1968 files changed, 140728 insertions, 150239 deletions

diff --git a/.gitignore b/.gitignore
index e27b5b12ff..3dcfa79f4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -182,7 +182,6 @@ JAVADOC-GENERATED
 # Files generated by configure.
 #
 
-/lib/*/configure
 /lib/*/config.log
 /lib/*/config.status
 
@@ -190,6 +189,8 @@ JAVADOC-GENERATED
 # Files generated by "./otp_build autoconf"
 #
 
+/lib/*/configure
+/lib/common_test/test_server/configure
 /lib/configure.in
 /aclocal.m4
 /lib/common_test/priv/auxdir/config.guess
@@ -201,9 +202,9 @@ JAVADOC-GENERATED
 /lib/erl_interface/src/auxdir/install-sh
 /lib/megaco/aclocal.m4
 /lib/odbc/aclocal.m4
-/lib/test_server/src/config.guess
-/lib/test_server/src/config.sub
-/lib/test_server/src/install-sh
+/lib/common_test/test_server/config.guess
+/lib/common_test/test_server/config.sub
+/lib/common_test/test_server/install-sh
 /lib/wx/aclocal.m4
 /lib/wx/autoconf/config.guess
 /lib/wx/autoconf/config.sub
diff --git a/HOWTO/INSTALL-CROSS.md b/HOWTO/INSTALL-CROSS.md
index 224f238fd0..0c984a825d 100644
--- a/HOWTO/INSTALL-CROSS.md
+++ b/HOWTO/INSTALL-CROSS.md
@@ -520,29 +520,6 @@ When a variable has been set, no warning will be issued.
     `posix_memalign` implementation that accepts larger than page size
     alignment.
 
-*   `erl_xcomp_ose_ldflags_pass1` - Linker flags for the OSE module (pass 1)
-
-*   `erl_xcomp_ose_ldflags_pass2` - Linker flags for the OSE module (pass 2)
-
-*   `erl_xcomp_ose_OSEROOT` - OSE installation root directory
-
-*   `erl_xcomp_ose_STRIP` - Strip utility shipped with the OSE distribution
-
-*   `erl_xcomp_ose_LM_POST_LINK` - OSE postlink tool
-
-*   `erl_xcomp_ose_LM_SET_CONF` - Sets the configuration for an OSE load module
-
-*   `erl_xcomp_ose_LM_ELF_SIZE` - Prints the section size information for an
-	OSE load module
-
-*   `erl_xcomp_ose_LM_LCF` - OSE load module linker configuration file
-
-*   `erl_xcomp_ose_BEAM_LM_CONF` - Beam OSE load module configuration file
-
-*   `erl_xcomp_ose_EPMD_LM_CONF` - EPMD OSE load module configuration file
-
-*   `erl_xcomp_ose_RUN_ERL_LM_CONF` - run_erl_lm OSE load module configuration file
-
 Copyright and License
 ---------------------
 
diff --git a/HOWTO/INSTALL.md b/HOWTO/INSTALL.md
index c1b6f44046..2ae1ed3c8d 100644
--- a/HOWTO/INSTALL.md
+++ b/HOWTO/INSTALL.md
@@ -68,7 +68,7 @@ also find the utilities needed for building the documentation.
     Required for building the application `crypto`.
     Further, `ssl` and `ssh` require a working crypto application and
     will also be skipped if OpenSSL is missing. The `public_key`
-    application will available without `crypto`, but the functionality
+    application is available without `crypto`, but the functionality
     will be very limited.
 
     The development package of OpenSSL including the header files are needed as well
@@ -356,8 +356,6 @@ Some of the available `configure` options are:
     depending on operating system and hardware platform. Note that by
     enabling this you might get a seemingly working system that sometimes
     fail on floating point operations.
-*   `--enable-darwin-universal` - Build universal binaries on darwin i386.
-*   `--enable-darwin-64bit` - Build 64-bit binaries on darwin
 *   `--enable-m64-build` - Build 64-bit binaries using the `-m64` flag to
     `(g)cc`
 *   `--enable-m32-build` - Build 32-bit binaries using the `-m32` flag to
@@ -374,9 +372,15 @@ Some of the available `configure` options are:
     `jinterface` application won't be built)
 *   `--{enable,disable}-dynamic-ssl-lib` - Dynamic OpenSSL libraries
 *   `--{enable,disable}-builtin-zlib` - Use the built-in source for zlib.
-*   `--with-ssl=PATH` - Specify location of OpenSSL include and lib
 *   `--{with,without}-ssl` - OpenSSL (without implies that the `crypto`,
     `ssh`, and `ssl` won't be built)
+*   `--with-ssl=PATH` - Specify location of OpenSSL include and lib
+*   `--with-ssl-incl=PATH` - Location of OpenSSL `include` directory,
+    if different than specified by `--with-ssl=PATH`
+*   `--with-ssl-rpath=yes|no|PATHS` - Runtime library path for OpenSSL.
+    Default is `yes`, which equates to a number of standard locations. If
+    `no`, then no runtime library paths will be used. Anything else should be
+    a comma separated list of paths.
 *   `--with-libatomic_ops=PATH` - Use the `libatomic_ops` library for atomic
     memory accesses. If `configure` should inform you about no native atomic
     implementation available, you typically want to try using the
@@ -400,7 +404,7 @@ Some of the available `configure` options are:
     that has to be the same as the filename. You also have to define
     `STATIC_ERLANG_{NIF,DRIVER}` when compiling the .o files for the nif/driver.
     If your nif/driver depends on some other dynamic library, you now have to link
-    that to the Erlang VM binary. This is easily achived by passing `LIBS=-llibname`
+    that to the Erlang VM binary. This is easily achieved by passing `LIBS=-llibname`
     to configure.
 *   `--without-$app` - By default all applications in Erlang/OTP will be included
 	in a release. If this is not wanted it is possible to specify that Erlang/OTP
diff --git a/Makefile.in b/Makefile.in
index 7ce420a8d7..377eebbbc2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -670,8 +670,6 @@ tertiary_bootstrap_copy:
 	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/wx ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/wx ; fi
 	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/ebin ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/ebin ; fi
 	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/wx/include ; fi
-	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server ; fi
-	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/test_server/include ; fi
 	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test ; fi
 	$(V_at)if test ! -d $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test/include ; then mkdir $(BOOTSTRAP_ROOT)/bootstrap/lib/common_test/include ; fi
 	$(V_at)for x in lib/ic/ebin/*.beam; do \
@@ -752,17 +750,6 @@ tertiary_bootstrap_copy:
 	done
 
 #	copy test includes to be able to compile tests with bootstrap compiler
-	$(V_at)for x in lib/test_server/include/*.hrl; do \
-		BN=`basename $$x`; \
-		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/test_server/include/$$BN; \
-		test -f  $$TF && \
-		test '!' -z "`find $$x -newer $$TF -print`" && \
-			cp $$x $$TF; \
-		test '!' -f $$TF && \
-			cp $$x $$TF; \
-		true; \
-	done
-
 	$(V_at)for x in lib/common_test/include/*.hrl; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/common_test/include/$$BN; \
@@ -966,7 +953,7 @@ primary_bootstrap_copy:
 
 # To remove modules left by the bootstrap building, but leave (restore)
 # the modules in kernel which are needed for an emulator build
-KERNEL_PRELOAD    = otp_ring0 init erl_prim_loader prim_inet prim_file zlib prim_zip erlang
+KERNEL_PRELOAD    = otp_ring0 init erl_prim_loader prim_inet prim_file zlib prim_zip erlang erts_code_purger
 KERNEL_PRELOAD_BEAMS=$(KERNEL_PRELOAD:%=$(BOOTSTRAP_TOP)/lib/kernel/ebin/%.beam)
 
 start_scripts:
@@ -987,7 +974,7 @@ local_setup:
 # ---------------------------------------------------------------------
 
 TEST_DIRS := \
-	lib/test_server \
+	lib/common_test/test_server \
 	$(wildcard lib/*/test) \
 	erts/test \
 	erts/epmd/test \
diff --git a/OTP_VERSION b/OTP_VERSION
index 60ea50e403..0b602e3cc8 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1 @@
-18.2.2
+19.0-rc0
diff --git a/README.md b/README.md
index b5c27f1bae..ed3bf26d6e 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,12 @@ In short:
 *   Once or twice a week, a status email called ["What's cooking in Erlang/OTP"] [4]
     will be sent to the [`erlang-patches`] [3] mailing list.
 
+Bug Reports
+--------------------------
+
+Please look at the [instructions for submitting bugs reports] [6].
+
+
 Copyright and License
 ---------------------
 
@@ -89,3 +95,4 @@ Copyright and License
    [3]: http://www.erlang.org/static/doc/mailinglist.html
    [4]: http://erlang.github.com/otp/
    [5]: HOWTO/INSTALL.md
+   [6]: https://github.com/erlang/otp/wiki/Bug-reports
diff --git a/bootstrap/bin/start.boot b/bootstrap/bin/start.boot
index cd628918e0..e07137fd5c 100644
--- a/bootstrap/bin/start.boot
+++ b/bootstrap/bin/start.boot
diff --git a/bootstrap/bin/start_clean.boot b/bootstrap/bin/start_clean.boot
index cd628918e0..e07137fd5c 100644
--- a/bootstrap/bin/start_clean.boot
+++ b/bootstrap/bin/start_clean.boot
diff --git a/bootstrap/lib/compiler/ebin/beam_a.beam b/bootstrap/lib/compiler/ebin/beam_a.beam
index 3ff689bd81..2388ccad80 100644
--- a/bootstrap/lib/compiler/ebin/beam_a.beam
+++ b/bootstrap/lib/compiler/ebin/beam_a.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_asm.beam b/bootstrap/lib/compiler/ebin/beam_asm.beam
index 6dcce01def..3249ce70a5 100644
--- a/bootstrap/lib/compiler/ebin/beam_asm.beam
+++ b/bootstrap/lib/compiler/ebin/beam_asm.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_block.beam b/bootstrap/lib/compiler/ebin/beam_block.beam
index 5d1e45fd72..7a96ad3196 100644
--- a/bootstrap/lib/compiler/ebin/beam_block.beam
+++ b/bootstrap/lib/compiler/ebin/beam_block.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_bool.beam b/bootstrap/lib/compiler/ebin/beam_bool.beam
index 0fa7612114..e677c125a3 100644
--- a/bootstrap/lib/compiler/ebin/beam_bool.beam
+++ b/bootstrap/lib/compiler/ebin/beam_bool.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_bs.beam b/bootstrap/lib/compiler/ebin/beam_bs.beam
new file mode 100644
index 0000000000..18b9f8bc1b
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_bs.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_bsm.beam b/bootstrap/lib/compiler/ebin/beam_bsm.beam
index a6757dfcfb..b65f915978 100644
--- a/bootstrap/lib/compiler/ebin/beam_bsm.beam
+++ b/bootstrap/lib/compiler/ebin/beam_bsm.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_clean.beam b/bootstrap/lib/compiler/ebin/beam_clean.beam
index 2fd2d2a82f..0f24e040e3 100644
--- a/bootstrap/lib/compiler/ebin/beam_clean.beam
+++ b/bootstrap/lib/compiler/ebin/beam_clean.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_dead.beam b/bootstrap/lib/compiler/ebin/beam_dead.beam
index 6ae6de1d8b..10926614e6 100644
--- a/bootstrap/lib/compiler/ebin/beam_dead.beam
+++ b/bootstrap/lib/compiler/ebin/beam_dead.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_dict.beam b/bootstrap/lib/compiler/ebin/beam_dict.beam
index 17b3c40eda..4e12260e65 100644
--- a/bootstrap/lib/compiler/ebin/beam_dict.beam
+++ b/bootstrap/lib/compiler/ebin/beam_dict.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_disasm.beam b/bootstrap/lib/compiler/ebin/beam_disasm.beam
index 7c5dca424f..b2fd7faa0c 100644
--- a/bootstrap/lib/compiler/ebin/beam_disasm.beam
+++ b/bootstrap/lib/compiler/ebin/beam_disasm.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_except.beam b/bootstrap/lib/compiler/ebin/beam_except.beam
index f4fccfeef7..e5d2c51c4d 100644
--- a/bootstrap/lib/compiler/ebin/beam_except.beam
+++ b/bootstrap/lib/compiler/ebin/beam_except.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_flatten.beam b/bootstrap/lib/compiler/ebin/beam_flatten.beam
index c1d5604349..f6fc8dfc50 100644
--- a/bootstrap/lib/compiler/ebin/beam_flatten.beam
+++ b/bootstrap/lib/compiler/ebin/beam_flatten.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_jump.beam b/bootstrap/lib/compiler/ebin/beam_jump.beam
index 630a370a94..7382cafb48 100644
--- a/bootstrap/lib/compiler/ebin/beam_jump.beam
+++ b/bootstrap/lib/compiler/ebin/beam_jump.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_listing.beam b/bootstrap/lib/compiler/ebin/beam_listing.beam
index 4d8f94c4ea..41fac49d23 100644
--- a/bootstrap/lib/compiler/ebin/beam_listing.beam
+++ b/bootstrap/lib/compiler/ebin/beam_listing.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_peep.beam b/bootstrap/lib/compiler/ebin/beam_peep.beam
index 7a7856e247..334047bbf6 100644
--- a/bootstrap/lib/compiler/ebin/beam_peep.beam
+++ b/bootstrap/lib/compiler/ebin/beam_peep.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_receive.beam b/bootstrap/lib/compiler/ebin/beam_receive.beam
index 78c9eb1c39..0aa196f3de 100644
--- a/bootstrap/lib/compiler/ebin/beam_receive.beam
+++ b/bootstrap/lib/compiler/ebin/beam_receive.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_reorder.beam b/bootstrap/lib/compiler/ebin/beam_reorder.beam
new file mode 100644
index 0000000000..0dc44add6b
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_reorder.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_split.beam b/bootstrap/lib/compiler/ebin/beam_split.beam
index 4821d92c96..a4e2b78938 100644
--- a/bootstrap/lib/compiler/ebin/beam_split.beam
+++ b/bootstrap/lib/compiler/ebin/beam_split.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_trim.beam b/bootstrap/lib/compiler/ebin/beam_trim.beam
index 6878a8a01c..194882f68a 100644
--- a/bootstrap/lib/compiler/ebin/beam_trim.beam
+++ b/bootstrap/lib/compiler/ebin/beam_trim.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_type.beam b/bootstrap/lib/compiler/ebin/beam_type.beam
index cb3bc1a8bd..35bc046ef8 100644
--- a/bootstrap/lib/compiler/ebin/beam_type.beam
+++ b/bootstrap/lib/compiler/ebin/beam_type.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_utils.beam b/bootstrap/lib/compiler/ebin/beam_utils.beam
index fc2e1b6c78..a97fc853a7 100644
--- a/bootstrap/lib/compiler/ebin/beam_utils.beam
+++ b/bootstrap/lib/compiler/ebin/beam_utils.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_validator.beam b/bootstrap/lib/compiler/ebin/beam_validator.beam
index 8b13cea141..73fa117755 100644
--- a/bootstrap/lib/compiler/ebin/beam_validator.beam
+++ b/bootstrap/lib/compiler/ebin/beam_validator.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_z.beam b/bootstrap/lib/compiler/ebin/beam_z.beam
index ac156a37e9..7bf77d7d33 100644
--- a/bootstrap/lib/compiler/ebin/beam_z.beam
+++ b/bootstrap/lib/compiler/ebin/beam_z.beam
diff --git a/bootstrap/lib/compiler/ebin/cerl.beam b/bootstrap/lib/compiler/ebin/cerl.beam
index 758861af20..88857b8905 100644
--- a/bootstrap/lib/compiler/ebin/cerl.beam
+++ b/bootstrap/lib/compiler/ebin/cerl.beam
diff --git a/bootstrap/lib/compiler/ebin/cerl_clauses.beam b/bootstrap/lib/compiler/ebin/cerl_clauses.beam
index 2357df79f4..95dd3f3cbb 100644
--- a/bootstrap/lib/compiler/ebin/cerl_clauses.beam
+++ b/bootstrap/lib/compiler/ebin/cerl_clauses.beam
diff --git a/bootstrap/lib/compiler/ebin/cerl_inline.beam b/bootstrap/lib/compiler/ebin/cerl_inline.beam
index 0e466ad38e..cc90a53ef9 100644
--- a/bootstrap/lib/compiler/ebin/cerl_inline.beam
+++ b/bootstrap/lib/compiler/ebin/cerl_inline.beam
diff --git a/bootstrap/lib/compiler/ebin/cerl_sets.beam b/bootstrap/lib/compiler/ebin/cerl_sets.beam
index d16543cdbe..20cf324b41 100644
--- a/bootstrap/lib/compiler/ebin/cerl_sets.beam
+++ b/bootstrap/lib/compiler/ebin/cerl_sets.beam
diff --git a/bootstrap/lib/compiler/ebin/cerl_trees.beam b/bootstrap/lib/compiler/ebin/cerl_trees.beam
index b23668fb2b..37120929ba 100644
--- a/bootstrap/lib/compiler/ebin/cerl_trees.beam
+++ b/bootstrap/lib/compiler/ebin/cerl_trees.beam
diff --git a/bootstrap/lib/compiler/ebin/compile.beam b/bootstrap/lib/compiler/ebin/compile.beam
index 111f85acd2..a0c114bf7e 100644
--- a/bootstrap/lib/compiler/ebin/compile.beam
+++ b/bootstrap/lib/compiler/ebin/compile.beam
diff --git a/bootstrap/lib/compiler/ebin/compiler.app b/bootstrap/lib/compiler/ebin/compiler.app
index d3b2296ea4..c5ec501890 100644
--- a/bootstrap/lib/compiler/ebin/compiler.app
+++ b/bootstrap/lib/compiler/ebin/compiler.app
@@ -19,12 +19,13 @@
 
 {application, compiler,
  [{description, "ERTS  CXC 138 10"},
-  {vsn, "6.0"},
+  {vsn, "6.0.3"},
   {modules, [
 	     beam_a,
 	     beam_asm,
 	     beam_block,
 	     beam_bool,
+	     beam_bs,
 	     beam_bsm,
 	     beam_clean,
 	     beam_dead,
@@ -37,6 +38,7 @@
 	     beam_opcodes,
 	     beam_peep,
 	     beam_receive,
+	     beam_reorder,
 	     beam_split,
 	     beam_trim,
 	     beam_type,
diff --git a/bootstrap/lib/compiler/ebin/compiler.appup b/bootstrap/lib/compiler/ebin/compiler.appup
index 889b72bd6b..0cdf00818d 100644
--- a/bootstrap/lib/compiler/ebin/compiler.appup
+++ b/bootstrap/lib/compiler/ebin/compiler.appup
@@ -16,7 +16,7 @@
 %% limitations under the License.
 %%
 %% %CopyrightEnd%
-{"5.0.4",
+{"6.0.3",
  [{<<".*">>,[{restart_application, compiler}]}],
  [{<<".*">>,[{restart_application, compiler}]}]
 }.
diff --git a/bootstrap/lib/compiler/ebin/core_lib.beam b/bootstrap/lib/compiler/ebin/core_lib.beam
index ec87099635..32b770c186 100644
--- a/bootstrap/lib/compiler/ebin/core_lib.beam
+++ b/bootstrap/lib/compiler/ebin/core_lib.beam
diff --git a/bootstrap/lib/compiler/ebin/core_lint.beam b/bootstrap/lib/compiler/ebin/core_lint.beam
index b1cbbf030d..69143cdd23 100644
--- a/bootstrap/lib/compiler/ebin/core_lint.beam
+++ b/bootstrap/lib/compiler/ebin/core_lint.beam
diff --git a/bootstrap/lib/compiler/ebin/core_parse.beam b/bootstrap/lib/compiler/ebin/core_parse.beam
index 025ac1591b..3ef8588f65 100644
--- a/bootstrap/lib/compiler/ebin/core_parse.beam
+++ b/bootstrap/lib/compiler/ebin/core_parse.beam
diff --git a/bootstrap/lib/compiler/ebin/core_pp.beam b/bootstrap/lib/compiler/ebin/core_pp.beam
index 7ba89c698e..f320fd6908 100644
--- a/bootstrap/lib/compiler/ebin/core_pp.beam
+++ b/bootstrap/lib/compiler/ebin/core_pp.beam
diff --git a/bootstrap/lib/compiler/ebin/core_scan.beam b/bootstrap/lib/compiler/ebin/core_scan.beam
index c54edfc0e7..5f7b22ba8b 100644
--- a/bootstrap/lib/compiler/ebin/core_scan.beam
+++ b/bootstrap/lib/compiler/ebin/core_scan.beam
diff --git a/bootstrap/lib/compiler/ebin/rec_env.beam b/bootstrap/lib/compiler/ebin/rec_env.beam
index c49a2e23e9..9388b5d4e1 100644
--- a/bootstrap/lib/compiler/ebin/rec_env.beam
+++ b/bootstrap/lib/compiler/ebin/rec_env.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_core_dsetel.beam b/bootstrap/lib/compiler/ebin/sys_core_dsetel.beam
index 14c69eec6c..0c2d05286a 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_dsetel.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_dsetel.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_core_fold.beam b/bootstrap/lib/compiler/ebin/sys_core_fold.beam
index cbdef8e1d7..52c0d62f5f 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_fold.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_fold.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_core_fold_lists.beam b/bootstrap/lib/compiler/ebin/sys_core_fold_lists.beam
index 58ae7c0393..20cd2af6bc 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_fold_lists.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_fold_lists.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_core_inline.beam b/bootstrap/lib/compiler/ebin/sys_core_inline.beam
index 4f44297bee..963b7ef6e1 100644
--- a/bootstrap/lib/compiler/ebin/sys_core_inline.beam
+++ b/bootstrap/lib/compiler/ebin/sys_core_inline.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_pre_attributes.beam b/bootstrap/lib/compiler/ebin/sys_pre_attributes.beam
index a1c6466ccd..934a539ad9 100644
--- a/bootstrap/lib/compiler/ebin/sys_pre_attributes.beam
+++ b/bootstrap/lib/compiler/ebin/sys_pre_attributes.beam
diff --git a/bootstrap/lib/compiler/ebin/sys_pre_expand.beam b/bootstrap/lib/compiler/ebin/sys_pre_expand.beam
index 6eba755081..71d381b5b3 100644
--- a/bootstrap/lib/compiler/ebin/sys_pre_expand.beam
+++ b/bootstrap/lib/compiler/ebin/sys_pre_expand.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_codegen.beam b/bootstrap/lib/compiler/ebin/v3_codegen.beam
index e53f0fcd12..322469639f 100644
--- a/bootstrap/lib/compiler/ebin/v3_codegen.beam
+++ b/bootstrap/lib/compiler/ebin/v3_codegen.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_core.beam b/bootstrap/lib/compiler/ebin/v3_core.beam
index e4c5f51f77..223eb2acef 100644
--- a/bootstrap/lib/compiler/ebin/v3_core.beam
+++ b/bootstrap/lib/compiler/ebin/v3_core.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_kernel.beam b/bootstrap/lib/compiler/ebin/v3_kernel.beam
index f5cdbb6e40..6555a39c86 100644
--- a/bootstrap/lib/compiler/ebin/v3_kernel.beam
+++ b/bootstrap/lib/compiler/ebin/v3_kernel.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_kernel_pp.beam b/bootstrap/lib/compiler/ebin/v3_kernel_pp.beam
index d54716bbee..306ecb1569 100644
--- a/bootstrap/lib/compiler/ebin/v3_kernel_pp.beam
+++ b/bootstrap/lib/compiler/ebin/v3_kernel_pp.beam
diff --git a/bootstrap/lib/compiler/ebin/v3_life.beam b/bootstrap/lib/compiler/ebin/v3_life.beam
index 741a702e88..d8822f929f 100644
--- a/bootstrap/lib/compiler/ebin/v3_life.beam
+++ b/bootstrap/lib/compiler/ebin/v3_life.beam
diff --git a/bootstrap/lib/kernel/ebin/application.beam b/bootstrap/lib/kernel/ebin/application.beam
index 97c6d9d415..ac01acad27 100644
--- a/bootstrap/lib/kernel/ebin/application.beam
+++ b/bootstrap/lib/kernel/ebin/application.beam
diff --git a/bootstrap/lib/kernel/ebin/application_controller.beam b/bootstrap/lib/kernel/ebin/application_controller.beam
index c4fa46e33e..2b3c8cf454 100644
--- a/bootstrap/lib/kernel/ebin/application_controller.beam
+++ b/bootstrap/lib/kernel/ebin/application_controller.beam
diff --git a/bootstrap/lib/kernel/ebin/application_master.beam b/bootstrap/lib/kernel/ebin/application_master.beam
index b81dfa81d3..24492a6771 100644
--- a/bootstrap/lib/kernel/ebin/application_master.beam
+++ b/bootstrap/lib/kernel/ebin/application_master.beam
diff --git a/bootstrap/lib/kernel/ebin/application_starter.beam b/bootstrap/lib/kernel/ebin/application_starter.beam
index f5059a487a..043e15fb2a 100644
--- a/bootstrap/lib/kernel/ebin/application_starter.beam
+++ b/bootstrap/lib/kernel/ebin/application_starter.beam
diff --git a/bootstrap/lib/kernel/ebin/auth.beam b/bootstrap/lib/kernel/ebin/auth.beam
index 74dde4fd1c..cbe477830b 100644
--- a/bootstrap/lib/kernel/ebin/auth.beam
+++ b/bootstrap/lib/kernel/ebin/auth.beam
diff --git a/bootstrap/lib/kernel/ebin/code.beam b/bootstrap/lib/kernel/ebin/code.beam
index cbef1633ee..28d8a5b579 100644
--- a/bootstrap/lib/kernel/ebin/code.beam
+++ b/bootstrap/lib/kernel/ebin/code.beam
diff --git a/bootstrap/lib/kernel/ebin/code_server.beam b/bootstrap/lib/kernel/ebin/code_server.beam
index 13ec972cc2..aa1ba78550 100644
--- a/bootstrap/lib/kernel/ebin/code_server.beam
+++ b/bootstrap/lib/kernel/ebin/code_server.beam
diff --git a/bootstrap/lib/kernel/ebin/disk_log.beam b/bootstrap/lib/kernel/ebin/disk_log.beam
index 287a8c0de8..3384baedc0 100644
--- a/bootstrap/lib/kernel/ebin/disk_log.beam
+++ b/bootstrap/lib/kernel/ebin/disk_log.beam
diff --git a/bootstrap/lib/kernel/ebin/disk_log_1.beam b/bootstrap/lib/kernel/ebin/disk_log_1.beam
index 55a9365f05..fc1c4781f1 100644
--- a/bootstrap/lib/kernel/ebin/disk_log_1.beam
+++ b/bootstrap/lib/kernel/ebin/disk_log_1.beam
diff --git a/bootstrap/lib/kernel/ebin/disk_log_server.beam b/bootstrap/lib/kernel/ebin/disk_log_server.beam
index 8c1622c7d8..50154045be 100644
--- a/bootstrap/lib/kernel/ebin/disk_log_server.beam
+++ b/bootstrap/lib/kernel/ebin/disk_log_server.beam
diff --git a/bootstrap/lib/kernel/ebin/dist_ac.beam b/bootstrap/lib/kernel/ebin/dist_ac.beam
index ea948cfe88..d2c186f03a 100644
--- a/bootstrap/lib/kernel/ebin/dist_ac.beam
+++ b/bootstrap/lib/kernel/ebin/dist_ac.beam
diff --git a/bootstrap/lib/kernel/ebin/dist_util.beam b/bootstrap/lib/kernel/ebin/dist_util.beam
index f87dd4a45c..8b75d83dd1 100644
--- a/bootstrap/lib/kernel/ebin/dist_util.beam
+++ b/bootstrap/lib/kernel/ebin/dist_util.beam
diff --git a/bootstrap/lib/kernel/ebin/erl_boot_server.beam b/bootstrap/lib/kernel/ebin/erl_boot_server.beam
index 91899fe231..20c41fd06e 100644
--- a/bootstrap/lib/kernel/ebin/erl_boot_server.beam
+++ b/bootstrap/lib/kernel/ebin/erl_boot_server.beam
diff --git a/bootstrap/lib/kernel/ebin/erl_ddll.beam b/bootstrap/lib/kernel/ebin/erl_ddll.beam
index e15e49d61c..0a644d2e38 100644
--- a/bootstrap/lib/kernel/ebin/erl_ddll.beam
+++ b/bootstrap/lib/kernel/ebin/erl_ddll.beam
diff --git a/bootstrap/lib/kernel/ebin/erl_distribution.beam b/bootstrap/lib/kernel/ebin/erl_distribution.beam
index 9a6acc0585..198f23e14b 100644
--- a/bootstrap/lib/kernel/ebin/erl_distribution.beam
+++ b/bootstrap/lib/kernel/ebin/erl_distribution.beam
diff --git a/bootstrap/lib/kernel/ebin/erl_epmd.beam b/bootstrap/lib/kernel/ebin/erl_epmd.beam
index 92d6387af3..8e8460514c 100644
--- a/bootstrap/lib/kernel/ebin/erl_epmd.beam
+++ b/bootstrap/lib/kernel/ebin/erl_epmd.beam
diff --git a/bootstrap/lib/kernel/ebin/erl_reply.beam b/bootstrap/lib/kernel/ebin/erl_reply.beam
index 79fb539bd3..6cf7d9e196 100644
--- a/bootstrap/lib/kernel/ebin/erl_reply.beam
+++ b/bootstrap/lib/kernel/ebin/erl_reply.beam
diff --git a/bootstrap/lib/kernel/ebin/error_handler.beam b/bootstrap/lib/kernel/ebin/error_handler.beam
index 740ba28f72..64f44baeb7 100644
--- a/bootstrap/lib/kernel/ebin/error_handler.beam
+++ b/bootstrap/lib/kernel/ebin/error_handler.beam
diff --git a/bootstrap/lib/kernel/ebin/error_logger.beam b/bootstrap/lib/kernel/ebin/error_logger.beam
index 10f7a0b984..73ab813430 100644
--- a/bootstrap/lib/kernel/ebin/error_logger.beam
+++ b/bootstrap/lib/kernel/ebin/error_logger.beam
diff --git a/bootstrap/lib/kernel/ebin/erts_debug.beam b/bootstrap/lib/kernel/ebin/erts_debug.beam
index bd73ff6c5c..908c63cb9a 100644
--- a/bootstrap/lib/kernel/ebin/erts_debug.beam
+++ b/bootstrap/lib/kernel/ebin/erts_debug.beam
diff --git a/bootstrap/lib/kernel/ebin/file.beam b/bootstrap/lib/kernel/ebin/file.beam
index 32a3a27993..1856278999 100644
--- a/bootstrap/lib/kernel/ebin/file.beam
+++ b/bootstrap/lib/kernel/ebin/file.beam
diff --git a/bootstrap/lib/kernel/ebin/file_io_server.beam b/bootstrap/lib/kernel/ebin/file_io_server.beam
index b9c53bde49..dabb6b194e 100644
--- a/bootstrap/lib/kernel/ebin/file_io_server.beam
+++ b/bootstrap/lib/kernel/ebin/file_io_server.beam
diff --git a/bootstrap/lib/kernel/ebin/file_server.beam b/bootstrap/lib/kernel/ebin/file_server.beam
index 48352e9dfd..151293e05c 100644
--- a/bootstrap/lib/kernel/ebin/file_server.beam
+++ b/bootstrap/lib/kernel/ebin/file_server.beam
diff --git a/bootstrap/lib/kernel/ebin/gen_sctp.beam b/bootstrap/lib/kernel/ebin/gen_sctp.beam
index e2bb806f2b..91aaa41063 100644
--- a/bootstrap/lib/kernel/ebin/gen_sctp.beam
+++ b/bootstrap/lib/kernel/ebin/gen_sctp.beam
diff --git a/bootstrap/lib/kernel/ebin/gen_tcp.beam b/bootstrap/lib/kernel/ebin/gen_tcp.beam
index 0182e11345..e40f1f2e45 100644
--- a/bootstrap/lib/kernel/ebin/gen_tcp.beam
+++ b/bootstrap/lib/kernel/ebin/gen_tcp.beam
diff --git a/bootstrap/lib/kernel/ebin/gen_udp.beam b/bootstrap/lib/kernel/ebin/gen_udp.beam
index e49561399d..ec4eda12f7 100644
--- a/bootstrap/lib/kernel/ebin/gen_udp.beam
+++ b/bootstrap/lib/kernel/ebin/gen_udp.beam
diff --git a/bootstrap/lib/kernel/ebin/global.beam b/bootstrap/lib/kernel/ebin/global.beam
index 158fbd1c93..419102e285 100644
--- a/bootstrap/lib/kernel/ebin/global.beam
+++ b/bootstrap/lib/kernel/ebin/global.beam
diff --git a/bootstrap/lib/kernel/ebin/global_group.beam b/bootstrap/lib/kernel/ebin/global_group.beam
index 85306ef123..1269f7e321 100644
--- a/bootstrap/lib/kernel/ebin/global_group.beam
+++ b/bootstrap/lib/kernel/ebin/global_group.beam
diff --git a/bootstrap/lib/kernel/ebin/group.beam b/bootstrap/lib/kernel/ebin/group.beam
index 0f72880f49..3df8f6030c 100644
--- a/bootstrap/lib/kernel/ebin/group.beam
+++ b/bootstrap/lib/kernel/ebin/group.beam
diff --git a/bootstrap/lib/kernel/ebin/heart.beam b/bootstrap/lib/kernel/ebin/heart.beam
index d4972ecdd2..86044153af 100644
--- a/bootstrap/lib/kernel/ebin/heart.beam
+++ b/bootstrap/lib/kernel/ebin/heart.beam
diff --git a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
index 8e2911cd13..b1b7fcdef2 100644
--- a/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
+++ b/bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
diff --git a/bootstrap/lib/kernel/ebin/inet.beam b/bootstrap/lib/kernel/ebin/inet.beam
index 75743c63cc..55598b0067 100644
--- a/bootstrap/lib/kernel/ebin/inet.beam
+++ b/bootstrap/lib/kernel/ebin/inet.beam
diff --git a/bootstrap/lib/kernel/ebin/inet6_sctp.beam b/bootstrap/lib/kernel/ebin/inet6_sctp.beam
index 10c2644259..5c827589bd 100644
--- a/bootstrap/lib/kernel/ebin/inet6_sctp.beam
+++ b/bootstrap/lib/kernel/ebin/inet6_sctp.beam
diff --git a/bootstrap/lib/kernel/ebin/inet6_tcp.beam b/bootstrap/lib/kernel/ebin/inet6_tcp.beam
index 96dd4739ea..f1ab2912bb 100644
--- a/bootstrap/lib/kernel/ebin/inet6_tcp.beam
+++ b/bootstrap/lib/kernel/ebin/inet6_tcp.beam
diff --git a/bootstrap/lib/kernel/ebin/inet6_udp.beam b/bootstrap/lib/kernel/ebin/inet6_udp.beam
index 73f0b52b90..2eb8c09701 100644
--- a/bootstrap/lib/kernel/ebin/inet6_udp.beam
+++ b/bootstrap/lib/kernel/ebin/inet6_udp.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_config.beam b/bootstrap/lib/kernel/ebin/inet_config.beam
index f31fb16742..f49fa7a376 100644
--- a/bootstrap/lib/kernel/ebin/inet_config.beam
+++ b/bootstrap/lib/kernel/ebin/inet_config.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_db.beam b/bootstrap/lib/kernel/ebin/inet_db.beam
index 6401f0fcfa..1b7450f0d3 100644
--- a/bootstrap/lib/kernel/ebin/inet_db.beam
+++ b/bootstrap/lib/kernel/ebin/inet_db.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_dns.beam b/bootstrap/lib/kernel/ebin/inet_dns.beam
index b1c3bf3369..88ecaaf10b 100644
--- a/bootstrap/lib/kernel/ebin/inet_dns.beam
+++ b/bootstrap/lib/kernel/ebin/inet_dns.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_gethost_native.beam b/bootstrap/lib/kernel/ebin/inet_gethost_native.beam
index 098c397936..93f60428a1 100644
--- a/bootstrap/lib/kernel/ebin/inet_gethost_native.beam
+++ b/bootstrap/lib/kernel/ebin/inet_gethost_native.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_hosts.beam b/bootstrap/lib/kernel/ebin/inet_hosts.beam
index 3e70a8b8c1..7278913418 100644
--- a/bootstrap/lib/kernel/ebin/inet_hosts.beam
+++ b/bootstrap/lib/kernel/ebin/inet_hosts.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_parse.beam b/bootstrap/lib/kernel/ebin/inet_parse.beam
index 294afcea30..4323d12bf1 100644
--- a/bootstrap/lib/kernel/ebin/inet_parse.beam
+++ b/bootstrap/lib/kernel/ebin/inet_parse.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_res.beam b/bootstrap/lib/kernel/ebin/inet_res.beam
index f35242f49a..ada7300673 100644
--- a/bootstrap/lib/kernel/ebin/inet_res.beam
+++ b/bootstrap/lib/kernel/ebin/inet_res.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_sctp.beam b/bootstrap/lib/kernel/ebin/inet_sctp.beam
index 19506c14e9..835c7b2928 100644
--- a/bootstrap/lib/kernel/ebin/inet_sctp.beam
+++ b/bootstrap/lib/kernel/ebin/inet_sctp.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_tcp.beam b/bootstrap/lib/kernel/ebin/inet_tcp.beam
index c2b42fef1c..698a94770b 100644
--- a/bootstrap/lib/kernel/ebin/inet_tcp.beam
+++ b/bootstrap/lib/kernel/ebin/inet_tcp.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam b/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam
index 1b389cbb4d..59cb7ce40e 100644
--- a/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam
+++ b/bootstrap/lib/kernel/ebin/inet_tcp_dist.beam
diff --git a/bootstrap/lib/kernel/ebin/inet_udp.beam b/bootstrap/lib/kernel/ebin/inet_udp.beam
index 6fbdd29f6d..6876ba3892 100644
--- a/bootstrap/lib/kernel/ebin/inet_udp.beam
+++ b/bootstrap/lib/kernel/ebin/inet_udp.beam
diff --git a/bootstrap/lib/kernel/ebin/kernel.app b/bootstrap/lib/kernel/ebin/kernel.app
index 85ba41bcef..49163534f8 100644
--- a/bootstrap/lib/kernel/ebin/kernel.app
+++ b/bootstrap/lib/kernel/ebin/kernel.app
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2015. 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.
@@ -22,7 +22,7 @@
 {application, kernel,
  [
   {description, "ERTS  CXC 138 10"},
-  {vsn, "4.0"},
+  {vsn, "4.2"},
   {modules, [application,
 	     application_controller,
 	     application_master,
@@ -116,6 +116,6 @@
   {applications, []},
   {env, [{error_logger, tty}]},
   {mod, {kernel, []}},
-  {runtime_dependencies, ["erts-7.0", "stdlib-2.5", "sasl-2.4"]}
+  {runtime_dependencies, ["erts-8.0", "stdlib-2.6", "sasl-2.6"]}
  ]
 }.
diff --git a/bootstrap/lib/kernel/ebin/kernel.appup b/bootstrap/lib/kernel/ebin/kernel.appup
index d09e0c6347..dbbc1ef977 100644
--- a/bootstrap/lib/kernel/ebin/kernel.appup
+++ b/bootstrap/lib/kernel/ebin/kernel.appup
@@ -16,9 +16,11 @@
 %% limitations under the License.
 %%
 %% %CopyrightEnd%
-{"4.0",
+{"4.2",
  %% Up from - max one major revision back
- [{<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17
+ [{<<"5\\.0(\\.[0-9]+)*">>,[restart_new_emulator]},       % OTP-19.*
+  {<<"4\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}],  % OTP-18.*
  %% Down to - max one major revision back
- [{<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}]  % OTP-17
+ [{<<"5\\.0(\\.[0-9]+)*">>,[restart_new_emulator]},      % OTP-19.*
+  {<<"4\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}]  % OTP-18.*
 }.
diff --git a/bootstrap/lib/kernel/ebin/kernel.beam b/bootstrap/lib/kernel/ebin/kernel.beam
index caeda89fa5..9fd407c287 100644
--- a/bootstrap/lib/kernel/ebin/kernel.beam
+++ b/bootstrap/lib/kernel/ebin/kernel.beam
diff --git a/bootstrap/lib/kernel/ebin/kernel_config.beam b/bootstrap/lib/kernel/ebin/kernel_config.beam
index 5a4649a054..8691aff64a 100644
--- a/bootstrap/lib/kernel/ebin/kernel_config.beam
+++ b/bootstrap/lib/kernel/ebin/kernel_config.beam
diff --git a/bootstrap/lib/kernel/ebin/net_adm.beam b/bootstrap/lib/kernel/ebin/net_adm.beam
index 4b09aae8a5..00772b61ff 100644
--- a/bootstrap/lib/kernel/ebin/net_adm.beam
+++ b/bootstrap/lib/kernel/ebin/net_adm.beam
diff --git a/bootstrap/lib/kernel/ebin/net_kernel.beam b/bootstrap/lib/kernel/ebin/net_kernel.beam
index e0bb445bf5..8afe1c0388 100644
--- a/bootstrap/lib/kernel/ebin/net_kernel.beam
+++ b/bootstrap/lib/kernel/ebin/net_kernel.beam
diff --git a/bootstrap/lib/kernel/ebin/os.beam b/bootstrap/lib/kernel/ebin/os.beam
index 9eaf7dfe5d..9ebe6c770f 100644
--- a/bootstrap/lib/kernel/ebin/os.beam
+++ b/bootstrap/lib/kernel/ebin/os.beam
diff --git a/bootstrap/lib/kernel/ebin/pg2.beam b/bootstrap/lib/kernel/ebin/pg2.beam
index 944f6a27a4..2115e46b60 100644
--- a/bootstrap/lib/kernel/ebin/pg2.beam
+++ b/bootstrap/lib/kernel/ebin/pg2.beam
diff --git a/bootstrap/lib/kernel/ebin/ram_file.beam b/bootstrap/lib/kernel/ebin/ram_file.beam
index a8b23f5490..b119b3656c 100644
--- a/bootstrap/lib/kernel/ebin/ram_file.beam
+++ b/bootstrap/lib/kernel/ebin/ram_file.beam
diff --git a/bootstrap/lib/kernel/ebin/rpc.beam b/bootstrap/lib/kernel/ebin/rpc.beam
index 4a8aa5da69..4fbd7b70fa 100644
--- a/bootstrap/lib/kernel/ebin/rpc.beam
+++ b/bootstrap/lib/kernel/ebin/rpc.beam
diff --git a/bootstrap/lib/kernel/ebin/seq_trace.beam b/bootstrap/lib/kernel/ebin/seq_trace.beam
index 13489135a2..68d1b50f84 100644
--- a/bootstrap/lib/kernel/ebin/seq_trace.beam
+++ b/bootstrap/lib/kernel/ebin/seq_trace.beam
diff --git a/bootstrap/lib/kernel/ebin/standard_error.beam b/bootstrap/lib/kernel/ebin/standard_error.beam
index be4f9292e7..9dfd66b2f4 100644
--- a/bootstrap/lib/kernel/ebin/standard_error.beam
+++ b/bootstrap/lib/kernel/ebin/standard_error.beam
diff --git a/bootstrap/lib/kernel/ebin/user.beam b/bootstrap/lib/kernel/ebin/user.beam
index d69339866a..c2b2808555 100644
--- a/bootstrap/lib/kernel/ebin/user.beam
+++ b/bootstrap/lib/kernel/ebin/user.beam
diff --git a/bootstrap/lib/kernel/ebin/user_drv.beam b/bootstrap/lib/kernel/ebin/user_drv.beam
index 726a130b55..e306b172bf 100644
--- a/bootstrap/lib/kernel/ebin/user_drv.beam
+++ b/bootstrap/lib/kernel/ebin/user_drv.beam
diff --git a/bootstrap/lib/kernel/ebin/user_sup.beam b/bootstrap/lib/kernel/ebin/user_sup.beam
index 79dd095896..9e7b95544d 100644
--- a/bootstrap/lib/kernel/ebin/user_sup.beam
+++ b/bootstrap/lib/kernel/ebin/user_sup.beam
diff --git a/bootstrap/lib/kernel/ebin/wrap_log_reader.beam b/bootstrap/lib/kernel/ebin/wrap_log_reader.beam
index 68578800a0..91ef523b99 100644
--- a/bootstrap/lib/kernel/ebin/wrap_log_reader.beam
+++ b/bootstrap/lib/kernel/ebin/wrap_log_reader.beam
diff --git a/bootstrap/lib/kernel/include/file.hrl b/bootstrap/lib/kernel/include/file.hrl
index 7cf033f7f5..36112bb040 100644
--- a/bootstrap/lib/kernel/include/file.hrl
+++ b/bootstrap/lib/kernel/include/file.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2015. 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.
@@ -23,37 +23,40 @@
 %%--------------------------------------------------------------------------
 
 -record(file_info,
-        {size   :: non_neg_integer(),   % Size of file in bytes.
-         type   :: 'device' | 'directory' | 'other' | 'regular' | 'symlink',
-         access :: 'read' | 'write' | 'read_write' | 'none',
-         atime  :: file:date_time() | non_neg_integer(),
+        {size   :: non_neg_integer() | 'undefined',  % Size of file in bytes.
+         type   :: 'device' | 'directory' | 'other' | 'regular' | 'symlink'
+                 | 'undefined',
+         access :: 'read' | 'write' | 'read_write' | 'none' | 'undefined',
+         atime  :: file:date_time() | non_neg_integer() | 'undefined',
                                      % The local time the file was last read:
                                      % {{Year, Mon, Day}, {Hour, Min, Sec}}.
                                      % atime, ctime, mtime may also be unix epochs()
-         mtime  :: file:date_time() | non_neg_integer(),
+         mtime  :: file:date_time() | non_neg_integer() | 'undefined',
                                      % The local time the file was last written.
-         ctime  :: file:date_time() | non_neg_integer(),
+         ctime  :: file:date_time() | non_neg_integer() | 'undefined',
                                      % The interpretation of this time field
                                      % is dependent on operating system.
                                      % On Unix it is the last time the file
                                      % or the inode was changed.  On Windows,
                                      % it is the creation time.
-         mode   :: non_neg_integer(), % File permissions.  On Windows,
+         mode   :: non_neg_integer() | 'undefined',
+                                     % File permissions.  On Windows,
                                      % the owner permissions will be
                                      % duplicated for group and user.
-         links  :: non_neg_integer(),
+         links  :: non_neg_integer() | 'undefined',
                                      % Number of links to the file (1 if the
                                      % filesystem doesn't support links).
-         major_device :: non_neg_integer(),
+         major_device :: non_neg_integer() | 'undefined',
                                      % Identifies the file system (Unix),
                                      % or the drive number (A: = 0, B: = 1)
                                      % (Windows).
          %% The following are Unix specific.
          %% They are set to zero on other operating systems.
-         minor_device :: non_neg_integer(), % Only valid for devices.
-         inode   :: non_neg_integer(),       % Inode number for file.
-         uid     :: non_neg_integer(),       % User id for owner.
-         gid     :: non_neg_integer()}).     % Group id for owner.
+         minor_device :: non_neg_integer() | 'undefined',
+                                             % Only valid for devices.
+         inode   :: non_neg_integer() | 'undefined',  % Inode number for file.
+         uid     :: non_neg_integer() | 'undefined',   % User id for owner.
+         gid     :: non_neg_integer() | 'undefined'}). % Group id for owner.
 
 
 -record(file_descriptor,
diff --git a/bootstrap/lib/stdlib/ebin/array.beam b/bootstrap/lib/stdlib/ebin/array.beam
index 4ad9c7cd04..4ad8942b06 100644
--- a/bootstrap/lib/stdlib/ebin/array.beam
+++ b/bootstrap/lib/stdlib/ebin/array.beam
diff --git a/bootstrap/lib/stdlib/ebin/base64.beam b/bootstrap/lib/stdlib/ebin/base64.beam
index e8d4b44102..ad725f61b9 100644
--- a/bootstrap/lib/stdlib/ebin/base64.beam
+++ b/bootstrap/lib/stdlib/ebin/base64.beam
diff --git a/bootstrap/lib/stdlib/ebin/beam_lib.beam b/bootstrap/lib/stdlib/ebin/beam_lib.beam
index d4f06cf9fd..8b987fd7f7 100644
--- a/bootstrap/lib/stdlib/ebin/beam_lib.beam
+++ b/bootstrap/lib/stdlib/ebin/beam_lib.beam
diff --git a/bootstrap/lib/stdlib/ebin/binary.beam b/bootstrap/lib/stdlib/ebin/binary.beam
index 666544c492..538d169565 100644
--- a/bootstrap/lib/stdlib/ebin/binary.beam
+++ b/bootstrap/lib/stdlib/ebin/binary.beam
diff --git a/bootstrap/lib/stdlib/ebin/c.beam b/bootstrap/lib/stdlib/ebin/c.beam
index 0e07dc1531..133035102e 100644
--- a/bootstrap/lib/stdlib/ebin/c.beam
+++ b/bootstrap/lib/stdlib/ebin/c.beam
diff --git a/bootstrap/lib/stdlib/ebin/calendar.beam b/bootstrap/lib/stdlib/ebin/calendar.beam
index 383d66e1a8..e71eebae3f 100644
--- a/bootstrap/lib/stdlib/ebin/calendar.beam
+++ b/bootstrap/lib/stdlib/ebin/calendar.beam
diff --git a/bootstrap/lib/stdlib/ebin/dets.beam b/bootstrap/lib/stdlib/ebin/dets.beam
index 100996bf85..b255a4e10f 100644
--- a/bootstrap/lib/stdlib/ebin/dets.beam
+++ b/bootstrap/lib/stdlib/ebin/dets.beam
diff --git a/bootstrap/lib/stdlib/ebin/dets_server.beam b/bootstrap/lib/stdlib/ebin/dets_server.beam
index 46c6769dfe..da999f3025 100644
--- a/bootstrap/lib/stdlib/ebin/dets_server.beam
+++ b/bootstrap/lib/stdlib/ebin/dets_server.beam
diff --git a/bootstrap/lib/stdlib/ebin/dets_utils.beam b/bootstrap/lib/stdlib/ebin/dets_utils.beam
index f2d1d86a60..ab627d50df 100644
--- a/bootstrap/lib/stdlib/ebin/dets_utils.beam
+++ b/bootstrap/lib/stdlib/ebin/dets_utils.beam
diff --git a/bootstrap/lib/stdlib/ebin/dets_v8.beam b/bootstrap/lib/stdlib/ebin/dets_v8.beam
index eca5a85114..9a1416a316 100644
--- a/bootstrap/lib/stdlib/ebin/dets_v8.beam
+++ b/bootstrap/lib/stdlib/ebin/dets_v8.beam
diff --git a/bootstrap/lib/stdlib/ebin/dets_v9.beam b/bootstrap/lib/stdlib/ebin/dets_v9.beam
index 711ca0b9f0..0b966769ba 100644
--- a/bootstrap/lib/stdlib/ebin/dets_v9.beam
+++ b/bootstrap/lib/stdlib/ebin/dets_v9.beam
diff --git a/bootstrap/lib/stdlib/ebin/dict.beam b/bootstrap/lib/stdlib/ebin/dict.beam
index 6ba808d6af..3b2b5a4c04 100644
--- a/bootstrap/lib/stdlib/ebin/dict.beam
+++ b/bootstrap/lib/stdlib/ebin/dict.beam
diff --git a/bootstrap/lib/stdlib/ebin/digraph.beam b/bootstrap/lib/stdlib/ebin/digraph.beam
index 40db38c992..76713562bc 100644
--- a/bootstrap/lib/stdlib/ebin/digraph.beam
+++ b/bootstrap/lib/stdlib/ebin/digraph.beam
diff --git a/bootstrap/lib/stdlib/ebin/digraph_utils.beam b/bootstrap/lib/stdlib/ebin/digraph_utils.beam
index 458c6d2895..9065fda936 100644
--- a/bootstrap/lib/stdlib/ebin/digraph_utils.beam
+++ b/bootstrap/lib/stdlib/ebin/digraph_utils.beam
diff --git a/bootstrap/lib/stdlib/ebin/edlin.beam b/bootstrap/lib/stdlib/ebin/edlin.beam
index aaa080bd97..8b1719eb0a 100644
--- a/bootstrap/lib/stdlib/ebin/edlin.beam
+++ b/bootstrap/lib/stdlib/ebin/edlin.beam
diff --git a/bootstrap/lib/stdlib/ebin/edlin_expand.beam b/bootstrap/lib/stdlib/ebin/edlin_expand.beam
index 3d9846bdcf..adc0f4ba1c 100644
--- a/bootstrap/lib/stdlib/ebin/edlin_expand.beam
+++ b/bootstrap/lib/stdlib/ebin/edlin_expand.beam
diff --git a/bootstrap/lib/stdlib/ebin/epp.beam b/bootstrap/lib/stdlib/ebin/epp.beam
index 00cf6f2a5c..e2a528f9fc 100644
--- a/bootstrap/lib/stdlib/ebin/epp.beam
+++ b/bootstrap/lib/stdlib/ebin/epp.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_anno.beam b/bootstrap/lib/stdlib/ebin/erl_anno.beam
index 4807dac5f9..72a255c88f 100644
--- a/bootstrap/lib/stdlib/ebin/erl_anno.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_anno.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_bits.beam b/bootstrap/lib/stdlib/ebin/erl_bits.beam
index 627b9ca711..af8619bac0 100644
--- a/bootstrap/lib/stdlib/ebin/erl_bits.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_bits.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_compile.beam b/bootstrap/lib/stdlib/ebin/erl_compile.beam
index e650afbf6d..82949da20a 100644
--- a/bootstrap/lib/stdlib/ebin/erl_compile.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_compile.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_eval.beam b/bootstrap/lib/stdlib/ebin/erl_eval.beam
index 2354a065ca..b58781d3f8 100644
--- a/bootstrap/lib/stdlib/ebin/erl_eval.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_eval.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_expand_records.beam b/bootstrap/lib/stdlib/ebin/erl_expand_records.beam
index db2d0e6b85..617913c674 100644
--- a/bootstrap/lib/stdlib/ebin/erl_expand_records.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_expand_records.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_lint.beam b/bootstrap/lib/stdlib/ebin/erl_lint.beam
index 35482f799b..3a0681d1bf 100644
--- a/bootstrap/lib/stdlib/ebin/erl_lint.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_lint.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_parse.beam b/bootstrap/lib/stdlib/ebin/erl_parse.beam
index 4b0e853390..79e96cabec 100644
--- a/bootstrap/lib/stdlib/ebin/erl_parse.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_parse.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_pp.beam b/bootstrap/lib/stdlib/ebin/erl_pp.beam
index d40913093a..4cc4884c92 100644
--- a/bootstrap/lib/stdlib/ebin/erl_pp.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_pp.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_scan.beam b/bootstrap/lib/stdlib/ebin/erl_scan.beam
index c29200f2e0..6c35d20c46 100644
--- a/bootstrap/lib/stdlib/ebin/erl_scan.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_scan.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_tar.beam b/bootstrap/lib/stdlib/ebin/erl_tar.beam
index e525b3738b..9bcbabc27c 100644
--- a/bootstrap/lib/stdlib/ebin/erl_tar.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_tar.beam
diff --git a/bootstrap/lib/stdlib/ebin/error_logger_file_h.beam b/bootstrap/lib/stdlib/ebin/error_logger_file_h.beam
index 0b98a9ceed..0e61e87708 100644
--- a/bootstrap/lib/stdlib/ebin/error_logger_file_h.beam
+++ b/bootstrap/lib/stdlib/ebin/error_logger_file_h.beam
diff --git a/bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam b/bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam
index 565904b903..46eafce18e 100644
--- a/bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam
+++ b/bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam
diff --git a/bootstrap/lib/stdlib/ebin/escript.beam b/bootstrap/lib/stdlib/ebin/escript.beam
index e923cecea8..c006d9a1ad 100644
--- a/bootstrap/lib/stdlib/ebin/escript.beam
+++ b/bootstrap/lib/stdlib/ebin/escript.beam
diff --git a/bootstrap/lib/stdlib/ebin/ets.beam b/bootstrap/lib/stdlib/ebin/ets.beam
index 9ac333dbee..a15534b365 100644
--- a/bootstrap/lib/stdlib/ebin/ets.beam
+++ b/bootstrap/lib/stdlib/ebin/ets.beam
diff --git a/bootstrap/lib/stdlib/ebin/eval_bits.beam b/bootstrap/lib/stdlib/ebin/eval_bits.beam
index 6627e1132c..be20e8c720 100644
--- a/bootstrap/lib/stdlib/ebin/eval_bits.beam
+++ b/bootstrap/lib/stdlib/ebin/eval_bits.beam
diff --git a/bootstrap/lib/stdlib/ebin/file_sorter.beam b/bootstrap/lib/stdlib/ebin/file_sorter.beam
index a2a82fb77d..9286aea119 100644
--- a/bootstrap/lib/stdlib/ebin/file_sorter.beam
+++ b/bootstrap/lib/stdlib/ebin/file_sorter.beam
diff --git a/bootstrap/lib/stdlib/ebin/filelib.beam b/bootstrap/lib/stdlib/ebin/filelib.beam
index 5941f9189f..5ea27fdca6 100644
--- a/bootstrap/lib/stdlib/ebin/filelib.beam
+++ b/bootstrap/lib/stdlib/ebin/filelib.beam
diff --git a/bootstrap/lib/stdlib/ebin/filename.beam b/bootstrap/lib/stdlib/ebin/filename.beam
index e4b462f5ff..95e4d69df0 100644
--- a/bootstrap/lib/stdlib/ebin/filename.beam
+++ b/bootstrap/lib/stdlib/ebin/filename.beam
diff --git a/bootstrap/lib/stdlib/ebin/gb_sets.beam b/bootstrap/lib/stdlib/ebin/gb_sets.beam
index 71da2376ba..3cb606350b 100644
--- a/bootstrap/lib/stdlib/ebin/gb_sets.beam
+++ b/bootstrap/lib/stdlib/ebin/gb_sets.beam
diff --git a/bootstrap/lib/stdlib/ebin/gb_trees.beam b/bootstrap/lib/stdlib/ebin/gb_trees.beam
index db59d5af19..d8579c63cd 100644
--- a/bootstrap/lib/stdlib/ebin/gb_trees.beam
+++ b/bootstrap/lib/stdlib/ebin/gb_trees.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen.beam b/bootstrap/lib/stdlib/ebin/gen.beam
index ccaabd8087..586973a973 100644
--- a/bootstrap/lib/stdlib/ebin/gen.beam
+++ b/bootstrap/lib/stdlib/ebin/gen.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen_event.beam b/bootstrap/lib/stdlib/ebin/gen_event.beam
index d22f9ec402..4788735049 100644
--- a/bootstrap/lib/stdlib/ebin/gen_event.beam
+++ b/bootstrap/lib/stdlib/ebin/gen_event.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen_fsm.beam b/bootstrap/lib/stdlib/ebin/gen_fsm.beam
index 119c20e1d7..f78a7368d5 100644
--- a/bootstrap/lib/stdlib/ebin/gen_fsm.beam
+++ b/bootstrap/lib/stdlib/ebin/gen_fsm.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen_server.beam b/bootstrap/lib/stdlib/ebin/gen_server.beam
index d6e5d223fb..8ebe9d7a3a 100644
--- a/bootstrap/lib/stdlib/ebin/gen_server.beam
+++ b/bootstrap/lib/stdlib/ebin/gen_server.beam
diff --git a/bootstrap/lib/stdlib/ebin/io.beam b/bootstrap/lib/stdlib/ebin/io.beam
index fd64aedde1..283c912800 100644
--- a/bootstrap/lib/stdlib/ebin/io.beam
+++ b/bootstrap/lib/stdlib/ebin/io.beam
diff --git a/bootstrap/lib/stdlib/ebin/io_lib.beam b/bootstrap/lib/stdlib/ebin/io_lib.beam
index c95a88c0f0..c52bf42077 100644
--- a/bootstrap/lib/stdlib/ebin/io_lib.beam
+++ b/bootstrap/lib/stdlib/ebin/io_lib.beam
diff --git a/bootstrap/lib/stdlib/ebin/io_lib_format.beam b/bootstrap/lib/stdlib/ebin/io_lib_format.beam
index 032e15eeb1..3fdf08d9e4 100644
--- a/bootstrap/lib/stdlib/ebin/io_lib_format.beam
+++ b/bootstrap/lib/stdlib/ebin/io_lib_format.beam
diff --git a/bootstrap/lib/stdlib/ebin/io_lib_fread.beam b/bootstrap/lib/stdlib/ebin/io_lib_fread.beam
index b4af88d5b5..62a4beeb2d 100644
--- a/bootstrap/lib/stdlib/ebin/io_lib_fread.beam
+++ b/bootstrap/lib/stdlib/ebin/io_lib_fread.beam
diff --git a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
index eed02e5fa5..9d37b74ad3 100644
--- a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
+++ b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
diff --git a/bootstrap/lib/stdlib/ebin/lib.beam b/bootstrap/lib/stdlib/ebin/lib.beam
index 1cc92d1b8d..8e594d97ad 100644
--- a/bootstrap/lib/stdlib/ebin/lib.beam
+++ b/bootstrap/lib/stdlib/ebin/lib.beam
diff --git a/bootstrap/lib/stdlib/ebin/lists.beam b/bootstrap/lib/stdlib/ebin/lists.beam
index 9db37e21d4..91297311b2 100644
--- a/bootstrap/lib/stdlib/ebin/lists.beam
+++ b/bootstrap/lib/stdlib/ebin/lists.beam
diff --git a/bootstrap/lib/stdlib/ebin/log_mf_h.beam b/bootstrap/lib/stdlib/ebin/log_mf_h.beam
index 58a8d68ed5..0c4b22c3df 100644
--- a/bootstrap/lib/stdlib/ebin/log_mf_h.beam
+++ b/bootstrap/lib/stdlib/ebin/log_mf_h.beam
diff --git a/bootstrap/lib/stdlib/ebin/maps.beam b/bootstrap/lib/stdlib/ebin/maps.beam
index d1aa8bb9dd..7533b56554 100644
--- a/bootstrap/lib/stdlib/ebin/maps.beam
+++ b/bootstrap/lib/stdlib/ebin/maps.beam
diff --git a/bootstrap/lib/stdlib/ebin/ms_transform.beam b/bootstrap/lib/stdlib/ebin/ms_transform.beam
index cc8503fdb3..2c0eb8a742 100644
--- a/bootstrap/lib/stdlib/ebin/ms_transform.beam
+++ b/bootstrap/lib/stdlib/ebin/ms_transform.beam
diff --git a/bootstrap/lib/stdlib/ebin/orddict.beam b/bootstrap/lib/stdlib/ebin/orddict.beam
index 665941a17c..f04348f982 100644
--- a/bootstrap/lib/stdlib/ebin/orddict.beam
+++ b/bootstrap/lib/stdlib/ebin/orddict.beam
diff --git a/bootstrap/lib/stdlib/ebin/otp_internal.beam b/bootstrap/lib/stdlib/ebin/otp_internal.beam
index 9e63d204b6..c9881fdd18 100644
--- a/bootstrap/lib/stdlib/ebin/otp_internal.beam
+++ b/bootstrap/lib/stdlib/ebin/otp_internal.beam
diff --git a/bootstrap/lib/stdlib/ebin/pool.beam b/bootstrap/lib/stdlib/ebin/pool.beam
index 72934a42d7..a06ae1717a 100644
--- a/bootstrap/lib/stdlib/ebin/pool.beam
+++ b/bootstrap/lib/stdlib/ebin/pool.beam
diff --git a/bootstrap/lib/stdlib/ebin/proc_lib.beam b/bootstrap/lib/stdlib/ebin/proc_lib.beam
index 0f732c8cae..568015b3e4 100644
--- a/bootstrap/lib/stdlib/ebin/proc_lib.beam
+++ b/bootstrap/lib/stdlib/ebin/proc_lib.beam
diff --git a/bootstrap/lib/stdlib/ebin/proplists.beam b/bootstrap/lib/stdlib/ebin/proplists.beam
index 2640cfe4ae..835df8c3a0 100644
--- a/bootstrap/lib/stdlib/ebin/proplists.beam
+++ b/bootstrap/lib/stdlib/ebin/proplists.beam
diff --git a/bootstrap/lib/stdlib/ebin/qlc.beam b/bootstrap/lib/stdlib/ebin/qlc.beam
index 652604afc0..436b62e50e 100644
--- a/bootstrap/lib/stdlib/ebin/qlc.beam
+++ b/bootstrap/lib/stdlib/ebin/qlc.beam
diff --git a/bootstrap/lib/stdlib/ebin/qlc_pt.beam b/bootstrap/lib/stdlib/ebin/qlc_pt.beam
index 90bc537b85..4032af0dd7 100644
--- a/bootstrap/lib/stdlib/ebin/qlc_pt.beam
+++ b/bootstrap/lib/stdlib/ebin/qlc_pt.beam
diff --git a/bootstrap/lib/stdlib/ebin/rand.beam b/bootstrap/lib/stdlib/ebin/rand.beam
index 6abb189f16..8370469ff4 100644
--- a/bootstrap/lib/stdlib/ebin/rand.beam
+++ b/bootstrap/lib/stdlib/ebin/rand.beam
diff --git a/bootstrap/lib/stdlib/ebin/random.beam b/bootstrap/lib/stdlib/ebin/random.beam
index f576b310df..fc351a800a 100644
--- a/bootstrap/lib/stdlib/ebin/random.beam
+++ b/bootstrap/lib/stdlib/ebin/random.beam
diff --git a/bootstrap/lib/stdlib/ebin/re.beam b/bootstrap/lib/stdlib/ebin/re.beam
index 875c4a5513..7b2e736a21 100644
--- a/bootstrap/lib/stdlib/ebin/re.beam
+++ b/bootstrap/lib/stdlib/ebin/re.beam
diff --git a/bootstrap/lib/stdlib/ebin/sets.beam b/bootstrap/lib/stdlib/ebin/sets.beam
index d8546de28d..4d4a2205f9 100644
--- a/bootstrap/lib/stdlib/ebin/sets.beam
+++ b/bootstrap/lib/stdlib/ebin/sets.beam
diff --git a/bootstrap/lib/stdlib/ebin/shell.beam b/bootstrap/lib/stdlib/ebin/shell.beam
index 9ad6d68ebd..8e64036c90 100644
--- a/bootstrap/lib/stdlib/ebin/shell.beam
+++ b/bootstrap/lib/stdlib/ebin/shell.beam
diff --git a/bootstrap/lib/stdlib/ebin/slave.beam b/bootstrap/lib/stdlib/ebin/slave.beam
index 532c46cd38..373d65f198 100644
--- a/bootstrap/lib/stdlib/ebin/slave.beam
+++ b/bootstrap/lib/stdlib/ebin/slave.beam
diff --git a/bootstrap/lib/stdlib/ebin/sofs.beam b/bootstrap/lib/stdlib/ebin/sofs.beam
index 976483833f..5514b0d4f9 100644
--- a/bootstrap/lib/stdlib/ebin/sofs.beam
+++ b/bootstrap/lib/stdlib/ebin/sofs.beam
diff --git a/bootstrap/lib/stdlib/ebin/stdlib.app b/bootstrap/lib/stdlib/ebin/stdlib.app
index 4a52c6a443..97910ada4f 100644
--- a/bootstrap/lib/stdlib/ebin/stdlib.app
+++ b/bootstrap/lib/stdlib/ebin/stdlib.app
@@ -20,7 +20,7 @@
 %%
 {application, stdlib,
  [{description, "ERTS  CXC 138 10"},
-  {vsn, "2.5"},
+  {vsn, "2.8"},
   {modules, [array,
 	     base64,
 	     beam_lib,
@@ -105,7 +105,7 @@
                dets]},
   {applications, [kernel]},
   {env, []},
-  {runtime_dependencies, ["sasl-2.4","kernel-4.0","erts-7.0","crypto-3.3",
+  {runtime_dependencies, ["sasl-2.6","kernel-4.1","erts-7.3","crypto-3.3",
 			  "compiler-5.0"]}
 ]}.
 
diff --git a/bootstrap/lib/stdlib/ebin/stdlib.appup b/bootstrap/lib/stdlib/ebin/stdlib.appup
index 689485f421..58af9ab142 100644
--- a/bootstrap/lib/stdlib/ebin/stdlib.appup
+++ b/bootstrap/lib/stdlib/ebin/stdlib.appup
@@ -16,9 +16,11 @@
 %% limitations under the License.
 %%
 %% %CopyrightEnd%
-{"2.5",
+{"2.8",
  %% Up from - max one major revision back
- [{<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}], %% 17.0-17.5
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]},       % OTP-19.*
+  {<<"2\\.[5-8](\\.[0-9]+)*">>,[restart_new_emulator]}],  % OTP-18.*
  %% Down to - max one major revision back
- [{<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}] %% 17.0-17.5
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]},      % OTP-19.*
+  {<<"2\\.[5-8](\\.[0-9]+)*">>,[restart_new_emulator]}]  % OTP-18.*
 }.
diff --git a/bootstrap/lib/stdlib/ebin/supervisor.beam b/bootstrap/lib/stdlib/ebin/supervisor.beam
index ce7b63a6c2..e03a3264a6 100644
--- a/bootstrap/lib/stdlib/ebin/supervisor.beam
+++ b/bootstrap/lib/stdlib/ebin/supervisor.beam
diff --git a/bootstrap/lib/stdlib/ebin/supervisor_bridge.beam b/bootstrap/lib/stdlib/ebin/supervisor_bridge.beam
index 4af6cc8f40..d2bfe6eea8 100644
--- a/bootstrap/lib/stdlib/ebin/supervisor_bridge.beam
+++ b/bootstrap/lib/stdlib/ebin/supervisor_bridge.beam
diff --git a/bootstrap/lib/stdlib/ebin/sys.beam b/bootstrap/lib/stdlib/ebin/sys.beam
index a569f8003f..d0162bdd07 100644
--- a/bootstrap/lib/stdlib/ebin/sys.beam
+++ b/bootstrap/lib/stdlib/ebin/sys.beam
diff --git a/bootstrap/lib/stdlib/ebin/timer.beam b/bootstrap/lib/stdlib/ebin/timer.beam
index 9887f37c70..8d8fcf8937 100644
--- a/bootstrap/lib/stdlib/ebin/timer.beam
+++ b/bootstrap/lib/stdlib/ebin/timer.beam
diff --git a/bootstrap/lib/stdlib/ebin/unicode.beam b/bootstrap/lib/stdlib/ebin/unicode.beam
index 16557d5631..17a318c4d4 100644
--- a/bootstrap/lib/stdlib/ebin/unicode.beam
+++ b/bootstrap/lib/stdlib/ebin/unicode.beam
diff --git a/bootstrap/lib/stdlib/ebin/win32reg.beam b/bootstrap/lib/stdlib/ebin/win32reg.beam
index b37ead63ba..2b4f9229ea 100644
--- a/bootstrap/lib/stdlib/ebin/win32reg.beam
+++ b/bootstrap/lib/stdlib/ebin/win32reg.beam
diff --git a/bootstrap/lib/stdlib/ebin/zip.beam b/bootstrap/lib/stdlib/ebin/zip.beam
index 83407cdb87..1a19b1f28a 100644
--- a/bootstrap/lib/stdlib/ebin/zip.beam
+++ b/bootstrap/lib/stdlib/ebin/zip.beam
diff --git a/bootstrap/lib/stdlib/include/erl_bits.hrl b/bootstrap/lib/stdlib/include/erl_bits.hrl
index 8405a55d55..2a54587a17 100644
--- a/bootstrap/lib/stdlib/include/erl_bits.hrl
+++ b/bootstrap/lib/stdlib/include/erl_bits.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2015. 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.
@@ -26,10 +26,10 @@
 -type bt_unit()  :: 1..256.
 
 -record(bittype, {
-          type   :: bt_type(),
-	  unit   :: bt_unit(),       %% element unit
-          sign   :: bt_sign(),
-          endian :: bt_endian()
+          type   :: bt_type() | 'undefined',
+	  unit   :: bt_unit() | 'undefined',       %% element unit
+          sign   :: bt_sign() | 'undefined',
+          endian :: bt_endian() | 'undefined'
          }).
 
 -record(bitdefault, {
diff --git a/configure.in b/configure.in
index 64b0bdac6d..8a7f372a50 100644
--- a/configure.in
+++ b/configure.in
@@ -208,10 +208,6 @@ AS_HELP_STRING([--disable-threads], [disable async thread support]))
 AC_ARG_ENABLE(dirty-schedulers,
 AS_HELP_STRING([--enable-dirty-schedulers], [enable dirty scheduler support]))
 
-AC_ARG_ENABLE(halfword-emulator,
-AS_HELP_STRING([--enable-halfword-emulator],
-               [enable halfword emulator (only for 64bit builds). Note: Halfword emulator is marked as deprecated and scheduled for removal in future major release.]))
-
 AC_ARG_ENABLE(smp-support,
 AS_HELP_STRING([--enable-smp-support], [enable smp support])
 AS_HELP_STRING([--disable-smp-support], [disable smp support]))
@@ -238,8 +234,8 @@ AS_HELP_STRING([--enable-native-libs],
                [compile Erlang libraries to native code]))
 
 AC_ARG_WITH(dynamic-trace,
-AS_HELP_STRING([--with-dynamic-trace={dtrace|systemtap}],
-	       [specify use of dynamic trace framework, dtrace or systemtap])
+AS_HELP_STRING([--with-dynamic-trace={dtrace|lttng|systemtap}],
+	       [specify use of dynamic trace framework, dtrace, lttng or systemtap])
 AS_HELP_STRING([--without-dynamic-trace], 
                [don't enable any dynamic tracing (default)]))
 AC_ARG_ENABLE(vm-probes,
@@ -271,7 +267,7 @@ AC_ARG_WITH(ssl-rpath,
 AS_HELP_STRING([--with-ssl-rpath=yes|no|PATHS],
                [runtime library path for OpenSSL. Default is 'yes', which equates to a
 	       number of standard locations. If 'no', then no runtime
-	       library paths wil be used. Anything else should be a
+	       library paths will be used. Anything else should be a
 	       comma separated list of paths.]))
 
 AC_ARG_ENABLE(dynamic-ssl-lib,
@@ -282,6 +278,10 @@ AC_ARG_ENABLE(builtin-zlib,
 AS_HELP_STRING([--enable-builtin-zlib],
                [force use of our own built-in zlib]))
 
+AC_ARG_ENABLE(sharing-preserving,
+AS_HELP_STRING([--enable-sharing-preserving],
+               [enable copying of terms without destroying sharing]))
+
 dnl This functionality has been lost along the way... :(
 dnl It could perhaps be nice to reintroduce some day; therefore,
 dnl it is not removed just commented out.
@@ -297,24 +297,6 @@ dnl     *)  erl_mandir='$(erlang_libdir)/man' ;;
 dnl   esac ], erl_mandir='$(erlang_libdir)/man')
 dnl AC_SUBST(erl_mandir)
 
-AC_ARG_ENABLE(darwin-universal,
-AS_HELP_STRING([--enable-darwin-universal],
-               [build universal binaries on darwin i386]),
-[ case "$enableval" in
-    no) enable_darwin_universal=no ;;
-    *)  enable_darwin_univeral=yes ;;
-  esac
-],enable_darwin_universal=no)
-
-
-AC_ARG_ENABLE(darwin-64bit,
-AS_HELP_STRING([--enable-darwin-64bit], [build 64bit binaries on darwin]),
-[ case "$enableval" in
-    no) enable_darwin_64bit=no ;;
-    *)  enable_darwin_64bit=yes ;;
-  esac
-],enable_darwin_64bit=no)
-
 AC_ARG_ENABLE(m64-build,
 AS_HELP_STRING([--enable-m64-build],
                [build 64bit binaries using the -m64 flag to (g)cc]),
@@ -329,12 +311,7 @@ AS_HELP_STRING([--enable-m32-build],
                [build 32bit binaries using the -m32 flag to (g)cc]),
 [ case "$enableval" in
     no) enable_m32_build=no ;;
-    *)
-	if test X${enable_darwin_64bit} = Xyes -o  X${enable_m64_build} = Xyes;
-	then
-		AC_MSG_ERROR([(--enable-darwin-64bit or --enable-m64-build) and --enable-m32-build are mutually exclusive]) ;
-	fi ;
-	enable_m32_build=yes ;;
+    *)	enable_m32_build=yes ;;
   esac
 ],enable_m32_build=no)
 
@@ -342,42 +319,6 @@ AC_ARG_WITH(libatomic_ops,
 	    AS_HELP_STRING([--with-libatomic_ops=PATH],
 			   [specify and prefer usage of libatomic_ops in the ethread library]))
 
-dnl OK, we might have darwin switches off different kinds, lets 
-dnl check it all before continuing.
-TMPSYS=`uname -s`-`uname -m`
-if test X${enable_darwin_universal} = Xyes; then
-	if test X${enable_darwin_64bit} = Xyes; then
-		AC_MSG_ERROR([--enable-darwin-universal and --enable-darwin-64bit mutually exclusive])
-	fi
-	enable_hipe=no
-	CFLAGS="-arch i386 -arch ppc $CFLAGS"
-	export CFLAGS
-	LDFLAGS="-arch i386 -arch ppc $LDFLAGS"
-	export LDFLAGS
-fi
-if test X${enable_darwin_64bit} = Xyes; then
-	case "$TMPSYS" in
-	    Darwin-i386|Darwin-x86_64)
-		;;
-	    Darwin*)
-		AC_MSG_ERROR([--enable-darwin-64bit only supported on x86 hosts])
-		;;
-	    *)
-		AC_MSG_ERROR([--enable-darwin-64bit only supported on Darwin])
-		;;
-	esac
-	enable_hipe=no
-	CFLAGS="-m64 $CFLAGS"
-	export CFLAGS
-	LDFLAGS="-m64 $LDFLAGS"
-	export LDFLAGS
-elif test X"$TMPSYS" '=' X"Darwin-i386"; then
-	CFLAGS="-m32 $CFLAGS"
-	export CFLAGS
-	LDFLAGS="-m32 $LDFLAGS"
-	export LDFLAGS
-fi
-
 m4_define(DEFAULT_SANITIZERS, [address,undefined])
 AC_ARG_ENABLE(sanitizers,
     AS_HELP_STRING(
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
index 3d52538933..017fdbd589 100644
--- a/erts/aclocal.m4
+++ b/erts/aclocal.m4
@@ -74,21 +74,6 @@ AC_ARG_VAR(erl_xcomp_clock_gettime_cpu_time, [clock_gettime() can be used for re
 AC_ARG_VAR(erl_xcomp_after_morecore_hook, [__after_morecore_hook can track malloc()s core memory usage: yes|no (only used when cross compiling)])
 AC_ARG_VAR(erl_xcomp_dlsym_brk_wrappers, [dlsym(RTLD_NEXT, _) brk wrappers can track malloc()s core memory usage: yes|no (only used when cross compiling)])
 
-dnl Cross compilation variables for OSE
-AC_ARG_VAR(erl_xcomp_ose_ldflags_pass1, [Linker flags for the OSE module (pass 1) (only used when cross compiling for OSE)])
-AC_ARG_VAR(erl_xcomp_ose_ldflags_pass2, [Linker flags for the OSE module (pass 2) (only used when cross compiling for OSE)])
-AC_ARG_VAR(erl_xcomp_ose_OSEROOT, [OSE installation root directory (only used when cross compiling for OSE)])
-AC_ARG_VAR(erl_xcomp_ose_STRIP, [Strip utility shipped with the OSE distribution(only used when cross compiling for OSE)])
-AC_ARG_VAR(erl_xcomp_ose_LM_POST_LINK, [OSE postlink tool (only used when cross compiling for OSE)])
-AC_ARG_VAR(erl_xcomp_ose_LM_SET_CONF, [Sets the configuration for an OSE load module (only used when cross compiling for OSE)])
-AC_ARG_VAR(erl_xcomp_ose_LM_ELF_SIZE, [Prints the section size information for an OSE load module (only used when cross compiling for OSE)])
-AC_ARG_VAR(erl_xcomp_ose_LM_LCF, [OSE load module linker configuration file (only used when cross compiling for OSE)])
-AC_ARG_VAR(erl_xcomp_ose_BEAM_LM_CONF, [BEAM OSE load module default configuration file (only used when cross compiling for OSE)])
-AC_ARG_VAR(erl_xcomp_ose_EPMD_LM_CONF, [EPMD OSE load module default configuration file (only used when cross compiling for OSE)])
-AC_ARG_VAR(erl_xcomp_ose_RUN_ERL_LM_CONF, [run_erl_lm OSE load module default configuration file (only used when cross compiling for OSE)])
-AC_ARG_VAR(erl_xcomp_ose_CONFD, [OSE confd source file])
-AC_ARG_VAR(erl_xcomp_ose_CRT0_LM, [OSE crt0 lm source file])
-
 ])
 
 AC_DEFUN(ERL_XCOMP_SYSROOT_INIT,
@@ -503,8 +488,6 @@ AC_CACHE_VAL(ac_cv_sys_ipv6_support,
 #ifdef __WIN32__
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#elif __OSE__
-#error "no ipv6"
 #else
 #include <netinet/in.h>
 #endif],
@@ -517,8 +500,6 @@ else
 #ifdef __WIN32__
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#elif __OSE__
-#error "no ipv6"
 #else
 #include <netinet/in.h>
 #endif],
@@ -991,12 +972,6 @@ if test "X$host_os" = "Xwin32"; then
     THR_LIBS=
     THR_LIB_NAME=win32_threads
     THR_LIB_TYPE=win32_threads
-elif test "X$host_os" = "Xose"; then
-    AC_MSG_RESULT(yes)
-    THR_DEFS="-DOSE_THREADS"
-    THR_LIBS=
-    THR_LIB_NAME=ose_threads
-    THR_LIB_TYPE=ose_threads
 else
     AC_MSG_RESULT(no)
     THR_DEFS=
@@ -1583,22 +1558,9 @@ case "$THR_LIB_NAME" in
 	fi
 	;;
 
-    pthread|ose_threads)
-        case "$THR_LIB_NAME" in
-	     pthread)
-		ETHR_THR_LIB_BASE_DIR=pthread
-		AC_DEFINE(ETHR_PTHREADS, 1, [Define if you have pthreads])
-		;;
-	     ose_threads)
-		AC_DEFINE(ETHR_OSE_THREADS, 1,
-		   [Define if you have OSE style threads])
-		ETHR_THR_LIB_BASE_DIR=ose
-		AC_CHECK_HEADER(ose_spi/ose_spi.h,
-		  AC_DEFINE(HAVE_OSE_SPI_H, 1,
-		    [Define if you have the "ose_spi/ose_spi.h" header file.]))
-		;;
-	esac
-	if test "x$THR_LIB_NAME" = "xpthread"; then
+    pthread)
+	ETHR_THR_LIB_BASE_DIR=pthread
+	AC_DEFINE(ETHR_PTHREADS, 1, [Define if you have pthreads])
 	case $host_os in
 	    openbsd*)
 		# The default stack size is insufficient for our needs
@@ -1657,7 +1619,6 @@ case "$THR_LIB_NAME" in
 	    *) ;;
 	esac
 
-	fi
 	dnl We sometimes need ETHR_DEFS in order to find certain headers
 	dnl (at least for pthread.h on osf1).
 	saved_cppflags="$CPPFLAGS"
@@ -1702,7 +1663,6 @@ case "$THR_LIB_NAME" in
 	dnl
 	dnl Check for functions
 	dnl
-	if test "x$THR_LIB_NAME" = "xpthread"; then
 	AC_CHECK_FUNC(pthread_spin_lock, \
 			[ethr_have_native_spinlock=yes \
 			 AC_DEFINE(ETHR_HAVE_PTHREAD_SPIN_LOCK, 1, \
@@ -1922,8 +1882,6 @@ case "$THR_LIB_NAME" in
 	esac
 	CFLAGS=$old_CFLAGS
 
-        fi ## test "x$THR_LIB_NAME" = "xpthread"
-
 	if test "X$disable_native_ethr_impls" = "Xyes"; then
 	    ethr_have_native_atomics=no
 	else
@@ -2117,63 +2075,159 @@ esac
 
 case "$GCC-$host_cpu" in
   yes-i86pc | yes-i*86 | yes-x86_64 | yes-amd64)
+
+    if test $ac_cv_sizeof_void_p = 4; then
+       dw_cmpxchg="cmpxchg8b"
+    else
+       dw_cmpxchg="cmpxchg16b"
+    fi
+
     gcc_dw_cmpxchg_asm=no
-    AC_MSG_CHECKING([for gcc double word cmpxchg asm support])    
-    AC_TRY_COMPILE([],
+    gcc_pic_dw_cmpxchg_asm=no
+    gcc_cflags_pic=no
+    gcc_cmpxchg8b_pic_no_clobber_ebx=no
+    gcc_cmpxchg8b_pic_no_clobber_ebx_register_shortage=no
+
+    save_CFLAGS="$CFLAGS"
+
+    # Check if it works out of the box using passed CFLAGS
+    # and with -fPIC added to CFLAGS if the passed CFLAGS
+    # doesn't trigger position independent code
+    pic_cmpxchg=unknown
+    while true; do
+
+        case $pic_cmpxchg in
+	  yes) pic_text="pic ";;
+	  *) pic_text="";;
+	esac
+
+	AC_MSG_CHECKING([for gcc $pic_text$dw_cmpxchg plain asm support])    
+
+	plain_cmpxchg=no
+    	AC_TRY_COMPILE([],
 	[
     char xchgd;
     long new[2], xchg[2], *p;		  
     __asm__ __volatile__(
-#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__
-	"pushl %%ebx\n\t"
-	"movl %8, %%ebx\n\t"
-#endif
 #if ETHR_SIZEOF_PTR == 4
 	"lock; cmpxchg8b %0\n\t"
 #else
 	"lock; cmpxchg16b %0\n\t"
 #endif
 	"setz %3\n\t"
-#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__
-	"popl %%ebx\n\t"
-#endif
-	: "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=c"(xchgd)
-	: "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "3"(new[1]),
-#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__
-	  "r"(new[0])
-#else
-	  "b"(new[0])
-#endif
+	: "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=q"(xchgd)
+	: "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "c"(new[1]), "b"(new[0])
 	: "cc", "memory");
+	],
+	[plain_cmpxchg=yes])
+
+	AC_MSG_RESULT([$plain_cmpxchg])
 
+	if test $pic_cmpxchg = yes; then
+	   gcc_pic_dw_cmpxchg_asm=$plain_cmpxchg
+	   break
+	fi
+
+	gcc_dw_cmpxchg_asm=$plain_cmpxchg
+
+    	# If not already compiling to position independent
+	# code add -fPIC to CFLAGS and do it again. This
+	# since we want also want to know how to compile
+	# to position independent code since this might
+	# cause problems with the use of the EBX register
+	# as input to the asm on 32-bit x86 and old gcc
+	# compilers (gcc vsn < 5).
+
+    	AC_TRY_COMPILE([],
+	[
+#if !defined(__PIC__) || !__PIC__
+#  error no pic
+#endif
 	],
-	[gcc_dw_cmpxchg_asm=yes])
-    if test $gcc_dw_cmpxchg_asm = no && test $ac_cv_sizeof_void_p = 4; then
+	[pic_cmpxchg=yes
+	 gcc_cflags_pic=yes],
+	[pic_cmpxchg=no])
+
+	if test $pic_cmpxchg = yes; then
+	   gcc_pic_dw_cmpxchg_asm=$gcc_dw_cmpxchg_asm
+	   break
+	fi
+
+	CFLAGS="$save_CFLAGS -fPIC"
+	pic_cmpxchg=yes
+
+    done
+
+    if test $gcc_pic_dw_cmpxchg_asm = no && test $ac_cv_sizeof_void_p = 4; then
+
+      AC_MSG_CHECKING([for gcc pic cmpxchg8b asm support with EBX workaround])
+
+      # Check if we can work around it by managing the ebx
+      # register explicitly in the asm...
+
       AC_TRY_COMPILE([],
+	[
+    char xchgd;
+    long new[2], xchg[2], *p;		  
+    __asm__ __volatile__(
+	"pushl %%ebx\n\t"
+	"movl %8, %%ebx\n\t"
+	"lock; cmpxchg8b %0\n\t"
+	"setz %3\n\t"
+	"popl %%ebx\n\t"
+	: "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=q"(xchgd)
+	: "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "c"(new[1]), "r"(new[0])
+	: "cc", "memory");
+	],
+	[gcc_pic_dw_cmpxchg_asm=yes
+	 gcc_cmpxchg8b_pic_no_clobber_ebx=yes])     
+
+      AC_MSG_RESULT([$gcc_pic_dw_cmpxchg_asm])
+
+      if test $gcc_pic_dw_cmpxchg_asm = no; then
+
+      	AC_MSG_CHECKING([for gcc pic cmpxchg8b asm support with EBX and register shortage workarounds])
+        # If no optimization is enabled we sometimes get a
+	# register shortage. Check if we can work around
+	# this...
+
+      	AC_TRY_COMPILE([],
 	  [
       char xchgd;
       long new[2], xchg[2], *p;
-#if !defined(__PIC__) || !__PIC__
-#  error nope
-#endif
       __asm__ __volatile__(
-    	  "pushl %%ebx\n\t"
-	  "movl (%7), %%ebx\n\t"
-	  "movl 4(%7), %%ecx\n\t"
-	  "lock; cmpxchg8b %0\n\t"
-  	  "setz %3\n\t"
-	  "popl %%ebx\n\t"
-	  : "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=c"(xchgd)
-	  : "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "3"(new)
+	"pushl %%ebx\n\t"
+	"movl (%7), %%ebx\n\t"
+	"movl 4(%7), %%ecx\n\t"
+	"lock; cmpxchg8b %0\n\t"
+	"setz %3\n\t"
+	"popl %%ebx\n\t"
+	: "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=c"(xchgd)
+	: "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "r"(new)
 	: "cc", "memory");
 
 	],
-	[gcc_dw_cmpxchg_asm=yes])
-      if test "$gcc_dw_cmpxchg_asm" = "yes"; then
-        AC_DEFINE(ETHR_CMPXCHG8B_REGISTER_SHORTAGE, 1, [Define if you get a register shortage with cmpxchg8b and position independent code])
+	[gcc_pic_dw_cmpxchg_asm=yes
+	 gcc_cmpxchg8b_pic_no_clobber_ebx=yes
+	 gcc_cmpxchg8b_pic_no_clobber_ebx_register_shortage=yes])
+
+        AC_MSG_RESULT([$gcc_pic_dw_cmpxchg_asm])
+      fi
+
+      if test $gcc_cflags_pic = yes; then
+        gcc_dw_cmpxchg_asm=$gcc_pic_dw_cmpxchg_asm
       fi
+ 
+   fi
+
+    CFLAGS="$save_CFLAGS"
+
+    if test "$gcc_cmpxchg8b_pic_no_clobber_ebx" = "yes"; then
+      AC_DEFINE(ETHR_CMPXCHG8B_PIC_NO_CLOBBER_EBX, 1, [Define if gcc wont let you clobber ebx with cmpxchg8b and position independent code])
+    fi
+    if test "$gcc_cmpxchg8b_pic_no_clobber_ebx_register_shortage" = "yes"; then
+      AC_DEFINE(ETHR_CMPXCHG8B_REGISTER_SHORTAGE, 1, [Define if you get a register shortage with cmpxchg8b and position independent code])
     fi
-    AC_MSG_RESULT([$gcc_dw_cmpxchg_asm])
     if test "$gcc_dw_cmpxchg_asm" = "yes"; then
       AC_DEFINE(ETHR_GCC_HAVE_DW_CMPXCHG_ASM_SUPPORT, 1, [Define if you use a gcc that supports the double word cmpxchg instruction])
     fi;;
diff --git a/erts/configure.in b/erts/configure.in
index 4fb725ff00..0257079c3b 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -106,7 +106,6 @@ AC_CONFIG_HEADER($host/config.h:config.h.in include/internal/$host/ethread_heade
 dnl ----------------------------------------------------------------------
 dnl Optional features.
 dnl ----------------------------------------------------------------------
-enable_child_waiter_thread=no
 ENABLE_ALLOC_TYPE_VARS=
 AC_SUBST(ENABLE_ALLOC_TYPE_VARS)
 
@@ -143,14 +142,6 @@ AS_HELP_STRING([--enable-dirty-schedulers], [enable dirty scheduler support]),
     *)  enable_dirty_schedulers=yes ;;
   esac ], enable_dirty_schedulers=no)
 
-AC_ARG_ENABLE(halfword-emulator,
-AS_HELP_STRING([--enable-halfword-emulator],
-               [enable halfword emulator (only for 64bit builds). Note: Halfword emulator is marked as deprecated and scheduled for removal in future major release.]),
-[ case "$enableval" in
-    no) enable_halfword_emualtor=no ;;
-    *)  enable_halfword_emulator=yes ;;
-  esac ], enable_halfword_emulator=unknown)
-
 AC_ARG_ENABLE(smp-support,
 AS_HELP_STRING([--enable-smp-support], [enable smp support])
 AS_HELP_STRING([--disable-smp-support], [disable smp support]),
@@ -224,24 +215,6 @@ AS_HELP_STRING([--enable-fp-exceptions],
   esac
 ],enable_fp_exceptions=auto)
 
-AC_ARG_ENABLE(darwin-universal,
-AS_HELP_STRING([--enable-darwin-universal],
-               [build universal binaries on darwin i386]),
-[ case "$enableval" in
-    no) enable_darwin_universal=no ;;
-    *)  enable_darwin_univeral=yes ;;
-  esac
-],enable_darwin_universal=no)
-
-
-AC_ARG_ENABLE(darwin-64bit,
-AS_HELP_STRING([--enable-darwin-64bit], [build 64bit binaries on darwin]),
-[ case "$enableval" in
-    no) enable_darwin_64bit=no ;;
-    *)  enable_darwin_64bit=yes ;;
-  esac
-],enable_darwin_64bit=no)
-
 AC_ARG_ENABLE(m64-build,
 AS_HELP_STRING([--enable-m64-build],
                [build 64bit binaries using the -m64 flag to (g)cc]),
@@ -256,18 +229,13 @@ AS_HELP_STRING([--enable-m32-build],
                [build 32bit binaries using the -m32 flag to (g)cc]),
 [ case "$enableval" in
     no) enable_m32_build=no ;;
-    *)
-	if test X${enable_darwin_64bit} = Xyes -o  X${enable_m64_build} = Xyes;
-	then
-		AC_MSG_ERROR([(--enable-darwin-64bit or --enable-m64-build) and --enable-m32-build are mutually exclusive]) ;
-	fi ;
-	enable_m32_build=yes ;;
+    *)	enable_m32_build=yes ;;
   esac
 ],enable_m32_build=no)
 
 AC_ARG_WITH(dynamic-trace,
-AS_HELP_STRING([--with-dynamic-trace={dtrace|systemtap}],
-	       [specify use of dynamic trace framework, dtrace or systemtap])
+AS_HELP_STRING([--with-dynamic-trace={dtrace|lttng|systemtap}],
+	       [specify use of dynamic trace framework, dtrace, lttng or systemtap])
 AS_HELP_STRING([--without-dynamic-trace], 
                [don't enable any dynamic tracing (default)]))
 
@@ -277,6 +245,10 @@ fi
 
 case "$with_dynamic_trace" in
      no) DYNAMIC_TRACE_FRAMEWORK=;;
+     lttng)
+            AC_DEFINE(USE_LTTNG,[1],
+                      [Define if you want to use lttng for dynamic tracing])
+            DYNAMIC_TRACE_FRAMEWORK=lttng;;
      dtrace) 
 	    AC_DEFINE(USE_DTRACE,[1],
 		[Define if you want to use dtrace for dynamic tracing])
@@ -312,10 +284,12 @@ AS_HELP_STRING([--enable-vm-probes],
 			fi)
 
 AC_SUBST(USE_VM_PROBES)
-if test X"$use_vm_probes" = X"yes"; then
-   USE_VM_PROBES=yes
-   AC_DEFINE(USE_VM_PROBES,[1],
-	     [Define to enable VM dynamic trace probes])
+if test X"$DYNAMIC_TRACE_FRAMEWORK" != X"lttng"; then
+    if test X"$use_vm_probes" = X"yes"; then
+        USE_VM_PROBES=yes
+        AC_DEFINE(USE_VM_PROBES,[1],
+                  [Define to enable VM dynamic trace probes])
+    fi
 fi
 
 AC_ARG_WITH(assumed-cache-line-size,
@@ -351,6 +325,21 @@ AS_HELP_STRING([--disable-saved-compile-time], [disable saved compile time]),
 
 AC_DEFINE_UNQUOTED(ERTS_SAVED_COMPILE_TIME, $save_compile_time, [Save compile time?])
 
+AC_ARG_WITH(microstate-accounting,
+AS_HELP_STRING([--with-microstate-accounting={yes|extra}],
+               [enable microstate account, possibly with extra detailed states])
+AS_HELP_STRING([--without-microstate-accounting],
+               [don't enable microstate accounting]),
+[],[with_microstate_accounting=yes])
+
+case "$with_microstate_accounting" in
+    yes) AC_DEFINE(ERTS_ENABLE_MSACC,[1],
+		[Define as 1 if you want to enable microstate accounting, 2 if you want extra states]) ;;
+    extra) AC_DEFINE(ERTS_ENABLE_MSACC,[2],
+		[Define as 1 if you want to enable microstate accounting, 2 if you want extra states]) ;;
+    *) ;;
+esac
+
 dnl Magic test for clearcase.
 OTP_RELEASE=
 if test "${ERLANG_COMMERCIAL_BUILD}" != ""; then
@@ -371,42 +360,7 @@ AC_MSG_CHECKING([OTP version])
 AC_MSG_RESULT([$OTP_VERSION])
 AC_SUBST(OTP_VERSION)
 
-dnl OK, we might have darwin switches off different kinds, lets 
-dnl check it all before continuing.
-TMPSYS=`uname -s`-`uname -m`
-if test X${enable_darwin_universal} = Xyes; then
-	if test X${enable_darwin_64bit} = Xyes; then
-		AC_MSG_ERROR([--enable-darwin-universal and --enable-darwin-64bit mutually exclusive])
-	fi
-	enable_hipe=no
-	case $CFLAGS in
-		*-arch\ ppc*)
-			;;
-		*)
-			CFLAGS="-arch ppc $CFLAGS"
-			;;
-	esac
-	case $CFLAGS in
-		*-arch\ i386*)
-			;;
-		*)
-			CFLAGS="-arch i386 $CFLAGS"
-			;;
-	esac
-fi
-if test X${enable_darwin_64bit} = Xyes; then
-	case "$TMPSYS" in
-	    Darwin-i386|Darwin-x86_64)
-		;;
-	    Darwin*)
-		AC_MSG_ERROR([--enable-darwin-64bit only supported on x86 hosts])
-		;;
-	    *)
-		AC_MSG_ERROR([--enable-darwin-64bit only supported on Darwin])
-		;;
-	esac
-fi
-if test X${enable_darwin_64bit} = Xyes -o X${enable_m64_build} = Xyes; then
+if test X${enable_m64_build} = Xyes; then
 	case $CFLAGS in
 		*-m64*)
 			;;
@@ -468,11 +422,8 @@ case $host_os in
     win32)
 	# The ethread library requires _WIN32_WINNT of at least 0x0403.
 	# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-	CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0501 -DWINVER=0x0501"
+	CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600 -DWINVER=0x0600"
 	;;
-    darwin*)
-        CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE"
-        ;;
     *)
 	;;
 esac
@@ -578,6 +529,7 @@ fi
 if test "x$GCC" = xyes; then
   # Treat certain GCC warnings as errors
   LM_TRY_ENABLE_CFLAG([-Werror=return-type], [WERRORFLAGS])
+  LM_TRY_ENABLE_CFLAG([-Werror=implicit], [WERRORFLAGS])
 
   # until the emulator can handle this, I suggest we turn it off!
   #WFLAGS="-Wall -Wshadow -Wcast-qual -Wmissing-declarations"
@@ -731,32 +683,13 @@ case $ARCH-$OPSYS in
 		esac
 		;;
 	*-darwin*)
-		if test X${enable_darwin_universal} = Xyes; then
-			AC_MSG_NOTICE([Adjusting LDFLAGS for universal binaries])
-			
-			case $LDFLAGS in
-				*-arch\ ppc*)
-					;;
-				*)
-					LDFLAGS="-arch ppc $LDFLAGS"
-					;;
-			esac
-			case $LDFLAGS in
-				*-arch\ i386*)
-					;;
-				*)
-					LDFLAGS="-arch i386 $LDFLAGS"
-					;;
-			esac
-		else
-			case $LDFLAGS in
-				*-m32*)
-					;;
-				*)
-					LDFLAGS="-m32 $LDFLAGS"
-					;;
-			esac
-		fi
+		case $LDFLAGS in
+			*-m32*)
+				;;
+			*)
+				LDFLAGS="-m32 $LDFLAGS"
+				;;
+		esac
 		;;
 	*)
 		if test X${enable_m64_build} = Xyes; then
@@ -796,36 +729,18 @@ esac
 	
 AC_SUBST(LIBCARBON)
 
-dnl Check if we should/can build a halfword emulator
-
-AC_MSG_CHECKING(if we are building a halfword emulator (32bit heap on 64bit machine))
-if test "$enable_halfword_emulator" = "yes"; then
-	if test "$ARCH" = "amd64"; then
-		AC_DEFINE(HALFWORD_HEAP_EMULATOR, [1],
-			  [Define if building a halfword-heap 64bit emulator])
-		ENABLE_ALLOC_TYPE_VARS="$ENABLE_ALLOC_TYPE_VARS halfword"
-		AC_MSG_RESULT([yes])
+dnl Check if we should/can build a sharing-preserving emulator
 
-		test -f "$ERL_TOP/erts/CONF_INFO" ||
-		    echo "" > "$ERL_TOP/erts/CONF_INFO"
-		cat >> $ERL_TOP/erts/CONF_INFO <<EOF
-
-                 The HALFWORD emulator has been enabled.
-                 This is a DEPRECATED feature scheduled for removal
-                 in a future major release.
-
-EOF
-	else
-		AC_MSG_ERROR(no; halfword emulator not supported on this architecture)
-	fi
+AC_MSG_CHECKING(if we are building a sharing-preserving emulator)
+if test "$enable_sharing_preserving" = "yes"; then
+        AC_DEFINE(SHCOPY, [1],
+		  [Define if building a sharing-preserving emulator])
+	AC_MSG_RESULT([yes])
 else
 	AC_MSG_RESULT([no])
 fi
 
 
-
-
-
 dnl some tests below will call this if we haven't already - and autoconf
 dnl can't handle those tests being done conditionally at runtime
 AC_PROG_CPP
@@ -944,10 +859,7 @@ dnl what the user say. This might not be the right way to do it, but
 dnl for now that is the way we do it.
 USER_LD=$LD
 USER_LDFLAGS="$LDFLAGS"
-case $host in
-   *ose) ;;
-   *) LD='$(CC)' ;;
-esac
+LD='$(CC)'
 AC_SUBST(LD)
 
 LDFLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
@@ -962,8 +874,6 @@ dnl This is the os flavour, should be unix, ose, vxworks or win32
 case $host in
    win32)
       ERLANG_OSTYPE=win32 ;;
-   *ose)
-      ERLANG_OSTYPE=ose ;;
    *)
       ERLANG_OSTYPE=unix ;;
 esac
@@ -1272,7 +1182,7 @@ case "$enable_threads"-"$found_threads" in
 	AC_MSG_RESULT(yes; enabled by user) ;;
     unknown-yes)
 	case $host_os in
-	    solaris*|linux*|darwin*|win32|ose)
+	    solaris*|linux*|darwin*|win32)
 		emu_threads=yes
 		AC_MSG_RESULT(yes; default on this platform)
 		;;
@@ -1334,11 +1244,7 @@ else
 	    AC_MSG_RESULT(no)
 	fi
 
-	disable_child_waiter_thread=no
 	case $host_os in
-	    solaris*)
-		enable_child_waiter_thread=yes
-		;;
 	    linux*)
 		AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
 		if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
@@ -1348,16 +1254,6 @@ else
 		else
 			AC_MSG_RESULT(no)
 		fi
-		if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
-		    # Child waiter thread cannot be enabled
-		    disable_child_waiter_thread=yes
-		    enable_child_waiter_thread=no
-		fi
-		;;
-	    win32|ose)
-		# Child waiter thread cannot be enabled
-		disable_child_waiter_thread=yes
-		enable_child_waiter_thread=no
 		;;
 	    *)
 		;;
@@ -1377,24 +1273,6 @@ else
 	    esac
 	done
 	EMU_THR_DEFS=$new_emu_thr_defs
-
-	AC_MSG_CHECKING(whether the child waiter thread should be enabled)
-	if test $enable_child_waiter_thread = yes; then
-	    AC_DEFINE(ENABLE_CHILD_WAITER_THREAD,[1],
-		[Define if you want to enable child waiter thread])
-	    AC_MSG_RESULT(yes)
-	else
-	    case $ERTS_BUILD_SMP_EMU-$disable_child_waiter_thread in
-		yes-no)
-		    AC_MSG_RESULT([yes on SMP build, but not on non-SMP build]);;
-		*-yes)
-	    	    AC_DEFINE(DISABLE_CHILD_WAITER_THREAD,[1],
-			[Define if you want to disable child waiter thread])
-		    AC_MSG_RESULT(no);;
-		*)
-		    AC_MSG_RESULT(no);;
-	    esac
-	fi
 fi
 
 AC_SUBST(EMU_THR_LIB_NAME)
@@ -1526,19 +1404,27 @@ dnl
 #	   if -lsocket doesn't work by itself.
 #--------------------------------------------------------------------
 
+tk_oldLibs=$LIBS
 erl_checkBoth=0
+SOCKET_LIBS=""
 AC_CHECK_FUNC(connect, erl_checkSocket=0, erl_checkSocket=1)
 if test "$erl_checkSocket" = 1; then
-    AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", erl_checkBoth=1)
+    AC_CHECK_LIB(socket, main, SOCKET_LIBS="-lsocket", erl_checkBoth=1)
 fi
+
 if test "$erl_checkBoth" = 1; then
-    tk_oldLibs=$LIBS
     LIBS="$LIBS -lsocket -lnsl"
-    AC_CHECK_FUNC(accept, erl_checkNsl=0, [LIBS=$tk_oldLibs])
+    AC_CHECK_FUNC(accept, SOCKET_LIBS="-lsocket -lnsl")
 fi
-AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
+
+LIBS="$tk_oldLibs $SOCKET_LIBS"
+AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [SOCKET_LIBS="$SOCKET_LIBS -lnsl"]))
 AC_CHECK_FUNC(gethostbyname_r,have_gethostbyname_r=yes)
 
+LIBS="$tk_oldLibs $SOCKET_LIBS"
+
+AC_SUBST(SOCKET_LIBS)
+
 dnl
 dnl These gethostbyname thingies use old style AC_DEFINE for BC with ancient 
 dnl autoconf...
@@ -1666,7 +1552,7 @@ AC_CHECK_HEADERS(fcntl.h limits.h unistd.h syslog.h dlfcn.h ieeefp.h \
                  sys/ioctl.h sys/time.h sys/uio.h \
                  sys/socket.h sys/sockio.h sys/socketio.h \
                  net/errno.h malloc.h arpa/nameser.h libdlpi.h \
-		 pty.h util.h utmp.h langinfo.h poll.h sdkddkver.h)
+		 pty.h util.h libutil.h utmp.h langinfo.h poll.h sdkddkver.h)
 
 AC_CHECK_MEMBERS([struct ifreq.ifr_hwaddr], [], [],
 	[#ifdef __WIN32__
@@ -2118,7 +2004,7 @@ AC_CHECK_FUNCS([getipnodebyname getipnodebyaddr gethostbyname2])
 AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
 		pread pwrite memmove strerror strerror_r strncasecmp \
 		gethrtime localtime_r gmtime_r inet_pton \
-		memcpy mallopt sbrk _sbrk __sbrk brk _brk __brk \
+		mmap mremap memcpy mallopt sbrk _sbrk __sbrk brk _brk __brk \
 		flockfile fstat strlcpy strlcat setsid posix2time time2posix \
 		setlocale nl_langinfo poll mlockall ppoll])
 
@@ -2136,8 +2022,7 @@ fi
 
 case X$erl_xcomp_posix_memalign in
      Xno) ;;
-     Xyes) AC_DEFINE(HAVE_POSIX_MEMALIGN,[1],
-                [Define to 1 if you have the `posix_memalign' function.]) ;;
+     Xyes) have_posix_memalign=yes ;;
      *)
 	AC_CHECK_FUNC(
 		[posix_memalign],
@@ -2152,15 +2037,19 @@ int main(void) {
       return error;
     return 0;
 }
-],AC_DEFINE(HAVE_POSIX_MEMALIGN,[1],
-    [Define to 1 if you have the `posix_memalign' function.])
+],have_posix_memalign=yes
 )
 		 else
-			AC_DEFINE(HAVE_POSIX_MEMALIGN,[1],
-		[Define to 1 if you have the `posix_memalign' function.])
+			have_posix_memalign=yes
 		 fi]);;
 esac
 
+if test $have_posix_memalign = yes; then
+   AC_DEFINE(HAVE_POSIX_MEMALIGN,[1],
+	     [Define to 1 if you have the `posix_memalign' function.])
+fi
+
+
 dnl writev on OS X snow leopard is broken for files > 4GB
 case $host_os in
         darwin10.8.0)
@@ -2170,17 +2059,6 @@ case $host_os in
 	    AC_CHECK_FUNCS([writev]) ;;
 esac
 
-case $host_os in
-        *ose)
-	    AC_MSG_CHECKING([for mmap])
-	    AC_MSG_RESULT(not using for OSE)
-	    AC_MSG_CHECKING([for mremap])
-	    AC_MSG_RESULT(not using for OSE) ;;
-        *)
-	    AC_CHECK_FUNCS([mmap mremap]) ;;
-esac
-
-
 AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>])
 
 disable_vfork=false
@@ -2829,17 +2707,26 @@ LM_SYS_IPV6
 LM_SYS_MULTICAST
 ERL_TIME_CORRECTION
 AC_CHECK_PROG(M4, m4, m4)
+
+
+dnl HiPE cannot run on 64-bit without MAP_FIXED and MAP_NORESERVE
+if test X${enable_hipe} != Xno && test X$ac_cv_sizeof_void_p != X4; then
+   AC_CHECK_DECLS([MAP_FIXED, MAP_NORESERVE], [], [], [#include <sys/mman.h>])
+   if test X$ac_cv_have_decl_MAP_FIXED != Xyes || test X$ac_cv_have_decl_MAP_NORESERVE != Xyes; then
+      if test X${enable_hipe} = Xyes; then
+	 AC_MSG_ERROR([HiPE on 64-bit needs MAP_FIXED and MAP_NORESERVE flags for mmap()])
+      else
+	 enable_hipe=no
+	 AC_MSG_WARN([Disable HiPE due to lack of MAP_FIXED and MAP_NORESERVE flags for mmap()])
+      fi
+   fi
+fi
+
 dnl check to auto-enable hipe here...
 if test "$cross_compiling" != "yes" && test X${enable_hipe} != Xno; then
   if test -z "$M4"; then
 	enable_hipe=no
    	AC_MSG_NOTICE([HiPE disabled as no valid m4 is found in PATH])
-  elif test "$enable_halfword_emulator" = "yes"; then
-       if test X${enable_hipe} = Xyes; then
-              AC_MSG_ERROR([HiPE can not be combined with halfword emulator (yet)])
-       else		    
-   	      AC_MSG_NOTICE([HiPE auto-disabled on halfword emulator])
-       fi	
   else
   	case "$ARCH-$OPSYS" in
 	    x86-linux|amd64-linux|x86-darwin*|amd64-darwin*|ppc-linux|ppc64-linux|ppc-darwin|arm-linux|amd64-freebsd|x86-freebsd|x86-sol2|amd64-sol2|ultrasparc-linux)
@@ -2849,44 +2736,6 @@ if test "$cross_compiling" != "yes" && test X${enable_hipe} != Xno; then
   fi
 fi
 
-case $ARCH-$OPSYS in
-	amd64-darwin*|x86-darwin*)
-		AC_MSG_CHECKING([For modern (leopard) style mcontext_t])
-		AC_TRY_COMPILE([
-				#include <stdlib.h>
-				#include <sys/types.h>
-				#include <unistd.h>
-				#include <mach/mach.h>
-				#include <pthread.h>
-				#include <machine/signal.h>
-				#include <ucontext.h>
-				],[
-				#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
-				#define __DARWIN__ 1
-				#endif
-
-				#ifndef __DARWIN__
-				#error inpossible
-				#else
-
-				mcontext_t mc = NULL;
-				int x = mc->__fs.__fpu_mxcsr;
-
-				#endif
-				],darwin_mcontext_leopard=yes,
-				darwin_mcontext_leopard=no)
-				if test X"$darwin_mcontext_leopard" = X"yes"; then
-				   AC_DEFINE(DARWIN_MODERN_MCONTEXT,[],[Modern style mcontext_t in MacOSX])
-				   AC_MSG_RESULT(yes)
-				else
-				   AC_MSG_RESULT(no)
-				fi
-		;;
-	*)
-		darwin_mcontext_leopard=no
-		;;
-esac
-
 if test X${enable_fp_exceptions} = Xauto ; then
    case $host_os in
    	*linux*)
@@ -3768,7 +3617,7 @@ dnl crypto
 #
 #--------------------------------------------------------------------
 
-DED_SYS_INCLUDE="-I${ERL_TOP}/erts/emulator/beam -I${ERL_TOP}/erts/include -I${ERL_TOP}/erts/include/$host -I${ERL_TOP}/erts/include/internal -I${ERL_TOP}/erts/include/internal/$host -I${ERL_TOP}/erts/emulator/sys/$ERLANG_OSTYPE"
+DED_SYS_INCLUDE="-I${ERL_TOP}/erts/emulator/beam -I${ERL_TOP}/erts/include -I${ERL_TOP}/erts/include/$host -I${ERL_TOP}/erts/include/internal -I${ERL_TOP}/erts/include/internal/$host -I${ERL_TOP}/erts/emulator/sys/$ERLANG_OSTYPE -I${ERL_TOP}/erts/emulator/sys/common"
 
 if test "X$ETHR_DEFS" = "X"; then
     DED_THR_DEFS="-D_THREAD_SAFE -D_REENTRANT"
@@ -3827,14 +3676,8 @@ case $host_os in
 				DED_LDFLAGS="-m64 $DED_LDFLAGS"
 				;;
 			*)
-				if test X${enable_darwin_universal} != Xyes; then
-					DED_LDFLAGS="-m32 $DED_LDFLAGS"
-				fi
 				;;
 		esac
-		if test X${enable_darwin_universal} = Xyes; then
-		   	DED_LDFLAGS="-arch ppc -arch i386 $DED_LDFLAGS"
-		fi	
 		DED_LD="$CC"
 		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
 	;;
@@ -3919,14 +3762,20 @@ dnl
 LM_FIND_EMU_CC
 
 dnl
-dnl DTrace
+dnl DTrace & LTTNG
 dnl
 case $DYNAMIC_TRACE_FRAMEWORK in
      dtrace|systemtap)
         AC_CHECK_TOOL(DTRACE, dtrace, none)
         test "$DTRACE" = "none" && AC_MSG_ERROR([No dtrace utility found.]);
+        enable_lttng_test=no
 	enable_dtrace_test=yes;;
-     *) enable_dtrace_test=no;;
+     lttng)
+        enable_lttng_test=yes
+        enable_dtrace_test=no;;
+     *)
+        enable_lttng_test=no
+        enable_dtrace_test=no;;
 esac        
 		     
 AC_SUBST(DTRACE)
@@ -3993,6 +3842,37 @@ if test "$enable_dtrace_test" = "yes" ; then
         fi
 fi
 
+if test "$enable_lttng_test" = "yes" ; then
+    AC_CHECK_HEADERS(lttng/tracepoint.h)
+    AC_CHECK_HEADERS(lttng/tracepoint-event.h)
+    dnl The macro tracepoint_enabled is not present in older lttng versions
+    dnl checking for tracepoint_enabled
+    AC_MSG_CHECKING([for tracepoint_enabled in lttng/tracepoint.h])
+    AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+            [#include <lttng/tracepoint.h>
+             #define TRACEPOINT_PROVIDER com_ericsson_otp
+             TRACEPOINT_EVENT(
+                 com_ericsson_otp,
+                 dummy,
+                 TP_ARGS(int, my_int),
+                 TP_FIELDS(ctf_integer(int, my_int, my_int)))
+             #define TRACEPOINT_CREATE_PROBES
+             #define TRACEPOINT_DEFINE],
+            [if(tracepoint_enabled(com_ericsson_otp,dummy)) do {} while(0)])],
+        [AC_MSG_RESULT([yes])],
+        [AC_MSG_ERROR([no (must be present)])])
+    if test "x$ac_cv_header_lttng_tracepoint_h" = "xyes" \
+        -a "x$ac_cv_header_lttng_tracepoint_event_h" = "xyes"; then
+        # No straight forward way to test for liblttng-ust when no public symbol exists,
+        # just add the lib.
+        LIBS="$LIBS -llttng-ust -ldl"
+    else
+        AC_MSG_ERROR([No LTTng support found.])
+    fi
+fi
+
+
 dnl
 dnl SSL, SSH and CRYPTO need the OpenSSL libraries
 dnl
@@ -4111,7 +3991,7 @@ AC_ARG_WITH(ssl-rpath,
 AS_HELP_STRING([--with-ssl-rpath=yes|no|PATHS],
                [runtime library path for OpenSSL. Default is "yes", which equates to a
 	       number of standard locations. If "no", then no runtime
-	       library paths wil be used. Anything else should be a
+	       library paths will be used. Anything else should be a
 	       comma separated list of paths.]),
 [
 case X$with_ssl in
@@ -4940,7 +4820,6 @@ AC_OUTPUT(
   Makefile:Makefile.in
   ../make/$host/otp.mk:../make/otp.mk.in
   ../make/$host/otp_ded.mk:../make/otp_ded.mk.in
-  ../make/$host/ose_lm.mk:../make/ose_lm.mk.in
 dnl
 dnl The ones below should be moved to their respective lib
 dnl
diff --git a/erts/doc/src/absform.xml b/erts/doc/src/absform.xml
index 186c9a1143..13756ddfdc 100644
--- a/erts/doc/src/absform.xml
+++ b/erts/doc/src/absform.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2015</year>
+      <year>2001</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -68,31 +68,29 @@
       <item>If D is a module declaration consisting of the forms
       <c>F_1</c>, ..., <c>F_k</c>, then
        Rep(D) = <c>[Rep(F_1), ..., Rep(F_k)]</c>.</item>
-      <item>If F is an attribute <c>-module(Mod)</c>, then
-       Rep(F) = <c>{attribute,LINE,module,Mod}</c>.</item>
       <item>If F is an attribute <c>-behavior(Behavior)</c>, then
        Rep(F) = <c>{attribute,LINE,behavior,Behavior}</c>.</item>
       <item>If F is an attribute <c>-behaviour(Behaviour)</c>, then
        Rep(F) = <c>{attribute,LINE,behaviour,Behaviour}</c>.</item>
+      <item>If F is an attribute <c>-compile(Options)</c>, then
+       Rep(F) = <c>{attribute,LINE,compile,Options}</c>.</item>
       <item>If F is an attribute <c>-export([Fun_1/A_1, ..., Fun_k/A_k])</c>, then
        Rep(F) = <c>{attribute,LINE,export,[{Fun_1,A_1}, ..., {Fun_k,A_k}]}</c>.</item>
-      <item>If F is an attribute <c>-import(Mod,[Fun_1/A_1, ..., Fun_k/A_k])</c>, then
-       Rep(F) = <c>{attribute,LINE,import,{Mod,[{Fun_1,A_1}, ..., {Fun_k,A_k}]}}</c>.</item>
       <item>If F is an attribute <c>-export_type([Type_1/A_1, ..., Type_k/A_k])</c>, then
        Rep(F) = <c>{attribute,LINE,export_type,[{Type_1,A_1}, ..., {Type_k,A_k}]}</c>.</item>
-      <item>If F is an attribute <c>-compile(Options)</c>, then
-       Rep(F) = <c>{attribute,LINE,compile,Options}</c>.</item>
+      <item>If F is an attribute <c>-import(Mod,[Fun_1/A_1, ..., Fun_k/A_k])</c>, then
+       Rep(F) = <c>{attribute,LINE,import,{Mod,[{Fun_1,A_1}, ..., {Fun_k,A_k}]}}</c>.</item>
+      <item>If F is an attribute <c>-module(Mod)</c>, then
+       Rep(F) = <c>{attribute,LINE,module,Mod}</c>.</item>
+      <item>If F is an attribute <c>-optional_callbacks([Fun_1/A_1, ..., Fun_k/A_k])</c>, then
+       Rep(F) = <c>{attribute,LINE,optional_callbacks,[{Fun_1,A_1}, ..., {Fun_k,A_k}]}</c>.</item>
       <item>If F is an attribute <c>-file(File,Line)</c>, then
        Rep(F) = <c>{attribute,LINE,file,{File,Line}}</c>.</item>
-      <item>If F is a record declaration
-       <c>-record(Name,{V_1, ..., V_k})</c>, then Rep(F) =
-       <c>{attribute,LINE,record,{Name,[Rep(V_1), ..., Rep(V_k)]}}</c>.
-       For Rep(V), see below.</item>
-      <item>If F is a type declaration
-       <c>-Type Name(V_1, ..., V_k) :: T</c>, where
-       <c>Type</c> is either the atom <c>type</c> or the atom <c>opaque</c>,
-       each <c>V_i</c> is a variable, and <c>T</c> is a type, then Rep(F) =
-       <c>{attribute,LINE,Type,{Name,Rep(T),[Rep(V_1), ..., Rep(V_k)]}}</c>.
+      <item>If F is a function declaration
+       <c>Name Fc_1 ; ... ; Name Fc_k</c>,
+       where each <c>Fc_i</c> is a function clause with a
+       pattern sequence of the same length <c>Arity</c>, then
+       Rep(F) = <c>{function,LINE,Name,Arity,[Rep(Fc_1), ...,Rep(Fc_k)]}</c>.
       </item>
       <item>If F is a function specification
        <c>-Spec Name Ft_1; ...; Ft_k</c>,
@@ -109,15 +107,20 @@
        <c>Arity</c>, then Rep(F) =
        <c>{attribute,Line,spec,{{Mod,Name,Arity},[Rep(Ft_1), ..., Rep(Ft_k)]}}</c>.
       </item>
+      <item>If F is a record declaration
+       <c>-record(Name,{V_1, ..., V_k})</c>,
+       where each <c>V_i</c> is a record field, then Rep(F) =
+       <c>{attribute,LINE,record,{Name,[Rep(V_1), ..., Rep(V_k)]}}</c>.
+       For Rep(V), see below.</item>
+      <item>If F is a type declaration
+       <c>-Type Name(V_1, ..., V_k) :: T</c>, where
+       <c>Type</c> is either the atom <c>type</c> or the atom <c>opaque</c>,
+       each <c>V_i</c> is a variable, and <c>T</c> is a type, then Rep(F) =
+       <c>{attribute,LINE,Type,{Name,Rep(T),[Rep(V_1), ..., Rep(V_k)]}}</c>.
+      </item>
       <item>If F is a wild attribute <c>-A(T)</c>, then
        Rep(F) = <c>{attribute,LINE,A,T}</c>.
       <br></br></item>
-      <item>If F is a function declaration
-       <c>Name Fc_1 ; ... ; Name Fc_k</c>,
-       where each <c>Fc_i</c> is a function clause with a
-       pattern sequence of the same length <c>Arity</c>, then
-       Rep(F) = <c>{function,LINE,Name,Arity,[Rep(Fc_1), ...,Rep(Fc_k)]}</c>.
-      </item>
     </list>
 
     <section>
@@ -131,11 +134,6 @@
         <item>If V is <c>A = E</c>,
 	 where <c>E</c> is an expression, then
          Rep(V) = <c>{record_field,LINE,Rep(A),Rep(E)}</c>.</item>
-        <item>If V is <c>A :: T</c>, where <c>T</c> is a
-          type and it does not contain
-          <c>undefined</c> syntactically, then Rep(V) =
-          <c>{typed_record_field,{record_field,LINE,Rep(A)},Rep(undefined | T)}</c>.
-        </item>
         <item>If V is <c>A :: T</c>, where <c>T</c> is a type, then Rep(V) =
           <c>{typed_record_field,{record_field,LINE,Rep(A)},Rep(T)}</c>.
           </item>
@@ -162,15 +160,15 @@
     <p>There are five kinds of atomic literals, which are represented in the
       same way in patterns, expressions and guards:</p>
     <list type="bulleted">
-      <item>If L is an integer or character literal, then
-       Rep(L) = <c>{integer,LINE,L}</c>.</item>
+      <item>If L is an atom literal, then
+       Rep(L) = <c>{atom,LINE,L}</c>.</item>
       <item>If L is a float literal, then
        Rep(L) = <c>{float,LINE,L}</c>.</item>
+      <item>If L is an integer or character literal, then
+       Rep(L) = <c>{integer,LINE,L}</c>.</item>
       <item>If L is a string literal consisting of the characters
       <c>C_1</c>, ..., <c>C_k</c>, then
        Rep(L) = <c>{string,LINE,[C_1, ..., C_k]}</c>.</item>
-      <item>If L is an atom literal, then
-       Rep(L) = <c>{atom,LINE,L}</c>.</item>
     </list>
     <p>Note that negative integer and float literals do not occur as such; they are
       parsed as an application of the unary negation operator.</p>
@@ -178,47 +176,59 @@
 
   <section>
     <title>Patterns</title>
-    <p>If <c>Ps</c> is a sequence of patterns <c>P_1, ..., P_k</c>, then
+    <p>If Ps is a sequence of patterns <c>P_1, ..., P_k</c>, then
       Rep(Ps) = <c>[Rep(P_1), ..., Rep(P_k)]</c>. Such sequences occur as the
       list of arguments to a function or fun.</p>
     <p>Individual patterns are represented as follows:</p>
     <list type="bulleted">
-      <item>If P is an atomic literal L, then Rep(P) = Rep(L).</item>
+      <item>If P is an atomic literal <c>L</c>, then Rep(P) = Rep(L).</item>
+      <item>If P is a bit string pattern
+       <c>&lt;&lt;P_1:Size_1/TSL_1, ..., P_k:Size_k/TSL_k>></c>, where each
+       <c>Size_i</c> is an expression that can be evaluated to an integer
+       and each <c>TSL_i</c> is a type specificer list, then
+       Rep(P) = <c>{bin,LINE,[{bin_element,LINE,Rep(P_1),Rep(Size_1),Rep(TSL_1)}, ..., {bin_element,LINE,Rep(P_k),Rep(Size_k),Rep(TSL_k)}]}</c>.
+       For Rep(TSL), see below.
+       An omitted <c>Size_i</c> is represented by <c>default</c>.
+       An omitted <c>TSL_i</c> is represented by <c>default</c>.</item>
       <item>If P is a compound pattern <c>P_1 = P_2</c>, then
        Rep(P) = <c>{match,LINE,Rep(P_1),Rep(P_2)}</c>.</item>
-      <item>If P is a variable pattern <c>V</c>, then
-       Rep(P) = <c>{var,LINE,A}</c>,
-       where A is an atom with a printname consisting of the same characters as
-      <c>V</c>.</item>
-      <item>If P is a universal pattern <c>_</c>, then
-       Rep(P) = <c>{var,LINE,'_'}</c>.</item>
-      <item>If P is a tuple pattern <c>{P_1, ..., P_k}</c>, then
-       Rep(P) = <c>{tuple,LINE,[Rep(P_1), ..., Rep(P_k)]}</c>.</item>
-      <item>If P is a nil pattern <c>[]</c>, then
-       Rep(P) = <c>{nil,LINE}</c>.</item>
       <item>If P is a cons pattern <c>[P_h | P_t]</c>, then
        Rep(P) = <c>{cons,LINE,Rep(P_h),Rep(P_t)}</c>.</item>
-      <item>If E is a binary pattern <c>&lt;&lt;P_1:Size_1/TSL_1, ..., P_k:Size_k/TSL_k>></c>, then
-       Rep(E) = <c>{bin,LINE,[{bin_element,LINE,Rep(P_1),Rep(Size_1),Rep(TSL_1)}, ..., {bin_element,LINE,Rep(P_k),Rep(Size_k),Rep(TSL_k)}]}</c>.
-       For Rep(TSL), see below.
-       An omitted <c>Size</c> is represented by <c>default</c>. An omitted <c>TSL</c>
-       (type specifier list) is represented by <c>default</c>.</item>
-      <item>If P is <c>P_1 Op P_2</c>, where <c>Op</c> is a binary operator (this
-       is either an occurrence of <c>++</c> applied to a literal string or character
+      <item>If P is a map pattern <c>#{A_1, ..., A_k}</c>, where each
+       <c>A_i</c> is an association <c>P_i_1 := P_i_2</c>, then Rep(P) =
+       <c>{map,LINE,[Rep(A_1), ..., Rep(A_k)]}</c>. For Rep(A), see
+       below.</item>
+      <item>If P is a nil pattern <c>[]</c>, then
+       Rep(P) = <c>{nil,LINE}</c>.</item>
+      <item>If P is an operator pattern <c>P_1 Op P_2</c>,
+       where <c>Op</c> is a binary operator (this is either an occurrence
+       of <c>++</c> applied to a literal string or character
        list, or an occurrence of an expression that can be evaluated to a number
        at compile time),
        then Rep(P) = <c>{op,LINE,Op,Rep(P_1),Rep(P_2)}</c>.</item>
-      <item>If P is <c>Op P_0</c>, where <c>Op</c> is a unary operator (this is an
-       occurrence of an expression that can be evaluated to a number at compile
+      <item>If P is an operator pattern <c>Op P_0</c>,
+       where <c>Op</c> is a unary operator (this is an occurrence of
+       an expression that can be evaluated to a number at compile
        time), then Rep(P) = <c>{op,LINE,Op,Rep(P_0)}</c>.</item>
-      <item>If P is a record pattern <c>#Name{Field_1=P_1, ..., Field_k=P_k}</c>,
-       then Rep(P) =
-      <c>{record,LINE,Name,[{record_field,LINE,Rep(Field_1),Rep(P_1)}, ..., {record_field,LINE,Rep(Field_k),Rep(P_k)}]}</c>.</item>
-      <item>If P is <c>#Name.Field</c>, then
-       Rep(P) = <c>{record_index,LINE,Name,Rep(Field)}</c>.</item>
-      <item>If P is <c>( P_0 )</c>, then
+      <item>If P is a parenthesized pattern <c>( P_0 )</c>, then
        Rep(P) = <c>Rep(P_0)</c>,
-       that is, patterns cannot be distinguished from their bodies.</item>
+       that is, parenthesized patterns cannot be distinguished from their
+       bodies.</item>
+      <item>If P is a record field index pattern <c>#Name.Field</c>,
+       where <c>Field</c> is an atom, then
+       Rep(P) = <c>{record_index,LINE,Name,Rep(Field)}</c>.</item>
+      <item>If P is a record pattern
+       <c>#Name{Field_1=P_1, ..., Field_k=P_k}</c>,
+       where each <c>Field_i</c> is an atom or <c>_</c>, then Rep(P) =
+       <c>{record,LINE,Name,[{record_field,LINE,Rep(Field_1),Rep(P_1)}, ..., {record_field,LINE,Rep(Field_k),Rep(P_k)}]}</c>.</item>
+      <item>If P is a tuple pattern <c>{P_1, ..., P_k}</c>, then
+       Rep(P) = <c>{tuple,LINE,[Rep(P_1), ..., Rep(P_k)]}</c>.</item>
+      <item>If P is a universal pattern <c>_</c>, then
+       Rep(P) = <c>{var,LINE,'_'}</c>.</item>
+      <item>If P is a variable pattern <c>V</c>, then
+       Rep(P) = <c>{var,LINE,A}</c>,
+       where A is an atom with a printname consisting of the same characters as
+      <c>V</c>.</item>
     </list>
     <p>Note that every pattern has the same source form as some expression, and is
       represented the same way as the corresponding expression.</p>
@@ -226,167 +236,187 @@
 
   <section>
     <title>Expressions</title>
-    <p>A body B is a sequence of expressions <c>E_1, ..., E_k</c>, and
-      Rep(B) = <c>[Rep(E_1), ..., Rep(E_k)]</c>.</p>
+    <p>A body B is a nonempty sequence of expressions <c>E_1, ..., E_k</c>,
+      and Rep(B) = <c>[Rep(E_1), ..., Rep(E_k)]</c>.</p>
     <p>An expression E is one of the following alternatives:</p>
     <list type="bulleted">
-      <item>If P is an atomic literal <c>L</c>, then Rep(P) = Rep(L).</item>
-      <item>If E is <c>P = E_0</c>, then
-       Rep(E) = <c>{match,LINE,Rep(P),Rep(E_0)}</c>.</item>
-      <item>If E is a variable <c>V</c>, then Rep(E) = <c>{var,LINE,A}</c>,
-       where <c>A</c> is an atom with a printname consisting of the same
-       characters as <c>V</c>.</item>
-      <item>If E is a tuple skeleton <c>{E_1, ..., E_k}</c>, then
-       Rep(E) = <c>{tuple,LINE,[Rep(E_1), ..., Rep(E_k)]}</c>.</item>
-      <item>If E is <c>[]</c>, then
-       Rep(E) = <c>{nil,LINE}</c>.</item>
-      <item>If E is a cons skeleton <c>[E_h | E_t]</c>, then
-       Rep(E) = <c>{cons,LINE,Rep(E_h),Rep(E_t)}</c>.</item>
-      <item>If E is a binary constructor <c>&lt;&lt;V_1:Size_1/TSL_1, ..., V_k:Size_k/TSL_k>></c>, then Rep(E) =
-       <c>{bin,LINE,[{bin_element,LINE,Rep(V_1),Rep(Size_1),Rep(TSL_1)}, ..., {bin_element,LINE,Rep(V_k),Rep(Size_k),Rep(TSL_k)}]}</c>.
+      <item>If E is an atomic literal <c>L</c>, then Rep(E) = Rep(L).</item>
+      <item>If E is a bit string comprehension
+       <c>&lt;&lt;E_0 || Q_1, ..., Q_k>></c>,
+       where each <c>Q_i</c> is a qualifier, then
+       Rep(E) = <c>{bc,LINE,Rep(E_0),[Rep(Q_1), ..., Rep(Q_k)]}</c>.
+       For Rep(Q), see below.</item>
+      <item>If E is a bit string constructor
+       <c>&lt;&lt;E_1:Size_1/TSL_1, ..., E_k:Size_k/TSL_k>></c>,
+       where each <c>Size_i</c> is an expression and each
+       <c>TSL_i</c> is a type specificer list, then Rep(E) =
+       <c>{bin,LINE,[{bin_element,LINE,Rep(E_1),Rep(Size_1),Rep(TSL_1)}, ..., {bin_element,LINE,Rep(E_k),Rep(Size_k),Rep(TSL_k)}]}</c>.
        For Rep(TSL), see below.
-       An omitted <c>Size</c> is represented by <c>default</c>. An omitted <c>TSL</c>
-       (type specifier list) is represented by <c>default</c>.</item>
-      <item>If E is <c>E_1 Op E_2</c>, where <c>Op</c> is a binary operator,
-       then Rep(E) = <c>{op,LINE,Op,Rep(E_1),Rep(E_2)}</c>.</item>
-      <item>If E is <c>Op E_0</c>, where <c>Op</c> is a unary operator, then
-       Rep(E) = <c>{op,LINE,Op,Rep(E_0)}</c>.</item>
-      <item>If E is <c>#Name{Field_1=E_1, ..., Field_k=E_k}</c>,
-       then Rep(E) =
-      <c>{record,LINE,Name,[{record_field,LINE,Rep(Field_1),Rep(E_1)}, ..., {record_field,LINE,Rep(Field_k),Rep(E_k)}]}</c>.</item>
-      <item>If E is <c>E_0#Name{Field_1=E_1, ..., Field_k=E_k}</c>, then
-       Rep(E) =
-      <c>{record,LINE,Rep(E_0),Name,[{record_field,LINE,Rep(Field_1),Rep(E_1)}, ..., {record_field,LINE,Rep(Field_k),Rep(E_k)}]}</c>.</item>
-      <item>If E is <c>#Name.Field</c>, then
-       Rep(E) = <c>{record_index,LINE,Name,Rep(Field)}</c>.</item>
-      <item>If E is <c>E_0#Name.Field</c>, then
-       Rep(E) = <c>{record_field,LINE,Rep(E_0),Name,Rep(Field)}</c>.</item>
-      <item>If E is <c>#{W_1, ..., W_k}</c> where each
-       <c>W_i</c> is a map assoc or exact field, then Rep(E) =
-       <c>{map,LINE,[Rep(W_1), ..., Rep(W_k)]}</c>. For Rep(W), see
-       below.</item>
-      <item>If E is <c>E_0#{W_1, ..., W_k}</c> where
-       <c>W_i</c> is a map assoc or exact field, then Rep(E) =
-       <c>{map,LINE,Rep(E_0),[Rep(W_1), ..., Rep(W_k)]}</c>.
-       For Rep(W), see below.</item>
-      <item>If E is <c>catch E_0</c>, then
+       An omitted <c>Size_i</c> is represented by <c>default</c>.
+       An omitted <c>TSL_i</c> is represented by <c>default</c>.</item>
+      <item>If E is a block expression <c>begin B end</c>,
+       where <c>B</c> is a body, then
+       Rep(E) = <c>{block,LINE,Rep(B)}</c>.</item>
+      <item>If E is a case expression <c>case E_0 of Cc_1 ; ... ; Cc_k end</c>,
+       where <c>E_0</c> is an expression and each <c>Cc_i</c> is a
+       case clause then Rep(E) =
+      <c>{'case',LINE,Rep(E_0),[Rep(Cc_1), ..., Rep(Cc_k)]}</c>.</item>
+      <item>If E is a catch expression <c>catch E_0</c>, then
        Rep(E) = <c>{'catch',LINE,Rep(E_0)}</c>.</item>
-      <item>If E is <c>E_0(E_1, ..., E_k)</c>, then
+      <item>If E is a cons skeleton <c>[E_h | E_t]</c>, then
+       Rep(E) = <c>{cons,LINE,Rep(E_h),Rep(E_t)}</c>.</item>
+      <item>If E is a fun expression <c>fun Name/Arity</c>, then
+       Rep(E) = <c>{'fun',LINE,{function,Name,Arity}}</c>.</item>
+      <item>If E is a fun expression
+       <c>fun Module:Name/Arity</c>, then Rep(E) =
+       <c>{'fun',LINE,{function,Rep(Module),Rep(Name),Rep(Arity)}}</c>.
+       (Before the R15 release: Rep(E) =
+       <c>{'fun',LINE,{function,Module,Name,Arity}}</c>.)</item>
+      <item>If E is a fun expression <c>fun Fc_1 ; ... ; Fc_k end</c>,
+       where each <c>Fc_i</c> is a function clause then Rep(E) =
+      <c>{'fun',LINE,{clauses,[Rep(Fc_1), ..., Rep(Fc_k)]}}</c>.</item>
+      <item>If E is a fun expression
+       <c>fun Name Fc_1 ; ... ; Name Fc_k end</c>,
+       where <c>Name</c> is a variable and each
+       <c>Fc_i</c> is a function clause then Rep(E) =
+       <c>{named_fun,LINE,Name,[Rep(Fc_1), ..., Rep(Fc_k)]}</c>.
+       </item>
+      <item>If E is a function call <c>E_0(E_1, ..., E_k)</c>, then
        Rep(E) = <c>{call,LINE,Rep(E_0),[Rep(E_1), ..., Rep(E_k)]}</c>.</item>
-      <item>If E is <c>E_m:E_0(E_1, ..., E_k)</c>, then Rep(E) =
-      <c>{call,LINE,{remote,LINE,Rep(E_m),Rep(E_0)},[Rep(E_1), ...,  Rep(E_k)]}</c>.
+      <item>If E is a function call <c>E_m:E_0(E_1, ..., E_k)</c>,
+       then Rep(E) =
+       <c>{call,LINE,{remote,LINE,Rep(E_m),Rep(E_0)},[Rep(E_1), ...,  Rep(E_k)]}</c>.
       </item>
-      <item>If E is a list comprehension <c>[E_0 || W_1, ..., W_k]</c>,
-       where each <c>W_i</c> is a generator or a filter, then Rep(E) =
-       <c>{lc,LINE,Rep(E_0),[Rep(W_1), ..., Rep(W_k)]}</c>. For Rep(W), see
-       below.</item>
-      <item>If E is a binary comprehension
-       <c>&lt;&lt;E_0 || W_1, ..., W_k>></c>,
-       where each <c>W_i</c> is a generator or a filter, then
-       Rep(E) = <c>{bc,LINE,Rep(E_0),[Rep(W_1), ..., Rep(W_k)]}</c>.
-       For Rep(W), see below.</item>
-      <item>If E is <c>begin B end</c>, where <c>B</c> is a body, then
-       Rep(E) = <c>{block,LINE,Rep(B)}</c>.</item>
-      <item>If E is <c>if Ic_1 ; ... ; Ic_k  end</c>,
+      <item>If E is an if expression <c>if Ic_1 ; ... ; Ic_k  end</c>,
        where each <c>Ic_i</c> is an if clause then Rep(E) =
       <c>{'if',LINE,[Rep(Ic_1), ..., Rep(Ic_k)]}</c>.</item>
-      <item>If E is <c>case E_0 of Cc_1 ; ... ; Cc_k end</c>,
-       where <c>E_0</c> is an expression and each <c>Cc_i</c> is a
-       case clause then Rep(E) =
-      <c>{'case',LINE,Rep(E_0),[Rep(Cc_1), ..., Rep(Cc_k)]}</c>.</item>
-      <item>If E is <c>try B catch Tc_1 ; ... ; Tc_k end</c>,
+      <item>If E is a list comprehension <c>[E_0 || Q_1, ..., Q_k]</c>,
+       where each <c>Q_i</c> is a qualifier, then Rep(E) =
+       <c>{lc,LINE,Rep(E_0),[Rep(Q_1), ..., Rep(Q_k)]}</c>. For Rep(Q), see
+       below.</item>
+      <item>If E is a map creation <c>#{A_1, ..., A_k}</c>,
+       where each <c>A_i</c> is an association <c>E_i_1 => E_i_2</c>
+       or <c>E_i_1 := E_i_2</c>, then Rep(E) =
+       <c>{map,LINE,[Rep(A_1), ..., Rep(A_k)]}</c>. For Rep(A), see
+       below.</item>
+      <item>If E is a map update <c>E_0#{A_1, ..., A_k}</c>,
+       where each <c>A_i</c> is an association <c>E_i_1 => E_i_2</c>
+       or <c>E_i_1 := E_i_2</c>, then Rep(E) =
+       <c>{map,LINE,Rep(E_0),[Rep(A_1), ..., Rep(A_k)]}</c>.
+       For Rep(A), see below.</item>
+      <item>If E is a match operator expression <c>P = E_0</c>,
+       where <c>P</c> is a pattern, then
+       Rep(E) = <c>{match,LINE,Rep(P),Rep(E_0)}</c>.</item>
+      <item>If E is nil, <c>[]</c>, then
+       Rep(E) = <c>{nil,LINE}</c>.</item>
+      <item>If E is an operator expression <c>E_1 Op E_2</c>,
+       where <c>Op</c> is a binary operator other than the match
+       operator <c>=</c>, then
+       Rep(E) = <c>{op,LINE,Op,Rep(E_1),Rep(E_2)}</c>.</item>
+      <item>If E is an operator expression <c>Op E_0</c>,
+       where <c>Op</c> is a unary operator, then
+       Rep(E) = <c>{op,LINE,Op,Rep(E_0)}</c>.</item>
+      <item>If E is a parenthesized expression <c>( E_0 )</c>, then
+       Rep(E) = <c>Rep(E_0)</c>, that is, parenthesized
+       expressions cannot be distinguished from their bodies.</item>
+      <item>If E is a receive expression <c>receive Cc_1 ; ... ; Cc_k end</c>,
+       where each <c>Cc_i</c> is a case clause then Rep(E) =
+      <c>{'receive',LINE,[Rep(Cc_1), ..., Rep(Cc_k)]}</c>.</item>
+      <item>If E is a receive expression
+       <c>receive Cc_1 ; ... ; Cc_k after E_0 -> B_t end</c>,
+       where each <c>Cc_i</c> is a case clause,
+      <c>E_0</c> is an expression and <c>B_t</c> is a body, then Rep(E) =
+      <c>{'receive',LINE,[Rep(Cc_1), ..., Rep(Cc_k)],Rep(E_0),Rep(B_t)}</c>.</item>
+      <item>If E is a record creation
+       <c>#Name{Field_1=E_1, ..., Field_k=E_k}</c>,
+       where each <c>Field_i</c> is an atom or <c>_</c>, then Rep(E) =
+      <c>{record,LINE,Name,[{record_field,LINE,Rep(Field_1),Rep(E_1)}, ..., {record_field,LINE,Rep(Field_k),Rep(E_k)}]}</c>.</item>
+      <item>If E is a record field access <c>E_0#Name.Field</c>,
+       where <c>Field</c> is an atom, then
+       Rep(E) = <c>{record_field,LINE,Rep(E_0),Name,Rep(Field)}</c>.</item>
+      <item>If E is a record field index <c>#Name.Field</c>,
+       where <c>Field</c> is an atom, then
+       Rep(E) = <c>{record_index,LINE,Name,Rep(Field)}</c>.</item>
+      <item>If E is a record update
+       <c>E_0#Name{Field_1=E_1, ..., Field_k=E_k}</c>,
+       where each <c>Field_i</c> is an atom, then Rep(E) =
+      <c>{record,LINE,Rep(E_0),Name,[{record_field,LINE,Rep(Field_1),Rep(E_1)}, ..., {record_field,LINE,Rep(Field_k),Rep(E_k)}]}</c>.</item>
+      <item>If E is a tuple skeleton <c>{E_1, ..., E_k}</c>, then
+       Rep(E) = <c>{tuple,LINE,[Rep(E_1), ..., Rep(E_k)]}</c>.</item>
+      <item>If E is a try expression <c>try B catch Tc_1 ; ... ; Tc_k end</c>,
        where <c>B</c> is a body and each <c>Tc_i</c> is a catch clause then
        Rep(E) =
       <c>{'try',LINE,Rep(B),[],[Rep(Tc_1), ..., Rep(Tc_k)],[]}</c>.</item>
-      <item>If E is <c>try B of Cc_1 ; ... ; Cc_k catch Tc_1 ; ... ; Tc_n end</c>,
+      <item>If E is a try expression
+       <c>try B of Cc_1 ; ... ; Cc_k catch Tc_1 ; ... ; Tc_n end</c>,
        where <c>B</c> is a body,
        each <c>Cc_i</c> is a case clause and
        each <c>Tc_j</c> is a catch clause then Rep(E) =
       <c>{'try',LINE,Rep(B),[Rep(Cc_1), ..., Rep(Cc_k)],[Rep(Tc_1), ..., Rep(Tc_n)],[]}</c>.</item>
-      <item>If E is <c>try B after A end</c>,
+      <item>If E is a try expression <c>try B after A end</c>,
        where <c>B</c> and <c>A</c> are bodies then Rep(E) =
       <c>{'try',LINE,Rep(B),[],[],Rep(A)}</c>.</item>
-      <item>If E is <c>try B of Cc_1 ; ... ; Cc_k after A end</c>,
+      <item>If E is a try expression
+       <c>try B of Cc_1 ; ... ; Cc_k after A end</c>,
        where <c>B</c> and <c>A</c> are a bodies and
        each <c>Cc_i</c> is a case clause then Rep(E) =
       <c>{'try',LINE,Rep(B),[Rep(Cc_1), ..., Rep(Cc_k)],[],Rep(A)}</c>.</item>
-      <item>If E is <c>try B catch Tc_1 ; ... ; Tc_k after A end</c>,
+      <item>If E is a try expression
+       <c>try B catch Tc_1 ; ... ; Tc_k after A end</c>,
        where <c>B</c> and <c>A</c> are bodies and
        each <c>Tc_i</c> is a catch clause then Rep(E) =
       <c>{'try',LINE,Rep(B),[],[Rep(Tc_1), ..., Rep(Tc_k)],Rep(A)}</c>.</item>
-      <item>If E is <c>try B of Cc_1 ; ... ; Cc_k  catch Tc_1 ; ... ; Tc_n after A end</c>,
+      <item>If E is a try expression
+       <c>try B of Cc_1 ; ... ; Cc_k  catch Tc_1 ; ... ; Tc_n after A end</c>,
        where <c>B</c> and <c>A</c> are a bodies,
-       each <c>Cc_i</c> is a case clause and
+       each <c>Cc_i</c> is a case clause, and
        each <c>Tc_j</c> is a catch clause then
        Rep(E) =
       <c>{'try',LINE,Rep(B),[Rep(Cc_1), ..., Rep(Cc_k)],[Rep(Tc_1),  ..., Rep(Tc_n)],Rep(A)}</c>.</item>
-      <item>If E is <c>receive Cc_1 ; ... ; Cc_k end</c>,
-       where each <c>Cc_i</c> is a case clause then Rep(E) =
-      <c>{'receive',LINE,[Rep(Cc_1), ..., Rep(Cc_k)]}</c>.</item>
-      <item>If E is <c>receive Cc_1 ; ... ; Cc_k after E_0 -> B_t end</c>,
-       where each <c>Cc_i</c> is a case clause,
-      <c>E_0</c> is an expression and <c>B_t</c> is a body, then Rep(E) =
-      <c>{'receive',LINE,[Rep(Cc_1), ..., Rep(Cc_k)],Rep(E_0),Rep(B_t)}</c>.</item>
-      <item>If E is <c>fun Name / Arity</c>, then
-       Rep(E) = <c>{'fun',LINE,{function,Name,Arity}}</c>.</item>
-      <item>If E is <c>fun Module:Name/Arity</c>, then Rep(E) =
-       <c>{'fun',LINE,{function,Rep(Module),Rep(Name),Rep(Arity)}}</c>.
-       (Before the R15 release: Rep(E) =
-       <c>{'fun',LINE,{function,Module,Name,Arity}}</c>.)</item>
-      <item>If E is <c>fun Fc_1 ; ... ; Fc_k end</c>
-       where each <c>Fc_i</c> is a function clause then Rep(E) =
-      <c>{'fun',LINE,{clauses,[Rep(Fc_1), ..., Rep(Fc_k)]}}</c>.</item>
-      <item>If E is <c>fun Name Fc_1 ; ... ; Name Fc_k end</c>
-       where <c>Name</c> is a variable and each
-       <c>Fc_i</c> is a function clause then Rep(E) =
-       <c>{named_fun,LINE,Name,[Rep(Fc_1), ..., Rep(Fc_k)]}</c>.
-       </item>
-      <item>If E is <c>( E_0 )</c>, then
-       Rep(E) = <c>Rep(E_0)</c>, that is, parenthesized
-       expressions cannot be distinguished from their bodies.</item>
+      <item>If E is a variable <c>V</c>, then Rep(E) = <c>{var,LINE,A}</c>,
+       where <c>A</c> is an atom with a printname consisting of the same
+       characters as <c>V</c>.</item>
     </list>
 
     <section>
-      <title>Generators and Filters</title>
-      <p>When W is a generator or a filter (in the body of a list or
-       binary comprehension), then:</p>
+      <title>Qualifiers</title>
+      <p>A qualifier Q is one of the following alternatives:</p>
       <list type="bulleted">
-        <item>If W is a generator <c>P &lt;- E</c>, where <c>P</c> is
+        <item>If Q is a filter <c>E</c>, where <c>E</c> is an expression, then
+         Rep(Q) = <c>Rep(E)</c>.</item>
+        <item>If Q is a generator <c>P &lt;- E</c>, where <c>P</c> is
 	 a pattern and <c>E</c> is an expression, then
-         Rep(W) = <c>{generate,LINE,Rep(P),Rep(E)}</c>.</item>
-        <item>If W is a generator <c>P &lt;= E</c>, where <c>P</c> is
+         Rep(Q) = <c>{generate,LINE,Rep(P),Rep(E)}</c>.</item>
+        <item>If Q is a bit string generator
+	 <c>P &lt;= E</c>, where <c>P</c> is
 	 a pattern and <c>E</c> is an expression, then
-         Rep(W) = <c>{b_generate,LINE,Rep(P),Rep(E)}</c>.</item>
-        <item>If W is a filter <c>E</c>, which is an expression, then
-         Rep(W) = <c>Rep(E)</c>.</item>
+         Rep(Q) = <c>{b_generate,LINE,Rep(P),Rep(E)}</c>.</item>
       </list>
     </section>
 
     <section>
-      <title>Binary Element Type Specifiers</title>
-      <p>A type specifier list TSL for a binary element is a sequence of type
-        specifiers <c>TS_1 - ... - TS_k</c>.
+      <title>Bit String Element Type Specifiers</title>
+      <p>A type specifier list TSL for a bit string element is a sequence
+        of type specifiers <c>TS_1 - ... - TS_k</c>, and
         Rep(TSL) = <c>[Rep(TS_1), ..., Rep(TS_k)]</c>.</p>
-      <p>When TS is a type specifier for a binary element, then:</p>
       <list type="bulleted">
-        <item>If TS is an atom <c>A</c>, then Rep(TS) = <c>A</c>.</item>
-        <item>If TS is a couple <c>A:Value</c> where <c>A</c> is an atom
-	 and <c>Value</c> is an integer, then Rep(TS) =
-	 <c>{A,Value}</c>.</item>
+        <item>If TS is a type specifier <c>A</c>, where <c>A</c> is an atom,
+	 then Rep(TS) = <c>A</c>.</item>
+        <item>If TS is a type specifier <c>A:Value</c>,
+	 where <c>A</c> is an atom and <c>Value</c> is an integer,
+	 then Rep(TS) = <c>{A,Value}</c>.</item>
       </list>
     </section>
 
     <section>
-      <title>Map Assoc and Exact Fields</title>
-      <p>When W is an assoc or exact field (in the body of a map), then:</p>
+      <title>Associations</title>
+      <p>An association A is one of the following alternatives:</p>
       <list type="bulleted">
-        <item>If W is an assoc field <c>K => V</c>, where
-         <c>K</c> and <c>V</c> are both expressions,
-         then Rep(W) = <c>{map_field_assoc,LINE,Rep(K),Rep(V)}</c>.
+	<item>If A is an association <c>K => V</c>,
+	 then Rep(A) = <c>{map_field_assoc,LINE,Rep(K),Rep(V)}</c>.
          </item>
-        <item>If W is an exact field <c>K := V</c>, where
-         <c>K</c> and <c>V</c> are both expressions,
-         then Rep(W) = <c>{map_field_exact,LINE,Rep(K),Rep(V)}</c>.
+	<item>If A is an association <c>K := V</c>,
+         then Rep(A) = <c>{map_field_exact,LINE,Rep(K),Rep(V)}</c>.
          </item>
       </list>
     </section>
@@ -398,39 +428,39 @@
       and catch clauses.</p>
     <p>A clause <c>C</c> is one of the following alternatives:</p>
     <list type="bulleted">
-      <item>If C is a function clause <c>( Ps ) -> B</c>
-       where <c>Ps</c> is a pattern sequence and <c>B</c> is a body, then
-       Rep(C) = <c>{clause,LINE,Rep(Ps),[],Rep(B)}</c>.</item>
-      <item>If C is a function clause <c>( Ps ) when Gs -> B</c>
-       where <c>Ps</c> is a pattern sequence,
-      <c>Gs</c> is a guard sequence and <c>B</c> is a body, then
-       Rep(C) = <c>{clause,LINE,Rep(Ps),Rep(Gs),Rep(B)}</c>.</item>
-      <item>If C is an if clause <c>Gs -> B</c>
-       where <c>Gs</c> is a guard sequence and <c>B</c> is a body, then
-       Rep(C) = <c>{clause,LINE,[],Rep(Gs),Rep(B)}</c>.</item>
-      <item>If C is a case clause <c>P -> B</c>
+      <item>If C is a case clause <c>P -> B</c>,
        where <c>P</c> is a pattern and <c>B</c> is a body, then
        Rep(C) = <c>{clause,LINE,[Rep(P)],[],Rep(B)}</c>.</item>
-      <item>If C is a case clause <c>P when Gs -> B</c>
+      <item>If C is a case clause <c>P when Gs -> B</c>,
        where <c>P</c> is a pattern,
       <c>Gs</c> is a guard sequence and <c>B</c> is a body, then
        Rep(C) = <c>{clause,LINE,[Rep(P)],Rep(Gs),Rep(B)}</c>.</item>
-      <item>If C is a catch clause <c>P -> B</c>
+      <item>If C is a catch clause <c>P -> B</c>,
        where <c>P</c> is a pattern and <c>B</c> is a body, then
        Rep(C) = <c>{clause,LINE,[Rep({throw,P,_})],[],Rep(B)}</c>.</item>
-      <item>If C is a catch clause <c>X : P -> B</c>
+      <item>If C is a catch clause <c>X : P -> B</c>,
        where <c>X</c> is an atomic literal or a variable pattern,
-      <c>P</c> is a pattern and <c>B</c> is a body, then
+      <c>P</c> is a pattern, and <c>B</c> is a body, then
        Rep(C) = <c>{clause,LINE,[Rep({X,P,_})],[],Rep(B)}</c>.</item>
-      <item>If C is a catch clause <c>P when Gs -> B</c>
-       where <c>P</c> is a pattern, <c>Gs</c> is a guard sequence
+      <item>If C is a catch clause <c>P when Gs -> B</c>,
+       where <c>P</c> is a pattern, <c>Gs</c> is a guard sequence,
        and <c>B</c> is a body, then
        Rep(C) = <c>{clause,LINE,[Rep({throw,P,_})],Rep(Gs),Rep(B)}</c>.</item>
-      <item>If C is a catch clause <c>X : P when Gs -> B</c>
+      <item>If C is a catch clause <c>X : P when Gs -> B</c>,
        where <c>X</c> is an atomic literal or a variable pattern,
-      <c>P</c> is a pattern, <c>Gs</c> is a guard sequence
+      <c>P</c> is a pattern, <c>Gs</c> is a guard sequence,
        and <c>B</c> is a body, then
        Rep(C) = <c>{clause,LINE,[Rep({X,P,_})],Rep(Gs),Rep(B)}</c>.</item>
+      <item>If C is a function clause <c>( Ps ) -> B</c>,
+       where <c>Ps</c> is a pattern sequence and <c>B</c> is a body, then
+       Rep(C) = <c>{clause,LINE,Rep(Ps),[],Rep(B)}</c>.</item>
+      <item>If C is a function clause <c>( Ps ) when Gs -> B</c>,
+       where <c>Ps</c> is a pattern sequence,
+      <c>Gs</c> is a guard sequence and <c>B</c> is a body, then
+       Rep(C) = <c>{clause,LINE,Rep(Ps),Rep(Gs),Rep(B)}</c>.</item>
+      <item>If C is an if clause <c>Gs -> B</c>,
+       where <c>Gs</c> is a guard sequence and <c>B</c> is a body, then
+       Rep(C) = <c>{clause,LINE,[],Rep(Gs),Rep(B)}</c>.</item>
     </list>
   </section>
 
@@ -444,46 +474,61 @@
       <c>[Rep(Gt_1), ..., Rep(Gt_k)]</c>.</p>
     <p>A guard test <c>Gt</c> is one of the following alternatives:</p>
     <list type="bulleted">
-      <item>If Gt is an atomic literal L, then Rep(Gt) = Rep(L).</item>
-      <item>If Gt is a variable pattern <c>V</c>, then
-       Rep(Gt) = <c>{var,LINE,A}</c>, where A is an atom with
-       a printname consisting of the same characters as <c>V</c>.</item>
-      <item>If Gt is a tuple skeleton <c>{Gt_1, ..., Gt_k}</c>, then
-       Rep(Gt) = <c>{tuple,LINE,[Rep(Gt_1), ..., Rep(Gt_k)]}</c>.</item>
-      <item>If Gt is <c>[]</c>, then Rep(Gt) = <c>{nil,LINE}</c>.</item>
-      <item>If Gt is a cons skeleton <c>[Gt_h | Gt_t]</c>, then
-       Rep(Gt) = <c>{cons,LINE,Rep(Gt_h),Rep(Gt_t)}</c>.</item>
-      <item>If Gt is a binary constructor
-       <c>&lt;&lt;Gt_1:Size_1/TSL_1, ..., Gt_k:Size_k/TSL_k>></c>, then
+      <item>If Gt is an atomic literal <c>L</c>, then Rep(Gt) = Rep(L).</item>
+      <item>If Gt is a bit string constructor
+       <c>&lt;&lt;Gt_1:Size_1/TSL_1, ..., Gt_k:Size_k/TSL_k>></c>,
+       where each <c>Size_i</c> is a guard test and each
+       <c>TSL_i</c> is a type specificer list, then
        Rep(Gt) = <c>{bin,LINE,[{bin_element,LINE,Rep(Gt_1),Rep(Size_1),Rep(TSL_1)}, ..., {bin_element,LINE,Rep(Gt_k),Rep(Size_k),Rep(TSL_k)}]}</c>.
        For Rep(TSL), see above.
-       An omitted <c>Size</c> is represented by <c>default</c>.
-       An omitted <c>TSL</c> (type specifier list) is represented
-       by <c>default</c>.</item>
-      <item>If Gt is <c>Gt_1 Op Gt_2</c>, where <c>Op</c>
-       is a binary operator, then Rep(Gt) =
-       <c>{op,LINE,Op,Rep(Gt_1),Rep(Gt_2)}</c>.</item>
-      <item>If Gt is <c>Op Gt_0</c>, where <c>Op</c> is a unary operator, then
+       An omitted <c>Size_i</c> is represented by <c>default</c>.
+       An omitted <c>TSL_i</c> is represented by <c>default</c>.</item>
+      <item>If Gt is a cons skeleton <c>[Gt_h | Gt_t]</c>, then
+       Rep(Gt) = <c>{cons,LINE,Rep(Gt_h),Rep(Gt_t)}</c>.</item>
+      <item>If Gt is a function call <c>A(Gt_1, ..., Gt_k)</c>,
+       where <c>A</c> is an atom, then Rep(Gt) =
+       <c>{call,LINE,Rep(A),[Rep(Gt_1), ..., Rep(Gt_k)]}</c>.</item>
+      <item>If Gt is a function call <c>A_m:A(Gt_1, ..., Gt_k)</c>,
+       where <c>A_m</c> is the atom <c>erlang</c> and <c>A</c> is
+       an atom or an operator, then Rep(Gt) =
+       <c>{call,LINE,{remote,LINE,Rep(A_m),Rep(A)},[Rep(Gt_1), ..., Rep(Gt_k)]}</c>.</item>
+      <item>If Gt is a map creation <c>#{A_1, ..., A_k}</c>,
+       where each <c>A_i</c> is an association <c>Gt_i_1 => Gt_i_2</c>
+       or <c>Gt_i_1 := Gt_i_2</c>, then Rep(Gt) =
+       <c>{map,LINE,[Rep(A_1), ..., Rep(A_k)]}</c>. For Rep(A), see
+       above.</item>
+      <item>If Gt is a map update <c>Gt_0#{A_1, ..., A_k}</c>, where each
+       <c>A_i</c> is an association <c>Gt_i_1 => Gt_i_2</c>
+       or <c>Gt_i_1 := Gt_i_2</c>, then Rep(Gt) =
+       <c>{map,LINE,Rep(Gt_0),[Rep(A_1), ..., Rep(A_k)]}</c>.
+       For Rep(A), see above.</item>
+      <item>If Gt is nil, <c>[]</c>,
+       then Rep(Gt) = <c>{nil,LINE}</c>.</item>
+      <item>If Gt is an operator guard test <c>Gt_1 Op Gt_2</c>,
+       where <c>Op</c> is a binary operator other than the match
+       operator <c>=</c>, then
+       Rep(Gt) = <c>{op,LINE,Op,Rep(Gt_1),Rep(Gt_2)}</c>.</item>
+      <item>If Gt is an operator guard test <c>Op Gt_0</c>,
+       where <c>Op</c> is a unary operator, then
        Rep(Gt) = <c>{op,LINE,Op,Rep(Gt_0)}</c>.</item>
-      <item>If Gt is <c>#Name{Field_1=Gt_1, ..., Field_k=Gt_k}</c>, then
-       Rep(E) =
-      <c>{record,LINE,Name,[{record_field,LINE,Rep(Field_1),Rep(Gt_1)}, ..., {record_field,LINE,Rep(Field_k),Rep(Gt_k)}]}</c>.</item>
-      <item>If Gt is <c>#Name.Field</c>, then
-       Rep(Gt) = <c>{record_index,LINE,Name,Rep(Field)}</c>.</item>
-      <item>If Gt is <c>Gt_0#Name.Field</c>, then
-       Rep(Gt) = <c>{record_field,LINE,Rep(Gt_0),Name,Rep(Field)}</c>.</item>
-      <item>If Gt is <c>A(Gt_1, ..., Gt_k)</c>, where <c>A</c> is an atom, then
-       Rep(Gt) = <c>{call,LINE,Rep(A),[Rep(Gt_1), ..., Rep(Gt_k)]}</c>.</item>
-      <item>If Gt is <c>A_m:A(Gt_1, ..., Gt_k)</c>, where <c>A_m</c> is
-       the atom <c>erlang</c> and <c>A</c> is an atom or an operator, then
-       Rep(Gt) = <c>{call,LINE,{remote,LINE,Rep(A_m),Rep(A)},[Rep(Gt_1), ..., Rep(Gt_k)]}</c>.</item>
-      <item>If Gt is <c>{A_m,A}(Gt_1, ..., Gt_k)</c>, where <c>A_m</c> is
-       the atom <c>erlang</c> and <c>A</c> is an atom or an operator, then
-       Rep(Gt) = <c>{call,LINE,Rep({A_m,A}),[Rep(Gt_1), ..., Rep(Gt_k)]}</c>.
-      </item>
-      <item>If Gt is <c>( Gt_0 )</c>, then
+      <item>If Gt is a parenthesized guard test <c>( Gt_0 )</c>, then
        Rep(Gt) = <c>Rep(Gt_0)</c>, that is, parenthesized
        guard tests cannot be distinguished from their bodies.</item>
+      <item>If Gt is a record creation
+       <c>#Name{Field_1=Gt_1, ..., Field_k=Gt_k}</c>,
+       where each <c>Field_i</c> is an atom or <c>_</c>, then Rep(Gt) =
+      <c>{record,LINE,Name,[{record_field,LINE,Rep(Field_1),Rep(Gt_1)}, ..., {record_field,LINE,Rep(Field_k),Rep(Gt_k)}]}</c>.</item>
+      <item>If Gt is  a record field access <c>Gt_0#Name.Field</c>,
+       where <c>Field</c> is an atom, then
+       Rep(Gt) = <c>{record_field,LINE,Rep(Gt_0),Name,Rep(Field)}</c>.</item>
+      <item>If Gt is a record field index <c>#Name.Field</c>,
+       where <c>Field</c> is an atom, then
+       Rep(Gt) = <c>{record_index,LINE,Name,Rep(Field)}</c>.</item>
+      <item>If Gt is a tuple skeleton <c>{Gt_1, ..., Gt_k}</c>, then
+       Rep(Gt) = <c>{tuple,LINE,[Rep(Gt_1), ..., Rep(Gt_k)]}</c>.</item>
+      <item>If Gt is a variable pattern <c>V</c>, then
+       Rep(Gt) = <c>{var,LINE,A}</c>, where A is an atom with
+       a printname consisting of the same characters as <c>V</c>.</item>
     </list>
     <p>Note that every guard test has the same source form as some expression,
       and is represented the same way as the corresponding expression.</p>
@@ -492,91 +537,83 @@
   <section>
     <title>Types</title>
     <list type="bulleted">
-      <item>If T is an annotated type <c>Anno :: Type</c>,
-       where <c>Anno</c> is a variable and
-       <c>Type</c> is a type, then Rep(T) =
-       <c>{ann_type,LINE,[Rep(Anno),Rep(Type)]}</c>.</item>
+      <item>If T is an annotated type <c>A :: T_0</c>,
+       where <c>A</c> is a variable, then Rep(T) =
+       <c>{ann_type,LINE,[Rep(A),Rep(T_0)]}</c>.</item>
       <item>If T is an atom or integer literal L, then Rep(T) = Rep(L).
       </item>
-      <item>If T is <c>L Op R</c>,
-       where <c>Op</c> is a binary operator and <c>L</c> and <c>R</c>
-       are types  (this is an occurrence of an expression that can be
-       evaluated to an integer at compile time), then
-       Rep(T) = <c>{op,LINE,Op,Rep(L),Rep(R)}</c>.</item>
-      <item>If T is <c>Op A</c>, where <c>Op</c> is a
-       unary operator and <c>A</c> is a type (this is an occurrence of
-       an expression that can be evaluated to an integer at compile time),
-       then Rep(T) = <c>{op,LINE,Op,Rep(A)}</c>.</item>
-      <item>If T is a bitstring type <c>&lt;&lt;_:M,_:_*N>></c>,
+      <item>If T is a bit string type <c>&lt;&lt;_:M,_:_*N>></c>,
        where <c>M</c> and <c>N</c> are singleton integer types, then Rep(T) =
        <c>{type,LINE,binary,[Rep(M),Rep(N)]}</c>.</item>
       <item>If T is the empty list type <c>[]</c>, then Rep(T) =
        <c>{type,Line,nil,[]}</c>.</item>
       <item>If T is a fun type <c>fun()</c>, then Rep(T) =
        <c>{type,LINE,'fun',[]}</c>.</item>
-      <item>If T is a fun type <c>fun((...) -> B)</c>,
-       where <c>B</c> is a type, then
-       Rep(T) = <c>{type,LINE,'fun',[{type,LINE,any},Rep(B)]}</c>.
+      <item>If T is a fun type <c>fun((...) -> T_0)</c>, then
+       Rep(T) = <c>{type,LINE,'fun',[{type,LINE,any},Rep(T_0)]}</c>.
        </item>
       <item>If T is a fun type <c>fun(Ft)</c>, where
        <c>Ft</c> is a function type,
-       then Rep(T) = <c>Rep(Ft)</c>.</item>
+       then Rep(T) = <c>Rep(Ft)</c>. For Rep(Ft), see below.</item>
       <item>If T is an integer range type <c>L .. H</c>,
        where <c>L</c> and <c>H</c> are singleton integer types, then
        Rep(T) = <c>{type,LINE,range,[Rep(L),Rep(H)]}</c>.</item>
       <item>If T is a map type <c>map()</c>, then Rep(T) =
        <c>{type,LINE,map,any}</c>.</item>
-      <item>If T is a map type <c>#{P_1, ..., P_k}</c>, where each
-       <c>P_i</c> is a map pair type, then Rep(T) =
-       <c>{type,LINE,map,[Rep(P_1), ..., Rep(P_k)]}</c>.</item>
-      <item>If T is a map pair type <c>K => V</c>, where
-       <c>K</c> and <c>V</c> are types, then Rep(T) =
-       <c>{type,LINE,map_field_assoc,[Rep(K),Rep(V)]}</c>.</item>
-      <item>If T is a predefined (or built-in) type <c>N(A_1, ..., A_k)</c>,
-       where each <c>A_i</c> is a type, then Rep(T) =
-       <c>{type,LINE,N,[Rep(A_1), ..., Rep(A_k)]}</c>.</item>
+      <item>If T is a map type <c>#{A_1, ..., A_k}</c>, where each
+       <c>A_i</c> is an association type, then Rep(T) =
+       <c>{type,LINE,map,[Rep(A_1), ..., Rep(A_k)]}</c>.
+       For Rep(A), see below.</item>
+      <item>If T is an operator type <c>T_1 Op T_2</c>,
+       where <c>Op</c> is a binary operator (this is an occurrence of
+       an expression that can be evaluated to an integer at compile
+       time), then
+       Rep(T) = <c>{op,LINE,Op,Rep(T_1),Rep(T_2)}</c>.</item>
+      <item>If T is an operator type <c>Op T_0</c>, where <c>Op</c> is a
+       unary operator (this is an occurrence of
+       an expression that can be evaluated to an integer at compile time),
+       then Rep(T) = <c>{op,LINE,Op,Rep(T_0)}</c>.</item>
+      <item>If T is <c>( T_0 )</c>, then Rep(T) = <c>Rep(T_0)</c>,
+       that is, parenthesized types cannot be distinguished from their
+       bodies.</item>
+      <item>If T is a predefined (or built-in) type <c>N(T_1, ..., T_k)</c>,
+       then Rep(T) =
+       <c>{type,LINE,N,[Rep(T_1), ..., Rep(T_k)]}</c>.</item>
       <item>If T is a record type <c>#Name{F_1, ..., F_k}</c>,
        where each <c>F_i</c> is a record field type, then Rep(T) =
        <c>{type,LINE,record,[Rep(Name),Rep(F_1), ..., Rep(F_k)]}</c>.
-       </item>
-      <item>If T is a record field type <c>Name :: Type</c>,
-       where <c>Type</c> is a type, then Rep(T) =
-       <c>{type,LINE,field_type,[Rep(Name),Rep(Type)]}</c>.</item>
-      <item>If T is a remote type <c>M:N(A_1, ..., A_k)</c>, where
-       each <c>A_i</c> is a type, then Rep(T) =
-       <c>{remote_type,LINE,[Rep(M),Rep(N),[Rep(A_1), ..., Rep(A_k)]]}</c>.
+       For Rep(F), see below.</item>
+      <item>If T is a remote type <c>M:N(T_1, ..., T_k)</c>, then Rep(T) =
+       <c>{remote_type,LINE,[Rep(M),Rep(N),[Rep(T_1), ..., Rep(T_k)]]}</c>.
        </item>
       <item>If T is a tuple type <c>tuple()</c>, then Rep(T) =
        <c>{type,LINE,tuple,any}</c>.</item>
-      <item>If T is a tuple type <c>{A_1, ..., A_k}</c>, where
-       each <c>A_i</c> is a type, then Rep(T) =
-       <c>{type,LINE,tuple,[Rep(A_1), ..., Rep(A_k)]}</c>.</item>
-      <item>If T is a type union <c>T_1 | ... | T_k</c>,
-       where each <c>T_i</c> is a type, then Rep(T) =
+      <item>If T is a tuple type <c>{T_1, ..., T_k}</c>, then Rep(T) =
+       <c>{type,LINE,tuple,[Rep(T_1), ..., Rep(T_k)]}</c>.</item>
+      <item>If T is a type union <c>T_1 | ... | T_k</c>, then Rep(T) =
        <c>{type,LINE,union,[Rep(T_1), ..., Rep(T_k)]}</c>.</item>
       <item>If T is a type variable <c>V</c>, then Rep(T) =
        <c>{var,LINE,A}</c>, where <c>A</c> is an atom with a printname
        consisting of the same characters as <c>V</c>. A type variable
        is any variable except underscore (<c>_</c>).</item>
-      <item>If T is a user-defined type <c>N(A_1, ..., A_k)</c>,
-       where each <c>A_i</c> is a type, then Rep(T) =
-       <c>{user_type,LINE,N,[Rep(A_1), ..., Rep(A_k)]}</c>.</item>
-      <item>If T is <c>( T_0 )</c>, then Rep(T) = <c>Rep(T_0)</c>,
-       that is, parenthesized types cannot be distinguished from their
-       bodies.</item>
+      <item>If T is a user-defined type <c>N(T_1, ..., T_k)</c>,
+       then Rep(T) =
+       <c>{user_type,LINE,N,[Rep(T_1), ..., Rep(T_k)]}</c>.</item>
     </list>
 
     <section>
       <title>Function Types</title>
+      <p>A function type Ft is one of the following alternatives:</p>
       <list type="bulleted">
        <item>If Ft is a constrained function type <c>Ft_1 when Fc</c>,
 	where <c>Ft_1</c> is a function type and
 	<c>Fc</c> is a function constraint, then Rep(T) =
-	<c>{type,LINE,bounded_fun,[Rep(Ft_1),Rep(Fc)]}</c>.</item>
-       <item>If Ft is a function type <c>(A_1, ..., A_n) -> B</c>,
-        where each <c>A_i</c> and <c>B</c> are types, then
-	Rep(Ft) = <c>{type,LINE,'fun',[{type,LINE,product,[Rep(A_1),
-	..., Rep(A_n)]},Rep(B)]}</c>.</item>
+	<c>{type,LINE,bounded_fun,[Rep(Ft_1),Rep(Fc)]}</c>.
+        For Rep(Fc), see below.</item>
+       <item>If Ft is a function type <c>(T_1, ..., T_n) -> T_0</c>,
+        where each <c>T_i</c> is a type, then
+	Rep(Ft) = <c>{type,LINE,'fun',[{type,LINE,product,[Rep(T_1),
+	..., Rep(T_n)]},Rep(T_0)]}</c>.</item>
       </list>
     </section>
 
@@ -592,6 +629,24 @@
        </item>
       </list>
     </section>
+
+    <section>
+      <title>Association Types</title>
+      <list type="bulleted">
+       <item>If A is an association type <c>K => V</c>, where
+        <c>K</c> and <c>V</c> are types, then Rep(A) =
+        <c>{type,LINE,map_field_assoc,[Rep(K),Rep(V)]}</c>.</item>
+      </list>
+    </section>
+
+    <section>
+      <title>Record Field Types</title>
+      <list type="bulleted">
+       <item>If F is a record field type <c>Name :: Type</c>,
+	where <c>Type</c> is a type, then Rep(F) =
+	<c>{type,LINE,field_type,[Rep(Name),Rep(Type)]}</c>.</item>
+      </list>
+    </section>
   </section>
 
   <section>
diff --git a/erts/doc/src/driver_entry.xml b/erts/doc/src/driver_entry.xml
index bad20d6343..ae7f264d0c 100644
--- a/erts/doc/src/driver_entry.xml
+++ b/erts/doc/src/driver_entry.xml
@@ -247,14 +247,10 @@ typedef struct erl_drv_entry {
           something that the <c>WaitForMultipleObjects</c> API
           function understands). (Some trickery in the emulator allows
           more than the built-in limit of 64 <c>Events</c> to be used.)</p>
-	  <p>On Enea OSE the <c>event</c> is one or more signals that can
-	  be retrieved using <seealso marker="ose:ose_erl_driver#erl_drv_ose_get_signal">erl_drv_ose_get_signal</seealso>.</p>
         <p>To use this with threads and asynchronous routines, create a
-          pipe on unix, an Event on Windows or a unique signal number on
-	  Enea OSE. When the routine
+          pipe on unix and an Event on Windows. When the routine
           completes, write to the pipe (use <c>SetEvent</c> on
-          Windows or send a message to the emulator process on Enea OSE),
-	  this will make the emulator call
+          Windows), this will make the emulator call
           <c>ready_input</c> or <c>ready_output</c>.</p>
           <p>Spurious events may happen. That is, calls to <c>ready_input</c>
           or <c>ready_output</c> even though no real events are signaled. In
@@ -441,7 +437,14 @@ typedef struct erl_drv_entry {
 	  <seealso marker="erl_driver#erl_drv_busy_msgq_limits">erl_drv_busy_msgq_limits()</seealso>
 	  function.
           </item>
-        </taglist> 
+          <tag><c>ERL_DRV_FLAG_USE_INIT_ACK</c></tag>
+          <item>When this flag is given the linked-in driver has to manually
+          acknowledge that the port has been successfully started using 
+	  <seealso marker="erl_driver#erl_drv_init_ack">erl_drv_init_ack()</seealso>.
+          This allows the implementor to make the erlang:open_port exit with
+          badarg after some initial asynchronous initialization has been done.
+          </item>
+        </taglist>
       </item>
       <tag>void *handle2</tag>
       <item>
diff --git a/erts/doc/src/epmd.xml b/erts/doc/src/epmd.xml
index 28fcc8f7af..7f61804bea 100644
--- a/erts/doc/src/epmd.xml
+++ b/erts/doc/src/epmd.xml
@@ -37,7 +37,7 @@
   <comsummary>
   <p>Erlang Port Mapper Daemon</p>
   <taglist>
-  <tag><c><![CDATA[epmd [-d|-debug] [DbgExtra...] [-port No] [-daemon] [-relaxed_command_check]]]></c></tag>
+  <tag><c><![CDATA[epmd [-d|-debug] [DbgExtra...] [-address Addresses] [-port No] [-daemon] [-relaxed_command_check]]]></c></tag>
   <item>
   <p>Starts the port mapper daemon</p>
   </item>
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index e8621fecc3..096af096dc 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -387,6 +387,28 @@
         <p>Replaces the path specified in the boot script. See
           <seealso marker="sasl:script">script(4)</seealso>.</p>
       </item>
+      <tag><c><![CDATA[-proto_dist Proto]]></c></tag>
+      <item>
+        <p>Specify a protocol for Erlang distribution.</p>
+	    <taglist>
+	      <tag><c>inet_tcp</c></tag>
+              <item>
+                  <p>TCP over IPv4 (the default)</p>
+              </item>
+	      <tag><c>inet_tls</c></tag>
+              <item>
+                  <p>distribution over TLS/SSL</p>
+              </item>
+	      <tag><c>inet6_tcp</c></tag>
+              <item>
+                  <p>TCP over IPv6</p>
+              </item>
+        </taglist>
+        <p>For example, to start up IPv6 distributed nodes:</p>
+<pre>
+% <input>erl -name [email protected] -proto_dist inet6_tcp</input>
+</pre>
+      </item>
       <tag><c><![CDATA[-remsh Node]]></c></tag>
       <item>
         <p>Starts Erlang with a remote shell connected to <c><![CDATA[Node]]></c>.</p>
@@ -1339,6 +1361,21 @@
           <seealso marker="kernel:error_logger#warning_map/0">error_logger(3)</seealso>
           for further information.</p>
       </item>
+      <tag><c><![CDATA[+xFlag Value]]></c></tag>
+      <item>
+        <p>Default process flag settings.</p>
+        <taglist>
+          <tag><marker id="+xmqd"><c>+xmqd off_heap|on_heap|mixed</c></marker></tag>
+          <item><p>
+	    Sets the default value for the process flag
+	    <c>message_queue_data</c>. If <c>+xmqd</c> is not
+	    passed, <c>mixed</c> will be the default. For more information,
+	    see the documentation of
+            <seealso marker="erlang#process_flag_message_queue_data"><c>process_flag(message_queue_data,
+	    MQD)</c></seealso>.
+	  </p></item>
+	</taglist>
+      </item>
       <tag><c><![CDATA[+zFlag Value]]></c></tag>
       <item>
         <p>Miscellaneous flags.</p>
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml
index e717fc0c4e..241d4131d5 100644
--- a/erts/doc/src/erl_driver.xml
+++ b/erts/doc/src/erl_driver.xml
@@ -347,6 +347,16 @@
 	  the driver does not handle sizes that overflow an <c>int</c>
 	  all will work as before.</p>
       </item>
+      <tag><marker id="time_measurement"/>Time Measurement</tag>
+      <item><p>Support for time measurement in drivers:
+      <list>
+	<item><seealso marker="#ErlDrvTime"><c>ErlDrvTime</c></seealso></item>
+	<item><seealso marker="#ErlDrvTimeUnit"><c>ErlDrvTimeUnit</c></seealso></item>
+	<item><seealso marker="#erl_drv_monotonic_time"><c>erl_drv_monotonic_time()</c></seealso></item>
+	<item><seealso marker="#erl_drv_time_offset"><c>erl_drv_time_offset()</c></seealso></item>
+	<item><seealso marker="#erl_drv_convert_time_unit"><c>erl_drv_convert_time_unit()</c></seealso></item>
+      </list></p>
+      </item>
     </taglist>
   </section>
 
@@ -860,6 +870,24 @@ typedef struct ErlIOVec {
 	   <seealso marker="#erl_drv_tsd_get">erl_drv_tsd_get()</seealso>.
 	</p>
       </item>
+      <tag><marker id="ErlDrvTime"/>ErlDrvTime</tag>
+      <item>
+        <p>A signed 64-bit integer type for representation of time.</p>
+      </item>
+      <tag><marker id="ErlDrvTimeUnit"/>ErlDrvTimeUnit</tag>
+      <item>
+        <p>An enumeration of time units supported by the driver API:</p>
+	<taglist>
+	  <tag><c>ERL_DRV_SEC</c></tag>
+	  <item><p>Seconds</p></item>
+	  <tag><c>ERL_DRV_MSEC</c></tag>
+	  <item><p>Milliseconds</p></item>
+	  <tag><c>ERL_DRV_USEC</c></tag>
+	  <item><p>Microseconds</p></item>
+	  <tag><c>ERL_DRV_NSEC</c></tag>
+	  <item><p>Nanoseconds</p></item>
+	</taglist>
+      </item>
      </taglist>
    </section>
 
@@ -1023,6 +1051,11 @@ typedef struct ErlIOVec {
       <fsummary>Read a system timestamp</fsummary>
       <desc>
         <marker id="driver_get_now"></marker>
+	<warning><p><em>This function is deprecated! Do not use it!</em>
+	Use <seealso marker="#erl_drv_monotonic_time"><c>erl_drv_monotonic_time()</c></seealso>
+	(perhaps in combination with
+	<seealso marker="#erl_drv_time_offset"><c>erl_drv_time_offset()</c></seealso>)
+	instead.</p></warning>
         <p>This function reads a timestamp into the memory pointed to by
           the parameter <c>now</c>. See the description of <seealso marker="#ErlDrvNowData">ErlDrvNowData</seealso> for
           specification of its fields.  </p>
@@ -1044,9 +1077,7 @@ typedef struct ErlIOVec {
           <c>select</c>/<c>poll</c> can use).
           On windows, the Win32 API function <c>WaitForMultipleObjects</c>
           is used. This places other restrictions on the event object.
-          Refer to the Win32 SDK documentation.
-	  On Enea OSE, the receive function is used. See the <seealso
-	  marker="ose:ose_erl_driver"></seealso> for more details.</p>
+          Refer to the Win32 SDK documentation.</p>
         <p>The <c>on</c> parameter should be <c>1</c> for setting events
           and <c>0</c> for clearing them.</p>
         <p>The <c>mode</c> argument is a bitwise-or combination of
@@ -1058,7 +1089,7 @@ typedef struct ErlIOVec {
           <seealso marker="driver_entry#ready_output">ready_output</seealso>.
           </p>
     <note>
-      <p>Some OS (Windows and Enea OSE) do not differentiate between read and write events.
+      <p>Some OS (Windows) do not differentiate between read and write events.
          The call-back for a fired event then only depends on the value of <c>mode</c>.</p>
     </note>
         <p><c>ERL_DRV_USE</c> specifies if we are using the event object or if we want to close it.
@@ -2133,6 +2164,53 @@ ERL_DRV_MAP          int sz
     </func>
 
     <func>
+      <name><ret>void</ret><nametext>erl_drv_init_ack(ErlDrvPort port, ErlDrvData res)</nametext></name>
+      <fsummary>Acknowledge the start of the port</fsummary>
+      <desc>
+        <marker id="erl_drv_init_ack"></marker>
+        <p>Arguments:</p>
+        <taglist>
+          <tag><c>port</c></tag>
+          <item>The port handle of the port (driver instance) creating
+           doing the acknowledgment.
+	  </item>
+          <tag><c>res</c></tag>
+          <item>The result of the port initialization. This can be the same values
+          as the return value of <seealso marker="driver_entry#start">start</seealso>,
+          i.e any of the error codes or the ErlDrvData that is to be used for this
+          port.
+          </item>
+        </taglist>
+        <p>
+          When this function is called the initiating erlang:open_port call is
+          returned as if the <seealso marker="driver_entry#start">start</seealso>
+          function had just been called. It can only be used when the
+          <seealso marker="driver_entry#driver_flags">ERL_DRV_FLAG_USE_INIT_ACK</seealso>
+          flag has been set on the linked-in driver.
+        </p>
+      </desc>
+    </func>
+
+    <func>
+      <name><ret>void</ret><nametext>erl_drv_set_os_pid(ErlDrvPort port, ErlDrvSInt pid)</nametext></name>
+      <fsummary>Set the os_pid for the port</fsummary>
+      <desc>
+        <marker id="erl_drv_set_os_pid"></marker>
+        <p>Arguments:</p>
+        <taglist>
+          <tag><c>port</c></tag>
+          <item>The port handle of the port (driver instance) to set the pid on.
+	  </item>
+          <tag><c>pid</c></tag>
+          <item>The pid to set.</item>
+        </taglist>
+        <p>
+          Set the os_pid seen when doing erlang:port_info/2 on this port.
+        </p>
+      </desc>
+    </func>
+
+    <func>
       <name><ret>int</ret><nametext>erl_drv_thread_create(char *name,
 				      ErlDrvTid *tid,
 				      void * (*func)(void *),
@@ -2997,6 +3075,86 @@ ERL_DRV_MAP          int sz
 		</desc>
 	</func>
 
+	<func>
+	  <name><ret>ErlDrvTime</ret><nametext>erl_drv_monotonic_time(ErlDrvTimeUnit time_unit)</nametext></name>
+	  <fsummary>Get Erlang Monotonic Time</fsummary>
+	  <desc>
+	    <marker id="erl_drv_monotonic_time"></marker>
+	    <p>Arguments:</p>
+	    <taglist>
+	      <tag><c>time_unit</c></tag>
+	      <item>Time unit of returned value.</item>
+	    </taglist>
+	    <p>
+	      Returns
+	      <seealso marker="time_correction#Erlang_Monotonic_Time">Erlang
+	      monotonic time</seealso>. Note that it is not uncommon with
+	      negative values.
+	    </p>
+	    <p>Returns <c>ERL_DRV_TIME_ERROR</c> if called with an invalid
+	    time unit argument, or if called from a thread that is not a
+	    scheduler thread.</p>
+	    <p>See also:</p>
+	    <list>
+	      <item><seealso marker="#ErlDrvTime"><c>ErlDrvTime</c></seealso></item>
+	      <item><seealso marker="#ErlDrvTimeUnit"><c>ErlDrvTimeUnit</c></seealso></item>
+	    </list>
+	  </desc>
+	</func>
+
+	<func>
+	  <name><ret>ErlDrvTime</ret><nametext>erl_drv_time_offset(ErlDrvTimeUnit time_unit)</nametext></name>
+	  <fsummary>Get current Time Offset</fsummary>
+	  <desc>
+	    <marker id="erl_drv_time_offset"></marker>
+	    <p>Arguments:</p>
+	    <taglist>
+	      <tag><c>time_unit</c></tag>
+	      <item>Time unit of returned value.</item>
+	    </taglist>
+	    <p>Returns the current time offset between
+	    <seealso marker="time_correction#Erlang_Monotonic_Time">Erlang monotonic time</seealso>
+	    and
+	    <seealso marker="time_correction#Erlang_System_Time">Erlang system time</seealso>
+	    converted into the <c>time_unit</c> passed as argument.</p>
+	    <p>Returns <c>ERL_DRV_TIME_ERROR</c> if called with an invalid
+	    time unit argument, or if called from a thread that is not a
+	    scheduler thread.</p>
+	    <p>See also:</p>
+	    <list>
+	      <item><seealso marker="#ErlDrvTime"><c>ErlDrvTime</c></seealso></item>
+	      <item><seealso marker="#ErlDrvTimeUnit"><c>ErlDrvTimeUnit</c></seealso></item>
+	    </list>
+	  </desc>
+	</func>
+
+	<func>
+	  <name><ret>ErlDrvTime</ret><nametext>erl_drv_convert_time_unit(ErlDrvTime val, ErlDrvTimeUnit from, ErlDrvTimeUnit to)</nametext></name>
+	  <fsummary>Convert time unit of a time value</fsummary>
+	  <desc>
+	    <marker id="erl_drv_convert_time_unit"></marker>
+	    <p>Arguments:</p>
+	    <taglist>
+	      <tag><c>val</c></tag>
+	      <item>Value to convert time unit for.</item>
+	      <tag><c>from</c></tag>
+	      <item>Time unit of <c>val</c>.</item>
+	      <tag><c>to</c></tag>
+	      <item>Time unit of returned value.</item>
+	    </taglist>
+	    <p>Converts the <c>val</c> value of time unit <c>from</c> to
+	    the corresponding value of time unit <c>to</c>. The result is
+	    rounded using the floor function.</p>
+	    <p>Returns <c>ERL_DRV_TIME_ERROR</c> if called with an invalid
+	    time unit argument.</p>
+	    <p>See also:</p>
+	    <list>
+	      <item><seealso marker="#ErlDrvTime"><c>ErlDrvTime</c></seealso></item>
+	      <item><seealso marker="#ErlDrvTimeUnit"><c>ErlDrvTimeUnit</c></seealso></item>
+	    </list>
+	  </desc>
+	</func>
+
   </funcs>
   <section>
     <title>SEE ALSO</title>
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml
index 2d8706169f..1e95634d1b 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -317,6 +317,17 @@ ok
       libraries might however fail if deprecated features are used.
       </p></item>
 
+      <tag><marker id="time_measurement"/>Time Measurement</tag>
+      <item><p>Support for time measurement in NIF libraries:
+      <list>
+	<item><seealso marker="#ErlNifTime"><c>ErlNifTime</c></seealso></item>
+	<item><seealso marker="#ErlNifTimeUnit"><c>ErlNifTimeUnit</c></seealso></item>
+	<item><seealso marker="#enif_monotonic_time"><c>enif_monotonic_time()</c></seealso></item>
+	<item><seealso marker="#enif_time_offset"><c>enif_time_offset()</c></seealso></item>
+	<item><seealso marker="#enif_convert_time_unit"><c>enif_convert_time_unit()</c></seealso></item>
+      </list></p>
+      </item>
+
       <tag>Long-running NIFs</tag>
       <item><p><marker id="dirty_nifs"/>Native functions
       <seealso marker="#lengthy_work">
@@ -513,6 +524,18 @@ typedef struct {
           <p>Note that <c>ErlNifBinary</c> is a semi-opaque type and you are
           only allowed to read fields <c>size</c> and <c>data</c>.</p>
       </item>
+
+      <tag><marker id="ErlNifBinaryToTerm"/>ErlNifBinaryToTerm</tag>
+      <item>
+        <p>An enumeration of the options that can be given to
+        <seealso marker="#enif_binary_to_term">enif_binary_to_term</seealso>.
+	For default behavior, use the value <c>0</c>.</p>
+        <taglist>
+	  <tag><c>ERL_NIF_BIN2TERM_SAFE</c></tag>
+	  <item><p>Use this option when receiving data from untrusted sources.</p></item>
+	</taglist>
+      </item>
+
       <tag><marker id="ErlNifPid"/>ErlNifPid</tag>
        <item>
           <p><c>ErlNifPid</c> is a process identifier (pid). In contrast to
@@ -521,6 +544,14 @@ typedef struct {
           <seealso marker="#ErlNifEnv">environment</seealso>. <c>ErlNifPid</c>
           is an opaque type.</p>
         </item>
+      <tag><marker id="ErlNifPort"/>ErlNifPort</tag>
+       <item>
+          <p><c>ErlNifPort</c> is a port identifier. In contrast to
+          port id terms (instances of <c>ERL_NIF_TERM</c>), <c>ErlNifPort</c>'s are self
+          contained and not bound to any
+          <seealso marker="#ErlNifEnv">environment</seealso>. <c>ErlNifPort</c>
+          is an opaque type.</p>
+        </item>
 
       <tag><marker id="ErlNifResourceType"/>ErlNifResourceType</tag>
        <item>
@@ -560,6 +591,40 @@ typedef enum {
                <item><p>A native signed 64-bit integer type.</p></item>
               <tag><marker id="ErlNifUInt64"/>ErlNifUInt64</tag>
                <item><p>A native unsigned 64-bit integer type.</p></item>
+	       
+      <tag><marker id="ErlNifTime"/>ErlNifTime</tag>
+      <item>
+        <p>A signed 64-bit integer type for representation of time.</p>
+      </item>
+      <tag><marker id="ErlNifTimeUnit"/>ErlNifTimeUnit</tag>
+      <item>
+        <p>An enumeration of time units supported by the NIF API:</p>
+	<taglist>
+	  <tag><c>ERL_NIF_SEC</c></tag>
+	  <item><p>Seconds</p></item>
+	  <tag><c>ERL_NIF_MSEC</c></tag>
+	  <item><p>Milliseconds</p></item>
+	  <tag><c>ERL_NIF_USEC</c></tag>
+	  <item><p>Microseconds</p></item>
+	  <tag><c>ERL_NIF_NSEC</c></tag>
+	  <item><p>Nanoseconds</p></item>
+	</taglist>
+      </item>
+
+      <tag><marker id="ErlNifUniqueInteger"/>ErlNifUniqueInteger</tag>
+      <item>
+        <p>An enumeration of the properties that can be requested from
+        <seealso marker="#enif_make_unique_integer">enif_unique_integer</seealso>.
+	For default properties, use the value <c>0</c>.</p>
+        <taglist>
+	  <tag><c>ERL_NIF_UNIQUE_POSITIVE</c></tag>
+	  <item><p>Return only positive integers</p></item>
+	  <tag><c>ERL_NIF_UNIQUE_MONOTONIC</c></tag>
+	  <item><p>Return only
+	  <seealso marker="time_correction#Strictly_Monotonically_Increasing">strictly
+	  monotonically increasing</seealso> integer corresponding to creation time</p></item>
+	</taglist>
+      </item>
 
     </taglist>
   </section>
@@ -602,6 +667,25 @@ typedef enum {
       have been allocated with <seealso marker="#enif_alloc_env">enif_alloc_env</seealso>.
       </p></desc>
     </func>
+    <func><name><ret>size_t</ret><nametext>enif_binary_to_term(ErlNifEnv *env, const unsigned char* data, size_t size, ERL_NIF_TERM *term, ErlNifBinaryToTerm opts)</nametext></name>
+    <fsummary>Create a term from the external format</fsummary>
+    <desc>
+      <p>Create a term that is the result of decoding the binary data
+      at <c>data</c>, which must be encoded according to the Erlang external term format.
+      No more than <c>size</c> bytes are read from <c>data</c>. Argument <c>opts</c>
+      correspond to the second argument to <seealso marker="erlang#binary_to_term-2">
+      <c>erlang:binary_to_term/2</c></seealso>, and must be either <c>0</c> or
+      <c>ERL_NIF_BIN2TERM_SAFE</c>.</p>
+      <p>On success, store the resulting term at <c>*term</c> and return
+      the actual number of bytes read. Return zero if decoding fails or if <c>opts</c>
+      is invalid.</p>
+      <p>See also:
+        <seealso marker="#ErlNifBinaryToTerm"><c>ErlNifBinaryToTerm</c></seealso>,
+        <seealso marker="erlang#binary_to_term-2"><c>erlang:binary_to_term/2</c></seealso> and
+        <seealso marker="#enif_term_to_binary"><c>enif_term_to_binary</c></seealso>.
+      </p>
+    </desc>
+    </func>
     <func><name><ret>int</ret><nametext>enif_compare(ERL_NIF_TERM lhs, ERL_NIF_TERM rhs)</nametext></name>
       <fsummary>Compare two terms</fsummary>
       <desc><p>Return an integer less than, equal to, or greater than
@@ -659,7 +743,48 @@ typedef enum {
     a number of repeated NIF-calls without the need to create threads.
     See also the <seealso marker="#WARNING">warning</seealso> text at the beginning of this document.</p>
     </desc>
+
     </func>
+
+    <func>
+      <name><ret>ErlNifTime</ret><nametext>enif_convert_time_unit(ErlNifTime val, ErlNifTimeUnit from, ErlNifTimeUnit to)</nametext></name>
+      <fsummary>Convert time unit of a time value</fsummary>
+      <desc>
+	<marker id="enif_convert_time_unit"></marker>
+	<p>Arguments:</p>
+	<taglist>
+	  <tag><c>val</c></tag>
+	  <item>Value to convert time unit for.</item>
+	  <tag><c>from</c></tag>
+	  <item>Time unit of <c>val</c>.</item>
+	  <tag><c>to</c></tag>
+	  <item>Time unit of returned value.</item>
+	</taglist>
+	<p>Converts the <c>val</c> value of time unit <c>from</c> to
+	the corresponding value of time unit <c>to</c>. The result is
+	rounded using the floor function.</p>
+	<p>Returns <c>ERL_NIF_TIME_ERROR</c> if called with an invalid
+	time unit argument.</p>
+	<p>See also:
+	  <seealso marker="#ErlNifTime"><c>ErlNifTime</c></seealso> and
+	  <seealso marker="#ErlNifTimeUnit"><c>ErlNifTimeUnit</c></seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name><ret>ERL_NIF_TERM</ret><nametext>enif_cpu_time(ErlNifEnv *)</nametext></name>
+      <fsummary></fsummary>
+      <desc>
+        <p>Returns the CPU time in the same format as <seealso marker="erlang#timestamp-0">erlang:timestamp()</seealso>.
+        The CPU time is the time the current logical cpu has spent executing since
+        some arbitrary point in the past.
+        If the OS does not support fetching of this value <c>enif_cpu_time</c>
+        invokes <seealso marker="#enif_make_badarg">enif_make_badarg</seealso>.
+        </p>
+      </desc>
+    </func>
+
     <func><name><ret>int</ret><nametext>enif_equal_tids(ErlNifTid tid1, ErlNifTid tid2)</nametext></name>
     <fsummary></fsummary>
     <desc><p>Same as <seealso marker="erl_driver#erl_drv_equal_tids">erl_drv_equal_tids</seealso>.
@@ -714,6 +839,12 @@ typedef enum {
     pid variable <c>*pid</c> from it and return true. Otherwise return false.
     No check if the process is alive is done.</p></desc>
     </func>
+    <func><name><ret>int</ret><nametext>enif_get_local_port(ErlNifEnv* env, ERL_NIF_TERM term, ErlNifPort* port_id)</nametext></name>
+    <fsummary>Read an local port term</fsummary>
+    <desc><p>If <c>term</c> identifies a node local port, initialize the
+    port variable <c>*port_id</c> from it and return true. Otherwise return false.
+    No check if the port is alive is done.</p></desc>
+    </func>
     <func><name><ret>int</ret><nametext>enif_get_list_cell(ErlNifEnv* env, ERL_NIF_TERM list, ERL_NIF_TERM* head, ERL_NIF_TERM* tail)</nametext></name>
       <fsummary>Get head and tail from a list</fsummary>
       <desc><p>Set <c>*head</c> and <c>*tail</c> from
@@ -723,7 +854,7 @@ typedef enum {
     <func><name><ret>int</ret><nametext>enif_get_list_length(ErlNifEnv* env, ERL_NIF_TERM term, unsigned* len)</nametext></name>
       <fsummary>Get the length of list <c>term</c></fsummary>
       <desc><p>Set <c>*len</c> to the length of list <c>term</c> and return true,
-      or return false if <c>term</c> is not a list.</p></desc>
+      or return false if <c>term</c> is not a proper list.</p></desc>
     </func>
     <func><name><ret>int</ret><nametext>enif_get_long(ErlNifEnv* env, ERL_NIF_TERM term, long int* ip)</nametext></name>
       <fsummary>Read an long integer term</fsummary>
@@ -882,6 +1013,17 @@ typedef enum {
       <fsummary>Determine if a term is a port</fsummary>
       <desc><p>Return true if <c>term</c> is a port.</p></desc>
     </func>
+    <func><name><ret>int</ret><nametext>enif_is_port_alive(ErlNifEnv* env, ErlNifPort *port_id)</nametext></name>
+      <fsummary>Determine if a local port is alive or not.</fsummary>
+      <desc><p>Return true if <c>port_id</c> is currently alive.</p>
+      <p>This function can only be used in a from a NIF-calling thread.</p></desc>
+    </func>
+    <func><name><ret>int</ret><nametext>enif_is_process_alive(ErlNifEnv* env, ErlNifPid *pid)</nametext></name>
+      <fsummary>Determine if a local process is alive or not.</fsummary>
+      <desc><p>Return true if <c>pid</c> is currently alive.</p>
+      <p>This function is only thread-safe when the emulator with SMP support is used.
+      It can only be used in a non-SMP emulator from a NIF-calling thread.</p></desc>
+    </func>
     <func><name><ret>int</ret><nametext>enif_is_ref(ErlNifEnv* env, ERL_NIF_TERM term)</nametext></name>
       <fsummary>Determine if a term is a reference</fsummary>
       <desc><p>Return true if <c>term</c> is a reference.</p></desc>
@@ -931,7 +1073,7 @@ typedef enum {
       <seealso marker="#enif_is_exception">enif_is_exception</seealso>, but
       not to any other NIF API function.</p>
       <p>See also: <seealso marker="#enif_has_pending_exception">enif_has_pending_exception</seealso>
-      and <seealso marker="#enif_raise_exception">enif_raise_exception</seealso>
+      and <seealso marker="#enif_raise_exception">enif_raise_exception</seealso>.
       </p>
       <note><p>In earlier versions (older than erts-7.0, OTP 18) the return value
       from <c>enif_make_badarg</c> had to be returned from the NIF. This
@@ -1165,6 +1307,23 @@ typedef enum {
       <fsummary>Create an unsigned integer term</fsummary>
       <desc><p>Create an integer term from an unsigned 64-bit integer.</p></desc>
     </func>
+    <func>
+      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_unique_integer(ErlNifEnv *env, ErlNifUniqueInteger properties)</nametext></name>
+      <fsummary></fsummary>
+      <desc>
+        <p>Returns a unique integer with the same properties as given by <seealso marker="erlang#unique_integer-1">erlang:unique_integer/1</seealso>.</p>
+        <p><c>env</c> is the environment to create the integer in.</p>
+        <p>
+          <c>ERL_NIF_UNIQUE_POSITIVE</c> and <c>ERL_NIF_UNIQUE_MONOTONIC</c> can
+          be passed as the second argument to change the properties of the
+          integer returned. It is possible to combine them by or:ing the
+          two values together.
+        </p>
+        <p>See also:
+	<seealso marker="#ErlNifUniqueInteger"><c>ErlNifUniqueInteger</c></seealso>.
+	</p>
+      </desc>
+    </func>
     <func><name><ret>ERL_NIF_TERM</ret><nametext>enif_make_ulong(ErlNifEnv* env, unsigned long i)</nametext></name>
       <fsummary>Create an integer term from an unsigned long int</fsummary>
       <desc><p>Create an integer term from an <c>unsigned long int</c>.</p></desc>
@@ -1235,6 +1394,33 @@ enif_map_iterator_destroy(env, &amp;iter);
       or false if the iterator is positioned at the head (before the first
       entry).</p></desc>
     </func>
+
+    <func>
+      <name><ret>ErlNifTime</ret><nametext>enif_monotonic_time(ErlNifTimeUnit time_unit)</nametext></name>
+      <fsummary>Get Erlang Monotonic Time</fsummary>
+      <desc>
+	<marker id="enif_monotonic_time"></marker>
+	<p>Arguments:</p>
+	<taglist>
+	  <tag><c>time_unit</c></tag>
+	  <item>Time unit of returned value.</item>
+	</taglist>
+	<p>
+	  Returns the current
+	  <seealso marker="time_correction#Erlang_Monotonic_Time">Erlang
+	  monotonic time</seealso>. Note that it is not uncommon with
+	  negative values.
+	</p>
+	<p>Returns <c>ERL_NIF_TIME_ERROR</c> if called with an invalid
+	time unit argument, or if called from a thread that is not a
+	scheduler thread.</p>
+	<p>See also:
+	  <seealso marker="#ErlNifTime"><c>ErlNifTime</c></seealso> and
+	  <seealso marker="#ErlNifTimeUnit"><c>ErlNifTimeUnit</c></seealso>.
+	</p>
+      </desc>
+    </func>
+
     <func><name><ret>ErlNifMutex *</ret><nametext>enif_mutex_create(char *name)</nametext></name>
     <fsummary></fsummary>
     <desc><p>Same as <seealso marker="erl_driver#erl_drv_mutex_create">erl_drv_mutex_create</seealso>.
@@ -1260,6 +1446,11 @@ enif_map_iterator_destroy(env, &amp;iter);
     <desc><p>Same as <seealso marker="erl_driver#erl_drv_mutex_unlock">erl_drv_mutex_unlock</seealso>.
           </p></desc>
     </func>
+    <func><name><ret>ERL_NIF_TERM</ret><nametext>enif_now_time(ErlNifEnv *env)</nametext></name>
+    <fsummary></fsummary>
+    <desc><p>Retuns an <seealso marker="erlang#now-0">erlang:now()</seealso> timestamp.
+    The enif_now_time function is <em>deprecated</em>.</p></desc>
+    </func>
     <func><name><ret>ErlNifResourceType *</ret><nametext>enif_open_resource_type(ErlNifEnv* env,
                              const char* module_str, const char* name,
                              ErlNifResourceDtor* dtor, ErlNifResourceFlags flags, ErlNifResourceFlags* tried)</nametext></name>
@@ -1289,6 +1480,35 @@ enif_map_iterator_destroy(env, &amp;iter);
        and <seealso marker="#upgrade">upgrade</seealso>.</p>
       </desc>
     </func>
+    <func><name><ret>int</ret><nametext>enif_port_command(ErlNifEnv* env, const ErlNifPort* to_port, ErlNifEnv *msg_env, ERL_NIF_TERM msg)</nametext></name>
+      <fsummary>Send a port_command to to_port</fsummary>
+      <desc>
+        <p>This function works the same as <seealso marker="erlang#port_command-2">erlang:port_command/2</seealso>
+        except that it is always completely asynchronous. This call may return false
+        if it detects that the port is already dead, otherwise it will return true.
+        </p>
+        <taglist>
+          <tag><c>env</c></tag>
+          <item>The environment of the calling process. May not be NULL.</item>
+          <tag><c>*to_port</c></tag>
+          <item>The port id of the receiving port. The port id should refer to a
+          port on the local node.</item>
+          <tag><c>msg_env</c></tag>
+          <item>The environment of the message term. Can be a process
+          independent environment allocated with
+          <seealso marker="#enif_alloc_env">enif_alloc_env</seealso> or NULL.</item>
+          <tag><c>msg</c></tag>
+          <item>The message term to send. The same limitations apply as on the
+          payload to <seealso marker="erlang#port_command-2">erlang:port_command/2</seealso>.</item>
+        </taglist>
+        <p>Using a <c>msg_env</c> of NULL is an optimization which groups together
+        calls to <c>enif_alloc_env</c>, <c>enif_make_copy</c>, <c>enif_port_command</c>
+        and <c>enif_free_env</c> into one call. This optimization is only usefull
+        when a majority of the terms are to be copied from <c>env</c> to the <c>msg_env</c>.</p>
+        <p>The call may return false if it detects that the command failed for some reason. Otherwise true is returned.</p>
+        <p>See also: <seealso marker="#enif_get_local_port"><c>enif_get_local_port</c></seealso>.</p>
+      </desc>
+    </func>
     <func><name><ret>void *</ret><nametext>enif_priv_data(ErlNifEnv* env)</nametext></name>
       <fsummary>Get the private data of a NIF library</fsummary>
       <desc><p>Return the pointer to the private data that was set by <c>load</c>,
@@ -1423,6 +1643,8 @@ enif_map_iterator_destroy(env, &amp;iter);
       of cleared for reuse with <seealso marker="#enif_clear_env">enif_clear_env</seealso>.</p>
       <p>This function is only thread-safe when the emulator with SMP support is used.
       It can only be used in a non-SMP emulator from a NIF-calling thread.</p>
+      <note><p>Passing <c>msg_env</c> as <c>NULL</c> is only supported since
+      erts-8.0 (OTP 19).</p></note>
       </desc>
     </func>
     <func><name><ret>unsigned</ret><nametext>enif_sizeof_resource(void* obj)</nametext></name>
@@ -1436,6 +1658,18 @@ enif_map_iterator_destroy(env, &amp;iter);
       <desc><p>Same as <seealso marker="erl_driver#driver_system_info">driver_system_info</seealso>.
             </p></desc>
     </func>
+    <func><name><ret>int</ret><nametext>enif_term_to_binary(ErlNifEnv *env, ERL_NIF_TERM term, ErlNifBinary *bin)</nametext></name>
+    <fsummary>Convert a term to the external format</fsummary>
+    <desc>
+      <p>Allocates a new binary with <seealso marker="#enif_alloc_binary">enif_alloc_binary</seealso>
+      and stores the result of encoding <c>term</c> according to the Erlang external term format.</p>
+      <p>Returns true on success or false if allocation failed.</p>
+      <p>See also:
+        <seealso marker="erlang#term_to_binary-1"><c>erlang:term_to_binary/1</c></seealso> and
+        <seealso marker="#enif_binary_to_term"><c>enif_binary_to_term</c></seealso>.
+      </p>
+    </desc>
+    </func>
     <func><name><ret>int</ret><nametext>enif_thread_create(char *name,ErlNifTid *tid,void * (*func)(void *),void *args,ErlNifThreadOpts *opts)</nametext></name>
     <fsummary></fsummary>
     <desc><p>Same as <seealso marker="erl_driver#erl_drv_thread_create">erl_drv_thread_create</seealso>.
@@ -1466,6 +1700,32 @@ enif_map_iterator_destroy(env, &amp;iter);
     <desc><p>Same as <seealso marker="erl_driver#erl_drv_thread_self">erl_drv_thread_self</seealso>.
           </p></desc>
     </func>
+
+    <func>
+      <name><ret>ErlNifTime</ret><nametext>enif_time_offset(ErlNifTimeUnit time_unit)</nametext></name>
+      <fsummary>Get current Time Offset</fsummary>
+      <desc>
+	<marker id="enif_time_offset"></marker>
+	<p>Arguments:</p>
+	<taglist>
+	  <tag><c>time_unit</c></tag>
+	  <item>Time unit of returned value.</item>
+	</taglist>
+	<p>Returns the current time offset between
+	<seealso marker="time_correction#Erlang_Monotonic_Time">Erlang monotonic time</seealso>
+	and
+	<seealso marker="time_correction#Erlang_System_Time">Erlang system time</seealso>
+	converted into the <c>time_unit</c> passed as argument.</p>
+	<p>Returns <c>ERL_NIF_TIME_ERROR</c> if called with an invalid
+	time unit argument, or if called from a thread that is not a
+	scheduler thread.</p>
+	<p>See also:
+	    <seealso marker="#ErlNifTime"><c>ErlNifTime</c></seealso> and
+	    <seealso marker="#ErlNifTimeUnit"><c>ErlNifTimeUnit</c></seealso>.
+	</p>
+      </desc>
+    </func>
+
     <func><name><ret>int</ret><nametext>enif_tsd_key_create(char *name, ErlNifTSDKey *key)</nametext></name>
     <fsummary></fsummary>
     <desc><p>Same as <seealso marker="erl_driver#erl_drv_tsd_key_create">erl_drv_tsd_key_create</seealso>.
diff --git a/erts/doc/src/erl_prim_loader.xml b/erts/doc/src/erl_prim_loader.xml
index db4f132609..8f66e07ae1 100644
--- a/erts/doc/src/erl_prim_loader.xml
+++ b/erts/doc/src/erl_prim_loader.xml
@@ -50,36 +50,9 @@
      <c>-loader_debug</c> are also experimental</p></warning>
 
   </description>
-  <datatypes>
-    <datatype>
-      <name name="host"/>
-    </datatype>
-  </datatypes>
 
   <funcs>
     <func>
-      <name name="start" arity="3"/>
-      <fsummary>Start the Erlang low level loader</fsummary>
-      <desc>
-        <p>Starts the Erlang low level loader. This function is called
-          by the <c>init</c> process (and module). The <c>init</c>
-          process reads the command line flags <c>-id <anno>Id</anno></c>,
-          <c>-loader <anno>Loader</anno></c>, and <c>-hosts <anno>Hosts</anno></c>. These are
-          the arguments supplied to the <c>start/3</c> function.</p>
-        <p>If <c>-loader</c> is not given, the default loader is
-          <c>efile</c> which tells the system to read from the file
-          system.</p>
-        <p>If <c>-loader</c> is <c>inet</c>, the <c>-id <anno>Id</anno></c>,
-          <c>-hosts <anno>Hosts</anno></c>, and <c>-setcookie Cookie</c> flags must
-          also be supplied. <c><anno>Hosts</anno></c> identifies hosts which this
-          node can contact in order to load modules. One Erlang
-          runtime system with a <c>erl_boot_server</c> process must be
-          started on each of hosts given in <c><anno>Hosts</anno></c> in order to
-          answer the requests. See <seealso
-          marker="kernel:erl_boot_server">erl_boot_server(3)</seealso>.</p>
-      </desc>
-    </func>
-    <func>
       <name name="get_file" arity="1"/>
       <fsummary>Get a file</fsummary>
       <desc>
@@ -87,8 +60,6 @@
           <c><anno>Filename</anno></c> is either an absolute file name or just the name
           of the file, for example <c>"lists.beam"</c>. If an internal
           path is set to the loader, this path is used to find the file.
-          If a user supplied loader is used, the path can be stripped
-          off if it is obsolete, and the loader does not use a path.
           <c><anno>FullName</anno></c> is the complete name of the fetched file.
           <c><anno>Bin</anno></c> is the contents of the file as a binary.</p>
 
@@ -189,17 +160,12 @@
         <p>Specifies which other Erlang nodes the <c>inet</c> loader
           can use. This flag is mandatory if the <c>-loader inet</c>
           flag is present. On each host, there must be on Erlang node
-          with the <c>erl_boot_server</c> which handles the load
-          requests. <c>Hosts</c> is a list of IP addresses (hostnames
+          with the <seealso
+          marker="kernel:erl_boot_server">erl_boot_server(3)</seealso>
+	  which handles the load requests.
+	  <c>Hosts</c> is a list of IP addresses (hostnames
           are not acceptable).</p>
       </item>
-      <tag><c>-id Id</c></tag>
-      <item>
-        <p>Specifies the identity of the Erlang runtime system. If
-          the system runs as a distributed node, <c>Id</c> must be
-          identical to the name supplied with the <c>-sname</c> or
-          <c>-name</c> distribution flags.</p>
-      </item>
       <tag><c>-setcookie Cookie</c></tag>
       <item>
         <p>Specifies the cookie of the Erlang runtime system. This flag
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 13b16d1ed3..350a8506f5 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -59,6 +59,12 @@
     </datatype>
 
     <datatype>
+      <name name="message_queue_data"></name>
+      <desc><p>See <seealso marker="#process_flag_message_queue_data"><c>erlang:process_flag(message_queue_data, MQD)</c></seealso>.</p>
+      </desc>
+    </datatype>
+
+    <datatype>
       <name name="timestamp"></name>
       <desc><p>See <seealso marker="#timestamp/0">erlang:timestamp/0</seealso>.</p>
       </desc>
@@ -125,6 +131,17 @@
 	  </note>
 	  </item>
 
+	  <tag><c>perf_counter</c></tag>
+	  <item><p>Symbolic representation of the performance counter
+          time unit used by the Erlang runtime system.</p>
+
+          <p>The <c>perf_counter</c> time unit behaves much in the same way
+          as the <c>native</c> time unit. That is it might differ inbetween
+          run-time restarts. You get values of this type by calling
+          <seealso marker="kernel:os#perf_counter/0"><c>os:perf_counter()</c></seealso>
+          </p>
+          </item>
+
 	</taglist>
 
 	<p>The <c>time_unit/0</c> type may be extended. Use
@@ -1105,7 +1122,7 @@
       <fsummary>Prints a term on standard output.</fsummary>
       <desc>
         <p>Prints a text representation of <c><anno>Term</anno></c> on the
-          standard output. On OSE, the term is printed to the ramlog.</p>
+          standard output.</p>
         <warning>
           <p>This BIF is intended for debugging only.</p>
         </warning>
@@ -1794,7 +1811,8 @@ os_prompt% </pre>
 	  </item>
 	</taglist>
         <note><p>On many platforms, the OS supports only status
-        codes 0-255.</p></note>
+        codes 0-255. A too large status code will be truncated by clearing
+	the high bits.</p></note>
 	<p>For integer <c><anno>Status</anno></c>, the Erlang runtime system
           closes all ports and allows async threads to finish their
           operations before exiting. To exit without such flushing, use
@@ -4280,9 +4298,59 @@ os_prompt% </pre>
         <p>Returns the old value of the flag.</p>
       </desc>
     </func>
-
+    <marker id="process_flag_message_queue_data"/>
     <func>
       <name name="process_flag" arity="2" clause_i="5"/>
+      <fsummary>Set process flag <c>message_queue_data</c> for the calling process</fsummary>
+      <type name="message_queue_data"/>
+      <desc>
+	<p>This flag determines how messages in the message queue
+	are stored. When the flag is:</p>
+        <taglist>
+          <tag><c>off_heap</c></tag>
+	  <item><p>
+	    <em>All</em> messages in the message queue will be stored
+	    outside of the process heap. This implies that <em>no</em>
+	    messages in the message queue will be part of a garbage
+	    collection of the process.
+	  </p></item>
+          <tag><c>on_heap</c></tag>
+	  <item><p>
+	    All messages in the message queue will eventually be
+	    placed on heap. They may however temporarily be stored
+	    off heap. This is how messages always have been stored
+	    up until ERTS version 8.0.
+	  </p></item>
+          <tag><c>mixed</c></tag>
+	  <item><p>
+	    Messages may be placed either on the heap or outside
+	    of the heap.
+	  </p></item>
+        </taglist>
+	<p>
+	  The default <c>message_queue_data</c> process flag is determined
+	  by the <seealso marker="erl#+xmqd"><c>+xmqd</c></seealso>
+	  <c>erl</c> command line argument.
+	</p>
+	<p>
+	  If the process potentially may get a hugh amount of messages,
+	  you are recommended to set the flag to <c>off_heap</c>. This
+	  since a garbage collection with lots of messages placed on
+	  the heap may become extremly expensive and the process may
+	  consume large amounts of memory. Performance of the
+	  actual message passing is however generally better when not
+	  using the <c>off_heap</c> flag.
+	</p>
+	<p>
+	  When changing this flag messages will be moved. This work
+	  has been initiated but not completed when this function
+	  call returns.
+	</p>
+        <p>Returns the old value of the flag.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="process_flag" arity="2" clause_i="6"/>
       <fsummary>Sets process flag <c>priority</c> for the calling process.</fsummary>
       <type name="priority_level"/>
       <desc>
@@ -4356,7 +4424,7 @@ os_prompt% </pre>
     </func>
 
     <func>
-      <name name="process_flag" arity="2" clause_i="6"/>
+      <name name="process_flag" arity="2" clause_i="7"/>
       <fsummary>Sets process flag <c>save_calls</c> for the calling process.</fsummary>
       <desc>
         <p><c><anno>N</anno></c> must be an integer in the interval 0..10000.
@@ -4387,7 +4455,7 @@ os_prompt% </pre>
     </func>
 
     <func>
-      <name name="process_flag" arity="2" clause_i="7"/>
+      <name name="process_flag" arity="2" clause_i="8"/>
       <fsummary>Sets process flag <c>sensitive</c> for the calling process.</fsummary>
       <desc>
         <p>Sets or clears flag <c>sensitive</c> for the current process.
@@ -4441,6 +4509,7 @@ os_prompt% </pre>
       <type name="process_info_result_item"/>
       <type name="priority_level"/>
       <type name="stack_item"/>
+      <type name="message_queue_data" />
       <desc>
         <p>Returns a list containing <c><anno>InfoTuple</anno></c>s with
 	  miscellaneous information about the process identified by
@@ -4493,6 +4562,7 @@ os_prompt% </pre>
       <type name="process_info_result_item"/>
       <type name="stack_item"/>
       <type name="priority_level"/>
+      <type name="message_queue_data" />
       <desc>
         <p>Returns information about the process identified by
            <c><anno>Pid</anno></c>, as specified by
@@ -4584,6 +4654,17 @@ os_prompt% </pre>
 	       The content of <c><anno>GCInfo</anno></c> can be changed without
 	       prior notice.</p>
           </item>
+          <tag><c>{garbage_collection_info, <anno>GCInfo</anno>}</c></tag>
+          <item>
+            <p><c><anno>GCInfo</anno></c> is a list containing miscellaneous
+	       detailed information about garbage collection for this process.
+	       The content of <c><anno>GCInfo</anno></c> can be changed without
+	       prior notice.
+               See <seealso marker="#gc_start">gc_start</seealso> in
+               <seealso marker="#trace/3">erlang:trace/3</seealso> for details about
+               what each item means.
+            </p>
+          </item>
           <tag><c>{group_leader, <anno>GroupLeader</anno>}</c></tag>
           <item>
             <p><c><anno>GroupLeader</anno></c> is group leader for the I/O of
@@ -4661,6 +4742,15 @@ os_prompt% </pre>
               monitor by name, the list item is
               <c>{process, {<anno>RegName</anno>, <anno>Node</anno>}}</c>.</p>
           </item>
+          <tag><c>{message_queue_data, <anno>MQD</anno>}</c></tag>
+          <item>
+            <p>Returns the current state of the <c>message_queue_data</c>
+	    process flag. <c><anno>MQD</anno></c> is either <c>off_heap</c>,
+	    <c>on_heap</c>, or <c>mixed</c>. For more information, see the
+	    documentation of
+            <seealso marker="#process_flag_message_queue_data"><c>process_flag(message_queue_data,
+	    MQD)</c></seealso>.</p>
+          </item>
           <tag><c>{priority, <anno>Level</anno>}</c></tag>
           <item>
             <p><c><anno>Level</anno></c> is the current priority level for
@@ -4803,6 +4893,12 @@ os_prompt% </pre>
             <seealso marker="kernel:code">code(3)</seealso>)
             and is not to be used elsewhere.</p>
         </warning>
+        <note>
+	  <p>As from <c>ERTS</c> 8.0 (OTP 19), any lingering processes
+	   that still execute the old code will be killed by this function.
+	   In earlier versions, such incorrect use could cause much
+	   more fatal failures, like emulator crash.</p>
+        </note>
         <p>Failure: <c>badarg</c> if there is no old code for
           <c><anno>Module</anno></c>.</p>
       </desc>
@@ -5429,6 +5525,8 @@ true</pre>
       <name name="spawn_opt" arity="2"/>
       <fsummary>Creates a new process with a fun as entry point.</fsummary>
       <type name="priority_level"/>
+      <type name="message_queue_data" />
+      <type name="spawn_opt_option" />
       <desc>
         <p>Returns the process identifier (pid) of a new process
           started by the application of <c><anno>Fun</anno></c>
@@ -5444,6 +5542,8 @@ true</pre>
       <name name="spawn_opt" arity="3"/>
       <fsummary>Creates a new process with a fun as entry point on a given node.</fsummary>
       <type name="priority_level"/>
+      <type name="message_queue_data" />
+      <type name="spawn_opt_option" />
       <desc>
         <p>Returns the process identifier (pid) of a new process started
           by the application of <c><anno>Fun</anno></c> to the
@@ -5458,6 +5558,8 @@ true</pre>
       <name name="spawn_opt" arity="4"/>
       <fsummary>Creates a new process with a function as entry point.</fsummary>
       <type name="priority_level"/>
+      <type name="message_queue_data" />
+      <type name="spawn_opt_option" />
       <desc>
         <p>Works as
           <seealso marker="#spawn/3">spawn/3</seealso>, except that an
@@ -5559,6 +5661,18 @@ true</pre>
               fine-tuning an application and to measure the execution
               time with various <c><anno>VSize</anno></c> values.</p>
           </item>
+          <tag><c>{message_queue_data, <anno>MQD</anno>}</c></tag>
+          <item>
+            <p>Sets the state of the <c>message_queue_data</c> process
+	    flag. <c><anno>MQD</anno></c> should be either <c>off_heap</c>,
+	    <c>on_heap</c>, or <c>mixed</c>. The default
+	    <c>message_queue_data</c> process flag is determined by the
+	    <seealso marker="erl#+xmqd"><c>+xmqd</c></seealso> <c>erl</c>
+	    command line argument. For more information, see the
+	    documentation of
+            <seealso marker="#process_flag_message_queue_data"><c>process_flag(message_queue_data,
+	    <anno>MQD</anno>)</c></seealso>.</p>
+          </item>
         </taglist>
       </desc>
     </func>
@@ -5567,6 +5681,8 @@ true</pre>
       <name name="spawn_opt" arity="5"/>
       <fsummary>Creates a new process with a function as entry point on a given node.</fsummary>
       <type name="priority_level"/>
+      <type name="message_queue_data" />
+      <type name="spawn_opt_option" />
       <desc>
         <p>Returns the process identifier (pid) of a new process started
           by the application
@@ -5755,6 +5871,146 @@ true</pre>
 
     <func>
       <name name="statistics" arity="1" clause_i="6"/>
+      <fsummary>Information about microstate accounting.</fsummary>
+      <desc>
+        <marker id="statistics_microstate_accounting"></marker>
+        <p>
+          Microstate accounting can be used to measure how much time the Erlang
+          runtime system spends doing various tasks. It is designed to be as
+          lightweight as possible, but there will be some overhead when this
+          is enabled. Microstate accounting is meant to be a profiling tool
+          to help figure out performance bottlenecks.
+          To <c>start</c>/<c>stop</c>/<c>reset</c> microstate_accounting you use
+          the system_flag
+          <seealso marker="#system_flag_microstate_accounting">
+            <c>microstate_accounting</c></seealso>.
+        </p>
+        <p>
+          <c>erlang:statistics(microstate_accounting)</c> returns a list of maps
+          representing some of the OS threads within ERTS. Each map contains
+          <c>type</c> and <c>id</c> fields that can be used to identify what
+          thread it is, and also a counters field that contains data about how
+          much time has been spent in the various states.</p>
+        <pre>
+> <input>erlang:statistics(microstate_accounting).</input>
+[#{counters => #{aux => 1899182914,
+                 check_io => 2605863602,
+                 emulator => 45731880463,
+                 gc => 1512206910,
+                 other => 5421338456,
+                 port => 221631,
+                 sleep => 5150294100},
+   id => 1,
+   type => scheduler}|...]
+        </pre>
+        <p>The time unit is the same as returned by
+        <seealso marker="kernel:os#perf_counter/0">
+          <c>os:perf_counter/0</c></seealso>.
+        So to convert it to milliseconds you could do something like this:</p>
+        <pre>
+lists:map(
+  fun(#{ counters := Cnt } = M) ->
+          MsCnt = maps:map(fun(_K, PerfCount) ->
+                                   erlang:convert_time_unit(PerfCount, perf_counter, 1000)
+                           end, Cnt),
+         M#{ counters := MsCnt }
+  end, erlang:statistics(microstate_accounting)).
+        </pre>
+        <p>
+          It is important to note that these values are not guaranteed to be
+          the exact time spent in each state. This is because of various
+          optimisation done in order to keep the overhead as small as possible.
+        </p>
+
+        <p>Currently the following <c><anno>MSAcc_Thread_Type</anno></c> are available:</p>
+        <taglist>
+          <tag><c>scheduler</c></tag>
+          <item>The main execution threads that do most of the work.</item>
+          <tag><c>async</c></tag><item>Async threads are used by various
+          linked-in drivers (mainly the file drivers) do offload non-cpu
+          intensive work.</item>
+          <tag><c>aux</c></tag><item>Takes care of any work that is not
+          specifically assigned to a scheduler.</item>
+        </taglist>
+        <p>Currently the following <c><anno>MSAcc_Thread_State</anno></c>s are available.
+        All states are exclusive, meaning that a thread cannot be in two states
+        at once. So if you add the numbers of all counters in a thread
+        you will get the total run-time for that thread.</p>
+        <taglist>
+          <tag><c>aux</c></tag>
+          <item>Time spent handling auxiliary jobs.</item>
+          <tag><c>check_io</c></tag>
+          <item>Time spent checking for new I/O events.</item>
+          <tag><c>emulator</c></tag>
+          <item>Time spent executing erlang processes.</item>
+          <tag><c>gc</c></tag>
+          <item>Time spent doing garbage collection. When extra states are
+          enabled this is the time spent doing non-fullsweep garbage
+          collections.</item>
+          <tag><c>other</c></tag>
+          <item>Time spent doing unaccounted things.</item>
+          <tag><c>port</c></tag>
+          <item>Time spent executing ports.</item>
+          <tag><c>sleep</c></tag>
+          <item>Time spent sleeping.</item>
+        </taglist>
+        <p>It is possible to add more fine grained <c><anno>MSAcc_Thread_State</anno></c>s
+        through configure.
+        (e.g. <c>./configure --with-microstate-accounting=extra</c>).
+        Enabling these states will cause a performance degradation when
+        microstate accounting is turned off and increase the overhead when
+        it is turned on.</p>
+        <taglist>
+          <tag><c>alloc</c></tag>
+          <item>Time spent managing memory. Without extra states this time is
+          spread out over all other states.</item>
+          <tag><c>bif</c></tag>
+          <item>Time spent in bifs. Without extra states this time is part of
+          the <c>emulator</c> state.</item>
+          <tag><c>busy_wait</c></tag>
+          <item>Time spent busy waiting. This is also the state where a
+          scheduler no longer reports that it is active when using
+          <seealso marker="#statistics_scheduler_wall_time">
+            <c>erlang:statistics(scheduler_wall_time)</c></seealso>.
+          So if you add all other states but this and sleep and then divide that
+          by all time in the thread you should get something very similar to the
+          scheduler_wall_time fraction. Without extra states this time is part
+          of the <c>other</c> state.</item>
+          <tag><c>ets</c></tag>
+          <item>Time spent executing ETS bifs. Without extra states this time is
+          part of the <c>emulator</c> state.</item>
+          <tag><c>gc_full</c></tag>
+          <item>Time spent doing fullsweep garbage collection. Without extra
+          states this time is part of the <c>gc</c> state.</item>
+          <tag><c>nif</c></tag>
+          <item>Time spent in nifs. Without extra states this time is part of
+          the <c>emulator</c> state.</item>
+          <tag><c>send</c></tag>
+          <item>Time spent sending messages (processes only). Without extra
+          states this time is part of the <c>emulator</c> state.</item>
+          <tag><c>timers</c></tag>
+          <item>Time spent managing timers. Without extra states this time is
+          part of the <c>other</c> state.</item>
+        </taglist>
+        <p>There is a utility module called
+        <seealso marker="runtime_tools:msacc"><c>msacc</c></seealso> in
+        runtime_tools that can be used to more easily analyse these
+        statistics.</p>
+
+        <p>
+          Returns <c>undefined</c> if the system flag
+          <seealso marker="#system_flag_microstate_accounting">
+            <c>microstate_accounting</c></seealso>
+          is turned off.
+	</p>
+        <p>The list of thread information is unsorted and may appear in
+        different order between calls.</p>
+        <note><p>The threads and states are subject to change without any
+        prior notice.</p></note>
+      </desc>
+    </func>
+    <func>
+      <name name="statistics" arity="1" clause_i="7"/>
       <fsummary>Information about reductions.</fsummary>
       <desc>
         <marker id="statistics_reductions"></marker>
@@ -5772,7 +6028,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="7"/>
+      <name name="statistics" arity="1" clause_i="8"/>
       <fsummary>Information about the run-queues.</fsummary>
       <desc><marker id="statistics_run_queue"></marker>
         <p>
@@ -5788,7 +6044,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="8"/>
+      <name name="statistics" arity="1" clause_i="9"/>
       <fsummary>Information about the run-queue lengths.</fsummary>
       <desc><marker id="statistics_run_queue_lengths"></marker>
 	<p>
@@ -5808,7 +6064,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="9"/>
+      <name name="statistics" arity="1" clause_i="10"/>
       <fsummary>Information about runtime.</fsummary>
       <desc>
         <p>Returns information about runtime, in milliseconds.</p>
@@ -5823,7 +6079,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="10"/>
+      <name name="statistics" arity="1" clause_i="11"/>
       <fsummary>Information about each schedulers work time.</fsummary>
       <desc>
       <marker id="statistics_scheduler_wall_time"></marker>
@@ -5894,7 +6150,7 @@ ok
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="11"/>
+      <name name="statistics" arity="1" clause_i="12"/>
       <fsummary>Information about active processes and ports.</fsummary>
       <desc><marker id="statistics_total_active_tasks"></marker>
 	<p>
@@ -5912,7 +6168,7 @@ ok
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="12"/>
+      <name name="statistics" arity="1" clause_i="13"/>
       <fsummary>Information about the run-queue lengths.</fsummary>
       <desc><marker id="statistics_total_run_queue_lengths"></marker>
         <p>
@@ -5931,7 +6187,7 @@ ok
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="13"/>
+      <name name="statistics" arity="1" clause_i="14"/>
       <fsummary>Information about wall clock.</fsummary>
       <desc>
         <p>Returns information about wall clock. <c>wall_clock</c> can
@@ -6165,6 +6421,17 @@ ok
 
     <func>
       <name name="system_flag" arity="2" clause_i="5"/>
+      <fsummary>Set system flag microstate_accounting</fsummary>
+      <desc><p><marker id="system_flag_microstate_accounting"></marker>
+      Turns on/off microstate accounting measurements. By passing reset it is possible to reset
+      all counters to 0.</p>
+      <p>For more information see,
+      <seealso marker="#statistics_microstate_accounting">erlang:statistics(microstate_accounting)</seealso>.
+      </p>
+      </desc>
+    </func>
+    <func>
+      <name name="system_flag" arity="2" clause_i="6"/>
       <fsummary>Sets system flag <c>min_heap_size</c>.</fsummary>
       <desc>
         <p>Sets the default minimum heap size for processes. The size
@@ -6179,7 +6446,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="6"/>
+      <name name="system_flag" arity="2" clause_i="7"/>
       <fsummary>Sets system flag <c>min_bin_vheap_size</c>.</fsummary>
       <desc>
         <p>Sets the default minimum binary virtual heap size for
@@ -6196,45 +6463,57 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="7"/>
+      <name name="system_flag" arity="2" clause_i="8"/>
       <fsummary>Sets system flag <c>multi_scheduling</c>.</fsummary>
       <desc>
         <p><marker id="system_flag_multi_scheduling"></marker>
           If multi-scheduling is enabled, more than one scheduler
           thread is used by the emulator. Multi-scheduling can be
-          blocked. When multi-scheduling is blocked, only
-          one scheduler thread schedules Erlang processes.</p>
+          blocked in two different ways. Either all schedulers but
+	  one is blocked, or all <em>normal</em> schedulers but
+	  one is blocked. When only normal schedulers are blocked
+	  dirty schedulers are free to continue to schedule
+	  processes.</p>
         <p>If <c><anno>BlockState</anno> =:= block</c>, multi-scheduling is
-          blocked. If <c><anno>BlockState</anno> =:= unblock</c> and no one
+          blocked. That is, one and only one scheduler thread will
+	  execute. If <c><anno>BlockState</anno> =:= unblock</c> and no one
           else blocks multi-scheduling, and this process has
           blocked only once, multi-scheduling is unblocked.</p>
-        <p>One process can block multi-scheduling multiple times.
-          If a process has blocked multiple times, it must
-          unblock exactly as many times as it has blocked before it
-          has released its multi-scheduling block. If a process that
-          has blocked multi-scheduling exits, it releases its
-          blocking of multi-scheduling.</p>
+        <p>If <c><anno>BlockState</anno> =:= block_normal</c>, normal
+	  multi-scheduling is blocked. That is, only one normal scheduler
+	  thread will execute, but multiple dirty schedulers may execute.
+	  If <c><anno>BlockState</anno> =:= unblock_normal</c> and no one
+          else blocks normal multi-scheduling, and this process has
+          blocked only once, normal multi-scheduling is unblocked.</p>
+        <p>One process can block multi-scheduling as well as normal
+	  multi-scheduling multiple times. If a process has blocked
+	  multiple times, it must unblock exactly as many times as it
+	  has blocked before it has released its multi-scheduling
+	  block. If a process that has blocked multi-scheduling or normal
+	  multi scheduling exits, it automatically releases its blocking
+	  of multi-scheduling and normal multi-scheduling.</p>
         <p>The return values are <c>disabled</c>, <c>blocked</c>,
-          or <c>enabled</c>. The returned value describes the
-          state just after the call to
+          <c>blocked_normal</c>, or <c>enabled</c>. The returned value
+	  describes the state just after the call to
           <c>erlang:system_flag(multi_scheduling, <anno>BlockState</anno>)</c>
           has been made. For information about the return values, see
           <seealso marker="#system_info_multi_scheduling">erlang:system_info(multi_scheduling)</seealso>.</p>
-        <note><p>Blocking of multi-scheduling is normally not needed.
-          If you feel that you need to block multi-scheduling,
-          consider it a few more times again. Blocking multi-scheduling
-          is only to be used as a last resort, as it is most likely
-          a <em>very inefficient</em> way to solve the problem.</p>
+        <note><p>Blocking of multi-scheduling and normal multi-scheduling
+	  is normally not needed. If you feel that you need to use these
+	  features, consider it a few more times again. Blocking
+	  multi-scheduling is only to be used as a last resort, as it is
+	  most likely a <em>very inefficient</em> way to solve the problem.</p>
         </note>
         <p>See also
           <seealso marker="#system_info_multi_scheduling">erlang:system_info(multi_scheduling)</seealso>,
+          <seealso marker="#system_info_normal_multi_scheduling_blockers">erlang:system_info(normal_multi_scheduling_blockers)</seealso>,
           <seealso marker="#system_info_multi_scheduling_blockers">erlang:system_info(multi_scheduling_blockers)</seealso>, and
           <seealso marker="#system_info_schedulers">erlang:system_info(schedulers)</seealso>.</p>
       </desc>
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="8"/>
+      <name name="system_flag" arity="2" clause_i="9"/>
       <fsummary>Sets system flag <c>scheduler_bind_type</c>.</fsummary>
       <type name="scheduler_bind_type"/>
       <desc>
@@ -6352,7 +6631,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="9"/>
+      <name name="system_flag" arity="2" clause_i="10"/>
       <fsummary>Sets system flag <c>scheduler_wall_time</c>.</fsummary>
       <desc><p><marker id="system_flag_scheduler_wall_time"></marker>
       Turns on or off scheduler wall time measurements.</p>
@@ -6362,7 +6641,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="10"/>
+      <name name="system_flag" arity="2" clause_i="11"/>
       <fsummary>Sets system flag <c>schedulers_online</c>.</fsummary>
       <desc>
         <p><marker id="system_flag_schedulers_online"></marker>
@@ -6387,7 +6666,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="11"/>
+      <name name="system_flag" arity="2" clause_i="12"/>
       <fsummary>Sets system flag <c>trace_control_word</c>.</fsummary>
       <desc>
         <p>Sets the value of the node trace control word to
@@ -6726,6 +7005,7 @@ ok
       <name name="system_info" arity="1" clause_i="65"/>
       <name name="system_info" arity="1" clause_i="66"/>
       <name name="system_info" arity="1" clause_i="67"/>
+      <name name="system_info" arity="1" clause_i="68"/>
       <fsummary>Information about the system.</fsummary>
       <desc>
         <p>Returns various information about the current system
@@ -7061,6 +7341,16 @@ ok
               where <c><anno>MinHeapSize</anno></c> is the current
               system-wide minimum heap size for spawned processes.</p>
           </item>
+          <tag><marker id="system_info_message_queue_data"><c>message_queue_data</c></marker></tag>
+          <item>
+            <p>Returns the default value of the <c>message_queue_data</c>
+	    process flag which is either <c>off_heap</c>, <c>on_heap</c>, or <c>mixed</c>.
+	    This default is set by the <c>erl</c> command line argument
+	    <seealso marker="erl#+xmqd"><c>+xmqd</c></seealso>. For more information on the
+	    <c>message_queue_data</c> process flag, see documentation of
+            <seealso marker="#process_flag_message_queue_data"><c>process_flag(message_queue_data,
+	    MQD)</c></seealso>.</p>
+          </item>
 	  <tag><c>min_bin_vheap_size</c></tag>
           <item>
 	      <p>Returns <c>{min_bin_vheap_size,
@@ -7080,7 +7370,8 @@ ok
           <tag><c>multi_scheduling</c></tag>
           <item>
           <marker id="system_info_multi_scheduling"></marker>
-            <p>Returns <c>disabled</c>, <c>blocked</c>, or <c>enabled</c>:</p>
+            <p>Returns <c>disabled</c>, <c>blocked</c>, <c>blocked_normal</c>,
+	    or <c>enabled</c>:</p>
             <taglist>
               <tag><c>disabled</c></tag>
               <item>
@@ -7091,14 +7382,22 @@ ok
               <tag><c>blocked</c></tag>
               <item>
                 <p>The emulator has more than one scheduler thread,
-                  but all scheduler threads except one are blocked,
-                  that is, only one scheduler thread schedules
+                  but all scheduler threads except one are blocked.
+                  That is, only one scheduler thread schedules
                   Erlang processes and executes Erlang code.</p>
               </item>
+              <tag><c>blocked_normal</c></tag>
+              <item>
+                <p>The emulator has more than one scheduler thread,
+                  but all normal scheduler threads except one are
+		  blocked. Note that dirty schedulers are not
+		  blocked, and may schedule Erlang processes and
+		  execute native code.</p>
+              </item>
               <tag><c>enabled</c></tag>
               <item>
                 <p>The emulator has more than one scheduler thread,
-                  and no scheduler threads are blocked, that is,
+                  and no scheduler threads are blocked. That is,
                   all available scheduler threads schedule
                   Erlang processes and execute Erlang code.</p>
               </item>
@@ -7106,6 +7405,7 @@ ok
             <p>See also
               <seealso marker="#system_flag_multi_scheduling">erlang:system_flag(multi_scheduling, BlockState)</seealso>,
               <seealso marker="#system_info_multi_scheduling_blockers">erlang:system_info(multi_scheduling_blockers)</seealso>,
+              <seealso marker="#system_info_normal_multi_scheduling_blockers">erlang:system_info(normal_multi_scheduling_blockers)</seealso>,
               and
               <seealso marker="#system_info_schedulers">erlang:system_info(schedulers)</seealso>.</p>
           </item>
@@ -7122,6 +7422,8 @@ ok
             <p>See also
               <seealso marker="#system_flag_multi_scheduling">erlang:system_flag(multi_scheduling, BlockState)</seealso>,
               <seealso marker="#system_info_multi_scheduling">erlang:system_info(multi_scheduling)</seealso>,
+	      <seealso marker="#system_info_normal_multi_scheduling_blockers">erlang:system_info(normal_multi_scheduling_blockers)</seealso>,
+
               and
               <seealso marker="#system_info_schedulers">erlang:system_info(schedulers)</seealso>.</p>
           </item>
@@ -7131,7 +7433,25 @@ ok
               used by the runtime system. It is on the form
 	      "&lt;major ver&gt;.&lt;minor ver&gt;".</p>
           </item>
-          <tag><c>otp_release</c></tag>
+          <tag><c>normal_multi_scheduling_blockers</c></tag>
+          <item>
+          <marker id="system_info_normal_multi_scheduling_blockers"></marker>
+            <p>Returns a list of <c><anno>Pid</anno></c>s when
+              normal multi-scheduling is blocked (i.e. all normal schedulers
+	      but one is blocked), otherwise the empty list is returned.
+	      The <c><anno>Pid</anno></c>s in the list represent all the
+	      processes currently blocking normal multi-scheduling.
+	      A <c><anno>Pid</anno></c> occurs only once in the list, even if
+	      the corresponding process has blocked multiple times.</p>
+            <p>See also
+              <seealso marker="#system_flag_multi_scheduling">erlang:system_flag(multi_scheduling, BlockState)</seealso>,
+              <seealso marker="#system_info_multi_scheduling">erlang:system_info(multi_scheduling)</seealso>,
+	      <seealso marker="#system_info_multi_scheduling_blockers">erlang:system_info(multi_scheduling_blockers)</seealso>,
+
+              and
+              <seealso marker="#system_info_schedulers">erlang:system_info(schedulers)</seealso>.</p>
+          </item>
+          <tag><marker id="system_info_otp_release"><c>otp_release</c></marker></tag>
           <item>
           <marker id="system_info_otp_release"></marker>
             <p>Returns a string containing the OTP release number of the
@@ -7372,6 +7692,7 @@ ok
 	      <seealso marker="#system_info_scheduler_id">erlang:system_info(scheduler_id)</seealso>,
               <seealso marker="#system_flag_multi_scheduling">erlang:system_flag(multi_scheduling, BlockState)</seealso>,
               <seealso marker="#system_info_multi_scheduling">erlang:system_info(multi_scheduling)</seealso>,
+	      <seealso marker="#system_info_normal_multi_scheduling_blockers">erlang:system_info(normal_multi_scheduling_blockers)</seealso>
               and
               <seealso marker="#system_info_multi_scheduling_blockers">erlang:system_info(multi_scheduling_blockers)</seealso>.</p>
           </item>
@@ -7739,6 +8060,14 @@ ok
              <c>inactive</c>, and later <c>active</c> when the port
 	     callback returns.</p>
           </item>
+          <tag><c>monotonic_timestamp</c></tag>
+          <item>
+            <p>Timestamps in profile messages will use
+	    <seealso marker="time_correction#Erlang_Monotonic_Time">Erlang
+	    monotonic time</seealso>. The time-stamp (Ts) has the same
+	    format and value as produced by
+	    <c>erlang:monotonic_time(nano_seconds)</c>.</p>
+          </item>
           <tag><c>runnable_procs</c></tag>
           <item>
           <p>If a process is put into or removed from the run queue, a
@@ -7759,6 +8088,25 @@ ok
              <c>{profile, scheduler, Id, State, NoScheds, Ts}</c>, is
              sent to <c><anno>ProfilerPid</anno></c>.</p>
           </item>
+          <tag><c>strict_monotonic_timestamp</c></tag>
+          <item>
+            <p>Timestamps in profile messages will consisting of
+	    <seealso marker="time_correction#Erlang_Monotonic_Time">Erlang
+	    monotonic time</seealso> and a monotonically increasing
+	    integer. The time-stamp (Ts) has the same format and value
+	    as produced by <c>{erlang:monotonic_time(nano_seconds),
+	    erlang:unique_integer([monotonic])}</c>.</p>
+          </item>
+          <tag><c>timestamp</c></tag>
+          <item>
+            <p>Timestamps in profile messages will include a
+            time-stamp (Ts) that has the same form as returned by
+            <c>erlang:now()</c>. This is also the default if no
+	    timestamp flag is given. If <c>cpu_timestamp</c> has
+	    been enabled via <c>erlang:trace/3</c>, this will also
+	    effect the timestamp produced in profiling messages
+	    when <c>timestamp</c> flag is enabled.</p>
+          </item>
         </taglist>
         <note><p><c>erlang:system_profile</c> is considered experimental
           and its behavior can change in a future release.</p>
@@ -8118,7 +8466,10 @@ timestamp() ->
           <tag><c>cpu_timestamp</c></tag>
           <item>
             <p>A global trace flag for the Erlang node that makes all
-              trace time-stamps to be in CPU time, not wall clock time.
+              trace time-stamps using the <c>timestamp</c> flag to be
+	      in CPU time, not wall clock time. That is, <c>cpu_timestamp</c>
+	      will not be used if <c>monotonic_timestamp</c>, or
+	      <c>strict_monotonic_timestamp</c> is enabled.
               Only allowed with <c>PidSpec==all</c>. If the host
               machine OS does not support high-resolution
               CPU time measurements, <c>trace/3</c> exits with
@@ -8126,6 +8477,26 @@ timestamp() ->
               not synchronize this value across cores, so be prepared
               that time might seem to go backwards when using this option.</p>
           </item>
+          <tag><c>monotonic_timestamp</c></tag>
+          <item>
+            <p>Includes an
+	    <seealso marker="time_correction#Erlang_Monotonic_Time">Erlang
+	    monotonic time</seealso> time-stamp in all trace messages. The
+            time-stamp (Ts) has the same format and value as produced by
+            <c>erlang:monotonic_time(nano_seconds)</c>. This flag overrides
+	    the <c>cpu_timestamp</c> flag.</p>
+          </item>
+          <tag><c>strict_monotonic_timestamp</c></tag>
+          <item>
+            <p>Includes an timestamp consisting of
+	    <seealso marker="time_correction#Erlang_Monotonic_Time">Erlang
+	    monotonic time</seealso> and a monotonically increasing
+	    integer in all trace messages. The time-stamp (Ts) has the
+	    same format and value as produced by
+            <c>{erlang:monotonic_time(nano_seconds),
+	    erlang:unique_integer([monotonic])}</c>. This flag overrides
+	    the <c>cpu_timestamp</c> flag.</p>
+          </item>
           <tag><c>arity</c></tag>
           <item>
             <p>Used with the <c>call</c> trace flag.
@@ -8172,9 +8543,16 @@ timestamp() ->
 	in the following list. <c>Pid</c> is the process identifier of the
 	traced process in which the traced event has occurred. The
 	third tuple element is the message tag.</p>
-        <p>If flag <c>timestamp</c> is given, the first tuple
-          element is <c>trace_ts</c> instead, and the time-stamp
-          is added last in the message tuple.</p>
+        <p>If flag <c>timestamp</c>, <c>strict_monotonic_timestamp</c>, or
+	<c>monotonic_timestamp</c> is given, the first tuple
+        element is <c>trace_ts</c> instead, and the time-stamp
+        is added as an extra element last in the message tuple. If
+	multiple timestamp flags are passed, <c>timestamp</c> has
+	precedence over <c>strict_monotonic_timestamp</c> which
+	in turn has precedence over <c>monotonic_timestamp</c>. All
+	timestamp flags are remembered, so if two are passed
+	and the one with highest precedence later is disabled
+	the other one will become active.</p>
         <marker id="trace_3_trace_messages"></marker>
         <taglist>
           <tag><c>{trace, Pid, 'receive', Msg}</c></tag>
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index 15b78ffa10..0965f9b49c 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -52,6 +52,8 @@
       <item>Allocator used for ETS data.</item>
       <tag><c>driver_alloc</c></tag>
       <item>Allocator used for driver data.</item>
+      <tag><c>literal_alloc</c></tag>
+      <item>Allocator used for constant terms in Erlang code.</item>
       <tag><c>sl_alloc</c></tag>
       <item>Allocator used for memory blocks that are expected to be
        short-lived.</item>
@@ -77,7 +79,7 @@
        instead of creating new segments.  This in order to reduce
        the number of system calls made.</item>
     </taglist>
-    <p><c>sys_alloc</c> is always enabled and
+    <p><c>sys_alloc</c> and <c>literal_alloc</c> are always enabled and
       cannot be disabled. <c>mseg_alloc</c> is always enabled if it is
       available and an allocator that uses it is enabled. All other
       allocators can be <seealso marker="#M_e">enabled or disabled</seealso>.
@@ -246,6 +248,7 @@
       the currently present allocators:</p>
     <list type="bulleted">
       <item><c>B: binary_alloc</c></item>
+      <item><c>I: literal_alloc</c></item>
       <item><c>D: std_alloc</c></item>
       <item><c>E: ets_alloc</c></item>
       <item><c>F: fix_alloc</c></item>
@@ -563,6 +566,16 @@
 	set to <c>false</c>, <c>sys_alloc</c> carriers will never be
 	created by allocators using the <c>alloc_util</c> framework.</item>
     </taglist>
+    <p>The following flag is special for <c>literal_alloc</c>:</p>
+    <taglist>
+      <tag><marker id="MIscs"/><c><![CDATA[+MIscs <size in MB>]]></c></tag>
+      <item>
+      <c>literal_alloc</c> super carrier size (in MB). The amount of
+      <em>virtual</em> address space reserved for literal terms in
+      Erlang code on 64-bit architectures. The default is 1024 (1GB)
+      and is usually sufficient. The flag is ignored on 32-bit
+      architectures.</item>
+    </taglist>
     <p>Instrumentation flags:</p>
     <taglist>
       <tag><marker id="Mim"/><c>+Mim true|false</c></tag>
diff --git a/erts/doc/src/init.xml b/erts/doc/src/init.xml
index fe26df61f7..2a33096d04 100644
--- a/erts/doc/src/init.xml
+++ b/erts/doc/src/init.xml
@@ -247,10 +247,7 @@
           <c>Expr</c> during system initialization. If any of these
           steps fail (syntax error, parse error or exception during
           evaluation), Erlang stops with an error message. Here is an
-          example that seeds the random number generator:</p>
-        <pre>
-% <input>erl -eval '{X,Y,Z} = now(), random:seed(X,Y,Z).'</input></pre>
-        <p>This example uses Erlang as a hexadecimal calculator:</p>
+          example that uses Erlang as a hexadecimal calculator:</p>
         <pre>
 % <input>erl -noshell -eval 'R = 16#1F+16#A0, io:format("~.16B~n", [R])' \\</input>
 <input>-s erlang halt</input>
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index a726cc7b97..7ccddf4ff0 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -32,6 +32,257 @@
   <p>This document describes the changes made to the ERTS application.</p>
 
 
+<section><title>Erts 7.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    <c>process_info(Pid, last_calls)</c> did not work for
+	    <c>Pid /= self()</c>.</p>
+          <p>
+	    Own Id: OTP-13418</p>
+        </item>
+        <item>
+          <p>
+	    Make sure to create a crash dump when running out of
+	    memory. This was accidentally removed in the erts-7.3
+	    release.</p>
+          <p>
+	    Own Id: OTP-13419</p>
+        </item>
+        <item>
+          <p>
+	    Schedulers could be woken by a premature timeout on
+	    Linux. This premature wakeup was however harmless.</p>
+          <p>
+	    Own Id: OTP-13420</p>
+        </item>
+        <item>
+          <p>
+	    A process communicating with a port via one of the
+	    <c>erlang:port_*</c> BIFs could potentially end up in an
+	    inconsistent state if the port terminated during the
+	    communication. When this occurred the process could later
+	    block in a <c>receive</c> even though it had messages
+	    matching in its message queue.</p>
+          <p>
+	    This bug was introduced in erts version 5.10 (OTP R16A).</p>
+          <p>
+	    Own Id: OTP-13424 Aux Id: OTP-10336 </p>
+        </item>
+        <item>
+          <p>
+	    The reference count of a process structure could under
+	    rare circumstances be erroneously managed. When this
+	    happened invalid memory accesses occurred.</p>
+          <p>
+	    Own Id: OTP-13446</p>
+        </item>
+        <item>
+          <p>
+	    Fix race between <c>process_flag(trap_exit,true)</c> and
+	    a received exit signal.</p>
+          <p>
+	    A process could terminate due to exit signal even though
+	    <c>process_flag(trap_exit,true)</c> had returned. A very
+	    specific timing between call to <c>process_flag/2</c> and
+	    exit signal from another scheduler was required for this
+	    to happen.</p>
+          <p>
+	    Own Id: OTP-13452</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 7.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The '-path' flag to 'erl' has been documented. This flag
+	    replaces the path specified in the boot script. It has
+	    always existed, but was earlier only documented in SASL
+	    (script).</p>
+          <p>
+	    Own Id: OTP-13060</p>
+        </item>
+        <item>
+          <p>
+	    The <c>call_time</c> tracing functionality internally
+	    used a time based on OS system time in order to measure
+	    call time which could cause erroneous results if OS
+	    system time was changed during tracing.</p>
+          <p>
+	    This functionality now use Erlang monotonic time in order
+	    to measure time. Besides fixing the erroneous results due
+	    to OS system time being used, the results are often also
+	    better since Erlang monotonic time often has better
+	    accuracy and precision.</p>
+          <p>
+	    Own Id: OTP-13216</p>
+        </item>
+        <item>
+          <p>
+	    Fix behaviour of -delay_write command line switch of
+	    epmd, which is used for debugging - in some cases epmd
+	    was sleeping twice the requested amount of time.</p>
+          <p>
+	    Own Id: OTP-13220</p>
+        </item>
+        <item>
+          <p>
+	    Fix race between timeout and exit signal that could cause
+	    a process to ignore the exit signal and continue
+	    execution. Bug exist since OTP 18.0.</p>
+          <p>
+	    Own Id: OTP-13245</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug in <c>erlang:halt/1,2</c> for large exit status
+	    values, causing either <c>badarg</c> (on 32-bit) or exit
+	    with a crash dump and/or core dump (on 64-bit). Make
+	    <c>erlang:halt/1,2</c> tolerate any non negative integer
+	    as exit status and truncate high order bits if the OS
+	    does not support it.</p>
+          <p>
+	    Own Id: OTP-13251 Aux Id: ERL-49 </p>
+        </item>
+        <item>
+          <p>
+	    <seealso
+	    marker="kernel:gen_tcp#accept/2"><c>gen_tcp:accept/2</c></seealso>
+	    was not <seealso
+	    marker="erts:time_correction#Time_Warp_Safe_Code">time
+	    warp safe</seealso>. This since it used the same time as
+	    returned by <seealso
+	    marker="erts:erlang#now/0"><c>erlang:now/0</c></seealso>
+	    when calculating timeout. This has now been fixed.</p>
+          <p>
+	    Own Id: OTP-13254 Aux Id: OTP-11997, OTP-13222 </p>
+        </item>
+        <item>
+          <p>
+	    Fix faulty error handling when writing to a compressed
+	    file.</p>
+          <p>
+	    Own Id: OTP-13270</p>
+        </item>
+        <item>
+          <p>
+	    Fix sendfile usage for large files on FreeBSD</p>
+          <p>
+	    Own Id: OTP-13271</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug that could cause
+	    <c>process_info(P,current_location)</c> to crash emulator
+	    for hipe compiled modules.</p>
+          <p>
+	    Own Id: OTP-13282 Aux Id: ERL-79 </p>
+        </item>
+        <item>
+          <p>
+	    Out of memory errors have been changed to cause an exit
+	    instead of abort.</p>
+          <p>
+	    Own Id: OTP-13292</p>
+        </item>
+        <item>
+          <p>
+	    When calling <c>garbage_collect/[1,2]</c> or
+	    <c>check_process_code/[2,3]</c> from a process with a
+	    higher priority than the priority of the process operated
+	    on, the run queues could end up in an inconsistent state.
+	    This bug has now been fixed.</p>
+          <p>
+	    Own Id: OTP-13298 Aux Id: OTP-11388 </p>
+        </item>
+        <item>
+          <p>
+	    A workaround for an issue with older gcc versions (less
+	    than 5) and inline assembly on 32-bit x86 caused an
+	    emulator crash when it had been compiled with a newer gcc
+	    version. An improved <c>configure</c> test, run when
+	    building OTP, now detects whether the workaround should
+	    be used or not.</p>
+          <p>
+	    Own Id: OTP-13326 Aux Id: ERL-80 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Introduced new statistics functionality in order to
+	    more efficiently retrieve information about run able and
+	    active processes and ports. For more information see:</p>
+	    <list> <item><seealso
+	    marker="erlang#statistics_total_run_queue_lengths"><c>statistics(total_run_queue_lengths)</c></seealso></item>
+	    <item><seealso
+	    marker="erlang#statistics_run_queue_lengths"><c>statistics(run_queue_lengths)</c></seealso></item>
+	    <item><seealso
+	    marker="erlang#statistics_total_active_tasks"><c>statistics(total_active_tasks)</c></seealso></item>
+	    <item><seealso
+	    marker="erlang#statistics_active_tasks"><c>statistics(active_tasks)</c></seealso></item>
+	    </list>
+          <p>
+	    Own Id: OTP-13201</p>
+        </item>
+        <item>
+          <p>
+	    Time warp safety improvements.</p>
+          <p>
+	    Introduced the options <c>monotonic_timestamp</c>, and
+	    <c>strict_monotonic_timestamp</c> to the trace,
+	    sequential trace, and system profile functionality. This
+	    since the already existing <c>timestamp</c> option is not
+	    time warp safe.</p>
+          <p>
+	    Introduced the option <c>safe_fixed_monotonic_time</c> to
+	    <c>ets:info/2</c> and <c>dets:info/2</c>. This since the
+	    already existing <c>safe_fixed</c> option is not time
+	    warp safe.</p>
+          <p>
+	    Own Id: OTP-13222 Aux Id: OTP-11997 </p>
+        </item>
+        <item>
+          <p>
+	    Fix a register race where down nodes goes undetected in
+	    epmd</p>
+          <p>
+	    Own Id: OTP-13301</p>
+        </item>
+        <item>
+          <p>
+	    Improved the gcc inline assembly implementing double word
+	    atomic compare and exchange on x86/x86_64 so that it also
+	    can be used when compiling with clang.</p>
+          <p>
+	    Own Id: OTP-13336</p>
+        </item>
+        <item>
+          <p>
+	    An optimization preventing a long wait for a scheduler
+	    thread looking up information about a process executing
+	    on another scheduler thread had unintentionally been lost
+	    in erts-5.10 (OTP R16A). This optimization has now been
+	    reintroduced.</p>
+          <p>
+	    Own Id: OTP-13365 Aux Id: OTP-9892 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 7.2.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/doc/src/run_erl.xml b/erts/doc/src/run_erl.xml
index 0a5b2c6136..faec3c68c1 100644
--- a/erts/doc/src/run_erl.xml
+++ b/erts/doc/src/run_erl.xml
@@ -59,7 +59,7 @@
            first argument to run_erl on the command line.</item>
           <tag>pipe_dir</tag>
           <item>This is where to put the named pipe, usually
-          <c><![CDATA[/tmp/]]></c> on Unix or <c><![CDATA[/pipe/]]></c> on OSE. It shall be suffixed by a <c><![CDATA[/]]></c> (slash),
+          <c><![CDATA[/tmp/]]></c>. It shall be suffixed by a <c><![CDATA[/]]></c> (slash),
            i.e. not <c><![CDATA[/tmp/epipies]]></c>, but <c><![CDATA[/tmp/epipes/]]></c>. </item>
           <tag>log_dir</tag>
           <item>This is where the log files are written. There will be one
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index a919f0e3ac..3a5cfddc30 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -23,10 +23,6 @@ include ../vsn.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 -include $(TARGET)/gen_git_version.mk
 
-ifeq ($(findstring ose,$(TARGET)),ose)
-include $(ERL_TOP)/make/$(TARGET)/ose_lm.mk
-endif
-
 ENABLE_ALLOC_TYPE_VARS = @ENABLE_ALLOC_TYPE_VARS@
 HIPE_ENABLED=@HIPE_ENABLED@
 DTRACE_ENABLED=@DTRACE_ENABLED@
@@ -245,9 +241,7 @@ HCC     = @HCC@
 LD      = @LD@
 DEXPORT = @DEXPORT@
 RANLIB  = @RANLIB@
-ifneq ($(findstring ose,$(TARGET)),ose)
 STRIP   = strip
-endif
 PERL    = @PERL@
 RM	= @RM@
 MKDIR	= @MKDIR@
@@ -323,7 +317,7 @@ else
 CS_CFLAGS = $(CS_CFLAGS_)
 endif
 CS_LDFLAGS = $(LDFLAGS)
-CS_LIBS = -L../lib/internal/$(TARGET) -lerts_internal$(TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
+CS_LIBS = -L../lib/internal/$(TARGET) -lerts_internal$(TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ @SOCKET_LIBS@
 
 LIBS	+= @TERMCAP_LIB@ -L../lib/internal/$(TARGET) @ERTS_INTERNAL_X_LIBS@
 
@@ -404,7 +398,7 @@ EMULATOR_EXECUTABLE = beam$(TF_MARKER).dll
 else
 EMULATOR_EXECUTABLE = beam$(TF_MARKER)
 endif
-CS_EXECUTABLE = child_setup$(TYPEMARKER)
+CS_EXECUTABLE = erl_child_setup$(TYPEMARKER)
 
 # ----------------------------------------------------------------------
 
@@ -597,6 +591,7 @@ ifeq ($(TARGET),win32)
 PRELOAD_OBJ = $(OBJDIR)/beams.$(RES_EXT)
 PRELOAD_SRC = $(TARGET)/beams.rc
 $(PRELOAD_SRC): $(ERL_TOP)/erts/preloaded/ebin/otp_ring0.beam \
+			$(ERL_TOP)/erts/preloaded/ebin/erts_code_purger.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/init.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/prim_eval.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/prim_inet.beam \
@@ -606,11 +601,13 @@ $(PRELOAD_SRC): $(ERL_TOP)/erts/preloaded/ebin/otp_ring0.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/erl_prim_loader.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/erlang.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/erts_internal.beam
+
 	$(gen_verbose)LANG=C $(PERL) utils/make_preload $(MAKE_PRELOAD_EXTRA) -rc $^ > $@
 else
 PRELOAD_OBJ = $(OBJDIR)/preload.o
 PRELOAD_SRC = $(TARGET)/preload.c
 $(PRELOAD_SRC): $(ERL_TOP)/erts/preloaded/ebin/otp_ring0.beam \
+			$(ERL_TOP)/erts/preloaded/ebin/erts_code_purger.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/init.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/prim_eval.beam \
 			$(ERL_TOP)/erts/preloaded/ebin/prim_inet.beam \
@@ -684,14 +681,6 @@ $(OBJDIR)/%.o: $(TTF_DIR)/%.c
 $(OBJDIR)/%.o: sys/$(ERLANG_OSTYPE)/%.c
 	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
-ifeq ($(findstring ose,$(TARGET)),ose)
-$(OBJDIR)/ose_confd.o: $(OSE_CONFD)
-	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-
-$(OBJDIR)/crt0_lm.o: $(CRT0_LM)
-	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-endif
-
 $(OBJDIR)/%.o: sys/common/%.c
 	$(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 
@@ -704,11 +693,11 @@ $(OBJDIR)/%.o: drivers/$(ERLANG_OSTYPE)/%.c
 # ----------------------------------------------------------------------
 # Specials
 #
-CS_SRC = sys/$(ERLANG_OSTYPE)/erl_child_setup.c
+CS_OBJ = $(OBJDIR)/erl_child_setup.o $(OBJDIR)/sys_uds.o $(OBJDIR)/hash.o
 
-$(BINDIR)/$(CS_EXECUTABLE): $(TTF_DIR)/GENERATED $(PRELOAD_SRC) $(CS_SRC) $(ERTS_LIB)
-	$(ld_verbose)$(CS_PURIFY) $(CC) $(CS_LDFLAGS) -o $(BINDIR)/$(CS_EXECUTABLE) \
-               $(CS_CFLAGS) $(COMMON_INCLUDES) $(CS_SRC) $(CS_LIBS)
+$(BINDIR)/$(CS_EXECUTABLE): $(TTF_DIR)/GENERATED $(PRELOAD_SRC) $(CS_OBJ) $(ERTS_LIB)
+	$(ld_verbose)$(CS_PURIFY) $(LD) $(CS_LDFLAGS) -o $(BINDIR)/$(CS_EXECUTABLE) \
+               $(CS_CFLAGS) $(COMMON_INCLUDES) $(CS_OBJ) $(CS_LIBS)
 
 $(OBJDIR)/%.kp.o: sys/common/%.c
 	$(V_CC) -DERTS_KERNEL_POLL_VERSION $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
@@ -787,7 +776,10 @@ RUN_OBJS = \
 	$(OBJDIR)/erl_zlib.o		$(OBJDIR)/erl_nif.o \
 	$(OBJDIR)/erl_bif_binary.o      $(OBJDIR)/erl_ao_firstfit_alloc.o \
 	$(OBJDIR)/erl_thr_queue.o	$(OBJDIR)/erl_sched_spec_pre_alloc.o \
-	$(OBJDIR)/erl_ptab.o		$(OBJDIR)/erl_map.o
+	$(OBJDIR)/erl_ptab.o		$(OBJDIR)/erl_map.o \
+	$(OBJDIR)/erl_msacc.o
+
+LTTNG_OBJS = $(OBJDIR)/erlang_lttng.o
 
 ifeq ($(TARGET),win32)
 DRV_OBJS = \
@@ -810,31 +802,10 @@ OS_OBJS = \
 	$(OBJDIR)/dosmap.o
 
 else
-ifeq ($(findstring ose,$(TARGET)),ose)
-OS_OBJS = \
-	$(OBJDIR)/sys.o \
-	$(OBJDIR)/driver_tab.o \
-	$(OBJDIR)/ose_efile.o \
-	$(OBJDIR)/gzio.o \
-	$(OBJDIR)/elib_memmove.o
-
-OS_OBJS += $(OBJDIR)/ose_confd.o \
-	$(OBJDIR)/crt0_lm.o
-
-OS_OBJS += $(OBJDIR)/sys_float.o \
-					 $(OBJDIR)/sys_time.o
-
-DRV_OBJS = \
-	$(OBJDIR)/efile_drv.o \
-	$(OBJDIR)/ose_signal_drv.o \
-	$(OBJDIR)/inet_drv.o \
-	$(OBJDIR)/zlib_drv.o \
-	$(OBJDIR)/ram_file_drv.o \
-	$(OBJDIR)/ttsl_drv.o
-
-else
 OS_OBJS = \
 	$(OBJDIR)/sys.o \
+	$(OBJDIR)/sys_drivers.o \
+	$(OBJDIR)/sys_uds.o \
 	$(OBJDIR)/driver_tab.o \
 	$(OBJDIR)/unix_efile.o \
 	$(OBJDIR)/gzio.o \
@@ -849,7 +820,6 @@ DRV_OBJS = \
 	$(OBJDIR)/ram_file_drv.o \
 	$(OBJDIR)/ttsl_drv.o
 endif
-endif
 
 ifneq ($(STATIC_NIFS),no)
 STATIC_NIF_LIBS = $(STATIC_NIFS)
@@ -917,7 +887,7 @@ ifdef HIPE_ENABLED
 EXTRA_BASE_OBJS += $(HIPE_OBJS)
 endif
 
-BASE_OBJS = $(EMU_OBJS) $(RUN_OBJS) $(OS_OBJS) $(EXTRA_BASE_OBJS)
+BASE_OBJS = $(EMU_OBJS) $(RUN_OBJS) $(OS_OBJS) $(EXTRA_BASE_OBJS) $(LTTNG_OBJS)
 
 before_DTrace_OBJS =	$(BASE_OBJS) $(DRV_OBJS)
 
@@ -1022,19 +992,12 @@ $(BINDIR)/$(EMULATOR_EXECUTABLE): $(INIT_OBJS) $(OBJS) $(DEPLIBS)
 	$(STATIC_DRIVER_LIBS) $(LIBS)
 
 else
-ifeq ($(findstring ose,$(TARGET)),ose)
-$(BINDIR)/$(EMULATOR_EXECUTABLE): $(INIT_OBJS) $(OBJS) $(DEPLIBS) $(LCF)
-	$(call build-ose-load-module, $@, $(INIT_OBJS) $(OBJS), $(STATIC_NIF_LIBS) \
-	$(STATIC_DRIVER_LIBS) $(LIBS), $(BEAM_LMCONF))
-
-else
 $(BINDIR)/$(EMULATOR_EXECUTABLE): $(INIT_OBJS) $(OBJS) $(DEPLIBS)
 	$(ld_verbose)$(PURIFY) $(LD) -o $(BINDIR)/$(EMULATOR_EXECUTABLE) \
 	$(HIPEBEAMLDFLAGS) $(LDFLAGS) $(DEXPORT) $(INIT_OBJS) $(OBJS) \
 	$(STATIC_NIF_LIBS) $(STATIC_DRIVER_LIBS) $(LIBS)
 
 endif
-endif
 
 # ----------------------------------------------------------------------
 # Dependencies
diff --git a/erts/emulator/beam/atom.c b/erts/emulator/beam/atom.c
index fe91134ef4..099c00bcf6 100644
--- a/erts/emulator/beam/atom.c
+++ b/erts/emulator/beam/atom.c
@@ -176,7 +176,7 @@ atom_alloc(Atom* tmpl)
 
     /*
      * Precompute ordinal value of first 3 bytes + 7 bits.
-     * This is used by utils.c:cmp_atoms().
+     * This is used by utils.c:erts_cmp_atoms().
      * We cannot use the full 32 bits of the first 4 bytes,
      * since we use the sign of the difference between two
      * ordinal values to represent their relative order.
@@ -435,6 +435,9 @@ init_atom_table(void)
     f.cmp  = (HCMP_FUN) atom_cmp;
     f.alloc = (HALLOC_FUN) atom_alloc;
     f.free = (HFREE_FUN) atom_free;
+    f.meta_alloc = (HMALLOC_FUN) erts_alloc;
+    f.meta_free = (HMFREE_FUN) erts_free;
+    f.meta_print = (HMPRINT_FUN) erts_print;
 
     atom_text_pos = NULL;
     atom_text_end = NULL;
diff --git a/erts/emulator/beam/atom.h b/erts/emulator/beam/atom.h
index ead56c83d8..2c002ca92f 100644
--- a/erts/emulator/beam/atom.h
+++ b/erts/emulator/beam/atom.h
@@ -129,6 +129,7 @@ typedef enum {
   (erts_is_atom_utf8_bytes((byte *) LSTR, sizeof(LSTR) - 1, (TERM)))
 #define ERTS_DECL_AM(S) Eterm AM_ ## S = am_atom_put(#S, sizeof(#S) - 1)
 #define ERTS_INIT_AM(S) AM_ ## S = am_atom_put(#S, sizeof(#S) - 1)
+#define ERTS_MAKE_AM(Str) am_atom_put(Str, sizeof(Str) - 1)
 
 int atom_table_size(void);	/* number of elements */
 int atom_table_sz(void);	/* table size in bytes, excluding stored objects */
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index fb3368eae2..169b071cd7 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -102,6 +102,7 @@ atom asynchronous
 atom atom
 atom atom_used
 atom attributes
+atom await_microstate_accounting_modifications
 atom await_port_send_result
 atom await_proc_exit
 atom await_result
@@ -118,14 +119,15 @@ atom bif_timer_server
 atom binary
 atom binary_bin_to_list_trap
 atom binary_copy_trap
+atom binary_find_trap
 atom binary_longest_prefix_trap
 atom binary_longest_suffix_trap
-atom binary_match_trap
-atom binary_matches_trap
 atom binary_to_list_continue
 atom binary_to_term_trap
 atom block
+atom block_normal
 atom blocked
+atom blocked_normal
 atom bm
 atom bnot
 atom bor
@@ -173,6 +175,7 @@ atom const
 atom context_switches
 atom control
 atom copy
+atom counters
 atom cpu
 atom cpu_timestamp
 atom cr
@@ -189,7 +192,9 @@ atom dexit
 atom depth
 atom dgroup_leader
 atom dictionary
+atom dirty_cpu
 atom dirty_cpu_schedulers_online
+atom dirty_io
 atom disable_trace
 atom disabled
 atom display_items
@@ -210,7 +215,9 @@ atom dsend
 atom dsend_continue_trap
 atom dunlink
 atom duplicate_bag
+atom duplicated
 atom dupnames
+atom einval
 atom elib_malloc
 atom emulator
 atom enable_trace
@@ -258,6 +265,7 @@ atom functions
 atom function_clause
 atom garbage_collecting
 atom garbage_collection
+atom garbage_collection_info
 atom gc_end
 atom gc_start
 atom Ge='>='
@@ -268,7 +276,9 @@ atom get_tcw
 atom getenv
 atom gather_gc_info_result
 atom gather_io_bytes
+atom gather_microstate_accounting_result
 atom gather_sched_wall_time_result
+atom gather_system_check_result
 atom getting_linked
 atom getting_unlinked
 atom global
@@ -299,6 +309,7 @@ atom index
 atom infinity
 atom info
 atom info_msg
+atom init
 atom initial_call
 atom input
 atom internal
@@ -352,17 +363,20 @@ atom memory_internal
 atom memory_types
 atom message
 atom message_binary
+atom message_queue_data
 atom message_queue_len
 atom messages
 atom merge_trap
 atom meta
 atom meta_match_spec
 atom micro_seconds
+atom microstate_accounting
 atom milli_seconds
 atom min_heap_size
 atom min_bin_vheap_size
 atom minor_version
 atom Minus='-'
+atom mixed
 atom module
 atom module_info
 atom monitored_by
@@ -370,6 +384,7 @@ atom monitor
 atom monitor_nodes
 atom monitors
 atom monotonic
+atom monotonic_timestamp
 atom more
 atom multi_scheduling
 atom multiline
@@ -425,10 +440,12 @@ atom notify
 atom notsup
 atom nouse_stdio
 atom objects
+atom off_heap
 atom offset
 atom ok
 atom old_heap_block_size
 atom old_heap_size
+atom on_heap
 atom on_load
 atom open
 atom open_error
@@ -439,13 +456,6 @@ atom orelse
 atom os_pid
 atom os_type
 atom os_version
-atom ose_bg_proc
-atom ose_int_proc
-atom ose_phantom
-atom ose_pri_proc
-atom ose_process_prio
-atom ose_process_type
-atom ose_ti_proc
 atom out
 atom out_exited
 atom out_exiting
@@ -559,6 +569,7 @@ atom static
 atom stderr_to_stdout
 atom stop
 atom stream
+atom strict_monotonic_timestamp
 atom sunrm
 atom suspend
 atom suspended
@@ -589,6 +600,8 @@ atom trace trace_ts traced
 atom trace_control_word
 atom tracer
 atom trap_exit
+atom trim
+atom trim_all
 atom try_clause
 atom true
 atom tuple
@@ -604,6 +617,7 @@ atom use_stdio
 atom used
 atom utf8
 atom unblock
+atom unblock_normal
 atom uniq
 atom unless_suspending
 atom unloaded
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c
index 0e192b1ebd..0b47fc3586 100644
--- a/erts/emulator/beam/beam_bif_load.c
+++ b/erts/emulator/beam/beam_bif_load.c
@@ -38,9 +38,9 @@
 #include "erl_thr_progress.h"
 
 static void set_default_trace_pattern(Eterm module);
-static Eterm check_process_code(Process* rp, Module* modp, int allow_gc, int *redsp);
+static Eterm check_process_code(Process* rp, Module* modp, Uint flags, int *redsp);
 static void delete_code(Module* modp);
-static void decrement_refc(BeamInstr* code);
+static void decrement_refc(BeamCodeHeader*);
 static int any_heap_ref_ptrs(Eterm* start, Eterm* end, char* mod_start, Uint mod_size);
 static int any_heap_refs(Eterm* start, Eterm* end, char* mod_start, Uint mod_size);
 
@@ -58,8 +58,8 @@ BIF_RETTYPE code_is_module_native_1(BIF_ALIST_1)
 	return am_undefined;
     }
     erts_rlock_old_code(code_ix);
-    res = (erts_is_module_native(modp->curr.code) ||
-           erts_is_module_native(modp->old.code)) ?
+    res = (erts_is_module_native(modp->curr.code_hdr) ||
+           erts_is_module_native(modp->old.code_hdr)) ?
 		am_true : am_false;
     erts_runlock_old_code(code_ix);
     return res;
@@ -81,12 +81,12 @@ BIF_RETTYPE code_make_stub_module_3(BIF_ALIST_3)
     modp = erts_get_module(BIF_ARG_1, erts_active_code_ix());
 
     if (modp && modp->curr.num_breakpoints > 0) {
-	ASSERT(modp->curr.code != NULL);
+	ASSERT(modp->curr.code_hdr != NULL);
 	erts_clear_module_break(modp);
 	ASSERT(modp->curr.num_breakpoints == 0);
     }
 
-    erts_start_staging_code_ix();
+    erts_start_staging_code_ix(1);
 
     res = erts_make_stub_module(BIF_P, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3);
 
@@ -139,6 +139,25 @@ prepare_loading_2(BIF_ALIST_2)
     BIF_RET(res);
 }
 
+BIF_RETTYPE
+has_prepared_code_on_load_1(BIF_ALIST_1)
+{
+    Eterm res;
+    ProcBin* pb;
+
+    if (!ERTS_TERM_IS_MAGIC_BINARY(BIF_ARG_1)) {
+    error:
+	BIF_ERROR(BIF_P, BADARG);
+    }
+
+    pb = (ProcBin*) binary_val(BIF_ARG_1);
+    res = erts_has_code_on_load(pb->val);
+    if (res == NIL) {
+	goto error;
+    }
+    BIF_RET(res);
+}
+
 struct m {
     Binary* code;
     Eterm module;
@@ -154,7 +173,7 @@ static struct /* Protected by code_write_permission */
 {
     Process* stager;
     ErtsThrPrgrLaterOp lop;
-}commiter_state;
+} committer_state;
 #endif
 
 static Eterm
@@ -163,14 +182,13 @@ exception_list(Process* p, Eterm tag, struct m* mp, Sint exceptions)
     Eterm* hp = HAlloc(p, 3 + 2*exceptions);
     Eterm res = NIL;
 
-    mp += exceptions - 1;
     while (exceptions > 0) {
 	if (mp->exception) {
 	    res = CONS(hp, mp->module, res);
 	    hp += 2;
 	    exceptions--;
 	}
-	mp--;
+	mp++;
     }
     return TUPLE2(hp, tag, res);
 }
@@ -179,8 +197,8 @@ exception_list(Process* p, Eterm tag, struct m* mp, Sint exceptions)
 BIF_RETTYPE
 finish_loading_1(BIF_ALIST_1)
 {
-    int i;
-    int n;
+    Sint i;
+    Sint n;
     struct m* p = NULL;
     Uint exceptions;
     Eterm res;
@@ -201,9 +219,13 @@ finish_loading_1(BIF_ALIST_1)
      */
 
     n = erts_list_length(BIF_ARG_1);
-    if (n == -1) {
-	ERTS_BIF_PREP_ERROR(res, BIF_P, BADARG);
-	goto done;
+    if (n < 0) {
+    badarg:
+	if (p) {
+	    erts_free(ERTS_ALC_T_LOADER_TMP, p);
+	}
+	erts_release_code_write_permission();
+	BIF_ERROR(BIF_P, BADARG);
     }
     p = erts_alloc(ERTS_ALC_T_LOADER_TMP, n*sizeof(struct m));
 
@@ -218,29 +240,32 @@ finish_loading_1(BIF_ALIST_1)
 	ProcBin* pb;
 
 	if (!ERTS_TERM_IS_MAGIC_BINARY(term)) {
-	    ERTS_BIF_PREP_ERROR(res, BIF_P, BADARG);
-	    goto done;
+	    goto badarg;
 	}
 	pb = (ProcBin*) binary_val(term);
 	p[i].code = pb->val;
 	p[i].module = erts_module_for_prepared_code(p[i].code);
 	if (p[i].module == NIL) {
-	    ERTS_BIF_PREP_ERROR(res, BIF_P, BADARG);
-	    goto done;
+	    goto badarg;
 	}
 	BIF_ARG_1 = CDR(cons);
     }
 
     /*
      * Since we cannot handle atomic loading of a group of modules
-     * if one or more of them uses on_load, we will only allow one
-     * element in the list. This limitation is intended to be
-     * lifted in the future.
+     * if one or more of them uses on_load, we will only allow
+     * more than one element in the list if none of the modules
+     * have an on_load function.
      */
 
     if (n > 1) {
-	ERTS_BIF_PREP_ERROR(res, BIF_P, SYSTEM_LIMIT);
-	goto done;
+	for (i = 0; i < n; i++) {
+	    if (erts_has_code_on_load(p[i].code) == am_true) {
+		erts_free(ERTS_ALC_T_LOADER_TMP, p);
+		erts_release_code_write_permission();
+		BIF_ERROR(BIF_P, SYSTEM_LIMIT);
+	    }
+	}
     }
 
     /*
@@ -252,11 +277,27 @@ finish_loading_1(BIF_ALIST_1)
      */
 
     res = am_ok;
-    erts_start_staging_code_ix();
+    erts_start_staging_code_ix(n);
 
     for (i = 0; i < n; i++) {
 	p[i].modp = erts_put_module(p[i].module);
+	p[i].modp->seen = 0;
     }
+
+    exceptions = 0;
+    for (i = 0; i < n; i++) {
+	p[i].exception = 0;
+	if (p[i].modp->seen) {
+	    p[i].exception = 1;
+	    exceptions++;
+	}
+	p[i].modp->seen = 1;
+    }
+    if (exceptions) {
+	res = exception_list(BIF_P, am_duplicated, p, exceptions);
+	goto done;
+    }
+
     for (i = 0; i < n; i++) {
 	if (p[i].modp->curr.num_breakpoints > 0 ||
 	    p[i].modp->curr.num_traced_exports > 0 ||
@@ -281,7 +322,7 @@ finish_loading_1(BIF_ALIST_1)
     exceptions = 0;
     for (i = 0; i < n; i++) {
 	p[i].exception = 0;
-	if (p[i].modp->curr.code && p[i].modp->old.code) {
+	if (p[i].modp->curr.code_hdr && p[i].modp->old.code_hdr) {
 	    p[i].exception = 1;
 	    exceptions++;
 	}
@@ -367,9 +408,9 @@ staging_epilogue(Process* c_p, int commit, Eterm res, int is_blocking,
 	 * schedulers to read active code_ix in a safe way while executing
 	 * without any memory barriers at all. 
 	 */
-	ASSERT(commiter_state.stager == NULL);
-	commiter_state.stager = c_p;
-	erts_schedule_thr_prgr_later_op(smp_code_ix_commiter, NULL, &commiter_state.lop);
+	ASSERT(committer_state.stager == NULL);
+	committer_state.stager = c_p;
+	erts_schedule_thr_prgr_later_op(smp_code_ix_commiter, NULL, &committer_state.lop);
 	erts_proc_inc_refc(c_p);
 	erts_suspend(c_p, ERTS_PROC_LOCK_MAIN, NULL);
 	/*
@@ -385,11 +426,11 @@ staging_epilogue(Process* c_p, int commit, Eterm res, int is_blocking,
 #ifdef ERTS_SMP
 static void smp_code_ix_commiter(void* null)
 {
-    Process* p = commiter_state.stager;
+    Process* p = committer_state.stager;
 
     erts_commit_staging_code_ix();
 #ifdef DEBUG
-    commiter_state.stager = NULL;
+    committer_state.stager = NULL;
 #endif
     erts_release_code_write_permission();
     erts_smp_proc_lock(p, ERTS_PROC_LOCK_STATUS);
@@ -417,7 +458,7 @@ check_old_code_1(BIF_ALIST_1)
     modp = erts_get_module(BIF_ARG_1, code_ix);
     if (modp != NULL) {
 	erts_rlock_old_code(code_ix);
-	if (modp->old.code != NULL) {
+	if (modp->old.code_hdr) {
 	    res = am_true;
 	}
 	erts_runlock_old_code(code_ix);
@@ -426,7 +467,7 @@ check_old_code_1(BIF_ALIST_1)
 }
 
 Eterm
-erts_check_process_code(Process *c_p, Eterm module, int allow_gc, int *redsp)
+erts_check_process_code(Process *c_p, Eterm module, Uint flags, int *redsp)
 {
     Module* modp;
     Eterm res;
@@ -441,7 +482,8 @@ erts_check_process_code(Process *c_p, Eterm module, int allow_gc, int *redsp)
     if (!modp)
 	return am_false;
     erts_rlock_old_code(code_ix);
-    res = modp->old.code ? check_process_code(c_p, modp, allow_gc, redsp) : am_false;
+    res = (!modp->old.code_hdr ? am_false :
+           check_process_code(c_p, modp, flags, redsp));
     erts_runlock_old_code(code_ix);
 
     return res;
@@ -450,49 +492,21 @@ erts_check_process_code(Process *c_p, Eterm module, int allow_gc, int *redsp)
 BIF_RETTYPE erts_internal_check_process_code_2(BIF_ALIST_2)
 {
     int reds = 0;
+    Uint flags;
     Eterm res;
-    Eterm olist = BIF_ARG_2;
-    int allow_gc = 1;
 
     if (is_not_atom(BIF_ARG_1))
 	goto badarg;
 
-    while (is_list(olist)) {
-	Eterm *lp = list_val(olist);
-	Eterm opt = CAR(lp);
-	if (is_tuple(opt)) {
-	    Eterm* tp = tuple_val(opt);
-	    switch (arityval(tp[0])) {
-	    case 2:
-		switch (tp[1]) {
-		case am_allow_gc:
-		    switch (tp[2]) {
-		    case am_false:
-			allow_gc = 0;
-			break;
-		    case am_true:
-			allow_gc = 1;
-			break;
-		    default:
-			goto badarg;
-		    }
-		    break;
-		default:
-		    goto badarg;
-		}
-		break;
-	    default:
-		goto badarg;
-	    }
-	}
-	else
-	    goto badarg;
-	olist = CDR(lp);
+    if (is_not_small(BIF_ARG_2))
+        goto badarg;
+
+    flags = unsigned_val(BIF_ARG_2);
+    if (flags & ~ERTS_CPC_ALL) {
+        goto badarg;
     }
-    if (is_not_nil(olist))
-	goto badarg;
 
-    res = erts_check_process_code(BIF_P, BIF_ARG_1, allow_gc, &reds);
+    res = erts_check_process_code(BIF_P, BIF_ARG_1, flags, &reds);
 
     ASSERT(is_value(res));
 
@@ -519,13 +533,13 @@ BIF_RETTYPE delete_module_1(BIF_ALIST_1)
     }
 
     {
-	erts_start_staging_code_ix();
+	erts_start_staging_code_ix(0);
 	code_ix = erts_staging_code_ix();
 	modp = erts_get_module(BIF_ARG_1, code_ix);
 	if (!modp) {
 	    res = am_undefined;
 	}
-	else if (modp->old.code != 0) {
+	else if (modp->old.code_hdr) {
 	    erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
 	    erts_dsprintf(dsbufp, "Module %T must be purged before loading\n",
 			  BIF_ARG_1);
@@ -563,8 +577,8 @@ BIF_RETTYPE module_loaded_1(BIF_ALIST_1)
     }
     code_ix = erts_active_code_ix();
     if ((modp = erts_get_module(BIF_ARG_1, code_ix)) != NULL) {
-	if (modp->curr.code != NULL
-	    && modp->curr.code[MI_ON_LOAD_FUNCTION_PTR] == 0) {
+	if (modp->curr.code_hdr
+	    && modp->curr.code_hdr->on_load_function_ptr == NULL) {
 	    res = am_true;
 	}
     }
@@ -611,8 +625,8 @@ BIF_RETTYPE call_on_load_function_1(BIF_ALIST_1)
 {
     Module* modp = erts_get_module(BIF_ARG_1, erts_active_code_ix());
 
-    if (modp && modp->curr.code) {
-	BIF_TRAP_CODE_PTR_0(BIF_P, modp->curr.code[MI_ON_LOAD_FUNCTION_PTR]);
+    if (modp && modp->curr.code_hdr) {
+	BIF_TRAP_CODE_PTR_0(BIF_P, modp->curr.code_hdr->on_load_function_ptr);
     }
     else {
 	BIF_ERROR(BIF_P, BADARG);
@@ -623,7 +637,6 @@ BIF_RETTYPE finish_after_on_load_2(BIF_ALIST_2)
 {
     ErtsCodeIndex code_ix;
     Module* modp;
-    Eterm on_load;
 
     if (!erts_try_seize_code_write_permission(BIF_P)) {
 	ERTS_BIF_YIELD2(bif_export[BIF_finish_after_on_load_2],
@@ -638,14 +651,14 @@ BIF_RETTYPE finish_after_on_load_2(BIF_ALIST_2)
     code_ix = erts_active_code_ix();
     modp = erts_get_module(BIF_ARG_1, code_ix);
 
-    if (!modp || modp->curr.code == 0) {
+    if (!modp || !modp->curr.code_hdr) {
     error:
 	erts_smp_thr_progress_unblock();
         erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_MAIN);
 	erts_release_code_write_permission();
 	BIF_ERROR(BIF_P, BADARG);
     }
-    if ((on_load = modp->curr.code[MI_ON_LOAD_FUNCTION_PTR]) == 0) {
+    if (modp->curr.code_hdr->on_load_function_ptr == NULL) {
 	goto error;
     }
     if (BIF_ARG_2 != am_false && BIF_ARG_2 != am_true) {
@@ -667,7 +680,7 @@ BIF_RETTYPE finish_after_on_load_2(BIF_ALIST_2)
 		ep->code[4] = 0;
 	    }
 	}
-	modp->curr.code[MI_ON_LOAD_FUNCTION_PTR] = 0;
+	modp->curr.code_hdr->on_load_function_ptr = NULL;
 	set_default_trace_pattern(BIF_ARG_1);
     } else if (BIF_ARG_2 == am_false) {
 	BeamInstr* code;
@@ -679,13 +692,16 @@ BIF_RETTYPE finish_after_on_load_2(BIF_ALIST_2)
 	 * the current code; the old code is not touched.
 	 */
 	erts_total_code_size -= modp->curr.code_length;
-	code = modp->curr.code;
-	end = (BeamInstr *)((char *)code + modp->curr.code_length);
+	code = (BeamInstr*) modp->curr.code_hdr;
+	end = (BeamInstr *) ((char *)code + modp->curr.code_length);
 	erts_cleanup_funs_on_purge(code, end);
 	beam_catches_delmod(modp->curr.catches, code, modp->curr.code_length,
 			    erts_active_code_ix());
-	erts_free(ERTS_ALC_T_CODE, (void *) code);
-	modp->curr.code = NULL;
+        if (modp->curr.code_hdr->literals_start) {
+            erts_free(ERTS_ALC_T_LITERAL, modp->curr.code_hdr->literals_start);
+        }
+	erts_free(ERTS_ALC_T_CODE, modp->curr.code_hdr);
+	modp->curr.code_hdr = NULL;
 	modp->curr.code_length = 0;
 	modp->curr.catches = BEAM_CATCHES_NIL;
 	erts_remove_from_ranges(code);
@@ -721,31 +737,50 @@ set_default_trace_pattern(Eterm module)
     }
 }
 
+static ERTS_INLINE int
+check_mod_funs(Process *p, ErlOffHeap *off_heap, char *area, size_t area_size)
+{
+    struct erl_off_heap_header* oh;
+    for (oh = off_heap->first; oh; oh = oh->next) {
+	if (thing_subtag(oh->thing_word) == FUN_SUBTAG) {
+	    ErlFunThing* funp = (ErlFunThing*) oh;
+	    if (ErtsInArea(funp->fe->address, area, area_size))
+		return !0;
+	}
+    }
+    return 0;
+}
+
+
 static Eterm
-check_process_code(Process* rp, Module* modp, int allow_gc, int *redsp)
+check_process_code(Process* rp, Module* modp, Uint flags, int *redsp)
 {
     BeamInstr* start;
+    char* literals;
+    Uint lit_bsize;
     char* mod_start;
     Uint mod_size;
-    BeamInstr* end;
     Eterm* sp;
-    struct erl_off_heap_header* oh;
     int done_gc = 0;
+    int need_gc = 0;
+    ErtsMessage *msgp;
+    ErlHeapFragment *hfrag;
 
-#define INSIDE(a) (start <= (a) && (a) < end)
+#define ERTS_ORDINARY_GC__ (1 << 0)
+#define ERTS_LITERAL_GC__  (1 << 1)
 
     /*
      * Pick up limits for the module.
      */
-    start = modp->old.code;
-    end = (BeamInstr *)((char *)start + modp->old.code_length);
+    start = (BeamInstr*) modp->old.code_hdr;
     mod_start = (char *) start;
     mod_size = modp->old.code_length;
 
     /*
      * Check if current instruction or continuation pointer points into module.
      */
-    if (INSIDE(rp->i) || INSIDE(rp->cp)) {
+    if (ErtsInArea(rp->i, mod_start, mod_size)
+	|| ErtsInArea(rp->cp, mod_start, mod_size)) {
 	return am_true;
     }
 
@@ -753,7 +788,7 @@ check_process_code(Process* rp, Module* modp, int allow_gc, int *redsp)
      * Check all continuation pointers stored on the stack.
      */
     for (sp = rp->stop; sp < STACK_START(rp); sp++) {
-	if (is_CP(*sp) && INSIDE(cp_val(*sp))) {
+	if (is_CP(*sp) && ErtsInArea(cp_val(*sp), mod_start, mod_size)) {
 	    return am_true;
 	}
     }
@@ -767,15 +802,15 @@ check_process_code(Process* rp, Module* modp, int allow_gc, int *redsp)
 	struct StackTrace *s;
 	ASSERT(is_list(rp->ftrace));
 	s = (struct StackTrace *) big_val(CDR(list_val(rp->ftrace)));
-	if ((s->pc && INSIDE(s->pc)) ||
-	    (s->current && INSIDE(s->current))) {
+	if ((s->pc && ErtsInArea(s->pc, mod_start, mod_size)) ||
+	    (s->current && ErtsInArea(s->current, mod_start, mod_size))) {
 	    rp->freason = EXC_NULL;
 	    rp->fvalue = NIL;
 	    rp->ftrace = NIL;
 	} else {
 	    int i;
 	    for (i = 0;  i < s->depth;  i++) {
-		if (INSIDE(s->trace[i])) {
+		if (ErtsInArea(s->trace[i], mod_start, mod_size)) {
 		    rp->freason = EXC_NULL;
 		    rp->fvalue = NIL;
 		    rp->ftrace = NIL;
@@ -796,111 +831,147 @@ check_process_code(Process* rp, Module* modp, int allow_gc, int *redsp)
     }
 
     /*
-     * See if there are funs that refer to the old version of the module.
+     * Message queue can contains funs, but (at least currently) no
+     * constants. If we got references to this module from the message
+     * queue, a GC cannot remove these...
      */
 
- rescan:
-    for (oh = MSO(rp).first; oh; oh = oh->next) {
-	if (thing_subtag(oh->thing_word) == FUN_SUBTAG) {
-	    ErlFunThing* funp = (ErlFunThing*) oh;
+    erts_smp_proc_lock(rp, ERTS_PROC_LOCK_MSGQ);
+    ERTS_SMP_MSGQ_MV_INQ2PRIVQ(rp);
+    erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_MSGQ);
 
-	    if (INSIDE((BeamInstr *) funp->fe->address)) {
-		if (done_gc) {
-		    return am_true;
-		} else {
-		    if (!allow_gc)
-			return am_aborted;
-		    /*
-		    * Try to get rid of this fun by garbage collecting.
-		    * Clear both fvalue and ftrace to make sure they
-		    * don't hold any funs.
-		    */
-		    rp->freason = EXC_NULL;
-		    rp->fvalue = NIL;
-		    rp->ftrace = NIL;
-		    done_gc = 1;
-		    FLAGS(rp) |= F_NEED_FULLSWEEP;
-		    *redsp += erts_garbage_collect(rp, 0, rp->arg_reg, rp->arity);
-		    goto rescan;
-		}
-	    }
+    literals = (char*) modp->old.code_hdr->literals_start;
+    lit_bsize = (char*) modp->old.code_hdr->literals_end - literals;
+
+    for (msgp = rp->msg.first; msgp; msgp = msgp->next) {
+	if (msgp->data.attached == ERTS_MSG_COMBINED_HFRAG)
+	    hfrag = &msgp->hfrag;
+	else if (is_value(ERL_MESSAGE_TERM(msgp)) && msgp->data.heap_frag)
+	    hfrag = msgp->data.heap_frag;
+	else
+	    continue;
+	for (; hfrag; hfrag = hfrag->next) {
+	    if (check_mod_funs(rp, &hfrag->off_heap, mod_start, mod_size))
+		return am_true;
+	    /* Should not contain any constants... */
+	    ASSERT(!any_heap_refs(&hfrag->mem[0],
+				  &hfrag->mem[hfrag->used_size],
+                                  literals,
+				  lit_bsize));
 	}
     }
 
-    /*
-     * See if there are constants inside the module referenced by the process.
-     */
-    done_gc = 0;
-    for (;;) {
-	ErlMessage* mp;
-
-	if (any_heap_ref_ptrs(&rp->fvalue, &rp->fvalue+1, mod_start, mod_size)) {
+    while (1) {
+
+	/* Check heap, stack etc... */
+	if (check_mod_funs(rp, &rp->off_heap, mod_start, mod_size))
+	    goto try_gc;
+        if (!(flags & ERTS_CPC_COPY_LITERALS)) {
+            /* Process ok. May contain old literals but we will be called
+             * again before module is purged.
+             */
+            return am_false;
+        }
+	if (any_heap_ref_ptrs(&rp->fvalue, &rp->fvalue+1, literals, lit_bsize)) {
 	    rp->freason = EXC_NULL;
 	    rp->fvalue = NIL;
 	    rp->ftrace = NIL;
 	}
-	if (any_heap_ref_ptrs(rp->stop, rp->hend, mod_start, mod_size)) {
-	    goto need_gc;
-	}
-	if (any_heap_refs(rp->heap, rp->htop, mod_start, mod_size)) {
-	    goto need_gc;
-	}
-
-	if (any_heap_refs(rp->old_heap, rp->old_htop, mod_start, mod_size)) {
-	    goto need_gc;
+	if (any_heap_ref_ptrs(rp->stop, rp->hend, literals, lit_bsize))
+	    goto try_literal_gc;
+	if (any_heap_refs(rp->heap, rp->htop, literals, lit_bsize))
+	    goto try_literal_gc;
+	if (any_heap_refs(rp->old_heap, rp->old_htop, literals, lit_bsize))
+	    goto try_literal_gc;
+
+	/* Check dictionary */
+	if (rp->dictionary) {
+	    Eterm* start = ERTS_PD_START(rp->dictionary);
+	    Eterm* end = start + ERTS_PD_SIZE(rp->dictionary);
+
+	    if (any_heap_ref_ptrs(start, end, literals, lit_bsize))
+		goto try_literal_gc;
 	}
 
-	if (rp->dictionary != NULL) {
-	    Eterm* start = rp->dictionary->data;
-	    Eterm* end = start + rp->dictionary->used;
+	/* Check heap fragments */
+	for (hfrag = rp->mbuf; hfrag; hfrag = hfrag->next) {
+	    Eterm *hp, *hp_end;
+	    /* Off heap lists should already have been moved into process */
+	    ASSERT(!check_mod_funs(rp, &hfrag->off_heap, mod_start, mod_size));
 
-	    if (any_heap_ref_ptrs(start, end, mod_start, mod_size)) {
-		goto need_gc;
-	    }
+	    hp = &hfrag->mem[0];
+	    hp_end = &hfrag->mem[hfrag->used_size];
+	    if (any_heap_refs(hp, hp_end, literals, lit_bsize))
+		goto try_literal_gc;
 	}
 
-	for (mp = rp->msg.first; mp != NULL; mp = mp->next) {
-	    if (any_heap_ref_ptrs(mp->m, mp->m+2, mod_start, mod_size)) {
-		goto need_gc;
+#ifdef DEBUG
+	/*
+	 * Message buffer fragments should not have any references
+	 * to constants, and off heap lists should already have
+	 * been moved into process off heap structure.
+	 */
+	for (msgp = rp->msg_frag; msgp; msgp = msgp->next) {
+	    if (msgp->data.attached == ERTS_MSG_COMBINED_HFRAG)
+		hfrag = &msgp->hfrag;
+	    else
+		hfrag = msgp->data.heap_frag;
+	    for (; hfrag; hfrag = hfrag->next) {
+		Eterm *hp, *hp_end;
+		ASSERT(!check_mod_funs(rp, &hfrag->off_heap, mod_start, mod_size));
+
+		hp = &hfrag->mem[0];
+		hp_end = &hfrag->mem[hfrag->used_size];
+		ASSERT(!any_heap_refs(hp, hp_end, literals, lit_bsize));
 	    }
 	}
-	break;
 
-    need_gc:
-	if (done_gc) {
+#endif
+
+	return am_false;
+
+    try_literal_gc:
+	need_gc |= ERTS_LITERAL_GC__;
+
+    try_gc:
+	need_gc |= ERTS_ORDINARY_GC__;
+
+	if ((done_gc & need_gc) == need_gc)
 	    return am_true;
-	} else {
-	    Eterm* literals;
-	    Uint lit_size;
-	    struct erl_off_heap_header* oh;
 
-	    if (!allow_gc)
-		return am_aborted;
+	if (!(flags & ERTS_CPC_ALLOW_GC))
+	    return am_aborted;
 
-	    /*
-	     * Try to get rid of constants by by garbage collecting.
-	     * Clear both fvalue and ftrace.
-	     */
-	    rp->freason = EXC_NULL;
-	    rp->fvalue = NIL;
-	    rp->ftrace = NIL;
-	    done_gc = 1;
+	need_gc &= ~done_gc;
+
+	/*
+	 * Try to get rid of constants by by garbage collecting.
+	 * Clear both fvalue and ftrace.
+	 */
+
+	rp->freason = EXC_NULL;
+	rp->fvalue = NIL;
+	rp->ftrace = NIL;
+
+	if (need_gc & ERTS_ORDINARY_GC__) {
 	    FLAGS(rp) |= F_NEED_FULLSWEEP;
-	    *redsp += erts_garbage_collect(rp, 0, rp->arg_reg, rp->arity);
-	    literals = (Eterm *) modp->old.code[MI_LITERALS_START];
-	    lit_size = (Eterm *) modp->old.code[MI_LITERALS_END] - literals;
-	    oh = (struct erl_off_heap_header *)
-		modp->old.code[MI_LITERALS_OFF_HEAP];
-	    *redsp += lit_size / 10; /* Need, better value... */
-	    erts_garbage_collect_literals(rp, literals, lit_size, oh);
+	    *redsp += erts_garbage_collect_nobump(rp, 0, rp->arg_reg, rp->arity);
+	    done_gc |= ERTS_ORDINARY_GC__;
 	}
+	if (need_gc & ERTS_LITERAL_GC__) {
+	    struct erl_off_heap_header* oh;
+	    oh = modp->old.code_hdr->literals_off_heap;
+	    *redsp += lit_bsize / 64; /* Need, better value... */
+	    erts_garbage_collect_literals(rp, (Eterm*)literals, lit_bsize, oh);
+	    done_gc |= ERTS_LITERAL_GC__;
+	}
+	need_gc = 0;
     }
-    return am_false;
-#undef INSIDE
-}
 
-#define in_area(ptr,start,nbytes) \
-    ((UWord)((char*)(ptr) - (char*)(start)) < (nbytes))
+#undef ERTS_ORDINARY_GC__
+#undef ERTS_LITERAL_GC__
+
+}
 
 static int
 any_heap_ref_ptrs(Eterm* start, Eterm* end, char* mod_start, Uint mod_size)
@@ -913,7 +984,7 @@ any_heap_ref_ptrs(Eterm* start, Eterm* end, char* mod_start, Uint mod_size)
 	switch (primary_tag(val)) {
 	case TAG_PRIMARY_BOXED:
 	case TAG_PRIMARY_LIST:
-	    if (in_area(EXPAND_POINTER(val), mod_start, mod_size)) {
+	    if (ErtsInArea(val, mod_start, mod_size)) {
 		return 1;
 	    }
 	    break;
@@ -933,7 +1004,7 @@ any_heap_refs(Eterm* start, Eterm* end, char* mod_start, Uint mod_size)
 	switch (primary_tag(val)) {
 	case TAG_PRIMARY_BOXED:
 	case TAG_PRIMARY_LIST:
-	    if (in_area(EXPAND_POINTER(val), mod_start, mod_size)) {
+	    if (ErtsInArea(val, mod_start, mod_size)) {
 		return 1;
 	    }
 	    break;
@@ -943,7 +1014,7 @@ any_heap_refs(Eterm* start, Eterm* end, char* mod_start, Uint mod_size)
                 if (header_is_bin_matchstate(val)) {
                     ErlBinMatchState *ms = (ErlBinMatchState*) p;
                     ErlBinMatchBuffer *mb = &(ms->mb);
-                    if (in_area(EXPAND_POINTER(mb->orig), mod_start, mod_size)) {
+                    if (ErtsInArea(mb->orig, mod_start, mod_size)) {
                         return 1;
                     }
                 }
@@ -958,7 +1029,104 @@ any_heap_refs(Eterm* start, Eterm* end, char* mod_start, Uint mod_size)
 
 #undef in_area
 
-BIF_RETTYPE purge_module_1(BIF_ALIST_1)
+#ifdef ERTS_SMP
+static void copy_literals_commit(void*);
+#endif
+
+copy_literals_t erts_clrange = {NULL, 0, THE_NON_VALUE};
+
+/* copy literals
+ *
+ * copy_literals.ptr = LitPtr
+ * copy_literals.sz  = LitSz
+ * ------ THR PROG COMMIT -----
+ *
+ *  - check process code
+ *  - check process code
+ *  ...
+ * copy_literals.ptr = NULL
+ * copy_literals.sz  = 0
+ * ------ THR PROG COMMIT -----
+ *  ...
+ */
+
+
+BIF_RETTYPE erts_internal_copy_literals_2(BIF_ALIST_2)
+{
+    ErtsCodeIndex code_ix;
+    Eterm res = am_true;
+
+    if (is_not_atom(BIF_ARG_1) || (am_true != BIF_ARG_2 && am_false != BIF_ARG_2)) {
+        BIF_ERROR(BIF_P, BADARG);
+    }
+
+    if (!erts_try_seize_code_write_permission(BIF_P)) {
+	ERTS_BIF_YIELD2(bif_export[BIF_erts_internal_copy_literals_2],
+                        BIF_P, BIF_ARG_1, BIF_ARG_2);
+    }
+
+    code_ix = erts_active_code_ix();
+
+    if (BIF_ARG_2 == am_true) {
+        Module* modp = erts_get_module(BIF_ARG_1, code_ix);
+        if (!modp || !modp->old.code_hdr) {
+            res = am_false;
+            goto done;
+        }
+        if (erts_clrange.ptr != NULL
+            && !(BIF_P->static_flags & ERTS_STC_FLG_SYSTEM_PROC)) {
+            res = am_aborted;
+            goto done;
+        }
+        erts_clrange.ptr = modp->old.code_hdr->literals_start;
+        erts_clrange.sz  = modp->old.code_hdr->literals_end - erts_clrange.ptr;
+        erts_clrange.pid = BIF_P->common.id;
+    } else if (BIF_ARG_2 == am_false) {
+        if (erts_clrange.pid != BIF_P->common.id) {
+            res = am_false;
+            goto done;
+        }
+        erts_clrange.ptr = NULL;
+        erts_clrange.sz  = 0;
+        erts_clrange.pid = THE_NON_VALUE;
+    }
+
+#ifdef ERTS_SMP
+    ASSERT(committer_state.stager == NULL);
+    committer_state.stager = BIF_P;
+    erts_schedule_thr_prgr_later_op(copy_literals_commit, NULL, &committer_state.lop);
+    erts_proc_inc_refc(BIF_P);
+    erts_suspend(BIF_P, ERTS_PROC_LOCK_MAIN, NULL);
+    ERTS_BIF_YIELD_RETURN(BIF_P, am_true);
+#endif
+done:
+    erts_release_code_write_permission();
+    BIF_RET(res);
+}
+
+#ifdef ERTS_SMP
+static void copy_literals_commit(void* null) {
+    Process* p = committer_state.stager;
+#ifdef DEBUG
+    committer_state.stager = NULL;
+#endif
+    erts_release_code_write_permission();
+    erts_smp_proc_lock(p, ERTS_PROC_LOCK_STATUS);
+    if (!ERTS_PROC_IS_EXITING(p)) {
+	erts_resume(p, ERTS_PROC_LOCK_STATUS);
+    }
+    erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+    erts_proc_dec_refc(p);
+}
+#endif /* ERTS_SMP */
+
+
+/* Do the actualy module purging and return:
+ * true for success
+ * false if no such old module
+ * BADARG if not an atom
+ */
+BIF_RETTYPE erts_internal_purge_module_1(BIF_ALIST_1)
 {
     ErtsCodeIndex code_ix;
     BeamInstr* code;
@@ -972,7 +1140,8 @@ BIF_RETTYPE purge_module_1(BIF_ALIST_1)
     }
 
     if (!erts_try_seize_code_write_permission(BIF_P)) {
-	ERTS_BIF_YIELD1(bif_export[BIF_purge_module_1], BIF_P, BIF_ARG_1);
+	ERTS_BIF_YIELD1(bif_export[BIF_erts_internal_purge_module_1],
+                        BIF_P, BIF_ARG_1);
     }
 
     code_ix = erts_active_code_ix();
@@ -982,7 +1151,7 @@ BIF_RETTYPE purge_module_1(BIF_ALIST_1)
      */
 
     if ((modp = erts_get_module(BIF_ARG_1, code_ix)) == NULL) {
-	ERTS_BIF_PREP_ERROR(ret, BIF_P, BADARG);
+        ERTS_BIF_PREP_RET(ret, am_false);
     }
     else {
 	erts_rwlock_old_code(code_ix);
@@ -990,8 +1159,8 @@ BIF_RETTYPE purge_module_1(BIF_ALIST_1)
 	/*
 	 * Any code to purge?
 	 */
-	if (modp->old.code == 0) {
-	    ERTS_BIF_PREP_ERROR(ret, BIF_P, BADARG);
+	if (!modp->old.code_hdr) {
+            ERTS_BIF_PREP_RET(ret, am_false);
 	}
 	else {
 	    /*
@@ -1013,14 +1182,17 @@ BIF_RETTYPE purge_module_1(BIF_ALIST_1)
 	     */
 	    ASSERT(erts_total_code_size >= modp->old.code_length);
 	    erts_total_code_size -= modp->old.code_length;
-	    code = modp->old.code;
+	    code = (BeamInstr*) modp->old.code_hdr;
 	    end = (BeamInstr *)((char *)code + modp->old.code_length);
 	    erts_cleanup_funs_on_purge(code, end);
 	    beam_catches_delmod(modp->old.catches, code, modp->old.code_length,
 				code_ix);
-	    decrement_refc(code);
+	    decrement_refc(modp->old.code_hdr);
+            if (modp->old.code_hdr->literals_start) {
+                erts_free(ERTS_ALC_T_LITERAL, modp->old.code_hdr->literals_start);
+            }
 	    erts_free(ERTS_ALC_T_CODE, (void *) code);
-	    modp->old.code = NULL;
+	    modp->old.code_hdr = NULL;
 	    modp->old.code_length = 0;
 	    modp->old.catches = BEAM_CATCHES_NIL;
 	    erts_remove_from_ranges(code);
@@ -1037,10 +1209,9 @@ BIF_RETTYPE purge_module_1(BIF_ALIST_1)
 }
 
 static void
-decrement_refc(BeamInstr* code)
+decrement_refc(BeamCodeHeader* code_hdr)
 {
-    struct erl_off_heap_header* oh =
-	(struct erl_off_heap_header *) code[MI_LITERALS_OFF_HEAP];
+    struct erl_off_heap_header* oh = code_hdr->literals_off_heap;
 
     while (oh) {
 	Binary* bptr;
@@ -1089,7 +1260,7 @@ delete_code(Module* modp)
     ASSERT(modp->curr.num_breakpoints == 0);
     ASSERT(modp->curr.num_traced_exports == 0);
     modp->old = modp->curr;
-    modp->curr.code = NULL;
+    modp->curr.code_hdr = NULL;
     modp->curr.code_length = 0;
     modp->curr.catches = BEAM_CATCHES_NIL;
     modp->curr.nif = NULL;
@@ -1106,9 +1277,9 @@ beam_make_current_old(Process *c_p, ErtsProcLocks c_p_locks, Eterm module)
      * if not, delete old code; error if old code already exists.
      */
 
-    if (modp->curr.code != NULL && modp->old.code != NULL)  {
+    if (modp->curr.code_hdr && modp->old.code_hdr)  {
 	return am_not_purged;
-    } else if (modp->old.code == NULL) { /* Make the current version old. */
+    } else if (!modp->old.code_hdr) { /* Make the current version old. */
 	delete_code(modp);
     }
     return NIL;
diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c
index 9860968687..74c9d3ee53 100644
--- a/erts/emulator/beam/beam_bp.c
+++ b/erts/emulator/beam/beam_bp.c
@@ -154,8 +154,8 @@ erts_bp_match_functions(BpFunctions* f, Eterm mfa[3], int specified)
     num_modules = 0;
     for (current = 0; current < max_modules; current++) {
 	modp = module_code(current, code_ix);
-	if (modp->curr.code) {
-	    max_funcs += modp->curr.code[MI_NUM_FUNCTIONS];
+	if (modp->curr.code_hdr) {
+	    max_funcs += modp->curr.code_hdr->num_functions;
 	    module[num_modules++] = modp;
 	}
     }
@@ -163,9 +163,9 @@ erts_bp_match_functions(BpFunctions* f, Eterm mfa[3], int specified)
     f->matching = (BpFunction *) Alloc(max_funcs*sizeof(BpFunction));
     i = 0;
     for (current = 0; current < num_modules; current++) {
-	BeamInstr** code_base = (BeamInstr **) module[current]->curr.code;
+	BeamCodeHeader* code_hdr = module[current]->curr.code_hdr;
 	BeamInstr* code;
-	Uint num_functions = (Uint)(UWord) code_base[MI_NUM_FUNCTIONS];
+	Uint num_functions = (Uint)(UWord) code_hdr->num_functions;
 	Uint fi;
 
 	if (specified > 0) {
@@ -179,7 +179,7 @@ erts_bp_match_functions(BpFunctions* f, Eterm mfa[3], int specified)
 	    BeamInstr* pc;
 	    int wi;
 
-	    code = code_base[MI_FUNCTIONS+fi];
+	    code = code_hdr->functions[fi];
 	    ASSERT(code[0] == (BeamInstr) BeamOp(op_i_func_info_IaaI));
 	    pc = code+5;
 	    if (erts_is_native_break(pc)) {
@@ -549,21 +549,21 @@ erts_clear_all_breaks(BpFunctions* f)
 
 int 
 erts_clear_module_break(Module *modp) {
-    BeamInstr** code_base;
+    BeamCodeHeader* code_hdr;
     Uint n;
     Uint i;
 
     ERTS_SMP_LC_ASSERT(erts_smp_thr_progress_is_blocking());
     ASSERT(modp);
-    code_base = (BeamInstr **) modp->curr.code;
-    if (code_base == NULL) {
+    code_hdr = modp->curr.code_hdr;
+    if (!code_hdr) {
 	return 0;
     }
-    n = (Uint)(UWord) code_base[MI_NUM_FUNCTIONS];
+    n = (Uint)(UWord) code_hdr->num_functions;
     for (i = 0; i < n; ++i) {
 	BeamInstr* pc;
 
-	pc = code_base[MI_FUNCTIONS+i] + 5;
+	pc = code_hdr->functions[i] + 5;
 	if (erts_is_native_break(pc)) {
 	    continue;
 	}
@@ -575,7 +575,7 @@ erts_clear_module_break(Module *modp) {
     for (i = 0; i < n; ++i) {
 	BeamInstr* pc;
 
-	pc = code_base[MI_FUNCTIONS+i] + 5;
+	pc = code_hdr->functions[i] + 5;
 	if (erts_is_native_break(pc)) {
 	    continue;
 	}
@@ -864,7 +864,7 @@ do_call_trace(Process* c_p, BeamInstr* I, Eterm* reg,
     Eterm* cpp;
     int return_to_trace = 0;
     BeamInstr w;
-    BeamInstr *cp_save;
+    BeamInstr *cp_save = c_p->cp;
     Uint32 flags;
     Uint need = 0;
     Eterm* E = c_p->stop;
@@ -974,7 +974,7 @@ erts_trace_time_call(Process* c_p, BeamInstr* I, BpDataTime* bdt)
     if (pbt == 0) {
 	/* First call of process to instrumented function */
 	pbt = Alloc(sizeof(process_breakpoint_time_t));
-	(void) ERTS_PROC_SET_CALL_TIME(c_p, ERTS_PROC_LOCK_MAIN, pbt);
+	(void) ERTS_PROC_SET_CALL_TIME(c_p, pbt);
     } else {
 	ASSERT(pbt->pc);
 	/* add time to previous code */
@@ -1205,17 +1205,17 @@ int erts_is_time_break(Process *p, BeamInstr *pc, Eterm *retval) {
 BeamInstr *
 erts_find_local_func(Eterm mfa[3]) {
     Module *modp;
-    BeamInstr** code_base;
+    BeamCodeHeader* code_hdr;
     BeamInstr* code_ptr;
     Uint i,n;
 
     if ((modp = erts_get_module(mfa[0], erts_active_code_ix())) == NULL)
 	return NULL;
-    if ((code_base = (BeamInstr **) modp->curr.code) == NULL)
+    if ((code_hdr = modp->curr.code_hdr) == NULL)
 	return NULL;
-    n = (BeamInstr) code_base[MI_NUM_FUNCTIONS];
+    n = (BeamInstr) code_hdr->num_functions;
     for (i = 0; i < n; ++i) {
-	code_ptr = code_base[MI_FUNCTIONS+i];
+	code_ptr = code_hdr->functions[i];
 	ASSERT(((BeamInstr) BeamOp(op_i_func_info_IaaI)) == code_ptr[0]);
 	ASSERT(mfa[0] == ((Eterm) code_ptr[2]) ||
 	       is_nil((Eterm) code_ptr[2]));
@@ -1598,9 +1598,7 @@ bp_time_unref(BpDataTime* bdt)
 			h_p = erts_pid2proc(NULL, 0, item->pid,
 					    ERTS_PROC_LOCK_MAIN);
 			if (h_p) {
-			    pbt = ERTS_PROC_SET_CALL_TIME(h_p,
-							  ERTS_PROC_LOCK_MAIN,
-							  NULL);
+			    pbt = ERTS_PROC_SET_CALL_TIME(h_p, NULL);
 			    if (pbt) {
 				Free(pbt);
 			    }
diff --git a/erts/emulator/beam/beam_catches.c b/erts/emulator/beam/beam_catches.c
index c1fd17c65d..7a1f4901aa 100644
--- a/erts/emulator/beam/beam_catches.c
+++ b/erts/emulator/beam/beam_catches.c
@@ -143,7 +143,7 @@ BeamInstr *beam_catches_car(unsigned i)
     struct bc_pool* p = &bccix[erts_active_code_ix()];
 
     if (i >= p->tabsize ) {
-	erl_exit(1, "beam_catches_delmod: index %#x is out of range\r\n", i);
+	erts_exit(ERTS_ERROR_EXIT, "beam_catches_delmod: index %#x is out of range\r\n", i);
     }
     return p->beam_catches[i].cp;
 }
@@ -157,10 +157,10 @@ void beam_catches_delmod(unsigned head, BeamInstr *code, unsigned code_bytes,
     ASSERT((code_ix == erts_active_code_ix()) != bccix[erts_staging_code_ix()].is_staging);
     for(i = head; i != (unsigned)-1;) {
 	if (i >= p->tabsize) {
-	    erl_exit(1, "beam_catches_delmod: index %#x is out of range\r\n", i);
+	    erts_exit(ERTS_ERROR_EXIT, "beam_catches_delmod: index %#x is out of range\r\n", i);
 	}
 	if( (char*)p->beam_catches[i].cp - (char*)code >= code_bytes ) {
-	    erl_exit(1,
+	    erts_exit(ERTS_ERROR_EXIT,
 		    "beam_catches_delmod: item %#x has cp %p which is not "
 		    "in module's range [%p,%p[\r\n",
 		    i, p->beam_catches[i].cp, code, ((char*)code + code_bytes));
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c
index 90985e4f53..e37bd4d78c 100644
--- a/erts/emulator/beam/beam_debug.c
+++ b/erts/emulator/beam/beam_debug.c
@@ -73,6 +73,40 @@ erts_debug_flat_size_1(BIF_ALIST_1)
     }
 }
 
+BIF_RETTYPE
+erts_debug_size_shared_1(BIF_ALIST_1)
+{
+    Process* p = BIF_P;
+    Eterm term = BIF_ARG_1;
+    Uint size = size_shared(term);
+
+    if (IS_USMALL(0, size)) {
+	BIF_RET(make_small(size));
+    } else {
+	Eterm* hp = HAlloc(p, BIG_UINT_HEAP_SIZE);
+	BIF_RET(uint_to_big(size, hp));
+    }
+}
+
+BIF_RETTYPE
+erts_debug_copy_shared_1(BIF_ALIST_1)
+{
+    Process* p = BIF_P;
+    Eterm term = BIF_ARG_1;
+    Uint size;
+    Eterm* hp;
+    Eterm copy;
+    erts_shcopy_t info;
+    INITIALIZE_SHCOPY(info);
+
+    size = copy_shared_calculate(term, &info);
+    if (size > 0) {
+      hp = HAlloc(p, size);
+    }
+    copy = copy_shared_perform(term, size, &info, &hp, &p->off_heap);
+    DESTROY_SHCOPY(info);
+    BIF_RET(copy);
+}
 
 BIF_RETTYPE
 erts_debug_breakpoint_2(BIF_ALIST_2)
@@ -208,7 +242,7 @@ erts_debug_disassemble_1(BIF_ALIST_1)
     Eterm bin;
     Eterm mfa;
     BeamInstr* funcinfo = NULL;	/* Initialized to eliminate warning. */
-    BeamInstr* code_base;
+    BeamCodeHeader* code_hdr;
     BeamInstr* code_ptr = NULL;	/* Initialized to eliminate warning. */
     BeamInstr instr;
     BeamInstr uaddr;
@@ -258,12 +292,12 @@ erts_debug_disassemble_1(BIF_ALIST_1)
 	     */
 	    code_ptr = ((BeamInstr *) ep->addressv[code_ix]) - 5;
 	    funcinfo = code_ptr+2;
-	} else if (modp == NULL || (code_base = modp->curr.code) == NULL) {
+	} else if (modp == NULL || (code_hdr = modp->curr.code_hdr) == NULL) {
 	    BIF_RET(am_undef);
 	} else {
-	    n = code_base[MI_NUM_FUNCTIONS];
+	    n = code_hdr->num_functions;
 	    for (i = 0; i < n; i++) {
-		code_ptr = (BeamInstr *) code_base[MI_FUNCTIONS+i];
+		code_ptr = code_hdr->functions[i];
 		if (code_ptr[3] == name && code_ptr[4] == arity) {
 		    funcinfo = code_ptr+2;
 		    break;
@@ -432,39 +466,33 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
     while (*sign) {
 	switch (*sign) {
 	case 'r':		/* x(0) */
-	    erts_print(to, to_arg, "x(0)");
+	    erts_print(to, to_arg, "r(0)");
 	    break;
 	case 'x':		/* x(N) */
-	    if (reg_index(ap[0]) == 0) {
-		erts_print(to, to_arg, "x[0]");
-	    } else {
-		erts_print(to, to_arg, "x(%d)", reg_index(ap[0]));
+	    {
+		Uint n = ap[0] / sizeof(Eterm);
+		erts_print(to, to_arg, "x(%d)", n);
+		ap++;
 	    }
-	    ap++;
 	    break;
 	case 'y':		/* y(N) */
-	    erts_print(to, to_arg, "y(%d)", reg_index(ap[0]) - CP_SIZE);
-	    ap++;
+	    {
+		Uint n = ap[0] / sizeof(Eterm) - CP_SIZE;
+		erts_print(to, to_arg, "y(%d)", n);
+		ap++;
+	    }
 	    break;
 	case 'n':		/* Nil */
 	    erts_print(to, to_arg, "[]");
 	    break;
 	case 's':		/* Any source (tagged constant or register) */
-	    tag = beam_reg_tag(*ap);
-	    if (tag == X_REG_DEF) {
-		if (reg_index(*ap) == 0) {
-		    erts_print(to, to_arg, "x[0]");
-		} else {
-		    erts_print(to, to_arg, "x(%d)", reg_index(*ap));
-		}
-		ap++;
-		break;
-	    } else if (tag == Y_REG_DEF) {
-		erts_print(to, to_arg, "y(%d)", reg_index(*ap) - CP_SIZE);
+	    tag = loader_tag(*ap);
+	    if (tag == LOADER_X_REG) {
+		erts_print(to, to_arg, "x(%d)", loader_x_reg_index(*ap));
 		ap++;
 		break;
-	    } else if (tag == R_REG_DEF) {
-		erts_print(to, to_arg, "x(0)");
+	    } else if (tag == LOADER_Y_REG) {
+		erts_print(to, to_arg, "y(%d)", loader_y_reg_index(*ap) - CP_SIZE);
 		ap++;
 		break;
 	    }
@@ -481,20 +509,12 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 	    ap++;
 	    break;
 	case 'd':		/* Destination (x(0), x(N), y(N)) */
-	    switch (beam_reg_tag(*ap)) {
-	    case X_REG_DEF:
-		if (reg_index(*ap) == 0) {
-		    erts_print(to, to_arg, "x[0]");
-		} else {
-		    erts_print(to, to_arg, "x(%d)", reg_index(*ap));
-		}
-		break;
-	    case Y_REG_DEF:
-		erts_print(to, to_arg, "y(%d)", reg_index(*ap) - CP_SIZE);
-		break;
-	    case R_REG_DEF:
-		erts_print(to, to_arg, "x(0)");
-		break;
+	    if (*ap & 1) {
+		erts_print(to, to_arg, "y(%d)",
+			   *ap / sizeof(Eterm) - CP_SIZE);
+	    } else {
+		erts_print(to, to_arg, "x(%d)",
+			   *ap / sizeof(Eterm));
 	    }
 	    ap++;
 	    break;
@@ -561,7 +581,7 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 	    ap++;
 	    break;
 	case 'l':		/* fr(N) */
-	    erts_print(to, to_arg, "fr(%d)", reg_index(ap[0]));
+	    erts_print(to, to_arg, "fr(%d)", loader_reg_index(ap[0]));
 	    ap++;
 	    break;
 	default:
@@ -580,7 +600,6 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
     unpacked = ap;
     ap = addr + size;
     switch (op) {
-    case op_i_select_val_lins_rfI:
     case op_i_select_val_lins_xfI:
     case op_i_select_val_lins_yfI:
 	{
@@ -600,7 +619,6 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 	    }
 	}
 	break;
-    case op_i_select_val_bins_rfI:
     case op_i_select_val_bins_xfI:
     case op_i_select_val_bins_yfI:
 	{
@@ -614,7 +632,6 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 	    }
 	}
 	break;
-    case op_i_select_tuple_arity_rfI:
     case op_i_select_tuple_arity_xfI:
     case op_i_select_tuple_arity_yfI:
         {
@@ -639,7 +656,6 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
             }
         }
         break;
-    case op_i_jump_on_val_rfII:
     case op_i_jump_on_val_xfII:
     case op_i_jump_on_val_yfII:
 	{
@@ -651,7 +667,6 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 	    }
 	}
 	break;
-    case op_i_jump_on_val_zero_rfI:
     case op_i_jump_on_val_zero_xfI:
     case op_i_jump_on_val_zero_yfI:
 	{
@@ -663,7 +678,6 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 	    }
 	}
 	break;
-    case op_i_put_tuple_rI:
     case op_i_put_tuple_xI:
     case op_i_put_tuple_yI:
     case op_new_map_dII:
@@ -673,20 +687,16 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 	    int n = unpacked[-1];
 
 	    while (n > 0) {
-		if (!is_header(ap[0])) {
+		switch (loader_tag(ap[0])) {
+		case LOADER_X_REG:
+		    erts_print(to, to_arg, " x(%d)", loader_x_reg_index(ap[0]));
+		    break;
+		case LOADER_Y_REG:
+		    erts_print(to, to_arg, " x(%d)", loader_y_reg_index(ap[0]));
+		    break;
+		default:
 		    erts_print(to, to_arg, " %T", (Eterm) ap[0]);
-		} else {
-		    switch ((ap[0] >> 2) & 0x03) {
-		    case R_REG_DEF:
-			erts_print(to, to_arg, " x(0)");
-			break;
-		    case X_REG_DEF:
-			erts_print(to, to_arg, " x(%d)", ap[0] >> 4);
-			break;
-		    case Y_REG_DEF:
-			erts_print(to, to_arg, " y(%d)", ap[0] >> 4);
-			break;
-		    }
+		    break;
 		}
 		ap++, size++, n--;
 	    }
@@ -699,18 +709,16 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr)
 	    while (n > 0) {
 		if (n % 3 == 1) {
 		    erts_print(to, to_arg, " %X", ap[0]);
-		} else if (!is_header(ap[0])) {
-		    erts_print(to, to_arg, " %T", (Eterm) ap[0]);
 		} else {
-		    switch ((ap[0] >> 2) & 0x03) {
-		    case R_REG_DEF:
-			erts_print(to, to_arg, " x(0)");
+		    switch (loader_tag(ap[0])) {
+		    case LOADER_X_REG:
+			erts_print(to, to_arg, " x(%d)", loader_x_reg_index(ap[0]));
 			break;
-		    case X_REG_DEF:
-			erts_print(to, to_arg, " x(%d)", ap[0] >> 4);
+		    case LOADER_Y_REG:
+			erts_print(to, to_arg, " y(%d)", loader_y_reg_index(ap[0]));
 			break;
-		    case Y_REG_DEF:
-			erts_print(to, to_arg, " y(%d)", ap[0] >> 4);
+		    default:
+			erts_print(to, to_arg, " %T", (Eterm) ap[0]);
 			break;
 		    }
 		}
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 38def5d89f..d648a2f23c 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -99,10 +99,7 @@ do {									\
 do {                                     \
   int i_;                                \
   int Arity_ = PC[-1];                   \
-  if (Arity_ > 0) {                      \
-	CHECK_TERM(r(0));                \
-  }                                      \
-  for (i_ = 1; i_ < Arity_; i_++) {      \
+  for (i_ = 0; i_ < Arity_; i_++) {      \
 	CHECK_TERM(x(i_));               \
   }                                      \
 } while (0)
@@ -116,6 +113,9 @@ do {                                     \
 #define MAX(x, y) (((x) > (y)) ? (x) : (y))
 #endif
 
+#define GET_BIF_MODULE(p)  ((Eterm) (((Export *) p)->code[0]))
+#define GET_BIF_FUNCTION(p)  ((Eterm) (((Export *) p)->code[1]))
+#define GET_BIF_ARITY(p)  ((Eterm) (((Export *) p)->code[2]))
 #define GET_BIF_ADDRESS(p) ((BifFunction) (((Export *) p)->code[4]))
 #define TermWords(t) (((t) / (sizeof(BeamInstr)/sizeof(Eterm))) + !!((t) % (sizeof(BeamInstr)/sizeof(Eterm))))
 
@@ -151,25 +151,21 @@ do {                                     \
    ASSERT(VALID_INSTR(* (Eterm *)(ip))); \
    I = (ip)
 
-#define FetchArgs(S1, S2) tmp_arg1 = (S1); tmp_arg2 = (S2)
+/*
+ * Register target (X or Y register).
+ */
+#define REG_TARGET(Target) (*(((Target) & 1) ? &yb(Target-1) : &xb(Target)))
 
 /*
  * Store a result into a register given a destination descriptor.
  */
 
-#define StoreResult(Result, DestDesc)               \
-  do {                                              \
-    Eterm stb_reg;                                  \
-    stb_reg = (DestDesc);                           \
-    CHECK_TERM(Result);                             \
-    switch (beam_reg_tag(stb_reg)) {                \
-    case R_REG_DEF:                                 \
-      r(0) = (Result); break;                       \
-    case X_REG_DEF:                                 \
-      xb(x_reg_offset(stb_reg)) = (Result); break;  \
-    default:                                        \
-      yb(y_reg_offset(stb_reg)) = (Result); break;  \
-    }                                               \
+#define StoreResult(Result, DestDesc)		\
+  do {						\
+    Eterm stb_reg;				\
+    stb_reg = (DestDesc);			\
+    CHECK_TERM(Result);				\
+    REG_TARGET(stb_reg) = (Result);		\
   } while (0)
 
 #define StoreSimpleDest(Src, Dest) Dest = (Src)
@@ -180,22 +176,16 @@ do {                                     \
  * be just before the next instruction.
  */
  
-#define StoreBifResult(Dst, Result)                          \
-  do {                                                       \
-    BeamInstr* stb_next;                                         \
-    Eterm stb_reg;                                           \
-    stb_reg = Arg(Dst);                                      \
-    I += (Dst) + 2;                                          \
-    stb_next = (BeamInstr *) *I;                                 \
-    CHECK_TERM(Result);                                      \
-    switch (beam_reg_tag(stb_reg)) {                         \
-    case R_REG_DEF:                                          \
-      r(0) = (Result); Goto(stb_next);                       \
-    case X_REG_DEF:                                          \
-      xb(x_reg_offset(stb_reg)) = (Result); Goto(stb_next);  \
-    default:                                                 \
-      yb(y_reg_offset(stb_reg)) = (Result); Goto(stb_next);  \
-    }                                                        \
+#define StoreBifResult(Dst, Result)		\
+  do {						\
+    BeamInstr* stb_next;			\
+    Eterm stb_reg;				\
+    stb_reg = Arg(Dst);				\
+    I += (Dst) + 2;				\
+    stb_next = (BeamInstr *) *I;		\
+    CHECK_TERM(Result);				\
+    REG_TARGET(stb_reg) = (Result);		\
+    Goto(stb_next);				\
   } while (0)
 
 #define ClauseFail() goto jump_f
@@ -250,6 +240,14 @@ void** beam_ops;
     HEAP_TOP(c_p) = HTOP;  \
     c_p->stop = E
 
+#define HEAVY_SWAPIN       \
+    SWAPIN;		   \
+    FCALLS = c_p->fcalls
+
+#define HEAVY_SWAPOUT      \
+    SWAPOUT;		   \
+    c_p->fcalls = FCALLS
+
 /*
  * Use LIGHT_SWAPOUT when the called function
  * will call HeapOnlyAlloc() (and never HAlloc()).
@@ -293,7 +291,7 @@ void** beam_ops;
 #define Ib(N) (N)
 #define x(N) reg[N]
 #define y(N) E[N]
-#define r(N) x##N
+#define r(N) x(N)
 
 /*
  * Makes sure that there are StackNeed + HeapNeed + 1 words available
@@ -309,12 +307,10 @@ void** beam_ops;
      needed = (StackNeed) + 1; \
      if (E - HTOP < (needed + (HeapNeed))) { \
            SWAPOUT; \
-           reg[0] = r(0); \
            PROCESS_MAIN_CHK_LOCKS(c_p); \
-           FCALLS -= erts_garbage_collect(c_p, needed + (HeapNeed), reg, (M)); \
+           FCALLS -= erts_garbage_collect_nobump(c_p, needed + (HeapNeed), reg, (M)); \
            ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p); \
            PROCESS_MAIN_CHK_LOCKS(c_p); \
-           r(0) = reg[0]; \
            SWAPIN; \
      } \
      E -= needed; \
@@ -363,12 +359,10 @@ void** beam_ops;
     unsigned need = (Nh);                                       		\
     if ((E - HTOP < need) || (MSO(c_p).overhead + (VNh) >= BIN_VHEAP_SZ(c_p))) {\
        SWAPOUT;                                                 		\
-       reg[0] = r(0);                                           		\
        PROCESS_MAIN_CHK_LOCKS(c_p);                             		\
-       FCALLS -= erts_garbage_collect(c_p, need, reg, (Live));  		\
+       FCALLS -= erts_garbage_collect_nobump(c_p, need, reg, (Live));  		\
        ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);					\
        PROCESS_MAIN_CHK_LOCKS(c_p);                             		\
-       r(0) = reg[0];                                           		\
        SWAPIN;                                                  		\
     }                                                           		\
     HEAP_SPACE_VERIFIED(need);                                                  \
@@ -386,12 +380,10 @@ void** beam_ops;
     unsigned need = (Nh);                                       \
     if (E - HTOP < need) {                                      \
        SWAPOUT;                                                 \
-       reg[0] = r(0);                                           \
        PROCESS_MAIN_CHK_LOCKS(c_p);                             \
-       FCALLS -= erts_garbage_collect(c_p, need, reg, (Live));  \
+       FCALLS -= erts_garbage_collect_nobump(c_p, need, reg, (Live));\
        ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);			\
        PROCESS_MAIN_CHK_LOCKS(c_p);                             \
-       r(0) = reg[0];                                           \
        SWAPIN;                                                  \
     }                                                           \
     HEAP_SPACE_VERIFIED(need);                             \
@@ -408,15 +400,11 @@ void** beam_ops;
     unsigned need = (Nh);						\
     if (E - HTOP < need) {						\
        SWAPOUT;								\
-       reg[0] = r(0);							\
        reg[Live] = Extra;						\
        PROCESS_MAIN_CHK_LOCKS(c_p);					\
-       FCALLS -= erts_garbage_collect(c_p, need, reg, (Live)+1);	\
+       FCALLS -= erts_garbage_collect_nobump(c_p, need, reg, (Live)+1);	\
        ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);				\
        PROCESS_MAIN_CHK_LOCKS(c_p);					\
-       if (Live > 0) {							\
-	   r(0) = reg[0];						\
-       }								\
        Extra = reg[Live];						\
        SWAPIN;								\
     }									\
@@ -438,10 +426,9 @@ void** beam_ops;
 
 #define MakeFun(FunP, NumFree)					\
   do {								\
-     SWAPOUT;							\
-     reg[0] = r(0);						\
+     HEAVY_SWAPOUT;						\
      r(0) = new_fun(c_p, reg, (ErlFunEntry *) FunP, NumFree);	\
-     SWAPIN;							\
+     HEAVY_SWAPIN;						\
   } while (0)
 
 #define PutTuple(Dst, Arity)			\
@@ -531,15 +518,19 @@ void** beam_ops;
     ASSERT(VALID_INSTR(Dst));  \
     Goto(Dst)
 
-#define GetR(pos, tr) \
-   do { \
-     tr = Arg(pos); \
-     switch (beam_reg_tag(tr)) { \
-     case R_REG_DEF: tr = r(0); break; \
-     case X_REG_DEF: tr = xb(x_reg_offset(tr)); break; \
-     case Y_REG_DEF: ASSERT(y_reg_offset(tr) >= 1); tr = yb(y_reg_offset(tr)); break; \
-     } \
-     CHECK_TERM(tr); \
+#define GetR(pos, tr)				\
+   do {						\
+     tr = Arg(pos);				\
+     switch (loader_tag(tr)) {			\
+     case LOADER_X_REG:				\
+        tr = x(loader_x_reg_index(tr));		\
+        break;					\
+     case LOADER_Y_REG:				\
+        ASSERT(loader_y_reg_index(tr) >= 1);	\
+        tr = y(loader_y_reg_index(tr));		\
+        break;					\
+     }						\
+     CHECK_TERM(tr);				\
    } while (0)
 
 #define GetArg1(N, Dst) GetR((N), Dst)
@@ -557,24 +548,93 @@ void** beam_ops;
    HTOP += 2;                      \
   } while (0)
 
+#define Swap(R1, R2)				\
+  do {						\
+    Eterm V = R1;				\
+    R1 = R2;					\
+    R2 = V;					\
+  } while (0)
+
+#define SwapTemp(R1, R2, Tmp)			\
+  do {						\
+    Eterm V = R1;				\
+    R1 = R2;					\
+    R2 = Tmp = V;				\
+  } while (0)
+
 #define Move(Src, Dst, Store)      \
    do {                            \
        Eterm term = (Src);         \
        Store(term, Dst);           \
    } while (0)
 
-#define Move2(S1, D1, S2, D2) D1 = (S1); D2 = (S2)
+#define Move2Par(S1, D1, S2, D2)		\
+  do {						\
+      Eterm V1, V2;				\
+      V1 = (S1); V2 = (S2); D1 = V1; D2 = V2;	\
+  } while (0)
+
+#define MoveShift(Src, SD, D)			\
+  do {						\
+    Eterm V;					\
+    V = Src; D = SD; SD = V;			\
+  } while (0)
+
+#define MoveDup(Src, D1, D2)			\
+  do {						\
+    D1 = D2 = (Src);				\
+  } while (0)
+
 #define Move3(S1, D1, S2, D2, S3, D3) D1 = (S1); D2 = (S2); D3 = (S3)
 
-#define MoveGenDest(src, dstp) \
-   if ((dstp) == NULL) { r(0) = (src); } else { *(dstp) = src; }
+#define MoveWindow3(S1, S2, S3, D)		\
+  do {						\
+      Eterm xt0, xt1, xt2;			\
+      Eterm *y = &D;				\
+      xt0  = S1;				\
+      xt1  = S2;				\
+      xt2  = S3;				\
+      y[0] = xt0;				\
+      y[1] = xt1;				\
+      y[2] = xt2;				\
+ } while (0)
+
+#define MoveWindow4(S1, S2, S3, S4, D)		\
+  do {						\
+      Eterm xt0, xt1, xt2, xt3;			\
+      Eterm *y = &D;				\
+      xt0  = S1;				\
+      xt1  = S2;				\
+      xt2  = S3;				\
+      xt3  = S4;				\
+      y[0] = xt0;				\
+      y[1] = xt1;				\
+      y[2] = xt2;				\
+      y[3] = xt3;				\
+ } while (0)
 
-#define MoveReturn(Src, Dest)       \
-    (Dest) = (Src);                 \
-    I = c_p->cp;                    \
-    ASSERT(VALID_INSTR(*c_p->cp));  \
-    c_p->cp = 0;                    \
-    CHECK_TERM(r(0));               \
+#define MoveWindow5(S1, S2, S3, S4, S5, D)	\
+  do {						\
+      Eterm xt0, xt1, xt2, xt3, xt4;		\
+      Eterm *y = &D;				\
+      xt0  = S1;				\
+      xt1  = S2;				\
+      xt2  = S3;				\
+      xt3  = S4;				\
+      xt4  = S5;				\
+      y[0] = xt0;				\
+      y[1] = xt1;				\
+      y[2] = xt2;				\
+      y[3] = xt3;				\
+      y[4] = xt4;				\
+ } while (0)
+
+#define MoveReturn(Src)				\
+    x(0) = (Src);				\
+    I = c_p->cp;				\
+    ASSERT(VALID_INSTR(*c_p->cp));		\
+    c_p->cp = 0;				\
+    CHECK_TERM(r(0));				\
     Goto(*I)
 
 #define DeallocateReturn(Deallocate)       \
@@ -586,26 +646,26 @@ void** beam_ops;
     Goto(*I);                              \
   } while (0)
 
-#define MoveDeallocateReturn(Src, Dest, Deallocate)  \
-    (Dest) = (Src);                                  \
+#define MoveDeallocateReturn(Src, Deallocate)	\
+    x(0) = (Src);				\
     DeallocateReturn(Deallocate)
 
-#define MoveCall(Src, Dest, CallDest, Size)	\
-    (Dest) = (Src);				\
+#define MoveCall(Src, CallDest, Size)		\
+    x(0) = (Src);				\
     SET_CP(c_p, I+Size+1);			\
-    SET_I((BeamInstr *) CallDest);			\
+    SET_I((BeamInstr *) CallDest);		\
     Dispatch();
 
-#define MoveCallLast(Src, Dest, CallDest, Deallocate)	\
-    (Dest) = (Src);					\
-    RESTORE_CP(E);					\
-    E = ADD_BYTE_OFFSET(E, (Deallocate));		\
-    SET_I((BeamInstr *) CallDest);				\
+#define MoveCallLast(Src, CallDest, Deallocate)	\
+    x(0) = (Src);				\
+    RESTORE_CP(E);				\
+    E = ADD_BYTE_OFFSET(E, (Deallocate));	\
+    SET_I((BeamInstr *) CallDest);		\
     Dispatch();
 
-#define MoveCallOnly(Src, Dest, CallDest)	\
-    (Dest) = (Src);				\
-    SET_I((BeamInstr *) CallDest);			\
+#define MoveCallOnly(Src, CallDest)		\
+    x(0) = (Src);				\
+    SET_I((BeamInstr *) CallDest);		\
     Dispatch();
 
 #define MoveJump(Src)				\
@@ -613,60 +673,58 @@ void** beam_ops;
      SET_I((BeamInstr *) Arg(0));		\
      Goto(*I);
 
-#define GetList(Src, H, T) do {			\
-   Eterm* tmp_ptr = list_val(Src);		\
-   H = CAR(tmp_ptr);				\
-   T = CDR(tmp_ptr); } while (0)
-
-#define GetTupleElement(Src, Element, Dest)				\
-  do {									\
-    tmp_arg1 = (Eterm) COMPRESS_POINTER(((unsigned char *) tuple_val(Src)) + 	\
-				(Element));				\
-    (Dest) = (*(Eterm *) EXPAND_POINTER(tmp_arg1));			\
-  } while (0)
-
-#define ExtractNextElement(Dest)					  \
-    tmp_arg1 += sizeof(Eterm);						  \
-    (Dest) = (* (Eterm *) (((unsigned char *) EXPAND_POINTER(tmp_arg1))))
-
-#define ExtractNextElement2(Dest)				\
-  do {								\
-    Eterm* ene_dstp = &(Dest);					\
-    ene_dstp[0] = ((Eterm *) EXPAND_POINTER(tmp_arg1))[1];	\
-    ene_dstp[1] = ((Eterm *) EXPAND_POINTER(tmp_arg1))[2];	\
-    tmp_arg1 += sizeof(Eterm) + sizeof(Eterm);			\
+#define GetList(Src, H, T)			\
+  do {						\
+    Eterm* tmp_ptr = list_val(Src);		\
+    Eterm hd, tl;				\
+    hd = CAR(tmp_ptr);				\
+    tl = CDR(tmp_ptr);				\
+    H = hd; T = tl;				\
   } while (0)
 
-#define ExtractNextElement3(Dest)		\
-  do {						\
-    Eterm* ene_dstp = &(Dest);			\
-    ene_dstp[0] = ((Eterm *) EXPAND_POINTER(tmp_arg1))[1];	\
-    ene_dstp[1] = ((Eterm *) EXPAND_POINTER(tmp_arg1))[2];	\
-    ene_dstp[2] = ((Eterm *) EXPAND_POINTER(tmp_arg1))[3];	\
-    tmp_arg1 += 3*sizeof(Eterm);		\
+#define GetTupleElement(Src, Element, Dest)		\
+  do {							\
+    Eterm* src;						\
+    src = ADD_BYTE_OFFSET(tuple_val(Src), (Element));	\
+    (Dest) = *src;					\
   } while (0)
 
-#define ExtractNextElement4(Dest)		\
-  do {						\
-    Eterm* ene_dstp = &(Dest);			\
-    ene_dstp[0] = ((Eterm *) EXPAND_POINTER(tmp_arg1))[1];	\
-    ene_dstp[1] = ((Eterm *) EXPAND_POINTER(tmp_arg1))[2];	\
-    ene_dstp[2] = ((Eterm *) EXPAND_POINTER(tmp_arg1))[3];	\
-    ene_dstp[3] = ((Eterm *) EXPAND_POINTER(tmp_arg1))[4];	\
-    tmp_arg1 += 4*sizeof(Eterm);		\
+#define GetTupleElement2(Src, Element, Dest)		\
+  do {							\
+    Eterm* src;						\
+    Eterm* dst;						\
+    Eterm E1, E2;					\
+    src = ADD_BYTE_OFFSET(tuple_val(Src), (Element));	\
+    dst = &(Dest);					\
+    E1 = src[0];					\
+    E2 = src[1];					\
+    dst[0] = E1;					\
+    dst[1] = E2;					\
   } while (0)
 
-#define ExtractElement(Element, Dest)		\
-  do {						\
-     tmp_arg1 += (Element);			\
-     (Dest) = (* (Eterm *) EXPAND_POINTER(tmp_arg1));		\
+#define GetTupleElement3(Src, Element, Dest)		\
+  do {							\
+    Eterm* src;						\
+    Eterm* dst;						\
+    Eterm E1, E2, E3;					\
+    src = ADD_BYTE_OFFSET(tuple_val(Src), (Element));	\
+    dst = &(Dest);					\
+    E1 = src[0];					\
+    E2 = src[1];					\
+    E3 = src[2];					\
+    dst[0] = E1;					\
+    dst[1] = E2;					\
+    dst[2] = E3;					\
   } while (0)
 
 #define EqualImmed(X, Y, Action) if (X != Y) { Action; }
 #define NotEqualImmed(X, Y, Action) if (X == Y) { Action; }
 #define EqualExact(X, Y, Action) if (!EQ(X,Y)) { Action; }
-#define IsLessThan(X, Y, Action) if (CMP_GE(X, Y)) { Action; }
-#define IsGreaterEqual(X, Y, Action) if (CMP_LT(X, Y)) { Action; }
+#define NotEqualExact(X, Y, Action) if (EQ(X,Y)) { Action; }
+#define Equal(X, Y, Action) CMP_EQ_ACTION(X,Y,Action)
+#define NotEqual(X, Y, Action) CMP_NE_ACTION(X,Y,Action)
+#define IsLessThan(X, Y, Action) CMP_LT_ACTION(X,Y,Action)
+#define IsGreaterEqual(X, Y, Action) CMP_GE_ACTION(X,Y,Action)
 
 #define IsFloat(Src, Fail) if (is_not_float(Src)) { Fail; }
 
@@ -690,18 +748,26 @@ void** beam_ops;
     if (is_not_list(Src)) { Fail; }                     \
     A(Need, Alive)
 
-#define IsNonemptyListTestHeap(Src, Need, Alive, Fail)  \
-    if (is_not_list(Src)) { Fail; }                     \
+#define IsNonemptyListTestHeap(Need, Alive, Fail)  \
+    if (is_not_list(x(0))) { Fail; }			\
     TestHeap(Need, Alive)
 
+#define IsNonemptyListGetList(Src, H, T, Fail)	\
+    if (is_not_list(Src)) {			\
+         Fail;					\
+    } else {					\
+       Eterm* tmp_ptr = list_val(Src);		\
+       Eterm hd, tl;				\
+       hd = CAR(tmp_ptr);			\
+       tl = CDR(tmp_ptr);			\
+       H = hd; T = tl;				\
+    }
+
 #define IsTuple(X, Action) if (is_not_tuple(X)) Action
 
-#define IsArity(Pointer, Arity, Fail)					  \
-    if (*(Eterm *)							  \
-	EXPAND_POINTER(tmp_arg1 = (Eterm) 				  \
-		       COMPRESS_POINTER(tuple_val(Pointer))) != (Arity))  \
-    { 									  \
-        Fail; 								  \
+#define IsArity(Pointer, Arity, Fail)		\
+    if (*tuple_val(Pointer) != (Arity)) {	\
+        Fail;					\
     }
 
 #define IsMap(Src, Fail) if (!is_map(Src)) { Fail; }
@@ -738,15 +804,21 @@ void** beam_ops;
      }							\
   } while (0)
 
-#define IsTupleOfArity(Src, Arity, Fail)				      \
-  do {									      \
-    if (is_not_tuple(Src) || 						      \
-	*(Eterm *)							      \
-	EXPAND_POINTER(tmp_arg1 = 					      \
-		       (Eterm) COMPRESS_POINTER(tuple_val(Src))) != Arity) { \
-        Fail;								      \
-    }									      \
+#ifdef DEBUG
+#define IsTupleOfArity(Src, Arityval, Fail)			\
+  do {								\
+    if (!(is_tuple(Src) && *tuple_val(Src) == Arityval)) {	\
+        Fail;							\
+    }								\
   } while (0)
+#else
+#define IsTupleOfArity(Src, Arityval, Fail)			\
+  do {								\
+    if (!(is_boxed(Src) && *tuple_val(Src) == Arityval)) {	\
+        Fail;							\
+    }								\
+  } while (0)
+#endif
 
 #define IsBoolean(X, Fail) if ((X) != am_true && (X) != am_false) { Fail; }
 
@@ -756,7 +828,7 @@ void** beam_ops;
 #define IsBitstring(Src, Fail) \
   if (is_not_binary(Src)) { Fail; }
 
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 #define BsSafeMul(A, B, Fail, Target)		\
    do { Uint64 _res = (A) * (B);		\
       if (_res / B != A) { Fail; }		\
@@ -773,6 +845,7 @@ void** beam_ops;
 #define BsGetFieldSize(Bits, Unit, Fail, Target)	\
    do {							\
       Sint _signed_size; Uint _uint_size;		\
+      Uint temp_bits;					\
       if (is_small(Bits)) {				\
         _signed_size = signed_val(Bits);		\
          if (_signed_size < 0) { Fail; }		\
@@ -787,6 +860,7 @@ void** beam_ops;
 #define BsGetUncheckedFieldSize(Bits, Unit, Fail, Target)	\
    do {								\
       Sint _signed_size; Uint _uint_size;			\
+      Uint temp_bits;						\
       if (is_small(Bits)) {					\
         _signed_size = signed_val(Bits);			\
          if (_signed_size < 0) { Fail; }			\
@@ -998,23 +1072,17 @@ init_emulator(void)
  */
 
 #if defined(__GNUC__) && defined(sparc) && !defined(DEBUG)
-#  define REG_x0 asm("%l0")
 #  define REG_xregs asm("%l1")
 #  define REG_htop asm("%l2")
 #  define REG_stop asm("%l3")
 #  define REG_I asm("%l4")
 #  define REG_fcalls asm("%l5")
-#  define REG_tmp_arg1 asm("%l6")
-#  define REG_tmp_arg2 asm("%l7")
 #else
-#  define REG_x0
 #  define REG_xregs
 #  define REG_htop
 #  define REG_stop
 #  define REG_I
 #  define REG_fcalls
-#  define REG_tmp_arg1
-#  define REG_tmp_arg2
 #endif
 
 #ifdef USE_VM_PROBES
@@ -1132,11 +1200,6 @@ void process_main(void)
     ERTS_DECLARE_DUMMY(Eterm pid);
 #endif
 
-    /*
-     * X register zero; also called r(0)
-     */
-    register Eterm x0 REG_x0 = NIL;
-
     /* Pointer to X registers: x(1)..x(N); reg[0] is used when doing GC,
      * in all other cases x0 is used.
      */
@@ -1164,17 +1227,6 @@ void process_main(void)
     register Sint FCALLS REG_fcalls = 0;
 
     /*
-     * Temporaries used for picking up arguments for instructions.
-     */
-    register Eterm tmp_arg1 REG_tmp_arg1 = NIL;
-    register Eterm tmp_arg2 REG_tmp_arg2 = NIL;
-#if HEAP_ON_C_STACK
-    Eterm tmp_big[2];           /* Temporary buffer for small bignums if HEAP_ON_C_STACK. */
-#else
-    Eterm *tmp_big;		/* Temporary buffer for small bignums if !HEAP_ON_C_STACK. */
-#endif
-
-    /*
      * X registers and floating point registers are located in
      * scheduler specific data.
      */
@@ -1185,8 +1237,6 @@ void process_main(void)
      */
     int neg_o_reds = 0;
 
-    Eterm (*arith_func)(Process* p, Eterm* reg, Uint live);
-
 #ifdef ERTS_OPCODE_COUNTER_SUPPORT
     static void* counting_opcodes[] = { DEFINE_COUNTING_OPCODES };
 #else
@@ -1197,13 +1247,13 @@ void process_main(void)
 #endif
 #endif
 
-    Uint temp_bits; /* Temporary used by BsSkipBits2 & BsGetInteger2 */
-
     Eterm pt_arity;		/* Used by do_put_tuple */
 
     Uint64 start_time = 0;          /* Monitor long schedule */
     BeamInstr* start_time_i = NULL;
 
+    ERTS_MSACC_DECLARE_CACHE_X() /* a cached value of the tsd pointer for msacc */
+
     ERL_BITS_DECLARE_STATEP; /* Has to be last declaration */
 
 
@@ -1247,9 +1297,6 @@ void process_main(void)
 
     PROCESS_MAIN_CHK_LOCKS(c_p);
     ERTS_SMP_UNREQ_PROC_MAIN_LOCK(c_p);
-#if HALFWORD_HEAP
-    ASSERT(erts_get_scheduler_data()->num_tmp_heap_used == 0);
-#endif
     ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
     c_p = schedule(c_p, reds_used);
     ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
@@ -1260,6 +1307,8 @@ void process_main(void)
     ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
     PROCESS_MAIN_CHK_LOCKS(c_p);
 
+    ERTS_MSACC_UPDATE_CACHE_X();
+
     if (erts_system_monitor_long_schedule != 0) {
 	start_time = erts_timestamp_millis();
 	start_time_i = c_p->i;
@@ -1267,9 +1316,6 @@ void process_main(void)
 
     reg = ERTS_PROC_GET_SCHDATA(c_p)->x_reg_array;
     freg = ERTS_PROC_GET_SCHDATA(c_p)->f_reg_array;
-#if !HEAP_ON_C_STACK
-    tmp_big = ERTS_PROC_GET_SCHDATA(c_p)->beam_emu_tmp_heap;
-#endif
     ERL_BITS_RELOAD_STATEP(c_p);
     {
 	int reds;
@@ -1278,7 +1324,7 @@ void process_main(void)
 	int i;
 
 	argp = c_p->arg_reg;
-	for (i = c_p->arity - 1; i > 0; i--) {
+	for (i = c_p->arity - 1; i >= 0; i--) {
 	    reg[i] = argp[i];
 	    CHECK_TERM(reg[i]);
 	}
@@ -1302,12 +1348,6 @@ void process_main(void)
 	}
 
 	next = (BeamInstr *) *I;
-	r(0) = c_p->arg_reg[0];
-#ifdef HARDDEBUG
-	if (c_p->arity > 0) {
-	    CHECK_TERM(r(0));
-	}
-#endif
 	SWAPIN;
 	ASSERT(VALID_INSTR(next));
 
@@ -1346,26 +1386,24 @@ void process_main(void)
 #endif
 #include "beam_hot.h"
 
-#define STORE_ARITH_RESULT(res) StoreBifResult(2, (res));
-#define ARITH_FUNC(name) erts_gc_##name
-
 	{
 	    Eterm increment_reg_val;
 	    Eterm increment_val;
 	    Uint live;
 	    Eterm result;
 
-	OpCase(i_increment_yIId):
-	    increment_reg_val = yb(Arg(0));
+	OpCase(i_increment_rIId):
+	    increment_reg_val = x(0);
+	    I--;
 	    goto do_increment;
 
 	OpCase(i_increment_xIId):
 	    increment_reg_val = xb(Arg(0));
 	    goto do_increment;
 
-	OpCase(i_increment_rIId):
-	    increment_reg_val = r(0);
-	    I--;
+	OpCase(i_increment_yIId):
+	    increment_reg_val = yb(Arg(0));
+	    goto do_increment;
 
 	do_increment:
 	    increment_val = Arg(1);
@@ -1374,229 +1412,133 @@ void process_main(void)
 		ASSERT(MY_IS_SSMALL(i) == IS_SSMALL(i));
 		if (MY_IS_SSMALL(i)) {
 		    result = make_small(i);
-		store_result:
 		    StoreBifResult(3, result);
 		}
 	    }
 
 	    live = Arg(2);
-	    SWAPOUT;
-	    reg[0] = r(0);
+	    HEAVY_SWAPOUT;
 	    reg[live] = increment_reg_val;
 	    reg[live+1] = make_small(increment_val);
 	    result = erts_gc_mixed_plus(c_p, reg, live);
-	    r(0) = reg[0];
-	    SWAPIN;
+	    HEAVY_SWAPIN;
 	    ERTS_HOLE_CHECK(c_p);
 	    if (is_value(result)) {
-		goto store_result;
+		StoreBifResult(3, result);
 	    }
 	    ASSERT(c_p->freason != BADMATCH || is_value(c_p->fvalue));
 	    goto find_func_info;
 	}
 
-#define DO_BIG_ARITH(Func,Arg1,Arg2)     \
-    do {                                 \
-        Uint live = Arg(1);              \
-        SWAPOUT;                         \
-        reg[0] = r(0);                   \
-        reg[live] = (Arg1);              \
-        reg[live+1] = (Arg2);            \
-        result = (Func)(c_p, reg, live); \
-        r(0) = reg[0];                   \
-        SWAPIN;                          \
-        ERTS_HOLE_CHECK(c_p);            \
-        if (is_value(result)) {          \
-            StoreBifResult(4,result);    \
-        }                                \
-        goto lb_Cl_error;                \
-    } while(0)
+#define DO_OUTLINED_ARITH_2(name, Op1, Op2)	\
+ do {						\
+     Eterm result;				\
+     Uint live = Arg(1);			\
+						\
+     HEAVY_SWAPOUT;				\
+     reg[live] = Op1;				\
+     reg[live+1] = Op2;				\
+     result = erts_gc_##name(c_p, reg, live);	\
+     HEAVY_SWAPIN;				\
+     ERTS_HOLE_CHECK(c_p);			\
+     if (is_value(result)) {			\
+	 StoreBifResult(4, result);		\
+     }						\
+     goto lb_Cl_error;				\
+ } while (0)
 
- OpCase(i_plus_jIxxd):
  {
+     Eterm PlusOp1, PlusOp2;
      Eterm result;
 
-     if (is_both_small(xb(Arg(2)), xb(Arg(3)))) {
-	 Sint i = signed_val(xb(Arg(2))) + signed_val(xb(Arg(3)));
+ OpCase(i_plus_jIxxd):
+     PlusOp1 = xb(Arg(2));
+     PlusOp2 = xb(Arg(3));
+     goto do_plus;
+
+ OpCase(i_plus_jIxyd):
+     PlusOp1 = xb(Arg(2));
+     PlusOp2 = yb(Arg(3));
+     goto do_plus;
+
+ OpCase(i_plus_jIssd):
+     GetArg2(2, PlusOp1, PlusOp2);
+     goto do_plus;
+
+ do_plus:
+     if (is_both_small(PlusOp1, PlusOp2)) {
+	 Sint i = signed_val(PlusOp1) + signed_val(PlusOp2);
 	 ASSERT(MY_IS_SSMALL(i) == IS_SSMALL(i));
 	 if (MY_IS_SSMALL(i)) {
 	     result = make_small(i);
              StoreBifResult(4, result);
 	 }
      }
-     DO_BIG_ARITH(ARITH_FUNC(mixed_plus), xb(Arg(2)), xb(Arg(3)));
+     DO_OUTLINED_ARITH_2(mixed_plus, PlusOp1, PlusOp2);
  }
 
- OpCase(i_plus_jId):
  {
+     Eterm MinusOp1, MinusOp2;
      Eterm result;
 
-     if (is_both_small(tmp_arg1, tmp_arg2)) {
-	 Sint i = signed_val(tmp_arg1) + signed_val(tmp_arg2);
-	 ASSERT(MY_IS_SSMALL(i) == IS_SSMALL(i));
-	 if (MY_IS_SSMALL(i)) {
-	     result = make_small(i);
-	     STORE_ARITH_RESULT(result);
-	 }
-     }
-     arith_func = ARITH_FUNC(mixed_plus);
-     goto do_big_arith2;
- }
-
  OpCase(i_minus_jIxxd):
- {
-     Eterm result;
+     MinusOp1 = xb(Arg(2));
+     MinusOp2 = xb(Arg(3));
+     goto do_minus;
 
-     if (is_both_small(xb(Arg(2)), xb(Arg(3)))) {
-	 Sint i = signed_val(xb(Arg(2))) - signed_val(xb(Arg(3)));
-	 ASSERT(MY_IS_SSMALL(i) == IS_SSMALL(i));
-	 if (MY_IS_SSMALL(i)) {
-	     result = make_small(i);
-             StoreBifResult(4, result);
-	 }
-     }
-     DO_BIG_ARITH(ARITH_FUNC(mixed_minus), xb(Arg(2)), xb(Arg(3)));
- }
-
- OpCase(i_minus_jId):
- {
-     Eterm result;
+ OpCase(i_minus_jIssd):
+     GetArg2(2, MinusOp1, MinusOp2);
+     goto do_minus;
 
-     if (is_both_small(tmp_arg1, tmp_arg2)) {
-	 Sint i = signed_val(tmp_arg1) - signed_val(tmp_arg2);
+ do_minus:
+     if (is_both_small(MinusOp1, MinusOp2)) {
+	 Sint i = signed_val(MinusOp1) - signed_val(MinusOp2);
 	 ASSERT(MY_IS_SSMALL(i) == IS_SSMALL(i));
 	 if (MY_IS_SSMALL(i)) {
 	     result = make_small(i);
-	     STORE_ARITH_RESULT(result);
+             StoreBifResult(4, result);
 	 }
      }
-     arith_func = ARITH_FUNC(mixed_minus);
-     goto do_big_arith2;
+     DO_OUTLINED_ARITH_2(mixed_minus, MinusOp1, MinusOp2);
  }
 
- OpCase(i_is_lt_f):
-    if (CMP_GE(tmp_arg1, tmp_arg2)) {
-	ClauseFail();
-    }
-    Next(1);
-
- OpCase(i_is_ge_f):
-    if (CMP_LT(tmp_arg1, tmp_arg2)) {
-	ClauseFail();
-    }
-    Next(1);
-
- OpCase(i_is_eq_f):
-    if (CMP_NE(tmp_arg1, tmp_arg2)) {
-	ClauseFail();
-    }
-    Next(1);
-
- OpCase(i_is_ne_f):
-    if (CMP_EQ(tmp_arg1, tmp_arg2)) {
-	ClauseFail();
-    }
-    Next(1);
-
- OpCase(i_is_eq_exact_f):
-    if (!EQ(tmp_arg1, tmp_arg2)) {
-	ClauseFail();
-    }
-    Next(1);
-
     {
 	Eterm is_eq_exact_lit_val;
 
-    OpCase(i_is_eq_exact_literal_xfc):
-	is_eq_exact_lit_val = xb(Arg(0));
-	I++;
+    OpCase(i_is_eq_exact_literal_fxc):
+	is_eq_exact_lit_val = xb(Arg(1));
 	goto do_is_eq_exact_literal;
 
-    OpCase(i_is_eq_exact_literal_yfc):
-	is_eq_exact_lit_val = yb(Arg(0));
-	I++;
+    OpCase(i_is_eq_exact_literal_fyc):
+	is_eq_exact_lit_val = yb(Arg(1));
 	goto do_is_eq_exact_literal;
 
-    OpCase(i_is_eq_exact_literal_rfc):
-	is_eq_exact_lit_val = r(0);
-
     do_is_eq_exact_literal:
-	if (!eq(Arg(1), is_eq_exact_lit_val)) {
+	if (!eq(Arg(2), is_eq_exact_lit_val)) {
 	    ClauseFail();
 	}
-	Next(2);
+	Next(3);
     }
 
     {
 	Eterm is_ne_exact_lit_val;
 
-    OpCase(i_is_ne_exact_literal_xfc):
-	is_ne_exact_lit_val = xb(Arg(0));
-	I++;
+    OpCase(i_is_ne_exact_literal_fxc):
+	is_ne_exact_lit_val = xb(Arg(1));
 	goto do_is_ne_exact_literal;
 
-    OpCase(i_is_ne_exact_literal_yfc):
-	is_ne_exact_lit_val = yb(Arg(0));
-	I++;
+    OpCase(i_is_ne_exact_literal_fyc):
+	is_ne_exact_lit_val = yb(Arg(1));
 	goto do_is_ne_exact_literal;
 
-    OpCase(i_is_ne_exact_literal_rfc):
-	is_ne_exact_lit_val = r(0);
-
     do_is_ne_exact_literal:
-	if (eq(Arg(1), is_ne_exact_lit_val)) {
+	if (eq(Arg(2), is_ne_exact_lit_val)) {
 	    ClauseFail();
 	}
-	Next(2);
+	Next(3);
     }
 
- OpCase(move_window3_xxxy): {
-     BeamInstr *next;
-     Eterm xt0, xt1, xt2;
-     Eterm *y = (Eterm *)(((unsigned char *)E) + (Arg(3)));
-     PreFetch(4, next);
-     xt0  = xb(Arg(0));
-     xt1  = xb(Arg(1));
-     xt2  = xb(Arg(2));
-     y[0] = xt0;
-     y[1] = xt1;
-     y[2] = xt2;
-     NextPF(4, next);
- }
- OpCase(move_window4_xxxxy): {
-     BeamInstr *next;
-     Eterm xt0, xt1, xt2, xt3;
-     Eterm *y = (Eterm *)(((unsigned char *)E) + (Arg(4)));
-     PreFetch(5, next);
-     xt0  = xb(Arg(0));
-     xt1  = xb(Arg(1));
-     xt2  = xb(Arg(2));
-     xt3  = xb(Arg(3));
-     y[0] = xt0;
-     y[1] = xt1;
-     y[2] = xt2;
-     y[3] = xt3;
-     NextPF(5, next);
- }
- OpCase(move_window5_xxxxxy): {
-     BeamInstr *next;
-     Eterm xt0, xt1, xt2, xt3, xt4;
-     Eterm *y = (Eterm *)(((unsigned char *)E) + (Arg(5)));
-     PreFetch(6, next);
-     xt0  = xb(Arg(0));
-     xt1  = xb(Arg(1));
-     xt2  = xb(Arg(2));
-     xt3  = xb(Arg(3));
-     xt4  = xb(Arg(4));
-     y[0] = xt0;
-     y[1] = xt1;
-     y[2] = xt2;
-     y[3] = xt3;
-     y[4] = xt4;
-     NextPF(6, next);
- }
-
- OpCase(i_move_call_only_fcr): {
+ OpCase(i_move_call_only_fc): {
      r(0) = Arg(1);
  }
  /* FALL THROUGH */
@@ -1606,7 +1548,7 @@ void process_main(void)
      Dispatch();
  }
 
- OpCase(i_move_call_last_fPcr): {
+ OpCase(i_move_call_last_fPc): {
      r(0) = Arg(2);
  }
  /* FALL THROUGH */
@@ -1618,7 +1560,7 @@ void process_main(void)
      Dispatch();
  }
 
- OpCase(i_move_call_crf): {
+ OpCase(i_move_call_cf): {
      r(0) = Arg(0);
      I++;
  }
@@ -1630,7 +1572,7 @@ void process_main(void)
      Dispatch();
  }
 
- OpCase(i_move_call_ext_last_ePcr): {
+ OpCase(i_move_call_ext_last_ePc): {
      r(0) = Arg(2);
  }
  /* FALL THROUGH */
@@ -1646,7 +1588,7 @@ void process_main(void)
     DTRACE_GLOBAL_CALL_FROM_EXPORT(c_p, Arg(0));
     Dispatchx();
 
- OpCase(i_move_call_ext_cre): {
+ OpCase(i_move_call_ext_ce): {
      r(0) = Arg(0);
      I++;
  }
@@ -1656,7 +1598,7 @@ void process_main(void)
     DTRACE_GLOBAL_CALL_FROM_EXPORT(c_p, Arg(0));
     Dispatchx();
 
- OpCase(i_move_call_ext_only_ecr): {
+ OpCase(i_move_call_ext_only_ec): {
      r(0) = Arg(1);
  }
  /* FALL THROUGH */
@@ -1722,17 +1664,11 @@ void process_main(void)
 
      PRE_BIF_SWAPOUT(c_p);
      c_p->fcalls = FCALLS - 1;
-     reg[0] = r(0);
      result = erl_send(c_p, r(0), x(1));
      PreFetch(0, next);
      ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
      ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
      PROCESS_MAIN_CHK_LOCKS(c_p);
-     if (c_p->mbuf || MSO(c_p).overhead >= BIN_VHEAP_SZ(c_p)) {
-	 result = erts_gc_after_bif_call(c_p, result, reg, 2);
-	 r(0) = reg[0];
-	 E = c_p->stop;
-     }
      HTOP = HEAP_TOP(c_p);
      FCALLS = c_p->fcalls;
      if (is_value(result)) {
@@ -1743,7 +1679,6 @@ void process_main(void)
 	 SET_CP(c_p, I+1);
 	 SET_I(c_p->i);
 	 SWAPIN;
-	 r(0) = reg[0];
 	 Dispatch();
      }
      goto find_func_info;
@@ -1753,29 +1688,23 @@ void process_main(void)
 	Eterm element_index;
 	Eterm element_tuple;
 
-    OpCase(i_element_xjsd):
-	element_tuple = xb(Arg(0));
-	I++;
+    OpCase(i_element_jxsd):
+	element_tuple = xb(Arg(1));
 	goto do_element;
 
-    OpCase(i_element_yjsd):
-	element_tuple = yb(Arg(0));
-	I++;
+    OpCase(i_element_jysd):
+	element_tuple = yb(Arg(1));
 	goto do_element;
 
-    OpCase(i_element_rjsd):
-	element_tuple = r(0);
-	/* Fall through */
-
     do_element:
-	GetArg1(1, element_index);
+	GetArg1(2, element_index);
 	if (is_small(element_index) && is_tuple(element_tuple)) {
 	    Eterm* tp = tuple_val(element_tuple);
 
 	    if ((signed_val(element_index) >= 1) &&
 		(signed_val(element_index) <= arityval(*tp))) {
 		Eterm result = tp[signed_val(element_index)];
-		StoreBifResult(2, result);
+		StoreBifResult(3, result);
 	    }
 	}
     }
@@ -1789,29 +1718,24 @@ void process_main(void)
     {
 	Eterm fast_element_tuple;
 
-    OpCase(i_fast_element_rjId):
-	fast_element_tuple = r(0);
+    OpCase(i_fast_element_jxId):
+     fast_element_tuple = xb(Arg(1));
+     goto do_fast_element;
+
+    OpCase(i_fast_element_jyId):
+     fast_element_tuple = yb(Arg(1));
+     goto do_fast_element;
 
     do_fast_element:
 	if (is_tuple(fast_element_tuple)) {
 	    Eterm* tp = tuple_val(fast_element_tuple);
-	    Eterm pos = Arg(1);	/* Untagged integer >= 1 */
+	    Eterm pos = Arg(2);	/* Untagged integer >= 1 */
 	    if (pos <= arityval(*tp)) {
 		Eterm result = tp[pos];
-		StoreBifResult(2, result);
+		StoreBifResult(3, result);
 	    }
 	}
      goto badarg;
-
-    OpCase(i_fast_element_xjId):
-     fast_element_tuple = xb(Arg(0));
-     I++;
-     goto do_fast_element;
-
-    OpCase(i_fast_element_yjId):
-     fast_element_tuple = yb(Arg(0));
-     I++;
-     goto do_fast_element;
  }
 
  OpCase(catch_yf):
@@ -1832,11 +1756,10 @@ void process_main(void)
 		 SWAPIN;
 	     }
 	     /* only x(2) is included in the rootset here */
-	     if (E - HTOP < 3 || c_p->mbuf) {	/* Force GC in case add_stacktrace()
-						 * created heap fragments */
+	     if (E - HTOP < 3) {
 		 SWAPOUT;
 		 PROCESS_MAIN_CHK_LOCKS(c_p);
-		 FCALLS -= erts_garbage_collect(c_p, 3, reg+2, 1);
+		 FCALLS -= erts_garbage_collect_nobump(c_p, 3, reg+2, 1);
 		 ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 		 PROCESS_MAIN_CHK_LOCKS(c_p);
 		 SWAPIN;
@@ -1917,13 +1840,20 @@ void process_main(void)
      * Pick up the next message and place it in x(0).
      * If no message, jump to a wait or wait_timeout instruction.
      */
- OpCase(i_loop_rec_fr):
+ OpCase(i_loop_rec_f):
  {
      BeamInstr *next;
-     ErlMessage* msgp;
+     ErtsMessage* msgp;
 
- loop_rec__:
+     /*
+      * We need to disable GC while matching messages
+      * in the queue. This since messages with data outside
+      * the heap will be corrupted by a GC.
+      */
+     ASSERT(!(c_p->flags & F_DELAY_GC));
+     c_p->flags |= F_DELAY_GC;
 
+ loop_rec__:
      PROCESS_MAIN_CHK_LOCKS(c_p);
 
      msgp = PEEK_MESSAGE(c_p);
@@ -1935,6 +1865,7 @@ void process_main(void)
 	 if (ERTS_PROC_PENDING_EXIT(c_p)) {
 	     erts_smp_proc_unlock(c_p, ERTS_PROC_LOCKS_MSG_RECEIVE);
 	     SWAPOUT;
+	     c_p->flags &= ~F_DELAY_GC;
 	     goto do_schedule; /* Will be rescheduled for exit */
 	 }
 	 ERTS_SMP_MSGQ_MV_INQ2PRIVQ(c_p);
@@ -1944,32 +1875,27 @@ void process_main(void)
 	 else
 #endif
 	 {
+	     c_p->flags &= ~F_DELAY_GC;
 	     SET_I((BeamInstr *) Arg(0));
 	     Goto(*I);		/* Jump to a wait or wait_timeout instruction */
 	 }
      }
-     ErtsMoveMsgAttachmentIntoProc(msgp, c_p, E, HTOP, FCALLS,
-				   {
-				       SWAPOUT;
-				       reg[0] = r(0);
-				       PROCESS_MAIN_CHK_LOCKS(c_p);
-				   },
-				   {
-				       ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
-				       PROCESS_MAIN_CHK_LOCKS(c_p);
-				       r(0) = reg[0];
-				       SWAPIN;
-				   });
      if (is_non_value(ERL_MESSAGE_TERM(msgp))) {
-	 /*
-	  * A corrupt distribution message that we weren't able to decode;
-	  * remove it...
-	  */
-	 ASSERT(!msgp->data.attached);
-         /* TODO: Add DTrace probe for this bad message situation? */
-	 UNLINK_MESSAGE(c_p, msgp);
-	 free_message(msgp);
-	 goto loop_rec__;
+	 SWAPOUT; /* erts_decode_dist_message() may write to heap... */
+	 if (!erts_decode_dist_message(c_p, ERTS_PROC_LOCK_MAIN, msgp, 0)) {
+	     /*
+	      * A corrupt distribution message that we weren't able to decode;
+	      * remove it...
+	      */
+	     /* No swapin should be needed */
+	     ASSERT(HTOP == c_p->htop && E == c_p->stop);
+	     /* TODO: Add DTrace probe for this bad message situation? */
+	     UNLINK_MESSAGE(c_p, msgp);
+	     msgp->next = NULL;
+	     erts_cleanup_messages(msgp);
+	     goto loop_rec__;
+	 }
+	 SWAPIN;
      }
      PreFetch(1, next);
      r(0) = ERL_MESSAGE_TERM(msgp);
@@ -1981,8 +1907,7 @@ void process_main(void)
   */
  OpCase(remove_message): {
      BeamInstr *next;
-     ErlMessage* msgp;
-
+     ErtsMessage* msgp;
      PROCESS_MAIN_CHK_LOCKS(c_p);
 
      PreFetch(0, next);
@@ -1996,20 +1921,7 @@ void process_main(void)
 	 if (DT_UTAG(c_p) != NIL) {
 	     if (DT_UTAG_FLAGS(c_p) & DT_UTAG_PERMANENT) {
 		 SEQ_TRACE_TOKEN(c_p) = am_have_dt_utag;
-#ifdef DTRACE_TAG_HARDDEBUG
-		 if (DT_UTAG_FLAGS(c_p) & DT_UTAG_SPREADING) 
-		     erts_fprintf(stderr,
-				  "Dtrace -> (%T) stop spreading "
-				  "tag %T with message %T\r\n",
-				  c_p->common.id,DT_UTAG(c_p),ERL_MESSAGE_TERM(msgp));
-#endif
 	     } else {
-#ifdef DTRACE_TAG_HARDDEBUG
-		 erts_fprintf(stderr,
-			      "Dtrace -> (%T) kill tag %T with "
-			      "message %T\r\n",
-			      c_p->common.id,DT_UTAG(c_p),ERL_MESSAGE_TERM(msgp));
-#endif
 		 DT_UTAG(c_p) = NIL;
 		 SEQ_TRACE_TOKEN(c_p) = NIL;
 	     }
@@ -2029,12 +1941,6 @@ void process_main(void)
 		 DT_UTAG(c_p) = ERL_MESSAGE_DT_UTAG(msgp);
 	     }
 	     DT_UTAG_FLAGS(c_p) |= DT_UTAG_SPREADING;
-#ifdef DTRACE_TAG_HARDDEBUG
-	     erts_fprintf(stderr,
-			  "Dtrace -> (%T) receive tag (%T) "
-			  "with message %T\r\n",
-			  c_p->common.id, DT_UTAG(c_p), ERL_MESSAGE_TERM(msgp));
-#endif
 	 } else {
 #endif
 	     ASSERT(is_tuple(SEQ_TRACE_TOKEN(c_p)));
@@ -2064,7 +1970,7 @@ void process_main(void)
 
          dtrace_proc_str(c_p, receiver_name);
          token2 = SEQ_TRACE_TOKEN(c_p);
-         if (token2 != NIL && token2 != am_have_dt_utag) {
+         if (have_seqtrace(token2)) {
              tok_label = signed_val(SEQ_TRACE_T_LABEL(token2));
              tok_lastcnt = signed_val(SEQ_TRACE_T_LASTCNT(token2));
              tok_serial = signed_val(SEQ_TRACE_T_SERIAL(token2));
@@ -2077,11 +1983,21 @@ void process_main(void)
      UNLINK_MESSAGE(c_p, msgp);
      JOIN_MESSAGE(c_p);
      CANCEL_TIMER(c_p);
-     free_message(msgp);
+
+     erts_save_message_in_proc(c_p, msgp);
+     c_p->flags &= ~F_DELAY_GC;
+
+     if (ERTS_IS_GC_DESIRED_INTERNAL(c_p, HTOP, E)) {
+	 /*
+	  * We want to GC soon but we leave a few
+	  * reductions giving the message some time
+	  * to turn into garbage.
+	  */
+	 ERTS_VBUMP_LEAVE_REDS_INTERNAL(c_p, 5, FCALLS);
+     }
 
      ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
      PROCESS_MAIN_CHK_LOCKS(c_p);
-
      NextPF(0, next);
  }
 
@@ -2090,9 +2006,22 @@ void process_main(void)
      * message didn't match), then jump to the loop_rec instruction.
      */
  OpCase(loop_rec_end_f): {
+
+     ASSERT(c_p->flags & F_DELAY_GC);
+
      SET_I((BeamInstr *) Arg(0));
      SAVE_MESSAGE(c_p);
-     goto loop_rec__;
+     if (FCALLS > 0 || FCALLS > neg_o_reds) {
+	 FCALLS--;
+	 goto loop_rec__;
+     }
+
+     c_p->flags &= ~F_DELAY_GC;
+     c_p->i = I;
+     SWAPOUT;
+     c_p->arity = 0;
+     c_p->current = NULL;
+     goto do_schedule;
  }
     /*
      * Prepare to wait for a message or a timeout, whichever occurs first.
@@ -2131,8 +2060,6 @@ void process_main(void)
 		  * c_p->def_arg_reg[0].  Note that it is safe to use this
 		  * location because there are no living x registers in
 		  * a receive statement.
-		  * Note that for the halfword emulator, the two first elements
-		  * of the array are used.
 		  */
 		 BeamInstr** pi = (BeamInstr**) c_p->def_arg_reg;
 		 *pi = I+3;
@@ -2249,10 +2176,6 @@ void process_main(void)
      select_val2 = xb(Arg(0));
      goto do_select_tuple_arity2;
 
- OpCase(i_select_tuple_arity2_rfAAff):
-     select_val2 = r(0);
-     I--;
-
  do_select_tuple_arity2:
      if (is_not_tuple(select_val2)) {
 	 goto select_val2_fail;
@@ -2268,10 +2191,6 @@ void process_main(void)
      select_val2 = xb(Arg(0));
      goto do_select_val2;
 
- OpCase(i_select_val2_rfccff):
-     select_val2 = r(0);
-     I--;
-
  do_select_val2:
      if (select_val2 == Arg(2)) {
 	 I += 3;
@@ -2295,10 +2214,6 @@ void process_main(void)
      select_val = yb(Arg(0));
      goto do_select_tuple_arity;
 
- OpCase(i_select_tuple_arity_rfI):
-     select_val = r(0);
-     I--;
-
  do_select_tuple_arity:
      if (is_tuple(select_val)) {
 	 select_val = *tuple_val(select_val);
@@ -2315,10 +2230,6 @@ void process_main(void)
      select_val = yb(Arg(0));
      goto do_linear_search;
 
- OpCase(i_select_val_lins_rfI):
-     select_val = r(0);
-     I--;
-
  do_linear_search: {
      BeamInstr *vs = &Arg(3);
      int ix = 0;
@@ -2345,10 +2256,6 @@ void process_main(void)
      select_val = yb(Arg(0));
      goto do_binary_search;
      
- OpCase(i_select_val_bins_rfI):
-     select_val = r(0);
-     I--;
-
  do_binary_search:
  {
      struct Pairs {
@@ -2409,10 +2316,6 @@ void process_main(void)
      jump_on_val_zero_index = xb(Arg(0));
      goto do_jump_on_val_zero_index;
 
- OpCase(i_jump_on_val_zero_rfI):
-     jump_on_val_zero_index = r(0);
-     I--;
-
  do_jump_on_val_zero_index:
      if (is_small(jump_on_val_zero_index)) {
 	 jump_on_val_zero_index = signed_val(jump_on_val_zero_index);
@@ -2437,10 +2340,6 @@ void process_main(void)
      jump_on_val_index = xb(Arg(0));
      goto do_jump_on_val_index;
 
- OpCase(i_jump_on_val_rfII):
-     jump_on_val_index = r(0);
-     I--;
-
  do_jump_on_val_index:
      if (is_small(jump_on_val_index)) {
 	 jump_on_val_index = (Uint) (signed_val(jump_on_val_index) - Arg(3));
@@ -2460,15 +2359,12 @@ void process_main(void)
 
      do {
 	 Eterm term = *I++;
-	 switch (term & _TAG_IMMED1_MASK) {
-	 case (R_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER:
-	     *hp++ = r(0);
-	     break;
-	 case (X_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER:
-	     *hp++ = x(term >> _TAG_IMMED1_SIZE);
+	 switch (loader_tag(term)) {
+	 case LOADER_X_REG:
+	     *hp++ = x(loader_x_reg_index(term));
 	     break;
-	 case (Y_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER:
-	     *hp++ = y(term >> _TAG_IMMED1_SIZE);
+	 case LOADER_Y_REG:
+	     *hp++ = y(loader_y_reg_index(term));
 	     break;
 	 default:
 	     *hp++ = term;
@@ -2482,31 +2378,26 @@ void process_main(void)
  OpCase(new_map_dII): {
      Eterm res;
 
-     x(0) = r(0);
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      res = new_map(c_p, reg, I-1);
-     SWAPIN;
-     r(0) = x(0);
+     HEAVY_SWAPIN;
      StoreResult(res, Arg(0));
      Next(3+Arg(2));
  }
 
-#define PUT_TERM_REG(term, desc)				\
-do {								\
-    switch ((desc) & _TAG_IMMED1_MASK) {			\
-    case (R_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER:	\
-	r(0) = (term);						\
-	break;							\
-    case (X_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER:	\
-	x((desc) >> _TAG_IMMED1_SIZE) = (term);			\
-	break;							\
-    case (Y_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER:	\
-	y((desc) >> _TAG_IMMED1_SIZE) = (term);			\
-	break;							\
-    default:							\
-	ASSERT(0);						\
-	break;							\
-    }								\
+#define PUT_TERM_REG(term, desc)		\
+do {						\
+    switch (loader_tag(desc)) {			\
+    case LOADER_X_REG:				\
+	x(loader_x_reg_index(desc)) = (term);	\
+	break;					\
+    case LOADER_Y_REG:				\
+	y(loader_y_reg_index(desc)) = (term);	\
+	break;					\
+    default:					\
+	ASSERT(0);				\
+	break;					\
+    }						\
 } while(0)
 
  OpCase(i_get_map_elements_fsI): {
@@ -2577,12 +2468,10 @@ do {								\
      Eterm map;
 
      GetArg1(1, map);
-     x(0) = r(0);
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      res = update_map_assoc(c_p, reg, map, I);
-     SWAPIN;
+     HEAVY_SWAPIN;
      if (is_value(res)) {
-	 r(0) = x(0);
 	 StoreResult(res, Arg(2));
 	 Next(5+Arg(4));
      } else {
@@ -2601,12 +2490,10 @@ do {								\
      Eterm map;
 
      GetArg1(1, map);
-     x(0) = r(0);
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      res = update_map_exact(c_p, reg, map, I);
-     SWAPIN;
+     HEAVY_SWAPIN;
      if (is_value(res)) {
-	 r(0) = x(0);
 	 StoreResult(res, Arg(2));
 	 Next(5+Arg(4));
      } else {
@@ -2688,13 +2575,10 @@ do {								\
     {
 	typedef Eterm (*GcBifFunction)(Process*, Eterm*, Uint);
 	GcBifFunction bf;
-	Eterm arg;
 	Eterm result;
 	Uint live = (Uint) Arg(3);
 
-	GetArg1(2, arg);
-	reg[0] = r(0);
-	reg[live] = arg;
+	GetArg1(2, x(live));
 	bf = (GcBifFunction) Arg(1);
 	c_p->fcalls = FCALLS;
 	SWAPOUT;
@@ -2705,7 +2589,6 @@ do {								\
 	ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	SWAPIN;
-	r(0) = reg[0];
 	ERTS_HOLE_CHECK(c_p);
 	FCALLS = c_p->fcalls;
 	if (is_value(result)) {
@@ -2715,12 +2598,12 @@ do {								\
 	    SET_I((BeamInstr *) Arg(0));
 	    Goto(*I);
 	}
-	reg[0] = arg;
+	x(0) = x(live);
 	I = handle_error(c_p, I, reg, translate_gc_bif((void *) bf));
 	goto post_error_handling;
     }
 
- OpCase(i_gc_bif2_jIId): /* Note, one less parameter than the i_gc_bif1
+ OpCase(i_gc_bif2_jIIssd): /* Note, one less parameter than the i_gc_bif1
 			    and i_gc_bif3 */
     {
 	typedef Eterm (*GcBifFunction)(Process*, Eterm*, Uint);
@@ -2728,9 +2611,13 @@ do {								\
 	Eterm result;
 	Uint live = (Uint) Arg(2);
 
-	reg[0] = r(0);
-	reg[live++] = tmp_arg1;
-	reg[live] = tmp_arg2;
+	GetArg2(3, x(live), x(live+1));
+	/*
+	 * XXX This calling convention does not make sense. 'live'
+	 * should point out the first argument, not the second
+	 * (i.e. 'live' should not be incremented below).
+	 */
+	live++;
 	bf = (GcBifFunction) Arg(1);
 	c_p->fcalls = FCALLS;
 	SWAPOUT;
@@ -2741,35 +2628,37 @@ do {								\
 	ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	SWAPIN;
-	r(0) = reg[0];
 	ERTS_HOLE_CHECK(c_p);
 	FCALLS = c_p->fcalls;
 	if (is_value(result)) {
-	    StoreBifResult(3, result);
+	    StoreBifResult(5, result);
 	}
 	if (Arg(0) != 0) {
 	    SET_I((BeamInstr *) Arg(0));
 	    Goto(*I);
 	}
-	reg[0] = tmp_arg1;
-	reg[1] = tmp_arg2;
+	live--;
+	x(0) = x(live);
+	x(1) = x(live+1);
 	I = handle_error(c_p, I, reg, translate_gc_bif((void *) bf));
 	goto post_error_handling;
     }
 
- OpCase(i_gc_bif3_jIsId):
+ OpCase(i_gc_bif3_jIIssd):
     {
 	typedef Eterm (*GcBifFunction)(Process*, Eterm*, Uint);
 	GcBifFunction bf;
-	Eterm arg;
 	Eterm result;
-	Uint live = (Uint) Arg(3);
+	Uint live = (Uint) Arg(2);
 
-	GetArg1(2, arg);
-	reg[0] = r(0);
-	reg[live++] = arg;
-	reg[live++] = tmp_arg1;
-	reg[live] = tmp_arg2;
+	x(live) = x(SCRATCH_X_REG);
+	GetArg2(3, x(live+1), x(live+2));
+	/*
+	 * XXX This calling convention does not make sense. 'live'
+	 * should point out the first argument, not the third
+	 * (i.e. 'live' should not be incremented below).
+	 */
+	live += 2;
 	bf = (GcBifFunction) Arg(1);
 	c_p->fcalls = FCALLS;
 	SWAPOUT;
@@ -2780,19 +2669,19 @@ do {								\
 	ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	SWAPIN;
-	r(0) = reg[0];
 	ERTS_HOLE_CHECK(c_p);
 	FCALLS = c_p->fcalls;
 	if (is_value(result)) {
-	    StoreBifResult(4, result);
+	    StoreBifResult(5, result);
 	}
 	if (Arg(0) != 0) {
 	    SET_I((BeamInstr *) Arg(0));
 	    Goto(*I);
 	}
-	reg[0] = arg;
-	reg[1] = tmp_arg1;
-	reg[2] = tmp_arg2;
+	live -= 2;
+	x(0) = x(live);
+	x(1) = x(live+1);
+	x(2) = x(live+2);
 	I = handle_error(c_p, I, reg, translate_gc_bif((void *) bf));
 	goto post_error_handling;
     }
@@ -2800,12 +2689,13 @@ do {								\
  /*
   * Guards bifs and, or, xor in guards.
   */
- OpCase(i_bif2_fbd):
+ OpCase(i_bif2_fbssd):
     {
-	Eterm tmp_reg[2] = {tmp_arg1, tmp_arg2};
+	Eterm tmp_reg[2];
 	Eterm (*bf)(Process*, Eterm*);
 	Eterm result;
 
+	GetArg2(2, tmp_reg[0], tmp_reg[1]);
 	bf = (BifFunction) Arg(1);
 	c_p->fcalls = FCALLS;
 	PROCESS_MAIN_CHK_LOCKS(c_p);
@@ -2817,7 +2707,7 @@ do {								\
 	ERTS_HOLE_CHECK(c_p);
 	FCALLS = c_p->fcalls;
 	if (is_value(result)) {
-	    StoreBifResult(2, result);
+	    StoreBifResult(4, result);
 	}
 	SET_I((BeamInstr *) Arg(0));
 	Goto(*I);
@@ -2826,12 +2716,13 @@ do {								\
  /*
   * Guards bifs and, or, xor, relational operators in body.
   */
- OpCase(i_bif2_body_bd):
+ OpCase(i_bif2_body_bssd):
     {
-	Eterm tmp_reg[2] = {tmp_arg1, tmp_arg2};
+	Eterm tmp_reg[2];
 	Eterm (*bf)(Process*, Eterm*);
 	Eterm result;
 
+	GetArg2(1, tmp_reg[0], tmp_reg[1]);
 	bf = (BifFunction) Arg(0);
 	PROCESS_MAIN_CHK_LOCKS(c_p);
 	ASSERT(!ERTS_PROC_IS_EXITING(c_p));
@@ -2842,10 +2733,10 @@ do {								\
 	ERTS_HOLE_CHECK(c_p);
 	if (is_value(result)) {
 	    ASSERT(!is_CP(result));
-	    StoreBifResult(1, result);
+	    StoreBifResult(3, result);
 	}
-	reg[0] = tmp_arg1;
-	reg[1] = tmp_arg2;
+	reg[0] = tmp_reg[0];
+	reg[1] = tmp_reg[1];
 	SWAPOUT;
 	I = handle_error(c_p, I, reg, bf);
 	goto post_error_handling;
@@ -2857,9 +2748,20 @@ do {								\
      */
  OpCase(call_bif_e):
     {
-	Eterm (*bf)(Process*, Eterm*, BeamInstr*) = GET_BIF_ADDRESS(Arg(0));
+        Eterm (*bf)(Process*, Eterm*, BeamInstr*);
 	Eterm result;
 	BeamInstr *next;
+	ErlHeapFragment *live_hf_end;
+
+        if (ERTS_MSACC_IS_ENABLED_CACHED_X()) {
+            if (GET_BIF_MODULE(Arg(0)) == am_ets) {
+                ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_ETS);
+            } else {
+                ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_BIF);
+            }
+        }
+
+	bf = GET_BIF_ADDRESS(Arg(0));
 
 	PRE_BIF_SWAPOUT(c_p);
 	c_p->fcalls = FCALLS - 1;
@@ -2869,20 +2771,26 @@ do {								\
 	PreFetch(1, next);
 	ASSERT(!ERTS_PROC_IS_EXITING(c_p));
 	ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
-	reg[0] = r(0);
+	live_hf_end = c_p->mbuf;
 	result = (*bf)(c_p, reg, I);
 	ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(result));
 	ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 	ERTS_HOLE_CHECK(c_p);
 	ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
-	PROCESS_MAIN_CHK_LOCKS(c_p);
-	if (c_p->mbuf || MSO(c_p).overhead >= BIN_VHEAP_SZ(c_p)) {
+	if (ERTS_IS_GC_DESIRED(c_p)) {
 	    Uint arity = ((Export *)Arg(0))->code[2];
-	    result = erts_gc_after_bif_call(c_p, result, reg, arity);
+	    result = erts_gc_after_bif_call_lhf(c_p, live_hf_end, result, reg, arity);
 	    E = c_p->stop;
 	}
+	PROCESS_MAIN_CHK_LOCKS(c_p);
 	HTOP = HEAP_TOP(c_p);
 	FCALLS = c_p->fcalls;
+        /* We have to update the cache if we are enabled in order
+           to make sure no book keeping is done after we disabled
+           msacc. We don't always do this as it is quite expensive. */
+        if (ERTS_MSACC_IS_ENABLED_CACHED_X())
+            ERTS_MSACC_UPDATE_CACHE_X();
+	ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_EMULATOR);
 	if (is_value(result)) {
 	    r(0) = result;
 	    CHECK_TERM(r(0));
@@ -2891,7 +2799,6 @@ do {								\
 	    SET_CP(c_p, I+2);
 	    SET_I(c_p->i);
 	    SWAPIN;
-	    r(0) = reg[0];
 	    Dispatch();
 	}
 
@@ -2907,111 +2814,81 @@ do {								\
   * Arithmetic operations.
   */
 
- OpCase(i_times_jId):
+ OpCase(i_times_jIssd):
  {
-     arith_func = ARITH_FUNC(mixed_times);
-     goto do_big_arith2;
+     Eterm Op1, Op2;
+     GetArg2(2, Op1, Op2);
+     DO_OUTLINED_ARITH_2(mixed_times, Op1, Op2);
  }
 
- OpCase(i_m_div_jId):
+ OpCase(i_m_div_jIssd):
  {
-     arith_func = ARITH_FUNC(mixed_div);
-     goto do_big_arith2;
+     Eterm Op1, Op2;
+     GetArg2(2, Op1, Op2);
+     DO_OUTLINED_ARITH_2(mixed_div, Op1, Op2);
  }
 
- OpCase(i_int_div_jId):
+ OpCase(i_int_div_jIssd):
  {
-     Eterm result;
+     Eterm Op1, Op2;
 
-     if (tmp_arg2 == SMALL_ZERO) {
+     GetArg2(2, Op1, Op2);
+     if (Op2 == SMALL_ZERO) {
 	 goto badarith;
-     } else if (is_both_small(tmp_arg1, tmp_arg2)) {
-	 Sint ires = signed_val(tmp_arg1) / signed_val(tmp_arg2);
+     } else if (is_both_small(Op1, Op2)) {
+	 Sint ires = signed_val(Op1) / signed_val(Op2);
 	 if (MY_IS_SSMALL(ires)) {
-	     result = make_small(ires);
-	     STORE_ARITH_RESULT(result);
+	     Eterm result = make_small(ires);
+	     StoreBifResult(4, result);
 	 }
      }
-     arith_func = ARITH_FUNC(int_div);
-     goto do_big_arith2;
+     DO_OUTLINED_ARITH_2(int_div, Op1, Op2);
  }
 
- OpCase(i_rem_jIxxd):
  {
-     Eterm result;
+     Eterm RemOp1, RemOp2;
 
-     if (xb(Arg(3)) == SMALL_ZERO) {
-	 goto badarith;
-     } else if (is_both_small(xb(Arg(2)), xb(Arg(3)))) {
-	 result = make_small(signed_val(xb(Arg(2))) % signed_val(xb(Arg(3))));
+ OpCase(i_rem_jIxxd):
+     RemOp1 = xb(Arg(2));
+     RemOp2 = xb(Arg(3));
+     goto do_rem;
+
+ OpCase(i_rem_jIssd):
+     GetArg2(2, RemOp1, RemOp2);
+     goto do_rem;
+
+ do_rem:
+     if (RemOp2 == SMALL_ZERO) {
+         goto badarith;
+     } else if (is_both_small(RemOp1, RemOp2)) {
+         Eterm result = make_small(signed_val(RemOp1) % signed_val(RemOp2));
          StoreBifResult(4, result);
+     } else {
+	 DO_OUTLINED_ARITH_2(int_rem, RemOp1, RemOp2);
      }
-     DO_BIG_ARITH(ARITH_FUNC(int_rem),xb(Arg(2)),xb(Arg(3)));
  }
 
- OpCase(i_rem_jId):
  {
-     Eterm result;
-
-     if (tmp_arg2 == SMALL_ZERO) {
-	 goto badarith;
-     } else if (is_both_small(tmp_arg1, tmp_arg2)) {
-	 result = make_small(signed_val(tmp_arg1) % signed_val(tmp_arg2));
-	 STORE_ARITH_RESULT(result);
-     } else {
-	 arith_func = ARITH_FUNC(int_rem);
-	 goto do_big_arith2;
-     }
- }
+     Eterm BandOp1, BandOp2;
 
  OpCase(i_band_jIxcd):
- {
-     Eterm result;
+     BandOp1 = xb(Arg(2));
+     BandOp2 = Arg(3);
+     goto do_band;
+
+ OpCase(i_band_jIssd):
+     GetArg2(2, BandOp1, BandOp2);
+     goto do_band;
 
-     if (is_both_small(xb(Arg(2)), Arg(3))) {
+ do_band:
+     if (is_both_small(BandOp1, BandOp2)) {
          /*
           * No need to untag -- TAG & TAG == TAG.
           */
-         result = xb(Arg(2)) & Arg(3);
+         Eterm result = BandOp1 & BandOp2;
          StoreBifResult(4, result);
      }
-     DO_BIG_ARITH(ARITH_FUNC(band),xb(Arg(2)),Arg(3));
- }
-
- OpCase(i_band_jId):
- {
-     Eterm result;
-
-     if (is_both_small(tmp_arg1, tmp_arg2)) {
-	 /*
-	  * No need to untag -- TAG & TAG == TAG.
-	  */
-	 result = tmp_arg1 & tmp_arg2;
-	 STORE_ARITH_RESULT(result);
-     }
-     arith_func = ARITH_FUNC(band);
-     goto do_big_arith2;
- }
-
-#undef DO_BIG_ARITH
-
- do_big_arith2:
- {
-     Eterm result;
-     Uint live = Arg(1);
-
-     SWAPOUT;
-     reg[0] = r(0);
-     reg[live] = tmp_arg1;
-     reg[live+1] = tmp_arg2;
-     result = arith_func(c_p, reg, live);
-     r(0) = reg[0];
-     SWAPIN;
-     ERTS_HOLE_CHECK(c_p);
-     if (is_value(result)) {
-	 STORE_ARITH_RESULT(result);
-     }
-     goto lb_Cl_error;
+     DO_OUTLINED_ARITH_2(band, BandOp1, BandOp2);
  }
 
  /*
@@ -3032,97 +2909,105 @@ do {								\
      goto find_func_info;
  }
 
- OpCase(i_bor_jId):
+ OpCase(i_bor_jIssd):
  {
-     Eterm result;
+     Eterm Op1, Op2;
 
-     if (is_both_small(tmp_arg1, tmp_arg2)) {
+     GetArg2(2, Op1, Op2);
+     if (is_both_small(Op1, Op2)) {
 	 /*
 	  * No need to untag -- TAG | TAG == TAG.
 	  */
-	 result = tmp_arg1 | tmp_arg2;
-	 STORE_ARITH_RESULT(result);
+	 Eterm result = Op1 | Op2;
+	 StoreBifResult(4, result);
      }
-     arith_func = ARITH_FUNC(bor);
-     goto do_big_arith2;
+     DO_OUTLINED_ARITH_2(bor, Op1, Op2);
  }
 
- OpCase(i_bxor_jId):
+ OpCase(i_bxor_jIssd):
  {
-     Eterm result;
+     Eterm Op1, Op2;
 
-     if (is_both_small(tmp_arg1, tmp_arg2)) {
+     GetArg2(2, Op1, Op2);
+     if (is_both_small(Op1, Op2)) {
 	 /*
 	  * We could extract the tag from one argument, but a tag extraction
 	  * could mean a shift.  Therefore, play it safe here.
 	  */
-	 result = make_small(signed_val(tmp_arg1) ^ signed_val(tmp_arg2));
-	 STORE_ARITH_RESULT(result);
+	 Eterm result = make_small(signed_val(Op1) ^ signed_val(Op2));
+	 StoreBifResult(4, result);
      }
-     arith_func = ARITH_FUNC(bxor);
-     goto do_big_arith2;
+     DO_OUTLINED_ARITH_2(bxor, Op1, Op2);
  }
 
  {
+     Eterm Op1, Op2;
      Sint i;
      Sint ires;
      Eterm* bigp;
+     Eterm tmp_big[2];
 
-     OpCase(i_bsr_jId):
-	 if (is_small(tmp_arg2)) {
-	     i = -signed_val(tmp_arg2);
-	     if (is_small(tmp_arg1)) {
+     OpCase(i_bsr_jIssd):
+         GetArg2(2, Op1, Op2);
+	 if (is_small(Op2)) {
+	     i = -signed_val(Op2);
+	     if (is_small(Op1)) {
 		 goto small_shift;
-	     } else if (is_big(tmp_arg1)) {
+	     } else if (is_big(Op1)) {
 		 if (i == 0) {
-		     StoreBifResult(2, tmp_arg1);
+		     StoreBifResult(4, Op1);
 		 }
 		 goto big_shift;
 	     }
-	 } else if (is_big(tmp_arg2)) {
+	 } else if (is_big(Op2)) {
 	     /*
 	      * N bsr NegativeBigNum == N bsl MAX_SMALL
 	      * N bsr PositiveBigNum == N bsl MIN_SMALL
 	      */
-	     tmp_arg2 = make_small(bignum_header_is_neg(*big_val(tmp_arg2)) ?
+	     Op2 = make_small(bignum_header_is_neg(*big_val(Op2)) ?
 				   MAX_SMALL : MIN_SMALL);
 	     goto do_bsl;
 	}
      goto badarith;
      
-     OpCase(i_bsl_jId):
+     OpCase(i_bsl_jIssd):
+         GetArg2(2, Op1, Op2);
+
  do_bsl:
-	 if (is_small(tmp_arg2)) {
-	     i = signed_val(tmp_arg2);
+	 if (is_small(Op2)) {
+	     i = signed_val(Op2);
 
-	     if (is_small(tmp_arg1)) {
+	     if (is_small(Op1)) {
 	     small_shift:
-		 ires = signed_val(tmp_arg1);
+		 ires = signed_val(Op1);
 	     
 		 if (i == 0 || ires == 0) {
-		     StoreBifResult(2, tmp_arg1);
+		     StoreBifResult(4, Op1);
 		 } else if (i < 0)  { /* Right shift */
 		     i = -i;
 		     if (i >= SMALL_BITS-1) {
-			 tmp_arg1 = (ires < 0) ? SMALL_MINUS_ONE : SMALL_ZERO;
+			 Op1 = (ires < 0) ? SMALL_MINUS_ONE : SMALL_ZERO;
 		     } else {
-			 tmp_arg1 = make_small(ires >> i);
+			 Op1 = make_small(ires >> i);
 		     }
-		     StoreBifResult(2, tmp_arg1);
+		     StoreBifResult(4, Op1);
 		 } else if (i < SMALL_BITS-1) { /* Left shift */
 		     if ((ires > 0 && ((~(Uint)0 << ((SMALL_BITS-1)-i)) & ires) == 0) ||
 			 ((~(Uint)0 << ((SMALL_BITS-1)-i)) & ~ires) == 0) {
-			 tmp_arg1 = make_small(ires << i);
-			 StoreBifResult(2, tmp_arg1);
+			 Op1 = make_small(ires << i);
+			 StoreBifResult(4, Op1);
 		     }
 		 }
-		 tmp_arg1 = small_to_big(ires, tmp_big);
+		 Op1 = small_to_big(ires, tmp_big);
+#ifdef TAG_LITERAL_PTR
+		 Op1 |= TAG_LITERAL_PTR;
+#endif
 
 	     big_shift:
 		 if (i > 0) {	/* Left shift. */
-		     ires = big_size(tmp_arg1) + (i / D_EXP);
+		     ires = big_size(Op1) + (i / D_EXP);
 		 } else {	/* Right shift. */
-		     ires = big_size(tmp_arg1);
+		     ires = big_size(Op1);
 		     if (ires <= (-i / D_EXP))
 			 ires = 3; /* ??? */
 		     else
@@ -3140,14 +3025,14 @@ do {								\
 			 c_p->freason = SYSTEM_LIMIT;
 			 goto lb_Cl_error;
 		     }
-		     TestHeapPreserve(ires+1, Arg(1), tmp_arg1);
+		     TestHeapPreserve(ires+1, Arg(1), Op1);
 		     bigp = HTOP;
-		     tmp_arg1 = big_lshift(tmp_arg1, i, bigp);
-		     if (is_big(tmp_arg1)) {
+		     Op1 = big_lshift(Op1, i, bigp);
+		     if (is_big(Op1)) {
 			 HTOP += bignum_header_arity(*HTOP) + 1;
 		     }
 		     HEAP_SPACE_VERIFIED(0);
-		     if (is_nil(tmp_arg1)) {
+		     if (is_nil(Op1)) {
 			 /*
 			  * This result must have been only slight larger
 			  * than allowed since it wasn't caught by the
@@ -3157,25 +3042,25 @@ do {								\
 			 goto lb_Cl_error;
 		     }
 		     ERTS_HOLE_CHECK(c_p);
-		     StoreBifResult(2, tmp_arg1);
+		     StoreBifResult(4, Op1);
 		 }
-	     } else if (is_big(tmp_arg1)) {
+	     } else if (is_big(Op1)) {
 		 if (i == 0) {
-		     StoreBifResult(2, tmp_arg1);
+		     StoreBifResult(4, Op1);
 		 }
 		 goto big_shift;
 	     }
-	 } else if (is_big(tmp_arg2)) {
-	     if (bignum_header_is_neg(*big_val(tmp_arg2))) {
+	 } else if (is_big(Op2)) {
+	     if (bignum_header_is_neg(*big_val(Op2))) {
 		 /*
 		  * N bsl NegativeBigNum is either 0 or -1, depending on
 		  * the sign of N. Since we don't believe this case
 		  * is common, do the calculation with the minimum
 		  * amount of code.
 		  */
-		 tmp_arg2 = make_small(MIN_SMALL);
+		 Op2 = make_small(MIN_SMALL);
 		 goto do_bsl;
-	     } else if (is_small(tmp_arg1) || is_big(tmp_arg1)) {
+	     } else if (is_small(Op1) || is_big(Op1)) {
 		 /*
 		  * N bsl PositiveBigNum is too large to represent.
 		  */
@@ -3199,12 +3084,10 @@ do {								\
 	 bnot_val = make_small(~signed_val(bnot_val));
      } else {
 	 Uint live = Arg(2);
-	 SWAPOUT;
-	 reg[0] = r(0);
+	 HEAVY_SWAPOUT;
 	 reg[live] = bnot_val;
 	 bnot_val = erts_gc_bnot(c_p, reg, live);
-	 r(0) = reg[0];
-	 SWAPIN;
+	 HEAVY_SWAPIN;
 	 ERTS_HOLE_CHECK(c_p);
 	 if (is_nil(bnot_val)) {
 	     goto lb_Cl_error;
@@ -3219,11 +3102,10 @@ do {								\
 
  OpCase(i_apply): {
      BeamInstr *next;
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      next = apply(c_p, r(0), x(1), x(2), reg);
-     SWAPIN;
+     HEAVY_SWAPIN;
      if (next != NULL) {
-	 r(0) = reg[0];
 	 SET_CP(c_p, I+1);
 	 SET_I(next);
 	 Dispatch();
@@ -3234,12 +3116,11 @@ do {								\
 
  OpCase(i_apply_last_P): {
      BeamInstr *next;
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      next = apply(c_p, r(0), x(1), x(2), reg);
-     SWAPIN;
+     HEAVY_SWAPIN;
      if (next != NULL) {
-	 r(0) = reg[0];
-	 SET_CP(c_p, (BeamInstr *) EXPAND_POINTER(E[0]));
+	 SET_CP(c_p, (BeamInstr *) E[0]);
 	 E = ADD_BYTE_OFFSET(E, Arg(0));
 	 SET_I(next);
 	 Dispatch();
@@ -3250,11 +3131,10 @@ do {								\
 
  OpCase(i_apply_only): {
      BeamInstr *next;
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      next = apply(c_p, r(0), x(1), x(2), reg);
-     SWAPIN;
+     HEAVY_SWAPIN;
      if (next != NULL) {
-	 r(0) = reg[0];
 	 SET_I(next);
 	 Dispatch();
      }
@@ -3265,12 +3145,10 @@ do {								\
  OpCase(apply_I): {
      BeamInstr *next;
 
-     reg[0] = r(0);
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      next = fixed_apply(c_p, reg, Arg(0));
-     SWAPIN;
+     HEAVY_SWAPIN;
      if (next != NULL) {
-	 r(0) = reg[0];
 	 SET_CP(c_p, I+2);
 	 SET_I(next);
 	 Dispatch();
@@ -3282,13 +3160,11 @@ do {								\
  OpCase(apply_last_IP): {
      BeamInstr *next;
 
-     reg[0] = r(0);
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      next = fixed_apply(c_p, reg, Arg(0));
-     SWAPIN;
+     HEAVY_SWAPIN;
      if (next != NULL) {
-	 r(0) = reg[0];
-	 SET_CP(c_p, (BeamInstr *) EXPAND_POINTER(E[0]));
+	 SET_CP(c_p, (BeamInstr *) E[0]);
 	 E = ADD_BYTE_OFFSET(E, Arg(1));
 	 SET_I(next);
 	 Dispatch();
@@ -3300,11 +3176,10 @@ do {								\
  OpCase(i_apply_fun): {
      BeamInstr *next;
 
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      next = apply_fun(c_p, r(0), x(1), reg);
-     SWAPIN;
+     HEAVY_SWAPIN;
      if (next != NULL) {
-	 r(0) = reg[0];
 	 SET_CP(c_p, I+1);
 	 SET_I(next);
 	 Dispatchfun();
@@ -3315,12 +3190,11 @@ do {								\
  OpCase(i_apply_fun_last_P): {
      BeamInstr *next;
 
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      next = apply_fun(c_p, r(0), x(1), reg);
-     SWAPIN;
+     HEAVY_SWAPIN;
      if (next != NULL) {
-	 r(0) = reg[0];
-	 SET_CP(c_p, (BeamInstr *) EXPAND_POINTER(E[0]));
+	 SET_CP(c_p, (BeamInstr *) E[0]);
 	 E = ADD_BYTE_OFFSET(E, Arg(0));
 	 SET_I(next);
 	 Dispatchfun();
@@ -3331,11 +3205,10 @@ do {								\
  OpCase(i_apply_fun_only): {
      BeamInstr *next;
 
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      next = apply_fun(c_p, r(0), x(1), reg);
-     SWAPIN;
+     HEAVY_SWAPIN;
      if (next != NULL) {
-	 r(0) = reg[0];
 	 SET_I(next);
 	 Dispatchfun();
      }
@@ -3345,13 +3218,10 @@ do {								\
  OpCase(i_call_fun_I): {
      BeamInstr *next;
 
-     SWAPOUT;
-     reg[0] = r(0);
-
+     HEAVY_SWAPOUT;
      next = call_fun(c_p, Arg(0), reg, THE_NON_VALUE);
-     SWAPIN;
+     HEAVY_SWAPIN;
      if (next != NULL) {
-	 r(0) = reg[0];
 	 SET_CP(c_p, I+2);
 	 SET_I(next);
 	 Dispatchfun();
@@ -3362,13 +3232,11 @@ do {								\
  OpCase(i_call_fun_last_IP): {
      BeamInstr *next;
 
-     SWAPOUT;
-     reg[0] = r(0);
+     HEAVY_SWAPOUT;
      next = call_fun(c_p, Arg(0), reg, THE_NON_VALUE);
-     SWAPIN;
+     HEAVY_SWAPIN;
      if (next != NULL) {
-	r(0) = reg[0];
-	SET_CP(c_p, (BeamInstr *) EXPAND_POINTER(E[0]));
+	SET_CP(c_p, (BeamInstr *) E[0]);
 	E = ADD_BYTE_OFFSET(E, Arg(1));
 	SET_I(next);
 	Dispatchfun();
@@ -3452,10 +3320,9 @@ do {								\
       */
 
      argp = c_p->arg_reg;
-     for (i = c_p->arity - 1; i > 0; i--) {
+     for (i = c_p->arity - 1; i >= 0; i--) {
 	 argp[i] = reg[i];
      }
-     c_p->arg_reg[0] = r(0);
      SWAPOUT;
      c_p->i = I;
      goto do_schedule1;
@@ -3468,19 +3335,14 @@ do {								\
      Eterm* p;
      
      PreFetch(3, next);
-     GetArg2(0, element, tuple);
+     GetArg1(0, element);
+     tuple = REG_TARGET(Arg(1));
      ASSERT(is_tuple(tuple));
      p = (Eterm *) ((unsigned char *) tuple_val(tuple) + Arg(2));
      *p = element;
      NextPF(3, next);
  }
 
- OpCase(i_is_ne_exact_f):
-    if (EQ(tmp_arg1, tmp_arg2)) {
-	ClauseFail();
-    }
-    Next(1);
-
  OpCase(normal_exit): {
      SWAPOUT;
      c_p->freason = EXC_NORMAL;
@@ -3498,48 +3360,18 @@ do {								\
      goto do_schedule;
  }
 
- OpCase(raise_ss): {
-     /* This was not done very well in R10-0; then, we passed the tag in
-	the first argument and hoped that the existing c_p->ftrace was
-	still correct. But the ftrace-object already includes the tag
-	(or rather, the freason). Now, we pass the original ftrace in
-	the first argument. We also handle atom tags in the first
-	argument for backwards compatibility.
-     */
-     Eterm raise_val1;
-     Eterm raise_val2;
-     GetArg2(0, raise_val1, raise_val2);
-     c_p->fvalue = raise_val2;
-     if (c_p->freason == EXC_NULL) {
-       /* a safety check for the R10-0 case; should not happen */
-       c_p->ftrace = NIL;
-       c_p->freason = EXC_ERROR;
-     }
-     /* for R10-0 code, keep existing c_p->ftrace and hope it's correct */
-     switch (raise_val1) {
-     case am_throw:
-       c_p->freason = EXC_THROWN & ~EXF_SAVETRACE;
-       break;
-     case am_error:
-       c_p->freason = EXC_ERROR & ~EXF_SAVETRACE;
-       break;
-     case am_exit:
-       c_p->freason = EXC_EXIT & ~EXF_SAVETRACE;
-       break;
-     default:
-       {/* R10-1 and later
-	   XXX note: should do sanity check on given trace if it can be
-	   passed from a user! Currently only expecting generated calls.
-	*/
-	 struct StackTrace *s;
-	 c_p->ftrace = raise_val1;
-	 s = get_trace_from_exc(raise_val1);
-	 if (s == NULL) {
-	   c_p->freason = EXC_ERROR;
-	 } else {
-	   c_p->freason = PRIMARY_EXCEPTION(s->freason);
-	 }
-       }
+ OpCase(i_raise): {
+     Eterm raise_trace = x(2);
+     Eterm raise_value = x(1);
+     struct StackTrace *s;
+
+     c_p->fvalue = raise_value;
+     c_p->ftrace = raise_trace;
+     s = get_trace_from_exc(raise_trace);
+     if (s == NULL) {
+	 c_p->freason = EXC_ERROR;
+     } else {
+	 c_p->freason = PRIMARY_EXCEPTION(s->freason);
      }
      goto find_func_info;
  }
@@ -3547,25 +3379,14 @@ do {								\
     {
 	Eterm badmatch_val;
 
-    OpCase(badmatch_y):
-	badmatch_val = yb(Arg(0));
-	goto do_badmatch;
-
     OpCase(badmatch_x):
 	badmatch_val = xb(Arg(0));
-	goto do_badmatch;
-
-    OpCase(badmatch_r):
-	badmatch_val = r(0);
-
-    do_badmatch:
 	c_p->fvalue = badmatch_val;
 	c_p->freason = BADMATCH;
     }
  /* Fall through here */
 
  find_func_info: {
-     reg[0] = r(0);
      SWAPOUT;
      I = handle_error(c_p, I, reg, NULL);
      goto post_error_handling;
@@ -3582,11 +3403,9 @@ do {								\
      * code[3]: &&call_error_handler
      * code[4]: Not used
      */
-    SWAPOUT;
-    reg[0] = r(0);
+    HEAVY_SWAPOUT;
     I = call_error_handler(c_p, I-3, reg, am_undefined_function);
-    r(0) = reg[0];
-    SWAPIN;
+    HEAVY_SWAPIN;
     if (I) {
 	Goto(*I);
     }
@@ -3594,18 +3413,13 @@ do {								\
  /* Fall through */
  OpCase(error_action_code): {
     handle_error:
-     reg[0] = r(0);
      SWAPOUT;
      I = handle_error(c_p, NULL, reg, NULL);
  post_error_handling:
      if (I == 0) {
 	 goto do_schedule;
      } else {
-	 r(0) = reg[0];
 	 ASSERT(!is_value(r(0)));
-	 if (c_p->mbuf) {
-	     erts_garbage_collect(c_p, 0, reg+1, 3);
-	 }
 	 SWAPIN;
 	 Goto(*I);
      }
@@ -3629,6 +3443,9 @@ do {								\
 	     * I[3]: Function pointer to dirty NIF
 	     */
 	    BifFunction vbf;
+	    ErlHeapFragment *live_hf_end;
+
+	    ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_NIF);
 
 	    DTRACE_NIF_ENTRY(c_p, (Eterm)I[-3], (Eterm)I[-2], (Uint)I[-1]);
 	    c_p->current = I-3; /* current and vbf set to please handle_error */ 
@@ -3644,7 +3461,7 @@ do {								\
 		NifF* fp = vbf = (NifF*) I[1];
 		struct enif_environment_t env;
 		erts_pre_nif(&env, c_p, (struct erl_module_nif*)I[2]);
-		reg[0] = r(0);
+		live_hf_end = c_p->mbuf;
 		nif_bif_result = (*fp)(&env, bif_nif_arity, reg);
 		if (env.exception_thrown)
 		    nif_bif_result = THE_NON_VALUE;
@@ -3654,6 +3471,8 @@ do {								\
 	    PROCESS_MAIN_CHK_LOCKS(c_p);
 	    ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 
+	    ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_EMULATOR);
+
 	    DTRACE_NIF_RETURN(c_p, (Eterm)I[-3], (Eterm)I[-2], (Uint)I[-1]);
 	    goto apply_bif_or_nif_epilogue;
 	 
@@ -3668,6 +3487,13 @@ do {								\
 	     * code[3]: &&apply_bif
 	     * code[4]: Function pointer to BIF function
 	     */
+            if (ERTS_MSACC_IS_ENABLED_CACHED_X()) {
+                if ((Eterm)I[-3] == am_ets) {
+                    ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_ETS);
+                } else {
+                    ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_BIF);
+                }
+            }
 
 	    c_p->current = I-3;	/* In case we apply process_info/1,2 or load_nif/1 */
 	    c_p->i = I;		/* In case we apply check_process_code/2. */
@@ -3683,25 +3509,32 @@ do {								\
 	    bif_nif_arity = I[-1];
             ASSERT(bif_nif_arity <= 4);
 	    ERTS_SMP_UNREQ_PROC_MAIN_LOCK(c_p);
-	    reg[0] = r(0);
+	    ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 	    {
 		Eterm (*bf)(Process*, Eterm*, BeamInstr*) = vbf;
 		ASSERT(!ERTS_PROC_IS_EXITING(c_p));
+		live_hf_end = c_p->mbuf;
 		nif_bif_result = (*bf)(c_p, reg, I);
 		ASSERT(!ERTS_PROC_IS_EXITING(c_p) ||
 		       is_non_value(nif_bif_result));
 		ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 		PROCESS_MAIN_CHK_LOCKS(c_p);
 	    }
-
+            /* We have to update the cache if we are enabled in order
+               to make sure no book keeping is done after we disabled
+               msacc. We don't always do this as it is quite expensive. */
+            if (ERTS_MSACC_IS_ENABLED_CACHED_X())
+                ERTS_MSACC_UPDATE_CACHE_X();
+	    ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_EMULATOR);
 	    DTRACE_BIF_RETURN(c_p, (Eterm)I[-3], (Eterm)I[-2], (Uint)I[-1]);
 
 	apply_bif_or_nif_epilogue:
 	    ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
 	    ERTS_HOLE_CHECK(c_p);
-	    if (c_p->mbuf) {
-		nif_bif_result = erts_gc_after_bif_call(c_p, nif_bif_result,
-						  reg, bif_nif_arity);
+	    if (ERTS_IS_GC_DESIRED(c_p)) {
+		nif_bif_result = erts_gc_after_bif_call_lhf(c_p, live_hf_end,
+							    nif_bif_result,
+							    reg, bif_nif_arity);
 	    }
 	    SWAPIN;  /* There might have been a garbage collection. */
 	    FCALLS = c_p->fcalls;
@@ -3713,7 +3546,6 @@ do {								\
 		Goto(*I);
 	    } else if (c_p->freason == TRAP) {
 		SET_I(c_p->i);
-		r(0) = reg[0];
 		if (c_p->flags & F_HIBERNATE_SCHED) {
 		    c_p->flags &= ~F_HIBERNATE_SCHED;
 		    goto do_schedule;
@@ -3735,21 +3567,21 @@ do {								\
 	StoreBifResult(1, result);
     }
 
+ OpCase(i_get_hash_cId):
+    {
+	Eterm arg;
+	Eterm result;
+
+	GetArg1(0, arg);
+	result = erts_pd_hash_get_with_hx(c_p, Arg(1), arg);
+	StoreBifResult(2, result);
+    }
+
     {
 	Eterm case_end_val;
 
     OpCase(case_end_x):
 	case_end_val = xb(Arg(0));
-	goto do_case_end;
-
-    OpCase(case_end_y):
-	case_end_val = yb(Arg(0));
-	goto do_case_end;
-
-    OpCase(case_end_r):
-	case_end_val = r(0);
-
-    do_case_end:
 	c_p->fvalue = case_end_val;
 	c_p->freason = EXC_CASE_CLAUSE;
 	goto find_func_info;
@@ -3797,19 +3629,13 @@ do {								\
 	 goto do_bs_init_bits_known;
      }
 
-     OpCase(i_bs_init_bits_fail_heap_IjId): {
-	 /* tmp_arg1 was fetched by an i_fetch instruction */
-	 num_bits_term = tmp_arg1;
-	 alloc = Arg(0);
-	 I++;
+     OpCase(i_bs_init_bits_fail_heap_sIjId): {
+	 GetArg1(0, num_bits_term);
+	 alloc = Arg(1);
+	 I += 2;
 	 goto do_bs_init_bits;
      }
 
-     OpCase(i_bs_init_bits_fail_rjId): {
-	 num_bits_term = r(0);
-	 alloc = 0;
-	 goto do_bs_init_bits;
-     }
      OpCase(i_bs_init_bits_fail_yjId): {
 	 num_bits_term = yb(Arg(0));
 	 I++;
@@ -3929,52 +3755,48 @@ do {								\
  }
 
  {
-     OpCase(i_bs_init_fail_heap_IjId): {
-	 /* tmp_arg1 was fetched by an i_fetch instruction */
-	 tmp_arg2 = Arg(0);
-	 I++;
-	 goto do_bs_init;
-     }
+     Eterm BsOp1, BsOp2;
 
-     OpCase(i_bs_init_fail_rjId): {
-	 tmp_arg1 = r(0);
-	 tmp_arg2 = 0;
+     OpCase(i_bs_init_fail_heap_sIjId): {
+	 GetArg1(0, BsOp1);
+	 BsOp2 = Arg(1);
+	 I += 2;
 	 goto do_bs_init;
      }
 
      OpCase(i_bs_init_fail_yjId): {
-	 tmp_arg1 = yb(Arg(0));
-	 tmp_arg2 = 0;
+	 BsOp1 = yb(Arg(0));
+	 BsOp2 = 0;
 	 I++;
 	 goto do_bs_init;
      }
 
      OpCase(i_bs_init_fail_xjId): {
-	 tmp_arg1 = xb(Arg(0));
-	 tmp_arg2 = 0;
+	 BsOp1 = xb(Arg(0));
+	 BsOp2 = 0;
 	 I++;
      }
 	 /* FALL THROUGH */
      do_bs_init:
-         if (is_small(tmp_arg1)) {
-	     Sint size = signed_val(tmp_arg1);
+         if (is_small(BsOp1)) {
+	     Sint size = signed_val(BsOp1);
 	     if (size < 0) {
 		 goto badarg;
 	     }
-	     tmp_arg1 = (Eterm) size;
+	     BsOp1 = (Eterm) size;
 	 } else {
 	     Uint bytes;
 
-	     if (!term_to_Uint(tmp_arg1, &bytes)) {
+	     if (!term_to_Uint(BsOp1, &bytes)) {
 		 c_p->freason = bytes;
 		 goto lb_Cl_error;
 	     }
 	     if ((bytes >> (8*sizeof(Uint)-3)) != 0) {
 		 goto system_limit;
 	     }
-	     tmp_arg1 = (Eterm) bytes;
+	     BsOp1 = (Eterm) bytes;
 	 }
-	 if (tmp_arg1 <= ERL_ONHEAP_BIN_LIMIT) {
+	 if (BsOp1 <= ERL_ONHEAP_BIN_LIMIT) {
 	     goto do_heap_bin_alloc;
 	 } else {
 	     goto do_proc_bin_alloc;
@@ -3982,15 +3804,15 @@ do {								\
 
 
      OpCase(i_bs_init_heap_IIId): {
-	 tmp_arg1 = Arg(0);
-	 tmp_arg2 = Arg(1);
+	 BsOp1 = Arg(0);
+	 BsOp2 = Arg(1);
 	 I++;
 	 goto do_proc_bin_alloc;
      }
 
      OpCase(i_bs_init_IId): {
-	 tmp_arg1 = Arg(0);
-	 tmp_arg2 = 0;
+	 BsOp1 = Arg(0);
+	 BsOp2 = 0;
      }
      /* FALL THROUGH */
      do_proc_bin_alloc: {
@@ -3999,13 +3821,13 @@ do {								\
 
 	 erts_bin_offset = 0;
 	 erts_writable_bin = 0;
-	 TestBinVHeap(tmp_arg1 / sizeof(Eterm), 
-	 	      tmp_arg2 + PROC_BIN_SIZE + ERL_SUB_BIN_SIZE, Arg(1));
+	 TestBinVHeap(BsOp1 / sizeof(Eterm),
+		      BsOp2 + PROC_BIN_SIZE + ERL_SUB_BIN_SIZE, Arg(1));
 
 	 /*
 	  * Allocate the binary struct itself.
 	  */
-	 bptr = erts_bin_nrml_alloc(tmp_arg1);
+	 bptr = erts_bin_nrml_alloc(BsOp1);
 	 erts_refc_init(&bptr->refc, 1);
 	 erts_current_bin = (byte *) bptr->orig_bytes;
 
@@ -4015,28 +3837,28 @@ do {								\
 	 pb = (ProcBin *) HTOP;
 	 HTOP += PROC_BIN_SIZE;
 	 pb->thing_word = HEADER_PROC_BIN;
-	 pb->size = tmp_arg1;
+	 pb->size = BsOp1;
 	 pb->next = MSO(c_p).first;
 	 MSO(c_p).first = (struct erl_off_heap_header*) pb;
 	 pb->val = bptr;
 	 pb->bytes = (byte*) bptr->orig_bytes;
 	 pb->flags = 0;
 	 
-	 OH_OVERHEAD(&(MSO(c_p)), tmp_arg1 / sizeof(Eterm));
+	 OH_OVERHEAD(&(MSO(c_p)), BsOp1 / sizeof(Eterm));
 
 	 StoreBifResult(2, make_binary(pb));
      }
 
      OpCase(i_bs_init_heap_bin_heap_IIId): {
-	 tmp_arg1 = Arg(0);
-	 tmp_arg2 = Arg(1);
+	 BsOp1 = Arg(0);
+	 BsOp2 = Arg(1);
 	 I++;
 	 goto do_heap_bin_alloc;
      }
 
      OpCase(i_bs_init_heap_bin_IId): {
-	 tmp_arg1 = Arg(0);
-	 tmp_arg2 = 0;
+	 BsOp1 = Arg(0);
+	 BsOp2 = 0;
      }
      /* Fall through */
      do_heap_bin_alloc:
@@ -4044,33 +3866,36 @@ do {								\
 	     ErlHeapBin* hb;
 	     Uint bin_need;
 
-	     bin_need = heap_bin_size(tmp_arg1);
+	     bin_need = heap_bin_size(BsOp1);
 	     erts_bin_offset = 0;
 	     erts_writable_bin = 0;
-	     TestHeap(bin_need+tmp_arg2+ERL_SUB_BIN_SIZE, Arg(1));
+	     TestHeap(bin_need+BsOp2+ERL_SUB_BIN_SIZE, Arg(1));
 	     hb = (ErlHeapBin *) HTOP;
 	     HTOP += bin_need;
-	     hb->thing_word = header_heap_bin(tmp_arg1);
-	     hb->size = tmp_arg1;
+	     hb->thing_word = header_heap_bin(BsOp1);
+	     hb->size = BsOp1;
 	     erts_current_bin = (byte *) hb->data;
-	     tmp_arg1 = make_binary(hb);
-	     StoreBifResult(2, tmp_arg1);
+	     BsOp1 = make_binary(hb);
+	     StoreBifResult(2, BsOp1);
 	 }
  }
 
- OpCase(i_bs_add_jId): {
-     Uint Unit = Arg(1);
-     if (is_both_small(tmp_arg1, tmp_arg2)) {
-	 Sint Arg1 = signed_val(tmp_arg1);
-	 Sint Arg2 = signed_val(tmp_arg2);
+ OpCase(bs_add_jssId): {
+     Eterm Op1, Op2;
+     Uint Unit = Arg(3);
+
+     GetArg2(1, Op1, Op2);
+     if (is_both_small(Op1, Op2)) {
+	 Sint Arg1 = signed_val(Op1);
+	 Sint Arg2 = signed_val(Op2);
 
 	 if (Arg1 >= 0 && Arg2 >= 0) {
-	     BsSafeMul(Arg2, Unit, goto system_limit, tmp_arg1);
-	     tmp_arg1 += Arg1;
+	     BsSafeMul(Arg2, Unit, goto system_limit, Op1);
+	     Op1 += Arg1;
 
 	 store_bs_add_result:
-	     if (MY_IS_SSMALL((Sint) tmp_arg1)) {
-		 tmp_arg1 = make_small(tmp_arg1);
+	     if (Op1 <= MAX_SMALL) {
+		 Op1 = make_small(Op1);
 	     } else {
 		 /*
 		  * May generate a heap fragment, but in this
@@ -4082,10 +3907,10 @@ do {								\
 		  * references (such as the heap).
 		  */
 		 SWAPOUT;
-		 tmp_arg1 = erts_make_integer(tmp_arg1, c_p);
+		 Op1 = erts_make_integer(Op1, c_p);
 		 HTOP = HEAP_TOP(c_p);
 	     }
-	     StoreBifResult(2, tmp_arg1);
+	     StoreBifResult(4, Op1);
 	 }
 	 goto badarg;
      } else {
@@ -4108,16 +3933,16 @@ do {								\
 	  * an Uint, the reason is SYSTEM_LIMIT.
 	  */
 
-	 if (!term_to_Uint(tmp_arg1, &a)) {
+	 if (!term_to_Uint(Op1, &a)) {
 	     if (a == BADARG) {
 		 goto badarg;
 	     }
-	     if (!term_to_Uint(tmp_arg2, &b)) {
+	     if (!term_to_Uint(Op2, &b)) {
 		 c_p->freason = b;
 		 goto lb_Cl_error;
 	     }
 	     goto system_limit;
-	 } else if (!term_to_Uint(tmp_arg2, &b)) {
+	 } else if (!term_to_Uint(Op2, &b)) {
 	     c_p->freason = b;
 	     goto lb_Cl_error;
 	 }
@@ -4127,8 +3952,8 @@ do {								\
 	  */
 	 
 	 BsSafeMul(b, Unit, goto system_limit, c);
-	 tmp_arg1 = a + c;
-	 if (tmp_arg1 < a) {
+	 Op1 = a + c;
+	 if (Op1 < a) {
 	     /*
 	      * If the result is less than one of the
 	      * arguments, there must have been an overflow.
@@ -4150,52 +3975,47 @@ do {								\
     }
 
  /*
-  * tmp_arg1 = Number of bytes to build
-  * tmp_arg2 = Source binary
-  * Operands: Fail ExtraHeap Live Unit Dst
+  * x(SCRATCH_X_REG);
+  * Operands: Fail ExtraHeap Live Unit Size Dst
   */
 
- OpCase(i_bs_append_jIIId): {
+ OpCase(i_bs_append_jIIIsd): {
      Uint live = Arg(2);
      Uint res;
+     Eterm Size;
 
-     SWAPOUT;
-     reg[0] = r(0);
-     reg[live] = tmp_arg2;
-     res = erts_bs_append(c_p, reg, live, tmp_arg1, Arg(1), Arg(3));
-     r(0) = reg[0];
-     SWAPIN;
+     GetArg1(4, Size);
+     HEAVY_SWAPOUT;
+     reg[live] = x(SCRATCH_X_REG);
+     res = erts_bs_append(c_p, reg, live, Size, Arg(1), Arg(3));
+     HEAVY_SWAPIN;
      if (is_non_value(res)) {
 	 /* c_p->freason is already set (may be either BADARG or SYSTEM_LIMIT). */
 	 goto lb_Cl_error;
      }
-     StoreBifResult(4, res);
+     StoreBifResult(5, res);
  }
 
  /*
-  * tmp_arg1 = Number of bytes to build
-  * tmp_arg2 = Source binary
-  * Operands: Fail Unit Dst
+  * Operands: Fail Size Src Unit Dst
   */
- OpCase(i_bs_private_append_jId): {
+ OpCase(i_bs_private_append_jIssd): {
      Eterm res;
+     Eterm Size, Src;
 
-     res = erts_bs_private_append(c_p, tmp_arg2, tmp_arg1, Arg(1));
+     GetArg2(2, Size, Src);
+     res = erts_bs_private_append(c_p, Src, Size, Arg(1));
      if (is_non_value(res)) {
 	 /* c_p->freason is already set (may be either BADARG or SYSTEM_LIMIT). */
 	 goto lb_Cl_error;
      }
-     StoreBifResult(2, res);
+     StoreBifResult(4, res);
  }
 
- /*
-  * tmp_arg1 = Initial size of writable binary
-  * Operands: Live Dst
-  */
  OpCase(bs_init_writable): {
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      r(0) = erts_bs_init_writable(c_p, r(0));
-     SWAPIN;
+     HEAVY_SWAPIN;
      Next(0);
  }
 
@@ -4252,7 +4072,7 @@ do {								\
      StoreBifResult(1, result);
  }
 
- OpCase(i_bs_put_utf16_jIs): {
+ OpCase(bs_put_utf16_jIs): {
      Eterm arg;
 
      GetArg1(2, arg);
@@ -4286,26 +4106,29 @@ do {								\
 
  /*
   * Only used for validating a value matched out. 
-  *
-  * tmp_arg1 = Integer to validate
-  * tmp_arg2 = Match context
   */
- OpCase(i_bs_validate_unicode_retract_j): {
-     /*
-      * There is no need to untag the integer, but it IS necessary
-      * to make sure it is small (a bignum pointer could fall in
-      * the valid range).
-      */
-     if (is_not_small(tmp_arg1) || tmp_arg1 > make_small(0x10FFFFUL) ||
-	 (make_small(0xD800UL) <= tmp_arg1 &&
-	  tmp_arg1 <= make_small(0xDFFFUL))) {
-	 ErlBinMatchBuffer *mb = ms_matchbuffer(tmp_arg2);
+ OpCase(i_bs_validate_unicode_retract_jss): {
+	Eterm i; 		/* Integer to validate */
 
-	 mb->offset -= 32;
-	 goto badarg;
-     }
-     Next(1);
- }
+	/*
+	 * There is no need to untag the integer, but it IS necessary
+	 * to make sure it is small (a bignum pointer could fall in
+	 * the valid range).
+	 */
+
+	GetArg1(1, i);
+	if (is_not_small(i) || i > make_small(0x10FFFFUL) ||
+	    (make_small(0xD800UL) <= i && i <= make_small(0xDFFFUL))) {
+	    Eterm ms;		/* Match context */
+	    ErlBinMatchBuffer* mb;
+
+	    GetArg1(2, ms);
+	    mb = ms_matchbuffer(ms);
+	    mb->offset -= 32;
+	    goto badarg;
+	}
+	Next(3);
+    }
 
  /*
   * Matching of binaries.
@@ -4317,9 +4140,6 @@ do {								\
      Uint slots;
      Eterm context;
 
-     OpCase(i_bs_start_match2_rfIId): {
-	 context = r(0);
-
      do_start_match:
 	 slots = Arg(2);
 	 if (!is_boxed(context)) {
@@ -4366,7 +4186,7 @@ do {								\
 	     ClauseFail();
 	 }
 	 NextPF(4, next);
-     }
+
      OpCase(i_bs_start_match2_xfIId): {
 	 context = xb(Arg(0));
 	 I++;
@@ -4379,18 +4199,6 @@ do {								\
      }
  }
 
- OpCase(bs_test_zero_tail2_fr): {
-     BeamInstr *next;
-     ErlBinMatchBuffer *_mb;
-     
-     PreFetch(1, next);
-     _mb = (ErlBinMatchBuffer*) ms_matchbuffer(r(0));
-     if (_mb->size != _mb->offset) {
-	 ClauseFail();
-     }
-     NextPF(1, next);
- }
-
  OpCase(bs_test_zero_tail2_fx): {
      BeamInstr *next;
      ErlBinMatchBuffer *_mb;
@@ -4403,16 +4211,6 @@ do {								\
      NextPF(2, next);
  }
 
- OpCase(bs_test_tail_imm2_frI): {
-     BeamInstr *next;
-     ErlBinMatchBuffer *_mb;
-     PreFetch(2, next);
-     _mb = ms_matchbuffer(r(0));
-     if (_mb->size - _mb->offset != Arg(1)) {
-	 ClauseFail();
-     }
-     NextPF(2, next);
- }
  OpCase(bs_test_tail_imm2_fxI): {
      BeamInstr *next;
      ErlBinMatchBuffer *_mb;
@@ -4424,16 +4222,6 @@ do {								\
      NextPF(3, next);
  }
 
- OpCase(bs_test_unit_frI): {
-     BeamInstr *next;
-     ErlBinMatchBuffer *_mb;
-     PreFetch(2, next);
-     _mb = ms_matchbuffer(r(0));
-     if ((_mb->size - _mb->offset) % Arg(1)) {
-	 ClauseFail();
-     }
-     NextPF(2, next);
- }
  OpCase(bs_test_unit_fxI): {
      BeamInstr *next;
      ErlBinMatchBuffer *_mb;
@@ -4445,16 +4233,6 @@ do {								\
      NextPF(3, next);
  }
 
- OpCase(bs_test_unit8_fr): {
-     BeamInstr *next;
-     ErlBinMatchBuffer *_mb;
-     PreFetch(1, next);
-     _mb = ms_matchbuffer(r(0));
-     if ((_mb->size - _mb->offset) & 7) {
-	 ClauseFail();
-     }
-     NextPF(1, next);
- }
  OpCase(bs_test_unit8_fx): {
      BeamInstr *next;
      ErlBinMatchBuffer *_mb;
@@ -4469,19 +4247,11 @@ do {								\
  {
      Eterm bs_get_integer8_context;
 
- OpCase(i_bs_get_integer_8_rfd): {
-	 bs_get_integer8_context = r(0);
-	 goto do_bs_get_integer_8;
-     }
-
  OpCase(i_bs_get_integer_8_xfd): {
-	 bs_get_integer8_context = xb(Arg(0));
-	 I++;
-     }
-
- do_bs_get_integer_8: {
 	 ErlBinMatchBuffer *_mb;
 	 Eterm _result;
+	 bs_get_integer8_context = xb(Arg(0));
+	 I++;
 	 _mb = ms_matchbuffer(bs_get_integer8_context);
 	 if (_mb->size - _mb->offset < 8) {
 	     ClauseFail();
@@ -4499,15 +4269,10 @@ do {								\
  {
      Eterm bs_get_integer_16_context;
 
- OpCase(i_bs_get_integer_16_rfd):
-     bs_get_integer_16_context = r(0);
-     goto do_bs_get_integer_16;
-
  OpCase(i_bs_get_integer_16_xfd):
      bs_get_integer_16_context = xb(Arg(0));
      I++;
 
- do_bs_get_integer_16:
      {
 	 ErlBinMatchBuffer *_mb;
 	 Eterm _result;
@@ -4528,17 +4293,10 @@ do {								\
  {
      Eterm bs_get_integer_32_context;
 
- OpCase(i_bs_get_integer_32_rfId):
-     bs_get_integer_32_context = r(0);
-     goto do_bs_get_integer_32;
-
-     
  OpCase(i_bs_get_integer_32_xfId):
      bs_get_integer_32_context = xb(Arg(0));
      I++;
 
-
- do_bs_get_integer_32:
      {
 	 ErlBinMatchBuffer *_mb;
 	 Uint32 _integer;
@@ -4551,11 +4309,11 @@ do {								\
 	     _integer = get_int32(_mb->base + _mb->offset/8);
 	 }
 	 _mb->offset += 32;
-#if !defined(ARCH_64) || HALFWORD_HEAP
+#if !defined(ARCH_64)
 	 if (IS_USMALL(0, _integer)) {
 #endif
 	     _result = make_small(_integer);
-#if !defined(ARCH_64) || HALFWORD_HEAP
+#if !defined(ARCH_64)
 	 } else {
 	     TestHeap(BIG_UINT_HEAP_SIZE, Arg(1));
 	     _result = uint_to_big((Uint) _integer, HTOP);
@@ -4567,103 +4325,82 @@ do {								\
      }
  }
 
- /* Operands: Size Live Fail Flags Dst */
- OpCase(i_bs_get_integer_imm_rIIfId): {
-     tmp_arg1 = r(0);
-     /* Operands: Size Live Fail Flags Dst */
-     goto do_bs_get_integer_imm_test_heap;
- }
+ {
+     Eterm Ms, Sz;
 
- /* Operands: x(Reg) Size Live Fail Flags Dst */
+     /* Operands: x(Reg) Size Live Fail Flags Dst */
  OpCase(i_bs_get_integer_imm_xIIfId): {
-     tmp_arg1 = xb(Arg(0));
-     I++;
-     /* Operands: Size Live Fail Flags Dst */
-     goto do_bs_get_integer_imm_test_heap;
- }
-
- /*
-  * tmp_arg1 = match context
-  * Operands: Size Live Fail Flags Dst
-  */
- do_bs_get_integer_imm_test_heap: {
-     Uint wordsneeded;
-     tmp_arg2 = Arg(0);
-     wordsneeded = 1+WSIZE(NBYTES(tmp_arg2));
-     TestHeapPreserve(wordsneeded, Arg(1), tmp_arg1);
-     I += 2;
-     /* Operands: Fail Flags Dst */
-     goto do_bs_get_integer_imm;
- }
-
- /* Operands: Size Fail Flags Dst */
- OpCase(i_bs_get_integer_small_imm_rIfId): {
-     tmp_arg1 = r(0);
-     tmp_arg2 = Arg(0);
-     I++;
-     /* Operands: Fail Flags Dst */
-     goto do_bs_get_integer_imm;
- }
+	 Uint wordsneeded;
+	 Ms = xb(Arg(0));
+	 Sz = Arg(1);
+	 wordsneeded = 1+WSIZE(NBYTES(Sz));
+	 TestHeapPreserve(wordsneeded, Arg(2), Ms);
+	 I += 3;
+	 /* Operands: Fail Flags Dst */
+	 goto do_bs_get_integer_imm;
+     }
 
- /* Operands: x(Reg) Size Fail Flags Dst */
+     /* Operands: x(Reg) Size Fail Flags Dst */
  OpCase(i_bs_get_integer_small_imm_xIfId): {
-     tmp_arg1 = xb(Arg(0));
-     tmp_arg2 = Arg(1);
-     I += 2;
-     /* Operands: Fail Flags Dst */
-     goto do_bs_get_integer_imm;
- }
+	 Ms = xb(Arg(0));
+	 Sz = Arg(1);
+	 I += 2;
+	 /* Operands: Fail Flags Dst */
+	 goto do_bs_get_integer_imm;
+     }
  
- /*
-  * tmp_arg1 = match context
-  * tmp_arg2 = size of field
-  * Operands: Fail Flags Dst
-  */
+     /*
+      * Ms = match context
+      * Sz = size of field
+      * Operands: Fail Flags Dst
+      */
  do_bs_get_integer_imm: {
-     ErlBinMatchBuffer* mb;
-     Eterm result;
+	 ErlBinMatchBuffer* mb;
+	 Eterm result;
 
-     mb = ms_matchbuffer(tmp_arg1);
-     LIGHT_SWAPOUT;
-     result = erts_bs_get_integer_2(c_p, tmp_arg2, Arg(1), mb);
-     LIGHT_SWAPIN;
-     HEAP_SPACE_VERIFIED(0);
-     if (is_non_value(result)) {
-	 ClauseFail();
+	 mb = ms_matchbuffer(Ms);
+	 LIGHT_SWAPOUT;
+	 result = erts_bs_get_integer_2(c_p, Sz, Arg(1), mb);
+	 LIGHT_SWAPIN;
+	 HEAP_SPACE_VERIFIED(0);
+	 if (is_non_value(result)) {
+	     ClauseFail();
+	 }
+	 StoreBifResult(2, result);
      }
-     StoreBifResult(2, result);
  }
 
  /*
-  * tmp_arg1 = Match context
-  * tmp_arg2 = Size field
-  * Operands: Fail Live FlagsAndUnit Dst
+  * Operands: Fail Live FlagsAndUnit Ms Sz Dst
   */
- OpCase(i_bs_get_integer_fIId): {
+ OpCase(i_bs_get_integer_fIIssd): {
      Uint flags;
      Uint size;
+     Eterm Ms;
+     Eterm Sz;
      ErlBinMatchBuffer* mb;
      Eterm result;
 
      flags = Arg(2);
-     BsGetFieldSize(tmp_arg2, (flags >> 3), ClauseFail(), size);
+     GetArg2(3, Ms, Sz);
+     BsGetFieldSize(Sz, (flags >> 3), ClauseFail(), size);
      if (size >= SMALL_BITS) {
 	 Uint wordsneeded;
-	 /* check bits size before potential gc.
+	 /* Check bits size before potential gc.
 	  * We do not want a gc and then realize we don't need
-	  * the allocated space (i.e. if the op fails)
+	  * the allocated space (i.e. if the op fails).
 	  *
-	  * remember to reacquire the matchbuffer after gc.
+	  * Remember to re-acquire the matchbuffer after gc.
 	  */
 
-	 mb = ms_matchbuffer(tmp_arg1);
+	 mb = ms_matchbuffer(Ms);
 	 if (mb->size - mb->offset < size) {
 	     ClauseFail();
 	 }
 	 wordsneeded = 1+WSIZE(NBYTES((Uint) size));
-	 TestHeapPreserve(wordsneeded, Arg(1), tmp_arg1);
+	 TestHeapPreserve(wordsneeded, Arg(1), Ms);
      }
-     mb = ms_matchbuffer(tmp_arg1);
+     mb = ms_matchbuffer(Ms);
      LIGHT_SWAPOUT;
      result = erts_bs_get_integer_2(c_p, size, flags, mb);
      LIGHT_SWAPIN;
@@ -4671,18 +4408,13 @@ do {								\
      if (is_non_value(result)) {
 	 ClauseFail();
      }
-     StoreBifResult(3, result);
+     StoreBifResult(5, result);
  }
 
  {
      Eterm get_utf8_context;
 
      /* Operands: MatchContext Fail Dst */
- OpCase(i_bs_get_utf8_rfd): {
-	 get_utf8_context = r(0);
-	 goto do_bs_get_utf8;
-     }
-
  OpCase(i_bs_get_utf8_xfd): {
 	 get_utf8_context = xb(Arg(0));
 	 I++;
@@ -4693,7 +4425,7 @@ do {								\
       * Operands: Fail Dst
       */
 
- do_bs_get_utf8: {
+     {
 	 Eterm result = erts_bs_get_utf8(ms_matchbuffer(get_utf8_context));
 	 if (is_non_value(result)) {
 	     ClauseFail();
@@ -4706,12 +4438,7 @@ do {								\
      Eterm get_utf16_context;
 
      /* Operands: MatchContext Fail Flags Dst */
- OpCase(i_bs_get_utf16_rfId): {
-	 get_utf16_context = r(0);
-	 goto do_bs_get_utf16;
-     }
-
- OpCase(i_bs_get_utf16_xfId): {
+     OpCase(i_bs_get_utf16_xfId): {
 	 get_utf16_context = xb(Arg(0));
 	 I++;
      }
@@ -4720,7 +4447,7 @@ do {								\
       * get_utf16_context = match_context
       * Operands: Fail Flags Dst
       */
- do_bs_get_utf16: {
+     {
 	 Eterm result = erts_bs_get_utf16(ms_matchbuffer(get_utf16_context),
 					  Arg(1));
 	 if (is_non_value(result)) {
@@ -4739,26 +4466,10 @@ do {								\
      Uint orig;
      Uint hole_size;
 
-     OpCase(bs_context_to_binary_r): {
-	 context_to_binary_context = x0;
-	 I -= 2;
-	 goto do_context_to_binary;
-     }
-
-     /* Unfortunately, inlining can generate this instruction. */
-     OpCase(bs_context_to_binary_y): {
-	 context_to_binary_context = yb(Arg(0));
-	 goto do_context_to_binary0;
-     }
-
-     OpCase(bs_context_to_binary_x): {
+     OpCase(bs_context_to_binary_x):
 	 context_to_binary_context = xb(Arg(0));
-     
-     do_context_to_binary0:
 	 I--;
-     }
 
- do_context_to_binary:
      if (is_boxed(context_to_binary_context) &&
 	 header_is_bin_matchstate(*boxed_val(context_to_binary_context))) {
 	 ErlBinMatchState* ms;
@@ -4770,17 +4481,11 @@ do {								\
      }
      Next(2);
 
-     OpCase(i_bs_get_binary_all_reuse_rfI): {
-	 context_to_binary_context = x0;
-	 goto do_bs_get_binary_all_reuse;
-     }
-
      OpCase(i_bs_get_binary_all_reuse_xfI): {
 	 context_to_binary_context = xb(Arg(0));
 	 I++;
      }
 
- do_bs_get_binary_all_reuse:
      mb = ms_matchbuffer(context_to_binary_context);
      size = mb->size - mb->offset;
      if (size % Arg(1) != 0) {
@@ -4808,16 +4513,11 @@ do {								\
  {
      Eterm match_string_context;
 
-     OpCase(i_bs_match_string_rfII): {
-	 match_string_context = r(0);
-	 goto do_bs_match_string;
-     }
      OpCase(i_bs_match_string_xfII): {
 	 match_string_context = xb(Arg(0));
 	 I++;
      }
 
- do_bs_match_string:
      {
 	 BeamInstr *next;
 	 byte* bytes;
@@ -4845,14 +4545,6 @@ do {								\
      }
  }
 
- OpCase(i_bs_save2_rI): {
-     BeamInstr *next;
-     ErlBinMatchState *_ms;
-     PreFetch(1, next);
-     _ms = (ErlBinMatchState*) boxed_val((Eterm) r(0));
-     _ms->save_offset[Arg(0)] = _ms->mb.offset;
-     NextPF(1, next);
- }
  OpCase(i_bs_save2_xI): {
      BeamInstr *next;
      ErlBinMatchState *_ms;
@@ -4862,14 +4554,6 @@ do {								\
      NextPF(2, next);
  }
 
- OpCase(i_bs_restore2_rI): {
-     BeamInstr *next;
-     ErlBinMatchState *_ms;
-     PreFetch(1, next);
-     _ms = (ErlBinMatchState*) boxed_val((Eterm) r(0));
-     _ms->mb.offset = _ms->save_offset[Arg(0)];
-     NextPF(1, next);
- }
  OpCase(i_bs_restore2_xI): {
      BeamInstr *next;
      ErlBinMatchState *_ms;
@@ -4917,9 +4601,7 @@ do {								\
      BeamInstr real_I;
      ASSERT(I[-5] == (BeamInstr) BeamOp(op_i_func_info_IaaI));
      SWAPOUT;
-     reg[0] = r(0);
      real_I = erts_generic_breakpoint(c_p, I, reg);
-     r(0) = reg[0];
      SWAPIN;
      ASSERT(VALID_INSTR(real_I));
      Goto(real_I);
@@ -4979,7 +4661,7 @@ do {								\
      BeamInstr *next;
 
      PreFetch(2, next);
-     GetR(0, targ1);
+     targ1 = REG_TARGET(Arg(0));
      /* Arg(0) == HEADER_FLONUM */
      GET_DOUBLE(targ1, *(FloatDef*)ADD_BYTE_OFFSET(freg, fr));
      NextPF(2, next);
@@ -4999,7 +4681,7 @@ do {								\
      Eterm fr = Arg(1);
      BeamInstr *next;
 
-     GetR(0, targ1);
+     targ1 = REG_TARGET(Arg(0));
      PreFetch(2, next);
      if (is_small(targ1)) {
 	 fb(fr) = (double) signed_val(targ1);
@@ -5018,7 +4700,7 @@ do {								\
 #ifdef NO_FPE_SIGNALS
      OpCase(fclearerror):
      OpCase(i_fcheckerror):
-	 erl_exit(1, "fclearerror/i_fcheckerror without fpe signals (beam_emu)");
+	 erts_exit(ERTS_ERROR_EXIT, "fclearerror/i_fcheckerror without fpe signals (beam_emu)");
 #  define ERTS_NO_FPE_CHECK_INIT ERTS_FP_CHECK_INIT
 #  define ERTS_NO_FPE_ERROR ERTS_FP_ERROR
 #else
@@ -5095,7 +4777,12 @@ do {								\
 
 #ifdef HIPE
  {
-     unsigned cmd;
+#define HIPE_MODE_SWITCH(Cmd)			\
+     SWAPOUT;					\
+     c_p->fcalls = FCALLS;			\
+     c_p->def_arg_reg[4] = -neg_o_reds;		\
+     c_p = hipe_mode_switch(c_p, Cmd, reg);     \
+     goto L_post_hipe_mode_switch
 
      OpCase(hipe_trap_call): {
 	 /*
@@ -5109,52 +4796,45 @@ do {								\
 	  */
 	 ASSERT(I[-5] == (Uint) OpCode(i_func_info_IaaI));
 	 c_p->hipe.u.ncallee = (void(*)(void)) I[-4];
-	 cmd = HIPE_MODE_SWITCH_CMD_CALL | (I[-1] << 8);
 	 ++hipe_trap_count;
-	 goto L_hipe_mode_switch;
+	 HIPE_MODE_SWITCH(HIPE_MODE_SWITCH_CMD_CALL | (I[-1] << 8));
      }
      OpCase(hipe_trap_call_closure): {
        ASSERT(I[-5] == (Uint) OpCode(i_func_info_IaaI));
        c_p->hipe.u.ncallee = (void(*)(void)) I[-4];
-       cmd = HIPE_MODE_SWITCH_CMD_CALL_CLOSURE | (I[-1] << 8);
        ++hipe_trap_count;
-       goto L_hipe_mode_switch;
+       HIPE_MODE_SWITCH(HIPE_MODE_SWITCH_CMD_CALL_CLOSURE | (I[-1] << 8));
      }
      OpCase(hipe_trap_return): {
-	 cmd = HIPE_MODE_SWITCH_CMD_RETURN;
-	 goto L_hipe_mode_switch;
+	 HIPE_MODE_SWITCH(HIPE_MODE_SWITCH_CMD_RETURN);
      }
      OpCase(hipe_trap_throw): {
-	 cmd = HIPE_MODE_SWITCH_CMD_THROW;
-	 goto L_hipe_mode_switch;
+	 HIPE_MODE_SWITCH(HIPE_MODE_SWITCH_CMD_THROW);
      }
      OpCase(hipe_trap_resume): {
-	 cmd = HIPE_MODE_SWITCH_CMD_RESUME;
-	 goto L_hipe_mode_switch;
+	 HIPE_MODE_SWITCH(HIPE_MODE_SWITCH_CMD_RESUME);
      }
- L_hipe_mode_switch:
-     /* XXX: this abuse of def_arg_reg[] is horrid! */
-     SWAPOUT;
-     c_p->fcalls = FCALLS;
-     c_p->def_arg_reg[4] = -neg_o_reds;
-     reg[0] = r(0);
-     c_p = hipe_mode_switch(c_p, cmd, reg);
+#undef HIPE_MODE_SWITCH
+
+ L_post_hipe_mode_switch:
      reg = ERTS_PROC_GET_SCHDATA(c_p)->x_reg_array;
      freg = ERTS_PROC_GET_SCHDATA(c_p)->f_reg_array;
      ERL_BITS_RELOAD_STATEP(c_p);
+     /* XXX: this abuse of def_arg_reg[] is horrid! */
      neg_o_reds = -c_p->def_arg_reg[4];
      FCALLS = c_p->fcalls;
      SWAPIN;
-     switch( c_p->def_arg_reg[3] ) { /* Halfword wont work with hipe yet! */
+     switch( c_p->def_arg_reg[3] ) {
        case HIPE_MODE_SWITCH_RES_RETURN:
 	 ASSERT(is_value(reg[0]));
-	 MoveReturn(reg[0], r(0));
+	 SET_I(c_p->cp);
+	 c_p->cp = 0;
+	 Goto(*I);
        case HIPE_MODE_SWITCH_RES_CALL_EXPORTED:
 	 c_p->i = c_p->hipe.u.callee_exp->addressv[erts_active_code_ix()];
 	 /*fall through*/
        case HIPE_MODE_SWITCH_RES_CALL_BEAM:
 	 SET_I(c_p->i);
-	 r(0) = reg[0];
 	 Dispatch();
        case HIPE_MODE_SWITCH_RES_CALL_CLOSURE:
 	 /* This can be used to call any function value, but currently it's
@@ -5163,9 +4843,8 @@ do {								\
 	     BeamInstr *next;
 
 	     next = call_fun(c_p, c_p->arity - 1, reg, THE_NON_VALUE);
-	     SWAPIN;
+	     HEAVY_SWAPIN;
 	     if (next != NULL) {
-		 r(0) = reg[0];
 		 SET_I(next);
 		 Dispatchfun();
 	     }
@@ -5176,7 +4855,7 @@ do {								\
 	 I = handle_error(c_p, I, reg, NULL);
 	 goto post_error_handling;
        default:
-	 erl_exit(1, "hipe_mode_switch: result %u\n", c_p->def_arg_reg[3]);
+	 erts_exit(ERTS_ERROR_EXIT, "hipe_mode_switch: result %u\n", c_p->def_arg_reg[3]);
      }
  }
  OpCase(hipe_call_count): {
@@ -5213,22 +4892,54 @@ do {								\
  }
 
  OpCase(i_hibernate): {
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      if (erts_hibernate(c_p, r(0), x(1), x(2), reg)) {
+	 FCALLS = c_p->fcalls;
 	 c_p->flags &= ~F_HIBERNATE_SCHED;
 	 goto do_schedule;
      } else {
+	 HEAVY_SWAPIN;
 	 I = handle_error(c_p, I, reg, hibernate_3);
 	 goto post_error_handling;
      }
  }
 
+ /* This is optimised as an instruction because
+    it has to be very very fast */
+ OpCase(i_perf_counter): {
+    BeamInstr* next;
+    ErtsSysPerfCounter ts;
+    PreFetch(0, next);
+
+    ts = erts_sys_perf_counter();
+
+    if (IS_SSMALL(ts)) {
+        r(0) = make_small((Sint)ts);
+    } else {
+        TestHeap(ERTS_SINT64_HEAP_SIZE(ts),0);
+        r(0) = make_big(HTOP);
+#if defined(ARCH_32) || HALFWORD_HEAP
+        if (ts >= (((Uint64) 1) << 32)) {
+            *HTOP = make_pos_bignum_header(2);
+            BIG_DIGIT(HTOP, 0) = (Uint) (ts & ((Uint) 0xffffffff));
+            BIG_DIGIT(HTOP, 1) = (Uint) ((ts >> 32) & ((Uint) 0xffffffff));
+            HTOP += 3;
+        }
+        else
+#endif
+        {
+                *HTOP = make_pos_bignum_header(1);
+                BIG_DIGIT(HTOP, 0) = (Uint) ts;
+                HTOP += 2;
+        }
+    }
+    NextPF(0, next);
+ }
+
  OpCase(i_debug_breakpoint): {
-     SWAPOUT;
-     reg[0] = r(0);
+     HEAVY_SWAPOUT;
      I = call_error_handler(c_p, I-3, reg, am_breakpoint);
-     r(0) = reg[0];
-     SWAPIN;
+     HEAVY_SWAPIN;
      if (I) {
 	 Goto(*I);
      }
@@ -5256,7 +4967,7 @@ do {								\
  OpCase(label_L):
  OpCase(on_load):
  OpCase(line_I):
-    erl_exit(1, "meta op\n");
+    erts_exit(ERTS_ERROR_EXIT, "meta op\n");
 
     /*
      * One-time initialization of Beam emulator.
@@ -5310,7 +5021,7 @@ do {								\
  }
 #ifdef NO_JUMP_TABLE
  default:
-    erl_exit(1, "unexpected op code %d\n",Go);
+    erts_exit(ERTS_ERROR_EXIT, "unexpected op code %d\n",Go);
   }
 #endif
     return;			/* Never executed */
@@ -5355,7 +5066,7 @@ translate_gc_bif(void* gcf)
     } else if (gcf == erts_gc_binary_part_3) {
 	return binary_part_3;
     } else {
-	erl_exit(1, "bad gc bif");
+	erts_exit(ERTS_ERROR_EXIT, "bad gc bif");
     }
 }
 
@@ -5420,7 +5131,7 @@ handle_error(Process* c_p, BeamInstr* pc, Eterm* reg, BifFunction bf)
     Eterm* hp;
     Eterm Value = c_p->fvalue;
     Eterm Args = am_true;
-    c_p->i = pc;    /* In case we call erl_exit(). */
+    c_p->i = pc;    /* In case we call erts_exit(). */
 
     ASSERT(c_p->freason != TRAP); /* Should have been handled earlier. */
 
@@ -5484,7 +5195,7 @@ handle_error(Process* c_p, BeamInstr* pc, Eterm* reg, BifFunction bf)
 	    c_p->cp = 0;	/* To avoid keeping stale references. */
 	    return new_pc;
 	}
-	if (c_p->catches > 0) erl_exit(1, "Catch not found");
+	if (c_p->catches > 0) erts_exit(ERTS_ERROR_EXIT, "Catch not found");
     }
     ERTS_SMP_UNREQ_PROC_MAIN_LOCK(c_p);
     terminate_proc(c_p, Value);
@@ -6439,7 +6150,7 @@ call_fun(Process* p,		/* Current process. */
 		 */
 		module = fe->module;
 		if ((modp = erts_get_module(module, code_ix)) != NULL
-		    && modp->curr.code != NULL) {
+		    && modp->curr.code_hdr != NULL) {
 		    /*
 		     * There is a module loaded, but obviously the fun is not
 		     * defined in it. We must not call the error_handler
@@ -6644,23 +6355,20 @@ static Eterm get_map_element_hash(Eterm map, Eterm key, Uint32 hx)
     return vs ? *vs : THE_NON_VALUE;
 }
 
-#define GET_TERM(term, dest)					\
-do {								\
-    Eterm src = (Eterm)(term);					\
-    switch (src & _TAG_IMMED1_MASK) {				\
-    case (R_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER:	\
-	dest = x(0);						\
-	break;							\
-    case (X_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER:	\
-	dest = x(src >> _TAG_IMMED1_SIZE);			\
-	break;							\
-    case (Y_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER:	\
-	dest = y(src >> _TAG_IMMED1_SIZE);			\
-	break;							\
-    default:							\
-	dest = src;						\
-	break;							\
-    }								\
+#define GET_TERM(term, dest)			\
+do {						\
+    Eterm src = (Eterm)(term);			\
+    switch (loader_tag(src)) {			\
+    case LOADER_X_REG:				\
+        dest = x(loader_x_reg_index(src));	\
+	break;					\
+    case LOADER_Y_REG:				\
+        dest = y(loader_y_reg_index(src));	\
+	break;					\
+    default:					\
+	dest = src;				\
+	break;					\
+    }						\
 } while(0)
 
 
@@ -6699,13 +6407,6 @@ new_map(Process* p, Eterm* reg, BeamInstr* I)
         erts_factory_proc_init(&factory, p);
         res = erts_hashmap_from_array(&factory, thp, n/2, 0);
         erts_factory_close(&factory);
-        if (p->mbuf) {
-            Uint live = Arg(2);
-            reg[live] = res;
-            erts_garbage_collect(p, 0, reg, live+1);
-            res       = reg[live];
-            E = p->stop;
-        }
         return res;
     }
 
@@ -6771,13 +6472,6 @@ update_map_assoc(Process* p, Eterm* reg, Eterm map, BeamInstr* I)
 	    hx = hashmap_make_hash(new_key);
 
 	    res = erts_hashmap_insert(p, hx, new_key, val, res,  0);
-	    if (p->mbuf) {
-		Uint live = Arg(3);
-		reg[live] = res;
-		erts_garbage_collect(p, 0, reg, live+1);
-		res       = reg[live];
-		E = p->stop;
-	    }
 
 	    new_p += 2;
 	}
@@ -6937,12 +6631,6 @@ update_map_assoc(Process* p, Eterm* reg, Eterm map, BeamInstr* I)
     /* The expensive case, need to build a hashmap */
     if (n > MAP_SMALL_MAP_LIMIT) {
 	res = erts_hashmap_from_ks_and_vs(p,flatmap_get_keys(mp),flatmap_get_values(mp),n);
-	if (p->mbuf) {
-	    Uint live = Arg(3);
-	    reg[live] = res;
-	    erts_garbage_collect(p, 0, reg, live+1);
-	    res       = reg[live];
-	}
     }
     return res;
 }
@@ -6998,14 +6686,6 @@ update_map_exact(Process* p, Eterm* reg, Eterm map, BeamInstr* I)
 		return res;
 	    }
 
-	    if (p->mbuf) {
-		Uint live = Arg(3);
-		reg[live] = res;
-		erts_garbage_collect(p, 0, reg, live+1);
-		res       = reg[live];
-		E = p->stop;
-	    }
-
 	    new_p += 2;
 	}
 	return res;
@@ -7114,6 +6794,15 @@ erts_is_builtin(Eterm Mod, Eterm Name, int arity)
     Export e;
     Export* ep;
 
+    if (Mod == am_erlang && Name == am_apply && arity == 3) {
+	/*
+	 * Special case. apply/3 is built-in (implemented in C),
+	 * but implemented in a different way than all other
+	 * BIFs.
+	 */
+	return 1;
+    }
+
     e.code[0] = Mod;
     e.code[1] = Name;
     e.code[2] = arity;
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index b70e5b9a2d..a98900460e 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -80,7 +80,7 @@ ErlDrvBinary* erts_gzinflate_buffer(char*, int);
 
 typedef struct {
     Uint value;			/* Value of label (NULL if not known yet). */
-    Uint patches;		/* Index (into code buffer) to first location
+    Sint patches;		/* Index (into code buffer) to first location
 				 * which must be patched with the value of this label.
 				 */
 #ifdef ERTS_SMP
@@ -284,9 +284,10 @@ typedef struct LoaderState {
     int specific_op;		/* Specific opcode (-1 if not found). */
     int num_functions;		/* Number of functions in module. */
     int num_labels;		/* Number of labels. */
-    int code_buffer_size;	/* Size of code buffer in words.  */
-    BeamInstr* code;		/* Loaded code. */
-    int ci;			/* Current index into loaded code. */
+    BeamCodeHeader* hdr;	/* Loaded code header */
+    BeamInstr* codev;	        /* Loaded code buffer */
+    int        codev_size;      /* Size of code buffer in words. */
+    int ci;			/* Current index into loaded code buffer. */
     Label* labels;
     StringPatch* string_patches; /* Linked list of position into string table to patch. */
     BeamInstr catches;		/* Linked list of catch_yf instructions. */
@@ -480,7 +481,7 @@ static void free_literal_fragment(ErlHeapFragment*);
 static void loader_state_dtor(Binary* magic);
 static Eterm insert_new_code(Process *c_p, ErtsProcLocks c_p_locks,
 			     Eterm group_leader, Eterm module,
-			     BeamInstr* code, Uint size);
+			     BeamCodeHeader* code, Uint size);
 static int init_iff_file(LoaderState* stp, byte* code, Uint size);
 static int scan_iff_file(LoaderState* stp, Uint* chunk_types,
 			 Uint num_types, Uint num_mandatory);
@@ -526,15 +527,15 @@ static void new_string_patch(LoaderState* stp, int pos);
 static Uint new_literal(LoaderState* stp, Eterm** hpp, Uint heap_size);
 static int genopargcompare(GenOpArg* a, GenOpArg* b);
 static Eterm get_module_info(Process* p, ErtsCodeIndex code_ix,
-                             BeamInstr* code, Eterm module, Eterm what);
+                             BeamCodeHeader*, Eterm module, Eterm what);
 static Eterm exported_from_module(Process* p, ErtsCodeIndex code_ix,
                                   Eterm mod);
-static Eterm functions_in_module(Process* p, BeamInstr* code);
-static Eterm attributes_for_module(Process* p, BeamInstr* code);
-static Eterm compilation_info_for_module(Process* p, BeamInstr* code);
-static Eterm md5_of_module(Process* p, BeamInstr* code);
-static Eterm has_native(BeamInstr* code);
-static Eterm native_addresses(Process* p, BeamInstr* code);
+static Eterm functions_in_module(Process* p, BeamCodeHeader*);
+static Eterm attributes_for_module(Process* p, BeamCodeHeader*);
+static Eterm compilation_info_for_module(Process* p, BeamCodeHeader*);
+static Eterm md5_of_module(Process* p, BeamCodeHeader*);
+static Eterm has_native(BeamCodeHeader*);
+static Eterm native_addresses(Process* p, BeamCodeHeader*);
 int patch_funentries(Eterm Patchlist);
 int patch(Eterm Addresses, Uint fe);
 static int safe_mul(UWord a, UWord b, UWord* resp);
@@ -601,6 +602,7 @@ extern void check_allocated_block(Uint type, void *blk);
 #define CHKBLK(TYPE,BLK) /* nothing */
 #endif
 
+
 Eterm
 erts_prepare_loading(Binary* magic, Process *c_p, Eterm group_leader,
 		     Eterm* modp, byte* code, Uint unloaded_size)
@@ -641,20 +643,27 @@ erts_prepare_loading(Binary* magic, Process *c_p, Eterm group_leader,
     /*
      * Initialize code area.
      */
-    stp->code_buffer_size = 2048 + stp->num_functions;
-    stp->code = (BeamInstr *) erts_alloc(ERTS_ALC_T_CODE,
-				    sizeof(BeamInstr) * stp->code_buffer_size);
+    stp->codev_size = 2048 + stp->num_functions;
+    stp->hdr = (BeamCodeHeader*) erts_alloc(ERTS_ALC_T_CODE,
+                                            (offsetof(BeamCodeHeader,functions)
+                                             + sizeof(BeamInstr) * stp->codev_size));
 
-    stp->code[MI_NUM_FUNCTIONS] = stp->num_functions;
-    stp->ci = MI_FUNCTIONS + stp->num_functions + 1;
+    stp->hdr->num_functions = stp->num_functions;
 
-    stp->code[MI_ATTR_PTR] = 0;
-    stp->code[MI_ATTR_SIZE] = 0;
-    stp->code[MI_ATTR_SIZE_ON_HEAP] = 0;
-    stp->code[MI_COMPILE_PTR] = 0;
-    stp->code[MI_COMPILE_SIZE] = 0;
-    stp->code[MI_COMPILE_SIZE_ON_HEAP] = 0;
-    stp->code[MI_MD5_PTR] = 0;
+    /* Let the codev array start at functions[0] in order to index
+     * both function pointers and the loaded code itself that follows.
+     */
+    stp->codev = (BeamInstr*) &stp->hdr->functions;
+    stp->ci = stp->num_functions + 1;
+
+    stp->hdr->attr_ptr = NULL;
+    stp->hdr->attr_size = 0;
+    stp->hdr->attr_size_on_heap = 0;
+    stp->hdr->compile_ptr = NULL;
+    stp->hdr->compile_size = 0;
+    stp->hdr->compile_size_on_heap = 0;
+    stp->hdr->literals_start = NULL;
+    stp->hdr->md5_ptr = NULL;
 
     /*
      * Read the atom table.
@@ -776,7 +785,7 @@ erts_finish_loading(Binary* magic, Process* c_p,
 
     CHKBLK(ERTS_ALC_T_CODE,stp->code);
     retval = insert_new_code(c_p, c_p_locks, stp->group_leader, stp->module,
-			     stp->code, stp->loaded_size);
+			     stp->hdr, stp->loaded_size);
     if (retval != NIL) {
 	goto load_error;
     }
@@ -799,7 +808,8 @@ erts_finish_loading(Binary* magic, Process* c_p,
     debug_dump_code(stp->code,stp->ci);
 #endif
 #endif
-    stp->code = NULL;		/* Prevent code from being freed. */
+    stp->hdr = NULL;		/* Prevent code from being freed. */
+    stp->codev = NULL;
     *modp = stp->module;
 
     /*
@@ -831,7 +841,8 @@ erts_alloc_loader_state(void)
     stp->specific_op = -1;
     stp->genop = NULL;
     stp->atom = NULL;
-    stp->code = NULL;
+    stp->hdr = NULL;
+    stp->codev = NULL;
     stp->labels = NULL;
     stp->import = NULL;
     stp->export = NULL;
@@ -870,13 +881,30 @@ erts_module_for_prepared_code(Binary* magic)
 	return NIL;
     }
     stp = ERTS_MAGIC_BIN_DATA(magic);
-    if (stp->code != 0) {
+    if (stp->hdr != 0) {
 	return stp->module;
     } else {
 	return NIL;
     }
 }
 
+/*
+ * Return a non-zero value if the module has an on_load function,
+ * or 0 if it does not.
+ */
+
+Eterm
+erts_has_code_on_load(Binary* magic)
+{
+    LoaderState* stp;
+
+    if (ERTS_MAGIC_BIN_DESTRUCTOR(magic) != loader_state_dtor) {
+	return NIL;
+    }
+    stp = ERTS_MAGIC_BIN_DATA(magic);
+    return stp->on_load ? am_true : am_false;
+}
+
 static void
 free_loader_state(Binary* magic)
 {
@@ -891,7 +919,7 @@ static ErlHeapFragment* new_literal_fragment(Uint size)
     ErlHeapFragment* bp;
     bp = (ErlHeapFragment*) ERTS_HEAP_ALLOC(ERTS_ALC_T_PREPARED_CODE,
 					    ERTS_HEAP_FRAG_SIZE(size));
-    ERTS_INIT_HEAP_FRAG(bp, size);
+    ERTS_INIT_HEAP_FRAG(bp, size, size);
     return bp;
 }
 
@@ -920,9 +948,13 @@ loader_state_dtor(Binary* magic)
 	driver_free_binary(stp->bin);
 	stp->bin = 0;
     }
-    if (stp->code != 0) {
-	erts_free(ERTS_ALC_T_CODE, stp->code);
-	stp->code = 0;
+    if (stp->hdr != 0) {
+        if (stp->hdr->literals_start) {
+            erts_free(ERTS_ALC_T_LITERAL, stp->hdr->literals_start);
+        }
+	erts_free(ERTS_ALC_T_CODE, stp->hdr);
+	stp->hdr = 0;
+        stp->codev = 0;
     }
     if (stp->labels != 0) {
 	erts_free(ERTS_ALC_T_PREPARED_CODE, (void *) stp->labels);
@@ -995,7 +1027,7 @@ loader_state_dtor(Binary* magic)
 
 static Eterm
 insert_new_code(Process *c_p, ErtsProcLocks c_p_locks,
-		Eterm group_leader, Eterm module, BeamInstr* code,
+		Eterm group_leader, Eterm module, BeamCodeHeader* code_hdr,
 		Uint size)
 {
     Module* modp;
@@ -1016,7 +1048,7 @@ insert_new_code(Process *c_p, ErtsProcLocks c_p_locks,
 
     erts_total_code_size += size;
     modp = erts_put_module(module);
-    modp->curr.code = code;
+    modp->curr.code_hdr = code_hdr;
     modp->curr.code_length = size;
     modp->curr.catches = BEAM_CATCHES_NIL; /* Will be filled in later. */
 
@@ -1024,7 +1056,7 @@ insert_new_code(Process *c_p, ErtsProcLocks c_p_locks,
      * Update ranges (used for finding a function from a PC value).
      */
 
-    erts_update_ranges(code, size);
+    erts_update_ranges((BeamInstr*)modp->curr.code_hdr, size);
     return NIL;
 }
 
@@ -1373,7 +1405,7 @@ read_export_table(LoaderState* stp)
 	if (value == 0) {
 	    LoadError2(stp, "export table entry %d: label %d not resolved", i, n);
 	}
-	stp->export[i].address = address = stp->code + value;
+	stp->export[i].address = address = stp->codev + value;
 
 	/*
 	 * Find out if there is a BIF with the same name.
@@ -1392,7 +1424,7 @@ read_export_table(LoaderState* stp)
 	 * any other functions that walk through all local functions.
 	 */
 
-	if (stp->labels[n].patches) {
+	if (stp->labels[n].patches >= 0) {
 	    LoadError3(stp, "there are local calls to the stub for "
 		       "the BIF %T:%T/%d",
 		       stp->module, func, arity);
@@ -1513,10 +1545,10 @@ read_literal_table(LoaderState* stp)
 	}
 
         if (heap_size > 0) {
-            erts_factory_message_init(&factory, NULL, NULL,
-                                      new_literal_fragment(heap_size));
+            erts_factory_heap_frag_init(&factory,
+					new_literal_fragment(heap_size));
 	    factory.alloc_type = ERTS_ALC_T_PREPARED_CODE;
-            val = erts_decode_ext(&factory, &p);
+            val = erts_decode_ext(&factory, &p, 0);
 
             if (is_non_value(val)) {
                 LoadError1(stp, "literal %d: bad external format", i);
@@ -1527,7 +1559,7 @@ read_literal_table(LoaderState* stp)
         }
         else {
             erts_factory_dummy_init(&factory);
-            val = erts_decode_ext(&factory, &p);
+            val = erts_decode_ext(&factory, &p, 0);
             if (is_non_value(val)) {
                 LoadError1(stp, "literal %d: bad external format", i);
             }
@@ -1735,7 +1767,7 @@ read_code_header(LoaderState* stp)
 				       stp->num_labels * sizeof(Label));
     for (i = 0; i < stp->num_labels; i++) {
 	stp->labels[i].value = 0;
-	stp->labels[i].patches = 0;
+	stp->labels[i].patches = -1;
 #ifdef ERTS_SMP
 	stp->labels[i].looprec_targeted = 0;
 #endif
@@ -1754,13 +1786,14 @@ read_code_header(LoaderState* stp)
     } else {}
 
 #define CodeNeed(w) do {						\
-    ASSERT(ci <= code_buffer_size);					\
-    if (code_buffer_size < ci+(w)) {					\
-        code_buffer_size = 2*ci+(w);					\
-	stp->code = code =						\
-	    (BeamInstr *) erts_realloc(ERTS_ALC_T_CODE,			\
-				     (void *) code,			\
-				     code_buffer_size * sizeof(BeamInstr));	\
+    ASSERT(ci <= codev_size);					        \
+    if (codev_size < ci+(w)) {					        \
+        codev_size = 2*ci+(w);	                                        \
+	stp->hdr = (BeamCodeHeader*) erts_realloc(ERTS_ALC_T_CODE,	\
+            (void *) stp->hdr,	                                        \
+            (offsetof(BeamCodeHeader,functions)                         \
+             + codev_size * sizeof(BeamInstr)));                        \
+        code = stp->codev = (BeamInstr*) &stp->hdr->functions;          \
     } 									\
 } while (0)
     
@@ -1776,7 +1809,7 @@ load_code(LoaderState* stp)
     int arg;			/* Number of current argument. */
     int num_specific;		/* Number of specific ops for current. */
     BeamInstr* code;
-    int code_buffer_size;
+    int codev_size;
     int specific;
     Uint last_label = 0;	/* Number of last label. */
     Uint function_number = 0;
@@ -1793,15 +1826,15 @@ load_code(LoaderState* stp)
 	FUNC_INFO_SZ = 5
     };
 
-    code = stp->code;
-    code_buffer_size = stp->code_buffer_size;
+    code = stp->codev;
+    codev_size = stp->codev_size;
     ci = stp->ci;
 
     for (;;) {
 	int new_op;
 	GenOp* tmp_op;
 
-	ASSERT(ci <= code_buffer_size);
+	ASSERT(ci <= codev_size);
 
     get_next_instr:
 	GetByte(stp, new_op);
@@ -1847,9 +1880,7 @@ load_code(LoaderState* stp)
 	    case TAG_o:
 		break;
 	    case TAG_x:
-		if (last_op->a[arg].val == 0) {
-		    last_op->a[arg].type = TAG_r;
-		} else if (last_op->a[arg].val >= MAX_REG) {
+		if (last_op->a[arg].val >= MAX_REG) {
 		    LoadError1(stp, "invalid x register number: %u",
 			       last_op->a[arg].val);
 		}
@@ -1894,15 +1925,14 @@ load_code(LoaderState* stp)
 			 */
 			{
 			    Eterm* hp;
-/* XXX:PaN - Halfword should use ARCH_64 variant instead */
-#if !defined(ARCH_64) || HALFWORD_HEAP
+#if !defined(ARCH_64)
 			    Uint high, low;
 # endif
 			    last_op->a[arg].val = new_literal(stp, &hp,
 							      FLOAT_SIZE_OBJECT);
 			    hp[0] = HEADER_FLONUM;
 			    last_op->a[arg].type = TAG_q;
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 			    GetInt(stp, 8, hp[1]);
 # else
 			    GetInt(stp, 4, high);
@@ -1998,42 +2028,47 @@ load_code(LoaderState* stp)
 	ASSERT(arity == last_op->arity);
 
     do_transform:
-	if (stp->genop == NULL) {
-	    last_op_next = NULL;
-	    goto get_next_instr;
-	}
-
+	ASSERT(stp->genop != NULL);
 	if (gen_opc[stp->genop->op].transform != -1) {
-	    int need;
-	    tmp_op = stp->genop;
-
-	    for (need = gen_opc[stp->genop->op].min_window-1; need > 0; need--) {
-		if (tmp_op == NULL) {
-		    goto get_next_instr;
-		}
-		tmp_op = tmp_op->next;
+	    if (stp->genop->next == NULL) {
+		/*
+		 * Simple heuristic: Most transformations requires
+		 * at least two instructions, so make sure that
+		 * there are. That will reduce the number of
+		 * TE_SHORT_WINDOWs.
+		 */
+		goto get_next_instr;
 	    }
 	    switch (transform_engine(stp)) {
 	    case TE_FAIL:
-		last_op_next = NULL;
-		last_op = NULL;
+		/*
+		 * No transformation found. stp->genop != NULL and
+		 * last_op_next is still valid. Go ahead and load
+		 * the instruction.
+		 */
 		break;
 	    case TE_OK:
+		/*
+		 * Some transformation was applied. last_op_next is
+		 * no longer valid and stp->genop may be NULL.
+		 * Try to transform again.
+		 */
+		if (stp->genop == NULL) {
+		    last_op_next = &stp->genop;
+		    goto get_next_instr;
+		}
 		last_op_next = NULL;
-		last_op = NULL;
 		goto do_transform;
 	    case TE_SHORT_WINDOW:
-		last_op_next = NULL;
-		last_op = NULL;
+		/*
+		 * No transformation applied. stp->genop != NULL and
+		 * last_op_next is still valid. Fetch a new instruction
+		 * before trying the transformation again.
+		 */
 		goto get_next_instr;
 	    }
 	}
 
-	if (stp->genop == NULL) {
-	    last_op_next = NULL;
-	    goto get_next_instr;
-	}
-
 	/*
 	 * From the collected generic instruction, find the specific
 	 * instruction.
@@ -2056,7 +2091,42 @@ load_code(LoaderState* stp)
 		if (((opc[specific].mask[0] & mask[0]) == mask[0]) &&
 		    ((opc[specific].mask[1] & mask[1]) == mask[1]) &&
 		    ((opc[specific].mask[2] & mask[2]) == mask[2])) {
-		    break;
+
+		    if (!opc[specific].involves_r) {
+			break;	/* No complications - match */
+		    }
+
+		    /*
+		     * The specific operation uses the 'r' operand,
+		     * which is shorthand for x(0). Now things
+		     * get complicated. First we must check whether
+		     * all operands that should be of type 'r' use
+		     * x(0) (as opposed to some other X register).
+		     */
+		    for (arg = 0; arg < arity; arg++) {
+			if (opc[specific].involves_r & (1 << arg) &&
+			    tmp_op->a[arg].type == TAG_x) {
+			    if (tmp_op->a[arg].val != 0) {
+				break; /* Other X register than 0 */
+			    }
+			}
+		    }
+
+		    if (arg == arity) {
+			/*
+			 * All 'r' operands use x(0) in the generic
+			 * operation. That means a match. Now we
+			 * will need to rewrite the generic instruction
+			 * to actually use 'r' instead of 'x(0)'.
+			 */
+			for (arg = 0; arg < arity; arg++) {
+			    if (opc[specific].involves_r & (1 << arg) &&
+				tmp_op->a[arg].type == TAG_x) {
+				tmp_op->a[arg].type = TAG_r;
+			    }
+			}
+			break;	/* Match */
+		    }
 		}
 		specific++;
 	    }
@@ -2167,14 +2237,11 @@ load_code(LoaderState* stp)
 		break;
 	    case 's':	/* Any source (tagged constant or register) */
 		switch (tag) {
-		case TAG_r:
-		    code[ci++] = make_rreg();
-		    break;
 		case TAG_x:
-		    code[ci++] = make_xreg(tmp_op->a[arg].val);
+		    code[ci++] = make_loader_x_reg(tmp_op->a[arg].val);
 		    break;
 		case TAG_y:
-		    code[ci++] = make_yreg(tmp_op->a[arg].val);
+		    code[ci++] = make_loader_y_reg(tmp_op->a[arg].val);
 		    break;
 		case TAG_i:
 		    code[ci++] = (BeamInstr) make_small((Uint)tmp_op->a[arg].val);
@@ -2185,6 +2252,10 @@ load_code(LoaderState* stp)
 		case TAG_n:
 		    code[ci++] = NIL;
 		    break;
+		case TAG_q:
+		    new_literal_patch(stp, ci);
+		    code[ci++] = tmp_op->a[arg].val;
+		    break;
 		default:
 		    LoadError1(stp, "bad tag %d for general source",
 			       tmp_op->a[arg].type);
@@ -2193,14 +2264,11 @@ load_code(LoaderState* stp)
 		break;
 	    case 'd':	/* Destination (x(0), x(N), y(N) */
 		switch (tag) {
-		case TAG_r:
-		    code[ci++] = make_rreg();
-		    break;
 		case TAG_x:
-		    code[ci++] = make_xreg(tmp_op->a[arg].val);
+		    code[ci++] = tmp_op->a[arg].val * sizeof(Eterm);
 		    break;
 		case TAG_y:
-		    code[ci++] = make_yreg(tmp_op->a[arg].val);
+		    code[ci++] = tmp_op->a[arg].val * sizeof(Eterm) + 1;
 		    break;
 		default:
 		    LoadError1(stp, "bad tag %d for destination",
@@ -2357,20 +2425,13 @@ load_code(LoaderState* stp)
 		stp->labels[tmp_op->a[arg].val].patches = ci;
 		ci++;
 		break;
-	    case TAG_r:
-		CodeNeed(1);
-		code[ci++] = (R_REG_DEF << _TAG_PRIMARY_SIZE) |
-		    TAG_PRIMARY_HEADER;
-		break;
 	    case TAG_x:
 		CodeNeed(1);
-		code[ci++] = (tmp_op->a[arg].val << _TAG_IMMED1_SIZE) |
-		    (X_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER;
+		code[ci++] = make_loader_x_reg(tmp_op->a[arg].val);
 		break;
 	    case TAG_y:
 		CodeNeed(1);
-		code[ci++] = (tmp_op->a[arg].val << _TAG_IMMED1_SIZE) |
-		    (Y_REG_DEF << _TAG_PRIMARY_SIZE) | TAG_PRIMARY_HEADER;
+		code[ci++] = make_loader_y_reg(tmp_op->a[arg].val);
 		break;
 	    case TAG_n:
 		CodeNeed(1);
@@ -2393,8 +2454,7 @@ load_code(LoaderState* stp)
 	switch (stp->specific_op) {
 	case op_i_func_info_IaaI:
 	    {
-		Uint offset;
-
+		Sint offset;
 		if (function_number >= stp->num_functions) {
 		    LoadError1(stp, "too many functions in module (header said %d)",
 			       stp->num_functions); 
@@ -2436,15 +2496,15 @@ load_code(LoaderState* stp)
 		stp->arity = code[ci-1];
 
 		ASSERT(stp->labels[last_label].value == ci - FUNC_INFO_SZ);
-		offset = MI_FUNCTIONS + function_number;
-		code[offset] = stp->labels[last_label].patches;
+		stp->hdr->functions[function_number] = (BeamInstr*) stp->labels[last_label].patches;
+		offset = function_number;
 		stp->labels[last_label].patches = offset;
 		function_number++;
 		if (stp->arity > MAX_ARG) {
 		    LoadError1(stp, "too many arguments: %d", stp->arity);
 		}
 #ifdef DEBUG
-		ASSERT(stp->labels[0].patches == 0); /* Should not be referenced. */
+		ASSERT(stp->labels[0].patches < 0); /* Should not be referenced. */
 		for (i = 1; i < stp->num_labels; i++) {
 		    ASSERT(stp->labels[i].patches < ci);
 		}
@@ -2458,7 +2518,6 @@ load_code(LoaderState* stp)
 	    stp->on_load = ci;
 	    break;
 	case op_bs_put_string_II:
-	case op_i_bs_match_string_rfII:
 	case op_i_bs_match_string_xfII:
 	    new_string_patch(stp, ci-1);
 	    break;
@@ -2515,7 +2574,7 @@ load_code(LoaderState* stp)
 	     * End of code found.
 	     */
 	case op_int_code_end:
-	    stp->code_buffer_size = code_buffer_size;
+	    stp->codev_size = codev_size;
 	    stp->ci = ci;
 	    stp->function = THE_NON_VALUE;
 	    stp->genop = NULL;
@@ -2530,7 +2589,10 @@ load_code(LoaderState* stp)
 	{
 	    GenOp* next = stp->genop->next;
 	    FREE_GENOP(stp, stp->genop);
-	    stp->genop = next;
+	    if ((stp->genop = next) == NULL) {
+		last_op_next = &stp->genop;
+		goto get_next_instr;
+	    }
 	    goto do_transform;
 	}
     }
@@ -2674,12 +2736,18 @@ mixed_types(LoaderState* stp, GenOpArg Size, GenOpArg* Rest)
 }
 
 static int
-same_label(LoaderState* stp, GenOpArg Target, GenOpArg Label)
+is_killed_apply(LoaderState* stp, GenOpArg Reg, GenOpArg Live)
 {
-    return Target.type = TAG_f && Label.type == TAG_u &&
-	Target.val == Label.val;
+    return Reg.type == TAG_x && Live.type == TAG_u &&
+	Live.val+2 <= Reg.val;
 }
 
+static int
+is_killed(LoaderState* stp, GenOpArg Reg, GenOpArg Live)
+{
+    return Reg.type == TAG_x && Live.type == TAG_u &&
+	Live.val <= Reg.val;
+}
 
 /*
  * Generate an instruction for element/2.
@@ -2696,17 +2764,17 @@ gen_element(LoaderState* stp, GenOpArg Fail, GenOpArg Index,
     op->next = NULL;
 
     if (Index.type == TAG_i && Index.val > 0 &&
-	(Tuple.type == TAG_r || Tuple.type == TAG_x || Tuple.type == TAG_y)) {
+	(Tuple.type == TAG_x || Tuple.type == TAG_y)) {
 	op->op = genop_i_fast_element_4;
-	op->a[0] = Tuple;
-	op->a[1] = Fail;
+	op->a[0] = Fail;
+	op->a[1] = Tuple;
 	op->a[2].type = TAG_u;
 	op->a[2].val = Index.val;
 	op->a[3] = Dst;
     } else {
 	op->op = genop_i_element_4;
-	op->a[0] = Tuple;
-	op->a[1] = Fail;
+	op->a[0] = Fail;
+	op->a[1] = Tuple;
 	op->a[2] = Index;
 	op->a[3] = Dst;
     }
@@ -2832,23 +2900,16 @@ gen_get_integer2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms, GenOpArg Live,
 	    goto generic;
 	}
     } else {
-	GenOp* op2;
-	NEW_GENOP(stp, op2);
-	
-	op->op = genop_i_fetch_2;
-	op->arity = 2;
-	op->a[0] = Ms;
-	op->a[1] = Size;
-	op->next = op2;
-
-	op2->op = genop_i_bs_get_integer_4;
-	op2->arity = 4;
-	op2->a[0] = Fail;
-	op2->a[1] = Live;
-	op2->a[2].type = TAG_u;
-	op2->a[2].val = (Unit.val << 3) | Flags.val;
-	op2->a[3] = Dst;
-	op2->next = NULL;
+	op->op = genop_i_bs_get_integer_6;
+	op->arity = 6;
+	op->a[0] = Fail;
+	op->a[1] = Live;
+	op->a[2].type = TAG_u;
+	op->a[2].val = (Unit.val << 3) | Flags.val;
+	op->a[3] = Ms;
+	op->a[4] = Size;
+	op->a[5] = Dst;
+	op->next = NULL;
 	return op;
     }
     op->next = NULL;
@@ -3272,14 +3333,14 @@ gen_literal_timeout(LoaderState* stp, GenOpArg Fail, GenOpArg Time)
     op->a[1].type = TAG_u;
     
     if (Time.type == TAG_i && (timeout = Time.val) >= 0 &&
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 	(timeout >> 32) == 0
 #else
 	1
 #endif
 	) {
 	op->a[1].val = timeout;
-#if !defined(ARCH_64) || HALFWORD_HEAP
+#if !defined(ARCH_64)
     } else if (Time.type == TAG_q) {
 	Eterm big;
 
@@ -3296,7 +3357,7 @@ gen_literal_timeout(LoaderState* stp, GenOpArg Fail, GenOpArg Time)
 	}
 #endif
     } else {
-#if !defined(ARCH_64) || HALFWORD_HEAP
+#if !defined(ARCH_64)
     error:
 #endif
 	op->op = genop_i_wait_error_0;
@@ -3319,14 +3380,14 @@ gen_literal_timeout_locked(LoaderState* stp, GenOpArg Fail, GenOpArg Time)
     op->a[1].type = TAG_u;
     
     if (Time.type == TAG_i && (timeout = Time.val) >= 0 &&
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 	(timeout >> 32) == 0
 #else
 	1
 #endif
 	) {
 	op->a[1].val = timeout;
-#if !defined(ARCH_64) || HALFWORD_HEAP
+#if !defined(ARCH_64)
     } else if (Time.type == TAG_q) {
 	Eterm big;
 
@@ -3343,7 +3404,7 @@ gen_literal_timeout_locked(LoaderState* stp, GenOpArg Fail, GenOpArg Time)
 	}
 #endif
     } else {
-#if !defined(ARCH_64) || HALFWORD_HEAP
+#if !defined(ARCH_64)
     error:
 #endif
 	op->op = genop_i_wait_error_locked_0;
@@ -3899,9 +3960,7 @@ gen_make_fun2(LoaderState* stp, GenOpArg idx)
 /*
  * Rewrite gc_bifs with one parameter (the common case). Utilized
  * in ops.tab to rewrite instructions calling bif's in guards
- * to use a garbage collecting implementation. The instructions
- * are sometimes once again rewritten to handle literals (putting the
- * parameter in the mostly unused r[0] before the instruction is executed).
+ * to use a garbage collecting implementation.
  */
 static GenOp*
 gen_guard_bif1(LoaderState* stp, GenOpArg Fail, GenOpArg Live, GenOpArg Bif,
@@ -3956,10 +4015,6 @@ gen_guard_bif1(LoaderState* stp, GenOpArg Fail, GenOpArg Live, GenOpArg Bif,
 
 /*
  * This is used by the ops.tab rule that rewrites gc_bifs with two parameters.
- * The instruction returned is then again rewritten to an i_load instruction
- * followed by i_gc_bif2_jIId, to handle literals properly.
- * As opposed to the i_gc_bif1_jIsId, the instruction  i_gc_bif2_jIId is
- * always rewritten, regardless of if there actually are any literals.
  */
 static GenOp*
 gen_guard_bif2(LoaderState* stp, GenOpArg Fail, GenOpArg Live, GenOpArg Bif,
@@ -3986,23 +4041,19 @@ gen_guard_bif2(LoaderState* stp, GenOpArg Fail, GenOpArg Live, GenOpArg Bif,
 	op->a[2].val = stp->import[Bif.val].arity;
 	return op;
     }
-    op->op = genop_ii_gc_bif2_6;
+    op->op = genop_i_gc_bif2_6;
     op->arity = 6;
     op->a[0] = Fail;
     op->a[1].type = TAG_u;
-    op->a[2] = S1;
-    op->a[3] = S2;
-    op->a[4] = Live;
+    op->a[2] = Live;
+    op->a[3] = S1;
+    op->a[4] = S2;
     op->a[5] = Dst;
     return op;
 }
 
 /*
  * This is used by the ops.tab rule that rewrites gc_bifs with three parameters.
- * The instruction returned is then again rewritten to a move instruction that
- * uses r[0] for temp storage, followed by an i_load instruction,
- * followed by i_gc_bif3_jIsId, to handle literals properly. Rewriting
- * always occur, as with the gc_bif2 counterpart.
  */
 static GenOp*
 gen_guard_bif3(LoaderState* stp, GenOpArg Fail, GenOpArg Live, GenOpArg Bif,
@@ -4033,10 +4084,10 @@ gen_guard_bif3(LoaderState* stp, GenOpArg Fail, GenOpArg Live, GenOpArg Bif,
     op->arity = 7;
     op->a[0] = Fail;
     op->a[1].type = TAG_u;
-    op->a[2] = S1;
-    op->a[3] = S2;
-    op->a[4] = S3;
-    op->a[5] = Live;
+    op->a[2] = Live;
+    op->a[3] = S1;
+    op->a[4] = S2;
+    op->a[5] = S3;
     op->a[6] = Dst;
     op->next = NULL;
     return op;
@@ -4258,6 +4309,53 @@ gen_get_map_element(LoaderState* stp, GenOpArg Fail, GenOpArg Src,
     return op;
 }
 
+static int
+hash_internal_genop_arg(LoaderState* stp, GenOpArg Key, Uint32* hx)
+{
+    switch (Key.type) {
+    case TAG_a:
+	*hx = atom_tab(atom_val(Key.val))->slot.bucket.hvalue;
+	return 1;
+    case TAG_i:
+	*hx = Key.val;
+	return 1;
+    case TAG_n:
+	*hx = make_internal_hash(NIL);
+	return 1;
+    case TAG_q:
+	*hx = make_internal_hash(stp->literals[Key.val].term);
+	return 1;
+    default:
+	return 0;
+    }
+}
+
+
+static GenOp*
+gen_get(LoaderState* stp, GenOpArg Src, GenOpArg Dst)
+{
+    GenOp* op;
+    Uint32 hx = 0;
+
+    NEW_GENOP(stp, op);
+    op->next = NULL;
+    if (hash_internal_genop_arg(stp, Src, &hx)) {
+	op->arity = 3;
+	op->op = genop_i_get_hash_3;
+        op->a[0] = Src;
+	op->a[1].type = TAG_u;
+	op->a[1].val = (BeamInstr) hx;
+	op->a[2] = Dst;
+    } else {
+	op->arity = 2;
+	op->op = genop_i_get_2;
+        op->a[0] = Src;
+	op->a[1] = Dst;
+    }
+    return op;
+}
+
+
 static GenOp*
 gen_get_map_elements(LoaderState* stp, GenOpArg Fail, GenOpArg Src,
 		     GenOpArg Size, GenOpArg* Rest)
@@ -4323,7 +4421,7 @@ gen_has_map_fields(LoaderState* stp, GenOpArg Fail, GenOpArg Src,
     for (i = 0; i < n; i++) {
 	op->a[3+2*i] = Rest[i];
 	op->a[3+2*i+1].type = TAG_x;
-	op->a[3+2*i+1].val = 0;	/* x(0); normally not used */
+	op->a[3+2*i+1].val = SCRATCH_X_REG; /* Ignore result */
     }
     return op;
 }
@@ -4336,8 +4434,8 @@ gen_has_map_fields(LoaderState* stp, GenOpArg Fail, GenOpArg Src,
 static int
 freeze_code(LoaderState* stp)
 {
-    BeamInstr* code = stp->code;
-    Uint *literal_end = NULL;
+    BeamCodeHeader* code_hdr = stp->hdr;
+    BeamInstr* codev = (BeamInstr*) &stp->hdr->functions;
     int i;
     byte* str_table;
     unsigned strtab_size = stp->chunks[STR_CHUNK].size;
@@ -4362,77 +4460,76 @@ freeze_code(LoaderState* stp)
     if (stp->line_instr == 0) {
 	line_size = 0;
     } else {
-	line_size = (MI_LINE_FUNC_TAB + (stp->num_functions + 1) +
-		     (stp->current_li+1) + stp->num_fnames) *
-	    sizeof(Eterm) + (stp->current_li+1) * stp->loc_size;
+	line_size = (offsetof(BeamCodeLineTab,func_tab)
+                     + (stp->num_functions + 1) * sizeof(BeamInstr**) /* func_tab */
+                     + (stp->current_li + 1) * sizeof(BeamInstr*)     /* line items */
+                     + stp->num_fnames * sizeof(Eterm)                /* fname table */
+                     + (stp->current_li + 1) * stp->loc_size);        /* loc_tab */
     }
-    size = (stp->ci * sizeof(BeamInstr)) +
-	(stp->total_literal_size * sizeof(Eterm)) +
+    size = offsetof(BeamCodeHeader,functions) + (stp->ci * sizeof(BeamInstr)) +
 	strtab_size + attr_size + compile_size + MD5_SIZE + line_size;
 
     /*
      * Move the code to its final location.
      */
 
-    code = (BeamInstr *) erts_realloc(ERTS_ALC_T_CODE, (void *) code, size);
-    CHKBLK(ERTS_ALC_T_CODE,code);
+    code_hdr = (BeamCodeHeader*) erts_realloc(ERTS_ALC_T_CODE, (void *) code_hdr, size);
+    codev = (BeamInstr*) &code_hdr->functions;
+    CHKBLK(ERTS_ALC_T_CODE,code_hdr);
     /*
      * Place a pointer to the op_int_code_end instruction in the
      * function table in the beginning of the file.
      */
 
-    code[MI_FUNCTIONS+stp->num_functions] = (BeamInstr) (code + stp->ci - 1);
-    CHKBLK(ERTS_ALC_T_CODE,code);
+    code_hdr->functions[stp->num_functions] = (codev + stp->ci - 1);
+    CHKBLK(ERTS_ALC_T_CODE,code_hdr);
 
     /*
      * Store the pointer to the on_load function.
      */
 
     if (stp->on_load) {
-	code[MI_ON_LOAD_FUNCTION_PTR] = (BeamInstr) (code + stp->on_load);
+	code_hdr->on_load_function_ptr = codev + stp->on_load;
     } else {
-	code[MI_ON_LOAD_FUNCTION_PTR] = 0;
+	code_hdr->on_load_function_ptr = NULL;
     }
-    CHKBLK(ERTS_ALC_T_CODE,code);
+    CHKBLK(ERTS_ALC_T_CODE,code_hdr);
 
-    literal_end = (Uint *) (code+stp->ci);
     /*
-     * Place the literal heap directly after the code and fix up all
-     * instructions that refer to it.
+     * Place the literals in their own allocated heap (for fast range check)
+     * and fix up all instructions that refer to it.
      */
     {
-	Uint* ptr;
-	Uint* low;
-	Uint* high;
+	Eterm* ptr;
 	LiteralPatch* lp;
         ErlOffHeap code_off_heap;
 
         ERTS_INIT_OFF_HEAP(&code_off_heap);
 
-	low = (Uint *) (code+stp->ci);
-	high = low + stp->total_literal_size;
-	code[MI_LITERALS_START] = (BeamInstr) low;
-	code[MI_LITERALS_END] = (BeamInstr) high;
-	ptr = low;
+        ptr = (Eterm*)erts_alloc(ERTS_ALC_T_LITERAL,
+                                 stp->total_literal_size*sizeof(Eterm));
+	code_hdr->literals_start = ptr;
+	code_hdr->literals_end = ptr + stp->total_literal_size;
 	for (i = 0; i < stp->num_literals; i++) {
-            if (stp->literals[i].heap_frags) {
-                move_multi_frags(&ptr, &code_off_heap, stp->literals[i].heap_frags,
-                                 &stp->literals[i].term, 1);
+            if (is_not_immed(stp->literals[i].term)) {
+                erts_move_multi_frags(&ptr, &code_off_heap,
+				      stp->literals[i].heap_frags,
+				      &stp->literals[i].term, 1, 1);
+                ASSERT(erts_is_literal(stp->literals[i].term,
+				       ptr_val(stp->literals[i].term)));
             }
-            else ASSERT(is_immed(stp->literals[i].term));
 	}
-        code[MI_LITERALS_OFF_HEAP] = (BeamInstr) code_off_heap.first;
+	code_hdr->literals_off_heap = code_off_heap.first;
 	lp = stp->literal_patches;
 	while (lp != 0) {
 	    BeamInstr* op_ptr;
 	    Literal* lit;
 
-	    op_ptr = code + lp->pos;
+	    op_ptr = codev + lp->pos;
 	    lit = &stp->literals[op_ptr[0]];
 	    op_ptr[0] = lit->term;
 	    lp = lp->next;
 	}
-	literal_end += stp->total_literal_size;
     }
     CHKBLK(ERTS_ALC_T_CODE,code);
 
@@ -4440,52 +4537,49 @@ freeze_code(LoaderState* stp)
      * If there is line information, place it here.
      */
     if (stp->line_instr == 0) {
-	code[MI_LINE_TABLE] = (BeamInstr) 0;
-	str_table = (byte *) literal_end;
+	code_hdr->line_table = NULL;
+	str_table = (byte *) (codev + stp->ci);
     } else {
-	Eterm* line_tab = (Eterm *) literal_end;
-	Eterm* p;
-	int ftab_size = stp->num_functions;
-	int num_instrs = stp->current_li;
-	Eterm* first_line_item;
+	BeamCodeLineTab* const line_tab = (BeamCodeLineTab *) (codev+stp->ci);
+	const int ftab_size = stp->num_functions;
+        const int num_instrs = stp->current_li;
+        const BeamInstr** const line_items =
+            (const BeamInstr**) &line_tab->func_tab[ftab_size + 1];
 
-	code[MI_LINE_TABLE] = (BeamInstr) line_tab;
-	p = line_tab + MI_LINE_FUNC_TAB;
+	code_hdr->line_table = line_tab;
 
-	first_line_item = (p + ftab_size + 1);
 	for (i = 0; i < ftab_size; i++) {
-	     *p++ = (Eterm) (BeamInstr) (first_line_item + stp->func_line[i]);
+            line_tab->func_tab[i] = line_items + stp->func_line[i];
 	}
-	*p++ = (Eterm) (BeamInstr) (first_line_item + num_instrs);
-	ASSERT(p == first_line_item);
+	line_tab->func_tab[i] = line_items + num_instrs;
+
 	for (i = 0; i < num_instrs; i++) {
-		*p++ = (Eterm) (BeamInstr) (code + stp->line_instr[i].pos);
+            line_items[i] = codev + stp->line_instr[i].pos;
 	}
-	*p++ = (Eterm) (BeamInstr) (code + stp->ci - 1);
+	line_items[i] = codev + stp->ci - 1;
 
-	line_tab[MI_LINE_FNAME_PTR] = (Eterm) (BeamInstr) p;
-	memcpy(p, stp->fname, stp->num_fnames*sizeof(Eterm));
-	p += stp->num_fnames;
+	line_tab->fname_ptr = (Eterm*) &line_items[i + 1];
+	memcpy(line_tab->fname_ptr, stp->fname, stp->num_fnames*sizeof(Eterm));
 
-	line_tab[MI_LINE_LOC_TAB] = (Eterm) (BeamInstr) p;
-	line_tab[MI_LINE_LOC_SIZE] = stp->loc_size;
+	line_tab->loc_size = stp->loc_size;
 	if (stp->loc_size == 2) {
-	    Uint16* locp = (Uint16 *) p;
-	    for (i = 0; i < num_instrs; i++) {
+            Uint16* locp = (Uint16 *) &line_tab->fname_ptr[stp->num_fnames];
+            line_tab->loc_tab.p2 = locp;
+            for (i = 0; i < num_instrs; i++) {
 		*locp++ = (Uint16) stp->line_instr[i].loc;
-	    }
-	    *locp++ = LINE_INVALID_LOCATION;
-	    str_table = (byte *) locp;
+            }
+            *locp++ = LINE_INVALID_LOCATION;
+            str_table = (byte *) locp;
 	} else {
-	    Uint32* locp = (Uint32 *) p;
-	    ASSERT(stp->loc_size == 4);
+	    Uint32* locp = (Uint32 *) &line_tab->fname_ptr[stp->num_fnames];
+            ASSERT(stp->loc_size == 4);
+            line_tab->loc_tab.p4 = locp;
 	    for (i = 0; i < num_instrs; i++) {
 		*locp++ = stp->line_instr[i].loc;
 	    }
 	    *locp++ = LINE_INVALID_LOCATION;
-	    str_table = (byte *) locp;
+            str_table = (byte *) locp;
 	}
-
 	CHKBLK(ERTS_ALC_T_CODE,code);
     }
 
@@ -4497,13 +4591,13 @@ freeze_code(LoaderState* stp)
     if (attr_size) {
 	byte* attr = str_table + strtab_size;
 	sys_memcpy(attr, stp->chunks[ATTR_CHUNK].start, stp->chunks[ATTR_CHUNK].size);
-	code[MI_ATTR_PTR] = (BeamInstr) attr;
-	code[MI_ATTR_SIZE] = (BeamInstr) stp->chunks[ATTR_CHUNK].size;
+	code_hdr->attr_ptr = attr;
+	code_hdr->attr_size = (BeamInstr) stp->chunks[ATTR_CHUNK].size;
 	decoded_size = erts_decode_ext_size(attr, attr_size);
 	if (decoded_size < 0) {
  	    LoadError0(stp, "bad external term representation of module attributes");
  	}
-	code[MI_ATTR_SIZE_ON_HEAP] = decoded_size;
+	code_hdr->attr_size_on_heap = decoded_size;
     }
     CHKBLK(ERTS_ALC_T_CODE,code);
     if (compile_size) {
@@ -4513,9 +4607,9 @@ freeze_code(LoaderState* stp)
 	       stp->chunks[COMPILE_CHUNK].size);
 
 	CHKBLK(ERTS_ALC_T_CODE,code);
-	code[MI_COMPILE_PTR] = (BeamInstr) compile_info;
+	code_hdr->compile_ptr = compile_info;
 	CHKBLK(ERTS_ALC_T_CODE,code);
-	code[MI_COMPILE_SIZE] = (BeamInstr) stp->chunks[COMPILE_CHUNK].size;
+	code_hdr->compile_size = (BeamInstr) stp->chunks[COMPILE_CHUNK].size;
 	CHKBLK(ERTS_ALC_T_CODE,code);
 	decoded_size = erts_decode_ext_size(compile_info, compile_size);
 	CHKBLK(ERTS_ALC_T_CODE,code);
@@ -4523,7 +4617,7 @@ freeze_code(LoaderState* stp)
  	    LoadError0(stp, "bad external term representation of compilation information");
  	}
 	CHKBLK(ERTS_ALC_T_CODE,code);
-	code[MI_COMPILE_SIZE_ON_HEAP] = decoded_size;
+	code_hdr->compile_size_on_heap = decoded_size;
     }
     CHKBLK(ERTS_ALC_T_CODE,code);
     {
@@ -4531,7 +4625,7 @@ freeze_code(LoaderState* stp)
 	CHKBLK(ERTS_ALC_T_CODE,code);
 	sys_memcpy(md5_sum, stp->mod_md5, MD5_SIZE);
 	CHKBLK(ERTS_ALC_T_CODE,code);
-	code[MI_MD5_PTR] = (BeamInstr) md5_sum;
+	code_hdr->md5_ptr = md5_sum;
 	CHKBLK(ERTS_ALC_T_CODE,code);
     }
     CHKBLK(ERTS_ALC_T_CODE,code);
@@ -4540,7 +4634,7 @@ freeze_code(LoaderState* stp)
      * Make sure that we have not overflowed the allocated code space.
      */
     ASSERT(str_table + strtab_size + attr_size + compile_size + MD5_SIZE ==
-	   ((byte *) code) + size);
+	   ((byte *) code_hdr) + size);
 
     /*
      * Patch all instructions that refer to the string table.
@@ -4552,46 +4646,47 @@ freeze_code(LoaderState* stp)
 	    BeamInstr* op_ptr;
 	    byte* strp;
 
-	    op_ptr = code + sp->pos;
+	    op_ptr = codev + sp->pos;
 	    strp = str_table + op_ptr[0];
 	    op_ptr[0] = (BeamInstr) strp;
 	    sp = sp->next;
 	}
     }
-    CHKBLK(ERTS_ALC_T_CODE,code);
+    CHKBLK(ERTS_ALC_T_CODE,code_hdr);
 
     /*
      * Resolve all labels.
      */
 
     for (i = 0; i < stp->num_labels; i++) {
-	Uint this_patch;
-	Uint next_patch;
+	Sint this_patch;
+	Sint next_patch;
 	Uint value = stp->labels[i].value;
 	
-	if (value == 0 && stp->labels[i].patches != 0) {
+	if (value == 0 && stp->labels[i].patches >= 0) {
 	    LoadError1(stp, "label %d not resolved", i);
 	}
 	ASSERT(value < stp->ci);
 	this_patch = stp->labels[i].patches;
-	while (this_patch != 0) {
+	while (this_patch >= 0) {
 	    ASSERT(this_patch < stp->ci);
-	    next_patch = code[this_patch];
+	    next_patch = codev[this_patch];
 	    ASSERT(next_patch < stp->ci);
-	    code[this_patch] = (BeamInstr) (code + value);
+	    codev[this_patch] = (BeamInstr) (codev + value);
 	    this_patch = next_patch;
 	}
     }
-    CHKBLK(ERTS_ALC_T_CODE,code);
+    CHKBLK(ERTS_ALC_T_CODE,code_hdr);
 
     /*
      * Save the updated code pointer and code size.
      */
 
-    stp->code = code;
+    stp->hdr = code_hdr;
+    stp->codev = codev;
     stp->loaded_size = size;
 
-    CHKBLK(ERTS_ALC_T_CODE,code);
+    CHKBLK(ERTS_ALC_T_CODE,code_hdr);
     return 1;
 
  load_error:
@@ -4599,7 +4694,8 @@ freeze_code(LoaderState* stp)
      * Make sure that the caller frees the newly reallocated block, and
      * not the old one (in case it has moved).
      */
-    stp->code = code;
+    stp->hdr = code_hdr;
+    stp->codev = codev;
     return 0;
 }
 
@@ -4610,7 +4706,7 @@ final_touch(LoaderState* stp)
     int on_load = stp->on_load;
     unsigned catches;
     Uint index;
-    BeamInstr* code = stp->code;
+    BeamInstr* codev = stp->codev;
     Module* modp;
 
     /*
@@ -4620,10 +4716,10 @@ final_touch(LoaderState* stp)
     index = stp->catches;
     catches = BEAM_CATCHES_NIL;
     while (index != 0) {
-	BeamInstr next = code[index];
-	code[index] = BeamOpCode(op_catch_yf);
-	catches = beam_catches_cons((BeamInstr *)code[index+2], catches);
-	code[index+2] = make_catch(catches);
+	BeamInstr next = codev[index];
+	codev[index] = BeamOpCode(op_catch_yf);
+	catches = beam_catches_cons((BeamInstr *)codev[index+2], catches);
+	codev[index+2] = make_catch(catches);
 	index = next;
     }
     modp = erts_put_module(stp->module);
@@ -4674,8 +4770,8 @@ final_touch(LoaderState* stp)
 	current = stp->import[i].patches;
 	while (current != 0) {
 	    ASSERT(current < stp->ci);
-	    next = stp->code[current];
-	    stp->code[current] = import;
+	    next = stp->codev[current];
+	    stp->codev[current] = import;
 	    current = next;
 	}
     }
@@ -4688,7 +4784,7 @@ final_touch(LoaderState* stp)
 	for (i = 0; i < stp->num_lambdas; i++) {
 	    unsigned entry_label = stp->lambdas[i].label;
 	    ErlFunEntry* fe = stp->lambdas[i].fe;
-	    BeamInstr* code_ptr = (BeamInstr *) (stp->code + stp->labels[entry_label].value);
+	    BeamInstr* code_ptr = stp->codev + stp->labels[entry_label].value;
 
 	    if (fe->address[0] != 0) {
 		/*
@@ -4710,31 +4806,25 @@ transform_engine(LoaderState* st)
     Uint op;
     int ap;			/* Current argument. */
     Uint* restart;		/* Where to restart if current match fails. */
-    GenOpArg def_vars[TE_MAX_VARS]; /* Default buffer for variables. */
-    GenOpArg* var = def_vars;
-    int num_vars = 0;
+    GenOpArg var[TE_MAX_VARS];	/* Buffer for variables. */
+    GenOpArg* rest_args = NULL;
+    int num_rest_args = 0;
     int i;			/* General index. */
     Uint mask;
     GenOp* instr;
+    GenOp* first = st->genop;
+    GenOp* keep = NULL;
     Uint* pc;
-    int rval;
     static Uint restart_fail[1] = {TOP_fail};
 
-    ASSERT(gen_opc[st->genop->op].transform != -1);
-    pc = op_transform + gen_opc[st->genop->op].transform;
-    restart = pc;
+    ASSERT(gen_opc[first->op].transform != -1);
+    restart = op_transform + gen_opc[first->op].transform;
 
  restart:
-    if (var != def_vars) {
-	erts_free(ERTS_ALC_T_LOADER_TMP, (void *) var);
-	var = def_vars;
-    }
     ASSERT(restart != NULL);
     pc = restart;
     ASSERT(*pc < NUM_TOPS);	/* Valid instruction? */
-    instr = st->genop;
-
-#define RETURN(r) rval = (r); goto do_return;
+    instr = first;
 
 #ifdef DEBUG
     restart = NULL;
@@ -4752,7 +4842,7 @@ transform_engine(LoaderState* st)
 		 * We'll need at least one more instruction to decide whether
 		 * this combination matches or not.
 		 */
-		RETURN(TE_SHORT_WINDOW);
+		return TE_SHORT_WINDOW;
 	    }
 	    if (*pc++ != instr->op)
 		goto restart;
@@ -4801,7 +4891,8 @@ transform_engine(LoaderState* st)
 	    if (var[i].type != instr->a[ap].type)
 		goto restart;
 	    switch (var[i].type) {
-	    case TAG_r: case TAG_n: break;
+	    case TAG_n:
+		break;
 	    default:
 		if (var[i].val != instr->a[ap].val)
 		    goto restart;
@@ -4913,19 +5004,9 @@ transform_engine(LoaderState* st)
 #if defined(TOP_rest_args)
 	case TOP_rest_args:
 	    {
-		int n = *pc++;
 		int formal_arity = gen_opc[instr->op].arity;
-		int j = formal_arity;
-
-		num_vars = n + (instr->arity - formal_arity);
-		var = erts_alloc(ERTS_ALC_T_LOADER_TMP,
-				 num_vars * sizeof(GenOpArg));
-		for (i = 0; i < n; i++) {
-		    var[i] = def_vars[i];
-		}
-		while (i < num_vars) {
-		    var[i++] = instr->a[j++];
-		}
+		num_rest_args = instr->arity - formal_arity;
+		rest_args = instr->a + formal_arity;
 	    }
 	    break;
 #endif
@@ -4934,21 +5015,22 @@ transform_engine(LoaderState* st)
 	    break;
 	case TOP_commit:
 	    instr = instr->next; /* The next_instr was optimized away. */
-
-	    /*
-	     * The left-hand side of this transformation matched.
-	     * Delete all matched instructions.
-	     */
-	    while (st->genop != instr) {
-		GenOp* next = st->genop->next;
-		FREE_GENOP(st, st->genop);
-		st->genop = next;
-	    }
+	    keep = instr;
+	    st->genop = instr;
 #ifdef DEBUG
 	    instr = 0;
 #endif
 	    break;
-
+#if defined(TOP_keep)
+	case TOP_keep:
+	    /* Keep the current instruction unchanged. */
+	    keep = instr;
+	    st->genop = instr;
+#ifdef DEBUG
+	    instr = 0;
+#endif
+	    break;
+#endif
 #if defined(TOP_call_end)
 	case TOP_call_end:
 	    {
@@ -4973,22 +5055,19 @@ transform_engine(LoaderState* st)
 		    lastp = &((*lastp)->next);
 		}
 		 
-		instr = instr->next; /* The next_instr was optimized away. */
-
-		/*
-		 * The left-hand side of this transformation matched.
-		 * Delete all matched instructions.
-		 */
-		while (st->genop != instr) {
-		    GenOp* next = st->genop->next;
-		    FREE_GENOP(st, st->genop);
-		    st->genop = next;
-		}
-		*lastp = st->genop;
+		keep = instr->next; /* The next_instr was optimized away. */
+		*lastp = keep;
 		st->genop = new_instr;
 	    }
-	    RETURN(TE_OK);
+	    /* FALLTHROUGH */
 #endif
+	case TOP_end:
+	    while (first != keep) {
+		GenOp* next = first->next;
+		FREE_GENOP(st, first);
+		first = next;
+	    }
+	    return TE_OK;
 	case TOP_new_instr:
 	    /*
 	     * Note that the instructions are generated in reverse order.
@@ -5000,6 +5079,12 @@ transform_engine(LoaderState* st)
 	    instr->arity = gen_opc[op].arity;
 	    ap = 0;
 	    break;
+#ifdef TOP_rename
+	case TOP_rename:
+	    instr->op = op = *pc++;
+	    instr->arity = gen_opc[op].arity;
+	    return TE_OK;
+#endif
 	case TOP_store_type:
 	    i = *pc++;
 	    instr->a[ap].type = i;
@@ -5019,14 +5104,10 @@ transform_engine(LoaderState* st)
 #if defined(TOP_store_rest_args)
 	case TOP_store_rest_args:
 	    {
-		int n = *pc++;
-		int num_extra = num_vars - n;
-
-		ASSERT(n <= num_vars);
-		GENOP_ARITY(instr, instr->arity+num_extra);
+		GENOP_ARITY(instr, instr->arity+num_rest_args);
 		memcpy(instr->a, instr->def_args, ap*sizeof(GenOpArg));
-		memcpy(instr->a+ap, var+n, num_extra*sizeof(GenOpArg));
-		ap += num_extra;
+		memcpy(instr->a+ap, rest_args, num_rest_args*sizeof(GenOpArg));
+		ap += num_rest_args;
 	    }
 	    break;
 #endif
@@ -5038,21 +5119,12 @@ transform_engine(LoaderState* st)
 	case TOP_try_me_else_fail:
 	    restart = restart_fail;
 	    break;
-	case TOP_end:
-	    RETURN(TE_OK);
 	case TOP_fail:
-	    RETURN(TE_FAIL);
+	    return TE_FAIL;
 	default:
 	    ASSERT(0);
 	}
     }
-#undef RETURN
-
- do_return:
-    if (var != def_vars) {
-	erts_free(ERTS_ALC_T_LOADER_TMP, (void *) var);
-    }
-    return rval;
 }
 
 static void
@@ -5311,7 +5383,7 @@ new_label(LoaderState* stp)
 					 (void *) stp->labels,
 					 stp->num_labels * sizeof(Label));
     stp->labels[num].value = 0;
-    stp->labels[num].patches = 0;
+    stp->labels[num].patches = -1;
     return num;
 }
 
@@ -5371,7 +5443,7 @@ erts_module_info_0(Process* p, Eterm module)
 {
     Module* modp;
     ErtsCodeIndex code_ix = erts_active_code_ix();
-    BeamInstr* code;
+    BeamCodeHeader* code_hdr;
     Eterm *hp;
     Eterm list = NIL;
     Eterm tup;
@@ -5385,13 +5457,13 @@ erts_module_info_0(Process* p, Eterm module)
 	return THE_NON_VALUE;
     }
 
-    code = modp->curr.code;
-    if (code == NULL) {
+    code_hdr = modp->curr.code_hdr;
+    if (code_hdr == NULL) {
         return THE_NON_VALUE;
     }
 
 #define BUILD_INFO(What) \
-    tup = get_module_info(p, code_ix, code, module, What); \
+    tup = get_module_info(p, code_ix, code_hdr, module, What); \
     hp = HAlloc(p, 5); \
     tup = TUPLE2(hp, What, tup); \
     hp += 3; \
@@ -5414,7 +5486,7 @@ erts_module_info_1(Process* p, Eterm module, Eterm what)
 {
     Module* modp;
     ErtsCodeIndex code_ix = erts_active_code_ix();
-    BeamInstr* code;
+    BeamCodeHeader* code_hdr;
 
     if (is_not_atom(module)) {
         return THE_NON_VALUE;
@@ -5425,34 +5497,34 @@ erts_module_info_1(Process* p, Eterm module, Eterm what)
         return THE_NON_VALUE;
     }
 
-    code = modp->curr.code;
-    if (code == NULL) {
+    code_hdr = modp->curr.code_hdr;
+    if (code_hdr == NULL) {
         return THE_NON_VALUE;
     }
 
-    return get_module_info(p, code_ix, code, module, what);
+    return get_module_info(p, code_ix, code_hdr, module, what);
 }
 
 static Eterm
-get_module_info(Process* p, ErtsCodeIndex code_ix, BeamInstr* code,
+get_module_info(Process* p, ErtsCodeIndex code_ix, BeamCodeHeader* code_hdr,
                 Eterm module, Eterm what)
 {
     if (what == am_module) {
 	return module;
     } else if (what == am_md5) {
-	return md5_of_module(p, code);
+	return md5_of_module(p, code_hdr);
     } else if (what == am_exports) {
 	return exported_from_module(p, code_ix, module);
     } else if (what == am_functions) {
-	return functions_in_module(p, code);
+	return functions_in_module(p, code_hdr);
     } else if (what == am_attributes) {
-	return attributes_for_module(p, code);
+	return attributes_for_module(p, code_hdr);
     } else if (what == am_compile) {
-	return compilation_info_for_module(p, code);
+	return compilation_info_for_module(p, code_hdr);
     } else if (what == am_native_addresses) {
-	return native_addresses(p, code);
+	return native_addresses(p, code_hdr);
     } else if (what == am_native) {
-	return has_native(code);
+	return has_native(code_hdr);
     }
     return THE_NON_VALUE;
 }
@@ -5464,7 +5536,7 @@ get_module_info(Process* p, ErtsCodeIndex code_ix, BeamInstr* code,
 
 Eterm
 functions_in_module(Process* p, /* Process whose heap to use. */
-		    BeamInstr* code)
+		    BeamCodeHeader* code_hdr)
 {
     int i;
     Uint num_functions;
@@ -5473,12 +5545,12 @@ functions_in_module(Process* p, /* Process whose heap to use. */
     Eterm* hp_end;
     Eterm result = NIL;
 
-    num_functions = code[MI_NUM_FUNCTIONS];
+    num_functions = code_hdr->num_functions;
     need = 5*num_functions;
     hp = HAlloc(p, need);
     hp_end = hp + need;
     for (i = num_functions-1; i >= 0 ; i--) {
-	BeamInstr* func_info = (BeamInstr *) code[MI_FUNCTIONS+i];
+	BeamInstr* func_info = code_hdr->functions[i];
 	Eterm name = (Eterm) func_info[3];
 	int arity = (int) func_info[4];
 	Eterm tuple;
@@ -5504,11 +5576,11 @@ functions_in_module(Process* p, /* Process whose heap to use. */
  */
 
 static Eterm
-has_native(BeamInstr *code)
+has_native(BeamCodeHeader *code_hdr)
 {
     Eterm result = am_false;
 #ifdef HIPE
-    if (erts_is_module_native(code)) {
+    if (erts_is_module_native(code_hdr)) {
         result = am_true;
     }
 #endif
@@ -5516,15 +5588,15 @@ has_native(BeamInstr *code)
 }
 
 int
-erts_is_module_native(BeamInstr* code)
+erts_is_module_native(BeamCodeHeader* code_hdr)
 {
     Uint i, num_functions;
 
     /* Check NativeAdress of first real function in module */
-    if (code != NULL) {
-        num_functions = code[MI_NUM_FUNCTIONS];
+    if (code_hdr != NULL) {
+        num_functions = code_hdr->num_functions;
         for (i=0; i<num_functions; i++) {
-            BeamInstr* func_info = (BeamInstr *) code[MI_FUNCTIONS+i];
+            BeamInstr* func_info = (BeamInstr *) code_hdr->functions[i];
             Eterm name = (Eterm) func_info[3];
             if (is_atom(name)) {
                 return func_info[1] != 0;
@@ -5541,7 +5613,7 @@ erts_is_module_native(BeamInstr* code)
  */
 
 static Eterm
-native_addresses(Process* p, BeamInstr* code)
+native_addresses(Process* p, BeamCodeHeader* code_hdr)
 {
     int i;
     Eterm* hp;
@@ -5550,12 +5622,12 @@ native_addresses(Process* p, BeamInstr* code)
     Eterm* hp_end;
     Eterm result = NIL;
 
-    num_functions = code[MI_NUM_FUNCTIONS];
+    num_functions = code_hdr->num_functions;
     need = (6+BIG_UINT_HEAP_SIZE)*num_functions;
     hp = HAlloc(p, need);
     hp_end = hp + need;
     for (i = num_functions-1; i >= 0 ; i--) {
-	BeamInstr* func_info = (BeamInstr *) code[MI_FUNCTIONS+i];
+	BeamInstr* func_info = code_hdr->functions[i];
 	Eterm name = (Eterm) func_info[3];
 	int arity = (int) func_info[4];
 	Eterm tuple;
@@ -5621,16 +5693,16 @@ exported_from_module(Process* p, /* Process whose heap to use. */
 
 Eterm
 attributes_for_module(Process* p, /* Process whose heap to use. */
-                      BeamInstr* code)
+                      BeamCodeHeader* code_hdr)
 {
     byte* ext;
     Eterm result = NIL;
 
-    ext = (byte *) code[MI_ATTR_PTR];
+    ext = code_hdr->attr_ptr;
     if (ext != NULL) {
 	ErtsHeapFactory factory;
-	erts_factory_proc_prealloc_init(&factory, p, code[MI_ATTR_SIZE_ON_HEAP]);
-	result = erts_decode_ext(&factory, &ext);
+	erts_factory_proc_prealloc_init(&factory, p, code_hdr->attr_size_on_heap);
+	result = erts_decode_ext(&factory, &ext, 0);
 	if (is_value(result)) {
 	    erts_factory_close(&factory);
 	}
@@ -5644,16 +5716,16 @@ attributes_for_module(Process* p, /* Process whose heap to use. */
 
 Eterm
 compilation_info_for_module(Process* p, /* Process whose heap to use. */
-                            BeamInstr* code)
+                            BeamCodeHeader* code_hdr)
 {
     byte* ext;
     Eterm result = NIL;
 
-    ext = (byte *) code[MI_COMPILE_PTR];
+    ext = code_hdr->compile_ptr;
     if (ext != NULL) {
 	ErtsHeapFactory factory;
-	erts_factory_proc_prealloc_init(&factory, p, code[MI_COMPILE_SIZE_ON_HEAP]);
-	result = erts_decode_ext(&factory, &ext);
+	erts_factory_proc_prealloc_init(&factory, p, code_hdr->compile_size_on_heap);
+	result = erts_decode_ext(&factory, &ext, 0);
 	if (is_value(result)) {
 	    erts_factory_close(&factory);
 	}
@@ -5667,9 +5739,9 @@ compilation_info_for_module(Process* p, /* Process whose heap to use. */
 
 Eterm
 md5_of_module(Process* p, /* Process whose heap to use. */
-              BeamInstr* code)
+              BeamCodeHeader* code_hdr)
 {
-    return new_binary(p, (byte *) code[MI_MD5_PTR], MD5_SIZE);
+    return new_binary(p, code_hdr->md5_ptr, MD5_SIZE);
 }
 
 /*
@@ -5868,7 +5940,7 @@ make_stub(BeamInstr* fp, Eterm mod, Eterm func, Uint arity, Uint native, BeamIns
     fp[4] = arity;
 #ifdef HIPE
     if (native) {
-	fp[5] = BeamOpCode(op_move_return_nr);
+	fp[5] = BeamOpCode(op_move_return_n);
 	hipe_mfa_save_orig_beam_op(mod, func, arity, fp+5);
     }
 #endif
@@ -5880,7 +5952,7 @@ static byte*
 stub_copy_info(LoaderState* stp,
 	       int chunk,	/* Chunk: ATTR_CHUNK or COMPILE_CHUNK */
 	       byte* info,	/* Where to store info. */
-	       BeamInstr* ptr_word,	/* Where to store pointer into info. */
+	       byte** ptr_word,	/* Where to store pointer into info. */
 	       BeamInstr* size_word,	/* Where to store size into info. */
 	       BeamInstr* size_on_heap_word) /* Where to store size on heap. */
 {
@@ -5888,7 +5960,7 @@ stub_copy_info(LoaderState* stp,
     Uint size = stp->chunks[chunk].size;
     if (size != 0) {
 	memcpy(info, stp->chunks[chunk].start, size);
-	*ptr_word = (BeamInstr) info;
+	*ptr_word = info;
 	decoded_size = erts_decode_ext_size(info, size);
 	if (decoded_size < 0) {
  	    return 0;
@@ -6143,15 +6215,14 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info)
     BeamInstr Patchlist;
     Eterm MD5Bin;
     Eterm* tp;
-    BeamInstr* code = NULL;
-    BeamInstr* ptrs;
+    BeamCodeHeader* code_hdr;
+    BeamInstr* code_base;
     BeamInstr* fp;
     byte* info;
-    Uint ci;
-    int n;
+    Sint n;
     int code_size;
     int rval;
-    int i;
+    Sint i;
     byte* temp_alloc = NULL;
     byte* bytes;
     Uint size;
@@ -6225,39 +6296,40 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info)
      * Allocate memory for the stub module.
      */
 
-    code_size = ((WORDS_PER_FUNCTION+1)*n + MI_FUNCTIONS + 2) * sizeof(BeamInstr);
-    code_size += stp->chunks[ATTR_CHUNK].size;
-    code_size += stp->chunks[COMPILE_CHUNK].size;
-    code_size += MD5_SIZE;
-    code = erts_alloc_fnf(ERTS_ALC_T_CODE, code_size);
-    if (!code) {
+    code_size = (offsetof(BeamCodeHeader,functions)
+                 + ((n+1) * sizeof(BeamInstr*))
+                 + (WORDS_PER_FUNCTION*n + 1) * sizeof(BeamInstr)
+                 + stp->chunks[ATTR_CHUNK].size
+                 + stp->chunks[COMPILE_CHUNK].size
+                 + MD5_SIZE);
+    code_hdr = erts_alloc_fnf(ERTS_ALC_T_CODE, code_size);
+    if (!code_hdr) {
 	goto error;
     }
 
     /*
-     * Initialize code area.
+     * Initialize code header.
      */
 
-    code[MI_NUM_FUNCTIONS] = n;
-    code[MI_ATTR_PTR] = 0;
-    code[MI_ATTR_SIZE] = 0;
-    code[MI_ATTR_SIZE_ON_HEAP] = 0;
-    code[MI_COMPILE_PTR] = 0;
-    code[MI_COMPILE_SIZE] = 0;
-    code[MI_COMPILE_SIZE_ON_HEAP] = 0;
-    code[MI_LITERALS_START] = 0;
-    code[MI_LITERALS_END] = 0;
-    code[MI_LITERALS_OFF_HEAP] = 0;
-    code[MI_ON_LOAD_FUNCTION_PTR] = 0;
-    code[MI_MD5_PTR] = 0;
-    ci = MI_FUNCTIONS + n + 1;
+    code_hdr->num_functions = n;
+    code_hdr->attr_ptr = NULL;
+    code_hdr->attr_size = 0;
+    code_hdr->attr_size_on_heap = 0;
+    code_hdr->compile_ptr = NULL;
+    code_hdr->compile_size = 0;
+    code_hdr->compile_size_on_heap = 0;
+    code_hdr->literals_start = NULL;
+    code_hdr->literals_end = NULL;
+    code_hdr->literals_off_heap = 0;
+    code_hdr->on_load_function_ptr = NULL;
+    code_hdr->line_table = NULL;
+    code_hdr->md5_ptr = NULL;
 
     /*
      * Make stubs for all functions.
      */
 
-    ptrs = code + MI_FUNCTIONS;
-    fp = code + ci;
+    fp = code_base = (BeamInstr*) &code_hdr->functions[n+1];
     for (i = 0; i < n; i++) {
 	Eterm* listp;
 	Eterm tuple;
@@ -6300,11 +6372,11 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info)
 	 * Set the pointer and make the stub. Put a return instruction
 	 * as the body until we know what kind of trap we should put there.
 	 */
-	ptrs[i] = (BeamInstr) fp;
+	code_hdr->functions[i] = fp;
 #ifdef HIPE
 	op = (Eterm) BeamOpCode(op_hipe_trap_call); /* Might be changed later. */
 #else
-	op = (Eterm) BeamOpCode(op_move_return_nr);
+	op = (Eterm) BeamOpCode(op_move_return_n);
 #endif
 	fp = make_stub(fp, Mod, func, arity, (Uint)native_address, op);
     }
@@ -6313,7 +6385,7 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info)
      * Insert the last pointer and the int_code_end instruction.
      */
 
-    ptrs[i] = (BeamInstr) fp;
+    code_hdr->functions[i] = fp;
     *fp++ = (BeamInstr) BeamOp(op_int_code_end);
 
     /*
@@ -6322,16 +6394,16 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info)
 
     info = (byte *) fp;
     info = stub_copy_info(stp, ATTR_CHUNK, info,
-			  code+MI_ATTR_PTR,
-			  code+MI_ATTR_SIZE,
-			  code+MI_ATTR_SIZE_ON_HEAP);
+			  &code_hdr->attr_ptr,
+			  &code_hdr->attr_size,
+			  &code_hdr->attr_size_on_heap);
     if (info == NULL) {
 	goto error;
     }
     info = stub_copy_info(stp, COMPILE_CHUNK, info,
-			  code+MI_COMPILE_PTR,
-			  code+MI_COMPILE_SIZE,
-			  code+MI_COMPILE_SIZE_ON_HEAP);
+			  &code_hdr->compile_ptr,
+			  &code_hdr->compile_size,
+			  &code_hdr->compile_size_on_heap);
     if (info == NULL) {
 	goto error;
     }
@@ -6340,7 +6412,7 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info)
       byte *md5 = NULL;
       if ((md5 = erts_get_aligned_binary_bytes(MD5Bin, &tmp)) != NULL) {
         sys_memcpy(info, md5, MD5_SIZE);
-        code[MI_MD5_PTR] = (BeamInstr) info;
+        code_hdr->md5_ptr = info;
       }
       erts_free_aligned_binary_bytes(tmp);
     }
@@ -6349,7 +6421,7 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info)
      * Insert the module in the module table.
      */
 
-    rval = insert_new_code(p, 0, p->group_leader, Mod, code, code_size);
+    rval = insert_new_code(p, 0, p->group_leader, Mod, code_hdr, code_size);
     if (rval != NIL) {
 	goto error;
     }
@@ -6358,7 +6430,7 @@ erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info)
      * Export all stub functions and insert the correct type of HiPE trap.
      */
 
-    fp = code + ci;
+    fp = code_base;
     for (i = 0; i < n; i++) {
 	stub_final_touch(stp, fp);
 	fp += WORDS_PER_FUNCTION;
diff --git a/erts/emulator/beam/beam_load.h b/erts/emulator/beam/beam_load.h
index d5af634fad..68f4b96893 100644
--- a/erts/emulator/beam/beam_load.h
+++ b/erts/emulator/beam/beam_load.h
@@ -24,7 +24,6 @@
 #include "beam_opcodes.h"
 #include "erl_process.h"
 
-int erts_is_module_native(BeamInstr* code);
 Eterm beam_make_current_old(Process *c_p, ErtsProcLocks c_p_locks,
 			    Eterm module);
 
@@ -34,7 +33,6 @@ typedef struct gen_op_entry {
    int specific;
    int num_specific;
    int transform;
-   int min_window;
 } GenOpEntry;
 
 extern GenOpEntry gen_opc[];
@@ -52,6 +50,7 @@ extern BeamInstr* em_call_error_handler;
 extern BeamInstr* em_apply_bif;
 extern BeamInstr* em_call_nif;
 
+
 /*
  * The following variables keep a sorted list of address ranges for
  * each module.  It allows us to quickly find a function given an
@@ -60,72 +59,81 @@ extern BeamInstr* em_call_nif;
 
 /* Total code size in bytes */
 extern Uint erts_total_code_size;
-/*
- * Index into start of code chunks which contains additional information
- * about the loaded module.
- *
- * First number of functions.
- */
 
-#define MI_NUM_FUNCTIONS     0
+typedef struct BeamCodeLineTab_ BeamCodeLineTab;
 
 /*
- * The attributes retrieved by Mod:module_info(attributes).
- */
-
-#define MI_ATTR_PTR          1
-#define MI_ATTR_SIZE	     2
-#define MI_ATTR_SIZE_ON_HEAP 3
-
-/*
- * The compilation information retrieved by Mod:module_info(compile).
- */
-
-#define MI_COMPILE_PTR          4
-#define MI_COMPILE_SIZE         5
-#define MI_COMPILE_SIZE_ON_HEAP 6
-
-/*
- * Literal area (constant pool).
- */
-#define MI_LITERALS_START	7
-#define MI_LITERALS_END		8
-#define MI_LITERALS_OFF_HEAP	9
-
-/*
- * Pointer to the on_load function (or NULL if none).
- */
-#define MI_ON_LOAD_FUNCTION_PTR 10
-
-/*
- * Pointer to the line table (or NULL if none).
- */
-#define MI_LINE_TABLE 11
-
-/*
- * Pointer to the module MD5 sum (16 bytes)
- */
-#define MI_MD5_PTR 12
-
-/*
- * Start of function pointer table.  This table contains pointers to
- * all functions in the module plus an additional pointer just beyond
- * the end of the last function.
- *
- * The actual loaded code (for the first function) start just beyond
- * this table.
+ * Header of code chunks which contains additional information
+ * about the loaded module.
  */
-
-#define MI_FUNCTIONS         13
+typedef struct beam_code_header {
+    /*
+     * Number of functions.
+     */
+    UWord num_functions;
+
+    /*
+     * The attributes retrieved by Mod:module_info(attributes).
+     */
+    byte* attr_ptr;
+    UWord attr_size;
+    UWord attr_size_on_heap;
+
+    /*
+     * The compilation information retrieved by Mod:module_info(compile).
+     */
+    byte* compile_ptr;
+    UWord compile_size;
+    UWord compile_size_on_heap;
+
+    /*
+     * Literal area (constant pool).
+     */
+    Eterm* literals_start;
+    Eterm* literals_end;
+    struct erl_off_heap_header* literals_off_heap;
+
+    /*
+     * Pointer to the on_load function (or NULL if none).
+     */
+    BeamInstr* on_load_function_ptr;
+
+    /*
+     * Pointer to the line table (or NULL if none).
+     */
+    BeamCodeLineTab* line_table;
+
+    /*
+     * Pointer to the module MD5 sum (16 bytes)
+     */
+    byte* md5_ptr;
+
+    /*
+     * Start of function pointer table.  This table contains pointers to
+     * all functions in the module plus an additional pointer just beyond
+     * the end of the last function.
+     *
+     * The actual loaded code (for the first function) start just beyond
+     * this table.
+     */
+    BeamInstr* functions[1];
+
+}BeamCodeHeader;
+
+int erts_is_module_native(BeamCodeHeader* code);
 
 /*
  * Layout of the line table.
  */
-
-#define MI_LINE_FNAME_PTR 0
-#define MI_LINE_LOC_TAB 1
-#define MI_LINE_LOC_SIZE 2
-#define MI_LINE_FUNC_TAB 3
+struct BeamCodeLineTab_ {
+    Eterm* fname_ptr;
+    int loc_size;
+    union {
+        Uint16* p2;
+        Uint32* p4;
+    }loc_tab;
+    const BeamInstr** func_tab[1];
+};
 
 #define LINE_INVALID_LOCATION (0)
 
diff --git a/erts/emulator/beam/beam_ranges.c b/erts/emulator/beam/beam_ranges.c
index 19079ba150..54c337ee72 100644
--- a/erts/emulator/beam/beam_ranges.c
+++ b/erts/emulator/beam/beam_ranges.c
@@ -37,8 +37,8 @@ typedef struct {
 #define RANGE_END(R) ((BeamInstr*)erts_smp_atomic_read_nob(&(R)->end))
 
 static Range* find_range(BeamInstr* pc);
-static void lookup_loc(FunctionInfo* fi, BeamInstr* pc,
-		       BeamInstr* modp, int idx);
+static void lookup_loc(FunctionInfo* fi, const BeamInstr* pc,
+		       BeamCodeHeader*, int idx);
 
 /*
  * The following variables keep a sorted list of address ranges for
@@ -53,6 +53,7 @@ struct ranges {
 };
 static struct ranges r[ERTS_NUM_CODE_IX];
 static erts_smp_atomic_t mem_used;
+static Range* write_ptr;
 
 #ifdef HARD_DEBUG
 static void check_consistency(struct ranges* p)
@@ -72,6 +73,17 @@ static void check_consistency(struct ranges* p)
 #  define CHECK(r)
 #endif /* HARD_DEBUG */
 
+static int
+rangecompare(Range* a, Range* b)
+{
+    if (a->start < b->start) {
+	return -1;
+    } else if (a->start == b->start) {
+	return 0;
+    } else {
+	return 1;
+    }
+}
 
 void
 erts_init_ranges(void)
@@ -88,45 +100,70 @@ erts_init_ranges(void)
 }
 
 void
-erts_start_staging_ranges(void)
+erts_start_staging_ranges(int num_new)
 {
+    ErtsCodeIndex src = erts_active_code_ix();
     ErtsCodeIndex dst = erts_staging_code_ix();
+    Sint need;
 
     if (r[dst].modules) {
 	erts_smp_atomic_add_nob(&mem_used, -r[dst].allocated);
 	erts_free(ERTS_ALC_T_MODULE_REFS, r[dst].modules);
-	r[dst].modules = NULL;
     }
+
+    need = r[dst].allocated = r[src].n + num_new;
+    erts_smp_atomic_add_nob(&mem_used, need);
+    write_ptr = erts_alloc(ERTS_ALC_T_MODULE_REFS,
+			   need * sizeof(Range));
+    r[dst].modules = write_ptr;
 }
 
 void
 erts_end_staging_ranges(int commit)
 {
-    ErtsCodeIndex dst = erts_staging_code_ix();
-
-    if (commit && r[dst].modules == NULL) {
+    if (commit) {
 	Sint i;
-	Sint n;
-
-	/* No modules added, just clone src and remove purged code. */
 	ErtsCodeIndex src = erts_active_code_ix();
+	ErtsCodeIndex dst = erts_staging_code_ix();
+	Range* mp;
+	Sint num_inserted;
 
-	erts_smp_atomic_add_nob(&mem_used, r[src].n);
-	r[dst].modules = erts_alloc(ERTS_ALC_T_MODULE_REFS,
-				    r[src].n * sizeof(Range));
-	r[dst].allocated = r[src].n;
-	n = 0;
+	mp = r[dst].modules;
+	num_inserted = write_ptr - mp;
 	for (i = 0; i < r[src].n; i++) {
 	    Range* rp = r[src].modules+i;
 	    if (rp->start < RANGE_END(rp)) {
 		/* Only insert a module that has not been purged. */
-		r[dst].modules[n] = *rp;
-		n++;
+		write_ptr->start = rp->start;
+		erts_smp_atomic_init_nob(&write_ptr->end,
+					 (erts_aint_t)(RANGE_END(rp)));
+		write_ptr++;
+	    }
+	}
+
+	/*
+	 * There are num_inserted new range entries (unsorted) at the
+	 * beginning of the modules array, followed by the old entries
+	 * (sorted). We must now sort the entire array.
+	 */
+
+	r[dst].n = write_ptr - mp;
+	if (num_inserted > 1) {
+	    qsort(mp, r[dst].n, sizeof(Range),
+		  (int (*)(const void *, const void *)) rangecompare);
+	} else if (num_inserted == 1) {
+	    /* Sift the new range into place. This is faster than qsort(). */
+	    Range t = mp[0];
+	    for (i = 0; i < r[dst].n-1 && t.start > mp[i+1].start; i++) {
+		mp[i] = mp[i+1];
 	    }
+	    mp[i] = t;
 	}
-	r[dst].n = n;
+	r[dst].modules = mp;
+	CHECK(&r[dst]);
 	erts_smp_atomic_set_nob(&r[dst].mid,
-				(erts_aint_t) (r[dst].modules + n / 2));
+				(erts_aint_t) (r[dst].modules +
+					       r[dst].n / 2));
     }
 }
 
@@ -135,82 +172,29 @@ erts_update_ranges(BeamInstr* code, Uint size)
 {
     ErtsCodeIndex dst = erts_staging_code_ix();
     ErtsCodeIndex src = erts_active_code_ix();
-    Sint i;
-    Sint n;
-    Sint need;
 
     if (src == dst) {
 	ASSERT(!erts_initialized);
 
 	/*
-	 * During start-up of system, the indices are the same.
-	 * Handle this by faking a source area.
+	 * During start-up of system, the indices are the same
+	 * and erts_start_staging_ranges() has not been called.
 	 */
-	src = (src+1) % ERTS_NUM_CODE_IX;
-	if (r[src].modules) {
-	    erts_smp_atomic_add_nob(&mem_used, -r[src].allocated);
-	    erts_free(ERTS_ALC_T_MODULE_REFS, r[src].modules);
+	if (r[dst].modules == NULL) {
+	    Sint need = 128;
+	    erts_smp_atomic_add_nob(&mem_used, need);
+	    r[dst].modules = erts_alloc(ERTS_ALC_T_MODULE_REFS,
+					need * sizeof(Range));
+	    r[dst].allocated = need;
+	    write_ptr = r[dst].modules;
 	}
-	r[src] = r[dst];
-	r[dst].modules = 0;
     }
 
-    CHECK(&r[src]);
-
-    ASSERT(r[dst].modules == NULL);
-    need = r[dst].allocated = r[src].n + 1;
-    erts_smp_atomic_add_nob(&mem_used, need);
-    r[dst].modules = (Range *) erts_alloc(ERTS_ALC_T_MODULE_REFS,
-					  need * sizeof(Range));
-    n = 0;
-    for (i = 0; i < r[src].n; i++) {
-	Range* rp = r[src].modules+i;
-	if (code < rp->start) {
-	    r[dst].modules[n].start = code;
-	    erts_smp_atomic_init_nob(&r[dst].modules[n].end,
-				     (erts_aint_t)(((byte *)code) + size));
-	    ASSERT(!n || RANGE_END(&r[dst].modules[n-1]) < code);
-	    n++;
-	    break;
-	}
-	if (rp->start < RANGE_END(rp)) {
-	    /* Only insert a module that has not been purged. */
-	    r[dst].modules[n].start = rp->start;
-	    erts_smp_atomic_init_nob(&r[dst].modules[n].end,
-				     (erts_aint_t)(RANGE_END(rp)));
-	    ASSERT(!n || RANGE_END(&r[dst].modules[n-1]) < rp->start);
-	    n++;
-	}
-    }
-
-    while (i < r[src].n) {
-	Range* rp = r[src].modules+i;
-	if (rp->start < RANGE_END(rp)) {
-	    /* Only insert a module that has not been purged. */
-	    r[dst].modules[n].start = rp->start;
-	    erts_smp_atomic_init_nob(&r[dst].modules[n].end,
-				     (erts_aint_t)(RANGE_END(rp)));
-	    ASSERT(!n || RANGE_END(&r[dst].modules[n-1]) < rp->start);
-	    n++;
-	}
-	i++;
-    }
-
-    if (n == 0 || code > r[dst].modules[n-1].start) {
-	r[dst].modules[n].start = code;
-	erts_smp_atomic_init_nob(&r[dst].modules[n].end,
-				 (erts_aint_t)(((byte *)code) + size));
-	ASSERT(!n || RANGE_END(&r[dst].modules[n-1]) < code);
-	n++;
-    }
-
-    ASSERT(n <= r[src].n+1);
-    r[dst].n = n;
-    erts_smp_atomic_set_nob(&r[dst].mid,
-			    (erts_aint_t) (r[dst].modules + n / 2));
-
-    CHECK(&r[dst]);
-    CHECK(&r[src]);
+    ASSERT(r[dst].modules);
+    write_ptr->start = code;
+    erts_smp_atomic_init_nob(&(write_ptr->end),
+			     (erts_aint_t)(((byte *)code) + size));
+    write_ptr++;
 }
 
 void
@@ -241,6 +225,7 @@ erts_lookup_function_info(FunctionInfo* fi, BeamInstr* pc, int full_info)
     BeamInstr** high;
     BeamInstr** mid;
     Range* rp;
+    BeamCodeHeader* hdr;
 
     fi->current = NULL;
     fi->needed = 5;
@@ -249,9 +234,10 @@ erts_lookup_function_info(FunctionInfo* fi, BeamInstr* pc, int full_info)
     if (rp == 0) {
 	return;
     }
+    hdr = (BeamCodeHeader*) rp->start;
 
-    low = (BeamInstr **) (rp->start + MI_FUNCTIONS);
-    high = low + rp->start[MI_NUM_FUNCTIONS];
+    low = hdr->functions;
+    high = low + hdr->num_functions;
     while (low < high) {
 	mid = low + (high-low) / 2;
 	if (pc < mid[0]) {
@@ -259,10 +245,9 @@ erts_lookup_function_info(FunctionInfo* fi, BeamInstr* pc, int full_info)
 	} else if (pc < mid[1]) {
 	    fi->current = mid[0]+2;
 	    if (full_info) {
-		BeamInstr** fp = (BeamInstr **) (rp->start +
-						 MI_FUNCTIONS);
+		BeamInstr** fp = hdr->functions;
 		int idx = mid - fp;
-		lookup_loc(fi, pc, rp->start, idx);
+		lookup_loc(fi, pc, hdr, idx);
 	    }
 	    return;
 	} else {
@@ -295,39 +280,34 @@ find_range(BeamInstr* pc)
 }
 
 static void
-lookup_loc(FunctionInfo* fi, BeamInstr* orig_pc, BeamInstr* modp, int idx)
+lookup_loc(FunctionInfo* fi, const BeamInstr* pc,
+           BeamCodeHeader* code_hdr, int idx)
 {
-    Eterm* line = (Eterm *) modp[MI_LINE_TABLE];
-    Eterm* low;
-    Eterm* high;
-    Eterm* mid;
-    Eterm pc;
+    BeamCodeLineTab* lt = code_hdr->line_table;
+    const BeamInstr** low;
+    const BeamInstr** high;
+    const BeamInstr** mid;
 
-    if (line == 0) {
+    if (lt == NULL) {
 	return;
     }
 
-    pc = (Eterm) (BeamInstr) orig_pc;
-    fi->fname_ptr = (Eterm *) (BeamInstr) line[MI_LINE_FNAME_PTR];
-    low = (Eterm *) (BeamInstr) line[MI_LINE_FUNC_TAB+idx];
-    high = (Eterm *) (BeamInstr) line[MI_LINE_FUNC_TAB+idx+1];
+    fi->fname_ptr = lt->fname_ptr;
+    low = lt->func_tab[idx];
+    high = lt->func_tab[idx+1];
     while (high > low) {
 	mid = low + (high-low) / 2;
 	if (pc < mid[0]) {
 	    high = mid;
 	} else if (pc < mid[1]) {
 	    int file;
-	    int index = mid - (Eterm *) (BeamInstr) line[MI_LINE_FUNC_TAB];
+	    int index = mid - lt->func_tab[0];
 
-	    if (line[MI_LINE_LOC_SIZE] == 2) {
-		Uint16* loc_table =
-		    (Uint16 *) (BeamInstr) line[MI_LINE_LOC_TAB];
-		fi->loc = loc_table[index];
+	    if (lt->loc_size == 2) {
+		fi->loc = lt->loc_tab.p2[index];
 	    } else {
-		Uint32* loc_table =
-		    (Uint32 *) (BeamInstr) line[MI_LINE_LOC_TAB];
-		ASSERT(line[MI_LINE_LOC_SIZE] == 4);
-		fi->loc = loc_table[index];
+		ASSERT(lt->loc_size == 4);
+		fi->loc = lt->loc_tab.p4[index];
 	    }
 	    if (fi->loc == LINE_INVALID_LOCATION) {
 		return;
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index a8cc19ee1f..75ccaa6dd9 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -44,6 +44,7 @@
 #include "erl_ptab.h"
 #include "erl_bits.h"
 #include "erl_bif_unique.h"
+#include "erl_msacc.h"
 
 Export *erts_await_result;
 static Export* flush_monitor_messages_trap = NULL;
@@ -54,6 +55,9 @@ Export* erts_format_cpu_topology_trap = NULL;
 static Export dsend_continue_trap_export;
 Export *erts_convert_time_unit_trap = NULL;
 
+static Export *await_msacc_mod_trap = NULL;
+static erts_smp_atomic32_t msacc;
+
 static Export *await_sched_wall_time_mod_trap;
 static erts_smp_atomic32_t sched_wall_time;
 
@@ -72,7 +76,7 @@ BIF_RETTYPE spawn_3(BIF_ALIST_3)
     ErlSpawnOpts so;
     Eterm pid;
 
-    so.flags = 0;
+    so.flags = erts_default_spo_flags;
     pid = erl_create_process(BIF_P, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3, &so);
     if (is_non_value(pid)) {
 	BIF_ERROR(BIF_P, so.error_code);
@@ -589,7 +593,7 @@ erts_queue_monitor_message(Process *p,
     Eterm reason_copy, ref_copy, item_copy;
     Uint reason_size, ref_size, item_size, heap_size;
     ErlOffHeap *ohp;
-    ErlHeapFragment *bp;
+    ErtsMessage *msgp;
 
     reason_size = IS_CONST(reason) ? 0 : size_object(reason);
     item_size   = IS_CONST(item) ? 0 : size_object(item);
@@ -597,11 +601,8 @@ erts_queue_monitor_message(Process *p,
 
     heap_size = 6+reason_size+ref_size+item_size;
 
-    hp = erts_alloc_message_heap(heap_size,
-				 &bp,
-				 &ohp,
-				 p,
-				 p_locksp);
+    msgp = erts_alloc_message_heap(p, p_locksp, heap_size,
+				   &hp, &ohp);
 
     reason_copy = (IS_CONST(reason)
 		   ? reason
@@ -612,7 +613,7 @@ erts_queue_monitor_message(Process *p,
     ref_copy    = copy_struct(ref, ref_size, &hp, ohp);
 
     tup = TUPLE5(hp, am_DOWN, ref_copy, type, item_copy, reason_copy);
-    erts_queue_message(p, p_locksp, bp, tup, NIL);
+    erts_queue_message(p, p_locksp, msgp, tup, NIL);
 }
 
 static BIF_RETTYPE
@@ -841,7 +842,7 @@ BIF_RETTYPE spawn_link_3(BIF_ALIST_3)
     ErlSpawnOpts so;
     Eterm pid;
 
-    so.flags = SPO_LINK;
+    so.flags = erts_default_spo_flags|SPO_LINK;
     pid = erl_create_process(BIF_P, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3, &so);
     if (is_non_value(pid)) {
 	BIF_ERROR(BIF_P, so.error_code);
@@ -878,7 +879,7 @@ BIF_RETTYPE spawn_opt_1(BIF_ALIST_1)
     /*
      * Store default values for options.
      */
-    so.flags          = SPO_USE_ARGS;
+    so.flags          = erts_default_spo_flags|SPO_USE_ARGS;
     so.min_heap_size  = H_MIN_SIZE;
     so.min_vheap_size = BIN_VH_MIN_SIZE;
     so.priority       = PRIORITY_NORMAL;
@@ -913,6 +914,22 @@ BIF_RETTYPE spawn_opt_1(BIF_ALIST_1)
 		    so.priority = PRIORITY_LOW;
 		else
 		    goto error;
+	    } else if (arg == am_message_queue_data) {
+		switch (val) {
+		case am_mixed:
+		    so.flags &= ~(SPO_OFF_HEAP_MSGQ|SPO_ON_HEAP_MSGQ);
+		    break;
+		case am_on_heap:
+		    so.flags &= ~SPO_OFF_HEAP_MSGQ;
+		    so.flags |= SPO_ON_HEAP_MSGQ;
+		    break;
+		case am_off_heap:
+		    so.flags &= ~SPO_ON_HEAP_MSGQ;
+		    so.flags |= SPO_OFF_HEAP_MSGQ;
+		    break;
+		default:
+		    goto error;
+		}
 	    } else if (arg == am_min_heap_size && is_small(val)) {
 		Sint min_heap_size = signed_val(val);
 		if (min_heap_size < 0) {
@@ -1550,7 +1567,7 @@ static BIF_RETTYPE process_flag_aux(Process *BIF_P,
 	   scb->n = 0;
        }
 
-       scb = ERTS_PROC_SET_SAVED_CALLS_BUF(rp, ERTS_PROC_LOCK_MAIN, scb);
+       scb = ERTS_PROC_SET_SAVED_CALLS_BUF(rp, scb);
 
        if (!scb)
 	   old_value = make_small(0);
@@ -1578,9 +1595,7 @@ BIF_RETTYPE process_flag_2(BIF_ALIST_2)
       if (is_not_atom(BIF_ARG_2)) {
 	 goto error;
       }
-      old_value = erts_proc_set_error_handler(BIF_P,
-					      ERTS_PROC_LOCK_MAIN,
-					      BIF_ARG_2);
+      old_value = erts_proc_set_error_handler(BIF_P, BIF_ARG_2);
       BIF_RET(old_value);
    }
    else if (BIF_ARG_1 == am_priority) {
@@ -1605,14 +1620,17 @@ BIF_RETTYPE process_flag_2(BIF_ALIST_2)
 	*       true. For more info, see implementation of
 	*       erts_send_exit_signal().
 	*/
+       erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCKS_XSIG_SEND);
        if (trap_exit)
 	   state = erts_smp_atomic32_read_bor_mb(&BIF_P->state,
 						 ERTS_PSFLG_TRAP_EXIT);
        else
 	   state = erts_smp_atomic32_read_band_mb(&BIF_P->state,
 						  ~ERTS_PSFLG_TRAP_EXIT);
+       erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCKS_XSIG_SEND);
+
 #ifdef ERTS_SMP
-       if (ERTS_PROC_PENDING_EXIT(BIF_P)) {
+       if (state & ERTS_PSFLG_PENDING_EXIT) {
 	   erts_handle_pending_exit(BIF_P, ERTS_PROC_LOCK_MAIN);
 	   ERTS_BIF_EXITED(BIF_P);
        }
@@ -1691,6 +1709,12 @@ BIF_RETTYPE process_flag_2(BIF_ALIST_2)
        }
        BIF_RET(old_value);
    }
+   else if (BIF_ARG_1 == am_message_queue_data) {
+       old_value = erts_change_message_queue_management(BIF_P, BIF_ARG_2);
+       if (is_non_value(old_value))
+	   goto error;
+       BIF_RET(old_value);
+   }
    else if (BIF_ARG_1 == am_sensitive) {
        Uint is_sensitive;
        if (BIF_ARG_2 == am_true) {
@@ -1931,7 +1955,7 @@ do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext* ctx)
     } else if (is_atom(to)) {
 	Eterm id = erts_whereis_name_to_id(p, to);
 
-	rp = erts_proc_lookup(id);
+	rp = erts_proc_lookup_raw(id);
 	if (rp) {
 	    if (IS_TRACED(p))
 		trace_send(p, to, msg);
@@ -2023,11 +2047,7 @@ do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext* ctx)
 	if (ERTS_PROC_GET_SAVED_CALLS_BUF(p))
 	    save_calls(p, &exp_send);
 	
-	if (SEQ_TRACE_TOKEN(p) != NIL
-#ifdef USE_VM_PROBES
-	    && SEQ_TRACE_TOKEN(p) != am_have_dt_utag
-#endif
-	    ) {
+        if (have_seqtrace(SEQ_TRACE_TOKEN(p))) {
 	    seq_trace_update_send(p);
 	    seq_trace_output(SEQ_TRACE_TOKEN(p), msg, 
 			     SEQ_TRACE_SEND, portid, p);
@@ -2128,7 +2148,11 @@ BIF_RETTYPE send_3(BIF_ALIST_3)
     int connect = !0;
     Eterm l = opts;
     Sint result;
+
     DeclareTypedTmpHeap(ErtsSendContext, ctx, BIF_P);
+
+    ERTS_MSACC_PUSH_STATE_M_X();
+
     UseTmpHeap(sizeof(ErtsSendContext)/sizeof(Eterm), BIF_P);
 
     ctx->suspend = !0;
@@ -2157,7 +2181,10 @@ BIF_RETTYPE send_3(BIF_ALIST_3)
     ref = NIL;
 #endif
 
+    ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_SEND);
     result = do_send(p, to, msg, &ref, ctx);
+    ERTS_MSACC_POP_STATE_M_X();
+
     if (result > 0) {
 	ERTS_VBUMP_REDS(p, result);
 	if (ERTS_IS_PROC_OUT_OF_REDS(p))
@@ -2216,7 +2243,7 @@ BIF_RETTYPE send_3(BIF_ALIST_3)
 			    erts_dsend_export_trap_context(p, ctx));
 	break;
     default:
-	erl_exit(ERTS_ABORT_EXIT, "send_3 invalid result %d\n", (int)result);
+	erts_exit(ERTS_ABORT_EXIT, "send_3 invalid result %d\n", (int)result);
 	break;
     }
 
@@ -2260,7 +2287,7 @@ static BIF_RETTYPE dsend_continue_trap_1(BIF_ALIST_1)
 	BIF_TRAP1(&dsend_continue_trap_export, BIF_P, BIF_ARG_1);
     }
     default:
-	erl_exit(ERTS_ABORT_EXIT, "dsend_continue_trap invalid result %d\n", (int)result);
+	erts_exit(ERTS_ABORT_EXIT, "dsend_continue_trap invalid result %d\n", (int)result);
 	break;
     }
     ASSERT(! "Can not arrive here");
@@ -2273,8 +2300,8 @@ Eterm erl_send(Process *p, Eterm to, Eterm msg)
     Eterm ref;
     Sint result;
     DeclareTypedTmpHeap(ErtsSendContext, ctx, p);
+    ERTS_MSACC_PUSH_AND_SET_STATE_M_X(ERTS_MSACC_STATE_SEND);
     UseTmpHeap(sizeof(ErtsSendContext)/sizeof(Eterm), p);
-
 #ifdef DEBUG
     ref = NIL;
 #endif
@@ -2285,7 +2312,9 @@ Eterm erl_send(Process *p, Eterm to, Eterm msg)
     ctx->dss.phase = ERTS_DSIG_SEND_PHASE_INIT;
 
     result = do_send(p, to, msg, &ref, ctx);
-    
+
+    ERTS_MSACC_POP_STATE_M_X();
+
     if (result > 0) {
 	ERTS_VBUMP_REDS(p, result);
 	if (ERTS_IS_PROC_OUT_OF_REDS(p))
@@ -2332,7 +2361,7 @@ Eterm erl_send(Process *p, Eterm to, Eterm msg)
 			    erts_dsend_export_trap_context(p, ctx));
 	break;
     default:
-	erl_exit(ERTS_ABORT_EXIT, "invalid send result %d\n", (int)result);
+	erts_exit(ERTS_ABORT_EXIT, "invalid send result %d\n", (int)result);
 	break;
     }
 
@@ -2809,7 +2838,7 @@ BIF_RETTYPE list_to_atom_1(BIF_ALIST_1)
 {
     Eterm res;
     char *buf = (char *) erts_alloc(ERTS_ALC_T_TMP, MAX_ATOM_CHARACTERS);
-    int i = intlist_to_buf(BIF_ARG_1, buf, MAX_ATOM_CHARACTERS);
+    Sint i = intlist_to_buf(BIF_ARG_1, buf, MAX_ATOM_CHARACTERS);
 
     if (i < 0) {
 	erts_free(ERTS_ALC_T_TMP, (void *) buf);
@@ -2829,7 +2858,7 @@ BIF_RETTYPE list_to_atom_1(BIF_ALIST_1)
  
 BIF_RETTYPE list_to_existing_atom_1(BIF_ALIST_1)
 {
-    int i;
+    Sint i;
     char *buf = (char *) erts_alloc(ERTS_ALC_T_TMP, MAX_ATOM_CHARACTERS);
 
     if ((i = intlist_to_buf(BIF_ARG_1, buf, MAX_ATOM_CHARACTERS)) < 0) {
@@ -2889,175 +2918,20 @@ BIF_RETTYPE integer_to_list_1(BIF_ALIST_1)
 
 /**********************************************************************/
 
-/* convert a list of ascii ascii integer value to an integer */
-
-
-#define LTI_BAD_STRUCTURE 0
-#define LTI_NO_INTEGER 1
-#define LTI_SOME_INTEGER 2
-#define LTI_ALL_INTEGER 3
-
-static int do_list_to_integer(Process *p, Eterm orig_list, 
-			      Eterm *integer, Eterm *rest)
-{
-     Sint i = 0;
-     Uint ui = 0;
-     int skip = 0;
-     int neg = 0;
-     Sint n = 0;
-     int m;
-     int lg2;
-     Eterm res;
-     Eterm* hp;
-     Eterm *hp_end;
-     Eterm lst = orig_list;
-     Eterm tail = lst;
-     int error_res = LTI_BAD_STRUCTURE;
-
-     if (is_nil(lst)) {
-       error_res = LTI_NO_INTEGER;
-     error:
-	 *rest = tail;
-	 *integer = make_small(0);
-	 return error_res;
-     }       
-     if (is_not_list(lst))
-       goto error;
-
-     /* if first char is a '-' then it is a negative integer */
-     if (CAR(list_val(lst)) == make_small('-')) {
-	  neg = 1;
-	  skip = 1;
-	  lst = CDR(list_val(lst));
-	  if (is_not_list(lst)) {
-	      tail = lst;
-	      error_res = LTI_NO_INTEGER;
-	      goto error;
-	  }
-     } else if (CAR(list_val(lst)) == make_small('+')) {
-	 /* ignore plus */
-	 skip = 1;
-	 lst = CDR(list_val(lst));
-	 if (is_not_list(lst)) {
-	     tail = lst;
-	     error_res = LTI_NO_INTEGER;
-	     goto error;
-	 }
-     }
-
-     /* Calculate size and do type check */
-
-     while(1) {
-	 if (is_not_small(CAR(list_val(lst)))) {
-	     break;
-	 }
-	 if (unsigned_val(CAR(list_val(lst))) < '0' ||
-	     unsigned_val(CAR(list_val(lst))) > '9') {
-	     break;
-	 }
-	 ui = ui * 10;
-	 ui = ui + unsigned_val(CAR(list_val(lst))) - '0';
-	 n++;
-	 lst = CDR(list_val(lst));
-	 if (is_nil(lst)) {
-	     break;
-	 }
-	 if (is_not_list(lst)) {
-	     break;
-	 }
-     }
-
-     tail = lst;
-     if (!n) {
-	 error_res = LTI_NO_INTEGER;
-	 goto error;
-     } 
-
-	 
-      /* If n <= 8 then we know it's a small int 
-      ** since 2^27 = 134217728. If n > 8 then we must
-      ** construct a bignum and let that routine do the checking
-      */
-
-     if (n <= SMALL_DIGITS) {  /* It must be small */
-	 if (neg) i = -(Sint)ui;
-         else i = (Sint)ui;
-	 res = make_small(i);
-     } else {
-	 /* Convert from log10 to log2 by multiplying with 1/log10(2)=3.3219
-	    which we round up to (3 + 1/3) */
-	 lg2 = (n+1)*3 + (n+1)/3 + 1;
-	 m  = (lg2+D_EXP-1)/D_EXP; /* number of digits */
-	 m  = BIG_NEED_SIZE(m);    /* number of words + thing */
-
-	 hp = HAlloc(p, m);
-	 hp_end = hp + m;
-	 
-	 lst = orig_list;
-	 if (skip)
-	     lst = CDR(list_val(lst));
-	 
-	 /* load first digits (at least one digit) */
-	 if ((i = (n % D_DECIMAL_EXP)) == 0)
-	     i = D_DECIMAL_EXP;
-	 n -= i;
-	 m = 0;
-	 while(i--) {
-	     m = 10*m + (unsigned_val(CAR(list_val(lst))) - '0');
-	     lst = CDR(list_val(lst));
-	 }
-	 res = small_to_big(m, hp);  /* load first digits */
-	 
-	 while(n) {
-	     i = D_DECIMAL_EXP;
-	     n -= D_DECIMAL_EXP;
-	     m = 0;
-	     while(i--) {
-		 m = 10*m + (unsigned_val(CAR(list_val(lst))) - '0');
-		 lst = CDR(list_val(lst));
-	     }
-	     if (is_small(res))
-		 res = small_to_big(signed_val(res), hp);
-	     res = big_times_small(res, D_DECIMAL_BASE, hp);
-	     if (is_small(res))
-		 res = small_to_big(signed_val(res), hp);
-	     res = big_plus_small(res, m, hp);
-	 }
-
-	 if (neg) {
-	     if (is_small(res))
-		 res = make_small(-signed_val(res));
-	     else {
-		 Uint *big = big_val(res); /* point to thing */
-		 *big = bignum_header_neg(*big);
-	     }
-	 }
-
-	 if (is_not_small(res)) {
-	     res = big_plus_small(res, 0, hp); /* includes conversion to small */
+/*
+ * Converts a list of ascii base10 digits to an integer fully or partially.
+ * Returns result and the remaining tail.
+ * On error returns: {error,not_a_list}, or {error, no_integer}
+ */
 
-	     if (is_not_small(res)) {
-		 hp += (big_arity(res)+1);
-	     }
-	 }
-	 HRelease(p,hp_end,hp);
-     }
-     *integer = res;
-     *rest = tail;
-     if (tail != NIL) {
-	 return LTI_SOME_INTEGER;
-     }
-     return LTI_ALL_INTEGER;
-}
 BIF_RETTYPE string_to_integer_1(BIF_ALIST_1)
 {
      Eterm res;
      Eterm tail;
      Eterm *hp;
      /* must be a list */
-     switch (do_list_to_integer(BIF_P,BIF_ARG_1,&res,&tail)) {
-	 /* HAlloc after do_list_to_integer as it 
-	    might HAlloc itself (bignum) */
+     switch (erts_list_to_integer(BIF_P, BIF_ARG_1, 10, &res, &tail)) {
+     /* HAlloc after erts_list_to_integer as it might HAlloc itself (bignum) */
      case LTI_BAD_STRUCTURE:
 	 hp = HAlloc(BIF_P,3);
 	 BIF_RET(TUPLE2(hp, am_error, am_not_a_list));
@@ -3072,13 +2946,14 @@ BIF_RETTYPE string_to_integer_1(BIF_ALIST_1)
 
 BIF_RETTYPE list_to_integer_1(BIF_ALIST_1)
  {
-   /* Using do_list_to_integer is about twice as fast as using 
+   /* Using erts_list_to_integer is about twice as fast as using
       erts_chars_to_integer because we do not have to copy the 
       entire list */
      Eterm res;
      Eterm dummy;
      /* must be a list */
-     if (do_list_to_integer(BIF_P,BIF_ARG_1,&res,&dummy) != LTI_ALL_INTEGER) {
+     if (erts_list_to_integer(BIF_P, BIF_ARG_1, 10,
+                              &res, &dummy) != LTI_ALL_INTEGER) {
 	 BIF_ERROR(BIF_P,BADARG);
      }
      BIF_RET(res);
@@ -3086,14 +2961,12 @@ BIF_RETTYPE list_to_integer_1(BIF_ALIST_1)
 
 BIF_RETTYPE list_to_integer_2(BIF_ALIST_2)
 {
-
   /* Bif implementation is about 50% faster than pure erlang,
      and since we have erts_chars_to_integer now it is simpler
      as well. This could be optmized further if we did not have to
      copy the list to buf. */
-    int i;
-    Eterm res;
-    char *buf = NULL;
+    Sint i;
+    Eterm res, dummy;
     int base;
 
     i = erts_list_length(BIF_ARG_1);
@@ -3101,31 +2974,16 @@ BIF_RETTYPE list_to_integer_2(BIF_ALIST_2)
       BIF_ERROR(BIF_P, BADARG);
     
     base = signed_val(BIF_ARG_2);
-  
+
     if (base < 2 || base > 36) 
       BIF_ERROR(BIF_P, BADARG);
 
-    /* Take fast path if base it 10 */
-    if (base == 10)
-      return list_to_integer_1(BIF_P,&BIF_ARG_1);
-    
-    buf = (char *) erts_alloc(ERTS_ALC_T_TMP, i + 1);
-    
-    if (intlist_to_buf(BIF_ARG_1, buf, i) < 0)
-      goto list_to_integer_1_error;
-    buf[i] = '\0';		/* null terminal */
-    
-    if ((res = erts_chars_to_integer(BIF_P,buf,i,base)) == THE_NON_VALUE)
-      goto list_to_integer_1_error;
-    
-    erts_free(ERTS_ALC_T_TMP, (void *) buf);
+    if (erts_list_to_integer(BIF_P, BIF_ARG_1, base,
+                             &res, &dummy) != LTI_ALL_INTEGER) {
+        BIF_ERROR(BIF_P,BADARG);
+    }
     BIF_RET(res);
-    
- list_to_integer_1_error:
-    erts_free(ERTS_ALC_T_TMP, (void *) buf);
-    BIF_ERROR(BIF_P, BADARG);
-     
- }
+}
 
 /**********************************************************************/
 
@@ -3431,7 +3289,7 @@ static BIF_RETTYPE do_charbuf_to_float(Process *BIF_P,char *buf) {
 
 BIF_RETTYPE list_to_float_1(BIF_ALIST_1)
 {
-    int i;
+    Sint i;
     Eterm res;
     char *buf = NULL;
 
@@ -3548,7 +3406,7 @@ BIF_RETTYPE list_to_tuple_1(BIF_ALIST_1)
     Eterm* cons;
     Eterm res;
     Eterm* hp;
-    int len;
+    Sint len;
 
     if ((len = erts_list_length(list)) < 0 || len > ERTS_MAX_TUPLE_SIZE) {
 	BIF_ERROR(BIF_P, BADARG);
@@ -3824,11 +3682,9 @@ BIF_RETTYPE now_0(BIF_ALIST_0)
 
 BIF_RETTYPE garbage_collect_0(BIF_ALIST_0)
 {
-    int reds;
-
     FLAGS(BIF_P) |= F_NEED_FULLSWEEP;
-    reds = erts_garbage_collect(BIF_P, 0, NULL, 0);
-    BIF_RET2(am_true, reds);
+    erts_garbage_collect(BIF_P, 0, NULL, 0);
+    BIF_RET(am_true);
 }
 
 /**********************************************************************/
@@ -3883,7 +3739,7 @@ BIF_RETTYPE erts_debug_display_1(BIF_ALIST_1)
     erts_dsprintf_buf_t *dsbufp = erts_create_tmp_dsbuf(64);       
     pres = erts_dsprintf(dsbufp, "%.*T\n", INT_MAX, BIF_ARG_1);
     if (pres < 0)
-	erl_exit(1, "Failed to convert term to string: %d (%s)\n",
+	erts_exit(ERTS_ERROR_EXIT, "Failed to convert term to string: %d (%s)\n",
 		 -pres, erl_errno_id(-pres));
     hp = HAlloc(BIF_P, 2*dsbufp->str_len); /* we need length * 2 heap words */
     res = buf_to_intlist(&hp, dsbufp->str, dsbufp->str_len, NIL);
@@ -3897,7 +3753,7 @@ BIF_RETTYPE display_string_1(BIF_ALIST_1)
 {
     Process* p = BIF_P;
     Eterm string = BIF_ARG_1;
-    int len = is_string(string);
+    Sint len = is_string(string);
     char *str;
 
     if (len <= 0) {
@@ -3905,7 +3761,7 @@ BIF_RETTYPE display_string_1(BIF_ALIST_1)
     }
     str = (char *) erts_alloc(ERTS_ALC_T_TMP, sizeof(char)*(len + 1));
     if (intlist_to_buf(string, str, len) != len)
-	erl_exit(1, "%s:%d: Internal error\n", __FILE__, __LINE__);
+	erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error\n", __FILE__, __LINE__);
     str[len] = '\0';
     erts_fprintf(stderr, "%s", str);
     erts_free(ERTS_ALC_T_TMP, (void *) str);
@@ -3925,7 +3781,7 @@ BIF_RETTYPE display_nl_0(BIF_ALIST_0)
 BIF_RETTYPE halt_0(BIF_ALIST_0)
 {
     VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt()\n"));
-    erl_halt(0);
+    erts_halt(0);
     ERTS_BIF_YIELD1(bif_export[BIF_halt_1], BIF_P, am_undefined);
 }
 
@@ -3938,20 +3794,21 @@ static char halt_msg[HALT_MSG_SIZE];
 /* ARGSUSED */
 BIF_RETTYPE halt_1(BIF_ALIST_1)
 {
-    Sint code;
+    Uint code;
     
-    if (is_small(BIF_ARG_1) && (code = signed_val(BIF_ARG_1)) >= 0) {
+    if (term_to_Uint_mask(BIF_ARG_1, &code)) {
+	int pos_int_code = (int) (code & INT_MAX);
 	VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt(%T)\n", BIF_ARG_1));
-	erl_halt((int)(- code));
+	erts_halt(pos_int_code);
 	ERTS_BIF_YIELD1(bif_export[BIF_halt_1], BIF_P, am_undefined);
     }
     else if (ERTS_IS_ATOM_STR("abort", BIF_ARG_1)) {
 	VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt(%T)\n", BIF_ARG_1));
 	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
-	erl_exit(ERTS_ABORT_EXIT, "");
+	erts_exit(ERTS_ABORT_EXIT, "");
     }
     else if (is_string(BIF_ARG_1) || BIF_ARG_1 == NIL) {
-	int i;
+	Sint i;
 
 	if ((i = intlist_to_buf(BIF_ARG_1, halt_msg, HALT_MSG_SIZE-1)) < 0) {
 	    goto error;
@@ -3959,11 +3816,11 @@ BIF_RETTYPE halt_1(BIF_ALIST_1)
 	halt_msg[i] = '\0';
 	VERBOSE(DEBUG_SYSTEM,("System halted by BIF halt(%T)\n", BIF_ARG_1));
 	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
-	erl_exit(ERTS_DUMP_EXIT, "%s\n", halt_msg);
+	erts_exit(ERTS_DUMP_EXIT, "%s\n", halt_msg);
     }
     else
 	goto error;
-    return NIL;  /* Pedantic (lint does not know about erl_exit) */
+    return NIL;  /* Pedantic (lint does not know about erts_exit) */
  error:
 	BIF_ERROR(BIF_P, BADARG);
 }
@@ -3974,7 +3831,7 @@ BIF_RETTYPE halt_1(BIF_ALIST_1)
 /* ARGSUSED */
 BIF_RETTYPE halt_2(BIF_ALIST_2)
 {
-    Sint code;
+    Uint code;
     Eterm optlist = BIF_ARG_2;
     int flush = 1;
 
@@ -4001,26 +3858,27 @@ BIF_RETTYPE halt_2(BIF_ALIST_2)
     if (is_not_nil(optlist))
 	goto error;
 
-    if (is_small(BIF_ARG_1) && (code = signed_val(BIF_ARG_1)) >= 0) {
+    if (term_to_Uint_mask(BIF_ARG_1, &code)) {
+	int pos_int_code = (int) (code & INT_MAX);
 	VERBOSE(DEBUG_SYSTEM,
 		("System halted by BIF halt(%T, %T)\n", BIF_ARG_1, BIF_ARG_2));
 	if (flush) {
-	    erl_halt((int)(- code));
+	    erts_halt(pos_int_code);
 	    ERTS_BIF_YIELD1(bif_export[BIF_halt_1], BIF_P, am_undefined);
 	}
 	else {
 	    erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
-	    erl_exit((int)(- code), "");
+            erts_exit(pos_int_code, "");
 	}
     }
     else if (ERTS_IS_ATOM_STR("abort", BIF_ARG_1)) {
 	VERBOSE(DEBUG_SYSTEM,
 		("System halted by BIF halt(%T, %T)\n", BIF_ARG_1, BIF_ARG_2));
 	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
-	erl_exit(ERTS_ABORT_EXIT, "");
+	erts_exit(ERTS_ABORT_EXIT, "");
     }
     else if (is_string(BIF_ARG_1) || BIF_ARG_1 == NIL) {
-	int i;
+	Sint i;
 
 	if ((i = intlist_to_buf(BIF_ARG_1, halt_msg, HALT_MSG_SIZE-1)) < 0) {
 	    goto error;
@@ -4029,11 +3887,11 @@ BIF_RETTYPE halt_2(BIF_ALIST_2)
 	VERBOSE(DEBUG_SYSTEM,
 		("System halted by BIF halt(%T, %T)\n", BIF_ARG_1, BIF_ARG_2));
 	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
-	erl_exit(ERTS_DUMP_EXIT, "%s\n", halt_msg);
+	erts_exit(ERTS_DUMP_EXIT, "%s\n", halt_msg);
     }
     else
 	goto error;
-    return NIL;  /* Pedantic (lint does not know about erl_exit) */
+    return NIL;  /* Pedantic (lint does not know about erts_exit) */
  error:
     BIF_ERROR(BIF_P, BADARG);
 }
@@ -4089,7 +3947,7 @@ term2list_dsprintf(Process *p, Eterm term)
     erts_dsprintf_buf_t *dsbufp = erts_create_tmp_dsbuf(64);       
     pres = erts_dsprintf(dsbufp, "%T", term);
     if (pres < 0)
-	erl_exit(1, "Failed to convert term to list: %d (%s)\n",
+	erts_exit(ERTS_ERROR_EXIT, "Failed to convert term to list: %d (%s)\n",
 		 -pres, erl_errno_id(-pres));
     hp = HAlloc(p, 2*dsbufp->str_len); /* we need length * 2 heap words */
     res = buf_to_intlist(&hp, dsbufp->str, dsbufp->str_len, NIL);
@@ -4117,16 +3975,9 @@ BIF_RETTYPE make_fun_3(BIF_ALIST_3)
     if (arity < 0) {
 	goto error;
     }
-#if HALFWORD_HEAP
-    hp = HAlloc(BIF_P, 3);
-    hp[0] = HEADER_EXPORT;
-    /* Yes, May be misaligned, but X86_64 will fix it... */
-    *((Export **) (hp+1)) = erts_export_get_or_make_stub(BIF_ARG_1, BIF_ARG_2, (Uint) arity);
-#else
     hp = HAlloc(BIF_P, 2);
     hp[0] = HEADER_EXPORT;
     hp[1] = (Eterm) erts_export_get_or_make_stub(BIF_ARG_1, BIF_ARG_2, (Uint) arity);
-#endif
     BIF_RET(make_export(hp));
 }
 
@@ -4170,7 +4021,7 @@ BIF_RETTYPE list_to_pid_1(BIF_ALIST_1)
 {
     Uint a = 0, b = 0, c = 0;
     char* cp;
-    int i;
+    Sint i;
     DistEntry *dep = NULL;
     char *buf = (char *) erts_alloc(ERTS_ALC_T_TMP, 65);
     /*
@@ -4347,22 +4198,33 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
     Sint n;
 
     if (BIF_ARG_1 == am_multi_scheduling) {
-	if (BIF_ARG_2 == am_block || BIF_ARG_2 == am_unblock) {
+	if (BIF_ARG_2 == am_block || BIF_ARG_2 == am_unblock
+	    || BIF_ARG_2 == am_block_normal || BIF_ARG_2 == am_unblock_normal) {
 #ifndef ERTS_SMP
 	    BIF_RET(am_disabled);
 #else
+	    int block = (BIF_ARG_2 == am_block
+			 || BIF_ARG_2 == am_block_normal);
+	    int normal = (BIF_ARG_2 == am_block_normal
+			  || BIF_ARG_2 == am_unblock_normal);
 	    if (erts_no_schedulers == 1)
 		BIF_RET(am_disabled);
 	    else {
 		switch (erts_block_multi_scheduling(BIF_P,
 						    ERTS_PROC_LOCK_MAIN,
-						    BIF_ARG_2 == am_block,
+						    block,
+						    normal,
 						    0)) {
 		case ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED:
 		    BIF_RET(am_blocked);
+		case ERTS_SCHDLR_SSPND_DONE_NMSCHED_BLOCKED:
+		    BIF_RET(am_blocked_normal);
 		case ERTS_SCHDLR_SSPND_YIELD_DONE_MSCHED_BLOCKED:
 		    ERTS_BIF_YIELD_RETURN_X(BIF_P, am_blocked,
 					    am_multi_scheduling);
+		case ERTS_SCHDLR_SSPND_YIELD_DONE_NMSCHED_BLOCKED:
+		    ERTS_BIF_YIELD_RETURN_X(BIF_P, am_blocked_normal,
+					    am_multi_scheduling);
 		case ERTS_SCHDLR_SSPND_DONE:
 		    BIF_RET(am_enabled);
 		case ERTS_SCHDLR_SSPND_YIELD_RESTART:
@@ -4395,11 +4257,7 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
 	switch (erts_set_schedulers_online(BIF_P,
 					   ERTS_PROC_LOCK_MAIN,
 					   signed_val(BIF_ARG_2),
-					   &old_no
-#ifdef ERTS_DIRTY_SCHEDULERS
-					   , 0
-#endif
-					   )) {
+					   &old_no, 0)) {
 	case ERTS_SCHDLR_SSPND_DONE:
 	    BIF_RET(make_small(old_no));
 	case ERTS_SCHDLR_SSPND_YIELD_RESTART:
@@ -4487,7 +4345,7 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
 	}
     } else if (BIF_ARG_1 == make_small(1)) {
 	int i, max;
-	ErlMessage* mp;
+	ErtsMessage* mp;
 	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
 	erts_smp_thr_progress_block();
 
@@ -4580,6 +4438,31 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
 	default:
 	    ERTS_INTERNAL_ERROR("Unknown state");
 	}
+#ifdef ERTS_ENABLE_MSACC
+    } else if (BIF_ARG_1 == am_microstate_accounting) {
+      Eterm threads;
+      if (BIF_ARG_2 == am_true || BIF_ARG_2 == am_false) {
+        erts_aint32_t new = BIF_ARG_2 == am_true ? ERTS_MSACC_ENABLE : ERTS_MSACC_DISABLE;
+	erts_aint32_t old = erts_smp_atomic32_xchg_nob(&msacc, new);
+	Eterm ref = erts_msacc_request(BIF_P, new, &threads);
+        if (is_non_value(ref))
+            BIF_RET(old ? am_true : am_false);
+	BIF_TRAP3(await_msacc_mod_trap,
+		  BIF_P,
+		  ref,
+		  old ? am_true : am_false,
+		  threads);
+      } else if (BIF_ARG_2 == am_reset) {
+	Eterm ref = erts_msacc_request(BIF_P, ERTS_MSACC_RESET, &threads);
+	erts_aint32_t old = erts_smp_atomic32_read_nob(&msacc);
+	ASSERT(is_value(ref));
+	BIF_TRAP3(await_msacc_mod_trap,
+		  BIF_P,
+		  ref,
+		  old ? am_true : am_false,
+		  threads);
+      }
+#endif
     } else if (ERTS_IS_ATOM_STR("scheduling_statistics", BIF_ARG_1)) {
 	int what;
 	if (ERTS_IS_ATOM_STR("disable", BIF_ARG_2))
@@ -4632,7 +4515,7 @@ BIF_RETTYPE hash_2(BIF_ALIST_2)
     if ((range = signed_val(BIF_ARG_2)) <= 0) {  /* [1..MAX_SMALL] */
 	BIF_ERROR(BIF_P, BADARG);
     }
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
     if (range > ((1L << 27) - 1))
 	BIF_ERROR(BIF_P, BADARG);
 #endif
@@ -4704,7 +4587,7 @@ BIF_RETTYPE phash2_2(BIF_ALIST_2)
     /*
      * Return either a small or a big. Use the heap for bigs if there is room.
      */
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
     BIF_RET(make_small(final_hash));
 #else
     if (IS_USMALL(0, final_hash)) {
@@ -4744,29 +4627,27 @@ BIF_RETTYPE erts_internal_cmp_term_2(BIF_ALIST_2) {
 /*
  * Processes doing yield on return in a bif ends up in bif_return_trap().
  */
-static BIF_RETTYPE bif_return_trap(
-#ifdef DEBUG
-    BIF_ALIST_2
-#else
-    BIF_ALIST_1
-#endif
-    )
+static BIF_RETTYPE bif_return_trap(BIF_ALIST_2)
 {
-#ifdef DEBUG
+    Eterm res = BIF_ARG_1;
+
     switch (BIF_ARG_2) {
-    case am_multi_scheduling:
 #ifdef ERTS_SMP
-	erts_dbg_multi_scheduling_return_trap(BIF_P, BIF_ARG_1);
-#endif
-	break;
-    case am_schedulers_online:
+    case am_multi_scheduling: {
+	int msb = erts_is_multi_scheduling_blocked();
+	if (msb > 0)
+	    res = am_blocked;
+	else if (msb < 0)
+	    res = am_blocked_normal;
+	else
+	    ERTS_INTERNAL_ERROR("Unexpected multi scheduling block state");
 	break;
+    }
+#endif
     default:
 	break;
     }
-#endif
-
-    BIF_RET(BIF_ARG_1);
+    BIF_RET(res);
 }
 
 /*
@@ -4871,17 +4752,12 @@ void erts_init_bif(void)
     erts_smp_atomic_init_nob(&erts_dead_ports_ptr, (erts_aint_t) NULL);
 
     /*
-     * bif_return_trap/1 is a hidden BIF that bifs that need to
-     * yield the calling process traps to. The only thing it does:
-     * return the value passed as argument.
+     * bif_return_trap/2 is a hidden BIF that bifs that need to
+     * yield the calling process traps to.
      */
-    erts_init_trap_export(&bif_return_trap_export, am_erlang, am_bif_return_trap,
-#ifdef DEBUG
-		     2
-#else
-		     1
-#endif
-		     , &bif_return_trap);
+    erts_init_trap_export(&bif_return_trap_export,
+			  am_erlang, am_bif_return_trap, 2,
+			  &bif_return_trap);
 
     erts_await_result = erts_export_put(am_erts_internal,
 					am_await_result,
@@ -4909,8 +4785,12 @@ void erts_init_bif(void)
     await_port_send_result_trap
 	= erts_export_put(am_erts_internal, am_await_port_send_result, 3);
     await_sched_wall_time_mod_trap
-	= erts_export_put(am_erlang, am_await_sched_wall_time_modifications, 2);
+        = erts_export_put(am_erlang, am_await_sched_wall_time_modifications, 2);
+    await_msacc_mod_trap
+	= erts_export_put(am_erts_internal, am_await_microstate_accounting_modifications, 3);
+
     erts_smp_atomic32_init_nob(&sched_wall_time, 0);
+    erts_smp_atomic32_init_nob(&msacc, ERTS_MSACC_IS_ENABLED());
 }
 
 #ifdef HARDDEBUG
diff --git a/erts/emulator/beam/bif.h b/erts/emulator/beam/bif.h
index c6ed60376a..46af552b39 100644
--- a/erts/emulator/beam/bif.h
+++ b/erts/emulator/beam/bif.h
@@ -54,22 +54,24 @@ extern Export *erts_convert_time_unit_trap;
 	(p)->fcalls = -CONTEXT_REDS;		\
 } while(0)
 
-
-#define ERTS_VBUMP_ALL_REDS(p)						\
+#define ERTS_VBUMP_ALL_REDS_INTERNAL(p, fcalls)				\
 do {									\
     if (!ERTS_PROC_GET_SAVED_CALLS_BUF((p))) {				\
-	if ((p)->fcalls > 0)						\
-	    ERTS_PROC_GET_SCHDATA((p))->virtual_reds += (p)->fcalls;	\
-	(p)->fcalls = 0;						\
+	if ((fcalls) > 0)						\
+	    ERTS_PROC_GET_SCHDATA((p))->virtual_reds += (fcalls);	\
+	(fcalls) = 0;							\
     }									\
     else {								\
-	if ((p)->fcalls > -CONTEXT_REDS)				\
+	if ((fcalls) > -CONTEXT_REDS)					\
 	    ERTS_PROC_GET_SCHDATA((p))->virtual_reds			\
-		+= ((p)->fcalls - (-CONTEXT_REDS));			\
-	(p)->fcalls = -CONTEXT_REDS;					\
+		+= ((fcalls) - (-CONTEXT_REDS));			\
+	(fcalls) = -CONTEXT_REDS;					\
     }									\
 } while(0)
 
+#define ERTS_VBUMP_ALL_REDS(p) \
+    ERTS_VBUMP_ALL_REDS_INTERNAL((p), (p)->fcalls)
+
 #define BUMP_REDS(p, gc) do {			   \
      ASSERT(p);		 			   \
      ERTS_SMP_LC_ASSERT(ERTS_PROC_LOCK_MAIN & erts_proc_lc_my_proc_locks(p));\
@@ -110,10 +112,34 @@ do {									\
     }									\
 } while(0)
 
-#define ERTS_BIF_REDS_LEFT(p)						\
+#define ERTS_VBUMP_LEAVE_REDS_INTERNAL(P, Reds, FCalls)			\
+    do {								\
+	if (ERTS_PROC_GET_SAVED_CALLS_BUF((P))) {			\
+	    int nreds__ = ((int)(Reds)) - CONTEXT_REDS;			\
+	    if ((FCalls) > nreds__) {					\
+		ERTS_PROC_GET_SCHDATA((P))->virtual_reds		\
+		    += (FCalls) - nreds__;				\
+		(FCalls) = nreds__;					\
+	    }								\
+	}								\
+	else {								\
+	    if ((FCalls) > (Reds)) {					\
+		ERTS_PROC_GET_SCHDATA((P))->virtual_reds		\
+		    += (FCalls) - (Reds);				\
+		(FCalls) = (Reds);					\
+	    }								\
+	}								\
+    } while (0)
+
+#define ERTS_VBUMP_LEAVE_REDS(P, Reds)					\
+    ERTS_VBUMP_LEAVE_REDS_INTERNAL(P, Reds, (P)->fcalls)
+
+#define ERTS_REDS_LEFT(p, FCalls)					\
   (ERTS_PROC_GET_SAVED_CALLS_BUF((p))					\
-   ? ((p)->fcalls > -CONTEXT_REDS ? ((p)->fcalls - (-CONTEXT_REDS)) : 0)\
-   : ((p)->fcalls > 0 ? (p)->fcalls : 0))
+   ? ((FCalls) > -CONTEXT_REDS ? ((FCalls) - (-CONTEXT_REDS)) : 0)	\
+   : ((FCalls) > 0 ? (FCalls) : 0))
+
+#define ERTS_BIF_REDS_LEFT(p) ERTS_REDS_LEFT(p, p->fcalls)
 
 #define BIF_RET2(x, gc) do {			\
     BUMP_REDS(BIF_P, (gc));			\
@@ -312,37 +338,20 @@ do {							\
  } while(0)
 
 extern Export bif_return_trap_export;
-#ifdef DEBUG
-#define ERTS_BIF_PREP_YIELD_RETURN_X(RET, P, VAL, DEBUG_VAL)		\
-do {									\
-    ERTS_VBUMP_ALL_REDS(P);						\
-    ERTS_BIF_PREP_TRAP2(RET, &bif_return_trap_export, (P), (VAL),	\
-			(DEBUG_VAL));					\
-} while (0)
-#else
-#define ERTS_BIF_PREP_YIELD_RETURN_X(RET, P, VAL, DEBUG_VAL)		\
+#define ERTS_BIF_PREP_YIELD_RETURN_X(RET, P, VAL, OP)			\
 do {									\
     ERTS_VBUMP_ALL_REDS(P);						\
-    ERTS_BIF_PREP_TRAP1(RET, &bif_return_trap_export, (P), (VAL));	\
+    ERTS_BIF_PREP_TRAP2(RET, &bif_return_trap_export, (P), (VAL), (OP));\
 } while (0)
-#endif
 
 #define ERTS_BIF_PREP_YIELD_RETURN(RET, P, VAL) \
   ERTS_BIF_PREP_YIELD_RETURN_X(RET, (P), (VAL), am_undefined)
 
-#ifdef DEBUG
-#define ERTS_BIF_YIELD_RETURN_X(P, VAL, DEBUG_VAL)			\
+#define ERTS_BIF_YIELD_RETURN_X(P, VAL, OP)				\
 do {									\
     ERTS_VBUMP_ALL_REDS(P);						\
-    BIF_TRAP2(&bif_return_trap_export, (P), (VAL), (DEBUG_VAL));	\
+    BIF_TRAP2(&bif_return_trap_export, (P), (VAL), (OP));		\
 } while (0)
-#else
-#define ERTS_BIF_YIELD_RETURN_X(P, VAL, DEBUG_VAL)			\
-do {									\
-    ERTS_VBUMP_ALL_REDS(P);						\
-    BIF_TRAP1(&bif_return_trap_export, (P), (VAL));			\
-} while (0)
-#endif
 
 #define ERTS_BIF_RETURN_YIELD(P) ERTS_VBUMP_ALL_REDS((P))
 
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 4f0656d174..a6670c10e8 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -115,7 +115,7 @@ bif erlang:time_offset/0
 bif erlang:time_offset/1
 bif erlang:timestamp/0
 
-bif erlang:open_port/2
+bif erts_internal:open_port/2
 
 bif erlang:pid_to_list/1
 bif erlang:ports/0
@@ -125,7 +125,6 @@ bif erlang:process_flag/3
 bif erlang:process_info/1
 bif erlang:process_info/2
 bif erlang:processes/0
-bif erlang:purge_module/1
 bif erlang:put/2
 bif erlang:register/2
 bif erlang:registered/0
@@ -167,13 +166,16 @@ bif erts_internal:request_system_task/3
 bif erts_internal:check_process_code/2
 
 bif erts_internal:map_to_tuple_keys/1
-bif erts_internal:map_type/1
+bif erts_internal:term_type/1
 bif erts_internal:map_hashmap_children/1
 
 bif erts_internal:time_unit/0
+bif erts_internal:perf_counter_unit/0
 
 bif erts_internal:is_system_process/1
 
+bif erts_internal:system_check/1
+
 # inet_db support
 bif erlang:port_set_data/2
 bif erlang:port_get_data/1
@@ -370,6 +372,7 @@ bif os:getpid/0
 bif os:timestamp/0
 bif os:system_time/0
 bif os:system_time/1
+bif os:perf_counter/0
 
 #
 # Bifs in the erl_ddll module (the module actually does not exist)
@@ -639,6 +642,18 @@ bif ets:update_counter/4
 bif erts_debug:map_info/1
 
 #
+# New in 19.0
+#
+
+bif erts_internal:copy_literals/2
+bif erts_internal:purge_module/1
+bif binary:split/2
+bif binary:split/3
+bif erts_debug:size_shared/1
+bif erts_debug:copy_shared/1
+bif erlang:has_prepared_code_on_load/1
+
+#
 # Obsolete
 #
 
diff --git a/erts/emulator/beam/big.c b/erts/emulator/beam/big.c
index 15bcd44fb9..c738a9ecf5 100644
--- a/erts/emulator/beam/big.c
+++ b/erts/emulator/beam/big.c
@@ -48,7 +48,7 @@
 	    _t_dst = (dst)+((sz)-1);				\
 	    _t_src = (src)+((sz)-1);				\
 	    while(_t_sz--) *_t_dst-- = *_t_src--;		\
-	}							\
+        }							\
     } while(0)
 
 /* add a and b with carry in + out */
@@ -423,6 +423,25 @@
 
 #endif
 
+/* Forward declaration of lookup tables (See below in this file) used in list to
+ * integer conversions for different bases. Also used in bignum printing.
+ */
+static const byte digits_per_sint_lookup[36-1];
+static const byte digits_per_small_lookup[36-1];
+static const Sint largest_power_of_base_lookup[36-1];
+
+static ERTS_INLINE byte get_digits_per_signed_int(Uint base) {
+    return digits_per_sint_lookup[base-2];
+}
+
+static ERTS_INLINE byte get_digits_per_small(Uint base) {
+    return digits_per_small_lookup[base-2];
+}
+
+static ERTS_INLINE Sint get_largest_power_of_base(Uint base) {
+    return largest_power_of_base_lookup[base-2];
+}
+
 /*
 ** compare two number vectors
 */
@@ -1487,20 +1506,8 @@ Eterm uint_to_big(Uint x, Eterm *y)
 
 Eterm uword_to_big(UWord x, Eterm *y)
 {
-#if HALFWORD_HEAP
-    Uint upper = x >> 32;
-    Uint lower = x & 0xFFFFFFFFUL;
-    if (upper == 0) {
-	*y = make_pos_bignum_header(1);
-    } else {
-	*y = make_pos_bignum_header(2);
-	BIG_DIGIT(y, 1) = upper;
-    }
-    BIG_DIGIT(y, 0) = lower;
-#else
     *y = make_pos_bignum_header(1);
     BIG_DIGIT(y, 0) = x;
-#endif
     return make_big(y);
 }
 
@@ -1525,7 +1532,7 @@ Eterm small_to_big(Sint x, Eterm *y)
 Eterm erts_uint64_to_big(Uint64 x, Eterm **hpp)
 {
     Eterm *hp = *hpp;
-#if defined(ARCH_32) || HALFWORD_HEAP
+#if defined(ARCH_32)
     if (x >= (((Uint64) 1) << 32)) {
 	*hp = make_pos_bignum_header(2);
 	BIG_DIGIT(hp, 0) = (Uint) (x & ((Uint) 0xffffffff));
@@ -1555,7 +1562,7 @@ Eterm erts_sint64_to_big(Sint64 x, Eterm **hpp)
 	neg = 1;
 	ux = -(Uint64)x;
     }
-#if defined(ARCH_32) || HALFWORD_HEAP
+#if defined(ARCH_32)
     if (ux >= (((Uint64) 1) << 32)) {
 	if (neg)
 	    *hp = make_neg_bignum_header(2);
@@ -1588,7 +1595,7 @@ erts_uint64_array_to_big(Uint **hpp, int neg, int len, Uint64 *array)
 
     pot_digits = digits = 0;
     for (i = 0; i < len; i++) {
-#if defined(ARCH_32) || HALFWORD_HEAP
+#if defined(ARCH_32)
 	Uint low_val = array[i] & ((Uint) 0xffffffff);
 	Uint high_val = (array[i] >> 32) & ((Uint) 0xffffffff);
 	BIG_DIGIT(headerp, pot_digits) = low_val;
@@ -1651,8 +1658,6 @@ big_to_double(Wterm x, double* resp)
 /*
  * Logic has been copied from erl_bif_guard.c and slightly
  * modified to use a static instead of dynamic heap
- *
- * HALFWORD: Return relative term with 'heap' as base.
  */
 Eterm
 double_to_big(double x, Eterm *heap, Uint hsz)
@@ -1683,7 +1688,7 @@ double_to_big(double x, Eterm *heap, Uint hsz)
     sz = BIG_NEED_SIZE(ds); /* number of words including arity */
 
     hp = heap;
-    res = make_big_rel(hp, heap);
+    res = make_big(hp);
     xp = (ErtsDigit*) (hp + 1);
 
     ASSERT(ds < hsz);
@@ -1733,8 +1738,10 @@ static Uint write_big(Wterm x, void (*write_func)(void *, char), void *arg)
     short sign = BIG_SIGN(xp);
     ErtsDigit rem;
     Uint n = 0;
+    const Uint digits_per_Sint = get_digits_per_signed_int(10);
+    const Sint largest_pow_of_base = get_largest_power_of_base(10);
 
-    if (xl == 1 && *dx < D_DECIMAL_BASE) {
+    if (xl == 1 && *dx < largest_pow_of_base) {
 	rem = *dx;
 	if (rem == 0) {
 	    (*write_func)(arg, '0'); n++;
@@ -1752,7 +1759,7 @@ static Uint write_big(Wterm x, void (*write_func)(void *, char), void *arg)
 	MOVE_DIGITS(tmp, dx, xl);
 
 	while(1) {
-	    tmpl = D_div(tmp, tmpl, D_DECIMAL_BASE, tmp, &rem);
+            tmpl = D_div(tmp, tmpl, largest_pow_of_base, tmp, &rem);
 	    if (tmpl == 1 && *tmp == 0) {
 		while(rem) {
 		    (*write_func)(arg, (rem % 10)+'0'); n++;
@@ -1760,7 +1767,7 @@ static Uint write_big(Wterm x, void (*write_func)(void *, char), void *arg)
 		}
 		break;
 	    } else {
-		int i = D_DECIMAL_EXP;
+                Uint i = digits_per_Sint;
 		while(i--) {
 		    (*write_func)(arg, (rem % 10)+'0'); n++;
 		    rem /= 10;
@@ -2028,6 +2035,32 @@ term_to_Uint(Eterm term, Uint *up)
     }
 }
 
+/* same as term_to_Uint()
+   but also accept larger bignums by masking
+ */
+int
+term_to_Uint_mask(Eterm term, Uint *up)
+{
+    if (is_small(term)) {
+	Sint i = signed_val(term);
+	if (i < 0) {
+	    *up = BADARG;
+	    return 0;
+	}
+	*up = (Uint) i;
+	return 1;
+    } else if (is_big(term) && !big_sign(term)) {
+	ErtsDigit* xr = big_v(term);
+
+	ERTS_CT_ASSERT(sizeof(ErtsDigit) == sizeof(Uint));
+	*up = (Uint)*xr;  /* just pick first word */
+	return 1;
+    } else {
+	*up = BADARG;
+	return 0;
+    }
+}
+
 int
 term_to_UWord(Eterm term, UWord *up)
 {
@@ -2536,63 +2569,100 @@ int term_equals_2pow32(Eterm x)
     }
 }
 
+static ERTS_INLINE int c2int_is_invalid_char(byte ch, int base) {
+    return (ch < '0'
+            || (ch > ('0' + base - 1)
+                && !(base > 10
+                     && ((ch >= 'a' && ch < ('a' + base - 10))
+                         || (ch >= 'A' && ch < ('A' + base - 10))))));
+}
+
+static ERTS_INLINE byte c2int_digit_from_base(byte ch) {
+    return ch <= '9' ? ch - '0'
+            : (10 + (ch <= 'Z' ? ch - 'A' : ch - 'a'));
+}
 
-#define IS_VALID_CHARACTER(CHAR,BASE) \
-  (CHAR < '0'				    \
-   || (CHAR > ('0' + BASE - 1)		    \
-       && !(BASE > 10							\
-	    && ((CHAR >= 'a' && CHAR < ('a' + BASE - 10))		\
-		|| (CHAR >= 'A' && CHAR < ('A' + BASE - 10))))))
-#define CHARACTER_FROM_BASE(CHAR)					\
-  ((CHAR <= '9') ? CHAR - '0' : 10 + ((CHAR <= 'Z') ? CHAR - 'A' : CHAR - 'a'))
-#define D_BASE_EXP(BASE) (d_base_exp_lookup[BASE-2])
-#define D_BASE_BASE(BASE) (d_base_base_lookup[BASE-2])
-#define LG2_LOOKUP(BASE)  (lg2_lookup[base-2])
+/*
+ * How many bits are needed to store 1 digit of given base in binary
+ * Wo.Alpha formula: Table [log2[n], {n,2,36}]
+ */
+static const double lg2_lookup[36-1] = {
+    1.0, 1.58496, 2.0, 2.32193, 2.58496, 2.80735, 3.0, 3.16993, 3.32193,
+    3.45943, 3.58496, 3.70044, 3.80735, 3.90689, 4.0, 4.08746, 4.16993, 4.24793,
+    4.32193, 4.39232, 4.45943, 4.52356, 4.58496, 4.64386, 4.70044, 4.75489,
+    4.80735, 4.85798, 4.90689, 4.9542, 5.0, 5.04439, 5.08746, 5.12928, 5.16993
+};
+static ERTS_INLINE double lookup_log2(Uint base) {
+    return lg2_lookup[base - 2];
+}
 
 /*
- * for i in 2..64 do
- *   lg2_lookup[i-2] = log2(i)
- * end
- * How many bits are needed to store string of size n
+ * How many digits can fit into a signed int (Sint) for given base, we take
+ * one digit away just to be on the safer side (some corner cases).
  */
-const double lg2_lookup[] = { 1.0, 1.58496, 2, 2.32193, 2.58496, 2.80735, 3.0,
-	3.16993, 3.32193, 3.45943, 3.58496, 3.70044, 3.80735, 3.90689, 4.0,
-	4.08746, 4.16993, 4.24793, 4.32193, 4.39232, 4.45943, 4.52356, 4.58496,
-	4.64386, 4.70044, 4.75489, 4.80735, 4.85798, 4.90689, 4.9542, 5.0,
-	5.04439, 5.08746, 5.12928, 5.16993, 5.20945, 5.24793, 5.2854, 5.32193,
-	5.35755, 5.39232, 5.42626, 5.45943, 5.49185, 5.52356, 5.55459, 5.58496,
-	5.61471, 5.64386, 5.67243, 5.70044, 5.72792, 5.75489, 5.78136, 5.80735,
-	5.83289, 5.85798, 5.88264, 5.90689, 5.93074, 5.9542, 5.97728, 6.0 };
+static const byte digits_per_sint_lookup[36-1] = {
+#if (SIZEOF_VOID_P == 4)
+    /* Wo.Alpha formula: Table [Trunc[31 / log[2,n]]-1, {n, 2, 36}] */
+    30, 18, 14, 12, 10, 10, 9, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5,
+    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4
+#elif (SIZEOF_VOID_P == 8)
+    /* Wo.Alpha formula: Table [Trunc[63 / log[2,n]]-1, {n, 2, 36}] */
+    62, 38, 30, 26, 23, 21, 20, 18, 17, 17, 16, 16, 15, 15, 14, 14, 14, 13, 13,
+    13, 13, 12, 12, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11
+#else
+    #error "Please produce a lookup table for the new architecture"
+#endif
+};
 
 /*
- * for i in 2..64 do
- *   d_base_exp_lookup[i-2] = 31 / lg2_lookup[i-2];
- * end
- * How many characters can fit in 31 bits
+ * How many digits can fit into Erlang Small (SMALL_BITS-1) counting sign bit
  */
-const byte d_base_exp_lookup[] = { 31, 19, 15, 13, 11, 11, 10, 9, 9, 8, 8, 8, 8,
-	7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5,
-	5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-	5, 5 };
+static const byte digits_per_small_lookup[36-1] = {
+#if (SIZEOF_VOID_P == 4)
+    /* Wo.Alpha formula: Table [Trunc[27 / log[2,n]]-1, {n, 2, 36}] */
+    27, 17, 13, 11, 10, 9, 9, 8, 8, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5,
+    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5
+#elif (SIZEOF_VOID_P == 8)
+    /* Wo.Alpha formula: Table [Trunc[59 / log[2,n]]-1, {n, 2, 36}] */
+    59, 37, 29, 25, 22, 21, 19, 18, 17, 17, 16, 15, 15, 15, 14, 14, 14, 13, 13,
+    13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11
+#else
+    #error "Please produce a lookup table for the new architecture"
+#endif
+};
 
 /*
- * for i in 2..64 do
- *   d_base_base_lookup[i-2] = pow(i,d_base_exp_lookup[i-2]);
- * end
- * How much can the characters which fit in 31 bit represent
+ * Largest power of base which can be represented in a signed int (Sint).
+ * Calculated by base 2..36 to the power of corresponding element from
+ * digits_per_sint_lookup.
  */
-const Uint d_base_base_lookup[] = { 2147483648u, 1162261467u, 1073741824u,
-	1220703125u, 362797056u, 1977326743u, 1073741824u, 387420489u,
-	1000000000u, 214358881u, 429981696u, 815730721u, 1475789056u,
-	170859375u, 268435456u, 410338673u, 612220032u, 893871739u, 1280000000u,
-	1801088541u, 113379904u, 148035889u, 191102976u, 244140625u, 308915776u,
-	387420489u, 481890304u, 594823321u, 729000000u, 887503681u, 1073741824u,
-	1291467969u, 1544804416u, 1838265625u, 60466176u, 69343957u, 79235168u,
-	90224199u, 102400000u, 115856201u, 130691232u, 147008443u, 164916224u,
-	184528125u, 205962976u, 229345007u, 254803968u, 282475249u, 312500000u,
-	345025251u, 380204032u, 418195493u, 459165024u, 503284375u, 550731776u,
-	601692057u, 656356768u, 714924299u, 777600000u, 844596301u, 916132832u,
-	992436543u, 1073741824u };
+static const Sint largest_power_of_base_lookup[36-1] = {
+#if (SIZEOF_VOID_P == 4)
+    /* Wo.Alpha formula: Table [Pow[n, Trunc[31 / log[2,n]]-1], {n, 2, 36}] */
+    1073741824, 387420489, 268435456, 244140625, 60466176, 282475249, 134217728,
+    43046721, 100000000, 19487171, 35831808, 62748517, 105413504, 11390625,
+    16777216, 24137569, 34012224, 47045881, 64000000, 85766121, 5153632,
+    6436343,7962624, 9765625, 11881376, 14348907, 17210368, 20511149, 24300000,
+    28629151, 33554432, 39135393, 45435424, 52521875, 1679616
+#elif (SIZEOF_VOID_P == 8)
+    /* Wo.Alpha formula: Table [Pow[n, Trunc[63 / log[2,n]]-1], {n, 2, 36}]
+     * with LL added after each element manually */
+    4611686018427387904LL, 1350851717672992089LL, 1152921504606846976LL,
+    1490116119384765625LL, 789730223053602816LL, 558545864083284007LL,
+    1152921504606846976LL, 150094635296999121LL, 100000000000000000LL,
+    505447028499293771LL, 184884258895036416LL, 665416609183179841LL,
+    155568095557812224LL, 437893890380859375LL, 72057594037927936LL,
+    168377826559400929LL, 374813367582081024LL, 42052983462257059LL,
+    81920000000000000LL, 154472377739119461LL, 282810057883082752LL,
+    21914624432020321LL, 36520347436056576LL, 59604644775390625LL,
+    95428956661682176LL, 150094635296999121LL, 232218265089212416LL,
+    12200509765705829LL, 17714700000000000LL, 25408476896404831LL,
+    36028797018963968LL, 50542106513726817LL, 70188843638032384LL,
+    96549157373046875LL, 131621703842267136LL
+#else
+    #error "Please produce a lookup table for the new architecture"
+#endif
+};
 
 Eterm erts_chars_to_integer(Process *BIF_P, char *bytes, 
 			   Uint size, const int base) {
@@ -2602,8 +2672,11 @@ Eterm erts_chars_to_integer(Process *BIF_P, char *bytes,
     int neg = 0;
     byte b;
     Eterm *hp, *hp_end;
-    int m;
+    Sint m;
     int lg2;
+    const Uint digits_per_small = get_digits_per_small(base);
+    const Uint digits_per_Sint = get_digits_per_signed_int(base);
+    const Sint largest_pow_of_base = get_largest_power_of_base(base);
 
     if (size == 0)
 	goto bytebuf_to_integer_1_error;
@@ -2618,57 +2691,68 @@ Eterm erts_chars_to_integer(Process *BIF_P, char *bytes,
 	size--;
     }
 
+    /* Trim leading zeroes */
+    if (size) {
+        while (*bytes == '0') {
+            bytes++;
+            size--;
+            if (!size) {
+                /* All zero! */
+                res = make_small(0);
+                goto bytebuf_to_integer_1_done;
+            }
+        }
+    }
+
     if (size == 0)
 	goto bytebuf_to_integer_1_error;
 
-    if (size < SMALL_DIGITS && base <= 10) {
-	/* *
-	 * Take shortcut if we know that all chars are '0' < b < '9' and
-	 * fit in a small. This improves speed by about 10% over the generic
-	 * small case.
-	 * */
-	while (size--) {
-	    b = *bytes++;
+    if (size < digits_per_small) {
+        if (base <= 10) {
+            /* *
+         * Take shortcut if we know that all chars are '0' < b < '9' and
+         * fit in a small. This improves speed by about 10% over the generic
+         * small case.
+         * */
+            while (size--) {
+                b = *bytes++;
 
-	    if (b < '0' || b > ('0'+base-1))
-		goto bytebuf_to_integer_1_error;
+                if (b < '0' || b > ('0'+base-1))
+                    goto bytebuf_to_integer_1_error;
 
-	    i = i * base + b - '0';
-	}
+                i = i * base + b - '0';
+            }
 
-	if (neg)
-	    i = -i;
-	res = make_small(i);
-	goto bytebuf_to_integer_1_done;
+            if (neg)
+                i = -i;
+            res = make_small(i);
+            goto bytebuf_to_integer_1_done;
+        }
+
+        /* Take shortcut if we know it will fit in a small.
+         * This improves speed by about 30%.
+         */
+        while (size) {
+            b = *bytes++;
+            size--;
+
+            if (c2int_is_invalid_char(b, base))
+                goto bytebuf_to_integer_1_error;
+
+            i = i * base + c2int_digit_from_base(b);
+        }
+
+        if (neg)
+            i = -i;
+        res = make_small(i);
+        goto bytebuf_to_integer_1_done;
     }
 
     /*
      * Calculate the maximum number of bits which will
      * be needed to represent the binary
      */
-    lg2 = ((size+2)*LG2_LOOKUP(base)+1);
-
-    if (lg2 < SMALL_BITS) {
-	/* Take shortcut if we know it will fit in a small.
-	 * This improves speed by about 30%.
-	 */
-	while (size) {
-	    b = *bytes++;
-	    size--;
-
-	    if (IS_VALID_CHARACTER(b,base))
-		goto bytebuf_to_integer_1_error;
-
-	    i = i * base + CHARACTER_FROM_BASE(b);
-
-	}
-
-	if (neg)
-	    i = -i;
-	res = make_small(i);
-	goto bytebuf_to_integer_1_done;
-
-    }
+    lg2 = ((size+2)*lookup_log2(base)+1);
 
     /* Start calculating bignum */
     m = (lg2 + D_EXP-1)/D_EXP;
@@ -2677,8 +2761,8 @@ Eterm erts_chars_to_integer(Process *BIF_P, char *bytes,
     hp = HAlloc(BIF_P, m);
     hp_end = hp + m;
 
-    if ((i = (size % D_BASE_EXP(base))) == 0)
-	i = D_BASE_EXP(base);
+    if ((i = (size % digits_per_Sint)) == 0)
+        i = digits_per_Sint;
 
     n = size - i;
     m = 0;
@@ -2686,34 +2770,34 @@ Eterm erts_chars_to_integer(Process *BIF_P, char *bytes,
     while (i--) {
 	b = *bytes++;
 
-	if (IS_VALID_CHARACTER(b,base)) {
+        if (c2int_is_invalid_char(b,base)) {
 	    HRelease(BIF_P, hp_end, hp);
 	    goto bytebuf_to_integer_1_error;
 	}
 
-	m = base * m + CHARACTER_FROM_BASE(b);
+        m = base * m + c2int_digit_from_base(b);
     }
 
     res = small_to_big(m, hp);
 
     while (n) {
-	i = D_BASE_EXP(base);
-	n -= D_BASE_EXP(base);
+        i = digits_per_Sint;
+        n -= digits_per_Sint;
 	m = 0;
 	while (i--) {
 	    b = *bytes++;
 
-	    if (IS_VALID_CHARACTER(b,base)) {
+            if (c2int_is_invalid_char(b,base)) {
 	      HRelease(BIF_P, hp_end, hp);
 	      goto bytebuf_to_integer_1_error;
 	    }
 
-	    m = base * m + CHARACTER_FROM_BASE(b);
+            m = base * m + c2int_digit_from_base(b);
 	}
 	if (is_small(res)) {
 	    res = small_to_big(signed_val(res), hp);
 	}
-	res = big_times_small(res, D_BASE_BASE(base), hp);
+        res = big_times_small(res, largest_pow_of_base, hp);
 	if (is_small(res)) {
 	    res = small_to_big(signed_val(res), hp);
 	}
@@ -2744,5 +2828,166 @@ bytebuf_to_integer_1_error:
 
 bytebuf_to_integer_1_done:
     return res;
+}
 
+/* Converts list of digits with given 'base' to integer sequentially. Returns
+ * result in 'integer_out', remaining tail goes to 'tail_out' and returns result
+ * code if the list was consumed fully or partially or there was an error
+ */
+LTI_result_t erts_list_to_integer(Process *BIF_P, Eterm orig_list,
+                                  const Uint base,
+                                  Eterm *integer_out, Eterm *tail_out)
+{
+     Sint i = 0;
+     Uint ui = 0;
+     int skip = 0;
+     int neg = 0;
+     Sint n = 0;
+     Sint m;
+     int lg2;
+     Eterm res;
+     Eterm lst = orig_list;
+     Eterm tail = lst;
+     int error_res = LTI_BAD_STRUCTURE;
+     const Uint digits_per_small = get_digits_per_small(base);
+     const Uint digits_per_Sint = get_digits_per_signed_int(base);
+
+     if (is_nil(lst)) {
+       error_res = LTI_NO_INTEGER;
+     error:
+         *tail_out = tail;
+         *integer_out = make_small(0);
+         return error_res;
+     }
+     if (is_not_list(lst))
+       goto error;
+
+     /* if first char is a '-' then it is a negative integer */
+     if (CAR(list_val(lst)) == make_small('-')) {
+          neg = 1;
+          skip = 1;
+          lst = CDR(list_val(lst));
+          if (is_not_list(lst)) {
+              tail = lst;
+              error_res = LTI_NO_INTEGER;
+              goto error;
+          }
+     } else if (CAR(list_val(lst)) == make_small('+')) {
+         /* ignore plus */
+         skip = 1;
+         lst = CDR(list_val(lst));
+         if (is_not_list(lst)) {
+             tail = lst;
+             error_res = LTI_NO_INTEGER;
+             goto error;
+         }
+     }
+
+     /* Calculate size and do type check */
+
+     while(1) {
+         byte ch;
+         if (is_not_small(CAR(list_val(lst)))) {
+             break;
+         }
+         ch = unsigned_val(CAR(list_val(lst)));
+         if (c2int_is_invalid_char(ch, base)) {
+             break;
+         }
+         ui = ui * base;
+         ui = ui + c2int_digit_from_base(ch);
+         n++;
+         lst = CDR(list_val(lst));
+         if (is_nil(lst)) {
+             break;
+         }
+         if (is_not_list(lst)) {
+             break;
+         }
+     }
+
+     tail = lst;
+     if (!n) {
+         error_res = LTI_NO_INTEGER;
+         goto error;
+     }
+
+
+      /* If length fits inside Sint then we know it's a small int. Else we
+       * must construct a bignum and let that routine do the checking
+       */
+
+     if (n <= digits_per_small) {  /* It must be small */
+         i = neg ? -(Sint)ui : (Sint)ui;
+         res = make_small(i);
+     } else {
+         const Sint largest_pow_of_base = get_largest_power_of_base(base);
+         Eterm *hp;
+         Eterm *hp_end;
+
+         /* Convert from log_base to log2 using lookup table */
+         lg2 = ((n+2)*lookup_log2(base)+1);
+         m  = (lg2+D_EXP-1)/D_EXP; /* number of digits */
+         m  = BIG_NEED_SIZE(m);    /* number of words + thing */
+
+         hp = HAlloc(BIF_P, m);
+         hp_end = hp + m;
+
+         lst = orig_list;
+         if (skip)
+             lst = CDR(list_val(lst));
+
+         /* load first digits (at least one digit) */
+         if ((i = (n % digits_per_Sint)) == 0)
+             i = digits_per_Sint;
+         n -= i;
+         m = 0;
+         while(i--) {
+             m *= base;
+             m += c2int_digit_from_base(unsigned_val(CAR(list_val(lst))));
+             lst = CDR(list_val(lst));
+         }
+         res = small_to_big(m, hp);  /* load first digits */
+
+         while(n) {
+             i = digits_per_Sint;
+             n -= digits_per_Sint;
+             m = 0;
+             while(i--) {
+                 m *= base;
+                 m += c2int_digit_from_base(unsigned_val(CAR(list_val(lst))));
+                 lst = CDR(list_val(lst));
+             }
+             if (is_small(res))
+                 res = small_to_big(signed_val(res), hp);
+             res = big_times_small(res, largest_pow_of_base, hp);
+             if (is_small(res))
+                 res = small_to_big(signed_val(res), hp);
+             res = big_plus_small(res, m, hp);
+         }
+
+         if (neg) {
+             if (is_small(res))
+                 res = make_small(-signed_val(res));
+             else {
+                 Uint *big = big_val(res); /* point to thing */
+                 *big = bignum_header_neg(*big);
+             }
+         }
+
+         if (is_not_small(res)) {
+             res = big_plus_small(res, 0, hp); /* includes conversion to small */
+
+             if (is_not_small(res)) {
+                 hp += (big_arity(res)+1);
+             }
+         }
+         HRelease(BIF_P, hp_end, hp);
+     }
+     *integer_out = res;
+     *tail_out = tail;
+     if (tail != NIL) {
+         return LTI_SOME_INTEGER;
+     }
+     return LTI_ALL_INTEGER;
 }
diff --git a/erts/emulator/beam/big.h b/erts/emulator/beam/big.h
index 4aa9724ae3..ee51e5d313 100644
--- a/erts/emulator/beam/big.h
+++ b/erts/emulator/beam/big.h
@@ -35,7 +35,7 @@
 
 typedef Uint     ErtsDigit;
 
-#if ((SIZEOF_VOID_P == 4) || HALFWORD_HEAP) && defined(SIZEOF_LONG_LONG) && (SIZEOF_LONG_LONG == 8)
+#if (SIZEOF_VOID_P == 4) && defined(SIZEOF_LONG_LONG) && (SIZEOF_LONG_LONG == 8)
 /* Assume 32-bit machine with long long support */
 typedef Uint64   ErtsDoubleDigit;
 typedef Uint16   ErtsHalfDigit;
@@ -54,9 +54,6 @@ typedef Uint32   ErtsHalfDigit;
 #error "can not determine machine size"
 #endif
 
-#define D_DECIMAL_EXP	9
-#define D_DECIMAL_BASE	1000000000
-
 typedef Uint  dsize_t;	 /* Vector size type */
 
 #define D_EXP (ERTS_SIZEOF_ETERM*8)
@@ -90,13 +87,9 @@ typedef Uint  dsize_t;	 /* Vector size type */
 
 #define BIG_UINT_HEAP_SIZE (1 + 1)	/* always, since sizeof(Uint) <= sizeof(Eterm) */
 
-#if HALFWORD_HEAP
-#define BIG_UWORD_HEAP_SIZE(UW) (((UW) >> (sizeof(Uint) * 8)) ? 3 : 2)
-#else
 #define BIG_UWORD_HEAP_SIZE(UW) BIG_UINT_HEAP_SIZE
-#endif
 
-#if defined(ARCH_32) || HALFWORD_HEAP
+#if defined(ARCH_32)
 
 #define ERTS_UINT64_BIG_HEAP_SIZE__(X) \
   ((X) >= (((Uint64) 1) << 32) ? (1 + 2) : (1 + 1))
@@ -161,6 +154,7 @@ Eterm bytes_to_big(byte*, dsize_t, int, Eterm*);
 byte* big_to_bytes(Eterm, byte*);
 
 int term_to_Uint(Eterm, Uint*);
+int term_to_Uint_mask(Eterm, Uint*);
 int term_to_UWord(Eterm, UWord*);
 int term_to_Sint(Eterm, Sint*);
 #if HAVE_INT64
@@ -177,5 +171,15 @@ Eterm erts_sint64_to_big(Sint64, Eterm **);
 
 Eterm erts_chars_to_integer(Process *, char*, Uint, const int);
 
+/* How list_to_integer classifies the input, was it even a string? */
+typedef enum {
+    LTI_BAD_STRUCTURE = 0,
+    LTI_NO_INTEGER    = 1,
+    LTI_SOME_INTEGER  = 2,
+    LTI_ALL_INTEGER   = 3
+} LTI_result_t;
+
+LTI_result_t erts_list_to_integer(Process *BIF_P, Eterm orig_list,
+                                  const Uint base,
+                                  Eterm *integer_out, Eterm *tail_out);
 #endif
-
diff --git a/erts/emulator/beam/binary.c b/erts/emulator/beam/binary.c
index e670fbf31c..3fd284b589 100644
--- a/erts/emulator/beam/binary.c
+++ b/erts/emulator/beam/binary.c
@@ -34,6 +34,9 @@
 #include "erl_binary.h"
 #include "erl_bits.h"
 
+#define L2B_B2L_MIN_EXEC_REDS (CONTEXT_REDS/4)
+#define L2B_B2L_RESCHED_REDS (CONTEXT_REDS/40)
+
 static Export binary_to_list_continue_export;
 static Export list_to_binary_continue_export;
 
@@ -47,7 +50,7 @@ erts_init_binary(void)
     if ((((UWord) &((Binary *) 0)->orig_bytes[0]) % ((UWord) 8)) != 0) {
 	/* I assume that any compiler should be able to optimize this
 	   away. If not, this test is not very expensive... */
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "Internal error: Address of orig_bytes[0] of a Binary"
 		 " is *not* 8-byte aligned\n");
     }
@@ -415,10 +418,10 @@ binary_to_list_chunk(Process *c_p,
 }
 
 static ERTS_INLINE BIF_RETTYPE
-binary_to_list(Process *c_p, Eterm *hp, Eterm tail, byte *bytes, Uint size, Uint bitoffs)
+binary_to_list(Process *c_p, Eterm *hp, Eterm tail, byte *bytes,
+	       Uint size, Uint bitoffs, int reds_left, int one_chunk)
 {
-    int reds_left = ERTS_BIF_REDS_LEFT(c_p);
-    if (size < reds_left*ERTS_B2L_BYTES_PER_REDUCTION) {
+    if (one_chunk) {
 	Eterm res;
 	BIF_RETTYPE ret;
 	int bump_reds = (size - 1)/ERTS_B2L_BYTES_PER_REDUCTION + 1;
@@ -472,11 +475,29 @@ BIF_RETTYPE binary_to_list_1(BIF_ALIST_1)
     Uint size;
     Uint bitsize;
     Uint bitoffs;
+    int reds_left;
+    int one_chunk;
 
     if (is_not_binary(BIF_ARG_1)) {
 	goto error;
     }
+
     size = binary_size(BIF_ARG_1);
+    reds_left = ERTS_BIF_REDS_LEFT(BIF_P);
+    one_chunk = size < reds_left*ERTS_B2L_BYTES_PER_REDUCTION;
+    if (!one_chunk) {
+	if (size < L2B_B2L_MIN_EXEC_REDS*ERTS_B2L_BYTES_PER_REDUCTION) {
+	    if (reds_left <= L2B_B2L_RESCHED_REDS) {
+		/* Yield and do it with full context reds... */
+		ERTS_BIF_YIELD1(bif_export[BIF_binary_to_list_1],
+				BIF_P, BIF_ARG_1);
+	    }
+	    /* Allow a bit more reductions... */
+	    one_chunk = 1;
+	    reds_left = L2B_B2L_MIN_EXEC_REDS;
+	}
+    }
+
     ERTS_GET_REAL_BIN(BIF_ARG_1, real_bin, offset, bitoffs, bitsize);
     if (bitsize != 0) {
 	goto error;
@@ -486,7 +507,8 @@ BIF_RETTYPE binary_to_list_1(BIF_ALIST_1)
     } else {
 	Eterm* hp = HAlloc(BIF_P, 2 * size);
 	byte* bytes = binary_bytes(real_bin)+offset;
-	return binary_to_list(BIF_P, hp, NIL, bytes, size, bitoffs);
+	return binary_to_list(BIF_P, hp, NIL, bytes, size,
+			      bitoffs, reds_left, one_chunk);
     }
 
     error:
@@ -505,6 +527,8 @@ BIF_RETTYPE binary_to_list_3(BIF_ALIST_3)
     Uint start;
     Uint stop;
     Eterm* hp;
+    int reds_left;
+    int one_chunk;
 
     if (is_not_binary(BIF_ARG_1)) {
 	goto error;
@@ -513,6 +537,21 @@ BIF_RETTYPE binary_to_list_3(BIF_ALIST_3)
 	goto error;
     }
     size = binary_size(BIF_ARG_1);
+    reds_left = ERTS_BIF_REDS_LEFT(BIF_P);
+    one_chunk = size < reds_left*ERTS_B2L_BYTES_PER_REDUCTION;
+    if (!one_chunk) {
+	if (size < L2B_B2L_MIN_EXEC_REDS*ERTS_B2L_BYTES_PER_REDUCTION) {
+	    if (reds_left <= L2B_B2L_RESCHED_REDS) {
+		/* Yield and do it with full context reds... */
+		ERTS_BIF_YIELD3(bif_export[BIF_binary_to_list_3],
+				BIF_P, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3);
+	    }
+	    /* Allow a bit more reductions... */
+	    one_chunk = 1;
+	    reds_left = L2B_B2L_MIN_EXEC_REDS;
+	}
+    }
+
     ERTS_GET_BINARY_BYTES(BIF_ARG_1, bytes, bitoffs, bitsize);
     if (start < 1 || start > size || stop < 1 ||
 	stop > size || stop < start ) {
@@ -520,7 +559,8 @@ BIF_RETTYPE binary_to_list_3(BIF_ALIST_3)
     }
     i = stop-start+1;
     hp = HAlloc(BIF_P, 2*i);
-    return binary_to_list(BIF_P, hp, NIL, bytes+start-1, i, bitoffs);
+    return binary_to_list(BIF_P, hp, NIL, bytes+start-1, i,
+			  bitoffs, reds_left, one_chunk);
     error:
 	BIF_ERROR(BIF_P, BADARG);
 }
@@ -537,11 +577,27 @@ BIF_RETTYPE bitstring_to_list_1(BIF_ALIST_1)
     byte* bytes;
     Eterm previous = NIL;
     Eterm* hp;
+    int reds_left;
+    int one_chunk;
 
     if (is_not_binary(BIF_ARG_1)) {
 	BIF_ERROR(BIF_P, BADARG);
     }
     size = binary_size(BIF_ARG_1);
+    reds_left = ERTS_BIF_REDS_LEFT(BIF_P);
+    one_chunk = size < reds_left*ERTS_B2L_BYTES_PER_REDUCTION;
+    if (!one_chunk) {
+	if (size < L2B_B2L_MIN_EXEC_REDS*ERTS_B2L_BYTES_PER_REDUCTION) {
+	    if (reds_left <= L2B_B2L_RESCHED_REDS) {
+		/* Yield and do it with full context reds... */
+		ERTS_BIF_YIELD1(bif_export[BIF_bitstring_to_list_1],
+				BIF_P, BIF_ARG_1);
+	    }
+	    /* Allow a bit more reductions... */
+	    one_chunk = 1;
+	    reds_left = L2B_B2L_MIN_EXEC_REDS;
+	}
+    }
     ERTS_GET_REAL_BIN(BIF_ARG_1, real_bin, offset, bitoffs, bitsize);
     bytes = binary_bytes(real_bin)+offset;
     if (bitsize == 0) {
@@ -566,7 +622,8 @@ BIF_RETTYPE bitstring_to_list_1(BIF_ALIST_1)
 	hp += 2;
     }
 
-    return binary_to_list(BIF_P, hp, previous, bytes, size, bitoffs);
+    return binary_to_list(BIF_P, hp, previous, bytes, size,
+			  bitoffs, reds_left, one_chunk);
 }
 
 
@@ -795,8 +852,19 @@ static BIF_RETTYPE list_to_binary_continue(BIF_ALIST_1)
 
 BIF_RETTYPE erts_list_to_binary_bif(Process *c_p, Eterm arg, Export *bif)
 {
+    int orig_reds_left = ERTS_BIF_REDS_LEFT(c_p);
     BIF_RETTYPE ret;
 
+    if (orig_reds_left < L2B_B2L_MIN_EXEC_REDS) {
+	if (orig_reds_left <= L2B_B2L_RESCHED_REDS) {
+	    /* Yield and do it with full context reds... */
+	    ERTS_BIF_PREP_YIELD1(ret, bif, c_p, arg);
+	    return ret;
+	}
+	/* Allow a bit more reductions... */
+	orig_reds_left = L2B_B2L_MIN_EXEC_REDS;
+    }
+
     if (is_nil(arg))
 	ERTS_BIF_PREP_RET(ret, new_binary(c_p, (byte *) "", 0));
     else if (is_not_list(arg))
@@ -818,7 +886,6 @@ BIF_RETTYPE erts_list_to_binary_bif(Process *c_p, Eterm arg, Export *bif)
 						       bif,
 						       erts_iolist_size_yielding,
 						       erts_iolist_to_buf_yielding);
-	    int orig_reds_left = ERTS_BIF_REDS_LEFT(c_p);
 
 	    /*
 	     * First try to do it all at once without having to use
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index 4ce9d24479..446598362c 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -104,7 +104,7 @@ process_killer(void)
 	    erts_printf("(k)ill (n)ext (r)eturn:\n");
 	    while(1) {
 		if ((j = sys_get_key(0)) <= 0)
-		    erl_exit(0, "");
+		    erts_exit(0, "");
 		switch(j) {
 		case 'k': {
 		    ErtsProcLocks rp_locks = ERTS_PROC_LOCKS_XSIG_SEND;
@@ -252,7 +252,7 @@ print_process_info(int to, void *to_arg, Process *p)
 
     /* display the message queue only if there is anything in it */
     if (!ERTS_IS_CRASH_DUMPING && p->msg.first != NULL && !garbing) {
-	ErlMessage* mp;
+	ErtsMessage* mp;
 	erts_print(to, to_arg, "Message queue: [");
 	for (mp = p->msg.first; mp; mp = mp->next)
 	    erts_print(to, to_arg, mp->next ? "%T," : "%T", ERL_MESSAGE_TERM(mp));
@@ -323,7 +323,7 @@ print_process_info(int to, void *to_arg, Process *p)
     erts_print(to, to_arg, "Heap unused: %bpu\n", (p->hend - p->htop));
     erts_print(to, to_arg, "OldHeap unused: %bpu\n",
 	       (OLD_HEAP(p) == NULL) ? 0 : (OLD_HEND(p) - OLD_HTOP(p)) );
-    erts_print(to, to_arg, "Memory: %beu\n", erts_process_memory(p));
+    erts_print(to, to_arg, "Memory: %beu\n", erts_process_memory(p, !0));
 
     if (garbing) {
 	print_garb_info(to, to_arg, p);
@@ -381,7 +381,7 @@ loaded(int to, void *to_arg)
     int i;
     int old = 0;
     int cur = 0;
-    BeamInstr* code;
+    BeamCodeHeader* code;
     Module* modp;
     ErtsCodeIndex code_ix;
 
@@ -439,30 +439,30 @@ loaded(int to, void *to_arg)
 		erts_print(to, to_arg, "\n");
 		erts_print(to, to_arg, "Current size: %d\n",
 			   modp->curr.code_length);
-		code = modp->curr.code;
-		if (code != NULL && code[MI_ATTR_PTR]) {
+		code = modp->curr.code_hdr;
+		if (code != NULL && code->attr_ptr) {
 		    erts_print(to, to_arg, "Current attributes: ");
-		    dump_attributes(to, to_arg, (byte *) code[MI_ATTR_PTR],
-				    code[MI_ATTR_SIZE]);
+		    dump_attributes(to, to_arg, code->attr_ptr,
+				    code->attr_size);
 		}
-		if (code != NULL && code[MI_COMPILE_PTR]) {
+		if (code != NULL && code->compile_ptr) {
 		    erts_print(to, to_arg, "Current compilation info: ");
-		    dump_attributes(to, to_arg, (byte *) code[MI_COMPILE_PTR],
-				    code[MI_COMPILE_SIZE]);
+		    dump_attributes(to, to_arg, code->compile_ptr,
+				    code->compile_size);
 		}
 
 		if (modp->old.code_length != 0) {
 		    erts_print(to, to_arg, "Old size: %d\n", modp->old.code_length);
-		    code = modp->old.code;
-		    if (code[MI_ATTR_PTR]) {
+		    code = modp->old.code_hdr;
+		    if (code->attr_ptr) {
 			erts_print(to, to_arg, "Old attributes: ");
-			dump_attributes(to, to_arg, (byte *) code[MI_ATTR_PTR],
-					code[MI_ATTR_SIZE]);
+			dump_attributes(to, to_arg, code->attr_ptr,
+					code->attr_size);
 		    }
-		    if (code[MI_COMPILE_PTR]) {
+		    if (code->compile_ptr) {
 			erts_print(to, to_arg, "Old compilation info: ");
-			dump_attributes(to, to_arg, (byte *) code[MI_COMPILE_PTR],
-					code[MI_COMPILE_SIZE]);
+			dump_attributes(to, to_arg, code->compile_ptr,
+					code->compile_size);
 		    }
 		}
 	    }
@@ -493,7 +493,7 @@ do_break(void)
        halt immediately if break is called */
     mode = erts_read_env("ERL_CONSOLE_MODE");
     if (mode && strcmp(mode, "window") != 0)
-	erl_exit(0, "");
+	erts_exit(0, "");
     erts_free_read_env(mode);
 #endif /* __WIN32__ */
 
@@ -503,7 +503,7 @@ do_break(void)
 
     while (1) {
 	if ((i = sys_get_key(0)) <= 0)
-	    erl_exit(0, "");
+	    erts_exit(0, "");
 	switch (i) {
 	case 'q':
 	case 'a': 
@@ -513,9 +513,9 @@ do_break(void)
 		   * The usual reason for a read error is Ctrl-C. Treat this as
 		   * 'a' to avoid infinite loop.
 		   */
-	    erl_exit(0, "");
+	    erts_exit(0, "");
 	case 'A':		/* Halt generating crash dump */
-	    erl_exit(1, "Crash dump requested by user");
+	    erts_exit(ERTS_ERROR_EXIT, "Crash dump requested by user");
 	case 'c':
 	    return;
 	case 'p':
@@ -684,7 +684,7 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
        crash dump. */
     erts_thr_progress_fatal_error_block(&tpd_buf);
 
-#ifdef ERTS_THR_HAVE_SIG_FUNCS
+#ifdef ERTS_SYS_SUSPEND_SIGNAL
     /*
      * We suspend all scheduler threads so that we can dump some
      * data about the currently running processes and scheduler data.
@@ -785,7 +785,7 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
     erts_fdprintf(fd, "Atoms: %d\n", atom_table_size());
 
 #ifdef USE_THREADS
-    /* We want to note which thread it was that called erl_exit */
+    /* We want to note which thread it was that called erts_exit */
     if (erts_get_scheduler_data()) {
         erts_fdprintf(fd, "Calling Thread: scheduler:%d\n",
                       erts_get_scheduler_data()->no);
@@ -818,7 +818,7 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
 
 #ifdef ERTS_SMP
 
-#if defined(ERTS_THR_HAVE_SIG_FUNCS)
+#ifdef ERTS_SYS_SUSPEND_SIGNAL
 
     /* We resume all schedulers so that we are in a known safe state
        when we write the rest of the crash dump */
diff --git a/erts/emulator/beam/code_ix.c b/erts/emulator/beam/code_ix.c
index 209d008d18..1b0968c55c 100644
--- a/erts/emulator/beam/code_ix.c
+++ b/erts/emulator/beam/code_ix.c
@@ -65,12 +65,12 @@ void erts_code_ix_init(void)
     CIX_TRACE("init");
 }
 
-void erts_start_staging_code_ix(void)
+void erts_start_staging_code_ix(int num_new)
 {
     beam_catches_start_staging();
     export_start_staging();
     module_start_staging();
-    erts_start_staging_ranges();
+    erts_start_staging_ranges(num_new);
     CIX_TRACE("start");
 }
 
diff --git a/erts/emulator/beam/code_ix.h b/erts/emulator/beam/code_ix.h
index 5f00b409ef..7a66211a5b 100644
--- a/erts/emulator/beam/code_ix.h
+++ b/erts/emulator/beam/code_ix.h
@@ -100,7 +100,7 @@ void erts_release_code_write_permission(void);
  * Must be followed by calls to either "end" and "commit" or "abort" before
  * code write permission can be released.
  */
-void erts_start_staging_code_ix(void);
+void erts_start_staging_code_ix(int num_new);
 
 /* End the staging.
  * Preceded by "start" and must be followed by "commit".
diff --git a/erts/emulator/beam/copy.c b/erts/emulator/beam/copy.c
index 8849dadd00..b38ebe066b 100644
--- a/erts/emulator/beam/copy.c
+++ b/erts/emulator/beam/copy.c
@@ -35,56 +35,59 @@
 #include "erl_bits.h"
 #include "dtrace-wrapper.h"
 
-static void move_one_frag(Eterm** hpp, ErlHeapFragment*, ErlOffHeap*);
+static void move_one_frag(Eterm** hpp, ErlHeapFragment*, ErlOffHeap*, int);
 
 /*
  *  Copy object "obj" to process p.
  */
-Eterm
-copy_object(Eterm obj, Process* to)
-{
-    Uint size = size_object(obj);
-    Eterm* hp = HAlloc(to, size);
-    Eterm res;
+Eterm copy_object_x(Eterm obj, Process* to, Uint extra) {
+    if (!is_immed(obj)) {
+        Uint size = size_object(obj);
+        Eterm* hp = HAllocX(to, size, extra);
+        Eterm res;
 
 #ifdef USE_VM_PROBES
-    if (DTRACE_ENABLED(copy_object)) {
-        DTRACE_CHARBUF(proc_name, 64);
+        if (DTRACE_ENABLED(copy_object)) {
+            DTRACE_CHARBUF(proc_name, 64);
 
-        erts_snprintf(proc_name, sizeof(DTRACE_CHARBUF_NAME(proc_name)),
-                      "%T", to->common.id);
-        DTRACE2(copy_object, proc_name, size);
-    }
+            erts_snprintf(proc_name, sizeof(DTRACE_CHARBUF_NAME(proc_name)),
+                    "%T", to->common.id);
+            DTRACE2(copy_object, proc_name, size);
+        }
 #endif
-    res = copy_struct(obj, size, &hp, &to->off_heap);
+        res = copy_struct(obj, size, &hp, &to->off_heap);
 #ifdef DEBUG
-    if (eq(obj, res) == 0) {
-	erl_exit(ERTS_ABORT_EXIT, "copy not equal to source\n");
-    }
+        if (eq(obj, res) == 0) {
+            erts_exit(ERTS_ABORT_EXIT, "copy not equal to source\n");
+        }
 #endif
-    return res;
+        return res;
+    }
+    return obj;
 }
 
 /*
  * Return the "flat" size of the object.
  */
 
-#if HALFWORD_HEAP
-Uint size_object_rel(Eterm obj, Eterm* base)
-#else
 Uint size_object(Eterm obj)
-#endif
 {
     Uint sum = 0;
     Eterm* ptr;
     int arity;
+#ifdef DEBUG
+    Eterm mypid = erts_get_current_pid();
+#endif
 
     DECLARE_ESTACK(s);
+
+    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] size_object %p\n", mypid, obj));
+
     for (;;) {
 	switch (primary_tag(obj)) {
 	case TAG_PRIMARY_LIST:
 	    sum += 2;
-	    ptr = list_val_rel(obj,base);
+	    ptr = list_val(obj);
 	    obj = *ptr++;
 	    if (!IS_CONST(obj)) {
 		ESTACK_PUSH(s, obj);
@@ -93,11 +96,11 @@ Uint size_object(Eterm obj)
 	    break;
 	case TAG_PRIMARY_BOXED:
 	    {
-		Eterm hdr = *boxed_val_rel(obj,base);
+		Eterm hdr = *boxed_val(obj);
 		ASSERT(is_header(hdr));
 		switch (hdr & _TAG_HEADER_MASK) {
 		case ARITYVAL_SUBTAG:
-		    ptr = tuple_val_rel(obj,base);
+		    ptr = tuple_val(obj);
 		    arity = header_arity(hdr);
 		    sum += arity + 1;
 		    if (arity == 0) { /* Empty tuple -- unusual. */
@@ -113,7 +116,7 @@ Uint size_object(Eterm obj)
 		    break;
 		case FUN_SUBTAG:
 		    {
-			Eterm* bptr = fun_val_rel(obj,base);
+			Eterm* bptr = fun_val(obj);
 			ErlFunThing* funp = (ErlFunThing *) bptr;
 			unsigned eterms = 1 /* creator */ + funp->num_free;
 			unsigned sz = thing_arityval(hdr);
@@ -134,7 +137,7 @@ Uint size_object(Eterm obj)
                             {
                                 Uint n;
                                 flatmap_t *mp;
-                                mp  = (flatmap_t*)flatmap_val_rel(obj,base);
+                                mp  = (flatmap_t*)flatmap_val(obj);
                                 ptr = (Eterm *)mp;
                                 n   = flatmap_get_size(mp) + 1;
                                 sum += n + 2;
@@ -153,7 +156,7 @@ Uint size_object(Eterm obj)
 			    {
 				Eterm *head;
 				Uint sz;
-				head  = hashmap_val_rel(obj, base);
+				head  = hashmap_val(obj);
 				sz    = hashmap_bitcount(MAP_HEADER_VAL(hdr));
 				sum  += 1 + sz + header_arity(hdr);
 				head += 1 + header_arity(hdr);
@@ -171,7 +174,7 @@ Uint size_object(Eterm obj)
 			    }
 			    break;
 			default:
-			    erl_exit(ERTS_ABORT_EXIT, "size_object: bad hashmap type %d\n", MAP_HEADER_TYPE(hdr));
+			    erts_exit(ERTS_ABORT_EXIT, "size_object: bad hashmap type %d\n", MAP_HEADER_TYPE(hdr));
 		    }
 		    break;
 		case SUB_BINARY_SUBTAG:
@@ -182,7 +185,7 @@ Uint size_object(Eterm obj)
 			Uint bitoffs;
 			Uint extra_bytes;
 			Eterm hdr;
-			ERTS_GET_REAL_BIN_REL(obj, real_bin, offset, bitoffs, bitsize, base);
+			ERTS_GET_REAL_BIN(obj, real_bin, offset, bitoffs, bitsize);
 			if ((bitsize + bitoffs) > 8) {
 			    sum += ERL_SUB_BIN_SIZE;
 			    extra_bytes = 2;
@@ -192,17 +195,17 @@ Uint size_object(Eterm obj)
 			} else {
 			    extra_bytes = 0;
 			}
-			hdr = *binary_val_rel(real_bin,base);
+			hdr = *binary_val(real_bin);
 			if (thing_subtag(hdr) == REFC_BINARY_SUBTAG) {
 			    sum += PROC_BIN_SIZE;
 			} else {
-			    sum += heap_bin_size(binary_size_rel(obj,base)+extra_bytes);
+			    sum += heap_bin_size(binary_size(obj)+extra_bytes);
 			}
 			goto pop_next;
 		    }
 		    break;
                 case BIN_MATCHSTATE_SUBTAG:
-		    erl_exit(ERTS_ABORT_EXIT,
+		    erts_exit(ERTS_ABORT_EXIT,
 			     "size_object: matchstate term not allowed");
 		default:
 		    sum += thing_arityval(hdr) + 1;
@@ -214,25 +217,389 @@ Uint size_object(Eterm obj)
 	pop_next:
 	    if (ESTACK_ISEMPTY(s)) {
 		DESTROY_ESTACK(s);
+		VERBOSE(DEBUG_SHCOPY, ("[pid=%T] size was: %u\n", mypid, sum));
 		return sum;
 	    }
 	    obj = ESTACK_POP(s);
 	    break;
 	default:
-	    erl_exit(ERTS_ABORT_EXIT, "size_object: bad tag for %#x\n", obj);
+	    erts_exit(ERTS_ABORT_EXIT, "size_object: bad tag for %#x\n", obj);
 	}
     }
 }
 
 /*
+ *  Machinery for sharing preserving information
+ *  Using a WSTACK but not very transparently; consider refactoring
+ */
+
+#define DECLARE_BITSTORE(s)						\
+    DECLARE_WSTACK(s);							\
+    int WSTK_CONCAT(s,_bitoffs) = 0;					\
+    int WSTK_CONCAT(s,_offset) = 0;					\
+    UWord WSTK_CONCAT(s,_buffer) = 0
+
+#define DESTROY_BITSTORE(s) DESTROY_WSTACK(s)
+#define BITSTORE_PUT(s,i)						\
+do {									\
+    WSTK_CONCAT(s,_buffer) |= i << WSTK_CONCAT(s,_bitoffs);		\
+    WSTK_CONCAT(s,_bitoffs) += 2;					\
+    if (WSTK_CONCAT(s,_bitoffs) >= 8*sizeof(UWord)) {			\
+	WSTACK_PUSH(s, WSTK_CONCAT(s,_buffer));				\
+	WSTK_CONCAT(s,_bitoffs) = 0;					\
+	WSTK_CONCAT(s,_buffer) = 0;					\
+    }									\
+} while(0)
+#define BITSTORE_CLOSE(s)						\
+do {									\
+    if (WSTK_CONCAT(s,_bitoffs) > 0) {					\
+	WSTACK_PUSH(s, WSTK_CONCAT(s,_buffer));				\
+	WSTK_CONCAT(s,_bitoffs) = 0;					\
+    }									\
+} while(0)
+
+#define BITSTORE_FETCH(s,dst)                                           \
+do {                                                                    \
+    UWord result;                                                       \
+    if (WSTK_CONCAT(s,_bitoffs) <= 0) {                                 \
+        WSTK_CONCAT(s,_buffer) = s.wstart[WSTK_CONCAT(s,_offset)];      \
+        WSTK_CONCAT(s,_offset)++;                                       \
+        WSTK_CONCAT(s,_bitoffs) = 8*sizeof(UWord);                      \
+    }                                                                   \
+    WSTK_CONCAT(s,_bitoffs) -= 2;                                       \
+    result = WSTK_CONCAT(s,_buffer) & 3;                                \
+    WSTK_CONCAT(s,_buffer) >>= 2;                                       \
+    (dst) = result;                                                     \
+} while(0)
+
+#define BOXED_VISITED_MASK	 ((Eterm) 3)
+#define BOXED_VISITED		 ((Eterm) 1)
+#define BOXED_SHARED_UNPROCESSED ((Eterm) 2)
+#define BOXED_SHARED_PROCESSED	 ((Eterm) 3)
+
+#define COUNT_OFF_HEAP (0)
+
+#define IN_LITERAL_PURGE_AREA(info, ptr)                 \
+    ((info)->range_ptr && (                              \
+        (info)->range_ptr <= (ptr) &&                    \
+        (ptr) < ((info)->range_ptr + (info)->range_sz)))
+/*
+ *  Return the real size of an object and find sharing information
+ *  This currently returns the same as erts_debug:size/1.
+ *  It is argued whether the size of subterms in constant pools
+ *  should be counted or not.
+ */
+
+Uint size_shared(Eterm obj)
+{
+    Eterm saved_obj = obj;
+    Uint sum = 0;
+    Eterm* ptr;
+
+    DECLARE_EQUEUE(s);
+    DECLARE_BITSTORE(b);
+
+    for (;;) {
+	switch (primary_tag(obj)) {
+	case TAG_PRIMARY_LIST: {
+	    Eterm head, tail;
+	    ptr = list_val(obj);
+	    /* we're not counting anything that's outside our heap */
+	    if (!COUNT_OFF_HEAP && erts_is_literal(obj,ptr)) {
+		goto pop_next;
+	    }
+	    head = CAR(ptr);
+	    tail = CDR(ptr);
+	    /* if it's visited, don't count it */
+	    if (primary_tag(tail) == TAG_PRIMARY_HEADER ||
+		primary_tag(head) == TAG_PRIMARY_HEADER) {
+		goto pop_next;
+	    }
+	    /* else make it visited now */
+	    switch (primary_tag(tail)) {
+	    case TAG_PRIMARY_LIST:
+		ptr[1] = (tail - TAG_PRIMARY_LIST) | TAG_PRIMARY_HEADER;
+		break;
+	    case TAG_PRIMARY_IMMED1:
+		CAR(ptr) = (head - primary_tag(head)) | TAG_PRIMARY_HEADER;
+		CDR(ptr) = (tail - TAG_PRIMARY_IMMED1) | primary_tag(head);
+		break;
+	    case TAG_PRIMARY_BOXED:
+		BITSTORE_PUT(b, primary_tag(head));
+		CAR(ptr) = (head - primary_tag(head)) | TAG_PRIMARY_HEADER;
+		CDR(ptr) = (tail - TAG_PRIMARY_BOXED) | TAG_PRIMARY_HEADER;
+		break;
+	    }
+	    /* and count it */
+	    sum += 2;
+	    if (!IS_CONST(head)) {
+		EQUEUE_PUT(s, head);
+	    }
+	    obj = tail;
+	    break;
+	}
+	case TAG_PRIMARY_BOXED: {
+	    Eterm hdr;
+	    ptr = boxed_val(obj);
+	    /* we're not counting anything that's outside our heap */
+	    if (!COUNT_OFF_HEAP && erts_is_literal(obj,ptr)) {
+		goto pop_next;
+	    }
+	    hdr = *ptr;
+	    /* if it's visited, don't count it */
+	    if (primary_tag(hdr) != TAG_PRIMARY_HEADER) {
+		goto pop_next;
+	    }
+	    /* else make it visited now */
+	    *ptr = (hdr - primary_tag(hdr)) + BOXED_VISITED;
+	    /* and count it */
+	    ASSERT(is_header(hdr));
+	    switch (hdr & _TAG_HEADER_MASK) {
+	    case ARITYVAL_SUBTAG: {
+		int arity = header_arity(hdr);
+		sum += arity + 1;
+		if (arity == 0) { /* Empty tuple -- unusual. */
+		    goto pop_next;
+		}
+		while (arity-- > 0) {
+		    obj = *++ptr;
+		    if (!IS_CONST(obj)) {
+			EQUEUE_PUT(s, obj);
+		    }
+		}
+		goto pop_next;
+	    }
+	    case FUN_SUBTAG: {
+		ErlFunThing* funp = (ErlFunThing *) ptr;
+		unsigned eterms = 1 /* creator */ + funp->num_free;
+		unsigned sz = thing_arityval(hdr);
+		sum += 1 /* header */ + sz + eterms;
+		ptr += 1 /* header */ + sz;
+		while (eterms-- > 0) {
+		    obj = *ptr++;
+		    if (!IS_CONST(obj)) {
+			EQUEUE_PUT(s, obj);
+		    }
+		}
+		goto pop_next;
+	    }
+	    case SUB_BINARY_SUBTAG: {
+		ErlSubBin* sb = (ErlSubBin *) ptr;
+		Uint extra_bytes;
+		Eterm hdr;
+		ASSERT((sb->thing_word & ~BOXED_VISITED_MASK) == HEADER_SUB_BIN);
+		if (sb->bitsize + sb->bitoffs > 8) {
+		    sum += ERL_SUB_BIN_SIZE;
+		    extra_bytes = 2;
+		} else if (sb->bitsize + sb->bitoffs > 0) {
+		    sum += ERL_SUB_BIN_SIZE;
+		    extra_bytes = 1;
+		} else {
+		    extra_bytes = 0;
+		}
+		ptr = binary_val(sb->orig);
+		hdr = (*ptr) & ~BOXED_VISITED_MASK;
+		if (thing_subtag(hdr) == REFC_BINARY_SUBTAG) {
+		    sum += PROC_BIN_SIZE;
+		} else {
+		    ASSERT(thing_subtag(hdr) == HEAP_BINARY_SUBTAG);
+		    sum += heap_bin_size(binary_size(obj) + extra_bytes);
+		}
+		goto pop_next;
+	    }
+            case MAP_SUBTAG:
+                switch (MAP_HEADER_TYPE(hdr)) {
+                    case MAP_HEADER_TAG_FLATMAP_HEAD : {
+                        flatmap_t *mp  = (flatmap_t*)flatmap_val(obj);
+                        Uint n = flatmap_get_size(mp) + 1;
+                        ptr  = (Eterm *)mp;
+                        sum += n + 2;
+                        ptr += 2; /* hdr + size words */
+                        while (n--) {
+                            obj = *ptr++;
+                            if (!IS_CONST(obj)) {
+                                EQUEUE_PUT(s, obj);
+                            }
+                        }
+                        goto pop_next;
+                    }
+                    case MAP_HEADER_TAG_HAMT_HEAD_BITMAP :
+                    case MAP_HEADER_TAG_HAMT_HEAD_ARRAY :
+                    case MAP_HEADER_TAG_HAMT_NODE_BITMAP : {
+                        Uint n = hashmap_bitcount(MAP_HEADER_VAL(hdr));
+                        sum += 1 + n + header_arity(hdr);
+                        ptr += 1 + header_arity(hdr);
+                        while (n--) {
+                            obj = *ptr++;
+                            if (!IS_CONST(obj)) {
+                                EQUEUE_PUT(s, obj);
+                            }
+                        }
+                        goto pop_next;
+                    }
+                    default:
+                        erts_exit(ERTS_ABORT_EXIT, "size_shared: bad hashmap type %d\n", MAP_HEADER_TYPE(hdr));
+                }
+	    case BIN_MATCHSTATE_SUBTAG:
+		erts_exit(ERTS_ABORT_EXIT,
+			 "size_shared: matchstate term not allowed");
+	    default:
+		sum += thing_arityval(hdr) + 1;
+		goto pop_next;
+	    }
+	    break;
+	}
+	case TAG_PRIMARY_IMMED1:
+	pop_next:
+	    if (EQUEUE_ISEMPTY(s)) {
+		goto cleanup;
+	    }
+	    obj = EQUEUE_GET(s);
+	    break;
+	default:
+	    erts_exit(ERTS_ABORT_EXIT, "size_shared: bad tag for %#x\n", obj);
+	}
+    }
+
+cleanup:
+    obj = saved_obj;
+    BITSTORE_CLOSE(b);
+    for (;;) {
+	switch (primary_tag(obj)) {
+	case TAG_PRIMARY_LIST: {
+	    Eterm head, tail;
+	    ptr = list_val(obj);
+	    if (!COUNT_OFF_HEAP && erts_is_literal(obj,ptr)) {
+		goto cleanup_next;
+	    }
+	    head = CAR(ptr);
+	    tail = CDR(ptr);
+	    /* if not already clean, clean it up */
+	    if (primary_tag(tail) == TAG_PRIMARY_HEADER) {
+		if (primary_tag(head) == TAG_PRIMARY_HEADER) {
+		    Eterm saved;
+                    BITSTORE_FETCH(b, saved);
+		    CAR(ptr) = head = (head - TAG_PRIMARY_HEADER) | saved;
+		    CDR(ptr) = tail = (tail - TAG_PRIMARY_HEADER) | TAG_PRIMARY_BOXED;
+		} else {
+		    CDR(ptr) = tail = (tail - TAG_PRIMARY_HEADER) | TAG_PRIMARY_LIST;
+		}
+	    } else if (primary_tag(head) == TAG_PRIMARY_HEADER) {
+		CAR(ptr) = head = (head - TAG_PRIMARY_HEADER) | primary_tag(tail);
+		CDR(ptr) = tail = (tail - primary_tag(tail)) | TAG_PRIMARY_IMMED1;
+	    } else {
+		goto cleanup_next;
+	    }
+	    /* and its children too */
+	    if (!IS_CONST(head)) {
+		EQUEUE_PUT_UNCHECKED(s, head);
+	    }
+	    obj = tail;
+	    break;
+	}
+	case TAG_PRIMARY_BOXED: {
+	    Eterm hdr;
+	    ptr = boxed_val(obj);
+	    if (!COUNT_OFF_HEAP && erts_is_literal(obj,ptr)) {
+		goto cleanup_next;
+	    }
+	    hdr = *ptr;
+	    /* if not already clean, clean it up */
+	    if (primary_tag(hdr) == TAG_PRIMARY_HEADER) {
+		goto cleanup_next;
+	    }
+	    else {
+		ASSERT(primary_tag(hdr) == BOXED_VISITED);
+		*ptr = hdr = (hdr - BOXED_VISITED) + TAG_PRIMARY_HEADER;
+	    }
+	    /* and its children too */
+	    switch (hdr & _TAG_HEADER_MASK) {
+	    case ARITYVAL_SUBTAG: {
+		int arity = header_arity(hdr);
+		if (arity == 0) { /* Empty tuple -- unusual. */
+		    goto cleanup_next;
+		}
+		while (arity-- > 0) {
+		    obj = *++ptr;
+		    if (!IS_CONST(obj)) {
+			EQUEUE_PUT_UNCHECKED(s, obj);
+		    }
+		}
+		goto cleanup_next;
+	    }
+	    case FUN_SUBTAG: {
+		ErlFunThing* funp = (ErlFunThing *) ptr;
+		unsigned eterms = 1 /* creator */ + funp->num_free;
+		unsigned sz = thing_arityval(hdr);
+		ptr += 1 /* header */ + sz;
+		while (eterms-- > 0) {
+		    obj = *ptr++;
+		    if (!IS_CONST(obj)) {
+			EQUEUE_PUT_UNCHECKED(s, obj);
+		    }
+		}
+		goto cleanup_next;
+	    }
+            case MAP_SUBTAG:
+                switch (MAP_HEADER_TYPE(hdr)) {
+                    case MAP_HEADER_TAG_FLATMAP_HEAD : {
+                        flatmap_t *mp = (flatmap_t *) ptr;
+                        Uint n = flatmap_get_size(mp) + 1;
+                        ptr += 2; /* hdr + size words */
+                        while (n--) {
+                            obj = *ptr++;
+                            if (!IS_CONST(obj)) {
+                                EQUEUE_PUT_UNCHECKED(s, obj);
+                            }
+                        }
+                        goto cleanup_next;
+                    }
+                    case MAP_HEADER_TAG_HAMT_HEAD_BITMAP :
+                    case MAP_HEADER_TAG_HAMT_HEAD_ARRAY :
+                    case MAP_HEADER_TAG_HAMT_NODE_BITMAP : {
+                        Uint n = hashmap_bitcount(MAP_HEADER_VAL(hdr));
+                        sum += 1 + n + header_arity(hdr);
+                        ptr += 1 + header_arity(hdr);
+                        while (n--) {
+                            obj = *ptr++;
+                            if (!IS_CONST(obj)) {
+                                EQUEUE_PUT_UNCHECKED(s, obj);
+                            }
+                        }
+                        goto cleanup_next;
+                    }
+                    default:
+                        erts_exit(ERTS_ABORT_EXIT, "size_shared: bad hashmap type %d\n", MAP_HEADER_TYPE(hdr));
+                }
+	    default:
+		goto cleanup_next;
+	    }
+	    break;
+	}
+	case TAG_PRIMARY_IMMED1:
+	cleanup_next:
+	    if (EQUEUE_ISEMPTY(s)) {
+		goto all_clean;
+	    }
+	    obj = EQUEUE_GET(s);
+	    break;
+	default:
+	    erts_exit(ERTS_ABORT_EXIT, "size_shared: bad tag for %#x\n", obj);
+	}
+    }
+
+ all_clean:
+    /* Return the result */
+    DESTROY_EQUEUE(s);
+    DESTROY_BITSTORE(b);
+    return sum;
+}
+
+
+/*
  *  Copy a structure to a heap.
  */
-#if HALFWORD_HEAP
-Eterm copy_struct_rel(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap,
-                      Eterm* src_base, Eterm* dst_base)
-#else
-Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
-#endif
+Eterm copy_struct_x(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap, Uint *bsz)
 {
     char* hstart;
     Uint hsize;
@@ -247,19 +614,23 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
     Eterm* argp;
     Eterm* const_tuple;
     Eterm hdr;
+    Eterm *hend;
     int i;
 #ifdef DEBUG
     Eterm org_obj = obj;
     Uint org_sz = sz;
+    Eterm mypid = erts_get_current_pid();
 #endif
 
     if (IS_CONST(obj))
 	return obj;
 
+    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] copy_struct %p\n", mypid, obj));
+
     DTRACE1(copy_struct, (int32_t)sz);
 
     hp = htop = *hpp;
-    hbot   = htop + sz;
+    hbot = hend = htop + sz;
     hstart = (char *)htop;
     hsize = (char*) hbot - hstart;
     const_tuple = 0;
@@ -268,11 +639,11 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
     switch (primary_tag(obj)) {
     case TAG_PRIMARY_LIST:
 	argp = &res;
-	objp = list_val_rel(obj,src_base);
+	objp = list_val(obj);
 	goto L_copy_list;
     case TAG_PRIMARY_BOXED: argp = &res; goto L_copy_boxed;
     default:
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "%s, line %d: Internal error in copy_struct: 0x%08x\n",
 		 __FILE__, __LINE__,obj);
     }
@@ -286,14 +657,11 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 	    hp++;
 	    break;
 	case TAG_PRIMARY_LIST:
-	    objp = list_val_rel(obj,src_base);
-	#if !HALFWORD_HEAP || defined(DEBUG)
-	    if (in_area(objp,hstart,hsize)) {
-		ASSERT(!HALFWORD_HEAP);
+	    objp = list_val(obj);
+	    if (ErtsInArea(objp,hstart,hsize)) {
 		hp++;
 		break;
 	    }
-	#endif
 	    argp = hp++;
 	    /* Fall through */
 
@@ -309,52 +677,41 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 		}
 		else {
 		    CAR(htop) = elem;
-		#if HALFWORD_HEAP
-		    CDR(htop) = CDR(objp);
-		    *tailp = make_list_rel(htop,dst_base);
-		    htop += 2;
-		    goto L_copy;
-		#else
 		    tailp = &CDR(htop);
 		    htop += 2;
-		#endif
 		}
-		ASSERT(!HALFWORD_HEAP || tp < hp || tp >= hbot);
-		*tp = make_list_rel(tailp - 1, dst_base);
+		*tp = make_list(tailp - 1);
 		obj = CDR(objp);
 		if (!is_list(obj)) {
 		    break;
 		}
-		objp = list_val_rel(obj,src_base);
+		objp = list_val(obj);
 	    }
 	    switch (primary_tag(obj)) {
 	    case TAG_PRIMARY_IMMED1: *tailp = obj; goto L_copy;
 	    case TAG_PRIMARY_BOXED: argp = tailp; goto L_copy_boxed;
 	    default:
-		erl_exit(ERTS_ABORT_EXIT,
+		erts_exit(ERTS_ABORT_EXIT,
 			 "%s, line %d: Internal error in copy_struct: 0x%08x\n",
 			 __FILE__, __LINE__,obj);
 	    }
 	    
 	case TAG_PRIMARY_BOXED:
-	#if !HALFWORD_HEAP || defined(DEBUG)
-	    if (in_area(boxed_val_rel(obj,src_base),hstart,hsize)) {
-		ASSERT(!HALFWORD_HEAP);
+	    if (ErtsInArea(boxed_val(obj),hstart,hsize)) {
 		hp++;
 		break;
 	    }
-	#endif
 	    argp = hp++;
 
 	L_copy_boxed:
-	    objp = boxed_val_rel(obj, src_base);
+	    objp = boxed_val(obj);
 	    hdr = *objp;
 	    switch (hdr & _TAG_HEADER_MASK) {
 	    case ARITYVAL_SUBTAG:
 		{
 		    int const_flag = 1; /* assume constant tuple */
 		    i = arityval(hdr);
-		    *argp = make_tuple_rel(htop, dst_base);
+		    *argp = make_tuple(htop);
 		    tp = htop;	/* tp is pointer to new arity value */
 		    *htop++ = *objp++; /* copy arity value */
 		    while (i--) {
@@ -383,7 +740,7 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 		    while (i--)  {
 			*tp++ = *objp++;
 		    }
-		    *argp = make_binary_rel(hbot, dst_base);
+		    *argp = make_binary(hbot);
 		    pb = (ProcBin*) hbot;
 		    erts_refc_inc(&pb->val->refc, 2);
 		    pb->next = off_heap->first;
@@ -410,7 +767,7 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 			extra_bytes = 0;
 		    } 
 		    real_size = size+extra_bytes;
-		    objp = binary_val_rel(real_bin,src_base);
+		    objp = binary_val(real_bin);
 		    if (thing_subtag(*objp) == HEAP_BINARY_SUBTAG) {
 			ErlHeapBin* from = (ErlHeapBin *) objp;
 			ErlHeapBin* to;
@@ -440,7 +797,7 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 			off_heap->first = (struct erl_off_heap_header*) to;
 			OH_OVERHEAD(off_heap, to->size / sizeof(Eterm));
 		    }
-		    *argp = make_binary_rel(hbot, dst_base);
+		    *argp = make_binary(hbot);
 		    if (extra_bytes != 0) {
 			ErlSubBin* res;
 			hbot -= ERL_SUB_BIN_SIZE;
@@ -452,7 +809,7 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 			res->offs = 0;
 			res->is_writable = 0;
 			res->orig = *argp;
-			*argp = make_binary_rel(hbot, dst_base);
+			*argp = make_binary(hbot);
 		    }
 		    break;
 		}
@@ -470,7 +827,7 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 		    funp->next = off_heap->first;
 		    off_heap->first = (struct erl_off_heap_header*) funp;
 		    erts_refc_inc(&funp->fe->refc, 2);
-		    *argp = make_fun_rel(tp, dst_base);
+		    *argp = make_fun(tp);
 		}
 		break;
 	    case EXTERNAL_PID_SUBTAG:
@@ -490,7 +847,7 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 		  off_heap->first = (struct erl_off_heap_header*)etp;
 		  erts_refc_inc(&etp->node->refc, 2);
 
-		  *argp = make_external_rel(tp, dst_base);
+		  *argp = make_external(tp);
 		}
 		break;
 	    case MAP_SUBTAG:
@@ -498,7 +855,7 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 		switch (MAP_HEADER_TYPE(hdr)) {
 		    case MAP_HEADER_TAG_FLATMAP_HEAD :
                         i = flatmap_get_size(objp) + 3;
-                        *argp = make_flatmap_rel(htop, dst_base);
+                        *argp = make_flatmap(htop);
                         while (i--) {
                             *htop++ = *objp++;
                         }
@@ -509,20 +866,20 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 		    case MAP_HEADER_TAG_HAMT_NODE_BITMAP :
 			i = 1 + hashmap_bitcount(MAP_HEADER_VAL(hdr));
 			while (i--)  { *htop++ = *objp++; }
-			*argp = make_hashmap_rel(tp, dst_base);
+			*argp = make_hashmap(tp);
 			break;
 		    default:
-			erl_exit(ERTS_ABORT_EXIT, "copy_struct: bad hashmap type %d\n", MAP_HEADER_TYPE(hdr));
+			erts_exit(ERTS_ABORT_EXIT, "copy_struct: bad hashmap type %d\n", MAP_HEADER_TYPE(hdr));
 		}
 		break;
 	    case BIN_MATCHSTATE_SUBTAG:
-		erl_exit(ERTS_ABORT_EXIT,
+		erts_exit(ERTS_ABORT_EXIT,
 			 "copy_struct: matchstate term not allowed");
 	    default:
 		i = thing_arityval(hdr)+1;
 		hbot -= i;
 		tp = hbot;
-		*argp = make_boxed_rel(hbot, dst_base);
+		*argp = make_boxed(hbot);
 		while (i--) {
 		    *tp++ = *objp++;
 		}
@@ -538,22 +895,870 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
 	}
     }
 
+    if (bsz) {
+        *hpp = htop;
+        *bsz = hend - hbot;
+    } else {
 #ifdef DEBUG
-    if (htop != hbot)
-	erl_exit(ERTS_ABORT_EXIT,
-		 "Internal error in copy_struct() when copying %T:"
-		 " htop=%p != hbot=%p (sz=%beu)\n",
-		 org_obj, htop, hbot, org_sz); 
+        if (htop != hbot)
+            erts_exit(ERTS_ABORT_EXIT,
+                    "Internal error in copy_struct() when copying %T:"
+                    " htop=%p != hbot=%p (sz=%beu)\n",
+                    org_obj, htop, hbot, org_sz);
 #else
-    if (htop > hbot) {
-	erl_exit(ERTS_ABORT_EXIT,
-		 "Internal error in copy_struct(): htop, hbot overrun\n");
-    }
+        if (htop > hbot) {
+            erts_exit(ERTS_ABORT_EXIT,
+                    "Internal error in copy_struct(): htop, hbot overrun\n");
+        }
 #endif
-    *hpp = (Eterm *) (hstart+hsize);
+        *hpp = (Eterm *) (hstart+hsize);
+    }
+    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] result is at %p\n", mypid, res));
     return res;
 }
 
+
+/*
+ *  Machinery for the table used by the sharing preserving copier
+ *  Using an ESTACK but not very transparently; consider refactoring
+ */
+
+#define DECLARE_SHTABLE(s)					\
+    DECLARE_ESTACK(s);						\
+    Uint ESTK_CONCAT(s,_offset) = 0
+#define DESTROY_SHTABLE(s) DESTROY_ESTACK(s)
+#define SHTABLE_INCR 4
+#define SHTABLE_NEXT(s)	ESTK_CONCAT(s,_offset)
+#define SHTABLE_PUSH(s,x,y,b)					\
+do {								\
+    if (s.sp > s.end - SHTABLE_INCR) {				\
+        erl_grow_estack(&(s), SHTABLE_INCR);	       		\
+    }								\
+    *s.sp++ = (x);						\
+    *s.sp++ = (y);						\
+    *s.sp++ = (Eterm) NULL;					\
+    *s.sp++ = (Eterm) (b);		                	\
+    ESTK_CONCAT(s,_offset) += SHTABLE_INCR;			\
+} while(0)
+#define SHTABLE_X(s,e) (s.start[e])
+#define SHTABLE_Y(s,e) (s.start[(e)+1])
+#define SHTABLE_FWD(s,e) ((Eterm *) (s.start[(e)+2]))
+#define SHTABLE_FWD_UPD(s,e,p) (s.start[(e)+2] = (Eterm) (p))
+#define SHTABLE_REV(s,e) ((Eterm *) (s.start[(e)+3]))
+
+#define LIST_SHARED_UNPROCESSED ((Eterm) 0)
+#define LIST_SHARED_PROCESSED	((Eterm) 1)
+
+#define HEAP_ELEM_TO_BE_FILLED	_unchecked_make_list(NULL)
+
+
+/*
+ *  Specialized macros for using/reusing the persistent state
+ */
+
+#define DECLARE_EQUEUE_INIT_INFO(q, info)		\
+    UWord* EQUE_DEF_QUEUE(q) = info->queue_default;	\
+    ErtsEQueue q = {					\
+        EQUE_DEF_QUEUE(q), /* start */			\
+        EQUE_DEF_QUEUE(q), /* front */			\
+        EQUE_DEF_QUEUE(q), /* back */			\
+        1,                 /* possibly_empty */		\
+        EQUE_DEF_QUEUE(q) + DEF_EQUEUE_SIZE, /* end */	\
+        ERTS_ALC_T_ESTACK  /* alloc_type */		\
+    }
+
+#define DECLARE_EQUEUE_FROM_INFO(q, info)		\
+    /* no EQUE_DEF_QUEUE(q), read-only */		\
+    ErtsEQueue q = {					\
+        info->queue_start,      /* start */		\
+        info->queue_start,      /* front */		\
+        info->queue_start,      /* back */		\
+        1,                      /* possibly_empty */	\
+        info->queue_end,        /* end */		\
+        info->queue_alloc_type  /* alloc_type */	\
+    }
+
+#define DECLARE_BITSTORE_INIT_INFO(s, info)		\
+    UWord* WSTK_DEF_STACK(s) = info->bitstore_default;	\
+    ErtsWStack s = {					\
+        WSTK_DEF_STACK(s),  /* wstart */		\
+        WSTK_DEF_STACK(s),  /* wsp */			\
+        WSTK_DEF_STACK(s) + DEF_WSTACK_SIZE, /* wend */	\
+        WSTK_DEF_STACK(s),  /* wdflt */ 		\
+        ERTS_ALC_T_ESTACK /* alloc_type */		\
+    };							\
+    int WSTK_CONCAT(s,_bitoffs) = 0;			\
+    /* no WSTK_CONCAT(s,_offset), write-only */		\
+    UWord WSTK_CONCAT(s,_buffer) = 0
+
+#define DECLARE_BITSTORE_FROM_INFO(s, info)		\
+    /* no WSTK_DEF_STACK(s), read-only */		\
+    ErtsWStack s = {					\
+        info->bitstore_start,  /* wstart */		\
+        NULL,                  /* wsp,  read-only */	\
+        NULL,                  /* wend, read-only */	\
+        NULL,                  /* wdef, read-only */	\
+        info->bitstore_alloc_type /* alloc_type */	\
+    };							\
+    int WSTK_CONCAT(s,_bitoffs) = 0;			\
+    int WSTK_CONCAT(s,_offset) = 0;			\
+    UWord WSTK_CONCAT(s,_buffer) = 0
+
+#define DECLARE_SHTABLE_INIT_INFO(s, info)		\
+    Eterm* ESTK_DEF_STACK(s) = info->shtable_default;	\
+    ErtsEStack s = {					\
+        ESTK_DEF_STACK(s),  /* start */			\
+        ESTK_DEF_STACK(s),  /* sp */			\
+        ESTK_DEF_STACK(s) + DEF_ESTACK_SIZE, /* end */	\
+        ESTK_DEF_STACK(s),  /* default */		\
+        ERTS_ALC_T_ESTACK /* alloc_type */		\
+    };							\
+    Uint ESTK_CONCAT(s,_offset) = 0
+
+#define DECLARE_SHTABLE_FROM_INFO(s, info)		\
+    /* no ESTK_DEF_STACK(s), read-only */		\
+    ErtsEStack s = {					\
+        info->shtable_start,     /* start */		\
+        NULL,                    /* sp,  read-only */	\
+        NULL,                    /* end, read-only */	\
+        NULL,                    /* def, read-only */	\
+        info->shtable_alloc_type /* alloc_type */	\
+    };							\
+    /* no ESTK_CONCAT(s,_offset), read-only */
+
+/*
+ *  Copy object "obj" preserving sharing.
+ *  First half: count size and calculate sharing.
+ */
+Uint copy_shared_calculate(Eterm obj, erts_shcopy_t *info)
+{
+    Uint sum;
+    Uint e;
+    unsigned sz;
+    Eterm* ptr;
+#ifdef DEBUG
+    Eterm mypid = erts_get_current_pid();
+#endif
+
+    DECLARE_EQUEUE_INIT_INFO(s, info);
+    DECLARE_BITSTORE_INIT_INFO(b, info);
+    DECLARE_SHTABLE_INIT_INFO(t, info);
+
+    /* step #0:
+       -------------------------------------------------------
+       get rid of the easy cases first:
+       - copying constants
+       - if not a proper process, do flat copy
+    */
+
+    if (IS_CONST(obj))
+	return 0;
+
+    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] copy_shared_calculate %p\n", mypid, obj));
+    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] message is %T\n", mypid, obj));
+
+    /* step #1:
+       -------------------------------------------------------
+       traverse the term and calculate the size;
+       when traversing, transform as you do in size_shared
+       but when you find shared objects:
+
+       a. add entry in the table, indexed by i
+       b. mark them:
+	  b1. boxed terms, set header to (i | 11)
+	      store (old header, NONV, NULL, backptr) in the entry
+	  b2. cons cells, set CDR to NONV, set CAR to i
+	      store (old CAR, old CDR, NULL, backptr) in the entry
+    */
+
+    sum = 0;
+
+    for (;;) {
+	switch (primary_tag(obj)) {
+	case TAG_PRIMARY_LIST: {
+	    Eterm head, tail;
+	    ptr = list_val(obj);
+	    /* off heap list pointers are copied verbatim */
+	    if (erts_is_literal(obj,ptr)) {
+		VERBOSE(DEBUG_SHCOPY, ("[pid=%T] bypassed copying %p is %T\n", mypid, ptr, obj));
+                if (IN_LITERAL_PURGE_AREA(info,ptr))
+                    info->literal_size += size_object(obj);
+		goto pop_next;
+	    }
+	    head = CAR(ptr);
+	    tail = CDR(ptr);
+	    /* if it's visited, don't count it;
+	       if not already shared, make it shared and store it in the table */
+	    if (primary_tag(tail) == TAG_PRIMARY_HEADER ||
+		primary_tag(head) == TAG_PRIMARY_HEADER) {
+		if (tail != THE_NON_VALUE) {
+		    e = SHTABLE_NEXT(t);
+		    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] tabling L %p\n", mypid, ptr));
+		    SHTABLE_PUSH(t, head, tail, ptr);
+		    CAR(ptr) = (e << _TAG_PRIMARY_SIZE) | LIST_SHARED_UNPROCESSED;
+		    CDR(ptr) = THE_NON_VALUE;
+		}
+		goto pop_next;
+	    }
+	    /* else make it visited now */
+	    switch (primary_tag(tail)) {
+	    case TAG_PRIMARY_LIST:
+		VERBOSE(DEBUG_SHCOPY, ("[pid=%T] mangling L/L %p\n", mypid, ptr));
+		CDR(ptr) = (tail - TAG_PRIMARY_LIST) | TAG_PRIMARY_HEADER;
+		break;
+	    case TAG_PRIMARY_IMMED1:
+		VERBOSE(DEBUG_SHCOPY, ("[pid=%T] mangling L/I %p\n", mypid, ptr));
+		CAR(ptr) = (head - primary_tag(head)) | TAG_PRIMARY_HEADER;
+		CDR(ptr) = (tail - TAG_PRIMARY_IMMED1) | primary_tag(head);
+		break;
+	    case TAG_PRIMARY_BOXED:
+		BITSTORE_PUT(b, primary_tag(head));
+		VERBOSE(DEBUG_SHCOPY, ("[pid=%T] mangling L/B %p\n", mypid, ptr));
+		CAR(ptr) = (head - primary_tag(head)) | TAG_PRIMARY_HEADER;
+		CDR(ptr) = (tail - TAG_PRIMARY_BOXED) | TAG_PRIMARY_HEADER;
+		break;
+	    }
+	    /* and count it */
+	    sum += 2;
+	    if (!IS_CONST(head)) {
+		EQUEUE_PUT(s, head);
+	    }
+	    obj = tail;
+	    break;
+	}
+	case TAG_PRIMARY_BOXED: {
+	    Eterm hdr;
+	    ptr = boxed_val(obj);
+	    /* off heap pointers to boxes are copied verbatim */
+	    if (erts_is_literal(obj,ptr)) {
+		VERBOSE(DEBUG_SHCOPY, ("[pid=%T] bypassed copying %p is %T\n", mypid, ptr, obj));
+                if (IN_LITERAL_PURGE_AREA(info,ptr))
+                    info->literal_size += size_object(obj);
+		goto pop_next;
+	    }
+	    hdr = *ptr;
+	    /* if it's visited, don't count it;
+	       if not already shared, make it shared and store it in the table */
+	    if (primary_tag(hdr) != TAG_PRIMARY_HEADER) {
+		if (primary_tag(hdr) == BOXED_VISITED) {
+		    e = SHTABLE_NEXT(t);
+		    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] tabling B %p\n", mypid, ptr));
+		    SHTABLE_PUSH(t, hdr, THE_NON_VALUE, ptr);
+		    *ptr = (e << _TAG_PRIMARY_SIZE) | BOXED_SHARED_UNPROCESSED;
+		}
+		goto pop_next;
+	    }
+	    /* else make it visited now */
+	    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] mangling B %p\n", mypid, ptr));
+	    *ptr = (hdr - primary_tag(hdr)) + BOXED_VISITED;
+	    /* and count it */
+	    ASSERT(is_header(hdr));
+	    switch (hdr & _TAG_HEADER_MASK) {
+	    case ARITYVAL_SUBTAG: {
+		int arity = header_arity(hdr);
+		sum += arity + 1;
+		if (arity == 0) { /* Empty tuple -- unusual. */
+		    goto pop_next;
+		}
+		while (arity-- > 0) {
+		    obj = *++ptr;
+		    if (!IS_CONST(obj)) {
+			EQUEUE_PUT(s, obj);
+		    }
+		}
+		goto pop_next;
+	    }
+	    case FUN_SUBTAG: {
+		ErlFunThing* funp = (ErlFunThing *) ptr;
+		unsigned eterms = 1 /* creator */ + funp->num_free;
+		sz = thing_arityval(hdr);
+		sum += 1 /* header */ + sz + eterms;
+		ptr += 1 /* header */ + sz;
+		while (eterms-- > 0) {
+		    obj = *ptr++;
+		    if (!IS_CONST(obj)) {
+			EQUEUE_PUT(s, obj);
+		    }
+		}
+		goto pop_next;
+	    }
+	    case SUB_BINARY_SUBTAG: {
+		ErlSubBin* sb = (ErlSubBin *) ptr;
+		Eterm real_bin = sb->orig;
+		Uint bit_offset = sb->bitoffs;
+		Uint bit_size = sb->bitsize;
+		size_t size = sb->size;
+		Uint extra_bytes;
+		Eterm hdr;
+		if (bit_size + bit_offset > 8) {
+		    sum += ERL_SUB_BIN_SIZE;
+		    extra_bytes = 2;
+		} else if (bit_size + bit_offset > 0) {
+		    sum += ERL_SUB_BIN_SIZE;
+		    extra_bytes = 1;
+		} else {
+		    extra_bytes = 0;
+		}
+		ASSERT(is_boxed(real_bin) &&
+		       (((*boxed_val(real_bin)) &
+			 (_TAG_HEADER_MASK - _BINARY_XXX_MASK - BOXED_VISITED_MASK))
+			== _TAG_HEADER_REFC_BIN));
+		hdr = *_unchecked_binary_val(real_bin) & ~BOXED_VISITED_MASK;
+		if (thing_subtag(hdr) == HEAP_BINARY_SUBTAG) {
+		    sum += heap_bin_size(size+extra_bytes);
+		} else {
+		    ASSERT(thing_subtag(hdr) == REFC_BINARY_SUBTAG);
+		    sum += PROC_BIN_SIZE;
+		}
+		goto pop_next;
+	    }
+            case MAP_SUBTAG:
+                switch (MAP_HEADER_TYPE(hdr)) {
+                    case MAP_HEADER_TAG_FLATMAP_HEAD : {
+                        flatmap_t *mp = (flatmap_t *) ptr;
+                        Uint n = flatmap_get_size(mp) + 1;
+                        sum += n + 2;
+                        ptr += 2; /* hdr + size words */
+                        while (n--) {
+                            obj = *ptr++;
+                            if (!IS_CONST(obj)) {
+                                EQUEUE_PUT(s, obj);
+                            }
+                        }
+                        goto pop_next;
+                    }
+                    case MAP_HEADER_TAG_HAMT_HEAD_BITMAP :
+                    case MAP_HEADER_TAG_HAMT_HEAD_ARRAY :
+                    case MAP_HEADER_TAG_HAMT_NODE_BITMAP : {
+                        Uint n = hashmap_bitcount(MAP_HEADER_VAL(hdr));
+                        sum += 1 + n + header_arity(hdr);
+                        ptr += 1 + header_arity(hdr);
+
+                        if (n == 0) {
+                            goto pop_next;
+                        }
+                        while(n--) {
+                            obj = *ptr++;
+                            if (!IS_CONST(obj)) {
+                                EQUEUE_PUT(s, obj);
+                            }
+                        }
+                        goto pop_next;
+                    }
+                    default:
+                        erts_exit(ERTS_ABORT_EXIT, "copy_shared_calculate: bad hashmap type %d\n", MAP_HEADER_TYPE(hdr));
+                }
+            case BIN_MATCHSTATE_SUBTAG:
+		erts_exit(ERTS_ABORT_EXIT,
+			 "size_shared: matchstate term not allowed");
+	    default:
+		sum += thing_arityval(hdr) + 1;
+		goto pop_next;
+	    }
+	    break;
+	}
+	case TAG_PRIMARY_IMMED1:
+	pop_next:
+	    if (EQUEUE_ISEMPTY(s)) {
+                /* add sentinel to the table */
+                SHTABLE_PUSH(t, THE_NON_VALUE, THE_NON_VALUE, NULL);
+                /* store persistent info */
+                BITSTORE_CLOSE(b);
+                info->queue_start = s.start;
+                info->queue_end = s.end;
+                info->queue_alloc_type = s.alloc_type;
+                info->bitstore_start = b.wstart;
+                info->bitstore_alloc_type = b.alloc_type;
+                info->shtable_start = t.start;
+                info->shtable_alloc_type = t.alloc_type;
+                /* single point of return: the size of the object */
+                VERBOSE(DEBUG_SHCOPY, ("[pid=%T] size was: %u\n", mypid, sum));
+                return sum + info->literal_size;
+	    }
+	    obj = EQUEUE_GET(s);
+	    break;
+	default:
+	    erts_exit(ERTS_ABORT_EXIT, "[pid=%T] size_shared: bad tag for %#x\n", obj);
+	}
+    }
+}
+
+/*
+ *  Copy object "obj" preserving sharing.
+ *  Second half: copy and restore the object.
+ */
+Uint copy_shared_perform(Eterm obj, Uint size, erts_shcopy_t *info,
+                         Eterm** hpp, ErlOffHeap* off_heap) {
+    Uint e;
+    unsigned sz;
+    Eterm* ptr;
+    Eterm* hp;
+    Eterm* hscan;
+    Eterm result;
+    Eterm* resp;
+    Eterm *hbot, *hend;
+    unsigned remaining;
+#ifdef DEBUG
+    Eterm mypid = erts_get_current_pid();
+    Eterm saved_obj = obj;
+#endif
+
+    DECLARE_EQUEUE_FROM_INFO(s, info);
+    DECLARE_BITSTORE_FROM_INFO(b, info);
+    DECLARE_SHTABLE_FROM_INFO(t, info);
+
+    /* step #0:
+       -------------------------------------------------------
+       get rid of the easy cases first:
+       - copying constants
+       - if not a proper process, do flat copy
+    */
+
+    if (IS_CONST(obj))
+	return obj;
+
+    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] copy_shared_perform %p\n", mypid, obj));
+
+    /* step #2: was performed before this function was called
+       -------------------------------------------------------
+       allocate new space
+    */
+
+    hscan = hp = *hpp;
+    hbot  = hend = hp + size;
+
+    /* step #3:
+       -------------------------------------------------------
+       traverse the term a second time and when traversing:
+       a. if the object is marked as shared
+	  a1. if the entry contains a forwarding ptr, use that
+	  a2. otherwise, copy it to the new space and store the
+	      forwarding ptr to the entry
+      b. otherwise, reverse-transform as you do in size_shared
+	 and copy to the new space
+    */
+
+    resp = &result;
+    remaining = 0;
+    for (;;) {
+	switch (primary_tag(obj)) {
+	case TAG_PRIMARY_LIST: {
+	    Eterm head, tail;
+	    ptr = list_val(obj);
+	    /* off heap list pointers are copied verbatim */
+	    if (erts_is_literal(obj,ptr)) {
+                if (!IN_LITERAL_PURGE_AREA(info,ptr)) {
+                    *resp = obj;
+                } else {
+                    Uint bsz = 0;
+                    *resp = copy_struct_x(obj, hbot - hp, &hp, off_heap, &bsz);
+                    hbot -= bsz;
+                }
+		goto cleanup_next;
+	    }
+	    head = CAR(ptr);
+	    tail = CDR(ptr);
+	    /* if it is shared */
+	    if (tail == THE_NON_VALUE) {
+		e = head >> _TAG_PRIMARY_SIZE;
+		/* if it has been processed, just use the forwarding pointer */
+		if (primary_tag(head) == LIST_SHARED_PROCESSED) {
+		    *resp = make_list(SHTABLE_FWD(t, e));
+		    goto cleanup_next;
+		}
+		/* else, let's process it now,
+		   copy it and keep the forwarding pointer */
+		else {
+		    CAR(ptr) = (head - primary_tag(head)) + LIST_SHARED_PROCESSED;
+		    head = SHTABLE_X(t, e);
+		    tail = SHTABLE_Y(t, e);
+		    ptr = &(SHTABLE_X(t, e));
+		    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] tabled L %p is %p\n", mypid, ptr, SHTABLE_REV(t, e)));
+		    SHTABLE_FWD_UPD(t, e, hp);
+		}
+	    }
+	    /* if not already clean, clean it up and copy it */
+	    if (primary_tag(tail) == TAG_PRIMARY_HEADER) {
+		if (primary_tag(head) == TAG_PRIMARY_HEADER) {
+		    Eterm saved;
+                    BITSTORE_FETCH(b, saved);
+		    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] unmangling L/B %p\n", mypid, ptr));
+		    CAR(ptr) = head = (head - TAG_PRIMARY_HEADER) + saved;
+		    CDR(ptr) = tail = (tail - TAG_PRIMARY_HEADER) + TAG_PRIMARY_BOXED;
+		} else {
+		    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] unmangling L/L %p\n", mypid, ptr));
+		    CDR(ptr) = tail = (tail - TAG_PRIMARY_HEADER) + TAG_PRIMARY_LIST;
+		}
+	    } else if (primary_tag(head) == TAG_PRIMARY_HEADER) {
+		VERBOSE(DEBUG_SHCOPY, ("[pid=%T] unmangling L/I %p\n", mypid, ptr));
+		CAR(ptr) = head = (head - TAG_PRIMARY_HEADER) | primary_tag(tail);
+		CDR(ptr) = tail = (tail - primary_tag(tail)) | TAG_PRIMARY_IMMED1;
+	    } else {
+		ASSERT(0 && "cannot come here");
+		goto cleanup_next;
+	    }
+	    /* and its children too */
+	    if (IS_CONST(head)) {
+		CAR(hp) = head;
+	    } else {
+		EQUEUE_PUT_UNCHECKED(s, head);
+		CAR(hp) = HEAP_ELEM_TO_BE_FILLED;
+	    }
+	    *resp = make_list(hp);
+	    resp = &(CDR(hp));
+	    hp += 2;
+	    obj = tail;
+	    break;
+	}
+	case TAG_PRIMARY_BOXED: {
+	    Eterm hdr;
+	    ptr = boxed_val(obj);
+	    /* off heap pointers to boxes are copied verbatim */
+	    if (erts_is_literal(obj,ptr)) {
+                if (!IN_LITERAL_PURGE_AREA(info,ptr)) {
+                    *resp = obj;
+                } else {
+                    Uint bsz = 0;
+                    *resp = copy_struct_x(obj, hbot - hp, &hp, off_heap, &bsz);
+                    hbot -= bsz;
+                }
+		goto cleanup_next;
+	    }
+	    hdr = *ptr;
+	    /* clean it up, unless it's already clean or shared and processed */
+	    switch (primary_tag(hdr)) {
+	    case TAG_PRIMARY_HEADER:
+		ASSERT(0 && "cannot come here");
+	    /* if it is shared and has been processed,
+	       just use the forwarding pointer */
+	    case BOXED_SHARED_PROCESSED:
+		e = hdr >> _TAG_PRIMARY_SIZE;
+		*resp = make_boxed(SHTABLE_FWD(t, e));
+		goto cleanup_next;
+	    /* if it is shared but has not been processed yet, let's process
+	       it now: copy it and keep the forwarding pointer */
+	    case BOXED_SHARED_UNPROCESSED:
+		e = hdr >> _TAG_PRIMARY_SIZE;
+		*ptr = (hdr - primary_tag(hdr)) + BOXED_SHARED_PROCESSED;
+		hdr = SHTABLE_X(t, e);
+		ASSERT(primary_tag(hdr) == BOXED_VISITED);
+		VERBOSE(DEBUG_SHCOPY, ("[pid=%T] tabled B %p is %p\n", mypid, ptr, SHTABLE_REV(t, e)));
+		VERBOSE(DEBUG_SHCOPY, ("[pid=%T] unmangling B %p\n", mypid, ptr));
+		SHTABLE_X(t, e) = hdr = (hdr - BOXED_VISITED) + TAG_PRIMARY_HEADER;
+		SHTABLE_FWD_UPD(t, e, hp);
+		break;
+	    case BOXED_VISITED:
+		VERBOSE(DEBUG_SHCOPY, ("[pid=%T] unmangling B %p\n", mypid, ptr));
+		*ptr = hdr = (hdr - BOXED_VISITED) + TAG_PRIMARY_HEADER;
+		break;
+	    }
+	    /* and its children too */
+	    switch (hdr & _TAG_HEADER_MASK) {
+	    case ARITYVAL_SUBTAG: {
+		int arity = header_arity(hdr);
+		*resp = make_boxed(hp);
+		*hp++ = hdr;
+		while (arity-- > 0) {
+		    obj = *++ptr;
+		    if (IS_CONST(obj)) {
+			*hp++ = obj;
+		    } else {
+			EQUEUE_PUT_UNCHECKED(s, obj);
+			*hp++ = HEAP_ELEM_TO_BE_FILLED;
+		    }
+		}
+		goto cleanup_next;
+	    }
+	    case FUN_SUBTAG: {
+		ErlFunThing* funp = (ErlFunThing *) ptr;
+		unsigned eterms = 1 /* creator */ + funp->num_free;
+		sz = thing_arityval(hdr);
+		funp = (ErlFunThing *) hp;
+		*resp = make_fun(hp);
+		*hp++ = hdr;
+		ptr++;
+		while (sz-- > 0) {
+		    *hp++ = *ptr++;
+		}
+		while (eterms-- > 0) {
+		    obj = *ptr++;
+		    if (IS_CONST(obj)) {
+			*hp++ = obj;
+		    } else {
+			EQUEUE_PUT_UNCHECKED(s, obj);
+			*hp++ = HEAP_ELEM_TO_BE_FILLED;
+		    }
+		}
+		funp->next = off_heap->first;
+		off_heap->first = (struct erl_off_heap_header*) funp;
+		erts_refc_inc(&funp->fe->refc, 2);
+		goto cleanup_next;
+	    }
+	    case MAP_SUBTAG:
+                *resp  = make_flatmap(hp);
+                *hp++  = hdr;
+                switch (MAP_HEADER_TYPE(hdr)) {
+                    case MAP_HEADER_TAG_FLATMAP_HEAD : {
+                        flatmap_t *mp = (flatmap_t *) ptr;
+                        Uint n = flatmap_get_size(mp) + 1;
+                        *hp++  = *++ptr; /* keys */
+                        while (n--) {
+                            obj = *++ptr;
+                            if (IS_CONST(obj)) {
+                                *hp++ = obj;
+                            } else {
+                                EQUEUE_PUT_UNCHECKED(s, obj);
+                                *hp++ = HEAP_ELEM_TO_BE_FILLED;
+                            }
+                        }
+                        goto cleanup_next;
+                    }
+                    case MAP_HEADER_TAG_HAMT_HEAD_BITMAP :
+                    case MAP_HEADER_TAG_HAMT_HEAD_ARRAY :
+			*hp++ = *++ptr; /* total map size */
+                    case MAP_HEADER_TAG_HAMT_NODE_BITMAP : {
+                         Uint n = hashmap_bitcount(MAP_HEADER_VAL(hdr));
+                         while (n--)  {
+                             obj = *++ptr;
+                             if (IS_CONST(obj)) {
+                                 *hp++ = obj;
+                             } else {
+                                 EQUEUE_PUT_UNCHECKED(s, obj);
+                                 *hp++ = HEAP_ELEM_TO_BE_FILLED;
+                             }
+                         }
+                        goto cleanup_next;
+                    }
+                    default:
+                        erts_exit(ERTS_ABORT_EXIT, "copy_shared_perform: bad hashmap type %d\n", MAP_HEADER_TYPE(hdr));
+                }
+	    case REFC_BINARY_SUBTAG: {
+		ProcBin* pb = (ProcBin *) ptr;
+		sz = thing_arityval(hdr);
+		if (pb->flags) {
+		    erts_emasculate_writable_binary(pb);
+		}
+		pb = (ProcBin *) hp;
+		*resp = make_binary(hp);
+		*hp++ = hdr;
+		ptr++;
+		while (sz-- > 0) {
+		    *hp++ = *ptr++;
+		}
+		erts_refc_inc(&pb->val->refc, 2);
+		pb->next = off_heap->first;
+		pb->flags = 0;
+		off_heap->first = (struct erl_off_heap_header*) pb;
+		OH_OVERHEAD(off_heap, pb->size / sizeof(Eterm));
+		goto cleanup_next;
+	    }
+	    case SUB_BINARY_SUBTAG: {
+		ErlSubBin* sb = (ErlSubBin *) ptr;
+		Eterm real_bin = sb->orig;
+		Uint bit_offset = sb->bitoffs;
+		Uint bit_size = sb->bitsize;
+		Uint offset = sb->offs;
+		size_t size = sb->size;
+		Uint extra_bytes;
+		Uint real_size;
+		if ((bit_size + bit_offset) > 8) {
+		    extra_bytes = 2;
+		} else if ((bit_size + bit_offset) > 0) {
+		    extra_bytes = 1;
+		} else {
+		    extra_bytes = 0;
+		}
+		real_size = size+extra_bytes;
+		ASSERT(is_boxed(real_bin) &&
+		       (((*boxed_val(real_bin)) &
+			 (_TAG_HEADER_MASK - _BINARY_XXX_MASK - BOXED_VISITED_MASK))
+			== _TAG_HEADER_REFC_BIN));
+		ptr = _unchecked_binary_val(real_bin);
+		*resp = make_binary(hp);
+		if (extra_bytes != 0) {
+		    ErlSubBin* res = (ErlSubBin *) hp;
+		    hp += ERL_SUB_BIN_SIZE;
+		    res->thing_word = HEADER_SUB_BIN;
+		    res->size = size;
+		    res->bitsize = bit_size;
+		    res->bitoffs = bit_offset;
+		    res->offs = 0;
+		    res->is_writable = 0;
+		    res->orig = make_binary(hp);
+		}
+		if (thing_subtag(*ptr & ~BOXED_VISITED_MASK) == HEAP_BINARY_SUBTAG) {
+		    ErlHeapBin* from = (ErlHeapBin *) ptr;
+		    ErlHeapBin* to = (ErlHeapBin *) hp;
+		    hp += heap_bin_size(real_size);
+		    to->thing_word = header_heap_bin(real_size);
+		    to->size = real_size;
+		    sys_memcpy(to->data, ((byte *)from->data)+offset, real_size);
+		} else {
+		    ProcBin* from = (ProcBin *) ptr;
+		    ProcBin* to = (ProcBin *) hp;
+		    ASSERT(thing_subtag(*ptr & ~BOXED_VISITED_MASK) == REFC_BINARY_SUBTAG);
+		    if (from->flags) {
+			erts_emasculate_writable_binary(from);
+		    }
+		    hp += PROC_BIN_SIZE;
+		    to->thing_word = HEADER_PROC_BIN;
+		    to->size = real_size;
+		    to->val = from->val;
+		    erts_refc_inc(&to->val->refc, 2);
+		    to->bytes = from->bytes + offset;
+		    to->next = off_heap->first;
+		    to->flags = 0;
+		    off_heap->first = (struct erl_off_heap_header*) to;
+		    OH_OVERHEAD(off_heap, to->size / sizeof(Eterm));
+		}
+		goto cleanup_next;
+	    }
+	    case EXTERNAL_PID_SUBTAG:
+	    case EXTERNAL_PORT_SUBTAG:
+	    case EXTERNAL_REF_SUBTAG: {
+		ExternalThing *etp = (ExternalThing *) hp;
+		sz = thing_arityval(hdr);
+		*resp = make_external(hp);
+		*hp++ = hdr;
+		ptr++;
+		while (sz-- > 0) {
+		    *hp++ = *ptr++;
+		}
+		etp->next = off_heap->first;
+		off_heap->first = (struct erl_off_heap_header*) etp;
+		erts_refc_inc(&etp->node->refc, 2);
+		goto cleanup_next;
+	    }
+	    default:
+		sz = thing_arityval(hdr);
+		*resp = make_boxed(hp);
+		*hp++ = hdr;
+		ptr++;
+		while (sz-- > 0) {
+		    *hp++ = *ptr++;
+		}
+		goto cleanup_next;
+	    }
+	    break;
+	}
+	case TAG_PRIMARY_IMMED1:
+	    *resp = obj;
+	cleanup_next:
+	    if (EQUEUE_ISEMPTY(s)) {
+		goto all_clean;
+	    }
+	    obj = EQUEUE_GET(s);
+	    for (;;) {
+		ASSERT(hscan < hp);
+		if (remaining == 0) {
+		    if (*hscan == HEAP_ELEM_TO_BE_FILLED) {
+			resp = hscan;
+			hscan += 2;
+			break; /* scanning loop */
+		    } else if (primary_tag(*hscan) == TAG_PRIMARY_HEADER) {
+			switch (*hscan & _TAG_HEADER_MASK) {
+			case ARITYVAL_SUBTAG:
+			    remaining = header_arity(*hscan);
+			    hscan++;
+			    break;
+			case FUN_SUBTAG: {
+			    ErlFunThing* funp = (ErlFunThing *) hscan;
+			    hscan += 1 + thing_arityval(*hscan);
+			    remaining = 1 + funp->num_free;
+			    break;
+			}
+			case MAP_SUBTAG:
+                            switch (MAP_HEADER_TYPE(*hscan)) {
+                                case MAP_HEADER_TAG_FLATMAP_HEAD : {
+                                    flatmap_t *mp = (flatmap_t *) hscan;
+                                    remaining = flatmap_get_size(mp) + 1;
+                                    hscan += 2;
+                                    break;
+                                }
+                                case MAP_HEADER_TAG_HAMT_HEAD_BITMAP :
+                                case MAP_HEADER_TAG_HAMT_HEAD_ARRAY :
+                                case MAP_HEADER_TAG_HAMT_NODE_BITMAP :
+                                    remaining = hashmap_bitcount(MAP_HEADER_VAL(*hscan));
+                                    hscan += MAP_HEADER_ARITY(*hscan) + 1;
+                                    break;
+                                default:
+                                    erts_exit(ERTS_ABORT_EXIT,
+                                            "copy_shared_perform: bad hashmap type %d\n",
+                                            MAP_HEADER_TYPE(*hscan));
+                            }
+                            break;
+			case SUB_BINARY_SUBTAG:
+			    ASSERT(((ErlSubBin *) hscan)->bitoffs +
+				   ((ErlSubBin *) hscan)->bitsize > 0);
+			    hscan += ERL_SUB_BIN_SIZE;
+			    break;
+			default:
+			    hscan += 1 + thing_arityval(*hscan);
+			    break;
+			}
+		    } else {
+			hscan++;
+		    }
+		} else if (*hscan == HEAP_ELEM_TO_BE_FILLED) {
+		    resp = hscan++;
+		    remaining--;
+		    break; /* scanning loop */
+		} else {
+		    hscan++;
+		    remaining--;
+		}
+	    }
+	    ASSERT(resp < hp);
+	    break;
+	default:
+	    erts_exit(ERTS_ABORT_EXIT, "size_shared: bad tag for %#x\n", obj);
+	}
+    }
+
+    /* step #4:
+       -------------------------------------------------------
+       traverse the table and reverse-transform all stored entries
+    */
+
+all_clean:
+    for (e = 0; ; e += SHTABLE_INCR) {
+	ptr = SHTABLE_REV(t, e);
+	if (ptr == NULL)
+	    break;
+	VERBOSE(DEBUG_SHCOPY, ("[copy] restoring shared: %x\n", ptr));
+	/* entry was a list */
+	if (SHTABLE_Y(t, e) != THE_NON_VALUE) {
+	    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] untabling L %p\n", mypid, ptr));
+	    CAR(ptr) = SHTABLE_X(t, e);
+	    CDR(ptr) = SHTABLE_Y(t, e);
+	}
+	/* entry was boxed */
+	else {
+	    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] untabling B %p\n", mypid, ptr));
+	    *ptr = SHTABLE_X(t, e);
+	    ASSERT(primary_tag(*ptr) == TAG_PRIMARY_HEADER);
+	}
+    }
+
+#ifdef DEBUG
+    if (eq(saved_obj, result) == 0) {
+	erts_fprintf(stderr, "original = %T\n", saved_obj);
+	erts_fprintf(stderr, "copy = %T\n", result);
+	erts_exit(ERTS_ABORT_EXIT, "copy (shared) not equal to source\n");
+    }
+#endif
+
+    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] original was %T\n", mypid, saved_obj));
+    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] copy is %T\n", mypid, result));
+    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] result is at %p\n", mypid, result));
+
+    ASSERT(hbot == hp);
+    ASSERT(size == ((hp - *hpp) + (hend - hbot)));
+    *hpp = hend;
+    return result;
+}
+
+
 /*
  * Copy a term that is guaranteed to be contained in a single
  * heap block. The heap block is copied word by word, and any
@@ -563,21 +1768,12 @@ Eterm copy_struct(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
  *
  * NOTE: Assumes that term is a tuple (ptr is an untagged tuple ptr).
  */
-#if HALFWORD_HEAP
-Eterm copy_shallow_rel(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap,
-		       Eterm* src_base)
-#else
 Eterm copy_shallow(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
-#endif
 {
     Eterm* tp = ptr;
     Eterm* hp = *hpp;
     const Eterm res = make_tuple(hp);
-#if HALFWORD_HEAP
-    const Sint offs = COMPRESS_POINTER(hp - (tp - src_base));
-#else
     const Sint offs = (hp - tp) * sizeof(Eterm);
-#endif
 
     while (sz--) {
 	Eterm val = *tp++;
@@ -652,17 +1848,24 @@ Eterm copy_shallow(Eterm* ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap)
  * move markers.
  * Typically used to copy a multi-fragmented message (from NIF).
  */
-void move_multi_frags(Eterm** hpp, ErlOffHeap* off_heap, ErlHeapFragment* first,
-		      Eterm* refs, unsigned nrefs)
+void erts_move_multi_frags(Eterm** hpp, ErlOffHeap* off_heap, ErlHeapFragment* first,
+			   Eterm* refs, unsigned nrefs, int literals)
 {
     ErlHeapFragment* bp;
     Eterm* hp_start = *hpp;
     Eterm* hp_end;
     Eterm* hp;
     unsigned i;
+    Eterm literal_tag;
+
+#ifdef TAG_LITERAL_PTR
+    literal_tag = (Eterm) literals ? TAG_LITERAL_PTR : 0;
+#else
+    literal_tag = (Eterm) 0;
+#endif
 
     for (bp=first; bp!=NULL; bp=bp->next) {
-	move_one_frag(hpp, bp, off_heap);
+	move_one_frag(hpp, bp, off_heap, literals);
     }
     hp_end = *hpp;
     for (hp=hp_start; hp<hp_end; ++hp) {
@@ -675,6 +1878,9 @@ void move_multi_frags(Eterm** hpp, ErlOffHeap* off_heap, ErlHeapFragment* first,
 	    val = *ptr;
 	    if (IS_MOVED_BOXED(val)) {
 		ASSERT(is_boxed(val));
+#ifdef TAG_LITERAL_PTR
+		val |= literal_tag;
+#endif
 		*hp = val;
 	    }
 	    break;
@@ -682,7 +1888,11 @@ void move_multi_frags(Eterm** hpp, ErlOffHeap* off_heap, ErlHeapFragment* first,
 	    ptr = list_val(gval);
 	    val = *ptr;
 	    if (IS_MOVED_CONS(val)) {
-		*hp = ptr[1];
+		val = ptr[1];
+#ifdef TAG_LITERAL_PTR
+		val |= literal_tag;
+#endif
+		*hp = val;
 	    }
 	    break;
 	case TAG_PRIMARY_HEADER:
@@ -693,12 +1903,12 @@ void move_multi_frags(Eterm** hpp, ErlOffHeap* off_heap, ErlHeapFragment* first,
 	}
     }
     for (i=0; i<nrefs; ++i) {
-	refs[i] = follow_moved(refs[i]);
+	refs[i] = follow_moved(refs[i], literal_tag);
     }
 }
 
 static void
-move_one_frag(Eterm** hpp, ErlHeapFragment* frag, ErlOffHeap* off_heap)
+move_one_frag(Eterm** hpp, ErlHeapFragment* frag, ErlOffHeap* off_heap, int literals)
 {
     Eterm* ptr = frag->mem;
     Eterm* end = ptr + frag->used_size;
@@ -735,4 +1945,3 @@ move_one_frag(Eterm** hpp, ErlHeapFragment* frag, ErlOffHeap* off_heap)
     OH_OVERHEAD(off_heap, frag->off_heap.overhead);
     frag->off_heap.first = NULL;
 }
-
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index 7be2b77a3b..fa385f105d 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -378,10 +378,11 @@ static void doit_node_link_net_exits(ErtsLink *lnk, void *vnecp)
     ASSERT(lnk->type == LINK_NODE);
     if (is_internal_pid(lnk->pid)) {
 	ErtsProcLocks rp_locks = ERTS_PROC_LOCK_LINK;
-	rp = erts_pid2proc(NULL, 0, lnk->pid, rp_locks);
-	if (!rp) {
+	ErlOffHeap *ohp;
+	rp = erts_proc_lookup(lnk->pid);
+	if (!rp)
 	    goto done;
-	}
+	erts_smp_proc_lock(rp, rp_locks);
 	rlnk = erts_remove_link(&ERTS_P_LINKS(rp), name);
 	if (rlnk != NULL) {
 	    ASSERT(is_atom(rlnk->pid) && (rlnk->type == LINK_NODE));
@@ -389,12 +390,14 @@ static void doit_node_link_net_exits(ErtsLink *lnk, void *vnecp)
 	}
 	n = ERTS_LINK_REFC(lnk);
 	for (i = 0; i < n; ++i) {
-	    ErlHeapFragment* bp;
-	    ErlOffHeap *ohp;
 	    Eterm tup;
-	    Eterm *hp = erts_alloc_message_heap(3,&bp,&ohp,rp,&rp_locks);
+	    Eterm *hp;
+	    ErtsMessage *msgp;
+
+	    msgp = erts_alloc_message_heap(rp, &rp_locks,
+					   3, &hp, &ohp);
 	    tup = TUPLE2(hp, am_nodedown, name);
-	    erts_queue_message(rp, &rp_locks, bp, tup, NIL);
+	    erts_queue_message(rp, &rp_locks, msgp, tup, NIL);
 	}
 	erts_smp_proc_unlock(rp, rp_locks);
     }
@@ -737,19 +740,11 @@ Eterm erts_dsend_export_trap_context(Process* p, ErtsSendContext* ctx)
     Binary* ctx_bin = erts_create_magic_binary(sizeof(struct exported_ctx),
 					       erts_dsend_context_dtor);
     struct exported_ctx* dst = ERTS_MAGIC_BIN_DATA(ctx_bin);
-    Uint ctl_size = !HALFWORD_HEAP ? 0 : (arityval(ctx->ctl_heap[0]) + 1);
-    Eterm* hp = HAlloc(p, ctl_size + PROC_BIN_SIZE);
+    Eterm* hp = HAlloc(p, PROC_BIN_SIZE);
 
     sys_memcpy(&dst->ctx, ctx, sizeof(ErtsSendContext));
     ASSERT(ctx->dss.ctl == make_tuple(ctx->ctl_heap));
-#if !HALFWORD_HEAP
     dst->ctx.dss.ctl = make_tuple(dst->ctx.ctl_heap);
-#else
-    /* Must put control tuple in low mem */
-    sys_memcpy(hp, ctx->ctl_heap,  ctl_size*sizeof(Eterm));
-    dst->ctx.dss.ctl = make_tuple(hp);
-    hp += ctl_size;
-#endif
     if (ctx->dss.acmp) {
 	sys_memcpy(&dst->acm, ctx->dss.acmp, sizeof(ErtsAtomCacheMap));
 	dst->ctx.dss.acmp = &dst->acm;
@@ -886,11 +881,7 @@ erts_dsig_send_msg(Eterm remote, Eterm message, ErtsSendContext* ctx)
     DTRACE_CHARBUF(receiver_name, 64);
 #endif
 
-    if (SEQ_TRACE_TOKEN(sender) != NIL
-#ifdef USE_VM_PROBES
-	&& SEQ_TRACE_TOKEN(sender) != am_have_dt_utag 
-#endif
-	) {
+    if (have_seqtrace(SEQ_TRACE_TOKEN(sender))) {
 	seq_trace_update_send(sender);
 	token = SEQ_TRACE_TOKEN(sender);
 	seq_trace_output(token, message, SEQ_TRACE_SEND, remote, sender);
@@ -905,7 +896,7 @@ erts_dsig_send_msg(Eterm remote, Eterm message, ErtsSendContext* ctx)
         erts_snprintf(receiver_name, sizeof(DTRACE_CHARBUF_NAME(receiver_name)),
                       "%T", remote);
         msize = size_object(message);
-        if (token != NIL && token != am_have_dt_utag) {
+        if (have_seqtrace(token)) {
             tok_label = signed_val(SEQ_TRACE_T_LABEL(token));
             tok_lastcnt = signed_val(SEQ_TRACE_T_LASTCNT(token));
             tok_serial = signed_val(SEQ_TRACE_T_SERIAL(token));
@@ -947,11 +938,7 @@ erts_dsig_send_reg_msg(Eterm remote_name, Eterm message,
     DTRACE_CHARBUF(receiver_name, 128);
 #endif
 
-    if (SEQ_TRACE_TOKEN(sender) != NIL
-#ifdef USE_VM_PROBES
-	&& SEQ_TRACE_TOKEN(sender) != am_have_dt_utag 
-#endif
-	) {
+    if (have_seqtrace(SEQ_TRACE_TOKEN(sender))) {
 	seq_trace_update_send(sender);
 	token = SEQ_TRACE_TOKEN(sender);
 	seq_trace_output(token, message, SEQ_TRACE_SEND, remote_name, sender);
@@ -966,7 +953,7 @@ erts_dsig_send_reg_msg(Eterm remote_name, Eterm message,
         erts_snprintf(receiver_name, sizeof(DTRACE_CHARBUF_NAME(receiver_name)),
                       "{%T,%s}", remote_name, node_name);
         msize = size_object(message);
-        if (token != NIL && token != am_have_dt_utag) {
+        if (have_seqtrace(token)) {
             tok_label = signed_val(SEQ_TRACE_T_LABEL(token));
             tok_lastcnt = signed_val(SEQ_TRACE_T_LASTCNT(token));
             tok_serial = signed_val(SEQ_TRACE_T_SERIAL(token));
@@ -1011,11 +998,7 @@ erts_dsig_send_exit_tt(ErtsDSigData *dsdp, Eterm local, Eterm remote,
 #endif
 
     UseTmpHeapNoproc(6);
-    if (token != NIL 
-#ifdef USE_VM_PROBES
-	&& token != am_have_dt_utag
-#endif
-	) {	
+    if (have_seqtrace(token)) {
 	seq_trace_update_send(dsdp->proc);
 	seq_trace_output_exit(token, reason, SEQ_TRACE_SEND, remote, local);
 	ctl = TUPLE5(&ctl_heap[0],
@@ -1034,7 +1017,7 @@ erts_dsig_send_exit_tt(ErtsDSigData *dsdp, Eterm local, Eterm remote,
                       "{%T,%s}", remote, node_name);
         erts_snprintf(reason_str, sizeof(DTRACE_CHARBUF_NAME(reason_str)),
                       "%T", reason);
-        if (token != NIL && token != am_have_dt_utag) {
+        if (have_seqtrace(token)) {
             tok_label = signed_val(SEQ_TRACE_T_LABEL(token));
             tok_lastcnt = signed_val(SEQ_TRACE_T_LASTCNT(token));
             tok_serial = signed_val(SEQ_TRACE_T_SERIAL(token));
@@ -1466,7 +1449,7 @@ int erts_net_message(Port *prt,
 		ErlOffHeap *ohp;
 		ASSERT(xsize);
 		heap_frag = erts_dist_ext_trailer(ede_copy);
-		ERTS_INIT_HEAP_FRAG(heap_frag, token_size);
+		ERTS_INIT_HEAP_FRAG(heap_frag, token_size, token_size);
 		hp = heap_frag->mem;
 		ohp = &heap_frag->off_heap;
 		token = tuple[5];
@@ -1515,7 +1498,7 @@ int erts_net_message(Port *prt,
 		ErlOffHeap *ohp;
 		ASSERT(xsize);
 		heap_frag = erts_dist_ext_trailer(ede_copy);
-		ERTS_INIT_HEAP_FRAG(heap_frag, token_size);
+		ERTS_INIT_HEAP_FRAG(heap_frag, token_size, token_size);
 		hp = heap_frag->mem;
 		ohp = &heap_frag->off_heap;
 		token = tuple[4];
@@ -1959,7 +1942,7 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
 	    goto done;
 	}
 	default:
-	    erl_exit(ERTS_ABORT_EXIT, "dsig_send invalid phase (%d)\n", (int)ctx->phase);
+	    erts_exit(ERTS_ABORT_EXIT, "dsig_send invalid phase (%d)\n", (int)ctx->phase);
 	}
     }
 
@@ -1980,7 +1963,7 @@ dist_port_command(Port *prt, ErtsDistOutputBuf *obuf)
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
 
     if (size > (Uint) INT_MAX)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "Absurdly large distribution output data buffer "
 		 "(%beu bytes) passed.\n",
 		 size);
@@ -2020,7 +2003,7 @@ dist_port_commandv(Port *prt, ErtsDistOutputBuf *obuf)
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
 
     if (size > (Uint) INT_MAX)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "Absurdly large distribution output data buffer "
 		 "(%beu bytes) passed.\n",
 		 size);
@@ -2062,9 +2045,9 @@ dist_port_commandv(Port *prt, ErtsDistOutputBuf *obuf)
 }
 
 
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 #define ERTS_PORT_REDS_MASK__ 0x003fffffffffffffL
-#elif defined(ARCH_32) || HALFWORD_HEAP
+#elif defined(ARCH_32)
 #define ERTS_PORT_REDS_MASK__ 0x003fffff
 #else
 #  error "Ohh come on ... !?!"
@@ -3275,11 +3258,16 @@ send_nodes_mon_msg(Process *rp,
 		   Uint sz)
 {
     Eterm msg;
-    ErlHeapFragment* bp;
+    Eterm *hp;
+    ErtsMessage *mp;
     ErlOffHeap *ohp;
-    Eterm *hp = erts_alloc_message_heap(sz, &bp, &ohp, rp, rp_locksp);
 #ifdef DEBUG
-    Eterm *hend = hp + sz;
+    Eterm *hend;
+#endif
+
+    mp = erts_alloc_message_heap(rp, rp_locksp, sz, &hp, &ohp);
+#ifdef DEBUG
+    hend = hp + sz;
 #endif
 
     if (!nmp->opts) {
@@ -3325,7 +3313,7 @@ send_nodes_mon_msg(Process *rp,
     }
 
     ASSERT(hend == hp);
-    erts_queue_message(rp, rp_locksp, bp, msg, NIL);
+    erts_queue_message(rp, rp_locksp, mp, msg, NIL);
 }
 
 static void
@@ -3382,7 +3370,7 @@ send_nodes_mon_msgs(Process *c_p, Eterm what, Eterm node, Eterm type, Eterm reas
 		    continue;
 		break;
 	    default:
-		erl_exit(ERTS_ABORT_EXIT, "Bad node type found\n");
+		erts_exit(ERTS_ABORT_EXIT, "Bad node type found\n");
 	    }
 	}
 
@@ -3691,7 +3679,7 @@ erts_processes_monitoring_nodes(Process *c_p)
 		case ERTS_NODES_MON_OPT_TYPES:        type = am_all;     break;
 		case ERTS_NODES_MON_OPT_TYPE_VISIBLE: type = am_visible; break;
 		case ERTS_NODES_MON_OPT_TYPE_HIDDEN:  type = am_hidden;  break;
-		default: erl_exit(ERTS_ABORT_EXIT, "Bad node type found\n");
+		default: erts_exit(ERTS_ABORT_EXIT, "Bad node type found\n");
 		}
 		olist = erts_bld_cons(hpp, szp, 
 				      erts_bld_tuple(hpp, szp, 2,
diff --git a/erts/emulator/beam/erl_afit_alloc.c b/erts/emulator/beam/erl_afit_alloc.c
index 47dafa53c0..4b0541c10e 100644
--- a/erts/emulator/beam/erl_afit_alloc.c
+++ b/erts/emulator/beam/erl_afit_alloc.c
@@ -241,7 +241,7 @@ info_options(Allctr_t *allctr,
     if (hpp || szp) {
 	
 	if (!atoms_initialized)
-	    erl_exit(1, "%s:%d: Internal error: Atoms not initialized",
+	    erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error: Atoms not initialized",
 		     __FILE__, __LINE__);;
 
 	res = NIL;
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index c3f4fe5a63..9cbe00d719 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -103,9 +103,9 @@ static Uint install_debug_functions(void);
 
 static int lock_all_physical_memory = 0;
 
-ErtsAllocatorFunctions_t erts_allctrs[ERTS_ALC_A_MAX+1];
+ErtsAllocatorFunctions_t ERTS_WRITE_UNLIKELY(erts_allctrs[ERTS_ALC_A_MAX+1]);
 ErtsAllocatorInfo_t erts_allctrs_info[ERTS_ALC_A_MAX+1];
-ErtsAllocatorThrSpec_t erts_allctr_thr_spec[ERTS_ALC_A_MAX+1];
+ErtsAllocatorThrSpec_t ERTS_WRITE_UNLIKELY(erts_allctr_thr_spec[ERTS_ALC_A_MAX+1]);
 
 #define ERTS_MIN(A, B) ((A) < (B) ? (A) : (B))
 #define ERTS_MAX(A, B) ((A) > (B) ? (A) : (B))
@@ -123,10 +123,6 @@ typedef union {
 
 static ErtsAllocatorState_t std_alloc_state;
 static ErtsAllocatorState_t ll_alloc_state;
-#if HALFWORD_HEAP
-static ErtsAllocatorState_t std_low_alloc_state;
-static ErtsAllocatorState_t ll_low_alloc_state;
-#endif
 static ErtsAllocatorState_t sl_alloc_state;
 static ErtsAllocatorState_t temp_alloc_state;
 static ErtsAllocatorState_t eheap_alloc_state;
@@ -134,6 +130,7 @@ static ErtsAllocatorState_t binary_alloc_state;
 static ErtsAllocatorState_t ets_alloc_state;
 static ErtsAllocatorState_t driver_alloc_state;
 static ErtsAllocatorState_t fix_alloc_state;
+static ErtsAllocatorState_t literal_alloc_state;
 static ErtsAllocatorState_t test_alloc_state;
 
 typedef struct {
@@ -151,24 +148,10 @@ typedef struct {
 #define ERTS_ALC_INFO_A_MSEG_ALLOC (ERTS_ALC_A_MAX + 2)
 #define ERTS_ALC_INFO_A_MAX ERTS_ALC_INFO_A_MSEG_ALLOC
 
-#if !HALFWORD_HEAP
 ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(aireq,
-				 ErtsAllocInfoReq,
-				 5,
-				 ERTS_ALC_T_AINFO_REQ)
-#else
-static ERTS_INLINE ErtsAllocInfoReq *
-aireq_alloc(void)
-{
-    return erts_alloc(ERTS_ALC_T_AINFO_REQ, sizeof(ErtsAllocInfoReq));
-}
-
-static ERTS_INLINE void
-aireq_free(ErtsAllocInfoReq *ptr)
-{
-    erts_free(ERTS_ALC_T_AINFO_REQ, ptr);
-}
-#endif
+                                 ErtsAllocInfoReq,
+                                 5,
+                                 ERTS_ALC_T_AINFO_REQ)
 
 ErtsAlcType_t erts_fix_core_allocator_ix;
 
@@ -182,6 +165,8 @@ enum allctr_type {
 struct au_init {
     int enable;
     int thr_spec;
+    int disable_allowed;
+    int thr_spec_allowed;
     int carrier_migration_allowed;
     enum allctr_type	atype;
     struct {
@@ -230,14 +215,11 @@ typedef struct {
     struct au_init ets_alloc;
     struct au_init driver_alloc;
     struct au_init fix_alloc;
-#if HALFWORD_HEAP
-    struct au_init std_low_alloc;
-    struct au_init ll_low_alloc;
-#endif
+    struct au_init literal_alloc;
     struct au_init test_alloc;
 } erts_alc_hndl_args_init_t;
 
-#define ERTS_AU_INIT__ {0, 0, 1, GOODFIT, DEFAULT_ALLCTR_INIT, {1,1,1,1}}
+#define ERTS_AU_INIT__ {0, 0, 1, 1, 1, GOODFIT, DEFAULT_ALLCTR_INIT, {1,1,1,1}}
 
 #define SET_DEFAULT_ALLOC_OPTS(IP)					\
 do {									\
@@ -261,10 +243,6 @@ set_default_sl_alloc_opts(struct au_init *ip)
 #endif
     ip->init.util.ts 		= ERTS_ALC_MTA_SHORT_LIVED;
     ip->init.util.rsbcst	= 80;
-#if HALFWORD_HEAP
-    ip->init.util.force         = 1;
-    ip->init.util.low_mem       = 1;
-#endif
     ip->init.util.acul		= ERTS_ALC_DEFAULT_ACUL;
 }
 
@@ -300,9 +278,9 @@ set_default_ll_alloc_opts(struct au_init *ip)
     ip->init.util.name_prefix	= "ll_";
     ip->init.util.alloc_no	= ERTS_ALC_A_LONG_LIVED;
 #ifndef SMALL_MEMORY
-    ip->init.util.mmbcs 	= 2*1024*1024 - 40; /* Main carrier size */
+    ip->init.util.mmbcs 	= 2*1024*1024; /* Main carrier size */
 #else
-    ip->init.util.mmbcs 	= 1*1024*1024 - 40; /* Main carrier size */
+    ip->init.util.mmbcs 	= 1*1024*1024; /* Main carrier size */
 #endif
     ip->init.util.ts 		= ERTS_ALC_MTA_LONG_LIVED;
     ip->init.util.asbcst	= 0;
@@ -313,6 +291,54 @@ set_default_ll_alloc_opts(struct au_init *ip)
 }
 
 static void
+set_default_literal_alloc_opts(struct au_init *ip)
+{
+    SET_DEFAULT_ALLOC_OPTS(ip);
+    ip->enable			= 1;
+    ip->thr_spec		= 0;
+    ip->disable_allowed         = 0;
+    ip->thr_spec_allowed        = 0;
+    ip->carrier_migration_allowed = 0;
+    ip->atype			= BESTFIT;
+    ip->init.bf.ao		= 1;
+    ip->init.util.ramv		= 0;
+    ip->init.util.mmsbc		= 0;
+    ip->init.util.sbct		= ~((UWord) 0);
+    ip->init.util.name_prefix	= "literal_";
+    ip->init.util.alloc_no	= ERTS_ALC_A_LITERAL;
+#ifndef SMALL_MEMORY
+    ip->init.util.mmbcs 	= 2*1024*1024; /* Main carrier size */
+#else
+    ip->init.util.mmbcs 	= 1*1024*1024; /* Main carrier size */
+#endif
+    ip->init.util.ts 		= ERTS_ALC_MTA_LITERAL;
+    ip->init.util.asbcst	= 0;
+    ip->init.util.rsbcst	= 0;
+    ip->init.util.rsbcmt	= 0;
+    ip->init.util.rmbcmt	= 0;
+    ip->init.util.acul		= 0;
+
+#if defined(ARCH_32)
+# if HAVE_ERTS_MSEG
+    ip->init.util.mseg_alloc   = &erts_alcu_literal_32_mseg_alloc;
+    ip->init.util.mseg_realloc = &erts_alcu_literal_32_mseg_realloc;
+    ip->init.util.mseg_dealloc = &erts_alcu_literal_32_mseg_dealloc;
+# endif
+    ip->init.util.sys_alloc    = &erts_alcu_literal_32_sys_alloc;
+    ip->init.util.sys_realloc  = &erts_alcu_literal_32_sys_realloc;
+    ip->init.util.sys_dealloc  = &erts_alcu_literal_32_sys_dealloc;
+#elif defined(ARCH_64)
+# ifdef ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION
+    ip->init.util.mseg_alloc    = &erts_alcu_literal_64_mseg_alloc;
+    ip->init.util.mseg_realloc  = &erts_alcu_literal_64_mseg_realloc;
+    ip->init.util.mseg_dealloc  = &erts_alcu_literal_64_mseg_dealloc;
+# endif
+#else
+# error Unknown architecture
+#endif
+}
+
+static void
 set_default_temp_alloc_opts(struct au_init *ip)
 {
     SET_DEFAULT_ALLOC_OPTS(ip);
@@ -330,10 +356,6 @@ set_default_temp_alloc_opts(struct au_init *ip)
     ip->init.util.ts 		= ERTS_ALC_MTA_TEMPORARY;
     ip->init.util.rsbcst	= 90;
     ip->init.util.rmbcmt	= 100;
-#if HALFWORD_HEAP
-    ip->init.util.force         = 1;
-    ip->init.util.low_mem       = 1;
-#endif
 }
 
 static void
@@ -352,10 +374,6 @@ set_default_eheap_alloc_opts(struct au_init *ip)
 #endif
     ip->init.util.ts 		= ERTS_ALC_MTA_EHEAP;
     ip->init.util.rsbcst	= 50;
-#if HALFWORD_HEAP
-    ip->init.util.force         = 1;
-    ip->init.util.low_mem       = 1;
-#endif
     ip->init.util.acul		= ERTS_ALC_DEFAULT_ACUL_EHEAP_ALLOC;
 }
 
@@ -589,18 +607,16 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
 
     fix_type_sizes[ERTS_ALC_FIX_TYPE_IX(ERTS_ALC_T_PROC)]
 	= sizeof(Process);
-#if !HALFWORD_HEAP
     fix_type_sizes[ERTS_ALC_FIX_TYPE_IX(ERTS_ALC_T_MONITOR_SH)]
 	= ERTS_MONITOR_SH_SIZE * sizeof(Uint);
     fix_type_sizes[ERTS_ALC_FIX_TYPE_IX(ERTS_ALC_T_NLINK_SH)]
 	= ERTS_LINK_SH_SIZE * sizeof(Uint);
-#endif
     fix_type_sizes[ERTS_ALC_FIX_TYPE_IX(ERTS_ALC_T_DRV_EV_D_STATE)]
 	= sizeof(ErtsDrvEventDataState);
     fix_type_sizes[ERTS_ALC_FIX_TYPE_IX(ERTS_ALC_T_DRV_SEL_D_STATE)]
 	= sizeof(ErtsDrvSelectDataState);
     fix_type_sizes[ERTS_ALC_FIX_TYPE_IX(ERTS_ALC_T_MSG_REF)]
-	= sizeof(ErlMessage);
+	= sizeof(ErtsMessageRef);
 #ifdef ERTS_SMP
     fix_type_sizes[ERTS_ALC_FIX_TYPE_IX(ERTS_ALC_T_THR_Q_EL_SL)]
 	= sizeof(ErtsThrQElement_t);
@@ -642,6 +658,7 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     set_default_driver_alloc_opts(&init.driver_alloc);
     set_default_fix_alloc_opts(&init.fix_alloc,
 			       fix_type_sizes);
+    set_default_literal_alloc_opts(&init.literal_alloc);
     set_default_test_alloc_opts(&init.test_alloc);
 
     if (argc && argv)
@@ -653,11 +670,11 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
 	if (mlockall(MCL_CURRENT|MCL_FUTURE) != 0) {
 	    int err = errno;
 	    char *errstr = err ? strerror(err) : "unknown";
-	    erl_exit(-1, "Failed to lock physical memory: %s (%d)\n",
+	    erts_exit(1, "Failed to lock physical memory: %s (%d)\n",
 		     errstr, err);
 	}
 #else
-	erl_exit(-1, "Failed to lock physical memory: Not supported\n");
+	erts_exit(1, "Failed to lock physical memory: Not supported\n");
 #endif
     }
 
@@ -670,6 +687,7 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     init.ets_alloc.thr_spec = 0;
     init.driver_alloc.thr_spec = 0;
     init.fix_alloc.thr_spec = 0;
+    init.literal_alloc.thr_spec = 0;
 #endif
 
     /* Make adjustments for carrier migration support */
@@ -682,6 +700,7 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     adjust_carrier_migration_support(&init.ets_alloc);
     adjust_carrier_migration_support(&init.driver_alloc);
     adjust_carrier_migration_support(&init.fix_alloc);
+    adjust_carrier_migration_support(&init.literal_alloc);
 
     if (init.erts_alloc_config) {
 	/* Adjust flags that erts_alloc_config won't like */
@@ -696,6 +715,7 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
 	init.ets_alloc.thr_spec = 0;
 	init.driver_alloc.thr_spec = 0;
 	init.fix_alloc.thr_spec = 0;
+        init.literal_alloc.thr_spec = 0;
 
 	/* No carrier migration */
 	init.temp_alloc.init.util.acul = 0;
@@ -707,6 +727,7 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
 	init.ets_alloc.init.util.acul = 0;
 	init.driver_alloc.init.util.acul = 0;
 	init.fix_alloc.init.util.acul = 0;
+        init.literal_alloc.init.util.acul = 0;
     }
 
 #ifdef ERTS_SMP
@@ -723,6 +744,7 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     adjust_tpref(&init.ets_alloc, erts_no_schedulers);
     adjust_tpref(&init.driver_alloc, erts_no_schedulers);
     adjust_tpref(&init.fix_alloc, erts_no_schedulers);
+    adjust_tpref(&init.literal_alloc, erts_no_schedulers);
 
 #else
     /* No thread specific if not smp */
@@ -741,6 +763,7 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     refuse_af_strategy(&init.ets_alloc);
     refuse_af_strategy(&init.driver_alloc);
     refuse_af_strategy(&init.fix_alloc);
+    refuse_af_strategy(&init.literal_alloc);
 
 #ifdef ERTS_SMP 
     if (!init.temp_alloc.thr_spec)
@@ -775,24 +798,6 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     erts_allctrs[ERTS_ALC_A_SYSTEM].free		= erts_sys_free;
     erts_allctrs_info[ERTS_ALC_A_SYSTEM].enabled	= 1;
 
-#if HALFWORD_HEAP
-    /* Init low memory variants by cloning */
-    init.std_low_alloc = init.std_alloc;
-    init.std_low_alloc.init.util.name_prefix	= "std_low_";
-    init.std_low_alloc.init.util.alloc_no = ERTS_ALC_A_STANDARD_LOW;
-    init.std_low_alloc.init.util.force = 1;
-    init.std_low_alloc.init.util.low_mem = 1;
-
-    init.ll_low_alloc = init.ll_alloc;
-    init.ll_low_alloc.init.util.name_prefix	= "ll_low_";
-    init.ll_low_alloc.init.util.alloc_no = ERTS_ALC_A_LONG_LIVED_LOW;
-    init.ll_low_alloc.init.util.force = 1;
-    init.ll_low_alloc.init.util.low_mem = 1;
-
-    set_au_allocator(ERTS_ALC_A_STANDARD_LOW, &init.std_low_alloc, ncpu);
-    set_au_allocator(ERTS_ALC_A_LONG_LIVED_LOW, &init.ll_low_alloc, ncpu);
-#endif /* HALFWORD */
-
     set_au_allocator(ERTS_ALC_A_TEMPORARY, &init.temp_alloc, ncpu);
     set_au_allocator(ERTS_ALC_A_SHORT_LIVED, &init.sl_alloc, ncpu);
     set_au_allocator(ERTS_ALC_A_STANDARD, &init.std_alloc, ncpu);
@@ -802,17 +807,18 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     set_au_allocator(ERTS_ALC_A_ETS, &init.ets_alloc, ncpu);
     set_au_allocator(ERTS_ALC_A_DRIVER, &init.driver_alloc, ncpu);
     set_au_allocator(ERTS_ALC_A_FIXED_SIZE, &init.fix_alloc, ncpu);
+    set_au_allocator(ERTS_ALC_A_LITERAL, &init.literal_alloc, ncpu);
     set_au_allocator(ERTS_ALC_A_TEST, &init.test_alloc, ncpu);
 
     for (i = ERTS_ALC_A_MIN; i <= ERTS_ALC_A_MAX; i++) {
 	if (!erts_allctrs[i].alloc)
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "Missing alloc function for %s\n", ERTS_ALC_A2AD(i));
 	if (!erts_allctrs[i].realloc)
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "Missing realloc function for %s\n", ERTS_ALC_A2AD(i));
 	if (!erts_allctrs[i].free)
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "Missing free function for %s\n", ERTS_ALC_A2AD(i));
     }
 
@@ -836,14 +842,6 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     start_au_allocator(ERTS_ALC_A_LONG_LIVED,
 		       &init.ll_alloc,
 		       &ll_alloc_state);
-#if HALFWORD_HEAP
-    start_au_allocator(ERTS_ALC_A_LONG_LIVED_LOW,
-		       &init.ll_low_alloc,
-		       &ll_low_alloc_state);
-    start_au_allocator(ERTS_ALC_A_STANDARD_LOW,
-		       &init.std_low_alloc,
-		       &std_low_alloc_state);
-#endif
     start_au_allocator(ERTS_ALC_A_EHEAP,
 		       &init.eheap_alloc,
 		       &eheap_alloc_state);
@@ -863,6 +861,9 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     start_au_allocator(ERTS_ALC_A_FIXED_SIZE,
 		       &init.fix_alloc,
 		       &fix_alloc_state);
+    start_au_allocator(ERTS_ALC_A_LITERAL,
+                       &init.literal_alloc,
+                       &literal_alloc_state);
 
     start_au_allocator(ERTS_ALC_A_TEST,
 		       &init.test_alloc,
@@ -871,9 +872,7 @@ erts_alloc_init(int *argc, char **argv, ErtsAllocInitOpts *eaiop)
     erts_mtrace_install_wrapper_functions();
     extra_block_size += erts_instr_init(init.instr.stat, init.instr.map);
 
-#if !HALFWORD_HEAP
     init_aireq_alloc();
-#endif
 
 #ifdef DEBUG
     extra_block_size += install_debug_functions();
@@ -890,7 +889,7 @@ erts_alloc_late_init(void)
 static void *
 erts_realloc_fixed_size(ErtsAlcType_t type, void *extra, void *p, Uint size)
 {
-    erl_exit(ERTS_ABORT_EXIT,
+    erts_exit(ERTS_ABORT_EXIT,
 	     "Attempt to reallocate a block of the fixed size type %s\n",
 	     ERTS_ALC_T2TD(type));
 }
@@ -971,6 +970,10 @@ set_au_allocator(ErtsAlcType_t alctr_n, struct au_init *init, int ncpu)
     else
 #endif
     {
+#ifdef ERTS_SMP
+        erts_exit(ERTS_ABORT_EXIT, "%salloc is not thread safe\n",
+                 init->init.util.name_prefix);
+#else
 	af->alloc = erts_alcu_alloc;
 	if (init->init.util.fix_type_size)
 	    af->realloc = erts_realloc_fixed_size;
@@ -979,6 +982,7 @@ set_au_allocator(ErtsAlcType_t alctr_n, struct au_init *init, int ncpu)
 	else
 	    af->realloc = erts_alcu_realloc;
 	af->free = erts_alcu_free;
+#endif
     }
     af->extra	= NULL;
     ai->alloc_util	= 1;
@@ -1012,7 +1016,7 @@ start_au_allocator(ErtsAlcType_t alctr_n,
 					  * tspec->size)
 				       + ERTS_CACHE_LINE_SIZE - 1));
 	if (!states)
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "Failed to allocate allocator states for %salloc\n",
 		     init->init.util.name_prefix);
 	tspec->allctr = (Allctr_t **) states;
@@ -1040,7 +1044,7 @@ start_au_allocator(ErtsAlcType_t alctr_n,
 				   (tot_fix_list_size
 				    + ERTS_CACHE_LINE_SIZE - 1));
 	if (!fix_lists)
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "Failed to allocate fix lists for %salloc\n",
 		     init->init.util.name_prefix);
 
@@ -1051,7 +1055,7 @@ start_au_allocator(ErtsAlcType_t alctr_n,
     }
 
     for (i = 0; i < size; i++) {
-	void *as;
+	Allctr_t *as;
 	atype = init->atype;
 
 	if (!init->thr_spec)
@@ -1088,22 +1092,22 @@ start_au_allocator(ErtsAlcType_t alctr_n,
 
 	switch (atype) {
 	case GOODFIT:
-	    as = (void *) erts_gfalc_start((GFAllctr_t *) as0,
+	    as = erts_gfalc_start((GFAllctr_t *) as0,
 					   &init->init.gf,
 					   &init->init.util);
 	    break;
 	case BESTFIT:
-	    as = (void *) erts_bfalc_start((BFAllctr_t *) as0,
+	    as = erts_bfalc_start((BFAllctr_t *) as0,
 					   &init->init.bf,
 					   &init->init.util);
 	    break;
 	case AFIT:
-	    as = (void *) erts_afalc_start((AFAllctr_t *) as0,
+	    as = erts_afalc_start((AFAllctr_t *) as0,
 					   &init->init.af,
 					   &init->init.util);
 	    break;
     	case AOFIRSTFIT:
-	    as = (void *) erts_aoffalc_start((AOFFAllctr_t *) as0,
+	    as = erts_aoffalc_start((AOFFAllctr_t *) as0,
 					     &init->init.aoff,
 					     &init->init.util);
 	    break;
@@ -1114,7 +1118,7 @@ start_au_allocator(ErtsAlcType_t alctr_n,
 	}
 
 	if (!as)
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "Failed to start %salloc\n", init->init.util.name_prefix);
 
 	ASSERT(as == (void *) as0);
@@ -1273,9 +1277,6 @@ get_acul_value(struct au_init *auip, char *param_end, char** argv, int* ip)
     if (sys_strcmp(value, "de") == 0) {
 	switch (auip->init.util.alloc_no) {
 	case ERTS_ALC_A_LONG_LIVED:
-#if HALFWORD_HEAP
-	case ERTS_ALC_A_LONG_LIVED_LOW:
-#endif
 	    return ERTS_ALC_DEFAULT_ENABLED_ACUL_LL_ALLOC;
 	case ERTS_ALC_A_EHEAP:
 	    return ERTS_ALC_DEFAULT_ENABLED_ACUL_EHEAP_ALLOC;
@@ -1353,9 +1354,17 @@ handle_au_arg(struct au_init *auip,
 	else
 	    goto bad_switch;
 	break;
-    case 'e':
-	auip->enable = get_bool_value(sub_param+1, argv, ip);
+    case 'e': {
+	int e = get_bool_value(sub_param + 1, argv, ip);
+        if (!auip->disable_allowed && !e) {
+            if (!u_switch)
+                bad_value(param, sub_param + 1, "false");
+	    else
+		ASSERT(auip->enable); /* ignore */
+        }
+	else auip->enable = e;
 	break;
+    }
     case 'l':
 	if (has_prefix("lmbcs", sub_param)) {
 	    auip->default_.lmbcs = 0;
@@ -1424,7 +1433,14 @@ handle_au_arg(struct au_init *auip,
     case 't': {
 	int res = get_bool_value(sub_param+1, argv, ip);
 	if (res > 0) {
-	    auip->thr_spec = 1;
+	    if (!auip->thr_spec_allowed) {
+		if (!u_switch)
+                    bad_value(param, sub_param + 1, "true");
+		else
+		    ASSERT(!auip->thr_spec); /* ignore */
+	    }
+	    else
+		auip->thr_spec = 1;
 	    break;
 	}
 	else if (res == 0) {
@@ -1473,6 +1489,16 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init)
 		case 'B':
 		    handle_au_arg(&init->binary_alloc, &argv[i][3], argv, &i, 0);
 		    break;
+                case 'I':
+                    if (has_prefix("scs", argv[i]+3)) {
+#if HAVE_ERTS_MSEG
+			init->mseg.literal_mmap.scs =
+#endif
+			    get_mb_value(argv[i]+6, argv, &i);
+		    }
+                    else
+                        handle_au_arg(&init->literal_alloc, &argv[i][3], argv, &i, 0);
+		    break;
 		case 'D':
 		    handle_au_arg(&init->std_alloc, &argv[i][3], argv, &i, 0);
 		    break;
@@ -1509,25 +1535,25 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init)
 		    }
 		    else if (has_prefix("scs", argv[i]+3)) {
 #if HAVE_ERTS_MSEG
-			init->mseg.mmap.scs =
+			init->mseg.dflt_mmap.scs =
 #endif
 			    get_mb_value(argv[i]+6, argv, &i);
 		    }
 		    else if (has_prefix("sco", argv[i]+3)) {
 #if HAVE_ERTS_MSEG
-			init->mseg.mmap.sco =
+			init->mseg.dflt_mmap.sco =
 #endif
 			    get_bool_value(argv[i]+6, argv, &i);
 		    }
 		    else if (has_prefix("scrpm", argv[i]+3)) {
 #if HAVE_ERTS_MSEG
-			init->mseg.mmap.scrpm =
+			init->mseg.dflt_mmap.scrpm =
 #endif
 			    get_bool_value(argv[i]+8, argv, &i);
 		    }
 		    else if (has_prefix("scrfsd", argv[i]+3)) {
 #if HAVE_ERTS_MSEG
-			init->mseg.mmap.scrfsd =
+			init->mseg.dflt_mmap.scrfsd =
 #endif
 			    get_amount_value(argv[i]+9, argv, &i);
 		    }
@@ -1909,7 +1935,7 @@ erts_alc_fatal_error(int error, int func, ErtsAlcType_t n, ...)
 	case ERTS_ALC_O_FREE:		op_str = "free";	break;
 	default:			op_str = "UNKNOWN";	break;
 	}
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "%s: %s operation not supported (memory type: \"%s\")\n",
 		 allctr_str, op_str, t_str);
 	break;
@@ -1923,18 +1949,18 @@ erts_alc_fatal_error(int error, int func, ErtsAlcType_t n, ...)
 	va_start(argp, n);
 	size = va_arg(argp, Uint);
 	va_end(argp);
-	erl_exit(1,
+	erts_exit(ERTS_DUMP_EXIT,
 		 "%s: Cannot %s %lu bytes of memory (of type \"%s\").\n",
 		 allctr_str, op, size, t_str);
 	break;
     }
     case ERTS_ALC_E_NOALLCTR:
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "erts_alloc: Unknown allocator type: %d\n",
 		 ERTS_ALC_T2A(ERTS_ALC_N2T(n)));
 	break;
     default:
-	erl_exit(ERTS_ABORT_EXIT, "erts_alloc: Unknown error: %d\n", error);
+	erts_exit(ERTS_ABORT_EXIT, "erts_alloc: Unknown error: %d\n", error);
 	break;
     }
 }
@@ -1996,48 +2022,6 @@ alcu_size(ErtsAlcType_t ai, ErtsAlcUFixInfo_t *fi, int fisz)
     return res;
 }
 
-#if HALFWORD_HEAP
-static ERTS_INLINE int
-alcu_is_low(ErtsAlcType_t ai)
-{
-    int is_low = 0;
-    ASSERT(erts_allctrs_info[ai].enabled);
-    ASSERT(erts_allctrs_info[ai].alloc_util);
-
-    if (!erts_allctrs_info[ai].thr_spec) {
-	Allctr_t *allctr = erts_allctrs_info[ai].extra;
-	is_low = allctr->mseg_opt.low_mem;
-    }
-    else {
-	ErtsAllocatorThrSpec_t *tspec = &erts_allctr_thr_spec[ai];
-	int i;
-# ifdef DEBUG
-	int found_one = 0;
-# endif
-
-	ASSERT(tspec->enabled);
-
-	for (i = tspec->size - 1; i >= 0; i--) {
-	    Allctr_t *allctr = tspec->allctr[i];
-	    if (allctr) {
-# ifdef DEBUG
-		if (!found_one) {
-		    is_low = allctr->mseg_opt.low_mem;
-		    found_one = 1;
-		}
-		else ASSERT(is_low == allctr->mseg_opt.low_mem);
-# else
-		is_low = allctr->mseg_opt.low_mem;
-		break;
-# endif
-	    }
-	}
-	ASSERT(found_one);
-    }
-    return is_low;
-}
-#endif /* HALFWORD */
-
 static ERTS_INLINE void
 add_fix_values(UWord *ap, UWord *up, ErtsAlcUFixInfo_t *fi, ErtsAlcType_t type)
 {
@@ -2067,9 +2051,6 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 	int code;
 	int ets;
 	int maximum;
-#if HALFWORD_HEAP
-	int low;
-#endif
     } want = {0};
     struct {
 	UWord total;
@@ -2082,9 +2063,6 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 	UWord code;
 	UWord ets;
 	UWord maximum;
-#if HALFWORD_HEAP
-	UWord low;
-#endif
     } size = {0};
     Eterm atoms[sizeof(size)/sizeof(UWord)];
     UWord *uintps[sizeof(size)/sizeof(UWord)];
@@ -2143,11 +2121,6 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 	    atoms[length] = am_maximum;
 	    uintps[length++] = &size.maximum;
 	}
-#if HALFWORD_HEAP
-	want.low = 1;
-	atoms[length] = am_low;
-	uintps[length++] = &size.low;
-#endif
     }
     else {
 	DeclareTmpHeapNoproc(tmp_heap,2);
@@ -2241,15 +2214,6 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 		    return am_badarg;
 		}
 		break;
-#if HALFWORD_HEAP
-	    case am_low:
-		if (!want.low) {
-		    want.low = 1;
-		    atoms[length] = am_low;
-		    uintps[length++] = &size.low;
-		}
-		break;
-#endif
 	    default:
 		UnUseTmpHeapNoproc(2);
 		return am_badarg;
@@ -2330,11 +2294,6 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 		if (save)
 		    *save = asz;
 		size.total += asz;
-#if HALFWORD_HEAP
-		if (alcu_is_low(ai)) {
-		    size.low += asz;
-		}
-#endif
 	    }
 	}
     }
@@ -2361,7 +2320,6 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 		       &size.processes_used,
 		       fi,
 		       ERTS_ALC_T_PROC);
-#if !HALFWORD_HEAP
 	add_fix_values(&size.processes,
 		       &size.processes_used,
 		       fi,
@@ -2371,7 +2329,6 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
 		       &size.processes_used,
 		       fi,
 		       ERTS_ALC_T_NLINK_SH);
-#endif
 	add_fix_values(&size.processes,
 		       &size.processes_used,
 		       fi,
@@ -2810,7 +2767,7 @@ erts_allocator_info(int to, void *arg)
 	    erts_mseg_info(i, &to, arg, 0, NULL, NULL);
 	}
 	erts_print(to, arg, "=allocator:mseg_alloc.erts_mmap\n");
-	erts_mmap_info(&to, arg, NULL, NULL, &emis);
+	erts_mmap_info(&erts_dflt_mmapper, &to, arg, NULL, NULL, &emis);
     }
 #endif
 
@@ -3036,12 +2993,12 @@ reply_alloc_info(void *vair)
     int global_instances = air->req_sched == sched_id;
     ErtsProcLocks rp_locks;
     Process *rp = air->proc;
-    Eterm ref_copy = NIL, ai_list, msg;
-    Eterm *hp = NULL, *hp_end = NULL, *hp_start = NULL;
+    Eterm ref_copy = NIL, ai_list, msg = NIL;
+    Eterm *hp = NULL, *hp_start = NULL, *hp_end = NULL;
     Eterm **hpp;
     Uint sz, *szp;
     ErlOffHeap *ohp = NULL;
-    ErlHeapFragment *bp = NULL;
+    ErtsMessage *mp = NULL;
     struct erts_mmap_info_struct emis;
     int i;
     Eterm (*info_func)(Allctr_t *,
@@ -3162,7 +3119,8 @@ reply_alloc_info(void *vair)
 
 		    ai_list = erts_bld_cons(hpp, szp,
 					    ainfo, ai_list);
-		    ainfo = (air->only_sz ? NIL : erts_mmap_info(NULL, NULL, hpp, szp, &emis));
+		    ainfo = (air->only_sz ? NIL :
+                             erts_mmap_info(&erts_dflt_mmapper, NULL, NULL, hpp, szp, &emis));
 		    ainfo = erts_bld_tuple3(hpp, szp,
                                             alloc_atom,
                                             erts_bld_atom(hpp,szp,"erts_mmap"),
@@ -3189,7 +3147,7 @@ reply_alloc_info(void *vair)
 					       make_small(0), ainfo);
 		    }
 		    else {
-			erl_exit(ERTS_ABORT_EXIT, "%s:%d: internal error\n",
+			erts_exit(ERTS_ABORT_EXIT, "%s:%d: internal error\n",
 				 __FILE__, __LINE__);
 		    }
 		}
@@ -3242,20 +3200,17 @@ reply_alloc_info(void *vair)
 	if (hpp)
 	    break;
 
-	hp = erts_alloc_message_heap(sz, &bp, &ohp, rp, &rp_locks);
+	mp = erts_alloc_message_heap(rp, &rp_locks, sz, &hp, &ohp);
 	hp_start = hp;
 	hp_end = hp + sz;
 	szp = NULL;
 	hpp = &hp;
     }
-    if (bp)
-	bp = erts_resize_message_buffer(bp, hp - hp_start, &msg, 1);
-    else {
-	ASSERT(hp);
-	HRelease(rp, hp_end, hp);	    
-    }
 
-    erts_queue_message(rp, &rp_locks, bp, msg, NIL);
+    if (hp != hp_end)
+	erts_shrink_message_heap(&mp, rp, hp_start, hp, hp_end, &msg, 1);
+
+    erts_queue_message(rp, &rp_locks, mp, msg, NIL);
 
     if (air->req_sched == sched_id)
 	rp_locks &= ~ERTS_PROC_LOCK_MAIN;
@@ -3426,7 +3381,7 @@ void *safe_realloc(void *ptr, Uint sz)
  * Keep alloc_SUITE_data/allocator_test.h updated if changes are made        *
  * to erts_alc_test()                                                        *
 \*                                                                           */
-#define ERTS_ALC_TEST_ABORT erl_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error\n")
+#define ERTS_ALC_TEST_ABORT erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error\n")
 
 UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 {
@@ -3479,8 +3434,11 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 	    init.enable = 1;
 	    init.atype = GOODFIT;
 	    init.init.util.name_prefix = (char *) a1;
-	    init.init.util.ts = a2 ? 1 : 0;
-
+#ifdef ERTS_SMP
+	    init.init.util.ts = 1;
+#else
+            init.init.util.ts = a2 ? 1 : 0;
+#endif
 	    if ((char **) a3) {
 		char **argv = (char **) a3;
 		int i = 0;
@@ -3888,7 +3846,7 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func)
     found_type = GET_TYPE_OF_PATTERN(pre_pattern);
     if (pre_pattern != MK_PATTERN(n)) {
 	if ((FIXED_FENCE_PATTERN_MASK & pre_pattern) != FIXED_FENCE_PATTERN)
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "ERROR: Fence at beginning of memory block (p=0x%u) "
 		     "clobbered.\n",
 		     (UWord) ptr);
@@ -3905,12 +3863,12 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func)
 	char *op_str;
 
 	if ((FIXED_FENCE_PATTERN_MASK & post_pattern) != FIXED_FENCE_PATTERN)
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "ERROR: Fence at end of memory block (p=0x%u, sz=%u) "
 		     "clobbered.\n",
 		     (UWord) ptr, (UWord) sz);
 	if (found_type != GET_TYPE_OF_PATTERN(post_pattern))
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "ERROR: Fence around memory block (p=0x%u, sz=%u) "
 		     "clobbered.\n",
 		     (UWord) ptr, (UWord) sz);
@@ -3933,7 +3891,7 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func)
 	default:			op_str = "???";		break;
 	}
 
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "ERROR: Memory block (p=0x%u, sz=%u) allocated as type \"%s\","
 		 " but %s as type \"%s\".\n",
 		 (UWord) ptr, (UWord) sz, ftype, op_str, otype);
diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h
index f540bae20d..ee2013bd93 100644
--- a/erts/emulator/beam/erl_alloc.h
+++ b/erts/emulator/beam/erl_alloc.h
@@ -30,6 +30,7 @@
 #ifdef USE_THREADS
 #include "erl_threads.h"
 #endif
+#include "erl_mmap.h"
 
 #ifdef DEBUG
 #  undef ERTS_ALC_WANT_INLINE
@@ -43,9 +44,11 @@
 #if ERTS_CAN_INLINE && ERTS_ALC_WANT_INLINE
 #  define ERTS_ALC_DO_INLINE 1
 #  define ERTS_ALC_INLINE static ERTS_INLINE
+#  define ERTS_ALC_FORCE_INLINE static ERTS_FORCE_INLINE
 #else
 #  define ERTS_ALC_DO_INLINE 0
 #  define ERTS_ALC_INLINE
+#  define ERTS_ALC_FORCE_INLINE
 #endif
 
 #define ERTS_ALC_NO_FIXED_SIZES \
@@ -177,6 +180,12 @@ void  sys_free(void *)               __deprecated; /* erts_free()        */
 void *sys_alloc(Uint )               __deprecated; /* erts_alloc_fnf()   */
 void *sys_realloc(void *, Uint)      __deprecated; /* erts_realloc_fnf() */
 
+#undef ERTS_HAVE_IS_IN_LITERAL_RANGE
+#if defined(ARCH_32) || defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION)
+#  define ERTS_HAVE_IS_IN_LITERAL_RANGE
+#endif
+
+
 /*
  * erts_alloc[_fnf](), erts_realloc[_fnf](), erts_free() works as
  * malloc(), realloc(), and free() with the following exceptions:
@@ -204,6 +213,9 @@ void erts_free(ErtsAlcType_t type, void *ptr);
 void *erts_alloc_fnf(ErtsAlcType_t type, Uint size);
 void *erts_realloc_fnf(ErtsAlcType_t type, void *ptr, Uint size);
 int erts_is_allctr_wrapper_prelocked(void);
+#ifdef ERTS_HAVE_IS_IN_LITERAL_RANGE
+int erts_is_in_literal_range(void* ptr);
+#endif
 
 #endif /* #if !ERTS_ALC_DO_INLINE */
 
@@ -221,12 +233,14 @@ ERTS_ALC_INLINE
 void *erts_alloc(ErtsAlcType_t type, Uint size)
 {
     void *res;
+    ERTS_MSACC_PUSH_AND_SET_STATE_X(ERTS_MSACC_STATE_ALLOC);
     res = (*erts_allctrs[ERTS_ALC_T2A(type)].alloc)(
-	ERTS_ALC_T2N(type),
-	erts_allctrs[ERTS_ALC_T2A(type)].extra,
-	size);
+            ERTS_ALC_T2N(type),
+            erts_allctrs[ERTS_ALC_T2A(type)].extra,
+            size);
     if (!res)
 	erts_alloc_n_enomem(ERTS_ALC_T2N(type), size);
+    ERTS_MSACC_POP_STATE_X();
     return res;
 }
 
@@ -234,6 +248,7 @@ ERTS_ALC_INLINE
 void *erts_realloc(ErtsAlcType_t type, void *ptr, Uint size)
 {
     void *res;
+    ERTS_MSACC_PUSH_AND_SET_STATE_X(ERTS_MSACC_STATE_ALLOC);
     res = (*erts_allctrs[ERTS_ALC_T2A(type)].realloc)(
 	ERTS_ALC_T2N(type),
 	erts_allctrs[ERTS_ALC_T2A(type)].extra,
@@ -241,37 +256,48 @@ void *erts_realloc(ErtsAlcType_t type, void *ptr, Uint size)
 	size);
     if (!res)
 	erts_realloc_n_enomem(ERTS_ALC_T2N(type), ptr, size);
+    ERTS_MSACC_POP_STATE_X();
     return res;
 }
 
 ERTS_ALC_INLINE
 void erts_free(ErtsAlcType_t type, void *ptr)
 {
+    ERTS_MSACC_PUSH_AND_SET_STATE_X(ERTS_MSACC_STATE_ALLOC);
     (*erts_allctrs[ERTS_ALC_T2A(type)].free)(
 	ERTS_ALC_T2N(type),
 	erts_allctrs[ERTS_ALC_T2A(type)].extra,
 	ptr);
+    ERTS_MSACC_POP_STATE_X();
 }
 
 
 ERTS_ALC_INLINE
 void *erts_alloc_fnf(ErtsAlcType_t type, Uint size)
 {
-    return (*erts_allctrs[ERTS_ALC_T2A(type)].alloc)(
+    void *res;
+    ERTS_MSACC_PUSH_AND_SET_STATE_X(ERTS_MSACC_STATE_ALLOC);
+    res = (*erts_allctrs[ERTS_ALC_T2A(type)].alloc)(
 	ERTS_ALC_T2N(type),
 	erts_allctrs[ERTS_ALC_T2A(type)].extra,
 	size);
+    ERTS_MSACC_POP_STATE_X();
+    return res;
 }
 
 
 ERTS_ALC_INLINE
 void *erts_realloc_fnf(ErtsAlcType_t type, void *ptr, Uint size)
 {
-    return (*erts_allctrs[ERTS_ALC_T2A(type)].realloc)(
+    void *res;
+    ERTS_MSACC_PUSH_AND_SET_STATE_X(ERTS_MSACC_STATE_ALLOC);
+    res = (*erts_allctrs[ERTS_ALC_T2A(type)].realloc)(
 	ERTS_ALC_T2N(type),
 	erts_allctrs[ERTS_ALC_T2A(type)].extra,
 	ptr,
 	size);
+    ERTS_MSACC_POP_STATE_X();
+    return res;
 }
 
 ERTS_ALC_INLINE
@@ -281,6 +307,28 @@ int erts_is_allctr_wrapper_prelocked(void)
 	&& !!erts_tsd_get(erts_allctr_prelock_tsd_key);  /* by me  */
 }
 
+#ifdef ERTS_HAVE_IS_IN_LITERAL_RANGE
+
+ERTS_ALC_FORCE_INLINE
+int erts_is_in_literal_range(void* ptr)
+{
+#if defined(ARCH_32)
+    Uint ix = (UWord)ptr >> ERTS_MMAP_SUPERALIGNED_BITS;
+
+    return erts_literal_vspace_map[ix / ERTS_VSPACE_WORD_BITS]
+                  & ((UWord)1 << (ix % ERTS_VSPACE_WORD_BITS));
+
+#elif defined(ARCH_64)
+    extern char* erts_literals_start;
+    extern UWord erts_literals_size;
+    return ErtsInArea(ptr, erts_literals_start, erts_literals_size);
+#else
+# error No ARCH_xx
+#endif
+}
+
+#endif /* ERTS_HAVE_IS_IN_LITERAL_RANGE */
+
 #endif /* #if ERTS_ALC_DO_INLINE || defined(ERTS_ALC_INTERNAL__) */
 
 #define ERTS_ALC_GET_THR_IX() ((int) erts_get_scheduler_id())
@@ -516,5 +564,3 @@ NAME##_free(TYPE *p)							\
 #undef ERTS_ALC_ATTRIBUTES
 
 #endif /* #ifndef ERL_ALLOC_H__ */
-
-
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types
index 1ecebdeb07..14067283bd 100644
--- a/erts/emulator/beam/erl_alloc.types
+++ b/erts/emulator/beam/erl_alloc.types
@@ -86,11 +86,7 @@ allocator	LONG_LIVED	true		ll_alloc
 allocator	EHEAP		true		eheap_alloc
 allocator	ETS		true		ets_alloc
 allocator	FIXED_SIZE	true		fix_alloc
-
-+if halfword
-allocator	LONG_LIVED_LOW	true		ll_low_alloc
-allocator	STANDARD_LOW	true		std_low_alloc
-+endif
+allocator	LITERAL 	true		literal_alloc
 
 +else # Non smp build
 
@@ -101,11 +97,7 @@ allocator	LONG_LIVED	false		ll_alloc
 allocator	EHEAP		false		eheap_alloc
 allocator	ETS		false		ets_alloc
 allocator	FIXED_SIZE	false		fix_alloc
-
-+if halfword
-allocator	LONG_LIVED_LOW	false		ll_low_alloc
-allocator	STANDARD_LOW	false		std_low_alloc
-+endif
+allocator	LITERAL 	false		literal_alloc
 
 +endif
 
@@ -160,6 +152,8 @@ type	OLD_HEAP	EHEAP		PROCESSES	old_heap
 type	HEAP_FRAG	EHEAP		PROCESSES	heap_frag
 type	TMP_HEAP	TEMPORARY	PROCESSES	tmp_heap
 type	MSG_REF		FIXED_SIZE	PROCESSES	msg_ref
+type	MSG		EHEAP		PROCESSES	message
+type	MSGQ_CHNG	SHORT_LIVED	PROCESSES	messages_queue_change
 type	MSG_ROOTS	TEMPORARY	PROCESSES	msg_roots
 type	ROOTSET		TEMPORARY	PROCESSES	root_set
 type	LOADER_TMP	TEMPORARY	CODE		loader_tmp
@@ -349,33 +343,13 @@ type	SSB		SHORT_LIVED	PROCESSES	ssb
 
 +endif
 
-
-+if halfword
-
-type	DDLL_PROCESS	STANDARD_LOW	SYSTEM		ddll_processes
-type	MONITOR_LH	STANDARD_LOW	PROCESSES	monitor_lh
-type	NLINK_LH	STANDARD_LOW	PROCESSES	nlink_lh
-type	CODE		LONG_LIVED_LOW	CODE		code
-type	DB_HEIR_DATA	STANDARD_LOW	ETS		db_heir_data
-type	DB_MS_PSDO_PROC	LONG_LIVED_LOW	ETS		db_match_pseudo_proc
-type	SCHDLR_DATA	LONG_LIVED_LOW	SYSTEM		scheduler_data
-type  	LL_TEMP_TERM 	LONG_LIVED_LOW	SYSTEM		ll_temp_term
-
-type	NIF_TRAP_EXPORT	STANDARD_LOW	CODE		nif_trap_export_entry
-type	EXPORT		LONG_LIVED_LOW	CODE		export_entry
-type	MONITOR_SH	STANDARD_LOW	PROCESSES	monitor_sh
-type	NLINK_SH	STANDARD_LOW	PROCESSES	nlink_sh
-type	AINFO_REQ	STANDARD_LOW	SYSTEM		alloc_info_request
-type	SCHED_WTIME_REQ	STANDARD_LOW	SYSTEM		sched_wall_time_request
-type	GC_INFO_REQ	STANDARD_LOW	SYSTEM		gc_info_request
-type	PORT_DATA_HEAP	STANDARD_LOW	SYSTEM		port_data_heap
-
-+else # "fullword"
+type	DEBUG	        SHORT_LIVED	SYSTEM          debugging
 
 type	DDLL_PROCESS	STANDARD	SYSTEM		ddll_processes
 type	MONITOR_LH	STANDARD	PROCESSES	monitor_lh
 type	NLINK_LH	STANDARD	PROCESSES	nlink_lh
 type	CODE		LONG_LIVED	CODE		code
+type	LITERAL		LITERAL 	CODE		literal
 type	DB_HEIR_DATA	STANDARD	ETS		db_heir_data
 type	DB_MS_PSDO_PROC	LONG_LIVED	ETS		db_match_pseudo_proc
 type	SCHDLR_DATA	LONG_LIVED	SYSTEM		scheduler_data
@@ -389,9 +363,8 @@ type	AINFO_REQ	SHORT_LIVED	SYSTEM		alloc_info_request
 type	SCHED_WTIME_REQ	SHORT_LIVED	SYSTEM		sched_wall_time_request
 type	GC_INFO_REQ	SHORT_LIVED	SYSTEM		gc_info_request
 type	PORT_DATA_HEAP	STANDARD	SYSTEM		port_data_heap
-
-+endif
-
+type    MSACC           DRIVER          SYSTEM          microstate_accounting
+type	SYS_CHECK_REQ	SHORT_LIVED	SYSTEM		system_check_request
 
 #
 # Types used by system specific code
@@ -430,21 +403,6 @@ type	SYS_WRITE_BUF	BINARY		SYSTEM		sys_write_buf
 
 +endif
 
-+if ose
-
-type	SYS_READ_BUF	TEMPORARY	SYSTEM		sys_read_buf
-type	FD_TAB		LONG_LIVED	SYSTEM		fd_tab
-type	FD_ENTRY_BUF	STANDARD	SYSTEM		fd_entry_buf
-type	FD_SIG_LIST	SHORT_LIVED	SYSTEM		fd_sig_list
-type    DRV_EV		STANDARD	SYSTEM		driver_event
-type	CS_PROG_PATH	LONG_LIVED	SYSTEM		cs_prog_path
-type	ENVIRONMENT	TEMPORARY	SYSTEM		environment
-type	PUTENV_STR	SYSTEM		SYSTEM		putenv_string
-type	PRT_REP_EXIT	STANDARD	SYSTEM		port_report_exit
-
-+endif
-
-
 +if win32
 
 type	DRV_DATA_BUF	SYSTEM		SYSTEM		drv_data_buf
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index 8229a15824..6e682019ba 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -52,6 +52,7 @@
 #ifdef ERTS_ENABLE_LOCK_COUNT
 #include "erl_lock_count.h"
 #endif
+#include "lttng-wrapper.h"
 
 #if defined(ERTS_ALLOC_UTIL_HARD_DEBUG) && defined(__GNUC__)
 #warning "* * * * * * * * * *"
@@ -751,12 +752,77 @@ internal_free(void *ptr)
 
 #endif
 
+#ifdef ARCH_32
+
+/*
+ * Bit vector for the entire 32-bit virtual address space
+ * with one bit for each super aligned memory segment.
+ */
+
+#define VSPACE_MAP_BITS  (1 << (32 - ERTS_MMAP_SUPERALIGNED_BITS))
+#define VSPACE_MAP_SZ    (VSPACE_MAP_BITS / ERTS_VSPACE_WORD_BITS)
+
+static ERTS_INLINE void set_bit(UWord* map, Uint ix)
+{
+    ASSERT(ix / ERTS_VSPACE_WORD_BITS < VSPACE_MAP_SZ);
+    map[ix / ERTS_VSPACE_WORD_BITS]
+        |= ((UWord)1 << (ix % ERTS_VSPACE_WORD_BITS));
+}
+
+static ERTS_INLINE void clr_bit(UWord* map, Uint ix)
+{
+    ASSERT(ix / ERTS_VSPACE_WORD_BITS < VSPACE_MAP_SZ);
+    map[ix / ERTS_VSPACE_WORD_BITS]
+        &= ~((UWord)1 << (ix % ERTS_VSPACE_WORD_BITS));
+}
+
+static ERTS_INLINE int is_bit_set(UWord* map, Uint ix)
+{
+    ASSERT(ix / ERTS_VSPACE_WORD_BITS < VSPACE_MAP_SZ);
+    return map[ix / ERTS_VSPACE_WORD_BITS]
+        & ((UWord)1 << (ix % ERTS_VSPACE_WORD_BITS));
+}
+
+UWord erts_literal_vspace_map[VSPACE_MAP_SZ];
+
+static void set_literal_range(void* start, Uint size)
+{
+    Uint ix = (UWord)start >> ERTS_MMAP_SUPERALIGNED_BITS;
+    Uint n = size >> ERTS_MMAP_SUPERALIGNED_BITS;
+
+    ASSERT(!((UWord)start & ERTS_INV_SUPERALIGNED_MASK));
+    ASSERT(!((UWord)size & ERTS_INV_SUPERALIGNED_MASK));
+    ASSERT(n);
+    while (n--) {
+        ASSERT(!is_bit_set(erts_literal_vspace_map, ix));
+        set_bit(erts_literal_vspace_map, ix);
+        ix++;
+    }
+}
+
+static void clear_literal_range(void* start, Uint size)
+{
+    Uint ix = (UWord)start >> ERTS_MMAP_SUPERALIGNED_BITS;
+    Uint n = size >> ERTS_MMAP_SUPERALIGNED_BITS;
+
+    ASSERT(!((UWord)start & ERTS_INV_SUPERALIGNED_MASK));
+    ASSERT(!((UWord)size & ERTS_INV_SUPERALIGNED_MASK));
+    ASSERT(n);
+    while (n--) {
+        ASSERT(is_bit_set(erts_literal_vspace_map, ix));
+        clr_bit(erts_literal_vspace_map, ix);
+        ix++;
+    }
+}
+
+#endif /* ARCH_32 */
+
 /* mseg ... */
 
 #if HAVE_ERTS_MSEG
 
-static ERTS_INLINE void *
-alcu_mseg_alloc(Allctr_t *allctr, Uint *size_p, Uint flags)
+void*
+erts_alcu_mseg_alloc(Allctr_t *allctr, Uint *size_p, Uint flags)
 {
     void *res;
     UWord size = (UWord) *size_p;
@@ -766,8 +832,9 @@ alcu_mseg_alloc(Allctr_t *allctr, Uint *size_p, Uint flags)
     return res;
 }
 
-static ERTS_INLINE void *
-alcu_mseg_realloc(Allctr_t *allctr, void *seg, Uint old_size, Uint *new_size_p)
+void*
+erts_alcu_mseg_realloc(Allctr_t *allctr, void *seg,
+                       Uint old_size, Uint *new_size_p)
 {
     void *res;
     UWord new_size = (UWord) *new_size_p;
@@ -778,17 +845,103 @@ alcu_mseg_realloc(Allctr_t *allctr, void *seg, Uint old_size, Uint *new_size_p)
     return res;
 }
 
-static ERTS_INLINE void
-alcu_mseg_dealloc(Allctr_t *allctr, void *seg, Uint size, Uint flags)
+void
+erts_alcu_mseg_dealloc(Allctr_t *allctr, void *seg, Uint size, Uint flags)
 {
     erts_mseg_dealloc_opt(allctr->alloc_no, seg, (UWord) size, flags, &allctr->mseg_opt);
     INC_CC(allctr->calls.mseg_dealloc);
 }
 
-#endif
 
-static ERTS_INLINE void *
-alcu_sys_alloc(Allctr_t *allctr, Uint size, int superalign)
+#if defined(ARCH_32)
+
+void*
+erts_alcu_literal_32_mseg_alloc(Allctr_t *allctr, Uint *size_p, Uint flags)
+{
+    void* res;
+    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL
+                   && !allctr->t && allctr->thread_safe);
+
+    res = erts_alcu_mseg_alloc(allctr, size_p, flags);
+    if (res)
+        set_literal_range(res, *size_p);
+    return res;
+}
+
+void*
+erts_alcu_literal_32_mseg_realloc(Allctr_t *allctr, void *seg,
+                               Uint old_size, Uint *new_size_p)
+{
+    void* res;
+    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL
+                   && !allctr->t && allctr->thread_safe);
+
+    if (seg && old_size)
+        clear_literal_range(seg, old_size);
+    res = erts_alcu_mseg_realloc(allctr, seg, old_size, new_size_p);
+    if (res)
+        set_literal_range(res, *new_size_p);
+    return res;
+}
+
+void
+erts_alcu_literal_32_mseg_dealloc(Allctr_t *allctr, void *seg, Uint size,
+                               Uint flags)
+{
+    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL
+                   && !allctr->t && allctr->thread_safe);
+
+    erts_alcu_mseg_dealloc(allctr, seg, size, flags);
+
+    clear_literal_range(seg, size);
+}
+
+#elif defined(ARCH_64) && defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION)
+
+void*
+erts_alcu_literal_64_mseg_alloc(Allctr_t *allctr, Uint *size_p, Uint flags)
+{
+    void* res;
+    UWord size = (UWord) *size_p;
+    Uint32 mmap_flags = ERTS_MMAPFLG_SUPERCARRIER_ONLY;
+    if (flags & ERTS_MSEG_FLG_2POW)
+        mmap_flags |= ERTS_MMAPFLG_SUPERALIGNED;
+
+    res = erts_mmap(&erts_literal_mmapper, mmap_flags, &size);
+    *size_p = (Uint)size;
+    INC_CC(allctr->calls.mseg_alloc);
+    return res;
+}
+
+void*
+erts_alcu_literal_64_mseg_realloc(Allctr_t *allctr, void *seg,
+                               Uint old_size, Uint *new_size_p)
+{
+    void *res;
+    UWord new_size = (UWord) *new_size_p;
+    res = erts_mremap(&erts_literal_mmapper, ERTS_MSEG_FLG_NONE, seg, old_size, &new_size);
+    *new_size_p = (Uint) new_size;
+    INC_CC(allctr->calls.mseg_realloc);
+    return res;
+}
+
+void
+erts_alcu_literal_64_mseg_dealloc(Allctr_t *allctr, void *seg, Uint size,
+                               Uint flags)
+{
+    Uint32 mmap_flags = ERTS_MMAPFLG_SUPERCARRIER_ONLY;
+    if (flags & ERTS_MSEG_FLG_2POW)
+        mmap_flags |= ERTS_MMAPFLG_SUPERALIGNED;
+
+    erts_munmap(&erts_literal_mmapper, mmap_flags, seg, (UWord)size);
+    INC_CC(allctr->calls.mseg_dealloc);
+}
+#endif /* ARCH_64 && ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION */
+
+#endif /* HAVE_ERTS_MSEG */
+
+void*
+erts_alcu_sys_alloc(Allctr_t *allctr, Uint size, int superalign)
 {
     void *res;
 #if ERTS_SA_MB_CARRIERS && ERTS_HAVE_ERTS_SYS_ALIGNED_ALLOC
@@ -803,8 +956,8 @@ alcu_sys_alloc(Allctr_t *allctr, Uint size, int superalign)
     return res;
 }
 
-static ERTS_INLINE void *
-alcu_sys_realloc(Allctr_t *allctr, void *ptr, Uint size, Uint old_size, int superalign)
+void*
+erts_alcu_sys_realloc(Allctr_t *allctr, void *ptr, Uint size, Uint old_size, int superalign)
 {
     void *res;
 
@@ -824,8 +977,8 @@ alcu_sys_realloc(Allctr_t *allctr, void *ptr, Uint size, Uint old_size, int supe
     return res;
 }
 
-static ERTS_INLINE void
-alcu_sys_free(Allctr_t *allctr, void *ptr, int superalign)
+void
+erts_alcu_sys_dealloc(Allctr_t *allctr, void *ptr, Uint size, int superalign)
 {
 #if ERTS_SA_MB_CARRIERS && ERTS_HAVE_ERTS_SYS_ALIGNED_ALLOC
     if (superalign)
@@ -838,6 +991,49 @@ alcu_sys_free(Allctr_t *allctr, void *ptr, int superalign)
 	erts_mtrace_crr_free(allctr->alloc_no, ERTS_ALC_A_SYSTEM, ptr);
 }
 
+#ifdef ARCH_32
+
+void*
+erts_alcu_literal_32_sys_alloc(Allctr_t *allctr, Uint size, int superalign)
+{
+    void* res;
+    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL
+                   && !allctr->t && allctr->thread_safe);
+
+    res = erts_alcu_sys_alloc(allctr, size, 1);
+    if (res)
+        set_literal_range(res, size);
+    return res;
+}
+
+void*
+erts_alcu_literal_32_sys_realloc(Allctr_t *allctr, void *ptr, Uint size, Uint old_size, int superalign)
+{
+    void* res;
+    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL
+                   && !allctr->t && allctr->thread_safe);
+
+    if (ptr && old_size)
+        clear_literal_range(ptr, old_size);
+    res = erts_alcu_sys_realloc(allctr, ptr, size, old_size, 1);
+    if (res)
+        set_literal_range(res, size);
+    return res;
+}
+
+void
+erts_alcu_literal_32_sys_dealloc(Allctr_t *allctr, void *ptr, Uint size, int superalign)
+{
+    ERTS_LC_ASSERT(allctr->alloc_no == ERTS_ALC_A_LITERAL
+                   && !allctr->t && allctr->thread_safe);
+
+    erts_alcu_sys_dealloc(allctr, ptr, size, 1);
+
+    clear_literal_range(ptr, size);
+}
+
+#endif /* ARCH_32 */
+
 static Uint
 get_next_mbc_size(Allctr_t *allctr)
 {
@@ -2084,7 +2280,7 @@ mbc_alloc_block(Allctr_t *allctr, Uint size, Uint *blk_szp)
 
     if (!blk) {
 	blk = create_carrier(allctr, get_blk_sz, CFLG_MBC);
-#if !HALFWORD_HEAP && !ERTS_SUPER_ALIGNED_MSEG_ONLY
+#if !ERTS_SUPER_ALIGNED_MSEG_ONLY
 	if (!blk) {
 	    /* Emergency! We couldn't create the carrier as we wanted.
 	       Try to place it in a sys_alloced sbc. */
@@ -2930,6 +3126,7 @@ cpool_insert(Allctr_t *allctr, Carrier_t *crr)
 
     erts_smp_atomic_set_wb(&crr->allctr,
 			   ((erts_aint_t) allctr)|ERTS_CRR_ALCTR_FLG_IN_POOL);
+    LTTNG3(carrier_pool_put, ERTS_ALC_A2AD(allctr->alloc_no), allctr->ix, CARRIER_SZ(crr));
 }
 
 static void
@@ -3045,6 +3242,7 @@ cpool_fetch(Allctr_t *allctr, UWord size)
     first_old_traitor = allctr->cpool.traitor_list.next;
     cpool_entrance = NULL;
 
+    LTTNG3(carrier_pool_get, ERTS_ALC_A2AD(allctr->alloc_no), allctr->ix, (unsigned long)size);
     /*
      * Search my own pooled_list,
      * i.e my abandoned carriers that were in the pool last time I checked.
@@ -3531,8 +3729,7 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
     int is_mseg = 0;
 #endif
 
-    if (HALFWORD_HEAP
-	|| (ERTS_SUPER_ALIGNED_MSEG_ONLY && (flags & CFLG_MBC))
+    if ((ERTS_SUPER_ALIGNED_MSEG_ONLY && (flags & CFLG_MBC))
 	|| !allow_sys_alloc_carriers) {
 	flags |= CFLG_FORCE_MSEG;
 	flags &= ~CFLG_FORCE_SYS_ALLOC;
@@ -3540,6 +3737,8 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
 	return NULL;
 #endif
     }
+    flags |= allctr->crr_set_flgs;
+    flags &= ~allctr->crr_clr_flgs;
 
     ASSERT((flags & CFLG_SBC && !(flags & CFLG_MBC))
 	   || (flags & CFLG_MBC && !(flags & CFLG_SBC)));
@@ -3555,7 +3754,21 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
 	return NULL;
     }
 
-    blk_sz = UMEMSZ2BLKSZ(allctr, umem_sz);
+    if (flags & CFLG_MAIN_CARRIER) {
+        ASSERT(flags & CFLG_MBC);
+        ASSERT(flags & CFLG_NO_CPOOL);
+        ASSERT(umem_sz == allctr->main_carrier_size);
+        ERTS_UNDEF(blk_sz, 0);
+
+        if (allctr->main_carrier_size < allctr->min_mbc_size)
+            allctr->main_carrier_size = allctr->min_mbc_size;
+        crr_sz = bcrr_sz = allctr->main_carrier_size;
+    }
+    else {
+        ERTS_UNDEF(bcrr_sz, 0);
+	ERTS_UNDEF(crr_sz, 0);
+        blk_sz = UMEMSZ2BLKSZ(allctr, umem_sz);
+    }
 
 #ifdef ERTS_SMP
     allctr->cpool.disable_abandon = ERTS_ALC_CPOOL_MAX_DISABLE_ABANDON;
@@ -3601,13 +3814,15 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
 	mseg_flags = ERTS_MSEG_FLG_NONE;
     }
     else {
-	crr_sz = (*allctr->get_next_mbc_size)(allctr);
-	if (crr_sz < MBC_HEADER_SIZE(allctr) + blk_sz)
-	    crr_sz = MBC_HEADER_SIZE(allctr) + blk_sz;
-	mseg_flags = ERTS_MSEG_FLG_2POW;
+        if (!(flags & CFLG_MAIN_CARRIER)) {
+            crr_sz = (*allctr->get_next_mbc_size)(allctr);
+            if (crr_sz < MBC_HEADER_SIZE(allctr) + blk_sz)
+                crr_sz = MBC_HEADER_SIZE(allctr) + blk_sz;
+        }
+        mseg_flags = ERTS_MSEG_FLG_2POW;
     }
 
-    crr = (Carrier_t *) alcu_mseg_alloc(allctr, &crr_sz, mseg_flags);
+    crr = (Carrier_t *) allctr->mseg_alloc(allctr, &crr_sz, mseg_flags);
     if (!crr) {
 	have_tried_mseg = 1;
 	if (!(have_tried_sys_alloc || flags & CFLG_FORCE_MSEG))
@@ -3639,23 +3854,22 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
     if (flags & CFLG_SBC) {
 	bcrr_sz = blk_sz + SBC_HEADER_SIZE;
     }
-    else {
+    else if (!(flags & CFLG_MAIN_CARRIER)) {
 	bcrr_sz = MBC_HEADER_SIZE(allctr) + blk_sz;
-	if (!(flags & CFLG_MAIN_CARRIER)
-	    && bcrr_sz < allctr->smallest_mbc_size)
-	    bcrr_sz = allctr->smallest_mbc_size;
+	if (bcrr_sz < allctr->smallest_mbc_size)
+            bcrr_sz = allctr->smallest_mbc_size;
     }
 
     crr_sz = (flags & CFLG_FORCE_SIZE
 	      ? UNIT_CEILING(bcrr_sz)
 	      : SYS_ALLOC_CARRIER_CEILING(bcrr_sz));
 
-    crr = (Carrier_t *) alcu_sys_alloc(allctr, crr_sz, flags & CFLG_MBC);
+    crr = (Carrier_t *) allctr->sys_alloc(allctr, crr_sz, flags & CFLG_MBC);
 	
     if (!crr) {
 	if (crr_sz > UNIT_CEILING(bcrr_sz)) {
 	    crr_sz = UNIT_CEILING(bcrr_sz);
-	    crr = (Carrier_t *) alcu_sys_alloc(allctr, crr_sz, flags & CFLG_MBC);
+	    crr = (Carrier_t *) allctr->sys_alloc(allctr, crr_sz, flags & CFLG_MBC);
 	}
 	if (!crr) {
 #if HAVE_ERTS_MSEG
@@ -3714,6 +3928,21 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
 
     }
 
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+    if (LTTNG_ENABLED(carrier_create)) {
+        lttng_decl_carrier_stats(mbc_stats);
+        lttng_decl_carrier_stats(sbc_stats);
+        LTTNG_CARRIER_STATS_TO_LTTNG_STATS(&(allctr->mbcs), mbc_stats);
+        LTTNG_CARRIER_STATS_TO_LTTNG_STATS(&(allctr->sbcs), sbc_stats);
+        LTTNG5(carrier_create,
+                ERTS_ALC_A2AD(allctr->alloc_no),
+                allctr->ix,
+                crr_sz,
+                mbc_stats,
+                sbc_stats);
+    }
+#endif
+
     DEBUG_SAVE_ALIGNMENT(crr);
     return blk;
 }
@@ -3754,7 +3983,7 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags)
 
 	    new_crr_sz = new_blk_sz + SBC_HEADER_SIZE;
 	    new_crr_sz = ERTS_SACRR_UNIT_CEILING(new_crr_sz);
-	    new_crr = (Carrier_t *) alcu_mseg_realloc(allctr,
+	    new_crr = (Carrier_t *) allctr->mseg_realloc(allctr,
 						      old_crr,
 						      old_crr_sz,
 						      &new_crr_sz);
@@ -3769,11 +3998,6 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags)
 		DEBUG_SAVE_ALIGNMENT(new_crr);
 		return new_blk;
 	    }
-#if HALFWORD_HEAP
-	    /* Old carrier unchanged; restore stat */
-	    STAT_MSEG_SBC_ALLOC(allctr, old_crr_sz, old_blk_sz);
-	    return NULL;
-#endif	    
 	    create_flags |= CFLG_FORCE_SYS_ALLOC; /* since mseg_realloc()
 						     failed */
 	}
@@ -3784,7 +4008,7 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags)
 		       (void *) BLK2UMEM(old_blk),
 		       MIN(new_blk_sz, old_blk_sz) - ABLK_HDR_SZ);
 	    unlink_carrier(&allctr->sbc_list, old_crr);
-	    alcu_mseg_dealloc(allctr, old_crr, old_crr_sz, ERTS_MSEG_FLG_NONE);
+            allctr->mseg_dealloc(allctr, old_crr, old_crr_sz, ERTS_MSEG_FLG_NONE);
 	}
 	else {
 	    /* Old carrier unchanged; restore stat */
@@ -3801,7 +4025,7 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags)
 			  ? UNIT_CEILING(new_bcrr_sz)
 			  : SYS_ALLOC_CARRIER_CEILING(new_bcrr_sz));
 
-	    new_crr = (Carrier_t *) alcu_sys_realloc(allctr,
+	    new_crr = (Carrier_t *) allctr->sys_realloc(allctr,
 						     (void *) old_crr,
 						     new_crr_sz,
 						     old_crr_sz,
@@ -3822,7 +4046,7 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags)
 	    else if (new_crr_sz > UNIT_CEILING(new_bcrr_sz)) {
 		new_crr_sz = new_blk_sz + SBC_HEADER_SIZE;
 		new_crr_sz = UNIT_CEILING(new_crr_sz);
-		new_crr = (Carrier_t *) alcu_sys_realloc(allctr,
+		new_crr = (Carrier_t *) allctr->sys_realloc(allctr,
 							 (void *) old_crr,
 							 new_crr_sz,
 							 old_crr_sz,
@@ -3845,7 +4069,7 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags)
 		       (void *) BLK2UMEM(old_blk),
 		       MIN(new_blk_sz, old_blk_sz) - ABLK_HDR_SZ);
 	    unlink_carrier(&allctr->sbc_list, old_crr);
-	    alcu_sys_free(allctr, old_crr, 0);
+	    allctr->sys_dealloc(allctr, old_crr, CARRIER_SZ(old_crr), 0);
 	}
 	else {
 	    /* Old carrier unchanged; restore... */
@@ -3861,13 +4085,13 @@ dealloc_carrier(Allctr_t *allctr, Carrier_t *crr, int superaligned)
 {
 #if HAVE_ERTS_MSEG
     if (IS_MSEG_CARRIER(crr))
-	alcu_mseg_dealloc(allctr, crr, CARRIER_SZ(crr),
+	allctr->mseg_dealloc(allctr, crr, CARRIER_SZ(crr),
 			  (superaligned
 			   ? ERTS_MSEG_FLG_2POW
 			   : ERTS_MSEG_FLG_NONE));
     else
 #endif
-	alcu_sys_free(allctr, crr, superaligned);
+	allctr->sys_dealloc(allctr, crr, CARRIER_SZ(crr), superaligned);
 }
 
 static void
@@ -3942,6 +4166,21 @@ destroy_carrier(Allctr_t *allctr, Block_t *blk, Carrier_t **busy_pcrr_pp)
                 allctr->remove_mbc(allctr, crr);
 	}
 
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+        if (LTTNG_ENABLED(carrier_destroy)) {
+            lttng_decl_carrier_stats(mbc_stats);
+            lttng_decl_carrier_stats(sbc_stats);
+            LTTNG_CARRIER_STATS_TO_LTTNG_STATS(&(allctr->mbcs), mbc_stats);
+            LTTNG_CARRIER_STATS_TO_LTTNG_STATS(&(allctr->sbcs), sbc_stats);
+            LTTNG5(carrier_destroy,
+                ERTS_ALC_A2AD(allctr->alloc_no),
+                allctr->ix,
+                crr_sz,
+                mbc_stats,
+                sbc_stats);
+        }
+#endif
+
 #ifdef ERTS_SMP
 	schedule_dealloc_carrier(allctr, crr);
 #else
@@ -3962,9 +4201,6 @@ static struct {
     Eterm e;
     Eterm t;
     Eterm ramv;
-#if HALFWORD_HEAP
-    Eterm low;
-#endif
     Eterm sbct;
 #if HAVE_ERTS_MSEG
     Eterm asbcst;
@@ -4055,9 +4291,6 @@ init_atoms(Allctr_t *allctr)
 	AM_INIT(e);
 	AM_INIT(t);
 	AM_INIT(ramv);
-#if HALFWORD_HEAP
-	AM_INIT(low);
-#endif
 	AM_INIT(sbct);
 #if HAVE_ERTS_MSEG
 	AM_INIT(asbcst);
@@ -4518,7 +4751,7 @@ make_name_atoms(Allctr_t *allctr)
     size_t prefix_len = strlen(allctr->name_prefix);
 
     if (prefix_len > MAX_ATOM_CHARACTERS + sizeof(realloc) - 1)
-	erl_exit(1,"Too long allocator name: %salloc\n",allctr->name_prefix);
+	erts_exit(ERTS_ERROR_EXIT,"Too long allocator name: %salloc\n",allctr->name_prefix);
 
     memcpy((void *) buf, (void *) allctr->name_prefix, prefix_len);
 
@@ -4663,9 +4896,6 @@ info_options(Allctr_t *allctr,
 		   "option e: true\n"
 		   "option t: %s\n"
 		   "option ramv: %s\n"
-#if HALFWORD_HEAP
-		   "option low: %s\n"
-#endif
 		   "option sbct: %beu\n"
 #if HAVE_ERTS_MSEG
 		   "option asbcst: %bpu\n"
@@ -4684,9 +4914,6 @@ info_options(Allctr_t *allctr,
 		   "option acul: %d\n",
 		   topt,
 		   allctr->ramv ? "true" : "false",
-#if HALFWORD_HEAP
-		   allctr->mseg_opt.low_mem ? "true" : "false",
-#endif
 		   allctr->sbc_threshold,
 #if HAVE_ERTS_MSEG
 		   allctr->mseg_opt.abs_shrink_th,
@@ -4749,9 +4976,6 @@ info_options(Allctr_t *allctr,
 	add_2tup(hpp, szp, &res,
 		 am.sbct,
 		 bld_uint(hpp, szp, allctr->sbc_threshold));
-#if HALFWORD_HEAP
-	add_2tup(hpp, szp, &res, am.low, allctr->mseg_opt.low_mem ? am_true : am_false);
-#endif
 	add_2tup(hpp, szp, &res, am.ramv, allctr->ramv ? am_true : am_false);
 	add_2tup(hpp, szp, &res, am.t, (allctr->t ? am_true : am_false));
 	add_2tup(hpp, szp, &res, am.e, am_true);
@@ -5146,6 +5370,11 @@ do_erts_alcu_alloc(ErtsAlcType_t type, void *extra, Uint size)
 void *erts_alcu_alloc(ErtsAlcType_t type, void *extra, Uint size)
 {
     void *res;
+#ifdef ERTS_SMP
+    ASSERT(!"This is not thread safe");
+#elif defined(USE_THREADS)
+    ASSERT(erts_equal_tids(erts_main_thread, erts_thr_self()));
+#endif
     res = do_erts_alcu_alloc(type, extra, size);
     DEBUG_CHECK_ALIGNMENT(res);
     return res;
@@ -5436,11 +5665,7 @@ do_erts_alcu_realloc(ErtsAlcType_t type,
 	Block_t *new_blk;
 	if(IS_SBC_BLK(blk)) {
 	do_carrier_resize:
-#if HALFWORD_HEAP
-	    new_blk = resize_carrier(allctr, blk, size, CFLG_SBC | CFLG_FORCE_MSEG);
-#else
 	    new_blk = resize_carrier(allctr, blk, size, CFLG_SBC);
-#endif
 	    res = new_blk ? BLK2UMEM(new_blk) : NULL;
 	}
 	else if (alcu_flgs & ERTS_ALCU_FLG_FAIL_REALLOC_MOVE)
@@ -5720,7 +5945,7 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
     /* erts_alcu_start assumes that allctr has been zeroed */
 
     if (((UWord)allctr & ERTS_CRR_ALCTR_FLG_MASK) != 0) {
-        erl_exit(ERTS_ABORT_EXIT, "%s:%d:erts_alcu_start: Alignment error\n",
+        erts_exit(ERTS_ABORT_EXIT, "%s:%d:erts_alcu_start: Alignment error\n",
                  __FILE__, __LINE__);
     }
 
@@ -5734,11 +5959,8 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
 #ifdef ERTS_SMP
     if (init->tspec || init->tpref)
 	allctr->mseg_opt.sched_spec = 1;
-#endif
-# if HALFWORD_HEAP
-    allctr->mseg_opt.low_mem = init->low_mem;
-# endif
-#endif
+#endif /* ERTS_SMP */
+#endif /* HAVE_ERTS_MSEG */
 
     allctr->name_prefix			= init->name_prefix;
     if (!allctr->name_prefix)
@@ -5887,24 +6109,59 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
 					    + ABLK_HDR_SZ)
 			       - ABLK_HDR_SZ);
 
+    if (init->sys_alloc) {
+        ASSERT(init->sys_realloc && init->sys_dealloc);
+        allctr->sys_alloc   = init->sys_alloc;
+        allctr->sys_realloc = init->sys_realloc;
+        allctr->sys_dealloc = init->sys_dealloc;
+    }
+    else {
+        ASSERT(!init->sys_realloc && !init->sys_dealloc);
+        allctr->sys_alloc   = &erts_alcu_sys_alloc;
+        allctr->sys_realloc = &erts_alcu_sys_realloc;
+        allctr->sys_dealloc = &erts_alcu_sys_dealloc;
+    }
+#if HAVE_ERTS_MSEG
+    if (init->mseg_alloc) {
+        ASSERT(init->mseg_realloc && init->mseg_dealloc);
+        allctr->mseg_alloc   = init->mseg_alloc;
+        allctr->mseg_realloc = init->mseg_realloc;
+        allctr->mseg_dealloc = init->mseg_dealloc;
+    }
+    else {
+        ASSERT(!init->mseg_realloc && !init->mseg_dealloc);
+        allctr->mseg_alloc   = &erts_alcu_mseg_alloc;
+        allctr->mseg_realloc = &erts_alcu_mseg_realloc;
+        allctr->mseg_dealloc = &erts_alcu_mseg_dealloc;
+    }
+    /* If a custom carrier alloc function is specified, make sure it's used */
+    if (init->mseg_alloc && !init->sys_alloc) {
+        allctr->crr_set_flgs = CFLG_FORCE_MSEG;
+        allctr->crr_clr_flgs = CFLG_FORCE_SYS_ALLOC;
+    }
+    else if (!init->mseg_alloc && init->sys_alloc) {
+        allctr->crr_set_flgs = CFLG_FORCE_SYS_ALLOC;
+        allctr->crr_clr_flgs = CFLG_FORCE_MSEG;
+    }
+#endif
+
     if (allctr->main_carrier_size) {
 	Block_t *blk;
 
 	blk = create_carrier(allctr,
 			     allctr->main_carrier_size,
-			     CFLG_MBC
+                             (ERTS_SUPER_ALIGNED_MSEG_ONLY
+                              ? CFLG_FORCE_MSEG : CFLG_FORCE_SYS_ALLOC)
+                             | CFLG_MBC
 			     | CFLG_FORCE_SIZE
 			     | CFLG_NO_CPOOL
-#if !HALFWORD_HEAP && !ERTS_SUPER_ALIGNED_MSEG_ONLY
-			     | CFLG_FORCE_SYS_ALLOC
-#endif
 			     | CFLG_MAIN_CARRIER);
 	if (!blk) {
 #ifdef USE_THREADS
 	  if (allctr->thread_safe)
 	    erts_mtx_destroy(&allctr->mutex);
 #endif
-	  erl_exit(ERTS_ABORT_EXIT,
+	  erts_exit(ERTS_ABORT_EXIT,
 	    "Failed to create main carrier for %salloc\n",
 	    init->name_prefix);
 	}
@@ -6049,7 +6306,7 @@ erts_alcu_test(UWord op, UWord a1, UWord a2)
     case 0x019:	return (UWord) PREV_BLK((Block_t *) a1);
     case 0x01a: return (UWord) IS_MBC_FIRST_BLK((Allctr_t*)a1, (Block_t *) a2);
     case 0x01b: return (UWord) sizeof(Unit_t);
-    case 0x01c: return (unsigned long) BLK_TO_MBC((Block_t*) a1);
+    case 0x01c: return (UWord) BLK_TO_MBC((Block_t*) a1);
     case 0x01d: ((Allctr_t*) a1)->add_mbc((Allctr_t*)a1, (Carrier_t*)a2); break;
     case 0x01e: ((Allctr_t*) a1)->remove_mbc((Allctr_t*)a1, (Carrier_t*)a2); break;
 #ifdef ERTS_SMP
@@ -6120,7 +6377,7 @@ erts_alcu_verify_unused(Allctr_t *allctr)
     if (no) {
 	UWord sz = allctr->sbcs.blocks.curr.size;
 	sz += allctr->mbcs.blocks.curr.size;
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "%salloc() used when expected to be unused!\n"
 		 "Total amount of blocks allocated: %bpu\n"
 		 "Total amount of bytes allocated: %bpu\n",
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h
index f4a2ae7ff3..afdff1a71e 100644
--- a/erts/emulator/beam/erl_alloc_util.h
+++ b/erts/emulator/beam/erl_alloc_util.h
@@ -24,6 +24,13 @@
 #define ERTS_ALCU_VSN_STR "3.0"
 
 #include "erl_alloc_types.h"
+#ifdef USE_THREADS
+#define ERL_THREADS_EMU_INTERNAL__
+#include "erl_threads.h"
+#endif
+
+#include "erl_mseg.h"
+#include "lttng-wrapper.h"
 
 #define ERTS_AU_PREF_ALLOC_BITS 11
 #define ERTS_AU_MAX_PREF_ALLOC_INSTANCES (1 << ERTS_AU_PREF_ALLOC_BITS)
@@ -45,7 +52,6 @@ typedef struct {
     int tspec;
     int tpref;
     int ramv;
-    int low_mem;   /* HALFWORD only */
     UWord sbct;
     UWord asbcst;
     UWord rsbcst;
@@ -61,6 +67,15 @@ typedef struct {
 
     void *fix;
     size_t *fix_type_size;
+
+#if HAVE_ERTS_MSEG
+    void* (*mseg_alloc)(Allctr_t*, Uint *size_p, Uint flags);
+    void* (*mseg_realloc)(Allctr_t*, void *seg, Uint old_size, Uint *new_size_p);
+    void  (*mseg_dealloc)(Allctr_t*, void *seg, Uint size, Uint flags);
+#endif
+    void* (*sys_alloc)(Allctr_t *allctr, Uint size, int superalign);
+    void* (*sys_realloc)(Allctr_t *allctr, void *ptr, Uint size, Uint old_size, int superalign);
+    void  (*sys_dealloc)(Allctr_t *allctr, void *ptr, Uint size, int superalign);
 } AllctrInit_t;
 
 typedef struct {
@@ -90,7 +105,6 @@ typedef struct {
     0,			/* (bool)   tspec:  thread specific              */\
     0,			/* (bool)   tpref:  thread preferred             */\
     0,			/* (bool)   ramv:   realloc always moves         */\
-    0,			/* (bool)   low_mem: HALFWORD only               */\
     512*1024,		/* (bytes)  sbct:   sbc threshold                */\
     2*1024*2024,	/* (amount) asbcst: abs sbc shrink threshold     */\
     20,			/* (%)      rsbcst: rel sbc shrink threshold     */\
@@ -125,7 +139,6 @@ typedef struct {
     0,			/* (bool)   tspec:  thread specific              */\
     0,			/* (bool)   tpref:  thread preferred             */\
     0,			/* (bool)   ramv:   realloc always moves         */\
-    0,			/* (bool)   low_mem: HALFWORD only               */\
     64*1024,		/* (bytes)  sbct:   sbc threshold                */\
     2*1024*2024,	/* (amount) asbcst: abs sbc shrink threshold     */\
     20,			/* (%)      rsbcst: rel sbc shrink threshold     */\
@@ -176,20 +189,44 @@ void    erts_alcu_check_delayed_dealloc(Allctr_t *, int, int *, ErtsThrPrgrVal *
 #endif
 erts_aint32_t erts_alcu_fix_alloc_shrink(Allctr_t *, erts_aint32_t);
 
+#ifdef ARCH_32
+extern UWord erts_literal_vspace_map[];
+# define ERTS_VSPACE_WORD_BITS (sizeof(UWord)*8)
+#endif
+
+void* erts_alcu_mseg_alloc(Allctr_t*, Uint *size_p, Uint flags);
+void* erts_alcu_mseg_realloc(Allctr_t*, void *seg, Uint old_size, Uint *new_size_p);
+void  erts_alcu_mseg_dealloc(Allctr_t*, void *seg, Uint size, Uint flags);
+
+#if HAVE_ERTS_MSEG
+# if defined(ARCH_32)
+void* erts_alcu_literal_32_mseg_alloc(Allctr_t*, Uint *size_p, Uint flags);
+void* erts_alcu_literal_32_mseg_realloc(Allctr_t*, void *seg, Uint old_size, Uint *new_size_p);
+void  erts_alcu_literal_32_mseg_dealloc(Allctr_t*, void *seg, Uint size, Uint flags);
+
+# elif defined(ARCH_64) && defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION)
+void* erts_alcu_literal_64_mseg_alloc(Allctr_t*, Uint *size_p, Uint flags);
+void* erts_alcu_literal_64_mseg_realloc(Allctr_t*, void *seg, Uint old_size, Uint *new_size_p);
+void  erts_alcu_literal_64_mseg_dealloc(Allctr_t*, void *seg, Uint size, Uint flags);
+# endif
+#endif /* HAVE_ERTS_MSEG */
+
+void* erts_alcu_sys_alloc(Allctr_t*, Uint size, int superalign);
+void* erts_alcu_sys_realloc(Allctr_t*, void *ptr, Uint size, Uint old_size, int superalign);
+void  erts_alcu_sys_dealloc(Allctr_t*, void *ptr, Uint size, int superalign);
+#ifdef ARCH_32
+void* erts_alcu_literal_32_sys_alloc(Allctr_t*, Uint size, int superalign);
+void* erts_alcu_literal_32_sys_realloc(Allctr_t*, void *ptr, Uint size, Uint old_size, int superalign);
+void  erts_alcu_literal_32_sys_dealloc(Allctr_t*, void *ptr, Uint size, int superalign);
 #endif
 
+#endif /* !ERL_ALLOC_UTIL__ */
+
 #if defined(GET_ERL_ALLOC_UTIL_IMPL) && !defined(ERL_ALLOC_UTIL_IMPL__)
 #define ERL_ALLOC_UTIL_IMPL__
 
 #define ERTS_ALCU_FLG_FAIL_REALLOC_MOVE		(((Uint32) 1) << 0)
 
-#ifdef USE_THREADS
-#define ERL_THREADS_EMU_INTERNAL__
-#include "erl_threads.h"
-#endif
-
-#include "erl_mseg.h"
-
 #undef ERTS_ALLOC_UTIL_HARD_DEBUG
 #ifdef DEBUG
 #  if 0
@@ -223,7 +260,7 @@ erts_aint32_t erts_alcu_fix_alloc_shrink(Allctr_t *, erts_aint32_t);
 
 #if ERTS_HAVE_MSEG_SUPER_ALIGNED \
     || (!HAVE_ERTS_MSEG && ERTS_HAVE_ERTS_SYS_ALIGNED_ALLOC)
-#  ifndef MSEG_ALIGN_BITS
+#  ifdef MSEG_ALIGN_BITS
 #    define ERTS_SUPER_ALIGN_BITS MSEG_ALIGN_BITS
 #  else
 #    define ERTS_SUPER_ALIGN_BITS 18
@@ -381,6 +418,18 @@ typedef struct {
     } blocks;
 } CarriersStats_t;
 
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+#define LTTNG_CARRIER_STATS_TO_LTTNG_STATS(CSP, LSP)            \
+    do {                                                        \
+        (LSP)->carriers.size = (CSP)->curr.norm.mseg.size       \
+                             + (CSP)->curr.norm.sys_alloc.size; \
+        (LSP)->carriers.no   = (CSP)->curr.norm.mseg.no         \
+                             + (CSP)->curr.norm.sys_alloc.no;   \
+        (LSP)->blocks.size   = (CSP)->blocks.curr.size;         \
+        (LSP)->blocks.no     = (CSP)->blocks.curr.no;           \
+    } while (0)
+#endif
+
 #ifdef ERTS_SMP
 
 typedef union ErtsAllctrDDBlock_t_ ErtsAllctrDDBlock_t;
@@ -501,6 +550,8 @@ struct Allctr_t_ {
     Uint		min_mbc_size;
     Uint		min_mbc_first_free_size;
     Uint		min_block_size;
+    UWord               crr_set_flgs;
+    UWord               crr_clr_flgs;
 
     /* Carriers */
     CarrierList_t	mbc_list;
@@ -546,6 +597,15 @@ struct Allctr_t_ {
     void		(*remove_mbc)	        (Allctr_t *, Carrier_t *);
     UWord		(*largest_fblk_in_mbc)  (Allctr_t *, Carrier_t *);
 
+#if HAVE_ERTS_MSEG
+    void*               (*mseg_alloc)(Allctr_t*, Uint *size_p, Uint flags);
+    void*               (*mseg_realloc)(Allctr_t*, void *seg, Uint old_size, Uint *new_size_p);
+    void                (*mseg_dealloc)(Allctr_t*, void *seg, Uint size, Uint flags);
+#endif
+    void*               (*sys_alloc)(Allctr_t *allctr, Uint size, int superalign);
+    void*               (*sys_realloc)(Allctr_t *allctr, void *ptr, Uint size, Uint old_size, int superalign);
+    void                (*sys_dealloc)(Allctr_t *allctr, void *ptr, Uint size, int superalign);
+
     void		(*init_atoms)		(void);
 
 #ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.c b/erts/emulator/beam/erl_ao_firstfit_alloc.c
index 19420af8ab..5cd067ff54 100644
--- a/erts/emulator/beam/erl_ao_firstfit_alloc.c
+++ b/erts/emulator/beam/erl_ao_firstfit_alloc.c
@@ -1035,7 +1035,7 @@ info_options(Allctr_t *allctr,
     if (hpp || szp) {
 	
 	if (!atoms_initialized)
-	    erl_exit(1, "%s:%d: Internal error: Atoms not initialized",
+	    erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error: Atoms not initialized",
 		     __FILE__, __LINE__);;
 
 	res = NIL;
diff --git a/erts/emulator/beam/erl_arith.c b/erts/emulator/beam/erl_arith.c
index b8c5ef9b09..3671025d22 100644
--- a/erts/emulator/beam/erl_arith.c
+++ b/erts/emulator/beam/erl_arith.c
@@ -42,15 +42,8 @@
 #  define MAX(x, y) (((x) > (y)) ? (x) : (y))
 #endif
 
-#if !HEAP_ON_C_STACK
-#  define DECLARE_TMP(VariableName,N,P)  \
-     Eterm *VariableName = ((ERTS_PROC_GET_SCHDATA(P)->erl_arith_tmp_heap) + (2 * N))
-#else
-#  define DECLARE_TMP(VariableName,N,P) \
-     Eterm VariableName[2]
-#endif
-#  define ARG_IS_NOT_TMP(Arg,Tmp) ((Arg) != make_big((Tmp)))
-
+#define DECLARE_TMP(VariableName,N,P)  Eterm VariableName[2]
+#define ARG_IS_NOT_TMP(Arg,Tmp) ((Arg) != make_big((Tmp)))
 
 static Eterm shift(Process* p, Eterm arg1, Eterm arg2, int right);
 
diff --git a/erts/emulator/beam/erl_async.c b/erts/emulator/beam/erl_async.c
index f071898046..69240f7886 100644
--- a/erts/emulator/beam/erl_async.c
+++ b/erts/emulator/beam/erl_async.c
@@ -28,6 +28,7 @@
 #include "erl_thr_queue.h"
 #include "erl_async.h"
 #include "dtrace-wrapper.h"
+#include "lttng-wrapper.h"
 
 #define ERTS_MAX_ASYNC_READY_CALLS_IN_SEQ 20
 
@@ -167,7 +168,6 @@ async_ready_q(Uint sched_id)
 
 #endif
 
-
 void
 erts_init_async(void)
 {
@@ -282,6 +282,13 @@ static ERTS_INLINE void async_add(ErtsAsync *a, ErtsAsyncQ* q)
 #endif
 
     erts_thr_q_enqueue(&q->thr_q, a);
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+    if (LTTNG_ENABLED(aio_pool_add)) {
+        lttng_decl_portbuf(port_str);
+        lttng_portid_to_str(a->port, port_str);
+        LTTNG2(aio_pool_add, port_str, -1);
+    }
+#endif
 #ifdef USE_VM_PROBES
     if (DTRACE_ENABLED(aio_pool_add)) {
         DTRACE_CHARBUF(port_str, 16);
@@ -318,6 +325,14 @@ static ERTS_INLINE ErtsAsync *async_get(ErtsThrQ_t *q,
 	    if (saved_fin_deq)
 		erts_thr_q_append_finalize_dequeue_data(&a->q.fin_deq, &fin_deq);
 #endif
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+            if (LTTNG_ENABLED(aio_pool_get)) {
+                lttng_decl_portbuf(port_str);
+                int length = erts_thr_q_length_dirty(q);
+                lttng_portid_to_str(a->port, port_str);
+                LTTNG2(aio_pool_get, port_str, length);
+            }
+#endif
 #ifdef USE_VM_PROBES
             if (DTRACE_ENABLED(aio_pool_get)) {
                 DTRACE_CHARBUF(port_str, 16);
@@ -401,13 +416,19 @@ static ERTS_INLINE void call_async_ready(ErtsAsync *a)
 				     ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP);
 #endif
     if (!p) {
-	if (a->async_free)
+	if (a->async_free) {
+            ERTS_MSACC_PUSH_AND_SET_STATE(ERTS_MSACC_STATE_PORT);
 	    a->async_free(a->async_data);
+            ERTS_MSACC_POP_STATE();
+        }
     }
     else {
 	if (async_ready(p, a->async_data)) {
-	    if (a->async_free)
+	    if (a->async_free) {
+                ERTS_MSACC_PUSH_AND_SET_STATE(ERTS_MSACC_STATE_PORT);
 		a->async_free(a->async_data);
+                ERTS_MSACC_POP_STATE();
+            }
 	}
 #if ERTS_USE_ASYNC_READY_Q
 	erts_port_release(p);
@@ -461,6 +482,8 @@ static erts_tse_t *async_thread_init(ErtsAsyncQ *aq)
 {
     ErtsThrQInit_t qinit = ERTS_THR_Q_INIT_DEFAULT;
     erts_tse_t *tse = erts_tse_fetch();
+    ERTS_DECLARE_DUMMY(Uint no);
+
 #ifdef ERTS_SMP
     ErtsThrPrgrCallbacks callbacks;
 
@@ -484,10 +507,12 @@ static erts_tse_t *async_thread_init(ErtsAsyncQ *aq)
 
     /* Inform main thread that we are done initializing... */
     erts_mtx_lock(&async->init.data.mtx);
-    async->init.data.no_initialized++;
+    no = async->init.data.no_initialized++;
     erts_cnd_signal(&async->init.data.cnd);
     erts_mtx_unlock(&async->init.data.mtx);
 
+    erts_msacc_init_thread("async", no, 0);
+
     return tse;
 }
 
@@ -495,6 +520,7 @@ static void *async_main(void* arg)
 {
     ErtsAsyncQ *aq = (ErtsAsyncQ *) arg;
     erts_tse_t *tse = async_thread_init(aq);
+    ERTS_MSACC_DECLARE_CACHE();
 
     while (1) {
 	ErtsThrQPrepEnQ_t *prep_enq;
@@ -502,11 +528,14 @@ static void *async_main(void* arg)
 	if (is_nil(a->port))
 	    break; /* Time to die */
 
+        ERTS_MSACC_UPDATE_CACHE();
+
 #if ERTS_ASYNC_PRINT_JOB
 	erts_fprintf(stderr, "<- %ld\n", a->async_id);
 #endif
-
+        ERTS_MSACC_SET_STATE_CACHED(ERTS_MSACC_STATE_PORT);
 	a->async_invoke(a->async_data);
+        ERTS_MSACC_SET_STATE_CACHED(ERTS_MSACC_STATE_OTHER);
 
 	async_reply(a, prep_enq);
     }
@@ -629,10 +658,13 @@ long driver_async(ErlDrvPort ix, unsigned int* key,
     unsigned int qix;
 #if ERTS_USE_ASYNC_READY_Q
     Uint sched_id;
+    ERTS_MSACC_PUSH_STATE();
 
     sched_id = erts_get_scheduler_id();
     if (!sched_id)
 	sched_id = 1;
+#else
+    ERTS_MSACC_PUSH_STATE();
 #endif
 
     prt = erts_drvport2port(ix);
@@ -685,12 +717,17 @@ long driver_async(ErlDrvPort ix, unsigned int* key,
 	return id;
     }
 #endif
-
+    
+    ERTS_MSACC_SET_STATE_CACHED(ERTS_MSACC_STATE_PORT);
     (*a->async_invoke)(a->async_data);
+    ERTS_MSACC_POP_STATE();
 
     if (async_ready(prt, a->async_data)) {
-	if (a->async_free != NULL)
+	if (a->async_free != NULL) {
+            ERTS_MSACC_SET_STATE_CACHED(ERTS_MSACC_STATE_PORT);
 	    (*a->async_free)(a->async_data);
+            ERTS_MSACC_POP_STATE();
+        }
     }
     erts_free(ERTS_ALC_T_ASYNC, (void *) a);
 
diff --git a/erts/emulator/beam/erl_bestfit_alloc.c b/erts/emulator/beam/erl_bestfit_alloc.c
index fb853b65ab..f39a18ac88 100644
--- a/erts/emulator/beam/erl_bestfit_alloc.c
+++ b/erts/emulator/beam/erl_bestfit_alloc.c
@@ -940,7 +940,7 @@ info_options(Allctr_t *allctr,
     if (hpp || szp) {
 	
 	if (!atoms_initialized)
-	    erl_exit(1, "%s:%d: Internal error: Atoms not initialized",
+	    erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error: Atoms not initialized",
 		     __FILE__, __LINE__);;
 
 	res = NIL;
diff --git a/erts/emulator/beam/erl_bif_binary.c b/erts/emulator/beam/erl_bif_binary.c
index 134aa2d396..aec72bd61a 100644
--- a/erts/emulator/beam/erl_bif_binary.c
+++ b/erts/emulator/beam/erl_bif_binary.c
@@ -55,10 +55,8 @@
 
 /* Init and local variables */
 
-static Export binary_match_trap_export;
-static BIF_RETTYPE binary_match_trap(BIF_ALIST_3);
-static Export binary_matches_trap_export;
-static BIF_RETTYPE binary_matches_trap(BIF_ALIST_3);
+static Export binary_find_trap_export;
+static BIF_RETTYPE binary_find_trap(BIF_ALIST_3);
 static Export binary_longest_prefix_trap_export;
 static BIF_RETTYPE binary_longest_prefix_trap(BIF_ALIST_3);
 static Export binary_longest_suffix_trap_export;
@@ -70,19 +68,15 @@ static BIF_RETTYPE binary_copy_trap(BIF_ALIST_2);
 static Uint max_loop_limit;
 
 static BIF_RETTYPE
-binary_match(Process *p, Eterm arg1, Eterm arg2, Eterm arg3);
+binary_match(Process *p, Eterm arg1, Eterm arg2, Eterm arg3, Uint flags);
 static BIF_RETTYPE
-binary_matches(Process *p, Eterm arg1, Eterm arg2, Eterm arg3);
+binary_split(Process *p, Eterm arg1, Eterm arg2, Eterm arg3);
 
 void erts_init_bif_binary(void)
 {
-    erts_init_trap_export(&binary_match_trap_export,
-			  am_erlang, am_binary_match_trap, 3,
-			  &binary_match_trap);
-
-    erts_init_trap_export(&binary_matches_trap_export,
-			  am_erlang, am_binary_matches_trap, 3,
-			  &binary_matches_trap);
+    erts_init_trap_export(&binary_find_trap_export,
+			  am_erlang, am_binary_find_trap, 3,
+			  &binary_find_trap);
 
     erts_init_trap_export(&binary_longest_prefix_trap_export,
 			  am_erlang, am_binary_longest_prefix_trap, 3,
@@ -314,8 +308,8 @@ static BMData *create_bmdata(MyAllocator *my, byte *x, Uint len,
 /*
  * Aho Corasick - Build a Trie and fill in the failure functions
  * when all strings are added.
- * The algorithm is nicely described by Dieter B�hler of University of
- * T�bingen:
+ * The algorithm is nicely described by Dieter Bühler of University of
+ * Tübingen:
  * http://www-sr.informatik.uni-tuebingen.de/~buehler/AC/AC.html
  */
 
@@ -537,21 +531,23 @@ static void ac_init_find_all(ACFindAllState *state, ACTrie *act, Sint startpos,
     state->out = NULL;
 }
 
-static void ac_restore_find_all(ACFindAllState *state, char *buff)
+static void ac_restore_find_all(ACFindAllState *state,
+                                const ACFindAllState *src)
 {
-    memcpy(state,buff,sizeof(ACFindAllState));
+    memcpy(state, src, sizeof(ACFindAllState));
     if (state->allocated > 0) {
 	state->out = erts_alloc(ERTS_ALC_T_TMP, sizeof(FindallData) * (state->allocated));
-	memcpy(state->out,buff+sizeof(ACFindAllState),sizeof(FindallData)*state->m);
+	memcpy(state->out, src+1, sizeof(FindallData)*state->m);
     } else {
 	state->out = NULL;
     }
 }
 
-static void ac_serialize_find_all(ACFindAllState *state, char *buff)
+static void ac_serialize_find_all(const ACFindAllState *state,
+                                  ACFindAllState *dst)
 {
-    memcpy(buff,state,sizeof(ACFindAllState));
-    memcpy(buff+sizeof(ACFindAllState),state->out,sizeof(FindallData)*state->m);
+    memcpy(dst, state, sizeof(ACFindAllState));
+    memcpy(dst+1, state->out, sizeof(FindallData)*state->m);
 }
 
 static void ac_clean_find_all(ACFindAllState *state)
@@ -565,9 +561,6 @@ static void ac_clean_find_all(ACFindAllState *state)
 #endif
 }
 
-#define SIZEOF_AC_SERIALIZED_FIND_ALL_STATE(S) \
-          (sizeof(ACFindAllState)+(sizeof(FindallData)*(S).m))
-
 /*
  * Differs to the find_first function in that it stores all matches and the values
  * arte returned only in the state.
@@ -814,24 +807,24 @@ static void bm_init_find_all(BMFindAllState *state, Sint startpos, Uint len)
     state->out = NULL;
 }
 
-static void bm_restore_find_all(BMFindAllState *state, char *buff)
+static void bm_restore_find_all(BMFindAllState *state,
+                                const BMFindAllState *src)
 {
-    memcpy(state,buff,sizeof(BMFindAllState));
+    memcpy(state, src, sizeof(BMFindAllState));
     if (state->allocated > 0) {
 	state->out = erts_alloc(ERTS_ALC_T_TMP, sizeof(FindallData) *
 				(state->allocated));
-	memcpy(state->out,buff+sizeof(BMFindAllState),
-	       sizeof(FindallData)*state->m);
+	memcpy(state->out, src+1, sizeof(FindallData)*state->m);
     } else {
 	state->out = NULL;
     }
 }
 
-static void bm_serialize_find_all(BMFindAllState *state, char *buff)
+static void bm_serialize_find_all(const BMFindAllState *state,
+                                  BMFindAllState *dst)
 {
-    memcpy(buff,state,sizeof(BMFindAllState));
-    memcpy(buff+sizeof(BMFindAllState),state->out,
-	   sizeof(FindallData)*state->m);
+    memcpy(dst, state, sizeof(BMFindAllState));
+    memcpy(dst+1, state->out, sizeof(FindallData)*state->m);
 }
 
 static void bm_clean_find_all(BMFindAllState *state)
@@ -845,9 +838,6 @@ static void bm_clean_find_all(BMFindAllState *state)
 #endif
 }
 
-#define SIZEOF_BM_SERIALIZED_FIND_ALL_STATE(S) \
-          (sizeof(BMFindAllState)+(sizeof(FindallData)*(S).m))
-
 /*
  * Differs to the find_first function in that it stores all matches and the
  * values are returned only in the state.
@@ -1030,283 +1020,142 @@ BIF_RETTYPE binary_compile_pattern_1(BIF_ALIST_1)
 #define DO_BIN_MATCH_BADARG -1
 #define DO_BIN_MATCH_RESTART -2
 
-static int do_binary_match(Process *p, Eterm subject, Uint hsstart, Uint hsend,
-			   Eterm type, Binary *bin, Eterm state_term,
-			   Eterm *res_term)
-{
-    byte *bytes;
-    Uint bitoffs, bitsize;
-    byte *temp_alloc = NULL;
-
-    ERTS_GET_BINARY_BYTES(subject, bytes, bitoffs, bitsize);
-    if (bitsize != 0) {
-	goto badarg;
-    }
-    if (bitoffs != 0) {
-	bytes = erts_get_aligned_binary_bytes(subject, &temp_alloc);
-    }
-    if (state_term != NIL) {
-	Eterm *ptr = big_val(state_term);
-	type = ptr[1];
-    }
-
-    if (type == am_bm) {
-	BMData *bm;
-	Sint pos;
-	Eterm ret;
-	Eterm *hp;
-	BMFindFirstState state;
-	Uint reds = get_reds(p, BM_LOOP_FACTOR);
-	Uint save_reds = reds;
-
-	bm = (BMData *) ERTS_MAGIC_BIN_DATA(bin);
-#ifdef HARDDEBUG
-	dump_bm_data(bm);
-#endif
-	if (state_term == NIL) {
-	    bm_init_find_first_match(&state, hsstart, hsend);
-	} else {
-	    Eterm *ptr = big_val(state_term);
-	    memcpy(&state,ptr+2,sizeof(state));
-	}
-#ifdef HARDDEBUG
-	erts_printf("(bm) state->pos = %ld, state->len = %lu\n",state.pos,
-		    state.len);
-#endif
-	pos = bm_find_first_match(&state, bm, bytes, &reds);
-	if (pos == BM_NOT_FOUND) {
-	    ret = am_nomatch;
-	} else if (pos == BM_RESTART) {
-	    int x = (sizeof(BMFindFirstState) / sizeof(Eterm)) +
-		!!(sizeof(BMFindFirstState) % sizeof(Eterm));
-#ifdef HARDDEBUG
-	    erts_printf("Trap bm!\n");
-#endif
-	    hp = HAlloc(p,x+2);
-	    hp[0] = make_pos_bignum_header(x+1);
-	    hp[1] = type;
-	    memcpy(hp+2,&state,sizeof(state));
-	    *res_term = make_big(hp);
-	    erts_free_aligned_binary_bytes(temp_alloc);
-	    return DO_BIN_MATCH_RESTART;
-	} else {
-	    Eterm erlen = erts_make_integer((Uint) bm->len, p);
-	    ret = erts_make_integer(pos,p);
-	    hp = HAlloc(p,3);
-	    ret = TUPLE2(hp, ret, erlen);
-	}
-	erts_free_aligned_binary_bytes(temp_alloc);
-	BUMP_REDS(p, (save_reds - reds) / BM_LOOP_FACTOR);
-	*res_term = ret;
-	return DO_BIN_MATCH_OK;
-    } else if (type == am_ac) {
-	ACTrie *act;
-	Uint pos, rlen;
-	int acr;
-	ACFindFirstState state;
-	Eterm ret;
-	Eterm *hp;
-	Uint reds = get_reds(p, AC_LOOP_FACTOR);
-	Uint save_reds = reds;
+#define BINARY_FIND_ALL		0x01
+#define BINARY_SPLIT_TRIM	0x02
+#define BINARY_SPLIT_TRIM_ALL	0x04
 
-	act = (ACTrie *) ERTS_MAGIC_BIN_DATA(bin);
-#ifdef HARDDEBUG
-	dump_ac_trie(act);
-#endif
-	if (state_term == NIL) {
-	    ac_init_find_first_match(&state, act, hsstart, hsend);
-	} else {
-	    Eterm *ptr = big_val(state_term);
-	    memcpy(&state,ptr+2,sizeof(state));
-	}
-	acr = ac_find_first_match(&state, bytes, &pos, &rlen, &reds);
-	if (acr == AC_NOT_FOUND) {
-	    ret = am_nomatch;
-	} else if (acr == AC_RESTART) {
-	    int x = (sizeof(state) / sizeof(Eterm)) +
-		!!(sizeof(ACFindFirstState) % sizeof(Eterm));
-#ifdef HARDDEBUG
-	    erts_printf("Trap ac!\n");
-#endif
-	    hp = HAlloc(p,x+2);
-	    hp[0] = make_pos_bignum_header(x+1);
-	    hp[1] = type;
-	    memcpy(hp+2,&state,sizeof(state));
-	    *res_term = make_big(hp);
-	    erts_free_aligned_binary_bytes(temp_alloc);
-	    return DO_BIN_MATCH_RESTART;
-	} else {
-	    Eterm epos = erts_make_integer(pos,p);
-	    Eterm erlen = erts_make_integer(rlen,p);
-	    hp = HAlloc(p,3);
-	    ret = TUPLE2(hp, epos, erlen);
-	}
-	erts_free_aligned_binary_bytes(temp_alloc);
-	BUMP_REDS(p, (save_reds - reds) / AC_LOOP_FACTOR);
-	*res_term = ret;
-	return DO_BIN_MATCH_OK;
-    }
- badarg:
-    return DO_BIN_MATCH_BADARG;
-}
+typedef struct BinaryFindState {
+    Eterm type;
+    Uint  flags;
+    Uint  hsstart;
+    Uint  hsend;
+    Eterm (*not_found_result) (Process *, Eterm, struct BinaryFindState *);
+    Eterm (*single_result)    (Process *, Eterm, struct BinaryFindState *, Sint, Sint);
+    Eterm (*global_result)    (Process *, Eterm, struct BinaryFindState *, FindallData *, Uint);
+} BinaryFindState;
+
+typedef struct BinaryFindState_bignum {
+    Eterm           bignum_hdr;
+    BinaryFindState bfs;
+    union {
+	BMFindFirstState bmffs;
+	BMFindAllState   bmfas;
+	ACFindFirstState acffs;
+	ACFindAllState   acfas;
+    } data;
+} BinaryFindState_bignum;
+
+#define SIZEOF_BINARY_FIND_STATE(S) \
+	  (sizeof(BinaryFindState)+sizeof(S))
+
+#define SIZEOF_BINARY_FIND_ALL_STATE(S) \
+	  (sizeof(BinaryFindState)+sizeof(S)+(sizeof(FindallData)*(S).m))
+
+static Eterm do_match_not_found_result(Process *p, Eterm subject, BinaryFindState *bfs);
+static Eterm do_match_single_result(Process *p, Eterm subject, BinaryFindState *bfs,
+				    Sint pos, Sint len);
+static Eterm do_match_global_result(Process *p, Eterm subject, BinaryFindState *bfs,
+				    FindallData *fad, Uint fad_sz);
+static Eterm do_split_not_found_result(Process *p, Eterm subject, BinaryFindState *bfs);
+static Eterm do_split_single_result(Process *p, Eterm subject, BinaryFindState *bfs,
+				    Sint pos, Sint len);
+static Eterm do_split_global_result(Process *p, Eterm subject, BinaryFindState *bfs,
+				    FindallData *fad, Uint fad_sz);
 
-static int do_binary_matches(Process *p, Eterm subject, Uint hsstart,
-			     Uint hsend, Eterm type, Binary *bin,
-			     Eterm state_term, Eterm *res_term)
+static int parse_match_opts_list(Eterm l, Eterm bin, Uint *posp, Uint *endp)
 {
-    byte *bytes;
-    Uint bitoffs, bitsize;
-    byte *temp_alloc = NULL;
-
-    ERTS_GET_BINARY_BYTES(subject, bytes, bitoffs, bitsize);
-    if (bitsize != 0) {
-	goto badarg;
-    }
-    if (bitoffs != 0) {
-	bytes = erts_get_aligned_binary_bytes(subject, &temp_alloc);
-    }
-    if (state_term != NIL) {
-	Eterm *ptr = big_val(state_term);
-	type = ptr[1];
-    }
-
-    if (type == am_bm) {
-	BMData *bm;
-	Sint pos;
-	Eterm ret,tpl;
-	Eterm *hp;
-	BMFindAllState state;
-	Uint reds = get_reds(p, BM_LOOP_FACTOR);
-	Uint save_reds = reds;
-
-	bm = (BMData *) ERTS_MAGIC_BIN_DATA(bin);
-#ifdef HARDDEBUG
-	dump_bm_data(bm);
-#endif
-	if (state_term == NIL) {
-	    bm_init_find_all(&state, hsstart, hsend);
-	} else {
-	    Eterm *ptr = big_val(state_term);
-	    bm_restore_find_all(&state,(char *) (ptr+2));
-	}
-
-	pos = bm_find_all_non_overlapping(&state, bm, bytes, &reds);
-	if (pos == BM_NOT_FOUND) {
-	    ret = NIL;
-	} else if (pos == BM_RESTART) {
-	    int x =
-		(SIZEOF_BM_SERIALIZED_FIND_ALL_STATE(state) / sizeof(Eterm)) +
-		!!(SIZEOF_BM_SERIALIZED_FIND_ALL_STATE(state) % sizeof(Eterm));
-#ifdef HARDDEBUG
-	    erts_printf("Trap bm!\n");
-#endif
-	    hp = HAlloc(p,x+2);
-	    hp[0] = make_pos_bignum_header(x+1);
-	    hp[1] = type;
-	    bm_serialize_find_all(&state, (char *) (hp+2));
-	    *res_term = make_big(hp);
-	    erts_free_aligned_binary_bytes(temp_alloc);
-	    bm_clean_find_all(&state);
-	    return DO_BIN_MATCH_RESTART;
-	} else {
-	    FindallData *fad = state.out;
-	    int i;
-	    for (i = 0; i < state.m; ++i) {
-		fad[i].epos = erts_make_integer(fad[i].pos,p);
-		fad[i].elen = erts_make_integer(fad[i].len,p);
+    Eterm *tp;
+    Uint pos;
+    Sint len;
+    if (l == THE_NON_VALUE || l == NIL) {
+	/* Invalid term or NIL, we're called from binary_match(es)_2 or
+	   have no options*/
+	*posp = 0;
+	*endp = binary_size(bin);
+	return 0;
+    } else if (is_list(l)) {
+	while(is_list(l)) {
+	    Eterm t = CAR(list_val(l));
+	    Uint orig_size;
+	    if (!is_tuple(t)) {
+		goto badarg;
 	    }
-	    hp = HAlloc(p,state.m * (3 + 2));
-	    ret = NIL;
-	    for (i = state.m - 1; i >= 0; --i) {
-		tpl = TUPLE2(hp, fad[i].epos, fad[i].elen);
-		hp +=3;
-		ret = CONS(hp,tpl,ret);
-		hp += 2;
+	    tp = tuple_val(t);
+	    if (arityval(*tp) != 2) {
+		goto badarg;
 	    }
-	}
-	erts_free_aligned_binary_bytes(temp_alloc);
-	bm_clean_find_all(&state);
-	BUMP_REDS(p, (save_reds - reds) / BM_LOOP_FACTOR);
-	*res_term = ret;
-	return DO_BIN_MATCH_OK;
-    } else if (type == am_ac) {
-	ACTrie *act;
-	int acr;
-	ACFindAllState state;
-	Eterm ret,tpl;
-	Eterm *hp;
-	Uint reds = get_reds(p, AC_LOOP_FACTOR);
-	Uint save_reds = reds;
-
-	act = (ACTrie *) ERTS_MAGIC_BIN_DATA(bin);
-#ifdef HARDDEBUG
-	dump_ac_trie(act);
-#endif
-	if (state_term == NIL) {
-	    ac_init_find_all(&state, act, hsstart, hsend);
-	} else {
-	    Eterm *ptr = big_val(state_term);
-	    ac_restore_find_all(&state,(char *) (ptr+2));
-	}
-	acr = ac_find_all_non_overlapping(&state, bytes, &reds);
-	if (acr == AC_NOT_FOUND) {
-	    ret = NIL;
-	} else if (acr == AC_RESTART) {
-	    int x =
-		(SIZEOF_AC_SERIALIZED_FIND_ALL_STATE(state) / sizeof(Eterm)) +
-		!!(SIZEOF_AC_SERIALIZED_FIND_ALL_STATE(state) % sizeof(Eterm));
-#ifdef HARDDEBUG
-	    erts_printf("Trap ac!\n");
-#endif
-	    hp = HAlloc(p,x+2);
-	    hp[0] = make_pos_bignum_header(x+1);
-	    hp[1] = type;
-	    ac_serialize_find_all(&state, (char *) (hp+2));
-	    *res_term = make_big(hp);
-	    erts_free_aligned_binary_bytes(temp_alloc);
-	    ac_clean_find_all(&state);
-	    return DO_BIN_MATCH_RESTART;
-	} else {
-	    FindallData *fad = state.out;
-	    int i;
-	    for (i = 0; i < state.m; ++i) {
-		fad[i].epos = erts_make_integer(fad[i].pos,p);
-		fad[i].elen = erts_make_integer(fad[i].len,p);
+	    if (tp[1] != am_scope || is_not_tuple(tp[2])) {
+		goto badarg;
 	    }
-	    hp = HAlloc(p,state.m * (3 + 2));
-	    ret = NIL;
-	    for (i = state.m - 1; i >= 0; --i) {
-		tpl = TUPLE2(hp, fad[i].epos, fad[i].elen);
-		hp +=3;
-		ret = CONS(hp,tpl,ret);
-		hp += 2;
+	    tp = tuple_val(tp[2]);
+	    if (arityval(*tp) != 2) {
+		goto badarg;
+	    }
+	    if (!term_to_Uint(tp[1], &pos)) {
+		goto badarg;
 	    }
+	    if (!term_to_Sint(tp[2], &len)) {
+		goto badarg;
+	    }
+	    if (len < 0) {
+		Uint lentmp = -(Uint)len;
+		/* overflow */
+		if ((Sint)lentmp < 0) {
+		    goto badarg;
+		}
+		len = lentmp;
+		pos -= len;
+	    }
+	    /* overflow */
+	    if ((pos + len) < pos || (len > 0 && (pos + len) == pos)) {
+		goto badarg;
+	    }
+	    *endp = len + pos;
+	    *posp = pos;
+	    if ((orig_size = binary_size(bin)) < pos ||
+		orig_size < (*endp)) {
+		goto badarg;
+	    }
+	    l = CDR(list_val(l));
 	}
-	erts_free_aligned_binary_bytes(temp_alloc);
-	ac_clean_find_all(&state);
-	BUMP_REDS(p, (save_reds - reds) / AC_LOOP_FACTOR);
-	*res_term = ret;
-	return DO_BIN_MATCH_OK;
+	return 0;
+    } else {
+    badarg:
+	return 1;
     }
- badarg:
-    return DO_BIN_MATCH_BADARG;
 }
 
-static int parse_match_opts_list(Eterm l, Eterm bin, Uint *posp, Uint *endp)
+static int parse_split_opts_list(Eterm l, Eterm bin, Uint *posp, Uint *endp, Uint *optp)
 {
     Eterm *tp;
     Uint pos;
     Sint len;
-    if (l == ((Eterm) 0) || l == NIL) {
-	/* Invalid term or NIL, we're called from binary_match(es)_2 or
-	   have no options*/
-	*posp = 0;
-	*endp = binary_size(bin);
+    *optp = 0;
+    *posp = 0;
+    *endp = binary_size(bin);
+    if (l == THE_NON_VALUE || l == NIL) {
 	return 0;
     } else if (is_list(l)) {
 	while(is_list(l)) {
 	    Eterm t = CAR(list_val(l));
 	    Uint orig_size;
+	    if (is_atom(t)) {
+		if (t == am_global) {
+		    *optp |= BINARY_FIND_ALL;
+		    l = CDR(list_val(l));
+		    continue;
+		}
+		if (t == am_trim) {
+		    *optp |= BINARY_SPLIT_TRIM;
+		    l = CDR(list_val(l));
+		    continue;
+		}
+		if (t == am_trim_all) {
+		    *optp |= BINARY_SPLIT_TRIM_ALL;
+		    l = CDR(list_val(l));
+		    continue;
+		}
+	    }
 	    if (!is_tuple(t)) {
 		goto badarg;
 	    }
@@ -1355,48 +1204,207 @@ static int parse_match_opts_list(Eterm l, Eterm bin, Uint *posp, Uint *endp)
     }
 }
 
-static BIF_RETTYPE binary_match_trap(BIF_ALIST_3)
+static int do_binary_find(Process *p, Eterm subject, BinaryFindState *bfs, Binary *bin,
+			  Eterm state_term, Eterm *res_term)
 {
-    int runres;
-    Eterm result;
-    Binary *bin = ((ProcBin *) binary_val(BIF_ARG_3))->val;
-    runres = do_binary_match(BIF_P,BIF_ARG_1,0,0,NIL,bin,BIF_ARG_2,&result);
-    if (runres == DO_BIN_MATCH_OK) {
-	BIF_RET(result);
-    } else {
-	BUMP_ALL_REDS(BIF_P);
-	BIF_TRAP3(&binary_match_trap_export, BIF_P, BIF_ARG_1, result,
-		  BIF_ARG_3);
+    byte *bytes;
+    Uint bitoffs, bitsize;
+    byte *temp_alloc = NULL;
+    BinaryFindState_bignum *state_ptr = NULL;
+
+    ERTS_GET_BINARY_BYTES(subject, bytes, bitoffs, bitsize);
+    if (bitsize != 0) {
+	goto badarg;
+    }
+    if (bitoffs != 0) {
+	bytes = erts_get_aligned_binary_bytes(subject, &temp_alloc);
+    }
+    if (state_term != NIL) {
+	state_ptr = (BinaryFindState_bignum *)(big_val(state_term));
+	bfs = &(state_ptr->bfs);
     }
-}
 
-static BIF_RETTYPE binary_matches_trap(BIF_ALIST_3)
-{
-    int runres;
-    Eterm result;
-    Binary *bin = ((ProcBin *) binary_val(BIF_ARG_3))->val;
-    runres = do_binary_matches(BIF_P,BIF_ARG_1,0,0,NIL,bin,BIF_ARG_2,&result);
-    if (runres == DO_BIN_MATCH_OK) {
-	BIF_RET(result);
+    if (bfs->flags & BINARY_FIND_ALL) {
+	if (bfs->type == am_bm) {
+	    BMData *bm;
+	    Sint pos;
+	    BMFindAllState state;
+	    Uint reds = get_reds(p, BM_LOOP_FACTOR);
+	    Uint save_reds = reds;
+
+	    bm = (BMData *) ERTS_MAGIC_BIN_DATA(bin);
+#ifdef HARDDEBUG
+	    dump_bm_data(bm);
+#endif
+	    if (state_term == NIL) {
+		bm_init_find_all(&state, bfs->hsstart, bfs->hsend);
+	    } else {
+		bm_restore_find_all(&state, &(state_ptr->data.bmfas));
+	    }
+
+	    pos = bm_find_all_non_overlapping(&state, bm, bytes, &reds);
+	    if (pos == BM_NOT_FOUND) {
+		*res_term = bfs->not_found_result(p, subject, bfs);
+	    } else if (pos == BM_RESTART) {
+		int x =
+		    (SIZEOF_BINARY_FIND_ALL_STATE(state) / sizeof(Eterm)) +
+		    !!(SIZEOF_BINARY_FIND_ALL_STATE(state) % sizeof(Eterm));
+#ifdef HARDDEBUG
+		erts_printf("Trap bm!\n");
+#endif
+		state_ptr = (BinaryFindState_bignum*) HAlloc(p, x+1);
+		state_ptr->bignum_hdr = make_pos_bignum_header(x);
+		memcpy(&state_ptr->bfs, bfs, sizeof(BinaryFindState));
+		bm_serialize_find_all(&state, &state_ptr->data.bmfas);
+		*res_term = make_big(&state_ptr->bignum_hdr);
+		erts_free_aligned_binary_bytes(temp_alloc);
+		bm_clean_find_all(&state);
+		return DO_BIN_MATCH_RESTART;
+	    } else {
+		*res_term = bfs->global_result(p, subject, bfs, state.out, state.m);
+	    }
+	    erts_free_aligned_binary_bytes(temp_alloc);
+	    bm_clean_find_all(&state);
+	    BUMP_REDS(p, (save_reds - reds) / BM_LOOP_FACTOR);
+	    return DO_BIN_MATCH_OK;
+	} else if (bfs->type == am_ac) {
+	    ACTrie *act;
+	    int acr;
+	    ACFindAllState state;
+	    Uint reds = get_reds(p, AC_LOOP_FACTOR);
+	    Uint save_reds = reds;
+
+	    act = (ACTrie *) ERTS_MAGIC_BIN_DATA(bin);
+#ifdef HARDDEBUG
+	    dump_ac_trie(act);
+#endif
+	    if (state_term == NIL) {
+		ac_init_find_all(&state, act, bfs->hsstart, bfs->hsend);
+	    } else {
+		ac_restore_find_all(&state, &(state_ptr->data.acfas));
+	    }
+	    acr = ac_find_all_non_overlapping(&state, bytes, &reds);
+	    if (acr == AC_NOT_FOUND) {
+		*res_term = bfs->not_found_result(p, subject, bfs);
+	    } else if (acr == AC_RESTART) {
+		int x =
+		    (SIZEOF_BINARY_FIND_ALL_STATE(state) / sizeof(Eterm)) +
+		    !!(SIZEOF_BINARY_FIND_ALL_STATE(state) % sizeof(Eterm));
+#ifdef HARDDEBUG
+		erts_printf("Trap ac!\n");
+#endif
+                state_ptr = (BinaryFindState_bignum*) HAlloc(p, x+1);
+		state_ptr->bignum_hdr = make_pos_bignum_header(x);
+		memcpy(&state_ptr->bfs, bfs, sizeof(BinaryFindState));
+		ac_serialize_find_all(&state, &state_ptr->data.acfas);
+		*res_term = make_big(&state_ptr->bignum_hdr);
+		erts_free_aligned_binary_bytes(temp_alloc);
+		ac_clean_find_all(&state);
+		return DO_BIN_MATCH_RESTART;
+	    } else {
+		*res_term = bfs->global_result(p, subject, bfs, state.out, state.m);
+	    }
+	    erts_free_aligned_binary_bytes(temp_alloc);
+	    ac_clean_find_all(&state);
+	    BUMP_REDS(p, (save_reds - reds) / AC_LOOP_FACTOR);
+	    return DO_BIN_MATCH_OK;
+	}
     } else {
-	BUMP_ALL_REDS(BIF_P);
-	BIF_TRAP3(&binary_matches_trap_export, BIF_P, BIF_ARG_1, result,
-		  BIF_ARG_3);
-    }
-}
+	if (bfs->type == am_bm) {
+	    BMData *bm;
+	    Sint pos;
+	    BMFindFirstState state;
+	    Uint reds = get_reds(p, BM_LOOP_FACTOR);
+	    Uint save_reds = reds;
+
+	    bm = (BMData *) ERTS_MAGIC_BIN_DATA(bin);
+#ifdef HARDDEBUG
+	    dump_bm_data(bm);
+#endif
+	    if (state_term == NIL) {
+		bm_init_find_first_match(&state, bfs->hsstart, bfs->hsend);
+	    } else {
+		memcpy(&state, &state_ptr->data.bmffs, sizeof(BMFindFirstState));
+	    }
 
-BIF_RETTYPE binary_match_3(BIF_ALIST_3)
-{
-    return binary_match(BIF_P, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3);
+#ifdef HARDDEBUG
+	    erts_printf("(bm) state->pos = %ld, state->len = %lu\n",state.pos,
+			state.len);
+#endif
+	    pos = bm_find_first_match(&state, bm, bytes, &reds);
+	    if (pos == BM_NOT_FOUND) {
+		*res_term = bfs->not_found_result(p, subject, bfs);
+	    } else if (pos == BM_RESTART) {
+		int x =
+		    (SIZEOF_BINARY_FIND_STATE(state) / sizeof(Eterm)) +
+		    !!(SIZEOF_BINARY_FIND_STATE(state) % sizeof(Eterm));
+#ifdef HARDDEBUG
+		erts_printf("Trap bm!\n");
+#endif
+                state_ptr = (BinaryFindState_bignum*) HAlloc(p, x+1);
+                state_ptr->bignum_hdr = make_pos_bignum_header(x);
+		memcpy(&state_ptr->bfs, bfs, sizeof(BinaryFindState));
+		memcpy(&state_ptr->data.acffs, &state, sizeof(BMFindFirstState));
+		*res_term = make_big(&state_ptr->bignum_hdr);
+		erts_free_aligned_binary_bytes(temp_alloc);
+		return DO_BIN_MATCH_RESTART;
+	    } else {
+		*res_term = bfs->single_result(p, subject, bfs, pos, bm->len);
+	    }
+	    erts_free_aligned_binary_bytes(temp_alloc);
+	    BUMP_REDS(p, (save_reds - reds) / BM_LOOP_FACTOR);
+	    return DO_BIN_MATCH_OK;
+	} else if (bfs->type == am_ac) {
+	    ACTrie *act;
+	    Uint pos, rlen;
+	    int acr;
+	    ACFindFirstState state;
+	    Uint reds = get_reds(p, AC_LOOP_FACTOR);
+	    Uint save_reds = reds;
+
+	    act = (ACTrie *) ERTS_MAGIC_BIN_DATA(bin);
+#ifdef HARDDEBUG
+	    dump_ac_trie(act);
+#endif
+	    if (state_term == NIL) {
+		ac_init_find_first_match(&state, act, bfs->hsstart, bfs->hsend);
+	    } else {
+		memcpy(&state, &state_ptr->data.acffs, sizeof(ACFindFirstState));
+	    }
+	    acr = ac_find_first_match(&state, bytes, &pos, &rlen, &reds);
+	    if (acr == AC_NOT_FOUND) {
+		*res_term = bfs->not_found_result(p, subject, bfs);
+	    } else if (acr == AC_RESTART) {
+		int x =
+		    (SIZEOF_BINARY_FIND_STATE(state) / sizeof(Eterm)) +
+		    !!(SIZEOF_BINARY_FIND_STATE(state) % sizeof(Eterm));
+#ifdef HARDDEBUG
+		erts_printf("Trap ac!\n");
+#endif
+		state_ptr = (BinaryFindState_bignum*) HAlloc(p, x+1);
+		state_ptr->bignum_hdr = make_pos_bignum_header(x);
+		memcpy(&state_ptr->bfs, bfs, sizeof(BinaryFindState));
+		memcpy(&state_ptr->data.acffs, &state, sizeof(ACFindFirstState));
+		*res_term = make_big(&state_ptr->bignum_hdr);
+		erts_free_aligned_binary_bytes(temp_alloc);
+		return DO_BIN_MATCH_RESTART;
+	    } else {
+		*res_term = bfs->single_result(p, subject, bfs, pos, rlen);
+	    }
+	    erts_free_aligned_binary_bytes(temp_alloc);
+	    BUMP_REDS(p, (save_reds - reds) / AC_LOOP_FACTOR);
+	    return DO_BIN_MATCH_OK;
+	}
+    }
+ badarg:
+    return DO_BIN_MATCH_BADARG;
 }
 
 static BIF_RETTYPE
-binary_match(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
+binary_match(Process *p, Eterm arg1, Eterm arg2, Eterm arg3, Uint flags)
 {
-    Uint hsstart;
-    Uint hsend;
+    BinaryFindState bfs;
     Eterm *tp;
-    Eterm type;
     Binary *bin;
     Eterm bin_term = NIL;
     int runres;
@@ -1405,11 +1413,12 @@ binary_match(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
     if (is_not_binary(arg1)) {
 	goto badarg;
     }
-    if (parse_match_opts_list(arg3,arg1,&hsstart,&hsend)) {
+    bfs.flags = flags;
+    if (parse_match_opts_list(arg3, arg1, &(bfs.hsstart), &(bfs.hsend))) {
 	goto badarg;
     }
-    if (hsend == 0) {
-	BIF_RET(am_nomatch);
+    if (bfs.hsend == 0) {
+	BIF_RET(do_match_not_found_result(p, arg1, &bfs));
     }
     if (is_tuple(arg2)) {
 	tp = tuple_val(arg2);
@@ -1420,21 +1429,24 @@ binary_match(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
 	    !ERTS_TERM_IS_MAGIC_BINARY(tp[2])) {
 	    goto badarg;
 	}
-	type = tp[1];
+	bfs.type = tp[1];
 	bin = ((ProcBin *) binary_val(tp[2]))->val;
-	if (type == am_bm &&
+	if (bfs.type == am_bm &&
 	    ERTS_MAGIC_BIN_DESTRUCTOR(bin) != cleanup_my_data_bm) {
 	    goto badarg;
 	}
-	if (type == am_ac &&
+	if (bfs.type == am_ac &&
 	    ERTS_MAGIC_BIN_DESTRUCTOR(bin) != cleanup_my_data_ac) {
 	    goto badarg;
 	}
 	bin_term = tp[2];
-    } else if (do_binary_match_compile(arg2,&type,&bin)) {
+    } else if (do_binary_match_compile(arg2, &(bfs.type), &bin)) {
 	goto badarg;
     }
-    runres = do_binary_match(p,arg1,hsstart,hsend,type,bin,NIL,&result);
+    bfs.not_found_result = &do_match_not_found_result;
+    bfs.single_result = &do_match_single_result;
+    bfs.global_result = &do_match_global_result;
+    runres = do_binary_find(p, arg1, &bfs, bin, NIL, &result);
     if (runres == DO_BIN_MATCH_RESTART && bin_term == NIL) {
 	Eterm *hp = HAlloc(p, PROC_BIN_SIZE);
 	bin_term = erts_mk_magic_binary_term(&hp, &MSO(p), bin);
@@ -1446,7 +1458,7 @@ binary_match(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
 	BIF_RET(result);
     case DO_BIN_MATCH_RESTART:
 	BUMP_ALL_REDS(p);
-	BIF_TRAP3(&binary_match_trap_export, p, arg1, result, bin_term);
+	BIF_TRAP3(&binary_find_trap_export, p, arg1, result, bin_term);
     default:
 	goto badarg;
     }
@@ -1454,17 +1466,31 @@ binary_match(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
     BIF_ERROR(p,BADARG);
 }
 
+BIF_RETTYPE binary_match_2(BIF_ALIST_2)
+{
+    return binary_match(BIF_P, BIF_ARG_1, BIF_ARG_2, THE_NON_VALUE, 0);
+}
+
+BIF_RETTYPE binary_match_3(BIF_ALIST_3)
+{
+    return binary_match(BIF_P, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3, 0);
+}
+
+BIF_RETTYPE binary_matches_2(BIF_ALIST_2)
+{
+    return binary_match(BIF_P, BIF_ARG_1, BIF_ARG_2, THE_NON_VALUE, BINARY_FIND_ALL);
+}
+
 BIF_RETTYPE binary_matches_3(BIF_ALIST_3)
 {
-    return binary_matches(BIF_P, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3);
+    return binary_match(BIF_P, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3, BINARY_FIND_ALL);
 }
 
 static BIF_RETTYPE
-binary_matches(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
+binary_split(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
 {
-    Uint hsstart, hsend;
+    BinaryFindState bfs;
     Eterm *tp;
-    Eterm type;
     Binary *bin;
     Eterm bin_term = NIL;
     int runres;
@@ -1473,11 +1499,12 @@ binary_matches(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
     if (is_not_binary(arg1)) {
 	goto badarg;
     }
-    if (parse_match_opts_list(arg3,arg1,&hsstart,&hsend)) {
+    if (parse_split_opts_list(arg3, arg1, &(bfs.hsstart), &(bfs.hsend), &(bfs.flags))) {
 	goto badarg;
     }
-    if (hsend == 0) {
-	BIF_RET(NIL);
+    if (bfs.hsend == 0) {
+	result = do_split_not_found_result(p, arg1, &bfs);
+	BIF_RET(result);
     }
     if (is_tuple(arg2)) {
 	tp = tuple_val(arg2);
@@ -1488,54 +1515,267 @@ binary_matches(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
 	    !ERTS_TERM_IS_MAGIC_BINARY(tp[2])) {
 	    goto badarg;
 	}
-	type = tp[1];
+	bfs.type = tp[1];
 	bin = ((ProcBin *) binary_val(tp[2]))->val;
-	if (type == am_bm &&
+	if (bfs.type == am_bm &&
 	    ERTS_MAGIC_BIN_DESTRUCTOR(bin) != cleanup_my_data_bm) {
 	    goto badarg;
 	}
-	if (type == am_ac &&
+	if (bfs.type == am_ac &&
 	    ERTS_MAGIC_BIN_DESTRUCTOR(bin) != cleanup_my_data_ac) {
 	    goto badarg;
 	}
 	bin_term = tp[2];
-    } else if (do_binary_match_compile(arg2,&type,&bin)) {
+    } else if (do_binary_match_compile(arg2, &(bfs.type), &bin)) {
 	goto badarg;
     }
-    runres = do_binary_matches(p,arg1,hsstart,hsend,type,bin,
-			       NIL,&result);
+    bfs.not_found_result = &do_split_not_found_result;
+    bfs.single_result = &do_split_single_result;
+    bfs.global_result = &do_split_global_result;
+    runres = do_binary_find(p, arg1, &bfs, bin, NIL, &result);
     if (runres == DO_BIN_MATCH_RESTART && bin_term == NIL) {
 	Eterm *hp = HAlloc(p, PROC_BIN_SIZE);
 	bin_term = erts_mk_magic_binary_term(&hp, &MSO(p), bin);
     } else if (bin_term == NIL) {
 	erts_bin_free(bin);
     }
-    switch (runres) {
+    switch(runres) {
     case DO_BIN_MATCH_OK:
 	BIF_RET(result);
     case DO_BIN_MATCH_RESTART:
-	BUMP_ALL_REDS(p);
-	BIF_TRAP3(&binary_matches_trap_export, p, arg1, result,
-		  bin_term);
+	BIF_TRAP3(&binary_find_trap_export, p, arg1, result, bin_term);
     default:
 	goto badarg;
     }
  badarg:
-    BIF_ERROR(p,BADARG);
+    BIF_ERROR(p, BADARG);
 }
 
+BIF_RETTYPE binary_split_2(BIF_ALIST_2)
+{
+    return binary_split(BIF_P, BIF_ARG_1, BIF_ARG_2, THE_NON_VALUE);
+}
 
-BIF_RETTYPE binary_match_2(BIF_ALIST_2)
+BIF_RETTYPE binary_split_3(BIF_ALIST_3)
 {
-    return binary_match(BIF_P,BIF_ARG_1,BIF_ARG_2,((Eterm) 0));
+    return binary_split(BIF_P, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3);
+}
+
+static Eterm do_match_not_found_result(Process *p, Eterm subject, BinaryFindState *bfs)
+{
+    if (bfs->flags & BINARY_FIND_ALL) {
+	return NIL;
+    } else {
+	return am_nomatch;
+    }
 }
 
+static Eterm do_match_single_result(Process *p, Eterm subject, BinaryFindState *bfs,
+				    Sint pos, Sint len)
+{
+    Eterm erlen;
+    Eterm *hp;
+    Eterm ret;
 
-BIF_RETTYPE binary_matches_2(BIF_ALIST_2)
+    erlen = erts_make_integer((Uint)(len), p);
+    ret = erts_make_integer(pos, p);
+    hp = HAlloc(p, 3);
+    ret = TUPLE2(hp, ret, erlen);
+
+    return ret;
+}
+
+static Eterm do_match_global_result(Process *p, Eterm subject, BinaryFindState *bfs,
+				    FindallData *fad, Uint fad_sz)
+{
+    Sint i;
+    Eterm tpl;
+    Eterm *hp;
+    Eterm ret;
+
+    for (i = 0; i < fad_sz; ++i) {
+	fad[i].epos = erts_make_integer(fad[i].pos, p);
+	fad[i].elen = erts_make_integer(fad[i].len, p);
+    }
+    hp = HAlloc(p, fad_sz * (3 + 2));
+    ret = NIL;
+    for (i = fad_sz - 1; i >= 0; --i) {
+	tpl = TUPLE2(hp, fad[i].epos, fad[i].elen);
+	hp += 3;
+	ret = CONS(hp, tpl, ret);
+	hp += 2;
+    }
+
+    return ret;
+}
+
+static Eterm do_split_not_found_result(Process *p, Eterm subject, BinaryFindState *bfs)
 {
-    return binary_matches(BIF_P,BIF_ARG_1,BIF_ARG_2,((Eterm) 0));
+    Eterm *hp;
+    Eterm ret;
+
+    if (bfs->flags & (BINARY_SPLIT_TRIM | BINARY_SPLIT_TRIM_ALL)
+        && binary_size(subject) == 0) {
+        return NIL;
+    }
+    hp = HAlloc(p, 2);
+    ret = CONS(hp, subject, NIL);
+
+    return ret;
 }
 
+static Eterm do_split_single_result(Process *p, Eterm subject, BinaryFindState *bfs,
+				    Sint pos, Sint len)
+{
+    size_t orig_size;
+    Eterm orig;
+    Uint offset;
+    Uint bit_offset;
+    Uint bit_size;
+    ErlSubBin *sb1;
+    ErlSubBin *sb2;
+    Eterm *hp;
+    Eterm ret;
+
+    orig_size = binary_size(subject);
+
+    if ((bfs->flags & (BINARY_SPLIT_TRIM | BINARY_SPLIT_TRIM_ALL)) &&
+	(orig_size - pos - len) == 0) {
+	if (pos == 0) {
+	    ret = NIL;
+	} else {
+	    hp = HAlloc(p, (ERL_SUB_BIN_SIZE + 2));
+	    ERTS_GET_REAL_BIN(subject, orig, offset, bit_offset, bit_size);
+	    sb1 = (ErlSubBin *) hp;
+	    sb1->thing_word = HEADER_SUB_BIN;
+	    sb1->size = pos;
+	    sb1->offs = offset;
+	    sb1->orig = orig;
+	    sb1->bitoffs = bit_offset;
+	    sb1->bitsize = bit_size;
+	    sb1->is_writable = 0;
+	    hp += ERL_SUB_BIN_SIZE;
+
+	    ret = CONS(hp, make_binary(sb1), NIL);
+	    hp += 2;
+	}
+    } else {
+	if ((bfs->flags & BINARY_SPLIT_TRIM_ALL) && (pos == 0)) {
+	    hp = HAlloc(p, 1 * (ERL_SUB_BIN_SIZE + 2));
+	    ERTS_GET_REAL_BIN(subject, orig, offset, bit_offset, bit_size);
+	    sb1 = NULL;
+	} else {
+	    hp = HAlloc(p, 2 * (ERL_SUB_BIN_SIZE + 2));
+	    ERTS_GET_REAL_BIN(subject, orig, offset, bit_offset, bit_size);
+	    sb1 = (ErlSubBin *) hp;
+	    sb1->thing_word = HEADER_SUB_BIN;
+	    sb1->size = pos;
+	    sb1->offs = offset;
+	    sb1->orig = orig;
+	    sb1->bitoffs = bit_offset;
+	    sb1->bitsize = 0;
+	    sb1->is_writable = 0;
+	    hp += ERL_SUB_BIN_SIZE;
+	}
+
+	sb2 = (ErlSubBin *) hp;
+	sb2->thing_word = HEADER_SUB_BIN;
+	sb2->size = orig_size - pos - len;
+	sb2->offs = offset + pos + len;
+	sb2->orig = orig;
+	sb2->bitoffs = bit_offset;
+	sb2->bitsize = bit_size;
+	sb2->is_writable = 0;
+	hp += ERL_SUB_BIN_SIZE;
+
+	ret = CONS(hp, make_binary(sb2), NIL);
+	hp += 2;
+	if (sb1 != NULL) {
+	    ret = CONS(hp, make_binary(sb1), ret);
+	    hp += 2;
+	}
+    }
+    return ret;
+}
+
+static Eterm do_split_global_result(Process *p, Eterm subject, BinaryFindState *bfs,
+				    FindallData *fad, Uint fad_sz)
+{
+    size_t orig_size;
+    Eterm orig;
+    Uint offset;
+    Uint bit_offset;
+    Uint bit_size;
+    ErlSubBin *sb;
+    Sint i;
+    Sint tail;
+    Uint list_size;
+    Uint end_pos;
+    Uint do_trim = bfs->flags & (BINARY_SPLIT_TRIM | BINARY_SPLIT_TRIM_ALL);
+    Eterm *hp;
+    Eterm *hendp;
+    Eterm ret;
+
+    tail = fad_sz - 1;
+    list_size = fad_sz + 1;
+    orig_size = binary_size(subject);
+    end_pos = (Uint)(orig_size);
+
+    hp = HAlloc(p, list_size * (ERL_SUB_BIN_SIZE + 2));
+    hendp = hp + list_size * (ERL_SUB_BIN_SIZE + 2);
+    ERTS_GET_REAL_BIN(subject, orig, offset, bit_offset, bit_size);
+    ASSERT(bit_size == 0);
+
+    ret = NIL;
+
+    for (i = tail; i >= 0; --i) {
+	sb = (ErlSubBin *)(hp);
+	sb->size = end_pos - (fad[i].pos + fad[i].len);
+	if (!(sb->size == 0 && do_trim)) {
+	    sb->thing_word = HEADER_SUB_BIN;
+	    sb->offs = offset + fad[i].pos + fad[i].len;
+	    sb->orig = orig;
+	    sb->bitoffs = bit_offset;
+	    sb->bitsize = 0;
+	    sb->is_writable = 0;
+	    hp += ERL_SUB_BIN_SIZE;
+	    ret = CONS(hp, make_binary(sb), ret);
+	    hp += 2;
+	    do_trim &= ~BINARY_SPLIT_TRIM;
+	}
+	end_pos = fad[i].pos;
+    }
+
+    sb = (ErlSubBin *)(hp);
+    sb->size = fad[0].pos;
+    if (!(sb->size == 0 && do_trim)) {
+	sb->thing_word = HEADER_SUB_BIN;
+	sb->offs = offset;
+	sb->orig = orig;
+	sb->bitoffs = bit_offset;
+	sb->bitsize = 0;
+	sb->is_writable = 0;
+	hp += ERL_SUB_BIN_SIZE;
+	ret = CONS(hp, make_binary(sb), ret);
+	hp += 2;
+    }
+    HRelease(p, hendp, hp);
+    return ret;
+}
+
+static BIF_RETTYPE binary_find_trap(BIF_ALIST_3)
+{
+    int runres;
+    Eterm result;
+    Binary *bin = ((ProcBin *) binary_val(BIF_ARG_3))->val;
+    runres = do_binary_find(BIF_P, BIF_ARG_1, NULL, bin, BIF_ARG_2, &result);
+    if (runres == DO_BIN_MATCH_OK) {
+	BIF_RET(result);
+    } else {
+	BUMP_ALL_REDS(BIF_P);
+	BIF_TRAP3(&binary_find_trap_export, BIF_P, BIF_ARG_1, result, BIF_ARG_3);
+    }
+}
 
 BIF_RETTYPE erts_binary_part(Process *p, Eterm binary, Eterm epos, Eterm elen)
 {
@@ -2550,7 +2790,6 @@ BIF_RETTYPE binary_referenced_byte_size_1(BIF_ALIST_1)
     }
     pb = (ProcBin *) binary_val(bin);
     if (pb->thing_word == HEADER_PROC_BIN) {
-	/* XXX:PaN - Halfword - orig_size is a long, we should handle that */
 	res = erts_make_integer((Uint) pb->val->orig_size, BIF_P);
     } else { /* heap binary */
 	res = erts_make_integer((Uint) ((ErlHeapBin *) pb)->size, BIF_P);
@@ -2568,7 +2807,7 @@ BIF_RETTYPE binary_referenced_byte_size_1(BIF_ALIST_1)
 #endif
 
 static int get_need(Uint u) {
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
     if (u > 0xFFFFFFFFUL) {
 	if (u > 0xFFFFFFFFFFFFUL) {
 	    if (u > 0xFFFFFFFFFFFFFFUL) {
diff --git a/erts/emulator/beam/erl_bif_ddll.c b/erts/emulator/beam/erl_bif_ddll.c
index 28bec6325c..b526eda41d 100644
--- a/erts/emulator/beam/erl_bif_ddll.c
+++ b/erts/emulator/beam/erl_bif_ddll.c
@@ -48,6 +48,7 @@
 #include "erl_version.h"
 #include "erl_bif_unique.h"
 #include "dtrace-wrapper.h"
+#include "lttng-wrapper.h"
 
 #ifdef ERTS_SMP
 #define DDLL_SMP 1
@@ -1309,7 +1310,7 @@ static Eterm notify_when_loaded(Process *p, Eterm name_term, char *name, ErtsPro
     case ERL_DE_FORCE_RELOAD:
 	break;
     default:
-	erl_exit(1,"Internal error, unknown state %u in dynamic driver.", drv->handle->status);
+	erts_exit(ERTS_ERROR_EXIT,"Internal error, unknown state %u in dynamic driver.", drv->handle->status);
     }
     p->flags |= F_USING_DDLL;
     r = add_monitor(p, drv->handle, ERL_DE_PROC_AWAIT_LOAD);
@@ -1619,6 +1620,7 @@ static int do_unload_driver_entry(DE_Handle *dh, Eterm *save_name)
 	    if (q->finish) {
 		int fpe_was_unmasked = erts_block_fpe();
 		DTRACE1(driver_finish, q->name);
+                LTTNG1(driver_finish, q->name);
 		(*(q->finish))();
 		erts_unblock_fpe(fpe_was_unmasked);
 	    }
@@ -1707,18 +1709,19 @@ static void notify_proc(Process *proc, Eterm ref, Eterm driver_name, Eterm type,
     Eterm mess;
     Eterm r;
     Eterm *hp;
-    ErlHeapFragment *bp;
-    ErlOffHeap *ohp;
+    ErtsMessage *mp;
     ErtsProcLocks rp_locks = 0;
+    ErlOffHeap *ohp;
     ERTS_SMP_CHK_NO_PROC_LOCKS;
 
     assert_drv_list_rwlocked();
     if (errcode != 0) {
 	int need = load_error_need(errcode);
 	Eterm e;
-	hp = erts_alloc_message_heap(6 /* tuple */ + 3 /* Error tuple */ + 
-				     REF_THING_SIZE + need, &bp, &ohp, 
-				     proc, &rp_locks);
+	mp = erts_alloc_message_heap(proc, &rp_locks,
+				     (6 /* tuple */ + 3 /* Error tuple */ + 
+				      REF_THING_SIZE + need),
+				     &hp, &ohp);
 	r = copy_ref(ref,hp);
 	hp += REF_THING_SIZE;
 	e = build_load_error_hp(hp, errcode);
@@ -1727,12 +1730,14 @@ static void notify_proc(Process *proc, Eterm ref, Eterm driver_name, Eterm type,
 	hp += 3;
 	mess = TUPLE5(hp,type,r,am_driver,driver_name,mess);
     } else {	
-	hp = erts_alloc_message_heap(6 /* tuple */ + REF_THING_SIZE, &bp, &ohp, proc, &rp_locks);
+	mp = erts_alloc_message_heap(proc, &rp_locks,
+				     6 /* tuple */ + REF_THING_SIZE,
+				     &hp, &ohp);
 	r = copy_ref(ref,hp);
 	hp += REF_THING_SIZE;
 	mess = TUPLE5(hp,type,r,am_driver,driver_name,tag);
     }
-    erts_queue_message(proc, &rp_locks, bp, mess, am_undefined);
+    erts_queue_message(proc, &rp_locks, mp, mess, am_undefined);
     erts_smp_proc_unlock(proc, rp_locks);
     ERTS_SMP_CHK_NO_PROC_LOCKS;
 }
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 414ff6711a..0b2c26a548 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -64,7 +64,9 @@ static Export* alloc_sizes_trap = NULL;
 static Export* gather_io_bytes_trap = NULL;
 
 static Export *gather_sched_wall_time_res_trap;
+static Export *gather_msacc_res_trap;
 static Export *gather_gc_info_res_trap;
+static Export *gather_system_check_res_trap;
 
 #define DECL_AM(S) Eterm AM_ ## S = am_atom_put(#S, sizeof(#S) - 1)
 
@@ -73,9 +75,6 @@ static char otp_version[] = ERLANG_OTP_VERSION;
 static char erts_system_version[] = ("Erlang/OTP " ERLANG_OTP_RELEASE
 				     "%s"
 				     " [erts-" ERLANG_VERSION "]"
-#if !HEAP_ON_C_STACK && !HALFWORD_HEAP
-				     " [no-c-stack-objects]"
-#endif
 #ifndef OTP_RELEASE
 #ifdef ERLANG_GIT_VERSION
 				     " [source-" ERLANG_GIT_VERSION "]"
@@ -84,12 +83,8 @@ static char erts_system_version[] = ("Erlang/OTP " ERLANG_OTP_RELEASE
 #endif
 #endif	
 #ifdef ARCH_64
-#if HALFWORD_HEAP
-				     " [64-bit halfword]"
-#else
 				     " [64-bit]"
 #endif
-#endif
 #ifdef ERTS_SMP
 				     " [smp:%beu:%beu]"
 #endif
@@ -131,12 +126,18 @@ static char erts_system_version[] = ("Erlang/OTP " ERLANG_OTP_RELEASE
 #ifdef ERTS_FRMPTR
 				     " [frame-pointer]"
 #endif
+#ifdef USE_LTTNG
+				     " [lttng]"
+#endif
 #ifdef USE_DTRACE
 				     " [dtrace]"
 #endif
 #ifdef USE_SYSTEMTAP
 				     " [systemtap]"
 #endif
+#ifdef SHCOPY
+				     " [sharing-preserving]"
+#endif
 				     "\n");
 
 #define ASIZE(a) (sizeof(a)/sizeof(a[0]))
@@ -322,13 +323,11 @@ erts_print_system_version(int to, void *arg, Process *c_p)
     char *ov = otp_version;
 #ifdef ERTS_SMP
     Uint total, online, active;
-#ifdef ERTS_DIRTY_SCHEDULERS
     Uint dirty_cpu, dirty_cpu_onln, dirty_io;
 
-    (void) erts_schedulers_state(&total, &online, &active, &dirty_cpu, &dirty_cpu_onln, &dirty_io, 0);
-#else
-    (void) erts_schedulers_state(&total, &online, &active, NULL, NULL, NULL, 0);
-#endif
+    erts_schedulers_state(&total, &online, &active,
+			  &dirty_cpu, &dirty_cpu_onln, NULL,
+			  &dirty_io, NULL);
 #endif
     for (i = 0; i < sizeof(otp_version)-4; i++) {
 	if (ov[i] == '-' && ov[i+1] == 'r' && ov[i+2] == 'c')
@@ -596,6 +595,8 @@ static Eterm pi_args[] = {
     am_min_bin_vheap_size,
     am_current_location,
     am_current_stacktrace,
+    am_message_queue_data,
+    am_garbage_collection_info
 };
 
 #define ERTS_PI_ARGS ((int) (sizeof(pi_args)/sizeof(Eterm)))
@@ -643,6 +644,8 @@ pi_arg2ix(Eterm arg)
     case am_min_bin_vheap_size:			return 28;
     case am_current_location:			return 29;
     case am_current_stacktrace:			return 30;
+    case am_message_queue_data:			return 31;
+    case am_garbage_collection_info:		return 32;
     default:					return -1;
     }
 }
@@ -671,18 +674,12 @@ static Eterm pi_1_keys[] = {
 #define ERTS_PI_1_NO_OF_KEYS (sizeof(pi_1_keys)/sizeof(Eterm))
 
 static Eterm pi_1_keys_list;
-#if HEAP_ON_C_STACK
 static Eterm pi_1_keys_list_heap[2*ERTS_PI_1_NO_OF_KEYS];
-#endif
 
 static void
 process_info_init(void)
 {
-#if HEAP_ON_C_STACK
     Eterm *hp = &pi_1_keys_list_heap[0];
-#else
-    Eterm *hp = erts_alloc(ERTS_ALC_T_LL_TEMP_TERM,sizeof(Eterm)*2*ERTS_PI_1_NO_OF_KEYS);
-#endif
     int i;
 
     pi_1_keys_list = NIL;
@@ -731,9 +728,10 @@ pi_pid2proc(Process *c_p, Eterm pid, ErtsProcLocks info_locks)
 
 
 
-BIF_RETTYPE
+static BIF_RETTYPE
 process_info_aux(Process *BIF_P,
 		 Process *rp,
+		 ErtsProcLocks rp_locks,
 		 Eterm rpid,
 		 Eterm item,
 		 int always_wrap);
@@ -824,10 +822,31 @@ process_info_list(Process *c_p, Eterm pid, Eterm list, int always_wrap,
 	*fail_type = ERTS_PI_FAIL_TYPE_AWAIT_EXIT;
 	goto done;
     }
-    else if (!(locks & ERTS_PROC_LOCK_STATUS)) {
-	erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_STATUS);
+    else {
+	ErtsProcLocks unlock_locks = 0;
+
+	if (c_p == rp)
+	    locks |= ERTS_PROC_LOCK_MAIN;
+
+	if (!(locks & ERTS_PROC_LOCK_STATUS))
+	    unlock_locks |= ERTS_PROC_LOCK_STATUS;
+
+	if (locks & ERTS_PROC_LOCK_MSGQ) {
+	    /*
+	     * Move in queue into private queue and
+	     * release msgq lock, enabling others to
+	     * send messages to the process while it
+	     * is being inspected...
+	     */
+	    ASSERT(locks & ERTS_PROC_LOCK_MAIN);
+	    ERTS_SMP_MSGQ_MV_INQ2PRIVQ(rp);
+	    locks &= ~ERTS_PROC_LOCK_MSGQ;
+	    unlock_locks |= ERTS_PROC_LOCK_MSGQ;
+	}
+
+	if (unlock_locks)
+	    erts_smp_proc_unlock(rp, unlock_locks);
     }
-	
 
     /*
      * We always handle 'messages' first if it should be part
@@ -839,7 +858,7 @@ process_info_list(Process *c_p, Eterm pid, Eterm list, int always_wrap,
     if (want_messages) {
 	ix = pi_arg2ix(am_messages);
 	ASSERT(part_res[ix] == THE_NON_VALUE);
-	part_res[ix] = process_info_aux(c_p, rp, pid, am_messages, always_wrap);
+	part_res[ix] = process_info_aux(c_p, rp, locks, pid, am_messages, always_wrap);
 	ASSERT(part_res[ix] != THE_NON_VALUE);
     }
 
@@ -847,7 +866,7 @@ process_info_list(Process *c_p, Eterm pid, Eterm list, int always_wrap,
 	ix = res_elem_ix[res_elem_ix_ix];
 	if (part_res[ix] == THE_NON_VALUE) {
 	    arg = pi_ix2arg(ix);
-	    part_res[ix] = process_info_aux(c_p, rp, pid, arg, always_wrap);
+	    part_res[ix] = process_info_aux(c_p, rp, locks, pid, arg, always_wrap);
 	    ASSERT(part_res[ix] != THE_NON_VALUE);
 	}
     }
@@ -914,7 +933,7 @@ BIF_RETTYPE process_info_1(BIF_ALIST_1)
 	case ERTS_PI_FAIL_TYPE_AWAIT_EXIT:
 	    ERTS_BIF_AWAIT_X_DATA_TRAP(BIF_P, BIF_ARG_1, am_undefined);
 	default:
-	    erl_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error", __FILE__, __LINE__);
+	    erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error", __FILE__, __LINE__);
 	}
     }
 
@@ -954,7 +973,7 @@ BIF_RETTYPE process_info_2(BIF_ALIST_2)
 	    case ERTS_PI_FAIL_TYPE_AWAIT_EXIT:
 		ERTS_BIF_AWAIT_X_DATA_TRAP(BIF_P, BIF_ARG_1, am_undefined);
 	    default:
-		erl_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error",
+		erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error",
 			 __FILE__, __LINE__);
 	    }
 	}
@@ -978,9 +997,31 @@ BIF_RETTYPE process_info_2(BIF_ALIST_2)
 	ERTS_BIF_AWAIT_X_DATA_TRAP(BIF_P, BIF_ARG_1, am_undefined);
     }
     else {
+	ErtsProcLocks unlock_locks = 0;
+
+	if (BIF_P == rp)
+	    info_locks |= ERTS_PROC_LOCK_MAIN;
+
 	if (!(info_locks & ERTS_PROC_LOCK_STATUS))
-	    erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_STATUS);
-	res = process_info_aux(BIF_P, rp, pid, BIF_ARG_2, 0);
+	    unlock_locks |= ERTS_PROC_LOCK_STATUS;
+
+	if (info_locks & ERTS_PROC_LOCK_MSGQ) {
+	    /*
+	     * Move in queue into private queue and
+	     * release msgq lock, enabling others to
+	     * send messages to the process while it
+	     * is being inspected...
+	     */
+	    ASSERT(info_locks & ERTS_PROC_LOCK_MAIN);
+	    ERTS_SMP_MSGQ_MV_INQ2PRIVQ(rp);
+	    info_locks &= ~ERTS_PROC_LOCK_MSGQ;
+	    unlock_locks |= ERTS_PROC_LOCK_MSGQ;
+	}
+
+	if (unlock_locks)
+	    erts_smp_proc_unlock(rp, unlock_locks);
+
+	res = process_info_aux(BIF_P, rp, info_locks, pid, BIF_ARG_2, 0);
     }
     ASSERT(is_value(res));
 
@@ -998,6 +1039,7 @@ BIF_RETTYPE process_info_2(BIF_ALIST_2)
 Eterm
 process_info_aux(Process *BIF_P,
 		 Process *rp,
+		 ErtsProcLocks rp_locks,
 		 Eterm rpid,
 		 Eterm item,
 		 int always_wrap)
@@ -1069,171 +1111,55 @@ process_info_aux(Process *BIF_P,
 	break;
 
     case am_messages: {
-	ErlMessage* mp;
-	int n;
 
-	ERTS_SMP_MSGQ_MV_INQ2PRIVQ(rp);
-	n = rp->msg.len;
-
-	if (n == 0 || ERTS_TRACE_FLAGS(rp) & F_SENSITIVE) {
+	if (rp->msg.len == 0 || ERTS_TRACE_FLAGS(rp) & F_SENSITIVE) {
 	    hp = HAlloc(BIF_P, 3);
 	} else {
-	    int remove_bad_messages = 0;
-	    struct {
-		Uint copy_struct_size;
-		ErlMessage* msgp;
-	    } *mq = erts_alloc(ERTS_ALC_T_TMP, n*sizeof(*mq));
-	    Sint i = 0;
-	    Uint heap_need = 3;
+	    ErtsMessageInfo *mip;
+	    Sint i;
+	    Uint heap_need;
+#ifdef DEBUG
 	    Eterm *hp_end;
+#endif
 
-	    for (mp = rp->msg.first; mp; mp = mp->next) {
-		heap_need += 2;
-		mq[i].msgp = mp;
-		if (rp != BIF_P) {
-		    Eterm msg = ERL_MESSAGE_TERM(mq[i].msgp);
-		    if (is_value(msg)) {
-			mq[i].copy_struct_size = (is_immed(msg)? 0 :
-						  size_object(msg));
-		    }
-		    else if (mq[i].msgp->data.attached) {
-			mq[i].copy_struct_size
-			    = erts_msg_attached_data_size(mq[i].msgp);
-		    }
-		    else {
-			/* Bad distribution message; ignore */
-			remove_bad_messages = 1;
-			mq[i].copy_struct_size = 0;
-		    }
-		    heap_need += mq[i].copy_struct_size;
-		}
-		else {
-		    mq[i].copy_struct_size = mp->data.attached ?
-                        erts_msg_attached_data_size(mp) : 0;
-		}
-		i++;
-	    }
+	    mip = erts_alloc(ERTS_ALC_T_TMP,
+			     rp->msg.len*sizeof(ErtsMessageInfo));
 
-            if (rp != BIF_P) {
-                hp = HAlloc(BIF_P, heap_need);
-                hp_end = hp + heap_need;
-                ASSERT(i == n);
-                for (i--; i >= 0; i--) {
-                    Eterm msg = ERL_MESSAGE_TERM(mq[i].msgp);
-		    if (is_value(msg)) {
-			if (mq[i].copy_struct_size)
-			    msg = copy_struct(msg,
-					      mq[i].copy_struct_size,
-					      &hp,
-					      &MSO(BIF_P));
-		    }
-		    else if (mq[i].msgp->data.attached) {
-			ErlHeapFragment *hfp;
-			/*
-			 * Decode it into a message buffer and attach it
-			 * to the message instead of the attached external
-			 * term.
-			 *
-			 * Note that we may not pass a process pointer
-			 * to erts_msg_distext2heap(), since it would then
-			 * try to alter locks on that process.
-			 */
-			msg = erts_msg_distext2heap(
-			    NULL, NULL, &hfp, &ERL_MESSAGE_TOKEN(mq[i].msgp),
-			    mq[i].msgp->data.dist_ext);
-
-			ERL_MESSAGE_TERM(mq[i].msgp) = msg;
-			mq[i].msgp->data.heap_frag = hfp;
-
-			if (is_non_value(msg)) {
-			    ASSERT(!mq[i].msgp->data.heap_frag);
-			    /* Bad distribution message; ignore */
-			    remove_bad_messages = 1;
-			    continue;
-			}
-			else {
-			    /* Make our copy of the message */
-			    ASSERT(size_object(msg) == erts_used_frag_sz(hfp));
-			    msg = copy_struct(msg,
-					      erts_used_frag_sz(hfp),
-					      &hp,
-					      &MSO(BIF_P));
-			}
-		    }
-		    else {
-			/* Bad distribution message; ignore */
-			remove_bad_messages = 1;
-			continue;
-		    }
-                    res = CONS(hp, msg, res);
-                    hp += 2;
-		}
-                HRelease(BIF_P, hp_end, hp+3);
-            }
-	    else {
-                for (i--; i >= 0; i--) {
-                    ErtsHeapFactory factory;
-                    Eterm msg = ERL_MESSAGE_TERM(mq[i].msgp);
-
-                    erts_factory_proc_prealloc_init(&factory, BIF_P,
-                                                    mq[i].copy_struct_size+2);
-		    if (mq[i].msgp->data.attached) {
-			/* Decode it on the heap */
-			erts_move_msg_attached_data_to_heap(&factory,
-							    mq[i].msgp);
-			msg = ERL_MESSAGE_TERM(mq[i].msgp);
-			ASSERT(!mq[i].msgp->data.attached);
-                    }
-                    if (is_value(msg)) {
-                        hp = erts_produce_heap(&factory, 2, 0);
-                        res = CONS(hp, msg, res);
-                    }
-                    else {
-                        /* Bad distribution message; ignore */
-                        remove_bad_messages = 1;
-                        continue;
-                    }
-                    erts_factory_close(&factory);
-		}
-                hp = HAlloc(BIF_P, 3);
-	    }
-	    erts_free(ERTS_ALC_T_TMP, mq);
-	    if (remove_bad_messages) {
-		ErlMessage **mpp;
-		/*
-		 * We need to remove bad distribution messages from
-		 * the queue, so that the value returned for
-		 * 'message_queue_len' is consistent with the value
-		 * returned for 'messages'.
-		 */
-		mpp = &rp->msg.first;
-		mp = rp->msg.first;
-		while (mp) {
-		    if (is_value(ERL_MESSAGE_TERM(mp))) {
-			mpp = &mp->next;
-			mp = mp->next;
-		    }
-		    else {
-			ErlMessage* bad_mp = mp;
-			ASSERT(!mp->data.attached);
-			if (rp->msg.save == &mp->next)
-			    rp->msg.save = mpp;
-			if (rp->msg.last == &mp->next)
-			    rp->msg.last = mpp;
-			*mpp = mp->next;
-			mp = mp->next;
-			rp->msg.len--;
-			free_message(bad_mp);
-		    }
-		}
+	    /*
+	     * Note that message queue may shrink when calling
+	     * erts_prep_msgq_for_inspection() since it removes
+	     * corrupt distribution messages.
+	     */
+	    heap_need = erts_prep_msgq_for_inspection(BIF_P, rp, rp_locks, mip);
+	    heap_need += 3; /* top 2-tuple */
+	    heap_need += rp->msg.len*2; /* Cons cells */
+
+	    hp = HAlloc(BIF_P, heap_need); /* heap_need is exact */
+#ifdef DEBUG
+	    hp_end = hp + heap_need;
+#endif
+
+	    /* Build list of messages... */
+	    for (i = rp->msg.len - 1, res = NIL; i >= 0; i--) {
+		Eterm msg = ERL_MESSAGE_TERM(mip[i].msgp);
+		Uint sz = mip[i].size;
+
+		if (sz != 0)
+		    msg = copy_struct(msg, sz, &hp, &BIF_P->off_heap);
+
+		res = CONS(hp, msg, res);
+		hp += 2;
 	    }
+
+	    ASSERT(hp_end == hp + 3);
+
+	    erts_free(ERTS_ALC_T_TMP, mip);
 	}
 	break;
     }
 
     case am_message_queue_len:
 	hp = HAlloc(BIF_P, 3);
-	ERTS_SMP_MSGQ_MV_INQ2PRIVQ(rp);
 	res = make_small(rp->msg.len);
 	break;
 
@@ -1421,7 +1347,7 @@ process_info_aux(Process *BIF_P,
     }
 
     case am_total_heap_size: {
-	ErlMessage *mp;
+	ErtsMessage *mp;
 	Uint total_heap_size;
 	Uint hsz = 3;
 
@@ -1431,8 +1357,6 @@ process_info_aux(Process *BIF_P,
 
 	total_heap_size += rp->mbuf_sz;
 
-	ERTS_SMP_MSGQ_MV_INQ2PRIVQ(rp);
-
 	for (mp = rp->msg.first; mp; mp = mp->next)
 	    if (mp->data.attached)
 		total_heap_size += erts_msg_attached_data_size(mp);
@@ -1454,7 +1378,7 @@ process_info_aux(Process *BIF_P,
 
     case am_memory: { /* Memory consumed in bytes */
 	Uint hsz = 3;
-	Uint size = erts_process_memory(rp);
+	Uint size = erts_process_memory(rp, 0);
 	(void) erts_bld_uint(NULL, &hsz, size);
 	hp = HAlloc(BIF_P, hsz);
 	res = erts_bld_uint(&hp, NULL, size);
@@ -1479,6 +1403,32 @@ process_info_aux(Process *BIF_P,
 	break;
     }
 
+    case am_garbage_collection_info: {
+        Uint sz = 0, actual_sz = 0;
+
+        if (rp == BIF_P) {
+            sz += ERTS_PROCESS_GC_INFO_MAX_SIZE;
+        } else {
+            erts_process_gc_info(rp, &sz, NULL);
+            sz += 3;
+        }
+
+        hp = HAlloc(BIF_P, sz);
+        res = erts_process_gc_info(rp, &actual_sz, &hp);
+
+        /* We may have some extra space, fill with 0 tuples */
+        if (actual_sz <= sz - 3) {
+            for (; actual_sz < sz - 3; hp++, actual_sz++)
+                hp[0] = make_arityval(0);
+        } else {
+            for (; actual_sz < sz; hp++, actual_sz++)
+                hp[0] = make_arityval(0);
+            hp = HAlloc(BIF_P, 3);
+        }
+
+        break;
+    }
+
     case am_group_leader: {
 	int sz = NC_HEAP_SIZE(rp->group_leader);
 	hp = HAlloc(BIF_P, 3 + sz);
@@ -1533,7 +1483,7 @@ process_info_aux(Process *BIF_P,
     }
 
     case am_last_calls: {
-	struct saved_calls *scb = ERTS_PROC_GET_SAVED_CALLS_BUF(BIF_P);
+	struct saved_calls *scb = ERTS_PROC_GET_SAVED_CALLS_BUF(rp);
 	if (!scb) {
 	    hp = HAlloc(BIF_P, 3);
 	    res = am_false;
@@ -1580,6 +1530,25 @@ process_info_aux(Process *BIF_P,
 	break;
     }
 
+    case am_message_queue_data:
+	switch (rp->flags & (F_OFF_HEAP_MSGQ|F_ON_HEAP_MSGQ)) {
+	case F_OFF_HEAP_MSGQ:
+	    res = am_off_heap;
+	    break;
+	case F_ON_HEAP_MSGQ:
+	    res = am_on_heap;
+	    break;
+	case 0:
+	    res = am_mixed;
+	    break;
+	default:
+	    res = am_error;
+	    ERTS_INTERNAL_ERROR("Inconsistent message queue management state");
+	    break;
+	}
+	hp = HAlloc(BIF_P, 3);
+	break;
+
     default:
 	return THE_NON_VALUE; /* will produce badarg */
 
@@ -1754,12 +1723,12 @@ info_1_tuple(Process* BIF_P,	/* Pointer to current process. */
 	if (arity == 2) {
 	    Eterm res = THE_NON_VALUE;
 	    char *buf;
-	    int len = is_string(*tp);
+	    Sint len = is_string(*tp);
 	    if (len <= 0)
 		return res;
 	    buf = (char *) erts_alloc(ERTS_ALC_T_TMP, len+1);
 	    if (intlist_to_buf(*tp, buf, len) != len)
-		erl_exit(1, "%s:%d: Internal error\n", __FILE__, __LINE__);
+		erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error\n", __FILE__, __LINE__);
 	    buf[len] = '\0';
 	    res = erts_instr_dump_memory_map(buf) ? am_true : am_false;
 	    erts_free(ERTS_ALC_T_TMP, (void *) buf);
@@ -1773,12 +1742,12 @@ info_1_tuple(Process* BIF_P,	/* Pointer to current process. */
 	    else {
 		Eterm res = THE_NON_VALUE;
 		char *buf;
-		int len = is_string(tp[1]);
+		Sint len = is_string(tp[1]);
 		if (len <= 0)
 		    return res;
 		buf = (char *) erts_alloc(ERTS_ALC_T_TMP, len+1);
 		if (intlist_to_buf(tp[1], buf, len) != len)
-		    erl_exit(1, "%s:%d: Internal error\n", __FILE__, __LINE__);
+		    erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error\n", __FILE__, __LINE__);
 		buf[len] = '\0';
 		res = erts_instr_dump_stat(buf, 1) ? am_true : am_false;
 		erts_free(ERTS_ALC_T_TMP, (void *) buf);
@@ -2076,12 +2045,18 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 #ifndef ERTS_SMP
 	BIF_RET(am_disabled);
 #else
+#ifndef ERTS_DIRTY_SCHEDULERS
 	if (erts_no_schedulers == 1)
 	    BIF_RET(am_disabled);
-	else {
-	    BIF_RET(erts_is_multi_scheduling_blocked()
-		    ? am_blocked
-		    : am_enabled);
+	else
+#endif
+	{
+	    int msb = erts_is_multi_scheduling_blocked();
+	    BIF_RET(!msb
+		    ? am_enabled
+		    : (msb > 0
+		       ? am_blocked
+		       : am_blocked_normal));
 	}
 #endif
     } else if (BIF_ARG_1 == am_build_type) {
@@ -2550,77 +2525,120 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	res = TUPLE3(hp, make_small(1), make_small(1), make_small(1));
 	BIF_RET(res);
 #else
+	Eterm *hp;
 	Uint total, online, active;
-	switch (erts_schedulers_state(&total,
-				      &online,
-				      &active,
-				      NULL,
-				      NULL,
-				      NULL,
-				      1)) {
-	case ERTS_SCHDLR_SSPND_DONE: {
-	    Eterm *hp = HAlloc(BIF_P, 4);
-	    res = TUPLE3(hp,
-			 make_small(total),
-			 make_small(online),
-			 make_small(active));
-	    BIF_RET(res);
+	erts_schedulers_state(&total, &online, &active,
+			      NULL, NULL, NULL, NULL, NULL);
+	hp = HAlloc(BIF_P, 4);
+	res = TUPLE3(hp,
+		     make_small(total),
+		     make_small(online),
+		     make_small(active));
+	BIF_RET(res);
+#endif
+    } else if (ERTS_IS_ATOM_STR("schedulers_state", BIF_ARG_1)) {
+#ifndef ERTS_SMP
+	Eterm *hp = HAlloc(BIF_P, 4);
+	res = TUPLE3(hp, make_small(1), make_small(1), make_small(1));
+	BIF_RET(res);
+#else
+	Eterm *hp;
+	Uint total, online, active;
+	erts_schedulers_state(&total, &online, &active,
+			      NULL, NULL, NULL, NULL, NULL);
+	hp = HAlloc(BIF_P, 4);
+	res = TUPLE3(hp,
+		     make_small(total),
+		     make_small(online),
+		     make_small(active));
+	BIF_RET(res);
+#endif
+    } else if (ERTS_IS_ATOM_STR("all_schedulers_state", BIF_ARG_1)) {
+#ifndef ERTS_SMP
+	Eterm *hp = HAlloc(BIF_P, 2+5);
+	res = CONS(hp+5,
+		   TUPLE4(hp,
+			  am_normal,
+			  make_small(1),
+			  make_small(1),
+			  make_small(1)),
+		   NIL);
+	BIF_RET(res);
+#else
+	Eterm *hp, tpl;
+	Uint sz, total, online, active,
+	    dirty_cpu_total, dirty_cpu_online, dirty_cpu_active,
+	    dirty_io_total, dirty_io_active;
+	erts_schedulers_state(&total, &online, &active,
+			      &dirty_cpu_total, &dirty_cpu_online, &dirty_cpu_active,
+			      &dirty_io_total, &dirty_io_active);
+
+	sz = 2+5;
+	if (dirty_cpu_total)
+	    sz += 2+5;
+	if (dirty_io_total)
+	    sz += 2+5;
+
+	hp = HAlloc(BIF_P, sz);
+
+	res = NIL;
+	if (dirty_io_total) {
+	    tpl = TUPLE4(hp,
+			 am_dirty_io,
+			 make_small(dirty_io_total),
+			 make_small(dirty_io_total),
+			 make_small(dirty_io_active));
+	    hp += 5;
+	    res = CONS(hp, tpl, res);
+	    hp += 2;
 	}
-	case ERTS_SCHDLR_SSPND_YIELD_RESTART:
-	    ERTS_VBUMP_ALL_REDS(BIF_P);
-	    BIF_TRAP1(bif_export[BIF_system_info_1],
-		      BIF_P, BIF_ARG_1);
-	default:
-	    ASSERT(0);
-	    BIF_ERROR(BIF_P, EXC_INTERNAL_ERROR);
+	if (dirty_cpu_total) {
+	    tpl = TUPLE4(hp,
+			 am_dirty_cpu,
+			 make_small(dirty_cpu_total),
+			 make_small(dirty_cpu_online),
+			 make_small(dirty_cpu_active));
+	    hp += 5;
+	    res = CONS(hp, tpl, res);
+	    hp += 2;
 	}
+	tpl = TUPLE4(hp,
+		     am_normal,
+		     make_small(total),
+		     make_small(online),
+		     make_small(active));
+	hp += 5;
+	res = CONS(hp, tpl, res);
+	BIF_RET(res);
 #endif
     } else if (ERTS_IS_ATOM_STR("schedulers_online", BIF_ARG_1)) {
 #ifndef ERTS_SMP
 	BIF_RET(make_small(1));
 #else
-	Uint total, online, active;
-	switch (erts_schedulers_state(&total, &online, &active, NULL, NULL, NULL, 1)) {
-	case ERTS_SCHDLR_SSPND_DONE:
-	    BIF_RET(make_small(online));
-	case ERTS_SCHDLR_SSPND_YIELD_RESTART:
-	    ERTS_VBUMP_ALL_REDS(BIF_P);
-	    BIF_TRAP1(bif_export[BIF_system_info_1],
-		      BIF_P, BIF_ARG_1);
-	default:
-	    ASSERT(0);
-	    BIF_ERROR(BIF_P, EXC_INTERNAL_ERROR);
-	}
+	Uint online;
+	erts_schedulers_state(NULL, &online, NULL, NULL, NULL, NULL, NULL, NULL);
+	BIF_RET(make_small(online));
 #endif
     } else if (ERTS_IS_ATOM_STR("schedulers_active", BIF_ARG_1)) {
 #ifndef ERTS_SMP
 	BIF_RET(make_small(1));
 #else
-	Uint total, online, active;
-	switch (erts_schedulers_state(&total, &online, &active, NULL, NULL, NULL, 1)) {
-	case ERTS_SCHDLR_SSPND_DONE:
-	    BIF_RET(make_small(active));
-	case ERTS_SCHDLR_SSPND_YIELD_RESTART:
-	    ERTS_VBUMP_ALL_REDS(BIF_P);
-	    BIF_TRAP1(bif_export[BIF_system_info_1],
-		      BIF_P, BIF_ARG_1);
-	default:
-	    ASSERT(0);
-	    BIF_ERROR(BIF_P, EXC_INTERNAL_ERROR);
-	}
+	Uint active;
+	erts_schedulers_state(NULL, NULL, &active, NULL, NULL, NULL, NULL, NULL);
+	BIF_RET(make_small(active));
 #endif
 #if defined(ERTS_SMP) && defined(ERTS_DIRTY_SCHEDULERS)
     } else if (ERTS_IS_ATOM_STR("dirty_cpu_schedulers", BIF_ARG_1)) {
 	Uint dirty_cpu;
-	erts_schedulers_state(NULL, NULL, NULL, &dirty_cpu, NULL, NULL, 1);
+	erts_schedulers_state(NULL, NULL, NULL, &dirty_cpu, NULL, NULL, NULL, NULL);
 	BIF_RET(make_small(dirty_cpu));
     } else if (ERTS_IS_ATOM_STR("dirty_cpu_schedulers_online", BIF_ARG_1)) {
 	Uint dirty_cpu_onln;
-	erts_schedulers_state(NULL, NULL, NULL, NULL, &dirty_cpu_onln, NULL, 1);
+	erts_schedulers_state(NULL, NULL, NULL, NULL, &dirty_cpu_onln, NULL, NULL, NULL);
 	BIF_RET(make_small(dirty_cpu_onln));
     } else if (ERTS_IS_ATOM_STR("dirty_io_schedulers", BIF_ARG_1)) {
 	Uint dirty_io;
-	erts_schedulers_state(NULL, NULL, NULL, NULL, NULL, &dirty_io, 1);
+	erts_schedulers_state(NULL, NULL, NULL, NULL, NULL, NULL, &dirty_io, NULL);
 	BIF_RET(make_small(dirty_io));
 #endif
     } else if (ERTS_IS_ATOM_STR("run_queues", BIF_ARG_1)) {
@@ -2674,7 +2692,16 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	if (erts_no_schedulers == 1)
 	    BIF_RET(NIL);
 	else
-	    BIF_RET(erts_multi_scheduling_blockers(BIF_P));
+	    BIF_RET(erts_multi_scheduling_blockers(BIF_P, 0));
+#endif
+    } else if (ERTS_IS_ATOM_STR("normal_multi_scheduling_blockers", BIF_ARG_1)) {
+#ifndef ERTS_SMP
+	BIF_RET(NIL);
+#else
+	if (erts_no_schedulers == 1)
+	    BIF_RET(NIL);
+	else
+	    BIF_RET(erts_multi_scheduling_blockers(BIF_P, 1));
 #endif
     } else if (ERTS_IS_ATOM_STR("modified_timing_level", BIF_ARG_1)) {
 	BIF_RET(ERTS_USE_MODIFIED_TIMING()
@@ -2724,6 +2751,9 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 #elif defined(USE_SYSTEMTAP)
 	DECL_AM(systemtap);
 	BIF_RET(AM_systemtap);
+#elif defined(USE_LTTNG)
+	DECL_AM(lttng);
+	BIF_RET(AM_lttng);
 #else
 	BIF_RET(am_none);
 #endif
@@ -2741,6 +2771,19 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	BIF_RET(am_true);
     }
 #endif
+    else if (BIF_ARG_1 == am_message_queue_data) {
+	switch (erts_default_spo_flags & (SPO_ON_HEAP_MSGQ|SPO_OFF_HEAP_MSGQ)) {
+	case SPO_OFF_HEAP_MSGQ:
+	    BIF_RET(am_off_heap);
+	case SPO_ON_HEAP_MSGQ:
+	    BIF_RET(am_on_heap);
+	case 0:
+	    BIF_RET(am_mixed);
+	default:
+	    ERTS_INTERNAL_ERROR("Inconsistent message queue management state");
+	    BIF_RET(am_error);
+	}
+    }
     else if (ERTS_IS_ATOM_STR("compile_info",BIF_ARG_1)) {
 	Uint  sz;
 	Eterm res = NIL, tup, text;
@@ -2779,6 +2822,20 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
     else if (ERTS_IS_ATOM_STR("eager_check_io",BIF_ARG_1)) {
 	BIF_RET(erts_eager_check_io ? am_true : am_false);
     }
+    else if (ERTS_IS_ATOM_STR("literal_test",BIF_ARG_1)) {
+#ifdef ERTS_HAVE_IS_IN_LITERAL_RANGE
+#ifdef ARCH_64
+	DECL_AM(range);
+	BIF_RET(AM_range);
+#else /* ARCH_32 */
+	DECL_AM(range_bitmask);
+	BIF_RET(AM_range_bitmask);
+#endif /* ARCH_32 */
+#else  /* ! ERTS_HAVE_IS_IN_LITERAL_RANGE */
+	DECL_AM(tag);
+	BIF_RET(AM_tag);
+#endif
+    }
 
     BIF_ERROR(BIF_P, BADARG);
 }
@@ -3267,6 +3324,14 @@ BIF_RETTYPE statistics_1(BIF_ALIST_1)
 	    szp = NULL;
 	    hpp = &hp;
 	}
+#ifdef ERTS_ENABLE_MSACC
+    } else if (BIF_ARG_1 == am_microstate_accounting) {
+        Eterm threads;
+        res = erts_msacc_request(BIF_P, ERTS_MSACC_GATHER, &threads);
+	if (is_non_value(res))
+	    BIF_RET(am_undefined);
+	BIF_TRAP2(gather_msacc_res_trap, BIF_P, res, threads);
+#endif
     } else if (BIF_ARG_1 == am_context_switches) {
 	Eterm cs = erts_make_integer(erts_get_total_context_switches(), BIF_P);
 	hp = HAlloc(BIF_P, 3);
@@ -3487,7 +3552,7 @@ BIF_RETTYPE erts_debug_get_internal_state_1(BIF_ALIST_1)
 	    BIF_RET(res);
 	}
         else if (ERTS_IS_ATOM_STR("mmap", BIF_ARG_1)) {
-            BIF_RET(erts_mmap_debug_info(BIF_P));
+            BIF_RET(erts_mmap_debug_info(&erts_dflt_mmapper, BIF_P));
         }
 	else if (ERTS_IS_ATOM_STR("unique_monotonic_integer_state", BIF_ARG_1)) {
 	    BIF_RET(erts_debug_get_unique_monotonic_integer_state(BIF_P));
@@ -3784,6 +3849,18 @@ BIF_RETTYPE erts_internal_is_system_process_1(BIF_ALIST_1)
     BIF_ERROR(BIF_P, BADARG);
 }
 
+BIF_RETTYPE erts_internal_system_check_1(BIF_ALIST_1)
+{
+    Eterm res;
+    if (ERTS_IS_ATOM_STR("schedulers", BIF_ARG_1)) {
+	res = erts_system_check_request(BIF_P);
+	if (is_non_value(res))
+	    BIF_RET(am_undefined);
+	BIF_TRAP1(gather_system_check_res_trap, BIF_P, res);
+    }
+
+    BIF_ERROR(BIF_P, BADARG);
+}
 
 static erts_smp_atomic_t hipe_test_reschedule_flag;
 
@@ -3798,7 +3875,7 @@ static void broken_halt_test(Eterm bif_arg_2)
 #if defined(ERTS_HAVE_TRY_CATCH)
     erts_get_scheduler_data()->run_queue = NULL;
 #endif
-    erl_exit(ERTS_DUMP_EXIT, "%T", bif_arg_2);
+    erts_exit(ERTS_DUMP_EXIT, "%T", bif_arg_2);
 }
 
 
@@ -3897,9 +3974,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
 		BIF_RET(am_false);
 	    }
 	    else {
-		FLAGS(rp) |= F_FORCE_GC;
-		if (BIF_P != rp)
-		    erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_MAIN);
+		ERTS_FORCE_GC(BIF_P);
 		BIF_RET(am_true);
 	    }
 	}
@@ -4045,7 +4120,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
 		BIF_RET(am_true);
 	}
 	else if (ERTS_IS_ATOM_STR("abort", BIF_ARG_1)) {
-	    erl_exit(ERTS_ABORT_EXIT, "%T\n", BIF_ARG_2);
+	    erts_exit(ERTS_ABORT_EXIT, "%T\n", BIF_ARG_2);
 	}
 	else if (ERTS_IS_ATOM_STR("kill_dist_connection", BIF_ARG_1)) {
 	    DistEntry *dep = erts_sysname_to_connected_dist_entry(BIF_ARG_2);
@@ -4118,6 +4193,17 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
 		BIF_RET(am_ok);
 	    }
 	}
+        else if (ERTS_IS_ATOM_STR("fill_heap", BIF_ARG_1)) {
+            UWord left = HeapWordsLeft(BIF_P);
+            if (left > 1) {
+                Eterm* hp = HAlloc(BIF_P, left);
+                *hp = make_pos_bignum_header(left - 1);
+            }
+            if (BIF_ARG_2 == am_true) {
+                FLAGS(BIF_P) |= F_NEED_FULLSWEEP;
+            }
+            BIF_RET(am_ok);
+        }
     }
 
     BIF_ERROR(BIF_P, BADARG);
@@ -4367,14 +4453,17 @@ static void os_info_init(void)
     os_flavor(buf, 1024);
     flav = erts_atom_put((byte *) buf, strlen(buf), ERTS_ATOM_ENC_LATIN1, 1);
     erts_free(ERTS_ALC_T_TMP, (void *) buf);
-    hp = erts_alloc(ERTS_ALC_T_LL_TEMP_TERM, (3+4)*sizeof(Eterm));
+    hp = erts_alloc(ERTS_ALC_T_LITERAL, (3+4)*sizeof(Eterm));
     os_type_tuple = TUPLE2(hp, type, flav);
+    erts_set_literal_tag(&os_type_tuple, hp, 3);
+
     hp += 3;
     os_version(&major, &minor, &build);
     os_version_tuple = TUPLE3(hp,
 			      make_small(major),
 			      make_small(minor),
 			      make_small(build));
+    erts_set_literal_tag(&os_version_tuple, hp, 4);
 }
 
 void
@@ -4391,6 +4480,10 @@ erts_bif_info_init(void)
 	= erts_export_put(am_erlang, am_gather_gc_info_result, 1);
     gather_io_bytes_trap
 	= erts_export_put(am_erts_internal, am_gather_io_bytes, 2);
+    gather_msacc_res_trap
+	= erts_export_put(am_erts_internal, am_gather_microstate_accounting_result, 2);
+    gather_system_check_res_trap
+	= erts_export_put(am_erts_internal, am_gather_system_check_result, 1);
     process_info_init();
     os_info_init();
 }
diff --git a/erts/emulator/beam/erl_bif_lists.c b/erts/emulator/beam/erl_bif_lists.c
index 5583dcb371..fe64e76575 100644
--- a/erts/emulator/beam/erl_bif_lists.c
+++ b/erts/emulator/beam/erl_bif_lists.c
@@ -42,7 +42,7 @@ static BIF_RETTYPE append(Process* p, Eterm A, Eterm B)
     Eterm last;
     size_t need;
     Eterm* hp;
-    int i;
+    Sint i;
 
     if ((i = erts_list_length(A)) < 0) {
 	BIF_ERROR(p, BADARG);
@@ -99,9 +99,9 @@ static Eterm subtract(Process* p, Eterm A, Eterm B)
     Eterm small_vec[SMALL_VEC_SIZE];	/* Preallocated memory for small lists */
     Eterm* vec_p;
     Eterm* vp;
-    int     i;
-    int     n;
-    int     m;
+    Sint i;
+    Sint n;
+    Sint m;
     
     if ((n = erts_list_length(A)) < 0) {
 	BIF_ERROR(p, BADARG);
diff --git a/erts/emulator/beam/erl_bif_op.c b/erts/emulator/beam/erl_bif_op.c
index c9192fc420..0f20ded1d6 100644
--- a/erts/emulator/beam/erl_bif_op.c
+++ b/erts/emulator/beam/erl_bif_op.c
@@ -89,22 +89,22 @@ BIF_RETTYPE not_1(BIF_ALIST_1)
 
 BIF_RETTYPE sgt_2(BIF_ALIST_2)
 {
-    BIF_RET(cmp_gt(BIF_ARG_1, BIF_ARG_2) ? am_true : am_false);
+    BIF_RET(CMP_GT(BIF_ARG_1, BIF_ARG_2) ? am_true : am_false);
 }
 
 BIF_RETTYPE sge_2(BIF_ALIST_2)
 {
-    BIF_RET(cmp_ge(BIF_ARG_1, BIF_ARG_2) ? am_true : am_false);
+    BIF_RET(CMP_GE(BIF_ARG_1, BIF_ARG_2) ? am_true : am_false);
 }
 
 BIF_RETTYPE slt_2(BIF_ALIST_2)
 {
-    BIF_RET(cmp_lt(BIF_ARG_1, BIF_ARG_2) ? am_true : am_false);
+    BIF_RET(CMP_LT(BIF_ARG_1, BIF_ARG_2) ? am_true : am_false);
 }
 
 BIF_RETTYPE sle_2(BIF_ALIST_2)
 {
-    BIF_RET(cmp_le(BIF_ARG_1, BIF_ARG_2) ? am_true : am_false);
+    BIF_RET(CMP_LE(BIF_ARG_1, BIF_ARG_2) ? am_true : am_false);
 }
 
 BIF_RETTYPE seq_2(BIF_ALIST_2)
@@ -114,7 +114,7 @@ BIF_RETTYPE seq_2(BIF_ALIST_2)
 
 BIF_RETTYPE seqeq_2(BIF_ALIST_2)
 {
-    BIF_RET(cmp_eq(BIF_ARG_1, BIF_ARG_2) ? am_true : am_false);
+    BIF_RET(CMP_EQ(BIF_ARG_1, BIF_ARG_2) ? am_true : am_false);
 }
 
 BIF_RETTYPE sneq_2(BIF_ALIST_2)
@@ -124,7 +124,7 @@ BIF_RETTYPE sneq_2(BIF_ALIST_2)
 
 BIF_RETTYPE sneqeq_2(BIF_ALIST_2)
 {
-    BIF_RET(cmp_ne(BIF_ARG_1, BIF_ARG_2) ? am_true : am_false);
+    BIF_RET(CMP_NE(BIF_ARG_1, BIF_ARG_2) ? am_true : am_false);
 }
 
 BIF_RETTYPE is_atom_1(BIF_ALIST_1)
@@ -258,7 +258,7 @@ Eterm erl_is_function(Process* p, Eterm arg1, Eterm arg2)
 	    BIF_RET(am_true);
 	}
     } else if (is_export(arg1)) {
-	Export* exp = (Export *) EXPAND_POINTER((export_val(arg1))[1]);
+	Export* exp = (Export *) (export_val(arg1)[1]);
 
 	if (exp->code[2] == (Uint) arity) {
 	    BIF_RET(am_true);
diff --git a/erts/emulator/beam/erl_bif_port.c b/erts/emulator/beam/erl_bif_port.c
index e47d7bcbbb..86bcf43678 100644
--- a/erts/emulator/beam/erl_bif_port.c
+++ b/erts/emulator/beam/erl_bif_port.c
@@ -41,6 +41,7 @@
 #include "external.h"
 #include "packet_parser.h"
 #include "erl_bits.h"
+#include "erl_bif_unique.h"
 #include "dtrace-wrapper.h"
 
 static Port *open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump);
@@ -50,10 +51,10 @@ static void free_args(char **);
 
 char *erts_default_arg0 = "default";
 
-BIF_RETTYPE open_port_2(BIF_ALIST_2)
+BIF_RETTYPE erts_internal_open_port_2(BIF_ALIST_2)
 {
     Port *port;
-    Eterm port_id;
+    Eterm res;
     char *str;
     int err_type, err_num;
 
@@ -61,27 +62,58 @@ BIF_RETTYPE open_port_2(BIF_ALIST_2)
     if (!port) {
 	if (err_type == -3) {
 	    ASSERT(err_num == BADARG || err_num == SYSTEM_LIMIT);
-	    BIF_ERROR(BIF_P, err_num);
+	    if (err_num == BADARG)
+                res = am_badarg;
+            else if (err_num == SYSTEM_LIMIT)
+                res = am_system_limit;
+            else
+                /* this is only here to silence gcc, it should not happen */
+                BIF_ERROR(BIF_P, EXC_INTERNAL_ERROR);
 	} else if (err_type == -2) {
 	    str = erl_errno_id(err_num);
+            res = erts_atom_put((byte *) str, strlen(str), ERTS_ATOM_ENC_LATIN1, 1);
 	} else {
-	    str = "einval";
+	    res = am_einval;
 	}
-	BIF_P->fvalue = erts_atom_put((byte *) str, strlen(str), ERTS_ATOM_ENC_LATIN1, 1);
-	BIF_ERROR(BIF_P, EXC_ERROR);
-    }
+        BIF_RET(res);
+    }
+
+    if (port->drv_ptr->flags & ERL_DRV_FLAG_USE_INIT_ACK) {
+        /* Copied from erl_port_task.c */
+        port->async_open_port = erts_alloc(ERTS_ALC_T_PRTSD,
+                                           sizeof(*port->async_open_port));
+        erts_make_ref_in_array(port->async_open_port->ref);
+        port->async_open_port->to = BIF_P->common.id;
+
+        erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCKS_MSG_RECEIVE | ERTS_PROC_LOCK_LINK);
+        if (ERTS_PROC_PENDING_EXIT(BIF_P)) {
+	    /* need to exit caller instead */
+	    erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCKS_MSG_RECEIVE | ERTS_PROC_LOCK_LINK);
+	    KILL_CATCHES(BIF_P);
+	    BIF_P->freason = EXC_EXIT;
+            erts_port_release(port);
+            BIF_RET(am_badarg);
+	}
+
+	ERTS_SMP_MSGQ_MV_INQ2PRIVQ(BIF_P);
+	BIF_P->msg.save = BIF_P->msg.last;
 
-    erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_LINK);
+	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCKS_MSG_RECEIVE);
+
+        res = erts_proc_store_ref(BIF_P, port->async_open_port->ref);
+    } else {
+        res = port->common.id;
+        erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_LINK);
+    }
 
-    port_id = port->common.id;
     erts_add_link(&ERTS_P_LINKS(port), LINK_PID, BIF_P->common.id);
-    erts_add_link(&ERTS_P_LINKS(BIF_P), LINK_PID, port_id);
+    erts_add_link(&ERTS_P_LINKS(BIF_P), LINK_PID, port->common.id);
 
     erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_LINK);
 
     erts_port_release(port);
 
-    BIF_RET(port_id);
+    BIF_RET(res);
 }
 
 static ERTS_INLINE Port *
@@ -617,7 +649,7 @@ BIF_RETTYPE port_get_data_1(BIF_ALIST_1)
 static Port *
 open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump)
 {
-    int i;
+    Sint i;
     Eterm option;
     Uint arity;
     Eterm* tp;
@@ -791,7 +823,7 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump)
 	} else {
 	    name_buf = (char *) erts_alloc(ERTS_ALC_T_TMP, i + 1);
 	    if (intlist_to_buf(name, name_buf, i) != i)
-		erl_exit(1, "%s:%d: Internal error\n", __FILE__, __LINE__);
+		erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error\n", __FILE__, __LINE__);
 	    name_buf[i] = '\0';
 	}
 	driver = &vanilla_driver;
@@ -945,8 +977,8 @@ static char **convert_args(Eterm l)
 {
     char **pp;
     char *b;
-    int n;
-    int i = 0;
+    Sint n;
+    Sint i = 0;
     Eterm str;
     if (is_not_list(l) && is_not_nil(l)) {
 	return NULL;
@@ -992,7 +1024,7 @@ static byte* convert_environment(Process* p, Eterm env)
     Eterm* temp_heap;
     Eterm* hp;
     Uint heap_size;
-    int n;
+    Sint n;
     Sint size;
     byte* bytes;
     int encoding = erts_get_native_filename_encoding();
@@ -1169,7 +1201,7 @@ static Eterm http_bld_uri(struct packet_callback_args* pca,
         return erts_bld_tuple(hpp, szp, 3, am_scheme, s1, s2);
                               
     default:
-        erl_exit(1, "%s, line %d: type=%u\n", __FILE__, __LINE__, uri->type);
+        erts_exit(ERTS_ERROR_EXIT, "%s, line %d: type=%u\n", __FILE__, __LINE__, uri->type);
     }
 }
 
diff --git a/erts/emulator/beam/erl_bif_re.c b/erts/emulator/beam/erl_bif_re.c
index 86951f32b0..7f7cd376ac 100644
--- a/erts/emulator/beam/erl_bif_re.c
+++ b/erts/emulator/beam/erl_bif_re.c
@@ -100,7 +100,7 @@ Sint erts_re_set_loop_limit(Sint limit)
 
 static int term_to_int(Eterm term, int *sp)
 {
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 
     if (is_small(term)) {
 	Uint x = signed_val(term);
@@ -151,7 +151,7 @@ static int term_to_int(Eterm term, int *sp)
 
 static Eterm make_signed_integer(int x, Process *p)
 {
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
     return make_small(x);
 #else
     Eterm* hp;
diff --git a/erts/emulator/beam/erl_bif_trace.c b/erts/emulator/beam/erl_bif_trace.c
index 03f51132b1..71a7079b09 100644
--- a/erts/emulator/beam/erl_bif_trace.c
+++ b/erts/emulator/beam/erl_bif_trace.c
@@ -431,6 +431,9 @@ Uint
 erts_trace_flag2bit(Eterm flag) 
 {
     switch (flag) {
+    case am_timestamp: return F_NOW_TS;
+    case am_strict_monotonic_timestamp: return F_STRICT_MON_TS;
+    case am_monotonic_timestamp: return F_MON_TS;
     case am_all: return TRACEE_FLAGS;
     case am_send: return F_TRACE_SEND;
     case am_receive: return F_TRACE_RECEIVE;
@@ -439,7 +442,6 @@ erts_trace_flag2bit(Eterm flag)
     case am_set_on_first_spawn: return F_TRACE_SOS1;
     case am_set_on_link: return F_TRACE_SOL;
     case am_set_on_first_link: return F_TRACE_SOL1;
-    case am_timestamp: return F_TIMESTAMP;
     case am_running: return F_TRACE_SCHED;
     case am_exiting: return F_TRACE_SCHED_EXIT;
     case am_garbage_collection: return F_TRACE_GC;
@@ -592,7 +594,7 @@ Eterm trace_3(BIF_ALIST_3)
 	    ERTS_TRACE_FLAGS(tracee_port) |= mask;
 	else
 	    ERTS_TRACE_FLAGS(tracee_port) &= ~mask;
-	
+
 	if (!ERTS_TRACE_FLAGS(tracee_port))
 	    ERTS_TRACER_PROC(tracee_port) = NIL;
 	else if (tracer != NIL)
@@ -978,7 +980,7 @@ trace_info_pid(Process* p, Eterm pid_spec, Eterm key)
     }
 
     if (key == am_flags) {
-	int num_flags = 19;	/* MAXIMUM number of flags. */
+	int num_flags = 21;	/* MAXIMUM number of flags. */
 	Uint needed = 3+2*num_flags;
 	Eterm flag_list = NIL;
 	Eterm* limit;
@@ -996,6 +998,9 @@ trace_info_pid(Process* p, Eterm pid_spec, Eterm key)
 #endif
         hp = HAlloc(p, needed);
 	limit = hp+needed;
+	FLAG(F_NOW_TS, am_timestamp);
+	FLAG(F_STRICT_MON_TS, am_strict_monotonic_timestamp);
+	FLAG(F_MON_TS, am_monotonic_timestamp);
 	FLAG(F_TRACE_SEND, am_send);
 	FLAG(F_TRACE_RECEIVE, am_receive);
 	FLAG(F_TRACE_SOS, am_set_on_spawn);
@@ -1007,7 +1012,6 @@ trace_info_pid(Process* p, Eterm pid_spec, Eterm key)
 	FLAG(F_TRACE_SCHED, am_running);
 	FLAG(F_TRACE_SCHED_EXIT, am_exiting);
 	FLAG(F_TRACE_GC, am_garbage_collection);
-	FLAG(F_TIMESTAMP, am_timestamp);
 	FLAG(F_TRACE_ARITY_ONLY, am_arity);
 	FLAG(F_TRACE_RETURN_TO, am_return_to);
 	FLAG(F_TRACE_SILENT, am_silent);
@@ -1798,7 +1802,11 @@ Eterm erts_seq_trace(Process *p, Eterm arg1, Eterm arg2,
     } else if (arg1 == am_print) {
 	current_flag = SEQ_TRACE_PRINT; 
     } else if (arg1 == am_timestamp) {
-	current_flag = SEQ_TRACE_TIMESTAMP; 
+	current_flag = SEQ_TRACE_NOW_TS; 
+    } else if (arg1 == am_strict_monotonic_timestamp) {
+	current_flag = SEQ_TRACE_STRICT_MON_TS; 
+    } else if (arg1 == am_monotonic_timestamp) {
+	current_flag = SEQ_TRACE_MON_TS; 
     }
     else
 	current_flag = 0;
@@ -1879,11 +1887,7 @@ new_seq_trace_token(Process* p)
 {
     Eterm* hp;
 
-    if (SEQ_TRACE_TOKEN(p) == NIL
-#ifdef USE_VM_PROBES
-	|| SEQ_TRACE_TOKEN(p) == am_have_dt_utag
-#endif
-	) {
+    if (have_no_seqtrace(SEQ_TRACE_TOKEN(p))) {
 	hp = HAlloc(p, 6);
 	SEQ_TRACE_TOKEN(p) = TUPLE5(hp, make_small(0),		/* Flags  */ 
 				    make_small(0),		/* Label  */
@@ -1903,13 +1907,11 @@ BIF_RETTYPE erl_seq_trace_info(Process *p, Eterm item)
 	BIF_ERROR(p, BADARG);
     }
 
-    if (SEQ_TRACE_TOKEN(p) == NIL
-#ifdef USE_VM_PROBES
-	|| SEQ_TRACE_TOKEN(p) == am_have_dt_utag
-#endif
-	) {
-	if ((item == am_send) || (item == am_receive) || 
-	    (item == am_print) || (item == am_timestamp)) {
+    if (have_no_seqtrace(SEQ_TRACE_TOKEN(p))) {
+	if ((item == am_send)  || (item == am_receive) || 
+	    (item == am_print) || (item == am_timestamp)
+	    || (item == am_monotonic_timestamp)
+	    || (item == am_strict_monotonic_timestamp)) {
 	    hp = HAlloc(p,3);
 	    res = TUPLE2(hp, item, am_false);
 	    BIF_RET(res);
@@ -1927,7 +1929,11 @@ BIF_RETTYPE erl_seq_trace_info(Process *p, Eterm item)
     } else if (item == am_print) {
 	current_flag = SEQ_TRACE_PRINT; 
     } else if (item == am_timestamp) {
-	current_flag = SEQ_TRACE_TIMESTAMP; 
+	current_flag = SEQ_TRACE_NOW_TS; 
+    } else if (item == am_strict_monotonic_timestamp) {
+	current_flag = SEQ_TRACE_STRICT_MON_TS; 
+    } else if (item == am_monotonic_timestamp) {
+	current_flag = SEQ_TRACE_MON_TS; 
     } else {
 	current_flag = 0;
     }
@@ -1964,11 +1970,7 @@ BIF_RETTYPE seq_trace_info_1(BIF_ALIST_1)
  */
 BIF_RETTYPE seq_trace_print_1(BIF_ALIST_1)    
 {
-    if (SEQ_TRACE_TOKEN(BIF_P) == NIL 
-#ifdef USE_VM_PROBES
-	|| SEQ_TRACE_TOKEN(BIF_P) == am_have_dt_utag
-#endif
-	) {
+    if (have_no_seqtrace(SEQ_TRACE_TOKEN(BIF_P))) {
 	BIF_RET(am_false);
     }
     seq_trace_update_send(BIF_P);
@@ -1987,11 +1989,7 @@ BIF_RETTYPE seq_trace_print_1(BIF_ALIST_1)
  */
 BIF_RETTYPE seq_trace_print_2(BIF_ALIST_2)    
 {
-    if (SEQ_TRACE_TOKEN(BIF_P) == NIL
-#ifdef USE_VM_PROBES
-	|| SEQ_TRACE_TOKEN(BIF_P) == am_have_dt_utag
-#endif
-	) {
+    if (have_no_seqtrace(SEQ_TRACE_TOKEN(BIF_P))) {
 	BIF_RET(am_false);
     }
     if (!(is_atom(BIF_ARG_1) || is_small(BIF_ARG_1))) {
@@ -2237,6 +2235,7 @@ static Eterm system_profile_get(Process *p) {
 	if (erts_system_profile_flags.exclusive) {
 	    res = CONS(hp, am_exclusive, res); hp += 2;
 	}
+
     	return TUPLE2(hp, system_profile, res);
     }
 }
@@ -2255,6 +2254,7 @@ BIF_RETTYPE system_profile_2(BIF_ALIST_2)
     int system_blocked = 0;
     Process *profiler_p = NULL;
     Port *profiler_port = NULL;
+    int ts;
 
     if (profiler == am_undefined || list == NIL) {
 	prev = system_profile_get(p);
@@ -2286,7 +2286,8 @@ BIF_RETTYPE system_profile_2(BIF_ALIST_2)
 	    goto error;
 	}
 
-	for (scheduler = 0, runnable_ports = 0, runnable_procs = 0, exclusive = 0;
+	for (ts = ERTS_TRACE_FLG_NOW_TIMESTAMP, scheduler = 0,
+		 runnable_ports = 0, runnable_procs = 0, exclusive = 0;
 	    is_list(list);
 	    list = CDR(list_val(list))) {
 	    
@@ -2299,6 +2300,12 @@ BIF_RETTYPE system_profile_2(BIF_ALIST_2)
 		exclusive = !0;
 	    } else if (t == am_scheduler) {
 		scheduler = !0;
+	    } else if (t == am_timestamp) {
+		ts = ERTS_TRACE_FLG_NOW_TIMESTAMP;
+	    } else if (t == am_strict_monotonic_timestamp) {
+		ts = ERTS_TRACE_FLG_STRICT_MONOTONIC_TIMESTAMP;
+	    } else if (t == am_monotonic_timestamp) {
+		ts = ERTS_TRACE_FLG_MONOTONIC_TIMESTAMP;
 	    } else goto error;
 	}	
 	if (is_not_nil(list)) goto error;
@@ -2311,7 +2318,7 @@ BIF_RETTYPE system_profile_2(BIF_ALIST_2)
 	erts_system_profile_flags.runnable_ports = !!runnable_ports;
 	erts_system_profile_flags.runnable_procs = !!runnable_procs;
 	erts_system_profile_flags.exclusive = !!exclusive;
-
+	erts_system_profile_ts_type = ts;
 	erts_smp_thr_progress_unblock();
 	erts_smp_proc_lock(p, ERTS_PROC_LOCK_MAIN);
 	
diff --git a/erts/emulator/beam/erl_bif_unique.c b/erts/emulator/beam/erl_bif_unique.c
index 5eca09c5a6..c9c8561f64 100644
--- a/erts/emulator/beam/erl_bif_unique.c
+++ b/erts/emulator/beam/erl_bif_unique.c
@@ -266,17 +266,19 @@ static ERTS_INLINE Eterm unique_integer_bif(Process *c_p, int positive)
 }
 
 Uint
-erts_raw_unique_integer_heap_size(Uint64 val[ERTS_UNIQUE_INT_RAW_VALUES])
+erts_raw_unique_integer_heap_size(Uint64 val[ERTS_UNIQUE_INT_RAW_VALUES],
+                                  int positive)
 {
     Uint sz;
-    bld_unique_integer_term(NULL, &sz, val[0], val[1], 0);
+    bld_unique_integer_term(NULL, &sz, val[0], val[1], positive);
     return sz;
 }
 
 Eterm
-erts_raw_make_unique_integer(Eterm **hpp, Uint64 val[ERTS_UNIQUE_INT_RAW_VALUES])
+erts_raw_make_unique_integer(Eterm **hpp, Uint64 val[ERTS_UNIQUE_INT_RAW_VALUES],
+    int positive)
 {
-    return bld_unique_integer_term(hpp, NULL, val[0], val[1], 0);
+    return bld_unique_integer_term(hpp, NULL, val[0], val[1], positive);
 }
 
 void
@@ -338,7 +340,7 @@ static struct {
     } w;
 } raw_unique_monotonic_integer erts_align_attribute(ERTS_CACHE_LINE_SIZE);
 
-#if defined(ARCH_32) || HALFWORD_HEAP
+#if defined(ARCH_32)
 #  define ERTS_UNIQUE_MONOTONIC_OFFSET ERTS_SINT64_MIN
 #else
 #  define ERTS_UNIQUE_MONOTONIC_OFFSET MIN_SMALL
@@ -368,7 +370,7 @@ get_unique_monotonic_integer_heap_size(Uint64 raw, int positive)
 	Sint64 value = ((Sint64) raw) + ERTS_UNIQUE_MONOTONIC_OFFSET;
 	if (IS_SSMALL(value))
 	    return 0;
-#if defined(ARCH_32) || HALFWORD_HEAP
+#if defined(ARCH_32)
 	return ERTS_SINT64_HEAP_SIZE(value);
 #else
 	return ERTS_UINT64_HEAP_SIZE((Uint64) value);
@@ -393,7 +395,7 @@ make_unique_monotonic_integer_value(Eterm *hp, Uint hsz, Uint64 raw, int positiv
 	if (hsz == 0)
 	    res = make_small(value);
 	else {
-#if defined(ARCH_32) || HALFWORD_HEAP
+#if defined(ARCH_32)
 	    res = erts_sint64_to_big(value, &hp);
 #else 
 	    res = erts_uint64_to_big((Uint64) value, &hp);
@@ -426,16 +428,16 @@ erts_raw_get_unique_monotonic_integer(void)
 }
 
 Uint
-erts_raw_unique_monotonic_integer_heap_size(Sint64 raw)
+erts_raw_unique_monotonic_integer_heap_size(Sint64 raw, int positive)
 {
-    return get_unique_monotonic_integer_heap_size(raw, 0);
+    return get_unique_monotonic_integer_heap_size(raw, positive);
 }
 
 Eterm
-erts_raw_make_unique_monotonic_integer_value(Eterm **hpp, Sint64 raw)
+erts_raw_make_unique_monotonic_integer_value(Eterm **hpp, Sint64 raw, int positive)
 {
-    Uint hsz = get_unique_monotonic_integer_heap_size(raw, 0);
-    Eterm res = make_unique_monotonic_integer_value(*hpp, hsz, raw, 0);
+    Uint hsz = get_unique_monotonic_integer_heap_size(raw, positive);
+    Eterm res = make_unique_monotonic_integer_value(*hpp, hsz, raw, positive);
     *hpp += hsz;
     return res;
 }
diff --git a/erts/emulator/beam/erl_bif_unique.h b/erts/emulator/beam/erl_bif_unique.h
index 37d5d91c39..94fd6163f2 100644
--- a/erts/emulator/beam/erl_bif_unique.h
+++ b/erts/emulator/beam/erl_bif_unique.h
@@ -41,8 +41,9 @@ void erts_make_ref_in_array(Uint32 ref[ERTS_MAX_REF_NUMBERS]);
  * not necessarily correspond to the end result.
  */
 Sint64 erts_raw_get_unique_monotonic_integer(void);
-Uint erts_raw_unique_monotonic_integer_heap_size(Sint64 raw);
-Eterm erts_raw_make_unique_monotonic_integer_value(Eterm **hpp, Sint64 raw);
+Uint erts_raw_unique_monotonic_integer_heap_size(Sint64 raw, int positive);
+Eterm erts_raw_make_unique_monotonic_integer_value(Eterm **hpp, Sint64 raw,
+                                                   int positive);
 
 Sint64 erts_get_min_unique_monotonic_integer(void);
 
@@ -53,8 +54,11 @@ Eterm erts_debug_get_unique_monotonic_integer_state(Process *c_p);
 #define ERTS_UNIQUE_INT_RAW_VALUES 2
 #define ERTS_MAX_UNIQUE_INT_HEAP_SIZE ERTS_UINT64_ARRAY_TO_BIG_MAX_HEAP_SZ(2)
 
-Uint erts_raw_unique_integer_heap_size(Uint64 val[ERTS_UNIQUE_INT_RAW_VALUES]);
-Eterm erts_raw_make_unique_integer(Eterm **hpp, Uint64 val[ERTS_UNIQUE_INT_RAW_VALUES]);
+Uint erts_raw_unique_integer_heap_size(Uint64 val[ERTS_UNIQUE_INT_RAW_VALUES],
+                                       int positive);
+Eterm erts_raw_make_unique_integer(Eterm **hpp,
+                                   Uint64 val[ERTS_UNIQUE_INT_RAW_VALUES],
+                                   int postive);
 void erts_raw_get_unique_integer(Uint64 val[ERTS_UNIQUE_INT_RAW_VALUES]);
 Sint64 erts_get_min_unique_integer(void);
 
diff --git a/erts/emulator/beam/erl_binary.h b/erts/emulator/beam/erl_binary.h
index ea01bf08f0..e181b5555d 100644
--- a/erts/emulator/beam/erl_binary.h
+++ b/erts/emulator/beam/erl_binary.h
@@ -72,7 +72,6 @@ typedef struct erl_heap_bin {
  */
 
 #define binary_size(Bin) (binary_val(Bin)[1])
-#define binary_size_rel(Bin,BasePtr) (binary_val_rel(Bin,BasePtr)[1])
 
 #define binary_bitsize(Bin)			\
   ((*binary_val(Bin) == HEADER_SUB_BIN) ?	\
@@ -95,12 +94,9 @@ typedef struct erl_heap_bin {
  * Bitsize: output variable (Uint)
  */
 
-#define ERTS_GET_BINARY_BYTES(Bin,Bytep,Bitoffs,Bitsize) \
-     ERTS_GET_BINARY_BYTES_REL(Bin,Bytep,Bitoffs,Bitsize,NULL)
-
-#define ERTS_GET_BINARY_BYTES_REL(Bin,Bytep,Bitoffs,Bitsize,BasePtr)    \
+#define ERTS_GET_BINARY_BYTES(Bin,Bytep,Bitoffs,Bitsize)                \
 do {									\
-    Eterm* _real_bin = binary_val_rel(Bin,BasePtr);			\
+    Eterm* _real_bin = binary_val(Bin);		                	\
     Uint _offs = 0;							\
     Bitoffs = Bitsize = 0;						\
     if (*_real_bin == HEADER_SUB_BIN) {					\
@@ -108,7 +104,7 @@ do {									\
 	_offs = _sb->offs;						\
         Bitoffs = _sb->bitoffs;						\
         Bitsize = _sb->bitsize;						\
-	_real_bin = binary_val_rel(_sb->orig,BasePtr);			\
+	_real_bin = binary_val(_sb->orig);	        		\
     }									\
     if (*_real_bin == HEADER_PROC_BIN) {				\
 	Bytep = ((ProcBin *) _real_bin)->bytes + _offs;			\
@@ -131,11 +127,8 @@ do {									\
  */
 
 #define ERTS_GET_REAL_BIN(Bin, RealBin, ByteOffset, BitOffset, BitSize) \
-     ERTS_GET_REAL_BIN_REL(Bin, RealBin, ByteOffset, BitOffset, BitSize, NULL)
-
-#define ERTS_GET_REAL_BIN_REL(Bin, RealBin, ByteOffset, BitOffset, BitSize, BasePtr) \
   do {									\
-    ErlSubBin* _sb = (ErlSubBin *) binary_val_rel(Bin,BasePtr);	        \
+    ErlSubBin* _sb = (ErlSubBin *) binary_val(Bin);	                \
     if (_sb->thing_word == HEADER_SUB_BIN) {				\
       RealBin = _sb->orig;						\
       ByteOffset = _sb->offs;						\
diff --git a/erts/emulator/beam/erl_bits.c b/erts/emulator/beam/erl_bits.c
index 01734c55d7..11d83686a3 100644
--- a/erts/emulator/beam/erl_bits.c
+++ b/erts/emulator/beam/erl_bits.c
@@ -282,7 +282,7 @@ erts_bs_get_integer_2(Process *p, Uint num_bits, unsigned flags, ErlBinMatchBuff
 	 * Simply shift whole bytes into the result.
 	 */
 	switch (BYTE_OFFSET(n)) {
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 	case 7: w = (w << 8) | *bp++;
 	case 6: w = (w << 8) | *bp++;
 	case 5: w = (w << 8) | *bp++;
@@ -387,7 +387,7 @@ erts_bs_get_integer_2(Process *p, Uint num_bits, unsigned flags, ErlBinMatchBuff
     case 3: 
 	v32 = LSB[0] + (LSB[1]<<8) + (LSB[2]<<16); 
 	goto big_small;
-#if !defined(ARCH_64) || HALFWORD_HEAP
+#if !defined(ARCH_64)
     case 4:
 	v32 = (LSB[0] + (LSB[1]<<8) + (LSB[2]<<16) + (LSB[3]<<24));
 	if (!IS_USMALL(sgn, v32)) {
diff --git a/erts/emulator/beam/erl_cpu_topology.c b/erts/emulator/beam/erl_cpu_topology.c
index 8395f6ecc6..c263eebfcc 100644
--- a/erts/emulator/beam/erl_cpu_topology.c
+++ b/erts/emulator/beam/erl_cpu_topology.c
@@ -402,7 +402,7 @@ cpu_bind_order_sort(erts_cpu_topology_t *cpudata,
 	    break;
 	default:
 	    cmp_func = NULL;
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "Bad cpu bind type: %d\n",
 		     (int) cpu_bind_order);
 	    break;
@@ -1590,7 +1590,7 @@ get_cpu_topology_term(Process *c_p, int type)
 	}
 	break;
     default:
-	erl_exit(ERTS_ABORT_EXIT, "Bad cpu topology type: %d\n", type);
+	erts_exit(ERTS_ABORT_EXIT, "Bad cpu topology type: %d\n", type);
 	break;
     }
 
@@ -1967,7 +1967,7 @@ cpu_group_insert(erts_cpu_groups_map_t *map,
 	    ix = 0;
     } while (ix != start);
 
-    erl_exit(ERTS_ABORT_EXIT, "Reader groups map full\n");
+    erts_exit(ERTS_ABORT_EXIT, "Reader groups map full\n");
 }
 
 
@@ -2290,7 +2290,7 @@ remove_cpu_groups(erts_cpu_groups_callback_t callback, void *arg)
 	prev_cgm = cgm;
     }
 
-    erl_exit(ERTS_ABORT_EXIT, "Cpu groups not found\n");
+    erts_exit(ERTS_ABORT_EXIT, "Cpu groups not found\n");
 }
 
 static int
@@ -2320,7 +2320,7 @@ cpu_groups_lookup(erts_cpu_groups_map_t *map,
 	    ix = 0;
     } while (ix != start);
 
-    erl_exit(ERTS_ABORT_EXIT, "Logical cpu id %d not found\n", logical);
+    erts_exit(ERTS_ABORT_EXIT, "Logical cpu id %d not found\n", logical);
 }
 
 static void
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c
index 878ee32b47..441dbdde4f 100644
--- a/erts/emulator/beam/erl_db.c
+++ b/erts/emulator/beam/erl_db.c
@@ -1295,7 +1295,7 @@ BIF_RETTYPE ets_rename_2(BIF_ALIST_2)
 	goto badarg;
 
     if (!remove_named_tab(tb, 1))
-	erl_exit(1,"Could not find named tab %s", tb->common.id);
+	erts_exit(ERTS_ERROR_EXIT,"Could not find named tab %s", tb->common.id);
 
     tb->common.id = tb->common.the_name = BIF_ARG_2;
 
@@ -1376,7 +1376,6 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
 	    status |= DB_ORDERED_SET;
 	    status &= ~(DB_SET | DB_BAG | DB_DUPLICATE_BAG);
 	}
-	/*TT*/
 	else if (is_tuple(val)) {
 	    Eterm *tp = tuple_val(val);
 	    if (arityval(tp[0]) == 2) {
@@ -1581,7 +1580,7 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
 			   BIF_P->common.id,
 			   make_small(slot)),
 		    0) != DB_ERROR_NONE) {
-	erl_exit(1,"Could not update ets metadata.");
+	erts_exit(ERTS_ERROR_EXIT,"Could not update ets metadata.");
     }
     db_meta_unlock(meta_pid_to_tab, LCK_WRITE_REC);
 
@@ -1774,15 +1773,9 @@ BIF_RETTYPE ets_delete_1(BIF_ALIST_1)
 	 * (it looks like an continuation pointer), but that is will crash the
 	 * emulator if this BIF is call traced.
 	 */
-#if HALFWORD_HEAP
-	Eterm *hp = HAlloc(BIF_P, 3);
-	hp[0] = make_pos_bignum_header(2);
-	*((UWord *) (UWord) (hp+1)) = (UWord) tb;
-#else
 	Eterm *hp = HAlloc(BIF_P, 2);
 	hp[0] = make_pos_bignum_header(1);
 	hp[1] = (Eterm) tb;
-#endif
 	BIF_TRAP1(&ets_delete_continue_exp, BIF_P, make_big(hp));
     }
     else {
@@ -1838,7 +1831,7 @@ BIF_RETTYPE ets_give_away_3(BIF_ALIST_3)
 			     tb->common.id,
 			     from_pid,
 			     BIF_ARG_3), 
-		      0);
+                      0);
     erts_smp_proc_unlock(to_proc, to_locks);
     UnUseTmpHeap(5,BIF_P);
     BIF_RET(am_true);
@@ -2840,7 +2833,7 @@ BIF_RETTYPE ets_match_spec_run_r_3(BIF_ALIST_3)
 	    BIF_TRAP3(bif_export[BIF_ets_match_spec_run_r_3],
 		      BIF_P,lst,BIF_ARG_2,ret);
 	}
-	res = db_prog_match(BIF_P, mp, CAR(list_val(lst)), NULL, NULL, 0,
+	res = db_prog_match(BIF_P, mp, CAR(list_val(lst)), NULL, 0,
 			    ERTS_PAM_COPY_RESULT, &dummy);
 	if (is_value(res)) {
 	    hp = HAlloc(BIF_P, 2);
@@ -2940,7 +2933,7 @@ void init_db(ErtsDbSpinCount db_spin_count)
 
     bits = erts_fit_in_bits_int32(db_max_tabs-1);
     if (bits > SMALL_BITS) {
-	erl_exit(1,"Max limit for ets tabled too high %u (max %u).",
+	erts_exit(ERTS_ERROR_EXIT,"Max limit for ets tabled too high %u (max %u).",
 		 db_max_tabs, ((Uint)1)<<SMALL_BITS);
     }
     meta_main_tab_slot_mask = (((Uint)1)<<bits) - 1;
@@ -3001,7 +2994,7 @@ void init_db(ErtsDbSpinCount db_spin_count)
     db_init_lock(meta_pid_to_tab, "meta_pid_to_tab", "meta_pid_to_tab_FIX");*/
 
     if (db_create_hash(NULL, meta_pid_to_tab) != DB_ERROR_NONE) {
-	erl_exit(1,"Unable to create ets metadata tables.");
+	erts_exit(ERTS_ERROR_EXIT,"Unable to create ets metadata tables.");
     }
 
     erts_smp_atomic_set_nob(&init_tb.common.memory_size, 0);
@@ -3032,7 +3025,7 @@ void init_db(ErtsDbSpinCount db_spin_count)
     db_init_lock(meta_pid_to_fixed_tab, "meta_pid_to_fixed_tab", "meta_pid_to_fixed_tab_FIX");*/
 
     if (db_create_hash(NULL, meta_pid_to_fixed_tab) != DB_ERROR_NONE) {
-	erl_exit(1,"Unable to create ets metadata tables.");
+	erts_exit(ERTS_ERROR_EXIT,"Unable to create ets metadata tables.");
     }
 
     /* Non visual BIF to trap to. */
@@ -3217,7 +3210,7 @@ retry:
 			     tb->common.id,
 			     p->common.id,
 			     heir_data), 
-		      0);
+                      0);
     erts_smp_proc_unlock(to_proc, to_locks);
     return !0;
 }
@@ -3229,7 +3222,7 @@ retry:
  * yielding.
  */
 #define ERTS_DB_INTERNAL_ERROR(LSTR) \
-  erl_exit(ERTS_ABORT_EXIT, "%s:%d:erts_db_process_exiting(): " LSTR "\n", \
+  erts_exit(ERTS_ABORT_EXIT, "%s:%d:erts_db_process_exiting(): " LSTR "\n", \
 	   __FILE__, __LINE__)
 
 int
@@ -3466,10 +3459,10 @@ static void fix_table_locked(Process* p, DbTable* tb)
 #endif
     erts_refc_inc(&tb->common.ref,1);
     fix = tb->common.fixations;
-    if (fix == NULL) { 
-	get_now(&(tb->common.megasec),
-		&(tb->common.sec), 
-		&(tb->common.microsec));
+    if (fix == NULL) {
+	tb->common.time.monotonic
+	    = erts_get_monotonic_time(ERTS_PROC_GET_SCHDATA(p));
+	tb->common.time.offset = erts_get_time_offset();
     }
     else {
 	for (; fix != NULL; fix = fix->next) {
@@ -3501,7 +3494,7 @@ static void fix_table_locked(Process* p, DbTable* tb)
 			   make_small(tb->common.slot)),
 		    0) != DB_ERROR_NONE) {
 	UnUseTmpHeap(3,p);
-	erl_exit(1,"Could not insert ets metadata in safe_fixtable.");
+	erts_exit(ERTS_ERROR_EXIT,"Could not insert ets metadata in safe_fixtable.");
     }	
     UnUseTmpHeap(3,p);
     db_meta_unlock(meta_pid_to_fixed_tab, LCK_WRITE_REC);
@@ -3652,11 +3645,8 @@ static BIF_RETTYPE ets_delete_trap(BIF_ALIST_1)
     Eterm* ptr = big_val(cont);
     DbTable *tb = *((DbTable **) (UWord) (ptr + 1));
 
-#if HALFWORD_HEAP
-    ASSERT(*ptr == make_pos_bignum_header(2));
-#else
     ASSERT(*ptr == make_pos_bignum_header(1));
-#endif
+
     db_lock(tb, LCK_WRITE);
     trap = free_table_cont(p, tb, 0, 1);
     db_unlock(tb, LCK_WRITE);
@@ -3731,6 +3721,7 @@ static int free_table_cont(Process *p,
 static Eterm table_info(Process* p, DbTable* tb, Eterm What)
 {
     Eterm ret = THE_NON_VALUE;
+    int use_monotonic;
 
     if (What == am_size) {
 	ret = make_small(erts_smp_atomic_read_nob(&tb->common.nitems));
@@ -3788,7 +3779,10 @@ static Eterm table_info(Process* p, DbTable* tb, Eterm What)
 	    ret = am_true;
 	else
 	    ret = am_false;
-    } else if (What == am_atom_put("safe_fixed",10)) {
+    } else if ((use_monotonic
+		= ERTS_IS_ATOM_STR("safe_fixed_monotonic_time",
+				   What))
+	       || ERTS_IS_ATOM_STR("safe_fixed", What)) {
 #ifdef ERTS_SMP
 	erts_smp_mtx_lock(&tb->common.fixlock);
 #endif
@@ -3797,7 +3791,19 @@ static Eterm table_info(Process* p, DbTable* tb, Eterm What)
 	    Eterm *hp;
 	    Eterm tpl, lst;
 	    DbFixation *fix;
-	    need = 7;
+	    Sint64 mtime;
+	    
+	    need = 3;
+	    if (use_monotonic) {
+		mtime = (Sint64) tb->common.time.monotonic;
+		mtime += ERTS_MONOTONIC_OFFSET_NATIVE;
+		if (!IS_SSMALL(mtime))
+		    need += ERTS_SINT64_HEAP_SIZE(mtime);
+	    }
+	    else {
+		mtime = 0;
+		need += 4;
+	    }
 	    for (fix = tb->common.fixations; fix != NULL; fix = fix->next) {
 		need += 5;
 	    }
@@ -3809,11 +3815,18 @@ static Eterm table_info(Process* p, DbTable* tb, Eterm What)
 		lst = CONS(hp,tpl,lst);
 		hp += 2;
 	    }
-	    tpl = TUPLE3(hp,
-			 make_small(tb->common.megasec),
-			 make_small(tb->common.sec),
-			 make_small(tb->common.microsec));
-	    hp += 4;
+	    if (use_monotonic)
+		tpl = (IS_SSMALL(mtime)
+		       ? make_small(mtime)
+		       : erts_sint64_to_big(mtime, &hp));
+	    else {
+		Uint ms, s, us;
+		erts_make_timestamp_value(&ms, &s, &us,
+					  tb->common.time.monotonic,
+					  tb->common.time.offset);
+		tpl = TUPLE3(hp, make_small(ms), make_small(s), make_small(us));
+		hp += 4;
+	    }
 	    ret = TUPLE2(hp, tpl, lst);
 	} else {
 	    ret = am_false;
diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c
index 98a2e2842a..240b79fc60 100644
--- a/erts/emulator/beam/erl_db_hash.c
+++ b/erts/emulator/beam/erl_db_hash.c
@@ -469,9 +469,6 @@ static ERTS_INLINE void try_shrink(DbTableHash* tb)
     }
 }	
 
-#define EQ_REL(x,y,y_base) \
-    (is_same(x,NULL,y,y_base) || (is_not_both_immed((x),(y)) && eq_rel((x),NULL,(y),y_base)))
-
 /* Is this a live object (not pseodo-deleted) with the specified key? 
 */
 static ERTS_INLINE int has_live_key(DbTableHash* tb, HashDbTerm* b,
@@ -481,7 +478,7 @@ static ERTS_INLINE int has_live_key(DbTableHash* tb, HashDbTerm* b,
     else {
 	Eterm itemKey = GETKEY(tb, b->dbterm.tpl);
 	ASSERT(!is_header(itemKey));
-	return EQ_REL(key, itemKey, b->dbterm.tpl);
+	return EQ(key, itemKey);
     }
 }
 
@@ -494,7 +491,7 @@ static ERTS_INLINE int has_key(DbTableHash* tb, HashDbTerm* b,
     else {
 	Eterm itemKey = GETKEY(tb, b->dbterm.tpl);
 	ASSERT(!is_header(itemKey));
-	return EQ_REL(key, itemKey, b->dbterm.tpl);
+	return EQ(key, itemKey);
     }
 }
 
@@ -2204,11 +2201,11 @@ static void db_print_hash(int to, void *to_arg, int show, DbTable *tbl)
 		    erts_print(to, to_arg, "*");
 		if (tb->common.compress) {
 		    Eterm key = GETKEY(tb, list->dbterm.tpl);
-		    erts_print(to, to_arg, "key=%R", key, list->dbterm.tpl);
+		    erts_print(to, to_arg, "key=%T", key);
 		}
 		else {
-		    Eterm obj = make_tuple_rel(list->dbterm.tpl,list->dbterm.tpl);
-		    erts_print(to, to_arg, "%R", obj, list->dbterm.tpl);
+		    Eterm obj = make_tuple(list->dbterm.tpl);
+		    erts_print(to, to_arg, "%T", obj);
 		}
 		if (list->next != 0)
 		    erts_print(to, to_arg, ",");
@@ -2899,9 +2896,6 @@ Ldone:
     handle->dbterm = &b->dbterm;
     handle->flags = flags;
     handle->new_size = b->dbterm.size;
-#if HALFWORD_HEAP
-    handle->abs_vec = NULL;
-#endif
     handle->lck = lck;
     return 1;
 }
@@ -3028,7 +3022,7 @@ void db_check_table_hash(DbTable *tbl)
 	if ((list = BUCKET(tb,j)) != 0) {
 	    while (list != 0) {
 		if (!is_tuple(make_tuple(list->dbterm.tpl))) {
-		    erl_exit(1, "Bad term in slot %d of ets table", j);
+		    erts_exit(ERTS_ERROR_EXIT, "Bad term in slot %d of ets table", j);
 		}
 		list = list->next;
 	    }
diff --git a/erts/emulator/beam/erl_db_tree.c b/erts/emulator/beam/erl_db_tree.c
index 465aa566ad..0f642f0867 100644
--- a/erts/emulator/beam/erl_db_tree.c
+++ b/erts/emulator/beam/erl_db_tree.c
@@ -280,7 +280,7 @@ struct select_delete_context {
 /*
 ** Forward declarations 
 */
-static TreeDbTerm *linkout_tree(DbTableTree *tb, Eterm key, Eterm* key_base);
+static TreeDbTerm *linkout_tree(DbTableTree *tb, Eterm key);
 static TreeDbTerm *linkout_object_tree(DbTableTree *tb, 
 				       Eterm object);
 static int do_free_tree_cont(DbTableTree *tb, int num_left);
@@ -291,15 +291,15 @@ static int delsub(TreeDbTerm **this);
 static TreeDbTerm *slot_search(Process *p, DbTableTree *tb, Sint slot);
 static TreeDbTerm *find_node(DbTableTree *tb, Eterm key);
 static TreeDbTerm **find_node2(DbTableTree *tb, Eterm key);
-static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack*, Eterm key, Eterm* kbase);
-static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack*, Eterm key, Eterm* kbase);
+static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack*, Eterm key);
+static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack*, Eterm key);
 static TreeDbTerm *find_next_from_pb_key(DbTableTree *tb, DbTreeStack*,
 					 Eterm key);
 static TreeDbTerm *find_prev_from_pb_key(DbTableTree *tb, DbTreeStack*,
 					 Eterm key);
 static void traverse_backwards(DbTableTree *tb,
 			       DbTreeStack*,
-			       Eterm lastkey, Eterm* lk_base,
+			       Eterm lastkey,
 			       int (*doit)(DbTableTree *tb,
 					   TreeDbTerm *,
 					   void *,
@@ -307,7 +307,7 @@ static void traverse_backwards(DbTableTree *tb,
 			       void *context); 
 static void traverse_forward(DbTableTree *tb,
 			     DbTreeStack*,
-			     Eterm lastkey, Eterm* lk_base,
+			     Eterm lastkey,
 			     int (*doit)(DbTableTree *tb,
 					 TreeDbTerm *,
 					 void *,
@@ -315,8 +315,8 @@ static void traverse_forward(DbTableTree *tb,
 			     void *context); 
 static int key_given(DbTableTree *tb, Eterm pattern, TreeDbTerm **ret,
 		     Eterm *partly_bound_key);
-static Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key, Eterm* bk_base);
-static Sint do_cmp_partly_bound(Eterm a, Eterm b, Eterm* b_base, int *done);
+static Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key);
+static Sint do_cmp_partly_bound(Eterm a, Eterm b, int *done);
 
 static int analyze_pattern(DbTableTree *tb, Eterm pattern, 
 			   struct mp_info *mpi);
@@ -517,7 +517,7 @@ static int db_next_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
     if (is_atom(key) && key == am_EOT)
 	return DB_ERROR_BADKEY;
     stack = get_any_stack(tb);
-    this = find_next(tb, stack, key, NULL);
+    this = find_next(tb, stack, key);
     release_stack(tb,stack);
     if (this == NULL) {
 	*ret = am_EOT;
@@ -563,7 +563,7 @@ static int db_prev_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
     if (is_atom(key) && key == am_EOT)
 	return DB_ERROR_BADKEY;
     stack = get_any_stack(tb);
-    this = find_prev(tb, stack, key, NULL);
+    this = find_prev(tb, stack, key);
     release_stack(tb,stack);
     if (this == NULL) {
 	*ret = am_EOT;
@@ -573,19 +573,13 @@ static int db_prev_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
     return DB_ERROR_NONE;
 }
 
-static ERTS_INLINE Sint cmp_key(DbTableTree* tb, Eterm key, Eterm* key_base,
-			       TreeDbTerm* obj)
-{
-    return cmp_rel(key, key_base,
-		   GETKEY(tb,obj->dbterm.tpl), obj->dbterm.tpl);
+static ERTS_INLINE Sint cmp_key(DbTableTree* tb, Eterm key, TreeDbTerm* obj) {
+    return CMP(key, GETKEY(tb,obj->dbterm.tpl));
 }
 
-static ERTS_INLINE int cmp_key_eq(DbTableTree* tb, Eterm key, Eterm* key_base,
-				  TreeDbTerm* obj)
-{
+static ERTS_INLINE int cmp_key_eq(DbTableTree* tb, Eterm key, TreeDbTerm* obj) {
     Eterm obj_key = GETKEY(tb,obj->dbterm.tpl);
-    return is_same(key, key_base, obj_key, obj->dbterm.tpl)
-	|| cmp_rel(key, key_base, obj_key, obj->dbterm.tpl) == 0;
+    return is_same(key, obj_key) || CMP(key, obj_key) == 0;
 }
 
 static int db_put_tree(DbTable *tbl, Eterm obj, int key_clash_fail)
@@ -619,7 +613,7 @@ static int db_put_tree(DbTable *tbl, Eterm obj, int key_clash_fail)
 	    (*this)->balance = 0;
 	    (*this)->left = (*this)->right = NULL;
 	    break;
-	} else if ((c = cmp_key(tb, key, NULL, *this)) < 0) {
+	} else if ((c = cmp_key(tb, key, *this)) < 0) {
 	    /* go lefts */
 	    dstack[dpos++] = DIR_LEFT;
 	    tstack[tpos++] = this;
@@ -774,7 +768,7 @@ static int db_erase_tree(DbTable *tbl, Eterm key, Eterm *ret)
 
     *ret = am_true;
 
-    if ((res = linkout_tree(tb, key, NULL)) != NULL) {
+    if ((res = linkout_tree(tb, key)) != NULL) {
 	free_term(tb, res);
     }
     return DB_ERROR_NONE;
@@ -970,15 +964,15 @@ static int db_select_continue_tree(Process *p,
     stack = get_any_stack(tb);
     if (chunk_size) {
 	if (reverse) {
-	    traverse_backwards(tb, stack, lastkey, NULL, &doit_select_chunk, &sc);
+	    traverse_backwards(tb, stack, lastkey, &doit_select_chunk, &sc);
 	} else {
-	    traverse_forward(tb, stack, lastkey, NULL, &doit_select_chunk, &sc);
+	    traverse_forward(tb, stack, lastkey, &doit_select_chunk, &sc);
 	}
     } else {
 	if (reverse) {
-	    traverse_forward(tb, stack, lastkey, NULL, &doit_select, &sc);
+	    traverse_forward(tb, stack, lastkey, &doit_select, &sc);
 	} else {
-	    traverse_backwards(tb, stack, lastkey, NULL, &doit_select, &sc);
+	    traverse_backwards(tb, stack, lastkey, &doit_select, &sc);
 	}
     }
     release_stack(tb,stack);
@@ -1003,9 +997,9 @@ static int db_select_continue_tree(Process *p,
 	    }
 
 	    key = GETKEY(tb, sc.lastobj);
-	    sz = size_object_rel(key,sc.lastobj);
+	    sz = size_object(key);
 	    hp = HAlloc(p, 9 + sz);
-	    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
+	    key = copy_struct(key, sz, &hp, &MSO(p));
 	    continuation = TUPLE8
 		(hp,
 		 tptr[1],
@@ -1026,8 +1020,8 @@ static int db_select_continue_tree(Process *p,
     key = GETKEY(tb, sc.lastobj);
     if (chunk_size) {
 	if (end_condition != NIL && 
-	    ((!reverse && cmp_partly_bound(end_condition,key,sc.lastobj) < 0) ||
-	     (reverse && cmp_partly_bound(end_condition,key,sc.lastobj) > 0))) {
+	    ((!reverse && cmp_partly_bound(end_condition,key) < 0) ||
+	     (reverse && cmp_partly_bound(end_condition,key) > 0))) {
 	    /* done anyway */
 	    if (!sc.got) {
 		RET_TO_BIF(am_EOT, DB_ERROR_NONE);
@@ -1039,16 +1033,16 @@ static int db_select_continue_tree(Process *p,
 	}
     } else {
 	if (end_condition != NIL && 
-	    ((!reverse && cmp_partly_bound(end_condition,key,sc.lastobj) > 0) ||
-	     (reverse && cmp_partly_bound(end_condition,key,sc.lastobj) < 0))) {
+	    ((!reverse && cmp_partly_bound(end_condition,key) > 0) ||
+	     (reverse && cmp_partly_bound(end_condition,key) < 0))) {
 	    /* done anyway */
 	    RET_TO_BIF(sc.accum,DB_ERROR_NONE);
 	}
     }
     /* Not done yet, let's trap. */
-    sz = size_object_rel(key,sc.lastobj);
+    sz = size_object(key);
     hp = HAlloc(p, 9 + sz);
-    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
+    key = copy_struct(key, sz, &hp, &MSO(p));
     continuation = TUPLE8
 	(hp,
 	 tptr[1],
@@ -1075,7 +1069,6 @@ static int db_select_tree(Process *p, DbTable *tbl,
     struct select_context sc;
     struct mp_info mpi;
     Eterm lastkey = THE_NON_VALUE;
-    Eterm* lk_base = NULL;
     Eterm key;
     Eterm continuation;
     unsigned sz;
@@ -1127,20 +1120,18 @@ static int db_select_tree(Process *p, DbTable *tbl,
 	if (mpi.some_limitation) {
 	    if ((this = find_prev_from_pb_key(tb, stack, mpi.least)) != NULL) {
 		lastkey = GETKEY(tb, this->dbterm.tpl);
-		lk_base = this->dbterm.tpl;
 	    }
 	    sc.end_condition = mpi.most;
 	}
-	traverse_forward(tb, stack, lastkey, lk_base, &doit_select, &sc);
+	traverse_forward(tb, stack, lastkey, &doit_select, &sc);
     } else {
 	if (mpi.some_limitation) {
 	    if ((this = find_next_from_pb_key(tb, stack, mpi.most)) != NULL) {
 		lastkey = GETKEY(tb, this->dbterm.tpl);
-		lk_base = this->dbterm.tpl;
 	    }
 	    sc.end_condition = mpi.least;
 	}
-	traverse_backwards(tb, stack, lastkey, lk_base, &doit_select, &sc);
+	traverse_backwards(tb, stack, lastkey, &doit_select, &sc);
     }
     release_stack(tb,stack);
 #ifdef HARDDEBUG
@@ -1153,9 +1144,9 @@ static int db_select_tree(Process *p, DbTable *tbl,
     }
 
     key = GETKEY(tb, sc.lastobj);
-    sz = size_object_rel(key, sc.lastobj);
+    sz = size_object(key);
     hp = HAlloc(p, 9 + sz + PROC_BIN_SIZE);
-    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
+    key = copy_struct(key, sz, &hp, &MSO(p));
     if (mpi.all_objects)
 	(mpi.mp)->flags |= BIN_FLAG_ALL_OBJECTS;
     mpb=db_make_mp_binary(p,mpi.mp,&hp);
@@ -1213,7 +1204,7 @@ static int db_select_count_continue_tree(Process *p,
     tptr = tuple_val(continuation);
 
     if (arityval(*tptr) != 5)
-	erl_exit(1,"Internal error in ets:select_count/1");
+	erts_exit(ERTS_ERROR_EXIT,"Internal error in ets:select_count/1");
     
     lastkey = tptr[2];
     end_condition = tptr[3];
@@ -1236,7 +1227,7 @@ static int db_select_count_continue_tree(Process *p,
     }
 
     stack = get_any_stack(tb);
-    traverse_backwards(tb, stack, lastkey, NULL, &doit_select_count, &sc);
+    traverse_backwards(tb, stack, lastkey, &doit_select_count, &sc);
     release_stack(tb,stack);
 
     BUMP_REDS(p, 1000 - sc.max);
@@ -1246,12 +1237,12 @@ static int db_select_count_continue_tree(Process *p,
     }	
     key = GETKEY(tb, sc.lastobj);
     if (end_condition != NIL && 
-	(cmp_partly_bound(end_condition,key,sc.lastobj) > 0)) {
+	(cmp_partly_bound(end_condition,key) > 0)) {
 	/* done anyway */
 	RET_TO_BIF(make_small(sc.got),DB_ERROR_NONE);
     }
     /* Not done yet, let's trap. */
-    sz = size_object_rel(key, sc.lastobj);
+    sz = size_object(key);
     if (IS_USMALL(0, sc.got)) {
 	hp = HAlloc(p, sz + 6);
 	egot = make_small(sc.got);
@@ -1261,7 +1252,7 @@ static int db_select_count_continue_tree(Process *p,
 	egot = uint_to_big(sc.got, hp);
 	hp += BIG_UINT_HEAP_SIZE;
     }
-    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
+    key = copy_struct(key, sz, &hp, &MSO(p));
     continuation = TUPLE5
 	(hp,
 	 tptr[1],
@@ -1284,7 +1275,6 @@ static int db_select_count_tree(Process *p, DbTable *tbl,
     struct select_count_context sc;
     struct mp_info mpi;
     Eterm lastkey = THE_NON_VALUE;
-    Eterm* lk_base = NULL;
     Eterm key;
     Eterm continuation;
     unsigned sz;
@@ -1334,12 +1324,11 @@ static int db_select_count_tree(Process *p, DbTable *tbl,
     if (mpi.some_limitation) {
 	if ((this = find_next_from_pb_key(tb, stack, mpi.most)) != NULL) {
 	    lastkey = GETKEY(tb, this->dbterm.tpl);
-	    lk_base = this->dbterm.tpl;
 	}
 	sc.end_condition = mpi.least;
     }
     
-    traverse_backwards(tb, stack, lastkey, lk_base, &doit_select_count, &sc);
+    traverse_backwards(tb, stack, lastkey, &doit_select_count, &sc);
     release_stack(tb,stack);
     BUMP_REDS(p, 1000 - sc.max);
     if (sc.max > 0) {
@@ -1347,7 +1336,7 @@ static int db_select_count_tree(Process *p, DbTable *tbl,
     }
 
     key = GETKEY(tb, sc.lastobj);
-    sz = size_object_rel(key, sc.lastobj);
+    sz = size_object(key);
     if (IS_USMALL(0, sc.got)) {
 	hp = HAlloc(p, sz + PROC_BIN_SIZE + 6);
 	egot = make_small(sc.got);
@@ -1357,7 +1346,7 @@ static int db_select_count_tree(Process *p, DbTable *tbl,
 	egot = uint_to_big(sc.got, hp);
 	hp += BIG_UINT_HEAP_SIZE;
     }
-    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
+    key = copy_struct(key, sz, &hp, &MSO(p));
     if (mpi.all_objects)
 	(mpi.mp)->flags |= BIN_FLAG_ALL_OBJECTS;
     mpb = db_make_mp_binary(p,mpi.mp,&hp);
@@ -1388,7 +1377,6 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl,
     struct select_context sc;
     struct mp_info mpi;
     Eterm lastkey = THE_NON_VALUE;
-    Eterm* lk_base = NULL;
     Eterm key;
     Eterm continuation;
     unsigned sz;
@@ -1445,20 +1433,18 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl,
 	if (mpi.some_limitation) {
 	    if ((this = find_next_from_pb_key(tb, stack, mpi.most)) != NULL) {
 		lastkey = GETKEY(tb, this->dbterm.tpl);
-		lk_base = this->dbterm.tpl;
 	    }
 	    sc.end_condition = mpi.least;
 	}
-	traverse_backwards(tb, stack, lastkey, lk_base, &doit_select_chunk, &sc);
+	traverse_backwards(tb, stack, lastkey, &doit_select_chunk, &sc);
     } else {
 	if (mpi.some_limitation) {
 	    if ((this = find_prev_from_pb_key(tb, stack, mpi.least)) != NULL) {
 		lastkey = GETKEY(tb, this->dbterm.tpl);
-		lk_base = this->dbterm.tpl;
 	    }
 	    sc.end_condition = mpi.most;
 	}
-	traverse_forward(tb, stack, lastkey, lk_base, &doit_select_chunk, &sc);
+	traverse_forward(tb, stack, lastkey, &doit_select_chunk, &sc);
     }
     release_stack(tb,stack);
 
@@ -1483,9 +1469,9 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl,
 	}
 
 	key = GETKEY(tb, sc.lastobj);
-	sz = size_object_rel(key, sc.lastobj);
+	sz = size_object(key);
 	hp = HAlloc(p, 9 + sz + PROC_BIN_SIZE);
-	key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
+	key = copy_struct(key, sz, &hp, &MSO(p));
 	if (mpi.all_objects)
 	    (mpi.mp)->flags |= BIN_FLAG_ALL_OBJECTS;
 	mpb = db_make_mp_binary(p,mpi.mp,&hp);
@@ -1508,9 +1494,9 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl,
     }
 
     key = GETKEY(tb, sc.lastobj);
-    sz = size_object_rel(key, sc.lastobj);
+    sz = size_object(key);
     hp = HAlloc(p, 9 + sz + PROC_BIN_SIZE);
-    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastobj, NULL);
+    key = copy_struct(key, sz, &hp, &MSO(p));
 
     if (mpi.all_objects)
 	(mpi.mp)->flags |= BIN_FLAG_ALL_OBJECTS;
@@ -1586,7 +1572,7 @@ static int db_select_delete_continue_tree(Process *p,
     sc.keypos = tb->common.keypos;
 
     ASSERT(!erts_smp_atomic_read_nob(&tb->is_stack_busy));
-    traverse_backwards(tb, &tb->static_stack, lastkey, NULL, &doit_select_delete, &sc);
+    traverse_backwards(tb, &tb->static_stack, lastkey, &doit_select_delete, &sc);
 
     BUMP_REDS(p, 1000 - sc.max);
 
@@ -1595,11 +1581,11 @@ static int db_select_delete_continue_tree(Process *p,
     }	
     key = GETKEY(tb, (sc.lastterm)->dbterm.tpl);
     if (end_condition != NIL && 
-	cmp_partly_bound(end_condition,key,sc.lastterm->dbterm.tpl) > 0) { /* done anyway */
+	cmp_partly_bound(end_condition,key) > 0) { /* done anyway */
 	RET_TO_BIF(erts_make_integer(sc.accum,p),DB_ERROR_NONE);
     }
     /* Not done yet, let's trap. */
-    sz = size_object_rel(key, sc.lastterm->dbterm.tpl);
+    sz = size_object(key);
     if (IS_USMALL(0, sc.accum)) {
 	hp = HAlloc(p, sz + 6);
 	eaccsum = make_small(sc.accum);
@@ -1609,7 +1595,7 @@ static int db_select_delete_continue_tree(Process *p,
 	eaccsum = uint_to_big(sc.accum, hp);
 	hp += BIG_UINT_HEAP_SIZE;
     }
-    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastterm->dbterm.tpl, NULL);
+    key = copy_struct(key, sz, &hp, &MSO(p));
     continuation = TUPLE5
 	(hp,
 	 tptr[1],
@@ -1630,7 +1616,6 @@ static int db_select_delete_tree(Process *p, DbTable *tbl,
     struct select_delete_context sc;
     struct mp_info mpi;
     Eterm lastkey = THE_NON_VALUE;
-    Eterm* lk_base = NULL;
     Eterm key;
     Eterm continuation;
     unsigned sz;
@@ -1683,12 +1668,11 @@ static int db_select_delete_tree(Process *p, DbTable *tbl,
     if (mpi.some_limitation) {
 	if ((this = find_next_from_pb_key(tb, &tb->static_stack, mpi.most)) != NULL) {
 	    lastkey = GETKEY(tb, this->dbterm.tpl);
-	    lk_base = this->dbterm.tpl;
 	}
 	sc.end_condition = mpi.least;
     }
 
-    traverse_backwards(tb, &tb->static_stack, lastkey, lk_base, &doit_select_delete, &sc);
+    traverse_backwards(tb, &tb->static_stack, lastkey, &doit_select_delete, &sc);
     BUMP_REDS(p, 1000 - sc.max);
 
     if (sc.max > 0) {
@@ -1696,7 +1680,7 @@ static int db_select_delete_tree(Process *p, DbTable *tbl,
     }
 
     key = GETKEY(tb, (sc.lastterm)->dbterm.tpl);
-    sz = size_object_rel(key, sc.lastterm->dbterm.tpl);
+    sz = size_object(key);
     if (IS_USMALL(0, sc.accum)) {
 	hp = HAlloc(p, sz + PROC_BIN_SIZE + 6);
 	eaccsum = make_small(sc.accum);
@@ -1706,7 +1690,7 @@ static int db_select_delete_tree(Process *p, DbTable *tbl,
 	eaccsum = uint_to_big(sc.accum, hp);
 	hp += BIG_UINT_HEAP_SIZE;
     }
-    key = copy_struct_rel(key, sz, &hp, &MSO(p), sc.lastterm->dbterm.tpl, NULL);
+    key = copy_struct(key, sz, &hp, &MSO(p));
     mpb = db_make_mp_binary(p,mpi.mp,&hp);
     
     continuation = TUPLE5
@@ -1734,7 +1718,7 @@ static int db_take_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
     TreeDbTerm *this;
 
     *ret = NIL;
-    this = linkout_tree(tb, key, NULL);
+    this = linkout_tree(tb, key);
     if (this) {
         Eterm copy, *hp, *hend;
 
@@ -1845,9 +1829,7 @@ do_db_tree_foreach_offheap(TreeDbTerm *tdbt,
     do_db_tree_foreach_offheap(tdbt->right, func, arg);
 }
 
-static TreeDbTerm *linkout_tree(DbTableTree *tb, 
-				Eterm key, Eterm* key_base)
-{
+static TreeDbTerm *linkout_tree(DbTableTree *tb, Eterm key) {
     TreeDbTerm **tstack[STACK_NEED];
     int tpos = 0;
     int dstack[STACK_NEED+1];
@@ -1869,7 +1851,7 @@ static TreeDbTerm *linkout_tree(DbTableTree *tb,
     for (;;) {
 	if (!*this) { /* Failure */
 	    return NULL;
-	} else if ((c = cmp_key(tb, key, key_base, *this)) < 0) {
+	} else if ((c = cmp_key(tb, key, *this)) < 0) {
 	    dstack[dpos++] = DIR_LEFT;
 	    tstack[tpos++] = this;
 	    this = &((*this)->left);
@@ -1933,7 +1915,7 @@ static TreeDbTerm *linkout_object_tree(DbTableTree *tb,
     for (;;) {
 	if (!*this) { /* Failure */
 	    return NULL;
-	} else if ((c = cmp_key(tb,key,NULL,*this)) < 0) {
+	} else if ((c = cmp_key(tb,key,*this)) < 0) {
 	    dstack[dpos++] = DIR_LEFT;
 	    tstack[tpos++] = this;
 	    this = &((*this)->left);
@@ -2319,15 +2301,13 @@ done:
  * Find next and previous in sort order
  */
 
-static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack* stack,
-			     Eterm key, Eterm* key_base)
-{
+static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack* stack, Eterm key) {
     TreeDbTerm *this;
     TreeDbTerm *tmp;
     Sint c;
 
     if(( this = TOP_NODE(stack)) != NULL) {
-	if (!cmp_key_eq(tb,key,key_base,this)) {
+	if (!cmp_key_eq(tb,key,this)) {
 	    /* Start from the beginning */
 	    stack->pos = stack->slot = 0;
 	}
@@ -2337,7 +2317,7 @@ static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack* stack,
 	    return NULL;
 	for (;;) {
 	    PUSH_NODE(stack, this);
-	    if (( c = cmp_key(tb,key,key_base,this) ) > 0) {
+	    if (( c = cmp_key(tb,key,this) ) > 0) {
 		if (this->right == NULL) /* We are at the previos 
 					    and the element does
 					    not exist */
@@ -2377,15 +2357,13 @@ static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack* stack,
     return this;
 }
 
-static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack* stack,
-			     Eterm key, Eterm* key_base)
-{
+static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack* stack, Eterm key) {
     TreeDbTerm *this;
     TreeDbTerm *tmp;
     Sint c;
 
     if(( this = TOP_NODE(stack)) != NULL) {
-	if (!cmp_key_eq(tb,key,key_base,this)) {
+	if (!cmp_key_eq(tb,key,this)) {
 	    /* Start from the beginning */
 	    stack->pos = stack->slot = 0;
 	}
@@ -2395,7 +2373,7 @@ static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack* stack,
 	    return NULL;
 	for (;;) {
 	    PUSH_NODE(stack, this);
-	    if (( c = cmp_key(tb,key,key_base,this) ) < 0) {
+	    if (( c = cmp_key(tb,key,this) ) < 0) {
 		if (this->left == NULL) /* We are at the next 
 					   and the element does
 					   not exist */
@@ -2448,8 +2426,7 @@ static TreeDbTerm *find_next_from_pb_key(DbTableTree *tb, DbTreeStack* stack,
 	return NULL;
     for (;;) {
 	PUSH_NODE(stack, this);
-	if (( c = cmp_partly_bound(key,GETKEY(tb, this->dbterm.tpl),
-				   this->dbterm.tpl) ) >= 0) {
+	if (( c = cmp_partly_bound(key,GETKEY(tb, this->dbterm.tpl))) >= 0) {
 	    if (this->right == NULL) {
 		do {
 		    tmp = POP_NODE(stack);
@@ -2482,8 +2459,7 @@ static TreeDbTerm *find_prev_from_pb_key(DbTableTree *tb, DbTreeStack* stack,
 	return NULL;
     for (;;) {
 	PUSH_NODE(stack, this);
-	if (( c = cmp_partly_bound(key,GETKEY(tb, this->dbterm.tpl),
-				   this->dbterm.tpl) ) <= 0) {
+	if (( c = cmp_partly_bound(key,GETKEY(tb, this->dbterm.tpl))) <= 0) {
 	    if (this->left == NULL) {
 		do {
 		    tmp = POP_NODE(stack);
@@ -2514,10 +2490,10 @@ static TreeDbTerm *find_node(DbTableTree *tb, Eterm key)
     DbTreeStack* stack = get_static_stack(tb);
 
     if(!stack || EMPTY_NODE(stack)
-       || !cmp_key_eq(tb, key, NULL, (this=TOP_NODE(stack)))) {
+       || !cmp_key_eq(tb, key, (this=TOP_NODE(stack)))) {
 
 	this = tb->root;
-	while (this != NULL && (res = cmp_key(tb,key,NULL,this)) != 0) {
+	while (this != NULL && (res = cmp_key(tb,key,this)) != 0) {
 	    if (res < 0)
 		this = this->left;
 	    else
@@ -2539,7 +2515,7 @@ static TreeDbTerm **find_node2(DbTableTree *tb, Eterm key)
     Sint res;
 
     this = &tb->root;
-    while ((*this) != NULL && (res = cmp_key(tb, key, NULL, *this)) != 0) {
+    while ((*this) != NULL && (res = cmp_key(tb, key, *this)) != 0) {
 	if (res < 0)
 	    this = &((*this)->left);
 	else
@@ -2589,9 +2565,6 @@ db_lookup_dbterm_tree(Process *p, DbTable *tbl, Eterm key, Eterm obj,
     handle->flags = flags;
     handle->bp = (void**) pp;
     handle->new_size = (*pp)->dbterm.size;
-#if HALFWORD_HEAP
-    handle->abs_vec = NULL;
-#endif
     return 1;
 }
 
@@ -2622,7 +2595,7 @@ db_finalize_dbterm_tree(int cret, DbUpdateHandle *handle)
  */
 static void traverse_backwards(DbTableTree *tb,
 			       DbTreeStack* stack,
-			       Eterm lastkey, Eterm* lk_base,
+			       Eterm lastkey,
 			       int (*doit)(DbTableTree *,
 					   TreeDbTerm *,
 					   void *,
@@ -2641,16 +2614,15 @@ static void traverse_backwards(DbTableTree *tb,
 	    this = this->right;
 	}
 	this = TOP_NODE(stack);
-	next = find_prev(tb, stack, GETKEY(tb, this->dbterm.tpl),
-			 this->dbterm.tpl);
+	next = find_prev(tb, stack, GETKEY(tb, this->dbterm.tpl));
 	if (!((*doit)(tb, this, context, 0)))
 	    return;
     } else {
-	next = find_prev(tb, stack, lastkey, lk_base);
+	next = find_prev(tb, stack, lastkey);
     }
 
     while ((this = next) != NULL) {
-	next = find_prev(tb, stack, GETKEY(tb, this->dbterm.tpl), this->dbterm.tpl);
+	next = find_prev(tb, stack, GETKEY(tb, this->dbterm.tpl));
 	if (!((*doit)(tb, this, context, 0)))
 	    return;
     }
@@ -2661,7 +2633,7 @@ static void traverse_backwards(DbTableTree *tb,
  */
 static void traverse_forward(DbTableTree *tb,
 			     DbTreeStack* stack,
-			     Eterm lastkey, Eterm* lk_base,
+			     Eterm lastkey,
 			     int (*doit)(DbTableTree *,
 					 TreeDbTerm *,
 					 void *,
@@ -2680,15 +2652,15 @@ static void traverse_forward(DbTableTree *tb,
 	    this = this->left;
 	}
 	this = TOP_NODE(stack);
-	next = find_next(tb, stack, GETKEY(tb, this->dbterm.tpl), this->dbterm.tpl);
+	next = find_next(tb, stack, GETKEY(tb, this->dbterm.tpl));
 	if (!((*doit)(tb, this, context, 1)))
 	    return;
     } else {
-	next = find_next(tb, stack, lastkey, lk_base);
+	next = find_next(tb, stack, lastkey);
     }
 
     while ((this = next) != NULL) {
-	next = find_next(tb, stack, GETKEY(tb, this->dbterm.tpl), this->dbterm.tpl);
+	next = find_next(tb, stack, GETKEY(tb, this->dbterm.tpl));
 	if (!((*doit)(tb, this, context, 1)))
 	    return;
     }
@@ -2725,7 +2697,7 @@ static int key_given(DbTableTree *tb, Eterm pattern, TreeDbTerm **ret,
 
 
 
-static Sint do_cmp_partly_bound(Eterm a, Eterm b, Eterm* b_base, int *done)
+static Sint do_cmp_partly_bound(Eterm a, Eterm b, int *done)
 {
     Eterm* aa;
     Eterm* bb;
@@ -2739,44 +2711,44 @@ static Sint do_cmp_partly_bound(Eterm a, Eterm b, Eterm* b_base, int *done)
 	*done = 1;
 	return 0;
     }
-    if (is_same(a,NULL,b,b_base))
+    if (is_same(a,b))
 	return 0;
     
     switch (a & _TAG_PRIMARY_MASK) {
     case TAG_PRIMARY_LIST:
 	if (!is_list(b)) {
-	    return cmp_rel(a,NULL,b,b_base);
+	    return CMP(a,b);
 	}
 	aa = list_val(a);
-	bb = list_val_rel(b,b_base);
+	bb = list_val(b);
 	while (1) {
-	    if ((j = do_cmp_partly_bound(*aa++, *bb++, b_base, done)) != 0 || *done)
+	    if ((j = do_cmp_partly_bound(*aa++, *bb++, done)) != 0 || *done)
 		return j;
-	    if (is_same(*aa, NULL, *bb, b_base))
+	    if (is_same(*aa, *bb))
 		return 0;
 	    if (is_not_list(*aa) || is_not_list(*bb))
-		return do_cmp_partly_bound(*aa, *bb, b_base, done);
+		return do_cmp_partly_bound(*aa, *bb, done);
 	    aa = list_val(*aa);
-	    bb = list_val_rel(*bb,b_base);
+	    bb = list_val(*bb);
 	}
     case TAG_PRIMARY_BOXED:
 	if ((b & _TAG_PRIMARY_MASK) != TAG_PRIMARY_BOXED) {
-	    return cmp_rel(a,NULL,b,b_base);
+	    return CMP(a,b);
 	}
 	a_hdr = ((*boxed_val(a)) & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE;
-	b_hdr = ((*boxed_val_rel(b,b_base)) & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE;
+	b_hdr = ((*boxed_val(b)) & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE;
 	if (a_hdr != b_hdr) {
-	    return cmp_rel(a, NULL, b, b_base);
+	    return CMP(a,b);
 	}
 	if (a_hdr == (_TAG_HEADER_ARITYVAL >> _TAG_PRIMARY_SIZE)) {
 	    aa = tuple_val(a);
-	    bb = tuple_val_rel(b, b_base);
+	    bb = tuple_val(b);
 	    /* compare the arities */
 	    i = arityval(*aa);	/* get the arity*/
 	    if (i < arityval(*bb)) return(-1);
 	    if (i > arityval(*bb)) return(1);
 	    while (i--) {
-		if ((j = do_cmp_partly_bound(*++aa, *++bb, b_base, done)) != 0
+		if ((j = do_cmp_partly_bound(*++aa, *++bb, done)) != 0
 		    || *done) 
 		    return j;
 	    }
@@ -2784,14 +2756,13 @@ static Sint do_cmp_partly_bound(Eterm a, Eterm b, Eterm* b_base, int *done)
 	}
 	/* Drop through */
       default:
-	  return cmp_rel(a, NULL, b, b_base);
+	  return CMP(a,b);
     }
 }
 
-static Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key, Eterm* bk_base)
-{
+static Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key) {
     int done = 0;
-    Sint ret = do_cmp_partly_bound(partly_bound_key, bound_key, bk_base, &done);
+    Sint ret = do_cmp_partly_bound(partly_bound_key, bound_key, &done);
 #ifdef HARDDEBUG
     erts_fprintf(stderr,"\ncmp_partly_bound: %T", partly_bound_key);
     if (ret < 0)
@@ -2800,7 +2771,7 @@ static Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key, Eterm* bk_
 	erts_fprintf(stderr," > ");
     else
 	erts_fprintf(stderr," == ");
-    erts_fprintf(stderr,"%R\n", bound_key, bk_base);
+    erts_fprintf(stderr,"%T\n", bound_key);
 #endif
     return ret;
 }
@@ -3017,12 +2988,10 @@ static int doit_select(DbTableTree *tb, TreeDbTerm *this, void *ptr,
     if (sc->end_condition != NIL && 
 	((forward && 
 	  cmp_partly_bound(sc->end_condition, 
-			   GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl),
-			   this->dbterm.tpl) < 0) ||
+			   GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl)) < 0) ||
 	 (!forward && 
 	  cmp_partly_bound(sc->end_condition, 
-			   GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl),
-			   this->dbterm.tpl) > 0))) {
+			   GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl)) > 0))) {
 	return 0;
     }
     ret = db_match_dbterm(&tb->common,sc->p,sc->mp,sc->all_objects,
@@ -3054,8 +3023,7 @@ static int doit_select_count(DbTableTree *tb, TreeDbTerm *this, void *ptr,
     /* Always backwards traversing */
     if (sc->end_condition != NIL && 
 	(cmp_partly_bound(sc->end_condition, 
-			  GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl),
-			  this->dbterm.tpl) > 0)) {
+			  GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl)) > 0)) {
 	return 0;
     }
     ret = db_match_dbterm(&tb->common, sc->p, sc->mp, 0,
@@ -3081,12 +3049,10 @@ static int doit_select_chunk(DbTableTree *tb, TreeDbTerm *this, void *ptr,
     if (sc->end_condition != NIL && 
 	((forward && 
 	  cmp_partly_bound(sc->end_condition, 
-			   GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl),
-			   this->dbterm.tpl) < 0) ||
+			   GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl)) < 0) ||
 	 (!forward && 
 	  cmp_partly_bound(sc->end_condition, 
-			   GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl),
-			   this->dbterm.tpl) > 0))) {
+			   GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl)) > 0))) {
 	return 0;
     }
 
@@ -3124,14 +3090,13 @@ static int doit_select_delete(DbTableTree *tb, TreeDbTerm *this, void *ptr,
     
     if (sc->end_condition != NIL && 
 	cmp_partly_bound(sc->end_condition, 
-			 GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl),
-			 this->dbterm.tpl) > 0)
+			 GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl)) > 0)
 	return 0;
     ret = db_match_dbterm(&tb->common, sc->p, sc->mp, 0,
 			  &this->dbterm, NULL, 0);
     if (ret == am_true) {
 	key = GETKEY(sc->tb, this->dbterm.tpl);
-	linkout_tree(sc->tb, key, this->dbterm.tpl);
+	linkout_tree(sc->tb, key);
 	sc->erase_lastterm = 1;
 	++sc->accum;
     }
@@ -3157,11 +3122,10 @@ static void do_dump_tree2(DbTableTree* tb, int to, void *to_arg, int show,
 	}
 	else {
 	    prefix = "";
-	    term = make_tuple_rel(t->dbterm.tpl,t->dbterm.tpl);
+	    term = make_tuple(t->dbterm.tpl);
 	}
-	erts_print(to, to_arg, "%*s%s%R (addr = %p, bal = %d)\n",
-		   offset, "", prefix, term, t->dbterm.tpl,
-		   t, t->balance);
+	erts_print(to, to_arg, "%*s%s%T (addr = %p, bal = %d)\n",
+		   offset, "", prefix, term, t, t->balance);
     }
     do_dump_tree2(tb, to, to_arg, show, t->left, offset + 4); 
 }
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index dab357a079..973be58420 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -239,11 +239,7 @@ typedef enum {
     matchCall2,
     matchCall3,
     matchPushV,
-#if HALFWORD_HEAP
-    matchPushVGuard,    /* First guard-only variable reference */
-#endif
-    matchPushVResult, /* First variable reference in result, or (if HALFWORD)
-                         in guard if also referenced in result */
+    matchPushVResult, /* First variable reference in result */
     matchPushExpr, /* Push the whole expression we're matching ('$_') */
     matchPushArrayAsList, /* Only when parameter is an Array and 
 			     not an erlang term  (DCOMP_TRACE) */
@@ -310,9 +306,6 @@ DMC_DECLARE_STACK_TYPE(unsigned);
 typedef struct DMCVariable {
     int is_bound;
     int is_in_body;
-#if HALFWORD_HEAP
-    int first_guard_label;  /* to maybe change from PushVGuard to PushVResult */
-#endif
 } DMCVariable;
 
 typedef struct DMCHeap {
@@ -374,7 +367,6 @@ typedef struct MatchVariable {
     Eterm term;
 #ifdef DEBUG
     Process* proc;
-    Eterm* base;
 #endif
 } MatchVariable;
 
@@ -415,7 +407,7 @@ cleanup_match_pseudo_process(ErtsMatchPseudoProcess *mpsp, int keep_heap)
 	else {
 	    int i;
 	    for (i = 0; i < ERTS_DEFAULT_MS_HEAP_SIZE; i++) {
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 		mpsp->default_heap[i] = (Eterm) 0xdeadbeefdeadbeef;
 #else
 		mpsp->default_heap[i] = (Eterm) 0xdeadbeef;
@@ -1240,7 +1232,7 @@ Eterm erts_match_set_run(Process *p, Binary *mpsp,
 {
     Eterm ret;
 
-    ret = db_prog_match(p, mpsp, NIL, NULL, args, num_args,
+    ret = db_prog_match(p, mpsp, NIL, args, num_args,
 			in_flags, return_flags);
 #if defined(HARDDEBUG)
     if (is_non_value(ret)) {
@@ -1265,7 +1257,7 @@ static Eterm erts_match_set_run_ets(Process *p, Binary *mpsp,
 {
     Eterm ret;
 
-    ret = db_prog_match(p, mpsp, args, NULL, NULL, num_args,
+    ret = db_prog_match(p, mpsp, args, NULL, num_args,
 			ERTS_PAM_COPY_RESULT,
 			return_flags);
 #if defined(HARDDEBUG)
@@ -1755,71 +1747,6 @@ static Eterm dpm_array_to_list(Process *psp, Eterm *arr, int arity)
     return ret;
 }
 
-
-#if HALFWORD_HEAP
-struct heap_checkpoint_t
-{
-    Process *p;
-    Eterm* htop;
-    ErlHeapFragment* mbuf;
-    unsigned used_size;
-    ErlOffHeap off_heap;
-};
-
-static void heap_checkpoint_init(Process* p, struct heap_checkpoint_t* hcp)
-{
-    hcp->p = p;
-    hcp->htop = HEAP_TOP(p);
-    hcp->mbuf = MBUF(p);
-    hcp->used_size = hcp->mbuf ? hcp->mbuf->used_size : 0;
-    hcp->off_heap = MSO(p);
-}
-
-static void heap_checkpoint_revert(struct heap_checkpoint_t* hcp)
-{
-    struct erl_off_heap_header* oh = MSO(hcp->p).first;
-
-    if (oh != hcp->off_heap.first) {
-	ASSERT(oh != NULL);
-	if (hcp->off_heap.first) {
-	    while (oh->next != hcp->off_heap.first) {
-		oh = oh->next;
-	    }
-	    oh->next = NULL;
-	}
-	erts_cleanup_offheap(&MSO(hcp->p));
-	MSO(hcp->p) = hcp->off_heap;
-    }
-    if (MBUF(hcp->p) != hcp->mbuf) {
-	ErlHeapFragment* hf = MBUF(hcp->p);
-	ASSERT(hf != NULL);
-	if (hcp->mbuf) {
-	    while (hf->next != hcp->mbuf) {
-		hf = hf->next;
-	    }
-	    hf->next = NULL;
-	}
-	free_message_buffer(MBUF(hcp->p));
-	MBUF(hcp->p) = hcp->mbuf;
-    }
-    if (hcp->mbuf != NULL && hcp->mbuf->used_size != hcp->used_size) {
-	hcp->mbuf->used_size = hcp->used_size;
-    }
-    HEAP_TOP(hcp->p) = hcp->htop;
-}
-#endif /* HALFWORD_HEAP */
-
-static ERTS_INLINE Eterm copy_object_rel(Process* p, Eterm term, Eterm* base)
-{
-    if (!is_immed(term)) {
-	Uint sz = size_object_rel(term, base);
-	Eterm* top = HAllocX(p, sz, HEAP_XTRA);
-	return copy_struct_rel(term, sz, &top, &MSO(p), base, NULL);
-    }
-    return term;
-}
-
-
 /*
 ** Execution of the match program, this is Pam.
 ** May return THE_NON_VALUE, which is a bailout.
@@ -1827,7 +1754,7 @@ static ERTS_INLINE Eterm copy_object_rel(Process* p, Eterm term, Eterm* base)
 ** i.e. 'DCOMP_TRACE' was specified 
 */
 Eterm db_prog_match(Process *c_p, Binary *bprog,
-		    Eterm term, Eterm* base,
+		    Eterm term,
 		    Eterm *termp,
 		    int arity,
 		    enum erts_pam_run_flags in_flags,
@@ -1855,17 +1782,12 @@ Eterm db_prog_match(Process *c_p, Binary *bprog,
     Eterm bif_args[3];
     int fail_label;
     int atomic_trace;
-#if HALFWORD_HEAP
-    struct heap_checkpoint_t c_p_checkpoint = {};
-#endif
 #ifdef DMC_DEBUG
     Uint *heap_fence;
     Uint *stack_fence;
     Uint save_op;
 #endif /* DMC_DEBUG */
 
-    ASSERT(base==NULL || HALFWORD_HEAP);
-
     mpsp = get_match_pseudo_process(c_p, prog->heap_size);
     psp = &mpsp->process;
 
@@ -1916,11 +1838,7 @@ Eterm db_prog_match(Process *c_p, Binary *bprog,
 			     do_catch != 0 */
 
     *return_flags = 0U;
-
     variables = mpsp->u.variables;
-#if HALFWORD_HEAP
-    c_p_checkpoint.p = NULL;
-#endif
 
 restart:
     ep = &term;
@@ -1931,14 +1849,12 @@ restart:
     fail_label = -1;
     build_proc = psp;
     esdp->current_process = psp;
-    ASSERT_HALFWORD(!c_p_checkpoint.p);
 
 #ifdef DEBUG
     ASSERT(variables == mpsp->u.variables);
     for (i=0; i<prog->num_bindings; i++) {
 	variables[i].term = THE_NON_VALUE;
 	variables[i].proc = NULL;
-	variables[i].base = base;
     }
 #endif
 
@@ -1946,11 +1862,11 @@ restart:
 
     #ifdef DMC_DEBUG
 	if (*heap_fence != FENCE_PATTERN) {
-	    erl_exit(1, "Heap fence overwritten in db_prog_match after op "
+	    erts_exit(ERTS_ERROR_EXIT, "Heap fence overwritten in db_prog_match after op "
 		     "0x%08x, overwritten with 0x%08x.", save_op, *heap_fence);
 	}
 	if (*stack_fence != FENCE_PATTERN) {
-	    erl_exit(1, "Stack fence overwritten in db_prog_match after op "
+	    erts_exit(ERTS_ERROR_EXIT, "Stack fence overwritten in db_prog_match after op "
 		     "0x%08x, overwritten with 0x%08x.", save_op, 
 		     *stack_fence);
 	}
@@ -1974,9 +1890,9 @@ restart:
 	    variables[n].term = dpm_array_to_list(psp, termp, arity);
 	    break;
 	case matchTuple: /* *ep is a tuple of arity n */
-	    if (!is_tuple_rel(*ep,base))
+	    if (!is_tuple(*ep))
 		FAIL();
-	    ep = tuple_val_rel(*ep,base);
+	    ep = tuple_val(*ep);
 	    n = *pc++;
 	    if (arityval(*ep) != n)
 		FAIL();
@@ -1984,9 +1900,9 @@ restart:
 	    break;
 	case matchPushT: /* *ep is a tuple of arity n, 
 			    push ptr to first element */
-	    if (!is_tuple_rel(*ep,base))
+	    if (!is_tuple(*ep))
 		FAIL();
-	    tp = tuple_val_rel(*ep,base);
+	    tp = tuple_val(*ep);
 	    n = *pc++;
 	    if (arityval(*tp) != n)
 		FAIL();
@@ -1996,51 +1912,51 @@ restart:
 	case matchList:
 	    if (!is_list(*ep))
 		FAIL();
-	    ep = list_val_rel(*ep,base);
+	    ep = list_val(*ep);
 	    break;
 	case matchPushL:
 	    if (!is_list(*ep))
 		FAIL();
-	    *sp++ = list_val_rel(*ep,base);
+	    *sp++ = list_val(*ep);
 	    ++ep;
 	    break;
         case matchMap:
-            if (!is_map_rel(*ep, base)) {
+            if (!is_map(*ep)) {
                 FAIL();
             }
             n = *pc++;
-            if (is_flatmap_rel(*ep,base)) {
-		if (flatmap_get_size(flatmap_val_rel(*ep, base)) < n) {
+            if (is_flatmap(*ep)) {
+		if (flatmap_get_size(flatmap_val(*ep)) < n) {
 		    FAIL();
 		}
             } else {
-		ASSERT(is_hashmap_rel(*ep,base));
-		if (hashmap_size_rel(*ep, base) < n) {
+		ASSERT(is_hashmap(*ep));
+		if (hashmap_size(*ep) < n) {
 		    FAIL();
 		}
 	    }
-            ep = flatmap_val_rel(*ep, base);
+            ep = flatmap_val(*ep);
             break;
         case matchPushM:
-            if (!is_map_rel(*ep, base)) {
+            if (!is_map(*ep)) {
                 FAIL();
             }
             n = *pc++;
-            if (is_flatmap_rel(*ep,base)) {
-		if (flatmap_get_size(flatmap_val_rel(*ep, base)) < n) {
+            if (is_flatmap(*ep)) {
+		if (flatmap_get_size(flatmap_val(*ep)) < n) {
 		    FAIL();
 		}
 	    } else {
-		ASSERT(is_hashmap_rel(*ep,base));
-		if (hashmap_size_rel(*ep, base) < n) {
+		ASSERT(is_hashmap(*ep));
+		if (hashmap_size(*ep) < n) {
 		    FAIL();
 		}
 	    }
-            *sp++ = flatmap_val_rel(*ep++, base);
+            *sp++ = flatmap_val(*ep++);
             break;
         case matchKey:
             t = (Eterm) *pc++;
-            tp = erts_maps_get_rel(t, make_boxed_rel(ep, base), base);
+            tp = erts_maps_get(t, make_boxed(ep));
             if (!tp) {
                 FAIL();
             }
@@ -2061,29 +1977,29 @@ restart:
 	    break;
 	case matchCmp:
 	    n = *pc++;
-	    if (!eq_rel(variables[n].term, base, *ep, base))
+	    if (!EQ(variables[n].term, *ep))
 		FAIL();
 	    ++ep;
 	    break;
 	case matchEqBin:
 	    t = (Eterm) *pc++;
-	    if (!eq_rel(t,NULL,*ep,base))
+	    if (!EQ(t,*ep))
 		FAIL();
 	    ++ep;
 	    break;
 	case matchEqFloat:
-	    if (!is_float_rel(*ep,base))
+	    if (!is_float(*ep))
 		FAIL();
-	    if (memcmp(float_val_rel(*ep,base) + 1, pc, sizeof(double)))
+	    if (memcmp(float_val(*ep) + 1, pc, sizeof(double)))
 		FAIL();
 	    pc += TermWords(2);
 	    ++ep;
 	    break;
 	case matchEqRef: {
 	    Eterm* epc = (Eterm*)pc;
-	    if (!is_ref_rel(*ep,base))
+	    if (!is_ref(*ep))
 		FAIL();
-	    if (!eq_rel(make_internal_ref_rel(epc, epc), epc, *ep, base)) {
+	    if (!EQ(make_internal_ref(epc), *ep)) {
 		FAIL();
 	    }
 	    i = thing_arityval(*epc);
@@ -2092,9 +2008,9 @@ restart:
 	    break;
 	}
 	case matchEqBig:
-	    if (!is_big_rel(*ep,base))
+	    if (!is_big(*ep))
 		FAIL();
-	    tp = big_val_rel(*ep,base);
+	    tp = big_val(*ep);
 	    {
 		Eterm *epc = (Eterm *) pc;
 		if (*tp != *epc)
@@ -2236,62 +2152,36 @@ restart:
 	    esp -= 2;
 	    esp[-1] = t;
 	    break;
-
-	#if HALFWORD_HEAP
-	case matchPushVGuard:
-	    if (!base) goto case_matchPushV;
-	    /* Build NULL-based copy on pseudo heap for easy disposal */
-	    n = *pc++;
-	    ASSERT(is_value(variables[n].term));
-	    ASSERT(!variables[n].proc);
-	    variables[n].term = copy_object_rel(psp, variables[n].term, base);
-	    *esp++ = variables[n].term;
-	    #ifdef DEBUG
-	    variables[n].proc = psp;
-	    variables[n].base = NULL;
-	    #endif
-	    break;
-	#endif
 	case matchPushVResult:
 	    if (!(in_flags & ERTS_PAM_COPY_RESULT)) goto case_matchPushV;
-
-	    /* Build (NULL-based) copy on callers heap */
-	#if HALFWORD_HEAP
-	    if (!do_catch && !c_p_checkpoint.p) {
-		heap_checkpoint_init(c_p, &c_p_checkpoint);
-	    }
-        #endif
+	    /* Build copy on callers heap */
 	    n = *pc++;
 	    ASSERT(is_value(variables[n].term));
 	    ASSERT(!variables[n].proc);
-	    variables[n].term = copy_object_rel(c_p, variables[n].term, base);
+	    variables[n].term = copy_object_x(variables[n].term, c_p, HEAP_XTRA);
 	    *esp++ = variables[n].term;
 	    #ifdef DEBUG
 	    variables[n].proc = c_p;
-	    variables[n].base = NULL;
 	    #endif
 	    break;
 	case matchPushV:
 	case_matchPushV:
 	    n = *pc++;
 	    ASSERT(is_value(variables[n].term));
-	    ASSERT(!variables[n].base);
 	    *esp++ = variables[n].term;
 	    break;
 	case matchPushExpr:
 	    if (in_flags & ERTS_PAM_COPY_RESULT) {
 		Uint sz;
 		Eterm* top;
-		sz = size_object_rel(term, base);
+		sz = size_object(term);
 		top = HAllocX(build_proc, sz, HEAP_XTRA);
 		if (in_flags & ERTS_PAM_CONTIGUOUS_TUPLE) {
-		    ASSERT(is_tuple_rel(term,base));
-		    *esp++ = copy_shallow_rel(tuple_val_rel(term,base), sz,
-					      &top, &MSO(build_proc), base);
+		    ASSERT(is_tuple(term));
+		    *esp++ = copy_shallow(tuple_val(term), sz, &top, &MSO(build_proc));
 		}
 		else {
-		    *esp++ = copy_struct_rel(term, sz, &top, &MSO(build_proc),
-					     base, NULL);
+		    *esp++ = copy_struct(term, sz, &top, &MSO(build_proc));
 		}
 	    }
 	    else {
@@ -2299,7 +2189,6 @@ restart:
 	    }
 	    break;
 	case matchPushArrayAsList:
-	    ASSERT_HALFWORD(base == NULL);
 	    n = arity; /* Only happens when 'term' is an array */
 	    tp = termp;
 	    ehp = HAllocX(build_proc, n*2, HEAP_XTRA);
@@ -2315,7 +2204,6 @@ restart:
 	    break;
 	case matchPushArrayAsListU:
 	    /* This instruction is NOT efficient. */
-	    ASSERT_HALFWORD(base == NULL);
 	    *esp++  = dpm_array_to_list(build_proc, termp, arity);
 	    break;
 	case matchTrue:
@@ -2420,11 +2308,7 @@ restart:
 	    *esp++ = am_true;
 	    break;
 	case matchIsSeqTrace:
-	    if (SEQ_TRACE_TOKEN(c_p) != NIL
-#ifdef USE_VM_PROBES
-		&& SEQ_TRACE_TOKEN(c_p) != am_have_dt_utag
-#endif
-		)
+            if (have_seqtrace(SEQ_TRACE_TOKEN(c_p)))
 		*esp++ = am_true;
 	    else
 		*esp++ = am_false;
@@ -2448,11 +2332,7 @@ restart:
 	    --esp;
 	    break;
 	case matchGetSeqToken:
-	    if (SEQ_TRACE_TOKEN(c_p) == NIL
-#ifdef USE_VM_PROBES
-		|| SEQ_TRACE_TOKEN(c_p) == am_have_dt_utag
-#endif
-		) 
+            if (have_no_seqtrace(SEQ_TRACE_TOKEN(c_p)))
 		*esp++ = NIL;
 	    else {
 		Eterm sender = SEQ_TRACE_TOKEN_SENDER(c_p);
@@ -2615,17 +2495,10 @@ restart:
 	case matchHalt:
 	    goto success;
 	default:
-	    erl_exit(1, "Internal error: unexpected opcode in match program.");
+	    erts_exit(ERTS_ERROR_EXIT, "Internal error: unexpected opcode in match program.");
 	}
     }
 fail:
-#if HALFWORD_HEAP
-    if (c_p_checkpoint.p) {
-	/* Dispose garbage built by guards on caller heap */
-	heap_checkpoint_revert(&c_p_checkpoint);
-	c_p_checkpoint.p = NULL;
-    }
-#endif
     *return_flags = 0U;
     if (fail_label >= 0) { /* We failed during a "TryMeElse",
 			      lets restart, with the next match
@@ -2639,11 +2512,11 @@ success:
 
 #ifdef DMC_DEBUG
     if (*heap_fence != FENCE_PATTERN) {
-	erl_exit(1, "Heap fence overwritten in db_prog_match after op "
+	erts_exit(ERTS_ERROR_EXIT, "Heap fence overwritten in db_prog_match after op "
 		 "0x%08x, overwritten with 0x%08x.", save_op, *heap_fence);
     }
     if (*stack_fence != FENCE_PATTERN) {
-	erl_exit(1, "Stack fence overwritten in db_prog_match after op "
+	erts_exit(ERTS_ERROR_EXIT, "Stack fence overwritten in db_prog_match after op "
 		 "0x%08x, overwritten with 0x%08x.", save_op, 
 		 *stack_fence);
     }
@@ -2788,13 +2661,6 @@ Wterm db_do_read_element(DbUpdateHandle* handle, Sint position)
 {
     Eterm elem = handle->dbterm->tpl[position];
     if (!is_header(elem)) {
-#if HALFWORD_HEAP
-	if (!is_immed(elem)
-	    && !handle->tb->common.compress
-	    && !(handle->abs_vec && handle->abs_vec[position])) {
-	    return rterm2wterm(elem, handle->dbterm->tpl);
-	}
-#endif
 	return elem;
     }
 
@@ -2822,9 +2688,6 @@ void db_do_update_element(DbUpdateHandle* handle,
     Eterm* oldp;
     Uint newval_sz;
     Uint oldval_sz;
-#if HALFWORD_HEAP
-    Eterm* old_base;
-#endif
 
     if (is_both_immed(newval,oldval)) {
 	handle->dbterm->tpl[position] = newval;
@@ -2841,15 +2704,8 @@ void db_do_update_element(DbUpdateHandle* handle,
 						       handle->dbterm);
 	    handle->flags |= DB_MUST_RESIZE;
 	    oldval = handle->dbterm->tpl[position];
-        #if HALFWORD_HEAP
-	    old_base = NULL;
-	#endif
 	}
 	else {
-	#if HALFWORD_HEAP
-	    ASSERT(!handle->abs_vec);
-	    old_base = handle->dbterm->tpl;
-	#endif
 	    if (is_boxed(newval)) {
 		newp = boxed_val(newval);
 		switch (*newp & _TAG_HEADER_MASK) {
@@ -2859,7 +2715,7 @@ void db_do_update_element(DbUpdateHandle* handle,
 		case _TAG_HEADER_HEAP_BIN:
 		    newval_sz = header_arity(*newp) + 1;
 		    if (is_boxed(oldval)) {
-			oldp = boxed_val_rel(oldval,old_base);
+			oldp = boxed_val(oldval);
 			switch (*oldp & _TAG_HEADER_MASK) {
 			case _TAG_HEADER_POS_BIG:
 			case _TAG_HEADER_NEG_BIG:
@@ -2879,20 +2735,13 @@ void db_do_update_element(DbUpdateHandle* handle,
 	    }
 	}
     }
-#if HALFWORD_HEAP
-    else {
-	old_base = (handle->tb->common.compress
-		    || (handle->abs_vec && handle->abs_vec[position])) ?
-	    NULL : handle->dbterm->tpl;
-    }
-#endif
     /* Not possible for simple memcpy or dbterm is already non-contiguous, */
     /* need to realloc... */
 
     newval_sz = is_immed(newval) ? 0 : size_object(newval);
 new_size_set:
 
-    oldval_sz = is_immed(oldval) ? 0 : size_object_rel(oldval,old_base);
+    oldval_sz = is_immed(oldval) ? 0 : size_object(oldval);
 both_size_set:
 
     handle->new_size = handle->new_size - oldval_sz + newval_sz;
@@ -2900,19 +2749,6 @@ both_size_set:
     /* write new value in old dbterm, finalize will make a flat copy */
     handle->dbterm->tpl[position] = newval;
     handle->flags |= DB_MUST_RESIZE;
-
-#if HALFWORD_HEAP
-    if (old_base && newval_sz > 0) {
-	ASSERT(!handle->tb->common.compress);
-	if (!handle->abs_vec) {
-	    int i = header_arity(handle->dbterm->tpl[0]);
-	    handle->abs_vec = erts_alloc(ERTS_ALC_T_TMP, (i+1)*sizeof(char));
-	    sys_memset(handle->abs_vec, 0, i+1);
-	    /* abs_vec[0] not used */
-	}
-	handle->abs_vec[position] = 1;
-    }
-#endif
 }
 
 static ERTS_INLINE byte* db_realloc_term(DbTableCommon* tb, void* old,
@@ -3011,7 +2847,7 @@ static void* copy_to_comp(DbTableCommon* tb, Eterm obj, DbTerm* dest,
     tpl[arity + 1] = alloc_size;
 
     tmp_offheap.first = NULL;
-    tpl[tb->keypos] = copy_struct_rel(key, size_object(key), &top.ep, &tmp_offheap, NULL, tpl);
+    tpl[tb->keypos] = copy_struct(key, size_object(key), &top.ep, &tmp_offheap);
     dest->first_oh = tmp_offheap.first;
     for (i=1; i<=arity; i++) {
 	if (i != tb->keypos) {
@@ -3030,7 +2866,7 @@ static void* copy_to_comp(DbTableCommon* tb, Eterm obj, DbTerm* dest,
 	Eterm* dbg_top = erts_alloc(ERTS_ALC_T_DB_TERM, dest->size * sizeof(Eterm));
 	dest->debug_clone = dbg_top;
 	tmp_offheap.first = dest->first_oh;
-	copy_struct_rel(obj, dest->size, &dbg_top, &tmp_offheap, NULL, dbg_top);
+	copy_struct(obj, dest->size, &dbg_top, &tmp_offheap);
 	dest->first_oh = tmp_offheap.first;
 	ASSERT(dbg_top == dest->debug_clone + dest->size);
     }
@@ -3077,7 +2913,7 @@ void* db_store_term(DbTableCommon *tb, DbTerm* old, Uint offset, Eterm obj)
     newp->size = size;
     top = newp->tpl;
     tmp_offheap.first  = NULL;
-    copy_struct_rel(obj, size, &top, &tmp_offheap, NULL, top);
+    copy_struct(obj, size, &top, &tmp_offheap);
     newp->first_oh = tmp_offheap.first;
 #ifdef DEBUG_CLONE
     newp->debug_clone = NULL;
@@ -3160,29 +2996,8 @@ void db_finalize_resize(DbUpdateHandle* handle, Uint offset)
 
 	tmp_offheap.first = NULL;
 
-    #if HALFWORD_HEAP
-	if (handle->abs_vec) {
-	    int i, arity = header_arity(handle->dbterm->tpl[0]);
-
-	    top[0] = tpl[0];
-	    top += arity + 1;
-	    for (i=1; i<=arity; i++) {
-		Eterm* src_base = handle->abs_vec[i] ? NULL : tpl;
-
-		newDbTerm->tpl[i] = copy_struct_rel(tpl[i],
-						    size_object_rel(tpl[i],src_base),
-						    &top, &tmp_offheap, src_base,
-						    newDbTerm->tpl);
-	    }
-	    newDbTerm->first_oh = tmp_offheap.first;
-	    ASSERT((byte*)top <= (newp + alloc_sz));
-	    erts_free(ERTS_ALC_T_TMP, handle->abs_vec);
-	}
-	else
-    #endif /* HALFWORD_HEAP */
 	{
-	    copy_struct_rel(make_tuple_rel(tpl,tpl), handle->new_size, &top,
-			    &tmp_offheap, tpl, top);
+	    copy_struct(make_tuple(tpl), handle->new_size, &top, &tmp_offheap);
 	    newDbTerm->first_oh = tmp_offheap.first;
 	    ASSERT((byte*)top == (newp + alloc_sz));
 	}
@@ -3199,9 +3014,9 @@ Eterm db_copy_from_comp(DbTableCommon* tb, DbTerm* bp, Eterm** hpp,
     hp[0] = bp->tpl[0];
     *hpp += arity + 1;
 
-    hp[tb->keypos] = copy_struct_rel(bp->tpl[tb->keypos],
-				     size_object_rel(bp->tpl[tb->keypos], bp->tpl),
-				     hpp, off_heap, bp->tpl, NULL);
+    hp[tb->keypos] = copy_struct(bp->tpl[tb->keypos],
+                                 size_object(bp->tpl[tb->keypos]),
+                                 hpp, off_heap);
 
     erts_factory_static_init(&factory, *hpp, bp->size - (arity+1), off_heap);
 
@@ -3221,7 +3036,7 @@ Eterm db_copy_from_comp(DbTableCommon* tb, DbTerm* bp, Eterm** hpp,
 
     ASSERT((*hpp - hp) <= bp->size);
 #ifdef DEBUG_CLONE
-    ASSERT(eq_rel(make_tuple(hp),NULL,make_tuple(bp->debug_clone),bp->debug_clone));
+    ASSERT(EQ(make_tuple(hp),make_tuple(bp->debug_clone)));
 #endif
     return make_tuple(hp);
 }
@@ -3245,14 +3060,14 @@ Eterm db_copy_element_from_ets(DbTableCommon* tb, Process* p,
 	*hpp = erts_produce_heap(&factory, extra, 0);
         erts_factory_close(&factory);
 #ifdef DEBUG_CLONE
-	ASSERT(eq_rel(copy, NULL, obj->debug_clone[pos], obj->debug_clone));
+	ASSERT(EQ(copy, obj->debug_clone[pos]));
 #endif
 	return copy;
     }
     else {
-	Uint sz = size_object_rel(obj->tpl[pos], obj->tpl);
+	Uint sz = size_object(obj->tpl[pos]);
 	*hpp = HAlloc(p, sz + extra);
-	return copy_struct_rel(obj->tpl[pos], sz, hpp, &MSO(p), obj->tpl, NULL);
+	return copy_struct(obj->tpl[pos], sz, hpp, &MSO(p));
     }
 }
 
@@ -3599,26 +3414,10 @@ static DMCRet dmc_one_term(DMCContext *context,
 	{
 	    Eterm* ref_val = internal_ref_val(c);
 	    DMC_PUSH(*text, matchEqRef);
-#if HALFWORD_HEAP
-	    {
-		union {
-		    UWord u;
-		    Uint t[2];
-		} fiddle;
-		ASSERT(thing_arityval(ref_val[0]) == 3);
-		fiddle.t[0] = ref_val[0];
-		fiddle.t[1] = ref_val[1];
-		DMC_PUSH(*text, fiddle.u);
-		fiddle.t[0] = ref_val[2];
-		fiddle.t[1] = ref_val[3];
-		DMC_PUSH(*text, fiddle.u);
-	    }
-#else
 	    n = thing_arityval(ref_val[0]);
 	    for (i = 0; i <= n; ++i) {
 		DMC_PUSH(*text, ref_val[i]);
 	    }
-#endif
 	    break;
 	}
 	case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
@@ -3627,53 +3426,19 @@ static DMCRet dmc_one_term(DMCContext *context,
 	    Eterm* bval = big_val(c);
 	    n = thing_arityval(bval[0]);
 	    DMC_PUSH(*text, matchEqBig);
-#if HALFWORD_HEAP
-	    {
-		union {
-		    UWord u;
-		    Uint t[2];
-		} fiddle;
-		ASSERT(n >= 1);
-		fiddle.t[0] = bval[0];
-		fiddle.t[1] = bval[1];
-		DMC_PUSH(*text, fiddle.u);
-		for (i = 2; i <= n; ++i) {
-		    fiddle.t[0] = bval[i];
-		    if (++i <= n) {
-			fiddle.t[1] = bval[i];
-		    } else {
-			fiddle.t[1] = (Uint) 0;
-		    }
-		    DMC_PUSH(*text, fiddle.u);
-		}
-	    }
-#else
 	    for (i = 0; i <= n; ++i) {
 		DMC_PUSH(*text, (Uint) bval[i]);
 	    }
-#endif
 	    break;
 	}
 	case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
 	    DMC_PUSH(*text,matchEqFloat);
-#if HALFWORD_HEAP
-	    {
-		union {
-		    UWord u;
-		    Uint t[2];
-		} fiddle;
-		fiddle.t[0] = float_val(c)[1];
-		fiddle.t[1] = float_val(c)[2];
-		DMC_PUSH(*text, fiddle.u);
-	    }
-#else
 	    DMC_PUSH(*text, (Uint) float_val(c)[1]);
 #ifdef ARCH_64
 	    DMC_PUSH(*text, (Uint) 0);
 #else
 	    DMC_PUSH(*text, (Uint) float_val(c)[2]);
 #endif
-#endif
 	    break;
 	default: /* BINARY, FUN, VECTOR, or EXTERNAL */
 	    DMC_PUSH(*text, matchEqBin);
@@ -3683,7 +3448,7 @@ static DMCRet dmc_one_term(DMCContext *context,
 	break;
     }
     default:
-	erl_exit(1, "db_match_compile: "
+	erts_exit(ERTS_ERROR_EXIT, "db_match_compile: "
 		 "Bad object on heap: 0x%bex\n", c);
     }
     return retOk;
@@ -3997,24 +3762,8 @@ static void dmc_add_pushv_variant(DMCContext *context, DMCHeap *heap,
     MatchOps instr = matchPushV;
 
     ASSERT(n < heap->vars_used && v->is_bound);
-    if (context->is_guard) {
-	#if HALFWORD_HEAP
-	if (!v->first_guard_label) {
-	    v->first_guard_label = DMC_STACK_NUM(*text);
-	    ASSERT(v->first_guard_label);
-	    instr = matchPushVGuard; /* may be changed to PushVResult below */
-	}
-	#endif
-    }
-    else { /* body */
-	#if HALFWORD_HEAP
-	if (v->first_guard_label) {
-	    /* Avoid double-copy, copy to result heap at first encounter in guard */
-	    DMC_POKE(*text, v->first_guard_label, matchPushVResult);
-	    v->is_in_body = 1;
-	}
-	#endif
-	if (!v->is_in_body) {
+    if (!context->is_guard) {
+        if(!v->is_in_body) {
 	    instr = matchPushVResult;
 	    v->is_in_body = 1;
 	}
@@ -4930,7 +4679,7 @@ static DMCRet dmc_fun(DMCContext *context,
 	DMC_PUSH(*text, matchCall3);
 	break;
     default:
-	erl_exit(1,"ets:match() internal error, "
+	erts_exit(ERTS_ERROR_EXIT,"ets:match() internal error, "
 		 "guard with more than 3 arguments.");
     }
     DMC_PUSH(*text, (UWord) b->biff);
@@ -5210,7 +4959,7 @@ static Uint my_size_object(Eterm t)
 		   tmp == am_const) {
 	    sum += size_object(tuple_val(t)[2]);
 	} else {
-	    erl_exit(1,"Internal error, sizing unrecognized object in "
+	    erts_exit(ERTS_ERROR_EXIT,"Internal error, sizing unrecognized object in "
 		     "(d)ets:match compilation.");
 	}
 	break;
@@ -5255,7 +5004,7 @@ static Eterm my_copy_struct(Eterm t, Eterm **hp, ErlOffHeap* off_heap)
 		sz = size_object(b);
 		ret = copy_struct(b,sz,hp,off_heap);
 	    } else {
-		erl_exit(1, "Trying to constant-copy non constant expression "
+		erts_exit(ERTS_ERROR_EXIT, "Trying to constant-copy non constant expression "
 			 "0x%bex in (d)ets:match compilation.", t);
 	    }
 	} else {
@@ -5443,16 +5192,13 @@ Eterm db_match_dbterm(DbTableCommon* tb, Process* c_p, Binary* bprog,
 			     int all, DbTerm* obj, Eterm** hpp, Uint extra)
 {
     Uint32 dummy;
-    Eterm* base;
     Eterm res;
 
     if (tb->compress) {
 	obj = db_alloc_tmp_uncompressed(tb, obj);
-	base = NULL;
     }
-    else base = HALFWORD_HEAP ? obj->tpl : NULL;
 
-    res = db_prog_match(c_p, bprog, make_tuple_rel(obj->tpl,base), base, NULL, 0,
+    res = db_prog_match(c_p, bprog, make_tuple(obj->tpl), NULL, 0,
 			ERTS_PAM_COPY_RESULT|ERTS_PAM_CONTIGUOUS_TUPLE, &dummy);
 
     if (is_value(res) && hpp!=NULL) {
@@ -5573,7 +5319,7 @@ void db_match_dis(Binary *bp)
 			first = 0;
 		    else
 			erts_printf(", ");
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 		    erts_printf("0x%016bex", rt->data.ui[ri]);
 #else
 		    erts_printf("0x%08bex", rt->data.ui[ri]);
@@ -5597,7 +5343,7 @@ void db_match_dis(Binary *bp)
 			first = 0;
 		    else
 			erts_printf(", ");
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 		    erts_printf("0x%016bex", *et);
 #else
 		    erts_printf("0x%08bex", *et);
@@ -5720,13 +5466,6 @@ void db_match_dis(Binary *bp)
 	    ++t;
 	    erts_printf("PushV\t%beu\n", n);
 	    break;
-    #if HALFWORD_HEAP
-	case matchPushVGuard:
-	    n = (Uint) *++t;
-	    ++t;
-	    erts_printf("PushVGuard\t%beu\n", n);
-	    break;
-    #endif
 	case matchPushVResult:
 	    n = (Uint) *++t;
 	    ++t;
diff --git a/erts/emulator/beam/erl_db_util.h b/erts/emulator/beam/erl_db_util.h
index 1ccdc0305b..911ed37aef 100644
--- a/erts/emulator/beam/erl_db_util.h
+++ b/erts/emulator/beam/erl_db_util.h
@@ -90,9 +90,6 @@ typedef struct {
     Uint new_size;
     int flags;
     void* lck;
-#if HALFWORD_HEAP
-    unsigned char* abs_vec;  /* [i] true if dbterm->tpl[i] is absolute Eterm */
-#endif
 } DbUpdateHandle;
 
 
@@ -229,7 +226,10 @@ typedef struct db_table_common {
     DbTableMethod* meth;      /* table methods */
     erts_smp_atomic_t nitems; /* Total number of items in table */
     erts_smp_atomic_t memory_size;/* Total memory size. NOTE: in bytes! */
-    Uint megasec,sec,microsec; /* Last fixation time */
+    struct {                  /* Last fixation time */
+	ErtsMonotonicTime monotonic;
+	ErtsMonotonicTime offset;
+    } time;
     DbFixation* fixations;    /* List of processes who have done safe_fixtable,
                                  "local" fixations not included. */ 
     /* All 32-bit fields */
@@ -287,10 +287,10 @@ ERTS_GLB_INLINE Eterm db_copy_key(Process* p, DbTable* tb, DbTerm* obj)
     Eterm key = GETKEY(tb, obj->tpl);
     if IS_CONST(key) return key;
     else {
-	Uint size = size_object_rel(key, obj->tpl);
+	Uint size = size_object(key);
 	Eterm* hp = HAlloc(p, size);
-	Eterm res = copy_struct_rel(key, size, &hp, &MSO(p), obj->tpl, NULL);
-	ASSERT(eq_rel(res,NULL,key,obj->tpl));
+	Eterm res = copy_struct(key, size, &hp, &MSO(p));
+	ASSERT(EQ(res,key));
 	return res;
     }
 }
@@ -302,14 +302,14 @@ ERTS_GLB_INLINE Eterm db_copy_object_from_ets(DbTableCommon* tb, DbTerm* bp,
 	return db_copy_from_comp(tb, bp, hpp, off_heap);
     }
     else {
-	return copy_shallow_rel(bp->tpl, bp->size, hpp, off_heap, bp->tpl);
+	return copy_shallow(bp->tpl, bp->size, hpp, off_heap);
     }
 }
 
 ERTS_GLB_INLINE int db_eq(DbTableCommon* tb, Eterm a, DbTerm* b)
 {
     if (!tb->compress) {
-	return eq_rel(a, NULL, make_tuple_rel(b->tpl,b->tpl), b->tpl);
+	return EQ(a, make_tuple(b->tpl));
     }
     else {
 	return db_eq_comp(tb, a, b);
@@ -435,7 +435,7 @@ Binary *db_match_compile(Eterm *matchexpr, Eterm *guards,
 Eterm db_match_dbterm(DbTableCommon* tb, Process* c_p, Binary* bprog,
 		      int all, DbTerm* obj, Eterm** hpp, Uint extra);
 
-Eterm db_prog_match(Process *p, Binary *prog, Eterm term, Eterm* base,
+Eterm db_prog_match(Process *p, Binary *prog, Eterm term,
 		    Eterm *termp, int arity,
 		    enum erts_pam_run_flags in_flags,
 		    Uint32 *return_flags /* Zeroed on enter */);
diff --git a/erts/emulator/beam/erl_debug.c b/erts/emulator/beam/erl_debug.c
index 2dcfb79f00..2902c98864 100644
--- a/erts/emulator/beam/erl_debug.c
+++ b/erts/emulator/beam/erl_debug.c
@@ -255,14 +255,14 @@ void erts_check_stack(Process *p)
     Eterm *stack_end = p->htop;
 
     if (p->stop > stack_start)
-	erl_exit(1,
+	erts_exit(ERTS_ERROR_EXIT,
 		 "<%lu.%lu.%lu>: Stack underflow\n",
 		 internal_pid_channel_no(p->common.id),
 		 internal_pid_number(p->common.id),
 		 internal_pid_serial(p->common.id));
 
     if (p->stop < stack_end)
-	erl_exit(1,
+	erts_exit(ERTS_ERROR_EXIT,
 		 "<%lu.%lu.%lu>: Stack overflow\n",
 		 internal_pid_channel_no(p->common.id),
 		 internal_pid_number(p->common.id),
@@ -287,7 +287,7 @@ void erts_check_stack(Process *p)
 	if (in_mbuf)
 	    continue;
 
-	erl_exit(1,
+	erts_exit(ERTS_ERROR_EXIT,
 		 "<%lu.%lu.%lu>: Wild stack pointer\n",
 		 internal_pid_channel_no(p->common.id),
 		 internal_pid_number(p->common.id),
@@ -312,6 +312,8 @@ void erts_check_for_holes(Process* p)
     p->last_htop = HEAP_TOP(p);
 
     for (hf = MBUF(p); hf != 0; hf = hf->next) {
+	if (hf == p->heap_hfrag)
+	    continue;
 	if (hf == p->last_mbuf) {
 	    break;
 	}
@@ -372,7 +374,7 @@ void erts_check_memory(Process *p, Eterm *start, Eterm *end)
 #ifdef DEBUG
         if (hval == DEBUG_BAD_WORD) {
             print_untagged_memory(start, end);
-            erl_exit(1, "Uninitialized HAlloc'ed memory found @ 0x%0*lx!\n",
+            erts_exit(ERTS_ERROR_EXIT, "Uninitialized HAlloc'ed memory found @ 0x%0*lx!\n",
                      PTR_SIZE,(unsigned long)(pos - 1));
         }
 #endif
@@ -385,7 +387,7 @@ void erts_check_memory(Process *p, Eterm *start, Eterm *end)
         if (verify_eterm(p,hval))
             continue;
 
-        erl_exit(1, "Wild pointer found @ 0x%0*lx!\n",
+        erts_exit(ERTS_ERROR_EXIT, "Wild pointer found @ 0x%0*lx!\n",
                  PTR_SIZE,(unsigned long)(pos - 1));
     }
 }
@@ -395,14 +397,14 @@ void verify_process(Process *p)
 #define VERIFY_AREA(name,ptr,sz) {                                      \
     int n = (sz);							\
     while (n--) if(!verify_eterm(p,*(ptr+n)))				\
-        erl_exit(1,"Wild pointer found in " name " of %T!\n",p->common.id); }
+        erts_exit(ERTS_ERROR_EXIT,"Wild pointer found in " name " of %T!\n",p->common.id); }
 
 #define VERIFY_ETERM(name,eterm) {                                      \
     if(!verify_eterm(p,eterm))                                          \
-        erl_exit(1,"Wild pointer found in " name " of %T!\n",p->common.id); }
+        erts_exit(ERTS_ERROR_EXIT,"Wild pointer found in " name " of %T!\n",p->common.id); }
 
 
-    ErlMessage* mp = p->msg.first;
+    ErtsMessage* mp = p->msg.first;
 
     VERBOSE(DEBUG_MEMORY,("Verify process: %T...\n",p->common.id));
 
@@ -416,7 +418,7 @@ void verify_process(Process *p)
     erts_check_heap(p);
 
     if (p->dictionary)
-        VERIFY_AREA("dictionary",p->dictionary->data, p->dictionary->used);
+        VERIFY_AREA("dictionary", ERTS_PD_START(p->dictionary), ERTS_PD_SIZE(p->dictionary));
     VERIFY_ETERM("seq trace token",p->seq_trace_token);
     VERIFY_ETERM("group leader",p->group_leader);
     VERIFY_ETERM("fvalue",p->fvalue);
@@ -531,7 +533,7 @@ static void print_process_memory(Process *p)
                 PTR_SIZE, "PCB", dashes, dashes, dashes, dashes);
 
     if (p->msg.first != NULL) {
-        ErlMessage* mp;
+        ErtsMessage* mp;
         erts_printf("  Message Queue:\n");
         mp = p->msg.first;
         while (mp != NULL) {
@@ -542,8 +544,8 @@ static void print_process_memory(Process *p)
     }
 
     if (p->dictionary != NULL) {
-        int n = p->dictionary->used;
-        Eterm *ptr = p->dictionary->data;
+        int n = ERTS_PD_SIZE(p->dictionary);
+        Eterm *ptr = ERTS_PD_START(p->dictionary);
         erts_printf("  Dictionary: ");
         while (n--) erts_printf("0x%0*lx ",PTR_SIZE,(unsigned long)ptr++);
         erts_printf("\n");
@@ -631,29 +633,4 @@ void print_memory_info(Process *p)
     }
     erts_printf("+-----------------%s-%s-%s-%s-+\n",dashes,dashes,dashes,dashes);
 }
-#if !HEAP_ON_C_STACK && defined(DEBUG)
-Eterm *erts_debug_allocate_tmp_heap(int size, Process *p)
-{
-    ErtsSchedulerData *sd = ((p == NULL) ? erts_get_scheduler_data() : ERTS_PROC_GET_SCHDATA(p));
-    int offset = sd->num_tmp_heap_used;
-
-    ASSERT(offset+size <= TMP_HEAP_SIZE);
-    return (sd->tmp_heap)+offset;
-}
-void erts_debug_use_tmp_heap(int size, Process *p)
-{
-    ErtsSchedulerData *sd = ((p == NULL) ? erts_get_scheduler_data() : ERTS_PROC_GET_SCHDATA(p));
-
-    sd->num_tmp_heap_used += size;
-    ASSERT(sd->num_tmp_heap_used <= TMP_HEAP_SIZE);
-}
-void erts_debug_unuse_tmp_heap(int size, Process *p)
-{
-    ErtsSchedulerData *sd = ((p == NULL) ? erts_get_scheduler_data() : ERTS_PROC_GET_SCHDATA(p));
-
-    sd->num_tmp_heap_used -= size;
-    ASSERT(sd->num_tmp_heap_used >= 0);
-}
-#endif
 #endif
-
diff --git a/erts/emulator/beam/erl_debug.h b/erts/emulator/beam/erl_debug.h
index 4905e64f07..029320691d 100644
--- a/erts/emulator/beam/erl_debug.h
+++ b/erts/emulator/beam/erl_debug.h
@@ -48,6 +48,7 @@
 #define DEBUG_THREADS      0x0010    /* Thread-related stuff                 */
 #define DEBUG_PROCESSES    0x0020    /* Process creation and removal         */
 #define DEBUG_MEMORY       0x0040    /* Display results of memory checks     */
+#define DEBUG_SHCOPY       0x0080    /* Sharing-preserving copying of terms  */
 
 extern Uint32 verbose;
 
@@ -92,10 +93,4 @@ extern void print_tagged_memory(Eterm *start, Eterm *end);
 extern void print_untagged_memory(Eterm *start, Eterm *end);
 extern void print_memory(Process *p);
 extern void print_memory_info(Process *p);
-#if defined(DEBUG) && !HEAP_ON_C_STACK
-extern Eterm *erts_debug_allocate_tmp_heap(int, Process *);
-extern void erts_debug_use_tmp_heap(int, Process *);
-extern void erts_debug_unuse_tmp_heap(int, Process *);
-#endif
-
 #endif /* _ERL_DEBUG_H_ */
diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h
index dbb4d719c1..0234b9b0e4 100644
--- a/erts/emulator/beam/erl_driver.h
+++ b/erts/emulator/beam/erl_driver.h
@@ -37,52 +37,6 @@
 #  endif
 #endif
 
-#ifdef SIZEOF_CHAR
-#  define SIZEOF_CHAR_SAVED__ SIZEOF_CHAR
-#  undef SIZEOF_CHAR
-#endif
-#ifdef SIZEOF_SHORT
-#  define SIZEOF_SHORT_SAVED__ SIZEOF_SHORT
-#  undef SIZEOF_SHORT
-#endif
-#ifdef SIZEOF_INT
-#  define SIZEOF_INT_SAVED__ SIZEOF_INT
-#  undef SIZEOF_INT
-#endif
-#ifdef SIZEOF_LONG
-#  define SIZEOF_LONG_SAVED__ SIZEOF_LONG
-#  undef SIZEOF_LONG
-#endif
-#ifdef SIZEOF_LONG_LONG
-#  define SIZEOF_LONG_LONG_SAVED__ SIZEOF_LONG_LONG
-#  undef SIZEOF_LONG_LONG
-#endif
-#ifdef HALFWORD_HEAP_EMULATOR
-#  define HALFWORD_HEAP_EMULATOR_SAVED__ HALFWORD_HEAP_EMULATOR
-#  undef HALFWORD_HEAP_EMULATOR
-#endif
-#include "erl_int_sizes_config.h"
-#if defined(SIZEOF_CHAR_SAVED__) && SIZEOF_CHAR_SAVED__ != SIZEOF_CHAR
-#  error SIZEOF_CHAR mismatch
-#endif
-#if defined(SIZEOF_SHORT_SAVED__) && SIZEOF_SHORT_SAVED__ != SIZEOF_SHORT
-#  error SIZEOF_SHORT mismatch
-#endif
-#if defined(SIZEOF_INT_SAVED__) && SIZEOF_INT_SAVED__ != SIZEOF_INT
-#  error SIZEOF_INT mismatch
-#endif
-#if defined(SIZEOF_LONG_SAVED__) && SIZEOF_LONG_SAVED__ != SIZEOF_LONG
-#  error SIZEOF_LONG mismatch
-#endif
-#if defined(SIZEOF_LONG_LONG_SAVED__) && SIZEOF_LONG_LONG_SAVED__ != SIZEOF_LONG_LONG
-#  error SIZEOF_LONG_LONG mismatch
-#endif
-
-/* This is OK to override by the NIF/driver implementor */
-#if defined(HALFWORD_HEAP_EMULATOR_SAVED__) && !defined(HALFWORD_HEAP_EMULATOR)
-#define HALFWORD_HEAP_EMULATOR HALFWORD_HEAP_EMULATOR_SAVED__
-#endif
-
 #include "erl_drv_nif.h"
 
 #include <stdlib.h>
@@ -134,7 +88,7 @@ typedef struct {
 
 #define ERL_DRV_EXTENDED_MARKER		(0xfeeeeeed)
 #define ERL_DRV_EXTENDED_MAJOR_VERSION	3
-#define ERL_DRV_EXTENDED_MINOR_VERSION	2
+#define ERL_DRV_EXTENDED_MINOR_VERSION	3
 
 /*
  * The emulator will refuse to load a driver with a major version
@@ -172,32 +126,17 @@ typedef struct {
 #define ERL_DRV_FLAG_USE_PORT_LOCKING	(1 << 0)
 #define ERL_DRV_FLAG_SOFT_BUSY		(1 << 1)
 #define ERL_DRV_FLAG_NO_BUSY_MSGQ	(1 << 2)
+#define ERL_DRV_FLAG_USE_INIT_ACK	(1 << 3)
 
 /*
  * Integer types
  */
-#if  defined(__WIN32__) && (SIZEOF_VOID_P == 8)
-typedef unsigned __int64 ErlDrvTermData;
-typedef unsigned __int64 ErlDrvUInt;
-typedef signed __int64 ErlDrvSInt;
-#else
-typedef unsigned long ErlDrvTermData;
-typedef unsigned long ErlDrvUInt;
-typedef signed long ErlDrvSInt;
-#endif
 
-#if defined(__WIN32__)
-typedef unsigned __int64 ErlDrvUInt64;
-typedef __int64 ErlDrvSInt64;
-#elif SIZEOF_LONG == 8
-typedef unsigned long ErlDrvUInt64;
-typedef long ErlDrvSInt64;
-#elif SIZEOF_LONG_LONG == 8
-typedef unsigned long long ErlDrvUInt64;
-typedef long long ErlDrvSInt64;
-#else
-#error No 64-bit integer type
-#endif
+typedef ErlNapiUInt64 ErlDrvUInt64;
+typedef ErlNapiSInt64 ErlDrvSInt64;
+typedef ErlNapiUInt ErlDrvUInt;
+typedef ErlNapiSInt ErlDrvSInt;
+typedef ErlNapiUInt ErlDrvTermData;
 
 #if defined(__WIN32__) || defined(_WIN32)
 typedef ErlDrvUInt ErlDrvSizeT;
@@ -250,6 +189,17 @@ typedef struct {
     unsigned long microsecs;
 } ErlDrvNowData;
 
+typedef ErlDrvSInt64 ErlDrvTime;
+
+#define ERL_DRV_TIME_ERROR ((ErlDrvSInt64) ERTS_NAPI_TIME_ERROR__)
+
+typedef enum {
+    ERL_DRV_SEC = ERTS_NAPI_SEC__,
+    ERL_DRV_MSEC = ERTS_NAPI_MSEC__,
+    ERL_DRV_USEC = ERTS_NAPI_USEC__,
+    ERL_DRV_NSEC = ERTS_NAPI_NSEC__
+} ErlDrvTimeUnit;
+
 /*
  * Error codes that can be return from driver.
  */
@@ -386,22 +336,23 @@ typedef struct erl_drv_entry {
 
 #ifdef STATIC_ERLANG_DRIVER
 #  define ERLANG_DRIVER_NAME(NAME) NAME ## _driver_init
+#  define ERL_DRIVER_EXPORT
 #else
 #  define ERLANG_DRIVER_NAME(NAME) driver_init
+#  if defined(__GNUC__) && __GNUC__ >= 4
+#    define ERL_DRIVER_EXPORT __attribute__ ((visibility("default")))
+#  elif defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+#    define ERL_DRIVER_EXPORT __global
+#  else
+#    define ERL_DRIVER_EXPORT
+#  endif
 #endif
 
-/* For windows dynamic drivers */
 #ifndef ERL_DRIVER_TYPES_ONLY
 
-#if defined(__WIN32__)
-#  define DRIVER_INIT(DRIVER_NAME) \
-  __declspec(dllexport) ErlDrvEntry* ERLANG_DRIVER_NAME(DRIVER_NAME)(void);	\
-    __declspec(dllexport) ErlDrvEntry* ERLANG_DRIVER_NAME(DRIVER_NAME)(void)
-#else 
-#  define DRIVER_INIT(DRIVER_NAME) \
-    ErlDrvEntry* ERLANG_DRIVER_NAME(DRIVER_NAME)(void); \
-    ErlDrvEntry* ERLANG_DRIVER_NAME(DRIVER_NAME)(void)
-#endif
+#define DRIVER_INIT(DRIVER_NAME) \
+    ERL_DRIVER_EXPORT ErlDrvEntry* ERLANG_DRIVER_NAME(DRIVER_NAME)(void); \
+    ERL_DRIVER_EXPORT ErlDrvEntry* ERLANG_DRIVER_NAME(DRIVER_NAME)(void)
 
 #define ERL_DRV_BUSY_MSGQ_DISABLED	(~((ErlDrvSizeT) 0))
 #define ERL_DRV_BUSY_MSGQ_READ_ONLY	((ErlDrvSizeT) 0)
@@ -685,8 +636,16 @@ EXTERN long driver_async(ErlDrvPort ix,
 EXTERN int driver_lock_driver(ErlDrvPort ix);
 
 /* Get the current 'now' timestamp (analogue to erlang:now()) */
-EXTERN int driver_get_now(ErlDrvNowData *now);
+EXTERN int driver_get_now(ErlDrvNowData *now) ERL_DRV_DEPRECATED_FUNC;
 
+/* Erlang Monotonic Time */
+EXTERN ErlDrvTime erl_drv_monotonic_time(ErlDrvTimeUnit time_unit);
+/* Time offset between Erlang Monotonic Time and Erlang System Time */
+EXTERN ErlDrvTime erl_drv_time_offset(ErlDrvTimeUnit time_unit);
+/* Time unit conversion */
+EXTERN ErlDrvTime erl_drv_convert_time_unit(ErlDrvTime val,
+					    ErlDrvTimeUnit from,
+					    ErlDrvTimeUnit to);
 
 /* These were removed from the ANSI version, now they're back. */
 
@@ -699,15 +658,11 @@ EXTERN char *driver_dl_error(void);
 EXTERN int erl_drv_putenv(const char *key, char *value);
 EXTERN int erl_drv_getenv(const char *key, char *value, size_t *value_size);
 
-#ifdef __OSE__
-typedef ErlDrvUInt ErlDrvOseEventId;
-EXTERN union SIGNAL *erl_drv_ose_get_signal(ErlDrvEvent ev);
-EXTERN ErlDrvEvent erl_drv_ose_event_alloc(SIGSELECT sig, ErlDrvOseEventId handle,
-					   ErlDrvOseEventId (*resolve_signal)(union SIGNAL *sig), void *extra);
-EXTERN void erl_drv_ose_event_free(ErlDrvEvent ev);
-EXTERN void erl_drv_ose_event_fetch(ErlDrvEvent ev, SIGSELECT *sig,
-                  ErlDrvOseEventId *handle, void **extra);
-#endif
+/* spawn start init ack */
+EXTERN void erl_drv_init_ack(ErlDrvPort ix, ErlDrvData res);
+
+/* set the pid seen in port_info */
+EXTERN void erl_drv_set_os_pid(ErlDrvPort ix, ErlDrvSInt pid);
 
 #endif /* !ERL_DRIVER_TYPES_ONLY */
 
diff --git a/erts/emulator/beam/erl_drv_nif.h b/erts/emulator/beam/erl_drv_nif.h
index e2385f63f4..f6b946ae82 100644
--- a/erts/emulator/beam/erl_drv_nif.h
+++ b/erts/emulator/beam/erl_drv_nif.h
@@ -50,6 +50,90 @@ typedef enum {
 } ErlDrvDirtyJobFlags;
 #endif
 
+#ifdef SIZEOF_CHAR
+#  define SIZEOF_CHAR_SAVED__ SIZEOF_CHAR
+#  undef SIZEOF_CHAR
+#endif
+#ifdef SIZEOF_SHORT
+#  define SIZEOF_SHORT_SAVED__ SIZEOF_SHORT
+#  undef SIZEOF_SHORT
+#endif
+#ifdef SIZEOF_INT
+#  define SIZEOF_INT_SAVED__ SIZEOF_INT
+#  undef SIZEOF_INT
+#endif
+#ifdef SIZEOF_LONG
+#  define SIZEOF_LONG_SAVED__ SIZEOF_LONG
+#  undef SIZEOF_LONG
+#endif
+#ifdef SIZEOF_LONG_LONG
+#  define SIZEOF_LONG_LONG_SAVED__ SIZEOF_LONG_LONG
+#  undef SIZEOF_LONG_LONG
+#endif
+#ifdef HALFWORD_HEAP_EMULATOR
+#  define HALFWORD_HEAP_EMULATOR_SAVED__ HALFWORD_HEAP_EMULATOR
+#  undef HALFWORD_HEAP_EMULATOR
+#endif
+#include "erl_int_sizes_config.h"
+#if defined(SIZEOF_CHAR_SAVED__) && SIZEOF_CHAR_SAVED__ != SIZEOF_CHAR
+#  error SIZEOF_CHAR mismatch
+#endif
+#if defined(SIZEOF_SHORT_SAVED__) && SIZEOF_SHORT_SAVED__ != SIZEOF_SHORT
+#  error SIZEOF_SHORT mismatch
+#endif
+#if defined(SIZEOF_INT_SAVED__) && SIZEOF_INT_SAVED__ != SIZEOF_INT
+#  error SIZEOF_INT mismatch
+#endif
+#if defined(SIZEOF_LONG_SAVED__) && SIZEOF_LONG_SAVED__ != SIZEOF_LONG
+#  error SIZEOF_LONG mismatch
+#endif
+#if defined(SIZEOF_LONG_LONG_SAVED__) && SIZEOF_LONG_LONG_SAVED__ != SIZEOF_LONG_LONG
+#  error SIZEOF_LONG_LONG mismatch
+#endif
+
+#if !defined(__GNUC__) && (defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_))
+typedef unsigned __int64 ErlNapiUInt64;
+typedef signed __int64 ErlNapiSInt64;
+#define ERL_NAPI_SINT64_MAX__ 9223372036854775807i64
+#define ERL_NAPI_SINT64_MIN__ (-ERL_NAPI_SINT64_MAX__ - 1i64)
+#elif SIZEOF_LONG == 8
+typedef unsigned long ErlNapiUInt64;
+typedef signed long ErlNapiSInt64;
+#define ERL_NAPI_SINT64_MAX__ 9223372036854775807L
+#define ERL_NAPI_SINT64_MIN__ (-ERL_NAPI_SINT64_MAX__ - 1L)
+#elif SIZEOF_LONG_LONG == 8
+typedef unsigned long long ErlNapiUInt64;
+typedef signed long long ErlNapiSInt64;
+#define ERL_NAPI_SINT64_MAX__ 9223372036854775807LL
+#define ERL_NAPI_SINT64_MIN__ (-ERL_NAPI_SINT64_MAX__ - 1LL)
+#else
+#  error No 64-bit integer type
+#endif
+
+#if SIZEOF_VOID_P == 8
+typedef ErlNapiUInt64 ErlNapiUInt;
+typedef ErlNapiSInt64 ErlNapiSInt;
+#elif SIZEOF_VOID_P == 4
+#  if SIZEOF_LONG == SIZEOF_VOID_P
+typedef unsigned long ErlNapiUInt;
+typedef signed long ErlNapiSInt;
+#  elif SIZEOF_INT == SIZEOF_VOID_P
+typedef unsigned int ErlNapiUInt;
+typedef signed int ErlNapiSInt;
+#  else
+#    error No 32-bit integer type
+#  endif
+#else
+#  error Not support arch
+#endif
+
+#define ERTS_NAPI_TIME_ERROR__ ERL_NAPI_SINT64_MIN__
+
+#define ERTS_NAPI_SEC__		0
+#define ERTS_NAPI_MSEC__	1
+#define ERTS_NAPI_USEC__	2
+#define ERTS_NAPI_NSEC__	3
+
 #endif  /* __ERL_DRV_NIF_H__ */
 
 
diff --git a/erts/emulator/beam/erl_drv_thread.c b/erts/emulator/beam/erl_drv_thread.c
index e0404eb5c9..184f8e8931 100644
--- a/erts/emulator/beam/erl_drv_thread.c
+++ b/erts/emulator/beam/erl_drv_thread.c
@@ -43,7 +43,7 @@ fatal_error(int err, char *func)
 	else
 	    estr = "Unknown error";
     }
-    erl_exit(ERTS_ABORT_EXIT, "Fatal error in %s: %s [%d]\n", func, estr, err);
+    erts_exit(ERTS_ABORT_EXIT, "Fatal error in %s: %s [%d]\n", func, estr, err);
 }
 
 #define ERL_DRV_TSD_KEYS_INC 10
diff --git a/erts/emulator/beam/erl_fun.c b/erts/emulator/beam/erl_fun.c
index 4268e2d40a..ed555aa92f 100644
--- a/erts/emulator/beam/erl_fun.c
+++ b/erts/emulator/beam/erl_fun.c
@@ -66,6 +66,9 @@ erts_init_fun_table(void)
     f.cmp  = (HCMP_FUN) fun_cmp;
     f.alloc = (HALLOC_FUN) fun_alloc;
     f.free = (HFREE_FUN) fun_free;
+    f.meta_alloc = (HMALLOC_FUN) erts_alloc;
+    f.meta_free = (HMFREE_FUN) erts_free;
+    f.meta_print = (HMPRINT_FUN) erts_print;
 
     hash_init(ERTS_ALC_T_FUN_TABLE, &erts_fun_table, "fun_table", 16, f);
 }
@@ -185,7 +188,7 @@ erts_erase_fun_entry(ErlFunEntry* fe)
 #endif
     {
 	if (fe->address != unloaded_fun)
-	    erl_exit(1,
+	    erts_exit(ERTS_ERROR_EXIT,
 		     "Internal error: "
 		     "Invalid reference count found on #Fun<%T.%d.%d>: "
 		     " About to erase fun still referred by code.\n",
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index 2f21111a2e..0d125c5598 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -47,6 +47,17 @@
 #define ERTS_INACT_WR_PB_LEAVE_LIMIT 10
 #define ERTS_INACT_WR_PB_LEAVE_PERCENTAGE 10
 
+#if defined(DEBUG) || 0
+#define ERTS_GC_DEBUG
+#else
+#undef ERTS_GC_DEBUG
+#endif
+#ifdef ERTS_GC_DEBUG
+#  define ERTS_GC_ASSERT ASSERT
+#else
+#  define ERTS_GC_ASSERT(B) ((void) 1)
+#endif
+
 /*
  * Returns number of elements in an array.
  */
@@ -59,7 +70,7 @@
         erts_fprintf(stderr, "stop=%p\n", (p)->stop); \
         erts_fprintf(stderr, "htop=%p\n", (p)->htop); \
         erts_fprintf(stderr, "heap=%p\n", (p)->heap); \
-        erl_exit(ERTS_ABORT_EXIT, "%s, line %d: %T: Overrun stack and heap\n", \
+        erts_exit(ERTS_ABORT_EXIT, "%s, line %d: %T: Overrun stack and heap\n", \
 		 __FILE__,__LINE__,(P)->common.id); \
     }
 
@@ -67,10 +78,10 @@
 #define ErtsGcQuickSanityCheck(P)					\
 do {									\
     ASSERT((P)->heap < (P)->hend);					\
-    ASSERT((P)->heap_sz == (P)->hend - (P)->heap);			\
+    ASSERT((p)->abandoned_heap || (P)->heap_sz == (P)->hend - (P)->heap); \
     ASSERT((P)->heap <= (P)->htop && (P)->htop <= (P)->hend);		\
     ASSERT((P)->heap <= (P)->stop && (P)->stop <= (P)->hend);		\
-    ASSERT((P)->heap <= (P)->high_water && (P)->high_water <= (P)->hend);\
+    ASSERT((p)->abandoned_heap || ((P)->heap <= (P)->high_water && (P)->high_water <= (P)->hend)); \
     OverRunCheck((P));							\
 } while (0)
 #else
@@ -98,18 +109,33 @@ typedef struct {
 
 static Uint setup_rootset(Process*, Eterm*, int, Rootset*);
 static void cleanup_rootset(Rootset *rootset);
-static Uint combined_message_size(Process* p);
 static void remove_message_buffers(Process* p);
-static int major_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl);
-static int minor_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl);
-static void do_minor(Process *p, Uint new_sz, Eterm* objv, int nobj);
-static Eterm* sweep_rootset(Rootset *rootset, Eterm* htop, char* src, Uint src_size);
-static Eterm* sweep_one_area(Eterm* n_hp, Eterm* n_htop, char* src, Uint src_size);
-static Eterm* sweep_one_heap(Eterm* heap_ptr, Eterm* heap_end, Eterm* htop,
-			     char* src, Uint src_size);
-static Eterm* collect_heap_frags(Process* p, Eterm* heap,
-				 Eterm* htop, Eterm* objv, int nobj);
-static void adjust_after_fullsweep(Process *p, int need, Eterm *objv, int nobj);
+static Eterm *full_sweep_heaps(Process *p,
+			       int hibernate,
+			       Eterm *n_heap, Eterm* n_htop,
+			       char *oh, Uint oh_size,
+			       Eterm *objv, int nobj);
+static int garbage_collect(Process* p, ErlHeapFragment *live_hf_end,
+			   int need, Eterm* objv, int nobj);
+static int major_collection(Process* p, ErlHeapFragment *live_hf_end,
+			    int need, Eterm* objv, int nobj, Uint *recl);
+static int minor_collection(Process* p, ErlHeapFragment *live_hf_end,
+			    int need, Eterm* objv, int nobj, Uint *recl);
+static void do_minor(Process *p, ErlHeapFragment *live_hf_end,
+		     char *mature, Uint mature_size,
+		     Uint new_sz, Eterm* objv, int nobj);
+static Eterm *sweep_new_heap(Eterm *n_hp, Eterm *n_htop,
+			     char* old_heap, Uint old_heap_size);
+static Eterm *sweep_heaps(Eterm *n_hp, Eterm *n_htop,
+			  char* old_heap, Uint old_heap_size);
+static Eterm* sweep_literal_area(Eterm* n_hp, Eterm* n_htop,
+				 char* old_heap, Uint old_heap_size,
+				 char* src, Uint src_size);
+static Eterm* sweep_literals_to_old_heap(Eterm* heap_ptr, Eterm* heap_end, Eterm* htop,
+					 char* src, Uint src_size);
+static Eterm* collect_live_heap_frags(Process* p, ErlHeapFragment *live_hf_end,
+				      Eterm* heap, Eterm* htop, Eterm* objv, int nobj);
+static int adjust_after_fullsweep(Process *p, int need, Eterm *objv, int nobj);
 static void shrink_new_heap(Process *p, Uint new_sz, Eterm *objv, int nobj);
 static void grow_new_heap(Process *p, Uint new_sz, Eterm* objv, int nobj);
 static void sweep_off_heap(Process *p, int fullsweep);
@@ -119,16 +145,16 @@ static void offset_rootset(Process *p, Sint offs, char* area, Uint area_size,
 			   Eterm* objv, int nobj);
 static void offset_off_heap(Process* p, Sint offs, char* area, Uint area_size);
 static void offset_mqueue(Process *p, Sint offs, char* area, Uint area_size);
+static void move_msgq_to_heap(Process *p);
 
 static void init_gc_info(ErtsGCInfo *gcip);
 
 #ifdef HARDDEBUG
 static void disallow_heap_frag_ref_in_heap(Process* p);
 static void disallow_heap_frag_ref_in_old_heap(Process* p);
-static void disallow_heap_frag_ref(Process* p, Eterm* n_htop, Eterm* objv, int nobj);
 #endif
 
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 # define MAX_HEAP_SIZES 154
 #else
 # define MAX_HEAP_SIZES 59
@@ -147,26 +173,24 @@ typedef struct {
     erts_smp_atomic32_t refc;
 } ErtsGCInfoReq;
 
-#if !HALFWORD_HEAP
-ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(gcireq,
-				 ErtsGCInfoReq,
-				 5,
-				 ERTS_ALC_T_GC_INFO_REQ)
-#else
-static ERTS_INLINE ErtsGCInfoReq *
-gcireq_alloc(void)
+static ERTS_INLINE int
+gc_cost(Uint gc_moved_live_words, Uint resize_moved_words)
 {
-    return erts_alloc(ERTS_ALC_T_GC_INFO_REQ,
-		      sizeof(ErtsGCInfoReq));
-}
+    Sint reds;
 
-static ERTS_INLINE void
-gcireq_free(ErtsGCInfoReq *ptr)
-{
-    erts_free(ERTS_ALC_T_GC_INFO_REQ, ptr);
+    reds = gc_moved_live_words/10;
+    reds += resize_moved_words/100;
+    if (reds < 1)
+	return 1;
+    if (reds > INT_MAX)
+	return INT_MAX;
+    return (int) reds;
 }
-#endif
 
+ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(gcireq,
+                                 ErtsGCInfoReq,
+                                 5,
+                                 ERTS_ALC_T_GC_INFO_REQ)
 /*
  * Initialize GC global data.
  */
@@ -208,7 +232,7 @@ erts_init_gc(void)
     }
 
 
-    /* for 32 bit we want max_heap_size to be MAX(32bit) / 4 [words] (and halfword)
+    /* for 32 bit we want max_heap_size to be MAX(32bit) / 4 [words]
      * for 64 bit we want max_heap_size to be MAX(52bit) / 8 [words]
      */
 
@@ -232,10 +256,7 @@ erts_init_gc(void)
       init_gc_info(&esdp->gc_info);
     }
 
-#if !HALFWORD_HEAP
     init_gcireq_alloc();
-#endif
-
 }
 
 /*
@@ -268,7 +289,7 @@ erts_next_heap_size(Uint size, Uint offset)
 		low = mid + 1;
 	    }
 	}
-	erl_exit(1, "no next heap size found: %beu, offset %beu\n", size, offset);
+	erts_exit(ERTS_ERROR_EXIT, "no next heap size found: %beu, offset %beu\n", size, offset);
     }
     return 0;
 }
@@ -351,10 +372,19 @@ erts_offset_off_heap(ErlOffHeap *ohp, Sint offs, Eterm* low, Eterm* high)
 #undef ptr_within
 
 Eterm
-erts_gc_after_bif_call(Process* p, Eterm result, Eterm* regs, Uint arity)
+erts_gc_after_bif_call_lhf(Process* p, ErlHeapFragment *live_hf_end,
+			   Eterm result, Eterm* regs, Uint arity)
 {
     int cost;
 
+    if (p->flags & F_HIBERNATE_SCHED) {
+	/*
+	 * We just hibernated. We do *not* want to mess
+	 * up the hibernation by an ordinary GC...
+	 */
+	return result;
+    }
+
     if (is_non_value(result)) {
 	if (p->freason == TRAP) {
 	  #if HIPE
@@ -362,21 +392,28 @@ erts_gc_after_bif_call(Process* p, Eterm result, Eterm* regs, Uint arity)
 		regs = ERTS_PROC_GET_SCHDATA(p)->x_reg_array;
 	    }
 	  #endif
-	    cost = erts_garbage_collect(p, 0, regs, p->arity);
+	    cost = garbage_collect(p, live_hf_end, 0, regs, p->arity);
 	} else {
-	    cost = erts_garbage_collect(p, 0, regs, arity);
+	    cost = garbage_collect(p, live_hf_end, 0, regs, arity);
 	}
     } else {
 	Eterm val[1];
 
 	val[0] = result;
-	cost = erts_garbage_collect(p, 0, val, 1);
+	cost = garbage_collect(p, live_hf_end, 0, val, 1);
 	result = val[0];
     }
     BUMP_REDS(p, cost);
     return result;
 }
 
+Eterm
+erts_gc_after_bif_call(Process* p, Eterm result, Eterm* regs, Uint arity)
+{
+    return erts_gc_after_bif_call_lhf(p, ERTS_INVALID_HFRAG_PTR,
+				      result, regs, arity);
+}
+
 static ERTS_INLINE void reset_active_writer(Process *p)
 {
     struct erl_off_heap_header* ptr;
@@ -390,6 +427,139 @@ static ERTS_INLINE void reset_active_writer(Process *p)
     }
 }
 
+#define ERTS_DELAY_GC_EXTRA_FREE 40
+#define ERTS_ABANDON_HEAP_COST 10
+
+static int
+delay_garbage_collection(Process *p, ErlHeapFragment *live_hf_end, int need)
+{
+    ErlHeapFragment *hfrag;
+    Eterm *orig_heap, *orig_hend, *orig_htop, *orig_stop;
+    Eterm *stop, *hend;
+    Uint hsz, ssz;
+    int reds_left;
+
+    ERTS_HOLE_CHECK(p);
+
+    if ((p->flags & F_DISABLE_GC)
+	&& p->live_hf_end == ERTS_INVALID_HFRAG_PTR) {
+	/*
+	 * A BIF yielded with disabled GC. Remember
+	 * heap fragments created by the BIF until we
+	 * do next GC.
+	 */
+	p->live_hf_end = live_hf_end;
+    }
+
+    if (need == 0)
+	return 1;
+
+    /*
+     * Satisfy need in a heap fragment...
+     */
+    ASSERT(need > 0);
+
+    orig_heap = p->heap;
+    orig_hend = p->hend;
+    orig_htop = p->htop;
+    orig_stop = p->stop;
+
+    ssz = orig_hend - orig_stop;
+    hsz = ssz + need + ERTS_DELAY_GC_EXTRA_FREE;
+
+    hfrag = new_message_buffer(hsz);
+    hfrag->next = p->mbuf;
+    p->mbuf = hfrag;
+    p->mbuf_sz += hsz;
+    p->heap = p->htop = &hfrag->mem[0];
+    p->hend = hend = &hfrag->mem[hsz];
+    p->stop = stop = hend - ssz;
+    sys_memcpy((void *) stop, (void *) orig_stop, ssz * sizeof(Eterm));
+
+    if (p->abandoned_heap) {
+	/* Active heap already in a fragment; adjust it... */
+	ErlHeapFragment *hfrag = ((ErlHeapFragment *)
+				  (((char *) orig_heap)
+				   - offsetof(ErlHeapFragment, mem)));
+	Uint unused = orig_hend - orig_htop;
+	ASSERT(hfrag->used_size == hfrag->alloc_size);
+	ASSERT(hfrag->used_size >= unused);
+	hfrag->used_size -= unused;
+	p->mbuf_sz -= unused;
+    }
+    else {
+	/* Do not leave a hole in the abandoned heap... */
+	if (orig_htop < orig_hend) {
+	    *orig_htop = make_pos_bignum_header(orig_hend-orig_htop-1);
+	    if (orig_htop + 1 < orig_hend) {
+		orig_hend[-1] = (Uint) (orig_htop - orig_heap);
+		p->flags |= F_ABANDONED_HEAP_USE;
+	    }
+	}
+	p->abandoned_heap = orig_heap;
+    }
+
+#ifdef CHECK_FOR_HOLES
+    p->last_htop = p->htop;
+    p->heap_hfrag = hfrag;
+#endif
+
+    /* Make sure that we do a proper GC as soon as possible... */
+    p->flags |= F_FORCE_GC;
+    reds_left = ERTS_BIF_REDS_LEFT(p);
+    if (reds_left > ERTS_ABANDON_HEAP_COST) {
+	int vreds = reds_left - ERTS_ABANDON_HEAP_COST;
+	ERTS_VBUMP_REDS(p, vreds);
+    }
+    return ERTS_ABANDON_HEAP_COST;
+}
+
+static ERTS_FORCE_INLINE Uint
+young_gen_usage(Process *p)
+{
+    Uint hsz;
+    Eterm *aheap;
+
+    hsz = p->mbuf_sz;
+
+    if (p->flags & F_ON_HEAP_MSGQ) {
+	ErtsMessage *mp;
+	for (mp = p->msg.first; mp; mp = mp->next)
+	    if (mp->data.attached)
+		hsz += erts_msg_attached_data_size(mp);
+    }
+
+    aheap = p->abandoned_heap;
+    if (!aheap)
+	hsz += p->htop - p->heap;
+    else {
+	/* used in orig heap */
+	if (p->flags & F_ABANDONED_HEAP_USE)
+	    hsz += aheap[p->heap_sz-1];
+	else
+	    hsz += p->heap_sz;
+	/* Remove unused part in latest fragment */
+	hsz -= p->hend - p->htop;
+    }
+    return hsz;
+}
+
+#define ERTS_GET_ORIG_HEAP(Proc, Heap, HTop)			\
+    do {							\
+	Eterm *aheap__ = (Proc)->abandoned_heap;		\
+	if (!aheap__) {						\
+	    (Heap) = (Proc)->heap;				\
+	    (HTop) = (Proc)->htop;				\
+	}							\
+	else {							\
+	    (Heap) = aheap__;					\
+	    if ((Proc)->flags & F_ABANDONED_HEAP_USE)		\
+		(HTop) = aheap__ + aheap__[(Proc)->heap_sz-1];	\
+	    else						\
+		(HTop) = aheap__ + (Proc)->heap_sz;		\
+	}							\
+    } while (0)
+
 /*
  * Garbage collect a process.
  *
@@ -398,21 +568,28 @@ static ERTS_INLINE void reset_active_writer(Process *p)
  * objv: Array of terms to add to rootset; that is to preserve.
  * nobj: Number of objects in objv.
  */
-int
-erts_garbage_collect(Process* p, int need, Eterm* objv, int nobj)
+static int
+garbage_collect(Process* p, ErlHeapFragment *live_hf_end,
+		int need, Eterm* objv, int nobj)
 {
     Uint reclaimed_now = 0;
-    int done = 0;
+    int reds;
     ErtsMonotonicTime start_time = 0; /* Shut up faulty warning... */
     ErtsSchedulerData *esdp;
+    ERTS_MSACC_PUSH_STATE_M();
 #ifdef USE_VM_PROBES
     DTRACE_CHARBUF(pidbuf, DTRACE_TERM_BUF_SIZE);
 #endif
 
-    if (p->flags & F_DISABLE_GC) {
-	ASSERT(need == 0);
-	return 1;
-    }
+    if (p->flags & (F_DISABLE_GC|F_DELAY_GC))
+	return delay_garbage_collection(p, live_hf_end, need);
+
+    if (p->abandoned_heap)
+	live_hf_end = ERTS_INVALID_HFRAG_PTR;
+    else if (p->live_hf_end != ERTS_INVALID_HFRAG_PTR)
+	live_hf_end = p->live_hf_end;
+
+    ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_GC);
 
     esdp = erts_get_scheduler_data();
 
@@ -420,16 +597,14 @@ erts_garbage_collect(Process* p, int need, Eterm* objv, int nobj)
         trace_gc(p, am_gc_start);
     }
 
-    (void) erts_smp_atomic32_read_bor_nob(&p->state, ERTS_PSFLG_GC);
+    erts_smp_atomic32_read_bor_nob(&p->state, ERTS_PSFLG_GC);
     if (erts_system_monitor_long_gc != 0)
 	start_time = erts_get_monotonic_time(esdp);
 
     ERTS_CHK_OFFHEAP(p);
 
     ErtsGcQuickSanityCheck(p);
-    if (GEN_GCS(p) >= MAX_GEN_GCS(p)) {
-        FLAGS(p) |= F_NEED_FULLSWEEP;
-    }
+
 #ifdef USE_VM_PROBES
     *pidbuf = '\0';
     if (DTRACE_ENABLED(gc_major_start)
@@ -442,17 +617,23 @@ erts_garbage_collect(Process* p, int need, Eterm* objv, int nobj)
     /*
      * Test which type of GC to do.
      */
-    while (!done) {
-	if ((FLAGS(p) & F_NEED_FULLSWEEP) != 0) {
-	    DTRACE2(gc_major_start, pidbuf, need);
-	    done = major_collection(p, need, objv, nobj, &reclaimed_now);
-	    DTRACE2(gc_major_end, pidbuf, reclaimed_now);
-	} else {
-	    DTRACE2(gc_minor_start, pidbuf, need);
-	    done = minor_collection(p, need, objv, nobj, &reclaimed_now);
-	    DTRACE2(gc_minor_end, pidbuf, reclaimed_now);
-	}
+
+    if (GEN_GCS(p) < MAX_GEN_GCS(p) && !(FLAGS(p) & F_NEED_FULLSWEEP)) {
+	DTRACE2(gc_minor_start, pidbuf, need);
+	reds = minor_collection(p, live_hf_end, need, objv, nobj, &reclaimed_now);
+	DTRACE2(gc_minor_end, pidbuf, reclaimed_now);
+	if (reds < 0)
+	    goto do_major_collection;
+    }
+    else {
+    do_major_collection:
+        ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_GC_FULL);
+	DTRACE2(gc_major_start, pidbuf, need);
+	reds = major_collection(p, live_hf_end, need, objv, nobj, &reclaimed_now);
+	DTRACE2(gc_major_end, pidbuf, reclaimed_now);
+        ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_GC);
     }
+
     reset_active_writer(p);
 
     /*
@@ -491,6 +672,9 @@ erts_garbage_collect(Process* p, int need, Eterm* objv, int nobj)
     esdp->gc_info.reclaimed += reclaimed_now;
     
     FLAGS(p) &= ~F_FORCE_GC;
+    p->live_hf_end = ERTS_INVALID_HFRAG_PTR;
+
+    ERTS_MSACC_POP_STATE_M();
 
 #ifdef CHECK_FOR_HOLES
     /*
@@ -512,15 +696,20 @@ erts_garbage_collect(Process* p, int need, Eterm* objv, int nobj)
     p->last_old_htop = p->old_htop;
 #endif
 
-    /* FIXME: This function should really return an Sint, i.e., a possibly
-       64 bit wide signed integer, but that requires updating all the code
-       that calls it. For now, we just return INT_MAX if the result is too
-       large for an int. */
-    {
-      Sint result = (HEAP_TOP(p) - HEAP_START(p)) / 10;
-      if (result >= INT_MAX) return INT_MAX;
-      else return (int) result;
-    }
+    return reds;
+}
+
+int
+erts_garbage_collect_nobump(Process* p, int need, Eterm* objv, int nobj)
+{
+    return garbage_collect(p, ERTS_INVALID_HFRAG_PTR, need, objv, nobj);
+}
+
+void
+erts_garbage_collect(Process* p, int need, Eterm* objv, int nobj)
+{
+    int reds = garbage_collect(p, ERTS_INVALID_HFRAG_PTR, need, objv, nobj);
+    BUMP_REDS(p, reds);
 }
 
 /*
@@ -533,13 +722,11 @@ erts_garbage_collect_hibernate(Process* p)
     Uint heap_size;
     Eterm* heap;
     Eterm* htop;
-    Rootset rootset;
-    char* src;
-    Uint src_size;
     Uint actual_size;
     char* area;
     Uint area_size;
     Sint offs;
+    int reds;
 
     if (p->flags & F_DISABLE_GC)
 	ERTS_INTERNAL_ERROR("GC disabled");
@@ -549,8 +736,6 @@ erts_garbage_collect_hibernate(Process* p)
      */
     erts_smp_atomic32_read_bor_nob(&p->state, ERTS_PSFLG_GC);
     ErtsGcQuickSanityCheck(p);
-    ASSERT(p->mbuf_sz == 0);
-    ASSERT(p->mbuf == 0);
     ASSERT(p->stop == p->hend);	/* Stack must be empty. */
 
     /*
@@ -558,46 +743,25 @@ erts_garbage_collect_hibernate(Process* p)
      */
 
 
-    heap_size = p->heap_sz + (p->old_htop - p->old_heap);
+    heap_size = p->heap_sz + (p->old_htop - p->old_heap) + p->mbuf_sz;
     heap = (Eterm*) ERTS_HEAP_ALLOC(ERTS_ALC_T_TMP_HEAP,
 				    sizeof(Eterm)*heap_size);
     htop = heap;
 
-    (void) setup_rootset(p, p->arg_reg, p->arity, &rootset);
-#if HIPE
-    hipe_empty_nstack(p);
-#endif
-
-    src = (char *) p->heap;
-    src_size = (char *) p->htop - src;
-    htop = sweep_rootset(&rootset, htop, src, src_size);
-    htop = sweep_one_area(heap, htop, src, src_size);
+    htop = full_sweep_heaps(p,
+			    1,
+			    heap,
+			    htop,
+			    (char *) p->old_heap,
+			    (char *) p->old_htop - (char *) p->old_heap,
+			    p->arg_reg,
+			    p->arity);
 
-    if (p->old_heap) {
-	src = (char *) p->old_heap;
-	src_size = (char *) p->old_htop - src;
-	htop = sweep_rootset(&rootset, htop, src, src_size);
-	htop = sweep_one_area(heap, htop, src, src_size);
-    }
-
-    cleanup_rootset(&rootset);
-
-    if (MSO(p).first) {
-        sweep_off_heap(p, 1);
-    }
-
-    /*
-     *  Update all pointers.
-     */
     ERTS_HEAP_FREE(ERTS_ALC_T_HEAP,
-		   (void*)HEAP_START(p),
-		   HEAP_SIZE(p) * sizeof(Eterm));
-    if (p->old_heap) {
-	ERTS_HEAP_FREE(ERTS_ALC_T_OLD_HEAP,
-		       (void*)p->old_heap,
-		       (p->old_hend - p->old_heap) * sizeof(Eterm));
-	p->old_heap = p->old_htop = p->old_hend = 0;
-    }
+		   (p->abandoned_heap
+		    ? p->abandoned_heap
+		    : p->heap),
+		   p->heap_sz * sizeof(Eterm));
 
     p->heap = heap;
     p->high_water = htop;
@@ -612,6 +776,7 @@ erts_garbage_collect_hibernate(Process* p)
     }
 
     FLAGS(p) &= ~F_FORCE_GC;
+    p->live_hf_end = ERTS_INVALID_HFRAG_PTR;
 
     /*
      * Move the heap to its final destination.
@@ -631,6 +796,8 @@ erts_garbage_collect_hibernate(Process* p)
     sys_memcpy((void *) heap, (void *) p->heap, actual_size*sizeof(Eterm));
     ERTS_HEAP_FREE(ERTS_ALC_T_TMP_HEAP, p->heap, p->heap_sz*sizeof(Eterm));
 
+    remove_message_buffers(p);
+
     p->stop = p->hend = heap + heap_size;
 
     offs = heap - p->heap;
@@ -659,15 +826,18 @@ erts_garbage_collect_hibernate(Process* p)
     ErtsGcQuickSanityCheck(p);
 
     erts_smp_atomic32_read_band_nob(&p->state, ~ERTS_PSFLG_GC);
+
+    reds = gc_cost(actual_size, actual_size);
+    BUMP_REDS(p, reds);
 }
 
 
 void
 erts_garbage_collect_literals(Process* p, Eterm* literals,
-			      Uint lit_size,
+			      Uint byte_lit_size,
 			      struct erl_off_heap_header* oh)
 {
-    Uint byte_lit_size = sizeof(Eterm)*lit_size;
+    Uint lit_size = byte_lit_size / sizeof(Eterm);
     Uint old_heap_size;
     Eterm* temp_lit;
     Sint offs;
@@ -743,7 +913,7 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
                 if (IS_MOVED_BOXED(val)) {
 		    ASSERT(is_boxed(val));
                     *g_ptr++ = val;
-		} else if (in_area(ptr, area, area_size)) {
+		} else if (ErtsInArea(ptr, area, area_size)) {
                     MOVE_BOXED(ptr,val,old_htop,g_ptr++);
 		} else {
 		    g_ptr++;
@@ -754,7 +924,7 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
                 val = *ptr;
                 if (IS_MOVED_CONS(val)) { /* Moved */
                     *g_ptr++ = ptr[1];
-		} else if (in_area(ptr, area, area_size)) {
+		} else if (ErtsInArea(ptr, area, area_size)) {
                     MOVE_CONS(ptr,val,old_htop,g_ptr++);
                 } else {
 		    g_ptr++;
@@ -774,8 +944,10 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
      * Now we'll have to go through all heaps updating all other references.
      */
 
-    old_htop = sweep_one_heap(p->heap, p->htop, old_htop, area, area_size);
-    old_htop = sweep_one_area(p->old_heap, old_htop, area, area_size);
+    old_htop = sweep_literals_to_old_heap(p->heap, p->htop, old_htop, area, area_size);
+    old_htop = sweep_literal_area(p->old_heap, old_htop,
+				  (char *) p->old_heap, sizeof(Eterm)*old_heap_size,
+				  area, area_size);
     ASSERT(p->old_htop <= old_htop && old_htop <= p->old_hend);
     p->old_htop = old_htop;
 
@@ -834,15 +1006,18 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
 }
 
 static int
-minor_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
+minor_collection(Process* p, ErlHeapFragment *live_hf_end,
+		 int need, Eterm* objv, int nobj, Uint *recl)
 {
-    Uint mature = HIGH_WATER(p) - HEAP_START(p);
+    Eterm *mature = p->abandoned_heap ? p->abandoned_heap : p->heap;
+    Uint mature_size = p->high_water - mature;
+    Uint size_before = young_gen_usage(p);
 
     /*
      * Allocate an old heap if we don't have one and if we'll need one.
      */
 
-    if (OLD_HEAP(p) == NULL && mature != 0) {
+    if (OLD_HEAP(p) == NULL && mature_size != 0) {
         Eterm* n_old;
 
         /* Note: We choose a larger heap size than strictly needed,
@@ -850,7 +1025,7 @@ minor_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
          * This improved Estone by more than 1200 estones on my computer
          * (Ultra Sparc 10).
          */
-        Uint new_sz = erts_next_heap_size(HEAP_TOP(p) - HEAP_START(p), 1);
+        Uint new_sz = erts_next_heap_size(size_before, 1);
 
         /* Create new, empty old_heap */
         n_old = (Eterm *) ERTS_HEAP_ALLOC(ERTS_ALC_T_OLD_HEAP,
@@ -866,41 +1041,32 @@ minor_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
      */
 
     if (OLD_HEAP(p) &&
-	    ((mature <= OLD_HEND(p) - OLD_HTOP(p)) &&
-	    ((BIN_VHEAP_MATURE(p) < ( BIN_OLD_VHEAP_SZ(p) - BIN_OLD_VHEAP(p)))) &&
-	    ((BIN_OLD_VHEAP_SZ(p) > BIN_OLD_VHEAP(p))) ) ) {
-	ErlMessage *msgp;
-	Uint size_after;
-	Uint need_after;
-	const Uint stack_size = STACK_SZ_ON_HEAP(p);
-	const Uint size_before = MBUF_SIZE(p) + (HEAP_TOP(p) - HEAP_START(p));
-	Uint new_sz = HEAP_SIZE(p) + MBUF_SIZE(p) + combined_message_size(p);
+	((mature_size <= OLD_HEND(p) - OLD_HTOP(p)) &&
+	 ((BIN_OLD_VHEAP_SZ(p) > BIN_OLD_VHEAP(p))) ) ) {
+	Eterm *prev_old_htop;
+	Uint stack_size, size_after, adjust_size, need_after, new_sz, new_mature;
+
+	stack_size = p->hend - p->stop;
+	new_sz = stack_size + size_before;
         new_sz = next_heap_size(p, new_sz, 0);
 
-        do_minor(p, new_sz, objv, nobj);
+	prev_old_htop = p->old_htop;
+        do_minor(p, live_hf_end, (char *) mature, mature_size*sizeof(Eterm),
+		 new_sz, objv, nobj);
+
+	if (p->flags & F_ON_HEAP_MSGQ)
+	    move_msgq_to_heap(p);
 
-        size_after = HEAP_TOP(p) - HEAP_START(p);
+	new_mature = p->old_htop - prev_old_htop;
+
+	size_after = new_mature;
+        size_after += HEAP_TOP(p) - HEAP_START(p) + p->mbuf_sz;
         *recl += (size_before - size_after);
 
-        /*
-	 * Copy newly received message onto the end of the new heap.
-	 */
-        ErtsGcQuickSanityCheck(p);
-        for (msgp = p->msg.first; msgp; msgp = msgp->next) {
-            if (msgp->data.attached) {
-                ErtsHeapFactory factory;
-                erts_factory_proc_prealloc_init(&factory, p,
-                                                erts_msg_attached_data_size(msgp));
-                erts_move_msg_attached_data_to_heap(&factory, msgp);
-                erts_factory_close(&factory);
-                ErtsGcQuickSanityCheck(p);
-            }
-        }
 	ErtsGcQuickSanityCheck(p);
 
         GEN_GCS(p)++;
         need_after = ((HEAP_TOP(p) - HEAP_START(p))
-                      + erts_used_frag_sz(MBUF(p))
                       + need
                       + stack_size);
 	
@@ -913,6 +1079,8 @@ minor_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
          * the heap size is substantial, we don't want to shrink.
          */
 
+	adjust_size = 0;
+
         if ((HEAP_SIZE(p) > 3000) && (4 * need_after < HEAP_SIZE(p)) &&
             ((HEAP_SIZE(p) > 8000) ||
              (HEAP_SIZE(p) > (OLD_HEND(p) - OLD_HEAP(p))))) {
@@ -934,28 +1102,33 @@ minor_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
 					       : next_heap_size(p, wanted, 0);
             if (wanted < HEAP_SIZE(p)) {
                 shrink_new_heap(p, wanted, objv, nobj);
+		adjust_size = p->htop - p->heap;
             }
 
-            ASSERT(HEAP_SIZE(p) == next_heap_size(p, HEAP_SIZE(p), 0));
-            ASSERT(MBUF(p) == NULL);
-	    return 1;		/* We are done. */
+	    goto done;
         }
 
         if (HEAP_SIZE(p) >= need_after) {
 	    /*
 	     * The heap size turned out to be just right. We are done.
 	     */
-            ASSERT(HEAP_SIZE(p) == next_heap_size(p, HEAP_SIZE(p), 0));
-            ASSERT(MBUF(p) == NULL);
-            return 1;
+	    goto done;
 	}
+
+        grow_new_heap(p, next_heap_size(p, need_after, 0), objv, nobj);
+	adjust_size = p->htop - p->heap;
+
+    done:
+	ASSERT(HEAP_SIZE(p) == next_heap_size(p, HEAP_SIZE(p), 0));
+	ASSERT(MBUF(p) == NULL);
+
+	return gc_cost(size_after, adjust_size);
     }
 
     /*
-     * Still not enough room after minor collection. Must force a major collection.
+     * Not enough room for a minor collection. Must force a major collection.
      */
-    FLAGS(p) |= F_NEED_FULLSWEEP;
-    return 0;
+    return -1;
 }
 
 /*
@@ -1009,7 +1182,9 @@ static ERTS_INLINE void offset_nstack(Process* p, Sint offs,
 #endif /* HIPE */
 
 static void
-do_minor(Process *p, Uint new_sz, Eterm* objv, int nobj)
+do_minor(Process *p, ErlHeapFragment *live_hf_end,
+	 char *mature, Uint mature_size,
+	 Uint new_sz, Eterm* objv, int nobj)
 {
     Rootset rootset;            /* Rootset for GC (stack, dictionary, etc). */
     Roots* roots;
@@ -1018,17 +1193,24 @@ do_minor(Process *p, Uint new_sz, Eterm* objv, int nobj)
     Eterm* ptr;
     Eterm val;
     Eterm gval;
-    char* heap = (char *) HEAP_START(p);
-    Uint heap_size = (char *) HEAP_TOP(p) - heap;
-    Uint mature_size = (char *) HIGH_WATER(p) - heap;
     Eterm* old_htop = OLD_HTOP(p);
     Eterm* n_heap;
+    char* oh = (char *) OLD_HEAP(p);
+    Uint oh_size = (char *) OLD_HTOP(p) - oh;
+
+    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] MINOR GC: %p %p %p %p\n", p->common.id,
+                           HEAP_START(p), HEAP_END(p), OLD_HEAP(p), OLD_HEND(p)));
 
     n_htop = n_heap = (Eterm*) ERTS_HEAP_ALLOC(ERTS_ALC_T_HEAP,
 					       sizeof(Eterm)*new_sz);
 
-    if (MBUF(p) != NULL) {
-	n_htop = collect_heap_frags(p, n_heap, n_htop, objv, nobj);
+    if (live_hf_end != ERTS_INVALID_HFRAG_PTR) {
+	/*
+	 * Move heap frags that we know are completely live
+	 * directly into the new young heap generation.
+	 */
+	n_htop = collect_live_heap_frags(p, live_hf_end, n_heap, n_htop,
+					 objv, nobj);
     }
 
     n = setup_rootset(p, objv, nobj, &rootset);
@@ -1051,9 +1233,9 @@ do_minor(Process *p, Uint new_sz, Eterm* objv, int nobj)
                 if (IS_MOVED_BOXED(val)) {
 		    ASSERT(is_boxed(val));
                     *g_ptr++ = val;
-                } else if (in_area(ptr, heap, mature_size)) {
+                } else if (ErtsInArea(ptr, mature, mature_size)) {
                     MOVE_BOXED(ptr,val,old_htop,g_ptr++);
-                } else if (in_area(ptr, heap, heap_size)) {
+                } else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
                     MOVE_BOXED(ptr,val,n_htop,g_ptr++);
                 } else {
 		    g_ptr++;
@@ -1066,9 +1248,9 @@ do_minor(Process *p, Uint new_sz, Eterm* objv, int nobj)
                 val = *ptr;
                 if (IS_MOVED_CONS(val)) { /* Moved */
                     *g_ptr++ = ptr[1];
-                } else if (in_area(ptr, heap, mature_size)) {
+                } else if (ErtsInArea(ptr, mature, mature_size)) {
                     MOVE_CONS(ptr,val,old_htop,g_ptr++);
-                } else if (in_area(ptr, heap, heap_size)) {
+                } else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
                     MOVE_CONS(ptr,val,n_htop,g_ptr++);
                 } else {
 		    g_ptr++;
@@ -1093,7 +1275,7 @@ do_minor(Process *p, Uint new_sz, Eterm* objv, int nobj)
      */
 
     if (mature_size == 0) {
-	n_htop = sweep_one_area(n_heap, n_htop, heap, heap_size);
+	n_htop = sweep_new_heap(n_heap, n_htop, oh, oh_size);
     } else {
 	Eterm* n_hp = n_heap;
 	Eterm* ptr;
@@ -1110,9 +1292,9 @@ do_minor(Process *p, Uint new_sz, Eterm* objv, int nobj)
 		if (IS_MOVED_BOXED(val)) {
 		    ASSERT(is_boxed(val));
 		    *n_hp++ = val;
-		} else if (in_area(ptr, heap, mature_size)) {
+		} else if (ErtsInArea(ptr, mature, mature_size)) {
 		    MOVE_BOXED(ptr,val,old_htop,n_hp++);
-		} else if (in_area(ptr, heap, heap_size)) {
+		} else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
 		    MOVE_BOXED(ptr,val,n_htop,n_hp++);
 		} else {
 		    n_hp++;
@@ -1124,9 +1306,9 @@ do_minor(Process *p, Uint new_sz, Eterm* objv, int nobj)
 		val = *ptr;
 		if (IS_MOVED_CONS(val)) {
 		    *n_hp++ = ptr[1];
-		} else if (in_area(ptr, heap, mature_size)) {
+		} else if (ErtsInArea(ptr, mature, mature_size)) {
 		    MOVE_CONS(ptr,val,old_htop,n_hp++);
-		} else if (in_area(ptr, heap, heap_size)) {
+		} else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
 		    MOVE_CONS(ptr,val,n_htop,n_hp++);
 		} else {
 		    n_hp++;
@@ -1146,10 +1328,10 @@ do_minor(Process *p, Uint new_sz, Eterm* objv, int nobj)
 			if (IS_MOVED_BOXED(val)) {
 			    *origptr = val;
 			    mb->base = binary_bytes(val);
-			} else if (in_area(ptr, heap, mature_size)) {
+			} else if (ErtsInArea(ptr, mature, mature_size)) {
 			    MOVE_BOXED(ptr,val,old_htop,origptr);
 			    mb->base = binary_bytes(mb->orig);
-			} else if (in_area(ptr, heap, heap_size)) {
+			} else if (ErtsInYoungGen(*origptr, ptr, oh, oh_size)) {
 			    MOVE_BOXED(ptr,val,n_htop,origptr);
 			    mb->base = binary_bytes(mb->orig);
 			}
@@ -1170,9 +1352,8 @@ do_minor(Process *p, Uint new_sz, Eterm* objv, int nobj)
      * may point to the old (soon to be deleted) new_heap.
      */
 
-    if (OLD_HTOP(p) < old_htop) {
-	old_htop = sweep_one_area(OLD_HTOP(p), old_htop, heap, heap_size);
-    }
+    if (OLD_HTOP(p) < old_htop)
+	old_htop = sweep_new_heap(OLD_HTOP(p), old_htop, oh, oh_size);
     OLD_HTOP(p) = old_htop;
     HIGH_WATER(p) = n_htop;
 
@@ -1204,8 +1385,12 @@ do_minor(Process *p, Uint new_sz, Eterm* objv, int nobj)
 #endif
 
     ERTS_HEAP_FREE(ERTS_ALC_T_HEAP,
-		   (void*)HEAP_START(p),
+		   (p->abandoned_heap
+		    ? p->abandoned_heap
+		    : HEAP_START(p)),
 		   HEAP_SIZE(p) * sizeof(Eterm));
+    p->abandoned_heap = NULL;
+    p->flags &= ~F_ABANDONED_HEAP_USE;
     HEAP_START(p) = n_heap;
     HEAP_TOP(p) = n_htop;
     HEAP_SIZE(p) = new_sz;
@@ -1222,31 +1407,30 @@ do_minor(Process *p, Uint new_sz, Eterm* objv, int nobj)
  */
 
 static int
-major_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
+major_collection(Process* p, ErlHeapFragment *live_hf_end,
+		 int need, Eterm* objv, int nobj, Uint *recl)
 {
-    Rootset rootset;
-    Roots* roots;
-    const Uint size_before = ((HEAP_TOP(p) - HEAP_START(p))
-                              + (OLD_HTOP(p) - OLD_HEAP(p))
-                              + MBUF_SIZE(p));
+    Uint size_before, size_after, stack_size;
     Eterm* n_heap;
     Eterm* n_htop;
-    char* src = (char *) HEAP_START(p);
-    Uint src_size = (char *) HEAP_TOP(p) - src;
     char* oh = (char *) OLD_HEAP(p);
     Uint oh_size = (char *) OLD_HTOP(p) - oh;
-    Uint n;
-    Uint new_sz;
-    int done;
+    Uint new_sz, stk_sz;
+    int adjusted;
+
+    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] MAJOR GC: %p %p %p %p\n", p->common.id,
+                           HEAP_START(p), HEAP_END(p), OLD_HEAP(p), OLD_HEND(p)));
 
     /*
      * Do a fullsweep GC. First figure out the size of the heap
      * to receive all live data.
      */
 
-    new_sz = (HEAP_SIZE(p) + MBUF_SIZE(p)
-              + combined_message_size(p)
-              + (OLD_HTOP(p) - OLD_HEAP(p)));
+    size_before = young_gen_usage(p);
+    size_before += p->old_htop - p->old_heap;
+    stack_size = p->hend - p->stop;
+
+    new_sz = stack_size + size_before;
     new_sz = next_heap_size(p, new_sz, 0);
 
     /*
@@ -1260,13 +1444,76 @@ major_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
     n_htop = n_heap = (Eterm *) ERTS_HEAP_ALLOC(ERTS_ALC_T_HEAP,
 						sizeof(Eterm)*new_sz);
 
-    /*
-     * Get rid of heap fragments.
-     */
+    if (live_hf_end != ERTS_INVALID_HFRAG_PTR) {
+	/*
+	 * Move heap frags that we know are completely live
+	 * directly into the heap.
+	 */
+	n_htop = collect_live_heap_frags(p, live_hf_end, n_heap, n_htop,
+					 objv, nobj);
+    }
 
-    if (MBUF(p) != NULL) {
-	n_htop = collect_heap_frags(p, n_heap, n_htop, objv, nobj);
+    n_htop = full_sweep_heaps(p, 0, n_heap, n_htop, oh, oh_size, objv, nobj);
+
+    /* Move the stack to the end of the heap */
+    stk_sz = HEAP_END(p) - p->stop;
+    sys_memcpy(n_heap + new_sz - stk_sz, p->stop, stk_sz * sizeof(Eterm));
+    p->stop = n_heap + new_sz - stk_sz;
+
+#ifdef USE_VM_PROBES
+    if (HEAP_SIZE(p) != new_sz && DTRACE_ENABLED(process_heap_grow)) {
+        DTRACE_CHARBUF(pidbuf, DTRACE_TERM_BUF_SIZE);
+
+        dtrace_proc_str(p, pidbuf);
+        DTRACE3(process_heap_grow, pidbuf, HEAP_SIZE(p), new_sz);
     }
+#endif
+
+    ERTS_HEAP_FREE(ERTS_ALC_T_HEAP,
+		   (p->abandoned_heap
+		    ? p->abandoned_heap
+		    : HEAP_START(p)),
+		   p->heap_sz * sizeof(Eterm));
+    p->abandoned_heap = NULL;
+    p->flags &= ~F_ABANDONED_HEAP_USE;
+    HEAP_START(p) = n_heap;
+    HEAP_TOP(p) = n_htop;
+    HEAP_SIZE(p) = new_sz;
+    HEAP_END(p) = n_heap + new_sz;
+    GEN_GCS(p) = 0;
+
+    HIGH_WATER(p) = HEAP_TOP(p);
+
+    remove_message_buffers(p);
+
+    if (p->flags & F_ON_HEAP_MSGQ)
+	move_msgq_to_heap(p);
+
+    ErtsGcQuickSanityCheck(p);
+
+    size_after = HEAP_TOP(p) - HEAP_START(p) + p->mbuf_sz;
+    *recl += size_before - size_after;
+
+    adjusted = adjust_after_fullsweep(p, need, objv, nobj);
+
+#ifdef HARDDEBUG
+    disallow_heap_frag_ref_in_heap(p);
+#endif
+    ErtsGcQuickSanityCheck(p);
+
+    return gc_cost(size_after, adjusted ? size_after : 0);
+}
+
+static Eterm *
+full_sweep_heaps(Process *p,
+		 int hibernate,
+		 Eterm *n_heap, Eterm* n_htop,
+		 char *oh, Uint oh_size,
+		 Eterm *objv, int nobj)
+{
+    Rootset rootset;
+    Roots *roots;
+    Uint n;
 
     /*
      * Copy all top-level terms directly referenced by the rootset to
@@ -1274,7 +1521,14 @@ major_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
      */
 
     n = setup_rootset(p, objv, nobj, &rootset);
-    n_htop = fullsweep_nstack(p, n_htop);
+
+#ifdef HIPE
+    if (hibernate)
+	hipe_empty_nstack(p);
+    else
+	n_htop = fullsweep_nstack(p, n_htop);
+#endif
+
     roots = rootset.roots;
     while (n--) {
 	Eterm* g_ptr = roots->v;
@@ -1294,7 +1548,7 @@ major_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
 		if (IS_MOVED_BOXED(val)) {
 		    ASSERT(is_boxed(val));
 		    *g_ptr++ = val;
-		} else if (in_area(ptr, src, src_size) || in_area(ptr, oh, oh_size)) {
+		} else if (!erts_is_literal(gval, ptr)) {
 		    MOVE_BOXED(ptr,val,n_htop,g_ptr++);
 		} else {
 		    g_ptr++;
@@ -1307,7 +1561,7 @@ major_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
 		val = *ptr;
 		if (IS_MOVED_CONS(val)) {
 		    *g_ptr++ = ptr[1];
-		} else if (in_area(ptr, src, src_size) || in_area(ptr, oh, oh_size)) {
+		} else if (!erts_is_literal(gval, ptr)) {
 		    MOVE_CONS(ptr,val,n_htop,g_ptr++);
 		} else {
 		    g_ptr++;
@@ -1332,74 +1586,7 @@ major_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
      * until all is copied.
      */
 
-    if (oh_size == 0) {
-	n_htop = sweep_one_area(n_heap, n_htop, src, src_size);
-    } else {
-	Eterm* n_hp = n_heap;
-
-	while (n_hp != n_htop) {
-	    Eterm* ptr;
-	    Eterm val;
-	    Eterm gval = *n_hp;
-
-	    switch (primary_tag(gval)) {
-	    case TAG_PRIMARY_BOXED: {
-		ptr = boxed_val(gval);
-		val = *ptr;
-		if (IS_MOVED_BOXED(val)) {
-		    ASSERT(is_boxed(val));
-		    *n_hp++ = val;
-		} else if (in_area(ptr, src, src_size) || in_area(ptr, oh, oh_size)) {
-		    MOVE_BOXED(ptr,val,n_htop,n_hp++);
-		} else {
-		    n_hp++;
-		}
-		break;
-	    }
-	    case TAG_PRIMARY_LIST: {
-		ptr = list_val(gval);
-		val = *ptr;
-		if (IS_MOVED_CONS(val)) {
-		    *n_hp++ = ptr[1];
-		} else if (in_area(ptr, src, src_size) || in_area(ptr, oh, oh_size)) {
-		    MOVE_CONS(ptr,val,n_htop,n_hp++);
-		} else {
-		    n_hp++;
-		}
-		break;
-	    }
-	    case TAG_PRIMARY_HEADER: {
-		if (!header_is_thing(gval))
-		    n_hp++;
-		else {
-		    if (header_is_bin_matchstate(gval)) {
-			ErlBinMatchState *ms = (ErlBinMatchState*) n_hp;
-			ErlBinMatchBuffer *mb = &(ms->mb);
-			Eterm* origptr;	
-			origptr = &(mb->orig);
-			ptr = boxed_val(*origptr);
-			val = *ptr;
-			if (IS_MOVED_BOXED(val)) {
-			    *origptr = val;
-			    mb->base = binary_bytes(*origptr);
-			} else if (in_area(ptr, src, src_size) ||
-				   in_area(ptr, oh, oh_size)) {
-			    MOVE_BOXED(ptr,val,n_htop,origptr); 
-			    mb->base = binary_bytes(*origptr);
-			    ptr = boxed_val(*origptr);
-			    val = *ptr;
-			}
-		    }
-		    n_hp += (thing_arityval(gval)+1);
-		}
-		break;
-	    }
-	    default:
-		n_hp++;
-		break;
-	    }
-	}
-    }
+    n_htop = sweep_heaps(n_heap, n_htop, oh, oh_size);
 
     if (MSO(p).first) {
 	sweep_off_heap(p, 1);
@@ -1412,75 +1599,13 @@ major_collection(Process* p, int need, Eterm* objv, int nobj, Uint *recl)
 	OLD_HEAP(p) = OLD_HTOP(p) = OLD_HEND(p) = NULL;
     }
 
-    /* Move the stack to the end of the heap */
-    n = HEAP_END(p) - p->stop;
-    sys_memcpy(n_heap + new_sz - n, p->stop, n * sizeof(Eterm));
-    p->stop = n_heap + new_sz - n;
-
-#ifdef USE_VM_PROBES
-    if (HEAP_SIZE(p) != new_sz && DTRACE_ENABLED(process_heap_grow)) {
-        DTRACE_CHARBUF(pidbuf, DTRACE_TERM_BUF_SIZE);
-
-        dtrace_proc_str(p, pidbuf);
-        DTRACE3(process_heap_grow, pidbuf, HEAP_SIZE(p), new_sz);
-    }
-#endif
-
-    ERTS_HEAP_FREE(ERTS_ALC_T_HEAP,
-		   (void *) HEAP_START(p),
-		   (HEAP_END(p) - HEAP_START(p)) * sizeof(Eterm));
-    HEAP_START(p) = n_heap;
-    HEAP_TOP(p) = n_htop;
-    HEAP_SIZE(p) = new_sz;
-    HEAP_END(p) = n_heap + new_sz;
-    GEN_GCS(p) = 0;
-
-    HIGH_WATER(p) = HEAP_TOP(p);
-
-    ErtsGcQuickSanityCheck(p);
-
-    *recl += size_before - (HEAP_TOP(p) - HEAP_START(p));
-
-    remove_message_buffers(p);
-
-    {
-	ErlMessage *msgp;
-
-	/*
-	 * Copy newly received message onto the end of the new heap.
-	 */
-        for (msgp = p->msg.first; msgp; msgp = msgp->next) {
-	    if (msgp->data.attached) {
-                ErtsHeapFactory factory;
-                erts_factory_proc_prealloc_init(&factory, p,
-                                                erts_msg_attached_data_size(msgp));
-		erts_move_msg_attached_data_to_heap(&factory, msgp);
-                erts_factory_close(&factory);
-		ErtsGcQuickSanityCheck(p);
-	    }
-	}
-    }
-
-    if (MBUF(p)) {
-        /* This is a very rare case when distributed messages copied above
-         * contained maps so big they did not fit on the heap causing the
-         * factory to create heap frags.
-         * Solution: Trigger a minor gc (without tenuring)
-         */
-        HIGH_WATER(p) = HEAP_START(p);
-        done = 0;
-    } else {
-        adjust_after_fullsweep(p, need, objv, nobj);
-        done = 1;
-    }
-
-    ErtsGcQuickSanityCheck(p);
-    return done;
+    return n_htop;
 }
 
-static void
+static int
 adjust_after_fullsweep(Process *p, int need, Eterm *objv, int nobj)
 {
+    int adjusted = 0;
     Uint wanted, sz, need_after;
     Uint stack_size = STACK_SZ_ON_HEAP(p);
     
@@ -1493,6 +1618,7 @@ adjust_after_fullsweep(Process *p, int need, Eterm *objv, int nobj)
         /* Too small - grow to match requested need */
         sz = next_heap_size(p, need_after, 0);
         grow_new_heap(p, sz, objv, nobj);
+	adjusted = 1;
     } else if (3 * HEAP_SIZE(p) < 4 * need_after){
         /* Need more than 75% of current, postpone to next GC.*/
         FLAGS(p) |= F_HEAP_GROW;
@@ -1509,25 +1635,10 @@ adjust_after_fullsweep(Process *p, int need, Eterm *objv, int nobj)
 
         if (sz < HEAP_SIZE(p)) {
             shrink_new_heap(p, sz, objv, nobj);
+	    adjusted = 1;
         }
     }
-}
-
-/*
- * Return the size of all message buffers that are NOT linked in the
- * mbuf list.
- */
-static Uint
-combined_message_size(Process* p)
-{
-    Uint sz;
-    ErlMessage *msgp;
-
-    for (sz = 0, msgp = p->msg.first; msgp; msgp = msgp->next) {
-	if (msgp->data.attached)
-	    sz += erts_msg_attached_data_size(msgp);
-    }
-    return sz;
+    return adjusted;
 }
 
 /*
@@ -1540,6 +1651,10 @@ remove_message_buffers(Process* p)
 	free_message_buffer(MBUF(p));
 	MBUF(p) = NULL;
     }    
+    if (p->msg_frag) {
+	erts_cleanup_messages(p->msg_frag);
+	p->msg_frag = NULL;
+    }
     MBUF_SIZE(p) = 0;    
 }
 #ifdef HARDDEBUG
@@ -1551,64 +1666,6 @@ remove_message_buffers(Process* p)
  * For performance reasons, we use _unchecked_list_val(), _unchecked_boxed_val(),
  * and so on to avoid a function call.
  */
- 
-static void
-disallow_heap_frag_ref(Process* p, Eterm* n_htop, Eterm* objv, int nobj)
-{
-    ErlHeapFragment* mbuf;
-    ErlHeapFragment* qb;
-    Eterm gval;
-    Eterm* ptr;
-    Eterm val;
-
-    ASSERT(p->htop != NULL);
-    mbuf = MBUF(p);
-
-    while (nobj--) {
-	gval = *objv;
-	
-	switch (primary_tag(gval)) {
-
-	case TAG_PRIMARY_BOXED: {
-	    ptr = _unchecked_boxed_val(gval);
-	    val = *ptr;
-	    if (IS_MOVED_BOXED(val)) {
-		ASSERT(is_boxed(val));
-		objv++;
-	    } else {
- 		for (qb = mbuf; qb != NULL; qb = qb->next) {
-		    if (in_area(ptr, qb->mem, qb->alloc_size*sizeof(Eterm))) {
-			abort();
-		    }
-		}
-		objv++;
-	    }
-	    break;
-	}
-
-	case TAG_PRIMARY_LIST: {
-	    ptr = _unchecked_list_val(gval);
-	    val = *ptr;
-	    if (IS_MOVED_CONS(val)) {
-		objv++;
-	    } else {
-		for (qb = mbuf; qb != NULL; qb = qb->next) {
-		    if (in_area(ptr, qb->mem, qb->alloc_size*sizeof(Eterm))) {
-			abort();
-		    }
-		}
-		objv++;
-	    }
-	    break;
-	}
-
-	default: {
-	    objv++;
-	    break;
-	}
-	}
-    }
-}
 
 static void
 disallow_heap_frag_ref_in_heap(Process* p)
@@ -1636,9 +1693,9 @@ disallow_heap_frag_ref_in_heap(Process* p)
 	switch (primary_tag(val)) {
 	case TAG_PRIMARY_BOXED:
 	    ptr = _unchecked_boxed_val(val);
-	    if (!in_area(ptr, heap, heap_size)) {
+	    if (!ErtsInArea(ptr, heap, heap_size)) {
 		for (qb = MBUF(p); qb != NULL; qb = qb->next) {
-		    if (in_area(ptr, qb->mem, qb->alloc_size*sizeof(Eterm))) {
+		    if (ErtsInArea(ptr, qb->mem, qb->alloc_size*sizeof(Eterm))) {
 			abort();
 		    }
 		}
@@ -1646,9 +1703,9 @@ disallow_heap_frag_ref_in_heap(Process* p)
 	    break;
 	case TAG_PRIMARY_LIST:
 	    ptr = _unchecked_list_val(val);
-	    if (!in_area(ptr, heap, heap_size)) {
+	    if (!ErtsInArea(ptr, heap, heap_size)) {
 		for (qb = MBUF(p); qb != NULL; qb = qb->next) {
-		    if (in_area(ptr, qb->mem, qb->alloc_size*sizeof(Eterm))) {
+		    if (ErtsInArea(ptr, qb->mem, qb->alloc_size*sizeof(Eterm))) {
 			abort();
 		    }
 		}
@@ -1690,26 +1747,26 @@ disallow_heap_frag_ref_in_old_heap(Process* p)
 	val = *hp++;
 	switch (primary_tag(val)) {
 	case TAG_PRIMARY_BOXED:
-	    ptr = (Eterm *) EXPAND_POINTER(val);
-	    if (!in_area(ptr, old_heap, old_heap_size)) {
-		if (in_area(ptr, new_heap, new_heap_size)) {
+	    ptr = (Eterm *) val;
+	    if (!ErtsInArea(ptr, old_heap, old_heap_size)) {
+		if (ErtsInArea(ptr, new_heap, new_heap_size)) {
 		    abort();
 		}
 		for (qb = MBUF(p); qb != NULL; qb = qb->next) {
-		    if (in_area(ptr, qb->mem, qb->alloc_size*sizeof(Eterm))) {
+		    if (ErtsInArea(ptr, qb->mem, qb->alloc_size*sizeof(Eterm))) {
 			abort();
 		    }
 		}
 	    }
 	    break;
 	case TAG_PRIMARY_LIST:
-	    ptr = (Eterm *) EXPAND_POINTER(val);
-	    if (!in_area(ptr, old_heap, old_heap_size)) {
-		if (in_area(ptr, new_heap, new_heap_size)) {
+	    ptr = (Eterm *) val;
+	    if (!ErtsInArea(ptr, old_heap, old_heap_size)) {
+		if (ErtsInArea(ptr, new_heap, new_heap_size)) {
 		    abort();
 		}
 		for (qb = MBUF(p); qb != NULL; qb = qb->next) {
-		    if (in_area(ptr, qb->mem, qb->alloc_size*sizeof(Eterm))) {
+		    if (ErtsInArea(ptr, qb->mem, qb->alloc_size*sizeof(Eterm))) {
 			abort();
 		    }
 		}
@@ -1718,7 +1775,7 @@ disallow_heap_frag_ref_in_old_heap(Process* p)
 	case TAG_PRIMARY_HEADER:
 	    if (header_is_thing(val)) {
 		hp += _unchecked_thing_arityval(val);
-		if (!in_area(hp, old_heap, old_heap_size+1)) {
+		if (!ErtsInArea(hp, old_heap, old_heap_size+1)) {
 		    abort();
 		}
 	    }
@@ -1728,66 +1785,30 @@ disallow_heap_frag_ref_in_old_heap(Process* p)
 }
 #endif
 
-static Eterm*
-sweep_rootset(Rootset* rootset, Eterm* htop, char* src, Uint src_size)
+typedef enum {
+    ErtsSweepNewHeap,
+    ErtsSweepHeaps,
+    ErtsSweepLiteralArea
+} ErtsSweepType;
+
+static ERTS_FORCE_INLINE Eterm *
+sweep(Eterm *n_hp, Eterm *n_htop,
+      ErtsSweepType type,
+      char *oh, Uint ohsz,
+      char *src, Uint src_size)
 {
-    Roots* roots = rootset->roots;
-    Uint n = rootset->num_roots;
     Eterm* ptr;
-    Eterm gval;
     Eterm val;
+    Eterm gval;
 
-    while (n--) {
-        Eterm* g_ptr = roots->v;
-        Uint g_sz = roots->sz;
-
-	roots++;
-        while (g_sz--) {
-            gval = *g_ptr;
-
-            switch (primary_tag(gval)) {
-	    case TAG_PRIMARY_BOXED: {
-		ptr = boxed_val(gval);
-                val = *ptr;
-                if (IS_MOVED_BOXED(val)) {
-		    ASSERT(is_boxed(val));
-                    *g_ptr++ = val;
-                } else if (in_area(ptr, src, src_size)) {
-                    MOVE_BOXED(ptr,val,htop,g_ptr++);
-                } else {
-		    g_ptr++;
-		}
-                break;
-	    }
-	    case TAG_PRIMARY_LIST: {
-                ptr = list_val(gval);
-                val = *ptr;
-                if (IS_MOVED_CONS(val)) {
-                    *g_ptr++ = ptr[1];
-                } else if (in_area(ptr, src, src_size)) {
-                    MOVE_CONS(ptr,val,htop,g_ptr++);
-                } else {
-		    g_ptr++;
-		}
-		break;
-	    }
-
-	    default:
-                g_ptr++;
-		break;
-            }
-        }
-    }
-    return htop;
-}
+#undef ERTS_IS_IN_SWEEP_AREA
 
-
-static Eterm*
-sweep_one_area(Eterm* n_hp, Eterm* n_htop, char* src, Uint src_size)
-{
-    Eterm* ptr;
-    Eterm val;
-    Eterm gval;
+#define ERTS_IS_IN_SWEEP_AREA(TPtr, Ptr)				\
+    (type == ErtsSweepHeaps						\
+     ? !erts_is_literal((TPtr), (Ptr))					\
+     : (type == ErtsSweepNewHeap					\
+	? ErtsInYoungGen((TPtr), (Ptr), oh, ohsz)			\
+	: ErtsInArea((Ptr), src, src_size)))
 
     while (n_hp != n_htop) {
 	ASSERT(n_hp < n_htop);
@@ -1799,7 +1820,7 @@ sweep_one_area(Eterm* n_hp, Eterm* n_htop, char* src, Uint src_size)
 	    if (IS_MOVED_BOXED(val)) {
 		ASSERT(is_boxed(val));
 		*n_hp++ = val;
-	    } else if (in_area(ptr, src, src_size)) {
+	    } else if (ERTS_IS_IN_SWEEP_AREA(gval, ptr)) {
 		MOVE_BOXED(ptr,val,n_htop,n_hp++);
 	    } else {
 		n_hp++;
@@ -1811,7 +1832,7 @@ sweep_one_area(Eterm* n_hp, Eterm* n_htop, char* src, Uint src_size)
 	    val = *ptr;
 	    if (IS_MOVED_CONS(val)) {
 		*n_hp++ = ptr[1];
-	    } else if (in_area(ptr, src, src_size)) {
+	    } else if (ERTS_IS_IN_SWEEP_AREA(gval, ptr)) {
 		MOVE_CONS(ptr,val,n_htop,n_hp++);
 	    } else {
 		n_hp++;
@@ -1832,7 +1853,7 @@ sweep_one_area(Eterm* n_hp, Eterm* n_htop, char* src, Uint src_size)
 		    if (IS_MOVED_BOXED(val)) {
 			*origptr = val;
 			mb->base = binary_bytes(*origptr);
-		    } else if (in_area(ptr, src, src_size)) {
+		    } else if (ERTS_IS_IN_SWEEP_AREA(*origptr, ptr)) {
 			MOVE_BOXED(ptr,val,n_htop,origptr); 
 			mb->base = binary_bytes(*origptr);
 		    }
@@ -1847,10 +1868,41 @@ sweep_one_area(Eterm* n_hp, Eterm* n_htop, char* src, Uint src_size)
 	}
     }
     return n_htop;
+#undef ERTS_IS_IN_SWEEP_AREA
+}
+
+static Eterm *
+sweep_new_heap(Eterm *n_hp, Eterm *n_htop, char* old_heap, Uint old_heap_size)
+{
+    return sweep(n_hp, n_htop,
+		 ErtsSweepNewHeap,
+		 old_heap, old_heap_size,
+		 NULL, 0);
+}
+
+static Eterm *
+sweep_heaps(Eterm *n_hp, Eterm *n_htop, char* old_heap, Uint old_heap_size)
+{
+    return sweep(n_hp, n_htop,
+		 ErtsSweepHeaps,
+		 old_heap, old_heap_size,
+		 NULL, 0);
+}
+
+static Eterm *
+sweep_literal_area(Eterm *n_hp, Eterm *n_htop,
+		   char* old_heap, Uint old_heap_size,
+		   char* src, Uint src_size)
+{
+    return sweep(n_hp, n_htop,
+		 ErtsSweepLiteralArea,
+		 old_heap, old_heap_size,
+		 src, src_size);
 }
 
 static Eterm*
-sweep_one_heap(Eterm* heap_ptr, Eterm* heap_end, Eterm* htop, char* src, Uint src_size)
+sweep_literals_to_old_heap(Eterm* heap_ptr, Eterm* heap_end, Eterm* htop,
+			   char* src, Uint src_size)
 {
     while (heap_ptr < heap_end) {
 	Eterm* ptr;
@@ -1864,7 +1916,7 @@ sweep_one_heap(Eterm* heap_ptr, Eterm* heap_end, Eterm* htop, char* src, Uint sr
 	    if (IS_MOVED_BOXED(val)) {
 		ASSERT(is_boxed(val));
 		*heap_ptr++ = val;
-	    } else if (in_area(ptr, src, src_size)) {
+	    } else if (ErtsInArea(ptr, src, src_size)) {
 		MOVE_BOXED(ptr,val,htop,heap_ptr++);
 	    } else {
 		heap_ptr++;
@@ -1876,7 +1928,7 @@ sweep_one_heap(Eterm* heap_ptr, Eterm* heap_end, Eterm* htop, char* src, Uint sr
 	    val = *ptr;
 	    if (IS_MOVED_CONS(val)) {
 		*heap_ptr++ = ptr[1];
-	    } else if (in_area(ptr, src, src_size)) {
+	    } else if (ErtsInArea(ptr, src, src_size)) {
 		MOVE_CONS(ptr,val,htop,heap_ptr++);
 	    } else {
 		heap_ptr++;
@@ -1897,7 +1949,7 @@ sweep_one_heap(Eterm* heap_ptr, Eterm* heap_end, Eterm* htop, char* src, Uint sr
 		    if (IS_MOVED_BOXED(val)) {
 			*origptr = val;
 			mb->base = binary_bytes(*origptr);
-		    } else if (in_area(ptr, src, src_size)) {
+		    } else if (ErtsInArea(ptr, src, src_size)) {
 			MOVE_BOXED(ptr,val,htop,origptr);
 			mb->base = binary_bytes(*origptr);
 		    }
@@ -1948,43 +2000,21 @@ move_one_area(Eterm* n_htop, char* src, Uint src_size)
  */
 
 static Eterm*
-collect_heap_frags(Process* p, Eterm* n_hstart, Eterm* n_htop,
-		   Eterm* objv, int nobj)
+collect_live_heap_frags(Process* p, ErlHeapFragment *live_hf_end,
+			Eterm* n_hstart, Eterm* n_htop,
+			Eterm* objv, int nobj)
 {
     ErlHeapFragment* qb;
     char* frag_begin;
     Uint frag_size;
 
     /*
-     * We don't allow references to a heap fragments from the stack, heap,
-     * or process dictionary.
-     */
-#ifdef HARDDEBUG
-    disallow_heap_frag_ref(p, n_htop, p->stop, STACK_START(p) - p->stop);
-    if (p->dictionary != NULL) {
-	disallow_heap_frag_ref(p, n_htop, p->dictionary->data, p->dictionary->used);
-    }
-    /* OTP-18: Actually we do allow references from heap to heap fragments now.
-       This can happen when doing "binary_to_term" with a "fat" map contained
-       in another term. A "fat" map is a hashmap with higher heap demand than
-       first estimated by "binary_to_term" causing the factory to allocate
-       additional heap (fragments) for the hashmap tree nodes.
-       Run map_SUITE:t_gc_rare_map_overflow to provoke this.
-
-       Inverted references like this does not matter however. The copy done
-       below by move_one_area() with move markers in the fragments and the
-       sweeping done later by the GC should make everything ok in the end.
-    */
-    /***disallow_heap_frag_ref_in_heap(p);***/
-#endif
-
-    /*
      * Move the heap fragments to the new heap. Note that no GC is done on
      * the heap fragments. Any garbage will thus be moved as well and survive
      * until next GC.  
      */ 
     qb = MBUF(p);
-    while (qb != NULL) {
+    while (qb != live_hf_end) {
         ASSERT(!qb->off_heap.first);  /* process fragments use the MSO(p) list */
 	frag_size = qb->used_size * sizeof(Eterm);
 	if (frag_size != 0) {
@@ -1996,12 +2026,177 @@ collect_heap_frags(Process* p, Eterm* n_hstart, Eterm* n_htop,
     return n_htop;
 }
 
+static ERTS_INLINE void
+copy_one_frag(Eterm** hpp, ErlOffHeap* off_heap,
+	      ErlHeapFragment *bp, Eterm *refs, int nrefs)
+{
+    Uint sz;
+    int i;
+    Sint offs;
+    struct erl_off_heap_header* oh;
+    Eterm *fhp, *hp;
+
+    OH_OVERHEAD(off_heap, bp->off_heap.overhead);
+    sz = bp->used_size;
+
+    fhp = bp->mem;
+    hp = *hpp;
+    offs = hp - fhp;
+
+    oh = NULL;
+    while (sz--) {
+	Uint cpy_sz;
+	Eterm val = *fhp++;
+
+	switch (primary_tag(val)) {
+	case TAG_PRIMARY_IMMED1:
+	    *hp++ = val;
+	    break;
+	case TAG_PRIMARY_LIST:
+	case TAG_PRIMARY_BOXED:
+	    *hp++ = offset_ptr(val, offs);
+	    break;
+	case TAG_PRIMARY_HEADER:
+	    *hp++ = val;
+	    switch (val & _HEADER_SUBTAG_MASK) {
+	    case ARITYVAL_SUBTAG:
+		break;
+	    case REFC_BINARY_SUBTAG:
+	    case FUN_SUBTAG:
+	    case EXTERNAL_PID_SUBTAG:
+	    case EXTERNAL_PORT_SUBTAG:
+	    case EXTERNAL_REF_SUBTAG:
+		oh = (struct erl_off_heap_header*) (hp-1);
+		cpy_sz = thing_arityval(val);
+		goto cpy_words;
+	    default:
+		cpy_sz = header_arity(val);
+
+	    cpy_words:
+		ASSERT(sz >= cpy_sz);
+		sz -= cpy_sz;
+		while (cpy_sz >= 8) {
+		    cpy_sz -= 8;
+		    *hp++ = *fhp++;
+		    *hp++ = *fhp++;
+		    *hp++ = *fhp++;
+		    *hp++ = *fhp++;
+		    *hp++ = *fhp++;
+		    *hp++ = *fhp++;
+		    *hp++ = *fhp++;
+		    *hp++ = *fhp++;
+		}
+		switch (cpy_sz) {
+		case 7: *hp++ = *fhp++;
+		case 6: *hp++ = *fhp++;
+		case 5: *hp++ = *fhp++;
+		case 4: *hp++ = *fhp++;
+		case 3: *hp++ = *fhp++;
+		case 2: *hp++ = *fhp++;
+		case 1: *hp++ = *fhp++;
+		default: break;
+		}
+		if (oh) {
+		    /* Add to offheap list */
+		    oh->next = off_heap->first;
+		    off_heap->first = oh;
+		    ASSERT(*hpp <= (Eterm*)oh);
+		    ASSERT(hp > (Eterm*)oh);
+		    oh = NULL;
+		}
+		break;
+	    }
+	    break;
+	}
+    }
+
+    ASSERT(bp->used_size == hp - *hpp);
+    *hpp = hp;
+
+    for (i = 0; i < nrefs; i++) {
+	if (is_not_immed(refs[i]))
+	    refs[i] = offset_ptr(refs[i], offs);
+    }
+    bp->off_heap.first = NULL;
+}
+
+static void
+move_msgq_to_heap(Process *p)
+{
+    ErtsMessage **mpp = &p->msg.first;
+
+    while (*mpp) {
+	ErtsMessage *mp = *mpp;
+
+	if (mp->data.attached) {
+	    ErlHeapFragment *bp;
+	    ErtsHeapFactory factory;
+
+	    erts_factory_proc_prealloc_init(&factory, p,
+					    erts_msg_attached_data_size(mp));
+
+	    if (is_non_value(ERL_MESSAGE_TERM(mp))) {
+		if (mp->data.dist_ext) {
+		    ASSERT(mp->data.dist_ext->heap_size >= 0);
+		    if (is_not_nil(ERL_MESSAGE_TOKEN(mp))) {
+			bp = erts_dist_ext_trailer(mp->data.dist_ext);
+			ERL_MESSAGE_TOKEN(mp) = copy_struct(ERL_MESSAGE_TOKEN(mp),
+							    bp->used_size,
+							    &factory.hp,
+							    factory.off_heap);
+			erts_cleanup_offheap(&bp->off_heap);
+		    }
+		    ERL_MESSAGE_TERM(mp) = erts_decode_dist_ext(&factory,
+								mp->data.dist_ext);
+		    erts_free_dist_ext_copy(mp->data.dist_ext);
+		    mp->data.dist_ext = NULL;
+		}
+	    }
+	    else {
+
+		if (mp->data.attached == ERTS_MSG_COMBINED_HFRAG)
+		    bp = &mp->hfrag;
+		else
+		    bp = mp->data.heap_frag;
+
+		if (bp->next)
+		    erts_move_multi_frags(&factory.hp, factory.off_heap, bp,
+					  mp->m, ERL_MESSAGE_REF_ARRAY_SZ, 0);
+		else
+		    copy_one_frag(&factory.hp, factory.off_heap, bp,
+				  mp->m, ERL_MESSAGE_REF_ARRAY_SZ);
+
+		if (mp->data.attached != ERTS_MSG_COMBINED_HFRAG) {
+		    mp->data.heap_frag = NULL;
+		    free_message_buffer(bp);
+		}
+		else {
+		    ErtsMessage *tmp = erts_alloc_message(0, NULL);
+		    sys_memcpy((void *) tmp->m, (void *) mp->m,
+			       sizeof(Eterm)*ERL_MESSAGE_REF_ARRAY_SZ); 
+		    tmp->next = mp->next;
+		    if (p->msg.save == &mp->next)
+			p->msg.save = &tmp->next;
+		    if (p->msg.last == &mp->next)
+			p->msg.last = &tmp->next;
+		    *mpp = tmp;
+		    mp->next = NULL;
+		    erts_cleanup_messages(mp);
+		    mp = tmp;
+		}
+	    }
+
+	    erts_factory_close(&factory);
+	}
+
+	mpp = &(*mpp)->next;
+    }
+}
+
 static Uint
 setup_rootset(Process *p, Eterm *objv, int nobj, Rootset *rootset)
 {
-    Uint avail;
     Roots* roots;
-    ErlMessage* mp;
     Uint n;
 
     n = 0;
@@ -2013,8 +2208,8 @@ setup_rootset(Process *p, Eterm *objv, int nobj, Rootset *rootset)
     ++n;
 
     if (p->dictionary != NULL) {
-        roots[n].v = p->dictionary->data;
-        roots[n].sz = p->dictionary->used;
+        roots[n].v = ERTS_PD_START(p->dictionary);
+        roots[n].sz = ERTS_PD_SIZE(p->dictionary);
         ++n;
     }
     if (nobj > 0) {
@@ -2024,7 +2219,7 @@ setup_rootset(Process *p, Eterm *objv, int nobj, Rootset *rootset)
     }
 
     ASSERT((is_nil(p->seq_trace_token) ||
-	    is_tuple(follow_moved(p->seq_trace_token)) ||
+	    is_tuple(follow_moved(p->seq_trace_token, (Eterm) 0)) ||
 	    is_atom(p->seq_trace_token)));
     if (is_not_immed(p->seq_trace_token)) {
 	roots[n].v = &p->seq_trace_token;
@@ -2042,7 +2237,7 @@ setup_rootset(Process *p, Eterm *objv, int nobj, Rootset *rootset)
 	   is_internal_pid(ERTS_TRACER_PROC(p)) ||
 	   is_internal_port(ERTS_TRACER_PROC(p)));
 
-    ASSERT(is_pid(follow_moved(p->group_leader)));
+    ASSERT(is_pid(follow_moved(p->group_leader, (Eterm) 0)));
     if (is_not_immed(p->group_leader)) {
 	roots[n].v  = &p->group_leader;
 	roots[n].sz = 1;
@@ -2079,31 +2274,47 @@ setup_rootset(Process *p, Eterm *objv, int nobj, Rootset *rootset)
 
     ASSERT(n <= rootset->size);
 
-    mp = p->msg.first;
-    avail = rootset->size - n;
-    while (mp != NULL) {
-	if (avail == 0) {
-	    Uint new_size = 2*rootset->size;
-	    if (roots == rootset->def) {
-		roots = erts_alloc(ERTS_ALC_T_ROOTSET,
-				   new_size*sizeof(Roots));
-		sys_memcpy(roots, rootset->def, sizeof(rootset->def));
-	    } else {
-		roots = erts_realloc(ERTS_ALC_T_ROOTSET,
-				     (void *) roots,
-				     new_size*sizeof(Roots));
-	    }
+    switch (p->flags & (F_OFF_HEAP_MSGQ|F_OFF_HEAP_MSGQ_CHNG)) {
+    case F_OFF_HEAP_MSGQ|F_OFF_HEAP_MSGQ_CHNG:
+	(void) erts_move_messages_off_heap(p);
+    case F_OFF_HEAP_MSGQ:
+	break;
+    case F_OFF_HEAP_MSGQ_CHNG:
+    case 0: {
+	/*
+	 * We do not have off heap message queue enabled, i.e. we
+	 * need to add message queue to rootset...
+	 */
+	ErtsMessage *mp;
+
+	/* Ensure large enough rootset... */
+	if (n + p->msg.len > rootset->size) {
+	    Uint new_size = n + p->msg.len;
+	    ERTS_GC_ASSERT(roots == rootset->def);
+	    roots = erts_alloc(ERTS_ALC_T_ROOTSET,
+			       new_size*sizeof(Roots));
+	    sys_memcpy(roots, rootset->def, n*sizeof(Roots));
 	    rootset->size = new_size;
-	    avail = new_size - n;
 	}
-	if (mp->data.attached == NULL) {
-	    roots[n].v = mp->m;
-	    roots[n].sz = 2;
-	    n++;
-	    avail--;
+
+	for (mp = p->msg.first; mp; mp = mp->next) {
+
+	    if (!mp->data.attached) {
+		/*
+		 * Message may refer data on heap;
+		 * add it to rootset...
+		 */
+		roots[n].v = mp->m;
+		roots[n].sz = ERL_MESSAGE_REF_ARRAY_SZ;
+		n++;
+	    }
 	}
-        mp = mp->next;
+	break;
     }
+    }
+
+    ASSERT(rootset->size >= n);
+
     rootset->roots = roots;
     rootset->num_roots = n;
     return n;
@@ -2343,11 +2554,11 @@ sweep_off_heap(Process *p, int fullsweep)
      */
     while (ptr) {
 	if (IS_MOVED_BOXED(ptr->thing_word)) {
-	    ASSERT(!in_area(ptr, oheap, oheap_sz));
+	    ASSERT(!ErtsInArea(ptr, oheap, oheap_sz));
 	    *prev = ptr = (struct erl_off_heap_header*) boxed_val(ptr->thing_word);
 	    ASSERT(!IS_MOVED_BOXED(ptr->thing_word));
 	    if (ptr->thing_word == HEADER_PROC_BIN) {
-		int to_new_heap = !in_area(ptr, oheap, oheap_sz);
+		int to_new_heap = !ErtsInArea(ptr, oheap, oheap_sz);
 		ASSERT(to_new_heap == !seen_mature || (!to_new_heap && (seen_mature=1)));
 		if (to_new_heap) {
 		    bin_vheap += ptr->size / sizeof(Eterm);
@@ -2361,7 +2572,7 @@ sweep_off_heap(Process *p, int fullsweep)
 		ptr = ptr->next;
 	    }
 	}
-	else if (!in_area(ptr, oheap, oheap_sz)) {
+	else if (!ErtsInArea(ptr, oheap, oheap_sz)) {
 	    /* garbage */
 	    switch (thing_subtag(ptr->thing_word)) {
 	    case REFC_BINARY_SUBTAG:
@@ -2393,7 +2604,7 @@ sweep_off_heap(Process *p, int fullsweep)
      * generational collection - keep objects in list.
      */
     while (ptr) {
-	ASSERT(in_area(ptr, oheap, oheap_sz));
+	ASSERT(ErtsInArea(ptr, oheap, oheap_sz));
 	ASSERT(!IS_MOVED_BOXED(ptr->thing_word));       
 	if (ptr->thing_word == HEADER_PROC_BIN) {
 	    BIN_OLD_VHEAP(p) += ptr->size / sizeof(Eterm); /* for binary gc (words)*/
@@ -2412,7 +2623,6 @@ sweep_off_heap(Process *p, int fullsweep)
     }
     BIN_VHEAP_SZ(p)     = next_vheap_size(p, bin_vheap, BIN_VHEAP_SZ(p));
     MSO(p).overhead     = bin_vheap;
-    BIN_VHEAP_MATURE(p) = bin_vheap;
 
     /*
      * If we got any shrink candidates, check them out.
@@ -2483,7 +2693,7 @@ offset_heap(Eterm* hp, Uint sz, Sint offs, char* area, Uint area_size)
 	switch (primary_tag(val)) {
 	  case TAG_PRIMARY_LIST:
 	  case TAG_PRIMARY_BOXED:
-	      if (in_area(ptr_val(val), area, area_size)) {
+	      if (ErtsInArea(ptr_val(val), area, area_size)) {
 		  *hp = offset_ptr(val, offs);
 	      }
 	      hp++;
@@ -2505,7 +2715,7 @@ offset_heap(Eterm* hp, Uint sz, Sint offs, char* area, Uint area_size)
 		  {
 		      struct erl_off_heap_header* oh = (struct erl_off_heap_header*) hp;
 
-		      if (in_area(oh->next, area, area_size)) {
+		      if (ErtsInArea(oh->next, area, area_size)) {
 			  Eterm** uptr = (Eterm **) (void *) &oh->next;
 			  *uptr += offs; /* Patch the mso chain */
 		      }
@@ -2515,7 +2725,7 @@ offset_heap(Eterm* hp, Uint sz, Sint offs, char* area, Uint area_size)
 		{	
 		  ErlBinMatchState *ms = (ErlBinMatchState*) hp;
 		  ErlBinMatchBuffer *mb = &(ms->mb);
-		  if (in_area(ptr_val(mb->orig), area, area_size)) {
+		  if (ErtsInArea(ptr_val(mb->orig), area, area_size)) {
 		      mb->orig = offset_ptr(mb->orig, offs);
 		      mb->base = binary_bytes(mb->orig);
 		  }
@@ -2545,7 +2755,7 @@ offset_heap_ptr(Eterm* hp, Uint sz, Sint offs, char* area, Uint area_size)
 	switch (primary_tag(val)) {
 	case TAG_PRIMARY_LIST:
 	case TAG_PRIMARY_BOXED:
-	    if (in_area(ptr_val(val), area, area_size)) {
+	    if (ErtsInArea(ptr_val(val), area, area_size)) {
 		*hp = offset_ptr(val, offs);
 	    }
 	    hp++;
@@ -2560,7 +2770,7 @@ offset_heap_ptr(Eterm* hp, Uint sz, Sint offs, char* area, Uint area_size)
 static void
 offset_off_heap(Process* p, Sint offs, char* area, Uint area_size)
 {
-    if (MSO(p).first && in_area((Eterm *)MSO(p).first, area, area_size)) {
+    if (MSO(p).first && ErtsInArea((Eterm *)MSO(p).first, area, area_size)) {
         Eterm** uptr = (Eterm**) (void *) &MSO(p).first;
         *uptr += offs;
     }
@@ -2572,35 +2782,39 @@ offset_off_heap(Process* p, Sint offs, char* area, Uint area_size)
 static void
 offset_mqueue(Process *p, Sint offs, char* area, Uint area_size)
 {
-    ErlMessage* mp = p->msg.first;
-
-    while (mp != NULL) {
-        Eterm mesg = ERL_MESSAGE_TERM(mp);
-	if (is_value(mesg)) {
-	    switch (primary_tag(mesg)) {
-	    case TAG_PRIMARY_LIST:
-	    case TAG_PRIMARY_BOXED:
-		if (in_area(ptr_val(mesg), area, area_size)) {
-		    ERL_MESSAGE_TERM(mp) = offset_ptr(mesg, offs);
+    ErtsMessage* mp = p->msg.first;
+
+    if ((p->flags & (F_OFF_HEAP_MSGQ|F_OFF_HEAP_MSGQ_CHNG)) != F_OFF_HEAP_MSGQ) {
+
+	while (mp != NULL) {
+	    Eterm mesg = ERL_MESSAGE_TERM(mp);
+	    if (is_value(mesg)) {
+		switch (primary_tag(mesg)) {
+		case TAG_PRIMARY_LIST:
+		case TAG_PRIMARY_BOXED:
+		    if (ErtsInArea(ptr_val(mesg), area, area_size)) {
+			ERL_MESSAGE_TERM(mp) = offset_ptr(mesg, offs);
+		    }
+		    break;
 		}
-		break;
 	    }
-	}
-	mesg = ERL_MESSAGE_TOKEN(mp);
-	if (is_boxed(mesg) && in_area(ptr_val(mesg), area, area_size)) {
-	    ERL_MESSAGE_TOKEN(mp) = offset_ptr(mesg, offs);
-        }
+	    mesg = ERL_MESSAGE_TOKEN(mp);
+	    if (is_boxed(mesg) && ErtsInArea(ptr_val(mesg), area, area_size)) {
+		ERL_MESSAGE_TOKEN(mp) = offset_ptr(mesg, offs);
+	    }
 #ifdef USE_VM_PROBES
-	mesg = ERL_MESSAGE_DT_UTAG(mp);
-	if (is_boxed(mesg) && in_area(ptr_val(mesg), area, area_size)) {
-	    ERL_MESSAGE_DT_UTAG(mp) = offset_ptr(mesg, offs);
-        }
+	    mesg = ERL_MESSAGE_DT_UTAG(mp);
+	    if (is_boxed(mesg) && ErtsInArea(ptr_val(mesg), area, area_size)) {
+		ERL_MESSAGE_DT_UTAG(mp) = offset_ptr(mesg, offs);
+	    }
 #endif	
 	
-        ASSERT((is_nil(ERL_MESSAGE_TOKEN(mp)) ||
-		is_tuple(ERL_MESSAGE_TOKEN(mp)) ||
-		is_atom(ERL_MESSAGE_TOKEN(mp))));
-        mp = mp->next;
+	    ASSERT((is_nil(ERL_MESSAGE_TOKEN(mp)) ||
+		    is_tuple(ERL_MESSAGE_TOKEN(mp)) ||
+		    is_atom(ERL_MESSAGE_TOKEN(mp))));
+	    mp = mp->next;
+	}
+
     }
 }
 
@@ -2609,8 +2823,8 @@ offset_one_rootset(Process *p, Sint offs, char* area, Uint area_size,
 	       Eterm* objv, int nobj)
 {
     if (p->dictionary)  {
-	offset_heap(p->dictionary->data, 
-		    p->dictionary->used, 
+	offset_heap(ERTS_PD_START(p->dictionary),
+		    ERTS_PD_SIZE(p->dictionary),
 		    offs, area, area_size);
     }
 
@@ -2659,7 +2873,7 @@ reply_gc_info(void *vgcirp)
     Eterm **hpp;
     Uint sz, *szp;
     ErlOffHeap *ohp = NULL;
-    ErlHeapFragment *bp = NULL;
+    ErtsMessage *mp = NULL;
 
     ASSERT(esdp);
 
@@ -2685,12 +2899,13 @@ reply_gc_info(void *vgcirp)
 	if (hpp)
 	  break;
 	
-	hp = erts_alloc_message_heap(sz, &bp, &ohp, rp, &rp_locks);
+	mp = erts_alloc_message_heap(rp, &rp_locks, sz, &hp, &ohp);
+
 	szp = NULL;
 	hpp = &hp;
     }
 
-    erts_queue_message(rp, &rp_locks, bp, msg, NIL);
+    erts_queue_message(rp, &rp_locks, mp, msg, NIL);
 
     if (gcirp->req_sched == esdp->no)
 	rp_locks &= ~ERTS_PROC_LOCK_MAIN;
@@ -2737,41 +2952,105 @@ erts_gc_info_request(Process *c_p)
     return ref;
 }
 
+Eterm
+erts_process_gc_info(Process *p, Uint *sizep, Eterm **hpp)
+{
+    ERTS_DECL_AM(bin_vheap_size);
+    ERTS_DECL_AM(bin_vheap_block_size);
+    ERTS_DECL_AM(bin_old_vheap_size);
+    ERTS_DECL_AM(bin_old_vheap_block_size);
+    Eterm tags[] = {
+        /* If you increase the number of elements here, make sure to update
+           any call sites as they may have stack allocations that depend
+           on the number of elements here. */
+        am_old_heap_block_size,
+        am_heap_block_size,
+        am_mbuf_size,
+        am_recent_size,
+        am_stack_size,
+        am_old_heap_size,
+        am_heap_size,
+        AM_bin_vheap_size,
+        AM_bin_vheap_block_size,
+        AM_bin_old_vheap_size,
+        AM_bin_old_vheap_block_size
+    };
+    UWord values[] = {
+        OLD_HEAP(p) ? OLD_HEND(p) - OLD_HEAP(p) : 0,
+        HEAP_SIZE(p),
+        MBUF_SIZE(p),
+        HIGH_WATER(p) - HEAP_START(p),
+        STACK_START(p) - p->stop,
+        OLD_HEAP(p) ? OLD_HTOP(p) - OLD_HEAP(p) : 0,
+        HEAP_TOP(p) - HEAP_START(p),
+        MSO(p).overhead,
+        BIN_VHEAP_SZ(p),
+        BIN_OLD_VHEAP(p),
+        BIN_OLD_VHEAP_SZ(p)
+    };
+
+    Eterm res = THE_NON_VALUE;
+
+    ERTS_CT_ASSERT(sizeof(values)/sizeof(*values) == sizeof(tags)/sizeof(*tags));
+    ERTS_CT_ASSERT(sizeof(values)/sizeof(*values) == ERTS_PROCESS_GC_INFO_MAX_TERMS);
+
+    res = erts_bld_atom_uword_2tup_list(hpp,
+                                        sizep,
+                                        sizeof(values)/sizeof(*values),
+                                        tags,
+                                        values);
+
+    return res;
+}
+
 #if defined(DEBUG) || defined(ERTS_OFFHEAP_DEBUG)
 
 static int
 within2(Eterm *ptr, Process *p, Eterm *real_htop)
 {
-    ErlHeapFragment* bp = MBUF(p);
-    ErlMessage* mp = p->msg.first;
-    Eterm *htop = real_htop ? real_htop : HEAP_TOP(p);
+    ErlHeapFragment* bp;
+    ErtsMessage* mp;
+    Eterm *htop, *heap;
+
+    if (p->abandoned_heap)
+	ERTS_GET_ORIG_HEAP(p, heap, htop);
+    else {
+	heap = p->heap;
+	htop = real_htop ? real_htop : HEAP_TOP(p);
+    }
 
     if (OLD_HEAP(p) && (OLD_HEAP(p) <= ptr && ptr < OLD_HEND(p))) {
         return 1;
     }
-    if (HEAP_START(p) <= ptr && ptr < htop) {
+    if (heap <= ptr && ptr < htop) {
         return 1;
     }
-    while (bp != NULL) {
-        if (bp->mem <= ptr && ptr < bp->mem + bp->used_size) {
-            return 1;
-        }
-        bp = bp->next;
-    }
+
+    mp = p->msg_frag;
+    bp = p->mbuf;
+
+    if (bp)
+	goto search_heap_frags;
+
     while (mp) {
-	if (mp->data.attached) {
-	    ErlHeapFragment *hfp;
-	    if (is_value(ERL_MESSAGE_TERM(mp)))
-		hfp = mp->data.heap_frag;
-	    else if (is_not_nil(ERL_MESSAGE_TOKEN(mp)))
-		hfp = erts_dist_ext_trailer(mp->data.dist_ext);
-	    else
-		hfp = NULL;
-	    if (hfp && hfp->mem <= ptr && ptr < hfp->mem + hfp->used_size)
+
+	if (mp->data.attached == ERTS_MSG_COMBINED_HFRAG)
+	    bp = &mp->hfrag;
+	else
+	    bp = mp->data.heap_frag;
+
+	mp = mp->next;
+
+    search_heap_frags:
+
+	while (bp) {
+	    if (bp->mem <= ptr && ptr < bp->mem + bp->used_size) {
 		return 1;
+	    }
+	    bp = bp->next;
 	}
-        mp = mp->next;
     }
+
     return 0;
 }
 
@@ -2788,16 +3067,16 @@ within(Eterm *ptr, Process *p)
 #define ERTS_CHK_OFFHEAP_ASSERT(EXP)			\
 do {							\
     if (!(EXP))						\
-	erl_exit(ERTS_ABORT_EXIT,			\
+	erts_exit(ERTS_ABORT_EXIT,			\
 		 "%s:%d: Assertion failed: %s\n",	\
 		 __FILE__, __LINE__, #EXP);		\
 } while (0)
 
+
 #ifdef ERTS_OFFHEAP_DEBUG_CHK_CIRCULAR_LIST
 #  define ERTS_OFFHEAP_VISITED_BIT ((Eterm) 1 << 31)
 #endif
 
-
 void
 erts_check_off_heap2(Process *p, Eterm *htop)
 {
@@ -2826,7 +3105,7 @@ erts_check_off_heap2(Process *p, Eterm *htop)
 	}
 	ERTS_CHK_OFFHEAP_ASSERT(refc >= 1);
 #ifdef ERTS_OFFHEAP_DEBUG_CHK_CIRCULAR_LIST
-	ERTS_CHK_OFFHEAP_ASSERT(!(u.hdr->thing_word & ERTS_EXTERNAL_VISITED_BIT));
+	ERTS_CHK_OFFHEAP_ASSERT(!(u.hdr->thing_word & ERTS_OFFHEAP_VISITED_BIT));
 	u.hdr->thing_word |= ERTS_OFFHEAP_VISITED_BIT;
 #endif
 	if (old) {
@@ -2839,7 +3118,7 @@ erts_check_off_heap2(Process *p, Eterm *htop)
 	}
     }
 
-#ifdef ERTS_OFFHEAP_DEBUG_CHK_CIRCULAR_EXTERNAL_LIST
+#ifdef ERTS_OFFHEAP_DEBUG_CHK_CIRCULAR_LIST
     for (u.hdr = MSO(p).first; u.hdr; u.hdr = u.hdr->next)
 	u.hdr->thing_word &= ~ERTS_OFFHEAP_VISITED_BIT;
 #endif
diff --git a/erts/emulator/beam/erl_gc.h b/erts/emulator/beam/erl_gc.h
index ecd1bf4d22..2cedd9361f 100644
--- a/erts/emulator/beam/erl_gc.h
+++ b/erts/emulator/beam/erl_gc.h
@@ -69,17 +69,18 @@ do {                                                                    \
     while (nelts--) *HTOP++ = *PTR++;                                   \
 } while(0)
 
-#define in_area(ptr,start,nbytes) \
- ((UWord)((char*)(ptr) - (char*)(start)) < (nbytes))
-
 #if defined(DEBUG) || defined(ERTS_OFFHEAP_DEBUG)
 int within(Eterm *ptr, Process *p);
 #endif
 
-ERTS_GLB_INLINE Eterm follow_moved(Eterm term);
+#define ErtsInYoungGen(TPtr, Ptr, OldHeap, OldHeapSz)			\
+    (!erts_is_literal((TPtr), (Ptr))					\
+     & !ErtsInArea((Ptr), (OldHeap), (OldHeapSz)))
+
+ERTS_GLB_INLINE Eterm follow_moved(Eterm term, Eterm xptr_tag);
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
-ERTS_GLB_INLINE Eterm follow_moved(Eterm term)
+ERTS_GLB_INLINE Eterm follow_moved(Eterm term, Eterm xptr_tag)
 {
     Eterm* ptr;
     switch (primary_tag(term)) {
@@ -87,17 +88,18 @@ ERTS_GLB_INLINE Eterm follow_moved(Eterm term)
 	break;
     case TAG_PRIMARY_BOXED:
 	ptr = boxed_val(term);
-	if (IS_MOVED_BOXED(*ptr)) term = *ptr;
+	if (IS_MOVED_BOXED(*ptr)) term = (*ptr) | xptr_tag;
 	break;
     case TAG_PRIMARY_LIST:
 	ptr = list_val(term);
-	if (IS_MOVED_CONS(ptr[0])) term = ptr[1];
+	if (IS_MOVED_CONS(ptr[0])) term = (ptr[1]) | xptr_tag;
 	break;
     default:
 	ASSERT(!"strange tag in follow_moved");
     }
     return term;
 }
+
 #endif
 
 #endif /* ERL_GC_C__ || HIPE_GC_C__ */
@@ -106,6 +108,23 @@ ERTS_GLB_INLINE Eterm follow_moved(Eterm term)
  * Global exported
  */
 
+#define ERTS_IS_GC_DESIRED_INTERNAL(Proc, HTop, STop)			\
+    ((((STop) - (HTop) < (Proc)->mbuf_sz))				\
+     | ((Proc)->off_heap.overhead > (Proc)->bin_vheap_sz)		\
+     | !!((Proc)->flags & F_FORCE_GC))
+
+#define ERTS_IS_GC_DESIRED(Proc)					\
+    ERTS_IS_GC_DESIRED_INTERNAL((Proc), (Proc)->htop, (Proc)->stop)
+
+#define ERTS_FORCE_GC_INTERNAL(Proc, FCalls)				\
+    do {								\
+	(Proc)->flags |= F_FORCE_GC;					\
+	ERTS_VBUMP_ALL_REDS_INTERNAL((Proc), (FCalls));			\
+    } while (0)
+
+#define ERTS_FORCE_GC(Proc)						\
+    ERTS_FORCE_GC_INTERNAL((Proc), (Proc)->fcalls)
+
 extern Uint erts_test_long_gc_sleep;
 
 typedef struct {
@@ -113,10 +132,18 @@ typedef struct {
   Uint64 garbage_cols;
 } ErtsGCInfo;
 
+#define ERTS_PROCESS_GC_INFO_MAX_TERMS (11)  /* number of elements in process_gc_info*/
+#define ERTS_PROCESS_GC_INFO_MAX_SIZE                                   \
+    (ERTS_PROCESS_GC_INFO_MAX_TERMS * (2/*cons*/ + 3/*2-tuple*/ + BIG_UINT_HEAP_SIZE))
+Eterm erts_process_gc_info(struct process*, Uint *, Eterm **);
+
 void erts_gc_info(ErtsGCInfo *gcip);
 void erts_init_gc(void);
-int erts_garbage_collect(struct process*, int, Eterm*, int);
+int erts_garbage_collect_nobump(struct process*, int, Eterm*, int);
+void erts_garbage_collect(struct process*, int, Eterm*, int);
 void erts_garbage_collect_hibernate(struct process* p);
+Eterm erts_gc_after_bif_call_lhf(struct process* p, ErlHeapFragment *live_hf_end,
+				 Eterm result, Eterm* regs, Uint arity);
 Eterm erts_gc_after_bif_call(struct process* p, Eterm result, Eterm* regs, Uint arity);
 void erts_garbage_collect_literals(struct process* p, Eterm* literals,
 				   Uint lit_size,
diff --git a/erts/emulator/beam/erl_goodfit_alloc.c b/erts/emulator/beam/erl_goodfit_alloc.c
index f89f8723d9..9b4aad9d91 100644
--- a/erts/emulator/beam/erl_goodfit_alloc.c
+++ b/erts/emulator/beam/erl_goodfit_alloc.c
@@ -571,8 +571,8 @@ info_options(Allctr_t *allctr,
     if (hpp || szp) {
 	
 	if (!atoms_initialized)
-	    erl_exit(1, "%s:%d: Internal error: Atoms not initialized",
-		     __FILE__, __LINE__);;
+	    erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error: Atoms not initialized",
+		     __FILE__, __LINE__);
 
 	res = NIL;
 	add_2tup(hpp, szp, &res, am.as, am.gf);
diff --git a/erts/emulator/beam/erl_hl_timer.c b/erts/emulator/beam/erl_hl_timer.c
index fb6d249145..491d2f8c84 100644
--- a/erts/emulator/beam/erl_hl_timer.c
+++ b/erts/emulator/beam/erl_hl_timer.c
@@ -1245,7 +1245,9 @@ hlt_bif_timer_timeout(ErtsHLTimer *tmr, Uint32 roflgs)
 	 * the middle of tree destruction).
 	 */
 	if (!ERTS_PROC_IS_EXITING(proc)) {
-	    erts_queue_message(proc, &proc_locks, tmr->btm.bp,
+	    ErtsMessage *mp = erts_alloc_message(0, NULL);
+	    mp->data.heap_frag = tmr->btm.bp;
+	    erts_queue_message(proc, &proc_locks, mp,
 			       tmr->btm.message, NIL);
 	    erts_smp_proc_unlock(proc, ERTS_PROC_LOCKS_MSG_SEND);
 	    queued_message = 1;
@@ -1926,36 +1928,31 @@ access_sched_local_btm(Process *c_p, Eterm pid,
 
     if (proc) {
 	Uint hsz;
-	ErlOffHeap *ohp;
-	ErlHeapFragment* bp;
+	ErtsMessage *mp;
 	Eterm *hp, msg, ref, result;
+	ErlOffHeap *ohp;
+	Uint32 *refn;
 #ifdef ERTS_HLT_DEBUG
 	Eterm *hp_end;
 #endif
 
-	hsz = 3; /* 2-tuple */
-	if (!async)
-	    hsz += REF_THING_SIZE;
+	hsz = REF_THING_SIZE;
+	if (async) {
+	    refn = trefn; /* timer ref */
+	    hsz += 4; /* 3-tuple */
+	}
 	else {
-	    if (is_non_value(tref) || proc != c_p)
-		hsz += REF_THING_SIZE;
-	    hsz += 1; /* upgrade to 3-tuple */
+	    refn = rrefn; /* request ref */
+	    hsz += 3; /* 2-tuple */
 	}
+
+	ERTS_HLT_ASSERT(refn);
+
 	if (time_left > (Sint64) MAX_SMALL)
 	    hsz += ERTS_SINT64_HEAP_SIZE(time_left);
 
-	if (proc == c_p) {
-	    bp = NULL;
-	    ohp = NULL;
-	    hp = HAlloc(c_p, hsz);
-	}
-	else {
-	    hp = erts_alloc_message_heap(hsz,
-					 &bp,
-					 &ohp,
-					 proc,
-					 &proc_locks);
-	}
+	mp = erts_alloc_message_heap(proc, &proc_locks,
+				     hsz, &hp, &ohp);
 
 #ifdef ERTS_HLT_DEBUG
 	hp_end = hp + hsz;
@@ -1968,35 +1965,22 @@ access_sched_local_btm(Process *c_p, Eterm pid,
 	else
 	    result = erts_sint64_to_big(time_left, &hp);
 
-	if (!async) {
-	    write_ref_thing(hp,
-			    rrefn[0],
-			    rrefn[1],
-			    rrefn[2]);
-	    ref = make_internal_ref(hp);
-	    hp += REF_THING_SIZE;
-	    msg = TUPLE2(hp, ref, result);
+	write_ref_thing(hp,
+			refn[0],
+			refn[1],
+			refn[2]);
+	ref = make_internal_ref(hp);
+	hp += REF_THING_SIZE;
 
-	    ERTS_HLT_ASSERT(hp + 3 == hp_end);
-	}
-	else {
-	    Eterm tag = cancel ? am_cancel_timer : am_read_timer;
-	    if (is_value(tref) && proc == c_p)
-		ref = tref;
-	    else {
-		write_ref_thing(hp,
-				trefn[0],
-				trefn[1],
-				trefn[2]);
-		ref = make_internal_ref(hp);
-		hp += REF_THING_SIZE;
-	    }
-	    msg = TUPLE3(hp, tag, ref, result);
+	msg = (async
+	       ? TUPLE3(hp, (cancel
+			     ? am_cancel_timer
+			     : am_read_timer), ref, result)
+	       : TUPLE2(hp, ref, result));
 
-	    ERTS_HLT_ASSERT(hp + 4 == hp_end);
+	ERTS_HLT_ASSERT(hp + (async ? 4 : 3) == hp_end);
 
-	}
-	erts_queue_message(proc, &proc_locks, bp, msg, NIL);
+	erts_queue_message(proc, &proc_locks, mp, msg, NIL);
 
 	if (c_p)
 	    proc_locks &= ~ERTS_PROC_LOCK_MAIN;
@@ -2034,7 +2018,7 @@ bif_timer_access_request(void *vreq)
 static int
 try_access_sched_remote_btm(ErtsSchedulerData *esdp,
 			    Process *c_p, Uint32 sid,
-			    Eterm tref, Uint32 *trefn,
+			    Uint32 *trefn,
 			    int async, int cancel,
 			    int info, Eterm *resp)
 {
@@ -2093,21 +2077,31 @@ try_access_sched_remote_btm(ErtsSchedulerData *esdp,
 	}
     }
     else {
-	Eterm tag, res, msg;
+	ErtsMessage *mp;
+	Eterm tag, res, msg, tref;
 	Uint hsz;
 	Eterm *hp;
 	ErtsProcLocks proc_locks = ERTS_PROC_LOCK_MAIN;
+	ErlOffHeap *ohp;
 
-	hsz = 4;
+	hsz = 4 + REF_THING_SIZE;
 	if (time_left > (Sint64) MAX_SMALL)
 	    hsz += ERTS_SINT64_HEAP_SIZE(time_left);
 
-	hp = HAlloc(c_p, hsz);
+	mp = erts_alloc_message_heap(c_p, &proc_locks,
+				     hsz, &hp, &ohp);
 	if (cancel)
 	    tag = am_cancel_timer;
 	else
 	    tag = am_read_timer;
 
+	write_ref_thing(hp,
+			trefn[0],
+			trefn[1],
+			trefn[2]);
+	tref = make_internal_ref(hp);
+	hp += REF_THING_SIZE;
+
 	if (time_left < 0)
 	    res = am_false;
 	else if (time_left <= (Sint64) MAX_SMALL)
@@ -2117,7 +2111,7 @@ try_access_sched_remote_btm(ErtsSchedulerData *esdp,
 
 	msg = TUPLE3(hp, tag, tref, res);
 
-	erts_queue_message(c_p, &proc_locks, NULL, msg, NIL);
+	erts_queue_message(c_p, &proc_locks, mp, msg, NIL);
 
 	proc_locks &= ~ERTS_PROC_LOCK_MAIN;
 	if (proc_locks)
@@ -2158,8 +2152,8 @@ access_bif_timer(Process *c_p, Eterm tref, int cancel, int async, int info)
 				     info);
 	ERTS_BIF_PREP_RET(ret, res);
     }
-    else if (try_access_sched_remote_btm(esdp, c_p, sid,
-					 tref, trefn,
+    else if (try_access_sched_remote_btm(esdp, c_p,
+					 sid, trefn,
 					 async, cancel,
 					 info, &res)) {
 	ERTS_BIF_PREP_RET(ret, res);
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index d9c3b0dcf4..0c81a95705 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -91,11 +91,6 @@ const int etp_arch_bits = 32;
 #else
 # error "Not 64-bit, nor 32-bit arch"
 #endif
-#if HALFWORD_HEAP
-const int etp_halfword = 1;
-#else
-const int etp_halfword = 0;
-#endif
 #ifdef HIPE
 const int etp_hipe = 1;
 #else
@@ -157,7 +152,7 @@ volatile int erts_writing_erl_crash_dump = 0;
 int erts_initialized = 0;
 
 #if defined(USE_THREADS) && !defined(ERTS_SMP)
-static erts_tid_t main_thread;
+erts_tid_t erts_main_thread;
 #endif
 
 int erts_use_sender_punish;
@@ -197,7 +192,7 @@ Uint32 verbose;             /* See erl_debug.h for information about verbose */
 
 int erts_atom_table_size = ATOM_LIMIT;	/* Maximum number of atoms */
 
-int erts_pd_initial_size = 10;
+int erts_pd_initial_size = 8;  /* must be power of 2 */
 
 int erts_modified_timing_level;
 
@@ -269,7 +264,7 @@ this_rel_num(void)
 	    i++;
 	this_rel = atoi(&this_rel_str[i]); 
 	if (this_rel < 1)
-	    erl_exit(-1, "Unexpected ERLANG_OTP_RELEASE format\n");
+	    erts_exit(1, "Unexpected ERLANG_OTP_RELEASE format\n");
     }
     return this_rel;
 }
@@ -393,11 +388,13 @@ erl_init(int ncpu,
     erts_mseg_late_init(); /* Must be after timer (erts_init_time()) and thread
 			      initializations */
 #endif
+    erl_sys_late_init();
 #ifdef HIPE
     hipe_mode_switch_init(); /* Must be after init_load/beam_catches/init */
 #endif
     packet_parser_init();
     erl_nif_init();
+    erts_msacc_init();
 }
 
 static Eterm
@@ -415,7 +412,7 @@ erl_first_process_otp(char* modname, void* code, unsigned size, int argc, char**
     start_mod = erts_atom_put((byte *) modname, sys_strlen(modname), ERTS_ATOM_ENC_LATIN1, 1);
     if (erts_find_function(start_mod, am_start, 2,
 			   erts_active_code_ix()) == NULL) {
-	erl_exit(5, "No function %s:start/2\n", modname);
+	erts_exit(ERTS_ERROR_EXIT, "No function %s:start/2\n", modname);
     }
 
     /*
@@ -436,13 +433,36 @@ erl_first_process_otp(char* modname, void* code, unsigned size, int argc, char**
     hp += 2;
     args = CONS(hp, env, args);
 
-    so.flags = SPO_SYSTEM_PROC;
+    so.flags = erts_default_spo_flags|SPO_SYSTEM_PROC;
     res = erl_create_process(&parent, start_mod, am_start, args, &so);
     erts_smp_proc_unlock(&parent, ERTS_PROC_LOCK_MAIN);
     erts_cleanup_empty_process(&parent);
     return res;
 }
 
+static Eterm
+erl_system_process_otp(Eterm parent_pid, char* modname)
+{
+    Eterm start_mod;
+    Process* parent;
+    ErlSpawnOpts so;
+    Eterm res;
+
+    start_mod = erts_atom_put((byte *) modname, sys_strlen(modname), ERTS_ATOM_ENC_LATIN1, 1);
+    if (erts_find_function(start_mod, am_start, 0,
+			   erts_active_code_ix()) == NULL) {
+	erts_exit(ERTS_ERROR_EXIT, "No function %s:start/0\n", modname);
+    }
+
+    parent = erts_pid2proc(NULL, 0, parent_pid, ERTS_PROC_LOCK_MAIN);
+
+    so.flags = erts_default_spo_flags|SPO_SYSTEM_PROC;
+    res = erl_create_process(parent, start_mod, am_start, NIL, &so);
+    erts_smp_proc_unlock(parent, ERTS_PROC_LOCK_MAIN);
+    return res;
+}
+
+
 Eterm
 erts_preloaded(Process* p)
 {
@@ -512,12 +532,12 @@ load_preloaded(void)
 	length = preload_p[i].size;
 	module_name = erts_atom_put((byte *) name, sys_strlen(name), ERTS_ATOM_ENC_LATIN1, 1);
 	if ((code = sys_preload_begin(&preload_p[i])) == 0)
-	    erl_exit(1, "Failed to find preloaded code for module %s\n", 
+	    erts_exit(ERTS_ERROR_EXIT, "Failed to find preloaded code for module %s\n",
 		     name);
 	res = erts_preload_module(NULL, 0, NIL, &module_name, code, length);
 	sys_preload_end(&preload_p[i]);
 	if (res != NIL)
-	    erl_exit(1,"Failed loading preloaded module %s (%T)\n",
+	    erts_exit(ERTS_ERROR_EXIT,"Failed loading preloaded module %s (%T)\n",
 		     name, res);
 	i++;
     }
@@ -635,6 +655,8 @@ void erts_usage(void)
 
     erts_fprintf(stderr, "-W<i|w|e>      set error logger warnings mapping,\n");
     erts_fprintf(stderr, "               see error_logger documentation for details\n");
+    erts_fprintf(stderr, "-xmqd  val     set default message queue data flag for processes,\n");
+    erts_fprintf(stderr, "               valid values are: off_heap | on_heap | mixed\n");
     erts_fprintf(stderr, "-zdbbl size    set the distribution buffer busy limit in kilobytes\n");
     erts_fprintf(stderr, "               valid range is [1-%d]\n", INT_MAX/1024);
     erts_fprintf(stderr, "-zdntgc time   set delayed node table gc in seconds\n");
@@ -648,7 +670,7 @@ void erts_usage(void)
     erts_fprintf(stderr, "Note that if the emulator is started with erlexec (typically\n");
     erts_fprintf(stderr, "from the erl script), these flags should be specified with +.\n");
     erts_fprintf(stderr, "\n\n");
-    erl_exit(-1, "");
+    erts_exit(1, "");
 }
 
 #ifdef USE_THREADS
@@ -723,6 +745,10 @@ early_init(int *argc, char **argv) /*
     char envbuf[21]; /* enough for any 64-bit integer */
     size_t envbufsz;
 
+#if defined(USE_THREADS) && !defined(ERTS_SMP)
+    erts_main_thread = erts_thr_self();
+#endif
+
     erts_save_emu_args(*argc, argv);
 
     erts_sched_compact_load = 1;
@@ -776,9 +802,6 @@ early_init(int *argc, char **argv) /*
 			       (erts_aint32_t) ((Uint16) -1));
 
     erts_pre_init_process();
-#if defined(USE_THREADS) && !defined(ERTS_SMP)
-    main_thread = erts_thr_self();
-#endif
 
     /*
      * We need to know the number of schedulers to use before we
@@ -1172,6 +1195,7 @@ early_init(int *argc, char **argv) /*
 	erts_thr_late_init(&elid);
     }
 #endif
+    erts_msacc_early_init();
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_late_init();
@@ -1236,6 +1260,7 @@ erl_start(int argc, char **argv)
     ErtsTimeWarpMode time_warp_mode;
     int node_tab_delete_delay = ERTS_NODE_TAB_DELAY_GC_DEFAULT;
     ErtsDbSpinCount db_spin_count = ERTS_DB_SPNCNT_NORMAL;
+    Eterm otp_ring0_pid;
 
     set_default_time_adj(&time_correction,
 			 &time_warp_mode);
@@ -1405,6 +1430,7 @@ erl_start(int argc, char **argv)
 		    case 't': verbose |= DEBUG_THREADS; break;
 		    case 'p': verbose |= DEBUG_PROCESSES; break;
 		    case 'm': verbose |= DEBUG_MESSAGES; break;
+		    case 'c': verbose |= DEBUG_SHCOPY; break;
 		    default : erts_fprintf(stderr,"Unknown verbose option: %c\n",*ch);
 		    }
 		}
@@ -1417,6 +1443,7 @@ erl_start(int argc, char **argv)
 	    if (verbose & DEBUG_THREADS) erts_printf("THREADS ");
 	    if (verbose & DEBUG_PROCESSES) erts_printf("PROCESSES ");
 	    if (verbose & DEBUG_MESSAGES) erts_printf("MESSAGES ");
+	    if (verbose & DEBUG_SHCOPY) erts_printf("SHCOPY ");
             erts_printf("\n");
 #else
 	    erts_fprintf(stderr, "warning: -v (only in debug compiled code)\n");
@@ -1445,7 +1472,7 @@ erl_start(int argc, char **argv)
 		}
 		erts_fprintf(stderr, "(" EMULATOR ") emulator version "
 			   ERLANG_VERSION "\n");
-		erl_exit(0, "");
+		erts_exit(0, "");
 	    }
 	    break;
 
@@ -1479,7 +1506,7 @@ erl_start(int argc, char **argv)
 		VERBOSE(DEBUG_SYSTEM, ("using minimum heap size %d\n", H_MIN_SIZE));
 	    } else if (has_prefix("pds", sub_param)) {
 		arg = get_arg(sub_param+3, argv[i+1], &i);
-		if ((erts_pd_initial_size = atoi(arg)) <= 0) {
+		if (!erts_pd_set_initial_size(atoi(arg))) {
 		    erts_fprintf(stderr, "bad initial process dictionary size %s\n", arg);
 		    erts_usage();
 		}
@@ -2020,6 +2047,32 @@ erl_start(int argc, char **argv)
 	    }
 	    break;
 
+	case 'x': {
+	    char *sub_param = argv[i]+2;
+	    if (has_prefix("mqd", sub_param)) {
+		arg = get_arg(sub_param+3, argv[i+1], &i);
+		if (sys_strcmp(arg, "mixed") == 0)
+		    erts_default_spo_flags &= ~(SPO_ON_HEAP_MSGQ|SPO_OFF_HEAP_MSGQ);
+		else if (sys_strcmp(arg, "on_heap") == 0) {
+		    erts_default_spo_flags &= ~SPO_OFF_HEAP_MSGQ;
+		    erts_default_spo_flags |= SPO_ON_HEAP_MSGQ;
+		}
+		else if (sys_strcmp(arg, "off_heap") == 0) {
+		    erts_default_spo_flags &= ~SPO_ON_HEAP_MSGQ;
+		    erts_default_spo_flags |= SPO_OFF_HEAP_MSGQ;
+		}
+		else {
+		    erts_fprintf(stderr,
+				 "Invalid message_queue_data flag: %s\n", arg);
+		    erts_usage();
+		}
+	    } else {
+		erts_fprintf(stderr, "bad -x option %s\n", argv[i]);
+		erts_usage();
+	    }
+	    break;
+        }
+
 	case 'z': {
 	    char *sub_param = argv[i]+2;
 
@@ -2073,7 +2126,8 @@ erl_start(int argc, char **argv)
 				 "Invalid ets busy wait threshold: %s\n", arg);
 		    erts_usage();
 		}
-	    } else {
+	    }
+	    else {
 		erts_fprintf(stderr, "bad -z option %s\n", argv[i]);
 		erts_usage();
 	    }
@@ -2134,6 +2188,7 @@ erl_start(int argc, char **argv)
 	init_break_handler();
     if (replace_intr)
 	erts_replace_intr();
+    sys_init_suspend_handler();
 #endif
 
     boot_argc = argc - i;  /* Number of arguments to init */
@@ -2156,8 +2211,10 @@ erl_start(int argc, char **argv)
 
     erts_initialized = 1;
 
-    (void) erl_first_process_otp("otp_ring0", NULL, 0,
-				 boot_argc, boot_argv);
+    otp_ring0_pid = erl_first_process_otp("otp_ring0", NULL, 0,
+					  boot_argc, boot_argv);
+
+    (void) erl_system_process_otp(otp_ring0_pid, "erts_code_purger");
 
 #ifdef ERTS_SMP
     erts_start_schedulers();
@@ -2167,6 +2224,7 @@ erl_start(int argc, char **argv)
 #else
     {
 	ErtsSchedulerData *esdp = erts_get_scheduler_data();
+        erts_msacc_init_thread("scheduler", 1, 1);
 	erts_thr_set_main_status(1, 1);
 #if ERTS_USE_ASYNC_READY_Q
 	esdp->aux_work_data.async_ready.queue
@@ -2232,7 +2290,7 @@ system_cleanup(int flush_async)
     if (!flush_async
 	|| !erts_initialized
 #if defined(USE_THREADS) && !defined(ERTS_SMP)
-	|| !erts_equal_tids(main_thread, erts_thr_self())
+	|| !erts_equal_tids(erts_main_thread, erts_thr_self())
 #endif
 	)
 	return;
@@ -2247,23 +2305,17 @@ system_cleanup(int flush_async)
 }
 
 static __decl_noreturn void __noreturn
-erl_exit_vv(int n, int flush_async, char *fmt, va_list args1, va_list args2)
+erts_exit_vv(int n, int flush_async, char *fmt, va_list args1, va_list args2)
 {
-    unsigned int an;
-
     system_cleanup(flush_async);
 
     save_statistics();
-    if (n < 0)
-        an = -(unsigned int)n;
-    else
-        an = n;
 
     if (erts_mtrace_enabled)
-	erts_mtrace_exit((Uint32) an);
+	erts_mtrace_exit((Uint32) n);
 
     /* Produce an Erlang core dump if error */
-    if (((n > 0 && erts_no_crash_dump == 0) || n == ERTS_DUMP_EXIT)
+    if (((n == ERTS_ERROR_EXIT && erts_no_crash_dump == 0) || n == ERTS_DUMP_EXIT)
 	&& erts_initialized) {
 	erl_crash_dump_v((char*) NULL, 0, fmt, args1);
     }
@@ -2276,29 +2328,29 @@ erl_exit_vv(int n, int flush_async, char *fmt, va_list args1, va_list args2)
 	exit(0);
     else if (n == ERTS_DUMP_EXIT)
 	ERTS_EXIT_AFTER_DUMP(1);
-    else if (n > 0 || n == ERTS_ABORT_EXIT)
+    else if (n == ERTS_ERROR_EXIT || n == ERTS_ABORT_EXIT)
         abort();
-    exit(an);
+    exit(n);
 }
 
 /* Exit without flushing async threads */
-__decl_noreturn void __noreturn erl_exit(int n, char *fmt, ...)
+__decl_noreturn void __noreturn erts_exit(int n, char *fmt, ...)
 {
     va_list args1, args2;
     va_start(args1, fmt);
     va_start(args2, fmt);
-    erl_exit_vv(n, 0, fmt, args1, args2);
+    erts_exit_vv(n, 0, fmt, args1, args2);
     va_end(args2);
     va_end(args1);
 }
 
 /* Exit after flushing async threads */
-__decl_noreturn void __noreturn erl_exit_flush_async(int n, char *fmt, ...)
+__decl_noreturn void __noreturn erts_flush_async_exit(int n, char *fmt, ...)
 {
     va_list args1, args2;
     va_start(args1, fmt);
     va_start(args2, fmt);
-    erl_exit_vv(n, 1, fmt, args1, args2);
+    erts_exit_vv(n, 1, fmt, args1, args2);
     va_end(args2);
     va_end(args1);
 }
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c
index 3b3b247020..598bf84c0b 100644
--- a/erts/emulator/beam/erl_lock_check.c
+++ b/erts/emulator/beam/erl_lock_check.c
@@ -113,9 +113,6 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {	"environ",				NULL			},
 #endif
     {	"efile_drv",				"address"		},
-#if defined(ENABLE_CHILD_WAITER_THREAD) || defined(ERTS_SMP)
-    {	"child_status",				NULL			},
-#endif
     {	"drv_ev_state_grow",			NULL,   		},
     {	"drv_ev_state",				"address"		},
     {	"safe_hash",				"address"		},
@@ -140,6 +137,8 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {	"mmap_init_atoms",			NULL			},
     {	"drv_tsd",				NULL			},
     {	"async_enq_mtx",			NULL			},
+    {   "msacc_list_mutex",                     NULL                    },
+    {   "msacc_unmanaged_mutex",                NULL                    },
 #ifdef ERTS_SMP
     {	"atom_tab",				NULL			},
     {	"misc_op_list_pre_alloc_lock",		"address"		},
@@ -156,9 +155,6 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {	"instr",				NULL			},
     {	"alcu_allocator",			"index"			},
     {	"mseg",					NULL			},
-#if HALFWORD_HEAP
-    {	"pmmap",				NULL			},
-#endif
 #ifdef ERTS_SMP
     {	"port_task_pre_alloc_lock",		"address"		},
     {	"proclist_pre_alloc_lock",		"address"		},
diff --git a/erts/emulator/beam/erl_map.c b/erts/emulator/beam/erl_map.c
index ff2a355309..6b747256e1 100644
--- a/erts/emulator/beam/erl_map.c
+++ b/erts/emulator/beam/erl_map.c
@@ -172,26 +172,22 @@ BIF_RETTYPE maps_to_list_1(BIF_ALIST_1) {
  */
 
 const Eterm *
-#if HALFWORD_HEAP
-erts_maps_get_rel(Eterm key, Eterm map, Eterm *map_base)
-#else
 erts_maps_get(Eterm key, Eterm map)
-#endif
 {
     Uint32 hx;
-    if (is_flatmap_rel(map, map_base)) {
+    if (is_flatmap(map)) {
 	Eterm *ks, *vs;
 	flatmap_t *mp;
 	Uint n, i;
 
-	mp  = (flatmap_t *)flatmap_val_rel(map, map_base);
+	mp  = (flatmap_t *)flatmap_val(map);
 	n   = flatmap_get_size(mp);
 
 	if (n == 0) {
 	    return NULL;
 	}
 
-	ks  = (Eterm *)tuple_val_rel(mp->keys, map_base) + 1;
+	ks  = (Eterm *)tuple_val(mp->keys) + 1;
 	vs  = flatmap_get_values(mp);
 
 	if (is_immed(key)) {
@@ -200,19 +196,19 @@ erts_maps_get(Eterm key, Eterm map)
 		    return &vs[i];
 		}
 	    }
-	}
-
-	for (i = 0; i < n; i++) {
-	    if (eq_rel(ks[i], map_base, key, NULL)) {
-		return &vs[i];
-	    }
-	}
+	} else {
+            for (i = 0; i < n; i++) {
+                if (EQ(ks[i], key)) {
+                    return &vs[i];
+                }
+            }
+        }
 	return NULL;
     }
-    ASSERT(is_hashmap_rel(map, map_base));
+    ASSERT(is_hashmap(map));
     hx = hashmap_make_hash(key);
 
-    return erts_hashmap_get_rel(hx, key, map, map_base);
+    return erts_hashmap_get(hx, key, map);
 }
 
 BIF_RETTYPE maps_find_2(BIF_ALIST_2) {
@@ -1274,7 +1270,7 @@ recurse:
                 break;
             }
             default:
-                erl_exit(ERTS_ABORT_EXIT, "bad header %ld\r\n", hdrA);
+                erts_exit(ERTS_ABORT_EXIT, "bad header %ld\r\n", hdrA);
             }
         }
 
@@ -1301,7 +1297,7 @@ recurse:
                 break;
             }
             default:
-                erl_exit(ERTS_ABORT_EXIT, "bad header %ld\r\n", hdrB);
+                erts_exit(ERTS_ABORT_EXIT, "bad header %ld\r\n", hdrB);
             }
         }
     }
@@ -1391,7 +1387,7 @@ resume_from_trap:
             res = make_boxed(nhp);
             break;
         default:
-            erl_exit(ERTS_ABORT_EXIT, "strange mix %d\r\n", sp->mix);
+            erts_exit(ERTS_ABORT_EXIT, "strange mix %d\r\n", sp->mix);
         }
     }
 
@@ -1886,7 +1882,7 @@ void hashmap_iterator_init(ErtsWStack* s, Eterm node, int reverse) {
         sz = hashmap_bitcount(MAP_HEADER_VAL(hdr));
 	break;
     default:
-	erl_exit(ERTS_ABORT_EXIT, "bad header");
+	erts_exit(ERTS_ABORT_EXIT, "bad header");
     }
 
     WSTACK_PUSH3((*s), (UWord)THE_NON_VALUE,  /* end marker */
@@ -1923,7 +1919,7 @@ Eterm* hashmap_iterator_next(ErtsWStack* s) {
 		ASSERT(sz < 17);
 		break;
 	    default:
-		erl_exit(ERTS_ABORT_EXIT, "bad header");
+		erts_exit(ERTS_ABORT_EXIT, "bad header");
 	    }
 
 	    idx++;
@@ -1973,7 +1969,7 @@ Eterm* hashmap_iterator_prev(ErtsWStack* s) {
 		ASSERT(sz < 17);
 		break;
 	    default:
-		erl_exit(1, "bad header");
+		erts_exit(ERTS_ERROR_EXIT, "bad header");
 	    }
 
             if (idx > sz)
@@ -1998,11 +1994,7 @@ Eterm* hashmap_iterator_prev(ErtsWStack* s) {
 }
 
 const Eterm *
-#if HALFWORD_HEAP
-erts_hashmap_get_rel(Uint32 hx, Eterm key, Eterm node, Eterm *map_base)
-#else
 erts_hashmap_get(Uint32 hx, Eterm key, Eterm node)
-#endif
 {
     Eterm *ptr, hdr, *res;
     Uint ix, lvl = 0;
@@ -2011,7 +2003,7 @@ erts_hashmap_get(Uint32 hx, Eterm key, Eterm node)
     UseTmpHeapNoproc(2);
 
     ASSERT(is_boxed(node));
-    ptr = boxed_val_rel(node, map_base);
+    ptr = boxed_val(node);
     hdr = *ptr;
     ASSERT(is_header(hdr));
     ASSERT(is_hashmap_header_head(hdr));
@@ -2032,15 +2024,15 @@ erts_hashmap_get(Uint32 hx, Eterm key, Eterm node)
         node  = ptr[ix+1];
 
         if (is_list(node)) { /* LEAF NODE [K|V] */
-            ptr = list_val_rel(node,map_base);
-            res = eq_rel(CAR(ptr), map_base, key, NULL) ? &(CDR(ptr)) : NULL;
+            ptr = list_val(node);
+            res = EQ(CAR(ptr), key) ? &(CDR(ptr)) : NULL;
             break;
         }
 
         hx = hashmap_shift_hash(th,hx,lvl,key);
 
         ASSERT(is_boxed(node));
-        ptr = boxed_val_rel(node, map_base);
+        ptr = boxed_val(node);
         hdr = *ptr;
         ASSERT(is_header(hdr));
         ASSERT(!is_hashmap_header_head(hdr));
@@ -2161,12 +2153,12 @@ int erts_hashmap_insert_down(Uint32 hx, Eterm key, Eterm node, Uint *sz,
 			size += HAMT_HEAD_BITMAP_SZ(n+1);
 			goto unroll;
 		    default:
-			erl_exit(1, "bad header tag %ld\r\n", hdr & _HEADER_MAP_SUBTAG_MASK);
+			erts_exit(ERTS_ERROR_EXIT, "bad header tag %ld\r\n", hdr & _HEADER_MAP_SUBTAG_MASK);
 			break;
 		}
 		break;
 	    default:
-		erl_exit(1, "bad primary tag %p\r\n", node);
+		erts_exit(ERTS_ERROR_EXIT, "bad primary tag %p\r\n", node);
 		break;
 	}
     }
@@ -2281,12 +2273,12 @@ Eterm erts_hashmap_insert_up(Eterm *hp, Eterm key, Eterm value,
 			res = make_hashmap(nhp);
 			break;
 		    default:
-			erl_exit(1, "bad header tag %x\r\n", hdr & _HEADER_MAP_SUBTAG_MASK);
+			erts_exit(ERTS_ERROR_EXIT, "bad header tag %x\r\n", hdr & _HEADER_MAP_SUBTAG_MASK);
 			break;
 		}
 		break;
 	    default:
-		erl_exit(1, "bad primary tag %x\r\n", primary_tag(node));
+		erts_exit(ERTS_ERROR_EXIT, "bad primary tag %x\r\n", primary_tag(node));
 		break;
 	}
 
@@ -2404,12 +2396,12 @@ static Eterm hashmap_delete(Process *p, Uint32 hx, Eterm key, Eterm map) {
 			/* not occupied */
 			goto not_found;
 		    default:
-			erl_exit(1, "bad header tag %ld\r\n", hdr & _HEADER_MAP_SUBTAG_MASK);
+			erts_exit(ERTS_ERROR_EXIT, "bad header tag %ld\r\n", hdr & _HEADER_MAP_SUBTAG_MASK);
 			break;
 		}
 		break;
 	    default:
-		erl_exit(1, "bad primary tag %p\r\n", node);
+		erts_exit(ERTS_ERROR_EXIT, "bad primary tag %p\r\n", node);
 		break;
 	}
     }
@@ -2586,7 +2578,7 @@ unroll:
 		res = make_hashmap(nhp);
 		break;
 	    default:
-		erl_exit(1, "bad header tag %x\r\n", hdr & _HEADER_MAP_SUBTAG_MASK);
+		erts_exit(ERTS_ERROR_EXIT, "bad header tag %x\r\n", hdr & _HEADER_MAP_SUBTAG_MASK);
 		break;
 	}
     } while(!ESTACK_ISEMPTY(stack));
@@ -2706,32 +2698,88 @@ BIF_RETTYPE erts_internal_map_to_tuple_keys_1(BIF_ALIST_1) {
 }
 
 /*
- * erts_internal:map_type/1
+ * erts_internal:term_type/1
  *
  * Used in erts_debug:size/1
  */
 
-BIF_RETTYPE erts_internal_map_type_1(BIF_ALIST_1) {
-    DECL_AM(hashmap);
-    DECL_AM(hashmap_node);
-    DECL_AM(flatmap);
-    if (is_map(BIF_ARG_1)) {
-        Eterm hdr = *(boxed_val(BIF_ARG_1));
-        ASSERT(is_header(hdr));
-        switch (hdr & _HEADER_MAP_SUBTAG_MASK) {
-            case HAMT_SUBTAG_HEAD_FLATMAP:
-                BIF_RET(AM_flatmap);
-            case HAMT_SUBTAG_HEAD_ARRAY:
-            case HAMT_SUBTAG_HEAD_BITMAP:
-                BIF_RET(AM_hashmap);
-            case HAMT_SUBTAG_NODE_BITMAP:
-                BIF_RET(AM_hashmap_node);
-            default:
-                erl_exit(1, "bad header");
+BIF_RETTYPE erts_internal_term_type_1(BIF_ALIST_1) {
+    Eterm obj = BIF_ARG_1;
+    switch (primary_tag(obj)) {
+        case TAG_PRIMARY_LIST:
+            BIF_RET(ERTS_MAKE_AM("list"));
+        case TAG_PRIMARY_BOXED: {
+            Eterm hdr = *boxed_val(obj);
+            ASSERT(is_header(hdr));
+            switch (hdr & _TAG_HEADER_MASK) {
+                case ARITYVAL_SUBTAG:
+                    BIF_RET(ERTS_MAKE_AM("tuple"));
+                case EXPORT_SUBTAG:
+                    BIF_RET(ERTS_MAKE_AM("export"));
+                case FUN_SUBTAG:
+                    BIF_RET(ERTS_MAKE_AM("fun"));
+                case MAP_SUBTAG:
+                    switch (MAP_HEADER_TYPE(hdr)) {
+                        case MAP_HEADER_TAG_FLATMAP_HEAD :
+                            BIF_RET(ERTS_MAKE_AM("flatmap"));
+                        case MAP_HEADER_TAG_HAMT_HEAD_BITMAP :
+                        case MAP_HEADER_TAG_HAMT_HEAD_ARRAY :
+                            BIF_RET(ERTS_MAKE_AM("hashmap"));
+                        case MAP_HEADER_TAG_HAMT_NODE_BITMAP :
+                            BIF_RET(ERTS_MAKE_AM("hashmap_node"));
+                        default:
+                            erts_exit(ERTS_ABORT_EXIT, "term_type: bad map header type %d\n", MAP_HEADER_TYPE(hdr));
+                    }
+                case REFC_BINARY_SUBTAG:
+                    BIF_RET(ERTS_MAKE_AM("refc_binary"));
+                case HEAP_BINARY_SUBTAG:
+                    BIF_RET(ERTS_MAKE_AM("heap_binary"));
+                case SUB_BINARY_SUBTAG:
+                    BIF_RET(ERTS_MAKE_AM("sub_binary"));
+                case BIN_MATCHSTATE_SUBTAG:
+                    BIF_RET(ERTS_MAKE_AM("matchstate"));
+                case POS_BIG_SUBTAG:
+                case NEG_BIG_SUBTAG:
+                    BIF_RET(ERTS_MAKE_AM("bignum"));
+                case REF_SUBTAG:
+                    BIF_RET(ERTS_MAKE_AM("reference"));
+                case EXTERNAL_REF_SUBTAG:
+                    BIF_RET(ERTS_MAKE_AM("external_reference"));
+                case EXTERNAL_PID_SUBTAG:
+                    BIF_RET(ERTS_MAKE_AM("external_pid"));
+                case EXTERNAL_PORT_SUBTAG:
+                    BIF_RET(ERTS_MAKE_AM("external_port"));
+                case FLOAT_SUBTAG:
+                    BIF_RET(ERTS_MAKE_AM("hfloat"));
+                default:
+                    erts_exit(ERTS_ABORT_EXIT, "term_type: Invalid tag (0x%X)\n", hdr);
+            }
         }
+        case TAG_PRIMARY_IMMED1:
+            switch (obj & _TAG_IMMED1_MASK) {
+                case _TAG_IMMED1_SMALL:
+                    BIF_RET(ERTS_MAKE_AM("fixnum"));
+                case _TAG_IMMED1_PID:
+                    BIF_RET(ERTS_MAKE_AM("pid"));
+                case _TAG_IMMED1_PORT:
+                    BIF_RET(ERTS_MAKE_AM("port"));
+                case _TAG_IMMED1_IMMED2:
+                    switch (obj & _TAG_IMMED2_MASK) {
+                        case _TAG_IMMED2_ATOM:
+                            BIF_RET(ERTS_MAKE_AM("atom"));
+                        case _TAG_IMMED2_CATCH:
+                            BIF_RET(ERTS_MAKE_AM("catch"));
+                        case _TAG_IMMED2_NIL:
+                            BIF_RET(ERTS_MAKE_AM("nil"));
+                        default:
+                            erts_exit(ERTS_ABORT_EXIT, "term_type: Invalid tag (0x%X)\n", obj);
+                    }
+                default:
+                    erts_exit(ERTS_ABORT_EXIT, "term_type: Invalid tag (0x%X)\n", obj);
+            }
+        default:
+            erts_exit(ERTS_ABORT_EXIT, "term_type: Invalid tag (0x%X)\n", obj);
     }
-    BIF_P->fvalue = BIF_ARG_1;
-    BIF_ERROR(BIF_P, BADMAP);
 }
 
 /*
@@ -2763,7 +2811,7 @@ BIF_RETTYPE erts_internal_map_hashmap_children_1(BIF_ALIST_1) {
                 ptr += 2;
                 break;
             default:
-                erl_exit(1, "bad header\r\n");
+                erts_exit(ERTS_ERROR_EXIT, "bad header\r\n");
                 break;
         }
         ASSERT(sz < 17);
@@ -2841,7 +2889,7 @@ static Eterm hashmap_info(Process *p, Eterm node) {
 			}
 			break;
 		    default:
-			erl_exit(1, "bad header\r\n");
+			erts_exit(ERTS_ERROR_EXIT, "bad header\r\n");
 			break;
 		}
 	}
diff --git a/erts/emulator/beam/erl_map.h b/erts/emulator/beam/erl_map.h
index 4d9d74bc37..052fa99f03 100644
--- a/erts/emulator/beam/erl_map.h
+++ b/erts/emulator/beam/erl_map.h
@@ -57,7 +57,6 @@ typedef struct flatmap_s {
 
 
 #define hashmap_size(x)               (((hashmap_head_t*) hashmap_val(x))->size)
-#define hashmap_size_rel(RTERM, BASE) hashmap_size(rterm2wterm(RTERM, BASE))
 #define hashmap_make_hash(Key)        make_internal_hash(Key)
 
 #define hashmap_restore_hash(Heap,Lvl,Key) \
@@ -104,23 +103,9 @@ Eterm  erts_hashmap_from_array(ErtsHeapFactory*, Eterm *leafs, Uint n, int rejec
 Eterm  erts_hashmap_from_ks_and_vs_extra(Process *p, Eterm *ks, Eterm *vs, Uint n,
 					 Eterm k, Eterm v);
 
-const Eterm *
-#if HALFWORD_HEAP
-erts_maps_get_rel(Eterm key, Eterm map, Eterm *map_base);
-#  define erts_maps_get(A, B) erts_maps_get_rel(A, B, NULL)
-#else
-erts_maps_get(Eterm key, Eterm map);
-#  define erts_maps_get_rel(A, B, B_BASE) erts_maps_get(A, B)
-#endif
+const Eterm *erts_maps_get(Eterm key, Eterm map);
 
-const Eterm *
-#if HALFWORD_HEAP
-erts_hashmap_get_rel(Uint32 hx, Eterm key, Eterm node, Eterm *map_base);
-#  define erts_hashmap_get(Hx, K, M) erts_hashmap_get_rel(Hx, K, M, NULL)
-#else
-erts_hashmap_get(Uint32 hx, Eterm key, Eterm map);
-#  define erts_hashmap_get_rel(Hx, K, M, M_BASE) erts_hashmap_get(Hx, K, M)
-#endif
+const Eterm *erts_hashmap_get(Uint32 hx, Eterm key, Eterm map);
 
 /* hamt nodes v2.0
  *
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index fa6b2fc613..bc0a55068b 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -33,8 +33,8 @@
 #include "erl_binary.h"
 #include "dtrace-wrapper.h"
 
-ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(message,
-				 ErlMessage,
+ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(message_ref,
+				 ErtsMessageRef,
 				 ERL_MESSAGE_BUF_SZ,
 				 ERTS_ALC_T_MSG_REF)
 
@@ -44,27 +44,20 @@ ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(message,
 #undef HARD_DEBUG
 #endif
 
-
-
-
-#ifdef DEBUG
-static ERTS_INLINE int in_heapfrag(const Eterm* ptr, const ErlHeapFragment *bp)
+void
+init_message(void)
 {
-    return ((unsigned)(ptr - bp->mem) < bp->used_size);
+    init_message_ref_alloc();
 }
-#endif
-
 
-void
-init_message(void)
+void *erts_alloc_message_ref(void)
 {
-    init_message_alloc();
+    return (void *) message_ref_alloc();
 }
 
-void
-free_message(ErlMessage* mp)
+void erts_free_message_ref(void *mp)
 {
-    message_free(mp);
+    message_ref_free((ErtsMessageRef *) mp);
 }
 
 /* Allocate message buffer (size in words) */
@@ -74,7 +67,8 @@ new_message_buffer(Uint size)
     ErlHeapFragment* bp;
     bp = (ErlHeapFragment*) ERTS_HEAP_ALLOC(ERTS_ALC_T_HEAP_FRAG,
 					    ERTS_HEAP_FRAG_SIZE(size));
-    ERTS_INIT_HEAP_FRAG(bp, size);
+    ERTS_INIT_HEAP_FRAG(bp, size, size);
+    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] new message buffer %p\n", erts_get_current_pid(), bp->mem));
     return bp;
 }
 
@@ -203,83 +197,57 @@ free_message_buffer(ErlHeapFragment* bp)
     }while (bp != NULL);
 }
 
-static ERTS_INLINE void
-link_mbuf_to_proc(Process *proc, ErlHeapFragment *bp)
+void
+erts_cleanup_messages(ErtsMessage *msgp)
 {
-    if (bp) {
-	/* Link the message buffer */
-	bp->next = MBUF(proc);
-	MBUF(proc) = bp;
-	MBUF_SIZE(proc) += bp->used_size;
-	FLAGS(proc) |= F_FORCE_GC;
-
-	/* Move any off_heap's into the process */
-	if (bp->off_heap.first != NULL) {
-	    struct erl_off_heap_header** next_p = &bp->off_heap.first;
-	    while (*next_p != NULL) {
-		next_p = &((*next_p)->next);
+    ErtsMessage *mp = msgp;
+    while (mp) {
+	ErtsMessage *fmp;
+	ErlHeapFragment *bp;
+	if (is_non_value(ERL_MESSAGE_TERM(mp))) {
+	    if (is_not_immed(ERL_MESSAGE_TOKEN(mp))) {
+		bp = (ErlHeapFragment *) mp->data.dist_ext->ext_endp;
+		erts_cleanup_offheap(&bp->off_heap);
+	    }
+	    if (mp->data.dist_ext)
+		erts_free_dist_ext_copy(mp->data.dist_ext);
+	}
+	else {
+	    if (mp->data.attached != ERTS_MSG_COMBINED_HFRAG)
+		bp = mp->data.heap_frag;
+	    else {
+		bp = mp->hfrag.next;
+		erts_cleanup_offheap(&mp->hfrag.off_heap);
 	    }
-	    *next_p = MSO(proc).first;
-	    MSO(proc).first = bp->off_heap.first;
-	    bp->off_heap.first = NULL;
-	    OH_OVERHEAD(&(MSO(proc)), bp->off_heap.overhead);
+	    if (bp)
+		free_message_buffer(bp);
 	}
+	fmp = mp;
+	mp = mp->next;
+	erts_free_message(fmp);
     }
 }
 
-Eterm
-erts_msg_distext2heap(Process *pp,
-		      ErtsProcLocks *plcksp,
-		      ErlHeapFragment **bpp,
-		      Eterm *tokenp,
-		      ErtsDistExternal *dist_extp)
+ErtsMessage *
+erts_realloc_shrink_message(ErtsMessage *mp, Uint sz, Eterm *brefs, Uint brefs_size)
 {
-    Eterm msg;
-    Uint tok_sz = 0;
-    Eterm *hp = NULL;
-    ErtsHeapFactory factory;
-    Sint sz;
-
-    *bpp = NULL;
-    sz = erts_decode_dist_ext_size(dist_extp);
-    if (sz < 0)
-	goto decode_error;
-    if (is_not_nil(*tokenp)) {
-	ErlHeapFragment *heap_frag = erts_dist_ext_trailer(dist_extp);
-	tok_sz = heap_frag->used_size;
-	sz += tok_sz;
-    }
-    if (pp) {
-	ErlOffHeap *ohp;
-	hp = erts_alloc_message_heap(sz, bpp, &ohp, pp, plcksp);
-    }
-    else {
-	*bpp = new_message_buffer(sz);
-	hp = (*bpp)->mem;
-    }
-    erts_factory_message_init(&factory, pp, hp, *bpp);
-    msg = erts_decode_dist_ext(&factory, dist_extp);
-    if (is_non_value(msg))
-	goto decode_error;
-    if (is_not_nil(*tokenp)) {
-	ErlHeapFragment *heap_frag = erts_dist_ext_trailer(dist_extp);
-	hp = erts_produce_heap(&factory, tok_sz, 0);
-	*tokenp = copy_struct(*tokenp, tok_sz, &hp, factory.off_heap);
-	erts_cleanup_offheap(&heap_frag->off_heap);
+    ErtsMessage *nmp = erts_realloc(ERTS_ALC_T_MSG, mp,
+				    sizeof(ErtsMessage) + (sz - 1)*sizeof(Eterm));
+    if (nmp != mp) {
+	Eterm *sp = &mp->hfrag.mem[0];
+	Eterm *ep = sp + sz;
+	Sint offs = &nmp->hfrag.mem[0] - sp;
+	erts_offset_off_heap(&nmp->hfrag.off_heap, offs, sp, ep);
+	erts_offset_heap(&nmp->hfrag.mem[0], sz, offs, sp, ep);
+	if (brefs && brefs_size)
+	    erts_offset_heap_ptr(brefs, brefs_size, offs, sp, ep);
     }
-    erts_free_dist_ext_copy(dist_extp);
-    erts_factory_close(&factory);
-    return msg;
 
- decode_error:
-    if (is_not_nil(*tokenp)) {
-	ErlHeapFragment *heap_frag = erts_dist_ext_trailer(dist_extp);
-	erts_cleanup_offheap(&heap_frag->off_heap);
-    }
-    erts_free_dist_ext_copy(dist_extp);
-    *bpp = NULL;
-    return THE_NON_VALUE;
- }
+    nmp->hfrag.used_size = sz;
+    nmp->hfrag.alloc_size = sz;
+
+    return nmp;
+}
 
 void
 erts_queue_dist_message(Process *rcvr,
@@ -287,7 +255,7 @@ erts_queue_dist_message(Process *rcvr,
 			ErtsDistExternal *dist_ext,
 			Eterm token)
 {
-    ErlMessage* mp;
+    ErtsMessage* mp;
 #ifdef USE_VM_PROBES
     Sint tok_label = 0;
     Sint tok_lastcnt = 0;
@@ -299,7 +267,17 @@ erts_queue_dist_message(Process *rcvr,
 
     ERTS_SMP_LC_ASSERT(*rcvr_locks == erts_proc_lc_my_proc_locks(rcvr));
 
-    mp = message_alloc();
+    mp = erts_alloc_message(0, NULL);
+    mp->data.dist_ext = dist_ext;
+
+    ERL_MESSAGE_TERM(mp) = THE_NON_VALUE;
+#ifdef USE_VM_PROBES
+    ERL_MESSAGE_DT_UTAG(mp) = NIL;
+    if (token == am_have_dt_utag)
+	ERL_MESSAGE_TOKEN(mp) = NIL;
+    else
+#endif
+	ERL_MESSAGE_TOKEN(mp) = token;
 
 #ifdef ERTS_SMP
     if (!(*rcvr_locks & ERTS_PROC_LOCK_MSGQ)) {
@@ -318,64 +296,46 @@ erts_queue_dist_message(Process *rcvr,
 	if (!(*rcvr_locks & ERTS_PROC_LOCK_MSGQ))
 	    erts_smp_proc_unlock(rcvr, ERTS_PROC_LOCK_MSGQ);
 	/* Drop message if receiver is exiting or has a pending exit ... */
-	if (is_not_nil(token)) {
-	    ErlHeapFragment *heap_frag;
-	    heap_frag = erts_dist_ext_trailer(mp->data.dist_ext);
-	    erts_cleanup_offheap(&heap_frag->off_heap);
-	}
-	erts_free_dist_ext_copy(dist_ext);
-	message_free(mp);
+	erts_cleanup_messages(mp);
     }
     else
 #endif
     if (IS_TRACED_FL(rcvr, F_TRACE_RECEIVE)) {
 	/* Ahh... need to decode it in order to trace it... */
-	ErlHeapFragment *mbuf;
-	Eterm msg;
 	if (!(*rcvr_locks & ERTS_PROC_LOCK_MSGQ))
 	    erts_smp_proc_unlock(rcvr, ERTS_PROC_LOCK_MSGQ);
-	message_free(mp);
-	msg = erts_msg_distext2heap(rcvr, rcvr_locks, &mbuf, &token, dist_ext);
-	if (is_value(msg))
+	if (!erts_decode_dist_message(rcvr, *rcvr_locks, mp, 0))
+	    erts_free_message(mp);
+	else {
+	    Eterm msg = ERL_MESSAGE_TERM(mp);
+	    token = ERL_MESSAGE_TOKEN(mp);
 #ifdef USE_VM_PROBES
-            if (DTRACE_ENABLED(message_queued)) {
-                DTRACE_CHARBUF(receiver_name, DTRACE_TERM_BUF_SIZE);
-
-                dtrace_proc_str(rcvr, receiver_name);
-                if (token != NIL && token != am_have_dt_utag) {
-                    tok_label = signed_val(SEQ_TRACE_T_LABEL(token));
-                    tok_lastcnt = signed_val(SEQ_TRACE_T_LASTCNT(token));
-                    tok_serial = signed_val(SEQ_TRACE_T_SERIAL(token));
-                }
-                DTRACE6(message_queued,
-                        receiver_name, size_object(msg), rcvr->msg.len,
-                        tok_label, tok_lastcnt, tok_serial);
-            }
+	    if (DTRACE_ENABLED(message_queued)) {
+		DTRACE_CHARBUF(receiver_name, DTRACE_TERM_BUF_SIZE);
+
+		dtrace_proc_str(rcvr, receiver_name);
+                if (have_seqtrace(token)) {
+		    tok_label = signed_val(SEQ_TRACE_T_LABEL(token));
+		    tok_lastcnt = signed_val(SEQ_TRACE_T_LASTCNT(token));
+		    tok_serial = signed_val(SEQ_TRACE_T_SERIAL(token));
+		}
+		DTRACE6(message_queued,
+			receiver_name, size_object(msg), rcvr->msg.len,
+			tok_label, tok_lastcnt, tok_serial);
+	    }
 #endif
-	    erts_queue_message(rcvr, rcvr_locks, mbuf, msg, token);
+	    erts_queue_message(rcvr, rcvr_locks, mp, msg, token);
+	}
     }
     else {
 	/* Enqueue message on external format */
 
-	ERL_MESSAGE_TERM(mp) = THE_NON_VALUE;
-#ifdef USE_VM_PROBES
-	ERL_MESSAGE_DT_UTAG(mp) = NIL;
-	if (token == am_have_dt_utag) {
-	    ERL_MESSAGE_TOKEN(mp) = NIL;
-	} else {
-#endif
-	    ERL_MESSAGE_TOKEN(mp) = token;
-#ifdef USE_VM_PROBES
-	}
-#endif
-	mp->next = NULL;
-
 #ifdef USE_VM_PROBES
         if (DTRACE_ENABLED(message_queued)) {
             DTRACE_CHARBUF(receiver_name, DTRACE_TERM_BUF_SIZE);
 
             dtrace_proc_str(rcvr, receiver_name);
-            if (token != NIL && token != am_have_dt_utag) {
+            if (have_seqtrace(token)) {
                 tok_label = signed_val(SEQ_TRACE_T_LABEL(token));
                 tok_lastcnt = signed_val(SEQ_TRACE_T_LASTCNT(token));
                 tok_serial = signed_val(SEQ_TRACE_T_SERIAL(token));
@@ -388,7 +348,7 @@ erts_queue_dist_message(Process *rcvr,
                     tok_label, tok_lastcnt, tok_serial);
         }
 #endif
-	mp->data.dist_ext = dist_ext;
+
 	LINK_MESSAGE(rcvr, mp);
 
 	if (!(*rcvr_locks & ERTS_PROC_LOCK_MSGQ))
@@ -408,9 +368,9 @@ erts_queue_dist_message(Process *rcvr,
 static Sint
 queue_message(Process *c_p,
 	      Process* receiver,
-	      ErtsProcLocks *receiver_locks,
 	      erts_aint32_t *receiver_state,
-	      ErlHeapFragment* bp,
+	      ErtsProcLocks *receiver_locks,
+	      ErtsMessage* mp,
 	      Eterm message,
 	      Eterm seq_trace_token
 #ifdef USE_VM_PROBES
@@ -419,31 +379,24 @@ queue_message(Process *c_p,
     )
 {
     Sint res;
-    ErlMessage* mp;
     int locked_msgq = 0;
-    erts_aint_t state;
-
-#ifndef ERTS_SMP
-    ASSERT(bp != NULL || receiver->mbuf == NULL);
-#endif
+    erts_aint32_t state;
 
     ERTS_SMP_LC_ASSERT(*receiver_locks == erts_proc_lc_my_proc_locks(receiver));
 
-    mp = message_alloc();
-
-    if (receiver_state)
-	state = *receiver_state;
-    else
-	state = erts_smp_atomic32_read_acqb(&receiver->state);
-
 #ifdef ERTS_SMP
 
-    if (state & (ERTS_PSFLG_EXITING|ERTS_PSFLG_PENDING_EXIT))
-	goto exiting;
-
     if (!(*receiver_locks & ERTS_PROC_LOCK_MSGQ)) {
 	if (erts_smp_proc_trylock(receiver, ERTS_PROC_LOCK_MSGQ) == EBUSY) {
 	    ErtsProcLocks need_locks = ERTS_PROC_LOCK_MSGQ;
+
+	    if (receiver_state)
+		state = *receiver_state;
+	    else
+		state = erts_smp_atomic32_read_nob(&receiver->state);
+	    if (state & (ERTS_PSFLG_EXITING|ERTS_PSFLG_PENDING_EXIT))
+		goto exiting;
+
 	    if (*receiver_locks & ERTS_PROC_LOCK_STATUS) {
 		erts_smp_proc_unlock(receiver, ERTS_PROC_LOCK_STATUS);
 		need_locks |= ERTS_PROC_LOCK_STATUS;
@@ -451,13 +404,12 @@ queue_message(Process *c_p,
 	    erts_smp_proc_lock(receiver, need_locks);
 	}
 	locked_msgq = 1;
-	state = erts_smp_atomic32_read_nob(&receiver->state);
-	if (receiver_state)
-	    *receiver_state = state;
     }
 
 #endif
 
+    state = erts_smp_atomic32_read_nob(&receiver->state);
+
     if (state & (ERTS_PSFLG_PENDING_EXIT|ERTS_PSFLG_EXITING)) {
 #ifdef ERTS_SMP
     exiting:
@@ -465,9 +417,7 @@ queue_message(Process *c_p,
 	/* Drop message if receiver is exiting or has a pending exit... */
 	if (locked_msgq)
 	    erts_smp_proc_unlock(receiver, ERTS_PROC_LOCK_MSGQ);
-	if (bp)
-	    free_message_buffer(bp);
-	message_free(mp);
+	erts_cleanup_messages(mp);
 	return 0;
     }
 
@@ -476,13 +426,9 @@ queue_message(Process *c_p,
 #ifdef USE_VM_PROBES
     ERL_MESSAGE_DT_UTAG(mp) = dt_utag;
 #endif
-    mp->next = NULL;
-    mp->data.heap_frag = bp;
 
-#ifndef ERTS_SMP
     res = receiver->msg.len;
-#else
-    res = receiver->msg_inq.len;
+#ifdef ERTS_SMP
     if (*receiver_locks & ERTS_PROC_LOCK_MAIN) {
 	/*
 	 * We move 'in queue' to 'private queue' and place
@@ -492,7 +438,7 @@ queue_message(Process *c_p,
 	 * we don't need to include the 'in queue' in
 	 * the root set when garbage collecting.
 	 */
-	res += receiver->msg.len;
+	res += receiver->msg_inq.len;
 	ERTS_SMP_MSGQ_MV_INQ2PRIVQ(receiver);
 	LINK_MESSAGE_PRIVQ(receiver, mp);
     }
@@ -544,19 +490,19 @@ queue_message(Process *c_p,
 void
 #ifdef USE_VM_PROBES
 erts_queue_message_probe(Process* receiver, ErtsProcLocks *receiver_locks,
-                         ErlHeapFragment* bp,
+                         ErtsMessage* mp,
                          Eterm message, Eterm seq_trace_token, Eterm dt_utag)
 #else
 erts_queue_message(Process* receiver, ErtsProcLocks *receiver_locks,
-                   ErlHeapFragment* bp,
+                   ErtsMessage* mp,
                    Eterm message, Eterm seq_trace_token)
 #endif
 {
     queue_message(NULL,
 		  receiver,
-		  receiver_locks,
 		  NULL,
-		  bp,
+		  receiver_locks,
+		  mp,
 		  message,
 		  seq_trace_token
 #ifdef USE_VM_PROBES
@@ -566,245 +512,37 @@ erts_queue_message(Process* receiver, ErtsProcLocks *receiver_locks,
 }
 
 void
-erts_link_mbuf_to_proc(struct process *proc, ErlHeapFragment *bp)
-{
-    Eterm* htop = HEAP_TOP(proc);
-
-    link_mbuf_to_proc(proc, bp);
-    if (htop < HEAP_LIMIT(proc)) {
-	*htop = make_pos_bignum_header(HEAP_LIMIT(proc)-htop-1);
-	HEAP_TOP(proc) = HEAP_LIMIT(proc);
-    }
-}
-
-/*
- * Moves content of message buffer attached to a message into a heap.
- * The message buffer is deallocated.
- */
-void
-erts_move_msg_mbuf_to_heap(Eterm** hpp, ErlOffHeap* off_heap, ErlMessage *msg)
+erts_link_mbuf_to_proc(Process *proc, ErlHeapFragment *first_bp)
 {
-    struct erl_off_heap_header* oh;
-    Eterm term, token, *fhp, *hp;
-    Sint offs;
-    Uint sz;
-    ErlHeapFragment *bp;
-#ifdef USE_VM_PROBES
-    Eterm utag;
-#endif
-
-#ifdef HARD_DEBUG
-    struct erl_off_heap_header* dbg_oh_start = off_heap->first;
-    Eterm dbg_term, dbg_token;
-    ErlHeapFragment *dbg_bp;
-    Uint *dbg_hp, *dbg_thp_start;
-    Uint dbg_term_sz, dbg_token_sz;
-#ifdef USE_VM_PROBES
-    Eterm dbg_utag;
-    Uint dbg_utag_sz;
-#endif
-#endif
-
-    bp = msg->data.heap_frag;
-    term = ERL_MESSAGE_TERM(msg);
-    token = ERL_MESSAGE_TOKEN(msg);
-#ifdef USE_VM_PROBES
-    utag = ERL_MESSAGE_DT_UTAG(msg);
-#endif
-    if (!bp) {
-#ifdef USE_VM_PROBES
-	ASSERT(is_immed(term) && is_immed(token) && is_immed(utag));
-#else
-	ASSERT(is_immed(term) && is_immed(token));
-#endif
-	return;
-    }
-
-#ifdef HARD_DEBUG
-    dbg_term_sz = size_object(term);
-    dbg_token_sz = size_object(token);
-    dbg_bp = new_message_buffer(dbg_term_sz + dbg_token_sz);
-#ifdef USE_VM_PROBES
-    dbg_utag_sz = size_object(utag);
-    dbg_bp = new_message_buffer(dbg_term_sz + dbg_token_sz + dbg_utag_sz );
-#endif
-    /*ASSERT(dbg_term_sz + dbg_token_sz == erts_msg_used_frag_sz(msg));
-      Copied size may be smaller due to removed SubBins's or garbage.
-      Copied size may be larger due to duplicated shared terms.
-    */
-    dbg_hp = dbg_bp->mem;
-    dbg_term = copy_struct(term, dbg_term_sz, &dbg_hp, &dbg_bp->off_heap);
-    dbg_token = copy_struct(token, dbg_token_sz, &dbg_hp, &dbg_bp->off_heap);
-#ifdef USE_VM_PROBES
-    dbg_utag = copy_struct(utag, dbg_utag_sz, &dbg_hp, &dbg_bp->off_heap);
-#endif
-   dbg_thp_start = *hpp;
-#endif
-
-    if (bp->next != NULL) {
-	move_multi_frags(hpp, off_heap, bp, msg->m, 
-#ifdef USE_VM_PROBES
-			 3
-#else
-			 2
-#endif
-			 );
-	goto copy_done;
-    }
-
-    OH_OVERHEAD(off_heap, bp->off_heap.overhead);
-    sz = bp->used_size;
-
-    ASSERT(is_immed(term) || in_heapfrag(ptr_val(term),bp));
-    ASSERT(is_immed(token) || in_heapfrag(ptr_val(token),bp));
-
-    fhp = bp->mem;
-    hp = *hpp;
-    offs = hp - fhp;
-
-    oh = NULL;
-    while (sz--) {
-	Uint cpy_sz;
-	Eterm val = *fhp++;
-
-	switch (primary_tag(val)) {
-	case TAG_PRIMARY_IMMED1:
-	    *hp++ = val;
-	    break;
-	case TAG_PRIMARY_LIST:
-	case TAG_PRIMARY_BOXED:
-	    ASSERT(in_heapfrag(ptr_val(val), bp));
-	    *hp++ = offset_ptr(val, offs);
-	    break;
-	case TAG_PRIMARY_HEADER:
-	    *hp++ = val;
-	    switch (val & _HEADER_SUBTAG_MASK) {
-	    case ARITYVAL_SUBTAG:
-		break;
-	    case REFC_BINARY_SUBTAG:
-	    case FUN_SUBTAG:
-	    case EXTERNAL_PID_SUBTAG:
-	    case EXTERNAL_PORT_SUBTAG:
-	    case EXTERNAL_REF_SUBTAG:
-		oh = (struct erl_off_heap_header*) (hp-1);
-		cpy_sz = thing_arityval(val);
-		goto cpy_words;
-	    default:
-		cpy_sz = header_arity(val);
-
-	    cpy_words:
-		ASSERT(sz >= cpy_sz);
-		sz -= cpy_sz;
-		while (cpy_sz >= 8) {
-		    cpy_sz -= 8;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		}
-		switch (cpy_sz) {
-		case 7: *hp++ = *fhp++;
-		case 6: *hp++ = *fhp++;
-		case 5: *hp++ = *fhp++;
-		case 4: *hp++ = *fhp++;
-		case 3: *hp++ = *fhp++;
-		case 2: *hp++ = *fhp++;
-		case 1: *hp++ = *fhp++;
-		default: break;
+    if (first_bp) {
+	ErlHeapFragment *bp = first_bp;
+
+	while (1) {
+	    /* Move any off_heap's into the process */
+	    if (bp->off_heap.first != NULL) {
+		struct erl_off_heap_header** next_p = &bp->off_heap.first;
+		while (*next_p != NULL) {
+		    next_p = &((*next_p)->next);
 		}
-		if (oh) {
-		    /* Add to offheap list */
-		    oh->next = off_heap->first;
-		    off_heap->first = oh;
-		    ASSERT(*hpp <= (Eterm*)oh);
-		    ASSERT(hp > (Eterm*)oh);
-		    oh = NULL;
-		}
-		break;
+		*next_p = MSO(proc).first;
+		MSO(proc).first = bp->off_heap.first;
+		bp->off_heap.first = NULL;
+		OH_OVERHEAD(&(MSO(proc)), bp->off_heap.overhead);
 	    }
-	    break;
+	    MBUF_SIZE(proc) += bp->used_size;
+	    if (!bp->next)
+		break;
+	    bp = bp->next;
 	}
-    }
-
-    ASSERT(bp->used_size == hp - *hpp);
-    *hpp = hp;
-
-    if (is_not_immed(token)) {
-	ASSERT(in_heapfrag(ptr_val(token), bp));
-	ERL_MESSAGE_TOKEN(msg) = offset_ptr(token, offs);
-#ifdef HARD_DEBUG
-	ASSERT(dbg_thp_start <= ptr_val(ERL_MESSAGE_TOKEN(msg)));
-	ASSERT(hp > ptr_val(ERL_MESSAGE_TOKEN(msg)));
-#endif
-    }
-
-    if (is_not_immed(term)) {
-	ASSERT(in_heapfrag(ptr_val(term),bp));
-	ERL_MESSAGE_TERM(msg) = offset_ptr(term, offs);
-#ifdef HARD_DEBUG
-	ASSERT(dbg_thp_start <= ptr_val(ERL_MESSAGE_TERM(msg)));
-	ASSERT(hp > ptr_val(ERL_MESSAGE_TERM(msg)));
-#endif
-    }
-#ifdef USE_VM_PROBES
-    if (is_not_immed(utag)) {
-	ASSERT(in_heapfrag(ptr_val(utag), bp));
-	ERL_MESSAGE_DT_UTAG(msg) = offset_ptr(utag, offs);
-#ifdef HARD_DEBUG
-	ASSERT(dbg_thp_start <= ptr_val(ERL_MESSAGE_DT_UTAG(msg)));
-	ASSERT(hp > ptr_val(ERL_MESSAGE_DT_UTAG(msg)));
-#endif
-    }
-#endif
-
-copy_done:
 
-#ifdef HARD_DEBUG
-    {
-	int i, j;
-	ErlHeapFragment* frag;
-	{
-	    struct erl_off_heap_header* dbg_oh = off_heap->first;
-	    i = j = 0;
-	    while (dbg_oh != dbg_oh_start) {
-		dbg_oh = dbg_oh->next;
-		i++;
-	    }
-	    for (frag=bp; frag; frag=frag->next) {
-		dbg_oh = frag->off_heap.first;
-		while (dbg_oh) {
-		    dbg_oh = dbg_oh->next;
-		    j++;
-		}
-	    }
-	    ASSERT(i == j);
-	}
+	/* Link the message buffer */
+	bp->next = MBUF(proc);
+	MBUF(proc) = first_bp;
     }
-#endif
-	    
-
-    bp->off_heap.first = NULL;
-    free_message_buffer(bp);
-    msg->data.heap_frag = NULL;
-
-#ifdef HARD_DEBUG
-    ASSERT(eq(ERL_MESSAGE_TERM(msg), dbg_term));
-    ASSERT(eq(ERL_MESSAGE_TOKEN(msg), dbg_token));
-#ifdef USE_VM_PROBES
-    ASSERT(eq(ERL_MESSAGE_DT_UTAG(msg), dbg_utag));
-#endif
-    free_message_buffer(dbg_bp);
-#endif
-
 }
 
-
 Uint
-erts_msg_attached_data_size_aux(ErlMessage *msg)
+erts_msg_attached_data_size_aux(ErtsMessage *msg)
 {
     Sint sz;
     ASSERT(is_non_value(ERL_MESSAGE_TERM(msg)));
@@ -833,29 +571,87 @@ erts_msg_attached_data_size_aux(ErlMessage *msg)
     return sz;
 }
 
-void
-erts_move_msg_attached_data_to_heap(ErtsHeapFactory* factory,
-				    ErlMessage *msg)
+ErtsMessage *
+erts_try_alloc_message_on_heap(Process *pp,
+			       erts_aint32_t *psp,
+			       ErtsProcLocks *plp,
+			       Uint sz,
+			       Eterm **hpp,
+			       ErlOffHeap **ohpp,
+			       int *on_heap_p)
 {
-    if (is_value(ERL_MESSAGE_TERM(msg)))
-	erts_move_msg_mbuf_to_heap(&factory->hp, factory->off_heap, msg);
-    else if (msg->data.dist_ext) {
-	ASSERT(msg->data.dist_ext->heap_size >= 0);
-	if (is_not_nil(ERL_MESSAGE_TOKEN(msg))) {
-	    ErlHeapFragment *heap_frag;
-	    heap_frag = erts_dist_ext_trailer(msg->data.dist_ext);
-	    ERL_MESSAGE_TOKEN(msg) = copy_struct(ERL_MESSAGE_TOKEN(msg),
-						 heap_frag->used_size,
-						 &factory->hp,
-						 factory->off_heap);
-	    erts_cleanup_offheap(&heap_frag->off_heap);
+#ifdef ERTS_SMP
+    int locked_main = 0;
+#endif
+    ErtsMessage *mp;
+
+    ASSERT(!(*psp & ERTS_PSFLG_OFF_HEAP_MSGQ));
+
+    if (
+#if defined(ERTS_SMP)
+	*plp & ERTS_PROC_LOCK_MAIN
+#else
+	1
+#endif
+	) {
+#ifdef ERTS_SMP
+    try_on_heap:
+#endif
+	if ((*psp & (ERTS_PSFLG_EXITING|ERTS_PSFLG_PENDING_EXIT))
+	    || (pp->flags & F_DISABLE_GC)
+	    || HEAP_LIMIT(pp) - HEAP_TOP(pp) <= sz) {
+	    /*
+	     * The heap is either potentially in an inconsistent
+	     * state, or not large enough.
+	     */
+#ifdef ERTS_SMP
+	    if (locked_main) {
+		*plp &= ~ERTS_PROC_LOCK_MAIN;
+		erts_smp_proc_unlock(pp, ERTS_PROC_LOCK_MAIN);
+	    }
+#endif
+	    goto in_message_fragment;
 	}
-	ERL_MESSAGE_TERM(msg) = erts_decode_dist_ext(factory,
-						     msg->data.dist_ext);
-	erts_free_dist_ext_copy(msg->data.dist_ext);
-	msg->data.dist_ext = NULL;
+
+	*hpp = HEAP_TOP(pp);
+	HEAP_TOP(pp) = *hpp + sz;
+	*ohpp = &MSO(pp);
+	mp = erts_alloc_message(0, NULL);
+	mp->data.attached = NULL;
+	*on_heap_p = !0;
+    }
+#ifdef ERTS_SMP
+    else if (erts_smp_proc_trylock(pp, ERTS_PROC_LOCK_MAIN) == 0) {
+	locked_main = 1;
+	*psp = erts_smp_atomic32_read_nob(&pp->state);
+	*plp |= ERTS_PROC_LOCK_MAIN;
+	goto try_on_heap;
     }
-    /* else: bad external detected when calculating size */
+#endif
+    else {
+    in_message_fragment:
+	if (!((*psp) & ERTS_PSFLG_ON_HEAP_MSGQ)) {
+	    mp = erts_alloc_message(sz, hpp);
+	    *ohpp = sz == 0 ? NULL : &mp->hfrag.off_heap;
+	}
+	else {
+	    mp = erts_alloc_message(0, NULL);
+	    if (!sz) {
+		*hpp = NULL;
+		*ohpp = NULL;
+	    }
+	    else {
+		ErlHeapFragment *bp;
+		bp = new_message_buffer(sz);
+		*hpp = &bp->mem[0];
+		mp->data.heap_frag = bp;
+		*ohpp = &bp->off_heap;
+	    }
+	}
+	*on_heap_p = 0;
+    }
+
+    return mp;
 }
 
 /*
@@ -870,7 +666,8 @@ erts_send_message(Process* sender,
 		  unsigned flags)
 {
     Uint msize;
-    ErlHeapFragment* bp = NULL;
+    ErtsMessage* mp;
+    ErlOffHeap *ohp;
     Eterm token = NIL;
     Sint res = 0;
 #ifdef USE_VM_PROBES
@@ -879,80 +676,99 @@ erts_send_message(Process* sender,
     Sint tok_label = 0;
     Sint tok_lastcnt = 0;
     Sint tok_serial = 0;
+    Eterm utag = NIL;
+#endif
+    erts_aint32_t receiver_state;
+#ifdef SHCOPY_SEND
+    erts_shcopy_t info;
 #endif
     BM_STOP_TIMER(system);
     BM_MESSAGE(message,sender,receiver);
     BM_START_TIMER(send);
 
- #ifdef USE_VM_PROBES
+#ifdef USE_VM_PROBES
     *sender_name = *receiver_name = '\0';
-   if (DTRACE_ENABLED(message_send)) {
+    if (DTRACE_ENABLED(message_send)) {
         erts_snprintf(sender_name, sizeof(DTRACE_CHARBUF_NAME(sender_name)),
 		      "%T", sender->common.id);
         erts_snprintf(receiver_name, sizeof(DTRACE_CHARBUF_NAME(receiver_name)),
 		      "%T", receiver->common.id);
     }
 #endif
+
+    receiver_state = erts_smp_atomic32_read_nob(&receiver->state);
+
     if (SEQ_TRACE_TOKEN(sender) != NIL && !(flags & ERTS_SND_FLG_NO_SEQ_TRACE)) {
         Eterm* hp;
 	Eterm stoken = SEQ_TRACE_TOKEN(sender);
 	Uint seq_trace_size = 0;
 #ifdef USE_VM_PROBES
 	Uint dt_utag_size = 0;
-	Eterm utag = NIL;
-#endif
-
-	BM_SWAP_TIMER(send,size);
-	msize = size_object(message);
-	BM_SWAP_TIMER(size,send);
-
-#ifdef USE_VM_PROBES
-	if (stoken != am_have_dt_utag) {
 #endif
-
+        BM_SWAP_TIMER(send,size);
+
+        /* SHCOPY corrupts the heap between
+         * copy_shared_calculate, and
+         * copy_shared_perform. (it inserts move_markers like the gc).
+         * Make sure we don't use the heap between those instances.
+         */
+        if (have_seqtrace(stoken)) {
 	    seq_trace_update_send(sender);
 	    seq_trace_output(stoken, message, SEQ_TRACE_SEND, 
 			     receiver->common.id, sender);
 	    seq_trace_size = 6; /* TUPLE5 */
-#ifdef USE_VM_PROBES
-	}
-	if (DT_UTAG_FLAGS(sender) & DT_UTAG_SPREADING) {
-	    dt_utag_size = size_object(DT_UTAG(sender));
-	} else if (stoken == am_have_dt_utag ) {
-	    stoken = NIL;
 	}
+#ifdef USE_VM_PROBES
+        if (DT_UTAG_FLAGS(sender) & DT_UTAG_SPREADING) {
+            dt_utag_size = size_object(DT_UTAG(sender));
+        } else if (stoken == am_have_dt_utag ) {
+            stoken = NIL;
+        }
 #endif
 
-	bp = new_message_buffer(msize + seq_trace_size 
+#ifdef SHCOPY_SEND
+        INITIALIZE_SHCOPY(info);
+        msize = copy_shared_calculate(message, &info);
+#else
+        msize = size_object(message);
+#endif
+        BM_SWAP_TIMER(size,send);
+
+        mp = erts_alloc_message_heap_state(receiver,
+                                           &receiver_state,
+                                           receiver_locks,
+                                           (msize
 #ifdef USE_VM_PROBES
-				+ dt_utag_size
+                                            + dt_utag_size
 #endif
-				);
-	hp = bp->mem;
+                                            + seq_trace_size),
+                                           &hp,
+                                           &ohp);
 
         BM_SWAP_TIMER(send,copy);
-	token = copy_struct(stoken,
-			    seq_trace_size,
-			    &hp,
-			    &bp->off_heap);
 
-	message = copy_struct(message, msize, &hp, &bp->off_heap);
-#ifdef USE_VM_PROBES
-	if (DT_UTAG_FLAGS(sender) & DT_UTAG_SPREADING) {
-	    utag = copy_struct(DT_UTAG(sender), dt_utag_size, &hp, &bp->off_heap);
-#ifdef DTRACE_TAG_HARDDEBUG
-	    erts_fprintf(stderr,
-			 "Dtrace -> (%T) Spreading tag (%T) with "
-			 "message %T!\r\n",sender->common.id, utag, message);
-#endif
-	}
+#ifdef SHCOPY_SEND
+	if (is_not_immed(message))
+            message = copy_shared_perform(message, msize, &info, &hp, ohp);
+        DESTROY_SHCOPY(info);
+#else
+	if (is_not_immed(message))
+            message = copy_struct(message, msize, &hp, ohp);
 #endif
-        BM_MESSAGE_COPIED(msize);
-        BM_SWAP_TIMER(copy,send);
+	if (is_immed(stoken))
+	    token = stoken;
+	else
+	    token = copy_struct(stoken, seq_trace_size, &hp, ohp);
 
 #ifdef USE_VM_PROBES
+	if (DT_UTAG_FLAGS(sender) & DT_UTAG_SPREADING) {
+	    if (is_immed(DT_UTAG(sender)))
+		utag = DT_UTAG(sender);
+	    else
+		utag = copy_struct(DT_UTAG(sender), dt_utag_size, &hp, ohp);
+	}
         if (DTRACE_ENABLED(message_send)) {
-	    if (stoken != NIL && stoken != am_have_dt_utag) {
+            if (have_seqtrace(stoken)) {
 		tok_label = signed_val(SEQ_TRACE_T_LABEL(stoken));
 		tok_lastcnt = signed_val(SEQ_TRACE_T_LASTCNT(stoken));
 		tok_serial = signed_val(SEQ_TRACE_T_SERIAL(stoken));
@@ -961,103 +777,68 @@ erts_send_message(Process* sender,
 		    msize, tok_label, tok_lastcnt, tok_serial);
         }
 #endif
-        res = queue_message(NULL,
-			    receiver,
-			    receiver_locks,
-			    NULL,
-			    bp,
-			    message,
-			    token
-#ifdef USE_VM_PROBES
-			    , utag
-#endif
-	    );
-        BM_SWAP_TIMER(send,system);
-    } else if (sender == receiver) {
-	/* Drop message if receiver has a pending exit ... */
-#ifdef ERTS_SMP
-	ErtsProcLocks need_locks = (~(*receiver_locks)
-				    & (ERTS_PROC_LOCK_MSGQ
-				       | ERTS_PROC_LOCK_STATUS));
-	if (need_locks) {
-	    *receiver_locks |= need_locks;
-	    if (erts_smp_proc_trylock(receiver, need_locks) == EBUSY) {
-		if (need_locks == ERTS_PROC_LOCK_MSGQ) {
-		    erts_smp_proc_unlock(receiver, ERTS_PROC_LOCK_STATUS);
-		    need_locks = ERTS_PROC_LOCK_MSGQ|ERTS_PROC_LOCK_STATUS;
-		}
-		erts_smp_proc_lock(receiver, need_locks);
-	    }
+        BM_MESSAGE_COPIED(msize);
+        BM_SWAP_TIMER(copy,send);
+
+    } else {
+        Eterm *hp;
+
+	if (receiver == sender && !(receiver_state & ERTS_PSFLG_OFF_HEAP_MSGQ)) {
+	    mp = erts_alloc_message(0, NULL);
+	    msize = 0;
 	}
-	if (!ERTS_PROC_PENDING_EXIT(receiver))
+	else {
+	    BM_SWAP_TIMER(send,size);
+#ifdef SHCOPY_SEND
+            INITIALIZE_SHCOPY(info);
+            msize = copy_shared_calculate(message, &info);
+#else
+            msize = size_object(message);
 #endif
-	{
-	    ErlMessage* mp = message_alloc();
-
-            DTRACE6(message_send, sender_name, receiver_name,
-                    size_object(message), tok_label, tok_lastcnt, tok_serial);
-	    mp->data.attached = NULL;
-	    ERL_MESSAGE_TERM(mp) = message;
-	    ERL_MESSAGE_TOKEN(mp) = NIL;
-#ifdef USE_VM_PROBES
-	    ERL_MESSAGE_DT_UTAG(mp) = NIL;
+	    BM_SWAP_TIMER(size,send);
+
+	    mp = erts_alloc_message_heap_state(receiver,
+					       &receiver_state,
+					       receiver_locks,
+					       msize,
+					       &hp,
+					       &ohp);
+	    BM_SWAP_TIMER(send,copy);
+#ifdef SHCOPY_SEND
+            if (is_not_immed(message))
+                message = copy_shared_perform(message, msize, &info, &hp, ohp);
+            DESTROY_SHCOPY(info);
+#else
+            if (is_not_immed(message))
+                message = copy_struct(message, msize, &hp, ohp);
 #endif
-	    mp->next = NULL;
-	    /*
-	     * We move 'in queue' to 'private queue' and place
-	     * message at the end of 'private queue' in order
-	     * to ensure that the 'in queue' doesn't contain
-	     * references into the heap. By ensuring this,
-	     * we don't need to include the 'in queue' in
-	     * the root set when garbage collecting.
-	     */
-	    
-	    ERTS_SMP_MSGQ_MV_INQ2PRIVQ(receiver);
-	    LINK_MESSAGE_PRIVQ(receiver, mp);
-
-	    res = receiver->msg.len;
-
-	    if (IS_TRACED_FL(receiver, F_TRACE_RECEIVE)) {
-		trace_receive(receiver, message);
-	    }
+	    BM_MESSAGE_COPIED(msz);
+	    BM_SWAP_TIMER(copy,send);
 	}
-        BM_SWAP_TIMER(send,system);
-    } else {
-	ErlOffHeap *ohp;
-        Eterm *hp;
-	erts_aint32_t state;
-
-	BM_SWAP_TIMER(send,size);
-	msize = size_object(message);
-	BM_SWAP_TIMER(size,send);
-	hp = erts_alloc_message_heap_state(msize,
-					   &bp,
-					   &ohp,
-					   receiver,
-					   receiver_locks,
-					   &state);
-	BM_SWAP_TIMER(send,copy);
-	message = copy_struct(message, msize, &hp, ohp);
-	BM_MESSAGE_COPIED(msz);
-	BM_SWAP_TIMER(copy,send);
+#ifdef USE_VM_PROBES
         DTRACE6(message_send, sender_name, receiver_name,
                 msize, tok_label, tok_lastcnt, tok_serial);
-	res = queue_message(sender,
-			    receiver,
-			    receiver_locks,
-			    &state,
-			    bp,
-			    message,
-			    token
-#ifdef USE_VM_PROBES
-			    , NIL
 #endif
-	    );
-        BM_SWAP_TIMER(send,system);
     }
-   return res;
+
+    res = queue_message(sender,
+			receiver,
+			&receiver_state,
+			receiver_locks,
+			mp,
+			message,
+			token
+#ifdef USE_VM_PROBES
+			, utag
+#endif
+	);
+
+    BM_SWAP_TIMER(send,system);
+    
+    return res;
 }
 
+
 /*
  * This function delivers an EXIT message to a process
  * which is trapping EXITs.
@@ -1075,46 +856,572 @@ erts_deliver_exit_message(Eterm from, Process *to, ErtsProcLocks *to_locksp,
     Uint sz_from;
     Eterm* hp;
     Eterm temptoken;
-    ErlHeapFragment* bp = NULL;
-
-    if (token != NIL
-#ifdef USE_VM_PROBES
-	&& token != am_have_dt_utag
+    ErtsMessage* mp;
+    ErlOffHeap *ohp;
+#ifdef SHCOPY_SEND
+    erts_shcopy_t info;
 #endif
-	) {
 
+    if (have_seqtrace(token)) {
 	ASSERT(is_tuple(token));
-	sz_reason = size_object(reason);
 	sz_token = size_object(token);
 	sz_from = size_object(from);
-	bp = new_message_buffer(sz_reason + sz_from + sz_token + 4);
-	hp = bp->mem;
-	mess = copy_struct(reason, sz_reason, &hp, &bp->off_heap);
-	from_copy = copy_struct(from, sz_from, &hp, &bp->off_heap);
+#ifdef SHCOPY_SEND
+        INITIALIZE_SHCOPY(info);
+        sz_reason = copy_shared_calculate(reason, &info);
+#else
+	sz_reason = size_object(reason);
+#endif
+	mp = erts_alloc_message_heap(to, to_locksp,
+				     sz_reason + sz_from + sz_token + 4,
+				     &hp, &ohp);
+#ifdef SHCOPY_SEND
+        mess = copy_shared_perform(reason, sz_reason, &info, &hp, ohp);
+        DESTROY_SHCOPY(info);
+#else
+	mess = copy_struct(reason, sz_reason, &hp, ohp);
+#endif
+	from_copy = copy_struct(from, sz_from, &hp, ohp);
 	save = TUPLE3(hp, am_EXIT, from_copy, mess);
 	hp += 4;
 	/* the trace token must in this case be updated by the caller */
 	seq_trace_output(token, save, SEQ_TRACE_SEND, to->common.id, NULL);
-	temptoken = copy_struct(token, sz_token, &hp, &bp->off_heap);
-	erts_queue_message(to, to_locksp, bp, save, temptoken);
+	temptoken = copy_struct(token, sz_token, &hp, ohp);
+	erts_queue_message(to, to_locksp, mp, save, temptoken);
     } else {
-	ErlOffHeap *ohp;
-	sz_reason = size_object(reason);
 	sz_from = IS_CONST(from) ? 0 : size_object(from);
+#ifdef SHCOPY_SEND
+        INITIALIZE_SHCOPY(info);
+        sz_reason = copy_shared_calculate(reason, &info);
+#else
+	sz_reason = size_object(reason);
+#endif
+	mp = erts_alloc_message_heap(to, to_locksp,
+				     sz_reason+sz_from+4, &hp, &ohp);
 
-	hp = erts_alloc_message_heap(sz_reason+sz_from+4,
-				     &bp,
-				     &ohp,
-				     to,
-				     to_locksp);
-
+#ifdef SHCOPY_SEND
+        mess = copy_shared_perform(reason, sz_reason, &info, &hp, ohp);
+        DESTROY_SHCOPY(info);
+#else
 	mess = copy_struct(reason, sz_reason, &hp, ohp);
+#endif
 	from_copy = (IS_CONST(from)
 		     ? from
 		     : copy_struct(from, sz_from, &hp, ohp));
 	save = TUPLE3(hp, am_EXIT, from_copy, mess);
-	erts_queue_message(to, to_locksp, bp, save, NIL);
+	erts_queue_message(to, to_locksp, mp, save, NIL);
+    }
+}
+
+void erts_save_message_in_proc(Process *p, ErtsMessage *msgp)
+{
+    ErlHeapFragment *hfp;
+
+    if (msgp->data.attached == ERTS_MSG_COMBINED_HFRAG)
+	hfp = &msgp->hfrag;
+    else if (msgp->data.attached) {
+	hfp = msgp->data.heap_frag;
+    }
+    else {
+	erts_free_message(msgp);
+	return; /* Nothing to save */
+    }
+
+    while (1) {
+	struct erl_off_heap_header *ohhp = hfp->off_heap.first;
+	if (ohhp) {
+	    for ( ; ohhp->next; ohhp = ohhp->next)
+		;
+	    ohhp->next = p->off_heap.first;
+	    p->off_heap.first = hfp->off_heap.first;
+	    hfp->off_heap.first = NULL;
+	}
+	p->off_heap.overhead += hfp->off_heap.overhead;
+	hfp->off_heap.overhead = 0;
+	p->mbuf_sz += hfp->used_size;
+
+	if (!hfp->next)
+	    break;
+	hfp = hfp->next;
+    }
+
+    msgp->next = p->msg_frag;
+    p->msg_frag = msgp;
+}
+
+Sint
+erts_move_messages_off_heap(Process *c_p)
+{
+    int reds = 1;
+    /*
+     * Move all messages off heap. This *only* occurs when the
+     * process had off heap message disabled and just enabled
+     * it...
+     */
+    ErtsMessage *mp;
+
+    reds += c_p->msg.len / 10;
+
+    ASSERT(erts_smp_atomic32_read_nob(&c_p->state)
+	   & ERTS_PSFLG_OFF_HEAP_MSGQ);
+    ASSERT(c_p->flags & F_OFF_HEAP_MSGQ_CHNG);
+
+    for (mp = c_p->msg.first; mp; mp = mp->next) {
+	Uint msg_sz, token_sz;
+#ifdef USE_VM_PROBES
+	Uint utag_sz;
+#endif
+	Eterm *hp;
+	ErlHeapFragment *hfrag;
+
+	if (mp->data.attached)
+	    continue;
+
+	if (is_immed(ERL_MESSAGE_TERM(mp))
+#ifdef USE_VM_PROBES
+	    && is_immed(ERL_MESSAGE_DT_UTAG(mp))
+#endif
+	    && is_not_immed(ERL_MESSAGE_TOKEN(mp)))
+	    continue;
+
+	/*
+	 * The message refers into the heap. Copy the message
+	 * from the heap into a heap fragment and attach
+	 * it to the message...
+	 */
+	msg_sz = size_object(ERL_MESSAGE_TERM(mp));
+#ifdef USE_VM_PROBES
+	utag_sz = size_object(ERL_MESSAGE_DT_UTAG(mp));
+#endif
+	token_sz = size_object(ERL_MESSAGE_TOKEN(mp));
+
+	hfrag = new_message_buffer(msg_sz
+#ifdef USE_VM_PROBES
+				   + utag_sz
+#endif
+				   + token_sz);
+	hp = hfrag->mem;
+	if (is_not_immed(ERL_MESSAGE_TERM(mp)))
+	    ERL_MESSAGE_TERM(mp) = copy_struct(ERL_MESSAGE_TERM(mp),
+					       msg_sz, &hp,
+					       &hfrag->off_heap);
+	if (is_not_immed(ERL_MESSAGE_TOKEN(mp)))
+	    ERL_MESSAGE_TOKEN(mp) = copy_struct(ERL_MESSAGE_TOKEN(mp),
+						token_sz, &hp,
+						&hfrag->off_heap);
+#ifdef USE_VM_PROBES
+	if (is_not_immed(ERL_MESSAGE_DT_UTAG(mp)))
+	    ERL_MESSAGE_DT_UTAG(mp) = copy_struct(ERL_MESSAGE_DT_UTAG(mp),
+						  utag_sz, &hp,
+						  &hfrag->off_heap);
+#endif
+	mp->data.heap_frag = hfrag;
+	reds += 1;
+    }
+
+    return reds;
+}
+
+Sint
+erts_complete_off_heap_message_queue_change(Process *c_p)
+{
+    int reds = 1;
+
+    ERTS_SMP_LC_ASSERT(ERTS_PROC_LOCK_MAIN == erts_proc_lc_my_proc_locks(c_p));
+    ASSERT(c_p->flags & F_OFF_HEAP_MSGQ_CHNG);
+    ASSERT(erts_smp_atomic32_read_nob(&c_p->state) & ERTS_PSFLG_OFF_HEAP_MSGQ);
+
+    /*
+     * This job was first initiated when the process changed to off heap
+     * message queue management. Since then ERTS_PSFLG_OFF_HEAP_MSGQ
+     * has been set. However, the management state might have been changed
+     * again (multiple times) since then. Check users last requested state
+     * (the flags F_OFF_HEAP_MSGQ, and F_ON_HEAP_MSGQ), and make the state
+     * consistent with that.
+     */
+
+    if (!(c_p->flags & F_OFF_HEAP_MSGQ))
+	erts_smp_atomic32_read_band_nob(&c_p->state,
+					~ERTS_PSFLG_OFF_HEAP_MSGQ);
+    else {
+	reds += 2;
+	erts_smp_proc_lock(c_p, ERTS_PROC_LOCK_MSGQ);
+	ERTS_SMP_MSGQ_MV_INQ2PRIVQ(c_p);
+	erts_smp_proc_unlock(c_p, ERTS_PROC_LOCK_MSGQ);
+	reds += erts_move_messages_off_heap(c_p);
+    }
+    c_p->flags &= ~F_OFF_HEAP_MSGQ_CHNG;
+    return reds;
+}
+
+typedef struct {
+    Eterm pid;
+    ErtsThrPrgrLaterOp lop;
+} ErtsChangeOffHeapMessageQueue;
+
+static void
+change_off_heap_msgq(void *vcohmq)
+{
+    ErtsChangeOffHeapMessageQueue *cohmq;
+    /*
+     * Now we've waited thread progress which ensures that all
+     * messages to the process are enqueued off heap. Schedule
+     * completion of this change as a system task on the process
+     * itself. This in order to avoid lock contention on its
+     * main lock. We will be called in
+     * erts_complete_off_heap_message_queue_change() (above) when
+     * the system task has been selected for execution.
+     */
+    cohmq = (ErtsChangeOffHeapMessageQueue *) vcohmq;
+    erts_schedule_complete_off_heap_message_queue_change(cohmq->pid);
+    erts_free(ERTS_ALC_T_MSGQ_CHNG, vcohmq);
+}
+
+Eterm
+erts_change_message_queue_management(Process *c_p, Eterm new_state)
+{
+    Eterm res;
+
+#ifdef DEBUG
+    if (c_p->flags & F_OFF_HEAP_MSGQ) {
+	ASSERT(erts_smp_atomic32_read_nob(&c_p->state)
+	       & ERTS_PSFLG_OFF_HEAP_MSGQ);
+    }
+    else {
+	if (c_p->flags & F_OFF_HEAP_MSGQ_CHNG) {
+	    ASSERT(erts_smp_atomic32_read_nob(&c_p->state)
+		   & ERTS_PSFLG_OFF_HEAP_MSGQ);
+	}
+	else {
+	    ASSERT(!(erts_smp_atomic32_read_nob(&c_p->state)
+		     & ERTS_PSFLG_OFF_HEAP_MSGQ));
+	}
+    }
+#endif
+
+    switch (c_p->flags & (F_OFF_HEAP_MSGQ|F_ON_HEAP_MSGQ)) {
+
+    case F_OFF_HEAP_MSGQ:
+	res = am_off_heap;
+
+	switch (new_state) {
+	case am_off_heap:
+	    break;
+	case am_on_heap:
+	    c_p->flags |= F_ON_HEAP_MSGQ;
+	    erts_smp_atomic32_read_bor_nob(&c_p->state,
+					   ERTS_PSFLG_ON_HEAP_MSGQ);
+	    /* fall through */
+	case am_mixed:
+	    c_p->flags &= ~F_OFF_HEAP_MSGQ;
+	    /*
+	     * We are not allowed to clear ERTS_PSFLG_OFF_HEAP_MSGQ
+	     * if a off heap change is ongoing. It will be adjusted
+	     * when the change completes...
+	     */
+	    if (!(c_p->flags & F_OFF_HEAP_MSGQ_CHNG)) {
+		/* Safe to clear ERTS_PSFLG_OFF_HEAP_MSGQ... */
+		erts_smp_atomic32_read_band_nob(&c_p->state,
+						~ERTS_PSFLG_OFF_HEAP_MSGQ);
+	    }
+	    break;
+	default:
+	    res = THE_NON_VALUE; /* badarg */
+	    break;
+	}
+	break;
+
+    case F_ON_HEAP_MSGQ:
+	res = am_on_heap;
+
+	switch (new_state) {
+	case am_on_heap:
+	    break;
+	case am_mixed:
+	    c_p->flags &= ~F_ON_HEAP_MSGQ;
+	    erts_smp_atomic32_read_band_nob(&c_p->state,
+					    ~ERTS_PSFLG_ON_HEAP_MSGQ);
+	    break;
+	case am_off_heap:
+	    c_p->flags &= ~F_ON_HEAP_MSGQ;
+	    erts_smp_atomic32_read_band_nob(&c_p->state,
+					    ~ERTS_PSFLG_ON_HEAP_MSGQ);
+	    goto change_to_off_heap;
+	default:
+	    res = THE_NON_VALUE; /* badarg */
+	    break;
+	}
+	break;
+
+    case 0:
+	res = am_mixed;
+
+	switch (new_state) {
+	case am_mixed:
+	    break;
+	case am_on_heap:
+	    c_p->flags |= F_ON_HEAP_MSGQ;
+	    erts_smp_atomic32_read_bor_nob(&c_p->state,
+					   ERTS_PSFLG_ON_HEAP_MSGQ);
+	    break;
+	case am_off_heap:
+	    goto change_to_off_heap;
+	default:
+	    res = THE_NON_VALUE; /* badarg */
+	    break;
+	}
+	break;
+
+    default:
+	res = am_error;
+	ERTS_INTERNAL_ERROR("Inconsistent message queue management state");
+	break;
+    }
+
+    return res;
+
+change_to_off_heap:
+
+    c_p->flags |= F_OFF_HEAP_MSGQ;
+
+    /*
+     * We do not have to schedule a change if
+     * we have an ongoing off heap change...
+     */
+    if (!(c_p->flags & F_OFF_HEAP_MSGQ_CHNG)) {
+	ErtsChangeOffHeapMessageQueue *cohmq;
+	/*
+	 * Need to set ERTS_PSFLG_OFF_HEAP_MSGQ and wait
+	 * thread progress before completing the change in
+	 * order to ensure that all senders observe that
+	 * messages should be passed off heap. When the
+	 * change has completed, GC does not need to inspect
+	 * the message queue at all.
+	 */
+	erts_smp_atomic32_read_bor_nob(&c_p->state,
+				       ERTS_PSFLG_OFF_HEAP_MSGQ);
+	c_p->flags |= F_OFF_HEAP_MSGQ_CHNG;
+	cohmq = erts_alloc(ERTS_ALC_T_MSGQ_CHNG,
+			   sizeof(ErtsChangeOffHeapMessageQueue));
+	cohmq->pid = c_p->common.id;
+	erts_schedule_thr_prgr_later_op(change_off_heap_msgq,
+					(void *) cohmq,
+					&cohmq->lop);
+    }
+
+    return res;
+}
+
+int
+erts_decode_dist_message(Process *proc, ErtsProcLocks proc_locks,
+			 ErtsMessage *msgp, int force_off_heap)
+{
+    ErtsHeapFactory factory;
+    Eterm msg;
+    ErlHeapFragment *bp;
+    Sint need;
+    int decode_in_heap_frag;
+
+    decode_in_heap_frag = (force_off_heap
+			   || !(proc_locks & ERTS_PROC_LOCK_MAIN)
+			   || (proc->flags & F_OFF_HEAP_MSGQ));
+
+    if (msgp->data.dist_ext->heap_size >= 0)
+	need = msgp->data.dist_ext->heap_size;
+    else {
+	need = erts_decode_dist_ext_size(msgp->data.dist_ext);
+	if (need < 0) {
+	    /* bad msg; remove it... */
+	    if (is_not_immed(ERL_MESSAGE_TOKEN(msgp))) {
+		bp = erts_dist_ext_trailer(msgp->data.dist_ext);
+		erts_cleanup_offheap(&bp->off_heap);
+	    }
+	    erts_free_dist_ext_copy(msgp->data.dist_ext);
+	    msgp->data.dist_ext = NULL;
+	    return 0;
+	}
+
+	msgp->data.dist_ext->heap_size = need;
+    }
+
+    if (is_not_immed(ERL_MESSAGE_TOKEN(msgp))) {
+	bp = erts_dist_ext_trailer(msgp->data.dist_ext);
+	need += bp->used_size;
+    }
+
+    if (decode_in_heap_frag)
+	erts_factory_heap_frag_init(&factory, new_message_buffer(need));
+    else
+	erts_factory_proc_prealloc_init(&factory, proc, need);
+
+    ASSERT(msgp->data.dist_ext->heap_size >= 0);
+    if (is_not_immed(ERL_MESSAGE_TOKEN(msgp))) {
+	ErlHeapFragment *heap_frag;
+	heap_frag = erts_dist_ext_trailer(msgp->data.dist_ext);
+	ERL_MESSAGE_TOKEN(msgp) = copy_struct(ERL_MESSAGE_TOKEN(msgp),
+					      heap_frag->used_size,
+					      &factory.hp,
+					      factory.off_heap);
+	erts_cleanup_offheap(&heap_frag->off_heap);
+    }
+
+    msg = erts_decode_dist_ext(&factory, msgp->data.dist_ext);
+    ERL_MESSAGE_TERM(msgp) = msg;
+    erts_free_dist_ext_copy(msgp->data.dist_ext);
+    msgp->data.attached = NULL;
+
+    if (is_non_value(msg)) {
+	erts_factory_undo(&factory);
+	return 0;
     }
+
+    erts_factory_trim_and_close(&factory, msgp->m,
+				ERL_MESSAGE_REF_ARRAY_SZ);
+
+    ASSERT(!msgp->data.heap_frag);
+
+    if (decode_in_heap_frag)
+	msgp->data.heap_frag = factory.heap_frags;
+
+    return 1;
+}
+
+/*
+ * ERTS_INSPECT_MSGQ_KEEP_OH_MSGS == 0 will move off heap messages
+ * into the heap of the inspected process if off_heap_message_queue
+ * is false when process_info(_, messages) is called. That is, the
+ * following GC will have more data in the rootset compared to the
+ * scenario when process_info(_, messages) had not been called.
+ *
+ * ERTS_INSPECT_MSGQ_KEEP_OH_MSGS != 0 will keep off heap messages
+ * off heap when process_info(_, messages) is called regardless of
+ * the off_heap_message_queue setting of the process. That is, it
+ * will change the following execution of the process as little as
+ * possible.
+ */
+#define ERTS_INSPECT_MSGQ_KEEP_OH_MSGS 1
+
+Uint
+erts_prep_msgq_for_inspection(Process *c_p, Process *rp,
+			      ErtsProcLocks rp_locks, ErtsMessageInfo *mip)
+{
+    Uint tot_heap_size;
+    ErtsMessage* mp;
+    Sint i;
+    int self_on_heap;
+    
+    /*
+     * Prepare the message queue for inspection
+     * by process_info().
+     *
+     *
+     * - Decode all messages on external format
+     * - Remove all corrupt dist messages from queue
+     * - Save pointer to, and heap size need of each
+     *   message in the mip array.
+     * - Return total heap size need for all messages
+     *   that needs to be copied.
+     *
+     * If ERTS_INSPECT_MSGQ_KEEP_OH_MSGS == 0:
+     * - In case off heap messages is disabled and
+     *   we are inspecting our own queue, move all
+     *   off heap data into the heap.
+     */
+
+    self_on_heap = c_p == rp && !(c_p->flags & F_OFF_HEAP_MSGQ);
+
+    tot_heap_size = 0;
+    i = 0;
+    mp = rp->msg.first;
+    while (mp) {
+	Eterm msg = ERL_MESSAGE_TERM(mp);
+
+	mip[i].size = 0;
+
+	if (is_non_value(msg)) {
+	    /* Dist message on external format; decode it... */
+	    if (mp->data.attached)
+		erts_decode_dist_message(rp, rp_locks, mp,
+					 ERTS_INSPECT_MSGQ_KEEP_OH_MSGS);
+
+	    msg = ERL_MESSAGE_TERM(mp);
+
+	    if (is_non_value(msg)) {
+		ErtsMessage **mpp;
+		ErtsMessage *bad_mp = mp;
+		/*
+		 * Bad distribution message; remove
+		 * it from the queue...
+		 */
+		ASSERT(!mp->data.attached);
+
+		mpp = i == 0 ? &rp->msg.first : &mip[i-1].msgp->next;
+
+		if (rp->msg.save == &bad_mp->next)
+		    rp->msg.save = mpp;
+		if (rp->msg.last == &bad_mp->next)
+		    rp->msg.last = mpp;
+		mp = mp->next;
+		*mpp = mp;
+		rp->msg.len--;
+		bad_mp->next = NULL;
+		erts_cleanup_messages(bad_mp);
+		continue;
+	    }
+	}
+
+	ASSERT(is_value(msg));
+
+#if ERTS_INSPECT_MSGQ_KEEP_OH_MSGS
+	if (is_not_immed(msg) && (!self_on_heap || mp->data.attached)) {
+	    Uint sz = size_object(msg);
+	    mip[i].size = sz;
+	    tot_heap_size += sz;
+	}
+#else
+	if (self_on_heap) {
+	    if (mp->data.attached) {
+		ErtsMessage *tmp = NULL;
+		if (mp->data.attached != ERTS_MSG_COMBINED_HFRAG) {
+		    erts_link_mbuf_to_proc(rp, mp->data.heap_frag);
+		    mp->data.attached = NULL;
+		}
+		else {
+		    /*
+		     * Need to replace the message reference since
+		     * we will get references to the message data
+		     * from the heap...
+		     */
+		    ErtsMessage **mpp;
+		    tmp = erts_alloc_message(0, NULL);
+		    sys_memcpy((void *) tmp->m, (void *) mp->m,
+			       sizeof(Eterm)*ERL_MESSAGE_REF_ARRAY_SZ); 
+		    mpp = i == 0 ? &rp->msg.first : &mip[i-1].msgp->next;
+		    tmp->next = mp->next;
+		    if (rp->msg.save == &mp->next)
+			rp->msg.save = &tmp->next;
+		    if (rp->msg.last == &mp->next)
+			rp->msg.last = &tmp->next;
+		    *mpp = tmp;
+		    erts_save_message_in_proc(rp, mp);
+		    mp = tmp;
+		}
+	    }
+	}
+	else if (is_not_immed(msg)) {
+	    Uint sz = size_object(msg);
+	    mip[i].size = sz;
+	    tot_heap_size += sz;
+	}
+
+#endif
+
+	mip[i].msgp = mp;
+	i++;
+	mp = mp->next;
+    }
+
+    return tot_heap_size;
 }
 
 void erts_factory_proc_init(ErtsHeapFactory* factory,
@@ -1127,47 +1434,138 @@ void erts_factory_proc_prealloc_init(ErtsHeapFactory* factory,
 				     Process* p,
 				     Sint size)
 {
+    ErlHeapFragment *bp = p->mbuf;
     factory->mode     = FACTORY_HALLOC;
     factory->p        = p;
     factory->hp_start = HAlloc(p, size);
     factory->hp       = factory->hp_start;
     factory->hp_end   = factory->hp_start + size;
     factory->off_heap = &p->off_heap;
+    factory->message  = NULL;
     factory->off_heap_saved.first    = p->off_heap.first;
     factory->off_heap_saved.overhead = p->off_heap.overhead;
-    factory->heap_frags_saved = p->mbuf;
+    factory->heap_frags_saved = bp;
+    factory->heap_frags_saved_used = bp ? bp->used_size : 0;
     factory->heap_frags = NULL; /* not used */
     factory->alloc_type = 0; /* not used */
 }
 
-void erts_factory_message_init(ErtsHeapFactory* factory,
-			       Process* rp,
-			       Eterm* hp,
-			       ErlHeapFragment* bp)
+void erts_factory_heap_frag_init(ErtsHeapFactory* factory,
+				 ErlHeapFragment* bp)
 {
-    if (bp) {
-	factory->mode     = FACTORY_HEAP_FRAGS;
-	factory->p        = NULL;
-	factory->hp_start = bp->mem;
-	factory->hp       = hp ? hp : bp->mem;
-	factory->hp_end   = bp->mem + bp->alloc_size;
-	factory->off_heap = &bp->off_heap;
-        factory->heap_frags = bp;
-        factory->heap_frags_saved = bp;
-        factory->alloc_type = ERTS_ALC_T_HEAP_FRAG;
-        ASSERT(!bp->next);
+    factory->mode     = FACTORY_HEAP_FRAGS;
+    factory->p        = NULL;
+    factory->hp_start = bp->mem;
+    factory->hp       = bp->mem;
+    factory->hp_end   = bp->mem + bp->alloc_size;
+    factory->off_heap = &bp->off_heap;
+    factory->message  = NULL;
+    factory->heap_frags = bp;
+    factory->heap_frags_saved = NULL;
+    factory->heap_frags_saved_used = 0;
+    factory->alloc_type = ERTS_ALC_T_HEAP_FRAG;
+    ASSERT(!bp->next);
+    factory->off_heap_saved.first    = factory->off_heap->first;
+    factory->off_heap_saved.overhead = factory->off_heap->overhead;
+
+    ASSERT(factory->hp >= factory->hp_start && factory->hp <= factory->hp_end);
+}
+
+
+ErtsMessage *
+erts_factory_message_create(ErtsHeapFactory* factory,
+			    Process *proc,
+			    ErtsProcLocks *proc_locksp,
+			    Uint sz)
+{
+    Eterm *hp;
+    ErlOffHeap *ohp;
+    ErtsMessage *msgp;
+    int on_heap;
+    erts_aint32_t state;
+
+    state = erts_smp_atomic32_read_nob(&proc->state);
+
+    if (state & ERTS_PSFLG_OFF_HEAP_MSGQ) {
+	msgp = erts_alloc_message(sz, &hp);
+	ohp = sz == 0 ? NULL : &msgp->hfrag.off_heap;
+	on_heap = 0;
+    }
+    else {
+	msgp = erts_try_alloc_message_on_heap(proc, &state,
+					      proc_locksp,
+					      sz, &hp, &ohp,
+					      &on_heap);
+    }
+
+    if (on_heap) {
+	ERTS_SMP_ASSERT(*proc_locksp & ERTS_PROC_LOCK_MAIN);
+	ASSERT(ohp == &proc->off_heap);
+	factory->mode = FACTORY_HALLOC;
+	factory->p = proc;
+	factory->heap_frags_saved = proc->mbuf;
+	factory->heap_frags_saved_used = proc->mbuf ? proc->mbuf->used_size : 0;
+    }
+    else {
+	factory->mode = FACTORY_MESSAGE;
+	factory->p = NULL;
+	factory->heap_frags_saved = NULL;
+	factory->heap_frags_saved_used = 0;
+
+	if (msgp->data.attached == ERTS_MSG_COMBINED_HFRAG) {
+	    ASSERT(!msgp->hfrag.next);
+	    factory->heap_frags = NULL;
+	}
+	else {
+	    ASSERT(!msgp->data.heap_frag
+		   || !msgp->data.heap_frag->next);
+	    factory->heap_frags = msgp->data.heap_frag;
+	}
+    }
+    factory->hp_start = hp;
+    factory->hp       = hp;
+    factory->hp_end   = hp + sz;
+    factory->message  = msgp;
+    factory->off_heap = ohp;
+    factory->alloc_type = ERTS_ALC_T_HEAP_FRAG;
+    if (ohp) {
+	factory->off_heap_saved.first    = ohp->first;
+	factory->off_heap_saved.overhead = ohp->overhead;
     }
     else {
-	factory->mode     = FACTORY_HALLOC;
-	factory->p        = rp;
-	factory->hp_start = hp;
-	factory->hp       = hp;
-	factory->hp_end   = HEAP_TOP(rp);
-	factory->off_heap = &rp->off_heap;
-        factory->heap_frags_saved = rp->mbuf;
-        factory->heap_frags = NULL; /* not used */
-        factory->alloc_type = 0; /* not used */
+	factory->off_heap_saved.first    = NULL;
+	factory->off_heap_saved.overhead = 0;
+    }
+
+    ASSERT(factory->hp >= factory->hp_start && factory->hp <= factory->hp_end);
+
+    return msgp;
+}
+
+void erts_factory_selfcontained_message_init(ErtsHeapFactory* factory,
+					     ErtsMessage *msgp,
+					     Eterm *hp)
+{
+    ErlHeapFragment* bp;
+    if (msgp->data.attached == ERTS_MSG_COMBINED_HFRAG) {
+	bp = &msgp->hfrag;
+	factory->heap_frags = NULL;
+    }
+    else {
+	bp = msgp->data.heap_frag;
+	factory->heap_frags = bp;
     }
+    factory->mode     = FACTORY_MESSAGE;
+    factory->p        = NULL;
+    factory->hp_start = bp->mem;
+    factory->hp       = hp;
+    factory->hp_end   = bp->mem + bp->alloc_size;
+    factory->message  = msgp;
+    factory->off_heap = &bp->off_heap;
+    factory->heap_frags_saved = NULL;
+    factory->heap_frags_saved_used = 0;
+    factory->alloc_type = ERTS_ALC_T_HEAP_FRAG;
+    ASSERT(!bp->next);
     factory->off_heap_saved.first    = factory->off_heap->first;
     factory->off_heap_saved.overhead = factory->off_heap->overhead;
 
@@ -1250,9 +1648,17 @@ static void reserve_heap(ErtsHeapFactory* factory, Uint need, Uint xtra)
 	factory->hp_end = factory->hp + need;
 	return;
 
-    case FACTORY_HEAP_FRAGS:
-    case FACTORY_TMP:
-	bp = factory->heap_frags;
+    case FACTORY_MESSAGE:
+	if (!factory->heap_frags) {
+	    ASSERT(factory->message->data.attached == ERTS_MSG_COMBINED_HFRAG);
+	    bp = &factory->message->hfrag;
+	}
+	else {
+	    /* Fall through */
+	case FACTORY_HEAP_FRAGS:
+	case FACTORY_TMP:
+	    bp = factory->heap_frags;
+	}
 
         if (bp) {
 	    ASSERT(factory->hp > bp->mem);
@@ -1290,8 +1696,23 @@ void erts_factory_close(ErtsHeapFactory* factory)
 	HRelease(factory->p, factory->hp_end, factory->hp);
 	break;
 
-    case FACTORY_HEAP_FRAGS:
-	bp = factory->heap_frags;
+    case FACTORY_MESSAGE:
+	if (!factory->heap_frags) {
+	    if (factory->message->data.attached == ERTS_MSG_COMBINED_HFRAG)
+		bp = &factory->message->hfrag;
+	    else
+		bp = NULL;
+	}
+	else {
+	    if (factory->message->data.attached	== ERTS_MSG_COMBINED_HFRAG)
+		factory->message->hfrag.next = factory->heap_frags;
+	    else
+		factory->message->data.heap_frag = factory->heap_frags;
+
+	    /* Fall through */
+	case FACTORY_HEAP_FRAGS:
+	    bp = factory->heap_frags;
+	}
 
 	if (bp) {
 	    ASSERT(factory->hp >= bp->mem);
@@ -1315,17 +1736,47 @@ void erts_factory_close(ErtsHeapFactory* factory)
 void erts_factory_trim_and_close(ErtsHeapFactory* factory,
 				 Eterm *brefs, Uint brefs_size)
 {
-    if (factory->mode == FACTORY_HEAP_FRAGS) {
-        ErlHeapFragment* bp = factory->heap_frags;
+    ErlHeapFragment *bp;
+
+    switch (factory->mode) {
+    case FACTORY_MESSAGE: {
+	ErtsMessage *mp = factory->message;
+	if (mp->data.attached == ERTS_MSG_COMBINED_HFRAG) {
+	    if (!mp->hfrag.next) {
+		Uint sz = factory->hp - factory->hp_start;
+		mp = erts_shrink_message(mp, sz, brefs, brefs_size);
+		factory->message = mp;
+		factory->mode = FACTORY_CLOSED;
+		return;
+	    }
+	    /*else we don't trim multi fragmented messages for now (off_heap...) */
+	    break;
+	}
+	/* Fall through... */
+    }
+    case FACTORY_HEAP_FRAGS:
+	bp = factory->heap_frags;
+	if (!bp)
+	    break;
         if (bp->next == NULL) {
             Uint used_sz = factory->hp - bp->mem;
             ASSERT(used_sz <= bp->alloc_size);
-            factory->heap_frags = erts_resize_message_buffer(bp, used_sz,
-                                                             brefs, brefs_size);
+	    if (used_sz > 0)
+		bp = erts_resize_message_buffer(bp, used_sz,
+						brefs, brefs_size);
+	    else {
+		free_message_buffer(bp);
+		bp = NULL;
+	    }
+	    factory->heap_frags = bp;
+	    if (factory->mode == FACTORY_MESSAGE)
+		factory->message->data.heap_frag = bp;
             factory->mode = FACTORY_CLOSED;
             return;
         }
-        /*else we don't trim multi fragmented messages for now */
+        /*else we don't trim multi fragmented messages for now (off_heap...) */
+    default:
+	break;
     }
     erts_factory_close(factory);
 }
@@ -1373,28 +1824,33 @@ void erts_factory_undo(ErtsHeapFactory* factory)
 
             /* Rollback heap top
 	     */
-            if (factory->heap_frags_saved == NULL) { /* No heap frags when we started */
-                ASSERT(factory->hp_start >= HEAP_START(factory->p));
-                ASSERT(factory->hp_start <= HEAP_LIMIT(factory->p));
 
-                HEAP_TOP(factory->p) = factory->hp_start;
-            }
-            else {
+	    if (HEAP_START(factory->p) <= factory->hp_start
+		&& factory->hp_start <= HEAP_LIMIT(factory->p)) {
+		HEAP_TOP(factory->p) = factory->hp_start;
+	    }
+
+	    /* Fix last heap frag */
+            if (factory->heap_frags_saved) {
                 ASSERT(factory->heap_frags_saved == factory->p->mbuf);
-                if (factory->hp_start == factory->heap_frags_saved->mem) {
+                if (factory->hp_start != factory->heap_frags_saved->mem)
+                    factory->heap_frags_saved->used_size = factory->heap_frags_saved_used;
+		else {
                     factory->p->mbuf = factory->p->mbuf->next;
                     ERTS_HEAP_FREE(ERTS_ALC_T_HEAP_FRAG, factory->heap_frags_saved,
                                    ERTS_HEAP_FRAG_SIZE(factory->heap_frags_saved->alloc_size));
                 }
-                else if (factory->hp_start != factory->hp_end) {
-                    unsigned remains = factory->hp_start - factory->heap_frags_saved->mem;
-                    ASSERT(remains > 0 && remains < factory->heap_frags_saved->used_size);
-                    factory->heap_frags_saved->used_size = remains;
-                }
             }
         }
         break;
 
+    case FACTORY_MESSAGE:
+	if (factory->message->data.attached == ERTS_MSG_COMBINED_HFRAG)
+	    factory->message->hfrag.next = factory->heap_frags;
+	else
+	    factory->message->data.heap_frag = factory->heap_frags;
+	erts_cleanup_messages(factory->message);
+	break;
     case FACTORY_TMP:
     case FACTORY_HEAP_FRAGS:
 	erts_cleanup_offheap(factory->off_heap);
@@ -1422,4 +1878,3 @@ void erts_factory_undo(ErtsHeapFactory* factory)
     factory->heap_frags = NULL;
 #endif
 }
-
diff --git a/erts/emulator/beam/erl_message.h b/erts/emulator/beam/erl_message.h
index 92ba3e571c..60035d15ae 100644
--- a/erts/emulator/beam/erl_message.h
+++ b/erts/emulator/beam/erl_message.h
@@ -24,6 +24,8 @@
 struct proc_bin;
 struct external_thing_;
 
+typedef struct erl_mesg ErtsMessage;
+
 /*
  * This struct represents data that must be updated by structure copy,
  * but is stored outside of any heap.
@@ -32,9 +34,6 @@ struct external_thing_;
 struct erl_off_heap_header {
     Eterm thing_word;
     Uint size;
-#if HALFWORD_HEAP
-    void* dummy_ptr_padding__;
-#endif
     struct erl_off_heap_header* next;
 };
 
@@ -57,6 +56,7 @@ typedef struct {
     enum {
         FACTORY_CLOSED = 0,
         FACTORY_HALLOC,
+        FACTORY_MESSAGE,
         FACTORY_HEAP_FRAGS,
         FACTORY_STATIC,
         FACTORY_TMP
@@ -65,8 +65,10 @@ typedef struct {
     Eterm* hp_start;
     Eterm* hp;
     Eterm* hp_end;
+    ErtsMessage *message;
     struct erl_heap_fragment* heap_frags;
     struct erl_heap_fragment* heap_frags_saved;
+    Uint heap_frags_saved_used;
     ErlOffHeap* off_heap;
     ErlOffHeap off_heap_saved;
     Uint32 alloc_type;
@@ -74,7 +76,10 @@ typedef struct {
 
 void erts_factory_proc_init(ErtsHeapFactory*, Process*);
 void erts_factory_proc_prealloc_init(ErtsHeapFactory*, Process*, Sint size);
-void erts_factory_message_init(ErtsHeapFactory*, Process*, Eterm* hp, struct erl_heap_fragment*);
+void erts_factory_heap_frag_init(ErtsHeapFactory*, struct erl_heap_fragment*);
+ErtsMessage *erts_factory_message_create(ErtsHeapFactory *, Process *,
+					  ErtsProcLocks *, Uint sz);
+void erts_factory_selfcontained_message_init(ErtsHeapFactory*, ErtsMessage *, Eterm *);
 void erts_factory_static_init(ErtsHeapFactory*, Eterm* hp, Uint size, ErlOffHeap*);
 void erts_factory_tmp_init(ErtsHeapFactory*, Eterm* hp, Uint size, Uint32 atype);
 void erts_factory_dummy_init(ErtsHeapFactory*);
@@ -96,6 +101,8 @@ void erts_factory_undo(ErtsHeapFactory*);
 #include "external.h"
 #include "erl_process.h"
 
+#define ERTS_INVALID_HFRAG_PTR ((ErlHeapFragment *) ~((UWord) 7))
+
 /*
  * This struct represents a heap fragment, which is used when there
  * isn't sufficient room in the process heap and we can't do a GC.
@@ -110,33 +117,53 @@ struct erl_heap_fragment {
     Eterm mem[1];		/* Data */
 };
 
-typedef struct erl_mesg {
-    struct erl_mesg* next;	/* Next message */
-    union {
-	ErtsDistExternal *dist_ext;
-	ErlHeapFragment *heap_frag;
-	void *attached;
-    } data;
+/* m[0] = message, m[1] = seq trace token */
+#define ERL_MESSAGE_REF_ARRAY_SZ 2
+#define ERL_MESSAGE_TERM(mp) ((mp)->m[0])
+#define ERL_MESSAGE_TOKEN(mp) ((mp)->m[1])
+
 #ifdef USE_VM_PROBES
-    Eterm m[3];                 /* m[0] = message, m[1] = seq trace token, m[3] = dynamic trace user tag */
+/* m[2] = dynamic trace user tag */
+#undef ERL_MESSAGE_REF_ARRAY_SZ
+#define ERL_MESSAGE_REF_ARRAY_SZ 3
+#define ERL_MESSAGE_DT_UTAG(mp) ((mp)->m[2])
 #else
-    Eterm m[2];			/* m[0] = message, m[1] = seq trace token */
 #endif
-} ErlMessage;
 
-#define ERL_MESSAGE_TERM(mp) ((mp)->m[0])
-#define ERL_MESSAGE_TOKEN(mp) ((mp)->m[1])
 #ifdef USE_VM_PROBES
-#define ERL_MESSAGE_DT_UTAG(mp) ((mp)->m[2])
+#define have_no_seqtrace(T) ((T) == NIL || (T) == am_have_dt_utag)
+#else
+#define have_no_seqtrace(T) ((T) == NIL)
 #endif
+#define have_seqtrace(T)    (!have_no_seqtrace(T))
+
+#define ERL_MESSAGE_REF_FIELDS__			\
+    ErtsMessage *next;	/* Next message */		\
+    union {						\
+	ErtsDistExternal *dist_ext;			\
+	ErlHeapFragment *heap_frag;			\
+	void *attached;					\
+    } data;						\
+    Eterm m[ERL_MESSAGE_REF_ARRAY_SZ]
+
+
+typedef struct erl_msg_ref__ {
+    ERL_MESSAGE_REF_FIELDS__;
+} ErtsMessageRef;
+
+struct erl_mesg {
+    ERL_MESSAGE_REF_FIELDS__;
+
+    ErlHeapFragment hfrag;
+};
 
 /* Size of default message buffer (erl_message.c) */
 #define ERL_MESSAGE_BUF_SZ 500
 
 typedef struct {
-    ErlMessage* first;
-    ErlMessage** last;  /* point to the last next pointer */
-    ErlMessage** save;
+    ErtsMessage* first;
+    ErtsMessage** last;  /* point to the last next pointer */
+    ErtsMessage** save;
     Sint len;            /* queue length */
 
     /*
@@ -144,14 +171,14 @@ typedef struct {
      * recv_set/1 instructions.
      */
     BeamInstr* mark;		/* address to rec_loop/2 instruction */
-    ErlMessage** saved_last;	/* saved last pointer */
+    ErtsMessage** saved_last;	/* saved last pointer */
 } ErlMessageQueue;
 
 #ifdef ERTS_SMP
 
 typedef struct {
-    ErlMessage* first;
-    ErlMessage** last;  /* point to the last next pointer */
+    ErtsMessage* first;
+    ErtsMessage** last;  /* point to the last next pointer */
     Sint len;            /* queue length */
 } ErlMessageInQueue;
 
@@ -202,7 +229,7 @@ do {									\
 
 /* Unlink current message */
 #define UNLINK_MESSAGE(p,msgp) do { \
-     ErlMessage* __mp = (msgp)->next; \
+     ErtsMessage* __mp = (msgp)->next; \
      *(p)->msg.save = __mp; \
      (p)->msg.len--; \
      if (__mp == NULL) \
@@ -218,76 +245,33 @@ do {									\
 #define SAVE_MESSAGE(p) \
      (p)->msg.save = &(*(p)->msg.save)->next
 
-/*
- * ErtsMoveMsgAttachmentIntoProc() moves data attached to a message
- * onto the heap of a process. The attached data is the content of
- * the the message either on the internal format or on the external
- * format, and also possibly a seq trace token on the internal format.
- * If the message content is on the external format, the decode might
- * fail. If the decoding fails, ERL_MESSAGE_TERM(M) will contain
- * THE_NON_VALUE. That is, ERL_MESSAGE_TERM(M) *has* to be checked
- * afterwards and taken care of appropriately.
- *
- * ErtsMoveMsgAttachmentIntoProc() will shallow copy to heap if
- * possible; otherwise, move to heap via garbage collection.
- *
- * ErtsMoveMsgAttachmentIntoProc() is used when receiveing messages
- * in process_main() and in hipe_check_get_msg().
- */
-
-#define ErtsMoveMsgAttachmentIntoProc(M, P, ST, HT, FC, SWPO, SWPI)	\
-do {									\
-    if ((M)->data.attached) {						\
-	Uint need__ = erts_msg_attached_data_size((M));			\
-        { SWPO ; }							\
- 	if ((ST) - (HT) >= need__) {					\
-            ErtsHeapFactory factory__;                                  \
-            erts_factory_proc_prealloc_init(&factory__, (P), need__);   \
-	    erts_move_msg_attached_data_to_heap(&factory__, (M));       \
-            erts_factory_close(&factory__);                             \
-            if ((P)->mbuf != NULL) {                                    \
-                /* Heap was exhausted by messages. This is a rare case */   \
-                /* that can currently (OTP 18) only happen if hamts are */  \
-                /* far exceeding the estimated heap size. Do GC. */         \
-                (FC) -= erts_garbage_collect((P), 0, NULL, 0);		\
-            }								\
-	}								\
-	else {								\
-	    (FC) -= erts_garbage_collect((P), 0, NULL, 0);		\
-	}								\
-        { SWPI ; }							\
-	ASSERT(!(M)->data.attached);					\
-    }									\
-} while (0)
-
 #define ERTS_SND_FLG_NO_SEQ_TRACE		(((unsigned) 1) << 0)
 
 #define ERTS_HEAP_FRAG_SIZE(DATA_WORDS) \
    (sizeof(ErlHeapFragment) - sizeof(Eterm) + (DATA_WORDS)*sizeof(Eterm))
 
-#define ERTS_INIT_HEAP_FRAG(HEAP_FRAG_P, DATA_WORDS)	\
-do {							\
-    (HEAP_FRAG_P)->next = NULL;				\
-    (HEAP_FRAG_P)->alloc_size = (DATA_WORDS);		\
-    (HEAP_FRAG_P)->used_size = (DATA_WORDS);            \
-    (HEAP_FRAG_P)->off_heap.first = NULL; 	        \
-    (HEAP_FRAG_P)->off_heap.overhead = 0;		\
-} while (0)
+#define ERTS_INIT_HEAP_FRAG(HEAP_FRAG_P, USED_WORDS, DATA_WORDS)	\
+    do {								\
+	(HEAP_FRAG_P)->next = NULL;					\
+	(HEAP_FRAG_P)->alloc_size = (DATA_WORDS);			\
+	(HEAP_FRAG_P)->used_size = (USED_WORDS);			\
+	(HEAP_FRAG_P)->off_heap.first = NULL;				\
+	(HEAP_FRAG_P)->off_heap.overhead = 0;				\
+    } while (0)
 
 void init_message(void);
-void free_message(ErlMessage *);
 ErlHeapFragment* new_message_buffer(Uint);
 ErlHeapFragment* erts_resize_message_buffer(ErlHeapFragment *, Uint,
 					    Eterm *, Uint);
 void free_message_buffer(ErlHeapFragment *);
 void erts_queue_dist_message(Process*, ErtsProcLocks*, ErtsDistExternal *, Eterm);
 #ifdef USE_VM_PROBES
-void erts_queue_message_probe(Process*, ErtsProcLocks*, ErlHeapFragment*,
+void erts_queue_message_probe(Process*, ErtsProcLocks*, ErtsMessage*,
                               Eterm message, Eterm seq_trace_token, Eterm dt_utag);
 #define erts_queue_message(RP,RL,BP,Msg,SEQ) \
     erts_queue_message_probe((RP),(RL),(BP),(Msg),(SEQ),NIL)
 #else
-void erts_queue_message(Process*, ErtsProcLocks*, ErlHeapFragment*,
+void erts_queue_message(Process*, ErtsProcLocks*, ErtsMessage*,
                         Eterm message, Eterm seq_trace_token);
 #define erts_queue_message_probe(RP,RL,BP,Msg,SEQ,TAG) \
     erts_queue_message((RP),(RL),(BP),(Msg),(SEQ))
@@ -296,20 +280,141 @@ void erts_deliver_exit_message(Eterm, Process*, ErtsProcLocks *, Eterm, Eterm);
 Sint erts_send_message(Process*, Process*, ErtsProcLocks*, Eterm, unsigned);
 void erts_link_mbuf_to_proc(Process *proc, ErlHeapFragment *bp);
 
-void erts_move_msg_mbuf_to_heap(Eterm**, ErlOffHeap*, ErlMessage *);
-
-Uint erts_msg_attached_data_size_aux(ErlMessage *msg);
-void erts_move_msg_attached_data_to_heap(ErtsHeapFactory*, ErlMessage *);
-Eterm erts_msg_distext2heap(Process *, ErtsProcLocks *, ErlHeapFragment **,
-			    Eterm *, ErtsDistExternal *);
+Uint erts_msg_attached_data_size_aux(ErtsMessage *msg);
 
 void erts_cleanup_offheap(ErlOffHeap *offheap);
+void erts_save_message_in_proc(Process *p, ErtsMessage *msg);
+Sint erts_move_messages_off_heap(Process *c_p);
+Sint erts_complete_off_heap_message_queue_change(Process *c_p);
+Eterm erts_change_message_queue_management(Process *c_p, Eterm new_state);
+
+int erts_decode_dist_message(Process *, ErtsProcLocks, ErtsMessage *, int);
+
+void erts_cleanup_messages(ErtsMessage *mp);
+
+typedef struct {
+    Uint size;
+    ErtsMessage *msgp;
+} ErtsMessageInfo;
+
+Uint erts_prep_msgq_for_inspection(Process *c_p,
+				   Process *rp,
+				   ErtsProcLocks rp_locks,
+				   ErtsMessageInfo *mip);
+
+void *erts_alloc_message_ref(void);
+void erts_free_message_ref(void *);
 
+#define ERTS_SMALL_FIX_MSG_SZ 10
+#define ERTS_MEDIUM_FIX_MSG_SZ 20
+#define ERTS_LARGE_FIX_MSG_SZ 30
 
+void *erts_alloc_small_message(void);
+void erts_free_small_message(void *mp);
+
+typedef struct {
+    ErtsMessage m;
+    Eterm data[ERTS_SMALL_FIX_MSG_SZ-1];
+} ErtsSmallFixSzMessage;
+
+typedef struct {
+    ErtsMessage m;
+    Eterm data[ERTS_MEDIUM_FIX_MSG_SZ-1];
+} ErtsMediumFixSzMessage;
+
+typedef struct {
+    ErtsMessage m;
+    Eterm data[ERTS_LARGE_FIX_MSG_SZ-1];
+} ErtsLargeFixSzMessage;
+
+ErtsMessage *erts_try_alloc_message_on_heap(Process *pp,
+					    erts_aint32_t *psp,
+					    ErtsProcLocks *plp,
+					    Uint sz,
+					    Eterm **hpp,
+					    ErlOffHeap **ohpp,
+					    int *on_heap_p);
+ErtsMessage *erts_realloc_shrink_message(ErtsMessage *mp, Uint sz,
+					 Eterm *brefs, Uint brefs_size);
+
+ERTS_GLB_FORCE_INLINE ErtsMessage *erts_alloc_message(Uint sz, Eterm **hpp);
+ERTS_GLB_FORCE_INLINE ErtsMessage *erts_shrink_message(ErtsMessage *mp, Uint sz,
+						       Eterm *brefs, Uint brefs_size);
+ERTS_GLB_FORCE_INLINE void erts_free_message(ErtsMessage *mp);
 ERTS_GLB_INLINE Uint erts_used_frag_sz(const ErlHeapFragment*);
-ERTS_GLB_INLINE Uint erts_msg_attached_data_size(ErlMessage *msg);
+ERTS_GLB_INLINE Uint erts_msg_attached_data_size(ErtsMessage *msg);
+
+#define ERTS_MSG_COMBINED_HFRAG ((void *) 0x1)
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_GLB_FORCE_INLINE ErtsMessage *erts_alloc_message(Uint sz, Eterm **hpp)
+{
+    ErtsMessage *mp;
+
+    if (sz == 0) {
+	mp = erts_alloc_message_ref();
+	mp->next = NULL;
+	ERL_MESSAGE_TERM(mp) = NIL;
+	mp->data.attached = NULL;
+	if (hpp)
+	    *hpp = NULL;
+	return mp;
+    }
+
+    mp = erts_alloc(ERTS_ALC_T_MSG,
+		    sizeof(ErtsMessage) + (sz - 1)*sizeof(Eterm));
+
+    mp->next = NULL;
+    ERL_MESSAGE_TERM(mp) = NIL;
+    mp->data.attached = ERTS_MSG_COMBINED_HFRAG;
+    ERTS_INIT_HEAP_FRAG(&mp->hfrag, sz, sz);
+
+    if (hpp)
+	*hpp = &mp->hfrag.mem[0];
+
+    return mp;
+}
+
+ERTS_GLB_FORCE_INLINE ErtsMessage *
+erts_shrink_message(ErtsMessage *mp, Uint sz, Eterm *brefs, Uint brefs_size)
+{
+    if (sz == 0) {
+	ErtsMessage *nmp;
+	if (!mp->data.attached)
+	    return mp;
+	ASSERT(mp->data.attached == ERTS_MSG_COMBINED_HFRAG);
+	nmp = erts_alloc_message_ref();
+#ifdef DEBUG
+	if (brefs && brefs_size) {
+	    int i;
+	    for (i = 0; i < brefs_size; i++)
+		ASSERT(is_non_value(brefs[i]) || is_immed(brefs[i]));
+	}
+#endif
+	erts_free(ERTS_ALC_T_MSG, mp);
+	return nmp;
+    }
+
+    ASSERT(mp->data.attached == ERTS_MSG_COMBINED_HFRAG);
+    ASSERT(mp->hfrag.used_size >= sz);
+
+    if (sz >= (mp->hfrag.alloc_size - mp->hfrag.alloc_size / 16)) {
+	mp->hfrag.used_size = sz;
+	return mp;
+    }
+
+    return erts_realloc_shrink_message(mp, sz, brefs, brefs_size);
+}
+
+ERTS_GLB_FORCE_INLINE void erts_free_message(ErtsMessage *mp)
+{
+    if (mp->data.attached != ERTS_MSG_COMBINED_HFRAG)
+	erts_free_message_ref(mp);
+    else
+	erts_free(ERTS_ALC_T_MSG, mp);
+}
+
 ERTS_GLB_INLINE Uint erts_used_frag_sz(const ErlHeapFragment* bp)
 {
     Uint sz = 0;
@@ -319,11 +424,17 @@ ERTS_GLB_INLINE Uint erts_used_frag_sz(const ErlHeapFragment* bp)
     return sz;
 }
 
-ERTS_GLB_INLINE Uint erts_msg_attached_data_size(ErlMessage *msg)
+ERTS_GLB_INLINE Uint erts_msg_attached_data_size(ErtsMessage *msg)
 {
     ASSERT(msg->data.attached);
-    if (is_value(ERL_MESSAGE_TERM(msg)))
-	return erts_used_frag_sz(msg->data.heap_frag);
+    if (is_value(ERL_MESSAGE_TERM(msg))) {
+	ErlHeapFragment *bp;
+	if (msg->data.attached == ERTS_MSG_COMBINED_HFRAG)
+	    bp = &msg->hfrag;
+	else
+	    bp = msg->data.heap_frag;
+	return erts_used_frag_sz(bp);
+    }
     else if (msg->data.dist_ext->heap_size < 0)
 	return erts_msg_attached_data_size_aux(msg);
     else {
diff --git a/erts/emulator/beam/erl_monitors.c b/erts/emulator/beam/erl_monitors.c
index 7dfa01c8ac..bd899fa2f9 100644
--- a/erts/emulator/beam/erl_monitors.c
+++ b/erts/emulator/beam/erl_monitors.c
@@ -356,7 +356,7 @@ void erts_add_monitor(ErtsMonitor **root, Uint type, Eterm ref, Eterm pid,
 	    tstack[tpos++] = this;
 	    this = &((*this)->right);
 	} else { /* Equal key is an error for monitors */
-	    erl_exit(1,"Insertion of already present monitor!");
+	    erts_exit(ERTS_ERROR_EXIT,"Insertion of already present monitor!");
 	    break;
 	}
     }
diff --git a/erts/emulator/beam/erl_msacc.c b/erts/emulator/beam/erl_msacc.c
new file mode 100644
index 0000000000..71e3fd8b6e
--- /dev/null
+++ b/erts/emulator/beam/erl_msacc.c
@@ -0,0 +1,486 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2014-2015. 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%
+ */
+
+/*
+ * Description: Microstate accounting.
+ *
+ *              We keep track of the different states that the
+ *              Erlang VM threads are in, in order to provide
+ *              performance/debugging statistics. There is a
+ *              small overhead in enabling this, but in the big
+ *              scheme of things it should be negligible.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#define ERTS_MSACC_STATE_STRINGS 1
+
+#include "sys.h"
+#include "global.h"
+#include "erl_threads.h"
+#include "erl_bif_unique.h"
+#include "erl_map.h"
+#include "erl_msacc.h"
+
+#if ERTS_ENABLE_MSACC
+
+static Eterm erts_msacc_gather_stats(ErtsMsAcc *msacc, Eterm **hpp, Uint *szp);
+static void erts_msacc_reset(ErtsMsAcc *msacc);
+static ErtsMsAcc* get_msacc(void);
+
+#ifdef USE_THREADS
+erts_tsd_key_t ERTS_WRITE_UNLIKELY(erts_msacc_key);
+#else
+ErtsMsAcc *ERTS_WRITE_UNLIKELY(erts_msacc) = NULL;
+#endif
+int ERTS_WRITE_UNLIKELY(erts_msacc_enabled);
+
+static Eterm *erts_msacc_state_atoms = NULL;
+static erts_rwmtx_t msacc_mutex;
+static ErtsMsAcc *msacc_managed = NULL;
+#ifdef USE_THREADS
+static ErtsMsAcc *msacc_unmanaged = NULL;
+static Uint msacc_unmanaged_count = 0;
+#endif
+
+/* we have to split initiation as atoms are not inited in early init */
+void erts_msacc_early_init(void) {
+#ifndef ERTS_MSACC_ALWAYS_ON
+    erts_msacc_enabled = 0;
+#endif
+    erts_rwmtx_init(&msacc_mutex,"msacc_list_mutex");
+#ifdef USE_THREADS
+    erts_tsd_key_create(&erts_msacc_key,"erts_msacc_key");
+#else
+    erts_msacc = NULL;
+#endif
+}
+
+void erts_msacc_init(void) {
+    int i;
+    erts_msacc_state_atoms = erts_alloc(ERTS_ALC_T_MSACC,
+                                        sizeof(Eterm)*ERTS_MSACC_STATE_COUNT);
+    for (i = 0; i < ERTS_MSACC_STATE_COUNT; i++) {
+        erts_msacc_state_atoms[i] = am_atom_put(erts_msacc_states[i],
+                                                strlen(erts_msacc_states[i]));
+    }
+}
+
+void erts_msacc_init_thread(char *type, int id, int managed) {
+    ErtsMsAcc *msacc;
+
+    msacc = erts_alloc(ERTS_ALC_T_MSACC, sizeof(ErtsMsAcc));
+
+    msacc->type = strdup(type);
+    msacc->id = make_small(id);
+    msacc->unmanaged = !managed;
+    msacc->tid = erts_thr_self();
+    msacc->perf_counter = 0;
+
+#ifdef USE_THREADS
+    erts_rwmtx_rwlock(&msacc_mutex);
+    if (!managed) {
+        erts_mtx_init(&msacc->mtx,"msacc_unmanaged_mutex");
+        msacc->next = msacc_unmanaged;
+        msacc_unmanaged = msacc;
+        msacc_unmanaged_count++;
+        ERTS_MSACC_TSD_SET(msacc);
+    } else {
+        msacc->next = msacc_managed;
+        msacc_managed = msacc;
+    }
+    erts_rwmtx_rwunlock(&msacc_mutex);
+#else
+    msacc_managed = msacc;
+#endif
+
+    erts_msacc_reset(msacc);
+
+#ifdef ERTS_MSACC_ALWAYS_ON
+    ERTS_MSACC_TSD_SET(msacc);
+    msacc->perf_counter = erts_sys_perf_counter();
+    msacc->state = ERTS_MSACC_STATE_OTHER;
+#endif
+}
+
+/*
+ * Creates a structure looking like this
+ * #{ type => scheduler, id => 1, counters => #{ State1 => Counter1 ... StateN => CounterN}}
+ */
+static
+Eterm erts_msacc_gather_stats(ErtsMsAcc *msacc, Eterm **hpp, Uint *szp) {
+    int i;
+    Eterm *hp;
+    Eterm key, state_key, state_map;
+    Eterm res = THE_NON_VALUE;
+    flatmap_t *map;
+
+    if (szp) {
+      *szp += MAP_HEADER_FLATMAP_SZ + 1 + 2*(3);
+      *szp += MAP_HEADER_FLATMAP_SZ + 1 + 2*(ERTS_MSACC_STATE_COUNT);
+      for (i = 0; i < ERTS_MSACC_STATE_COUNT; i++) {
+          (void)erts_bld_sint64(NULL,szp,(Sint64)msacc->perf_counters[i]);
+#ifdef ERTS_MSACC_STATE_COUNTERS
+          (void)erts_bld_uint64(NULL,szp,msacc->state_counters[i]);
+          *szp += 3; /* tuple to put state+perf counter in */
+#endif
+      }
+    }
+
+    if (hpp) {
+        Eterm counters[ERTS_MSACC_STATE_COUNT];
+        hp = *hpp;
+        for (i = 0; i < ERTS_MSACC_STATE_COUNT; i++) {
+            Eterm counter = erts_bld_sint64(&hp,NULL,(Sint64)msacc->perf_counters[i]);
+#ifdef ERTS_MSACC_STATE_COUNTERS
+            Eterm counter__ = erts_bld_uint64(&hp,NULL,msacc->state_counters[i]);
+            counters[i] = TUPLE2(hp,counter,counter__);
+            hp += 3;
+#else
+            counters[i] = counter;
+#endif
+        }
+
+      key = TUPLE3(hp,am_counters,am_id,am_type);
+      hp += 4;
+
+      state_key = make_tuple(hp);
+      hp[0] = make_arityval(ERTS_MSACC_STATE_COUNT);
+      
+      for (i = 0; i < ERTS_MSACC_STATE_COUNT; i++)
+        hp[1+i] = erts_msacc_state_atoms[i];
+      hp += 1 + ERTS_MSACC_STATE_COUNT;
+
+      map = (flatmap_t*)hp;
+      hp += MAP_HEADER_FLATMAP_SZ;
+      map->thing_word = MAP_HEADER_FLATMAP;
+      map->size = ERTS_MSACC_STATE_COUNT;
+      map->keys = state_key;
+      for (i = 0; i < ERTS_MSACC_STATE_COUNT; i++)
+            hp[i] = counters[i];
+      hp += ERTS_MSACC_STATE_COUNT;
+      state_map = make_flatmap(map);
+
+      map = (flatmap_t*)hp;
+      hp += MAP_HEADER_FLATMAP_SZ;
+      map->thing_word = MAP_HEADER_FLATMAP;
+      map->size = 3;
+      map->keys = key;
+      hp[0] = state_map;
+      hp[1] = msacc->id;
+      hp[2] = am_atom_put(msacc->type,strlen(msacc->type));
+      hp += 3;
+
+      *hpp = hp;
+      res = make_flatmap(map);
+    }
+
+    return res;
+}
+
+typedef struct {
+    int action;
+    Process *proc;
+    Eterm ref;
+    Eterm ref_heap[REF_THING_SIZE];
+    Uint req_sched;
+    erts_smp_atomic32_t refc;
+} ErtsMSAccReq;
+
+static ErtsMsAcc* get_msacc(void) {
+    ErtsMsAcc *msacc;
+    erts_rwmtx_rlock(&msacc_mutex);
+    msacc = msacc_managed;
+    while (!erts_equal_tids(msacc->tid,erts_thr_self())) {
+        msacc = msacc->next;
+        ASSERT(msacc != NULL);
+    }
+    erts_rwmtx_runlock(&msacc_mutex);
+    return msacc;
+}
+
+static void send_reply(ErtsMsAcc *msacc, ErtsMSAccReq *msaccrp) {
+    ErtsSchedulerData *esdp = erts_get_scheduler_data();
+    Process *rp = msaccrp->proc;
+    ErtsMessage *msgp = NULL;
+    Eterm **hpp, *hp;
+    Eterm ref_copy = NIL, msg;
+    Uint sz, *szp;
+    ErlOffHeap *ohp = NULL;
+    ErtsProcLocks rp_locks = (esdp && msaccrp->req_sched == esdp->no
+                              ? ERTS_PROC_LOCK_MAIN : 0);
+
+    sz = 0;
+    hpp = NULL;
+    szp = &sz;
+
+    if (msacc->unmanaged) erts_mtx_lock(&msacc->mtx);
+
+    while (1) {
+	if (hpp)
+            ref_copy = STORE_NC(hpp, ohp, msaccrp->ref);
+	else
+            *szp += REF_THING_SIZE;
+
+	if (msaccrp->action != ERTS_MSACC_GATHER)
+            msg = ref_copy;
+	else {
+            msg = erts_msacc_gather_stats(msacc, hpp, szp);
+            msg = erts_bld_tuple(hpp, szp, 2, ref_copy, msg);
+	}
+	if (hpp)
+            break;
+
+	msgp = erts_alloc_message_heap(rp, &rp_locks, sz, &hp, &ohp);
+        hpp = &hp;
+	szp = NULL;
+    }
+
+    if (msacc->unmanaged) erts_mtx_unlock(&msacc->mtx);
+
+    erts_queue_message(rp, &rp_locks, msgp, msg, NIL);
+
+    if (esdp && msaccrp->req_sched == esdp->no)
+	rp_locks &= ~ERTS_PROC_LOCK_MAIN;
+
+    if (rp_locks)
+	erts_smp_proc_unlock(rp, rp_locks);
+
+}
+
+static void
+reply_msacc(void *vmsaccrp)
+{
+    ErtsMsAcc *msacc = ERTS_MSACC_TSD_GET();
+    ErtsMSAccReq *msaccrp = (ErtsMSAccReq *) vmsaccrp;
+
+    ASSERT(!msacc || !msacc->unmanaged);
+
+    if (msaccrp->action == ERTS_MSACC_ENABLE && !msacc) {
+        msacc = get_msacc();
+
+        msacc->perf_counter = erts_sys_perf_counter();
+
+        msacc->state = ERTS_MSACC_STATE_OTHER;
+
+        ERTS_MSACC_TSD_SET(msacc);
+
+    } else if (msaccrp->action == ERTS_MSACC_DISABLE && msacc) {
+        ERTS_MSACC_TSD_SET(NULL);
+    } else if (msaccrp->action == ERTS_MSACC_RESET) {
+        msacc = msacc ? msacc : get_msacc();
+        erts_msacc_reset(msacc);
+    } else if (msaccrp->action == ERTS_MSACC_GATHER && !msacc) {
+        msacc = get_msacc();
+    }
+
+    ASSERT(!msacc || !msacc->unmanaged);
+
+    send_reply(msacc, msaccrp);
+
+    erts_proc_dec_refc(msaccrp->proc);
+
+    if (erts_smp_atomic32_dec_read_nob(&msaccrp->refc) == 0)
+      erts_free(ERTS_ALC_T_MSACC, vmsaccrp);
+}
+
+static void erts_msacc_reset(ErtsMsAcc *msacc) {
+  int i;
+  if (msacc->unmanaged) erts_mtx_lock(&msacc->mtx);
+
+  for (i = 0; i < ERTS_MSACC_STATE_COUNT; i++) {
+      msacc->perf_counters[i] = 0;
+#ifdef ERTS_MSACC_STATE_COUNTERS
+      msacc->state_counters[i] = 0;
+#endif
+  }
+
+  if (msacc->unmanaged) erts_mtx_unlock(&msacc->mtx);
+}
+
+#endif /* ERTS_ENABLE_MSACC */
+
+
+/*
+ * This function is responsible for enabling, disabling, resetting and
+ * gathering data related to microstate accounting.
+ *
+ * Managed threads and unmanaged threads are handled differently.
+ *   - managed threads get a misc_aux job telling them to switch on msacc
+ *   - unmanaged have some fields protected by a mutex that has to be taken
+ *     before any values can be updated
+ *
+ * For performance reasons there is also a global value erts_msacc_enabled
+ * that controls the state of all threads. Statistics gathering is only on
+ * if erts_msacc_enabled && msacc is true.
+ */
+Eterm
+erts_msacc_request(Process *c_p, int action, Eterm *threads)
+{
+#ifdef ERTS_ENABLE_MSACC
+    ErtsMsAcc *msacc =  ERTS_MSACC_TSD_GET();
+    ErtsSchedulerData *esdp = ERTS_PROC_GET_SCHDATA(c_p);
+    Eterm ref;
+    ErtsMSAccReq *msaccrp;
+    Eterm *hp;
+
+
+#ifdef ERTS_MSACC_ALWAYS_ON
+    if (action == ERTS_MSACC_ENABLE || action == ERTS_MSACC_DISABLE)
+        return THE_NON_VALUE;
+#else
+    /* take care of double enable, and double disable here */
+    if (msacc && action == ERTS_MSACC_ENABLE) {
+        return THE_NON_VALUE;
+    } else if (!msacc && action == ERTS_MSACC_DISABLE) {
+        return THE_NON_VALUE;
+    }
+#endif
+
+    ref = erts_make_ref(c_p);
+
+    msaccrp = erts_alloc(ERTS_ALC_T_MSACC, sizeof(ErtsMSAccReq));
+    hp = &msaccrp->ref_heap[0];
+
+    msaccrp->action = action;
+    msaccrp->proc = c_p;
+    msaccrp->ref = STORE_NC(&hp, NULL, ref);
+    msaccrp->req_sched = esdp->no;
+
+#ifdef ERTS_SMP
+    *threads = erts_no_schedulers;
+    *threads += 1; /* aux thread */
+#else
+    *threads = 1;
+#endif
+
+    erts_smp_atomic32_init_nob(&msaccrp->refc,(erts_aint32_t)*threads);
+
+    erts_proc_add_refc(c_p, *threads);
+
+    if (erts_no_schedulers > 1)
+	erts_schedule_multi_misc_aux_work(1,
+                                          erts_no_schedulers,
+                                          reply_msacc,
+                                          (void *) msaccrp);
+#ifdef ERTS_SMP
+    /* aux thread */
+    erts_schedule_misc_aux_work(0, reply_msacc, (void *) msaccrp);
+#endif
+
+#ifdef USE_THREADS
+    /* Manage unmanaged threads */
+    switch (action) {
+    case ERTS_MSACC_GATHER: {
+        Uint unmanaged_count;
+        ErtsMsAcc *msacc, **unmanaged;
+        int i = 0;
+
+        /* we copy a list of pointers here so that we do not have to have
+           the msacc_mutex when sending messages */
+        erts_rwmtx_rlock(&msacc_mutex);
+        unmanaged_count = msacc_unmanaged_count;
+        unmanaged = erts_alloc(ERTS_ALC_T_MSACC,
+                               sizeof(ErtsMsAcc*)*unmanaged_count);
+
+        for (i = 0, msacc = msacc_unmanaged;
+             i < unmanaged_count;
+             i++, msacc = msacc->next) {
+            unmanaged[i] = msacc;
+        }
+        erts_rwmtx_runlock(&msacc_mutex);
+
+        for (i = 0; i < unmanaged_count; i++) {
+            erts_mtx_lock(&unmanaged[i]->mtx);
+            if (unmanaged[i]->perf_counter) {
+                ErtsSysPerfCounter perf_counter;
+                /* if enabled update stats */
+                perf_counter = erts_sys_perf_counter();
+                unmanaged[i]->perf_counters[unmanaged[i]->state] +=
+                    perf_counter - unmanaged[i]->perf_counter;
+                unmanaged[i]->perf_counter = perf_counter;
+            }
+            erts_mtx_unlock(&unmanaged[i]->mtx);
+            send_reply(unmanaged[i],msaccrp);
+        }
+        erts_free(ERTS_ALC_T_MSACC,unmanaged);
+        /* We have just sent unmanaged_count messages, so bump no of threads */
+        *threads += unmanaged_count;
+        break;
+    }
+    case ERTS_MSACC_RESET: {
+        ErtsMsAcc *msacc;
+        erts_rwmtx_rlock(&msacc_mutex);
+        for (msacc = msacc_unmanaged; msacc != NULL; msacc = msacc->next)
+            erts_msacc_reset(msacc);
+        erts_rwmtx_runlock(&msacc_mutex);
+        break;
+    }
+    case ERTS_MSACC_ENABLE: {
+        erts_rwmtx_rlock(&msacc_mutex);
+        for (msacc = msacc_unmanaged; msacc != NULL; msacc = msacc->next) {
+            erts_mtx_lock(&msacc->mtx);
+            msacc->perf_counter = erts_sys_perf_counter();
+            /* we assume the unmanaged thread is sleeping */
+            msacc->state = ERTS_MSACC_STATE_SLEEP;
+            erts_mtx_unlock(&msacc->mtx);
+        }
+        erts_rwmtx_runlock(&msacc_mutex);
+        break;
+    }
+    case ERTS_MSACC_DISABLE: {
+        ErtsSysPerfCounter perf_counter;
+        erts_rwmtx_rlock(&msacc_mutex);
+        /* make sure to update stats with latest results */
+        for (msacc = msacc_unmanaged; msacc != NULL; msacc = msacc->next) {
+            erts_mtx_lock(&msacc->mtx);
+            perf_counter = erts_sys_perf_counter();
+            msacc->perf_counters[msacc->state] += perf_counter - msacc->perf_counter;
+            msacc->perf_counter = 0;
+            erts_mtx_unlock(&msacc->mtx);
+        }
+        erts_rwmtx_runlock(&msacc_mutex);
+        break;
+    }
+    default: { ASSERT(0); }
+    }
+
+#endif
+
+    *threads = make_small(*threads);
+
+    reply_msacc((void *) msaccrp);
+
+#ifndef ERTS_MSACC_ALWAYS_ON
+    /* enable/disable the global value */
+    if (action == ERTS_MSACC_ENABLE) {
+        erts_msacc_enabled = 1;
+    } else if (action == ERTS_MSACC_DISABLE) {
+        erts_msacc_enabled = 0;
+    }
+#endif
+
+    return ref;
+#else
+    return THE_NON_VALUE;
+#endif
+}
diff --git a/erts/emulator/beam/erl_msacc.h b/erts/emulator/beam/erl_msacc.h
new file mode 100644
index 0000000000..284388f7aa
--- /dev/null
+++ b/erts/emulator/beam/erl_msacc.h
@@ -0,0 +1,409 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2014-2015. 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%
+ */
+
+#ifndef ERL_MSACC_H__
+#define ERL_MSACC_H__
+
+/* Can be enabled/disabled via configure */
+#if ERTS_ENABLE_MSACC == 2
+#define ERTS_MSACC_EXTENDED_STATES 1
+#endif
+
+/* Uncomment this to also count the number of
+   transitions to a state. This will add a count
+   to the counter map. */
+/* #define ERTS_MSACC_STATE_COUNTERS 1 */
+
+/* Uncomment this to make msacc to always be on,
+   this reduces overhead a little bit when profiling */
+/* #define ERTS_MSACC_ALWAYS_ON 1 */
+
+#define ERTS_MSACC_DISABLE 0
+#define ERTS_MSACC_ENABLE  1
+#define ERTS_MSACC_RESET   2
+#define ERTS_MSACC_GATHER  3
+
+/*
+ * When adding a new state, you have to:
+ * * Add it here
+ * * Increment ERTS_MSACC_STATE_COUNT
+ * * Add string value to erts_msacc_states
+ * * Have to be in alphabetical order!
+ * * Only add states to the non-extended section after
+ *   careful benchmarking to make sure the overhead
+ *   when disabled is minimal.
+ */
+
+#ifndef ERTS_MSACC_EXTENDED_STATES
+#define ERTS_MSACC_STATE_AUX       0
+#define ERTS_MSACC_STATE_CHECK_IO  1
+#define ERTS_MSACC_STATE_EMULATOR  2
+#define ERTS_MSACC_STATE_GC        3
+#define ERTS_MSACC_STATE_OTHER     4
+#define ERTS_MSACC_STATE_PORT      5
+#define ERTS_MSACC_STATE_SLEEP     6
+
+#define ERTS_MSACC_STATE_COUNT 7
+
+#if ERTS_MSACC_STATE_STRINGS && ERTS_ENABLE_MSACC
+static char *erts_msacc_states[] = {
+    "aux",
+    "check_io",
+    "emulator",
+    "gc",
+    "other",
+    "port",
+    "sleep"
+};
+#endif
+
+#else
+
+#define ERTS_MSACC_STATE_ALLOC     0
+#define ERTS_MSACC_STATE_AUX       1
+#define ERTS_MSACC_STATE_BIF       2
+#define ERTS_MSACC_STATE_BUSY_WAIT 3
+#define ERTS_MSACC_STATE_CHECK_IO  4
+#define ERTS_MSACC_STATE_EMULATOR  5
+#define ERTS_MSACC_STATE_ETS       6
+#define ERTS_MSACC_STATE_GC        7
+#define ERTS_MSACC_STATE_GC_FULL   8
+#define ERTS_MSACC_STATE_NIF       9
+#define ERTS_MSACC_STATE_OTHER     10
+#define ERTS_MSACC_STATE_PORT      11
+#define ERTS_MSACC_STATE_SEND      12
+#define ERTS_MSACC_STATE_SLEEP     13
+#define ERTS_MSACC_STATE_TIMERS    14
+
+#define ERTS_MSACC_STATE_COUNT 15
+
+#if ERTS_MSACC_STATE_STRINGS
+static char *erts_msacc_states[] = {
+    "alloc",
+    "aux",
+    "bif",
+    "busy_wait",
+    "check_io",
+    "emulator",
+    "ets",
+    "gc",
+    "gc_full",
+    "nif",
+    "other",
+    "port",
+    "send",
+    "sleep",
+    "timers"
+};
+#endif
+
+#endif
+
+typedef struct erl_msacc_t_ ErtsMsAcc;
+
+struct erl_msacc_t_ {
+
+    /* the the values below are protected by mtx iff unmanaged = 1 */
+    ErtsSysPerfCounter perf_counter;
+    ErtsSysPerfCounter perf_counters[ERTS_MSACC_STATE_COUNT];
+#ifdef ERTS_MSACC_STATE_COUNTERS
+    Uint64 state_counters[ERTS_MSACC_STATE_COUNT];
+#endif
+    Uint state;
+
+    /* protected by msacc_mutex in erl_msacc.c, and should be constant */
+    int unmanaged;
+    erts_mtx_t mtx;
+    ErtsMsAcc *next;
+    erts_tid_t tid;
+    Eterm id;
+    char *type;
+};
+
+#if ERTS_ENABLE_MSACC
+
+#define ERTS_MSACC_INLINE ERTS_GLB_INLINE
+
+#ifdef USE_THREADS
+extern erts_tsd_key_t erts_msacc_key;
+#else
+extern ErtsMsAcc *erts_msacc;
+#endif
+
+#ifdef ERTS_MSACC_ALWAYS_ON
+#define erts_msacc_enabled 1
+#else
+extern int erts_msacc_enabled;
+#endif
+
+#ifdef USE_THREADS
+#define ERTS_MSACC_TSD_GET() erts_tsd_get(erts_msacc_key)
+#define ERTS_MSACC_TSD_SET(tsd) erts_tsd_set(erts_msacc_key,tsd)
+#else
+#define ERTS_MSACC_TSD_GET() erts_msacc
+#define ERTS_MSACC_TSD_SET(tsd) erts_msacc = tsd
+#endif
+
+void erts_msacc_early_init(void);
+void erts_msacc_init(void);
+void erts_msacc_init_thread(char *type, int id, int liberty);
+
+/* The defines below are used to instrument the vm code
+ * with different state changes. There are two variants
+ * of each define. One that has a cached ErtsMsAcc *
+ * that it can use, and one that does not.
+ * The cached values are necessary to have in order to get
+ * low enough overhead when running without msacc enabled.
+ *
+ * The two most common patterns to use the function with are:
+ *
+ *   ERTS_MSACC_PUSH_AND_SET_STATE(ERTS_MSACC_STATE_NEWSTATE);
+ *     ... call other function in new state ...
+ *   ERTS_MSACC_POP_STATE();
+ *
+ * Note that the erts_msacc_push* function declare new variables, so
+ * to conform with C89 we have to call it in the beginning of a function.
+ * We might not want to change state it the beginning though, so we use this:
+ *
+ *   ERTS_MSACC_PUSH_STATE();
+ *     ... some other code ...
+ *   ERTS_MSACC_SET_STATE_CACHED(ERTS_MSACC_STATE_NEWSTATE);
+ *     ... call other function in new state ...
+ *   ERTS_MSACC_POP_STATE();
+ *
+ * Notice that we used the cached version of set_state as push_state already
+ * read the erts_msacc_enabled to the cache.
+ *
+ * Most macros also have other variants with the suffix _m which means that
+ * they are known to only be called in managed threads, or with the _x suffix
+ * which means that it should only be used in an emulator compiled with
+ * extended states.
+ *
+ * Here is a listing of the entire api:
+ *
+ *  void ERTS_MSACC_DECLARE_CACHE()
+ *  void ERTS_MSACC_UPDATE_CACHE()
+ *  void ERTS_MSACC_IS_ENABLED()
+ *  void ERTS_MSACC_IS_ENABLED_CACHED()
+ *
+ *  void ERTS_MSACC_PUSH_STATE()
+ *  void ERTS_MSACC_SET_STATE(int state)
+ *  void ERTS_MSACC_PUSH_AND_SET_STATE(int state)
+ *
+ *  void ERTS_MSACC_PUSH_STATE_CACHED()
+ *  void ERTS_MSACC_SET_STATE_CACHED(int state)
+ *  void ERTS_MSACC_PUSH_AND_SET_STATE_CACHED(int state)
+ *  void ERTS_MSACC_POP_STATE()
+ *
+ *  void ERTS_MSACC_PUSH_STATE_M()
+ *  void ERTS_MSACC_PUSH_STATE_CACHED_M()
+ *  void ERTS_MSACC_SET_STATE_CACHED_M(int state)
+ *  void ERTS_MSACC_SET_STATE_M(int state)
+ *  void ERTS_MSACC_POP_STATE_M()
+ *  void ERTS_MSACC_PUSH_AND_SET_STATE_M(int state)
+ *
+ *  Most functions are also available with an _x suffix that are only enabled
+ *  when using the extra states. If they are not, just add them to the end
+ *  of this file.
+ */
+
+/* cache handling functions */
+#define ERTS_MSACC_IS_ENABLED() ERTS_UNLIKELY(erts_msacc_enabled)
+#define ERTS_MSACC_DECLARE_CACHE()                                      \
+    ErtsMsAcc *ERTS_MSACC_UPDATE_CACHE();                                 \
+    ERTS_DECLARE_DUMMY(Uint __erts_msacc_state) = ERTS_MSACC_STATE_OTHER;
+#define ERTS_MSACC_IS_ENABLED_CACHED() ERTS_UNLIKELY(__erts_msacc_cache != NULL)
+#define ERTS_MSACC_UPDATE_CACHE()                                       \
+    __erts_msacc_cache = erts_msacc_enabled ? ERTS_MSACC_TSD_GET() : NULL
+
+
+/* The defines below implicitly declare and load a new cache */
+#define ERTS_MSACC_PUSH_STATE()                           \
+    ERTS_MSACC_DECLARE_CACHE();                           \
+    ERTS_MSACC_PUSH_STATE_CACHED()
+#define ERTS_MSACC_SET_STATE(state)                                     \
+    ERTS_MSACC_DECLARE_CACHE();                                         \
+    ERTS_MSACC_SET_STATE_CACHED(state)
+#define ERTS_MSACC_PUSH_AND_SET_STATE(state)                    \
+    ERTS_MSACC_PUSH_STATE(); ERTS_MSACC_SET_STATE_CACHED(state)
+
+/* The defines below need an already declared cache to work */
+#define ERTS_MSACC_PUSH_STATE_CACHED()                                  \
+    __erts_msacc_state = ERTS_MSACC_IS_ENABLED_CACHED() ?               \
+        erts_msacc_get_state_um__(__erts_msacc_cache) : ERTS_MSACC_STATE_OTHER
+#define ERTS_MSACC_SET_STATE_CACHED(state) \
+    if (ERTS_MSACC_IS_ENABLED_CACHED())                         \
+        erts_msacc_set_state_um__(__erts_msacc_cache, state, 1)
+#define ERTS_MSACC_PUSH_AND_SET_STATE_CACHED(state) \
+    ERTS_MSACC_PUSH_STATE_CACHED(); ERTS_MSACC_SET_STATE_CACHED(state)
+#define ERTS_MSACC_POP_STATE()                                          \
+    if (ERTS_MSACC_IS_ENABLED_CACHED())                                 \
+        erts_msacc_set_state_um__(__erts_msacc_cache, __erts_msacc_state, 0)
+
+/* Only use these defines when we know that we have in a managed thread */
+#define ERTS_MSACC_PUSH_STATE_M()                         \
+    ERTS_MSACC_DECLARE_CACHE();                           \
+    ERTS_MSACC_PUSH_STATE_CACHED_M()
+#define ERTS_MSACC_PUSH_STATE_CACHED_M()                                \
+    __erts_msacc_state = ERTS_MSACC_IS_ENABLED_CACHED() ?    \
+        erts_msacc_get_state_m__(__erts_msacc_cache) : ERTS_MSACC_STATE_OTHER
+#define ERTS_MSACC_SET_STATE_M(state)                   \
+    ERTS_MSACC_DECLARE_CACHE();                         \
+    ERTS_MSACC_SET_STATE_CACHED_M(state)
+#define ERTS_MSACC_SET_STATE_CACHED_M(state)            \
+    if (ERTS_MSACC_IS_ENABLED_CACHED())      \
+        erts_msacc_set_state_m__(__erts_msacc_cache, state, 1)
+#define ERTS_MSACC_POP_STATE_M()                                  \
+    if (ERTS_MSACC_IS_ENABLED_CACHED())                      \
+        erts_msacc_set_state_m__(__erts_msacc_cache, __erts_msacc_state, 0)
+#define ERTS_MSACC_PUSH_AND_SET_STATE_M(state)                    \
+    ERTS_MSACC_PUSH_STATE_M(); ERTS_MSACC_SET_STATE_CACHED_M(state)
+
+ERTS_MSACC_INLINE
+void erts_msacc_set_state_um__(ErtsMsAcc *msacc,Uint state,int increment);
+ERTS_MSACC_INLINE
+void erts_msacc_set_state_m__(ErtsMsAcc *msacc,Uint state,int increment);
+
+ERTS_MSACC_INLINE
+Uint erts_msacc_get_state_um__(ErtsMsAcc *msacc);
+ERTS_MSACC_INLINE
+Uint erts_msacc_get_state_m__(ErtsMsAcc *msacc);
+
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_MSACC_INLINE
+Uint erts_msacc_get_state_um__(ErtsMsAcc *msacc) {
+    Uint state;
+    if (msacc->unmanaged)
+        erts_mtx_lock(&msacc->mtx);
+    state = msacc->state;
+    if (msacc->unmanaged)
+        erts_mtx_unlock(&msacc->mtx);
+    return state;
+}
+
+ERTS_MSACC_INLINE
+Uint erts_msacc_get_state_m__(ErtsMsAcc *msacc) {
+    return msacc->state;
+}
+
+ERTS_MSACC_INLINE
+void erts_msacc_set_state_um__(ErtsMsAcc *msacc, Uint new_state, int increment) {
+    if (ERTS_UNLIKELY(msacc->unmanaged)) {
+        erts_mtx_lock(&msacc->mtx);
+        msacc->state = new_state;
+        if (ERTS_LIKELY(!msacc->perf_counter)) {
+            erts_mtx_unlock(&msacc->mtx);
+            return;
+        }
+    }
+
+    erts_msacc_set_state_m__(msacc,new_state,increment);
+
+    if (ERTS_UNLIKELY(msacc->unmanaged))
+        erts_mtx_unlock(&msacc->mtx);
+}
+
+ERTS_MSACC_INLINE
+void erts_msacc_set_state_m__(ErtsMsAcc *msacc, Uint new_state, int increment) {
+    ErtsSysPerfCounter prev_perf_counter;
+    Sint64 diff;
+
+    if (new_state == msacc->state)
+        return;
+
+    prev_perf_counter = msacc->perf_counter;
+    msacc->perf_counter = erts_sys_perf_counter();
+    diff = msacc->perf_counter - prev_perf_counter;
+    ASSERT(diff >= 0);
+    msacc->perf_counters[msacc->state] += diff;
+#ifdef ERTS_MSACC_STATE_COUNTERS
+    msacc->state_counters[new_state] += increment;
+#endif
+    msacc->state = new_state;
+}
+
+#endif /* ERTS_GLB_INLINE_INCL_FUNC_DEF */
+
+#else
+
+#define ERTS_MSACC_IS_ENABLED() 0
+#define erts_msacc_early_init()
+#define erts_msacc_init()
+#define erts_msacc_init_thread(type, id, liberty)
+#define ERTS_MSACC_PUSH_STATE()
+#define ERTS_MSACC_PUSH_STATE_CACHED()
+#define ERTS_MSACC_POP_STATE()
+#define ERTS_MSACC_SET_STATE(state)
+#define ERTS_MSACC_SET_STATE_CACHED(state)
+#define ERTS_MSACC_PUSH_AND_SET_STATE(state)
+#define ERTS_MSACC_PUSH_AND_SET_STATE_CACHED(state)
+#define ERTS_MSACC_UPDATE_CACHE()
+#define ERTS_MSACC_IS_ENABLED_CACHED()
+#define ERTS_MSACC_DECLARE_CACHE()
+#define ERTS_MSACC_PUSH_STATE_M()
+#define ERTS_MSACC_PUSH_STATE_CACHED_M()
+#define ERTS_MSACC_SET_STATE_CACHED_M(state)
+#define ERTS_MSACC_POP_STATE_M()
+#define ERTS_MSACC_PUSH_AND_SET_STATE_M(state)
+
+
+#endif /* ERTS_ENABLE_MSACC */
+
+#ifndef ERTS_MSACC_EXTENDED_STATES
+
+#define ERTS_MSACC_PUSH_STATE_X()
+#define ERTS_MSACC_POP_STATE_X()
+#define ERTS_MSACC_SET_STATE_X(state)
+#define ERTS_MSACC_SET_STATE_M_X(state)
+#define ERTS_MSACC_SET_STATE_CACHED_X(state)
+#define ERTS_MSACC_PUSH_AND_SET_STATE_X(state)
+#define ERTS_MSACC_PUSH_AND_SET_STATE_CACHED_X(state)
+#define ERTS_MSACC_UPDATE_CACHE_X()
+#define ERTS_MSACC_IS_ENABLED_CACHED_X() 0
+#define ERTS_MSACC_DECLARE_CACHE_X()
+#define ERTS_MSACC_PUSH_STATE_M_X()
+#define ERTS_MSACC_PUSH_STATE_CACHED_M_X()
+#define ERTS_MSACC_SET_STATE_CACHED_M_X(state)
+#define ERTS_MSACC_POP_STATE_M_X()
+#define ERTS_MSACC_PUSH_AND_SET_STATE_M_X(state)
+
+#else
+
+#define ERTS_MSACC_PUSH_STATE_X() ERTS_MSACC_PUSH_STATE()
+#define ERTS_MSACC_POP_STATE_X() ERTS_MSACC_POP_STATE()
+#define ERTS_MSACC_SET_STATE_X(state) ERTS_MSACC_SET_STATE(state)
+#define ERTS_MSACC_SET_STATE_M_X(state) ERTS_MSACC_SET_STATE_M(state)
+#define ERTS_MSACC_SET_STATE_CACHED_X(state) ERTS_MSACC_SET_STATE_CACHED(state)
+#define ERTS_MSACC_PUSH_AND_SET_STATE_X(state) ERTS_MSACC_PUSH_AND_SET_STATE(state)
+#define ERTS_MSACC_PUSH_AND_SET_STATE_CACHED_X(state) ERTS_MSACC_PUSH_AND_SET_STATE_CACHED(state)
+#define ERTS_MSACC_UPDATE_CACHE_X() ERTS_MSACC_UPDATE_CACHE()
+#define ERTS_MSACC_IS_ENABLED_CACHED_X() ERTS_MSACC_IS_ENABLED_CACHED()
+#define ERTS_MSACC_DECLARE_CACHE_X() ERTS_MSACC_DECLARE_CACHE()
+#define ERTS_MSACC_PUSH_STATE_M_X() ERTS_MSACC_PUSH_STATE_M()
+#define ERTS_MSACC_PUSH_STATE_CACHED_M_X() ERTS_MSACC_PUSH_STATE_CACHED_M()
+#define ERTS_MSACC_SET_STATE_CACHED_M_X(state) ERTS_MSACC_SET_STATE_CACHED_M(state)
+#define ERTS_MSACC_POP_STATE_M_X() ERTS_MSACC_POP_STATE_M()
+#define ERTS_MSACC_PUSH_AND_SET_STATE_M_X(state) ERTS_MSACC_PUSH_AND_SET_STATE_M(state)
+
+#endif /* !ERTS_MSACC_EXTENDED_STATES */
+
+#endif /* ERL_MSACC_H__ */
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index d7a2076d85..d3030070b7 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -209,6 +209,7 @@ static void flush_env(ErlNifEnv* env)
 */
 static void cache_env(ErlNifEnv* env)
 {
+    env->heap_frag = MBUF(env->proc);
     if (env->heap_frag == NULL) {
 	ASSERT(env->hp_end == HEAP_LIMIT(env->proc));
 	ASSERT(env->hp <= HEAP_TOP(env->proc));
@@ -216,10 +217,6 @@ static void cache_env(ErlNifEnv* env)
 	env->hp = HEAP_TOP(env->proc);
     }
     else {
-	ASSERT(env->hp_end != HEAP_LIMIT(env->proc));
-	ASSERT(env->hp_end - env->hp <= env->heap_frag->alloc_size);       
-	env->heap_frag = MBUF(env->proc);
-	ASSERT(env->heap_frag != NULL);
 	env->hp = env->heap_frag->mem + env->heap_frag->used_size;
 	env->hp_end = env->heap_frag->mem + env->heap_frag->alloc_size;
     }
@@ -314,6 +311,7 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
     ErtsProcLocks rp_locks = 0;
     Process* rp;
     Process* c_p;
+    ErtsMessage *mp;
     ErlHeapFragment* frags;
     Eterm receiver = to_pid->pid;
     int flush_me = 0;
@@ -330,7 +328,7 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
 #ifdef ERTS_SMP
 	c_p = NULL;
 #else
-	erl_exit(ERTS_ABORT_EXIT,"enif_send: env==NULL on non-SMP VM");
+	erts_exit(ERTS_ABORT_EXIT,"enif_send: env==NULL on non-SMP VM");
 #endif
     }    
 
@@ -347,7 +345,7 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
     ASSERT(frags == MBUF(&menv->phony_proc));
     if (frags != NULL) {
 	/* Move all offheap's from phony proc to the first fragment.
-	   Quick and dirty, but erts_move_msg_mbuf_to_heap doesn't care. */
+	   Quick and dirty... */
 	ASSERT(!is_offheap(&frags->off_heap));
 	frags->off_heap = MSO(&menv->phony_proc);
 	clear_offheap(&MSO(&menv->phony_proc));
@@ -359,7 +357,9 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
     if (flush_me) {	
 	flush_env(env); /* Needed for ERTS_HOLE_CHECK */ 
     }
-    erts_queue_message(rp, &rp_locks, frags, msg, am_undefined);
+    mp = erts_alloc_message(0, NULL);
+    mp->data.heap_frag = frags;
+    erts_queue_message(rp, &rp_locks, mp, msg, am_undefined);
     if (c_p == rp)
 	rp_locks &= ~ERTS_PROC_LOCK_MAIN;
     if (rp_locks)
@@ -372,13 +372,46 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
     return 1;
 }
 
+int
+enif_port_command(ErlNifEnv *env, const ErlNifPort* to_port,
+                  ErlNifEnv *msg_env, ERL_NIF_TERM msg)
+{
+
+    ErtsSchedulerData *esdp = erts_get_scheduler_data();
+    int scheduler = esdp ? esdp->no : 0;
+    Port *prt;
+
+    if (scheduler == 0 || !env)
+        return 0;
+
+    prt = erts_port_lookup(to_port->port_id,
+                           (erts_port_synchronous_ops
+                            ? ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP
+                            : ERTS_PORT_SFLGS_INVALID_LOOKUP));
+
+    if (!prt)
+        return 0;
+
+    return erts_port_output_async(prt, env->proc->common.id, msg);
+}
+
 ERL_NIF_TERM enif_make_copy(ErlNifEnv* dst_env, ERL_NIF_TERM src_term)
 {
     Uint sz;
     Eterm* hp;
+#ifdef SHCOPY
+    erts_shcopy_t info;
+    INITIALIZE_SHCOPY(info);
+    sz = copy_shared_calculate(src_term, &info);
+    hp = alloc_heap(dst_env, sz);
+    src_term = copy_shared_perform(src_term, sz, &info, &hp, &MSO(dst_env->proc));
+    DESTROY_SHCOPY(info);
+    return src_term;
+#else
     sz = size_object(src_term);
     hp = alloc_heap(dst_env, sz);
     return copy_struct(src_term, sz, &hp, &MSO(dst_env->proc));
+#endif
 }
 
 
@@ -391,12 +424,28 @@ static int is_offheap(const ErlOffHeap* oh)
 
 ErlNifPid* enif_self(ErlNifEnv* caller_env, ErlNifPid* pid)
 {
+    if (caller_env->proc->common.id == ERTS_INVALID_PID)
+        return NULL;
     pid->pid = caller_env->proc->common.id;
     return pid;
 }
+
 int enif_get_local_pid(ErlNifEnv* env, ERL_NIF_TERM term, ErlNifPid* pid)
 {
-    return is_internal_pid(term) ? (pid->pid=term, 1) : 0;
+    if (is_internal_pid(term)) {
+        pid->pid=term;
+        return 1;
+    }
+    return 0;
+}
+
+int enif_get_local_port(ErlNifEnv* env, ERL_NIF_TERM term, ErlNifPort* port)
+{
+    if (is_internal_port(term)) {
+        port->port_id=term;
+        return 1;
+    }
+    return 0;
 }
 
 int enif_is_atom(ErlNifEnv* env, ERL_NIF_TERM term)
@@ -609,6 +658,68 @@ unsigned char* enif_make_new_binary(ErlNifEnv* env, size_t size,
     return binary_bytes(*termp);
 }
 
+int enif_term_to_binary(ErlNifEnv *dst_env, ERL_NIF_TERM term,
+                        ErlNifBinary *bin)
+{
+    Sint size;
+    byte *bp;
+    Binary* refbin;
+
+    size = erts_encode_ext_size(term);
+    if (!enif_alloc_binary(size, bin))
+        return 0;
+
+    refbin = bin->ref_bin;
+
+    bp = bin->data;
+
+    erts_encode_ext(term, &bp);
+
+    bin->size = bp - bin->data;
+    refbin->orig_size = bin->size;
+
+    ASSERT(bin->data + bin->size == bp);
+
+    return 1;
+}
+
+size_t enif_binary_to_term(ErlNifEnv *dst_env,
+                           const unsigned char* data,
+                           size_t data_sz,
+                           ERL_NIF_TERM *term,
+                           ErlNifBinaryToTerm opts)
+{
+    Sint size;
+    ErtsHeapFactory factory;
+    byte *bp = (byte*) data;
+
+    ERTS_CT_ASSERT(ERL_NIF_BIN2TERM_SAFE == ERTS_DIST_EXT_BTT_SAFE);
+
+    if (opts & ~ERL_NIF_BIN2TERM_SAFE) {
+        return 0;
+    }
+    if ((size = erts_decode_ext_size(bp, data_sz)) < 0)
+        return 0;
+
+    if (size > 0) {
+        flush_env(dst_env);
+        erts_factory_proc_prealloc_init(&factory, dst_env->proc, size);
+    } else {
+        erts_factory_dummy_init(&factory);
+    }
+
+    *term = erts_decode_ext(&factory, &bp, (Uint32)opts);
+
+    if (is_non_value(*term)) {
+        return 0;
+    }
+    erts_factory_close(&factory);
+    cache_env(dst_env);
+
+    ASSERT(bp > data);
+    return bp - data;
+}
+
 int enif_is_identical(Eterm lhs, Eterm rhs)
 {
     return EQ(lhs,rhs);
@@ -898,8 +1009,13 @@ int enif_get_list_cell(ErlNifEnv* env, Eterm term, Eterm* head, Eterm* tail)
 
 int enif_get_list_length(ErlNifEnv* env, Eterm term, unsigned* len)
 {
-    if (is_not_list(term) && is_not_nil(term)) return 0;
-    *len = erts_list_length(term);
+    Sint i;
+    Uint u;
+
+    if ((i = erts_list_length(term)) < 0) return 0;
+    u = (Uint)i;
+    if ((unsigned)u != u) return 0;
+    *len = u;
     return 1;
 }
 
@@ -1140,6 +1256,103 @@ int enif_make_reverse_list(ErlNifEnv* env, ERL_NIF_TERM term, ERL_NIF_TERM *list
     return 1;
 }
 
+int enif_is_process_alive(ErlNifEnv* env, ErlNifPid *proc)
+{
+    ErtsProcLocks rp_locks = 0; /* We don't need any locks,
+                                   just to check if it is alive */
+    Eterm target = proc->pid;
+    Process* rp;
+    Process* c_p;
+    int scheduler = erts_get_scheduler_id() != 0;
+
+    if (env != NULL) {
+	c_p = env->proc;
+	if (target == c_p->common.id) {
+            /* We are alive! */
+	    return 1;
+	}
+    }
+    else {
+#ifdef ERTS_SMP
+	c_p = NULL;
+#else
+	erts_exit(ERTS_ABORT_EXIT,"enif_is_process_alive: "
+                  "env==NULL on non-SMP VM");
+#endif
+    }
+
+    rp = (scheduler
+	  ? erts_proc_lookup(target)
+	  : erts_pid2proc_opt(c_p, ERTS_PROC_LOCK_MAIN,
+			      target, rp_locks, ERTS_P2P_FLG_INC_REFC));
+    if (rp == NULL) {
+        ASSERT(env == NULL || target != c_p->common.id);
+	return 0;
+    } else {
+        if (!scheduler)
+            erts_proc_dec_refc(rp);
+        return 1;
+    }
+}
+
+int enif_is_port_alive(ErlNifEnv *env, ErlNifPort *port)
+{
+    /* only allowed if called from scheduler */
+    if (erts_get_scheduler_id() == 0)
+        erts_exit(ERTS_ABORT_EXIT,"enif_is_port_alive: called from non-scheduler");
+
+    return erts_port_lookup(
+        port->port_id,
+        (erts_port_synchronous_ops
+         ? ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP
+         : ERTS_PORT_SFLGS_INVALID_LOOKUP)) != NULL;
+}
+
+ERL_NIF_TERM
+enif_now_time(ErlNifEnv *env)
+{
+    Uint mega, sec, micro;
+    Eterm *hp;
+    get_now(&mega, &sec, &micro);
+    hp = alloc_heap(env, 4);
+    return TUPLE3(hp, make_small(mega), make_small(sec), make_small(micro));
+}
+
+ERL_NIF_TERM
+enif_cpu_time(ErlNifEnv *env)
+{
+#ifdef HAVE_ERTS_NOW_CPU
+    Uint mega, sec, micro;
+    Eterm *hp;
+    erts_get_now_cpu(&mega, &sec, &micro);
+    hp = alloc_heap(env, 4);
+    return TUPLE3(hp, make_small(mega), make_small(sec), make_small(micro));
+#else
+    return enif_make_badarg(env);
+#endif
+}
+
+ERL_NIF_TERM
+enif_make_unique_integer(ErlNifEnv *env, ErlNifUniqueInteger properties)
+{
+    int monotonic = properties & ERL_NIF_UNIQUE_MONOTONIC;
+    int positive = properties & ERL_NIF_UNIQUE_POSITIVE;
+    Eterm *hp;
+    Uint hsz;
+
+    if (monotonic) {
+        Sint64 raw_unique = erts_raw_get_unique_monotonic_integer();
+        hsz = erts_raw_unique_monotonic_integer_heap_size(raw_unique, positive);
+        hp = alloc_heap(env, hsz);
+        return erts_raw_make_unique_monotonic_integer_value(&hp, raw_unique, positive);
+    } else {
+        Uint64 raw_unique[ERTS_UNIQUE_INT_RAW_VALUES];
+        erts_raw_get_unique_integer(raw_unique);
+        hsz = erts_raw_unique_integer_heap_size(raw_unique, positive);
+        hp = alloc_heap(env, hsz);
+        return erts_raw_make_unique_integer(&hp, raw_unique, positive);
+    }
+}
 
 ErlNifMutex* enif_mutex_create(char *name) { return erl_drv_mutex_create(name); }
 void enif_mutex_destroy(ErlNifMutex *mtx) {  erl_drv_mutex_destroy(mtx); }
@@ -1175,6 +1388,26 @@ void enif_thread_exit(void *resp) { erl_drv_thread_exit(resp); }
 int enif_thread_join(ErlNifTid tid, void **respp) { return erl_drv_thread_join(tid,respp); }
 int enif_getenv(const char *key, char *value, size_t *value_size) { return erl_drv_getenv(key, value, value_size); }
 
+ErlNifTime enif_monotonic_time(ErlNifTimeUnit time_unit)
+{
+    return (ErlNifTime) erts_napi_monotonic_time((int) time_unit);
+}
+
+ErlNifTime enif_time_offset(ErlNifTimeUnit time_unit)
+{
+    return (ErlNifTime) erts_napi_time_offset((int) time_unit);
+}
+
+ErlNifTime
+enif_convert_time_unit(ErlNifTime val,
+		       ErlNifTimeUnit from,
+		       ErlNifTimeUnit to)
+{
+    return (ErlNifTime) erts_napi_convert_time_unit((ErtsMonotonicTime) val,
+						    (int) from,
+						    (int) to);
+}
+
 int enif_fprintf(void* filep, const char* format, ...) 
 { 
     int ret;
@@ -1615,7 +1848,7 @@ allocate_nif_sched_data(Process* proc, int argc)
 	ep->exp.addressv[i] = &ep->exp.code[3];
     }
     ep->exp.code[3] = (BeamInstr) em_call_nif;
-    (void) ERTS_PROC_SET_NIF_TRAP_EXPORT(proc, ERTS_PROC_LOCK_MAIN, ep);
+    (void) ERTS_PROC_SET_NIF_TRAP_EXPORT(proc, ep);
     return ep;
 }
 
@@ -1772,12 +2005,10 @@ execute_dirty_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
     ep = (NifExport*) ERTS_PROC_GET_NIF_TRAP_EXPORT(proc);
     ASSERT(ep);
     ep->fp = NULL;
+    erts_smp_atomic32_read_band_mb(&proc->state, ~(ERTS_PSFLG_DIRTY_CPU_PROC
+						   | ERTS_PSFLG_DIRTY_IO_PROC));
     result = (*fp)(env, argc, argv);
-    erts_smp_atomic32_read_band_mb(&proc->state,
-				   ~(ERTS_PSFLG_DIRTY_CPU_PROC
-				     |ERTS_PSFLG_DIRTY_IO_PROC
-				     |ERTS_PSFLG_DIRTY_CPU_PROC_IN_Q
-				     |ERTS_PSFLG_DIRTY_IO_PROC_IN_Q));
+
     if (erts_refc_dectest(&env->mod_nif->rt_dtor_cnt, 0) == 0 && env->mod_nif->mod == NULL)
 	close_lib(env->mod_nif);
     /*
@@ -1825,13 +2056,6 @@ schedule_dirty_nif(ErlNifEnv* env, int flags, int argc, const ERL_NIF_TERM argv[
     a = erts_smp_atomic32_read_acqb(&proc->state);
     while (1) {
 	n = state = a;
-	/*
-	 * clear any current dirty flags and dirty queue indicators,
-	 * in case the application is shifting a job from one type
-	 * of dirty scheduler to the other
-	 */
-	n &= ~(ERTS_PSFLG_DIRTY_CPU_PROC|ERTS_PSFLG_DIRTY_IO_PROC
-	       |ERTS_PSFLG_DIRTY_CPU_PROC_IN_Q|ERTS_PSFLG_DIRTY_IO_PROC_IN_Q);
 	if (flags == ERL_NIF_DIRTY_JOB_CPU_BOUND)
 	    n |= ERTS_PSFLG_DIRTY_CPU_PROC;
 	else
@@ -2231,17 +2455,17 @@ int enif_map_iterator_get_pair(ErlNifEnv *env,
  ***************************************************************************/
 
 
-static BeamInstr** get_func_pp(BeamInstr* mod_code, Eterm f_atom, unsigned arity)
+static BeamInstr** get_func_pp(BeamCodeHeader* mod_code, Eterm f_atom, unsigned arity)
 {
-    int n = (int) mod_code[MI_NUM_FUNCTIONS];
+    int n = (int) mod_code->num_functions;
     int j;
     for (j = 0; j < n; ++j) {
-	BeamInstr* code_ptr = (BeamInstr*) mod_code[MI_FUNCTIONS+j];
+	BeamInstr* code_ptr = (BeamInstr*) mod_code->functions[j];
 	ASSERT(code_ptr[0] == (BeamInstr) BeamOp(op_i_func_info_IaaI));
 	if (f_atom == ((Eterm) code_ptr[3])
 	    && arity == ((unsigned) code_ptr[4])) {
 
-	    return (BeamInstr**) &mod_code[MI_FUNCTIONS+j];
+	    return (BeamInstr**) &mod_code->functions[j];
 	}
     }
     return NULL;
@@ -2424,8 +2648,8 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2)
     if (init_func != NULL)
       handle = init_func;
 
-    if (!in_area(caller, mod->curr.code, mod->curr.code_length)) {
-	ASSERT(in_area(caller, mod->old.code, mod->old.code_length));
+    if (!in_area(caller, mod->curr.code_hdr, mod->curr.code_length)) {
+	ASSERT(in_area(caller, mod->old.code_hdr, mod->old.code_length));
 
 	ret = load_nif_error(BIF_P, "old_code", "Calling load_nif from old "
 			     "module '%T' not allowed", mod_atom);
@@ -2479,7 +2703,7 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2)
 	for (i=0; i < entry->num_of_funcs && ret==am_ok; i++) {
 	    BeamInstr** code_pp;
 	    if (!erts_atom_get(f->name, sys_strlen(f->name), &f_atom, ERTS_ATOM_ENC_LATIN1)
-		|| (code_pp = get_func_pp(mod->curr.code, f_atom, f->arity))==NULL) {
+		|| (code_pp = get_func_pp(mod->curr.code_hdr, f_atom, f->arity))==NULL) {
 		ret = load_nif_error(BIF_P,bad_lib,"Function not found %T:%s/%u",
 				     mod_atom, f->name, f->arity);
 	    }
@@ -2622,7 +2846,7 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2)
 	{
 	    BeamInstr* code_ptr;
 	    erts_atom_get(f->name, sys_strlen(f->name), &f_atom, ERTS_ATOM_ENC_LATIN1);
-	    code_ptr = *get_func_pp(mod->curr.code, f_atom, f->arity);
+	    code_ptr = *get_func_pp(mod->curr.code_hdr, f_atom, f->arity);
 
 	    if (code_ptr[1] == 0) {
 		code_ptr[5+0] = (BeamInstr) BeamOp(op_call_nif);
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h
index 5e39343e9b..bc1f59bc90 100644
--- a/erts/emulator/beam/erl_nif.h
+++ b/erts/emulator/beam/erl_nif.h
@@ -49,9 +49,10 @@
 **           add ErlNifFunc flags
 ** 2.8: 18.0 add enif_has_pending_exception
 ** 2.9: 18.2 enif_getenv
+** 2.10: Time API
 */
 #define ERL_NIF_MAJOR_VERSION 2
-#define ERL_NIF_MINOR_VERSION 9
+#define ERL_NIF_MINOR_VERSION 10
 
 /*
  * The emulator will refuse to load a nif-lib with a major version
@@ -67,63 +68,31 @@
 
 #include <stdlib.h>
 
-#ifdef SIZEOF_CHAR
-#  define SIZEOF_CHAR_SAVED__ SIZEOF_CHAR
-#  undef SIZEOF_CHAR
-#endif
-#ifdef SIZEOF_SHORT
-#  define SIZEOF_SHORT_SAVED__ SIZEOF_SHORT
-#  undef SIZEOF_SHORT
-#endif
-#ifdef SIZEOF_INT
-#  define SIZEOF_INT_SAVED__ SIZEOF_INT
-#  undef SIZEOF_INT
-#endif
-#ifdef SIZEOF_LONG
-#  define SIZEOF_LONG_SAVED__ SIZEOF_LONG
-#  undef SIZEOF_LONG
-#endif
-#ifdef SIZEOF_LONG_LONG
-#  define SIZEOF_LONG_LONG_SAVED__ SIZEOF_LONG_LONG
-#  undef SIZEOF_LONG_LONG
-#endif
-#ifdef HALFWORD_HEAP_EMULATOR
-#  define HALFWORD_HEAP_EMULATOR_SAVED__ HALFWORD_HEAP_EMULATOR
-#  undef HALFWORD_HEAP_EMULATOR
-#endif
-#include "erl_int_sizes_config.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if (defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_))
-typedef unsigned __int64 ErlNifUInt64;
-typedef __int64 ErlNifSInt64;
-#elif SIZEOF_LONG == 8
-typedef unsigned long ErlNifUInt64;
-typedef long ErlNifSInt64;
-#elif SIZEOF_LONG_LONG == 8
-typedef unsigned long long ErlNifUInt64;
-typedef long long ErlNifSInt64;
-#else
-#error No 64-bit integer type
-#endif
+typedef ErlNapiUInt64 ErlNifUInt64;
+typedef ErlNapiSInt64 ErlNifSInt64;
+typedef ErlNapiUInt ErlNifUInt;
+typedef ErlNapiSInt ErlNifSInt;
 
-#ifdef HALFWORD_HEAP_EMULATOR
-#  define ERL_NIF_VM_VARIANT "beam.halfword" 
-typedef unsigned int ERL_NIF_TERM;
-#else
 #  define ERL_NIF_VM_VARIANT "beam.vanilla" 
-#  if SIZEOF_LONG == SIZEOF_VOID_P
-typedef unsigned long ERL_NIF_TERM;
-#  elif SIZEOF_LONG_LONG == SIZEOF_VOID_P
-typedef unsigned long long ERL_NIF_TERM;
-#  endif
-#endif
+typedef ErlNifUInt ERL_NIF_TERM;
 
 typedef ERL_NIF_TERM ERL_NIF_UINT;
 
+typedef ErlNifSInt64 ErlNifTime;
+
+#define ERL_NIF_TIME_ERROR ((ErlNifSInt64) ERTS_NAPI_TIME_ERROR__)
+
+typedef enum {
+    ERL_NIF_SEC = ERTS_NAPI_SEC__,
+    ERL_NIF_MSEC = ERTS_NAPI_MSEC__,
+    ERL_NIF_USEC = ERTS_NAPI_USEC__,
+    ERL_NIF_NSEC = ERTS_NAPI_NSEC__
+} ErlNifTimeUnit;
+
 struct enif_environment_t;
 typedef struct enif_environment_t ErlNifEnv;
 
@@ -181,7 +150,12 @@ typedef enum
 typedef struct
 {
     ERL_NIF_TERM pid;  /* internal, may change */
-}ErlNifPid;
+} ErlNifPid;
+
+typedef struct
+{
+    ERL_NIF_TERM port_id;  /* internal, may change */
+}ErlNifPort;
 
 typedef ErlDrvSysInfo ErlNifSysInfo;
 
@@ -228,6 +202,15 @@ typedef enum {
     ERL_NIF_MAP_ITERATOR_TAIL = ERL_NIF_MAP_ITERATOR_LAST
 } ErlNifMapIteratorEntry;
 
+typedef enum {
+    ERL_NIF_UNIQUE_POSITIVE = (1 << 0),
+    ERL_NIF_UNIQUE_MONOTONIC = (1 << 1)
+} ErlNifUniqueInteger;
+
+typedef enum {
+    ERL_NIF_BIN2TERM_SAFE = 0x20000000
+} ErlNifBinaryToTerm;
+
 #if (defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_))
 #  define ERL_NIF_API_FUNC_DECL(RET_TYPE, NAME, ARGS) RET_TYPE (*NAME) ARGS
 typedef struct {
@@ -252,22 +235,28 @@ extern TWinDynNifCallbacks WinDynNifCallbacks;
 
 #if (defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_))
 #  define ERL_NIF_INIT_GLOB TWinDynNifCallbacks WinDynNifCallbacks;
-#  ifdef STATIC_ERLANG_NIF
-#    define ERL_NIF_INIT_DECL(MODNAME) __declspec(dllexport) ErlNifEntry* MODNAME ## _nif_init(TWinDynNifCallbacks* callbacks)
-#  else
-#    define ERL_NIF_INIT_DECL(MODNAME) __declspec(dllexport) ErlNifEntry* nif_init(TWinDynNifCallbacks* callbacks)
-#  endif
+#  define ERL_NIF_INIT_ARGS TWinDynNifCallbacks* callbacks
 #  define ERL_NIF_INIT_BODY memcpy(&WinDynNifCallbacks,callbacks,sizeof(TWinDynNifCallbacks))
+#  define ERL_NIF_INIT_EXPORT __declspec(dllexport)
 #else 
 #  define ERL_NIF_INIT_GLOB
+#  define ERL_NIF_INIT_ARGS void
 #  define ERL_NIF_INIT_BODY
-#  ifdef STATIC_ERLANG_NIF
-#    define ERL_NIF_INIT_DECL(MODNAME)  ErlNifEntry* MODNAME ## _nif_init(void)
+#  if defined(__GNUC__) && __GNUC__ >= 4
+#    define ERL_NIF_INIT_EXPORT __attribute__ ((visibility("default")))
+#  elif defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+#    define ERL_NIF_INIT_EXPORT __global
 #  else
-#    define ERL_NIF_INIT_DECL(MODNAME)  ErlNifEntry* nif_init(void)
+#    define ERL_NIF_INIT_EXPORT
 #  endif
 #endif
 
+#ifdef STATIC_ERLANG_NIF
+#  define ERL_NIF_INIT_DECL(MODNAME) ErlNifEntry* MODNAME ## _nif_init(ERL_NIF_INIT_ARGS)
+#else
+#  define ERL_NIF_INIT_DECL(MODNAME) ERL_NIF_INIT_EXPORT ErlNifEntry* nif_init(ERL_NIF_INIT_ARGS)
+#endif
+
 #ifdef ERL_NIF_DIRTY_SCHEDULER_SUPPORT
 #  define ERL_NIF_ENTRY_OPTIONS ERL_NIF_DIRTY_NIF_OPTION
 #else
diff --git a/erts/emulator/beam/erl_nif_api_funcs.h b/erts/emulator/beam/erl_nif_api_funcs.h
index 08b9afc6af..35058afe7c 100644
--- a/erts/emulator/beam/erl_nif_api_funcs.h
+++ b/erts/emulator/beam/erl_nif_api_funcs.h
@@ -160,6 +160,18 @@ ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_schedule_nif,(ErlNifEnv*,const char*,int
 ERL_NIF_API_FUNC_DECL(int, enif_has_pending_exception, (ErlNifEnv *env, ERL_NIF_TERM* reason));
 ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM, enif_raise_exception, (ErlNifEnv *env, ERL_NIF_TERM reason));
 ERL_NIF_API_FUNC_DECL(int,enif_getenv,(const char* key, char* value, size_t* value_size));
+ERL_NIF_API_FUNC_DECL(ErlNifTime, enif_monotonic_time, (ErlNifTimeUnit));
+ERL_NIF_API_FUNC_DECL(ErlNifTime, enif_time_offset, (ErlNifTimeUnit));
+ERL_NIF_API_FUNC_DECL(ErlNifTime, enif_convert_time_unit, (ErlNifTime, ErlNifTimeUnit, ErlNifTimeUnit));
+ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM, enif_now_time, (ErlNifEnv *env));
+ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM, enif_cpu_time, (ErlNifEnv *env));
+ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM, enif_make_unique_integer, (ErlNifEnv *env, ErlNifUniqueInteger properties));
+ERL_NIF_API_FUNC_DECL(int, enif_is_process_alive, (ErlNifEnv *env, ErlNifPid *pid));
+ERL_NIF_API_FUNC_DECL(int, enif_is_port_alive, (ErlNifEnv *env, ErlNifPort *port_id));
+ERL_NIF_API_FUNC_DECL(int, enif_get_local_port, (ErlNifEnv* env, ERL_NIF_TERM, ErlNifPort* port_id));
+ERL_NIF_API_FUNC_DECL(int, enif_term_to_binary, (ErlNifEnv *env, ERL_NIF_TERM term, ErlNifBinary *bin));
+ERL_NIF_API_FUNC_DECL(size_t, enif_binary_to_term, (ErlNifEnv *env, const unsigned char* data, size_t sz, ERL_NIF_TERM *term, unsigned int opts));
+ERL_NIF_API_FUNC_DECL(int, enif_port_command, (ErlNifEnv *env, const ErlNifPort* to_port, ErlNifEnv *msg_env, ERL_NIF_TERM msg));
 
 /*
 ** ADD NEW ENTRIES HERE (before this comment) !!!
@@ -312,6 +324,18 @@ ERL_NIF_API_FUNC_DECL(int,enif_is_on_dirty_scheduler,(ErlNifEnv*));
 #  define enif_has_pending_exception ERL_NIF_API_FUNC_MACRO(enif_has_pending_exception)
 #  define enif_raise_exception ERL_NIF_API_FUNC_MACRO(enif_raise_exception)
 #  define enif_getenv ERL_NIF_API_FUNC_MACRO(enif_getenv)
+#  define enif_monotonic_time ERL_NIF_API_FUNC_MACRO(enif_monotonic_time)
+#  define enif_time_offset ERL_NIF_API_FUNC_MACRO(enif_time_offset)
+#  define enif_convert_time_unit ERL_NIF_API_FUNC_MACRO(enif_convert_time_unit)
+#  define enif_now_time ERL_NIF_API_FUNC_MACRO(enif_now_time)
+#  define enif_cpu_time ERL_NIF_API_FUNC_MACRO(enif_cpu_time)
+#  define enif_make_unique_integer ERL_NIF_API_FUNC_MACRO(enif_make_unique_integer)
+#  define enif_is_process_alive ERL_NIF_API_FUNC_MACRO(enif_is_process_alive)
+#  define enif_is_port_alive ERL_NIF_API_FUNC_MACRO(enif_is_port_alive)
+#  define enif_get_local_port ERL_NIF_API_FUNC_MACRO(enif_get_local_port)
+#  define enif_term_to_binary ERL_NIF_API_FUNC_MACRO(enif_term_to_binary)
+#  define enif_binary_to_term ERL_NIF_API_FUNC_MACRO(enif_binary_to_term)
+#  define enif_port_command ERL_NIF_API_FUNC_MACRO(enif_port_command)
 
 /*
 ** ADD NEW ENTRIES HERE (before this comment)
diff --git a/erts/emulator/beam/erl_node_container_utils.h b/erts/emulator/beam/erl_node_container_utils.h
index 211b1a0090..b6a3531e28 100644
--- a/erts/emulator/beam/erl_node_container_utils.h
+++ b/erts/emulator/beam/erl_node_container_utils.h
@@ -255,7 +255,7 @@ extern ErtsPTab erts_port;
  * Refs                                                                    *
 \*                                                                         */
 
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 
 #define internal_ref_no_of_numbers(x)					\
   (internal_ref_data((x))[0])
@@ -328,8 +328,6 @@ extern ErtsPTab erts_port;
 					 : external_ref_channel_no((x)))
 #define is_ref(x)			(is_internal_ref((x))		\
 					 || is_external_ref((x)))
-#define is_ref_rel(x,Base)		(is_internal_ref_rel((x),Base)	\
-					 || is_external_ref_rel((x),Base))
 #define is_not_ref(x)			(!is_ref(x))
 
 #endif
diff --git a/erts/emulator/beam/erl_node_tables.c b/erts/emulator/beam/erl_node_tables.c
index 707de39556..8617f42d7b 100644
--- a/erts/emulator/beam/erl_node_tables.c
+++ b/erts/emulator/beam/erl_node_tables.c
@@ -787,10 +787,13 @@ void erts_init_node_tables(int dd_sec)
     erts_smp_rwmtx_init_opt(&erts_node_table_rwmtx, &rwmtx_opt, "node_table");
     erts_smp_rwmtx_init_opt(&erts_dist_table_rwmtx, &rwmtx_opt, "dist_table");
 
-    f.hash  = (H_FUN)			dist_table_hash;
-    f.cmp   = (HCMP_FUN)		dist_table_cmp;
-    f.alloc = (HALLOC_FUN)		dist_table_alloc;
-    f.free  = (HFREE_FUN)		dist_table_free;
+    f.hash       = (H_FUN)		dist_table_hash;
+    f.cmp        = (HCMP_FUN)		dist_table_cmp;
+    f.alloc      = (HALLOC_FUN)		dist_table_alloc;
+    f.free       = (HFREE_FUN)		dist_table_free;
+    f.meta_alloc = (HMALLOC_FUN) 	erts_alloc;
+    f.meta_free  = (HMFREE_FUN) 	erts_free;
+    f.meta_print = (HMPRINT_FUN) 	erts_print;
     hash_init(ERTS_ALC_T_DIST_TABLE, &erts_dist_table, "dist_table", 11, f);
 
     f.hash  = (H_FUN)      			node_table_hash;
@@ -1050,7 +1053,7 @@ insert_dist_entry(DistEntry *dist, int type, Eterm id, Uint creation)
     }
 
     if(!rdp)
-	erl_exit(1,
+	erts_exit(ERTS_ERROR_EXIT,
 		 "Reference to non-existing distribution table entry found!\n");
 
     insert_dist_referrer(rdp, type, id, creation);
@@ -1111,7 +1114,7 @@ insert_node(ErlNode *node, int type, Eterm id)
     }
 
     if (!rnp)
-	erl_exit(1, "Reference to non-existing node table entry found!\n");
+	erts_exit(ERTS_ERROR_EXIT, "Reference to non-existing node table entry found!\n");
 
     insert_node_referrer(rnp, type, id);
 }
@@ -1157,23 +1160,11 @@ insert_offheap(ErlOffHeap *oh, int type, Eterm id)
 			break;
 		    }
 		if (insert_bin) {
-#if HALFWORD_HEAP
-		    UWord val = (UWord) u.pb->val;
-		    DeclareTmpHeapNoproc(id_heap,BIG_UINT_HEAP_SIZE*2); /* extra place allocated */
-#else
 		    DeclareTmpHeapNoproc(id_heap,BIG_UINT_HEAP_SIZE);
-#endif
 		    Uint *hp = &id_heap[0];
 		    InsertedBin *nib;
-#if HALFWORD_HEAP
-		    int actual_need = BIG_UWORD_HEAP_SIZE(val);
-		    ASSERT(actual_need <= (BIG_UINT_HEAP_SIZE*2));
-		    UseTmpHeapNoproc(actual_need);
-		    a.id = erts_bld_uword(&hp, NULL, (UWord) val);
-#else
 		    UseTmpHeapNoproc(BIG_UINT_HEAP_SIZE);
 		    a.id = erts_bld_uint(&hp, NULL, (Uint) u.pb->val);
-#endif
 		    erts_match_prog_foreach_offheap(u.pb->val,
 						    insert_offheap2,
 						    (void *) &a);
@@ -1181,11 +1172,7 @@ insert_offheap(ErlOffHeap *oh, int type, Eterm id)
 		    nib->bin_val = u.pb->val;
 		    nib->next = inserted_bins;
 		    inserted_bins = nib;
-#if HALFWORD_HEAP
-		    UnUseTmpHeapNoproc(actual_need);
-#else
 		    UnUseTmpHeapNoproc(BIG_UINT_HEAP_SIZE);
-#endif
 		}
 	    }		
 	    break;
@@ -1371,56 +1358,50 @@ setup_reference_table(void)
     for (i = 0; i < max; i++) {
 	Process *proc = erts_pix2proc(i);
 	if (proc) {
-	    ErlMessage *msg;
+	    int mli;
+	    ErtsMessage *msg_list[] = {
+		proc->msg.first,
+#ifdef ERTS_SMP
+		proc->msg_inq.first,
+#endif
+		proc->msg_frag};
 
 	    /* Insert Heap */
 	    insert_offheap(&(proc->off_heap),
 			   HEAP_REF,
 			   proc->common.id);
-	    /* Insert message buffers */
+	    /* Insert heap fragments buffers */
 	    for(hfp = proc->mbuf; hfp; hfp = hfp->next)
 		insert_offheap(&(hfp->off_heap),
 			       HEAP_REF,
 			       proc->common.id);
-	    /* Insert msg msg buffers */
-	    for (msg = proc->msg.first; msg; msg = msg->next) {
-		ErlHeapFragment *heap_frag = NULL;
-		if (msg->data.attached) {
-		    if (is_value(ERL_MESSAGE_TERM(msg)))
-			heap_frag = msg->data.heap_frag;
-		    else {
-			if (msg->data.dist_ext->dep)
-			    insert_dist_entry(msg->data.dist_ext->dep,
-					      HEAP_REF, proc->common.id, 0);
-			if (is_not_nil(ERL_MESSAGE_TOKEN(msg)))
-			    heap_frag = erts_dist_ext_trailer(msg->data.dist_ext);
+
+	    /* Insert msg buffers */
+	    for (mli = 0; mli < sizeof(msg_list)/sizeof(msg_list[0]); mli++) {
+		ErtsMessage *msg;
+		for (msg = msg_list[mli]; msg; msg = msg->next) {
+		    ErlHeapFragment *heap_frag = NULL;
+		    if (msg->data.attached) {
+			if (msg->data.attached == ERTS_MSG_COMBINED_HFRAG)
+			    heap_frag = &msg->hfrag;
+			else if (is_value(ERL_MESSAGE_TERM(msg)))
+			    heap_frag = msg->data.heap_frag;
+			else {
+			    if (msg->data.dist_ext->dep)
+				insert_dist_entry(msg->data.dist_ext->dep,
+						  HEAP_REF, proc->common.id, 0);
+			    if (is_not_nil(ERL_MESSAGE_TOKEN(msg)))
+				heap_frag = erts_dist_ext_trailer(msg->data.dist_ext);
+			}
 		    }
-		}
-		if (heap_frag)
-		    insert_offheap(&(heap_frag->off_heap),
-				   HEAP_REF,
-				   proc->common.id);
-	    }
-#ifdef ERTS_SMP
-	    for (msg = proc->msg_inq.first; msg; msg = msg->next) {
-		ErlHeapFragment *heap_frag = NULL;
-		if (msg->data.attached) {
-		    if (is_value(ERL_MESSAGE_TERM(msg)))
-			heap_frag = msg->data.heap_frag;
-		    else {
-			if (msg->data.dist_ext->dep)
-			    insert_dist_entry(msg->data.dist_ext->dep,
-					      HEAP_REF, proc->common.id, 0);
-			if (is_not_nil(ERL_MESSAGE_TOKEN(msg)))
-			    heap_frag = erts_dist_ext_trailer(msg->data.dist_ext);
+		    while (heap_frag) {
+			insert_offheap(&(heap_frag->off_heap),
+				       HEAP_REF,
+				       proc->common.id);
+			heap_frag = heap_frag->next;
 		    }
 		}
-		if (heap_frag)
-		    insert_offheap(&(heap_frag->off_heap),
-				   HEAP_REF,
-				   proc->common.id);
 	    }
-#endif
 	    /* Insert links */
 	    if (ERTS_P_LINKS(proc))
 		insert_links(ERTS_P_LINKS(proc), proc->common.id);
diff --git a/erts/emulator/beam/erl_node_tables.h b/erts/emulator/beam/erl_node_tables.h
index 694ac84232..fb2f2a5407 100644
--- a/erts/emulator/beam/erl_node_tables.h
+++ b/erts/emulator/beam/erl_node_tables.h
@@ -41,6 +41,7 @@
 
 #include "sys.h"
 #include "hash.h"
+#include "erl_alloc.h"
 #include "erl_process.h"
 #include "erl_monitors.h"
 #include "erl_smp.h"
@@ -66,7 +67,7 @@
 #define ERTS_DE_QFLGS_ALL			(ERTS_DE_QFLG_BUSY \
 						 | ERTS_DE_QFLG_EXIT)
 
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 #define ERTS_DIST_OUTPUT_BUF_DBG_PATTERN ((Uint) 0xf713f713f713f713UL)
 #else
 #define ERTS_DIST_OUTPUT_BUF_DBG_PATTERN ((Uint) 0xf713f713)
diff --git a/erts/emulator/beam/erl_port.h b/erts/emulator/beam/erl_port.h
index acd68ef0ad..5b06bc7fd1 100644
--- a/erts/emulator/beam/erl_port.h
+++ b/erts/emulator/beam/erl_port.h
@@ -185,8 +185,13 @@ struct _erl_drv_port {
     int control_flags;		 /* Flags for port_control()  */
     ErlDrvPDL port_data_lock;
 
-    ErtsPrtSD *psd;		 /* Port specific data */
+    erts_smp_atomic_t psd;	 /* Port specific data */
     int reds; /* Only used while executing driver callbacks */
+
+    struct {
+        Eterm to;
+        Uint32 ref[ERTS_MAX_REF_NUMBERS];
+    } *async_open_port;         /* Reference used with async open port */
 };
 
 
@@ -247,22 +252,51 @@ ERTS_GLB_INLINE void *erts_prtsd_set(Port *p, int ix, void *new);
 ERTS_GLB_INLINE void *
 erts_prtsd_get(Port *prt, int ix)
 {
-    return prt->psd ? prt->psd->data[ix] : NULL;
+    ErtsPrtSD *psd = (ErtsPrtSD *) erts_smp_atomic_read_nob(&prt->psd);
+    if (!psd)
+	return NULL;
+    ERTS_SMP_DATA_DEPENDENCY_READ_MEMORY_BARRIER;
+    return psd->data[ix];
 }
 
 ERTS_GLB_INLINE void *
 erts_prtsd_set(Port *prt, int ix, void *data)
 {
-    if (prt->psd) {
-	void *old = prt->psd->data[ix];
-	prt->psd->data[ix] = data;
+    ErtsPrtSD *psd, *new_psd;
+    void *old;
+    int i;
+
+    psd = (ErtsPrtSD *) erts_smp_atomic_read_nob(&prt->psd);
+
+    if (psd) {
+#ifdef ERTS_SMP
+#ifdef ETHR_ORDERED_READ_DEPEND
+	ETHR_MEMBAR(ETHR_LoadStore|ETHR_StoreStore);
+#else
+	ETHR_MEMBAR(ETHR_LoadLoad|ETHR_LoadStore|ETHR_StoreStore);
+#endif
+#endif
+	old = psd->data[ix];
+	psd->data[ix] = data;
 	return old;
     }
-    else {
-	prt->psd = erts_alloc(ERTS_ALC_T_PRTSD, sizeof(ErtsPrtSD));
-	prt->psd->data[ix] = data;
+
+    if (!data)
 	return NULL;
-    }
+
+    new_psd = erts_alloc(ERTS_ALC_T_PRTSD, sizeof(ErtsPrtSD));
+    for (i = 0; i < ERTS_PRTSD_SIZE; i++)
+	new_psd->data[i] = NULL;
+    psd = (ErtsPrtSD *) erts_smp_atomic_cmpxchg_mb(&prt->psd,
+						   (erts_aint_t) new_psd,
+						   (erts_aint_t) NULL);
+    if (psd)
+	erts_free(ERTS_ALC_T_PRTSD, new_psd);
+    else
+	psd = new_psd;
+    old = psd->data[ix];
+    psd->data[ix] = data;
+    return old;
 }
 
 #endif
@@ -687,7 +721,7 @@ erts_drvport2port_state(ErlDrvPort drvport, erts_aint32_t *statep)
     Port *prt = ERTS_ErlDrvPort2Port(drvport);
     erts_aint32_t state;
     ASSERT(prt);
-    ERTS_LC_ASSERT(erts_lc_is_emu_thr());
+//    ERTS_LC_ASSERT(erts_lc_is_emu_thr());
     if (prt == ERTS_INVALID_ERL_DRV_PORT)
 	return ERTS_INVALID_ERL_DRV_PORT;
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt)
@@ -944,4 +978,11 @@ ErtsPortOpResult erts_port_control(Process *, Port *, unsigned int, Eterm, Eterm
 ErtsPortOpResult erts_port_call(Process *, Port *, unsigned int, Eterm, Eterm *);
 ErtsPortOpResult erts_port_info(Process *, Port *, Eterm, Eterm *);
 
+int erts_port_output_async(Port *, Eterm, Eterm);
+
+/*
+ * Signals from ports to ports. Used by sys drivers.
+ */
+int erl_drv_port_control(Eterm, char, char*, ErlDrvSizeT);
+
 #endif
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index 5c38db1cbc..ec07d145ab 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -35,6 +35,7 @@
 #include "dist.h"
 #include "erl_check_io.h"
 #include "dtrace-wrapper.h"
+#include "lttng-wrapper.h"
 #include <stdarg.h>
 
 /*
@@ -69,6 +70,18 @@ static void chk_task_queues(Port *pp, ErtsPortTask *execq, int processing_busy_q
 #else
 #define  DTRACE_DRIVER(PROBE_NAME, PP) do {} while(0)
 #endif
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+#define LTTNG_DRIVER(TRACEPOINT, PP)                              \
+    if (LTTNG_ENABLED(TRACEPOINT)) {                              \
+        lttng_decl_portbuf(port_str);                             \
+        lttng_decl_procbuf(proc_str);                             \
+        lttng_pid_to_str(ERTS_PORT_GET_CONNECTED(PP), proc_str);  \
+        lttng_port_to_str((PP), port_str);                        \
+        LTTNG3(TRACEPOINT, proc_str, port_str, (PP)->name);       \
+    }
+#else
+#define LTTNG_DRIVER(TRACEPOINT, PP) do {} while(0)
+#endif
 
 #define ERTS_SMP_LC_VERIFY_RQ(RQ, PP)					\
     do {								\
@@ -180,10 +193,9 @@ p2p_sig_data_to_task(ErtsProc2PortSigData *sigdp)
     return ptp;
 }
 
-ErtsProc2PortSigData *
-erts_port_task_alloc_p2p_sig_data(void)
+static ERTS_INLINE ErtsProc2PortSigData *
+p2p_sig_data_init(ErtsPortTask *ptp)
 {
-    ErtsPortTask *ptp = port_task_alloc();
 
     ptp->type = ERTS_PORT_TASK_PROC_SIG;
     ptp->u.alive.flags = ERTS_PT_FLG_SIG_DEP;
@@ -194,6 +206,31 @@ erts_port_task_alloc_p2p_sig_data(void)
     return &ptp->u.alive.td.psig.data;
 }
 
+ErtsProc2PortSigData *
+erts_port_task_alloc_p2p_sig_data(void)
+{
+    ErtsPortTask *ptp = port_task_alloc();
+
+    return p2p_sig_data_init(ptp);
+}
+
+ErtsProc2PortSigData *
+erts_port_task_alloc_p2p_sig_data_extra(size_t extra, void **extra_ptr)
+{
+    ErtsPortTask *ptp = erts_alloc(ERTS_ALC_T_PORT_TASK,
+                                   sizeof(ErtsPortTask) + extra);
+
+    *extra_ptr = ptp+1;
+
+    return p2p_sig_data_init(ptp);
+}
+
+void
+erts_port_task_free_p2p_sig_data(ErtsProc2PortSigData *sigdp)
+{
+    schedule_port_task_free(p2p_sig_data_to_task(sigdp));
+}
+
 static ERTS_INLINE Eterm
 task_caller(ErtsPortTask *ptp)
 {
@@ -1648,6 +1685,7 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
     int active;
     Uint64 start_time = 0;
     ErtsSchedulerData *esdp = runq->scheduler;
+    ERTS_MSACC_PUSH_STATE_M();
 
     ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(runq));
 
@@ -1690,6 +1728,7 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
 
     state = erts_atomic32_read_nob(&pp->state);
     pp->reds = ERTS_PORT_REDS_EXECUTE;
+    ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_PORT);
     goto begin_handle_tasks;
 
     while (1) {
@@ -1726,6 +1765,7 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
 		reds = ERTS_PORT_REDS_TIMEOUT;
 		if (!(state & ERTS_PORT_SFLGS_DEAD)) {
 		    DTRACE_DRIVER(driver_timeout, pp);
+		    LTTNG_DRIVER(driver_timeout, pp);
 		    (*pp->drv_ptr->timeout)((ErlDrvData) pp->drv_data);
 		}
 	    }
@@ -1734,7 +1774,8 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
 	    reds = ERTS_PORT_REDS_INPUT;
 	    ASSERT((state & ERTS_PORT_SFLGS_DEAD) == 0);
             DTRACE_DRIVER(driver_ready_input, pp);
-	    /* NOTE some windows/ose drivers use ->ready_input
+            LTTNG_DRIVER(driver_ready_input, pp);
+	    /* NOTE some windows drivers use ->ready_input
 	       for input and output */
 	    (*pp->drv_ptr->ready_input)((ErlDrvData) pp->drv_data,
 					ptp->u.alive.td.io.event);
@@ -1745,6 +1786,7 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
 	    reds = ERTS_PORT_REDS_OUTPUT;
 	    ASSERT((state & ERTS_PORT_SFLGS_DEAD) == 0);
             DTRACE_DRIVER(driver_ready_output, pp);
+            LTTNG_DRIVER(driver_ready_output, pp);
 	    (*pp->drv_ptr->ready_output)((ErlDrvData) pp->drv_data,
 					 ptp->u.alive.td.io.event);
 	    reset_executed_io_task_handle(ptp);
@@ -1754,6 +1796,7 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
 	    reds = ERTS_PORT_REDS_EVENT;
 	    ASSERT((state & ERTS_PORT_SFLGS_DEAD) == 0);
             DTRACE_DRIVER(driver_event, pp);
+            LTTNG_DRIVER(driver_event, pp);
 	    (*pp->drv_ptr->event)((ErlDrvData) pp->drv_data,
 				  ptp->u.alive.td.io.event,
 				  ptp->u.alive.td.io.event_data);
@@ -1784,7 +1827,7 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
 	    reds = erts_dist_command(pp, CONTEXT_REDS - pp->reds);
 	    break;
 	default:
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "Invalid port task type: %d\n",
 		     (int) ptp->type);
 	    break;
@@ -1822,6 +1865,7 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
     }
 
     erts_unblock_fpe(fpe_was_unmasked);
+    ERTS_MSACC_POP_STATE_M();
 
 
     if (io_tasks_executed) {
@@ -2048,7 +2092,7 @@ begin_port_cleanup(Port *pp, ErtsPortTask **execqp, int *processing_busy_q_p)
 		break;
 	    }
 	    default:
-		erl_exit(ERTS_ABORT_EXIT,
+		erts_exit(ERTS_ABORT_EXIT,
 			 "Invalid port task type: %d\n",
 			 (int) ptp->type);
 	    }
diff --git a/erts/emulator/beam/erl_port_task.h b/erts/emulator/beam/erl_port_task.h
index 335f7a77d5..56cef4e352 100644
--- a/erts/emulator/beam/erl_port_task.h
+++ b/erts/emulator/beam/erl_port_task.h
@@ -269,6 +269,8 @@ int erts_port_task_schedule(Eterm,
 void erts_port_task_free_port(Port *);
 int erts_port_is_scheduled(Port *);
 ErtsProc2PortSigData *erts_port_task_alloc_p2p_sig_data(void);
+ErtsProc2PortSigData *erts_port_task_alloc_p2p_sig_data_extra(size_t extra, void **extra_ptr);
+void erts_port_task_free_p2p_sig_data(ErtsProc2PortSigData *sigdp);
 
 #ifdef ERTS_SMP
 void erts_enqueue_port(ErtsRunQueue *rq, Port *pp);
diff --git a/erts/emulator/beam/erl_printf_term.c b/erts/emulator/beam/erl_printf_term.c
index 2917d58932..45ba4371dc 100644
--- a/erts/emulator/beam/erl_printf_term.c
+++ b/erts/emulator/beam/erl_printf_term.c
@@ -117,13 +117,12 @@ do {									\
 /* return 0 if list is not a non-empty flat list of printable characters */
 
 static int
-is_printable_string(Eterm list, Eterm* base)
-{
+is_printable_string(Eterm list) {
     int len = 0;
     int c;
 
     while(is_list(list)) {
-	Eterm* consp = list_val_rel(list, base);
+	Eterm* consp = list_val(list);
 	Eterm hd = CAR(consp);
 
 	if (!is_byte(hd))
@@ -260,9 +259,7 @@ static char *format_binary(Uint16 x, char *b) {
 #endif
 
 static int
-print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount,
-	   Eterm* obj_base) /* ignored if !HALFWORD_HEAP */
-{
+print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount) {
     DECLARE_WSTACK(s);
     int res;
     int i;
@@ -308,7 +305,7 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount,
 		obj = (Eterm) popped.word;
 	    L_print_one_cons:
 		{
-		    Eterm* cons = list_val_rel(obj, obj_base);
+		    Eterm* cons = list_val(obj);
 		    Eterm tl;
 		    
 		    obj = CAR(cons);
@@ -344,11 +341,7 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount,
 	    PRINT_CHAR(res, fn, arg, '>');
 	    goto L_done;
 	}
-#if HALFWORD_HEAP
-	wobj = is_immed(obj) ? (Wterm)obj : rterm2wterm(obj, obj_base);
-#else
 	wobj = (Wterm)obj;
-#endif
 	switch (tag_val_def(wobj)) {
 	case NIL_DEF:
 	    PRINT_STRING(res, fn, arg, "[]");
@@ -424,10 +417,10 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount,
 	    PRINT_CHAR(res, fn, arg, '>');
 	    break;
 	case LIST_DEF:
-	    if (is_printable_string(obj, obj_base)) {
+	    if (is_printable_string(obj)) {
 		int c;
 		PRINT_CHAR(res, fn, arg, '"');
-		nobj = list_val_rel(obj, obj_base);
+		nobj = list_val(obj);
 		while (1) {
 		    if ((*dcount)-- <= 0)
 			goto L_done;
@@ -441,7 +434,7 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount,
 		    }
 		    if (is_not_list(*nobj))
 			break;
-		    nobj = list_val_rel(*nobj, obj_base);
+		    nobj = list_val(*nobj);
 		}
 		PRINT_CHAR(res, fn, arg, '"');
 	    } else {
@@ -469,11 +462,11 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount,
 	case BINARY_DEF:
 	    {
 		byte* bytep;
-		Uint bytesize = binary_size_rel(obj,obj_base);
+		Uint bytesize = binary_size(obj);
 		Uint bitoffs;
 		Uint bitsize;
 		byte octet;
-		ERTS_GET_BINARY_BYTES_REL(obj, bytep, bitoffs, bitsize, obj_base);
+		ERTS_GET_BINARY_BYTES(obj, bytep, bitoffs, bitsize);
 
 		if (bitsize || !bytesize
 		    || !is_printable_ascii(bytep, bytesize, bitoffs)) {
@@ -648,13 +641,11 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount,
 
 
 int
-erts_printf_term(fmtfn_t fn, void* arg, ErlPfEterm term, long precision,
-		 ErlPfEterm* term_base)
-{
+erts_printf_term(fmtfn_t fn, void* arg, ErlPfEterm term, long precision) {
     int res;
     ERTS_CT_ASSERT(sizeof(ErlPfEterm) == sizeof(Eterm));
 
-    res = print_term(fn, arg, (Eterm)term, &precision, (Eterm*)term_base);
+    res = print_term(fn, arg, (Eterm)term, &precision);
     if (res < 0)
 	return res;
     if (precision <= 0)
diff --git a/erts/emulator/beam/erl_printf_term.h b/erts/emulator/beam/erl_printf_term.h
index 87618a36d7..4618457f27 100644
--- a/erts/emulator/beam/erl_printf_term.h
+++ b/erts/emulator/beam/erl_printf_term.h
@@ -22,6 +22,5 @@
 #define ERL_PRINTF_TERM_H__
 
 #include "erl_printf_format.h"
-int erts_printf_term(fmtfn_t fn, void* arg, ErlPfEterm term, long precision,
-		     ErlPfEterm* term_base);
+int erts_printf_term(fmtfn_t fn, void* arg, ErlPfEterm term, long precision);
 #endif
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index dd8bc9a698..57a7b0f288 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -43,6 +43,7 @@
 #include "erl_thr_queue.h"
 #include "erl_async.h"
 #include "dtrace-wrapper.h"
+#include "lttng-wrapper.h"
 #include "erl_ptab.h"
 #include "erl_bif_unique.h"
 #define ERTS_WANT_TIMER_WHEEL_API
@@ -58,11 +59,7 @@
 
 #define ERTS_PROC_MIN_CONTEXT_SWITCH_REDS_COST (CONTEXT_REDS/10)
 
-#ifndef ERTS_SCHED_MIN_SPIN
 #define ERTS_SCHED_SPIN_UNTIL_YIELD 100
-#else
-#define ERTS_SCHED_SPIN_UNTIL_YIELD 1
-#endif
 
 #define ERTS_SCHED_SYS_SLEEP_SPINCOUNT_VERY_LONG 40
 #define ERTS_SCHED_AUX_WORK_SLEEP_SPINCOUNT_FACT_VERY_LONG 1000
@@ -119,7 +116,7 @@
 #define RUNQ_SET_RQ(X, RQ) erts_smp_atomic_set_nob((X), (erts_aint_t) (RQ))
 
 #ifdef DEBUG
-#  if defined(ARCH_64) && !HALFWORD_HEAP
+#  if defined(ARCH_64)
 #    define ERTS_DBG_SET_INVALID_RUNQP(RQP, N) \
     (RUNQ_SET_RQ((RQP), (0xdeadbeefdead0003LL | ((N) << 4)))
 #  define ERTS_DBG_VERIFY_VALID_RUNQP(RQP) \
@@ -152,19 +149,13 @@ extern BeamInstr beam_apply[];
 extern BeamInstr beam_exit[];
 extern BeamInstr beam_continue_exit[];
 
-#ifdef __OSE__
-/* Eager check I/O not supported on OSE yet. */
-int erts_eager_check_io = 0;
-#else
-int erts_eager_check_io = 1;
-#endif
-int erts_sched_compact_load;
-int erts_sched_balance_util = 0;
-Uint erts_no_schedulers;
-#ifdef ERTS_DIRTY_SCHEDULERS
-Uint erts_no_dirty_cpu_schedulers;
-Uint erts_no_dirty_io_schedulers;
-#endif
+int ERTS_WRITE_UNLIKELY(erts_default_spo_flags) = 0;
+int ERTS_WRITE_UNLIKELY(erts_eager_check_io) = 1;
+int ERTS_WRITE_UNLIKELY(erts_sched_compact_load);
+int ERTS_WRITE_UNLIKELY(erts_sched_balance_util) = 0;
+Uint ERTS_WRITE_UNLIKELY(erts_no_schedulers);
+Uint ERTS_WRITE_UNLIKELY(erts_no_dirty_cpu_schedulers) = 0;
+Uint ERTS_WRITE_UNLIKELY(erts_no_dirty_io_schedulers) = 0;
 
 static char *erts_aux_work_flag_descr[ERTS_SSI_AUX_WORK_NO_FLAGS] = {0};
 int erts_aux_work_no_flags = ERTS_SSI_AUX_WORK_NO_FLAGS;
@@ -196,84 +187,176 @@ int erts_disable_proc_not_running_opt;
 
 static ErtsAuxWorkData *aux_thread_aux_work_data;
 
-#define ERTS_SCHDLR_SSPND_CHNG_WAITER		(((erts_aint32_t) 1) << 0)
+#define ERTS_SCHDLR_SSPND_CHNG_NMSB		(((erts_aint32_t) 1) << 0)
 #define ERTS_SCHDLR_SSPND_CHNG_MSB		(((erts_aint32_t) 1) << 1)
 #define ERTS_SCHDLR_SSPND_CHNG_ONLN		(((erts_aint32_t) 1) << 2)
+#define ERTS_SCHDLR_SSPND_CHNG_DCPU_ONLN	(((erts_aint32_t) 1) << 3)
 
-#ifndef DEBUG
+typedef enum {
+    ERTS_SCHED_NORMAL,
+    ERTS_SCHED_DIRTY_CPU,
+    ERTS_SCHED_DIRTY_IO
+} ErtsSchedType;
 
-#define ERTS_SCHDLR_SSPND_CHNG_SET(VAL, OLD_VAL) \
-  erts_smp_atomic32_set_nob(&schdlr_sspnd.changing, (VAL))
+typedef struct {
+    int ongoing;
+    ErtsProcList *blckrs;
+    ErtsProcList *chngq;
+} ErtsMultiSchedulingBlock;
 
-#ifdef ERTS_DIRTY_SCHEDULERS
-#define ERTS_SCHDLR_SSPND_DIRTY_CPU_CHNG_SET(VAL, OLD_VAL) \
-  erts_smp_atomic32_set_nob(&schdlr_sspnd.dirty_cpu_changing, (VAL))
-#define ERTS_SCHDLR_SSPND_DIRTY_IO_CHNG_SET(VAL, OLD_VAL) \
-  erts_smp_atomic32_set_nob(&schdlr_sspnd.dirty_io_changing, (VAL))
-#endif
+static struct {
+    erts_smp_mtx_t mtx;
+    Uint32 online;
+    Uint32 curr_online;
+    Uint32 active;
+    erts_smp_atomic32_t changing;
+    ErtsProcList *chngq;
+    Eterm changer;
+    ErtsMultiSchedulingBlock nmsb; /* Normal multi Scheduling Block */
+    ErtsMultiSchedulingBlock msb; /* Multi Scheduling Block */
+} schdlr_sspnd;
 
-#else
+#define ERTS_SCHDLR_SSPND_S_BITS	10
+#define ERTS_SCHDLR_SSPND_DCS_BITS	11
+#define ERTS_SCHDLR_SSPND_DIS_BITS	11
 
-#define ERTS_SCHDLR_SSPND_CHNG_SET(VAL, OLD_VAL)			\
-do {									\
-    erts_aint32_t old_val__;						\
-    old_val__ = erts_smp_atomic32_xchg_nob(&schdlr_sspnd.changing,     	\
-					   (VAL));			\
-    ASSERT(old_val__ == (OLD_VAL));					\
-} while (0)
+#define ERTS_SCHDLR_SSPND_S_MASK	((1 << ERTS_SCHDLR_SSPND_S_BITS)-1)
+#define ERTS_SCHDLR_SSPND_DCS_MASK	((1 << ERTS_SCHDLR_SSPND_DCS_BITS)-1)
+#define ERTS_SCHDLR_SSPND_DIS_MASK	((1 << ERTS_SCHDLR_SSPND_DIS_BITS)-1)
 
-#ifdef ERTS_DIRTY_SCHEDULERS
-#define ERTS_SCHDLR_SSPND_DIRTY_CPU_CHNG_SET(VAL, OLD_VAL)		\
-do {									\
-    erts_aint32_t old_val__;						\
-    old_val__ = erts_smp_atomic32_xchg_nob(&schdlr_sspnd.dirty_cpu_changing, \
-					   (VAL));			\
-    ASSERT(old_val__ == (OLD_VAL));					\
-} while (0)
-#define ERTS_SCHDLR_SSPND_DIRTY_IO_CHNG_SET(VAL, OLD_VAL)		\
-do {									\
-    erts_aint32_t old_val__;						\
-    old_val__ = erts_smp_atomic32_xchg_nob(&schdlr_sspnd.dirty_io_changing, \
-					   (VAL));			\
-    ASSERT(old_val__ == (OLD_VAL));					\
-} while (0)
-#endif
+#define ERTS_SCHDLR_SSPND_S_SHIFT	0
+#define ERTS_SCHDLR_SSPND_DCS_SHIFT	(ERTS_SCHDLR_SSPND_S_SHIFT \
+					 + ERTS_SCHDLR_SSPND_S_BITS)
+#define ERTS_SCHDLR_SSPND_DIS_SHIFT	(ERTS_SCHDLR_SSPND_DCS_SHIFT \
+					 + ERTS_SCHDLR_SSPND_DCS_BITS)
 
+#if (ERTS_SCHDLR_SSPND_S_BITS		\
+     + ERTS_SCHDLR_SSPND_DCS_BITS	\
+     + ERTS_SCHDLR_SSPND_DIS_BITS) > 32
+#  error Wont fit in Uint32
 #endif
 
-
-static struct {
-    erts_smp_mtx_t mtx;
-    erts_smp_cnd_t cnd;
-    int online;
-    int curr_online;
-    int wait_curr_online;
-#ifdef ERTS_DIRTY_SCHEDULERS
-    int dirty_cpu_online;
-    int dirty_cpu_curr_online;
-    int dirty_cpu_wait_curr_online;
-    int dirty_io_online;
-    int dirty_io_curr_online;
-    int dirty_io_wait_curr_online;
+#if (ERTS_MAX_NO_OF_SCHEDULERS-1) > ERTS_SCHDLR_SSPND_S_MASK
+#  error Max no schedulers wont fit in its bit-field
 #endif
-    erts_smp_atomic32_t changing;
-    erts_smp_atomic32_t active;
-#ifdef ERTS_DIRTY_SCHEDULERS
-    erts_smp_atomic32_t dirty_cpu_changing;
-    erts_smp_atomic32_t dirty_cpu_active;
-    erts_smp_atomic32_t dirty_io_changing;
-    erts_smp_atomic32_t dirty_io_active;
+#if ERTS_MAX_NO_OF_DIRTY_CPU_SCHEDULERS > ERTS_SCHDLR_SSPND_DCS_MASK
+#  error Max no dirty cpu schedulers wont fit in its bit-field
 #endif
-    struct {
-	int ongoing;
-	long wait_active;
-#ifdef ERTS_DIRTY_SCHEDULERS
-	long dirty_cpu_wait_active;
-	long dirty_io_wait_active;
+#if ERTS_MAX_NO_OF_DIRTY_IO_SCHEDULERS > ERTS_SCHDLR_SSPND_DIS_MASK
+#  error Max no dirty io schedulers wont fit in its bit-field
 #endif
-	ErtsProcList *procs;
-    } msb; /* Multi Scheduling Block */
-} schdlr_sspnd;
+
+#define ERTS_SCHDLR_SSPND_MAKE_NSCHEDS_VAL(S, DCS, DIS)			\
+    ((((Uint32) (((S) & ERTS_SCHDLR_SSPND_S_MASK))-1)			\
+      << ERTS_SCHDLR_SSPND_S_SHIFT)					\
+     | ((((Uint32) ((DCS) & ERTS_SCHDLR_SSPND_DCS_MASK))		\
+	 << ERTS_SCHDLR_SSPND_DCS_SHIFT))				\
+     | ((((Uint32) ((DIS) & ERTS_SCHDLR_SSPND_DIS_MASK))		\
+	 << ERTS_SCHDLR_SSPND_DIS_SHIFT)))
+
+static void init_scheduler_suspend(void);
+
+static ERTS_INLINE Uint32
+schdlr_sspnd_get_nscheds(Uint32 *valp, ErtsSchedType type)
+{
+    Uint32 res = (Uint32) (*valp);
+    switch (type) {
+    case ERTS_SCHED_NORMAL:
+	res >>= ERTS_SCHDLR_SSPND_S_SHIFT;
+	res &= (Uint32) ERTS_SCHDLR_SSPND_S_MASK;
+	res++;
+	break;
+    case ERTS_SCHED_DIRTY_CPU:
+	res >>= ERTS_SCHDLR_SSPND_DCS_SHIFT;
+	res &= (Uint32) ERTS_SCHDLR_SSPND_DCS_MASK;
+	break;
+    case ERTS_SCHED_DIRTY_IO:
+	res >>= ERTS_SCHDLR_SSPND_DIS_SHIFT;
+	res &= (Uint32) ERTS_SCHDLR_SSPND_DIS_MASK;
+	break;
+    default:
+	ERTS_INTERNAL_ERROR("Invalid scheduler type");
+	return 0;
+    }
+
+    return res;
+}
+
+static ERTS_INLINE void
+schdlr_sspnd_dec_nscheds(Uint32 *valp, ErtsSchedType type)
+{
+    ASSERT(schdlr_sspnd_get_nscheds(valp, type) > 0);
+
+    switch (type) {
+    case ERTS_SCHED_NORMAL:
+	*valp -= ((Uint32) 1) << ERTS_SCHDLR_SSPND_S_SHIFT;
+	break;
+    case ERTS_SCHED_DIRTY_CPU:
+	*valp -= ((Uint32) 1) << ERTS_SCHDLR_SSPND_DCS_SHIFT;
+	break;
+    case ERTS_SCHED_DIRTY_IO:
+	*valp -= ((Uint32) 1) << ERTS_SCHDLR_SSPND_DIS_SHIFT;
+	break;
+    default:
+	ERTS_INTERNAL_ERROR("Invalid scheduler type");
+    }
+}
+
+static ERTS_INLINE void
+schdlr_sspnd_inc_nscheds(Uint32 *valp, ErtsSchedType type)
+{
+    switch (type) {
+    case ERTS_SCHED_NORMAL:
+	ASSERT(schdlr_sspnd_get_nscheds(valp, type)
+	       < ERTS_MAX_NO_OF_SCHEDULERS-1);
+	*valp += ((Uint32) 1) << ERTS_SCHDLR_SSPND_S_SHIFT;
+	break;
+    case ERTS_SCHED_DIRTY_CPU:
+	ASSERT(schdlr_sspnd_get_nscheds(valp, type)
+	       < ERTS_MAX_NO_OF_DIRTY_CPU_SCHEDULERS);
+	*valp += ((Uint32) 1) << ERTS_SCHDLR_SSPND_DCS_SHIFT;
+	break;
+    case ERTS_SCHED_DIRTY_IO:
+	ASSERT(schdlr_sspnd_get_nscheds(valp, type)
+	       < ERTS_MAX_NO_OF_DIRTY_IO_SCHEDULERS);
+	*valp += ((Uint32) 1) << ERTS_SCHDLR_SSPND_DIS_SHIFT;
+	break;
+    default:
+	ERTS_INTERNAL_ERROR("Invalid scheduler type");
+    }
+}
+
+static ERTS_INLINE void
+schdlr_sspnd_set_nscheds(Uint32 *valp, ErtsSchedType type, Uint32 no)
+{
+    Uint32 val = *valp;
+
+    switch (type) {
+    case ERTS_SCHED_NORMAL:
+	ASSERT(no > 0);
+	val &= ~(((Uint32) ERTS_SCHDLR_SSPND_S_MASK)
+		 << ERTS_SCHDLR_SSPND_S_SHIFT);
+	val |= (((no-1) & ((Uint32) ERTS_SCHDLR_SSPND_S_MASK))
+		<< ERTS_SCHDLR_SSPND_S_SHIFT);
+	break;
+    case ERTS_SCHED_DIRTY_CPU:
+	val &= ~(((Uint32) ERTS_SCHDLR_SSPND_DCS_MASK)
+		 << ERTS_SCHDLR_SSPND_DCS_SHIFT);
+	val |= ((no & ((Uint32) ERTS_SCHDLR_SSPND_DCS_MASK))
+		 << ERTS_SCHDLR_SSPND_DCS_SHIFT);
+	break;
+    case ERTS_SCHED_DIRTY_IO:
+	val &= ~(((Uint32) ERTS_SCHDLR_SSPND_DIS_MASK)
+		 << ERTS_SCHDLR_SSPND_DIS_SHIFT);
+	val |= ((no & ((Uint32) ERTS_SCHDLR_SSPND_DIS_MASK))
+		<< ERTS_SCHDLR_SSPND_DIS_SHIFT);
+	break;
+    default:
+	ERTS_INTERNAL_ERROR("Invalid scheduler type");
+    }
+
+    *valp = val;
+}
 
 static struct {
     erts_smp_mtx_t update_mtx;
@@ -303,7 +386,7 @@ do {							\
 erts_sched_stat_t erts_sched_stat;
 
 #ifdef USE_THREADS
-static erts_tsd_key_t sched_data_key;
+static erts_tsd_key_t ERTS_WRITE_UNLIKELY(sched_data_key);
 #endif
 
 static erts_smp_atomic32_t function_calls;
@@ -343,16 +426,16 @@ static ErtsAlignedSchedulerSleepInfo *aligned_dirty_io_sched_sleep_info;
 
 static Uint last_reductions;
 static Uint last_exact_reductions;
-Uint erts_default_process_flags;
-Eterm erts_system_monitor;
-Eterm erts_system_monitor_long_gc;
-Uint erts_system_monitor_long_schedule;
-Eterm erts_system_monitor_large_heap;
+Eterm ERTS_WRITE_UNLIKELY(erts_system_monitor);
+Eterm ERTS_WRITE_UNLIKELY(erts_system_monitor_long_gc);
+Uint ERTS_WRITE_UNLIKELY(erts_system_monitor_long_schedule);
+Eterm ERTS_WRITE_UNLIKELY(erts_system_monitor_large_heap);
 struct erts_system_monitor_flags_t erts_system_monitor_flags;
 
 /* system performance monitor */
 Eterm erts_system_profile;
 struct erts_system_profile_flags_t erts_system_profile_flags;
+int erts_system_profile_ts_type = ERTS_TRACE_FLG_NOW_TIMESTAMP;
 
 #if ERTS_MAX_PROCESSES > 0x7fffffff
 #error "Need to store process_count in another type"
@@ -360,7 +443,8 @@ struct erts_system_profile_flags_t erts_system_profile_flags;
 
 typedef enum {
     ERTS_PSTT_GC,	/* Garbage Collect */
-    ERTS_PSTT_CPC	/* Check Process Code */
+    ERTS_PSTT_CPC,	/* Check Process Code */
+    ERTS_PSTT_COHMQ     /* Change off heap message queue */
 } ErtsProcSysTaskType;
 
 #define ERTS_MAX_PROC_SYS_TASK_ARGS 2
@@ -433,8 +517,10 @@ do {									\
 do {									\
     ErtsRunQueue *RQVAR;						\
     int ix__;								\
+    int online__ = (int) schdlr_sspnd_get_nscheds(&schdlr_sspnd.online,	\
+						  ERTS_SCHED_NORMAL);	\
     ERTS_SMP_LC_ASSERT(erts_smp_lc_mtx_is_locked(&schdlr_sspnd.mtx));	\
-    for (ix__ = 0; ix__ < schdlr_sspnd.online; ix__++) {		\
+    for (ix__ = 0; ix__ < online__; ix__++) {				\
 	RQVAR = ERTS_RUNQ_IX(ix__);					\
 	erts_smp_runq_lock(RQVAR);					\
 	{ DO; }								\
@@ -506,16 +592,13 @@ dbg_chk_aux_work_val(erts_aint32_t value)
 #if HAVE_ERTS_MSEG
     valid |= ERTS_SSI_AUX_WORK_MSEG_CACHE_CHECK;
 #endif
-#ifdef ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
-    valid |= ERTS_SSI_AUX_WORK_CHECK_CHILDREN;
-#endif
 #ifdef ERTS_SSI_AUX_WORK_REAP_PORTS
     valid |= ERTS_SSI_AUX_WORK_REAP_PORTS;
 #endif
     valid |= ERTS_SSI_AUX_WORK_DEBUG_WAIT_COMPLETED;
 
     if (~valid & value)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "Invalid aux_work value found: 0x%x\n",
 		 ~valid & value);
 }
@@ -595,8 +678,6 @@ erts_pre_init_process(void)
 	= "MISC_THR_PRGR";
     erts_aux_work_flag_descr[ERTS_SSI_AUX_WORK_MISC_IX]
 	= "MISC";
-    erts_aux_work_flag_descr[ERTS_SSI_AUX_WORK_CHECK_CHILDREN_IX]
-	= "CHECK_CHILDREN";
     erts_aux_work_flag_descr[ERTS_SSI_AUX_WORK_SET_TMO_IX]
 	= "SET_TMO";
     erts_aux_work_flag_descr[ERTS_SSI_AUX_WORK_MSEG_CACHE_CHECK_IX]
@@ -607,45 +688,36 @@ erts_pre_init_process(void)
 	= "DEBUG_WAIT_COMPLETED";
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
- {
-     int ix;
-
-     erts_psd_required_locks[ERTS_PSD_ERROR_HANDLER].get_locks
-	 = ERTS_PSD_ERROR_HANDLER_BUF_GET_LOCKS;
-     erts_psd_required_locks[ERTS_PSD_ERROR_HANDLER].set_locks
-	 = ERTS_PSD_ERROR_HANDLER_BUF_SET_LOCKS;
 
-     erts_psd_required_locks[ERTS_PSD_SAVED_CALLS_BUF].get_locks
-	 = ERTS_PSD_SAVED_CALLS_BUF_GET_LOCKS;
-     erts_psd_required_locks[ERTS_PSD_SAVED_CALLS_BUF].set_locks
-	 = ERTS_PSD_SAVED_CALLS_BUF_SET_LOCKS;
+    erts_psd_required_locks[ERTS_PSD_ERROR_HANDLER].get_locks
+	= ERTS_PSD_ERROR_HANDLER_BUF_GET_LOCKS;
+    erts_psd_required_locks[ERTS_PSD_ERROR_HANDLER].set_locks
+	= ERTS_PSD_ERROR_HANDLER_BUF_SET_LOCKS;
 
-     erts_psd_required_locks[ERTS_PSD_SCHED_ID].get_locks
-	 = ERTS_PSD_SCHED_ID_GET_LOCKS;
-     erts_psd_required_locks[ERTS_PSD_SCHED_ID].set_locks
-	 = ERTS_PSD_SCHED_ID_SET_LOCKS;
+    erts_psd_required_locks[ERTS_PSD_SAVED_CALLS_BUF].get_locks
+	= ERTS_PSD_SAVED_CALLS_BUF_GET_LOCKS;
+    erts_psd_required_locks[ERTS_PSD_SAVED_CALLS_BUF].set_locks
+	= ERTS_PSD_SAVED_CALLS_BUF_SET_LOCKS;
 
-     erts_psd_required_locks[ERTS_PSD_CALL_TIME_BP].get_locks
-	 = ERTS_PSD_CALL_TIME_BP_GET_LOCKS;
-     erts_psd_required_locks[ERTS_PSD_CALL_TIME_BP].set_locks
-	 = ERTS_PSD_CALL_TIME_BP_SET_LOCKS;
+    erts_psd_required_locks[ERTS_PSD_SCHED_ID].get_locks
+	= ERTS_PSD_SCHED_ID_GET_LOCKS;
+    erts_psd_required_locks[ERTS_PSD_SCHED_ID].set_locks
+	= ERTS_PSD_SCHED_ID_SET_LOCKS;
 
-     erts_psd_required_locks[ERTS_PSD_DELAYED_GC_TASK_QS].get_locks
-	 = ERTS_PSD_DELAYED_GC_TASK_QS_GET_LOCKS;
-     erts_psd_required_locks[ERTS_PSD_DELAYED_GC_TASK_QS].set_locks
-	 = ERTS_PSD_DELAYED_GC_TASK_QS_SET_LOCKS;
+    erts_psd_required_locks[ERTS_PSD_CALL_TIME_BP].get_locks
+	= ERTS_PSD_CALL_TIME_BP_GET_LOCKS;
+    erts_psd_required_locks[ERTS_PSD_CALL_TIME_BP].set_locks
+	= ERTS_PSD_CALL_TIME_BP_SET_LOCKS;
 
-     erts_psd_required_locks[ERTS_PSD_NIF_TRAP_EXPORT].get_locks
-	 = ERTS_PSD_NIF_TRAP_EXPORT_GET_LOCKS;
-     erts_psd_required_locks[ERTS_PSD_NIF_TRAP_EXPORT].set_locks
-	 = ERTS_PSD_NIF_TRAP_EXPORT_SET_LOCKS;
+    erts_psd_required_locks[ERTS_PSD_DELAYED_GC_TASK_QS].get_locks
+	= ERTS_PSD_DELAYED_GC_TASK_QS_GET_LOCKS;
+    erts_psd_required_locks[ERTS_PSD_DELAYED_GC_TASK_QS].set_locks
+	= ERTS_PSD_DELAYED_GC_TASK_QS_SET_LOCKS;
 
-     /* Check that we have locks for all entries */
-     for (ix = 0; ix < ERTS_PSD_SIZE; ix++) {
-	 ERTS_SMP_LC_ASSERT(erts_psd_required_locks[ix].get_locks);
-	 ERTS_SMP_LC_ASSERT(erts_psd_required_locks[ix].set_locks);
-     }
- }
+    erts_psd_required_locks[ERTS_PSD_NIF_TRAP_EXPORT].get_locks
+	= ERTS_PSD_NIF_TRAP_EXPORT_GET_LOCKS;
+    erts_psd_required_locks[ERTS_PSD_NIF_TRAP_EXPORT].set_locks
+	= ERTS_PSD_NIF_TRAP_EXPORT_SET_LOCKS;
 #endif
 }
 
@@ -684,7 +756,6 @@ erts_init_process(int ncpu, int proc_tab_size, int legacy_proc_tab)
 
     last_reductions = 0;
     last_exact_reductions = 0;
-    erts_default_process_flags = 0;
 }
 
 void
@@ -954,6 +1025,12 @@ sched_wall_time_change(ErtsSchedulerData *esdp, int working)
 	    }
 	}
     }
+    if (!working) {
+        ERTS_MSACC_SET_STATE_M_X(ERTS_MSACC_STATE_BUSY_WAIT);
+    } else {
+        ERTS_MSACC_SET_STATE_M_X(ERTS_MSACC_STATE_OTHER);
+    }
+
 }
 
 typedef struct {
@@ -966,25 +1043,24 @@ typedef struct {
     erts_smp_atomic32_t refc;
 } ErtsSchedWallTimeReq;
 
-#if !HALFWORD_HEAP
+typedef struct {
+    Process *proc;
+    Eterm ref;
+    Eterm ref_heap[REF_THING_SIZE];
+    Uint req_sched;
+    erts_smp_atomic32_t refc;
+} ErtsSystemCheckReq;
+
+
 ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(swtreq,
 				 ErtsSchedWallTimeReq,
 				 5,
 				 ERTS_ALC_T_SCHED_WTIME_REQ)
-#else
-static ERTS_INLINE ErtsSchedWallTimeReq *
-swtreq_alloc(void)
-{
-    return erts_alloc(ERTS_ALC_T_SCHED_WTIME_REQ,
-		      sizeof(ErtsSchedWallTimeReq));
-}
 
-static ERTS_INLINE void
-swtreq_free(ErtsSchedWallTimeReq *ptr)
-{
-    erts_free(ERTS_ALC_T_SCHED_WTIME_REQ, ptr);
-}
-#endif
+ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(screq,
+				 ErtsSystemCheckReq,
+				 5,
+				 ERTS_ALC_T_SYS_CHECK_REQ)
 
 static void
 reply_sched_wall_time(void *vswtrp)
@@ -1001,7 +1077,7 @@ reply_sched_wall_time(void *vswtrp)
     Eterm **hpp;
     Uint sz, *szp;
     ErlOffHeap *ohp = NULL;
-    ErlHeapFragment *bp = NULL;
+    ErtsMessage *mp = NULL;
 
     ASSERT(esdp);
 #ifdef ERTS_DIRTY_SCHEDULERS
@@ -1057,12 +1133,12 @@ reply_sched_wall_time(void *vswtrp)
 	if (hpp)
 	    break;
 
-	hp = erts_alloc_message_heap(sz, &bp, &ohp, rp, &rp_locks);
+	mp = erts_alloc_message_heap(rp, &rp_locks, sz, &hp, &ohp);
 	szp = NULL;
 	hpp = &hp;
     }
 
-    erts_queue_message(rp, &rp_locks, bp, msg, NIL);
+    erts_queue_message(rp, &rp_locks, mp, msg, NIL);
 
     if (swtrp->req_sched == esdp->no)
 	rp_locks &= ~ERTS_PROC_LOCK_MAIN;
@@ -1117,6 +1193,75 @@ erts_sched_wall_time_request(Process *c_p, int set, int enable)
     return ref;
 }
 
+static void
+reply_system_check(void *vscrp)
+{
+    ErtsSchedulerData *esdp = erts_get_scheduler_data();
+    ErtsSystemCheckReq *scrp = (ErtsSystemCheckReq *) vscrp;
+    ErtsProcLocks rp_locks = (scrp->req_sched == esdp->no ? ERTS_PROC_LOCK_MAIN : 0);
+    Process *rp = scrp->proc;
+    Eterm msg;
+    Eterm *hp = NULL;
+    Eterm **hpp;
+    Uint sz;
+    ErlOffHeap *ohp = NULL;
+    ErtsMessage *mp = NULL;
+
+    ASSERT(esdp);
+#ifdef ERTS_DIRTY_SCHEDULERS
+    ASSERT(!ERTS_SCHEDULER_IS_DIRTY(esdp));
+#endif
+
+    sz = REF_THING_SIZE;
+    mp = erts_alloc_message_heap(rp, &rp_locks, sz, &hp, &ohp);
+    hpp = &hp;
+    msg = STORE_NC(hpp, ohp, scrp->ref);
+
+    erts_queue_message(rp, &rp_locks, mp, msg, NIL);
+
+    if (scrp->req_sched == esdp->no)
+	rp_locks &= ~ERTS_PROC_LOCK_MAIN;
+
+    if (rp_locks)
+	erts_smp_proc_unlock(rp, rp_locks);
+
+    erts_proc_dec_refc(rp);
+
+    if (erts_smp_atomic32_dec_read_nob(&scrp->refc) == 0)
+	screq_free(vscrp);
+}
+
+
+Eterm erts_system_check_request(Process *c_p) {
+    ErtsSchedulerData *esdp = ERTS_PROC_GET_SCHDATA(c_p);
+    Eterm ref;
+    ErtsSystemCheckReq *scrp;
+    Eterm *hp;
+
+    scrp = screq_alloc();
+    ref = erts_make_ref(c_p);
+    hp = &scrp->ref_heap[0];
+
+    scrp->proc = c_p;
+    scrp->ref = STORE_NC(&hp, NULL, ref);
+    scrp->req_sched = esdp->no;
+    erts_smp_atomic32_init_nob(&scrp->refc, (erts_aint32_t) erts_no_schedulers);
+
+    erts_proc_add_refc(c_p, (Sint) erts_no_schedulers);
+
+#ifdef ERTS_SMP
+    if (erts_no_schedulers > 1)
+	erts_schedule_multi_misc_aux_work(1,
+					  erts_no_schedulers,
+					  reply_system_check,
+					  (void *) scrp);
+#endif
+
+    reply_system_check((void *) scrp);
+
+    return ref;
+}
+
 static ERTS_INLINE ErtsProcList *
 proclist_create(Process *p)
 {
@@ -1127,6 +1272,15 @@ proclist_create(Process *p)
     return plp;
 }
 
+static ERTS_INLINE ErtsProcList *
+proclist_copy(ErtsProcList *plp0)
+{
+    ErtsProcList *plp1 = proclist_alloc();
+    plp1->pid = plp0->pid;
+    plp1->started_interval = plp0->started_interval;
+    return plp1;
+}
+
 static ERTS_INLINE void
 proclist_destroy(ErtsProcList *plp)
 {
@@ -1134,6 +1288,12 @@ proclist_destroy(ErtsProcList *plp)
 }
 
 ErtsProcList *
+erts_proclist_copy(ErtsProcList *plp)
+{
+    return proclist_copy(plp);
+}
+
+ErtsProcList *
 erts_proclist_create(Process *p)
 {
     return proclist_create(p);
@@ -1146,46 +1306,25 @@ erts_proclist_destroy(ErtsProcList *plp)
 }
 
 void *
-erts_psd_set_init(Process *p, ErtsProcLocks plocks, int ix, void *data)
+erts_psd_set_init(Process *p, int ix, void *data)
 {
     void *old;
-    ErtsProcLocks xplocks;
-    int refc = 0;
-    ErtsPSD *psd = erts_alloc(ERTS_ALC_T_PSD, sizeof(ErtsPSD));
+    ErtsPSD *psd, *new_psd;
     int i;
-    for (i = 0; i < ERTS_PSD_SIZE; i++)
-	psd->data[i] = NULL;
 
-    ERTS_SMP_LC_ASSERT(plocks);
-    ERTS_SMP_LC_ASSERT(plocks == erts_proc_lc_my_proc_locks(p));
+    new_psd = erts_alloc(ERTS_ALC_T_PSD, sizeof(ErtsPSD));
+    for (i = 0; i < ERTS_PSD_SIZE; i++)
+	new_psd->data[i] = NULL;
 
-    xplocks = ERTS_PROC_LOCKS_ALL;
-    xplocks &= ~plocks;
-    if (xplocks && erts_smp_proc_trylock(p, xplocks) == EBUSY) {
-	if (xplocks & ERTS_PROC_LOCK_MAIN) {
-	    erts_proc_inc_refc(p);
-	    erts_smp_proc_unlock(p, plocks);
-	    erts_smp_proc_lock(p, ERTS_PROC_LOCKS_ALL);
-	    refc = 1;
-	}
-	else {
-	    if (plocks & ERTS_PROC_LOCKS_ALL_MINOR)
-		erts_smp_proc_unlock(p, plocks & ERTS_PROC_LOCKS_ALL_MINOR);
-	    erts_smp_proc_lock(p, ERTS_PROC_LOCKS_ALL_MINOR);
-	}
-    }
-    if (!p->psd)
-	p->psd = psd;
-    if (xplocks)
-	erts_smp_proc_unlock(p, xplocks);
-    if (refc)
-	erts_proc_dec_refc(p);
-    ASSERT(p->psd);
-    if (p->psd != psd)
-	erts_free(ERTS_ALC_T_PSD, psd);
-    old = p->psd->data[ix];
-    p->psd->data[ix] = data;
-    ERTS_SMP_LC_ASSERT(plocks == erts_proc_lc_my_proc_locks(p));
+    psd = (ErtsPSD *) erts_smp_atomic_cmpxchg_mb(&p->psd,
+						 (erts_aint_t) new_psd,
+						 (erts_aint_t) NULL);
+    if (psd)
+	erts_free(ERTS_ALC_T_PSD, new_psd);
+    else
+	psd = new_psd;
+    old = psd->data[ix];
+    psd->data[ix] = data;
     return old;
 }
 
@@ -1211,7 +1350,7 @@ erts_sched_finish_poke(ErtsSchedulerSleepInfo *ssi, erts_aint32_t flags)
     case 0:
 	break;
     default:
-	erl_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error\n",
+	erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error\n",
 		 __FILE__, __LINE__);
 	break;
     }
@@ -1724,15 +1863,17 @@ handle_delayed_dealloc(ErtsAuxWorkData *awdp, erts_aint32_t aux_work, int waitin
     int need_thr_progress = 0;
     ErtsThrPrgrVal wakeup = ERTS_THR_PRGR_INVALID;
     int more_work = 0;
-
+    ERTS_MSACC_PUSH_STATE_M_X();
 #ifdef ERTS_DIRTY_SCHEDULERS
     ASSERT(!awdp->esdp || !ERTS_SCHEDULER_IS_DIRTY(awdp->esdp));
 #endif
     unset_aux_work_flags(ssi, ERTS_SSI_AUX_WORK_DD);
+    ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_ALLOC);
     erts_alloc_scheduler_handle_delayed_dealloc((void *) awdp->esdp,
 						&need_thr_progress,
 						&wakeup,
 						&more_work);
+    ERTS_MSACC_POP_STATE_M_X();
     if (more_work) {
 	if (set_aux_work_flags(ssi, ERTS_SSI_AUX_WORK_DD)
 	    & ERTS_SSI_AUX_WORK_DD_THR_PRGR) {
@@ -2041,8 +2182,7 @@ setup_thr_debug_wait_completed(void *vproc)
     if (debug_wait_completed_flags & ERTS_DEBUG_WAIT_COMPLETED_DEALLOCATIONS) {
 	erts_alloc_fix_alloc_shrink(awdp->sched_id, 0);
 	wait_flags |= (ERTS_SSI_AUX_WORK_DD
-		       | ERTS_SSI_AUX_WORK_DD_THR_PRGR
-		       | ERTS_SSI_AUX_WORK_THR_PRGR_LATER_OP);
+		       | ERTS_SSI_AUX_WORK_DD_THR_PRGR);
 #ifdef ERTS_SMP
 	aux_work_flags |= ERTS_SSI_AUX_WORK_DD;
 #endif
@@ -2050,8 +2190,7 @@ setup_thr_debug_wait_completed(void *vproc)
 
     if (debug_wait_completed_flags & ERTS_DEBUG_WAIT_COMPLETED_TIMER_CANCELLATIONS) {
 	wait_flags |= (ERTS_SSI_AUX_WORK_CNCLD_TMRS
-		       | ERTS_SSI_AUX_WORK_CNCLD_TMRS_THR_PRGR
-		       | ERTS_SSI_AUX_WORK_THR_PRGR_LATER_OP);
+		       | ERTS_SSI_AUX_WORK_CNCLD_TMRS_THR_PRGR);
 #ifdef ERTS_SMP
 	if (awdp->esdp && !ERTS_SCHEDULER_IS_DIRTY(awdp->esdp))
 	    aux_work_flags |= ERTS_SSI_AUX_WORK_CNCLD_TMRS;
@@ -2065,26 +2204,42 @@ setup_thr_debug_wait_completed(void *vproc)
     awdp->debug.wait_completed.arg = vproc;
 }
 
-static void
-prep_setup_thr_debug_wait_completed(void *vproc)
+struct debug_lop {
+    ErtsThrPrgrLaterOp lop;
+    Process *proc;
+};
+
+static void later_thr_debug_wait_completed(void *vlop)
 {
+    struct debug_lop *lop = vlop;
     erts_aint32_t count = (erts_aint32_t) erts_no_schedulers;
 #ifdef ERTS_SMP
     count += 1; /* aux thread */
 #endif
     if (erts_atomic32_dec_read_mb(&debug_wait_completed_count) == count) {
-	/* scheduler threads */
-	erts_schedule_multi_misc_aux_work(0,
-					  erts_no_schedulers,
-					  setup_thr_debug_wait_completed,
-					  vproc);
+        /* scheduler threads */
+        erts_schedule_multi_misc_aux_work(0,
+                                          erts_no_schedulers,
+                                          setup_thr_debug_wait_completed,
+                                          lop->proc);
 #ifdef ERTS_SMP
-	/* aux_thread */
-	erts_schedule_misc_aux_work(0,
-				    setup_thr_debug_wait_completed,
-				    vproc);
+        /* aux_thread */
+        erts_schedule_misc_aux_work(0,
+                                    setup_thr_debug_wait_completed,
+                                    lop->proc);
 #endif
     }
+    erts_free(ERTS_ALC_T_DEBUG, lop);
+}
+
+
+static void
+init_thr_debug_wait_completed(void *vproc)
+{
+    struct debug_lop* lop = erts_alloc(ERTS_ALC_T_DEBUG,
+                                       sizeof(struct debug_lop));
+    lop->proc = vproc;
+    erts_schedule_thr_prgr_later_op(later_thr_debug_wait_completed, lop, &lop->lop);
 }
 
 
@@ -2094,7 +2249,7 @@ erts_debug_wait_completed(Process *c_p, int flags)
     /* Only one process at a time can do this */
     erts_aint32_t count = (erts_aint32_t) (2*erts_no_schedulers);
 #ifdef ERTS_SMP
-    count += 2; /* aux thread */
+    count += 1; /* aux thread */
 #endif
     if (0 == erts_atomic32_cmpxchg_mb(&debug_wait_completed_count,
 				      count,
@@ -2102,51 +2257,18 @@ erts_debug_wait_completed(Process *c_p, int flags)
 	debug_wait_completed_flags = flags;
 	erts_suspend(c_p, ERTS_PROC_LOCK_MAIN, NULL);
 	erts_proc_inc_refc(c_p);
-	/* scheduler threads */
+
+        /* First flush later-ops on all scheduler threads */
 	erts_schedule_multi_misc_aux_work(0,
 					  erts_no_schedulers,
-					  prep_setup_thr_debug_wait_completed,
+					  init_thr_debug_wait_completed,
 					  (void *) c_p);
-#ifdef ERTS_SMP
-	/* aux_thread */
-	erts_schedule_misc_aux_work(0,
-				    prep_setup_thr_debug_wait_completed,
-				    (void *) c_p);
-#endif
 	return 1;
     }
     return 0;
 }
 
 
-#ifdef ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
-void
-erts_smp_notify_check_children_needed(void)
-{
-    int i;
-    for (i = 0; i < erts_no_schedulers; i++)
-	set_aux_work_flags_wakeup_nob(ERTS_SCHED_SLEEP_INFO_IX(i),
-				      ERTS_SSI_AUX_WORK_CHECK_CHILDREN);
-#ifdef ERTS_DIRTY_SCHEDULERS
-    for (i = 0; i < erts_no_dirty_cpu_schedulers; i++)
-	set_aux_work_flags_wakeup_nob(ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(i),
-				      ERTS_SSI_AUX_WORK_CHECK_CHILDREN);
-    for (i = 0; i < erts_no_dirty_io_schedulers; i++)
-	set_aux_work_flags_wakeup_nob(ERTS_DIRTY_IO_SCHED_SLEEP_INFO_IX(i),
-				      ERTS_SSI_AUX_WORK_CHECK_CHILDREN);
-#endif
-}
-
-static ERTS_INLINE erts_aint32_t
-handle_check_children(ErtsAuxWorkData *awdp, erts_aint32_t aux_work, int waiting)
-{
-    unset_aux_work_flags(awdp->ssi, ERTS_SSI_AUX_WORK_CHECK_CHILDREN);
-    erts_check_children();
-    return aux_work & ~ERTS_SSI_AUX_WORK_CHECK_CHILDREN;
-}
-
-#endif
-
 static void
 notify_reap_ports_relb(void)
 {
@@ -2195,7 +2317,7 @@ handle_reap_ports(ErtsAuxWorkData *awdp, erts_aint32_t aux_work, int waiting)
 	    erts_port_release(prt);
 	}
 	if (erts_smp_atomic32_dec_read_nob(&erts_halt_progress) == 0) {
-	    erl_exit_flush_async(erts_halt_code, "");
+	    erts_flush_async_exit(erts_halt_code, "");
 	}
     }
     return aux_work & ~ERTS_SSI_AUX_WORK_REAP_PORTS;
@@ -2232,12 +2354,15 @@ handle_aux_work(ErtsAuxWorkData *awdp, erts_aint32_t orig_aux_work, int waiting)
 	ERTS_DBG_CHK_AUX_WORK_VAL(aux_work); \
 	if (!(aux_work & ~ignore)) { \
 	    ERTS_DBG_CHK_AUX_WORK_VAL(aux_work); \
+            ERTS_MSACC_UPDATE_CACHE();       \
+            ERTS_MSACC_POP_STATE_M();              \
 	    return aux_work; \
 	} \
     }
 
     erts_aint32_t aux_work = orig_aux_work;
     erts_aint32_t ignore = 0;
+    ERTS_MSACC_PUSH_AND_SET_STATE_M(ERTS_MSACC_STATE_AUX);
 
     ASSERT(!awdp->esdp || !ERTS_SCHEDULER_IS_DIRTY(awdp->esdp));
 #ifdef ERTS_SMP
@@ -2301,10 +2426,6 @@ handle_aux_work(ErtsAuxWorkData *awdp, erts_aint32_t orig_aux_work, int waiting)
     HANDLE_AUX_WORK(ERTS_SSI_AUX_WORK_MISC,
 		    handle_misc_aux_work);
 
-#ifdef ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
-    HANDLE_AUX_WORK(ERTS_SSI_AUX_WORK_CHECK_CHILDREN,
-		    handle_check_children);
-#endif
 
     HANDLE_AUX_WORK(ERTS_SSI_AUX_WORK_SET_TMO,
 		    handle_setup_aux_work_timer);
@@ -2332,6 +2453,8 @@ handle_aux_work(ErtsAuxWorkData *awdp, erts_aint32_t orig_aux_work, int waiting)
 	haw_thr_prgr_current_check_progress(awdp);
 #endif
 
+    ERTS_MSACC_UPDATE_CACHE();
+    ERTS_MSACC_POP_STATE_M();
     return aux_work;
 
 #undef HANDLE_AUX_WORK
@@ -2532,19 +2655,10 @@ try_set_sys_scheduling(void)
 #endif
 
 static ERTS_INLINE int
-prepare_for_sys_schedule(ErtsSchedulerData *esdp, int non_blocking)
+prepare_for_sys_schedule(int non_blocking)
 {
     if (non_blocking && erts_eager_check_io) {
 #ifdef ERTS_SMP
-#ifdef ERTS_SCHED_ONLY_POLL_SCHED_1
-	if (esdp->no != 1) {
-	    /* If we are not scheduler 1 and ERTS_SCHED_ONLY_POLL_SCHED_1 is used
-	       then we make sure to wake scheduler 1 */
-	    ErtsRunQueue *rq = ERTS_RUNQ_IX(0);
-	    wake_scheduler(rq);
-	    return 0;
-	}
-#endif
 	return try_set_sys_scheduling();
 #else
 	return 1;
@@ -2554,16 +2668,6 @@ prepare_for_sys_schedule(ErtsSchedulerData *esdp, int non_blocking)
 #ifdef ERTS_SMP
 	while (!erts_port_task_have_outstanding_io_tasks()
 	       && try_set_sys_scheduling()) {
-#ifdef ERTS_SCHED_ONLY_POLL_SCHED_1
-	    if (esdp->no != 1) {
-		/* If we are not scheduler 1 and ERTS_SCHED_ONLY_POLL_SCHED_1 is used
-		   then we make sure to wake scheduler 1 */
-		ErtsRunQueue *rq = ERTS_RUNQ_IX(0);
-		clear_sys_scheduling();
-		wake_scheduler(rq);
-		return 0;
-	    }
-#endif
 	    if (!erts_port_task_have_outstanding_io_tasks())
 		return 1;
 	    clear_sys_scheduling();
@@ -2615,13 +2719,6 @@ sched_active(Uint no, ErtsRunQueue *rq)
 	profile_scheduler(make_small(no), am_active);
 }
 
-static int ERTS_INLINE
-ongoing_multi_scheduling_block(void)
-{
-    ERTS_SMP_LC_ASSERT(erts_lc_mtx_is_locked(&schdlr_sspnd.mtx));
-    return schdlr_sspnd.msb.ongoing;
-}
-
 static ERTS_INLINE void
 empty_runq_aux(ErtsRunQueue *rq, Uint32 old_flags)
 {
@@ -2858,6 +2955,8 @@ aux_thread(void *unused)
 
     ssi->event = erts_tse_fetch();
 
+    erts_msacc_init_thread("aux", 1, 1);
+
     callbacks.arg = (void *) ssi;
     callbacks.wakeup = thr_prgr_wakeup;
     callbacks.prepare_wait = thr_prgr_prep_wait;
@@ -2868,6 +2967,7 @@ aux_thread(void *unused)
     init_aux_work_data(awdp, NULL, NULL);
     awdp->ssi = ssi;
 
+
     sched_prep_spin_wait(ssi);
 
     while (1) {
@@ -2887,8 +2987,6 @@ aux_thread(void *unused)
 		erts_thr_progress_active(NULL, thr_prgr_active = 0);
 	    erts_thr_progress_prepare_wait(NULL);
 
-	    ERTS_SCHED_FAIR_YIELD();
-
 	    flgs = sched_spin_wait(ssi, 0);
 
 	    if (flgs & ERTS_SSI_FLG_SLEEPING) {
@@ -2923,6 +3021,9 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 #ifdef ERTS_SMP
     int thr_prgr_active = 1;
     erts_aint32_t flgs;
+#endif
+    ERTS_MSACC_PUSH_STATE_M();
+#ifdef ERTS_SMP
 
     ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(rq));
 
@@ -2956,7 +3057,7 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
      * be waiting in erl_sys_schedule()
      */
 
-    if (ERTS_SCHEDULER_IS_DIRTY(esdp) || !prepare_for_sys_schedule(esdp, 0)) {
+    if (ERTS_SCHEDULER_IS_DIRTY(esdp) || !prepare_for_sys_schedule(0)) {
 
 	sched_waiting(esdp->no, rq);
 
@@ -2970,7 +3071,7 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 	    sched_wall_time_change(esdp, thr_prgr_active);
 
 	while (1) {
-	    ErtsMonotonicTime current_time;
+	    ErtsMonotonicTime current_time = 0;
 
 	    aux_work = erts_atomic32_read_acqb(&ssi->aux_work);
 	    if (aux_work && !ERTS_SCHEDULER_IS_DIRTY(esdp)) {
@@ -2979,6 +3080,7 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 		    sched_wall_time_change(esdp, 1);
 		}
 		aux_work = handle_aux_work(&esdp->aux_work_data, aux_work, 1);
+                ERTS_MSACC_UPDATE_CACHE();
 		if (aux_work && erts_thr_progress_update(esdp))
 		    erts_thr_progress_leader_update(esdp);
 	    }
@@ -3003,8 +3105,10 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 		    timeout_time = erts_check_next_timeout_time(esdp);
 		    current_time = erts_get_monotonic_time(esdp);
 		    do_timeout = (current_time >= timeout_time);
-		} else
+		} else {
+		    current_time = 0;
 		    timeout_time = ERTS_MONOTONIC_TIME_MAX;
+		}
 		if (do_timeout) {
 		    if (!thr_prgr_active) {
 			erts_thr_progress_active(esdp, thr_prgr_active = 1);
@@ -3020,8 +3124,6 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 			erts_thr_progress_prepare_wait(esdp);
 		    }
 
-		    ERTS_SCHED_FAIR_YIELD();
-
 		    flgs = sched_spin_wait(ssi, spincount);
 		    if (flgs & ERTS_SSI_FLG_SLEEPING) {
 			ASSERT(flgs & ERTS_SSI_FLG_WAITING);
@@ -3042,7 +3144,9 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 								     - 1) + 1;
 				} else
 				    timeout = -1;
+                                ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_SLEEP);
 				res = erts_tse_twait(ssi->event, timeout);
+                                ERTS_MSACC_POP_STATE_M();
 				current_time = ERTS_SCHEDULER_IS_DIRTY(esdp) ? 0 :
 				    erts_get_monotonic_time(esdp);
 			    } while (res == EINTR);
@@ -3092,13 +3196,8 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 #ifdef ERTS_DIRTY_SCHEDULERS
 	ASSERT(!ERTS_SCHEDULER_IS_DIRTY(esdp));
 #endif
-
-#ifdef ERTS_SCHED_ONLY_POLL_SCHED_1
-	ASSERT(esdp->no == 1);
-#endif
 	sched_waiting_sys(esdp->no, rq);
 
-
 	erts_smp_runq_unlock(rq);
 
 	ASSERT(working);
@@ -3116,9 +3215,14 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 	    if (working)
 		sched_wall_time_change(esdp, working = 0);
 
+	    ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_CHECK_IO);
+
 	    ASSERT(!erts_port_task_have_outstanding_io_tasks());
+            LTTNG2(scheduler_poll, esdp->no, 1);
 	    erl_sys_schedule(1); /* Might give us something to do */
 
+	    ERTS_MSACC_POP_STATE_M();
+
 	    if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
 		current_time = erts_get_monotonic_time(esdp);
 		if (current_time >= erts_next_timeout_time(esdp->next_tmo_ref))
@@ -3139,6 +3243,7 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 		    erts_thr_progress_active(esdp, thr_prgr_active = 1);
 #endif
 		aux_work = handle_aux_work(&esdp->aux_work_data, aux_work, 1);
+                ERTS_MSACC_UPDATE_CACHE();
 #ifdef ERTS_SMP
 		if (aux_work && erts_thr_progress_update(esdp))
 		    erts_thr_progress_leader_update(esdp);
@@ -3165,7 +3270,7 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 		 * Got to check that we still got I/O tasks; otherwise
 		 * we have to continue checking for I/O...
 		 */
-		if (!prepare_for_sys_schedule(esdp, 0)) {
+		if (!prepare_for_sys_schedule(0)) {
 		    spincount *= ERTS_SCHED_TSE_SLEEP_SPINCOUNT_FACT;
 		    goto tse_wait;
 		}
@@ -3187,7 +3292,7 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 	     * Got to check that we still got I/O tasks; otherwise
 	     * we have to wait in erl_sys_schedule() after all...
 	     */
-	    if (!prepare_for_sys_schedule(esdp, 0)) {
+	    if (!prepare_for_sys_schedule(0)) {
 		/*
 		 * Not allowed to wait in erl_sys_schedule;
 		 * do tse wait instead...
@@ -3236,8 +3341,13 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 
 	ASSERT(!erts_port_task_have_outstanding_io_tasks());
 
+	ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_CHECK_IO);
+        LTTNG2(scheduler_poll, esdp->no, 0);
+
 	erl_sys_schedule(0);
 
+	ERTS_MSACC_POP_STATE_M();
+
 	if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
 	    ErtsMonotonicTime current_time = erts_get_monotonic_time(esdp);
 	    if (current_time >= erts_next_timeout_time(esdp->next_tmo_ref))
@@ -3307,7 +3417,8 @@ wake_scheduler(ErtsRunQueue *rq)
      * so all code *should* handle this without having
      * the lock on the run queue.
      */
-    ERTS_SMP_LC_ASSERT(!erts_smp_lc_runq_is_locked(rq));
+    ERTS_SMP_LC_ASSERT(!erts_smp_lc_runq_is_locked(rq)
+		       || ERTS_RUNQ_IX_IS_DIRTY(rq->ix));
 
     ssi = rq->scheduler->ssi;
 
@@ -3632,6 +3743,13 @@ check_requeue_process(ErtsRunQueue *rq, int prio_q)
     return 0;
 }
 
+static ERTS_INLINE void
+free_proxy_proc(Process *proxy)
+{
+    ASSERT(erts_smp_atomic32_read_nob(&proxy->state) & ERTS_PSFLG_PROXY);
+    erts_free(ERTS_ALC_T_PROC, proxy);
+}
+
 #ifdef ERTS_SMP
 
 static ErtsRunQueue *
@@ -3714,7 +3832,7 @@ immigrate(ErtsRunQueue *c_rq, ErtsMigrationPath *mp)
 	    prio = ERTS_PORT_PRIO_LEVEL;
 	    break;
 	default:
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "%s:%d:%s(): Invalid immigrate queue mask",
 		     __FILE__, __LINE__, __func__);
 	    prio = 0;
@@ -3738,7 +3856,7 @@ immigrate(ErtsRunQueue *c_rq, ErtsMigrationPath *mp)
 		    rq = erts_port_runq(prt);
 		    if (rq) {
 			if (rq != c_rq)
-			    erl_exit(ERTS_ABORT_EXIT,
+			    erts_exit(ERTS_ABORT_EXIT,
 				     "%s:%d:%s(): Internal error",
 				     __FILE__, __LINE__, __func__);
 			erts_enqueue_port(c_rq, prt);
@@ -3803,24 +3921,33 @@ static ERTS_INLINE void
 resume_run_queue(ErtsRunQueue *rq)
 {
     int pix;
+    Uint32 oflgs;
 
     erts_smp_runq_lock(rq);
 
-    (void) ERTS_RUNQ_FLGS_READ_BSET(rq,
-				    (ERTS_RUNQ_FLG_OUT_OF_WORK
-				     | ERTS_RUNQ_FLG_HALFTIME_OUT_OF_WORK
-				     | ERTS_RUNQ_FLG_SUSPENDED),
-				    (ERTS_RUNQ_FLG_OUT_OF_WORK
-				     | ERTS_RUNQ_FLG_HALFTIME_OUT_OF_WORK));
+    oflgs = ERTS_RUNQ_FLGS_READ_BSET(rq,
+				     (ERTS_RUNQ_FLG_OUT_OF_WORK
+				      | ERTS_RUNQ_FLG_HALFTIME_OUT_OF_WORK
+				      | ERTS_RUNQ_FLG_SUSPENDED),
+				     (ERTS_RUNQ_FLG_OUT_OF_WORK
+				      | ERTS_RUNQ_FLG_HALFTIME_OUT_OF_WORK));
+
+    if (oflgs & ERTS_RUNQ_FLG_SUSPENDED) {
+	erts_aint32_t len;
+
+	rq->check_balance_reds = ERTS_RUNQ_CALL_CHECK_BALANCE_REDS;
+	for (pix = 0; pix < ERTS_NO_PROC_PRIO_LEVELS; pix++) {
+	    len = erts_smp_atomic32_read_dirty(&rq->procs.prio_info[pix].len);
+	    rq->procs.prio_info[pix].max_len = len;
+	    rq->procs.prio_info[pix].reds = 0;
+	}
+	len = erts_smp_atomic32_read_dirty(&rq->ports.info.len);
+	rq->ports.info.max_len = len;
+	rq->ports.info.reds = 0;
+	len = erts_smp_atomic32_read_dirty(&rq->len);
+	rq->max_len = len;
 
-    rq->check_balance_reds = ERTS_RUNQ_CALL_CHECK_BALANCE_REDS;
-    for (pix = 0; pix < ERTS_NO_PROC_PRIO_LEVELS; pix++) {
-	rq->procs.prio_info[pix].max_len = 0;
-	rq->procs.prio_info[pix].reds = 0;
     }
-    rq->ports.info.max_len = 0;
-    rq->ports.info.reds = 0;
-    rq->max_len = 0;
 
     erts_smp_runq_unlock(rq);
 
@@ -3929,7 +4056,7 @@ evacuate_run_queue(ErtsRunQueue *rq,
 	    prt_rq = erts_port_runq(prt);
 	    if (prt_rq) {
 		if (prt_rq != to_rq)
-		    erl_exit(ERTS_ABORT_EXIT,
+		    erts_exit(ERTS_ABORT_EXIT,
 			     "%s:%d:%s() internal error\n",
 			     __FILE__, __LINE__, __func__);
 		erts_enqueue_port(to_rq, prt);
@@ -3946,9 +4073,6 @@ evacuate_run_queue(ErtsRunQueue *rq,
 	erts_aint32_t state;
 	Process *proc;
 	int notify = 0;
-#ifdef ERTS_DIRTY_SCHEDULERS
-	int requeue;
-#endif
 	to_rq = NULL;
 
 #ifdef ERTS_DIRTY_SCHEDULERS
@@ -3963,49 +4087,94 @@ evacuate_run_queue(ErtsRunQueue *rq,
 
 	proc = dequeue_process(rq, prio_q, &state);
 	while (proc) {
-#ifdef ERTS_DIRTY_SCHEDULERS
-	    requeue = 1;
+	    Process *real_proc;
+	    int prio;
+	    erts_aint32_t max_qbit, qbit, real_state;
+
+	    prio = ERTS_PSFLGS_GET_PRQ_PRIO(state);
+	    qbit = ((erts_aint32_t) 1) << prio;
+
+	    if (!(state & ERTS_PSFLG_PROXY)) {
+		real_proc = proc;
+		real_state = state;
+	    }
+	    else {
+		real_proc = erts_proc_lookup_raw(proc->common.id);
+		if (!real_proc) {
+		    free_proxy_proc(proc);
+		    goto handle_next_proc;
+		}
+		real_state =  erts_smp_atomic32_read_acqb(&real_proc->state);
+	    }
+
+	    max_qbit = (state >> ERTS_PSFLGS_IN_PRQ_MASK_OFFSET);
+	    max_qbit &= ERTS_PSFLGS_QMASK;
+	    max_qbit |= 1 << ERTS_PSFLGS_QMASK_BITS;
+	    max_qbit &= -max_qbit;
+
+	    if (qbit > max_qbit) {
+		/* Process already queued with higher prio; drop it... */
+		if (real_proc != proc)
+		    free_proxy_proc(proc);
+		else {
+		    erts_aint32_t clr_bits;
+#ifdef DEBUG
+		    erts_aint32_t old;
 #endif
-	    if (ERTS_PSFLG_BOUND & state) {
-		/* Bound processes get stuck here... */
-		proc->next = NULL;
-		if (sbpp->last)
-		    sbpp->last->next = proc;
-		else
-		    sbpp->first = proc;
-		sbpp->last = proc;
-#ifdef ERTS_DIRTY_SCHEDULERS
-		requeue = 0;
+
+		    clr_bits = ERTS_PSFLG_IN_RUNQ;
+		    clr_bits |= qbit << ERTS_PSFLGS_IN_PRQ_MASK_OFFSET;
+
+#ifdef DEBUG
+		    old =
+#else
+			(void)
 #endif
+			erts_smp_atomic32_read_band_mb(&proc->state,
+						       ~clr_bits);
+			ASSERT((old & clr_bits) == clr_bits);
+
+		}
+
+		goto handle_next_proc;
 	    }
+
 #ifdef ERTS_DIRTY_SCHEDULERS
-	    else if (state & ERTS_PSFLG_DIRTY_CPU_PROC_IN_Q) {
+
+	    if (ERTS_RUNQ_IX_IS_DIRTY(rq->ix)) {
+		erts_aint32_t dqbit = qbit;
 #ifdef DEBUG
-		erts_aint32_t old =
-#else
-		(void)
+		erts_aint32_t old_dqbit;
 #endif
-		    erts_smp_atomic32_read_band_nob(&proc->state,
-						    ~(ERTS_PSFLG_DIRTY_CPU_PROC
-						      | ERTS_PSFLG_DIRTY_CPU_PROC_IN_Q));
-		/* assert that no other dirty flags are set */
-		ASSERT(!(old & (ERTS_PSFLG_DIRTY_IO_PROC|ERTS_PSFLG_DIRTY_IO_PROC_IN_Q)));
-	    } else if (state & ERTS_PSFLG_DIRTY_IO_PROC_IN_Q) {
+
+		if (rq == ERTS_DIRTY_CPU_RUNQ)
+		    dqbit <<= ERTS_PDSFLGS_IN_CPU_PRQ_MASK_OFFSET;
+		else {
+		    ASSERT(rq == ERTS_DIRTY_IO_RUNQ);
+		    dqbit <<= ERTS_PDSFLGS_IN_IO_PRQ_MASK_OFFSET;
+		}
+
 #ifdef DEBUG
-		erts_aint32_t old =
+		old_dqbit = (int)
 #else
-		(void)
+		    (void)
 #endif
-		    erts_smp_atomic32_read_band_nob(&proc->state,
-						    ~(ERTS_PSFLG_DIRTY_IO_PROC
-						      | ERTS_PSFLG_DIRTY_IO_PROC_IN_Q));
-		/* assert that no other dirty flags are set */
-		ASSERT(!(old & (ERTS_PSFLG_DIRTY_CPU_PROC|ERTS_PSFLG_DIRTY_CPU_PROC_IN_Q)));
+		    erts_smp_atomic32_read_band_mb(&real_proc->dirty_state,
+						   ~dqbit);
+		ASSERT(old_dqbit & dqbit);
 	    }
-	    if (requeue) {
-#else
-	    else {
 #endif
+
+	    if (ERTS_PSFLG_BOUND & real_state) {
+		/* Bound processes get stuck here... */
+		proc->next = NULL;
+		if (sbpp->last)
+		    sbpp->last->next = proc;
+		else
+		    sbpp->first = proc;
+		sbpp->last = proc;
+	    }
+	    else {
 		int prio = (int) ERTS_PSFLGS_GET_PRQ_PRIO(state);
 		erts_smp_runq_unlock(rq);
 
@@ -4028,6 +4197,8 @@ evacuate_run_queue(ErtsRunQueue *rq,
 
 		erts_smp_runq_lock(rq);
 	    }
+
+	handle_next_proc:
 	    proc = dequeue_process(rq, prio_q, &state);
 	}
 	if (notify)
@@ -4130,7 +4301,7 @@ no_procs:
 	    return 0;
 	else {
 	    if (prt_rq != rq)
-		erl_exit(ERTS_ABORT_EXIT,
+		erts_exit(ERTS_ABORT_EXIT,
 			 "%s:%d:%s() internal error\n",
 			 __FILE__, __LINE__, __func__);
 	    *rq_lockedp = 1;
@@ -5308,17 +5479,11 @@ erts_early_init_scheduling(int no_schedulers)
     wakeup_other.threshold = ERTS_SCHED_WAKEUP_OTHER_THRESHOLD_MEDIUM;
     wakeup_other.type = ERTS_SCHED_WAKEUP_OTHER_TYPE_DEFAULT;
 #endif
-#ifndef ERTS_SCHED_MIN_SPIN
     sched_busy_wait.sys_schedule = ERTS_SCHED_SYS_SLEEP_SPINCOUNT_MEDIUM;
     sched_busy_wait.tse = (ERTS_SCHED_SYS_SLEEP_SPINCOUNT_MEDIUM
 			   * ERTS_SCHED_TSE_SLEEP_SPINCOUNT_FACT);
     sched_busy_wait.aux_work = (ERTS_SCHED_SYS_SLEEP_SPINCOUNT_MEDIUM
 				* ERTS_SCHED_AUX_WORK_SLEEP_SPINCOUNT_FACT_MEDIUM);
-#else
-    sched_busy_wait.sys_schedule = ERTS_SCHED_SYS_SLEEP_SPINCOUNT_NONE;
-    sched_busy_wait.tse = ERTS_SCHED_SYS_SLEEP_SPINCOUNT_NONE;
-    sched_busy_wait.aux_work = ERTS_SCHED_SYS_SLEEP_SPINCOUNT_NONE;
-#endif
 }
 
 int
@@ -5502,9 +5667,6 @@ init_scheduler_data(ErtsSchedulerData* esdp, int num,
     esdp->f_reg_array =
 	erts_alloc_permanent_cache_aligned(ERTS_ALC_T_BEAM_REGISTER,
 					   MAX_REG * sizeof(FloatDef));
-#if !HEAP_ON_C_STACK
-    esdp->num_tmp_heap_used = 0;
-#endif
 #ifdef ERTS_DIRTY_SCHEDULERS
     if (ERTS_RUNQ_IX_IS_DIRTY(runq->ix)) {
 	esdp->no = 0;
@@ -5564,6 +5726,9 @@ erts_init_scheduling(int no_schedulers, int no_schedulers_online
     char *daww_ptr;
     size_t daww_sz;
     size_t size_runqs;
+#ifdef ERTS_SMP
+    erts_aint32_t set_schdlr_sspnd_change_flags;
+#endif
 
     init_misc_op_list_alloc();
     init_proc_sys_task_queues_alloc();
@@ -5789,9 +5954,8 @@ erts_init_scheduling(int no_schedulers, int no_schedulers_online
 #endif
 
     init_misc_aux_work();
-#if !HALFWORD_HEAP
     init_swtreq_alloc();
-#endif
+    init_screq_alloc();
 
     erts_atomic32_init_nob(&debug_wait_completed_count, 0); /* debug only */
     debug_wait_completed_flags = 0;
@@ -5802,25 +5966,6 @@ erts_init_scheduling(int no_schedulers, int no_schedulers_online
 	erts_alloc_permanent_cache_aligned(ERTS_ALC_T_SCHDLR_DATA,
 					   sizeof(ErtsAuxWorkData));
 
-    erts_smp_mtx_init(&schdlr_sspnd.mtx, "schdlr_sspnd");
-    erts_smp_cnd_init(&schdlr_sspnd.cnd);
-
-    erts_smp_atomic32_init_nob(&schdlr_sspnd.changing, 0);
-    schdlr_sspnd.online = no_schedulers_online;
-    schdlr_sspnd.curr_online = no_schedulers;
-    schdlr_sspnd.msb.ongoing = 0;
-    erts_smp_atomic32_init_nob(&schdlr_sspnd.active, no_schedulers);
-#ifdef ERTS_DIRTY_SCHEDULERS
-    erts_smp_atomic32_init_nob(&schdlr_sspnd.dirty_cpu_changing, 0);
-    schdlr_sspnd.dirty_cpu_online = no_dirty_cpu_schedulers_online;
-    schdlr_sspnd.dirty_cpu_curr_online = no_dirty_cpu_schedulers;
-    erts_smp_atomic32_init_nob(&schdlr_sspnd.dirty_cpu_active, no_dirty_cpu_schedulers);
-    erts_smp_atomic32_init_nob(&schdlr_sspnd.dirty_io_changing, 0);
-    schdlr_sspnd.dirty_io_online = no_dirty_io_schedulers;
-    schdlr_sspnd.dirty_io_curr_online = no_dirty_io_schedulers;
-    erts_smp_atomic32_init_nob(&schdlr_sspnd.dirty_io_active, no_dirty_io_schedulers);
-#endif
-    schdlr_sspnd.msb.procs = NULL;
     init_no_runqs(no_schedulers_online, no_schedulers_online);
     balance_info.last_active_runqs = no_schedulers;
     erts_smp_mtx_init(&balance_info.update_mtx, "migration_info_update");
@@ -5835,32 +5980,66 @@ erts_init_scheduling(int no_schedulers, int no_schedulers_online
 
     init_migration_paths();
 
-    if (no_schedulers_online < no_schedulers) {
+    init_scheduler_suspend();
+
+    set_schdlr_sspnd_change_flags = 0;
+
+    schdlr_sspnd_set_nscheds(&schdlr_sspnd.online,
+			     ERTS_SCHED_NORMAL,
+			     no_schedulers_online);
+    schdlr_sspnd_set_nscheds(&schdlr_sspnd.curr_online,
+			     ERTS_SCHED_NORMAL,
+			     no_schedulers);
+    schdlr_sspnd_set_nscheds(&schdlr_sspnd.active,
+			     ERTS_SCHED_NORMAL,
+			     no_schedulers);
+
+    if (no_schedulers_online != no_schedulers) {
+	ASSERT(no_schedulers_online < no_schedulers);
+	set_schdlr_sspnd_change_flags |= ERTS_SCHDLR_SSPND_CHNG_ONLN;
+	schdlr_sspnd.changer = am_init;
 	change_no_used_runqs(no_schedulers_online);
 	for (ix = no_schedulers_online; ix < erts_no_run_queues; ix++)
 	    suspend_run_queue(ERTS_RUNQ_IX(ix));
     }
 
-    schdlr_sspnd.wait_curr_online = no_schedulers_online;
-    schdlr_sspnd.curr_online *= 2; /* Boot strapping... */
-    ERTS_SCHDLR_SSPND_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_ONLN
-				| ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
 #ifdef ERTS_DIRTY_SCHEDULERS
-    schdlr_sspnd.dirty_cpu_wait_curr_online = no_dirty_cpu_schedulers_online;
-    schdlr_sspnd.dirty_cpu_curr_online *= 2;
-    ERTS_SCHDLR_SSPND_DIRTY_CPU_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_ONLN
-					  | ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
-    for (ix = no_dirty_cpu_schedulers_online; ix < no_dirty_cpu_schedulers; ix++) {
-	ErtsSchedulerData* esdp = ERTS_DIRTY_CPU_SCHEDULER_IX(ix);
-	erts_smp_atomic32_read_bor_nob(&esdp->ssi->flags, ERTS_SSI_FLG_SUSPENDED);
+
+    schdlr_sspnd_set_nscheds(&schdlr_sspnd.online,
+			     ERTS_SCHED_DIRTY_CPU,
+			     no_dirty_cpu_schedulers_online);
+    schdlr_sspnd_set_nscheds(&schdlr_sspnd.curr_online,
+			     ERTS_SCHED_DIRTY_CPU,
+			     no_dirty_cpu_schedulers);
+    schdlr_sspnd_set_nscheds(&schdlr_sspnd.active,
+			     ERTS_SCHED_DIRTY_CPU,
+			     no_dirty_cpu_schedulers);
+
+    if (no_dirty_cpu_schedulers_online != no_dirty_cpu_schedulers) {
+	ASSERT(no_dirty_cpu_schedulers_online < no_dirty_cpu_schedulers);
+	set_schdlr_sspnd_change_flags |= ERTS_SCHDLR_SSPND_CHNG_DCPU_ONLN;
+	for (ix = no_dirty_cpu_schedulers_online; ix < no_dirty_cpu_schedulers; ix++) {
+	    ErtsSchedulerData* esdp = ERTS_DIRTY_CPU_SCHEDULER_IX(ix);
+	    erts_smp_atomic32_read_bor_nob(&esdp->ssi->flags, ERTS_SSI_FLG_SUSPENDED);
+	}
     }
 
-    schdlr_sspnd.dirty_io_wait_curr_online = no_dirty_io_schedulers;
-    schdlr_sspnd.dirty_io_curr_online *= 2;
-    ERTS_SCHDLR_SSPND_DIRTY_IO_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_ONLN
-					 | ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
+    schdlr_sspnd_set_nscheds(&schdlr_sspnd.online,
+			     ERTS_SCHED_DIRTY_IO,
+			     no_dirty_io_schedulers);
+    schdlr_sspnd_set_nscheds(&schdlr_sspnd.curr_online,
+			     ERTS_SCHED_DIRTY_IO,
+			     no_dirty_io_schedulers);
+    schdlr_sspnd_set_nscheds(&schdlr_sspnd.active,
+			     ERTS_SCHED_DIRTY_IO,
+			     no_dirty_io_schedulers);
+
 #endif
 
+    if (set_schdlr_sspnd_change_flags)
+	erts_smp_atomic32_set_nob(&schdlr_sspnd.changing,
+				  set_schdlr_sspnd_change_flags);
+
     erts_smp_atomic32_init_nob(&doing_sys_schedule, 0);
 
     init_misc_aux_work();
@@ -5875,11 +6054,9 @@ erts_init_scheduling(int no_schedulers, int no_schedulers_online
 #endif
     }
     erts_no_schedulers = 1;
-#ifdef ERTS_DIRTY_SCHEDULERS
     erts_no_dirty_cpu_schedulers = 0;
     erts_no_dirty_io_schedulers = 0;
 #endif
-#endif
 
     erts_smp_atomic32_init_nob(&function_calls, 0);
 
@@ -5971,19 +6148,96 @@ make_proxy_proc(Process *prev_proxy, Process *proc, erts_aint32_t prio)
     return proxy;
 }
 
-static ERTS_INLINE void
-free_proxy_proc(Process *proxy)
-{
-    ASSERT(erts_smp_atomic32_read_nob(&proxy->state) & ERTS_PSFLG_PROXY);
-    erts_free(ERTS_ALC_T_PROC, proxy);
-}
-
 #define ERTS_ENQUEUE_NOT 0
 #define ERTS_ENQUEUE_NORMAL_QUEUE 1
-#ifdef ERTS_DIRTY_SCHEDULERS
 #define ERTS_ENQUEUE_DIRTY_CPU_QUEUE 2
 #define ERTS_ENQUEUE_DIRTY_IO_QUEUE 3
+
+#ifdef ERTS_DIRTY_SCHEDULERS
+
+static int
+check_dirty_enqueue_in_prio_queue(Process *c_p,
+				  erts_aint32_t *newp,
+				  erts_aint32_t actual,
+				  erts_aint32_t aprio,
+				  erts_aint32_t qbit)
+{
+    int queue;
+    erts_aint32_t dact, max_qbit;
+
+    /* Termination should be done on an ordinary scheduler */
+    if (actual & ERTS_PSFLG_EXITING) {
+	*newp &= ~ERTS_PSFLGS_DIRTY_WORK;
+	return ERTS_ENQUEUE_NORMAL_QUEUE;
+    }
+
+    /*
+     * If we have system tasks, we enqueue on ordinary run-queue
+     * and take care of those system tasks first.
+     */
+    if (actual & ERTS_PSFLG_ACTIVE_SYS)
+	return ERTS_ENQUEUE_NORMAL_QUEUE;
+
+    dact = erts_smp_atomic32_read_mb(&c_p->dirty_state);
+    if (actual & (ERTS_PSFLG_DIRTY_ACTIVE_SYS
+		  | ERTS_PSFLG_DIRTY_CPU_PROC)) {
+	max_qbit = ((dact >> ERTS_PDSFLGS_IN_CPU_PRQ_MASK_OFFSET)
+		    & ERTS_PDSFLGS_QMASK);
+	queue = ERTS_ENQUEUE_DIRTY_CPU_QUEUE;
+    }
+    else {
+	ASSERT(actual & ERTS_PSFLG_DIRTY_IO_PROC);
+	max_qbit = ((dact >> ERTS_PDSFLGS_IN_IO_PRQ_MASK_OFFSET)
+		    & ERTS_PDSFLGS_QMASK);
+	queue = ERTS_ENQUEUE_DIRTY_IO_QUEUE;
+    }
+
+    max_qbit |= 1 << ERTS_PSFLGS_QMASK_BITS;
+    max_qbit &= -max_qbit;
+
+    if (qbit >= max_qbit)
+	return ERTS_ENQUEUE_NOT; /* Already queued in higher or equal prio */
+    if ((actual & (ERTS_PSFLG_IN_RUNQ|ERTS_PSFLGS_USR_PRIO_MASK))
+	!= (aprio << ERTS_PSFLGS_USR_PRIO_OFFSET)) {
+	/*
+	 * Process struct already enqueued, or actual prio not
+	 * equal to user prio, i.e., enqueue using proxy.
+	 */
+	return -1*queue;
+    }
+
+    *newp |= ERTS_PSFLG_IN_RUNQ;
+    return queue;
+}
+
+static ERTS_INLINE int
+fin_dirty_enq_s_change(Process *p,
+		       int pstruct_reserved,
+		       erts_aint32_t enq_prio,
+		       int qmask_offset)
+{
+    erts_aint32_t qbit = 1 << enq_prio;
+    qbit <<= qmask_offset;
+
+    if (qbit & erts_smp_atomic32_read_bor_mb(&p->dirty_state, qbit)) {
+	/* Already enqueue by someone else... */
+	if (pstruct_reserved) {
+	    /* We reserved process struct for enqueue; clear it... */
+#ifdef DEBUG
+	    erts_aint32_t old =
+#else
+		(void)
 #endif
+		erts_smp_atomic32_read_band_nob(&p->state, ~ERTS_PSFLG_IN_RUNQ);
+	    ASSERT(old & ERTS_PSFLG_IN_RUNQ);
+	}
+	return 0;
+    }
+
+    return !0;
+}
+
+#endif /* ERTS_DIRTY_SCHEDULERS */
 
 static ERTS_INLINE int
 check_enqueue_in_prio_queue(Process *c_p,
@@ -5999,61 +6253,14 @@ check_enqueue_in_prio_queue(Process *c_p,
     *prq_prio_p = aprio;
 
 #ifdef ERTS_DIRTY_SCHEDULERS
-    if (actual & (ERTS_PSFLG_DIRTY_CPU_PROC|ERTS_PSFLG_DIRTY_IO_PROC)) {
-        /*
-         * If we have system tasks of a priority higher
-         * or equal to the user priority, we enqueue
-         * on ordinary run-queue and take care of
-         * those system tasks first.
-         */
-        if (actual & ERTS_PSFLG_ACTIVE_SYS) {
-            erts_aint32_t uprio, stprio, qmask;
-            uprio = (actual >> ERTS_PSFLGS_USR_PRIO_OFFSET) & ERTS_PSFLGS_PRIO_MASK;
-            if (aprio < uprio)
-                goto enqueue_normal_runq; /* system tasks with higher prio */
-            erts_smp_proc_lock(c_p, ERTS_PROC_LOCK_STATUS);
-            qmask = c_p->sys_task_qs->qmask;
-            erts_smp_proc_unlock(c_p, ERTS_PROC_LOCK_STATUS);
-            switch (qmask & -qmask) {
-            case MAX_BIT:
-                stprio = PRIORITY_MAX;
-                break;
-            case HIGH_BIT:
-                stprio = PRIORITY_HIGH;
-                break;
-            case NORMAL_BIT:
-                stprio = PRIORITY_NORMAL;
-                break;
-            case LOW_BIT:
-                stprio = PRIORITY_LOW;
-                break;
-            default:
-                stprio = PRIORITY_LOW+1;
-                break;
-            }
-            if (stprio <= uprio)
-                goto enqueue_normal_runq; /* system tasks with higher prio */
-        }
-
-        /* Enqueue in dirty run queue if not already enqueued */
-	if (actual & (ERTS_PSFLG_DIRTY_CPU_PROC_IN_Q|ERTS_PSFLG_DIRTY_IO_PROC_IN_Q))
-	    return ERTS_ENQUEUE_NOT; /* already in queue */
-        if (actual & ERTS_PSFLG_DIRTY_CPU_PROC) {
-	    *newp |= ERTS_PSFLG_DIRTY_CPU_PROC_IN_Q;
-            if (actual & ERTS_PSFLG_IN_RUNQ)
-                return -ERTS_ENQUEUE_DIRTY_CPU_QUEUE; /* use proxy */
-	    *newp |= ERTS_PSFLG_IN_RUNQ;
-            return ERTS_ENQUEUE_DIRTY_CPU_QUEUE;
-        }
-	*newp |= ERTS_PSFLG_DIRTY_IO_PROC_IN_Q;
-        if (actual & ERTS_PSFLG_IN_RUNQ)
-            return -ERTS_ENQUEUE_DIRTY_IO_QUEUE; /* use proxy */
-	*newp |= ERTS_PSFLG_IN_RUNQ;
-        return ERTS_ENQUEUE_DIRTY_IO_QUEUE;
+    if (actual & ERTS_PSFLGS_DIRTY_WORK) {
+	int res = check_dirty_enqueue_in_prio_queue(c_p, newp, actual,
+						    aprio, qbit);
+	if (res != ERTS_ENQUEUE_NORMAL_QUEUE)
+	    return res;
     }
-
- enqueue_normal_runq:
 #endif
+
     max_qbit = (actual >> ERTS_PSFLGS_IN_PRQ_MASK_OFFSET) & ERTS_PSFLGS_QMASK;
     max_qbit |= 1 << ERTS_PSFLGS_QMASK_BITS;
     max_qbit &= -max_qbit;
@@ -6085,6 +6292,65 @@ check_enqueue_in_prio_queue(Process *c_p,
     return ERTS_ENQUEUE_NORMAL_QUEUE;
 }
 
+static ERTS_INLINE ErtsRunQueue *
+select_enqueue_run_queue(int enqueue, int enq_prio, Process *p, erts_aint32_t state)
+{
+
+    switch (enqueue) {
+
+    case ERTS_ENQUEUE_NOT:
+
+	return NULL;
+
+#ifdef ERTS_DIRTY_SCHEDULERS
+
+    case ERTS_ENQUEUE_DIRTY_CPU_QUEUE:
+    case -ERTS_ENQUEUE_DIRTY_CPU_QUEUE:
+
+	if (fin_dirty_enq_s_change(p, enqueue > 0, enq_prio,
+				   ERTS_PDSFLGS_IN_CPU_PRQ_MASK_OFFSET))
+	    return ERTS_DIRTY_CPU_RUNQ;
+
+	return NULL;
+
+
+    case ERTS_ENQUEUE_DIRTY_IO_QUEUE:
+    case -ERTS_ENQUEUE_DIRTY_IO_QUEUE:
+
+	if (fin_dirty_enq_s_change(p, enqueue > 0, enq_prio,
+				   ERTS_PDSFLGS_IN_IO_PRQ_MASK_OFFSET))
+	    return ERTS_DIRTY_IO_RUNQ;
+
+	return NULL;
+
+#endif
+
+    default: {
+	ErtsRunQueue* runq;
+
+	ASSERT(enqueue == ERTS_ENQUEUE_NORMAL_QUEUE
+	       || enqueue == -ERTS_ENQUEUE_NORMAL_QUEUE);
+
+	runq = erts_get_runq_proc(p);
+
+#ifdef ERTS_SMP
+	if (!(ERTS_PSFLG_BOUND & state)) {
+	    ErtsRunQueue *new_runq = erts_check_emigration_need(runq, enq_prio);
+	    if (new_runq) {
+		RUNQ_SET_RQ(&p->run_queue, new_runq);
+		runq = new_runq;
+	    }
+	}
+#endif
+
+	ASSERT(runq);
+
+	return runq;
+    }
+    }
+}
+
+
 /*
  * schedule_out_process() return with c_rq locked.
  */
@@ -6093,11 +6359,7 @@ schedule_out_process(ErtsRunQueue *c_rq, erts_aint32_t state, Process *p, Proces
 {
     erts_aint32_t a, e, n, enq_prio = -1;
     int enqueue; /* < 0 -> use proxy */
-    Process* sched_p;
     ErtsRunQueue* runq;
-#ifdef ERTS_SMP
-    int check_emigration_need;
-#endif
 
     a = state;
 
@@ -6109,7 +6371,7 @@ schedule_out_process(ErtsRunQueue *c_rq, erts_aint32_t state, Process *p, Proces
 	enqueue = ERTS_ENQUEUE_NOT;
 
 	n &= ~(ERTS_PSFLG_RUNNING|ERTS_PSFLG_RUNNING_SYS);
-	if (a & ERTS_PSFLG_ACTIVE_SYS
+	if (a & (ERTS_PSFLG_ACTIVE_SYS|ERTS_PSFLG_DIRTY_ACTIVE_SYS)
 	    || (a & (ERTS_PSFLG_ACTIVE|ERTS_PSFLG_SUSPENDED)) == ERTS_PSFLG_ACTIVE) {
 	    enqueue = check_enqueue_in_prio_queue(p, &enq_prio, &n, a);
 	}
@@ -6118,16 +6380,17 @@ schedule_out_process(ErtsRunQueue *c_rq, erts_aint32_t state, Process *p, Proces
 	    break;
     }
 
-    switch (enqueue) {
-    case ERTS_ENQUEUE_NOT:
+    runq = select_enqueue_run_queue(enqueue, enq_prio, p, n);
+
+    if (!runq) {
+
 	if (erts_system_profile_flags.runnable_procs) {
 
 	    /* Status lock prevents out of order "runnable proc" trace msgs */
 	    ERTS_SMP_LC_ASSERT(ERTS_PROC_LOCK_STATUS & erts_proc_lc_my_proc_locks(p));
 
-	    if (!(a & ERTS_PSFLG_ACTIVE_SYS)
-		&& (!(a & ERTS_PSFLG_ACTIVE)
-		    || (a & ERTS_PSFLG_SUSPENDED))) {
+	    if (!(a & (ERTS_PSFLG_ACTIVE_SYS|ERTS_PSFLG_DIRTY_ACTIVE_SYS))
+		&& (!(a & ERTS_PSFLG_ACTIVE) || (a & ERTS_PSFLG_SUSPENDED))) {
 		/* Process inactive */
 		profile_runnable_proc(p, am_inactive);
 	    }
@@ -6140,98 +6403,76 @@ schedule_out_process(ErtsRunQueue *c_rq, erts_aint32_t state, Process *p, Proces
 
 	return 0;
 
-#ifdef ERTS_DIRTY_SCHEDULERS
-#ifdef ERTS_SMP
-    case ERTS_ENQUEUE_DIRTY_CPU_QUEUE:
-    case -ERTS_ENQUEUE_DIRTY_CPU_QUEUE:
-	runq = ERTS_DIRTY_CPU_RUNQ;
-	ASSERT(ERTS_SCHEDULER_IS_DIRTY_CPU(runq->scheduler));
-#ifdef ERTS_SMP
-	check_emigration_need = 0;
-#endif
-	break;
+    }
+    else {
+	Process* sched_p;
 
-    case ERTS_ENQUEUE_DIRTY_IO_QUEUE:
-    case -ERTS_ENQUEUE_DIRTY_IO_QUEUE:
-	runq = ERTS_DIRTY_IO_RUNQ;
-	ASSERT(ERTS_SCHEDULER_IS_DIRTY_IO(runq->scheduler));
-#ifdef ERTS_SMP
-	check_emigration_need = 0;
-#endif
-	break;
-#endif
-#endif
+	ASSERT(!(n & ERTS_PSFLG_SUSPENDED) || (n & (ERTS_PSFLG_ACTIVE_SYS
+						    | ERTS_PSFLG_DIRTY_ACTIVE_SYS)));
 
-    default:
-	ASSERT(enqueue == ERTS_ENQUEUE_NORMAL_QUEUE
-	       || enqueue == -ERTS_ENQUEUE_NORMAL_QUEUE);
+	if (enqueue < 0)
+	    sched_p = make_proxy_proc(proxy, p, enq_prio);
+	else {
+	    sched_p = p;
+	    if (proxy)
+		free_proxy_proc(proxy);
+	}
 
-	runq = erts_get_runq_proc(p);
-#ifdef ERTS_SMP
-	check_emigration_need = !(ERTS_PSFLG_BOUND & n);
-#endif
-	break;
-    }
+	ASSERT(runq);
 
-    ASSERT(!(n & ERTS_PSFLG_SUSPENDED) || (n & ERTS_PSFLG_ACTIVE_SYS));
+	erts_smp_runq_lock(runq);
 
-    if (enqueue < 0)
-	sched_p = make_proxy_proc(proxy, p, enq_prio);
-    else {
-	sched_p = p;
-	if (proxy)
-	    free_proxy_proc(proxy);
-    }
+	/* Enqueue the process */
+	enqueue_process(runq, (int) enq_prio, sched_p);
 
-#ifdef ERTS_SMP
-    if (check_emigration_need) {
-	ErtsRunQueue *new_runq = erts_check_emigration_need(runq, enq_prio);
-	if (new_runq) {
-	    RUNQ_SET_RQ(&sched_p->run_queue, new_runq);
-	    runq = new_runq;
-	}
-    }
-#endif
+	if (runq == c_rq)
+	    return 1;
 
-    ASSERT(runq);
+	erts_smp_runq_unlock(runq);
 
-    erts_smp_runq_lock(runq);
+	smp_notify_inc_runq(runq);
 
-    /* Enqueue the process */
-    enqueue_process(runq, (int) enq_prio, sched_p);
+	erts_smp_runq_lock(c_rq);
 
-    if (runq == c_rq)
 	return 1;
-    erts_smp_runq_unlock(runq);
-    smp_notify_inc_runq(runq);
-    erts_smp_runq_lock(c_rq);
-    return 1;
+    }
+
 }
 
 static ERTS_INLINE void
-add2runq(Process *p, erts_aint32_t state, erts_aint32_t prio)
+add2runq(int enqueue, erts_aint32_t prio,
+	 Process *proc, erts_aint32_t state,
+	 Process **proxy)
 {
-    ErtsRunQueue *runq = erts_get_runq_proc(p);
+    ErtsRunQueue *runq;
 
-#ifdef ERTS_SMP
-    if (!(ERTS_PSFLG_BOUND & state)) {
-	ErtsRunQueue *new_runq = erts_check_emigration_need(runq, (int) prio);
-	if (new_runq) {
-	    RUNQ_SET_RQ(&p->run_queue, new_runq);
-	    runq = new_runq;
-	}
-    }
-#endif
-    ASSERT(runq);
+    runq = select_enqueue_run_queue(enqueue, prio, proc, state);
 
-    erts_smp_runq_lock(runq);
+    if (runq) {
+	Process *sched_p;
 
-    /* Enqueue the process */
-    enqueue_process(runq, (int) prio, p);
+	if (enqueue > 0)
+	    sched_p = proc;
+	else {
+	    Process *pxy;
 
-    erts_smp_runq_unlock(runq);
-    smp_notify_inc_runq(runq);
+	    if (!proxy)
+		pxy = NULL;
+	    else {
+		pxy = *proxy;
+		*proxy = NULL;
+	    }
+	    sched_p = make_proxy_proc(pxy, proc, prio);
+	}
+
+	erts_smp_runq_lock(runq);
+
+	/* Enqueue the process */
+	enqueue_process(runq, (int) prio, sched_p);
 
+	erts_smp_runq_unlock(runq);
+	smp_notify_inc_runq(runq);
+    }
 }
 
 static ERTS_INLINE int
@@ -6337,10 +6578,7 @@ schedule_process(Process *p, erts_aint32_t in_state, ErtsProcLocks locks)
 					     &state,
 					     &enq_prio,
 					     locks);
-    if (enqueue != ERTS_ENQUEUE_NOT)
-	add2runq(enqueue > 0 ? p : make_proxy_proc(NULL, p, enq_prio),
-		 state,
-		 enq_prio);
+    add2runq(enqueue, enq_prio, p, state, NULL);
 }
 
 void
@@ -6349,22 +6587,99 @@ erts_schedule_process(Process *p, erts_aint32_t state, ErtsProcLocks locks)
     schedule_process(p, state, locks);
 }
 
-static void
-schedule_process_sys_task(Process *p, erts_aint32_t state, Process *proxy)
+static int
+schedule_process_sys_task(Process *p, erts_aint32_t prio, ErtsProcSysTask *st)
 {
-    /*
-     * Expects status lock to be locked when called, and
-     * returns with status lock unlocked...
-     */
-    erts_aint32_t a = state, n, enq_prio = -1;
+    int res;
+    int locked;
+    ErtsProcSysTaskQs *stqs, *free_stqs;
+    erts_aint32_t state, a, n, enq_prio;
     int enqueue; /* < 0 -> use proxy */
-    unsigned int prof_runnable_procs = erts_system_profile_flags.runnable_procs;
+    unsigned int prof_runnable_procs;
+
+    res = 1; /* prepare for success */
+    st->next = st->prev = st; /* Prep for empty prio queue */
+    state = erts_smp_atomic32_read_nob(&p->state);
+    prof_runnable_procs = erts_system_profile_flags.runnable_procs;
+    locked = 0;
+    free_stqs = NULL;
+    if (state & ERTS_PSFLG_ACTIVE_SYS)
+	stqs = NULL;
+    else {
+    alloc_qs:
+	stqs = proc_sys_task_queues_alloc();
+	stqs->qmask = 1 << prio;
+	stqs->ncount = 0;
+	stqs->q[PRIORITY_MAX] = NULL;
+	stqs->q[PRIORITY_HIGH] = NULL;
+	stqs->q[PRIORITY_NORMAL] = NULL;
+	stqs->q[PRIORITY_LOW] = NULL;
+	stqs->q[prio] = st;
+    }
+
+    if (!locked) {
+	locked = 1;
+	erts_smp_proc_lock(p, ERTS_PROC_LOCK_STATUS);
+
+	state = erts_smp_atomic32_read_nob(&p->state);
+	if (state & ERTS_PSFLG_EXITING) {
+	    free_stqs = stqs;
+	    res = 0;
+	    goto cleanup;
+	}
+    }
+
+    if (!p->sys_task_qs) {
+	if (stqs)
+	    p->sys_task_qs = stqs;
+	else
+	    goto alloc_qs;
+    }
+    else {
+	free_stqs = stqs;
+	stqs = p->sys_task_qs;
+	if (!stqs->q[prio]) {
+	    stqs->q[prio] = st;
+	    stqs->qmask |= 1 << prio;
+	}
+	else {
+	    st->next = stqs->q[prio];
+	    st->prev = stqs->q[prio]->prev;
+	    st->next->prev = st;
+	    st->prev->next = st;
+	    ASSERT(stqs->qmask & (1 << prio));
+	}
+    }
+
+    if (ERTS_PSFLGS_GET_ACT_PRIO(state) > prio) {
+	erts_aint32_t n, a, e;
+	/* Need to elevate actual prio */
+
+	a = state;
+	do {
+	    if (ERTS_PSFLGS_GET_ACT_PRIO(a) <= prio) {
+		n = a;
+		break;
+	    }
+	    n = e = a;
+	    n &= ~ERTS_PSFLGS_ACT_PRIO_MASK;
+	    n |= (prio << ERTS_PSFLGS_ACT_PRIO_OFFSET);
+	    a = erts_smp_atomic32_cmpxchg_nob(&p->state, n, e);    
+	} while (a != e);
+	state = n;
+    }
+
+
+    a = state;
+    enq_prio = -1;
 
     /* Status lock prevents out of order "runnable proc" trace msgs */
     ERTS_SMP_LC_ASSERT(ERTS_PROC_LOCK_STATUS & erts_proc_lc_my_proc_locks(p));
 
-    if (!prof_runnable_procs)
+    if (!prof_runnable_procs) {
 	erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+	locked = 0;
+    }
 
     ASSERT(!(state & ERTS_PSFLG_PROXY));
 
@@ -6372,8 +6687,10 @@ schedule_process_sys_task(Process *p, erts_aint32_t state, Process *proxy)
 	erts_aint32_t e;
 	n = e = a;
 
-	if (a & ERTS_PSFLG_FREE)
+	if (a & ERTS_PSFLG_FREE) {
+	    res = 0;
 	    goto cleanup; /* We don't want to schedule free processes... */
+	}
 
 	enqueue = ERTS_ENQUEUE_NOT;
 	n |= ERTS_PSFLG_ACTIVE_SYS;
@@ -6397,29 +6714,22 @@ schedule_process_sys_task(Process *p, erts_aint32_t state, Process *proxy)
 	}
 
 	erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
-	prof_runnable_procs = 0;
+	locked = 0;
     }
 
-    if (enqueue != ERTS_ENQUEUE_NOT) {
-	Process *sched_p;
-	if (enqueue > 0)
-	    sched_p = p;
-	else {
-	    sched_p = make_proxy_proc(proxy, p, enq_prio);
-	    proxy = NULL;
-	}
-	add2runq(sched_p, n, enq_prio);
-    }
+    add2runq(enqueue, enq_prio, p, n, NULL);
 
 cleanup:
 
-    if (prof_runnable_procs)
+    if (locked)
 	erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
 
-    if (proxy)
-	free_proxy_proc(proxy);
+    if (free_stqs)
+	proc_sys_task_queues_free(free_stqs);
 
     ERTS_SMP_LC_ASSERT(!(ERTS_PROC_LOCK_STATUS & erts_proc_lc_my_proc_locks(p)));
+
+    return res;
 }
 
 static ERTS_INLINE int
@@ -6461,9 +6771,6 @@ suspend_process(Process *c_p, Process *p)
 
     if (suspended) {
 
-	ASSERT(!(ERTS_PSFLG_RUNNING & state)
-	       || p == erts_get_current_process());
-
 	if (suspended > 0 && erts_system_profile_flags.runnable_procs) {
 
 	    /* 'state' is before our change... */
@@ -6505,23 +6812,7 @@ resume_process(Process *p, ErtsProcLocks locks)
 					 &state,
 					 &enq_prio,
 					 locks);
-    if (enqueue)
-	add2runq(enqueue > 0 ? p : make_proxy_proc(NULL, p, enq_prio),
-		 state,
-		 enq_prio);
-}
-
-int
-erts_get_max_no_executing_schedulers(void)
-{
-#ifdef ERTS_SMP
-    if (erts_smp_atomic32_read_nob(&schdlr_sspnd.changing))
-	return (int) erts_no_schedulers;
-    ERTS_THR_MEMORY_BARRIER;
-    return (int) erts_smp_atomic32_read_nob(&schdlr_sspnd.active);
-#else
-    return 1;
-#endif
+    add2runq(enqueue, enq_prio, p, state, NULL);
 }
 
 #ifdef ERTS_SMP
@@ -6626,42 +6917,82 @@ sched_set_suspended_sleeptype(ErtsSchedulerSleepInfo *ssi)
     }
 }
 
-#ifdef ERTS_DIRTY_SCHEDULERS
+static void
+init_scheduler_suspend(void)
+{
+    erts_smp_mtx_init(&schdlr_sspnd.mtx, "schdlr_sspnd");
+    schdlr_sspnd.online = ERTS_SCHDLR_SSPND_MAKE_NSCHEDS_VAL(1, 0, 0);
+    schdlr_sspnd.curr_online = ERTS_SCHDLR_SSPND_MAKE_NSCHEDS_VAL(1, 0, 0);
+    schdlr_sspnd.active = ERTS_SCHDLR_SSPND_MAKE_NSCHEDS_VAL(1, 0, 0);
+    erts_smp_atomic32_init_nob(&schdlr_sspnd.changing, 0);
+    schdlr_sspnd.chngq = NULL;
+    schdlr_sspnd.changer = am_false;
+    schdlr_sspnd.nmsb.ongoing = 0;
+    schdlr_sspnd.nmsb.blckrs = NULL;
+    schdlr_sspnd.nmsb.chngq = NULL;
+    schdlr_sspnd.msb.ongoing = 0;
+    schdlr_sspnd.msb.blckrs = NULL;
+    schdlr_sspnd.msb.chngq = NULL;
+}
+
+typedef struct {
+    struct {
+	Eterm chngr;
+	Eterm nxt;
+    } onln;
+    struct {
+	ErtsProcList *chngrs;
+    } msb;
+} ErtsSchdlrSspndResume;
+
+static void
+schdlr_sspnd_resume_proc(Eterm pid)
+{
+    Process *p = erts_pid2proc(NULL, 0, pid, ERTS_PROC_LOCK_STATUS);
+    if (p) {
+	resume_process(p, ERTS_PROC_LOCK_STATUS);
+	erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+    }
+}
+
+static ERTS_INLINE void
+schdlr_sspnd_resume_procs(ErtsSchedType sched_type,
+			  ErtsSchdlrSspndResume *resume)
+{
+    if (is_internal_pid(resume->onln.chngr)) {
+	schdlr_sspnd_resume_proc(resume->onln.chngr);
+	resume->onln.chngr = NIL;
+    }
+    if (is_internal_pid(resume->onln.nxt)) {
+	schdlr_sspnd_resume_proc(resume->onln.nxt);
+	resume->onln.nxt = NIL;
+    }
+    while (resume->msb.chngrs) {
+	ErtsProcList *plp = resume->msb.chngrs;
+	resume->msb.chngrs = plp->next;
+	schdlr_sspnd_resume_proc(plp->pid);
+	proclist_destroy(plp);
+    }
+}
 
 static void
 suspend_scheduler(ErtsSchedulerData *esdp)
 {
     erts_aint32_t flgs;
     erts_aint32_t changing;
-#ifdef ERTS_DIRTY_SCHEDULERS
-    long no = (long) (ERTS_SCHEDULER_IS_DIRTY(esdp)
-		      ? ERTS_DIRTY_SCHEDULER_NO(esdp)
-		      : esdp->no);
-#else
-    long no = (long) esdp->no;
-#endif
+    long no;
     ErtsSchedulerSleepInfo *ssi = esdp->ssi;
-    long active_schedulers;
     int curr_online = 1;
-    int wake = 0;
+    ErtsSchdlrSspndResume resume = {{NIL, NIL}, {NULL}};
     erts_aint32_t aux_work;
     int thr_prgr_active = 1;
     ErtsStuckBoundProcesses sbp = {NULL, NULL};
-    int* ss_onlinep;
-    int* ss_curr_onlinep;
-    int* ss_wait_curr_onlinep;
-    long* ss_wait_activep;
-    long ss_wait_active_target;
-    erts_smp_atomic32_t* ss_changingp;
-    erts_smp_atomic32_t* ss_activep;
+    ErtsSchedType sched_type;
+    erts_aint32_t online_flag;
 
     /*
      * Schedulers may be suspended in two different ways:
      * - A scheduler may be suspended since it is not online.
-     *   All schedulers with scheduler ids greater than
-     *   schdlr_sspnd.online are suspended; same for dirty
-     *   schedulers and schdlr_sspnd.dirty_cpu_online and
-     *   schdlr_sspnd.dirty_io_online.
      * - Multi scheduling is blocked. All schedulers except the
      *   scheduler with scheduler id 1 are suspended, and all
      *   dirty CPU and dirty I/O schedulers are suspended.
@@ -6669,27 +7000,43 @@ suspend_scheduler(ErtsSchedulerData *esdp)
      * Regardless of why a scheduler is suspended, it ends up here.
      */
 
-    ASSERT(ERTS_SCHEDULER_IS_DIRTY(esdp) || no != 1);
-
 #ifdef ERTS_DIRTY_SCHEDULERS
     if (ERTS_SCHEDULER_IS_DIRTY(esdp)) {
+	no = ERTS_DIRTY_SCHEDULER_NO(esdp);
+	if (ERTS_RUNQ_IS_DIRTY_CPU_RUNQ(esdp->run_queue)) {
+	    online_flag = ERTS_SCHDLR_SSPND_CHNG_DCPU_ONLN;
+	    sched_type = ERTS_SCHED_DIRTY_CPU;
+	}
+	else {
+	    online_flag = 0;
+	    sched_type = ERTS_SCHED_DIRTY_IO;
+	}
+    }
+    else
+#endif
+    {
+	online_flag = ERTS_SCHDLR_SSPND_CHNG_ONLN;
+	no = esdp->no;
+	sched_type = ERTS_SCHED_NORMAL;
+    }
+
+    ASSERT(sched_type != ERTS_SCHED_NORMAL || no != 1);
+
+    if (sched_type != ERTS_SCHED_NORMAL) {
 	if (erts_smp_mtx_trylock(&schdlr_sspnd.mtx) == EBUSY) {
 	    erts_smp_runq_unlock(esdp->run_queue);
 	    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
 	    erts_smp_runq_lock(esdp->run_queue);
 	}
-	if (ongoing_multi_scheduling_block())
+	if (schdlr_sspnd.msb.ongoing)
 	    evacuate_run_queue(esdp->run_queue, &sbp);
-    } else
-#endif
+	erts_smp_runq_unlock(esdp->run_queue);
+    }
+    else {
 	evacuate_run_queue(esdp->run_queue, &sbp);
 
-    erts_smp_runq_unlock(esdp->run_queue);
+	erts_smp_runq_unlock(esdp->run_queue);
 
-#ifdef ERTS_DIRTY_SCHEDULERS
-    if (!ERTS_SCHEDULER_IS_DIRTY(esdp))
-#endif
-    {
 	erts_sched_check_cpu_bind_prep_suspend(esdp);
 
 	if (erts_system_profile_flags.scheduler)
@@ -6703,318 +7050,115 @@ suspend_scheduler(ErtsSchedulerData *esdp)
     flgs = sched_prep_spin_suspended(ssi, ERTS_SSI_FLG_SUSPENDED);
     if (flgs & ERTS_SSI_FLG_SUSPENDED) {
 
-#ifdef ERTS_DIRTY_SCHEDULERS
-	if (ERTS_SCHEDULER_IS_DIRTY(esdp)) {
-	    if (ERTS_RUNQ_IS_DIRTY_CPU_RUNQ(esdp->run_queue)) {
-		active_schedulers = erts_smp_atomic32_dec_read_nob(&schdlr_sspnd.dirty_cpu_active);
-		ASSERT(active_schedulers >= 0);
-		changing = erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_cpu_changing);
-		ss_onlinep = &schdlr_sspnd.dirty_cpu_online;
-		ss_curr_onlinep = &schdlr_sspnd.dirty_cpu_curr_online;
-		ss_wait_curr_onlinep = &schdlr_sspnd.dirty_cpu_wait_curr_online;
-		ss_changingp = &schdlr_sspnd.dirty_cpu_changing;
-		ss_wait_activep = &schdlr_sspnd.msb.dirty_cpu_wait_active;
-		ss_activep = &schdlr_sspnd.dirty_cpu_active;
-	    } else {
-		active_schedulers = erts_smp_atomic32_dec_read_nob(&schdlr_sspnd.dirty_io_active);
-		ASSERT(active_schedulers >= 0);
-		changing = erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_io_changing);
-		ss_onlinep = &schdlr_sspnd.dirty_io_online;
-		ss_curr_onlinep = &schdlr_sspnd.dirty_io_curr_online;
-		ss_wait_curr_onlinep = &schdlr_sspnd.dirty_io_wait_curr_online;
-		ss_changingp = &schdlr_sspnd.dirty_io_changing;
-		ss_wait_activep = &schdlr_sspnd.msb.dirty_io_wait_active;
-		ss_activep = &schdlr_sspnd.dirty_io_active;
-	    }
-	    ss_wait_active_target = 0;
-	}
-	else
-#endif
-	{
-	    active_schedulers = erts_smp_atomic32_dec_read_nob(&schdlr_sspnd.active);
-	    ASSERT(active_schedulers >= 1);
-	    changing = erts_smp_atomic32_read_nob(&schdlr_sspnd.changing);
-	    ss_onlinep = &schdlr_sspnd.online;
-	    ss_curr_onlinep = &schdlr_sspnd.curr_online;
-	    ss_wait_curr_onlinep = &schdlr_sspnd.wait_curr_online;
-	    ss_changingp = &schdlr_sspnd.changing;
-	    ss_wait_activep = &schdlr_sspnd.msb.wait_active;
-	    ss_activep = &schdlr_sspnd.active;
-	    ss_wait_active_target = 1;
-	}
-	if (changing & ERTS_SCHDLR_SSPND_CHNG_MSB) {
-	    if (active_schedulers == *ss_wait_activep)
-		wake = 1;
-	    if (active_schedulers == ss_wait_active_target) {
-		changing = erts_smp_atomic32_read_band_nob(ss_changingp,
-							   ~ERTS_SCHDLR_SSPND_CHNG_MSB);
-		changing &= ~ERTS_SCHDLR_SSPND_CHNG_MSB;
-	    }
-	}
-
-	while (1) {
-	    if (changing & ERTS_SCHDLR_SSPND_CHNG_ONLN) {
-		int changed = 0;
-		if (no > *ss_onlinep && curr_online) {
-		    (*ss_curr_onlinep)--;
-		    curr_online = 0;
-		    changed = 1;
-		}
-		else if (no <= *ss_onlinep && !curr_online) {
-		    (*ss_curr_onlinep)++;
-		    curr_online = 1;
-		    changed = 1;
-		}
-		if (changed
-		    && *ss_curr_onlinep == *ss_wait_curr_onlinep)
-		    wake = 1;
-		if (*ss_onlinep == *ss_curr_onlinep) {
-		    changing = erts_smp_atomic32_read_band_nob(ss_changingp,
-							       ~ERTS_SCHDLR_SSPND_CHNG_ONLN);
-		    changing &= ~ERTS_SCHDLR_SSPND_CHNG_ONLN;
-		}
-	    }
+	schdlr_sspnd_dec_nscheds(&schdlr_sspnd.active, sched_type);
 
-	    if (wake) {
-		erts_smp_cnd_signal(&schdlr_sspnd.cnd);
-		wake = 0;
-	    }
-
-	    if (curr_online && !ongoing_multi_scheduling_block()) {
-		flgs = erts_smp_atomic32_read_acqb(&ssi->flags);
-		if (!(flgs & ERTS_SSI_FLG_SUSPENDED))
-		    break;
-	    }
-	    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
+	ASSERT(schdlr_sspnd_get_nscheds(&schdlr_sspnd.active,
+					ERTS_SCHED_NORMAL) >= 1);
 
-	    while (1) {
-		erts_aint32_t qmask;
-		erts_aint32_t flgs;
+	changing = erts_smp_atomic32_read_nob(&schdlr_sspnd.changing);
 
-		qmask = (ERTS_RUNQ_FLGS_GET(esdp->run_queue)
-			 & ERTS_RUNQ_FLGS_QMASK);
-		aux_work = erts_atomic32_read_acqb(&ssi->aux_work);
-		if (aux_work|qmask) {
-		    if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
-			if (!thr_prgr_active) {
-			    erts_thr_progress_active(esdp, thr_prgr_active = 1);
-			    sched_wall_time_change(esdp, 1);
-			}
-			if (aux_work)
-			    aux_work = handle_aux_work(&esdp->aux_work_data,
-						       aux_work,
-						       1);
+	while (1) {
 
-			if (aux_work && erts_thr_progress_update(esdp))
-			    erts_thr_progress_leader_update(esdp);
+	    if (changing & (ERTS_SCHDLR_SSPND_CHNG_NMSB
+			    | ERTS_SCHDLR_SSPND_CHNG_MSB)) {
+		int i = 0;
+		ErtsMultiSchedulingBlock *msb[3] = {0};
+		if (changing & ERTS_SCHDLR_SSPND_CHNG_NMSB)
+		    msb[i++] = &schdlr_sspnd.nmsb;
+		if (changing & ERTS_SCHDLR_SSPND_CHNG_MSB)
+		    msb[i++] = &schdlr_sspnd.msb;
+
+		for (i = 0; msb[i]; i++) {
+		    erts_aint32_t clr_flg = 0;
+
+		    if (msb[i] == &schdlr_sspnd.nmsb
+			&& schdlr_sspnd_get_nscheds(&schdlr_sspnd.active,
+						    ERTS_SCHED_NORMAL) == 1) {
+			clr_flg = ERTS_SCHDLR_SSPND_CHNG_NMSB;
 		    }
-		    if (qmask) {
-#ifdef ERTS_DIRTY_SCHEDULERS
-			if (ERTS_SCHEDULER_IS_DIRTY(esdp)) {
-			    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-			    erts_smp_runq_lock(esdp->run_queue);
-			    if (ongoing_multi_scheduling_block())
-				evacuate_run_queue(esdp->run_queue, &sbp);
-			    erts_smp_runq_unlock(esdp->run_queue);
-			    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
-			} else
-#endif
-			{
-			    erts_smp_runq_lock(esdp->run_queue);
-			    evacuate_run_queue(esdp->run_queue, &sbp);
-			    erts_smp_runq_unlock(esdp->run_queue);
-			}
+		    else if (schdlr_sspnd.active
+			     == ERTS_SCHDLR_SSPND_MAKE_NSCHEDS_VAL(1, 0, 0)) {
+			clr_flg = ERTS_SCHDLR_SSPND_CHNG_MSB;
 		    }
-		}
 
-		if (!aux_work) {
-#ifdef ERTS_DIRTY_SCHEDULERS
-		    if (!ERTS_SCHEDULER_IS_DIRTY(esdp))
-#endif
-		    {
-			if (thr_prgr_active) {
-			    erts_thr_progress_active(esdp, thr_prgr_active = 0);
-			    sched_wall_time_change(esdp, 0);
+		    if (clr_flg) {
+			ErtsProcList *plp, *end_plp;
+			changing = erts_smp_atomic32_read_band_nob(&schdlr_sspnd.changing,
+								   ~clr_flg);
+			changing &= ~clr_flg;
+			(void) erts_proclist_fetch(&msb[i]->chngq, &end_plp);
+			/* resume processes that initiated the multi scheduling block... */
+			plp = msb[i]->chngq;
+			while (plp) {
+			    erts_proclist_store_last(&msb[i]->blckrs,
+						     proclist_copy(plp));
+			    plp = plp->next;
 			}
-			erts_thr_progress_prepare_wait(esdp);
+			if (end_plp)
+			    end_plp->next = resume.msb.chngrs;
+			resume.msb.chngrs = msb[i]->chngq;
+			msb[i]->chngq = NULL;
 		    }
-		    flgs = sched_spin_suspended(ssi,
-						ERTS_SCHED_SUSPEND_SLEEP_SPINCOUNT);
-		    if (flgs == (ERTS_SSI_FLG_SLEEPING
-				 | ERTS_SSI_FLG_WAITING
-				 | ERTS_SSI_FLG_SUSPENDED)) {
-			flgs = sched_set_suspended_sleeptype(ssi);
-			if (flgs == (ERTS_SSI_FLG_SLEEPING
-				     | ERTS_SSI_FLG_TSE_SLEEPING
-				     | ERTS_SSI_FLG_WAITING
-				     | ERTS_SSI_FLG_SUSPENDED)) {
-			    int res;
-
-			    do {
-				res = erts_tse_twait(ssi->event, -1);
-			    } while (res == EINTR);
-			}
-		    }
-#ifdef ERTS_DIRTY_SCHEDULERS
-		    if (!ERTS_SCHEDULER_IS_DIRTY(esdp))
-#endif
-			erts_thr_progress_finalize_wait(esdp);
 		}
-
-		flgs = sched_prep_spin_suspended(ssi, (ERTS_SSI_FLG_WAITING
-						       | ERTS_SSI_FLG_SUSPENDED));
-		if (!(flgs & ERTS_SSI_FLG_SUSPENDED))
-		    break;
-		changing = erts_smp_atomic32_read_nob(ss_changingp);
-		if (changing & ~ERTS_SCHDLR_SSPND_CHNG_WAITER)
-		    break;
-	    }
-
-	    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-	    changing = erts_smp_atomic32_read_nob(ss_changingp);
-	}
-
-	active_schedulers = erts_smp_atomic32_inc_read_nob(ss_activep);
-	changing = erts_smp_atomic32_read_nob(ss_changingp);
-	if ((changing & ERTS_SCHDLR_SSPND_CHNG_MSB)
-	    && *ss_onlinep == active_schedulers) {
-	    erts_smp_atomic32_read_band_nob(ss_changingp,
-					    ~ERTS_SCHDLR_SSPND_CHNG_MSB);
-	}
-
-#ifdef ERTS_DIRTY_SCHEDULERS
-	if (!ERTS_SCHEDULER_IS_DIRTY(esdp))
-#endif
-	    ASSERT(no <= *ss_onlinep);
-	ASSERT(!ongoing_multi_scheduling_block());
-
-    }
-
-    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
-
-    ASSERT(curr_online);
-
-#ifdef ERTS_DIRTY_SCHEDULERS
-    if (!ERTS_SCHEDULER_IS_DIRTY(esdp))
-#endif
-    {
-	if (erts_system_profile_flags.scheduler)
-	    profile_scheduler(make_small(esdp->no), am_active);
-
-	if (!thr_prgr_active) {
-	    erts_thr_progress_active(esdp, thr_prgr_active = 1);
-	    sched_wall_time_change(esdp, 1);
-	}
-    }
-
-    if (!ERTS_SCHEDULER_IS_DIRTY(esdp))
-	(void) erts_get_monotonic_time(esdp);
-    erts_smp_runq_lock(esdp->run_queue);
-    non_empty_runq(esdp->run_queue);
-
-#ifdef ERTS_DIRTY_SCHEDULERS
-    if (!ERTS_SCHEDULER_IS_DIRTY(esdp))
-#endif
-    {
-	schedule_bound_processes(esdp->run_queue, &sbp);
-
-	erts_sched_check_cpu_bind_post_suspend(esdp);
-    }
-}
-
-#else /* !ERTS_DIRTY_SCHEDULERS */
-
-static void
-suspend_scheduler(ErtsSchedulerData *esdp)
-{
-    erts_aint32_t flgs;
-    erts_aint32_t changing;
-    long no = (long) esdp->no;
-    ErtsSchedulerSleepInfo *ssi = esdp->ssi;
-    long active_schedulers;
-    int curr_online = 1;
-    int wake = 0;
-    erts_aint32_t aux_work;
-    int thr_prgr_active = 1;
-    ErtsStuckBoundProcesses sbp = {NULL, NULL};
-
-    /*
-     * Schedulers may be suspended in two different ways:
-     * - A scheduler may be suspended since it is not online.
-     *   All schedulers with scheduler ids greater than
-     *   schdlr_sspnd.online are suspended.
-     * - Multi scheduling is blocked. All schedulers except the
-     *   scheduler with scheduler id 1 are suspended.
-     *
-     * Regardless of why a scheduler is suspended, it ends up here.
-     */
-
-    ASSERT(no != 1);
-
-    evacuate_run_queue(esdp->run_queue, &sbp);
-
-    erts_smp_runq_unlock(esdp->run_queue);
-
-    erts_sched_check_cpu_bind_prep_suspend(esdp);
-
-    if (erts_system_profile_flags.scheduler)
-    	profile_scheduler(make_small(esdp->no), am_inactive);
-
-    sched_wall_time_change(esdp, 0);
-
-    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-
-    flgs = sched_prep_spin_suspended(ssi, ERTS_SSI_FLG_SUSPENDED);
-    if (flgs & ERTS_SSI_FLG_SUSPENDED) {
-
-	active_schedulers = erts_smp_atomic32_dec_read_nob(&schdlr_sspnd.active);
-	ASSERT(active_schedulers >= 1);
-	changing = erts_smp_atomic32_read_nob(&schdlr_sspnd.changing);
-	if (changing & ERTS_SCHDLR_SSPND_CHNG_MSB) {
-	    if (active_schedulers == schdlr_sspnd.msb.wait_active)
-		wake = 1;
-	    if (active_schedulers == 1) {
-		changing = erts_smp_atomic32_read_band_nob(&schdlr_sspnd.changing,
-							   ~ERTS_SCHDLR_SSPND_CHNG_MSB);
-		changing &= ~ERTS_SCHDLR_SSPND_CHNG_MSB;
 	    }
-	}
 
-	while (1) {
-	    if (changing & ERTS_SCHDLR_SSPND_CHNG_ONLN) {
+	    if (changing & online_flag) {
 		int changed = 0;
-		if (no > schdlr_sspnd.online && curr_online) {
-		    schdlr_sspnd.curr_online--;
+		Uint32 st_online;
+
+		st_online = schdlr_sspnd_get_nscheds(&schdlr_sspnd.online,
+						     sched_type);
+		if (no > st_online && curr_online) {
+		    schdlr_sspnd_dec_nscheds(&schdlr_sspnd.curr_online,
+					     sched_type);
 		    curr_online = 0;
 		    changed = 1;
 		}
-		else if (no <= schdlr_sspnd.online && !curr_online) {
-		    schdlr_sspnd.curr_online++;
+		else if (no <= st_online && !curr_online) {
+		    schdlr_sspnd_inc_nscheds(&schdlr_sspnd.curr_online,
+					     sched_type);
 		    curr_online = 1;
 		    changed = 1;
 		}
 		if (changed
-		    && schdlr_sspnd.curr_online == schdlr_sspnd.wait_curr_online)
-		    wake = 1;
-		if (schdlr_sspnd.online == schdlr_sspnd.curr_online) {
+		    && (schdlr_sspnd_get_nscheds(&schdlr_sspnd.online,
+						 sched_type)
+			== schdlr_sspnd_get_nscheds(&schdlr_sspnd.curr_online,
+						    sched_type))) {
+		    ErtsProcList *plp;
 		    changing = erts_smp_atomic32_read_band_nob(&schdlr_sspnd.changing,
-							       ~ERTS_SCHDLR_SSPND_CHNG_ONLN);
-		    changing &= ~ERTS_SCHDLR_SSPND_CHNG_ONLN;
+							       ~online_flag);
+		    changing &= ~online_flag;
+		    if (sched_type == ERTS_SCHED_NORMAL) {
+			ASSERT(is_internal_pid(schdlr_sspnd.changer)
+			       || schdlr_sspnd.changer == am_init);
+			/* resume process that initiated this change... */
+			resume.onln.chngr = schdlr_sspnd.changer;
+			plp = erts_proclist_peek_first(schdlr_sspnd.chngq);
+			if (!plp)
+			    schdlr_sspnd.changer = am_false;
+			else {
+			    schdlr_sspnd.changer = am_true; /* change right in transit */
+			    /* resume process that is queued for next change... */
+			    resume.onln.nxt = plp->pid;
+			    ASSERT(is_internal_pid(resume.onln.nxt));
+			}
+		    }
 		}
 	    }
 
-	    if (wake) {
-		erts_smp_cnd_signal(&schdlr_sspnd.cnd);
-		wake = 0;
-	    }
-
-	    if (curr_online && !ongoing_multi_scheduling_block()) {
+	    if (curr_online
+		&& (sched_type == ERTS_SCHED_NORMAL
+		    ? !(schdlr_sspnd.msb.ongoing|schdlr_sspnd.nmsb.ongoing)
+		    : !schdlr_sspnd.msb.ongoing)) {
 		flgs = erts_smp_atomic32_read_acqb(&ssi->flags);
 		if (!(flgs & ERTS_SSI_FLG_SUSPENDED))
 		    break;
 	    }
 	    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
 
+	    schdlr_sspnd_resume_procs(sched_type, &resume);
+
 	    while (1) {
 		ErtsMonotonicTime current_time;
 		erts_aint32_t qmask;
@@ -7022,9 +7166,23 @@ suspend_scheduler(ErtsSchedulerData *esdp)
 
 		qmask = (ERTS_RUNQ_FLGS_GET(esdp->run_queue)
 			 & ERTS_RUNQ_FLGS_QMASK);
-		aux_work = erts_atomic32_read_acqb(&ssi->aux_work);
-		if (aux_work|qmask) {
-		    if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
+
+		if (sched_type != ERTS_SCHED_NORMAL) {
+		    if (qmask) {
+			erts_smp_mtx_lock(&schdlr_sspnd.mtx);
+			erts_smp_runq_lock(esdp->run_queue);
+			if (schdlr_sspnd.msb.ongoing)
+			    evacuate_run_queue(esdp->run_queue, &sbp);
+			erts_smp_runq_unlock(esdp->run_queue);
+			erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
+		    }
+		    aux_work = 0;
+		}
+		else {
+
+		    aux_work = erts_atomic32_read_acqb(&ssi->aux_work);
+
+		    if (aux_work|qmask) {
 			if (!thr_prgr_active) {
 			    erts_thr_progress_active(esdp, thr_prgr_active = 1);
 			    sched_wall_time_change(esdp, 1);
@@ -7033,45 +7191,53 @@ suspend_scheduler(ErtsSchedulerData *esdp)
 			    aux_work = handle_aux_work(&esdp->aux_work_data,
 						       aux_work,
 						       1);
+
 			if (aux_work && erts_thr_progress_update(esdp))
 			    erts_thr_progress_leader_update(esdp);
+			if (qmask) {
+			    erts_smp_runq_lock(esdp->run_queue);
+			    evacuate_run_queue(esdp->run_queue, &sbp);
+			    erts_smp_runq_unlock(esdp->run_queue);
+			}
 		    }
-		    if (qmask) {
-			erts_smp_runq_lock(esdp->run_queue);
-			evacuate_run_queue(esdp->run_queue, &sbp);
-			erts_smp_runq_unlock(esdp->run_queue);
-		    }
+
 		}
 
 		if (aux_work) {
-		    if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
-			current_time = erts_get_monotonic_time(esdp);
-			if (current_time >= erts_next_timeout_time(esdp->next_tmo_ref)) {
-			    if (!thr_prgr_active) {
-				erts_thr_progress_active(esdp, thr_prgr_active = 1);
-				sched_wall_time_change(esdp, 1);
-			    }
-			    erts_bump_timers(esdp->timer_wheel, current_time);
+		    ASSERT(sched_type == ERTS_SCHED_NORMAL);
+		    current_time = erts_get_monotonic_time(esdp);
+		    if (current_time >= erts_next_timeout_time(esdp->next_tmo_ref)) {
+			if (!thr_prgr_active) {
+			    erts_thr_progress_active(esdp, thr_prgr_active = 1);
+			    sched_wall_time_change(esdp, 1);
 			}
+			erts_bump_timers(esdp->timer_wheel, current_time);
 		    }
 		}
 		else {
 		    ErtsMonotonicTime timeout_time;
-		    int do_timeout = 0;
-		    if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
+		    int do_timeout;
+
+		    if (sched_type == ERTS_SCHED_NORMAL) {
 			timeout_time = erts_check_next_timeout_time(esdp);
 			current_time = erts_get_monotonic_time(esdp);
 			do_timeout = (current_time >= timeout_time);
-		    } else
+		    }
+		    else {
 			timeout_time = ERTS_MONOTONIC_TIME_MAX;
+			current_time = 0;
+			do_timeout = 0;
+		    }
+
 		    if (do_timeout) {
+			ASSERT(sched_type == ERTS_SCHED_NORMAL);
 			if (!thr_prgr_active) {
 			    erts_thr_progress_active(esdp, thr_prgr_active = 1);
 			    sched_wall_time_change(esdp, 1);
 			}
 		    }
 		    else {
-			if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
+			if (sched_type == ERTS_SCHED_NORMAL) {
 			    if (thr_prgr_active) {
 				erts_thr_progress_active(esdp, thr_prgr_active = 0);
 				sched_wall_time_change(esdp, 0);
@@ -7090,30 +7256,39 @@ suspend_scheduler(ErtsSchedulerData *esdp)
 					 | ERTS_SSI_FLG_SUSPENDED)) {
 				int res;
 
-				current_time = ERTS_SCHEDULER_IS_DIRTY(esdp) ? 0 :
-				    erts_get_monotonic_time(esdp);
+				if (sched_type == ERTS_SCHED_NORMAL)
+				    current_time = erts_get_monotonic_time(esdp);
+				else
+				    current_time = 0;
+
 				do {
 				    Sint64 timeout;
 				    if (current_time >= timeout_time)
 					break;
-				    if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
+				    if (sched_type != ERTS_SCHED_NORMAL)
+					timeout = -1;
+				    else
 					timeout = ERTS_MONOTONIC_TO_NSEC(timeout_time
 									 - current_time
 									 - 1) + 1;
-				    } else
-					timeout = -1;
 				    res = erts_tse_twait(ssi->event, timeout);
-				    current_time = ERTS_SCHEDULER_IS_DIRTY(esdp) ? 0 :
-					erts_get_monotonic_time(esdp);
+
+				    if (sched_type == ERTS_SCHED_NORMAL)
+					current_time = erts_get_monotonic_time(esdp);
+				    else
+					current_time = 0;
+
 				} while (res == EINTR);
 			    }
 			}
-			if (!ERTS_SCHEDULER_IS_DIRTY(esdp))
+			if (sched_type == ERTS_SCHED_NORMAL)
 			    erts_thr_progress_finalize_wait(esdp);
 		    }
 
-		    if (!ERTS_SCHEDULER_IS_DIRTY(esdp) && current_time >= timeout_time)
+		    if (current_time >= timeout_time) {
+			ASSERT(sched_type == ERTS_SCHED_NORMAL);
 			erts_bump_timers(esdp->timer_wheel, current_time);
+		    }
 		}
 
 		flgs = sched_prep_spin_suspended(ssi, (ERTS_SSI_FLG_WAITING
@@ -7121,7 +7296,7 @@ suspend_scheduler(ErtsSchedulerData *esdp)
 		if (!(flgs & ERTS_SSI_FLG_SUSPENDED))
 		    break;
 		changing = erts_smp_atomic32_read_nob(&schdlr_sspnd.changing);
-		if (changing & ~ERTS_SCHDLR_SSPND_CHNG_WAITER)
+		if (changing)
 		    break;
 	    }
 
@@ -7129,612 +7304,494 @@ suspend_scheduler(ErtsSchedulerData *esdp)
 	    changing = erts_smp_atomic32_read_nob(&schdlr_sspnd.changing);
 	}
 
-	active_schedulers = erts_smp_atomic32_inc_read_nob(&schdlr_sspnd.active);
+	schdlr_sspnd_inc_nscheds(&schdlr_sspnd.active, sched_type);
 	changing = erts_smp_atomic32_read_nob(&schdlr_sspnd.changing);
 	if ((changing & ERTS_SCHDLR_SSPND_CHNG_MSB)
-	    && schdlr_sspnd.online == active_schedulers) {
+	    && schdlr_sspnd.online == schdlr_sspnd.active) {
 	    erts_smp_atomic32_read_band_nob(&schdlr_sspnd.changing,
 					    ~ERTS_SCHDLR_SSPND_CHNG_MSB);
 	}
 
-	ASSERT(no <= schdlr_sspnd.online);
-	ASSERT(!ongoing_multi_scheduling_block());
-
+	ASSERT(no <= schdlr_sspnd_get_nscheds(&schdlr_sspnd.online, sched_type));
+	ASSERT((sched_type == ERTS_SCHED_NORMAL
+		? !(schdlr_sspnd.msb.ongoing|schdlr_sspnd.nmsb.ongoing)
+		: !schdlr_sspnd.msb.ongoing));
     }
 
     erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
 
+    ASSERT(!resume.msb.chngrs);
+    schdlr_sspnd_resume_procs(sched_type, &resume);
+
     ASSERT(curr_online);
 
-    if (erts_system_profile_flags.scheduler)
-    	profile_scheduler(make_small(esdp->no), am_active);
+    if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
+	if (erts_system_profile_flags.scheduler)
+	    profile_scheduler(make_small(esdp->no), am_active);
 
-    if (!thr_prgr_active) {
-	erts_thr_progress_active(esdp, thr_prgr_active = 1);
-	sched_wall_time_change(esdp, 1);
+	if (!thr_prgr_active) {
+	    erts_thr_progress_active(esdp, thr_prgr_active = 1);
+	    sched_wall_time_change(esdp, 1);
+	}
     }
 
+    if (sched_type == ERTS_SCHED_NORMAL)
+	(void) erts_get_monotonic_time(esdp);
     erts_smp_runq_lock(esdp->run_queue);
     non_empty_runq(esdp->run_queue);
 
-    schedule_bound_processes(esdp->run_queue, &sbp);
+    if (sched_type == ERTS_SCHED_NORMAL) {
+	schedule_bound_processes(esdp->run_queue, &sbp);
 
-    erts_sched_check_cpu_bind_post_suspend(esdp);
+	erts_sched_check_cpu_bind_post_suspend(esdp);
+    }
 }
 
-#endif
-
-ErtsSchedSuspendResult
+void
 erts_schedulers_state(Uint *total,
 		      Uint *online,
 		      Uint *active,
 		      Uint *dirty_cpu,
 		      Uint *dirty_cpu_online,
+		      Uint *dirty_cpu_active,
 		      Uint *dirty_io,
-		      int yield_allowed)
+		      Uint *dirty_io_active)
 {
-    int res = ERTS_SCHDLR_SSPND_EINVAL;
-    erts_aint32_t changing;
-    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-    changing = erts_smp_atomic32_read_nob(&schdlr_sspnd.changing);
-#ifdef ERTS_DIRTY_SCHEDULERS
-    changing |= (erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_cpu_changing)
-		 | erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_io_changing));
-#endif
-    if (yield_allowed && (changing & ~ERTS_SCHDLR_SSPND_CHNG_WAITER))
-	res = ERTS_SCHDLR_SSPND_YIELD_RESTART;
-    else {
+    if (active || online || dirty_cpu_online
+	|| dirty_cpu_active || dirty_io_active) {
+	erts_smp_mtx_lock(&schdlr_sspnd.mtx);
 	if (active)
-	    *active = schdlr_sspnd.online;
+	    *active = schdlr_sspnd_get_nscheds(&schdlr_sspnd.active,
+					       ERTS_SCHED_NORMAL);
 	if (online)
-	    *online = schdlr_sspnd.online;
-	if (ongoing_multi_scheduling_block() && active)
-	    *active = 1;
-#ifdef ERTS_DIRTY_SCHEDULERS
+	    *online = schdlr_sspnd_get_nscheds(&schdlr_sspnd.curr_online,
+					       ERTS_SCHED_NORMAL);
+	if (dirty_cpu_active)
+	    *dirty_cpu_active = schdlr_sspnd_get_nscheds(&schdlr_sspnd.active,
+							 ERTS_SCHED_DIRTY_CPU);
 	if (dirty_cpu_online)
-	    *dirty_cpu_online = schdlr_sspnd.dirty_cpu_online;
-#endif
-	res = ERTS_SCHDLR_SSPND_DONE;
+	    *dirty_cpu_online = schdlr_sspnd_get_nscheds(&schdlr_sspnd.curr_online,
+							 ERTS_SCHED_DIRTY_CPU);
+	if (dirty_io_active)
+	    *dirty_io_active = schdlr_sspnd_get_nscheds(&schdlr_sspnd.active,
+							ERTS_SCHED_DIRTY_IO);
+	erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
     }
-    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
+
     if (total)
 	*total = erts_no_schedulers;
-#ifdef ERTS_DIRTY_SCHEDULERS
     if (dirty_cpu)
 	*dirty_cpu = erts_no_dirty_cpu_schedulers;
     if (dirty_io)
 	*dirty_io = erts_no_dirty_io_schedulers;
-#endif
-    return res;
 }
 
-#ifdef ERTS_DIRTY_SCHEDULERS
+static void
+abort_sched_onln_chng_waitq(Process *p)
+{
+    Eterm resume = NIL;
+
+    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
+
+#ifdef DEBUG
+    {
+	int found_it = 0;
+	ErtsProcList *plp = erts_proclist_peek_first(schdlr_sspnd.chngq);
+	while (plp) {
+	    if (erts_proclist_same(plp, p))
+		found_it++;
+	    plp = erts_proclist_peek_next(schdlr_sspnd.chngq, plp);
+	}
+	ASSERT(found_it == !!(p->flags & F_SCHDLR_ONLN_WAITQ));
+    }
+#endif
+
+    if (p->flags & F_SCHDLR_ONLN_WAITQ) {
+	ErtsProcList *plp = NULL;
+
+	plp = erts_proclist_peek_first(schdlr_sspnd.chngq);
+	if (plp) {
+	    if (erts_proclist_same(plp, p)
+		&& schdlr_sspnd.changer == am_true) {
+		p->flags &= ~F_SCHDLR_ONLN_WAITQ;
+		/*
+		 * Change right was in transit to us;
+		 * transfer it to the next process by
+		 * resuming it...
+		 */
+		erts_proclist_remove(&schdlr_sspnd.chngq, plp);
+		proclist_destroy(plp);
+		plp = erts_proclist_peek_first(schdlr_sspnd.chngq);
+		if (plp)
+		    resume = plp->pid;
+		else
+		    schdlr_sspnd.changer = am_false;
+	    }
+	    else {
+		do {
+		    if (erts_proclist_same(plp, p)) {
+			p->flags &= ~F_SCHDLR_ONLN_WAITQ;
+			erts_proclist_remove(&schdlr_sspnd.chngq, plp);
+			proclist_destroy(plp);
+			break;
+		    }
+		    plp = erts_proclist_peek_next(schdlr_sspnd.chngq, plp);
+		} while (plp);
+	    }
+	}
+    }
+
+    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
+
+    if (is_internal_pid(resume))
+	schdlr_sspnd_resume_proc(resume);
+}
 
 ErtsSchedSuspendResult
 erts_set_schedulers_online(Process *p,
 			   ErtsProcLocks plocks,
 			   Sint new_no,
-			   Sint *old_no
-#ifdef ERTS_DIRTY_SCHEDULERS
-			   , int dirty_only
-#endif
-			   )
+			   Sint *old_no,
+			   int dirty_only)
 {
-    ErtsSchedulerData *esdp;
-    int ix, res = -1, no, have_unlocked_plocks, end_wait;
-    erts_aint32_t changing = 0;
+    int resume_proc, ix, res = -1, no, have_unlocked_plocks;
+    erts_aint32_t changing = 0, change_flags;
+    int online, increase;
+    ErtsProcList *plp;
 #ifdef ERTS_DIRTY_SCHEDULERS
-    ErtsSchedulerSleepInfo* ssi;
-    int dirty_no, change_dirty;
+    int dirty_no, change_dirty, dirty_online;
+#else
+    ASSERT(!dirty_only);
 #endif
 
     if (new_no < 1)
 	return ERTS_SCHDLR_SSPND_EINVAL;
-#ifdef ERTS_DIRTY_SCHEDULERS
     else if (dirty_only && erts_no_dirty_cpu_schedulers < new_no)
 	return ERTS_SCHDLR_SSPND_EINVAL;
-#endif
     else if (erts_no_schedulers < new_no)
 	return ERTS_SCHDLR_SSPND_EINVAL;
 
-    esdp = ERTS_PROC_GET_SCHDATA(p);
-    end_wait = 0;
+#ifdef ERTS_DIRTY_SCHEDULERS
+    if (dirty_only)
+	resume_proc = 0;
+    else
+#endif
+    {
+	resume_proc = 1;
+	/*
+	 * If we suspend current process we need to suspend before
+	 * requesting the change; otherwise, we got a resume/suspend
+	 * race...
+	 */
+	if (!(plocks & ERTS_PROC_LOCK_STATUS))
+	    erts_smp_proc_lock(p, ERTS_PROC_LOCK_STATUS);
+	suspend_process(p, p);
+	if (!(plocks & ERTS_PROC_LOCK_STATUS))
+	    erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+    }
 
     erts_smp_mtx_lock(&schdlr_sspnd.mtx);
 
+    change_flags = 0;
     have_unlocked_plocks = 0;
     no = (int) new_no;
 
 #ifdef ERTS_DIRTY_SCHEDULERS
-    ASSERT(schdlr_sspnd.dirty_cpu_online <= erts_no_dirty_cpu_schedulers);
+    if (!dirty_only)
+#endif
+    {
+	changing = erts_smp_atomic32_read_nob(&schdlr_sspnd.changing);
+	if (changing & ERTS_SCHDLR_SSPND_CHNG_ONLN) {
+	enqueue_wait:
+	    p->flags |= F_SCHDLR_ONLN_WAITQ;
+	    plp = proclist_create(p);
+	    erts_proclist_store_last(&schdlr_sspnd.chngq, plp);
+	    resume_proc = 0;
+	    res = ERTS_SCHDLR_SSPND_YIELD_RESTART;
+	    goto done;
+	}
+	plp = erts_proclist_peek_first(schdlr_sspnd.chngq);
+	if (!plp) {
+	    ASSERT(schdlr_sspnd.changer == am_false);
+	}
+	else {
+	    ASSERT(schdlr_sspnd.changer == am_true);
+	    if (!erts_proclist_same(plp, p))
+		goto enqueue_wait;
+	    p->flags &= ~F_SCHDLR_ONLN_WAITQ;
+	    erts_proclist_remove(&schdlr_sspnd.chngq, plp);
+	    proclist_destroy(plp);
+	}
+    }
+
+    *old_no = online = schdlr_sspnd_get_nscheds(&schdlr_sspnd.online,
+						ERTS_SCHED_NORMAL);
+#ifndef ERTS_DIRTY_SCHEDULERS
+    if (no == online) {
+	res = ERTS_SCHDLR_SSPND_DONE;
+	goto done;
+    }
+#else /* ERTS_DIRTY_SCHEDULERS */
+    dirty_online = schdlr_sspnd_get_nscheds(&schdlr_sspnd.online,
+					    ERTS_SCHED_DIRTY_CPU);
+    if (dirty_only)
+	*old_no = dirty_online;
+
+    ASSERT(dirty_online <= erts_no_dirty_cpu_schedulers);
+
     if (dirty_only) {
-	if (no > schdlr_sspnd.online) {
-	    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
-	    return ERTS_SCHDLR_SSPND_EINVAL;
+	if (no > online) {
+	    res = ERTS_SCHDLR_SSPND_EINVAL;
+	    goto done;
 	}
 	dirty_no = no;
+	if (dirty_no == dirty_online) {
+	    res = ERTS_SCHDLR_SSPND_DONE;
+	    goto done;
+	}
+	change_dirty = 1;
     } else {
 	/*
 	 * Adjust the number of dirty CPU schedulers online relative to the
 	 * adjustment made to the number of normal schedulers online.
 	 */
 	int total_pct = erts_no_dirty_cpu_schedulers*100/erts_no_schedulers;
-	int onln_pct = no*total_pct/schdlr_sspnd.online;
-	dirty_no = schdlr_sspnd.dirty_cpu_online*onln_pct/100;
+	int onln_pct = no*total_pct/online;
+	dirty_no = dirty_online*onln_pct/100;
 	if (dirty_no == 0)
 	    dirty_no = 1;
 	ASSERT(dirty_no <= erts_no_dirty_cpu_schedulers);
-    }
-#endif
-    changing = erts_smp_atomic32_read_nob(&schdlr_sspnd.changing);
-#ifdef ERTS_DIRTY_SCHEDULERS
-    changing |= erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_cpu_changing);
-#endif
-    if (changing) {
-	res = ERTS_SCHDLR_SSPND_YIELD_RESTART;
-    }
-    else {
-	int online = *old_no = schdlr_sspnd.online;
-#ifdef ERTS_DIRTY_SCHEDULERS
-	int dirty_online = schdlr_sspnd.dirty_cpu_online;
 
-	if (dirty_only) {
-	    *old_no = schdlr_sspnd.dirty_cpu_online;
-	    if (dirty_no == schdlr_sspnd.dirty_cpu_online) {
+	if (no != online)
+	    change_dirty = (dirty_no != dirty_online);
+	else {
+	    dirty_only = 1;
+	    if (dirty_no == dirty_online) {
 		res = ERTS_SCHDLR_SSPND_DONE;
+		goto done;
 	    }
 	    change_dirty = 1;
-	} else {
-#endif
-	    if (no == schdlr_sspnd.online) {
-#ifdef ERTS_DIRTY_SCHEDULERS
-		dirty_only = 1;
-		if (dirty_no == schdlr_sspnd.dirty_cpu_online)
-#endif
-		    res = ERTS_SCHDLR_SSPND_DONE;
-#ifdef ERTS_DIRTY_SCHEDULERS
-		else
-		    change_dirty = 1;
-#endif
-	    }
-#ifdef ERTS_DIRTY_SCHEDULERS
-	    else
-		change_dirty = (dirty_no != schdlr_sspnd.dirty_cpu_online);
 	}
-#endif
-	if (res == -1)
-	{
-	    int increase = (no > online);
-#ifdef ERTS_DIRTY_SCHEDULERS
-	    if (!dirty_only) {
-#endif
-		ERTS_SCHDLR_SSPND_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_ONLN
-					    | ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
-		schdlr_sspnd.online = no;
-#ifdef ERTS_DIRTY_SCHEDULERS
-	    } else
-		increase = (dirty_no > dirty_online);
-	    if (change_dirty) {
-		ERTS_SCHDLR_SSPND_DIRTY_CPU_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_ONLN
-						      | ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
-		schdlr_sspnd.dirty_cpu_online = dirty_no;
-	    }
-#endif
-	    if (increase) {
-		int ix;
-#ifdef ERTS_DIRTY_SCHEDULERS
-		if (!dirty_only) {
-#endif
-		    schdlr_sspnd.wait_curr_online = no;
-		    if (ongoing_multi_scheduling_block()) {
-			for (ix = online; ix < no; ix++)
-			    erts_sched_poke(ERTS_SCHED_SLEEP_INFO_IX(ix));
-		    }
-		    else {
-			if (plocks) {
-			    have_unlocked_plocks = 1;
-			    erts_smp_proc_unlock(p, plocks);
-			}
-			change_no_used_runqs(no);
+    }
+    if (change_dirty) {
+	change_flags |= ERTS_SCHDLR_SSPND_CHNG_DCPU_ONLN;
+	schdlr_sspnd_set_nscheds(&schdlr_sspnd.online,
+				 ERTS_SCHED_DIRTY_CPU,
+				 dirty_no);
+    }
 
-			for (ix = online; ix < no; ix++)
-			    resume_run_queue(ERTS_RUNQ_IX(ix));
+    if (dirty_only)
+	increase = (dirty_no > dirty_online);
+    else
+#endif /* ERTS_DIRTY_SCHEDULERS */
+    {
+	change_flags |= ERTS_SCHDLR_SSPND_CHNG_ONLN;
+	schdlr_sspnd_set_nscheds(&schdlr_sspnd.online,
+				 ERTS_SCHED_NORMAL,
+				 no);
+	increase = (no > online);
+    }
 
-			for (ix = no; ix < erts_no_run_queues; ix++)
-			    suspend_run_queue(ERTS_RUNQ_IX(ix));
-		    }
+    erts_smp_atomic32_read_bor_nob(&schdlr_sspnd.changing, change_flags);
+
+    res = ERTS_SCHDLR_SSPND_DONE;
+    if (increase) {
+	int ix;
 #ifdef ERTS_DIRTY_SCHEDULERS
+	if (change_dirty) {
+	    ErtsSchedulerSleepInfo* ssi;
+	    if (schdlr_sspnd.msb.ongoing) {
+		for (ix = dirty_online; ix < dirty_no; ix++) {
+		    ssi = ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(ix);
+		    erts_sched_poke(ssi);
 		}
-		if (change_dirty) {
-		    schdlr_sspnd.dirty_cpu_wait_curr_online = dirty_no;
-		    ASSERT(schdlr_sspnd.dirty_cpu_curr_online !=
-			   schdlr_sspnd.dirty_cpu_wait_curr_online);
-		    if (ongoing_multi_scheduling_block()) {
-			for (ix = dirty_online; ix < dirty_no; ix++) {
-			    ssi = ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(ix);
-			    erts_sched_poke(ssi);
-			}
-		    } else {
-			for (ix = dirty_online; ix < dirty_no; ix++) {
-			    ssi = ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(ix);
-			    scheduler_ssi_resume_wake(ssi);
-			    erts_smp_atomic32_read_band_nob(&ssi->flags,
-							    ~ERTS_SSI_FLG_SUSPENDED);
-			}
-			wake_dirty_schedulers(ERTS_DIRTY_CPU_RUNQ, 0);
-		    }
+	    } else {
+		for (ix = dirty_online; ix < dirty_no; ix++) {
+		    ssi = ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(ix);
+		    scheduler_ssi_resume_wake(ssi);
 		}
-#endif
-		res = ERTS_SCHDLR_SSPND_DONE;
 	    }
-	    else /* if (no < online) */ {
-#ifdef ERTS_DIRTY_SCHEDULERS
-		if (change_dirty) {
-		    schdlr_sspnd.dirty_cpu_wait_curr_online = dirty_no;
-		    ASSERT(schdlr_sspnd.dirty_cpu_curr_online !=
-			   schdlr_sspnd.dirty_cpu_wait_curr_online);
-		    if (ongoing_multi_scheduling_block()) {
-			for (ix = dirty_no; ix < dirty_online; ix++) {
-			    ssi = ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(ix);
-			    erts_sched_poke(ssi);
-			}
-		    } else {
-			for (ix = dirty_no; ix < dirty_online; ix++) {
-			    ssi = ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(ix);
-			    erts_smp_atomic32_read_bor_nob(&ssi->flags,
-							   ERTS_SSI_FLG_SUSPENDED);
-			}
-			wake_dirty_schedulers(ERTS_DIRTY_CPU_RUNQ, 0);
-		    }
-		}
-		if (dirty_only) {
-		    res = ERTS_SCHDLR_SSPND_DONE;
-		}
-		else
+	}
+	if (!dirty_only)
 #endif
-		{
-		    if (p->scheduler_data->no <= no) {
-			res = ERTS_SCHDLR_SSPND_DONE;
-			schdlr_sspnd.wait_curr_online = no;
-		    }
-		    else {
-			/*
-			 * Yield! Current process needs to migrate
-			 * before bif returns.
-			 */
-			res = ERTS_SCHDLR_SSPND_YIELD_DONE;
-			schdlr_sspnd.wait_curr_online = no+1;
-		    }
-
-		    if (ongoing_multi_scheduling_block()) {
-			for (ix = no; ix < online; ix++)
-			    erts_sched_poke(ERTS_SCHED_SLEEP_INFO_IX(ix));
-		    }
-		    else {
-			if (plocks) {
-			    have_unlocked_plocks = 1;
-			    erts_smp_proc_unlock(p, plocks);
-			}
-
-			change_no_used_runqs(no);
-			for (ix = no; ix < erts_no_run_queues; ix++)
-			    suspend_run_queue(ERTS_RUNQ_IX(ix));
-
-			for (ix = no; ix < online; ix++) {
-			    ErtsRunQueue *rq = ERTS_RUNQ_IX(ix);
-			    wake_scheduler(rq);
-			}
-		    }
-		}
+	{
+	    if (schdlr_sspnd.msb.ongoing|schdlr_sspnd.nmsb.ongoing) {
+		for (ix = online; ix < no; ix++)
+		    erts_sched_poke(ERTS_SCHED_SLEEP_INFO_IX(ix));
 	    }
-
-#ifdef ERTS_DIRTY_SCHEDULERS
-	    if (change_dirty) {
-		while (schdlr_sspnd.dirty_cpu_curr_online != schdlr_sspnd.dirty_cpu_wait_curr_online)
-		    erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
-		ERTS_SCHDLR_SSPND_DIRTY_CPU_CHNG_SET(0, ERTS_SCHDLR_SSPND_CHNG_WAITER);
-		erts_smp_atomic32_read_band_nob(&schdlr_sspnd.dirty_cpu_changing,
-						~ERTS_SCHDLR_SSPND_CHNG_WAITER);
-	    }
-	    if (!dirty_only)
-#endif
-	    {
-		if (schdlr_sspnd.curr_online != schdlr_sspnd.wait_curr_online) {
-		    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
-		    if (plocks && !have_unlocked_plocks) {
-			have_unlocked_plocks = 1;
-			erts_smp_proc_unlock(p, plocks);
-		    }
-		    erts_thr_progress_active(esdp, 0);
-		    erts_thr_progress_prepare_wait(esdp);
-		    end_wait = 1;
-		    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
+	    else {
+		if (plocks) {
+		    have_unlocked_plocks = 1;
+		    erts_smp_proc_unlock(p, plocks);
 		}
+		change_no_used_runqs(no);
 
-		while (schdlr_sspnd.curr_online != schdlr_sspnd.wait_curr_online)
-		    erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
+		for (ix = online; ix < no; ix++)
+		    resume_run_queue(ERTS_RUNQ_IX(ix));
 
-		ASSERT(res != ERTS_SCHDLR_SSPND_DONE
-		       ? (ERTS_SCHDLR_SSPND_CHNG_WAITER
-			  & erts_smp_atomic32_read_nob(&schdlr_sspnd.changing))
-		       : (ERTS_SCHDLR_SSPND_CHNG_WAITER
-			  == erts_smp_atomic32_read_nob(&schdlr_sspnd.changing)));
-		erts_smp_atomic32_read_band_nob(&schdlr_sspnd.changing,
-						~ERTS_SCHDLR_SSPND_CHNG_WAITER);
+		for (ix = no; ix < erts_no_run_queues; ix++)
+		    suspend_run_queue(ERTS_RUNQ_IX(ix));
 	    }
 	}
     }
-
-    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
+    else /* if decrease */ {
 #ifdef ERTS_DIRTY_SCHEDULERS
-    ASSERT(schdlr_sspnd.dirty_cpu_online <= schdlr_sspnd.online);
-    if (!dirty_only)
-#endif
-    {
-	if (end_wait) {
-	    erts_thr_progress_finalize_wait(esdp);
-	    erts_thr_progress_active(esdp, 1);
-	}
-	if (have_unlocked_plocks)
-	    erts_smp_proc_lock(p, plocks);
-    }
-
-    return res;
-}
-
-#else /* !ERTS_DIRTY_SCHEDULERS */
-
-ErtsSchedSuspendResult
-erts_set_schedulers_online(Process *p,
-			   ErtsProcLocks plocks,
-			   Sint new_no,
-			   Sint *old_no)
-{
-    ErtsSchedulerData *esdp;
-    int ix, res, no, have_unlocked_plocks, end_wait;
-    erts_aint32_t changing;
-
-    if (new_no < 1 || erts_no_schedulers < new_no)
-	return ERTS_SCHDLR_SSPND_EINVAL;
-
-    esdp = ERTS_PROC_GET_SCHDATA(p);
-    end_wait = 0;
-
-    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-
-    have_unlocked_plocks = 0;
-    no = (int) new_no;
-
-    changing = erts_smp_atomic32_read_nob(&schdlr_sspnd.changing);
-    if (changing) {
-	res = ERTS_SCHDLR_SSPND_YIELD_RESTART;
-    }
-    else {
-	int online = *old_no = schdlr_sspnd.online;
-	if (no == schdlr_sspnd.online) {
-	    res = ERTS_SCHDLR_SSPND_DONE;
-	}
-	else {
-	    ERTS_SCHDLR_SSPND_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_ONLN
-					| ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
-	    schdlr_sspnd.online = no;
-	    if (no > online) {
-		int ix;
-		schdlr_sspnd.wait_curr_online = no;
-		if (ongoing_multi_scheduling_block()) {
-		    for (ix = online; ix < no; ix++)
-			erts_sched_poke(ERTS_SCHED_SLEEP_INFO_IX(ix));
+	if (change_dirty) {
+	    ErtsSchedulerSleepInfo* ssi;
+	    if (schdlr_sspnd.msb.ongoing) {
+		for (ix = dirty_no; ix < dirty_online; ix++) {
+		    ssi = ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(ix);
+		    erts_sched_poke(ssi);
 		}
-		else {
-		    if (plocks) {
-			have_unlocked_plocks = 1;
-			erts_smp_proc_unlock(p, plocks);
-		    }
-		    change_no_used_runqs(no);
-
-		    for (ix = online; ix < no; ix++)
-			resume_run_queue(ERTS_RUNQ_IX(ix));
-
-		    for (ix = no; ix < erts_no_run_queues; ix++)
-			suspend_run_queue(ERTS_RUNQ_IX(ix));
+	    } else {
+		for (ix = dirty_no; ix < dirty_online; ix++) {
+		    ssi = ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(ix);
+		    erts_smp_atomic32_read_bor_nob(&ssi->flags,
+						   ERTS_SSI_FLG_SUSPENDED);
 		}
-		res = ERTS_SCHDLR_SSPND_DONE;
+		wake_dirty_schedulers(ERTS_DIRTY_CPU_RUNQ, 0);
 	    }
-	    else /* if (no < online) */ {
-		if (p->scheduler_data->no <= no) {
-		    res = ERTS_SCHDLR_SSPND_DONE;
-		    schdlr_sspnd.wait_curr_online = no;
-		}
-		else {
-		    /*
-		     * Yield! Current process needs to migrate
-		     * before bif returns.
-		     */
-		    res = ERTS_SCHDLR_SSPND_YIELD_DONE;
-		    schdlr_sspnd.wait_curr_online = no+1;
-		}
-
-		if (ongoing_multi_scheduling_block()) {
-		    for (ix = no; ix < online; ix++)
-			erts_sched_poke(ERTS_SCHED_SLEEP_INFO_IX(ix));
-		}
-		else {
-		    if (plocks) {
-			have_unlocked_plocks = 1;
-			erts_smp_proc_unlock(p, plocks);
-		    }
-
-		    change_no_used_runqs(no);
-		    for (ix = no; ix < erts_no_run_queues; ix++)
-			suspend_run_queue(ERTS_RUNQ_IX(ix));
-
-		    for (ix = no; ix < online; ix++) {
-			ErtsRunQueue *rq = ERTS_RUNQ_IX(ix);
-			wake_scheduler(rq);
-		    }
-		}
+	}
+	if (!dirty_only)
+#endif
+	{
+	    if (schdlr_sspnd.msb.ongoing|schdlr_sspnd.nmsb.ongoing) {
+		for (ix = no; ix < online; ix++)
+		    erts_sched_poke(ERTS_SCHED_SLEEP_INFO_IX(ix));
 	    }
-
-	    if (schdlr_sspnd.curr_online != schdlr_sspnd.wait_curr_online) {
-		erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
-		if (plocks && !have_unlocked_plocks) {
+	    else {
+		if (plocks) {
 		    have_unlocked_plocks = 1;
 		    erts_smp_proc_unlock(p, plocks);
 		}
-		erts_thr_progress_active(esdp, 0);
-		erts_thr_progress_prepare_wait(esdp);
-		end_wait = 1;
-		erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-	    }
 
-	    while (schdlr_sspnd.curr_online != schdlr_sspnd.wait_curr_online)
-		erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
-
-	    ASSERT(res != ERTS_SCHDLR_SSPND_DONE
-		   ? (ERTS_SCHDLR_SSPND_CHNG_WAITER
-		      & erts_smp_atomic32_read_nob(&schdlr_sspnd.changing))
-		   : (ERTS_SCHDLR_SSPND_CHNG_WAITER
-		      == erts_smp_atomic32_read_nob(&schdlr_sspnd.changing)));
-	    erts_smp_atomic32_read_band_nob(&schdlr_sspnd.changing,
-					    ~ERTS_SCHDLR_SSPND_CHNG_WAITER);
+		change_no_used_runqs(no);
+		for (ix = no; ix < erts_no_run_queues; ix++)
+		    suspend_run_queue(ERTS_RUNQ_IX(ix));
 
+		for (ix = no; ix < online; ix++) {
+		    ErtsRunQueue *rq = ERTS_RUNQ_IX(ix);
+		    wake_scheduler(rq);
+		}
+	    }
 	}
     }
 
-    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
-    if (end_wait) {
-	erts_thr_progress_finalize_wait(esdp);
-	erts_thr_progress_active(esdp, 1);
+    if (change_flags & ERTS_SCHDLR_SSPND_CHNG_ONLN) {
+	/* Suspend and wait for requested change to complete... */
+	schdlr_sspnd.changer = p->common.id;
+	resume_proc = 0;
+	res = ERTS_SCHDLR_SSPND_YIELD_DONE;
     }
+
+done:
+
+    ASSERT(schdlr_sspnd_get_nscheds(&schdlr_sspnd.online,
+				    ERTS_SCHED_DIRTY_CPU)
+	   <= schdlr_sspnd_get_nscheds(&schdlr_sspnd.online,
+				       ERTS_SCHED_NORMAL));
+
+    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
+
     if (have_unlocked_plocks)
 	erts_smp_proc_lock(p, plocks);
 
+    if (resume_proc) {
+	if (!(plocks & ERTS_PROC_LOCK_STATUS))
+	    erts_smp_proc_lock(p, ERTS_PROC_LOCK_STATUS);
+	resume_process(p, plocks|ERTS_PROC_LOCK_STATUS);
+	if (!(plocks & ERTS_PROC_LOCK_STATUS))
+	    erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+    }
+
     return res;
 }
 
-#endif
-
 ErtsSchedSuspendResult
-erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
+erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int normal, int all)
 {
-    int ix, res, have_unlocked_plocks = 0, online;
-    erts_aint32_t changing;
+    int resume_proc, ix, res, have_unlocked_plocks = 0;
     ErtsProcList *plp;
 #ifdef ERTS_DIRTY_SCHEDULERS
     ErtsSchedulerSleepInfo* ssi;
 #endif
+    ErtsMultiSchedulingBlock *msbp;
+    erts_aint32_t chng_flg;
+    int have_blckd_flg;
 
-    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-    changing = erts_smp_atomic32_read_nob(&schdlr_sspnd.changing);
-#ifdef ERTS_DIRTY_SCHEDULERS
-    changing |= (erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_cpu_changing)
-		 | erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_io_changing));
-#endif
-    if (changing) {
-	res = ERTS_SCHDLR_SSPND_YIELD_RESTART; /* Yield */
+    if (normal) {
+	chng_flg = ERTS_SCHDLR_SSPND_CHNG_NMSB;
+	have_blckd_flg = F_HAVE_BLCKD_NMSCHED;
+	msbp = &schdlr_sspnd.nmsb;
+    }
+    else {
+	chng_flg = ERTS_SCHDLR_SSPND_CHNG_MSB;
+	have_blckd_flg = F_HAVE_BLCKD_MSCHED;
+	msbp = &schdlr_sspnd.msb;
     }
-    else if (on) { /* ------ BLOCK ------ */
-	if (schdlr_sspnd.msb.procs) {
+
+    /*
+     * If we suspend current process we need to suspend before
+     * requesting the change; otherwise, we got a resume/suspend
+     * race...
+     */
+    if (!on) {
+	/* We never suspend current process when unblocking... */
+	resume_proc = 0;
+    }
+    else {
+	resume_proc = 1;
+	if (!(plocks & ERTS_PROC_LOCK_STATUS))
+	    erts_smp_proc_lock(p, ERTS_PROC_LOCK_STATUS);
+	suspend_process(p, p);
+	if (!(plocks & ERTS_PROC_LOCK_STATUS))
+	    erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+    }
+
+    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
+    if (on) { /* ------ BLOCK ------ */
+	if (msbp->chngq) {
+	    ASSERT(msbp->ongoing);
+	    p->flags |= have_blckd_flg;
+	    goto wait_until_msb;
+	}
+	else if (msbp->blckrs) {
+	    ASSERT(msbp->ongoing);
 	    plp = proclist_create(p);
-	    erts_proclist_store_last(&schdlr_sspnd.msb.procs, plp);
-	    p->flags |= F_HAVE_BLCKD_MSCHED;
-	    ASSERT(erts_smp_atomic32_read_nob(&schdlr_sspnd.active) == 1);
-#ifdef ERTS_DIRTY_SCHEDULERS
-	    ASSERT(erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_cpu_active) == 0);
-	    ASSERT(erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_io_active) == 0);
-#endif
+	    erts_proclist_store_last(&msbp->blckrs, plp);
+	    p->flags |= have_blckd_flg;
+	    ASSERT(schdlr_sspnd.active == ERTS_SCHDLR_SSPND_MAKE_NSCHEDS_VAL(1, 0, 0));
 	    ASSERT(p->scheduler_data->no == 1);
-	    res = ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED;
-	} else {
-	    int online = schdlr_sspnd.online;
-	    p->flags |= F_HAVE_BLCKD_MSCHED;
+	    if (schdlr_sspnd.msb.ongoing)
+		res = ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED;
+	    else
+		res = ERTS_SCHDLR_SSPND_DONE_NMSCHED_BLOCKED;
+	}
+	else {
+	    int online = (int) schdlr_sspnd_get_nscheds(&schdlr_sspnd.online,
+							ERTS_SCHED_NORMAL);
+	    ASSERT(!msbp->ongoing);
+	    p->flags |= have_blckd_flg;
 	    if (plocks) {
 		have_unlocked_plocks = 1;
 		erts_smp_proc_unlock(p, plocks);
 	    }
-	    ASSERT(!ongoing_multi_scheduling_block());
-	    schdlr_sspnd.msb.ongoing = 1;
-	    if (online == 1) {
-		res = ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED;
-		ASSERT(erts_smp_atomic32_read_nob(&schdlr_sspnd.active) == 1);
-#ifdef ERTS_DIRTY_SCHEDULERS
-		ASSERT(erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_cpu_active) == 1);
-		ASSERT(!(erts_smp_atomic32_read_nob(&ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(0)->flags)
-			 & ERTS_SSI_FLG_SUSPENDED));
-		schdlr_sspnd.msb.dirty_cpu_wait_active = 0;
-		ERTS_SCHDLR_SSPND_DIRTY_CPU_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_MSB
-						      | ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
-		ssi = ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(0);
-		erts_smp_atomic32_read_bor_nob(&ssi->flags, ERTS_SSI_FLG_SUSPENDED);
-		wake_dirty_schedulers(ERTS_DIRTY_CPU_RUNQ, 0);
-		while (erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_cpu_active)
-		       != schdlr_sspnd.msb.dirty_cpu_wait_active)
-		    erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
-		ERTS_SCHDLR_SSPND_DIRTY_CPU_CHNG_SET(0, ERTS_SCHDLR_SSPND_CHNG_WAITER);
-
-		schdlr_sspnd.msb.dirty_io_wait_active = 0;
-		ERTS_SCHDLR_SSPND_DIRTY_IO_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_MSB
-						     | ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
-		for (ix = 0; ix < erts_no_dirty_io_schedulers; ix++) {
-		    ssi = ERTS_DIRTY_IO_SCHED_SLEEP_INFO_IX(ix);
-		    erts_smp_atomic32_read_bor_nob(&ssi->flags,
-						   ERTS_SSI_FLG_SUSPENDED);
-		}
-		wake_dirty_schedulers(ERTS_DIRTY_IO_RUNQ, 0);
-		while (erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_io_active)
-		       != schdlr_sspnd.msb.dirty_io_wait_active)
-		    erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
-		ERTS_SCHDLR_SSPND_DIRTY_IO_CHNG_SET(0, ERTS_SCHDLR_SSPND_CHNG_WAITER);
-#endif
+	    ASSERT(!msbp->ongoing);
+	    msbp->ongoing = 1;
+	    if (schdlr_sspnd.active == ERTS_SCHDLR_SSPND_MAKE_NSCHEDS_VAL(1, 0, 0)
+		|| (normal && schdlr_sspnd_get_nscheds(&schdlr_sspnd.active,
+						       ERTS_SCHED_NORMAL) == 1)) {
 		ASSERT(p->scheduler_data->no == 1);
+		plp = proclist_create(p);
+		erts_proclist_store_last(&msbp->blckrs, plp);
+		if (schdlr_sspnd.msb.ongoing)
+		    res = ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED;
+		else
+		    res = ERTS_SCHDLR_SSPND_DONE_NMSCHED_BLOCKED;
 	    }
 	    else {
-		ERTS_SCHDLR_SSPND_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_MSB
-					    | ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
-		if (p->scheduler_data->no == 1) {
-		    res = ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED;
-		    schdlr_sspnd.msb.wait_active = 1;
-		}
-		else {
-		    /*
-		     * Yield! Current process needs to migrate
-		     * before bif returns.
-		     */
-		    res = ERTS_SCHDLR_SSPND_YIELD_DONE_MSCHED_BLOCKED;
-		    schdlr_sspnd.msb.wait_active = 2;
-		}
-
-#ifdef ERTS_DIRTY_SCHEDULERS
-		schdlr_sspnd.msb.dirty_cpu_wait_active = 0;
-		ERTS_SCHDLR_SSPND_DIRTY_CPU_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_MSB
-						      | ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
-		for (ix = 0; ix < erts_no_dirty_cpu_schedulers; ix++) {
-		    ssi = ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(ix);
-		    erts_smp_atomic32_read_bor_nob(&ssi->flags,
-						   ERTS_SSI_FLG_SUSPENDED);
-		}
-		wake_dirty_schedulers(ERTS_DIRTY_CPU_RUNQ, 0);
-		while (erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_cpu_active)
-		       != schdlr_sspnd.msb.dirty_cpu_wait_active)
-		    erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
-		ERTS_SCHDLR_SSPND_DIRTY_CPU_CHNG_SET(0, ERTS_SCHDLR_SSPND_CHNG_WAITER);
-		ASSERT(schdlr_sspnd.dirty_cpu_curr_online == schdlr_sspnd.dirty_cpu_online);
-
-		schdlr_sspnd.msb.dirty_io_wait_active = 0;
-		ERTS_SCHDLR_SSPND_DIRTY_IO_CHNG_SET((ERTS_SCHDLR_SSPND_CHNG_MSB
-						     | ERTS_SCHDLR_SSPND_CHNG_WAITER), 0);
-		for (ix = 0; ix < erts_no_dirty_io_schedulers; ix++) {
-		    ssi = ERTS_DIRTY_IO_SCHED_SLEEP_INFO_IX(ix);
-		    erts_smp_atomic32_read_bor_nob(&ssi->flags,
-						   ERTS_SSI_FLG_SUSPENDED);
-		}
-		wake_dirty_schedulers(ERTS_DIRTY_IO_RUNQ, 0);
-		while (erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_io_active)
-		       != schdlr_sspnd.msb.dirty_io_wait_active)
-		    erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
-		ERTS_SCHDLR_SSPND_DIRTY_IO_CHNG_SET(0, ERTS_SCHDLR_SSPND_CHNG_WAITER);
-		ASSERT(schdlr_sspnd.dirty_io_curr_online == schdlr_sspnd.dirty_io_online);
-#endif
+		erts_smp_atomic32_read_bor_nob(&schdlr_sspnd.changing,
+					       chng_flg);
 		change_no_used_runqs(1);
 		for (ix = 1; ix < erts_no_run_queues; ix++)
 		    suspend_run_queue(ERTS_RUNQ_IX(ix));
@@ -7744,84 +7801,84 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 		    wake_scheduler(rq);
 		}
 
-		if (erts_smp_atomic32_read_nob(&schdlr_sspnd.active)
-		    != schdlr_sspnd.msb.wait_active) {
-		    ErtsSchedulerData *esdp;
-
-		    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
-
-		    if (plocks && !have_unlocked_plocks) {
-			have_unlocked_plocks = 1;
-			erts_smp_proc_unlock(p, plocks);
+#ifdef ERTS_DIRTY_SCHEDULERS
+		if (!normal) {
+		    for (ix = 0; ix < erts_no_dirty_cpu_schedulers; ix++) {
+			ssi = ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(ix);
+			erts_smp_atomic32_read_bor_nob(&ssi->flags,
+						       ERTS_SSI_FLG_SUSPENDED);
 		    }
+		    wake_dirty_schedulers(ERTS_DIRTY_CPU_RUNQ, 0);
 
-		    esdp = ERTS_PROC_GET_SCHDATA(p);
-
-		    erts_thr_progress_active(esdp, 0);
-		    erts_thr_progress_prepare_wait(esdp);
-
-		    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-
-		    while (erts_smp_atomic32_read_nob(&schdlr_sspnd.active)
-			   != schdlr_sspnd.msb.wait_active)
-			erts_smp_cnd_wait(&schdlr_sspnd.cnd,
-					  &schdlr_sspnd.mtx);
-		    
-		    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
-		    
-		    erts_thr_progress_active(esdp, 1);
-		    erts_thr_progress_finalize_wait(esdp);
+		    for (ix = 0; ix < erts_no_dirty_io_schedulers; ix++) {
+			ssi = ERTS_DIRTY_IO_SCHED_SLEEP_INFO_IX(ix);
+			erts_smp_atomic32_read_bor_nob(&ssi->flags,
+						       ERTS_SSI_FLG_SUSPENDED);
+		    }
+		    wake_dirty_schedulers(ERTS_DIRTY_IO_RUNQ, 0);
+		}
+#endif
 
-		    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
+	    wait_until_msb:
 
-		}
+		ASSERT(chng_flg & erts_smp_atomic32_read_nob(&schdlr_sspnd.changing));
 
-		ASSERT(res != ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED
-		       ? (ERTS_SCHDLR_SSPND_CHNG_WAITER
-			  & erts_smp_atomic32_read_nob(&schdlr_sspnd.changing))
-		       : (ERTS_SCHDLR_SSPND_CHNG_WAITER
-			  == erts_smp_atomic32_read_nob(&schdlr_sspnd.changing)));
-		erts_smp_atomic32_read_band_nob(&schdlr_sspnd.changing,
-						~ERTS_SCHDLR_SSPND_CHNG_WAITER);
+		plp = proclist_create(p);
+		erts_proclist_store_last(&msbp->chngq, plp);
+		resume_proc = 0;
+		if (schdlr_sspnd.msb.ongoing)
+		    res = ERTS_SCHDLR_SSPND_YIELD_DONE_MSCHED_BLOCKED;
+		else
+		    res = ERTS_SCHDLR_SSPND_YIELD_DONE_NMSCHED_BLOCKED;
 	    }
-	    plp = proclist_create(p);
-	    erts_proclist_store_last(&schdlr_sspnd.msb.procs, plp);
 	    ASSERT(p->scheduler_data);
 	}
     }
-    else if (!ongoing_multi_scheduling_block()) {
-	/* unblock not ongoing */
-	ASSERT(!schdlr_sspnd.msb.procs);
-	res = ERTS_SCHDLR_SSPND_DONE;
+    else if (!msbp->ongoing) {
+	ASSERT(!msbp->blckrs);
+	goto unblock_res;
     }
     else {  /* ------ UNBLOCK ------ */
-	if (p->flags & F_HAVE_BLCKD_MSCHED) {
-	    ErtsProcList *plp = erts_proclist_peek_first(schdlr_sspnd.msb.procs);
-
-	    while (plp) {
-		ErtsProcList *tmp_plp = plp;
-		plp = erts_proclist_peek_next(schdlr_sspnd.msb.procs, plp);
-		if (erts_proclist_same(tmp_plp, p)) {
-		    erts_proclist_remove(&schdlr_sspnd.msb.procs, tmp_plp);
-		    proclist_destroy(tmp_plp);
-		    if (!all)
-			break;
+	if (p->flags & have_blckd_flg) {
+	    ErtsProcList *plps[2];
+	    ErtsProcList *plp;
+	    int limit = 0;
+
+	    plps[limit++] = erts_proclist_peek_first(msbp->blckrs);
+	    if (all)
+		plps[limit++] = erts_proclist_peek_first(msbp->chngq);
+
+	    for (ix = 0; ix < limit; ix++) {
+		plp = plps[ix];
+		while (plp) {
+		    ErtsProcList *tmp_plp = plp;
+		    plp = erts_proclist_peek_next(msbp->blckrs, plp);
+		    if (erts_proclist_same(tmp_plp, p)) {
+			erts_proclist_remove(&msbp->blckrs, tmp_plp);
+			proclist_destroy(tmp_plp);
+			if (!all)
+			    break;
+		    }
 		}
 	    }
 	}
-	if (schdlr_sspnd.msb.procs)
-	    res = ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED;
-	else {
-	    ERTS_SCHDLR_SSPND_CHNG_SET(ERTS_SCHDLR_SSPND_CHNG_MSB, 0);
-	    p->flags &= ~F_HAVE_BLCKD_MSCHED;
-	    schdlr_sspnd.msb.ongoing = 0;
-	    if (schdlr_sspnd.online == 1) {
+	if (!msbp->blckrs && !msbp->chngq) {
+	    int online = (int) schdlr_sspnd_get_nscheds(&schdlr_sspnd.online,
+							ERTS_SCHED_NORMAL);
+	    erts_smp_atomic32_read_bor_nob(&schdlr_sspnd.changing,
+					   chng_flg);
+	    p->flags &= ~have_blckd_flg;
+	    msbp->ongoing = 0;
+	    if (online == 1) {
 		/* No normal schedulers to resume */
-		ASSERT(erts_smp_atomic32_read_nob(&schdlr_sspnd.active) == 1);
-		ERTS_SCHDLR_SSPND_CHNG_SET(0, ERTS_SCHDLR_SSPND_CHNG_MSB);
+		ASSERT(schdlr_sspnd_get_nscheds(&schdlr_sspnd.active,
+						ERTS_SCHED_NORMAL) == 1);
+#ifndef ERTS_DIRTY_SCHEDULERS
+		erts_smp_atomic32_read_band_nob(&schdlr_sspnd.changing,
+						~chng_flg);
+#endif
 	    }
-	    else {
-		online = schdlr_sspnd.online;
+	    else if (!(schdlr_sspnd.msb.ongoing|schdlr_sspnd.nmsb.ongoing)) {
 		if (plocks) {
 		    have_unlocked_plocks = 1;
 		    erts_smp_proc_unlock(p, plocks);
@@ -7837,83 +7894,91 @@ erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int all)
 		    suspend_run_queue(ERTS_RUNQ_IX(ix));
 	    }
 #ifdef ERTS_DIRTY_SCHEDULERS
-	    ERTS_SCHDLR_SSPND_DIRTY_CPU_CHNG_SET(ERTS_SCHDLR_SSPND_CHNG_MSB, 0);
-	    schdlr_sspnd.msb.dirty_cpu_wait_active = schdlr_sspnd.dirty_cpu_online;
-	    for (ix = 0; ix < schdlr_sspnd.dirty_cpu_online; ix++) {
-		ssi = ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(ix);
-		scheduler_ssi_resume_wake(ssi);
-		erts_smp_atomic32_read_band_nob(&ssi->flags,
-						~ERTS_SSI_FLG_SUSPENDED);
-	    }
-	    wake_dirty_schedulers(ERTS_DIRTY_CPU_RUNQ, 0);
-
-	    ERTS_SCHDLR_SSPND_DIRTY_IO_CHNG_SET(ERTS_SCHDLR_SSPND_CHNG_MSB, 0);
-	    schdlr_sspnd.msb.dirty_io_wait_active = erts_no_dirty_io_schedulers;
-	    for (ix = 0; ix < erts_no_dirty_io_schedulers; ix++) {
-		ssi = ERTS_DIRTY_IO_SCHED_SLEEP_INFO_IX(ix);
-		scheduler_ssi_resume_wake(ssi);
-		erts_smp_atomic32_read_band_nob(&ssi->flags,
-						~ERTS_SSI_FLG_SUSPENDED);
-	    }
-	    wake_dirty_schedulers(ERTS_DIRTY_IO_RUNQ, 0);
+	    if (!normal) {
+		ASSERT(!schdlr_sspnd.msb.ongoing);
+		online = (int) schdlr_sspnd_get_nscheds(&schdlr_sspnd.online,
+							ERTS_SCHED_DIRTY_CPU);
+		for (ix = 0; ix < online; ix++) {
+		    ssi = ERTS_DIRTY_CPU_SCHED_SLEEP_INFO_IX(ix);
+		    scheduler_ssi_resume_wake(ssi);
+		}
+
+		for (ix = 0; ix < erts_no_dirty_io_schedulers; ix++) {
+		    ssi = ERTS_DIRTY_IO_SCHED_SLEEP_INFO_IX(ix);
+		    scheduler_ssi_resume_wake(ssi);
+		}
+	    }
 #endif
-	    res = ERTS_SCHDLR_SSPND_DONE;
 	}
+
+    unblock_res:
+	if (schdlr_sspnd.msb.ongoing)
+	    res = ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED;
+	else if (schdlr_sspnd.nmsb.ongoing)
+	    res = ERTS_SCHDLR_SSPND_DONE_NMSCHED_BLOCKED;
+	else
+	    res = ERTS_SCHDLR_SSPND_DONE;
     }
 
     erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
+
     if (have_unlocked_plocks)
 	erts_smp_proc_lock(p, plocks);
-    return res;
-}
 
-#ifdef DEBUG
-void
-erts_dbg_multi_scheduling_return_trap(Process *p, Eterm return_value)
-{
-    if (return_value == am_blocked) {
-	erts_aint32_t active = erts_smp_atomic32_read_nob(&schdlr_sspnd.active);
-	ASSERT(1 <= active && active <= 2);
-	ASSERT(ERTS_PROC_GET_SCHDATA(p)->no == 1);
+    if (resume_proc) {
+	if (!(plocks & ERTS_PROC_LOCK_STATUS))
+	    erts_smp_proc_lock(p, ERTS_PROC_LOCK_STATUS);
+	resume_process(p, plocks|ERTS_PROC_LOCK_STATUS);
+	if (!(plocks & ERTS_PROC_LOCK_STATUS))
+	    erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
     }
+
+    return res;
 }
-#endif
 
 int
 erts_is_multi_scheduling_blocked(void)
 {
     int res;
     erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-    res = schdlr_sspnd.msb.procs != NULL;
+    if (schdlr_sspnd.msb.blckrs)
+	res = 1;
+    else if (schdlr_sspnd.nmsb.blckrs)
+	res = -1;
+    else
+	res = 0;
     erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
     return res;
 }
 
 Eterm
-erts_multi_scheduling_blockers(Process *p)
+erts_multi_scheduling_blockers(Process *p, int normal)
 {
     Eterm res = NIL;
+    ErtsMultiSchedulingBlock *msbp;
+
+    msbp = normal ? &schdlr_sspnd.nmsb : &schdlr_sspnd.msb;
 
     erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-    if (!erts_proclist_is_empty(schdlr_sspnd.msb.procs)) {
+    if (!erts_proclist_is_empty(msbp->blckrs)) {
 	Eterm *hp, *hp_end;
 	ErtsProcList *plp1, *plp2;
 	Uint max_size = 0;
 
-	for (plp1 = erts_proclist_peek_first(schdlr_sspnd.msb.procs);
+	for (plp1 = erts_proclist_peek_first(msbp->blckrs);
 	     plp1;
-	     plp1 = erts_proclist_peek_next(schdlr_sspnd.msb.procs, plp1)) {
+	     plp1 = erts_proclist_peek_next(msbp->blckrs, plp1)) {
 	    max_size += 2;
 	}
 	ASSERT(max_size);
 	hp = HAlloc(p, max_size);
 	hp_end = hp + max_size;
-	for (plp1 = erts_proclist_peek_first(schdlr_sspnd.msb.procs);
+	for (plp1 = erts_proclist_peek_first(msbp->blckrs);
 	     plp1;
-	     plp1 = erts_proclist_peek_next(schdlr_sspnd.msb.procs, plp1)) {
-	    for (plp2 = erts_proclist_peek_first(schdlr_sspnd.msb.procs);
+	     plp1 = erts_proclist_peek_next(msbp->blckrs, plp1)) {
+	    for (plp2 = erts_proclist_peek_first(msbp->blckrs);
 		 plp2->pid != plp1->pid;
-		 plp2 = erts_proclist_peek_next(schdlr_sspnd.msb.procs, plp2));
+		 plp2 = erts_proclist_peek_next(msbp->blckrs, plp2));
 	    if (plp2 == plp1) {
 		res = CONS(hp, plp1->pid, res);
 		hp += 2;
@@ -7951,6 +8016,8 @@ sched_thread_func(void *vesdp)
     callbacks.wait = thr_prgr_wait;
     callbacks.finalize_wait = thr_prgr_fin_wait;
 
+    erts_msacc_init_thread("scheduler", no, 1);
+
     erts_thr_progress_register_managed_thread(esdp, &callbacks, 0);
     erts_alloc_register_scheduler(vesdp);
 #endif
@@ -7980,39 +8047,6 @@ sched_thread_func(void *vesdp)
 #endif
     erts_thread_init_float();
 
-    if (no == 1) {
-	erts_thr_progress_active(esdp, 0);
-	erts_thr_progress_prepare_wait(esdp);
-    }
-
-    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-
-    ASSERT(erts_smp_atomic32_read_nob(&schdlr_sspnd.changing)
-	   & ERTS_SCHDLR_SSPND_CHNG_ONLN);
-
-    if (--schdlr_sspnd.curr_online == schdlr_sspnd.wait_curr_online) {
-	erts_smp_atomic32_read_band_nob(&schdlr_sspnd.changing,
-					~ERTS_SCHDLR_SSPND_CHNG_ONLN);
-	if (no != 1)
-#ifdef ERTS_DIRTY_SCHEDULERS
-	    erts_smp_cnd_broadcast(&schdlr_sspnd.cnd);
-#else
-	    erts_smp_cnd_signal(&schdlr_sspnd.cnd);
-#endif
-    }
-
-    if (no == 1) {
-	while (schdlr_sspnd.curr_online != schdlr_sspnd.wait_curr_online)
-	    erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
-	ERTS_SCHDLR_SSPND_CHNG_SET(0, ERTS_SCHDLR_SSPND_CHNG_WAITER);
-    }
-    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
-
-    if (no == 1) {
-	erts_thr_progress_finalize_wait(esdp);
-	erts_thr_progress_active(esdp, 1);
-    }
-
 #ifdef ERTS_DO_VERIFY_UNUSED_TEMP_ALLOC
     esdp->verify_unused_temp_alloc
 	= erts_alloc_get_verify_unused_temp_alloc(
@@ -8022,7 +8056,7 @@ sched_thread_func(void *vesdp)
 
     process_main();
     /* No schedulers should *ever* terminate */
-    erl_exit(ERTS_ABORT_EXIT,
+    erts_exit(ERTS_ABORT_EXIT,
 	     "Scheduler thread number %beu terminated\n",
 	     no);
     return NULL;
@@ -8067,27 +8101,9 @@ sched_dirty_cpu_thread_func(void *vesdp)
 #endif
     erts_thread_init_float();
 
-    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-    ASSERT(erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_cpu_changing)
-	   & ERTS_SCHDLR_SSPND_CHNG_ONLN);
-
-    if (--schdlr_sspnd.dirty_cpu_curr_online == schdlr_sspnd.dirty_cpu_wait_curr_online) {
-	erts_smp_atomic32_read_band_nob(&schdlr_sspnd.dirty_cpu_changing,
-					~ERTS_SCHDLR_SSPND_CHNG_ONLN);
-	if (no != 1)
-	    erts_smp_cnd_broadcast(&schdlr_sspnd.cnd);
-    }
-
-    if (no == 1) {
-	while (schdlr_sspnd.dirty_cpu_curr_online != schdlr_sspnd.dirty_cpu_wait_curr_online)
-	    erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
-	ERTS_SCHDLR_SSPND_DIRTY_CPU_CHNG_SET(0, ERTS_SCHDLR_SSPND_CHNG_WAITER);
-    }
-    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
-
     process_main();
     /* No schedulers should *ever* terminate */
-    erl_exit(ERTS_ABORT_EXIT,
+    erts_exit(ERTS_ABORT_EXIT,
 	     "Dirty CPU scheduler thread number %beu terminated\n",
 	     no);
     return NULL;
@@ -8130,27 +8146,9 @@ sched_dirty_io_thread_func(void *vesdp)
 #endif
     erts_thread_init_float();
 
-    erts_smp_mtx_lock(&schdlr_sspnd.mtx);
-    ASSERT(erts_smp_atomic32_read_nob(&schdlr_sspnd.dirty_io_changing)
-	   & ERTS_SCHDLR_SSPND_CHNG_ONLN);
-
-    if (--schdlr_sspnd.dirty_io_curr_online == schdlr_sspnd.dirty_io_wait_curr_online) {
-	erts_smp_atomic32_read_band_nob(&schdlr_sspnd.dirty_io_changing,
-					~ERTS_SCHDLR_SSPND_CHNG_ONLN);
-	if (no != 1)
-	    erts_smp_cnd_broadcast(&schdlr_sspnd.cnd);
-    }
-
-    if (no == 1) {
-	while (schdlr_sspnd.dirty_io_curr_online != schdlr_sspnd.dirty_io_wait_curr_online)
-	    erts_smp_cnd_wait(&schdlr_sspnd.cnd, &schdlr_sspnd.mtx);
-	ERTS_SCHDLR_SSPND_DIRTY_IO_CHNG_SET(0, ERTS_SCHDLR_SSPND_CHNG_WAITER);
-    }
-    erts_smp_mtx_unlock(&schdlr_sspnd.mtx);
-
     process_main();
     /* No schedulers should *ever* terminate */
-    erl_exit(ERTS_ABORT_EXIT,
+    erts_exit(ERTS_ABORT_EXIT,
 	     "Dirty I/O scheduler thread number %beu terminated\n",
 	     no);
     return NULL;
@@ -8180,12 +8178,12 @@ erts_start_schedulers(void)
         erts_snprintf(opts.name, 16, "runq_supervisor");
 	erts_atomic_init_nob(&runq_supervisor_sleeping, 0);
 	if (0 != ethr_event_init(&runq_supervision_event))
-	    erl_exit(1, "Failed to create run-queue supervision event\n");
+	    erts_exit(ERTS_ERROR_EXIT, "Failed to create run-queue supervision event\n");
 	if (0 != ethr_thr_create(&runq_supervisor_tid,
 				 runq_supervisor,
 				 NULL,
 				 &opts))
-	    erl_exit(1, "Failed to create run-queue supervision thread\n");
+	    erts_exit(ERTS_ERROR_EXIT, "Failed to create run-queue supervision thread\n");
 
     }
 #endif
@@ -8206,18 +8204,12 @@ erts_start_schedulers(void)
 
 	erts_snprintf(opts.name, 16, "%lu_scheduler", actual + 1);
 
-#ifdef __OSE__
-        /* This should be done in the bind strategy */
-	opts.coreNo = (actual+1) % ose_num_cpus();
-#endif
-
 	res = ethr_thr_create(&esdp->tid, sched_thread_func, (void*)esdp, &opts);
 
 	if (res != 0) {
            break;
 	}
     }
-
     erts_no_schedulers = actual;
 
 #ifdef ERTS_DIRTY_SCHEDULERS
@@ -8229,14 +8221,14 @@ erts_start_schedulers(void)
 	    erts_snprintf(opts.name, 16, "%d_dirty_cpu_scheduler", ix + 1);
 	    res = ethr_thr_create(&esdp->tid,sched_dirty_cpu_thread_func,(void*)esdp,&opts);
 	    if (res != 0)
-		erl_exit(1, "Failed to create dirty cpu scheduler thread %d\n", ix);
+		erts_exit(ERTS_ERROR_EXIT, "Failed to create dirty cpu scheduler thread %d\n", ix);
 	}
 	for (ix = 0; ix < erts_no_dirty_io_schedulers; ix++) {
 	    ErtsSchedulerData *esdp = ERTS_DIRTY_IO_SCHEDULER_IX(ix);
 	    erts_snprintf(opts.name, 16, "%d_dirty_io_scheduler", ix + 1);
 	    res = ethr_thr_create(&esdp->tid,sched_dirty_io_thread_func,(void*)esdp,&opts);
 	    if (res != 0)
-		erl_exit(1, "Failed to create dirty io scheduler thread %d\n", ix);
+		erts_exit(ERTS_ERROR_EXIT, "Failed to create dirty io scheduler thread %d\n", ix);
 	}
     }
 #endif
@@ -8246,16 +8238,12 @@ erts_start_schedulers(void)
 
     erts_snprintf(opts.name, 16, "aux");
 
-#ifdef __OSE__
-    opts.coreNo = 0;
-#endif /* __OSE__ */
-
     res = ethr_thr_create(&aux_tid, aux_thread, NULL, &opts);
     if (res != 0)
-	erl_exit(1, "Failed to create aux thread\n");
+	erts_exit(ERTS_ERROR_EXIT, "Failed to create aux thread\n");
 
     if (actual < 1)
-	erl_exit(1,
+	erts_exit(ERTS_ERROR_EXIT,
 		 "Failed to create any scheduler-threads: %s (%d)\n",
 		 erl_errno_id(res),
 		 res);
@@ -8269,7 +8257,6 @@ erts_start_schedulers(void)
 		      actual, actual == 1 ? " was" : "s were");
 	erts_send_error_to_logger_nogl(dsbufp);
     }
-
 }
 
 #endif /* ERTS_SMP */
@@ -8288,7 +8275,7 @@ add_pend_suspend(Process *suspendee,
 					 sizeof(ErtsPendingSuspend));
     psp->next = NULL;
 #ifdef DEBUG
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
     psp->end = (ErtsPendingSuspend *) 0xdeaddeaddeaddead;
 #else
     psp->end = (ErtsPendingSuspend *) 0xdeaddead;
@@ -8410,9 +8397,8 @@ pid2proc_not_running(Process *c_p, ErtsProcLocks c_p_locks,
 	    resume_process(rp, rp_locks);
     }
     else {
-
 	rp = erts_pid2proc(c_p, c_p_locks|ERTS_PROC_LOCK_STATUS,
-			   pid, pid_locks|ERTS_PROC_LOCK_STATUS);
+			   pid, ERTS_PROC_LOCK_STATUS);
 
 	if (!rp) {
 	    c_p->flags &= ~F_P2PNR_RESCHED;
@@ -8421,40 +8407,84 @@ pid2proc_not_running(Process *c_p, ErtsProcLocks c_p_locks,
 
 	ASSERT(!(c_p->flags & F_P2PNR_RESCHED));
 
-	if (suspend) {
-	    if (suspend_process(c_p, rp))
-		goto done;
-	}
-	else {
-	    if (!((ERTS_PSFLG_RUNNING|ERTS_PSFLG_RUNNING_SYS)
-		  & erts_smp_atomic32_read_acqb(&rp->state)))
-		goto done;
+	/*
+	 * Suspend the other process in order to prevent
+	 * it from being selected for normal execution.
+	 * This will however not prevent it from being
+	 * selected for execution of a system task. If
+	 * it is selected for execution of a system task
+	 * we might be blocked for quite a while if the
+	 * try-lock below fails. That is, there is room
+	 * for improvement here...
+	 */
 
-	}
+	if (!suspend_process(c_p, rp)) {
+	    /* Other process running */
 
-	/* Other process running */
+	    ASSERT(ERTS_PSFLG_RUNNING
+		   & erts_smp_atomic32_read_nob(&rp->state));
 
-	/*
-	 * If we got pending suspenders and suspend ourselves waiting
-	 * to suspend another process we might deadlock.
-	 * In this case we have to yield, be suspended by
-	 * someone else and then do it all over again.
-	 */
-	if (!c_p->pending_suspenders) {
-	    /* Mark rp pending for suspend by c_p */
-	    add_pend_suspend(rp, c_p->common.id, handle_pend_sync_suspend);
-	    ASSERT(is_nil(c_p->suspendee));
+	running:
 
-	    /* Suspend c_p; when rp is suspended c_p will be resumed. */
-	    suspend_process(c_p, c_p);
-	    c_p->flags |= F_P2PNR_RESCHED;
+	    /*
+	     * If we got pending suspenders and suspend ourselves waiting
+	     * to suspend another process we might deadlock.
+	     * In this case we have to yield, be suspended by
+	     * someone else and then do it all over again.
+	     */
+	    if (!c_p->pending_suspenders) {
+		/* Mark rp pending for suspend by c_p */
+		add_pend_suspend(rp, c_p->common.id, handle_pend_sync_suspend);
+		ASSERT(is_nil(c_p->suspendee));
+
+		/* Suspend c_p; when rp is suspended c_p will be resumed. */
+		suspend_process(c_p, c_p);
+		c_p->flags |= F_P2PNR_RESCHED;
+	    }
+	    /* Yield (caller is assumed to yield immediately in bif). */
+	    erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_STATUS);
+	    rp = ERTS_PROC_LOCK_BUSY;
+	}
+	else {
+	    ErtsProcLocks need_locks = pid_locks & ~ERTS_PROC_LOCK_STATUS;
+	    if (need_locks && erts_smp_proc_trylock(rp, need_locks) == EBUSY) {
+		if (ERTS_PSFLG_RUNNING_SYS
+		    & erts_smp_atomic32_read_nob(&rp->state)) {
+		    /* Executing system task... */
+		    resume_process(rp, ERTS_PROC_LOCK_STATUS);
+		    goto running;
+		}
+		erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_STATUS);
+		/*
+		 * If we are unlucky, the process just got selected for
+		 * execution of a system task. In this case we may be
+		 * blocked here for quite a while... Execution of system
+		 * tasks are fortunately quite rare events. We try to
+		 * avoid this by checking if it is in a state executing
+		 * system tasks (above), but it will not prevent all
+		 * scenarios for a long block here...
+		 */
+		rp = erts_pid2proc(c_p, c_p_locks|ERTS_PROC_LOCK_STATUS,
+				   pid, pid_locks|ERTS_PROC_LOCK_STATUS);
+		if (!rp)
+		    goto done;
+	    }
+
+	    /*
+	     * The previous suspend has prevented the process
+	     * from being selected for normal execution regardless
+	     * of locks held or not held on it...
+	     */
+	    ASSERT(!(ERTS_PSFLG_RUNNING
+		     & erts_smp_atomic32_read_nob(&rp->state)));
+
+	    if (!suspend)
+		resume_process(rp, pid_locks|ERTS_PROC_LOCK_STATUS);
 	}
-	/* Yield (caller is assumed to yield immediately in bif). */
-	erts_smp_proc_unlock(rp, pid_locks|ERTS_PROC_LOCK_STATUS);
-	rp = ERTS_PROC_LOCK_BUSY;
     }
 
  done:
+	
     if (rp && rp != ERTS_PROC_LOCK_BUSY && !(pid_locks & ERTS_PROC_LOCK_STATUS))
 	erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_STATUS);
     if (unlock_c_p_status)
@@ -9240,6 +9270,8 @@ Process *schedule(Process *p, int calls)
     Uint32 flags;
     erts_aint32_t state = 0; /* Supress warning... */
 
+    ERTS_MSACC_DECLARE_CACHE();
+
 #ifdef USE_VM_PROBES
     if (p != NULL && DTRACE_ENABLED(process_unscheduled)) {
         DTRACE_CHARBUF(process_buf, DTRACE_TERM_BUF_SIZE);
@@ -9342,6 +9374,8 @@ Process *schedule(Process *p, int calls)
 
 	erts_smp_proc_unlock(p, ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_STATUS);
 
+        ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_OTHER);
+
 	if (state & ERTS_PSFLG_FREE) {
 #ifdef ERTS_SMP
 	    ASSERT(esdp->free_process == p);
@@ -9378,15 +9412,16 @@ Process *schedule(Process *p, int calls)
 #ifdef ERTS_SMP
 	ErtsMigrationPaths *mps;
 	ErtsMigrationPath *mp;
-	ErtsProcList *pnd_xtrs = rq->procs.pending_exiters;
-	if (erts_proclist_fetch(&pnd_xtrs, NULL)) {
-	    rq->procs.pending_exiters = NULL;
-	    erts_smp_runq_unlock(rq);
-	    handle_pending_exiters(pnd_xtrs);
-	    erts_smp_runq_lock(rq);
-	}
 
 	if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
+	    ErtsProcList *pnd_xtrs = rq->procs.pending_exiters;
+	    if (erts_proclist_fetch(&pnd_xtrs, NULL)) {
+		rq->procs.pending_exiters = NULL;
+		erts_smp_runq_unlock(rq);
+		handle_pending_exiters(pnd_xtrs);
+		erts_smp_runq_lock(rq);
+	    }
+
 	    if (rq->check_balance_reds <= 0)
 		check_balance(rq);
 
@@ -9430,12 +9465,10 @@ Process *schedule(Process *p, int calls)
 	    erts_aint32_t aux_work;
 	    int leader_update = erts_thr_progress_update(esdp);
 	    aux_work = erts_atomic32_read_acqb(&esdp->ssi->aux_work);
-	    if (aux_work | leader_update | ERTS_SCHED_FAIR) {
+	    if (aux_work | leader_update) {
 		erts_smp_runq_unlock(rq);
 		if (leader_update)
 		    erts_thr_progress_leader_update(esdp);
-		else if (ERTS_SCHED_FAIR)
-		  ERTS_SCHED_FAIR_YIELD();
 		if (aux_work)
 		    handle_aux_work(&esdp->aux_work_data, aux_work, 0);
 		erts_smp_runq_lock(rq);
@@ -9504,7 +9537,7 @@ Process *schedule(Process *p, int calls)
 	    scheduler_wait(&fcalls, esdp, rq);
 	    flags = ERTS_RUNQ_FLGS_SET_NOB(rq, ERTS_RUNQ_FLG_EXEC);
 	    flags |= ERTS_RUNQ_FLG_EXEC;
-
+            ERTS_MSACC_UPDATE_CACHE();
 #ifdef ERTS_SMP
 	    non_empty_runq(rq);
 #endif
@@ -9513,12 +9546,14 @@ Process *schedule(Process *p, int calls)
 	}
 	else if (!ERTS_SCHEDULER_IS_DIRTY(esdp) &&
 		 (fcalls > input_reductions &&
-		  prepare_for_sys_schedule(esdp, !0))) {
+		  prepare_for_sys_schedule(!0))) {
 	    ErtsMonotonicTime current_time;
 	    /*
 	     * Schedule system-level activities.
 	     */
 
+	    ERTS_MSACC_PUSH_STATE_CACHED_M();
+
 	    erts_smp_atomic32_set_relb(&function_calls, 0);
 	    fcalls = 0;
 
@@ -9526,7 +9561,12 @@ Process *schedule(Process *p, int calls)
 	    erts_sys_schedule_interrupt(0);
 #endif
 	    erts_smp_runq_unlock(rq);
+
+            ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_CHECK_IO);
+            LTTNG2(scheduler_poll, esdp->no, 1);
+
 	    erl_sys_schedule(1);
+	    ERTS_MSACC_POP_STATE_M();
 
 	    current_time = erts_get_monotonic_time(esdp);
 	    if (current_time >= erts_next_timeout_time(esdp->next_tmo_ref))
@@ -9584,11 +9624,12 @@ Process *schedule(Process *p, int calls)
     pick_next_process: {
 	    erts_aint32_t psflg_band_mask;
 	    int prio_q;
-	    int qmask;
+	    int qmask, qbit;
 
 	    flags = ERTS_RUNQ_FLGS_GET_NOB(rq);
 	    qmask = (int) (flags & ERTS_RUNQ_FLGS_PROCS_QMASK);
-	    switch (qmask & -qmask) {
+	    qbit = qmask & -qmask;
+	    switch (qbit) {
 	    case MAX_BIT:
 		prio_q = PRIORITY_MAX;
 		break;
@@ -9604,9 +9645,12 @@ Process *schedule(Process *p, int calls)
 	    case 0:			/* No process at all */
 	    default:
 		ASSERT(qmask == 0);
+                ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_OTHER);
 		goto check_activities_to_run;
 	    }
 
+            ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_EMULATOR);
+
 	    BM_START_TIMER(system);
 
 	    /*
@@ -9616,20 +9660,11 @@ Process *schedule(Process *p, int calls)
 
 	    ASSERT(p); /* Wrong qmask in rq->flags? */
 
-	    psflg_band_mask = ~(((erts_aint32_t) 1) << (ERTS_PSFLGS_GET_PRQ_PRIO(state)
-							+ ERTS_PSFLGS_IN_PRQ_MASK_OFFSET));
-
-#ifdef ERTS_DIRTY_SCHEDULERS
-	    ASSERT((state & (ERTS_PSFLG_DIRTY_CPU_PROC|ERTS_PSFLG_DIRTY_IO_PROC)) !=
-		   (ERTS_PSFLG_DIRTY_CPU_PROC|ERTS_PSFLG_DIRTY_IO_PROC));
-	    if (state & (ERTS_PSFLG_DIRTY_CPU_PROC|ERTS_PSFLG_DIRTY_IO_PROC)) {
-		ASSERT((ERTS_SCHEDULER_IS_DIRTY_CPU(esdp) && (state & ERTS_PSFLG_DIRTY_CPU_PROC)) ||
-		       (ERTS_SCHEDULER_IS_DIRTY_IO(esdp) && (state & ERTS_PSFLG_DIRTY_IO_PROC)));
-		if (!ERTS_SCHEDULER_IS_DIRTY(esdp) && !(state & ERTS_PSFLG_ACTIVE_SYS))
-		    goto pick_next_process;
-		state &= ~(ERTS_PSFLG_DIRTY_CPU_PROC_IN_Q|ERTS_PSFLG_DIRTY_IO_PROC_IN_Q);
-	    }
-#endif
+	    if (ERTS_SCHEDULER_IS_DIRTY(esdp))
+		psflg_band_mask = ~((erts_aint32_t) 0);
+	    else
+		psflg_band_mask = ~(((erts_aint32_t) 1) << (ERTS_PSFLGS_GET_PRQ_PRIO(state)
+							    + ERTS_PSFLGS_IN_PRQ_MASK_OFFSET));
 
 	    if (!(state & ERTS_PSFLG_PROXY))
 		psflg_band_mask &= ~ERTS_PSFLG_IN_RUNQ;
@@ -9652,9 +9687,11 @@ Process *schedule(Process *p, int calls)
 			       | ERTS_PSFLG_RUNNING_SYS))) {
 		    tmp = state & (ERTS_PSFLG_SUSPENDED
 				   | ERTS_PSFLG_PENDING_EXIT
-				   | ERTS_PSFLG_ACTIVE_SYS);
+				   | ERTS_PSFLG_ACTIVE_SYS
+				   | ERTS_PSFLG_DIRTY_ACTIVE_SYS);
 		    if (tmp != ERTS_PSFLG_SUSPENDED) {
-			if (state & ERTS_PSFLG_ACTIVE_SYS)
+			if (state & (ERTS_PSFLG_ACTIVE_SYS
+				     | ERTS_PSFLG_DIRTY_ACTIVE_SYS))
 			    new |= ERTS_PSFLG_RUNNING_SYS;
 			else
 			    new |= ERTS_PSFLG_RUNNING;
@@ -9667,14 +9704,17 @@ Process *schedule(Process *p, int calls)
 				  | ERTS_PSFLG_FREE))
 			|| ((state & (ERTS_PSFLG_SUSPENDED
 				      | ERTS_PSFLG_PENDING_EXIT
-				      | ERTS_PSFLG_ACTIVE_SYS))
+				      | ERTS_PSFLG_ACTIVE_SYS
+				      | ERTS_PSFLG_DIRTY_ACTIVE_SYS))
 			    == ERTS_PSFLG_SUSPENDED)) {
-			if (state & ERTS_PSFLG_FREE)
-			    erts_proc_dec_refc(p);
 			if (proxy_p) {
 			    free_proxy_proc(proxy_p);
 			    proxy_p = NULL;
 			}
+			else if (state & ERTS_PSFLG_FREE) {
+			    /* free and not queued by proxy */
+			    erts_proc_dec_refc(p);
+			}
 			goto pick_next_process;
 		    }
 		    state = new;
@@ -9686,10 +9726,42 @@ Process *schedule(Process *p, int calls)
 
 	    esdp->current_process = p;
 
+
+	    reds = context_reds;
+
+#ifdef ERTS_SMP
+
+	    erts_smp_runq_unlock(rq);
+
+#ifdef ERTS_DIRTY_SCHEDULERS
+	    if (ERTS_SCHEDULER_IS_DIRTY(esdp)) {
+#ifdef DEBUG
+		int old_dqbit;
+#endif
+		int dqbit = qbit;
+
+		if (rq == ERTS_DIRTY_CPU_RUNQ)
+		    dqbit <<= ERTS_PDSFLGS_IN_CPU_PRQ_MASK_OFFSET;
+		else {
+		    ASSERT(rq == ERTS_DIRTY_IO_RUNQ);
+		    dqbit <<= ERTS_PDSFLGS_IN_IO_PRQ_MASK_OFFSET;
+		}
+
+#ifdef DEBUG
+		old_dqbit = (int)
+#else
+		    (void)
+#endif
+		    erts_smp_atomic32_read_band_mb(&p->dirty_state, ~dqbit);
+		ASSERT(old_dqbit & dqbit);
+	    }
+#endif /* ERTS_DIRTY_SCHEDULERS */
+
+#endif /* ERTS_SMP */
+
 	}
 
 #ifdef ERTS_SMP
-	erts_smp_runq_unlock(rq);
 
 	if (flags & ERTS_RUNQ_FLG_PROTECTED)
 	    (void) ERTS_RUNQ_FLGS_UNSET(rq, ERTS_RUNQ_FLG_PROTECTED);
@@ -9698,12 +9770,11 @@ Process *schedule(Process *p, int calls)
 
 	erts_smp_proc_lock(p, ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_STATUS);
 
+	state = erts_smp_atomic32_read_nob(&p->state);
+
 	if (erts_sched_stat.enabled) {
 	    int prio;
-	    UWord old = ERTS_PROC_SCHED_ID(p,
-					  (ERTS_PROC_LOCK_MAIN
-					   | ERTS_PROC_LOCK_STATUS),
-					  (UWord) esdp->no);
+	    UWord old = ERTS_PROC_SCHED_ID(p, (UWord) esdp->no);
 	    int migrated = old && old != esdp->no;
 
 #ifdef ERTS_DIRTY_SCHEDULERS
@@ -9722,15 +9793,56 @@ Process *schedule(Process *p, int calls)
 	    erts_smp_spin_unlock(&erts_sched_stat.lock);
 	}
 
-	if (ERTS_PROC_PENDING_EXIT(p)) {
+	ASSERT(!p->scheduler_data);
+	p->scheduler_data = esdp;
+
+	state = erts_smp_atomic32_read_nob(&p->state);
+
+#ifdef ERTS_DIRTY_SCHEDULERS
+	if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
+	    if (!!(state & ERTS_PSFLGS_DIRTY_WORK)
+		& !(state & ERTS_PSFLG_ACTIVE_SYS)) {
+		/* Migrate to dirty scheduler... */
+	    sunlock_sched_out_proc:
+		erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+		p->fcalls = reds;
+		goto sched_out_proc;
+
+	    }
+	}
+	else {
+	    if (state & (ERTS_PSFLG_ACTIVE_SYS
+			 | ERTS_PSFLG_PENDING_EXIT
+			 | ERTS_PSFLG_EXITING)) {
+		/* Migrate to normal scheduler... */
+		goto sunlock_sched_out_proc;
+	    }
+	    if ((state & ERTS_PSFLG_DIRTY_ACTIVE_SYS)
+		&& rq == ERTS_DIRTY_IO_RUNQ) {
+		/* Migrate to dirty cpu scheduler... */
+		goto sunlock_sched_out_proc;
+	    }
+
+	    ASSERT((state & ERTS_PSFLG_DIRTY_ACTIVE_SYS)
+		   || *p->i == (BeamInstr) em_call_nif);
+
+	    ASSERT(rq == ERTS_DIRTY_CPU_RUNQ
+		   ? (state & (ERTS_PSFLG_DIRTY_CPU_PROC
+			       | ERTS_PSFLG_DIRTY_ACTIVE_SYS))
+		   : (rq == ERTS_DIRTY_IO_RUNQ
+		      && (state & ERTS_PSFLG_DIRTY_IO_PROC)));	    
+	}
+#endif
+
+	if (state & ERTS_PSFLG_PENDING_EXIT) {
 	    erts_handle_pending_exit(p,
 				     ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_STATUS);
 	    state = erts_smp_atomic32_read_nob(&p->state);
 	}
-	ASSERT(!p->scheduler_data);
-	p->scheduler_data = esdp;
-#endif
-	reds = context_reds;
+
+#endif /* ERTS_SMP */
+
+	p->fcalls = reds;
 
 	if (IS_TRACED(p)) {
 	    if (state & ERTS_PSFLG_EXITING) {
@@ -9756,14 +9868,24 @@ Process *schedule(Process *p, int calls)
 #endif
 
 	if (state & ERTS_PSFLG_RUNNING_SYS) {
-	    reds -= execute_sys_tasks(p, &state, reds);
-	    if (reds <= 0
+	    /*
+	     * GC is normally never delayed when a process
+	     * is scheduled out, but might be when executing
+	     * hand written beam assembly in
+	     * prim_eval:'receive'. If GC is delayed we are
+	     * not allowed to execute system tasks.
+	     */
+	    if (!(p->flags & F_DELAY_GC)) {
+		reds -= execute_sys_tasks(p, &state, reds);
+		if (reds <= 0
 #ifdef ERTS_DIRTY_SCHEDULERS
-		|| (state & (ERTS_PSFLG_DIRTY_CPU_PROC|ERTS_PSFLG_DIRTY_IO_PROC))
+		    || ERTS_SCHEDULER_IS_DIRTY(esdp)
+		    || (state & ERTS_PSFLGS_DIRTY_WORK)
 #endif
-		) {
-		p->fcalls = reds;
-		goto sched_out_proc;
+		    ) {
+		    p->fcalls = reds;
+		    goto sched_out_proc;
+		}
 	    }
 
 	    ASSERT(state & ERTS_PSFLG_RUNNING_SYS);
@@ -9792,13 +9914,13 @@ Process *schedule(Process *p, int calls)
 	    }
 	}
 
-	if (!(state & ERTS_PSFLG_EXITING)
-	    && ((FLAGS(p) & F_FORCE_GC)
-		|| (MSO(p).overhead > BIN_VHEAP_SZ(p)))) {
-	    reds -= erts_garbage_collect(p, 0, p->arg_reg, p->arity);
-	    if (reds <= 0) {
-		p->fcalls = reds;
-		goto sched_out_proc;
+	if (ERTS_IS_GC_DESIRED(p)) {
+	    if (!(state & ERTS_PSFLG_EXITING) && !(p->flags & (F_DELAY_GC|F_DISABLE_GC))) {
+		reds -= erts_garbage_collect_nobump(p, 0, p->arg_reg, p->arity);
+		if (reds <= 0) {
+		    p->fcalls = reds;
+		    goto sched_out_proc;
+		}
 	    }
 	}
 
@@ -9807,7 +9929,6 @@ Process *schedule(Process *p, int calls)
 	    proxy_p = NULL;
 	}
 	    
-	p->fcalls = reds;
 	ERTS_SMP_CHK_HAVE_ONLY_MAIN_PROC_LOCK(p);
 
 	/* Never run a suspended process */
@@ -9838,7 +9959,7 @@ notify_sys_task_executed(Process *c_p, ErtsProcSysTask *st, Eterm st_result)
     if (rp) {
 	ErtsProcLocks rp_locks;
 	ErlOffHeap *ohp;
-	ErlHeapFragment* bp;
+	ErtsMessage *mp;
 	Eterm *hp, msg, req_id, result;
 	Uint st_result_sz, hsz;
 #ifdef DEBUG
@@ -9850,11 +9971,7 @@ notify_sys_task_executed(Process *c_p, ErtsProcSysTask *st, Eterm st_result)
 	st_result_sz = is_immed(st_result) ? 0 : size_object(st_result);
 	hsz = st->req_id_sz + st_result_sz + 4 /* 3-tuple */;
 
-	hp = erts_alloc_message_heap(hsz,
-				     &bp,
-				     &ohp,
-				     rp,
-				     &rp_locks);
+	mp = erts_alloc_message_heap(rp, &rp_locks, hsz, &hp, &ohp);
 
 #ifdef DEBUG
 	hp_start = hp;
@@ -9879,7 +9996,7 @@ notify_sys_task_executed(Process *c_p, ErtsProcSysTask *st, Eterm st_result)
 	ASSERT(hp_start + hsz == hp);
 #endif
 
-	erts_queue_message(rp, &rp_locks, bp, msg, NIL);
+	erts_queue_message(rp, &rp_locks, mp, msg, NIL);
 
 	if (c_p == rp)
 	    rp_locks &= ~ERTS_PROC_LOCK_MAIN;
@@ -10081,10 +10198,10 @@ execute_sys_tasks(Process *c_p, erts_aint32_t *statep, int in_reds)
 	    else {
 		if (!garbage_collected) {
 		    FLAGS(c_p) |= F_NEED_FULLSWEEP;
-		    reds += erts_garbage_collect(c_p,
-						 0,
-						 c_p->arg_reg,
-						 c_p->arity);
+		    reds += erts_garbage_collect_nobump(c_p,
+							0,
+							c_p->arg_reg,
+							c_p->arity);
 		    garbage_collected = 1;
 		}
 		st_res = am_true;
@@ -10093,7 +10210,7 @@ execute_sys_tasks(Process *c_p, erts_aint32_t *statep, int in_reds)
 	case ERTS_PSTT_CPC:
 	    st_res = erts_check_process_code(c_p,
 					     st->arg[0],
-					     st->arg[1] == am_true,
+                                             unsigned_val(st->arg[1]),
 					     &reds);
 	    if (is_non_value(st_res)) {
 		/* Needed gc, but gc was disabled */
@@ -10101,6 +10218,10 @@ execute_sys_tasks(Process *c_p, erts_aint32_t *statep, int in_reds)
 		st = NULL;
 	    }
 	    break;
+	case ERTS_PSTT_COHMQ:
+	    reds += erts_complete_off_heap_message_queue_change(c_p);
+	    st_res = am_true;
+	    break;
 	default:
 	    ERTS_INTERNAL_ERROR("Invalid process sys task type");
 	    st_res = am_false;
@@ -10143,6 +10264,9 @@ cleanup_sys_tasks(Process *c_p, erts_aint32_t in_state, int in_reds)
 	case ERTS_PSTT_CPC:
 	    st_res = am_false;
 	    break;
+	case ERTS_PSTT_COHMQ:
+	    st_res = am_false;
+	    break;
 	default:
 	    ERTS_INTERNAL_ERROR("Invalid process sys task type");
 	    st_res = am_false;
@@ -10161,10 +10285,8 @@ BIF_RETTYPE
 erts_internal_request_system_task_3(BIF_ALIST_3)
 {
     Process *rp = erts_proc_lookup(BIF_ARG_1);
-    ErtsProcSysTaskQs *stqs, *free_stqs = NULL;
     ErtsProcSysTask *st = NULL;
-    erts_aint32_t prio, rp_state;
-    int rp_locked;
+    erts_aint32_t prio;
     Eterm noproc_res, req_type;
 
     if (!rp && !is_internal_pid(BIF_ARG_1)) {
@@ -10221,7 +10343,6 @@ erts_internal_request_system_task_3(BIF_ALIST_3)
 	}
 	st = erts_alloc(ERTS_ALC_T_PROC_SYS_TSK,
 			ERTS_PROC_SYS_TASK_SIZE(tot_sz));
-	st->next = st->prev = st; /* Prep for empty prio queue */
 	ERTS_INIT_OFF_HEAP(&st->off_heap);
 	hp = &st->heap[0];
 
@@ -10253,7 +10374,7 @@ erts_internal_request_system_task_3(BIF_ALIST_3)
     case am_check_process_code:
 	if (is_not_atom(st->arg[0]))
 	    goto badarg;
-	if (st->arg[1] != am_true && st->arg[1] != am_false)
+	if (is_not_small(st->arg[1]) || (unsigned_val(st->arg[1]) & ~ERTS_CPC_ALL))
 	    goto badarg;
 	noproc_res = am_false;
 	st->type = ERTS_PSTT_CPC;
@@ -10265,95 +10386,11 @@ erts_internal_request_system_task_3(BIF_ALIST_3)
 	goto badarg;
     }
 
-    rp_state = erts_smp_atomic32_read_nob(&rp->state);
-
-    rp_locked = 0;
-
-    free_stqs = NULL;
-    if (rp_state & ERTS_PSFLG_ACTIVE_SYS)
-	stqs = NULL;
-    else {
-    alloc_qs:
-	stqs = proc_sys_task_queues_alloc();
-	stqs->qmask = 1 << prio;
-	stqs->ncount = 0;
-	stqs->q[PRIORITY_MAX] = NULL;
-	stqs->q[PRIORITY_HIGH] = NULL;
-	stqs->q[PRIORITY_NORMAL] = NULL;
-	stqs->q[PRIORITY_LOW] = NULL;
-	stqs->q[prio] = st;
-    }
-
-    if (!rp_locked) {
-	rp_locked = 1;
-	erts_smp_proc_lock(rp, ERTS_PROC_LOCK_STATUS);
-
-	rp_state = erts_smp_atomic32_read_nob(&rp->state);
-	if (rp_state & ERTS_PSFLG_EXITING) {
-	    erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_STATUS);
-	    rp = NULL;
-	    free_stqs = stqs;
-	    goto noproc;
-	}
-    }
-
-    if (!rp->sys_task_qs) {
-	if (stqs)
-	    rp->sys_task_qs = stqs;
-	else
-	    goto alloc_qs;
-    }
-    else {
-	if (stqs)
-	    free_stqs = stqs;
-	stqs = rp->sys_task_qs;
-	if (!stqs->q[prio]) {
-	    stqs->q[prio] = st;
-	    stqs->qmask |= 1 << prio;
-	}
-	else {
-	    st->next = stqs->q[prio];
-	    st->prev = stqs->q[prio]->prev;
-	    st->next->prev = st;
-	    st->prev->next = st;
-	    ASSERT(stqs->qmask & (1 << prio));
-	}
-    }
-
-    if (ERTS_PSFLGS_GET_ACT_PRIO(rp_state) > prio) {
-	erts_aint32_t n, a, e;
-	/* Need to elevate actual prio */
-
-	a = rp_state;
-	do {
-	    if (ERTS_PSFLGS_GET_ACT_PRIO(a) <= prio) {
-		n = a;
-		break;
-	    }
-	    n = e = a;
-	    n &= ~ERTS_PSFLGS_ACT_PRIO_MASK;
-	    n |= (prio << ERTS_PSFLGS_ACT_PRIO_OFFSET);
-	    a = erts_smp_atomic32_cmpxchg_nob(&rp->state, n, e);    
-	} while (a != e);
-	rp_state = n;
+    if (!schedule_process_sys_task(rp, prio, st)) {
+    noproc:
+	notify_sys_task_executed(BIF_P, st, noproc_res);
     }
 
-    /*
-     * schedule_process_sys_task() unlocks status
-     * lock on process.
-     */
-    schedule_process_sys_task(rp, rp_state, NULL);
-
-    if (free_stqs)
-	proc_sys_task_queues_free(free_stqs);
-
-    BIF_RET(am_ok);
-
-noproc:
-
-    notify_sys_task_executed(BIF_P, st, noproc_res);
-    if (free_stqs)
-	proc_sys_task_queues_free(free_stqs);
     BIF_RET(am_ok);
 
 badarg:
@@ -10362,11 +10399,35 @@ badarg:
 	erts_cleanup_offheap(&st->off_heap);
 	erts_free(ERTS_ALC_T_PROC_SYS_TSK, st);
     }
-    if (free_stqs)
-	proc_sys_task_queues_free(free_stqs);
     BIF_ERROR(BIF_P, BADARG);
 }
 
+void
+erts_schedule_complete_off_heap_message_queue_change(Eterm pid)
+{
+    Process *rp = erts_proc_lookup(pid);
+    if (rp) {
+	ErtsProcSysTask *st;
+	erts_aint32_t state;
+	int i;
+
+	st = erts_alloc(ERTS_ALC_T_PROC_SYS_TSK,
+			ERTS_PROC_SYS_TASK_SIZE(0));
+	st->type = ERTS_PSTT_COHMQ;
+	st->requester = NIL;
+	st->reply_tag = NIL;
+	st->req_id = NIL;
+	st->req_id_sz = 0;
+	for (i = 0; i < ERTS_MAX_PROC_SYS_TASK_ARGS; i++)
+	    st->arg[i] = NIL;
+	ERTS_INIT_OFF_HEAP(&st->off_heap);
+	state = erts_smp_atomic32_read_nob(&rp->state);
+
+	if (!schedule_process_sys_task(rp, ERTS_PSFLGS_GET_USR_PRIO(state), st))
+	    erts_free(ERTS_ALC_T_PROC_SYS_TSK, st);
+    }
+}
+
 static void
 save_gc_task(Process *c_p, ErtsProcSysTask *st, int prio)
 {
@@ -10386,7 +10447,7 @@ save_gc_task(Process *c_p, ErtsProcSysTask *st, int prio)
 	qs->q[PRIORITY_NORMAL] = NULL;
 	qs->q[PRIORITY_LOW] = NULL;
 	qs->q[prio] = st;
-	(void) ERTS_PROC_SET_DELAYED_GC_TASK_QS(c_p, ERTS_PROC_LOCK_MAIN, qs);
+	(void) ERTS_PROC_SET_DELAYED_GC_TASK_QS(c_p, qs);
     }
     else {
 	if (!qs->q[prio]) {
@@ -10533,7 +10594,7 @@ erts_set_gc_state(Process *c_p, int enable)
 
     erts_smp_proc_unlock(c_p, ERTS_PROC_LOCK_STATUS);
 
-    (void) ERTS_PROC_SET_DELAYED_GC_TASK_QS(c_p, ERTS_PROC_LOCK_MAIN, NULL);
+    (void) ERTS_PROC_SET_DELAYED_GC_TASK_QS(c_p, NULL);
 
     if (dgc_tsk_qs)
 	proc_sys_task_queues_free(dgc_tsk_qs);
@@ -10752,6 +10813,9 @@ static void early_init_process_struct(void *varg, Eterm data)
     Process *proc = arg->proc;
 
     proc->common.id = make_internal_pid(data);
+#ifdef ERTS_DIRTY_SCHEDULERS
+    erts_smp_atomic32_init_nob(&proc->dirty_state, 0);
+#endif
     erts_smp_atomic32_init_relb(&proc->state, arg->state);
 
 #ifdef ERTS_SMP
@@ -10812,6 +10876,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 		   Eterm args,	/* Arguments for function (must be well-formed list). */
 		   ErlSpawnOpts* so) /* Options for spawn. */
 {
+    Uint flags = 0;
     ErtsRunQueue *rq = NULL;
     Process *p;
     Sint arity;			/* Number of arguments. */
@@ -10821,6 +10886,10 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
     Eterm res = THE_NON_VALUE;
     erts_aint32_t state = 0;
     erts_aint32_t prio = (erts_aint32_t) PRIORITY_NORMAL;
+#ifdef SHCOPY_SPAWN
+    erts_shcopy_t info;
+    INITIALIZE_SHCOPY(info);
+#endif
 
 #ifdef ERTS_SMP
     erts_smp_proc_lock(parent, ERTS_PROC_LOCKS_ALL_MINOR);
@@ -10849,6 +10918,15 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
     state |= (((prio & ERTS_PSFLGS_PRIO_MASK) << ERTS_PSFLGS_ACT_PRIO_OFFSET)
 	      | ((prio & ERTS_PSFLGS_PRIO_MASK) << ERTS_PSFLGS_USR_PRIO_OFFSET));
 
+    if (so->flags & SPO_OFF_HEAP_MSGQ) {
+	state |= ERTS_PSFLG_OFF_HEAP_MSGQ;
+	flags |= F_OFF_HEAP_MSGQ;
+    }
+    else if (so->flags & SPO_ON_HEAP_MSGQ) {
+	state |= ERTS_PSFLG_ON_HEAP_MSGQ;
+	flags |= F_ON_HEAP_MSGQ;
+    }
+
     if (!rq)
 	rq = erts_get_runq_proc(parent);
 
@@ -10867,11 +10945,15 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
     BM_COUNT(processes_spawned);
 
     BM_SWAP_TIMER(system,size);
+#ifdef SHCOPY_SPAWN
+    arg_size = copy_shared_calculate(args, &info);
+#else
     arg_size = size_object(args);
+#endif
     BM_SWAP_TIMER(size,system);
     heap_need = arg_size;
 
-    p->flags = erts_default_process_flags;
+    p->flags = flags;
 
     p->static_flags = 0;
     if (so->flags & SPO_SYSTEM_PROC)
@@ -10920,12 +11002,13 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
     p->stop = p->hend = p->heap + sz;
     p->htop = p->heap;
     p->heap_sz = sz;
+    p->abandoned_heap = NULL;
+    p->live_hf_end = ERTS_INVALID_HFRAG_PTR;
     p->catches = 0;
 
     p->bin_vheap_sz     = p->min_vheap_size;
     p->bin_old_vheap_sz = p->min_vheap_size;
     p->bin_old_vheap    = 0;
-    p->bin_vheap_mature = 0;
 
     p->sys_task_qs = NULL;
 
@@ -10944,7 +11027,12 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
     BM_MESSAGE(args,p,parent);
     BM_START_TIMER(system);
     BM_SWAP_TIMER(system,copy);
+#ifdef SHCOPY_SPAWN
+    p->arg_reg[2] = copy_shared_perform(args, arg_size, &info, &p->htop, &p->off_heap);
+    DESTROY_SHCOPY(info);
+#else
     p->arg_reg[2] = copy_struct(args, arg_size, &p->htop, &p->off_heap);
+#endif
     BM_MESSAGE_COPIED(arg_size);
     BM_SWAP_TIMER(copy,system);
     p->arity = 3;
@@ -10990,8 +11078,9 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
     p->accessor_bif_timers = NULL;
 #endif
     p->mbuf = NULL;
+    p->msg_frag = NULL;
     p->mbuf_sz = 0;
-    p->psd = NULL;
+    erts_smp_atomic_init_nob(&p->psd, (erts_aint_t) NULL);
     p->dictionary = NULL;
     p->seq_trace_lastcnt = 0;
     p->seq_trace_clock = 0;
@@ -11125,6 +11214,8 @@ void erts_init_empty_process(Process *p)
     p->stop = NULL;
     p->hend = NULL;
     p->heap = NULL;
+    p->abandoned_heap = NULL;
+    p->live_hf_end = ERTS_INVALID_HFRAG_PTR;
     p->gen_gcs = 0;
     p->max_gen_gcs = 0;
     p->min_heap_size = 0;
@@ -11145,7 +11236,6 @@ void erts_init_empty_process(Process *p)
     p->bin_old_vheap_sz = BIN_VH_MIN_SIZE;
     p->bin_old_vheap = 0;
     p->sys_task_qs = NULL;
-    p->bin_vheap_mature = 0;
     ERTS_PTMR_INIT(p);
     p->next = NULL;
     p->off_heap.first = NULL;
@@ -11157,8 +11247,9 @@ void erts_init_empty_process(Process *p)
     p->old_htop = NULL;
     p->old_heap = NULL;
     p->mbuf = NULL;
+    p->msg_frag = NULL;
     p->mbuf_sz = 0;
-    p->psd = NULL;
+    erts_smp_atomic_init_nob(&p->psd, (erts_aint_t) NULL);
     ERTS_P_MONITORS(p) = NULL;
     ERTS_P_LINKS(p) = NULL;         /* List of links */
     p->nodes_monitors = NULL;
@@ -11214,6 +11305,9 @@ void erts_init_empty_process(Process *p)
     p->last_old_htop = NULL;
 #endif
 
+#ifdef ERTS_DIRTY_SCHEDULERS
+    erts_smp_atomic32_init_nob(&p->dirty_state, 0);
+#endif
     erts_smp_atomic32_init_nob(&p->state, (erts_aint32_t) PRIORITY_NORMAL);
 
 #ifdef ERTS_SMP
@@ -11245,6 +11339,8 @@ erts_debug_verify_clean_empty_process(Process* p)
     ASSERT(p->htop == NULL);
     ASSERT(p->stop == NULL);
     ASSERT(p->hend == NULL);
+    ASSERT(p->abandoned_heap == NULL);
+    ASSERT(p->live_hf_end == ERTS_INVALID_HFRAG_PTR);
     ASSERT(p->heap == NULL);
     ASSERT(p->common.id == ERTS_INVALID_PID);
     ASSERT(ERTS_TRACER_PROC(p) == NIL);
@@ -11322,14 +11418,18 @@ erts_cleanup_empty_process(Process* p)
 static void
 delete_process(Process* p)
 {
-    ErlMessage* mp;
-
+    Eterm *heap;
+    ErtsPSD *psd;
     VERBOSE(DEBUG_PROCESSES, ("Removing process: %T\n",p->common.id));
+    VERBOSE(DEBUG_SHCOPY, ("[pid=%T] delete process: %p %p %p %p\n", p->common.id,
+                           HEAP_START(p), HEAP_END(p), OLD_HEAP(p), OLD_HEND(p)));
 
     /* Cleanup psd */
 
-    if (p->psd)
-	erts_free(ERTS_ALC_T_PSD, p->psd);
+    psd = (ErtsPSD *) erts_smp_atomic_read_nob(&p->psd);
+
+    if (psd)
+	erts_free(ERTS_ALC_T_PSD, psd);
 
     /* Clean binaries and funs */
     erts_cleanup_offheap(&p->off_heap);
@@ -11348,16 +11448,17 @@ delete_process(Process* p)
      * Release heaps. Clobber contents in DEBUG build.
      */
 
-
-#ifdef DEBUG
-    sys_memset(p->heap, DEBUG_BAD_BYTE, p->heap_sz*sizeof(Eterm));
-#endif
-
 #ifdef HIPE
     hipe_delete_process(&p->hipe);
 #endif
 
-    ERTS_HEAP_FREE(ERTS_ALC_T_HEAP, (void*) p->heap, p->heap_sz*sizeof(Eterm));
+    heap = p->abandoned_heap ? p->abandoned_heap : p->heap;
+
+#ifdef DEBUG
+    sys_memset(heap, DEBUG_BAD_BYTE, p->heap_sz*sizeof(Eterm));
+#endif
+
+    ERTS_HEAP_FREE(ERTS_ALC_T_HEAP, (void*) heap, p->heap_sz*sizeof(Eterm));
     if (p->old_heap != NULL) {
 
 #ifdef DEBUG
@@ -11376,27 +11477,14 @@ delete_process(Process* p)
 	free_message_buffer(p->mbuf);
     }
 
+    if (p->msg_frag)
+	erts_cleanup_messages(p->msg_frag);
+
     erts_erase_dicts(p);
 
     /* free all pending messages */
-    mp = p->msg.first;
-    while(mp != NULL) {
-	ErlMessage* next_mp = mp->next;
-	if (mp->data.attached) {
-	    if (is_value(mp->m[0]))
-		free_message_buffer(mp->data.heap_frag);
-	    else {
-		if (is_not_nil(mp->m[1])) {
-		    ErlHeapFragment *heap_frag;
-		    heap_frag = (ErlHeapFragment *) mp->data.dist_ext->ext_endp;
-		    erts_cleanup_offheap(&heap_frag->off_heap);
-		}
-		erts_free_dist_ext_copy(mp->data.dist_ext);
-	    }
-	}
-	free_message(mp);
-	mp = next_mp;
-    }
+    erts_cleanup_messages(p->msg.first);
+    p->msg.first = NULL;
 
     ASSERT(!p->nodes_monitors);
     ASSERT(!p->suspend_monitors);
@@ -11415,7 +11503,9 @@ set_proc_exiting(Process *p,
     ERTS_SMP_LC_ASSERT(erts_proc_lc_my_proc_locks(p) == ERTS_PROC_LOCKS_ALL);
 
     enqueue = change_proc_schedule_state(p,
-					 ERTS_PSFLG_SUSPENDED|ERTS_PSFLG_PENDING_EXIT,
+					 (ERTS_PSFLG_SUSPENDED
+					  | ERTS_PSFLG_PENDING_EXIT
+					  | ERTS_PSFLGS_DIRTY_WORK),
 					 ERTS_PSFLG_EXITING|ERTS_PSFLG_ACTIVE,
 					 &state,
 					 &enq_prio,
@@ -11449,10 +11539,7 @@ set_proc_exiting(Process *p,
     }
 #endif
 
-    if (enqueue)
-	add2runq(enqueue > 0 ? p : make_proxy_proc(NULL, p, enq_prio),
-		 state,
-		 enq_prio);
+    add2runq(enqueue, enq_prio, p, state, NULL);
 }
 
 static ERTS_INLINE erts_aint32_t
@@ -11555,6 +11642,11 @@ save_pending_exiter(Process *p)
     else
         rq = esdp->run_queue;
 
+#ifdef ERTS_DIRTY_SCHEDULERS
+    if (ERTS_RUNQ_IX_IS_DIRTY(rq->ix))
+	rq = ERTS_RUNQ_IX(0); /* Handle on ordinary scheduler */
+#endif
+
     plp = proclist_create(p);
 
     erts_smp_runq_lock(rq);
@@ -11564,13 +11656,8 @@ save_pending_exiter(Process *p)
     non_empty_runq(rq);
 
     erts_smp_runq_unlock(rq);
-#ifdef ERTS_DIRTY_SCHEDULERS
-    if (ERTS_RUNQ_IX_IS_DIRTY(rq->ix))
-	wake_dirty_schedulers(rq, 0);
-    else
-#endif
-	wake_scheduler(rq);
 
+    wake_scheduler(rq);
 }
 
 #endif
@@ -11584,35 +11671,46 @@ static ERTS_INLINE void
 send_exit_message(Process *to, ErtsProcLocks *to_locksp,
 		  Eterm exit_term, Uint term_size, Eterm token)
 {
-    if (token == NIL 
-#ifdef USE_VM_PROBES
-	|| token == am_have_dt_utag
-#endif
-	) {
-	Eterm* hp;
-	Eterm mess;
-	ErlHeapFragment* bp;
-	ErlOffHeap *ohp;
-
-	hp = erts_alloc_message_heap(term_size, &bp, &ohp, to, to_locksp);
+    ErtsMessage *mp;
+    ErlOffHeap *ohp;
+    Eterm* hp;
+    Eterm mess;
+#ifdef SHCOPY_SEND
+    erts_shcopy_t info;
+#endif
+
+    if (!have_seqtrace(token)) {
+#ifdef SHCOPY_SEND
+        INITIALIZE_SHCOPY(info);
+        term_size = copy_shared_calculate(exit_term, &info);
+	mp = erts_alloc_message_heap(to, to_locksp, term_size, &hp, &ohp);
+        mess = copy_shared_perform(exit_term, term_size, &info, &hp, ohp);
+        DESTROY_SHCOPY(info);
+#else
+	mp = erts_alloc_message_heap(to, to_locksp, term_size, &hp, &ohp);
 	mess = copy_struct(exit_term, term_size, &hp, ohp);
-	erts_queue_message(to, to_locksp, bp, mess, NIL);
+#endif
+	erts_queue_message(to, to_locksp, mp, mess, NIL);
     } else {
-	ErlHeapFragment* bp;
-	Eterm* hp;
-	Eterm mess;
 	Eterm temp_token;
 	Uint sz_token;
 
 	ASSERT(is_tuple(token));
 	sz_token = size_object(token);
-	bp = new_message_buffer(term_size+sz_token);
-	hp = bp->mem;
-	mess = copy_struct(exit_term, term_size, &hp, &bp->off_heap);
+#ifdef SHCOPY_SEND
+        INITIALIZE_SHCOPY(info);
+        term_size = copy_shared_calculate(exit_term, &info);
+	mp = erts_alloc_message_heap(to, to_locksp, term_size+sz_token, &hp, &ohp);
+        mess = copy_shared_perform(exit_term, term_size, &info, &hp, ohp);
+        DESTROY_SHCOPY(info);
+#else
+	mp = erts_alloc_message_heap(to, to_locksp, term_size+sz_token, &hp, &ohp);
+	mess = copy_struct(exit_term, term_size, &hp, ohp);
+#endif
 	/* the trace token must in this case be updated by the caller */
 	seq_trace_output(token, mess, SEQ_TRACE_SEND, to->common.id, NULL);
-	temp_token = copy_struct(token, sz_token, &hp, &bp->off_heap);
-	erts_queue_message(to, to_locksp, bp, mess, temp_token);
+	temp_token = copy_struct(token, sz_token, &hp, ohp);
+	erts_queue_message(to, to_locksp, mp, mess, temp_token);
     }
 }
 
@@ -11721,11 +11819,7 @@ send_exit_signal(Process *c_p,		/* current process if and only
 
     if ((state & ERTS_PSFLG_TRAP_EXIT)
 	&& (reason != am_kill || (flags & ERTS_XSIG_FLG_IGN_KILL))) {
-	if (is_not_nil(token) 
-#ifdef USE_VM_PROBES
-	    && token != am_have_dt_utag
-#endif
-	    && token_update)
+        if (have_seqtrace(token) && token_update)
 	    seq_trace_update_send(token_update);
 	if (is_value(exit_tuple))
 	    send_exit_message(rp, rp_locks, exit_tuple, exit_tuple_sz, token);
@@ -12112,7 +12206,7 @@ static void doit_exit_link(ErtsLink *lnk, void *vpcontext)
 	break;
 	
     default:
-	erl_exit(1, "bad type in link list\n");
+	erts_exit(ERTS_ERROR_EXIT, "bad type in link list\n");
 	break;
     }
     erts_destroy_link(lnk);
@@ -12153,7 +12247,7 @@ erts_do_exit_process(Process* p, Eterm reason)
 #endif
 
     if (p->static_flags & ERTS_STC_FLG_SYSTEM_PROC)
-	erl_exit(ERTS_DUMP_EXIT, "System process %T terminated: %T\n",
+	erts_exit(ERTS_DUMP_EXIT, "System process %T terminated: %T\n",
                  p->common.id, reason);
 
 #ifdef ERTS_SMP
@@ -12257,21 +12351,46 @@ erts_continue_exit_process(Process *p)
 #endif
 
 #ifdef ERTS_SMP
+    if (p->flags & F_SCHDLR_ONLN_WAITQ)
+	abort_sched_onln_chng_waitq(p);
+
     if (p->flags & F_HAVE_BLCKD_MSCHED) {
 	ErtsSchedSuspendResult ssr;
-	ssr = erts_block_multi_scheduling(p, ERTS_PROC_LOCK_MAIN, 0, 1);
+	ssr = erts_block_multi_scheduling(p, ERTS_PROC_LOCK_MAIN, 0, 0, 1);
+	switch (ssr) {
+	case ERTS_SCHDLR_SSPND_YIELD_RESTART:
+	    goto yield;
+	case ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED:
+	case ERTS_SCHDLR_SSPND_DONE_NMSCHED_BLOCKED:
+	case ERTS_SCHDLR_SSPND_YIELD_DONE_MSCHED_BLOCKED:
+	case ERTS_SCHDLR_SSPND_YIELD_DONE_NMSCHED_BLOCKED:
+	case ERTS_SCHDLR_SSPND_DONE:
+	case ERTS_SCHDLR_SSPND_YIELD_DONE:
+	    p->flags &= ~F_HAVE_BLCKD_MSCHED;
+	    break;
+	case ERTS_SCHDLR_SSPND_EINVAL:
+	default:
+	    erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error: %d\n",
+		      __FILE__, __LINE__, (int) ssr);
+	}
+    }
+    if (p->flags & F_HAVE_BLCKD_NMSCHED) {
+	ErtsSchedSuspendResult ssr;
+	ssr = erts_block_multi_scheduling(p, ERTS_PROC_LOCK_MAIN, 0, 1, 1);
 	switch (ssr) {
 	case ERTS_SCHDLR_SSPND_YIELD_RESTART:
 	    goto yield;
 	case ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED:
+	case ERTS_SCHDLR_SSPND_DONE_NMSCHED_BLOCKED:
 	case ERTS_SCHDLR_SSPND_YIELD_DONE_MSCHED_BLOCKED:
+	case ERTS_SCHDLR_SSPND_YIELD_DONE_NMSCHED_BLOCKED:
 	case ERTS_SCHDLR_SSPND_DONE:
 	case ERTS_SCHDLR_SSPND_YIELD_DONE:
 	    p->flags &= ~F_HAVE_BLCKD_MSCHED;
 	    break;
 	case ERTS_SCHDLR_SSPND_EINVAL:
 	default:
-	    erl_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error: %d\n",
+	    erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error: %d\n",
 		     __FILE__, __LINE__, (int) ssr);
 	}
     }
@@ -12389,9 +12508,9 @@ erts_continue_exit_process(Process *p)
     }
     
     dep = (p->flags & F_DISTRIBUTION) ? erts_this_dist_entry : NULL;
-    scb = ERTS_PROC_SET_SAVED_CALLS_BUF(p, ERTS_PROC_LOCKS_ALL, NULL);
-    pbt = ERTS_PROC_SET_CALL_TIME(p, ERTS_PROC_LOCKS_ALL, NULL);
-    nif_export = ERTS_PROC_SET_NIF_TRAP_EXPORT(p, ERTS_PROC_LOCKS_ALL, NULL);
+    scb = ERTS_PROC_SET_SAVED_CALLS_BUF(p, NULL);
+    pbt = ERTS_PROC_SET_CALL_TIME(p, NULL);
+    nif_export = ERTS_PROC_SET_NIF_TRAP_EXPORT(p, NULL);
 
     erts_smp_proc_unlock(p, ERTS_PROC_LOCKS_ALL);
 #ifdef BM_COUNTERS
@@ -12558,7 +12677,7 @@ stack_element_dump(int to, void *to_arg, Eterm* sp, int yreg)
     }
 
     if (is_CP(x)) {
-        erts_print(to, to_arg, "Return addr %p (", (Eterm *) EXPAND_POINTER(x));
+        erts_print(to, to_arg, "Return addr %p (", (Eterm *) x);
         print_function_from_pc(to, to_arg, cp_val(x));
         erts_print(to, to_arg, ")\n");
         yreg = 0;
@@ -12768,10 +12887,10 @@ erts_print_scheduler_info(int to, void *to_arg, ErtsSchedulerData *esdp) {
  *    The same global atomic is used as refcount.
  *
  * A BIF that calls this should make sure to schedule out to never come back:
- *    erl_halt((int)(- code));
+ *    erts_halt(code);
  *    ERTS_BIF_YIELD1(bif_export[BIF_erlang_halt_1], BIF_P, NIL);
  */
-void erl_halt(int code)
+void erts_halt(int code)
 {
     if (-1 == erts_smp_atomic32_cmpxchg_acqb(&erts_halt_progress,
 					     erts_no_schedulers,
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index 7b19e76352..c07337b325 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -60,6 +60,9 @@ typedef struct process Process;
 #include "erl_mseg.h"
 #include "erl_async.h"
 #include "erl_gc.h"
+#define ERTS_ONLY_INCLUDE_TRACE_FLAGS
+#include "erl_trace.h"
+#undef ERTS_ONLY_INCLUDE_TRACE_FLAGS
 
 #ifdef HIPE
 #include "hipe_process.h"
@@ -76,10 +79,8 @@ struct ErtsNodesMonitor_;
 #define ERTS_HAVE_SCHED_UTIL_BALANCING_SUPPORT		0
 
 #define ERTS_MAX_NO_OF_SCHEDULERS 1024
-#ifdef ERTS_DIRTY_SCHEDULERS
 #define ERTS_MAX_NO_OF_DIRTY_CPU_SCHEDULERS ERTS_MAX_NO_OF_SCHEDULERS
 #define ERTS_MAX_NO_OF_DIRTY_IO_SCHEDULERS ERTS_MAX_NO_OF_SCHEDULERS
-#endif
 
 #define ERTS_DEFAULT_MAX_PROCESSES (1 << 18)
 
@@ -243,7 +244,9 @@ extern int erts_sched_thread_suggested_stack_size;
 
 typedef enum {
     ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED,
+    ERTS_SCHDLR_SSPND_DONE_NMSCHED_BLOCKED,
     ERTS_SCHDLR_SSPND_YIELD_DONE_MSCHED_BLOCKED,
+    ERTS_SCHDLR_SSPND_YIELD_DONE_NMSCHED_BLOCKED,
     ERTS_SCHDLR_SSPND_DONE,
     ERTS_SCHDLR_SSPND_YIELD_RESTART,
     ERTS_SCHDLR_SSPND_YIELD_DONE,
@@ -301,7 +304,6 @@ typedef enum {
     ERTS_SSI_AUX_WORK_ASYNC_READY_CLEAN_IX,
     ERTS_SSI_AUX_WORK_MISC_THR_PRGR_IX,
     ERTS_SSI_AUX_WORK_MISC_IX,
-    ERTS_SSI_AUX_WORK_CHECK_CHILDREN_IX,
     ERTS_SSI_AUX_WORK_SET_TMO_IX,
     ERTS_SSI_AUX_WORK_MSEG_CACHE_CHECK_IX,
     ERTS_SSI_AUX_WORK_REAP_PORTS_IX,
@@ -334,8 +336,6 @@ typedef enum {
     (((erts_aint32_t) 1) << ERTS_SSI_AUX_WORK_MISC_THR_PRGR_IX)
 #define ERTS_SSI_AUX_WORK_MISC \
     (((erts_aint32_t) 1) << ERTS_SSI_AUX_WORK_MISC_IX)
-#define ERTS_SSI_AUX_WORK_CHECK_CHILDREN \
-    (((erts_aint32_t) 1) << ERTS_SSI_AUX_WORK_CHECK_CHILDREN_IX)
 #define ERTS_SSI_AUX_WORK_SET_TMO \
     (((erts_aint32_t) 1) << ERTS_SSI_AUX_WORK_SET_TMO_IX)
 #define ERTS_SSI_AUX_WORK_MSEG_CACHE_CHECK \
@@ -640,12 +640,6 @@ struct ErtsSchedulerData_ {
     Process *free_process;
     ErtsThrPrgrData thr_progress_data;
 #endif
-#if !HEAP_ON_C_STACK
-    Eterm tmp_heap[TMP_HEAP_SIZE];
-    int num_tmp_heap_used;
-    Eterm beam_emu_tmp_heap[BEAM_EMU_TMP_HEAP_SIZE];
-    Eterm erl_arith_tmp_heap[ERL_ARITH_TMP_HEAP_SIZE];
-#endif
     ErtsSchedulerSleepInfo *ssi;
     Process *current_process;
     Uint no;			/* Scheduler number for normal schedulers */
@@ -699,13 +693,6 @@ extern ErtsAlignedSchedulerData *erts_aligned_dirty_io_scheduler_data;
 extern ErtsSchedulerData *erts_scheduler_data;
 #endif
 
-#ifdef ERTS_SCHED_FAIR
-#define ERTS_SCHED_FAIR_YIELD() ETHR_YIELD()
-#else
-#define ERTS_SCHED_FAIR 0
-#define ERTS_SCHED_FAIR_YIELD()
-#endif
-
 #if defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK)
 int erts_smp_lc_runq_is_locked(ErtsRunQueue *);
 #endif
@@ -831,8 +818,8 @@ typedef struct {
 #define ERTS_PSD_ERROR_HANDLER_BUF_GET_LOCKS ERTS_PROC_LOCK_MAIN
 #define ERTS_PSD_ERROR_HANDLER_BUF_SET_LOCKS ERTS_PROC_LOCK_MAIN
 
-#define ERTS_PSD_SAVED_CALLS_BUF_GET_LOCKS ERTS_PROC_LOCK_MAIN
-#define ERTS_PSD_SAVED_CALLS_BUF_SET_LOCKS ERTS_PROC_LOCK_MAIN
+#define ERTS_PSD_SAVED_CALLS_BUF_GET_LOCKS ((ErtsProcLocks) 0)
+#define ERTS_PSD_SAVED_CALLS_BUF_SET_LOCKS ((ErtsProcLocks) 0)
 
 #define ERTS_PSD_SCHED_ID_GET_LOCKS ERTS_PROC_LOCK_STATUS
 #define ERTS_PSD_SCHED_ID_SET_LOCKS ERTS_PROC_LOCK_STATUS
@@ -843,8 +830,8 @@ typedef struct {
 #define ERTS_PSD_DELAYED_GC_TASK_QS_GET_LOCKS ERTS_PROC_LOCK_MAIN
 #define ERTS_PSD_DELAYED_GC_TASK_QS_SET_LOCKS ERTS_PROC_LOCK_MAIN
 
-#define ERTS_PSD_NIF_TRAP_EXPORT_GET_LOCKS ERTS_PROC_LOCK_MAIN
-#define ERTS_PSD_NIF_TRAP_EXPORT_SET_LOCKS ERTS_PROC_LOCK_MAIN
+#define ERTS_PSD_NIF_TRAP_EXPORT_GET_LOCKS ((ErtsProcLocks) 0)
+#define ERTS_PSD_NIF_TRAP_EXPORT_SET_LOCKS ((ErtsProcLocks) 0)
 
 typedef struct {
     ErtsProcLocks get_locks;
@@ -921,7 +908,6 @@ struct ErtsPendingSuspend_ {
 
 #  define MIN_VHEAP_SIZE(p)   (p)->min_vheap_size
 #  define BIN_VHEAP_SZ(p)     (p)->bin_vheap_sz
-#  define BIN_VHEAP_MATURE(p) (p)->bin_vheap_mature
 #  define BIN_OLD_VHEAP_SZ(p) (p)->bin_old_vheap_sz
 #  define BIN_OLD_VHEAP(p)    (p)->bin_old_vheap
 
@@ -939,6 +925,7 @@ struct process {
     Eterm* stop;		/* Stack top */
     Eterm* heap;		/* Heap start */
     Eterm* hend;		/* Heap end */
+    Eterm* abandoned_heap;
     Uint heap_sz;		/* Size of heap in words */
     Uint min_heap_size;         /* Minimum size of heap (in words). */
     Uint min_vheap_size;        /* Minimum size of virtual heap (in words). */
@@ -1035,18 +1022,22 @@ struct process {
     Uint16 gen_gcs;		/* Number of (minor) generational GCs. */
     Uint16 max_gen_gcs;		/* Max minor gen GCs before fullsweep. */
     ErlOffHeap off_heap;	/* Off-heap data updated by copy_struct(). */
-    ErlHeapFragment* mbuf;	/* Pointer to message buffer list */
-    Uint mbuf_sz;		/* Size of all message buffers */
-    ErtsPSD *psd;		/* Rarely used process specific data */
+    ErlHeapFragment* mbuf;	/* Pointer to heap fragment list */
+    ErlHeapFragment* live_hf_end;
+    ErtsMessage *msg_frag;	/* Pointer to message fragment list */
+    Uint mbuf_sz;		/* Total size of heap fragments and message fragments */
+    erts_smp_atomic_t psd;		/* Rarely used process specific data */
 
     Uint64 bin_vheap_sz;	/* Virtual heap block size for binaries */
-    Uint64 bin_vheap_mature;	/* Virtual heap block size for binaries */
     Uint64 bin_old_vheap_sz;	/* Virtual old heap block size for binaries */
     Uint64 bin_old_vheap;	/* Virtual old heap size for binaries */
 
     ErtsProcSysTaskQs *sys_task_qs;
 
     erts_smp_atomic32_t state;  /* Process state flags (see ERTS_PSFLG_*) */
+#ifdef ERTS_DIRTY_SCHEDULERS
+    erts_smp_atomic32_t dirty_state; /* Process dirty state flags (see ERTS_PDSFLG_*) */
+#endif
 
 #ifdef ERTS_SMP
     ErlMessageInQueue msg_inq;
@@ -1064,6 +1055,7 @@ struct process {
 #ifdef CHECK_FOR_HOLES
     Eterm* last_htop;		/* No need to scan the heap below this point. */
     ErlHeapFragment* last_mbuf;	/* No need to scan beyond this mbuf. */
+    ErlHeapFragment* heap_hfrag; /* Heap abandoned, htop now lives in this frag */
 #endif
 
 #ifdef DEBUG
@@ -1087,6 +1079,7 @@ extern const Process erts_invalid_process;
 do {						\
   (p)->last_htop = 0;				\
   (p)->last_mbuf = 0;				\
+  (p)->heap_hfrag = NULL;			\
 } while (0)
 
 # define ERTS_HOLE_CHECK(p) erts_check_for_holes((p))
@@ -1164,15 +1157,16 @@ void erts_check_for_holes(Process* p);
 #define ERTS_PSFLG_RUNNING_SYS		ERTS_PSFLG_BIT(15)
 #define ERTS_PSFLG_PROXY		ERTS_PSFLG_BIT(16)
 #define ERTS_PSFLG_DELAYED_SYS		ERTS_PSFLG_BIT(17)
-#ifdef ERTS_DIRTY_SCHEDULERS
-#define ERTS_PSFLG_DIRTY_CPU_PROC	ERTS_PSFLG_BIT(18)
-#define ERTS_PSFLG_DIRTY_IO_PROC	ERTS_PSFLG_BIT(19)
-#define ERTS_PSFLG_DIRTY_CPU_PROC_IN_Q	ERTS_PSFLG_BIT(20)
-#define ERTS_PSFLG_DIRTY_IO_PROC_IN_Q	ERTS_PSFLG_BIT(21)
+#define ERTS_PSFLG_OFF_HEAP_MSGQ	ERTS_PSFLG_BIT(18)
+#define ERTS_PSFLG_ON_HEAP_MSGQ		ERTS_PSFLG_BIT(19)
+#define ERTS_PSFLG_DIRTY_CPU_PROC	ERTS_PSFLG_BIT(20)
+#define ERTS_PSFLG_DIRTY_IO_PROC	ERTS_PSFLG_BIT(21)
+#define ERTS_PSFLG_DIRTY_ACTIVE_SYS	ERTS_PSFLG_BIT(22)
 #define ERTS_PSFLG_MAX  (ERTS_PSFLGS_ZERO_BIT_OFFSET + 22)
-#else
-#define ERTS_PSFLG_MAX  (ERTS_PSFLGS_ZERO_BIT_OFFSET + 18)
-#endif
+
+#define ERTS_PSFLGS_DIRTY_WORK		(ERTS_PSFLG_DIRTY_CPU_PROC	\
+					 | ERTS_PSFLG_DIRTY_IO_PROC	\
+					 | ERTS_PSFLG_DIRTY_ACTIVE_SYS)
 
 #define ERTS_PSFLGS_IN_PRQ_MASK 	(ERTS_PSFLG_IN_PRQ_MAX		\
 					 | ERTS_PSFLG_IN_PRQ_HIGH	\
@@ -1184,7 +1178,37 @@ void erts_check_for_holes(Process* p);
 #define ERTS_PSFLGS_GET_USR_PRIO(PSFLGS) \
     (((PSFLGS) >> ERTS_PSFLGS_USR_PRIO_OFFSET) & ERTS_PSFLGS_PRIO_MASK)
 #define ERTS_PSFLGS_GET_PRQ_PRIO(PSFLGS) \
-    (((PSFLGS) >> ERTS_PSFLGS_USR_PRIO_OFFSET) & ERTS_PSFLGS_PRIO_MASK)
+    (((PSFLGS) >> ERTS_PSFLGS_PRQ_PRIO_OFFSET) & ERTS_PSFLGS_PRIO_MASK)
+
+#ifdef ERTS_DIRTY_SCHEDULERS
+
+/*
+ * Flags in the dirty_state field.
+ */
+
+#define ERTS_PDSFLG_IN_CPU_PRQ_MAX 	(((erts_aint32_t) 1) << 0)
+#define ERTS_PDSFLG_IN_CPU_PRQ_HIGH	(((erts_aint32_t) 1) << 1)
+#define ERTS_PDSFLG_IN_CPU_PRQ_NORMAL	(((erts_aint32_t) 1) << 2)
+#define ERTS_PDSFLG_IN_CPU_PRQ_LOW 	(((erts_aint32_t) 1) << 3)
+#define ERTS_PDSFLG_IN_IO_PRQ_MAX 	(((erts_aint32_t) 1) << 4)
+#define ERTS_PDSFLG_IN_IO_PRQ_HIGH	(((erts_aint32_t) 1) << 5)
+#define ERTS_PDSFLG_IN_IO_PRQ_NORMAL	(((erts_aint32_t) 1) << 6)
+#define ERTS_PDSFLG_IN_IO_PRQ_LOW 	(((erts_aint32_t) 1) << 7)
+
+#define ERTS_PDSFLGS_QMASK 		ERTS_PSFLGS_QMASK
+#define ERTS_PDSFLGS_IN_CPU_PRQ_MASK_OFFSET 0
+#define ERTS_PDSFLGS_IN_IO_PRQ_MASK_OFFSET ERTS_PSFLGS_QMASK_BITS
+
+#define ERTS_PDSFLG_IN_CPU_PRQ_MASK 	(ERTS_PDSFLG_IN_CPU_PRQ_MAX	\
+					 | ERTS_PDSFLG_IN_CPU_PRQ_HIGH	\
+					 | ERTS_PDSFLG_IN_CPU_PRQ_NORMAL\
+					 | ERTS_PDSFLG_IN_CPU_PRQ_LOW)
+#define ERTS_PDSFLG_IN_IO_PRQ_MASK 	(ERTS_PDSFLG_IN_CPU_PRQ_MAX	\
+					 | ERTS_PDSFLG_IN_CPU_PRQ_HIGH	\
+					 | ERTS_PDSFLG_IN_CPU_PRQ_NORMAL\
+					 | ERTS_PDSFLG_IN_CPU_PRQ_LOW)
+#endif
+
 
 /*
  * Static flags that do not change after process creation.
@@ -1219,12 +1243,16 @@ void erts_check_for_holes(Process* p);
 #define SPO_USE_ARGS 2
 #define SPO_MONITOR 4
 #define SPO_SYSTEM_PROC 8
+#define SPO_OFF_HEAP_MSGQ 16
+#define SPO_ON_HEAP_MSGQ 32
+
+extern int erts_default_spo_flags;
 
 /*
  * The following struct contains options for a process to be spawned.
  */
 typedef struct {
-    Uint flags;
+    int flags;
     int error_code;		/* Error code returned from create_process(). */
     Eterm mref;			/* Monitor ref returned (if SPO_MONITOR was given). */
 
@@ -1264,7 +1292,6 @@ Eterm* erts_heap_alloc(Process* p, Uint need, Uint xtra);
 Eterm* erts_set_hole_marker(Eterm* ptr, Uint sz);
 #endif
 
-extern Uint erts_default_process_flags;
 extern erts_smp_rwmtx_t erts_cpu_bind_rwmtx;
 /* If any of the erts_system_monitor_* variables are set (enabled),
 ** erts_system_monitor must be != NIL, to allow testing on just
@@ -1292,6 +1319,7 @@ struct erts_system_profile_flags_t {
     unsigned int exclusive : 1;
 };
 extern struct erts_system_profile_flags_t erts_system_profile_flags;
+extern int erts_system_profile_ts_type;
 
 /* process flags */
 #define F_HIBERNATE_SCHED    (1 <<  0) /* Schedule out after hibernate op */
@@ -1305,63 +1333,110 @@ extern struct erts_system_profile_flags_t erts_system_profile_flags;
 #define F_HAVE_BLCKD_MSCHED  (1 <<  8) /* Process has blocked multi-scheduling */
 #define F_P2PNR_RESCHED      (1 <<  9) /* Process has been rescheduled via erts_pid2proc_not_running() */
 #define F_FORCE_GC           (1 << 10) /* Force gc at process in-scheduling */
-#define F_DISABLE_GC         (1 << 11) /* Disable GC */
+#define F_DISABLE_GC         (1 << 11) /* Disable GC (see below) */
+#define F_OFF_HEAP_MSGQ      (1 << 12) /* Off heap msg queue */
+#define F_ON_HEAP_MSGQ       (1 << 13) /* Off heap msg queue */
+#define F_OFF_HEAP_MSGQ_CHNG (1 << 14) /* Off heap msg queue changing */
+#define F_ABANDONED_HEAP_USE (1 << 15) /* Have usage of abandoned heap */
+#define F_DELAY_GC           (1 << 16) /* Similar to disable GC (see below) */
+#define F_SCHDLR_ONLN_WAITQ  (1 << 17) /* Process enqueued waiting to change schedulers online */
+#define F_HAVE_BLCKD_NMSCHED (1 << 18) /* Process has blocked normal multi-scheduling */
+
+/*
+ * F_DISABLE_GC and F_DELAY_GC are similar. Both will prevent
+ * GC of the process, but it is important to use the right
+ * one:
+ * - F_DISABLE_GC should *only* be used by BIFs. This when
+ *   the BIF needs to yield while preventig a GC.
+ * - F_DELAY_GC should only be used when GC is temporarily
+ *   disabled while the process is scheduled. A process must
+ *   not be scheduled out while F_DELAY_GC is set.
+ */
+
+#define ERTS_TRACE_FLAGS_TS_TYPE_SHIFT			0
+
+#define F_TRACE_FLAG(N)      (1 << (ERTS_TRACE_TS_TYPE_BITS + (N)))
 
 /* process trace_flags */
-#define F_SENSITIVE          (1 << 0)
-#define F_TRACE_SEND         (1 << 1)   
-#define F_TRACE_RECEIVE      (1 << 2)
-#define F_TRACE_SOS          (1 << 3) /* Set on spawn       */
-#define F_TRACE_SOS1         (1 << 4) /* Set on first spawn */
-#define F_TRACE_SOL          (1 << 5) /* Set on link        */
-#define F_TRACE_SOL1         (1 << 6) /* Set on first link  */
-#define F_TRACE_CALLS        (1 << 7)
-#define F_TIMESTAMP          (1 << 8)
-#define F_TRACE_PROCS        (1 << 9)
-#define F_TRACE_FIRST_CHILD  (1 << 10)
-#define F_TRACE_SCHED        (1 << 11)
-#define F_TRACE_GC           (1 << 12)
-#define F_TRACE_ARITY_ONLY   (1 << 13)
-#define F_TRACE_RETURN_TO    (1 << 14) /* Return_to trace when breakpoint tracing */
-#define F_TRACE_SILENT       (1 << 15) /* No call trace msg suppress */
-#define F_TRACER             (1 << 16) /* May be (has been) tracer */
-#define F_EXCEPTION_TRACE    (1 << 17) /* May have exception trace on stack */
+
+#define F_NOW_TS             (ERTS_TRACE_FLG_NOW_TIMESTAMP \
+			      << ERTS_TRACE_FLAGS_TS_TYPE_SHIFT)
+#define F_STRICT_MON_TS      (ERTS_TRACE_FLG_STRICT_MONOTONIC_TIMESTAMP \
+			      << ERTS_TRACE_FLAGS_TS_TYPE_SHIFT)
+#define F_MON_TS             (ERTS_TRACE_FLG_MONOTONIC_TIMESTAMP \
+			      << ERTS_TRACE_FLAGS_TS_TYPE_SHIFT)
+#define F_SENSITIVE          F_TRACE_FLAG(0)
+#define F_TRACE_SEND         F_TRACE_FLAG(1)
+#define F_TRACE_RECEIVE      F_TRACE_FLAG(2)
+#define F_TRACE_SOS          F_TRACE_FLAG(3) /* Set on spawn       */
+#define F_TRACE_SOS1         F_TRACE_FLAG(4) /* Set on first spawn */
+#define F_TRACE_SOL          F_TRACE_FLAG(5) /* Set on link        */
+#define F_TRACE_SOL1         F_TRACE_FLAG(6) /* Set on first link  */
+#define F_TRACE_CALLS        F_TRACE_FLAG(7)
+#define F_TRACE_PROCS        F_TRACE_FLAG(8)
+#define F_TRACE_FIRST_CHILD  F_TRACE_FLAG(9)
+#define F_TRACE_SCHED        F_TRACE_FLAG(10)
+#define F_TRACE_GC           F_TRACE_FLAG(11)
+#define F_TRACE_ARITY_ONLY   F_TRACE_FLAG(12)
+#define F_TRACE_RETURN_TO    F_TRACE_FLAG(13) /* Return_to trace when breakpoint tracing */
+#define F_TRACE_SILENT       F_TRACE_FLAG(14) /* No call trace msg suppress */
+#define F_TRACER             F_TRACE_FLAG(15) /* May be (has been) tracer */
+#define F_EXCEPTION_TRACE    F_TRACE_FLAG(16) /* May have exception trace on stack */
 
 /* port trace flags, currently the same as process trace flags */
-#define F_TRACE_SCHED_PORTS  (1 << 18) /* Trace of port scheduling */
-#define F_TRACE_SCHED_PROCS  (1 << 19) /* With virtual scheduling */
-#define F_TRACE_PORTS	     (1 << 20) /* Ports equivalent to F_TRACE_PROCS */
-#define F_TRACE_SCHED_NO     (1 << 21) /* Trace with scheduler id */
-#define F_TRACE_SCHED_EXIT   (1 << 22)
+#define F_TRACE_SCHED_PORTS  F_TRACE_FLAG(17) /* Trace of port scheduling */
+#define F_TRACE_SCHED_PROCS  F_TRACE_FLAG(18) /* With virtual scheduling */
+#define F_TRACE_PORTS	     F_TRACE_FLAG(19) /* Ports equivalent to F_TRACE_PROCS */
+#define F_TRACE_SCHED_NO     F_TRACE_FLAG(20) /* Trace with scheduler id */
+#define F_TRACE_SCHED_EXIT   F_TRACE_FLAG(21)
 
-#define F_NUM_FLAGS          23
+#define F_NUM_FLAGS          (ERTS_TRACE_TS_TYPE_BITS + 22)
 #ifdef DEBUG
 #  define F_INITIAL_TRACE_FLAGS (5 << F_NUM_FLAGS)
 #else
 #  define F_INITIAL_TRACE_FLAGS 0
 #endif
 
+/* F_TIMESTAMP_MASK is a bit-field of all all timestamp types */
+#define F_TIMESTAMP_MASK \
+    (ERTS_TRACE_TS_TYPE_MASK << ERTS_TRACE_FLAGS_TS_TYPE_SHIFT)
+
 #define TRACEE_FLAGS ( F_TRACE_PROCS | F_TRACE_CALLS \
 		     | F_TRACE_SOS |  F_TRACE_SOS1| F_TRACE_RECEIVE  \
 		     | F_TRACE_SOL | F_TRACE_SOL1 | F_TRACE_SEND \
-		     | F_TRACE_SCHED | F_TIMESTAMP | F_TRACE_GC \
+		     | F_TRACE_SCHED | F_TIMESTAMP_MASK | F_TRACE_GC \
 		     | F_TRACE_ARITY_ONLY | F_TRACE_RETURN_TO \
                      | F_TRACE_SILENT | F_TRACE_SCHED_PROCS | F_TRACE_PORTS \
 		     | F_TRACE_SCHED_PORTS | F_TRACE_SCHED_NO \
 		     | F_TRACE_SCHED_EXIT)
 
 #define ERTS_TRACEE_MODIFIER_FLAGS \
-  (F_TRACE_SILENT | F_TIMESTAMP | F_TRACE_SCHED_NO)
+  (F_TRACE_SILENT | F_TIMESTAMP_MASK | F_TRACE_SCHED_NO)
 #define ERTS_PORT_TRACEE_FLAGS \
   (ERTS_TRACEE_MODIFIER_FLAGS | F_TRACE_PORTS | F_TRACE_SCHED_PORTS)
 #define ERTS_PROC_TRACEE_FLAGS \
   ((TRACEE_FLAGS & ~ERTS_PORT_TRACEE_FLAGS) | ERTS_TRACEE_MODIFIER_FLAGS)
 
+#define SEQ_TRACE_FLAG(N)        (1 << (ERTS_TRACE_TS_TYPE_BITS + (N)))
+
 /* Sequential trace flags */
+
+/* SEQ_TRACE_TIMESTAMP_MASK is a bit-field */
+#define SEQ_TRACE_TIMESTAMP_MASK \
+    (ERTS_TRACE_TS_TYPE_MASK << ERTS_SEQ_TRACE_FLAGS_TS_TYPE_SHIFT)
+
 #define SEQ_TRACE_SEND     (1 << 0)
 #define SEQ_TRACE_RECEIVE  (1 << 1)
 #define SEQ_TRACE_PRINT    (1 << 2)
-#define SEQ_TRACE_TIMESTAMP (1 << 3)
+
+#define ERTS_SEQ_TRACE_FLAGS_TS_TYPE_SHIFT 3
+
+#define SEQ_TRACE_NOW_TS   (ERTS_TRACE_FLG_NOW_TIMESTAMP \
+			    << ERTS_SEQ_TRACE_FLAGS_TS_TYPE_SHIFT)
+#define SEQ_TRACE_STRICT_MON_TS (ERTS_TRACE_FLG_STRICT_MONOTONIC_TIMESTAMP \
+				 << ERTS_SEQ_TRACE_FLAGS_TS_TYPE_SHIFT)
+#define SEQ_TRACE_MON_TS (ERTS_TRACE_FLG_MONOTONIC_TIMESTAMP \
+			  << ERTS_SEQ_TRACE_FLAGS_TS_TYPE_SHIFT)
 
 #ifdef USE_VM_PROBES
 #define DT_UTAG_PERMANENT (1 << 0)
@@ -1450,6 +1525,7 @@ void erts_init_scheduling(int, int
 
 int erts_set_gc_state(Process *c_p, int enable);
 Eterm erts_sched_wall_time_request(Process *c_p, int set, int enable);
+Eterm erts_system_check_request(Process *c_p);
 Eterm erts_gc_info_request(Process *c_p);
 Uint64 erts_get_proc_interval(void);
 Uint64 erts_ensure_later_proc_interval(Uint64);
@@ -1459,6 +1535,7 @@ int erts_setup_nif_gc(Process* proc, Eterm** objv, int* nobj); /* see erl_nif.c
 void erts_destroy_nif_export(void *); /* see erl_nif.c */
 
 ErtsProcList *erts_proclist_create(Process *);
+ErtsProcList *erts_proclist_copy(ErtsProcList *);
 void erts_proclist_destroy(ErtsProcList *);
 
 ERTS_GLB_INLINE int erts_proclist_same(ErtsProcList *, Process *);
@@ -1639,40 +1716,31 @@ void erts_schedule_thr_prgr_later_cleanup_op(void (*)(void *),
 					     void *,
 					     ErtsThrPrgrLaterOp *,
 					     UWord);
+void erts_schedule_complete_off_heap_message_queue_change(Eterm pid);
 
 #if defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK)
 int erts_dbg_check_halloc_lock(Process *p);
 #endif
-#ifdef DEBUG
-void erts_dbg_multi_scheduling_return_trap(Process *, Eterm);
-#endif
-int erts_get_max_no_executing_schedulers(void);
 #if defined(ERTS_SMP) || defined(ERTS_DIRTY_SCHEDULERS)
-ErtsSchedSuspendResult
-erts_schedulers_state(Uint *, Uint *, Uint *, Uint *, Uint *, Uint *, int);
+void
+erts_schedulers_state(Uint *, Uint *, Uint *, Uint *, Uint *, Uint *, Uint *, Uint *);
 #endif
 #ifdef ERTS_SMP
 ErtsSchedSuspendResult
 erts_set_schedulers_online(Process *p,
 			   ErtsProcLocks plocks,
 			   Sint new_no,
-			   Sint *old_no
-#ifdef ERTS_DIRTY_SCHEDULERS
-			   , int dirty_only
-#endif
-			   );
+			   Sint *old_no,
+			   int dirty_only);
 ErtsSchedSuspendResult
-erts_block_multi_scheduling(Process *, ErtsProcLocks, int, int);
+erts_block_multi_scheduling(Process *, ErtsProcLocks, int, int, int);
 int erts_is_multi_scheduling_blocked(void);
-Eterm erts_multi_scheduling_blockers(Process *);
+Eterm erts_multi_scheduling_blockers(Process *, int);
 void erts_start_schedulers(void);
 void erts_alloc_notify_delayed_dealloc(int);
 void erts_alloc_ensure_handle_delayed_dealloc_call(int);
-#ifdef ERTS_SMP
 void erts_notify_canceled_timer(ErtsSchedulerData *, int);
 #endif
-void erts_smp_notify_check_children_needed(void);
-#endif
 #if ERTS_USE_ASYNC_READY_Q
 void erts_notify_check_async_ready_queue(void *);
 #endif
@@ -1766,7 +1834,7 @@ Uint erts_debug_nbalance(void);
 
 int erts_debug_wait_completed(Process *c_p, int flags);
 
-Uint erts_process_memory(Process *c_p);
+Uint erts_process_memory(Process *c_p, int incl_msg_inq);
 
 #ifdef ERTS_SMP
 #  define ERTS_GET_SCHEDULER_DATA_FROM_PROC(PROC) ((PROC)->scheduler_data)
@@ -1835,18 +1903,19 @@ do {									\
 #define ERTS_SMP_LC_CHK_RUNQ_LOCK(RQ, L)
 #endif
 
-void *erts_psd_set_init(Process *p, ErtsProcLocks plocks, int ix, void *data);
+void *erts_psd_set_init(Process *p, int ix, void *data);
 
 ERTS_GLB_INLINE void *
 erts_psd_get(Process *p, int ix);
 ERTS_GLB_INLINE void *
-erts_psd_set(Process *p, ErtsProcLocks plocks, int ix, void *new);
+erts_psd_set(Process *p, int ix, void *new);
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
 ERTS_GLB_INLINE void *
 erts_psd_get(Process *p, int ix)
 {
+    ErtsPSD *psd;
 #if defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK)
     ErtsProcLocks locks = erts_proc_lc_my_proc_locks(p);
     if (ERTS_LC_PSD_ANY_LOCK == erts_psd_required_locks[ix].get_locks)
@@ -1857,17 +1926,19 @@ erts_psd_get(Process *p, int ix)
 			   || erts_thr_progress_is_blocking());
     }
 #endif
+
+    psd = (ErtsPSD *) erts_smp_atomic_read_nob(&p->psd);
     ASSERT(0 <= ix && ix < ERTS_PSD_SIZE);
-    return p->psd ? p->psd->data[ix] : NULL;
+    if (!psd)
+	return NULL;
+    ERTS_SMP_DATA_DEPENDENCY_READ_MEMORY_BARRIER;
+    return psd->data[ix];
 }
 
-
-/*
- * NOTE: erts_psd_set() might release and reacquire locks on 'p'.
- */
 ERTS_GLB_INLINE void *
-erts_psd_set(Process *p, ErtsProcLocks plocks, int ix, void *data)
+erts_psd_set(Process *p, int ix, void *data)
 {
+    ErtsPSD *psd;
 #if defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK)
     ErtsProcLocks locks = erts_proc_lc_my_proc_locks(p);
     if (ERTS_LC_PSD_ANY_LOCK == erts_psd_required_locks[ix].set_locks)
@@ -1878,50 +1949,56 @@ erts_psd_set(Process *p, ErtsProcLocks plocks, int ix, void *data)
 			   || erts_thr_progress_is_blocking());
     }
 #endif
+    psd = (ErtsPSD *) erts_smp_atomic_read_nob(&p->psd);
     ASSERT(0 <= ix && ix < ERTS_PSD_SIZE);
-    if (p->psd) {
-	void *old = p->psd->data[ix];
-	p->psd->data[ix] = data;
+    if (psd) {
+	void *old;
+#ifdef ERTS_SMP
+#ifdef ETHR_ORDERED_READ_DEPEND
+	ETHR_MEMBAR(ETHR_LoadStore|ETHR_StoreStore);
+#else
+	ETHR_MEMBAR(ETHR_LoadLoad|ETHR_LoadStore|ETHR_StoreStore);
+#endif
+#endif
+	old = psd->data[ix];
+	psd->data[ix] = data;
 	return old;
     }
-    else {
-	if (!data)
-	    return NULL;
-	else
-	    return erts_psd_set_init(p, plocks, ix, data);
-    }
+
+    if (!data)
+	return NULL;
+
+    return erts_psd_set_init(p, ix, data);
 }
 
 #endif
 
-#define ERTS_PROC_SCHED_ID(P, L, ID) \
-  ((UWord) erts_psd_set((P), (L), ERTS_PSD_SCHED_ID, (void *) (ID)))
+#define ERTS_PROC_SCHED_ID(P, ID) \
+  ((UWord) erts_psd_set((P), ERTS_PSD_SCHED_ID, (void *) (ID)))
 
 #define ERTS_PROC_GET_SAVED_CALLS_BUF(P) \
   ((struct saved_calls *) erts_psd_get((P), ERTS_PSD_SAVED_CALLS_BUF))
-#define ERTS_PROC_SET_SAVED_CALLS_BUF(P, L, SCB) \
-  ((struct saved_calls *) erts_psd_set((P), (L), ERTS_PSD_SAVED_CALLS_BUF, (void *) (SCB)))
+#define ERTS_PROC_SET_SAVED_CALLS_BUF(P, SCB) \
+  ((struct saved_calls *) erts_psd_set((P), ERTS_PSD_SAVED_CALLS_BUF, (void *) (SCB)))
 
 #define ERTS_PROC_GET_CALL_TIME(P) \
   ((process_breakpoint_time_t *) erts_psd_get((P), ERTS_PSD_CALL_TIME_BP))
-#define ERTS_PROC_SET_CALL_TIME(P, L, PBT) \
-  ((process_breakpoint_time_t *) erts_psd_set((P), (L), ERTS_PSD_CALL_TIME_BP, (void *) (PBT)))
+#define ERTS_PROC_SET_CALL_TIME(P, PBT) \
+  ((process_breakpoint_time_t *) erts_psd_set((P), ERTS_PSD_CALL_TIME_BP, (void *) (PBT)))
 
 #define ERTS_PROC_GET_DELAYED_GC_TASK_QS(P) \
     ((ErtsProcSysTaskQs *) erts_psd_get((P), ERTS_PSD_DELAYED_GC_TASK_QS))
-#define ERTS_PROC_SET_DELAYED_GC_TASK_QS(P, L, PBT) \
-    ((ErtsProcSysTaskQs *) erts_psd_set((P), (L), ERTS_PSD_DELAYED_GC_TASK_QS, (void *) (PBT)))
+#define ERTS_PROC_SET_DELAYED_GC_TASK_QS(P, PBT) \
+    ((ErtsProcSysTaskQs *) erts_psd_set((P), ERTS_PSD_DELAYED_GC_TASK_QS, (void *) (PBT)))
 
 #define ERTS_PROC_GET_NIF_TRAP_EXPORT(P) \
     erts_psd_get((P), ERTS_PSD_NIF_TRAP_EXPORT)
-#define ERTS_PROC_SET_NIF_TRAP_EXPORT(P, L, NTE) \
-    erts_psd_set((P), (L), ERTS_PSD_NIF_TRAP_EXPORT, (void *) (NTE))
+#define ERTS_PROC_SET_NIF_TRAP_EXPORT(P, NTE) \
+    erts_psd_set((P), ERTS_PSD_NIF_TRAP_EXPORT, (void *) (NTE))
 
 
 ERTS_GLB_INLINE Eterm erts_proc_get_error_handler(Process *p);
-ERTS_GLB_INLINE Eterm erts_proc_set_error_handler(Process *p,
-						  ErtsProcLocks plocks,
-						  Eterm handler);
+ERTS_GLB_INLINE Eterm erts_proc_set_error_handler(Process *p, Eterm handler);
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 ERTS_GLB_INLINE Eterm
@@ -1937,13 +2014,13 @@ erts_proc_get_error_handler(Process *p)
 }
 
 ERTS_GLB_INLINE Eterm
-erts_proc_set_error_handler(Process *p, ErtsProcLocks plocks, Eterm handler)
+erts_proc_set_error_handler(Process *p, Eterm handler)
 {
     void *old_val;
     void *new_val;
     ASSERT(is_atom(handler));
     new_val = (handler == am_error_handler) ? NULL : (void *) (UWord) handler;
-    old_val = erts_psd_set(p, plocks, ERTS_PSD_ERROR_HANDLER, new_val);
+    old_val = erts_psd_set(p, ERTS_PSD_ERROR_HANDLER, new_val);
     if (!old_val)
 	return am_error_handler;
     else {
@@ -2076,6 +2153,22 @@ ERTS_GLB_INLINE void erts_smp_xrunq_unlock(ErtsRunQueue *rq, ErtsRunQueue *xrq);
 ERTS_GLB_INLINE void erts_smp_runqs_lock(ErtsRunQueue *rq1, ErtsRunQueue *rq2);
 ERTS_GLB_INLINE void erts_smp_runqs_unlock(ErtsRunQueue *rq1, ErtsRunQueue *rq2);
 
+ERTS_GLB_INLINE ErtsMessage *erts_alloc_message_heap_state(Process *pp,
+							   erts_aint32_t *psp,
+							   ErtsProcLocks *plp,
+							   Uint sz,
+							   Eterm **hpp,
+							   ErlOffHeap **ohpp);
+ERTS_GLB_INLINE ErtsMessage *erts_alloc_message_heap(Process *pp,
+						     ErtsProcLocks *plp,
+						     Uint sz,
+						     Eterm **hpp,
+						     ErlOffHeap **ohpp);
+
+ERTS_GLB_INLINE void erts_shrink_message_heap(ErtsMessage **msgpp, Process *pp,
+					      Eterm *start_hp, Eterm *used_hp, Eterm *end_hp,
+					      Eterm *brefs, Uint brefs_size);
+
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
 ERTS_GLB_INLINE
@@ -2224,6 +2317,63 @@ erts_smp_runqs_unlock(ErtsRunQueue *rq1, ErtsRunQueue *rq2)
 #endif
 }
 
+ERTS_GLB_INLINE ErtsMessage *
+erts_alloc_message_heap_state(Process *pp,
+			      erts_aint32_t *psp,
+			      ErtsProcLocks *plp,
+			      Uint sz,
+			      Eterm **hpp,
+			      ErlOffHeap **ohpp)
+{
+    int on_heap;
+
+    if ((*psp) & ERTS_PSFLG_OFF_HEAP_MSGQ) {
+	ErtsMessage *mp = erts_alloc_message(sz, hpp);
+	*ohpp = sz == 0 ? NULL : &mp->hfrag.off_heap;
+	return mp;
+    }
+
+    return erts_try_alloc_message_on_heap(pp, psp, plp, sz, hpp, ohpp, &on_heap);
+}
+
+ERTS_GLB_INLINE ErtsMessage *
+erts_alloc_message_heap(Process *pp,
+			ErtsProcLocks *plp,
+			Uint sz,
+			Eterm **hpp,
+			ErlOffHeap **ohpp)
+{
+    erts_aint32_t state = erts_smp_atomic32_read_nob(&pp->state);
+    return erts_alloc_message_heap_state(pp, &state, plp, sz, hpp, ohpp);
+}
+
+ERTS_GLB_INLINE void
+erts_shrink_message_heap(ErtsMessage **msgpp, Process *pp,
+			 Eterm *start_hp, Eterm *used_hp, Eterm *end_hp,
+			 Eterm *brefs, Uint brefs_size)
+{
+    ASSERT(start_hp <= used_hp && used_hp <= end_hp);
+    if ((*msgpp)->data.attached == ERTS_MSG_COMBINED_HFRAG)
+	*msgpp = erts_shrink_message(*msgpp, used_hp - start_hp,
+				     brefs, brefs_size);
+    else if (!(*msgpp)->data.attached) {
+	ERTS_SMP_LC_ASSERT(ERTS_PROC_LOCK_MAIN
+			   & erts_proc_lc_my_proc_locks(pp));
+	HRelease(pp, end_hp, used_hp);
+    }
+    else {
+	ErlHeapFragment *hfrag = (*msgpp)->data.heap_frag;
+	if (start_hp != used_hp)
+	    hfrag = erts_resize_message_buffer(hfrag, used_hp - start_hp,
+					       brefs, brefs_size);
+	else {
+	    free_message_buffer(hfrag);
+	    hfrag = NULL;
+	}
+	(*msgpp)->data.heap_frag = hfrag;
+    }
+}
+
 #endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
 
 ERTS_GLB_INLINE ErtsAtomCacheMap *erts_get_atom_cache_map(Process *c_p);
@@ -2317,6 +2467,6 @@ erts_sched_poke(ErtsSchedulerSleepInfo *ssi)
 #endif
 
 
-void erl_halt(int code);
+void erts_halt(int code);
 extern erts_smp_atomic32_t erts_halt_progress;
 extern int erts_halt_code;
diff --git a/erts/emulator/beam/erl_process_dict.c b/erts/emulator/beam/erl_process_dict.c
index 8606371bdf..487b944fc0 100644
--- a/erts/emulator/beam/erl_process_dict.c
+++ b/erts/emulator/beam/erl_process_dict.c
@@ -51,16 +51,19 @@
 #define INITIAL_SIZE        (erts_pd_initial_size)
 
 /* Hash utility macros  */
-#define HASH_RANGE(PDict) ((PDict)->homeSize + (PDict)->splitPosition)
+#define HASH_RANGE(PDict) ((PDict)->usedSlots)
 
-#define MAKE_HASH(Term) 				\
-((is_small(Term)) ? unsigned_val(Term) :		\
- ((is_atom(Term)) ? 					\
-  (atom_tab(atom_val(term))->slot.bucket.hvalue) :	\
-  make_hash2(Term)))
+#define MAKE_HASH(Term)                                \
+    ((is_small(Term)) ? unsigned_val(Term) :           \
+     ((is_atom(Term)) ?                                \
+      (atom_tab(atom_val(Term))->slot.bucket.hvalue) : \
+      make_internal_hash(Term)))
 
 #define PD_SZ2BYTES(Sz) (sizeof(ProcDict) + ((Sz) - 1)*sizeof(Eterm))
 
+#define pd_hash_value(Pdict, Key) \
+    pd_hash_value_to_ix(Pdict, MAKE_HASH((Key)))
+
 /* Memory allocation macros */
 #define PD_ALLOC(Sz)				\
      erts_alloc(ERTS_ALC_T_PROC_DICT, (Sz))
@@ -74,14 +77,19 @@
 #define TCDR(Term) CDR(list_val(Term))
 
 /* Array access macro */ 
-#define ARRAY_GET(PDict, Index) (((PDict)->size > (Index)) ? \
-				 (PDict)->data[Index] : NIL)
+#define ARRAY_GET(PDict, Index) (ASSERT((Index) < (PDict)->arraySize), \
+				 (PDict)->data[Index])
+#define ARRAY_PUT(PDict, Index, Val) (ASSERT((Index) < (PDict)->arraySize), \
+                                      (PDict)->data[Index] = (Val))
+
+#define IS_POW2(X) ((X) && !((X) & ((X)-1)))
 
 /*
  * Forward decalarations
  */
 static void pd_hash_erase(Process *p, Eterm id, Eterm *ret);
 static void pd_hash_erase_all(Process *p);
+static Eterm pd_hash_get_with_hval(Process *p, Eterm bucket, Eterm id);
 static Eterm pd_hash_get_keys(Process *p, Eterm value);
 static Eterm pd_hash_get_all_keys(Process *p, ProcDict *pd);
 static Eterm pd_hash_get_all(Process *p, ProcDict *pd);
@@ -91,9 +99,9 @@ static void shrink(Process *p, Eterm* ret);
 static void grow(Process *p);
 
 static void array_shrink(ProcDict **ppd, unsigned int need);
-static Eterm array_put(ProcDict **ppdict, unsigned int ndx, Eterm term);
+static void ensure_array_size(ProcDict**, unsigned int size);
 
-static unsigned int pd_hash_value(ProcDict *pdict, Eterm term);
+static unsigned int pd_hash_value_to_ix(ProcDict *pdict, Uint32 hx);
 static unsigned int next_array_size(unsigned int need);
 
 /*
@@ -134,6 +142,16 @@ static void pd_check(ProcDict *pd);
 ** External interface
 */
 
+int
+erts_pd_set_initial_size(int size)
+{
+    if (size <= 0)
+	return 0;
+
+    erts_pd_initial_size = 1 << erts_fit_in_bits_uint(size-1);
+    return 1;
+}
+
 /*
  * Called from break handler
  */
@@ -146,9 +164,9 @@ erts_dictionary_dump(int to, void *to_arg, ProcDict *pd)
     /*PD_CHECK(pd);*/
     if (pd == NULL)
 	return;
-    erts_print(to, to_arg, "(size = %d, used = %d, homeSize = %d, "
+    erts_print(to, to_arg, "(size = %d, usedSlots = %d, "
 	       "splitPosition = %d, numElements = %d)\n",
-	       pd->size, pd->used, pd->homeSize, 
+	       pd->arraySize, pd->usedSlots,
 	       pd->splitPosition, (unsigned int) pd->numElements);
     for (i = 0; i < HASH_RANGE(pd); ++i) {
 	erts_print(to, to_arg, "%d: %T\n", i, ARRAY_GET(pd, i));
@@ -203,7 +221,7 @@ erts_dicts_mem_size(Process *p)
 {
     Uint size = 0;
     if (p->dictionary)
-	size += PD_SZ2BYTES(p->dictionary->size);
+	size += PD_SZ2BYTES(p->dictionary->arraySize);
     return size;
 }
 
@@ -345,7 +363,7 @@ static void pd_hash_erase(Process *p, Eterm id, Eterm *ret)
     if (is_boxed(old)) {	/* Tuple */
 	ASSERT(is_tuple(old));
 	if (EQ(tuple_val(old)[1], id)) {
-	    array_put(&(p->dictionary), hval, NIL);
+	    ARRAY_PUT(p->dictionary, hval, NIL);
 	    --(p->dictionary->numElements);
 	    *ret = tuple_val(old)[2];
 	}
@@ -365,7 +383,7 @@ static void pd_hash_erase(Process *p, Eterm id, Eterm *ret)
 	old = ARRAY_GET(p->dictionary, hval);
 	ASSERT(is_list(old));
 	if (is_nil(TCDR(old))) {
-	    array_put(&p->dictionary, hval, TCAR(old));
+	    ARRAY_PUT(p->dictionary, hval, TCAR(old));
 	}
     } else if (is_not_nil(old)) {
 #ifdef DEBUG
@@ -374,7 +392,7 @@ static void pd_hash_erase(Process *p, Eterm id, Eterm *ret)
 		     "display term found in line %d:\n"
 		     "%T\n", p->common.id, __LINE__, old);
 #endif
-	erl_exit(1, "Damaged process dictionary found during erase/1.");
+	erts_exit(ERTS_ERROR_EXIT, "Damaged process dictionary found during erase/1.");
     }
     if ((range = HASH_RANGE(p->dictionary)) > INITIAL_SIZE && 
 	range / 2  > (p->dictionary->numElements)) {
@@ -390,40 +408,56 @@ static void pd_hash_erase_all(Process *p)
     }
 }
 
+Eterm erts_pd_hash_get_with_hx(Process *p, Uint32 hx, Eterm id)
+{
+    unsigned int hval;
+    ProcDict *pd = p->dictionary;
+
+    ASSERT(hx == MAKE_HASH(id));
+    if (pd == NULL)
+	return am_undefined;
+    hval = pd_hash_value_to_ix(pd, hx);
+    return pd_hash_get_with_hval(p, ARRAY_GET(pd, hval), id);
+}
+
 Eterm erts_pd_hash_get(Process *p, Eterm id) 
 {
     unsigned int hval;
-    Eterm tmp;
     ProcDict *pd = p->dictionary;
 
     if (pd == NULL)
 	return am_undefined;
     hval = pd_hash_value(pd, id);
-    tmp = ARRAY_GET(pd, hval);
-    if (is_boxed(tmp)) {	/* Tuple */
-	ASSERT(is_tuple(tmp));
-	if (EQ(tuple_val(tmp)[1], id)) {
-	    return tuple_val(tmp)[2];
+    return pd_hash_get_with_hval(p, ARRAY_GET(pd, hval), id);
+}
+
+Eterm pd_hash_get_with_hval(Process *p, Eterm bucket, Eterm id)
+{
+    if (is_boxed(bucket)) {     /* Tuple */
+	ASSERT(is_tuple(bucket));
+	if (EQ(tuple_val(bucket)[1], id)) {
+	    return tuple_val(bucket)[2];
 	}
-    } else if (is_list(tmp)) {
-	for (; tmp != NIL && !EQ(tuple_val(TCAR(tmp))[1], id); tmp = TCDR(tmp)) {
+    } else if (is_list(bucket)) {
+	for (; bucket != NIL && !EQ(tuple_val(TCAR(bucket))[1], id); bucket = TCDR(bucket)) {
 	    ;
 	}
-	if (tmp != NIL) {
-	    return tuple_val(TCAR(tmp))[2];
+	if (bucket != NIL) {
+	    return tuple_val(TCAR(bucket))[2];
 	}
-    } else if (is_not_nil(tmp)) {
+    } else if (is_not_nil(bucket)) {
 #ifdef DEBUG
 	erts_fprintf(stderr,
 		     "Process dictionary for process %T is broken, trying to "
 		     "display term found in line %d:\n"
-		     "%T\n", p->common.id, __LINE__, tmp);
+		     "%T\n", p->common.id, __LINE__, bucket);
 #endif
-	erl_exit(1, "Damaged process dictionary found during get/1.");
+	erts_exit(ERTS_ERROR_EXIT, "Damaged process dictionary found during get/1.");
     }
     return am_undefined;
 }
 
+
 #define PD_GET_TKEY(Dst,Src)                            \
 do {                                                    \
     ASSERT(is_tuple((Src)));                            \
@@ -549,8 +583,11 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value)
 
     if (p->dictionary == NULL) {
 	/* Create it */
-	array_put(&(p->dictionary), INITIAL_SIZE - 1, NIL);
-	p->dictionary->homeSize = INITIAL_SIZE;
+        ensure_array_size(&p->dictionary, INITIAL_SIZE);
+	p->dictionary->usedSlots = INITIAL_SIZE;
+        p->dictionary->sizeMask = INITIAL_SIZE*2 - 1;
+        p->dictionary->splitPosition = 0;
+        p->dictionary->numElements = 0;
     }	
     hval = pd_hash_value(p->dictionary, id);
     old = ARRAY_GET(p->dictionary, hval);
@@ -583,7 +620,7 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value)
 	root[0] = id;
 	root[1] = value;
 	root[2] = old;
-	BUMP_REDS(p, erts_garbage_collect(p, needed, root, 3));
+	erts_garbage_collect(p, needed, root, 3);
 	id = root[0];
 	value = root[1];
 	old = root[2];
@@ -602,19 +639,19 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value)
      * Update the dictionary.
      */
     if (is_nil(old)) {
-	array_put(&(p->dictionary), hval, tpl);
+	ARRAY_PUT(p->dictionary, hval, tpl);
 	++(p->dictionary->numElements);
     } else if (is_boxed(old)) {
 	ASSERT(is_tuple(old));
 	if (EQ(tuple_val(old)[1],id)) {
-	    array_put(&(p->dictionary), hval, tpl);
+	    ARRAY_PUT(p->dictionary, hval, tpl);
 	    return tuple_val(old)[2];
 	} else {
 	    hp = HeapOnlyAlloc(p, 4);
 	    tmp = CONS(hp, old, NIL);
 	    hp += 2;
 	    ++(p->dictionary->numElements);
-	    array_put(&(p->dictionary), hval, CONS(hp, tpl, tmp));
+	    ARRAY_PUT(p->dictionary, hval, CONS(hp, tpl, tmp));
 	    hp += 2;
 	    ASSERT(hp <= hp_limit);
 	}
@@ -624,7 +661,7 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value)
 	     * New key. Simply prepend the tuple to the beginning of the list.
 	     */
 	    hp = HeapOnlyAlloc(p, 2);
-	    array_put(&(p->dictionary), hval, CONS(hp, tpl, old));
+	    ARRAY_PUT(p->dictionary, hval, CONS(hp, tpl, old));
 	    hp += 2;
 	    ASSERT(hp <= hp_limit);
 	    ++(p->dictionary->numElements);
@@ -659,7 +696,7 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value)
 	    nlist = CONS(hp, tpl, nlist);
 	    hp += 2;
 	    ASSERT(hp <= hp_limit);
-	    array_put(&(p->dictionary), hval, nlist);
+	    ARRAY_PUT(p->dictionary, hval, nlist);
 	    return tuple_val(TCAR(tmp))[2];
 	}
     } else {
@@ -670,7 +707,7 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value)
 		     "%T\n", p->common.id, __LINE__, old);
 #endif
 
-	erl_exit(1, "Damaged process dictionary found during put/2.");
+	erts_exit(ERTS_ERROR_EXIT, "Damaged process dictionary found during put/2.");
     }
     if (HASH_RANGE(p->dictionary) <= p->dictionary->numElements) {
 	grow(p);
@@ -684,6 +721,7 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value)
 
 static void shrink(Process *p, Eterm* ret) 
 {
+    ProcDict *pd = p->dictionary;
     unsigned int range = HASH_RANGE(p->dictionary);
     unsigned int steps = (range*3) / 10;
     Eterm hi, lo, tmp;
@@ -698,25 +736,26 @@ static void shrink(Process *p, Eterm* ret)
     }
 
     for (i = 0; i < steps; ++i) {
-	ProcDict *pd = p->dictionary;
 	if (pd->splitPosition == 0) {
-	    pd->homeSize /= 2;
-	    pd->splitPosition = pd->homeSize;
+            ASSERT(IS_POW2(pd->usedSlots));
+            pd->sizeMask = pd->usedSlots - 1;
+	    pd->splitPosition = pd->usedSlots / 2;
 	}
 	--(pd->splitPosition);
-	hi = ARRAY_GET(pd, (pd->splitPosition + pd->homeSize));
+        /* Must wait to decrement 'usedSlots' for GC rootset below */
+	hi = ARRAY_GET(pd, pd->usedSlots - 1);
 	lo = ARRAY_GET(pd, pd->splitPosition);
 	if (hi != NIL) {
 	    if (lo == NIL) {
-		array_put(&(p->dictionary), pd->splitPosition, hi);
+		ARRAY_PUT(pd, pd->splitPosition, hi);
 	    } else {
-		int needed = 4;
+		Sint needed = 4;
 		if (is_list(hi) && is_list(lo)) {
 		    needed = 2*erts_list_length(hi);
 		}
 		if (HeapWordsLeft(p) < needed) {
-		    BUMP_REDS(p, erts_garbage_collect(p, needed, ret, 1));
-		    hi = pd->data[(pd->splitPosition + pd->homeSize)];
+		    erts_garbage_collect(p, needed, ret, 1);
+		    hi = pd->data[pd->usedSlots - 1];
 		    lo = pd->data[pd->splitPosition];
 		}
 #ifdef DEBUG
@@ -727,13 +766,13 @@ static void shrink(Process *p, Eterm* ret)
 			hp = HeapOnlyAlloc(p, 4);
 			tmp = CONS(hp, hi, NIL);
 			hp += 2;
-			array_put(&(p->dictionary), pd->splitPosition, 
+			ARRAY_PUT(pd, pd->splitPosition,
 				  CONS(hp,lo,tmp));
 			hp += 2;
 			ASSERT(hp <= hp_limit);
 		    } else { /* hi is a list */
 			hp = HeapOnlyAlloc(p, 2);
-			array_put(&(p->dictionary), pd->splitPosition, 
+			ARRAY_PUT(pd, pd->splitPosition,
 				  CONS(hp, lo, hi));
 			hp += 2;
 			ASSERT(hp <= hp_limit);
@@ -741,7 +780,7 @@ static void shrink(Process *p, Eterm* ret)
 		} else { /* lo is a list */
 		    if (is_tuple(hi)) {
 			hp = HeapOnlyAlloc(p, 2);
-			array_put(&(p->dictionary), pd->splitPosition, 
+			ARRAY_PUT(pd, pd->splitPosition,
 				  CONS(hp, hi, lo));
 			hp += 2;
 			ASSERT(hp <= hp_limit);
@@ -753,14 +792,15 @@ static void shrink(Process *p, Eterm* ret)
 			    hp += 2;
 			}
 			ASSERT(hp <= hp_limit);
-			array_put(&(p->dictionary), pd->splitPosition, lo);
+			ARRAY_PUT(pd, pd->splitPosition, lo);
 		    }
 		}
 	    }
 	}
-	array_put(&(p->dictionary), (pd->splitPosition + pd->homeSize), NIL);
+        --pd->usedSlots;
+	ARRAY_PUT(pd, pd->usedSlots, NIL);
     }
-    if (HASH_RANGE(p->dictionary) <= (p->dictionary->size / 4)) {
+    if (HASH_RANGE(p->dictionary) <= (p->dictionary->arraySize / 4)) {
 	array_shrink(&(p->dictionary), (HASH_RANGE(p->dictionary) * 3) / 2);
     }
 }
@@ -768,14 +808,14 @@ static void shrink(Process *p, Eterm* ret)
 static void grow(Process *p)
 {
     unsigned int i,j;
-    unsigned int steps = p->dictionary->homeSize / 5;
+    unsigned int steps = (p->dictionary->usedSlots / 4) & 0xf;
     Eterm l1,l2;
     Eterm l;
     Eterm *hp;
     unsigned int pos;
     unsigned int homeSize;
-    int needed = 0;
-    ProcDict *pd;
+    Sint needed = 0;
+    ProcDict *pd = p->dictionary;
 #ifdef DEBUG
     Eterm *hp_limit;
 #endif
@@ -784,18 +824,20 @@ static void grow(Process *p)
     if (steps == 0)
 	steps = 1;
     /* Dont grow over MAX_HASH */
-    if ((MAX_HASH - steps) <= HASH_RANGE(p->dictionary)) {
+    if ((MAX_HASH - steps) <= HASH_RANGE(pd)) {
 	return;
     }
 
+    ensure_array_size(&p->dictionary, HASH_RANGE(pd) + steps);
+    pd = p->dictionary;
+
     /*
      * Calculate total number of heap words needed, and garbage collect
      * if necessary.
      */
 
-    pd = p->dictionary;
     pos = pd->splitPosition;
-    homeSize = pd->homeSize;
+    homeSize = pd->usedSlots - pd->splitPosition;
     for (i = 0; i < steps; ++i) {
 	if (pos == homeSize) {
 	    homeSize *= 2;
@@ -811,7 +853,7 @@ static void grow(Process *p)
 	}
     }
     if (HeapWordsLeft(p) < needed) {
-	BUMP_REDS(p, erts_garbage_collect(p, needed, 0, 0));
+	erts_garbage_collect(p, needed, 0, 0);
     }
 #ifdef DEBUG
     hp_limit = p->htop + needed;
@@ -820,21 +862,22 @@ static void grow(Process *p)
     /*
      * Now grow.
      */
-
+    homeSize = pd->usedSlots - pd->splitPosition;
     for (i = 0; i < steps; ++i) {
-	ProcDict *pd = p->dictionary;
-	if (pd->splitPosition == pd->homeSize) {
-	    pd->homeSize *= 2;
-	    pd->splitPosition = 0;
+	if (pd->splitPosition == homeSize) {
+	    homeSize *= 2;
+            pd->sizeMask = homeSize*2 - 1;
+            pd->splitPosition = 0;
 	}
 	pos = pd->splitPosition;
 	++pd->splitPosition; /* For the hashes */
+        ++pd->usedSlots;
+        ASSERT(pos + homeSize == pd->usedSlots - 1);
 	l = ARRAY_GET(pd, pos);
 	if (is_tuple(l)) {
 	    if (pd_hash_value(pd, tuple_val(l)[1]) != pos) {
-		array_put(&(p->dictionary), pos + 
-			  p->dictionary->homeSize, l);
-		array_put(&(p->dictionary), pos, NIL);
+		ARRAY_PUT(pd, pos + homeSize, l);
+		ARRAY_PUT(pd, pos, NIL);
 	    }
 	} else {
 	    l2 = NIL;
@@ -856,10 +899,8 @@ static void grow(Process *p)
 	    if (l2 != NIL && TCDR(l2) == NIL)
 		l2 = TCAR(l2);
 	    ASSERT(hp <= hp_limit);
-	    /* After array_put pd is no longer valid */
-	    array_put(&(p->dictionary), pos, l1);
-	    array_put(&(p->dictionary), pos + 
-		      p->dictionary->homeSize, l2);
+	    ARRAY_PUT(pd, pos, l1);
+	    ARRAY_PUT(pd, pos + homeSize, l2);
 	}
     }
 
@@ -876,73 +917,65 @@ static void array_shrink(ProcDict **ppd, unsigned int need)
 {
     unsigned int siz = next_array_size(need);
 
-    HDEBUGF(("array_shrink: size = %d, used = %d, need = %d",
-	     (*ppd)->size, (*ppd)->used, need));
+    HDEBUGF(("array_shrink: size = %d, need = %d",
+	     (*ppd)->arraySize, need));
 
-    if (siz > (*ppd)->size)
+    if (siz >= (*ppd)->arraySize)
 	return; /* Only shrink */
 
     *ppd = PD_REALLOC(((void *) *ppd),
-		      PD_SZ2BYTES((*ppd)->size),
+		      PD_SZ2BYTES((*ppd)->arraySize),
 		      PD_SZ2BYTES(siz));
 
-    (*ppd)->size = siz;
-    if ((*ppd)->size < (*ppd)->used)
-	(*ppd)->used = (*ppd)->size;
+    (*ppd)->arraySize = siz;
 }
     
 			
-static Eterm array_put(ProcDict **ppdict, unsigned int ndx, Eterm term)
+static void ensure_array_size(ProcDict **ppdict, unsigned int size)
 {
+    ProcDict *pd = *ppdict;
     unsigned int i;
-    Eterm ret;
-    if (*ppdict == NULL) {
-	Uint siz = next_array_size(ndx+1);
-	ProcDict *p;
 
-        p = PD_ALLOC(PD_SZ2BYTES(siz));
+    if (pd == NULL) {
+	Uint siz = next_array_size(size);
+
+        pd = PD_ALLOC(PD_SZ2BYTES(siz));
 	for (i = 0; i < siz; ++i) 
-	    p->data[i] = NIL;
-	p->size = siz;
-	p->homeSize = p->splitPosition = p->numElements = p->used = 0;
-	*ppdict = p;
-    } else if (ndx >= (*ppdict)->size) {
-	Uint osize = (*ppdict)->size;
-	Uint nsize = next_array_size(ndx+1);
-	*ppdict = PD_REALLOC(((void *) *ppdict),
+	    pd->data[i] = NIL;
+	pd->arraySize = siz;
+        *ppdict = pd;
+    } else if (size > pd->arraySize) {
+	Uint osize = pd->arraySize;
+	Uint nsize = next_array_size(size);
+	pd = PD_REALLOC(((void *) pd),
 			     PD_SZ2BYTES(osize),
 			     PD_SZ2BYTES(nsize));
 	for (i = osize; i < nsize; ++i)
-	    (*ppdict)->data[i] = NIL;
-	(*ppdict)->size = nsize;
+	    pd->data[i] = NIL;
+	pd->arraySize = nsize;
+        *ppdict = pd;
     }
-    ret = (*ppdict)->data[ndx];
-    (*ppdict)->data[ndx] = term;
-    if ((ndx + 1) > (*ppdict)->used)
-	(*ppdict)->used = ndx + 1;
-#ifdef HARDDEBUG
-    HDEBUGF(("array_put: (*ppdict)->size = %d, (*ppdict)->used = %d, ndx = %d",
-	     (*ppdict)->size, (*ppdict)->used, ndx));
-    erts_fprintf(stderr, "%T", term);
-#endif /* HARDDEBUG */
-    return ret;
 }
 
 /*
 ** Basic utilities
 */
 
-static unsigned int pd_hash_value(ProcDict *pdict, Eterm term) 
+static unsigned int pd_hash_value_to_ix(ProcDict *pdict, Uint32 hx) 
 { 
-    Uint hash, high;
+    Uint high;
 
-    hash = MAKE_HASH(term);
-    high = hash % (pdict->homeSize*2);
+    ASSERT(IS_POW2(pdict->sizeMask+1));
+    ASSERT(HASH_RANGE(pdict) >= (pdict->sizeMask >> 1));
+    ASSERT(HASH_RANGE(pdict) <= (pdict->sizeMask + 1));
+
+    high = hx & pdict->sizeMask;
     if (high >= HASH_RANGE(pdict))
-	return hash % pdict->homeSize;
+	return hx & (pdict->sizeMask >> 1);
     return high;
 }
 
+
 static unsigned int next_array_size(unsigned int need)
 {
     static unsigned int tab[] =
@@ -1002,35 +1035,39 @@ static unsigned int next_array_size(unsigned int need)
 static void pd_check(ProcDict *pd) 
 {
     unsigned int i;
+    unsigned int used;
     Uint num;
     if (pd == NULL)
 	return;
-    ASSERT(pd->size >= pd->used);
+    used = HASH_RANGE(pd);
+    ASSERT(pd->arraySize >= used);
     ASSERT(HASH_RANGE(pd) <= MAX_HASH);
-    for (i = 0, num = 0; i < pd->used; ++i) {
+    for (i = 0, num = 0; i < used; ++i) {
 	Eterm t = pd->data[i];
 	if (is_nil(t)) {
 	    continue;
 	} else if (is_tuple(t)) {
 	    ++num;
 	    ASSERT(arityval(*tuple_val(t)) == 2);
+            ASSERT(pd_hash_value(pd, tuple_val(t)[1]) == i);
 	    continue;
 	} else if (is_list(t)) {
 	    while (t != NIL) {
 		++num;
 		ASSERT(is_tuple(TCAR(t)));
 		ASSERT(arityval(*(tuple_val(TCAR(t)))) == 2);
+                ASSERT(pd_hash_value(pd, tuple_val(TCAR(t))[1]) == i);
 		t = TCDR(t);
 	    }
 	    continue;
 	} else {
-	    erl_exit(1, 
+	    erts_exit(ERTS_ERROR_EXIT,
 		     "Found tag 0x%08x in process dictionary at position %d",
 		     (unsigned long) t, (int) i);
 	}
     }
     ASSERT(num == pd->numElements);
-    ASSERT(pd->splitPosition <= pd->homeSize);
+    ASSERT(pd->usedSlots >= pd->splitPosition*2);
 }
 
 #endif /* DEBUG */
diff --git a/erts/emulator/beam/erl_process_dict.h b/erts/emulator/beam/erl_process_dict.h
index cc53800eb5..dac214c8a1 100644
--- a/erts/emulator/beam/erl_process_dict.h
+++ b/erts/emulator/beam/erl_process_dict.h
@@ -23,14 +23,18 @@
 #include "sys.h"
 
 typedef struct proc_dict {
-    unsigned int size;
-    unsigned int used;
-    unsigned int homeSize;
+    unsigned int sizeMask;
+    unsigned int usedSlots;
+    unsigned int arraySize;
     unsigned int splitPosition;
     Uint numElements;
     Eterm data[1]; /* The beginning of an array of erlang terms */
 } ProcDict;
 
+#define ERTS_PD_START(PD) ((PD)->data)
+#define ERTS_PD_SIZE(PD)  ((PD)->usedSlots)
+
+int erts_pd_set_initial_size(int size);
 Uint erts_dicts_mem_size(struct process *p);
 void erts_erase_dicts(struct process *p);
 void erts_dictionary_dump(int to, void *to_arg, ProcDict *pd);
@@ -39,5 +43,6 @@ void erts_deep_dictionary_dump(int to, void *to_arg,
 Eterm erts_dictionary_copy(struct process *p, ProcDict *pd);
 
 Eterm erts_pd_hash_get(struct process *p, Eterm id);
+Eterm erts_pd_hash_get_with_hx(Process *p, Uint32 hx, Eterm id);
 
 #endif
diff --git a/erts/emulator/beam/erl_process_dump.c b/erts/emulator/beam/erl_process_dump.c
index 25f0b1ed38..73552b28de 100644
--- a/erts/emulator/beam/erl_process_dump.c
+++ b/erts/emulator/beam/erl_process_dump.c
@@ -78,13 +78,14 @@ erts_deep_process_dump(int to, void *to_arg)
     dump_binaries(to, to_arg, all_binaries);
 }
 
-Uint erts_process_memory(Process *p) {
-  ErlMessage *mp;
+Uint erts_process_memory(Process *p, int incl_msg_inq) {
+  ErtsMessage *mp;
   Uint size = 0;
   struct saved_calls *scb;
   size += sizeof(Process);
 
-  ERTS_SMP_MSGQ_MV_INQ2PRIVQ(p);
+  if (incl_msg_inq)
+      ERTS_SMP_MSGQ_MV_INQ2PRIVQ(p);
 
   erts_doforall_links(ERTS_P_LINKS(p), &erts_one_link_size, &size);
   erts_doforall_monitors(ERTS_P_MONITORS(p), &erts_one_mon_size, &size);
@@ -92,7 +93,7 @@ Uint erts_process_memory(Process *p) {
   if (p->old_hend && p->old_heap)
     size += (p->old_hend - p->old_heap) * sizeof(Eterm);
 
-  size += p->msg.len * sizeof(ErlMessage);
+  size += p->msg.len * sizeof(ErtsMessage);
 
   for (mp = p->msg.first; mp; mp = mp->next)
     if (mp->data.attached)
@@ -102,7 +103,7 @@ Uint erts_process_memory(Process *p) {
     size += p->arity * sizeof(p->arg_reg[0]);
   }
 
-  if (p->psd)
+  if (erts_smp_atomic_read_nob(&p->psd) != (erts_aint_t) NULL)
     size += sizeof(ErtsPSD);
 
   scb = ERTS_PROC_GET_SAVED_CALLS_BUF(p);
@@ -119,7 +120,7 @@ static void
 dump_process_info(int to, void *to_arg, Process *p)
 {
     Eterm* sp;
-    ErlMessage* mp;
+    ErtsMessage* mp;
     int yreg = -1;
 
     ERTS_SMP_MSGQ_MV_INQ2PRIVQ(p);
@@ -365,7 +366,7 @@ heap_dump(int to, void *to_arg, Eterm x)
 
     while (x != OUR_NIL) {
 	if (is_CP(x)) {
-	    next = (Eterm *) EXPAND_POINTER(x);
+	    next = (Eterm *) x;
 	} else if (is_list(x)) {
 	    ptr = list_val(x);
 	    if (ptr[0] != OUR_NIL) {
@@ -378,7 +379,7 @@ heap_dump(int to, void *to_arg, Eterm x)
 		    ptr[1] = make_small(0);
 		}
 		x = ptr[0];
-		ptr[0] = (Eterm) COMPRESS_POINTER(next);
+		ptr[0] = (Eterm) next;
 		next = ptr + 1;
 		continue;
 	    }
@@ -408,7 +409,7 @@ heap_dump(int to, void *to_arg, Eterm x)
 			ptr[0] = OUR_NIL;
 		    } else {
 			x = ptr[arity];
-			ptr[0] = (Eterm) COMPRESS_POINTER(next);
+			ptr[0] = (Eterm) next;
 			next = ptr + arity - 1;
 			continue;
 		    }
@@ -617,7 +618,7 @@ erts_dump_extended_process_state(int to, void *to_arg, erts_aint32_t psflg) {
     if (psflg)
         erts_print(to, to_arg, " | ");
 
-    for (i = 0; i < ERTS_PSFLG_MAX && psflg; i++) {
+    for (i = 0; i <= ERTS_PSFLG_MAX && psflg; i++) {
         erts_aint32_t chk = (1 << i);
         if (psflg & chk) {
             switch (chk) {
@@ -657,16 +658,16 @@ erts_dump_extended_process_state(int to, void *to_arg, erts_aint32_t psflg) {
                 erts_print(to, to_arg, "PROXY"); break;
             case ERTS_PSFLG_DELAYED_SYS:
                 erts_print(to, to_arg, "DELAYED_SYS"); break;
-#ifdef ERTS_DIRTY_SCHEDULERS
+            case ERTS_PSFLG_OFF_HEAP_MSGQ:
+                erts_print(to, to_arg, "OFF_HEAP_MSGQ"); break;
+            case ERTS_PSFLG_ON_HEAP_MSGQ:
+                erts_print(to, to_arg, "ON_HEAP_MSGQ"); break;
             case ERTS_PSFLG_DIRTY_CPU_PROC:
                 erts_print(to, to_arg, "DIRTY_CPU_PROC"); break;
             case ERTS_PSFLG_DIRTY_IO_PROC:
                 erts_print(to, to_arg, "DIRTY_IO_PROC"); break;
-            case ERTS_PSFLG_DIRTY_CPU_PROC_IN_Q:
-                erts_print(to, to_arg, "DIRTY_CPU_PROC_IN_Q"); break;
-            case ERTS_PSFLG_DIRTY_IO_PROC_IN_Q:
-                erts_print(to, to_arg, "DIRTY_IO_PROC_IN_Q"); break;
-#endif
+            case ERTS_PSFLG_DIRTY_ACTIVE_SYS:
+                erts_print(to, to_arg, "DIRTY_ACTIVE_SYS"); break;
             default:
                 erts_print(to, to_arg, "UNKNOWN(%d)", chk); break;
             }
diff --git a/erts/emulator/beam/erl_process_lock.h b/erts/emulator/beam/erl_process_lock.h
index a64c993e8f..9c59301086 100644
--- a/erts/emulator/beam/erl_process_lock.h
+++ b/erts/emulator/beam/erl_process_lock.h
@@ -523,6 +523,10 @@ erts_smp_proc_lock__(Process *p,
 
     ERTS_LC_ASSERT((locks & ~ERTS_PROC_LOCKS_ALL) == 0);
 
+#ifdef ERTS_ENABLE_LOCK_CHECK
+    erts_proc_lc_lock(p, locks, file, line);
+#endif
+
     old_lflgs = erts_smp_proc_raw_trylock__(p, locks);
 
     if (old_lflgs != 0) {
@@ -544,9 +548,6 @@ erts_smp_proc_lock__(Process *p,
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_proc_lock_post_x(&(p->lock), locks, file, line);
 #endif
-#ifdef ERTS_ENABLE_LOCK_CHECK
-    erts_proc_lc_lock(p, locks, file, line);
-#endif
 
 #ifdef ERTS_PROC_LOCK_DEBUG
     erts_proc_lock_op_debug(p, locks, 1);
diff --git a/erts/emulator/beam/erl_ptab.c b/erts/emulator/beam/erl_ptab.c
index f7997df051..9ed175fe01 100644
--- a/erts/emulator/beam/erl_ptab.c
+++ b/erts/emulator/beam/erl_ptab.c
@@ -1255,7 +1255,7 @@ ptab_list_bif_engine(Process *c_p, Eterm *res_accp, Binary *mbp)
 	    return 1;
 
 	default:
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "%s:%d:ptab_list_bif_engine(): Invalid state: %d\n",
 		     __FILE__, __LINE__, (int) ptlbdp->state);
 	}
diff --git a/erts/emulator/beam/erl_term.c b/erts/emulator/beam/erl_term.c
index e5050bfaa5..72a1e0b6ec 100644
--- a/erts/emulator/beam/erl_term.c
+++ b/erts/emulator/beam/erl_term.c
@@ -28,94 +28,35 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-__decl_noreturn static void __noreturn
-et_abort(const char *expr, const char *file, unsigned line)
+void
+erts_set_literal_tag(Eterm *term, Eterm *hp_start, Eterm hsz)
 {
-#ifdef EXIT_ON_ET_ABORT
-    static int have_been_called = 0;
+#ifdef TAG_LITERAL_PTR
+    Eterm *hp_end, *hp;
+    
+    hp_end = hp_start + hsz;
+    hp = hp_start;
 
-    if (have_been_called) {
-	abort();
-    } else {
-	/*
-	 * Prevent infinite loop.
-	 */
-	have_been_called = 1;
-	erl_exit(1, "TYPE ASSERTION FAILED, file %s, line %u: %s\n", file, line, expr);
-    }
-#else
-    erts_fprintf(stderr, "TYPE ASSERTION FAILED, file %s, line %u: %s\n", file, line, expr);
-    abort();
-#endif
-}
-
-#if ET_DEBUG
-#define ET_ASSERT(expr,file,line) \
-do { \
-    if (!(expr)) \
-	et_abort(#expr, file, line); \
-} while(0)
-#else
-#define ET_ASSERT(expr,file,line)	do { } while(0)
-#endif
-
-#if ET_DEBUG
-unsigned tag_val_def_debug(Wterm x, const char *file, unsigned line)
-#else
-unsigned tag_val_def(Wterm x)
-#define file __FILE__
-#define line __LINE__
-#endif
-{
-    static char msg[32];
-
-    switch (x & _TAG_PRIMARY_MASK) {
-    case TAG_PRIMARY_LIST:
-	ET_ASSERT(_list_precond(x),file,line);
-	return LIST_DEF;
-      case TAG_PRIMARY_BOXED: {
-	  Eterm hdr = *boxed_val(x);
-	  ET_ASSERT(is_header(hdr),file,line);
-	  switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-	    case (_TAG_HEADER_ARITYVAL >> _TAG_PRIMARY_SIZE):	return TUPLE_DEF;
-	    case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):	return BIG_DEF;
-	    case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):	return BIG_DEF;
-	    case (_TAG_HEADER_REF >> _TAG_PRIMARY_SIZE):	return REF_DEF;
-	    case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):	return FLOAT_DEF;
-	    case (_TAG_HEADER_EXPORT >> _TAG_PRIMARY_SIZE):     return EXPORT_DEF;
-	    case (_TAG_HEADER_FUN >> _TAG_PRIMARY_SIZE):	return FUN_DEF;
-	    case (_TAG_HEADER_EXTERNAL_PID >> _TAG_PRIMARY_SIZE):	return EXTERNAL_PID_DEF;
-	    case (_TAG_HEADER_EXTERNAL_PORT >> _TAG_PRIMARY_SIZE):	return EXTERNAL_PORT_DEF;
-	    case (_TAG_HEADER_EXTERNAL_REF >> _TAG_PRIMARY_SIZE):	return EXTERNAL_REF_DEF;
-	    case (_TAG_HEADER_MAP >> _TAG_PRIMARY_SIZE):	return MAP_DEF;
-	    case (_TAG_HEADER_REFC_BIN >> _TAG_PRIMARY_SIZE):	return BINARY_DEF;
-	    case (_TAG_HEADER_HEAP_BIN >> _TAG_PRIMARY_SIZE):	return BINARY_DEF;
-	    case (_TAG_HEADER_SUB_BIN >> _TAG_PRIMARY_SIZE):	return BINARY_DEF;
-	    case (_TAG_HEADER_BIN_MATCHSTATE >> _TAG_PRIMARY_SIZE): return MATCHSTATE_DEF;
-	  }
- 
-	  break;
-      }
-      case TAG_PRIMARY_IMMED1: {
-	  switch ((x & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-	    case (_TAG_IMMED1_PID >> _TAG_PRIMARY_SIZE):	return PID_DEF;
-	    case (_TAG_IMMED1_PORT >> _TAG_PRIMARY_SIZE):	return PORT_DEF;
-	    case (_TAG_IMMED1_IMMED2 >> _TAG_PRIMARY_SIZE): {
-		switch ((x & _TAG_IMMED2_MASK) >> _TAG_IMMED1_SIZE) {
-		  case (_TAG_IMMED2_ATOM >> _TAG_IMMED1_SIZE):	return ATOM_DEF;
-		  case (_TAG_IMMED2_NIL >> _TAG_IMMED1_SIZE):	return NIL_DEF;
-		}
-		break;
+    while (hp < hp_end) {
+	switch (primary_tag(*hp)) {
+	case TAG_PRIMARY_BOXED:
+	case TAG_PRIMARY_LIST:
+	    *hp |= TAG_LITERAL_PTR;
+	    break;
+	case TAG_PRIMARY_HEADER:
+	    if (header_is_thing(*hp)) {
+		hp += thing_arityval(*hp);
 	    }
-	    case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):	return SMALL_DEF;
-	  }
-	  break;
-      }
+	    break;
+	default:
+	    break;
+	}
+	
+	hp++;
     }
-    erts_snprintf(msg, sizeof(msg), "tag_val_def: %#lx", (unsigned long) x);
-    et_abort(msg, file, line);
-#undef file
-#undef line
+    if (is_boxed(*term) || is_list(*term))
+	*term |= TAG_LITERAL_PTR;
+#endif
 }
 
 /*
@@ -174,9 +115,7 @@ ET_DEFINE_CHECKED(Uint,external_thing_data_words,ExternalThing*,is_thing_ptr);
 ET_DEFINE_CHECKED(Eterm,make_cp,UWord *,_is_taggable_pointer);
 ET_DEFINE_CHECKED(UWord *,cp_val,Eterm,is_CP);
 ET_DEFINE_CHECKED(Uint,catch_val,Eterm,is_catch);
-ET_DEFINE_CHECKED(Uint,x_reg_offset,Uint,_is_xreg);
-ET_DEFINE_CHECKED(Uint,y_reg_offset,Uint,_is_yreg);
-ET_DEFINE_CHECKED(Uint,x_reg_index,Uint,_is_xreg);
-ET_DEFINE_CHECKED(Uint,y_reg_index,Uint,_is_yreg);
+ET_DEFINE_CHECKED(Uint,loader_x_reg_index,Uint,_is_loader_x_reg);
+ET_DEFINE_CHECKED(Uint,loader_y_reg_index,Uint,_is_loader_y_reg);
 
 #endif	/* ET_DEBUG */
diff --git a/erts/emulator/beam/erl_term.h b/erts/emulator/beam/erl_term.h
index d5e91d80d9..0a71534790 100644
--- a/erts/emulator/beam/erl_term.h
+++ b/erts/emulator/beam/erl_term.h
@@ -21,34 +21,10 @@
 #ifndef __ERL_TERM_H
 #define __ERL_TERM_H
 
-#include "sys.h" /* defines HALFWORD_HEAP */
+#include "erl_mmap.h"
 
 typedef UWord Wterm;  /* Full word terms */
 
-#if HALFWORD_HEAP
-#  define HEAP_ON_C_STACK 0
-#  if HALFWORD_ASSERT
-#    ifdef ET_DEBUG
-#      undef ET_DEBUG
-#    endif
-#    define ET_DEBUG 1
-#  endif
-#  if 1
-#    define CHECK_POINTER_MASK 0xFFFFFFFF00000000UL
-#    define COMPRESS_POINTER(APointer) ((Eterm) (UWord) (APointer))
-#    define EXPAND_POINTER(AnEterm) ((UWord) (AnEterm))
-#  else
-#    define CHECK_POINTER_MASK 0x0UL
-#    define COMPRESS_POINTER(AnUint) (AnUint)
-#    define EXPAND_POINTER(APointer) (APointer)
-#  endif
-#else
-#  define HEAP_ON_C_STACK 1
-#  define CHECK_POINTER_MASK 0x0UL
-#  define COMPRESS_POINTER(AnUint) (AnUint)
-#  define EXPAND_POINTER(APointer) (APointer)
-#endif
-
 struct erl_node_; /* Declared in erl_node_tables.h */
 
 /*
@@ -74,6 +50,24 @@ struct erl_node_; /* Declared in erl_node_tables.h */
 #define _ET_APPLY(F,X)	_unchecked_##F(X)
 #endif
 
+#if defined(ARCH_64)
+#  define TAG_PTR_MASK__	0x7
+#  if !defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION)
+#    ifdef HIPE
+#      error Hipe on 64-bit needs a real mmap as it does not support the literal tag
+#    endif
+#    define TAG_LITERAL_PTR	0x4
+#  else
+#    undef TAG_LITERAL_PTR
+#  endif
+#elif defined(ARCH_32)
+#  define TAG_PTR_MASK__	0x3
+#  undef TAG_LITERAL_PTR
+#else
+#  error Not supported arch
+#endif
+
+
 #define _TAG_PRIMARY_SIZE	2
 #define _TAG_PRIMARY_MASK	0x3
 #define TAG_PRIMARY_HEADER	0x0
@@ -190,15 +184,13 @@ struct erl_node_; /* Declared in erl_node_tables.h */
 
 
 /* boxed object access methods */
-#if HALFWORD_HEAP
-#define _is_taggable_pointer(x)	 (((UWord)(x) & (CHECK_POINTER_MASK | 0x3)) == 0)
-#define _boxed_precond(x)        (is_boxed(x))
-#else
-#define _is_taggable_pointer(x)	 (((Uint)(x) & 0x3) == 0)
+
+#define _is_taggable_pointer(x)	 (((Uint)(x) & TAG_PTR_MASK__) == 0)
+
 #define  _boxed_precond(x)       (is_boxed(x))
-#endif
-#define _is_aligned(x)		(((Uint)(x) & 0x3) == 0)
-#define _unchecked_make_boxed(x) ((Uint) COMPRESS_POINTER(x) + TAG_PRIMARY_BOXED)
+
+#define _is_aligned(x)		(((Uint)(x) & TAG_PTR_MASK__) == 0)
+#define _unchecked_make_boxed(x) ((Uint)(x) + TAG_PRIMARY_BOXED)
 _ET_DECLARE_CHECKED(Eterm,make_boxed,const Eterm*)
 #define make_boxed(x)		_ET_APPLY(make_boxed,(x))
 #if 1
@@ -209,12 +201,16 @@ _ET_DECLARE_CHECKED(int,is_boxed,Eterm)
 #else
 #define is_boxed(x)		(((x) & _TAG_PRIMARY_MASK) == TAG_PRIMARY_BOXED)
 #endif
-#define _unchecked_boxed_val(x) ((Eterm*) EXPAND_POINTER(((x) - TAG_PRIMARY_BOXED)))
+#ifdef TAG_LITERAL_PTR
+#define _unchecked_boxed_val(x) _unchecked_ptr_val(x)
+#else
+#define _unchecked_boxed_val(x) ((Eterm*) ((x) - TAG_PRIMARY_BOXED))
+#endif
 _ET_DECLARE_CHECKED(Eterm*,boxed_val,Wterm)
 #define boxed_val(x)		_ET_APPLY(boxed_val,(x))
 
 /* cons cell ("list") access methods */
-#define _unchecked_make_list(x)	((Uint) COMPRESS_POINTER(x) + TAG_PRIMARY_LIST)
+#define _unchecked_make_list(x)	((Uint)(x) + TAG_PRIMARY_LIST)
 _ET_DECLARE_CHECKED(Eterm,make_list,const Eterm*)
 #define make_list(x)		_ET_APPLY(make_list,(x))
 #if 1
@@ -226,12 +222,12 @@ _ET_DECLARE_CHECKED(int,is_not_list,Eterm)
 #define is_list(x)		(((x) & _TAG_PRIMARY_MASK) == TAG_PRIMARY_LIST)
 #define is_not_list(x)		(!is_list((x)))
 #endif
-#if HALFWORD_HEAP
 #define _list_precond(x)        (is_list(x))
+#ifdef TAG_LITERAL_PTR
+#define _unchecked_list_val(x) _unchecked_ptr_val(x)
 #else
-#define _list_precond(x)       (is_list(x))
+#define _unchecked_list_val(x) ((Eterm*) ((x) - TAG_PRIMARY_LIST))
 #endif
-#define _unchecked_list_val(x) ((Eterm*) EXPAND_POINTER((x) - TAG_PRIMARY_LIST))
 _ET_DECLARE_CHECKED(Eterm*,list_val,Wterm)
 #define list_val(x)		_ET_APPLY(list_val,(x))
 
@@ -242,15 +238,22 @@ _ET_DECLARE_CHECKED(Eterm*,list_val,Wterm)
 #define CDR(x)  ((x)[1])
 
 /* generic tagged pointer (boxed or list) access methods */
-#define _unchecked_ptr_val(x)	((Eterm*) EXPAND_POINTER((x) & ~((Uint) 0x3)))
+#define _unchecked_ptr_val(x)	((Eterm*) ((x) & ~((Uint) TAG_PTR_MASK__)))
 #define ptr_val(x)		_unchecked_ptr_val((x))	/*XXX*/
 #define _unchecked_offset_ptr(x,offs)	((x)+((offs)*sizeof(Eterm)))
 #define offset_ptr(x,offs)	_unchecked_offset_ptr(x,offs)	/*XXX*/
 #define _unchecked_byte_offset_ptr(x,byte_offs)	((x)+(offs))
 #define byte_offset_ptr(x,offs) _unchecked_byte_offset_ptr(x,offs)  /*XXX*/
 
+#ifdef TAG_LITERAL_PTR
+#define _unchecked_is_not_literal_ptr(x) (!((x) & TAG_LITERAL_PTR))
+#define is_not_literal_ptr(x) _unchecked_is_not_literal_ptr((x)) /*XXX*/
+#define is_literal_ptr(x) (!is_not_literal_ptr((x))) /*XXX*/
+#endif
+
+
 /* fixnum ("small") access methods */
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 #define SMALL_BITS	(64-4)
 #define SMALL_DIGITS	(17)
 #else
@@ -396,11 +399,7 @@ _ET_DECLARE_CHECKED(Eterm*,fun_val,Wterm)
 _ET_DECLARE_CHECKED(Eterm*,export_val,Wterm)
 #define export_val(x)	_ET_APPLY(export_val,(x))
 #define is_export_header(x)	((x) == HEADER_EXPORT)
-#if HALFWORD_HEAP
-#define HEADER_EXPORT   _make_header(2,_TAG_HEADER_EXPORT)
-#else
 #define HEADER_EXPORT   _make_header(1,_TAG_HEADER_EXPORT)
-#endif
 
 /* bignum access methods */
 #define make_pos_bignum_header(sz)	_make_header((sz),_TAG_HEADER_POS_BIG)
@@ -424,7 +423,7 @@ _ET_DECLARE_CHECKED(Eterm*,big_val,Wterm)
 #define big_val(x)		_ET_APPLY(big_val,(x))
 
 /* flonum ("float") access methods */
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 #define HEADER_FLONUM   _make_header(1,_TAG_HEADER_FLOAT)
 #else
 #define HEADER_FLONUM	_make_header(2,_TAG_HEADER_FLOAT)
@@ -445,12 +444,12 @@ typedef union float_def
     byte   fb[sizeof(ieee754_8)];
     Uint16 fs[sizeof(ieee754_8) / sizeof(Uint16)];
     Uint32 fw[sizeof(ieee754_8) / sizeof(Uint32)];
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
     Uint   fdw;
 #endif
 } FloatDef;
 
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 
 #define FLOAT_VAL_GET_DOUBLE(fval, f) (f).fdw = *((fval)+1)
 
@@ -727,7 +726,7 @@ _ET_DECLARE_CHECKED(struct erl_node_*,internal_port_node,Eterm)
 #define ERTS_MAX_REF_NUMBERS	3
 #define ERTS_REF_NUMBERS	ERTS_MAX_REF_NUMBERS
 
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 #  define ERTS_REF_WORDS	(ERTS_REF_NUMBERS/2 + 1)
 #  define ERTS_REF_32BIT_WORDS  (ERTS_REF_NUMBERS+1)
 #else
@@ -749,7 +748,7 @@ typedef struct {
 #define make_ref_thing_header(DW) \
   _make_header((DW)+REF_THING_HEAD_SIZE-1,_TAG_HEADER_REF)
 
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 
 /*
  * Ref layout on a 64-bit little endian machine:
@@ -1009,27 +1008,20 @@ _ET_DECLARE_CHECKED(struct erl_node_*,external_ref_node,Eterm)
 #define MAP_HEADER_VAL(Hdr)   (((Hdr) >> (_HEADER_ARITY_OFFS + MAP_HEADER_TAG_SZ + MAP_HEADER_ARITY_SZ)) & (0xffff))
 
 #define make_hashmap(x)		      make_boxed((Eterm*)(x))
-#define make_hashmap_rel 	      make_boxed_rel
 #define is_hashmap(x)		      (is_boxed((x)) && is_hashmap_header(*boxed_val((x))))
 #define is_not_hashmap(x)             (!is_hashmap(x))
-#define is_hashmap_rel(RTERM,BASE)    is_hashmap(rterm2wterm(RTERM,BASE))
 #define is_hashmap_header(x)	      (((x) & (_HEADER_MAP_HASHMAP_HEAD_MASK)) == HAMT_SUBTAG_HEAD_ARRAY)
 #define hashmap_val(x)		      _unchecked_boxed_val((x))
-#define hashmap_val_rel(RTERM, BASE)  hashmap_val(rterm2wterm(RTERM, BASE))
 
 #define make_flatmap(x)               make_boxed((Eterm*)(x))
-#define make_flatmap_rel(x, BASE)     make_boxed_rel((Eterm*)(x),(BASE))
 #define is_flatmap(x)                 (is_boxed((x)) && is_flatmap_header(*boxed_val((x))))
-#define is_flatmap_rel(RTERM,BASE)    is_flatmap(rterm2wterm(RTERM,BASE))
 #define is_not_flatmap(x)             (!is_flatmap((x)))
 #define is_flatmap_header(x)          (((x) & (_HEADER_MAP_SUBTAG_MASK)) == HAMT_SUBTAG_HEAD_FLATMAP)
 #define flatmap_val(x)                (_unchecked_boxed_val((x)))
-#define flatmap_val_rel(RTERM, BASE)  flatmap_val(rterm2wterm(RTERM, BASE))
 
 #define is_map_header(x)       (((x) & (_TAG_HEADER_MASK)) == _TAG_HEADER_MAP)
 #define is_map(x)              (is_boxed((x)) && is_map_header(*boxed_val(x)))
 #define is_not_map(x)          (!is_map(x))
-#define is_map_rel(RTERM,BASE) is_map(rterm2wterm(RTERM,BASE))
 
 /* number tests */
 
@@ -1048,14 +1040,14 @@ _ET_DECLARE_CHECKED(struct erl_node_*,external_ref_node,Eterm)
 #error "fix yer arch, like"
 #endif
 
-#define _unchecked_make_cp(x)	((Eterm) COMPRESS_POINTER(x))
+#define _unchecked_make_cp(x)	((Eterm)(x))
 _ET_DECLARE_CHECKED(Eterm,make_cp,BeamInstr*)
 #define make_cp(x)	_ET_APPLY(make_cp,(x))
 
 #define is_not_CP(x)	((x) & _CPMASK)
 #define is_CP(x)	(!is_not_CP(x))
 
-#define _unchecked_cp_val(x)	((BeamInstr*) EXPAND_POINTER(x))
+#define _unchecked_cp_val(x)	((BeamInstr*) (x))
 _ET_DECLARE_CHECKED(BeamInstr*,cp_val,Eterm)
 #define cp_val(x)	_ET_APPLY(cp_val,(x))
 
@@ -1071,44 +1063,40 @@ _ET_DECLARE_CHECKED(Uint,catch_val,Eterm)
 /*
  * Overloaded tags.
  *
- * SMALL = 15
- * ATOM/NIL=7
+ * In the loader, we want to tag a term in a way so that it can
+ * be any literal (atom/integer/float/tuple/list/binary) or a
+ * register.
  *
- * Note that the two least significant bits in SMALL/ATOM/NIL always are 3;
- * thus, we can distinguish register from literals by looking at only these
- * two bits.
+ * We can achive that by overloading the PID and PORT tags to
+ * mean X and Y registers. That works because there are no
+ * pid or port literals.
  */
 
-#define X_REG_DEF	0
-#define Y_REG_DEF	1
-#define R_REG_DEF	2
+#define _LOADER_TAG_XREG _TAG_IMMED1_PID
+#define _LOADER_TAG_YREG _TAG_IMMED1_PORT
+#define _LOADER_TAG_SIZE _TAG_IMMED1_SIZE
+#define _LOADER_MASK _TAG_IMMED1_MASK
 
-#define beam_reg_tag(x)	((x) & 3)
+#define LOADER_X_REG _LOADER_TAG_XREG
+#define LOADER_Y_REG _LOADER_TAG_YREG
 
-#define make_rreg()	R_REG_DEF
-#define make_xreg(ix)	(((ix) * sizeof(Eterm)) | X_REG_DEF)
-#define make_yreg(ix)	(((ix) * sizeof(Eterm)) | Y_REG_DEF)
+#define make_loader_x_reg(R) (((R) << _LOADER_TAG_SIZE) | _LOADER_TAG_XREG)
+#define make_loader_y_reg(R) (((R) << _LOADER_TAG_SIZE) | _LOADER_TAG_YREG)
 
-#define _is_xreg(x)	(beam_reg_tag(x) == X_REG_DEF)
-#define _is_yreg(x)	(beam_reg_tag(x) == Y_REG_DEF)
+#define loader_reg_index(R) ((R) >> _LOADER_TAG_SIZE)
 
-#define _unchecked_x_reg_offset(R)	((R) - X_REG_DEF)
-_ET_DECLARE_CHECKED(Uint,x_reg_offset,Uint)
-#define x_reg_offset(R)	_ET_APPLY(x_reg_offset,(R))
+#define loader_tag(T) ((T) & _LOADER_MASK)
 
-#define _unchecked_y_reg_offset(R)	((R) - Y_REG_DEF)
-_ET_DECLARE_CHECKED(Uint,y_reg_offset,Uint)
-#define y_reg_offset(R)	_ET_APPLY(y_reg_offset,(R))
+#define _is_loader_x_reg(x) (loader_tag(x) == _LOADER_TAG_XREG)
+#define _is_loader_y_reg(x) (loader_tag(x) == _LOADER_TAG_YREG)
 
-#define reg_index(R) ((R) / sizeof(Eterm))
+#define _unchecked_loader_x_reg_index(R) ((R) >> _LOADER_TAG_SIZE)
+_ET_DECLARE_CHECKED(Uint,loader_x_reg_index,Uint)
+#define loader_x_reg_index(R) _ET_APPLY(loader_x_reg_index,(R))
 
-#define _unchecked_x_reg_index(R)	((R) >> 2)
-_ET_DECLARE_CHECKED(Uint,x_reg_index,Uint)
-#define x_reg_index(R)	_ET_APPLY(x_reg_index,(R))
-
-#define _unchecked_y_reg_index(R)	((R) >> 2)
-_ET_DECLARE_CHECKED(Uint,y_reg_index,Uint)
-#define y_reg_index(R)	_ET_APPLY(y_reg_index,(R))
+#define _unchecked_loader_y_reg_index(R)  ((R) >> _LOADER_TAG_SIZE)
+_ET_DECLARE_CHECKED(Uint,loader_y_reg_index,Uint)
+#define loader_y_reg_index(R) _ET_APPLY(loader_y_reg_index,(R))
 
 /*
  * Backwards compatibility definitions:
@@ -1141,11 +1129,11 @@ _ET_DECLARE_CHECKED(Uint,y_reg_index,Uint)
 #define FIRST_VACANT_TAG_DEF    0x12
 
 #if ET_DEBUG
-extern unsigned tag_val_def_debug(Wterm, const char*, unsigned);
-#define tag_val_def(x)	tag_val_def_debug((x),__FILE__,__LINE__)
+ERTS_GLB_INLINE unsigned tag_val_def(Wterm, const char*, unsigned);
 #else
-extern unsigned tag_val_def(Wterm);
+ERTS_GLB_INLINE unsigned tag_val_def(Wterm);
 #endif
+
 #define not_eq_tags(X,Y)	(tag_val_def((X)) ^ tag_val_def((Y)))
 
 #define NUMBER_CODE(x,y)	((tag_val_def(x) << 5) | tag_val_def(y))
@@ -1160,81 +1148,83 @@ extern unsigned tag_val_def(Wterm);
 #define FLOAT_BIG 	_NUMBER_CODE(FLOAT_DEF,BIG_DEF)
 #define FLOAT_FLOAT	_NUMBER_CODE(FLOAT_DEF,FLOAT_DEF)
 
-#if HALFWORD_HEAP
-#define ptr2rel(PTR,BASE) ((Eterm*)((char*)(PTR) - (char*)(BASE)))
-#define rterm2wterm(REL,BASE) ((Wterm)(REL) + (Wterm)(BASE))
-
-#else /* HALFWORD_HEAP */
-
-#define ptr2rel(PTR,BASE) (PTR)
-#define rterm2wterm(REL,BASE) (REL)
-
-#endif /* !HALFWORD_HEAP */
-
-#define make_list_rel(PTR, BASE) make_list(ptr2rel(PTR,BASE))
-#define make_boxed_rel(PTR, BASE) make_boxed(ptr2rel(PTR,BASE))
-#define make_fun_rel make_boxed_rel
-#define make_binary_rel make_boxed_rel
-#define make_tuple_rel make_boxed_rel
-#define make_external_rel make_boxed_rel
-#define make_internal_ref_rel make_boxed_rel
-#define make_big_rel make_boxed_rel
-
-#define binary_val_rel(RTERM, BASE) binary_val(rterm2wterm(RTERM, BASE))
-#define list_val_rel(RTERM, BASE) list_val(rterm2wterm(RTERM, BASE))
-#define boxed_val_rel(RTERM, BASE) boxed_val(rterm2wterm(RTERM, BASE))
-#define tuple_val_rel(RTERM, BASE) tuple_val(rterm2wterm(RTERM, BASE))
-#define export_val_rel(RTERM, BASE) export_val(rterm2wterm(RTERM, BASE))
-#define fun_val_rel(RTERM, BASE) fun_val(rterm2wterm(RTERM, BASE))
-#define big_val_rel(RTERM,BASE)	big_val(rterm2wterm(RTERM,BASE))
-#define float_val_rel(RTERM,BASE) float_val(rterm2wterm(RTERM,BASE))
-#define internal_ref_val_rel(RTERM,BASE) internal_ref_val(rterm2wterm(RTERM,BASE))
-
-#define external_thing_ptr_rel(RTERM, BASE) external_thing_ptr(rterm2wterm(RTERM, BASE))
-#define external_data_words_rel(RTERM,BASE) external_data_words(rterm2wterm(RTERM,BASE))
-
-#define external_port_node_rel(RTERM,BASE) external_port_node(rterm2wterm(RTERM,BASE))
-#define external_port_data_rel(RTERM,BASE) external_port_data(rterm2wterm(RTERM,BASE))
-
-#define is_external_pid_rel(RTERM,BASE) is_external_pid(rterm2wterm(RTERM,BASE))
-#define external_pid_node_rel(RTERM,BASE) external_pid_node(rterm2wterm(RTERM,BASE))
-#define external_pid_data_rel(RTERM,BASE) external_pid_data(rterm2wterm(RTERM,BASE))
-
-#define is_binary_rel(RTERM,BASE) is_binary(rterm2wterm(RTERM,BASE))
-#define is_float_rel(RTERM,BASE) is_float(rterm2wterm(RTERM,BASE))
-#define is_fun_rel(RTERM,BASE) is_fun(rterm2wterm(RTERM,BASE))
-#define is_big_rel(RTERM,BASE) is_big(rterm2wterm(RTERM,BASE))
-#define is_export_rel(RTERM,BASE) is_export(rterm2wterm(RTERM,BASE))
-#define is_tuple_rel(RTERM,BASE) is_tuple(rterm2wterm(RTERM,BASE))
+#define is_same(A,B) ((A)==(B))
 
-#define GET_DOUBLE_REL(RTERM, f, BASE) GET_DOUBLE(rterm2wterm(RTERM,BASE), f)
+void erts_set_literal_tag(Eterm *term, Eterm *hp_start, Eterm hsz);
 
-#define ref_thing_ptr_rel(RTERM,BASE) ref_thing_ptr(rterm2wterm(RTERM,BASE))
-#define is_internal_ref_rel(RTERM,BASE) is_internal_ref(rterm2wterm(RTERM,BASE))
-#define is_external_rel(RTERM,BASE) is_external(rterm2wterm(RTERM,BASE))
-#define is_external_port_rel(RTERM,BASE) is_external_port(rterm2wterm(RTERM,BASE))
-#define is_external_ref_rel(RTERM,BASE) is_external_ref(rterm2wterm(RTERM,BASE))
-
-#define external_node_rel(RTERM,BASE) external_node(rterm2wterm(RTERM,BASE))
-
-
-#if HALFWORD_HEAP
-ERTS_GLB_INLINE int is_same(Eterm a, Eterm* a_base, Eterm b, Eterm* b_base);
+#if ET_DEBUG
+#define ET_ASSERT(expr,file,line) \
+do { \
+    if (!(expr)) \
+	erl_assert_error("TYPE ASSERTION: " #expr, __FUNCTION__, file, line); \
+} while(0)
+#else
+#define ET_ASSERT(expr,file,line)	do { } while(0)
+#endif
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
-ERTS_GLB_INLINE int is_same(Eterm a, Eterm* a_base, Eterm b, Eterm* b_base)
-{
-    /* If bases differ, assume a and b are on different "heaps",
-       ie can only be same if immed */
-    ASSERT(a_base == b_base || is_immed(a) || is_immed(b)
-	   || rterm2wterm(a,a_base) != rterm2wterm(b,b_base));
 
-    return a == b && (a_base == b_base || is_immed(a));
+#if ET_DEBUG
+ERTS_GLB_INLINE unsigned tag_val_def(Wterm x, const char *file, unsigned line)
+#else
+ERTS_GLB_INLINE unsigned tag_val_def(Wterm x)
+#define file __FILE__
+#define line __LINE__
+#endif
+{
+    static char *msg = "tag_val_def error";
+
+    switch (x & _TAG_PRIMARY_MASK) {
+    case TAG_PRIMARY_LIST:
+	ET_ASSERT(_list_precond(x),file,line);
+	return LIST_DEF;
+      case TAG_PRIMARY_BOXED: {
+	  Eterm hdr = *boxed_val(x);
+	  ET_ASSERT(is_header(hdr),file,line);
+	  switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
+	    case (_TAG_HEADER_ARITYVAL >> _TAG_PRIMARY_SIZE):	return TUPLE_DEF;
+	    case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):	return BIG_DEF;
+	    case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):	return BIG_DEF;
+	    case (_TAG_HEADER_REF >> _TAG_PRIMARY_SIZE):	return REF_DEF;
+	    case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):	return FLOAT_DEF;
+	    case (_TAG_HEADER_EXPORT >> _TAG_PRIMARY_SIZE):     return EXPORT_DEF;
+	    case (_TAG_HEADER_FUN >> _TAG_PRIMARY_SIZE):	return FUN_DEF;
+	    case (_TAG_HEADER_EXTERNAL_PID >> _TAG_PRIMARY_SIZE):	return EXTERNAL_PID_DEF;
+	    case (_TAG_HEADER_EXTERNAL_PORT >> _TAG_PRIMARY_SIZE):	return EXTERNAL_PORT_DEF;
+	    case (_TAG_HEADER_EXTERNAL_REF >> _TAG_PRIMARY_SIZE):	return EXTERNAL_REF_DEF;
+	    case (_TAG_HEADER_MAP >> _TAG_PRIMARY_SIZE):	return MAP_DEF;
+	    case (_TAG_HEADER_REFC_BIN >> _TAG_PRIMARY_SIZE):	return BINARY_DEF;
+	    case (_TAG_HEADER_HEAP_BIN >> _TAG_PRIMARY_SIZE):	return BINARY_DEF;
+	    case (_TAG_HEADER_SUB_BIN >> _TAG_PRIMARY_SIZE):	return BINARY_DEF;
+	    case (_TAG_HEADER_BIN_MATCHSTATE >> _TAG_PRIMARY_SIZE): return MATCHSTATE_DEF;
+	  }
+
+	  break;
+      }
+      case TAG_PRIMARY_IMMED1: {
+	  switch ((x & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
+	    case (_TAG_IMMED1_PID >> _TAG_PRIMARY_SIZE):	return PID_DEF;
+	    case (_TAG_IMMED1_PORT >> _TAG_PRIMARY_SIZE):	return PORT_DEF;
+	    case (_TAG_IMMED1_IMMED2 >> _TAG_PRIMARY_SIZE): {
+		switch ((x & _TAG_IMMED2_MASK) >> _TAG_IMMED1_SIZE) {
+		  case (_TAG_IMMED2_ATOM >> _TAG_IMMED1_SIZE):	return ATOM_DEF;
+		  case (_TAG_IMMED2_NIL >> _TAG_IMMED1_SIZE):	return NIL_DEF;
+		}
+		break;
+	    }
+	    case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):	return SMALL_DEF;
+	  }
+	  break;
+      }
+    }
+    erl_assert_error(msg, __FUNCTION__, file, line);
+#undef file
+#undef line
 }
 #endif
 
-#else /* !HALFWORD_HEAP */
-#define is_same(A,A_BASE,B,B_BASE) ((A)==(B))
+#if ET_DEBUG
+#define tag_val_def(X) tag_val_def(X, __FILE__, __LINE__)
 #endif
 
 #endif	/* __ERL_TERM_H */
diff --git a/erts/emulator/beam/erl_thr_progress.c b/erts/emulator/beam/erl_thr_progress.c
index 7148b756e7..7b06fd840f 100644
--- a/erts/emulator/beam/erl_thr_progress.c
+++ b/erts/emulator/beam/erl_thr_progress.c
@@ -502,7 +502,7 @@ erts_thr_progress_register_unmanaged_thread(ErtsThrPrgrCallbacks *callbacks)
 
     if (tpd) {
 	if (!tpd->is_temporary)
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "%s:%d:%s(): Double register of thread\n",
 		     __FILE__, __LINE__, __func__);
 	is_blocking = tpd->is_blocking;
@@ -524,7 +524,7 @@ erts_thr_progress_register_unmanaged_thread(ErtsThrPrgrCallbacks *callbacks)
 #endif
     ASSERT(tpd->id >= 0);
     if (tpd->id >= intrnl->unmanaged.no)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "%s:%d:%s(): Too many unmanaged registered threads\n",
 		 __FILE__, __LINE__, __func__);
 
@@ -547,7 +547,7 @@ erts_thr_progress_register_managed_thread(ErtsSchedulerData *esdp,
 
     if (tpd) {
 	if (!tpd->is_temporary)
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "%s:%d:%s(): Double register of thread\n",
 		     __FILE__, __LINE__, __func__);
 	is_blocking = tpd->is_blocking;
@@ -568,7 +568,7 @@ erts_thr_progress_register_managed_thread(ErtsSchedulerData *esdp,
 	tpd->id = erts_atomic32_inc_read_nob(&intrnl->misc.data.managed_id);
     ASSERT(tpd->id >= 0);
     if (tpd->id >= intrnl->managed.no)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "%s:%d:%s(): Too many managed registered threads\n",
 		 __FILE__, __LINE__, __func__);
 
@@ -1033,7 +1033,7 @@ has_reached_wakeup(ErtsThrPrgrVal wakeup)
 	    limit += 1;
 
 	if (!erts_thr_progress_has_passed__(limit, wakeup))
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "Invalid wakeup request value found:"
 		     " current=%b64u, wakeup=%b64u, limit=%b64u",
 		     current, wakeup, limit);
@@ -1102,7 +1102,7 @@ request_wakeup_managed(ErtsThrPrgrData *tpd, ErtsThrPrgrVal value)
     ix = erts_atomic32_inc_read_nob(&mwd->len) - 1;
 #if ERTS_THR_PRGR_DBG_CHK_WAKEUP_REQUEST_VALUE
     if (ix >= intrnl->managed.no)
-	erl_exit(ERTS_ABORT_EXIT, "Internal error: Too many wakeup requests\n");
+	erts_exit(ERTS_ABORT_EXIT, "Internal error: Too many wakeup requests\n");
 #endif
     mwd->id[ix] = tpd->id;
 
diff --git a/erts/emulator/beam/erl_thr_queue.c b/erts/emulator/beam/erl_thr_queue.c
index 3a91ca9dbe..30c9d70c59 100644
--- a/erts/emulator/beam/erl_thr_queue.c
+++ b/erts/emulator/beam/erl_thr_queue.c
@@ -224,7 +224,7 @@ ErtsThrQCleanState_t
 erts_thr_q_destroy(ErtsThrQ_t *q)
 {
     if (!q->q.blk)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "Trying to destroy not created thread queue\n");
     return erts_thr_q_finalize(q);
 }
@@ -589,7 +589,7 @@ enqueue(ErtsThrQ_t *q, void *data, ErtsThrQElement_t *this)
 
 #if ERTS_THR_Q_DBG_CHK_DATA
     if (!data)
-	erl_exit(ERTS_ABORT_EXIT, "Missing data in enqueue\n");
+	erts_exit(ERTS_ABORT_EXIT, "Missing data in enqueue\n");
 #endif
 
     ASSERT(!q->q.finalizing);
@@ -771,7 +771,7 @@ erts_thr_q_dequeue(ErtsThrQ_t *q)
 #if ERTS_THR_Q_DBG_CHK_DATA
     head->data.ptr = NULL;
     if (!res)
-	erl_exit(ERTS_ABORT_EXIT, "Missing data in dequeue\n");
+	erts_exit(ERTS_ABORT_EXIT, "Missing data in dequeue\n");
 #endif
     clean(q,
 	  (q->head.deq_fini.automatic
@@ -780,3 +780,35 @@ erts_thr_q_dequeue(ErtsThrQ_t *q)
     return res;
 #endif
 }
+
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+int
+erts_thr_q_length_dirty(ErtsThrQ_t *q)
+{
+    int n = 0;
+#ifndef USE_THREADS
+    void *res;
+    ErtsThrQElement_t *tmp;
+
+    for (tmp = q->first; tmp != NULL; tmp = tmp->next) {
+        n++;
+    }
+#else
+    ErtsThrQElement_t *e;
+    erts_aint_t inext;
+
+    e = ErtsThrQDirtyReadEl(&q->head.head);
+    inext = erts_atomic_read_acqb(&e->next);
+
+    while (inext != ERTS_AINT_NULL) {
+        e = (ErtsThrQElement_t *) inext;
+        if (e != &q->tail.data.marker) {
+            /* don't count marker */
+            n++;
+        }
+        inext = erts_atomic_read_acqb(&e->next);
+    }
+#endif
+    return n;
+}
+#endif
diff --git a/erts/emulator/beam/erl_thr_queue.h b/erts/emulator/beam/erl_thr_queue.h
index 27a6d03224..f5e5522948 100644
--- a/erts/emulator/beam/erl_thr_queue.h
+++ b/erts/emulator/beam/erl_thr_queue.h
@@ -190,6 +190,10 @@ void erts_thr_q_append_finalize_dequeue_data(ErtsThrQFinDeQ_t *,
 int erts_thr_q_finalize_dequeue(ErtsThrQFinDeQ_t *);
 void erts_thr_q_finalize_dequeue_state_init(ErtsThrQFinDeQ_t *);
 
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+int erts_thr_q_length_dirty(ErtsThrQ_t *);
+#endif
+
 #ifdef ERTS_SMP
 ERTS_GLB_INLINE ErtsThrPrgrVal erts_thr_q_need_thr_progress(ErtsThrQ_t *q);
 #endif
diff --git a/erts/emulator/beam/erl_threads.h b/erts/emulator/beam/erl_threads.h
index 34f91e2ec8..e689547d1d 100644
--- a/erts/emulator/beam/erl_threads.h
+++ b/erts/emulator/beam/erl_threads.h
@@ -2056,6 +2056,8 @@ erts_atomic64_read_dirty(erts_atomic64_t *var)
 
 #endif /* !USE_THREADS */
 
+#include "erl_msacc.h"
+
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
 ERTS_GLB_INLINE void
@@ -2414,6 +2416,7 @@ erts_cnd_wait(erts_cnd_t *cnd, erts_mtx_t *mtx)
 {
 #ifdef USE_THREADS
     int res;
+    ERTS_MSACC_PUSH_AND_SET_STATE(ERTS_MSACC_STATE_SLEEP);
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_unlock(&mtx->lc);
 #endif
@@ -2432,6 +2435,7 @@ erts_cnd_wait(erts_cnd_t *cnd, erts_mtx_t *mtx)
 #endif
     if (res != 0 && res != EINTR)
 	erts_thr_fatal_error(res, "wait on condition variable");
+    ERTS_MSACC_POP_STATE();
 #endif
 }
 
@@ -3488,7 +3492,11 @@ ERTS_GLB_INLINE void erts_tse_reset(erts_tse_t *ep)
 ERTS_GLB_INLINE int erts_tse_wait(erts_tse_t *ep)
 {
 #ifdef USE_THREADS
-    return ethr_event_wait(&((ethr_ts_event *) ep)->event);
+    int res;
+    ERTS_MSACC_PUSH_AND_SET_STATE(ERTS_MSACC_STATE_SLEEP);
+    res = ethr_event_wait(&((ethr_ts_event *) ep)->event);
+    ERTS_MSACC_POP_STATE();
+    return res;
 #else
     return ENOTSUP;
 #endif
@@ -3497,7 +3505,11 @@ ERTS_GLB_INLINE int erts_tse_wait(erts_tse_t *ep)
 ERTS_GLB_INLINE int erts_tse_swait(erts_tse_t *ep, int spincount)
 {
 #ifdef USE_THREADS
-    return ethr_event_swait(&((ethr_ts_event *) ep)->event, spincount);
+    int res;
+    ERTS_MSACC_PUSH_AND_SET_STATE(ERTS_MSACC_STATE_SLEEP);
+    res = ethr_event_swait(&((ethr_ts_event *) ep)->event, spincount);
+    ERTS_MSACC_POP_STATE();
+    return res;
 #else
     return ENOTSUP;
 #endif
@@ -3506,8 +3518,12 @@ ERTS_GLB_INLINE int erts_tse_swait(erts_tse_t *ep, int spincount)
 ERTS_GLB_INLINE int erts_tse_twait(erts_tse_t *ep, Sint64 tmo)
 {
 #ifdef USE_THREADS
-    return ethr_event_twait(&((ethr_ts_event *) ep)->event,
-			    (ethr_sint64_t) tmo);
+    int res;
+    ERTS_MSACC_PUSH_AND_SET_STATE(ERTS_MSACC_STATE_SLEEP);
+    res = ethr_event_twait(&((ethr_ts_event *) ep)->event,
+                           (ethr_sint64_t) tmo);
+    ERTS_MSACC_POP_STATE();
+    return res;
 #else
     return ENOTSUP;
 #endif
@@ -3516,9 +3532,13 @@ ERTS_GLB_INLINE int erts_tse_twait(erts_tse_t *ep, Sint64 tmo)
 ERTS_GLB_INLINE int erts_tse_stwait(erts_tse_t *ep, int spincount, Sint64 tmo)
 {
 #ifdef USE_THREADS
-    return ethr_event_stwait(&((ethr_ts_event *) ep)->event,
-			     spincount,
-			     (ethr_sint64_t) tmo);
+    int res;
+    ERTS_MSACC_PUSH_AND_SET_STATE(ERTS_MSACC_STATE_SLEEP);
+    res = ethr_event_stwait(&((ethr_ts_event *) ep)->event,
+                            spincount,
+                            (ethr_sint64_t) tmo);
+    ERTS_MSACC_POP_STATE();
+    return res;
 #else
     return ENOTSUP;
 #endif
diff --git a/erts/emulator/beam/erl_time.h b/erts/emulator/beam/erl_time.h
index 43e543e035..5242063550 100644
--- a/erts/emulator/beam/erl_time.h
+++ b/erts/emulator/beam/erl_time.h
@@ -133,11 +133,17 @@ typedef struct {
 
 extern ErtsTimeSupData erts_time_sup__;
 
+ErtsMonotonicTime erts_napi_monotonic_time(int time_unit);
+ErtsMonotonicTime erts_napi_time_offset(int time_unit);
+ErtsMonotonicTime erts_napi_convert_time_unit(ErtsMonotonicTime val, int from, int to);
+
 ERTS_GLB_INLINE Uint64
 erts_time_unit_conversion(Uint64 value,
 			  Uint32 from_time_unit,
 			  Uint32 to_time_unit);
 
+ErtsSysPerfCounter erts_perf_counter_unit(void);
+
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
 ERTS_GLB_INLINE Uint64
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c
index 7327e0b48c..f3f528eaf6 100644
--- a/erts/emulator/beam/erl_time_sup.c
+++ b/erts/emulator/beam/erl_time_sup.c
@@ -33,6 +33,8 @@
 #include "global.h"
 #define ERTS_WANT_TIMER_WHEEL_API
 #include "erl_time.h"
+#include "erl_driver.h"
+#include "erl_nif.h"
  
 static erts_smp_mtx_t erts_timeofday_mtx;
 static erts_smp_mtx_t erts_get_time_mtx;
@@ -57,6 +59,7 @@ static int time_sup_initialized = 0;
 #define ERTS_MONOTONIC_TIME_TERA \
     (ERTS_MONOTONIC_TIME_GIGA*ERTS_MONOTONIC_TIME_KILO)
 
+static void init_time_napi(void);
 static void
 schedule_send_time_offset_changed_notifications(ErtsMonotonicTime new_offset);
 
@@ -286,7 +289,7 @@ read_corrected_time(int os_drift_corrected)
 	ci = time_sup.inf.c.parmon.cdata.insts.curr;
     else {
 	if (os_mtime < time_sup.inf.c.parmon.cdata.insts.prev.os_mtime)
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "OS monotonic time stepped backwards\n");
 	ci = time_sup.inf.c.parmon.cdata.insts.prev;
     }
@@ -378,7 +381,7 @@ check_time_correction(void *vesdp)
     erts_smp_rwmtx_runlock(&time_sup.inf.c.parmon.rwmtx);
 
     if (os_mtime < ci.os_mtime)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "OS monotonic time stepped backwards\n");
 
     erl_mtime = calc_corrected_erl_mtime(os_mtime, &ci, &mdiff,
@@ -795,7 +798,7 @@ finalize_corrected_time_offset(ErtsSystemTime *stimep)
     erts_smp_rwmtx_runlock(&time_sup.inf.c.parmon.rwmtx);
 
     if (os_mtime < ci.os_mtime)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "OS monotonic time stepped backwards\n");
 
     return calc_corrected_erl_mtime(os_mtime, &ci, NULL,
@@ -948,6 +951,8 @@ erts_init_time_sup(int time_correction, ErtsTimeWarpMode time_warp_mode)
     ErtsMonotonicTime abs_native_offset, native_offset;
 #endif
 
+    init_time_napi();
+
     erts_hl_timer_init();
 
     ASSERT(ERTS_MONOTONIC_TIME_MIN < ERTS_MONOTONIC_TIME_MAX);
@@ -1744,7 +1749,40 @@ erts_get_monotonic_time(ErtsSchedulerData *esdp)
 {
     ErtsMonotonicTime mtime = time_sup.r.o.get_time();
     update_last_mtime(esdp, mtime);
-    return mtime;    
+    return mtime;
+}
+
+ErtsMonotonicTime
+erts_get_time_offset(void)
+{
+    return get_time_offset();
+}
+
+static ERTS_INLINE void
+make_timestamp_value(Uint* megasec, Uint* sec, Uint* microsec,
+		     ErtsMonotonicTime mtime, ErtsMonotonicTime offset)
+{
+    ErtsMonotonicTime stime, as;
+    Uint ms;
+
+    stime = ERTS_MONOTONIC_TO_USEC(mtime + offset);
+
+    as = stime / ERTS_MONOTONIC_TIME_MEGA;
+    *megasec = ms = (Uint) (stime / ERTS_MONOTONIC_TIME_TERA);
+    *sec = (Uint) (as - (((ErtsMonotonicTime) ms)
+			 * ERTS_MONOTONIC_TIME_MEGA));
+    *microsec = (Uint) (stime - as*ERTS_MONOTONIC_TIME_MEGA);
+
+    ASSERT(((ErtsMonotonicTime) ms)*ERTS_MONOTONIC_TIME_TERA
+	   + ((ErtsMonotonicTime) *sec)*ERTS_MONOTONIC_TIME_MEGA
+	   + *microsec == stime);
+}
+
+void
+erts_make_timestamp_value(Uint* megasec, Uint* sec, Uint* microsec,
+			  ErtsMonotonicTime mtime, ErtsMonotonicTime offset)
+{
+    make_timestamp_value(megasec, sec, microsec, mtime, offset);
 }
 
 void
@@ -1919,15 +1957,16 @@ send_time_offset_changed_notifications(void *new_offsetp)
 		ErtsProcLocks rp_locks = ERTS_PROC_LOCK_LINK;
 		erts_smp_proc_lock(rp, ERTS_PROC_LOCK_LINK);
 		if (erts_lookup_monitor(ERTS_P_MONITORS(rp), ref)) {
-		    ErlHeapFragment *bp;
+		    ErtsMessage *mp;
 		    ErlOffHeap *ohp;
 		    Eterm message;
 
-		    hp = erts_alloc_message_heap(hsz, &bp, &ohp, rp, &rp_locks);
+		    mp = erts_alloc_message_heap(rp, &rp_locks,
+						 hsz, &hp, &ohp);
 		    *patch_refp = ref;
 		    ASSERT(hsz == size_object(message_template));
 		    message = copy_struct(message_template, hsz, &hp, ohp);
-		    erts_queue_message(rp, &rp_locks, bp, message, NIL);
+		    erts_queue_message(rp, &rp_locks, mp, message, NIL);
 		}
 		erts_smp_proc_unlock(rp, rp_locks);
 	    }
@@ -2164,6 +2203,146 @@ time_unit_conversion(Process *c_p, Eterm term, ErtsMonotonicTime val, ErtsMonoto
     return ret;
 }
 
+
+/*
+ * Time Native API (drivers and NIFs)
+ */
+
+#define ERTS_NAPI_TIME_ERROR ((ErtsMonotonicTime) ERTS_NAPI_TIME_ERROR__)
+
+static void
+init_time_napi(void)
+{
+    /* Verify that time native api constants are as expected... */
+
+    ASSERT(sizeof(ErtsMonotonicTime) == sizeof(ErlDrvTime));
+    ASSERT(ERL_DRV_TIME_ERROR == (ErlDrvTime) ERTS_NAPI_TIME_ERROR);
+    ASSERT(ERL_DRV_TIME_ERROR < (ErlDrvTime) 0);
+    ASSERT(ERTS_NAPI_SEC__ == (int) ERL_DRV_SEC);
+    ASSERT(ERTS_NAPI_MSEC__ == (int) ERL_DRV_MSEC);
+    ASSERT(ERTS_NAPI_USEC__ == (int) ERL_DRV_USEC);
+    ASSERT(ERTS_NAPI_NSEC__ == (int) ERL_DRV_NSEC);
+
+    ASSERT(sizeof(ErtsMonotonicTime) == sizeof(ErlNifTime));
+    ASSERT(ERL_NIF_TIME_ERROR == (ErlNifTime) ERTS_NAPI_TIME_ERROR);
+    ASSERT(ERL_NIF_TIME_ERROR < (ErlNifTime) 0);
+    ASSERT(ERTS_NAPI_SEC__ == (int) ERL_NIF_SEC);
+    ASSERT(ERTS_NAPI_MSEC__ == (int) ERL_NIF_MSEC);
+    ASSERT(ERTS_NAPI_USEC__ == (int) ERL_NIF_USEC);
+    ASSERT(ERTS_NAPI_NSEC__ == (int) ERL_NIF_NSEC);
+}
+
+ErtsMonotonicTime
+erts_napi_monotonic_time(int time_unit)
+{
+    ErtsSchedulerData *esdp;
+    ErtsMonotonicTime mtime;
+
+    /* At least for now only allow schedulers to do this... */
+    esdp = erts_get_scheduler_data();
+    if (!esdp)
+	return ERTS_NAPI_TIME_ERROR;
+
+    mtime = time_sup.r.o.get_time();
+    update_last_mtime(esdp, mtime);
+
+    switch (time_unit) {
+    case ERTS_NAPI_SEC__:
+	mtime = ERTS_MONOTONIC_TO_SEC(mtime);
+	mtime += ERTS_MONOTONIC_OFFSET_SEC;
+	break;
+    case ERTS_NAPI_MSEC__:
+	mtime = ERTS_MONOTONIC_TO_MSEC(mtime);
+	mtime += ERTS_MONOTONIC_OFFSET_MSEC;
+	break;
+    case ERTS_NAPI_USEC__:
+	mtime = ERTS_MONOTONIC_TO_USEC(mtime);
+	mtime += ERTS_MONOTONIC_OFFSET_USEC;
+	break;
+    case ERTS_NAPI_NSEC__:
+	mtime = ERTS_MONOTONIC_TO_NSEC(mtime);
+	mtime += ERTS_MONOTONIC_OFFSET_NSEC;
+	break;
+    default:
+	return ERTS_NAPI_TIME_ERROR;
+    }
+
+    return mtime;
+}
+
+ErtsMonotonicTime
+erts_napi_time_offset(int time_unit)
+{
+    ErtsSchedulerData *esdp;
+    ErtsSystemTime offs;
+
+    /* At least for now only allow schedulers to do this... */
+    esdp = erts_get_scheduler_data();
+    if (!esdp)
+	return ERTS_NAPI_TIME_ERROR;
+
+    offs = get_time_offset();
+    switch (time_unit) {
+    case ERTS_NAPI_SEC__:
+	offs = ERTS_MONOTONIC_TO_SEC(offs);
+	offs -= ERTS_MONOTONIC_OFFSET_SEC;
+	break;
+    case ERTS_NAPI_MSEC__:
+	offs = ERTS_MONOTONIC_TO_MSEC(offs);
+	offs -= ERTS_MONOTONIC_OFFSET_MSEC;
+	break;
+    case ERTS_NAPI_USEC__:
+	offs = ERTS_MONOTONIC_TO_USEC(offs);
+	offs -= ERTS_MONOTONIC_OFFSET_USEC;
+	break;
+    case ERTS_NAPI_NSEC__:
+	offs = ERTS_MONOTONIC_TO_NSEC(offs);
+	offs -= ERTS_MONOTONIC_OFFSET_NSEC;
+	break;
+    default:
+	return ERTS_NAPI_TIME_ERROR;
+    }
+    return offs;
+}
+
+ErtsMonotonicTime
+erts_napi_convert_time_unit(ErtsMonotonicTime val, int from, int to)
+{
+    ErtsMonotonicTime ffreq, tfreq, denom;
+    /*
+     * Convertion between time units using floor function.
+     *
+     * Note that this needs to work also for negative
+     * values. Ordinary integer division on a negative
+     * value will give ceiling...
+     */
+
+    switch ((int) from) {
+    case ERTS_NAPI_SEC__: ffreq = 1; break;
+    case ERTS_NAPI_MSEC__: ffreq = 1000; break;
+    case ERTS_NAPI_USEC__: ffreq = 1000*1000; break;
+    case ERTS_NAPI_NSEC__: ffreq = 1000*1000*1000; break;
+    default: return ERTS_NAPI_TIME_ERROR;
+    }
+
+    switch ((int) to) {
+    case ERTS_NAPI_SEC__: tfreq = 1; break;
+    case ERTS_NAPI_MSEC__: tfreq = 1000; break;
+    case ERTS_NAPI_USEC__: tfreq = 1000*1000; break;
+    case ERTS_NAPI_NSEC__: tfreq = 1000*1000*1000; break;
+    default: return ERTS_NAPI_TIME_ERROR;
+    }
+
+    if (tfreq >= ffreq)
+	return val * (tfreq / ffreq);
+
+    denom = ffreq / tfreq;
+    if (val >= 0)
+	return val / denom;
+
+    return (val - (denom - 1)) / denom;
+}
+
 /* Built in functions */
 
 BIF_RETTYPE monotonic_time_0(BIF_ALIST_0)
@@ -2220,22 +2399,14 @@ BIF_RETTYPE time_offset_1(BIF_ALIST_1)
 BIF_RETTYPE timestamp_0(BIF_ALIST_0)
 {
     Eterm *hp, res;
-    ErtsMonotonicTime stime, mtime, all_sec, offset;
+    ErtsMonotonicTime mtime, offset;
     Uint mega_sec, sec, micro_sec;
 
     mtime = time_sup.r.o.get_time();
     offset = get_time_offset();
     update_last_mtime(ERTS_PROC_GET_SCHDATA(BIF_P), mtime);
-    stime = ERTS_MONOTONIC_TO_USEC(mtime + offset);
-    all_sec = stime / ERTS_MONOTONIC_TIME_MEGA;
-    mega_sec = (Uint) (stime / ERTS_MONOTONIC_TIME_TERA);
-    sec = (Uint) (all_sec - (((ErtsMonotonicTime) mega_sec)
-			     * ERTS_MONOTONIC_TIME_MEGA));
-    micro_sec = (Uint) (stime - all_sec*ERTS_MONOTONIC_TIME_MEGA);
 
-    ASSERT(((ErtsMonotonicTime) mega_sec)*ERTS_MONOTONIC_TIME_TERA
-	   + ((ErtsMonotonicTime) sec)*ERTS_MONOTONIC_TIME_MEGA
-	   + micro_sec == stime);
+    make_timestamp_value(&mega_sec, &sec, &micro_sec, mtime, offset);
 
     /*
      * Mega seconds is the only value that potentially
@@ -2264,9 +2435,19 @@ BIF_RETTYPE os_system_time_0(BIF_ALIST_0)
     BIF_RET(make_time_val(BIF_P, stime));
 }
 
-BIF_RETTYPE os_system_time_1(BIF_ALIST_0)
+BIF_RETTYPE os_system_time_1(BIF_ALIST_1)
 {
     ErtsSystemTime stime = erts_os_system_time();
     BIF_RET(time_unit_conversion(BIF_P, BIF_ARG_1, stime, 0));
 }
 
+BIF_RETTYPE
+os_perf_counter_0(BIF_ALIST_0)
+{
+    BIF_RET(make_time_val(BIF_P, erts_sys_perf_counter()));
+}
+
+BIF_RETTYPE erts_internal_perf_counter_unit_0(BIF_ALIST_0)
+{
+    BIF_RET(make_time_val(BIF_P, erts_sys_perf_counter_unit()));
+}
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index e1b03a057f..9033c1b75c 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -38,6 +38,7 @@
 #include "erl_binary.h"
 #include "erl_bits.h"
 #include "erl_thr_progress.h"
+#include "erl_bif_unique.h"
 
 #if 0
 #define DEBUG_PRINTOUTS
@@ -77,6 +78,263 @@ enum ErtsSysMsgType {
     SYS_MSG_TYPE_SYSPROF
 };
 
+#define ERTS_TRACE_TS_NOW_MAX_SIZE				\
+    4
+#define ERTS_TRACE_TS_MONOTONIC_MAX_SIZE			\
+    ERTS_MAX_SINT64_HEAP_SIZE
+#define ERTS_TRACE_TS_STRICT_MONOTONIC_MAX_SIZE			\
+    (3 + ERTS_MAX_SINT64_HEAP_SIZE				\
+     + ERTS_MAX_UINT64_HEAP_SIZE)
+
+#define ERTS_TRACE_PATCH_TS_MAX_SIZE				\
+    (1 + ((ERTS_TRACE_TS_NOW_MAX_SIZE				\
+	   > ERTS_TRACE_TS_MONOTONIC_MAX_SIZE)			\
+	  ? ((ERTS_TRACE_TS_NOW_MAX_SIZE			\
+	      > ERTS_TRACE_TS_STRICT_MONOTONIC_MAX_SIZE)	\
+	     ? ERTS_TRACE_TS_NOW_MAX_SIZE			\
+	     : ERTS_TRACE_TS_STRICT_MONOTONIC_MAX_SIZE)		\
+	  : ((ERTS_TRACE_TS_MONOTONIC_MAX_SIZE			\
+	      > ERTS_TRACE_TS_STRICT_MONOTONIC_MAX_SIZE)	\
+	     ? ERTS_TRACE_TS_MONOTONIC_MAX_SIZE			\
+	     : ERTS_TRACE_TS_STRICT_MONOTONIC_MAX_SIZE)))
+
+#define TFLGS_TS_TYPE(p) ERTS_TFLGS2TSTYPE(ERTS_TRACE_FLAGS((p)))
+
+/*
+ * FUTURE CHANGES:
+ *
+ * The timestamp functionality has intentionally been
+ * split in two parts for future use even though it
+ * is not used like this today. take_timestamp() takes
+ * the timestamp and calculate heap need for it (which
+ * is not constant). write_timestamp() writes the
+ * timestamp to the allocated heap. That is, one typically
+ * want to take the timestamp before allocating the heap
+ * and then write it to the heap.
+ *
+ * The trace output functionality now use patch_ts_size(),
+ * write_ts(), and patch_ts(). write_ts() both takes the
+ * timestamp and writes it. Since we don't know the
+ * heap need when allocating the heap area we need to
+ * over allocate (maximum size from patch_ts_size()) and
+ * then potentially (often) shrink the heap area after the
+ * timestamp has been written. The only reason it is
+ * currently done this way is because we do not want to
+ * make major changes of the trace behavior in a patch.
+ * This is planned to be changed in next major release.
+ */
+
+typedef struct {
+    int ts_type_flag;
+    union {
+	struct {
+	    Uint ms;
+	    Uint s;
+	    Uint us;
+	} now;
+	struct {
+	    ErtsMonotonicTime time;
+	    Sint64 raw_unique;
+	} monotonic;
+    } u;
+} ErtsTraceTimeStamp;
+
+static ERTS_INLINE Uint
+take_timestamp(ErtsTraceTimeStamp *tsp, int ts_type)
+{
+    int ts_type_flag = ts_type & -ts_type; /* least significant flag */
+
+    ASSERT(ts_type_flag == ERTS_TRACE_FLG_NOW_TIMESTAMP
+	   || ts_type_flag == ERTS_TRACE_FLG_MONOTONIC_TIMESTAMP
+	   || ts_type_flag == ERTS_TRACE_FLG_STRICT_MONOTONIC_TIMESTAMP
+	   || ts_type_flag == 0);
+
+    tsp->ts_type_flag = ts_type_flag;
+    switch (ts_type_flag) {
+    case 0:
+	return (Uint) 0;
+    case ERTS_TRACE_FLG_NOW_TIMESTAMP:
+#ifdef HAVE_ERTS_NOW_CPU
+	if (erts_cpu_timestamp)
+	    erts_get_now_cpu(&tsp->u.now.ms, &tsp->u.now.s, &tsp->u.now.us);
+	else
+#endif
+	    get_now(&tsp->u.now.ms, &tsp->u.now.s, &tsp->u.now.us);
+	return (Uint) 4;
+    case ERTS_TRACE_FLG_MONOTONIC_TIMESTAMP:
+    case ERTS_TRACE_FLG_STRICT_MONOTONIC_TIMESTAMP: {
+	Uint hsz = 0;
+	ErtsMonotonicTime mtime = erts_get_monotonic_time(NULL);
+	mtime = ERTS_MONOTONIC_TO_NSEC(mtime);
+	mtime += ERTS_MONOTONIC_OFFSET_NSEC;
+	hsz = (IS_SSMALL(mtime) ?
+	       (Uint) 0
+	       : ERTS_SINT64_HEAP_SIZE((Sint64) mtime));
+	tsp->u.monotonic.time = mtime;
+	if (ts_type_flag == ERTS_TRACE_FLG_STRICT_MONOTONIC_TIMESTAMP) {
+	    Sint64 raw_unique;
+	    hsz += 3; /* 2-tuple */
+	    raw_unique = erts_raw_get_unique_monotonic_integer();
+	    tsp->u.monotonic.raw_unique = raw_unique;
+	    hsz += erts_raw_unique_monotonic_integer_heap_size(raw_unique, 0);
+	}
+	return hsz;
+    }
+    default:
+	ERTS_INTERNAL_ERROR("invalid timestamp type");
+	return 0;
+    }
+}
+
+static ERTS_INLINE Eterm
+write_timestamp(ErtsTraceTimeStamp *tsp, Eterm **hpp)
+{
+    int ts_type_flag = tsp->ts_type_flag;
+    Eterm res;
+
+    switch (ts_type_flag) {
+    case 0:
+	return NIL;
+    case ERTS_TRACE_FLG_NOW_TIMESTAMP:
+	res = TUPLE3(*hpp,
+		     make_small(tsp->u.now.ms),
+		     make_small(tsp->u.now.s),
+		     make_small(tsp->u.now.us));
+	*hpp += 4;
+	return res;
+    case ERTS_TRACE_FLG_MONOTONIC_TIMESTAMP:
+    case ERTS_TRACE_FLG_STRICT_MONOTONIC_TIMESTAMP: {
+	Sint64 mtime, raw;
+	Eterm unique, emtime;
+
+	mtime = (Sint64) tsp->u.monotonic.time;
+	emtime = (IS_SSMALL(mtime)
+		  ? make_small((Sint64) mtime)
+		  : erts_sint64_to_big((Sint64) mtime, hpp));
+
+	if (ts_type_flag == ERTS_TRACE_FLG_MONOTONIC_TIMESTAMP)
+	    return emtime;
+
+	raw = tsp->u.monotonic.raw_unique;
+	unique = erts_raw_make_unique_monotonic_integer_value(hpp, raw, 0);
+	res = TUPLE2(*hpp, emtime, unique);
+	*hpp += 3;
+	return res;
+    }
+    default:
+	ERTS_INTERNAL_ERROR("invalid timestamp type");
+	return THE_NON_VALUE;
+    }
+}
+
+#define PATCH_TS_SIZE(p) patch_ts_size(TFLGS_TS_TYPE(p))
+
+static ERTS_INLINE Uint
+patch_ts_size(int ts_type)
+{
+    int ts_type_flag = ts_type & -ts_type; /* least significant flag */
+    switch (ts_type_flag) {
+    case 0:
+	return 0;
+    case ERTS_TRACE_FLG_NOW_TIMESTAMP:
+	return 1 + ERTS_TRACE_TS_NOW_MAX_SIZE;
+    case ERTS_TRACE_FLG_MONOTONIC_TIMESTAMP:
+	return 1 + ERTS_TRACE_TS_MONOTONIC_MAX_SIZE;
+    case ERTS_TRACE_FLG_STRICT_MONOTONIC_TIMESTAMP:
+	return 1 + ERTS_TRACE_TS_STRICT_MONOTONIC_MAX_SIZE;
+    default:
+	ERTS_INTERNAL_ERROR("invalid timestamp type");
+	return 0;
+    }
+}
+
+/*
+ * Write a timestamp. The timestamp MUST be the last
+ * thing built on the heap. This since write_ts() might
+ * adjust the size of the used area.
+ */
+static Eterm
+write_ts(int ts_type, Eterm *hp, ErlHeapFragment *bp, Process *tracer)
+{
+    ErtsTraceTimeStamp ts;
+    Sint shrink;
+    Eterm res, *ts_hp = hp;
+    Uint hsz;
+
+    ASSERT(ts_type);
+
+    hsz = take_timestamp(&ts, ts_type);
+
+    res = write_timestamp(&ts, &ts_hp);
+
+    ASSERT(ts_hp == hp + hsz);
+
+    switch (ts.ts_type_flag) {
+    case ERTS_TRACE_FLG_MONOTONIC_TIMESTAMP:
+	shrink = ERTS_TRACE_TS_MONOTONIC_MAX_SIZE;
+	break;
+    case ERTS_TRACE_FLG_STRICT_MONOTONIC_TIMESTAMP:
+	shrink = ERTS_TRACE_TS_STRICT_MONOTONIC_MAX_SIZE;
+	break;
+    default:
+	return res;
+    }
+
+    shrink -= hsz;
+
+    ASSERT(shrink >= 0);
+
+    if (shrink) {
+	if (bp)
+	    bp->used_size -= shrink;
+#ifndef ERTS_SMP
+	else if (tracer) {
+	    Eterm *endp = ts_hp + shrink;
+	    HRelease(tracer, endp, ts_hp);
+	}
+#endif
+    }
+
+    return res;
+}
+
+/*
+ * Patch a timestamp into a tuple. The tuple MUST be the last thing
+ * built on the heap before the call, and the timestamp MUST be
+ * the last thing after the call. This since patch_ts() might adjust
+ * the size of the used area.
+ */
+
+#define PATCH_TS__(Type, Tuple, Hp, Bp, Tracer)			\
+    do {							\
+	int ts_type__ = (Type);					\
+	if (ts_type__)						\
+	    patch_ts(ts_type__, (Tuple), (Hp), (Bp), (Tracer));	\
+    } while (0)
+
+#ifdef ERTS_SMP
+#define PATCH_TS(Type, Tuple, Hp, Bp, Tracer) \
+    PATCH_TS__((Type), (Tuple), (Hp), (Bp), NULL)
+#else
+#define PATCH_TS(Type, Tuple, Hp, Bp, Tracer) \
+    PATCH_TS__((Type), (Tuple), (Hp), (Bp), (Tracer))
+#endif
+
+static ERTS_INLINE void
+patch_ts(int ts_type, Eterm tuple, Eterm* hp, ErlHeapFragment *bp, Process *tracer)
+{
+    Eterm *tptr = tuple_val(tuple);
+    int arity = arityval(*tptr);
+
+    ASSERT(ts_type);
+    ASSERT((tptr+arity+1) == hp);
+
+    tptr[0] = make_arityval(arity+1);
+    tptr[1] = am_trace_ts;
+
+    *hp = write_ts(ts_type, hp+1, bp, tracer);
+}
+
 #ifdef ERTS_SMP
 static void enqueue_sys_msg_unlocked(enum ErtsSysMsgType type,
 				     Eterm from,
@@ -114,15 +372,10 @@ void erts_init_trace(void) {
 
 static Eterm system_seq_tracer;
 
-#ifdef ERTS_SMP
 #define ERTS_ALLOC_SYSMSG_HEAP(SZ, BPP, OHPP, UNUSED) \
   (*(BPP) = new_message_buffer((SZ)), \
    *(OHPP) = &(*(BPP))->off_heap, \
    (*(BPP))->mem)
-#else
-#define ERTS_ALLOC_SYSMSG_HEAP(SZ, BPP, OHPP, RPP) \
-  erts_alloc_message_heap((SZ), (BPP), (OHPP), (RPP), 0)
-#endif
 
 #ifdef ERTS_SMP
 #define ERTS_ENQ_TRACE_MSG(FPID, TPID, MSG, BP) \
@@ -131,8 +384,12 @@ do { \
     enqueue_sys_msg_unlocked(SYS_MSG_TYPE_TRACE, (FPID), (TPID), (MSG), (BP)); \
 } while(0)
 #else
-#define ERTS_ENQ_TRACE_MSG(FPID, TPROC, MSG, BP) \
-    erts_queue_message((TPROC), NULL, (BP), (MSG), NIL)
+#define ERTS_ENQ_TRACE_MSG(FPID, TPROC, MSG, BP)		\
+    do {							\
+	ErtsMessage *mp__ = erts_alloc_message(0, NULL);		\
+	mp__->data.heap_frag = (BP);				\
+	erts_queue_message((TPROC), NULL, mp__, (MSG), NIL);	\
+    } while (0)
 #endif
 
 /*
@@ -365,23 +622,6 @@ erts_get_system_profile(void) {
     return profile;
 }
 
-
-#ifdef HAVE_ERTS_NOW_CPU
-#  define GET_NOW(m, s, u) \
-do { \
-    if (erts_cpu_timestamp) \
-	erts_get_now_cpu(m, s, u); \
-    else \
-	get_now(m, s, u); \
-} while (0)
-#else
-#  define GET_NOW(m, s, u) do {get_now(m, s, u);} while (0)
-#endif
-
-
-
-static Eterm* patch_ts(Eterm tuple4, Eterm* hp);
-
 #ifdef ERTS_SMP
 static void
 do_send_to_port(Eterm to,
@@ -420,7 +660,7 @@ WRITE_SYS_MSG_TO_PORT(Eterm unused_to,
 
     erts_encode_ext(message, &ptr);
     if (!(ptr <= buffer+size)) {
-	erl_exit(1, "Internal error in do_send_to_port: %d\n", ptr-buffer);
+	erts_exit(ERTS_ERROR_EXIT, "Internal error in do_send_to_port: %d\n", ptr-buffer);
     }
 
 #ifndef ERTS_SMP
@@ -436,11 +676,11 @@ WRITE_SYS_MSG_TO_PORT(Eterm unused_to,
 /* Send        {trace_ts, Pid, out, 0, Timestamp}
  * followed by {trace_ts, Pid, in, 0, NewTimestamp}
  *
- * 'NewTimestamp' is fetched from GET_NOW() through patch_ts().
+ * 'NewTimestamp' through patch_ts().
  */
 static void 
-do_send_schedfix_to_port(Port *trace_port, Eterm pid, Eterm timestamp) {
-#define LOCAL_HEAP_SIZE (4+5+5)
+do_send_schedfix_to_port(Port *trace_port, Eterm pid, Eterm timestamp, int ts_type) {
+#define LOCAL_HEAP_SIZE (5+5+ERTS_TRACE_PATCH_TS_MAX_SIZE)
     DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
     Eterm message;
     Eterm *hp;
@@ -462,9 +702,11 @@ do_send_schedfix_to_port(Port *trace_port, Eterm pid, Eterm timestamp) {
 		    SYS_MSG_TYPE_UNDEFINED,
 		    message);
 
-    message = TUPLE4(hp, am_trace_ts, pid, am_in, mfarity);
-    hp += 5;
-    hp = patch_ts(message, hp);
+
+    message = TUPLE5(hp, am_trace_ts, pid, am_in, mfarity,
+		     NIL /* Will be overwritten by timestamp */);
+    hp += 6;
+    hp[-1] = write_ts(ts_type, hp, NULL, NULL);
 
     do_send_to_port(trace_port->common.id,
 		    trace_port,
@@ -481,7 +723,7 @@ do_send_schedfix_to_port(Port *trace_port, Eterm pid, Eterm timestamp) {
  * It is assumed that 'message' is not an 'out' message.
  *
  * 'c_p' is the currently executing process, "tracee" is the traced process
- * which 'message' concerns => if (*tracee_flags & F_TIMESTAMP), 
+ * which 'message' concerns => if (*tracee_flags & F_TIMESTAMP_MASK), 
  * 'message' must contain a timestamp.
  */
 static void
@@ -489,8 +731,9 @@ send_to_port(Process *c_p, Eterm message,
 	     Eterm *tracer_pid, Uint *tracee_flags) {
     Port* trace_port;
 #ifndef ERTS_SMP
-#define LOCAL_HEAP_SIZE (4)
-    Eterm ts, *hp;
+    int ts_type;
+#define LOCAL_HEAP_SIZE ERTS_TRACE_PATCH_TS_MAX_SIZE
+    Eterm ts;
     DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
 #endif
 
@@ -519,7 +762,7 @@ send_to_port(Process *c_p, Eterm message,
      */
 
     if ( c_p == NULL || 
-	 (! IS_TRACED_FL(c_p, F_TRACE_SCHED | F_TIMESTAMP))) { 
+	 (! IS_TRACED_FL(c_p, F_TRACE_SCHED | F_TIMESTAMP_MASK))) { 
 #endif
 	do_send_to_port(*tracer_pid,
 			trace_port,
@@ -538,22 +781,12 @@ send_to_port(Process *c_p, Eterm message,
      */
     UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 
-    if (*tracee_flags & F_TIMESTAMP) {
-	ASSERT(is_tuple(message));
-	hp = tuple_val(message);
-	ts = hp[arityval(hp[0])];
-    } else {
-	/* A fake schedule might be needed,
-	 * but this message does not contain a timestamp.
-	 * Create a dummy trace message with timestamp to be
-	 * passed to do_send_schedfix_to_port().
-	 */
-	Uint ms,s,us;
-	GET_NOW(&ms, &s, &us);
-	hp = local_heap;
-	ts = TUPLE3(hp, make_small(ms), make_small(s), make_small(us));
-	hp += 4;
-    }
+    /* A fake schedule might be needed.
+     * Create a dummy trace message with timestamp to be
+     * passed to do_send_schedfix_to_port().
+     */
+    ts_type = TFLGS_TS_TYPE(c_p);
+    ts = write_ts(ts_type, local_heap, NULL, NULL);
 
     trace_port->control_flags &= ~PORT_CONTROL_FLAG_HEAVY;
     do_send_to_port(*tracer_pid,
@@ -572,7 +805,7 @@ send_to_port(Process *c_p, Eterm message,
 	 * just after writning the real trace message, and now gets scheduled
 	 * in again.
 	 */
-	do_send_schedfix_to_port(trace_port, c_p->common.id, ts);
+	do_send_schedfix_to_port(trace_port, c_p->common.id, ts, ts_type);
     }
 
     erts_port_release(trace_port);
@@ -591,11 +824,9 @@ send_to_port(Process *c_p, Eterm message,
 static void 
 profile_send(Eterm from, Eterm message) {
     Uint sz = 0;
-    ErlHeapFragment *bp = NULL;
     Uint *hp = NULL;
     Eterm msg = NIL;
     Process *profile_p = NULL;
-    ErlOffHeap *off_heap = NULL;
 
     Eterm profiler = erts_get_system_profile();
 
@@ -621,6 +852,7 @@ profile_send(Eterm from, Eterm message) {
 	}
     	
     } else {
+	ErtsMessage *mp;
 	ASSERT(is_internal_pid(profiler));
         
 	profile_p = erts_proc_lookup(profiler);
@@ -629,10 +861,13 @@ profile_send(Eterm from, Eterm message) {
 	    return;
 
 	sz = size_object(message);
-	hp = erts_alloc_message_heap(sz, &bp, &off_heap, profile_p, 0);
-	msg = copy_struct(message, sz, &hp, &bp->off_heap);
-	
-        erts_queue_message(profile_p, NULL, bp, msg, NIL);
+	mp = erts_alloc_message(sz, &hp);
+	if (sz == 0)
+	    msg = message;
+	else
+	    msg = copy_struct(message, sz, &hp, &mp->hfrag.off_heap);
+
+        erts_queue_message(profile_p, NULL, mp, msg, NIL);
     }
 }
 
@@ -641,20 +876,19 @@ profile_send(Eterm from, Eterm message) {
 
 /* A fake schedule out/in message pair will be sent,
  * if the driver so requests.
- * If (timestamp == NIL), one is fetched from GET_NOW().
  *
  * 'c_p' is the currently executing process, may be NULL.
  */
 static void
 seq_trace_send_to_port(Process *c_p,
 		       Eterm seq_tracer,
-		       Eterm message,
-		       Eterm timestamp)
+		       Eterm message)
 {
     Port* trace_port;
 #ifndef ERTS_SMP
-    Eterm ts, *hp;
-#define LOCAL_HEAP_SIZE (4)
+    int ts_type;
+    Eterm ts;
+#define LOCAL_HEAP_SIZE ERTS_TRACE_PATCH_TS_MAX_SIZE
     DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
     UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 #endif
@@ -679,7 +913,7 @@ seq_trace_send_to_port(Process *c_p,
     }
 
     if (c_p == NULL
-	|| (! IS_TRACED_FL(c_p, F_TRACE_SCHED | F_TIMESTAMP))) {
+	|| (! IS_TRACED_FL(c_p, F_TRACE_SCHED | F_TIMESTAMP_MASK))) {
 #endif
 	do_send_to_port(seq_tracer,
 			trace_port,
@@ -696,20 +930,12 @@ seq_trace_send_to_port(Process *c_p,
      * with 'running' and 'timestamp'.
      */
 
-    if (timestamp != NIL) {
-	ts = timestamp;
-    } else {
-	/* A fake schedule might be needed,
-	 * but this message does not contain a timestamp.
-	 * Create a dummy trace message with timestamp to be
-	 * passed to do_send_schedfix_to_port().
-	 */
-	Uint ms,s,us;
-	GET_NOW(&ms, &s, &us);
-	hp = local_heap;
-	ts = TUPLE3(hp, make_small(ms), make_small(s), make_small(us));
-	hp += 4;
-    }
+    /* A fake schedule might be needed.
+     * Create a dummy trace message with timestamp to be
+     * passed to do_send_schedfix_to_port().
+     */
+    ts_type = TFLGS_TS_TYPE(c_p);
+    ts = write_ts(ts_type, local_heap, NULL, NULL);
 
     trace_port->control_flags &= ~PORT_CONTROL_FLAG_HEAVY;
     do_send_to_port(seq_tracer,
@@ -728,7 +954,7 @@ seq_trace_send_to_port(Process *c_p,
 	 * just after writing the real trace message, and now gets scheduled
 	 * in again.
 	 */
-	do_send_schedfix_to_port(trace_port, c_p->common.id, ts);
+	do_send_schedfix_to_port(trace_port, c_p->common.id, ts, ts_type);
     }
 
     erts_port_release(trace_port);
@@ -738,32 +964,6 @@ seq_trace_send_to_port(Process *c_p,
 #endif
 }
 
-#define TS_HEAP_WORDS 5
-#define TS_SIZE(p) ((ERTS_TRACE_FLAGS((p)) & F_TIMESTAMP) \
-		    ? TS_HEAP_WORDS \
-		    : 0)
-
-/*
- * Patch a timestamp into a tuple.  The tuple must be the last thing
- * built on the heap.
- *
- * Returns the new hp pointer.
-*/
-static Eterm*
-patch_ts(Eterm tuple, Eterm* hp)
-{
-    Uint ms, s, us;
-    Eterm* ptr = tuple_val(tuple);
-    int arity = arityval(*ptr);
-
-    ASSERT((ptr+arity+1) == hp);
-    ptr[0] = make_arityval(arity+1);
-    ptr[1] = am_trace_ts;
-    GET_NOW(&ms, &s, &us);
-    *hp = TUPLE3(hp+1, make_small(ms), make_small(s), make_small(us));
-    return hp+5;
-}
-
 static ERTS_INLINE void
 send_to_tracer(Process *tracee,
 	       ERTS_TRACER_REF_TYPE tracer_ref,
@@ -776,13 +976,13 @@ send_to_tracer(Process *tracee,
 
     erts_smp_mtx_lock(&smq_mtx);
 
-    if (ERTS_TRACE_FLAGS(tracee) & F_TIMESTAMP)
-	*hpp = patch_ts(msg, *hpp);
-
-    if (is_internal_pid(ERTS_TRACER_PROC(tracee)))
+    if (is_internal_pid(ERTS_TRACER_PROC(tracee))) {
+	PATCH_TS(TFLGS_TS_TYPE(tracee), msg, *hpp, bp, tracer_ref);
 	ERTS_ENQ_TRACE_MSG(tracee->common.id, tracer_ref, msg, bp);
+    }
     else {
 	ASSERT(is_internal_port(ERTS_TRACER_PROC(tracee)));
+	PATCH_TS(TFLGS_TS_TYPE(tracee), msg, *hpp, NULL, NULL);
 	send_to_port(no_fake_sched ? NULL : tracee,
 		     msg,
 		     &ERTS_TRACER_PROC(tracee),
@@ -796,7 +996,7 @@ send_to_tracer(Process *tracee,
 static void
 trace_sched_aux(Process *p, Eterm what, int never_fake_sched)
 {
-#define LOCAL_HEAP_SIZE (5+4+1+TS_HEAP_WORDS)
+#define LOCAL_HEAP_SIZE (5+4+1+ERTS_TRACE_PATCH_TS_MAX_SIZE)
     DeclareTmpHeap(local_heap,LOCAL_HEAP_SIZE,p);
     Eterm tmp, mess, *hp;
     ErlHeapFragment *bp = NULL;
@@ -852,7 +1052,7 @@ trace_sched_aux(Process *p, Eterm what, int never_fake_sched)
 	    size += 4;
 	if (sched_no)
 	    size += 1;
-	size += TS_SIZE(p);
+	size += PATCH_TS_SIZE(p);
 	hp = ERTS_ALLOC_SYSMSG_HEAP(size, &bp, &off_heap, tracer_ref);
     }
 
@@ -926,7 +1126,7 @@ trace_send(Process *p, Eterm to, Eterm msg)
     }
 
     if (is_internal_port(ERTS_TRACER_PROC(p))) {
-#define LOCAL_HEAP_SIZE (11)
+#define LOCAL_HEAP_SIZE (6 + ERTS_TRACE_PATCH_TS_MAX_SIZE)
 	DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
 	UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 
@@ -934,9 +1134,7 @@ trace_send(Process *p, Eterm to, Eterm msg)
 	mess = TUPLE5(hp, am_trace, p->common.id, operation, msg, to);
 	hp += 6;
 	erts_smp_mtx_lock(&smq_mtx);
-	if (ERTS_TRACE_FLAGS(p) & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
+	PATCH_TS(TFLGS_TS_TYPE(p), mess, hp, NULL, NULL);
 	send_to_port(p, mess, &ERTS_TRACER_PROC(p), &ERTS_TRACE_FLAGS(p));
 	UnUseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 #undef LOCAL_HEAP_SIZE
@@ -955,7 +1153,7 @@ trace_send(Process *p, Eterm to, Eterm msg)
 
 	sz_msg = size_object(msg);
 	sz_to  = size_object(to);
-	need = sz_msg + sz_to + 6 + TS_SIZE(p);
+	need = sz_msg + sz_to + 6 + PATCH_TS_SIZE(p);
 	
 	hp = ERTS_ALLOC_SYSMSG_HEAP(need, &bp, &off_heap, tracer_ref);
 
@@ -972,10 +1170,7 @@ trace_send(Process *p, Eterm to, Eterm msg)
 
 	erts_smp_mtx_lock(&smq_mtx);
 
-	if (ERTS_TRACE_FLAGS(p) & F_TIMESTAMP) {
-	    patch_ts(mess, hp);
-	}
-
+	PATCH_TS(TFLGS_TS_TYPE(p), mess, hp, bp, tracer_ref);
 	ERTS_ENQ_TRACE_MSG(p->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
     }
@@ -992,7 +1187,7 @@ trace_receive(Process *rp, Eterm msg)
     Eterm* hp;
 
     if (is_internal_port(ERTS_TRACER_PROC(rp))) {
-#define LOCAL_HEAP_SIZE (10)
+#define LOCAL_HEAP_SIZE (5+ERTS_TRACE_PATCH_TS_MAX_SIZE)
 	DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
 	UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 
@@ -1000,9 +1195,7 @@ trace_receive(Process *rp, Eterm msg)
 	mess = TUPLE4(hp, am_trace, rp->common.id, am_receive, msg);
 	hp += 5;
 	erts_smp_mtx_lock(&smq_mtx);
-	if (ERTS_TRACE_FLAGS(rp) & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
+	PATCH_TS(TFLGS_TS_TYPE(rp), mess, hp, NULL, NULL);
 	send_to_port(rp, mess, &ERTS_TRACER_PROC(rp), &ERTS_TRACE_FLAGS(rp));
 	UnUseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 #undef LOCAL_HEAP_SIZE
@@ -1021,7 +1214,7 @@ trace_receive(Process *rp, Eterm msg)
 
 	sz_msg = size_object(msg);
 
-	hsz = sz_msg + 5 + TS_SIZE(rp);
+	hsz = sz_msg + 5 + PATCH_TS_SIZE(rp);
 
 	hp = ERTS_ALLOC_SYSMSG_HEAP(hsz, &bp, &off_heap, tracer_ref);
 
@@ -1031,10 +1224,7 @@ trace_receive(Process *rp, Eterm msg)
 
 	erts_smp_mtx_lock(&smq_mtx);
 
-	if (ERTS_TRACE_FLAGS(rp) & F_TIMESTAMP) {
-	    patch_ts(mess, hp);
-	}
-
+	PATCH_TS(TFLGS_TS_TYPE(rp), mess, hp, bp, tracer_ref);
 	ERTS_ENQ_TRACE_MSG(rp->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
     }
@@ -1045,11 +1235,7 @@ seq_trace_update_send(Process *p)
 {
     Eterm seq_tracer = erts_get_system_seq_tracer();
     ASSERT((is_tuple(SEQ_TRACE_TOKEN(p)) || is_nil(SEQ_TRACE_TOKEN(p))));
-    if ( (p->common.id == seq_tracer) || (SEQ_TRACE_TOKEN(p) == NIL)
-#ifdef USE_VM_PROBES
-	 || (SEQ_TRACE_TOKEN(p) == am_have_dt_utag)
-#endif
-	 ) {
+    if ((p->common.id == seq_tracer) || have_no_seqtrace(SEQ_TRACE_TOKEN(p))) {
 	return 0;
     }
     SEQ_TRACE_TOKEN_SENDER(p) = p->common.id;
@@ -1084,6 +1270,7 @@ seq_trace_output_generic(Eterm token, Eterm msg, Uint type,
     Eterm type_atom;
     int sz_exit;
     Eterm seq_tracer;
+    int ts_type;
 
     seq_tracer = erts_get_system_seq_tracer();
 
@@ -1098,7 +1285,7 @@ seq_trace_output_generic(Eterm token, Eterm msg, Uint type,
     case SEQ_TRACE_PRINT:   type_atom = am_print; break;
     case SEQ_TRACE_RECEIVE: type_atom = am_receive; break;
     default:
-	erl_exit(1, "invalid type in seq_trace_output_generic: %d:\n", type);
+	erts_exit(ERTS_ERROR_EXIT, "invalid type in seq_trace_output_generic: %d:\n", type);
 	return;			/* To avoid warning */
     }
 
@@ -1111,8 +1298,10 @@ seq_trace_output_generic(Eterm token, Eterm msg, Uint type,
 	return;			/* no need to send anything */
     }
 
+    ts_type = ERTS_SEQTFLGS2TSTYPE(unsigned_val(SEQ_TRACE_T_FLAGS(token)));
+
     if (is_internal_port(seq_tracer)) {
-#define LOCAL_HEAP_SIZE (64)
+#define LOCAL_HEAP_SIZE (60 + ERTS_TRACE_PATCH_TS_MAX_SIZE)
 	DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
 	UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 
@@ -1128,17 +1317,17 @@ seq_trace_output_generic(Eterm token, Eterm msg, Uint type,
 	mess = TUPLE5(hp, type_atom, lastcnt_serial, SEQ_TRACE_T_SENDER(token),
 		      receiver, msg);
 	hp += 6;
+
 	erts_smp_mtx_lock(&smq_mtx);
-	if ((unsigned_val(SEQ_TRACE_T_FLAGS(token)) & SEQ_TRACE_TIMESTAMP) == 0) {
+	if (!ts_type) {
 	    mess = TUPLE3(hp, am_seq_trace, label, mess);
-	    seq_trace_send_to_port(NULL, seq_tracer, mess, NIL);
+	    seq_trace_send_to_port(NULL, seq_tracer, mess);
 	} else {
-	    Uint ms,s,us,ts;
-	    GET_NOW(&ms, &s, &us);
-	    ts = TUPLE3(hp, make_small(ms),make_small(s), make_small(us));
-	    hp += 4;
-	    mess = TUPLE4(hp, am_seq_trace, label, mess, ts);
-	    seq_trace_send_to_port(process, seq_tracer, mess, ts);
+	    mess = TUPLE4(hp, am_seq_trace, label, mess,
+			  NIL /* Will be overwritten by timestamp */);
+	    hp += 5;
+	    hp[-1] = write_ts(ts_type, hp, NULL, NULL);
+	    seq_trace_send_to_port(process, seq_tracer, mess);
 	}
 	UnUseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 #undef LOCAL_HEAP_SIZE
@@ -1173,8 +1362,7 @@ seq_trace_output_generic(Eterm token, Eterm msg, Uint type,
 	sz_lastcnt_serial = 3; /* TUPLE2 */
 	sz_msg = size_object(msg);
 
-	sz_ts = ((unsigned_val(SEQ_TRACE_T_FLAGS(token)) & SEQ_TRACE_TIMESTAMP) ? 
-		 5 : 0);
+	sz_ts = patch_ts_size(ts_type);
 	if (exitfrom != NIL) {
 	    sz_exit = 4; /* create {'EXIT',exitfrom,msg} */
 	    sz_exitfrom = size_object(exitfrom);
@@ -1218,14 +1406,20 @@ seq_trace_output_generic(Eterm token, Eterm msg, Uint type,
 
 	erts_smp_mtx_lock(&smq_mtx);
 
-	if (sz_ts) {/* timestamp should be included */
-	    Uint ms,s,us,ts;
-	    GET_NOW(&ms, &s, &us);
-	    ts = TUPLE3(hp, make_small(ms),make_small(s), make_small(us));
-	    hp += 4;
-	    mess = TUPLE4(hp, am_seq_trace, label, mess, ts);
-	} else {
+	if (!ts_type)
 	    mess = TUPLE3(hp, am_seq_trace, label, mess);
+	else {
+	    mess = TUPLE4(hp, am_seq_trace, label, mess,
+			  NIL /* Will be overwritten by timestamp */);
+	    hp += 5;
+	    /* Write timestamp in element 6 of the 'msg' tuple */
+	    hp[-1] = write_ts(ts_type, hp, bp,
+#ifndef ERTS_SMP
+			      tracer
+#else
+			      NULL
+#endif
+		);
 	}
 
 #ifdef ERTS_SMP
@@ -1233,7 +1427,11 @@ seq_trace_output_generic(Eterm token, Eterm msg, Uint type,
 	erts_smp_mtx_unlock(&smq_mtx);
 #else
         /* trace_token must be NIL here */
-	erts_queue_message(tracer, NULL, bp, mess, NIL);
+	{
+	    ErtsMessage *mp = erts_alloc_message(0, NULL);
+	    mp->data.heap_frag = bp;
+	    erts_queue_message(tracer, NULL, mp, mess, NIL);
+	}
 #endif
     }
 }
@@ -1244,7 +1442,7 @@ seq_trace_output_generic(Eterm token, Eterm msg, Uint type,
 void 
 erts_trace_return_to(Process *p, BeamInstr *pc)
 {
-#define LOCAL_HEAP_SIZE (4+5+5)
+#define LOCAL_HEAP_SIZE (4+5+ERTS_TRACE_PATCH_TS_MAX_SIZE)
     Eterm* hp;
     Eterm mfa;
     Eterm mess;
@@ -1269,9 +1467,7 @@ erts_trace_return_to(Process *p, BeamInstr *pc)
 
     erts_smp_mtx_lock(&smq_mtx);
 
-    if (ERTS_TRACE_FLAGS(p) & F_TIMESTAMP) {
-	hp = patch_ts(mess, hp);
-    }
+    PATCH_TS(TFLGS_TS_TYPE(p), mess, hp, NULL, NULL);
 
     if (is_internal_port(ERTS_TRACER_PROC(p))) {
 	send_to_port(p, mess, &ERTS_TRACER_PROC(p), &ERTS_TRACE_FLAGS(p));
@@ -1318,6 +1514,7 @@ erts_trace_return(Process* p, BeamInstr* fi, Eterm retval, Eterm *tracer_pid)
     Eterm mod, name;
     int arity;
     Uint meta_flags, *tracee_flags;
+    int ts_type;
 #ifdef ERTS_SMP
     Eterm tracee;
 #endif
@@ -1353,7 +1550,7 @@ erts_trace_return(Process* p, BeamInstr* fi, Eterm retval, Eterm *tracer_pid)
 	 *     meta trace =>
 	 *       use fixed flag set instead of process flags
 	 */	    
-	meta_flags = F_TRACE_CALLS | F_TIMESTAMP;
+	meta_flags = F_TRACE_CALLS | F_NOW_TS;
 	tracee_flags = &meta_flags;
 #ifdef ERTS_SMP
 	tracee = NIL;
@@ -1367,8 +1564,10 @@ erts_trace_return(Process* p, BeamInstr* fi, Eterm retval, Eterm *tracer_pid)
     name = fi[1];
     arity = fi[2];
     
+    ts_type = ERTS_TFLGS2TSTYPE(*tracee_flags);
+
     if (is_internal_port(*tracer_pid)) {
-#define LOCAL_HEAP_SIZE (4+6+5)
+#define LOCAL_HEAP_SIZE (4+6+ERTS_TRACE_PATCH_TS_MAX_SIZE)
 	DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
 	UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 	hp = local_heap;
@@ -1377,9 +1576,7 @@ erts_trace_return(Process* p, BeamInstr* fi, Eterm retval, Eterm *tracer_pid)
 	mess = TUPLE5(hp, am_trace, p->common.id, am_return_from, mfa, retval);
 	hp += 6;
 	erts_smp_mtx_lock(&smq_mtx);
-	if (*tracee_flags & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
+	PATCH_TS(ts_type, mess, hp, NULL, NULL);
 	send_to_port(p, mess, tracer_pid, tracee_flags);
 	UnUseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 #undef LOCAL_HEAP_SIZE
@@ -1390,24 +1587,15 @@ erts_trace_return(Process* p, BeamInstr* fi, Eterm retval, Eterm *tracer_pid)
 	ERTS_TRACER_REF_TYPE tracer_ref;
 	unsigned size;
 	unsigned retval_size;
-#ifdef DEBUG
-	Eterm* limit;
-#endif
 
 	ASSERT(is_internal_pid(*tracer_pid));
 
 	ERTS_GET_TRACER_REF(tracer_ref, *tracer_pid, *tracee_flags);
-	
+
 	retval_size = size_object(retval);
-	size = 6 + 4 + retval_size;
-	if (*tracee_flags & F_TIMESTAMP) {
-	    size += 1+4;
-	}
+	size = 6 + 4 + retval_size + patch_ts_size(ts_type);
 
 	hp = ERTS_ALLOC_SYSMSG_HEAP(size, &bp, &off_heap, tracer_ref);
-#ifdef DEBUG
-	limit = hp + size;
-#endif
 
 	/*
 	 * Build the trace tuple and put it into receive queue of the tracer process.
@@ -1421,11 +1609,7 @@ erts_trace_return(Process* p, BeamInstr* fi, Eterm retval, Eterm *tracer_pid)
 
 	erts_smp_mtx_lock(&smq_mtx);
 
-	if (*tracee_flags & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
-
-	ASSERT(hp == limit);
+	PATCH_TS(ts_type, mess, hp, bp, tracer_ref);
 
 	ERTS_ENQ_TRACE_MSG(tracee, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
@@ -1448,6 +1632,7 @@ erts_trace_exception(Process* p, BeamInstr mfa[3], Eterm class, Eterm value,
     Eterm cv;
     Eterm mess;
     Uint meta_flags, *tracee_flags;
+    int ts_type;
 #ifdef ERTS_SMP
     Eterm tracee;
 #endif
@@ -1486,15 +1671,17 @@ erts_trace_exception(Process* p, BeamInstr mfa[3], Eterm class, Eterm value,
 	 *     meta trace =>
 	 *       use fixed flag set instead of process flags
 	 */	    
-	meta_flags = F_TRACE_CALLS | F_TIMESTAMP;
+	meta_flags = F_TRACE_CALLS | F_NOW_TS;
 	tracee_flags = &meta_flags;
 #ifdef ERTS_SMP
 	tracee = NIL;
 #endif
     }
     
+    ts_type = ERTS_TFLGS2TSTYPE(*tracee_flags);
+
     if (is_internal_port(*tracer_pid)) {
-#define LOCAL_HEAP_SIZE (4+3+6+5)
+#define LOCAL_HEAP_SIZE (4+3+6+ERTS_TRACE_PATCH_TS_MAX_SIZE)
 	DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
 	UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 
@@ -1507,10 +1694,7 @@ erts_trace_exception(Process* p, BeamInstr mfa[3], Eterm class, Eterm value,
 	hp += 6;
 	ASSERT((hp - local_heap) <= LOCAL_HEAP_SIZE);
 	erts_smp_mtx_lock(&smq_mtx);
-	if (*tracee_flags & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp); /* hp += 5 */
-	    ASSERT((hp - local_heap) == LOCAL_HEAP_SIZE);
-	}
+	PATCH_TS(ts_type, mess, hp, NULL, NULL);
 	send_to_port(p, mess, tracer_pid, tracee_flags);
 	UnUseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 #undef LOCAL_HEAP_SIZE
@@ -1521,24 +1705,15 @@ erts_trace_exception(Process* p, BeamInstr mfa[3], Eterm class, Eterm value,
 	ERTS_TRACER_REF_TYPE tracer_ref;
 	unsigned size;
 	unsigned value_size;
-#ifdef DEBUG
-	Eterm* limit;
-#endif
 
 	ASSERT(is_internal_pid(*tracer_pid));
 
 	ERTS_GET_TRACER_REF(tracer_ref, *tracer_pid, *tracee_flags);
 	
 	value_size = size_object(value);
-	size = 6 + 4 + 3 + value_size;
-	if (*tracee_flags & F_TIMESTAMP) {
-	    size += 1+4;
-	}
+	size = 6 + 4 + 3 + value_size + patch_ts_size(ts_type);
 
 	hp = ERTS_ALLOC_SYSMSG_HEAP(size, &bp, &off_heap, tracer_ref);
-#ifdef DEBUG
-	limit = hp + size;
-#endif
 
 	/*
 	 * Build the trace tuple and put it into receive queue of the tracer process.
@@ -1555,11 +1730,7 @@ erts_trace_exception(Process* p, BeamInstr mfa[3], Eterm class, Eterm value,
 
 	erts_smp_mtx_lock(&smq_mtx);
 
-	if (*tracee_flags & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
-
-	ASSERT(hp == limit);
+	PATCH_TS(ts_type, mess, hp, bp, tracer_ref);
 
 	ERTS_ENQ_TRACE_MSG(tracee, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
@@ -1592,6 +1763,7 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
     Eterm pam_result = am_true;
     Eterm mess;
     Uint meta_flags, *tracee_flags;
+    int ts_type;
 #ifdef ERTS_SMP
     Eterm tracee;
 #endif
@@ -1633,7 +1805,7 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	    /* No trace messages for sensitive processes. */
 	    return 0;
 	}
-	meta_flags = F_TRACE_CALLS | F_TIMESTAMP;
+	meta_flags = F_TRACE_CALLS | F_NOW_TS;
 	tracee_flags = &meta_flags;
 #ifdef ERTS_SMP
 	tracee = NIL;
@@ -1676,13 +1848,10 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
     }
     args = transformed_args;
 
+    ts_type = ERTS_TFLGS2TSTYPE(*tracee_flags);
+
     if (is_internal_port(*tracer_pid)) {
-#if HEAP_ON_C_STACK
-	Eterm local_heap[64+MAX_ARG];
-#else
-	Eterm *local_heap = erts_alloc(ERTS_ALC_T_TEMP_TERM,
-				       sizeof(Eterm)*(64+MAX_ARG));
-#endif
+	Eterm local_heap[64+ERTS_TRACE_PATCH_TS_MAX_SIZE+MAX_ARG];
 	hp = local_heap;
 
 	if (!erts_is_valid_tracer_port(*tracer_pid)) {
@@ -1697,9 +1866,6 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	    if (is_not_nil(tracee))
 		erts_smp_proc_unlock(p, ERTS_PROC_LOCKS_ALL_MINOR);
 #endif
-#if !HEAP_ON_C_STACK
-	    erts_free(ERTS_ALC_T_TEMP_TERM,local_heap);
-#endif
 	    UnUseTmpHeap(ERL_SUB_BIN_SIZE,p);
 	    return 0;
 	}
@@ -1727,9 +1893,6 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 					    ERTS_PAM_TMP_RESULT, &return_flags);
 	    if (is_non_value(pam_result)) {
 		erts_match_set_release_result(p);
-#if !HEAP_ON_C_STACK
-		erts_free(ERTS_ALC_T_TEMP_TERM,local_heap);
-#endif
 		UnUseTmpHeap(ERL_SUB_BIN_SIZE,p);
 		return 0;
 	    }
@@ -1738,9 +1901,6 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	    /* Meta trace */
 	    if (pam_result == am_false) {
 		erts_match_set_release_result(p);
-#if !HEAP_ON_C_STACK
-		erts_free(ERTS_ALC_T_TEMP_TERM,local_heap);
-#endif
 		UnUseTmpHeap(ERL_SUB_BIN_SIZE,p);
 		return return_flags;
 	    }
@@ -1748,17 +1908,11 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	    /* Non-meta trace */
 	    if (*tracee_flags & F_TRACE_SILENT) { 
 		erts_match_set_release_result(p);
-#if !HEAP_ON_C_STACK
-		erts_free(ERTS_ALC_T_TEMP_TERM,local_heap);
-#endif
 		UnUseTmpHeap(ERL_SUB_BIN_SIZE,p);
 		return 0;
 	    }
 	    if (pam_result == am_false) {
 		erts_match_set_release_result(p);
-#if !HEAP_ON_C_STACK
-		erts_free(ERTS_ALC_T_TEMP_TERM,local_heap);
-#endif
 		UnUseTmpHeap(ERL_SUB_BIN_SIZE,p);
 		return return_flags;
 	    }
@@ -1796,15 +1950,10 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	    *hp++ = pam_result;
 	}
 	erts_smp_mtx_lock(&smq_mtx);
-	if (*tracee_flags & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
+	PATCH_TS(ts_type, mess, hp, NULL, NULL);
 	send_to_port(p, mess, tracer_pid, tracee_flags);
 	erts_smp_mtx_unlock(&smq_mtx);
 	erts_match_set_release_result(p);
-#if !HEAP_ON_C_STACK
-	erts_free(ERTS_ALC_T_TEMP_TERM,local_heap);
-#endif
 	UnUseTmpHeap(ERL_SUB_BIN_SIZE,p);
 	return *tracer_pid == NIL ? 0 : return_flags;
 
@@ -1820,9 +1969,6 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	unsigned sizes[MAX_ARG];
 	unsigned pam_result_size = 0;
 	int invalid_tracer;
-#ifdef DEBUG
-	Eterm* limit;
-#endif
 
 	ASSERT(is_internal_pid(*tracer_pid));
 	
@@ -1915,10 +2061,7 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 		size += sizes[i];
 	    }
 	}
-	if (*tracee_flags & F_TIMESTAMP) {
-	    size += 1 + 4;
-	    /* One element in trace tuple + timestamp tuple. */
-	}
+	size += patch_ts_size(ts_type);
 	if (pam_result != am_true) {
 	    pam_result_size = size_object(pam_result);
 	    size += 1 + pam_result_size;
@@ -1926,9 +2069,6 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	}
 	
 	hp = ERTS_ALLOC_SYSMSG_HEAP(size, &bp, &off_heap, tracer_ref);
-#ifdef DEBUG
-	limit = hp + size;
-#endif
 
 	/*
 	 * Build the the {M,F,A} tuple in the message buffer. 
@@ -1971,11 +2111,7 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 
 	erts_smp_mtx_lock(&smq_mtx);
 
-	if (*tracee_flags & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
-
-	ASSERT(hp == limit);
+	PATCH_TS(ts_type, mess, hp, bp, tracer_ref);
 	ERTS_ENQ_TRACE_MSG(tracee, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
 	UnUseTmpHeap(ERL_SUB_BIN_SIZE,p);
@@ -2010,9 +2146,7 @@ trace_proc(Process *c_p, Process *t_p, Eterm what, Eterm data)
 	mess = TUPLE4(hp, am_trace, t_p->common.id, what, data);
 	hp += 5;
 	erts_smp_mtx_lock(&smq_mtx);
-	if (ERTS_TRACE_FLAGS(t_p) & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
+	PATCH_TS(TFLGS_TS_TYPE(t_p), mess, hp, NULL, NULL);
 	send_to_port(
 #ifndef ERTS_SMP
 	    /* No fake schedule out and in again after an exit */
@@ -2042,7 +2176,7 @@ trace_proc(Process *c_p, Process *t_p, Eterm what, Eterm data)
 
 	sz_data = size_object(data);
 
-	need = sz_data + 5 + TS_SIZE(t_p);
+	need = sz_data + 5 + PATCH_TS_SIZE(t_p);
 
 	hp = ERTS_ALLOC_SYSMSG_HEAP(need, &bp, &off_heap, tracer_ref);
 
@@ -2052,9 +2186,7 @@ trace_proc(Process *c_p, Process *t_p, Eterm what, Eterm data)
 
 	erts_smp_mtx_lock(&smq_mtx);
 
-	if (ERTS_TRACE_FLAGS(t_p) & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
+	PATCH_TS(TFLGS_TS_TYPE(t_p), mess, hp, bp, tracer_ref);
 
 	ERTS_ENQ_TRACE_MSG(t_p->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
@@ -2088,9 +2220,7 @@ trace_proc_spawn(Process *p, Eterm pid,
 	mess = TUPLE5(hp, am_trace, p->common.id, am_spawn, pid, mfa);
 	hp += 6;
 	erts_smp_mtx_lock(&smq_mtx);
-	if (ERTS_TRACE_FLAGS(p) & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
+	PATCH_TS(TFLGS_TS_TYPE(p), mess, hp, NULL, NULL);
 	send_to_port(p, mess, &ERTS_TRACER_PROC(p), &ERTS_TRACE_FLAGS(p));
 	UnUseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 #undef LOCAL_HEAP_SIZE
@@ -2111,7 +2241,7 @@ trace_proc_spawn(Process *p, Eterm pid,
 
 	sz_args = size_object(args);
 	sz_pid = size_object(pid);
-	need = sz_args + 4 + 6 + TS_SIZE(p);
+	need = sz_args + 4 + 6 + PATCH_TS_SIZE(p);
 
 	hp = ERTS_ALLOC_SYSMSG_HEAP(need, &bp, &off_heap, tracer_ref);
 
@@ -2124,9 +2254,7 @@ trace_proc_spawn(Process *p, Eterm pid,
 
 	erts_smp_mtx_lock(&smq_mtx);
 
-	if (ERTS_TRACE_FLAGS(p) & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
+	PATCH_TS(TFLGS_TS_TYPE(p), mess, hp, bp, tracer_ref);
 
 	ERTS_ENQ_TRACE_MSG(p->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
@@ -2163,11 +2291,6 @@ void save_calls(Process *p, Export *e)
 void
 trace_gc(Process *p, Eterm what)
 {
-    ERTS_DECL_AM(bin_vheap_size);
-    ERTS_DECL_AM(bin_vheap_block_size);
-    ERTS_DECL_AM(bin_old_vheap_size);
-    ERTS_DECL_AM(bin_old_vheap_block_size);
-
     ErlHeapFragment *bp = NULL;
     ErlOffHeap *off_heap;
     ERTS_TRACER_REF_TYPE tracer_ref = ERTS_NULL_TRACER_REF;	/* Initialized
@@ -2178,43 +2301,10 @@ trace_gc(Process *p, Eterm what)
     Eterm msg = NIL;
     Uint size;
 
-    Eterm tags[] = {
-	am_old_heap_block_size,
-	am_heap_block_size,
-	am_mbuf_size,
-	am_recent_size,
-	am_stack_size,
-	am_old_heap_size,
-	am_heap_size,
-	AM_bin_vheap_size,
-	AM_bin_vheap_block_size,
-	AM_bin_old_vheap_size,
-	AM_bin_old_vheap_block_size
-    };
-
-    UWord values[] = {
-	OLD_HEAP(p) ? OLD_HEND(p) - OLD_HEAP(p) : 0,
-	HEAP_SIZE(p),
-	MBUF_SIZE(p),
-	HIGH_WATER(p) - HEAP_START(p),
-	STACK_START(p) - p->stop,
-	OLD_HEAP(p) ? OLD_HTOP(p) - OLD_HEAP(p) : 0,
-	HEAP_TOP(p) - HEAP_START(p),
-	MSO(p).overhead,
-	BIN_VHEAP_SZ(p),
-	BIN_OLD_VHEAP(p),
-	BIN_OLD_VHEAP_SZ(p)
-    };
 #define LOCAL_HEAP_SIZE						\
-    (sizeof(values)/sizeof(*values)) *				\
-	(2/*cons*/ + 3/*2-tuple*/ + BIG_UINT_HEAP_SIZE) +	\
-	5/*4-tuple */ + TS_HEAP_WORDS
+    (ERTS_PROCESS_GC_INFO_MAX_SIZE) +                           \
+	5/*4-tuple */ + ERTS_TRACE_PATCH_TS_MAX_SIZE
     DeclareTmpHeap(local_heap,LOCAL_HEAP_SIZE,p);
-#ifdef DEBUG
-    Eterm* limit;
-#endif
-
-    ERTS_CT_ASSERT(sizeof(values)/sizeof(*values) == sizeof(tags)/sizeof(Eterm));
 
     UseTmpHeap(LOCAL_HEAP_SIZE,p);
 
@@ -2222,12 +2312,9 @@ trace_gc(Process *p, Eterm what)
 	hp = local_heap;
 #ifdef DEBUG
 	size = 0;
-	(void) erts_bld_atom_uword_2tup_list(NULL,
-					    &size,
-					    sizeof(values)/sizeof(*values),
-					    tags,
-					    values);
-	size += 5/*4-tuple*/ + TS_SIZE(p);
+        (void) erts_process_gc_info(p, &size, NULL);
+
+	size += 5/*4-tuple*/ + PATCH_TS_SIZE(p);
 #endif
     } else {
 	ASSERT(is_internal_pid(ERTS_TRACER_PROC(p)));
@@ -2237,40 +2324,30 @@ trace_gc(Process *p, Eterm what)
 			    ERTS_TRACE_FLAGS(p));
 
 	size = 0;
-	(void) erts_bld_atom_uword_2tup_list(NULL,
-					    &size,
-					    sizeof(values)/sizeof(*values),
-					    tags,
-					    values);
-	size += 5/*4-tuple*/ + TS_SIZE(p);
+        (void) erts_process_gc_info(p, &size, NULL);
+
+	size += 5/*4-tuple*/ + PATCH_TS_SIZE(p);
 
 	hp = ERTS_ALLOC_SYSMSG_HEAP(size, &bp, &off_heap, tracer_ref);
     }
 
-#ifdef DEBUG
-    limit = hp + size;
     ASSERT(size <= LOCAL_HEAP_SIZE);
-#endif
 
-    msg = erts_bld_atom_uword_2tup_list(&hp,
-				       NULL,
-				       sizeof(values)/sizeof(*values),
-				       tags,
-				       values);
+    msg = erts_process_gc_info(p, NULL, &hp);
 
     msg = TUPLE4(hp, am_trace, p->common.id, what, msg);
     hp += 5;
 
     erts_smp_mtx_lock(&smq_mtx);
 
-    if (ERTS_TRACE_FLAGS(p) & F_TIMESTAMP) {
-	hp = patch_ts(msg, hp);
-    }
-    ASSERT(hp == limit);
-    if (is_internal_port(ERTS_TRACER_PROC(p)))
+    if (is_internal_port(ERTS_TRACER_PROC(p))) {
+	PATCH_TS(TFLGS_TS_TYPE(p), msg, hp, NULL, NULL);
 	send_to_port(p, msg, &ERTS_TRACER_PROC(p), &ERTS_TRACE_FLAGS(p));
-    else
+    }
+    else {
+	PATCH_TS(TFLGS_TS_TYPE(p), msg, hp, bp, tracer_ref);
 	ERTS_ENQ_TRACE_MSG(p->common.id, tracer_ref, msg, bp);
+    }
     erts_smp_mtx_unlock(&smq_mtx);
     UnUseTmpHeap(LOCAL_HEAP_SIZE,p);
 #undef LOCAL_HEAP_SIZE
@@ -2332,7 +2409,11 @@ monitor_long_schedule_proc(Process *p, BeamInstr *in_fp, BeamInstr *out_fp, Uint
 #ifdef ERTS_SMP
     enqueue_sys_msg(SYS_MSG_TYPE_SYSMON, p->common.id, NIL, msg, bp);
 #else
-    erts_queue_message(monitor_p, NULL, bp, msg, NIL);
+    {
+	ErtsMessage *mp = erts_alloc_message(0, NULL);
+	mp->data.heap_frag = bp;
+	erts_queue_message(monitor_p, NULL, mp, msg, NIL);
+    }
 #endif
 }
 void 
@@ -2393,7 +2474,11 @@ monitor_long_schedule_port(Port *pp, ErtsPortTaskType type, Uint time)
 #ifdef ERTS_SMP
     enqueue_sys_msg(SYS_MSG_TYPE_SYSMON, pp->common.id, NIL, msg, bp);
 #else
-    erts_queue_message(monitor_p, NULL, bp, msg, NIL);
+    {
+	ErtsMessage *mp = erts_alloc_message(0, NULL);
+	mp->data.heap_frag = bp;
+	erts_queue_message(monitor_p, NULL, mp, msg, NIL);
+    }
 #endif
 }
 
@@ -2464,7 +2549,11 @@ monitor_long_gc(Process *p, Uint time) {
 #ifdef ERTS_SMP
     enqueue_sys_msg(SYS_MSG_TYPE_SYSMON, p->common.id, NIL, msg, bp);
 #else
-    erts_queue_message(monitor_p, NULL, bp, msg, NIL);
+    {
+	ErtsMessage *mp = erts_alloc_message(0, NULL);
+	mp->data.heap_frag = bp;
+	erts_queue_message(monitor_p, NULL, mp, msg, NIL);
+    }
 #endif
 }
 
@@ -2535,7 +2624,11 @@ monitor_large_heap(Process *p) {
 #ifdef ERTS_SMP
     enqueue_sys_msg(SYS_MSG_TYPE_SYSMON, p->common.id, NIL, msg, bp);
 #else
-    erts_queue_message(monitor_p, NULL, bp, msg, NIL);
+    {
+	ErtsMessage *mp = erts_alloc_message(0, NULL);
+	mp->data.heap_frag = bp;
+	erts_queue_message(monitor_p, NULL, mp, msg, NIL);
+    }
 #endif
 }
 
@@ -2563,7 +2656,11 @@ monitor_generic(Process *p, Eterm type, Eterm spec) {
 #ifdef ERTS_SMP
     enqueue_sys_msg(SYS_MSG_TYPE_SYSMON, p->common.id, NIL, msg, bp);
 #else
-    erts_queue_message(monitor_p, NULL, bp, msg, NIL);
+    {
+	ErtsMessage *mp = erts_alloc_message(0, NULL);
+	mp->data.heap_frag = bp;
+	erts_queue_message(monitor_p, NULL, mp, msg, NIL);
+    }
 #endif
 
 }
@@ -2574,19 +2671,18 @@ monitor_generic(Process *p, Eterm type, Eterm spec) {
 
 void
 profile_scheduler(Eterm scheduler_id, Eterm state) {
-    Eterm *hp, msg, timestamp;
-    Uint Ms, s, us;
+    Eterm *hp, msg;
+    ErlHeapFragment *bp = NULL;
 
 #ifndef ERTS_SMP
-#define LOCAL_HEAP_SIZE (4 + 7)
+#define LOCAL_HEAP_SIZE (7 + ERTS_TRACE_PATCH_TS_MAX_SIZE)
     DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
     UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
     hp = local_heap;
 #else
-    ErlHeapFragment *bp;
     Uint hsz;
 
-    hsz = 4 + 7;
+    hsz = 7 + patch_ts_size(erts_system_profile_ts_type)-1;
 	
     bp = new_message_buffer(hsz);
     hp = bp->mem;
@@ -2606,10 +2702,13 @@ profile_scheduler(Eterm scheduler_id, Eterm state) {
 	break;
     }
 
-    GET_NOW(&Ms, &s, &us);
-    timestamp = TUPLE3(hp, make_small(Ms), make_small(s), make_small(us)); hp += 4;
-    msg = TUPLE6(hp, am_profile, am_scheduler, scheduler_id, state,
-		 make_small(active_sched), timestamp); hp += 7;
+    msg = TUPLE6(hp, am_profile, am_scheduler, scheduler_id,
+		 state, make_small(active_sched),
+		 NIL /* Will be overwritten by timestamp */);
+    hp += 7;
+
+    /* Write timestamp in element 6 of the 'msg' tuple */
+    hp[-1] = write_ts(erts_system_profile_ts_type, hp, bp, NULL);
 
 #ifndef ERTS_SMP
     profile_send(NIL, msg);
@@ -2680,7 +2779,7 @@ trace_port_open(Port *p, Eterm calling_pid, Eterm drv_name) {
     Eterm* hp;
 
     if (is_internal_port(ERTS_TRACER_PROC(p))) {
-#define LOCAL_HEAP_SIZE (5+6)
+#define LOCAL_HEAP_SIZE (6+ERTS_TRACE_PATCH_TS_MAX_SIZE)
 	DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
 	UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 
@@ -2689,9 +2788,7 @@ trace_port_open(Port *p, Eterm calling_pid, Eterm drv_name) {
 	mess = TUPLE5(hp, am_trace, calling_pid, am_open, p->common.id, drv_name);
 	hp += 6;
 	erts_smp_mtx_lock(&smq_mtx);
-	if (ERTS_TRACE_FLAGS(p) & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
+	PATCH_TS(TFLGS_TS_TYPE(p), mess, hp, NULL, NULL);
 	/* No fake schedule */
 	send_to_port(NULL, mess, &ERTS_TRACER_PROC(p), &ERTS_TRACE_FLAGS(p));
 	UnUseTmpHeapNoproc(LOCAL_HEAP_SIZE);
@@ -2705,7 +2802,7 @@ trace_port_open(Port *p, Eterm calling_pid, Eterm drv_name) {
 	
 	ASSERT(is_internal_pid(ERTS_TRACER_PROC(p)));
 
-	sz_data = 6 + TS_SIZE(p);
+	sz_data = 6 + PATCH_TS_SIZE(p);
 
 	ERTS_GET_TRACER_REF(tracer_ref,
 			    ERTS_TRACER_PROC(p),
@@ -2718,9 +2815,7 @@ trace_port_open(Port *p, Eterm calling_pid, Eterm drv_name) {
 
 	erts_smp_mtx_lock(&smq_mtx);
 
-	if (ERTS_TRACE_FLAGS(p) & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
+	PATCH_TS(TFLGS_TS_TYPE(p), mess, hp, bp, tracer_ref);
 
 	ERTS_ENQ_TRACE_MSG(p->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
@@ -2744,7 +2839,7 @@ trace_port(Port *t_p, Eterm what, Eterm data) {
 		       || erts_thr_progress_is_blocking());
 
     if (is_internal_port(ERTS_TRACER_PROC(t_p))) {
-#define LOCAL_HEAP_SIZE (5+5)
+#define LOCAL_HEAP_SIZE (5+ERTS_TRACE_PATCH_TS_MAX_SIZE)
 	DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
 	UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 
@@ -2752,9 +2847,7 @@ trace_port(Port *t_p, Eterm what, Eterm data) {
 	mess = TUPLE4(hp, am_trace, t_p->common.id, what, data);
 	hp += 5;
 	erts_smp_mtx_lock(&smq_mtx);
-	if (ERTS_TRACE_FLAGS(t_p) & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
+	PATCH_TS(TFLGS_TS_TYPE(t_p), mess, hp, NULL, NULL);
 	/* No fake schedule */
 	send_to_port(NULL,mess,&ERTS_TRACER_PROC(t_p),&ERTS_TRACE_FLAGS(t_p));
 	UnUseTmpHeapNoproc(LOCAL_HEAP_SIZE);
@@ -2768,7 +2861,7 @@ trace_port(Port *t_p, Eterm what, Eterm data) {
 
 	ASSERT(is_internal_pid(ERTS_TRACER_PROC(t_p)));
 
-	sz_data = 5 + TS_SIZE(t_p);
+	sz_data = 5 + PATCH_TS_SIZE(t_p);
 
 	ERTS_GET_TRACER_REF(tracer_ref,
 			    ERTS_TRACER_PROC(t_p),
@@ -2781,9 +2874,7 @@ trace_port(Port *t_p, Eterm what, Eterm data) {
 
 	erts_smp_mtx_lock(&smq_mtx);
 
-	if (ERTS_TRACE_FLAGS(t_p) & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
+	PATCH_TS(TFLGS_TS_TYPE(t_p), mess, hp, bp, tracer_ref);
 
 	ERTS_ENQ_TRACE_MSG(t_p->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
@@ -2811,7 +2902,7 @@ trace_sched_ports_where(Port *p, Eterm what, Eterm where) {
     Eterm sched_id = am_undefined;
     
     if (is_internal_port(ERTS_TRACER_PROC(p))) {
-#define LOCAL_HEAP_SIZE (5+6)
+#define LOCAL_HEAP_SIZE (6+ERTS_TRACE_PATCH_TS_MAX_SIZE)
 	DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
 	UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 
@@ -2834,9 +2925,8 @@ trace_sched_ports_where(Port *p, Eterm what, Eterm where) {
 	hp += ws;
 	
 	erts_smp_mtx_lock(&smq_mtx);
-	if (ERTS_TRACE_FLAGS(p) & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
+
+	PATCH_TS(TFLGS_TS_TYPE(p), mess, hp, NULL, NULL);
 	
 	/* No fake scheduling */
 	send_to_port(NULL, mess, &ERTS_TRACER_PROC(p), &ERTS_TRACE_FLAGS(p));
@@ -2856,7 +2946,7 @@ trace_sched_ports_where(Port *p, Eterm what, Eterm where) {
 			    ERTS_TRACER_PROC(p),
 			    ERTS_TRACE_FLAGS(p));
 
-	hp = ERTS_ALLOC_SYSMSG_HEAP(ws+TS_SIZE(p), &bp, &off_heap, tracer_ref);
+	hp = ERTS_ALLOC_SYSMSG_HEAP(ws+PATCH_TS_SIZE(p), &bp, &off_heap, tracer_ref);
 
 	if (IS_TRACED_FL(p, F_TRACE_SCHED_NO)) {
 #ifdef ERTS_SMP
@@ -2874,10 +2964,7 @@ trace_sched_ports_where(Port *p, Eterm what, Eterm where) {
 
 	erts_smp_mtx_lock(&smq_mtx);
 
-	if (ERTS_TRACE_FLAGS(p) & F_TIMESTAMP) {
-	    hp = patch_ts(mess, hp);
-	}
-
+	PATCH_TS(TFLGS_TS_TYPE(p), mess, hp, bp, tracer_ref);
 	ERTS_ENQ_TRACE_MSG(p->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
     }
@@ -2887,13 +2974,12 @@ trace_sched_ports_where(Port *p, Eterm what, Eterm where) {
 
 void
 profile_runnable_port(Port *p, Eterm status) {
-    Uint Ms, s, us;
-    Eterm *hp, msg, timestamp;
-
+    Eterm *hp, msg;
+    ErlHeapFragment *bp = NULL;
     Eterm count = make_small(0);
 
 #ifndef ERTS_SMP
-#define LOCAL_HEAP_SIZE (4 + 6)
+#define LOCAL_HEAP_SIZE (6 + ERTS_TRACE_PATCH_TS_MAX_SIZE)
 
     DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
     UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
@@ -2901,10 +2987,9 @@ profile_runnable_port(Port *p, Eterm status) {
     hp = local_heap;
     
 #else
-    ErlHeapFragment *bp;
     Uint hsz;
 
-    hsz = 4 + 6;
+    hsz = 6 + patch_ts_size(erts_system_profile_ts_type)-1;
 
     bp = new_message_buffer(hsz);
     hp = bp->mem;
@@ -2912,9 +2997,12 @@ profile_runnable_port(Port *p, Eterm status) {
 
     erts_smp_mtx_lock(&smq_mtx);
 
-    GET_NOW(&Ms, &s, &us);
-    timestamp = TUPLE3(hp, make_small(Ms), make_small(s), make_small(us)); hp += 4;
-    msg = TUPLE5(hp, am_profile, p->common.id, status, count, timestamp); hp += 6;
+    msg = TUPLE5(hp, am_profile, p->common.id, status, count,
+		 NIL /* Will be overwritten by timestamp */);
+    hp += 6;
+
+    /* Write timestamp in element 5 of the 'msg' tuple */
+    hp[-1] = write_ts(erts_system_profile_ts_type, hp, bp, NULL);
 
 #ifndef ERTS_SMP
     profile_send(p->common.id, msg);
@@ -2929,20 +3017,19 @@ profile_runnable_port(Port *p, Eterm status) {
 /* Process profiling */
 void 
 profile_runnable_proc(Process *p, Eterm status){
-    Uint Ms, s, us;
-    Eterm *hp, msg, timestamp;
+    Eterm *hp, msg;
     Eterm where = am_undefined;
+    ErlHeapFragment *bp = NULL;
 
 #ifndef ERTS_SMP
-#define LOCAL_HEAP_SIZE (4 + 6 + 4)
+#define LOCAL_HEAP_SIZE (4 + 6 + ERTS_TRACE_PATCH_TS_MAX_SIZE)
 
     DeclareTmpHeapNoproc(local_heap,LOCAL_HEAP_SIZE);
     UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 
     hp = local_heap;
 #else
-    ErlHeapFragment *bp;
-    Uint hsz = 4 + 6 + 4;
+    Uint hsz = 4 + 6 + patch_ts_size(erts_system_profile_ts_type)-1;
 #endif
 	
     if (!p->current) {
@@ -2951,7 +3038,7 @@ profile_runnable_proc(Process *p, Eterm status){
 
 #ifdef ERTS_SMP
     if (!p->current) {
-	hsz = 4 + 6;
+	hsz -= 4;
     }
 
     bp = new_message_buffer(hsz);
@@ -2966,9 +3053,13 @@ profile_runnable_proc(Process *p, Eterm status){
 	
     erts_smp_mtx_lock(&smq_mtx);
 
-    GET_NOW(&Ms, &s, &us);
-    timestamp = TUPLE3(hp, make_small(Ms), make_small(s), make_small(us)); hp += 4;
-    msg = TUPLE5(hp, am_profile, p->common.id, status, where, timestamp); hp += 6;
+    msg = TUPLE5(hp, am_profile, p->common.id, status, where,
+		 NIL /* Will be overwritten by timestamp */);
+    hp += 6;
+
+    /* Write timestamp in element 5 of the 'msg' tuple */
+    hp[-1] = write_ts(erts_system_profile_ts_type, hp, bp, NULL);
+
 #ifndef ERTS_SMP
     profile_send(p->common.id, msg);
     UnUseTmpHeapNoproc(LOCAL_HEAP_SIZE);
@@ -3297,8 +3388,6 @@ sys_msg_dispatcher_func(void *unused)
 	    if (erts_thr_progress_update(NULL))
 		erts_thr_progress_leader_update(NULL);
 
-	    ERTS_SCHED_FAIR_YIELD();
-
 #ifdef DEBUG_PRINTOUTS
 	    print_msg_type(smqp);
 #endif
@@ -3357,8 +3446,11 @@ sys_msg_dispatcher_func(void *unused)
 		    goto failure;
 		}
 		else {
+		    ErtsMessage *mp;
 		queue_proc_msg:
-		    erts_queue_message(proc,&proc_locks,smqp->bp,smqp->msg,NIL);
+		    mp = erts_alloc_message(0, NULL);
+		    mp->data.heap_frag = smqp->bp;
+		    erts_queue_message(proc,&proc_locks,mp,smqp->msg,NIL);
 #ifdef DEBUG_PRINTOUTS
 		    erts_fprintf(stderr, "delivered\n");
 #endif
@@ -3453,9 +3545,6 @@ static void
 init_sys_msg_dispatcher(void)
 {
     erts_smp_thr_opts_t thr_opts = ERTS_SMP_THR_OPTS_DEFAULT_INITER;
-#ifdef __OSE__
-    thr_opts.coreNo   = 0;
-#endif
     thr_opts.detached = 1;
     thr_opts.name = "sys_msg_dispatcher";
     init_smq_element_alloc();
@@ -3463,7 +3552,6 @@ init_sys_msg_dispatcher(void)
     sys_message_queue_end = NULL;
     erts_smp_cnd_init(&smq_cnd);
     erts_smp_mtx_init(&smq_mtx, "sys_msg_q");
-
     erts_smp_thr_create(&sys_msg_dispatcher_tid,
 			sys_msg_dispatcher_func,
 			NULL,
diff --git a/erts/emulator/beam/erl_trace.h b/erts/emulator/beam/erl_trace.h
index 7405490f76..a0058264d7 100644
--- a/erts/emulator/beam/erl_trace.h
+++ b/erts/emulator/beam/erl_trace.h
@@ -18,8 +18,38 @@
  * %CopyrightEnd%
  */
 
+#ifndef ERL_TRACE_H__FLAGS__
+#define ERL_TRACE_H__FLAGS__
+/*
+ * NOTE! The bits used for these flags matter. The flag with
+ * the least significant bit will take precedence!
+ *
+ * The "now timestamp" has highest precedence due to
+ * compatibility reasons.
+ */
+#define ERTS_TRACE_FLG_NOW_TIMESTAMP			(1 << 0)
+#define ERTS_TRACE_FLG_STRICT_MONOTONIC_TIMESTAMP	(1 << 1)
+#define ERTS_TRACE_FLG_MONOTONIC_TIMESTAMP		(1 << 2)
+
+/*
+ * The bits used effects trace flags (of processes and ports)
+ * as well as sequential trace flags. If changed make sure
+ * these arn't messed up...
+ */
+#define ERTS_TRACE_TS_TYPE_BITS 			3
+#define ERTS_TRACE_TS_TYPE_MASK					\
+    ((1 << ERTS_TRACE_TS_TYPE_BITS) - 1)
+
+#define ERTS_TFLGS2TSTYPE(TFLGS)				\
+    ((int) (((TFLGS) >> ERTS_TRACE_FLAGS_TS_TYPE_SHIFT) 	\
+	    & ERTS_TRACE_TS_TYPE_MASK))
+#define ERTS_SEQTFLGS2TSTYPE(SEQTFLGS)				\
+    ((int) (((SEQTFLGS) >> ERTS_SEQ_TRACE_FLAGS_TS_TYPE_SHIFT)	\
+	    & ERTS_TRACE_TS_TYPE_MASK))
+
+#endif /* ERL_TRACE_H__FLAGS__ */
 
-#ifndef ERL_TRACE_H__
+#if !defined(ERL_TRACE_H__) && !defined(ERTS_ONLY_INCLUDE_TRACE_FLAGS)
 #define ERL_TRACE_H__
 
 struct binary;
diff --git a/erts/emulator/beam/erl_unicode.c b/erts/emulator/beam/erl_unicode.c
index 551717139d..36d85b0a22 100644
--- a/erts/emulator/beam/erl_unicode.c
+++ b/erts/emulator/beam/erl_unicode.c
@@ -2507,7 +2507,7 @@ void erts_copy_utf8_to_utf16_little(byte *target, byte *bytes, int num_chars)
 		((Uint) (bytes[3] & ((byte) 0x3F)));
 	    bytes += 4;
 	} else {
-	    erl_exit(1,"Internal unicode error in prim_file:internal_name2native/1");
+	    erts_exit(ERTS_ERROR_EXIT,"Internal unicode error in prim_file:internal_name2native/1");
 	}
 	*target++ = (byte) (unipoint & 0xFF);
 	*target++ = (byte) ((unipoint >> 8) & 0xFF);
diff --git a/erts/emulator/beam/erl_utils.h b/erts/emulator/beam/erl_utils.h
index 6dab3bf297..640969daf0 100644
--- a/erts/emulator/beam/erl_utils.h
+++ b/erts/emulator/beam/erl_utils.h
@@ -115,7 +115,7 @@ void erts_silence_warn_unused_result(long unused);
 int erts_fit_in_bits_int64(Sint64);
 int erts_fit_in_bits_int32(Sint32);
 int erts_fit_in_bits_uint(Uint);
-int erts_list_length(Eterm);
+Sint erts_list_length(Eterm);
 int erts_is_builtin(Eterm, Eterm, int);
 Uint32 make_broken_hash(Eterm);
 Uint32 block_hash(byte *, unsigned, Uint32);
@@ -157,51 +157,46 @@ void erts_init_utils_mem(void);
 erts_dsprintf_buf_t *erts_create_tmp_dsbuf(Uint);
 void erts_destroy_tmp_dsbuf(erts_dsprintf_buf_t *);
 
-#if HALFWORD_HEAP
-int eq_rel(Eterm a, Eterm* a_base, Eterm b, Eterm* b_base);
-#  define eq(A,B) eq_rel(A,NULL,B,NULL)
-#else
 int eq(Eterm, Eterm);
-#  define eq_rel(A,A_BASE,B,B_BASE) eq(A,B)
-#endif
 
 #define EQ(x,y) (((x) == (y)) || (is_not_both_immed((x),(y)) && eq((x),(y))))
 
-#if HALFWORD_HEAP
-Sint erts_cmp_rel_opt(Eterm, Eterm*, Eterm, Eterm*, int, int);
-#define cmp_rel(A,A_BASE,B,B_BASE)       erts_cmp_rel_opt(A,A_BASE,B,B_BASE,0,0)
-#define cmp_rel_term(A,A_BASE,B,B_BASE)  erts_cmp_rel_opt(A,A_BASE,B,B_BASE,1,0)
-#define CMP(A,B)                         erts_cmp_rel_opt(A,NULL,B,NULL,0,0)
-#define CMP_TERM(A,B)                    erts_cmp_rel_opt(A,NULL,B,NULL,1,0)
-#define CMP_EQ_ONLY(A,B)                 erts_cmp_rel_opt(A,NULL,B,NULL,0,1)
-#else
+int erts_cmp_atoms(Eterm a, Eterm b);
 Sint erts_cmp(Eterm, Eterm, int, int);
+Sint erts_cmp_compound(Eterm, Eterm, int, int);
 Sint cmp(Eterm a, Eterm b);
-#define cmp_rel(A,A_BASE,B,B_BASE)       erts_cmp(A,B,0,0)
-#define cmp_rel_term(A,A_BASE,B,B_BASE)  erts_cmp(A,B,1,0)
 #define CMP(A,B)                         erts_cmp(A,B,0,0)
 #define CMP_TERM(A,B)                    erts_cmp(A,B,1,0)
 #define CMP_EQ_ONLY(A,B)                 erts_cmp(A,B,0,1)
-#endif
 
-#define cmp_lt(a,b)          (CMP((a),(b)) <  0)
-#define cmp_le(a,b)          (CMP((a),(b)) <= 0)
-#define cmp_eq(a,b)          (CMP_EQ_ONLY((a),(b)) == 0)
-#define cmp_ne(a,b)          (CMP_EQ_ONLY((a),(b)) != 0)
-#define cmp_ge(a,b)          (CMP((a),(b)) >= 0)
-#define cmp_gt(a,b)          (CMP((a),(b)) >  0)
-
-#define cmp_lt_term(a,b)     (CMP_TERM((a),(b)) <  0)
-#define cmp_le_term(a,b)     (CMP_TERM((a),(b)) <= 0)
-#define cmp_ge_term(a,b)     (CMP_TERM((a),(b)) >= 0)
-#define cmp_gt_term(a,b)     (CMP_TERM((a),(b)) >  0)
-
-#define CMP_LT(a,b)          ((a) != (b) && cmp_lt((a),(b)))
-#define CMP_GE(a,b)          ((a) == (b) || cmp_ge((a),(b)))
-#define CMP_EQ(a,b)          ((a) == (b) || cmp_eq((a),(b)))
-#define CMP_NE(a,b)          ((a) != (b) && cmp_ne((a),(b)))
-
-#define CMP_LT_TERM(a,b)     ((a) != (b) && cmp_lt_term((a),(b)))
-#define CMP_GE_TERM(a,b)     ((a) == (b) || cmp_ge_term((a),(b)))
+#define CMP_LT(a,b)          ((a) != (b) && CMP((a),(b)) <  0)
+#define CMP_LE(a,b)          ((a) == (b) || CMP((a),(b)) <= 0)
+#define CMP_EQ(a,b)          ((a) == (b) || CMP_EQ_ONLY((a),(b)) == 0)
+#define CMP_NE(a,b)          ((a) != (b) && CMP_EQ_ONLY((a),(b)) != 0)
+#define CMP_GE(a,b)          ((a) == (b) || CMP((a),(b)) >= 0)
+#define CMP_GT(a,b)          ((a) != (b) && CMP((a),(b)) >  0)
+
+#define CMP_EQ_ACTION(X,Y,Action)	\
+    if ((X) != (Y)) { CMP_SPEC((X),(Y),!=,Action,1); }
+#define CMP_NE_ACTION(X,Y,Action)	\
+    if ((X) == (Y)) { Action; } else { CMP_SPEC((X),(Y),==,Action,1); }
+#define CMP_GE_ACTION(X,Y,Action)	\
+    if ((X) != (Y)) { CMP_SPEC((X),(Y),<,Action,0); }
+#define CMP_LT_ACTION(X,Y,Action)	\
+    if ((X) == (Y)) { Action; } else { CMP_SPEC((X),(Y),>=,Action,0); }
+
+#define CMP_SPEC(X,Y,Op,Action,EqOnly)				\
+    if (is_atom(X) && is_atom(Y)) {				\
+	if (erts_cmp_atoms(X, Y) Op 0) { Action; };		\
+    } else if (is_both_small(X, Y)) {				\
+	if (signed_val(X) Op signed_val(Y)) { Action; };	\
+    } else if (is_float(X) && is_float(Y)) {			\
+        FloatDef af, bf;					\
+        GET_DOUBLE(X, af);					\
+        GET_DOUBLE(Y, bf);					\
+        if (af.fd Op bf.fd) { Action; };			\
+    } else {							\
+	if (erts_cmp_compound(X,Y,0,EqOnly) Op 0) { Action; };	\
+    }
 
 #endif
diff --git a/erts/emulator/beam/erl_vm.h b/erts/emulator/beam/erl_vm.h
index 8948ca2ea9..98f27a1725 100644
--- a/erts/emulator/beam/erl_vm.h
+++ b/erts/emulator/beam/erl_vm.h
@@ -40,14 +40,6 @@
 #define MAX_ARG 255	        /* Max number of arguments allowed */
 #define MAX_REG 1024            /* Max number of x(N) registers used */
 
-/* Scheduler stores data for temporary heaps if
-   !HEAP_ON_C_STACK. Macros (*TmpHeap*) in global.h selects if we put temporary
-   heap data on the C stack or if we use the buffers in the scheduler data. */
-#define TMP_HEAP_SIZE 128            /* Number of Eterm in the schedulers
-				        small heap for transient heap data */
-#define ERL_ARITH_TMP_HEAP_SIZE 4    /* as does erl_arith... */
-#define BEAM_EMU_TMP_HEAP_SIZE  2    /* and beam_emu... */
-
 /*
  * The new arithmetic operations need some extra X registers in the register array.
  * so does the gc_bif's (i_gc_bif3 need 3 extra).
@@ -117,12 +109,8 @@
 #define HeapWordsLeft(p) (HEAP_LIMIT(p) - HEAP_TOP(p))
 
 #if defined(DEBUG) || defined(CHECK_FOR_HOLES)
-#if HALFWORD_HEAP
-# define ERTS_HOLE_MARKER (0xdeadbeef)
-#else
 # define ERTS_HOLE_MARKER (((0xdeadbeef << 24) << 8) | 0xdeadbeef)
-#endif
-#endif
+#endif /* egil: 32-bit ? */
 
 /*
  * Allocate heap memory on the ordinary heap, NEVER in a heap
@@ -153,6 +141,7 @@
 typedef struct op_entry {
    char* name;			/* Name of instruction. */
    Uint32 mask[3];		/* Signature mask. */
+   unsigned involves_r;		/* Needs special attention when matching. */
    int sz;			/* Number of loaded words. */
    char* pack;			/* Instructions for packing engine. */
    char* sign;			/* Signature string. */
diff --git a/erts/etc/ose/run_erl.h b/erts/emulator/beam/erlang_lttng.c
index bdc8b6c355..fce40eedc1 100644
--- a/erts/etc/ose/run_erl.h
+++ b/erts/emulator/beam/erlang_lttng.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2013. All Rights Reserved.
+ * Copyright Ericsson AB 1996-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.
@@ -17,14 +17,16 @@
  *
  * %CopyrightEnd%
  */
-#ifndef ERL_RUN_ERL_H
-#define ERL_RUN_ERL_H
-
-#include "ose.h"
-
-#include "erts.sig"
-
-int run_erl(int argc, char **argv);
-OS_PROCESS(run_erl_process);
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
 #endif
+
+#ifdef USE_LTTNG
+#define TRACEPOINT_CREATE_PROBES
+/*
+ * The header containing our TRACEPOINT_EVENTs.
+ */
+#define TRACEPOINT_DEFINE
+#include "erlang_lttng.h"
+#endif /* USE_LTTNG */
diff --git a/erts/emulator/beam/erlang_lttng.h b/erts/emulator/beam/erlang_lttng.h
new file mode 100644
index 0000000000..43ceeda671
--- /dev/null
+++ b/erts/emulator/beam/erlang_lttng.h
@@ -0,0 +1,424 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 1996-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%
+ */
+
+#ifdef USE_LTTNG
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER com_ericsson_otp
+
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "erlang_lttng.h"
+
+#if !defined(__ERLANG_LTTNG_H__) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define __ERLANG_LTTNG_H__
+
+#include <lttng/tracepoint.h>
+
+/* Schedulers */
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    scheduler_poll,
+    TP_ARGS(
+        int, id,
+        int, runnable
+    ),
+    TP_FIELDS(
+        ctf_integer(int, scheduler, id)
+        ctf_integer(int, runnable, runnable)
+    )
+)
+
+#ifndef LTTNG_CARRIER_STATS
+#define LTTNG_CARRIER_STATS
+typedef struct {
+    unsigned long no;
+    unsigned long size;
+} lttng_stat_values_t;
+
+typedef struct {
+    lttng_stat_values_t carriers;
+    lttng_stat_values_t blocks;
+} lttng_carrier_stats_t;
+#endif
+
+
+/* Port and Driver Scheduling */
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_start,
+    TP_ARGS(
+        char*, pid,
+        char*, driver,
+        char*, port
+    ),
+    TP_FIELDS(
+        ctf_string(pid, pid)
+        ctf_string(driver, driver)
+        ctf_string(port, port)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_init,
+    TP_ARGS(
+        char*, driver,
+        int, major,
+        int, minor,
+        int, flags
+    ),
+    TP_FIELDS(
+        ctf_string(driver, driver)
+        ctf_integer(int, major, major)
+        ctf_integer(int, minor, minor)
+        ctf_integer(int, flags, flags)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_outputv,
+    TP_ARGS(
+        char*, pid,
+        char*, port,
+        char*, driver,
+        size_t, bytes
+    ),
+    TP_FIELDS(
+        ctf_string(pid, pid)
+        ctf_string(port, port)
+        ctf_string(driver, driver)
+        ctf_integer(size_t, bytes, bytes)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_output,
+    TP_ARGS(
+        char*, pid,
+        char*, port,
+        char*, driver,
+        size_t, bytes
+    ),
+    TP_FIELDS(
+        ctf_string(pid, pid)
+        ctf_string(port, port)
+        ctf_string(driver, driver)
+        ctf_integer(size_t, bytes, bytes)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_ready_input,
+    TP_ARGS(
+        char*, pid,
+        char*, port,
+        char*, driver
+    ),
+    TP_FIELDS(
+        ctf_string(pid, pid)
+        ctf_string(port, port)
+        ctf_string(driver, driver)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_ready_output,
+    TP_ARGS(
+        char*, pid,
+        char*, port,
+        char*, driver
+    ),
+    TP_FIELDS(
+        ctf_string(pid, pid)
+        ctf_string(port, port)
+        ctf_string(driver, driver)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_event,
+    TP_ARGS(
+        char*, pid,
+        char*, port,
+        char*, driver
+    ),
+    TP_FIELDS(
+        ctf_string(pid, pid)
+        ctf_string(port, port)
+        ctf_string(driver, driver)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_timeout,
+    TP_ARGS(
+        char*, pid,
+        char*, port,
+        char*, driver
+    ),
+    TP_FIELDS(
+        ctf_string(pid, pid)
+        ctf_string(port, port)
+        ctf_string(driver, driver)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_stop_select,
+    TP_ARGS(
+        char*, driver
+    ),
+    TP_FIELDS(
+        ctf_string(driver, driver)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_flush,
+    TP_ARGS(
+        char*, pid,
+        char*, port,
+        char*, driver
+    ),
+    TP_FIELDS(
+        ctf_string(pid, pid)
+        ctf_string(port, port)
+        ctf_string(driver, driver)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_stop,
+    TP_ARGS(
+        char*, pid,
+        char*, driver,
+        char*, port
+    ),
+    TP_FIELDS(
+        ctf_string(pid, pid)
+        ctf_string(driver, driver)
+        ctf_string(port, port)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_process_exit,
+    TP_ARGS(
+        char*, pid,
+        char*, port,
+        char*, driver
+    ),
+    TP_FIELDS(
+        ctf_string(pid, pid)
+        ctf_string(port, port)
+        ctf_string(driver, driver)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_ready_async,
+    TP_ARGS(
+        char*, pid,
+        char*, port,
+        char*, driver
+    ),
+    TP_FIELDS(
+        ctf_string(pid, pid)
+        ctf_string(port, port)
+        ctf_string(driver, driver)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_finish,
+    TP_ARGS(
+        char*, driver
+    ),
+    TP_FIELDS(
+        ctf_string(driver, driver)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_call,
+    TP_ARGS(
+        char*, pid,
+        char*, port,
+        char*, driver,
+        unsigned int, command,
+        size_t, bytes
+    ),
+    TP_FIELDS(
+        ctf_string(pid, pid)
+        ctf_string(port, port)
+        ctf_string(driver, driver)
+        ctf_integer(unsigned int, command, command)
+        ctf_integer(size_t, bytes, bytes)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    driver_control,
+    TP_ARGS(
+        char*, pid,
+        char*, port,
+        char*, driver,
+        unsigned int, command,
+        size_t, bytes
+    ),
+    TP_FIELDS(
+        ctf_string(pid, pid)
+        ctf_string(port, port)
+        ctf_string(driver, driver)
+        ctf_integer(unsigned int, command, command)
+        ctf_integer(size_t, bytes, bytes)
+    )
+)
+
+/* Async pool */
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    aio_pool_get,
+    TP_ARGS(
+        char*, port,
+        int, length
+    ),
+    TP_FIELDS(
+        ctf_string(port, port)
+        ctf_integer(int, length, length)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    aio_pool_add,
+    TP_ARGS(
+        char*, port,
+        int, length
+    ),
+    TP_FIELDS(
+        ctf_string(port, port)
+        ctf_integer(int, length, length)
+    )
+)
+
+
+/* Memory Allocator */
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    carrier_create,
+    TP_ARGS(
+        const char*, type,
+        int, instance,
+        unsigned long, size,
+        lttng_carrier_stats_t *, mbcs,
+        lttng_carrier_stats_t *, sbcs
+    ),
+    TP_FIELDS(
+        ctf_string(type, type)
+        ctf_integer(int, instance, instance)
+        ctf_integer(unsigned long, size, size)
+        ctf_integer(unsigned long, mbc_carriers, mbcs->carriers.no)
+        ctf_integer(unsigned long, mbc_carriers_size, mbcs->carriers.size)
+        ctf_integer(unsigned long, mbc_blocks, mbcs->blocks.no)
+        ctf_integer(unsigned long, mbc_blocks_size, mbcs->blocks.size)
+        ctf_integer(unsigned long, sbc_carriers, sbcs->carriers.no)
+        ctf_integer(unsigned long, sbc_carriers_size, sbcs->carriers.size)
+        ctf_integer(unsigned long, sbc_blocks, sbcs->blocks.no)
+        ctf_integer(unsigned long, sbc_blocks_size, sbcs->blocks.size)
+    )
+)
+
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    carrier_destroy,
+    TP_ARGS(
+        const char*, type,
+        int, instance,
+        unsigned long, size,
+        lttng_carrier_stats_t *, mbcs,
+        lttng_carrier_stats_t *, sbcs
+    ),
+    TP_FIELDS(
+        ctf_string(type, type)
+        ctf_integer(int, instance, instance)
+        ctf_integer(unsigned long, size, size)
+        ctf_integer(unsigned long, mbc_carriers, mbcs->carriers.no)
+        ctf_integer(unsigned long, mbc_carriers_size, mbcs->carriers.size)
+        ctf_integer(unsigned long, mbc_blocks, mbcs->blocks.no)
+        ctf_integer(unsigned long, mbc_blocks_size, mbcs->blocks.size)
+        ctf_integer(unsigned long, sbc_carriers, sbcs->carriers.no)
+        ctf_integer(unsigned long, sbc_carriers_size, sbcs->carriers.size)
+        ctf_integer(unsigned long, sbc_blocks, sbcs->blocks.no)
+        ctf_integer(unsigned long, sbc_blocks_size, sbcs->blocks.size)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    carrier_pool_put,
+    TP_ARGS(
+        const char*, name,
+        int, instance,
+        unsigned long, size
+    ),
+    TP_FIELDS(
+        ctf_string(type, name)
+        ctf_integer(int, instance, instance)
+        ctf_integer(unsigned long, size, size)
+    )
+)
+
+TRACEPOINT_EVENT(
+    com_ericsson_otp,
+    carrier_pool_get,
+    TP_ARGS(
+        const char*, name,
+        int, instance,
+        unsigned long, size
+    ),
+    TP_FIELDS(
+        ctf_string(type, name)
+        ctf_integer(int, instance, instance)
+        ctf_integer(unsigned long, size, size)
+    )
+)
+
+#endif /* __ERLANG_LTTNG_H__ */
+#include <lttng/tracepoint-event.h>
+#endif /* USE_LTTNG */
diff --git a/erts/emulator/beam/export.c b/erts/emulator/beam/export.c
index 2420df36b5..581efe6eec 100644
--- a/erts/emulator/beam/export.c
+++ b/erts/emulator/beam/export.c
@@ -184,6 +184,9 @@ init_export_table(void)
     f.cmp  = (HCMP_FUN) export_cmp;
     f.alloc = (HALLOC_FUN) export_alloc;
     f.free = (HFREE_FUN) export_free;
+    f.meta_alloc = (HMALLOC_FUN) erts_alloc;
+    f.meta_free = (HMFREE_FUN) erts_free;
+    f.meta_print = (HMPRINT_FUN) erts_print;
 
     for (i=0; i<ERTS_NUM_CODE_IX; i++) {
 	erts_index_init(ERTS_ALC_T_EXPORT_TABLE, &export_tables[i], "export_list",
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index a85aa15403..10f03636ec 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -570,7 +570,7 @@ void erts_encode_ext(Eterm term, byte **ext)
     *ep++ = VERSION_MAGIC;
     ep = enc_term(NULL, term, ep, TERM_TO_BINARY_DFLAGS, NULL);
     if (!ep)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "%s:%d:erts_encode_ext(): Internal data structure error\n",
 		 __FILE__, __LINE__);
     *ext = ep;
@@ -967,19 +967,24 @@ erts_decode_dist_ext(ErtsHeapFactory* factory,
     return THE_NON_VALUE;
 }
 
-Eterm erts_decode_ext(ErtsHeapFactory* factory, byte **ext)
+Eterm erts_decode_ext(ErtsHeapFactory* factory, byte **ext, Uint32 flags)
 {
+    ErtsDistExternal ede, *edep;
     Eterm obj;
     byte *ep = *ext;
     if (*ep++ != VERSION_MAGIC) {
         erts_factory_undo(factory);
 	return THE_NON_VALUE;
     }
-    ep = dec_term(NULL, factory, ep, &obj, NULL);
+    if (flags) {
+        ASSERT(flags == ERTS_DIST_EXT_BTT_SAFE);
+        ede.flags = flags; /* a dummy struct just for the flags */
+        edep = &ede;
+    } else {
+        edep = NULL;
+    }
+    ep = dec_term(edep, factory, ep, &obj, NULL);
     if (!ep) {
-#ifdef DEBUG
-	bin_write(ERTS_PRINT_STDERR,NULL,*ext,500);
-#endif
 	return THE_NON_VALUE;
     }
     *ext = ep;
@@ -1559,7 +1564,7 @@ static BIF_RETTYPE binary_to_term_int(Process* p, Uint32 flags, Eterm bin, Binar
             b2t_destroy_context(ctx);
 
             if (ctx->u.dc.factory.hp > ctx->u.dc.factory.hp_end) {
-                erl_exit(1, ":%s, line %d: heap overrun by %d words(s)\n",
+                erts_exit(ERTS_ERROR_EXIT, ":%s, line %d: heap overrun by %d words(s)\n",
                          __FILE__, __LINE__, ctx->u.dc.factory.hp - ctx->u.dc.factory.hp_end);
             }
 	    erts_factory_close(&ctx->u.dc.factory);
@@ -1708,12 +1713,12 @@ erts_term_to_binary_simple(Process* p, Eterm Term, Uint size, int level, Uint fl
 
 	if ((endp = enc_term(NULL, Term, bytes, flags, NULL))
 	    == NULL) {
-	    erl_exit(1, "%s, line %d: bad term: %x\n",
+	    erts_exit(ERTS_ERROR_EXIT, "%s, line %d: bad term: %x\n",
 		     __FILE__, __LINE__, Term);
 	}
 	real_size = endp - bytes;
 	if (real_size > size) {
-	    erl_exit(1, "%s, line %d: buffer overflow: %d word(s)\n",
+	    erts_exit(ERTS_ERROR_EXIT, "%s, line %d: buffer overflow: %d word(s)\n",
 		     __FILE__, __LINE__, real_size - size);
 	}
 
@@ -1753,12 +1758,12 @@ erts_term_to_binary_simple(Process* p, Eterm Term, Uint size, int level, Uint fl
 	bytes[0] = VERSION_MAGIC;
 	if ((endp = enc_term(NULL, Term, bytes+1, flags, NULL))
 	    == NULL) {
-	    erl_exit(1, "%s, line %d: bad term: %x\n",
+	    erts_exit(ERTS_ERROR_EXIT, "%s, line %d: bad term: %x\n",
 		     __FILE__, __LINE__, Term);
 	}
 	real_size = endp - bytes;
 	if (real_size > size) {
-	    erl_exit(1, "%s, line %d: buffer overflow: %d word(s)\n",
+	    erts_exit(ERTS_ERROR_EXIT, "%s, line %d: buffer overflow: %d word(s)\n",
 		     __FILE__, __LINE__, endp - (bytes + size));
 	}
 	return erts_realloc_binary(bin, real_size);
@@ -2339,10 +2344,6 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
     Eterm val;
     FloatDef f;
     Sint r = 0;
-#if HALFWORD_HEAP
-    UWord wobj;
-#endif
-
 
     if (ctx) {
 	WSTACK_CHANGE_ALLOCATOR(s, ERTS_ALC_T_SAVED_ESTACK);
@@ -2362,11 +2363,8 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 
  outer_loop:
     while (!WSTACK_ISEMPTY(s)) {
-#if HALFWORD_HEAP
-	obj = (Eterm) (wobj = WSTACK_POP(s));
-#else
 	obj = WSTACK_POP(s);
-#endif
+
 	switch (val = WSTACK_POP(s)) {
 	case ENC_TERM:
 	    break;
@@ -2384,11 +2382,7 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 	    break;
 	case ENC_PATCH_FUN_SIZE:
 	    {
-#if HALFWORD_HEAP
-		byte* size_p = (byte *) wobj;
-#else
 		byte* size_p = (byte *) obj;
-#endif
 		put_int32(ep - size_p, size_p);
 	    }
 	    goto outer_loop;
@@ -2435,21 +2429,13 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 	case ENC_LAST_ARRAY_ELEMENT:
 	    /* obj is the tuple */
 	    {
-#if HALFWORD_HEAP
-		Eterm* ptr = (Eterm *) wobj;
-#else
 		Eterm* ptr = (Eterm *) obj;
-#endif
 		obj = *ptr;
 	    }
 	    break;
 	default:		/* ENC_LAST_ARRAY_ELEMENT+1 and upwards */
 	    {
-#if HALFWORD_HEAP
-		Eterm* ptr = (Eterm *) wobj;
-#else
 		Eterm* ptr = (Eterm *) obj;
-#endif
 		obj = *ptr++;
 		WSTACK_PUSH2(s, val-1, (UWord)ptr);
 	    }
@@ -2650,7 +2636,7 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 		    ASSERT(node_sz < 17);
 		    break;
 		default:
-		    erl_exit(1, "bad header\r\n");
+		    erts_exit(ERTS_ERROR_EXIT, "bad header\r\n");
 		}
 
 		ptr++;
@@ -2976,7 +2962,7 @@ dec_term(ErtsDistExternal *edep,
             case B2TDecodeList:
                 objp = next - 2;
                 while (n > 0) {
-                    objp[0] = (Eterm) COMPRESS_POINTER(next);
+                    objp[0] = (Eterm) next;
                     objp[1] = make_list(next);
                     next = objp;
                     objp -= 2;
@@ -2987,7 +2973,7 @@ dec_term(ErtsDistExternal *edep,
             case B2TDecodeTuple:
                 objp = next - 1;
                 while (n-- > 0) {
-                    objp[0] = (Eterm) COMPRESS_POINTER(next);
+                    objp[0] = (Eterm) next;
                     next = objp;
                     objp--;
                 }
@@ -3043,7 +3029,7 @@ dec_term(ErtsDistExternal *edep,
     while (next != NULL) {
 
 	objp = next;
-	next = (Eterm *) EXPAND_POINTER(*objp);
+	next = (Eterm *) *objp;
 
 	switch (*ep++) {
 	case INTEGER_EXT:
@@ -3051,7 +3037,7 @@ dec_term(ErtsDistExternal *edep,
 		Sint sn = get_int32(ep);
 
 		ep += 4;
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 		*objp = make_small(sn);
 #else
 		if (MY_IS_SSMALL(sn)) {
@@ -3174,7 +3160,7 @@ dec_term_atom_common:
 		reds -= n;
 	    }
 	    while (n-- > 0) {
-		objp[0] = (Eterm) COMPRESS_POINTER(next);
+		objp[0] = (Eterm) next;
 		next = objp;
 		objp--;
 	    }
@@ -3192,8 +3178,8 @@ dec_term_atom_common:
 	    *objp = make_list(hp);
             hp += 2 * n;
 	    objp = hp - 2;
-	    objp[0] = (Eterm) COMPRESS_POINTER((objp+1));
-	    objp[1] = (Eterm) COMPRESS_POINTER(next);
+	    objp[0] = (Eterm) (objp+1);
+	    objp[1] = (Eterm) next;
 	    next = objp;
 	    objp -= 2;
             n--;
@@ -3206,7 +3192,7 @@ dec_term_atom_common:
 		reds -= n;
 	    }
             while (n > 0) {
-		objp[0] = (Eterm) COMPRESS_POINTER(next);
+		objp[0] = (Eterm) next;
 		objp[1] = make_list(next);
 		next = objp;
 		objp -= 2;
@@ -3373,7 +3359,7 @@ dec_term_atom_common:
 		    RefThing *rtp = (RefThing *) hp;
 		    ref_num = (Uint32 *) (hp + REF_THING_HEAD_SIZE);
 
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 		    hp += REF_THING_HEAD_SIZE + ref_words/2 + 1;
 		    rtp->header = make_ref_thing_header(ref_words/2 + 1);
 #else
@@ -3384,13 +3370,13 @@ dec_term_atom_common:
 		}
 		else {
 		    ExternalThing *etp = (ExternalThing *) hp;
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 		    hp += EXTERNAL_THING_HEAD_SIZE + ref_words/2 + 1;
 #else
 		    hp += EXTERNAL_THING_HEAD_SIZE + ref_words;
 #endif
 
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 		    etp->header = make_external_ref_header(ref_words/2 + 1);
 #else
 		    etp->header = make_external_ref_header(ref_words);
@@ -3403,7 +3389,7 @@ dec_term_atom_common:
 		    ref_num = &(etp->data.ui32[0]);
 		}
 
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 		*(ref_num++) = ref_words /* 32-bit arity */;
 #endif
 		ref_num[0] = r0;
@@ -3411,7 +3397,7 @@ dec_term_atom_common:
 		    ref_num[i] = get_int32(ep);
 		    ep += 4;
 		}
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 		if ((1 + ref_words) % 2)
 		    ref_num[ref_words] = 0;
 #endif
@@ -3563,12 +3549,7 @@ dec_term_atom_common:
                 }
 		*objp = make_export(hp);
 		*hp++ = HEADER_EXPORT;
-#if HALFWORD_HEAP
-		*((UWord *) (UWord) hp) =  (UWord) erts_export_get_or_make_stub(mod, name, arity);
-		hp += 2;
-#else
 		*hp++ = (Eterm) erts_export_get_or_make_stub(mod, name, arity);
-#endif
 		break;
 	    }
 	    break;
@@ -3604,8 +3585,8 @@ dec_term_atom_common:
                     *objp          = make_flatmap(mp);
 
                     for (n = size; n; n--) {
-                        *vptr = (Eterm) COMPRESS_POINTER(next);
-                        *kptr = (Eterm) COMPRESS_POINTER(vptr);
+                        *vptr = (Eterm) next;
+                        *kptr = (Eterm) vptr;
                         next  = kptr;
                         vptr--;
                         kptr--;
@@ -3619,8 +3600,8 @@ dec_term_atom_common:
                     hamt->leaf_array = hp;
 
                     for (n = size; n; n--) {
-                        CDR(hp) = (Eterm) COMPRESS_POINTER(next);
-                        CAR(hp) = (Eterm) COMPRESS_POINTER(&CDR(hp));
+                        CDR(hp) = (Eterm) next;
+                        CAR(hp) = (Eterm) &CDR(hp);
                         next = &CAR(hp);
                         hp += 2;
                     }
@@ -3697,11 +3678,11 @@ dec_term_atom_common:
 
 		/* Environment */
 		for (i = num_free-1; i >= 0; i--) {
-		    funp->env[i] = (Eterm) COMPRESS_POINTER(next);
+		    funp->env[i] = (Eterm) next;
 		    next = funp->env + i;
 		}
 		/* Creator */
-		funp->creator = (Eterm) COMPRESS_POINTER(next);
+		funp->creator = (Eterm) next;
 		next = &(funp->creator);
 		break;
 	    }
@@ -3770,7 +3751,7 @@ dec_term_atom_common:
 
 		/* Environment */
 		for (i = num_free-1; i >= 0; i--) {
-		    funp->env[i] = (Eterm) COMPRESS_POINTER(next);
+		    funp->env[i] = (Eterm) next;
 		    next = funp->env + i;
 		}
 		break;
@@ -3897,7 +3878,7 @@ dec_term_atom_common:
     }
     WSTACK_DESTROY(flat_maps);
 
-    ASSERT((Eterm*)EXPAND_POINTER(*dbg_resultp) != NULL);
+    ASSERT((Eterm*)*dbg_resultp != NULL);
 
     if (ctx) {
         ctx->state = B2TDone;
@@ -4110,7 +4091,7 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 		    ASSERT(node_sz < 17);
 		    break;
 		default:
-		    erl_exit(1, "bad header\r\n");
+		    erts_exit(ERTS_ERROR_EXIT, "bad header\r\n");
 		}
 
 		ptr++;
@@ -4190,11 +4171,7 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 	case EXPORT_DEF:
 	    {
 		Export* ep = *((Export **) (export_val(obj) + 1));
-#if HALFWORD_HEAP
-		result += 2;
-#else
 		result += 1;
-#endif
 		result += encode_size_struct2(acmp, ep->code[0], dflags);
 		result += encode_size_struct2(acmp, ep->code[1], dflags);
 		result += encode_size_struct2(acmp, make_small(ep->code[2]), dflags);
@@ -4202,7 +4179,7 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 	    break;
 
 	default:
-	    erl_exit(1,"Internal data structure error (in encode_size_struct2)%x\n",
+	    erts_exit(ERTS_ERROR_EXIT,"Internal data structure error (in encode_size_struct2)%x\n",
 		     obj);
 	}
 
@@ -4309,7 +4286,7 @@ init_done:
 	switch (tag) {
 	case INTEGER_EXT:
 	    SKIP(4);
-#if !defined(ARCH_64) || HALFWORD_HEAP
+#if !defined(ARCH_64)
 	    heap_size += BIG_UINT_HEAP_SIZE;
 #endif
 	    break;
@@ -4398,7 +4375,7 @@ init_done:
 		ep += 2;
 		atom_extra_skip = 1 + 4*id_words;
 		/* In case it is an external ref */
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 		heap_size += EXTERNAL_THING_HEAD_SIZE + id_words/2 + 1;
 #else
 		heap_size += EXTERNAL_THING_HEAD_SIZE + id_words;
@@ -4484,11 +4461,7 @@ init_done:
 	    break;
 	case EXPORT_EXT:
 	    terms += 3;
-#if HALFWORD_HEAP
-	    heap_size += 3;
-#else
 	    heap_size += 2;
-#endif
 	    break;
 	case NEW_FUN_EXT:
 	    {
diff --git a/erts/emulator/beam/external.h b/erts/emulator/beam/external.h
index d12051c6b4..87eff2fe9f 100644
--- a/erts/emulator/beam/external.h
+++ b/erts/emulator/beam/external.h
@@ -191,7 +191,7 @@ Eterm erts_decode_dist_ext(ErtsHeapFactory* factory, ErtsDistExternal *);
 
 Sint erts_decode_ext_size(byte*, Uint);
 Sint erts_decode_ext_size_ets(byte*, Uint);
-Eterm erts_decode_ext(ErtsHeapFactory*, byte**);
+Eterm erts_decode_ext(ErtsHeapFactory*, byte**, Uint32 flags);
 Eterm erts_decode_ext_ets(ErtsHeapFactory*, byte*);
 
 Eterm erts_term_to_binary(Process* p, Eterm Term, int level, Uint flags);
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index ec9296d034..d7edf451be 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -310,9 +310,6 @@ typedef union {
 typedef struct proc_bin {
     Eterm thing_word;		/* Subtag REFC_BINARY_SUBTAG. */
     Uint size;			/* Binary size in bytes. */
-#if HALFWORD_HEAP
-    void* dummy_ptr_padding__;
-#endif
     struct erl_off_heap_header *next;
     Binary *val;		/* Pointer to Binary structure. */
     byte *bytes;		/* Pointer to the actual data bytes. */
@@ -383,7 +380,7 @@ extern int bif_reductions;      /* reductions + fcalls (when doing call_bif) */
 extern int stackdump_on_exit;
 
 /*
- * Here is an implementation of a lightweiht stack.
+ * Here is an implementation of a lightweight stack.
  *
  * Use it like this:
  *
@@ -428,7 +425,7 @@ void erl_grow_estack(ErtsEStack*, Uint need);
 #define ESTACK_CHANGE_ALLOCATOR(s,t)					\
 do {									\
     if ((s).start != ESTK_DEF_STACK(s)) {				\
-	erl_exit(1, "Internal error - trying to change allocator "	\
+	erts_exit(ERTS_ERROR_EXIT, "Internal error - trying to change allocator "	\
 		 "type of active estack\n");				\
     }									\
     (s).alloc_type = (t);						\
@@ -589,7 +586,7 @@ do {	 	                                                  \
 #define WSTACK_CHANGE_ALLOCATOR(s,t)					\
 do {									\
     if (s.wstart != WSTK_DEF_STACK(s)) {				\
-	erl_exit(1, "Internal error - trying to change allocator "	\
+	erts_exit(ERTS_ERROR_EXIT, "Internal error - trying to change allocator "	\
 		 "type of active wstack\n");				\
     }									\
     s.alloc_type = (t);							\
@@ -781,7 +778,7 @@ ErtsPStack s = { (byte*)PSTK_DEF_STACK(s), /* pstart */                    \
 #define PSTACK_CHANGE_ALLOCATOR(s,t)					\
 do {									\
     if (s.pstart != (byte*)PSTK_DEF_STACK(s)) {				\
-	erl_exit(1, "Internal error - trying to change allocator "	\
+	erts_exit(ERTS_ERROR_EXIT, "Internal error - trying to change allocator "	\
 		 "type of active pstack\n");				\
     }									\
     s.alloc_type = (t);							\
@@ -848,6 +845,94 @@ do {\
 } while(0)
 
 
+/*
+ *  An implementation of lightweight unbounded queues,
+ *  using a circular dynamic array.
+ *  It does not include support for change_allocator.
+ *
+ *  Use it like this:
+ *
+ *  DECLARE_EQUEUE(Queue)	(At the start of a block)
+ *  ...
+ *  EQUEUE_PUT(Queue, Term)
+ *  ...
+ *  if (EQUEUE_ISEMPTY(Queue)) {
+ *     Queue is empty
+ *  } else {
+ *     Term = EQUEUE_GET(Stack);
+ *     Process popped Term here
+ *  }
+ *  ...
+ *  DESTROY_EQUEUE(Queue)
+ */
+
+typedef struct {
+    Eterm* start;
+    Eterm* front;
+    Eterm* back;
+    int possibly_empty;
+    Eterm* end;
+    ErtsAlcType_t alloc_type;
+} ErtsEQueue;
+
+#define DEF_EQUEUE_SIZE (16)
+
+void erl_grow_equeue(ErtsEQueue*, Eterm* def_queue);
+#define EQUE_CONCAT(a,b) a##b
+#define EQUE_DEF_QUEUE(q) EQUE_CONCAT(q,_default_equeue)
+
+#define DECLARE_EQUEUE(q)				\
+    UWord EQUE_DEF_QUEUE(q)[DEF_EQUEUE_SIZE];     	\
+    ErtsEQueue q = {					\
+        EQUE_DEF_QUEUE(q), /* start */			\
+        EQUE_DEF_QUEUE(q), /* front */			\
+        EQUE_DEF_QUEUE(q), /* back */			\
+        1,                 /* possibly_empty */		\
+        EQUE_DEF_QUEUE(q) + DEF_EQUEUE_SIZE, /* end */	\
+        ERTS_ALC_T_ESTACK  /* alloc_type */		\
+    }
+
+#define DESTROY_EQUEUE(q)				\
+do {							\
+    if (q.start != EQUE_DEF_QUEUE(q)) {			\
+      erts_free(q.alloc_type, q.start);			\
+    }							\
+} while(0)
+
+#define EQUEUE_PUT_UNCHECKED(q, x)			\
+do {							\
+    q.possibly_empty = 0;				\
+    *(q.back) = (x);                    		\
+    if (++(q.back) == q.end) {				\
+	q.back = q.start;				\
+    }							\
+} while(0)
+
+#define EQUEUE_PUT(q, x)				\
+do {							\
+    if (q.back == q.front && !q.possibly_empty) {	\
+        erl_grow_equeue(&q, EQUE_DEF_QUEUE(q));		\
+    }							\
+    EQUEUE_PUT_UNCHECKED(q, x);				\
+} while(0)
+
+#define EQUEUE_ISEMPTY(q) (q.back == q.front && q.possibly_empty)
+
+ERTS_GLB_INLINE Eterm erts_equeue_get(ErtsEQueue *q);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+ERTS_GLB_INLINE Eterm erts_equeue_get(ErtsEQueue *q) {
+    Eterm x;
+    q->possibly_empty = 1;
+    x = *(q->front);
+    if (++(q->front) == q->end) {
+        q->front = q->start;
+    }
+    return x;
+}
+#endif
+#define EQUEUE_GET(q) erts_equeue_get(&(q));
+
 /* binary.c */
 
 void erts_emasculate_writable_binary(ProcBin* pb);
@@ -900,8 +985,18 @@ Eterm erl_send(Process *p, Eterm to, Eterm msg);
 Eterm erl_is_function(Process* p, Eterm arg1, Eterm arg2);
 
 /* beam_bif_load.c */
-Eterm erts_check_process_code(Process *c_p, Eterm module, int allow_gc, int *redsp);
+#define ERTS_CPC_ALLOW_GC      (1 << 0)
+#define ERTS_CPC_COPY_LITERALS (1 << 1)
+#define ERTS_CPC_ALL           (ERTS_CPC_ALLOW_GC | ERTS_CPC_COPY_LITERALS)
+Eterm erts_check_process_code(Process *c_p, Eterm module, Uint flags, int *redsp);
 
+typedef struct {
+    Eterm *ptr;
+    Uint   sz;
+    Eterm pid;
+} copy_literals_t;
+
+extern copy_literals_t erts_clrange;
 
 /* beam_load.c */
 typedef struct {
@@ -913,6 +1008,7 @@ typedef struct {
 
 Binary* erts_alloc_loader_state(void);
 Eterm erts_module_for_prepared_code(Binary* magic);
+Eterm erts_has_code_on_load(Binary* magic);
 Eterm erts_prepare_loading(Binary* loader_state,  Process *c_p,
 			   Eterm group_leader, Eterm* modp,
 			   byte* code, Uint size);
@@ -931,7 +1027,7 @@ Eterm erts_make_stub_module(Process* p, Eterm Mod, Eterm Beam, Eterm Info);
 
 /* beam_ranges.c */
 void erts_init_ranges(void);
-void erts_start_staging_ranges(void);
+void erts_start_staging_ranges(int num_new);
 void erts_end_staging_ranges(int commit);
 void erts_update_ranges(BeamInstr* code, Uint size);
 void erts_remove_from_ranges(BeamInstr* code);
@@ -952,39 +1048,75 @@ double erts_get_positive_zero_float(void);
 
 /* config.c */
 
-__decl_noreturn void __noreturn erl_exit(int n, char*, ...);
-__decl_noreturn void __noreturn erl_exit_flush_async(int n, char*, ...);
+__decl_noreturn void __noreturn erts_exit(int n, char*, ...);
+__decl_noreturn void __noreturn erts_flush_async_exit(int n, char*, ...);
 void erl_error(char*, va_list);
 
-/* copy.c */
-Eterm copy_object(Eterm, Process*);
+/* This controls whether sharing-preserving copy is used by Erlang */
 
-#if HALFWORD_HEAP
-Uint size_object_rel(Eterm, Eterm*);
-#  define size_object(A) size_object_rel(A,NULL)
+#ifdef SHCOPY
+#define SHCOPY_SEND
+#define SHCOPY_SPAWN
+#endif
+
+/* The persistent state while the sharing-preserving copier works */
 
-Eterm copy_struct_rel(Eterm, Uint, Eterm**, ErlOffHeap*, Eterm* src_base, Eterm* dst_base);
-#  define copy_struct(OBJ,SZ,HPP,OH) copy_struct_rel(OBJ,SZ,HPP,OH, NULL,NULL)
+typedef struct {
+    Eterm  queue_default[DEF_EQUEUE_SIZE];
+    Eterm* queue_start;
+    Eterm* queue_end;
+    ErtsAlcType_t queue_alloc_type;
+    UWord  bitstore_default[DEF_WSTACK_SIZE];
+    UWord* bitstore_start;
+    ErtsAlcType_t bitstore_alloc_type;
+    Eterm  shtable_default[DEF_ESTACK_SIZE];
+    Eterm* shtable_start;
+    ErtsAlcType_t shtable_alloc_type;
+    Uint literal_size;
+    Eterm *range_ptr;
+    Uint  range_sz;
+} erts_shcopy_t;
+
+#define INITIALIZE_SHCOPY(info)                         \
+do {                                                    \
+    info.queue_start = info.queue_default;              \
+    info.bitstore_start = info.bitstore_default;        \
+    info.shtable_start = info.shtable_default;          \
+    info.literal_size = 0;                              \
+    info.range_ptr = erts_clrange.ptr;                  \
+    info.range_sz  = erts_clrange.sz;                   \
+} while(0)
 
-Eterm copy_shallow_rel(Eterm*, Uint, Eterm**, ErlOffHeap*, Eterm* src_base);
-#  define copy_shallow(A,B,C,D) copy_shallow_rel(A,B,C,D,NULL)
+#define DESTROY_SHCOPY(info)                                            \
+do {                                                                    \
+    if (info.queue_start != info.queue_default) {                       \
+        erts_free(info.queue_alloc_type, info.queue_start);             \
+    }                                                                   \
+    if (info.bitstore_start != info.bitstore_default) {                 \
+        erts_free(info.bitstore_alloc_type, info.bitstore_start);       \
+    }                                                                   \
+    if (info.shtable_start != info.shtable_default) {                   \
+        erts_free(info.shtable_alloc_type, info.shtable_start);         \
+    }                                                                   \
+} while(0)
 
-#else /* !HALFWORD_HEAP */
+/* copy.c */
+Eterm copy_object_x(Eterm, Process*, Uint);
+#define copy_object(Term, Proc) copy_object_x(Term,Proc,0)
 
 Uint size_object(Eterm);
-#  define size_object_rel(A,B) size_object(A)
+Uint copy_shared_calculate(Eterm, erts_shcopy_t*);
+Eterm copy_shared_perform(Eterm, Uint, erts_shcopy_t*, Eterm**, ErlOffHeap*);
 
-Eterm copy_struct(Eterm, Uint, Eterm**, ErlOffHeap*);
-#  define copy_struct_rel(OBJ,SZ,HPP,OH, SB,DB) copy_struct(OBJ,SZ,HPP,OH)
+Uint size_shared(Eterm);
 
+Eterm copy_struct_x(Eterm, Uint, Eterm**, ErlOffHeap*, Uint* bsz);
+#define copy_struct(Obj,Sz,HPP,OH) \
+    copy_struct_x(Obj,Sz,HPP,OH,NULL)
 Eterm copy_shallow(Eterm*, Uint, Eterm**, ErlOffHeap*);
-#  define copy_shallow_rel(A,B,C,D, BASE) copy_shallow(A,B,C,D)
 
-#endif
-
-
-void move_multi_frags(Eterm** hpp, ErlOffHeap*, ErlHeapFragment* first,
-		      Eterm* refs, unsigned nrefs);
+void erts_move_multi_frags(Eterm** hpp, ErlOffHeap*, ErlHeapFragment* first,
+			   Eterm* refs, unsigned nrefs, int literals);
 
 /* Utilities */
 extern void erts_delete_nodes_monitors(Process *, ErtsProcLocks);
@@ -1037,6 +1169,9 @@ extern ErtsModifiedTimings erts_modified_timings[];
 extern int erts_no_line_info;
 extern Eterm erts_error_logger_warnings;
 extern int erts_initialized;
+#if defined(USE_THREADS) && !defined(ERTS_SMP)
+extern erts_tid_t erts_main_thread;
+#endif
 extern int erts_compat_rel;
 extern int erts_use_sender_punish;
 void erts_short_init(void);
@@ -1177,10 +1312,10 @@ int erts_utf8_to_latin1(byte* dest, const byte* source, int slen);
 #define ERTS_UTF8_OK_MAX_CHARS 4
 
 void bin_write(int, void*, byte*, size_t);
-int intlist_to_buf(Eterm, char*, int); /* most callers pass plain char*'s */
+Sint intlist_to_buf(Eterm, char*, Sint); /* most callers pass plain char*'s */
 
 struct Sint_buf {
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
     char s[22];
 #else
     char s[12];
@@ -1250,7 +1385,7 @@ ErlDrvSizeT erts_iolist_to_buf(Eterm, char*, ErlDrvSizeT);
 ErlDrvSizeT erts_iolist_to_buf_yielding(ErtsIOList2BufState *);
 int erts_iolist_size_yielding(ErtsIOListState *state);
 int erts_iolist_size(Eterm, ErlDrvSizeT *);
-int is_string(Eterm);
+Sint is_string(Eterm);
 void erl_at_exit(void (*) (void*), void*);
 Eterm collect_memory(Process *);
 void dump_memory_to_fd(int);
@@ -1296,6 +1431,29 @@ int erts_print_system_version(int to, void *arg, Process *c_p);
 
 int erts_hibernate(Process* c_p, Eterm module, Eterm function, Eterm args, Eterm* reg);
 
+ERTS_GLB_FORCE_INLINE int erts_is_literal(Eterm tptr, Eterm *ptr);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_GLB_FORCE_INLINE int erts_is_literal(Eterm tptr, Eterm *ptr)
+{
+    ASSERT(is_boxed(tptr) || is_list(tptr));
+    ASSERT(ptr == ptr_val(tptr));
+
+#if defined(ERTS_HAVE_IS_IN_LITERAL_RANGE)
+    return erts_is_in_literal_range(ptr);
+#elif defined(TAG_LITERAL_PTR)
+    return is_literal_ptr(tptr);
+#else
+#  error Not able to detect literals...
+#endif
+
+}
+
+#endif
+
+Eterm erts_msacc_request(Process *c_p, int action, Eterm *threads);
+
 /*
 ** Call_trace uses this API for the parameter matching functions
 */
@@ -1344,191 +1502,21 @@ extern void erts_match_prog_foreach_offheap(Binary *b,
 
 extern erts_driver_t vanilla_driver;
 extern erts_driver_t spawn_driver;
+extern erts_driver_t forker_driver;
 extern erts_driver_t fd_driver;
 
 int erts_beam_jump_table(void);
 
-/* Should maybe be placed in erl_message.h, but then we get an include mess. */
-ERTS_GLB_INLINE Eterm *
-erts_alloc_message_heap_state(Uint size,
-			      ErlHeapFragment **bpp,
-			      ErlOffHeap **ohpp,
-			      Process *receiver,
-			      ErtsProcLocks *receiver_locks,
-			      erts_aint32_t *statep);
-
-ERTS_GLB_INLINE Eterm *
-erts_alloc_message_heap(Uint size,
-			ErlHeapFragment **bpp,
-			ErlOffHeap **ohpp,
-			Process *receiver,
-			ErtsProcLocks *receiver_locks);
-
-#if ERTS_GLB_INLINE_INCL_FUNC_DEF
-
-/*
- * NOTE: erts_alloc_message_heap() releases msg q and status
- *       lock on receiver without ensuring that other locks are
- *       held. User is responsible to ensure that the receiver
- *       pointer cannot become invalid until after message has
- *       been passed. This is normal done either by increasing
- *       reference count on process (preferred) or by holding
- *       main or link lock over the whole message passing
- *       operation.
- */
-
-ERTS_GLB_INLINE Eterm *
-erts_alloc_message_heap_state(Uint size,
-			      ErlHeapFragment **bpp,
-			      ErlOffHeap **ohpp,
-			      Process *receiver,
-			      ErtsProcLocks *receiver_locks,
-			      erts_aint32_t *statep)
-{
-    Eterm *hp;
-    erts_aint32_t state;
-#ifdef ERTS_SMP
-    int locked_main = 0;
-    state = erts_smp_atomic32_read_acqb(&receiver->state);
-    if (statep)
-	*statep = state;
-    if (state & (ERTS_PSFLG_EXITING
-		 | ERTS_PSFLG_PENDING_EXIT))
-	goto allocate_in_mbuf;
-#endif
-
-    if (size > (Uint) INT_MAX)
-	erl_exit(ERTS_ABORT_EXIT, "HUGE size (%beu)\n", size);
-
-    if (
-#if defined(ERTS_SMP)
-	*receiver_locks & ERTS_PROC_LOCK_MAIN
-#else
-	1
-#endif
-	) {
-#ifdef ERTS_SMP
-    try_allocate_on_heap:
-#endif
-	state = erts_smp_atomic32_read_nob(&receiver->state);
-	if (statep)
-	    *statep = state;
-	if ((state & (ERTS_PSFLG_EXITING
-		      | ERTS_PSFLG_PENDING_EXIT))
-	    || (receiver->flags & F_DISABLE_GC)
-	    || HEAP_LIMIT(receiver) - HEAP_TOP(receiver) <= size) {
-	    /*
-	     * The heap is either potentially in an inconsistent
-	     * state, or not large enough.
-	     */
-#ifdef ERTS_SMP
-	    if (locked_main) {
-		*receiver_locks &= ~ERTS_PROC_LOCK_MAIN;
-		erts_smp_proc_unlock(receiver, ERTS_PROC_LOCK_MAIN);
-	    }
-#endif
-	    goto allocate_in_mbuf;
-	}
-	hp = HEAP_TOP(receiver);
-	HEAP_TOP(receiver) = hp + size;
-	*bpp = NULL;
-	*ohpp = &MSO(receiver);
-    }
-#ifdef ERTS_SMP
-    else if (erts_smp_proc_trylock(receiver, ERTS_PROC_LOCK_MAIN) == 0) {
-	locked_main = 1;
-	*receiver_locks |= ERTS_PROC_LOCK_MAIN;
-	goto try_allocate_on_heap;
-    }
-#endif
-    else {
-	ErlHeapFragment *bp;
-    allocate_in_mbuf:
-	bp = new_message_buffer(size);
-	hp = bp->mem;
-	*bpp = bp;
-	*ohpp = &bp->off_heap;
-    }
-
-    return hp;
-}
-
-ERTS_GLB_INLINE Eterm *
-erts_alloc_message_heap(Uint size,
-			ErlHeapFragment **bpp,
-			ErlOffHeap **ohpp,
-			Process *receiver,
-			ErtsProcLocks *receiver_locks)
-{
-    return erts_alloc_message_heap_state(size, bpp, ohpp, receiver,
-					 receiver_locks, NULL);
-}
-
-#endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
-
-#if !HEAP_ON_C_STACK
-#  if defined(DEBUG)
-#    define DeclareTmpHeap(VariableName,Size,Process) \
-       Eterm *VariableName = erts_debug_allocate_tmp_heap(Size,Process)
-#    define DeclareTypedTmpHeap(Type,VariableName,Process)		\
-      Type *VariableName = (Type *) erts_debug_allocate_tmp_heap(sizeof(Type)/sizeof(Eterm),Process)
-#    define DeclareTmpHeapNoproc(VariableName,Size) \
-       Eterm *VariableName = erts_debug_allocate_tmp_heap(Size,NULL)
-#    define UseTmpHeap(Size,Proc) \
-       do { \
-         erts_debug_use_tmp_heap((Size),(Proc)); \
-       } while (0)
-#    define UnUseTmpHeap(Size,Proc) \
-       do { \
-         erts_debug_unuse_tmp_heap((Size),(Proc)); \
-       } while (0)
-#    define UseTmpHeapNoproc(Size) \
-       do { \
-         erts_debug_use_tmp_heap(Size,NULL); \
-       } while (0)
-#    define UnUseTmpHeapNoproc(Size) \
-       do { \
-         erts_debug_unuse_tmp_heap(Size,NULL); \
-       } while (0)
-#  else
-#    define DeclareTmpHeap(VariableName,Size,Process) \
-       Eterm *VariableName = (ERTS_PROC_GET_SCHDATA(Process)->tmp_heap)+(ERTS_PROC_GET_SCHDATA(Process)->num_tmp_heap_used)
-#    define DeclareTypedTmpHeap(Type,VariableName,Process)		\
-      Type *VariableName = (Type *) (ERTS_PROC_GET_SCHDATA(Process)->tmp_heap)+(ERTS_PROC_GET_SCHDATA(Process)->num_tmp_heap_used)
-#    define DeclareTmpHeapNoproc(VariableName,Size) \
-       Eterm *VariableName = (erts_get_scheduler_data()->tmp_heap)+(erts_get_scheduler_data()->num_tmp_heap_used)
-#    define UseTmpHeap(Size,Proc) \
-       do { \
-         ERTS_PROC_GET_SCHDATA(Proc)->num_tmp_heap_used += (Size); \
-       } while (0)
-#    define UnUseTmpHeap(Size,Proc) \
-       do { \
-         ERTS_PROC_GET_SCHDATA(Proc)->num_tmp_heap_used -= (Size); \
-       } while (0)
-#    define UseTmpHeapNoproc(Size) \
-       do { \
-         erts_get_scheduler_data()->num_tmp_heap_used += (Size); \
-       } while (0)
-#    define UnUseTmpHeapNoproc(Size) \
-       do { \
-         erts_get_scheduler_data()->num_tmp_heap_used -= (Size); \
-       } while (0)
-
-
-#  endif
-
-#else
-#  define DeclareTmpHeap(VariableName,Size,Process) \
+#define DeclareTmpHeap(VariableName,Size,Process) \
      Eterm VariableName[Size]
-#  define DeclareTypedTmpHeap(Type,VariableName,Process)	\
+#define DeclareTypedTmpHeap(Type,VariableName,Process)	\
      Type VariableName[1]
-#  define DeclareTmpHeapNoproc(VariableName,Size) \
+#define DeclareTmpHeapNoproc(VariableName,Size) \
      Eterm VariableName[Size]
-#  define UseTmpHeap(Size,Proc) /* Nothing */
-#  define UnUseTmpHeap(Size,Proc) /* Nothing */
-#  define UseTmpHeapNoproc(Size) /* Nothing */
-#  define UnUseTmpHeapNoproc(Size) /* Nothing */
-#endif /* HEAP_ON_C_STACK */
+#define UseTmpHeap(Size,Proc) /* Nothing */
+#define UnUseTmpHeap(Size,Proc) /* Nothing */
+#define UseTmpHeapNoproc(Size) /* Nothing */
+#define UnUseTmpHeapNoproc(Size) /* Nothing */
 
 ERTS_GLB_INLINE void dtrace_pid_str(Eterm pid, char *process_buf);
 ERTS_GLB_INLINE void dtrace_proc_str(Process *process, char *process_buf);
@@ -1576,6 +1564,7 @@ dtrace_fun_decode(Process *process,
     erts_snprintf(mfa_buf, DTRACE_TERM_BUF_SIZE, "%T:%T/%d",
                   module, function, arity);
 }
+
 #endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
 
 #endif /* !__GLOBAL_H__ */
diff --git a/erts/emulator/beam/hash.c b/erts/emulator/beam/hash.c
index e0fde337f2..5a0b93f693 100644
--- a/erts/emulator/beam/hash.c
+++ b/erts/emulator/beam/hash.c
@@ -27,8 +27,6 @@
 #endif
 
 #include "sys.h"
-#include "erl_vm.h"
-#include "global.h"
 #include "hash.h"
 
 /*
@@ -66,6 +64,7 @@ void hash_get_info(HashInfo *hi, Hash *h)
     int i;
     int max_depth = 0;
     int objects = 0;
+    int used = 0;
 
     for (i = 0; i < size; i++) {
 	int depth = 0;
@@ -76,14 +75,18 @@ void hash_get_info(HashInfo *hi, Hash *h)
 	    depth++;
 	    b = b->next;
 	}
-	if (depth > max_depth)
-	    max_depth = depth;
+        if (depth) {
+            used++;
+            if (depth > max_depth)
+                max_depth = depth;
+        }
     }
+    ASSERT(objects == h->nobjs);
 
     hi->name  = h->name;
     hi->size  = h->size;
-    hi->used  = h->used;
-    hi->objs  = objects;
+    hi->used  = used;
+    hi->objs  = h->nobjs;
     hi->depth = max_depth;
 }
 
@@ -98,11 +101,11 @@ void hash_info(int to, void *arg, Hash* h)
 
     hash_get_info(&hi, h);
 
-    erts_print(to, arg, "=hash_table:%s\n", hi.name);
-    erts_print(to, arg, "size: %d\n",       hi.size);
-    erts_print(to, arg, "used: %d\n",       hi.used);
-    erts_print(to, arg, "objs: %d\n",       hi.objs);
-    erts_print(to, arg, "depth: %d\n",      hi.depth);
+    h->fun.meta_print(to, arg, "=hash_table:%s\n", hi.name);
+    h->fun.meta_print(to, arg, "size: %d\n",       hi.size);
+    h->fun.meta_print(to, arg, "used: %d\n",       hi.used);
+    h->fun.meta_print(to, arg, "objs: %d\n",       hi.objs);
+    h->fun.meta_print(to, arg, "depth: %d\n",      hi.depth);
 }
 
 
@@ -119,47 +122,56 @@ hash_table_sz(Hash *h)
 }
 
 
+static ERTS_INLINE void set_thresholds(Hash* h)
+{
+    h->grow_threshold = (8*h->size)/5;   /* grow at 160% load */
+    if (h->size_ix > h->min_size_ix)
+        h->shrink_threshold = h->size / 5;  /* shrink at 20% load */
+    else
+        h->shrink_threshold = -1;  /* never shrink below inital size */
+}
+
 /*
 ** init a pre allocated or static hash structure
 ** and allocate buckets.
 */
-Hash* hash_init(ErtsAlcType_t type, Hash* h, char* name, int size, HashFunctions fun)
+Hash* hash_init(int type, Hash* h, char* name, int size, HashFunctions fun)
 {
     int sz;
     int ix = 0;
 
-    h->type = type;
+    h->meta_alloc_type = type;
 
     while (h_size_table[ix] != -1 && h_size_table[ix] < size)
 	ix++;
     if (h_size_table[ix] == -1)
-	erl_exit(1, "panic: too large hash table size (%d)\n", size);
+	return NULL;
 
     size = h_size_table[ix];
     sz = size*sizeof(HashBucket*);
 
-    h->bucket = (HashBucket**) erts_alloc(h->type, sz);
+    h->bucket = (HashBucket**) fun.meta_alloc(h->meta_alloc_type, sz);
 
     sys_memzero(h->bucket, sz);
     h->is_allocated = 0;
     h->name = name;
     h->fun = fun;
     h->size = size;
-    h->size20percent = h->size/5;
-    h->size80percent = (4*h->size)/5;
-    h->ix = ix;
-    h->used = 0;
+    h->size_ix = ix;
+    h->min_size_ix = ix;
+    h->nobjs = 0;
+    set_thresholds(h);
     return h;
 }
 
 /*
 ** Create a new hash table
 */
-Hash* hash_new(ErtsAlcType_t type, char* name, int size, HashFunctions fun)
+Hash* hash_new(int type, char* name, int size, HashFunctions fun)
 {
     Hash* h;
 
-    h = erts_alloc(type, sizeof(Hash));
+    h = fun.meta_alloc(type, sizeof(Hash));
 
     h = hash_init(type, h, name, size, fun);
     h->is_allocated =  1;
@@ -183,9 +195,9 @@ void hash_delete(Hash* h)
 	    b = b_next;
 	}
     }
-    erts_free(h->type, h->bucket);
+    h->fun.meta_free(h->meta_alloc_type, h->bucket);
     if (h->is_allocated)
-	erts_free(h->type, (void*) h);
+	h->fun.meta_free(h->meta_alloc_type, (void*) h);
 }
 
 /*
@@ -199,39 +211,34 @@ static void rehash(Hash* h, int grow)
     int i;
 
     if (grow) {
-	if ((h_size_table[h->ix+1]) == -1)
+	if ((h_size_table[h->size_ix+1]) == -1)
 	    return;
-	h->ix++;
+	h->size_ix++;
     }
     else {
-	if (h->ix == 0)
+	if (h->size_ix == 0)
 	    return;
-	h->ix--;
+	h->size_ix--;
     }
-    h->size = h_size_table[h->ix];
-    h->size20percent = h->size/5;
-    h->size80percent = (4*h->size)/5;
+    h->size = h_size_table[h->size_ix];
     sz = h->size*sizeof(HashBucket*);
 
-    new_bucket = (HashBucket **) erts_alloc(h->type, sz);
+    new_bucket = (HashBucket **) h->fun.meta_alloc(h->meta_alloc_type, sz);
     sys_memzero(new_bucket, sz);
 
-    h->used = 0;
-
     for (i = 0; i < old_size; i++) {
 	HashBucket* b = h->bucket[i];
 	while (b != (HashBucket*) 0) {
 	    HashBucket* b_next = b->next;
 	    int ix = b->hvalue % h->size;
-	    if (new_bucket[ix] == NULL)
-		h->used++;
 	    b->next = new_bucket[ix];
 	    new_bucket[ix] = b;
 	    b = b_next;
 	}
     }
-    erts_free(h->type, (void *) h->bucket);
+    h->fun.meta_free(h->meta_alloc_type, (void *) h->bucket);
     h->bucket = new_bucket;
+    set_thresholds(h);
 }
 
 /*
@@ -268,68 +275,15 @@ void* hash_put(Hash* h, void* tmpl)
     }
     b = (HashBucket*) h->fun.alloc(tmpl);
 
-    if (h->bucket[ix] == NULL)
-	h->used++;
-
     b->hvalue = hval;
     b->next = h->bucket[ix];
     h->bucket[ix] = b;
 
-    if (h->used > h->size80percent)  /* rehash at 80% */
+    if (++h->nobjs > h->grow_threshold)
 	rehash(h, 1);
     return (void*) b;
 }
 
-static void
-hash_insert_entry(Hash* h, HashBucket* entry)
-{
-    HashValue hval = entry->hvalue;
-    int ix = hval % h->size;
-    HashBucket* b = h->bucket[ix];
-
-    while (b != (HashBucket*) 0) {
-	if ((b->hvalue == hval) && (h->fun.cmp((void*)entry, (void*)b) == 0)) {
-	    abort();		/* Should not happen */
-	}
-	b = b->next;
-    }
-
-    if (h->bucket[ix] == NULL)
-	h->used++;
-
-    entry->next = h->bucket[ix];
-    h->bucket[ix] = entry;
-
-    if (h->used > h->size80percent)  /* rehash at 80% */
-	rehash(h, 1);
-}
-
-
-/*
- * Move all entries in src into dst; empty src.
- * Entries in src must not exist in dst.
- */
-void
-erts_hash_merge(Hash* src, Hash* dst)
-{
-    int limit = src->size;
-    HashBucket** bucket = src->bucket;
-    int i;
-
-    src->used = 0;
-    for (i = 0; i < limit; i++) {
-	HashBucket* b = bucket[i];
-	HashBucket* next;
-
-	bucket[i] = NULL;
-	while (b) {
-	    next = b->next;
-	    hash_insert_entry(dst, b);
-	    b = next;
-	}
-    }
-}
-
 /*
 ** Erase hash entry return template if erased
 ** return 0 if not erased
@@ -348,9 +302,7 @@ void* hash_erase(Hash* h, void* tmpl)
 	    else
 		h->bucket[ix] = b->next;
 	    h->fun.free((void*)b);
-	    if (h->bucket[ix] == NULL)
-		h->used--;
-	    if (h->used < h->size20percent)  /* rehash at 20% */
+	    if (--h->nobjs < h->shrink_threshold)
 		rehash(h, 0);
 	    return tmpl;
 	}
@@ -381,9 +333,7 @@ hash_remove(Hash *h, void *tmpl)
 		prev->next = b->next;
 	    else
 		h->bucket[ix] = b->next;
-	    if (h->bucket[ix] == NULL)
-		h->used--;
-	    if (h->used < h->size20percent)  /* rehash at 20% */
+	    if (--h->nobjs < h->shrink_threshold)
 		rehash(h, 0);
 	    return (void *) b;
 	}
diff --git a/erts/emulator/beam/hash.h b/erts/emulator/beam/hash.h
index 87fdb360e3..e94aaa0a84 100644
--- a/erts/emulator/beam/hash.h
+++ b/erts/emulator/beam/hash.h
@@ -29,14 +29,17 @@
 #include "sys.h"
 #endif
 
-#include "erl_alloc.h"
-
 typedef unsigned long HashValue;
+typedef struct hash Hash;
 
 typedef int (*HCMP_FUN)(void*, void*);
 typedef HashValue (*H_FUN)(void*);
 typedef void* (*HALLOC_FUN)(void*);
 typedef void (*HFREE_FUN)(void*);
+/* Meta functions */
+typedef void* (*HMALLOC_FUN)(int,size_t);
+typedef void (*HMFREE_FUN)(int,void*);
+typedef int (*HMPRINT_FUN)(int,void*,char*, ...);
 
 /*
 ** This bucket must be placed in top of 
@@ -55,6 +58,9 @@ typedef struct hash_functions
     HCMP_FUN cmp;
     HALLOC_FUN alloc;
     HFREE_FUN free;
+    HMALLOC_FUN meta_alloc;
+    HMFREE_FUN meta_free;
+    HMPRINT_FUN meta_print;
 } HashFunctions;
 
 typedef struct {
@@ -65,22 +71,23 @@ typedef struct {
   int   depth;
 } HashInfo;
 
-typedef struct hash
+struct hash
 {
     HashFunctions fun;   /* Function block */
     int is_allocated;    /* 0 iff hash structure is on stack or is static */
-    ErtsAlcType_t type;
+    int meta_alloc_type; /* argument to pass to meta_alloc and meta_free */
     char* name;          /* Table name (static string, for debugging) */
     int size;		 /* Number of slots */
-    int size20percent;   /* 20 percent of number of slots */
-    int size80percent;   /* 80 percent of number of slots */
-    int ix;              /* Size index in size table */
-    int used;		 /* Number of slots used */
+    int shrink_threshold;
+    int grow_threshold;
+    int size_ix;         /* Size index in size table */
+    int min_size_ix;     /* Never shrink table smaller than this */
+    int nobjs;		 /* Number of objects in table */
     HashBucket** bucket; /* Vector of bucket pointers (objects) */
-} Hash;
+};
 
-Hash* hash_new(ErtsAlcType_t, char*, int, HashFunctions);
-Hash* hash_init(ErtsAlcType_t, Hash*, char*, int, HashFunctions);
+Hash* hash_new(int, char*, int, HashFunctions);
+Hash* hash_init(int, Hash*, char*, int, HashFunctions);
 
 void  hash_delete(Hash*);
 void  hash_get_info(HashInfo*, Hash*);
@@ -93,6 +100,4 @@ void* hash_erase(Hash*, void*);
 void* hash_remove(Hash*, void*);
 void  hash_foreach(Hash*, void (*func)(void *, void *), void *);
 
-void erts_hash_merge(Hash* src, Hash* dst);
-
 #endif
diff --git a/erts/emulator/beam/index.c b/erts/emulator/beam/index.c
index 06d0b5123d..5f6ea14732 100644
--- a/erts/emulator/beam/index.c
+++ b/erts/emulator/beam/index.c
@@ -84,7 +84,7 @@ index_put_entry(IndexTable* t, void* tmpl)
 	Uint sz;
 	if (ix >= t->limit) {
 	    /* A core dump is unnecessary */
-	    erl_exit(ERTS_DUMP_EXIT, "no more index entries in %s (max=%d)\n",
+	    erts_exit(ERTS_DUMP_EXIT, "no more index entries in %s (max=%d)\n",
 		     t->htable.name, t->limit);
 	}
 	sz = INDEX_PAGE_SIZE*sizeof(IndexSlot*);
@@ -123,7 +123,7 @@ void erts_index_merge(Hash* src, IndexTable* dst)
 	    ix = dst->entries++;
 	    if (ix >= dst->size) {
 		if (ix >= dst->limit) {
-		    erl_exit(1, "no more index entries in %s (max=%d)\n",
+		    erts_exit(ERTS_ERROR_EXIT, "no more index entries in %s (max=%d)\n",
 			     dst->htable.name, dst->limit);
 		}
 		sz = INDEX_PAGE_SIZE*sizeof(IndexSlot*);
diff --git a/erts/emulator/beam/index.h b/erts/emulator/beam/index.h
index 14fab41026..99b2bdfab0 100644
--- a/erts/emulator/beam/index.h
+++ b/erts/emulator/beam/index.h
@@ -30,6 +30,10 @@
 #include "hash.h"
 #endif
 
+#ifndef ERL_ALLOC_H__
+#include "erl_alloc.h"
+#endif
+
 typedef struct index_slot 
 {
     HashBucket bucket;
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index c64c8802b9..b85b581cdc 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -47,15 +47,18 @@
 #define ERTS_WANT_EXTERNAL_TAGS
 #include "external.h"
 #include "dtrace-wrapper.h"
+#include "lttng-wrapper.h"
 #include "erl_map.h"
 #include "erl_bif_unique.h"
 #include "erl_hl_timer.h"
+#include "erl_time.h"
 
 extern ErlDrvEntry fd_driver_entry;
-#ifndef __OSE__
 extern ErlDrvEntry vanilla_driver_entry;
-#endif
 extern ErlDrvEntry spawn_driver_entry;
+#ifndef __WIN32__
+extern ErlDrvEntry forker_driver_entry;
+#endif
 extern ErlDrvEntry *driver_tab[]; /* table of static drivers, only used during initialization */
 
 erts_driver_t *driver_list; /* List of all drivers, static and dynamic. */
@@ -73,6 +76,9 @@ const Port erts_invalid_port = {{ERTS_INVALID_PORT}};
 
 erts_driver_t vanilla_driver;
 erts_driver_t spawn_driver;
+#ifndef __WIN32__
+erts_driver_t forker_driver;
+#endif
 erts_driver_t fd_driver;
 
 int erts_port_synchronous_ops = 0;
@@ -86,6 +92,7 @@ static void deliver_result(Eterm sender, Eterm pid, Eterm res);
 static int init_driver(erts_driver_t *, ErlDrvEntry *, DE_Handle *);
 static void terminate_port(Port *p);
 static void pdl_init(void);
+static int driver_failure_term(ErlDrvPort ix, Eterm term, int eof);
 #ifdef ERTS_SMP
 static void driver_monitor_lock_pdl(Port *p);
 static void driver_monitor_unlock_pdl(Port *p);
@@ -307,12 +314,9 @@ static Port *create_port(char *name,
     size_t port_size, busy_port_queue_size, size;
     erts_aint32_t state = ERTS_PORT_SFLG_CONNECTED;
     erts_aint32_t x_pts_flgs = 0;
-#ifdef DEBUG
-    /* Make sure the debug flags survives until port is freed */
-    state |= ERTS_PORT_SFLG_PORT_DEBUG;
-#endif
 
 #ifdef ERTS_SMP
+    ErtsRunQueue *runq;
     if (!driver_lock) {
 	/* Align size for mutex following port struct */
 	port_size = size = ERTS_ALC_DATA_ALIGN_SIZE(sizeof(Port));
@@ -322,6 +326,12 @@ static Port *create_port(char *name,
 #endif
 	port_size = size = ERTS_ALC_DATA_ALIGN_SIZE(sizeof(Port));
 
+#ifdef DEBUG
+    /* Make sure the debug flags survives until port is freed */
+    state |= ERTS_PORT_SFLG_PORT_DEBUG;
+#endif
+
+
     busy_port_queue_size
 	= ((driver->flags & ERL_DRV_FLAG_NO_BUSY_MSGQ)
 	   ? 0
@@ -357,8 +367,12 @@ static Port *create_port(char *name,
 	p += sizeof(erts_mtx_t);
 	state |= ERTS_PORT_SFLG_PORT_SPECIFIC_LOCK;
     }
-    erts_smp_atomic_set_nob(&prt->run_queue,
-			    (erts_aint_t) erts_get_runq_current(NULL));
+    if (erts_get_scheduler_data())
+        runq = erts_get_runq_current(NULL);
+    else
+        runq = ERTS_RUNQ_IX(0);
+    erts_smp_atomic_set_nob(&prt->run_queue, (erts_aint_t) runq);
+
     prt->xports = NULL;
 #else
     erts_atomic32_init_nob(&prt->refc, 1);
@@ -384,7 +398,8 @@ static Port *create_port(char *name,
     prt->common.u.alive.reg = NULL;
     ERTS_PTMR_INIT(prt);
     erts_port_task_handle_init(&prt->timeout_task);
-    prt->psd = NULL;
+    erts_smp_atomic_init_nob(&prt->psd, (erts_aint_t) NULL);
+    prt->async_open_port = NULL;
     prt->drv_data = (SWord) 0;
     prt->os_pid = -1;
 
@@ -466,6 +481,11 @@ erts_port_free(Port *prt)
 
     erts_port_task_fini_sched(&prt->sched);
 
+    if (prt->async_open_port) {
+        erts_free(ERTS_ALC_T_PRTSD, prt->async_open_port);
+        prt->async_open_port = NULL;
+    }
+
 #ifdef ERTS_SMP
     ASSERT(prt->lock);
     if (state & ERTS_PORT_SFLG_PORT_SPECIFIC_LOCK)
@@ -687,6 +707,7 @@ erts_open_driver(erts_driver_t* driver,	/* Pointer to driver. */
 
     error_number = error_type = 0;
     if (driver->start) {
+        ERTS_MSACC_PUSH_STATE_M();
 	if (IS_TRACED_FL(port, F_TRACE_SCHED_PORTS)) {
 	    trace_sched_ports_where(port, am_in, am_start);
 	}
@@ -697,6 +718,19 @@ erts_open_driver(erts_driver_t* driver,	/* Pointer to driver. */
             DTRACE3(driver_start, process_str, driver->name, port_str);
         }
 #endif
+
+	ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_PORT);
+
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+        if (LTTNG_ENABLED(driver_start)) {
+            lttng_decl_portbuf(port_str);
+            lttng_decl_procbuf(proc_str);
+            lttng_pid_to_str(pid, proc_str);
+            lttng_port_to_str(port, port_str);
+            LTTNG3(driver_start, proc_str, driver->name, port_str);
+        }
+#endif
+
 	fpe_was_unmasked = erts_block_fpe();
 	drv_data = (*driver->start)(ERTS_Port2ErlDrvPort(port), name, opts);
 	if (((SWord) drv_data) == -1)
@@ -716,6 +750,7 @@ erts_open_driver(erts_driver_t* driver,	/* Pointer to driver. */
 	}
 
 	erts_unblock_fpe(fpe_was_unmasked);
+	ERTS_MSACC_POP_STATE_M();
 	port->caller = NIL;
 	if (IS_TRACED_FL(port, F_TRACE_SCHED_PORTS)) {
 	    trace_sched_ports_where(port, am_out, am_start);
@@ -1105,7 +1140,7 @@ io_list_vec_len(Eterm obj, int* vsize, Uint* csize,
     Uint p_v_size = 0;
     Uint p_c_size = 0;
     Uint p_in_clist = 0;
-    Uint total; /* Uint due to halfword emulator */
+    Uint total;
 
     goto L_jump_start;  /* avoid a push */
 
@@ -1412,7 +1447,7 @@ queue_port_sched_op_reply(Process *rp,
 
     erts_factory_trim_and_close(factory, &msg, 1);
 
-    erts_queue_message(rp, rp_locksp, factory->heap_frags, msg, NIL);
+    erts_queue_message(rp, rp_locksp, factory->message, msg, NIL);
 }
 
 static void
@@ -1420,12 +1455,9 @@ port_sched_op_reply(Eterm to, Uint32 *ref_num, Eterm msg)
 {
     Process *rp = erts_proc_lookup_raw(to);
     if (rp) {
-	ErlOffHeap *ohp;
-	ErlHeapFragment* bp;
         ErtsHeapFactory factory;
 	Eterm msg_copy;
 	Uint hsz, msg_sz;
-	Eterm *hp;
 	ErtsProcLocks rp_locks = 0;
 
 	hsz = ERTS_QUEUE_PORT_SCHED_OP_REPLY_SIZE;
@@ -1436,18 +1468,13 @@ port_sched_op_reply(Eterm to, Uint32 *ref_num, Eterm msg)
 	    hsz += msg_sz;
 	}
 
-	hp = erts_alloc_message_heap(hsz,
-						&bp,
-						&ohp,
-						rp,
-						&rp_locks);
-        erts_factory_message_init(&factory, rp, hp, bp);
-	if (is_immed(msg))
-	    msg_copy = msg;
-	else {
-	    msg_copy = copy_struct(msg, msg_sz, &hp, ohp);
-            factory.hp = hp;
-        }
+	(void) erts_factory_message_create(&factory, rp,
+					   &rp_locks, hsz);
+	msg_copy = (is_immed(msg)
+		    ? msg
+		    : copy_struct(msg, msg_sz,
+				  &factory.hp,
+				  factory.off_heap));
 
 	queue_port_sched_op_reply(rp,
 				  &rp_locks,
@@ -1528,13 +1555,44 @@ erts_schedule_proc2port_signal(Process *c_p,
 	erts_smp_proc_lock(c_p, ERTS_PROC_LOCK_MAIN);
 
     if (sched_res != 0) {
-	if (refp)
+	if (refp) {
+	    /*
+	     * We need to restore the message queue save
+	     * pointer to the beginning of the message queue
+	     * since the caller now wont wait for a message
+	     * containing the reference created above...
+	     */
+	    ASSERT(c_p);
+	    erts_smp_proc_lock(c_p, ERTS_PROC_LOCKS_MSG_RECEIVE);
+	    JOIN_MESSAGE(c_p);
+	    erts_smp_proc_unlock(c_p, ERTS_PROC_LOCKS_MSG_RECEIVE);
 	    *refp = NIL;
+	}
 	return ERTS_PORT_OP_DROPPED;
     }
     return ERTS_PORT_OP_SCHEDULED;
 }
 
+static int
+erts_schedule_port2port_signal(Eterm port_num, ErtsProc2PortSigData *sigdp,
+                               int task_flags,
+                               ErtsProc2PortSigCallback callback)
+{
+    Port *prt = erts_port_lookup_raw(port_num);
+
+    if (!prt)
+        return -1;
+
+    sigdp->caller = ERTS_INVALID_PID;
+
+    return erts_port_task_schedule(prt->common.id,
+                                   NULL,
+                                   ERTS_PORT_TASK_PROC_SIG,
+                                   sigdp,
+                                   callback,
+                                   task_flags);
+}
+
 static ERTS_INLINE void
 send_badsig(Port *prt) {
     ErtsProcLocks rp_locks = ERTS_PROC_LOCKS_XSIG_SEND;
@@ -1679,6 +1737,7 @@ call_driver_outputv(int bang_op,
     else {
 	ErtsSchedulerData *esdp = erts_get_scheduler_data();
 	ErlDrvSizeT size = evp->size;
+	ERTS_MSACC_PUSH_AND_SET_STATE_M(ERTS_MSACC_STATE_PORT);
 
 	ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt)	
 			   || ERTS_IS_CRASH_DUMPING);
@@ -1689,6 +1748,15 @@ call_driver_outputv(int bang_op,
 	    DTRACE4(driver_outputv, process_str, port_str, prt->name, size);
 	}
 #endif
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+        if (LTTNG_ENABLED(driver_outputv)) {
+            lttng_decl_portbuf(port_str);
+            lttng_decl_procbuf(proc_str);
+            lttng_pid_to_str(caller, proc_str);
+            lttng_port_to_str(prt, port_str);
+            LTTNG4(driver_outputv, proc_str, port_str, prt->name, size);
+        }
+#endif
 
 	prt->caller = caller;
 	(*drv->outputv)((ErlDrvData) prt->drv_data, evp);
@@ -1699,6 +1767,8 @@ call_driver_outputv(int bang_op,
 	    esdp->io.out += (Uint64) size;
 	else
 	    erts_atomic64_add_nob(&bytes_out, (erts_aint64_t) size);
+
+	ERTS_MSACC_POP_STATE_M();
     }
 }
 
@@ -1712,7 +1782,6 @@ cleanup_scheduled_outputv(ErlIOVec *ev, ErlDrvBinary *cbinp)
 	    driver_free_binary(ev->binv[i]);
     if (cbinp)
 	driver_free_binary(cbinp);
-    erts_free(ERTS_ALC_T_DRV_CMD_DATA, ev);
 }
 
 static int
@@ -1779,6 +1848,7 @@ call_driver_output(int bang_op,
 	send_badsig(prt);
     else {
 	ErtsSchedulerData *esdp = erts_get_scheduler_data();
+        ERTS_MSACC_PUSH_AND_SET_STATE_M(ERTS_MSACC_STATE_PORT);
 	ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt)	
 			   || ERTS_IS_CRASH_DUMPING);
 
@@ -1788,6 +1858,15 @@ call_driver_output(int bang_op,
 	    DTRACE4(driver_output, process_str, port_str, prt->name, size);
 	}
 #endif
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+        if (LTTNG_ENABLED(driver_output)) {
+            lttng_decl_portbuf(port_str);
+            lttng_decl_procbuf(proc_str);
+            lttng_pid_to_str(caller, proc_str);
+            lttng_port_to_str(prt, port_str);
+            LTTNG4(driver_output, proc_str, port_str, prt->name, size);
+        }
+#endif
 
 	prt->caller = caller;
 	(*drv->output)((ErlDrvData) prt->drv_data, bufp, size);
@@ -1798,6 +1877,8 @@ call_driver_output(int bang_op,
 	    esdp->io.out += (Uint64) size;
 	else
 	    erts_atomic64_add_nob(&bytes_out, (erts_aint64_t) size);
+
+	ERTS_MSACC_POP_STATE_M();
     }
 }
 
@@ -1847,6 +1928,188 @@ port_sig_output(Port *prt, erts_aint32_t state, int op, ErtsProc2PortSigData *si
     return ERTS_PORT_REDS_CMD_OUTPUT;
 }
 
+
+/*
+ * This erts_port_output will always create a port task.
+ * The call is treated as a port_command call, i.e. no
+ * badsig i generated if the input in invalid. However
+ * an error_logger message is generated.
+ */
+int
+erts_port_output_async(Port *prt, Eterm from, Eterm list)
+{
+
+    ErtsPortOpResult res;
+    ErtsProc2PortSigData *sigdp;
+    erts_driver_t *drv = prt->drv_ptr;
+    size_t size;
+    int task_flags;
+    ErtsProc2PortSigCallback port_sig_callback;
+    ErlDrvBinary *cbin = NULL;
+    ErlIOVec *evp = NULL;
+    char *buf = NULL;
+    ErtsPortTaskHandle *ns_pthp;
+
+    if (drv->outputv) {
+        ErlIOVec ev;
+	SysIOVec* ivp;
+	ErlDrvBinary**  bvp;
+        int vsize;
+	Uint csize;
+	Uint pvsize;
+	Uint pcsize;
+        size_t iov_offset, binv_offset, alloc_size;
+        Uint blimit = 0;
+        char *ptr;
+        int i;
+
+        Eterm* bptr = NULL;
+        Uint offset;
+
+        if (is_binary(list)) {
+            /* We optimize for when we get a procbin without offset */
+            Eterm real_bin;
+            int bitoffs;
+            int bitsize;
+            ERTS_GET_REAL_BIN(list, real_bin, offset, bitoffs, bitsize);
+            bptr = binary_val(real_bin);
+            if (*bptr == HEADER_PROC_BIN && bitoffs == 0) {
+                size = binary_size(list);
+                vsize = 1;
+            } else
+                bptr = NULL;
+        }
+
+        if (!bptr) {
+            if (io_list_vec_len(list, &vsize, &csize, &pvsize, &pcsize, &size))
+                goto bad_value;
+
+            /* To pack or not to pack (small binaries) ...? */
+            if (vsize >= SMALL_WRITE_VEC) {
+                /* Do pack */
+                vsize = pvsize + 1;
+                csize = pcsize;
+                blimit = ERL_SMALL_IO_BIN_LIMIT;
+            }
+            cbin = driver_alloc_binary(csize);
+            if (!cbin)
+                erts_alloc_enomem(ERTS_ALC_T_DRV_BINARY, ERTS_SIZEOF_Binary(csize));
+        }
+
+
+        iov_offset = ERTS_ALC_DATA_ALIGN_SIZE(sizeof(ErlIOVec));
+	binv_offset = iov_offset;
+        binv_offset += ERTS_ALC_DATA_ALIGN_SIZE((vsize+1)*sizeof(SysIOVec));
+        alloc_size = binv_offset;
+	alloc_size += (vsize+1)*sizeof(ErlDrvBinary *);
+
+        sigdp = erts_port_task_alloc_p2p_sig_data_extra(alloc_size, (void**)&ptr);
+
+        evp = (ErlIOVec *) ptr;
+        ivp = evp->iov = (SysIOVec *) (ptr + iov_offset);
+        bvp = evp->binv = (ErlDrvBinary **) (ptr + binv_offset);
+
+        ivp[0].iov_base = NULL;
+	ivp[0].iov_len = 0;
+	bvp[0] = NULL;
+
+        if (bptr) {
+            ProcBin* pb = (ProcBin *) bptr;
+
+            ivp[1].iov_base = pb->bytes+offset;
+            ivp[1].iov_len = size;
+            bvp[1] = Binary2ErlDrvBinary(pb->val);
+
+            evp->vsize = 1;
+        } else {
+
+            evp->vsize = io_list_to_vec(list, ivp+1, bvp+1, cbin, blimit);
+            if (evp->vsize < 0) {
+                if (evp != &ev)
+                    erts_free(ERTS_ALC_T_DRV_CMD_DATA, evp);
+                driver_free_binary(cbin);
+                goto bad_value;
+            }
+        }
+#if 0
+	/* This assertion may say something useful, but it can
+        be falsified during the emulator test suites. */
+	ASSERT(evp->vsize == vsize);
+#endif
+	evp->vsize++;
+	evp->size = size;  /* total size */
+
+        /* Need to increase refc on all binaries */
+        for (i = 1; i < evp->vsize; i++)
+            if (bvp[i])
+                driver_binary_inc_refc(bvp[i]);
+
+	sigdp->flags = ERTS_P2P_SIG_TYPE_OUTPUTV;
+	sigdp->u.outputv.from = from;
+	sigdp->u.outputv.evp = evp;
+	sigdp->u.outputv.cbinp = cbin;
+	port_sig_callback = port_sig_outputv;
+    } else {
+        ErlDrvSizeT ERTS_DECLARE_DUMMY(r);
+
+	/*
+	 * Apperently there exist code that write 1 byte to
+	 * much in buffer. Where it resides I don't know, but
+	 * we can live with one byte extra allocated...
+	 */
+
+        if (erts_iolist_size(list, &size))
+            goto bad_value;
+
+        buf = erts_alloc(ERTS_ALC_T_DRV_CMD_DATA, size + 1);
+
+        r = erts_iolist_to_buf(list, buf, size);
+        ASSERT(ERTS_IOLIST_TO_BUF_SUCCEEDED(r));
+
+	sigdp = erts_port_task_alloc_p2p_sig_data();
+	sigdp->flags = ERTS_P2P_SIG_TYPE_OUTPUT;
+	sigdp->u.output.from = from;
+	sigdp->u.output.bufp = buf;
+	sigdp->u.output.size = size;
+	port_sig_callback = port_sig_output;
+    }
+    sigdp->flags = 0;
+    ns_pthp = NULL;
+    task_flags = 0;
+
+    res = erts_schedule_proc2port_signal(NULL,
+					 prt,
+					 ERTS_INVALID_PID,
+					 NULL,
+					 sigdp,
+					 task_flags,
+					 ns_pthp,
+					 port_sig_callback);
+
+    if (res != ERTS_PORT_OP_SCHEDULED) {
+	if (drv->outputv)
+	    cleanup_scheduled_outputv(evp, cbin);
+	else
+	    cleanup_scheduled_output(buf);
+	return 1;
+    }
+    return 1;
+
+bad_value:
+
+    /*
+     * We call badsig directly here as this function is called with
+     * the main lock of the calling process still held.
+     * At the moment this operation is always not a bang_op, so
+     * only an error_logger message should be generated, no badsig.
+    */
+
+    badsig_received(0, prt, erts_atomic32_read_nob(&prt->state), 1);
+
+    return 0;
+
+}
+
 ErtsPortOpResult
 erts_port_output(Process *c_p,
 		 int flags,
@@ -1856,7 +2119,7 @@ erts_port_output(Process *c_p,
 		 Eterm *refp)
 {
     ErtsPortOpResult res;
-    ErtsProc2PortSigData *sigdp;
+    ErtsProc2PortSigData *sigdp = NULL;
     erts_driver_t *drv = prt->drv_ptr;
     size_t size;
     int try_call;
@@ -1909,7 +2172,6 @@ erts_port_output(Process *c_p,
 	DTRACE4(port_command, process_str, port_str, prt->name, "command");
     }
 #endif
-
     if (drv->outputv) {
 	ErlIOVec ev;
 	SysIOVec iv[SMALL_WRITE_VEC];
@@ -1938,10 +2200,13 @@ erts_port_output(Process *c_p,
 	    evp = &ev;
 	}
 	else {
-	    char *ptr = erts_alloc((try_call
-				    ? ERTS_ALC_T_TMP
-				    : ERTS_ALC_T_DRV_CMD_DATA), alloc_size);
-
+            char *ptr;
+            if (try_call) {
+                ptr = erts_alloc(ERTS_ALC_T_TMP, alloc_size);
+            } else {
+                sigdp = erts_port_task_alloc_p2p_sig_data_extra(
+                    alloc_size, (void**)&ptr);
+            }
 	    evp = (ErlIOVec *) ptr;
 	    ivp = evp->iov = (SysIOVec *) (ptr + iov_offset);
 	    bvp = evp->binv = (ErlDrvBinary **) (ptr + binv_offset);
@@ -1970,9 +2235,12 @@ erts_port_output(Process *c_p,
 	bvp[0] = NULL;
 	evp->vsize = io_list_to_vec(list, ivp+1, bvp+1, cbin, blimit);
 	if (evp->vsize < 0) {
-	    if (evp != &ev)
-		erts_free(try_call ? ERTS_ALC_T_TMP : ERTS_ALC_T_DRV_CMD_DATA,
-			  evp);
+            if (evp != &ev) {
+                if (try_call)
+                    erts_free(ERTS_ALC_T_TMP, evp);
+                else
+                    erts_port_task_free_p2p_sig_data(sigdp);
+            }
 	    driver_free_binary(cbin);
 	    goto bad_value;
 	}
@@ -2024,8 +2292,10 @@ erts_port_output(Process *c_p,
 		/* Fall through... */
 	    case ERTS_TRY_IMM_DRV_CALL_INVALID_PORT:
 		driver_free_binary(cbin);
-		if (evp != &ev)
+		if (evp != &ev) {
+                    ASSERT(!sigdp);
 		    erts_free(ERTS_ALC_T_TMP, evp);
+                }
 		if (try_call_res != ERTS_TRY_IMM_DRV_CALL_OK)
 		    return ERTS_PORT_OP_DROPPED;
 		if (c_p)
@@ -2036,8 +2306,10 @@ erts_port_output(Process *c_p,
 		if (async_nosuspend
 		    && (sched_flags & (busy_flgs|ERTS_PTS_FLG_EXIT))) {
 		    driver_free_binary(cbin);
-		    if (evp != &ev)
+                    if (evp != &ev) {
+                        ASSERT(!sigdp);
 			erts_free(ERTS_ALC_T_TMP, evp);
+                    }
 		    return ((sched_flags & ERTS_PTS_FLG_EXIT)
 			    ? ERTS_PORT_OP_DROPPED
 			    : ERTS_PORT_OP_BUSY);
@@ -2052,9 +2324,16 @@ erts_port_output(Process *c_p,
 		if (bvp[i])
 		    driver_binary_inc_refc(bvp[i]);
 
-	    new_evp = erts_alloc(ERTS_ALC_T_DRV_CMD_DATA, alloc_size);
+            /* The port task and iovec is allocated in the
+               same structure as an optimization. This
+               is especially important in erts_port_output_async
+               of when !try_call */
+            ASSERT(sigdp == NULL);
+            sigdp = erts_port_task_alloc_p2p_sig_data_extra(
+                alloc_size, (void**)&new_evp);
 
 	    if (evp != &ev) {
+                /* Copy from TMP alloc to port task */
 		sys_memcpy((void *) new_evp, (void *) evp, alloc_size);
 		new_evp->iov = (SysIOVec *) (((char *) new_evp)
 					     + iov_offset);
@@ -2102,7 +2381,6 @@ erts_port_output(Process *c_p,
 	    evp = new_evp;
 	}
 
-	sigdp = erts_port_task_alloc_p2p_sig_data();
 	sigdp->flags = ERTS_P2P_SIG_TYPE_OUTPUTV;
 	sigdp->u.outputv.from = from;
 	sigdp->u.outputv.evp = evp;
@@ -2370,6 +2648,11 @@ erts_port_exit(Process *c_p,
 		      | ERTS_PORT_SIG_FLG_BROKEN_LINK
 		      | ERTS_PORT_SIG_FLG_FORCE_SCHED)) == 0);
 
+#ifndef __WIN32__
+    if (prt->drv_ptr == &forker_driver)
+        return ERTS_PORT_OP_DROPPED;
+#endif
+
     if (!(flags & ERTS_PORT_SIG_FLG_FORCE_SCHED)) {
 	ErtsTryImmDrvCallState try_call_state
 	    = ERTS_INIT_TRY_IMM_DRV_CALL_STATE(c_p,
@@ -2734,6 +3017,72 @@ erts_port_link(Process *c_p, Port *prt, Eterm to, Eterm *refp)
 					  port_sig_link);
 }
 
+static void
+init_ack_send_reply(Port *port, Eterm resp)
+{
+
+    if (!is_internal_port(resp)) {
+        Process *rp = erts_proc_lookup_raw(port->async_open_port->to);
+        erts_smp_proc_lock(rp, ERTS_PROC_LOCK_LINK);
+        erts_remove_link(&ERTS_P_LINKS(port), port->async_open_port->to);
+        erts_remove_link(&ERTS_P_LINKS(rp), port->common.id);
+        erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
+    }
+    port_sched_op_reply(port->async_open_port->to,
+                        port->async_open_port->ref,
+                        resp);
+
+    erts_free(ERTS_ALC_T_PRTSD, port->async_open_port);
+    port->async_open_port = NULL;
+}
+
+void
+erl_drv_init_ack(ErlDrvPort ix, ErlDrvData res) {
+    Port *port = erts_drvport2port(ix);
+    SWord err_type = (SWord)res;
+    Eterm resp;
+
+    if (port == ERTS_INVALID_ERL_DRV_PORT && port->async_open_port)
+        return;
+
+    if (port->async_open_port) {
+        switch(err_type) {
+        case -3:
+            resp = am_badarg;
+            break;
+        case -2: {
+            char *str = erl_errno_id(errno);
+            resp = erts_atom_put((byte *) str, strlen(str),
+                                 ERTS_ATOM_ENC_LATIN1, 1);
+            break;
+        }
+        case -1:
+            resp = am_einval;
+            break;
+        default:
+            resp = port->common.id;
+            break;
+        }
+
+        init_ack_send_reply(port, resp);
+
+        if (err_type == -1 || err_type == -2 || err_type == -3)
+            driver_failure_term(ix, am_normal, 0);
+        port->drv_data = err_type;
+    }
+}
+
+void
+erl_drv_set_os_pid(ErlDrvPort ix, ErlDrvSInt pid) {
+    Port *port = erts_drvport2port(ix);
+
+    if (port == ERTS_INVALID_ERL_DRV_PORT)
+        return;
+
+    port->os_pid = (SWord)pid;
+
+}
+
 void erts_init_io(int port_tab_size,
 		  int port_tab_size_ignore_files,
 		  int legacy_port_tab)
@@ -2794,10 +3143,11 @@ void erts_init_io(int port_tab_size,
     erts_smp_rwmtx_rwlock(&erts_driver_list_lock);
 
     init_driver(&fd_driver, &fd_driver_entry, NULL);
-#ifndef __OSE__
     init_driver(&vanilla_driver, &vanilla_driver_entry, NULL);
-#endif
     init_driver(&spawn_driver, &spawn_driver_entry, NULL);
+#ifndef __WIN32__
+    init_driver(&forker_driver, &forker_driver_entry, NULL);
+#endif
     erts_init_static_drivers();
     for (dp = driver_tab; *dp != NULL; dp++)
 	erts_add_driver_entry(*dp, NULL, 1);
@@ -2859,6 +3209,9 @@ void erts_lcnt_enable_io_lock_count(int enable) {
 
     lcnt_enable_drv_lock_count(&vanilla_driver, enable);
     lcnt_enable_drv_lock_count(&spawn_driver, enable);
+#ifndef __WIN32__
+    lcnt_enable_drv_lock_count(&forker_driver, enable);
+#endif
     lcnt_enable_drv_lock_count(&fd_driver, enable);
     /* enable lock counting in all drivers */
     for (dp = driver_list; dp; dp = dp->next) {
@@ -3054,16 +3407,17 @@ deliver_result(Eterm sender, Eterm pid, Eterm res)
 
     if (rp) {
 	Eterm tuple;
-	ErlHeapFragment *bp;
+	ErtsMessage *mp;
 	ErlOffHeap *ohp;
 	Eterm* hp;
 	Uint sz_res;
 
 	sz_res = size_object(res);
-	hp = erts_alloc_message_heap(sz_res + 3, &bp, &ohp, rp, &rp_locks);
+	mp = erts_alloc_message_heap(rp, &rp_locks,
+				     sz_res + 3, &hp, &ohp);
 	res = copy_struct(res, sz_res, &hp, ohp);
 	tuple = TUPLE2(hp, sender, res);
-	erts_queue_message(rp, &rp_locks, bp, tuple, NIL);
+	erts_queue_message(rp, &rp_locks, mp, tuple, NIL);
 
 	if (rp_locks)
 	    erts_smp_proc_unlock(rp, rp_locks);
@@ -3091,7 +3445,7 @@ static void deliver_read_message(Port* prt, erts_aint32_t state, Eterm to,
     Eterm tuple;
     Process* rp;
     Eterm* hp;
-    ErlHeapFragment *bp;
+    ErtsMessage *mp;
     ErlOffHeap *ohp;
     ErtsProcLocks rp_locks = 0;
     int scheduler = erts_get_scheduler_id() != 0;
@@ -3117,7 +3471,7 @@ static void deliver_read_message(Port* prt, erts_aint32_t state, Eterm to,
     if (!rp)
 	return;
 
-    hp = erts_alloc_message_heap(need, &bp, &ohp, rp, &rp_locks);
+    mp = erts_alloc_message_heap(rp, &rp_locks, need, &hp, &ohp);
 
     listp = NIL;
     if ((state & ERTS_PORT_SFLG_BINARY_IO) == 0) {
@@ -3159,7 +3513,7 @@ static void deliver_read_message(Port* prt, erts_aint32_t state, Eterm to,
     tuple = TUPLE2(hp, prt->common.id, tuple);
     hp += 3;
 
-    erts_queue_message(rp, &rp_locks, bp, tuple, am_undefined);
+    erts_queue_message(rp, &rp_locks, mp, tuple, am_undefined);
     if (rp_locks)
 	erts_smp_proc_unlock(rp, rp_locks);
     if (!scheduler)
@@ -3233,7 +3587,7 @@ deliver_vec_message(Port* prt,			/* Port */
     Eterm tuple;
     Process* rp;
     Eterm* hp;
-    ErlHeapFragment *bp;
+    ErtsMessage *mp;
     ErlOffHeap *ohp;
     ErtsProcLocks rp_locks = 0;
     int scheduler = erts_get_scheduler_id() != 0;
@@ -3265,7 +3619,7 @@ deliver_vec_message(Port* prt,			/* Port */
 	need += (hlen+csize)*2;
     }
 
-    hp = erts_alloc_message_heap(need, &bp, &ohp, rp, &rp_locks);
+    mp = erts_alloc_message_heap(rp, &rp_locks, need, &hp, &ohp);
 
     listp = NIL;
     iov += vsize;
@@ -3326,7 +3680,7 @@ deliver_vec_message(Port* prt,			/* Port */
     tuple = TUPLE2(hp, prt->common.id, tuple);
     hp += 3;
 
-    erts_queue_message(rp, &rp_locks, bp, tuple, am_undefined);
+    erts_queue_message(rp, &rp_locks, mp, tuple, am_undefined);
     erts_smp_proc_unlock(rp, rp_locks);
     if (!scheduler)
 	erts_proc_dec_refc(rp);
@@ -3366,18 +3720,32 @@ static void flush_port(Port *p)
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(p));
 
     if (p->drv_ptr->flush != NULL) {
+        ERTS_MSACC_PUSH_STATE_M();
 #ifdef USE_VM_PROBES
         if (DTRACE_ENABLED(driver_flush)) {
             DTRACE_FORMAT_COMMON_PID_AND_PORT(ERTS_PORT_GET_CONNECTED(p), p)
             DTRACE3(driver_flush, process_str, port_str, p->name);
         }
 #endif
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+        if (LTTNG_ENABLED(driver_flush)) {
+            lttng_decl_portbuf(port_str);
+            lttng_decl_procbuf(proc_str);
+            lttng_pid_to_str(ERTS_PORT_GET_CONNECTED(p), proc_str);
+            lttng_port_to_str(p, port_str);
+            LTTNG3(driver_flush, proc_str, port_str, p->name);
+        }
+#endif
+
+
         if (IS_TRACED_FL(p, F_TRACE_SCHED_PORTS)) {
 	    trace_sched_ports_where(p, am_in, am_flush);
 	}
+        ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_PORT);
 	fpe_was_unmasked = erts_block_fpe();
 	(*p->drv_ptr->flush)((ErlDrvData)p->drv_data);
 	erts_unblock_fpe(fpe_was_unmasked);
+	ERTS_MSACC_POP_STATE_M();
         if (IS_TRACED_FL(p, F_TRACE_SCHED_PORTS)) {
 	    trace_sched_ports_where(p, am_out, am_flush);
 	}
@@ -3401,6 +3769,7 @@ terminate_port(Port *prt)
     Eterm connected_id = NIL /* Initialize to silence compiler */;
     erts_driver_t *drv;
     erts_aint32_t state;
+    ErtsPrtSD *psd;
 
     ERTS_SMP_CHK_NO_PROC_LOCKS;
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
@@ -3425,14 +3794,26 @@ terminate_port(Port *prt)
     drv = prt->drv_ptr;
     if ((drv != NULL) && (drv->stop != NULL)) {
 	int fpe_was_unmasked = erts_block_fpe();
+	ERTS_MSACC_PUSH_AND_SET_STATE_M(ERTS_MSACC_STATE_PORT);
 #ifdef USE_VM_PROBES
         if (DTRACE_ENABLED(driver_stop)) {
             DTRACE_FORMAT_COMMON_PID_AND_PORT(connected_id, prt)
             DTRACE3(driver_stop, process_str, drv->name, port_str);
         }
 #endif
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+        if (LTTNG_ENABLED(driver_stop)) {
+            lttng_decl_portbuf(port_str);
+            lttng_decl_procbuf(proc_str);
+            lttng_pid_to_str(connected_id, proc_str);
+            lttng_port_to_str(prt, port_str);
+            LTTNG3(driver_stop, proc_str, drv->name, port_str);
+        }
+#endif
+
 	(*drv->stop)((ErlDrvData)prt->drv_data);
 	erts_unblock_fpe(fpe_was_unmasked);
+	ERTS_MSACC_POP_STATE_M();
 #ifdef ERTS_SMP
 	if (prt->xports)
 	    erts_port_handle_xports(prt);
@@ -3452,8 +3833,9 @@ terminate_port(Port *prt)
 
     erts_cleanup_port_data(prt);
 
-    if (prt->psd)
-	erts_free(ERTS_ALC_T_PRTSD, prt->psd);
+    psd = (ErtsPrtSD *) erts_smp_atomic_read_nob(&prt->psd);
+    if (psd)
+	erts_free(ERTS_ALC_T_PRTSD, psd);
 
     ASSERT(prt->dist_entry == NULL);
 
@@ -3466,7 +3848,7 @@ terminate_port(Port *prt)
     if ((state & ERTS_PORT_SFLG_HALT)
 	&& (erts_smp_atomic32_dec_read_nob(&erts_halt_progress) == 0)) {
 	erts_port_release(prt); /* We will exit and never return */
-	erl_exit_flush_async(erts_halt_code, "");
+	erts_flush_async_exit(erts_halt_code, "");
     }
     if (is_internal_port(send_closed_port_id))
 	deliver_result(send_closed_port_id, connected_id, am_closed);
@@ -3743,6 +4125,7 @@ call_driver_control(Eterm caller,
 		    ErlDrvSizeT *from_size)
 {
     ErlDrvSSizeT cres;
+    ERTS_MSACC_PUSH_STATE_M();
 
     if (!prt->drv_ptr->control)
 	return ERTS_PORT_OP_BADARG;
@@ -3756,6 +4139,18 @@ call_driver_control(Eterm caller,
                 command, size);
     }
 #endif
+    
+    ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_PORT);
+
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+    if (LTTNG_ENABLED(driver_control)) {
+        lttng_decl_procbuf(proc_str);
+        lttng_decl_portbuf(port_str);
+        lttng_pid_to_str(caller, proc_str);
+        lttng_port_to_str(prt, port_str);
+        LTTNG5(driver_control, proc_str, port_str, prt->name, command, size);
+    }
+#endif
 
     prt->caller = caller;
     cres = prt->drv_ptr->control((ErlDrvData) prt->drv_data,
@@ -3766,6 +4161,8 @@ call_driver_control(Eterm caller,
 				 *from_size);
     prt->caller = NIL;
 
+    ERTS_MSACC_POP_STATE_M();
+
     if (cres < 0)
 	return ERTS_PORT_OP_BADARG;
 
@@ -3817,7 +4214,6 @@ write_port_control_result(int control_flags,
 			  ErlDrvSizeT resp_size,
 			  char *pre_alloc_buf,
 			  Eterm **hpp,
-			  ErlHeapFragment *bp,
 			  ErlOffHeap *ohp)
 {
     Eterm res;
@@ -3891,16 +4287,13 @@ port_sig_control(Port *prt,
 
 	if (res == ERTS_PORT_OP_DONE) {
 	    Eterm msg;
-	    Eterm *hp;
-	    ErlHeapFragment *bp;
-	    ErlOffHeap *ohp;
             ErtsHeapFactory factory;
 	    Process *rp;
 	    ErtsProcLocks rp_locks = 0;
 	    Uint hsz, rsz;
 	    int control_flags;
 
-	    rp = erts_proc_lookup_raw(sigdp->caller);
+	    rp = sigdp->caller == ERTS_INVALID_PID ? NULL : erts_proc_lookup_raw(sigdp->caller);
 	    if (!rp)
 		goto done;
 
@@ -3913,22 +4306,15 @@ port_sig_control(Port *prt,
 	    hsz = rsz + ERTS_QUEUE_PORT_SCHED_OP_REPLY_SIZE;
 
 
-	    hp = erts_alloc_message_heap(hsz,
-						    &bp,
-						    &ohp,
-						    rp,
-						    &rp_locks);
-            erts_factory_message_init(&factory, rp, hp, bp);
+	    (void) erts_factory_message_create(&factory, rp,
+					       &rp_locks, hsz);
 
 	    msg = write_port_control_result(control_flags,
 					    resp_bufp,
 					    resp_size,
 					    &resp_buf[0],
-					    &hp,
-					    bp,
-					    ohp);
-            factory.hp = hp;
-
+					    &factory.hp,
+					    factory.off_heap);
 	    queue_port_sched_op_reply(rp,
 				      &rp_locks,
                                       &factory,
@@ -3943,7 +4329,8 @@ port_sig_control(Port *prt,
 
     /* failure */
 
-    port_sched_op_reply(sigdp->caller, sigdp->ref, am_badarg);
+    if (sigdp->caller != ERTS_INVALID_PID)
+        port_sched_op_reply(sigdp->caller, sigdp->ref, am_badarg);
 
 done:
 
@@ -3953,6 +4340,23 @@ done:
     return ERTS_PORT_REDS_CONTROL;
 }
 
+/*
+ * This is an asynchronous control call. I.e. it will not return anything
+ * to the caller.
+ */
+int
+erl_drv_port_control(Eterm port_num, char cmd, char* buff, ErlDrvSizeT size)
+{
+    ErtsProc2PortSigData *sigdp = erts_port_task_alloc_p2p_sig_data();
+
+    sigdp->flags = ERTS_P2P_SIG_TYPE_CONTROL | ERTS_P2P_SIG_DATA_FLG_REPLY;
+    sigdp->u.control.binp = NULL;
+    sigdp->u.control.command = cmd;
+    sigdp->u.control.bufp = buff;
+    sigdp->u.control.size = size;
+
+    return erts_schedule_port2port_signal(port_num, sigdp, 0, port_sig_control);
+}
 
 ErtsPortOpResult
 erts_port_control(Process* c_p,
@@ -4069,7 +4473,6 @@ erts_port_control(Process* c_p,
 						 resp_size,
 						 &resp_buf[0],
 						 &hp,
-						 NULL,
 						 &c_p->off_heap);
 	    BUMP_REDS(c_p, ERTS_PORT_REDS_CONTROL);
 	    return ERTS_PORT_OP_DONE;
@@ -4091,10 +4494,10 @@ erts_port_control(Process* c_p,
     binp = NULL;
 
     if (is_binary(data) && binary_bitoffset(data) == 0) {
-	Eterm *ebinp = binary_val_rel(data, NULL);
+	Eterm *ebinp = binary_val(data);
 	ASSERT(!tmp_alloced);
 	if (*ebinp == HEADER_SUB_BIN)
-	    ebinp = binary_val_rel(((ErlSubBin *) ebinp)->orig, NULL);
+	    ebinp = binary_val(((ErlSubBin *) ebinp)->orig);
 	if (*ebinp != HEADER_PROC_BIN)
 	    copy = 1;
 	else {
@@ -4147,6 +4550,7 @@ call_driver_call(Eterm caller,
 		 unsigned *ret_flagsp)
 {
     ErlDrvSSizeT cres;
+    ERTS_MSACC_PUSH_STATE_M();
 
     if (!prt->drv_ptr->call)
 	return ERTS_PORT_OP_BADARG;
@@ -4161,6 +4565,17 @@ call_driver_call(Eterm caller,
         DTRACE5(driver_call, process_str, port_str, prt->name, command, size);
     }
 #endif
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+    if (LTTNG_ENABLED(driver_call)) {
+        lttng_decl_procbuf(proc_str);
+        lttng_decl_portbuf(port_str);
+        lttng_pid_to_str(caller,proc_str);
+        lttng_port_to_str(prt, port_str);
+        LTTNG5(driver_call, proc_str, port_str, prt->name, command, size);
+    }
+#endif
+
+    ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_PORT);
 
     prt->caller = caller;
     cres = prt->drv_ptr->call((ErlDrvData) prt->drv_data,
@@ -4172,6 +4587,8 @@ call_driver_call(Eterm caller,
 			      ret_flagsp);
     prt->caller = NIL;
 
+    ERTS_MSACC_POP_STATE_M();
+
     if (cres <= 0
 	|| ((byte) (*resp_bufp)[0]) != VERSION_MAGIC)
 	return ERTS_PORT_OP_BADARG;
@@ -4228,22 +4645,15 @@ port_sig_call(Port *prt,
 
 	    hsz = erts_decode_ext_size((byte *) resp_bufp, resp_size);
 	    if (hsz >= 0) {
-                ErlHeapFragment* bp;
-                ErlOffHeap* ohp;
                 ErtsHeapFactory factory;
 		byte *endp;
 
 		hsz += 3; /* ok tuple */
 		hsz += ERTS_QUEUE_PORT_SCHED_OP_REPLY_SIZE;
 
-                hp = erts_alloc_message_heap(hsz,
-                                             &bp,
-                                             &ohp,
-                                             rp,
-                                             &rp_locks);
+                (void) erts_factory_message_create(&factory, rp, &rp_locks, hsz);
 		endp = (byte *) resp_bufp;
-                erts_factory_message_init(&factory, rp, hp, bp);
-		msg = erts_decode_ext(&factory, &endp);
+		msg = erts_decode_ext(&factory, &endp, 0);
 		if (is_value(msg)) {
                     hp = erts_produce_heap(&factory,
                                            3,
@@ -4362,7 +4772,7 @@ erts_port_call(Process* c_p,
 	    hsz += 3;
             erts_factory_proc_prealloc_init(&factory, c_p, hsz);
 	    endp = (byte *) resp_bufp;
-	    term = erts_decode_ext(&factory, &endp);
+	    term = erts_decode_ext(&factory, &endp, 0);
 	    if (term == THE_NON_VALUE)
 		return ERTS_PORT_OP_BADARG;
             hp = erts_produce_heap(&factory,3,0);
@@ -4503,7 +4913,9 @@ port_sig_info(Port *prt,
 				    sigdp->u.info.item);
 	if (is_value(value)) {
             ErtsHeapFactory factory;
-            erts_factory_message_init(&factory, NULL, hp, bp);
+	    ErtsMessage *mp = erts_alloc_message(0, NULL);
+	    mp->data.heap_frag = bp;
+            erts_factory_selfcontained_message_init(&factory, mp, hp);
 	    queue_port_sched_op_reply(rp,
 				      &rp_locks,
                                       &factory,
@@ -4591,8 +5003,8 @@ reply_io_bytes(void *vreq)
 
     rp = erts_proc_lookup(req->pid);
     if (rp) {
-	ErlOffHeap *ohp = NULL;
-	ErlHeapFragment *bp = NULL;
+	ErlOffHeap *ohp;
+	ErtsMessage *mp;
 	ErtsProcLocks rp_locks;
 	Eterm ref, msg, ein, eout, *hp;
 	Uint64 in, out;
@@ -4614,7 +5026,7 @@ reply_io_bytes(void *vreq)
 	erts_bld_uint64(NULL, &hsz, in);
 	erts_bld_uint64(NULL, &hsz, out);
 
-	hp = erts_alloc_message_heap(hsz, &bp, &ohp, rp, &rp_locks);
+	mp = erts_alloc_message_heap(rp, &rp_locks, hsz, &hp, &ohp);
 
 	ref = make_internal_ref(hp);
 	write_ref_thing(hp, req->refn[0], req->refn[1], req->refn[2]);
@@ -4624,7 +5036,7 @@ reply_io_bytes(void *vreq)
 	eout = erts_bld_uint64(&hp, NULL, out);
 
 	msg = TUPLE4(hp, ref, make_small(sched_id), ein, eout);
-	erts_queue_message(rp, &rp_locks, bp, msg, NIL);
+	erts_queue_message(rp, &rp_locks, mp, msg, NIL);
 
 	if (req->sched_id == sched_id)
 	    rp_locks &= ~ERTS_PROC_LOCK_MAIN;
@@ -4730,6 +5142,10 @@ print_port_info(Port *p, int to, void *arg)
 	erts_print(to, arg, "Port is a file: %s\n",p->name);
     } else if (p->drv_ptr == &spawn_driver) {
 	erts_print(to, arg, "Port controls external process: %s\n",p->name);
+#ifndef __WIN32__
+    } else if (p->drv_ptr == &forker_driver) {
+	erts_print(to, arg, "Port controls forker process: %s\n",p->name);
+#endif
     } else {
 	erts_print(to, arg, "Port controls linked-in driver: %s\n",p->name);
     }
@@ -4876,12 +5292,13 @@ int get_port_flags(ErlDrvPort ix)
 void erts_raw_port_command(Port* p, byte* buf, Uint len)
 {
     int fpe_was_unmasked;
+    ERTS_MSACC_PUSH_STATE_M();
 
     ERTS_SMP_CHK_NO_PROC_LOCKS;
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(p));
 
     if (len > (Uint) INT_MAX)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "Absurdly large data buffer (%beu bytes) passed to"
 		 "output callback of %s driver.\n",
 		 len,
@@ -4896,9 +5313,11 @@ void erts_raw_port_command(Port* p, byte* buf, Uint len)
         DTRACE4(driver_output, "-raw-", port_str, p->name, len);
     }
 #endif
+    ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_PORT);
     fpe_was_unmasked = erts_block_fpe();
     (*p->drv_ptr->output)((ErlDrvData)p->drv_data, (char*) buf, (int) len);
     erts_unblock_fpe(fpe_was_unmasked);
+    ERTS_MSACC_POP_STATE_M();
 }
 
 int async_ready(Port *p, void* data)
@@ -4910,14 +5329,25 @@ int async_ready(Port *p, void* data)
     if (p) {
 	ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(p));
 	if (p->drv_ptr->ready_async != NULL) {
+	    ERTS_MSACC_PUSH_AND_SET_STATE_M(ERTS_MSACC_STATE_PORT);
 #ifdef USE_VM_PROBES
             if (DTRACE_ENABLED(driver_ready_async)) {
                 DTRACE_FORMAT_COMMON_PID_AND_PORT(ERTS_PORT_GET_CONNECTED(p), p)
                 DTRACE3(driver_ready_async, process_str, port_str, p->name);
             }
 #endif
+#ifdef USE_LTTNG_VM_TRACEPOINTS 
+            if (LTTNG_ENABLED(driver_ready_async)) {
+                lttng_decl_portbuf(port_str);
+                lttng_decl_procbuf(proc_str);
+                lttng_pid_to_str(ERTS_PORT_GET_CONNECTED(p), proc_str);
+                lttng_port_to_str(p, port_str);
+                LTTNG3(driver_ready_async, proc_str, port_str, p->name);
+            }
+#endif
 	    (*p->drv_ptr->ready_async)((ErlDrvData)p->drv_data, data);
 	    need_free = 0;
+	    ERTS_MSACC_POP_STATE_M();
 
 	}
 	erts_port_driver_callback_epilogue(p, NULL);
@@ -5069,11 +5499,11 @@ ErlDrvTermData driver_mk_term_nil(void)
 void driver_report_exit(ErlDrvPort ix, int status)
 {
    Eterm* hp;
+   ErlOffHeap *ohp;
    Eterm tuple;
    Process *rp;
    Eterm pid;
-   ErlHeapFragment *bp = NULL;
-   ErlOffHeap *ohp;
+   ErtsMessage *mp;
    ErtsProcLocks rp_locks = 0;
    int scheduler = erts_get_scheduler_id() != 0;
    Port* prt = erts_drvport2port(ix);
@@ -5093,13 +5523,13 @@ void driver_report_exit(ErlDrvPort ix, int status)
    if (!rp)
        return;
 
-   hp = erts_alloc_message_heap(3+3, &bp, &ohp, rp, &rp_locks);
+   mp = erts_alloc_message_heap(rp, &rp_locks, 3+3, &hp, &ohp);
 
    tuple = TUPLE2(hp, am_exit_status, make_small(status));
    hp += 3;
    tuple = TUPLE2(hp, prt->common.id, tuple);
 
-   erts_queue_message(rp, &rp_locks, bp, tuple, am_undefined);
+   erts_queue_message(rp, &rp_locks, mp, tuple, am_undefined);
 
    erts_smp_proc_unlock(rp, rp_locks);
    if (!scheduler)
@@ -5209,7 +5639,6 @@ driver_deliver_term(Eterm to, ErlDrvTermData* data, int len)
     ErtsProcLocks rp_locks = 0;
     struct b2t_states__ b2t;
     int scheduler;
-    int is_heap_need_limited = 1;
     ErtsSchedulerData *esdp = erts_get_scheduler_data();
 
     ERTS_UNDEF(mess,NIL);
@@ -5248,25 +5677,17 @@ driver_deliver_term(Eterm to, ErlDrvTermData* data, int len)
 	    break;
 	case ERL_DRV_INT:  /* signed int argument */
 	    ERTS_DDT_CHK_ENOUGH_ARGS(1);
-#if HALFWORD_HEAP
-	    erts_bld_sint64(NULL, &need, (Sint64)ptr[0]);
-#else
 	    /* check for bignum */
 	    if (!IS_SSMALL((Sint)ptr[0]))
 		need += BIG_UINT_HEAP_SIZE;  /* use small_to_big */
-#endif
 	    ptr++;
 	    depth++;
 	    break;
 	case ERL_DRV_UINT:  /* unsigned int argument */
 	    ERTS_DDT_CHK_ENOUGH_ARGS(1);
-#if HALFWORD_HEAP
-	    erts_bld_uint64(NULL, &need, (Uint64)ptr[0]);
-#else
 	    /* check for bignum */
 	    if (!IS_USMALL(0, (Uint)ptr[0]))
 		need += BIG_UINT_HEAP_SIZE;  /* use small_to_big */
-#endif
 	    ptr++;
 	    depth++;
 	    break;
@@ -5386,9 +5807,6 @@ driver_deliver_term(Eterm to, ErlDrvTermData* data, int len)
 	    need += hsz;
 	    ptr += 2;
 	    depth++;
-            if (size > MAP_SMALL_MAP_LIMIT*3) { /* may contain big map */
-                is_heap_need_limited = 0;
-            }
 	    break;
 	}
 	case ERL_DRV_MAP: { /* int */
@@ -5396,7 +5814,6 @@ driver_deliver_term(Eterm to, ErlDrvTermData* data, int len)
 	    if ((int) ptr[0] < 0) ERTS_DDT_FAIL;
             if (ptr[0] > MAP_SMALL_MAP_LIMIT) {
                 need += HASHMAP_ESTIMATED_HEAP_SIZE(ptr[0]);
-                is_heap_need_limited = 0;
             } else {
                 need += MAP_HEADER_FLATMAP_SZ + 1 + 2*ptr[0];
             }
@@ -5435,17 +5852,7 @@ driver_deliver_term(Eterm to, ErlDrvTermData* data, int len)
 	goto done;
     }
 
-    /* Try copy directly to destination heap if we know there are no big maps */
-    if (is_heap_need_limited) {
-        ErlOffHeap *ohp;
-        ErlHeapFragment* bp;
-        Eterm* hp = erts_alloc_message_heap(need, &bp, &ohp, rp, &rp_locks);
-        erts_factory_message_init(&factory, rp, hp, bp);
-    }
-    else {
-        erts_factory_message_init(&factory, NULL, NULL,
-                                  new_message_buffer(need));
-    }
+    (void) erts_factory_message_create(&factory, rp, &rp_locks, need);
 
     /*
      * Interpret the instructions and build the term.
@@ -5465,10 +5872,6 @@ driver_deliver_term(Eterm to, ErlDrvTermData* data, int len)
 	    break;
 
 	case ERL_DRV_INT:  /* signed int argument */
-#if HALFWORD_HEAP
-	    erts_reserve_heap(&factory, BIG_NEED_SIZE(2));
-	    mess = erts_bld_sint64(&factory.hp, NULL, (Sint64)ptr[0]);
-#else
 	    erts_reserve_heap(&factory, BIG_UINT_HEAP_SIZE);
 	    if (IS_SSMALL((Sint)ptr[0]))
 		mess = make_small((Sint)ptr[0]);
@@ -5476,15 +5879,10 @@ driver_deliver_term(Eterm to, ErlDrvTermData* data, int len)
 		mess = small_to_big((Sint)ptr[0], factory.hp);
 		factory.hp += BIG_UINT_HEAP_SIZE;
 	    }
-#endif
 	    ptr++;
 	    break;
 
 	case ERL_DRV_UINT:  /* unsigned int argument */
-#if HALFWORD_HEAP
-	    erts_reserve_heap(&factory, BIG_NEED_FOR_BITS(64));
-	    mess = erts_bld_uint64(&factory.hp, NULL, (Uint64)ptr[0]);
-#else
 	    erts_reserve_heap(&factory, BIG_UINT_HEAP_SIZE);
 	    if (IS_USMALL(0, (Uint)ptr[0]))
 		mess = make_small((Uint)ptr[0]);
@@ -5492,7 +5890,6 @@ driver_deliver_term(Eterm to, ErlDrvTermData* data, int len)
 		mess = uint_to_big((Uint)ptr[0], factory.hp);
 		factory.hp += BIG_UINT_HEAP_SIZE;
 	    }
-#endif
 	    ptr++;
 	    break;
 
@@ -5724,9 +6121,9 @@ driver_deliver_term(Eterm to, ErlDrvTermData* data, int len)
 
     if (res > 0) {
 	mess = ESTACK_POP(stack);  /* get resulting value */
-	erts_factory_close(&factory);
+	erts_factory_trim_and_close(&factory, &mess, 1);
 	/* send message */
-	erts_queue_message(rp, &rp_locks, factory.heap_frags, mess, am_undefined);
+	erts_queue_message(rp, &rp_locks, factory.message, mess, am_undefined);
     }
     else {
 	if (b2t.ix > b2t.used)
@@ -6762,6 +7159,28 @@ driver_get_now(ErlDrvNowData *now_data)
     return 0;
 }
 
+ErlDrvTime
+erl_drv_monotonic_time(ErlDrvTimeUnit time_unit)
+{
+    return (ErlDrvTime) erts_napi_monotonic_time((int) time_unit);
+}
+
+ErlDrvTime
+erl_drv_time_offset(ErlDrvTimeUnit time_unit)
+{
+    return (ErlDrvTime) erts_napi_time_offset((int) time_unit);
+}
+
+ErlDrvTime
+erl_drv_convert_time_unit(ErlDrvTime val,
+			  ErlDrvTimeUnit from,
+			  ErlDrvTimeUnit to)
+{
+    return (ErlDrvTime) erts_napi_convert_time_unit((ErtsMonotonicTime) val,
+						    (int) from,
+						    (int) to);
+}
+
 static void ref_to_driver_monitor(Eterm ref, ErlDrvMonitor *mon)
 {
     RefThing *refp;
@@ -6809,7 +7228,7 @@ int driver_monitor_process(ErlDrvPort drvport,
 {
     Port *prt;
     int ret;
-#if !HEAP_ON_C_STACK || (defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK))
+#if defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK)
     ErtsSchedulerData *sched = erts_get_scheduler_data();
 #endif
 
@@ -6820,16 +7239,6 @@ int driver_monitor_process(ErlDrvPort drvport,
     /* Now (in SMP) we should have either the port lock (if we have a scheduler) or the port data lock
        (if we're a driver thread) */
     ERTS_SMP_LC_ASSERT((sched != NULL || prt->port_data_lock));
-
-#if !HEAP_ON_C_STACK
-    if (!sched) {
-	/* Need a separate allocation for the ref :( */
-	Eterm *buf = erts_alloc(ERTS_ALC_T_TEMP_TERM,
-				sizeof(Eterm)*REF_THING_SIZE);
-	ret = do_driver_monitor_process(prt,buf,process,monitor);
-	erts_free(ERTS_ALC_T_TEMP_TERM,buf);
-    } else
-#endif
     {
 	DeclareTmpHeapNoproc(buf,REF_THING_SIZE);
 	UseTmpHeapNoproc(REF_THING_SIZE);
@@ -6882,7 +7291,7 @@ int driver_demonitor_process(ErlDrvPort drvport,
 {
     Port *prt;
     int ret;
-#if !HEAP_ON_C_STACK || (defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK))
+#if defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK)
     ErtsSchedulerData *sched = erts_get_scheduler_data();
 #endif
 
@@ -6893,15 +7302,6 @@ int driver_demonitor_process(ErlDrvPort drvport,
     /* Now we should have either the port lock (if we have a scheduler) or the port data lock
        (if we're a driver thread) */
     ERTS_SMP_LC_ASSERT((sched != NULL || prt->port_data_lock));
-#if !HEAP_ON_C_STACK
-    if (!sched) {
-	/* Need a separate allocation for the ref :( */
-	Eterm *buf = erts_alloc(ERTS_ALC_T_TEMP_TERM,
-				sizeof(Eterm)*REF_THING_SIZE);
-	ret = do_driver_demonitor_process(prt,buf,monitor);
-	erts_free(ERTS_ALC_T_TEMP_TERM,buf);
-    } else
-#endif
     {
 	DeclareTmpHeapNoproc(buf,REF_THING_SIZE);
 	UseTmpHeapNoproc(REF_THING_SIZE);
@@ -6937,7 +7337,7 @@ ErlDrvTermData driver_get_monitored_process(ErlDrvPort drvport,
 {
     Port *prt;
     ErlDrvTermData ret;
-#if !HEAP_ON_C_STACK || (defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK))
+#if defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK)
     ErtsSchedulerData *sched = erts_get_scheduler_data();
 #endif
 
@@ -6948,16 +7348,6 @@ ErlDrvTermData driver_get_monitored_process(ErlDrvPort drvport,
     /* Now we should have either the port lock (if we have a scheduler) or the port data lock
        (if we're a driver thread) */
     ERTS_SMP_LC_ASSERT((sched != NULL || prt->port_data_lock));
-
-#if !HEAP_ON_C_STACK
-    if (!sched) {
-	/* Need a separate allocation for the ref :( */
-	Eterm *buf = erts_alloc(ERTS_ALC_T_TEMP_TERM,
-				sizeof(Eterm)*REF_THING_SIZE);
-	ret = do_driver_get_monitored_process(prt,buf,monitor);
-	erts_free(ERTS_ALC_T_TEMP_TERM,buf);
-    } else
-#endif
     {
 	DeclareTmpHeapNoproc(buf,REF_THING_SIZE);
 	UseTmpHeapNoproc(REF_THING_SIZE);
@@ -6981,6 +7371,7 @@ void erts_fire_port_monitor(Port *prt, Eterm ref)
     void (*callback)(ErlDrvData drv_data, ErlDrvMonitor *monitor);
     ErlDrvMonitor drv_monitor;
     int fpe_was_unmasked;
+    ERTS_MSACC_PUSH_STATE_M();
 
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
     ASSERT(prt->drv_ptr != NULL);    
@@ -6992,6 +7383,7 @@ void erts_fire_port_monitor(Port *prt, Eterm ref)
     callback = prt->drv_ptr->process_exit;
     ASSERT(callback != NULL);
     ref_to_driver_monitor(ref,&drv_monitor);
+    ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_PORT);
     DRV_MONITOR_UNLOCK_PDL(prt);
 #ifdef USE_VM_PROBES
     if (DTRACE_ENABLED(driver_process_exit)) {
@@ -6999,10 +7391,20 @@ void erts_fire_port_monitor(Port *prt, Eterm ref)
         DTRACE3(driver_process_exit, process_str, port_str, prt->name);
     }
 #endif
+#ifdef USE_LTTNG_VM_TRACEPOINTS
+    if (LTTNG_ENABLED(driver_process_exit)) {
+        lttng_decl_portbuf(port_str);
+        lttng_decl_procbuf(proc_str);
+        lttng_pid_to_str(ERTS_PORT_GET_CONNECTED(prt), proc_str);
+        lttng_port_to_str(prt, port_str);
+        LTTNG3(driver_process_exit, proc_str, port_str, prt->name);
+    }
+#endif
     fpe_was_unmasked = erts_block_fpe();
     (*callback)((ErlDrvData) (prt->drv_data), &drv_monitor);
     erts_unblock_fpe(fpe_was_unmasked);
     DRV_MONITOR_LOCK_PDL(prt);
+    ERTS_MSACC_POP_STATE_M();
     /* remove monitor *after* callback */
     rmon = erts_remove_monitor(&ERTS_P_MONITORS(prt), ref);
     DRV_MONITOR_UNLOCK_PDL(prt);
@@ -7023,6 +7425,9 @@ driver_failure_term(ErlDrvPort ix, Eterm term, int eof)
     if (prt == ERTS_INVALID_ERL_DRV_PORT)
 	return -1;
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
+
+    if (prt->async_open_port)
+        init_ack_send_reply(prt, prt->common.id);
     if (eof)
 	flush_linebuf_messages(prt, state);
     if (state & ERTS_PORT_SFLG_CLOSING) {
@@ -7289,7 +7694,7 @@ driver_system_info(ErlDrvSysInfo *sip, size_t si_size)
      * of ErlDrvSysInfo (introduced in driver version 1.0).
      */
     if (!sip || si_size < ERL_DRV_SYS_INFO_SIZE(smp_support)) 
-	erl_exit(1,
+	erts_exit(ERTS_ERROR_EXIT,
 		 "driver_system_info(%p, %ld) called with invalid arguments\n",
 		 sip, si_size);
 
@@ -7472,6 +7877,8 @@ init_driver(erts_driver_t *drv, ErlDrvEntry *de, DE_Handle *handle)
 	int fpe_was_unmasked = erts_block_fpe();
         DTRACE4(driver_init, drv->name, drv->version.major, drv->version.minor,
                 drv->flags);
+        LTTNG4(driver_init, drv->name, drv->version.major, drv->version.minor,
+                drv->flags);
 	res = (*de->init)();
 	erts_unblock_fpe(fpe_was_unmasked);
 	return res;
diff --git a/erts/emulator/beam/lttng-wrapper.h b/erts/emulator/beam/lttng-wrapper.h
new file mode 100644
index 0000000000..294872c365
--- /dev/null
+++ b/erts/emulator/beam/lttng-wrapper.h
@@ -0,0 +1,107 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 1996-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%
+ */
+
+#ifndef __LTTNG_WRAPPER_H__
+#define __LTTNG_WRAPPER_H__
+
+#ifdef USE_LTTNG
+
+#include "erlang_lttng.h"
+#define USE_LTTNG_VM_TRACEPOINTS
+
+#define LTTNG_BUFFER_SZ      (256)
+#define LTTNG_PROC_BUFFER_SZ (16)
+#define LTTNG_PORT_BUFFER_SZ (20)
+#define LTTNG_MFA_BUFFER_SZ  (256)
+
+#define lttng_decl_procbuf(Name) \
+    char Name[LTTNG_PROC_BUFFER_SZ]
+
+#define lttng_decl_portbuf(Name) \
+    char Name[LTTNG_PORT_BUFFER_SZ]
+
+#define lttng_decl_mfabuf(Name) \
+    char Name[LTTNG_MFA_BUFFER_SZ]
+
+#define lttng_decl_carrier_stats(Name) \
+    lttng_carrier_stats_t Name##_STATSTRUCT, *Name = &Name##_STATSTRUCT
+
+#define lttng_pid_to_str(pid, name) \
+    erts_snprintf(name, LTTNG_PROC_BUFFER_SZ, "%T", (pid))
+
+#define lttng_portid_to_str(pid, name) \
+    erts_snprintf(name, LTTNG_PORT_BUFFER_SZ, "%T", (pid))
+
+#define lttng_proc_to_str(p, name) \
+    lttng_pid_to_str(((p) ? (p)->common.id : ERTS_INVALID_PID), name)
+
+#define lttng_port_to_str(p, name) \
+    lttng_portid_to_str(((p) ? (p)->common.id : ERTS_INVALID_PORT), name)
+
+#define lttng_mfa_to_str(m,f,a, Name) \
+    erts_snprintf(Name, LTTNG_MFA_BUFFER_SZ, "%T:%T/%lu", (Eterm)(m), (Eterm)(f), (Uint)(a))
+
+#define lttng_proc_to_mfa_str(p, Name)                              \
+    do {                                                            \
+        if (ERTS_PROC_IS_EXITING((p))) {                            \
+            strcpy(Name, "<exiting>");                              \
+        } else {                                                    \
+            BeamInstr *_fptr = find_function_from_pc((p)->i);       \
+            if (_fptr) {                                            \
+                lttng_mfa_to_str(_fptr[0],_fptr[1],_fptr[2], Name); \
+            } else {                                                \
+                strcpy(Name, "<unknown>");                          \
+            }                                                       \
+        }                                                           \
+    } while(0)
+
+/* ErtsRunQueue->ErtsSchedulerData->Uint */
+#define lttng_rq_to_id(RQ) \
+    (RQ)->scheduler->no
+
+#define LTTNG_ENABLED(Name) \
+    tracepoint_enabled(com_ericsson_otp, Name)
+
+/* include a special LTTNG_DO for do_tracepoint ? */
+#define LTTNG1(Name, Arg1) \
+    tracepoint(com_ericsson_otp, Name, (Arg1))
+
+#define LTTNG2(Name, Arg1, Arg2) \
+    tracepoint(com_ericsson_otp, Name, (Arg1), (Arg2))
+
+#define LTTNG3(Name, Arg1, Arg2, Arg3) \
+    tracepoint(com_ericsson_otp, Name, (Arg1), (Arg2), (Arg3))
+
+#define LTTNG4(Name, Arg1, Arg2, Arg3, Arg4) \
+    tracepoint(com_ericsson_otp, Name, (Arg1), (Arg2), (Arg3), (Arg4))
+
+#define LTTNG5(Name, Arg1, Arg2, Arg3, Arg4, Arg5) \
+    tracepoint(com_ericsson_otp, Name, (Arg1), (Arg2), (Arg3), (Arg4), (Arg5))
+
+#else /* USE_LTTNG */
+
+#define LTTNG1(Name, Arg1) do {} while(0)
+#define LTTNG2(Name, Arg1, Arg2) do {} while(0)
+#define LTTNG3(Name, Arg1, Arg2, Arg3) do {} while(0)
+#define LTTNG4(Name, Arg1, Arg2, Arg3, Arg4) do {} while(0)
+#define LTTNG5(Name, Arg1, Arg2, Arg3, Arg4, Arg5) do {} while(0)
+
+#endif /* USE_LTTNG */
+#endif /* __LTTNG_WRAPPER_H__ */
diff --git a/erts/emulator/beam/module.c b/erts/emulator/beam/module.c
index 86dd3b5aac..f5c7b177d3 100644
--- a/erts/emulator/beam/module.c
+++ b/erts/emulator/beam/module.c
@@ -74,8 +74,8 @@ static Module* module_alloc(Module* tmpl)
     erts_smp_atomic_add_nob(&tot_module_bytes, sizeof(Module));
 
     obj->module = tmpl->module;
-    obj->curr.code = 0;
-    obj->old.code = 0;
+    obj->curr.code_hdr = 0;
+    obj->old.code_hdr = 0;
     obj->curr.code_length = 0;
     obj->old.code_length = 0;
     obj->slot.index = -1;
@@ -103,6 +103,9 @@ void init_module_table(void)
     f.cmp  = (HCMP_FUN) module_cmp;
     f.alloc = (HALLOC_FUN) module_alloc;
     f.free = (HFREE_FUN) module_free;
+    f.meta_alloc = (HMALLOC_FUN) erts_alloc;
+    f.meta_free = (HMFREE_FUN) erts_free;
+    f.meta_print = (HMPRINT_FUN) erts_print;
 
     for (i = 0; i < ERTS_NUM_CODE_IX; i++) {
 	erts_index_init(ERTS_ALC_T_MODULE_TABLE, &module_tables[i], "module_code",
diff --git a/erts/emulator/beam/module.h b/erts/emulator/beam/module.h
index c8a6351b04..b7468b0926 100644
--- a/erts/emulator/beam/module.h
+++ b/erts/emulator/beam/module.h
@@ -26,7 +26,7 @@
 #endif
 
 struct erl_module_instance {
-    BeamInstr* code;
+    BeamCodeHeader* code_hdr;
     int code_length;		/* Length of loaded code in bytes. */
     unsigned catches;
     struct erl_module_nif* nif;
@@ -37,6 +37,7 @@ struct erl_module_instance {
 typedef struct erl_module {
     IndexSlot slot;		/* Must be located at top of struct! */
     int module;			/* Atom index for module (not tagged). */
+    int seen;			/* Used by finish_loading() */
 
     struct erl_module_instance curr;
     struct erl_module_instance old; /* protected by "old_code" rwlock */
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index 1d32e72247..96a3a72bb5 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -39,8 +39,8 @@ too_old_compiler | never() =>
 # necessary.) Since the instructions don't work correctly in R12B, simply
 # refuse to load the module.
 
-func_info M=a a==am_module_info A=u==0 | label L | move n r => too_old_compiler
-func_info M=a a==am_module_info A=u==1 | label L | move n r => too_old_compiler
+func_info M=a a==am_module_info A=u==0 | label L | move n x==0 => too_old_compiler
+func_info M=a a==am_module_info A=u==1 | label L | move n x==0 => too_old_compiler
 
 # The undocumented and unsupported guard BIF is_constant/1 was removed
 # in R13. The is_constant/2 operation is marked as obsolete in genop.tab,
@@ -76,17 +76,6 @@ return
 # with the following call instruction, we need to make sure that
 # there is no line/1 instruction between the move and the call.
 #
-
-move S r | line Loc | call_ext Ar Func => \
-     line Loc | move S r | call_ext Ar Func
-move S r | line Loc | call_ext_last Ar Func=u$is_bif D => \
-     line Loc | move S r | call_ext_last Ar Func D
-move S r | line Loc | call_ext_only Ar Func=u$is_bif => \
-     line Loc | move S r | call_ext_only Ar Func
-move S r | line Loc | call Ar Func => \
-     line Loc | move S r | call Ar Func
-
-#
 # A tail-recursive call to an external function (non-BIF) will
 # never be saved on the stack, so there is no reason to keep
 # the line instruction. (The compiler did not remove the line
@@ -94,10 +83,14 @@ move S r | line Loc | call Ar Func => \
 # BIFs and ordinary Erlang functions.)
 #
 
-line Loc | call_ext_last Ar Func=u$is_not_bif D => \
-     call_ext_last Ar Func D
-line Loc | call_ext_only Ar Func=u$is_not_bif => \
-     call_ext_only Ar Func
+move S X0=x==0 | line Loc | call_ext Ar Func => \
+     line Loc | move S X0 | call_ext Ar Func
+move S X0=x==0 | line Loc | call_ext_last Ar Func=u$is_not_bif D => \
+     move S X0 | call_ext_last Ar Func D
+move S X0=x==0 | line Loc | call_ext_only Ar Func=u$is_not_bif => \
+     move S X0 | call_ext_only Ar Func
+move S X0=x==0 | line Loc | call Ar Func => \
+     line Loc | move S X0 | call Ar Func
 
 line Loc | func_info M F A => func_info M F A | line Loc
 
@@ -167,66 +160,45 @@ is_tuple Fail=f S | select_tuple_arity S=d Fail=f Size=u Rest=* => \
 select_tuple_arity S=d Fail=f Size=u Rest=* => \
   gen_select_tuple_arity(S, Fail, Size, Rest)
 
-i_select_val_bins r f I
 i_select_val_bins x f I
 i_select_val_bins y f I
 
-i_select_val_lins r f I
 i_select_val_lins x f I
 i_select_val_lins y f I
 
-i_select_val2 r f c c f f
 i_select_val2 x f c c f f
 i_select_val2 y f c c f f
 
-i_select_tuple_arity r f I
 i_select_tuple_arity x f I
 i_select_tuple_arity y f I
 
-i_select_tuple_arity2 r f A A f f
 i_select_tuple_arity2 x f A A f f
 i_select_tuple_arity2 y f A A f f
 
-i_jump_on_val_zero r f I
 i_jump_on_val_zero x f I
 i_jump_on_val_zero y f I
 
-i_jump_on_val r f I I
 i_jump_on_val x f I I
 i_jump_on_val y f I I
 
-jump Target | label Lbl | same_label(Target, Lbl) => label Lbl
-
-is_ne_exact L1 S1 S2 | jump Fail | label L2 | same_label(L1, L2) => \
-  is_eq_exact Fail S1 S2 | label L2
-
 %macro: get_list GetList -pack
 get_list x x x
 get_list x x y
-get_list x x r
 get_list x y x
 get_list x y y
-get_list x y r
-get_list x r x
-get_list x r y
 
 get_list y x x
 get_list y x y
-get_list y x r
 get_list y y x
 get_list y y y
-get_list y y r
-get_list y r x
-get_list y r y
 
+# The following get_list instructions using x(0) are frequently used.
 get_list r x x
+get_list r r y
+get_list x r x
 get_list r x y
-get_list r x r
-get_list r y x
-get_list r y y
 get_list r y r
-get_list r r x
-get_list r r y
+get_list r x r
 
 # Old-style catch.
 catch y f
@@ -237,33 +209,31 @@ try Y F => catch Y F
 try_case Y => try_end Y
 try_end y
 
-try_case_end Literal=q => move Literal x | try_case_end x
 try_case_end s
 
 # Destructive set tuple element
 
-set_tuple_element Lit=q Tuple Pos => move Lit x | set_tuple_element x Tuple Pos
 set_tuple_element s d P
 
 # Get tuple element
 
 %macro: i_get_tuple_element GetTupleElement -pack
 i_get_tuple_element x P x
-i_get_tuple_element r P x
 i_get_tuple_element y P x
-i_get_tuple_element x P r
-i_get_tuple_element y P r
 
 %cold
-i_get_tuple_element r P r
 i_get_tuple_element x P y
-i_get_tuple_element r P y
 i_get_tuple_element y P y
 %hot
 
+%macro: i_get_tuple_element2 GetTupleElement2 -pack
+i_get_tuple_element2 x P x
+
+%macro: i_get_tuple_element3 GetTupleElement3 -pack
+i_get_tuple_element3 x P x
+
 %macro: is_number IsNumber -fail_action
 %cold
-is_number f r
 is_number f x
 is_number f y
 %hot
@@ -273,25 +243,28 @@ is_number Fail Literal=q => move Literal x | is_number Fail x
 
 jump f
 
-case_end Literal=cq => move Literal x | case_end x
-badmatch Literal=cq => move Literal x | badmatch x
+case_end NotInX=cy => move NotInX x | case_end x
+badmatch NotInX=cy => move NotInX x | badmatch x
 
-case_end r
 case_end x
-case_end y
 
-badmatch r
 badmatch x
-badmatch y
 
 if_end
-raise s s
+
+# Operands for raise/2 are almost always in x(2) and x(1).
+# Optimize for that case.
+raise x==2 x==1 => i_raise
+raise Trace=y Value=y => move Trace x=2 | move Value x=1 | i_raise
+raise Trace Value => move Trace x=3 | move Value x=1 | move x=3 x=2 | i_raise
+
+i_raise
 
 # Internal now, but could be useful to make known to the compiler.
 badarg j
 system_limit j
 
-move C=cxy r | jump Lbl => move_jump Lbl C
+move C=cxy x==0 | jump Lbl => move_jump Lbl C
 
 %macro: move_jump MoveJump -nonext
 move_jump f n
@@ -309,8 +282,6 @@ move_window/6
 
 # x -> y
 
-move S1=r S2=y | move X1=x Y1=y => move2 S1 S2 X1 Y1
-
 move X1=x Y1=y | move X2=x Y2=y | move X3=x Y3=y | succ(Y1,Y2) | succ(Y2,Y3) => \
     move_window X1 X2 X3 Y1 Y3
 
@@ -323,24 +294,76 @@ move_window X1=x X2=x X3=x X4=x Y1=y Y4=y | move X5=x Y5=y | succ(Y4,Y5) => \
 move_window X1=x X2=x X3=x Y1=y Y3=y => move_window3 X1 X2 X3 Y1
 move_window X1=x X2=x X3=x X4=x Y1=y Y4=y => move_window4 X1 X2 X3 X4 Y1
 
+%macro: move_window3 MoveWindow3 -pack
+%macro: move_window4 MoveWindow4 -pack
+%macro: move_window5 MoveWindow5 -pack
+
 move_window3 x x x y
 move_window4 x x x x y
 move_window5 x x x x x y
 
-move X1=x Y1=y | move X2=x Y2=y => move2 X1 Y1 X2 Y2
-move Y1=y X1=x | move Y2=y X2=x => move2 Y1 X1 Y2 X2
-move X1=x X2=x | move X3=x X4=x => move2 X1 X2 X3 X4
+# Swap registers.
+move R1=x Tmp=x | move R2=xy R1 | move Tmp R2 => swap_temp R1 R2 Tmp
+
+swap_temp R1 R2 Tmp | line Loc | apply Live | is_killed_apply(Tmp, Live) => \
+  swap R1 R2 | line Loc | apply Live
+
+swap_temp R1 R2 Tmp | line Loc | call Live Addr | is_killed(Tmp, Live) => \
+  swap R1 R2 | line Loc | call Live Addr
+swap_temp R1 R2 Tmp | call_only Live Addr | \
+  is_killed(Tmp, Live) => swap R1 R2 | call_only Live Addr
+swap_temp R1 R2 Tmp | call_last Live Addr D | \
+  is_killed(Tmp, Live) => swap R1 R2 | call_last Live Addr D
+
+swap_temp R1 R2 Tmp | line Loc | call_ext Live Addr | is_killed(Tmp, Live) => \
+  swap R1 R2 | line Loc | call_ext Live Addr
+swap_temp R1 R2 Tmp | line Loc | call_ext_only Live Addr | \
+  is_killed(Tmp, Live) => swap R1 R2 | line Loc | call_ext_only Live Addr
+swap_temp R1 R2 Tmp | line Loc | call_ext_last Live Addr D | \
+  is_killed(Tmp, Live) => swap R1 R2 | line Loc | call_ext_last Live Addr D
+
+%macro: swap_temp SwapTemp -pack
+swap_temp x x x
+swap_temp x y x
+
+%macro: swap Swap -pack
+swap x x
+swap x y
+
+move Src=x D1=x | move Src=x D2=x => move_dup Src D1 D2
+move Src=x SD=x | move SD=x D=x   => move_dup Src SD D
+move Src=x D1=x | move Src=x D2=y => move_dup Src D1 D2
+move Src=y SD=x | move SD=x D=y   => move_dup Src SD D
+move Src=x SD=x | move SD=x D=y   => move_dup Src SD D
+move Src=y SD=x | move SD=x D=x   => move_dup Src SD D
 
-move S1=x S2=r | move S3=x S4=x => move2 S1 S2 S3 S4
-move S1=x S2=r | move X1=x Y1=y => move2 S1 S2 X1 Y1
-move S1=y S2=r | move X1=x Y1=y => move2 S1 S2 X1 Y1
+move SD=x D=x | move Src=xy SD=x => move_shift Src SD D
+move SD=y D=x | move Src=x  SD=y => move_shift Src SD D
+move SD=x D=y | move Src=x  SD=x => move_shift Src SD D
 
-move Y1=y X1=x | move S1=r D1=x => move2 Y1 X1 S1 D1
-move S1=r D1=x | move Y1=y X1=x => move2 S1 D1 Y1 X1
+# The transformations above guarantee that the source for
+# the second move is not the same as the destination for
+# the first move. That means that we can do the moves in
+# parallel (fetch both values, then store them) which could
+# be faster.
 
-move2 X1=x Y1=y X2=x Y2=y | move X3=x Y3=y => move3 X1 Y1 X2 Y2 X3 Y3
-move2 Y1=y X1=x Y2=y X2=x | move Y3=y X3=x => move3 Y1 X1 Y2 X2 Y3 X3
-move2 X1=x X2=x X3=x X4=x | move X5=x X6=x => move3 X1 X2 X3 X4 X5 X6
+move X1=x Y1=y | move X2=x Y2=y => move2_par X1 Y1 X2 Y2
+move Y1=y X1=x | move Y2=y X2=x => move2_par Y1 X1 Y2 X2
+
+move X1=x X2=x | move X3=x X4=x => move2_par X1 X2 X3 X4
+
+move X1=x X2=x | move X3=x Y1=y => move2_par X1 X2 X3 Y1
+
+move S1=x S2=x | move X1=x Y1=y => move2_par S1 S2 X1 Y1
+
+move S1=y S2=x | move X1=x Y1=y => move2_par S1 S2 X1 Y1
+
+move Y1=y X1=x | move S1=x D1=x => move2_par Y1 X1 S1 D1
+move S1=x D1=x | move Y1=y X1=x => move2_par S1 D1 Y1 X1
+
+move2_par X1=x Y1=y X2=x Y2=y | move X3=x Y3=y => move3 X1 Y1 X2 Y2 X3 Y3
+move2_par Y1=y X1=x Y2=y X2=x | move Y3=y X3=x => move3 Y1 X1 Y2 X2 Y3 X3
+move2_par X1=x X2=x X3=x X4=x | move X5=x X6=x => move3 X1 X2 X3 X4 X5 X6
 
 move C=aiq X=x==1 => move_x1 C
 move C=aiq X=x==2 => move_x2 C
@@ -348,21 +371,32 @@ move C=aiq X=x==2 => move_x2 C
 move_x1 c
 move_x2 c
 
-%macro: move2 Move2 -pack
-move2 x y x y
-move2 y x y x
-move2 x x x x
+%macro: move_shift MoveShift -pack
+move_shift x x x
+move_shift y x x
+move_shift x y x
+move_shift x x y
+
+%macro: move_dup MoveDup -pack
+move_dup x x x
+move_dup x x y
+move_dup y x x
+move_dup y x y
 
-move2 x r x x
+%macro: move2_par Move2Par -pack
 
-move2 x r x y
-move2 r y x y
-move2 y r x y
+move2_par x y x y
+move2_par y x y x
+move2_par x x x x
 
-move2 r x y x
-move2 y x r x
+move2_par x x x y
 
-%macro: move3 Move3
+move2_par y x x y
+
+move2_par x x y x
+move2_par y x x x
+
+%macro: move3 Move3 -pack
 move3 x y x y x y
 move3 y x y x y x
 move3 x x x x x x
@@ -375,20 +409,22 @@ move S=c D=y => move S x | move x D
 %macro:move Move -pack -gen_dest
 move x x
 move x y
-move x r
 move y x
-move y r
-move r x
-move r y
-move c r
 move c x
 move n x
-move n r
 move y y
 
+# The following move instructions using x(0) are frequently used.
+
+move x r
+move r x
+move y r
+move c r
+move r y
+
 # Receive operations.
 
-loop_rec Fail Src | smp_mark_target_label(Fail) => i_loop_rec Fail Src
+loop_rec Fail x==0 | smp_mark_target_label(Fail) => i_loop_rec Fail
 
 label L | wait_timeout Fail Src | smp_already_locked(L) => label L | i_wait_timeout_locked Fail Src
 wait_timeout Fail Src => i_wait_timeout Fail Src
@@ -403,7 +439,7 @@ label L | timeout | smp_already_locked(L) => label L | timeout_locked
 remove_message
 timeout
 timeout_locked
-i_loop_rec f r
+i_loop_rec f
 loop_rec_end f
 wait f
 wait_locked f
@@ -421,93 +457,57 @@ send
 # Optimized comparisons with one immediate/literal operand.
 #
 
-is_eq_exact Lbl R=rxy C=ian => i_is_eq_exact_immed Lbl R C
-is_eq_exact Lbl R=rxy C=q => i_is_eq_exact_literal R Lbl C
+is_eq_exact Lbl R=xy C=ian => i_is_eq_exact_immed Lbl R C
+is_eq_exact Lbl R=xy C=q => i_is_eq_exact_literal Lbl R C
 
-is_ne_exact Lbl R=rxy C=ian => i_is_ne_exact_immed Lbl R C
-is_ne_exact Lbl R=rxy C=q => i_is_ne_exact_literal R Lbl C
+is_ne_exact Lbl R=xy C=ian => i_is_ne_exact_immed Lbl R C
+is_ne_exact Lbl R=xy C=q => i_is_ne_exact_literal Lbl R C
 
 %macro: i_is_eq_exact_immed EqualImmed -fail_action
 i_is_eq_exact_immed f r c
 i_is_eq_exact_immed f x c
 i_is_eq_exact_immed f y c
 
-i_is_eq_exact_literal r f c
-i_is_eq_exact_literal x f c
-i_is_eq_exact_literal y f c
+i_is_eq_exact_literal f x c
+i_is_eq_exact_literal f y c
 
 %macro: i_is_ne_exact_immed NotEqualImmed -fail_action
-i_is_ne_exact_immed f r c
 i_is_ne_exact_immed f x c
 i_is_ne_exact_immed f y c
 
-i_is_ne_exact_literal r f c
-i_is_ne_exact_literal x f c
-i_is_ne_exact_literal y f c
-
-#
-# Common Compare Specializations
-# We don't do all of them since we want
-# to keep the instruction set small-ish
-#
+i_is_ne_exact_literal f x c
+i_is_ne_exact_literal f y c
 
-is_eq_exact Lbl S1=xy S2=r => is_eq_exact Lbl S2 S1
-is_eq_exact Lbl S1=rx S2=xy => i_is_eq_exact_spec Lbl S1 S2
-%macro: i_is_eq_exact_spec EqualExact -fail_action
+is_eq_exact Lbl Y=y X=x => is_eq_exact Lbl X Y
+%macro: is_eq_exact EqualExact -fail_action -pack
+is_eq_exact f x x
+is_eq_exact f x y
+is_eq_exact f s s
 
-i_is_eq_exact_spec f x x
-i_is_eq_exact_spec f x y
-i_is_eq_exact_spec f r x
-i_is_eq_exact_spec f r y
+%macro: is_lt IsLessThan -fail_action
+is_lt f x x
+is_lt f x c
+is_lt f c x
 %cold
-i_is_eq_exact_spec f r r
+is_lt f s s
 %hot
 
-is_lt Lbl S1=rxc S2=rxc  => i_is_lt_spec Lbl S1 S2
-
-%macro: i_is_lt_spec IsLessThan -fail_action
-
-i_is_lt_spec f x x
-i_is_lt_spec f x r
-i_is_lt_spec f x c
-i_is_lt_spec f r x
-i_is_lt_spec f r c
-i_is_lt_spec f c x
-i_is_lt_spec f c r
+%macro: is_ge IsGreaterEqual -fail_action
+is_ge f x x
+is_ge f x c
+is_ge f c x
 %cold
-i_is_lt_spec f r r
-i_is_lt_spec f c c
+is_ge f s s
 %hot
 
-is_ge Lbl S1=xc S2=xc => i_is_ge_spec Lbl S1 S2
+%macro: is_ne_exact NotEqualExact -fail_action
+is_ne_exact f s s
 
-%macro: i_is_ge_spec IsGreaterEqual -fail_action
+%macro: is_eq Equal -fail_action
+is_eq f s s
 
-i_is_ge_spec f x x
-i_is_ge_spec f x c
-i_is_ge_spec f c x
-%cold
-i_is_ge_spec f c c
-%hot
-
-#
-# All other comparisons.
-#
-
-is_eq_exact Lbl S1 S2 => i_fetch S1 S2 | i_is_eq_exact Lbl
-is_ne_exact Lbl S1 S2 => i_fetch S1 S2 | i_is_ne_exact Lbl
-
-is_lt Lbl S1 S2 => i_fetch S1 S2 | i_is_lt Lbl
-is_ge Lbl S1 S2 => i_fetch S1 S2 | i_is_ge Lbl
-is_eq Lbl S1 S2 => i_fetch S1 S2 | i_is_eq Lbl
-is_ne Lbl S1 S2 => i_fetch S1 S2 | i_is_ne Lbl
-
-i_is_eq_exact f
-i_is_ne_exact f
-i_is_lt f
-i_is_ge f
-i_is_eq f
-i_is_ne f
+%macro: is_ne NotEqual -fail_action
+is_ne f s s
 
 #
 # Putting things.
@@ -525,7 +525,6 @@ i_put_tuple Dst Arity Puts=* | put S => \
 i_put_tuple/2
 
 %macro:i_put_tuple PutTuple -pack -goto:do_put_tuple
-i_put_tuple r I
 i_put_tuple x I
 i_put_tuple y I
 
@@ -542,74 +541,36 @@ put_list x n x
 put_list y n x
 put_list x x x
 put_list y x x
-put_list x x r
-put_list y r r
 
 put_list y y x
 put_list x y x
-put_list r x x
-put_list r y x
-put_list r x r
-put_list y y r
-put_list y r x
-put_list r n x
 
-put_list x r x
-put_list x y r
-put_list y x r
 put_list y x x
 
-put_list x r r
-
 # put_list SrcReg Constant Dst
-put_list r c r
-put_list r c x
-put_list r c y
 
-put_list x c r
 put_list x c x
 put_list x c y
 
-put_list y c r
 put_list y c x
-put_list y c y
 
 # put_list Constant SrcReg Dst
-put_list c r r
-put_list c r x
-put_list c r y
 
-put_list c x r
 put_list c x x
-put_list c x y
-
-put_list c y r
 put_list c y x
-put_list c y y
 
-%cold
-put_list s s d
-%hot
+# The following put_list instructions using x(0) are frequently used.
 
-%macro: i_fetch FetchArgs -pack
-i_fetch c r
-i_fetch c x
-i_fetch c y
-i_fetch r c
-i_fetch r x
-i_fetch r y
-i_fetch x c
-i_fetch x r
-i_fetch x x
-i_fetch x y
-i_fetch y c
-i_fetch y r
-i_fetch y x
-i_fetch y y
+put_list y r r
+put_list x r r
+put_list r n r
+put_list r n x
+put_list r x x
+put_list r x r
+put_list x x r
 
 %cold
-i_fetch c c
-i_fetch s s
+put_list s s d
 %hot
 
 #
@@ -631,27 +592,27 @@ return_trace
 # Note: There is no 'move_return y r', since there never are any y registers
 # when we do move_return (if we have y registers, we must do move_deallocate_return).
 
-move S r | return => move_return S r
+move S x==0 | return => move_return S
 
 %macro: move_return MoveReturn -nonext
-move_return x r
-move_return c r
-move_return n r
+move_return x
+move_return c
+move_return n
 
-move S r | deallocate D | return => move_deallocate_return S r D
+move S x==0 | deallocate D | return => move_deallocate_return S D
 
 %macro: move_deallocate_return MoveDeallocateReturn -pack -nonext
-move_deallocate_return x r Q
-move_deallocate_return y r Q
-move_deallocate_return c r Q
-move_deallocate_return n r Q
+move_deallocate_return x Q
+move_deallocate_return y Q
+move_deallocate_return c Q
+move_deallocate_return n Q
 
 deallocate D | return => deallocate_return D
 
 %macro: deallocate_return DeallocateReturn -nonext
 deallocate_return Q
 
-test_heap Need u==1 | put_list Y=y r r => test_heap_1_put_list Need Y
+test_heap Need u==1 | put_list Y=y x==0 x==0 => test_heap_1_put_list Need Y
 
 %macro: test_heap_1_put_list TestHeapPutList -pack
 test_heap_1_put_list I y
@@ -660,18 +621,18 @@ test_heap_1_put_list I y
 
 is_tuple Fail Literal=q => move Literal x | is_tuple Fail x
 is_tuple Fail=f c => jump Fail
-is_tuple Fail=f S=rxy | test_arity Fail=f S=rxy Arity => is_tuple_of_arity Fail S Arity
+is_tuple Fail=f S=xy | test_arity Fail=f S=xy Arity => is_tuple_of_arity Fail S Arity
 
 %macro:is_tuple_of_arity IsTupleOfArity -fail_action
 
+is_tuple_of_arity f r A
 is_tuple_of_arity f x A
 is_tuple_of_arity f y A
-is_tuple_of_arity f r A
 
 %macro: is_tuple IsTuple -fail_action
+is_tuple f r
 is_tuple f x
 is_tuple f y
-is_tuple f r
 
 test_arity Fail Literal=q Arity => move Literal x | test_arity Fail x Arity
 test_arity Fail=f c Arity => jump Fail
@@ -679,95 +640,63 @@ test_arity Fail=f c Arity => jump Fail
 %macro: test_arity IsArity -fail_action
 test_arity f x A
 test_arity f y A
-test_arity f r A
-
-is_tuple_of_arity Fail=f Reg Arity | get_tuple_element Reg P=u==0 Dst=xy => \
-  is_tuple_of_arity Fail Reg Arity | extract_next_element Dst | original_reg Reg P
-
-test_arity Fail Reg Arity | get_tuple_element Reg P=u==0 Dst=xy => \
-  test_arity Fail Reg Arity | extract_next_element Dst | original_reg Reg P
-
-original_reg Reg P1 | get_tuple_element Reg P2 Dst=xy | succ(P1, P2) => \
-  extract_next_element Dst | original_reg Reg P2
-
-get_tuple_element Reg P Dst => i_get_tuple_element Reg P Dst | original_reg Reg P
 
-original_reg Reg Pos =>
+get_tuple_element Reg=x P1 D1=x | get_tuple_element Reg=x P2 D2=x | \
+   get_tuple_element Reg=x P3 D3=x | \
+   succ(P1, P2) | succ(P2, P3) | \
+   succ(D1, D2) | succ(D2, D3) => i_get_tuple_element3 Reg P1 D1
 
-original_reg/2
+get_tuple_element Reg=x P1 D1=x | get_tuple_element Reg=x P2 D2=x | \
+   succ(P1, P2) | succ(D1, D2) => i_get_tuple_element2 Reg P1 D1
 
-extract_next_element D1=xy | original_reg Reg P1 | get_tuple_element Reg P2 D2=xy | \
-succ(P1, P2) | succ(D1, D2) => \
-  extract_next_element2 D1 | original_reg Reg P2
-
-extract_next_element2 D1=xy | original_reg Reg P1 | get_tuple_element Reg P2 D2=xy | \
-succ(P1, P2) | succ2(D1, D2) => \
-  extract_next_element3 D1 | original_reg Reg P2
-
-#extract_next_element3 D1=xy | original_reg Reg P1 | get_tuple_element Reg P2 D2=xy | \
-#succ(P1, P2) | succ3(D1, D2) => \
-#  extract_next_element4 D1 | original_reg Reg P2
-
-%macro: extract_next_element ExtractNextElement -pack
-extract_next_element x
-extract_next_element y
-
-%macro: extract_next_element2 ExtractNextElement2 -pack
-extract_next_element2 x
-extract_next_element2 y
-
-%macro: extract_next_element3 ExtractNextElement3 -pack
-extract_next_element3 x
-extract_next_element3 y
-
-#%macro: extract_next_element4 ExtractNextElement4 -pack
-#extract_next_element4 x
-#extract_next_element4 y
+get_tuple_element Reg P Dst => i_get_tuple_element Reg P Dst
 
 is_integer Fail=f i =>
 is_integer Fail=f an => jump Fail
 is_integer Fail Literal=q => move Literal x | is_integer Fail x
 
-is_integer Fail=f S=rx | allocate Need Regs => is_integer_allocate Fail S Need Regs
+is_integer Fail=f S=x | allocate Need Regs => is_integer_allocate Fail S Need Regs
 
 %macro: is_integer_allocate IsIntegerAllocate -fail_action
 is_integer_allocate f x I I
-is_integer_allocate f r I I
 
 %macro: is_integer IsInteger -fail_action
 is_integer f x
 is_integer f y
-is_integer f r
 
 is_list Fail=f n =>
 is_list Fail Literal=q => move Literal x | is_list Fail x
 is_list Fail=f c => jump Fail
 %macro: is_list IsList -fail_action
-is_list f r
 is_list f x
 %cold
 is_list f y
 %hot
 
-is_nonempty_list Fail=f S=rx | allocate Need Rs => is_nonempty_list_allocate Fail S Need Rs
+is_nonempty_list Fail=f S=x | allocate Need Rs => is_nonempty_list_allocate Fail S Need Rs
 
 %macro:is_nonempty_list_allocate IsNonemptyListAllocate -fail_action -pack
-is_nonempty_list_allocate f x I t
 is_nonempty_list_allocate f r I t
+is_nonempty_list_allocate f x I t
 
-is_nonempty_list F=f r | test_heap I1 I2 => is_non_empty_list_test_heap F r I1 I2
+is_nonempty_list F=f x==0 | test_heap I1 I2 => is_non_empty_list_test_heap F I1 I2
 
 %macro: is_non_empty_list_test_heap IsNonemptyListTestHeap -fail_action -pack
-is_non_empty_list_test_heap f r I t
+is_non_empty_list_test_heap f I t
+
+is_nonempty_list Fail=f S=x | get_list S D1=x D2=x => \
+  is_nonempty_list_get_list Fail S D1 D2
+
+%macro: is_nonempty_list_get_list IsNonemptyListGetList -fail_action -pack
+is_nonempty_list_get_list f r x x
+is_nonempty_list_get_list f x x x
 
 %macro: is_nonempty_list IsNonemptyList -fail_action
 is_nonempty_list f x
 is_nonempty_list f y
-is_nonempty_list f r
 
 %macro: is_atom IsAtom -fail_action
 is_atom f x
-is_atom f r
 %cold
 is_atom f y
 %hot
@@ -775,7 +704,6 @@ is_atom Fail=f a =>
 is_atom Fail=f niq => jump Fail
 
 %macro: is_float IsFloat -fail_action
-is_float f r
 is_float f x
 %cold
 is_float f y
@@ -789,12 +717,10 @@ is_nil Fail=f qia => jump Fail
 %macro: is_nil IsNil -fail_action
 is_nil f x
 is_nil f y
-is_nil f r
 
 is_binary Fail Literal=q => move Literal x | is_binary Fail x
 is_binary Fail=f c => jump Fail
 %macro: is_binary IsBinary -fail_action
-is_binary f r
 is_binary f x
 %cold
 is_binary f y
@@ -806,7 +732,6 @@ is_bitstr Fail Term => is_bitstring Fail Term
 is_bitstring Fail Literal=q => move Literal x | is_bitstring Fail x
 is_bitstring Fail=f c => jump Fail
 %macro: is_bitstring IsBitstring -fail_action
-is_bitstring f r
 is_bitstring f x
 %cold
 is_bitstring f y
@@ -814,7 +739,6 @@ is_bitstring f y
 
 is_reference Fail=f cq => jump Fail
 %macro: is_reference IsRef -fail_action
-is_reference f r
 is_reference f x
 %cold
 is_reference f y
@@ -822,7 +746,6 @@ is_reference f y
 
 is_pid Fail=f cq => jump Fail
 %macro: is_pid IsPid -fail_action
-is_pid f r
 is_pid f x
 %cold
 is_pid f y
@@ -830,7 +753,6 @@ is_pid f y
 
 is_port Fail=f cq => jump Fail
 %macro: is_port IsPort -fail_action
-is_port f r
 is_port f x
 %cold
 is_port f y
@@ -842,14 +764,12 @@ is_boolean Fail=f ac => jump Fail
 
 %cold
 %macro: is_boolean IsBoolean -fail_action
-is_boolean f r
 is_boolean f x
 is_boolean f y
 %hot
 
 is_function2 Fail=f acq Arity => jump Fail
 is_function2 Fail=f Fun a => jump Fail
-is_function2 Fail Fun Literal=q => move Literal x | is_function2 Fail Fun x
 
 is_function2 f s s
 %macro: is_function2 IsFunction2 -fail_action
@@ -989,76 +909,76 @@ call_ext_only u==3 u$func:erlang:hibernate/3 => i_hibernate
 %unless USE_VM_PROBES
 
 call_ext Arity u$func:erlang:dt_get_tag/0 => \
-    move a=am_undefined r
+    move a=am_undefined x=0
 call_ext_last Arity u$func:erlang:dt_get_tag/0 D => \
-    move a=am_undefined r | deallocate D | return
+    move a=am_undefined x=0 | deallocate D | return
 call_ext_only Arity u$func:erlang:dt_get_tag/0 => \
-    move a=am_undefined r | return
-
-move Any r | call_ext Arity u$func:erlang:dt_put_tag/1 => \
-    move a=am_undefined r
-move Any r | call_ext_last Arity u$func:erlang:dt_put_tag/1 D => \
-    move a=am_undefined r | deallocate D | return
-move Any r | call_ext_only Arity u$func:erlang:dt_put_tag/1 => \
-    move a=am_undefined r | return
+    move a=am_undefined x=0 | return
+
+move Any x==0 | call_ext Arity u$func:erlang:dt_put_tag/1 => \
+    move a=am_undefined x=0
+move Any x==0 | call_ext_last Arity u$func:erlang:dt_put_tag/1 D => \
+    move a=am_undefined x=0 | deallocate D | return
+move Any x==0 | call_ext_only Arity u$func:erlang:dt_put_tag/1 => \
+    move a=am_undefined x=0 | return
 call_ext Arity u$func:erlang:dt_put_tag/1 => \
-    move a=am_undefined r
+    move a=am_undefined x=0
 call_ext_last Arity u$func:erlang:dt_put_tag/1 D => \
-    move a=am_undefined r | deallocate D | return
+    move a=am_undefined x=0 | deallocate D | return
 call_ext_only Arity u$func:erlang:dt_put_tag/1 => \
-    move a=am_undefined r | return
+    move a=am_undefined x=0 | return
 
 call_ext Arity u$func:erlang:dt_get_tag_data/0 => \
-    move a=am_undefined r
+    move a=am_undefined x=0
 call_ext_last Arity u$func:erlang:dt_get_tag_data/0 D => \
-    move a=am_undefined r | deallocate D | return
+    move a=am_undefined x=0 | deallocate D | return
 call_ext_only Arity u$func:erlang:dt_get_tag_data/0 => \
-    move a=am_undefined r | return
-
-move Any r | call_ext Arity u$func:erlang:dt_spread_tag/1 => \
-    move a=am_true r
-move Any r | call_ext_last Arity u$func:erlang:dt_spread_tag/1 D => \
-    move a=am_true r | deallocate D | return
-move Any r | call_ext_only Arity u$func:erlang:dt_spread_tag/1 => \
-    move a=am_true r | return
+    move a=am_undefined x=0 | return
+
+move Any x==0 | call_ext Arity u$func:erlang:dt_spread_tag/1 => \
+    move a=am_true x=0
+move Any x==0 | call_ext_last Arity u$func:erlang:dt_spread_tag/1 D => \
+    move a=am_true x=0 | deallocate D | return
+move Any x==0 | call_ext_only Arity u$func:erlang:dt_spread_tag/1 => \
+    move a=am_true x=0 | return
 call_ext Arity u$func:erlang:dt_spread_tag/1 => \
-    move a=am_true r
+    move a=am_true x=0
 call_ext_last Arity u$func:erlang:dt_spread_tag/1 D => \
-    move a=am_true r | deallocate D | return
+    move a=am_true x=0 | deallocate D | return
 call_ext_only Arity u$func:erlang:dt_spread_tag/1 => \
-    move a=am_true r | return
-
-move Any r | call_ext Arity u$func:erlang:dt_restore_tag/1 => \
-    move a=am_true r
-move Any r | call_ext_last Arity u$func:erlang:dt_restore_tag/1 D => \
-    move a=am_true r | deallocate D | return
-move Any r | call_ext_only Arity u$func:erlang:dt_restore_tag/1 => \
-    move a=am_true r | return
+    move a=am_true x=0 | return
+
+move Any x==0 | call_ext Arity u$func:erlang:dt_restore_tag/1 => \
+    move a=am_true x=0
+move Any x==0 | call_ext_last Arity u$func:erlang:dt_restore_tag/1 D => \
+    move a=am_true x=0 | deallocate D | return
+move Any x==0 | call_ext_only Arity u$func:erlang:dt_restore_tag/1 => \
+    move a=am_true x=0 | return
 call_ext Arity u$func:erlang:dt_restore_tag/1 => \
-    move a=am_true r
+    move a=am_true x=0
 call_ext_last Arity u$func:erlang:dt_restore_tag/1 D => \
-    move a=am_true r | deallocate D | return
+    move a=am_true x=0 | deallocate D | return
 call_ext_only Arity u$func:erlang:dt_restore_tag/1 => \
-    move a=am_true r | return
-
-move Any r | call_ext Arity u$func:erlang:dt_prepend_vm_tag_data/1 => \
-    move Any r
-move Any r | call_ext_last Arity u$func:erlang:dt_prepend_vm_tag_data/1 D => \
-    move Any r | deallocate D | return
-move Any r | call_ext_only Arity u$func:erlang:dt_prepend_vm_tag_data/1 => \
-    move Any r | return
+    move a=am_true x=0 | return
+
+move Any x==0 | call_ext Arity u$func:erlang:dt_prepend_vm_tag_data/1 => \
+    move Any x=0
+move Any x==0 | call_ext_last Arity u$func:erlang:dt_prepend_vm_tag_data/1 D => \
+    move Any x=0 | deallocate D | return
+move Any x==0 | call_ext_only Arity u$func:erlang:dt_prepend_vm_tag_data/1 => \
+    move Any x=0 | return
 call_ext Arity u$func:erlang:dt_prepend_vm_tag_data/1 =>
 call_ext_last Arity u$func:erlang:dt_prepend_vm_tag_data/1 D => \
     deallocate D | return
 call_ext_only Arity u$func:erlang:dt_prepend_vm_tag_data/1 => \
     return
 
-move Any r | call_ext Arity u$func:erlang:dt_append_vm_tag_data/1 => \
-    move Any r
-move Any r | call_ext_last Arity u$func:erlang:dt_append_vm_tag_data/1 D => \
-    move Any r | deallocate D | return
-move Any r | call_ext_only Arity u$func:erlang:dt_append_vm_tag_data/1 => \
-    move Any r | return
+move Any x==0 | call_ext Arity u$func:erlang:dt_append_vm_tag_data/1 => \
+    move Any x=0
+move Any x==0 | call_ext_last Arity u$func:erlang:dt_append_vm_tag_data/1 D => \
+    move Any x=0 | deallocate D | return
+move Any x==0 | call_ext_only Arity u$func:erlang:dt_append_vm_tag_data/1 => \
+    move Any x=0 | return
 call_ext Arity u$func:erlang:dt_append_vm_tag_data/1 =>
 call_ext_last Arity u$func:erlang:dt_append_vm_tag_data/1 D => \
     deallocate D | return
@@ -1066,10 +986,17 @@ call_ext_only Arity u$func:erlang:dt_append_vm_tag_data/1 => \
     return
 
 # Can happen after one of the transformations above.
-move Discarded r | move Something r => move Something r
+move Discarded x==0 | move Something x==0 => move Something x=0
 
 %endif
 
+call_ext u==0 u$func:os:perf_counter/0 => \
+    i_perf_counter
+call_ext_last u==0 u$func:os:perf_counter/0 D => \
+    i_perf_counter | deallocate_return D
+call_ext_only u==0 u$func:os:perf_counter/0 => \
+    i_perf_counter | return
+
 #
 # The general case for BIFs that have no special instructions.
 # A BIF used in the tail must be followed by a return instruction.
@@ -1091,9 +1018,9 @@ call_ext_only Ar=u Bif=u$is_bif => \
 # with call instructions.
 #
 
-move S=c r | call_ext Ar=u Func=u$is_not_bif => i_move_call_ext S r Func
-move S=c r | call_ext_last Ar=u Func=u$is_not_bif D => i_move_call_ext_last Func D S r
-move S=c r | call_ext_only Ar=u Func=u$is_not_bif => i_move_call_ext_only Func S r 
+move S=c x==0 | call_ext Ar=u Func=u$is_not_bif => i_move_call_ext S Func
+move S=c x==0 | call_ext_last Ar=u Func=u$is_not_bif D => i_move_call_ext_last Func D S
+move S=c x==0 | call_ext_only Ar=u Func=u$is_not_bif => i_move_call_ext_only Func S
 
 call_ext Ar Func        => i_call_ext Func
 call_ext_last Ar Func D => i_call_ext_last Func D
@@ -1109,6 +1036,8 @@ i_apply_fun_only
 
 i_hibernate
 
+i_perf_counter
+
 call_bif e
 
 #
@@ -1118,80 +1047,74 @@ call_bif e
 bif0 u$bif:erlang:self/0 Dst=d => self Dst
 bif0 u$bif:erlang:node/0 Dst=d => node Dst
 
-bif1 Fail Bif=u$bif:erlang:get/1 Src=s Dst=d => i_get Src Dst
+bif1 Fail Bif=u$bif:erlang:get/1 Src=s Dst=d => gen_get(Src, Dst)
 
-bif2 Jump=j u$bif:erlang:element/2 S1=s S2=rxy Dst=d => gen_element(Jump, S1, S2, Dst)
+bif2 Jump=j u$bif:erlang:element/2 S1=s S2=xy Dst=d => gen_element(Jump, S1, S2, Dst)
 
-bif1 Fail Bif Literal=q Dst => move Literal x | bif1 Fail Bif x Dst
 bif1 p Bif S1 Dst => bif1_body Bif S1 Dst
 
-bif1_body Bif Literal=q Dst => move Literal x | bif1_body Bif x Dst
-
-bif2 p Bif S1 S2 Dst => i_fetch S1 S2 | i_bif2_body Bif Dst
-bif2 Fail Bif S1 S2 Dst => i_fetch S1 S2 | i_bif2 Fail Bif Dst
+bif2 p Bif S1 S2 Dst => i_bif2_body Bif S1 S2 Dst
+bif2 Fail Bif S1 S2 Dst => i_bif2 Fail Bif S1 S2 Dst
 
+i_get_hash c I d
 i_get s d
 
 %macro: self Self
-self r
 self x
 self y
 
 %macro: node Node
-node r
 node x
 %cold
 node y
 %hot
 
-i_fast_element r j I d
-i_fast_element x j I d
-i_fast_element y j I d
+i_fast_element j x I d
+i_fast_element j y I d
 
-i_element r j s d
-i_element x j s d
-i_element y j s d
+i_element j x s d
+i_element j y s d
 
 bif1 f b s d
 bif1_body b s d
-i_bif2 f b d
-i_bif2_body b d
+i_bif2 f b s s d
+i_bif2_body b s s d
 
 #
 # Internal calls.
 #
 
-move S=c r | call Ar P=f => i_move_call S r P
-move S=s r | call Ar P=f => move_call S r P
+move S=c x==0 | call Ar P=f => i_move_call S P
+move S=s x==0 | call Ar P=f => move_call S P
 
-i_move_call c r f
+i_move_call c f
 
 %macro:move_call MoveCall -arg_f -size -nonext
-move_call/3
+move_call/2
 
-move_call x r f
-move_call y r f
+move_call x f
+move_call y f
 
-move S=c r | call_last Ar P=f D => i_move_call_last P D S r
-move S r | call_last Ar P=f D => move_call_last S r P D
+move S=c x==0 | call_last Ar P=f D => i_move_call_last P D S
+move S x==0 | call_last Ar P=f D => move_call_last S P D
 
-i_move_call_last f P c r
+i_move_call_last f P c
 
 %macro:move_call_last MoveCallLast -arg_f -nonext -pack
 
-move_call_last/4
-move_call_last x r f Q
-move_call_last y r f Q
+move_call_last/3
+move_call_last x f Q
+move_call_last y f Q
 
-move S=c r | call_only Ar P=f => i_move_call_only P S r
-move S=x r | call_only Ar P=f => move_call_only S r P
+move S=c x==0 | call_only Ar P=f => i_move_call_only P S
+move S=x x==0 | call_only Ar P=f => move_call_only S P
 
-i_move_call_only f c r
+i_move_call_only f c
 
 %macro:move_call_only MoveCallOnly -arg_f -nonext
-move_call_only/3
+move_call_only/2
 
-move_call_only x r f
+move_call_only x f
 
 call Ar Func        => i_call Func
 call_last Ar Func D => i_call_last Func D
@@ -1205,9 +1128,9 @@ i_call_ext e
 i_call_ext_last e P
 i_call_ext_only e
 
-i_move_call_ext c r e
-i_move_call_ext_last e P c r
-i_move_call_ext_only e c r
+i_move_call_ext c e
+i_move_call_ext_last e P c
+i_move_call_ext_only e c
 
 # Fun calls.
 
@@ -1227,7 +1150,6 @@ i_make_fun I t
 %macro: is_function IsFunction -fail_action
 is_function f x
 is_function f y
-is_function f r
 is_function Fail=f c => jump Fail
 
 func_info M F A => i_func_info u M F A
@@ -1239,131 +1161,105 @@ func_info M F A => i_func_info u M F A
 %cold
 bs_start_match2 Fail=f ica X Y D => jump Fail
 bs_start_match2 Fail Bin X Y D => i_bs_start_match2 Bin Fail X Y D
-i_bs_start_match2 r f I I d
 i_bs_start_match2 x f I I d
 i_bs_start_match2 y f I I d
 
 bs_save2 Reg Index => gen_bs_save(Reg, Index)
-i_bs_save2 r I
 i_bs_save2 x I
 
 bs_restore2 Reg Index => gen_bs_restore(Reg, Index)
-i_bs_restore2 r I
 i_bs_restore2 x I
 
 # Matching integers
 bs_match_string Fail Ms Bits Val => i_bs_match_string Ms Fail Bits Val
 
-i_bs_match_string r f I I
 i_bs_match_string x f I I
 
 # Fetching integers from binaries.
-bs_get_integer2 Fail=f Ms=rx Live=u Sz=sq Unit=u Flags=u Dst=d => \
+bs_get_integer2 Fail=f Ms=x Live=u Sz=sq Unit=u Flags=u Dst=d => \
 			gen_get_integer2(Fail, Ms, Live, Sz, Unit, Flags, Dst)
 
-i_bs_get_integer_small_imm r I f I d
 i_bs_get_integer_small_imm x I f I d
-i_bs_get_integer_imm r I I f I d
 i_bs_get_integer_imm x I I f I d
-i_bs_get_integer f I I d
-i_bs_get_integer_8 r f d
+i_bs_get_integer f I I s s d
 i_bs_get_integer_8 x f d
-i_bs_get_integer_16 r f d
 i_bs_get_integer_16 x f d
-i_bs_get_integer_32 r f I d
 i_bs_get_integer_32 x f I d
 
 # Fetching binaries from binaries.
-bs_get_binary2 Fail=f Ms=rx Live=u Sz=sq Unit=u Flags=u Dst=d => \
+bs_get_binary2 Fail=f Ms=x Live=u Sz=sq Unit=u Flags=u Dst=d => \
 			gen_get_binary2(Fail, Ms, Live, Sz, Unit, Flags, Dst)
 
 %macro: i_bs_get_binary_imm2 BsGetBinaryImm_2 -fail_action -gen_dest
 %macro: i_bs_get_binary2 BsGetBinary_2 -fail_action -gen_dest
 %macro: i_bs_get_binary_all2 BsGetBinaryAll_2 -fail_action -gen_dest
 
-i_bs_get_binary_imm2 f r I I I d
 i_bs_get_binary_imm2 f x I I I d
-i_bs_get_binary2 f r I s I d
 i_bs_get_binary2 f x I s I d
-i_bs_get_binary_all2 f r I I d
 i_bs_get_binary_all2 f x I I d
-i_bs_get_binary_all_reuse r f I
 i_bs_get_binary_all_reuse x f I
 
 # Fetching float from binaries.
-bs_get_float2 Fail=f Ms=rx Live=u Sz=s Unit=u Flags=u Dst=d => \
+bs_get_float2 Fail=f Ms=x Live=u Sz=s Unit=u Flags=u Dst=d => \
 		gen_get_float2(Fail, Ms, Live, Sz, Unit, Flags, Dst)
 
-bs_get_float2 Fail=f Ms=rx Live=u Sz=q Unit=u Flags=u Dst=d => jump Fail
+bs_get_float2 Fail=f Ms=x Live=u Sz=q Unit=u Flags=u Dst=d => jump Fail
 
 %macro: i_bs_get_float2 BsGetFloat2 -fail_action -gen_dest
-i_bs_get_float2 f r I s I d
 i_bs_get_float2 f x I s I d
 
 # Miscellanous
 
-bs_skip_bits2 Fail=f Ms=rx Sz=s Unit=u Flags=u => \
-			gen_skip_bits2(Fail, Ms, Sz, Unit, Flags)
-bs_skip_bits2 Fail=f Ms=rx Sz=q Unit=u Flags=u => \
+bs_skip_bits2 Fail=f Ms=x Sz=sq Unit=u Flags=u => \
 			gen_skip_bits2(Fail, Ms, Sz, Unit, Flags)
 
 %macro: i_bs_skip_bits_imm2 BsSkipBitsImm2 -fail_action
-i_bs_skip_bits_imm2 f r I
 i_bs_skip_bits_imm2 f x I
 
 %macro: i_bs_skip_bits2 BsSkipBits2 -fail_action
-i_bs_skip_bits2 f r x I
-i_bs_skip_bits2 f r y I
 i_bs_skip_bits2 f x x I
-i_bs_skip_bits2 f x r I
 i_bs_skip_bits2 f x y I
 
 %macro: i_bs_skip_bits_all2 BsSkipBitsAll2 -fail_action
-i_bs_skip_bits_all2 f r I
 i_bs_skip_bits_all2 f x I 
 
-bs_test_tail2 Fail=f Ms=rx Bits=u==0 => bs_test_zero_tail2 Fail Ms
-bs_test_tail2 Fail=f Ms=rx Bits=u => bs_test_tail_imm2 Fail Ms Bits
-bs_test_zero_tail2 f r
+bs_test_tail2 Fail=f Ms=x Bits=u==0 => bs_test_zero_tail2 Fail Ms
+bs_test_tail2 Fail=f Ms=x Bits=u => bs_test_tail_imm2 Fail Ms Bits
 bs_test_zero_tail2 f x
-bs_test_tail_imm2 f r I
 bs_test_tail_imm2 f x I
 
 bs_test_unit F Ms Unit=u==8 => bs_test_unit8 F Ms
-bs_test_unit f r I
 bs_test_unit f x I
-bs_test_unit8 f r
 bs_test_unit8 f x
 
-bs_context_to_binary r
+# An y register operand for bs_context_to_binary is rare,
+# but can happen because of inlining.
+
+bs_context_to_binary Y=y => move Y x | bs_context_to_binary x
+
 bs_context_to_binary x
-bs_context_to_binary y
 
 #
 # Utf8/utf16/utf32 support. (R12B-5)
 #
-bs_get_utf8 Fail=f Ms=rx u u Dst=d => i_bs_get_utf8 Ms Fail Dst
-i_bs_get_utf8 r f d
+bs_get_utf8 Fail=f Ms=x u u Dst=d => i_bs_get_utf8 Ms Fail Dst
 i_bs_get_utf8 x f d
 
-bs_skip_utf8 Fail=f Ms=rx u u => i_bs_get_utf8 Ms Fail x
+bs_skip_utf8 Fail=f Ms=x u u => i_bs_get_utf8 Ms Fail x
 
-bs_get_utf16 Fail=f Ms=rx u Flags=u Dst=d => i_bs_get_utf16 Ms Fail Flags Dst
-bs_skip_utf16 Fail=f Ms=rx u Flags=u => i_bs_get_utf16 Ms Fail Flags x
+bs_get_utf16 Fail=f Ms=x u Flags=u Dst=d => i_bs_get_utf16 Ms Fail Flags Dst
+bs_skip_utf16 Fail=f Ms=x u Flags=u => i_bs_get_utf16 Ms Fail Flags x
 
-i_bs_get_utf16 r f I d
 i_bs_get_utf16 x f I d
 
-bs_get_utf32 Fail=f Ms=rx Live=u Flags=u Dst=d => \
+bs_get_utf32 Fail=f Ms=x Live=u Flags=u Dst=d => \
 	bs_get_integer2 Fail Ms Live i=32 u=1 Flags Dst | \
-	i_fetch Dst Ms | \
-	i_bs_validate_unicode_retract Fail
-bs_skip_utf32 Fail=f Ms=rx Live=u Flags=u => \
+	i_bs_validate_unicode_retract Fail Dst Ms
+bs_skip_utf32 Fail=f Ms=x Live=u Flags=u => \
 	bs_get_integer2 Fail Ms Live i=32 u=1 Flags x | \
-	i_fetch x Ms | \
-	i_bs_validate_unicode_retract Fail
+	i_bs_validate_unicode_retract Fail x Ms
 
-i_bs_validate_unicode_retract j
+i_bs_validate_unicode_retract j s s
 %hot
 
 #
@@ -1385,13 +1281,12 @@ bs_init2 Fail Sz=u Words Regs Flags Dst => \
 bs_init2 Fail Sz Words=u==0 Regs Flags Dst => \
   i_bs_init_fail Sz Fail Regs Dst
 bs_init2 Fail Sz Words Regs Flags Dst => \
-  i_fetch Sz r | i_bs_init_fail_heap Words Fail Regs Dst
+  i_bs_init_fail_heap Sz Words Fail Regs Dst
 
-i_bs_init_fail r j I d
 i_bs_init_fail x j I d
 i_bs_init_fail y j I d
 
-i_bs_init_fail_heap I j I d
+i_bs_init_fail_heap s I j I d
 
 i_bs_init I I d
 i_bs_init_heap_bin I I d
@@ -1408,39 +1303,35 @@ bs_init_bits Fail Sz=u Words Regs Flags Dst =>  i_bs_init_bits_heap Sz Words Reg
 bs_init_bits Fail Sz Words=u==0 Regs Flags Dst => \
   i_bs_init_bits_fail Sz Fail Regs Dst
 bs_init_bits Fail Sz Words Regs Flags Dst => \
-  i_fetch Sz r | i_bs_init_bits_fail_heap Words Fail Regs Dst
+  i_bs_init_bits_fail_heap Sz Words Fail Regs Dst
 
-i_bs_init_bits_fail r j I d
 i_bs_init_bits_fail x j I d
 i_bs_init_bits_fail y j I d
 
-i_bs_init_bits_fail_heap I j I d
+i_bs_init_bits_fail_heap s I j I d
 
 i_bs_init_bits I I d
 i_bs_init_bits_heap I I I d
 
 bs_add Fail S1=i==0 S2 Unit=u==1 D => move S2 D
-bs_add Fail S1 S2 Unit D => i_fetch S1 S2 | i_bs_add Fail Unit D
 
-i_bs_add j I d
+bs_add j s s I d
 
 bs_append Fail Size Extra Live Unit Bin Flags Dst => \
-  i_fetch Size Bin | i_bs_append Fail Extra Live Unit Dst
+  move Bin x | i_bs_append Fail Extra Live Unit Size Dst
 
 bs_private_append Fail Size Unit Bin Flags Dst => \
-  i_fetch Size Bin | i_bs_private_append Fail Unit Dst
+  i_bs_private_append Fail Unit Size Bin Dst
 
 bs_init_writable
 
-i_bs_append j I I I d
-i_bs_private_append j I d
+i_bs_append j I I I s d
+i_bs_private_append j I s s d
 
 #
 # Storing integers into binaries.
 #
 
-bs_put_integer Fail=j Sz=s Unit=u Flags=u Literal=q => \
-	move Literal x | bs_put_integer Fail Sz Unit Flags x
 bs_put_integer Fail=j Sz=sq Unit=u Flags=u Src=s => \
 			gen_put_integer(Fail, Sz, Unit, Flags, Src)
 
@@ -1454,32 +1345,20 @@ i_new_bs_put_integer_imm j I I s
 # Utf8/utf16/utf32 support. (R12B-5)
 #
 
-bs_utf8_size Fail Literal=q Dst=d => \
-	move Literal x | bs_utf8_size Fail x Dst
 bs_utf8_size j Src=s Dst=d => i_bs_utf8_size Src Dst
 
 i_bs_utf8_size s d
 
-bs_utf16_size Fail Literal=q Dst=d => \
-	move Literal x | bs_utf16_size Fail x Dst
 bs_utf16_size j Src=s Dst=d => i_bs_utf16_size Src Dst
 
 i_bs_utf16_size s d
 
-bs_put_utf8 Fail=j Flags=u Literal=q => \
-	move Literal x | bs_put_utf8 Fail Flags x
 bs_put_utf8 Fail u Src=s => i_bs_put_utf8 Fail Src
 
 i_bs_put_utf8 j s
 
-bs_put_utf16 Fail=j Flags=u Literal=q => \
-	move Literal x | bs_put_utf16 Fail Flags x
-bs_put_utf16 Fail Flags=u Src=s => i_bs_put_utf16 Fail Flags Src
-
-i_bs_put_utf16 j I s
+bs_put_utf16 j I s
 
-bs_put_utf32 Fail=j Flags=u Literal=q => \
-	move Literal x | bs_put_utf32 Fail Flags x
 bs_put_utf32 Fail=j Flags=u Src=s => \
    i_bs_validate_unicode Fail Src | bs_put_integer Fail i=32 u=1 Flags Src
 
@@ -1490,9 +1369,6 @@ i_bs_validate_unicode j s
 #
 bs_put_float Fail Sz=q Unit Flags Val => badarg Fail
 
-bs_put_float Fail=j Sz Unit=u Flags=u Literal=q => \
-	move Literal x | bs_put_float Fail Sz Unit Flags x
-
 bs_put_float Fail=j Sz=s Unit=u Flags=u Src=s => \
 			gen_put_float(Fail, Sz, Unit, Flags, Src)
 
@@ -1506,8 +1382,6 @@ i_new_bs_put_float_imm j I I s
 # Storing binaries into binaries.
 #
 
-bs_put_binary Fail Sz Unit Flags Literal=q => \
- 	move Literal x | bs_put_binary Fail Sz Unit Flags x
 bs_put_binary Fail=j Sz=s Unit=u Flags=u Src=s => \
 			gen_put_binary(Fail, Sz, Unit, Flags, Src)
 
@@ -1600,7 +1474,6 @@ is_map Fail Lit=q | literal_is_map(Lit) =>
 is_map Fail cq => jump Fail
 
 %macro: is_map IsMap -fail_action
-is_map f r
 is_map f x
 is_map f y
 
@@ -1611,101 +1484,119 @@ has_map_fields Fail Src Size Rest=* => \
 
 ## Transform get_map_elements(s) #{ K1 := V1, K2 := V2 }
 
-get_map_elements Fail Src=rxy Size=u==2 Rest=* => \
+get_map_elements Fail Src=xy Size=u==2 Rest=* => \
     gen_get_map_element(Fail, Src, Size, Rest)
 get_map_elements Fail Src Size Rest=* | map_key_sort(Size, Rest) => \
    gen_get_map_elements(Fail, Src, Size, Rest)
 
 i_get_map_elements f s I
 
-i_get_map_element Fail Src=rxy Key=ry Dst => \
+i_get_map_element Fail Src=xy Key=y Dst => \
     move Key x | i_get_map_element Fail Src x Dst
 
 %macro: i_get_map_element_hash GetMapElementHash -fail_action
-i_get_map_element_hash f r c I r
-i_get_map_element_hash f x c I r
-i_get_map_element_hash f y c I r
-i_get_map_element_hash f r c I x
 i_get_map_element_hash f x c I x
 i_get_map_element_hash f y c I x
-i_get_map_element_hash f r c I y
 i_get_map_element_hash f x c I y
 i_get_map_element_hash f y c I y
 
 %macro: i_get_map_element GetMapElement -fail_action
-i_get_map_element f r x r
-i_get_map_element f x x r
-i_get_map_element f y x r
-i_get_map_element f r x x
 i_get_map_element f x x x
 i_get_map_element f y x x
-i_get_map_element f r x y
 i_get_map_element f x x y
 i_get_map_element f y x y
 
 #
+# Convert the plus operations to a generic plus instruction.
+#
+gen_plus/5
+gen_minus/5
+
+gc_bif1 Fail Live u$bif:erlang:splus/1 Src Dst => \
+   gen_plus Fail Live Src i Dst
+gc_bif2 Fail Live u$bif:erlang:splus/2 S1 S2 Dst => \
+   gen_plus Fail Live S1 S2 Dst
+
+gc_bif1 Fail Live u$bif:erlang:sminus/1 Src Dst => \
+   gen_minus Fail Live i Src Dst
+gc_bif2 Fail Live u$bif:erlang:sminus/2 S1 S2 Dst => \
+   gen_minus Fail Live S1 S2 Dst
+
+#
 # Optimize addition and subtraction of small literals using
 # the i_increment/4 instruction (in bodies, not in guards).
 #
 
-gc_bif2 p Live u$bif:erlang:splus/2 Int=i Reg=d Dst => \
+gen_plus p Live Int=i Reg=d Dst => \
 	gen_increment(Reg, Int, Live, Dst)
-gc_bif2 p Live u$bif:erlang:splus/2 Reg=d Int=i Dst => \
+gen_plus p Live Reg=d Int=i Dst => \
 	gen_increment(Reg, Int, Live, Dst)
 
-gc_bif2 p Live u$bif:erlang:sminus/2 Reg=d Int=i Dst | \
-	negation_is_small(Int) => \
+gen_minus p Live Reg=d Int=i Dst | negation_is_small(Int) => \
 	gen_increment_from_minus(Reg, Int, Live, Dst)
 
 #
 # GCing arithmetic instructions.
 #
 
-gc_bif2 Fail I u$bif:erlang:splus/2 S1=x S2=x Dst=d => i_plus Fail I S1 S2 Dst
-gc_bif2 Fail I u$bif:erlang:splus/2 S1 S2 Dst=d => i_fetch S1 S2 | i_plus Fail I Dst
-gc_bif2 Fail I u$bif:erlang:sminus/2 S1=x S2=x Dst=d => i_minus Fail I S1 S2 Dst
-gc_bif2 Fail I u$bif:erlang:sminus/2 S1 S2 Dst=d => i_fetch S1 S2 | i_minus Fail I Dst
-gc_bif2 Fail I u$bif:erlang:stimes/2 S1 S2 Dst=d => i_fetch S1 S2 | i_times Fail I Dst
-gc_bif2 Fail I u$bif:erlang:div/2 S1 S2 Dst=d => i_fetch S1 S2 | i_m_div Fail I Dst
+gen_plus Fail Live S1 S2 Dst => i_plus Fail Live S1 S2 Dst
 
-gc_bif2 Fail I u$bif:erlang:intdiv/2 S1 S2 Dst=d => i_fetch S1 S2 | i_int_div Fail I Dst
-gc_bif2 Fail I u$bif:erlang:rem/2 S1=x S2=x Dst=d => i_rem Fail I S1 S2 Dst
-gc_bif2 Fail I u$bif:erlang:rem/2 S1 S2 Dst=d => i_fetch S1 S2 | i_rem Fail I Dst
+gen_minus Fail Live S1 S2 Dst => i_minus Fail Live S1 S2 Dst
 
-gc_bif2 Fail I u$bif:erlang:bsl/2 S1 S2 Dst=d => i_fetch S1 S2 | i_bsl Fail I Dst
-gc_bif2 Fail I u$bif:erlang:bsr/2 S1 S2 Dst=d => i_fetch S1 S2 | i_bsr Fail I Dst
+gc_bif2 Fail Live u$bif:erlang:stimes/2 S1 S2 Dst => \
+  i_times Fail Live S1 S2 Dst
 
-gc_bif2 Fail I u$bif:erlang:band/2 S1=x S2=c Dst=d => i_band Fail I S1 S2 Dst
-gc_bif2 Fail I u$bif:erlang:band/2 S1 S2 Dst=d => i_fetch S1 S2 | i_band Fail I Dst
-gc_bif2 Fail I u$bif:erlang:bor/2 S1 S2 Dst=d => i_fetch S1 S2 | i_bor Fail I Dst
-gc_bif2 Fail I u$bif:erlang:bxor/2 S1 S2 Dst=d => i_fetch S1 S2 | i_bxor Fail I Dst
+gc_bif2 Fail Live u$bif:erlang:div/2 S1 S2 Dst => \
+  i_m_div Fail Live S1 S2 Dst
+gc_bif2 Fail Live u$bif:erlang:intdiv/2 S1 S2 Dst => \
+  i_int_div Fail Live S1 S2 Dst
 
-gc_bif1 Fail I u$bif:erlang:bnot/1 Src Dst=d => i_int_bnot Fail Src I Dst
+gc_bif2 Fail Live u$bif:erlang:rem/2 S1 S2 Dst => \
+  i_rem Fail Live S1 S2 Dst
+
+gc_bif2 Fail Live u$bif:erlang:bsl/2 S1 S2 Dst => \
+  i_bsl Fail Live S1 S2 Dst
+gc_bif2 Fail Live u$bif:erlang:bsr/2 S1 S2 Dst => \
+  i_bsr Fail Live S1 S2 Dst
+
+gc_bif2 Fail Live u$bif:erlang:band/2 S1 S2 Dst => \
+  i_band Fail Live S1 S2 Dst
 
-gc_bif1 Fail I u$bif:erlang:sminus/1 Src Dst=d => i_fetch i Src | i_minus Fail I Dst
-gc_bif1 Fail I u$bif:erlang:splus/1 Src Dst=d => i_fetch i Src | i_plus Fail I Dst
+gc_bif2 Fail Live u$bif:erlang:bor/2 S1 S2 Dst => \
+  i_bor Fail Live S1 S2 Dst
+
+gc_bif2 Fail Live u$bif:erlang:bxor/2 S1 S2 Dst => \
+  i_bxor Fail Live S1 S2 Dst
+
+gc_bif1 Fail I u$bif:erlang:bnot/1 Src Dst=d => i_int_bnot Fail Src I Dst
 
 i_increment r I I d
 i_increment x I I d
 i_increment y I I d
 
 i_plus j I x x d
-i_plus j I d
+i_plus j I x y d
+i_plus j I s s d
+
 i_minus j I x x d
-i_minus j I d
-i_times j I d
-i_m_div j I d
-i_int_div j I d
+i_minus j I s s d
+
+i_times j I s s d
+
+i_m_div j I s s d
+i_int_div j I s s d
+
 i_rem j I x x d
-i_rem j I d
+i_rem j I s s d
 
-i_bsl j I d
-i_bsr j I d
+i_bsl j I s s d
+i_bsr j I s s d
 
 i_band j I x c d
-i_band j I d
-i_bor j I d
-i_bxor j I d
+i_band j I s s d
+
+i_bor j I s s d
+i_bxor j I s s d
 
 i_int_bnot j s I d
 
@@ -1731,21 +1622,18 @@ gc_bif2 Fail I Bif S1 S2 Dst => \
 gc_bif3 Fail I Bif S1 S2 S3 Dst => \
 	gen_guard_bif3(Fail, I, Bif, S1, S2, S3, Dst)
 
-i_gc_bif1 Fail Bif V=q Live D => move V x | i_gc_bif1 Fail Bif x Live D
-
 i_gc_bif1 j I s I d
 
-ii_gc_bif2/6
-
-ii_gc_bif2 Fail Bif S1 S2 Live D => i_fetch S1 S2 | i_gc_bif2 Fail Bif Live D
-
-i_gc_bif2 j I I d
+i_gc_bif2 j I I s s d
 
 ii_gc_bif3/7
 
-ii_gc_bif3 Fail Bif S1 S2 S3 Live D => move S1 x | i_fetch S2 S3 | i_gc_bif3 Fail Bif x Live D
+# A specific instruction can only have 6 operands, so we must
+# pass one of the arguments in an x register.
+ii_gc_bif3 Fail Bif Live S1 S2 S3 Dst => \
+  move S1 x | i_gc_bif3 Fail Bif Live S2 S3 Dst
 
-i_gc_bif3 j I s I d
+i_gc_bif3 j I I s s d
 
 #
 # The following instruction is specially handled in beam_load.c
diff --git a/erts/emulator/beam/register.c b/erts/emulator/beam/register.c
index 7ade8bca0f..ebc35b0c4d 100644
--- a/erts/emulator/beam/register.c
+++ b/erts/emulator/beam/register.c
@@ -125,7 +125,7 @@ static RegProc* reg_alloc(RegProc *tmpl)
 {
     RegProc* obj = (RegProc*) erts_alloc(ERTS_ALC_T_REG_PROC, sizeof(RegProc));
     if (!obj) {
-	erl_exit(1, "Can't allocate %d bytes of memory\n", sizeof(RegProc));
+	erts_exit(ERTS_ERROR_EXIT, "Can't allocate %d bytes of memory\n", sizeof(RegProc));
     }
     obj->name = tmpl->name;
     obj->p = tmpl->p;
@@ -151,6 +151,9 @@ void init_register_table(void)
     f.cmp  = (HCMP_FUN) reg_cmp;
     f.alloc = (HALLOC_FUN) reg_alloc;
     f.free = (HFREE_FUN) reg_free;
+    f.meta_alloc = (HMALLOC_FUN) erts_alloc;
+    f.meta_free = (HMFREE_FUN) erts_free;
+    f.meta_print = (HMPRINT_FUN) erts_print;
 
     hash_init(ERTS_ALC_T_REG_TABLE, &process_reg, "process_reg",
 	      PREG_HASH_SIZE, f);
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index ec94e3a596..44735c0ec0 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -21,6 +21,19 @@
 #ifndef __SYS_H__
 #define __SYS_H__
 
+#if !defined(__GNUC__)
+#  define ERTS_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) 0
+#elif !defined(__GNUC_MINOR__)
+#  define ERTS_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) \
+  ((__GNUC__ << 24) >= (((MAJ) << 24) | ((MIN) << 12) | (PL)))
+#elif !defined(__GNUC_PATCHLEVEL__)
+#  define ERTS_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) \
+  (((__GNUC__ << 24) | (__GNUC_MINOR__ << 12)) >= (((MAJ) << 24) | ((MIN) << 12) | (PL)))
+#else
+#  define ERTS_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) \
+  (((__GNUC__ << 24) | (__GNUC_MINOR__ << 12) | __GNUC_PATCHLEVEL__) >= (((MAJ) << 24) | ((MIN) << 12) | (PL)))
+#endif
+
 #ifdef ERTS_INLINE
 #  ifndef ERTS_CAN_INLINE
 #    define ERTS_CAN_INLINE 1
@@ -38,6 +51,17 @@
 #  endif
 #endif
 
+#ifndef ERTS_FORCE_INLINE
+#  if ERTS_AT_LEAST_GCC_VSN__(3,1,1)
+#    define ERTS_FORCE_INLINE __inline__ __attribute__((__always_inline__))
+#  elif defined(__WIN32__)
+#    define ERTS_FORCE_INLINE __forceinline
+#  endif
+#  ifndef ERTS_FORCE_INLINE
+#    define ERTS_FORCE_INLINE ERTS_INLINE
+#  endif
+#endif
+
 #if defined(DEBUG) || defined(ERTS_ENABLE_LOCK_CHECK)
 #  undef ERTS_CAN_INLINE
 #  define ERTS_CAN_INLINE 0
@@ -46,8 +70,10 @@
 #endif
 
 #if ERTS_CAN_INLINE
+#define ERTS_GLB_FORCE_INLINE static ERTS_FORCE_INLINE
 #define ERTS_GLB_INLINE static ERTS_INLINE
 #else
+#define ERTS_GLB_FORCE_INLINE
 #define ERTS_GLB_INLINE
 #endif
 
@@ -61,22 +87,14 @@
 #  define NO_FPE_SIGNALS
 #endif
 
-#ifdef DISABLE_CHILD_WAITER_THREAD
-#undef ENABLE_CHILD_WAITER_THREAD
-#endif
-
-#if defined(ERTS_SMP) && !defined(DISABLE_CHILD_WAITER_THREAD)
-#undef ENABLE_CHILD_WAITER_THREAD
-#define ENABLE_CHILD_WAITER_THREAD 1
-#endif
-
 #define ERTS_I64_LITERAL(X) X##LL
 
+#define ErtsInArea(ptr,start,nbytes) \
+    ((UWord)((char*)(ptr) - (char*)(start)) < (nbytes))
+
 #if defined (__WIN32__)
 #  include "erl_win_sys.h"
-#elif defined (__OSE__)
-#  include "erl_ose_sys.h"
-#else 
+#else
 #  include "erl_unix_sys.h"
 #ifndef UNIX
 #  define UNIX 1
@@ -111,19 +129,6 @@ typedef int ErtsSysFdType;
 typedef ERTS_SYS_FD_TYPE ErtsSysFdType;
 #endif
 
-#if !defined(__GNUC__)
-#  define ERTS_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) 0
-#elif !defined(__GNUC_MINOR__)
-#  define ERTS_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) \
-  ((__GNUC__ << 24) >= (((MAJ) << 24) | ((MIN) << 12) | (PL)))
-#elif !defined(__GNUC_PATCHLEVEL__)
-#  define ERTS_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) \
-  (((__GNUC__ << 24) | (__GNUC_MINOR__ << 12)) >= (((MAJ) << 24) | ((MIN) << 12) | (PL)))
-#else
-#  define ERTS_AT_LEAST_GCC_VSN__(MAJ, MIN, PL) \
-  (((__GNUC__ << 24) | (__GNUC_MINOR__ << 12) | __GNUC_PATCHLEVEL__) >= (((MAJ) << 24) | ((MIN) << 12) | (PL)))
-#endif
-
 #if ERTS_AT_LEAST_GCC_VSN__(2, 96, 0)
 #  define ERTS_LIKELY(BOOL)   __builtin_expect((BOOL), !0)
 #  define ERTS_UNLIKELY(BOOL) __builtin_expect((BOOL), 0)
@@ -131,6 +136,17 @@ typedef ERTS_SYS_FD_TYPE ErtsSysFdType;
 #  define ERTS_LIKELY(BOOL)   (BOOL)
 #  define ERTS_UNLIKELY(BOOL) (BOOL)
 #endif
+
+#if ERTS_AT_LEAST_GCC_VSN__(2, 96, 0)
+#if (defined(__APPLE__) && defined(__MACH__)) || defined(__DARWIN__)
+#  define ERTS_WRITE_UNLIKELY(X) X __attribute__ ((section ("__DATA,ERTS_LOW_WRITE") ))
+#else
+#  define ERTS_WRITE_UNLIKELY(X) X __attribute__ ((section ("ERTS_LOW_WRITE") ))
+#endif
+#else
+#  define ERTS_WRITE_UNLIKELY(X) X
+#endif
+
 #ifdef __GNUC__
 #  if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5)
 #    define ERTS_DECLARE_DUMMY(X) X __attribute__ ((unused))
@@ -191,6 +207,12 @@ __decl_noreturn void __noreturn erl_assert_error(const char* expr, const char *f
 #  define ASSERT(e) ((void) 1)
 #endif
 
+#ifdef ERTS_SMP
+#  define ERTS_SMP_ASSERT(e) ASSERT(e)
+#else
+#  define ERTS_SMP_ASSERT(e) ((void)1)
+#endif
+
 /* ERTS_UNDEF can be used to silence false warnings about
  * "variable may be used uninitialized" while keeping the variable
  * marked as undefined by valgrind.
@@ -285,62 +307,11 @@ __decl_noreturn void __noreturn erl_assert_error(const char* expr, const char *f
 #else
 #error Neither 32 nor 64 bit architecture
 #endif
-#if defined(ARCH_64) && defined(HALFWORD_HEAP_EMULATOR)
-#    define HALFWORD_HEAP 1
-#    define HALFWORD_ASSERT 0
-#    define ASSERT_HALFWORD(COND) ASSERT(COND)
-#    undef ERTS_SIZEOF_TERM
-#    define ERTS_SIZEOF_TERM 4
-#else
-#    define HALFWORD_HEAP 0
-#    define HALFWORD_ASSERT 0
-#    define ASSERT_HALFWORD(COND)
-#endif
 
 #if SIZEOF_VOID_P != SIZEOF_SIZE_T
 #error sizeof(void*) != sizeof(size_t)
 #endif
 
-#if HALFWORD_HEAP
-
-#if SIZEOF_INT == 4
-typedef unsigned int Eterm;
-typedef unsigned int Uint;
-typedef int          Sint;
-#define ERTS_UINT_MAX UINT_MAX
-#define ERTS_SIZEOF_ETERM SIZEOF_INT
-#define ErtsStrToSint strtol
-#else
-#error Found no appropriate type to use for 'Eterm', 'Uint' and 'Sint'
-#endif
-
-#if SIZEOF_VOID_P == SIZEOF_LONG
-typedef unsigned long UWord;
-typedef long          SWord;
-#define SWORD_CONSTANT(Const) Const##L
-#define UWORD_CONSTANT(Const) Const##UL
-#define ERTS_UWORD_MAX ULONG_MAX
-#define ERTS_SWORD_MAX LONG_MAX
-#elif SIZEOF_VOID_P == SIZEOF_INT
-typedef unsigned int UWord;
-typedef int          SWord;
-#define SWORD_CONSTANT(Const) Const
-#define UWORD_CONSTANT(Const) Const##U
-#define ERTS_UWORD_MAX UINT_MAX
-#define ERTS_SWORD_MAX INT_MAX
-#elif SIZEOF_VOID_P == SIZEOF_LONG_LONG
-typedef unsigned long long UWord;
-typedef long long          SWord;
-#define SWORD_CONSTANT(Const) Const##LL
-#define UWORD_CONSTANT(Const) Const##ULL
-#define ERTS_UWORD_MAX ULLONG_MAX
-#define ERTS_SWORD_MAX LLONG_MAX
-#else
-#error Found no appropriate type to use for 'Eterm', 'Uint' and 'Sint'
-#endif
-
-#else /* !HALFWORD_HEAP */
-
 #if SIZEOF_VOID_P == SIZEOF_LONG
 typedef unsigned long Eterm;
 typedef unsigned long Uint;
@@ -383,8 +354,6 @@ typedef Uint UWord;
 typedef Sint SWord;
 #define ERTS_UINT_MAX ERTS_UWORD_MAX
 
-#endif /* HALFWORD_HEAP */
-
 typedef UWord BeamInstr;
 
 #ifndef HAVE_INT64
@@ -611,15 +580,16 @@ static unsigned long zero_value = 0, one_value = 1;
 #  endif /* !__WIN32__ */
 #endif /* WANT_NONBLOCKING */
 
-__decl_noreturn void __noreturn erl_exit(int n, char*, ...);
+__decl_noreturn void __noreturn erts_exit(int n, char*, ...);
 
-/* Some special erl_exit() codes: */
-#define ERTS_INTR_EXIT	INT_MIN		/* called from signal handler */
-#define ERTS_ABORT_EXIT	(INT_MIN + 1)	/* no crash dump; only abort() */
-#define ERTS_DUMP_EXIT	(INT_MIN + 2)	/* crash dump; then exit() */
+/* Some special erts_exit() codes: */
+#define ERTS_INTR_EXIT	-1		/* called from signal handler */
+#define ERTS_ABORT_EXIT	-2	        /* no crash dump; only abort() */
+#define ERTS_DUMP_EXIT	-3              /* crash dump; then exit() */
+#define ERTS_ERROR_EXIT	-4              /* crash dump; then abort() */
 
 #define ERTS_INTERNAL_ERROR(What) \
-    erl_exit(ERTS_ABORT_EXIT, "%s:%d:%s(): Internal error: %s\n", \
+    erts_exit(ERTS_ABORT_EXIT, "%s:%d:%s(): Internal error: %s\n", \
 	     __FILE__, __LINE__, __func__, What)
 
 Eterm erts_check_io_info(void *p);
@@ -785,6 +755,7 @@ void erts_sys_main_thread(void);
 extern int erts_sys_prepare_crash_dump(int secs);
 extern void erts_sys_pre_init(void);
 extern void erl_sys_init(void);
+extern void erl_sys_late_init(void);
 extern void erl_sys_args(int *argc, char **argv);
 extern void erl_sys_schedule(int);
 void sys_tty_reset(int);
@@ -819,6 +790,10 @@ int local_to_univ(Sint *year, Sint *month, Sint *day,
 void get_now(Uint*, Uint*, Uint*);
 struct ErtsSchedulerData_;
 ErtsMonotonicTime erts_get_monotonic_time(struct ErtsSchedulerData_ *);
+ErtsMonotonicTime erts_get_time_offset(void);
+void
+erts_make_timestamp_value(Uint* megasec, Uint* sec, Uint* microsec,
+			  ErtsMonotonicTime mtime, ErtsMonotonicTime offset);
 void get_sys_now(Uint*, Uint*, Uint*);
 void set_break_quit(void (*)(void), void (*)(void));
 
@@ -929,7 +904,7 @@ erts_refc_inc(erts_refc_t *refcp, erts_aint_t min_val)
 #ifdef ERTS_REFC_DEBUG
     erts_aint_t val = erts_smp_atomic_inc_read_nob((erts_smp_atomic_t *) refcp);
     if (val < min_val)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "erts_refc_inc(): Bad refc found (refc=%ld < %ld)!\n",
 		 val, min_val);
 #else
@@ -943,7 +918,7 @@ erts_refc_inctest(erts_refc_t *refcp, erts_aint_t min_val)
     erts_aint_t val = erts_smp_atomic_inc_read_nob((erts_smp_atomic_t *) refcp);
 #ifdef ERTS_REFC_DEBUG
     if (val < min_val)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "erts_refc_inctest(): Bad refc found (refc=%ld < %ld)!\n",
 		 val, min_val);
 #endif
@@ -956,7 +931,7 @@ erts_refc_dec(erts_refc_t *refcp, erts_aint_t min_val)
 #ifdef ERTS_REFC_DEBUG
     erts_aint_t val = erts_smp_atomic_dec_read_nob((erts_smp_atomic_t *) refcp);
     if (val < min_val)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "erts_refc_dec(): Bad refc found (refc=%ld < %ld)!\n",
 		 val, min_val);
 #else
@@ -970,7 +945,7 @@ erts_refc_dectest(erts_refc_t *refcp, erts_aint_t min_val)
     erts_aint_t val = erts_smp_atomic_dec_read_nob((erts_smp_atomic_t *) refcp);
 #ifdef ERTS_REFC_DEBUG
     if (val < min_val)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "erts_refc_dectest(): Bad refc found (refc=%ld < %ld)!\n",
 		 val, min_val);
 #endif
@@ -983,7 +958,7 @@ erts_refc_add(erts_refc_t *refcp, erts_aint_t diff, erts_aint_t min_val)
 #ifdef ERTS_REFC_DEBUG
     erts_aint_t val = erts_smp_atomic_add_read_nob((erts_smp_atomic_t *) refcp, diff);
     if (val < min_val)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "erts_refc_add(%ld): Bad refc found (refc=%ld < %ld)!\n",
 		 diff, val, min_val);
 #else
@@ -997,7 +972,7 @@ erts_refc_read(erts_refc_t *refcp, erts_aint_t min_val)
     erts_aint_t val = erts_smp_atomic_read_nob((erts_smp_atomic_t *) refcp);
 #ifdef ERTS_REFC_DEBUG
     if (val < min_val)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "erts_refc_read(): Bad refc found (refc=%ld < %ld)!\n",
 		 val, min_val);
 #endif
@@ -1098,7 +1073,6 @@ extern int erts_use_kernel_poll;
 
 #define put_int8(i, s) do {((unsigned char*)(s))[0] = (i) & 0xff;} while (0)
 
-
 /*
  * Use DEBUGF as you would use printf, but use double parentheses:
  *
diff --git a/erts/emulator/beam/time.c b/erts/emulator/beam/time.c
index 0ab6661c9f..0ce4f443f3 100644
--- a/erts/emulator/beam/time.c
+++ b/erts/emulator/beam/time.c
@@ -278,9 +278,14 @@ ErtsMonotonicTime
 erts_check_next_timeout_time(ErtsSchedulerData *esdp)
 {
     ErtsTimerWheel *tiw = esdp->timer_wheel;
+    ErtsMonotonicTime time;
+    ERTS_MSACC_DECLARE_CACHE_X();
     if (tiw->true_next_timeout_time)
 	return tiw->next_timeout_time;
-    return find_next_timeout(esdp, tiw, 1, 0, 0);
+    ERTS_MSACC_PUSH_AND_SET_STATE_CACHED_X(ERTS_MSACC_STATE_TIMERS);
+    time = find_next_timeout(esdp, tiw, 1, 0, 0);
+    ERTS_MSACC_POP_STATE_M_X();
+    return time;
 }
 
 #ifndef ERTS_TW_DEBUG
@@ -336,6 +341,7 @@ erts_bump_timers(ErtsTimerWheel *tiw, ErtsMonotonicTime curr_time)
 {
     int tiw_pos_ix, slots, yielded_slot_restarted, yield_count;
     ErtsMonotonicTime bump_to, tmp_slots, old_pos;
+    ERTS_MSACC_PUSH_AND_SET_STATE_M_X(ERTS_MSACC_STATE_TIMERS);
 
     yield_count = ERTS_TWHEEL_BUMP_YIELD_LIMIT;
 
@@ -371,6 +377,7 @@ erts_bump_timers(ErtsTimerWheel *tiw, ErtsMonotonicTime curr_time)
 		tiw->next_timeout_time = curr_time + ERTS_MONOTONIC_DAY;
 		tiw->pos = bump_to;
 		tiw->yield_slot = ERTS_TWHEEL_SLOT_INACTIVE;
+                ERTS_MSACC_POP_STATE_M_X();
 		return;
 	    }
 
@@ -382,6 +389,7 @@ erts_bump_timers(ErtsTimerWheel *tiw, ErtsMonotonicTime curr_time)
 		    tiw->yield_slot = ERTS_TWHEEL_SLOT_AT_ONCE;
 		    tiw->true_next_timeout_time = 1;
 		    tiw->next_timeout_time = ERTS_CLKTCKS_TO_MONOTONIC(old_pos);
+                    ERTS_MSACC_POP_STATE_M_X();
 		    return;
 		}
 
@@ -400,8 +408,10 @@ erts_bump_timers(ErtsTimerWheel *tiw, ErtsMonotonicTime curr_time)
 		p = tiw->at_once.head;
 	    }
 
-	    if (tiw->pos >= bump_to)
+	    if (tiw->pos >= bump_to) {
+                ERTS_MSACC_POP_STATE_M_X();
 		break;
+            }
 
 	    if (tiw->nto == 0)
 		goto empty_wheel;
@@ -478,6 +488,7 @@ erts_bump_timers(ErtsTimerWheel *tiw, ErtsMonotonicTime curr_time)
 			    tiw->yield_slot = tiw_pos_ix;
 			    tiw->yield_slots_left = slots;
 			    tiw->yield_start_pos = old_pos;
+                            ERTS_MSACC_POP_STATE_M_X();
 			    return; /* Yield! */
 			}
 
@@ -500,6 +511,7 @@ erts_bump_timers(ErtsTimerWheel *tiw, ErtsMonotonicTime curr_time)
 
     /* Search at most two seconds ahead... */
     (void) find_next_timeout(NULL, tiw, 0, curr_time, ERTS_SEC_TO_MONOTONIC(2));
+    ERTS_MSACC_POP_STATE_M_X();
 }
 
 Uint
@@ -555,7 +567,7 @@ erts_init_time(int time_correction, ErtsTimeWarpMode time_warp_mode)
     itime = erts_init_time_sup(time_correction, time_warp_mode);
 #ifdef TIW_ITIME_IS_CONSTANT 
     if (itime != TIW_ITIME) {
-	erl_exit(ERTS_ABORT_EXIT, "timer resolution mismatch %d != %d", itime, TIW_ITIME);
+	erts_exit(ERTS_ABORT_EXIT, "timer resolution mismatch %d != %d", itime, TIW_ITIME);
     }
 #else
     tiw_itime = itime;
@@ -569,6 +581,7 @@ erts_twheel_set_timer(ErtsTimerWheel *tiw,
 		      ErtsMonotonicTime timeout_pos)
 {
     ErtsMonotonicTime timeout_time;
+    ERTS_MSACC_PUSH_AND_SET_STATE_M_X(ERTS_MSACC_STATE_TIMERS);
 
     p->u.func.timeout = timeout;
     p->u.func.cancel = cancel;
@@ -612,6 +625,7 @@ erts_twheel_set_timer(ErtsTimerWheel *tiw,
 	tiw->true_next_timeout_time = 1;
 	tiw->next_timeout_time = timeout_time;
     }
+    ERTS_MSACC_POP_STATE_M_X();
 }
 
 void
@@ -620,11 +634,13 @@ erts_twheel_cancel_timer(ErtsTimerWheel *tiw, ErtsTWheelTimer *p)
     if (p->slot != ERTS_TWHEEL_SLOT_INACTIVE) {
 	ErlCancelProc cancel;
 	void *arg;
+        ERTS_MSACC_PUSH_AND_SET_STATE_M_X(ERTS_MSACC_STATE_TIMERS);
 	remove_timer(tiw, p);
 	cancel = p->u.func.cancel;
 	arg = p->u.func.arg;
 	if (cancel)
 	    (*cancel)(arg);
+        ERTS_MSACC_POP_STATE_M_X();
     }
 }
 
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index 5286391746..66fcfcf6ce 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -110,7 +110,6 @@ Eterm*
 erts_heap_alloc(Process* p, Uint need, Uint xtra)
 {
     ErlHeapFragment* bp;
-    Eterm* htop;
     Uint n;
 #if defined(DEBUG) || defined(CHECK_FOR_HOLES)
     Uint i;
@@ -156,16 +155,6 @@ erts_heap_alloc(Process* p, Uint need, Uint xtra)
     n--;
 #endif
 
-    /*
-     * When we have created a heap fragment, we are no longer allowed
-     * to store anything more on the heap. 
-     */
-    htop = HEAP_TOP(p);
-    if (htop < HEAP_LIMIT(p)) {
-	*htop = make_pos_bignum_header(HEAP_LIMIT(p)-htop-1);
-	HEAP_TOP(p) = HEAP_LIMIT(p);
-    }
-
     bp->next = MBUF(p);
     MBUF(p) = bp;
     bp->alloc_size = n;
@@ -269,6 +258,31 @@ erl_grow_pstack(ErtsPStack* s, void* default_pstack, unsigned need_bytes)
     s->psp = s->pstart + sp_offs;
 }
 
+/*
+ * Helper function for the EQUEUE macros defined in global.h.
+ */
+
+void
+erl_grow_equeue(ErtsEQueue* q, Eterm* default_equeue)
+{
+    Uint old_size = (q->end - q->start);
+    Uint new_size = old_size * 2;
+    Uint first_part = (q->end - q->front);
+    Uint second_part = (q->back - q->start);
+    Eterm* new_ptr = erts_alloc(q->alloc_type, new_size*sizeof(Eterm));
+    ASSERT(q->back == q->front);   // of course the queue is full now!
+    if (first_part > 0)
+      sys_memcpy(new_ptr, q->front, first_part*sizeof(Eterm));
+    if (second_part > 0)
+      sys_memcpy(new_ptr+first_part, q->start, second_part*sizeof(Eterm));
+    if (q->start != default_equeue)
+      erts_free(q->alloc_type, q->start);
+    q->start = new_ptr;
+    q->end = q->start + new_size;
+    q->front = q->start;
+    q->back = q->start + old_size;
+}
+
 /* CTYPE macros */
 
 #define LATIN1
@@ -303,10 +317,10 @@ erl_grow_pstack(ErtsPStack* s, void* default_pstack, unsigned need_bytes)
  * Calculate length of a list.
  * Returns -1 if not a proper list (i.e. not terminated with NIL)
  */
-int
+Sint
 erts_list_length(Eterm list)
 {
-    int i = 0;
+    Sint i = 0;
 
     while(is_list(list)) {
 	i++;
@@ -894,7 +908,7 @@ tail_recur:
 	    Uint y2 = y1 < 0 ? -(Uint)y1 : y1;
 
 	    UINT32_HASH_STEP(y2, FUNNY_NUMBER2);
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 	    if (y2 >> 32)
 		UINT32_HASH_STEP(y2 >> 32, FUNNY_NUMBER2);
 #endif
@@ -1015,7 +1029,7 @@ tail_recur:
 	    }
 	    d = BIG_DIGIT(ptr, k);
 	    k = sizeof(ErtsDigit);
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
 	    if (!(d >> 32))
 		k /= 2;
 #endif
@@ -1055,7 +1069,7 @@ tail_recur:
 	}    
 	
     default:
-	erl_exit(1, "Invalid tag in make_hash(0x%X,0x%X)\n", term, op);
+	erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_hash(0x%X,0x%X)\n", term, op);
 	return 0;
       }
       if (WSTACK_ISEMPTY(stack)) break;
@@ -1328,7 +1342,7 @@ make_hash2(Eterm term)
                     i = hashmap_bitcount(MAP_HEADER_VAL(hdr));
                     break;
                 default:
-                    erl_exit(1, "bad header");
+                    erts_exit(ERTS_ERROR_EXIT, "bad header");
                 }
                 while (i) {
                     if (is_list(*ptr)) {
@@ -1491,7 +1505,7 @@ make_hash2(Eterm term)
 	    break;
 		    
 	    default:
-		erl_exit(1, "Invalid tag in make_hash2(0x%X)\n", term);
+		erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_hash2(0x%X)\n", term);
 	    }
 	}
 	break;
@@ -1522,7 +1536,7 @@ make_hash2(Eterm term)
 			UINT32_HASH(NIL_DEF, HCONST_2);
 		    goto hash2_common;
 		default:
-		    erl_exit(1, "Invalid tag in make_hash2(0x%X)\n", term);
+		    erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_hash2(0x%X)\n", term);
 		}
 	    case _TAG_IMMED1_SMALL:
 	      {
@@ -1538,7 +1552,7 @@ make_hash2(Eterm term)
 	    }
 	    break;
 	default:
-	    erl_exit(1, "Invalid tag in make_hash2(0x%X)\n", term);
+	    erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_hash2(0x%X)\n", term);
 	hash2_common:
 
 	    /* Uint32 hash always has the hash value of the previous term,
@@ -1733,7 +1747,7 @@ make_internal_hash(Eterm term)
                     i = hashmap_bitcount(MAP_HEADER_VAL(hdr));
                     break;
                 default:
-                    erl_exit(1, "bad header");
+                    erts_exit(ERTS_ERROR_EXIT, "bad header");
                 }
                 while (i) {
                     if (is_list(*ptr)) {
@@ -1909,7 +1923,7 @@ make_internal_hash(Eterm term)
 		goto pop_next;
 	    }
 	    default:
-		erl_exit(1, "Invalid tag in make_hash2(0x%X)\n", term);
+		erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_hash2(0x%X)\n", term);
 	    }
 	}
 	break;
@@ -1922,7 +1936,7 @@ make_internal_hash(Eterm term)
             goto pop_next;
 
 	default:
-	    erl_exit(1, "Invalid tag in make_hash2(0x%X)\n", term);
+	    erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_hash2(0x%X)\n", term);
 
 	pop_next:
 	    if (ESTACK_ISEMPTY(s)) {
@@ -1985,7 +1999,7 @@ tail_recur:
 	    (atom_tab(atom_val(term))->slot.bucket.hvalue);
 	break;
     case SMALL_DEF:
-#if defined(ARCH_64) && !HALFWORD_HEAP
+#if defined(ARCH_64)
     {
 	Sint y1 = signed_val(term);
 	Uint y2 = y1 < 0 ? -(Uint)y1 : y1;
@@ -2205,7 +2219,7 @@ tail_recur:
 	}
 
     default:
-	erl_exit(1, "Invalid tag in make_broken_hash\n");
+	erts_exit(ERTS_ERROR_EXIT, "Invalid tag in make_broken_hash\n");
 	return 0;
       }
       if (WSTACK_ISEMPTY(stack)) break;
@@ -2281,7 +2295,11 @@ static void do_send_logger_message(Eterm *hp, ErlOffHeap *ohp, ErlHeapFragment *
 	erts_queue_error_logger_message(from, message, bp);
     }
 #else
-    erts_queue_message(p, NULL /* only used for smp build */, bp, message, NIL);
+    {
+	ErtsMessage *mp = erts_alloc_message(0, NULL);
+	mp->data.heap_frag = bp;
+	erts_queue_message(p, NULL /* only used for smp build */, mp, message, NIL);
+    }
 #endif
 }
 
@@ -2594,11 +2612,7 @@ erts_destroy_tmp_dsbuf(erts_dsprintf_buf_t *dsbufp)
  * Test for equality of two terms.
  * Returns 0 if not equal, or a non-zero value otherwise.
  */
-#if HALFWORD_HEAP
-int eq_rel(Eterm a, Eterm* a_base, Eterm b, Eterm* b_base)
-#else
 int eq(Eterm a, Eterm b)
-#endif
 {
     DECLARE_WSTACK(stack);
     Sint sz;
@@ -2606,18 +2620,18 @@ int eq(Eterm a, Eterm b)
     Eterm* bb;
 
 tailrecur:
-    if (is_same(a, a_base, b, b_base)) goto pop_next;
+    if (is_same(a, b)) goto pop_next;
 tailrecur_ne:
 
     switch (primary_tag(a)) {
     case TAG_PRIMARY_LIST:
 	if (is_list(b)) {
-	    Eterm* aval = list_val_rel(a, a_base);
-	    Eterm* bval = list_val_rel(b, b_base);
+	    Eterm* aval = list_val(a);
+	    Eterm* bval = list_val(b);
 	    while (1) {
 		Eterm atmp = CAR(aval);
 		Eterm btmp = CAR(bval);
-		if (!is_same(atmp,a_base,btmp,b_base)) {
+		if (!is_same(atmp,btmp)) {
 		    WSTACK_PUSH2(stack,(UWord) CDR(bval),(UWord) CDR(aval));
 		    a = atmp;
 		    b = btmp;
@@ -2625,7 +2639,7 @@ tailrecur_ne:
 		}
 		atmp = CDR(aval);
 		btmp = CDR(bval);
-		if (is_same(atmp,a_base,btmp,b_base)) {
+		if (is_same(atmp,btmp)) {
 		    goto pop_next;
 		}
 		if (is_not_list(atmp) || is_not_list(btmp)) {
@@ -2633,22 +2647,22 @@ tailrecur_ne:
 		    b = btmp;
 		    goto tailrecur_ne;
 		}
-		aval = list_val_rel(atmp, a_base);
-		bval = list_val_rel(btmp, b_base);
+		aval = list_val(atmp);
+		bval = list_val(btmp);
 	    }
 	}
 	break; /* not equal */
 
     case TAG_PRIMARY_BOXED:
 	{	
-	    Eterm hdr = *boxed_val_rel(a,a_base);
+	    Eterm hdr = *boxed_val(a);
 	    switch (hdr & _TAG_HEADER_MASK) {
 	    case ARITYVAL_SUBTAG:
 		{
-		    aa = tuple_val_rel(a, a_base);
-		    if (!is_boxed(b) || *boxed_val_rel(b,b_base) != *aa)
+		    aa = tuple_val(a);
+		    if (!is_boxed(b) || *boxed_val(b) != *aa)
 			goto not_equal;
-		    bb = tuple_val_rel(b,b_base);
+		    bb = tuple_val(b);
 		    if ((sz = arityval(*aa)) == 0) goto pop_next;
 		    ++aa;
 		    ++bb;
@@ -2667,16 +2681,16 @@ tailrecur_ne:
 		    Uint a_bitoffs;
 		    Uint b_bitoffs;
 		    
-		    if (!is_binary_rel(b,b_base)) {
+		    if (!is_binary(b)) {
 			goto not_equal;
 		    }
-		    a_size = binary_size_rel(a,a_base);
-		    b_size = binary_size_rel(b,b_base);
+		    a_size = binary_size(a);
+		    b_size = binary_size(b);
 		    if (a_size != b_size) {
 			goto not_equal;
 		    }
-		    ERTS_GET_BINARY_BYTES_REL(a, a_ptr, a_bitoffs, a_bitsize, a_base);
-		    ERTS_GET_BINARY_BYTES_REL(b, b_ptr, b_bitoffs, b_bitsize, b_base);
+		    ERTS_GET_BINARY_BYTES(a, a_ptr, a_bitoffs, a_bitsize);
+		    ERTS_GET_BINARY_BYTES(b, b_ptr, b_bitoffs, b_bitsize);
 		    if ((a_bitsize | b_bitsize | a_bitoffs | b_bitoffs) == 0) {
 			if (sys_memcmp(a_ptr, b_ptr, a_size) == 0) goto pop_next;
 		    } else if (a_bitsize == b_bitsize) {
@@ -2687,9 +2701,9 @@ tailrecur_ne:
 		}
 	    case EXPORT_SUBTAG:
 		{
-		    if (is_export_rel(b,b_base)) {
-			Export* a_exp = *((Export **) (export_val_rel(a,a_base) + 1));
-			Export* b_exp = *((Export **) (export_val_rel(b,b_base) + 1));
+		    if (is_export(b)) {
+			Export* a_exp = *((Export **) (export_val(a) + 1));
+			Export* b_exp = *((Export **) (export_val(b) + 1));
 			if (a_exp == b_exp) goto pop_next;
 		    }
 		    break; /* not equal */
@@ -2699,10 +2713,10 @@ tailrecur_ne:
 		    ErlFunThing* f1;
 		    ErlFunThing* f2;
   
-		    if (!is_fun_rel(b,b_base))
+		    if (!is_fun(b))
 			goto not_equal;
-		    f1 = (ErlFunThing *) fun_val_rel(a,a_base);
-		    f2 = (ErlFunThing *) fun_val_rel(b,b_base);
+		    f1 = (ErlFunThing *) fun_val(a);
+		    f2 = (ErlFunThing *) fun_val(b);
 		    if (f1->fe->module != f2->fe->module ||
 			f1->fe->old_index != f2->fe->old_index ||
 			f1->fe->old_uniq != f2->fe->old_uniq ||
@@ -2720,15 +2734,15 @@ tailrecur_ne:
 		ExternalThing *ap;
 		ExternalThing *bp;
 
-		if(!is_external_rel(b,b_base))
+		if(!is_external(b))
 		    goto not_equal;
 
-		ap = external_thing_ptr_rel(a,a_base);
-		bp = external_thing_ptr_rel(b,b_base);
+		ap = external_thing_ptr(a);
+		bp = external_thing_ptr(b);
 
 		if(ap->header == bp->header && ap->node == bp->node) {
-		    ASSERT(1 == external_data_words_rel(a,a_base));
-		    ASSERT(1 == external_data_words_rel(b,b_base));
+		    ASSERT(1 == external_data_words(a));
+		    ASSERT(1 == external_data_words(b));
 		    
 		    if (ap->data.ui[0] == bp->data.ui[0]) goto pop_next;
 		}
@@ -2749,11 +2763,11 @@ tailrecur_ne:
 		ExternalThing* athing;
 		ExternalThing* bthing;
 
-		if(!is_external_ref_rel(b,b_base))
+		if(!is_external_ref(b))
 		    goto not_equal;
 
-		athing = external_thing_ptr_rel(a,a_base);
-		bthing = external_thing_ptr_rel(b,b_base);
+		athing = external_thing_ptr(a);
+		bthing = external_thing_ptr(b);
 
 		if(athing->node != bthing->node)
 		    goto not_equal;
@@ -2765,12 +2779,12 @@ tailrecur_ne:
 
 		goto ref_common;
 	    case REF_SUBTAG:
-		    if (!is_internal_ref_rel(b,b_base))
+		    if (!is_internal_ref(b))
 			goto not_equal;
 
 		    {
-			RefThing* athing = ref_thing_ptr_rel(a,a_base);
-			RefThing* bthing = ref_thing_ptr_rel(b,b_base);
+			RefThing* athing = ref_thing_ptr(a);
+			RefThing* bthing = ref_thing_ptr(b);
 			alen = internal_thing_ref_no_of_numbers(athing);
 			blen = internal_thing_ref_no_of_numbers(bthing);
 			anum = internal_thing_ref_numbers(athing);
@@ -2820,10 +2834,10 @@ tailrecur_ne:
 		{
 		    int i;
   
-		    if (!is_big_rel(b,b_base))
+		    if (!is_big(b))
 			goto not_equal;
-		    aa = big_val_rel(a,a_base);
-		    bb = big_val_rel(b,b_base);
+		    aa = big_val(a);
+		    bb = big_val(b);
 		    if (*aa != *bb)
 			goto not_equal;
 		    i = BIG_ARITY(aa);
@@ -2838,19 +2852,19 @@ tailrecur_ne:
 		    FloatDef af;
 		    FloatDef bf;
   
-		    if (is_float_rel(b,b_base)) {
-			GET_DOUBLE_REL(a, af, a_base);
-			GET_DOUBLE_REL(b, bf, b_base);
+		    if (is_float(b)) {
+			GET_DOUBLE(a, af);
+			GET_DOUBLE(b, bf);
 			if (af.fd == bf.fd) goto pop_next;
 		    }
 		    break; /* not equal */
 		}
 	    case MAP_SUBTAG:
-                if (is_flatmap_rel(a, a_base)) {
-		    aa = flatmap_val_rel(a, a_base);
-		    if (!is_boxed(b) || *boxed_val_rel(b,b_base) != *aa)
+                if (is_flatmap(a)) {
+		    aa = flatmap_val(a);
+		    if (!is_boxed(b) || *boxed_val(b) != *aa)
 			goto not_equal;
-		    bb = flatmap_val_rel(b,b_base);
+		    bb = flatmap_val(b);
 		    sz = flatmap_get_size((flatmap_t*)aa);
 
 		    if (sz != flatmap_get_size((flatmap_t*)bb)) goto not_equal;
@@ -2862,11 +2876,11 @@ tailrecur_ne:
 		    goto term_array;
 
                 } else {
-		    if (!is_boxed(b) || *boxed_val_rel(b,b_base) != hdr)
+		    if (!is_boxed(b) || *boxed_val(b) != hdr)
 			goto not_equal;
 
-		    aa = hashmap_val_rel(a, a_base) + 1;
-		    bb = hashmap_val_rel(b, b_base) + 1;
+		    aa = hashmap_val(a) + 1;
+		    bb = hashmap_val(b) + 1;
 		    switch (hdr & _HEADER_MAP_SUBTAG_MASK) {
 		    case HAMT_SUBTAG_HEAD_ARRAY:
 			aa++; bb++;
@@ -2879,7 +2893,7 @@ tailrecur_ne:
 			ASSERT(sz > 0 && sz < 17);
 			break;
 		    default:
-			erl_exit(1, "Unknown hashmap subsubtag\n");
+			erts_exit(ERTS_ERROR_EXIT, "Unknown hashmap subsubtag\n");
 		    }
 		    goto term_array;
 		}
@@ -2899,7 +2913,7 @@ term_array: /* arrays in 'aa' and 'bb', length in 'sz' */
 	Eterm* bp = bb;
 	Sint i = sz;
 	for (;;) {
-	    if (!is_same(*ap,a_base,*bp,b_base)) break;
+	    if (!is_same(*ap,*bp)) break;
 	    if (--i == 0) goto pop_next;
 	    ++ap;
 	    ++bp;
@@ -2977,7 +2991,7 @@ static int cmpbytes(byte *s1, int l1, byte *s2, int l2)
 
 #define float_comp(x,y)    (((x)<(y)) ? -1 : (((x)==(y)) ? 0 : 1))
 
-static int cmp_atoms(Eterm a, Eterm b)
+int erts_cmp_atoms(Eterm a, Eterm b)
 {
     Atom *aa = atom_tab(atom_val(a));
     Atom *bb = atom_tab(atom_val(b));
@@ -2988,7 +3002,6 @@ static int cmp_atoms(Eterm a, Eterm b)
 		    bb->name+3, bb->len-3);
 }
 
-#if !HALFWORD_HEAP
 /* cmp(Eterm a, Eterm b)
  *  For compatibility with HiPE - arith-based compare.
  */
@@ -2996,39 +3009,22 @@ Sint cmp(Eterm a, Eterm b)
 {
     return erts_cmp(a, b, 0, 0);
 }
-#endif
 
-#if HALFWORD_HEAP
-static Sint erts_cmp_compound_rel_opt(Eterm a, Eterm* a_base,
-                                      Eterm b, Eterm* b_base,
-                                      int exact, int eq_only);
-#else
-static Sint erts_cmp_compound(Eterm a, Eterm b, int exact, int eq_only);
-#endif
+Sint erts_cmp_compound(Eterm a, Eterm b, int exact, int eq_only);
 
-#if HALFWORD_HEAP
-Sint erts_cmp_rel_opt(Eterm a, Eterm* a_base,
-                      Eterm b, Eterm* b_base,
-                      int exact, int eq_only)
-#else
 Sint erts_cmp(Eterm a, Eterm b, int exact, int eq_only)
-#endif
 {
     if (is_atom(a) && is_atom(b)) {
-        return cmp_atoms(a, b);
+        return erts_cmp_atoms(a, b);
     } else if (is_both_small(a, b)) {
         return (signed_val(a) - signed_val(b));
-    } else if (is_float_rel(a, a_base) && is_float_rel(b, b_base)) {
+    } else if (is_float(a) && is_float(b)) {
         FloatDef af, bf;
-        GET_DOUBLE_REL(a, af, a_base);
-        GET_DOUBLE_REL(b, bf, b_base);
+        GET_DOUBLE(a, af);
+        GET_DOUBLE(b, bf);
         return float_comp(af.fd, bf.fd);
     }
-#if HALFWORD_HEAP
-    return erts_cmp_compound_rel_opt(a,a_base,b,b_base,exact,eq_only);
-#else
     return erts_cmp_compound(a,b,exact,eq_only);
-#endif
 }
 
 
@@ -3036,13 +3032,7 @@ Sint erts_cmp(Eterm a, Eterm b, int exact, int eq_only)
  * exact = 1 -> term-based compare
  * exact = 0 -> arith-based compare
  */
-#if HALFWORD_HEAP
-static Sint erts_cmp_compound_rel_opt(Eterm a, Eterm* a_base,
-                                      Eterm b, Eterm* b_base,
-                                      int exact, int eq_only)
-#else
-static Sint erts_cmp_compound(Eterm a, Eterm b, int exact, int eq_only)
-#endif
+Sint erts_cmp_compound(Eterm a, Eterm b, int exact, int eq_only)
 {
 #define PSTACK_TYPE struct erts_cmp_hashmap_state
     struct erts_cmp_hashmap_state {
@@ -3099,7 +3089,7 @@ static Sint erts_cmp_compound(Eterm a, Eterm b, int exact, int eq_only)
     do {								\
 	if((AN) != (BN)) {						\
             if((AN)->sysname != (BN)->sysname)				\
-                RETURN_NEQ(cmp_atoms((AN)->sysname, (BN)->sysname));	\
+                RETURN_NEQ(erts_cmp_atoms((AN)->sysname, (BN)->sysname));	\
 	    ASSERT((AN)->creation != (BN)->creation);			\
 	    RETURN_NEQ(((AN)->creation < (BN)->creation) ? -1 : 1);	\
 	}								\
@@ -3109,7 +3099,7 @@ static Sint erts_cmp_compound(Eterm a, Eterm b, int exact, int eq_only)
 bodyrecur:
     j = 0;
 tailrecur:
-    if (is_same(a,a_base,b,b_base)) {	/* Equal values or pointers. */
+    if (is_same(a,b)) {	/* Equal values or pointers. */
 	goto pop_next;
     }
 tailrecur_ne:
@@ -3117,7 +3107,7 @@ tailrecur_ne:
     /* deal with majority (?) cases by brute-force */
     if (is_atom(a)) {
 	if (is_atom(b)) {
-	    ON_CMP_GOTO(cmp_atoms(a, b));
+	    ON_CMP_GOTO(erts_cmp_atoms(a, b));
 	}
     } else if (is_both_small(a, b)) {
 	ON_CMP_GOTO(signed_val(a) - signed_val(b));
@@ -3135,9 +3125,9 @@ tailrecur_ne:
 	    if (is_internal_port(b)) {
 		bnode = erts_this_node;
 		bdata = internal_port_data(b);
-	    } else if (is_external_port_rel(b,b_base)) {
-		bnode = external_port_node_rel(b,b_base);
-		bdata = external_port_data_rel(b,b_base);
+	    } else if (is_external_port(b)) {
+		bnode = external_port_node(b);
+		bdata = external_port_data(b);
 	    } else {
 		a_tag = PORT_DEF;
 		goto mixed_types;
@@ -3153,9 +3143,9 @@ tailrecur_ne:
 	    if (is_internal_pid(b)) {
 		bnode = erts_this_node;
 		bdata = internal_pid_data(b);
-	    } else if (is_external_pid_rel(b,b_base)) {
-		bnode = external_pid_node_rel(b,b_base);
-		bdata = external_pid_data_rel(b,b_base);
+	    } else if (is_external_pid(b)) {
+		bnode = external_pid_node(b);
+		bdata = external_pid_data(b);
 	    } else {
 		a_tag = PID_DEF;
 		goto mixed_types;
@@ -3188,12 +3178,12 @@ tailrecur_ne:
 	    a_tag = LIST_DEF;
 	    goto mixed_types;
 	}
-	aa = list_val_rel(a,a_base);
-	bb = list_val_rel(b,b_base);
+	aa = list_val(a);
+	bb = list_val(b);
 	while (1) {
 	    Eterm atmp = CAR(aa);
 	    Eterm btmp = CAR(bb);
-	    if (!is_same(atmp,a_base,btmp,b_base)) {
+	    if (!is_same(atmp,btmp)) {
 		WSTACK_PUSH2(stack,(UWord) CDR(bb),(UWord) CDR(aa));
 		a = atmp;
 		b = btmp;
@@ -3201,7 +3191,7 @@ tailrecur_ne:
 	    }
 	    atmp = CDR(aa);
 	    btmp = CDR(bb);
-	    if (is_same(atmp,a_base,btmp,b_base)) {
+	    if (is_same(atmp,btmp)) {
 		goto pop_next;
 	    }
 	    if (is_not_list(atmp) || is_not_list(btmp)) {
@@ -3209,20 +3199,20 @@ tailrecur_ne:
 		b = btmp;
 		goto tailrecur_ne;
 	    }
-	    aa = list_val_rel(atmp,a_base);
-	    bb = list_val_rel(btmp,b_base);
+	    aa = list_val(atmp);
+	    bb = list_val(btmp);
 	}
     case TAG_PRIMARY_BOXED:
 	{
-	    Eterm ahdr = *boxed_val_rel(a,a_base);
+	    Eterm ahdr = *boxed_val(a);
 	    switch ((ahdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
 	    case (_TAG_HEADER_ARITYVAL >> _TAG_PRIMARY_SIZE):
-		if (!is_tuple_rel(b,b_base)) {
+		if (!is_tuple(b)) {
 		    a_tag = TUPLE_DEF;
 		    goto mixed_types;
 		}
-		aa = tuple_val_rel(a,a_base);
-		bb = tuple_val_rel(b,b_base);
+		aa = tuple_val(a);
+		bb = tuple_val(b);
 		/* compare the arities */
 		i = arityval(ahdr);	/* get the arity*/
 		if (i != arityval(*bb)) {
@@ -3238,18 +3228,18 @@ tailrecur_ne:
 		{
                     struct erts_cmp_hashmap_state* sp;
                     if (is_flatmap_header(ahdr)) {
-                        if (!is_flatmap_rel(b,b_base)) {
-                            if (is_hashmap_rel(b,b_base)) {
-                                aa = (Eterm *)flatmap_val_rel(a,a_base);
-                                i = flatmap_get_size((flatmap_t*)aa) - hashmap_size_rel(b,b_base);
+                        if (!is_flatmap(b)) {
+                            if (is_hashmap(b)) {
+                                aa = (Eterm *)flatmap_val(a);
+                                i = flatmap_get_size((flatmap_t*)aa) - hashmap_size(b);
                                 ASSERT(i != 0);
                                 RETURN_NEQ(i);
                             }
                             a_tag = MAP_DEF;
                             goto mixed_types;
                         }
-                        aa = (Eterm *)flatmap_val_rel(a,a_base);
-                        bb = (Eterm *)flatmap_val_rel(b,b_base);
+                        aa = (Eterm *)flatmap_val(a);
+                        bb = (Eterm *)flatmap_val(b);
 
                         i = flatmap_get_size((flatmap_t*)aa);
                         if (i != flatmap_get_size((flatmap_t*)bb)) {
@@ -3276,21 +3266,21 @@ tailrecur_ne:
                             goto bodyrecur;
                         }
                     }
-		    if (!is_hashmap_rel(b,b_base)) {
-                        if (is_flatmap_rel(b,b_base)) {
-                            bb = (Eterm *)flatmap_val_rel(b,b_base);
-                            i = hashmap_size_rel(a,a_base) - flatmap_get_size((flatmap_t*)bb);
+		    if (!is_hashmap(b)) {
+                        if (is_flatmap(b)) {
+                            bb = (Eterm *)flatmap_val(b);
+                            i = hashmap_size(a) - flatmap_get_size((flatmap_t*)bb);
                             ASSERT(i != 0);
                             RETURN_NEQ(i);
                         }
 			a_tag = MAP_DEF;
 			goto mixed_types;
 		    }
-		    i = hashmap_size_rel(a,a_base) - hashmap_size_rel(b,b_base);
+		    i = hashmap_size(a) - hashmap_size(b);
 		    if (i) {
 			RETURN_NEQ(i);
 		    }
-                    if (hashmap_size_rel(a,a_base) == 0) {
+                    if (hashmap_size(a) == 0) {
                         goto pop_next;
                     }
 
@@ -3325,48 +3315,48 @@ tailrecur_ne:
                     goto bodyrecur;
 		}
 	    case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		if (!is_float_rel(b,b_base)) {
+		if (!is_float(b)) {
 		    a_tag = FLOAT_DEF;
 		    goto mixed_types;
 		} else {
 		    FloatDef af;
 		    FloatDef bf; 
 
-		    GET_DOUBLE_REL(a, af, a_base);
-		    GET_DOUBLE_REL(b, bf, b_base);
+		    GET_DOUBLE(a, af);
+		    GET_DOUBLE(b, bf);
 		    ON_CMP_GOTO(float_comp(af.fd, bf.fd));
 		}
 	    case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
 	    case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		if (!is_big_rel(b,b_base)) {
+		if (!is_big(b)) {
 		    a_tag = BIG_DEF;
 		    goto mixed_types;
 		}
-		ON_CMP_GOTO(big_comp(rterm2wterm(a,a_base), rterm2wterm(b,b_base)));
+		ON_CMP_GOTO(big_comp(a, b));
 	    case (_TAG_HEADER_EXPORT >> _TAG_PRIMARY_SIZE):
-		if (!is_export_rel(b,b_base)) {
+		if (!is_export(b)) {
 		    a_tag = EXPORT_DEF;
 		    goto mixed_types;
 		} else {
-		    Export* a_exp = *((Export **) (export_val_rel(a,a_base) + 1));
-		    Export* b_exp = *((Export **) (export_val_rel(b,b_base) + 1));
+		    Export* a_exp = *((Export **) (export_val(a) + 1));
+		    Export* b_exp = *((Export **) (export_val(b) + 1));
 
-		    if ((j = cmp_atoms(a_exp->code[0], b_exp->code[0])) != 0) {
+		    if ((j = erts_cmp_atoms(a_exp->code[0], b_exp->code[0])) != 0) {
 			RETURN_NEQ(j);
 		    }
-		    if ((j = cmp_atoms(a_exp->code[1], b_exp->code[1])) != 0) {
+		    if ((j = erts_cmp_atoms(a_exp->code[1], b_exp->code[1])) != 0) {
 			RETURN_NEQ(j);
 		    }
 		    ON_CMP_GOTO((Sint) a_exp->code[2] - (Sint) b_exp->code[2]);
 		}
 		break;
 	    case (_TAG_HEADER_FUN >> _TAG_PRIMARY_SIZE):
-		if (!is_fun_rel(b,b_base)) {
+		if (!is_fun(b)) {
 		    a_tag = FUN_DEF;
 		    goto mixed_types;
 		} else {
-		    ErlFunThing* f1 = (ErlFunThing *) fun_val_rel(a,a_base);
-		    ErlFunThing* f2 = (ErlFunThing *) fun_val_rel(b,b_base);
+		    ErlFunThing* f1 = (ErlFunThing *) fun_val(a);
+		    ErlFunThing* f2 = (ErlFunThing *) fun_val(b);
 		    Sint diff;
 
 		    diff = cmpbytes(atom_tab(atom_val(f1->fe->module))->name,
@@ -3398,29 +3388,29 @@ tailrecur_ne:
 		if (is_internal_pid(b)) {
 		    bnode = erts_this_node;
 		    bdata = internal_pid_data(b);
-		} else if (is_external_pid_rel(b,b_base)) {
-		    bnode = external_pid_node_rel(b,b_base);
-		    bdata = external_pid_data_rel(b,b_base);
+		} else if (is_external_pid(b)) {
+		    bnode = external_pid_node(b);
+		    bdata = external_pid_data(b);
 		} else {
 		    a_tag = EXTERNAL_PID_DEF;
 		    goto mixed_types;
 		}
-		anode = external_pid_node_rel(a,a_base);
-		adata = external_pid_data_rel(a,a_base);
+		anode = external_pid_node(a);
+		adata = external_pid_data(a);
 		goto pid_common;
 	    case (_TAG_HEADER_EXTERNAL_PORT >> _TAG_PRIMARY_SIZE):
 		if (is_internal_port(b)) {
 		    bnode = erts_this_node;
 		    bdata = internal_port_data(b);
-		} else if (is_external_port_rel(b,b_base)) {
-		    bnode = external_port_node_rel(b,b_base);
-		    bdata = external_port_data_rel(b,b_base);
+		} else if (is_external_port(b)) {
+		    bnode = external_port_node(b);
+		    bdata = external_port_data(b);
 		} else {
 		    a_tag = EXTERNAL_PORT_DEF;
 		    goto mixed_types;
 		}
-		anode = external_port_node_rel(a,a_base);
-		adata = external_port_data_rel(a,a_base);
+		anode = external_port_node(a);
+		adata = external_port_data(a);
 		goto port_common;
 	    case (_TAG_HEADER_REF >> _TAG_PRIMARY_SIZE):
 		/*
@@ -3428,14 +3418,13 @@ tailrecur_ne:
 		 * (32-bit words), *not* ref data words.
 		 */
 
-		
-		if (is_internal_ref_rel(b,b_base)) {
-		    RefThing* bthing = ref_thing_ptr_rel(b,b_base);
+		if (is_internal_ref(b)) {
+		    RefThing* bthing = ref_thing_ptr(b);
 		    bnode = erts_this_node;
 		    bnum = internal_thing_ref_numbers(bthing);
 		    blen = internal_thing_ref_no_of_numbers(bthing);
-		} else if(is_external_ref_rel(b,b_base)) {
-		    ExternalThing* bthing = external_thing_ptr_rel(b,b_base);
+		} else if(is_external_ref(b)) {
+		    ExternalThing* bthing = external_thing_ptr(b);
 		    bnode = bthing->node;
 		    bnum = external_thing_ref_numbers(bthing);
 		    blen = external_thing_ref_no_of_numbers(bthing);
@@ -3444,7 +3433,7 @@ tailrecur_ne:
 		    goto mixed_types;
 		}
 		{
-		    RefThing* athing = ref_thing_ptr_rel(a,a_base);
+		    RefThing* athing = ref_thing_ptr(a);
 		    anode = erts_this_node;
 		    anum = internal_thing_ref_numbers(athing);
 		    alen = internal_thing_ref_no_of_numbers(athing);
@@ -3477,13 +3466,13 @@ tailrecur_ne:
 			RETURN_NEQ((Sint32) (anum[i] - bnum[i]));
 		goto pop_next;
 	    case (_TAG_HEADER_EXTERNAL_REF >> _TAG_PRIMARY_SIZE):
-		if (is_internal_ref_rel(b,b_base)) {
-		    RefThing* bthing = ref_thing_ptr_rel(b,b_base);
+		if (is_internal_ref(b)) {
+		    RefThing* bthing = ref_thing_ptr(b);
 		    bnode = erts_this_node;
 		    bnum = internal_thing_ref_numbers(bthing);
 		    blen = internal_thing_ref_no_of_numbers(bthing);
-		} else if (is_external_ref_rel(b,b_base)) {
-		    ExternalThing* bthing = external_thing_ptr_rel(b,b_base);
+		} else if (is_external_ref(b)) {
+		    ExternalThing* bthing = external_thing_ptr(b);
 		    bnode = bthing->node;
 		    bnum = external_thing_ref_numbers(bthing);
 		    blen = external_thing_ref_no_of_numbers(bthing);
@@ -3492,7 +3481,7 @@ tailrecur_ne:
 		    goto mixed_types;
 		}
 		{
-		    ExternalThing* athing = external_thing_ptr_rel(a,a_base);
+		    ExternalThing* athing = external_thing_ptr(a);
 		    anode = athing->node;
 		    anum = external_thing_ref_numbers(athing);
 		    alen = external_thing_ref_no_of_numbers(athing);
@@ -3500,13 +3489,13 @@ tailrecur_ne:
 		goto ref_common;
 	    default:
 		/* Must be a binary */
-		ASSERT(is_binary_rel(a,a_base));
-		if (!is_binary_rel(b,b_base)) {
+		ASSERT(is_binary(a));
+		if (!is_binary(b)) {
 		    a_tag = BINARY_DEF;
 		    goto mixed_types;
 		} else {
-		    Uint a_size = binary_size_rel(a,a_base);
-		    Uint b_size = binary_size_rel(b,b_base);
+		    Uint a_size = binary_size(a);
+		    Uint b_size = binary_size(b);
 		    Uint a_bitsize;
 		    Uint b_bitsize;
 		    Uint a_bitoffs;
@@ -3515,8 +3504,8 @@ tailrecur_ne:
 		    int cmp;
 		    byte* a_ptr;
 		    byte* b_ptr;
-		    ERTS_GET_BINARY_BYTES_REL(a, a_ptr, a_bitoffs, a_bitsize, a_base);
-		    ERTS_GET_BINARY_BYTES_REL(b, b_ptr, b_bitoffs, b_bitsize, b_base);
+		    ERTS_GET_BINARY_BYTES(a, a_ptr, a_bitoffs, a_bitsize);
+		    ERTS_GET_BINARY_BYTES(b, b_ptr, b_bitoffs, b_bitsize);
 		    if ((a_bitsize | b_bitsize | a_bitoffs | b_bitoffs) == 0) {
 			min_size = (a_size < b_size) ? a_size : b_size;
 			if ((cmp = sys_memcmp(a_ptr, b_ptr, min_size)) != 0) {
@@ -3547,13 +3536,8 @@ tailrecur_ne:
     {
 	FloatDef f1, f2;
 	Eterm big;
-#if HALFWORD_HEAP
-	Wterm aw = is_immed(a) ? a : rterm2wterm(a,a_base);
-	Wterm bw = is_immed(b) ? b : rterm2wterm(b,b_base);
-#else
 	Eterm aw = a;
 	Eterm bw = b;
-#endif
 #define MAX_LOSSLESS_FLOAT ((double)((1LL << 53) - 2))
 #define MIN_LOSSLESS_FLOAT ((double)(((1LL << 53) - 2)*-1))
 #define BIG_ARITY_FLOAT_MAX (1024 / D_EXP) /* arity of max float as a bignum */
@@ -3625,7 +3609,7 @@ tailrecur_ne:
 		}
 	    } else {
 		big = double_to_big(f2.fd, big_buf, sizeof(big_buf)/sizeof(Eterm));
-		j = big_comp(aw, rterm2wterm(big,big_buf));
+		j = big_comp(aw, big);
 	    }
 	    if (_NUMBER_CODE(a_tag, b_tag) == FLOAT_BIG) {
 		j = -j;
@@ -3673,9 +3657,9 @@ term_array: /* arrays in 'aa' and 'bb', length in 'i' */
     while (--i) {
 	a = *aa++;
 	b = *bb++;
-	if (!is_same(a,a_base, b,b_base)) {
+	if (!is_same(a, b)) {
 	    if (is_atom(a) && is_atom(b)) {
-		if ((j = cmp_atoms(a, b)) != 0) {
+		if ((j = erts_cmp_atoms(a, b)) != 0) {
 		    goto not_equal;
 		}
 	    } else if (is_both_small(a, b)) {
@@ -3946,11 +3930,11 @@ void bin_write(int to, void *to_arg, byte* buf, size_t sz)
 /* Fill buf with the contents of bytelist list 
    return number of chars in list or -1 for error */
 
-int
-intlist_to_buf(Eterm list, char *buf, int len)
+Sint
+intlist_to_buf(Eterm list, char *buf, Sint len)
 {
     Eterm* listptr;
-    int sz = 0;
+    Sint sz = 0;
 
     if (is_nil(list)) 
 	return 0;
@@ -4365,7 +4349,7 @@ iolist_size(const int yield_support, ErtsIOListState *state, Eterm obj, ErlDrvSi
 {
     int res, init_yield_count, yield_count;
     Eterm* objp;
-    Uint size = (Uint) *sizep; /* Intentionally Uint due to halfword heap */
+    Uint size = (Uint) *sizep;
     DECLARE_ESTACK(s);
 
     if (!yield_support)
@@ -4497,11 +4481,12 @@ int erts_iolist_size(Eterm obj, ErlDrvSizeT* sizep)
     return iolist_size(0, NULL, obj, sizep);
 }
 
-/* return 0 if item is not a non-empty flat list of bytes */
-int
+/* return 0 if item is not a non-empty flat list of bytes
+   otherwise return the nonzero length of the list */
+Sint
 is_string(Eterm list)
 {
-    int len = 0;
+    Sint len = 0;
 
     while(is_list(list)) {
 	Eterm* consp = list_val(list);
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
index 3b6abec25e..ee14bd8bba 100644
--- a/erts/emulator/drivers/common/efile_drv.c
+++ b/erts/emulator/drivers/common/efile_drv.c
@@ -101,15 +101,9 @@
 #  include "config.h"
 #endif
 
-#ifndef __OSE__
 #include <ctype.h>
 #include <sys/types.h>
 #include <stdlib.h>
-#else
-#include "ctype.h"
-#include "sys/types.h"
-#include "stdlib.h"
-#endif
 
 /* Need (NON)BLOCKING macros for sendfile */
 #ifndef WANT_NONBLOCKING
@@ -125,8 +119,6 @@
 #include "dtrace-wrapper.h" 
 
 
-void erl_exit(int n, char *fmt, ...);
-
 static ErlDrvSysInfo sys_info;
 
 /* For explanation of this var, see comment for same var in erl_async.c */
@@ -515,21 +507,10 @@ struct t_data
 static void *ef_safe_alloc(Uint s)
 {
     void *p = EF_ALLOC(s);
-    if (!p) erl_exit(1, "efile drv: Can't allocate %lu bytes of memory\n", (unsigned long)s);
-    return p;
-}
-
-#if 0 /* Currently not used */
-
-static void *ef_safe_realloc(void *op, Uint s)
-{
-    void *p = EF_REALLOC(op, s);
-    if (!p) erl_exit(1, "efile drv: Can't reallocate %lu bytes of memory\n", (unsigned long)s);
+    if (!p) erts_exit(ERTS_ERROR_EXIT, "efile drv: Can't allocate %lu bytes of memory\n", (unsigned long)s);
     return p;
 }
 
-#endif
-
 /*********************************************************************
  * ErlIOVec manipulation functions.
  */
@@ -895,7 +876,7 @@ static void reply_Uint_posix_error(file_descriptor *desc, Uint num,
     TRACE_C('N');
 
     response[0] = FILE_RESP_NUMERR;
-#if SIZEOF_VOID_P == 4 || HALFWORD_HEAP
+#if SIZEOF_VOID_P == 4
     put_int32(0, response+1);
 #else
     put_int32(num>>32, response+1);
@@ -964,7 +945,7 @@ static int reply_Uint(file_descriptor *desc, Uint result) {
     TRACE_C('R');
 
     tmp[0] = FILE_RESP_NUMBER;
-#if SIZEOF_VOID_P == 4 || HALFWORD_HEAP
+#if SIZEOF_VOID_P == 4
     put_int32(0, tmp+1);
 #else
     put_int32(result>>32, tmp+1);
@@ -1532,10 +1513,10 @@ static void invoke_writev(void *data) {
 		     * with errno.
 		     */
 		    errno = EINVAL; 
-		    if (! (status = 
-			   erts_gzwrite((ErtsGzFile)d->fd,
-					iov[i].iov_base,
-					iov[i].iov_len)) == iov[i].iov_len) {
+		    status = erts_gzwrite((ErtsGzFile)d->fd,
+					  iov[i].iov_base,
+					  iov[i].iov_len) == iov[i].iov_len;
+		    if (! status) {
 			d->errInfo.posix_errno =
 			    d->errInfo.os_errno = errno; /* XXX Correct? */
 			break;
@@ -2919,12 +2900,12 @@ file_output(ErlDrvData e, char* buf, ErlDrvSizeT count)
 	    d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1
 			      + FILENAME_BYTELEN(buf + 9*4) + FILENAME_CHARSIZE);
 	    
-	    d->info.mode       = get_int32(buf +  0 * 4);
-	    d->info.uid        = get_int32(buf +  1 * 4);
-	    d->info.gid        = get_int32(buf +  2 * 4);
-	    d->info.accessTime = (time_t)((Sint64)get_int64(buf +  3 * 4));
-	    d->info.modifyTime = (time_t)((Sint64)get_int64(buf +  5 * 4));
-	    d->info.cTime      = (time_t)((Sint64)get_int64(buf +  7 * 4));
+	    d->info.mode       = get_int32(buf + 0 * 4);
+	    d->info.uid        = get_int32(buf + 1 * 4);
+	    d->info.gid        = get_int32(buf + 2 * 4);
+	    d->info.accessTime = get_int64(buf + 3 * 4);
+	    d->info.modifyTime = get_int64(buf + 5 * 4);
+	    d->info.cTime      = get_int64(buf + 7 * 4);
 
 	    FILENAME_COPY(d->b, buf + 9*4);
 #ifdef USE_VM_PROBES
diff --git a/erts/emulator/drivers/common/erl_efile.h b/erts/emulator/drivers/common/erl_efile.h
index be5a891486..7ffeed6b9d 100644
--- a/erts/emulator/drivers/common/erl_efile.h
+++ b/erts/emulator/drivers/common/erl_efile.h
@@ -105,9 +105,9 @@ typedef struct _Efile_info {
     Uint32 inode;		/* Inode number. */
     Uint32 uid;			/* User id of owner. */
     Uint32 gid;			/* Group id of owner. */
-    time_t accessTime;		/* Last time the file was accessed. */
-    time_t modifyTime;		/* Last time the file was modified. */
-    time_t cTime;		/* Creation time (Windows) or last
+    Sint64 accessTime;		/* Last time the file was accessed. */
+    Sint64 modifyTime;		/* Last time the file was modified. */
+    Sint64 cTime;		/* Creation time (Windows) or last
 				 * inode change (Unix).
 				 */
 } Efile_info;
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 89011d89ad..b219669ce5 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -94,10 +94,6 @@ typedef unsigned long long llu_t;
 #define INT16_MAX (32767)
 #endif
 
-#ifdef __OSE__
-#include "inet.h"
-#endif
-
 #ifdef __WIN32__
 #define  STRNCASECMP strncasecmp
 
@@ -298,139 +294,7 @@ static unsigned long one_value = 1;
 #define TCP_SHUT_RD    SD_RECEIVE
 #define TCP_SHUT_RDWR  SD_BOTH
 
-#elif defined (__OSE__)
-
-/*
- * Some notes about how inet (currently only tcp) works on OSE.
- * The driver uses OSE signals to communicate with the one_inet
- * process. Because of the difference in how signals and file descriptors
- * work the whole select/deselect mechanic is very different.
- * In ose when a sock_select is done a function is called. That function
- * notes the changes that the driver want to do, but does not act on it.
- * later when the function returns the new desired state is compared
- * to the previous state and the apprioriate actions are taken. The action
- * is usually to either request more data from the stack or stop requesting
- * data.
- *
- * One thing to note is that the driver never does select/deselect. It always
- * listens for the signals. Flow of data is regulated by sending or not sending
- * signals to the ose inet process.
- *
- * The interesting functions to look at are:
- *  * inet_driver_select : called when sock_select is called
- *  * tcp_inet_ose_dispatch_signal : checks state changes and sends new signals
- *  * tcp_inet_drv_output_ose : ready output callback, reads signals and calls
- *                              dispatch_signal
- *  * tcp_inet_drv_input_ose : ready input callback.
- */
-
-#include "efs.h"
-#include "sys/socket.h"
-#include "sys/uio.h"
-#include "sfk/sys/sfk_uio.h"
-#include "netinet/in.h"
-#include "netinet/tcp.h"
-#include "netdb.h"
-#include "ose_spi/socket.sig"
-
-
-static ssize_t writev_fallback(int fd, const struct iovec *iov, int iovcnt, int max_sz);
-
-#define INVALID_SOCKET -1
-#define INVALID_EVENT  -1
-#define SOCKET_ERROR   -1
-
-#define SOCKET int
-#define HANDLE int
-#define FD_READ         ERL_DRV_READ
-#define FD_WRITE        ERL_DRV_WRITE
-#define FD_CLOSE        0
-#define FD_CONNECT      (1<<4)
-#define FD_ACCEPT       (1<<5)
-#define SOCK_FD_ERROR   (1<<6)
-
-#define sock_connect(s, addr, len)  connect((s), (addr), (len))
-#define sock_listen(s, b)           listen((s), (b))
-#define sock_bind(s, addr, len)     bind((s), (addr), (len))
-#define sock_getopt(s,t,n,v,l)      getsockopt((s),(t),(n),(v),(l))
-#define sock_setopt(s,t,n,v,l)      setsockopt((s),(t),(n),(v),(l))
-#define sock_name(s, addr, len)     getsockname((s), (addr), (len))
-#define sock_peer(s, addr, len)     getpeername((s), (addr), (len))
-#define sock_ntohs(x)               ntohs((x))
-#define sock_ntohl(x)               ntohl((x))
-#define sock_htons(x)               htons((x))
-#define sock_htonl(x)               htonl((x))
-
-#define sock_accept(s, addr, len)   accept((s), (addr), (len))
-#define sock_send(s,buf,len,flag)   inet_send((s),(buf),(len),(flag))
-#define sock_sendto(s,buf,blen,flag,addr,alen) \
-	    sendto((s),(buf),(blen),(flag),(addr),(alen))
-#define sock_sendv(s, vec, size, np, flag) \
-	    (*(np) = writev_fallback((s), (struct iovec*)(vec), (size), (*(np))))
-#define sock_sendmsg(s,msghdr,flag) sendmsg((s),(msghdr),(flag))
-
-#define sock_open(af, type, proto)  socket((af), (type), (proto))
-#define sock_close(s)               close((s))
-#define sock_dup(s)                 dup((s))
-#define sock_shutdown(s, how)       shutdown((s), (how))
-
-#define sock_hostname(buf, len)     gethostname((buf), (len))
-#define sock_getservbyname(name,proto) getservbyname((name), (proto))
-#define sock_getservbyport(port,proto) getservbyport((port), (proto))
-
-#define sock_recv(s,buf,len,flag)   recv((s),(buf),(len),(flag))
-#define sock_recvfrom(s,buf,blen,flag,addr,alen) \
-                recvfrom((s),(buf),(blen),(flag),(addr),(alen))
-#define sock_recvmsg(s,msghdr,flag) recvmsg((s),(msghdr),(flag))
-
-#define sock_errno()                errno
-#define sock_create_event(d)        ((d)->s) /* return file descriptor */
-#define sock_close_event(e)                  /* do nothing */
-
-#ifndef WANT_NONBLOCKING
-#define WANT_NONBLOCKING
-#endif
-#include "sys.h"
-
-typedef unsigned long  u_long;
-#define  IN_CLASSA(a)      ((((in_addr_t)(a)) & 0x80000000) == 0)
-#define  IN_CLASSA_NET     0xff000000
-#define  IN_CLASSA_NSHIFT  24
-#define  IN_CLASSA_HOST    (0xffffffff & ~IN_CLASSA_NET)
-#define  IN_CLASSA_MAX     128
-
-#define  IN_CLASSB(a)      ((((in_addr_t)(a)) & 0xc0000000) == 0x80000000)
-#define  IN_CLASSB_NET     0xffff0000
-#define  IN_CLASSB_NSHIFT  16
-#define  IN_CLASSB_HOST    (0xffffffff & ~IN_CLASSB_NET)
-#define  IN_CLASSB_MAX     65536
-
-#define  IN_CLASSC(a)      ((((in_addr_t)(a)) & 0xe0000000) == 0xc0000000)
-#define  IN_CLASSC_NET     0xffffff00
-#define  IN_CLASSC_NSHIFT  8
-#define  IN_CLASSC_HOST    (0xffffffff & ~IN_CLASSC_NET)
-
-#define  IN_CLASSD(a)      ((((in_addr_t)(a)) & 0xf0000000) == 0xe0000000)
-#define  IN_MULTICAST(a)      IN_CLASSD(a)
-
-#define  IN_EXPERIMENTAL(a)   ((((in_addr_t)(a)) & 0xe0000000) == 0xe0000000)
-#define  IN_BADCLASS(a)    ((((in_addr_t)(a)) & 0xf0000000) == 0xf0000000)
-
-#define sock_select(d, flags, onoff) do { \
-        ASSERT(!(d)->is_ignored); \
-        (d)->event_mask = (onoff) ? \
-                 ((d)->event_mask | (flags)) : \
-                 ((d)->event_mask & ~(flags)); \
-        DEBUGF(("(%s / %d) sock_select(%ld): flags=%02X, onoff=%d, event_mask=%02lX, s=%d\r\n", \
-		__FILE__, __LINE__, (long) (d)->port, (flags), (onoff), (unsigned long) (d)->event_mask, (d)->s)); \
-        inet_driver_select((d), (flags), (onoff)); \
-   } while(0)
-
-#define TCP_SHUT_WR    SHUT_WR
-#define TCP_SHUT_RD    SHUT_RD
-#define TCP_SHUT_RDWR  SHUT_RDWR
-
-#else /* !__OSE__ && !__WIN32__ */
+#else /* !__WIN32__ */
 
 #include <sys/time.h>
 #ifdef NETDB_H_NEEDS_IN_H
@@ -704,7 +568,7 @@ static int my_strncasecmp(const char *s1, const char *s2, size_t n)
 #define TCP_SHUT_RD    SHUT_RD
 #define TCP_SHUT_RDWR  SHUT_RDWR
 
-#endif /* !__WIN32__ && !__OSE__ */
+#endif /* !__WIN32__ */
 
 #ifdef HAVE_SOCKLEN_T
 #  define SOCKLEN_T socklen_t
@@ -1048,7 +912,7 @@ typedef union {
 #endif
 
 typedef struct _multi_timer_data {
-    ErlDrvNowData when;
+    ErlDrvTime when;
     ErlDrvTermData caller;
     void (*timeout_function)(ErlDrvData drv_data, ErlDrvTermData caller);
     struct _multi_timer_data *next;
@@ -1168,13 +1032,6 @@ typedef struct {
     char *netns;                /* Socket network namespace name
 				   as full file path */
 #endif
-#ifdef __OSE__
-    int select_state;           /* state to keep track of whether we
-				   should trigger another read/write
-				   request at end of ready_input/output */
-    ErlDrvEvent events[6];
-#endif
-
 } inet_descriptor;
 
 
@@ -1190,10 +1047,8 @@ static void tcp_inet_stop(ErlDrvData);
 static void tcp_inet_command(ErlDrvData, char*, ErlDrvSizeT);
 static void tcp_inet_commandv(ErlDrvData, ErlIOVec*);
 static void tcp_inet_flush(ErlDrvData drv_data);
-#ifndef __OSE__
 static void tcp_inet_drv_input(ErlDrvData, ErlDrvEvent);
 static void tcp_inet_drv_output(ErlDrvData data, ErlDrvEvent event);
-#endif
 static ErlDrvData tcp_inet_start(ErlDrvPort, char* command);
 static ErlDrvSSizeT tcp_inet_ctl(ErlDrvData, unsigned int,
 				 char*, ErlDrvSizeT, char**, ErlDrvSizeT);
@@ -1206,71 +1061,6 @@ static void tcp_inet_event(ErlDrvData, ErlDrvEvent);
 static void find_dynamic_functions(void);
 #endif
 
-#ifdef __OSE__
-/* The structure of the signal used for requesting asynchronous 
- * notification from the stack. Under normal circumstances the network stack 
- * shouldn't overwrite the value set in the fd field by the sender 
- * of the request */
-struct OseAsyncSig {
-    struct FmEvent event;
-    int fd;
-};
-
-union SIGNAL {
-    SIGSELECT signo;
-    struct OseAsyncSig async;
-};
-
-static ErlDrvSSizeT tcp_inet_ctl_ose(ErlDrvData e, unsigned int cmd,
-				     char* buf, ErlDrvSizeT len,
-				     char** rbuf, ErlDrvSizeT rsize);
-static void tcp_inet_commandv_ose(ErlDrvData e, ErlIOVec* ev);
-static void tcp_inet_drv_output_ose(ErlDrvData data, ErlDrvEvent event);
-static void tcp_inet_drv_input_ose(ErlDrvData data, ErlDrvEvent event);
-static ErlDrvOseEventId inet_resolve_signal(union SIGNAL *sig);
-
-#ifdef INET_DRV_DEBUG
-
-static char *read_req = "SO_EVENT_READ_REQUEST";
-static char *read_rep = "SO_EVENT_READ_REPLY";
-static char *write_req = "SO_EVENT_WRITE_REQUEST";
-static char *write_rep = "SO_EVENT_WRITE_REPLY";
-static char *eof_req = "SO_EVENT_EOF_REQUEST";
-static char *eof_rep = "SO_EVENT_EOF_REPLY";
-static char *accept_req = "SO_EVENT_ACCEPT_REQUEST";
-static char *accept_rep = "SO_EVENT_ACCEPT_REPLY";
-static char *connect_req = "SO_EVENT_CONNECT_REQUEST";
-static char *connect_rep = "SO_EVENT_CONNECT_REPLY";
-static char *error_req = "SO_EVENT_ERROR_REQUEST";
-static char *error_rep = "SO_EVENT_ERROR_REPLY";
-static char signo_tmp[32];
-
-static char *signo_to_string(SIGSELECT signo) {
-  switch (signo) {
-  case SO_EVENT_READ_REQUEST: { return read_req; }
-  case SO_EVENT_READ_REPLY: { return read_rep; }
-  case SO_EVENT_WRITE_REQUEST: { return write_req; }
-  case SO_EVENT_WRITE_REPLY: { return write_rep; }
-  case SO_EVENT_EOF_REQUEST: { return eof_req; }
-  case SO_EVENT_EOF_REPLY: { return eof_rep; }
-  case SO_EVENT_ACCEPT_REQUEST: { return accept_req; }
-  case SO_EVENT_ACCEPT_REPLY: { return accept_rep; }
-  case SO_EVENT_CONNECT_REQUEST: { return connect_req; }
-  case SO_EVENT_CONNECT_REPLY: { return connect_rep; }
-  case SO_EVENT_ERROR_REQUEST: { return error_req; }
-  case SO_EVENT_ERROR_REPLY: { return error_rep; }
-  }
-
-  snprintf(signo_tmp,32,"0x%x",signo);
-
-  return signo_tmp;
-}
-
-#endif
-
-#endif /* __OSE__ */
-
-
 static struct erl_drv_entry tcp_inet_driver_entry =
 {
     tcp_inet_init,  /* inet_init will add this driver !! */
@@ -1280,9 +1070,6 @@ static struct erl_drv_entry tcp_inet_driver_entry =
 #ifdef __WIN32__
     tcp_inet_event,
     NULL,
-#elif defined(__OSE__)
-    tcp_inet_drv_input_ose, /*ready_input*/
-    tcp_inet_drv_output_ose, /*ready_output*/
 #else
     tcp_inet_drv_input,
     tcp_inet_drv_output,
@@ -1290,17 +1077,9 @@ static struct erl_drv_entry tcp_inet_driver_entry =
     "tcp_inet",
     NULL,
     NULL,
-#ifdef __OSE__
-    tcp_inet_ctl_ose,
-#else
     tcp_inet_ctl,
-#endif
     tcp_inet_timeout,
-#ifdef __OSE__
-    tcp_inet_commandv_ose,
-#else
     tcp_inet_commandv,
-#endif
     NULL,
     tcp_inet_flush,
     NULL,
@@ -1452,14 +1231,6 @@ static int packet_inet_output(udp_descriptor* udesc, HANDLE event);
 /* convert descriptor pointer to inet_descriptor pointer */
 #define INETP(d) (&(d)->inet)
 
-#ifdef __OSE__
-static void inet_driver_select(inet_descriptor* desc,
-			       int flags, int onoff);
-static void tcp_inet_ose_dispatch_signals(tcp_descriptor *desc,
-					  int prev_select_state,
-					  union SIGNAL *sig);
-#endif
-
 static int async_ref = 0;          /* async reference id generator */
 #define NEW_ASYNC_ID() ((async_ref++) & 0xffff)
 
@@ -1574,7 +1345,7 @@ static const struct in6_addr in6addr_loopback =
 #endif /* HAVE_IN6 */
 
 /* XXX: is this a driver interface function ??? */
-void erl_exit(int n, char*, ...);
+void erts_exit(int n, char*, ...);
 
 /*
  * Malloc wrapper,
@@ -1587,7 +1358,7 @@ void erl_exit(int n, char*, ...);
 static void *alloc_wrapper(ErlDrvSizeT size){
     void *ret = driver_alloc(size);
     if(ret == NULL) 
-	erl_exit(1,"Out of virtual memory in malloc (%s)", __FILE__);
+	erts_exit(ERTS_ERROR_EXIT,"Out of virtual memory in malloc (%s)", __FILE__);
     return ret;
 }
 #define ALLOC(X) alloc_wrapper(X)
@@ -1595,7 +1366,7 @@ static void *alloc_wrapper(ErlDrvSizeT size){
 static void *realloc_wrapper(void *current, ErlDrvSizeT size){
     void *ret = driver_realloc(current,size);
     if(ret == NULL) 
-	erl_exit(1,"Out of virtual memory in realloc (%s)", __FILE__);
+	erts_exit(ERTS_ERROR_EXIT,"Out of virtual memory in realloc (%s)", __FILE__);
     return ret;
 }
 #define REALLOC(X,Y) realloc_wrapper(X,Y)
@@ -1856,7 +1627,7 @@ check_double_release(InetDrvBufStk *bs, ErlDrvBinary* buf)
     int i;
     for (i = 0; i < bs->buf.pos; ++i) {
 	if (bs->buf.stk[i] == buf) {
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "Multiple buffer release in inet_drv, this "
 		     "is a bug, save the core and send it to "
 		     "[email protected]!");
@@ -4355,16 +4126,6 @@ static void desc_close(inet_descriptor* desc)
 	desc->forced_events = 0;
 	desc->send_would_block = 0;
 #endif
-#ifdef __OSE__
-	if (desc->events[0]) {
-	  driver_select(desc->port,desc->events[0],FD_READ|FD_WRITE|ERL_DRV_USE,0);
-	  driver_select(desc->port,desc->events[1],FD_READ|FD_WRITE|ERL_DRV_USE,0);
-	  driver_select(desc->port,desc->events[2],FD_READ|FD_WRITE|ERL_DRV_USE,0);
-	  driver_select(desc->port,desc->events[3],FD_READ|FD_WRITE|ERL_DRV_USE,0);
-	  driver_select(desc->port,desc->events[4],FD_READ|FD_WRITE|ERL_DRV_USE,0);
-	  driver_select(desc->port,desc->events[5],FD_READ|FD_WRITE|ERL_DRV_USE,0);
-	}
-#else
 	/*
 	 * We should close the fd here, but the other driver might still
 	 * be selecting on it.
@@ -4374,7 +4135,6 @@ static void desc_close(inet_descriptor* desc)
 			  ERL_DRV_USE, 0);
 	else
 	  inet_stop_select((ErlDrvEvent)(long)desc->event,NULL);
-#endif
 	desc->event = INVALID_EVENT; /* closed by stop_select callback */
 	desc->s = INVALID_SOCKET;
 	desc->event_mask = 0;
@@ -4416,65 +4176,6 @@ static int erl_inet_close(inet_descriptor* desc)
     return 0;
 }
 
-#ifdef __OSE__
-static void inet_select_init(inet_descriptor* desc)
-{
-    desc->events[0] =
-        erl_drv_ose_event_alloc(SO_EVENT_READ_REPLY,
-                desc->s,
-                inet_resolve_signal,
-                NULL);
-    driver_select(desc->port, desc->events[0],
-            ERL_DRV_READ|ERL_DRV_USE, 1);
-
-    desc->events[1] =
-        erl_drv_ose_event_alloc(SO_EVENT_EOF_REPLY,
-                desc->s,
-                inet_resolve_signal,
-                NULL);
-    driver_select(desc->port, desc->events[1],
-            ERL_DRV_READ|ERL_DRV_USE, 1);
-
-    desc->events[2] =
-        erl_drv_ose_event_alloc(SO_EVENT_ACCEPT_REPLY,
-                desc->s,
-                inet_resolve_signal,
-                NULL);
-    driver_select(desc->port, desc->events[2],
-            ERL_DRV_READ|ERL_DRV_USE, 1);
-
-    /* trigger tcp_inet_input */
-    desc->events[3] =
-        erl_drv_ose_event_alloc(SO_EVENT_WRITE_REPLY,
-                desc->s,
-                inet_resolve_signal,
-                NULL);
-    driver_select(desc->port, desc->events[3],
-            ERL_DRV_WRITE|ERL_DRV_USE, 1);
-
-    desc->events[4] =
-        erl_drv_ose_event_alloc(SO_EVENT_CONNECT_REPLY,
-                desc->s,
-                inet_resolve_signal,
-                NULL);
-    driver_select(desc->port, desc->events[4],
-            ERL_DRV_WRITE|ERL_DRV_USE, 1);
-
-    desc->events[5] =
-        erl_drv_ose_event_alloc(SO_EVENT_ERROR_REPLY,
-                desc->s,
-                inet_resolve_signal,
-                NULL);
-    driver_select(desc->port, desc->events[5],
-            ERL_DRV_WRITE|ERL_DRV_USE, 1);
-
-    /* Issue a select on error event before any other select to be sure we are
-       prepared to receive error notifications from the stack, even in the
-       situations when select isn't issued */
-    sock_select(desc, SOCK_FD_ERROR, 1);
-}
-#endif
-
 static ErlDrvSSizeT inet_ctl_open(inet_descriptor* desc, int domain, int type,
 				  char** rbuf, ErlDrvSizeT rsize)
 {
@@ -4557,9 +4258,6 @@ static ErlDrvSSizeT inet_ctl_open(inet_descriptor* desc, int domain, int type,
 #ifdef __WIN32__
     driver_select(desc->port, desc->event, ERL_DRV_READ, 1);
 #endif
-#ifdef __OSE__
-    inet_select_init(desc);
-#endif
 
     desc->state = INET_STATE_OPEN;
     desc->stype = type;
@@ -4583,13 +4281,7 @@ static ErlDrvSSizeT inet_ctl_fdopen(inet_descriptor* desc, int domain, int type,
         if (name.sa.sa_family != domain)
             return ctl_error(EINVAL, rbuf, rsize);
     }
-#ifdef __OSE__        
-    /* for fdopen duplicating the sd will allow to uniquely identify
-       the signal from OSE with erlang port */
-    desc->s = sock_dup(s);    
-#else
     desc->s = s;
-#endif
 
     if ((desc->event = sock_create_event(desc)) == INVALID_EVENT)
 	return ctl_error(sock_errno(), rbuf, rsize);
@@ -4607,12 +4299,6 @@ static ErlDrvSSizeT inet_ctl_fdopen(inet_descriptor* desc, int domain, int type,
 	sz = sizeof(name);
 	if (!IS_SOCKET_ERROR(sock_peer(s, (struct sockaddr*) &name, &sz))) {
 	    desc->state = INET_STATE_CONNECTED;
-#ifdef __OSE__
-            /* since we are dealing with different descriptors (i.e. inet and
-               socket) the select part should be initialized with the right
-               values */
-            inet_select_init(desc);
-#endif
         }
     }
 
@@ -7117,7 +6803,7 @@ static ErlDrvSSizeT inet_fill_opts(inet_descriptor* desc,
     do {						\
 	ErlDrvSizeT new_need = ((Ptr) - (*dest)) + (Size);	\
 	if (new_need > dest_used) {			\
-	    erl_exit(1,"Internal error in inet_drv, "	\
+	    erts_exit(ERTS_ERROR_EXIT,"Internal error in inet_drv, "	\
 		     "miscalculated buffer size");	\
 	}						\
 	dest_used = new_need;				\
@@ -7494,7 +7180,7 @@ static ErlDrvSSizeT sctp_fill_opts(inet_descriptor* desc,
     do {                                                        \
 	int need;                                               \
 	if ((Index) > spec_allocated) {                         \
-	    erl_exit(1,"Internal error in inet_drv, "           \
+	    erts_exit(ERTS_ERROR_EXIT,"Internal error in inet_drv, "           \
 		     "miscalculated buffer size");              \
 	}                                                       \
 	need = (Index) + (N);                                   \
@@ -8414,15 +8100,6 @@ static ErlDrvData inet_start(ErlDrvPort port, int size, int protocol)
 #ifdef HAVE_SETNS
     desc->netns = NULL;
 #endif
-#ifdef __OSE__
-    desc->select_state = 0;
-    desc->events[0] = NULL;
-    desc->events[1] = NULL;
-    desc->events[2] = NULL;
-    desc->events[3] = NULL;
-    desc->events[4] = NULL;
-    desc->events[5] = NULL;
-#endif
 
     return (ErlDrvData)desc;
 }
@@ -9149,10 +8826,6 @@ static tcp_descriptor* tcp_inet_copy(tcp_descriptor* desc,SOCKET s,
     copy_desc->inet.port = port;
     copy_desc->inet.dport = driver_mk_port(port);
 
-#ifdef __OSE__
-    inet_select_init(&copy_desc->inet);
-#endif
-
     *err = 0;
     return copy_desc;
 }
@@ -9214,23 +8887,6 @@ static void tcp_inet_stop(ErlDrvData e)
     inet_stop(INETP(desc));
 }
 
-#ifdef __OSE__
-
-static ErlDrvSSizeT tcp_inet_ctl_ose(ErlDrvData e, unsigned int cmd,
-				     char* buf, ErlDrvSizeT len,
-				     char** rbuf, ErlDrvSizeT rsize) {
-
-  tcp_descriptor* desc = (tcp_descriptor*)e;
-  int prev_select_state = INETP(desc)->select_state;
-
-  ErlDrvSSizeT res = tcp_inet_ctl(e,cmd,buf,len,rbuf,rsize);
-
-  tcp_inet_ose_dispatch_signals((tcp_descriptor*)e,prev_select_state,NULL);
-
-  return res;
-}
-#endif
-
 /* TCP requests from Erlang */
 static ErlDrvSSizeT tcp_inet_ctl(ErlDrvData e, unsigned int cmd,
 				 char* buf, ErlDrvSizeT len,
@@ -9672,17 +9328,6 @@ static void tcp_inet_command(ErlDrvData e, char *buf, ErlDrvSizeT len)
     DEBUGF(("tcp_inet_command(%ld) }\r\n", (long)desc->inet.port)); 
 }
 
-#ifdef __OSE__
-
-static void tcp_inet_commandv_ose(ErlDrvData e, ErlIOVec* ev) {
-  int prev_select_state = INETP((tcp_descriptor*)e)->select_state;
-  tcp_inet_commandv(e, ev);
-  tcp_inet_ose_dispatch_signals((tcp_descriptor*)e,prev_select_state,NULL);
-}
-
-#endif
-
-
 static void tcp_inet_commandv(ErlDrvData e, ErlIOVec* ev)
 {
     tcp_descriptor* desc = (tcp_descriptor*)e;
@@ -9755,22 +9400,6 @@ static void inet_stop_select(ErlDrvEvent event, void* _)
 {
 #ifdef __WIN32__
     WSACloseEvent((HANDLE)event);
-#elif defined(__OSE__)
-    ErlDrvOseEventId id;
-    union SIGNAL *sig;
-    erl_drv_ose_event_fetch(event, NULL, &id,NULL);
-    DEBUGF(("inet_stop_select(?#?) {s=%d\n",id));
-    sock_close((int)id);
-    /* On socket close all the signals waiting to be processed as part of the
-       select should be deallocated */
-    while((sig = erl_drv_ose_get_signal(event))) {
-      DEBUGF(("inet_stop_select(?#?): Freeing signal %s\n",
-	      signo_to_string(sig->signo)));
-      free_buf(&sig);
-    }
-    erl_drv_ose_event_free(event);
-    DEBUGF(("inet_stop_select(?#?) }\n"));
-      
 #else
     sock_close((SOCKET)(long)event);
 #endif
@@ -10319,146 +9948,7 @@ static void tcp_inet_event(ErlDrvData e, ErlDrvEvent event)
     return;
 }
 
-#elif defined(__OSE__) /* !__WIN32__ */
-/* The specific resolve signal function. It will return the socket descriptor
-   for which the select was issued */
-static ErlDrvOseEventId inet_resolve_signal(union SIGNAL *sig) {
-  DEBUGF(("%s(?#?): s=%d got signal %s, status = %d, extra = %d, sender = 0x%x\n",
-	  __FUNCTION__,sig->async.fd,signo_to_string(sig->signo),
-	  sig->async.event.status,
-	  sig->async.event.extra,sender(&sig)));
-  if (sig->signo == SO_EVENT_READ_REPLY ||
-      sig->signo == SO_EVENT_ACCEPT_REPLY ||
-      sig->signo == SO_EVENT_EOF_REPLY ||
-      sig->signo == SO_EVENT_WRITE_REPLY ||
-      sig->signo == SO_EVENT_ERROR_REPLY ||
-      sig->signo == SO_EVENT_CONNECT_REPLY ) {
-    return sig->async.fd;
-  }
-
-  return -1;
-}
-
-static void inet_driver_select(inet_descriptor* desc,
-			       int flags, int onoff) {
-    ASSERT(!desc->is_ignored);
-
-    if(onoff) {
-      desc->select_state |= flags;
-    } else {
-      desc->select_state &= ~flags;
-    }
-}
-
-static ssize_t writev_fallback(int fd, const struct iovec *iov, int iovcnt, int max_sz)
-{
-    size_t data_len = 0;
-    size_t sent = 0;
-    ssize_t n;
-    int i;
-
-    for(i = 0; i < iovcnt; i++)
-    {
-        data_len = iov[i].iov_len;
-tryagain:        
-        n = sock_send(fd, iov[i].iov_base, data_len, 0);
-        if (IS_SOCKET_ERROR(n)) {
-            /* If buffer length is greater than the amount stack is able to
-             * send out then try to send at least max_sz (this comes with
-             * SO_EVENT_WRITE_REPLY signal*/
-            if ((errno == EMSGSIZE) && (max_sz > 0) && (data_len > max_sz)) {
-                data_len = max_sz;
-                goto tryagain;
-            }
-            break;
-        }
-        sent += n;
-    }
-    return sent;
-}
-
-#define OSE_EVENT_REQ(TCP_DESC,EVENT) do {				\
-    union SIGNAL *sig = alloc(sizeof(struct OseAsyncSig), EVENT);	\
-    sig->async.fd = INETP(TCP_DESC)->s;					\
-    ose_request_event(INETP(TCP_DESC)->s, &sig, 1);			\
-    DEBUGF(("%s(%ld): s=%d sent %s\r\n",__FUNCTION__,			\
-      INETP(TCP_DESC)->port,INETP(TCP_DESC)->s,signo_to_string(EVENT))); \
-  } while(0)
-
-static void tcp_inet_ose_dispatch_signals(tcp_descriptor *desc,
-					  int prev_select_state,
-					  union SIGNAL *sig) {
-  if (sig) {
-    DEBUGF(("tcp_inet_ose_dispatch_signals(%ld) {s=%d resend\r\n",
-	    (long)INETP(desc)->port,INETP(desc)->s));
-    /* We are reacting to a signal, which means that if
-       the select_state for that signal is still activated
-       we should send a new signal */
-    switch (sig->signo) {
-    case SO_EVENT_READ_REPLY: {
-      if (INETP(desc)->select_state & FD_READ)
-	OSE_EVENT_REQ(desc,SO_EVENT_READ_REQUEST);
-      break;
-    }
-    case SO_EVENT_WRITE_REPLY: {
-      if (INETP(desc)->select_state & FD_WRITE)
-	OSE_EVENT_REQ(desc,SO_EVENT_WRITE_REQUEST);
-      break;
-    }
-    case SO_EVENT_CONNECT_REPLY: {
-      if (INETP(desc)->select_state & FD_CONNECT)
-	OSE_EVENT_REQ(desc,SO_EVENT_CONNECT_REQUEST);
-      break;
-    }
-    case SO_EVENT_ACCEPT_REPLY: {
-      if (INETP(desc)->select_state & FD_ACCEPT)
-	OSE_EVENT_REQ(desc,SO_EVENT_ACCEPT_REQUEST);
-      break;
-    }
-    case SO_EVENT_ERROR_REPLY: {
-      if (INETP(desc)->select_state & SOCK_FD_ERROR)
-	OSE_EVENT_REQ(desc,SO_EVENT_ERROR_REQUEST);
-      break;
-    }
-
-    }
-    DEBUGF(("tcp_inet_ose_dispatch_signals(%ld) }\r\n",
-	    (long)INETP(desc)->port));
-  }
-
-  if (INETP(desc)->select_state != prev_select_state) {
-    /* If the select state has changed we have to issue signals for
-       the state parts that have changed. */
-    int xor_select_state = INETP(desc)->select_state ^ prev_select_state;
-    DEBUGF(("tcp_inet_ose_dispatch_signals(%ld) {s=%d select change\r\n",
-	    (long)INETP(desc)->port,INETP(desc)->s));
-    if ((xor_select_state & FD_READ) &&
-	(INETP(desc)->select_state & FD_READ)) {
-      OSE_EVENT_REQ(desc,SO_EVENT_READ_REQUEST);
-    }
-    if ((xor_select_state & FD_WRITE) &&
-	(INETP(desc)->select_state & FD_WRITE)) {
-      OSE_EVENT_REQ(desc,SO_EVENT_WRITE_REQUEST);
-    }
-    if ((xor_select_state & FD_CONNECT) &&
-	(INETP(desc)->select_state & FD_CONNECT)) {
-      OSE_EVENT_REQ(desc,SO_EVENT_CONNECT_REQUEST);
-    }
-    if ((xor_select_state & FD_ACCEPT) &&
-	(INETP(desc)->select_state & FD_ACCEPT)) {
-      OSE_EVENT_REQ(desc,SO_EVENT_ACCEPT_REQUEST);
-    }
-    if ((xor_select_state & SOCK_FD_ERROR) &&
-	(INETP(desc)->select_state & SOCK_FD_ERROR)) {
-      OSE_EVENT_REQ(desc,SO_EVENT_ERROR_REQUEST);
-    }
-
-    DEBUGF(("tcp_inet_ose_dispatch_signals(%ld) }\r\n",
-	    (long)INETP(desc)->port));
-  }
-}
-
-#endif /* __OSE__ */
+#endif /* __WIN32__ */
 
 
 /* socket has input:
@@ -10945,49 +10435,6 @@ static void tcp_shutdown_async(tcp_descriptor* desc)
 	desc->tcp_add_flags |= TCP_ADDF_SHUTDOWN_WR_DONE;
 }
 
-#ifdef __OSE__
-
-static void tcp_inet_drv_output_ose(ErlDrvData data, ErlDrvEvent event)
-{
-  union SIGNAL *event_sig = erl_drv_ose_get_signal(event);
-
-  while (event_sig) {
-      int prev_select_state = INETP((tcp_descriptor*)data)->select_state;
-      int res = tcp_inet_output((tcp_descriptor*)data, (HANDLE)event_sig);
-      if (res != -1) {
-	tcp_inet_ose_dispatch_signals((tcp_descriptor*)data,
-				      prev_select_state,event_sig);
-	free_buf(&event_sig);
-	event_sig = erl_drv_ose_get_signal(event);
-      } else {
-	/* NOTE: here the event object could have been deallocated!!!!
-	   inet_stop_select is called when doing driver_select(ERL_DRV_USE,0)
-	 */
-	free_buf(&event_sig);
-	return;
-      }
-  }
-}
-
-static void tcp_inet_drv_input_ose(ErlDrvData data, ErlDrvEvent event)
-{
-  union SIGNAL *event_sig = erl_drv_ose_get_signal(event);
-
-  while (event_sig) {
-    int prev_select_state = INETP((tcp_descriptor*)data)->select_state;
-    int res = tcp_inet_input((tcp_descriptor*)data, (HANDLE)event);
-    if (res != -1) {
-      tcp_inet_ose_dispatch_signals((tcp_descriptor*)data, prev_select_state,
-				    event_sig);
-      free_buf(&event_sig);
-      event_sig = erl_drv_ose_get_signal(event);
-    } else {
-      free_buf(&event_sig);
-      return;
-    }
-  }
-}
-#else
 static void tcp_inet_drv_output(ErlDrvData data, ErlDrvEvent event)
 {
     (void)tcp_inet_output((tcp_descriptor*)data, (HANDLE)event);
@@ -10997,7 +10444,6 @@ static void tcp_inet_drv_input(ErlDrvData data, ErlDrvEvent event)
 {
     (void)tcp_inet_input((tcp_descriptor*)data, (HANDLE)event);
 }
-#endif
 
 /* socket ready for ouput:
 ** 1. INET_STATE_CONNECTING => non block connect ?
@@ -11063,13 +10509,6 @@ static int tcp_inet_output(tcp_descriptor* desc, HANDLE event)
 	    ssize_t n;
 	    SysIOVec* iov;
 
-#ifdef __OSE__
-            /* For large size buffers case the amount of data that the stack is
-               able to send out (received in the .extra field) should be passed
-               down to writev_fallback */
-            n = event ? ((union SIGNAL*)event)->async.event.extra : 0;
-#endif
-
 	    if ((iov = driver_peekq(ix, &vsize)) == NULL) {
 		sock_select(INETP(desc), FD_WRITE, 0);
 		send_empty_out_q_msgs(INETP(desc));
@@ -11097,12 +10536,6 @@ static int tcp_inet_output(tcp_descriptor* desc, HANDLE event)
 				    sizes > (max 32 bit signed int) */
 	      size_t howmuch = 0x7FFFFFFF; /* max signed 32 bit */
 	      int x;
-#ifdef __OSE__
-              /* For EWOULDBLOCK sock_sendv returns 0 so we have to be sure it
-                 wasn't the case */
-              if(sock_errno() == ERRNO_BLOCK) 
-                    goto done;
-#endif
 	      for(x = 0; x < vsize && iov[x].iov_len == 0; ++x)
 		;
 	      if (x < vsize) {
@@ -12144,115 +11577,18 @@ make_noninheritable_handle(SOCKET s)
  * Multi-timers
  */
 
-static void absolute_timeout(unsigned millis, ErlDrvNowData *out)
-{
-    unsigned rest;
-    unsigned long millipart;
-    unsigned long secpart;
-    unsigned long megasecpart;
-    unsigned tmo_secs = (millis / 1000U);
-    unsigned tmo_millis = (millis % 1000);
-    driver_get_now(out);
-    rest = (out->microsecs) % 1000;
-    millipart = ((out->microsecs) / 1000UL);
-    if (rest >= 500) {
-	++millipart;
-    }
-    secpart = out->secs;
-    megasecpart = out->megasecs;
-    millipart += tmo_millis;
-    secpart += (millipart / 1000000UL);
-    millipart %= 1000000UL;
-    secpart += tmo_secs;
-    megasecpart += (secpart / 1000000UL);
-    secpart %= 1000000UL;
-    out->megasecs = megasecpart;
-    out->secs = secpart;
-    out->microsecs = (millipart * 1000UL);
-}
-
-static unsigned relative_timeout(ErlDrvNowData *in) 
-{
-    ErlDrvNowData now;
-    unsigned rest;
-    unsigned long millipart, in_millis, in_secs, in_megasecs;
-
-    driver_get_now(&now);
-
-    in_secs = in->secs;
-    in_megasecs = in->megasecs;
-
-    rest = (now.microsecs) % 1000;
-    millipart = ((now.microsecs) / 1000UL);
-    if (rest >= 500) {
-	++millipart;
-    }
-    in_millis = ((in->microsecs) / 1000UL);
-    if ( in_millis < millipart ) {
-	if (in_secs > 0) {
-	    --in_secs;
-	} else {
-	    in_secs = (1000000UL - 1UL);
-	    if (in_megasecs <= now.megasecs) {
-		return 0;
-	    } else {
-		--in_megasecs;
-	    }
-	}
-	in_millis += 1000UL;
-    }
-    in_millis -= millipart;
-    
-    if (in_secs < now.secs) {
-	if (in_megasecs <= now.megasecs) {
-	    return 0;
-	} else {
-	    --in_megasecs;
-	}
-	in_secs += 1000000;
-    }
-    in_secs -= now.secs;
-    if (in_megasecs < now.megasecs) {
-	return 0;
-    } else {
-	in_megasecs -= now.megasecs;
-    }
-    return (unsigned) ((in_megasecs * 1000000000UL) + 
-		       (in_secs * 1000UL) + 
-		       in_millis);
-}
-
-#ifdef DEBUG
-static int nowcmp(ErlDrvNowData *d1, ErlDrvNowData *d2)
-{
-    /* Assume it's not safe to do signed conversion on megasecs... */
-    if (d1->megasecs < d2->megasecs) {
-	return -1;
-    } else if (d1->megasecs > d2->megasecs) {
-	return 1;
-    } else if (d1->secs != d2->secs) {
-	return ((int) d1->secs) - ((int) d2->secs);
-    } 
-    return ((int) d1->microsecs) - ((int) d2->microsecs);
-}
-#endif
-
 static void fire_multi_timers(MultiTimerData **first, ErlDrvPort port,
 			      ErlDrvData data)
 {
-    unsigned next_timeout;
+    ErlDrvTime next_timeout;
     if (!*first) {
 	ASSERT(0);
 	return;
     }
 #ifdef DEBUG
     {
-	ErlDrvNowData chk;
-	driver_get_now(&chk);
-	chk.microsecs /= 10000UL;
-	chk.microsecs *= 10000UL;
-	chk.microsecs += 10000;
-	ASSERT(nowcmp(&chk,&((*first)->when)) >= 0);
+	ErlDrvTime chk = erl_drv_monotonic_time(ERL_DRV_MSEC);
+	ASSERT(chk >= (*first)->when);
     }
 #endif
     do {
@@ -12264,9 +11600,9 @@ static void fire_multi_timers(MultiTimerData **first, ErlDrvPort port,
 	    return;
 	}
 	(*first)->prev = NULL;
-	next_timeout = relative_timeout(&((*first)->when));
-    } while (next_timeout == 0);
-    driver_set_timer(port,next_timeout);
+	next_timeout = (*first)->when - erl_drv_monotonic_time(ERL_DRV_MSEC);
+    } while (next_timeout <= 0);
+    driver_set_timer(port, (unsigned long) next_timeout);
 }
 
 static void clean_multi_timers(MultiTimerData **first, ErlDrvPort port)
@@ -12289,8 +11625,10 @@ static void remove_multi_timer(MultiTimerData **first, ErlDrvPort port, MultiTim
 	driver_cancel_timer(port);
 	*first = p->next;
 	if (*first) {
-	    unsigned ntmo = relative_timeout(&((*first)->when));
-	    driver_set_timer(port,ntmo);
+	    ErlDrvTime ntmo = (*first)->when - erl_drv_monotonic_time(ERL_DRV_MSEC);
+	    if (ntmo < 0)
+		ntmo = 0;
+	    driver_set_timer(port, (unsigned long) ntmo);
 	}
     }
     if (p->next != NULL) {
@@ -12304,26 +11642,14 @@ static MultiTimerData *add_multi_timer(MultiTimerData **first, ErlDrvPort port,
 				       void (*timeout_fun)(ErlDrvData drv_data, 
 							   ErlDrvTermData caller))
 {
-#define eq_mega(a, b) ((a)->when.megasecs == (b)->when.megasecs)
-#define eq_sec(a, b) ((a)->when.secs == (b)->when.secs)
     MultiTimerData *mtd, *p, *s;
     mtd = ALLOC(sizeof(MultiTimerData));
-    absolute_timeout(timeout, &(mtd->when));
+    mtd->when = erl_drv_monotonic_time(ERL_DRV_MSEC) + ((ErlDrvTime) timeout) + 1;
     mtd->timeout_function = timeout_fun;
     mtd->caller = caller;
     mtd->next = mtd->prev = NULL;
     for(p = *first,s = NULL; p != NULL; s = p, p = p->next) {
-	if (p->when.megasecs >= mtd->when.megasecs) {
-	    break;
-	}
-    }
-    for (; p!= NULL && eq_mega(p, mtd); s = p, p = p->next) {
-	if (p->when.secs >= mtd->when.secs) {
-	    break;
-	}
-    }
-    for (; p!= NULL && eq_mega(p, mtd) && eq_sec(p, mtd); s = p, p = p->next) {
-	if (p->when.microsecs >= mtd->when.microsecs) {
+	if (p->when >= mtd->when) {
 	    break;
 	}
     }
@@ -12353,12 +11679,6 @@ static MultiTimerData *add_multi_timer(MultiTimerData **first, ErlDrvPort port,
     }
     return mtd;
 }
-#undef eq_mega
-#undef eq_sec
-	
-
-
-
 
 /*-----------------------------------------------------------------------------
 
diff --git a/erts/emulator/drivers/ose/ose_efile.c b/erts/emulator/drivers/ose/ose_efile.c
deleted file mode 100644
index c8337a95d5..0000000000
--- a/erts/emulator/drivers/ose/ose_efile.c
+++ /dev/null
@@ -1,1125 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 1997-2012. 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: Provides file and directory operations for OSE.
- */
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#if defined(HAVE_POSIX_FALLOCATE) && !defined(__sun) && !defined(__sun__)
-#define _XOPEN_SOURCE 600
-#endif
-#if !defined(_GNU_SOURCE) && defined(HAVE_LINUX_FALLOC_H)
-#define _GNU_SOURCE
-#endif
-#include "sys.h"
-#include "erl_driver.h"
-#include "erl_efile.h"
-#if defined(DARWIN) || defined(HAVE_LINUX_FALLOC_H) || defined(HAVE_POSIX_FALLOCATE)
-#include "fcntl.h"
-#endif
-#include "ose.h"
-#include "unistd.h"
-#include "sys/stat.h"
-#include "dirent.h"
-#include "sys/time.h"
-#include "time.h"
-#include "assert.h"
-
-/* Find a definition of MAXIOV, that is used in the code later. */
-#if defined IOV_MAX
-#define MAXIOV IOV_MAX
-#elif defined UIO_MAXIOV
-#define MAXIOV UIO_MAXIOV
-#else
-#define MAXIOV 16
-#endif
-
-/*
- * Macros for testing file types.
- */
-
-#define ISDIR(st) (((st).st_mode & S_IFMT) == S_IFDIR)
-#define ISREG(st) (((st).st_mode & S_IFMT) == S_IFREG)
-#define ISDEV(st) \
-    (((st).st_mode&S_IFMT) == S_IFCHR || ((st).st_mode&S_IFMT) == S_IFBLK)
-#define ISLNK(st) (((st).st_mode & S_IFLNK) == S_IFLNK)
-#ifdef NO_UMASK
-#define FILE_MODE 0644
-#define DIR_MODE  0755
-#else
-#define FILE_MODE 0666
-#define DIR_MODE  0777
-#endif
-
-#define IS_DOT_OR_DOTDOT(s) \
-    (s[0] == '.' && (s[1] == '\0' || (s[1] == '.' && s[2] == '\0')))
-
-/*
- * Macros for handling local file descriptors
- * and mutexes.
- *
- * Handling of files like this is necessary because OSE
- * does not allow seeking after the end of a file. So
- * what we do it emulate this by keeping track of the size
- * of the file and where the file's positions is. If a
- * write happens after eof then we pad it.
- *
- * Given time this should be rewritten to get rid of the
- * mutex and use the port lock to protect the data. This
- * could be done be done by adapting the efile api for some
- * calls to allow some meta-data to be associated with the
- * open file.
- */
-
-#define L_FD_IS_VALID(fd_data) ((fd_data)->beyond_eof > 0)
-#define L_FD_INVALIDATE(fd_data) (fd_data)->beyond_eof = 0
-#define L_FD_CUR(fd_data) (fd_data)->pos
-#define L_FD_OFFS_BEYOND_EOF(fd_data, offs) \
-    (((fd_data)->size > offs) ? 0 : 1)
-
-#define L_FD_FAIL -1
-#define L_FD_SUCCESS 1
-#define L_FD_PAD_SIZE 255
-
-struct fd_meta {
-    ErlDrvMutex *meta_mtx;
-    struct fd_data *fd_data_list;
-};
-
-struct fd_data {
-    int fd;
-    struct fd_data *next;
-    struct fd_data *prev;
-    int pos;
-    int beyond_eof;
-    size_t size;
-#ifdef DEBUG
-    PROCESS owner;
-#endif
-};
-
-static int l_invalidate_local_fd(int fd);
-static int l_pad_file(struct fd_data *fd_data, off_t offset);
-static int check_error(int result, Efile_error* errInfo);
-static struct fd_data* l_new_fd(void);
-static int l_remove_local_fd(int fd);
-static struct fd_data* l_find_local_fd(int fd);
-static int l_update_local_fd(int fd, int pos, int size);
-
-static struct fd_meta* fdm = NULL;
-
-
-/***************************************************************************/
-
-static int
-l_remove_local_fd(int fd)
-{
-    struct fd_data *fd_data;
-    fd_data = l_find_local_fd(fd);
-
-    if (fd_data == NULL) {
-        return L_FD_FAIL;
-    }
-#ifdef DEBUG
-    assert(fd_data->owner == current_process());
-#endif
-    erl_drv_mutex_lock(fdm->meta_mtx);
-    /* head ? */
-    if (fd_data == fdm->fd_data_list) {
-        if (fd_data->next != NULL) {
-            /* remove link to head */
-            fd_data->next->prev = NULL;
-            /* set new head */
-            fdm->fd_data_list = fd_data->next;
-        }
-        else {
-            /* head is lonely */
-            fdm->fd_data_list = NULL;
-        }
-    }
-    else { /* not head */
-        if (fd_data->prev == NULL) {
-            erl_drv_mutex_unlock(fdm->meta_mtx);
-            return L_FD_FAIL;
-        }
-        else {
-            if (fd_data->next != NULL) {
-                fd_data->next->prev = fd_data->prev;
-                fd_data->prev->next = fd_data->next;
-            }
-            else {
-                fd_data->prev->next = NULL;
-            }
-        }
-    }
-
-    /* scramble values */
-    fd_data->beyond_eof = -1;
-    fd_data->next = NULL;
-    fd_data->prev = NULL;
-    fd_data->fd = -1;
-
-    /* unlock and clean */
-    driver_free(fd_data);
-    erl_drv_mutex_unlock(fdm->meta_mtx);
-
-    return L_FD_SUCCESS;
-}
-
-/***************************************************************************/
-
-static int
-l_invalidate_local_fd(int fd) {
-    struct fd_data *fd_data;
-
-    if ((fd_data = l_find_local_fd(fd)) == NULL) {
-        return L_FD_FAIL;
-    }
-
-    fd_data->beyond_eof = 0;
-    return L_FD_SUCCESS;
-}
-
-/****************************************************************************/
-
-static struct fd_data*
-l_find_local_fd(int fd) {
-    struct fd_data *fd_data;
-
-    fd_data = NULL;
-    erl_drv_mutex_lock(fdm->meta_mtx);
-    for (fd_data = fdm->fd_data_list; fd_data != NULL; ) {
-        if (fd_data->fd == fd) {
-#ifdef DEBUG
-            assert(fd_data->owner == current_process());
-#endif
-            break;
-        }
-        fd_data = fd_data->next;
-    }
-    erl_drv_mutex_unlock(fdm->meta_mtx);
-    return fd_data;
-}
-
-/***************************************************************************/
-
-static struct fd_data*
-l_new_fd(void) {
-    struct fd_data *fd_data;
-
-    fd_data = driver_alloc(sizeof(struct fd_data));
-    if (fd_data == NULL) {
-        return NULL;
-    }
-    erl_drv_mutex_lock(fdm->meta_mtx);
-    if (fdm->fd_data_list == NULL) {
-        fdm->fd_data_list = fd_data;
-        fdm->fd_data_list->prev = NULL;
-        fdm->fd_data_list->next = NULL;
-    }
-    else {
-        fd_data->next = fdm->fd_data_list;
-        fdm->fd_data_list = fd_data;
-        fdm->fd_data_list->prev = NULL;
-    }
-#ifdef DEBUG
-    fd_data->owner = current_process();
-#endif
-    erl_drv_mutex_unlock(fdm->meta_mtx);
-    return fd_data;
-}
-
-/***************************************************************************/
-
-static int
-l_update_local_fd(int fd, int pos, int size) {
-    struct fd_data *fd_data = NULL;
-
-    fd_data = l_find_local_fd(fd);
-    /* new fd to handle? */
-    if (fd_data == NULL) {
-        fd_data = l_new_fd();
-        if (fd_data == NULL) {
-            /* out of memory */
-            return L_FD_FAIL;
-        }
-    }
-    fd_data->size = size;
-    fd_data->pos = pos;
-    fd_data->fd = fd;
-    fd_data->beyond_eof = 1;
-
-    return L_FD_SUCCESS;
-}
-
-/***************************************************************************/
-
-static int
-l_pad_file(struct fd_data *fd_data, off_t offset) {
-    int size_dif;
-    int written = 0;
-    int ret_val = L_FD_SUCCESS;
-    char padding[L_FD_PAD_SIZE];
-
-    size_dif = (offset - fd_data->size);
-    memset(&padding, '\0', L_FD_PAD_SIZE);
-
-    while (size_dif > 0) {
-        written = write(fd_data->fd, padding,
-                (size_dif < L_FD_PAD_SIZE) ?
-                size_dif : L_FD_PAD_SIZE);
-        if (written < 0 && errno != EINTR && errno != EAGAIN) {
-            ret_val = -1;
-            break;
-        }
-        size_dif -= written;
-    }
-    L_FD_INVALIDATE(fd_data);
-    return ret_val;
-}
-
-/***************************************************************************/
-
-static int
-check_error(int result, Efile_error *errInfo) {
-    if (result < 0) {
-        errInfo->posix_errno = errInfo->os_errno = errno;
-        return 0;
-    }
-    return 1;
-}
-
-/***************************************************************************/
-
-int
-efile_init() {
-    fdm = driver_alloc(sizeof(struct fd_meta));
-    if (fdm == NULL) {
-        return L_FD_FAIL;
-    }
-    fdm->meta_mtx = erl_drv_mutex_create("ose_efile local fd mutex\n");
-    erl_drv_mutex_lock(fdm->meta_mtx);
-    fdm->fd_data_list = NULL;
-    erl_drv_mutex_unlock(fdm->meta_mtx);
-    return L_FD_SUCCESS;
-}
-
-/***************************************************************************/
-
-int
-efile_mkdir(Efile_error* errInfo,       /* Where to return error codes. */
-        char* name)                 /* Name of directory to create. */
-{
-#ifdef NO_MKDIR_MODE
-    return check_error(mkdir(name), errInfo);
-#else
-    int res = mkdir(name, DIR_MODE);
-    if (res < 0 && errno == EINVAL) {
-      errno = ENOENT;
-    }
-    return check_error(res, errInfo);
-#endif
-}
-
-/***************************************************************************/
-
-int
-efile_rmdir(Efile_error* errInfo,       /* Where to return error codes. */
-        char* name)                 /* Name of directory to delete. */
-{
-    if (rmdir(name) == 0) {
-        return 1;
-    }
-    if (errno == ENOTEMPTY) {
-        errno = EEXIST;
-    }
-    if (errno == EEXIST || errno == EINVAL) {
-        int saved_errno = errno;
-        struct stat file_stat;
-        struct stat cwd_stat;
-
-        if(stat(name, &file_stat) != 0) {
-            errno = ENOENT;
-            return check_error(-1, errInfo);
-        }
-        /*
-         *  The error code might be wrong if this is the current directory.
-         */
-        if (stat(name, &file_stat) == 0 && stat(".", &cwd_stat) == 0 &&
-                file_stat.st_ino == cwd_stat.st_ino &&
-                file_stat.st_dev == cwd_stat.st_dev) {
-            saved_errno = EACCES;
-        }
-        errno = saved_errno;
-    }
-    return check_error(-1, errInfo);
-}
-
-/***************************************************************************/
-
-int
-efile_delete_file(Efile_error* errInfo, /* Where to return error codes. */
-        char* name)           /* Name of file to delete. */
-{
-    struct stat statbuf;
-
-    if (stat(name, &statbuf) >= 0) {
-        /* Do not let unlink() remove directories */
-        if (ISDIR(statbuf)) {
-            errno = EPERM;
-            return check_error(-1, errInfo);
-        }
-
-        if (unlink(name) == 0) {
-            return 1;
-        }
-
-        if (errno == EISDIR) {
-            errno = EPERM;
-            return check_error(-1, errInfo);
-        }
-    }
-    else {
-        if (errno == EINVAL) {
-            errno = ENOENT;
-            return check_error(-1, errInfo);
-        }
-    }
-    return check_error(-1, errInfo);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- *      Changes the name of an existing file or directory, from src to dst.
- *      If src and dst refer to the same file or directory, does nothing
- *      and returns success.  Otherwise if dst already exists, it will be
- *      deleted and replaced by src subject to the following conditions:
- *          If src is a directory, dst may be an empty directory.
- *          If src is a file, dst may be a file.
- *      In any other situation where dst already exists, the rename will
- *      fail.
- *
- * Results:
- *      If the directory was successfully created, returns 1.
- *      Otherwise the return value is 0 and errno is set to
- *      indicate the error.  Some possible values for errno are:
- *
- *      EACCES:     src or dst parent directory can't be read and/or written.
- *      EEXIST:     dst is a non-empty directory.
- *      EINVAL:     src is a root directory or dst is a subdirectory of src.
- *      EISDIR:     dst is a directory, but src is not.
- *      ENOENT:     src doesn't exist, or src or dst is "".
- *      ENOTDIR:    src is a directory, but dst is not.
- *      EXDEV:      src and dst are on different filesystems.
- *
- * Side effects:
- *      The implementation of rename may allow cross-filesystem renames,
- *      but the caller should be prepared to emulate it with copy and
- *      delete if errno is EXDEV.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-efile_rename(Efile_error* errInfo,      /* Where to return error codes. */
-        char* src,                 /* Original name. */
-        char* dst)                 /* New name. */
-{
-
-    /* temporary fix AFM does not recognize ./<file name>
-     * in destination remove pending on adaption of AFM fix
-     */
-
-    char *dot_str;
-    if (dst != NULL) {
-        dot_str = strchr(dst, '.');
-        if (dot_str && dot_str == dst && dot_str[1] == '/') {
-            dst = dst+2;
-        }
-    }
-
-    if (rename(src, dst) == 0) {
-        return 1;
-    }
-    if (errno == ENOTEMPTY) {
-        errno = EEXIST;
-    }
-    if (errno == EINVAL) {
-        struct stat file_stat;
-
-        if (stat(dst, &file_stat)== 0) {
-            if (ISDIR(file_stat)) {
-                errno = EISDIR;
-            }
-            else if (ISREG(file_stat)) {
-                errno = ENOTDIR;
-            }
-            else {
-                errno = EINVAL;
-            }
-        }
-        else {
-            errno = EINVAL;
-        }
-    }
-
-    if (strcmp(src, "/") == 0) {
-        errno = EINVAL;
-    }
-    return check_error(-1, errInfo);
-}
-
-/***************************************************************************/
-
-int
-efile_chdir(Efile_error* errInfo,   /* Where to return error codes. */
-        char* name)             /* Name of directory to make current. */
-{
-    return check_error(chdir(name), errInfo);
-}
-
-/***************************************************************************/
-
-int
-efile_getdcwd(Efile_error* errInfo,     /* Where to return error codes. */
-        int drive,                /* 0 - current, 1 - A, 2 - B etc. */
-        char* buffer,             /* Where to return the current
-                                     directory. */
-        size_t size)              /* Size of buffer. */
-{
-    if (drive == 0) {
-        if (getcwd(buffer, size) == NULL)
-            return check_error(-1, errInfo);
-
-        return 1;
-    }
-
-    /*
-     * Drives other than 0 is not supported on Unix.
-     */
-
-    errno = ENOTSUP;
-    return check_error(-1, errInfo);
-}
-
-/***************************************************************************/
-
-int
-efile_readdir(Efile_error* errInfo,     /* Where to return error codes. */
-        char* name,               /* Name of directory to open. */
-        EFILE_DIR_HANDLE* p_dir_handle,   /* Pointer to directory
-                                             handle of
-                                             open directory.*/
-        char* buffer,             /* Pointer to buffer for
-                                     one filename. */
-        size_t *size)             /* in-out Size of buffer, length
-                                     of name. */
-{
-    DIR *dp;                    /* Pointer to directory structure. */
-    struct dirent* dirp;        /* Pointer to directory entry. */
-
-    /*
-     * If this is the first call, we must open the directory.
-     */
-
-    if (*p_dir_handle == NULL) {
-        dp = opendir(name);
-        if (dp == NULL)
-            return check_error(-1, errInfo);
-        *p_dir_handle = (EFILE_DIR_HANDLE) dp;
-    }
-
-    /*
-     * Retrieve the name of the next file using the directory handle.
-     */
-
-    dp = *((DIR **)((void *)p_dir_handle));
-    for (;;) {
-        dirp = readdir(dp);
-        if (dirp == NULL) {
-            closedir(dp);
-            return 0;
-        }
-        if (IS_DOT_OR_DOTDOT(dirp->d_name))
-            continue;
-        buffer[0] = '\0';
-        strncat(buffer, dirp->d_name, (*size)-1);
-        *size = strlen(dirp->d_name);
-        return 1;
-    }
-}
-
-/***************************************************************************/
-
-int
-efile_openfile(Efile_error* errInfo,    /* Where to return error codes. */
-        char* name,              /* Name of directory to open. */
-        int flags,               /* Flags to user for opening. */
-        int* pfd,                /* Where to store the file
-                                    descriptor. */
-        Sint64 *pSize)           /* Where to store the size of the
-                                    file. */
-{
-    struct stat statbuf;
-    int fd;
-    int mode;                   /* Open mode. */
-
-    if (stat(name, &statbuf) >= 0 && !ISREG(statbuf)) {
-        errno = EISDIR;
-        return check_error(-1, errInfo);
-    }
-
-    switch (flags & (EFILE_MODE_READ|EFILE_MODE_WRITE)) {
-        case EFILE_MODE_READ:
-            mode = O_RDONLY;
-            break;
-        case EFILE_MODE_WRITE:
-            if (flags & EFILE_NO_TRUNCATE)
-                mode = O_WRONLY | O_CREAT;
-            else
-                mode = O_WRONLY | O_CREAT | O_TRUNC;
-            break;
-        case EFILE_MODE_READ_WRITE:
-            mode = O_RDWR | O_CREAT;
-            break;
-        default:
-            errno = EINVAL;
-            return check_error(-1, errInfo);
-    }
-
-
-    if (flags & EFILE_MODE_APPEND) {
-        mode &= ~O_TRUNC;
-        mode |= O_APPEND;
-    }
-
-    if (flags & EFILE_MODE_EXCL) {
-        mode |= O_EXCL;
-    }
-
-    fd = open(name, mode, FILE_MODE);
-
-    if (!check_error(fd, errInfo))
-        return 0;
-
-    *pfd = fd;
-    if (pSize) {
-        *pSize = statbuf.st_size;
-    }
-    return 1;
-}
-
-/***************************************************************************/
-
-int
-efile_may_openfile(Efile_error* errInfo, char *name) {
-    struct stat statbuf;        /* Information about the file */
-    int result;
-
-    result = stat(name, &statbuf);
-    if (!check_error(result, errInfo))
-        return 0;
-    if (!ISREG(statbuf)) {
-        errno = EISDIR;
-        return check_error(-1, errInfo);
-    }
-    return 1;
-}
-
-/***************************************************************************/
-
-void
-efile_closefile(int fd)
-{
-    if (l_find_local_fd(fd) != NULL) {
-        l_remove_local_fd(fd);
-    }
-    close(fd);
-}
-
-/***************************************************************************/
-
-int
-efile_fdatasync(Efile_error *errInfo, /* Where to return error codes. */
-        int fd)               /* File descriptor for file to sync data. */
-{
-    return efile_fsync(errInfo, fd);
-}
-
-/***************************************************************************/
-
-int
-efile_fsync(Efile_error *errInfo, /* Where to return error codes. */
-        int fd)               /* File descriptor for file to sync. */
-{
-    return check_error(fsync(fd), errInfo);
-}
-
-/***************************************************************************/
-
-int
-efile_fileinfo(Efile_error* errInfo, Efile_info* pInfo,
-        char* name, int info_for_link)
-{
-    struct stat statbuf;        /* Information about the file */
-    int result;
-
-    result = stat(name, &statbuf);
-    if (!check_error(result, errInfo)) {
-        return 0;
-    }
-
-#if SIZEOF_OFF_T == 4
-    pInfo->size_high = 0;
-#else
-    pInfo->size_high = (Uint32)(statbuf.st_size >> 32);
-#endif
-    pInfo->size_low = (Uint32)statbuf.st_size;
-
-#ifdef NO_ACCESS
-    /* Just look at read/write access for owner. */
-
-    pInfo->access = ((statbuf.st_mode >> 6) & 07) >> 1;
-
-#else
-    pInfo->access = FA_NONE;
-    if (access(name, R_OK) == 0)
-        pInfo->access |= FA_READ;
-    if (access(name, W_OK) == 0)
-        pInfo->access |= FA_WRITE;
-
-#endif
-
-    if (ISDEV(statbuf))
-        pInfo->type = FT_DEVICE;
-    else if (ISDIR(statbuf))
-        pInfo->type = FT_DIRECTORY;
-    else if (ISREG(statbuf))
-        pInfo->type = FT_REGULAR;
-    else if (ISLNK(statbuf))
-        pInfo->type = FT_SYMLINK;
-    else
-        pInfo->type = FT_OTHER;
-
-    pInfo->accessTime   = statbuf.st_atime;
-    pInfo->modifyTime   = statbuf.st_mtime;
-    pInfo->cTime        = statbuf.st_ctime;
-
-    pInfo->mode         = statbuf.st_mode;
-    pInfo->links        = statbuf.st_nlink;
-    pInfo->major_device = statbuf.st_dev;
-    pInfo->inode        = statbuf.st_ino;
-    pInfo->uid          = statbuf.st_uid;
-    pInfo->gid          = statbuf.st_gid;
-
-    return 1;
-}
-
-/***************************************************************************/
-
-int
-efile_write_info(Efile_error *errInfo, Efile_info *pInfo, char *name)
-{
-    /*
-     * On some systems chown will always fail for a non-root user unless
-     * POSIX_CHOWN_RESTRICTED is not set.  Others will succeed as long as
-     * you don't try to chown a file to someone besides youself.
-     */
-    if (pInfo->mode != -1) {
-        mode_t newMode = pInfo->mode & (S_ISUID | S_ISGID |
-                S_IRWXU | S_IRWXG | S_IRWXO);
-        if (chmod(name, newMode)) {
-            newMode &= ~(S_ISUID | S_ISGID);
-            if (chmod(name, newMode)) {
-                return check_error(-1, errInfo);
-            }
-        }
-    }
-
-    return 1;
-}
-
-/***************************************************************************/
-
-int
-efile_write(Efile_error* errInfo,       /* Where to return error codes. */
-        int flags,                  /* Flags given when file was
-                                       opened. */
-        int fd,                     /* File descriptor to write to. */
-        char* buf,                  /* Buffer to write. */
-        size_t count)               /* Number of bytes to write. */
-{
-    ssize_t written;                    /* Bytes written in last operation. */
-    struct fd_data *fd_data;
-
-    if ((fd_data = l_find_local_fd(fd)) != NULL) {
-        if (L_FD_IS_VALID(fd_data)) {
-            /* we are beyond eof and need to pad*/
-            if (l_pad_file(fd_data, L_FD_CUR(fd_data)) < 0) {
-                return check_error(-1, errInfo);
-            }
-        }
-    }
-
-    while (count > 0)  {
-        if ((written = write(fd, buf, count)) < 0) {
-            if (errno != EINTR) {
-                return check_error(-1, errInfo);
-            }
-            else {
-                written = 0;
-            }
-        }
-        ASSERT(written <= count);
-        buf += written;
-        count -= written;
-    }
-    return 1;
-}
-
-/***************************************************************************/
-
-int
-efile_writev(Efile_error* errInfo,   /* Where to return error codes */
-        int flags,              /* Flags given when file was
-                                 * opened */
-        int fd,                 /* File descriptor to write to */
-        SysIOVec* iov,          /* Vector of buffer structs.
-                                 * The structs may be changed i.e.
-                                 * due to incomplete writes */
-        int iovcnt)             /* Number of structs in vector */
-{
-    struct fd_data *fd_data;
-    int cnt = 0;                     /* Buffers so far written */
-
-    ASSERT(iovcnt >= 0);
-    if ((fd_data = l_find_local_fd(fd)) != NULL) {
-        if (L_FD_IS_VALID(fd_data)) {
-            /* we are beyond eof and need to pad*/
-            if (l_pad_file(fd_data, L_FD_CUR(fd_data)) < 0) {
-                return check_error(-1, errInfo);
-            }
-        }
-    }
-    while (cnt < iovcnt) {
-        if ((! iov[cnt].iov_base) || (iov[cnt].iov_len <= 0)) {
-            /* Empty buffer - skip */
-            cnt++;
-        }
-        else { /* Non-empty buffer */
-            ssize_t w;                   /* Bytes written in this call */
-            do {
-                w = write(fd, iov[cnt].iov_base, iov[cnt].iov_len);
-            } while (w < 0 && errno == EINTR);
-
-            ASSERT(w <= iov[cnt].iov_len || w == -1);
-
-            if (w < 0) {
-                return check_error(-1, errInfo);
-            }
-            /* Move forward to next buffer to write */
-            for (; cnt < iovcnt && w > 0; cnt++) {
-                if (iov[cnt].iov_base && iov[cnt].iov_len > 0) {
-                    if (w < iov[cnt].iov_len) {
-                        /* Adjust the buffer for next write */
-                        iov[cnt].iov_len -= w;
-                        iov[cnt].iov_base += w;
-                        w = 0;
-                        break;
-                    }
-                    else {
-                        w -= iov[cnt].iov_len;
-                    }
-                }
-            }
-            ASSERT(w == 0);
-        } /* else Non-empty buffer */
-    } /* while (cnt< iovcnt) */
-    return 1;
-}
-
-/***************************************************************************/
-
-int
-efile_read(Efile_error* errInfo,     /* Where to return error codes. */
-        int flags,                  /* Flags given when file was opened. */
-        int fd,                     /* File descriptor to read from. */
-        char* buf,                  /* Buffer to read into. */
-        size_t count,       /* Number of bytes to read. */
-        size_t *pBytesRead)         /* Where to return number of
-                                       bytes read. */
-{
-    ssize_t n;
-    struct fd_data *fd_data;
-
-    if ((fd_data = l_find_local_fd(fd)) != NULL) {
-        if (L_FD_IS_VALID(fd_data)) {
-            *pBytesRead = 0;
-            return 1;
-        }
-    }
-    for (;;)  {
-        if ((n = read(fd, buf, count)) >= 0) {
-            break;
-        }
-        else if (errno != EINTR) {
-            return check_error(-1, errInfo);
-        }
-    }
-    if (fd_data != NULL && L_FD_IS_VALID(fd_data)) {
-        L_FD_INVALIDATE(fd_data);
-    }
-    *pBytesRead = (size_t) n;
-    return 1;
-}
-
-/* pread() and pwrite()                                                   */
-/* Some unix systems, notably Solaris has these syscalls                  */
-/* It is especially nice for i.e. the dets module to have support         */
-/* for this, even if the underlying OS dosn't support it, it is           */
-/* reasonably easy to work around by first calling seek, and then         */
-/* calling read().                                                        */
-/* This later strategy however changes the file pointer, which pread()    */
-/* does not do. We choose to ignore this and say that the location        */
-/* of the file pointer is undefined after a call to any of the p functions*/
-
-
-int
-efile_pread(Efile_error* errInfo,     /* Where to return error codes. */
-        int fd,                /* File descriptor to read from. */
-        Sint64 offset,            /* Offset in bytes from BOF. */
-        char* buf,                     /* Buffer to read into. */
-        size_t count,          /* Number of bytes to read. */
-        size_t *pBytesRead)            /* Where to return
-                                          number of bytes read. */
-{
-    int res = efile_seek(errInfo, fd, offset, EFILE_SEEK_SET, NULL);
-    if (res) {
-        return efile_read(errInfo, 0, fd, buf, count, pBytesRead);
-    } else {
-        return res;
-    }
-}
-
-
-/***************************************************************************/
-
-int
-efile_pwrite(Efile_error* errInfo,  /* Where to return error codes. */
-        int fd,                /* File descriptor to write to. */
-        char* buf,             /* Buffer to write. */
-        size_t count,          /* Number of bytes to write. */
-        Sint64 offset)         /* where to write it */
-{
-    int res = efile_seek(errInfo, fd, offset, EFILE_SEEK_SET, NULL);
-
-    if (res) {
-        return efile_write(errInfo, 0, fd, buf, count);
-    } else {
-        return res;
-    }
-}
-
-/***************************************************************************/
-
-int
-efile_seek(Efile_error* errInfo,      /* Where to return error codes. */
-        int fd,                    /* File descriptor to do the seek on. */
-        Sint64 offset,             /* Offset in bytes from the given
-                                      origin. */
-        int origin,                /* Origin of seek (SEEK_SET, SEEK_CUR,
-                                      SEEK_END). */
-        Sint64 *new_location)      /* Resulting new location in file. */
-{
-    off_t off, result;
-    off = (off_t) offset;
-
-    switch (origin) {
-        case EFILE_SEEK_SET:
-            origin = SEEK_SET;
-            break;
-        case EFILE_SEEK_CUR:
-            origin = SEEK_CUR;
-            break;
-        case EFILE_SEEK_END:
-            origin = SEEK_END;
-            break;
-        default:
-            errno = EINVAL;
-            return check_error(-1, errInfo);
-    }
-
-    if (off != offset) {
-        errno = EINVAL;
-        return check_error(-1, errInfo);
-    }
-
-    errno = 0;
-    result = lseek(fd, off, origin);
-
-    if (result >= 0) {
-        l_invalidate_local_fd(fd);
-    }
-
-    if (result < 0)
-    {
-        if (errno == ENOSYS) {
-            int size, cur_pos;
-
-            if (off < 0) {
-                errno = EINVAL;
-                return check_error(-1, errInfo);
-            }
-
-            cur_pos = lseek(fd, 0, SEEK_CUR);
-            size = lseek(fd, 0, SEEK_END);
-
-            if (origin == SEEK_SET) {
-                result = offset;
-            }
-            else if (origin == SEEK_CUR) {
-                result = offset + cur_pos;
-            }
-            else if (origin == SEEK_END) {
-                result = size + offset;
-            }
-
-            /* sanity check our result */
-            if (size > result) {
-                return check_error(-1, errInfo);
-            }
-
-            /* store the data localy */
-            l_update_local_fd(fd, result, size);
-
-            /* reset the original file position */
-            if (origin != SEEK_END) {
-                lseek(fd, cur_pos, SEEK_SET);
-            }
-        }
-        else if (errno == 0) {
-            errno = EINVAL;
-        }
-    }
-
-    if (new_location) {
-        *new_location = result;
-    }
-
-    return 1;
-}
-
-/***************************************************************************/
-
-int
-efile_truncate_file(Efile_error* errInfo, int *fd, int flags)
-{
-    off_t offset;
-    struct fd_data *fd_data;
-
-    if ((fd_data = l_find_local_fd(*fd)) != NULL && L_FD_IS_VALID(fd_data)) {
-        offset = L_FD_CUR(fd_data);
-    }
-    else {
-        offset = lseek(*fd, 0, SEEK_CUR);
-    }
-
-    return check_error(((offset >= 0) &&
-                (ftruncate(*fd, offset) == 0)) ? 1 : -1, errInfo);
-}
-
-/***************************************************************************/
-
-int
-efile_readlink(Efile_error* errInfo, char* name, char* buffer, size_t size)
-{
-    errno = ENOTSUP;
-    return check_error(-1, errInfo);
-}
-
-/***************************************************************************/
-
-int
-efile_altname(Efile_error* errInfo, char* name, char* buffer, size_t size)
-{
-    errno = ENOTSUP;
-    return check_error(-1, errInfo);
-}
-
-/***************************************************************************/
-
-int
-efile_link(Efile_error* errInfo, char* old, char* new)
-{
-    errno = ENOTSUP;
-    return check_error(-1, errInfo);
-}
-
-/***************************************************************************/
-
-int
-efile_symlink(Efile_error* errInfo, char* old, char* new)
-{
-    errno = ENOTSUP;
-    return check_error(-1, errInfo);
-}
-
-/***************************************************************************/
-
-int
-efile_fadvise(Efile_error* errInfo, int fd, Sint64 offset,
-        Sint64 length, int advise)
-{
-    return check_error(posix_fadvise(fd, offset, length, advise), errInfo);
-}
-
-/***************************************************************************/
-
-static int
-call_posix_fallocate(int fd, Sint64 offset, Sint64 length)
-{
-    int ret;
-
-    /*
-     * On Linux and Solaris for example, posix_fallocate() returns
-     * a positive error number on error and it does not set errno.
-     * On FreeBSD however (9.0 at least), it returns -1 on error
-     * and it sets errno.
-     */
-    do {
-        ret = posix_fallocate(fd, (off_t) offset, (off_t) length);
-        if (ret > 0) {
-            errno = ret;
-            ret = -1;
-        }
-    } while (ret != 0 && errno == EINTR);
-
-    return ret;
-}
-
-/***************************************************************************/
-
-int
-efile_fallocate(Efile_error* errInfo, int fd, Sint64 offset, Sint64 length)
-{
-    return check_error(call_posix_fallocate(fd, offset, length), errInfo);
-}
diff --git a/erts/emulator/drivers/ose/ose_signal_drv.c b/erts/emulator/drivers/ose/ose_signal_drv.c
deleted file mode 100644
index 2be9462a47..0000000000
--- a/erts/emulator/drivers/ose/ose_signal_drv.c
+++ /dev/null
@@ -1,897 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2013-2013. 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%
- */
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "errno.h"
-#include "stdio.h"
-#include "string.h"
-#include "stddef.h"
-
-#include "sys.h"
-#include "erl_driver.h"
-#include "ose.h"
-
-
-#ifdef HAVE_OSE_SPI_H
-#include "ose_spi/ose_spi.h"
-#endif
-
-#define DEBUG_ATTACH   0
-#define DEBUG_HUNT     0
-#define DEBUG_SEND     0
-#define DEBUG_LISTEN   0
-
-#if 0
-#define DEBUGP(FMT,...) printf(FMT, __VA_ARGS__)
-#else
-#define DEBUGP(FMT,...)
-#endif
-
-#if DEBUG_ATTACH
-#define DEBUGP_ATTACH(...) DEBUGP( __VA_ARGS__)
-#else
-#define DEBUGP_ATTACH(...)
-#endif
-
-#if DEBUG_HUNT
-#define DEBUGP_HUNT(...) DEBUGP( __VA_ARGS__)
-#else
-#define DEBUGP_HUNT(...)
-#endif
-
-#if DEBUG_LISTEN
-#define DEBUGP_LISTEN(...) DEBUGP( __VA_ARGS__)
-#else
-#define DEBUGP_LISTEN(...)
-#endif
-
-#if DEBUG_SEND
-#define DEBUGP_SEND(...) DEBUGP( __VA_ARGS__)
-#else
-#define DEBUGP_SEND(...)
-#endif
-
-
-#define DRIVER_NAME "ose_signal_drv"
-#define GET_SPID        1
-#define GET_NAME        2
-#define HUNT          100
-#define DEHUNT        101
-#define ATTACH        102
-#define DETACH        103
-#define SEND          104
-#define SEND_W_S      105
-#define LISTEN        106
-#define OPEN          200
-
-#define REF_SEGMENT_SIZE 8
-
-struct async {
-  SIGSELECT signo;
-  ErlDrvTermData port;
-  ErlDrvTermData proc;
-  PROCESS spid;
-  PROCESS target;
-  Uint32 ref;
-};
-
-/**
- * OSE signals
- **/
-union SIGNAL {
-  SIGSELECT signo;
-  struct async async;
-};
-
-/**
- * The driver's context
- **/
-typedef struct _driver_context {
-  ErlDrvPort port;
-  PROCESS spid;
-  ErlDrvEvent perm_events[2];
-  ErlDrvEvent *events;
-  Uint32 event_cnt;
-  Uint32 ref;
-  Uint32 *outstanding_refs;
-  Uint32 outstanding_refs_max;
-  Uint32 outstanding_refs_cnt;
-} driver_context_t;
-
-/**
- * Global variables
- **/
-static ErlDrvTermData a_ok;
-static ErlDrvTermData a_error;
-static ErlDrvTermData a_enomem;
-static ErlDrvTermData a_enoent;
-static ErlDrvTermData a_badarg;
-static ErlDrvTermData a_mailbox_up;
-static ErlDrvTermData a_mailbox_down;
-static ErlDrvTermData a_ose_drv_reply;
-static ErlDrvTermData a_message;
-static PROCESS proxy_proc;
-
-
-/**
- * Serialize/unserialize unsigned 32-bit values
- **/
-static char *put_u32(unsigned int value, char *ptr) {
-  *ptr++ = (value & 0xff000000) >> 24;
-  *ptr++ = (value & 0x00ff0000) >> 16;
-  *ptr++ = (value & 0x0000ff00) >> 8;
-  *ptr++ = (value & 0xff);
-
-  return ptr;
-}
-
-static unsigned int get_u32(char *ptr) {
-  unsigned int result = 0;
-  result += (ptr[0] & 0xff) << 24;
-  result += (ptr[1] & 0xff) << 16;
-  result += (ptr[2] & 0xff) << 8;
-  result += (ptr[3] & 0xff);
-
-  return result;
-}
-
-
-/* Stolen from efile_drv.c */
-
-/* char EV_CHAR_P(ErlIOVec *ev, int p, int q) */
-#define EV_CHAR_P(ev, p, q)                   \
-    (((char *)(ev)->iov[(q)].iov_base) + (p))
-
-/* int EV_GET_CHAR(ErlIOVec *ev, char *p, int *pp, int *qp) */
-#define EV_GET_CHAR(ev, p, pp, qp) ev_get_char(ev, p ,pp, qp)
-static int
-ev_get_char(ErlIOVec *ev, char *p, int *pp, int *qp) {
-  if (*(pp)+1 <= (ev)->iov[*(qp)].iov_len) {
-    *(p) = *EV_CHAR_P(ev, *(pp), *(qp));
-    if (*(pp)+1 < (ev)->iov[*(qp)].iov_len)
-      *(pp) = *(pp)+1;
-    else {
-      (*(qp))++;
-      *pp = 0;
-    }
-    return !0;
-  }
-  return 0;
-}
-
-/* Uint32 EV_UINT32(ErlIOVec *ev, int p, int q)*/
-#define EV_UINT32(ev, p, q) \
-    ((Uint32) *(((unsigned char *)(ev)->iov[(q)].iov_base) + (p)))
-
-/* int EV_GET_UINT32(ErlIOVec *ev, Uint32 *p, int *pp, int *qp) */
-#define EV_GET_UINT32(ev, p, pp, qp) ev_get_uint32(ev,(Uint32*)(p),pp,qp)
-static int
-ev_get_uint32(ErlIOVec *ev, Uint32 *p, int *pp, int *qp) {
-  if (*(pp)+4 <= (ev)->iov[*(qp)].iov_len) {
-    *(p) = (EV_UINT32(ev, *(pp),   *(qp)) << 24)
-      | (EV_UINT32(ev, *(pp)+1, *(qp)) << 16)
-      | (EV_UINT32(ev, *(pp)+2, *(qp)) << 8)
-      | (EV_UINT32(ev, *(pp)+3, *(qp)));
-    if (*(pp)+4 < (ev)->iov[*(qp)].iov_len)
-      *(pp) = *(pp)+4;
-    else {
-      (*(qp))++;
-      *pp = 0;
-    }
-    return !0;
-  }
-  return 0;
-}
-
-/**
- * Convinience macros
- **/
-#define send_response(port,output) erl_drv_send_term(driver_mk_port(port),\
-    driver_caller(port), output, sizeof(output) / sizeof(output[0]));
-
-void iov_memcpy(void *dest,ErlIOVec *ev,int ind,int off);
-void iov_memcpy(void *dest,ErlIOVec *ev,int ind,int off) {
-  int i;
-  memcpy(dest,ev->iov[ind].iov_base+off,ev->iov[ind].iov_len-off);
-  for (i = ind+1; i < ev->vsize; i++)
-    memcpy(dest,ev->iov[i].iov_base,ev->iov[i].iov_len);
-}
-
-/**
- * Reference handling
- **/
-
-static int add_reference(driver_context_t *ctxt, Uint32 ref) {
-
-  /*
-   * Premature optimizations may be evil, but they sure are fun.
-   */
-
-  if (ctxt->outstanding_refs == NULL) {
-    /* First ref to be ignored */
-    ctxt->outstanding_refs = driver_alloc(REF_SEGMENT_SIZE*sizeof(Uint32));
-    if (!ctxt->outstanding_refs)
-      return 1;
-
-    memset(ctxt->outstanding_refs,0,REF_SEGMENT_SIZE*sizeof(Uint32));
-    ctxt->outstanding_refs_max += REF_SEGMENT_SIZE;
-    ctxt->outstanding_refs[ctxt->outstanding_refs_cnt++] = ref;
-  } else if (ctxt->outstanding_refs_cnt == ctxt->outstanding_refs_max) {
-    /* Expand ref array */
-    Uint32 *new_array;
-    ctxt->outstanding_refs_max += REF_SEGMENT_SIZE;
-    new_array = driver_realloc(ctxt->outstanding_refs,
-			       ctxt->outstanding_refs_max*sizeof(Uint32));
-
-    if (!new_array) {
-      ctxt->outstanding_refs_max -= REF_SEGMENT_SIZE;
-      return 1;
-    }
-
-    ctxt->outstanding_refs = new_array;
-
-    memset(ctxt->outstanding_refs+ctxt->outstanding_refs_cnt,0,
-	   REF_SEGMENT_SIZE*sizeof(Uint32));
-    ctxt->outstanding_refs[ctxt->outstanding_refs_cnt++] = ref;
-
-  } else {
-    /* Find an empty slot:
-     *   First we try current index,
-     *   then we scan for a slot.
-     */
-    if (!ctxt->outstanding_refs[ctxt->outstanding_refs_cnt]) {
-      ctxt->outstanding_refs[ctxt->outstanding_refs_cnt++] = ref;
-    } else {
-      int i;
-      ASSERT(ctxt->outstanding_refs_cnt < ctxt->outstanding_refs_max);
-      for (i = 0; i < ctxt->outstanding_refs_max; i++)
-	if (!ctxt->outstanding_refs[i])
-	  break;
-      ASSERT(ctxt->outstanding_refs[i] == 0);
-      ctxt->outstanding_refs[i] = ref;
-      ctxt->outstanding_refs_cnt++;
-    }
-  }
-  return 0;
-}
-
-/* Return 0 if removed, 1 if does not exist, */
-static int remove_reference(driver_context_t *ctxt, Uint32 ref) {
-  int i,j;
-
-  if (ctxt->outstanding_refs_max == 0 && ctxt->outstanding_refs_cnt == 0) {
-    ASSERT(ctxt->outstanding_refs == NULL);
-    return 1;
-  }
-
-  for (i = 0; i < ctxt->outstanding_refs_max; i++) {
-    if (ctxt->outstanding_refs[i] == ref) {
-      ctxt->outstanding_refs[i] = 0;
-      ctxt->outstanding_refs_cnt--;
-      i = -1;
-      break;
-    }
-  }
-
-  if (i != -1)
-    return 1;
-
-  if (ctxt->outstanding_refs_cnt == 0) {
-    driver_free(ctxt->outstanding_refs);
-    ctxt->outstanding_refs = NULL;
-    ctxt->outstanding_refs_max = 0;
-  } else if (ctxt->outstanding_refs_cnt == (ctxt->outstanding_refs_max - REF_SEGMENT_SIZE)) {
-    Uint32 *new_array;
-    for (i = 0, j = 0; i < ctxt->outstanding_refs_cnt; i++) {
-      if (ctxt->outstanding_refs[i] == 0) {
-	for (j = i+1; j < ctxt->outstanding_refs_max; j++)
-	  if (ctxt->outstanding_refs[j]) {
-	    ctxt->outstanding_refs[i] = ctxt->outstanding_refs[j];
-	    ctxt->outstanding_refs[j] = 0;
-	    break;
-	  }
-      }
-    }
-    ctxt->outstanding_refs_max -= REF_SEGMENT_SIZE;
-    new_array = driver_realloc(ctxt->outstanding_refs,
-			       ctxt->outstanding_refs_max*sizeof(Uint32));
-    if (!new_array) {
-      ctxt->outstanding_refs_max += REF_SEGMENT_SIZE;
-      return 2;
-    }
-
-    ctxt->outstanding_refs = new_array;
-
-  }
-
-  return 0;
-}
-
-/**
- * The OSE proxy process. This only handles ERTS_SIGNAL_OSE_DRV_ATTACH.
- * The process is needed because signals triggered by attach ignore
- * redir tables.
- *
- * We have one global proxy process to save memory. An attempt to make each
- * port phantom into a proxy was made, but that used way to much memory.
- */
-static OS_PROCESS(driver_proxy_process) {
-  SIGSELECT sigs[] = {1,ERTS_SIGNAL_OSE_DRV_ATTACH};
-  PROCESS master = 0;
-
-  while (1) {
-    union SIGNAL *sig = receive(sigs);
-
-    if (sig->signo == ERTS_SIGNAL_OSE_DRV_ATTACH) {
-
-      /* The first message is used to determine who to send messages to. */
-      if (master == 0)
-	master = sender(&sig);
-
-      if (sig->async.target == 0) {
-	PROCESS from = sender(&sig);
-	restore(sig);
-	DEBUGP_ATTACH("0x%x: got attach 0x%x, sending to 0x%x\n",
-		      current_process(),from,master);
-	sig->async.target = from;
-	send(&sig,master);
-      } else {
-	PROCESS target = sig->async.target;
-	restore(sig);
-	sig->async.target = 0;
-	DEBUGP_ATTACH("0x%x: doing attach on 0x%x\n",current_process(),target);
-	attach(&sig,target);
-      }
-    }
-  }
-}
-
-
-/**
- * Init routine for the driver
- **/
-static int drv_init(void) {
-
-  a_ok = driver_mk_atom("ok");
-  a_error = driver_mk_atom("error");
-  a_enomem = driver_mk_atom("enomem");
-  a_enoent = driver_mk_atom("enoent");
-  a_badarg = driver_mk_atom("badarg");
-  a_mailbox_up = driver_mk_atom("mailbox_up");
-  a_mailbox_down = driver_mk_atom("mailbox_down");
-  a_ose_drv_reply = driver_mk_atom("ose_drv_reply");
-  a_message = driver_mk_atom("message");
-
-  proxy_proc = create_process(get_ptype(current_process()),
-			      "ose_signal_driver_proxy",
-			      driver_proxy_process, 10000,
-			      get_pri(current_process()),
-			      0, 0, NULL, 0, 0);
-
-#ifdef DEBUG
-  efs_clone(proxy_proc);
-#endif
-  start(proxy_proc);
-
-  return 0;
-}
-
-/* Signal resolution callback */
-static ErlDrvOseEventId resolve_signal(union SIGNAL* osig) {
-  union SIGNAL *sig = osig;
-  if (sig->signo == ERTS_SIGNAL_OSE_DRV_HUNT ||
-      sig->signo == ERTS_SIGNAL_OSE_DRV_ATTACH) {
-    return sig->async.spid;
-  }
-  DEBUGP("%p: Got signal %d sent to %p from 0x%p\n",
-	 current_process(),sig->signo,addressee(&sig),sender(&sig));
-  return addressee(&sig);
-}
-
-
-/**
- * Start routine for the driver
- **/
-static ErlDrvData drv_start(ErlDrvPort port, char *command)
-{
-  driver_context_t *ctxt = driver_alloc(sizeof(driver_context_t));
-
-  ctxt->perm_events[0] = NULL;
-  ctxt->perm_events[1] = NULL;
-
-  ctxt->spid = 0;
-  ctxt->port = port;
-  ctxt->event_cnt = 0;
-  ctxt->events = NULL;
-  ctxt->ref = 0;
-  ctxt->outstanding_refs = NULL;
-  ctxt->outstanding_refs_max = 0;
-  ctxt->outstanding_refs_cnt = 0;
-
-
-  /* Set the communication protocol to Erlang to be binary */
-  set_port_control_flags(port, PORT_CONTROL_FLAG_BINARY);
-
-  /* Everything ok */
-  return (ErlDrvData)ctxt;
-}
-
-/**
- * Stop routine for the driver
- **/
-static void drv_stop(ErlDrvData driver_data)
-{
-  driver_context_t *ctxt = (driver_context_t *)driver_data;
-  int i;
-
-  /* HUNT + ATTACH */
-  if (ctxt->perm_events[0])
-    driver_select(ctxt->port, ctxt->perm_events[0],
-		  ERL_DRV_USE|ERL_DRV_READ, 0);
-  if (ctxt->perm_events[1])
-    driver_select(ctxt->port, ctxt->perm_events[1],
-		  ERL_DRV_USE|ERL_DRV_READ, 0);
-
-  for (i = 0; i < ctxt->event_cnt; i++) {
-    driver_select(ctxt->port, ctxt->events[i], ERL_DRV_USE|ERL_DRV_READ, 0);
-  }
-
-  if (ctxt->spid != 0)
-    kill_proc(ctxt->spid);
-  DEBUGP("0x%x: stopped\n",ctxt->spid);
-  if (ctxt->events)
-    driver_free(ctxt->events);
-  if (ctxt->outstanding_refs)
-    driver_free(ctxt->outstanding_refs);
-
-  driver_free(ctxt);
-}
-
-/**
- * Output from Erlang
- **/
-static void outputv(ErlDrvData driver_data, ErlIOVec *ev)
-{
-  driver_context_t *ctxt = (driver_context_t *)driver_data;
-  int p = 0, q = 1;
-  char cmd;
-
-  if (! EV_GET_CHAR(ev,&cmd,&p,&q)) {
-    ErlDrvTermData output[] = {
-      ERL_DRV_ATOM, a_ose_drv_reply,
-      ERL_DRV_PORT, driver_mk_port(ctxt->port),
-      ERL_DRV_ATOM, a_badarg,
-      ERL_DRV_TUPLE, 3};
-    send_response(ctxt->port, output);
-    return;
-  }
-
-  /* Command is in the buffer's first byte */
-  switch(cmd) {
-
-  case OPEN: {
-    char *name = driver_alloc(ev->size - 1+1);
-    struct OS_redir_entry redir[2];
-
-    redir[0].sig = 1;
-    redir[0].pid = current_process();
-
-    iov_memcpy(name,ev,q,p);
-    name[ev->size-1] = '\0';
-
-    ctxt->spid = create_process(OS_PHANTOM, name, NULL, 0,
-				0, 0, 0, redir, 0, 0);
-
-    DEBUGP("0x%x: open\n",ctxt->spid);
-
-    ctxt->perm_events[1] =
-      erl_drv_ose_event_alloc(ERTS_SIGNAL_OSE_DRV_ATTACH,(int)ctxt->spid,
-			      resolve_signal, NULL);
-    driver_select(ctxt->port,ctxt->perm_events[1],ERL_DRV_READ|ERL_DRV_USE,1);
-
-    ctxt->perm_events[0] =
-      erl_drv_ose_event_alloc(ERTS_SIGNAL_OSE_DRV_HUNT,(int)ctxt->spid,
-			      resolve_signal, NULL);
-    driver_select(ctxt->port,ctxt->perm_events[0],ERL_DRV_READ|ERL_DRV_USE,1);
-
-    start(ctxt->spid);
-
-    {
-      ErlDrvTermData output[] = {
-	ERL_DRV_ATOM, a_ose_drv_reply,
-	ERL_DRV_PORT, driver_mk_port(ctxt->port),
-	ERL_DRV_ATOM, a_ok,
-	ERL_DRV_TUPLE, 3};
-
-      send_response(ctxt->port, output);
-    }
-
-    break;
-
-  }
-
-  case ATTACH:
-  case HUNT:
-    {
-      union SIGNAL *sig = alloc(sizeof(union SIGNAL),
-				cmd == HUNT ? ERTS_SIGNAL_OSE_DRV_HUNT:ERTS_SIGNAL_OSE_DRV_ATTACH);
-
-      sig->async.port = driver_mk_port(ctxt->port);
-      sig->async.proc = driver_caller(ctxt->port);
-      sig->async.spid = ctxt->spid;
-      sig->async.ref = ++ctxt->ref;
-
-      if (add_reference(ctxt,ctxt->ref)) {
-	ErlDrvTermData output[] = {
-	  ERL_DRV_ATOM, a_ose_drv_reply,
-	  ERL_DRV_PORT, driver_mk_port(ctxt->port),
-	  ERL_DRV_ATOM, a_enomem,
-	  ERL_DRV_TUPLE, 3};
-	send_response(ctxt->port, output);
-	free_buf(&sig);
-      } else {
-	ErlDrvTermData output[] = {
-	  ERL_DRV_ATOM, a_ose_drv_reply,
-	  ERL_DRV_PORT, driver_mk_port(ctxt->port),
-	  ERL_DRV_PORT, driver_mk_port(ctxt->port),
-	  ERL_DRV_INT, (ErlDrvUInt)ctxt->ref,
-	  ERL_DRV_TUPLE, 2,
-	  ERL_DRV_TUPLE, 3};
-	send_response(ctxt->port, output);
-
-	if (cmd == HUNT) {
-	  char *huntname = driver_alloc(sizeof(char)*((ev->size-1)+1));
-
-	  iov_memcpy(huntname,ev,q,p);
-	  huntname[ev->size-1] = '\0';
-
-	  DEBUGP_HUNT("0x%x: hunt %s -> %u (%u,%u)\n",
-		      ctxt->spid,huntname,ctxt->ref,
-		      ctxt->outstanding_refs_cnt,
-		      ctxt->outstanding_refs_max);
-
-	  hunt(huntname, 0, NULL, &sig);
-
-	  driver_free(huntname);
-	} else {
-	  EV_GET_UINT32(ev,&sig->async.target,&p,&q);
-	  DEBUGP_ATTACH("0x%x: attach %u -> %u (%u,%u)\n",
-			ctxt->spid,sig->async.target,
-			ctxt->ref,
-			ctxt->outstanding_refs_cnt,
-			ctxt->outstanding_refs_max);
-
-	  send(&sig,proxy_proc);
-	}
-
-      }
-
-      break;
-    }
-
-  case DETACH:
-  case DEHUNT:
-    {
-
-        Uint32 ref;
-
-	EV_GET_UINT32(ev,&ref,&p,&q);
-	if (cmd == DETACH) {
-	  DEBUGP_ATTACH("0x%x: detach %u (%u,%u)\n",ctxt->spid,ref,
-			ctxt->outstanding_refs_cnt,
-			ctxt->outstanding_refs_max);
-	} else {
-	  DEBUGP_HUNT("0x%x: dehunt %u (%u,%u)\n",ctxt->spid,ref,
-		      ctxt->outstanding_refs_cnt,
-		      ctxt->outstanding_refs_max);
-	}
-
-	if (remove_reference(ctxt,ref)) {
-	  ErlDrvTermData output[] = {
-	    ERL_DRV_ATOM, a_ose_drv_reply,
-	    ERL_DRV_PORT, driver_mk_port(ctxt->port),
-	    ERL_DRV_ATOM, a_error,
-	    ERL_DRV_ATOM, a_enoent,
-	    ERL_DRV_TUPLE, 2,
-	    ERL_DRV_TUPLE, 3};
-
-	  send_response(ctxt->port, output);
-	} else {
-	  ErlDrvTermData output[] = {
-	    ERL_DRV_ATOM, a_ose_drv_reply,
-	    ERL_DRV_PORT, driver_mk_port(ctxt->port),
-	    ERL_DRV_ATOM, a_ok,
-	    ERL_DRV_TUPLE, 3};
-
-	  send_response(ctxt->port, output);
-	}
-
-      break;
-    }
-
-  case SEND:
-  case SEND_W_S:
-    {
-      PROCESS spid;
-      PROCESS sender;
-      SIGSELECT signo;
-      OSBUFSIZE size = ev->size-9;
-      union SIGNAL *sig;
-
-      EV_GET_UINT32(ev,&spid,&p,&q);
-
-      if (cmd == SEND_W_S) {
-	EV_GET_UINT32(ev,&sender,&p,&q);
-	size -= 4;
-      } else {
-	sender = ctxt->spid;
-      }
-
-      EV_GET_UINT32(ev,&signo,&p,&q);
-
-      sig = alloc(size + sizeof(SIGSELECT),signo);
-
-      if (cmd == SEND_W_S) {
-	DEBUGP_SEND("0x%x: send_w_s(%u,%u,%u)\n",ctxt->spid,spid,signo,sender);
-      } else {
-	DEBUGP_SEND("0x%x: send(%u,%u)\n",ctxt->spid,spid,signo);
-      }
-
-      iov_memcpy(((char *)&sig->signo) + sizeof(SIGSELECT),ev,q,p);
-
-      send_w_s(&sig, sender, spid);
-
-      break;
-    }
-
-    case LISTEN:
-    {
-      int i,j,event_cnt = (ev->size - 1)/4;
-      ErlDrvEvent *events = NULL;
-      SIGSELECT signo,tmp_signo;
-
-      if (event_cnt == 0) {
-	for (i = 0; i < ctxt->event_cnt; i++)
-	  driver_select(ctxt->port,ctxt->events[i],ERL_DRV_READ|ERL_DRV_USE,0);
-	if (ctxt->events)
-	  driver_free(ctxt->events);
-      } else {
-	events = driver_alloc(sizeof(ErlDrvEvent)*event_cnt);
-	EV_GET_UINT32(ev,&signo,&p,&q);
-	for (i = 0, j = 0; i < event_cnt || j < ctxt->event_cnt; ) {
-
-	  if (ctxt->events)
-	    erl_drv_ose_event_fetch(ctxt->events[j],&tmp_signo,NULL,NULL);
-
-	  if (signo == tmp_signo) {
-	    events[i++] = ctxt->events[j++];
-	    EV_GET_UINT32(ev,&signo,&p,&q);
-	  } else if (signo < tmp_signo || !ctxt->events) {
-	    /* New signal to select on */
-	    events[i] = erl_drv_ose_event_alloc(signo,(int)ctxt->spid,
-						resolve_signal, NULL);
-	    driver_select(ctxt->port,events[i++],ERL_DRV_READ|ERL_DRV_USE,1);
-	    EV_GET_UINT32(ev,&signo,&p,&q);
-	  } else {
-	    /* Remove old signal to select on */
-	    driver_select(ctxt->port,ctxt->events[j++],ERL_DRV_READ|ERL_DRV_USE,0);
-	  }
-	}
-	if (ctxt->events)
-	  driver_free(ctxt->events);
-      }
-      ctxt->events = events;
-      ctxt->event_cnt = event_cnt;
-
-      {
-	ErlDrvTermData output[] = {
-	  ERL_DRV_ATOM, a_ose_drv_reply,
-	  ERL_DRV_PORT, driver_mk_port(ctxt->port),
-	  ERL_DRV_ATOM, a_ok,
-	  ERL_DRV_TUPLE, 3};
-	send_response(ctxt->port, output);
-      }
-      break;
-    }
-
-    default:
-    {
-      DEBUGP("Warning: 'ose_signal_drv' unknown command '%d'\n", cmd);
-      break;
-    }
-  }
-}
-
-/**
- * Handler for when OSE signal arrives
- **/
-static void ready_input(ErlDrvData driver_data, ErlDrvEvent event)
-{
-  driver_context_t *ctxt = (driver_context_t *)driver_data;
-  union SIGNAL *sig = erl_drv_ose_get_signal(event);
-
-  while (sig != NULL) {
-
-    switch(sig->signo)
-      {
-	/* Remote process is available */
-      case ERTS_SIGNAL_OSE_DRV_HUNT:
-	{
-	  const PROCESS spid = sender(&sig);
-
-	  if (remove_reference(ctxt,sig->async.ref)) {
-	    DEBUGP_HUNT("0x%x: Got hunt from 0x%x -> %u (CANCELLED) (%u,%u)\n",
-			ctxt->spid,spid,sig->async.ref,
-			ctxt->outstanding_refs_cnt,
-			ctxt->outstanding_refs_max);
-	    /* Already removed by dehunt */
-	  } else {
-	    ErlDrvTermData reply[] = {
-	      ERL_DRV_ATOM, a_mailbox_up,
-	      ERL_DRV_PORT, sig->async.port,
-	      ERL_DRV_PORT, sig->async.port,
-	      ERL_DRV_UINT, (ErlDrvUInt)sig->async.ref,
-	      ERL_DRV_TUPLE, 2,
-	      ERL_DRV_UINT, (ErlDrvUInt)spid,
-	      ERL_DRV_TUPLE, 4};
-	    DEBUGP_HUNT("0x%x: Got hunt from 0x%x -> %u (%u,%u)\n",
-			ctxt->spid,spid,sig->async.ref,
-			ctxt->outstanding_refs_cnt,
-			ctxt->outstanding_refs_max);
-	    erl_drv_send_term(sig->async.port, sig->async.proc, reply,
-			      sizeof(reply) / sizeof(reply[0]));
-	  }
-	  break;
-	}
-
-	/* Remote process is down */
-      case ERTS_SIGNAL_OSE_DRV_ATTACH:
-	{
-	  PROCESS spid = sig->async.target;
-
-	  if (remove_reference(ctxt,sig->async.ref)) {
-	    DEBUGP_ATTACH("0x%x: Got attach from 0x%x -> %u (CANCELLED) (%u,%u)\n",
-			  ctxt->spid,spid,sig->async.ref,
-			  ctxt->outstanding_refs_cnt,
-			  ctxt->outstanding_refs_max);
-	    /* Already removed by detach */
-	  } else {
-	    ErlDrvTermData reply[] = {
-	      ERL_DRV_ATOM, a_mailbox_down,
-	      ERL_DRV_PORT, sig->async.port,
-	      ERL_DRV_PORT, sig->async.port,
-	      ERL_DRV_UINT, sig->async.ref,
-	      ERL_DRV_TUPLE, 2,
-	      ERL_DRV_UINT, (ErlDrvUInt)spid,
-	      ERL_DRV_TUPLE, 4};
-	     DEBUGP_ATTACH("0x%x: Got attach from 0x%x -> %u (%u,%u)\n",
-			   ctxt->spid,spid,sig->async.ref,
-			   ctxt->outstanding_refs_cnt,
-			   ctxt->outstanding_refs_max);
-	    erl_drv_send_term(sig->async.port, sig->async.proc, reply,
-			      sizeof(reply) / sizeof(reply[0]));
-	  }
-	  break;
-	}
-
-	/* Received user defined signal */
-      default:
-	{
-	  const PROCESS spid = sender(&sig);
-	  const OSBUFSIZE size = sigsize(&sig) - sizeof(SIGSELECT);
-	  const char *sig_data = ((char *)&sig->signo) + sizeof(SIGSELECT);
-
-	  ErlDrvTermData reply[] = {
-	    ERL_DRV_ATOM, a_message,
-	    ERL_DRV_PORT, driver_mk_port(ctxt->port),
-	    ERL_DRV_UINT, (ErlDrvUInt)spid,
-	    ERL_DRV_UINT, (ErlDrvUInt)ctxt->spid,
-	    ERL_DRV_UINT, (ErlDrvUInt)sig->signo,
-	    ERL_DRV_BUF2BINARY, (ErlDrvTermData)sig_data, (ErlDrvUInt)size,
-	    ERL_DRV_TUPLE, 4,
-	    ERL_DRV_TUPLE, 3};
-
-	  DEBUGP_SEND("0x%x: Got 0x%u\r\n", spid, sig->signo);
-
-	  erl_drv_output_term(driver_mk_port(ctxt->port), reply,
-			      sizeof(reply) / sizeof(reply[0]));
-	  break;
-	}
-      }
-
-    free_buf(&sig);
-    sig = erl_drv_ose_get_signal(event);
-  }
-}
-
-/**
- * Handler for 'port_control'
- **/
-static ErlDrvSSizeT control(ErlDrvData driver_data, unsigned int cmd,
-                            char *buf, ErlDrvSizeT len,
-                            char **rbuf, ErlDrvSizeT rlen)
-{
-  driver_context_t *ctxt = (driver_context_t *)driver_data;
-
-  switch(cmd)
-  {
-    case GET_SPID:
-    {
-      const PROCESS spid = ctxt->spid;
-      put_u32(spid, *rbuf);
-      return sizeof(PROCESS);
-    }
-
-#ifdef HAVE_OSE_SPI_H
-    case GET_NAME:
-    {
-      const PROCESS spid = get_u32(buf);
-      char *name = (char*)get_pid_info(spid,OSE_PI_NAME);
-      int n;
-      if (!name) {
-	*rbuf = NULL;
-	return 0;
-      }
-
-      if (rlen < (n = strlen(name))) {
-	ErlDrvBinary *bin = driver_alloc_binary(n);
-	strncpy(bin->orig_bytes,name,n);
-	*rbuf = (char*)bin;
-      } else
-	strncpy(*rbuf,name,n);
-      free_buf((union SIGNAL**)&name);
-
-      return n;
-    }
-#endif
-    default:
-    {
-      /* Unknown command */
-      return (ErlDrvSSizeT)ERL_DRV_ERROR_GENERAL;
-      break;
-    }
-  }
-}
-
-static void stop_select(ErlDrvEvent event, void *reserved)
-{
-  erl_drv_ose_event_free(event);
-}
-
-/**
- * Setup the driver entry for the Erlang runtime
- **/
-ErlDrvEntry ose_signal_driver_entry = {
-  .init                         = drv_init,
-  .start                        = drv_start,
-  .stop                         = drv_stop,
-  .outputv                      = outputv,
-  .ready_input                  = ready_input,
-  .driver_name                  = DRIVER_NAME,
-  .control                      = control,
-  .extended_marker              = ERL_DRV_EXTENDED_MARKER,
-  .major_version                = ERL_DRV_EXTENDED_MAJOR_VERSION,
-  .minor_version                = ERL_DRV_EXTENDED_MINOR_VERSION,
-  .driver_flags                 = ERL_DRV_FLAG_USE_PORT_LOCKING,
-  .stop_select                  = stop_select
-};
-
diff --git a/erts/emulator/drivers/ose/ttsl_drv.c b/erts/emulator/drivers/ose/ttsl_drv.c
deleted file mode 100644
index f759b47984..0000000000
--- a/erts/emulator/drivers/ose/ttsl_drv.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 1996-2013. 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%
- */
-/*
- * Stub tty driver because group/user depend on this.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "erl_driver.h"
-
-static int ttysl_init(void);
-static ErlDrvData ttysl_start(ErlDrvPort, char*);
-
-/* Define the driver table entry. */
-struct erl_drv_entry ttsl_driver_entry = {
-    ttysl_init,
-    ttysl_start,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    "tty_sl",
-    NULL,
-    NULL,
-    NULL,
-    NULL, /* timeout */
-    NULL, /* outputv */
-    NULL, /* ready_async */
-    NULL, /* flush */
-    NULL, /* call */
-    NULL, /* event */
-    ERL_DRV_EXTENDED_MARKER,
-    ERL_DRV_EXTENDED_MAJOR_VERSION,
-    ERL_DRV_EXTENDED_MINOR_VERSION,
-    0, /* ERL_DRV_FLAGs */
-    NULL,
-    NULL, /* process_exit */
-    NULL
-};
-
-
-static int ttysl_init(void)
-{
-    return 0;
-}
-
-static ErlDrvData ttysl_start(ErlDrvPort port, char* buf)
-{
-    return ERL_DRV_ERROR_GENERAL;
-}
diff --git a/erts/emulator/drivers/unix/ttsl_drv.c b/erts/emulator/drivers/unix/ttsl_drv.c
index 25cad37e25..35ccfa589a 100644
--- a/erts/emulator/drivers/unix/ttsl_drv.c
+++ b/erts/emulator/drivers/unix/ttsl_drv.c
@@ -199,7 +199,7 @@ static void my_debug_printf(char *fmt, ...)
     erts_vsnprintf(buffer,1024,fmt,args);
     va_end(args);
     erts_fprintf(debuglog,"%s\n",buffer);
-    //erts_printf("Debuglog = %s\n",buffer);
+    /*erts_printf("Debuglog = %s\n",buffer);*/
 }
 
 #else
@@ -261,7 +261,7 @@ static int ttysl_init(void)
 	    if (debuglog != NULL)
 		setbuf(debuglog,NULL);
 	}
-	DEBUGLOG(("Debuglog = %s(0x%ld)\n",dl,(long) debuglog));
+	DEBUGLOG(("ttysl_init: Debuglog = %s(0x%ld)\n",dl,(long) debuglog));
     }
 #endif
     return 0;
@@ -277,36 +277,46 @@ static ErlDrvData ttysl_start(ErlDrvPort port, char* buf)
     int flag;
     extern int using_oldshell; /* set this to let the rest of erts know */
 
+    DEBUGLOG(("ttysl_start: driver input \"%s\", ttysl_port = %d (-1 expected)", buf, ttysl_port));
     utf8buf_size = 0;
-    if (ttysl_port != (ErlDrvPort)-1)
-      return ERL_DRV_ERROR_GENERAL;
+    if (ttysl_port != (ErlDrvPort)-1) {
+        DEBUGLOG(("ttysl_start: failure with ttysl_port = %d, not initialized properly?\n", ttysl_port));
+        return ERL_DRV_ERROR_GENERAL;
+    }
 
-    if (!isatty(0) || !isatty(1))
+    DEBUGLOG(("ttysl_start: isatty(0) = %d (1 expected), isatty(1) = %d (1 expected)", isatty(0), isatty(1)));
+    if (!isatty(0) || !isatty(1)) {
+        DEBUGLOG(("ttysl_start: failure in isatty, isatty(0) = %d, isatty(1) = %d", isatty(0), isatty(1)));
 	return ERL_DRV_ERROR_GENERAL;
+    }
 
     /* Set the terminal modes to default leave as is. */
     canon = echo = sig = 0;
 
     /* Parse the input parameters. */
     for (s = strchr(buf, ' '); s; s = t) {
-	s++;
-	/* Find end of this argument (start of next) and insert NUL. */
-	if ((t = strchr(s, ' '))) {
-	    *t = '\0';
-	}
-	if ((flag = ((*s == '+') ? 1 : ((*s == '-') ? -1 : 0)))) {
-	    if (s[1] == 'c') canon = flag;
-	    if (s[1] == 'e') echo = flag;
-	    if (s[1] == 's') sig = flag;
-	}
-	else if ((ttysl_fd = open(s, O_RDWR, 0)) < 0)
-	      return ERL_DRV_ERROR_GENERAL;
+        s++;
+        /* Find end of this argument (start of next) and insert NUL. */
+        if ((t = strchr(s, ' '))) {
+            *t = '\0';
+        }
+        if ((flag = ((*s == '+') ? 1 : ((*s == '-') ? -1 : 0)))) {
+            if (s[1] == 'c') canon = flag;
+            if (s[1] == 'e') echo = flag;
+            if (s[1] == 's') sig = flag;
+        }
+        else if ((ttysl_fd = open(s, O_RDWR, 0)) < 0) {
+            DEBUGLOG(("ttysl_start: failed to open ttysl_fd, open(%s, O_RDWR, 0)) = %d\n", s, ttysl_fd));
+            return ERL_DRV_ERROR_GENERAL;
+        }
     }
+
     if (ttysl_fd < 0)
       ttysl_fd = 0;
 
     if (tty_init(ttysl_fd, canon, echo, sig) < 0 ||
-	tty_set(ttysl_fd) < 0) {
+        tty_set(ttysl_fd) < 0) {
+        DEBUGLOG(("ttysl_start: failed init tty or set tty\n"));
 	ttysl_port = (ErlDrvPort)-1;
 	tty_reset(ttysl_fd);
 	return ERL_DRV_ERROR_GENERAL;
@@ -314,6 +324,7 @@ static ErlDrvData ttysl_start(ErlDrvPort port, char* buf)
 
     /* Set up smart line and termcap stuff. */
     if (!start_lbuf() || !start_termcap()) {
+        DEBUGLOG(("ttysl_start: failed to start_lbuf or start_termcap\n"));
 	stop_lbuf();		/* Must free this */
 	tty_reset(ttysl_fd);
 	return ERL_DRV_ERROR_GENERAL;
@@ -335,10 +346,10 @@ static ErlDrvData ttysl_start(ErlDrvPort port, char* buf)
     l = setlocale(LC_CTYPE, "");  /* Set international environment */
     if (l != NULL) {
 	utf8_mode = (strcmp(nl_langinfo(CODESET), "UTF-8") == 0);
-	DEBUGLOG(("setlocale: %s\n",l));
+	DEBUGLOG(("ttysl_start: setlocale: %s",l));
     }
 #endif
-    DEBUGLOG(("utf8_mode is %s\n",(utf8_mode) ? "on" : "off"));
+    DEBUGLOG(("ttysl_start: utf8_mode is %s",(utf8_mode) ? "on" : "off"));
     sys_signal(SIGCONT, cont);
     sys_signal(SIGWINCH, winch);
 
@@ -348,6 +359,7 @@ static ErlDrvData ttysl_start(ErlDrvPort port, char* buf)
     /* we need to know this when we enter the break handler */
     using_oldshell = 0;
 
+    DEBUGLOG(("ttysl_start: successful start\n"));
     return (ErlDrvData)ttysl_port;	/* Nothing important to return */
 #endif /* HAVE_TERMCAP */
 }
@@ -418,6 +430,7 @@ static ErlDrvSSizeT ttysl_control(ErlDrvData drv_data,
 
 static void ttysl_stop(ErlDrvData ttysl_data)
 {
+    DEBUGLOG(("ttysl_stop: ttysl_port = %d\n",ttysl_port));
     if (ttysl_port != (ErlDrvPort)-1) {
 	stop_lbuf();
 	stop_termcap();
@@ -617,12 +630,13 @@ static int check_buf_size(byte *s, int n)
     int ch;
     int size = 10;
 
+    DEBUGLOG(("check_buf_size: n = %d",n));
     while(pos < n) {
 	/* Indata is always UTF-8 */
 	if ((ch = pick_utf8(s,n,&pos)) < 0) {
 	    /* XXX temporary allow invalid chars */
 	    ch = (int) s[pos];
-	    DEBUGLOG(("Invalid UTF8:%d",ch));
+	    DEBUGLOG(("check_buf_size: Invalid UTF8:%d",ch));
 	    ++pos;
 	} 
 	if (utf8_mode) { /* That is, terminal is UTF8 compliant */
@@ -630,7 +644,7 @@ static int check_buf_size(byte *s, int n)
 #ifdef HAVE_WCWIDTH
 		int width;
 #endif
-		DEBUGLOG(("Printable(UTF-8:%d):%d",pos,ch));
+		DEBUGLOG(("check_buf_size: Printable(UTF-8:%d):%d",pos,ch));
 		size++;
 #ifdef HAVE_WCWIDTH
 		if ((width = wcwidth(ch)) > 1) {
@@ -640,21 +654,21 @@ static int check_buf_size(byte *s, int n)
 	    } else if (ch == '\t') {
 		size += 8;
 	    } else {
-		DEBUGLOG(("Magic(UTF-8:%d):%d",pos,ch));
+		DEBUGLOG(("check_buf_size: Magic(UTF-8:%d):%d",pos,ch));
 		size += 2;
 	    }
 	} else {
 	    if (ch <= 255 && isprint(ch)) {
-		DEBUGLOG(("Printable:%d",ch));
+		DEBUGLOG(("check_buf_size: Printable:%d",ch));
 		size++;
 	    } else if (ch == '\t') 
 		size += 8;
 	    else if (ch >= 128) {
-		DEBUGLOG(("Non printable:%d",ch));
+		DEBUGLOG(("check_buf_size: Non printable:%d",ch));
 		size += (octal_or_hex_positions(ch) + 1);
 	    }
 	    else {
-		DEBUGLOG(("Magic:%d",ch));
+		DEBUGLOG(("check_buf_size: Magic:%d",ch));
 		size += 2;
 	    }
 	}
@@ -664,10 +678,12 @@ static int check_buf_size(byte *s, int n)
 
 	lbuf_size = size + lpos + BUFSIZ;
 	if ((lbuf = driver_realloc(lbuf, lbuf_size * sizeof(Uint32))) == NULL) {
+            DEBUGLOG(("check_buf_size: alloc failure of %d bytes", lbuf_size * sizeof(Uint32)));
 	    driver_failure(ttysl_port, -1);
 	    return(0);
 	}
     }
+    DEBUGLOG(("check_buf_size: success\n"));
     return(1);
 }
 
@@ -685,6 +701,8 @@ static void ttysl_from_erlang(ErlDrvData ttysl_data, char* buf, ErlDrvSizeT coun
     if (lpos > MAXSIZE) 
 	put_chars((byte*)"\n", 1);
 
+    DEBUGLOG(("ttysl_from_erlang: OP = %d", buf[0]));
+
     switch (buf[0]) {
     case OP_PUTC_SYNC:
         /* Using sync means that we have to send an ok to the
@@ -695,7 +713,7 @@ static void ttysl_from_erlang(ErlDrvData ttysl_data, char* buf, ErlDrvSizeT coun
            the port_command. */
         /* fall through */
     case OP_PUTC:
-	DEBUGLOG(("OP: Putc(%lu)",(unsigned long) count-1));
+	DEBUGLOG(("ttysl_from_erlang: OP: Putc(%lu)",(unsigned long) count-1));
 	if (check_buf_size((byte*)buf+1, count-1) == 0)
 	    return; 
 	put_chars((byte*)buf+1, count-1);
@@ -738,6 +756,7 @@ static void ttysl_from_erlang(ErlDrvData ttysl_data, char* buf, ErlDrvSizeT coun
                                   ERL_DRV_USE|ERL_DRV_WRITE,1);
                     break;
                 } else {
+                    DEBUGLOG(("ttysl_from_erlang: driver failure in writev(%d,..) = %d (errno = %d)\n", ttysl_fd, written, errno));
 		    driver_failure_posix(ttysl_port, errno);
 		    return;
                 }
@@ -774,6 +793,9 @@ static void ttysl_to_tty(ErlDrvData ttysl_data, ErlDrvEvent fd) {
         ErlDrvSizeT sz;
 
         iov = driver_peekq(ttysl_port,&qlen);
+        
+        DEBUGLOG(("ttysl_to_tty: qlen = %d", qlen));
+
         if (iov)
             written = writev(ttysl_fd, iov, qlen > MAXIOV ? MAXIOV : qlen);
         else
@@ -782,6 +804,7 @@ static void ttysl_to_tty(ErlDrvData ttysl_data, ErlDrvEvent fd) {
             if (errno == EINTR) {
 	        continue;
 	    } else if (errno != ERRNO_BLOCK){
+                DEBUGLOG(("ttysl_to_tty: driver failure in writev(%d,..) = %d (errno = %d)\n", ttysl_fd, written, errno));
 	        driver_failure_posix(ttysl_port, errno);
             }
             break;
@@ -800,11 +823,13 @@ static void ttysl_to_tty(ErlDrvData ttysl_data, ErlDrvEvent fd) {
             if (sz == 0) {
                 driver_select(ttysl_port,(ErlDrvEvent)(long)ttysl_fd,
                               ERL_DRV_WRITE,0);
-                if (ttysl_terminate)
+                if (ttysl_terminate) {
                     /* flush has been called, which means we should terminate
                        when queue is empty. This will not send any exit
                        message */
+                    DEBUGLOG(("ttysl_to_tty: ttysl_terminate normal\n"));
                     driver_failure_atom(ttysl_port, "normal");
+		}
                 break;
             }
         }
@@ -814,6 +839,7 @@ static void ttysl_to_tty(ErlDrvData ttysl_data, ErlDrvEvent fd) {
 }
 
 static void ttysl_flush_tty(ErlDrvData ttysl_data) {
+    DEBUGLOG(("ttysl_flush_tty: .."));
     ttysl_terminate = 1;
     return;
 }
@@ -834,6 +860,8 @@ static void ttysl_from_tty(ErlDrvData ttysl_data, ErlDrvEvent fd)
 	p += utf8buf_size;
 	utf8buf_size = 0;
     }
+
+    DEBUGLOG(("ttysl_from_tty: remainder = %d", left));
     
     if ((i = read((int)(SWord)fd, (char *) p, left)) >= 0) {
 	if (p != b) {
@@ -847,7 +875,7 @@ static void ttysl_from_tty(ErlDrvData ttysl_data, ErlDrvEvent fd)
 		utf8buf_size = i -pos;
 		memcpy(utf8buf,b+pos,utf8buf_size);
 	    } else if (ch == -1) {
-		DEBUGLOG(("Giving up on UTF8 mode, invalid character"));
+		DEBUGLOG(("ttysl_from_tty: Giving up on UTF8 mode, invalid character"));
 		utf8_mode = 0;
 		goto latin_terminal;
 	    }
@@ -864,6 +892,7 @@ static void ttysl_from_tty(ErlDrvData ttysl_data, ErlDrvEvent fd)
 	    }
 	}
     } else {
+        DEBUGLOG(("ttysl_from_tty: driver failure in read(%d,..) = %d\n", (int)(SWord)fd, i)); 
 	driver_failure(ttysl_port, -1);
     }
 }
@@ -1155,7 +1184,7 @@ static int write_buf(Uint32 *s, int n)
 	    byte *octbuff;
 	    byte octtmp[256];
 	    int octbytes;
-	    DEBUGLOG(("Escaped: %d", ch));
+	    DEBUGLOG(("write_buf: Escaped: %d", ch));
 	    octbytes = octal_or_hex_positions(ch);
 	    if (octbytes > 256) {
 		octbuff = driver_alloc(octbytes);
@@ -1164,11 +1193,11 @@ static int write_buf(Uint32 *s, int n)
 	    }
 	    octbytes = 0;
 	    octal_or_hex_format(ch, octbuff, &octbytes);
-	     DEBUGLOG(("octbytes: %d", octbytes));
+            DEBUGLOG(("write_buf: octbytes: %d", octbytes));
 	    outc('\\');
 	    for (i = 0; i < octbytes; ++i) {
 		outc(lastput = octbuff[i]);
-		DEBUGLOG(("outc: %d", (int) lastput));
+		DEBUGLOG(("write_buf: outc: %d", (int) lastput));
 	    }
 	    n -= octbytes+1;
 	    s += octbytes+1;
@@ -1180,7 +1209,7 @@ static int write_buf(Uint32 *s, int n)
 	    --n; s++;
 #endif
 	} else {
-	    DEBUGLOG(("Very unexpected character %d",(int) *s));
+	    DEBUGLOG(("write_buf: Very unexpected character %d",(int) *s));
 	    ++n;
 	    --s;
 	}
@@ -1242,6 +1271,9 @@ static int start_termcap(void)
     size_t envsz = 1024;
     char *env = NULL;
     char *c;
+    int tres;
+
+    DEBUGLOG(("start_termcap: .."));
 
     capbuf = driver_alloc(1024);
     if (!capbuf)
@@ -1249,9 +1281,10 @@ static int start_termcap(void)
     eres = erl_drv_getenv("TERM", capbuf, &envsz);
     if (eres == 0)
 	env = capbuf;
-    else if (eres < 0)
+    else if (eres < 0) {
+        DEBUGLOG(("start_termcap: failure in erl_drv_getenv(\"TERM\", ..) = %d\n", eres));
 	goto false;
-    else /* if (eres > 1) */ {
+    } else /* if (eres > 1) */ {
       char *envbuf = driver_alloc(envsz);
       if (!envbuf)
 	  goto false;
@@ -1261,7 +1294,8 @@ static int start_termcap(void)
 	  if (eres == 0)
 	      break;
 	  newenvbuf = driver_realloc(envbuf, envsz);
-	  if (eres < 0 || !newenvbuf) {
+          if (eres < 0 || !newenvbuf) {
+              DEBUGLOG(("start_termcap: failure in erl_drv_getenv(\"TERM\", ..) = %d or realloc buf == %p\n", eres, newenvbuf));
 	      env = newenvbuf ? newenvbuf : envbuf;
 	      goto false;
 	  }
@@ -1269,8 +1303,10 @@ static int start_termcap(void)
       }
       env = envbuf;
     }
-    if (tgetent((char*)lbuf, env) <= 0)
-      goto false;
+    if ((tres = tgetent((char*)lbuf, env)) <= 0) {
+        DEBUGLOG(("start_termcap: failure in tgetent(..) = %d\n", tres));
+        goto false;
+    }
     if (env != capbuf) {
 	env = NULL;
 	driver_free(env);
@@ -1286,8 +1322,11 @@ static int start_termcap(void)
     if (!(left = tgetflag("bs") ? "\b" : tgetstr("bc", &c)))
       left = "\b";		/* Can't happen - but does on Solaris 2 */
     right = tgetstr("nd", &c);
-    if (up && down && left && right)
-      return TRUE;
+    if (up && down && left && right) {
+        DEBUGLOG(("start_termcap: successful start\n"));
+        return TRUE;
+    }
+    DEBUGLOG(("start_termcap: failed start\n"));
  false:
     if (env && env != capbuf)
 	driver_free(env);
@@ -1364,10 +1403,13 @@ static void update_cols(void)
 
 static struct termios tty_smode, tty_rmode;
 
-static int tty_init(int fd, int canon, int echo, int sig)
-{
-    if (tcgetattr(fd, &tty_rmode) < 0)
-      return -1;
+static int tty_init(int fd, int canon, int echo, int sig) {
+    int tres;
+    DEBUGLOG(("tty_init: fd = %d, canon = %d, echo = %d, sig = %d", fd, canon, echo, sig));
+    if ((tres = tcgetattr(fd, &tty_rmode)) < 0) {
+        DEBUGLOG(("tty_init: failure in tcgetattr(%d,..) = %d\n", fd, tres));
+        return -1;
+    }
     tty_smode = tty_rmode;
 
     /* Default characteristics for all usage including termcap output. */
@@ -1420,6 +1462,7 @@ static int tty_init(int fd, int canon, int echo, int sig)
 #endif	
 	tty_smode.c_lflag &= ~(ISIG|IEXTEN);
     }
+    DEBUGLOG(("tty_init: successful init\n"));
     return 0;
 }
 
@@ -1430,20 +1473,25 @@ static int tty_init(int fd, int canon, int echo, int sig)
 
 static int tty_set(int fd)
 {
-    DEBUGF(("Setting tty...\n"));
+    int tres;
+    DEBUGF(("tty_set: Setting tty...\n"));
 
-    if (tcsetattr(fd, TCSANOW, &tty_smode) < 0)
+    if ((tres = tcsetattr(fd, TCSANOW, &tty_smode)) < 0) {
+        DEBUGLOG(("tty_set: failure in tcgetattr(%d,..) = %d\n", fd, tres));
 	return(-1);
+    }
     return(0);
 }
 
 static int tty_reset(int fd)         /* of terminal device */
 {
-    DEBUGF(("Resetting tty...\n"));
+    int tres;
+    DEBUGF(("tty_reset: Resetting tty...\n"));
 
-    if (tcsetattr(fd, TCSANOW, &tty_rmode) < 0)
+    if ((tres = tcsetattr(fd, TCSANOW, &tty_rmode)) < 0) {
+        DEBUGLOG(("tty_reset: failure in tcsetattr(%d,..) = %d\n", fd, tres));
 	return(-1);
-    
+    }
     return(0);
 }
 
@@ -1458,6 +1506,7 @@ static int tty_reset(int fd)         /* of terminal device */
 static RETSIGTYPE suspend(int sig)
 {
     if (tty_reset(ttysl_fd) < 0) {
+        DEBUGLOG(("signal: failure in suspend(%d), can't reset tty %d\n", sig, ttysl_fd));
 	fprintf(stderr,"Can't reset tty \n");
 	exit(1);
     }
@@ -1469,6 +1518,7 @@ static RETSIGTYPE suspend(int sig)
     sys_signal(sig, suspend);	/* Reset signal handler */ 
 
     if (tty_set(ttysl_fd) < 0) {
+        DEBUGLOG(("signal: failure in suspend(%d), can't set tty %d\n", sig, ttysl_fd));
 	fprintf(stderr,"Can't set tty raw \n");
 	exit(1);
     }
@@ -1479,6 +1529,7 @@ static RETSIGTYPE suspend(int sig)
 static RETSIGTYPE cont(int sig)
 {
     if (tty_set(ttysl_fd) < 0) {
+        DEBUGLOG(("signal: failure in cont(%d), can't set tty raw %d\n", sig, ttysl_fd));
 	fprintf(stderr,"Can't set tty raw\n");
 	exit(1);
     }
diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c
index 46eccc6568..0861435264 100644
--- a/erts/emulator/drivers/unix/unix_efile.c
+++ b/erts/emulator/drivers/unix/unix_efile.c
@@ -39,6 +39,11 @@
 #ifdef HAVE_SYS_UIO_H
 #include <sys/types.h>
 #include <sys/uio.h>
+#if defined(HAVE_SENDFILE) && (defined(__FreeBSD__) || defined(__DragonFly__))
+/* Need to define __BSD_VISIBLE in order to expose prototype of sendfile */
+#define __BSD_VISIBLE 1
+#include <sys/socket.h>
+#endif
 #endif
 #if defined(HAVE_SENDFILE) && (defined(__linux__) || (defined(__sun) && defined(__SVR4)))
 #include <sys/sendfile.h>
@@ -462,7 +467,7 @@ int
 efile_fdatasync(Efile_error *errInfo, /* Where to return error codes. */
 	    int fd)               /* File descriptor for file to sync data. */
 {
-#ifdef HAVE_FDATASYNC
+#if defined(HAVE_FDATASYNC) && !defined(__DARWIN__)
     return check_error(fdatasync(fd), errInfo);
 #else
     return efile_fsync(errInfo, fd);
@@ -532,9 +537,9 @@ efile_fileinfo(Efile_error* errInfo, Efile_info* pInfo,
     else
 	pInfo->type = FT_OTHER;
 
-    pInfo->accessTime   = statbuf.st_atime;
-    pInfo->modifyTime   = statbuf.st_mtime;
-    pInfo->cTime        = statbuf.st_ctime;
+    pInfo->accessTime   = (Sint64)statbuf.st_atime;
+    pInfo->modifyTime   = (Sint64)statbuf.st_mtime;
+    pInfo->cTime        = (Sint64)statbuf.st_ctime;
 
     pInfo->mode         = statbuf.st_mode;
     pInfo->links        = statbuf.st_nlink;
@@ -573,8 +578,8 @@ efile_write_info(Efile_error *errInfo, Efile_info *pInfo, char *name)
 	}
     }
 
-    tval.actime  = pInfo->accessTime;
-    tval.modtime = pInfo->modifyTime;
+    tval.actime  = (time_t)pInfo->accessTime;
+    tval.modtime = (time_t)pInfo->modifyTime;
 
     return check_error(utime(name, &tval), errInfo);
 }
@@ -633,12 +638,21 @@ efile_writev(Efile_error* errInfo,   /* Where to return error codes */
 		do {
 		    w = writev(fd, &iov[cnt], b);
 		} while (w < 0 && errno == EINTR);
+		if (w < 0 && errno == EINVAL) {
+		    goto single_write;
+		}
 	    } else
+	    single_write:
 		/* Degenerated io vector - use regular write */
 #endif
 		{
 		    do {
-			w = write(fd, iov[cnt].iov_base, iov[cnt].iov_len);
+			size_t iov_len = iov[cnt].iov_len;
+			size_t limit = 1024*1024*1024; /* 1GB */
+			if (iov_len > limit) {
+			    iov_len = limit;
+			}
+			w = write(fd, iov[cnt].iov_base, iov_len);
 		    } while (w < 0 && errno == EINTR);
 		    ASSERT(w <= iov[cnt].iov_len ||
 			   (w == -1 && errno != EINTR));
diff --git a/erts/emulator/drivers/win32/win_con.c b/erts/emulator/drivers/win32/win_con.c
index 0d63d46698..7fe708dc7b 100644
--- a/erts/emulator/drivers/win32/win_con.c
+++ b/erts/emulator/drivers/win32/win_con.c
@@ -279,7 +279,7 @@ ConInit(void)
 }
 
 /*
-  ConNormalExit() is called from erl_exit() when the emulator
+  ConNormalExit() is called from erts_exit() when the emulator
   is stopping. If the exit has not been initiated by this 
   console thread (WM_DESTROY or ID_BREAK), the function must 
   invoke the console thread to save the user preferences.
@@ -529,7 +529,7 @@ ConThreadInit(LPVOID param)
     /*
        PostQuitMessage() results in WM_QUIT which makes GetMessage()
        return 0 (which stops the main loop). Before we return from
-       the console thread, the ctrl_handler is called to do erl_exit. 
+       the console thread, the ctrl_handler is called to do erts_exit.
     */
     (*ctrl_handler)(CTRL_CLOSE_EVENT);
     return msg.wParam;
diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c
index cc68e1f74d..70354aa9af 100644
--- a/erts/emulator/hipe/hipe_bif0.c
+++ b/erts/emulator/hipe/hipe_bif0.c
@@ -406,7 +406,7 @@ BIF_RETTYPE hipe_bifs_enter_code_2(BIF_ALIST_2)
 	    nrcallees = arityval(tuple_val(BIF_ARG_2)[0]);
 	else
 	    nrcallees = 0;
-	erl_exit(1, "%s: failed to allocate %lu bytes and %lu trampolines\r\n",
+	erts_exit(ERTS_ERROR_EXIT, "%s: failed to allocate %lu bytes and %lu trampolines\r\n",
 		 __func__, (unsigned long)nrbytes, (unsigned long)nrcallees);
     }
     memcpy(address, bytes, nrbytes);
@@ -488,7 +488,7 @@ static void *const_term_alloc(void *tmpl)
     alloc_size = size + (offsetof(struct const_term, mem)/sizeof(Eterm));
     hipe_constants_size += alloc_size;
 
-    p = (struct const_term*)erts_alloc(ERTS_ALC_T_HIPE, alloc_size * sizeof(Eterm));
+    p = (struct const_term*)erts_alloc(ERTS_ALC_T_LITERAL, alloc_size * sizeof(Eterm));
 
     /* I have absolutely no idea if having a private 'off_heap'
        works or not. _Some_ off_heap object is required for
@@ -497,6 +497,8 @@ static void *const_term_alloc(void *tmpl)
     hp = &p->mem[0];
     p->val = copy_struct(obj, size, &hp, &const_term_table_off_heap);
 
+    erts_set_literal_tag(&p->val, &p->mem[0], size);
+
     return &p->bucket;
 }
 
@@ -507,6 +509,9 @@ static void init_const_term_table(void)
     f.cmp = (HCMP_FUN) const_term_cmp;
     f.alloc = (HALLOC_FUN) const_term_alloc;
     f.free = (HFREE_FUN) NULL;
+    f.meta_alloc = (HMALLOC_FUN) erts_alloc;
+    f.meta_free = (HMFREE_FUN) erts_free;
+    f.meta_print = (HMPRINT_FUN) erts_print;
     hash_init(ERTS_ALC_T_HIPE, &const_term_table, "const_term_table", 97, f);
 }
 
@@ -574,15 +579,15 @@ static void print_mfa(Eterm mod, Eterm fun, unsigned int ari)
 static Uint *hipe_find_emu_address(Eterm mod, Eterm name, unsigned int arity)
 {
     Module *modp;
-    Uint *code_base;
+    BeamCodeHeader* code_hdr;
     int i, n;
 
     modp = erts_get_module(mod, erts_active_code_ix());
-    if (modp == NULL || (code_base = modp->curr.code) == NULL)
+    if (modp == NULL || (code_hdr = modp->curr.code_hdr) == NULL)
 	return NULL;
-    n = code_base[MI_NUM_FUNCTIONS];
+    n = code_hdr->num_functions;
     for (i = 0; i < n; ++i) {
-	Uint *code_ptr = (Uint*)code_base[MI_FUNCTIONS+i];
+	Uint *code_ptr = (Uint*)code_hdr->functions[i];
 	ASSERT(code_ptr[0] == BeamOpCode(op_i_func_info_IaaI));
 	if (code_ptr[3] == name && code_ptr[4] == arity)
 	    return code_ptr+5;
@@ -715,6 +720,9 @@ static void init_nbif_table(void)
     f.cmp = (HCMP_FUN) nbif_cmp;
     f.alloc = (HALLOC_FUN) nbif_alloc;
     f.free = NULL;
+    f.meta_alloc = (HMALLOC_FUN) erts_alloc;
+    f.meta_free = (HMFREE_FUN) erts_free;
+    f.meta_print = (HMPRINT_FUN) erts_print;
 
     hash_init(ERTS_ALC_T_NBIF_TABLE, &nbif_table, "nbif_table", 500, f);
 
@@ -808,6 +816,9 @@ static void init_primop_table(void)
     f.cmp = (HCMP_FUN) primop_cmp;
     f.alloc = (HALLOC_FUN) primop_alloc;
     f.free = NULL;
+    f.meta_alloc = (HMALLOC_FUN) erts_alloc;
+    f.meta_free = (HMFREE_FUN) erts_free;
+    f.meta_print = (HMPRINT_FUN) erts_print;
 
     hash_init(ERTS_ALC_T_HIPE, &primop_table, "primop_table", 50, f);
 
@@ -1311,7 +1322,7 @@ static void *hipe_make_stub(Eterm m, Eterm f, unsigned int arity, int is_remote)
     export_entry = erts_export_get_or_make_stub(m, f, arity);
     StubAddress = hipe_make_native_stub(export_entry, arity);
     if (!StubAddress)
-	erl_exit(1, "hipe_make_stub: code allocation failed\r\n");
+	erts_exit(ERTS_ERROR_EXIT, "hipe_make_stub: code allocation failed\r\n");
     return StubAddress;
 }
 
@@ -1826,6 +1837,9 @@ static void init_modinfo_table(void)
     f.cmp = (HCMP_FUN) modinfo_cmp;
     f.alloc = (HALLOC_FUN) modinfo_alloc;
     f.free = (HFREE_FUN) NULL;
+    f.meta_alloc = (HMALLOC_FUN) erts_alloc;
+    f.meta_free = (HMFREE_FUN) erts_free;
+    f.meta_print = (HMPRINT_FUN) erts_print;
     hash_init(ERTS_ALC_T_HIPE, &modinfo_table, "modinfo_table", 11, f);
 }
 
diff --git a/erts/emulator/hipe/hipe_bif0.tab b/erts/emulator/hipe/hipe_bif0.tab
index e3328c7d2c..5ce254314a 100644
--- a/erts/emulator/hipe/hipe_bif0.tab
+++ b/erts/emulator/hipe/hipe_bif0.tab
@@ -142,4 +142,4 @@ atom bs_validate_unicode
 atom bs_validate_unicode_retract
 atom emulate_fpe
 atom emasculate_binary
-
+atom is_divisible
diff --git a/erts/emulator/hipe/hipe_bif_list.m4 b/erts/emulator/hipe/hipe_bif_list.m4
index 6aa0c9a32e..7240280345 100644
--- a/erts/emulator/hipe/hipe_bif_list.m4
+++ b/erts/emulator/hipe/hipe_bif_list.m4
@@ -193,6 +193,7 @@ standard_bif_interface_2(nbif_rethrow, hipe_rethrow)
 standard_bif_interface_3(nbif_find_na_or_make_stub, hipe_find_na_or_make_stub)
 standard_bif_interface_2(nbif_nonclosure_address, hipe_nonclosure_address)
 nocons_nofail_primop_interface_0(nbif_fclearerror_error, hipe_fclearerror_error)
+standard_bif_interface_2(nbif_is_divisible, hipe_is_divisible)
 
 /*
  * Mbox primops with implicit P parameter.
diff --git a/erts/emulator/hipe/hipe_gc.c b/erts/emulator/hipe/hipe_gc.c
index 2c747771ac..2e19bf88bf 100644
--- a/erts/emulator/hipe/hipe_gc.c
+++ b/erts/emulator/hipe/hipe_gc.c
@@ -46,10 +46,6 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
     /* arch-specific nstack walk state */
     struct nstack_walk_state walk_state;
 
-    /* fullsweep-specific state */
-    char *src, *oh;
-    Uint src_size, oh_size;
-
     if (!p->hipe.nstack) {
 	ASSERT(!p->hipe.nsp && !p->hipe.nstend);
 	return n_htop;
@@ -66,11 +62,6 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
 
     sdesc = nstack_walk_init_sdesc(p, &walk_state);
 
-    src = (char*)HEAP_START(p);
-    src_size = (char*)HEAP_TOP(p) - src;
-    oh = (char*)OLD_HEAP(p);
-    oh_size = (char*)OLD_HTOP(p) - oh;
-
     for (;;) {
 	if (nstack_walk_nsp_reached_end(nsp, nsp_end)) {
 	    if (nsp == nsp_end) {
@@ -97,8 +88,7 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
 		    if (IS_MOVED_BOXED(val)) {
 			ASSERT(is_boxed(val));
 			*nsp_i = val;
-		    } else if (in_area(ptr, src, src_size) ||
-			       in_area(ptr, oh, oh_size)) {
+		    } else if (!erts_is_literal(gval, ptr)) {
 			MOVE_BOXED(ptr, val, n_htop, nsp_i);
 		    }
 		} else if (is_list(gval)) {
@@ -106,8 +96,7 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
 		    Eterm val = *ptr;
 		    if (IS_MOVED_CONS(val)) {
 			*nsp_i = ptr[1];
-		    } else if (in_area(ptr, src, src_size) ||
-			       in_area(ptr, oh, oh_size)) {
+		    } else if (!erts_is_literal(gval, ptr)) {
 			ASSERT(within(ptr, p));
 			MOVE_CONS(ptr, val, n_htop, nsp_i);
 		    }
@@ -139,11 +128,13 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
     unsigned int mask;
     /* arch-specific nstack walk state */
     struct nstack_walk_state walk_state;
+    char *oh;
+    Uint oh_size;
 
     /* gensweep-specific state */
     Eterm *old_htop, *n_htop;
-    char *heap;
-    Uint heap_size, mature_size;
+    char *mature;
+    Uint mature_size;
 
     if (!p->hipe.nstack) {
 	ASSERT(!p->hipe.nsp && !p->hipe.nstend);
@@ -168,9 +159,10 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
 
     old_htop = *ptr_old_htop;
     n_htop = *ptr_n_htop;
-    heap = (char*)HEAP_START(p);
-    heap_size = (char*)HEAP_TOP(p) - heap;
-    mature_size = (char*)HIGH_WATER(p) - heap;
+    mature = (char *) (p->abandoned_heap ? p->abandoned_heap : p->heap);
+    mature_size = (char*)HIGH_WATER(p) - mature;
+    oh = (char*)OLD_HEAP(p);
+    oh_size = (char*)OLD_HTOP(p) - oh;
 
     for (;;) {
 	if (nstack_walk_nsp_reached_end(nsp, nsp_end)) {
@@ -209,9 +201,9 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
 		    if (IS_MOVED_BOXED(val)) {
 			ASSERT(is_boxed(val));
 			*nsp_i = val;
-		    } else if (in_area(ptr, heap, mature_size)) {
+		    } else if (ErtsInArea(ptr, mature, mature_size)) {
 			MOVE_BOXED(ptr, val, old_htop, nsp_i);
-		    } else if (in_area(ptr, heap, heap_size)) {
+		    } else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
 			ASSERT(within(ptr, p));
 			MOVE_BOXED(ptr, val, n_htop, nsp_i);
 		    }
@@ -220,9 +212,9 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
 		    Eterm val = *ptr;
 		    if (IS_MOVED_CONS(val)) {
 			*nsp_i = ptr[1];
-		    } else if (in_area(ptr, heap, mature_size)) {
+		    } else if (ErtsInArea(ptr, mature, mature_size)) {
 			MOVE_CONS(ptr, val, old_htop, nsp_i);
-		    } else if (in_area(ptr, heap, heap_size)) {
+		    } else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
 			ASSERT(within(ptr, p));
 			MOVE_CONS(ptr, val, n_htop, nsp_i);
 		    }
diff --git a/erts/emulator/hipe/hipe_mode_switch.c b/erts/emulator/hipe/hipe_mode_switch.c
index 968452a641..804c458b6c 100644
--- a/erts/emulator/hipe/hipe_mode_switch.c
+++ b/erts/emulator/hipe/hipe_mode_switch.c
@@ -108,7 +108,7 @@ static const char *code_str(unsigned code)
 static void __noreturn
 hipe_abort(const char *expr, const char *file, unsigned line)
 {
-    erl_exit(1, "ASSERTION FAILED, file %s, line %u: %s\r\n", file, line, expr);
+    erts_exit(ERTS_ERROR_EXIT, "ASSERTION FAILED, file %s, line %u: %s\r\n", file, line, expr);
 }
 
 #define HIPE_ASSERT3(expr, file, line) \
@@ -196,7 +196,7 @@ hipe_push_beam_trap_frame(Process *p, Eterm reg[], unsigned arity)
 	ASSERT(!(p->flags & F_DISABLE_GC));
 	if ((p->stop - 2) < p->htop) {
 	    DPRINTF("calling gc to increase BEAM stack size");
-	    p->fcalls -= erts_garbage_collect(p, 2, reg, arity);
+	    erts_garbage_collect(p, 2, reg, arity);
 	    ASSERT(!((p->stop - 2) < p->htop));
 	}
 	p->stop -= 2;
@@ -316,7 +316,7 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[])
 	  break;
       }
       default:
-	erl_exit(1, "hipe_mode_switch: cmd %#x\r\n", cmd);
+	erts_exit(ERTS_ERROR_EXIT, "hipe_mode_switch: cmd %#x\r\n", cmd);
     }
  do_return_from_native:
     DPRINTF("result == %#x (%s)", result, code_str(result));
@@ -560,7 +560,7 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[])
 	  goto do_throw_to_native;
       }
       default:
-	erl_exit(1, "hipe_mode_switch: result %#x\r\n", result);
+	erts_exit(ERTS_ERROR_EXIT, "hipe_mode_switch: result %#x\r\n", result);
     }
     HIPE_CHECK_PCB(p);
     p->def_arg_reg[3] = result;
diff --git a/erts/emulator/hipe/hipe_mode_switch.h b/erts/emulator/hipe/hipe_mode_switch.h
index bc863a4f36..620cc6356b 100644
--- a/erts/emulator/hipe/hipe_mode_switch.h
+++ b/erts/emulator/hipe/hipe_mode_switch.h
@@ -95,7 +95,7 @@ ERTS_GLB_INLINE void hipe_reserve_beam_trap_frame(Process *p, Eterm reg[], unsig
 
     /* ensure that at least 2 words are available on the BEAM stack */
     if ((p->stop - 2) < p->htop) {
-	p->fcalls -= erts_garbage_collect(p, 2, reg, arity);
+	erts_garbage_collect(p, 2, reg, arity);
 	ASSERT(!((p->stop - 2) < p->htop));
     }
     p->stop -= 2;
diff --git a/erts/emulator/hipe/hipe_native_bif.c b/erts/emulator/hipe/hipe_native_bif.c
index 688378b2fe..0ec417999b 100644
--- a/erts/emulator/hipe/hipe_native_bif.c
+++ b/erts/emulator/hipe/hipe_native_bif.c
@@ -80,7 +80,7 @@ Eterm hipe_show_nstack_1(BIF_ALIST_1)
 void hipe_gc(Process *p, Eterm need)
 {
     hipe_set_narity(p, 1);
-    p->fcalls -= erts_garbage_collect(p, unsigned_val(need), NULL, 0);
+    erts_garbage_collect(p, unsigned_val(need), NULL, 0);
     hipe_set_narity(p, 0);
 }
 
@@ -157,13 +157,22 @@ BIF_RETTYPE hipe_set_timeout(BIF_ALIST_1)
  */
 void hipe_select_msg(Process *p)
 {
-    ErlMessage *msgp;
+    ErtsMessage *msgp;
 
     msgp = PEEK_MESSAGE(p);
     UNLINK_MESSAGE(p, msgp);	/* decrements global 'erts_proc_tot_mem' variable */
     JOIN_MESSAGE(p);
     CANCEL_TIMER(p);		/* calls erts_cancel_proc_timer() */
-    free_message(msgp);
+    erts_save_message_in_proc(p, msgp);
+    p->flags &= ~F_DELAY_GC;
+    if (ERTS_IS_GC_DESIRED(p)) {
+	/*
+	 * We want to GC soon but we leave a few
+	 * reductions giving the message some time
+	 * to turn into garbage.
+	 */
+	ERTS_VBUMP_LEAVE_REDS(p, 5);
+    }
 }
 
 void hipe_fclearerror_error(Process *p)
@@ -171,7 +180,7 @@ void hipe_fclearerror_error(Process *p)
 #if !defined(NO_FPE_SIGNALS)
     erts_fp_check_init_error(&p->fp_exception);
 #else
-    erl_exit(ERTS_ABORT_EXIT, "Emulated FPE not cleared by HiPE");
+    erts_exit(ERTS_ABORT_EXIT, "Emulated FPE not cleared by HiPE");
 #endif
 }
 
@@ -504,12 +513,25 @@ int hipe_bs_validate_unicode_retract(ErlBinMatchBuffer* mb, Eterm arg)
     return 1;
 }
 
+BIF_RETTYPE hipe_is_divisible(BIF_ALIST_2)
+{
+    /* Arguments are Eterm-sized unsigned integers */
+    Uint dividend = BIF_ARG_1;
+    Uint divisor = BIF_ARG_2;
+    if (dividend % divisor) {
+	BIF_ERROR(BIF_P, BADARG);
+    } else {
+	return NIL;
+    }
+}
+
 /* This is like the loop_rec_fr BEAM instruction
  */
 Eterm hipe_check_get_msg(Process *c_p)
 {
-    Eterm ret;
-    ErlMessage *msgp;
+    ErtsMessage *msgp;
+
+    c_p->flags |= F_DELAY_GC;
 
  next_message:
 
@@ -531,25 +553,29 @@ Eterm hipe_check_get_msg(Process *c_p)
 	    /* XXX: BEAM doesn't need this */
 	    c_p->hipe_smp.have_receive_locks = 1;
 #endif
+	    c_p->flags &= ~F_DELAY_GC;
 	    return THE_NON_VALUE;
 #ifdef ERTS_SMP
 	}
 #endif
     }
-    ErtsMoveMsgAttachmentIntoProc(msgp, c_p, c_p->stop, HEAP_TOP(c_p),
-				  c_p->fcalls, (void) 0, (void) 0);
-    ret = ERL_MESSAGE_TERM(msgp);
-    if (is_non_value(ret)) {
+
+    if (is_non_value(ERL_MESSAGE_TERM(msgp))
+	&& !erts_decode_dist_message(c_p, ERTS_PROC_LOCK_MAIN, msgp, 0)) {
 	/*
 	 * A corrupt distribution message that we weren't able to decode;
 	 * remove it...
 	 */
 	ASSERT(!msgp->data.attached);
 	UNLINK_MESSAGE(c_p, msgp);
-	free_message(msgp);
+	msgp->next = NULL;
+	erts_cleanup_messages(msgp);
 	goto next_message;
     }
-    return ret;
+
+    ASSERT(is_value(ERL_MESSAGE_TERM(msgp)));
+
+    return ERL_MESSAGE_TERM(msgp);
 }
 
 /*
diff --git a/erts/emulator/hipe/hipe_native_bif.h b/erts/emulator/hipe/hipe_native_bif.h
index 0e1a75f7eb..55a0d3bb1b 100644
--- a/erts/emulator/hipe/hipe_native_bif.h
+++ b/erts/emulator/hipe/hipe_native_bif.h
@@ -68,6 +68,7 @@ AEXTERN(Eterm,nbif_bs_put_utf16le,(Process*,Eterm,byte*,unsigned int));
 AEXTERN(Eterm,nbif_bs_get_utf16,(void));
 AEXTERN(Eterm,nbif_bs_validate_unicode,(Process*,Eterm));
 AEXTERN(Eterm,nbif_bs_validate_unicode_retract,(void));
+AEXTERN(void,nbif_is_divisible,(Process*,Uint,Uint));
 
 AEXTERN(void,nbif_select_msg,(Process*));
 AEXTERN(Eterm,nbif_cmp_2,(void));
@@ -93,6 +94,7 @@ BIF_RETTYPE hipe_bs_put_utf16le(BIF_ALIST_3);
 BIF_RETTYPE hipe_bs_validate_unicode(BIF_ALIST_1);
 struct erl_bin_match_buffer;
 int hipe_bs_validate_unicode_retract(struct erl_bin_match_buffer*, Eterm);
+BIF_RETTYPE hipe_is_divisible(BIF_ALIST_2);
 
 #ifdef NO_FPE_SIGNALS
 AEXTERN(void,nbif_emulate_fpe,(Process*));
diff --git a/erts/emulator/hipe/hipe_primops.h b/erts/emulator/hipe/hipe_primops.h
index adf7b1f382..0bec677574 100644
--- a/erts/emulator/hipe/hipe_primops.h
+++ b/erts/emulator/hipe/hipe_primops.h
@@ -68,6 +68,8 @@ PRIMOP_LIST(am_bs_get_utf16, &nbif_bs_get_utf16)
 PRIMOP_LIST(am_bs_validate_unicode, &nbif_bs_validate_unicode)
 PRIMOP_LIST(am_bs_validate_unicode_retract, &nbif_bs_validate_unicode_retract)
 
+PRIMOP_LIST(am_is_divisible, &nbif_is_divisible)
+
 PRIMOP_LIST(am_cmp_2, &nbif_cmp_2)
 PRIMOP_LIST(am_op_exact_eqeq_2, &nbif_eq_2)
 
diff --git a/erts/emulator/hipe/hipe_x86_signal.c b/erts/emulator/hipe/hipe_x86_signal.c
index b7dae88417..0ecd13c4bc 100644
--- a/erts/emulator/hipe/hipe_x86_signal.c
+++ b/erts/emulator/hipe/hipe_x86_signal.c
@@ -38,9 +38,6 @@
  *
  * Our solution is to override the C library's signal handler setup
  * procedure with our own which enforces the SA_ONSTACK flag.
- *
- * XXX: This code only supports Linux with glibc-2.1 or above,
- * and Solaris 8.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -55,27 +52,6 @@
 #include "hipe_signal.h"
 
 #if __GLIBC__ == 2 && (__GLIBC_MINOR__ >= 3)
-/* See comment below for glibc 2.2. */
-#ifndef __USE_GNU
-#define __USE_GNU		/* to un-hide RTLD_NEXT */
-#endif
-#include <dlfcn.h>
-static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
-#define init_done()	(__next_sigaction != 0)
-extern int __sigaction(int, const struct sigaction*, struct sigaction*);
-#define __SIGACTION __sigaction
-static void do_init(void)
-{
-    __next_sigaction = dlsym(RTLD_NEXT, "__sigaction");
-    if (__next_sigaction != 0)
-	return;
-    perror("dlsym");
-    abort();
-}
-#define INIT()	do { if (!init_done()) do_init(); } while (0)
-#endif	/* glibc 2.3 */
-
-#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 2 /*|| __GLIBC_MINOR__ == 3*/)
 /*
  * __libc_sigaction() is the core routine.
  * Without libpthread, sigaction() and __sigaction() are both aliases
@@ -100,65 +76,14 @@ static void do_init(void)
  * old BSD or SysV interfaces.
  * glibc's internal calls to __sigaction() appear to be mostly safe.
  * hipe_signal_init() fixes some unsafe ones, e.g. the SIGPROF handler.
- *
- * Tested with glibc-2.1.92 on RedHat 7.0, glibc-2.2.2 on RedHat 7.1,
- * glibc-2.2.4 on RedHat 7.2, and glibc-2.2.5 on RedHat 7.3.
  */
-#if 0
-/* works with 2.2.5 and 2.2.4, but not 2.2.2 or 2.1.92 */
+#ifndef __USE_GNU
 #define __USE_GNU		/* to un-hide RTLD_NEXT */
-#include <dlfcn.h>
-static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
-#define init_done()	(__next_sigaction != 0)
-#define __SIGACTION __sigaction
-static void do_init(void)
-{
-    __next_sigaction = dlsym(RTLD_NEXT, "__sigaction");
-    if (__next_sigaction != 0)
-	return;
-    perror("dlsym");
-    abort();
-}
-#define INIT()	do { if (!init_done()) do_init(); } while (0)
-#else
-/* semi-works with all 2.2 versions so far */
-extern int __sigaction(int, const struct sigaction*, struct sigaction*);
-#define __next_sigaction __sigaction	/* pthreads-aware version */
-#undef __SIGACTION	/* we can't override __sigaction() */
-#define INIT()		do{}while(0)
 #endif
-#endif	/* glibc 2.2 */
-
-#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 1
-/*
- * __sigaction() is the core routine.
- * Without libpthread, sigaction() is an alias for __sigaction().
- * libpthread redefines sigaction() as a non-trivial wrapper around
- * __sigaction().
- * glibc has internal calls to both sigaction() and __sigaction().
- *
- * Overriding __sigaction() would be ideal, but doing so breaks
- * libpthread (threads hang). Instead we override sigaction() and
- * use dlsym RTLD_NEXT to find glibc's version of sigaction().
- * glibc's internal calls to __sigaction() appear to be mostly safe.
- * hipe_signal_init() fixes some unsafe ones, e.g. the SIGPROF handler.
- *
- * Tested with glibc-2.1.3 on RedHat 6.2.
- */
-#include <dlfcn.h>
-static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
-#define init_done()	(__next_sigaction != 0)
-#undef __SIGACTION
-static void do_init(void)
-{
-    __next_sigaction = dlsym(RTLD_NEXT, "sigaction");
-    if (__next_sigaction != 0)
-	return;
-    perror("dlsym");
-    abort();
-}
-#define INIT()	do { if (!init_done()) do_init(); } while (0)
-#endif	/* glibc 2.1 */
+#define NEXT_SIGACTION "__sigaction"
+#define LIBC_SIGACTION __sigaction
+#define OVERRIDE_SIGACTION
+#endif	/* glibc >= 2.3 */
 
 /* Is there no standard identifier for Darwin/MacOSX ? */
 #if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
@@ -181,21 +106,10 @@ static void do_init(void)
  * The other _sigaction, _sigaction_no_bind I don't understand the purpose
  * of and don't modify.
  */
-#include <dlfcn.h>
-static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
-#define init_done()	(__next_sigaction != 0)
-extern int _sigaction(int, const struct sigaction*, struct sigaction*);
-#define __SIGACTION _sigaction
-static void do_init(void)
-{
-    __next_sigaction = dlsym(RTLD_NEXT, "sigaction");
-    if (__next_sigaction != 0)
-	return;
-    perror("dlsym_darwin");
-    abort();
-}
+#define NEXT_SIGACTION "sigaction"
+#define LIBC_SIGACTION _sigaction
+#undef OVERRIDE_SIGACTION
 #define _NSIG NSIG
-#define INIT()	do { if (!init_done()) do_init(); } while (0)
 #endif /* __DARWIN__ */
 
 #if defined(__sun__)
@@ -218,20 +132,10 @@ static void do_init(void)
  * our init routine has had a chance to find _sigaction()'s address.
  * This forces us to initialise at the first call.
  */
-#include <dlfcn.h>
-static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
-#define init_done()	(__next_sigaction != 0)
-#define __SIGACTION _sigaction
-static void do_init(void)
-{
-    __next_sigaction = dlsym(RTLD_NEXT, "_sigaction");
-    if (__next_sigaction != 0)
-	return;
-    perror("dlsym");
-    abort();
-}
+#define NEXT_SIGACTION "_sigaction"
+#define LIBC_SIGACTION _sigaction
+#define OVERRIDE_SIGACTION
 #define _NSIG NSIG
-#define INIT()	do { if (!init_done()) do_init(); } while (0)
 #endif /* __sun__ */
 
 #if defined(__FreeBSD__)
@@ -239,23 +143,22 @@ static void do_init(void)
  * This is a copy of Darwin code for FreeBSD.
  * CAVEAT: detailed semantics are not verified yet.
  */
-#include <dlfcn.h>
-static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
-#define init_done()	(__next_sigaction != 0)
-extern int _sigaction(int, const struct sigaction*, struct sigaction*);
-#define __SIGACTION _sigaction
-static void do_init(void)
-{
-    __next_sigaction = dlsym(RTLD_NEXT, "sigaction");
-    if (__next_sigaction != 0)
-	return;
-    perror("dlsym_freebsd");
-    abort();
-}
+#define NEXT_SIGACTION "sigaction"
+#define LIBC_SIGACTION _sigaction
+#undef OVERRIDE_SIGACTION
 #define _NSIG NSIG
-#define INIT()	do { if (!init_done()) do_init(); } while (0)
 #endif /* __FreeBSD__ */
 
+#if defined(__NetBSD__)
+/*
+ * Note: This is only stub code to allow the build to succeed.
+ * Whether this actually provides the needed overrides for safe
+ * signal delivery or not is unknown.
+ */
+#undef NEXT_SIGACTION
+#undef OVERRIDE_SIGACTION
+#endif /* __NetBSD__ */
+
 #if !(defined(__GLIBC__) || defined(__DARWIN__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__sun__))
 /*
  * Unknown libc -- assume musl.  Note: musl deliberately does not provide a musl-specific
@@ -265,30 +168,40 @@ static void do_init(void)
  * There are libc-internal calls to __libc_sigaction which install handlers, so we must
  * override __libc_sigaction rather than __sigaction.
  */
+#define NEXT_SIGACTION "__libc_sigaction"
+#define LIBC_SIGACTION __libc_sigaction
+#define OVERRIDE_SIGACTION
+#ifndef _NSIG
+#define _NSIG NSIG
+#endif
+#endif	/* !(__GLIBC__ || __DARWIN__ || __NetBSD__ || __FreeBSD__ || __sun__) */
+
+#if defined(NEXT_SIGACTION)
+/*
+ * Initialize a function pointer to the libc core sigaction routine,
+ * to be used by our wrappers.
+ */
 #include <dlfcn.h>
-static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
-#define init_done()	(__next_sigaction != 0)
-#define __SIGACTION __libc_sigaction
+static int (*next_sigaction)(int, const struct sigaction*, struct sigaction*);
 static void do_init(void)
 {
-    __next_sigaction = dlsym(RTLD_NEXT, "__libc_sigaction");
-    if (__next_sigaction != 0)
+    next_sigaction = dlsym(RTLD_NEXT, NEXT_SIGACTION);
+    if (next_sigaction != 0)
 	return;
     perror("dlsym");
     abort();
 }
-#ifndef _NSIG
-#define _NSIG NSIG
-#endif
-#define INIT()	do { if (!init_done()) do_init(); } while (0)
-#endif	/* !(__GLIBC__ || __DARWIN__ || __NetBSD__ || __FreeBSD__ || __sun__) */
+#define INIT()	do { if (!next_sigaction) do_init(); } while (0)
+#else	/* !defined(NEXT_SIGACTION) */
+#define INIT()	do { } while (0)
+#endif	/* !defined(NEXT_SIGACTION) */
 
-#if !defined(__NetBSD__)
+#if defined(NEXT_SIGACTION)
 /*
  * This is our wrapper for sigaction(). sigaction() can be called before
  * hipe_signal_init() has been executed, especially when threads support
  * has been linked with the executable. Therefore, we must initialise
- * __next_sigaction() dynamically, the first time it's needed.
+ * next_sigaction() dynamically, the first time it's needed.
  */
 static int my_sigaction(int signum, const struct sigaction *act, struct sigaction *oldact)
 {
@@ -304,24 +217,26 @@ static int my_sigaction(int signum, const struct sigaction *act, struct sigactio
 	newact.sa_flags |= SA_ONSTACK;
 	act = &newact;
     }
-    return __next_sigaction(signum, act, oldact);
+    return next_sigaction(signum, act, oldact);
 }
 #endif
+
+#if defined(LIBC_SIGACTION)
 /*
  * This overrides the C library's core sigaction() procedure, catching
  * all its internal calls.
  */
-#ifdef __SIGACTION
-int __SIGACTION(int signum, const struct sigaction *act, struct sigaction *oldact)
+extern int LIBC_SIGACTION(int, const struct sigaction*, struct sigaction*);
+int LIBC_SIGACTION(int signum, const struct sigaction *act, struct sigaction *oldact)
 {
     return my_sigaction(signum, act, oldact);
 }
 #endif
 
+#if defined(OVERRIDE_SIGACTION)
 /*
  * This catches the application's own sigaction() calls.
  */
-#if !defined(__DARWIN__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
 int sigaction(int signum, const struct sigaction *act, struct sigaction *oldact)
 {
     return my_sigaction(signum, act, oldact);
@@ -336,15 +251,11 @@ static void hipe_sigaltstack(void *ss_sp)
     stack_t ss;
 
     ss.ss_sp = ss_sp;
-    ss.ss_flags = SS_ONSTACK;
+    ss.ss_flags = 0;
     ss.ss_size = SIGSTKSZ;
     if (sigaltstack(&ss, NULL) < 0) {
-	/* might be a broken pre-2.4 Linux kernel, try harder */
-	ss.ss_flags = 0;
-	if (sigaltstack(&ss, NULL) < 0) {
-	    perror("sigaltstack");
-	    abort();
-	}
+	perror("sigaltstack");
+	abort();
     }
 }
 
@@ -381,9 +292,7 @@ void hipe_signal_init(void)
     struct sigaction sa;
     int i;
 
-#ifndef __NetBSD__
     INIT();
-#endif
 
     hipe_sigaltstack_init();
 
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c
index 105b129065..0d5043fa2a 100644
--- a/erts/emulator/sys/common/erl_check_io.c
+++ b/erts/emulator/sys/common/erl_check_io.c
@@ -39,6 +39,7 @@
 #include "erl_check_io.h"
 #include "erl_thr_progress.h"
 #include "dtrace-wrapper.h"
+#include "lttng-wrapper.h"
 #define ERTS_WANT_TIMER_WHEEL_API
 #include "erl_time.h"
 
@@ -395,6 +396,7 @@ forget_removed(struct pollset_info* psi)
 	if (drv_ptr) {
 	    int was_unmasked = erts_block_fpe();
 	    DTRACE1(driver_stop_select, drv_ptr->name);
+	    LTTNG1(driver_stop_select, drv_ptr->name);
 	    (*drv_ptr->stop_select) ((ErlDrvEvent) fd, NULL);
 	    erts_unblock_fpe(was_unmasked);
 	    if (drv_ptr->handle) {
@@ -1055,6 +1057,7 @@ done_unknown:
     if (stop_select_fn) {
 	int was_unmasked = erts_block_fpe();
 	DTRACE1(driver_stop_select, name);
+	LTTNG1(driver_stop_select, "unknown");
 	(*stop_select_fn)(e, NULL);
 	erts_unblock_fpe(was_unmasked);
     }
@@ -1337,11 +1340,7 @@ print_select_op(erts_dsprintf_buf_t *dsbufp,
 {
     Port *pp = erts_drvport2port(ix);
     erts_dsprintf(dsbufp,
-#ifdef __OSE__
-		  "driver_select(%p, %d,%s%s%s%s | %d, %d) "
-#else
 		  "driver_select(%p, %d,%s%s%s%s, %d) "
-#endif
 		  "by ",
 		  ix,
 		  (int) GET_FD(fd),
@@ -1861,25 +1860,6 @@ stale_drv_select(Eterm id, ErtsDrvEventState *state, int mode)
 
 #ifndef ERTS_SYS_CONTINOUS_FD_NUMBERS
 
-#ifdef __OSE__
-static SafeHashValue drv_ev_state_hash(void *des)
-{
-    ErtsSysFdType fd = ((ErtsDrvEventState *) des)->fd;
-    /* We use hash on signo ^ id in order for steal to happen when the
-       same signo + fd is selected on by two different ports */
-    SafeHashValue val = (SafeHashValue)(fd->signo ^ fd->id);
-    return val ^ (val >> 8);
-}
-
-static int drv_ev_state_cmp(void *des1, void *des2)
-{
-    ErtsSysFdType fd1 = ((ErtsDrvEventState *) des1)->fd;
-    ErtsSysFdType fd2 = ((ErtsDrvEventState *) des2)->fd;
-    if (fd1->signo == fd2->signo && fd1->id == fd2->id)
-      return 0;
-    return 1;
-}
-#else /* !__OSE__ && !ERTS_SYS_CONTINOUS_FD_NUMBERS i.e. probably windows */
 static SafeHashValue drv_ev_state_hash(void *des)
 {
     SafeHashValue val = (SafeHashValue) ((ErtsDrvEventState *) des)->fd;
@@ -1891,7 +1871,6 @@ static int drv_ev_state_cmp(void *des1, void *des2)
     return ( ((ErtsDrvEventState *) des1)->fd == ((ErtsDrvEventState *) des2)->fd
 	    ? 0 : 1);
 }
-#endif
 
 static void *drv_ev_state_alloc(void *des_tmpl)
 {
diff --git a/erts/emulator/sys/common/erl_mmap.c b/erts/emulator/sys/common/erl_mmap.c
index 754047829f..889d6f3868 100644
--- a/erts/emulator/sys/common/erl_mmap.c
+++ b/erts/emulator/sys/common/erl_mmap.c
@@ -51,23 +51,22 @@
 #endif
 
 /*
- * `mmap_state.sa.bot` and `mmap_state.sua.top` are read only after
+ * `mm->sa.bot` and `mm->sua.top` are read only after
  * initialization, but the other pointers are not; i.e., only
  * ERTS_MMAP_IN_SUPERCARRIER() is allowed without the mutex held.
  */
 #define ERTS_MMAP_IN_SUPERCARRIER(PTR)					\
-    (((UWord) (PTR)) - ((UWord) mmap_state.sa.bot)			\
-     < ((UWord) mmap_state.sua.top) - ((UWord) mmap_state.sa.bot))
+    (((UWord) (PTR)) - ((UWord) mm->sa.bot)			\
+     < ((UWord) mm->sua.top) - ((UWord) mm->sa.bot))
 #define ERTS_MMAP_IN_SUPERALIGNED_AREA(PTR)				\
-    (ERTS_SMP_LC_ASSERT(erts_lc_mtx_is_locked(&mmap_state.mtx)),	\
-     (((UWord) (PTR)) - ((UWord) mmap_state.sa.bot)			\
-      < ((UWord) mmap_state.sa.top) - ((UWord) mmap_state.sa.bot)))
+    (ERTS_SMP_LC_ASSERT(erts_lc_mtx_is_locked(&mm->mtx)),	\
+     (((UWord) (PTR)) - ((UWord) mm->sa.bot)			\
+      < ((UWord) mm->sa.top) - ((UWord) mm->sa.bot)))
 #define ERTS_MMAP_IN_SUPERUNALIGNED_AREA(PTR)				\
-    (ERTS_SMP_LC_ASSERT(erts_lc_mtx_is_locked(&mmap_state.mtx)),	\
-     (((UWord) (PTR)) - ((UWord) mmap_state.sua.bot)			\
-      < ((UWord) mmap_state.sua.top) - ((UWord) mmap_state.sua.bot)))
+    (ERTS_SMP_LC_ASSERT(erts_lc_mtx_is_locked(&mm->mtx)),	\
+     (((UWord) (PTR)) - ((UWord) mm->sua.bot)			\
+      < ((UWord) mm->sua.top) - ((UWord) mm->sua.bot)))
 
-int erts_have_erts_mmap;
 UWord erts_page_inv_mask;
 
 #if defined(DEBUG) || defined(ERTS_MMAP_DEBUG)
@@ -197,10 +196,10 @@ static ErtsMMapOp mmap_ops[ERTS_MMAP_OP_RINGBUF_SZ];
 
 #define ERTS_MMAP_OP_LCK(RES, IN_SZ, OUT_SZ)			\
     do {							\
-	erts_smp_mtx_lock(&mmap_state.mtx);			\
+	erts_smp_mtx_lock(&mm->mtx);			\
 	ERTS_MMAP_OP_START((IN_SZ));				\
 	ERTS_MMAP_OP_END((RES), (OUT_SZ));			\
-	erts_smp_mtx_unlock(&mmap_state.mtx);			\
+	erts_smp_mtx_unlock(&mm->mtx);			\
     } while (0)
 
 #define ERTS_MUNMAP_OP(PTR, SZ)					\
@@ -219,9 +218,9 @@ static ErtsMMapOp mmap_ops[ERTS_MMAP_OP_RINGBUF_SZ];
 
 #define ERTS_MUNMAP_OP_LCK(PTR, SZ)				\
     do {							\
-	erts_smp_mtx_lock(&mmap_state.mtx);			\
+	erts_smp_mtx_lock(&mm->mtx);			\
 	ERTS_MUNMAP_OP((PTR), (SZ));				\
-	erts_smp_mtx_unlock(&mmap_state.mtx);			\
+	erts_smp_mtx_unlock(&mm->mtx);			\
     } while (0)
 
 #define ERTS_MREMAP_OP_START(OLD_PTR, OLD_SZ, IN_SZ)		\
@@ -247,10 +246,10 @@ static ErtsMMapOp mmap_ops[ERTS_MMAP_OP_RINGBUF_SZ];
 
 #define ERTS_MREMAP_OP_LCK(RES, OLD_PTR, OLD_SZ, IN_SZ, OUT_SZ)	\
     do {							\
-	erts_smp_mtx_lock(&mmap_state.mtx);			\
+	erts_smp_mtx_lock(&mm->mtx);			\
 	ERTS_MREMAP_OP_START((OLD_PTR), (OLD_SZ), (IN_SZ));	\
 	ERTS_MREMAP_OP_END((RES), (OUT_SZ));			\
-	erts_smp_mtx_unlock(&mmap_state.mtx);			\
+	erts_smp_mtx_unlock(&mm->mtx);			\
     } while (0)
 
 #define ERTS_MMAP_OP_ABORT()					\
@@ -294,7 +293,7 @@ typedef struct {
     Uint nseg;
 }ErtsFreeSegMap;
 
-static struct {
+struct ErtsMemMapper_ {
     int (*reserve_physical)(char *, UWord);
     void (*unreserve_physical)(char *, UWord);
     int supercarrier;
@@ -346,54 +345,62 @@ static struct {
 	    UWord used;
 	} os;
     } size;
-} mmap_state;
+};
+
+ErtsMemMapper erts_dflt_mmapper;
+
+#if defined(ARCH_64) && defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION)
+ErtsMemMapper erts_literal_mmapper;
+char* erts_literals_start;
+UWord erts_literals_size;
+#endif
 
 #define ERTS_MMAP_SIZE_SC_SA_INC(SZ) 						\
     do {									\
-	mmap_state.size.supercarrier.used.total += (SZ);			\
-	mmap_state.size.supercarrier.used.sa += (SZ);				\
-	ERTS_MMAP_ASSERT(mmap_state.size.supercarrier.used.total		\
-			 <= mmap_state.size.supercarrier.total);		\
-	ERTS_MMAP_ASSERT(mmap_state.size.supercarrier.used.sa			\
-			 <= mmap_state.size.supercarrier.used.total);		\
+	mm->size.supercarrier.used.total += (SZ);			\
+	mm->size.supercarrier.used.sa += (SZ);				\
+	ERTS_MMAP_ASSERT(mm->size.supercarrier.used.total		\
+			 <= mm->size.supercarrier.total);		\
+	ERTS_MMAP_ASSERT(mm->size.supercarrier.used.sa			\
+			 <= mm->size.supercarrier.used.total);		\
     } while (0)
 #define ERTS_MMAP_SIZE_SC_SA_DEC(SZ) 						\
     do {									\
-	ERTS_MMAP_ASSERT(mmap_state.size.supercarrier.used.total >= (SZ));	\
-	mmap_state.size.supercarrier.used.total -= (SZ);			\
-	ERTS_MMAP_ASSERT(mmap_state.size.supercarrier.used.sa >= (SZ));		\
-	mmap_state.size.supercarrier.used.sa -= (SZ);				\
+	ERTS_MMAP_ASSERT(mm->size.supercarrier.used.total >= (SZ));	\
+	mm->size.supercarrier.used.total -= (SZ);			\
+	ERTS_MMAP_ASSERT(mm->size.supercarrier.used.sa >= (SZ));		\
+	mm->size.supercarrier.used.sa -= (SZ);				\
     } while (0)
 #define ERTS_MMAP_SIZE_SC_SUA_INC(SZ) 						\
     do {									\
-	mmap_state.size.supercarrier.used.total += (SZ);			\
-	mmap_state.size.supercarrier.used.sua += (SZ);				\
-	ERTS_MMAP_ASSERT(mmap_state.size.supercarrier.used.total		\
-			 <= mmap_state.size.supercarrier.total);		\
-	ERTS_MMAP_ASSERT(mmap_state.size.supercarrier.used.sua			\
-			 <= mmap_state.size.supercarrier.used.total);		\
+	mm->size.supercarrier.used.total += (SZ);			\
+	mm->size.supercarrier.used.sua += (SZ);				\
+	ERTS_MMAP_ASSERT(mm->size.supercarrier.used.total		\
+			 <= mm->size.supercarrier.total);		\
+	ERTS_MMAP_ASSERT(mm->size.supercarrier.used.sua			\
+			 <= mm->size.supercarrier.used.total);		\
     } while (0)
 #define ERTS_MMAP_SIZE_SC_SUA_DEC(SZ) 						\
     do {									\
-	ERTS_MMAP_ASSERT(mmap_state.size.supercarrier.used.total >= (SZ));	\
-	mmap_state.size.supercarrier.used.total -= (SZ);			\
-	ERTS_MMAP_ASSERT(mmap_state.size.supercarrier.used.sua >= (SZ));	\
-	mmap_state.size.supercarrier.used.sua -= (SZ);				\
+	ERTS_MMAP_ASSERT(mm->size.supercarrier.used.total >= (SZ));	\
+	mm->size.supercarrier.used.total -= (SZ);			\
+	ERTS_MMAP_ASSERT(mm->size.supercarrier.used.sua >= (SZ));	\
+	mm->size.supercarrier.used.sua -= (SZ);				\
     } while (0)
 #define ERTS_MMAP_SIZE_OS_INC(SZ)						\
     do {									\
-	ERTS_MMAP_ASSERT(mmap_state.size.os.used + (SZ) >= (SZ));		\
-	mmap_state.size.os.used += (SZ);					\
+	ERTS_MMAP_ASSERT(mm->size.os.used + (SZ) >= (SZ));		\
+	mm->size.os.used += (SZ);					\
     } while (0)
 #define ERTS_MMAP_SIZE_OS_DEC(SZ) 						\
     do {									\
-	ERTS_MMAP_ASSERT(mmap_state.size.os.used >= (SZ));			\
-	mmap_state.size.os.used -= (SZ);					\
+	ERTS_MMAP_ASSERT(mm->size.os.used >= (SZ));			\
+	mm->size.os.used -= (SZ);					\
     } while (0)
 
 
 static void
-add_free_desc_area(char *start, char *end)
+add_free_desc_area(ErtsMemMapper* mm, char *start, char *end)
 {
     ERTS_MMAP_ASSERT(end == (void *) 0 || end > start);
     if (sizeof(ErtsFreeSegDesc) <= ((UWord) end) - ((UWord) start)) {
@@ -403,7 +410,7 @@ add_free_desc_area(char *start, char *end)
 
 	no = 1;
 	prev_desc = (ErtsFreeSegDesc *) start;
-	prev_desc->start = mmap_state.desc.free_list;
+	prev_desc->start = mm->desc.free_list;
 	desc = (ErtsFreeSegDesc *) (start + sizeof(ErtsFreeSegDesc));
 	desc_end = start + 2*sizeof(ErtsFreeSegDesc);
 
@@ -414,59 +421,59 @@ add_free_desc_area(char *start, char *end)
 	    desc_end += sizeof(ErtsFreeSegDesc);
 	    no++;
 	}
-	mmap_state.desc.free_list = (char *) prev_desc;
-	mmap_state.no.free_seg_descs += no;
+	mm->desc.free_list = (char *) prev_desc;
+	mm->no.free_seg_descs += no;
     }
 }
 
 static ErtsFreeSegDesc *
-add_unused_free_desc_area(void)
+add_unused_free_desc_area(ErtsMemMapper* mm)
 {
     char *ptr;
-    if (!mmap_state.desc.unused_start)
+    if (!mm->desc.unused_start)
 	return NULL;
 
-    ERTS_MMAP_ASSERT(mmap_state.desc.unused_end);
+    ERTS_MMAP_ASSERT(mm->desc.unused_end);
     ERTS_MMAP_ASSERT(ERTS_PAGEALIGNED_SIZE
-		     <= mmap_state.desc.unused_end - mmap_state.desc.unused_start);
+		     <= mm->desc.unused_end - mm->desc.unused_start);
 
-    ptr = mmap_state.desc.unused_start + ERTS_PAGEALIGNED_SIZE;
-    add_free_desc_area(mmap_state.desc.unused_start, ptr);
+    ptr = mm->desc.unused_start + ERTS_PAGEALIGNED_SIZE;
+    add_free_desc_area(mm, mm->desc.unused_start, ptr);
 
-    if ((mmap_state.desc.unused_end - ptr) >= ERTS_PAGEALIGNED_SIZE)
-	mmap_state.desc.unused_start = ptr;
+    if ((mm->desc.unused_end - ptr) >= ERTS_PAGEALIGNED_SIZE)
+	mm->desc.unused_start = ptr;
     else
-	mmap_state.desc.unused_end = mmap_state.desc.unused_start = NULL;
+	mm->desc.unused_end = mm->desc.unused_start = NULL;
 
-    ERTS_MMAP_ASSERT(mmap_state.desc.free_list);
-    return (ErtsFreeSegDesc *) mmap_state.desc.free_list;
+    ERTS_MMAP_ASSERT(mm->desc.free_list);
+    return (ErtsFreeSegDesc *) mm->desc.free_list;
 }
 
 static ERTS_INLINE ErtsFreeSegDesc *
-alloc_desc(void)
+alloc_desc(ErtsMemMapper* mm)
 {
     ErtsFreeSegDesc *res;
-    res = (ErtsFreeSegDesc *) mmap_state.desc.free_list;
+    res = (ErtsFreeSegDesc *) mm->desc.free_list;
     if (!res) {
-	res = add_unused_free_desc_area();
+	res = add_unused_free_desc_area(mm);
 	if (!res)
 	    return NULL;
     }
-    mmap_state.desc.free_list = res->start;
-    ASSERT(mmap_state.no.free_segs.curr < mmap_state.no.free_seg_descs);
-    mmap_state.no.free_segs.curr++;
-    if (mmap_state.no.free_segs.max < mmap_state.no.free_segs.curr)
-	mmap_state.no.free_segs.max = mmap_state.no.free_segs.curr;
+    mm->desc.free_list = res->start;
+    ASSERT(mm->no.free_segs.curr < mm->no.free_seg_descs);
+    mm->no.free_segs.curr++;
+    if (mm->no.free_segs.max < mm->no.free_segs.curr)
+	mm->no.free_segs.max = mm->no.free_segs.curr;
     return res;
 }
 
 static ERTS_INLINE void
-free_desc(ErtsFreeSegDesc *desc)
+free_desc(ErtsMemMapper* mm, ErtsFreeSegDesc *desc)
 {
-    desc->start = mmap_state.desc.free_list;
-    mmap_state.desc.free_list = (char *) desc;
-    ERTS_MMAP_ASSERT(mmap_state.no.free_segs.curr > 0);
-    mmap_state.no.free_segs.curr--;
+    desc->start = mm->desc.free_list;
+    mm->desc.free_list = (char *) desc;
+    ERTS_MMAP_ASSERT(mm->no.free_segs.curr > 0);
+    mm->no.free_segs.curr--;
 }
 
 static ERTS_INLINE ErtsFreeSegDesc* anode_to_desc(RBTNode* anode)
@@ -1233,7 +1240,7 @@ Eterm build_free_seg_list(Process* p, ErtsFreeSegMap* map)
 #    define ERTS_MMAP_FD		(-1)
 #  else
 #    define ERTS_MMAP_FLAGS		(MAP_PRIVATE)
-#    define ERTS_MMAP_FD		mmap_state.mmap_fd
+#    define ERTS_MMAP_FD		mm->mmap_fd
 #  endif
 #endif
 
@@ -1334,7 +1341,7 @@ os_unreserve_physical(char *ptr, UWord size)
     void *res = mmap((void *) ptr, (size_t) size, ERTS_MMAP_UNRESERVE_PROT,
 		     ERTS_MMAP_UNRESERVE_FLAGS, ERTS_MMAP_FD, 0);
     if (res == (void *) MAP_FAILED)
-	erl_exit(ERTS_ABORT_EXIT, "Failed to unreserve memory");
+	erts_exit(ERTS_ABORT_EXIT, "Failed to unreserve memory");
 }
 
 static void *
@@ -1378,11 +1385,12 @@ static void unreserve_noop(char *ptr, UWord size)
 }
 
 static UWord
-alloc_desc_insert_free_seg(ErtsFreeSegMap *map, char* start, char* end)
+alloc_desc_insert_free_seg(ErtsMemMapper* mm,
+                           ErtsFreeSegMap *map, char* start, char* end)
 {
     char *ptr;
     ErtsFreeSegMap *da_map;
-    ErtsFreeSegDesc *desc = alloc_desc();
+    ErtsFreeSegDesc *desc = alloc_desc(mm);
     if (desc) {
 	insert_free_seg(map, desc, start, end);
 	return 0;
@@ -1395,13 +1403,13 @@ alloc_desc_insert_free_seg(ErtsFreeSegMap *map, char* start, char* end)
      */
 
 #if ERTS_HAVE_OS_MMAP
-    if (!mmap_state.no_os_mmap) {
-        ptr = os_mmap(mmap_state.desc.new_area_hint, ERTS_PAGEALIGNED_SIZE, 0);
+    if (!mm->no_os_mmap) {
+        ptr = os_mmap(mm->desc.new_area_hint, ERTS_PAGEALIGNED_SIZE, 0);
         if (ptr) {
-            mmap_state.desc.new_area_hint = ptr+ERTS_PAGEALIGNED_SIZE;
+            mm->desc.new_area_hint = ptr+ERTS_PAGEALIGNED_SIZE;
             ERTS_MMAP_SIZE_OS_INC(ERTS_PAGEALIGNED_SIZE);
-            add_free_desc_area(ptr, ptr+ERTS_PAGEALIGNED_SIZE);
-            desc = alloc_desc();
+            add_free_desc_area(mm, ptr, ptr+ERTS_PAGEALIGNED_SIZE);
+            desc = alloc_desc(mm);
             ERTS_MMAP_ASSERT(desc);
             insert_free_seg(map, desc, start, end);
             return 0;
@@ -1412,20 +1420,20 @@ alloc_desc_insert_free_seg(ErtsFreeSegMap *map, char* start, char* end)
     /*
      * ...then try to find a good place in the supercarrier...
      */
-    da_map = &mmap_state.sua.map;
+    da_map = &mm->sua.map;
     desc = lookup_free_seg(da_map, ERTS_PAGEALIGNED_SIZE);
     if (desc) {
-	if (mmap_state.reserve_physical(desc->start, ERTS_PAGEALIGNED_SIZE))
+	if (mm->reserve_physical(desc->start, ERTS_PAGEALIGNED_SIZE))
 	    ERTS_MMAP_SIZE_SC_SUA_INC(ERTS_PAGEALIGNED_SIZE);
 	else
 	    desc = NULL;
 	
     }
     else {
-	da_map = &mmap_state.sa.map;
+	da_map = &mm->sa.map;
 	desc = lookup_free_seg(da_map, ERTS_PAGEALIGNED_SIZE);
 	if (desc) {
-	    if (mmap_state.reserve_physical(desc->start, ERTS_PAGEALIGNED_SIZE))
+	    if (mm->reserve_physical(desc->start, ERTS_PAGEALIGNED_SIZE))
 		ERTS_MMAP_SIZE_SC_SA_INC(ERTS_PAGEALIGNED_SIZE);
 	    else
 		desc = NULL;
@@ -1433,15 +1441,15 @@ alloc_desc_insert_free_seg(ErtsFreeSegMap *map, char* start, char* end)
     }
     if (desc) {
 	char *da_end = desc->start + ERTS_PAGEALIGNED_SIZE;
-	add_free_desc_area(desc->start, da_end);
+	add_free_desc_area(mm, desc->start, da_end);
 	if (da_end != desc->end)
 	    resize_free_seg(da_map, desc, da_end, desc->end);
 	else {
 	    delete_free_seg(da_map, desc);
-	    free_desc(desc);
+	    free_desc(mm, desc);
 	}
 
-	desc = alloc_desc();
+	desc = alloc_desc(mm);
 	ERTS_MMAP_ASSERT(desc);
 	insert_free_seg(map, desc, start, end);
 	return 0;
@@ -1454,10 +1462,10 @@ alloc_desc_insert_free_seg(ErtsFreeSegMap *map, char* start, char* end)
     ptr = start + ERTS_PAGEALIGNED_SIZE;
     ERTS_MMAP_ASSERT(ptr <= end);
 
-    add_free_desc_area(start, ptr);
+    add_free_desc_area(mm, start, ptr);
 
     if (ptr != end) {
-	desc = alloc_desc();
+	desc = alloc_desc(mm);
 	ERTS_MMAP_ASSERT(desc);
 	insert_free_seg(map, desc, ptr, end);
     }
@@ -1466,46 +1474,46 @@ alloc_desc_insert_free_seg(ErtsFreeSegMap *map, char* start, char* end)
 }
 
 void *
-erts_mmap(Uint32 flags, UWord *sizep)
+erts_mmap(ErtsMemMapper* mm, Uint32 flags, UWord *sizep)
 {
     char *seg;
     UWord asize = ERTS_PAGEALIGNED_CEILING(*sizep);
 
     /* Map in premapped supercarrier */
-    if (mmap_state.supercarrier && !(ERTS_MMAPFLG_OS_ONLY & flags)) {
+    if (mm->supercarrier && !(ERTS_MMAPFLG_OS_ONLY & flags)) {
 	char *end;
 	ErtsFreeSegDesc *desc;
 	Uint32 superaligned = (ERTS_MMAPFLG_SUPERALIGNED & flags);
 
-	erts_smp_mtx_lock(&mmap_state.mtx);
+	erts_smp_mtx_lock(&mm->mtx);
 
 	ERTS_MMAP_OP_START(*sizep);
 
 	if (!superaligned) {
-	    desc = lookup_free_seg(&mmap_state.sua.map, asize);
+	    desc = lookup_free_seg(&mm->sua.map, asize);
 	    if (desc) {
 		seg = desc->start;
 		end = seg+asize;
-		if (!mmap_state.reserve_physical(seg, asize))
+		if (!mm->reserve_physical(seg, asize))
 		    goto supercarrier_reserve_failure;
 		if (desc->end == end) {
-		    delete_free_seg(&mmap_state.sua.map, desc);
-		    free_desc(desc);
+		    delete_free_seg(&mm->sua.map, desc);
+		    free_desc(mm, desc);
 		}
 		else {
 		    ERTS_MMAP_ASSERT(end < desc->end);
-		    resize_free_seg(&mmap_state.sua.map, desc, end, desc->end);
+		    resize_free_seg(&mm->sua.map, desc, end, desc->end);
 		}
 		ERTS_MMAP_SIZE_SC_SUA_INC(asize);
 		goto supercarrier_success;
 	    }
 
-	    if (asize <= mmap_state.sua.bot - mmap_state.sa.top) {
-		if (!mmap_state.reserve_physical(mmap_state.sua.bot - asize,
+	    if (asize <= mm->sua.bot - mm->sa.top) {
+		if (!mm->reserve_physical(mm->sua.bot - asize,
 						 asize))
 		    goto supercarrier_reserve_failure;
-		mmap_state.sua.bot -= asize;
-		seg = mmap_state.sua.bot;
+		mm->sua.bot -= asize;
+		seg = mm->sua.bot;
 		ERTS_MMAP_SIZE_SC_SUA_INC(asize);
 		goto supercarrier_success;
 	    }
@@ -1513,84 +1521,84 @@ erts_mmap(Uint32 flags, UWord *sizep)
 
 	asize = ERTS_SUPERALIGNED_CEILING(asize);
 
-	desc = lookup_free_seg(&mmap_state.sa.map, asize);
+	desc = lookup_free_seg(&mm->sa.map, asize);
 	if (desc) {
 	    char *start = seg = desc->start;
 	    seg = (char *) ERTS_SUPERALIGNED_CEILING(seg);
 	    end = seg+asize;
-	    if (!mmap_state.reserve_physical(start, (UWord) (end - start)))
+	    if (!mm->reserve_physical(start, (UWord) (end - start)))
 		goto supercarrier_reserve_failure;
 	    ERTS_MMAP_SIZE_SC_SA_INC(asize);
 	    if (desc->end == end) {
 		if (start != seg)
-		    resize_free_seg(&mmap_state.sa.map, desc, start, seg);
+		    resize_free_seg(&mm->sa.map, desc, start, seg);
 		else {
-		    delete_free_seg(&mmap_state.sa.map, desc);
-		    free_desc(desc);
+		    delete_free_seg(&mm->sa.map, desc);
+		    free_desc(mm, desc);
 		}
 	    }
 	    else {
 		ERTS_MMAP_ASSERT(end < desc->end);
-		resize_free_seg(&mmap_state.sa.map, desc, end, desc->end);
+		resize_free_seg(&mm->sa.map, desc, end, desc->end);
 		if (start != seg) {
 		    UWord ad_sz;
-		    ad_sz = alloc_desc_insert_free_seg(&mmap_state.sua.map,
+		    ad_sz = alloc_desc_insert_free_seg(mm, &mm->sua.map,
 						       start, seg);
 		    start += ad_sz;
 		    if (start != seg)
-			mmap_state.unreserve_physical(start, (UWord) (seg - start));
+			mm->unreserve_physical(start, (UWord) (seg - start));
 		}
 	    }
 	    goto supercarrier_success;
 	}
 
 	if (superaligned) {
-	    char *start = mmap_state.sa.top;
+	    char *start = mm->sa.top;
 	    seg = (char *) ERTS_SUPERALIGNED_CEILING(start);
 
-	    if (asize + (seg - start) <= mmap_state.sua.bot - start) {
+	    if (asize + (seg - start) <= mm->sua.bot - start) {
 		end = seg + asize;
-		if (!mmap_state.reserve_physical(start, (UWord) (end - start)))
+		if (!mm->reserve_physical(start, (UWord) (end - start)))
 		    goto supercarrier_reserve_failure;
-		mmap_state.sa.top = end;
+		mm->sa.top = end;
 		ERTS_MMAP_SIZE_SC_SA_INC(asize);
 		if (start != seg) {
 		    UWord ad_sz;
-		    ad_sz = alloc_desc_insert_free_seg(&mmap_state.sua.map,
+		    ad_sz = alloc_desc_insert_free_seg(mm, &mm->sua.map,
 						       start, seg);
 		    start += ad_sz;
 		    if (start != seg)
-			mmap_state.unreserve_physical(start, (UWord) (seg - start));
+			mm->unreserve_physical(start, (UWord) (seg - start));
 		}
 		goto supercarrier_success;
 	    }
 
-	    desc = lookup_free_seg(&mmap_state.sua.map, asize + ERTS_SUPERALIGNED_SIZE);
+	    desc = lookup_free_seg(&mm->sua.map, asize + ERTS_SUPERALIGNED_SIZE);
 	    if (desc) {
 		char *org_start = desc->start;
 		char *org_end = desc->end;
 
 		seg = (char *) ERTS_SUPERALIGNED_CEILING(org_start);
 		end = seg + asize;
-		if (!mmap_state.reserve_physical(seg, (UWord) (org_end - seg)))
+		if (!mm->reserve_physical(seg, (UWord) (org_end - seg)))
 		    goto supercarrier_reserve_failure;
 		ERTS_MMAP_SIZE_SC_SUA_INC(asize);
 		if (org_start != seg) {
 		    ERTS_MMAP_ASSERT(org_start < seg);
-		    resize_free_seg(&mmap_state.sua.map, desc, org_start, seg);
+		    resize_free_seg(&mm->sua.map, desc, org_start, seg);
 		    desc = NULL;
 		}
 		if (end != org_end) {
 		    UWord ad_sz = 0;
 		    ERTS_MMAP_ASSERT(end < org_end);
 		    if (desc)
-			resize_free_seg(&mmap_state.sua.map, desc, end, org_end);
+			resize_free_seg(&mm->sua.map, desc, end, org_end);
 		    else
-			ad_sz = alloc_desc_insert_free_seg(&mmap_state.sua.map,
+			ad_sz = alloc_desc_insert_free_seg(mm, &mm->sua.map,
 							   end, org_end);
 		    end += ad_sz;
 		    if (end != org_end)
-			mmap_state.unreserve_physical(end,
+			mm->unreserve_physical(end,
 						      (UWord) (org_end - end));
 		}
 		goto supercarrier_success;
@@ -1598,12 +1606,12 @@ erts_mmap(Uint32 flags, UWord *sizep)
 	}
 
 	ERTS_MMAP_OP_ABORT();
-	erts_smp_mtx_unlock(&mmap_state.mtx);
+	erts_smp_mtx_unlock(&mm->mtx);
     }
 
 #if ERTS_HAVE_OS_MMAP
     /* Map using OS primitives */
-    if (!(ERTS_MMAPFLG_SUPERCARRIER_ONLY & flags) && !mmap_state.no_os_mmap) {
+    if (!(ERTS_MMAPFLG_SUPERCARRIER_ONLY & flags) && !mm->no_os_mmap) {
 	if (!(ERTS_MMAPFLG_SUPERALIGNED & flags)) {
 	    seg = os_mmap(NULL, asize, 0);
 	    if (!seg)
@@ -1661,25 +1669,25 @@ supercarrier_success:
 #endif
 
     ERTS_MMAP_OP_END(seg, asize);
-    erts_smp_mtx_unlock(&mmap_state.mtx);
+    erts_smp_mtx_unlock(&mm->mtx);
 
     *sizep = asize;
     return (void *) seg;
 
 supercarrier_reserve_failure:
-    erts_smp_mtx_unlock(&mmap_state.mtx);
+    erts_smp_mtx_unlock(&mm->mtx);
     *sizep = 0;
     return NULL;
 }
 
 void
-erts_munmap(Uint32 flags, void *ptr, UWord size)
+erts_munmap(ErtsMemMapper* mm, Uint32 flags, void *ptr, UWord size)
 {
     ERTS_MMAP_ASSERT(ERTS_IS_PAGEALIGNED(ptr));
     ERTS_MMAP_ASSERT(ERTS_IS_PAGEALIGNED(size));
 
     if (!ERTS_MMAP_IN_SUPERCARRIER(ptr)) {
-	ERTS_MMAP_ASSERT(!mmap_state.no_os_mmap);
+	ERTS_MMAP_ASSERT(!mm->no_os_mmap);
 #if ERTS_HAVE_OS_MMAP
 	ERTS_MUNMAP_OP_LCK(ptr, size);
 	ERTS_MMAP_SIZE_OS_DEC(size);
@@ -1692,45 +1700,45 @@ erts_munmap(Uint32 flags, void *ptr, UWord size)
 	ErtsFreeSegDesc *prev, *next, *desc;
 	UWord ad_sz = 0;
 
-	ERTS_MMAP_ASSERT(mmap_state.supercarrier);
+	ERTS_MMAP_ASSERT(mm->supercarrier);
 
 	start = (char *) ptr;
 	end = start + size;
 
-	erts_smp_mtx_lock(&mmap_state.mtx);
+	erts_smp_mtx_lock(&mm->mtx);
 
 	ERTS_MUNMAP_OP(ptr, size);
 
 	if (ERTS_MMAP_IN_SUPERALIGNED_AREA(ptr)) {
 
-	    map = &mmap_state.sa.map;
+	    map = &mm->sa.map;
 	    adjacent_free_seg(map, start, end, &prev, &next);
 
 	    ERTS_MMAP_SIZE_SC_SA_DEC(size);
-	    if (end == mmap_state.sa.top) {
+	    if (end == mm->sa.top) {
 		ERTS_MMAP_ASSERT(!next);
 		if (prev) {
 		    start = prev->start;
 		    delete_free_seg(map, prev);
-		    free_desc(prev);
+		    free_desc(mm, prev);
 		}
-		mmap_state.sa.top = start;
+		mm->sa.top = start;
 		goto supercarrier_success;
 	    }
 	}
 	else {
-	    map = &mmap_state.sua.map;
+	    map = &mm->sua.map;
 	    adjacent_free_seg(map, start, end, &prev, &next);
 
 	    ERTS_MMAP_SIZE_SC_SUA_DEC(size);
-	    if (start == mmap_state.sua.bot) {
+	    if (start == mm->sua.bot) {
 		ERTS_MMAP_ASSERT(!prev);
 		if (next) {
 		    end = next->end;
 		    delete_free_seg(map, next);
-		    free_desc(next);
+		    free_desc(mm, next);
 		}
-		mmap_state.sua.bot = end;
+		mm->sua.bot = end;
 		goto supercarrier_success;
 	    }
 	}
@@ -1742,7 +1750,7 @@ erts_munmap(Uint32 flags, void *ptr, UWord size)
 	    end = next->end;
 	    if (prev) {
 		delete_free_seg(map, next);
-		free_desc(next);
+		free_desc(mm, next);
 		goto save_prev;
 	    }
 	    desc = next;
@@ -1756,7 +1764,7 @@ erts_munmap(Uint32 flags, void *ptr, UWord size)
 	if (desc)
 	    resize_free_seg(map, desc, start, end);
 	else
-	    ad_sz = alloc_desc_insert_free_seg(map, start, end);
+	    ad_sz = alloc_desc_insert_free_seg(mm, map, start, end);
 	
     supercarrier_success: {
 	    UWord unres_sz;
@@ -1764,30 +1772,32 @@ erts_munmap(Uint32 flags, void *ptr, UWord size)
 	    ERTS_MMAP_ASSERT(size >= ad_sz);
 	    unres_sz = size - ad_sz;
 	    if (unres_sz)
-		mmap_state.unreserve_physical(((char *) ptr) + ad_sz, unres_sz);
+		mm->unreserve_physical(((char *) ptr) + ad_sz, unres_sz);
 
-            erts_smp_mtx_unlock(&mmap_state.mtx);
+            erts_smp_mtx_unlock(&mm->mtx);
 	}
     }
 }
 
 static void *
-remap_move(Uint32 flags, void *ptr, UWord old_size, UWord *sizep)
+remap_move(ErtsMemMapper* mm,
+           Uint32 flags, void *ptr, UWord old_size, UWord *sizep)
 {
     UWord size = *sizep;
-    void *new_ptr = erts_mmap(flags, &size);
+    void *new_ptr = erts_mmap(mm, flags, &size);
     if (!new_ptr)
 	return NULL;
     *sizep = size;
     if (old_size < size)
 	size = old_size;
     sys_memcpy(new_ptr, ptr, (size_t) size);
-    erts_munmap(flags, ptr, old_size);
+    erts_munmap(mm, flags, ptr, old_size);
     return new_ptr;
 }
 
 void *
-erts_mremap(Uint32 flags, void *ptr, UWord old_size, UWord *sizep)
+erts_mremap(ErtsMemMapper* mm,
+            Uint32 flags, void *ptr, UWord old_size, UWord *sizep)
 {
     void *new_ptr;
     Uint32 superaligned;
@@ -1799,11 +1809,11 @@ erts_mremap(Uint32 flags, void *ptr, UWord old_size, UWord *sizep)
 
     if (!ERTS_MMAP_IN_SUPERCARRIER(ptr)) {
 
-	ERTS_MMAP_ASSERT(!mmap_state.no_os_mmap);
+	ERTS_MMAP_ASSERT(!mm->no_os_mmap);
 
-	if (!(ERTS_MMAPFLG_OS_ONLY & flags) && mmap_state.supercarrier) {
-	    new_ptr = remap_move(ERTS_MMAPFLG_SUPERCARRIER_ONLY|flags, ptr,
-				 old_size, sizep);
+	if (!(ERTS_MMAPFLG_OS_ONLY & flags) && mm->supercarrier) {
+	    new_ptr = remap_move(mm, ERTS_MMAPFLG_SUPERCARRIER_ONLY|flags,
+                                 ptr, old_size, sizep);
 	    if (new_ptr)
 		return new_ptr;
 	}
@@ -1850,7 +1860,7 @@ erts_mremap(Uint32 flags, void *ptr, UWord old_size, UWord *sizep)
 #endif
 #if ERTS_HAVE_OS_MREMAP
 	if (superaligned)
-	    return remap_move(flags, new_ptr, old_size, sizep);
+	    return remap_move(mm, flags, new_ptr, old_size, sizep);
 	else {
 	    new_ptr = os_mremap(ptr, old_size, asize, 0);
 	    if (!new_ptr)
@@ -1872,10 +1882,10 @@ erts_mremap(Uint32 flags, void *ptr, UWord old_size, UWord *sizep)
 	ErtsFreeSegDesc *prev, *next;
 	UWord ad_sz = 0;
 
-	ERTS_MMAP_ASSERT(mmap_state.supercarrier);
+	ERTS_MMAP_ASSERT(mm->supercarrier);
 
 	if (ERTS_MMAPFLG_OS_ONLY & flags)
-	    return remap_move(flags, ptr, old_size, sizep);
+	    return remap_move(mm, flags, ptr, old_size, sizep);
 
 	superaligned = (ERTS_MMAPFLG_SUPERALIGNED & flags);
 
@@ -1883,19 +1893,19 @@ erts_mremap(Uint32 flags, void *ptr, UWord old_size, UWord *sizep)
 		 ? ERTS_SUPERALIGNED_CEILING(*sizep)
 		 : ERTS_PAGEALIGNED_CEILING(*sizep));
 
-	erts_smp_mtx_lock(&mmap_state.mtx);
+	erts_smp_mtx_lock(&mm->mtx);
 
 	if (ERTS_MMAP_IN_SUPERALIGNED_AREA(ptr)
-	    ? (!superaligned && lookup_free_seg(&mmap_state.sua.map, asize))
-	    : (superaligned && lookup_free_seg(&mmap_state.sa.map, asize))) {
-	    erts_smp_mtx_unlock(&mmap_state.mtx);
+	    ? (!superaligned && lookup_free_seg(&mm->sua.map, asize))
+	    : (superaligned && lookup_free_seg(&mm->sa.map, asize))) {
+	    erts_smp_mtx_unlock(&mm->mtx);
 	    /*
 	     * Segment currently in wrong area (due to a previous memory
 	     * shortage), move it to the right area.
 	     * (remap_move() will succeed)
 	     */
-	    return remap_move(ERTS_MMAPFLG_SUPERCARRIER_ONLY|flags, ptr,
-			      old_size, sizep);
+	    return remap_move(mm, ERTS_MMAPFLG_SUPERCARRIER_ONLY|flags,
+                              ptr, old_size, sizep);
 	}
 
 	ERTS_MREMAP_OP_START(ptr, old_size, *sizep);
@@ -1917,18 +1927,18 @@ erts_mremap(Uint32 flags, void *ptr, UWord old_size, UWord *sizep)
 	    UWord unres_sz;
 	    new_ptr = ptr;
 	    if (!ERTS_MMAP_IN_SUPERALIGNED_AREA(ptr)) {
-		map = &mmap_state.sua.map;
+		map = &mm->sua.map;
 		ERTS_MMAP_SIZE_SC_SUA_DEC(old_size - asize);
 	    }
 	    else {
-		if (end == mmap_state.sa.top) {
-		    mmap_state.sa.top = new_end;
-		    mmap_state.unreserve_physical(((char *) ptr) + asize,
+		if (end == mm->sa.top) {
+		    mm->sa.top = new_end;
+		    mm->unreserve_physical(((char *) ptr) + asize,
 						  old_size - asize);
 		    goto supercarrier_resize_success;
 		}
 		ERTS_MMAP_SIZE_SC_SA_DEC(old_size - asize);
-		map = &mmap_state.sa.map;
+		map = &mm->sa.map;
 	    }
 	    
 	    adjacent_free_seg(map, start, end, &prev, &next);
@@ -1936,11 +1946,11 @@ erts_mremap(Uint32 flags, void *ptr, UWord old_size, UWord *sizep)
 	    if (next)
 		resize_free_seg(map, next, new_end, next->end);
 	    else
-		ad_sz = alloc_desc_insert_free_seg(map, new_end, end);
+		ad_sz = alloc_desc_insert_free_seg(mm, map, new_end, end);
 	    ERTS_MMAP_ASSERT(old_size - asize >= ad_sz);
 	    unres_sz = old_size - asize - ad_sz;
 	    if (unres_sz)
-		mmap_state.unreserve_physical(((char *) ptr) + asize + ad_sz,
+		mm->unreserve_physical(((char *) ptr) + asize + ad_sz,
 					      unres_sz);
 	    goto supercarrier_resize_success;
 	}
@@ -1950,17 +1960,17 @@ erts_mremap(Uint32 flags, void *ptr, UWord old_size, UWord *sizep)
 	    ERTS_MMAP_ASSERT(ERTS_IS_PAGEALIGNED(old_size));
 	    ERTS_MMAP_ASSERT(ERTS_IS_PAGEALIGNED(asize));
 
-	    adjacent_free_seg(&mmap_state.sua.map, start, end, &prev, &next);
+	    adjacent_free_seg(&mm->sua.map, start, end, &prev, &next);
 
 	    if (next && new_end <= next->end) {
-		if (!mmap_state.reserve_physical(((char *) ptr) + old_size,
+		if (!mm->reserve_physical(((char *) ptr) + old_size,
 						 asize - old_size))
 		    goto supercarrier_reserve_failure;
 		if (new_end < next->end)
-		    resize_free_seg(&mmap_state.sua.map, next, new_end, next->end);
+		    resize_free_seg(&mm->sua.map, next, new_end, next->end);
 		else {
-		    delete_free_seg(&mmap_state.sua.map, next);
-		    free_desc(next);
+		    delete_free_seg(&mm->sua.map, next);
+		    free_desc(mm, next);
 		}
 		new_ptr = ptr;
 		ERTS_MMAP_SIZE_SC_SUA_INC(asize - old_size);
@@ -1969,28 +1979,28 @@ erts_mremap(Uint32 flags, void *ptr, UWord old_size, UWord *sizep)
 	}
 	else { /* Superaligned area */
 
-	    if (end == mmap_state.sa.top) {
-		if (new_end <= mmap_state.sua.bot) {
-		    if (!mmap_state.reserve_physical(((char *) ptr) + old_size,
+	    if (end == mm->sa.top) {
+		if (new_end <= mm->sua.bot) {
+		    if (!mm->reserve_physical(((char *) ptr) + old_size,
 						     asize - old_size))
 			goto supercarrier_reserve_failure;
-		    mmap_state.sa.top = new_end;
+		    mm->sa.top = new_end;
 		    new_ptr = ptr;
 		    ERTS_MMAP_SIZE_SC_SA_INC(asize - old_size);
 		    goto supercarrier_resize_success;
 		}
 	    }
 	    else {
-		adjacent_free_seg(&mmap_state.sa.map, start, end, &prev, &next);
+		adjacent_free_seg(&mm->sa.map, start, end, &prev, &next);
 		if (next && new_end <= next->end) {
-		    if (!mmap_state.reserve_physical(((char *) ptr) + old_size,
+		    if (!mm->reserve_physical(((char *) ptr) + old_size,
 						     asize - old_size))
 			goto supercarrier_reserve_failure;
 		    if (new_end < next->end)
-			resize_free_seg(&mmap_state.sa.map, next, new_end, next->end);
+			resize_free_seg(&mm->sa.map, next, new_end, next->end);
 		    else {
-			delete_free_seg(&mmap_state.sa.map, next);
-			free_desc(next);
+			delete_free_seg(&mm->sa.map, next);
+			free_desc(mm, next);
 		    }
 		    new_ptr = ptr;
 		    ERTS_MMAP_SIZE_SC_SA_INC(asize - old_size);
@@ -2000,12 +2010,12 @@ erts_mremap(Uint32 flags, void *ptr, UWord old_size, UWord *sizep)
 	}
 
 	ERTS_MMAP_OP_ABORT();
-	erts_smp_mtx_unlock(&mmap_state.mtx);
+	erts_smp_mtx_unlock(&mm->mtx);
 
 	/* Failed to resize... */
     }
 
-    return remap_move(flags, ptr, old_size, sizep);
+    return remap_move(mm, flags, ptr, old_size, sizep);
 
 supercarrier_resize_success:
 
@@ -2022,25 +2032,24 @@ supercarrier_resize_success:
 #endif
 
     ERTS_MREMAP_OP_END(new_ptr, asize);
-    erts_smp_mtx_unlock(&mmap_state.mtx);
+    erts_smp_mtx_unlock(&mm->mtx);
 
     *sizep = asize;
     return new_ptr;
 
 supercarrier_reserve_failure:
     ERTS_MREMAP_OP_END(NULL, old_size);
-    erts_smp_mtx_unlock(&mmap_state.mtx);
+    erts_smp_mtx_unlock(&mm->mtx);
     *sizep = old_size;
     return NULL;
     
 }
 
-int erts_mmap_in_supercarrier(void *ptr)
+int erts_mmap_in_supercarrier(ErtsMemMapper* mm, void *ptr)
 {
     return ERTS_MMAP_IN_SUPERCARRIER(ptr);
 }
 
-
 static struct {
     Eterm total;
     Eterm total_sa;
@@ -2103,8 +2112,9 @@ static void hard_dbg_mseg_init(void);
 #endif
 
 void
-erts_mmap_init(ErtsMMapInit *init)
+erts_mmap_init(ErtsMemMapper* mm, ErtsMMapInit *init)
 {
+    static int is_first_call = 1;
     int virtual_map = 0;
     char *start = NULL, *end = NULL;
     UWord pagesize;
@@ -2126,25 +2136,25 @@ erts_mmap_init(ErtsMMapInit *init)
 #endif
     erts_page_inv_mask = pagesize - 1;
     if (pagesize & erts_page_inv_mask)
-	erl_exit(-1, "erts_mmap: Invalid pagesize: %bpu\n",
+	erts_exit(1, "erts_mmap: Invalid pagesize: %bpu\n",
 		 pagesize);
 
     ERTS_MMAP_OP_RINGBUF_INIT();
 
-    erts_have_erts_mmap = 0;
-
-    mmap_state.supercarrier = 0;
-    mmap_state.reserve_physical = reserve_noop;
-    mmap_state.unreserve_physical = unreserve_noop;
+    mm->supercarrier = 0;
+    mm->reserve_physical = reserve_noop;
+    mm->unreserve_physical = unreserve_noop;
 
 #if HAVE_MMAP && !defined(MAP_ANON)
-    mmap_state.mmap_fd = open("/dev/zero", O_RDWR);
-    if (mmap_state.mmap_fd < 0)
-	erl_exit(-1, "erts_mmap: Failed to open /dev/zero\n");
+    mm->mmap_fd = open("/dev/zero", O_RDWR);
+    if (mm->mmap_fd < 0)
+	erts_exit(1, "erts_mmap: Failed to open /dev/zero\n");
 #endif
 
-    erts_smp_mtx_init(&mmap_state.mtx, "erts_mmap");
-    erts_mtx_init(&am.init_mutex, "mmap_init_atoms");
+    erts_smp_mtx_init(&mm->mtx, "erts_mmap");
+    if (is_first_call) {
+        erts_mtx_init(&am.init_mutex, "mmap_init_atoms");
+    }
 
 #ifdef ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION
     if (init->virtual_range.start) {
@@ -2155,13 +2165,13 @@ erts_mmap_init(ErtsMMapInit *init)
 	sz = end - ptr;
 	start = os_mmap_virtual(ptr, sz);
 	if (!start || start > ptr || start >= end)
-	    erl_exit(-1,
+	    erts_exit(1,
 		     "erts_mmap: Failed to create virtual range for super carrier\n");
 	sz = start - ptr;
 	if (sz)
 	    os_munmap(end, sz);
-	mmap_state.reserve_physical = os_reserve_physical;
-	mmap_state.unreserve_physical = os_unreserve_physical;
+	mm->reserve_physical = os_reserve_physical;
+	mm->unreserve_physical = os_unreserve_physical;
 	virtual_map = 1;
     }
     else
@@ -2179,8 +2189,8 @@ erts_mmap_init(ErtsMMapInit *init)
 #ifdef ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION
 	if (!init->scrpm) {
 	    start = os_mmap_virtual(NULL, sz);
-	    mmap_state.reserve_physical = os_reserve_physical;
-	    mmap_state.unreserve_physical = os_unreserve_physical;
+	    mm->reserve_physical = os_reserve_physical;
+	    mm->unreserve_physical = os_unreserve_physical;
 	    virtual_map = 1;
 	}
 	else
@@ -2193,7 +2203,7 @@ erts_mmap_init(ErtsMMapInit *init)
 	    start = os_mmap(NULL, sz, 1);
 	}
 	if (!start)
-	    erl_exit(-1,
+	    erts_exit(1,
 		     "erts_mmap: Failed to create super carrier of size %bpu MB\n",
 		     init->scs/1024/1024);
 	end = start + sz;
@@ -2206,34 +2216,32 @@ erts_mmap_init(ErtsMMapInit *init)
 	}
 #endif
     }
-    if (!mmap_state.no_os_mmap)
-	erts_have_erts_mmap |= ERTS_HAVE_ERTS_OS_MMAP;
 #endif
 
-    mmap_state.no.free_seg_descs = 0;
-    mmap_state.no.free_segs.curr = 0;
-    mmap_state.no.free_segs.max = 0;
+    mm->no.free_seg_descs = 0;
+    mm->no.free_segs.curr = 0;
+    mm->no.free_segs.max = 0;
 
-    mmap_state.size.supercarrier.total = 0;
-    mmap_state.size.supercarrier.used.total = 0;
-    mmap_state.size.supercarrier.used.sa = 0;
-    mmap_state.size.supercarrier.used.sua = 0;
-    mmap_state.size.os.used = 0;
+    mm->size.supercarrier.total = 0;
+    mm->size.supercarrier.used.total = 0;
+    mm->size.supercarrier.used.sa = 0;
+    mm->size.supercarrier.used.sua = 0;
+    mm->size.os.used = 0;
 
-    mmap_state.desc.new_area_hint = NULL;
+    mm->desc.new_area_hint = NULL;
 
     if (!start) {
-	mmap_state.sa.bot = NULL;
-	mmap_state.sua.top = NULL;
-	mmap_state.sa.bot = NULL;
-	mmap_state.sua.top = NULL;
-	mmap_state.no_os_mmap = 0;
-        mmap_state.supercarrier = 0;
+	mm->sa.bot = NULL;
+	mm->sua.top = NULL;
+	mm->sa.bot = NULL;
+	mm->sua.top = NULL;
+	mm->no_os_mmap = 0;
+        mm->supercarrier = 0;
     }
     else {
 	size_t desc_size;
 
-	mmap_state.no_os_mmap = init->sco;
+	mm->no_os_mmap = init->sco;
 
 	desc_size = init->scrfsd;
 	if (desc_size < 100)
@@ -2242,68 +2250,75 @@ erts_mmap_init(ErtsMMapInit *init)
 	if ((desc_size
 	     + ERTS_SUPERALIGNED_SIZE
 	     + ERTS_PAGEALIGNED_SIZE) > end - start)
-	    erl_exit(-1, "erts_mmap: No space for segments in super carrier\n");
+	    erts_exit(1, "erts_mmap: No space for segments in super carrier\n");
 
-	mmap_state.sa.bot = start;
-	mmap_state.sa.bot += desc_size;
-	mmap_state.sa.bot = (char *) ERTS_SUPERALIGNED_CEILING(mmap_state.sa.bot);
-	mmap_state.sa.top = mmap_state.sa.bot;
-	mmap_state.sua.top = end;
-	mmap_state.sua.bot = mmap_state.sua.top;
+	mm->sa.bot = start;
+	mm->sa.bot += desc_size;
+	mm->sa.bot = (char *) ERTS_SUPERALIGNED_CEILING(mm->sa.bot);
+	mm->sa.top = mm->sa.bot;
+	mm->sua.top = end;
+	mm->sua.bot = mm->sua.top;
 
-	mmap_state.size.supercarrier.used.total += (UWord) (mmap_state.sa.bot - start);
+	mm->size.supercarrier.used.total += (UWord) (mm->sa.bot - start);
 
-	mmap_state.desc.free_list = NULL;
-        mmap_state.desc.reserved = 0;
+	mm->desc.free_list = NULL;
+        mm->desc.reserved = 0;
 
 	if (end == (void *) 0) {
 	    /*
 	     * Very unlikely, but we need a guarantee
-	     * that `mmap_state.sua.top` always will
+	     * that `mm->sua.top` always will
 	     * compare as larger than all segment pointers
 	     * into the super carrier...
 	     */
-	    mmap_state.sua.top -= ERTS_PAGEALIGNED_SIZE;
-	    mmap_state.size.supercarrier.used.total += ERTS_PAGEALIGNED_SIZE;
+	    mm->sua.top -= ERTS_PAGEALIGNED_SIZE;
+	    mm->size.supercarrier.used.total += ERTS_PAGEALIGNED_SIZE;
 #ifdef ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION
-	    if (!virtual_map || os_reserve_physical(mmap_state.sua.top, ERTS_PAGEALIGNED_SIZE))
+	    if (!virtual_map || os_reserve_physical(mm->sua.top, ERTS_PAGEALIGNED_SIZE))
 #endif
-		add_free_desc_area(mmap_state.sua.top, end);
-            mmap_state.desc.reserved += (end - mmap_state.sua.top) / sizeof(ErtsFreeSegDesc);
+		add_free_desc_area(mm, mm->sua.top, end);
+            mm->desc.reserved += (end - mm->sua.top) / sizeof(ErtsFreeSegDesc);
 	}
 
-	mmap_state.size.supercarrier.total = (UWord) (mmap_state.sua.top - start);
+	mm->size.supercarrier.total = (UWord) (mm->sua.top - start);
 
 	/*
 	 * Area before (and after) super carrier
 	 * will be used for free segment descritors.
 	 */
 #ifdef ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION
-	if (virtual_map && !os_reserve_physical(start, mmap_state.sa.bot - start))
-	    erl_exit(-1, "erts_mmap: Failed to reserve physical memory for descriptors\n");
+	if (virtual_map && !os_reserve_physical(start, mm->sa.bot - start))
+	    erts_exit(1, "erts_mmap: Failed to reserve physical memory for descriptors\n");
 #endif
-	mmap_state.desc.unused_start = start;
-	mmap_state.desc.unused_end = mmap_state.sa.bot;
-        mmap_state.desc.reserved += ((mmap_state.desc.unused_end - start)
+	mm->desc.unused_start = start;
+	mm->desc.unused_end = mm->sa.bot;
+        mm->desc.reserved += ((mm->desc.unused_end - start)
                                      / sizeof(ErtsFreeSegDesc));
 
-	init_free_seg_map(&mmap_state.sa.map, SA_SZ_ADDR_ORDER);
-	init_free_seg_map(&mmap_state.sua.map, SZ_REVERSE_ADDR_ORDER);
+	init_free_seg_map(&mm->sa.map, SA_SZ_ADDR_ORDER);
+	init_free_seg_map(&mm->sua.map, SZ_REVERSE_ADDR_ORDER);
 
-	mmap_state.supercarrier = 1;
-	erts_have_erts_mmap |= ERTS_HAVE_ERTS_SUPERCARRIER_MMAP;
+	mm->supercarrier = 1;
 
-	mmap_state.desc.new_area_hint = end;
+	mm->desc.new_area_hint = end;
 
     }
 
 #if !ERTS_HAVE_OS_MMAP
-    mmap_state.no_os_mmap = 1;
+    mm->no_os_mmap = 1;
 #endif
 
 #ifdef HARD_DEBUG_MSEG
     hard_dbg_mseg_init();
 #endif
+
+#if defined(ARCH_64) && defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION)
+   if (mm == &erts_literal_mmapper) {
+       erts_literals_start = erts_literal_mmapper.sa.bot;
+       erts_literals_size  = erts_literal_mmapper.sua.top - erts_literals_start;
+    }
+#endif
+    is_first_call = 0;
 }
 
 
@@ -2313,7 +2328,8 @@ add_2tup(Uint **hpp, Uint *szp, Eterm *lp, Eterm el1, Eterm el2)
     *lp = erts_bld_cons(hpp, szp, erts_bld_tuple(hpp, szp, 2, el1, el2), *lp);
 }
 
-Eterm erts_mmap_info(int *print_to_p,
+Eterm erts_mmap_info(ErtsMemMapper* mm,
+                     int *print_to_p,
                      void *print_to_arg,
                      Eterm** hpp, Uint* szp,
                      struct erts_mmap_info_struct* emis)
@@ -2328,29 +2344,29 @@ Eterm erts_mmap_info(int *print_to_p,
     Eterm res = THE_NON_VALUE;
 
     if (!hpp) {
-        erts_smp_mtx_lock(&mmap_state.mtx);
-        emis->sizes[0] = mmap_state.size.supercarrier.total;
-        emis->sizes[1] = mmap_state.sa.top  - mmap_state.sa.bot;
-        emis->sizes[2] = mmap_state.sua.top - mmap_state.sua.bot;
-        emis->sizes[3] = mmap_state.size.supercarrier.used.total;
-        emis->sizes[4] = mmap_state.size.supercarrier.used.sa;
-        emis->sizes[5] = mmap_state.size.supercarrier.used.sua;
+        erts_smp_mtx_lock(&mm->mtx);
+        emis->sizes[0] = mm->size.supercarrier.total;
+        emis->sizes[1] = mm->sa.top  - mm->sa.bot;
+        emis->sizes[2] = mm->sua.top - mm->sua.bot;
+        emis->sizes[3] = mm->size.supercarrier.used.total;
+        emis->sizes[4] = mm->size.supercarrier.used.sa;
+        emis->sizes[5] = mm->size.supercarrier.used.sua;
 
-        emis->segs[0] = mmap_state.no.free_segs.curr;
-        emis->segs[1] = mmap_state.no.free_segs.max;
-        emis->segs[2] = mmap_state.no.free_seg_descs;
-        emis->segs[3] = mmap_state.desc.reserved;
-        emis->segs[4] = mmap_state.sa.map.nseg;
-        emis->segs[5] = mmap_state.sua.map.nseg;
+        emis->segs[0] = mm->no.free_segs.curr;
+        emis->segs[1] = mm->no.free_segs.max;
+        emis->segs[2] = mm->no.free_seg_descs;
+        emis->segs[3] = mm->desc.reserved;
+        emis->segs[4] = mm->sa.map.nseg;
+        emis->segs[5] = mm->sua.map.nseg;
 
-        emis->os_used = mmap_state.size.os.used;
-        erts_smp_mtx_unlock(&mmap_state.mtx);
+        emis->os_used = mm->size.os.used;
+        erts_smp_mtx_unlock(&mm->mtx);
     }
 
     if (print_to_p) {
         int to = *print_to_p;
 	void *arg = print_to_arg;
-        if (mmap_state.supercarrier) {
+        if (mm->supercarrier) {
             const char* prefix = "supercarrier ";
             erts_print(to, arg, "%stotal size: %bpu\n", prefix, emis->sizes[0]);
             erts_print(to, arg, "%stotal sa size: %bpu\n", prefix, emis->sizes[1]);
@@ -2365,7 +2381,7 @@ Eterm erts_mmap_info(int *print_to_p,
             erts_print(to, arg, "%ssa free segs: %bpu\n", prefix, emis->segs[4]);
             erts_print(to, arg, "%ssua free segs: %bpu\n", prefix, emis->segs[5]);
         }
-        if (!mmap_state.no_os_mmap) {
+        if (!mm->no_os_mmap) {
             erts_print(to, arg, "os mmap size used: %bpu\n", emis->os_used);
         }
     }
@@ -2377,7 +2393,7 @@ Eterm erts_mmap_info(int *print_to_p,
         }
 
         lix = 0;
-        if (mmap_state.supercarrier) {
+        if (mm->supercarrier) {
             group[0] = erts_bld_atom_uword_2tup_list(hpp, szp,
                                                      sizeof(size_tags)/sizeof(Eterm),
                                                      size_tags, emis->sizes);
@@ -2389,7 +2405,7 @@ Eterm erts_mmap_info(int *print_to_p,
             lix++;
         }
 
-        if (!mmap_state.no_os_mmap) {
+        if (!mm->no_os_mmap) {
             group[0] = erts_bld_atom_uword_2tup_list(hpp, szp,
                                                       1, &am.used, &emis->os_used);
             list[lix] = erts_bld_2tup_list(hpp, szp, 1, group_tags, group);
@@ -2401,25 +2417,26 @@ Eterm erts_mmap_info(int *print_to_p,
     return res;
 }
 
-Eterm erts_mmap_info_options(char *prefix,
+Eterm erts_mmap_info_options(ErtsMemMapper* mm,
+                             char *prefix,
                              int *print_to_p,
                              void *print_to_arg,
                              Uint **hpp,
                              Uint *szp)
 {
-    const UWord scs = mmap_state.sua.top - mmap_state.sa.bot;
-    const Eterm sco = mmap_state.no_os_mmap ? am_true : am_false;
-    const Eterm scrpm = (mmap_state.reserve_physical == reserve_noop) ? am_true : am_false;
+    const UWord scs = mm->sua.top - mm->sa.bot;
+    const Eterm sco = mm->no_os_mmap ? am_true : am_false;
+    const Eterm scrpm = (mm->reserve_physical == reserve_noop) ? am_true : am_false;
     Eterm res = THE_NON_VALUE;
 
     if (print_to_p) {
         int to = *print_to_p;
 	void *arg = print_to_arg;
         erts_print(to, arg, "%sscs: %bpu\n", prefix, scs);
-        if (mmap_state.supercarrier) {
+        if (mm->supercarrier) {
             erts_print(to, arg, "%ssco: %T\n", prefix, sco);
             erts_print(to, arg, "%sscrpm: %T\n", prefix, scrpm);
-            erts_print(to, arg, "%sscrfsd: %beu\n", prefix, mmap_state.desc.reserved);
+            erts_print(to, arg, "%sscrfsd: %beu\n", prefix, mm->desc.reserved);
         }
     }
 
@@ -2429,9 +2446,9 @@ Eterm erts_mmap_info_options(char *prefix,
         }
 
         res = NIL;
-        if (mmap_state.supercarrier) {
+        if (mm->supercarrier) {
             add_2tup(hpp, szp, &res, am.scrfsd,
-                     erts_bld_uint(hpp,szp, mmap_state.desc.reserved));
+                     erts_bld_uint(hpp,szp, mm->desc.reserved));
             add_2tup(hpp, szp, &res, am.scrpm, scrpm);
             add_2tup(hpp, szp, &res, am.sco, sco);
         }
@@ -2441,9 +2458,9 @@ Eterm erts_mmap_info_options(char *prefix,
 }
 
 
-Eterm erts_mmap_debug_info(Process* p)
+Eterm erts_mmap_debug_info(ErtsMemMapper* mm, Process* p)
 {
-    if (mmap_state.supercarrier) {
+    if (mm->supercarrier) {
         ERTS_DECL_AM(sabot);
         ERTS_DECL_AM(satop);
         ERTS_DECL_AM(suabot);
@@ -2453,18 +2470,17 @@ Eterm erts_mmap_debug_info(Process* p)
         UWord values[4];
         Eterm *hp, *hp_end;
         Uint may_need;
-        const Uint PTR_BIG_SZ = HALFWORD_HEAP ? 3 : 2;
-
-        erts_smp_mtx_lock(&mmap_state.mtx);
-        values[0] = (UWord)mmap_state.sa.bot;
-        values[1] = (UWord)mmap_state.sa.top;
-        values[2] = (UWord)mmap_state.sua.bot;
-        values[3] = (UWord)mmap_state.sua.top;
-        sa_list = build_free_seg_list(p, &mmap_state.sa.map);
-        sua_list = build_free_seg_list(p, &mmap_state.sua.map);
-        erts_smp_mtx_unlock(&mmap_state.mtx);
-
-        may_need = 4*(2+3+PTR_BIG_SZ) + 2*(2+3);
+
+        erts_smp_mtx_lock(&mm->mtx);
+        values[0] = (UWord)mm->sa.bot;
+        values[1] = (UWord)mm->sa.top;
+        values[2] = (UWord)mm->sua.bot;
+        values[3] = (UWord)mm->sua.top;
+        sa_list = build_free_seg_list(p, &mm->sa.map);
+        sua_list = build_free_seg_list(p, &mm->sua.map);
+        erts_smp_mtx_unlock(&mm->mtx);
+
+        may_need = 4*(2+3+2) + 2*(2+3);
         hp = HAlloc(p, may_need);
         hp_end = hp + may_need;
 
diff --git a/erts/emulator/sys/common/erl_mmap.h b/erts/emulator/sys/common/erl_mmap.h
index 66619c5161..67e131b53e 100644
--- a/erts/emulator/sys/common/erl_mmap.h
+++ b/erts/emulator/sys/common/erl_mmap.h
@@ -30,9 +30,6 @@
 #define ERTS_MMAPFLG_SUPERCARRIER_ONLY		(((Uint32) 1) << 1)
 #define ERTS_MMAPFLG_SUPERALIGNED		(((Uint32) 1) << 2)
 
-#define ERTS_HAVE_ERTS_OS_MMAP			(1 << 0)
-#define ERTS_HAVE_ERTS_SUPERCARRIER_MMAP	(1 << 1)
-extern int erts_have_erts_mmap;
 extern UWord erts_page_inv_mask;
 
 typedef struct {
@@ -53,23 +50,31 @@ typedef struct {
 #define ERTS_MMAP_INIT_DEFAULT_INITER \
     {{NULL, NULL}, {NULL, NULL}, 0, 1, (1 << 16), 1}
 
-void *erts_mmap(Uint32 flags, UWord *sizep);
-void erts_munmap(Uint32 flags, void *ptr, UWord size);
-void *erts_mremap(Uint32 flags, void *ptr, UWord old_size, UWord *sizep);
-int erts_mmap_in_supercarrier(void *ptr);
-void erts_mmap_init(ErtsMMapInit*);
+#define ERTS_LITERAL_VIRTUAL_AREA_SIZE (UWORD_CONSTANT(1)*1024*1024*1024)
+
+#define ERTS_MMAP_INIT_LITERAL_INITER \
+    {{NULL, NULL}, {NULL, NULL}, ERTS_LITERAL_VIRTUAL_AREA_SIZE, 1, (1 << 16), 0}
+
+typedef struct ErtsMemMapper_ ErtsMemMapper;
+
+void *erts_mmap(ErtsMemMapper*, Uint32 flags, UWord *sizep);
+void erts_munmap(ErtsMemMapper*, Uint32 flags, void *ptr, UWord size);
+void *erts_mremap(ErtsMemMapper*, Uint32 flags, void *ptr, UWord old_size, UWord *sizep);
+int erts_mmap_in_supercarrier(ErtsMemMapper*, void *ptr);
+void erts_mmap_init(ErtsMemMapper*, ErtsMMapInit*);
 struct erts_mmap_info_struct
 {
     UWord sizes[6];
     UWord segs[6];
     UWord os_used;
 };
-Eterm erts_mmap_info(int *print_to_p, void *print_to_arg,
+Eterm erts_mmap_info(ErtsMemMapper*, int *print_to_p, void *print_to_arg,
                      Eterm** hpp, Uint* szp, struct erts_mmap_info_struct*);
-Eterm erts_mmap_info_options(char *prefix, int *print_to_p, void *print_to_arg,
+Eterm erts_mmap_info_options(ErtsMemMapper*,
+                             char *prefix, int *print_to_p, void *print_to_arg,
                              Uint **hpp, Uint *szp);
 struct process;
-Eterm erts_mmap_debug_info(struct process*);
+Eterm erts_mmap_debug_info(ErtsMemMapper*, struct process*);
 
 #define ERTS_SUPERALIGNED_SIZE \
     (1 << ERTS_MMAP_SUPERALIGNED_BITS)
@@ -121,6 +126,11 @@ Eterm erts_mmap_debug_info(struct process*);
 #  define ERTS_HAVE_OS_MMAP 1
 #endif
 
+extern ErtsMemMapper erts_dflt_mmapper;
+#if defined(ARCH_64) && defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION)
+extern ErtsMemMapper erts_literal_mmapper;
+#endif
+
 /*#define HARD_DEBUG_MSEG*/
 #ifdef HARD_DEBUG_MSEG
 #  define HARD_DBG_INSERT_MSEG hard_dbg_insert_mseg
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c
index 0d51aad863..286130bece 100644
--- a/erts/emulator/sys/common/erl_mseg.c
+++ b/erts/emulator/sys/common/erl_mseg.c
@@ -99,17 +99,12 @@ static const int debruijn[32] = {
 
 static int atoms_initialized;
 
-typedef struct mem_kind_t MemKind;
-
 const ErtsMsegOpt_t erts_mseg_default_opt = {
     1,			/* Use cache		     */
     1,			/* Preserv data		     */
     0,			/* Absolute shrink threshold */
     0,			/* Relative shrink threshold */
     0			/* Scheduler specific        */
-#if HALFWORD_HEAP
-    ,0                  /* need low memory */
-#endif
 };
 
 
@@ -142,7 +137,14 @@ struct cache_t_ {
 
 typedef struct ErtsMsegAllctr_t_ ErtsMsegAllctr_t;
 
-struct mem_kind_t {
+struct ErtsMsegAllctr_t_ {
+    int ix;
+
+    int is_init_done;
+    int is_thread_safe;
+    erts_mtx_t mtx;
+
+    int is_cache_check_scheduled;
 
     cache_t cache[MAX_CACHE_SIZE];
     cache_t cache_unpowered_node;
@@ -168,29 +170,6 @@ struct mem_kind_t {
 	} max_ever;
     } segments;
 
-    ErtsMsegAllctr_t *ma;
-    const char* name;
-    MemKind* next;
-};/*MemKind*/
-
-struct ErtsMsegAllctr_t_ {
-    int ix;
-
-    int is_init_done;
-    int is_thread_safe;
-    erts_mtx_t mtx;
-
-    int is_cache_check_scheduled;
-
-    MemKind* mk_list;
-
-#if HALFWORD_HEAP
-    MemKind low_mem;
-    MemKind hi_mem;
-#else
-    MemKind the_mem;
-#endif
-
     Uint max_cache_size;
     Uint abs_max_cache_bad_fit;
     Uint rel_max_cache_bad_fit;
@@ -302,22 +281,17 @@ schedule_cache_check(ErtsMsegAllctr_t *ma) {
 /* #define ERTS_PRINT_ERTS_MMAP */
 
 static ERTS_INLINE void *
-mseg_create(ErtsMsegAllctr_t *ma, Uint flags, MemKind* mk, UWord *sizep)
+mseg_create(ErtsMsegAllctr_t *ma, Uint flags, UWord *sizep)
 {
 #ifdef ERTS_PRINT_ERTS_MMAP
     UWord req_size = *sizep;
 #endif
     void *seg;
     Uint32 mmap_flags = 0;
-#if HALFWORD_HEAP
-    mmap_flags |= ((mk == &ma->low_mem)
-		   ? ERTS_MMAPFLG_SUPERCARRIER_ONLY
-		   : ERTS_MMAPFLG_OS_ONLY);
-#endif
     if (MSEG_FLG_IS_2POW(flags))
 	mmap_flags |= ERTS_MMAPFLG_SUPERALIGNED;
 
-    seg = erts_mmap(mmap_flags, sizep);
+    seg = erts_mmap(&erts_dflt_mmapper, mmap_flags, sizep);
 
 #ifdef ERTS_PRINT_ERTS_MMAP
     erts_fprintf(stderr, "%p = erts_mmap(%s, {%bpu, %bpu});\n", seg,
@@ -331,18 +305,13 @@ mseg_create(ErtsMsegAllctr_t *ma, Uint flags, MemKind* mk, UWord *sizep)
 }
 
 static ERTS_INLINE void
-mseg_destroy(ErtsMsegAllctr_t *ma, Uint flags, MemKind* mk, void *seg_p, UWord size) {
+mseg_destroy(ErtsMsegAllctr_t *ma, Uint flags, void *seg_p, UWord size) {
     
     Uint32 mmap_flags = 0;
-#if HALFWORD_HEAP
-    mmap_flags |= ((mk == &ma->low_mem)
-		   ? ERTS_MMAPFLG_SUPERCARRIER_ONLY
-		   : ERTS_MMAPFLG_OS_ONLY);
-#endif
     if (MSEG_FLG_IS_2POW(flags))
 	 mmap_flags |= ERTS_MMAPFLG_SUPERALIGNED;
 
-    erts_munmap(mmap_flags, seg_p, size);
+    erts_munmap(&erts_dflt_mmapper, mmap_flags, seg_p, size);
 #ifdef ERTS_PRINT_ERTS_MMAP
     erts_fprintf(stderr, "erts_munmap(%s, %p, %bpu);\n",
 		 (mmap_flags & ERTS_MMAPFLG_SUPERALIGNED) ? "sa" : "sua",
@@ -353,22 +322,17 @@ mseg_destroy(ErtsMsegAllctr_t *ma, Uint flags, MemKind* mk, void *seg_p, UWord s
 }
 
 static ERTS_INLINE void *
-mseg_recreate(ErtsMsegAllctr_t *ma, Uint flags, MemKind* mk, void *old_seg, UWord old_size, UWord *sizep)
+mseg_recreate(ErtsMsegAllctr_t *ma, Uint flags, void *old_seg, UWord old_size, UWord *sizep)
 {
 #ifdef ERTS_PRINT_ERTS_MMAP
     UWord req_size = *sizep;	
 #endif
     void *new_seg;
     Uint32 mmap_flags = 0;
-#if HALFWORD_HEAP
-    mmap_flags |= ((mk == &ma->low_mem)
-		   ? ERTS_MMAPFLG_SUPERCARRIER_ONLY
-		   : ERTS_MMAPFLG_OS_ONLY);
-#endif
     if (MSEG_FLG_IS_2POW(flags))
 	mmap_flags |= ERTS_MMAPFLG_SUPERALIGNED;
 
-    new_seg = erts_mremap(mmap_flags, old_seg, old_size, sizep);
+    new_seg = erts_mremap(&erts_dflt_mmapper, mmap_flags, old_seg, old_size, sizep);
 
 #ifdef ERTS_PRINT_ERTS_MMAP
     erts_fprintf(stderr, "%p = erts_mremap(%s, %p, %bpu, {%bpu, %bpu});\n",
@@ -392,11 +356,8 @@ do {									\
 		       || erts_smp_thr_progress_is_blocking()		\
 		       || ERTS_IS_CRASH_DUMPING);			\
 } while (0)
-#define ERTS_DBG_MK_CHK_THR_ACCESS(MK) \
-  ERTS_DBG_MA_CHK_THR_ACCESS((MK)->ma)
 #else
 #define ERTS_DBG_MA_CHK_THR_ACCESS(MA)
-#define ERTS_DBG_MK_CHK_THR_ACCESS(MK)
 #endif
 
 /* Cache interface */
@@ -409,10 +370,10 @@ static ERTS_INLINE void mseg_cache_clear_node(cache_t *c) {
     c->prev = c;
 }
 
-static ERTS_INLINE int cache_bless_segment(MemKind *mk, void *seg, UWord size, Uint flags) {
+static ERTS_INLINE int cache_bless_segment(ErtsMsegAllctr_t *ma, void *seg, UWord size, Uint flags) {
 
     cache_t *c;
-    ERTS_DBG_MK_CHK_THR_ACCESS(mk);
+    ERTS_DBG_MA_CHK_THR_ACCESS(ma);
 
     ASSERT(!MSEG_FLG_IS_2POW(flags) || (MSEG_FLG_IS_2POW(flags) && MAP_IS_ALIGNED(seg) && IS_2POW(size)));
 
@@ -421,11 +382,11 @@ static ERTS_INLINE int cache_bless_segment(MemKind *mk, void *seg, UWord size, U
      * Large blocks has no such cache and it is up to mseg to cache them to speed things up.
      */
 
-    if (!erts_circleq_is_empty(&(mk->cache_free))) {
+    if (!erts_circleq_is_empty(&(ma->cache_free))) {
 
 	/* We have free slots, use one to cache the segment */
 
-	c = erts_circleq_head(&(mk->cache_free));
+	c = erts_circleq_head(&(ma->cache_free));
 	erts_circleq_remove(c);
 
 	c->seg  = seg;
@@ -437,29 +398,28 @@ static ERTS_INLINE int cache_bless_segment(MemKind *mk, void *seg, UWord size, U
 	    ASSERT(ix < CACHE_AREAS);
 	    ASSERT((1 << (ix + MSEG_ALIGN_BITS)) == size);
 
-	    erts_circleq_push_head(&(mk->cache_powered_node[ix]), c);
+	    erts_circleq_push_head(&(ma->cache_powered_node[ix]), c);
 
 	} else
-	    erts_circleq_push_head(&(mk->cache_unpowered_node), c);
+	    erts_circleq_push_head(&(ma->cache_unpowered_node), c);
 
-	mk->cache_size++;
-	ASSERT(mk->cache_size <= mk->ma->max_cache_size);
+	ma->cache_size++;
 
 	return 1;
-    } else if (!MSEG_FLG_IS_2POW(flags) && !erts_circleq_is_empty(&(mk->cache_unpowered_node))) {
+    } else if (!MSEG_FLG_IS_2POW(flags) && !erts_circleq_is_empty(&(ma->cache_unpowered_node))) {
 	/* No free slots.
 	 * Evict oldest slot from unpowered cache so we can cache an unpowered (sbc) segment  */
 
-	c = erts_circleq_tail(&(mk->cache_unpowered_node));
+	c = erts_circleq_tail(&(ma->cache_unpowered_node));
 	erts_circleq_remove(c);
 
-	mseg_destroy(mk->ma, ERTS_MSEG_FLG_NONE, mk, c->seg, c->size);
+	mseg_destroy(ma, ERTS_MSEG_FLG_NONE, c->seg, c->size);
 	mseg_cache_clear_node(c);
 
 	c->seg  = seg;
 	c->size = size;
 
-	erts_circleq_push_head(&(mk->cache_unpowered_node), c);
+	erts_circleq_push_head(&(ma->cache_unpowered_node), c);
 
 	return 1;
     } else if (!MSEG_FLG_IS_2POW(flags)) {
@@ -473,20 +433,20 @@ static ERTS_INLINE int cache_bless_segment(MemKind *mk, void *seg, UWord size, U
 	int i;
 
 	for( i = 0; i < CACHE_AREAS; i++) {
-	    if (erts_circleq_is_empty(&(mk->cache_powered_node[i])))
+	    if (erts_circleq_is_empty(&(ma->cache_powered_node[i])))
 		continue;
 
-	    c = erts_circleq_tail(&(mk->cache_powered_node[i]));
+	    c = erts_circleq_tail(&(ma->cache_powered_node[i]));
 	    erts_circleq_remove(c);
 
-	    mseg_destroy(mk->ma, ERTS_MSEG_FLG_2POW, mk, c->seg, c->size);
+	    mseg_destroy(ma, ERTS_MSEG_FLG_2POW, c->seg, c->size);
 
 	    mseg_cache_clear_node(c);
 
 	    c->seg  = seg;
 	    c->size = size;
 
-	    erts_circleq_push_head(&(mk->cache_unpowered_node), c);
+	    erts_circleq_push_head(&(ma->cache_unpowered_node), c);
 
 	    return 1;
 	}
@@ -495,11 +455,11 @@ static ERTS_INLINE int cache_bless_segment(MemKind *mk, void *seg, UWord size, U
     return 0;
 }
 
-static ERTS_INLINE void *cache_get_segment(MemKind *mk, UWord *size_p, Uint flags) {
+static ERTS_INLINE void *cache_get_segment(ErtsMsegAllctr_t *ma, UWord *size_p, Uint flags) {
 
     UWord size = *size_p;
 
-    ERTS_DBG_MK_CHK_THR_ACCESS(mk);
+    ERTS_DBG_MA_CHK_THR_ACCESS(ma);
 
     if (MSEG_FLG_IS_2POW(flags)) {
 
@@ -512,10 +472,10 @@ static ERTS_INLINE void *cache_get_segment(MemKind *mk, UWord *size_p, Uint flag
 
 	for( i = ix; i < CACHE_AREAS; i++) {
 
-	    if (erts_circleq_is_empty(&(mk->cache_powered_node[i])))
+	    if (erts_circleq_is_empty(&(ma->cache_powered_node[i])))
 		continue;
 
-	    c = erts_circleq_head(&(mk->cache_powered_node[i]));
+	    c = erts_circleq_head(&(ma->cache_powered_node[i]));
 	    erts_circleq_remove(c);
 
 	    ASSERT(IS_2POW(c->size));
@@ -524,31 +484,31 @@ static ERTS_INLINE void *cache_get_segment(MemKind *mk, UWord *size_p, Uint flag
 	    csize = c->size;
 	    seg   = (char*) c->seg;
 
-	    mk->cache_size--;
-	    mk->cache_hits++;
+	    ma->cache_size--;
+	    ma->cache_hits++;
 
 	    /* link to free cache list */
 	    mseg_cache_clear_node(c);
-	    erts_circleq_push_head(&(mk->cache_free), c);
+	    erts_circleq_push_head(&(ma->cache_free), c);
 
-	    ASSERT(!(mk->cache_size < 0));
+	    ASSERT(!(ma->cache_size < 0));
 
 	    if (csize != size)
-		mseg_destroy(mk->ma, ERTS_MSEG_FLG_2POW, mk, seg + size, csize - size);
+		mseg_destroy(ma, ERTS_MSEG_FLG_2POW, seg + size, csize - size);
 
 	    return seg;
 	}
     } 
-    else if (!erts_circleq_is_empty(&(mk->cache_unpowered_node))) {
+    else if (!erts_circleq_is_empty(&(ma->cache_unpowered_node))) {
 	void *seg;
 	cache_t *c;
 	cache_t *best = NULL;
 	UWord bdiff = 0;
 	UWord csize;
-	UWord bad_max_abs = mk->ma->abs_max_cache_bad_fit;
-	UWord bad_max_rel = mk->ma->rel_max_cache_bad_fit;
+	UWord bad_max_abs = ma->abs_max_cache_bad_fit;
+	UWord bad_max_rel = ma->rel_max_cache_bad_fit;
 
-	erts_circleq_foreach(c, &(mk->cache_unpowered_node)) {
+	erts_circleq_foreach(c, &(ma->cache_unpowered_node)) {
 	    csize = c->size;
 	    if (csize >= size) {
 		if (((csize - size)*100 < bad_max_rel*size) && (csize - size) < bad_max_abs ) {
@@ -557,11 +517,11 @@ static ERTS_INLINE void *cache_get_segment(MemKind *mk, UWord *size_p, Uint flag
 
 		    erts_circleq_remove(c);
 
-		    mk->cache_size--;
-		    mk->cache_hits++;
+		    ma->cache_size--;
+		    ma->cache_hits++;
 
 		    mseg_cache_clear_node(c);
-		    erts_circleq_push_head(&(mk->cache_free), c);
+		    erts_circleq_push_head(&(ma->cache_free), c);
 
 		    *size_p = csize;
 
@@ -584,7 +544,7 @@ static ERTS_INLINE void *cache_get_segment(MemKind *mk, UWord *size_p, Uint flag
 	    ASSERT(best->seg);
 	    ASSERT(best->size > 0);
 
-	    mk->cache_hits++;
+	    ma->cache_hits++;
 
 	    /* Use current cache placement for remaining segment space */
 
@@ -608,7 +568,7 @@ static ERTS_INLINE void *cache_get_segment(MemKind *mk, UWord *size_p, Uint flag
  * using callbacks from aux-work in the scheduler.
  */
 
-static ERTS_INLINE Uint mseg_drop_one_memkind_cache_size(MemKind *mk, Uint flags, cache_t *head) {
+static ERTS_INLINE Uint mseg_drop_one_cache_size(ErtsMsegAllctr_t *ma, Uint flags, cache_t *head) {
     cache_t *c = NULL;
 
     c = erts_circleq_tail(head);
@@ -617,19 +577,19 @@ static ERTS_INLINE Uint mseg_drop_one_memkind_cache_size(MemKind *mk, Uint flags
     if (erts_mtrace_enabled)
 	erts_mtrace_crr_free(SEGTYPE, SEGTYPE, c->seg);
 
-    mseg_destroy(mk->ma, flags, mk, c->seg, c->size);
+    mseg_destroy(ma, flags, c->seg, c->size);
     mseg_cache_clear_node(c);
-    erts_circleq_push_head(&(mk->cache_free), c);
+    erts_circleq_push_head(&(ma->cache_free), c);
 
-    mk->segments.current.watermark--;
-    mk->cache_size--;
+    ma->segments.current.watermark--;
+    ma->cache_size--;
 
-    ASSERT( mk->cache_size >= 0 );
+    ASSERT(ma->cache_size >= 0);
 
-    return mk->cache_size;
+    return ma->cache_size;
 }
 
-static ERTS_INLINE Uint mseg_drop_memkind_cache_size(MemKind *mk, Uint flags, cache_t *head) {
+static ERTS_INLINE Uint mseg_drop_cache_size(ErtsMsegAllctr_t *ma, Uint flags, cache_t *head) {
     cache_t *c = NULL;
 
     while (!erts_circleq_is_empty(head)) {
@@ -640,58 +600,52 @@ static ERTS_INLINE Uint mseg_drop_memkind_cache_size(MemKind *mk, Uint flags, ca
 	if (erts_mtrace_enabled)
 	    erts_mtrace_crr_free(SEGTYPE, SEGTYPE, c->seg);
 
-	mseg_destroy(mk->ma, flags, mk, c->seg, c->size);
+	mseg_destroy(ma, flags, c->seg, c->size);
 
 	mseg_cache_clear_node(c);
-	erts_circleq_push_head(&(mk->cache_free), c);
-
-	mk->segments.current.watermark--;
-	mk->cache_size--;
+	erts_circleq_push_head(&(ma->cache_free), c);
 
+	ma->segments.current.watermark--;
+	ma->cache_size--;
     }
 
-    ASSERT( mk->cache_size >= 0 );
+    ASSERT(ma->cache_size >= 0);
 
-    return mk->cache_size;
+    return ma->cache_size;
 }
 
-/* mseg_check_memkind_cache
- * - Check if we can empty some cached segments in this
- *   MemKind.
+/* mseg_check_cache
+ * - Check if we can empty some cached segments in this allocator
  */
 
 
-static Uint mseg_check_memkind_cache(MemKind *mk) {
+static Uint mseg_check_cache(ErtsMsegAllctr_t *ma) {
     int i;
 
-    ERTS_DBG_MK_CHK_THR_ACCESS(mk);
+    ERTS_DBG_MA_CHK_THR_ACCESS(ma);
 
     for (i = 0; i < CACHE_AREAS; i++) {
-	if (!erts_circleq_is_empty(&(mk->cache_powered_node[i])))
-	    return mseg_drop_one_memkind_cache_size(mk, ERTS_MSEG_FLG_2POW, &(mk->cache_powered_node[i]));
+	if (!erts_circleq_is_empty(&(ma->cache_powered_node[i])))
+	    return mseg_drop_one_cache_size(ma, ERTS_MSEG_FLG_2POW, &(ma->cache_powered_node[i]));
     }
 
-    if (!erts_circleq_is_empty(&(mk->cache_unpowered_node)))
-	return mseg_drop_one_memkind_cache_size(mk, ERTS_MSEG_FLG_NONE, &(mk->cache_unpowered_node));
+    if (!erts_circleq_is_empty(&(ma->cache_unpowered_node)))
+	return mseg_drop_one_cache_size(ma, ERTS_MSEG_FLG_NONE, &(ma->cache_unpowered_node));
 
     return 0;
 }
 
 /* mseg_cache_check
  * - Check if we have some cache we can purge
- *   in any of the memkinds.
  */
 
 static void mseg_cache_check(ErtsMsegAllctr_t *ma) {
-    MemKind* mk;
     Uint empty_cache = 1;
 
     ERTS_MSEG_LOCK(ma);
 
-    for (mk = ma->mk_list; mk; mk = mk->next) {
-	if (mseg_check_memkind_cache(mk))
-	    empty_cache = 0;
-    }
+    if (mseg_check_cache(ma))
+        empty_cache = 0;
 
     /* If all MemKinds caches are empty,
      * remove aux-work callback
@@ -709,7 +663,7 @@ static void mseg_cache_check(ErtsMsegAllctr_t *ma) {
 /* erts_mseg_cache_check
  * - This is a callback that is scheduled as aux-work from
  *   schedulers and is called at some interval if we have a cache
- *   on this mseg-allocator and memkind.
+ *   on this mseg-allocator.
  * - Purpose: Empty cache slowly so we don't collect mapped areas
  *   and bloat memory.
  */
@@ -719,42 +673,32 @@ void erts_mseg_cache_check(void) {
 }
 
 
-/* *_mseg_clear_*_cache
+/* mseg_clear_cache
  * Remove cached segments from the allocator completely
  */
 
-static void mseg_clear_memkind_cache(MemKind *mk) {
+
+static void mseg_clear_cache(ErtsMsegAllctr_t *ma) {
     int i;
+    ERTS_MSEG_LOCK(ma);
+    ERTS_DBG_MA_CHK_THR_ACCESS(ma);
 
     /* drop pow2 caches */
     for (i = 0; i < CACHE_AREAS; i++) {
-	if (erts_circleq_is_empty(&(mk->cache_powered_node[i])))
+	if (erts_circleq_is_empty(&(ma->cache_powered_node[i])))
 	    continue;
 
-	mseg_drop_memkind_cache_size(mk, ERTS_MSEG_FLG_2POW, &(mk->cache_powered_node[i]));
-	ASSERT(erts_circleq_is_empty(&(mk->cache_powered_node[i])));
+	mseg_drop_cache_size(ma, ERTS_MSEG_FLG_2POW, &(ma->cache_powered_node[i]));
+	ASSERT(erts_circleq_is_empty(&(ma->cache_powered_node[i])));
     }
     /* drop varied caches */
-    if (!erts_circleq_is_empty(&(mk->cache_unpowered_node)))
-	mseg_drop_memkind_cache_size(mk, ERTS_MSEG_FLG_NONE, &(mk->cache_unpowered_node));
-
-    ASSERT(erts_circleq_is_empty(&(mk->cache_unpowered_node)));
-    ASSERT(mk->cache_size == 0);
-}
+    if (!erts_circleq_is_empty(&(ma->cache_unpowered_node)))
+	mseg_drop_cache_size(ma, ERTS_MSEG_FLG_NONE, &(ma->cache_unpowered_node));
 
-static void mseg_clear_cache(ErtsMsegAllctr_t *ma) {
-    MemKind* mk;
-
-    ERTS_MSEG_LOCK(ma);
-    ERTS_DBG_MA_CHK_THR_ACCESS(ma);
-
-
-    for (mk = ma->mk_list; mk; mk = mk->next) {
-	mseg_clear_memkind_cache(mk);
-    }
+    ASSERT(erts_circleq_is_empty(&(ma->cache_unpowered_node)));
+    ASSERT(ma->cache_size == 0);
 
     INC_CC(ma, clear_cache);
-
     ERTS_MSEG_UNLOCK(ma);
 }
 
@@ -763,25 +707,12 @@ void erts_mseg_clear_cache(void) {
     mseg_clear_cache(ERTS_MSEG_ALLCTR_IX(0));
 }
 
-
-
-static ERTS_INLINE MemKind* memkind(ErtsMsegAllctr_t *ma,
-				    const ErtsMsegOpt_t *opt)
-{
-#if HALFWORD_HEAP
-    return opt->low_mem ? &ma->low_mem : &ma->hi_mem;
-#else
-    return &ma->the_mem;
-#endif
-}
-
 static void *
 mseg_alloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, UWord *size_p,
 	   Uint flags, const ErtsMsegOpt_t *opt)
 {
     UWord size;
     void *seg;
-    MemKind* mk = memkind(ma, opt);
 
     INC_CC(ma, alloc);
 
@@ -795,10 +726,10 @@ mseg_alloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, UWord *size_p,
 	}
     }
 
-    if (opt->cache && mk->cache_size > 0 && (seg = cache_get_segment(mk, &size, flags)) != NULL)
+    if (opt->cache && ma->cache_size > 0 && (seg = cache_get_segment(ma, &size, flags)) != NULL)
 	goto done;
 
-    seg = mseg_create(ma, flags, mk, &size);
+    seg = mseg_create(ma, flags, &size);
 
     if (!seg)
 	*size_p = 0;
@@ -808,7 +739,7 @@ done:
 	if (erts_mtrace_enabled)
 	    erts_mtrace_crr_alloc(seg, atype, ERTS_MTRACE_SEGMENT_ID, size);
 
-	ERTS_MSEG_ALLOC_STAT(mk,size);
+	ERTS_MSEG_ALLOC_STAT(ma,size);
     }
 
     return seg;
@@ -819,11 +750,9 @@ static void
 mseg_dealloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg, UWord size,
 	     Uint flags, const ErtsMsegOpt_t *opt)
 {
-    MemKind* mk = memkind(ma, opt);
-
-    ERTS_MSEG_DEALLOC_STAT(mk,size);
+    ERTS_MSEG_DEALLOC_STAT(ma,size);
 
-    if (opt->cache && cache_bless_segment(mk, seg, size, flags)) {
+    if (opt->cache && cache_bless_segment(ma, seg, size, flags)) {
 	schedule_cache_check(ma);
 	goto done;
     }
@@ -831,7 +760,7 @@ mseg_dealloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg, UWord size,
     if (erts_mtrace_enabled)
 	erts_mtrace_crr_free(atype, SEGTYPE, seg);
 
-    mseg_destroy(ma, flags, mk, seg, size);
+    mseg_destroy(ma, flags, seg, size);
 
 done:
 
@@ -842,7 +771,6 @@ static void *
 mseg_realloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg,
 	     UWord old_size, UWord *new_size_p, Uint flags, const ErtsMsegOpt_t *opt)
 {
-    MemKind* mk;
     void *new_seg;
     UWord new_size;
 
@@ -861,7 +789,6 @@ mseg_realloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg,
 	return NULL;
     }
 
-    mk = memkind(ma, opt);
     new_seg = seg;
 
     if (!MSEG_FLG_IS_2POW(flags))
@@ -876,7 +803,7 @@ mseg_realloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg,
 
     if (new_size > old_size) {
 	if (opt->preserv) {
-	    new_seg = mseg_recreate(ma, flags, mk, (void *) seg, old_size, &new_size);
+	    new_seg = mseg_recreate(ma, flags, (void *) seg, old_size, &new_size);
 	    if (!new_seg)
 		new_size = old_size;
 	}
@@ -896,7 +823,7 @@ mseg_realloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg,
 	    new_size = old_size;
 	}
 	else {
-	    new_seg = mseg_recreate(ma, flags, mk, (void *) seg, old_size, &new_size);
+	    new_seg = mseg_recreate(ma, flags, (void *) seg, old_size, &new_size);
 	    if (!new_seg)
 		new_size = old_size;
 	}
@@ -910,7 +837,7 @@ mseg_realloc(ErtsMsegAllctr_t *ma, ErtsAlcType_t atype, void *seg,
     ASSERT(!MSEG_FLG_IS_2POW(flags) || IS_2POW(new_size));
     *new_size_p = new_size;
 
-    ERTS_MSEG_REALLOC_STAT(mk, old_size, new_size);
+    ERTS_MSEG_REALLOC_STAT(ma, old_size, new_size);
 
     return new_seg;
 }
@@ -1070,7 +997,8 @@ info_options(ErtsMsegAllctr_t *ma,
 {
     Eterm res;
 
-    res = erts_mmap_info_options(prefix, print_to_p, print_to_arg, hpp, szp);
+    res = erts_mmap_info_options(&erts_dflt_mmapper,
+                                 prefix, print_to_p, print_to_arg, hpp, szp);
 
     if (print_to_p) {
 	int to = *print_to_p;
@@ -1180,63 +1108,63 @@ info_calls(ErtsMsegAllctr_t *ma, int *print_to_p, void *print_to_arg, Uint **hpp
 }
 
 static Eterm
-info_status(ErtsMsegAllctr_t *ma, MemKind* mk, int *print_to_p, void *print_to_arg,
+info_status(ErtsMsegAllctr_t *ma, int *print_to_p, void *print_to_arg,
 	    int begin_new_max_period, Uint **hpp, Uint *szp)
 {
     Eterm res = THE_NON_VALUE;
     
-    if (mk->segments.max_ever.no < mk->segments.max.no)
-	mk->segments.max_ever.no = mk->segments.max.no;
-    if (mk->segments.max_ever.sz < mk->segments.max.sz)
-	mk->segments.max_ever.sz = mk->segments.max.sz;
+    if (ma->segments.max_ever.no < ma->segments.max.no)
+	ma->segments.max_ever.no = ma->segments.max.no;
+    if (ma->segments.max_ever.sz < ma->segments.max.sz)
+	ma->segments.max_ever.sz = ma->segments.max.sz;
 
     if (print_to_p) {
 	int to = *print_to_p;
 	void *arg = print_to_arg;
 
-	erts_print(to, arg, "cached_segments: %beu\n", mk->cache_size);
-	erts_print(to, arg, "cache_hits: %beu\n", mk->cache_hits);
+	erts_print(to, arg, "cached_segments: %beu\n", ma->cache_size);
+	erts_print(to, arg, "cache_hits: %beu\n", ma->cache_hits);
 	erts_print(to, arg, "segments: %beu %beu %beu\n",
-		   mk->segments.current.no, mk->segments.max.no, mk->segments.max_ever.no);
+		   ma->segments.current.no, ma->segments.max.no, ma->segments.max_ever.no);
 	erts_print(to, arg, "segments_size: %beu %beu %beu\n",
-		   mk->segments.current.sz, mk->segments.max.sz, mk->segments.max_ever.sz);
+		   ma->segments.current.sz, ma->segments.max.sz, ma->segments.max_ever.sz);
 	erts_print(to, arg, "segments_watermark: %beu\n",
-		   mk->segments.current.watermark);
+		   ma->segments.current.watermark);
     }
 
     if (hpp || szp) {
 	res = NIL;
 	add_2tup(hpp, szp, &res,
 		 am.segments_watermark,
-		 bld_unstable_uint(hpp, szp, mk->segments.current.watermark));
+		 bld_unstable_uint(hpp, szp, ma->segments.current.watermark));
 	add_4tup(hpp, szp, &res,
 		 am.segments_size,
-		 bld_unstable_uint(hpp, szp, mk->segments.current.sz),
-		 bld_unstable_uint(hpp, szp, mk->segments.max.sz),
-		 bld_unstable_uint(hpp, szp, mk->segments.max_ever.sz));
+		 bld_unstable_uint(hpp, szp, ma->segments.current.sz),
+		 bld_unstable_uint(hpp, szp, ma->segments.max.sz),
+		 bld_unstable_uint(hpp, szp, ma->segments.max_ever.sz));
 	add_4tup(hpp, szp, &res,
 		 am.segments,
-		 bld_unstable_uint(hpp, szp, mk->segments.current.no),
-		 bld_unstable_uint(hpp, szp, mk->segments.max.no),
-		 bld_unstable_uint(hpp, szp, mk->segments.max_ever.no));
+		 bld_unstable_uint(hpp, szp, ma->segments.current.no),
+		 bld_unstable_uint(hpp, szp, ma->segments.max.no),
+		 bld_unstable_uint(hpp, szp, ma->segments.max_ever.no));
 	add_2tup(hpp, szp, &res,
 		 am.cache_hits,
-		 bld_unstable_uint(hpp, szp, mk->cache_hits));
+		 bld_unstable_uint(hpp, szp, ma->cache_hits));
 	add_2tup(hpp, szp, &res,
 		 am.cached_segments,
-		 bld_unstable_uint(hpp, szp, mk->cache_size));
+		 bld_unstable_uint(hpp, szp, ma->cache_size));
 
     }
 
     if (begin_new_max_period) {
-	mk->segments.max.no = mk->segments.current.no;
-	mk->segments.max.sz = mk->segments.current.sz;
+	ma->segments.max.no = ma->segments.current.no;
+	ma->segments.max.sz = ma->segments.current.sz;
     }
 
     return res;
 }
 
-static Eterm info_memkind(ErtsMsegAllctr_t *ma, MemKind* mk, int *print_to_p, void *print_to_arg,
+static Eterm info_memkind(ErtsMsegAllctr_t *ma, int *print_to_p, void *print_to_arg,
 			  int begin_max_per, Uint **hpp, Uint *szp)
 {
     Eterm res = THE_NON_VALUE;
@@ -1244,15 +1172,15 @@ static Eterm info_memkind(ErtsMsegAllctr_t *ma, MemKind* mk, int *print_to_p, vo
     Eterm values[3];
 
     if (print_to_p) {
-	erts_print(*print_to_p, print_to_arg, "memory kind: %s\n", mk->name);
+	erts_print(*print_to_p, print_to_arg, "memory kind: %s\n", "all memory");
     }
     if (hpp || szp) {
 	atoms[0] = am.name;
 	atoms[1] = am.status;
 	atoms[2] = am.calls;
-	values[0] = erts_bld_string(hpp, szp, mk->name);
+	values[0] = erts_bld_string(hpp, szp, "all memory");
     }
-    values[1] = info_status(ma, mk, print_to_p, print_to_arg, begin_max_per, hpp, szp);
+    values[1] = info_status(ma, print_to_p, print_to_arg, begin_max_per, hpp, szp);
     values[2] = info_calls(ma, print_to_p, print_to_arg, hpp, szp);
 
     if (hpp || szp)
@@ -1261,7 +1189,6 @@ static Eterm info_memkind(ErtsMsegAllctr_t *ma, MemKind* mk, int *print_to_p, vo
     return res;
 }
 
-
 static Eterm
 info_version(ErtsMsegAllctr_t *ma, int *print_to_p, void *print_to_arg, Uint **hpp, Uint *szp)
 {
@@ -1326,12 +1253,7 @@ erts_mseg_info(int ix,
     ERTS_MSEG_LOCK(ma);
     ERTS_DBG_MA_CHK_THR_ACCESS(ma);
 
-#if HALFWORD_HEAP
-    values[n++] = info_memkind(ma, &ma->low_mem, print_to_p, print_to_arg, begin_max_per, hpp, szp);
-    values[n++] = info_memkind(ma, &ma->hi_mem, print_to_p, print_to_arg, begin_max_per, hpp, szp);
-#else
-    values[n++] = info_memkind(ma, &ma->the_mem, print_to_p, print_to_arg, begin_max_per, hpp, szp);
-#endif
+    values[n++] = info_memkind(ma, print_to_p, print_to_arg, begin_max_per, hpp, szp);
     if (hpp || szp)
 	res = bld_2tup_list(hpp, szp, n, atoms, values);
 
@@ -1408,13 +1330,10 @@ Uint
 erts_mseg_no(const ErtsMsegOpt_t *opt)
 {
     ErtsMsegAllctr_t *ma = ERTS_MSEG_ALLCTR_OPT(opt);
-    MemKind* mk;
-    Uint n = 0;
+    Uint n;
     ERTS_MSEG_LOCK(ma);
     ERTS_DBG_MA_CHK_THR_ACCESS(ma);
-    for (mk=ma->mk_list; mk; mk=mk->next) {
-	n += mk->segments.current.no;
-    }
+    n = ma->segments.current.no;
     ERTS_MSEG_UNLOCK(ma);
     return n;
 }
@@ -1426,16 +1345,16 @@ erts_mseg_unit_size(void)
 }
 
 
-static void mem_kind_init(ErtsMsegAllctr_t *ma, MemKind* mk, const char* name)
+static void mem_cache_init(ErtsMsegAllctr_t *ma)
 {
     int i;
 
     /* Clear all cache headers */
-    mseg_cache_clear_node(&(mk->cache_free));
-    mseg_cache_clear_node(&(mk->cache_unpowered_node));
+    mseg_cache_clear_node(&(ma->cache_free));
+    mseg_cache_clear_node(&(ma->cache_unpowered_node));
 
     for (i = 0; i < CACHE_AREAS; i++) {
-	mseg_cache_clear_node(&(mk->cache_powered_node[i]));
+	mseg_cache_clear_node(&(ma->cache_powered_node[i]));
     }
 
     /* Populate cache free list */
@@ -1443,25 +1362,20 @@ static void mem_kind_init(ErtsMsegAllctr_t *ma, MemKind* mk, const char* name)
     ASSERT(ma->max_cache_size <= MAX_CACHE_SIZE);
 
     for (i = 0; i < ma->max_cache_size; i++) {
-	mseg_cache_clear_node(&(mk->cache[i]));
-	erts_circleq_push_head(&(mk->cache_free), &(mk->cache[i]));
+	mseg_cache_clear_node(&(ma->cache[i]));
+	erts_circleq_push_head(&(ma->cache_free), &(ma->cache[i]));
     }
 
-    mk->cache_size = 0;
-    mk->cache_hits = 0;
-
-    mk->segments.current.watermark = 0;
-    mk->segments.current.no = 0;
-    mk->segments.current.sz = 0;
-    mk->segments.max.no = 0;
-    mk->segments.max.sz = 0;
-    mk->segments.max_ever.no = 0;
-    mk->segments.max_ever.sz = 0;
-
-    mk->ma = ma;
-    mk->name = name;
-    mk->next = ma->mk_list;
-    ma->mk_list = mk;
+    ma->cache_size = 0;
+    ma->cache_hits = 0;
+
+    ma->segments.current.watermark = 0;
+    ma->segments.current.no = 0;
+    ma->segments.current.sz = 0;
+    ma->segments.max.no = 0;
+    ma->segments.max.sz = 0;
+    ma->segments.max_ever.no = 0;
+    ma->segments.max_ever.sz = 0;
 }
 
 void
@@ -1488,19 +1402,13 @@ erts_mseg_init(ErtsMsegInit_t *init)
 
     erts_mtx_init(&init_atoms_mutex, "mseg_init_atoms");
 
-#if HALFWORD_HEAP
-    if (sizeof(void *) != 8)
-	erl_exit(-1,"Halfword emulator cannot be run in 32bit mode");
-
-    init->mmap.virtual_range.start = (char *) sbrk(0);
-    init->mmap.virtual_range.end = (char *) 0x100000000UL;
-    init->mmap.sco = 0;
+    erts_mmap_init(&erts_dflt_mmapper, &init->dflt_mmap);
+#if defined(ARCH_64) && defined(ERTS_HAVE_OS_PHYSICAL_MEMORY_RESERVATION)
+    erts_mmap_init(&erts_literal_mmapper, &init->literal_mmap);
 #endif
 
-    erts_mmap_init(&init->mmap);
-
     if (!IS_2POW(GET_PAGE_SIZE))
-	erl_exit(ERTS_ABORT_EXIT, "erts_mseg: Unexpected page_size %beu\n", GET_PAGE_SIZE);
+	erts_exit(ERTS_ABORT_EXIT, "erts_mseg: Unexpected page_size %beu\n", GET_PAGE_SIZE);
 
     ASSERT((MSEG_ALIGNED_SIZE % GET_PAGE_SIZE) == 0);
 
@@ -1529,14 +1437,7 @@ erts_mseg_init(ErtsMsegInit_t *init)
 	if (ma->max_cache_size > MAX_CACHE_SIZE)
 	    ma->max_cache_size = MAX_CACHE_SIZE;
 
-	ma->mk_list = NULL;
-
-#if HALFWORD_HEAP
-	mem_kind_init(ma, &ma->low_mem, "low memory");
-	mem_kind_init(ma, &ma->hi_mem, "high memory");
-#else
-	mem_kind_init(ma, &ma->the_mem, "all memory");
-#endif
+	mem_cache_init(ma);
 
 	sys_memzero((void *) &ma->calls, sizeof(ErtsMsegCalls));
     }
@@ -1545,13 +1446,8 @@ erts_mseg_init(ErtsMsegInit_t *init)
 
 static ERTS_INLINE Uint tot_cache_size(ErtsMsegAllctr_t *ma)
 {
-    MemKind* mk;
-    Uint sz = 0;
     ERTS_DBG_MA_CHK_THR_ACCESS(ma);
-    for (mk=ma->mk_list; mk; mk=mk->next) {
-	sz += mk->cache_size;
-    }
-    return sz;
+    return ma->cache_size;
 }
 
 /*
diff --git a/erts/emulator/sys/common/erl_mseg.h b/erts/emulator/sys/common/erl_mseg.h
index ba04e919fc..2acd8f8505 100644
--- a/erts/emulator/sys/common/erl_mseg.h
+++ b/erts/emulator/sys/common/erl_mseg.h
@@ -42,16 +42,6 @@
 
 #if ERTS_HAVE_MSEG_SUPER_ALIGNED
 #  define MSEG_ALIGN_BITS ERTS_MMAP_SUPERALIGNED_BITS
-#else
-/* If we don't use super aligned multiblock carriers
- * we will mmap with page size alignment (and thus use corresponding
- * align bits).
- *
- * Current implementation needs this to be a constant and
- * only uses this for user dev testing so setting page size
- * to 4096 (12 bits) is fine.
- */
-#  define MSEG_ALIGN_BITS       (12)
 #endif
 
 #if HAVE_ERTS_MSEG
@@ -69,7 +59,8 @@ typedef struct {
     Uint rmcbf;
     Uint mcs;
     Uint nos;
-    ErtsMMapInit mmap;
+    ErtsMMapInit dflt_mmap;
+    ErtsMMapInit literal_mmap;
 } ErtsMsegInit_t;
 
 #define ERTS_MSEG_INIT_DEFAULT_INITIALIZER				\
@@ -78,7 +69,8 @@ typedef struct {
     20,			/* rmcbf: Relative max cache bad fit	*/	\
     10,			/* mcs:   Max cache size		*/	\
     1000,		/* cci:   Cache check interval		*/	\
-    ERTS_MMAP_INIT_DEFAULT_INITER					\
+    ERTS_MMAP_INIT_DEFAULT_INITER,					\
+    ERTS_MMAP_INIT_LITERAL_INITER                                       \
 }
 
 typedef struct {
@@ -87,9 +79,6 @@ typedef struct {
     UWord abs_shrink_th;
     UWord rel_shrink_th;
     int sched_spec;
-#if HALFWORD_HEAP
-    int low_mem;
-#endif
 } ErtsMsegOpt_t;
 
 extern const ErtsMsegOpt_t erts_mseg_default_opt;
diff --git a/erts/emulator/sys/common/erl_os_monotonic_time_extender.c b/erts/emulator/sys/common/erl_os_monotonic_time_extender.c
index b79485241f..367b22d989 100644
--- a/erts/emulator/sys/common/erl_os_monotonic_time_extender.c
+++ b/erts/emulator/sys/common/erl_os_monotonic_time_extender.c
@@ -44,7 +44,7 @@ static void *os_monotonic_time_extender(void *vstatep)
 	erts_milli_sleep(sleep_time);
     }
 
-    erl_exit(ERTS_ABORT_EXIT, "os_monotonic_time_extender thread terminating");
+    erts_exit(ERTS_ABORT_EXIT, "os_monotonic_time_extender thread terminating");
     return NULL;
 }
 
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 21fa214364..36ee94111c 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -74,6 +74,7 @@
 #include "erl_thr_progress.h"
 #include "erl_driver.h"
 #include "erl_alloc.h"
+#include "erl_msacc.h"
 
 #if !defined(ERTS_POLL_USE_EPOLL) \
     && !defined(ERTS_POLL_USE_DEVPOLL)  \
@@ -2238,6 +2239,7 @@ static ERTS_INLINE int
 check_fd_events(ErtsPollSet ps, ErtsMonotonicTime timeout_time, int max_res)
 {
     int res;
+    ERTS_MSACC_PUSH_STATE_M();
     if (erts_smp_atomic_read_nob(&ps->no_of_user_fds) == 0
 	&& timeout_time == ERTS_POLL_NO_TIMEOUT) {
 	/* Nothing to poll and zero timeout; done... */
@@ -2259,6 +2261,7 @@ check_fd_events(ErtsPollSet ps, ErtsMonotonicTime timeout_time, int max_res)
 #ifdef ERTS_SMP
                     erts_thr_progress_prepare_wait(NULL);
 #endif
+                    ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_SLEEP);
                     timerfd_set(ps, &its);
                     res = epoll_wait(ps->kp_fd, ps->res_events, max_res, -1);
                     res = timerfd_clear(ps, res, max_res);
@@ -2268,10 +2271,12 @@ check_fd_events(ErtsPollSet ps, ErtsMonotonicTime timeout_time, int max_res)
             }
 #else /* !ERTS_POLL_USE_TIMERFD */
 	    timeout = (int) get_timeout(ps, 1000, timeout_time);
+            if (timeout) {
 #ifdef ERTS_SMP
-	    if (timeout)
 		erts_thr_progress_prepare_wait(NULL);
 #endif
+                ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_SLEEP);
+            }
 	    res = epoll_wait(ps->kp_fd, ps->res_events, max_res, timeout);
 #endif /* !ERTS_POLL_USE_TIMERFD */
 #elif ERTS_POLL_USE_KQUEUE	/* --- kqueue ------------------------------ */
@@ -2279,10 +2284,12 @@ check_fd_events(ErtsPollSet ps, ErtsMonotonicTime timeout_time, int max_res)
 	    if (max_res > ps->res_events_len)
 		grow_res_events(ps, max_res);
 	    timeout = get_timeout_timespec(ps, &ts, timeout_time);
+            if (timeout) {
 #ifdef ERTS_SMP
-	    if (timeout)
 		erts_thr_progress_prepare_wait(NULL);
 #endif
+		ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_SLEEP);
+            }
 	    res = kevent(ps->kp_fd, NULL, 0, ps->res_events, max_res, &ts);
 #endif				/* ----------------------------------------- */
 	}
@@ -2306,26 +2313,33 @@ check_fd_events(ErtsPollSet ps, ErtsMonotonicTime timeout_time, int max_res)
 	    if (poll_res.dp_nfds > ps->res_events_len)
 		grow_res_events(ps, poll_res.dp_nfds);
 	    poll_res.dp_fds = ps->res_events;
+	    if (timeout) {
 #ifdef ERTS_SMP
-	    if (timeout)
 		erts_thr_progress_prepare_wait(NULL);
 #endif
+                ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_SLEEP);
+            }
 	    poll_res.dp_timeout = timeout;
 	    res = ioctl(ps->kp_fd, DP_POLL, &poll_res);
 #elif ERTS_POLL_USE_POLL && defined(HAVE_PPOLL)	/* --- ppoll ---------------- */
             struct timespec ts;
 	    timeout = get_timeout_timespec(ps, &ts, timeout_time);
+            if (timeout) {
 #ifdef ERTS_SMP
-	    if (timeout)
 		erts_thr_progress_prepare_wait(NULL);
 #endif
+		ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_SLEEP);
+            }
             res = ppoll(ps->poll_fds, ps->no_poll_fds, &ts, NULL);
 #elif ERTS_POLL_USE_POLL        /* --- poll --------------------------------- */
 	    timeout = (int) get_timeout(ps, 1000, timeout_time);
+
+	    if (timeout) {
 #ifdef ERTS_SMP
-	    if (timeout)
 		erts_thr_progress_prepare_wait(NULL);
 #endif
+		ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_SLEEP);
+            }
 	    res = poll(ps->poll_fds, ps->no_poll_fds, timeout);
 #elif ERTS_POLL_USE_SELECT	/* --- select ------------------------------ */
 	    SysTimeval to;
@@ -2334,18 +2348,22 @@ check_fd_events(ErtsPollSet ps, ErtsMonotonicTime timeout_time, int max_res)
 	    ERTS_FD_COPY(&ps->input_fds, &ps->res_input_fds);
 	    ERTS_FD_COPY(&ps->output_fds, &ps->res_output_fds);
 
+	    if (timeout) {
 #ifdef ERTS_SMP
-	    if (timeout)
 		erts_thr_progress_prepare_wait(NULL);
 #endif
+		ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_SLEEP);
+	    }
 	    res = ERTS_SELECT(ps->max_fd + 1,
 			      &ps->res_input_fds,
 			      &ps->res_output_fds,
 			      NULL,
 			      &to);
 #ifdef ERTS_SMP
-	    if (timeout)
+	    if (timeout) {
 		erts_thr_progress_finalize_wait(NULL);
+		ERTS_MSACC_POP_STATE_M();
+	    }
 	    if (res < 0
 		&& errno == EBADF
 		&& ERTS_POLLSET_HAVE_UPDATE_REQUESTS(ps)) {
@@ -2380,10 +2398,12 @@ check_fd_events(ErtsPollSet ps, ErtsMonotonicTime timeout_time, int max_res)
 	    return res;
 #endif				/* ----------------------------------------- */
 	}
+	if (timeout) {
 #ifdef ERTS_SMP
-	if (timeout)
 	    erts_thr_progress_finalize_wait(NULL);
 #endif
+	    ERTS_MSACC_POP_STATE_M();
+	}
 	return res;
     }
 }
diff --git a/erts/emulator/sys/common/erl_poll.h b/erts/emulator/sys/common/erl_poll.h
index bd3a46ef0f..bc2c681876 100644
--- a/erts/emulator/sys/common/erl_poll.h
+++ b/erts/emulator/sys/common/erl_poll.h
@@ -93,7 +93,7 @@
 #  if defined(ERTS_USE_POLL)
 #    undef ERTS_POLL_USE_POLL
 #    define ERTS_POLL_USE_POLL 1
-#  elif !defined(__WIN32__) && !defined(__OSE__)
+#  elif !defined(__WIN32__)
 #    undef ERTS_POLL_USE_SELECT
 #    define ERTS_POLL_USE_SELECT 1
 #  endif
@@ -104,31 +104,13 @@
 typedef Uint32 ErtsPollEvents;
 #undef ERTS_POLL_EV_E2N
 
-#if defined(__WIN32__) || defined(__OSE__)	/* --- win32 or ose -------- */
+#if defined(__WIN32__)	/* --- win32  --------------------------------------- */
 
 #define ERTS_POLL_EV_IN   1
 #define ERTS_POLL_EV_OUT  2
 #define ERTS_POLL_EV_ERR  4
 #define ERTS_POLL_EV_NVAL 8
 
-#ifdef __OSE__
-
-typedef struct ErtsPollOseMsgList_ {
-  struct ErtsPollOseMsgList_ *next;
-  union SIGNAL *data;
-} ErtsPollOseMsgList;
-
-struct erts_sys_fd_type {
-    SIGSELECT signo;
-    ErlDrvOseEventId id;
-    ErtsPollOseMsgList *msgs;
-    ErlDrvOseEventId (*resolve_signal)(union SIGNAL *sig);
-    ethr_mutex mtx;
-    void *extra;
-};
-
-#endif
-
 #elif ERTS_POLL_USE_EPOLL	/* --- epoll ------------------------------- */
 
 #include <sys/epoll.h>
diff --git a/erts/emulator/sys/ose/beam.lmconf b/erts/emulator/sys/ose/beam.lmconf
deleted file mode 100644
index 4ad46b01d9..0000000000
--- a/erts/emulator/sys/ose/beam.lmconf
+++ /dev/null
@@ -1,26 +0,0 @@
-OSE_LM_STACK_SIZES=256,512,1024,2048,4096,8192,16384,65536
-OSE_LM_SIGNAL_SIZES=31,63,127,255,1023,4095,16383,65535
-OSE_LM_POOL_SIZE=0x200000
-OSE_LM_MAIN_NAME=main
-OSE_LM_MAIN_STACK_SIZE=0xF000
-OSE_LM_MAIN_PRIORITY=20
-## Has to be of a type that allows MAM
-OSE_LM_PROGRAM_TYPE=APP_RAM
-OSE_LM_DATA_INIT=YES
-OSE_LM_BSS_INIT=YES
-OSE_LM_EXEC_MODEL=SHARED
-HEAP_MAX_SIZE=1000000000
-HEAP_SMALL_BUF_INIT_SIZE=20971520
-HEAP_LARGE_BUF_THRESHOLD=16000000
-HEAP_LOCK_TYPE=2
-
-ERTS_DEFAULT_PRIO=24
-ERTS_SCHEDULER_PRIO=24
-ERTS_ASYNC_PRIO=22
-ERTS_AUX_PRIO=24
-ERTS_SYS_MSG_DISPATCHER_PRIO=21
-
-# Setting the environment variable EFS_RESOLVE_TMO on the block to 0.
-# This will eliminiate delays when trying to open files on not mounted
-# volumes.
-EFS_RESOLVE_TMO=0
diff --git a/erts/emulator/sys/ose/driver_int.h b/erts/emulator/sys/ose/driver_int.h
deleted file mode 100644
index 4a5b7171d1..0000000000
--- a/erts/emulator/sys/ose/driver_int.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 1997-2009. 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%
- */
-/*
- * System dependant driver declarations
- */
-
-#ifndef __DRIVER_INT_H__
-#define __DRIVER_INT_H__
-
-#ifdef HAVE_SYS_UIO_H
-#include <sys/types.h>
-#include <sys/uio.h>
-
-typedef struct iovec SysIOVec;
-
-#else
-
-typedef struct {
-    char* iov_base;
-    int   iov_len;
-} SysIOVec;
-
-#endif
-
-#endif
diff --git a/erts/emulator/sys/ose/erl_main.c b/erts/emulator/sys/ose/erl_main.c
deleted file mode 100644
index 877e85f43a..0000000000
--- a/erts/emulator/sys/ose/erl_main.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2000-2009. 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%
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#include <stdlib.h>
-
-#include "sys.h"
-#include "erl_vm.h"
-#include "global.h"
-#include "ose.h"
-
-int
-main(int argc, char **argv) {
-
-  (void)stdin;(void)stdout;(void)stderr;
-
-  /* When starting using pm_create -c ARGV="-- -root ..", argv[0] is the first
-     part of ARGV and not the name of the executable. So we shuffle some
-     pointers here to make erl_start happy. */
-  if (argv[0][0] == '-') {
-    int i;
-    char **tmp_argv = malloc(sizeof(char*)*(argc+1));
-    for (i = 0; i < argc; i++)
-      tmp_argv[i+1] = argv[i];
-    tmp_argv[0] = "beam";
-    erl_start(argc+1,tmp_argv);
-    free(tmp_argv);
-  } else {
-   erl_start(argc,argv);
-  }
-
-   stop(current_process());
-
-   return 0;
-}
diff --git a/erts/emulator/sys/ose/erl_ose_sys.h b/erts/emulator/sys/ose/erl_ose_sys.h
deleted file mode 100644
index d0cd3180bf..0000000000
--- a/erts/emulator/sys/ose/erl_ose_sys.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 1997-2011. 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%
- *
- * This file handles differences between different Unix systems.
- * This should be the only place with conditional compilation
- * depending on the type of OS.
- */
-
-#ifndef _ERL_OSE_SYS_H
-#define _ERL_OSE_SYS_H
-
-#include "ose.h"
-#undef NIL
-#include "ramlog.h"
-#include "erts.sig"
-
-#include "fcntl.h"
-#include "math.h"
-#include "stdio.h"
-#include "stdlib.h"
-#include "string.h"
-#include "sys/param.h"
-#include "sys/time.h"
-#include "time.h"
-#include "dirent.h"
-#include "ethread.h"
-
-/* FIXME: configuration options */
-#define ERTS_SCHED_MIN_SPIN 1
-#define ERTS_SCHED_ONLY_POLL_SCHED_1 1
-#define ERTS_SCHED_FAIR 1
-#define NO_SYSCONF 1
-#define OPEN_MAX FOPEN_MAX
-
-#define MAP_ANON MAP_ANONYMOUS
-
-#ifndef HAVE_MMAP
-#   define HAVE_MMAP 0
-#endif
-
-#if HAVE_MMAP
-#   include "sys/mman.h"
-#endif
-
-/*
- * Min number of async threads
- */
-#define ERTS_MIN_NO_OF_ASYNC_THREADS 1
-
-/*
- * Our own type of "FD's"
- */
-#define ERTS_SYS_FD_TYPE struct erts_sys_fd_type*
-#define NO_FSTAT_ON_SYS_FD_TYPE 1 /* They are signals, not files */
-
-#include "sys/stat.h"
-
-/* FIXME mremap is not defined in OSE - POSIX issue */
-extern void *mremap (void *__addr, size_t __old_len, size_t __new_len,
-                        int __flags, ...);
-
-/* FIXME: mremap constants */
-#define MREMAP_MAYMOVE  1
-#define MREMAP_FIXED    2
-
-typedef void *GETENV_STATE;
-
-/*
-** For the erl_timer_sup module.
-*/
-#define HAVE_GETHRTIME
-
-typedef long long SysHrTime;
-extern SysHrTime sys_gethrtime(void);
-
-void sys_init_hrtime(void);
-
-typedef time_t erts_time_t;
-
-typedef struct timeval SysTimeval;
-
-#define sys_gettimeofday(Arg) ((void) gettimeofday((Arg), NULL))
-
-typedef struct {
-    clock_t tms_utime;
-    clock_t tms_stime;
-    clock_t tms_cutime;
-    clock_t tms_cstime;
-} SysTimes;
-
-extern int erts_ticks_per_sec;
-
-#define SYS_CLK_TCK (erts_ticks_per_sec)
-
-extern clock_t sys_times(SysTimes *buffer);
-
-/* No use in having other resolutions than 1 Ms. */
-#define SYS_CLOCK_RESOLUTION 1
-
-#define erts_isfinite finite
-
-#ifdef NO_FPE_SIGNALS
-
-#define erts_get_current_fp_exception() NULL
-#ifdef ERTS_SMP
-#define erts_thread_init_fp_exception() do{}while(0)
-#endif
-#  define __ERTS_FP_CHECK_INIT(fpexnp) do {} while (0)
-#  define __ERTS_FP_ERROR(fpexnp, f, Action) if (!finite(f)) { Action; } else {}
-#  define __ERTS_FP_ERROR_THOROUGH(fpexnp, f, Action) __ERTS_FP_ERROR(fpexnp, f, Action)
-#  define __ERTS_SAVE_FP_EXCEPTION(fpexnp)
-#  define __ERTS_RESTORE_FP_EXCEPTION(fpexnp)
-
-#define erts_sys_block_fpe() 0
-#define erts_sys_unblock_fpe(x) do{}while(0)
-
-#else /* !NO_FPE_SIGNALS */
-
-extern volatile unsigned long *erts_get_current_fp_exception(void);
-#ifdef ERTS_SMP
-extern void erts_thread_init_fp_exception(void);
-#endif
-#  if (defined(__i386__) || defined(__x86_64__)) && defined(__GNUC__)
-#    define erts_fwait(fpexnp,f) \
-	__asm__ __volatile__("fwait" : "=m"(*(fpexnp)) : "m"(f))
-#  elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GNUC__)
-#    define erts_fwait(fpexnp,f) \
-	__asm__ __volatile__("" : "=m"(*(fpexnp)) : "fm"(f))
-#  elif defined(__sparc__) && defined(__linux__) && defined(__GNUC__)
-#    define erts_fwait(fpexnp,f) \
-	__asm__ __volatile__("" : "=m"(*(fpexnp)) : "em"(f))
-#  else
-#    define erts_fwait(fpexnp,f) \
-	__asm__ __volatile__("" : "=m"(*(fpexnp)) : "g"(f))
-#  endif
-#  if (defined(__i386__) || defined(__x86_64__)) && defined(__GNUC__)
-     extern void erts_restore_fpu(void);
-#  else
-#    define erts_restore_fpu() /*empty*/
-#  endif
-#  if (!defined(__GNUC__) || \
-       (__GNUC__ < 2) || \
-       (__GNUC__ == 2 && __GNUC_MINOR < 96)) && \
-      !defined(__builtin_expect)
-#    define __builtin_expect(x, expected_value) (x)
-#  endif
-static __inline__ int erts_check_fpe(volatile unsigned long *fp_exception, double f)
-{
-    erts_fwait(fp_exception, f);
-    if (__builtin_expect(*fp_exception == 0, 1))
-       return 0;
-    *fp_exception = 0;
-    erts_restore_fpu();
-    return 1;
-}
-#  undef erts_fwait
-#  undef erts_restore_fpu
-extern void erts_fp_check_init_error(volatile unsigned long *fp_exception);
-static __inline__ void __ERTS_FP_CHECK_INIT(volatile unsigned long *fp_exception)
-{
-    if (__builtin_expect(*fp_exception == 0, 1))
-	return;
-    erts_fp_check_init_error(fp_exception);
-}
-#  define __ERTS_FP_ERROR(fpexnp, f, Action) do { if (erts_check_fpe((fpexnp),(f))) { Action; } } while (0)
-#  define __ERTS_SAVE_FP_EXCEPTION(fpexnp) unsigned long old_erl_fp_exception = *(fpexnp)
-#  define __ERTS_RESTORE_FP_EXCEPTION(fpexnp) \
-              do { *(fpexnp) = old_erl_fp_exception; } while (0)
-   /* This is for library calls where we don't trust the external
-      code to always throw floating-point exceptions on errors. */
-static __inline__ int erts_check_fpe_thorough(volatile unsigned long *fp_exception, double f)
-{
-    return erts_check_fpe(fp_exception, f) || !finite(f);
-}
-#  define __ERTS_FP_ERROR_THOROUGH(fpexnp, f, Action) \
-  do { if (erts_check_fpe_thorough((fpexnp),(f))) { Action; } } while (0)
-
-int erts_sys_block_fpe(void);
-void erts_sys_unblock_fpe(int);
-
-#endif /* !NO_FPE_SIGNALS */
-
-#define ERTS_FP_CHECK_INIT(p)		__ERTS_FP_CHECK_INIT(&(p)->fp_exception)
-#define ERTS_FP_ERROR(p, f, A)		__ERTS_FP_ERROR(&(p)->fp_exception, f, A)
-#define ERTS_FP_ERROR_THOROUGH(p, f, A)	__ERTS_FP_ERROR_THOROUGH(&(p)->fp_exception, f, A)
-
-/* FIXME: force HAVE_GETPAGESIZE and stub getpagesize */
-#ifndef HAVE_GETPAGESIZE
-#define HAVE_GETPAGESIZE 1
-#endif
-
-extern int getpagesize(void);
-
-#ifndef HZ
-#define HZ 60
-#endif
-
-/* OSE5 doesn't provide limits.h so a number of macros should be
- * added manually */
-
-#ifndef CHAR_BIT
-#define CHAR_BIT 8
-#endif
-
-/* Minimum and maximum values a `signed int' can hold.  */
-#ifndef INT_MAX
-#define INT_MAX	2147483647
-#endif
-
-#ifndef INT_MIN
-#define INT_MIN	(-INT_MAX - 1)
-#endif
-
-#ifndef UINT_MAX
-#  define UINT_MAX   4294967295U
-#endif
-
-/*
-static void erts_ose_sys_send(union SIGNAL **signal,PROCESS dst,
-			      char* file,int line) {
-  SIGSELECT **ziggy = (SIGSELECT**)signal;
-  printf("%s:%d 0x%x Send signal 0x%x(0x%x) to 0x%x\r\n",
-	 file,line,current_process(),ziggy[0][0],*ziggy,dst);
-  send(signal,dst);
-}
-#define send(signal,dst) erts_ose_sys_send(signal,dst,__FILE__,__LINE__)
-
-static void erts_ose_sys_send_w_sender(union SIGNAL **signal,
-				       PROCESS sender,PROCESS dst,
-				       char* file,int line) {
-  SIGSELECT **ziggy = (SIGSELECT**)signal;
-  printf("%s:%d 0x%x Send signal 0x%x(0x%x) to 0x%x as 0x%x\r\n",
-	 file,line,current_process(),ziggy[0][0],*ziggy,dst,sender);
-  send_w_sender(signal,sender,dst);
-}
-#define send_w_sender(signal,sender,dst) \
-  erts_ose_sys_send_w_sender(signal,sender,dst,__FILE__,__LINE__)
-
-
-static union SIGNAL *erts_ose_sys_receive(SIGSELECT *sigsel,
-					  char *file,
-					  int line) {
-  SIGSELECT *sig;
-  int i;
-
-  printf("%s:%d 0x%x receive({%d,",file,line,current_process(),sigsel[0]);
-  for (i = 1; i < sigsel[0]; i++)
-    printf("0x%x, ",sigsel[i]);
-  if (sigsel[0] != 0)
-    printf("0x%x",sigsel[i]);
-  printf("})\n");
-  sig = (SIGSELECT*)receive(sigsel);
-  printf("%s:%d 0x%x got 0x%x from 0x%x\n",file,line,current_process(),
-	 *sig,sender((union SIGNAL**)(&sig)));
-  return (union SIGNAL*)sig;
-}
-#define receive(SIGSEL) erts_ose_sys_receive(SIGSEL,__FILE__,__LINE__)
-
-static union SIGNAL *erts_ose_sys_receive_w_tmo(OSTIME tmo,SIGSELECT *sigsel,
-						char *file,int line) {
-  SIGSELECT *sig;
-  int i;
-  if (tmo == 0) {
-    sig = (SIGSELECT*)receive_w_tmo(tmo,sigsel);
-    if (sig != NULL) {
-      printf("%s:%d 0x%x receive_w_tmo(0,{%d,",file,line,current_process(),
-	     sigsel[0]);
-      for (i = 1; i < sigsel[0]; i++)
-	printf("0x%x, ",sigsel[i]);
-      if (sigsel[0] != 0)
-	printf("0x%x",sigsel[i]);
-      printf("})\n");
-      printf("%s:%d 0x%x got 0x%x from 0x%x\n",file,line,current_process(),
-	     *sig,sender((union SIGNAL**)(&sig)));
-    }
-  } else {
-    printf("%s:%d 0x%x receive_w_tmo(%u,{%d,",file,line,current_process(),tmo,
-	   sigsel[0]);
-      for (i = 1; i < sigsel[0]; i++)
-	printf("0x%x, ",sigsel[i]);
-      if (sigsel[0] != 0)
-	printf("0x%x",sigsel[i]);
-      printf("})\n");
-      sig = (SIGSELECT*)receive_w_tmo(tmo,sigsel);
-      printf("%s:%d 0x%x got ",file,line,current_process());
-      if (sig == NULL)
-	printf("TIMEOUT\n");
-      else
-	printf("0x%x from 0x%x\n",*sig,sender((union SIGNAL**)(&sig)));
-  }
-
-  return (union SIGNAL*)sig;
-}
-
-#define receive_w_tmo(tmo,sigsel) erts_ose_sys_receive_w_tmo(tmo,sigsel, \
-							     __FILE__,__LINE__)
-
-static union SIGNAL *erts_ose_sys_receive_fsem(OSTIME tmo,SIGSELECT *sigsel,
-					       OSFSEMVAL fsem,
-					       char *file,int line) {
-  SIGSELECT *sig;
-  int i;
-  if (tmo == 0) {
-    sig = (SIGSELECT*)receive_fsem(tmo,sigsel,fsem);
-    if (sig != NULL && sig != OS_RCV_FSEM) {
-      printf("%s:%d 0x%x receive_fsem(0,{%d,",file,line,current_process(),
-	     sigsel[0]);
-      for (i = 1; i < sigsel[0]; i++)
-	printf("0x%x, ",sigsel[i]);
-      if (sigsel[0] != 0)
-	printf("0x%x",sigsel[i]);
-      printf("},%d)\n",fsem);
-      printf("%s:%d 0x%x got 0x%x from 0x%x\n",file,line,current_process(),
-	     *sig,sender((union SIGNAL**)(&sig)));
-    }
-  } else {
-    printf("%s:%d 0x%x receive_fsem(%u,{%d,",file,line,current_process(),tmo,
-	   sigsel[0]);
-      for (i = 1; i < sigsel[0]; i++)
-	printf("0x%x, ",sigsel[i]);
-      if (sigsel[0] != 0)
-	printf("0x%x",sigsel[i]);
-      printf("},%d)\n",fsem);
-      sig = (SIGSELECT*)receive_fsem(tmo,sigsel,fsem);
-      printf("%s:%d 0x%x got ",file,line,current_process());
-      if (sig == NULL)
-	printf("TIMEOUT\n");
-      else if (sig == OS_RCV_FSEM)
-	printf("FSEM\n");
-      else
-	printf("0x%x from 0x%x\n",*sig,sender((union SIGNAL**)(&sig)));
-  }
-
-  return (union SIGNAL*)sig;
-}
-
-#define receive_fsem(tmo,sigsel,fsem) \
-  erts_ose_sys_receive_fsem(tmo,sigsel,fsem,__FILE__,__LINE__)
-*/
-#endif  /* _ERL_OSE_SYS_H */
diff --git a/erts/emulator/sys/ose/erl_ose_sys_ddll.c b/erts/emulator/sys/ose/erl_ose_sys_ddll.c
deleted file mode 100644
index 5051f7fcc1..0000000000
--- a/erts/emulator/sys/ose/erl_ose_sys_ddll.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2006-2013. 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%
- */
-
-/*
- * Interface functions to the dynamic linker using dl* functions.
- * (No support in OSE, we use static linkage instead)
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "sys.h"
-#include "erl_vm.h"
-#include "global.h"
-
-
-void erl_sys_ddll_init(void) {
-}
-
-/*
- * Open a shared object
- */
-int erts_sys_ddll_open(const char *full_name, void **handle, ErtsSysDdllError* err)
-{
-   return ERL_DE_ERROR_NO_DDLL_FUNCTIONALITY;
-}
-
-int erts_sys_ddll_open_noext(char *dlname, void **handle, ErtsSysDdllError* err)
-{
-   return ERL_DE_ERROR_NO_DDLL_FUNCTIONALITY;
-}
-
-/*
- * Find a symbol in the shared object
- */
-int erts_sys_ddll_sym2(void *handle, const char *func_name, void **function,
-		       ErtsSysDdllError* err)
-{
-   return ERL_DE_ERROR_NO_DDLL_FUNCTIONALITY;
-}
-
-/* XXX:PaN These two will be changed with new driver interface! */
-
-/*
- * Load the driver init function, might appear under different names depending on object arch...
- */
-
-int erts_sys_ddll_load_driver_init(void *handle, void **function)
-{
-    void *fn;
-    int res;
-    if ((res = erts_sys_ddll_sym2(handle, "driver_init", &fn, NULL)) != ERL_DE_NO_ERROR) {
-	res = erts_sys_ddll_sym2(handle, "_driver_init", &fn, NULL);
-    }
-    if (res == ERL_DE_NO_ERROR) {
-	*function = fn;
-    }
-    return res;
-}
-
-int erts_sys_ddll_load_nif_init(void *handle, void **function, ErtsSysDdllError* err)
-{
-    void *fn;
-    int res;
-    if ((res = erts_sys_ddll_sym2(handle, "nif_init", &fn, err)) != ERL_DE_NO_ERROR) {
-	res = erts_sys_ddll_sym2(handle, "_nif_init", &fn, err);
-    }
-    if (res == ERL_DE_NO_ERROR) {
-	*function = fn;
-    }
-    return res;
-}
-
-/*
- * Call the driver_init function, whatever it's really called, simple on unix...
-*/
-void *erts_sys_ddll_call_init(void *function) {
-    void *(*initfn)(void) = function;
-    return (*initfn)();
-}
-void *erts_sys_ddll_call_nif_init(void *function) {
-    return erts_sys_ddll_call_init(function);
-}
-
-
-
-/*
- * Close a chared object
- */
-int erts_sys_ddll_close2(void *handle, ErtsSysDdllError* err)
-{
-   return ERL_DE_ERROR_NO_DDLL_FUNCTIONALITY;
-}
-
-
-/*
- * Return string that describes the (current) error
- */
-char *erts_sys_ddll_error(int code)
-{
-    return "Unspecified error";
-}
-
-void erts_sys_ddll_free_error(ErtsSysDdllError* err)
-{
-    if (err->str != NULL) {
-	erts_free(ERTS_ALC_T_DDLL_TMP_BUF, err->str);
-    }
-}
diff --git a/erts/emulator/sys/ose/erl_poll.c b/erts/emulator/sys/ose/erl_poll.c
deleted file mode 100644
index 5cee582a00..0000000000
--- a/erts/emulator/sys/ose/erl_poll.c
+++ /dev/null
@@ -1,818 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2006-2012. 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%
- */
-
-/*
- * Description:	Poll interface suitable for ERTS on OSE with or without
- *              SMP support.
- *
- *		The interface is currently implemented using:
- *                - receive + receive_fsem
- *
- * Author: 	Lukas Larsson
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "erl_thr_progress.h"
-#include "erl_driver.h"
-#include "erl_alloc.h"
-#include "erl_poll.h"
-
-#define NOFILE    4096
-
-/*
- * Some debug macros
- */
-
-/* #define HARDDEBUG
-#define HARDTRACE*/
-#ifdef HARDDEBUG
-#ifdef HARDTRACE
-#define HARDTRACEF(X, ...) { fprintf(stderr, X, __VA_ARGS__); fprintf(stderr,"\r\n"); }
-#else
-#define HARDTRACEF(...)
-#endif
-
-#else
-#define HARDTRACEF(X,...)
-#define HARDDEBUGF(...)
-#endif
-
-#if 0
-#define ERTS_POLL_DEBUG_PRINT
-#endif
-
-#if defined(DEBUG) && 0
-#define HARD_DEBUG
-#endif
-
-#  define SEL_ALLOC	erts_alloc
-#  define SEL_REALLOC	realloc_wrap
-#  define SEL_FREE	erts_free
-
-#ifdef ERTS_SMP
-
-#define ERTS_POLLSET_LOCK(PS) \
-  erts_smp_mtx_lock(&(PS)->mtx)
-#define ERTS_POLLSET_UNLOCK(PS) \
-  erts_smp_mtx_unlock(&(PS)->mtx)
-
-#else
-
-#define ERTS_POLLSET_LOCK(PS)
-#define ERTS_POLLSET_UNLOCK(PS)
-
-#endif
-
-/*
- * --- Data types ------------------------------------------------------------
- */
-
-union SIGNAL {
-    SIGSELECT sig_no;
-};
-
-typedef struct erts_sigsel_item_ ErtsSigSelItem;
-
-struct erts_sigsel_item_ {
-    ErtsSigSelItem *next;
-    ErtsSysFdType fd;
-    ErtsPollEvents events;
-};
-
-typedef struct erts_sigsel_info_ ErtsSigSelInfo;
-
-struct erts_sigsel_info_ {
-    ErtsSigSelInfo *next;
-    SIGSELECT signo;
-    ErlDrvOseEventId (*decode)(union SIGNAL* sig);
-    ErtsSigSelItem *fds;
-};
-
-struct ErtsPollSet_ {
-    SIGSELECT *sigs;
-    ErtsSigSelInfo *info;
-    Uint sig_count;
-    Uint item_count;
-    PROCESS interrupt;
-    erts_atomic32_t wakeup_state;
-    erts_atomic64_t timeout_time;
-#ifdef ERTS_SMP
-    erts_smp_mtx_t mtx;
-#endif
-};
-
-static int max_fds = -1;
-
-static ERTS_INLINE void
-init_timeout_time(ErtsPollSet ps)
-{
-    erts_atomic64_init_nob(&ps->timeout_time,
-			   (erts_aint64_t) ERTS_MONOTONIC_TIME_MAX);
-}
-
-static ERTS_INLINE void
-set_timeout_time(ErtsPollSet ps, ErtsMonotonicTime time)
-{
-    erts_atomic64_set_relb(&ps->timeout_time,
-			   (erts_aint64_t) time);
-}
-
-static ERTS_INLINE ErtsMonotonicTime
-get_timeout_time(ErtsPollSet ps)
-{
-    return (ErtsMonotonicTime) erts_atomic64_read_acqb(&ps->timeout_time);
-}
-
-#define ERTS_POLL_NOT_WOKEN		((erts_aint32_t) (1 << 0))
-#define ERTS_POLL_WOKEN_INTR		((erts_aint32_t) (1 << 1))
-#define ERTS_POLL_WOKEN_TIMEDOUT	((erts_aint32_t) (1 << 2))
-#define ERTS_POLL_WOKEN_IO_READY	((erts_aint32_t) (1 << 3))
-#define ERTS_POLL_SLEEPING	        ((erts_aint32_t) (1 << 4))
-
-/* signal list prototypes */
-static ErtsSigSelInfo *get_sigsel_info(ErtsPollSet ps, SIGSELECT signo);
-static ErtsSigSelItem *get_sigsel_item(ErtsPollSet ps, ErtsSysFdType fd);
-static ErtsSigSelInfo *add_sigsel_info(ErtsPollSet ps, ErtsSysFdType fd,
-				       ErlDrvOseEventId (*decode)(union SIGNAL* sig));
-static ErtsSigSelItem *add_sigsel_item(ErtsPollSet ps, ErtsSysFdType fd,
-				       ErlDrvOseEventId (*decode)(union SIGNAL* sig));
-static int del_sigsel_info(ErtsPollSet ps, ErtsSigSelInfo *info);
-static int del_sigsel_item(ErtsPollSet ps, ErtsSigSelItem *item);
-static int update_sigsel(ErtsPollSet ps);
-
-static ErtsSigSelInfo *
-get_sigsel_info(ErtsPollSet ps, SIGSELECT signo) {
-    ErtsSigSelInfo *curr = ps->info;
-    while (curr != NULL) {
-	if (curr->signo == signo)
-	    return curr;
-	curr = curr->next;
-    }
-    return NULL;
-}
-
-static ErtsSigSelItem *
-get_sigsel_item(ErtsPollSet ps, ErtsSysFdType fd) {
-    ErtsSigSelInfo *info = get_sigsel_info(ps,fd->signo);
-    ErtsSigSelItem *curr;
-
-    if (info == NULL)
-	return NULL;
-
-    curr = info->fds;
-
-    while (curr != NULL) {
-	if (curr->fd->id == fd->id) {
-	    ASSERT(curr->fd->signo == fd->signo);
-	    return curr;
-	}
-	curr = curr->next;
-    }
-    return NULL;
-}
-
-static ErtsSigSelInfo *
-add_sigsel_info(ErtsPollSet ps, ErtsSysFdType fd,
-		ErlDrvOseEventId (*decode)(union SIGNAL* sig)) {
-    ErtsSigSelInfo *info = SEL_ALLOC(ERTS_ALC_T_POLLSET,
-		       sizeof(ErtsSigSelInfo));
-    info->next = ps->info;
-    info->fds = NULL;
-    info->signo = fd->signo;
-    info->decode = decode;
-    ps->info = info;
-    ps->sig_count++;
-    return info;
-}
-
-static ErtsSigSelItem *
-add_sigsel_item(ErtsPollSet ps, ErtsSysFdType fd,
-		ErlDrvOseEventId (*decode)(union SIGNAL* sig)) {
-    ErtsSigSelInfo *info = get_sigsel_info(ps,fd->signo);
-    ErtsSigSelItem *item = SEL_ALLOC(ERTS_ALC_T_POLLSET,
-			   sizeof(ErtsSigSelItem));
-    if (info == NULL)
-	info = add_sigsel_info(ps, fd, decode);
-    if (info->decode != decode) {
-	erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-	erts_dsprintf(dsbufp, "erts_poll_control() inconsistency: multiple resolve_signal functions for same signal (%d)\n",
-	    fd->signo);
-	erts_send_error_to_logger_nogl(dsbufp);
-    }
-    ASSERT(info->decode == decode);
-    item->next = info->fds;
-    item->fd = fd;
-    item->events = 0;
-    info->fds = item;
-    ps->item_count++;
-    return item;
-}
-
-static int del_sigsel_info(ErtsPollSet ps, ErtsSigSelInfo *info) {
-    ErtsSigSelInfo *curr, *prev;
-
-    if (ps->info == info) {
-	ps->info = ps->info->next;
-    } else {
-	curr = ps->info->next;
-	prev = ps->info;
-
-	while (curr != info) {
-	    if (curr == NULL)
-		return 1;
-	    prev = curr;
-	    curr = curr->next;
-	}
-	prev->next = curr->next;
-    }
-
-    ps->sig_count--;
-    SEL_FREE(ERTS_ALC_T_POLLSET, info);
-    return 0;
-}
-
-static int del_sigsel_item(ErtsPollSet ps, ErtsSigSelItem *item) {
-    ErtsSigSelInfo *info = get_sigsel_info(ps,item->fd->signo);
-    ErtsSigSelItem *curr, *prev;
-
-    ps->item_count--;
-    ASSERT(ps->item_count >= 0);
-
-    if (info->fds == item) {
-	info->fds = info->fds->next;
-	SEL_FREE(ERTS_ALC_T_POLLSET,item);
-	if (info->fds == NULL)
-	    return del_sigsel_info(ps,info);
-	return 0;
-    }
-
-    curr = info->fds->next;
-    prev = info->fds;
-
-    while (curr != item) {
-	if (curr == NULL) {
-	    /* We did not find an item to delete so we have to
-	     * increment item count again.
-	     */
-	    ps->item_count++;
-	    return 1;
-	}
-	prev = curr;
-	curr = curr->next;
-    }
-    prev->next = curr->next;
-    SEL_FREE(ERTS_ALC_T_POLLSET,item);
-    return 0;
-}
-
-#ifdef ERTS_SMP
-
-static void update_redir_tables(ErtsPollSet ps) {
-  struct OS_redir_entry *redir_table;
-  PROCESS sched_1 = ERTS_SCHEDULER_IX(0)->tid.id;
-  int i;
-  redir_table = SEL_ALLOC(ERTS_ALC_T_POLLSET,
-			  sizeof(struct OS_redir_entry)*(ps->sig_count+1));
-
-  redir_table[0].sig = ps->sig_count+1;
-  redir_table[0].pid = 0;
-
-  for (i = 1; i < ps->sig_count+1; i++) {
-    redir_table[i].sig = ps->sigs[i];
-    redir_table[i].pid = sched_1;
-  }
-
-  for (i = 1; i < erts_no_schedulers; i++) {
-    ErtsSchedulerData *esdp = ERTS_SCHEDULER_IX(i);
-    set_redirection(esdp->tid.id,redir_table);
-  }
-
-  SEL_FREE(ERTS_ALC_T_POLLSET,redir_table);
-}
-
-#endif
-
-static int update_sigsel(ErtsPollSet ps) {
-    ErtsSigSelInfo *info = ps->info;
-
-    int i;
-
-    if (ps->sigs != NULL)
-	SEL_FREE(ERTS_ALC_T_POLLSET,ps->sigs);
-
-    if (ps->sig_count == 0) {
-	/* If there are no signals we place a non-valid signal to make sure that
-	 * we do not trigger on a any unrelated signals which are sent to the
-	 * process.
-	 */
-	ps->sigs = SEL_ALLOC(ERTS_ALC_T_POLLSET,sizeof(SIGSELECT)*(2));
-	ps->sigs[0] = 1;
-	ps->sigs[1] = ERTS_SIGNAL_INVALID;
-	return 0;
-    }
-
-    ps->sigs = SEL_ALLOC(ERTS_ALC_T_POLLSET,sizeof(SIGSELECT)*(ps->sig_count+1));
-    ps->sigs[0] = ps->sig_count;
-
-    for (i = 1; info != NULL; i++, info = info->next)
-	ps->sigs[i] = info->signo;
-
-#ifdef ERTS_SMP
-    update_redir_tables(ps);
-#endif
-
-    return 0;
-}
-
-static ERTS_INLINE void
-wake_poller(ErtsPollSet ps)
-{
-  erts_aint32_t wakeup_state;
-
-  ERTS_THR_MEMORY_BARRIER;
-  wakeup_state = erts_atomic32_read_nob(&ps->wakeup_state);
-  while (wakeup_state != ERTS_POLL_WOKEN_IO_READY
-	 && wakeup_state != ERTS_POLL_WOKEN_INTR) {
-    erts_aint32_t act = erts_atomic32_cmpxchg_nob(&ps->wakeup_state,
-						  ERTS_POLL_WOKEN_INTR,
-						  wakeup_state);
-    if (act == wakeup_state) {
-      wakeup_state = act;
-      break;
-    }
-    wakeup_state = act;
-  }
-  if (wakeup_state == ERTS_POLL_SLEEPING) {
-    /*
-     * Since we don't know the internals of signal_fsem() we issue
-     * a memory barrier as a safety precaution ensuring that
-     * the store we just made to wakeup_state wont be reordered
-     * with loads in signal_fsem().
-     */
-    ERTS_THR_MEMORY_BARRIER;
-    signal_fsem(ps->interrupt);
-  }
-}
-
-static ERTS_INLINE void
-reset_interrupt(ErtsPollSet ps)
-{
-    /* We need to keep io-ready if set */
-    erts_aint32_t wakeup_state = erts_atomic32_read_nob(&ps->wakeup_state);
-    while (wakeup_state != ERTS_POLL_NOT_WOKEN &&
-	   wakeup_state != ERTS_POLL_SLEEPING) {
-	erts_aint32_t act = erts_atomic32_cmpxchg_nob(&ps->wakeup_state,
-						      ERTS_POLL_NOT_WOKEN,
-						      wakeup_state);
-	if (wakeup_state == act)
-	    break;
-	wakeup_state = act;
-    }
-    ERTS_THR_MEMORY_BARRIER;
-}
-
-static ERTS_INLINE void
-set_interrupt(ErtsPollSet ps)
-{
-    wake_poller(ps);
-}
-
-void erts_poll_interrupt(ErtsPollSet ps,int set) {
-    HARDTRACEF("erts_poll_interrupt called!\n");
-
-    if (!set)
-	reset_interrupt(ps);
-    else
-	set_interrupt(ps);
-
-}
-
-void erts_poll_interrupt_timed(ErtsPollSet ps,
-			       int set,
-			       ErtsTimeoutTime timeout_time) {
-    HARDTRACEF("erts_poll_interrupt_timed called!\n");
-
-    if (!set)
-	reset_interrupt(ps);
-    else if (get_timeout_time(ps) > timeout_time)
-        set_interrupt(ps);
-}
-
-ErtsPollEvents erts_poll_control(ErtsPollSet ps, ErtsSysFdType fd,
-	ErtsPollEvents pe, int on, int* do_wake) {
-    ErtsSigSelItem *curr;
-    ErtsPollEvents new_events;
-    int old_sig_count;
-
-    HARDTRACEF(
-	    "%ux: In erts_poll_control, fd = %d, pe = %d, on = %d, *do_wake = %d, curr = 0x%xu",
-	    ps, fd, pe, on, do_wake, curr);
-
-    ERTS_POLLSET_LOCK(ps);
-
-    if (on && (pe & ERTS_POLL_EV_IN) && (pe & ERTS_POLL_EV_OUT)) {
-      /* Check to make sure both in and out are not used at the same time */
-      new_events = ERTS_POLL_EV_NVAL;
-      goto done;
-    }
-
-    curr = get_sigsel_item(ps, fd);
-    old_sig_count = ps->sig_count;
-
-    if (curr == NULL && on) {
-	curr = add_sigsel_item(ps, fd, fd->resolve_signal);
-    } else if (curr == NULL && !on) {
-        new_events = ERTS_POLL_EV_NVAL;
-	goto done;
-    }
-
-    new_events = curr->events;
-
-    if (pe == 0) {
-	*do_wake = 0;
-	goto done;
-    }
-
-    if (on) {
-	new_events |= pe;
-	curr->events = new_events;
-    } else {
-	new_events &= ~pe;
-	curr->events = new_events;
-	if (new_events == 0 && del_sigsel_item(ps, curr)) {
-	    new_events = ERTS_POLL_EV_NVAL;
-	    goto done;
-	}
-    }
-
-    if (ps->sig_count != old_sig_count) {
-      if (update_sigsel(ps))
-	new_events = ERTS_POLL_EV_NVAL;
-    }
-done:
-    ERTS_POLLSET_UNLOCK(ps);
-    HARDTRACEF("%ux: Out erts_poll_control", ps);
-    return new_events;
-}
-
-int erts_poll_wait(ErtsPollSet ps,
-		   ErtsPollResFd pr[],
-		   int *len,
-		   ErtsMonotonicTime timeout_time)
-{
-    int res = ETIMEDOUT, no_fds, currid = 0;
-    OSTIME timeout;
-    union SIGNAL *sig;
-    ErtsMonotonicTime current_time, diff_time, timeout;
-    // HARDTRACEF("%ux: In erts_poll_wait",ps);
-    if (ps->interrupt == (PROCESS)0)
-      ps->interrupt = current_process();
-
-    ASSERT(current_process() == ps->interrupt);
-    ASSERT(get_fsem(current_process()) == 0);
-    ASSERT(erts_atomic32_read_nob(&ps->wakeup_state) &
-	   (ERTS_POLL_NOT_WOKEN | ERTS_POLL_WOKEN_INTR));
-    /* Max no of spots avable in pr */
-    no_fds = *len;
-
-    *len = 0;
-
-    /* erts_printf("Entering erts_poll_wait(), timeout_time=%bps\n",
-		   timeout_time); */
-
-    if (timeout_time == ERTS_POLL_NO_TIMEOUT) {
-    no_timeout:
-	timeout = (OSTIME) 0;
-	save_timeout_time = ERTS_MONOTONIC_TIME_MIN;
-    }
-    else {
-	ErtsMonotonicTime current_time, diff_time;
-	current_time = erts_get_monotonic_time(NULL);
-	diff_time = timeout_time - current_time;
-	if (diff_time <= 0)
-	    goto no_timeout;
-	diff_time = (ERTS_MONOTONIC_TO_MSEC(diff_time - 1) + 1);
-	if (diff_time > INT_MAX)
-	    diff_time = INT_MAX;
-	timeout = (OSTIME) diff_time;
-	save_timeout_time = current_time;
-	save_timeout_time += ERTS_MSEC_TO_MONOTONIC(diff_time);
-    }
-
-    set_timeout_time(ps, save_timeout_time);
-
-    while (currid < no_fds) {
-      if (timeout > 0) {
-	erts_aint32_t act = erts_atomic32_cmpxchg_nob(&ps->wakeup_state,
-						      ERTS_POLL_SLEEPING,
-						      ERTS_POLL_NOT_WOKEN);
-	if (act == ERTS_POLL_NOT_WOKEN) {
-#ifdef ERTS_SMP
-	  erts_thr_progress_prepare_wait(NULL);
-#endif
-	  sig = receive_fsem(timeout, ps->sigs, 1);
-#ifdef ERTS_SMP
-	  erts_thr_progress_finalize_wait(NULL);
-#endif
-	} else {
-	  ASSERT(act == ERTS_POLL_WOKEN_INTR);
-	  sig = OS_RCV_FSEM;
-	}
-      } else
-	  sig = receive_w_tmo(0, ps->sigs);
-
-	if (sig == NULL) {
-	  if (timeout > 0) {
-	    erts_aint32_t act = erts_atomic32_cmpxchg_nob(&ps->wakeup_state,
-							  ERTS_POLL_WOKEN_TIMEDOUT,
-							  ERTS_POLL_SLEEPING);
-	    if (act == ERTS_POLL_WOKEN_INTR)
-	      /* Restore fsem as it was signaled but we got a timeout */
-	      wait_fsem(1);
-	    } else
-	    erts_atomic32_cmpxchg_nob(&ps->wakeup_state,
-				      ERTS_POLL_WOKEN_TIMEDOUT,
-				      ERTS_POLL_NOT_WOKEN);
-	    break;
-	} else if (sig == OS_RCV_FSEM) {
-	  ASSERT(erts_atomic32_read_nob(&ps->wakeup_state) == ERTS_POLL_WOKEN_INTR);
-	  break;
-	}
-       {
-          ErtsSigSelInfo *info = get_sigsel_info(ps, sig->sig_no);
-          struct erts_sys_fd_type fd = { sig->sig_no, info->decode(sig) };
-          ErtsSigSelItem *item = get_sigsel_item(ps, &fd);
-
-	  ASSERT(sig);
-          if (currid == 0 && timeout > 0) {
-	    erts_aint32_t act = erts_atomic32_cmpxchg_nob(&ps->wakeup_state,
-							  ERTS_POLL_WOKEN_IO_READY,
-							  ERTS_POLL_SLEEPING);
-	    if (act == ERTS_POLL_WOKEN_INTR) {
-	      /* Restore fsem as it was signaled but we got a msg */
-	      wait_fsem(1);
-	      act = erts_atomic32_cmpxchg_nob(&ps->wakeup_state,
-					      ERTS_POLL_WOKEN_IO_READY,
-					      ERTS_POLL_WOKEN_INTR);
-	    }
-	  } else if (currid == 0) {
-	    erts_atomic32_set_nob(&ps->wakeup_state,
-				  ERTS_POLL_WOKEN_IO_READY);
-	  }
-
-	  if (item == NULL) {
-	    erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-	    erts_dsprintf(
-                dsbufp,
-                "erts_poll_wait() failed: found unkown signal id %d (signo %u) "
-		"(curr_proc 0x%x)\n",
-                fd.id, fd.signo, current_process());
-             erts_send_error_to_logger_nogl(dsbufp);
-	     timeout = 0;
-             /* Under normal circumstances the signal is deallocated by the
-              * driver that issued the select operation. But in this case
-              * there's no driver waiting for such signal so we have to
-              * deallocate it here */
-             if (sig)
-                 free_buf(&sig);
-	  } else {
-	    int i;
-	    struct erts_sys_fd_type *fd = NULL;
-	    ErtsPollOseMsgList *tl,*new;
-
-	    /* Check if this fd has already been triggered by a previous signal */
-	    for (i = 0; i < currid;i++) {
-	      if (pr[i].fd == item->fd) {
-		fd = pr[i].fd;
-		pr[i].events |= item->events;
-		break;
-	      }
-	    }
-
-	    /* First time this fd is triggered */
-	    if (fd == NULL) {
-	      pr[currid].fd = item->fd;
-	      pr[currid].events = item->events;
-	      fd = item->fd;
-	      timeout = 0;
-	      currid++;
-	    }
-
-	    /* Insert new signal in approriate list */
-	    new = erts_alloc(ERTS_ALC_T_FD_SIG_LIST,sizeof(ErtsPollOseMsgList));
-	    new->next = NULL;
-	    new->data = sig;
-
-	    ethr_mutex_lock(&fd->mtx);
-	    tl = fd->msgs;
-
-	    if (tl == NULL) {
-	      fd->msgs = new;
-	    } else {
-	      while (tl->next != NULL)
-		tl = tl->next;
-	      tl->next = new;
-	    }
-	    ethr_mutex_unlock(&fd->mtx);
-          }
-
-       }
-    }
-
-    {
-       erts_aint32_t wakeup_state = erts_atomic32_read_nob(&ps->wakeup_state);
-
-       switch (wakeup_state) {
-          case ERTS_POLL_WOKEN_IO_READY:
-             res = 0;
-             break;
-          case ERTS_POLL_WOKEN_INTR:
-             res = EINTR;
-             break;
-          case ERTS_POLL_WOKEN_TIMEDOUT:
-             res = ETIMEDOUT;
-             break;
-          case ERTS_POLL_NOT_WOKEN:
-             /* This happens when we get an invalid signal only */
-             res = EINVAL;
-             break;
-          default:
-             res = 0;
-             erl_exit(ERTS_ABORT_EXIT,
-                      "%s:%d: Internal error: Invalid wakeup_state=%d\n",
-                      __FILE__, __LINE__, (int) wakeup_state);
-       }
-    }
-
-    erts_atomic32_set_nob(&ps->wakeup_state, ERTS_POLL_NOT_WOKEN);
-    set_timeout_time(ps, ERTS_MONOTONIC_TIME_MAX);
-
-    *len = currid;
-
-    // HARDTRACEF("%ux: Out erts_poll_wait",ps);
-    return res;
-}
-
-int erts_poll_max_fds(void)
-{
-
-    HARDTRACEF("In/Out erts_poll_max_fds -> %d",max_fds);
-    return max_fds;
-}
-
-void erts_poll_info(ErtsPollSet ps,
-		    ErtsPollInfo *pip)
-{
-    Uint size = 0;
-    Uint num_events = 0;
-
-    size += sizeof(struct ErtsPollSet_);
-    size += sizeof(ErtsSigSelInfo)*ps->sig_count;
-    size += sizeof(ErtsSigSelItem)*ps->item_count;
-    size += sizeof(SIGSELECT)*(ps->sig_count+1);
-
-    pip->primary = "receive_fsem";
-
-    pip->fallback = NULL;
-
-    pip->kernel_poll = NULL;
-
-    pip->memory_size = size;
-
-    pip->poll_set_size = num_events;
-
-    pip->fallback_poll_set_size = 0;
-
-    pip->lazy_updates = 0;
-
-    pip->pending_updates = 0;
-
-    pip->batch_updates = 0;
-
-    pip->concurrent_updates = 0;
-
-
-    pip->max_fds = erts_poll_max_fds();
-    HARDTRACEF("%ux: Out erts_poll_info",ps);
-
-}
-
-ErtsPollSet erts_poll_create_pollset(void)
-{
-    ErtsPollSet ps = SEL_ALLOC(ERTS_ALC_T_POLLSET,
-			       sizeof(struct ErtsPollSet_));
-
-    ps->sigs       = NULL;
-    ps->sig_count  = 0;
-    ps->item_count = 0;
-    ps->info       = NULL;
-    ps->interrupt  = (PROCESS)0;
-    erts_atomic32_init_nob(&ps->wakeup_state, ERTS_POLL_NOT_WOKEN);
-    init_timeout_time(ps);
-#ifdef ERTS_SMP
-    erts_smp_mtx_init(&ps->mtx, "pollset");
-#endif
-    update_sigsel(ps);
-    HARDTRACEF("%ux: Out erts_poll_create_pollset",ps);
-    return ps;
-}
-
-void erts_poll_destroy_pollset(ErtsPollSet ps)
-{
-    ErtsSigSelInfo *info;
-    for (info = ps->info; ps->info != NULL; info = ps->info, ps->info = ps->info->next) {
-	ErtsSigSelItem *item;
-	for (item = info->fds; info->fds != NULL; item = info->fds, info->fds = info->fds->next)
-	    SEL_FREE(ERTS_ALC_T_POLLSET, item);
-	SEL_FREE(ERTS_ALC_T_POLLSET, info);
-    }
-
-    SEL_FREE(ERTS_ALC_T_POLLSET,ps->sigs);
-
-#ifdef ERTS_SMP
-    erts_smp_mtx_destroy(&ps->mtx);
-#endif
-
-    SEL_FREE(ERTS_ALC_T_POLLSET,ps);
-}
-
-void  erts_poll_init(void)
-{
-    HARDTRACEF("In %s", __FUNCTION__);
-    max_fds = 256;
-
-    HARDTRACEF("Out %s", __FUNCTION__);
-}
-
-
-/* OSE driver functions */
-
-union SIGNAL *erl_drv_ose_get_signal(ErlDrvEvent drv_ev) {
-    struct erts_sys_fd_type *ev = (struct erts_sys_fd_type *)drv_ev;
-    ethr_mutex_lock(&ev->mtx);
-    if (ev->msgs == NULL) {
-      ethr_mutex_unlock(&ev->mtx);
-      return NULL;
-    } else {
-      ErtsPollOseMsgList *msg = ev->msgs;
-      union SIGNAL *sig = (union SIGNAL*)msg->data;
-      ASSERT(msg->data);
-      ev->msgs = msg->next;
-      ethr_mutex_unlock(&ev->mtx);
-      erts_free(ERTS_ALC_T_FD_SIG_LIST,msg);
-      restore(sig);
-      return sig;
-    }
-}
-
-ErlDrvEvent
-erl_drv_ose_event_alloc(SIGSELECT signo, ErlDrvOseEventId id,
-			ErlDrvOseEventId (*resolve_signal)(union SIGNAL *sig), void *extra) {
-  struct erts_sys_fd_type *ev = erts_alloc(ERTS_ALC_T_DRV_EV,
-					   sizeof(struct erts_sys_fd_type));
-  ev->signo = signo;
-  ev->extra = extra;
-  ev->id = id;
-  ev->msgs = NULL;
-  ev->resolve_signal = resolve_signal;
-  ethr_mutex_init(&ev->mtx);
-  return (ErlDrvEvent)ev;
-}
-
-void erl_drv_ose_event_free(ErlDrvEvent drv_ev) {
-  struct erts_sys_fd_type *ev = (struct erts_sys_fd_type *)drv_ev;
-  ASSERT(ev->msgs == NULL);
-  ethr_mutex_destroy(&ev->mtx);
-  erts_free(ERTS_ALC_T_DRV_EV,ev);
-}
-
-void erl_drv_ose_event_fetch(ErlDrvEvent drv_ev, SIGSELECT *signo,
-                             ErlDrvOseEventId *id, void **extra) {
-  struct erts_sys_fd_type *ev = (struct erts_sys_fd_type *)drv_ev;
-  if (signo)
-    *signo = ev->signo;
-  if (extra)
-    *extra = ev->extra;
-  if (id)
-    *id = ev->id;
-}
diff --git a/erts/emulator/sys/ose/erts.sig b/erts/emulator/sys/ose/erts.sig
deleted file mode 100644
index 78b883ee6c..0000000000
--- a/erts/emulator/sys/ose/erts.sig
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef ERTS_OSE_SIGNALS
-#define ERTS_OSE_SIGNALS
-
-#ifndef ERTS_OSE_SIGNAL_BASE
-#define ERTS_OSE_SIGNAL_BASE 0x01900280
-#endif
-
-#define ERTS_SIGNAL_INVALID        ERTS_OSE_SIGNAL_BASE
-#define ERTS_SIGNAL_FD_DRV_CONFIG  ERTS_OSE_SIGNAL_BASE+1
-#define ERTS_SIGNAL_FD_DRV_ASYNC   ERTS_OSE_SIGNAL_BASE+2
-#define ERTS_SIGNAL_OSE_DRV_ATTACH ERTS_OSE_SIGNAL_BASE+3
-#define ERTS_SIGNAL_OSE_DRV_HUNT   ERTS_OSE_SIGNAL_BASE+4
-
-#define ERTS_SIGNAL_RUN_ERL_SETUP  ERTS_OSE_SIGNAL_BASE+100
-#define ERTS_SIGNAL_RUN_ERL_DAEMON ERTS_OSE_SIGNAL_BASE+101
-
-#endif
diff --git a/erts/emulator/sys/ose/gcc_4.4.3_lm_ppc.lcf b/erts/emulator/sys/ose/gcc_4.4.3_lm_ppc.lcf
deleted file mode 100644
index a19d23facf..0000000000
--- a/erts/emulator/sys/ose/gcc_4.4.3_lm_ppc.lcf
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2013-2014 by Enea Software AB,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- ******************************************************************************/
-
-OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
-OUTPUT_ARCH("powerpc")
-ENTRY("crt0_lm")
-MEMORY
-{
- rom : ORIGIN = 0x01000000, LENGTH = 0x01000000
- ram : ORIGIN = 0x02000000, LENGTH = 0x01000000
-}
-PHDRS
-{
-  ph_conf PT_LOAD ;
- ph_rom PT_LOAD ;
- ph_ram PT_LOAD ;
-}
-SECTIONS
-{
- .text :
- {
-  *(.text_first)
-  *(.text)
-  *(.text.*)
-  *(.stub)
-  *(oscode)
-  *(.init*)
-  *(.fini*)
-  *(.gnu.warning)
-  *(.gnu.linkonce.t.*)
-  *(.glue_7t)
-  *(.glue_7)
- } > rom :ph_rom = 0
- .ose_sfk_biosentry :
- {
-  *(.ose_sfk_biosentry)
-        } > rom :ph_rom
- .ctors :
- {
-  __CTOR_LIST__ = .;
-  *(.ctors)
-  *(SORT(.ctors.*))
-  __CTOR_END__ = .;
- } > rom :ph_rom
- .dtors :
- {
-  __DTOR_LIST__ = .;
-  *(.dtors)
-  *(SORT(.dtors.*))
-  __DTOR_END__ = .;
- } > rom :ph_rom
- OSESYMS :
- {
-  *(.osesyms)
- } > rom :ph_rom
- .rodata :
- {
-  *(.rodata)
-  *(.rodata.*)
-  *(.gnu.linkonce.r.*)
- } > rom :ph_rom
- .eh_frame_hdr :
- {
-  *(.eh_frame_hdr)
- } > rom :ph_rom
- .eh_frame :
- {
-  __EH_FRAME_BEGIN__ = .;
-  *(.eh_frame)
-  LONG(0)
-  __EH_FRAME_END__ = .;
- } > rom :ph_rom
- .gcc_except_table :
- {
-  *(.gcc_except_table .gcc_except_table.*)
- } > rom :ph_rom
- .sdata2 :
- {
-  PROVIDE (_SDA2_BASE_ = .);
-  *(.sdata2)
-  *(.sdata2.*)
-  *(.gnu.linkonce.s2.*)
- } > rom :ph_rom
- .sbss2 :
- {
-  *(.sbss2)
-  *(.sbss2.*)
-  *(.gnu.linkonce.sb2.*)
- } > rom :ph_rom
- LMCONF :
- {
-  obj/?*?/ose_confd.o(.rodata)
-  *(LMCONF)
- } > rom :ph_conf
- .data :
- {
-  LONG(0xDEADBABE)
-  *(.data)
-  *(.data.*)
-  *(.gnu.linkonce.d.*)
-  SORT(CONSTRUCTORS)
-  . = ALIGN(0x10);
- } > ram :ph_ram = 0
-        .sdata2 :
-   {
-         _SDA2_BASE_ = .;
-             *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
-   }> ram :ph_ram
- .sdata :
- {
-         PROVIDE (_SDA_BASE_ = .);
-  *(.sdata)
-  *(.sdata.*)
-  *(.gnu.linkonce.s.*)
- } > ram :ph_ram
- .sbss :
- {
-  *(.sbss)
-  *(.sbss.*)
-  *(.scommon)
-  *(.gnu.linkonce.sb.*)
- } > ram :ph_ram
- .bss (NOLOAD) :
- {
-  *(.bss)
-  *(.bss.*)
-  *(COMMON)
-  *(.gnu.linkonce.b.*)
-  *(.osvars)
- } > ram :ph_ram
- .ignore (NOLOAD) :
- {
-  *(.rel.dyn)
- } > ram :ph_ram
- .debug 0 : { *(.debug) }
- .line 0 : { *(.line) }
- .debug_srcinfo 0 : { *(.debug_srcinfo) }
- .debug_sfnames 0 : { *(.debug_sfnames) }
- .debug_aranges 0 : { *(.debug_aranges) }
- .debug_pubnames 0 : { *(.debug_pubnames) }
- .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
- .debug_abbrev 0 : { *(.debug_abbrev) }
- .debug_line 0 : { *(.debug_line) }
- .debug_frame 0 : { *(.debug_frame) }
- .debug_str 0 : { *(.debug_str) }
- .debug_loc 0 : { *(.debug_loc) }
- .debug_macinfo 0 : { *(.debug_macinfo) }
- .debug_weaknames 0 : { *(.debug_weaknames) }
- .debug_funcnames 0 : { *(.debug_funcnames) }
- .debug_typenames 0 : { *(.debug_typenames) }
- .debug_varnames 0 : { *(.debug_varnames) }
-}
-__OSESYMS_START = ADDR(OSESYMS);
-__OSESYMS_END = ADDR(OSESYMS) + SIZEOF(OSESYMS);
diff --git a/erts/emulator/sys/ose/gcc_4.6.3_lm_ppc.lcf b/erts/emulator/sys/ose/gcc_4.6.3_lm_ppc.lcf
deleted file mode 100644
index 3440c2961b..0000000000
--- a/erts/emulator/sys/ose/gcc_4.6.3_lm_ppc.lcf
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2013-2014 by Enea Software AB,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- ******************************************************************************/
-
-OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
-OUTPUT_ARCH("powerpc")
-
-ENTRY("crt0_lm")
-
-/* Note:
- * You may have to increase the length of the "rom" memory region and the
- * origin and length of the "ram" memory region below depending on the size
- * of the code and data in your load module.
- */
-
-MEMORY
-{
-	conf : ORIGIN = 0x00100000, LENGTH = 0x00030000
-	rom  : ORIGIN = 0x01000000, LENGTH = 0x01000000
-	ram  : ORIGIN = 0x03000000, LENGTH = 0x01000000
-}
-
-PHDRS
-{
-	ph_conf PT_LOAD ;
-	ph_rom PT_LOAD ;
-	ph_ram PT_LOAD ;
-}
-
-SECTIONS
-{
-/*---------------------------------------------------------------------------
- *		Load module configuration area
- *-------------------------------------------------------------------------*/
-
-	/* Load module configuration section. */
-	LMCONF :
-	{
-		obj/?*?/ose_confd.o(.rodata)
-		*(LMCONF)
-	} > conf :ph_conf
-
-/*---------------------------------------------------------------------------
- *		Read-only area
- *-------------------------------------------------------------------------*/
-
-	/* Code section. */
-	.text :
-	{
-		*(.text)
-		*(.text.*)
-		*(.stub)
-		*(oscode)
-		*(.init*)
-		*(.fini*)
-		*(.gnu.warning)
-		*(.gnu.linkonce.t.*)
-	} > rom :ph_rom = 0
-
-	/* OSE symbols section. */
-	OSESYMS :
-	{
-		*(.osesyms)
-	} > rom :ph_rom
-
-	/* Read-only data section. */
-	.rodata :
-	{
-		*(.rodata)
-		*(.rodata.*)
-		*(.gnu.linkonce.r.*)
-	} > rom :ph_rom
-
-	/* C++ exception handling section. */
-	.eh_frame :
-	{
-		__EH_FRAME_BEGIN__ = .;
-		*(.eh_frame)
-		LONG(0)
-		__EH_FRAME_END__ = .;
-	} > rom :ph_rom
-
-	/* C++ exception handling section. */
-	.gcc_except_table :
-	{
-		*(.gcc_except_table .gcc_except_table.*)
-	} > rom :ph_rom
-
-	/* PowerPC EABI initialized read-only data section. */
-	.sdata2 :
-	{
-		PROVIDE (_SDA2_BASE_ = .);
-		*(.sdata2)
-		*(.sdata2.*)
-		*(.gnu.linkonce.s2.*)
-	} > rom :ph_rom
-
-	/* PowerPC EABI uninitialized read-only data section. */
-	.sbss2 :
-	{
-		*(.sbss2)
-		*(.sbss2.*)
-		*(.gnu.linkonce.sb2.*)
-	} > rom :ph_rom
-
-/*---------------------------------------------------------------------------
- *		Read-write area
- *-------------------------------------------------------------------------*/
-
-	/*-------------------------------------------------------------------
-	 * Initialized data (copied by PM)
-	 *-----------------------------------------------------------------*/
-
-	/* Data section. */
-	.data :
-	{
-		*(.data)
-		*(.data.*)
-		*(.gnu.linkonce.d.*)
-		SORT(CONSTRUCTORS)
-	} > ram :ph_ram
-
-	/* C++ constructor section. */
-	.ctors :
-	{
-		__CTOR_LIST__ = .;
-		*(.ctors)
-		*(SORT(.ctors.*))
-		__CTOR_END__ = .;
-	} > ram :ph_ram
-
-	/* C++ destructor section. */
-	.dtors :
-	{
-		__DTOR_LIST__ = .;
-		*(.dtors)
-		*(SORT(.dtors.*))
-		__DTOR_END__ = .;
-	} > ram :ph_ram
-
-
-	/* Small data section. */
-	.sdata ALIGN(0x10) :
-	{
-		PROVIDE (_SDA_BASE_ = .);
-		*(.sdata)
-		*(.sdata.*)
-		*(.gnu.linkonce.s.*)
-	} > ram :ph_ram
-
-	/*-------------------------------------------------------------------
-	 * Uninitialized data (cleared by PM)
-	 *-----------------------------------------------------------------*/
-
-	/* Small bss section. */
-	.sbss :
-	{
-		*(.sbss)
-		*(.sbss.*)
-		*(.scommon)
-		*(.gnu.linkonce.sb.*)
-	} > ram :ph_ram
-
-	/* Bss section. */
-	.bss :
-	{
-		*(.bss)
-		*(.bss.*)
-		*(COMMON)
-		*(.gnu.linkonce.b.*)
-	} > ram :ph_ram
-
-/*---------------------------------------------------------------------------
- *		Debug information
- *-------------------------------------------------------------------------*/
-
-	/*
-	 * Stabs debug sections.
-	 */
-
-	.stab            0 : { *(.stab) }
-	.stabstr         0 : { *(.stabstr) }
-	.stab.excl       0 : { *(.stab.excl) }
-	.stab.exclstr    0 : { *(.stab.exclstr) }
-	.stab.index      0 : { *(.stab.index) }
-	.stab.indexstr   0 : { *(.stab.indexstr) }
-	.comment         0 : { *(.comment) }
-
-	/*
-	 * DWARF debug sections.
-	 */
-
-	/* DWARF 1 */
-	.debug           0 : { *(.debug) }
-	.line            0 : { *(.line) }
-	/* GNU DWARF 1 extensions */
-	.debug_srcinfo   0 : { *(.debug_srcinfo) }
-	.debug_sfnames   0 : { *(.debug_sfnames) }
-	/* DWARF 1.1 and DWARF 2 */
-	.debug_aranges   0 : { *(.debug_aranges) }
-	.debug_pubnames  0 : { *(.debug_pubnames) }
-	/* DWARF 2 */
-	.debug_info      0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-	.debug_abbrev    0 : { *(.debug_abbrev) }
-	.debug_line      0 : { *(.debug_line) }
-	.debug_frame     0 : { *(.debug_frame) }
-	.debug_str       0 : { *(.debug_str) }
-	.debug_loc       0 : { *(.debug_loc) }
-	.debug_macinfo   0 : { *(.debug_macinfo) }
-	/* SGI/MIPS DWARF 2 extensions */
-	.debug_weaknames 0 : { *(.debug_weaknames) }
-	.debug_funcnames 0 : { *(.debug_funcnames) }
-	.debug_typenames 0 : { *(.debug_typenames) }
-	.debug_varnames  0 : { *(.debug_varnames) }
-}
diff --git a/erts/emulator/sys/ose/sys.c b/erts/emulator/sys/ose/sys.c
deleted file mode 100644
index bcd0ffa0b6..0000000000
--- a/erts/emulator/sys/ose/sys.c
+++ /dev/null
@@ -1,1847 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 1996-2013. 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%
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#include "sys/time.h"
-#include "time.h"
-#include "sys/uio.h"
-#include "termios.h"
-#include "ctype.h"
-#include "termios.h"
-
-#ifdef HAVE_FCNTL_H
-#include "fcntl.h"
-#endif
-
-#ifdef HAVE_SYS_IOCTL_H
-#include "sys/ioctl.h"
-#endif
-
-#define ERTS_WANT_BREAK_HANDLING
-#define WANT_NONBLOCKING
-#include "sys.h"
-#include "erl_thr_progress.h"
-
-#ifdef USE_THREADS
-#include "erl_threads.h"
-#endif
-
-#include "erl_mseg.h"
-
-#include "unistd.h"
-#include "efs.h"
-#include "erl_printf.h"
-#include "aio.h"
-#include "pm.h"
-#include "fcntl.h"
-
-/* Set the define to 1 to get some logging */
-#if 0
-#include "ramlog.h"
-#define LOG(output) ramlog_printf output
-#else
-#define LOG(output)
-#endif
-
-extern char **environ;
-static erts_smp_rwmtx_t environ_rwmtx;
-static PROCESS sig_proxy_pid = 0;
-
-#define MAX_VSIZE 16		/* Max number of entries allowed in an I/O
-				 * vector sock_sendv().
-				 */
-/*
- * Don't need global.h, but bif_table.h (included by bif.h),
- * won't compile otherwise
- */
-#include "global.h"
-#include "bif.h"
-
-#include "erl_sys_driver.h"
-#include "erl_check_io.h"
-#include "erl_cpu_topology.h"
-
-/* The priority for reader/writer processes */
-#define FD_PROC_PRI get_pri(current_process())
-
-typedef struct ErtsSysReportExit_ ErtsSysReportExit;
-struct ErtsSysReportExit_ {
-    ErtsSysReportExit  *next;
-    Eterm              port;
-    int                pid;
-    int                ifd;
-    int                ofd;
-    ErlDrvEvent        attach_event;
-    ErlDrvEvent        input_event;
-    ErlDrvEvent        output_event;
-};
-
-/* This data is shared by these drivers - initialized by spawn_init() */
-static struct driver_data {
-   ErlDrvPort          port_num;
-   int                 ofd;
-   int                 ifd;
-   int                 packet_bytes;
-   ErtsSysReportExit   *report_exit;
-   int                 pid;
-   int                 alive;
-   int                 status;
-   ErlDrvEvent         input_event;
-   ErlDrvEvent         output_event;
-   struct aiocb        aiocb;
-   FmHandle            handle;
-   char                *install_handle;
-} *driver_data;			/* indexed by fd */
-
-struct async {
-  SIGSELECT            signo;
-  ErlDrvTermData       port;
-  ErlDrvTermData       proc;
-  PROCESS              spid;
-  PROCESS              target;
-  Uint32               ref;
-};
-
-static ErtsSysReportExit *report_exit_list;
-static ERTS_INLINE void report_exit_status(ErtsSysReportExit *rep, int status);
-
-extern int  driver_interrupt(int, int);
-extern void do_break(void);
-
-extern void erl_sys_args(int*, char**);
-
-/* The following two defs should probably be moved somewhere else */
-
-extern void erts_sys_init_float(void);
-
-extern void erl_crash_dump(char* file, int line, char* fmt, ...);
-
-#define DIR_SEPARATOR_CHAR    '/'
-
-#if defined(DEBUG)
-#define ERL_BUILD_TYPE_MARKER ".debug"
-#else /* opt */
-#define ERL_BUILD_TYPE_MARKER
-#endif
-
-#define CHILD_SETUP_PROG_NAME	"child_setup" ERL_BUILD_TYPE_MARKER
-
-#ifdef DEBUG
-static int debug_log = 0;
-#endif
-
-#ifdef ERTS_SMP
-static erts_smp_atomic32_t have_prepared_crash_dump;
-#define ERTS_PREPARED_CRASH_DUMP \
-  ((int) erts_smp_atomic32_xchg_nob(&have_prepared_crash_dump, 1))
-#else
-static volatile int have_prepared_crash_dump;
-#define ERTS_PREPARED_CRASH_DUMP \
-  (have_prepared_crash_dump++)
-#endif
-
-static erts_smp_atomic_t sys_misc_mem_sz;
-
-#if defined(ERTS_SMP)
-erts_mtx_t chld_stat_mtx;
-#endif
-
-#if defined(ERTS_SMP) /* ------------------------------------------------- */
-#define CHLD_STAT_LOCK		erts_mtx_lock(&chld_stat_mtx)
-#define CHLD_STAT_UNLOCK	erts_mtx_unlock(&chld_stat_mtx)
-
-#else /* ------------------------------------------------------------------- */
-#define CHLD_STAT_LOCK
-#define CHLD_STAT_UNLOCK
-static volatile int children_died;
-#endif
-
-#define SET_AIO(REQ,FD,SIZE,BUFF)                                       \
-   memset(&(REQ),0,sizeof(REQ));                                        \
-   (REQ).aio_fildes = FD;                                               \
-   (REQ).aio_offset = FM_POSITION_CURRENT;                              \
-   (REQ).aio_nbytes = SIZE;                                             \
-   (REQ).aio_buf = BUFF;                                                \
-   (REQ).aio_sigevent.sigev_notify = SIGEV_NONE
-
-/* the first sizeof(struct aiocb *) bytes of the write buffer
- * will contain the pointer to the aiocb struct, this needs
- * to be freed between asynchronous writes.
- * A write of 0 bytes is ignored. */
-#define WRITE_AIO(FD,SIZE,BUFF) do {                                    \
-   if (SIZE > 0) {                                                      \
-      struct aiocb *write_req = driver_alloc(sizeof(struct aiocb));     \
-      char *write_buff = driver_alloc((sizeof(char)*SIZE)+1+            \
-            (sizeof(struct aiocb *)));                                  \
-      *(struct aiocb **)write_buff = (struct aiocb *)write_req;         \
-      write_buff += sizeof(struct aiocb *);                             \
-      memcpy(write_buff,BUFF,SIZE+1);                                   \
-      SET_AIO(*write_req,FD,SIZE,write_buff);                           \
-      if (aio_write(write_req))						\
-	ramlog_printf("%s:%d: write failed with %d\n",			\
-		      __FILE__,__LINE__,errno);				\
-   }                                                                    \
-} while(0)
-
-/* free the write_buffer and write_req
- * created in the WRITE_AIO() request macro */
-#define FREE_AIO(ptr) do {                                              \
-   struct aiocb *aiocb_ptr;                                             \
-   char *buffer_ptr;                                                    \
-   aiocb_ptr = *(struct aiocb **)((ptr)-sizeof(struct aiocb *));        \
-   buffer_ptr = (((char*)ptr)-sizeof(struct aiocb *));			\
-   driver_free(aiocb_ptr);                                              \
-   driver_free(buffer_ptr);                                             \
-} while(0)
-
-#define DISPATCH_AIO(sig) do {                                          \
-   if (aio_dispatch(sig))						\
-     ramlog_printf("%s:%d: dispatch failed with %d\n",			\
-		   __FILE__,__LINE__,errno);				\
-   } while(0)
-
-#define AIO_PIPE_SIZE 1024
-
-/* debug print macros */
-#define DEBUG_RES 0
-
-#ifdef DEBUG_RES
-#define DEBUG_CHECK_RES(actual, expected) \
-   do { \
-      if (actual != expected ) { \
-         ramlog_printf("Result check failed" \
-                       " got: 0x%08x expected:0x%08x\nat: %s:%d\n", \
-               actual, expected, __FILE__, __LINE__); \
-         abort();  /* This might perhaps be too harsh? */ \
-      } \
-   } while(0)
-#else
-#define DEBUG_CHECK_RES
-#endif
-
-static struct fd_data {
-    char  pbuf[4];   /* hold partial packet bytes */
-    int   psz;       /* size of pbuf */
-    char  *buf;
-    char  *cpos;
-    int   sz;
-    int   remain;  /* for input on fd */
-} *fd_data;			/* indexed by fd */
-
-/********************* General functions ****************************/
-
-/* This is used by both the drivers and general I/O, must be set early */
-static int max_files = -1;
-
-/*
- * a few variables used by the break handler
- */
-#ifdef ERTS_SMP
-erts_smp_atomic32_t erts_break_requested;
-#define ERTS_SET_BREAK_REQUESTED \
-  erts_smp_atomic32_set_nob(&erts_break_requested, (erts_aint32_t) 1)
-#define ERTS_UNSET_BREAK_REQUESTED \
-  erts_smp_atomic32_set_nob(&erts_break_requested, (erts_aint32_t) 0)
-#else
-volatile int erts_break_requested = 0;
-#define ERTS_SET_BREAK_REQUESTED (erts_break_requested = 1)
-#define ERTS_UNSET_BREAK_REQUESTED (erts_break_requested = 0)
-#endif
-/* set early so the break handler has access to initial mode */
-static struct termios initial_tty_mode;
-static int replace_intr = 0;
-/* assume yes initially, ttsl_init will clear it */
-int using_oldshell = 1;
-static PROCESS get_signal_proxy_pid(void);
-
-static void
-init_check_io(void)
-{
-    erts_init_check_io();
-    max_files = erts_check_io_max_files();
-}
-
-#ifdef ERTS_POLL_NEED_ASYNC_INTERRUPT_SUPPORT
-#define ERTS_CHK_IO_AS_INTR()	erts_check_io_async_sig_interrupt()
-#else
-#define ERTS_CHK_IO_AS_INTR()	erts_check_io_interrupt(1)
-#endif
-#define ERTS_CHK_IO_INTR	erts_check_io_interrupt
-#define ERTS_CHK_IO_INTR_TMD	erts_check_io_interrupt_timed
-#define ERTS_CHK_IO		erts_check_io
-#define ERTS_CHK_IO_SZ		erts_check_io_size
-
-
-void
-erts_sys_schedule_interrupt(int set)
-{
-    ERTS_CHK_IO_INTR(set);
-}
-
-#ifdef ERTS_SMP
-void
-erts_sys_schedule_interrupt_timed(int set, ErtsMonotonicTime timeout_time)
-{
-    ERTS_CHK_IO_INTR_TMD(set, timeout_time);
-}
-#endif
-
-Uint
-erts_sys_misc_mem_sz(void)
-{
-    Uint res = ERTS_CHK_IO_SZ();
-    res += erts_smp_atomic_read_mb(&sys_misc_mem_sz);
-    return res;
-}
-
-/*
- * reset the terminal to the original settings on exit
- */
-void sys_tty_reset(int exit_code)
-{
-  if (using_oldshell && !replace_intr) {
-    SET_BLOCKING(0);
-  }
-  else if (isatty(0)) {
-    tcsetattr(0,TCSANOW,&initial_tty_mode);
-  }
-}
-
-#ifdef USE_THREADS
-
-typedef struct {
-    int sched_bind_data;
-} erts_thr_create_data_t;
-
-/*
- * thr_create_prepare() is called in parent thread before thread creation.
- * Returned value is passed as argument to thr_create_cleanup().
- */
-static void *
-thr_create_prepare(void)
-{
-    erts_thr_create_data_t *tcdp;
-
-    tcdp = erts_alloc(ERTS_ALC_T_TMP, sizeof(erts_thr_create_data_t));
-
-    tcdp->sched_bind_data = erts_sched_bind_atthrcreate_prepare();
-
-    return (void *) tcdp;
-}
-
-
-/* thr_create_cleanup() is called in parent thread after thread creation. */
-static void
-thr_create_cleanup(void *vtcdp)
-{
-    erts_thr_create_data_t *tcdp = (erts_thr_create_data_t *) vtcdp;
-
-    erts_sched_bind_atthrcreate_parent(tcdp->sched_bind_data);
-
-    erts_free(ERTS_ALC_T_TMP, tcdp);
-}
-
-static void
-thr_create_prepare_child(void *vtcdp)
-{
-    erts_thr_create_data_t *tcdp = (erts_thr_create_data_t *) vtcdp;
-
-#ifdef ERTS_ENABLE_LOCK_COUNT
-    erts_lcnt_thread_setup();
-#endif
-
-    erts_sched_bind_atthrcreate_child(tcdp->sched_bind_data);
-}
-
-#endif /* #ifdef USE_THREADS */
-
-/* The two functions below are stolen from win_con.c
-   They have to use malloc/free/realloc directly becasue
-   we want to do able to do erts_printf very early on.
- */
-#define VPRINTF_BUF_INC_SIZE 128
-static erts_dsprintf_buf_t *
-grow_vprintf_buf(erts_dsprintf_buf_t *dsbufp, size_t need)
-{
-    char *buf;
-    size_t size;
-
-    ASSERT(dsbufp);
-
-    if (!dsbufp->str) {
-	size = (((need + VPRINTF_BUF_INC_SIZE - 1)
-		 / VPRINTF_BUF_INC_SIZE)
-		* VPRINTF_BUF_INC_SIZE);
-	buf = (char *) malloc(size * sizeof(char));
-    }
-    else {
-	size_t free_size = dsbufp->size - dsbufp->str_len;
-
-	if (need <= free_size)
-	    return dsbufp;
-
-	size = need - free_size + VPRINTF_BUF_INC_SIZE;
-	size = (((size + VPRINTF_BUF_INC_SIZE - 1)
-		 / VPRINTF_BUF_INC_SIZE)
-		* VPRINTF_BUF_INC_SIZE);
-	size += dsbufp->size;
-        buf = (char *) realloc((void *) dsbufp->str,
-			       size * sizeof(char));
-    }
-    if (!buf)
-	return NULL;
-    if (buf != dsbufp->str)
-	dsbufp->str = buf;
-    dsbufp->size = size;
-    return dsbufp;
-}
-
-static int erts_sys_ramlog_printf(char *format, va_list arg_list)
-{
-    int res,i;
-    erts_dsprintf_buf_t dsbuf = ERTS_DSPRINTF_BUF_INITER(grow_vprintf_buf);
-    res = erts_vdsprintf(&dsbuf, format, arg_list);
-    if (res >= 0) {
-      for (i = 0; i < dsbuf.str_len; i+= 50)
-	/* We print 50 characters at a time because otherwise
-	   the ramlog looks broken */
-        ramlog_printf("%.*s",dsbuf.str_len-50 < 0?dsbuf.str_len:50,dsbuf.str+i);
-    }
-    if (dsbuf.str)
-      free((void *) dsbuf.str);
-    return res;
-}
-
-void
-erts_sys_pre_init(void)
-{
-    erts_printf_add_cr_to_stdout = 1;
-    erts_printf_add_cr_to_stderr = 1;
-#ifdef USE_THREADS
-    {
-    erts_thr_init_data_t eid = ERTS_THR_INIT_DATA_DEF_INITER;
-
-    eid.thread_create_child_func = thr_create_prepare_child;
-    /* Before creation in parent */
-    eid.thread_create_prepare_func = thr_create_prepare;
-    /* After creation in parent */
-    eid.thread_create_parent_func = thr_create_cleanup,
-
-    erts_thr_init(&eid);
-
-    report_exit_list = NULL;
-
-#ifdef ERTS_ENABLE_LOCK_COUNT
-    erts_lcnt_init();
-#endif
-
-#if defined(ERTS_SMP)
-    erts_mtx_init(&chld_stat_mtx, "child_status");
-#endif
-    }
-#ifdef ERTS_SMP
-    erts_smp_atomic32_init_nob(&erts_break_requested, 0);
-    erts_smp_atomic32_init_nob(&have_prepared_crash_dump, 0);
-#else
-    erts_break_requested = 0;
-    have_prepared_crash_dump = 0;
-#endif
-#if !defined(ERTS_SMP)
-    children_died = 0;
-#endif
-#endif /* USE_THREADS */
-
-    erts_printf_stdout_func = erts_sys_ramlog_printf;
-
-    erts_smp_atomic_init_nob(&sys_misc_mem_sz, 0);
-}
-
-void
-erl_sys_init(void)
-{
-
-#ifdef USE_SETLINEBUF
-    setlinebuf(stdout);
-#else
-    setvbuf(stdout, (char *)NULL, _IOLBF, BUFSIZ);
-#endif
-
-    erts_sys_init_float();
-
-    /* we save this so the break handler can set and reset it properly */
-    /* also so that we can reset on exit (break handler or not) */
-    if (isatty(0)) {
-	tcgetattr(0,&initial_tty_mode);
-    }
-    tzset(); /* Required at least for NetBSD with localtime_r() */
-}
-
-static ERTS_INLINE int
-prepare_crash_dump(int secs)
-{
-#define NUFBUF (3)
-    int i, max;
-    char env[21]; /* enough to hold any 64-bit integer */
-    size_t envsz;
-    /*DeclareTmpHeapNoproc(heap,NUFBUF);*/
-    /*Eterm *hp = heap;*/
-    /*Eterm list = NIL;*/
-    int has_heart = 0;
-
-    UseTmpHeapNoproc(NUFBUF);
-
-    if (ERTS_PREPARED_CRASH_DUMP)
-	return 0; /* We have already been called */
-
-
-    /* Positive secs means an alarm must be set
-     * 0 or negative means no alarm
-     *
-     * Set alarm before we try to write to a port
-     * we don't want to hang on a port write with
-     * no alarm.
-     *
-     */
-
-#if 0 /*ose TBD!!!*/
-    if (secs >= 0) {
-	alarm((unsigned int)secs);
-    }
-#endif
-
-    /* Make sure we unregister at epmd (unknown fd) and get at least
-       one free filedescriptor (for erl_crash.dump) */
-
-    max = max_files;
-    if (max < 1024)
-	max = 1024;
-    for (i = 3; i < max; i++) {
-	close(i);
-    }
-
-    envsz = sizeof(env);
-    i = erts_sys_getenv__("ERL_CRASH_DUMP_NICE", env, &envsz);
-    if (i >= 0) {
-	int nice_val;
-	nice_val = i != 0 ? 0 : atoi(env);
-	if (nice_val > 39) {
-	    nice_val = 39;
-	}
-	set_pri(nice_val);
-    }
-
-    UnUseTmpHeapNoproc(NUFBUF);
-#undef NUFBUF
-    return has_heart;
-}
-
-int erts_sys_prepare_crash_dump(int secs)
-{
-    return prepare_crash_dump(secs);
-}
-
-static ERTS_INLINE void
-break_requested(void)
-{
-  /*
-   * just set a flag - checked for and handled by
-   * scheduler threads erts_check_io() (not signal handler).
-   */
-#ifdef DEBUG
-  fprintf(stderr,"break!\n");
-#endif
-  if (ERTS_BREAK_REQUESTED)
-      erl_exit(ERTS_INTR_EXIT, "");
-
-  ERTS_SET_BREAK_REQUESTED;
-  ERTS_CHK_IO_AS_INTR(); /* Make sure we don't sleep in poll */
-}
-
-/* Disable break */
-void erts_set_ignore_break(void) {
-
-}
-
-/* Don't use ctrl-c for break handler but let it be
-   used by the shell instead (see user_drv.erl) */
-void erts_replace_intr(void) {
-  struct termios mode;
-
-  if (isatty(0)) {
-    tcgetattr(0, &mode);
-
-    /* here's an example of how to replace ctrl-c with ctrl-u */
-    /* mode.c_cc[VKILL] = 0;
-       mode.c_cc[VINTR] = CKILL; */
-
-    mode.c_cc[VINTR] = 0;	/* disable ctrl-c */
-    tcsetattr(0, TCSANOW, &mode);
-    replace_intr = 1;
-  }
-}
-
-void init_break_handler(void)
-{
-
-}
-
-int sys_max_files(void)
-{
-   return(max_files);
-}
-
-
-/************************** OS info *******************************/
-
-/* Used by erlang:info/1. */
-/* (This code was formerly in drv.XXX/XXX_os_drv.c) */
-
-char os_type[] = "ose";
-
-void
-os_flavor(char* namebuf,	/* Where to return the name. */
-	  unsigned size)	/* Size of name buffer. */
-{
-#if 0
-    struct utsname uts;		/* Information about the system. */
-    char* s;
-
-    (void) uname(&uts);
-    for (s = uts.sysname; *s; s++) {
-	if (isupper((int) *s)) {
-	    *s = tolower((int) *s);
-	}
-    }
-    strcpy(namebuf, uts.sysname);
-#else
-    strncpy(namebuf, "release", size);
-#endif
-}
-
-void
-os_version(pMajor, pMinor, pBuild)
-int* pMajor;			/* Pointer to major version. */
-int* pMinor;			/* Pointer to minor version. */
-int* pBuild;			/* Pointer to build number. */
-{
-    *pMajor = 5;
-    *pMinor = 7;
-    *pBuild = 0;
-}
-
-void init_getenv_state(GETENV_STATE *state)
-{
-   erts_smp_rwmtx_rlock(&environ_rwmtx);
-   *state = NULL;
-}
-
-char **environ; /*ose - needs replacement*/
-
-char *getenv_string(GETENV_STATE *state0)
-{
-   char **state = (char **) *state0;
-   char *cp;
-
-   ERTS_SMP_LC_ASSERT(erts_smp_lc_rwmtx_is_rlocked(&environ_rwmtx));
-
-   if (state == NULL)
-      state = environ;
-
-   cp = *state++;
-   *state0 = (GETENV_STATE) state;
-
-   return cp;
-}
-
-void fini_getenv_state(GETENV_STATE *state)
-{
-   *state = NULL;
-   erts_smp_rwmtx_runlock(&environ_rwmtx);
-}
-
-
-/************************** Port I/O *******************************/
-
-/* I. Common stuff */
-
-union SIGNAL {
-    SIGSELECT sig_no;
-    struct FmReadPtr fm_read_reply;
-    struct FmWritePtr fm_write_reply;
-    struct async async;
-};
-
-/* II. The spawn/fd drivers */
-
-/*
- * Decreasing the size of it below 16384 is not allowed.
- */
-#define ERTS_SYS_READ_BUF_SZ (64*1024)
-
-/* Driver interfaces */
-static ErlDrvData spawn_start(ErlDrvPort, char*, SysDriverOpts*);
-static ErlDrvData fd_start(ErlDrvPort, char*, SysDriverOpts*);
-static ErlDrvSSizeT fd_control(ErlDrvData, unsigned int, char *, ErlDrvSizeT,
-			       char **, ErlDrvSizeT);
-static int spawn_init(void);
-static void fd_stop(ErlDrvData);
-static void erl_stop(ErlDrvData);
-static void ready_input(ErlDrvData, ErlDrvEvent);
-static void ready_output(ErlDrvData, ErlDrvEvent);
-static void output(ErlDrvData, char*, ErlDrvSizeT);
-static void stop_select(ErlDrvEvent, void*);
-
-static PROCESS
-get_signal_proxy_pid(void) {
-   union SIGNAL *sig;
-   SIGSELECT any_sig[] = {1,ERTS_SIGNAL_OSE_DRV_ATTACH};
-
-   if (!sig_proxy_pid) {
-      sig = alloc(sizeof(union SIGNAL), ERTS_SIGNAL_OSE_DRV_ATTACH);
-      hunt("ose_signal_driver_proxy", 0, NULL, &sig);
-      sig = receive(any_sig);
-      sig_proxy_pid = sender(&sig);
-      free_buf(&sig);
-   }
-   ASSERT(sig_proxy_pid);
-   return sig_proxy_pid;
-}
-
-static ErlDrvOseEventId
-resolve_signal(union SIGNAL* sig) {
-   switch(sig->sig_no) {
-
-      case FM_READ_PTR_REPLY:
-            return (ErlDrvOseEventId)sig->fm_read_reply.handle;
-
-       case FM_WRITE_PTR_REPLY:
-            return (ErlDrvOseEventId)sig->fm_write_reply.handle;
-
-       case ERTS_SIGNAL_OSE_DRV_ATTACH:
-            return (ErlDrvOseEventId)sig->async.target;
-
-       default:
-            break;
-    }
-    return (ErlDrvOseEventId)-1;
-}
-
-struct erl_drv_entry spawn_driver_entry = {
-    spawn_init,
-    spawn_start,
-    NULL, /* erl_stop, */
-    output,
-    ready_input,
-    ready_output,
-    "spawn",
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    ERL_DRV_EXTENDED_MARKER,
-    ERL_DRV_EXTENDED_MAJOR_VERSION,
-    ERL_DRV_EXTENDED_MINOR_VERSION,
-    ERL_DRV_FLAG_USE_PORT_LOCKING,
-    NULL, NULL,
-    stop_select
-};
-struct erl_drv_entry fd_driver_entry = {
-    NULL,
-    fd_start,
-    fd_stop,
-    output,
-    ready_input,
-    ready_output,
-    "fd",
-    NULL,
-    NULL,
-    fd_control,
-    NULL,
-    NULL,
-    NULL, /* ready_async */
-    NULL, /* flush */
-    NULL, /* call */
-    NULL, /* event */
-    ERL_DRV_EXTENDED_MARKER,
-    ERL_DRV_EXTENDED_MAJOR_VERSION,
-    ERL_DRV_EXTENDED_MINOR_VERSION,
-    0, /* ERL_DRV_FLAGs */
-    NULL, /* handle2 */
-    NULL, /* process_exit */
-    stop_select
-};
-
-static void
-set_spawn_fd(int local_fd, int remote_fd, PROCESS remote_pid) {
-   PROCESS vm_pid;
-   FmHandle handle;
-   char env_val[55];
-   char env_name[10];
-   EfsStatus efs_res;
-
-   /* get pid of pipevm and handle of chosen fd */
-   efs_res = efs_examine_fd(local_fd, FLIB_FD_VMPID, &vm_pid, 0);
-   DEBUG_CHECK_RES(efs_res, EFS_SUCCESS);
-
-   /* setup the file descriptor to buffer per line */
-   efs_res = efs_config_fd(local_fd, FLIB_FD_BUFMODE, FM_BUFF_LINE,
-                    FLIB_FD_BUFSIZE, 80, 0);
-   DEBUG_CHECK_RES(efs_res, EFS_SUCCESS);
-
-   /* duplicate handle  and set spawn pid owner */
-   efs_res = efs_dup_to(local_fd, remote_pid, &handle);
-   DEBUG_CHECK_RES(efs_res, EFS_SUCCESS);
-
-   sprintf(env_name, "FD%d", remote_fd);
-
-   /* Syntax of the environment variable:
-    * "FD#" "<pid of pipevm>,<handle>,<buffer mode>,<buff size>,<omode>" */
-   sprintf(env_val, "0x%lx,0x%lx,%lu,%lu,0x%x",
-                    vm_pid, handle,
-                    FM_BUFF_LINE, 80,
-                    O_APPEND);
-
-   set_env(remote_pid, env_name, env_val);
-}
-
-static ErlDrvData
-set_driver_data(ErlDrvPort port_num,
-			   int ifd,
-			   int ofd,
-			   int packet_bytes,
-			   int read_write,
-			   int exit_status,
-			   PROCESS pid)
-{
-    Port *prt;
-    ErtsSysReportExit *report_exit;
-
-    prt = erts_drvport2port(port_num);
-    if (prt != ERTS_INVALID_ERL_DRV_PORT) {
-       prt->os_pid = pid;
-    }
-
-    /* READ */
-    if (read_write & DO_READ) {
-       EfsStatus res = efs_examine_fd(ifd, FLIB_FD_HANDLE,
-				      &driver_data[ifd].handle, 0);
-       if (res != EFS_SUCCESS)
-	 ramlog_printf("%s:%d: efs_examine_fd(%d) failed with %d\n",
-		       __FILE__,__LINE__,ifd,errno);
-       driver_data[ifd].ifd = ifd;
-       driver_data[ifd].packet_bytes = packet_bytes;
-       driver_data[ifd].port_num = port_num;
-       driver_data[ifd].pid = pid;
-
-       /* async read struct */
-       memset(&driver_data[ifd].aiocb, 0, sizeof(struct aiocb));
-       driver_data[ifd].aiocb.aio_buf = driver_alloc(AIO_PIPE_SIZE);
-       driver_data[ifd].aiocb.aio_fildes = ifd;
-       driver_data[ifd].aiocb.aio_nbytes = (packet_bytes?packet_bytes:AIO_PIPE_SIZE);
-       driver_data[ifd].alive = 1;
-       driver_data[ifd].status = 0;
-       driver_data[ifd].input_event =
-          erl_drv_ose_event_alloc(FM_READ_PTR_REPLY,
-                driver_data[ifd].handle, resolve_signal,
-                &driver_data[ifd].ifd);
-
-       /* READ & WRITE */
-       if (read_write & DO_WRITE) {
-          driver_data[ifd].ofd = ofd;
-          efs_examine_fd(ofd, FLIB_FD_HANDLE, &driver_data[ofd].handle, 0);
-
-          driver_data[ifd].output_event =
-             erl_drv_ose_event_alloc(FM_WRITE_PTR_REPLY,
-                   driver_data[ofd].handle, resolve_signal,
-                   &driver_data[ofd].ofd);
-          driver_data[ofd].pid = pid;
-          if (ifd != ofd) {
-             driver_data[ofd] = driver_data[ifd];
-             driver_data[ofd].aiocb.aio_buf = NULL;
-           }
-       }
-       else { /* READ ONLY */
-          driver_data[ifd].ofd = -1;
-       }
-
-       /* enable input event */
-       (void) driver_select(port_num, driver_data[ifd].input_event,
-			     (ERL_DRV_READ | ERL_DRV_USE), 1);
-
-       if (aio_read(&driver_data[ifd].aiocb))
-	 ramlog_printf("%s:%d: aio_read(%d) failed with %d\n",
-		       __FILE__,__LINE__,ifd,errno);
-    }
-    else { /* WRITE ONLY */
-       efs_examine_fd(ofd, FLIB_FD_HANDLE, &driver_data[ofd].handle, 0);
-       driver_data[ofd].packet_bytes = packet_bytes;
-       driver_data[ofd].port_num = port_num;
-       driver_data[ofd].ofd = ofd;
-       driver_data[ofd].pid = pid;
-       driver_data[ofd].alive = 1;
-       driver_data[ofd].status = 0;
-       driver_data[ofd].output_event =
-          erl_drv_ose_event_alloc(FM_WRITE_PTR_REPLY, driver_data[ofd].handle,
-				    resolve_signal, &driver_data[ofd].ofd);
-       driver_data[ofd].input_event = driver_data[ofd].output_event;
-    }
-
-    /* this is used for spawned load modules, and is needed
-     * to properly uninstall them */
-    if (exit_status) {
-       struct PmProgramInfo *info;
-       int install_handle_size;
-       union SIGNAL *sig;
-       PmStatus pm_status;
-       report_exit = erts_alloc(ERTS_ALC_T_PRT_REP_EXIT,
-				 sizeof(ErtsSysReportExit));
-       report_exit->next = report_exit_list;
-       report_exit->port = erts_drvport2id(port_num);
-       report_exit->pid = pid;
-       report_exit->ifd = (read_write & DO_READ) ? ifd : -1;
-       report_exit->ofd = (read_write & DO_WRITE) ? ofd : -1;
-       report_exit_list = report_exit;
-       report_exit->attach_event =
-          erl_drv_ose_event_alloc(ERTS_SIGNAL_OSE_DRV_ATTACH, pid,
-				resolve_signal, &driver_data[ifd].ifd);
-
-       /* setup ifd and ofd report exit */
-       driver_data[ifd].report_exit = report_exit;
-       driver_data[ofd].report_exit = report_exit;
-
-       pm_status = ose_pm_program_info(pid, &info);
-       DEBUG_CHECK_RES(pm_status, PM_SUCCESS);
-
-       install_handle_size = strlen(info->install_handle)+1;
-       driver_data[ifd].install_handle = driver_alloc(install_handle_size);
-       strcpy(driver_data[ifd].install_handle,
-             info->install_handle);
-
-       free_buf((union SIGNAL **)&info);
-
-       sig = alloc(sizeof(struct async), ERTS_SIGNAL_OSE_DRV_ATTACH);
-       sig->async.target = pid;
-       send(&sig, get_signal_proxy_pid());
-
-       /* this event will trigger when we receive an attach signal
-        * from the recently dead load module */
-       (void)driver_select(port_num,report_exit->attach_event, DO_READ, 1);
-    }
-    else {
-       report_exit = NULL;
-    }
-
-    /* the return value is the pointer to the driver_data struct we created
-     * in this function, it will be used in the drivers input
-     * and output functions */
-    return (ErlDrvData)((!(read_write & DO_READ) && read_write & DO_WRITE)
-          ? &driver_data[ofd]
-          : &driver_data[ifd]);
-}
-
-static int spawn_init()
-{
-    int i;
-
-    driver_data = (struct driver_data *)
-      erts_alloc(ERTS_ALC_T_DRV_TAB, max_files * sizeof(struct driver_data));
-    erts_smp_atomic_add_nob(&sys_misc_mem_sz,
-			    max_files * sizeof(struct driver_data));
-
-    for (i = 0; i < max_files; i++)
-        driver_data[i].pid = -1;
-
-   return 1;
-}
-
-static void
-init_fd_data(int fd, ErlDrvPort port_num)
-{
-    fd_data[fd].buf = NULL;
-    fd_data[fd].cpos = NULL;
-    fd_data[fd].remain = 0;
-    fd_data[fd].sz = 0;
-    fd_data[fd].psz = 0;
-}
-
-/* FIXME write a decent text on pipes on ose */
-static ErlDrvData
-spawn_start(ErlDrvPort port_num, char* name, SysDriverOpts* opts)
-{
-    int ifd[2];
-    int ofd[2];
-    static uint32_t ticker = 1;
-    PmStatus pm_status;
-    OSDOMAIN domain = PM_NEW_DOMAIN;
-    PROCESS progpid, mainbid, mainpid;
-    char *handle = NULL;
-    struct PmProgramInfo *info;
-    char *args = NULL;
-    char *tmp_handle;
-    ErlDrvData res = (ErlDrvData)-1;
-    int handle_size;
-    char *ptr;
-
-   
-    args = driver_alloc(strlen(name)+1);
-    strcpy(args, name);
-    /* We need to handle name in three parts 
-     * - install handle (must be unique)
-     * - install binary (needed for ose_pm_install_load_module())
-     * - full path (as argument to the spawned applications env.var
-     */
-
-    /* full path including arguments */
-    args = driver_alloc(strlen(name)+1);
-    strcpy(args, name);
-
-    /* handle path */
-    tmp_handle = strrchr(name, '/');
-    if (tmp_handle == NULL) {
-       tmp_handle = name;
-    }
-    else {
-       tmp_handle++;
-    }
-
-    /* handle args */
-    ptr = strchr(tmp_handle, ' ');
-    if (ptr != NULL) {
-       *ptr = '\0';
-       handle_size = ptr - tmp_handle;
-    }
-    else {
-       handle_size = strlen(name)+1;
-    }
-
-    /* make room for ticker */
-    handle_size += (ticker<10)?3:((ticker<100)?4:5);
-    handle = driver_alloc(handle_size);
-    
-    do {
-       snprintf(handle, handle_size, "%s_%d", tmp_handle, ticker);
-       pm_status = ose_pm_install_load_module(0, "ELF", name, handle,
-                                              0, 0, NULL);
-       ticker++;
-    } while (pm_status == PM_EINSTALL_HANDLE_ALREADY_INSTALLED);
-
-    if (pm_status != PM_SUCCESS) {
-       errno = ENOSYS; /* FIXME add comment */
-       return ERL_DRV_ERROR_ERRNO; 
-    }
-
-    /* Create Program */
-    pm_status = ose_pm_create_program(&domain, handle, 0, 0,
-                                      NULL, &progpid, &mainbid);
-    DEBUG_CHECK_RES(pm_status, PM_SUCCESS);
-
-    /* Get the mainpid from the newly created program */
-    pm_status = ose_pm_program_info(progpid, &info);
-    DEBUG_CHECK_RES(pm_status, PM_SUCCESS);
-
-    mainpid = info->main_process;
-    free_buf ((union SIGNAL **)&info);
-
-    /* pipevm needs to be started
-     * pipe will return 0 if success, -1 if not,
-     * errno will be set */
-    if (pipe(ifd) != 0 || pipe(ofd) != 0) {
-       DEBUG_CHECK_RES(0, -1);
-       ASSERT(0);
-    }
-
-    /* setup driver data */
-    res = set_driver_data(port_num, ofd[0], ifd[1], opts->packet_bytes,
-              opts->read_write, 1 /* opts->exit_status */, progpid);
-
-    /* init the fd_data array for read/write */
-    init_fd_data(ofd[0], port_num);
-    init_fd_data(ifd[1], port_num);
-
-    /* setup additional configurations
-     * for the spawned applications environment */
-    if (args != NULL) {
-       set_env(progpid, "ARGV", args);
-    }
-    set_env(mainbid, "EFS_RESOLVE_TMO", 0);
-    set_spawn_fd(ifd[0], 0, mainpid);
-    set_spawn_fd(ofd[1], 1, mainpid);
-    set_spawn_fd(ofd[1], 2, mainpid);
-
-    /* start the spawned program */
-    pm_status = ose_pm_start_program(mainbid);
-    DEBUG_CHECK_RES(pm_status, PM_SUCCESS);
-
-    /* close unused fd's */
-    close(ifd[0]);
-    close(ofd[1]);
-
-    if (handle) {
-       driver_free(handle);
-    }
-
-    return (ErlDrvData)res;
-}
-
-#define FD_DEF_HEIGHT 24
-#define FD_DEF_WIDTH 80
-/* Control op */
-#define FD_CTRL_OP_GET_WINSIZE 100
-
-static int fd_get_window_size(int fd, Uint32 *width, Uint32 *height)
-{
-#ifdef TIOCGWINSZ
-    struct winsize ws;
-    if (ioctl(fd,TIOCGWINSZ,&ws) == 0) {
-	*width = (Uint32) ws.ws_col;
-	*height = (Uint32) ws.ws_row;
-	return 0;
-    }
-#endif
-    return -1;
-}
-
-static ErlDrvSSizeT fd_control(ErlDrvData drv_data,
-			       unsigned int command,
-			       char *buf, ErlDrvSizeT len,
-			       char **rbuf, ErlDrvSizeT rlen)
-{
-   struct driver_data *data = (struct driver_data *)drv_data;
-    char resbuff[2*sizeof(Uint32)];
-    switch (command) {
-    case FD_CTRL_OP_GET_WINSIZE:
-	{
-	    Uint32 w,h;
-	    if (fd_get_window_size(data->ifd,&w,&h))
-		return 0;
-	    memcpy(resbuff,&w,sizeof(Uint32));
-	    memcpy(resbuff+sizeof(Uint32),&h,sizeof(Uint32));
-	}
-	break;
-    default:
-	return 0;
-    }
-    if (rlen < 2*sizeof(Uint32)) {
-	*rbuf = driver_alloc(2*sizeof(Uint32));
-    }
-    memcpy(*rbuf,resbuff,2*sizeof(Uint32));
-    return 2*sizeof(Uint32);
-}
-
-static ErlDrvData fd_start(ErlDrvPort port_num, char* name,
-			   SysDriverOpts* opts)
-{
-    ErlDrvData res;
-
-    CHLD_STAT_LOCK;
-    if (opts->read_write & DO_READ) {
-	init_fd_data(opts->ifd, port_num);
-    }
-    if (opts->read_write & DO_WRITE) {
-	init_fd_data(opts->ofd, port_num);
-    }
-    res = set_driver_data(port_num, opts->ifd, opts->ofd,
-				      opts->packet_bytes,
-				      opts->read_write, 0, -1);
-    CHLD_STAT_UNLOCK;
-    return res;
-}
-
-static void clear_fd_data(int fd)
-{
-    if (fd_data[fd].sz > 0) {
-	erts_free(ERTS_ALC_T_FD_ENTRY_BUF, (void *) fd_data[fd].buf);
-	ASSERT(erts_smp_atomic_read_nob(&sys_misc_mem_sz) >= fd_data[fd].sz);
-	erts_smp_atomic_add_nob(&sys_misc_mem_sz, -1*fd_data[fd].sz);
-    }
-    fd_data[fd].buf = NULL;
-    fd_data[fd].sz = 0;
-    fd_data[fd].remain = 0;
-    fd_data[fd].cpos = NULL;
-    fd_data[fd].psz = 0;
-}
-
-static void nbio_stop_fd(ErlDrvPort prt, ErlDrvEvent ev)
-{
-    int *fd;
-    driver_select(prt,ev,DO_READ|DO_WRITE,0);
-    erl_drv_ose_event_fetch(ev, NULL, NULL, (void **)&fd);
-    clear_fd_data(*fd);
-    SET_BLOCKING(*fd);
-}
-
-static void fd_stop(ErlDrvData drv_data)  /* Does not close the fds */
-{
-   struct driver_data *data = (struct driver_data *)drv_data;
-
-   if (data->ofd != -1) {
-      if (data->ifd != data->ofd) { /* read and write */
-         nbio_stop_fd(data->port_num, data->input_event);
-         nbio_stop_fd(data->port_num, data->output_event);
-      }
-      else { /* write only */
-         nbio_stop_fd(data->port_num, data->output_event);
-      }
-   }
-   else { /* read only */
-      nbio_stop_fd(data->port_num, data->input_event);
-   }
-}
-
-
-static void erl_stop(ErlDrvData drv_data)
-{
-   struct driver_data *data = (struct driver_data *)drv_data;
-
-   CHLD_STAT_LOCK;
-   data->pid = -1;
-   CHLD_STAT_UNLOCK;
-
-   if (data->ofd != -1) {
-      if (data->ifd != data->ofd) { /* read and write */
-         nbio_stop_fd(data->port_num, data->input_event);
-         nbio_stop_fd(data->port_num, data->output_event);
-      }
-      else { /* write only */
-         nbio_stop_fd(data->port_num, data->output_event);
-      }
-   }
-   else { /* read only */
-      nbio_stop_fd(data->port_num, data->input_event);
-   }
-   close(data->ifd);
-   close(data->ofd);
-}
-
-/* The parameter e is a pointer to the driver_data structure
- * related to the fd to be used as output */
-static void output(ErlDrvData drv_data, char* buf, ErlDrvSizeT len)
-{
-    ErlDrvSizeT sz;
-    char lb[4];
-    char* lbp;
-    struct driver_data *data = (struct driver_data *)drv_data;
-
-    if (((data->packet_bytes == 2) &&
-             (len > 0xffff)) || (data->packet_bytes == 1 && len > 0xff)) {
-	driver_failure_posix(data->port_num, EINVAL);
-	return; /* -1; */
-    }
-    put_int32(len, lb);
-    lbp = lb + (4-(data->packet_bytes));
-
-    if ((sz = driver_sizeq(data->port_num)) > 0) {
-       if (data->packet_bytes != 0) {
-          driver_enq(data->port_num, lbp, data->packet_bytes);
-       }
-       driver_enq(data->port_num, buf, len);
-
-       if (sz + len + data->packet_bytes >= (1 << 13))
-	    set_busy_port(data->port_num, 1);
-    }
-    else {
-       char *pbbuf;
-       if (data->packet_bytes != 0) {
-          pbbuf = malloc(len + data->packet_bytes);
-          int i;
-          for (i = 0; i < data->packet_bytes; i++) {
-             *pbbuf++ = *lbp++;
-          }
-          strncpy(pbbuf, buf, len);
-          pbbuf -= data->packet_bytes;
-       }
-       driver_select(data->port_num, data->output_event,
-		      ERL_DRV_WRITE|ERL_DRV_USE, 1);
-       WRITE_AIO(data->ofd, 
-             (data->packet_bytes ? len+data->packet_bytes : len), 
-             (data->packet_bytes ? pbbuf : buf));
-       if (data->packet_bytes != 0) free(pbbuf);
-    }
-    return; /* 0; */
-}
-
-/* This function is being run when we in recieve
- * either a read of 0 bytes, or the attach signal from a dying
- * spawned load module */
-static int port_inp_failure(ErlDrvPort port_num, ErlDrvEvent ready_fd, int res)
-				/* Result: 0 (eof) or -1 (error) */
-{
-    int *fd;
-    SIGSELECT sig_no;
-    ASSERT(res <= 0);
-
-    erl_drv_ose_event_fetch(ready_fd,&sig_no, NULL, (void **)&fd);
-    /* As we need to handle two signals, we do this in two steps */
-    if (driver_data[*fd].alive) {
-       report_exit_status(driver_data[*fd].report_exit, 0); /* status? */
-    }
-    else {
-       driver_select(port_num,ready_fd,DO_READ|DO_WRITE,0);
-       clear_fd_data(*fd);
-       driver_report_exit(driver_data[*fd].port_num, driver_data[*fd].status);
-       /* As we do not really know if the spawn has crashed or exited nicely
-        * we do not check the result status of the following call.. FIXME
-        * can we handle this in a better way? */
-       ose_pm_uninstall_load_module(driver_data[*fd].install_handle);
-       driver_free(driver_data[*fd].install_handle);
-       driver_free((void *)driver_data[*fd].aiocb.aio_buf);
-
-       close(*fd);
-    }
-
-    return 0;
-}
-
-/* The parameter e is a pointer to the driver_data structure
- * related to the fd to be used as output.
- * ready_fd is the event that triggered this call to ready_input */
-static void ready_input(ErlDrvData drv_data, ErlDrvEvent ready_fd)
-{
-    int res;
-    Uint h;
-    char *buf;
-    union SIGNAL *sig;
-    struct driver_data *data = (struct driver_data *)drv_data;
-
-    sig = erl_drv_ose_get_signal(ready_fd);
-    ASSERT(sig);
-
-
-   while (sig) {
-      /* If we've recieved an attach signal, we need to handle
-       * it in port_inp_failure */
-      if (sig->sig_no == ERTS_SIGNAL_OSE_DRV_ATTACH) {
-         port_inp_failure(data->port_num, ready_fd, 0);
-       }
-       else {
-          res = sig->fm_read_reply.actual;
-          if (res == 0) {
-             port_inp_failure(data->port_num, ready_fd, res);
-             break;
-          }
-
-          if (data->packet_bytes == 0) {
-             if (res < 0) {
-                if ((errno != EINTR) && (errno != ERRNO_BLOCK)) {
-                   port_inp_failure(data->port_num, ready_fd, res);
-                }
-             }
-             else if (res == 0) {
-                /* read of 0 bytes, eof, otherside of pipe is assumed dead */
-                port_inp_failure(data->port_num, ready_fd, res);
-                break;
-             }
-             else {
-                buf = driver_alloc(res);
-                memcpy(buf, (void *)data->aiocb.aio_buf, res);
-                driver_select(data->port_num, data->output_event,
-                      ERL_DRV_WRITE|ERL_DRV_USE, 1);
-                driver_output(data->port_num, (char*) buf, res);
-                driver_free(buf);
-             }
-                /* clear the previous read */
-                memset(data->aiocb.aio_buf, 0, res);
-
-                /* issue a new read */
-                DISPATCH_AIO(sig);
-                aio_read(&data->aiocb);
-          }
-          else if (data->packet_bytes && fd_data[data->ifd].remain > 0) {
-             /* we've read a partial package, or a header */
-
-             if (res == fd_data[data->ifd].remain) { /* we are done! */
-                char *buf = data->aiocb.aio_buf;
-                int i;
-
-                /* do we have anything buffered? */
-                if (fd_data[data->ifd].buf != NULL) {
-                   memcpy(fd_data[data->ifd].buf + fd_data[data->ifd].sz,
-                          buf, res);
-                   buf = fd_data[data->ifd].buf;
-                }
-
-                fd_data[data->ifd].sz += res;
-                driver_output(data->port_num, buf, (fd_data[data->ifd].sz>0?fd_data[data->ifd].sz:res));
-                clear_fd_data(data->ifd);
-
-                /* clear the previous read */
-                memset(data->aiocb.aio_buf, 0, res);
-             
-                /* issue a new read */
-                DISPATCH_AIO(sig);
-                data->aiocb.aio_nbytes = data->packet_bytes;
-
-                if (data->aiocb.aio_buf == NULL) {
-                   port_inp_failure(data->port_num, ready_fd, -1);
-                }
-                aio_read(&data->aiocb);
-             }
-             else if(res < fd_data[data->ifd].remain) { /* received part of a package */
-                if (fd_data[data->ifd].sz == 0) {
-
-                   fd_data[data->ifd].sz += res;
-                   memcpy(fd_data[data->ifd].buf, data->aiocb.aio_buf, res);
-                   fd_data[data->ifd].remain -= res;
-                }
-                else {
-                   memcpy(fd_data[data->ifd].buf + fd_data[data->ifd].sz,
-                          data->aiocb.aio_buf, res);
-                   fd_data[data->ifd].sz += res;
-                   fd_data[data->ifd].remain -= res;
-                }
-                /* clear the previous read */
-                memset(data->aiocb.aio_buf, 0, res);
-
-                /* issue a new read */
-                DISPATCH_AIO(sig);
-                data->aiocb.aio_nbytes = fd_data[data->ifd].remain;
-
-                if (data->aiocb.aio_buf == NULL) {
-                    port_inp_failure(data->port_num, ready_fd, -1);
-                }
-                aio_read(&data->aiocb);
-             }
-          }
-          else if (data->packet_bytes && fd_data[data->ifd].remain == 0) { /* we've recieved a header */
-
-             /* analyze the header FIXME  */
-             switch (data->packet_bytes) {
-                case 1: h = get_int8(data->aiocb.aio_buf);  break;
-                case 2: h = get_int16(data->aiocb.aio_buf); break;
-                case 4: h = get_int32(data->aiocb.aio_buf); break;
-             }
-
-             fd_data[data->ifd].buf = erts_alloc_fnf(ERTS_ALC_T_FD_ENTRY_BUF, h + data->packet_bytes);
-             fd_data[data->ifd].remain = ((h + data->packet_bytes) - res);
-
-             /* clear the previous read */
-             memset(data->aiocb.aio_buf, 0, data->packet_bytes);
-
-             /* issue a new read */
-             DISPATCH_AIO(sig);
-             data->aiocb.aio_nbytes = h;
-
-             if (data->aiocb.aio_buf == NULL) {
-                port_inp_failure(data->port_num, ready_fd, -1);
-             }
-             aio_read(&data->aiocb);
-          }
-       }
-       sig = erl_drv_ose_get_signal(ready_fd);
-    }
-}
-
-
-/* The parameter e is a pointer to the driver_data structure
- * related to the fd to be used as output.
- * ready_fd is the event that triggered this call to ready_input */
-static void ready_output(ErlDrvData drv_data, ErlDrvEvent ready_fd)
-{
-   SysIOVec *iov;
-   int vlen;
-   int res;
-   union SIGNAL *sig;
-   struct driver_data *data = (struct driver_data *)drv_data;
-
-   sig = erl_drv_ose_get_signal(ready_fd);
-   ASSERT(sig);
-
-   while (sig != NULL) {
-      if (sig->fm_write_reply.actual <= 0) {
-         int status;
-
-         status = efs_status_to_errno(sig->fm_write_reply.status);
-         driver_select(data->port_num, ready_fd, ERL_DRV_WRITE, 0);
-         DISPATCH_AIO(sig);
-         FREE_AIO(sig->fm_write_reply.buffer);
-
-         driver_failure_posix(data->port_num, status);
-      }
-      else { /* written bytes > 0 */
-          iov = driver_peekq(data->port_num, &vlen);
-          if (vlen > 0) {
-             DISPATCH_AIO(sig);
-             FREE_AIO(sig->fm_write_reply.buffer);
-             res = driver_deq(data->port_num, iov[0].iov_len);
-             if (res > 0) { 
-                iov = driver_peekq(data->port_num, &vlen);
-                WRITE_AIO(data->ofd, iov[0].iov_len, iov[0].iov_base);
-             }
-         }
-         else if (vlen == 0) {
-            DISPATCH_AIO(sig);
-            FREE_AIO(sig->fm_write_reply.buffer);
-         }
-
-      }
-      sig = erl_drv_ose_get_signal(ready_fd);
-   }
-}
-
-static void stop_select(ErlDrvEvent ready_fd, void* _)
-{
-   int *fd;
-   erl_drv_ose_event_fetch(ready_fd, NULL, NULL, (void **)&fd);
-   erl_drv_ose_event_free(ready_fd);
-   close(*fd);
-}
-
-
-void erts_do_break_handling(void)
-{
-    struct termios temp_mode;
-    int saved = 0;
-
-    /*
-     * Most functions that do_break() calls are intentionally not thread safe;
-     * therefore, make sure that all threads but this one are blocked before
-     * proceeding!
-     */
-    erts_smp_thr_progress_block();
-
-    /* during break we revert to initial settings */
-    /* this is done differently for oldshell */
-    if (using_oldshell && !replace_intr) {
-      SET_BLOCKING(1);
-    }
-    else if (isatty(0)) {
-      tcgetattr(0,&temp_mode);
-      tcsetattr(0,TCSANOW,&initial_tty_mode);
-      saved = 1;
-    }
-
-    /* call the break handling function, reset the flag */
-    do_break();
-
-    fflush(stdout);
-
-    /* after break we go back to saved settings */
-    if (using_oldshell && !replace_intr) {
-      SET_NONBLOCKING(1);
-    }
-    else if (saved) {
-      tcsetattr(0,TCSANOW,&temp_mode);
-    }
-
-    erts_smp_thr_progress_unblock();
-}
-
-static pid_t
-getpid(void)
-{
-   return get_bid(current_process());
-}
-
-int getpagesize(void)
-{
-   return 1024;
-}
-
-
-/* Fills in the systems representation of the jam/beam process identifier.
-** The Pid is put in STRING representation in the supplied buffer,
-** no interpretatione of this should be done by the rest of the
-** emulator. The buffer should be at least 21 bytes long.
-*/
-void sys_get_pid(char *buffer, size_t buffer_size){
-    pid_t p = getpid();
-    /* Assume the pid is scalar and can rest in an unsigned long... */
-    erts_snprintf(buffer, buffer_size, "%lu",(unsigned long) p);
-}
-
-int
-erts_sys_putenv_raw(char *key, char *value) {
-    return erts_sys_putenv(key, value);
-}
-int
-erts_sys_putenv(char *key, char *value)
-{
-    int res;
-
-    erts_smp_rwmtx_rwlock(&environ_rwmtx);
-    res = set_env(get_bid(current_process()), key,
-		  value);
-    erts_smp_rwmtx_rwunlock(&environ_rwmtx);
-    return res;
-}
-
-
-int
-erts_sys_unsetenv(char *key)
-{
-    int res;
-
-    erts_smp_rwmtx_rwlock(&environ_rwmtx);
-    res = set_env(get_bid(current_process()),key,NULL);
-    erts_smp_rwmtx_rwunlock(&environ_rwmtx);
-
-    return res;
-}
-
-int
-erts_sys_getenv__(char *key, char *value, size_t *size)
-{
-    int res;
-    char *orig_value = get_env(get_bid(current_process()), key);
-    if (!orig_value)
-	res = -1;
-    else {
-	size_t len = sys_strlen(orig_value);
-	if (len >= *size) {
-	    *size = len + 1;
-	    res = 1;
-	}
-	else {
-	    *size = len;
-	    sys_memcpy((void *) value, (void *) orig_value, len+1);
-	    res = 0;
-	}
-	free_buf((union SIGNAL **)&orig_value);
-    }
-    return res;
-}
-
-int
-erts_sys_getenv_raw(char *key, char *value, size_t *size) {
-    return erts_sys_getenv(key, value, size);
-}
-
-/*
- * erts_sys_getenv
- * returns:
- *  -1, if environment key is not set with a value
- *   0, if environment key is set and value fits into buffer res
- *   1, if environment key is set but does not fit into buffer res
- *      res is set with the needed buffer res value
- */
-
-int
-erts_sys_getenv(char *key, char *value, size_t *size)
-{
-    int res;
-    erts_smp_rwmtx_rlock(&environ_rwmtx);
-    res = erts_sys_getenv__(key, value, size);
-    erts_smp_rwmtx_runlock(&environ_rwmtx);
-    return res;
-}
-
-void
-sys_init_io(void)
-{
-    fd_data = (struct fd_data *)
-	erts_alloc(ERTS_ALC_T_FD_TAB, max_files * sizeof(struct fd_data));
-    erts_smp_atomic_add_nob(&sys_misc_mem_sz,
-			    max_files * sizeof(struct fd_data));
-}
-
-extern const char pre_loaded_code[];
-extern Preload pre_loaded[];
-
-void erts_sys_alloc_init(void)
-{
-}
-
-void *erts_sys_alloc(ErtsAlcType_t t, void *x, Uint sz)
-{
-    void *res = malloc((size_t) sz);
-#if HAVE_ERTS_MSEG
-    if (!res) {
-	erts_mseg_clear_cache();
-	return malloc((size_t) sz);
-    }
-#endif
-    return res;
-}
-
-void *erts_sys_realloc(ErtsAlcType_t t, void *x, void *p, Uint sz)
-{
-    void *res = realloc(p, (size_t) sz);
-#if HAVE_ERTS_MSEG
-    if (!res) {
-	erts_mseg_clear_cache();
-	return realloc(p, (size_t) sz);
-    }
-#endif
-    return res;
-}
-
-void erts_sys_free(ErtsAlcType_t t, void *x, void *p)
-{
-    free(p);
-}
-
-/* Return a pointer to a vector of names of preloaded modules */
-
-Preload*
-sys_preloaded(void)
-{
-    return pre_loaded;
-}
-
-/* Return a pointer to preloaded code for module "module" */
-unsigned char*
-sys_preload_begin(Preload* p)
-{
-    return p->code;
-}
-
-/* Clean up if allocated */
-void sys_preload_end(Preload* p)
-{
-    /* Nothing */
-}
-
-/* Read a key from console (?) */
-
-int sys_get_key(fd)
-int fd;
-{
-    int c;
-    unsigned char rbuf[64];
-
-    fflush(stdout);		/* Flush query ??? */
-
-    if ((c = read(fd,rbuf,64)) <= 0) {
-      return c;
-    }
-
-    return rbuf[0];
-}
-
-
-#ifdef DEBUG
-
-extern int erts_initialized;
-void
-erl_assert_error(const char* expr, const char* func,
-		 const char* file, int line)
-{
-    fflush(stdout);
-    fprintf(stderr, "%s:%d:%s() Assertion failed: %s\n",
-	    file, line, func, expr);
-    fflush(stderr);
-    ramlog_printf("%s:%d:%s() Assertion failed: %s\n",
-		  file, line, func, expr);
-
-    abort();
-}
-
-void
-erl_debug(char* fmt, ...)
-{
-    char sbuf[1024];		/* Temporary buffer. */
-    va_list va;
-
-    if (debug_log) {
-	va_start(va, fmt);
-	vsprintf(sbuf, fmt, va);
-	va_end(va);
-	fprintf(stderr, "%s", sbuf);
-    }
-}
-
-#endif /* DEBUG */
-
-static ERTS_INLINE void
-report_exit_status(ErtsSysReportExit *rep, int status)
-{
-   if (rep->ifd >= 0) {
-      driver_data[rep->ifd].alive = 0;
-      driver_data[rep->ifd].status = status;
-   }
-   if (rep->ofd >= 0) {
-      driver_data[rep->ofd].alive = 0;
-      driver_data[rep->ofd].status = status;
-   }
-
-   erts_free(ERTS_ALC_T_PRT_REP_EXIT, rep);
-}
-
-#define ERTS_REPORT_EXIT_STATUS report_exit_status
-
-/*
- * Called from schedule() when it runs out of runnable processes,
- * or when Erlang code has performed INPUT_REDUCTIONS reduction
- * steps. runnable == 0 iff there are no runnable Erlang processes.
- */
-void
-erl_sys_schedule(int runnable)
-{
-    ASSERT(get_fsem(current_process()) == 0);
-#ifdef ERTS_SMP
-    ASSERT(erts_get_scheduler_data()->no == 1);
-    ERTS_CHK_IO(!runnable);
-#else
-    ERTS_CHK_IO( 1 );
-#endif
-    ASSERT(get_fsem(current_process()) == 0);
-    ERTS_SMP_LC_ASSERT(!erts_thr_progress_is_blocking());
-}
-
-
-#ifdef ERTS_SMP
-
-void
-erts_sys_main_thread(void)
-{
-    erts_thread_disable_fpe();
-
-    /* Become signal receiver thread... */
-#ifdef ERTS_ENABLE_LOCK_CHECK
-    erts_lc_set_thread_name("signal_receiver");
-#endif
-
-    while (1) {
-       static const SIGSELECT sigsel[] = {0};
-       union SIGNAL *msg = receive(sigsel);
-
-       fprintf(stderr,"Main thread got message %d from 0x%x!!\r\n",
-               msg->sig_no, sender(&msg));
-       free_buf(&msg);
-    }
-}
-
-#endif /* ERTS_SMP */
-
-void
-erl_sys_args(int* argc, char** argv)
-{
-    int i, j;
-
-    erts_smp_rwmtx_init(&environ_rwmtx, "environ");
-
-    init_check_io();
-
-    /* Handled arguments have been marked with NULL. Slide arguments
-       not handled towards the beginning of argv. */
-    for (i = 0, j = 0; i < *argc; i++) {
-	if (argv[i])
-	    argv[j++] = argv[i];
-    }
-    *argc = j;
-
-}
diff --git a/erts/emulator/sys/ose/sys_float.c b/erts/emulator/sys/ose/sys_float.c
deleted file mode 100644
index 3d9abc6bd1..0000000000
--- a/erts/emulator/sys/ose/sys_float.c
+++ /dev/null
@@ -1,845 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2001-2013. 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%
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "sys.h"
-#include "global.h"
-#include "erl_process.h"
-
-
-#ifdef NO_FPE_SIGNALS
-
-void
-erts_sys_init_float(void)
-{
-# ifdef SIGFPE
-    sys_sigset(SIGFPE, SIG_IGN); /* Ignore so we can test for NaN and Inf */
-# endif
-}
-
-#else  /* !NO_FPE_SIGNALS */
-
-#ifdef ERTS_SMP
-static erts_tsd_key_t fpe_key;
-
-/* once-only initialisation early in the main thread (via erts_sys_init_float()) */
-static void erts_init_fp_exception(void)
-{
-    /* XXX: the wrappers prevent using a pthread destructor to
-       deallocate the key's value; so when/where do we do that? */
-    erts_tsd_key_create(&fpe_key);
-}
-
-void erts_thread_init_fp_exception(void)
-{
-    unsigned long *fpe = erts_alloc(ERTS_ALC_T_FP_EXCEPTION, sizeof(*fpe));
-    *fpe = 0L;
-    erts_tsd_set(fpe_key, fpe);
-}
-
-static ERTS_INLINE volatile unsigned long *erts_thread_get_fp_exception(void)
-{
-    return (volatile unsigned long*)erts_tsd_get(fpe_key);
-}
-#else /* !SMP */
-#define erts_init_fp_exception()	/*empty*/
-static volatile unsigned long fp_exception;
-#define erts_thread_get_fp_exception()	(&fp_exception)
-#endif /* SMP */
-
-volatile unsigned long *erts_get_current_fp_exception(void)
-{
-    Process *c_p;
-
-    c_p = erts_get_current_process();
-    if (c_p)
-	return &c_p->fp_exception;
-    return erts_thread_get_fp_exception();
-}
-
-static void set_current_fp_exception(unsigned long pc)
-{
-    volatile unsigned long *fpexnp = erts_get_current_fp_exception();
-    ASSERT(fpexnp != NULL);
-    *fpexnp = pc;
-}
-
-void erts_fp_check_init_error(volatile unsigned long *fpexnp)
-{
-    char buf[64];
-    snprintf(buf, sizeof buf, "ERTS_FP_CHECK_INIT at %p: detected unhandled FPE at %p\r\n",
-	     __builtin_return_address(0), (void*)*fpexnp);
-    if (write(2, buf, strlen(buf)) <= 0)
-	erl_exit(ERTS_ABORT_EXIT, "%s", buf);
-    *fpexnp = 0;
-#if defined(__i386__) || defined(__x86_64__)
-    erts_restore_fpu();
-#endif
-}
-
-/* Is there no standard identifier for Darwin/MacOSX ? */
-#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
-#define __DARWIN__ 1
-#endif
-
-#if (defined(__i386__) || defined(__x86_64__)) && defined(__GNUC__)
-
-static void unmask_x87(void)
-{
-    unsigned short cw;
-
-    __asm__ __volatile__("fstcw %0" : "=m"(cw));
-    cw &= ~(0x01|0x04|0x08);   /* unmask IM, ZM, OM */
-    __asm__ __volatile__("fldcw %0" : : "m"(cw));
-}
-
-/* mask x87 FPE, return true if the previous state was unmasked */
-static int mask_x87(void)
-{
-    unsigned short cw;
-    int unmasked;
-
-    __asm__ __volatile__("fstcw %0" : "=m"(cw));
-    unmasked = (cw & (0x01|0x04|0x08)) == 0;
-    /* or just set cw = 0x37f */
-    cw |= (0x01|0x04|0x08); /* mask IM, ZM, OM */
-    __asm__ __volatile__("fldcw %0" : : "m"(cw));
-    return unmasked;
-}
-
-static void unmask_sse2(void)
-{
-    unsigned int mxcsr;
-
-    __asm__ __volatile__("stmxcsr %0" : "=m"(mxcsr));
-    mxcsr &= ~(0x003F|0x0680); /* clear exn flags, unmask OM, ZM, IM (not PM, UM, DM) */
-    __asm__ __volatile__("ldmxcsr %0" : : "m"(mxcsr));
-}
-
-/* mask SSE2 FPE, return true if the previous state was unmasked */
-static int mask_sse2(void)
-{
-    unsigned int mxcsr;
-    int unmasked;
-
-    __asm__ __volatile__("stmxcsr %0" : "=m"(mxcsr));
-    unmasked = (mxcsr & 0x0680) == 0;
-    /* or just set mxcsr = 0x1f80 */
-    mxcsr &= ~0x003F; /* clear exn flags */
-    mxcsr |=  0x0680; /* mask OM, ZM, IM (not PM, UM, DM) */
-    __asm__ __volatile__("ldmxcsr %0" : : "m"(mxcsr));
-    return unmasked;
-}
-
-#if defined(__x86_64__)
-
-static inline int cpu_has_sse2(void) { return 1; }
-
-#else /* !__x86_64__ */
-
-/*
- * Check if an x86-32 processor has SSE2.
- */
-static unsigned int xor_eflags(unsigned int mask)
-{
-    unsigned int eax, edx;
-
-    eax = mask;			/* eax = mask */
-    __asm__("pushfl\n\t"
-	    "popl %0\n\t"	/* edx = original EFLAGS */
-	    "xorl %0, %1\n\t"	/* eax = mask ^ EFLAGS */
-	    "pushl %1\n\t"
-	    "popfl\n\t"		/* new EFLAGS = mask ^ original EFLAGS */
-	    "pushfl\n\t"
-	    "popl %1\n\t"	/* eax = new EFLAGS */
-	    "xorl %0, %1\n\t"	/* eax = new EFLAGS ^ old EFLAGS */
-	    "pushl %0\n\t"
-	    "popfl"		/* restore original EFLAGS */
-	    : "=d"(edx), "=a"(eax)
-	    : "1"(eax));
-    return eax;
-}
-
-static __inline__ unsigned int cpuid_eax(unsigned int op)
-{
-    unsigned int eax, save_ebx;
-
-    /* In PIC mode i386 reserves EBX. So we must save
-       and restore it ourselves to not upset gcc. */
-    __asm__(
-	"movl %%ebx, %1\n\t"
-	"cpuid\n\t"
-	"movl %1, %%ebx"
-	: "=a"(eax), "=m"(save_ebx)
-	: "0"(op)
-	: "cx", "dx");
-    return eax;
-}
-
-static __inline__ unsigned int cpuid_edx(unsigned int op)
-{
-    unsigned int eax, edx, save_ebx;
-
-    /* In PIC mode i386 reserves EBX. So we must save
-       and restore it ourselves to not upset gcc. */
-    __asm__(
-	"movl %%ebx, %2\n\t"
-	"cpuid\n\t"
-	"movl %2, %%ebx"
-	: "=a"(eax), "=d"(edx), "=m"(save_ebx)
-	: "0"(op)
-	: "cx");
-    return edx;
-}
-
-/* The AC bit, bit #18, is a new bit introduced in the EFLAGS
- * register on the Intel486 processor to generate alignment
- * faults. This bit cannot be set on the Intel386 processor.
- */
-static __inline__ int is_386(void)
-{
-    return ((xor_eflags(1<<18) >> 18) & 1) == 0;
-}
-
-/* Newer x86 processors have a CPUID instruction, as indicated by
- * the ID bit (#21) in EFLAGS being modifiable.
- */
-static __inline__ int has_CPUID(void)
-{
-    return (xor_eflags(1<<21) >> 21) & 1;
-}
-
-static int cpu_has_sse2(void)
-{
-    unsigned int maxlev, features;
-    static int has_sse2 = -1;
-
-    if (has_sse2 >= 0)
-	return has_sse2;
-    has_sse2 = 0;
-
-    if (is_386())
-	return 0;
-    if (!has_CPUID())
-	return 0;
-    maxlev = cpuid_eax(0);
-    /* Intel A-step Pentium had a preliminary version of CPUID.
-       It also didn't have SSE2. */
-    if ((maxlev & 0xFFFFFF00) == 0x0500)
-	return 0;
-    /* If max level is zero then CPUID cannot report any features. */
-    if (maxlev == 0)
-	return 0;
-    features = cpuid_edx(1);
-    has_sse2 = (features & (1 << 26)) != 0;
-
-    return has_sse2;
-}
-#endif /* !__x86_64__ */
-
-static void unmask_fpe(void)
-{
-    __asm__ __volatile__("fnclex");
-    unmask_x87();
-    if (cpu_has_sse2())
-	unmask_sse2();
-}
-
-static void unmask_fpe_conditional(int unmasked)
-{
-    if (unmasked)
-	unmask_fpe();
-}
-
-/* mask x86 FPE, return true if the previous state was unmasked */
-static int mask_fpe(void)
-{
-    int unmasked;
-
-    unmasked = mask_x87();
-    if (cpu_has_sse2())
-	unmasked |= mask_sse2();
-    return unmasked;
-}
-
-void erts_restore_fpu(void)
-{
-    __asm__ __volatile__("fninit");
-    unmask_x87();
-    if (cpu_has_sse2())
-	unmask_sse2();
-}
-
-#elif defined(__sparc__) && defined(__linux__)
-
-#if defined(__arch64__)
-#define LDX "ldx"
-#define STX "stx"
-#else
-#define LDX "ld"
-#define STX "st"
-#endif
-
-static void unmask_fpe(void)
-{
-    unsigned long fsr;
-
-    __asm__(STX " %%fsr, %0" : "=m"(fsr));
-    fsr &= ~(0x1FUL << 23);	/* clear FSR[TEM] field */
-    fsr |= (0x1AUL << 23);	/* enable NV, OF, DZ exceptions */
-    __asm__ __volatile__(LDX " %0, %%fsr" : : "m"(fsr));
-}
-
-static void unmask_fpe_conditional(int unmasked)
-{
-    if (unmasked)
-	unmask_fpe();
-}
-
-/* mask SPARC FPE, return true if the previous state was unmasked */
-static int mask_fpe(void)
-{
-    unsigned long fsr;
-    int unmasked;
-
-    __asm__(STX " %%fsr, %0" : "=m"(fsr));
-    unmasked = ((fsr >> 23) & 0x1A) == 0x1A;
-    fsr &= ~(0x1FUL << 23);	/* clear FSR[TEM] field */
-    __asm__ __volatile__(LDX " %0, %%fsr" : : "m"(fsr));
-    return unmasked;
-}
-
-#elif (defined(__powerpc__) && defined(__linux__)) || (defined(__ppc__) && defined(__DARWIN__))
-
-#if defined(__linux__)
-#include <sys/prctl.h>
-
-static void set_fpexc_precise(void)
-{
-    if (prctl(PR_SET_FPEXC, PR_FP_EXC_PRECISE) < 0) {
-	perror("PR_SET_FPEXC");
-	exit(1);
-    }
-}
-
-#elif defined(__DARWIN__)
-
-#include <mach/mach.h>
-#include <pthread.h>
-
-/*
- * FE0 FE1	MSR bits
- *  0   0	floating-point exceptions disabled
- *  0   1	floating-point imprecise nonrecoverable
- *  1   0	floating-point imprecise recoverable
- *  1   1	floating-point precise mode
- *
- * Apparently:
- * - Darwin 5.5 (MacOS X <= 10.1) starts with FE0 == FE1 == 0,
- *   and resets FE0 and FE1 to 0 after each SIGFPE.
- * - Darwin 6.0 (MacOS X 10.2) starts with FE0 == FE1 == 1,
- *   and does not reset FE0 or FE1 after a SIGFPE.
- */
-#define FE0_MASK	(1<<11)
-#define FE1_MASK	(1<<8)
-
-/* a thread cannot get or set its own MSR bits */
-static void *fpu_fpe_enable(void *arg)
-{
-    thread_t t = *(thread_t*)arg;
-    struct ppc_thread_state state;
-    unsigned int state_size = PPC_THREAD_STATE_COUNT;
-
-    if (thread_get_state(t, PPC_THREAD_STATE, (natural_t*)&state, &state_size) != KERN_SUCCESS) {
-	perror("thread_get_state");
-	exit(1);
-    }
-    if ((state.srr1 & (FE1_MASK|FE0_MASK)) != (FE1_MASK|FE0_MASK)) {
-#if 1
-	/* This would also have to be performed in the SIGFPE handler
-	   to work around the MSR reset older Darwin releases do. */
-	state.srr1 |= (FE1_MASK|FE0_MASK);
-	thread_set_state(t, PPC_THREAD_STATE, (natural_t*)&state, state_size);
-#else
-	fprintf(stderr, "srr1 == 0x%08x, your Darwin is too old\n", state.srr1);
-	exit(1);
-#endif
-    }
-    return NULL; /* Ok, we appear to be on Darwin 6.0 or later */
-}
-
-static void set_fpexc_precise(void)
-{
-    thread_t self = mach_thread_self();
-    pthread_t enabler;
-
-    if (pthread_create(&enabler, NULL, fpu_fpe_enable, &self)) {
-	perror("pthread_create");
-    } else if (pthread_join(enabler, NULL)) {
-	perror("pthread_join");
-    }
-}
-
-#endif
-
-static void set_fpscr(unsigned int fpscr)
-{
-    union {
-	double d;
-	unsigned int fpscr[2];
-    } u;
-
-    u.fpscr[0] = 0xFFF80000;
-    u.fpscr[1] = fpscr;
-    __asm__ __volatile__("mtfsf 255,%0" : : "f"(u.d));
-}
-
-static unsigned int get_fpscr(void)
-{
-    union {
-	double d;
-	unsigned int fpscr[2];
-    } u;
-
-    __asm__("mffs %0" : "=f"(u.d));
-    return u.fpscr[1];
-}
-
-static void unmask_fpe(void)
-{
-    set_fpexc_precise();
-    set_fpscr(0x80|0x40|0x10);	/* VE, OE, ZE; not UE or XE */
-}
-
-static void unmask_fpe_conditional(int unmasked)
-{
-    if (unmasked)
-	unmask_fpe();
-}
-
-/* mask PowerPC FPE, return true if the previous state was unmasked */
-static int mask_fpe(void)
-{
-    int unmasked;
-
-    unmasked = (get_fpscr() & (0x80|0x40|0x10)) == (0x80|0x40|0x10);
-    set_fpscr(0x00);
-    return unmasked;
-}
-
-#else
-
-static void unmask_fpe(void)
-{
-    fpsetmask(FP_X_INV | FP_X_OFL | FP_X_DZ);
-}
-
-static void unmask_fpe_conditional(int unmasked)
-{
-    if (unmasked)
-	unmask_fpe();
-}
-
-/* mask IEEE FPE, return true if previous state was unmasked */
-static int mask_fpe(void)
-{
-    const fp_except unmasked_mask = FP_X_INV | FP_X_OFL | FP_X_DZ;
-    fp_except old_mask;
-
-    old_mask = fpsetmask(0);
-    return (old_mask & unmasked_mask) == unmasked_mask;
-}
-
-#endif
-
-#if (defined(__linux__) && (defined(__i386__) || defined(__x86_64__) || defined(__sparc__) || defined(__powerpc__))) || (defined(__DARWIN__) && (defined(__i386__) || defined(__x86_64__) || defined(__ppc__))) || (defined(__FreeBSD__) && (defined(__x86_64__) || defined(__i386__))) || ((defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__x86_64__)) || (defined(__sun__) && defined(__x86_64__))
-
-#if defined(__linux__) && defined(__i386__)
-#if !defined(X86_FXSR_MAGIC)
-#define X86_FXSR_MAGIC 0x0000
-#endif
-#elif defined(__FreeBSD__) && defined(__x86_64__)
-#include <sys/types.h>
-#include <machine/fpu.h>
-#elif defined(__FreeBSD__) && defined(__i386__)
-#include <sys/types.h>
-#include <machine/npx.h>
-#elif defined(__DARWIN__)
-#include <machine/signal.h>
-#elif defined(__OpenBSD__) && defined(__x86_64__)
-#include <sys/types.h>
-#include <machine/fpu.h>
-#endif
-#if !(defined(__OpenBSD__) && defined(__x86_64__))
-#include <ucontext.h>
-#endif
-#include <string.h>
-
-#if defined(__linux__) && defined(__x86_64__)
-#define mc_pc(mc)	((mc)->gregs[REG_RIP])
-#elif defined(__linux__) && defined(__i386__)
-#define mc_pc(mc)	((mc)->gregs[REG_EIP])
-#elif defined(__DARWIN__) && defined(__i386__)
-#ifdef DARWIN_MODERN_MCONTEXT
-#define mc_pc(mc)	((mc)->__ss.__eip)
-#else
-#define mc_pc(mc)	((mc)->ss.eip)
-#endif
-#elif defined(__DARWIN__) && defined(__x86_64__)
-#ifdef DARWIN_MODERN_MCONTEXT
-#define mc_pc(mc)	((mc)->__ss.__rip)
-#else
-#define mc_pc(mc)	((mc)->ss.rip)
-#endif
-#elif defined(__FreeBSD__) && defined(__x86_64__)
-#define mc_pc(mc)	((mc)->mc_rip)
-#elif defined(__FreeBSD__) && defined(__i386__)
-#define mc_pc(mc)	((mc)->mc_eip)
-#elif defined(__NetBSD__) && defined(__x86_64__)
-#define mc_pc(mc)	((mc)->__gregs[_REG_RIP])
-#elif defined(__NetBSD__) && defined(__i386__)
-#define mc_pc(mc)	((mc)->__gregs[_REG_EIP])
-#elif defined(__OpenBSD__) && defined(__x86_64__)
-#define mc_pc(mc)	((mc)->sc_rip)
-#elif defined(__sun__) && defined(__x86_64__)
-#define mc_pc(mc)	((mc)->gregs[REG_RIP])
-#endif
-
-static void fpe_sig_action(int sig, siginfo_t *si, void *puc)
-{
-    ucontext_t *uc = puc;
-    unsigned long pc;
-
-#if defined(__linux__)
-#if defined(__x86_64__)
-    mcontext_t *mc = &uc->uc_mcontext;
-    fpregset_t fpstate = mc->fpregs;
-    pc = mc_pc(mc);
-    /* A failed SSE2 instruction will restart. To avoid
-       looping we mask SSE2 exceptions now and unmask them
-       again later in erts_check_fpe()/erts_restore_fpu().
-       On RISCs we update PC to skip the failed instruction,
-       but the ever increasing complexity of the x86 instruction
-       set encoding makes that a poor solution here. */
-    fpstate->mxcsr = 0x1F80;
-    fpstate->swd &= ~0xFF;
-#elif defined(__i386__)
-    mcontext_t *mc = &uc->uc_mcontext;
-    fpregset_t fpstate = mc->fpregs;
-    pc = mc_pc(mc);
-    if ((fpstate->status >> 16) == X86_FXSR_MAGIC)
-	((struct _fpstate*)fpstate)->mxcsr = 0x1F80;
-    fpstate->sw &= ~0xFF;
-#elif defined(__sparc__) && defined(__arch64__)
-    /* on SPARC the 3rd parameter points to a sigcontext not a ucontext */
-    struct sigcontext *sc = (struct sigcontext*)puc;
-    pc = sc->sigc_regs.tpc;
-    sc->sigc_regs.tpc = sc->sigc_regs.tnpc;
-    sc->sigc_regs.tnpc += 4;
-#elif defined(__sparc__)
-    /* on SPARC the 3rd parameter points to a sigcontext not a ucontext */
-    struct sigcontext *sc = (struct sigcontext*)puc;
-    pc = sc->si_regs.pc;
-    sc->si_regs.pc = sc->si_regs.npc;
-    sc->si_regs.npc = (unsigned long)sc->si_regs.npc + 4;
-#elif defined(__powerpc__)
-#if defined(__powerpc64__)
-    mcontext_t *mc = &uc->uc_mcontext;
-    unsigned long *regs = &mc->gp_regs[0];
-#else
-    mcontext_t *mc = uc->uc_mcontext.uc_regs;
-    unsigned long *regs = &mc->gregs[0];
-#endif
-    pc = regs[PT_NIP];
-    regs[PT_NIP] += 4;
-    regs[PT_FPSCR] = 0x80|0x40|0x10;	/* VE, OE, ZE; not UE or XE */
-#endif
-#elif defined(__DARWIN__) && (defined(__i386__) || defined(__x86_64__))
-#ifdef DARWIN_MODERN_MCONTEXT
-    mcontext_t mc = uc->uc_mcontext;
-    pc = mc_pc(mc);
-    mc->__fs.__fpu_mxcsr = 0x1F80;
-    *(unsigned short *)&mc->__fs.__fpu_fsw &= ~0xFF;
-#else
-    mcontext_t mc = uc->uc_mcontext;
-    pc = mc_pc(mc);
-    mc->fs.fpu_mxcsr = 0x1F80;
-    *(unsigned short *)&mc->fs.fpu_fsw &= ~0xFF;
-#endif /* DARWIN_MODERN_MCONTEXT */
-#elif defined(__DARWIN__) && defined(__ppc__)
-    mcontext_t mc = uc->uc_mcontext;
-    pc = mc->ss.srr0;
-    mc->ss.srr0 += 4;
-    mc->fs.fpscr = 0x80|0x40|0x10;
-#elif defined(__FreeBSD__) && defined(__x86_64__)
-    mcontext_t *mc = &uc->uc_mcontext;
-    struct savefpu *savefpu = (struct savefpu*)&mc->mc_fpstate;
-    struct envxmm *envxmm = &savefpu->sv_env;
-    pc = mc_pc(mc);
-    envxmm->en_mxcsr = 0x1F80;
-    envxmm->en_sw &= ~0xFF;
-#elif defined(__FreeBSD__) && defined(__i386__)
-    mcontext_t *mc = &uc->uc_mcontext;
-    union savefpu *savefpu = (union savefpu*)&mc->mc_fpstate;
-    pc = mc_pc(mc);
-    if (mc->mc_fpformat == _MC_FPFMT_XMM) {
-	struct envxmm *envxmm = &savefpu->sv_xmm.sv_env;
-	envxmm->en_mxcsr = 0x1F80;
-	envxmm->en_sw &= ~0xFF;
-    } else {
-	struct env87 *env87 = &savefpu->sv_87.sv_env;
-	env87->en_sw &= ~0xFF;
-    }
-#elif defined(__NetBSD__) && defined(__x86_64__)
-    mcontext_t *mc = &uc->uc_mcontext;
-    struct fxsave64 *fxsave = (struct fxsave64 *)&mc->__fpregs;
-    pc = mc_pc(mc);
-    fxsave->fx_mxcsr = 0x1F80;
-    fxsave->fx_fsw &= ~0xFF;
-#elif defined(__NetBSD__) && defined(__i386__)
-    mcontext_t *mc = &uc->uc_mcontext;
-    pc = mc_pc(mc);
-    if (uc->uc_flags & _UC_FXSAVE) {
-	struct envxmm *envxmm = (struct envxmm *)&mc->__fpregs;
-	envxmm->en_mxcsr = 0x1F80;
-	envxmm->en_sw &= ~0xFF;
-    } else {
-	struct env87 *env87 = (struct env87 *)&mc->__fpregs;
-	env87->en_sw &= ~0xFF;
-    }
-#elif defined(__OpenBSD__) && defined(__x86_64__)
-    struct fxsave64 *fxsave = uc->sc_fpstate;
-    pc = mc_pc(uc);
-    fxsave->fx_mxcsr = 0x1F80;
-    fxsave->fx_fsw &= ~0xFF;
-#elif defined(__sun__) && defined(__x86_64__)
-    mcontext_t *mc = &uc->uc_mcontext;
-    struct fpchip_state *fpstate = &mc->fpregs.fp_reg_set.fpchip_state;
-    pc = mc_pc(mc);
-    fpstate->mxcsr = 0x1F80;
-    fpstate->sw &= ~0xFF;
-#endif
-#if 0
-    {
-	char buf[64];
-	snprintf(buf, sizeof buf, "%s: FPE at %p\r\n", __FUNCTION__, (void*)pc);
-	write(2, buf, strlen(buf));
-    }
-#endif
-    set_current_fp_exception(pc);
-}
-
-static void erts_thread_catch_fp_exceptions(void)
-{
-    struct sigaction act;
-    memset(&act, 0, sizeof act);
-    act.sa_sigaction = fpe_sig_action;
-    act.sa_flags = SA_SIGINFO;
-    sigaction(SIGFPE, &act, NULL);
-    unmask_fpe();
-}
-
-#else  /* !((__linux__ && (__i386__ || __x86_64__ || __powerpc__)) || (__DARWIN__ && (__i386__ || __x86_64__ || __ppc__))) */
-
-static void fpe_sig_handler(int sig)
-{
-    set_current_fp_exception(1); /* XXX: convert to sigaction so we can get the trap PC */
-}
-
-static void erts_thread_catch_fp_exceptions(void)
-{
-    sys_sigset(SIGFPE, fpe_sig_handler);
-    unmask_fpe();
-}
-
-#endif /* (__linux__ && (__i386__ || __x86_64__ || __powerpc__)) || (__DARWIN__ && (__i386__ || __x86_64__ || __ppc__))) */
-
-/* once-only initialisation early in the main thread */
-void erts_sys_init_float(void)
-{
-    erts_init_fp_exception();
-    erts_thread_catch_fp_exceptions();
-    erts_printf_block_fpe = erts_sys_block_fpe;
-    erts_printf_unblock_fpe = erts_sys_unblock_fpe;
-}
-
-#endif /* NO_FPE_SIGNALS */
-
-void erts_thread_init_float(void)
-{
-#ifdef ERTS_SMP
-    /* This allows Erlang schedulers to leave Erlang-process context
-       and still have working FP exceptions. XXX: is this needed? */
-    erts_thread_init_fp_exception();
-#endif
-
-#ifndef NO_FPE_SIGNALS
-    /* NOTE:
-     *  erts_thread_disable_fpe() is called in all threads at
-     *  creation. We at least need to call unmask_fpe()
-     */
-#if defined(__DARWIN__) || defined(__FreeBSD__)
-    /* Darwin (7.9.0) does not appear to propagate FP exception settings
-       to a new thread from its parent. So if we want FP exceptions, we
-       must manually re-enable them in each new thread.
-       FreeBSD 6.1 appears to suffer from a similar issue. */
-    erts_thread_catch_fp_exceptions();
-#else
-    unmask_fpe();
-#endif
-
-#endif
-}
-
-void erts_thread_disable_fpe(void)
-{
-#if !defined(NO_FPE_SIGNALS)
-    (void)mask_fpe();
-#endif
-}
-
-#if !defined(NO_FPE_SIGNALS)
-int erts_sys_block_fpe(void)
-{
-    return mask_fpe();
-}
-
-void erts_sys_unblock_fpe(int unmasked)
-{
-    unmask_fpe_conditional(unmasked);
-}
-#endif
-
-/* The following check is incorporated from the Vee machine */
-
-#define ISDIGIT(d) ((d) >= '0' && (d) <= '9')
-
-/*
- ** Convert a double to ascii format 0.dddde[+|-]ddd
- ** return number of characters converted or -1 if error.
- **
- ** These two functions should maybe use localeconv() to pick up
- ** the current radix character, but since it is uncertain how
- ** expensive such a system call is, and since no-one has heard
- ** of other radix characters than '.' and ',' an ad-hoc
- ** low execution time solution is used instead.
- */
-
-int
-sys_double_to_chars_ext(double fp, char *buffer, size_t buffer_size, size_t decimals)
-{
-    char *s = buffer;
-
-    if (erts_snprintf(buffer, buffer_size, "%.*e", decimals, fp) >= buffer_size)
-        return -1;
-    /* Search upto decimal point */
-    if (*s == '+' || *s == '-') s++;
-    while (ISDIGIT(*s)) s++;
-    if (*s == ',') *s++ = '.'; /* Replace ',' with '.' */
-    /* Scan to end of string */
-    while (*s) s++;
-    return s-buffer; /* i.e strlen(buffer) */
-}
-
-/* Float conversion */
-
-int
-sys_chars_to_double(char* buf, double* fp)
-{
-#ifndef NO_FPE_SIGNALS
-    volatile unsigned long *fpexnp = erts_get_current_fp_exception();
-#endif
-    char *s = buf, *t, *dp;
-
-    /* Robert says that something like this is what he really wanted:
-     * (The [.,] radix test is NOT what Robert wanted - it was added later)
-     *
-     * 7 == sscanf(Tbuf, "%[+-]%[0-9][.,]%[0-9]%[eE]%[+-]%[0-9]%s", ....);
-     * if (*s2 == 0 || *s3 == 0 || *s4 == 0 || *s6 == 0 || *s7)
-     *   break;
-     */
-
-    /* Scan string to check syntax. */
-    if (*s == '+' || *s == '-') s++;
-    if (!ISDIGIT(*s))		/* Leading digits. */
-      return -1;
-    while (ISDIGIT(*s)) s++;
-    if (*s != '.' && *s != ',')	/* Decimal part. */
-      return -1;
-    dp = s++;			/* Remember decimal point pos just in case */
-    if (!ISDIGIT(*s))
-      return -1;
-    while (ISDIGIT(*s)) s++;
-    if (*s == 'e' || *s == 'E') {
-	/* There is an exponent. */
-	s++;
-	if (*s == '+' || *s == '-') s++;
-	if (!ISDIGIT(*s))
-	  return -1;
-	while (ISDIGIT(*s)) s++;
-    }
-    if (*s)			/* That should be it */
-      return -1;
-
-#ifdef NO_FPE_SIGNALS
-    errno = 0;
-#endif
-    __ERTS_FP_CHECK_INIT(fpexnp);
-    *fp = strtod(buf, &t);
-    __ERTS_FP_ERROR_THOROUGH(fpexnp, *fp, return -1);
-    if (t != s) {		/* Whole string not scanned */
-	/* Try again with other radix char */
-	*dp = (*dp == '.') ? ',' : '.';
-	errno = 0;
-	__ERTS_FP_CHECK_INIT(fpexnp);
-	*fp = strtod(buf, &t);
-	__ERTS_FP_ERROR_THOROUGH(fpexnp, *fp, return -1);
-    }
-
-#ifdef NO_FPE_SIGNALS
-    if (errno == ERANGE) {
-	if (*fp == HUGE_VAL || *fp == -HUGE_VAL) {
-	    /* overflow, should give error */
-	    return -1;
-	} else if (t == s && *fp == 0.0) {
-	    /* This should give 0.0 - OTP-7178 */
-	    errno = 0;
-
-	} else if (*fp == 0.0) {
-	    return -1;
-	}
-    }
-#endif
-    return 0;
-}
-
-int
-matherr(struct exception *exc)
-{
-#if !defined(NO_FPE_SIGNALS)
-    volatile unsigned long *fpexnp = erts_get_current_fp_exception();
-    if (fpexnp != NULL)
-	*fpexnp = (unsigned long)__builtin_return_address(0);
-#endif
-    return 1;
-}
diff --git a/erts/emulator/sys/ose/sys_time.c b/erts/emulator/sys/ose/sys_time.c
deleted file mode 100644
index 5dac75956a..0000000000
--- a/erts/emulator/sys/ose/sys_time.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2005-2009. 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%
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "sys.h"
-#include "global.h"
-
-/******************* Routines for time measurement *********************/
-
-int erts_ticks_per_sec = 0; /* Will be SYS_CLK_TCK in erl_unix_sys.h */
-
-int sys_init_time(void)
-{
-  return SYS_CLOCK_RESOLUTION;
-}
-
-clock_t sys_times(SysTimes *now) {
-  now->tms_utime = now->tms_stime = now->tms_cutime =  now->tms_cstime = 0;
-  return 0;
-}
-
-static OSTICK last_tick_count = 0;
-static SysHrTime wrap = 0;
-static OSTICK us_per_tick;
-
-void sys_init_hrtime() {
-  us_per_tick = system_tick();
-}
-
-SysHrTime sys_gethrtime() {
-  OSTICK ticks = get_ticks();
-  if (ticks < (SysHrTime) last_tick_count) {
-    wrap += 1ULL << 32;
-  }
-  last_tick_count = ticks;
-  return ((((SysHrTime) ticks) + wrap) * 1000*us_per_tick);
-}
diff --git a/erts/emulator/sys/unix/erl_child_setup.c b/erts/emulator/sys/unix/erl_child_setup.c
index a3c5c20641..8dd14bbac6 100644
--- a/erts/emulator/sys/unix/erl_child_setup.c
+++ b/erts/emulator/sys/unix/erl_child_setup.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2015. 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.
@@ -19,109 +19,234 @@
  */
 
 /*
- * After a vfork() (or fork()) the child exec()s to this program which
- * sets up the child and exec()s to the user program (see spawn_start()
- * in sys.c and ticket OTP-4389).
+ * This program is started at erts startup and all fork's that
+ * have to be done are done in here. This is done for a couple
+ * of reasons:
+ *  - Allow usage of fork without a memory explosion.
+ *  -- we do not want to use vfork, as it blocks the VM
+ *     until the execv is done, and if the program that
+ *     is to be executed is on an NFS that is unavailable,
+ *     the execv can block for a very long time.
+ *  -- we cannot do fork inside the VM as that would temporarily
+ *     duplicate the memory usage of the VM per parallel exec.
+ *
+ * Some implementation notes:
+ *  - A single Unix Domain Socket is setup in between the VM and
+ *    this program. Over that UDS the file descriptors that should
+ *    be used to talk to the child program are sent.
+ *    The actual command to execute, together with options and the
+ *    environment, is sent over the pipe represented by the
+ *    file descriptors mentioned above. We don't send the
+ *    command over the UDS as that would increase the likely hood
+ *    that it's buffer would be full.
+ *
+ *  - Since it is this program that execv's, it has to take care of
+ *    all the SIGCHLD signals that the child programs generate. The
+ *    signals are received and the pid+exit reason is sent as data
+ *    on the UDS to the VM. The VM is then able to map the pid to the
+ *    port of the child program that just exited and deliver the status
+ *    code if requested.
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
-#define NEED_CHILD_SETUP_DEFINES
-#include "sys.h"
-#include "erl_misc_utils.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/wait.h>
 
-#ifdef SIG_SIGSET		/* Old SysV */
-void sys_sigrelease(int sig)
+#define WANT_NONBLOCKING
+
+#include "erl_driver.h"
+#include "sys_uds.h"
+#include "hash.h"
+#include "erl_term.h"
+#include "erl_child_setup.h"
+
+#define SET_CLOEXEC(fd) fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC)
+
+#if defined(__ANDROID__)
+#define SHELL "/system/bin/sh"
+#else
+#define SHELL "/bin/sh"
+#endif /* __ANDROID__ */
+
+//#define HARD_DEBUG
+#ifdef HARD_DEBUG
+#define DEBUG_PRINT(fmt, ...) fprintf(stderr, fmt "\r\n", ##__VA_ARGS__)
+#else
+#define DEBUG_PRINT(fmt, ...)
+#endif
+
+#define ABORT(fmt, ...) do {                                            \
+        fprintf(stderr, "erl_child_setup: " fmt "\r\n", ##__VA_ARGS__); \
+        abort();                                                        \
+    } while(0)
+
+#ifdef DEBUG
+void
+erl_assert_error(const char* expr, const char* func, const char* file, int line)
 {
-    sigrelse(sig);
+    fflush(stdout);
+    fprintf(stderr, "%s:%d:%s() Assertion failed: %s\n",
+            file, line, func, expr);
+    fflush(stderr);
+    abort();
 }
-#else /* !SIG_SIGSET */
-#ifdef SIG_SIGNAL		/* Old BSD */
-sys_sigrelease(int sig)
+#endif
+
+void sys_sigblock(int sig)
 {
-    sigsetmask(sigblock(0) & ~sigmask(sig));
+    sigset_t mask;
+
+    sigemptyset(&mask);
+    sigaddset(&mask, sig);
+    sigprocmask(SIG_BLOCK, &mask, (sigset_t *)NULL);
 }
-#else /* !SIG_SIGNAL */	/* The True Way - POSIX!:-) */
+
 void sys_sigrelease(int sig)
 {
     sigset_t mask;
-
     sigemptyset(&mask);
     sigaddset(&mask, sig);
     sigprocmask(SIG_UNBLOCK, &mask, (sigset_t *)NULL);
 }
-#endif /* !SIG_SIGNAL */
-#endif /* !SIG_SIGSET */
-
-#if defined(__ANDROID__)
-static int system_properties_fd(void);
-#endif /* __ANDROID__ */
 
-#if defined(__ANDROID__)
-#define SHELL "/system/bin/sh"
-#else
-#define SHELL "/bin/sh"
-#endif /* __ANDROID__ */
+static void add_os_pid_to_port_id_mapping(Eterm, pid_t);
+static Eterm get_port_id(pid_t);
+static int forker_hash_init(void);
 
+static int max_files = -1;
+static int sigchld_pipe[2];
 
-int
-main(int argc, char *argv[])
+static int
+start_new_child(int pipes[])
 {
-    int i, from, to;
-    int erts_spawn_executable = 0;
+    int size, res, i, pos = 0;
+    char *buff, *o_buff;
+
+    char *cmd, *wd, **new_environ, **args = NULL;
+
+    Sint cnt, flags;
 
-    /* OBSERVE!
-     * Keep child setup after fork() (implemented in sys.c) up to date
-     * if changes are made here.
-     */
+    /* only child executes here */
 
-    if (argc != CS_ARGV_NO_OF_ARGS) {
-	if (argc < CS_ARGV_NO_OF_ARGS) {
-	    return 1;
-	} else {
-	    erts_spawn_executable = 1;
-	}
+    do {
+        res = read(pipes[0], (char*)&size, sizeof(size));
+    } while(res < 0 && (errno == EINTR || errno == ERRNO_BLOCK));
+
+    if (res <= 0) {
+        goto child_error;
     }
 
-    if (strcmp("false", argv[CS_ARGV_UNBIND_IX]) != 0)
-	if (erts_unbind_from_cpu_str(argv[CS_ARGV_UNBIND_IX]) != 0)
-	    return 1;
+    buff = malloc(size);
+
+    DEBUG_PRINT("size = %d", size);
+
+    do {
+        if ((res = read(pipes[0], buff + pos, size - pos)) < 0) {
+            if (errno == ERRNO_BLOCK || errno == EINTR)
+                continue;
+            goto child_error;
+        }
+        if (res == 0) {
+            errno = EPIPE;
+            goto child_error;
+        }
+        pos += res;
+    } while(size - pos != 0);
+
+    o_buff = buff;
+
+    flags = get_int32(buff);
+    buff += sizeof(Sint32);
 
-    for (i = 0; i < CS_ARGV_NO_OF_DUP2_OPS; i++) {
-	if (argv[CS_ARGV_DUP2_OP_IX(i)][0] == '-'
-	    && argv[CS_ARGV_DUP2_OP_IX(i)][1] == '\0')
-	    break;
-	if (sscanf(argv[CS_ARGV_DUP2_OP_IX(i)], "%d:%d", &from, &to) != 2)
-	    return 1;
-	if (dup2(from, to) < 0)
-	    return 1;
+    DEBUG_PRINT("flags = %d", flags);
+
+    cmd = buff;
+    buff += strlen(buff) + 1;
+    if (*buff == '\0') {
+        wd = NULL;
+    } else {
+        wd = buff;
+        buff += strlen(buff) + 1;
     }
+    buff++;
 
-    if (sscanf(argv[CS_ARGV_FD_CR_IX], "%d:%d", &from, &to) != 2)
-	return 1;
+    DEBUG_PRINT("wd = %s", wd);
 
-#if defined(HAVE_CLOSEFROM)
-    closefrom(from);
-#elif defined(__ANDROID__)
-    if (from <= to) {
-	int spfd = system_properties_fd();
-	for (i = from; i <= to; i++) {
-	    if (i != spfd) {
-		(void) close(i);
-            }
-	}
+    cnt = get_int32(buff);
+    buff += sizeof(Sint32);
+    new_environ = malloc(sizeof(char*)*(cnt + 1));
+
+    DEBUG_PRINT("env_len = %ld", cnt);
+    for (i = 0; i < cnt; i++, buff++) {
+        new_environ[i] = buff;
+        while(*buff != '\0') buff++;
     }
-#else  /* !__ANDROID__ */
-    for (i = from; i <= to; i++) {
-	(void) close(i);
+    new_environ[cnt] = NULL;
+
+    if (o_buff + size != buff) {
+        /* This is a spawn executable call */
+        cnt = get_int32(buff);
+        buff += sizeof(Sint32);
+        args = malloc(sizeof(char*)*(cnt + 1));
+        for (i = 0; i < cnt; i++, buff++) {
+            args[i] = buff;
+            while(*buff != '\0') buff++;
+        }
+        args[cnt] = NULL;
     }
-#endif /* HAVE_CLOSEFROM */
 
-    if (!(argv[CS_ARGV_WD_IX][0] == '.' && argv[CS_ARGV_WD_IX][1] == '\0')
-	&& chdir(argv[CS_ARGV_WD_IX]) < 0)
-	return 1;
+    if (o_buff + size != buff) {
+        errno = EINVAL;
+        goto child_error;
+    }
+
+    DEBUG_PRINT("read ack");
+    do {
+        ErtsSysForkerProto proto;
+        res = read(pipes[0], &proto, sizeof(proto));
+        if (res > 0) {
+            ASSERT(proto.action == ErtsSysForkerProtoAction_Ack);
+            ASSERT(res == sizeof(proto));
+        }
+    } while(res < 0 && (errno == EINTR || errno == ERRNO_BLOCK));
+    if (res < 1) {
+        errno = EPIPE;
+        goto child_error;
+    }
+
+    DEBUG_PRINT("Do that forking business: '%s'\n",cmd);
+
+    /* When the dup2'ing below is done, only
+       fd's 0, 1, 2 and maybe 3, 4 should survive the
+       exec. All other fds (i.e. the unix domain sockets
+       and stray pipe ends) should have CLOEXEC set on them
+       so they will be closed when the exec happens */
+    if (flags & FORKER_FLAG_USE_STDIO) {
+        /* stdin for process */
+        if (flags & FORKER_FLAG_DO_WRITE &&
+            dup2(pipes[0], 0) < 0)
+            goto child_error;
+        /* stdout for process */
+        if (flags & FORKER_FLAG_DO_READ &&
+            dup2(pipes[1], 1) < 0)
+            goto child_error;
+    }
+    else {	/* XXX will fail if pipes[0] == 4 (unlikely..) */
+        if (flags & FORKER_FLAG_DO_READ && dup2(pipes[1], 4) < 0)
+            goto child_error;
+        if (flags & FORKER_FLAG_DO_WRITE && dup2(pipes[0], 3) < 0)
+            goto child_error;
+    }
+
+    if (dup2(pipes[2], 2) < 0)
+        goto child_error;
+
+    if (wd && chdir(wd) < 0)
+        goto child_error;
 
 #if defined(USE_SETPGRP_NOARGS)		/* SysV */
     (void) setpgrp();
@@ -131,34 +256,301 @@ main(int argc, char *argv[])
     (void) setsid();
 #endif
 
+    close(pipes[0]);
+    close(pipes[1]);
+    close(pipes[2]);
+
     sys_sigrelease(SIGCHLD);
-    sys_sigrelease(SIGINT);
-    sys_sigrelease(SIGUSR1);
-
-    if (erts_spawn_executable) {
-	if (argv[CS_ARGV_NO_OF_ARGS + 1] == NULL) {
-	    execl(argv[CS_ARGV_NO_OF_ARGS],argv[CS_ARGV_NO_OF_ARGS],
-		  (char *) NULL);
-	} else {
-	    execv(argv[CS_ARGV_NO_OF_ARGS],&(argv[CS_ARGV_NO_OF_ARGS + 1]));
-	}
+
+    if (args) {
+        /* spawn_executable */
+        execve(cmd, args, new_environ);
     } else {
-        execl(SHELL, "sh", "-c", argv[CS_ARGV_CMD_IX], (char *) NULL);
+        execle(SHELL, "sh", "-c", cmd, (char *) NULL, new_environ);
     }
-    return 1;
+child_error:
+    DEBUG_PRINT("exec error: %d\r\n",errno);
+    _exit(128 + errno);
+}
+
+
+/*
+ * [OTP-3906]
+ * Solaris signal management gets confused when threads are used and a
+ * lot of child processes dies. The confusion results in that SIGCHLD
+ * signals aren't delivered to the emulator which in turn results in
+ * a lot of defunct processes in the system.
+ *
+ * The problem seems to appear when a signal is frequently
+ * blocked/unblocked at the same time as the signal is frequently
+ * propagated. The child waiter thread is a workaround for this problem.
+ * The SIGCHLD signal is always blocked (in all threads), and the child
+ * waiter thread fetches the signal by a call to sigwait(). See
+ * child_waiter().
+ *
+ * This should be a non-issue since the fork:ing was moved outside of
+ * the emulator into erl_child_setup. I'm leaving the comment here
+ * for posterity. */
+
+static void handle_sigchld(int sig) {
+    int buff[2], res;
+
+    sys_sigblock(SIGCHLD);
+
+    while ((buff[0] = waitpid((pid_t)(-1), buff+1, WNOHANG)) > 0) {
+        do {
+            res = write(sigchld_pipe[1], buff, sizeof(buff));
+        } while (res < 0 && errno == EINTR);
+        if (res <= 0)
+            ABORT("Failed to write to sigchld_pipe (%d): %d (%d)", sigchld_pipe[1], res, errno);
+        DEBUG_PRINT("Reap child %d (%d)", buff[0], buff[1]);
+    }
+
+    sys_sigrelease(SIGCHLD);
 }
 
 #if defined(__ANDROID__)
 static int system_properties_fd(void)
 {
-    int fd;
+    static int fd = -2;
     char *env;
 
+    if (fd != -2) return fd;
     env = getenv("ANDROID_PROPERTY_WORKSPACE");
     if (!env) {
+        fd = -1;
         return -1;
     }
     fd = atoi(env);
     return fd;
 }
 #endif /* __ANDROID__ */
+
+int
+main(int argc, char *argv[])
+{
+    /* This fd should be open from beam */
+    int uds_fd = 3, max_fd = 3;
+#ifndef HAVE_CLOSEFROM
+    int i;
+#endif
+    struct sigaction sa;
+
+    if (argc < 1 || sscanf(argv[1],"%d",&max_files) != 1) {
+        ABORT("Invalid arguments to child_setup");
+    }
+
+/* We close all fds except the uds from beam.
+   All other fds from now on will have the
+   CLOEXEC flags set on them. This means that we
+   only have to close a very limited number of fds
+   after we fork before the exec. */
+#if defined(HAVE_CLOSEFROM)
+    closefrom(4);
+#else
+    for (i = 4; i < max_files; i++)
+#if defined(__ANDROID__)
+        if (i != system_properties_fd())
+#endif
+        (void) close(i);
+#endif
+
+    if (pipe(sigchld_pipe) < 0) {
+        ABORT("Failed to setup sigchld pipe (%d)", errno);
+    }
+
+    SET_CLOEXEC(sigchld_pipe[0]);
+    SET_CLOEXEC(sigchld_pipe[1]);
+
+    max_fd = max_fd < sigchld_pipe[0] ? sigchld_pipe[0] : max_fd;
+
+    sa.sa_handler = &handle_sigchld;
+    sigemptyset(&sa.sa_mask);
+    sa.sa_flags = SA_RESTART | SA_NOCLDSTOP;
+    if (sigaction(SIGCHLD, &sa, 0) == -1) {
+        perror(0);
+        exit(1);
+    }
+
+    forker_hash_init();
+
+    SET_CLOEXEC(uds_fd);
+
+    DEBUG_PRINT("Starting forker %d", max_files);
+
+    while (1) {
+        fd_set read_fds;
+        int res;
+        FD_ZERO(&read_fds);
+        FD_SET(uds_fd, &read_fds);
+        FD_SET(sigchld_pipe[0], &read_fds);
+        DEBUG_PRINT("child_setup selecting on %d, %d (%d)",
+                uds_fd, sigchld_pipe[0], max_fd);
+        res = select(max_fd+1, &read_fds, NULL, NULL, NULL);
+
+        if (res < 0) {
+            if (errno == EINTR) continue;
+            ABORT("Select failed: %d (%d)",res, errno);
+        }
+
+        if (FD_ISSET(uds_fd, &read_fds)) {
+            int pipes[3], res, os_pid;
+            ErtsSysForkerProto proto;
+            errno = 0;
+            if ((res = sys_uds_read(uds_fd, (char*)&proto, sizeof(proto),
+                                    pipes, 3, MSG_DONTWAIT)) < 0) {
+                if (errno == EINTR)
+                    continue;
+                DEBUG_PRINT("erl_child_setup failed to read from uds: %d, %d", res, errno);
+                _exit(0);
+            }
+
+            if (res == 0) {
+                DEBUG_PRINT("uds was closed!");
+                _exit(0);
+            }
+            /* Since we use unix domain sockets and send the entire data in
+               one go we *should* get the entire payload at once. */
+            ASSERT(res == sizeof(proto));
+            ASSERT(proto.action == ErtsSysForkerProtoAction_Start);
+
+            sys_sigblock(SIGCHLD);
+
+            errno = 0;
+
+            os_pid = fork();
+            if (os_pid == 0)
+                start_new_child(pipes);
+
+            add_os_pid_to_port_id_mapping(proto.u.start.port_id, os_pid);
+
+            /* We write an ack here, but expect the reply on
+               the pipes[0] inside the fork */
+            proto.action = ErtsSysForkerProtoAction_Go;
+            proto.u.go.os_pid = os_pid;
+            proto.u.go.error_number = errno;
+            while (write(pipes[1], &proto, sizeof(proto)) < 0 && errno == EINTR)
+                ; /* remove gcc warning */
+
+#ifdef FORKER_PROTO_START_ACK
+            proto.action = ErtsSysForkerProtoAction_StartAck;
+            while (write(uds_fd, &proto, sizeof(proto)) < 0 && errno == EINTR)
+                ; /* remove gcc warning */
+#endif
+
+            sys_sigrelease(SIGCHLD);
+            close(pipes[0]);
+            close(pipes[1]);
+            close(pipes[2]);
+        }
+
+        if (FD_ISSET(sigchld_pipe[0], &read_fds)) {
+            int ibuff[2];
+            ErtsSysForkerProto proto;
+            res = read(sigchld_pipe[0], ibuff, sizeof(ibuff));
+            if (res <= 0) {
+                if (errno == EINTR)
+                    continue;
+                ABORT("Failed to read from sigchld pipe: %d (%d)", res, errno);
+            }
+
+            proto.u.sigchld.port_id = get_port_id((pid_t)(ibuff[0]));
+
+            if (proto.u.sigchld.port_id == THE_NON_VALUE)
+                continue; /* exit status report not requested */
+
+            proto.action = ErtsSysForkerProtoAction_SigChld;
+            proto.u.sigchld.error_number = ibuff[1];
+            DEBUG_PRINT("send %s to %d", buff, uds_fd);
+            if (write(uds_fd, &proto, sizeof(proto)) < 0) {
+                if (errno == EINTR)
+                    continue;
+                /* The uds was close, which most likely means that the VM
+                   has exited. This will be detected when we try to read
+                   from the uds_fd. */
+                DEBUG_PRINT("Failed to write to uds: %d (%d)", uds_fd, errno);
+            }
+        }
+    }
+    return 1;
+}
+
+typedef struct exit_status {
+    HashBucket hb;
+    pid_t os_pid;
+    Eterm port_id;
+} ErtsSysExitStatus;
+
+static Hash *forker_hash;
+
+static void add_os_pid_to_port_id_mapping(Eterm port_id, pid_t os_pid)
+{
+    if (port_id != THE_NON_VALUE) {
+        /* exit status report requested */
+        ErtsSysExitStatus es;
+        es.os_pid = os_pid;
+        es.port_id = port_id;
+        hash_put(forker_hash, &es);
+    }
+}
+
+static Eterm get_port_id(pid_t os_pid)
+{
+    ErtsSysExitStatus est, *es;
+    Eterm port_id;
+    est.os_pid = os_pid;
+    es = hash_remove(forker_hash, &est);
+    if (!es) return THE_NON_VALUE;
+    port_id = es->port_id;
+    free(es);
+    return port_id;
+}
+
+static int fcmp(void *a, void *b)
+{
+    ErtsSysExitStatus *sa = a;
+    ErtsSysExitStatus *sb = b;
+    return !(sa->os_pid == sb->os_pid);
+}
+
+static HashValue fhash(void *e)
+{
+    ErtsSysExitStatus *se = e;
+    Uint32 val = se->os_pid;
+    val = (val+0x7ed55d16) + (val<<12);
+    val = (val^0xc761c23c) ^ (val>>19);
+    val = (val+0x165667b1) + (val<<5);
+    val = (val+0xd3a2646c) ^ (val<<9);
+    val = (val+0xfd7046c5) + (val<<3);
+    val = (val^0xb55a4f09) ^ (val>>16);
+    return val;
+}
+
+static void *falloc(void *e)
+{
+    ErtsSysExitStatus *se = e;
+    ErtsSysExitStatus *ne = malloc(sizeof(ErtsSysExitStatus));
+    ne->os_pid = se->os_pid;
+    ne->port_id = se->port_id;
+    return ne;
+}
+
+static void *meta_alloc(int type, size_t size) { return malloc(size); }
+static void meta_free(int type, void *p)       { free(p); }
+
+static int forker_hash_init(void)
+{
+    HashFunctions forker_hash_functions;
+    forker_hash_functions.hash = fhash;
+    forker_hash_functions.cmp = fcmp;
+    forker_hash_functions.alloc = falloc;
+    forker_hash_functions.free = free;
+    forker_hash_functions.meta_alloc = meta_alloc;
+    forker_hash_functions.meta_free  = meta_free;
+    forker_hash_functions.meta_print = NULL;
+
+    forker_hash = hash_new(0, "forker_hash",
+                           16, forker_hash_functions);
+
+    return 1;
+}
diff --git a/erts/emulator/sys/unix/erl_child_setup.h b/erts/emulator/sys/unix/erl_child_setup.h
new file mode 100644
index 0000000000..a28b136bfc
--- /dev/null
+++ b/erts/emulator/sys/unix/erl_child_setup.h
@@ -0,0 +1,77 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2015-2015. 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%
+ *
+ * This file defines the interface inbetween erts and child_setup.
+ */
+
+#ifndef _ERL_UNIX_FORKER_H
+#define _ERL_UNIX_FORKER_H
+
+#include "sys.h"
+
+#ifdef __FreeBSD__
+/* The freebsd sendmsg man page explicitly states that
+   you should not close fds before they are known
+   to have reached the other side, so this Ack protects
+   against that. */
+#define FORKER_PROTO_START_ACK 1
+#endif
+
+#define FORKER_ARGV_NO_OF_ARGS  3
+#define FORKER_ARGV_PROGNAME_IX	0    /* Program name                          */
+#define FORKER_ARGV_MAX_FILES	1    /* max_files                             */
+
+#define FORKER_FLAG_USE_STDIO   (1 << 0)    /* dup the pipe to stdin/stderr   */
+#define FORKER_FLAG_EXIT_STATUS (1 << 1)    /* send the exit status to parent */
+#define FORKER_FLAG_DO_READ     (1 << 2)    /* dup write fd */
+#define FORKER_FLAG_DO_WRITE    (1 << 3)    /* dup read  fd  */
+
+#if SIZEOF_VOID_P == SIZEOF_LONG
+typedef unsigned long ErtsSysPortId;
+#elif SIZEOF_VOID_P == SIZEOF_INT
+typedef unsigned int ErtsSysPortId;
+#elif SIZEOF_VOID_P == SIZEOF_LONG_LONG
+typedef unsigned long long ErtsSysPortId;
+#endif
+
+typedef struct ErtsSysForkerProto_ {
+    enum {
+        ErtsSysForkerProtoAction_Start,
+        ErtsSysForkerProtoAction_StartAck,
+        ErtsSysForkerProtoAction_Go,
+        ErtsSysForkerProtoAction_SigChld,
+        ErtsSysForkerProtoAction_Ack
+    } action;
+    union {
+        struct {
+            ErtsSysPortId port_id;
+            int fds[3];
+        } start;
+        struct {
+            pid_t os_pid;
+            int error_number;
+        } go;
+        struct {
+            ErtsSysPortId port_id;
+            int error_number;
+        } sigchld;
+    } u;
+} ErtsSysForkerProto;
+
+#endif /* #ifndef _ERL_UNIX_FORKER_H */
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h
index 8d4e98bf3a..e217c38ca9 100644
--- a/erts/emulator/sys/unix/erl_unix_sys.h
+++ b/erts/emulator/sys/unix/erl_unix_sys.h
@@ -30,9 +30,7 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef QNX
 #include <memory.h>
-#endif
 
 #if defined(__sun__) && defined(__SVR4) && !defined(__EXTENSIONS__)
 #   define __EXTENSIONS__
@@ -92,11 +90,6 @@
 #include <ieeefp.h>
 #endif
 
-#ifdef QNX
-#include <process.h>
-#include <sys/qnx_glob.h>
-#endif
-
 #include <pwd.h>
 
 #ifndef HZ
@@ -108,6 +101,10 @@
 #endif
 #include <netdb.h>
 
+#ifdef HAVE_MACH_ABSOLUTE_TIME
+#include <mach/mach_time.h>
+#endif
+
 #ifdef HAVE_POSIX_MEMALIGN
 #  define ERTS_HAVE_ERTS_SYS_ALIGNED_ALLOC 1
 #endif
@@ -136,13 +133,6 @@
 #  define ERTS_POLL_NEED_ASYNC_INTERRUPT_SUPPORT
 #endif
 
-#ifndef ENABLE_CHILD_WAITER_THREAD
-#  ifdef ERTS_SMP
-#    define ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
-void erts_check_children(void);
-#  endif
-#endif
-
 typedef void *GETENV_STATE;
 
 /*
@@ -171,6 +161,7 @@ typedef long long ErtsSysHrTime;
 #endif
 
 typedef ErtsMonotonicTime ErtsSystemTime;
+typedef ErtsSysHrTime ErtsSysPerfCounter;
 
 #define ERTS_MONOTONIC_TIME_MIN (((ErtsMonotonicTime) 1) << 63)
 #define ERTS_MONOTONIC_TIME_MAX (~ERTS_MONOTONIC_TIME_MIN)
@@ -219,6 +210,7 @@ ErtsSystemTime erts_os_system_time(void);
  * It may or may not be monotonic.
  */
 ErtsSysHrTime erts_sys_hrtime(void);
+#define ERTS_HRTIME_UNIT (1000*1000*1000)
 
 struct erts_sys_time_read_only_data__ {
 #ifdef ERTS_OS_MONOTONIC_INLINE_FUNC_PTR_CALL__
@@ -227,6 +219,8 @@ struct erts_sys_time_read_only_data__ {
 #ifdef ERTS_OS_TIMES_INLINE_FUNC_PTR_CALL__
     void (*os_times)(ErtsMonotonicTime *, ErtsSystemTime *);
 #endif
+    ErtsSysPerfCounter (*perf_counter)(void);
+    ErtsSysPerfCounter perf_counter_unit;
     int ticks_per_sec;
 };
 
@@ -280,7 +274,24 @@ erts_os_times(ErtsMonotonicTime *mtimep, ErtsSystemTime *stimep)
 #endif /* ERTS_HAVE_OS_MONOTONIC_TIME_SUPPORT */
 
 /*
- *
+ * Functions for getting the performance counter
+ */
+
+ERTS_GLB_INLINE ErtsSysPerfCounter erts_sys_perf_counter(void);
+#define erts_sys_perf_counter_unit() erts_sys_time_data__.r.o.perf_counter_unit
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_GLB_INLINE ErtsSysPerfCounter
+erts_sys_perf_counter()
+{
+    return (*erts_sys_time_data__.r.o.perf_counter)();
+}
+
+#endif /* ERTS_GLB_INLINE_INCL_FUNC_DEF */
+
+/*
+ * Functions for measuring CPU time
  */
 
 #if (defined(HAVE_GETHRVTIME) || defined(HAVE_CLOCK_GETTIME_CPU_TIME))
@@ -310,7 +321,7 @@ typedef void (*SIGFUNC)(int);
 extern SIGFUNC sys_signal(int, SIGFUNC);
 extern void sys_sigrelease(int);
 extern void sys_sigblock(int);
-extern void sys_stop_cat(void);
+extern void sys_init_suspend_handler(void);
 
 /*
  * Handling of floating point exceptions.
@@ -425,19 +436,6 @@ void erts_sys_unblock_fpe(int);
 #define ERTS_FP_ERROR_THOROUGH(p, f, A)	__ERTS_FP_ERROR_THOROUGH(&(p)->fp_exception, f, A)
 
 
-#ifdef NEED_CHILD_SETUP_DEFINES
-/* The child setup argv[] */
-#define CS_ARGV_PROGNAME_IX	0		/* Program name		*/
-#define CS_ARGV_UNBIND_IX	1		/* Unbind from cpu	*/
-#define CS_ARGV_WD_IX		2		/* Working directory	*/
-#define CS_ARGV_CMD_IX		3		/* Command		*/
-#define CS_ARGV_FD_CR_IX	4		/* Fd close range	*/
-#define CS_ARGV_DUP2_OP_IX(N)	((N) + 5)	/* dup2 operations	*/
-
-#define CS_ARGV_NO_OF_DUP2_OPS	3		/* Number of dup2 ops	*/
-#define CS_ARGV_NO_OF_ARGS	8		/* Number of arguments	*/
-#endif /* #ifdef NEED_CHILD_SETUP_DEFINES */
-
 /* Threads */
 #ifdef USE_THREADS
 extern int init_async(int);
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index 8d7da3e47e..4f992d3caf 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -49,7 +49,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#define NEED_CHILD_SETUP_DEFINES
 #define ERTS_WANT_BREAK_HANDLING
 #define ERTS_WANT_GOT_SIGUSR1
 #define WANT_NONBLOCKING    /* must define this to pull in defs from sys.h */
@@ -67,7 +66,7 @@
 #include "erl_mseg.h"
 
 extern char **environ;
-static erts_smp_rwmtx_t environ_rwmtx;
+erts_smp_rwmtx_t environ_rwmtx;
 
 #define MAX_VSIZE 16		/* Max number of entries allowed in an I/O
 				 * vector sock_sendv().
@@ -76,89 +75,12 @@ static erts_smp_rwmtx_t environ_rwmtx;
  * Don't need global.h, but bif_table.h (included by bif.h),
  * won't compile otherwise
  */
-#include "global.h" 
+#include "global.h"
 #include "bif.h"
 
-#include "erl_sys_driver.h"
 #include "erl_check_io.h"
 #include "erl_cpu_topology.h"
 
-#ifndef DISABLE_VFORK
-#define DISABLE_VFORK 0
-#endif
-
-#if defined IOV_MAX
-#define MAXIOV IOV_MAX
-#elif defined UIO_MAXIOV
-#define MAXIOV UIO_MAXIOV
-#else
-#define MAXIOV 16
-#endif
-
-#ifdef USE_THREADS
-#  ifdef ENABLE_CHILD_WAITER_THREAD
-#    define CHLDWTHR ENABLE_CHILD_WAITER_THREAD
-#  else
-#    define CHLDWTHR 0
-#  endif
-#  define FDBLOCK 1
-#else
-#  define CHLDWTHR 0
-#  define FDBLOCK 0
-#endif
-/*
- * [OTP-3906]
- * Solaris signal management gets confused when threads are used and a
- * lot of child processes dies. The confusion results in that SIGCHLD
- * signals aren't delivered to the emulator which in turn results in
- * a lot of defunct processes in the system.
- *
- * The problem seems to appear when a signal is frequently
- * blocked/unblocked at the same time as the signal is frequently
- * propagated. The child waiter thread is a workaround for this problem.
- * The SIGCHLD signal is always blocked (in all threads), and the child
- * waiter thread fetches the signal by a call to sigwait(). See
- * child_waiter().
- */
-
-typedef struct ErtsSysReportExit_ ErtsSysReportExit;
-struct ErtsSysReportExit_ {
-    ErtsSysReportExit *next;
-    Eterm port;
-    int pid;
-    int ifd;
-    int ofd;
-#if CHLDWTHR && !defined(ERTS_SMP)
-    int status;
-#endif
-};
-
-/* Used by the fd driver iff the fd could not be set to non-blocking */
-typedef struct ErtsSysBlocking_ {
-    ErlDrvPDL pdl;
-    int res;
-    int err;
-    unsigned int pkey;
-} ErtsSysBlocking;
-
-
-/* This data is shared by these drivers - initialized by spawn_init() */
-static struct driver_data {
-    ErlDrvPort port_num;
-    int ofd, packet_bytes;
-    ErtsSysReportExit *report_exit;
-    int pid;
-    int alive;
-    int status;
-    int terminating;
-    ErtsSysBlocking *blocking;
-} *driver_data;			/* indexed by fd */
-
-static ErtsSysReportExit *report_exit_list;
-#if CHLDWTHR && !defined(ERTS_SMP)
-static ErtsSysReportExit *report_exit_transit_list;
-#endif
-
 extern int  driver_interrupt(int, int);
 extern void do_break(void);
 
@@ -170,33 +92,6 @@ extern void erts_sys_init_float(void);
 
 extern void erl_crash_dump(char* file, int line, char* fmt, ...);
 
-#define DIR_SEPARATOR_CHAR    '/'
-
-#if defined(__ANDROID__)
-#define SHELL "/system/bin/sh"
-#else
-#define SHELL "/bin/sh"
-#endif /* __ANDROID__ */
-
-
-#if defined(DEBUG)
-#define ERL_BUILD_TYPE_MARKER ".debug"
-#elif defined(PURIFY)
-#define ERL_BUILD_TYPE_MARKER ".purify"
-#elif defined(QUANTIFY)
-#define ERL_BUILD_TYPE_MARKER ".quantify"
-#elif defined(PURECOV)
-#define ERL_BUILD_TYPE_MARKER ".purecov"
-#elif defined(VALGRIND)
-#define ERL_BUILD_TYPE_MARKER ".valgrind"
-#else /* opt */
-#define ERL_BUILD_TYPE_MARKER
-#endif
-
-#define CHILD_SETUP_PROG_NAME	"child_setup" ERL_BUILD_TYPE_MARKER
-#if !DISABLE_VFORK
-static char *child_setup_prog;
-#endif
 
 #ifdef DEBUG
 static int debug_log = 0;
@@ -220,58 +115,20 @@ static volatile int have_prepared_crash_dump;
   (have_prepared_crash_dump++)
 #endif
 
-static erts_smp_atomic_t sys_misc_mem_sz;
+erts_smp_atomic_t sys_misc_mem_sz;
 
 #if defined(ERTS_SMP)
 static void smp_sig_notify(char c);
 static int sig_notify_fds[2] = {-1, -1};
 
+#if !defined(ETHR_UNUSABLE_SIGUSRX) && defined(ERTS_THR_HAVE_SIG_FUNCS)
 static int sig_suspend_fds[2] = {-1, -1};
 #define ERTS_SYS_SUSPEND_SIGNAL SIGUSR2
-
 #endif
 
-jmp_buf erts_sys_sigsegv_jmp;
-
-#if CHLDWTHR || defined(ERTS_SMP)
-erts_mtx_t chld_stat_mtx;
-#endif
-#if CHLDWTHR
-static erts_tid_t child_waiter_tid;
-/* chld_stat_mtx is used to protect against concurrent accesses
-   of the driver_data fields pid, alive, and status. */
-erts_cnd_t chld_stat_cnd;
-static long children_alive;
-#define CHLD_STAT_LOCK		erts_mtx_lock(&chld_stat_mtx)
-#define CHLD_STAT_UNLOCK	erts_mtx_unlock(&chld_stat_mtx)
-#define CHLD_STAT_WAIT		erts_cnd_wait(&chld_stat_cnd, &chld_stat_mtx)
-#define CHLD_STAT_SIGNAL	erts_cnd_signal(&chld_stat_cnd)
-#elif defined(ERTS_SMP) /* ------------------------------------------------- */
-#define CHLD_STAT_LOCK		erts_mtx_lock(&chld_stat_mtx)
-#define CHLD_STAT_UNLOCK	erts_mtx_unlock(&chld_stat_mtx)
-
-#else /* ------------------------------------------------------------------- */
-#define CHLD_STAT_LOCK
-#define CHLD_STAT_UNLOCK
-static volatile int children_died;
 #endif
 
-
-static struct fd_data {
-    char  pbuf[4];   /* hold partial packet bytes */
-    int   psz;       /* size of pbuf */
-    char  *buf;
-    char  *cpos;
-    int   sz;
-    int   remain;  /* for input on fd */
-} *fd_data;			/* indexed by fd */
-
-/* static FUNCTION(int, write_fill, (int, char*, int)); unused? */
-static void note_child_death(int, int);
-
-#if CHLDWTHR
-static void* child_waiter(void *);
-#endif
+jmp_buf erts_sys_sigsegv_jmp;
 
 static int crashdump_companion_cube_fd = -1;
 
@@ -453,9 +310,10 @@ MALLOC_USE_HASH(1);
 #ifdef USE_THREADS
 
 #ifdef ERTS_THR_HAVE_SIG_FUNCS
+
 /*
  * Child thread inherits parents signal mask at creation. In order to
- * guarantee that the main thread will receive all SIGINT, SIGCHLD, and
+ * guarantee that the main thread will receive all SIGINT, and
  * SIGUSR1 signals sent to the process, we block these signals in the
  * parent thread when creating a new thread.
  */
@@ -551,14 +409,11 @@ erts_sys_pre_init(void)
 #ifdef ERTS_THR_HAVE_SIG_FUNCS
     sigemptyset(&thr_create_sigmask);
     sigaddset(&thr_create_sigmask, SIGINT);   /* block interrupt */
-    sigaddset(&thr_create_sigmask, SIGCHLD);  /* block child signals */
     sigaddset(&thr_create_sigmask, SIGUSR1);  /* block user defined signal */
 #endif
 
     erts_thr_init(&eid);
 
-    report_exit_list = NULL;
-
 #ifdef ERTS_ENABLE_LOCK_COUNT
     erts_lcnt_init();
 #endif
@@ -569,17 +424,6 @@ erts_sys_pre_init(void)
 
 #ifdef USE_THREADS
 
-#if CHLDWTHR || defined(ERTS_SMP)
-    erts_mtx_init(&chld_stat_mtx, "child_status");
-#endif
-#if CHLDWTHR
-#ifndef ERTS_SMP
-    report_exit_transit_list = NULL;
-#endif
-    erts_cnd_init(&chld_stat_cnd);
-    children_alive = 0;
-#endif
-
 #ifdef ERTS_SMP
     erts_smp_atomic32_init_nob(&erts_break_requested, 0);
     erts_smp_atomic32_init_nob(&erts_got_sigusr1, 0);
@@ -589,9 +433,6 @@ erts_sys_pre_init(void)
     erts_got_sigusr1 = 0;
     have_prepared_crash_dump = 0;
 #endif
-#if !CHLDWTHR && !defined(ERTS_SMP)
-    children_died = 0;
-#endif
 
 #endif /* USE_THREADS */
 
@@ -628,39 +469,6 @@ erts_sys_pre_init(void)
 void
 erl_sys_init(void)
 {
-#if !DISABLE_VFORK
- {
-    int res;
-    char bindir[MAXPATHLEN];
-    size_t bindirsz = sizeof(bindir);
-    Uint csp_path_sz;
-
-    res = erts_sys_getenv_raw("BINDIR", bindir, &bindirsz);
-    if (res != 0) {
-	if (res < 0)
-	    erl_exit(-1,
-		     "Environment variable BINDIR is not set\n");
-	if (res > 0)
-	    erl_exit(-1,
-		     "Value of environment variable BINDIR is too large\n");
-    }
-    if (bindir[0] != DIR_SEPARATOR_CHAR)
-	erl_exit(-1,
-		 "Environment variable BINDIR does not contain an"
-		 " absolute path\n");
-    csp_path_sz = (strlen(bindir)
-		   + 1 /* DIR_SEPARATOR_CHAR */
-		   + sizeof(CHILD_SETUP_PROG_NAME)
-		   + 1);
-    child_setup_prog = erts_alloc(ERTS_ALC_T_CS_PROG_PATH, csp_path_sz);
-    erts_smp_atomic_add_nob(&sys_misc_mem_sz, csp_path_sz);
-    erts_snprintf(child_setup_prog, csp_path_sz,
-            "%s%c%s",
-            bindir,
-            DIR_SEPARATOR_CHAR,
-            CHILD_SETUP_PROG_NAME);
- }
-#endif
 
 #ifdef USE_SETLINEBUF
     setlinebuf(stdout);
@@ -825,7 +633,7 @@ break_requested(void)
   fprintf(stderr,"break!\n");
 #endif
   if (ERTS_BREAK_REQUESTED)
-      erl_exit(ERTS_INTR_EXIT, "");
+      erts_exit(ERTS_INTR_EXIT, "");
 
   ERTS_SET_BREAK_REQUESTED;
   ERTS_CHK_IO_AS_INTR(); /* Make sure we don't sleep in poll */
@@ -864,7 +672,7 @@ sigusr1_exit(void)
     }
 
     prepare_crash_dump(secs);
-    erl_exit(1, "Received SIGUSR1\n");
+    erts_exit(ERTS_ERROR_EXIT, "Received SIGUSR1\n");
 }
 
 #ifdef ETHR_UNUSABLE_SIGUSRX
@@ -872,7 +680,7 @@ sigusr1_exit(void)
 
 #else
 
-#ifdef ERTS_SMP
+#ifdef ERTS_SYS_SUSPEND_SIGNAL
 void
 sys_thr_suspend(erts_tid_t tid) {
     erts_thr_kill(tid, ERTS_SYS_SUSPEND_SIGNAL);
@@ -900,7 +708,7 @@ static RETSIGTYPE user_signal1(int signum)
 #endif
 }
 
-#ifdef ERTS_SMP
+#ifdef ERTS_SYS_SUSPEND_SIGNAL
 #if (defined(SIG_SIGSET) || defined(SIG_SIGNAL))
 static RETSIGTYPE suspend_signal(void)
 #else
@@ -913,14 +721,14 @@ static RETSIGTYPE suspend_signal(int signum)
      res = read(sig_suspend_fds[0], buf, sizeof(int));
    } while (res < 0 && errno == EINTR);
 }
-#endif /* #ifdef ERTS_SMP */
+#endif /* #ifdef ERTS_SYS_SUSPEND_SIGNAL */
 
 #endif /* #ifndef ETHR_UNUSABLE_SIGUSRX */
 
 static void
 quit_requested(void)
 {
-    erl_exit(ERTS_INTR_EXIT, "");
+    erts_exit(ERTS_INTR_EXIT, "");
 }
 
 #if (defined(SIG_SIGSET) || defined(SIG_SIGNAL))
@@ -966,53 +774,20 @@ void init_break_handler(void)
    sys_signal(SIGINT, request_break);
 #ifndef ETHR_UNUSABLE_SIGUSRX
    sys_signal(SIGUSR1, user_signal1);
-#ifdef ERTS_SMP
-   sys_signal(ERTS_SYS_SUSPEND_SIGNAL, suspend_signal);
-#endif /* #ifdef ERTS_SMP */
 #endif /* #ifndef ETHR_UNUSABLE_SIGUSRX */
    sys_signal(SIGQUIT, do_quit);
 }
 
-int sys_max_files(void)
+void sys_init_suspend_handler(void)
 {
-   return(max_files);
-}
-
-static void block_signals(void)
-{
-#if !CHLDWTHR
-   sys_sigblock(SIGCHLD);
-#endif
-#ifndef ERTS_SMP
-   sys_sigblock(SIGINT);
-#ifndef ETHR_UNUSABLE_SIGUSRX
-   sys_sigblock(SIGUSR1);
-#endif /* #ifndef ETHR_UNUSABLE_SIGUSRX */
-#endif /* #ifndef ERTS_SMP */
-
-#if defined(ERTS_SMP) && !defined(ETHR_UNUSABLE_SIGUSRX)
-   sys_sigblock(ERTS_SYS_SUSPEND_SIGNAL);
+#ifdef ERTS_SYS_SUSPEND_SIGNAL
+   sys_signal(ERTS_SYS_SUSPEND_SIGNAL, suspend_signal);
 #endif
-
 }
 
-static void unblock_signals(void)
+int sys_max_files(void)
 {
-    /* Update erl_child_setup.c if changed */
-#if !CHLDWTHR
-   sys_sigrelease(SIGCHLD);
-#endif
-#ifndef ERTS_SMP
-   sys_sigrelease(SIGINT);
-#ifndef ETHR_UNUSABLE_SIGUSRX
-   sys_sigrelease(SIGUSR1);
-#endif /* #ifndef ETHR_UNUSABLE_SIGUSRX */
-#endif /* #ifndef ERTS_SMP */
-
-#if defined(ERTS_SMP) && !defined(ETHR_UNUSABLE_SIGUSRX)
-   sys_sigrelease(ERTS_SYS_SUSPEND_SIGNAL);
-#endif
-
+   return(max_files);
 }
 
 /************************** OS info *******************************/
@@ -1102,1502 +877,6 @@ void fini_getenv_state(GETENV_STATE *state)
    erts_smp_rwmtx_runlock(&environ_rwmtx);
 }
 
-
-/************************** Port I/O *******************************/
-
-
-
-/* I. Common stuff */
-
-/*
- * Decreasing the size of it below 16384 is not allowed.
- */
-
-/* II. The spawn/fd/vanilla drivers */
-
-#define ERTS_SYS_READ_BUF_SZ (64*1024)
-
-/* Driver interfaces */
-static ErlDrvData spawn_start(ErlDrvPort, char*, SysDriverOpts*);
-static ErlDrvData fd_start(ErlDrvPort, char*, SysDriverOpts*);
-#if FDBLOCK
-static void fd_async(void *);
-static void fd_ready_async(ErlDrvData drv_data, ErlDrvThreadData thread_data);
-#endif
-static ErlDrvSSizeT fd_control(ErlDrvData, unsigned int, char *, ErlDrvSizeT,
-			       char **, ErlDrvSizeT);
-static ErlDrvData vanilla_start(ErlDrvPort, char*, SysDriverOpts*);
-static int spawn_init(void);
-static void fd_stop(ErlDrvData);
-static void fd_flush(ErlDrvData);
-static void stop(ErlDrvData);
-static void ready_input(ErlDrvData, ErlDrvEvent);
-static void ready_output(ErlDrvData, ErlDrvEvent);
-static void output(ErlDrvData, char*, ErlDrvSizeT);
-static void outputv(ErlDrvData, ErlIOVec*);
-static void stop_select(ErlDrvEvent, void*);
-
-struct erl_drv_entry spawn_driver_entry = {
-    spawn_init,
-    spawn_start,
-    stop,
-    output,
-    ready_input,
-    ready_output,
-    "spawn",
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    ERL_DRV_EXTENDED_MARKER,
-    ERL_DRV_EXTENDED_MAJOR_VERSION,
-    ERL_DRV_EXTENDED_MINOR_VERSION,
-    ERL_DRV_FLAG_USE_PORT_LOCKING,
-    NULL, NULL,
-    stop_select
-};
-struct erl_drv_entry fd_driver_entry = {
-    NULL,
-    fd_start,
-    fd_stop,
-    output,
-    ready_input,
-    ready_output, 
-    "fd",
-    NULL,
-    NULL,
-    fd_control,
-    NULL,
-    outputv,
-#if FDBLOCK
-    fd_ready_async, /* ready_async */
-#else
-    NULL,
-#endif
-    fd_flush, /* flush */
-    NULL, /* call */
-    NULL, /* event */
-    ERL_DRV_EXTENDED_MARKER,
-    ERL_DRV_EXTENDED_MAJOR_VERSION,
-    ERL_DRV_EXTENDED_MINOR_VERSION,
-    0, /* ERL_DRV_FLAGs */
-    NULL, /* handle2 */
-    NULL, /* process_exit */
-    stop_select
-};
-struct erl_drv_entry vanilla_driver_entry = {
-    NULL,
-    vanilla_start,
-    stop,
-    output,
-    ready_input,
-    ready_output,
-    "vanilla",
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL, /* flush */
-    NULL, /* call */
-    NULL, /* event */
-    ERL_DRV_EXTENDED_MARKER,
-    ERL_DRV_EXTENDED_MAJOR_VERSION,
-    ERL_DRV_EXTENDED_MINOR_VERSION,
-    0, /* ERL_DRV_FLAGs */
-    NULL, /* handle2 */
-    NULL, /* process_exit */
-    stop_select
-};
-
-/* Handle SIGCHLD signals. */
-#if (defined(SIG_SIGSET) || defined(SIG_SIGNAL))
-static RETSIGTYPE onchld(void)
-#else
-static RETSIGTYPE onchld(int signum)
-#endif
-{
-#if CHLDWTHR
-    ASSERT(0); /* We should *never* catch a SIGCHLD signal */
-#elif defined(ERTS_SMP)
-    smp_sig_notify('C');
-#else
-    children_died = 1;
-    ERTS_CHK_IO_AS_INTR(); /* Make sure we don't sleep in poll */
-#endif
-}
-
-static int set_blocking_data(struct driver_data *dd) {
-
-    dd->blocking = erts_alloc(ERTS_ALC_T_SYS_BLOCKING, sizeof(ErtsSysBlocking));
-
-    erts_smp_atomic_add_nob(&sys_misc_mem_sz, sizeof(ErtsSysBlocking));
-
-    dd->blocking->pdl = driver_pdl_create(dd->port_num);
-    dd->blocking->res = 0;
-    dd->blocking->err = 0;
-    dd->blocking->pkey = driver_async_port_key(dd->port_num);
-
-    return 1;
-}
-
-static int set_driver_data(ErlDrvPort port_num,
-			   int ifd,
-			   int ofd,
-			   int packet_bytes,
-			   int read_write,
-			   int exit_status,
-			   int pid,
-                           int is_blocking)
-{
-    Port *prt;
-    ErtsSysReportExit *report_exit;
-
-    if (!exit_status)
-	report_exit = NULL;
-    else {
-	report_exit = erts_alloc(ERTS_ALC_T_PRT_REP_EXIT,
-				 sizeof(ErtsSysReportExit));
-	report_exit->next = report_exit_list;
-	report_exit->port = erts_drvport2id(port_num);
-	report_exit->pid = pid;
-	report_exit->ifd = read_write & DO_READ ? ifd : -1;
-	report_exit->ofd = read_write & DO_WRITE ? ofd : -1;
-#if CHLDWTHR && !defined(ERTS_SMP)
-	report_exit->status = 0;
-#endif
-	report_exit_list = report_exit;
-    }
-
-    prt = erts_drvport2port(port_num);
-    if (prt != ERTS_INVALID_ERL_DRV_PORT)
-	prt->os_pid = pid;
-
-    if (read_write & DO_READ) {
-	driver_data[ifd].packet_bytes = packet_bytes;
-	driver_data[ifd].port_num = port_num;
-	driver_data[ifd].report_exit = report_exit;
-	driver_data[ifd].pid = pid;
-	driver_data[ifd].alive = 1;
-	driver_data[ifd].status = 0;
-        driver_data[ifd].terminating = 0;
-        driver_data[ifd].blocking = NULL;
-	if (read_write & DO_WRITE) {
-	    driver_data[ifd].ofd = ofd;
-            if (is_blocking && FDBLOCK)
-                if (!set_blocking_data(driver_data+ifd))
-                    return -1;
-	    if (ifd != ofd)
-		driver_data[ofd] = driver_data[ifd];  /* structure copy */
-	} else {		/* DO_READ only */
-	    driver_data[ifd].ofd = -1;
-	}
-	(void) driver_select(port_num, ifd, (ERL_DRV_READ|ERL_DRV_USE), 1);
-	return(ifd);
-    } else {			/* DO_WRITE only */
-	driver_data[ofd].packet_bytes = packet_bytes;
-	driver_data[ofd].port_num = port_num;
-	driver_data[ofd].report_exit = report_exit;
-	driver_data[ofd].ofd = ofd;
-	driver_data[ofd].pid = pid;
-	driver_data[ofd].alive = 1;
-	driver_data[ofd].status = 0;
-        driver_data[ofd].terminating = 0;
-        driver_data[ofd].blocking = NULL;
-        if (is_blocking && FDBLOCK)
-            if (!set_blocking_data(driver_data+ofd))
-                return -1;
-	return(ofd);
-    }
-}
-
-static int spawn_init()
-{
-   int i;
-#if CHLDWTHR
-   erts_thr_opts_t thr_opts = ERTS_THR_OPTS_DEFAULT_INITER;
-
-   thr_opts.detached = 0;
-   thr_opts.suggested_stack_size = 0; /* Smallest possible */
-   thr_opts.name = "child_waiter";
-#endif
-
-   sys_signal(SIGPIPE, SIG_IGN); /* Ignore - we'll handle the write failure */
-   driver_data = (struct driver_data *)
-       erts_alloc(ERTS_ALC_T_DRV_TAB, max_files * sizeof(struct driver_data));
-   erts_smp_atomic_add_nob(&sys_misc_mem_sz,
-			   max_files * sizeof(struct driver_data));
-
-   for (i = 0; i < max_files; i++)
-      driver_data[i].pid = -1;
-
-#if CHLDWTHR
-   sys_sigblock(SIGCHLD);
-#endif
-
-   sys_signal(SIGCHLD, onchld); /* Reap children */
-
-#if CHLDWTHR
-   erts_thr_create(&child_waiter_tid, child_waiter, NULL, &thr_opts);
-#endif
-
-   return 1;
-}
-
-static void close_pipes(int ifd[2], int ofd[2], int read_write)
-{
-    if (read_write & DO_READ) {
-	(void) close(ifd[0]);
-	(void) close(ifd[1]);
-    }
-    if (read_write & DO_WRITE) {
-	(void) close(ofd[0]);
-	(void) close(ofd[1]);
-    }
-}
-
-static void init_fd_data(int fd, ErlDrvPort port_num)
-{
-    fd_data[fd].buf = NULL;
-    fd_data[fd].cpos = NULL;
-    fd_data[fd].remain = 0;
-    fd_data[fd].sz = 0;
-    fd_data[fd].psz = 0;
-}
-
-static char **build_unix_environment(char *block)
-{
-    int i;
-    int j;
-    int len;
-    char *cp;
-    char **cpp;
-    char** old_env;
-    
-    ERTS_SMP_LC_ASSERT(erts_smp_lc_rwmtx_is_rlocked(&environ_rwmtx));
-
-    cp = block;
-    len = 0;
-    while (*cp != '\0') {
-	cp += strlen(cp) + 1;
-	len++;
-    }
-    old_env = environ;
-    while (*old_env++ != NULL) {
-	len++;
-    }
-    
-    cpp = (char **) erts_alloc_fnf(ERTS_ALC_T_ENVIRONMENT,
-				   sizeof(char *) * (len+1));
-    if (cpp == NULL) {
-	return NULL;
-    }
-
-    cp = block;
-    len = 0;
-    while (*cp != '\0') {
-	cpp[len] = cp;
-	cp += strlen(cp) + 1;
-	len++;
-    }
-    
-    i = len;
-    for (old_env = environ; *old_env; old_env++) {
-	char* old = *old_env;
-
-	for (j = 0; j < len; j++) {
-	    char *s, *t;
-
-	    s = cpp[j];
-	    t = old;
-	    while (*s == *t && *s != '=') {
-		s++, t++;
-	    }
-	    if (*s == '=' && *t == '=') {
-		break;
-	    }
-	}
-
-	if (j == len) {		/* New version not found */
-	    cpp[len++] = old;
-	}
-    }
-
-    for (j = 0; j < i; ) {
-        size_t last = strlen(cpp[j])-1;
-	if (cpp[j][last] == '=' && strchr(cpp[j], '=') == cpp[j]+last) {
-	    cpp[j] = cpp[--len];
-	    if (len < i) {
-		i--;
-	    } else {
-		j++;
-	    }
-	}
-	else {
-	    j++;
-	}
-    }
-
-    cpp[len] = NULL;
-    return cpp;
-}
-
-/*
-  [arndt] In most Unix systems, including Solaris 2.5, 'fork' allocates memory
-  in swap space for the child of a 'fork', whereas 'vfork' does not do this.
-  The natural call to use here is therefore 'vfork'. Due to a bug in
-  'vfork' in Solaris 2.5 (apparently fixed in 2.6), using 'vfork'
-  can be dangerous in what seems to be these circumstances:
-      If the child code under a vfork sets the signal action to SIG_DFL
-      (or SIG_IGN)
-      for any signal which was previously set to a signal handler, the
-      state of the parent is clobbered, so that the later arrival of
-      such a signal yields a sigsegv in the parent. If the signal was
-      not set to a signal handler, but ignored, all seems to work.
-  If you change the forking code below, beware of this.
- */
-
-static ErlDrvData spawn_start(ErlDrvPort port_num, char* name, SysDriverOpts* opts)
-{
-#define CMD_LINE_PREFIX_STR "exec "
-#define CMD_LINE_PREFIX_STR_SZ (sizeof(CMD_LINE_PREFIX_STR) - 1)
-
-    int ifd[2], ofd[2], len, pid, i;
-    char **volatile new_environ; /* volatile since a vfork() then cannot
-				    cause 'new_environ' to be clobbered
-				    in the parent process. */
-    int saved_errno;
-    long res;
-    char *cmd_line;
-#ifndef QNX
-    int unbind;
-#endif
-#if !DISABLE_VFORK
-    int no_vfork;
-    size_t no_vfork_sz = sizeof(no_vfork);
-
-    no_vfork = (erts_sys_getenv_raw("ERL_NO_VFORK",
-				    (char *) &no_vfork,
-				    &no_vfork_sz) >= 0);
-#endif
-
-    switch (opts->read_write) {
-    case DO_READ:
-	if (pipe(ifd) < 0)
-	    return ERL_DRV_ERROR_ERRNO;
-	if (ifd[0] >= max_files) {
-	    close_pipes(ifd, ofd, opts->read_write);
-	    errno = EMFILE;
-	    return ERL_DRV_ERROR_ERRNO;
-	}
-	ofd[1] = -1;		/* keep purify happy */
-	break;
-    case DO_WRITE:
-	if (pipe(ofd) < 0) return ERL_DRV_ERROR_ERRNO;
-	if (ofd[1] >= max_files) {
-	    close_pipes(ifd, ofd, opts->read_write);
-	    errno = EMFILE;
-	    return ERL_DRV_ERROR_ERRNO;
-	}
-	ifd[0] = -1;		/* keep purify happy */
-	break;
-    case DO_READ|DO_WRITE:
-	if (pipe(ifd) < 0) return ERL_DRV_ERROR_ERRNO;
-	errno = EMFILE;		/* default for next two conditions */
-	if (ifd[0] >= max_files || pipe(ofd) < 0) {
-	    close_pipes(ifd, ofd, DO_READ);
-	    return ERL_DRV_ERROR_ERRNO;
-	}
-	if (ofd[1] >= max_files) {
-	    close_pipes(ifd, ofd, opts->read_write);
-	    errno = EMFILE;
-	    return ERL_DRV_ERROR_ERRNO;
-	}
-	break;
-    default:
-	ASSERT(0);
-	return ERL_DRV_ERROR_GENERAL;
-    }
-
-    if (opts->spawn_type == ERTS_SPAWN_EXECUTABLE) {
-	/* started with spawn_executable, not with spawn */
-	len = strlen(name);
-	cmd_line = (char *) erts_alloc_fnf(ERTS_ALC_T_TMP, len + 1);
-	if (!cmd_line) {
-	    close_pipes(ifd, ofd, opts->read_write);
-	    errno = ENOMEM;
-	    return ERL_DRV_ERROR_ERRNO;
-	}
-	memcpy((void *) cmd_line,(void *) name, len);
-	cmd_line[len] = '\0';
-	if (access(cmd_line,X_OK) != 0) {
-	    int save_errno = errno;
-	    erts_free(ERTS_ALC_T_TMP, cmd_line);
-	    errno = save_errno;
-	    return ERL_DRV_ERROR_ERRNO;
-	}
-    } else {
-	/* make the string suitable for giving to "sh" */
-	len = strlen(name);
-	cmd_line = (char *) erts_alloc_fnf(ERTS_ALC_T_TMP,
-					   CMD_LINE_PREFIX_STR_SZ + len + 1);
-	if (!cmd_line) {
-	    close_pipes(ifd, ofd, opts->read_write);
-	    errno = ENOMEM;
-	    return ERL_DRV_ERROR_ERRNO;
-	}
-	memcpy((void *) cmd_line,
-	       (void *) CMD_LINE_PREFIX_STR,
-	       CMD_LINE_PREFIX_STR_SZ);
-	memcpy((void *) (cmd_line + CMD_LINE_PREFIX_STR_SZ), (void *) name, len);
-	cmd_line[CMD_LINE_PREFIX_STR_SZ + len] = '\0';
-    }
-
-    erts_smp_rwmtx_rlock(&environ_rwmtx);
-
-    if (opts->envir == NULL) {
-	new_environ = environ;
-    } else if ((new_environ = build_unix_environment(opts->envir)) == NULL) {
-	erts_smp_rwmtx_runlock(&environ_rwmtx);
-	erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
-	errno = ENOMEM;
-	return ERL_DRV_ERROR_ERRNO;
-    } 
-
-#ifndef QNX
-    /* Block child from SIGINT and SIGUSR1. Must be before fork()
-       to be safe. */
-    block_signals();
-
-    CHLD_STAT_LOCK;
-
-    unbind = erts_sched_bind_atfork_prepare();
-
-#if !DISABLE_VFORK
-    /* See fork/vfork discussion before this function. */
-    if (no_vfork) {
-#endif
-
-	DEBUGF(("Using fork\n"));
-	pid = fork();
-
-	if (pid == 0) {
-	    /* The child! Setup child... */
-
-	    if (erts_sched_bind_atfork_child(unbind) != 0)
-		goto child_error;
-
-	    /* OBSERVE!
-	     * Keep child setup after vfork() (implemented below and in
-	     * erl_child_setup.c) up to date if changes are made here.
-	     */
-
-	    if (opts->use_stdio) {
-		if (opts->read_write & DO_READ) {
-		    /* stdout for process */
-		    if (dup2(ifd[1], 1) < 0)
-			goto child_error;
-		    if(opts->redir_stderr)
-			/* stderr for process */
-			if (dup2(ifd[1], 2) < 0)
-			    goto child_error;
-		}
-		if (opts->read_write & DO_WRITE)
-		    /* stdin for process */
-		    if (dup2(ofd[0], 0) < 0)
-			goto child_error;
-	    }
-	    else {	/* XXX will fail if ofd[0] == 4 (unlikely..) */
-		if (opts->read_write & DO_READ)
-		    if (dup2(ifd[1], 4) < 0)
-			goto child_error;
-		if (opts->read_write & DO_WRITE)
-		    if (dup2(ofd[0], 3) < 0)
-			goto child_error;
-	    }
-
-#if defined(HAVE_CLOSEFROM)
-	    closefrom(opts->use_stdio ? 3 : 5);
-#else
-	    for (i = opts->use_stdio ? 3 : 5; i < max_files; i++)
-		(void) close(i);
-#endif
-
-	    if (opts->wd && chdir(opts->wd) < 0)
-		goto child_error;
-
-#if defined(USE_SETPGRP_NOARGS)		/* SysV */
-	    (void) setpgrp();
-#elif defined(USE_SETPGRP)		/* BSD */
-	    (void) setpgrp(0, getpid());
-#else					/* POSIX */
-	    (void) setsid();
-#endif
-	    
-	    unblock_signals();
-
-	    if (opts->spawn_type == ERTS_SPAWN_EXECUTABLE) {
-		if (opts->argv == NULL) {
-		    execle(cmd_line,cmd_line,(char *) NULL, new_environ);
-		} else {
-		    if (opts->argv[0] == erts_default_arg0) {
-			opts->argv[0] = cmd_line;
-		    }
-		    execve(cmd_line, opts->argv, new_environ);
-		    if (opts->argv[0] == cmd_line) {
-			opts->argv[0] = erts_default_arg0;
-		    }
-		}
-	    } else {
-		execle(SHELL, "sh", "-c", cmd_line, (char *) NULL, new_environ);
-	    }
-	child_error:
-	    _exit(1);
-	}
-#if !DISABLE_VFORK
-    }
-#define ENOUGH_BYTES (44)
-    else { /* Use vfork() */
-	char **cs_argv= erts_alloc(ERTS_ALC_T_TMP,(CS_ARGV_NO_OF_ARGS + 1)*
-				   sizeof(char *));
-	char fd_close_range[ENOUGH_BYTES];                  /* 44 bytes are enough to  */
-	char dup2_op[CS_ARGV_NO_OF_DUP2_OPS][ENOUGH_BYTES]; /* hold any "%d:%d" string */
-                                                            /* on a 64-bit machine.    */
-
-	/* Setup argv[] for the child setup program (implemented in
-	   erl_child_setup.c) */
-	i = 0;
-	if (opts->use_stdio) {
-	    if (opts->read_write & DO_READ){
-		/* stdout for process */
-		erts_snprintf(&dup2_op[i++][0], ENOUGH_BYTES, "%d:%d", ifd[1], 1);
-		if(opts->redir_stderr)
-		    /* stderr for process */
-		    erts_snprintf(&dup2_op[i++][0], ENOUGH_BYTES, "%d:%d", ifd[1], 2);
-	    }
-	    if (opts->read_write & DO_WRITE)
-		/* stdin for process */
-		erts_snprintf(&dup2_op[i++][0], ENOUGH_BYTES, "%d:%d", ofd[0], 0);
-	} else {	/* XXX will fail if ofd[0] == 4 (unlikely..) */
-	    if (opts->read_write & DO_READ)
-		erts_snprintf(&dup2_op[i++][0], ENOUGH_BYTES, "%d:%d", ifd[1], 4);
-	    if (opts->read_write & DO_WRITE)
-		erts_snprintf(&dup2_op[i++][0], ENOUGH_BYTES, "%d:%d", ofd[0], 3);
-	}
-	for (; i < CS_ARGV_NO_OF_DUP2_OPS; i++)
-	    strcpy(&dup2_op[i][0], "-");
-	erts_snprintf(fd_close_range, ENOUGH_BYTES, "%d:%d", opts->use_stdio ? 3 : 5, max_files-1);
-
-	cs_argv[CS_ARGV_PROGNAME_IX] = child_setup_prog;
-	cs_argv[CS_ARGV_WD_IX] = opts->wd ? opts->wd : ".";
-	cs_argv[CS_ARGV_UNBIND_IX] = erts_sched_bind_atvfork_child(unbind);
-	cs_argv[CS_ARGV_FD_CR_IX] = fd_close_range;
-	for (i = 0; i < CS_ARGV_NO_OF_DUP2_OPS; i++)
-	    cs_argv[CS_ARGV_DUP2_OP_IX(i)] = &dup2_op[i][0];
-
-	if (opts->spawn_type == ERTS_SPAWN_EXECUTABLE) {
-	    int num = 0;
-	    int j = 0;
-	    if (opts->argv != NULL) {
-		for(; opts->argv[num] != NULL; ++num)
-		    ;
-	    }
-	    cs_argv = erts_realloc(ERTS_ALC_T_TMP,cs_argv, (CS_ARGV_NO_OF_ARGS + 1 + num + 1) * sizeof(char *));
-	    cs_argv[CS_ARGV_CMD_IX] = "-";
-	    cs_argv[CS_ARGV_NO_OF_ARGS] = cmd_line;
-	    if (opts->argv != NULL) {
-		for (;opts->argv[j] != NULL; ++j) {
-		    if (opts->argv[j] == erts_default_arg0) {
-			cs_argv[CS_ARGV_NO_OF_ARGS + 1 + j] = cmd_line;
-		    } else {
-			cs_argv[CS_ARGV_NO_OF_ARGS + 1 + j] = opts->argv[j];
-		    }
-		}
-	    }
-	    cs_argv[CS_ARGV_NO_OF_ARGS + 1 + j] = NULL;
-	} else {
-	    cs_argv[CS_ARGV_CMD_IX] = cmd_line; /* Command */
-	    cs_argv[CS_ARGV_NO_OF_ARGS] = NULL;
-	}
-	DEBUGF(("Using vfork\n"));
-	pid = vfork();
-
-	if (pid == 0) {
-	    /* The child! */
-
-	    /* Observe!
-	     * OTP-4389: The child setup program (implemented in
-	     * erl_child_setup.c) will perform the necessary setup of the
-	     * child before it execs to the user program. This because
-	     * vfork() only allow an *immediate* execve() or _exit() in the
-	     * child.
-	     */
-	    execve(child_setup_prog, cs_argv, new_environ);
-	    _exit(1);
-	}
-	erts_free(ERTS_ALC_T_TMP,cs_argv);
-    }
-#undef ENOUGH_BYTES
-#endif
-
-    erts_sched_bind_atfork_parent(unbind);
-
-    if (pid == -1) {
-        saved_errno = errno;
-	CHLD_STAT_UNLOCK;
-	erts_smp_rwmtx_runlock(&environ_rwmtx);
-	erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
-        unblock_signals();
-        close_pipes(ifd, ofd, opts->read_write);
-	errno = saved_errno;
-	return ERL_DRV_ERROR_ERRNO;
-    }
-#else /* QNX */
-    if (opts->use_stdio) {
-	if (opts->read_write & DO_READ)
-	    qnx_spawn_options.iov[1] = ifd[1];  /* stdout for process */
-	if (opts->read_write & DO_WRITE)
-	    qnx_spawn_options.iov[0] = ofd[0];  /* stdin for process */
-	} 
-    else {
-	if (opts->read_write & DO_READ)
-	    qnx_spawn_options.iov[4] = ifd[1];
-	if (opts->read_write & DO_WRITE)
-	    qnx_spawn_options.iov[3] = ofd[0];
-    }
-    /* Close fds on exec */
-    for (i = 3; i < max_files; i++)
-	fcntl(i, F_SETFD, 1);
-
-    qnx_spawn_options.flags = _SPAWN_SETSID;
-    if ((pid = spawnl(P_NOWAIT, SHELL, SHELL, "-c", cmd_line, 
-                      (char *) 0)) < 0) {
-	erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
-        reset_qnx_spawn();
-	erts_smp_rwmtx_runlock(&environ_rwmtx);
-	close_pipes(ifd, ofd, opts->read_write);
-	return ERL_DRV_ERROR_GENERAL;
-    }
-    reset_qnx_spawn();
-#endif /* QNX */
-
-    erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
-
-    if (new_environ != environ)
-	erts_free(ERTS_ALC_T_ENVIRONMENT, (void *) new_environ);
-
-    if (opts->read_write & DO_READ) 
-	(void) close(ifd[1]);
-    if (opts->read_write & DO_WRITE)
-	(void) close(ofd[0]);
-	
-    if (opts->read_write & DO_READ) {
-	SET_NONBLOCKING(ifd[0]);
-	init_fd_data(ifd[0], port_num);
-    }
-    if (opts->read_write & DO_WRITE) {
-	SET_NONBLOCKING(ofd[1]);
-        init_fd_data(ofd[1], port_num);
-    }
-
-    res = set_driver_data(port_num, ifd[0], ofd[1], opts->packet_bytes,
-			  opts->read_write, opts->exit_status, pid, 0);
-    /* Don't unblock SIGCHLD until now, since the call above must
-       first complete putting away the info about our new subprocess. */
-    unblock_signals();
-
-#if CHLDWTHR
-    ASSERT(children_alive >= 0);
-
-    if (!(children_alive++))
-	CHLD_STAT_SIGNAL; /* Wake up child waiter thread if no children
-			     was alive before we fork()ed ... */
-#endif
-    /* Don't unlock chld_stat_mtx until now of the same reason as above */
-    CHLD_STAT_UNLOCK;
-
-    erts_smp_rwmtx_runlock(&environ_rwmtx);
-
-    return (ErlDrvData)res;
-#undef CMD_LINE_PREFIX_STR
-#undef CMD_LINE_PREFIX_STR_SZ
-}
-
-#ifdef QNX
-static reset_qnx_spawn()
-{
-    int i;
-
-    /* Reset qnx_spawn_options */
-    qnx_spawn_options.flags = 0; 
-    qnx_spawn_options.iov[0] = 0xff;
-    qnx_spawn_options.iov[1] = 0xff;
-    qnx_spawn_options.iov[2] = 0xff;
-    qnx_spawn_options.iov[3] = 0xff;
-}
-#endif
-
-#define FD_DEF_HEIGHT 24
-#define FD_DEF_WIDTH 80
-/* Control op */
-#define FD_CTRL_OP_GET_WINSIZE 100
-
-static int fd_get_window_size(int fd, Uint32 *width, Uint32 *height)
-{
-#ifdef TIOCGWINSZ 
-    struct winsize ws;
-    if (ioctl(fd,TIOCGWINSZ,&ws) == 0) {
-	*width = (Uint32) ws.ws_col;
-	*height = (Uint32) ws.ws_row;
-	return 0;
-    }
-#endif
-    return -1;
-}
-
-static ErlDrvSSizeT fd_control(ErlDrvData drv_data,
-			       unsigned int command,
-			       char *buf, ErlDrvSizeT len,
-			       char **rbuf, ErlDrvSizeT rlen)
-{
-    int fd = (int)(long)drv_data;
-    char resbuff[2*sizeof(Uint32)];
-    switch (command) {
-    case FD_CTRL_OP_GET_WINSIZE:
-	{
-	    Uint32 w,h;
-	    if (fd_get_window_size(fd,&w,&h)) 
-		return 0;
-	    memcpy(resbuff,&w,sizeof(Uint32));
-	    memcpy(resbuff+sizeof(Uint32),&h,sizeof(Uint32));
-	}
-	break;
-    default:
-	return 0;
-    }
-    if (rlen < 2*sizeof(Uint32)) {
-	*rbuf = driver_alloc(2*sizeof(Uint32));
-    }
-    memcpy(*rbuf,resbuff,2*sizeof(Uint32));
-    return 2*sizeof(Uint32);
-}
-
-static ErlDrvData fd_start(ErlDrvPort port_num, char* name,
-			   SysDriverOpts* opts)
-{
-    ErlDrvData res;
-    int non_blocking = 0;
-
-    if (((opts->read_write & DO_READ) && opts->ifd >= max_files) ||
-	((opts->read_write & DO_WRITE) && opts->ofd >= max_files))
-	return ERL_DRV_ERROR_GENERAL;
-
-    /*
-     * Historical:
-     *
-     * "Note about nonblocking I/O.
-     *
-     * At least on Solaris, setting the write end of a TTY to nonblocking,
-     * will set the input end to nonblocking as well (and vice-versa).
-     * If erl is run in a pipeline like this:  cat | erl
-     * the input end of the TTY will be the standard input of cat.
-     * And cat is not prepared to handle nonblocking I/O."
-     *
-     * Actually, the reason for this is not that the tty itself gets set
-     * in non-blocking mode, but that the "input end" (cat's stdin) and
-     * the "output end" (erlang's stdout) are typically the "same" file
-     * descriptor, dup()'ed from a single fd by one of this process'
-     * ancestors.
-     *
-     * The workaround for this problem used to be a rather bad kludge,
-     * interposing an extra process ("internal cat") between erlang's
-     * stdout and the original stdout, allowing erlang to set its stdout
-     * in non-blocking mode without affecting the stdin of the preceding
-     * process in the pipeline - and being a kludge, it caused all kinds
-     * of weird problems.
-     *
-     * So, this is the current logic:
-     *
-     * The only reason to set non-blocking mode on the output fd at all is
-     * if it's something that can cause a write() to block, of course,
-     * i.e. primarily if it points to a tty, socket, pipe, or fifo. 
-     *
-     * If we don't set non-blocking mode when we "should" have, and output
-     * becomes blocked, the entire runtime system will be suspended - this
-     * is normally bad of course, and can happen fairly "easily" - e.g. user
-     * hits ^S on tty - but doesn't necessarily happen.
-     * 
-     * If we do set non-blocking mode when we "shouldn't" have, the runtime
-     * system will end up seeing EOF on the input fd (due to the preceding
-     * process dying), which typically will cause the entire runtime system
-     * to terminate immediately (due to whatever erlang process is seeing
-     * the EOF taking it as a signal to halt the system). This is *very* bad.
-     * 
-     * I.e. we should take a conservative approach, and only set non-
-     * blocking mode when we a) need to, and b) are reasonably certain
-     * that it won't be a problem. And as in the example above, the problem
-     * occurs when input fd and output fd point to different "things".
-     *
-     * However, determining that they are not just the same "type" of
-     * "thing", but actually the same instance of that type of thing, is
-     * unreasonably complex in many/most cases.
-     *
-     * Also, with pipes, sockets, and fifos it's far from obvious that the
-     * user *wants* non-blocking output: If you're running erlang inside
-     * some complex pipeline, you're probably not running a real-time system
-     * that must never stop, but rather *want* it to suspend if the output
-     * channel is "full".
-     *
-     * So, the bottom line: We will only set the output fd non-blocking if
-     * it points to a tty, and either a) the input fd also points to a tty,
-     * or b) we can make sure that setting the output fd non-blocking
-     * doesn't interfere with someone else's input, via a somewhat milder
-     * kludge than the above.
-     *
-     * Also keep in mind that while this code is almost exclusively run as
-     * a result of an erlang open_port({fd,0,1}, ...), that isn't the only
-     * case - it can be called with any old pre-existing file descriptors,
-     * the relations between which (if they're even two) we can only guess
-     * at - still, we try our best...
-     *
-     * Added note OTP 18: Some systems seem to use stdout/stderr to log data
-     * using unix pipes, so we cannot allow the system to block on a write.
-     * Therefore we use an async thread to write the data to fd's that could
-     * not be set to non-blocking. When no async threads are available we
-     * fall back on the old behaviour.
-     *
-     * Also the guarantee about what is delivered to the OS has changed.
-     * Pre 18 the fd driver did no flushing of data before terminating.
-     * Now it does. This is because we want to be able to guarantee that things
-     * such as escripts and friends really have outputted all data before
-     * terminating. This could potentially block the termination of the system
-     * for a very long time, but if the user wants to terminate fast she should
-     * use erlang:halt with flush=false.
-     */
-
-    if (opts->read_write & DO_READ) {
-	init_fd_data(opts->ifd, port_num);
-    }
-    if (opts->read_write & DO_WRITE) {
-	init_fd_data(opts->ofd, port_num);
-
-	/* If we don't have a read end, all bets are off - no non-blocking. */
-	if (opts->read_write & DO_READ) {
-
-	    if (isatty(opts->ofd)) { /* output fd is a tty:-) */
-
-		if (isatty(opts->ifd)) { /* input fd is also a tty */
-
-		    /* To really do this "right", we should also check that
-		       input and output fd point to the *same* tty - but
-		       this seems like overkill; ttyname() isn't for free,
-		       and this is a very common case - and it's hard to
-		       imagine a scenario where setting non-blocking mode
-		       here would cause problems - go ahead and do it. */
-
-                    non_blocking = 1;
-		    SET_NONBLOCKING(opts->ofd);
-
-		} else {	/* output fd is a tty, input fd isn't */
-
-		    /* This is a "problem case", but also common (see the
-		       example above) - i.e. it makes sense to try a bit
-		       harder before giving up on non-blocking mode: Try to
-		       re-open the tty that the output fd points to, and if
-		       successful replace the original one with the "new" fd
-		       obtained this way, and set *that* one in non-blocking
-		       mode. (Yes, this is a kludge.)
-
-		       However, re-opening the tty may fail in a couple of
-		       (unusual) cases:
-
-		       1) The name of the tty (or an equivalent one, i.e.
-			  same major/minor number) can't be found, because
-			  it actually lives somewhere other than /dev (or
-			  wherever ttyname() looks for it), and isn't
-			  equivalent to any of those that do live in the
-			  "standard" place - this should be *very* unusual.
-
-		       2) Permissions on the tty don't allow us to open it -
-			  it's perfectly possible to have an fd open to an
-			  object whose permissions wouldn't allow us to open
-			  it. This is not as unusual as it sounds, one case
-			  is if the user has su'ed to someone else (not
-			  root) - we have a read/write fd open to the tty
-			  (because it has been inherited all the way down
-			  here), but we have neither read nor write
-			  permission for the tty.
-
-		       In these cases, we finally give up, and don't set the
-		       output fd in non-blocking mode. */
-
-		    char *tty;
-		    int nfd;
-
-		    if ((tty = ttyname(opts->ofd)) != NULL &&
-			(nfd = open(tty, O_WRONLY)) != -1) {
-			dup2(nfd, opts->ofd);
-			close(nfd);
-                        non_blocking = 1;
-			SET_NONBLOCKING(opts->ofd);
-		    }
-		}
-	    }
-	}
-    }
-    CHLD_STAT_LOCK;
-    res = (ErlDrvData)(long)set_driver_data(port_num, opts->ifd, opts->ofd,
-                                            opts->packet_bytes,
-                                            opts->read_write, 0, -1,
-                                            !non_blocking);
-    CHLD_STAT_UNLOCK;
-    return res;
-}
-
-static void clear_fd_data(int fd) 
-{
-    if (fd_data[fd].sz > 0) {
-	erts_free(ERTS_ALC_T_FD_ENTRY_BUF, (void *) fd_data[fd].buf);
-	ASSERT(erts_smp_atomic_read_nob(&sys_misc_mem_sz) >= fd_data[fd].sz);
-	erts_smp_atomic_add_nob(&sys_misc_mem_sz, -1*fd_data[fd].sz);
-    }
-    fd_data[fd].buf = NULL;
-    fd_data[fd].sz = 0;
-    fd_data[fd].remain = 0;
-    fd_data[fd].cpos = NULL;
-    fd_data[fd].psz = 0;
-}
-
-static void nbio_stop_fd(ErlDrvPort prt, int fd)
-{
-    driver_select(prt,fd,DO_READ|DO_WRITE,0);
-    clear_fd_data(fd);
-    SET_BLOCKING(fd);
-}
-
-static void fd_stop(ErlDrvData ev)  /* Does not close the fds */
-{
-    int ofd;
-    int fd = (int)(long)ev;
-    ErlDrvPort prt = driver_data[fd].port_num;
-    
-#if FDBLOCK
-    if (driver_data[fd].blocking) {
-        erts_free(ERTS_ALC_T_SYS_BLOCKING,driver_data[fd].blocking);
-        driver_data[fd].blocking = NULL;
-        erts_smp_atomic_add_nob(&sys_misc_mem_sz, -1*sizeof(ErtsSysBlocking));
-    }
-#endif
-
-    nbio_stop_fd(prt, fd);
-    ofd = driver_data[fd].ofd;
-    if (ofd != fd && ofd != -1)
-	nbio_stop_fd(prt, ofd);
-}
-
-static void fd_flush(ErlDrvData fd)
-{
-    if (!driver_data[(int)(long)fd].terminating)
-        driver_data[(int)(long)fd].terminating = 1;
-}
-
-static ErlDrvData vanilla_start(ErlDrvPort port_num, char* name,
-				SysDriverOpts* opts)
-{
-    int flags, fd;
-    ErlDrvData res;
-
-    flags = (opts->read_write == DO_READ ? O_RDONLY :
-	     opts->read_write == DO_WRITE ? O_WRONLY|O_CREAT|O_TRUNC :
-	     O_RDWR|O_CREAT);
-    if ((fd = open(name, flags, 0666)) < 0)
-	return ERL_DRV_ERROR_GENERAL;
-    if (fd >= max_files) {
-	close(fd);
-	return ERL_DRV_ERROR_GENERAL;
-    }
-    SET_NONBLOCKING(fd);
-    init_fd_data(fd, port_num);
-
-    CHLD_STAT_LOCK;
-    res = (ErlDrvData)(long)set_driver_data(port_num, fd, fd,
-                                            opts->packet_bytes,
-                                            opts->read_write, 0, -1, 0);
-    CHLD_STAT_UNLOCK;
-    return res;
-}
-
-/* Note that driver_data[fd].ifd == fd if the port was opened for reading, */
-/* otherwise (i.e. write only) driver_data[fd].ofd = fd.  */
-
-static void stop(ErlDrvData fd)
-{
-    ErlDrvPort prt;
-    int ofd;
-
-    prt = driver_data[(int)(long)fd].port_num;
-    nbio_stop_fd(prt, (int)(long)fd);
-
-    ofd = driver_data[(int)(long)fd].ofd;
-    if (ofd != (int)(long)fd && (int)(long)ofd != -1)
-	nbio_stop_fd(prt, ofd);
-    else
-	ofd = -1;
-
-    CHLD_STAT_LOCK;
-
-    /* Mark as unused. */
-    driver_data[(int)(long)fd].pid = -1;
-
-    CHLD_STAT_UNLOCK;
-
-    /* SMP note: Close has to be last thing done (open file descriptors work
-       as locks on driver_data[] entries) */
-    driver_select(prt, (int)(long)fd, ERL_DRV_USE, 0);  /* close(fd); */
-    if (ofd >= 0) {
-	driver_select(prt, (int)(long)ofd, ERL_DRV_USE, 0);  /* close(ofd); */
-    }
-}
-
-/* used by fd_driver */
-static void outputv(ErlDrvData e, ErlIOVec* ev)
-{
-    int fd = (int)(long)e;
-    ErlDrvPort ix = driver_data[fd].port_num;
-    int pb = driver_data[fd].packet_bytes;
-    int ofd = driver_data[fd].ofd;
-    ssize_t n;
-    ErlDrvSizeT sz;
-    char lb[4];
-    char* lbp;
-    ErlDrvSizeT len = ev->size;
-
-    /* (len > ((unsigned long)-1 >> (4-pb)*8)) */
-    /*    if (pb >= 0 && (len & (((ErlDrvSizeT)1 << (pb*8))) - 1) != len) {*/
-    if (((pb == 2) && (len > 0xffff)) || (pb == 1 && len > 0xff)) {
-	driver_failure_posix(ix, EINVAL);
-	return; /* -1; */
-    }
-    /* Handles 0 <= pb <= 4 only */
-    put_int32((Uint32) len, lb);
-    lbp = lb + (4-pb);
-
-    ev->iov[0].iov_base = lbp;
-    ev->iov[0].iov_len = pb;
-    ev->size += pb;
-
-    if (driver_data[fd].blocking && FDBLOCK)
-        driver_pdl_lock(driver_data[fd].blocking->pdl);
-
-    if ((sz = driver_sizeq(ix)) > 0) {
-	driver_enqv(ix, ev, 0);
-
-        if (driver_data[fd].blocking && FDBLOCK)
-            driver_pdl_unlock(driver_data[fd].blocking->pdl);
-
-	if (sz + ev->size >= (1 << 13))
-	    set_busy_port(ix, 1);
-    }
-    else if (!driver_data[fd].blocking || !FDBLOCK) {
-        /* We try to write directly if the fd in non-blocking */
-	int vsize = ev->vsize > MAX_VSIZE ? MAX_VSIZE : ev->vsize;
-
-	n = writev(ofd, (const void *) (ev->iov), vsize);
-	if (n == ev->size)
-	    return; /* 0;*/
-	if (n < 0) {
-	    if ((errno != EINTR) && (errno != ERRNO_BLOCK)) {
-		driver_failure_posix(ix, errno);
-		return; /* -1;*/
-	    }
-	    n = 0;
-	}
-	driver_enqv(ix, ev, n);  /* n is the skip value */
-	driver_select(ix, ofd, ERL_DRV_WRITE|ERL_DRV_USE, 1);
-    }
-#if FDBLOCK
-    else {
-        if (ev->size != 0) {
-            driver_enqv(ix, ev, 0);
-            driver_pdl_unlock(driver_data[fd].blocking->pdl);
-            driver_async(ix, &driver_data[fd].blocking->pkey,
-                         fd_async, driver_data+fd, NULL);
-        } else {
-            driver_pdl_unlock(driver_data[fd].blocking->pdl);
-        }
-    }
-#endif
-    /* return 0;*/
-}
-
-/* Used by spawn_driver and vanilla driver */
-static void output(ErlDrvData e, char* buf, ErlDrvSizeT len)
-{
-    int fd = (int)(long)e;
-    ErlDrvPort ix = driver_data[fd].port_num;
-    int pb = driver_data[fd].packet_bytes;
-    int ofd = driver_data[fd].ofd;
-    ssize_t n;
-    ErlDrvSizeT sz;
-    char lb[4];
-    char* lbp;
-    struct iovec iv[2];
-
-    /* (len > ((unsigned long)-1 >> (4-pb)*8)) */
-    if (((pb == 2) && (len > 0xffff)) || (pb == 1 && len > 0xff)) {
-	driver_failure_posix(ix, EINVAL);
-	return; /* -1; */
-    }
-    put_int32(len, lb);
-    lbp = lb + (4-pb);
-
-    if ((sz = driver_sizeq(ix)) > 0) {
-	driver_enq(ix, lbp, pb);
-	driver_enq(ix, buf, len);
-	if (sz + len + pb >= (1 << 13))
-	    set_busy_port(ix, 1);
-    }
-    else {
-	iv[0].iov_base = lbp;
-	iv[0].iov_len = pb;  /* should work for pb=0 */
-	iv[1].iov_base = buf;
-	iv[1].iov_len = len;
-	n = writev(ofd, iv, 2);
-	if (n == pb+len)
-	    return; /* 0; */
-	if (n < 0) {
-	    if ((errno != EINTR) && (errno != ERRNO_BLOCK)) {
-		driver_failure_posix(ix, errno);
-		return; /* -1; */
-	    }
-	    n = 0;
-	}
-	if (n < pb) {
-	    driver_enq(ix, lbp+n, pb-n);
-	    driver_enq(ix, buf, len);
-	}
-	else {
-	    n -= pb;
-	    driver_enq(ix, buf+n, len-n);
-	}
-	driver_select(ix, ofd, ERL_DRV_WRITE|ERL_DRV_USE, 1);
-    }
-    return; /* 0; */
-}
-
-static int port_inp_failure(ErlDrvPort port_num, int ready_fd, int res)
-				/* Result: 0 (eof) or -1 (error) */
-{
-    int err = errno;
-
-    ASSERT(res <= 0);
-    (void) driver_select(port_num, ready_fd, ERL_DRV_READ|ERL_DRV_WRITE, 0); 
-    clear_fd_data(ready_fd);
-
-    if (driver_data[ready_fd].blocking && FDBLOCK) {
-        driver_pdl_lock(driver_data[ready_fd].blocking->pdl);
-        if (driver_sizeq(driver_data[ready_fd].port_num) > 0) {
-            driver_pdl_unlock(driver_data[ready_fd].blocking->pdl);
-            /* We have stuff in the output queue, so we just
-               set the state to terminating and wait for fd_async_ready
-               to terminate the port */
-            if (res == 0)
-                driver_data[ready_fd].terminating = 2;
-            else
-                driver_data[ready_fd].terminating = -err;
-            return 0;
-        }
-        driver_pdl_unlock(driver_data[ready_fd].blocking->pdl);
-    }
-
-    if (res == 0) {
-	if (driver_data[ready_fd].report_exit) {
-	    CHLD_STAT_LOCK;
-
-	    if (driver_data[ready_fd].alive) {
-		/*
-		 * We have eof and want to report exit status, but the process
-		 * hasn't exited yet. When it does report_exit_status() will
-		 * driver_select() this fd which will make sure that we get
-		 * back here with driver_data[ready_fd].alive == 0 and
-		 * driver_data[ready_fd].status set.
-		 */
-		CHLD_STAT_UNLOCK;
-		return 0;
-	    }
-	    else {
-		int status = driver_data[ready_fd].status;
-		CHLD_STAT_UNLOCK;
-
-		/* We need not be prepared for stopped/continued processes. */
-		if (WIFSIGNALED(status))
-		    status = 128 + WTERMSIG(status);
-		else
-		    status = WEXITSTATUS(status);
-
-		driver_report_exit(driver_data[ready_fd].port_num, status);
-	    }
-       }
-       driver_failure_eof(port_num);
-    } else {
-	driver_failure_posix(port_num, err);
-    }
-    return 0;
-}
-
-/* fd is the drv_data that is returned from the */
-/* initial start routine                        */
-/* ready_fd is the descriptor that is ready to read */
-
-static void ready_input(ErlDrvData e, ErlDrvEvent ready_fd)
-{
-    int fd = (int)(long)e;
-    ErlDrvPort port_num;
-    int packet_bytes;
-    int res;
-    Uint h;
-
-    port_num = driver_data[fd].port_num;
-    packet_bytes = driver_data[fd].packet_bytes;
-
-
-    if (packet_bytes == 0) {
-	byte *read_buf = (byte *) erts_alloc(ERTS_ALC_T_SYS_READ_BUF,
-					     ERTS_SYS_READ_BUF_SZ);
-	res = read(ready_fd, read_buf, ERTS_SYS_READ_BUF_SZ);
-	if (res < 0) {
-	    if ((errno != EINTR) && (errno != ERRNO_BLOCK))
-		port_inp_failure(port_num, ready_fd, res);
-	}
-	else if (res == 0)
-	    port_inp_failure(port_num, ready_fd, res);
-	else 
-	    driver_output(port_num, (char*) read_buf, res);
-	erts_free(ERTS_ALC_T_SYS_READ_BUF, (void *) read_buf);
-    }
-    else if (fd_data[ready_fd].remain > 0) { /* We try to read the remainder */
-	/* space is allocated in buf */
-	res = read(ready_fd, fd_data[ready_fd].cpos, 
-		   fd_data[ready_fd].remain);
-	if (res < 0) {
-	    if ((errno != EINTR) && (errno != ERRNO_BLOCK))
-		port_inp_failure(port_num, ready_fd, res);
-	}
-	else if (res == 0) {
-	    port_inp_failure(port_num, ready_fd, res);
-	}
-	else if (res == fd_data[ready_fd].remain) { /* we're done  */
-	    driver_output(port_num, fd_data[ready_fd].buf, 
-			  fd_data[ready_fd].sz);
-	    clear_fd_data(ready_fd);
-	}
-	else { /*  if (res < fd_data[ready_fd].remain) */
-	    fd_data[ready_fd].cpos += res;
-	    fd_data[ready_fd].remain -= res;
-	}
-    }
-    else if (fd_data[ready_fd].remain == 0) { /* clean fd */
-	byte *read_buf = (byte *) erts_alloc(ERTS_ALC_T_SYS_READ_BUF,
-					     ERTS_SYS_READ_BUF_SZ);
-	/* We make one read attempt and see what happens */
-	res = read(ready_fd, read_buf, ERTS_SYS_READ_BUF_SZ);
-	if (res < 0) {  
-	    if ((errno != EINTR) && (errno != ERRNO_BLOCK))
-		port_inp_failure(port_num, ready_fd, res);
-	}
-	else if (res == 0) {     	/* eof */
-	    port_inp_failure(port_num, ready_fd, res);
-	} 
-	else if (res < packet_bytes - fd_data[ready_fd].psz) { 
-	    memcpy(fd_data[ready_fd].pbuf+fd_data[ready_fd].psz,
-		   read_buf, res);
-	    fd_data[ready_fd].psz += res;
-	}
-	else  { /* if (res >= packet_bytes) */
-	    unsigned char* cpos = read_buf;
-	    int bytes_left = res;
-
-	    while (1) {
-		int psz = fd_data[ready_fd].psz;
-		char* pbp = fd_data[ready_fd].pbuf + psz;
-
-		while(bytes_left && (psz < packet_bytes)) {
-		    *pbp++ = *cpos++;
-		    bytes_left--;
-		    psz++;
-		}
-		
-		if (psz < packet_bytes) {
-		    fd_data[ready_fd].psz = psz;
-		    break;
-		}
-		fd_data[ready_fd].psz = 0;
-
-		switch (packet_bytes) {
-		case 1: h = get_int8(fd_data[ready_fd].pbuf);  break;
-		case 2: h = get_int16(fd_data[ready_fd].pbuf); break;
-		case 4: h = get_int32(fd_data[ready_fd].pbuf); break;
-		default: ASSERT(0); return; /* -1; */
-		}
-
-		if (h <= (bytes_left)) {
-		    driver_output(port_num, (char*) cpos, h);
-		    cpos += h;
-		    bytes_left -= h;
-		    continue;
-		}
-		else {		/* The last message we got was split */
-		        char *buf = erts_alloc_fnf(ERTS_ALC_T_FD_ENTRY_BUF, h);
-		    if (!buf) {
-			errno = ENOMEM;
-			port_inp_failure(port_num, ready_fd, -1);
-		    }
-		    else {
-			erts_smp_atomic_add_nob(&sys_misc_mem_sz, h);
-			sys_memcpy(buf, cpos, bytes_left);
-			fd_data[ready_fd].buf = buf;
-			fd_data[ready_fd].sz = h;
-			fd_data[ready_fd].remain = h - bytes_left;
-			fd_data[ready_fd].cpos = buf + bytes_left;
-		    }
-		    break;
-		}
-	    }
-	}
-	erts_free(ERTS_ALC_T_SYS_READ_BUF, (void *) read_buf);
-    }
-}
-
-
-/* fd is the drv_data that is returned from the */
-/* initial start routine                        */
-/* ready_fd is the descriptor that is ready to read */
-
-static void ready_output(ErlDrvData e, ErlDrvEvent ready_fd)
-{
-    int fd = (int)(long)e;
-    ErlDrvPort ix = driver_data[fd].port_num;
-    int n;
-    struct iovec* iv;
-    int vsize;
-    
-
-    if ((iv = (struct iovec*) driver_peekq(ix, &vsize)) == NULL) {
-	driver_select(ix, ready_fd, ERL_DRV_WRITE, 0);
-        if (driver_data[fd].terminating)
-            driver_failure_atom(driver_data[fd].port_num,"normal");
-	return; /* 0; */
-    }
-    vsize = vsize > MAX_VSIZE ? MAX_VSIZE : vsize;
-    if ((n = writev(ready_fd, iv, vsize)) > 0) {
-	if (driver_deq(ix, n) == 0)
-	    set_busy_port(ix, 0);
-    }
-    else if (n < 0) {
-	if (errno == ERRNO_BLOCK || errno == EINTR)
-	    return; /* 0; */
-	else {
-	    int res = errno;
-	    driver_select(ix, ready_fd, ERL_DRV_WRITE, 0);
-	    driver_failure_posix(ix, res);
-	    return; /* -1; */
-	}
-    }
-    return; /* 0; */
-}
-
-static void stop_select(ErlDrvEvent fd, void* _)
-{
-    close((int)fd);
-}
-
-#if FDBLOCK
-
-static void
-fd_async(void *async_data)
-{
-    int res;
-    struct driver_data *dd = (struct driver_data*)async_data;
-    SysIOVec      *iov0;
-    SysIOVec      *iov;
-    int            iovlen;
-    int            err = 0;
-    /* much of this code is stolen from efile_drv:invoke_writev */
-    driver_pdl_lock(dd->blocking->pdl);
-    iov0 = driver_peekq(dd->port_num, &iovlen);
-    iovlen = iovlen < MAXIOV ? iovlen : MAXIOV;
-    iov = erts_alloc_fnf(ERTS_ALC_T_SYS_WRITE_BUF,
-                         sizeof(SysIOVec)*iovlen);
-    if (!iov) {
-        res = -1;
-        err = ENOMEM;
-        driver_pdl_unlock(dd->blocking->pdl);
-    } else {
-        memcpy(iov,iov0,iovlen*sizeof(SysIOVec));
-        driver_pdl_unlock(dd->blocking->pdl);
-
-        do {
-            res = writev(dd->ofd, iov, iovlen);
-        } while (res < 0 && errno == EINTR);
-        if (res < 0)
-            err = errno;
-
-        erts_free(ERTS_ALC_T_SYS_WRITE_BUF, iov);
-    }
-    dd->blocking->res = res;
-    dd->blocking->err = err;
-}
-
-void fd_ready_async(ErlDrvData drv_data,
-                    ErlDrvThreadData thread_data) {
-    struct driver_data *dd = (struct driver_data *)thread_data;
-    ErlDrvPort port_num = dd->port_num;
-
-    ASSERT(dd->blocking);
-    ASSERT(dd == (driver_data + (int)(long)drv_data));
-
-    if (dd->blocking->res > 0) {
-        driver_pdl_lock(dd->blocking->pdl);
-        if (driver_deq(port_num, dd->blocking->res) == 0) {
-            driver_pdl_unlock(dd->blocking->pdl);
-            set_busy_port(port_num, 0);
-            if (dd->terminating) {
-                /* The port is has been ordered to terminate
-                   from either fd_flush or port_inp_failure */
-                if (dd->terminating == 1)
-                    driver_failure_atom(port_num, "normal");
-                else if (dd->terminating == 2)
-                    driver_failure_eof(port_num);
-                else if (dd->terminating < 0)
-                    driver_failure_posix(port_num, -dd->terminating);
-                return; /* -1; */
-            }
-        } else {
-            driver_pdl_unlock(dd->blocking->pdl);
-            /* still data left to write in queue */
-            driver_async(port_num, &dd->blocking->pkey, fd_async, dd, NULL);
-            return /* 0; */;
-        }
-    } else if (dd->blocking->res < 0) {
-        if (dd->blocking->err == ERRNO_BLOCK) {
-            set_busy_port(port_num, 1);
-            /* still data left to write in queue */
-            driver_async(port_num, &dd->blocking->pkey, fd_async, dd, NULL);
-        } else
-            driver_failure_posix(port_num, dd->blocking->err);
-        return; /* -1; */
-    }
-    return; /* 0; */
-}
-
-#endif
-
 void erts_do_break_handling(void)
 {
     struct termios temp_mode;
@@ -2738,10 +1017,6 @@ erts_sys_unsetenv(char *key)
 void
 sys_init_io(void)
 {
-    fd_data = (struct fd_data *)
-	erts_alloc(ERTS_ALC_T_FD_TAB, max_files * sizeof(struct fd_data));
-    erts_smp_atomic_add_nob(&sys_misc_mem_sz,
-			    max_files * sizeof(struct fd_data));
 }
 
 #if (0) /* unused? */
@@ -2935,179 +1210,6 @@ erl_debug(char* fmt, ...)
 
 #endif /* DEBUG */
 
-static ERTS_INLINE void
-report_exit_status(ErtsSysReportExit *rep, int status)
-{
-    Port *pp;
-#ifdef ERTS_SMP
-    CHLD_STAT_UNLOCK;
-    pp = erts_thr_id2port_sflgs(rep->port,
-				ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP);
-    CHLD_STAT_LOCK;
-#else
-    pp = erts_id2port_sflgs(rep->port,
-			    NULL,
-			    0,
-			    ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP);
-#endif
-    if (pp) {
-	if (rep->ifd >= 0) {
-	    driver_data[rep->ifd].alive = 0;
-	    driver_data[rep->ifd].status = status;
-	    (void) driver_select(ERTS_Port2ErlDrvPort(pp),
-				 rep->ifd,
-				 (ERL_DRV_READ|ERL_DRV_USE),
-				 1);
-	}
-	if (rep->ofd >= 0) {
-	    driver_data[rep->ofd].alive = 0;
-	    driver_data[rep->ofd].status = status;
-	    (void) driver_select(ERTS_Port2ErlDrvPort(pp),
-				 rep->ofd,
-				 (ERL_DRV_WRITE|ERL_DRV_USE),
-				 1);
-	}
-#ifdef ERTS_SMP
-	erts_thr_port_release(pp);
-#else
-	erts_port_release(pp);
-#endif
-    }
-    erts_free(ERTS_ALC_T_PRT_REP_EXIT, rep);
-}
-
-#if !CHLDWTHR  /* ---------------------------------------------------------- */
-
-#define ERTS_REPORT_EXIT_STATUS report_exit_status
-
-static int check_children(void)
-{
-    int res = 0;
-    int pid;
-    int status;
-
-#ifndef ERTS_SMP
-    if (children_died)
-#endif
-    {
-	sys_sigblock(SIGCHLD);
-	CHLD_STAT_LOCK;
-	while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
-	    note_child_death(pid, status);
-#ifndef ERTS_SMP
-	children_died = 0;
-#endif
-	CHLD_STAT_UNLOCK;
-	sys_sigrelease(SIGCHLD);
-	res = 1;
-    }
-    return res;
-}
-
-#ifdef ERTS_SMP
-
-void
-erts_check_children(void)
-{
-    (void) check_children();
-}
-
-#endif
-
-#elif CHLDWTHR && defined(ERTS_SMP) /* ------------------------------------- */
-
-#define ERTS_REPORT_EXIT_STATUS report_exit_status
-
-#define check_children() (0)
-
-
-#else /* CHLDWTHR && !defined(ERTS_SMP) ------------------------------------ */
-
-#define ERTS_REPORT_EXIT_STATUS initiate_report_exit_status
-
-static ERTS_INLINE void
-initiate_report_exit_status(ErtsSysReportExit *rep, int status)
-{
-    rep->next = report_exit_transit_list;
-    rep->status = status;
-    report_exit_transit_list = rep;
-    erts_sys_schedule_interrupt(1);
-}
-
-static int check_children(void)
-{
-    int res;
-    ErtsSysReportExit *rep;
-    CHLD_STAT_LOCK;
-    rep = report_exit_transit_list;
-    res = rep != NULL;
-    while (rep) {
-	ErtsSysReportExit *curr_rep = rep;
-	rep = rep->next;
-	report_exit_status(curr_rep, curr_rep->status);
-    }
-    report_exit_transit_list = NULL;
-    CHLD_STAT_UNLOCK;
-    return res;
-}
-
-#endif /* ------------------------------------------------------------------ */
-
-static void note_child_death(int pid, int status)
-{
-    ErtsSysReportExit **repp = &report_exit_list;
-    ErtsSysReportExit *rep = report_exit_list;
-
-    while (rep) {
-	if (pid == rep->pid) {
-	    *repp = rep->next;
-	    ERTS_REPORT_EXIT_STATUS(rep, status);
-	    break;
-	}
-	repp = &rep->next;
-	rep = rep->next;
-    }
-}
-
-#if CHLDWTHR
-
-static void *
-child_waiter(void *unused)
-{
-  int pid;
-  int status;
-
-#ifdef ERTS_ENABLE_LOCK_CHECK
-  erts_lc_set_thread_name("child waiter");
-#endif
-
-  while(1) {
-#ifdef DEBUG
-      int waitpid_errno;
-#endif
-      pid = waitpid(-1, &status, 0);
-#ifdef DEBUG
-      waitpid_errno = errno;
-#endif
-      CHLD_STAT_LOCK;
-      if (pid < 0) {
-	  ASSERT(waitpid_errno == ECHILD);
-      }
-      else {
-	  children_alive--;
-	  ASSERT(children_alive >= 0);
-	  note_child_death(pid, status);
-      }
-      while (!children_alive)
-	  CHLD_STAT_WAIT; /* Wait for children to wait on... :) */
-      CHLD_STAT_UNLOCK;
-  }
-
-  return NULL;
-}
-
-#endif
-
 /*
  * Called from schedule() when it runs out of runnable processes,
  * or when Erlang code has performed INPUT_REDUCTIONS reduction
@@ -3116,13 +1218,8 @@ child_waiter(void *unused)
 void
 erl_sys_schedule(int runnable)
 {
-#ifdef ERTS_SMP
     ERTS_CHK_IO(!runnable);
-#else
-    ERTS_CHK_IO(runnable ? 0 : !check_children());
-#endif
     ERTS_SMP_LC_ASSERT(!erts_thr_progress_is_blocking());
-    (void) check_children();
 }
 
 
@@ -3150,10 +1247,6 @@ smp_sig_notify(char c)
 static void *
 signal_dispatcher_thread_func(void *unused)
 {
-#if !CHLDWTHR
-    int initialized = 0;
-    int notify_check_children = 0;
-#endif
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_lc_set_thread_name("signal_dispatcher");
 #endif
@@ -3165,7 +1258,7 @@ signal_dispatcher_thread_func(void *unused)
 	if (res < 0) {
 	    if (errno == EINTR)
 		continue;
-	    erl_exit(ERTS_ABORT_EXIT,
+	    erts_exit(ERTS_ABORT_EXIT,
 		     "signal-dispatcher thread got unexpected error: %s (%d)\n",
 		     erl_errno_id(errno),
 		     errno);
@@ -3191,19 +1284,7 @@ signal_dispatcher_thread_func(void *unused)
 	     */
 	    switch (buf[i]) {
 	    case 0: /* Emulator initialized */
-#if !CHLDWTHR
-		initialized = 1;
-		if (!notify_check_children)
-#endif
-		    break;
-#if !CHLDWTHR
-	    case 'C': /* SIGCHLD */
-		if (initialized)
-		    erts_smp_notify_check_children_needed();
-		else
-		    notify_check_children = 1;
-		break;
-#endif
+                break;
 	    case 'I': /* SIGINT */
 		break_requested();
 		break;
@@ -3214,7 +1295,7 @@ signal_dispatcher_thread_func(void *unused)
 		sigusr1_exit();
 		break;
 	    default:
-		erl_exit(ERTS_ABORT_EXIT,
+		erts_exit(ERTS_ABORT_EXIT,
 			 "signal-dispatcher thread received unknown "
 			 "signal notification: '%c'\n",
 			 buf[i]);
@@ -3233,7 +1314,7 @@ init_smp_sig_notify(void)
     thr_opts.name = "sys_sig_dispatcher";
 
     if (pipe(sig_notify_fds) < 0) {
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "Failed to create signal-dispatcher pipe: %s (%d)\n",
 		 erl_errno_id(errno),
 		 errno);
@@ -3248,12 +1329,14 @@ init_smp_sig_notify(void)
 
 static void
 init_smp_sig_suspend(void) {
+#ifdef ERTS_SYS_SUSPEND_SIGNAL
   if (pipe(sig_suspend_fds) < 0) {
-    erl_exit(ERTS_ABORT_EXIT,
+    erts_exit(ERTS_ABORT_EXIT,
 	     "Failed to create sig_suspend pipe: %s (%d)\n",
 	     erl_errno_id(errno),
 	     errno);
   }
+#endif
 }
 
 #ifdef __DARWIN__
@@ -3265,7 +1348,7 @@ static void initialize_darwin_main_thread_pipes(void)
 {
     if (pipe(erts_darwin_main_thread_pipe) < 0 || 
 	pipe(erts_darwin_main_thread_result_pipe) < 0) {
-	erl_exit(1,"Fatal error initializing Darwin main thread stealing");
+	erts_exit(ERTS_ERROR_EXIT,"Fatal error initializing Darwin main thread stealing");
     }
 }
 
diff --git a/erts/emulator/sys/unix/sys_drivers.c b/erts/emulator/sys/unix/sys_drivers.c
new file mode 100644
index 0000000000..82fea1b330
--- /dev/null
+++ b/erts/emulator/sys/unix/sys_drivers.c
@@ -0,0 +1,1862 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 1996-2014. 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%
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#ifdef ISC32
+#define _POSIX_SOURCE
+#define _XOPEN_SOURCE
+#endif
+
+#include <sys/times.h>		/* ! */
+#include <time.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <sys/uio.h>
+#include <termios.h>
+#include <ctype.h>
+#include <sys/utsname.h>
+#include <sys/select.h>
+#include <arpa/inet.h>
+
+#ifdef ISC32
+#include <sys/bsdtypes.h>
+#endif
+
+#include <termios.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#define WANT_NONBLOCKING    /* must define this to pull in defs from sys.h */
+#include "sys.h"
+
+#ifdef USE_THREADS
+#include "erl_threads.h"
+#endif
+
+extern char **environ;
+extern erts_smp_rwmtx_t environ_rwmtx;
+
+extern erts_smp_atomic_t sys_misc_mem_sz;
+
+static Eterm forker_port;
+
+#define MAX_VSIZE 16		/* Max number of entries allowed in an I/O
+				 * vector sock_sendv().
+				 */
+/*
+ * Don't need global.h, but erl_cpu_topology.h won't compile otherwise
+ */
+#include "global.h"
+#include "erl_cpu_topology.h"
+
+#include "erl_sys_driver.h"
+#include "sys_uds.h"
+
+#include "erl_child_setup.h"
+
+#if defined IOV_MAX
+#define MAXIOV IOV_MAX
+#elif defined UIO_MAXIOV
+#define MAXIOV UIO_MAXIOV
+#else
+#define MAXIOV 16
+#endif
+
+#ifdef USE_THREADS
+#  define FDBLOCK 1
+#else
+#  define FDBLOCK 0
+#endif
+
+/* Used by the fd driver iff the fd could not be set to non-blocking */
+typedef struct ErtsSysBlocking_ {
+    ErlDrvPDL pdl;
+    int res;
+    int err;
+    unsigned int pkey;
+} ErtsSysBlocking;
+
+typedef struct fd_data {
+    int   fd;
+    char  pbuf[4];   /* hold partial packet bytes */
+    int   psz;       /* size of pbuf */
+    char  *buf;
+    char  *cpos;
+    int   sz;
+    int   remain;  /* for input on fd */
+} ErtsSysFdData;
+
+typedef struct driver_data {
+    ErlDrvPort port_num;
+    ErtsSysFdData *ofd;
+    ErtsSysFdData *ifd;
+    int packet_bytes;
+    int pid;
+    int alive;
+    int status;
+    int terminating;
+    ErtsSysBlocking *blocking;
+} ErtsSysDriverData;
+
+#define DIR_SEPARATOR_CHAR    '/'
+
+#if defined(__ANDROID__)
+#define SHELL "/system/bin/sh"
+#else
+#define SHELL "/bin/sh"
+#endif /* __ANDROID__ */
+
+#if defined(DEBUG)
+#define ERL_BUILD_TYPE_MARKER ".debug"
+#elif defined(PURIFY)
+#define ERL_BUILD_TYPE_MARKER ".purify"
+#elif defined(QUANTIFY)
+#define ERL_BUILD_TYPE_MARKER ".quantify"
+#elif defined(PURECOV)
+#define ERL_BUILD_TYPE_MARKER ".purecov"
+#elif defined(VALGRIND)
+#define ERL_BUILD_TYPE_MARKER ".valgrind"
+#else /* opt */
+#define ERL_BUILD_TYPE_MARKER
+#endif
+
+#ifdef DEBUG
+#define close(fd) do { int res = close(fd); ASSERT(res > -1); } while(0)
+#endif
+
+#define CHILD_SETUP_PROG_NAME	"erl_child_setup" ERL_BUILD_TYPE_MARKER
+
+// #define HARD_DEBUG
+#ifdef HARD_DEBUG
+#define driver_select(port_num, fd, flags, onoff)                       \
+    do {                                                                \
+        if (((flags) & ERL_DRV_READ) && onoff)                          \
+            fprintf(stderr,"%010d %p: read select %d\r\n", __LINE__, port_num, (int)fd); \
+        if (((flags) & ERL_DRV_WRITE) && onoff)                         \
+            fprintf(stderr,"%010d %p: writ select %d\r\n", __LINE__, port_num, (int)fd); \
+        if (((flags) & ERL_DRV_READ) && !onoff)                          \
+            fprintf(stderr,"%010d %p: read unsele %d\r\n", __LINE__, port_num, (int)fd); \
+        if (((flags) & ERL_DRV_WRITE) && !onoff)                         \
+            fprintf(stderr,"%010d %p: writ unsele %d\r\n", __LINE__, port_num, (int)fd); \
+        driver_select_nkp(port_num, fd, flags, onoff);                  \
+    } while(0)
+#endif
+
+/*
+ * Decreasing the size of it below 16384 is not allowed.
+ */
+
+#define ERTS_SYS_READ_BUF_SZ (64*1024)
+
+/* I. Initialization */
+
+void
+erl_sys_late_init(void)
+{
+    SysDriverOpts opts;
+#ifdef ERTS_SMP
+    Port *port;
+#endif
+
+    sys_signal(SIGPIPE, SIG_IGN); /* Ignore - we'll handle the write failure */
+
+    opts.packet_bytes = 0;
+    opts.use_stdio = 1;
+    opts.redir_stderr = 0;
+    opts.read_write = 0;
+    opts.hide_window = 0;
+    opts.wd = NULL;
+    opts.envir = NULL;
+    opts.exit_status = 0;
+    opts.overlapped_io = 0;
+    opts.spawn_type = ERTS_SPAWN_ANY;
+    opts.argv = NULL;
+    opts.parallelism = erts_port_parallelism;
+
+#ifdef ERTS_SMP
+    port =
+#endif
+        erts_open_driver(&forker_driver, make_internal_pid(0), "forker", &opts, NULL, NULL);
+#ifdef ERTS_SMP
+    erts_mtx_unlock(port->lock);
+#endif
+}
+
+/* II. Prototypes */
+
+/* II.I Spawn prototypes */
+static ErlDrvData spawn_start(ErlDrvPort, char*, SysDriverOpts*);
+static ErlDrvSSizeT spawn_control(ErlDrvData, unsigned int, char *,
+                                  ErlDrvSizeT, char **, ErlDrvSizeT);
+
+/* II.II Vanilla prototypes */
+static ErlDrvData vanilla_start(ErlDrvPort, char*, SysDriverOpts*);
+
+
+/* II.III FD prototypes */
+static ErlDrvData fd_start(ErlDrvPort, char*, SysDriverOpts*);
+#if FDBLOCK
+static void fd_async(void *);
+static void fd_ready_async(ErlDrvData drv_data, ErlDrvThreadData thread_data);
+#endif
+static ErlDrvSSizeT fd_control(ErlDrvData, unsigned int, char *, ErlDrvSizeT,
+			       char **, ErlDrvSizeT);
+static void fd_stop(ErlDrvData);
+static void fd_flush(ErlDrvData);
+
+/* II.IV Common prototypes */
+static void stop(ErlDrvData);
+static void ready_input(ErlDrvData, ErlDrvEvent);
+static void ready_output(ErlDrvData, ErlDrvEvent);
+static void output(ErlDrvData, char*, ErlDrvSizeT);
+static void outputv(ErlDrvData, ErlIOVec*);
+static void stop_select(ErlDrvEvent, void*);
+
+/* II.V Forker prototypes */
+static ErlDrvData forker_start(ErlDrvPort, char*, SysDriverOpts*);
+static void forker_stop(ErlDrvData);
+static void forker_ready_input(ErlDrvData, ErlDrvEvent);
+static void forker_ready_output(ErlDrvData, ErlDrvEvent);
+static ErlDrvSSizeT forker_control(ErlDrvData, unsigned int, char *,
+                                   ErlDrvSizeT, char **, ErlDrvSizeT);
+
+/* III Driver entries */
+
+/* III.I The spawn driver */
+struct erl_drv_entry spawn_driver_entry = {
+    NULL,
+    spawn_start,
+    stop,
+    output,
+    ready_input,
+    ready_output,
+    "spawn",
+    NULL,
+    NULL,
+    spawn_control,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    ERL_DRV_EXTENDED_MARKER,
+    ERL_DRV_EXTENDED_MAJOR_VERSION,
+    ERL_DRV_EXTENDED_MINOR_VERSION,
+    ERL_DRV_FLAG_USE_PORT_LOCKING | ERL_DRV_FLAG_USE_INIT_ACK,
+    NULL, NULL,
+    stop_select
+};
+
+/* III.II The fd driver */
+struct erl_drv_entry fd_driver_entry = {
+    NULL,
+    fd_start,
+    fd_stop,
+    output,
+    ready_input,
+    ready_output,
+    "fd",
+    NULL,
+    NULL,
+    fd_control,
+    NULL,
+    outputv,
+#if FDBLOCK
+    fd_ready_async, /* ready_async */
+#else
+    NULL,
+#endif
+    fd_flush, /* flush */
+    NULL, /* call */
+    NULL, /* event */
+    ERL_DRV_EXTENDED_MARKER,
+    ERL_DRV_EXTENDED_MAJOR_VERSION,
+    ERL_DRV_EXTENDED_MINOR_VERSION,
+    0, /* ERL_DRV_FLAGs */
+    NULL, /* handle2 */
+    NULL, /* process_exit */
+    stop_select
+};
+
+/* III.III The vanilla driver */
+struct erl_drv_entry vanilla_driver_entry = {
+    NULL,
+    vanilla_start,
+    stop,
+    output,
+    ready_input,
+    ready_output,
+    "vanilla",
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL, /* flush */
+    NULL, /* call */
+    NULL, /* event */
+    ERL_DRV_EXTENDED_MARKER,
+    ERL_DRV_EXTENDED_MAJOR_VERSION,
+    ERL_DRV_EXTENDED_MINOR_VERSION,
+    0, /* ERL_DRV_FLAGs */
+    NULL, /* handle2 */
+    NULL, /* process_exit */
+    stop_select
+};
+
+/* III.III The forker driver */
+struct erl_drv_entry forker_driver_entry = {
+    NULL,
+    forker_start,
+    forker_stop,
+    NULL,
+    forker_ready_input,
+    forker_ready_output,
+    "spawn_forker",
+    NULL,
+    NULL,
+    forker_control,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    ERL_DRV_EXTENDED_MARKER,
+    ERL_DRV_EXTENDED_MAJOR_VERSION,
+    ERL_DRV_EXTENDED_MINOR_VERSION,
+    0,
+    NULL, NULL,
+    stop_select
+};
+
+/* Untility functions */
+
+static int set_blocking_data(ErtsSysDriverData *dd) {
+
+    dd->blocking = erts_alloc(ERTS_ALC_T_SYS_BLOCKING, sizeof(ErtsSysBlocking));
+
+    erts_smp_atomic_add_nob(&sys_misc_mem_sz, sizeof(ErtsSysBlocking));
+
+    dd->blocking->pdl = driver_pdl_create(dd->port_num);
+    dd->blocking->res = 0;
+    dd->blocking->err = 0;
+    dd->blocking->pkey = driver_async_port_key(dd->port_num);
+
+    return 1;
+}
+
+static void init_fd_data(ErtsSysFdData *fd_data, int fd)
+{
+    fd_data->fd = fd;
+    fd_data->buf = NULL;
+    fd_data->cpos = NULL;
+    fd_data->remain = 0;
+    fd_data->sz = 0;
+    fd_data->psz = 0;
+}
+
+static ErtsSysDriverData *
+create_driver_data(ErlDrvPort port_num,
+                   int ifd,
+                   int ofd,
+                   int packet_bytes,
+                   int read_write,
+                   int exit_status,
+                   int pid,
+                   int is_blocking)
+{
+    Port *prt;
+    ErtsSysDriverData *driver_data;
+    char *data;
+    int size = sizeof(ErtsSysDriverData);
+
+    if (read_write & DO_READ)
+        size += sizeof(ErtsSysFdData);
+
+    if ((read_write & DO_WRITE) &&
+        ((ifd != ofd || ofd == -1) || !(read_write & DO_READ)))
+        size += sizeof(ErtsSysFdData);
+
+    data = erts_alloc(ERTS_ALC_T_DRV_TAB,size);
+    erts_smp_atomic_add_nob(&sys_misc_mem_sz, size);
+
+    driver_data = (ErtsSysDriverData*)data;
+    data += sizeof(*driver_data);
+
+    prt = erts_drvport2port(port_num);
+    if (prt != ERTS_INVALID_ERL_DRV_PORT)
+	prt->os_pid = pid;
+
+    driver_data->packet_bytes = packet_bytes;
+    driver_data->port_num = port_num;
+    driver_data->pid = pid;
+    driver_data->alive = exit_status ? 1 : 0;
+    driver_data->status = 0;
+    driver_data->terminating = 0;
+    driver_data->blocking = NULL;
+
+    if (read_write & DO_READ) {
+        driver_data->ifd = (ErtsSysFdData*)data;
+        data += sizeof(*driver_data->ifd);
+        init_fd_data(driver_data->ifd, ifd);
+        driver_select(port_num, ifd, (ERL_DRV_READ|ERL_DRV_USE), 1);
+    } else {
+        driver_data->ifd = NULL;
+    }
+
+    if (read_write & DO_WRITE) {
+        if (ofd != -1 && ifd == ofd && read_write & DO_READ) {
+            /* This is for when ifd and ofd are the same fd */
+            driver_data->ofd = driver_data->ifd;
+        } else {
+            driver_data->ofd = (ErtsSysFdData*)data;
+            data += sizeof(*driver_data->ofd);
+            init_fd_data(driver_data->ofd, ofd);
+        }
+        if (is_blocking && FDBLOCK)
+            if (!set_blocking_data(driver_data)) {
+                erts_free(ERTS_ALC_T_DRV_TAB, driver_data);
+                return NULL;
+            }
+    } else {
+        driver_data->ofd = NULL;
+    }
+
+    return driver_data;
+}
+
+/* Spawn driver */
+
+static void close_pipes(int ifd[2], int ofd[2])
+{
+    close(ifd[0]);
+    close(ifd[1]);
+    close(ofd[0]);
+    close(ofd[1]);
+}
+
+static char **build_unix_environment(char *block)
+{
+    int i;
+    int j;
+    int len;
+    char *cp;
+    char **cpp;
+    char** old_env;
+    
+    ERTS_SMP_LC_ASSERT(erts_smp_lc_rwmtx_is_rlocked(&environ_rwmtx));
+
+    cp = block;
+    len = 0;
+    while (*cp != '\0') {
+	cp += strlen(cp) + 1;
+	len++;
+    }
+    old_env = environ;
+    while (*old_env++ != NULL) {
+	len++;
+    }
+    
+    cpp = (char **) erts_alloc_fnf(ERTS_ALC_T_ENVIRONMENT,
+				   sizeof(char *) * (len+1));
+    if (cpp == NULL) {
+	return NULL;
+    }
+
+    cp = block;
+    len = 0;
+    while (*cp != '\0') {
+	cpp[len] = cp;
+	cp += strlen(cp) + 1;
+	len++;
+    }
+    
+    i = len;
+    for (old_env = environ; *old_env; old_env++) {
+	char* old = *old_env;
+
+	for (j = 0; j < len; j++) {
+	    char *s, *t;
+
+	    /* check if cpp[j] equals old
+	       before the = sign,
+	       i.e.
+	       "TMPDIR=/tmp/" */
+	    s = cpp[j];
+	    t = old;
+	    while (*s == *t && *s != '=') {
+		s++, t++;
+	    }
+	    if (*s == '=' && *t == '=') {
+		break;
+	    }
+	}
+
+	if (j == len) {		/* New version not found */
+	    cpp[len++] = old;
+	}
+    }
+
+    for (j = 0; j < i; ) {
+        size_t last = strlen(cpp[j])-1;
+	if (cpp[j][last] == '=' && strchr(cpp[j], '=') == cpp[j]+last) {
+	    cpp[j] = cpp[--len];
+	    if (len < i) {
+		i--;
+	    } else {
+		j++;
+	    }
+	}
+	else {
+	    j++;
+	}
+    }
+
+    cpp[len] = NULL;
+    return cpp;
+}
+
+static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
+                              SysDriverOpts* opts)
+{
+#define CMD_LINE_PREFIX_STR "exec "
+#define CMD_LINE_PREFIX_STR_SZ (sizeof(CMD_LINE_PREFIX_STR) - 1)
+
+    int len;
+    char **new_environ;
+    ErtsSysDriverData *dd;
+    char *cmd_line;
+    char wd_buff[MAXPATHLEN+1];
+    char *wd;
+    int ifd[2], ofd[2], stderrfd;
+
+    if (pipe(ifd) < 0) return ERL_DRV_ERROR_ERRNO;
+    errno = EMFILE;		/* default for next three conditions */
+    if (ifd[0] >= sys_max_files() || pipe(ofd) < 0) {
+        close(ifd[0]);
+        close(ifd[1]);
+        return ERL_DRV_ERROR_ERRNO;
+    }
+    if (ofd[1] >= sys_max_files()) {
+        close_pipes(ifd, ofd);
+        errno = EMFILE;
+        return ERL_DRV_ERROR_ERRNO;
+    }
+
+    SET_NONBLOCKING(ifd[0]);
+    SET_NONBLOCKING(ofd[1]);
+
+    stderrfd = opts->redir_stderr ? ifd[1] : dup(2);
+
+    if (stderrfd >= sys_max_files() || stderrfd < 0) {
+        close_pipes(ifd, ofd);
+        if (stderrfd > -1)
+            close(stderrfd);
+        return ERL_DRV_ERROR_ERRNO;
+    }
+
+    if (opts->spawn_type == ERTS_SPAWN_EXECUTABLE) {
+	/* started with spawn_executable, not with spawn */
+	len = strlen(name);
+	cmd_line = (char *) erts_alloc_fnf(ERTS_ALC_T_TMP, len + 1);
+	if (!cmd_line) {
+            close_pipes(ifd, ofd);
+	    errno = ENOMEM;
+	    return ERL_DRV_ERROR_ERRNO;
+	}
+	memcpy((void *) cmd_line,(void *) name, len);
+	cmd_line[len] = '\0';
+	len = len + 1;
+	if (access(cmd_line,X_OK) != 0) {
+	    int save_errno = errno;
+	    erts_free(ERTS_ALC_T_TMP, cmd_line);
+            close_pipes(ifd, ofd);
+	    errno = save_errno;
+	    return ERL_DRV_ERROR_ERRNO;
+	}
+    } else {
+	/* make the string suitable for giving to "sh" */
+	len = strlen(name);
+	cmd_line = (char *) erts_alloc_fnf(ERTS_ALC_T_TMP,
+					   CMD_LINE_PREFIX_STR_SZ + len + 1);
+	if (!cmd_line) {
+            close_pipes(ifd, ofd);
+	    errno = ENOMEM;
+	    return ERL_DRV_ERROR_ERRNO;
+	}
+	memcpy((void *) cmd_line,
+	       (void *) CMD_LINE_PREFIX_STR,
+	       CMD_LINE_PREFIX_STR_SZ);
+	memcpy((void *) (cmd_line + CMD_LINE_PREFIX_STR_SZ), (void *) name, len);
+	cmd_line[CMD_LINE_PREFIX_STR_SZ + len] = '\0';
+	len = CMD_LINE_PREFIX_STR_SZ + len + 1;
+    }
+
+    erts_smp_rwmtx_rlock(&environ_rwmtx);
+
+    if (opts->envir == NULL) {
+	new_environ = environ;
+    } else if ((new_environ = build_unix_environment(opts->envir)) == NULL) {
+	erts_smp_rwmtx_runlock(&environ_rwmtx);
+        close_pipes(ifd, ofd);
+	erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
+	errno = ENOMEM;
+	return ERL_DRV_ERROR_ERRNO;
+    }
+
+    if (opts->wd == NULL) {
+        if ((wd = getcwd(wd_buff, MAXPATHLEN+1)) == NULL) {
+            /* on some OSs this call opens a fd in the
+               background which means that this can
+               return EMFILE */
+            int err = errno;
+            close_pipes(ifd, ofd);
+            erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
+            if (new_environ != environ)
+                erts_free(ERTS_ALC_T_ENVIRONMENT, (void *) new_environ);
+            erts_smp_rwmtx_runlock(&environ_rwmtx);
+            errno = err;
+            return ERL_DRV_ERROR_ERRNO;
+        }
+    } else {
+        wd = opts->wd;
+    }
+
+    {
+        struct iovec *io_vector;
+        int iov_len = 5;
+        char nullbuff[] = "\0";
+        int j, i = 0, res;
+        Sint32 buffsz = 0, env_len = 0, argv_len = 0,
+            flags = (opts->use_stdio ? FORKER_FLAG_USE_STDIO : 0)
+            | (opts->exit_status ? FORKER_FLAG_EXIT_STATUS : 0)
+            | (opts->read_write & DO_READ ? FORKER_FLAG_DO_READ : 0)
+            | (opts->read_write & DO_WRITE ? FORKER_FLAG_DO_WRITE : 0);
+
+        /* count number of elements in environment */
+        while(new_environ[env_len] != NULL)
+            env_len++;
+        iov_len += 1 + env_len; /* num envs including size int */
+
+        /* count number of element in argument list */
+        if (opts->spawn_type == ERTS_SPAWN_EXECUTABLE) {
+            if (opts->argv != NULL) {
+                while(opts->argv[argv_len] != NULL)
+                    argv_len++;
+            } else {
+                argv_len++;
+            }
+            iov_len += 1 + argv_len; /* num argvs including size int */
+        }
+
+        io_vector = erts_alloc_fnf(ERTS_ALC_T_TMP, sizeof(struct iovec) * iov_len);
+
+        if (!io_vector) {
+            close_pipes(ifd, ofd);
+            erts_smp_rwmtx_runlock(&environ_rwmtx);
+            erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
+            if (new_environ != environ)
+                erts_free(ERTS_ALC_T_ENVIRONMENT, (void *) new_environ);
+            errno = ENOMEM;
+            return ERL_DRV_ERROR_ERRNO;
+        }
+
+        io_vector[i].iov_base = (void*)&buffsz;
+        io_vector[i++].iov_len = sizeof(buffsz);
+
+        io_vector[i].iov_base = (void*)&flags;
+        flags = htonl(flags);
+        io_vector[i++].iov_len = sizeof(flags);
+        buffsz += sizeof(flags);
+
+        io_vector[i].iov_base = cmd_line;
+        io_vector[i++].iov_len = len;
+        buffsz += len;
+
+        io_vector[i].iov_base = wd;
+        io_vector[i].iov_len = strlen(io_vector[i].iov_base) + 1;
+        buffsz += io_vector[i++].iov_len;
+
+        io_vector[i].iov_base = nullbuff;
+        io_vector[i++].iov_len = 1;
+        buffsz += io_vector[i-1].iov_len;
+
+        io_vector[i].iov_base = (void*)&env_len;
+        env_len = htonl(env_len);
+        io_vector[i++].iov_len = sizeof(env_len);
+        buffsz += io_vector[i-1].iov_len;
+
+        for (j = 0; new_environ[j] != NULL; j++) {
+            io_vector[i].iov_base = new_environ[j];
+            io_vector[i++].iov_len = strlen(new_environ[j]) + 1;
+            buffsz += io_vector[i-1].iov_len;
+        }
+
+        /* only append arguments if this was a spawn_executable */
+        if (opts->spawn_type == ERTS_SPAWN_EXECUTABLE) {
+
+            io_vector[i].iov_base = (void*)&argv_len;
+            argv_len = htonl(argv_len);
+            io_vector[i++].iov_len = sizeof(argv_len);
+            buffsz += io_vector[i-1].iov_len;
+
+            if (opts->argv) {
+                /* If there are arguments we copy in the references to
+                   them into the iov */
+                for (j = 0; opts->argv[j]; j++) {
+                    if (opts->argv[j] == erts_default_arg0)
+                        io_vector[i].iov_base = cmd_line;
+                    else
+                        io_vector[i].iov_base = opts->argv[j];
+                    io_vector[i].iov_len = strlen(io_vector[i].iov_base) + 1;
+                    buffsz += io_vector[i++].iov_len;
+                }
+            } else {
+                io_vector[i].iov_base = cmd_line;
+                io_vector[i].iov_len = strlen(io_vector[i].iov_base) + 1;
+                buffsz += io_vector[i++].iov_len;
+            }
+        }
+
+        /* we send the request to do the fork */
+        if ((res = writev(ofd[1], io_vector, iov_len > MAXIOV ? MAXIOV : iov_len)) < 0) {
+            if (errno == ERRNO_BLOCK) {
+                res = 0;
+            } else {
+                int err = errno;
+                close_pipes(ifd, ofd);
+                erts_free(ERTS_ALC_T_TMP, io_vector);
+                if (new_environ != environ)
+                    erts_free(ERTS_ALC_T_ENVIRONMENT, (void *) new_environ);
+                erts_smp_rwmtx_runlock(&environ_rwmtx);
+                erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
+                errno = err;
+                return ERL_DRV_ERROR_ERRNO;
+            }
+        }
+
+        if (res < buffsz) {
+            /* we only wrote part of the command payload. Enqueue the rest. */
+            for (i = 0; i < iov_len; i++) {
+                driver_enq(port_num, io_vector[i].iov_base, io_vector[i].iov_len);
+            }
+            driver_deq(port_num, res);
+            driver_select(port_num, ofd[1], ERL_DRV_WRITE|ERL_DRV_USE, 1);
+        }
+
+        erts_free(ERTS_ALC_T_TMP, io_vector);
+    }
+
+    erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
+
+    if (new_environ != environ)
+	erts_free(ERTS_ALC_T_ENVIRONMENT, (void *) new_environ);
+
+    erts_smp_rwmtx_runlock(&environ_rwmtx);
+
+    dd = create_driver_data(port_num, ifd[0], ofd[1], opts->packet_bytes,
+                             DO_WRITE | DO_READ, opts->exit_status,
+                             0, 0);
+
+    {
+        /* send ofd[0] + ifd[1] + stderrfd to forker port */
+        ErtsSysForkerProto *proto =
+            erts_alloc(ERTS_ALC_T_DRV_CTRL_DATA,
+                       sizeof(ErtsSysForkerProto));
+        memset(proto, 0, sizeof(ErtsSysForkerProto));
+        proto->action = ErtsSysForkerProtoAction_Start;
+        proto->u.start.fds[0] = ofd[0];
+        proto->u.start.fds[1] = ifd[1];
+        proto->u.start.fds[2] = stderrfd;
+        proto->u.start.port_id = opts->exit_status ? erts_drvport2id(port_num) : THE_NON_VALUE;
+        if (erl_drv_port_control(forker_port, 'S', (char*)proto, sizeof(*proto))) {
+            /* The forker port has been killed, we close both fd's which will
+               make open_port throw an epipe error */
+            close(ofd[0]);
+            close(ifd[1]);
+        }
+    }
+
+    /* we set these fds to negative to mark if
+       they should be closed after the handshake */
+    if (!(opts->read_write & DO_READ))
+        dd->ifd->fd *= -1;
+
+    if (!(opts->read_write & DO_WRITE))
+        dd->ofd->fd *= -1;
+
+    return (ErlDrvData)dd;
+#undef CMD_LINE_PREFIX_STR
+#undef CMD_LINE_PREFIX_STR_SZ
+}
+
+static ErlDrvSSizeT spawn_control(ErlDrvData e, unsigned int cmd, char *buf,
+                                  ErlDrvSizeT len, char **rbuf, ErlDrvSizeT rlen)
+{
+    ErtsSysDriverData *dd = (ErtsSysDriverData*)e;
+    ErtsSysForkerProto *proto = (ErtsSysForkerProto *)buf;
+
+    ASSERT(len == sizeof(*proto));
+    ASSERT(proto->action == ErtsSysForkerProtoAction_SigChld);
+
+    dd->status = proto->u.sigchld.error_number;
+    dd->alive = -1;
+
+    if (dd->ifd)
+        driver_select(dd->port_num, abs(dd->ifd->fd), ERL_DRV_READ | ERL_DRV_USE, 1);
+
+    if (dd->ofd)
+        driver_select(dd->port_num, abs(dd->ofd->fd), ERL_DRV_WRITE | ERL_DRV_USE, 1);
+
+    return 0;
+}
+
+#define FD_DEF_HEIGHT 24
+#define FD_DEF_WIDTH 80
+/* Control op */
+#define FD_CTRL_OP_GET_WINSIZE 100
+
+static int fd_get_window_size(int fd, Uint32 *width, Uint32 *height)
+{
+#ifdef TIOCGWINSZ 
+    struct winsize ws;
+    if (ioctl(fd,TIOCGWINSZ,&ws) == 0) {
+	*width = (Uint32) ws.ws_col;
+	*height = (Uint32) ws.ws_row;
+	return 0;
+    }
+#endif
+    return -1;
+}
+
+static ErlDrvSSizeT fd_control(ErlDrvData drv_data,
+			       unsigned int command,
+			       char *buf, ErlDrvSizeT len,
+			       char **rbuf, ErlDrvSizeT rlen)
+{
+    int fd = (int)(long)drv_data;
+    char resbuff[2*sizeof(Uint32)];
+    switch (command) {
+    case FD_CTRL_OP_GET_WINSIZE:
+	{
+	    Uint32 w,h;
+	    if (fd_get_window_size(fd,&w,&h)) 
+		return 0;
+	    memcpy(resbuff,&w,sizeof(Uint32));
+	    memcpy(resbuff+sizeof(Uint32),&h,sizeof(Uint32));
+	}
+	break;
+    default:
+	return 0;
+    }
+    if (rlen < 2*sizeof(Uint32)) {
+	*rbuf = driver_alloc(2*sizeof(Uint32));
+    }
+    memcpy(*rbuf,resbuff,2*sizeof(Uint32));
+    return 2*sizeof(Uint32);
+}
+
+static ErlDrvData fd_start(ErlDrvPort port_num, char* name,
+			   SysDriverOpts* opts)
+{
+    int non_blocking = 0;
+
+    if (((opts->read_write & DO_READ) && opts->ifd >= sys_max_files()) ||
+	((opts->read_write & DO_WRITE) && opts->ofd >= sys_max_files()))
+	return ERL_DRV_ERROR_GENERAL;
+
+    /*
+     * Historical:
+     *
+     * "Note about nonblocking I/O.
+     *
+     * At least on Solaris, setting the write end of a TTY to nonblocking,
+     * will set the input end to nonblocking as well (and vice-versa).
+     * If erl is run in a pipeline like this:  cat | erl
+     * the input end of the TTY will be the standard input of cat.
+     * And cat is not prepared to handle nonblocking I/O."
+     *
+     * Actually, the reason for this is not that the tty itself gets set
+     * in non-blocking mode, but that the "input end" (cat's stdin) and
+     * the "output end" (erlang's stdout) are typically the "same" file
+     * descriptor, dup()'ed from a single fd by one of this process'
+     * ancestors.
+     *
+     * The workaround for this problem used to be a rather bad kludge,
+     * interposing an extra process ("internal cat") between erlang's
+     * stdout and the original stdout, allowing erlang to set its stdout
+     * in non-blocking mode without affecting the stdin of the preceding
+     * process in the pipeline - and being a kludge, it caused all kinds
+     * of weird problems.
+     *
+     * So, this is the current logic:
+     *
+     * The only reason to set non-blocking mode on the output fd at all is
+     * if it's something that can cause a write() to block, of course,
+     * i.e. primarily if it points to a tty, socket, pipe, or fifo. 
+     *
+     * If we don't set non-blocking mode when we "should" have, and output
+     * becomes blocked, the entire runtime system will be suspended - this
+     * is normally bad of course, and can happen fairly "easily" - e.g. user
+     * hits ^S on tty - but doesn't necessarily happen.
+     * 
+     * If we do set non-blocking mode when we "shouldn't" have, the runtime
+     * system will end up seeing EOF on the input fd (due to the preceding
+     * process dying), which typically will cause the entire runtime system
+     * to terminate immediately (due to whatever erlang process is seeing
+     * the EOF taking it as a signal to halt the system). This is *very* bad.
+     * 
+     * I.e. we should take a conservative approach, and only set non-
+     * blocking mode when we a) need to, and b) are reasonably certain
+     * that it won't be a problem. And as in the example above, the problem
+     * occurs when input fd and output fd point to different "things".
+     *
+     * However, determining that they are not just the same "type" of
+     * "thing", but actually the same instance of that type of thing, is
+     * unreasonably complex in many/most cases.
+     *
+     * Also, with pipes, sockets, and fifos it's far from obvious that the
+     * user *wants* non-blocking output: If you're running erlang inside
+     * some complex pipeline, you're probably not running a real-time system
+     * that must never stop, but rather *want* it to suspend if the output
+     * channel is "full".
+     *
+     * So, the bottom line: We will only set the output fd non-blocking if
+     * it points to a tty, and either a) the input fd also points to a tty,
+     * or b) we can make sure that setting the output fd non-blocking
+     * doesn't interfere with someone else's input, via a somewhat milder
+     * kludge than the above.
+     *
+     * Also keep in mind that while this code is almost exclusively run as
+     * a result of an erlang open_port({fd,0,1}, ...), that isn't the only
+     * case - it can be called with any old pre-existing file descriptors,
+     * the relations between which (if they're even two) we can only guess
+     * at - still, we try our best...
+     *
+     * Added note OTP 18: Some systems seem to use stdout/stderr to log data
+     * using unix pipes, so we cannot allow the system to block on a write.
+     * Therefore we use an async thread to write the data to fd's that could
+     * not be set to non-blocking. When no async threads are available we
+     * fall back on the old behaviour.
+     *
+     * Also the guarantee about what is delivered to the OS has changed.
+     * Pre 18 the fd driver did no flushing of data before terminating.
+     * Now it does. This is because we want to be able to guarantee that things
+     * such as escripts and friends really have outputted all data before
+     * terminating. This could potentially block the termination of the system
+     * for a very long time, but if the user wants to terminate fast she should
+     * use erlang:halt with flush=false.
+     */
+
+    /* Try to figure out if we can use non-blocking writes */
+    if (opts->read_write & DO_WRITE) {
+
+	/* If we don't have a read end, all bets are off - no non-blocking. */
+	if (opts->read_write & DO_READ) {
+
+	    if (isatty(opts->ofd)) { /* output fd is a tty:-) */
+
+		if (isatty(opts->ifd)) { /* input fd is also a tty */
+
+		    /* To really do this "right", we should also check that
+		       input and output fd point to the *same* tty - but
+		       this seems like overkill; ttyname() isn't for free,
+		       and this is a very common case - and it's hard to
+		       imagine a scenario where setting non-blocking mode
+		       here would cause problems - go ahead and do it. */
+
+                    non_blocking = 1;
+		    SET_NONBLOCKING(opts->ofd);
+
+		} else {	/* output fd is a tty, input fd isn't */
+
+		    /* This is a "problem case", but also common (see the
+		       example above) - i.e. it makes sense to try a bit
+		       harder before giving up on non-blocking mode: Try to
+		       re-open the tty that the output fd points to, and if
+		       successful replace the original one with the "new" fd
+		       obtained this way, and set *that* one in non-blocking
+		       mode. (Yes, this is a kludge.)
+
+		       However, re-opening the tty may fail in a couple of
+		       (unusual) cases:
+
+		       1) The name of the tty (or an equivalent one, i.e.
+			  same major/minor number) can't be found, because
+			  it actually lives somewhere other than /dev (or
+			  wherever ttyname() looks for it), and isn't
+			  equivalent to any of those that do live in the
+			  "standard" place - this should be *very* unusual.
+
+		       2) Permissions on the tty don't allow us to open it -
+			  it's perfectly possible to have an fd open to an
+			  object whose permissions wouldn't allow us to open
+			  it. This is not as unusual as it sounds, one case
+			  is if the user has su'ed to someone else (not
+			  root) - we have a read/write fd open to the tty
+			  (because it has been inherited all the way down
+			  here), but we have neither read nor write
+			  permission for the tty.
+
+		       In these cases, we finally give up, and don't set the
+		       output fd in non-blocking mode. */
+
+		    char *tty;
+		    int nfd;
+
+		    if ((tty = ttyname(opts->ofd)) != NULL &&
+			(nfd = open(tty, O_WRONLY)) != -1) {
+			dup2(nfd, opts->ofd);
+			close(nfd);
+                        non_blocking = 1;
+			SET_NONBLOCKING(opts->ofd);
+		    }
+		}
+	    }
+	}
+    }
+    return (ErlDrvData)create_driver_data(port_num, opts->ifd, opts->ofd,
+                                          opts->packet_bytes,
+                                          opts->read_write, 0, -1,
+                                          !non_blocking);
+}
+
+static void clear_fd_data(ErtsSysFdData *fdd)
+{
+    if (fdd->sz > 0) {
+	erts_free(ERTS_ALC_T_FD_ENTRY_BUF, (void *) fdd->buf);
+	ASSERT(erts_smp_atomic_read_nob(&sys_misc_mem_sz) >= fdd->sz);
+	erts_smp_atomic_add_nob(&sys_misc_mem_sz, -1*fdd->sz);
+    }
+    fdd->buf = NULL;
+    fdd->sz = 0;
+    fdd->remain = 0;
+    fdd->cpos = NULL;
+    fdd->psz = 0;
+}
+
+static void nbio_stop_fd(ErlDrvPort prt, ErtsSysFdData *fdd)
+{
+    driver_select(prt, abs(fdd->fd), DO_READ|DO_WRITE, 0);
+    clear_fd_data(fdd);
+    SET_BLOCKING(abs(fdd->fd));
+
+}
+
+static void fd_stop(ErlDrvData ev)  /* Does not close the fds */
+{
+    ErtsSysDriverData* dd = (ErtsSysDriverData*)ev;
+    ErlDrvPort prt = dd->port_num;
+    int sz = sizeof(ErtsSysDriverData);
+
+#if FDBLOCK
+    if (dd->blocking) {
+        erts_free(ERTS_ALC_T_SYS_BLOCKING, dd->blocking);
+        dd->blocking = NULL;
+        sz += sizeof(ErtsSysBlocking);
+    }
+#endif
+
+    if (dd->ifd) {
+        sz += sizeof(ErtsSysFdData);
+        nbio_stop_fd(prt, dd->ifd);
+    }
+    if (dd->ofd && dd->ofd != dd->ifd) {
+        sz += sizeof(ErtsSysFdData);
+        nbio_stop_fd(prt, dd->ofd);
+    }
+
+     erts_free(ERTS_ALC_T_DRV_TAB, dd);
+     erts_smp_atomic_add_nob(&sys_misc_mem_sz, -sz);
+}
+
+static void fd_flush(ErlDrvData ev)
+{
+    ErtsSysDriverData* dd = (ErtsSysDriverData*)ev;
+    if (!dd->terminating)
+        dd->terminating = 1;
+}
+
+static ErlDrvData vanilla_start(ErlDrvPort port_num, char* name,
+				SysDriverOpts* opts)
+{
+    int flags, fd;
+    ErlDrvData res;
+
+    flags = (opts->read_write == DO_READ ? O_RDONLY :
+	     opts->read_write == DO_WRITE ? O_WRONLY|O_CREAT|O_TRUNC :
+	     O_RDWR|O_CREAT);
+    if ((fd = open(name, flags, 0666)) < 0)
+	return ERL_DRV_ERROR_GENERAL;
+    if (fd >= sys_max_files()) {
+	close(fd);
+	return ERL_DRV_ERROR_GENERAL;
+    }
+    SET_NONBLOCKING(fd);
+
+    res = (ErlDrvData)(long)create_driver_data(port_num, fd, fd,
+                                               opts->packet_bytes,
+                                               opts->read_write, 0, -1, 0);
+    return res;
+}
+
+/* Note that driver_data[fd].ifd == fd if the port was opened for reading, */
+/* otherwise (i.e. write only) driver_data[fd].ofd = fd.  */
+
+static void stop(ErlDrvData ev)
+{
+    ErtsSysDriverData* dd = (ErtsSysDriverData*)ev;
+    ErlDrvPort prt = dd->port_num;
+
+    if (dd->ifd) {
+        nbio_stop_fd(prt, dd->ifd);
+        driver_select(prt, abs(dd->ifd->fd), ERL_DRV_USE, 0);  /* close(ifd); */
+    }
+
+    if (dd->ofd && dd->ofd != dd->ifd) {
+	nbio_stop_fd(prt, dd->ofd);
+	driver_select(prt, abs(dd->ofd->fd), ERL_DRV_USE, 0);  /* close(ofd); */
+    }
+
+    erts_free(ERTS_ALC_T_DRV_TAB, dd);
+}
+
+/* used by fd_driver */
+static void outputv(ErlDrvData e, ErlIOVec* ev)
+{
+    ErtsSysDriverData *dd = (ErtsSysDriverData*)e;
+    ErlDrvPort ix = dd->port_num;
+    int pb = dd->packet_bytes;
+    int ofd = dd->ofd ? dd->ofd->fd : -1;
+    ssize_t n;
+    ErlDrvSizeT sz;
+    char lb[4];
+    char* lbp;
+    ErlDrvSizeT len = ev->size;
+
+    /* (len > ((unsigned long)-1 >> (4-pb)*8)) */
+    /*    if (pb >= 0 && (len & (((ErlDrvSizeT)1 << (pb*8))) - 1) != len) {*/
+    if (((pb == 2) && (len > 0xffff)) || (pb == 1 && len > 0xff)) {
+	driver_failure_posix(ix, EINVAL);
+	return; /* -1; */
+    }
+    /* Handles 0 <= pb <= 4 only */
+    put_int32((Uint32) len, lb);
+    lbp = lb + (4-pb);
+
+    ev->iov[0].iov_base = lbp;
+    ev->iov[0].iov_len = pb;
+    ev->size += pb;
+
+    if (dd->blocking && FDBLOCK)
+        driver_pdl_lock(dd->blocking->pdl);
+
+    if ((sz = driver_sizeq(ix)) > 0) {
+	driver_enqv(ix, ev, 0);
+
+        if (dd->blocking && FDBLOCK)
+            driver_pdl_unlock(dd->blocking->pdl);
+
+	if (sz + ev->size >= (1 << 13))
+	    set_busy_port(ix, 1);
+    }
+    else if (!dd->blocking || !FDBLOCK) {
+        /* We try to write directly if the fd in non-blocking */
+	int vsize = ev->vsize > MAX_VSIZE ? MAX_VSIZE : ev->vsize;
+
+	n = writev(ofd, (const void *) (ev->iov), vsize);
+	if (n == ev->size)
+	    return; /* 0;*/
+	if (n < 0) {
+	    if ((errno != EINTR) && (errno != ERRNO_BLOCK)) {
+		driver_failure_posix(ix, errno);
+		return; /* -1;*/
+	    }
+	    n = 0;
+	}
+	driver_enqv(ix, ev, n);  /* n is the skip value */
+	driver_select(ix, ofd, ERL_DRV_WRITE|ERL_DRV_USE, 1);
+    }
+#if FDBLOCK
+    else {
+        if (ev->size != 0) {
+            driver_enqv(ix, ev, 0);
+            driver_pdl_unlock(dd->blocking->pdl);
+            driver_async(ix, &dd->blocking->pkey,
+                         fd_async, dd, NULL);
+        } else {
+            driver_pdl_unlock(dd->blocking->pdl);
+        }
+    }
+#endif
+    /* return 0;*/
+}
+
+/* Used by spawn_driver and vanilla driver */
+static void output(ErlDrvData e, char* buf, ErlDrvSizeT len)
+{
+    ErtsSysDriverData *dd = (ErtsSysDriverData*)e;
+    ErlDrvPort ix = dd->port_num;
+    int pb = dd->packet_bytes;
+    int ofd = dd->ofd ? dd->ofd->fd : -1;
+    ssize_t n;
+    ErlDrvSizeT sz;
+    char lb[4];
+    char* lbp;
+    struct iovec iv[2];
+
+    /* (len > ((unsigned long)-1 >> (4-pb)*8)) */
+    if (((pb == 2) && (len > 0xffff))
+        || (pb == 1 && len > 0xff)
+        || dd->pid == 0 /* Attempt at output before port is ready */) {
+	driver_failure_posix(ix, EINVAL);
+	return; /* -1; */
+    }
+    put_int32(len, lb);
+    lbp = lb + (4-pb);
+
+    if ((sz = driver_sizeq(ix)) > 0) {
+	driver_enq(ix, lbp, pb);
+	driver_enq(ix, buf, len);
+	if (sz + len + pb >= (1 << 13))
+	    set_busy_port(ix, 1);
+    }
+    else {
+	iv[0].iov_base = lbp;
+	iv[0].iov_len = pb;  /* should work for pb=0 */
+	iv[1].iov_base = buf;
+	iv[1].iov_len = len;
+	n = writev(ofd, iv, 2);
+	if (n == pb+len)
+	    return; /* 0; */
+	if (n < 0) {
+	    if ((errno != EINTR) && (errno != ERRNO_BLOCK)) {
+		driver_failure_posix(ix, errno);
+		return; /* -1; */
+	    }
+	    n = 0;
+	}
+	if (n < pb) {
+	    driver_enq(ix, lbp+n, pb-n);
+	    driver_enq(ix, buf, len);
+	}
+	else {
+	    n -= pb;
+	    driver_enq(ix, buf+n, len-n);
+	}
+	driver_select(ix, ofd, ERL_DRV_WRITE|ERL_DRV_USE, 1);
+    }
+    return; /* 0; */
+}
+
+static int port_inp_failure(ErtsSysDriverData *dd, int res)
+				/* Result: 0 (eof) or -1 (error) */
+{
+    int err = errno;
+
+    ASSERT(res <= 0);
+    if (dd->ifd) {
+        driver_select(dd->port_num, dd->ifd->fd, ERL_DRV_READ|ERL_DRV_WRITE, 0);
+        clear_fd_data(dd->ifd);
+    }
+
+    if (dd->blocking && FDBLOCK) {
+        driver_pdl_lock(dd->blocking->pdl);
+        if (driver_sizeq(dd->port_num) > 0) {
+            driver_pdl_unlock(dd->blocking->pdl);
+            /* We have stuff in the output queue, so we just
+               set the state to terminating and wait for fd_async_ready
+               to terminate the port */
+            if (res == 0)
+                dd->terminating = 2;
+            else
+                dd->terminating = -err;
+            return 0;
+        }
+        driver_pdl_unlock(dd->blocking->pdl);
+    }
+
+    if (res == 0) {
+        if (dd->alive == 1) {
+            /*
+             * We have eof and want to report exit status, but the process
+             * hasn't exited yet. When it does ready_input will
+             * driver_select() this fd which will make sure that we get
+             * back here with dd->alive == -1 and dd->status set.
+             */
+            return 0;
+        }
+        else if (dd->alive == -1) {
+            int status = dd->status;
+
+            /* We need not be prepared for stopped/continued processes. */
+            if (WIFSIGNALED(status))
+                status = 128 + WTERMSIG(status);
+            else
+                status = WEXITSTATUS(status);
+            driver_report_exit(dd->port_num, status);
+        }
+       driver_failure_eof(dd->port_num);
+    } else if (dd->ifd) {
+        erl_drv_init_ack(dd->port_num, ERL_DRV_ERROR_ERRNO);
+    } else {
+	driver_failure_posix(dd->port_num, err);
+    }
+    return 0;
+}
+
+/* fd is the drv_data that is returned from the */
+/* initial start routine                        */
+/* ready_fd is the descriptor that is ready to read */
+
+static void ready_input(ErlDrvData e, ErlDrvEvent ready_fd)
+{
+    ErtsSysDriverData *dd = (ErtsSysDriverData*)e;
+    ErlDrvPort port_num;
+    int packet_bytes;
+    int res;
+    Uint h;
+
+    port_num = dd->port_num;
+    packet_bytes = dd->packet_bytes;
+
+    ASSERT(abs(dd->ifd->fd) == ready_fd);
+
+    if (dd->pid == 0) {
+        /* the pid is sent from erl_child_setup. spawn driver only. */
+        ErtsSysForkerProto proto;
+        int res;
+
+        if((res = read(ready_fd, &proto, sizeof(proto))) <= 0) {
+            /* hmm, child setup seems to have closed the pipe too early...
+               we close the port as there is not much else we can do */
+            if (res < 0 && errno == ERRNO_BLOCK)
+                return;
+            driver_select(port_num, ready_fd, ERL_DRV_READ, 0);
+            if (res == 0)
+                errno = EPIPE;
+            port_inp_failure(dd, -1);
+            return;
+        }
+
+        ASSERT(proto.action == ErtsSysForkerProtoAction_Go);
+        dd->pid = proto.u.go.os_pid;
+
+        if (dd->pid == -1) {
+            /* Setup failed! The only reason why this should happen is if
+               the fork fails. */
+            errno = proto.u.go.error_number;
+            port_inp_failure(dd, -1);
+            return;
+        }
+
+        proto.action = ErtsSysForkerProtoAction_Ack;
+
+        if (driver_sizeq(port_num) > 0) {
+            driver_enq(port_num, (char*)&proto, sizeof(proto));
+            } else {
+                if (write(abs(dd->ofd->fd), &proto, sizeof(proto)) < 0)
+                    if (errno == ERRNO_BLOCK || errno == EINTR)
+                        driver_enq(port_num, (char*)&proto, sizeof(proto));
+                /* do nothing on failure here. If the ofd is broken, then
+                   the ifd will probably also be broken and trigger
+                   a port_inp_failure */
+            }
+
+            if (dd->ifd->fd < 0) {
+                driver_select(port_num, abs(dd->ifd->fd), ERL_DRV_READ|ERL_DRV_USE, 0);
+                erts_smp_atomic_add_nob(&sys_misc_mem_sz, -sizeof(ErtsSysFdData));
+                dd->ifd = NULL;
+            }
+
+            if (dd->ofd->fd < 0  || driver_sizeq(port_num) > 0)
+                /* we select in order to close fd or write to queue,
+                   child setup will close this fd if fd < 0 */
+                driver_select(port_num, abs(dd->ofd->fd), ERL_DRV_WRITE|ERL_DRV_USE, 1);
+
+            erl_drv_set_os_pid(port_num, dd->pid);
+            erl_drv_init_ack(port_num, e);
+            return;
+    }
+
+    if (packet_bytes == 0) {
+	byte *read_buf = (byte *) erts_alloc(ERTS_ALC_T_SYS_READ_BUF,
+					     ERTS_SYS_READ_BUF_SZ);
+	res = read(ready_fd, read_buf, ERTS_SYS_READ_BUF_SZ);
+	if (res < 0) {
+	    if ((errno != EINTR) && (errno != ERRNO_BLOCK))
+		port_inp_failure(dd, res);
+	}
+	else if (res == 0)
+	    port_inp_failure(dd, res);
+	else
+	    driver_output(port_num, (char*) read_buf, res);
+	erts_free(ERTS_ALC_T_SYS_READ_BUF, (void *) read_buf);
+    }
+    else if (dd->ifd->remain > 0) { /* We try to read the remainder */
+	/* space is allocated in buf */
+	res = read(ready_fd, dd->ifd->cpos,
+		   dd->ifd->remain);
+	if (res < 0) {
+	    if ((errno != EINTR) && (errno != ERRNO_BLOCK))
+		port_inp_failure(dd, res);
+	}
+	else if (res == 0) {
+	    port_inp_failure(dd, res);
+	}
+	else if (res == dd->ifd->remain) { /* we're done  */
+	    driver_output(port_num, dd->ifd->buf,
+			  dd->ifd->sz);
+	    clear_fd_data(dd->ifd);
+	}
+	else { /*  if (res < dd->ifd->remain) */
+	    dd->ifd->cpos += res;
+	    dd->ifd->remain -= res;
+	}
+    }
+    else if (dd->ifd->remain == 0) { /* clean fd */
+	byte *read_buf = (byte *) erts_alloc(ERTS_ALC_T_SYS_READ_BUF,
+					     ERTS_SYS_READ_BUF_SZ);
+	/* We make one read attempt and see what happens */
+	res = read(ready_fd, read_buf, ERTS_SYS_READ_BUF_SZ);
+	if (res < 0) {
+	    if ((errno != EINTR) && (errno != ERRNO_BLOCK))
+		port_inp_failure(dd, res);
+	}
+	else if (res == 0) {     	/* eof */
+	    port_inp_failure(dd, res);
+	}
+	else if (res < packet_bytes - dd->ifd->psz) {
+	    memcpy(dd->ifd->pbuf+dd->ifd->psz,
+		   read_buf, res);
+	    dd->ifd->psz += res;
+	}
+	else  { /* if (res >= packet_bytes) */
+	    unsigned char* cpos = read_buf;
+	    int bytes_left = res;
+
+	    while (1) {
+		int psz = dd->ifd->psz;
+		char* pbp = dd->ifd->pbuf + psz;
+
+		while(bytes_left && (psz < packet_bytes)) {
+		    *pbp++ = *cpos++;
+		    bytes_left--;
+		    psz++;
+		}
+
+		if (psz < packet_bytes) {
+		    dd->ifd->psz = psz;
+		    break;
+		}
+		dd->ifd->psz = 0;
+
+		switch (packet_bytes) {
+		case 1: h = get_int8(dd->ifd->pbuf);  break;
+		case 2: h = get_int16(dd->ifd->pbuf); break;
+		case 4: h = get_int32(dd->ifd->pbuf); break;
+		default: ASSERT(0); return; /* -1; */
+		}
+
+		if (h <= (bytes_left)) {
+		    driver_output(port_num, (char*) cpos, h);
+		    cpos += h;
+		    bytes_left -= h;
+		    continue;
+		}
+		else {		/* The last message we got was split */
+		        char *buf = erts_alloc_fnf(ERTS_ALC_T_FD_ENTRY_BUF, h);
+		    if (!buf) {
+			errno = ENOMEM;
+			port_inp_failure(dd, -1);
+		    }
+		    else {
+			erts_smp_atomic_add_nob(&sys_misc_mem_sz, h);
+			sys_memcpy(buf, cpos, bytes_left);
+			dd->ifd->buf = buf;
+			dd->ifd->sz = h;
+			dd->ifd->remain = h - bytes_left;
+			dd->ifd->cpos = buf + bytes_left;
+		    }
+		    break;
+		}
+	    }
+	}
+	erts_free(ERTS_ALC_T_SYS_READ_BUF, (void *) read_buf);
+    }
+}
+
+
+/* fd is the drv_data that is returned from the */
+/* initial start routine                        */
+/* ready_fd is the descriptor that is ready to read */
+
+static void ready_output(ErlDrvData e, ErlDrvEvent ready_fd)
+{
+    ErtsSysDriverData *dd = (ErtsSysDriverData*)e;
+    ErlDrvPort ix = dd->port_num;
+    int n;
+    struct iovec* iv;
+    int vsize;
+
+    if ((iv = (struct iovec*) driver_peekq(ix, &vsize)) == NULL) {
+	driver_select(ix, ready_fd, ERL_DRV_WRITE, 0);
+        if (dd->pid > 0 && dd->ofd->fd < 0) {
+            /* The port was opened with 'in' option, which means we
+               should close the output fd as soon as the command has
+               been sent. */
+            driver_select(ix, ready_fd, ERL_DRV_WRITE|ERL_DRV_USE, 0);
+            erts_smp_atomic_add_nob(&sys_misc_mem_sz, -sizeof(ErtsSysFdData));
+            dd->ofd = NULL;
+        }
+        if (dd->terminating)
+            driver_failure_atom(dd->port_num,"normal");
+	return; /* 0; */
+    }
+    vsize = vsize > MAX_VSIZE ? MAX_VSIZE : vsize;
+    if ((n = writev(ready_fd, iv, vsize)) > 0) {
+	if (driver_deq(ix, n) == 0)
+	    set_busy_port(ix, 0);
+    }
+    else if (n < 0) {
+	if (errno == ERRNO_BLOCK || errno == EINTR)
+	    return; /* 0; */
+	else {
+	    int res = errno;
+	    driver_select(ix, ready_fd, ERL_DRV_WRITE, 0);
+	    driver_failure_posix(ix, res);
+	    return; /* -1; */
+	}
+    }
+    return; /* 0; */
+}
+
+static void stop_select(ErlDrvEvent fd, void* _)
+{
+    close((int)fd);
+}
+
+#if FDBLOCK
+
+static void
+fd_async(void *async_data)
+{
+    int res;
+    ErtsSysDriverData *dd = (ErtsSysDriverData *)async_data;
+    SysIOVec      *iov0;
+    SysIOVec      *iov;
+    int            iovlen;
+    int            err = 0;
+    /* much of this code is stolen from efile_drv:invoke_writev */
+    driver_pdl_lock(dd->blocking->pdl);
+    iov0 = driver_peekq(dd->port_num, &iovlen);
+    iovlen = iovlen < MAXIOV ? iovlen : MAXIOV;
+    iov = erts_alloc_fnf(ERTS_ALC_T_SYS_WRITE_BUF,
+                         sizeof(SysIOVec)*iovlen);
+    if (!iov) {
+        res = -1;
+        err = ENOMEM;
+        driver_pdl_unlock(dd->blocking->pdl);
+    } else {
+        memcpy(iov,iov0,iovlen*sizeof(SysIOVec));
+        driver_pdl_unlock(dd->blocking->pdl);
+
+        do {
+            res = writev(dd->ofd->fd, iov, iovlen);
+        } while (res < 0 && errno == EINTR);
+        if (res < 0)
+            err = errno;
+        err = errno;
+
+        erts_free(ERTS_ALC_T_SYS_WRITE_BUF, iov);
+    }
+    dd->blocking->res = res;
+    dd->blocking->err = err;
+}
+
+void fd_ready_async(ErlDrvData drv_data,
+                    ErlDrvThreadData thread_data) {
+    ErtsSysDriverData *dd = (ErtsSysDriverData *)thread_data;
+    ErlDrvPort port_num = dd->port_num;
+
+    ASSERT(dd->blocking);
+
+    if (dd->blocking->res > 0) {
+        driver_pdl_lock(dd->blocking->pdl);
+        if (driver_deq(port_num, dd->blocking->res) == 0) {
+            driver_pdl_unlock(dd->blocking->pdl);
+            set_busy_port(port_num, 0);
+            if (dd->terminating) {
+                /* The port is has been ordered to terminate
+                   from either fd_flush or port_inp_failure */
+                if (dd->terminating == 1)
+                    driver_failure_atom(port_num, "normal");
+                else if (dd->terminating == 2)
+                    driver_failure_eof(port_num);
+                else if (dd->terminating < 0)
+                    driver_failure_posix(port_num, -dd->terminating);
+                return; /* -1; */
+            }
+        } else {
+            driver_pdl_unlock(dd->blocking->pdl);
+            /* still data left to write in queue */
+            driver_async(port_num, &dd->blocking->pkey, fd_async, dd, NULL);
+            return /* 0; */;
+        }
+    } else if (dd->blocking->res < 0) {
+        if (dd->blocking->err == ERRNO_BLOCK) {
+            set_busy_port(port_num, 1);
+            /* still data left to write in queue */
+            driver_async(port_num, &dd->blocking->pkey, fd_async, dd, NULL);
+        } else
+            driver_failure_posix(port_num, dd->blocking->err);
+        return; /* -1; */
+    }
+    return; /* 0; */
+}
+
+#endif
+
+/* Forker driver */
+
+static int forker_fd;
+
+static ErlDrvData forker_start(ErlDrvPort port_num, char* name,
+                               SysDriverOpts* opts)
+{
+
+    int i;
+    int fds[2];
+    int res, unbind;
+    char bindir[MAXPATHLEN];
+    size_t bindirsz = sizeof(bindir);
+    Uint csp_path_sz;
+    char *child_setup_prog;
+
+    forker_port = erts_drvport2id(port_num);
+
+    res = erts_sys_getenv_raw("BINDIR", bindir, &bindirsz);
+    if (res != 0) {
+        if (res < 0)
+            erts_exit(1,
+                     "Environment variable BINDIR is not set\n");
+        if (res > 0)
+            erts_exit(1,
+                     "Value of environment variable BINDIR is too large\n");
+    }
+    if (bindir[0] != DIR_SEPARATOR_CHAR)
+        erts_exit(1,
+                 "Environment variable BINDIR does not contain an"
+                 " absolute path\n");
+    csp_path_sz = (strlen(bindir)
+                   + 1 /* DIR_SEPARATOR_CHAR */
+                   + sizeof(CHILD_SETUP_PROG_NAME)
+                   + 1);
+    child_setup_prog = erts_alloc(ERTS_ALC_T_CS_PROG_PATH, csp_path_sz);
+    erts_snprintf(child_setup_prog, csp_path_sz,
+                  "%s%c%s",
+                  bindir,
+                  DIR_SEPARATOR_CHAR,
+                  CHILD_SETUP_PROG_NAME);
+    if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0) {
+        erts_exit(ERTS_ABORT_EXIT,
+                 "Could not open unix domain socket in spawn_init: %d\n",
+                 errno);
+    }
+
+    forker_fd = fds[0];
+
+    unbind = erts_sched_bind_atfork_prepare();
+
+    i = fork();
+
+    if (i == 0) {
+        /* The child */
+        char *cs_argv[FORKER_ARGV_NO_OF_ARGS] =
+            {CHILD_SETUP_PROG_NAME, NULL, NULL};
+        char buff[128];
+
+        erts_sched_bind_atfork_child(unbind);
+
+        snprintf(buff, 128, "%d", sys_max_files());
+        cs_argv[FORKER_ARGV_MAX_FILES] = buff;
+
+        /* We preallocate fd 3 for the uds fd */
+        if (fds[1] != 3) {
+            dup2(fds[1], 3);
+        }
+
+#if defined(USE_SETPGRP_NOARGS)		/* SysV */
+    (void) setpgrp();
+#elif defined(USE_SETPGRP)		/* BSD */
+    (void) setpgrp(0, getpid());
+#else					/* POSIX */
+    (void) setsid();
+#endif
+
+        execv(child_setup_prog, cs_argv);
+        _exit(1);
+    }
+
+    erts_sched_bind_atfork_parent(unbind);
+
+    erts_free(ERTS_ALC_T_CS_PROG_PATH, child_setup_prog);
+
+    close(fds[1]);
+
+    SET_NONBLOCKING(forker_fd);
+
+    driver_select(port_num, forker_fd, ERL_DRV_READ|ERL_DRV_USE, 1);
+
+    return (ErlDrvData)port_num;
+}
+
+static void forker_stop(ErlDrvData e)
+{
+    /* we probably should do something here,
+       the port has been closed by the user. */
+}
+
+static void forker_ready_input(ErlDrvData e, ErlDrvEvent fd)
+{
+    int res;
+    ErtsSysForkerProto *proto;
+
+    proto = erts_alloc(ERTS_ALC_T_DRV_CTRL_DATA, sizeof(*proto));
+
+    if ((res = read(fd, proto, sizeof(*proto))) < 0) {
+        if (errno == ERRNO_BLOCK)
+            return;
+        erts_exit(ERTS_DUMP_EXIT, "Failed to read from erl_child_setup: %d\n", errno);
+    }
+
+    if (res == 0)
+        erts_exit(ERTS_DUMP_EXIT, "erl_child_setup closed\n");
+
+    ASSERT(res == sizeof(*proto));
+
+#ifdef FORKER_PROTO_START_ACK
+    if (proto->action == ErtsSysForkerProtoAction_StartAck) {
+        /* Ideally we would like to not have to ack each Start
+           command being sent over the uds, but it would seem
+           that some operating systems (only observed on FreeBSD)
+           throw away data on the uds when the socket becomes full,
+           so we have to.
+        */
+        ErlDrvPort port_num = (ErlDrvPort)e;
+        int vlen;
+        SysIOVec *iov = driver_peekq(port_num, &vlen);
+        ErtsSysForkerProto *proto = (ErtsSysForkerProto *)iov[0].iov_base;
+
+        close(proto->u.start.fds[0]);
+        close(proto->u.start.fds[1]);
+        if (proto->u.start.fds[1] != proto->u.start.fds[2])
+            close(proto->u.start.fds[2]);
+
+        driver_deq(port_num, sizeof(*proto));
+
+        if (driver_sizeq(port_num) > 0)
+            driver_select(port_num, forker_fd, ERL_DRV_WRITE|ERL_DRV_USE, 1);
+    } else
+#endif
+    {
+        ASSERT(proto->action == ErtsSysForkerProtoAction_SigChld);
+
+        /* ideally this would be a port_command call, but as command is
+           already used by the spawn_driver, we use control instead.
+           Note that when using erl_drv_port_control it is an asynchronous
+           control. */
+        erl_drv_port_control(proto->u.sigchld.port_id, 'S',
+                             (char*)proto, sizeof(*proto));
+    }
+
+}
+
+static void forker_ready_output(ErlDrvData e, ErlDrvEvent fd)
+{
+    ErlDrvPort port_num = (ErlDrvPort)e;
+
+#ifndef FORKER_PROTO_START_ACK
+    while (driver_sizeq(port_num) > 0) {
+#endif
+        int vlen;
+        SysIOVec *iov = driver_peekq(port_num, &vlen);
+        ErtsSysForkerProto *proto = (ErtsSysForkerProto *)iov[0].iov_base;
+        ASSERT(iov[0].iov_len >= (sizeof(*proto)));
+        if (sys_uds_write(forker_fd, (char*)proto, sizeof(*proto),
+                          proto->u.start.fds, 3, 0) < 0) {
+            if (errno == ERRNO_BLOCK)
+                return;
+            erts_exit(ERTS_DUMP_EXIT, "Failed to write to erl_child_setup: %d\n", errno);
+        }
+#ifndef FORKER_PROTO_START_ACK
+        close(proto->u.start.fds[0]);
+        close(proto->u.start.fds[1]);
+        if (proto->u.start.fds[1] != proto->u.start.fds[2])
+            close(proto->u.start.fds[2]);
+        driver_deq(port_num, sizeof(*proto));
+    }
+#endif
+
+    driver_select(port_num, forker_fd, ERL_DRV_WRITE, 0);
+}
+
+static ErlDrvSSizeT forker_control(ErlDrvData e, unsigned int cmd, char *buf,
+                                   ErlDrvSizeT len, char **rbuf, ErlDrvSizeT rlen)
+{
+    ErtsSysForkerProto *proto = (ErtsSysForkerProto *)buf;
+    ErlDrvPort port_num = (ErlDrvPort)e;
+    int res;
+
+    driver_enq(port_num, buf, len);
+    if (driver_sizeq(port_num) > sizeof(*proto)) {
+        return 0;
+    }
+
+    if ((res = sys_uds_write(forker_fd, (char*)proto, sizeof(*proto),
+                             proto->u.start.fds, 3, 0)) < 0) {
+        if (errno == ERRNO_BLOCK) {
+            driver_select(port_num, forker_fd, ERL_DRV_WRITE|ERL_DRV_USE, 1);
+            return 0;
+        }
+        erts_exit(ERTS_DUMP_EXIT, "Failed to write to erl_child_setup: %d\n", errno);
+    }
+
+#ifndef FORKER_PROTO_START_ACK
+    ASSERT(res == sizeof(*proto));
+    close(proto->u.start.fds[0]);
+    close(proto->u.start.fds[1]);
+    if (proto->u.start.fds[1] != proto->u.start.fds[2])
+        close(proto->u.start.fds[2]);
+    driver_deq(port_num, sizeof(*proto));
+#endif
+
+    return 0;
+}
diff --git a/erts/emulator/sys/unix/sys_float.c b/erts/emulator/sys/unix/sys_float.c
index 1ef9e5eef7..89e2484b17 100644
--- a/erts/emulator/sys/unix/sys_float.c
+++ b/erts/emulator/sys/unix/sys_float.c
@@ -90,7 +90,7 @@ void erts_fp_check_init_error(volatile unsigned long *fpexnp)
     snprintf(buf, sizeof buf, "ERTS_FP_CHECK_INIT at %p: detected unhandled FPE at %p\r\n",
 	     __builtin_return_address(0), (void*)*fpexnp);
     if (write(2, buf, strlen(buf)) <= 0)
-	erl_exit(ERTS_ABORT_EXIT, "%s", buf);
+	erts_exit(ERTS_ABORT_EXIT, "%s", buf);
     *fpexnp = 0;
 #if defined(__i386__) || defined(__x86_64__)
     erts_restore_fpu();
@@ -499,18 +499,8 @@ static int mask_fpe(void)
 #define mc_pc(mc)	((mc)->gregs[REG_RIP])
 #elif defined(__linux__) && defined(__i386__)
 #define mc_pc(mc)	((mc)->gregs[REG_EIP])
-#elif defined(__DARWIN__) && defined(__i386__)
-#ifdef DARWIN_MODERN_MCONTEXT
-#define mc_pc(mc)	((mc)->__ss.__eip)
-#else
-#define mc_pc(mc)	((mc)->ss.eip)
-#endif
-#elif defined(__DARWIN__) && defined(__x86_64__)
-#ifdef DARWIN_MODERN_MCONTEXT
-#define mc_pc(mc)	((mc)->__ss.__rip)
-#else
-#define mc_pc(mc)	((mc)->ss.rip)
-#endif
+#elif defined(__DARWIN__)
+# error "Floating-point exceptions not supported on MacOS X"
 #elif defined(__FreeBSD__) && defined(__x86_64__)
 #define mc_pc(mc)	((mc)->mc_rip)
 #elif defined(__FreeBSD__) && defined(__i386__)
@@ -575,17 +565,7 @@ static void fpe_sig_action(int sig, siginfo_t *si, void *puc)
     regs[PT_FPSCR] = 0x80|0x40|0x10;	/* VE, OE, ZE; not UE or XE */
 #endif
 #elif defined(__DARWIN__) && (defined(__i386__) || defined(__x86_64__))
-#ifdef DARWIN_MODERN_MCONTEXT
-    mcontext_t mc = uc->uc_mcontext;
-    pc = mc_pc(mc);
-    mc->__fs.__fpu_mxcsr = 0x1F80;
-    *(unsigned short *)&mc->__fs.__fpu_fsw &= ~0xFF;
-#else
-    mcontext_t mc = uc->uc_mcontext;
-    pc = mc_pc(mc);
-    mc->fs.fpu_mxcsr = 0x1F80;
-    *(unsigned short *)&mc->fs.fpu_fsw &= ~0xFF;
-#endif /* DARWIN_MODERN_MCONTEXT */
+# error "Floating-point exceptions not supported on MacOS X"
 #elif defined(__DARWIN__) && defined(__ppc__)
     mcontext_t mc = uc->uc_mcontext;
     pc = mc->ss.srr0;
diff --git a/erts/emulator/sys/unix/sys_time.c b/erts/emulator/sys/unix/sys_time.c
index 2e1914f564..8ce02506ab 100644
--- a/erts/emulator/sys/unix/sys_time.c
+++ b/erts/emulator/sys/unix/sys_time.c
@@ -65,6 +65,8 @@
 #  include <fcntl.h>
 #endif
 
+static void init_perf_counter(void);
+
 /******************* Routines for time measurement *********************/
 
 #undef ERTS_SYS_TIME_INTERNAL_STATE_WRITE_FREQ__
@@ -342,7 +344,7 @@ sys_init_time(ErtsSysInitTimeResult *init_resp)
      * times() (CLK_TCK), the resolution is always one millisecond..
      */
     if ((erts_sys_time_data__.r.o.ticks_per_sec = TICKS_PER_SEC()) < 0)
-	erl_exit(ERTS_ABORT_EXIT, "Can't get clock ticks/sec\n");
+	erts_exit(ERTS_ABORT_EXIT, "Can't get clock ticks/sec\n");
     
 #if defined(OS_MONOTONIC_TIME_USING_TIMES)
 #if ERTS_COMPILE_TIME_MONOTONIC_TIME_UNIT
@@ -404,6 +406,8 @@ sys_init_time(ErtsSysInitTimeResult *init_resp)
 #  error Missing erts_os_system_time() implementation
 #endif
 
+    init_perf_counter();
+
 }
 
 void
@@ -450,7 +454,7 @@ posix_clock_gettime(clockid_t id, char *name)
     if (clock_gettime(id, &ts) != 0) {
 	int err = errno;
 	char *errstr = err ? strerror(err) : "unknown";
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "clock_gettime(%s, _) failed: %s (%d)\n",
 		 name, errstr, err);
     }
@@ -495,13 +499,13 @@ posix_clock_gettime_times(clockid_t mid, char *mname,
     
     if (mres != 0) {
 	char *errstr = merr ? strerror(merr) : "unknown";
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "clock_gettime(%s, _) failed: %s (%d)\n",
 		 mname, errstr, merr);
     }
     if (sres != 0) {
 	char *errstr = serr ? strerror(serr) : "unknown";
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "clock_gettime(%s, _) failed: %s (%d)\n",
 		 sname, errstr, serr);
     }
@@ -674,7 +678,7 @@ mach_clocks_init(void)
     clck_srv_p = &internal_state.r.o.mach.clock.monotonic.srv;
     kret = host_get_clock_service(host, id, clck_srv_p);
     if (kret != KERN_SUCCESS) {
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "host_get_clock_service(_, %s, _) failed\n",
 		 name);
     }
@@ -686,7 +690,7 @@ mach_clocks_init(void)
     clck_srv_p = &internal_state.r.o.mach.clock.wall.srv;
     kret = host_get_clock_service(host, id, clck_srv_p);
     if (kret != KERN_SUCCESS) {
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "host_get_clock_service(_, %s, _) failed\n",
 		 name);
     }
@@ -695,7 +699,7 @@ mach_clocks_init(void)
     if (atexit(mach_clocks_fini) != 0) {
 	int err = errno;
 	char *errstr = err ? strerror(err) : "unknown";
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "Failed to register mach_clocks_fini() "
 		 "for call at exit: %s (%d)\n",
 		 errstr, err);
@@ -717,7 +721,7 @@ mach_clock_getres(ErtsMachClock *clk)
 				(clock_attr_t) attr,
 				&cnt);
     if (kret != KERN_SUCCESS || cnt != 1) {
-	erl_exit(ERTS_ABORT_EXIT,	
+	erts_exit(ERTS_ABORT_EXIT,
 		 "clock_get_attributes(%s, _) failed\n",
 		 clk->name);
     }
@@ -735,7 +739,7 @@ mach_clock_get_time(ErtsMachClock *clk)
 
     kret = clock_get_time(clk->srv, &time_spec);
     if (kret != KERN_SUCCESS)
-	erl_exit(ERTS_ABORT_EXIT, "clock_get_time(%s, _) failed\n", clk->name);
+	erts_exit(ERTS_ABORT_EXIT, "clock_get_time(%s, _) failed\n", clk->name);
 
     return ERTS_TimeSpec2Sint64(&time_spec);
 }
@@ -781,11 +785,11 @@ erts_os_times(ErtsMonotonicTime *mtimep, ErtsSystemTime *stimep)
 			   &sys_time_spec);
 
     if (mkret != KERN_SUCCESS)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "clock_get_time(%s, _) failed\n",
 		 internal_state.r.o.mach.clock.monotonic.name);
     if (skret != KERN_SUCCESS)
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "clock_get_time(%s, _) failed\n",
 		 internal_state.r.o.mach.clock.wall.name);
 
@@ -850,7 +854,7 @@ erts_os_system_time(void)
     if (gettimeofday(&tv, NULL) != 0) {
 	int err = errno;
 	char *errstr = err ? strerror(err) : "unknown";
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "gettimeofday(_, NULL) failed: %s (%d)\n",
 		 errstr, err);
     }
@@ -908,10 +912,120 @@ erts_os_times(ErtsMonotonicTime *mtimep, ErtsSystemTime *stimep)
 
 #endif
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
+ * Performance counter functions                                             *
+\*                                                                           */
+
+
+/* What resolution to spin to in micro seconds */
+#define RESOLUTION 100
+/* How many iterations to spin */
+#define ITERATIONS 1
+/* How many significant figures to round to */
+#define SIGFIGS 3
+
+static ErtsSysPerfCounter calculate_perf_counter_unit(void) {
+    int i;
+    ErtsSysPerfCounter pre, post;
+    double value = 0;
+    double round_factor;
+#if defined(HAVE_GETHRTIME) && defined(GETHRTIME_WITH_CLOCK_GETTIME)
+    struct timespec basetime,comparetime;
+#define __GETTIME(arg) clock_gettime(CLOCK_MONOTONIC,arg)
+#define __GETUSEC(arg) (arg.tv_nsec / 1000)
+#else
+    SysTimeval basetime,comparetime;
+#define __GETTIME(arg) sys_gettimeofday(arg)
+#define __GETUSEC(arg) arg.tv_usec
+#endif
+
+    for (i = 0; i < ITERATIONS; i++) {
+        /* Make sure usec just flipped over at current resolution */
+        __GETTIME(&basetime);
+        do {
+            __GETTIME(&comparetime);
+        } while ((__GETUSEC(basetime) / RESOLUTION) == (__GETUSEC(comparetime) / RESOLUTION));
+
+        pre = erts_sys_perf_counter();
+
+        __GETTIME(&basetime);
+        do {
+            __GETTIME(&comparetime);
+        } while ((__GETUSEC(basetime) / RESOLUTION) == (__GETUSEC(comparetime) / RESOLUTION));
+
+        post = erts_sys_perf_counter();
+
+        value += post - pre;
+    }
+    /* After this value is ticks per us */
+    value /= (RESOLUTION*ITERATIONS);
+
+    /* We round to 3 significant figures */
+    round_factor = pow(10.0, SIGFIGS - ceil(log10(value)));
+    value = ((ErtsSysPerfCounter)(value * round_factor + 0.5)) / round_factor;
+
+    /* convert to ticks per second */
+    return 1000000 * value;
+}
+
+static int have_rdtscp(void)
+{
+#if defined(ETHR_X86_RUNTIME_CONF__)
+    /* On early x86 cpu's the tsc varies with the current speed of the cpu,
+       which means that the time per tick vary depending on the current
+       load of the cpu. We do not want this as it would give very scewed
+       numbers when the cpu is mostly idle.
+       The linux kernel seems to think that checking for constant and
+       reliable is enough to trust the counter so we do the same.
+
+       If this test is not good enough, I don't know what we'll do.
+       Maybe fallback on erts_sys_hrtime always, but that would be a shame as
+       rdtsc is about 3 times faster than hrtime... */
+    return ETHR_X86_RUNTIME_CONF_HAVE_CONSTANT_TSC__ &&
+        ETHR_X86_RUNTIME_CONF_HAVE_TSC_RELIABLE__;
+#else
+    return 0;
+#endif
+}
+
+static ErtsSysPerfCounter rdtsc(void)
+{
+ /*  It may have been a good idea to put the cpuid instruction before
+     the rdtsc, but I decided against it because it is not really
+     needed for msacc, and it slows it down by quite a bit (5-7 times slower).
+     As a result though, this timestamp becomes much less
+     accurate as it might be re-ordered to be executed way before or after this
+     function is called.
+ */
+    ErtsSysPerfCounter ts;
+#if defined(__x86_64__)
+    __asm__ __volatile__ ("rdtsc\n\t"
+                          "shl $32, %%rdx\n\t"
+                          "or %%rdx, %0" : "=a" (ts) : : "rdx");
+#elif defined(__i386__)
+    __asm__ __volatile__ ("rdtsc\n\t"
+                           : "=A" (ts) );
+#endif
+    return ts;
+}
+
+static void init_perf_counter(void)
+{
+    if (have_rdtscp()) {
+        erts_sys_time_data__.r.o.perf_counter = rdtsc;
+        erts_sys_time_data__.r.o.perf_counter_unit = calculate_perf_counter_unit();
+    } else {
+        erts_sys_time_data__.r.o.perf_counter = erts_sys_hrtime;
+        erts_sys_time_data__.r.o.perf_counter_unit = ERTS_HRTIME_UNIT;
+    }
+}
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifdef HAVE_GETHRVTIME_PROCFS_IOCTL
 
+/* The code below only has effect on solaris < 10,
+   needed in order for gehhrvtime to work properly */
 int sys_start_hrvtime(void)
 {
     long msacct = PR_MSACCT;
diff --git a/erts/emulator/sys/unix/sys_uds.c b/erts/emulator/sys/unix/sys_uds.c
new file mode 100644
index 0000000000..015d0346a1
--- /dev/null
+++ b/erts/emulator/sys/unix/sys_uds.c
@@ -0,0 +1,155 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2002-2009. 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%
+ */
+
+#include "sys_uds.h"
+
+int
+sys_uds_readv(int fd, struct iovec *iov, size_t iov_len,
+             int *fds, int fd_count, int flags) {
+    struct msghdr msg;
+    struct cmsghdr *cmsg = NULL;
+    char ancillary_buff[256] = {0};
+    int res, i = 0;
+
+    /* setup a place to fill in message contents */
+    memset(&msg, 0, sizeof(struct msghdr));
+    msg.msg_iov = iov;
+    msg.msg_iovlen = iov_len;
+
+    /* provide space for the ancillary data */
+    msg.msg_control = ancillary_buff;
+    msg.msg_controllen = sizeof(ancillary_buff);
+
+    if((res = recvmsg(fd, &msg, flags)) < 0) {
+#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
+        /* When some OS X versions run out of fd's
+           they give EMSGSIZE instead of EMFILE.
+           We remap this as we want the correct
+           error to appear for the user */
+        if (errno == EMSGSIZE)
+            errno = EMFILE;
+#endif
+        return res;
+    }
+
+    if((msg.msg_flags & MSG_CTRUNC) == MSG_CTRUNC)
+    {
+        /* We assume that we have given enough space for any header
+           that are sent to us. So the only remaining reason to get
+           this flag set is if the caller has run out of file descriptors.
+        */
+        errno = EMFILE;
+        return -1;
+    }
+
+    for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg) ) {
+        if ((cmsg->cmsg_level == SOL_SOCKET) &&
+            (cmsg->cmsg_type == SCM_RIGHTS)) {
+                int *cmsg_data = (int *)CMSG_DATA(cmsg);
+                while ((char*)cmsg_data < (char*)cmsg + cmsg->cmsg_len) {
+                    if (i < fd_count) {
+                        fds[i++] = *cmsg_data++;
+                    } else {
+                        /* for some strange reason, we have received more FD's
+                           than we wanted... close them if we are not running
+                           debug. */
+                        if(i >= fd_count) abort();
+                        close(*cmsg_data++);
+                    }
+                }
+            }
+    }
+
+    return res;
+}
+
+int
+sys_uds_read(int fd, char *buff, size_t len,
+             int *fds, int fd_count, int flags) {
+    struct iovec iov;
+    iov.iov_base = buff;
+    iov.iov_len = len;
+    return sys_uds_readv(fd, &iov, 1, fds, fd_count, flags);
+}
+
+
+int
+sys_uds_writev(int fd, struct iovec *iov, size_t iov_len,
+               int *fds, int fd_count, int flags) {
+
+    struct msghdr msg;
+    struct cmsghdr *cmsg = NULL;
+    int res, i;
+
+    /* initialize socket message */
+    memset(&msg, 0, sizeof(struct msghdr));
+
+    /* We flatten the iov if it is too long */
+    if (iov_len > MAXIOV) {
+        int size = 0;
+        char *buff;
+        for (i = 0; i < iov_len; i++)
+            size += iov[i].iov_len;
+        buff = malloc(size);
+
+        for (i = 0; i < iov_len; i++) {
+            memcpy(buff, iov[i].iov_base, iov[i].iov_len);
+            buff += iov[i].iov_len;
+        }
+
+        iov[0].iov_base = buff - size;
+        iov[0].iov_len = size;
+        msg.msg_iov = iov;
+        msg.msg_iovlen = 1;
+    } else {
+        msg.msg_iov = iov;
+        msg.msg_iovlen = iov_len;
+    }
+
+    /* initialize the ancillary data */
+    msg.msg_control = calloc(1, CMSG_SPACE(sizeof(int) * fd_count));
+    msg.msg_controllen = CMSG_SPACE(sizeof(int) * fd_count);
+
+    /* copy the fd array into the ancillary data */
+    cmsg = CMSG_FIRSTHDR(&msg);
+    if(!cmsg) abort();
+    cmsg->cmsg_level = SOL_SOCKET;
+    cmsg->cmsg_type = SCM_RIGHTS;
+    cmsg->cmsg_len = CMSG_LEN(sizeof(int) * fd_count);
+    memcpy(CMSG_DATA(cmsg), fds, sizeof(int) * fd_count);
+
+    res = sendmsg(fd, &msg, flags);
+
+    if (iov_len > MAXIOV)
+        free(iov[0].iov_base);
+
+    free(msg.msg_control);
+
+    return res;
+}
+
+int
+sys_uds_write(int fd, char *buff, size_t len,
+              int *fds, int fd_count, int flags) {
+    struct iovec iov;
+    iov.iov_base = buff;
+    iov.iov_len = len;
+    return sys_uds_writev(fd, &iov, 1, fds, fd_count, flags);
+}
diff --git a/erts/emulator/sys/unix/sys_uds.h b/erts/emulator/sys/unix/sys_uds.h
new file mode 100644
index 0000000000..844a2804d8
--- /dev/null
+++ b/erts/emulator/sys/unix/sys_uds.h
@@ -0,0 +1,57 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2002-2009. 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%
+ */
+
+#ifndef _ERL_UNIX_UDS_H
+#define _ERL_UNIX_UDS_H
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#if defined(__sun__) && !defined(_XOPEN_SOURCE)
+#define _XOPEN_SOURCE 500
+#endif
+
+#include <limits.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+
+#if defined IOV_MAX
+#define MAXIOV IOV_MAX
+#elif defined UIO_MAXIOV
+#define MAXIOV UIO_MAXIOV
+#else
+#define MAXIOV 16
+#endif
+
+#include "sys.h"
+
+int sys_uds_readv(int fd, struct iovec *iov, size_t iov_len,
+                  int *fds, int fd_count, int flags);
+int sys_uds_read(int fd, char *buff, size_t len,
+                 int *fds, int fd_count, int flags);
+int sys_uds_writev(int fd, struct iovec *iov, size_t iov_len,
+                   int *fds, int fd_count, int flags);
+int sys_uds_write(int fd, char *buff, size_t len,
+                  int *fds, int fd_count, int flags);
+
+#endif /* #ifndef _ERL_UNIX_UDS_H */
diff --git a/erts/emulator/sys/win32/erl_poll.c b/erts/emulator/sys/win32/erl_poll.c
index 466f4a3b48..9c1bef5f4f 100644
--- a/erts/emulator/sys/win32/erl_poll.c
+++ b/erts/emulator/sys/win32/erl_poll.c
@@ -27,6 +27,7 @@
 #include "erl_alloc.h"
 #include "erl_poll.h"
 #include "erl_time.h"
+#include "erl_msacc.h"
 
 /*
  * Some debug macros 
@@ -436,7 +437,7 @@ wakeup_cause(ErtsPollSet ps)
 	break;
     default:
 	res = 0;
-	erl_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_ABORT_EXIT,
 		 "%s:%d: Internal error: Invalid wakeup_state=%d\n",
 		 __FILE__, __LINE__, (int) wakeup_state);
     }
@@ -576,7 +577,7 @@ static void signal_standby(ErtsPollSet ps)
     --(ps->standby_wait_counter);
     if (ps->standby_wait_counter < 0) {
 	LeaveCriticalSection(&(ps->standby_crit));
-	erl_exit(1,"Standby signalled by more threads than expected");
+	erts_exit(ERTS_ERROR_EXIT,"Standby signalled by more threads than expected");
     }
     if (!(ps->standby_wait_counter)) {
 	SetEvent(ps->standby_wait_event);
@@ -738,7 +739,7 @@ static void *break_waiter(void *param)
 	    erts_mtx_unlock(&break_waiter_lock);
 	    break;
 	default:
-	    erl_exit(1,"Unexpected event in break_waiter");
+	    erts_exit(ERTS_ERROR_EXIT,"Unexpected event in break_waiter");
 	}
     }
 }
@@ -1157,7 +1158,7 @@ int erts_poll_wait(ErtsPollSet ps,
 		   HARDDEBUGF(("Oups!"));
 		   /* Oups, got signalled before we took the lock, can't reset */
 		   if(!is_io_ready(ps)) {
-		       erl_exit(1,"Internal error: "
+		       erts_exit(ERTS_ERROR_EXIT,"Internal error: "
 				"Inconsistent io structures in erl_poll.\n");
 		   }
 		   START_WAITER(ps,w);
@@ -1188,16 +1189,19 @@ int erts_poll_wait(ErtsPollSet ps,
     if (timeout > 0 && !erts_atomic32_read_nob(&break_waiter_state)) {
 	HANDLE harr[2] = {ps->event_io_ready, break_happened_event};
 	int num_h = 2;
+        ERTS_MSACC_PUSH_STATE_M();
 
 	HARDDEBUGF(("Start waiting %d [%d]",num_h, (int) timeout));
 	ERTS_POLLSET_UNLOCK(ps);
 #ifdef ERTS_SMP
 	erts_thr_progress_prepare_wait(NULL);
 #endif
+        ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_SLEEP);
 	WaitForMultipleObjects(num_h, harr, FALSE, timeout);
 #ifdef ERTS_SMP
 	erts_thr_progress_finalize_wait(NULL);
 #endif
+        ERTS_MSACC_POP_STATE_M();
 	ERTS_POLLSET_LOCK(ps);
 	HARDDEBUGF(("Stop waiting %d [%d]",num_h, (int) timeout));
 	woke_up(ps);
@@ -1215,7 +1219,7 @@ int erts_poll_wait(ErtsPollSet ps,
 	    ERTS_SET_BREAK_REQUESTED;
 	    break;
 	case  BREAK_WAITER_GOT_HALT:
-	    erl_exit(0,"");
+	    erts_exit(0,"");
 	    break;
 	default:
 	    break;
diff --git a/erts/emulator/sys/win32/erl_win_dyn_driver.h b/erts/emulator/sys/win32/erl_win_dyn_driver.h
index baac7c903e..9c699fdba0 100644
--- a/erts/emulator/sys/win32/erl_win_dyn_driver.h
+++ b/erts/emulator/sys/win32/erl_win_dyn_driver.h
@@ -103,6 +103,11 @@ WDD_TYPEDEF(ErlDrvSInt, driver_pdl_inc_refc, (ErlDrvPDL));
 WDD_TYPEDEF(ErlDrvSInt, driver_pdl_dec_refc, (ErlDrvPDL));
 WDD_TYPEDEF(void, driver_system_info, (ErlDrvSysInfo *, size_t));
 WDD_TYPEDEF(int, driver_get_now, (ErlDrvNowData *));
+WDD_TYPEDEF(ErlDrvTime, erl_drv_monotonic_time, (ErlDrvTimeUnit));
+WDD_TYPEDEF(ErlDrvTime, erl_drv_time_offset, (ErlDrvTimeUnit));
+WDD_TYPEDEF(ErlDrvTime, erl_drv_convert_time_unit, (ErlDrvTime,
+						    ErlDrvTimeUnit,
+						    ErlDrvTimeUnit));
 WDD_TYPEDEF(int, driver_monitor_process, (ErlDrvPort port, 
 					  ErlDrvTermData process, 
 					  ErlDrvMonitor *monitor));
@@ -217,6 +222,9 @@ typedef struct {
     WDD_FTYPE(driver_pdl_dec_refc) *driver_pdl_dec_refc;
     WDD_FTYPE(driver_system_info) *driver_system_info;
     WDD_FTYPE(driver_get_now) *driver_get_now;
+    WDD_FTYPE(erl_drv_monotonic_time) *erl_drv_monotonic_time;
+    WDD_FTYPE(erl_drv_time_offset) *erl_drv_time_offset;
+    WDD_FTYPE(erl_drv_convert_time_unit) *erl_drv_convert_time_unit;
     WDD_FTYPE(driver_monitor_process) *driver_monitor_process;
     WDD_FTYPE(driver_demonitor_process) *driver_demonitor_process;
     WDD_FTYPE(driver_get_monitored_process) *driver_get_monitored_process;
@@ -328,6 +336,9 @@ extern TWinDynDriverCallbacks WinDynDriverCallbacks;
 #define driver_pdl_dec_refc (WinDynDriverCallbacks.driver_pdl_dec_refc)
 #define driver_system_info (WinDynDriverCallbacks.driver_system_info)
 #define driver_get_now (WinDynDriverCallbacks.driver_get_now)
+#define erl_drv_monotonic_time (WinDynDriverCallbacks.erl_drv_monotonic_time)
+#define erl_drv_time_offset (WinDynDriverCallbacks.erl_drv_time_offset)
+#define erl_drv_convert_time_unit (WinDynDriverCallbacks.erl_drv_convert_time_unit)
 #define driver_monitor_process \
 (WinDynDriverCallbacks.driver_monitor_process)
 #define driver_demonitor_process \
@@ -463,6 +474,9 @@ do {				                        \
 ((W).driver_pdl_dec_refc) = driver_pdl_dec_refc;	\
 ((W).driver_system_info) = driver_system_info;		\
 ((W).driver_get_now) = driver_get_now;		        \
+((W).erl_drv_monotonic_time) = erl_drv_monotonic_time;	\
+((W).erl_drv_time_offset) = erl_drv_time_offset;	\
+((W).erl_drv_convert_time_unit) = erl_drv_convert_time_unit; \
 ((W).driver_monitor_process) = driver_monitor_process;    \
 ((W).driver_demonitor_process) = driver_demonitor_process;  \
 ((W).driver_get_monitored_process) = driver_get_monitored_process;      \
diff --git a/erts/emulator/sys/win32/erl_win_sys.h b/erts/emulator/sys/win32/erl_win_sys.h
index 7e8dd8a4ca..99c1066ab3 100644
--- a/erts/emulator/sys/win32/erl_win_sys.h
+++ b/erts/emulator/sys/win32/erl_win_sys.h
@@ -183,6 +183,7 @@ typedef LONGLONG ErtsSysHrTime;
 #endif
 
 typedef ErtsMonotonicTime ErtsSystemTime;
+typedef ErtsMonotonicTime ErtsSysPerfCounter;
 
 ErtsSystemTime erts_os_system_time(void);
 
@@ -213,6 +214,7 @@ ERTS_GLB_INLINE ErtsMonotonicTime erts_os_monotonic_time(void);
 ERTS_GLB_INLINE void erts_os_times(ErtsMonotonicTime *,
 				   ErtsSystemTime *);
 ERTS_GLB_INLINE ErtsSysHrTime erts_sys_hrtime(void);
+ERTS_GLB_INLINE ErtsSysPerfCounter erts_sys_perf_counter(void);
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
@@ -234,6 +236,18 @@ erts_sys_hrtime(void)
     return (*erts_sys_time_data__.r.o.sys_hrtime)();
 }
 
+ERTS_GLB_INLINE ErtsSysPerfCounter
+erts_sys_perf_counter(void)
+{
+    return (*erts_sys_time_data__.r.o.sys_hrtime)();
+}
+
+ERTS_GLB_INLINE ErtsSysPerfCounter
+erts_sys_perf_counter_unit(void)
+{
+    return 1000 * 1000 * 1000;
+}
+
 #endif /* ERTS_GLB_INLINE_INCL_FUNC_DEF */
 
 extern void sys_gettimeofday(SysTimeval *tv);
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index fce76db28f..391bbd4cbc 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -38,7 +38,7 @@
 void erts_sys_init_float(void);
 
 void erl_start(int, char**);
-void erl_exit(int n, char*, ...);
+void erts_exit(int n, char*, ...);
 void erl_error(char*, va_list);
 void erl_crash_dump(char*, int, char*, ...);
 
@@ -200,7 +200,7 @@ erts_sys_misc_mem_sz(void)
  */
 void sys_tty_reset(int exit_code)
 {
-    if (exit_code > 0)
+    if (exit_code == ERTS_ERROR_EXIT)
 	ConWaitForExit();
     else
 	ConNormalExit();
@@ -1334,10 +1334,8 @@ spawn_start(ErlDrvPort port_num, char* utf8_name, SysDriverOpts* opts)
 	retval = set_driver_data(dp, hFromChild, hToChild, opts->read_write,
 				 opts->exit_status);
 	if (retval != ERL_DRV_ERROR_GENERAL && retval != ERL_DRV_ERROR_ERRNO) {
-	    Port *prt = erts_drvport2port(port_num);
-		/* We assume that this cannot generate a negative number */
-	    ASSERT(prt != ERTS_INVALID_ERL_DRV_PORT);
-	    prt->os_pid = (SWord) pid;
+            /* We assume that this cannot generate a negative number */
+            erl_drv_set_os_pid(port_num, pid);
 	}
     }
     
@@ -1528,8 +1526,8 @@ create_child_process
 	 * Parse out the program name from the command line (it can be quoted and
 	 * contain spaces).
 	 */
-	newcmdline = (wchar_t *) erts_alloc(ERTS_ALC_T_TMP, 2048*sizeof(wchar_t));
 	cmdlength = parse_command(origcmd);
+	newcmdline = (wchar_t *) erts_alloc(ERTS_ALC_T_TMP, (MAX_PATH+wcslen(origcmd)-cmdlength)*sizeof(wchar_t));
 	thecommand = (wchar_t *) erts_alloc(ERTS_ALC_T_TMP, (cmdlength+1)*sizeof(wchar_t));
 	wcsncpy(thecommand, origcmd, cmdlength);
 	thecommand[cmdlength] = L'\0';
@@ -3081,6 +3079,8 @@ erl_bin_write(buf, sz, max)
   }
 }
 
+#endif /* DEBUG */
+
 void
 erl_assert_error(const char* expr, const char* func, const char* file, int line)
 {   
@@ -3096,7 +3096,6 @@ erl_assert_error(const char* expr, const char* func, const char* file, int line)
     DebugBreak();
 }
 
-#endif /* DEBUG */
 	    
 static void
 check_supported_os_version(void)
@@ -3110,13 +3109,13 @@ check_supported_os_version(void)
 	    || int_os_version.dwMajorVersion < major
 	    || (int_os_version.dwMajorVersion == major
 		&& int_os_version.dwMinorVersion < minor))
-	    erl_exit(-1,
+	    erts_exit(1,
 		     "Windows version not supported "
 		     "(min required: winnt %d.%d)\n",
 		     major, minor);
     }
 #else
-    erl_exit(-1,
+    erts_exit(1,
 	     "Windows version not supported "
 	     "(min required: win %d.%d)\n",
 	     nt_major, nt_minor);
@@ -3273,6 +3272,12 @@ void erl_sys_init(void)
 }
 
 void
+erl_sys_late_init(void)
+{
+    /* do nothing */
+}
+
+void
 erts_sys_schedule_interrupt(int set)
 {
     erts_check_io_interrupt(set);
diff --git a/erts/emulator/sys/win32/sys_interrupt.c b/erts/emulator/sys/win32/sys_interrupt.c
index d6178de03c..a89211fa8e 100644
--- a/erts/emulator/sys/win32/sys_interrupt.c
+++ b/erts/emulator/sys/win32/sys_interrupt.c
@@ -81,7 +81,7 @@ BOOL WINAPI ctrl_handler_ignore_break(DWORD dwCtrlType)
 	    return TRUE;
 	/* else pour through... */
     case CTRL_CLOSE_EVENT:
-	erl_exit(0, "");
+	erts_exit(0, "");
 	break;
     }
     return TRUE;
@@ -106,7 +106,7 @@ BOOL WINAPI ctrl_handler_replace_intr(DWORD dwCtrlType)
 	/* else pour through... */
     case CTRL_CLOSE_EVENT:
     case CTRL_SHUTDOWN_EVENT:
-	erl_exit(0, "");
+	erts_exit(0, "");
 	break;
     }
     return TRUE;
@@ -133,7 +133,7 @@ BOOL WINAPI ctrl_handler(DWORD dwCtrlType)
 	    return TRUE;
 	/* else pour through... */
     case CTRL_CLOSE_EVENT:
-	erl_exit(0, "");
+	erts_exit(0, "");
 	break;
     }
     return TRUE;
diff --git a/erts/emulator/sys/win32/sys_time.c b/erts/emulator/sys/win32/sys_time.c
index 9e5f78703a..9a9d90610d 100644
--- a/erts/emulator/sys/win32/sys_time.c
+++ b/erts/emulator/sys/win32/sys_time.c
@@ -147,7 +147,7 @@ os_monotonic_time_qpc(void)
     LARGE_INTEGER pc;
 
     if (!(*internal_state.r.o.pQueryPerformanceCounter)(&pc))
-	erl_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n");
+	erts_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n");
 
     return (ErtsMonotonicTime) pc.QuadPart;
 }
@@ -164,7 +164,7 @@ os_times_qpc(ErtsMonotonicTime *mtimep, ErtsSystemTime *stimep)
     GetSystemTime(&st);
 
     if (!qpcr)
-	erl_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n");
+	erts_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n");
 
     *mtimep = (ErtsMonotonicTime) pc.QuadPart;
 
@@ -251,7 +251,7 @@ sys_hrtime_qpc(void)
     LARGE_INTEGER pc;
 
     if (!(*internal_state.r.o.pQueryPerformanceCounter)(&pc))
-	erl_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n");
+	erts_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n");
 
     ASSERT(pc.QuadPart > 0);
 
@@ -397,6 +397,7 @@ sys_init_time(ErtsSysInitTimeResult *init_resp)
 
     erts_sys_time_data__.r.o.os_monotonic_time = os_mtime_func;
     erts_sys_time_data__.r.o.os_times = os_times_func;
+    erts_sys_time_data__.r.o.sys_hrtime = sys_hrtime_func;
     init_resp->os_monotonic_time_unit = time_unit;
     init_resp->have_os_monotonic_time = 1;
     init_resp->have_corrected_os_monotonic_time = 0;
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile
index 77614d455c..0f716c11a1 100644
--- a/erts/emulator/test/Makefile
+++ b/erts/emulator/test/Makefile
@@ -70,15 +70,18 @@ MODULES= \
 	hash_SUITE \
 	hibernate_SUITE \
 	list_bif_SUITE \
+	lttng_SUITE \
 	map_SUITE \
 	match_spec_SUITE \
 	module_info_SUITE \
 	monitor_SUITE \
+	multi_load_SUITE \
 	nested_SUITE \
 	nif_SUITE \
 	node_container_SUITE \
 	nofrag_SUITE \
 	num_bif_SUITE \
+	message_queue_data_SUITE \
 	op_SUITE \
 	port_SUITE \
 	port_bif_SUITE \
@@ -157,7 +160,7 @@ RELSYSDIR = $(RELEASE_PATH)/emulator_test
 # FLAGS
 # ----------------------------------------------------
 ERL_MAKE_FLAGS += 
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 # ----------------------------------------------------
 # Targets
diff --git a/erts/emulator/test/a_SUITE.erl b/erts/emulator/test/a_SUITE.erl
index 16f060fe34..5b3a213154 100644
--- a/erts/emulator/test/a_SUITE.erl
+++ b/erts/emulator/test/a_SUITE.erl
@@ -27,68 +27,43 @@
 %%%-------------------------------------------------------------------
 -module(a_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, long_timers/1, pollset_size/1]).
+-export([all/0, suite/0,
+	 long_timers/1, pollset_size/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [long_timers, pollset_size].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-long_timers(doc) ->
-    [];
-long_timers(suite) ->
-    [];
 long_timers(Config) when is_list(Config) ->
-    Dir = ?config(data_dir, Config),
-    ?line long_timers_test:start(Dir),
-    ?line {comment,
-	   "Testcase started! This test will run in parallel with the "
-	   "erts testsuite and ends in the z_SUITE:long_timers testcase."}.
+    Dir = proplists:get_value(data_dir, Config),
+    long_timers_test:start(Dir),
+    {comment, "Testcase started! This test will run in parallel with the "
+              "erts testsuite and ends in the z_SUITE:long_timers testcase."}.
 
-pollset_size(doc) ->
-    [];
-pollset_size(suite) ->
-    [];
 pollset_size(Config) when is_list(Config) ->
     %% Ensure inet_gethost_native port program started, in order to
     %% allow other suites to use it...
     inet_gethost_native:gethostbyname("localhost"),
-    ?line Parent = self(),
-    ?line Go = make_ref(),
-    ?line spawn(fun () ->
-			Name = pollset_size_testcase_initial_state_holder,
-			true = register(Name, self()),
-			ChkIo = get_check_io_info(),
-			io:format("Initial: ~p~n", [ChkIo]),
-			Parent ! Go,
-			receive
-			    {get_initial_check_io_result, Pid} ->
-				Pid ! {initial_check_io_result, ChkIo}
-			end
-		end),
-    ?line receive Go -> ok end,
-    ?line {comment,
-	   "Testcase started! This test will run in parallel with the "
-	   "erts testsuite and ends in the z_SUITE:pollset_size testcase."}.
+    Parent = self(),
+    Go = make_ref(),
+    spawn(fun () ->
+                  Name = pollset_size_testcase_initial_state_holder,
+                  true = register(Name, self()),
+                  ChkIo = get_check_io_info(),
+                  io:format("Initial: ~p~n", [ChkIo]),
+                  Parent ! Go,
+                  receive
+                      {get_initial_check_io_result, Pid} ->
+                          Pid ! {initial_check_io_result, ChkIo}
+                  end
+          end),
+    receive Go -> ok end,
+    {comment, "Testcase started! This test will run in parallel with the "
+              "erts testsuite and ends in the z_SUITE:pollset_size testcase."}.
 
 %%
 %% Internal functions...
@@ -106,5 +81,3 @@ display_check_io(ChkIo) ->
 
 get_check_io_info() ->
     z_SUITE:get_check_io_info().
-
-
diff --git a/erts/emulator/test/after_SUITE.erl b/erts/emulator/test/after_SUITE.erl
index 5017a83185..a72cd8deea 100644
--- a/erts/emulator/test/after_SUITE.erl
+++ b/erts/emulator/test/after_SUITE.erl
@@ -22,92 +22,66 @@
 
 %% Tests receive after.
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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,
 	 t_after/1, receive_after/1, receive_after_big/1,
 	 receive_after_errors/1, receive_var_zero/1, receive_zero/1,
 	 multi_timeout/1, receive_after_32bit/1,
 	 receive_after_blast/1]).
 
--export([init_per_testcase/2, end_per_testcase/2]).
-
 %% Internal exports.
 
 -export([timeout_g/0]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 4}}].
 
 all() -> 
     [t_after, receive_after, receive_after_big,
      receive_after_errors, receive_var_zero, receive_zero,
      multi_timeout, receive_after_32bit, receive_after_blast].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(3)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
 %% Tests for an old round-off error in 'receive after'."
 t_after(Config) when is_list(Config) ->
-    ?line spawn(fun frequent_process/0),
-    ?line Period = test_server:minutes(1),
-    ?line Before = erlang:monotonic_time(),
+    spawn(fun frequent_process/0),
+    Period = test_server:minutes(1),
+    Before = erlang:monotonic_time(),
     receive
-	after Period ->
-		?line After = erlang:monotonic_time(),
-		?line report(Period, Before, After)
-	end.
+    after Period ->
+                After = erlang:monotonic_time(),
+                report(Period, Before, After)
+    end.
 
 report(Period, Before, After) ->
     case erlang:convert_time_unit(After - Before, native, 100*1000) / Period of
-	Percent when Percent > 100.10 ->
-	    test_server:fail({too_inaccurate, Percent});
-	Percent when Percent < 100.0 ->
-	    test_server:fail({too_early, Percent});
-	Percent ->
-	    Comment = io_lib:format("Elapsed/expected: ~.2f %", [Percent]),
-	    {comment, lists:flatten(Comment)}
+        Percent when Percent > 100.10 ->
+            ct:fail({too_inaccurate, Percent});
+        Percent when Percent < 100.0 ->
+            ct:fail({too_early, Percent});
+        Percent ->
+            Comment = io_lib:format("Elapsed/expected: ~.2f %", [Percent]),
+            {comment, lists:flatten(Comment)}
     end.
 
 frequent_process() ->
     receive
-	after 100 ->
-		?line frequent_process()
-	end.
+    after 100 ->
+              frequent_process()
+    end.
 
-receive_after(doc) ->
-    "Test that 'receive after' works (doesn't hang). "
-    "The test takes 10 seconds to complete.";
+%%  Test that 'receive after' works (doesn't hang).
+%%  The test takes 10 seconds to complete.
 receive_after(Config) when is_list(Config) ->
-    ?line receive_after1(5000).
+    receive_after1(5000).
 
 receive_after1(1) ->
-    ?line io:format("Testing: receive after ~p~n", [1]), 
-    ?line receive after 1 -> ok end;
+    io:format("Testing: receive after ~p~n", [1]), 
+    receive after 1 -> ok end;
 receive_after1(N) -> 
-    ?line io:format("Testing: receive after ~p~n", [N]), 
-    ?line receive after N -> receive_after1(N div 2) end.
+    io:format("Testing: receive after ~p~n", [N]), 
+    receive after N -> receive_after1(N div 2) end.
 
 receive_after_big(Config) when is_list(Config) ->
     %% Test that 'receive after' with a 32 bit number works.
@@ -119,14 +93,14 @@ receive_after_big1(Timeout) ->
     erlang:yield(),
     spawn(fun() -> Self ! here_is_a_message end),
     ok = receive
-	     here_is_a_message ->
-		 ok
-	 after Timeout ->
-		 %% We test that the timeout can be set,
-		 %% not that an timeout occurs after the appropriate delay
-		 %% (48 days, 56 minutes, 48 seconds)!
-		 timeout
-	 end.
+             here_is_a_message ->
+                 ok
+         after Timeout ->
+                   %% We test that the timeout can be set,
+                   %% not that an timeout occurs after the appropriate delay
+                   %% (48 days, 56 minutes, 48 seconds)!
+                   timeout
+         end.
 
 receive_after_big2() ->
     Self = self(),
@@ -147,38 +121,38 @@ receive_after_big2() ->
 
 %% Test error cases for 'receive after'.
 receive_after_errors(Config) when is_list(Config) ->
-    ?line ?TryAfter(-1),
-    ?line ?TryAfter(0.0),
-    ?line ?TryAfter(3.14),
-    ?line ?TryAfter(16#100000000),
-    ?line ?TryAfter(392347129847294724972398472984729847129874),
-    ?line ?TryAfter(16#3fffffffffffffff),
-    ?line ?TryAfter(16#ffffffffffffffff),
-    ?line ?TryAfter(-16#100000000),
-    ?line ?TryAfter(-3891278094774921784123987129848),
-    ?line ?TryAfter(xxx),
+    ?TryAfter(-1),
+    ?TryAfter(0.0),
+    ?TryAfter(3.14),
+    ?TryAfter(16#100000000),
+    ?TryAfter(392347129847294724972398472984729847129874),
+    ?TryAfter(16#3fffffffffffffff),
+    ?TryAfter(16#ffffffffffffffff),
+    ?TryAfter(-16#100000000),
+    ?TryAfter(-3891278094774921784123987129848),
+    ?TryAfter(xxx),
     ok.
 
 try_after(Timeout) ->
     {'EXIT',{timeout_value,_}} = (catch receive after Timeout -> ok end).
 
-receive_var_zero(doc) -> "Test 'after Z', when Z == 0.";
+%% Test 'after Z', when Z == 0.
 receive_var_zero(Config) when is_list(Config) ->
     self() ! x,
     self() ! y,
     Z = zero(),
     timeout = receive
-		  z -> ok
-	      after Z -> timeout
-	      end,
+                  z -> ok
+              after Z -> timeout
+              end,
     timeout = receive
-	      after Z -> timeout
-	      end,
+              after Z -> timeout
+              end,
     self() ! w,
     receive
 	x -> ok;
 	Other ->
-	    ?line ?t:fail({bad_message,Other})
+	    ct:fail({bad_message,Other})
     end.
 
 zero() -> 0.
@@ -188,44 +162,43 @@ receive_zero(Config) when is_list(Config) ->
     self() ! x,
     self() ! y,
     timeout = receive
-		  z -> ok
-	      after 0 ->
-		      timeout
-	      end,
+                  z -> ok
+              after 0 ->
+                        timeout
+              end,
     self() ! w,
     timeout = receive
               after 0 -> timeout
               end,
     receive
-	x -> ok;
-	Other ->
-	    ?line ?t:fail({bad_message,Other})
+        x -> ok;
+        Other ->
+            ct:fail({bad_message,Other})
     end.
 
-multi_timeout(doc) ->
-    "Test for catching invalid assertion in erl_message.c (in queue_message)."
-    "This failed (dumped core) with debug-compiled emulator.";
+%% Test for catching invalid assertion in erl_message.c (in queue_message)
+%% This failed (dumped core) with debug-compiled emulator.
 multi_timeout(Config) when is_list(Config) ->
-    ?line P = spawn(?MODULE, timeout_g, []),
-    ?line P ! a,
-    ?line P ! b,
-    ?line receive
-	  after 1000 -> ok
-	  end,
-    ?line P ! c,
-    ?line receive
-	  after 1000 -> ok
-	  end,
-    ?line P ! d,
+    P = spawn(?MODULE, timeout_g, []),
+    P ! a,
+    P ! b,
+    receive
+    after 1000 -> ok
+    end,
+    P ! c,
+    receive
+    after 1000 -> ok
+    end,
+    P ! d,
     ok.
 
 timeout_g() ->
-    ?line receive
-	a -> ok
+    receive
+        a -> ok
+    end,
+    receive
+    after 100000 -> ok
     end,
-    ?line receive
-	  after 100000 -> ok
-	  end,
     ok.
 
 %% OTP-7493: Timeout for 32 bit numbers (such as 16#ffffFFFF) could
@@ -264,8 +237,8 @@ receive_after_blast(Config) when is_list(Config) ->
     TimeoutTime = erlang:monotonic_time(milli_seconds) + 5000,
     lists:foreach(fun ({P, _}) -> P ! {go, TimeoutTime} end, PMs),
     lists:foreach(fun ({P, M}) ->
-			  receive
-			      {'DOWN', M, process, P, normal} ->
-				  ok
-			  end
-		  end, PMs).
+                          receive
+                              {'DOWN', M, process, P, normal} ->
+                                  ok
+                          end
+                  end, PMs).
diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index aa6a1fbcdc..03b020c521 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -19,8 +19,7 @@
 
 -module(alloc_SUITE).
 -author('[email protected]').
--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, init_per_testcase/2, end_per_testcase/2]).
 
 -export([basic/1,
 	 coalesce/1,
@@ -34,42 +33,20 @@
 	 cpool/1,
 	 migration/1]).
 
--export([init_per_testcase/2, end_per_testcase/2]).
+-include_lib("common_test/include/ct.hrl").
 
--include_lib("test_server/include/test_server.hrl").
-
--define(DEFAULT_TIMETRAP_SECS, 240).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 4}}].
 
 all() -> 
     [basic, coalesce, threads, realloc_copy, bucket_index,
      bucket_mask, rbtree, mseg_clear_cache, erts_mmap, cpool, migration].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-
 init_per_testcase(Case, Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:seconds(?DEFAULT_TIMETRAP_SECS)),
-    [{watchdog, Dog}, {testcase, Case}, {debug,false} | Config].
+    [{testcase, Case},{debug,false}|Config].
 
 end_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -77,41 +54,15 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %% Testcases                                                              %%
 %%                                                                        %%
 
-basic(suite) -> [];
-basic(doc) ->   [];
-basic(Cfg) -> ?line drv_case(Cfg).
-
-coalesce(suite) -> [];
-coalesce(doc) ->   [];
-coalesce(Cfg) -> ?line drv_case(Cfg).
-
-threads(suite) -> [];
-threads(doc) ->   [];
-threads(Cfg) -> ?line drv_case(Cfg).
-
-realloc_copy(suite) -> [];
-realloc_copy(doc) ->   [];
-realloc_copy(Cfg) -> ?line drv_case(Cfg).
-
-bucket_index(suite) -> [];
-bucket_index(doc) ->   [];
-bucket_index(Cfg) -> ?line drv_case(Cfg).
-
-bucket_mask(suite) -> [];
-bucket_mask(doc) ->   [];
-bucket_mask(Cfg) -> ?line drv_case(Cfg).
-
-rbtree(suite) -> [];
-rbtree(doc) ->   [];
-rbtree(Cfg) -> ?line drv_case(Cfg).
-
-mseg_clear_cache(suite) -> [];
-mseg_clear_cache(doc) ->   [];
-mseg_clear_cache(Cfg) -> ?line drv_case(Cfg).
-
-cpool(suite) -> [];
-cpool(doc) ->   [];
-cpool(Cfg) -> ?line drv_case(Cfg).
+basic(Cfg) -> drv_case(Cfg).
+coalesce(Cfg) -> drv_case(Cfg).
+threads(Cfg) -> drv_case(Cfg).
+realloc_copy(Cfg) -> drv_case(Cfg).
+bucket_index(Cfg) -> drv_case(Cfg).
+bucket_mask(Cfg) -> drv_case(Cfg).
+rbtree(Cfg) -> drv_case(Cfg).
+mseg_clear_cache(Cfg) -> drv_case(Cfg).
+cpool(Cfg) -> drv_case(Cfg).
 
 migration(Cfg) ->
     case erlang:system_info(smp_support) of
@@ -122,15 +73,12 @@ migration(Cfg) ->
     end.
 
 erts_mmap(Config) when is_list(Config) ->
-    case {?t:os_type(), is_halfword_vm()} of
-	{{unix, _}, false} ->
+    case os:type() of
+	{unix, _} ->
 	    [erts_mmap_do(Config, SCO, SCRPM, SCRFSD)
 	     || SCO <-[true,false], SCRFSD <-[1234,0], SCRPM <- [true,false]];
-
-	{_,true} ->
-	    {skipped, "No supercarrier support on halfword vm"};
 	{SkipOs,_} ->
-	    ?line {skipped,
+	    {skipped,
 		   lists:flatten(["Not run on "
 				  | io_lib:format("~p",[SkipOs])])}
     end.
@@ -153,25 +101,26 @@ erts_mmap_do(Config, SCO, SCRPM, SCRFSD) ->
     {ok, Node} = start_node(Config, Opts),
     Self = self(),
     Ref = make_ref(),
-    F = fun () ->
-		SI = erlang:system_info({allocator,mseg_alloc}),
-		{erts_mmap,EM} = lists:keyfind(erts_mmap, 1, SI),
-		{supercarrier,SC} = lists:keyfind(supercarrier, 1, EM),
-		{sizes,Sizes} = lists:keyfind(sizes, 1, SC),
-		{free_segs,Segs} = lists:keyfind(free_segs,1,SC),
-		{total,Total} = lists:keyfind(total,1,Sizes),
-		Total = SCS*1024*1024,
-
-		{reserved,Reserved} = lists:keyfind(reserved,1,Segs),
-		true = (Reserved >= SCRFSD),
-
-		case {SCO,lists:keyfind(os,1,EM)} of
-		    {true, false} -> ok;
-		    {false, {os,_}} -> ok
-		end,
-
-		Self ! {Ref, ok}
-	end,
+    F = fun() ->
+                SI = erlang:system_info({allocator,mseg_alloc}),
+                {erts_mmap,EM} = lists:keyfind(erts_mmap, 1, SI),
+                {supercarrier,SC} = lists:keyfind(supercarrier, 1, EM),
+                {sizes,Sizes} = lists:keyfind(sizes, 1, SC),
+                {free_segs,Segs} = lists:keyfind(free_segs,1,SC),
+                {total,Total} = lists:keyfind(total,1,Sizes),
+                io:format("Expecting total ~w, got ~w~n", [SCS*1024*1024,Total]),
+                Total = SCS*1024*1024,
+
+                {reserved,Reserved} = lists:keyfind(reserved,1,Segs),
+                true = (Reserved >= SCRFSD),
+
+                case {SCO,lists:keyfind(os,1,EM)} of
+                    {true, false} -> ok;
+                    {false, {os,_}} -> ok
+                end,
+
+                Self ! {Ref, ok}
+        end,
 
     spawn_link(Node, F),
     Result = receive {Ref, Rslt} -> Rslt end,
@@ -188,28 +137,28 @@ drv_case(Config) ->
     drv_case(Config, one_shot, "").
 
 drv_case(Config, Mode, NodeOpts) when is_list(Config) ->
-    case ?t:os_type() of
+    case os:type() of
 	{Family, _} when Family == unix; Family == win32 ->
-	    ?line {ok, Node} = start_node(Config, NodeOpts),
-	    ?line Self = self(),
-	    ?line Ref = make_ref(),
-	    ?line spawn_link(Node,
+	    {ok, Node} = start_node(Config, NodeOpts),
+	    Self = self(),
+	    Ref = make_ref(),
+	    spawn_link(Node,
 			     fun () ->
 				     Res = run_drv_case(Config, Mode),
 				     Self ! {Ref, Res}
 			     end),
-	    ?line Result = receive {Ref, Rslt} -> Rslt end,
-	    ?line stop_node(Node),
-	    ?line Result;
+	    Result = receive {Ref, Rslt} -> Rslt end,
+	    stop_node(Node),
+	    Result;
 	SkipOs ->
-	    ?line {skipped,
+	    {skipped,
 		   lists:flatten(["Not run on "
 				  | io_lib:format("~p",[SkipOs])])}
     end.
 
 run_drv_case(Config, Mode) ->
-    DataDir = ?config(data_dir,Config),
-    CaseName = ?config(testcase,Config),
+    DataDir = proplists:get_value(data_dir,Config),
+    CaseName = proplists:get_value(testcase,Config),
     File = filename:join(DataDir, CaseName),
     {ok,CaseName,Bin} = compile:file(File, [binary,return_errors]),
     {module,CaseName} = erlang:load_module(CaseName,Bin),
@@ -269,7 +218,6 @@ print_stats(migration) ->
 
     io:format("Number of blocks  : ~p\n", [Btot]),
     io:format("Number of carriers: ~p\n", [Ctot]);
-
 print_stats(_) -> ok.
 
 tuple_add(T1, T2) ->
@@ -341,7 +289,7 @@ repeat_while_loop(Fun, TRef, I) ->
 flush_log() ->
     receive
 	{print, Str} ->
-	    ?t:format("~s", [Str]),
+	    io:format("~s", [Str]),
 	    flush_log()
     after 0 ->
 	    ok
@@ -351,23 +299,23 @@ handle_result(_State, Result0) ->
     flush_log(),
     case Result0 of
 	{'EXIT', Error} ->
-	    ?line ?t:fail(Error);
+	    ct:fail(Error);
 	{'EXIT', error, Error} ->
-	    ?line ?t:fail(Error);
+	    ct:fail(Error);
 	{failed, Comment} ->
-	    ?line ?t:fail(Comment);
+	    ct:fail(Comment);
 	{skipped, Comment} ->
-	    ?line {skipped, Comment};
+	    {skipped, Comment};
 	{succeeded, ""} ->
-	    ?line succeeded;
+	    succeeded;
 	{succeeded, Comment} ->
-	    ?line {comment, Comment};
+	    {comment, Comment};
 	continue ->
 	    continue
     end.
 
 start_node(Config, Opts) when is_list(Config), is_list(Opts) ->
-    case ?config(debug,Config) of
+    case proplists:get_value(debug,Config) of
 	true -> {ok, node()};
 	_ -> start_node_1(Config, Opts)
     end.
@@ -376,23 +324,16 @@ start_node_1(Config, Opts) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
 			++ "-"
-			++ atom_to_list(?config(testcase, Config))
+			++ atom_to_list(proplists:get_value(testcase, Config))
 			++ "-"
 			++ integer_to_list(erlang:system_time(seconds))
 			++ "-"
 			++ integer_to_list(erlang:unique_integer([positive]))),
-    ?t:start_node(Name, slave, [{args, Opts++" -pa "++Pa}]).
+    test_server:start_node(Name, slave, [{args, Opts++" -pa "++Pa}]).
 
 stop_node(Node) when Node =:= node() -> ok;
 stop_node(Node) ->
-    ?t:stop_node(Node).
-
-is_halfword_vm() ->
-    case {erlang:system_info({wordsize, internal}),
-	  erlang:system_info({wordsize, external})} of
-	{4, 8} -> true;
-	{WS, WS} -> false
-    end.
+    test_server:stop_node(Node).
 
 free_memory() ->
     %% Free memory in MB.
@@ -411,5 +352,6 @@ free_memory() ->
 	TotFree div (1024*1024)
     catch
 	error : undef ->
-	    ?t:fail({"os_mon not built"})
+	    ct:fail({"os_mon not built"})
     end.
+
diff --git a/erts/emulator/test/alloc_SUITE_data/threads.c b/erts/emulator/test/alloc_SUITE_data/threads.c
index 2f5f841e3d..44d982b6c7 100644
--- a/erts/emulator/test/alloc_SUITE_data/threads.c
+++ b/erts/emulator/test/alloc_SUITE_data/threads.c
@@ -96,16 +96,11 @@ static void fail(int t_no, char *frmt, ...)
     exit_thread(t_no, 0);
 }
 
-static Allctr_t *alloc_not_ts = NULL;
 static Allctr_t *alloc_ts_1 = NULL;
 static Allctr_t *alloc_ts_2 = NULL;
 
 static void stop_allocators(void)
 {
-    if (alloc_not_ts) {
-	STOP_ALC(alloc_not_ts);
-	alloc_not_ts = NULL;
-    }
     if (alloc_ts_1) {
 	STOP_ALC(alloc_ts_1);
 	alloc_ts_1 = NULL;
@@ -155,7 +150,6 @@ testcase_run(TestCaseState_t *tcs)
     if (!IS_THREADS_ENABLED)
 	testcase_skipped(tcs, "Threads not enabled");
 
-    alloc_not_ts = NULL;
     alloc_ts_1 = NULL;
     alloc_ts_2 = NULL;
 
@@ -164,16 +158,12 @@ testcase_run(TestCaseState_t *tcs)
     sprintf(sbct_buf, "%d", SBC_THRESHOLD/1024);
     
     memcpy((void *) argv, argv_org, sizeof(argv_org));
-    alloc_not_ts = START_ALC("threads_not_ts", 0, argv);
-    ASSERT(tcs, alloc_not_ts);
-    memcpy((void *) argv, argv_org, sizeof(argv_org));
     alloc_ts_1 = START_ALC("threads_ts_1", 1, argv);
     ASSERT(tcs, alloc_ts_1);
     memcpy((void *) argv, argv_org, sizeof(argv_org));
     alloc_ts_2 = START_ALC("threads_ts_2", 1, argv);
     ASSERT(tcs, alloc_ts_2);
 
-    ASSERT(tcs, !IS_ALLOC_THREAD_SAFE(alloc_not_ts));
     ASSERT(tcs, IS_ALLOC_THREAD_SAFE(alloc_ts_1));
     ASSERT(tcs, IS_ALLOC_THREAD_SAFE(alloc_ts_2));
 
@@ -190,12 +180,7 @@ testcase_run(TestCaseState_t *tcs)
 
 	threads[i].arg.no_ops_per_bl = NO_OF_OPS_PER_BL;
 
-	if (i == 1) {
-	    alc = "threads_not_ts";
-	    threads[i].arg.no_ops_per_bl *= 2;
-	    threads[i].arg.a = alloc_not_ts;
-	}
-	else if (i % 2 == 0) {
+	if (i % 2 == 0) {
 	    alc = "threads_ts_1";
 	    threads[i].arg.a = alloc_ts_1;
 	}
diff --git a/erts/emulator/test/async_ports_SUITE.erl b/erts/emulator/test/async_ports_SUITE.erl
index c89b3655ff..f0f5fb5687 100644
--- a/erts/emulator/test/async_ports_SUITE.erl
+++ b/erts/emulator/test/async_ports_SUITE.erl
@@ -1,8 +1,10 @@
 -module(async_ports_SUITE).
 
--include_lib("common_test/include/ct.hrl").
+-export([all/0, suite/0]).
+-export([permanent_busy_test/1]).
+-export([run_loop/5]).
 
--compile(export_all).
+-include_lib("common_test/include/ct.hrl").
 
 -define(PACKET_SIZE, (10 * 1024 * 8)).
 -define(CPORT_DELAY, 100).
@@ -11,17 +13,15 @@
 -define(TEST_PROCS_COUNT, 2).
 -define(TC_TIMETRAP_SECONDS, 10).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, ?TC_TIMETRAP_SECONDS}}].
 
 all() ->
-    [
-     permanent_busy_test
-    ].
+    [permanent_busy_test].
 
 permanent_busy_test(Config) ->
-    ct:timetrap({seconds, ?TC_TIMETRAP_SECONDS}),
-    ExePath = filename:join(?config(data_dir, Config), "cport"),
-
+    ExePath = filename:join(proplists:get_value(data_dir, Config), "cport"),
     Self = self(),
     spawn_link(
       fun() ->
@@ -29,17 +29,16 @@ permanent_busy_test(Config) ->
 
               Port = open_port(ExePath),
               
-              Testers =
-                  lists:map(
-                    fun(_) ->
-                            erlang:spawn_link(?MODULE, run_loop,
-                                              [Self,
-                                               Port,
-                                               Block,
-                                               ?TEST_LOOPS_COUNT,
-                                               0])
-                    end,
-                    lists:seq(1, ?TEST_PROCS_COUNT)),
+              Testers = lists:map(
+                          fun(_) ->
+                                  spawn_link(?MODULE, run_loop,
+                                             [Self,
+                                              Port,
+                                              Block,
+                                              ?TEST_LOOPS_COUNT,
+                                              0])
+                          end,
+                          lists:seq(1, ?TEST_PROCS_COUNT)),
               Self ! {test_info, Port, Testers},
               endless_flush(Port)
       end),
diff --git a/erts/emulator/test/beam_SUITE.erl b/erts/emulator/test/beam_SUITE.erl
index 706a4a1c16..f61ab431e9 100644
--- a/erts/emulator/test/beam_SUITE.erl
+++ b/erts/emulator/test/beam_SUITE.erl
@@ -24,17 +24,18 @@
 	 init_per_group/2,end_per_group/2, 
 	 packed_registers/1, apply_last/1, apply_last_bif/1,
 	 buildo_mucho/1, heap_sizes/1, big_lists/1, fconv/1,
-	 select_val/1]).
+	 select_val/1, swap_temp_apply/1]).
 
--export([applied/2]).
+-export([applied/2,swap_temp_applied/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [packed_registers, apply_last, apply_last_bif,
-     buildo_mucho, heap_sizes, big_lists, select_val].
+     buildo_mucho, heap_sizes, big_lists, select_val,
+     swap_temp_apply].
 
 groups() -> 
     [].
@@ -61,15 +62,15 @@ apply_last(Config) when is_list(Config) ->
 	    {Pid, finished} ->
 		stack_size(Pid)
 	after 30000 ->
-		?t:fail("applied/2 timed out.")
+		ct:fail("applied/2 timed out.")
 	end,
     Pid ! die,
-    ?t:format("Size: ~p~n", [Size]),
+    io:format("Size: ~p~n", [Size]),
     if
 	Size < 700 ->
 	    ok;
 	true ->
-	    ?t:fail("10000 apply() grew stack too much.")
+	    ct:fail("10000 apply() grew stack too much.")
     end,
     ok.
 
@@ -95,7 +96,7 @@ apply_last_bif(Config) when is_list(Config) ->
 %% Test three high register numbers in a put_list instruction
 %% (to test whether packing works properly).
 packed_registers(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Mod = packed_regs,
     Name = filename:join(PrivDir, atom_to_list(Mod) ++ ".erl"),
 
@@ -132,8 +133,7 @@ verify_packed_regs([], _, -1) -> ok;
 verify_packed_regs([{Term, N}| T], Term, N) ->
     verify_packed_regs(T, Term, N-1);
 verify_packed_regs(L, Term, N) ->
-    ok = io:format("Expected [{~p, ~p}|T]; got\n~p\n", [Term, N, L]),
-    test_server:fail().
+    ct:fail("Expected [{~p, ~p}|T]; got\n~p\n", [Term, N, L]).
 
 buildo_mucho(Config) when is_list(Config) ->
     buildo_mucho_1(),
@@ -319,7 +319,7 @@ fconv(Config) when is_list(Config) ->
 do_fconv(Type) ->
     try
 	do_fconv(Type, 1.0),
-	test_server:fail()
+	ct:fail(no_badarith)
     catch
 	error:badarith ->
 	    ok
@@ -347,3 +347,41 @@ do_select_val(X) ->
 	Int when is_integer(Int) ->
 	    integer
     end.
+
+swap_temp_apply(_Config) ->
+    {swap_temp_applied,42} = do_swap_temp_apply(41),
+    not_an_integer = do_swap_temp_apply(not_an_integer),
+    ok.
+
+do_swap_temp_apply(Msg) ->
+    case swap_temp_apply_function(Msg) of
+	undefined -> Msg;
+	Type ->
+	    %% The following sequence:
+	    %%   move {x,0} {x,2}
+	    %%   move {y,0} {x,0}
+	    %%   move {x,2} {y,0}
+	    %%   apply 1
+	    %%
+	    %% Would be incorrectly transformed to:
+	    %%   swap {x,0} {y,0}
+	    %%   apply 1
+	    %%
+	    %% ({x,1} is the module, {x,2} the function to be applied).
+	    %%
+	    %% If the instructions are to be transformed, the correct
+	    %% transformation is:
+	    %%
+	    %%   swap_temp {x,0} {y,0} {x,2}
+	    %%   apply 1
+	    Fields = ?MODULE:Type(Msg),
+	    {Type,Fields}
+    end.
+
+swap_temp_apply_function(Int) when is_integer(Int) ->
+    swap_temp_applied;
+swap_temp_apply_function(_) ->
+    undefined.
+
+swap_temp_applied(Int) ->
+    Int+1.
diff --git a/erts/emulator/test/beam_literals_SUITE.erl b/erts/emulator/test/beam_literals_SUITE.erl
index 9f14ca26e5..b013ff5fbb 100644
--- a/erts/emulator/test/beam_literals_SUITE.erl
+++ b/erts/emulator/test/beam_literals_SUITE.erl
@@ -28,7 +28,7 @@
 	 put_list/1, fconv/1, literal_case_expression/1,
 	 increment/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -55,7 +55,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-putting(doc) -> "Test creating lists and tuples containing big number literals.";
+%% Test creating lists and tuples containing big number literals.
 putting(Config) when is_list(Config) ->
     -773973888575883407313908 = chksum(putting1(8987697898797)).
 
@@ -64,23 +64,22 @@ putting1(X) ->
      [X|349873987387373],
      [329878349873|-387394729872], -773973937933873929749873}.
 
-matching_bigs(doc) -> "Test matching of a few big number literals (in Beam,"
-		      "select_val/3 will NOT be used).";
+%% Test matching of a few big number literals (in Beam select_val/3 will NOT be used).
 matching_bigs(Config) when is_list(Config) ->
     a = matching1(3972907842873739),
     b = matching1(-389789298378939783333333333333333333784),
     other = matching1(3141699999999999999999999999999999999),
     other = matching1(42).
 
-matching_smalls(doc) -> "Test matching small numbers (both positive and negative).";
+%% Test matching small numbers (both positive and negative).
 matching_smalls(Config) when is_list(Config) ->
-    ?line a = m_small(-42),
-    ?line b = m_small(0),
-    ?line c = m_small(105),
-    ?line d = m_small(-13),
-    ?line e = m_small(337848),
-    ?line other = m_small(324),
-    ?line other = m_small(-7),
+    a = m_small(-42),
+    b = m_small(0),
+    c = m_small(105),
+    d = m_small(-13),
+    e = m_small(337848),
+    other = m_small(324),
+    other = m_small(-7),
     ok.
 
 m_small(-42) -> a;
@@ -90,17 +89,16 @@ m_small(-13) -> d;
 m_small(337848) -> e;
 m_small(_) -> other.
 
-matching_smalls_jt(doc) ->
-    "Test matching small numbers (both positive and negative). "
-	"Make sure that a jump table is used.";
+%% Test matching small numbers (both positive and negative).
+%% Make sure that a jump table is used.
 matching_smalls_jt(Config) when is_list(Config) ->
-    ?line a = m_small_jt(-2),
-    ?line b = m_small_jt(-1),
-    ?line c = m_small_jt(0),
-    ?line d = m_small_jt(2),
-    ?line e = m_small_jt(3),
-    ?line other = m_small(324),
-    ?line other = m_small(-7),
+    a = m_small_jt(-2),
+    b = m_small_jt(-1),
+    c = m_small_jt(0),
+    d = m_small_jt(2),
+    e = m_small_jt(3),
+    other = m_small(324),
+    other = m_small(-7),
     ok.
 
 m_small_jt(-2) -> a;
@@ -117,8 +115,7 @@ matching1(-389789298378939783333333333333333333784) -> b;
 matching1(_) -> other.
 
 
-matching_more_bigs(doc) -> "Test matching of a big number literals (in Beam,"
-		      "a select_val/3 instruction will be used).";
+%% Test matching of a big number literals (in Beam, a select_val/3 instruction will be used)
 matching_more_bigs(Config) when is_list(Config) ->
     a = matching2(-999766349740978337),
     b = matching2(9734097866575478),
@@ -137,8 +134,7 @@ matching2(13987294872948990) -> d;
 matching2(777723896192459245) -> e;
 matching2(_) -> other.
 
-matching_bigs_and_smalls(doc) -> "Test matching of a mix of big numbers and literals.";
-matching_bigs_and_smalls(suite) -> [];
+%% Test matching of a mix of big numbers and literals.
 matching_bigs_and_smalls(Config) when is_list(Config) ->
     a = matching3(38472928723987239873873),
     b = matching3(0),
@@ -159,30 +155,30 @@ matching3(42) -> e;
 matching3(-4533) -> f;
 matching3(_) -> other.
 
-badmatch(doc) -> "Test literal badmatches with big number and floats.";
+%% Test literal badmatches with big number and floats.
 badmatch(Config) when is_list(Config) ->
     %% We are satisfied if we can load this module and run it.
     Big = id(32984798729847892498297824872982972978239874),
     Float = id(3.1415927),
-    ?line catch a = Big,
-    ?line catch b = Float,
-    ?line {'EXIT',{{badmatch,3879373498378993387},_}} =
+    catch a = Big,
+    catch b = Float,
+    {'EXIT',{{badmatch,3879373498378993387},_}} =
 	   (catch c = 3879373498378993387),
-    ?line {'EXIT',{{badmatch,7.0},_}} = (catch d = 7.0),
-    ?line case Big of
-	      Big -> ok
-	  end,
-    ?line case Float of
-	      Float -> ok
-	  end,
+    {'EXIT',{{badmatch,7.0},_}} = (catch d = 7.0),
+    case Big of
+        Big -> ok
+    end,
+    case Float of
+        Float -> ok
+    end,
     ok.
 
 case_clause(Config) when is_list(Config) ->
-    ?line {'EXIT',{{case_clause,337.0},_}} = (catch case_clause_float()),
-    ?line {'EXIT',{{try_clause,42.0},_}} = (catch try_case_clause_float()),
-    ?line {'EXIT',{{case_clause,37932749837839747383847398743789348734987},_}} =
+    {'EXIT',{{case_clause,337.0},_}} = (catch case_clause_float()),
+    {'EXIT',{{try_clause,42.0},_}} = (catch try_case_clause_float()),
+    {'EXIT',{{case_clause,37932749837839747383847398743789348734987},_}} =
 	(catch case_clause_big()),
-    ?line {'EXIT',{{try_clause,977387349872349870423364354398566348},_}} =
+    {'EXIT',{{try_clause,977387349872349870423364354398566348},_}} =
 	(catch try_case_clause_big()),
     ok.
 
@@ -210,8 +206,7 @@ try_case_clause_big() ->
 	    error
     end.
 
-receiving(doc) -> "Test receive with a big number literal (more than 27 bits, "
-		      "less than 32 bits).";
+%% Test receive with a big number literal (more than 27 bits, less than 32 bits).
 receiving(Config) when is_list(Config) ->
     Self = self(),
     spawn(fun() -> Self ! here_is_a_message end),
@@ -222,11 +217,11 @@ receiving(Config) when is_list(Config) ->
 		 timeout
 	 end.
 
-literal_type_tests(doc) -> "Test type tests on literal values.";
+%% Test type tests on literal values.
 literal_type_tests(Config) when is_list(Config) ->
     %% Generate an Erlang module with all different type of type tests.
-    ?line Tests = make_test([{T, L} || T <- type_tests(), L <- literals()]),
-    ?line Mod = literal_test,
+    Tests = make_test([{T, L} || T <- type_tests(), L <- literals()]),
+    Mod = literal_test,
     Anno = erl_anno:new(0),
     Func = {function, Anno, test, 0, [{clause,Anno,[],[],Tests}]},
     Form = [{attribute,Anno,module,Mod},
@@ -234,22 +229,22 @@ literal_type_tests(Config) when is_list(Config) ->
             Func, {eof,Anno}],
 
     %% Print generated code for inspection.
-    ?line lists:foreach(fun (F) -> io:put_chars([erl_pp:form(F),"\n"]) end, Form),
+    lists:foreach(fun (F) -> io:put_chars([erl_pp:form(F),"\n"]) end, Form),
 
     %% Test compile:form/1.  This implies full optimization (default).
-    ?line {ok,Mod,Code1} = compile:forms(Form),
-    ?line {module,Mod} = code:load_binary(Mod, Mod, Code1),
-    ?line Mod:test(),
-    ?line true = code:delete(Mod),
-    ?line code:purge(Mod),
+    {ok,Mod,Code1} = compile:forms(Form),
+    {module,Mod} = code:load_binary(Mod, Mod, Code1),
+    Mod:test(),
+    true = code:delete(Mod),
+    code:purge(Mod),
 			       
     %% Test compile:form/2.  Turn off all optimizations.
-    ?line {ok,Mod,Code2} = compile:forms(Form, [binary,report,time,
+    {ok,Mod,Code2} = compile:forms(Form, [binary,report,time,
 						no_copt,no_postopt]),
-    ?line {module,Mod} = code:load_binary(Mod, Mod, Code2),
-    ?line Mod:test(),
-    ?line true = code:delete(Mod),
-    ?line code:purge(Mod),
+    {module,Mod} = code:load_binary(Mod, Mod, Code2),
+    Mod:test(),
+    true = code:delete(Mod),
+    code:purge(Mod),
     ok.
 
 make_test([{is_function=T,L}|Ts]) ->
@@ -299,34 +294,34 @@ type_tests() ->
 
 put_list(Config) when is_list(Config) ->
     %% put_list x0 Literal Reg
-    ?line [Config|8739757395764] = put_list_rqr(Config),
-    ?line {[Config|7779757395764],Config} = put_list_rqx(Config),
-    ?line [Config|98765432100000] = put_list_rqy(Config),
+    [Config|8739757395764] = put_list_rqr(Config),
+    {[Config|7779757395764],Config} = put_list_rqx(Config),
+    [Config|98765432100000] = put_list_rqy(Config),
 
     %% put_list x Literal Reg
-    ?line [Config|16#FFFFF77777137483769] = put_list_xqr(ignore, Config),
-    ?line {[Config|16#AAAAAFFFFF77777],{a,b},Config} =  put_list_xqx({a,b}, Config),
-    ?line [Config|12777765432979879] = put_list_xqy(ignore, Config),
+    [Config|16#FFFFF77777137483769] = put_list_xqr(ignore, Config),
+    {[Config|16#AAAAAFFFFF77777],{a,b},Config} =  put_list_xqx({a,b}, Config),
+    [Config|12777765432979879] = put_list_xqy(ignore, Config),
 
     %% put_list y Literal Reg
-    ?line [Config|17424134793676869867] = put_list_yqr(Config),
-    ?line {[Config|77424134793676869867],Config} = put_list_yqx(Config),
-    ?line {Config,[Config|16#BCDEFF4241676869867]} = put_list_yqy(Config),
+    [Config|17424134793676869867] = put_list_yqr(Config),
+    {[Config|77424134793676869867],Config} = put_list_yqx(Config),
+    {Config,[Config|16#BCDEFF4241676869867]} = put_list_yqy(Config),
 
     %% put_list Literal x0 Reg
-    ?line [42.0|Config] = put_list_qrr(Config),
-    ?line [Config,42.0|Config] = put_list_qrx(Config),
-    ?line [100.0|Config] = put_list_qry(Config),
+    [42.0|Config] = put_list_qrr(Config),
+    [Config,42.0|Config] = put_list_qrx(Config),
+    [100.0|Config] = put_list_qry(Config),
 
     %% put_list Literal x1 Reg
-    ?line [127.0|Config] = put_list_qxr({ignore,me}, Config),
-    ?line [Config,130.0|Config] = put_list_qxx(ignore, Config),
-    ?line [99.0|Config] = put_list_qxy(Config),
+    [127.0|Config] = put_list_qxr({ignore,me}, Config),
+    [Config,130.0|Config] = put_list_qxx(ignore, Config),
+    [99.0|Config] = put_list_qxy(Config),
 
     %% put_list Literal y0 Reg
-    ?line [200.0|Config] = put_list_qyr(Config),
-    ?line [Config,210.0|Config] = put_list_qyx(Config),
-    ?line [[300.0|Config]|Config] = put_list_qyy(Config),
+    [200.0|Config] = put_list_qyr(Config),
+    [Config,210.0|Config] = put_list_qyx(Config),
+    [[300.0|Config]|Config] = put_list_qyy(Config),
 
     ok.
     
@@ -417,8 +412,8 @@ put_list_qyy(Config) ->
     [Res|Config].
 
 fconv(Config) when is_list(Config) ->
-    ?line 5.0 = fconv_1(-34444444450.0),
-    ?line 13.0 = fconv_2(7.0),
+    5.0 = fconv_1(-34444444450.0),
+    13.0 = fconv_2(7.0),
     ok.
 
 fconv_1(F) when is_float(F) ->
@@ -428,19 +423,18 @@ fconv_2(F) when is_float(F) ->
     6.0 + F.
 
 literal_case_expression(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line Src = filename:join(DataDir, "literal_case_expression"),
-    ?line {ok,literal_case_expression=Mod,Code} =
-	compile:file(Src, [from_asm,binary]),
-    ?line {module,Mod} = code:load_binary(Mod, Src, Code),
-    ?line ok = Mod:x(),
-    ?line ok = Mod:y(),
-    ?line ok = Mod:zi1(),
-    ?line ok = Mod:zi2(),
-    ?line ok = Mod:za1(),
-    ?line ok = Mod:za2(),
-    ?line true = code:delete(Mod),
-    ?line code:purge(Mod),
+    DataDir = proplists:get_value(data_dir, Config),
+    Src = filename:join(DataDir, "literal_case_expression"),
+    {ok,literal_case_expression=Mod,Code} = compile:file(Src, [from_asm,binary]),
+    {module,Mod} = code:load_binary(Mod, Src, Code),
+    ok = Mod:x(),
+    ok = Mod:y(),
+    ok = Mod:zi1(),
+    ok = Mod:zi2(),
+    ok = Mod:za1(),
+    ok = Mod:za2(),
+    true = code:delete(Mod),
+    code:purge(Mod),
     ok.
 
 %% Test the i_increment instruction.
@@ -452,27 +446,27 @@ increment(Config) when is_list(Config) ->
     Neg32 = -(1 bsl 27),
     Big32 = id(1 bsl 32),
     Result32 = (1 bsl 32) + (1 bsl 27),
-    ?line Result32 = Big32 + (1 bsl 27),
-    ?line Result32 = Big32 - Neg32,
+    Result32 = Big32 + (1 bsl 27),
+    Result32 = Big32 - Neg32,
 
     %% Same thing, but for the 64-bit emulator.
     Neg64 = -(1 bsl 59),
     Big64 = id(1 bsl 64),
     Result64 = (1 bsl 64) + (1 bsl 59),
-    ?line Result64 = Big64 + (1 bsl 59),
-    ?line Result64 = Big64 - Neg64,
+    Result64 = Big64 + (1 bsl 59),
+    Result64 = Big64 - Neg64,
 
     %% Test error handling for the i_increment instruction.
     Bad = id(bad),
-    ?line {'EXIT',{badarith,_}} = (catch Bad + 42),
+    {'EXIT',{badarith,_}} = (catch Bad + 42),
 
     %% Small operands, but a big result.
     Res32 = 1 bsl 27,
     Small32 = id(Res32-1),
-    ?line Res32 = Small32 + 1,
+    Res32 = Small32 + 1,
     Res64 = 1 bsl 59,
     Small64 = id(Res64-1),
-    ?line Res64 = Small64 + 1,
+    Res64 = Small64 + 1,
     ok.
 
 %% Help functions.
diff --git a/erts/emulator/test/bif_SUITE.erl b/erts/emulator/test/bif_SUITE.erl
index d6a771e7b9..43d00e699a 100644
--- a/erts/emulator/test/bif_SUITE.erl
+++ b/erts/emulator/test/bif_SUITE.erl
@@ -20,21 +20,22 @@
 
 -module(bif_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.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,
 	 display/1, display_huge/0,
 	 erl_bif_types/1,guard_bifs_in_erl_bif_types/1,
 	 shadow_comments/1,
 	 specs/1,improper_bif_stubs/1,auto_imports/1,
 	 t_list_to_existing_atom/1,os_env/1,otp_7526/1,
 	 binary_to_atom/1,binary_to_existing_atom/1,
-	 atom_to_binary/1,min_max/1, erlang_halt/1]).
+	 atom_to_binary/1,min_max/1, erlang_halt/1,
+	 is_builtin/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() -> 
     [erl_bif_types, guard_bifs_in_erl_bif_types, shadow_comments,
@@ -42,37 +43,9 @@ all() ->
      t_list_to_existing_atom, os_env, otp_7526,
      display,
      atom_to_binary, binary_to_atom, binary_to_existing_atom,
-     min_max, erlang_halt].
+     min_max, erlang_halt, is_builtin].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(1)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
-
-display(suite) ->
-    [];
-display(doc) ->
-    ["Uses erlang:display to test that erts_printf does not do deep recursion"];
+%% Uses erlang:display to test that erts_printf does not do deep recursion
 display(Config) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     {ok, Node} = test_server:start_node(display_huge_term,peer,
@@ -117,7 +90,7 @@ erl_bif_types_2(List) ->
 	[_|_] ->
 	    io:put_chars("Bifs with bad arity\n"),
 	    io:format("~p\n", [BadArity]),
-	    ?line ?t:fail({length(BadArity),bad_arity})
+	    ct:fail({length(BadArity),bad_arity})
     end.
 
 erl_bif_types_3(List) ->
@@ -141,7 +114,7 @@ erl_bif_types_3(List) ->
 	    io:put_chars("Bifs with failing calls to erlang_bif_types:type/3 "
 			 "(or with bogus return values):\n"),
 	    io:format("~p\n", [BadSmokeTest]),
-	    ?line ?t:fail({length(BadSmokeTest),bad_smoke_test})
+	    ct:fail({length(BadSmokeTest),bad_smoke_test})
     end.
 
 guard_bifs_in_erl_bif_types(_Config) ->
@@ -162,7 +135,7 @@ guard_bifs_in_erl_bif_types(_Config) ->
 	       "The following guard BIFs have no type information "
 	       "in erl_bif_types:\n\n",
 	       [io_lib:format("  ~p/~p\n", [F,A]) || {F,A} <- Not]]),
-	    ?t:fail()
+	    ct:fail(erl_bif_types)
     end.
 
 shadow_comments(_Config) ->
@@ -202,7 +175,7 @@ shadow_comments(_Config) ->
 	       "obvious.\n\nThe following comments are missing:\n\n",
 	       [io_lib:format("%% Shadowed by erl_bif_types: ~p:~p/~p\n",
 			      [M,F,A]) || {M,F,A} <- NoComments]]),
-	    ?t:fail()
+	    ct:fail(bif_stub)
     end,
 
     case NoBifSpecs of
@@ -216,7 +189,7 @@ shadow_comments(_Config) ->
 	       "Therefore, the following comments should be removed:\n\n",
 	       [io_lib:format("%% Shadowed by erl_bif_types: ~p:~p/~p\n",
 			      [M,F,A]) || {M,F,A} <- NoBifSpecs]]),
-	    ?t:fail()
+	    ct:fail(erl_bif_types)
     end.
 
 extract_comments(Mod, Path) ->
@@ -238,7 +211,7 @@ ensure_erl_bif_types_compiled() ->
     case erlang:function_exported(erl_bif_types, module_info, 0) of
 	false ->
 	    %% Fail cleanly.
-	    ?t:fail("erl_bif_types not compiled");
+	    ct:fail("erl_bif_types not compiled");
 	true ->
 	    ok
     end.
@@ -276,7 +249,7 @@ specs(_) ->
 	[_|_] ->
 	    io:put_chars("The following BIFs don't have specs:\n"),
 	    [print_mfa(MFA) || MFA <- NoSpecs],
-	    ?t:fail()
+	    ct:fail(no_spec)
     end.
 
 is_operator({erlang,F,A}) ->
@@ -336,7 +309,7 @@ auto_imports([{erlang,F,A}|T], Errors) ->
 auto_imports([], 0) ->
     ok;
 auto_imports([], Errors) ->
-    ?t:fail({Errors,inconsistencies}).
+    ct:fail({Errors,inconsistencies}).
 
 extract_functions(M, Abstr) ->
     [{{M,F,A},Body} || {function,_,F,A,Body} <- Abstr].
@@ -355,40 +328,36 @@ check_stub({_,F,A}, B) ->
 	    io:put_chars(erl_pp:function(Func)),
 	    io:nl(),
 	    io:put_chars("The body should be: erlang:nif_error(undef)"),
-	    ?t:fail()
+	    ct:fail(invalid_body)
     end.
 
 t_list_to_existing_atom(Config) when is_list(Config) ->
-    ?line all = list_to_existing_atom("all"),
-    ?line ?MODULE = list_to_existing_atom(?MODULE_STRING),
-    ?line UnlikelyStr = "dsfj923874390867er869fds9864y97jhg3973qerueoru",
+    all = list_to_existing_atom("all"),
+    ?MODULE = list_to_existing_atom(?MODULE_STRING),
+    UnlikelyStr = "dsfj923874390867er869fds9864y97jhg3973qerueoru",
     try
-	?line list_to_existing_atom(UnlikelyStr),
-	?line ?t:fail()
+	list_to_existing_atom(UnlikelyStr),
+	ct:fail(atom_exists)
     catch
 	error:badarg -> ok
     end,
 
     %% The compiler has become smarter! We need the call to id/1 in
     %% the next line.
-    ?line UnlikelyAtom = list_to_atom(id(UnlikelyStr)),
-    ?line UnlikelyAtom = list_to_existing_atom(UnlikelyStr),
+    UnlikelyAtom = list_to_atom(id(UnlikelyStr)),
+    UnlikelyAtom = list_to_existing_atom(UnlikelyStr),
     ok.
 
-os_env(doc) ->
-    [];
-os_env(suite) ->
-    [];
 os_env(Config) when is_list(Config) ->
-    ?line EnvVar1 = "MjhgvFDrresdCghN mnjkUYg vfrD",
-    ?line false = os:getenv(EnvVar1),
-    ?line true = os:putenv(EnvVar1, "mors"),
-    ?line "mors" = os:getenv(EnvVar1),
-    ?line true = os:putenv(EnvVar1, ""),
-    ?line case os:getenv(EnvVar1) of
-	      "" -> ?line ok;
-	      false -> ?line ok;
-	      BadVal -> ?line ?t:fail(BadVal)
+    EnvVar1 = "MjhgvFDrresdCghN mnjkUYg vfrD",
+    false = os:getenv(EnvVar1),
+    true = os:putenv(EnvVar1, "mors"),
+    "mors" = os:getenv(EnvVar1),
+    true = os:putenv(EnvVar1, ""),
+    case os:getenv(EnvVar1) of
+	      "" -> ok;
+	      false -> ok;
+	      BadVal -> ct:fail(BadVal)
 	  end,
     true = os:putenv(EnvVar1, "mors"),
     true = os:unsetenv(EnvVar1),
@@ -396,19 +365,18 @@ os_env(Config) when is_list(Config) ->
     true = os:unsetenv(EnvVar1), % unset unset variable
     %% os:putenv, os:getenv and os:unsetenv currently use a temp
     %% buffer of size 1024 for storing key+value
-    ?line os_env_long(1010, 1030, "hej hopp").
+    os_env_long(1010, 1030, "hej hopp").
     
 os_env_long(Min, Max, _Value) when Min > Max ->
-    ?line ok;
+    ok;
 os_env_long(Min, Max, Value) ->
-    ?line EnvVar = lists:duplicate(Min, $X),
-    ?line true = os:putenv(EnvVar, Value),
-    ?line Value = os:getenv(EnvVar),
+    EnvVar = lists:duplicate(Min, $X),
+    true = os:putenv(EnvVar, Value),
+    Value = os:getenv(EnvVar),
     true = os:unsetenv(EnvVar),
-    ?line os_env_long(Min+1, Max, Value).
+    os_env_long(Min+1, Max, Value).
 
-otp_7526(doc) ->    
-    ["Test that string:to_integer does not Halloc in wrong order."];
+%% Test that string:to_integer does not Halloc in wrong order.
 otp_7526(Config) when is_list(Config) ->
     ok = test_7526(256).
 
@@ -423,15 +391,15 @@ do_test_7526(N,M) ->
     {Self, Ref} = {self(), make_ref()},
     T = erlang:make_tuple(M,0),
     spawn_opt(fun()->
-		      L = iterate_7526(N, []),
-		      BadList = [X || X <- L, X =/= 9223372036854775808],
-		      BadLen = length(BadList),
-		      M = length(tuple_to_list(T)),
-		      %%io:format("~b bad conversions: ~p~n", [BadLen, BadList]),
-		      Self ! {done, Ref, BadLen}
-	      end,
-	      [link,{fullsweep_after,0}]),
-	receive {done, Ref, Len} -> Len end.
+                      L = iterate_7526(N, []),
+                      BadList = [X || X <- L, X =/= 9223372036854775808],
+                      BadLen = length(BadList),
+                      M = length(tuple_to_list(T)),
+                      %%io:format("~b bad conversions: ~p~n", [BadLen, BadList]),
+                      Self ! {done, Ref, BadLen}
+              end,
+              [link,{fullsweep_after,0}]),
+    receive {done, Ref, Len} -> Len end.
 
 
 test_7526(0) ->
@@ -455,57 +423,53 @@ binary_to_atom(Config) when is_list(Config) ->
     LongBin = list_to_binary(Long),
 
     %% latin1
-    ?line '' = test_binary_to_atom(<<>>, latin1),
-    ?line '\377' = test_binary_to_atom(<<255>>, latin1),
-    ?line HalfLongAtom = test_binary_to_atom(HalfLongBin, latin1),
-    ?line LongAtom = test_binary_to_atom(LongBin, latin1),
+    '' = test_binary_to_atom(<<>>, latin1),
+    '\377' = test_binary_to_atom(<<255>>, latin1),
+    HalfLongAtom = test_binary_to_atom(HalfLongBin, latin1),
+    LongAtom = test_binary_to_atom(LongBin, latin1),
 
     %% utf8
-    ?line '' = test_binary_to_atom(<<>>, utf8),
-    ?line HalfLongAtom = test_binary_to_atom(HalfLongBin, utf8),
-    ?line HalfLongAtom = test_binary_to_atom(HalfLongBin, unicode),
-    ?line [] = [C || C <- lists:seq(128, 255),
+    '' = test_binary_to_atom(<<>>, utf8),
+    HalfLongAtom = test_binary_to_atom(HalfLongBin, utf8),
+    HalfLongAtom = test_binary_to_atom(HalfLongBin, unicode),
+    [] = [C || C <- lists:seq(128, 255),
 		     begin
 			 list_to_atom([C]) =/=
 			     test_binary_to_atom(<<C/utf8>>, utf8)
 		     end],
 
     %% badarg failures.
-    ?line fail_binary_to_atom(atom),
-    ?line fail_binary_to_atom(42),
-    ?line fail_binary_to_atom({a,b,c}),
-    ?line fail_binary_to_atom([1,2,3]),
-    ?line fail_binary_to_atom([]),
-    ?line fail_binary_to_atom(42.0),
-    ?line fail_binary_to_atom(self()),
-    ?line fail_binary_to_atom(make_ref()),
-    ?line fail_binary_to_atom(<<0:7>>),
-    ?line fail_binary_to_atom(<<42:13>>),
-    ?line ?BADARG(binary_to_atom(id(<<>>), blurf)),
-    ?line ?BADARG(binary_to_atom(id(<<>>), [])),
+    fail_binary_to_atom(atom),
+    fail_binary_to_atom(42),
+    fail_binary_to_atom({a,b,c}),
+    fail_binary_to_atom([1,2,3]),
+    fail_binary_to_atom([]),
+    fail_binary_to_atom(42.0),
+    fail_binary_to_atom(self()),
+    fail_binary_to_atom(make_ref()),
+    fail_binary_to_atom(<<0:7>>),
+    fail_binary_to_atom(<<42:13>>),
+    ?BADARG(binary_to_atom(id(<<>>), blurf)),
+    ?BADARG(binary_to_atom(id(<<>>), [])),
 
     %% Bad UTF8 sequences.
-    ?line ?BADARG(binary_to_atom(id(<<255>>), utf8)),
-    ?line ?BADARG(binary_to_atom(id(<<255,0>>), utf8)),
-    ?line ?BADARG(binary_to_atom(id(<<16#C0,16#80>>), utf8)), %Overlong 0.
-    ?line [?BADARG(binary_to_atom(<<C/utf8>>, utf8)) ||
-	      C <- lists:seq(256, 16#D7FF)],
-    ?line [?BADARG(binary_to_atom(<<C/utf8>>, utf8)) ||
-	      C <- lists:seq(16#E000, 16#FFFD)],
-    ?line [?BADARG(binary_to_atom(<<C/utf8>>, utf8)) ||
-	      C <- lists:seq(16#10000, 16#8FFFF)],
-    ?line [?BADARG(binary_to_atom(<<C/utf8>>, utf8)) ||
-	      C <- lists:seq(16#90000, 16#10FFFF)],
+    ?BADARG(binary_to_atom(id(<<255>>), utf8)),
+    ?BADARG(binary_to_atom(id(<<255,0>>), utf8)),
+    ?BADARG(binary_to_atom(id(<<16#C0,16#80>>), utf8)), %Overlong 0.
+    [?BADARG(binary_to_atom(<<C/utf8>>, utf8)) || C <- lists:seq(256, 16#D7FF)],
+    [?BADARG(binary_to_atom(<<C/utf8>>, utf8)) || C <- lists:seq(16#E000, 16#FFFD)],
+    [?BADARG(binary_to_atom(<<C/utf8>>, utf8)) || C <- lists:seq(16#10000, 16#8FFFF)],
+    [?BADARG(binary_to_atom(<<C/utf8>>, utf8)) || C <- lists:seq(16#90000, 16#10FFFF)],
 
     %% system_limit failures.
-    ?line ?SYS_LIMIT(binary_to_atom(id(<<0:512/unit:8,255>>), utf8)),
-    ?line ?SYS_LIMIT(binary_to_atom(id(<<0:512/unit:8,255,0>>), utf8)),
-    ?line ?SYS_LIMIT(binary_to_atom(<<0:256/unit:8>>, latin1)),
-    ?line ?SYS_LIMIT(binary_to_atom(<<0:257/unit:8>>, latin1)),
-    ?line ?SYS_LIMIT(binary_to_atom(<<0:512/unit:8>>, latin1)),
-    ?line ?SYS_LIMIT(binary_to_atom(<<0:256/unit:8>>, utf8)),
-    ?line ?SYS_LIMIT(binary_to_atom(<<0:257/unit:8>>, utf8)),
-    ?line ?SYS_LIMIT(binary_to_atom(<<0:512/unit:8>>, utf8)),
+    ?SYS_LIMIT(binary_to_atom(id(<<0:512/unit:8,255>>), utf8)),
+    ?SYS_LIMIT(binary_to_atom(id(<<0:512/unit:8,255,0>>), utf8)),
+    ?SYS_LIMIT(binary_to_atom(<<0:256/unit:8>>, latin1)),
+    ?SYS_LIMIT(binary_to_atom(<<0:257/unit:8>>, latin1)),
+    ?SYS_LIMIT(binary_to_atom(<<0:512/unit:8>>, latin1)),
+    ?SYS_LIMIT(binary_to_atom(<<0:256/unit:8>>, utf8)),
+    ?SYS_LIMIT(binary_to_atom(<<0:257/unit:8>>, utf8)),
+    ?SYS_LIMIT(binary_to_atom(<<0:512/unit:8>>, utf8)),
     ok.
 
 test_binary_to_atom(Bin0, Encoding) ->
@@ -518,49 +482,49 @@ test_binary_to_atom(Bin0, Encoding) ->
 
 fail_binary_to_atom(Bin) ->
     try
-	binary_to_atom(Bin, latin1)
+        binary_to_atom(Bin, latin1)
     catch
-	error:badarg ->
-	    ok
+        error:badarg ->
+            ok
     end,
     try
-	binary_to_atom(Bin, utf8)
+        binary_to_atom(Bin, utf8)
     catch
-	error:badarg ->
-	    ok
+        error:badarg ->
+            ok
     end,
     try
-	binary_to_existing_atom(Bin, latin1)
+        binary_to_existing_atom(Bin, latin1)
     catch
-	error:badarg ->
-	    ok
+        error:badarg ->
+            ok
     end,
     try
-	binary_to_existing_atom(Bin, utf8)
+        binary_to_existing_atom(Bin, utf8)
     catch
-	error:badarg ->
-	    ok
+        error:badarg ->
+            ok
     end.
 	
 
 binary_to_existing_atom(Config) when is_list(Config) ->
-    ?line UnlikelyBin = <<"ou0897979655678dsfj923874390867er869fds973qerueoru">>,
+    UnlikelyBin = <<"ou0897979655678dsfj923874390867er869fds973qerueoru">>,
     try
-	?line binary_to_existing_atom(UnlikelyBin, latin1),
-	?line ?t:fail()
+	binary_to_existing_atom(UnlikelyBin, latin1),
+	ct:fail(atom_exists)
     catch
 	error:badarg -> ok
     end,
 
     try
-	?line binary_to_existing_atom(UnlikelyBin, utf8),
-	?line ?t:fail()
+	binary_to_existing_atom(UnlikelyBin, utf8),
+	ct:fail(atom_exists)
     catch
 	error:badarg -> ok
     end,
 
-    ?line UnlikelyAtom = binary_to_atom(id(UnlikelyBin), latin1),
-    ?line UnlikelyAtom = binary_to_existing_atom(UnlikelyBin, latin1),
+    UnlikelyAtom = binary_to_atom(id(UnlikelyBin), latin1),
+    UnlikelyAtom = binary_to_existing_atom(UnlikelyBin, latin1),
     ok.
 
 
@@ -573,32 +537,32 @@ atom_to_binary(Config) when is_list(Config) ->
     LongBin = list_to_binary(Long),
 
     %% latin1
-    ?line <<>> = atom_to_binary('', latin1),
-    ?line <<"abc">> = atom_to_binary(abc, latin1),
-    ?line <<127>> = atom_to_binary('\177', latin1),
-    ?line HalfLongBin = atom_to_binary(HalfLongAtom, latin1),
-    ?line LongBin = atom_to_binary(LongAtom, latin1),
+    <<>> = atom_to_binary('', latin1),
+    <<"abc">> = atom_to_binary(abc, latin1),
+    <<127>> = atom_to_binary('\177', latin1),
+    HalfLongBin = atom_to_binary(HalfLongAtom, latin1),
+    LongBin = atom_to_binary(LongAtom, latin1),
 
     %% utf8.
-    ?line <<>> = atom_to_binary('', utf8),
-    ?line <<>> = atom_to_binary('', unicode),
-    ?line <<127>> = atom_to_binary('\177', utf8),
-    ?line <<"abcdef">> = atom_to_binary(abcdef, utf8),
-    ?line HalfLongBin = atom_to_binary(HalfLongAtom, utf8),
-    ?line LongAtomBin = atom_to_binary(LongAtom, utf8),
-    ?line verify_long_atom_bin(LongAtomBin, 0),
+    <<>> = atom_to_binary('', utf8),
+    <<>> = atom_to_binary('', unicode),
+    <<127>> = atom_to_binary('\177', utf8),
+    <<"abcdef">> = atom_to_binary(abcdef, utf8),
+    HalfLongBin = atom_to_binary(HalfLongAtom, utf8),
+    LongAtomBin = atom_to_binary(LongAtom, utf8),
+    verify_long_atom_bin(LongAtomBin, 0),
 
     %% Failing cases.
-    ?line fail_atom_to_binary(<<1>>),
-    ?line fail_atom_to_binary(42),
-    ?line fail_atom_to_binary({a,b,c}),
-    ?line fail_atom_to_binary([1,2,3]),
-    ?line fail_atom_to_binary([]),
-    ?line fail_atom_to_binary(42.0),
-    ?line fail_atom_to_binary(self()),
-    ?line fail_atom_to_binary(make_ref()),
-    ?line ?BADARG(atom_to_binary(id(a), blurf)),
-    ?line ?BADARG(atom_to_binary(id(b), [])),
+    fail_atom_to_binary(<<1>>),
+    fail_atom_to_binary(42),
+    fail_atom_to_binary({a,b,c}),
+    fail_atom_to_binary([1,2,3]),
+    fail_atom_to_binary([]),
+    fail_atom_to_binary(42.0),
+    fail_atom_to_binary(self()),
+    fail_atom_to_binary(make_ref()),
+    ?BADARG(atom_to_binary(id(a), blurf)),
+    ?BADARG(atom_to_binary(id(b), [])),
     ok.
 
 verify_long_atom_bin(<<I/utf8,T/binary>>, I) ->
@@ -607,74 +571,73 @@ verify_long_atom_bin(<<>>, 255) -> ok.
 
 fail_atom_to_binary(Term) ->
     try
-	atom_to_binary(Term, latin1)
+        atom_to_binary(Term, latin1)
     catch
-	error:badarg ->
-	    ok
+        error:badarg ->
+            ok
     end,
     try
-	atom_to_binary(Term, utf8)
+        atom_to_binary(Term, utf8)
     catch
-	error:badarg ->
-	    ok
+        error:badarg ->
+            ok
     end.
 
 min_max(Config) when is_list(Config) ->	
-    ?line a = erlang:min(id(a), a),
-    ?line a = erlang:min(id(a), b),
-    ?line a = erlang:min(id(b), a),
-    ?line b = erlang:min(id(b), b),
-    ?line a = erlang:max(id(a), a),
-    ?line b = erlang:max(id(a), b),
-    ?line b = erlang:max(id(b), a),
-    ?line b = erlang:max(id(b), b),
-
-    ?line 42.0 = erlang:min(42.0, 42),
-    ?line 42.0 = erlang:max(42.0, 42),
+    a = erlang:min(id(a), a),
+    a = erlang:min(id(a), b),
+    a = erlang:min(id(b), a),
+    b = erlang:min(id(b), b),
+    a = erlang:max(id(a), a),
+    b = erlang:max(id(a), b),
+    b = erlang:max(id(b), a),
+    b = erlang:max(id(b), b),
+
+    42.0 = erlang:min(42.0, 42),
+    42.0 = erlang:max(42.0, 42),
     %% And now (R14) they are also autoimported!
-    ?line a = min(id(a), a),
-    ?line a = min(id(a), b),
-    ?line a = min(id(b), a),
-    ?line b = min(id(b), b),
-    ?line a = max(id(a), a),
-    ?line b = max(id(a), b),
-    ?line b = max(id(b), a),
-    ?line b = max(id(b), b),
-
-    ?line 42.0 = min(42.0, 42),
-    ?line 42.0 = max(42.0, 42),
-
+    a = min(id(a), a),
+    a = min(id(a), b),
+    a = min(id(b), a),
+    b = min(id(b), b),
+    a = max(id(a), a),
+    b = max(id(a), b),
+    b = max(id(b), a),
+    b = max(id(b), b),
+
+    42.0 = min(42.0, 42),
+    42.0 = max(42.0, 42),
     ok.
 
 
 
 erlang_halt(Config) when is_list(Config) ->
     try erlang:halt(undefined) of
-	_-> ?t:fail({erlang,halt,{undefined}})
+	_-> ct:fail({erlang,halt,{undefined}})
     catch error:badarg -> ok end,
     try halt(undefined) of
-	_-> ?t:fail({halt,{undefined}})
+	_-> ct:fail({halt,{undefined}})
     catch error:badarg -> ok end,
     try erlang:halt(undefined, []) of
-	_-> ?t:fail({erlang,halt,{undefined,[]}})
+	_-> ct:fail({erlang,halt,{undefined,[]}})
     catch error:badarg -> ok end,
     try halt(undefined, []) of
-	_-> ?t:fail({halt,{undefined,[]}})
+	_-> ct:fail({halt,{undefined,[]}})
     catch error:badarg -> ok end,
     try halt(0, undefined) of
-	_-> ?t:fail({halt,{0,undefined}})
+	_-> ct:fail({halt,{0,undefined}})
     catch error:badarg -> ok end,
     try halt(0, [undefined]) of
-	_-> ?t:fail({halt,{0,[undefined]}})
+	_-> ct:fail({halt,{0,[undefined]}})
     catch error:badarg -> ok end,
     try halt(0, [{undefined,true}]) of
-	_-> ?t:fail({halt,{0,[{undefined,true}]}})
+	_-> ct:fail({halt,{0,[{undefined,true}]}})
     catch error:badarg -> ok end,
     try halt(0, [{flush,undefined}]) of
-	_-> ?t:fail({halt,{0,[{flush,undefined}]}})
+	_-> ct:fail({halt,{0,[{flush,undefined}]}})
     catch error:badarg -> ok end,
     try halt(0, [{flush,true,undefined}]) of
-	_-> ?t:fail({halt,{0,[{flush,true,undefined}]}})
+	_-> ct:fail({halt,{0,[{flush,true,undefined}]}})
     catch error:badarg -> ok end,
     H = hostname(),
     {ok,N1} = slave:start(H, halt_node1),
@@ -716,6 +679,22 @@ wait_until_stable_size(File,PrevSz) ->
             wait_until_stable_size(File,NewSz)
     end.
 
+is_builtin(_Config) ->
+    Exp0 = [{M,F,A} || {M,_} <- code:all_loaded(),
+		       {F,A} <- M:module_info(exports)],
+    Exp = ordsets:from_list(Exp0),
+
+    %% erlang:apply/3 is considered to be built-in, but is not
+    %% implemented as other BIFs.
+
+    Builtins0 = [{erlang,apply,3}|erlang:system_info(snifs)],
+    Builtins = ordsets:from_list(Builtins0),
+    NotBuiltin = ordsets:subtract(Exp, Builtins),
+    _ = [true = erlang:is_builtin(M, F, A) || {M,F,A} <- Builtins],
+    _ = [false = erlang:is_builtin(M, F, A) || {M,F,A} <- NotBuiltin],
+
+    ok.
+
 
 %% Helpers
     
diff --git a/erts/emulator/test/big_SUITE.erl b/erts/emulator/test/big_SUITE.erl
index e8f881f2a4..d331083661 100644
--- a/erts/emulator/test/big_SUITE.erl
+++ b/erts/emulator/test/big_SUITE.erl
@@ -20,8 +20,8 @@
 -module(big_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]).
+
 -export([t_div/1, eq_28/1, eq_32/1, eq_big/1, eq_math/1, big_literals/1,
 	 borders/1, negative/1, big_float_1/1, big_float_2/1,
 	 shift_limit_1/1, powmod/1, system_limit/1, toobig/1, otp_6692/1]).
@@ -32,11 +32,12 @@
 
 -export([fac/1, fib/1, pow/2, gcd/2, lcm/2]).
 
--export([init_per_testcase/2, end_per_testcase/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 3}}].
 
 all() -> 
     [t_div, eq_28, eq_32, eq_big, eq_math, big_literals,
@@ -46,27 +47,6 @@ all() ->
 groups() -> 
     [{big_float, [], [big_float_1, big_float_2]}].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(3)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
 %%
 %% Syntax of data files:
 %% Expr1 = Expr2.
@@ -95,7 +75,7 @@ eq_math(Config) when is_list(Config) ->
     test(TestFile).
 
 
-borders(doc) -> "Tests border cases between small/big.";
+%% Tests border cases between small/big.
 borders(Config) when is_list(Config) ->
     TestFile = test_file(Config, "borders.dat"),
     test(TestFile).
@@ -107,7 +87,7 @@ negative(Config) when is_list(Config) ->
 
 %% Find test file
 test_file(Config, Name) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     filename:join(DataDir, Name).
 
 %%
@@ -119,12 +99,12 @@ test(File) ->
     test(File, [node()]).
 
 test(File, Nodes) ->
-    ?line {ok,Fd} = file:open(File, [read]),
+    {ok,Fd} = file:open(File, [read]),
     Res = test(File, Fd, Nodes),
     file:close(Fd),
     case Res of
 	{0,Cases} -> {comment, integer_to_list(Cases) ++ " cases"};
-	{_,_} -> test_server:fail()
+	{_,_} -> ct:fail("failed")
     end.
 
 test(File, Fd, Ns) ->
@@ -156,7 +136,7 @@ multi_match(Ns, Expr) ->
     multi_match(Ns, Expr, []).
 
 multi_match([Node|Ns], Expr, Rs) ->
-    ?line X = rpc:call(Node, big_SUITE, eval, [Expr]),
+    X = rpc:call(Node, big_SUITE, eval, [Expr]),
     if X == 0 -> multi_match(Ns, Expr, Rs);
        true -> multi_match(Ns, Expr, [{Node,X}|Rs])
     end;
@@ -248,10 +228,10 @@ lcm(Q, R) ->
 %% Test case t_div cut in from R2D test suite.
 
 t_div(Config) when is_list(Config) ->
-    ?line 'try'(fun() -> 98765432101234 div 98765432101235 end, 0),
+    'try'(fun() -> 98765432101234 div 98765432101235 end, 0),
 
     % Big remainder, small quotient.
-    ?line 'try'(fun() -> 339254531512 div 68719476736 end, 4),
+    'try'(fun() -> 339254531512 div 68719476736 end, 4),
     ok.
 
 'try'(Fun, Result) ->
@@ -265,65 +245,60 @@ t_div(Config) when is_list(Config) ->
 	{result, Result} ->
 	    'try'(Iter-1, Fun, Result, [0|Filler]);
 	{result, Other} ->
-	    io:format("Expected ~p; got ~p~n", [Result, Other]),
-	    test_server:fail()
+	    ct:fail("Expected ~p; got ~p~n", [Result, Other])
     end.
 
 init(ReplyTo, Fun, _Filler) ->
     ReplyTo ! {result, Fun()}.
 
-big_literals(doc) ->
-    "Tests that big-number literals work correctly.";
+%% Tests that big-number literals work correctly.
 big_literals(Config) when is_list(Config) ->
     %% Note: The literal test cannot be compiler on a pre-R4 Beam emulator,
     %% so we compile it now.
-    ?line DataDir = ?config(data_dir, Config),
-    ?line Test = filename:join(DataDir, "literal_test"),
-    ?line {ok, Mod, Bin} = compile:file(Test, [binary]),
-    ?line {module, Mod} = code:load_binary(Mod, Mod, Bin),
-    ?line ok = Mod:t(),
+    DataDir = proplists:get_value(data_dir, Config),
+    Test = filename:join(DataDir, "literal_test"),
+    {ok, Mod, Bin} = compile:file(Test, [binary]),
+    {module, Mod} = code:load_binary(Mod, Mod, Bin),
+    ok = Mod:t(),
     ok.
 
 
-big_float_1(doc) ->
-    ["OTP-2436, part 1"];
+%% OTP-2436, part 1
 big_float_1(Config) when is_list(Config) ->
     %% F is a number very close to a maximum float.
-    ?line F = id(1.7e308),
-    ?line I = trunc(F),
-    ?line true = (I == F),
-    ?line false = (I /= F),
-    ?line true = (I > F/2),
-    ?line false = (I =< F/2),
-    ?line true = (I*2 >= F),
-    ?line false = (I*2 < F),
-    ?line true = (I*I > F),
-    ?line false = (I*I =< F),
-
-    ?line true = (F == I),
-    ?line false = (F /= I),
-    ?line false = (F/2 > I),
-    ?line true = (F/2 =< I),
-    ?line false = (F >= I*2),
-    ?line true = (F < I*2),
-    ?line false = (F > I*I),
-    ?line true = (F =< I*I),
+    F = id(1.7e308),
+    I = trunc(F),
+    true = (I == F),
+    false = (I /= F),
+    true = (I > F/2),
+    false = (I =< F/2),
+    true = (I*2 >= F),
+    false = (I*2 < F),
+    true = (I*I > F),
+    false = (I*I =< F),
+
+    true = (F == I),
+    false = (F /= I),
+    false = (F/2 > I),
+    true = (F/2 =< I),
+    false = (F >= I*2),
+    true = (F < I*2),
+    false = (F > I*I),
+    true = (F =< I*I),
     ok.
 
-big_float_2(doc) ->
-    ["OTP-2436, part 2"];
+%% "OTP-2436, part 2
 big_float_2(Config) when is_list(Config) ->
-    ?line F = id(1.7e308),
-    ?line I = trunc(F),
-    ?line {'EXIT', _} = (catch 1/(2*I)),
-    ?line _Ignore = 2/I,
-    ?line {'EXIT', _} = (catch 4/(2*I)),
+    F = id(1.7e308),
+    I = trunc(F),
+    {'EXIT', _} = (catch 1/(2*I)),
+    _Ignore = 2/I,
+    {'EXIT', _} = (catch 4/(2*I)),
     ok.
 
-shift_limit_1(doc) ->
-    ["OTP-3256"];
+%% OTP-3256
 shift_limit_1(Config) when is_list(Config) ->
-    ?line case catch (id(1) bsl 100000000) of
+    case catch (id(1) bsl 100000000) of
 	      {'EXIT', {system_limit, _}} ->
 		  ok
 	  end,
@@ -352,16 +327,16 @@ powmod(A, B, C) ->
     end.
 
 system_limit(Config) when is_list(Config) ->
-    ?line Maxbig = maxbig(),
-    ?line {'EXIT',{system_limit,_}} = (catch Maxbig+1),
-    ?line {'EXIT',{system_limit,_}} = (catch -Maxbig-1),
-    ?line {'EXIT',{system_limit,_}} = (catch 2*Maxbig),
-    ?line {'EXIT',{system_limit,_}} = (catch bnot Maxbig),
-    ?line {'EXIT',{system_limit,_}} = (catch apply(erlang, id('bnot'), [Maxbig])),
-    ?line {'EXIT',{system_limit,_}} = (catch Maxbig bsl 2),
-    ?line {'EXIT',{system_limit,_}} = (catch apply(erlang, id('bsl'), [Maxbig,2])),
-    ?line {'EXIT',{system_limit,_}} = (catch id(1) bsl (1 bsl 45)),
-    ?line {'EXIT',{system_limit,_}} = (catch id(1) bsl (1 bsl 69)),
+    Maxbig = maxbig(),
+    {'EXIT',{system_limit,_}} = (catch Maxbig+1),
+    {'EXIT',{system_limit,_}} = (catch -Maxbig-1),
+    {'EXIT',{system_limit,_}} = (catch 2*Maxbig),
+    {'EXIT',{system_limit,_}} = (catch bnot Maxbig),
+    {'EXIT',{system_limit,_}} = (catch apply(erlang, id('bnot'), [Maxbig])),
+    {'EXIT',{system_limit,_}} = (catch Maxbig bsl 2),
+    {'EXIT',{system_limit,_}} = (catch apply(erlang, id('bsl'), [Maxbig,2])),
+    {'EXIT',{system_limit,_}} = (catch id(1) bsl (1 bsl 45)),
+    {'EXIT',{system_limit,_}} = (catch id(1) bsl (1 bsl 69)),
     ok.
 
 maxbig() ->
@@ -372,7 +347,7 @@ maxbig() ->
 id(I) -> I.
 
 toobig(Config) when is_list(Config) ->
-    ?line {'EXIT',{{badmatch,_},_}} = (catch toobig()),
+    {'EXIT',{{badmatch,_},_}} = (catch toobig()),
     ok.
 
 toobig() ->
@@ -381,12 +356,9 @@ toobig() ->
     <<ANr:ASize>> = A, % should fail
     ANr band ANr.
 
-otp_6692(suite) ->
-    [];
-otp_6692(doc) ->
-    ["Tests for DIV/REM bug reported in OTP-6692"];
+%% Tests for DIV/REM bug reported in OTP-6692
 otp_6692(Config) when is_list(Config)->
-    ?line loop1(1,1000).
+    loop1(1,1000).
 
 fact(N) ->
      fact(N,1).
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 96ba2f64d4..fcd49e43d3 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -40,7 +40,7 @@
 %%      phash2(Binary, N)
 %%
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, 
@@ -106,17 +106,17 @@ end_per_testcase(_Func, _Config) ->
 
 copy_terms(Config) when is_list(Config) ->
     Self = self(),
-    ?line Pid = spawn_link(fun() -> copy_server(Self) end),
+    Pid = spawn_link(fun() -> copy_server(Self) end),
     F = fun(Term) ->
 		Pid ! Term,
 		receive
 		    Term -> ok;
 		    Other ->
 			io:format("Sent: ~P\nGot back:~P", [Term,12,Other,12]),
-			?t:fail(bad_term)
+			ct:fail(bad_term)
 		end
 	end,
-    ?line test_terms(F),
+    test_terms(F),
     ok.
 
 copy_server(Parent) ->
@@ -129,154 +129,152 @@ copy_server(Parent) ->
 %% Tests list_to_binary/1, binary_to_list/1 and size/1,
 %% using flat lists.
 
-conversions(suite) -> [];
 conversions(Config) when is_list(Config) ->
-    ?line test_bin([]),
-    ?line test_bin([1]),
-    ?line test_bin([1, 2]),
-    ?line test_bin([1, 2, 3]),
-    ?line test_bin(lists:seq(0, ?heap_binary_size)),
-    ?line test_bin(lists:seq(0, ?heap_binary_size+1)),
-    ?line test_bin(lists:seq(0, 255)),
-    ?line test_bin(lists:duplicate(50000, $@)),
+    test_bin([]),
+    test_bin([1]),
+    test_bin([1, 2]),
+    test_bin([1, 2, 3]),
+    test_bin(lists:seq(0, ?heap_binary_size)),
+    test_bin(lists:seq(0, ?heap_binary_size+1)),
+    test_bin(lists:seq(0, 255)),
+    test_bin(lists:duplicate(50000, $@)),
 
     %% Binary in list.
     List = [1,2,3,4,5],
-    ?line B1 = make_sub_binary(list_to_binary(List)),
-    ?line 5 = size(B1),
-    ?line 5 = size(make_unaligned_sub_binary(B1)),
-    ?line 40 = bit_size(B1),
-    ?line 40 = bit_size(make_unaligned_sub_binary(B1)),
-    ?line B2 = list_to_binary([42,B1,19]),
-    ?line B2 = list_to_binary([42,make_unaligned_sub_binary(B1),19]),
-    ?line B2 = iolist_to_binary(B2),
-    ?line B2 = iolist_to_binary(make_unaligned_sub_binary(B2)),
-    ?line 7 = size(B2),
-    ?line 7 = size(make_sub_binary(B2)),
-    ?line 56 = bit_size(B2),
-    ?line 56 = bit_size(make_sub_binary(B2)),
-    ?line [42,1,2,3,4,5,19] = binary_to_list(B2),
-    ?line [42,1,2,3,4,5,19] = binary_to_list(make_sub_binary(B2)),
-    ?line [42,1,2,3,4,5,19] = binary_to_list(make_unaligned_sub_binary(B2)),
-    ?line [42,1,2,3,4,5,19] = bitstring_to_list(B2),
-    ?line [42,1,2,3,4,5,19] = bitstring_to_list(make_sub_binary(B2)),
-    ?line [42,1,2,3,4,5,19] = bitstring_to_list(make_unaligned_sub_binary(B2)),
+    B1 = make_sub_binary(list_to_binary(List)),
+    5 = size(B1),
+    5 = size(make_unaligned_sub_binary(B1)),
+    40 = bit_size(B1),
+    40 = bit_size(make_unaligned_sub_binary(B1)),
+    B2 = list_to_binary([42,B1,19]),
+    B2 = list_to_binary([42,make_unaligned_sub_binary(B1),19]),
+    B2 = iolist_to_binary(B2),
+    B2 = iolist_to_binary(make_unaligned_sub_binary(B2)),
+    7 = size(B2),
+    7 = size(make_sub_binary(B2)),
+    56 = bit_size(B2),
+    56 = bit_size(make_sub_binary(B2)),
+    [42,1,2,3,4,5,19] = binary_to_list(B2),
+    [42,1,2,3,4,5,19] = binary_to_list(make_sub_binary(B2)),
+    [42,1,2,3,4,5,19] = binary_to_list(make_unaligned_sub_binary(B2)),
+    [42,1,2,3,4,5,19] = bitstring_to_list(B2),
+    [42,1,2,3,4,5,19] = bitstring_to_list(make_sub_binary(B2)),
+    [42,1,2,3,4,5,19] = bitstring_to_list(make_unaligned_sub_binary(B2)),
 
     ok.
 
 test_bin(List) ->
-    ?line Size = length(List),
-    ?line Bin = list_to_binary(List),
-    ?line Bin = iolist_to_binary(List),
-    ?line Bin = list_to_bitstring(List),
-    ?line Size = iolist_size(List),
-    ?line Size = iolist_size(Bin),
-    ?line Size = iolist_size(make_unaligned_sub_binary(Bin)),
-    ?line Size = size(Bin),
-    ?line Size = size(make_sub_binary(Bin)),
-    ?line Size = size(make_unaligned_sub_binary(Bin)),
-    ?line List = binary_to_list(Bin),
-    ?line List = binary_to_list(make_sub_binary(Bin)),
-    ?line List = binary_to_list(make_unaligned_sub_binary(Bin)),
-    ?line List = bitstring_to_list(Bin),
-    ?line List = bitstring_to_list(make_unaligned_sub_binary(Bin)).
+    Size = length(List),
+    Bin = list_to_binary(List),
+    Bin = iolist_to_binary(List),
+    Bin = list_to_bitstring(List),
+    Size = iolist_size(List),
+    Size = iolist_size(Bin),
+    Size = iolist_size(make_unaligned_sub_binary(Bin)),
+    Size = size(Bin),
+    Size = size(make_sub_binary(Bin)),
+    Size = size(make_unaligned_sub_binary(Bin)),
+    List = binary_to_list(Bin),
+    List = binary_to_list(make_sub_binary(Bin)),
+    List = binary_to_list(make_unaligned_sub_binary(Bin)),
+    List = bitstring_to_list(Bin),
+    List = bitstring_to_list(make_unaligned_sub_binary(Bin)).
 
 %% Tests list_to_binary/1, iolist_to_binary/1, list_to_bitstr/1, binary_to_list/1,3,
 %% bitstr_to_list/1, and size/1, using deep lists.
 
 deep_lists(Config) when is_list(Config) ->
-    ?line test_deep_list(["abc"]),
-    ?line test_deep_list([[12,13,[123,15]]]),
-    ?line test_deep_list([[12,13,[lists:seq(0, 255), []]]]),
+    test_deep_list(["abc"]),
+    test_deep_list([[12,13,[123,15]]]),
+    test_deep_list([[12,13,[lists:seq(0, 255), []]]]),
     ok.
 
 test_deep_list(List) ->
-    ?line FlatList = lists:flatten(List),
-    ?line Size = length(FlatList),
-    ?line Bin = list_to_binary(List),
-    ?line Bin = iolist_to_binary(List),
-    ?line Bin = iolist_to_binary(Bin),
-    ?line Bin = list_to_bitstring(List),
-    ?line Size = size(Bin),
-    ?line Size = iolist_size(List),
-    ?line Size = iolist_size(FlatList),
-    ?line Size = iolist_size(Bin),
-    ?line Bitsize = bit_size(Bin),
-    ?line Bitsize = 8*Size,
-    ?line FlatList = binary_to_list(Bin),
-    ?line FlatList = bitstring_to_list(Bin),
+    FlatList = lists:flatten(List),
+    Size = length(FlatList),
+    Bin = list_to_binary(List),
+    Bin = iolist_to_binary(List),
+    Bin = iolist_to_binary(Bin),
+    Bin = list_to_bitstring(List),
+    Size = size(Bin),
+    Size = iolist_size(List),
+    Size = iolist_size(FlatList),
+    Size = iolist_size(Bin),
+    Bitsize = bit_size(Bin),
+    Bitsize = 8*Size,
+    FlatList = binary_to_list(Bin),
+    FlatList = bitstring_to_list(Bin),
     io:format("testing plain binary..."),
-    ?line t_binary_to_list_3(FlatList, Bin, 1, Size),
+    t_binary_to_list_3(FlatList, Bin, 1, Size),
     io:format("testing unaligned sub binary..."),
-    ?line t_binary_to_list_3(FlatList, make_unaligned_sub_binary(Bin), 1, Size).
+    t_binary_to_list_3(FlatList, make_unaligned_sub_binary(Bin), 1, Size).
 
 t_binary_to_list_3(List, Bin, From, To) ->
-    ?line going_up(List, Bin, From, To),
-    ?line going_down(List, Bin, From, To),
-    ?line going_center(List, Bin, From, To).
+    going_up(List, Bin, From, To),
+    going_down(List, Bin, From, To),
+    going_center(List, Bin, From, To).
 
 going_up(List, Bin, From, To) when From =< To ->
-    ?line List = binary_to_list(Bin, From, To),
-    ?line going_up(tl(List), Bin, From+1, To);
+    List = binary_to_list(Bin, From, To),
+    going_up(tl(List), Bin, From+1, To);
 going_up(_List, _Bin, From, To) when From > To ->
     ok.
     
 going_down(List, Bin, From, To) when To > 0->
-    ?line compare(List, binary_to_list(Bin, From, To), To-From+1),
-    ?line going_down(List, Bin, From, To-1);
+    compare(List, binary_to_list(Bin, From, To), To-From+1),
+    going_down(List, Bin, From, To-1);
 going_down(_List, _Bin, _From, _To) ->
     ok.
 
 going_center(List, Bin, From, To) when From >= To ->
-    ?line compare(List, binary_to_list(Bin, From, To), To-From+1),
-    ?line going_center(tl(List), Bin, From+1, To-1);
+    compare(List, binary_to_list(Bin, From, To), To-From+1),
+    going_center(tl(List), Bin, From+1, To-1);
 going_center(_List, _Bin, _From, _To) ->
     ok.
 
 compare([X|Rest1], [X|Rest2], Left) when Left > 0 ->
-    ?line compare(Rest1, Rest2, Left-1);
+    compare(Rest1, Rest2, Left-1);
 compare([_X|_], [_Y|_], _Left) ->
-    ?line test_server:fail();
+    ct:fail("compare fail");
 compare(_List, [], 0) ->
     ok.
 
 deep_bitstr_lists(Config) when is_list(Config) ->
-    ?line {<<7:3>>,[<<7:3>>]} = test_deep_bitstr([<<7:3>>]),
-    ?line {<<42,5:3>>=Bin,[42,<<5:3>>]=List} = test_deep_bitstr([42,<<5:3>>]),
-    ?line {Bin,List} = test_deep_bitstr([42|<<5:3>>]),
-    ?line {Bin,List} = test_deep_bitstr([<<42,5:3>>]),
-    ?line {Bin,List} = test_deep_bitstr([<<1:3>>,<<10:5>>|<<5:3>>]),
-    ?line {Bin,List} = test_deep_bitstr([<<1:3>>,<<10:5>>,<<5:3>>]),
-    ?line {Bin,List} = test_deep_bitstr([[<<1:3>>,<<10:5>>],[],<<5:3>>]),
-    ?line {Bin,List} = test_deep_bitstr([[[<<1:3>>]|<<10:5>>],[],<<5:3>>]),
-    ?line {Bin,List} = test_deep_bitstr([[<<0:1>>,<<0:1>>,[],<<1:1>>,<<10:5>>],
+    {<<7:3>>,[<<7:3>>]} = test_deep_bitstr([<<7:3>>]),
+    {<<42,5:3>>=Bin,[42,<<5:3>>]=List} = test_deep_bitstr([42,<<5:3>>]),
+    {Bin,List} = test_deep_bitstr([42|<<5:3>>]),
+    {Bin,List} = test_deep_bitstr([<<42,5:3>>]),
+    {Bin,List} = test_deep_bitstr([<<1:3>>,<<10:5>>|<<5:3>>]),
+    {Bin,List} = test_deep_bitstr([<<1:3>>,<<10:5>>,<<5:3>>]),
+    {Bin,List} = test_deep_bitstr([[<<1:3>>,<<10:5>>],[],<<5:3>>]),
+    {Bin,List} = test_deep_bitstr([[[<<1:3>>]|<<10:5>>],[],<<5:3>>]),
+    {Bin,List} = test_deep_bitstr([[<<0:1>>,<<0:1>>,[],<<1:1>>,<<10:5>>],
 					 <<1:1>>,<<0:1>>,<<1:1>>]),
     ok.
 
 test_deep_bitstr(List) ->
-    %%?line {'EXIT',{badarg,_}} = list_to_binary(List),
+    %%{'EXIT',{badarg,_}} = list_to_binary(List),
     Bin = list_to_bitstring(List),
     {Bin,bitstring_to_list(Bin)}.
 
-bad_list_to_binary(suite) -> [];
 bad_list_to_binary(Config) when is_list(Config) ->
-    ?line test_bad_bin(atom),
-    ?line test_bad_bin(42),
-    ?line test_bad_bin([1|2]),
-    ?line test_bad_bin([256]),
-    ?line test_bad_bin([255, [256]]),
-    ?line test_bad_bin([-1]),
-    ?line test_bad_bin([atom_in_list]),
-    ?line test_bad_bin([[<<8>>]|bad_tail]),
+    test_bad_bin(atom),
+    test_bad_bin(42),
+    test_bad_bin([1|2]),
+    test_bad_bin([256]),
+    test_bad_bin([255, [256]]),
+    test_bad_bin([-1]),
+    test_bad_bin([atom_in_list]),
+    test_bad_bin([[<<8>>]|bad_tail]),
 
     {'EXIT',{badarg,_}} = (catch list_to_binary(id(<<1,2,3>>))),
     {'EXIT',{badarg,_}} = (catch list_to_binary(id([<<42:7>>]))),
     {'EXIT',{badarg,_}} = (catch list_to_bitstring(id(<<1,2,3>>))),
     
     %% Funs used to be implemented as a type of binary internally.
-    ?line test_bad_bin(fun(X, Y) -> X*Y end),
-    ?line test_bad_bin([1,fun(X) -> X + 1 end,2|fun() -> 0 end]),
-    ?line test_bad_bin([fun(X) -> X + 1 end]),
+    test_bad_bin(fun(X, Y) -> X*Y end),
+    test_bad_bin([1,fun(X) -> X + 1 end,2|fun() -> 0 end]),
+    test_bad_bin([fun(X) -> X + 1 end]),
 
     %% Test iolists that do not fit in the address space.
     %% Unfortunately, it would be too slow to test in a 64-bit emulator.
@@ -287,15 +285,15 @@ bad_list_to_binary(Config) when is_list(Config) ->
 
 huge_iolists() ->
     FourGigs = 1 bsl 32,
-    ?line Sizes = [FourGigs+N || N <- lists:seq(0, 64)] ++
+    Sizes = [FourGigs+N || N <- lists:seq(0, 64)] ++
 	[1 bsl N || N <- lists:seq(33, 37)],
-    ?line Base = <<0:(1 bsl 20)/unit:8>>,
+    Base = <<0:(1 bsl 20)/unit:8>>,
     [begin
 	 L = build_iolist(Sz, Base),
-	 ?line {'EXIT',{system_limit,_}} = (catch list_to_binary([L])),
-	 ?line {'EXIT',{system_limit,_}} = (catch list_to_bitstring([L])),
-	 ?line {'EXIT',{system_limit,_}} = (catch binary:list_to_bin([L])),
-	 ?line {'EXIT',{system_limit,_}} = (catch iolist_to_binary(L))
+	 {'EXIT',{system_limit,_}} = (catch list_to_binary([L])),
+	 {'EXIT',{system_limit,_}} = (catch list_to_bitstring([L])),
+	 {'EXIT',{system_limit,_}} = (catch binary:list_to_bin([L])),
+	 {'EXIT',{system_limit,_}} = (catch iolist_to_binary(L))
 	 end || Sz <- Sizes],
     ok.
 
@@ -305,15 +303,15 @@ test_bad_bin(List) ->
     {'EXIT',{badarg,_}} = (catch list_to_bitstring(List)),
     {'EXIT',{badarg,_}} = (catch iolist_size(List)).
 
-bad_binary_to_list(doc) -> "Tries binary_to_list/1,3 with bad arguments.";
+%% Tries binary_to_list/1,3 with bad arguments.
 bad_binary_to_list(Config) when is_list(Config) ->
-    ?line bad_bin_to_list(fun(X) -> X * 42 end),
+    bad_bin_to_list(fun(X) -> X * 42 end),
 
     GoodBin = list_to_binary(lists:seq(1, 10)),
-    ?line bad_bin_to_list(fun(X) -> X * 44 end, 1, 2),
-    ?line bad_bin_to_list(GoodBin, 0, 1),
-    ?line bad_bin_to_list(GoodBin, 2, 1),
-    ?line bad_bin_to_list(GoodBin, 11, 11),
+    bad_bin_to_list(fun(X) -> X * 44 end, 1, 2),
+    bad_bin_to_list(GoodBin, 0, 1),
+    bad_bin_to_list(GoodBin, 2, 1),
+    bad_bin_to_list(GoodBin, 11, 11),
     {'EXIT',{badarg,_}} = (catch binary_to_list(id(<<42:7>>))),
     ok.
 
@@ -327,63 +325,61 @@ bad_bin_to_list(Bin, First, Last) ->
     
 %% Tries to split a binary at all possible positions.
 
-t_split_binary(suite) -> [];
 t_split_binary(Config) when is_list(Config) ->
-    ?line L = lists:seq(0, ?heap_binary_size-5), %Heap binary.
-    ?line B = list_to_binary(L),
-    ?line split(L, B, size(B)),
+    L = lists:seq(0, ?heap_binary_size-5), %Heap binary.
+    B = list_to_binary(L),
+    split(L, B, size(B)),
 
     %% Sub binary of heap binary.
-    ?line split(L, make_sub_binary(B), size(B)),
+    split(L, make_sub_binary(B), size(B)),
     {X,_Y} = split_binary(B, size(B) div 2),
-    ?line split(binary_to_list(X), X, size(X)),
+    split(binary_to_list(X), X, size(X)),
 
     %% Unaligned sub binary of heap binary.
-    ?line split(L, make_unaligned_sub_binary(B), size(B)),
+    split(L, make_unaligned_sub_binary(B), size(B)),
     {X,_Y} = split_binary(B, size(B) div 2),
-    ?line split(binary_to_list(X), X, size(X)),
+    split(binary_to_list(X), X, size(X)),
     
     %% Reference-counted binary.
-    ?line L2 = lists:seq(0, ?heap_binary_size+1),
-    ?line B2 = list_to_binary(L2),
-    ?line split(L2, B2, size(B2)),
+    L2 = lists:seq(0, ?heap_binary_size+1),
+    B2 = list_to_binary(L2),
+    split(L2, B2, size(B2)),
 
     %% Sub binary of reference-counted binary.
-    ?line split(L2, make_sub_binary(B2), size(B2)),
+    split(L2, make_sub_binary(B2), size(B2)),
     {X2,_Y2} = split_binary(B2, size(B2) div 2),
-    ?line split(binary_to_list(X2), X2, size(X2)),
+    split(binary_to_list(X2), X2, size(X2)),
 
     %% Unaligned sub binary of reference-counted binary.
-    ?line split(L2, make_unaligned_sub_binary(B2), size(B2)),
+    split(L2, make_unaligned_sub_binary(B2), size(B2)),
     {X2,_Y2} = split_binary(B2, size(B2) div 2),
-    ?line split(binary_to_list(X2), X2, size(X2)),
+    split(binary_to_list(X2), X2, size(X2)),
 
     ok.
 
 split(L, B, Pos) when Pos > 0 ->
-    ?line {B1, B2} = split_binary(B, Pos),
-    ?line B1 = list_to_binary(lists:sublist(L, 1, Pos)),
-    ?line B2 = list_to_binary(lists:nthtail(Pos, L)),
-    ?line split(L, B, Pos-1);
+    {B1, B2} = split_binary(B, Pos),
+    B1 = list_to_binary(lists:sublist(L, 1, Pos)),
+    B2 = list_to_binary(lists:nthtail(Pos, L)),
+    split(L, B, Pos-1);
 split(_L, _B, 0) ->
     ok.
 
-bad_split(doc) -> "Tries split_binary/2 with bad arguments.";
-bad_split(suite) -> [];
+%% Tries split_binary/2 with bad arguments.
 bad_split(Config) when is_list(Config) ->
     GoodBin = list_to_binary([1,2,3]),
-    ?line bad_split(GoodBin, -1),
-    ?line bad_split(GoodBin, 4),
-    ?line bad_split(GoodBin, a),
+    bad_split(GoodBin, -1),
+    bad_split(GoodBin, 4),
+    bad_split(GoodBin, a),
 
     %% Funs are a kind of binaries.
-    ?line bad_split(fun(_X) -> 1 end, 1),
+    bad_split(fun(_X) -> 1 end, 1),
     ok.
     
 bad_split(Bin, Pos) ->
     {'EXIT',{badarg,_}} = (catch split_binary(Bin, Pos)).
 
-t_hash(doc) -> "Test hash/2 with different type of binaries.";
+%% Test hash/2 with different type of binaries.
 t_hash(Config) when is_list(Config) ->
     test_hash([]),
     test_hash([253]),
@@ -396,36 +392,34 @@ test_hash(List) ->
     Bin = list_to_binary(List),
     Sbin = make_sub_binary(List),
     Unaligned = make_unaligned_sub_binary(Sbin),
-    ?line test_hash_1(Bin, Sbin, Unaligned, fun erlang:hash/2),
-    ?line test_hash_1(Bin, Sbin, Unaligned, fun erlang:phash/2),
-    ?line test_hash_1(Bin, Sbin, Unaligned, fun erlang:phash2/2).
+    test_hash_1(Bin, Sbin, Unaligned, fun erlang:hash/2),
+    test_hash_1(Bin, Sbin, Unaligned, fun erlang:phash/2),
+    test_hash_1(Bin, Sbin, Unaligned, fun erlang:phash2/2).
 
 test_hash_1(Bin, Sbin, Unaligned, Hash) when is_function(Hash, 2) ->
     N = 65535,
     case {Hash(Bin, N),Hash(Sbin, N),Hash(Unaligned, N)} of
 	{H,H,H} -> ok;
 	{H1,H2,H3} ->
-	    io:format("Different hash values: ~p, ~p, ~p\n", [H1,H2,H3]),
-	    ?t:fail()
+	    ct:fail("Different hash values: ~p, ~p, ~p\n", [H1,H2,H3])
     end.
 
-bad_size(doc) -> "Try bad arguments to size/1.";
-bad_size(suite) -> [];
+%% Try bad arguments to size/1.
 bad_size(Config) when is_list(Config) ->
-    ?line {'EXIT',{badarg,_}} = (catch size(fun(X) -> X + 33 end)),
+    {'EXIT',{badarg,_}} = (catch size(fun(X) -> X + 33 end)),
     ok.
 
 bad_term_to_binary(Config) when is_list(Config) ->
     T = id({a,b,c}),
-    ?line {'EXIT',{badarg,_}} = (catch term_to_binary(T, not_a_list)),
-    ?line {'EXIT',{badarg,_}} = (catch term_to_binary(T, [blurf])),
-    ?line {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{compressed,-1}])),
-    ?line {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{compressed,10}])),
-    ?line {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{compressed,cucumber}])),
-    ?line {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{compressed}])),
-    ?line {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{version,1}|bad_tail])),
-    ?line {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{minor_version,-1}])),
-    ?line {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{minor_version,x}])),
+    {'EXIT',{badarg,_}} = (catch term_to_binary(T, not_a_list)),
+    {'EXIT',{badarg,_}} = (catch term_to_binary(T, [blurf])),
+    {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{compressed,-1}])),
+    {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{compressed,10}])),
+    {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{compressed,cucumber}])),
+    {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{compressed}])),
+    {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{version,1}|bad_tail])),
+    {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{minor_version,-1}])),
+    {'EXIT',{badarg,_}} = (catch term_to_binary(T, [{minor_version,x}])),
 
     ok.
 
@@ -464,7 +458,7 @@ terms(Config) when is_list(Config) ->
 		      UnalignedC = make_unaligned_sub_binary(BinC),
 		      Term = binary_to_term_stress(UnalignedC)
 	      end,
-    ?line test_terms(TestFun),
+    test_terms(TestFun),
     ok.
 
 terms_compression_levels(Term, UncompressedSz, Level) when Level < 10 ->
@@ -476,7 +470,7 @@ terms_compression_levels(Term, UncompressedSz, Level) when Level < 10 ->
 terms_compression_levels(_, _, _) -> ok.
 
 terms_float(Config) when is_list(Config) ->
-    ?line test_floats(fun(Term) ->
+    test_floats(fun(Term) ->
 			      Bin0 = term_to_binary(Term, [{minor_version,0}]),
 			      Term = binary_to_term_stress(Bin0),
 			      Bin1 = term_to_binary(Term),
@@ -492,22 +486,21 @@ terms_float(Config) when is_list(Config) ->
 
 float_middle_endian(Config) when is_list(Config) ->
     %% Testing for roundtrip is not enough.
-    ?line <<131,70,63,240,0,0,0,0,0,0>> = term_to_binary(1.0, [{minor_version,1}]),
-    ?line 1.0 = binary_to_term_stress(<<131,70,63,240,0,0,0,0,0,0>>).
+    <<131,70,63,240,0,0,0,0,0,0>> = term_to_binary(1.0, [{minor_version,1}]),
+    1.0 = binary_to_term_stress(<<131,70,63,240,0,0,0,0,0,0>>).
 
 external_size(Config) when is_list(Config) ->
     %% Build a term whose external size only fits in a big num (on 32-bit CPU).
-    ?line external_size_1(16#11111111111111117777777777777777888889999, 0, 16#FFFFFFF),
+    external_size_1(16#11111111111111117777777777777777888889999, 0, 16#FFFFFFF),
 
     %% Test that the same binary aligned and unaligned has the same external size.
-    ?line Bin = iolist_to_binary([1,2,3,96]),
-    ?line Unaligned = make_unaligned_sub_binary(Bin),
+    Bin = iolist_to_binary([1,2,3,96]),
+    Unaligned = make_unaligned_sub_binary(Bin),
     case {erlang:external_size(Bin),erlang:external_size(Unaligned)} of
 	{X,X} -> ok;
 	{Sz1,Sz2} ->
-	    io:format("  Aligned size: ~p\n", [Sz1]),
-	    io:format("Unaligned size: ~p\n", [Sz2]),
-	    ?line ?t:fail()
+	    ct:fail("  Aligned size: ~p\n"
+                    "Unaligned size: ~p\n", [Sz1,Sz2])
     end,
     true = (erlang:external_size(Bin) =:= erlang:external_size(Bin, [{minor_version, 1}])),
     true = (erlang:external_size(Unaligned) =:= erlang:external_size(Unaligned, [{minor_version, 1}])).
@@ -521,30 +514,29 @@ external_size_1(Term, Size0, Limit) when Size0 < Limit ->
 external_size_1(_, _, _) -> ok.
 
 t_iolist_size(Config) when is_list(Config) ->
-    ?line Seed = {erlang:monotonic_time(),
-		  erlang:time_offset(),
-		  erlang:unique_integer([positive])},
-    ?line io:format("Seed: ~p", [Seed]),
-    ?line random:seed(Seed),
-    ?line Base = <<0:(1 bsl 20)/unit:8>>,
-    ?line Powers = [1 bsl N || N <- lists:seq(2, 37)],
-    ?line Sizes0 = [[N - random:uniform(N div 2),
-		     lists:seq(N-2, N+2),
-		     N+N div 2,
-		     N + random:uniform(N div 2)] ||
-		       N <- Powers],
+    _ = rand:uniform(),				%Seed generator
+    io:format("Seed: ~p", [rand:export_seed()]),
+
+    Base = <<0:(1 bsl 20)/unit:8>>,
+    Powers = [1 bsl N || N <- lists:seq(2, 37)],
+    Sizes0 = [[N - rand:uniform(N div 2),
+	       lists:seq(N-2, N+2),
+	       N+N div 2,
+	       N + rand:uniform(N div 2)] ||
+		 N <- Powers],
+
     %% Test sizes around 1^32 more thoroughly.
     FourGigs = 1 bsl 32,
-    ?line Sizes1 = [FourGigs+N || N <- lists:seq(-8, 40)] ++ Sizes0,
-    ?line Sizes2 = lists:flatten(Sizes1),
-    ?line Sizes = lists:usort(Sizes2),
+    Sizes1 = [FourGigs+N || N <- lists:seq(-8, 40)] ++ Sizes0,
+    Sizes2 = lists:flatten(Sizes1),
+    Sizes = lists:usort(Sizes2),
     io:format("~p sizes:", [length(Sizes)]),
     io:format("~p\n", [Sizes]),
-    ?line [Sz = iolist_size(build_iolist(Sz, Base)) || Sz <- Sizes],
+    _ = [Sz = iolist_size(build_iolist(Sz, Base)) || Sz <- Sizes],
     ok.
 
 build_iolist(N, Base) when N < 16 ->
-    case random:uniform(3) of
+    case rand:uniform(3) of
 	1 ->
 	    <<Bin:N/binary,_/binary>> = Base,
 	    Bin;
@@ -552,7 +544,7 @@ build_iolist(N, Base) when N < 16 ->
 	    lists:seq(1, N)
     end;
 build_iolist(N, Base) when N =< byte_size(Base) ->
-    case random:uniform(3) of
+    case rand:uniform(3) of
 	1 ->
 	    <<Bin:N/binary,_/binary>> = Base,
 	    Bin;
@@ -570,7 +562,7 @@ build_iolist(N, Base) when N =< byte_size(Base) ->
 	    end
     end;
 build_iolist(N0, Base) ->
-    Small = random:uniform(15),
+    Small = rand:uniform(15),
     Seq = lists:seq(1, Small),
     N = N0 - Small,
     case N rem 2 of
@@ -583,33 +575,32 @@ build_iolist(N0, Base) ->
     end.
 
 
-bad_binary_to_term_2(doc) -> "OTP-4053.";
-bad_binary_to_term_2(suite) -> [];
+%% OTP-4053
 bad_binary_to_term_2(Config) when is_list(Config) ->
-    ?line {ok, N} = test_server:start_node(plopp, slave, []),
-    ?line R = rpc:call(N, erlang, binary_to_term, [<<131,111,255,255,255,0>>]),
-    ?line case R of
+    {ok, N} = test_server:start_node(plopp, slave, []),
+    R = rpc:call(N, erlang, binary_to_term, [<<131,111,255,255,255,0>>]),
+    case R of
 	      {badrpc, {'EXIT', _}} ->
 		  ok;
 	      _Other ->
-		  test_server:fail({rpcresult, R})
+		  ct:fail({rpcresult, R})
 	  end,
-    ?line test_server:stop_node(N),
+    test_server:stop_node(N),
     ok.
 
-bad_binary_to_term(doc) -> "Try bad input to binary_to_term/1.";
+%% Try bad input to binary_to_term/1.
 bad_binary_to_term(Config) when is_list(Config) ->
-    ?line bad_bin_to_term(an_atom),
-    ?line bad_bin_to_term({an,tuple}),
-    ?line bad_bin_to_term({a,list}),
-    ?line bad_bin_to_term(fun() -> self() end),
-    ?line bad_bin_to_term(fun(X) -> 42*X end),
-    ?line bad_bin_to_term(fun(X, Y) -> {X,Y} end),
-    ?line bad_bin_to_term(fun(X, Y, Z) -> {X,Y,Z} end),
-    ?line bad_bin_to_term(bit_sized_binary(term_to_binary({you,should,'not',see,this,term}))),
+    bad_bin_to_term(an_atom),
+    bad_bin_to_term({an,tuple}),
+    bad_bin_to_term({a,list}),
+    bad_bin_to_term(fun() -> self() end),
+    bad_bin_to_term(fun(X) -> 42*X end),
+    bad_bin_to_term(fun(X, Y) -> {X,Y} end),
+    bad_bin_to_term(fun(X, Y, Z) -> {X,Y,Z} end),
+    bad_bin_to_term(bit_sized_binary(term_to_binary({you,should,'not',see,this,term}))),
 
     %% Bad float.
-    ?line bad_bin_to_term(<<131,70,-1:64>>),
+    bad_bin_to_term(<<131,70,-1:64>>),
     ok.
 
 bad_bin_to_term(BadBin) ->
@@ -618,25 +609,24 @@ bad_bin_to_term(BadBin) ->
 bad_bin_to_term(BadBin,Opts) ->
     {'EXIT',{badarg,_}} = (catch binary_to_term_stress(BadBin,Opts)).
 
-safe_binary_to_term2(doc) -> "Test safety options for binary_to_term/2";
+%% Test safety options for binary_to_term/2
 safe_binary_to_term2(Config) when is_list(Config) ->
-    ?line bad_bin_to_term(<<131,100,0,14,"undefined_atom">>, [safe]),
-    ?line bad_bin_to_term(<<131,100,0,14,"other_bad_atom">>, [safe]),
+    bad_bin_to_term(<<131,100,0,14,"undefined_atom">>, [safe]),
+    bad_bin_to_term(<<131,100,0,14,"other_bad_atom">>, [safe]),
     BadHostAtom = <<100,0,14,"badguy@badhost">>,
     Empty = <<0,0,0,0>>,
     BadRef = <<131,114,0,3,BadHostAtom/binary,0,<<0,0,0,255>>/binary,
 	      Empty/binary,Empty/binary>>,
-    ?line bad_bin_to_term(BadRef, [safe]), % good ref, with a bad atom
-    ?line fullsweep_after = binary_to_term_stress(<<131,100,0,15,"fullsweep_after">>, [safe]), % should be a good atom
+    bad_bin_to_term(BadRef, [safe]), % good ref, with a bad atom
+    fullsweep_after = binary_to_term_stress(<<131,100,0,15,"fullsweep_after">>, [safe]), % should be a good atom
     BadExtFun = <<131,113,100,0,4,98,108,117,101,100,0,4,109,111,111,110,97,3>>,
-    ?line bad_bin_to_term(BadExtFun, [safe]),
+    bad_bin_to_term(BadExtFun, [safe]),
     ok.
 
 %% Tests bad input to binary_to_term/1.
 
-bad_terms(suite) -> [];
 bad_terms(Config) when is_list(Config) ->
-    ?line test_terms(fun corrupter/1),
+    test_terms(fun corrupter/1),
     {'EXIT',{badarg,_}} = (catch binary_to_term(<<131,$M,3:32,0,11,22,33>>)),
     {'EXIT',{badarg,_}} = (catch binary_to_term(<<131,$M,3:32,9,11,22,33>>)),
     {'EXIT',{badarg,_}} = (catch binary_to_term(<<131,$M,0:32,1,11,22,33>>)),
@@ -669,7 +659,7 @@ corrupter(Term) ->
     corrupter0(Term).
 
 corrupter0(Term) ->
-    ?line try
+    try
 	      S = io_lib:format("About to corrupt: ~P", [Term,12]),
 	      io:put_chars(S)
 	  catch
@@ -677,42 +667,41 @@ corrupter0(Term) ->
 		  io:format("About to corrupt: <<bit-level-binary:~p",
 			    [bit_size(Term)])
 	  end,
-    ?line Bin = term_to_binary(Term),
-    ?line corrupter(Bin, size(Bin)-1),
-    ?line CompressedBin = term_to_binary(Term, [compressed]),
-    ?line corrupter(CompressedBin, size(CompressedBin)-1).
+    Bin = term_to_binary(Term),
+    corrupter(Bin, size(Bin)-1),
+    CompressedBin = term_to_binary(Term, [compressed]),
+    corrupter(CompressedBin, size(CompressedBin)-1).
 
 corrupter(Bin, Pos) when Pos >= 0 ->
-    ?line {ShorterBin, Rest} = split_binary(Bin, Pos),
-    ?line catch binary_to_term_stress(ShorterBin), %% emulator shouldn't crash
-    ?line MovedBin = list_to_binary([ShorterBin]),
-    ?line catch binary_to_term_stress(MovedBin), %% emulator shouldn't crash
+    {ShorterBin, Rest} = split_binary(Bin, Pos),
+    catch binary_to_term_stress(ShorterBin), %% emulator shouldn't crash
+    MovedBin = list_to_binary([ShorterBin]),
+    catch binary_to_term_stress(MovedBin), %% emulator shouldn't crash
 
     %% Bit faults, shouldn't crash
     <<Byte,Tail/binary>> = Rest,
     Fun = fun(M) -> FaultyByte = Byte bxor M,                    
 		    catch binary_to_term_stress(<<ShorterBin/binary,
 					  FaultyByte, Tail/binary>>) end,
-    ?line lists:foreach(Fun,[1,2,4,8,16,32,64,128,255]),    
-    ?line corrupter(Bin, Pos-1);
+    lists:foreach(Fun,[1,2,4,8,16,32,64,128,255]),    
+    corrupter(Bin, Pos-1);
 corrupter(_Bin, _) ->
     ok.
 
-more_bad_terms(suite) -> [];
 more_bad_terms(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line BadFile = filename:join(Data, "bad_binary"),
-    ?line ok = io:format("File: ~s\n", [BadFile]),
-    ?line case file:read_file(BadFile) of
+    Data = proplists:get_value(data_dir, Config),
+    BadFile = filename:join(Data, "bad_binary"),
+    ok = io:format("File: ~s\n", [BadFile]),
+    case file:read_file(BadFile) of
 	      {ok,Bin} ->
-		  ?line {'EXIT',{badarg,_}} = (catch binary_to_term_stress(Bin)),
+		  {'EXIT',{badarg,_}} = (catch binary_to_term_stress(Bin)),
 		  ok;
 	      Other ->
-		  ?line ?t:fail(Other)
+		  ct:fail(Other)
 	  end.
 
 otp_5484(Config) when is_list(Config) ->
-    ?line {'EXIT',_} =
+    {'EXIT',_} =
 	(catch
 	     binary_to_term_stress(
 	       <<131,
@@ -725,7 +714,7 @@ otp_5484(Config) when is_list(Config) ->
 		255,
 		106>>)),
 
-    ?line {'EXIT',_} =
+    {'EXIT',_} =
 	(catch
 	     binary_to_term_stress(
 	       <<131,
@@ -737,13 +726,13 @@ otp_5484(Config) when is_list(Config) ->
 		2,
 		106>>)),
 
-    ?line {'EXIT',_} =
+    {'EXIT',_} =
 	(catch
 	     binary_to_term_stress(
 	       %% A old-type fun in a list containing a bad creator pid.
 	       <<131,108,0,0,0,1,117,0,0,0,0,103,100,0,13,110,111,110,111,100,101,64,110,111,104,111,115,116,255,255,0,25,255,0,0,0,0,100,0,1,116,97,0,98,6,142,121,72,106>>)),
 
-    ?line {'EXIT',_} =
+    {'EXIT',_} =
 	(catch
 	     binary_to_term_stress(
 	       %% A new-type fun in a list containing a bad creator pid.
@@ -755,7 +744,7 @@ otp_5484(Config) when is_list(Config) ->
 		106,				%[] instead of an atom.
 		0,0,0,27,0,0,0,0,0,106>>)),
 
-    ?line {'EXIT',_} =
+    {'EXIT',_} =
 	(catch
 	     binary_to_term_stress(
 	       %% A new-type fun in a list containing a bad module.
@@ -766,7 +755,7 @@ otp_5484(Config) when is_list(Config) ->
 		107,0,1,64,			%String instead of atom (same length).
 		97,0,98,6,64,82,230,103,100,0,13,110,111,110,111,100,101,64,110,111,104,111,115,116,0,0,0,48,0,0,0,0,0,97,42,97,7,106>>)),
 
-    ?line {'EXIT',_} =
+    {'EXIT',_} =
 	(catch
 	     binary_to_term_stress(
 	       %% A new-type fun in a list containing a bad index.
@@ -778,7 +767,7 @@ otp_5484(Config) when is_list(Config) ->
 		104,0,				%Tuple {} instead of integer.
 		98,6,64,82,230,103,100,0,13,110,111,110,111,100,101,64,110,111,104,111,115,116,0,0,0,48,0,0,0,0,0,97,42,97,7,106>>)),
 
-    ?line {'EXIT',_} =
+    {'EXIT',_} =
 	(catch
 	     binary_to_term_stress(
 	       %% A new-type fun in a list containing a bad unique value.
@@ -792,46 +781,46 @@ otp_5484(Config) when is_list(Config) ->
 		103,100,0,13,110,111,110,111,100,101,64,110,111,104,111,115,116,0,0,0,48,0,0,0,0,0,97,42,97,7,106>>)),
 
     %% An absurdly large atom.
-    ?line {'EXIT',_} = 
+    {'EXIT',_} = 
 	(catch binary_to_term_stress(iolist_to_binary([<<131,100,65000:16>>|
 						lists:duplicate(65000, 42)]))),
 
     %% Longer than 255 characters.
-    ?line {'EXIT',_} = 
+    {'EXIT',_} = 
 	(catch binary_to_term_stress(iolist_to_binary([<<131,100,256:16>>|
 						lists:duplicate(256, 42)]))),
 
     %% OTP-7218. Thanks to Matthew Dempsky. Also make sure that we
     %% cover the other error cases for external funs (EXPORT_EXT).
-    ?line {'EXIT',_} = 
+    {'EXIT',_} = 
 	(catch binary_to_term_stress(
 		 <<131,
 		  113,				%EXPORT_EXP
 		  97,13,			%Integer: 13
 		  97,13,			%Integer: 13
 		  97,13>>)),			%Integer: 13
-    ?line {'EXIT',_} = 
+    {'EXIT',_} = 
 	(catch binary_to_term_stress(
 		 <<131,
 		  113,				%EXPORT_EXP
 		  100,0,1,64,			%Atom: '@'
 		  97,13,			%Integer: 13
 		  97,13>>)),			%Integer: 13
-    ?line {'EXIT',_} = 
+    {'EXIT',_} = 
 	(catch binary_to_term_stress(
 		 <<131,
 		  113,				%EXPORT_EXP
 		  100,0,1,64,			%Atom: '@'
 		  100,0,1,64,			%Atom: '@'
 		  106>>)),			%NIL
-    ?line {'EXIT',_} = 
+    {'EXIT',_} = 
 	(catch binary_to_term_stress(
 		 <<131,
 		  113,				%EXPORT_EXP
 		  100,0,1,64,			%Atom: '@'
 		  100,0,1,64,			%Atom: '@'
 		  98,255,255,255,255>>)),	%Integer: -1
-    ?line {'EXIT',_} = 
+    {'EXIT',_} = 
 	(catch binary_to_term_stress(
 		 <<131,
 		  113,				%EXPORT_EXP
@@ -840,7 +829,7 @@ otp_5484(Config) when is_list(Config) ->
 		  113,97,13,97,13,97,13>>)),	%fun 13:13/13
 
     %% Bad funs.
-    ?line {'EXIT',_} = (catch binary_to_term_stress(fake_fun(0, lists:seq(0, 256)))),
+    {'EXIT',_} = (catch binary_to_term_stress(fake_fun(0, lists:seq(0, 256)))),
     ok.
 
 fake_fun(Arity, Env0) ->
@@ -863,9 +852,9 @@ fake_fun(Arity, Env0) ->
 
 %% More bad terms submitted by Matthias Lang.
 otp_5933(Config) when is_list(Config) ->
-    ?line try_bad_lengths(<<131,$m>>),		%binary
-    ?line try_bad_lengths(<<131,$n>>),		%bignum
-    ?line try_bad_lengths(<<131,$o>>),		%huge bignum
+    try_bad_lengths(<<131,$m>>),		%binary
+    try_bad_lengths(<<131,$n>>),		%bignum
+    try_bad_lengths(<<131,$o>>),		%huge bignum
     ok.
 
 try_bad_lengths(B) ->
@@ -884,7 +873,7 @@ otp_6817(Config) when is_list(Config) ->
 
     %% Floats are only validated when the heap fragment has been allocated.
     BadFloat = <<131,99,53,46,48,$X,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,101,45,48,49,0,0,0,0,0>>,
-    ?line otp_6817_try_bin(BadFloat),
+    otp_6817_try_bin(BadFloat),
 
     %% {Binary,BadFloat}: When the error in float is discovered, a refc-binary
     %% has been allocated and the list of refc-binaries goes through the
@@ -904,7 +893,7 @@ otp_6817(Config) when is_list(Config) ->
 	 230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,
 	 249,250,251,252,253,254,255,99,51,46,49,52,$B,$l,$u,$r,$f,48,48,48,48,48,48,
 	 48,48,49,50,52,51,52,101,43,48,48,0,0,0,0,0>>,
-    ?line otp_6817_try_bin(BinAndFloat),
+    otp_6817_try_bin(BinAndFloat),
 
     %% {Fun,BadFloat}
     FunAndFloat =
@@ -912,14 +901,14 @@ otp_6817(Config) when is_list(Config) ->
 	 71,8,0,0,0,0,0,0,0,0,100,0,1,116,97,0,98,5,175,169,123,103,100,0,13,110,111,
 	 110,111,100,101,64,110,111,104,111,115,116,0,0,0,41,0,0,0,0,0,99,50,46,55,48,
 	 $Y,57,57,57,57,57,57,57,57,57,57,57,57,57,54,52,52,55,101,43,48,48,0,0,0,0,0>>,
-    ?line otp_6817_try_bin(FunAndFloat),
+    otp_6817_try_bin(FunAndFloat),
 
     %% [ExternalPid|BadFloat]
     ExtPidAndFloat =
 	<<131,108,0,0,0,1,103,100,0,13,107,97,108,108,101,64,115,116,114,105,100,101,
 	 114,0,0,0,36,0,0,0,0,2,99,48,46,$@,48,48,48,48,48,48,48,48,48,48,48,48,48,48,
 	 48,48,48,48,48,101,43,48,48,0,0,0,0,0>>,
-    ?line otp_6817_try_bin(ExtPidAndFloat),
+    otp_6817_try_bin(ExtPidAndFloat),
     ok.
 
 otp_6817_try_bin(Bin) ->
@@ -937,8 +926,7 @@ otp_6817_try_bin(Bin) ->
     %% Will crash if the bug is present.
     erlang:garbage_collect().
 
-otp_8117(doc) -> "Some bugs in binary_to_term when 32-bit integers are negative.";
-otp_8117(suite) -> [];
+%% Some bugs in binary_to_term when 32-bit integers are negative.
 otp_8117(Config) when is_list(Config) ->
     [otp_8117_do(Op,-(1 bsl N)) || Op <- ['fun',named_fun,list,tuple],
 				   N <- lists:seq(0,31)],
@@ -947,23 +935,22 @@ otp_8117(Config) when is_list(Config) ->
 otp_8117_do('fun',Neg) ->
     % Fun with negative num_free
     FunBin = term_to_binary(fun() -> ok end),
-    ?line <<B1:27/binary,_NumFree:32,Rest/binary>> = FunBin,   
-    ?line bad_bin_to_term(<<B1/binary,Neg:32,Rest/binary>>);
+    <<B1:27/binary,_NumFree:32,Rest/binary>> = FunBin,   
+    bad_bin_to_term(<<B1/binary,Neg:32,Rest/binary>>);
 otp_8117_do(named_fun,Neg) ->
     % Named fun with negative num_free
     FunBin = term_to_binary(fun F() -> F end),
-    ?line <<B1:27/binary,_NumFree:32,Rest/binary>> = FunBin,
-    ?line bad_bin_to_term(<<B1/binary,Neg:32,Rest/binary>>);
+    <<B1:27/binary,_NumFree:32,Rest/binary>> = FunBin,
+    bad_bin_to_term(<<B1/binary,Neg:32,Rest/binary>>);
 otp_8117_do(list,Neg) ->
     %% List with negative length
-    ?line bad_bin_to_term(<<131,104,2,108,Neg:32,97,11,104,1,97,12,97,13,106,97,14>>);
+    bad_bin_to_term(<<131,104,2,108,Neg:32,97,11,104,1,97,12,97,13,106,97,14>>);
 otp_8117_do(tuple,Neg) ->    
     %% Tuple with negative arity
-    ?line bad_bin_to_term(<<131,104,2,105,Neg:32,97,11,97,12,97,13,97,14>>).
+    bad_bin_to_term(<<131,104,2,105,Neg:32,97,11,97,12,97,13,97,14>>).
     
 
-ordering(doc) -> "Tests ordering of binaries.";
-ordering(suite) -> [];
+%% Tests ordering of binaries.
 ordering(Config) when is_list(Config) ->
     B1 = list_to_binary([7,8,9]),
     B2 = make_sub_binary([1,2,3,4]),
@@ -972,54 +959,54 @@ ordering(Config) when is_list(Config) ->
 
     %% From R8 binaries are compared as strings.
 
-    ?line false = B1 == B2,
-    ?line false = B1 =:= B2,
-    ?line true = B1 /= B2,
-    ?line true = B1 =/= B2,
+    false = B1 == B2,
+    false = B1 =:= B2,
+    true = B1 /= B2,
+    true = B1 =/= B2,
 
-    ?line true = B1 > B2,
-    ?line true = B2 < B3,
-    ?line true = B2 =< B1,
-    ?line true = B2 =< B3,
+    true = B1 > B2,
+    true = B2 < B3,
+    true = B2 =< B1,
+    true = B2 =< B3,
 
-    ?line true = B2 =:= Unaligned,
-    ?line true = B2 == Unaligned,
-    ?line true = Unaligned < B3,
-    ?line true = Unaligned =< B3,
+    true = B2 =:= Unaligned,
+    true = B2 == Unaligned,
+    true = Unaligned < B3,
+    true = Unaligned =< B3,
 
     %% Binaries are greater than all other terms.
 
-    ?line true = B1 > 0,
-    ?line true = B1 > 39827491247298471289473333333333333333333333333333,
-    ?line true = B1 > -3489274937438742190467869234328742398347,
-    ?line true = B1 > 3.14,
-    ?line true = B1 > [],
-    ?line true = B1 > [a],
-    ?line true = B1 > {a},
-    ?line true = B1 > self(),
-    ?line true = B1 > make_ref(),
-    ?line true = B1 > xxx,
-    ?line true = B1 > fun() -> 1 end,
-    ?line true = B1 > fun erlang:send/2,
-
-    ?line Path = ?config(priv_dir, Config),
-    ?line AFile = filename:join(Path, "vanilla_file"),
-    ?line Port = open_port(AFile, [out]),
-    ?line true = B1 > Port,
-
-    ?line true = B1 >= 0,
-    ?line true = B1 >= 39827491247298471289473333333333333333333333333333,
-    ?line true = B1 >= -3489274937438742190467869234328742398347,
-    ?line true = B1 >= 3.14,
-    ?line true = B1 >= [],
-    ?line true = B1 >= [a],
-    ?line true = B1 >= {a},
-    ?line true = B1 >= self(),
-    ?line true = B1 >= make_ref(),
-    ?line true = B1 >= xxx,
-    ?line true = B1 >= fun() -> 1 end,
-    ?line true = B1 >= fun erlang:send/2,
-    ?line true = B1 >= Port,
+    true = B1 > 0,
+    true = B1 > 39827491247298471289473333333333333333333333333333,
+    true = B1 > -3489274937438742190467869234328742398347,
+    true = B1 > 3.14,
+    true = B1 > [],
+    true = B1 > [a],
+    true = B1 > {a},
+    true = B1 > self(),
+    true = B1 > make_ref(),
+    true = B1 > xxx,
+    true = B1 > fun() -> 1 end,
+    true = B1 > fun erlang:send/2,
+
+    Path = proplists:get_value(priv_dir, Config),
+    AFile = filename:join(Path, "vanilla_file"),
+    Port = open_port(AFile, [out]),
+    true = B1 > Port,
+
+    true = B1 >= 0,
+    true = B1 >= 39827491247298471289473333333333333333333333333333,
+    true = B1 >= -3489274937438742190467869234328742398347,
+    true = B1 >= 3.14,
+    true = B1 >= [],
+    true = B1 >= [a],
+    true = B1 >= {a},
+    true = B1 >= self(),
+    true = B1 >= make_ref(),
+    true = B1 >= xxx,
+    true = B1 >= fun() -> 1 end,
+    true = B1 >= fun erlang:send/2,
+    true = B1 >= Port,
 
     ok.
 
@@ -1032,153 +1019,153 @@ unaligned_order(Config) when is_list(Config) ->
 test_unaligned_order(I, J) ->
     Align = {I,J},
     io:format("~p ~p", [I,J]),
-    ?line true = test_unaligned_order_1('=:=', <<1,2,3,16#AA,16#7C,4,16#5F,5,16#5A>>,
+    true = test_unaligned_order_1('=:=', <<1,2,3,16#AA,16#7C,4,16#5F,5,16#5A>>,
 					<<1,2,3,16#AA,16#7C,4,16#5F,5,16#5A>>,
 					Align),
-    ?line false = test_unaligned_order_1('=/=', <<1,2,3>>, <<1,2,3>>, Align),
-    ?line true = test_unaligned_order_1('==', <<4,5,6>>, <<4,5,6>>, Align),
-    ?line false = test_unaligned_order_1('/=', <<1,2,3>>, <<1,2,3>>, Align),
+    false = test_unaligned_order_1('=/=', <<1,2,3>>, <<1,2,3>>, Align),
+    true = test_unaligned_order_1('==', <<4,5,6>>, <<4,5,6>>, Align),
+    false = test_unaligned_order_1('/=', <<1,2,3>>, <<1,2,3>>, Align),
 
-    ?line true = test_unaligned_order_1('<', <<1,2>>, <<1,2,3>>, Align),
-    ?line true = test_unaligned_order_1('=<', <<1,2>>, <<1,2,3>>, Align),
-    ?line true = test_unaligned_order_1('=<', <<1,2,7,8>>, <<1,2,7,8>>, Align),
+    true = test_unaligned_order_1('<', <<1,2>>, <<1,2,3>>, Align),
+    true = test_unaligned_order_1('=<', <<1,2>>, <<1,2,3>>, Align),
+    true = test_unaligned_order_1('=<', <<1,2,7,8>>, <<1,2,7,8>>, Align),
     ok.
 
 test_unaligned_order_1(Op, A, B, {Aa,Ba}) ->
     erlang:Op(unaligned_sub_bin(A, Aa), unaligned_sub_bin(B, Ba)).
     
 test_terms(Test_Func) ->
-    ?line Test_Func(atom),
-    ?line Test_Func(''),
-    ?line Test_Func('a'),
-    ?line Test_Func('ab'),
-    ?line Test_Func('abc'),
-    ?line Test_Func('abcd'),
-    ?line Test_Func('abcde'),
-    ?line Test_Func('abcdef'),
-    ?line Test_Func('abcdefg'),
-    ?line Test_Func('abcdefgh'),
-
-    ?line Test_Func(fun() -> ok end),
+    Test_Func(atom),
+    Test_Func(''),
+    Test_Func('a'),
+    Test_Func('ab'),
+    Test_Func('abc'),
+    Test_Func('abcd'),
+    Test_Func('abcde'),
+    Test_Func('abcdef'),
+    Test_Func('abcdefg'),
+    Test_Func('abcdefgh'),
+
+    Test_Func(fun() -> ok end),
     X = id([a,{b,c},c]),
     Y = id({x,y,z}),
     Z = id(1 bsl 8*257),
-    ?line Test_Func(fun() -> X end),
-    ?line Test_Func(fun() -> {X,Y} end),
-    ?line Test_Func([fun() -> {X,Y,Z} end,
+    Test_Func(fun() -> X end),
+    Test_Func(fun() -> {X,Y} end),
+    Test_Func([fun() -> {X,Y,Z} end,
 		     fun() -> {Z,X,Y} end,
 		     fun() -> {Y,Z,X} end]),
 
-    ?line Test_Func({trace_ts,{even_bigger,{some_data,fun() -> ok end}},{1,2,3}}),
-    ?line Test_Func({trace_ts,{even_bigger,{some_data,<<1,2,3,4,5,6,7,8,9,10>>}},
+    Test_Func({trace_ts,{even_bigger,{some_data,fun() -> ok end}},{1,2,3}}),
+    Test_Func({trace_ts,{even_bigger,{some_data,<<1,2,3,4,5,6,7,8,9,10>>}},
 		     {1,2,3}}),
 
-    ?line Test_Func(1),
-    ?line Test_Func(42),
-    ?line Test_Func(-23),
-    ?line Test_Func(256),
-    ?line Test_Func(25555),
-    ?line Test_Func(-3333),
+    Test_Func(1),
+    Test_Func(42),
+    Test_Func(-23),
+    Test_Func(256),
+    Test_Func(25555),
+    Test_Func(-3333),
 
-    ?line Test_Func(1.0),
+    Test_Func(1.0),
 
-    ?line Test_Func(183749783987483978498378478393874),
-    ?line Test_Func(-37894183749783987483978498378478393874),
+    Test_Func(183749783987483978498378478393874),
+    Test_Func(-37894183749783987483978498378478393874),
     Very_Big = very_big_num(),
-    ?line Test_Func(Very_Big),
-    ?line Test_Func(-Very_Big+1),
-
-    ?line Test_Func([]),
-    ?line Test_Func("abcdef"),
-    ?line Test_Func([a, b, 1, 2]),
-    ?line Test_Func([a|b]),
-
-    ?line Test_Func({}),
-    ?line Test_Func({1}),
-    ?line Test_Func({a, b}),
-    ?line Test_Func({a, b, c}),
-    ?line Test_Func(list_to_tuple(lists:seq(0, 255))),
-    ?line Test_Func(list_to_tuple(lists:seq(0, 256))),
-
-    ?line Test_Func(make_ref()),
-    ?line Test_Func([make_ref(), make_ref()]),
-
-    ?line Test_Func(make_port()),
-
-    ?line Test_Func(make_pid()),
-
-    ?line Test_Func(Bin0 = list_to_binary(lists:seq(0, 14))),
-    ?line Test_Func(Bin1 = list_to_binary(lists:seq(0, ?heap_binary_size))),
-    ?line Test_Func(Bin2 = list_to_binary(lists:seq(0, ?heap_binary_size+1))),
-    ?line Test_Func(Bin3 = list_to_binary(lists:seq(0, 255))),
-
-    ?line Test_Func(make_unaligned_sub_binary(Bin0)),
-    ?line Test_Func(make_unaligned_sub_binary(Bin1)),
-    ?line Test_Func(make_unaligned_sub_binary(Bin2)),
-    ?line Test_Func(make_unaligned_sub_binary(Bin3)),
-
-    ?line Test_Func(make_sub_binary(lists:seq(42, 43))),
-    ?line Test_Func(make_sub_binary([42,43,44])),
-    ?line Test_Func(make_sub_binary([42,43,44,45])),
-    ?line Test_Func(make_sub_binary([42,43,44,45,46])),
-    ?line Test_Func(make_sub_binary([42,43,44,45,46,47])),
-    ?line Test_Func(make_sub_binary([42,43,44,45,46,47,48])),
-    ?line Test_Func(make_sub_binary(lists:seq(42, 49))),
-    ?line Test_Func(make_sub_binary(lists:seq(0, 14))),
-    ?line Test_Func(make_sub_binary(lists:seq(0, ?heap_binary_size))),
-    ?line Test_Func(make_sub_binary(lists:seq(0, ?heap_binary_size+1))),
-    ?line Test_Func(make_sub_binary(lists:seq(0, 255))),
-
-    ?line Test_Func(make_unaligned_sub_binary(lists:seq(42, 43))),
-    ?line Test_Func(make_unaligned_sub_binary([42,43,44])),
-    ?line Test_Func(make_unaligned_sub_binary([42,43,44,45])),
-    ?line Test_Func(make_unaligned_sub_binary([42,43,44,45,46])),
-    ?line Test_Func(make_unaligned_sub_binary([42,43,44,45,46,47])),
-    ?line Test_Func(make_unaligned_sub_binary([42,43,44,45,46,47,48])),
-    ?line Test_Func(make_unaligned_sub_binary(lists:seq(42, 49))),
-    ?line Test_Func(make_unaligned_sub_binary(lists:seq(0, 14))),
-    ?line Test_Func(make_unaligned_sub_binary(lists:seq(0, ?heap_binary_size))),
-    ?line Test_Func(make_unaligned_sub_binary(lists:seq(0, ?heap_binary_size+1))),
-    ?line Test_Func(make_unaligned_sub_binary(lists:seq(0, 255))),
+    Test_Func(Very_Big),
+    Test_Func(-Very_Big+1),
+
+    Test_Func([]),
+    Test_Func("abcdef"),
+    Test_Func([a, b, 1, 2]),
+    Test_Func([a|b]),
+
+    Test_Func({}),
+    Test_Func({1}),
+    Test_Func({a, b}),
+    Test_Func({a, b, c}),
+    Test_Func(list_to_tuple(lists:seq(0, 255))),
+    Test_Func(list_to_tuple(lists:seq(0, 256))),
+
+    Test_Func(make_ref()),
+    Test_Func([make_ref(), make_ref()]),
+
+    Test_Func(make_port()),
+
+    Test_Func(make_pid()),
+
+    Test_Func(Bin0 = list_to_binary(lists:seq(0, 14))),
+    Test_Func(Bin1 = list_to_binary(lists:seq(0, ?heap_binary_size))),
+    Test_Func(Bin2 = list_to_binary(lists:seq(0, ?heap_binary_size+1))),
+    Test_Func(Bin3 = list_to_binary(lists:seq(0, 255))),
+
+    Test_Func(make_unaligned_sub_binary(Bin0)),
+    Test_Func(make_unaligned_sub_binary(Bin1)),
+    Test_Func(make_unaligned_sub_binary(Bin2)),
+    Test_Func(make_unaligned_sub_binary(Bin3)),
+
+    Test_Func(make_sub_binary(lists:seq(42, 43))),
+    Test_Func(make_sub_binary([42,43,44])),
+    Test_Func(make_sub_binary([42,43,44,45])),
+    Test_Func(make_sub_binary([42,43,44,45,46])),
+    Test_Func(make_sub_binary([42,43,44,45,46,47])),
+    Test_Func(make_sub_binary([42,43,44,45,46,47,48])),
+    Test_Func(make_sub_binary(lists:seq(42, 49))),
+    Test_Func(make_sub_binary(lists:seq(0, 14))),
+    Test_Func(make_sub_binary(lists:seq(0, ?heap_binary_size))),
+    Test_Func(make_sub_binary(lists:seq(0, ?heap_binary_size+1))),
+    Test_Func(make_sub_binary(lists:seq(0, 255))),
+
+    Test_Func(make_unaligned_sub_binary(lists:seq(42, 43))),
+    Test_Func(make_unaligned_sub_binary([42,43,44])),
+    Test_Func(make_unaligned_sub_binary([42,43,44,45])),
+    Test_Func(make_unaligned_sub_binary([42,43,44,45,46])),
+    Test_Func(make_unaligned_sub_binary([42,43,44,45,46,47])),
+    Test_Func(make_unaligned_sub_binary([42,43,44,45,46,47,48])),
+    Test_Func(make_unaligned_sub_binary(lists:seq(42, 49))),
+    Test_Func(make_unaligned_sub_binary(lists:seq(0, 14))),
+    Test_Func(make_unaligned_sub_binary(lists:seq(0, ?heap_binary_size))),
+    Test_Func(make_unaligned_sub_binary(lists:seq(0, ?heap_binary_size+1))),
+    Test_Func(make_unaligned_sub_binary(lists:seq(0, 255))),
 
     %% Bit level binaries.
-    ?line Test_Func(<<1:1>>),
-    ?line Test_Func(<<2:2>>),
-    ?line Test_Func(<<42:10>>),
-    ?line Test_Func(list_to_bitstring([<<5:6>>|lists:seq(0, 255)])),
+    Test_Func(<<1:1>>),
+    Test_Func(<<2:2>>),
+    Test_Func(<<42:10>>),
+    Test_Func(list_to_bitstring([<<5:6>>|lists:seq(0, 255)])),
 
-    ?line Test_Func(F = fun(A) -> 42*A end),
-    ?line Test_Func(lists:duplicate(32, F)),
+    Test_Func(F = fun(A) -> 42*A end),
+    Test_Func(lists:duplicate(32, F)),
 
-    ?line Test_Func(FF = fun binary_SUITE:all/0),
-    ?line Test_Func(lists:duplicate(32, FF)),
+    Test_Func(FF = fun binary_SUITE:all/0),
+    Test_Func(lists:duplicate(32, FF)),
 
     ok.
 
 test_floats(Test_Func) ->
-    ?line Test_Func(5.5),
-    ?line Test_Func(-15.32),
-    ?line Test_Func(1.2435e25),
-    ?line Test_Func(1.2333e-20),
-    ?line Test_Func(199.0e+15),
+    Test_Func(5.5),
+    Test_Func(-15.32),
+    Test_Func(1.2435e25),
+    Test_Func(1.2333e-20),
+    Test_Func(199.0e+15),
     ok.
 
 very_big_num() ->
     very_big_num(33, 1).
 
 very_big_num(Left, Result) when Left > 0 ->
-    ?line very_big_num(Left-1, Result*256);
+    very_big_num(Left-1, Result*256);
 very_big_num(0, Result) ->
-    ?line Result.
+    Result.
 
 make_port() ->
-    ?line open_port({spawn, efile}, [eof]).
+    open_port({spawn, efile}, [eof]).
 
 make_pid() ->
-    ?line spawn_link(?MODULE, sleeper, []).
+    spawn_link(?MODULE, sleeper, []).
 
 sleeper() ->
-    ?line receive after infinity -> ok end.
+    receive after infinity -> ok end.
 
 
 %% Test that binaries are garbage collected properly.
@@ -1218,7 +1205,7 @@ gc_test1(Pid) ->
     receive
 	{Pid,done} -> ok
     after 10000 ->
-	    ?line ?t:fail()
+	    ct:fail("timeout")
     end.
 
 %% Like split binary, but returns REFC binaries. Only useful for gc_test/1.
@@ -1237,7 +1224,7 @@ gc() ->
 gc1() -> ok.
 
 bit_sized_binary_sizes(Config) when is_list(Config) ->
-    ?line [bsbs_1(A) || A <- lists:seq(1, 8)],
+    [bsbs_1(A) || A <- lists:seq(1, 8)],
     ok.
 
 bsbs_1(A) ->
@@ -1279,13 +1266,13 @@ obsolete_funs(Config) when is_list(Config) ->
     X = id({1,2,3}),
     Y = id([a,b,c,d]),
     Z = id({x,y,z}),
-    ?line obsolete_fun(fun() -> ok end),
-    ?line obsolete_fun(fun() -> X end),
-    ?line obsolete_fun(fun(A) -> {A,X} end),
-    ?line obsolete_fun(fun() -> {X,Y} end),
-    ?line obsolete_fun(fun() -> {X,Y,Z} end),
+    obsolete_fun(fun() -> ok end),
+    obsolete_fun(fun() -> X end),
+    obsolete_fun(fun(A) -> {A,X} end),
+    obsolete_fun(fun() -> {X,Y} end),
+    obsolete_fun(fun() -> {X,Y,Z} end),
 
-    ?line obsolete_fun(fun ?MODULE:all/1),
+    obsolete_fun(fun ?MODULE:all/1),
 
     erts_debug:set_internal_state(available_internal_state, false),
     ok.
@@ -1312,41 +1299,41 @@ no_fun_roundtrip(Term) ->
 %% but recognized by binary_to_term/1.
 
 robustness(Config) when is_list(Config) ->
-    ?line [] = binary_to_term_stress(<<131,107,0,0>>),	%Empty string.
-    ?line [] = binary_to_term_stress(<<131,108,0,0,0,0,106>>),	%Zero-length list.
+    [] = binary_to_term_stress(<<131,107,0,0>>),	%Empty string.
+    [] = binary_to_term_stress(<<131,108,0,0,0,0,106>>),	%Zero-length list.
 
     %% {[],a} where [] is a zero-length list.
-    ?line {[],a} = binary_to_term_stress(<<131,104,2,108,0,0,0,0,106,100,0,1,97>>),
+    {[],a} = binary_to_term_stress(<<131,104,2,108,0,0,0,0,106,100,0,1,97>>),
 
     %% {42,a} where 42 is a zero-length list with 42 in the tail.
-    ?line {42,a} = binary_to_term_stress(<<131,104,2,108,0,0,0,0,97,42,100,0,1,97>>),
+    {42,a} = binary_to_term_stress(<<131,104,2,108,0,0,0,0,97,42,100,0,1,97>>),
 
     %% {{x,y},a} where {x,y} is a zero-length list with {x,y} in the tail.
-    ?line {{x,y},a} = binary_to_term_stress(<<131,104,2,108,0,0,0,0,
+    {{x,y},a} = binary_to_term_stress(<<131,104,2,108,0,0,0,0,
 				      104,2,100,0,1,120,100,0,1,
 				      121,100,0,1,97>>),
 
     %% Bignums fitting in 32 bits.
-    ?line 16#7FFFFFFF = binary_to_term_stress(<<131,98,127,255,255,255>>),
-    ?line -1 = binary_to_term_stress(<<131,98,255,255,255,255>>),
+    16#7FFFFFFF = binary_to_term_stress(<<131,98,127,255,255,255>>),
+    -1 = binary_to_term_stress(<<131,98,255,255,255,255>>),
     
     ok.
 
 %% OTP-8180: Test several terms that have been known to crash the emulator.
 %% (Thanks to Scott Lystig Fritchie.)
 otp_8180(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line Wc = filename:join(Data, "zzz.*"),
+    Data = proplists:get_value(data_dir, Config),
+    Wc = filename:join(Data, "zzz.*"),
     Files = filelib:wildcard(Wc),
     [run_otp_8180(F) || F <- Files],
     ok.
 
 run_otp_8180(Name) ->
     io:format("~s", [Name]),
-    ?line {ok,Bins} = file:consult(Name),
+    {ok,Bins} = file:consult(Name),
     [begin
 	 io:format("~p\n", [Bin]),
-	 ?line {'EXIT',{badarg,_}} = (catch binary_to_term_stress(Bin))
+	 {'EXIT',{badarg,_}} = (catch binary_to_term_stress(Bin))
      end || Bin <- Bins],
     ok.
 
@@ -1518,7 +1505,7 @@ cmp_old_impl(Config) when is_list(Config) ->
 	false ->
 	    {skipped, "No "++Rel++" available"};
 	true ->
-	    {ok, Node} = ?t:start_node(list_to_atom(atom_to_list(?MODULE)++"_"++Rel),
+	    {ok, Node} = test_server:start_node(list_to_atom(atom_to_list(?MODULE)++"_"++Rel),
 				       peer,
 				       [{args, " -setcookie "++Cookie},
 					{erl, [{release, Rel}]}]),
@@ -1560,7 +1547,7 @@ cmp_old_impl(Config) when is_list(Config) ->
 	    cmp_node(Node, {erlang, bitstring_to_list, [list_to_bitstring(list2bitstrlist(mk_list(1000000)))]}),
 	    cmp_node(Node, {erlang, bitstring_to_list, [list_to_bitstring(list2bitstrlist(mk_list(10000000)))]}),
 
-	    ?t:stop_node(Node),
+	    test_server:stop_node(Node),
 
 	    ok
     end.
@@ -1604,7 +1591,7 @@ bit_sized_binary(Bin0) ->
 
 unaligned_sub_bin(Bin, 0) -> Bin;
 unaligned_sub_bin(Bin0, Offs) ->
-    F = random:uniform(256),
+    F = rand:uniform(256),
     Roffs = 8-Offs,
     Bin1 = <<F:Offs,Bin0/binary,F:Roffs>>,
     Sz = size(Bin0),
diff --git a/erts/emulator/test/bs_bincomp_SUITE.erl b/erts/emulator/test/bs_bincomp_SUITE.erl
index dcd13c19df..8836fe40ae 100644
--- a/erts/emulator/test/bs_bincomp_SUITE.erl
+++ b/erts/emulator/test/bs_bincomp_SUITE.erl
@@ -131,7 +131,7 @@ tracing(Config) when is_list(Config) ->
 
 random_binary() ->
     Seq = [1,2,3,4,5,6,7,8,9,10],
-    << <<($a + random:uniform($z - $a)):8>> || _ <- Seq >>.
+    << <<($a + rand:uniform($z - $a)):8>> || _ <- Seq >>.
 
 random_binaries(N) when N > 0 ->
     random_binary(),
diff --git a/erts/emulator/test/bs_bit_binaries_SUITE.erl b/erts/emulator/test/bs_bit_binaries_SUITE.erl
index a07fd7609c..dd056d10af 100644
--- a/erts/emulator/test/bs_bit_binaries_SUITE.erl
+++ b/erts/emulator/test/bs_bit_binaries_SUITE.erl
@@ -30,7 +30,7 @@
 	 big_binary_to_and_from_list/1,send_and_receive/1,
 	 send_and_receive_alot/1,append/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -57,9 +57,9 @@ end_per_group(_GroupName, Config) ->
 
 
 misc(Config) when is_list(Config) ->
-    ?line <<1:100>> = id(<<1:100>>),
-    ?line {ok,ok} = {match(7),match(9)},
-    ?line {ok,ok} = {match1(15),match1(31)},
+    <<1:100>> = id(<<1:100>>),
+    {ok,ok} = {match(7),match(9)},
+    {ok,ok} = {match1(15),match1(31)},
     ok.
 
 
@@ -76,70 +76,70 @@ match1(N) ->
     ok.
 
 test_bit_size(Config) when is_list(Config) ->
-    ?line 101 = bit_size(<<1:101>>),
-    ?line 1001 = bit_size(<<1:1001>>),
-    ?line 80 = bit_size(<<1:80>>),
-    ?line 800 = bit_size(<<1:800>>),
-    ?line Bin = <<0:16#1000000>>,
-    ?line BigBin = list_to_bitstring([Bin||_ <- lists:seq(1,16#10)]++[<<1:1>>]),
-    ?line 16#10000001 = erlang:bit_size(BigBin),
+    101 = bit_size(<<1:101>>),
+    1001 = bit_size(<<1:1001>>),
+    80 = bit_size(<<1:80>>),
+    800 = bit_size(<<1:800>>),
+    Bin = <<0:16#1000000>>,
+    BigBin = list_to_bitstring([Bin||_ <- lists:seq(1,16#10)]++[<<1:1>>]),
+    16#10000001 = erlang:bit_size(BigBin),
     %% Only run these on computers with lots of memory
     %% HugeBin = list_to_bitstring([BigBin||_ <- lists:seq(1,16#10)]++[<<1:1>>]),
     %% 16#100000011 = bit_size(HugeBin), 
-    ?line 0 = bit_size(<<>>),
+    0 = bit_size(<<>>),
     ok.
 
 horrid_match(Config) when is_list(Config) ->
-    ?line <<1:4,B:24/bitstring>> = <<1:4,42:24/little>>,
-    ?line <<42:24/little>> = B, 
+    <<1:4,B:24/bitstring>> = <<1:4,42:24/little>>,
+    <<42:24/little>> = B, 
     ok.
 			 
 test_bitstr(Config) when is_list(Config) ->
-    ?line <<1:7,B/bitstring>> = <<1:7,<<1:1,6>>/bitstring>>,
-    ?line <<1:1,6>> = B,
-    ?line B = <<1:1,6>>,
+    <<1:7,B/bitstring>> = <<1:7,<<1:1,6>>/bitstring>>,
+    <<1:1,6>> = B,
+    B = <<1:1,6>>,
   ok.
 		      
 asymmetric_tests(Config) when is_list(Config) ->
-    ?line <<1:12>> = <<0,1:4>>,
-    ?line <<0,1:4>> = <<1:12>>,
-    ?line <<1:1,X/bitstring>> = <<128,255,0,0:2>>,
-    ?line <<1,254,0,0:1>> = X,
-    ?line X = <<1,254,0,0:1>>,
-    ?line <<1:1,X1:25/bitstring>> = <<128,255,0,0:2>>,
-    ?line <<1,254,0,0:1>> = X1,
-    ?line X1 = <<1,254,0,0:1>>,
+    <<1:12>> = <<0,1:4>>,
+    <<0,1:4>> = <<1:12>>,
+    <<1:1,X/bitstring>> = <<128,255,0,0:2>>,
+    <<1,254,0,0:1>> = X,
+    X = <<1,254,0,0:1>>,
+    <<1:1,X1:25/bitstring>> = <<128,255,0,0:2>>,
+    <<1,254,0,0:1>> = X1,
+    X1 = <<1,254,0,0:1>>,
     ok.
 
 big_asymmetric_tests(Config) when is_list(Config) ->
-    ?line <<1:875,1:12>> = <<1:875,0,1:4>>,
-    ?line <<1:875,0,1:4>> = <<1:875,1:12>>,
-    ?line <<1:1,X/bitstring>> = <<128,255,0,0:2,1:875>>,
-    ?line <<1,254,0,0:1,1:875>> = X,
-    ?line X = <<1,254,0,0:1,1:875>>,
-    ?line <<1:1,X1:900/bitstring>> = <<128,255,0,0:2,1:875>>,
-    ?line <<1,254,0,0:1,1:875>> = X1,
-    ?line X1 = <<1,254,0,0:1,1:875>>,
+    <<1:875,1:12>> = <<1:875,0,1:4>>,
+    <<1:875,0,1:4>> = <<1:875,1:12>>,
+    <<1:1,X/bitstring>> = <<128,255,0,0:2,1:875>>,
+    <<1,254,0,0:1,1:875>> = X,
+    X = <<1,254,0,0:1,1:875>>,
+    <<1:1,X1:900/bitstring>> = <<128,255,0,0:2,1:875>>,
+    <<1,254,0,0:1,1:875>> = X1,
+    X1 = <<1,254,0,0:1,1:875>>,
   ok.
 
 binary_to_and_from_list(Config) when is_list(Config) ->
-    ?line <<1,2,3,4,1:1>> = list_to_bitstring(bitstring_to_list(<<1,2,3,4,1:1>>)),
-    ?line [1,2,3,4,<<1:1>>] = bitstring_to_list(<<1,2,3,4,1:1>>),
-    ?line <<1:1,1,2,3,4>> = list_to_bitstring([<<1:1>>,1,2,3,4]),
-    ?line [128,129,1,130,<<0:1>>] = bitstring_to_list(<<1:1,1,2,3,4>>),
+    <<1,2,3,4,1:1>> = list_to_bitstring(bitstring_to_list(<<1,2,3,4,1:1>>)),
+    [1,2,3,4,<<1:1>>] = bitstring_to_list(<<1,2,3,4,1:1>>),
+    <<1:1,1,2,3,4>> = list_to_bitstring([<<1:1>>,1,2,3,4]),
+    [128,129,1,130,<<0:1>>] = bitstring_to_list(<<1:1,1,2,3,4>>),
     ok.
  
 big_binary_to_and_from_list(Config) when is_list(Config) ->
-    ?line <<1:800,2,3,4,1:1>> = list_to_bitstring(bitstring_to_list(<<1:800,2,3,4,1:1>>)),
-    ?line [1,2,3,4|_Rest1] = bitstring_to_list(<<1,2,3,4,1:800,1:1>>),
-    ?line <<1:801,1,2,3,4>> = list_to_bitstring([<<1:801>>,1,2,3,4]),
+    <<1:800,2,3,4,1:1>> = list_to_bitstring(bitstring_to_list(<<1:800,2,3,4,1:1>>)),
+    [1,2,3,4|_Rest1] = bitstring_to_list(<<1,2,3,4,1:800,1:1>>),
+    <<1:801,1,2,3,4>> = list_to_bitstring([<<1:801>>,1,2,3,4]),
     ok.  
 
 send_and_receive(Config) when is_list(Config) -> 
-    ?line Bin = <<1,2:7>>,
+    Bin = <<1,2:7>>,
     Pid = spawn_link(fun() -> receiver(Bin) end),
-    ?line Pid ! {self(),<<1:7,8:5,Bin/bitstring>>},
-    ?line receive
+    Pid ! {self(),<<1:7,8:5,Bin/bitstring>>},
+    receive
 	      ok ->
 		  ok
 	  end.
@@ -176,8 +176,8 @@ receiver_alot(Bin) ->
 
 append(Config) when is_list(Config) ->
     cs_init(),
-    ?line <<(-1):256/signed-unit:8>> = cs(do_append(id(<<>>), 256*8)),
-    ?line <<(-1):256/signed-unit:8>> = cs(do_append2(id(<<>>), 256*4)),
+    <<(-1):256/signed-unit:8>> = cs(do_append(id(<<>>), 256*8)),
+    <<(-1):256/signed-unit:8>> = cs(do_append2(id(<<>>), 256*4)),
     <<(-1):256/signed-unit:8>> = cs(do_append3(id(<<>>), 256*8)),
     cs_end().
     
diff --git a/erts/emulator/test/bs_construct_SUITE.erl b/erts/emulator/test/bs_construct_SUITE.erl
index cadb30e1a4..8deb0c7422 100644
--- a/erts/emulator/test/bs_construct_SUITE.erl
+++ b/erts/emulator/test/bs_construct_SUITE.erl
@@ -22,40 +22,26 @@
 
 -module(bs_construct_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,
 	 test1/1, test2/1, test3/1, test4/1, test5/1, testf/1,
 	 not_used/1, in_guard/1,
 	 mem_leak/1, coerce_to_float/1, bjorn/1,
 	 huge_float_field/1, huge_binary/1, system_limit/1, badarg/1,
 	 copy_writable_binary/1, kostis/1, dynamic/1, bs_add/1,
-	 otp_7422/1, zero_width/1, bad_append/1]).
+	 otp_7422/1, zero_width/1, bad_append/1, bs_add_overflow/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 10}}].
 
 all() -> 
     [test1, test2, test3, test4, test5, testf, not_used,
      in_guard, mem_leak, coerce_to_float, bjorn,
      huge_float_field, huge_binary, system_limit, badarg,
      copy_writable_binary, kostis, dynamic, bs_add, otp_7422, zero_width,
-     bad_append].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
+     bad_append, bs_add_overflow].
 
 big(1) ->
     57285702734876389752897683.
@@ -68,9 +54,9 @@ r(L) ->
 -define(T(B, L), {B, ??B, L}).
 -define(N(B), {B, ??B, unknown}).
 
--define(FAIL(Expr), ?line fail_check(catch Expr, ??Expr, [])).
+-define(FAIL(Expr), fail_check(catch Expr, ??Expr, [])).
 
--define(FAIL_VARS(Expr, Vars), ?line fail_check(catch Expr, ??Expr, Vars)).
+-define(FAIL_VARS(Expr, Vars), fail_check(catch Expr, ??Expr, Vars)).
 
 l(I_13, I_big1) ->
     [
@@ -189,7 +175,7 @@ one_test({C_bin, E_bin, Str, Bytes}) when is_list(Bytes) ->
 	true ->
 	    io:format("ERROR: Compiled: ~p. Expected ~p. Got ~p.~n",
 		      [Str, Bytes, binary_to_list(C_bin)]),
-	    test_server:fail(comp)
+	    ct:fail(comp)
     end,
     if
 	E_bin == Bin ->
@@ -197,7 +183,7 @@ one_test({C_bin, E_bin, Str, Bytes}) when is_list(Bytes) ->
 	true ->
 	    io:format("ERROR: Interpreted: ~p. Expected ~p. Got ~p.~n",
 		      [Str, Bytes, binary_to_list(E_bin)]),
-	    test_server:fail(comp)
+	    ct:fail(comp)
     end;
 one_test({C_bin, E_bin, Str, Result}) ->
     io:format("  ~s ~p~n", [Str, C_bin]),
@@ -218,7 +204,7 @@ one_test({C_bin, E_bin, Str, Result}) ->
 		    io:format("ERROR: Compiled not equal to interpreted:"
 			      "~n ~p, ~p.~n",
 			      [binary_to_list(C_bin), binary_to_list(E_bin)]),
-		    test_server:fail(comp);
+		    ct:fail(comp);
 		0 ->
 		    ok;
 		%% For situations where the final bits may not matter, like
@@ -253,23 +239,22 @@ fail_check({'EXIT',{badarg,_}}, Str, Vars) ->
     try	evaluate(Str, Vars) of
 	Res ->
 	    io:format("Interpreted result: ~p", [Res]),
-	    ?t:fail(did_not_fail_in_intepreted_code)
+	    ct:fail(did_not_fail_in_intepreted_code)
     catch
 	error:badarg ->
 	    ok
     end;
 fail_check(Res, _, _) ->
     io:format("Compiled result: ~p", [Res]),
-    ?t:fail(did_not_fail_in_compiled_code).
+    ct:fail(did_not_fail_in_compiled_code).
 
 %%% Simple working cases
-test1(suite) -> [];
 test1(Config) when is_list(Config) ->
-    ?line I_13 = i(13),
-    ?line I_big1 = big(1),
-    ?line Vars = [{'I_13', I_13},
+    I_13 = i(13),
+    I_big1 = big(1),
+    Vars = [{'I_13', I_13},
 		  {'I_big1', I_big1}],
-    ?line lists:foreach(fun one_test/1, eval_list(l(I_13, I_big1), Vars)).
+    lists:foreach(fun one_test/1, eval_list(l(I_13, I_big1), Vars)).
 
 %%% Misc
 
@@ -285,10 +270,9 @@ gen(N, S, A) ->
 gen_l(N, S, A) ->
     [?T(<<A:S/little, A:(N-S)/little>>, comp(N, A, S))].
 
-test2(suite) -> [];
 test2(Config) when is_list(Config) ->
-    ?line test2(0, 8, 2#10101010101010101),
-    ?line test2(0, 8, 2#1111111111).
+    test2(0, 8, 2#10101010101010101),
+    test2(0, 8, 2#1111111111).
 
 test2(End, End, _) ->
     ok;
@@ -313,10 +297,9 @@ t3() ->
      ?N(<<>>)
     ].
 
-test3(suite) -> [];
 test3(Config) when is_list(Config) ->
-    ?line Vars = [],
-    ?line lists:foreach(fun one_test/1, eval_list(t3(), Vars)).
+    Vars = [],
+    lists:foreach(fun one_test/1, eval_list(t3(), Vars)).
 
 gen_u(N, S, A) ->
     [?N(<<A:S, A:(N-S)>>)].
@@ -324,10 +307,9 @@ gen_u(N, S, A) ->
 gen_u_l(N, S, A) ->
     [?N(<<A:S/little, A:(N-S)/little>>)].
 
-test4(suite) -> [];
 test4(Config) when is_list(Config) ->
-    ?line test4(0, 16, 2#10101010101010101),
-    ?line test4(0, 16, 2#1111111111).
+    test4(0, 16, 2#10101010101010101),
+    test4(0, 16, 2#1111111111).
 
 test4(End, End, _) ->
     ok;
@@ -345,11 +327,10 @@ gen_b(N, S, A) ->
     [?T(<<A:S/binary-unit:1, A:(N-S)/binary-unit:1>>,
 	binary_to_list(<<A:S/binary-unit:1, A:(N-S)/binary-unit:1>>))].
 
-test5(suite) -> [];
-test5(doc) -> ["OTP-3995"];
+%% OTP-3995
 test5(Config) when is_list(Config) ->
-    ?line test5(0, 8, <<73>>),
-    ?line test5(0, 8, <<68>>).
+    test5(0, 8, <<73>>),
+    test5(0, 8, <<68>>).
 
 test5(End, End, _) ->
     ok;
@@ -363,47 +344,46 @@ test5(S, A) ->
     lists:foreach(fun one_test/1, eval_list(gen_b(N, S, A), Vars)).
 
 %%% Failure cases
-testf(suite) -> [];
 testf(Config) when is_list(Config) ->
-    ?line ?FAIL(<<3.14>>),
-    ?line ?FAIL(<<<<1,2>>>>),
+    ?FAIL(<<3.14>>),
+    ?FAIL(<<<<1,2>>>>),
 
-    ?line ?FAIL(<<2.71/binary>>),
-    ?line ?FAIL(<<24334/binary>>),
-    ?line ?FAIL(<<24334344294788947129487129487219847/binary>>),
+    ?FAIL(<<2.71/binary>>),
+    ?FAIL(<<24334/binary>>),
+    ?FAIL(<<24334344294788947129487129487219847/binary>>),
     BigInt = id(24334344294788947129487129487219847),
-    ?line ?FAIL_VARS(<<BigInt/binary>>, [{'BigInt',BigInt}]),
-    ?line ?FAIL_VARS(<<42,BigInt/binary>>, [{'BigInt',BigInt}]),
-    ?line ?FAIL_VARS(<<BigInt:2/binary>>, [{'BigInt',BigInt}]),
+    ?FAIL_VARS(<<BigInt/binary>>, [{'BigInt',BigInt}]),
+    ?FAIL_VARS(<<42,BigInt/binary>>, [{'BigInt',BigInt}]),
+    ?FAIL_VARS(<<BigInt:2/binary>>, [{'BigInt',BigInt}]),
 
     %% One negative field size, but the sum of field sizes will be 1 byte.
     %% Make sure that we reject that properly.
     I_minus_777 = id(-777),
     I_minus_2047 = id(-2047),
-    ?line ?FAIL_VARS(<<I_minus_777:2048/unit:8,57:I_minus_2047/unit:8>>,
+    ?FAIL_VARS(<<I_minus_777:2048/unit:8,57:I_minus_2047/unit:8>>,
 		     ordsets:from_list([{'I_minus_777',I_minus_777},
 					{'I_minus_2047',I_minus_2047}])),
-    ?line ?FAIL(<<<<1,2,3>>/float>>),
+    ?FAIL(<<<<1,2,3>>/float>>),
 
     %% Negative field widths.
-    ?line testf_1(-8, <<1,2,3,4,5>>),
-    ?line ?FAIL(<<0:(-(1 bsl 100))>>),
+    testf_1(-8, <<1,2,3,4,5>>),
+    ?FAIL(<<0:(-(1 bsl 100))>>),
 
-    ?line ?FAIL(<<42:(-16)>>),
-    ?line ?FAIL(<<3.14:(-8)/float>>),
-    ?line ?FAIL(<<<<23,56,0,2>>:(-16)/binary>>),
-    ?line ?FAIL(<<<<23,56,0,2>>:(2.5)/binary>>),
-    ?line ?FAIL(<<<<23,56,0,2>>:(anka)>>),
-    ?line ?FAIL(<<<<23,56,0,2>>:(anka)>>),
+    ?FAIL(<<42:(-16)>>),
+    ?FAIL(<<3.14:(-8)/float>>),
+    ?FAIL(<<<<23,56,0,2>>:(-16)/binary>>),
+    ?FAIL(<<<<23,56,0,2>>:(2.5)/binary>>),
+    ?FAIL(<<<<23,56,0,2>>:(anka)>>),
+    ?FAIL(<<<<23,56,0,2>>:(anka)>>),
 
     %% Unit failures.
-    ?line ?FAIL(<<<<1:1>>/binary>>),
+    ?FAIL(<<<<1:1>>/binary>>),
     Sz = id(1),
-    ?line ?FAIL_VARS(<<<<1:Sz>>/binary>>, [{'Sz',Sz}]),
-    ?line {'EXIT',{badarg,_}} = (catch <<<<1:(id(1))>>/binary>>),
-    ?line ?FAIL(<<<<7,8,9>>/binary-unit:16>>),
-    ?line ?FAIL(<<<<7,8,9,3:7>>/binary-unit:16>>),
-    ?line ?FAIL(<<<<7,8,9,3:7>>/binary-unit:17>>),
+    ?FAIL_VARS(<<<<1:Sz>>/binary>>, [{'Sz',Sz}]),
+    {'EXIT',{badarg,_}} = (catch <<<<1:(id(1))>>/binary>>),
+    ?FAIL(<<<<7,8,9>>/binary-unit:16>>),
+    ?FAIL(<<<<7,8,9,3:7>>/binary-unit:16>>),
+    ?FAIL(<<<<7,8,9,3:7>>/binary-unit:17>>),
 
     ok.
 
@@ -413,14 +393,13 @@ testf_1(W, B) ->
     ?FAIL_VARS(<<3.14:W/float>>, Vars),
     ?FAIL_VARS(<<B:W/binary>>, [{'B',B}|Vars]).
 
-not_used(doc) ->
-    "Test that constructed binaries that are not used will still give an exception.";
+%% Test that constructed binaries that are not used will still give an exception.
 not_used(Config) when is_list(Config) ->
-    ?line ok = not_used1(3, <<"dum">>),
-    ?line {'EXIT',{badarg,_}} = (catch not_used1(3, "dum")),
-    ?line {'EXIT',{badarg,_}} = (catch not_used2(444, -2)),
-    ?line {'EXIT',{badarg,_}} = (catch not_used2(444, anka)),
-    ?line {'EXIT',{badarg,_}} = (catch not_used3(444)),
+    ok = not_used1(3, <<"dum">>),
+    {'EXIT',{badarg,_}} = (catch not_used1(3, "dum")),
+    {'EXIT',{badarg,_}} = (catch not_used2(444, -2)),
+    {'EXIT',{badarg,_}} = (catch not_used2(444, anka)),
+    {'EXIT',{badarg,_}} = (catch not_used3(444)),
     ok.
 
 not_used1(I, BinString) ->
@@ -436,11 +415,11 @@ not_used3(I) ->
     ok.
 
 in_guard(Config) when is_list(Config) ->
-    ?line 1 = in_guard(<<16#74ad:16>>, 16#e95, 5),
-    ?line 2 = in_guard(<<16#3A,16#F7,"hello">>, 16#3AF7, <<"hello">>),
-    ?line 3 = in_guard(<<16#FBCD:14,3.1415/float,3:2>>, 16#FBCD, 3.1415),
-    ?line 3 = in_guard(<<16#FBCD:14,3/float,3:2>>, 16#FBCD, 3),
-    ?line 3 = in_guard(<<16#FBCD:14,(2 bsl 226)/float,3:2>>, 16#FBCD, 2 bsl 226),
+    1 = in_guard(<<16#74ad:16>>, 16#e95, 5),
+    2 = in_guard(<<16#3A,16#F7,"hello">>, 16#3AF7, <<"hello">>),
+    3 = in_guard(<<16#FBCD:14,3.1415/float,3:2>>, 16#FBCD, 3.1415),
+    3 = in_guard(<<16#FBCD:14,3/float,3:2>>, 16#FBCD, 3),
+    3 = in_guard(<<16#FBCD:14,(2 bsl 226)/float,3:2>>, 16#FBCD, 2 bsl 226),
     nope = in_guard(<<1>>, 42, b),
     nope = in_guard(<<1>>, a, b),
     nope = in_guard(<<1,2>>, 1, 1),
@@ -454,16 +433,16 @@ in_guard(Bin, A, B) when <<A:14,B/float,3:2>> == Bin -> 3;
 in_guard(Bin, A, B) when {a,b,<<A:14,B/float,3:2>>} == Bin -> cant_happen;
 in_guard(_, _, _) -> nope.
 
-mem_leak(doc) -> "Make sure that construction has no memory leak";
+%% Make sure that construction has no memory leak
 mem_leak(Config) when is_list(Config) ->
-    ?line B = make_bin(16, <<0>>),
-    ?line mem_leak(1024, B),
+    B = make_bin(16, <<0>>),
+    mem_leak(1024, B),
     ok.
 
 mem_leak(0, _) -> ok;
 mem_leak(N, B) ->
-    ?line big_bin(B, <<23>>),
-    ?line {'EXIT',{badarg,_}} = (catch big_bin(B, bad)),
+    big_bin(B, <<23>>),
+    {'EXIT',{badarg,_}} = (catch big_bin(B, bad)),
     mem_leak(N-1, B).
 
 big_bin(B1, B2) ->
@@ -477,18 +456,18 @@ make_bin(0, Acc) -> Acc;
 make_bin(N, Acc) -> make_bin(N-1, <<Acc/binary,Acc/binary>>).
 
 -define(COF(Int0),
-	?line (fun(Int) ->
+	(fun(Int) ->
 		       true = <<Int:32/float>> =:= <<(float(Int)):32/float>>,
 		       true = <<Int:64/float>> =:= <<(float(Int)):64/float>>
 			   end)(nonliteral(Int0)),
- 	?line true = <<Int0:32/float>> =:= <<(float(Int0)):32/float>>,
- 	?line true = <<Int0:64/float>> =:= <<(float(Int0)):64/float>>).
+ 	true = <<Int0:32/float>> =:= <<(float(Int0)):32/float>>,
+ 	true = <<Int0:64/float>> =:= <<(float(Int0)):64/float>>).
 
 -define(COF64(Int0),
-	?line (fun(Int) ->
+	(fun(Int) ->
 		       true = <<Int:64/float>> =:= <<(float(Int)):64/float>>
 			   end)(nonliteral(Int0)),
- 	?line true = <<Int0:64/float>> =:= <<(float(Int0)):64/float>>).
+ 	true = <<Int0:64/float>> =:= <<(float(Int0)):64/float>>).
 
 nonliteral(X) -> X.
     
@@ -507,7 +486,7 @@ coerce_to_float(Config) when is_list(Config) ->
     ok.
 
 bjorn(Config) when is_list(Config) ->
-    ?line error = bjorn_1(),
+    error = bjorn_1(),
     ok.
 
 bjorn_1() ->
@@ -535,32 +514,47 @@ do_something() ->
     throw(blurf).
 
 huge_float_field(Config) when is_list(Config) ->
-    ?line {'EXIT',{badarg,_}} = (catch <<0.0:9/float-unit:8>>),
-    ?line huge_float_check(catch <<0.0:67108865/float-unit:64>>),
-    ?line huge_float_check(catch <<0.0:((1 bsl 26)+1)/float-unit:64>>),
-    ?line huge_float_check(catch <<0.0:(id(67108865))/float-unit:64>>),
-%%  ?line huge_float_check(catch <<0.0:((1 bsl 60)+1)/float-unit:64>>),
-    ?line huge_float_check(catch <<3839739387439387383739387987347983:((1 bsl 26)+1)/float-unit:64>>),
-%%  ?line huge_float_check(catch <<3839739387439387383739387987347983:((1 bsl 60)+1)/float-unit:64>>),
+    {'EXIT',{badarg,_}} = (catch <<0.0:9/float-unit:8>>),
+    huge_float_check(catch <<0.0:67108865/float-unit:64>>),
+    huge_float_check(catch <<0.0:((1 bsl 26)+1)/float-unit:64>>),
+    huge_float_check(catch <<0.0:(id(67108865))/float-unit:64>>),
+%%  huge_float_check(catch <<0.0:((1 bsl 60)+1)/float-unit:64>>),
+    huge_float_check(catch <<3839739387439387383739387987347983:((1 bsl 26)+1)/float-unit:64>>),
+%%  huge_float_check(catch <<3839739387439387383739387987347983:((1 bsl 60)+1)/float-unit:64>>),
     ok.
 
 huge_float_check({'EXIT',{system_limit,_}}) -> ok;
 huge_float_check({'EXIT',{badarg,_}}) -> ok.
 
 huge_binary(Config) when is_list(Config) ->
-    ?line 16777216 = size(<<0:(id(1 bsl 26)),(-1):(id(1 bsl 26))>>),
-    ?line garbage_collect(),
+    ct:timetrap({seconds, 30}),
+    16777216 = size(<<0:(id(1 bsl 26)),(-1):(id(1 bsl 26))>>),
+    garbage_collect(),
     {Shift,Return} = case free_mem() of
-			 undefined -> {32,ok};
-			 Mb when Mb > 600 -> {32,ok};
-			 Mb when Mb > 300 -> {31,"Limit huge binaries to 256 Mb"};
-			 _ -> {30,"Limit huge binary to 128 Mb"}
+			 undefined ->
+			     %% This test has to be inlined inside the case to
+			     %% use a literal Shift
+			     garbage_collect(),
+			     id(<<0:((1 bsl 32)-1)>>),
+			     {32,ok};
+			 Mb when Mb > 600 ->
+			     garbage_collect(),
+			     id(<<0:((1 bsl 32)-1)>>),
+			     {32,ok};
+			 Mb when Mb > 300 ->
+			     garbage_collect(),
+			     id(<<0:((1 bsl 31)-1)>>),
+			     {31,"Limit huge binaries to 256 Mb"};
+			 _ ->
+			     garbage_collect(),
+			     id(<<0:((1 bsl 30)-1)>>),
+			     {30,"Limit huge binary to 128 Mb"}
 		     end,
-    ?line garbage_collect(),
-    ?line id(<<0:((1 bsl Shift)-1)>>),
-    ?line garbage_collect(),
-    ?line id(<<0:(id((1 bsl Shift)-1))>>),
-    ?line garbage_collect(),
+    garbage_collect(),
+    id(<<0:((1 bsl Shift)-1)>>),
+    garbage_collect(),
+    id(<<0:(id((1 bsl Shift)-1))>>),
+    garbage_collect(),
     case Return of
 	ok -> ok;	     
 	Comment -> {comment, Comment}
@@ -595,16 +589,16 @@ free_mem() ->
 system_limit(Config) when is_list(Config) ->
     WordSize = erlang:system_info(wordsize),
     BitsPerWord = WordSize * 8,
-    ?line {'EXIT',{system_limit,_}} =
+    {'EXIT',{system_limit,_}} =
 	(catch <<0:(id(0)),42:(id(1 bsl BitsPerWord))>>),
-    ?line {'EXIT',{system_limit,_}} =
+    {'EXIT',{system_limit,_}} =
 	(catch <<42:(id(1 bsl BitsPerWord)),0:(id(0))>>),
-    ?line {'EXIT',{system_limit,_}} =
+    {'EXIT',{system_limit,_}} =
 	(catch <<(id(<<>>))/binary,0:(id(1 bsl 100))>>),
 
     %% Would fail to load.
-    ?line {'EXIT',{system_limit,_}} = (catch <<0:(1 bsl 67)>>),
-    ?line {'EXIT',{system_limit,_}} = (catch <<0:((1 bsl 64)+1)>>),
+    {'EXIT',{system_limit,_}} = (catch <<0:(1 bsl 67)>>),
+    {'EXIT',{system_limit,_}} = (catch <<0:((1 bsl 64)+1)>>),
 
     case WordSize of
 	4 ->
@@ -614,60 +608,59 @@ system_limit(Config) when is_list(Config) ->
     end.
 
 system_limit_32() ->
-    ?line {'EXIT',{badarg,_}} = (catch <<42:(-1)>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<42:(id(-1))>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<42:(id(-389739873536870912))/unit:8>>),
-    ?line {'EXIT',{system_limit,_}} = (catch <<42:536870912/unit:8>>),
-    ?line {'EXIT',{system_limit,_}} = (catch <<42:(id(536870912))/unit:8>>),
-    ?line {'EXIT',{system_limit,_}} = (catch <<0:(id(8)),42:536870912/unit:8>>),
-    ?line {'EXIT',{system_limit,_}} =
+    {'EXIT',{badarg,_}} = (catch <<42:(-1)>>),
+    {'EXIT',{badarg,_}} = (catch <<42:(id(-1))>>),
+    {'EXIT',{badarg,_}} = (catch <<42:(id(-389739873536870912))/unit:8>>),
+    {'EXIT',{system_limit,_}} = (catch <<42:536870912/unit:8>>),
+    {'EXIT',{system_limit,_}} = (catch <<42:(id(536870912))/unit:8>>),
+    {'EXIT',{system_limit,_}} = (catch <<0:(id(8)),42:536870912/unit:8>>),
+    {'EXIT',{system_limit,_}} =
 	(catch <<0:(id(8)),42:(id(536870912))/unit:8>>),
 
     %% The size would be silently truncated, resulting in a crash.
-    ?line {'EXIT',{system_limit,_}} = (catch <<0:(1 bsl 35)>>),
-    ?line {'EXIT',{system_limit,_}} = (catch <<0:((1 bsl 32)+1)>>),
+    {'EXIT',{system_limit,_}} = (catch <<0:(1 bsl 35)>>),
+    {'EXIT',{system_limit,_}} = (catch <<0:((1 bsl 32)+1)>>),
 
     %% Would fail to load.
-    ?line {'EXIT',{system_limit,_}} = (catch <<0:(1 bsl 43)>>),
-    ?line {'EXIT',{system_limit,_}} = (catch <<0:((1 bsl 40)+1)>>),
+    {'EXIT',{system_limit,_}} = (catch <<0:(1 bsl 43)>>),
+    {'EXIT',{system_limit,_}} = (catch <<0:((1 bsl 40)+1)>>),
     ok.
 
 badarg(Config) when is_list(Config) ->
-    ?line {'EXIT',{badarg,_}} =
+    {'EXIT',{badarg,_}} =
 	(catch <<0:(id(1 bsl 100)),0:(id(-1))>>),
-    ?line {'EXIT',{badarg,_}} =
+    {'EXIT',{badarg,_}} =
 	(catch <<0:(id(1 bsl 100)),0:(id(-(1 bsl 70)))>>),
-    ?line {'EXIT',{badarg,_}} =
+    {'EXIT',{badarg,_}} =
 	(catch <<0:(id(-(1 bsl 70))),0:(id(1 bsl 100))>>),
 
-    ?line {'EXIT',{badarg,_}} =
+    {'EXIT',{badarg,_}} =
 	(catch <<(id(<<>>))/binary,0:(id(-(1 bsl 100)))>>),
 
     ok.
 
 copy_writable_binary(Config) when is_list(Config) ->
-    ?line [copy_writable_binary_1(I) || I <- lists:seq(0, 256)],
+    [copy_writable_binary_1(I) || I <- lists:seq(0, 256)],
     ok.
 
 copy_writable_binary_1(_) ->
-    ?line Bin0 = <<(id(<<>>))/binary,0,1,2,3,4,5,6,7>>,
-    ?line SubBin = make_sub_bin(Bin0),
-    ?line id(<<42,34,55,Bin0/binary>>),		%Make reallocation likelier.
-    ?line Pid = spawn(fun() ->
+    Bin0 = <<(id(<<>>))/binary,0,1,2,3,4,5,6,7>>,
+    SubBin = make_sub_bin(Bin0),
+    id(<<42,34,55,Bin0/binary>>),		%Make reallocation likelier.
+    Pid = spawn(fun() ->
 			      copy_writable_binary_holder(Bin0, SubBin)
 		      end),
-    ?line Tab = ets:new(holder, []),
-    ?line ets:insert(Tab, {17,Bin0}),
-    ?line ets:insert(Tab, {42,SubBin}),
-    ?line id(<<Bin0/binary,0:(64*1024*8)>>),
-    ?line Pid ! self(),
-    ?line [{17,Bin0}] = ets:lookup(Tab, 17),
-    ?line [{42,Bin0}] = ets:lookup(Tab, 42),
+    Tab = ets:new(holder, []),
+    ets:insert(Tab, {17,Bin0}),
+    ets:insert(Tab, {42,SubBin}),
+    id(<<Bin0/binary,0:(64*1024*8)>>),
+    Pid ! self(),
+    [{17,Bin0}] = ets:lookup(Tab, 17),
+    [{42,Bin0}] = ets:lookup(Tab, 42),
     receive
 	{Pid,Bin0,Bin0} -> ok;
 	Other ->
-	    io:format("Unexpected message: ~p", [Other]),
-	    ?line ?t:fail()
+	    ct:fail("Unexpected message: ~p", [Other])
     end,
     ok.
 
@@ -708,8 +701,8 @@ have_250_terabytes_of_ram() -> false.
 %% give the same result.
 
 dynamic(Config) when is_list(Config) ->
-    ?line dynamic_1(fun dynamic_big/5),
-    ?line dynamic_1(fun dynamic_little/5),
+    dynamic_1(fun dynamic_big/5),
+    dynamic_1(fun dynamic_little/5),
     ok.
 		      
 dynamic_1(Dynamic) ->
@@ -788,32 +781,32 @@ bs_add(Config) when is_list(Config) ->
 	 return],
 
     %% Write assembly file and assemble it.
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line RootName = filename:join(PrivDir, atom_to_list(Mod)),
-    ?line AsmFile = RootName ++ ".S",
-    ?line {ok,Fd} = file:open(AsmFile, [write]),
-    ?line [io:format(Fd, "~p. \n", [T]) || T <- Code],
-    ?line ok = file:close(Fd),
-    ?line {ok,Mod} = compile:file(AsmFile, [from_asm,report,{outdir,PrivDir}]),
-    ?line LoadRc = code:load_abs(RootName),
-    ?line {module,_Module} = LoadRc,
+    PrivDir = proplists:get_value(priv_dir, Config),
+    RootName = filename:join(PrivDir, atom_to_list(Mod)),
+    AsmFile = RootName ++ ".S",
+    {ok,Fd} = file:open(AsmFile, [write]),
+    [io:format(Fd, "~p. \n", [T]) || T <- Code],
+    ok = file:close(Fd),
+    {ok,Mod} = compile:file(AsmFile, [from_asm,report,{outdir,PrivDir}]),
+    LoadRc = code:load_abs(RootName),
+    {module,_Module} = LoadRc,
 
     %% Find smallest positive bignum.
-    ?line SmallestBig = smallest_big(),
-    ?line io:format("~p\n", [SmallestBig]),
-    ?line Expected = SmallestBig + N,
+    SmallestBig = smallest_big(),
+    io:format("~p\n", [SmallestBig]),
+    Expected = SmallestBig + N,
     DoTest = fun() ->
 		     exit(Mod:bs_add(SmallestBig, -SmallestBig))
 	     end,
-    ?line {Pid,Mref} = spawn_monitor(DoTest),
+    {Pid,Mref} = spawn_monitor(DoTest),
     receive
 	{'DOWN',Mref,process,Pid,Res} -> ok
     end,
-    ?line Expected = Res,
+    Expected = Res,
 
     %% Clean up.
-    ?line ok = file:delete(AsmFile),
-    ?line ok = file:delete(code:which(Mod)),
+    ok = file:delete(AsmFile),
+    ok = file:delete(code:which(Mod)),
     ok.
 
      
@@ -854,17 +847,17 @@ otp_7422_bin(N) when N < 512 ->
 otp_7422_bin(_) -> ok.
 
 zero_width(Config) when is_list(Config) ->
-    ?line Z = id(0),
+    Z = id(0),
     Small = id(42),
     Big = id(1 bsl 128),
-    ?line <<>> = <<Small:Z>>,
-    ?line <<>> = <<Small:0>>,
-    ?line <<>> = <<Big:Z>>,
-    ?line <<>> = <<Big:0>>,
+    <<>> = <<Small:Z>>,
+    <<>> = <<Small:0>>,
+    <<>> = <<Big:Z>>,
+    <<>> = <<Big:0>>,
     
-    ?line {'EXIT',{badarg,_}} = (catch <<not_a_number:0>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<(id(not_a_number)):Z>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<(id(not_a_number)):0>>),
+    {'EXIT',{badarg,_}} = (catch <<not_a_number:0>>),
+    {'EXIT',{badarg,_}} = (catch <<(id(not_a_number)):Z>>),
+    {'EXIT',{badarg,_}} = (catch <<(id(not_a_number)):0>>),
 
     ok.
 
@@ -911,5 +904,19 @@ append_unit_8(Bin) ->
 append_unit_16(Bin) ->
     <<Bin/binary-unit:16,0:1>>.
 
+%% Produce a large result of bs_add that, if cast to signed int, would overflow
+%% into a negative number that fits a smallnum.
+bs_add_overflow(Config) ->
+    case erlang:system_info(wordsize) of
+	8 ->
+	    {skip, "64-bit architecture"};
+	4 ->
+	    Large = <<0:((1 bsl 30)-1)>>,
+	    {'EXIT',{system_limit,_}} =
+		(catch <<Large/bits, Large/bits, Large/bits, Large/bits,
+                         Large/bits, Large/bits, Large/bits, Large/bits,
+                         Large/bits>>),
+	    ok
+    end.
     
 id(I) -> I.
diff --git a/erts/emulator/test/bs_match_bin_SUITE.erl b/erts/emulator/test/bs_match_bin_SUITE.erl
index ba79643e69..6f7abf8c4e 100644
--- a/erts/emulator/test/bs_match_bin_SUITE.erl
+++ b/erts/emulator/test/bs_match_bin_SUITE.erl
@@ -24,7 +24,7 @@
 	 init_per_group/2,end_per_group/2,
 	 byte_split_binary/1,bit_split_binary/1,match_huge_bin/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -47,33 +47,33 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-byte_split_binary(doc) -> "Tries to split a binary at all byte-aligned positions.";
+%% Tries to split a binary at all byte-aligned positions.
 byte_split_binary(Config) when is_list(Config) ->
-    ?line L = lists:seq(0, 57),
-    ?line B = mkbin(L),
-    ?line byte_split(L, B, size(B)),
-    ?line Unaligned = make_unaligned_sub_binary(B),
-    ?line byte_split(L, Unaligned, size(Unaligned)).
+    L = lists:seq(0, 57),
+    B = mkbin(L),
+    byte_split(L, B, size(B)),
+    Unaligned = make_unaligned_sub_binary(B),
+    byte_split(L, Unaligned, size(Unaligned)).
 
 byte_split(L, B, Pos) when Pos >= 0 ->
-    ?line Sz1 = Pos,
-    ?line Sz2 = size(B) - Pos,
-    ?line <<B1:Sz1/binary,B2:Sz2/binary>> = B,
-    ?line B1 = list_to_binary(lists:sublist(L, 1, Pos)),
-    ?line B2 = list_to_binary(lists:nthtail(Pos, L)),
-    ?line byte_split(L, B, Pos-1);
+    Sz1 = Pos,
+    Sz2 = size(B) - Pos,
+    <<B1:Sz1/binary,B2:Sz2/binary>> = B,
+    B1 = list_to_binary(lists:sublist(L, 1, Pos)),
+    B2 = list_to_binary(lists:nthtail(Pos, L)),
+    byte_split(L, B, Pos-1);
 byte_split(_, _, _) -> ok.
 
-bit_split_binary(doc) -> "Tries to split a binary at all positions.";
+%% Tries to split a binary at all positions.
 bit_split_binary(Config) when is_list(Config) ->
     Fun = fun(Bin, List, SkipBef, N) ->
-		  ?line SkipAft = 8*size(Bin) - N - SkipBef,
+		  SkipAft = 8*size(Bin) - N - SkipBef,
 		  %%io:format("~p, ~p, ~p", [SkipBef,N,SkipAft]),
-		  ?line <<_:SkipBef,OutBin:N/binary-unit:1,_:SkipAft>> = Bin,
-		  ?line OutBin = make_bin_from_list(List, N)
+		  <<_:SkipBef,OutBin:N/binary-unit:1,_:SkipAft>> = Bin,
+		  OutBin = make_bin_from_list(List, N)
 	  end,
-    ?line bit_split_binary1(Fun, erlang:md5(<<1,2,3>>)),
-    ?line bit_split_binary1(Fun,
+    bit_split_binary1(Fun, erlang:md5(<<1,2,3>>)),
+    bit_split_binary1(Fun,
 			    make_unaligned_sub_binary(erlang:md5(<<1,2,3>>))),
     ok.
 
@@ -119,19 +119,19 @@ make_unaligned_sub_binary(Bin0) ->
 id(I) -> I.
 
 match_huge_bin(Config) when is_list(Config) ->
-    ?line Bin = <<0:(1 bsl 27),13:8>>,
-    ?line skip_huge_bin_1(1 bsl 27, Bin),
-    ?line 16777216 = match_huge_bin_1(1 bsl 27, Bin),
+    Bin = <<0:(1 bsl 27),13:8>>,
+    skip_huge_bin_1(1 bsl 27, Bin),
+    16777216 = match_huge_bin_1(1 bsl 27, Bin),
     
     %% Test overflowing the size of a binary field.
-    ?line nomatch = overflow_huge_bin_skip_32(Bin),
-    ?line nomatch = overflow_huge_bin_32(Bin),
-    ?line nomatch = overflow_huge_bin_skip_64(Bin),
-    ?line nomatch = overflow_huge_bin_64(Bin),
+    nomatch = overflow_huge_bin_skip_32(Bin),
+    nomatch = overflow_huge_bin_32(Bin),
+    nomatch = overflow_huge_bin_skip_64(Bin),
+    nomatch = overflow_huge_bin_64(Bin),
 
     %% Size in variable
-    ?line ok = overflow_huge_bin(Bin, lists:seq(25, 32)++lists:seq(50, 64)),
-    ?line ok = overflow_huge_bin_unit128(Bin, lists:seq(25, 32)++lists:seq(50, 64)),
+    ok = overflow_huge_bin(Bin, lists:seq(25, 32)++lists:seq(50, 64)),
+    ok = overflow_huge_bin_unit128(Bin, lists:seq(25, 32)++lists:seq(50, 64)),
 
     ok.
 
diff --git a/erts/emulator/test/bs_match_int_SUITE.erl b/erts/emulator/test/bs_match_int_SUITE.erl
index 368f71978d..42d692c1ba 100644
--- a/erts/emulator/test/bs_match_int_SUITE.erl
+++ b/erts/emulator/test/bs_match_int_SUITE.erl
@@ -24,7 +24,7 @@
 	 integer/1,signed_integer/1,dynamic/1,more_dynamic/1,mml/1,
 	 match_huge_int/1,bignum/1,unaligned_32_bit/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -import(lists, [seq/2]).
 
@@ -51,22 +51,22 @@ end_per_group(_GroupName, Config) ->
 
 
 integer(Config) when is_list(Config) ->
-    ?line 0 = get_int(mkbin([])),
-    ?line 0 = get_int(mkbin([0])),
-    ?line 42 = get_int(mkbin([42])),
-    ?line 255 = get_int(mkbin([255])),
-    ?line 256 = get_int(mkbin([1,0])),
-    ?line 257 = get_int(mkbin([1,1])),
-    ?line 258 = get_int(mkbin([1,2])),
-    ?line 258 = get_int(mkbin([1,2])),
-    ?line 65534 = get_int(mkbin([255,254])),
-    ?line 16776455 = get_int(mkbin([255,253,7])),
-    ?line 4245492555 = get_int(mkbin([253,13,19,75])),
-    ?line 4294967294 = get_int(mkbin([255,255,255,254])),
-    ?line 4294967295 = get_int(mkbin([255,255,255,255])),
-    ?line Eight = [200,1,19,128,222,42,97,111],
-    ?line cmp128(Eight, uint(Eight)),
-    ?line fun_clause(catch get_int(mkbin(seq(1,5)))),
+    0 = get_int(mkbin([])),
+    0 = get_int(mkbin([0])),
+    42 = get_int(mkbin([42])),
+    255 = get_int(mkbin([255])),
+    256 = get_int(mkbin([1,0])),
+    257 = get_int(mkbin([1,1])),
+    258 = get_int(mkbin([1,2])),
+    258 = get_int(mkbin([1,2])),
+    65534 = get_int(mkbin([255,254])),
+    16776455 = get_int(mkbin([255,253,7])),
+    4245492555 = get_int(mkbin([253,13,19,75])),
+    4294967294 = get_int(mkbin([255,255,255,254])),
+    4294967295 = get_int(mkbin([255,255,255,255])),
+    Eight = [200,1,19,128,222,42,97,111],
+    cmp128(Eight, uint(Eight)),
+    fun_clause(catch get_int(mkbin(seq(1,5)))),
     ok.
 
 get_int(Bin) ->
@@ -89,13 +89,13 @@ cmp128(<<I:128>>, I) -> equal;
 cmp128(_, _) -> not_equal.
     
 signed_integer(Config) when is_list(Config) ->
-    ?line {no_match,_} = sint(mkbin([])),
-    ?line {no_match,_} = sint(mkbin([1,2,3])),
-    ?line 127 = sint(mkbin([127])),
-    ?line -1 = sint(mkbin([255])),
-    ?line -128 = sint(mkbin([128])),
-    ?line 42 = sint(mkbin([42,255])),
-    ?line 127 = sint(mkbin([127,255])).
+    {no_match,_} = sint(mkbin([])),
+    {no_match,_} = sint(mkbin([1,2,3])),
+    127 = sint(mkbin([127])),
+    -1 = sint(mkbin([255])),
+    -128 = sint(mkbin([128])),
+    42 = sint(mkbin([42,255])),
+    127 = sint(mkbin([127,255])).
 
 sint(Bin) ->
     case Bin of
@@ -130,7 +130,7 @@ dynamic(Bin, S1, S2, A, B) ->
 	_Other -> erlang:error(badmatch, [Bin,S1,S2,A,B])
     end.
 
-more_dynamic(doc) -> "Extract integers at different alignments and of different sizes.";
+%% Extract integers at different alignments and of different sizes.
 more_dynamic(Config) when is_list(Config) ->
 
     % Unsigned big-endian numbers.
@@ -139,7 +139,7 @@ more_dynamic(Config) when is_list(Config) ->
 			<<_:SkipBef,Int:N,_:SkipAft>> = Bin,
 			Int = make_int(List, N, 0)
 		end,
-    ?line more_dynamic1(Unsigned, erlang:md5(mkbin([42]))),
+    more_dynamic1(Unsigned, erlang:md5(mkbin([42]))),
 
     %% Signed big-endian numbers.
     Signed  = fun(Bin, List, SkipBef, N) ->
@@ -151,10 +151,10 @@ more_dynamic(Config) when is_list(Config) ->
 			      io:format("Bin = ~p,", [Bin]),
 			      io:format("SkipBef = ~p, N = ~p", [SkipBef,N]),
 			      io:format("Expected ~p, got ~p", [Int,Other]),
-			      ?t:fail()
+			      ct:fail(signed_big_endian_fail)
 		      end
 	      end,
-    ?line more_dynamic1(Signed, erlang:md5(mkbin([43]))),
+    more_dynamic1(Signed, erlang:md5(mkbin([43]))),
 
     %% Unsigned little-endian numbers.
     UnsLittle  = fun(Bin, List, SkipBef, N) ->
@@ -162,7 +162,7 @@ more_dynamic(Config) when is_list(Config) ->
 			 <<_:SkipBef,Int:N/little,_:SkipAft>> = Bin,
 			 Int = make_int(big_to_little(List, N), N, 0)
 		 end,
-    ?line more_dynamic1(UnsLittle, erlang:md5(mkbin([44]))),
+    more_dynamic1(UnsLittle, erlang:md5(mkbin([44]))),
 
     %% Signed little-endian numbers.
     SignLittle  = fun(Bin, List, SkipBef, N) ->
@@ -171,7 +171,7 @@ more_dynamic(Config) when is_list(Config) ->
 			  Little = big_to_little(List, N),
 			  Int = make_signed_int(Little, N)
 		  end,
-    ?line more_dynamic1(SignLittle, erlang:md5(mkbin([45]))),
+    more_dynamic1(SignLittle, erlang:md5(mkbin([45]))),
 
     ok.
 
@@ -227,23 +227,23 @@ mkbin(L) when is_list(L) -> list_to_binary(L).
     
 
 mml(Config) when is_list(Config) ->
-    ?line single_byte_binary = mml_choose(<<42>>),
-    ?line multi_byte_binary = mml_choose(<<42,43>>).
+    single_byte_binary = mml_choose(<<42>>),
+    multi_byte_binary = mml_choose(<<42,43>>).
 
 mml_choose(<<_A:8>>) -> single_byte_binary;
 mml_choose(<<_A:8,_T/binary>>) -> multi_byte_binary.
 
 match_huge_int(Config) when is_list(Config) ->
     Sz = 1 bsl 27,
-    ?line Bin = <<0:Sz,13:8>>,
-    ?line skip_huge_int_1(Sz, Bin),
-    ?line 0 = match_huge_int_1(Sz, Bin),
+    Bin = <<0:Sz,13:8>>,
+    skip_huge_int_1(Sz, Bin),
+    0 = match_huge_int_1(Sz, Bin),
 
     %% Test overflowing the size of an integer field.
-    ?line nomatch = overflow_huge_int_skip_32(Bin),
+    nomatch = overflow_huge_int_skip_32(Bin),
     case erlang:system_info(wordsize) of
 	4 ->
-	    ?line nomatch = overflow_huge_int_32(Bin);
+	    nomatch = overflow_huge_int_32(Bin);
 	8 ->
 	    %% An attempt will be made to allocate heap space for
 	    %% the bignum (which will probably fail); only if the
@@ -251,15 +251,15 @@ match_huge_int(Config) when is_list(Config) ->
 	    %% the binary is too small.
 	    ok
     end,
-    ?line nomatch = overflow_huge_int_skip_64(Bin),
-    ?line nomatch = overflow_huge_int_64(Bin),
+    nomatch = overflow_huge_int_skip_64(Bin),
+    nomatch = overflow_huge_int_64(Bin),
 
     %% Test overflowing the size of an integer field using variables as sizes.
-    ?line Sizes = case erlang:system_info(wordsize) of
+    Sizes = case erlang:system_info(wordsize) of
 		      4 -> lists:seq(25, 32);
 		      8 -> []
 		  end ++ lists:seq(50, 64),
-    ?line ok = overflow_huge_int_unit128(Bin, Sizes),
+    ok = overflow_huge_int_unit128(Bin, Sizes),
 
     ok.
 
@@ -326,19 +326,19 @@ overflow_huge_int_64(<<Int:9223372036854775808/unit:128,0,_/binary>>) -> {8,Int}
 overflow_huge_int_64(_) -> nomatch.
 
 bignum(Config) when is_list(Config) ->
-    ?line Bin = id(<<42,0:1024/unit:8,43>>),
-    ?line <<42:1025/little-integer-unit:8,_:8>> = Bin,
-    ?line <<_:8,43:1025/integer-unit:8>> = Bin,
+    Bin = id(<<42,0:1024/unit:8,43>>),
+    <<42:1025/little-integer-unit:8,_:8>> = Bin,
+    <<_:8,43:1025/integer-unit:8>> = Bin,
 
-    ?line BignumBin = id(<<0:512/unit:8,258254417031933722623:9/unit:8>>),
-    ?line <<258254417031933722623:(512+9)/unit:8>> = BignumBin,
+    BignumBin = id(<<0:512/unit:8,258254417031933722623:9/unit:8>>),
+    <<258254417031933722623:(512+9)/unit:8>> = BignumBin,
     erlang:garbage_collect(),			%Search for holes in debug-build.
     ok.
 
 unaligned_32_bit(Config) when is_list(Config) ->
     %% There used to be a risk for heap overflow (fixed in R11B-5).
-    ?line L = unaligned_32_bit_1(<<-1:(64*1024)>>),
-    ?line unaligned_32_bit_verify(L, 1638).
+    L = unaligned_32_bit_1(<<-1:(64*1024)>>),
+    unaligned_32_bit_verify(L, 1638).
 
 unaligned_32_bit_1(<<1:1,U:32,_:7,T/binary>>) ->
     [U|unaligned_32_bit_1(T)];
diff --git a/erts/emulator/test/bs_match_misc_SUITE.erl b/erts/emulator/test/bs_match_misc_SUITE.erl
index e875dc859c..114d7ecb36 100644
--- a/erts/emulator/test/bs_match_misc_SUITE.erl
+++ b/erts/emulator/test/bs_match_misc_SUITE.erl
@@ -19,17 +19,18 @@
 %%
 -module(bs_match_misc_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,
 	 bound_var/1,bound_tail/1,t_float/1,little_float/1,sean/1,
 	 kenneth/1,encode_binary/1,native/1,happi/1,
 	 size_var/1,wiger/1,x0_context/1,huge_float_field/1,
 	 writable_binary_matched/1,otp_7198/1,unordered_bindings/1,
 	 float_middle_endian/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 10}}].
 
 all() -> 
     [bound_var, bound_tail, t_float, little_float, sean,
@@ -37,39 +38,24 @@ all() ->
      x0_context, huge_float_field, writable_binary_matched,
      otp_7198, unordered_bindings, float_middle_endian].
 
-groups() -> 
-    [].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-bound_var(doc) -> "Test matching of bound variables.";
+%% Test matching of bound variables.
 bound_var(Config) when is_list(Config) ->
-    ?line ok = bound_var(42, 13, <<42,13>>),
-    ?line nope = bound_var(42, 13, <<42,255>>),
-    ?line nope = bound_var(42, 13, <<154,255>>),
+    ok = bound_var(42, 13, <<42,13>>),
+    nope = bound_var(42, 13, <<42,255>>),
+    nope = bound_var(42, 13, <<154,255>>),
     ok.
 
 bound_var(A, B, <<A:8,B:8>>) -> ok;
 bound_var(_, _, _) -> nope.
 
-bound_tail(doc) -> "Test matching of a bound tail.";
+%% Test matching of a bound tail.
 bound_tail(Config) when is_list(Config) ->
-    ?line ok = bound_tail(<<>>, <<13,14>>),
-    ?line ok = bound_tail(<<2,3>>, <<1,1,2,3>>),
-    ?line nope = bound_tail(<<2,3>>, <<1,1,2,7>>),
-    ?line nope = bound_tail(<<2,3>>, <<1,1,2,3,4>>),
-    ?line nope = bound_tail(<<2,3>>, <<>>),
+    ok = bound_tail(<<>>, <<13,14>>),
+    ok = bound_tail(<<2,3>>, <<1,1,2,3>>),
+    nope = bound_tail(<<2,3>>, <<1,1,2,7>>),
+    nope = bound_tail(<<2,3>>, <<1,1,2,3,4>>),
+    nope = bound_tail(<<2,3>>, <<>>),
     ok.
 
 bound_tail(T, <<_:16,T/binary>>) -> ok;
@@ -79,26 +65,26 @@ t_float(Config) when is_list(Config) ->
     F = f1(),
     G = f_one(),
 
-    ?line G = match_float(<<63,128,0,0>>, 32, 0),
-    ?line G = match_float(<<63,240,0,0,0,0,0,0>>, 64, 0),
+    G = match_float(<<63,128,0,0>>, 32, 0),
+    G = match_float(<<63,240,0,0,0,0,0,0>>, 64, 0),
 
-    ?line fcmp(F, match_float(<<F:32/float>>, 32, 0)),
-    ?line fcmp(F, match_float(<<F:64/float>>, 64, 0)),
-    ?line fcmp(F, match_float(<<1:1,F:32/float,127:7>>, 32, 1)),
-    ?line fcmp(F, match_float(<<1:1,F:64/float,127:7>>, 64, 1)),
-    ?line fcmp(F, match_float(<<1:13,F:32/float,127:3>>, 32, 13)),
-    ?line fcmp(F, match_float(<<1:13,F:64/float,127:3>>, 64, 13)),
+    fcmp(F, match_float(<<F:32/float>>, 32, 0)),
+    fcmp(F, match_float(<<F:64/float>>, 64, 0)),
+    fcmp(F, match_float(<<1:1,F:32/float,127:7>>, 32, 1)),
+    fcmp(F, match_float(<<1:1,F:64/float,127:7>>, 64, 1)),
+    fcmp(F, match_float(<<1:13,F:32/float,127:3>>, 32, 13)),
+    fcmp(F, match_float(<<1:13,F:64/float,127:3>>, 64, 13)),
 
-    ?line {'EXIT',{{badmatch,_},_}} = (catch match_float(<<0,0>>, 16, 0)),
-    ?line {'EXIT',{{badmatch,_},_}} = (catch match_float(<<0,0>>, 16#7fffffff, 0)),
+    {'EXIT',{{badmatch,_},_}} = (catch match_float(<<0,0>>, 16, 0)),
+    {'EXIT',{{badmatch,_},_}} = (catch match_float(<<0,0>>, 16#7fffffff, 0)),
 
     ok.
 
 float_middle_endian(Config) when is_list(Config) ->
     F = 9007199254740990.0, % turns to -NaN when word-swapped
-    ?line fcmp(F, match_float(<<F:64/float>>, 64, 0)),
-    ?line fcmp(F, match_float(<<1:1,F:64/float,127:7>>, 64, 1)),
-    ?line fcmp(F, match_float(<<1:13,F:64/float,127:3>>, 64, 13)),
+    fcmp(F, match_float(<<F:64/float>>, 64, 0)),
+    fcmp(F, match_float(<<1:1,F:64/float,127:7>>, 64, 1)),
+    fcmp(F, match_float(<<1:13,F:64/float,127:3>>, 64, 13)),
     ok.
 
 
@@ -115,15 +101,15 @@ little_float(Config) when is_list(Config) ->
     F = f2(),
     G = f_one(),
 
-    ?line G = match_float_little(<<0,0,0,0,0,0,240,63>>, 64, 0),
-    ?line G = match_float_little(<<0,0,128,63>>, 32, 0),
+    G = match_float_little(<<0,0,0,0,0,0,240,63>>, 64, 0),
+    G = match_float_little(<<0,0,128,63>>, 32, 0),
 
-    ?line fcmp(F, match_float_little(<<F:32/float-little>>, 32, 0)),
-    ?line fcmp(F, match_float_little(<<F:64/float-little>>, 64, 0)),
-    ?line fcmp(F, match_float_little(<<1:1,F:32/float-little,127:7>>, 32, 1)),
-    ?line fcmp(F, match_float_little(<<1:1,F:64/float-little,127:7>>, 64, 1)),
-    ?line fcmp(F, match_float_little(<<1:13,F:32/float-little,127:3>>, 32, 13)),
-    ?line fcmp(F, match_float_little(<<1:13,F:64/float-little,127:3>>, 64, 13)),
+    fcmp(F, match_float_little(<<F:32/float-little>>, 32, 0)),
+    fcmp(F, match_float_little(<<F:64/float-little>>, 64, 0)),
+    fcmp(F, match_float_little(<<1:1,F:32/float-little,127:7>>, 32, 1)),
+    fcmp(F, match_float_little(<<1:1,F:64/float-little,127:7>>, 64, 1)),
+    fcmp(F, match_float_little(<<1:13,F:32/float-little,127:3>>, 32, 13)),
+    fcmp(F, match_float_little(<<1:13,F:64/float-little,127:3>>, 64, 13)),
 
     ok.
 
@@ -151,16 +137,16 @@ f_one() ->
     1.0.
 
 sean(Config) when is_list(Config) ->
-    ?line small = sean1(<<>>),
-    ?line small = sean1(<<1>>),
-    ?line small = sean1(<<1,2>>),
-    ?line small = sean1(<<1,2,3>>),
-    ?line large = sean1(<<1,2,3,4>>),
-
-    ?line small = sean1(<<4>>),
-    ?line small = sean1(<<4,5>>),
-    ?line small = sean1(<<4,5,6>>),
-    ?line {'EXIT',{function_clause,_}} = (catch sean1(<<4,5,6,7>>)),
+    small = sean1(<<>>),
+    small = sean1(<<1>>),
+    small = sean1(<<1,2>>),
+    small = sean1(<<1,2,3>>),
+    large = sean1(<<1,2,3,4>>),
+
+    small = sean1(<<4>>),
+    small = sean1(<<4,5>>),
+    small = sean1(<<4,5,6>>),
+    {'EXIT',{function_clause,_}} = (catch sean1(<<4,5,6,7>>)),
     ok.
 
 sean1(<<B/binary>>) when byte_size(B) < 4 -> small;
@@ -292,28 +278,28 @@ getBase64Char(_Else) ->
 -define(M(F), <<F>> = <<F>>).
 
 native(Config) when is_list(Config) ->
-    ?line ?M(3.14:64/native-float), 
-    ?line ?M(333:16/native),
-    ?line ?M(38658345:32/native),
+    ?M(3.14:64/native-float), 
+    ?M(333:16/native),
+    ?M(38658345:32/native),
     case <<1:16/native>> of
 	<<0,1>> -> native_big();
 	<<1,0>> -> native_little()
     end.
 
 native_big() ->
-    ?line <<37.33:64/native-float>> = <<37.33:64/big-float>>,
-    ?line <<3974:16/native-integer>> = <<3974:16/big-integer>>,
+    <<37.33:64/native-float>> = <<37.33:64/big-float>>,
+    <<3974:16/native-integer>> = <<3974:16/big-integer>>,
     {comment,"Big endian"}.
 
 native_little() ->
-    ?line <<37869.32343:64/native-float>> = <<37869.32343:64/little-float>>,
-    ?line <<7974:16/native-integer>> = <<7974:16/little-integer>>,
+    <<37869.32343:64/native-float>> = <<37869.32343:64/little-float>>,
+    <<7974:16/native-integer>> = <<7974:16/little-integer>>,
     {comment,"Little endian"}.
 
 happi(Config) when is_list(Config) ->
     Bin = <<".123">>,
-    ?line <<"123">> = lex_digits1(Bin, 1, []),
-    ?line <<"123">> = lex_digits2(Bin, 1, []),
+    <<"123">> = lex_digits1(Bin, 1, []),
+    <<"123">> = lex_digits2(Bin, 1, []),
     ok.
 
 lex_digits1(<<$., Rest/binary>>,_Val,_Acc) ->
@@ -334,16 +320,16 @@ dec(A) ->
     A-$0.  
 
 size_var(Config) when is_list(Config) ->
-    ?line {<<45>>,<<>>} = split(<<1:16,45>>),
-    ?line {<<45>>,<<46,47>>} = split(<<1:16,45,46,47>>),
-    ?line {<<45,46>>,<<47>>} = split(<<2:16,45,46,47>>),
+    {<<45>>,<<>>} = split(<<1:16,45>>),
+    {<<45>>,<<46,47>>} = split(<<1:16,45,46,47>>),
+    {<<45,46>>,<<47>>} = split(<<2:16,45,46,47>>),
 
-    ?line {<<45,46,47>>,<<48>>} = split_2(<<16:8,3:16,45,46,47,48>>),
+    {<<45,46,47>>,<<48>>} = split_2(<<16:8,3:16,45,46,47,48>>),
     
-    ?line {<<45,46>>,<<47>>} = split(2, <<2:16,45,46,47>>),
-    ?line {'EXIT',{function_clause,_}} = (catch split(42, <<2:16,45,46,47>>)),
+    {<<45,46>>,<<47>>} = split(2, <<2:16,45,46,47>>),
+    {'EXIT',{function_clause,_}} = (catch split(42, <<2:16,45,46,47>>)),
 
-    ?line <<"cdef">> = skip(<<2:8,"abcdef">>),
+    <<"cdef">> = skip(<<2:8,"abcdef">>),
     
     ok.
 
@@ -359,11 +345,11 @@ split_2(<<N0:8,N:N0,B:N/binary,T/binary>>) ->
 skip(<<N:8,_:N/binary,T/binary>>) -> T.
 
 wiger(Config) when is_list(Config) ->
-    ?line ok1 = wcheck(<<3>>),
-    ?line ok2 = wcheck(<<1,2,3>>),
-    ?line ok3 = wcheck(<<4>>),
-    ?line {error,<<1,2,3,4>>} = wcheck(<<1,2,3,4>>),
-    ?line {error,<<>>} = wcheck(<<>>),
+    ok1 = wcheck(<<3>>),
+    ok2 = wcheck(<<1,2,3>>),
+    ok3 = wcheck(<<4>>),
+    {error,<<1,2,3,4>>} = wcheck(<<1,2,3,4>>),
+    {error,<<>>} = wcheck(<<>>),
     ok.
 
 wcheck(<<A>>) when A==3->
@@ -396,24 +382,24 @@ x0_2(_, Bin) ->
 
 x0_3(_, Bin) ->
     case Bin of
-	<<_:72,7:8,_/binary>> ->
-	    ?line ?t:fail();
-	<<_:64,0:16,_/binary>> ->
-	    ?line ?t:fail();
-	<<_:64,42:16,123456:32,_/binary>> ->
-	    ok
+        <<_:72,7:8,_/binary>> ->
+            ct:fail(bs_matched_1);
+        <<_:64,0:16,_/binary>> ->
+            ct:fail(bs_matched_2);
+        <<_:64,42:16,123456:32,_/binary>> ->
+            ok
     end.
 
 
 huge_float_field(Config) when is_list(Config) ->
     Sz = 1 bsl 27,
-    ?line Bin = <<0:Sz>>,
+    Bin = <<0:Sz>>,
 
-    ?line nomatch = overflow_huge_float_skip_32(Bin),
-    ?line nomatch = overflow_huge_float_32(Bin),
+    nomatch = overflow_huge_float_skip_32(Bin),
+    nomatch = overflow_huge_float_32(Bin),
 
-    ?line ok = overflow_huge_float(Bin, lists:seq(25, 32)++lists:seq(50, 64)),
-    ?line ok = overflow_huge_float_unit128(Bin, lists:seq(25, 32)++lists:seq(50, 64)),
+    ok = overflow_huge_float(Bin, lists:seq(25, 32)++lists:seq(50, 64)),
+    ok = overflow_huge_float_unit128(Bin, lists:seq(25, 32)++lists:seq(50, 64)),
     ok.
 
 overflow_huge_float_skip_32(<<_:4294967296/float,0,_/binary>>) -> 1; % 1 bsl 32
@@ -455,15 +441,15 @@ overflow_huge_float(_, []) -> ok.
 overflow_huge_float_unit128(Bin, [Sz0|Sizes]) ->
     Sz = id(1 bsl Sz0),
     case Bin of
-	<<_:Sz/float-unit:128,0,_/binary>> ->
-	    {error,Sz};
-	_ ->
-	    case Bin of
-		<<Var:Sz/float-unit:128,0,_/binary>> ->
-		    {error,Sz,Var};
-		_ ->
-		    overflow_huge_float_unit128(Bin, Sizes)
-	    end
+        <<_:Sz/float-unit:128,0,_/binary>> ->
+            {error,Sz};
+        _ ->
+            case Bin of
+                <<Var:Sz/float-unit:128,0,_/binary>> ->
+                    {error,Sz,Var};
+                _ ->
+                    overflow_huge_float_unit128(Bin, Sizes)
+            end
     end;
 overflow_huge_float_unit128(_, []) -> ok.
 
@@ -473,25 +459,24 @@ overflow_huge_float_unit128(_, []) -> ok.
 %%
 
 writable_binary_matched(Config) when is_list(Config) ->
-    ?line WritableBin = create_writeable_binary(),
-    ?line writable_binary_matched(WritableBin, WritableBin, 500).
+    WritableBin = create_writeable_binary(),
+    writable_binary_matched(WritableBin, WritableBin, 500).
 
 writable_binary_matched(<<0>>, _, N) ->
-    if
-	N =:= 0 -> ok;
-	true ->
-	    put(grow_heap, [N|get(grow_heap)]),
-	    ?line WritableBin = create_writeable_binary(),
-	    ?line writable_binary_matched(WritableBin, WritableBin, N-1)
+    if N =:= 0 -> ok;
+       true ->
+           put(grow_heap, [N|get(grow_heap)]),
+           WritableBin = create_writeable_binary(),
+           writable_binary_matched(WritableBin, WritableBin, N-1)
     end;
 writable_binary_matched(<<B:8,T/binary>>, WritableBin0, N) ->
-    ?line WritableBin = writable_binary(WritableBin0, B),
+    WritableBin = writable_binary(WritableBin0, B),
     writable_binary_matched(T, WritableBin, N).
 
 writable_binary(WritableBin0, B) when is_binary(WritableBin0) ->
     %% Heavy append to force the binary to move.
-    ?line WritableBin = <<WritableBin0/binary,0:(size(WritableBin0))/unit:8,B>>,
-    ?line id(<<(id(0)):128/unit:8>>),
+    WritableBin = <<WritableBin0/binary,0:(size(WritableBin0))/unit:8,B>>,
+    id(<<(id(0)):128/unit:8>>),
     WritableBin.
 
 create_writeable_binary() ->
@@ -502,7 +487,7 @@ otp_7198(Config) when is_list(Config) ->
     %% increase the number of saved positions, the thing word was not updated
     %% to account for the new size. Therefore, if there was a garbage collection,
     %% the new slots would be included in the garbage collection.
-    ?line [do_otp_7198(FillerSize) || FillerSize <- lists:seq(0, 256)],
+    [do_otp_7198(FillerSize) || FillerSize <- lists:seq(0, 256)],
     ok.
 
 do_otp_7198(FillerSize) ->
@@ -512,8 +497,7 @@ do_otp_7198(FillerSize) ->
 	{'DOWN',Ref,process,Pid,normal} ->
 	    ok;
 	{'DOWN',Ref,process,Pid,Reason} ->
-	    io:format("unexpected: ~p", [Reason]),
-	    ?line ?t:fail()
+	    ct:fail("unexpected: ~p", [Reason])
     end.
     
 do_otp_7198_test(_) ->
@@ -540,27 +524,27 @@ otp_7198_scan(<<>>, TokAcc) ->
 otp_7198_scan(<<D, Z, Rest/binary>>, TokAcc) when
                         (D =:= $D orelse D =:= $d) and
                         ((Z =:= $\s) or (Z =:= $() or (Z =:= $))) ->
-        otp_7198_scan(<<Z, Rest/binary>>, ['AND' | TokAcc]);
+    otp_7198_scan(<<Z, Rest/binary>>, ['AND' | TokAcc]);
 
 otp_7198_scan(<<D>>, TokAcc) when
                         (D =:= $D) or (D =:= $d) ->
-        otp_7198_scan(<<>>, ['AND' | TokAcc]);
+    otp_7198_scan(<<>>, ['AND' | TokAcc]);
 
 otp_7198_scan(<<N, Z, Rest/binary>>, TokAcc) when
                         (N =:= $N orelse N =:= $n) and
                         ((Z =:= $\s) or (Z =:= $() or (Z =:= $))) ->
-        otp_7198_scan(<<Z, Rest/binary>>, ['NOT' | TokAcc]);
+    otp_7198_scan(<<Z, Rest/binary>>, ['NOT' | TokAcc]);
 
 otp_7198_scan(<<C, Rest/binary>>, TokAcc) when
                                 (C >= $A) and (C =< $Z);
                                 (C >= $a) and (C =< $z);
                                 (C >= $0) and (C =< $9) ->
-        case Rest of
-                <<$:, R/binary>> ->
-                        otp_7198_scan(R, [{'FIELD', C} | TokAcc]);
-                _ ->
-                        otp_7198_scan(Rest, [{'KEYWORD', C} | TokAcc])
-        end.
+    case Rest of
+        <<$:, R/binary>> ->
+            otp_7198_scan(R, [{'FIELD', C} | TokAcc]);
+        _ ->
+            otp_7198_scan(Rest, [{'KEYWORD', C} | TokAcc])
+    end.
 
 unordered_bindings(Config) when is_list(Config) ->
     {<<1,2,3,4>>,<<42,42>>,<<3,3,3>>} =
diff --git a/erts/emulator/test/bs_match_tail_SUITE.erl b/erts/emulator/test/bs_match_tail_SUITE.erl
index 58b0d3fef6..8392a0df47 100644
--- a/erts/emulator/test/bs_match_tail_SUITE.erl
+++ b/erts/emulator/test/bs_match_tail_SUITE.erl
@@ -21,61 +21,46 @@
 -module(bs_match_tail_SUITE).
 
 -author('[email protected]').
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2,aligned/1,unaligned/1,zero_tail/1]).
+-export([all/0, suite/0,
+	 aligned/1,unaligned/1,zero_tail/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [aligned, unaligned, zero_tail].
 
-groups() -> 
-    [].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-aligned(doc) -> "Test aligned tails.";
+%% Test aligned tails.
 aligned(Config) when is_list(Config) ->
-    ?line Tail1 = mkbin([]),
-    ?line {258,Tail1} = al_get_tail_used(mkbin([1,2])),
-    ?line Tail2 = mkbin(lists:seq(1, 127)),
-    ?line {35091,Tail2} = al_get_tail_used(mkbin([137,19|Tail2])),
-
-    ?line 64896 = al_get_tail_unused(mkbin([253,128])),
-    ?line 64895 = al_get_tail_unused(mkbin([253,127|lists:seq(42, 255)])),
-
-    ?line Tail3 = mkbin(lists:seq(0, 19)),
-    ?line {0,Tail1} = get_dyn_tail_used(Tail1, 0),
-    ?line {0,Tail3} = get_dyn_tail_used(mkbin([Tail3]), 0),
-    ?line {73,Tail3} = get_dyn_tail_used(mkbin([73|Tail3]), 8),
-
-    ?line 0 = get_dyn_tail_unused(mkbin([]), 0),
-    ?line 233 = get_dyn_tail_unused(mkbin([233]), 8),
-    ?line 23 = get_dyn_tail_unused(mkbin([23,22,2]), 8),
+    Tail1 = mkbin([]),
+    {258,Tail1} = al_get_tail_used(mkbin([1,2])),
+    Tail2 = mkbin(lists:seq(1, 127)),
+    {35091,Tail2} = al_get_tail_used(mkbin([137,19|Tail2])),
+
+    64896 = al_get_tail_unused(mkbin([253,128])),
+    64895 = al_get_tail_unused(mkbin([253,127|lists:seq(42, 255)])),
+
+    Tail3 = mkbin(lists:seq(0, 19)),
+    {0,Tail1} = get_dyn_tail_used(Tail1, 0),
+    {0,Tail3} = get_dyn_tail_used(mkbin([Tail3]), 0),
+    {73,Tail3} = get_dyn_tail_used(mkbin([73|Tail3]), 8),
+
+    0 = get_dyn_tail_unused(mkbin([]), 0),
+    233 = get_dyn_tail_unused(mkbin([233]), 8),
+    23 = get_dyn_tail_unused(mkbin([23,22,2]), 8),
     ok.
 
 al_get_tail_used(<<A:16,T/binary>>) -> {A,T}.
 al_get_tail_unused(<<A:16,_/binary>>) -> A.
 
-unaligned(doc) -> "Test that an non-aligned tail cannot be matched out.";
+%% Test that an non-aligned tail cannot be matched out.
 unaligned(Config) when is_list(Config) ->
-    ?line {'EXIT',{function_clause,_}} = (catch get_tail_used(mkbin([42]))),
-    ?line {'EXIT',{{badmatch,_},_}} = (catch get_dyn_tail_used(mkbin([137]), 3)),
-    ?line {'EXIT',{function_clause,_}} = (catch get_tail_unused(mkbin([42,33]))),
-    ?line {'EXIT',{{badmatch,_},_}} = (catch get_dyn_tail_unused(mkbin([44]), 7)),
+    {'EXIT',{function_clause,_}} = (catch get_tail_used(mkbin([42]))),
+    {'EXIT',{{badmatch,_},_}} = (catch get_dyn_tail_used(mkbin([137]), 3)),
+    {'EXIT',{function_clause,_}} = (catch get_tail_unused(mkbin([42,33]))),
+    {'EXIT',{{badmatch,_},_}} = (catch get_dyn_tail_unused(mkbin([44]), 7)),
     ok.
 
 get_tail_used(<<A:1,T/binary>>) -> {A,T}.
@@ -90,11 +75,11 @@ get_dyn_tail_unused(Bin, Sz) ->
     <<A:Sz,_/binary>> = Bin,
     A.
 
-zero_tail(doc) -> "Test that zero tails are tested correctly.";
+%% Test that zero tails are tested correctly.
 zero_tail(Config) when is_list(Config) ->
-    ?line 7 = (catch test_zero_tail(mkbin([7]))),
-    ?line {'EXIT',{function_clause,_}} = (catch test_zero_tail(mkbin([1,2]))),
-    ?line {'EXIT',{function_clause,_}} = (catch test_zero_tail2(mkbin([1,2,3]))),
+    7 = (catch test_zero_tail(mkbin([7]))),
+    {'EXIT',{function_clause,_}} = (catch test_zero_tail(mkbin([1,2]))),
+    {'EXIT',{function_clause,_}} = (catch test_zero_tail2(mkbin([1,2,3]))),
     ok.
 
 test_zero_tail(<<A:8>>) -> A.
@@ -102,7 +87,3 @@ test_zero_tail(<<A:8>>) -> A.
 test_zero_tail2(<<_A:4,_B:4>>) -> ok.
 
 mkbin(L) when is_list(L) -> list_to_binary(L).
-
-
-    
-
diff --git a/erts/emulator/test/bs_utf_SUITE.erl b/erts/emulator/test/bs_utf_SUITE.erl
index 0625c22163..f1c09bfbb0 100644
--- a/erts/emulator/test/bs_utf_SUITE.erl
+++ b/erts/emulator/test/bs_utf_SUITE.erl
@@ -20,52 +20,28 @@
 
 -module(bs_utf_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,
 	 utf8_roundtrip/1,utf16_roundtrip/1,utf32_roundtrip/1,
 	 utf8_illegal_sequences/1,utf16_illegal_sequences/1,
 	 utf32_illegal_sequences/1,
 	 bad_construction/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
--define(FAIL(Expr), ?line fail_check(catch Expr, ??Expr, [])).
+-define(FAIL(Expr), fail_check(catch Expr, ??Expr, [])).
 
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(6)),
-    [{watchdog,Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 6}}].
 
 all() -> 
     [utf8_roundtrip, utf16_roundtrip, utf32_roundtrip,
      utf8_illegal_sequences, utf16_illegal_sequences,
      utf32_illegal_sequences, bad_construction].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 utf8_roundtrip(Config) when is_list(Config) ->
-    ?line utf8_roundtrip(0, 16#D7FF),
-    ?line utf8_roundtrip(16#E000, 16#10FFFF),
+    utf8_roundtrip(0, 16#D7FF),
+    utf8_roundtrip(16#E000, 16#10FFFF),
     ok.
 
 utf8_roundtrip(First, Last) when First =< Last ->
@@ -83,10 +59,9 @@ utf16_roundtrip(Config) when is_list(Config) ->
     Big = fun utf16_big_roundtrip/1,
     Little = fun utf16_little_roundtrip/1,
     PidRefs = [spawn_monitor(fun() ->
-				     do_utf16_roundtrip(Fun)
-			     end) || Fun <- [Big,Little]],
-    [receive {'DOWN',Ref,process,Pid,Reason} -> normal=Reason end ||
-	{Pid,Ref} <- PidRefs],
+                                     do_utf16_roundtrip(Fun)
+                             end) || Fun <- [Big,Little]],
+    [receive {'DOWN',Ref,process,Pid,Reason} -> normal=Reason end || {Pid,Ref} <- PidRefs],
     ok.
 
 do_utf16_roundtrip(Fun) ->
@@ -154,20 +129,20 @@ utf32_little_roundtrip(Char) ->
     ok.
 
 utf8_illegal_sequences(Config) when is_list(Config) ->
-    ?line fail_range(16#10FFFF+1, 16#10FFFF+512), %Too large.
-    ?line fail_range(16#D800, 16#DFFF),		%Reserved for UTF-16.
+    fail_range(16#10FFFF+1, 16#10FFFF+512), %Too large.
+    fail_range(16#D800, 16#DFFF),		%Reserved for UTF-16.
 
     %% Illegal first character.
-    ?line [fail(<<I,16#8F,16#8F,16#8F>>) || I <- lists:seq(16#80, 16#BF)],
+    [fail(<<I,16#8F,16#8F,16#8F>>) || I <- lists:seq(16#80, 16#BF)],
 
     %% Short sequences.
-    ?line short_sequences(16#80, 16#10FFFF),
+    short_sequences(16#80, 16#10FFFF),
 
     %% Overlong sequences. (Using more bytes than necessary
     %% is not allowed.)
-    ?line overlong(0, 127, 2),
-    ?line overlong(128, 16#7FF, 3),
-    ?line overlong(16#800, 16#FFFF, 4),
+    overlong(0, 127, 2),
+    overlong(128, 16#7FF, 3),
+    overlong(16#800, 16#FFFF, 4),
     ok.
 
 fail_range(Char, End) when Char =< End ->
@@ -187,9 +162,9 @@ short_sequences(Char, End) ->
 short_sequences_1(Char, Step, End) when Char =< End ->
     CharEnd = lists:min([Char+Step-1,End]),
     [spawn_monitor(fun() ->
-			   io:format("~p - ~p\n", [Char,CharEnd]),
-			   do_short_sequences(Char, CharEnd)
-		   end)|short_sequences_1(Char+Step, Step, End)];
+                           io:format("~p - ~p\n", [Char,CharEnd]),
+                           do_short_sequences(Char, CharEnd)
+                   end)|short_sequences_1(Char+Step, Step, End)];
 short_sequences_1(_, _, _) -> [].
 
 do_short_sequences(Char, End) when Char =< End ->
@@ -228,9 +203,9 @@ overlong(_, _, _) -> ok.
 overlong(Char, NumBytes) when NumBytes < 5 ->
     case int_to_utf8(Char, NumBytes) of
 	<<Char/utf8>>=Bin ->
-	    ?t:fail({illegal_encoding_accepted,Bin,Char});
+	    ct:fail({illegal_encoding_accepted,Bin,Char});
 	<<OtherChar/utf8>>=Bin ->
-	    ?t:fail({illegal_encoding_accepted,Bin,Char,OtherChar});
+	    ct:fail({illegal_encoding_accepted,Bin,Char,OtherChar});
 	_ -> ok
     end,
     overlong(Char, NumBytes+1);
@@ -241,16 +216,16 @@ fail(Bin) ->
     fail_1(make_unaligned(Bin)).
 
 fail_1(<<Char/utf8>>=Bin) ->
-    ?t:fail({illegal_encoding_accepted,Bin,Char});
+    ct:fail({illegal_encoding_accepted,Bin,Char});
 fail_1(_) -> ok.
 
 
 utf16_illegal_sequences(Config) when is_list(Config) ->
-    ?line utf16_fail_range(16#10FFFF+1, 16#10FFFF+512), %Too large.
-    ?line utf16_fail_range(16#D800, 16#DFFF),		%Reserved for UTF-16.
+    utf16_fail_range(16#10FFFF+1, 16#10FFFF+512), %Too large.
+    utf16_fail_range(16#D800, 16#DFFF),	          %Reserved for UTF-16.
 
-    ?line lonely_hi_surrogate(16#D800, 16#DFFF),
-    ?line leading_lo_surrogate(16#DC00, 16#DFFF),
+    lonely_hi_surrogate(16#D800, 16#DFFF),
+    leading_lo_surrogate(16#DC00, 16#DFFF),
     
     ok.
 
@@ -265,9 +240,9 @@ lonely_hi_surrogate(Char, End) when Char =< End ->
     BinLittle = <<Char:16/little>>,
     case {BinBig,BinLittle} of
 	{<<Bad/big-utf16>>,_} ->
-	    ?t:fail({lonely_hi_surrogate_accepted,Bad});
+	    ct:fail({lonely_hi_surrogate_accepted,Bad});
 	{_,<<Bad/little-utf16>>} ->
-	    ?t:fail({lonely_hi_surrogate_accepted,Bad});
+	    ct:fail({lonely_hi_surrogate_accepted,Bad});
 	{_,_} ->
 	    ok
     end,
@@ -284,9 +259,9 @@ leading_lo_surrogate(HiSurr, LoSurr, End) when LoSurr =< End ->
     BinLittle = <<HiSurr:16/little,LoSurr:16/little>>,
     case {BinBig,BinLittle} of
 	{<<Bad/big-utf16,_/bits>>,_} ->
-	    ?t:fail({leading_lo_surrogate_accepted,Bad});
+	    ct:fail({leading_lo_surrogate_accepted,Bad});
 	{_,<<Bad/little-utf16,_/bits>>} ->
-	    ?t:fail({leading_lo_surrogate_accepted,Bad});
+	    ct:fail({leading_lo_surrogate_accepted,Bad});
 	{_,_} ->
 	    ok
     end,
@@ -294,20 +269,20 @@ leading_lo_surrogate(HiSurr, LoSurr, End) when LoSurr =< End ->
 leading_lo_surrogate(_, _, _) -> ok.
 
 utf32_illegal_sequences(Config) when is_list(Config) ->
-    ?line utf32_fail_range(16#10FFFF+1, 16#10FFFF+512), %Too large.
-    ?line utf32_fail_range(16#D800, 16#DFFF),		%Reserved for UTF-16.
-    ?line utf32_fail_range(-100, -1),
+    utf32_fail_range(16#10FFFF+1, 16#10FFFF+512), %Too large.
+    utf32_fail_range(16#D800, 16#DFFF),		%Reserved for UTF-16.
+    utf32_fail_range(-100, -1),
     ok.
 
 utf32_fail_range(Char, End) when Char =< End ->
     {'EXIT',_} = (catch <<Char/big-utf32>>),
     {'EXIT',_} = (catch <<Char/little-utf32>>),
     case {<<Char:32>>,<<Char:32/little>>} of
-	{<<Unexpected/utf32>>,_} ->
-	    ?line ?t:fail(Unexpected);
-	{_,<<Unexpected/little-utf32>>} ->
-	    ?line ?t:fail(Unexpected);
-	{_,_} -> ok
+        {<<Unexpected/utf32>>,_} ->
+            ct:fail(Unexpected);
+        {_,<<Unexpected/little-utf32>>} ->
+            ct:fail(Unexpected);
+        {_,_} -> ok
     end,
     utf32_fail_range(Char+1, End);
 utf32_fail_range(_, _) -> ok.
@@ -387,14 +362,14 @@ fail_check({'EXIT',{badarg,_}}, Str, Vars) ->
     try	evaluate(Str, Vars) of
 	Res ->
 	    io:format("Interpreted result: ~p", [Res]),
-	    ?t:fail(did_not_fail_in_intepreted_code)
+	    ct:fail(did_not_fail_in_intepreted_code)
     catch
 	error:badarg ->
 	    ok
     end;
 fail_check(Res, _, _) ->
     io:format("Compiled result: ~p", [Res]),
-    ?t:fail(did_not_fail_in_compiled_code).
+    ct:fail(did_not_fail_in_compiled_code).
 
 evaluate(Str, Vars) ->
     {ok,Tokens,_} =
@@ -406,4 +381,3 @@ evaluate(Str, Vars) ->
     end.
 
 id(I) -> I.
-    
diff --git a/erts/emulator/test/busy_port_SUITE.erl b/erts/emulator/test/busy_port_SUITE.erl
index 6a2588aadd..c582f8d77b 100644
--- a/erts/emulator/test/busy_port_SUITE.erl
+++ b/erts/emulator/test/busy_port_SUITE.erl
@@ -20,8 +20,7 @@
 
 -module(busy_port_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2,end_per_testcase/2,
+-export([all/0, suite/0, end_per_testcase/2,
 	 io_to_busy/1, message_order/1, send_3/1, 
 	 system_monitor/1, no_trap_exit/1,
 	 no_trap_exit_unlinked/1, trap_exit/1, multiple_writers/1,
@@ -29,12 +28,14 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Internal exports.
 -export([init/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 4}}].
 
 all() -> 
     [io_to_busy, message_order, send_3, system_monitor,
@@ -43,21 +44,6 @@ all() ->
      scheduling_delay_busy,scheduling_delay_busy_nosuspend,
      scheduling_busy_link].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 end_per_testcase(_Case, Config) when is_list(Config) ->
     case whereis(busy_drv_server) of
 	undefined ->
@@ -76,17 +62,14 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %% Tests I/O operations to a busy port, to make sure a suspended send
 %% operation is correctly restarted.  This used to crash Beam.
 
-io_to_busy(suite) -> [];
 io_to_busy(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(30)),
+    ct:timetrap({seconds, 30}),
 
-    ?line start_busy_driver(Config),
-    ?line process_flag(trap_exit, true),
-    ?line Writer = fun_spawn(fun writer/0),
-    ?line Generator = fun_spawn(fun() -> generator(100, Writer) end),
-    ?line wait_for([Writer, Generator]),
-
-    ?line test_server:timetrap_cancel(Dog),
+    start_busy_driver(Config),
+    process_flag(trap_exit, true),
+    Writer = fun_spawn(fun writer/0),
+    Generator = fun_spawn(fun() -> generator(100, Writer) end),
+    wait_for([Writer, Generator]),
     ok.
 
 generator(N, Writer) ->
@@ -130,27 +113,24 @@ forget(_) ->
 %% Test the interaction of busy ports and message sending.
 %% This used to cause the wrong message to be received.
 
-message_order(suite) -> {req, dynamic_loading};
 message_order(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-
-    ?line start_busy_driver(Config),
-    ?line Self = self(),
-    ?line Busy = fun_spawn(fun () -> send_to_busy_1(Self) end),
-    ?line receive after 1000 -> ok end,
-    ?line Busy ! first,
-    ?line Busy ! second,
-    ?line receive after 1 -> ok end,
-    ?line unlock_slave(),
-    ?line Busy ! third,
-    ?line receive
-	      {Busy, first} ->
-		  ok;
-	      Other ->
-		  test_server:fail({unexpected_message, Other})
-	  end,
-
-    ?line test_server:timetrap_cancel(Dog),
+    ct:timetrap({seconds, 10}),
+
+    start_busy_driver(Config),
+    Self = self(),
+    Busy = fun_spawn(fun () -> send_to_busy_1(Self) end),
+    receive after 1000 -> ok end,
+    Busy ! first,
+    Busy ! second,
+    receive after 1 -> ok end,
+    unlock_slave(),
+    Busy ! third,
+    receive
+        {Busy, first} ->
+            ok;
+        Other ->
+            ct:fail({unexpected_message, Other})
+    end,
     ok.
 
 send_to_busy_1(Parent) ->
@@ -164,80 +144,64 @@ send_to_busy_1(Parent) ->
     end.
 
 %% Test the bif send/3
-send_3(suite) -> {req,dynamic_loading};
-send_3(doc) -> ["Test the BIF send/3"];
 send_3(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
+    ct:timetrap({seconds, 10}),
     %%
-    ?line start_busy_driver(Config),
-    ?line {Owner,Slave} = get_slave(),
-    ?line ok = erlang:send(Slave, {Owner,{command,"set busy"}}, 
-			   [nosuspend]),
+    start_busy_driver(Config),
+    {Owner,Slave} = get_slave(),
+    ok = erlang:send(Slave, {Owner,{command,"set busy"}}, [nosuspend]),
     receive after 100 -> ok end, % ensure command reached port
-    ?line nosuspend = erlang:send(Slave, {Owner,{command,"busy"}},
-				  [nosuspend]),
-    ?line unlock_slave(),
-    ?line ok = erlang:send(Slave, {Owner,{command,"not busy"}}, 
-			   [nosuspend]),
-    ?line ok = command(stop),
-    %%
-    ?line test_server:timetrap_cancel(Dog),
+    nosuspend = erlang:send(Slave, {Owner,{command,"busy"}}, [nosuspend]),
+    unlock_slave(),
+    ok = erlang:send(Slave, {Owner,{command,"not busy"}}, [nosuspend]),
+    ok = command(stop),
     ok.
 
 %% Test the erlang:system_monitor(Pid, [busy_port])
-system_monitor(suite) -> {req,dynamic_loading};
-system_monitor(doc) -> ["Test erlang:system_monitor({Pid,[busy_port]})."];
 system_monitor(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Self = self(),
+    ct:timetrap({seconds, 10}),
+    Self = self(),
     %%
-    ?line OldMonitor = erlang:system_monitor(Self, [busy_port]),
-    ?line {Self,[busy_port]} = erlang:system_monitor(),
-    ?line Void = make_ref(),
-    ?line start_busy_driver(Config),
-    ?line {Owner,Slave} = get_slave(),
-    ?line Master = command(get_master),
-    ?line Parent = self(),
-    ?line Busy = 
-	spawn_link(
-	  fun() ->
-		  (catch port_command(Slave, "set busy")),
-		  receive {Parent,alpha} -> ok end,
-		  (catch port_command(Slave, "busy")),
-		  (catch port_command(Slave, "free")),
-		  Parent ! {self(),alpha},
-		  command(lock),
-		  receive {Parent,beta} -> ok end,
-		  command({port_command,"busy"}),
-		  command({port_command,"free"}),
-		  Parent ! {self(),beta}
-	  end),
-    ?line Void = rec(Void),
-    ?line Busy ! {self(),alpha},
-    ?line {monitor,Busy,busy_port,Slave} = rec(Void),
-    ?line unlock_slave(),
-    ?line {Busy,alpha} = rec(Void),
-    ?line Void = rec(Void),
-    ?line Busy ! {self(), beta},
-    ?line {monitor,Owner,busy_port,Slave} = rec(Void),
-    ?line port_command(Master, "u"),
-    ?line {Busy,beta} = rec(Void),
-    ?line Void = rec(Void),
-    ?line _NewMonitor = erlang:system_monitor(OldMonitor),
-    ?line OldMonitor = erlang:system_monitor(),
-    ?line OldMonitor = erlang:system_monitor(OldMonitor),
-    %%
-    ?line test_server:timetrap_cancel(Dog),
+    OldMonitor = erlang:system_monitor(Self, [busy_port]),
+    {Self,[busy_port]} = erlang:system_monitor(),
+    Void = make_ref(),
+    start_busy_driver(Config),
+    {Owner,Slave} = get_slave(),
+    Master = command(get_master),
+    Parent = self(),
+    Busy = spawn_link(
+             fun() ->
+                     (catch port_command(Slave, "set busy")),
+                     receive {Parent,alpha} -> ok end,
+                     (catch port_command(Slave, "busy")),
+                     (catch port_command(Slave, "free")),
+                     Parent ! {self(),alpha},
+                     command(lock),
+                     receive {Parent,beta} -> ok end,
+                     command({port_command,"busy"}),
+                     command({port_command,"free"}),
+                     Parent ! {self(),beta}
+             end),
+    Void = rec(Void),
+    Busy ! {self(),alpha},
+    {monitor,Busy,busy_port,Slave} = rec(Void),
+    unlock_slave(),
+    {Busy,alpha} = rec(Void),
+    Void = rec(Void),
+    Busy ! {self(), beta},
+    {monitor,Owner,busy_port,Slave} = rec(Void),
+    port_command(Master, "u"),
+    {Busy,beta} = rec(Void),
+    Void = rec(Void),
+    _NewMonitor = erlang:system_monitor(OldMonitor),
+    OldMonitor = erlang:system_monitor(),
+    OldMonitor = erlang:system_monitor(OldMonitor),
     ok.
 
-
-
 rec(Tag) ->
     receive X -> X after 1000 -> Tag end.
 
 
-
-
 %% Assuming the following scenario,
 %%
 %%  +---------------+		       +-----------+
@@ -248,65 +212,59 @@ rec(Tag) ->
 %%
 %% tests that the suspended process is killed if the port is killed.
 
-no_trap_exit(suite) -> [];
 no_trap_exit(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line process_flag(trap_exit, true),
-    ?line Pid = fun_spawn(fun no_trap_exit_process/3,
-			  [self(), linked, Config]),
-    ?line receive
-	      {Pid, port_created, Port} ->
-		  io:format("Process ~w created port ~w", [Pid, Port]),
-		  ?line exit(Port, die);
-	      Other1 ->
-		  test_server:fail({unexpected_message, Other1})
-	  end,
-    ?line receive
-	      {'EXIT', Pid, die} ->
-		  ok;
-	      Other2 ->
-		  test_server:fail({unexpected_message, Other2})
-	  end,
-
-    ?line test_server:timetrap_cancel(Dog),
+    ct:timetrap({seconds, 10}),
+    process_flag(trap_exit, true),
+    Pid = fun_spawn(fun no_trap_exit_process/3, [self(), linked, Config]),
+    receive
+        {Pid, port_created, Port} ->
+            io:format("Process ~w created port ~w", [Pid, Port]),
+            exit(Port, die);
+        Other1 ->
+            ct:fail({unexpected_message, Other1})
+    end,
+    receive
+        {'EXIT', Pid, die} ->
+            ok;
+        Other2 ->
+            ct:fail({unexpected_message, Other2})
+    end,
     ok.
 
 %% The same scenario as above, but the port has been explicitly
 %% unlinked from the process.
 
-no_trap_exit_unlinked(suite) -> [];
 no_trap_exit_unlinked(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line process_flag(trap_exit, true),
-    ?line Pid = fun_spawn(fun no_trap_exit_process/3,
-			  [self(), unlink, Config]),
-    ?line receive
-	      {Pid, port_created, Port} ->
-		  io:format("Process ~w created port ~w", [Pid, Port]),
-		  ?line exit(Port, die);
-	      Other1 ->
-		  test_server:fail({unexpected_message, Other1})
-	  end,
-    ?line receive
-	      {'EXIT', Pid, normal} ->
-		  ok;
-	      Other2 ->
-		  test_server:fail({unexpected_message, Other2})
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    ct:timetrap({seconds, 10}),
+    process_flag(trap_exit, true),
+    Pid = fun_spawn(fun no_trap_exit_process/3,
+                    [self(), unlink, Config]),
+    receive
+        {Pid, port_created, Port} ->
+            io:format("Process ~w created port ~w", [Pid, Port]),
+            exit(Port, die);
+        Other1 ->
+            ct:fail({unexpected_message, Other1})
+    end,
+    receive
+        {'EXIT', Pid, normal} ->
+            ok;
+        Other2 ->
+            ct:fail({unexpected_message, Other2})
+    end,
     ok.
 
 no_trap_exit_process(ResultTo, Link, Config) ->
-    ?line load_busy_driver(Config),
-    ?line _Master = open_port({spawn, "busy_drv master"}, [eof]),
-    ?line Slave = open_port({spawn, "busy_drv slave"}, [eof]),
-    ?line case Link of
-	      linked -> ok;
-	      unlink -> unlink(Slave)
-	  end,
-    ?line (catch port_command(Slave, "lock port")),
-    ?line ResultTo ! {self(), port_created, Slave},
-    ?line (catch port_command(Slave, "suspend me")),
+    load_busy_driver(Config),
+    _Master = open_port({spawn, "busy_drv master"}, [eof]),
+    Slave = open_port({spawn, "busy_drv slave"}, [eof]),
+    case Link of
+        linked -> ok;
+        unlink -> unlink(Slave)
+    end,
+    (catch port_command(Slave, "lock port")),
+    ResultTo ! {self(), port_created, Slave},
+    (catch port_command(Slave, "suspend me")),
     ok.
 
 %% Assuming the following scenario,
@@ -320,36 +278,34 @@ no_trap_exit_process(ResultTo, Link, Config) ->
 %% tests that the suspended process is scheduled runnable and
 %% receives an 'EXIT' message if the port is killed.
 
-trap_exit(suite) -> [];
 trap_exit(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Pid = fun_spawn(fun busy_port_exit_process/2, [self(), Config]),
-    ?line receive
+    ct:timetrap({seconds, 10}),
+    Pid = fun_spawn(fun busy_port_exit_process/2, [self(), Config]),
+    receive
 	      {Pid, port_created, Port} ->
 		  io:format("Process ~w created port ~w", [Pid, Port]),
-		  ?line unlink(Pid),
-		  ?line {status, suspended} = process_info(Pid, status),
-		  ?line exit(Port, die);
+		  unlink(Pid),
+		  {status, suspended} = process_info(Pid, status),
+		  exit(Port, die);
 	      Other1 ->
-		  test_server:fail({unexpected_message, Other1})
+		  ct:fail({unexpected_message, Other1})
 	  end,
-    ?line receive
+    receive
 	      {Pid, ok} ->
 		  ok;
 	      Other2 ->
-		  test_server:fail({unexpected_message, Other2})
+		  ct:fail({unexpected_message, Other2})
 	  end,
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 busy_port_exit_process(ResultTo, Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line load_busy_driver(Config),
-    ?line _Master = open_port({spawn, "busy_drv master"}, [eof]),
-    ?line Slave = open_port({spawn, "busy_drv slave"}, [eof]),
-    ?line (catch port_command(Slave, "lock port")),
-    ?line ResultTo ! {self(), port_created, Slave},
-    ?line (catch port_command(Slave, "suspend me")),
+    process_flag(trap_exit, true),
+    load_busy_driver(Config),
+    _Master = open_port({spawn, "busy_drv master"}, [eof]),
+    Slave = open_port({spawn, "busy_drv slave"}, [eof]),
+    (catch port_command(Slave, "lock port")),
+    ResultTo ! {self(), port_created, Slave},
+    (catch port_command(Slave, "suspend me")),
     receive
 	{'EXIT', Slave, die} ->
 	    ResultTo ! {self(), ok};
@@ -362,19 +318,18 @@ busy_port_exit_process(ResultTo, Config) ->
 %% This should work even if some of the processes have terminated
 %% in the meantime.
 
-multiple_writers(suite) -> [];
 multiple_writers(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line start_busy_driver(Config),
-    ?line process_flag(trap_exit, true),
+    ct:timetrap({seconds, 10}),
+    start_busy_driver(Config),
+    process_flag(trap_exit, true),
 
     %% Start the waiters and make sure they have blocked.
-    ?line W1 = fun_spawn(fun quick_writer/0),
-    ?line W2 = fun_spawn(fun quick_writer/0),
-    ?line W3 = fun_spawn(fun quick_writer/0),
-    ?line W4 = fun_spawn(fun quick_writer/0),
-    ?line W5 = fun_spawn(fun quick_writer/0),
-    ?line test_server:sleep(500),		% Make sure writers have blocked.
+    W1 = fun_spawn(fun quick_writer/0),
+    W2 = fun_spawn(fun quick_writer/0),
+    W3 = fun_spawn(fun quick_writer/0),
+    W4 = fun_spawn(fun quick_writer/0),
+    W5 = fun_spawn(fun quick_writer/0),
+    test_server:sleep(500),		% Make sure writers have blocked.
 
     %% Kill two of the processes.
     exit(W1, kill),
@@ -383,10 +338,8 @@ multiple_writers(Config) when is_list(Config) ->
     receive {'EXIT', W3, killed} -> ok end,
 
     %% Unlock the port.  The surviving processes should be become runnable.
-    ?line unlock_slave(),
-    ?line wait_for([W2, W4, W5]),
-    
-    ?line test_server:timetrap_cancel(Dog),
+    unlock_slave(),
+    wait_for([W2, W4, W5]),
     ok.
 
 quick_writer() ->
@@ -402,205 +355,193 @@ soft_busy_driver(Config) when is_list(Config) ->
     hs_test(Config, false).
 
 hs_test(Config, HardBusy) when is_list(Config) ->
-    ?line DrvName = case HardBusy of
-			true -> 'hard_busy_drv';
-			false -> 'soft_busy_drv'
-		    end,
-    ?line erl_ddll:start(),
-    ?line Path = ?config(data_dir, Config),
+    DrvName = case HardBusy of
+                  true -> 'hard_busy_drv';
+                  false -> 'soft_busy_drv'
+              end,
+    erl_ddll:start(),
+    Path = proplists:get_value(data_dir, Config),
     case erl_ddll:load_driver(Path, DrvName) of
-	ok -> ok;
-	{error, Error} ->
-	    io:format("~s\n", [erl_ddll:format_error(Error)]),
-	    ?line ?t:fail()
+        ok -> ok;
+        {error, Error} ->
+            ct:fail(erl_ddll:format_error(Error))
     end,
 
-    ?line Port = open_port({spawn, DrvName}, []),
-    
+    Port = open_port({spawn, DrvName}, []),
+
     NotSuspended = fun (Proc) ->
-			   chk_not_value({status,suspended},
-					 process_info(Proc, status))
-		   end,
+                           chk_not_value({status,suspended},
+                                         process_info(Proc, status))
+                   end,
     NotBusyEnd = fun (Proc, Res, Time) ->
-			 receive
-			     {Port, caller, Proc} -> ok
-			 after
-			     500 -> exit(missing_caller_message)
-			 end,
-			 chk_value({return, true}, Res),
-			 chk_range(0, Time, 100)
-		 end,    
+                         receive
+                             {Port, caller, Proc} -> ok
+                         after
+                             500 -> exit(missing_caller_message)
+                         end,
+                         chk_value({return, true}, Res),
+                         chk_range(0, Time, 100)
+                 end,    
     ForceEnd = fun (Proc, Res, Time) ->
-		       case HardBusy of
-			   false ->
-			       NotBusyEnd(Proc, Res, Time);
-			   true ->
-			       chk_value({error, notsup}, Res),
-			       chk_range(0, Time, 100),
-			       receive
-				   Msg -> exit({unexpected_msg, Msg})
-			       after
-				   500 -> ok
-			       end
-		       end
-	       end,
+                       case HardBusy of
+                           false ->
+                               NotBusyEnd(Proc, Res, Time);
+                           true ->
+                               chk_value({error, notsup}, Res),
+                               chk_range(0, Time, 100),
+                               receive
+                                   Msg -> exit({unexpected_msg, Msg})
+                               after
+                                   500 -> ok
+                               end
+                       end
+               end,
     BadArg = fun (_Proc, Res, Time) ->
-		     chk_value({error, badarg}, Res),
-		     chk_range(0, Time, 100)
-	     end,
+                     chk_value({error, badarg}, Res),
+                     chk_range(0, Time, 100)
+             end,
 
     %% Not busy
 
     %% Not busy; nosuspend option
-    ?line hs_busy_pcmd(Port, [nosuspend], NotSuspended, NotBusyEnd),
+    hs_busy_pcmd(Port, [nosuspend], NotSuspended, NotBusyEnd),
 
     %% Not busy; force option
-    ?line hs_busy_pcmd(Port, [force], NotSuspended, ForceEnd),
+    hs_busy_pcmd(Port, [force], NotSuspended, ForceEnd),
 
     %% Not busy; force and nosuspend option
-    ?line hs_busy_pcmd(Port, [force, nosuspend], NotSuspended, ForceEnd),
+    hs_busy_pcmd(Port, [force, nosuspend], NotSuspended, ForceEnd),
 
     %% Not busy; no option
-    ?line hs_busy_pcmd(Port, [], NotSuspended, NotBusyEnd),
+    hs_busy_pcmd(Port, [], NotSuspended, NotBusyEnd),
 
     %% Not busy; bad option
-    ?line hs_busy_pcmd(Port, [bad_option], NotSuspended, BadArg),
+    hs_busy_pcmd(Port, [bad_option], NotSuspended, BadArg),
 
 
     %% Make busy
-    ?line erlang:port_control(Port, $B, []),
+    erlang:port_control(Port, $B, []),
 
 
     %% Busy; nosuspend option
-    ?line hs_busy_pcmd(Port, [nosuspend], NotSuspended,
-		       fun (_Proc, Res, Time) ->
-			       chk_value({return, false}, Res),
-			       chk_range(0, Time, 100),
-			       receive
-				   Msg -> exit({unexpected_msg, Msg})
-			       after
-				   500 -> ok
-			       end
-		       end),
+    hs_busy_pcmd(Port, [nosuspend], NotSuspended,
+                 fun (_Proc, Res, Time) ->
+                         chk_value({return, false}, Res),
+                         chk_range(0, Time, 100),
+                         receive
+                             Msg -> exit({unexpected_msg, Msg})
+                         after
+                             500 -> ok
+                         end
+                 end),
 
     %% Busy; force option
-    ?line hs_busy_pcmd(Port, [force], NotSuspended, ForceEnd),
+    hs_busy_pcmd(Port, [force], NotSuspended, ForceEnd),
 
     %% Busy; force and nosuspend option
-    ?line hs_busy_pcmd(Port, [force, nosuspend], NotSuspended, ForceEnd),
+    hs_busy_pcmd(Port, [force, nosuspend], NotSuspended, ForceEnd),
 
     %% Busy; bad option
-    ?line hs_busy_pcmd(Port, [bad_option], NotSuspended, BadArg),
+    hs_busy_pcmd(Port, [bad_option], NotSuspended, BadArg),
 
     %% no option on busy port
-    ?line hs_busy_pcmd(Port, [],
-		       fun (Proc) ->
-			       receive after 1000 -> ok end,
-			       chk_value({status,suspended},
-					 process_info(Proc, status)),
-
-			       %% Make not busy
-			       erlang:port_control(Port, $N, [])
-		       end,
-		       fun (_Proc, Res, Time) ->
-			       chk_value({return, true}, Res),
-			       chk_range(1000, Time, 2000)
-		       end),
-
-    ?line true = erlang:port_close(Port),
-    ?line ok = erl_ddll:unload_driver(DrvName),
-    ?line ok = erl_ddll:stop(),
-    ?line ok.
+    hs_busy_pcmd(Port, [],
+                 fun (Proc) ->
+                         receive after 1000 -> ok end,
+                         chk_value({status,suspended},
+                                   process_info(Proc, status)),
+
+                         %% Make not busy
+                         erlang:port_control(Port, $N, [])
+                 end,
+                 fun (_Proc, Res, Time) ->
+                         chk_value({return, true}, Res),
+                         chk_range(1000, Time, 2000)
+                 end),
+
+    true = erlang:port_close(Port),
+    ok = erl_ddll:unload_driver(DrvName),
+    ok = erl_ddll:stop(),
+    ok.
 
 hs_busy_pcmd(Prt, Opts, StartFun, EndFun) ->
     Tester = self(),
     P = spawn_link(fun () ->
-			   erlang:yield(),
-			   Tester ! {self(), doing_port_command},
-			   Start = erlang:monotonic_time(micro_seconds),
-			   Res = try {return,
-				      port_command(Prt, [], Opts)}
-				 catch Exception:Error -> {Exception, Error}
-				 end,
-			   End = erlang:monotonic_time(micro_seconds),
-			   Time = round((End - Start)/1000),
-			   Tester ! {self(), port_command_result, Res, Time}
-		   end),
+                           erlang:yield(),
+                           Tester ! {self(), doing_port_command},
+                           Start = erlang:monotonic_time(micro_seconds),
+                           Res = try {return,
+                                      port_command(Prt, [], Opts)}
+                                 catch Exception:Error -> {Exception, Error}
+                                 end,
+                           End = erlang:monotonic_time(micro_seconds),
+                           Time = round((End - Start)/1000),
+                           Tester ! {self(), port_command_result, Res, Time}
+                   end),
     receive
-	{P, doing_port_command} ->
-	    ok
+        {P, doing_port_command} ->
+            ok
     end,
     StartFun(P),
     receive
-	{P, port_command_result, Res, Time} ->
-	    EndFun(P, Res, Time)
+        {P, port_command_result, Res, Time} ->
+            EndFun(P, Res, Time)
     end.
 
 scheduling_delay_busy(Config) ->
-    
-    Scenario = 
-	[{1,{spawn,[{var,drvname},undefined]}},
-	 {2,{call,[{var,1},open_port]}},
-	 {3,{spawn,[{var,2},{var,1}]}},
-	 {0,{ack,[{var,1},{busy,1,250}]}},
-	 {0,{cast,[{var,3},{command,2}]}},
-	 [{0,{cast,[{var,3},{command,I}]}} 
-	  || I <- lists:seq(3,50)],
-	 {0,{cast,[{var,3},take_control]}},
-	 {0,{cast,[{var,1},{new_owner,{var,3}}]}},
-	 {0,{cast,[{var,3},close]}},
-	 {0,{timer,sleep,[300]}},
-	 {0,{erlang,port_command,[{var,2},<<$N>>,[force]]}},
-	 [{0,{cast,[{var,1},{command,I}]}} 
-	  || I <- lists:seq(101,127)]
-	 ,{10,{call,[{var,3},get_data]}}
-	 ],
+    Scenario = [{1,{spawn,[{var,drvname},undefined]}},
+                {2,{call,[{var,1},open_port]}},
+                {3,{spawn,[{var,2},{var,1}]}},
+                {0,{ack,[{var,1},{busy,1,250}]}},
+                {0,{cast,[{var,3},{command,2}]}},
+                [{0,{cast,[{var,3},{command,I}]}} || I <- lists:seq(3,50)],
+                {0,{cast,[{var,3},take_control]}},
+                {0,{cast,[{var,1},{new_owner,{var,3}}]}},
+                {0,{cast,[{var,3},close]}},
+                {0,{timer,sleep,[300]}},
+                {0,{erlang,port_command,[{var,2},<<$N>>,[force]]}},
+                [{0,{cast,[{var,1},{command,I}]}} || I <- lists:seq(101,127)],
+                {10,{call,[{var,3},get_data]}}],
 
     Validation = [{seq,10,lists:seq(1,50)}],
 
-    port_scheduling(Scenario,Validation,?config(data_dir,Config)).
+    port_scheduling(Scenario,Validation,proplists:get_value(data_dir,Config)).
 
 scheduling_delay_busy_nosuspend(Config) ->
-
-    Scenario = 
-	[{1,{spawn,[{var,drvname},undefined]}},
-	 {2,{call,[{var,1},open_port]}},
-	 {0,{cast,[{var,1},{command,1,100}]}},
-	 {0,{cast,[{var,1},{busy,2}]}},
-	 {0,{timer,sleep,[200]}}, % ensure reached port
-	 {10,{call,[{var,1},{command,3,[nosuspend]}]}},
-	 {0,{timer,sleep,[200]}},
-	 {0,{erlang,port_command,[{var,2},<<$N>>,[force]]}},
-	 {0,{cast,[{var,1},close]}},
-	 {20,{call,[{var,1},get_data]}}
-	 ],
+    Scenario = [{1,{spawn,[{var,drvname},undefined]}},
+                {2,{call,[{var,1},open_port]}},
+                {0,{cast,[{var,1},{command,1,100}]}},
+                {0,{cast,[{var,1},{busy,2}]}},
+                {0,{timer,sleep,[200]}}, % ensure reached port
+                {10,{call,[{var,1},{command,3,[nosuspend]}]}},
+                {0,{timer,sleep,[200]}},
+                {0,{erlang,port_command,[{var,2},<<$N>>,[force]]}},
+                {0,{cast,[{var,1},close]}},
+                {20,{call,[{var,1},get_data]}}],
 
     Validation = [{eq,10,nosuspend},{seq,20,[1,2]}],
 
-    port_scheduling(Scenario,Validation,?config(data_dir,Config)).
+    port_scheduling(Scenario,Validation,proplists:get_value(data_dir,Config)).
 
 scheduling_busy_link(Config) ->
-    
-    Scenario = 
-	[{1,{spawn,[{var,drvname},undefined]}},
-	 {2,{call,[{var,1},open_port]}},
-	 {3,{spawn,[{var,2},{var,1}]}},
-	 {0,{cast,[{var,1},unlink]}},
-	 {0,{cast,[{var,1},{busy,1}]}},
-	 {0,{cast,[{var,1},{command,2}]}},
-	 {0,{cast,[{var,1},link]}},
-	 {0,{timer,sleep,[1000]}},
-	 {0,{ack,[{var,3},take_control]}},
-	 {0,{cast,[{var,1},{new_owner,{var,3}}]}},
-	 {0,{cast,[{var,3},close]}},
-	 {10,{call,[{var,3},get_data]}},
-	 {20,{call,[{var,1},get_exit]}}
-	 ],
+    Scenario = [{1,{spawn,[{var,drvname},undefined]}},
+                {2,{call,[{var,1},open_port]}},
+                {3,{spawn,[{var,2},{var,1}]}},
+                {0,{cast,[{var,1},unlink]}},
+                {0,{cast,[{var,1},{busy,1}]}},
+                {0,{cast,[{var,1},{command,2}]}},
+                {0,{cast,[{var,1},link]}},
+                {0,{timer,sleep,[1000]}},
+                {0,{ack,[{var,3},take_control]}},
+                {0,{cast,[{var,1},{new_owner,{var,3}}]}},
+                {0,{cast,[{var,3},close]}},
+                {10,{call,[{var,3},get_data]}},
+                {20,{call,[{var,1},get_exit]}}],
 
     Validation = [{seq,10,[1]},
 		  {seq,20,[{'EXIT',noproc}]}],
 
-    port_scheduling(Scenario,Validation,?config(data_dir,Config)).
+    port_scheduling(Scenario,Validation,proplists:get_value(data_dir,Config)).
 
 process_init(DrvName,Owner) ->
     process_flag(trap_exit,true),
@@ -699,11 +640,11 @@ handle_msg(close,Port,Owner,_Data)  ->
 handle_msg(get_data,Port,_Owner,{[],_Exit})  ->
     %% Wait for data if it has not arrived yet
     receive
-	{Port,{data,Data}} ->
-	    Data
+        {Port,{data,Data}} ->
+            Data
     after 2000 ->
-	    pal("~p",[erlang:process_info(self())]),
-	    exit(did_not_get_port_data)
+              pal("~p",[erlang:process_info(self())]),
+              exit(did_not_get_port_data)
     end;
 handle_msg(get_data,_Port,Owner,{Data,Exit})  ->
     pal("GetData",[]),
@@ -753,8 +694,7 @@ port_scheduling(Scenario,Validation,Path) ->
     case erl_ddll:load_driver(Path, DrvName) of
 	ok -> ok;
 	{error, Error} ->
-	    io:format("~s\n", [erl_ddll:format_error(Error)]),
-	    ?line ?t:fail()
+            ct:fail(erl_ddll:format_error(Error))
     end,
 
     Data = run_scenario(lists:flatten(Scenario),[{drvname,DrvName}]),
@@ -860,7 +800,7 @@ wait_for(Pids) ->
 	{'EXIT', Pid, normal} ->
 	    wait_for(lists:delete(Pid, Pids));
 	Other ->
-	    test_server:fail({bad_exit, Other})
+	    ct:fail({bad_exit, Other})
     end.
 
 fun_spawn(Fun) ->
@@ -896,39 +836,38 @@ fun_spawn(Fun, Args) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 load_busy_driver(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line erl_ddll:start(),
+    DataDir = proplists:get_value(data_dir, Config),
+    erl_ddll:start(),
     case erl_ddll:load_driver(DataDir, "busy_drv") of
 	ok -> ok;
 	{error, Error} ->
-	    io:format("~s\n", [erl_ddll:format_error(Error)]),
-	    ?line ?t:fail()
+            ct:fail(erl_ddll:format_error(Error))
     end.
 
 %%% Interface functions.
 
 start_busy_driver(Config) when is_list(Config) ->
-    ?line Pid = spawn_link(?MODULE, init, [Config, self()]),
-    ?line receive
+    Pid = spawn_link(?MODULE, init, [Config, self()]),
+    receive
 	      {Pid, started} ->
 		  ok;
 	      Other ->
-		  test_server:fail({unexpected_message, Other})
+		  ct:fail({unexpected_message, Other})
 	  end.
 
 unlock_slave() ->
     command(unlock).
 
 get_slave() ->
-    ?line command(get_slave).
+    command(get_slave).
 
 %% Internal functions.
 
 command(Msg) ->
-    ?line whereis(busy_drv_server) ! {self(), Msg},
-    ?line receive
-	      {busy_drv_reply, Reply} ->
-		  Reply
+    whereis(busy_drv_server) ! {self(), Msg},
+    receive
+        {busy_drv_reply, Reply} ->
+            Reply
     end.
 
 %%% Server.
diff --git a/erts/emulator/test/call_trace_SUITE.erl b/erts/emulator/test/call_trace_SUITE.erl
index 064404a038..4ec18aa49e 100644
--- a/erts/emulator/test/call_trace_SUITE.erl
+++ b/erts/emulator/test/call_trace_SUITE.erl
@@ -21,66 +21,46 @@
 
 -module(call_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,
-	 hipe/1,process_specs/1,basic/1,flags/1,errors/1,pam/1,change_pam/1,
-	 return_trace/1,exception_trace/1,on_load/1,deep_exception/1,
-	 upgrade/1,
-	 exception_nocatch/1,bit_syntax/1]).
+-export([all/0, suite/0,
+         init_per_testcase/2,end_per_testcase/2,
+         hipe/1,process_specs/1,basic/1,flags/1,errors/1,pam/1,change_pam/1,
+         return_trace/1,exception_trace/1,on_load/1,deep_exception/1,
+         upgrade/1,
+         exception_nocatch/1,bit_syntax/1]).
 
 %% Helper functions.
 
 -export([bar/0,foo/0,foo/1,foo/2,expect/1,worker_foo/1,pam_foo/2,nasty/0,
-	 id/1,deep/3,deep_1/3,deep_2/2,deep_3/2,deep_4/1,deep_5/1,
-	 bs_sum_a/2,bs_sum_b/2]).
+         id/1,deep/3,deep_1/3,deep_2/2,deep_3/2,deep_4/1,deep_5/1,
+         bs_sum_a/2,bs_sum_b/2]).
 
 %% Debug
 -export([abbr/1,abbr/2]).
 
-
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(P, 20).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 30}}].
 
 all() -> 
     Common = [errors, on_load],
     NotHipe = [process_specs, basic, flags, pam, change_pam,
-	       upgrade,
-	       return_trace, exception_trace, deep_exception,
-	       exception_nocatch, bit_syntax],
+               upgrade,
+               return_trace, exception_trace, deep_exception,
+               exception_nocatch, bit_syntax],
     Hipe = [hipe],
     case test_server:is_native(call_trace_SUITE) of
-	true -> Hipe ++ Common;
-	false -> NotHipe ++ Common
+        true -> Hipe ++ Common;
+        false -> NotHipe ++ Common
     end.
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog = ?t:timetrap(?t:seconds(30)),
-    [{watchdog, Dog}|Config].
+    Config.
 
 end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-
     %% Reloading the module will clear all trace patterns, and
     %% in a debug-compiled emulator run assertions of the counters
     %% for the number of traced exported functions in this module.
@@ -88,51 +68,49 @@ end_per_testcase(_Func, Config) ->
     c:l(?MODULE).
 
 hipe(Config) when is_list(Config) ->
-    ?line 0 = erlang:trace_pattern({?MODULE,worker_foo,1}, true),
-    ?line 0 = erlang:trace_pattern({?MODULE,worker_foo,1}, true, [local]),
-    ?line AllFuncs = erlang:trace_pattern({'_','_','_'}, true),
+    0 = erlang:trace_pattern({?MODULE,worker_foo,1}, true),
+    0 = erlang:trace_pattern({?MODULE,worker_foo,1}, true, [local]),
+    AllFuncs = erlang:trace_pattern({'_','_','_'}, true),
 
     %% Make sure that a traced, exported function can still be found.
-    ?line true = erlang:function_exported(error_handler, undefined_function, 3),
-    ?line AllFuncs = erlang:trace_pattern({'_','_','_'}, false),
+    true = erlang:function_exported(error_handler, undefined_function, 3),
+    AllFuncs = erlang:trace_pattern({'_','_','_'}, false),
     ok.
 
-process_specs(doc) ->
-    "Tests 'all', 'new', and 'existing' for specifying processes.";
-process_specs(suite) -> [];
+%% Tests 'all', 'new', and 'existing' for specifying processes.
 process_specs(Config) when is_list(Config) ->
-    ?line Tracer = start_tracer(),
-    ?line {flags,[call]} = trace_info(self(), flags),
-    ?line {tracer,Tracer} = trace_info(self(), tracer),
-    ?line trace_func({?MODULE,worker_foo,1}, []),
+    Tracer = start_tracer(),
+    {flags,[call]} = trace_info(self(), flags),
+    {tracer,Tracer} = trace_info(self(), tracer),
+    trace_func({?MODULE,worker_foo,1}, []),
 
     %% Test the 'new' flag.
 
-    ?line {Work1A,Work1B} = start_and_trace(new, [1,2,3], A1B={3,2,1}),
+    {Work1A,Work1B} = start_and_trace(new, [1,2,3], A1B={3,2,1}),
     {flags,[]} = trace_info(Work1A, flags),
     {tracer,[]} = trace_info(Work1A, tracer),
     {tracer,Tracer} = trace_info(Work1B, tracer),
     {flags,[call]} = trace_info(Work1B, flags),
-    ?line expect({trace,Work1B,call,{?MODULE,worker_foo,[A1B]}}),
-    ?line unlink(Work1B),
-    ?line Mref = erlang:monitor(process, Work1B),
-    ?line exit(Work1B, kill),
+    expect({trace,Work1B,call,{?MODULE,worker_foo,[A1B]}}),
+    unlink(Work1B),
+    Mref = erlang:monitor(process, Work1B),
+    exit(Work1B, kill),
     receive
-	{'DOWN',Mref,_,_,_} -> ok
+        {'DOWN',Mref,_,_,_} -> ok
     end,
-    ?line undefined = trace_info(Work1B, flags),
-    ?line {flags,[]} = trace_info(new, flags),
-    ?line {tracer,[]} = trace_info(new, tracer),
+    undefined = trace_info(Work1B, flags),
+    {flags,[]} = trace_info(new, flags),
+    {tracer,[]} = trace_info(new, tracer),
 
     %% Test the 'existing' flag.
-    ?line {Work2A,_Work2B} = start_and_trace(existing, A2A=[5,6,7], [7,6,5]),
-    ?line expect({trace,Work2A,call,{?MODULE,worker_foo,[A2A]}}),
+    {Work2A,_Work2B} = start_and_trace(existing, A2A=[5,6,7], [7,6,5]),
+    expect({trace,Work2A,call,{?MODULE,worker_foo,[A2A]}}),
 
     %% Test the 'all' flag.
-    ?line {Work3A,Work3B} = start_and_trace(all, A3A=[12,13], A3B=[13,12]),
-    ?line expect({trace,Work3A,call,{?MODULE,worker_foo,[A3A]}}),
-    ?line expect({trace,Work3B,call,{?MODULE,worker_foo,[A3B]}}),
-    
+    {Work3A,Work3B} = start_and_trace(all, A3A=[12,13], A3B=[13,12]),
+    expect({trace,Work3A,call,{?MODULE,worker_foo,[A3A]}}),
+    expect({trace,Work3B,call,{?MODULE,worker_foo,[A3B]}}),
+
     ok.
 
 start_and_trace(Flag, A1, A2) ->
@@ -142,33 +120,33 @@ start_and_trace(Flag, A1, A2) ->
     call_worker(W1, A1),
     call_worker(W2, A2),
     case Flag of
-	new ->
-	    {flags,[call]} = trace_info(new, flags),
-	    {tracer,_} = trace_info(new, tracer);
-	_Other ->
-	    ok
+        new ->
+            {flags,[call]} = trace_info(new, flags),
+            {tracer,_} = trace_info(new, tracer);
+        _Other ->
+            ok
     end,
     trace_pid(Flag, false, [call]),
     {W1,W2}.
 
 start_worker() ->
-    ?line spawn(fun worker_loop/0).
+    spawn(fun worker_loop/0).
 
 call_worker(Pid, Arg) ->
     Pid ! {self(),{call,Arg}},
     receive
-	{result,Res} -> Res
+        {result,Res} -> Res
     after 5000 ->
-	    ?line ?t:fail(no_answer_from_worker)
+              ct:fail(no_answer_from_worker)
     end.
 
 worker_loop() ->
     receive
-	{From,{call,Arg}} ->
-	    From ! {result,?MODULE:worker_foo(Arg)},
-	    worker_loop();
-	Other ->
-	    exit({unexpected_message,Other})
+        {From,{call,Arg}} ->
+            From ! {result,?MODULE:worker_foo(Arg)},
+            worker_loop();
+        Other ->
+            exit({unexpected_message,Other})
     end.
 
 worker_foo(_Arg) ->
@@ -177,98 +155,98 @@ worker_foo(_Arg) ->
 %% Basic test of the call tracing (we trace one process).
 basic(_Config) ->
     case test_server:is_native(lists) of
-	true -> {skip,"lists is native"};
-	false -> basic()
+        true -> {skip,"lists is native"};
+        false -> basic()
     end.
 
 basic() ->
-    ?line start_tracer(),
-    ?line trace_info(self(), flags),
-    ?line trace_info(self(), tracer),
-    ?line 0 = trace_func({?MODULE,no_such_function,0}, []),
-    ?line {traced,undefined} = 
-	trace_info({?MODULE,no_such_function,0}, traced),
-    ?line {match_spec, undefined} = 
-	trace_info({?MODULE,no_such_function,0}, match_spec),
+    start_tracer(),
+    trace_info(self(), flags),
+    trace_info(self(), tracer),
+    0 = trace_func({?MODULE,no_such_function,0}, []),
+    {traced,undefined} = 
+    trace_info({?MODULE,no_such_function,0}, traced),
+    {match_spec, undefined} = 
+    trace_info({?MODULE,no_such_function,0}, match_spec),
 
     %% Trace some functions...
 
-    ?line trace_func({lists,'_','_'}, []),
+    trace_func({lists,'_','_'}, []),
 
     %% Make sure that tracing the same functions more than once
     %% does not cause any problems.
-    ?line 3 = trace_func({?MODULE,foo,'_'}, true),
-    ?line 3 = trace_func({?MODULE,foo,'_'}, true),
-    ?line 1 = trace_func({?MODULE,bar,0}, true),
-    ?line 1 = trace_func({?MODULE,bar,0}, true),
-    ?line {traced,global} = trace_info({?MODULE,bar,0}, traced),
-    ?line 1 = trace_func({erlang,list_to_integer,1}, true),
-    ?line {traced,global} = trace_info({erlang,list_to_integer,1}, traced),
+    3 = trace_func({?MODULE,foo,'_'}, true),
+    3 = trace_func({?MODULE,foo,'_'}, true),
+    1 = trace_func({?MODULE,bar,0}, true),
+    1 = trace_func({?MODULE,bar,0}, true),
+    {traced,global} = trace_info({?MODULE,bar,0}, traced),
+    1 = trace_func({erlang,list_to_integer,1}, true),
+    {traced,global} = trace_info({erlang,list_to_integer,1}, traced),
 
     %% ... and call them...
 
-    ?line AList = [x,y,z],
-    ?line true = lists:member(y, AList),
-    ?line foo0 = ?MODULE:foo(),
-    ?line 4 = ?MODULE:foo(3),
-    ?line 11 = ?MODULE:foo(7, 4),
-    ?line ok = ?MODULE:bar(),
-    ?line 42 = list_to_integer(non_literal("42")),
+    AList = [x,y,z],
+    true = lists:member(y, AList),
+    foo0 = ?MODULE:foo(),
+    4 = ?MODULE:foo(3),
+    11 = ?MODULE:foo(7, 4),
+    ok = ?MODULE:bar(),
+    42 = list_to_integer(non_literal("42")),
 
     %% ... make sure the we got trace messages (but not for ?MODULE:expect/1).
 
-    ?line Self = self(),
-    ?line ?MODULE:expect({trace,Self,call,{lists,member,[y,AList]}}),
-    ?line ?MODULE:expect({trace,Self,call,{?MODULE,foo,[]}}),
-    ?line ?MODULE:expect({trace,Self,call,{?MODULE,foo,[3]}}),
-    ?line ?MODULE:expect({trace,Self,call,{?MODULE,foo,[7,4]}}),
-    ?line ?MODULE:expect({trace,Self,call,{?MODULE,bar,[]}}),
-    ?line ?MODULE:expect({trace,Self,call,{erlang,list_to_integer,["42"]}}),
+    Self = self(),
+    ?MODULE:expect({trace,Self,call,{lists,member,[y,AList]}}),
+    ?MODULE:expect({trace,Self,call,{?MODULE,foo,[]}}),
+    ?MODULE:expect({trace,Self,call,{?MODULE,foo,[3]}}),
+    ?MODULE:expect({trace,Self,call,{?MODULE,foo,[7,4]}}),
+    ?MODULE:expect({trace,Self,call,{?MODULE,bar,[]}}),
+    ?MODULE:expect({trace,Self,call,{erlang,list_to_integer,["42"]}}),
 
     %% Turn off trace for this module and call functions...
 
-    ?line trace_func({?MODULE,'_','_'}, false),
-    ?line {traced,false} = trace_info({?MODULE,bar,0}, traced),
-    ?line foo0 = ?MODULE:foo(),
-    ?line 4 = ?MODULE:foo(3),
-    ?line 11 = ?MODULE:foo(7, 4),
-    ?line ok = ?MODULE:bar(),
-    ?line [1,2,3,4,5,6,7,8,9,10] = lists:seq(1, 10),
-    ?line 777 = list_to_integer(non_literal("777")),
+    trace_func({?MODULE,'_','_'}, false),
+    {traced,false} = trace_info({?MODULE,bar,0}, traced),
+    foo0 = ?MODULE:foo(),
+    4 = ?MODULE:foo(3),
+    11 = ?MODULE:foo(7, 4),
+    ok = ?MODULE:bar(),
+    [1,2,3,4,5,6,7,8,9,10] = lists:seq(1, 10),
+    777 = list_to_integer(non_literal("777")),
 
     %% ... turn on all trace messages...
 
-    ?line trace_func({'_','_','_'}, false),
-    ?line [b,a] = lists:reverse([a,b]),
+    trace_func({'_','_','_'}, false),
+    [b,a] = lists:reverse([a,b]),
 
     %% Read out the remaing trace messages.
 
-    ?line ?MODULE:expect({trace,Self,call,{lists,seq,[1,10]}}),
-    ?line ?MODULE:expect({trace,Self,call,{erlang,list_to_integer,["777"]}}),
+    ?MODULE:expect({trace,Self,call,{lists,seq,[1,10]}}),
+    ?MODULE:expect({trace,Self,call,{erlang,list_to_integer,["777"]}}),
     receive
-	Any ->
-	    ?line ?t:fail({unexpected_message,Any})
+        Any ->
+            ct:fail({unexpected_message,Any})
     after 1 ->
-	    ok
+              ok
     end,
 
     %% Turn on and then off tracing on all external functions.
     %% This might cause the emulator to crasch later if it doesn't
     %% restore all export entries properly.
 
-    ?line AllFuncs = trace_func({'_','_','_'}, true),
+    AllFuncs = trace_func({'_','_','_'}, true),
     io:format("AllFuncs = ~p", [AllFuncs]),
     %% Make sure that a traced, exported function can still be found.
-    ?line true = erlang:function_exported(error_handler, undefined_function, 3),
-    ?line AllFuncs = trace_func({'_','_','_'}, false),
-    ?line erlang:trace_delivered(all),
+    true = erlang:function_exported(error_handler, undefined_function, 3),
+    AllFuncs = trace_func({'_','_','_'}, false),
+    erlang:trace_delivered(all),
     receive
-	{trace_delivered,_,_} -> ok
+        {trace_delivered,_,_} -> ok
     end,
     c:flush(),					% Print the traces messages.
     c:flush(),					% Print the traces messages.
 
-    ?line {traced,false} = trace_info({erlang,list_to_integer,1}, traced),
+    {traced,false} = trace_info({erlang,list_to_integer,1}, traced),
 
     ok.
 
@@ -287,8 +265,8 @@ foo(X, Y) -> X+Y.
 %% This test case was written to verify that we do not change
 %% any behaviour with the introduction of "block-free" upgrade in R16.
 %% In short: Do not refer to this test case as an authority of how it must work.
-upgrade(doc) ->
-    "Test tracing on module being upgraded";
+
+%% Test tracing on module being upgraded
 upgrade(Config) when is_list(Config) ->
     V1 = compile_version(my_upgrade_test, 1, Config),
     V2 = compile_version(my_upgrade_test, 2, Config),
@@ -304,8 +282,8 @@ upgrade_do(V1, V2, TraceLocalVersion) ->
 
     trace_func({my_upgrade_test,'_','_'}, [], [global]),
     case TraceLocalVersion of
-	true -> trace_func({my_upgrade_test,local_version,0}, [], [local]);
-	_ -> ok
+        true -> trace_func({my_upgrade_test,local_version,0}, [], [local]);
+        _ -> ok
     end,
     1 = my_upgrade_test:version(),
     1 = my_upgrade_test:do_local(),
@@ -320,15 +298,15 @@ upgrade_do(V1, V2, TraceLocalVersion) ->
     expect({trace,Self,call,{my_upgrade_test,do_local,[]}}),
     expect({trace,Self,call,{my_upgrade_test,do_real_local,[]}}),
     case TraceLocalVersion of
-	true -> expect({trace,Self,call,{my_upgrade_test,local_version,[]}});
-	_ -> ok
+        true -> expect({trace,Self,call,{my_upgrade_test,local_version,[]}});
+        _ -> ok
     end,
     expect({trace,Self,call,{my_upgrade_test,make_fun_exp,[]}}),
     expect({trace,Self,call,{my_upgrade_test,make_fun_local,[]}}),
     expect({trace,Self,call,{my_upgrade_test,version,[]}}), % F1_exp
     case TraceLocalVersion of
-	true -> expect({trace,Self,call,{my_upgrade_test,local_version,[]}}); % F1_loc
-	_ -> ok
+        true -> expect({trace,Self,call,{my_upgrade_test,local_version,[]}}); % F1_loc
+        _ -> ok
     end,
 
     {module,my_upgrade_test} = erlang:load_module(my_upgrade_test, V2),
@@ -350,8 +328,8 @@ upgrade_do(V1, V2, TraceLocalVersion) ->
 
     trace_func({my_upgrade_test,'_','_'}, [], [global]),
     case TraceLocalVersion of
-	true -> trace_func({my_upgrade_test,local_version,0}, [], [local]);
-	_ -> ok
+        true -> trace_func({my_upgrade_test,local_version,0}, [], [local]);
+        _ -> ok
     end,
     2 = my_upgrade_test:version(),
     2 = my_upgrade_test:do_local(),
@@ -363,13 +341,13 @@ upgrade_do(V1, V2, TraceLocalVersion) ->
     expect({trace,Self,call,{my_upgrade_test,do_local,[]}}),
     expect({trace,Self,call,{my_upgrade_test,do_real_local,[]}}),
     case TraceLocalVersion of
-	true -> expect({trace,Self,call,{my_upgrade_test,local_version,[]}});
-	_ -> ok
+        true -> expect({trace,Self,call,{my_upgrade_test,local_version,[]}});
+        _ -> ok
     end,
     expect({trace,Self,call,{my_upgrade_test,version,[]}}), % F2_exp
     case TraceLocalVersion of
-	true -> expect({trace,Self,call,{my_upgrade_test,local_version,[]}}); % F2_loc
-	_ -> ok
+        true -> expect({trace,Self,call,{my_upgrade_test,local_version,[]}}); % F2_loc
+        _ -> ok
     end,
 
     true = erlang:delete_module(my_upgrade_test),
@@ -385,10 +363,10 @@ upgrade_do(V1, V2, TraceLocalVersion) ->
     ok.
 
 compile_version(Module, Version, Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     File = filename:join(Data, atom_to_list(Module)),
     {ok,Module,Bin} = compile:file(File, [{d,'VERSION',Version},
-					    binary,report]),
+                                          binary,report]),
     Bin.
 
 
@@ -397,162 +375,157 @@ compile_version(Module, Version, Config) ->
 %% Also, test the '{tracer,Pid}' option.
 flags(_Config) ->
     case test_server:is_native(filename) of
-	true -> {skip,"filename is native"};
-	false -> flags()
+        true -> {skip,"filename is native"};
+        false -> flags()
     end.
 
 flags() ->
-    ?line Tracer = start_tracer_loop(),
-    ?line trace_pid(self(), true, [call,{tracer,Tracer}]),
+    Tracer = start_tracer_loop(),
+    trace_pid(self(), true, [call,{tracer,Tracer}]),
 
     %% Trace some functions...
 
-    ?line trace_func({filename,'_','_'}, true),
+    trace_func({filename,'_','_'}, true),
 
     %% ... and call them...
 
-    ?line Self = self(),
-    ?line filename:absname("nisse"),
-    ?line ?MODULE:expect({trace,Self,call,{filename,absname,["nisse"]}}),
-    ?line trace_pid(Self, true, [call,arity]),
-    ?line filename:absname("kalle"),
-    ?line filename:absname("kalle", "/root"),
-    ?line ?MODULE:expect({trace,Self,call,{filename,absname,1}}),
-    ?line ?MODULE:expect({trace,Self,call,{filename,absname,2}}),
-    ?line trace_info(Self, flags),
+    Self = self(),
+    filename:absname("nisse"),
+    ?MODULE:expect({trace,Self,call,{filename,absname,["nisse"]}}),
+    trace_pid(Self, true, [call,arity]),
+    filename:absname("kalle"),
+    filename:absname("kalle", "/root"),
+    ?MODULE:expect({trace,Self,call,{filename,absname,1}}),
+    ?MODULE:expect({trace,Self,call,{filename,absname,2}}),
+    trace_info(Self, flags),
 
     %% Timestamp + arity.
 
     flag_test(fun() ->
-		      ?line trace_pid(Self, true, [timestamp]),
-		      ?line "dum" = filename:basename("/abcd/dum"),
-		      ?line Ts = expect({trace_ts,Self,call,{filename,basename,1},ts}),
-		      ?line trace_info(Self, flags),
-		      Ts
-	      end),
+                      trace_pid(Self, true, [timestamp]),
+                      "dum" = filename:basename("/abcd/dum"),
+                      Ts = expect({trace_ts,Self,call,{filename,basename,1},ts}),
+                      trace_info(Self, flags),
+                      Ts
+              end),
 
     %% Timestamp.
 
-    ?line AnArg = "/abcd/hejsan",
+    AnArg = "/abcd/hejsan",
     flag_test(fun() ->
-		      ?line trace_pid(Self, false, [arity]),
-		      ?line "hejsan" = filename:basename(AnArg),
-		      ?line Ts = expect({trace_ts,Self,call,
-					 {filename,basename,[AnArg]},ts}),
-		      ?line trace_info(Self, flags),
-		      Ts
-	      end),
+                      trace_pid(Self, false, [arity]),
+                      "hejsan" = filename:basename(AnArg),
+                      Ts = expect({trace_ts,Self,call,
+                                   {filename,basename,[AnArg]},ts}),
+                      trace_info(Self, flags),
+                      Ts
+              end),
 
     %% All flags turned off.
 
-    ?line trace_pid(Self, false, [timestamp]),
-    ?line AnotherArg = filename:join(AnArg, "hoppsan"),
-    ?line "hoppsan" = filename:basename(AnotherArg),
-    ?line expect({trace,Self,call,{filename,join,[AnArg,"hoppsan"]}}),
-    ?line expect({trace,Self,call,{filename,basename,[AnotherArg]}}),
-    ?line trace_info(Self, flags),
-    
+    trace_pid(Self, false, [timestamp]),
+    AnotherArg = filename:join(AnArg, "hoppsan"),
+    "hoppsan" = filename:basename(AnotherArg),
+    expect({trace,Self,call,{filename,join,[AnArg,"hoppsan"]}}),
+    expect({trace,Self,call,{filename,basename,[AnotherArg]}}),
+    trace_info(Self, flags),
+
     ok.
 
 flag_test(Test) ->
     Now = now(),
     Ts = Test(),
     case timer:now_diff(Ts, Now) of
-	Time when Time < 5*1000000 ->
-	    %% Reasonable short time.
-	    ok;
-	_Diff ->
-	    %% Too large difference.
-	    io:format("Now = ~p\n", [Now]),
-	    io:format("Ts = ~p\n", [Ts]),
-	    ?line ?t:fail()
+        Time when Time < 5*1000000 ->
+            %% Reasonable short time.
+            ok;
+        _Diff ->
+            %% Too large difference.
+            ct:fail("Now = ~p, Ts = ~p", [Now, Ts])
     end,
     flag_test_cpu_timestamp(Test).
 
 flag_test_cpu_timestamp(Test) ->
     try erlang:trace(all, true, [cpu_timestamp]) of
-	_ ->
-	    io:format("CPU timestamps"),
-	    Ts = Test(),
-	    erlang:trace(all, false, [cpu_timestamp]),
-	    Origin = {0,0,0},
-	    Hour = 3600*1000000,
-	    case timer:now_diff(Ts, Origin) of
-		Diff when Diff < 4*Hour ->
-		    %% In the worst case, CPU timestamps count from when this
-		    %% Erlang emulator was started. The above test is a conservative
-		    %% test that all CPU timestamps should pass.
-		    ok;
-		_Time ->
-		    io:format("Strange CPU timestamp: ~p", [Ts]),
-		    ?line ?t:fail()
-	    end,
-	    io:format("Turned off CPU timestamps")
+        _ ->
+            io:format("CPU timestamps"),
+            Ts = Test(),
+            erlang:trace(all, false, [cpu_timestamp]),
+            Origin = {0,0,0},
+            Hour = 3600*1000000,
+            case timer:now_diff(Ts, Origin) of
+                Diff when Diff < 4*Hour ->
+                    %% In the worst case, CPU timestamps count from when this
+                    %% Erlang emulator was started. The above test is a conservative
+                    %% test that all CPU timestamps should pass.
+                    ok;
+                _Time ->
+                    ct:fail("Strange CPU timestamp: ~p", [Ts])
+            end,
+            io:format("Turned off CPU timestamps")
     catch
-	error:badarg -> ok
+        error:badarg -> ok
     end.
 
-errors(doc) -> "Test bad arguments for trace/3 and trace_pattern/3.";
-errors(suite) -> [];
+%% Test bad arguments for trace/3 and trace_pattern/3.
 errors(Config) when is_list(Config) ->
-    ?line expect_badarg_pid(aaa, true, []),
-    ?line expect_badarg_pid({pid,dum}, false, []),
-    ?line expect_badarg_func({'_','_',1}, []),
-    ?line expect_badarg_func({'_',gosh,1}, []),
-    ?line expect_badarg_func({xxx,'_',2}, []),
-    ?line expect_badarg_func({xxx,yyy,b}, glurp),
+    expect_badarg_pid(aaa, true, []),
+    expect_badarg_pid({pid,dum}, false, []),
+    expect_badarg_func({'_','_',1}, []),
+    expect_badarg_func({'_',gosh,1}, []),
+    expect_badarg_func({xxx,'_',2}, []),
+    expect_badarg_func({xxx,yyy,b}, glurp),
     ok.
 
 expect_badarg_pid(What, How, Flags) ->
     case catch erlang:trace(What, How, Flags) of
-	{'EXIT',{badarg,Where}} ->
-	    io:format("trace(~p, ~p, ~p) ->\n  {'EXIT',{badarg,~p}}",
-		      [What,How,Flags,Where]),
-	    ok;
-	Other ->
-	    io:format("trace(~p, ~p, ~p) -> ~p",
-		      [What,How,Flags,Other]),
-	    ?t:fail({unexpected,Other})
+        {'EXIT',{badarg,Where}} ->
+            io:format("trace(~p, ~p, ~p) ->\n  {'EXIT',{badarg,~p}}",
+                      [What,How,Flags,Where]),
+            ok;
+        Other ->
+            io:format("trace(~p, ~p, ~p) -> ~p",
+                      [What,How,Flags,Other]),
+            ct:fail({unexpected,Other})
     end.
 
 expect_badarg_func(MFA, Pattern) ->
     case catch erlang:trace_pattern(MFA, Pattern) of
-	{'EXIT',{badarg,Where}} ->
-	    io:format("trace_pattern(~p, ~p) ->\n  {'EXIT',{badarg,~p}}",
-		      [MFA,Pattern,Where]),
-	    ok;
-	Other ->
-	    io:format("trace_pattern(~p, ~p) -> ~p",
-		      [MFA, Pattern, Other]),
-	    ?t:fail({unexpected,Other})
+        {'EXIT',{badarg,Where}} ->
+            io:format("trace_pattern(~p, ~p) ->\n  {'EXIT',{badarg,~p}}",
+                      [MFA,Pattern,Where]),
+            ok;
+        Other ->
+            io:format("trace_pattern(~p, ~p) -> ~p",
+                      [MFA, Pattern, Other]),
+            ct:fail({unexpected,Other})
     end.
 
-pam(doc) -> "Basic test of PAM.";
-pam(suite) -> [];
+%% Basic test of PAM.
 pam(Config) when is_list(Config) ->
-    ?line start_tracer(),
-    ?line Self = self(),
+    start_tracer(),
+    Self = self(),
 
     %% Build the match program.
-    ?line Prog1 = {[{a,tuple},'$1'],[],[]},
-    ?line Prog2 = {[{a,bigger,tuple},'$1'],[],[{message,'$1'}]},
-    ?line MatchProg = [Prog1,Prog2],
-    ?line pam_trace(MatchProg),
+    Prog1 = {[{a,tuple},'$1'],[],[]},
+    Prog2 = {[{a,bigger,tuple},'$1'],[],[{message,'$1'}]},
+    MatchProg = [Prog1,Prog2],
+    pam_trace(MatchProg),
 
     %% Do some calls.
-    ?line ?MODULE:pam_foo(not_a_tuple, [a,b]),
-    ?line ?MODULE:pam_foo({a,tuple}, [a,list]),
-    ?line ?MODULE:pam_foo([this,one,will,'not',match], dummy_arg),
-    ?line LongList = lists:seq(1,10),
-    ?line ?MODULE:pam_foo({a,bigger,tuple}, LongList),
+    ?MODULE:pam_foo(not_a_tuple, [a,b]),
+    ?MODULE:pam_foo({a,tuple}, [a,list]),
+    ?MODULE:pam_foo([this,one,will,'not',match], dummy_arg),
+    LongList = lists:seq(1,10),
+    ?MODULE:pam_foo({a,bigger,tuple}, LongList),
 
     %% Check that we get the correct trace messages.
-    ?line expect({trace,Self,call,{?MODULE,pam_foo,[{a,tuple},[a,list]]}}),
-    ?line expect({trace,Self,call,
-		  {?MODULE,pam_foo,[{a,bigger,tuple},LongList]},
-		  LongList}),
+    expect({trace,Self,call,{?MODULE,pam_foo,[{a,tuple},[a,list]]}}),
+    expect({trace,Self,call,
+            {?MODULE,pam_foo,[{a,bigger,tuple},LongList]},
+            LongList}),
 
-    ?line trace_func({?MODULE,pam_foo,'_'}, false),
+    trace_func({?MODULE,pam_foo,'_'}, false),
     ok.
 
 pam_trace(Prog) ->
@@ -567,38 +540,38 @@ pam_foo(A, B) ->
 %% Test changing PAM programs for a function.
 change_pam(_Config) ->
     case test_server:is_native(lists) of
-	true -> {skip,"lists is native"};
-	false -> change_pam()
+        true -> {skip,"lists is native"};
+        false -> change_pam()
     end.
 
 change_pam() ->
-    ?line start_tracer(),
-    ?line Self = self(),
+    start_tracer(),
+    Self = self(),
 
     %% Install the first match program.
     %% Test using timestamp at the same time.
 
-    ?line trace_pid(Self, true, [call,arity,timestamp]),
-    ?line Prog1 = [{['$1','$2'],[],[{message,'$1'}]}],
-    ?line change_pam_trace(Prog1),
-    ?line [x,y] = lists:append(id([x]), id([y])),
-    ?line {heap_size,_} = erlang:process_info(Self, heap_size),
-    ?line expect({trace_ts,Self,call,{lists,append,2},[x],ts}),
-    ?line expect({trace_ts,Self,call,{erlang,process_info,2},Self,ts}),
+    trace_pid(Self, true, [call,arity,timestamp]),
+    Prog1 = [{['$1','$2'],[],[{message,'$1'}]}],
+    change_pam_trace(Prog1),
+    [x,y] = lists:append(id([x]), id([y])),
+    {heap_size,_} = erlang:process_info(Self, heap_size),
+    expect({trace_ts,Self,call,{lists,append,2},[x],ts}),
+    expect({trace_ts,Self,call,{erlang,process_info,2},Self,ts}),
 
     %% Install a new PAM program.
 
-    ?line Prog2 = [{['$1','$2'],[],[{message,'$2'}]}],
-    ?line change_pam_trace(Prog2),
-    ?line [xx,yy] = lists:append(id([xx]), id([yy])),
-    ?line {current_function,_} = erlang:process_info(Self, current_function),
-    ?line expect({trace_ts,Self,call,{lists,append,2},[yy],ts}),
-    ?line expect({trace_ts,Self,call,{erlang,process_info,2},current_function,ts}),
+    Prog2 = [{['$1','$2'],[],[{message,'$2'}]}],
+    change_pam_trace(Prog2),
+    [xx,yy] = lists:append(id([xx]), id([yy])),
+    {current_function,_} = erlang:process_info(Self, current_function),
+    expect({trace_ts,Self,call,{lists,append,2},[yy],ts}),
+    expect({trace_ts,Self,call,{erlang,process_info,2},current_function,ts}),
 
-    ?line 1 = trace_func({lists,append,2}, false),
-    ?line 1 = trace_func({erlang,process_info,2}, false),
-    ?line {match_spec,false} = trace_info({lists,append,2}, match_spec),
-    ?line {match_spec,false} = trace_info({erlang,process_info,2}, match_spec),
+    1 = trace_func({lists,append,2}, false),
+    1 = trace_func({erlang,process_info,2}, false),
+    {match_spec,false} = trace_info({lists,append,2}, match_spec),
+    {match_spec,false} = trace_info({erlang,process_info,2}, match_spec),
 
     ok.
 
@@ -611,71 +584,71 @@ change_pam_trace(Prog) ->
 
 return_trace(_Config) ->
     case test_server:is_native(lists) of
-	true -> {skip,"lists is native"};
-	false -> return_trace()
+        true -> {skip,"lists is native"};
+        false -> return_trace()
     end.
 
 return_trace() ->
     X = {save,me},
-    ?line start_tracer(),
-    ?line Self = self(),
+    start_tracer(),
+    Self = self(),
 
     %% Test call and return trace and timestamp.
 
-    ?line trace_pid(Self, true, [call,timestamp]),
+    trace_pid(Self, true, [call,timestamp]),
     Stupid = {pointless,tuple},
-    ?line Prog1 = [{['$1','$2'],[],[{return_trace},{message,{Stupid}}]}],
-    ?line 1 = trace_func({lists,append,2}, Prog1),
-    ?line 1 = trace_func({erlang,process_info,2}, Prog1),
-    ?line {match_spec,Prog1} = trace_info({lists,append,2}, match_spec),
-    ?line {match_spec,Prog1} = trace_info({erlang,process_info,2}, match_spec),
+    Prog1 = [{['$1','$2'],[],[{return_trace},{message,{Stupid}}]}],
+    1 = trace_func({lists,append,2}, Prog1),
+    1 = trace_func({erlang,process_info,2}, Prog1),
+    {match_spec,Prog1} = trace_info({lists,append,2}, match_spec),
+    {match_spec,Prog1} = trace_info({erlang,process_info,2}, match_spec),
 
-    ?line [x,y] = lists:append(id([x]), id([y])),
+    [x,y] = lists:append(id([x]), id([y])),
     Current = {current_function,{?MODULE,return_trace,0}},
-    ?line Current = erlang:process_info(Self, current_function),
-    ?line expect({trace_ts,Self,call,{lists,append,[[x],[y]]},Stupid,ts}),
-    ?line expect({trace_ts,Self,return_from,{lists,append,2},[x,y],ts}),
-    ?line expect({trace_ts,Self,call,{erlang,process_info,[Self,current_function]},
-		  Stupid,ts}),
-    ?line expect({trace_ts,Self,return_from,{erlang,process_info,2},Current,ts}),
+    Current = erlang:process_info(Self, current_function),
+    expect({trace_ts,Self,call,{lists,append,[[x],[y]]},Stupid,ts}),
+    expect({trace_ts,Self,return_from,{lists,append,2},[x,y],ts}),
+    expect({trace_ts,Self,call,{erlang,process_info,[Self,current_function]},
+            Stupid,ts}),
+    expect({trace_ts,Self,return_from,{erlang,process_info,2},Current,ts}),
 
     %% Try catch/exit.
 
-    ?line 1 = trace_func({?MODULE,nasty,0}, [{[],[],[{return_trace},{message,false}]}]),
-    ?line {'EXIT',good_bye} = (catch ?MODULE:nasty()),
-    ?line 1 = trace_func({?MODULE,nasty,0}, false),
+    1 = trace_func({?MODULE,nasty,0}, [{[],[],[{return_trace},{message,false}]}]),
+    {'EXIT',good_bye} = (catch ?MODULE:nasty()),
+    1 = trace_func({?MODULE,nasty,0}, false),
 
     %% Turn off trace.
 
-    ?line 1 = trace_func({lists,append,2}, false),
-    ?line 1 = trace_func({erlang,process_info,2}, false),
-    ?line {match_spec,false} = trace_info({lists,append,2}, match_spec),
-    ?line {match_spec,false} = trace_info({erlang,process_info,2}, match_spec),
+    1 = trace_func({lists,append,2}, false),
+    1 = trace_func({erlang,process_info,2}, false),
+    {match_spec,false} = trace_info({lists,append,2}, match_spec),
+    {match_spec,false} = trace_info({erlang,process_info,2}, match_spec),
 
     %% No timestamp, no trace message for call.
 
-    ?line trace_pid(Self, false, [timestamp]),
-    ?line Prog2 = [{['$1','$2'],[],[{return_trace},{message,false}]},
-		   {['$1'],[],[{return_trace},{message,false}]}],
-    ?line 1 = trace_func({lists,seq,2}, Prog2),
-    ?line 1 = trace_func({erlang,atom_to_list,1}, Prog2),
-    ?line {match_spec,Prog2} = trace_info({lists,seq,2}, match_spec),
-    ?line {match_spec,Prog2} = trace_info({erlang,atom_to_list,1}, match_spec),
+    trace_pid(Self, false, [timestamp]),
+    Prog2 = [{['$1','$2'],[],[{return_trace},{message,false}]},
+             {['$1'],[],[{return_trace},{message,false}]}],
+    1 = trace_func({lists,seq,2}, Prog2),
+    1 = trace_func({erlang,atom_to_list,1}, Prog2),
+    {match_spec,Prog2} = trace_info({lists,seq,2}, match_spec),
+    {match_spec,Prog2} = trace_info({erlang,atom_to_list,1}, match_spec),
 
-    ?line lists:seq(2, 7),
-    ?line _ = atom_to_list(non_literal(nisse)),
-    ?line expect({trace,Self,return_from,{lists,seq,2},[2,3,4,5,6,7]}),
-    ?line expect({trace,Self,return_from,{erlang,atom_to_list,1},"nisse"}),
+    lists:seq(2, 7),
+    _ = atom_to_list(non_literal(nisse)),
+    expect({trace,Self,return_from,{lists,seq,2},[2,3,4,5,6,7]}),
+    expect({trace,Self,return_from,{erlang,atom_to_list,1},"nisse"}),
 
     %% Turn off trace.
 
-    ?line 1 = trace_func({lists,seq,2}, false),
-    ?line 1 = trace_func({erlang,atom_to_list,1}, false),
-    ?line {match_spec,false} = trace_info({lists,seq,2}, match_spec),
-    ?line {match_spec,false} = trace_info({erlang,atom_to_list,1}, match_spec),
+    1 = trace_func({lists,seq,2}, false),
+    1 = trace_func({erlang,atom_to_list,1}, false),
+    {match_spec,false} = trace_info({lists,seq,2}, match_spec),
+    {match_spec,false} = trace_info({erlang,atom_to_list,1}, match_spec),
+
+    {save,me} = X,
 
-    ?line {save,me} = X,
-    
     ok.
 
 nasty() ->
@@ -683,396 +656,393 @@ nasty() ->
 
 exception_trace(_Config) ->
     case test_server:is_native(lists) of
-	true -> {skip,"lists is native"};
-	false -> exception_trace()
+        true -> {skip,"lists is native"};
+        false -> exception_trace()
     end.
 
 exception_trace() ->
     X = {save,me},
-    ?line start_tracer(),
-    ?line Self = self(),
+    start_tracer(),
+    Self = self(),
 
     %% Test call and return trace and timestamp.
 
-    ?line trace_pid(Self, true, [call,timestamp]),
+    trace_pid(Self, true, [call,timestamp]),
     Stupid = {pointless,tuple},
-    ?line Prog1 = [{['$1','$2'],[],[{exception_trace},{message,{Stupid}}]}],
-    ?line 1 = trace_func({lists,append,2}, Prog1),
-    ?line 1 = trace_func({erlang,process_info,2}, Prog1),
-    ?line {match_spec,Prog1} = trace_info({lists,append,2}, match_spec),
-    ?line {match_spec,Prog1} = 
-	trace_info({erlang,process_info,2}, match_spec),
-
-    ?line [x,y] = lists:append(id([x]), id([y])),
+    Prog1 = [{['$1','$2'],[],[{exception_trace},{message,{Stupid}}]}],
+    1 = trace_func({lists,append,2}, Prog1),
+    1 = trace_func({erlang,process_info,2}, Prog1),
+    {match_spec,Prog1} = trace_info({lists,append,2}, match_spec),
+    {match_spec,Prog1} = 
+    trace_info({erlang,process_info,2}, match_spec),
+
+    [x,y] = lists:append(id([x]), id([y])),
     Current = {current_function,{?MODULE,exception_trace,0}},
-    ?line Current = erlang:process_info(Self, current_function),
-    ?line expect({trace_ts,Self,call,{lists,append,[[x],[y]]},Stupid,ts}),
-    ?line expect({trace_ts,Self,return_from,{lists,append,2},[x,y],ts}),
-    ?line expect({trace_ts,Self,call,{erlang,process_info,
-				      [Self,current_function]},
-		  Stupid,ts}),
-    ?line expect({trace_ts,Self,return_from,
-		  {erlang,process_info,2},Current,ts}),
+    Current = erlang:process_info(Self, current_function),
+    expect({trace_ts,Self,call,{lists,append,[[x],[y]]},Stupid,ts}),
+    expect({trace_ts,Self,return_from,{lists,append,2},[x,y],ts}),
+    expect({trace_ts,Self,call,{erlang,process_info,
+                                [Self,current_function]},
+            Stupid,ts}),
+    expect({trace_ts,Self,return_from,
+            {erlang,process_info,2},Current,ts}),
 
     %% Try catch/exit.
 
-    ?line 1 = trace_func({?MODULE,nasty,0}, 
-			 [{[],[],[{exception_trace},{message,false}]}]),
-    ?line {'EXIT',good_bye} = (catch ?MODULE:nasty()),
-    ?line expect({trace_ts,Self,exception_from,
-		  {?MODULE,nasty,0},{exit,good_bye},ts}),
-    ?line 1 = trace_func({?MODULE,nasty,0}, false),
+    1 = trace_func({?MODULE,nasty,0}, 
+                   [{[],[],[{exception_trace},{message,false}]}]),
+    {'EXIT',good_bye} = (catch ?MODULE:nasty()),
+    expect({trace_ts,Self,exception_from,
+            {?MODULE,nasty,0},{exit,good_bye},ts}),
+    1 = trace_func({?MODULE,nasty,0}, false),
 
     %% Turn off trace.
 
-    ?line 1 = trace_func({lists,append,2}, false),
-    ?line 1 = trace_func({erlang,process_info,2}, false),
-    ?line {match_spec,false} = trace_info({lists,append,2}, match_spec),
-    ?line {match_spec,false} = 
-	trace_info({erlang,process_info,2}, match_spec),
+    1 = trace_func({lists,append,2}, false),
+    1 = trace_func({erlang,process_info,2}, false),
+    {match_spec,false} = trace_info({lists,append,2}, match_spec),
+    {match_spec,false} = 
+    trace_info({erlang,process_info,2}, match_spec),
 
     %% No timestamp, no trace message for call.
 
-    ?line trace_pid(Self, false, [timestamp]),
-    ?line Prog2 = [{['$1','$2'],[],[{exception_trace},{message,false}]},
-		   {['$1'],[],[{exception_trace},{message,false}]}],
-    ?line 1 = trace_func({lists,seq,2}, Prog2),
-    ?line 1 = trace_func({erlang,atom_to_list,1}, Prog2),
-    ?line {match_spec,Prog2} = trace_info({lists,seq,2}, match_spec),
-    ?line {match_spec,Prog2} = 
-	trace_info({erlang,atom_to_list,1}, match_spec),
+    trace_pid(Self, false, [timestamp]),
+    Prog2 = [{['$1','$2'],[],[{exception_trace},{message,false}]},
+             {['$1'],[],[{exception_trace},{message,false}]}],
+    1 = trace_func({lists,seq,2}, Prog2),
+    1 = trace_func({erlang,atom_to_list,1}, Prog2),
+    {match_spec,Prog2} = trace_info({lists,seq,2}, match_spec),
+    {match_spec,Prog2} = 
+    trace_info({erlang,atom_to_list,1}, match_spec),
 
-    ?line lists:seq(2, 7),
-    ?line _ = atom_to_list(non_literal(nisse)),
-    ?line expect({trace,Self,return_from,{lists,seq,2},[2,3,4,5,6,7]}),
-    ?line expect({trace,Self,return_from,{erlang,atom_to_list,1},"nisse"}),
+    lists:seq(2, 7),
+    _ = atom_to_list(non_literal(nisse)),
+    expect({trace,Self,return_from,{lists,seq,2},[2,3,4,5,6,7]}),
+    expect({trace,Self,return_from,{erlang,atom_to_list,1},"nisse"}),
 
     %% Turn off trace.
 
-    ?line 1 = trace_func({lists,seq,2}, false),
-    ?line 1 = trace_func({erlang,atom_to_list,1}, false),
-    ?line {match_spec,false} = trace_info({lists,seq,2}, match_spec),
-    ?line {match_spec,false} = 
-	trace_info({erlang,atom_to_list,1}, match_spec),
+    1 = trace_func({lists,seq,2}, false),
+    1 = trace_func({erlang,atom_to_list,1}, false),
+    {match_spec,false} = trace_info({lists,seq,2}, match_spec),
+    {match_spec,false} = 
+    trace_info({erlang,atom_to_list,1}, match_spec),
 
-    ?line expect(),
-    ?line {save,me} = X,
+    expect(),
+    {save,me} = X,
     ok.
 
-on_load(doc) -> "Test the on_load argument for trace_pattern/3.";
-on_load(suite) -> [];
+%% Test the on_load argument for trace_pattern/3.
 on_load(Config) when is_list(Config) ->
-    ?line 0 = erlang:trace_pattern(on_load, []),
-    ?line {traced,global} = erlang:trace_info(on_load, traced),
-    ?line {match_spec,[]} = erlang:trace_info(on_load, match_spec),
+    0 = erlang:trace_pattern(on_load, []),
+    {traced,global} = erlang:trace_info(on_load, traced),
+    {match_spec,[]} = erlang:trace_info(on_load, match_spec),
 
-    ?line 0 = erlang:trace_pattern(on_load, true, [local]),
-    ?line {traced,local} = erlang:trace_info(on_load, traced),
-    ?line {match_spec,[]} = erlang:trace_info(on_load, match_spec),
+    0 = erlang:trace_pattern(on_load, true, [local]),
+    {traced,local} = erlang:trace_info(on_load, traced),
+    {match_spec,[]} = erlang:trace_info(on_load, match_spec),
 
-    ?line 0 = erlang:trace_pattern(on_load, false, [local]),
-    ?line {traced,false} = erlang:trace_info(on_load, traced),
-    ?line {match_spec,false} = erlang:trace_info(on_load, match_spec),
+    0 = erlang:trace_pattern(on_load, false, [local]),
+    {traced,false} = erlang:trace_info(on_load, traced),
+    {match_spec,false} = erlang:trace_info(on_load, match_spec),
 
-    ?line Pam1 = [{[],[],[{message,false}]}],
-    ?line 0 = erlang:trace_pattern(on_load, Pam1),
-    ?line {traced,global} = erlang:trace_info(on_load, traced),
-    ?line {match_spec,Pam1} = erlang:trace_info(on_load, match_spec),
+    Pam1 = [{[],[],[{message,false}]}],
+    0 = erlang:trace_pattern(on_load, Pam1),
+    {traced,global} = erlang:trace_info(on_load, traced),
+    {match_spec,Pam1} = erlang:trace_info(on_load, match_spec),
 
-    ?line 0 = erlang:trace_pattern(on_load, true, [local]),
-    ?line 0 = erlang:trace_pattern(on_load, false, [local]),
+    0 = erlang:trace_pattern(on_load, true, [local]),
+    0 = erlang:trace_pattern(on_load, false, [local]),
 
     ok.
 
 
 
-deep_exception(doc) -> "Test the new exception trace.";
-deep_exception(suite) -> [];
+%% Test the new exception trace.
 deep_exception(Config) when is_list(Config) ->
     deep_exception().
 
 deep_exception() ->
-    ?line start_tracer(),
-    ?line Self = self(),
-    ?line N = 200000,
-    ?line LongImproperList = seq(1, N-1, N),
-    
+    start_tracer(),
+    Self = self(),
+    N = 200000,
+    LongImproperList = seq(1, N-1, N),
+
     Prog = [{'_',[],[{exception_trace}]}],
-%%    ?line 1 = trace_pid(Self, true, [call]),
-    ?line 1 = trace_func({?MODULE,deep,'_'}, Prog),
-    ?line 1 = trace_func({?MODULE,deep_1,'_'}, Prog),
-    ?line 1 = trace_func({?MODULE,deep_2,'_'}, Prog),
-    ?line 1 = trace_func({?MODULE,deep_3,'_'}, Prog),
-    ?line 1 = trace_func({?MODULE,deep_4,'_'}, Prog),
-    ?line 1 = trace_func({?MODULE,deep_5,'_'}, Prog),
-    ?line 1 = trace_func({?MODULE,id,'_'}, Prog),
-    ?line 1 = trace_func({erlang,'++','_'}, Prog),
-    ?line 1 = trace_func({erlang,exit,1}, Prog),
-    ?line 1 = trace_func({erlang,throw,1}, Prog),
-    ?line 2 = trace_func({erlang,error,'_'}, Prog),
-    ?line 1 = trace_func({lists,reverse,2}, Prog),
-
-    ?line deep_exception(?LINE, exit, [paprika], 1, 
-			 [{trace,Self,call,{erlang,exit,[paprika]}},
-			  {trace,Self,exception_from,{erlang,exit,1},
-			   {exit,paprika}}], 
-			 exception_from, {exit,paprika}),
-    ?line deep_exception(?LINE, throw, [3.14], 2, 
-			 [{trace,Self,call,{erlang,throw,[3.14]}},
-			  {trace,Self,exception_from,{erlang,throw,1},
-			   {throw,3.14}}], 
-			 exception_from, {throw,3.14}),
-    ?line deep_exception(?LINE, error, [{paprika}], 3, 
-			 [{trace,Self,call,{erlang,error,[{paprika}]}},
-			  {trace,Self,exception_from,{erlang,error,1},
-			   {error,{paprika}}}], 
-			 exception_from, {error,{paprika}}),
-    ?line deep_exception(?LINE, error, ["{paprika}",[]], 3, 
-			 [{trace,Self,call,{erlang,error,["{paprika}",[]]}},
-			  {trace,Self,exception_from,{erlang,error,2},
-			   {error,"{paprika}"}}], 
-			 exception_from, {error,"{paprika}"}),
-    ?line deep_exception(?LINE, id, [broccoli], 4, [], 
-			 return_from, broccoli),
-    ?line deep_exception(
-	    ?LINE, append, [1,2], 5,
-	    [{trace,Self,call,{erlang,'++',[1,2]}},
-	     {trace,Self,exception_from,{erlang,'++',2},{error,badarg}}],
-	    exception_from, {error,badarg}),
-    ?line deep_exception(?LINE, '=', [1,2], 6, [],
-			 exception_from, {error,{badmatch,2}}),
+    %%    1 = trace_pid(Self, true, [call]),
+    1 = trace_func({?MODULE,deep,'_'}, Prog),
+    1 = trace_func({?MODULE,deep_1,'_'}, Prog),
+    1 = trace_func({?MODULE,deep_2,'_'}, Prog),
+    1 = trace_func({?MODULE,deep_3,'_'}, Prog),
+    1 = trace_func({?MODULE,deep_4,'_'}, Prog),
+    1 = trace_func({?MODULE,deep_5,'_'}, Prog),
+    1 = trace_func({?MODULE,id,'_'}, Prog),
+    1 = trace_func({erlang,'++','_'}, Prog),
+    1 = trace_func({erlang,exit,1}, Prog),
+    1 = trace_func({erlang,throw,1}, Prog),
+    2 = trace_func({erlang,error,'_'}, Prog),
+    1 = trace_func({lists,reverse,2}, Prog),
+
+    deep_exception(?LINE, exit, [paprika], 1, 
+                   [{trace,Self,call,{erlang,exit,[paprika]}},
+                    {trace,Self,exception_from,{erlang,exit,1},
+                     {exit,paprika}}], 
+                   exception_from, {exit,paprika}),
+    deep_exception(?LINE, throw, [3.14], 2, 
+                   [{trace,Self,call,{erlang,throw,[3.14]}},
+                    {trace,Self,exception_from,{erlang,throw,1},
+                     {throw,3.14}}], 
+                   exception_from, {throw,3.14}),
+    deep_exception(?LINE, error, [{paprika}], 3, 
+                   [{trace,Self,call,{erlang,error,[{paprika}]}},
+                    {trace,Self,exception_from,{erlang,error,1},
+                     {error,{paprika}}}], 
+                   exception_from, {error,{paprika}}),
+    deep_exception(?LINE, error, ["{paprika}",[]], 3, 
+                   [{trace,Self,call,{erlang,error,["{paprika}",[]]}},
+                    {trace,Self,exception_from,{erlang,error,2},
+                     {error,"{paprika}"}}], 
+                   exception_from, {error,"{paprika}"}),
+    deep_exception(?LINE, id, [broccoli], 4, [], 
+                   return_from, broccoli),
+    deep_exception(
+      ?LINE, append, [1,2], 5,
+      [{trace,Self,call,{erlang,'++',[1,2]}},
+       {trace,Self,exception_from,{erlang,'++',2},{error,badarg}}],
+      exception_from, {error,badarg}),
+    deep_exception(?LINE, '=', [1,2], 6, [],
+                   exception_from, {error,{badmatch,2}}),
     %%
-    ?line io:format("== Subtest: ~w", [?LINE]),
-    ?line try lists:reverse(LongImproperList, []) of
-	      R1 -> test_server:fail({returned,abbr(R1)})
-	  catch error:badarg -> ok
-	  end,
-    ?line expect(fun ({trace,S,call,{lists,reverse,[L1,L2]}})
-		     when is_list(L1), is_list(L2), S == Self ->
-			 next;
-		     ({trace,S,exception_from,
-		       {lists,reverse,2},{error,badarg}}) 
-		     when S == Self ->
-			 expected;
-		     ('_') ->
-			 {trace,Self,exception_from,
-			  {lists,reverse,2},{error,badarg}};
-		     (_) ->
-			 {unexpected,
-			  {trace,Self,exception_from,
-			   {lists,reverse,2},{error,badarg}}}
-		 end),
-    ?line deep_exception(?LINE, deep_5, [1,2], 7, 
-			 [{trace,Self,call,{erlang,error,[undef]}},
-			  {trace,Self,exception_from,{erlang,error,1},
-			   {error,undef}}],
-			 exception_from, {error,undef}),
-    ?line deep_exception(?LINE, deep_5, [undef], 8, 
-			 [{trace,Self,call,{?MODULE,deep_5,[undef]}},
-			  {trace,Self,exception_from,{?MODULE,deep_5,1},
-			   {error,function_clause}}],
-			 exception_from, {error,function_clause}),
-    
+    io:format("== Subtest: ~w", [?LINE]),
+    try lists:reverse(LongImproperList, []) of
+        R1 -> ct:fail({returned,abbr(R1)})
+    catch error:badarg -> ok
+    end,
+    expect(fun ({trace,S,call,{lists,reverse,[L1,L2]}})
+                 when is_list(L1), is_list(L2), S == Self ->
+                   next;
+               ({trace,S,exception_from,
+                 {lists,reverse,2},{error,badarg}}) 
+                 when S == Self ->
+                   expected;
+               ('_') ->
+                   {trace,Self,exception_from,
+                    {lists,reverse,2},{error,badarg}};
+               (_) ->
+                   {unexpected,
+                    {trace,Self,exception_from,
+                     {lists,reverse,2},{error,badarg}}}
+           end),
+    deep_exception(?LINE, deep_5, [1,2], 7, 
+                   [{trace,Self,call,{erlang,error,[undef]}},
+                    {trace,Self,exception_from,{erlang,error,1},
+                     {error,undef}}],
+                   exception_from, {error,undef}),
+    deep_exception(?LINE, deep_5, [undef], 8, 
+                   [{trace,Self,call,{?MODULE,deep_5,[undef]}},
+                    {trace,Self,exception_from,{?MODULE,deep_5,1},
+                     {error,function_clause}}],
+                   exception_from, {error,function_clause}),
+
     %% Apply
     %%
-    ?line deep_exception(?LINE, apply, [erlang,error,[[mo|rot]]], 1, 
-			 [{trace,Self,call,{erlang,error,[[mo|rot]]}},
-			  {trace,Self,exception_from,{erlang,error,1},
-			   {error,[mo|rot]}}],
-			 exception_from, {error,[mo|rot]}),
-    ?line deep_exception(?LINE, apply, [erlang,error,[[mo|"rot"],[]]], 1, 
-			 [{trace,Self,call,{erlang,error,[[mo|"rot"],[]]}},
-			  {trace,Self,exception_from,{erlang,error,2},
-			   {error,[mo|"rot"]}}],
-			 exception_from, {error,[mo|"rot"]}),
-    ?line Morot = make_ref(),
-    ?line deep_exception(?LINE, apply, [erlang,throw,[Morot]], 3, 
-			 [{trace,Self,call,{erlang,throw,[Morot]}},
-			  {trace,Self,exception_from,{erlang,throw,1},
-			   {throw,Morot}}],
-			 exception_from, {throw,Morot}),
-    ?line deep_exception(?LINE, apply, [erlang,exit,[["morot"|Morot]]], 2, 
-			 [{trace,Self,call,{erlang,exit,[["morot"|Morot]]}},
-			  {trace,Self,exception_from,{erlang,exit,1},
-			   {exit,["morot"|Morot]}}],
-			 exception_from, {exit,["morot"|Morot]}),
-    ?line deep_exception(
-	    ?LINE, apply, [?MODULE,id,[spenat]], 4,
-	    [{trace,Self,call,{?MODULE,id,[spenat]}},
-	     {trace,Self,return_from,{?MODULE,id,1},spenat}],
-	    return_from, spenat),
-    ?line deep_exception(
-	    ?LINE, apply, [erlang,'++',[1,2]], 5,
-	    [{trace,Self,call,{erlang,'++',[1,2]}},
-	     {trace,Self,exception_from,{erlang,'++',2},{error,badarg}}],
-	    exception_from, {error,badarg}),
-    ?line io:format("== Subtest: ~w", [?LINE]),
-    ?line try apply(lists, reverse, [LongImproperList, []]) of
-	      R2 -> test_server:fail({returned,abbr(R2)})
-	  catch error:badarg -> ok
-	  end,
-    ?line expect(fun ({trace,S,call,{lists,reverse,[L1,L2]}})
-		     when is_list(L1), is_list(L2), S == Self ->
-			 next;
-		     ({trace,S,exception_from,
-		       {lists,reverse,2},{error,badarg}}) 
-		     when S == Self ->
-			 expected;
-		     ('_') ->
-			 {trace,Self,exception_from,
-			  {lists,reverse,2},{error,badarg}};
-		     (_) ->
-			 {unexpected,
-			  {trace,Self,exception_from,
-			   {lists,reverse,2},{error,badarg}}}
-		 end),
-    ?line deep_exception(?LINE, apply, [?MODULE,deep_5,[1,2]], 7, 
-			 [{trace,Self,call,{erlang,error,[undef]}},
-			  {trace,Self,exception_from,{erlang,error,1},
-			   {error,undef}}],
-			 exception_from, {error,undef}),
-    ?line deep_exception(?LINE, apply, [?MODULE,deep_5,[undef]], 8, 
-			 [{trace,Self,call,{?MODULE,deep_5,[undef]}},
-			  {trace,Self,exception_from,{?MODULE,deep_5,1},
-			   {error,function_clause}}],
-			 exception_from, {error,function_clause}),
+    deep_exception(?LINE, apply, [erlang,error,[[mo|rot]]], 1, 
+                   [{trace,Self,call,{erlang,error,[[mo|rot]]}},
+                    {trace,Self,exception_from,{erlang,error,1},
+                     {error,[mo|rot]}}],
+                   exception_from, {error,[mo|rot]}),
+    deep_exception(?LINE, apply, [erlang,error,[[mo|"rot"],[]]], 1, 
+                   [{trace,Self,call,{erlang,error,[[mo|"rot"],[]]}},
+                    {trace,Self,exception_from,{erlang,error,2},
+                     {error,[mo|"rot"]}}],
+                   exception_from, {error,[mo|"rot"]}),
+    Morot = make_ref(),
+    deep_exception(?LINE, apply, [erlang,throw,[Morot]], 3, 
+                   [{trace,Self,call,{erlang,throw,[Morot]}},
+                    {trace,Self,exception_from,{erlang,throw,1},
+                     {throw,Morot}}],
+                   exception_from, {throw,Morot}),
+    deep_exception(?LINE, apply, [erlang,exit,[["morot"|Morot]]], 2, 
+                   [{trace,Self,call,{erlang,exit,[["morot"|Morot]]}},
+                    {trace,Self,exception_from,{erlang,exit,1},
+                     {exit,["morot"|Morot]}}],
+                   exception_from, {exit,["morot"|Morot]}),
+    deep_exception(
+      ?LINE, apply, [?MODULE,id,[spenat]], 4,
+      [{trace,Self,call,{?MODULE,id,[spenat]}},
+       {trace,Self,return_from,{?MODULE,id,1},spenat}],
+      return_from, spenat),
+    deep_exception(
+      ?LINE, apply, [erlang,'++',[1,2]], 5,
+      [{trace,Self,call,{erlang,'++',[1,2]}},
+       {trace,Self,exception_from,{erlang,'++',2},{error,badarg}}],
+      exception_from, {error,badarg}),
+    io:format("== Subtest: ~w", [?LINE]),
+    try apply(lists, reverse, [LongImproperList, []]) of
+        R2 -> ct:fail({returned,abbr(R2)})
+    catch error:badarg -> ok
+    end,
+    expect(fun ({trace,S,call,{lists,reverse,[L1,L2]}})
+                 when is_list(L1), is_list(L2), S == Self ->
+                   next;
+               ({trace,S,exception_from,
+                 {lists,reverse,2},{error,badarg}}) 
+                 when S == Self ->
+                   expected;
+               ('_') ->
+                   {trace,Self,exception_from,
+                    {lists,reverse,2},{error,badarg}};
+               (_) ->
+                   {unexpected,
+                    {trace,Self,exception_from,
+                     {lists,reverse,2},{error,badarg}}}
+           end),
+    deep_exception(?LINE, apply, [?MODULE,deep_5,[1,2]], 7, 
+                   [{trace,Self,call,{erlang,error,[undef]}},
+                    {trace,Self,exception_from,{erlang,error,1},
+                     {error,undef}}],
+                   exception_from, {error,undef}),
+    deep_exception(?LINE, apply, [?MODULE,deep_5,[undef]], 8, 
+                   [{trace,Self,call,{?MODULE,deep_5,[undef]}},
+                    {trace,Self,exception_from,{?MODULE,deep_5,1},
+                     {error,function_clause}}],
+                   exception_from, {error,function_clause}),
     %% Apply of fun
     %%
-    ?line deep_exception(?LINE, apply, 
-			 [fun () -> 
-				  erlang:error([{"palsternacka",3.14},17]) 
-			  end, []], 1, 
-			 [{trace,Self,call,
-			   {erlang,error,[[{"palsternacka",3.14},17]]}},
-			  {trace,Self,exception_from,{erlang,error,1},
-			   {error,[{"palsternacka",3.14},17]}}],
-			 exception_from, {error,[{"palsternacka",3.14},17]}),
-    ?line deep_exception(?LINE, apply, 
-			 [fun () -> 
-				  erlang:error(["palsternacka",17], []) 
-			  end, []], 1, 
-			 [{trace,Self,call,
-			   {erlang,error,[["palsternacka",17],[]]}},
-			  {trace,Self,exception_from,{erlang,error,2},
-			   {error,["palsternacka",17]}}],
-			 exception_from, {error,["palsternacka",17]}),
-    ?line deep_exception(?LINE, apply, 
-			 [fun () -> erlang:throw(Self) end, []], 2, 
-			 [{trace,Self,call,{erlang,throw,[Self]}},
-			  {trace,Self,exception_from,{erlang,throw,1},
-			   {throw,Self}}],
-			 exception_from, {throw,Self}),
-    ?line deep_exception(?LINE, apply, 
-			 [fun () -> 
-				  erlang:exit({1,2,3,4,[5,palsternacka]})
-			  end, []], 3,
-			 [{trace,Self,call,
-			   {erlang,exit,[{1,2,3,4,[5,palsternacka]}]}},
-			  {trace,Self,exception_from,{erlang,exit,1},
-			   {exit,{1,2,3,4,[5,palsternacka]}}}],
-			 exception_from, {exit,{1,2,3,4,[5,palsternacka]}}),
-    ?line deep_exception(?LINE, apply, 
-			 [fun () -> ?MODULE:id(bladsallad) end, []], 4,
-			 [{trace,Self,call,{?MODULE,id,[bladsallad]}},
-			  {trace,Self,return_from,{?MODULE,id,1},bladsallad}],
-			 return_from, bladsallad),
-    ?line deep_exception(?LINE, apply, 
-			 [fun (A, B) -> A ++ B end, [1,2]], 5,
-			 [{trace,Self,call,{erlang,'++',[1,2]}},
-			  {trace,Self,exception_from,
-			   {erlang,'++',2},{error,badarg}}],
-			 exception_from, {error,badarg}),
-    ?line deep_exception(?LINE, apply, [fun (A, B) -> A = B end, [1,2]], 6, 
-			 [],
-			 exception_from, {error,{badmatch,2}}),
-    ?line io:format("== Subtest: ~w", [?LINE]),
-    ?line try apply(fun() -> lists:reverse(LongImproperList, []) end, []) of
-	      R3 -> test_server:fail({returned,abbr(R3)})
-	  catch error:badarg -> ok
-	  end,
-    ?line expect(fun ({trace,S,call,{lists,reverse,[L1,L2]}})
-		     when is_list(L1), is_list(L2), S == Self ->
-			 next;
-		     ({trace,S,exception_from,
-		       {lists,reverse,2},{error,badarg}}) 
-		     when S == Self ->
-			 expected;
-		     ('_') ->
-			 {trace,Self,exception_from,
-			  {lists,reverse,2},{error,badarg}};
-		     (_) ->
-			 {unexpected,
-			  {trace,Self,exception_from,
-			   {lists,reverse,2},{error,badarg}}}
-		 end),
-    ?line deep_exception(?LINE, apply, 
-			 [fun () -> ?MODULE:deep_5(1,2) end, []], 7, 
-			 [{trace,Self,call,{erlang,error,[undef]}},
-			  {trace,Self,exception_from,{erlang,error,1},
-			   {error,undef}}],
-			 exception_from, {error,undef}),
-    ?line deep_exception(?LINE, apply, 
-			 [fun () -> ?MODULE:deep_5(undef) end, []], 8, 
-			 [{trace,Self,call,{?MODULE,deep_5,[undef]}},
-			  {trace,Self,exception_from,{?MODULE,deep_5,1},
-			   {error,function_clause}}],
-			 exception_from, {error,function_clause}),
-    
-    ?line trace_func({?MODULE,'_','_'}, false),
-    ?line trace_func({erlang,'_','_'}, false),
-    ?line trace_func({lists,'_','_'}, false),
-    ?line expect(),
-    ?line ok.
+    deep_exception(?LINE, apply, 
+                   [fun () -> 
+                            erlang:error([{"palsternacka",3.14},17]) 
+                    end, []], 1, 
+                   [{trace,Self,call,
+                     {erlang,error,[[{"palsternacka",3.14},17]]}},
+                    {trace,Self,exception_from,{erlang,error,1},
+                     {error,[{"palsternacka",3.14},17]}}],
+                   exception_from, {error,[{"palsternacka",3.14},17]}),
+    deep_exception(?LINE, apply, 
+                   [fun () -> 
+                            erlang:error(["palsternacka",17], []) 
+                    end, []], 1, 
+                   [{trace,Self,call,
+                     {erlang,error,[["palsternacka",17],[]]}},
+                    {trace,Self,exception_from,{erlang,error,2},
+                     {error,["palsternacka",17]}}],
+                   exception_from, {error,["palsternacka",17]}),
+    deep_exception(?LINE, apply, 
+                   [fun () -> erlang:throw(Self) end, []], 2, 
+                   [{trace,Self,call,{erlang,throw,[Self]}},
+                    {trace,Self,exception_from,{erlang,throw,1},
+                     {throw,Self}}],
+                   exception_from, {throw,Self}),
+    deep_exception(?LINE, apply, 
+                   [fun () -> 
+                            erlang:exit({1,2,3,4,[5,palsternacka]})
+                    end, []], 3,
+                   [{trace,Self,call,
+                     {erlang,exit,[{1,2,3,4,[5,palsternacka]}]}},
+                    {trace,Self,exception_from,{erlang,exit,1},
+                     {exit,{1,2,3,4,[5,palsternacka]}}}],
+                   exception_from, {exit,{1,2,3,4,[5,palsternacka]}}),
+    deep_exception(?LINE, apply, 
+                   [fun () -> ?MODULE:id(bladsallad) end, []], 4,
+                   [{trace,Self,call,{?MODULE,id,[bladsallad]}},
+                    {trace,Self,return_from,{?MODULE,id,1},bladsallad}],
+                   return_from, bladsallad),
+    deep_exception(?LINE, apply, 
+                   [fun (A, B) -> A ++ B end, [1,2]], 5,
+                   [{trace,Self,call,{erlang,'++',[1,2]}},
+                    {trace,Self,exception_from,
+                     {erlang,'++',2},{error,badarg}}],
+                   exception_from, {error,badarg}),
+    deep_exception(?LINE, apply, [fun (A, B) -> A = B end, [1,2]], 6, 
+                   [],
+                   exception_from, {error,{badmatch,2}}),
+    io:format("== Subtest: ~w", [?LINE]),
+    try apply(fun() -> lists:reverse(LongImproperList, []) end, []) of
+        R3 -> ct:fail({returned,abbr(R3)})
+    catch error:badarg -> ok
+    end,
+    expect(fun ({trace,S,call,{lists,reverse,[L1,L2]}})
+                 when is_list(L1), is_list(L2), S == Self ->
+                   next;
+               ({trace,S,exception_from,
+                 {lists,reverse,2},{error,badarg}}) 
+                 when S == Self ->
+                   expected;
+               ('_') ->
+                   {trace,Self,exception_from,
+                    {lists,reverse,2},{error,badarg}};
+               (_) ->
+                   {unexpected,
+                    {trace,Self,exception_from,
+                     {lists,reverse,2},{error,badarg}}}
+           end),
+    deep_exception(?LINE, apply, 
+                   [fun () -> ?MODULE:deep_5(1,2) end, []], 7, 
+                   [{trace,Self,call,{erlang,error,[undef]}},
+                    {trace,Self,exception_from,{erlang,error,1},
+                     {error,undef}}],
+                   exception_from, {error,undef}),
+    deep_exception(?LINE, apply, 
+                   [fun () -> ?MODULE:deep_5(undef) end, []], 8, 
+                   [{trace,Self,call,{?MODULE,deep_5,[undef]}},
+                    {trace,Self,exception_from,{?MODULE,deep_5,1},
+                     {error,function_clause}}],
+                   exception_from, {error,function_clause}),
+
+    trace_func({?MODULE,'_','_'}, false),
+    trace_func({erlang,'_','_'}, false),
+    trace_func({lists,'_','_'}, false),
+    expect(),
+    ok.
 
 
 deep_exception(Line, B, Q, N, Extra, Tag, R) ->
-    ?line Self = self(),
-    ?line io:format("== Subtest: ~w", [Line]),
-    ?line Result = ?MODULE:deep(N, B, Q),
-    ?line Result = deep_expect(Self, B, Q, N, Extra, Tag, R).
+    Self = self(),
+    io:format("== Subtest: ~w", [Line]),
+    Result = ?MODULE:deep(N, B, Q),
+    Result = deep_expect(Self, B, Q, N, Extra, Tag, R).
 
 deep_expect(Self, B, Q, N, Extra, Tag, R) ->
-    ?line expect({trace,Self,call,{?MODULE,deep,[N,B,Q]}}),
-    ?line Result = deep_expect_N(Self, B, Q, N, Extra, Tag, R),
-    ?line expect({trace,Self,return_from,{?MODULE,deep,3},Result}),
-    ?line Result.
+    expect({trace,Self,call,{?MODULE,deep,[N,B,Q]}}),
+    Result = deep_expect_N(Self, B, Q, N, Extra, Tag, R),
+    expect({trace,Self,return_from,{?MODULE,deep,3},Result}),
+    Result.
 
 deep_expect_N(Self, B, Q, N, Extra, Tag, R) ->
     deep_expect_N(Self, B, Q, N, Extra, Tag, R, N).
 
 deep_expect_N(Self, B, Q, N, Extra, Tag, R, J) when J > 0 ->
-    ?line expect({trace,Self,call,{?MODULE,deep_1,[J,B,Q]}}),
-    ?line deep_expect_N(Self, B, Q, N, Extra, Tag, R, J-1);
+    expect({trace,Self,call,{?MODULE,deep_1,[J,B,Q]}}),
+    deep_expect_N(Self, B, Q, N, Extra, Tag, R, J-1);
 deep_expect_N(Self, B, Q, N, Extra, Tag, R, 0) ->
-    ?line expect({trace,Self,call,{?MODULE,deep_2,[B,Q]}}),
-    ?line expect({trace,Self,call,{?MODULE,deep_3,[B,Q]}}),
-    ?line expect({trace,Self,return_from,{?MODULE,deep_3,2},{B,Q}}),
-    ?line expect({trace,Self,call,{?MODULE,deep_4,[{B,Q}]}}),
-    ?line expect({trace,Self,call,{?MODULE,id,[{B,Q}]}}),
-    ?line expect({trace,Self,return_from,{?MODULE,id,1},{B,Q}}),
-    ?line deep_expect_Extra(Self, N, Extra, Tag, R),
-    ?line expect({trace,Self,Tag,{?MODULE,deep_4,1},R}),
-    ?line expect({trace,Self,Tag,{?MODULE,deep_2,2},R}),
-    ?line deep_expect_N(Self, N, Tag, R).
+    expect({trace,Self,call,{?MODULE,deep_2,[B,Q]}}),
+    expect({trace,Self,call,{?MODULE,deep_3,[B,Q]}}),
+    expect({trace,Self,return_from,{?MODULE,deep_3,2},{B,Q}}),
+    expect({trace,Self,call,{?MODULE,deep_4,[{B,Q}]}}),
+    expect({trace,Self,call,{?MODULE,id,[{B,Q}]}}),
+    expect({trace,Self,return_from,{?MODULE,id,1},{B,Q}}),
+    deep_expect_Extra(Self, N, Extra, Tag, R),
+    expect({trace,Self,Tag,{?MODULE,deep_4,1},R}),
+    expect({trace,Self,Tag,{?MODULE,deep_2,2},R}),
+    deep_expect_N(Self, N, Tag, R).
 
 deep_expect_Extra(Self, N, [E|Es], Tag, R) ->
-    ?line expect(E),
-    ?line deep_expect_Extra(Self, N, Es, Tag, R);
+    expect(E),
+    deep_expect_Extra(Self, N, Es, Tag, R);
 deep_expect_Extra(_Self, _N, [], _Tag, _R) ->
-    ?line ok.
+    ok.
 
 deep_expect_N(Self, N, Tag, R) when N > 0 ->
-    ?line expect({trace,Self,Tag,{?MODULE,deep_1,3},R}),
-    ?line deep_expect_N(Self, N-1, Tag, R);
+    expect({trace,Self,Tag,{?MODULE,deep_1,3},R}),
+    deep_expect_N(Self, N-1, Tag, R);
 deep_expect_N(_Self, 0, return_from, R) ->
-    ?line {value,R};
+    {value,R};
 deep_expect_N(_Self, 0, exception_from, R) ->
-    ?line R.
+    R.
 
 
 
-exception_nocatch(doc) -> "Test the new exception trace.";
-exception_nocatch(suite) -> [];
+%% Test the new exception trace.
 exception_nocatch(Config) when is_list(Config) ->
     exception_nocatch().
 
@@ -1082,78 +1052,78 @@ exception_nocatch() ->
     Deep4LocBadmatch = get_deep_4_loc({'=',[a,b]}),
 
     Prog = [{'_',[],[{exception_trace}]}],
-    ?line 1 = erlang:trace_pattern({?MODULE,deep_1,'_'}, Prog),
-    ?line 1 = erlang:trace_pattern({?MODULE,deep_2,'_'}, Prog),
-    ?line 1 = erlang:trace_pattern({?MODULE,deep_3,'_'}, Prog),
-    ?line 1 = erlang:trace_pattern({?MODULE,deep_4,'_'}, Prog),
-    ?line 1 = erlang:trace_pattern({?MODULE,deep_5,'_'}, Prog),
-    ?line 1 = erlang:trace_pattern({?MODULE,id,'_'}, Prog),
-    ?line 1 = erlang:trace_pattern({erlang,exit,1}, Prog),
-    ?line 1 = erlang:trace_pattern({erlang,throw,1}, Prog),
-    ?line 2 = erlang:trace_pattern({erlang,error,'_'}, Prog),
-    ?line Q1 = {make_ref(),Prog},
-    ?line T1 = 
-	exception_nocatch(?LINE, exit, [Q1], 3, 
-			  [{trace,t1,call,{erlang,exit,[Q1]}},
-			   {trace,t1,exception_from,{erlang,exit,1},
-			    {exit,Q1}}],
-			  exception_from, {exit,Q1}),
-    ?line expect({trace,T1,exit,Q1}),
-    ?line Q2 = {cake,14.125},
-    ?line T2 = 
-	exception_nocatch(?LINE, throw, [Q2], 2, 
-			  [{trace,t2,call,{erlang,throw,[Q2]}},
-			   {trace,t2,exception_from,{erlang,throw,1},
-			    {error,{nocatch,Q2}}}],
-			  exception_from, {error,{nocatch,Q2}}),
-    ?line expect({trace,T2,exit,{{nocatch,Q2},[{erlang,throw,[Q2],[]},
-					       {?MODULE,deep_4,1,
-						Deep4LocThrow}]}}),
-    ?line Q3 = {dump,[dump,{dump}]},
-    ?line T3 = 
-	exception_nocatch(?LINE, error, [Q3], 4, 
-			  [{trace,t3,call,{erlang,error,[Q3]}},
-			   {trace,t3,exception_from,{erlang,error,1},
-			    {error,Q3}}],
-			  exception_from, {error,Q3}),
-    ?line expect({trace,T3,exit,{Q3,[{erlang,error,[Q3],[]},
-				     {?MODULE,deep_4,1,Deep4LocError}]}}),
-    ?line T4 = 
-	exception_nocatch(?LINE, '=', [17,4711], 5, [], 
-			  exception_from, {error,{badmatch,4711}}),
-    ?line expect({trace,T4,exit,{{badmatch,4711},
-				 [{?MODULE,deep_4,1,Deep4LocBadmatch}]}}),
+    1 = erlang:trace_pattern({?MODULE,deep_1,'_'}, Prog),
+    1 = erlang:trace_pattern({?MODULE,deep_2,'_'}, Prog),
+    1 = erlang:trace_pattern({?MODULE,deep_3,'_'}, Prog),
+    1 = erlang:trace_pattern({?MODULE,deep_4,'_'}, Prog),
+    1 = erlang:trace_pattern({?MODULE,deep_5,'_'}, Prog),
+    1 = erlang:trace_pattern({?MODULE,id,'_'}, Prog),
+    1 = erlang:trace_pattern({erlang,exit,1}, Prog),
+    1 = erlang:trace_pattern({erlang,throw,1}, Prog),
+    2 = erlang:trace_pattern({erlang,error,'_'}, Prog),
+    Q1 = {make_ref(),Prog},
+    T1 = 
+    exception_nocatch(?LINE, exit, [Q1], 3, 
+                      [{trace,t1,call,{erlang,exit,[Q1]}},
+                       {trace,t1,exception_from,{erlang,exit,1},
+                        {exit,Q1}}],
+                      exception_from, {exit,Q1}),
+    expect({trace,T1,exit,Q1}),
+    Q2 = {cake,14.125},
+    T2 = 
+    exception_nocatch(?LINE, throw, [Q2], 2, 
+                      [{trace,t2,call,{erlang,throw,[Q2]}},
+                       {trace,t2,exception_from,{erlang,throw,1},
+                        {error,{nocatch,Q2}}}],
+                      exception_from, {error,{nocatch,Q2}}),
+    expect({trace,T2,exit,{{nocatch,Q2},[{erlang,throw,[Q2],[]},
+                                         {?MODULE,deep_4,1,
+                                          Deep4LocThrow}]}}),
+    Q3 = {dump,[dump,{dump}]},
+    T3 = 
+    exception_nocatch(?LINE, error, [Q3], 4, 
+                      [{trace,t3,call,{erlang,error,[Q3]}},
+                       {trace,t3,exception_from,{erlang,error,1},
+                        {error,Q3}}],
+                      exception_from, {error,Q3}),
+    expect({trace,T3,exit,{Q3,[{erlang,error,[Q3],[]},
+                               {?MODULE,deep_4,1,Deep4LocError}]}}),
+    T4 = 
+    exception_nocatch(?LINE, '=', [17,4711], 5, [], 
+                      exception_from, {error,{badmatch,4711}}),
+    expect({trace,T4,exit,{{badmatch,4711},
+                           [{?MODULE,deep_4,1,Deep4LocBadmatch}]}}),
     %%
-    ?line erlang:trace_pattern({?MODULE,'_','_'}, false),
-    ?line erlang:trace_pattern({erlang,'_','_'}, false),
-    ?line expect(),
-    ?line ok.
+    erlang:trace_pattern({?MODULE,'_','_'}, false),
+    erlang:trace_pattern({erlang,'_','_'}, false),
+    expect(),
+    ok.
 
 get_deep_4_loc(Arg) ->
     try
-	deep_4(Arg),
-	?t:fail(should_not_return_to_here)
+        deep_4(Arg),
+        ct:fail(should_not_return_to_here)
     catch
-	_:_ ->
-	    [{?MODULE,deep_4,1,Loc0}|_] = erlang:get_stacktrace(),
-	    Loc0
+        _:_ ->
+            [{?MODULE,deep_4,1,Loc0}|_] = erlang:get_stacktrace(),
+            Loc0
     end.
 
 exception_nocatch(Line, B, Q, N, Extra, Tag, R) ->
-    ?line io:format("== Subtest: ~w", [Line]),
-    ?line Go = make_ref(),
-    ?line Tracee = 
-	spawn(fun () ->
-		      receive
-			  Go ->
-			      deep_1(N, B, Q)
-		      end
-	      end),
-    ?line 1 = erlang:trace(Tracee, true, [call,return_to,procs]),
-    ?line Tracee ! Go,
-    ?line deep_expect_N(Tracee, B, Q, N-1, 
-			[setelement(2, T, Tracee) || T <- Extra], Tag, R),
-    ?line Tracee.
+    io:format("== Subtest: ~w", [Line]),
+    Go = make_ref(),
+    Tracee = 
+    spawn(fun () ->
+                  receive
+                      Go ->
+                          deep_1(N, B, Q)
+                  end
+          end),
+    1 = erlang:trace(Tracee, true, [call,return_to,procs]),
+    Tracee ! Go,
+    deep_expect_N(Tracee, B, Q, N-1, 
+                  [setelement(2, T, Tracee) || T <- Extra], Tag, R),
+    Tracee.
 
 %% Make sure that code that uses the optimized bit syntax matching
 %% can be traced without crashing the emulator. (Actually, it seems
@@ -1161,22 +1131,22 @@ exception_nocatch(Line, B, Q, N, Extra, Tag, R) ->
 %% will keep the test case anyway.)
 
 bit_syntax(Config) when is_list(Config) ->
-    ?line start_tracer(),
-    ?line 1 = trace_func({?MODULE,bs_sum_a,'_'}, []),
-    ?line 1 = trace_func({?MODULE,bs_sum_b,'_'}, []),
+    start_tracer(),
+    1 = trace_func({?MODULE,bs_sum_a,'_'}, []),
+    1 = trace_func({?MODULE,bs_sum_b,'_'}, []),
 
-    ?line 6 = call_bs_sum_a(<<1,2,3>>),
-    ?line 10 = call_bs_sum_b(<<1,2,3,4>>),
+    6 = call_bs_sum_a(<<1,2,3>>),
+    10 = call_bs_sum_b(<<1,2,3,4>>),
 
-    ?line trace_func({?MODULE,'_','_'}, false),
-    ?line erlang:trace_delivered(all),
+    trace_func({?MODULE,'_','_'}, false),
+    erlang:trace_delivered(all),
     receive
-	{trace_delivered,_,_} -> ok
+        {trace_delivered,_,_} -> ok
     end,
-    
+
     Self = self(),
-    ?line expect({trace,Self,call,{?MODULE,bs_sum_a,[<<2,3>>,1]}}),
-    ?line expect({trace,Self,call,{?MODULE,bs_sum_b,[1,<<2,3,4>>]}}),
+    expect({trace,Self,call,{?MODULE,bs_sum_a,[<<2,3>>,1]}}),
+    expect({trace,Self,call,{?MODULE,bs_sum_b,[1,<<2,3,4>>]}}),
 
     ok.
 
@@ -1191,7 +1161,7 @@ bs_sum_a(<<>>, Acc) -> Acc.
 
 bs_sum_b(Acc, <<H,T/binary>>) -> bs_sum_b(H+Acc, T);
 bs_sum_b(Acc, <<>>) -> Acc.
-    
+
 
 
 
@@ -1199,98 +1169,98 @@ bs_sum_b(Acc, <<>>) -> Acc.
 
 expect() ->
     case flush() of
-	[] -> ok;
-	Msgs ->
-	    test_server:fail({unexpected,abbr(Msgs)})
+        [] -> ok;
+        Msgs ->
+            ct:fail({unexpected,abbr(Msgs)})
     end.
 
 expect({trace_ts,Pid,Type,MFA,Term,ts}=Message) ->
     receive
-	M ->
-	    case M of
-		{trace_ts,Pid,Type,MFA,Term,Ts}=MessageTs ->
-		    ok = io:format("Expected and got ~p", [abbr(MessageTs)]),
-		    Ts;
-		_ ->
-		    io:format("Expected ~p; got ~p", [abbr(Message),abbr(M)]),
-		    test_server:fail({unexpected,abbr([M|flush()])})
-	    end
+        M ->
+            case M of
+                {trace_ts,Pid,Type,MFA,Term,Ts}=MessageTs ->
+                    ok = io:format("Expected and got ~p", [abbr(MessageTs)]),
+                    Ts;
+                _ ->
+                    io:format("Expected ~p; got ~p", [abbr(Message),abbr(M)]),
+                    ct:fail({unexpected,abbr([M|flush()])})
+            end
     after 5000 ->
-	    io:format("Expected ~p; got nothing", [abbr(Message)]),
-	    test_server:fail(no_trace_message)
+              io:format("Expected ~p; got nothing", [abbr(Message)]),
+              ct:fail(no_trace_message)
     end;
 expect({trace_ts,Pid,Type,MFA,ts}=Message) ->
     receive
-	M ->
-	    case M of
-		{trace_ts,Pid,Type,MFA,Ts} ->
-		    ok = io:format("Expected and got ~p", [abbr(M)]),
-		    Ts;
-		_ ->
-		    io:format("Expected ~p; got ~p", [abbr(Message),abbr(M)]),
-		    test_server:fail({unexpected,abbr([M|flush()])})
-	    end
+        M ->
+            case M of
+                {trace_ts,Pid,Type,MFA,Ts} ->
+                    ok = io:format("Expected and got ~p", [abbr(M)]),
+                    Ts;
+                _ ->
+                    io:format("Expected ~p; got ~p", [abbr(Message),abbr(M)]),
+                    ct:fail({unexpected,abbr([M|flush()])})
+            end
     after 5000 ->
-	    io:format("Expected ~p; got nothing", [abbr(Message)]),
-	    test_server:fail(no_trace_message)
+              io:format("Expected ~p; got nothing", [abbr(Message)]),
+              ct:fail(no_trace_message)
     end;
 expect(Validator) when is_function(Validator) ->
     receive
-	M ->
-	    case Validator(M) of
-		expected ->
-		    ok = io:format("Expected and got ~p", [abbr(M)]);
- 		next ->
- 		    ok = io:format("Expected and got ~p", [abbr(M)]),
- 		    expect(Validator);
- 		{unexpected,Message} ->
- 		    io:format("Expected ~p; got ~p", [abbr(Message),abbr(M)]),
- 		    test_server:fail({unexpected,abbr([M|flush()])})
-	    end
+        M ->
+            case Validator(M) of
+                expected ->
+                    ok = io:format("Expected and got ~p", [abbr(M)]);
+                next ->
+                    ok = io:format("Expected and got ~p", [abbr(M)]),
+                    expect(Validator);
+                {unexpected,Message} ->
+                    io:format("Expected ~p; got ~p", [abbr(Message),abbr(M)]),
+                    ct:fail({unexpected,abbr([M|flush()])})
+            end
     after 5000 ->
-	    io:format("Expected ~p; got nothing", [abbr(Validator('_'))]),
-	    test_server:fail(no_trace_message)
+              io:format("Expected ~p; got nothing", [abbr(Validator('_'))]),
+              ct:fail(no_trace_message)
     end;
 expect(Message) ->
     receive
-	M ->
-	    case M of
-		Message ->
-		    ok = io:format("Expected and got ~p", [abbr(Message)]);
-		Other ->
-		    io:format("Expected ~p; got ~p", 
-			      [abbr(Message),abbr(Other)]),
-		    test_server:fail({unexpected,abbr([Other|flush()])})
-	    end
+        M ->
+            case M of
+                Message ->
+                    ok = io:format("Expected and got ~p", [abbr(Message)]);
+                Other ->
+                    io:format("Expected ~p; got ~p", 
+                              [abbr(Message),abbr(Other)]),
+                    ct:fail({unexpected,abbr([Other|flush()])})
+            end
     after 5000 ->
-	    io:format("Expected ~p; got nothing", [abbr(Message)]),
-	    test_server:fail(no_trace_message)
+              io:format("Expected ~p; got nothing", [abbr(Message)]),
+              ct:fail(no_trace_message)
     end.
 
 trace_info(What, Key) ->
     get(tracer) ! {apply,self(),{erlang,trace_info,[What,Key]}},
     Res = receive
-	      {apply_result,Result} -> Result
-	  end,
+              {apply_result,Result} -> Result
+          end,
     ok = io:format("erlang:trace_info(~p, ~p) -> ~p",
-		   [What,Key,Res]),
+                   [What,Key,Res]),
     Res.
-    
+
 trace_func(MFA, MatchSpec) ->
     trace_func(MFA, MatchSpec, []).
 trace_func(MFA, MatchSpec, Flags) ->
     get(tracer) ! {apply,self(),{erlang,trace_pattern,[MFA, MatchSpec, Flags]}},
     Res = receive
-	      {apply_result,Result} -> Result
-	  end,
+              {apply_result,Result} -> Result
+          end,
     ok = io:format("trace_pattern(~p, ~p, ~p) -> ~p", [MFA,MatchSpec,Flags,Res]),
     Res.
 
 trace_pid(Pid, On, Flags) ->
     get(tracer) ! {apply,self(),{erlang,trace,[Pid,On,Flags]}},
     Res = receive
-	      {apply_result,Result} -> Result
-	  end,
+              {apply_result,Result} -> Result
+          end,
     ok = io:format("trace(~p, ~p, ~p) -> ~p", [Pid,On,Flags,Res]),
     Res.
 
@@ -1310,19 +1280,19 @@ tracer(RelayTo) ->
 
 tracer_loop(RelayTo) ->
     receive
-	{apply,From,{M,F,A}} ->
-	    From ! {apply_result,apply(M, F, A)},
-	    tracer_loop(RelayTo);
-	Msg ->
-	    RelayTo ! Msg,
-	    tracer_loop(RelayTo)
+        {apply,From,{M,F,A}} ->
+            From ! {apply_result,apply(M, F, A)},
+            tracer_loop(RelayTo);
+        Msg ->
+            RelayTo ! Msg,
+            tracer_loop(RelayTo)
     end.
 
 id(I) -> I.
 
 deep(N, Class, Reason) ->
     try ?MODULE:deep_1(N, Class, Reason) of
-	Value -> {value,Value}
+        Value -> {value,Value}
     catch C:R -> {C,R}
     end.
 
@@ -1339,30 +1309,30 @@ deep_3(Class, Reason) ->
 
 deep_4(CR) ->
     case ?MODULE:id(CR) of
-	{exit,[Reason]} ->
-	    erlang:exit(Reason);
-	{throw,[Reason]} ->
-	    erlang:throw(Reason);
-	{error,[Reason,Arglist]} ->
-	    erlang:error(Reason, Arglist);
-	{error,[Reason]} ->
-	    erlang:error(Reason);
-	{id,[Reason]} ->
-	    Reason;
-	{reverse,[A,B]} ->
-	    lists:reverse(A, B);
-	{append,[A,B]} ->
-	    A ++ B;
-	{apply,[Fun,Args]} ->
-	    erlang:apply(Fun, Args);
-	{apply,[M,F,Args]} ->
-	    erlang:apply(M, F, Args);
-	{deep_5,[A,B]} ->
-	    ?MODULE:deep_5(A, B);
-	{deep_5,[A]} ->
-	    ?MODULE:deep_5(A);
-	{'=',[A,B]} ->
-	    A = B
+        {exit,[Reason]} ->
+            erlang:exit(Reason);
+        {throw,[Reason]} ->
+            erlang:throw(Reason);
+        {error,[Reason,Arglist]} ->
+            erlang:error(Reason, Arglist);
+        {error,[Reason]} ->
+            erlang:error(Reason);
+        {id,[Reason]} ->
+            Reason;
+        {reverse,[A,B]} ->
+            lists:reverse(A, B);
+        {append,[A,B]} ->
+            A ++ B;
+        {apply,[Fun,Args]} ->
+            erlang:apply(Fun, Args);
+        {apply,[M,F,Args]} ->
+            erlang:apply(M, F, Args);
+        {deep_5,[A,B]} ->
+            ?MODULE:deep_5(A, B);
+        {deep_5,[A]} ->
+            ?MODULE:deep_5(A);
+        {'=',[A,B]} ->
+            A = B
     end.
 
 deep_5(A) when is_integer(A) ->
@@ -1370,9 +1340,9 @@ deep_5(A) when is_integer(A) ->
 
 flush() ->
     receive X ->
-	    [X|flush()]
+                [X|flush()]
     after 1000 ->
-	    []
+              []
     end.
 
 %% Abbreviate large complex terms
@@ -1395,10 +1365,10 @@ abbr_tuple(_, _, _, R) ->
 %%
 abbr_list(_, 0, R) ->
     case io_lib:printable_list(R) of
-	true ->
-	    reverse(R, "...");
-	false ->
-	    reverse(R, '...')
+        true ->
+            reverse(R, "...");
+        false ->
+            reverse(R, '...')
     end;
 abbr_list([H|T], N, R) ->
     M = N-1,
diff --git a/erts/emulator/test/code_SUITE.erl b/erts/emulator/test/code_SUITE.erl
index 9f318a38be..db285a3977 100644
--- a/erts/emulator/test/code_SUITE.erl
+++ b/erts/emulator/test/code_SUITE.erl
@@ -19,17 +19,17 @@
 %%
 
 -module(code_SUITE).
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2,
-	 versions/1,new_binary_types/1,
-	 t_check_process_code/1,t_check_old_code/1,
-	 t_check_process_code_ets/1,
-	 external_fun/1,get_chunk/1,module_md5/1,make_stub/1,
-	 make_stub_many_funs/1,constant_pools/1,constant_refc_binaries/1,
-	 false_dependency/1,coverage/1,fun_confusion/1]).
+-export([all/0, suite/0, init_per_suite/1, end_per_suite/1, 
+         versions/1,new_binary_types/1,
+         t_check_process_code/1,t_check_old_code/1,
+         t_check_process_code_ets/1,
+         external_fun/1,get_chunk/1,module_md5/1,make_stub/1,
+         make_stub_many_funs/1,constant_pools/1,constant_refc_binaries/1,
+         false_dependency/1,coverage/1,fun_confusion/1,
+         t_copy_literals/1]).
 
 -define(line_trace, 1).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -38,10 +38,7 @@ all() ->
      t_check_process_code_ets, t_check_old_code, external_fun, get_chunk,
      module_md5, make_stub, make_stub_many_funs,
      constant_pools, constant_refc_binaries, false_dependency,
-     coverage, fun_confusion].
-
-groups() -> 
-    [].
+     coverage, fun_confusion, t_copy_literals].
 
 init_per_suite(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
@@ -51,12 +48,6 @@ end_per_suite(_Config) ->
     catch erts_debug:set_internal_state(available_internal_state, false),
     ok.
 
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 %% Make sure that only two versions of a module can be loaded.
 versions(Config) when is_list(Config) ->
     V1 = compile_version(1, Config),
@@ -77,10 +68,10 @@ versions(Config) when is_list(Config) ->
     _ = monitor(process, P1),
     _ = monitor(process, P2),
     receive
-	{'DOWN',_,process,P1,normal} -> ok
+        {'DOWN',_,process,P1,normal} -> ok
     end,
     receive
-	{'DOWN',_,process,P2,normal} -> ok
+        {'DOWN',_,process,P2,normal} -> ok
     end,
     true = erlang:purge_module(versions),
     true = erlang:delete_module(versions),
@@ -88,84 +79,84 @@ versions(Config) when is_list(Config) ->
     ok.
 
 compile_version(Version, Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     File = filename:join(Data, "versions"),
     {ok,versions,Bin} = compile:file(File, [{d,'VERSION',Version},
-					    binary,report]),
+                                            binary,report]),
     Bin.
 
 load_version(Code, Ver) ->
     case erlang:load_module(versions, Code) of
-	{module,versions} ->
-	    Pid = spawn_link(versions, loop, []),
-	    Ver = versions:version(),
-	    Ver = check_version(Pid),
-	    {ok,Pid,Ver};
-	Error ->
-	    Error
+        {module,versions} ->
+            Pid = spawn_link(versions, loop, []),
+            Ver = versions:version(),
+            Ver = check_version(Pid),
+            {ok,Pid,Ver};
+        Error ->
+            Error
     end.
 
 check_version(Pid) ->
     Pid ! {self(),version},
     receive
-	{Pid,version,Version} ->
-	    Version
+        {Pid,version,Version} ->
+            Version
     end.
 
 new_binary_types(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "my_code_test"),
-    ?line {ok,my_code_test,Bin} = compile:file(File, [binary]),
-    ?line {module,my_code_test} = erlang:load_module(my_code_test,
-						     make_sub_binary(Bin)),
-    ?line true = erlang:delete_module(my_code_test),
-    ?line true = erlang:purge_module(my_code_test),
-
-    ?line {module,my_code_test} = erlang:load_module(my_code_test,
-						     make_unaligned_sub_binary(Bin)),
-    ?line true = erlang:delete_module(my_code_test),
-    ?line true = erlang:purge_module(my_code_test),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "my_code_test"),
+    {ok,my_code_test,Bin} = compile:file(File, [binary]),
+    {module,my_code_test} = erlang:load_module(my_code_test,
+                                               make_sub_binary(Bin)),
+    true = erlang:delete_module(my_code_test),
+    true = erlang:purge_module(my_code_test),
+
+    {module,my_code_test} = erlang:load_module(my_code_test,
+                                               make_unaligned_sub_binary(Bin)),
+    true = erlang:delete_module(my_code_test),
+    true = erlang:purge_module(my_code_test),
 
     %% Try heap binaries and bad binaries.
-    ?line {error,badfile} = erlang:load_module(my_code_test, <<1,2>>),
-    ?line {error,badfile} = erlang:load_module(my_code_test,
-						make_sub_binary(<<1,2>>)),
-    ?line {error,badfile} = erlang:load_module(my_code_test,
-						make_unaligned_sub_binary(<<1,2>>)),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:load_module(my_code_test,
-						      bit_sized_binary(Bin))),
+    {error,badfile} = erlang:load_module(my_code_test, <<1,2>>),
+    {error,badfile} = erlang:load_module(my_code_test,
+                                         make_sub_binary(<<1,2>>)),
+    {error,badfile} = erlang:load_module(my_code_test,
+                                         make_unaligned_sub_binary(<<1,2>>)),
+    {'EXIT',{badarg,_}} = (catch erlang:load_module(my_code_test,
+                                                    bit_sized_binary(Bin))),
     ok.
 
 t_check_process_code(Config) when is_list(Config) ->
-    ?line Priv = ?config(priv_dir, Config),
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "my_code_test"),
-    ?line Code = filename:join(Priv, "my_code_test"),
+    Priv = proplists:get_value(priv_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "my_code_test"),
+    Code = filename:join(Priv, "my_code_test"),
 
-    ?line {ok,my_code_test} = c:c(File, [{outdir,Priv}]),
+    {ok,my_code_test} = c:c(File, [{outdir,Priv}]),
 
-    ?line MyFun = fun(X, Y) -> X + Y end,	%Confuse things.
-    ?line F = my_code_test:make_fun(42),
-    ?line 2 = fun_refc(F),
-    ?line MyFun2 = fun(X, Y) -> X * Y end,	%Confuse things.
-    ?line 44 = F(2),
+    MyFun = fun(X, Y) -> X + Y end,	%Confuse things.
+    F = my_code_test:make_fun(42),
+    2 = fun_refc(F),
+    MyFun2 = fun(X, Y) -> X * Y end,	%Confuse things.
+    44 = F(2),
 
     %% Delete the module and call the fun again.
-    ?line true = erlang:delete_module(my_code_test),
-    ?line 2 = fun_refc(F),
-    ?line 45 = F(3),
-    ?line {'EXIT',{undef,_}} = (catch my_code_test:make_fun(33)),
+    true = erlang:delete_module(my_code_test),
+    2 = fun_refc(F),
+    45 = F(3),
+    {'EXIT',{undef,_}} = (catch my_code_test:make_fun(33)),
 
     %% The fun should still be there, preventing purge.
-    ?line true = erlang:check_process_code(self(), my_code_test),
+    true = erlang:check_process_code(self(), my_code_test),
     gc(),
     gc(),					%Place funs on the old heap.
-    ?line true = erlang:check_process_code(self(), my_code_test),
+    true = erlang:check_process_code(self(), my_code_test),
 
     %% Using the funs here guarantees that they will not be prematurely garbed.
-    ?line 48 = F(6),
-    ?line 3 = MyFun(1, 2),
-    ?line 12 = MyFun2(3, 4),
+    48 = F(6),
+    3 = MyFun(1, 2),
+    12 = MyFun2(3, 4),
 
     %% Kill all funs.
     t_check_process_code1(Code, []).
@@ -173,64 +164,64 @@ t_check_process_code(Config) when is_list(Config) ->
 %% The real fun was killed, but we have some fakes which look similar.
 
 t_check_process_code1(Code, Fakes) ->
-    ?line MyFun = fun(X, Y) -> X + Y + 1 end,	%Confuse things.
-    ?line false = erlang:check_process_code(self(), my_code_test),
-    ?line 4 = MyFun(1, 2),
+    MyFun = fun(X, Y) -> X + Y + 1 end,	%Confuse things.
+    false = erlang:check_process_code(self(), my_code_test),
+    4 = MyFun(1, 2),
     t_check_process_code2(Code, Fakes).
 
 t_check_process_code2(Code, _) ->
-    ?line false = erlang:check_process_code(self(), my_code_test),
-    ?line true = erlang:purge_module(my_code_test),
+    false = erlang:check_process_code(self(), my_code_test),
+    true = erlang:purge_module(my_code_test),
 
     %% In the next test we will load the same module twice.
-    ?line {module,my_code_test} = code:load_abs(Code),
-    ?line F = my_code_test:make_fun(37),
-    ?line 2 = fun_refc(F),
-    ?line false = erlang:check_process_code(self(), my_code_test),
-    ?line {module,my_code_test} = code:load_abs(Code),
-    ?line 2 = fun_refc(F),
+    {module,my_code_test} = code:load_abs(Code),
+    F = my_code_test:make_fun(37),
+    2 = fun_refc(F),
+    false = erlang:check_process_code(self(), my_code_test),
+    {module,my_code_test} = code:load_abs(Code),
+    2 = fun_refc(F),
 
     %% Still false because the fun with the same identify is found
     %% in the current code.
-    ?line false = erlang:check_process_code(self(), my_code_test),
-    
+    false = erlang:check_process_code(self(), my_code_test),
+
     %% Some fake funs in the same module should not do any difference.
-    ?line false = erlang:check_process_code(self(), my_code_test),
+    false = erlang:check_process_code(self(), my_code_test),
 
     38 = F(1),
     t_check_process_code3(Code, F, []).
 
 t_check_process_code3(Code, F, Fakes) ->
     Pid = spawn_link(fun() -> body(F, Fakes) end),
-    ?line true = erlang:purge_module(my_code_test),
-    ?line false = erlang:check_process_code(self(), my_code_test),
-    ?line false = erlang:check_process_code(Pid, my_code_test),
+    true = erlang:purge_module(my_code_test),
+    false = erlang:check_process_code(self(), my_code_test),
+    false = erlang:check_process_code(Pid, my_code_test),
 
-    ?line true = erlang:delete_module(my_code_test),
-    ?line true = erlang:check_process_code(self(), my_code_test),
-    ?line true = erlang:check_process_code(Pid, my_code_test),
+    true = erlang:delete_module(my_code_test),
+    true = erlang:check_process_code(self(), my_code_test),
+    true = erlang:check_process_code(Pid, my_code_test),
     39 = F(2),
     t_check_process_code4(Code, Pid).
 
 t_check_process_code4(_Code, Pid) ->
     Pid ! drop_funs,
     receive after 1 -> ok end,
-    ?line false = erlang:check_process_code(Pid, my_code_test),
+    false = erlang:check_process_code(Pid, my_code_test),
     ok.
 
 body(F, Fakes) ->
     receive
-	jog ->
-	    40 = F(3),
-	    erlang:garbage_collect(),
-	    body(F, Fakes);
-	drop_funs ->
-	    dropped_body()
+        jog ->
+            40 = F(3),
+            erlang:garbage_collect(),
+            body(F, Fakes);
+        drop_funs ->
+            dropped_body()
     end.
 
 dropped_body() ->
     receive
-	X -> exit(X)
+        X -> exit(X)
     end.
 
 gc() ->
@@ -238,61 +229,60 @@ gc() ->
     gc1().
 gc1() -> ok.
 
-t_check_process_code_ets(doc) ->
-    "Test check_process_code/2 in combination with a fun obtained from an ets table.";
+%% Test check_process_code/2 in combination with a fun obtained from an ets table.
 t_check_process_code_ets(Config) when is_list(Config) ->
     case test_server:is_native(?MODULE) of
-	true ->
-	    {skip,"Native code"};
-	false ->
-	    do_check_process_code_ets(Config)
+        true ->
+            {skip,"Native code"};
+        false ->
+            do_check_process_code_ets(Config)
     end.
 
 do_check_process_code_ets(Config) ->
-    ?line Priv = ?config(priv_dir, Config),
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "my_code_test"),
-
-    ?line erlang:purge_module(my_code_test),
-    ?line erlang:delete_module(my_code_test),
-    ?line {ok,my_code_test} = c:c(File, [{outdir,Priv}]),
-
-    ?line T = ets:new(my_code_test, []),
-    ?line ets:insert(T, {7,my_code_test:make_fun(107)}),
-    ?line ets:insert(T, {8,my_code_test:make_fun(108)}),
-    ?line erlang:delete_module(my_code_test),
-    ?line false = erlang:check_process_code(self(), my_code_test),
+    Priv = proplists:get_value(priv_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "my_code_test"),
+
+    erlang:purge_module(my_code_test),
+    erlang:delete_module(my_code_test),
+    {ok,my_code_test} = c:c(File, [{outdir,Priv}]),
+
+    T = ets:new(my_code_test, []),
+    ets:insert(T, {7,my_code_test:make_fun(107)}),
+    ets:insert(T, {8,my_code_test:make_fun(108)}),
+    erlang:delete_module(my_code_test),
+    false = erlang:check_process_code(self(), my_code_test),
     Body = fun() ->
-		   [{7,F1}] = ets:lookup(T, 7),
-		   [{8,F2}] = ets:lookup(T, 8),
-		   IdleLoop = fun() -> receive _X -> ok end end,
-		   RecLoop = fun(Again) ->
-				     receive
-					 call -> 110 = F1(3),
-						 100 = F2(-8),
-						 Again(Again);
-					 {drop_funs,To} ->
-					     To ! funs_dropped,
-					     IdleLoop()
-				     end
-			     end,
-		   true = erlang:check_process_code(self(), my_code_test),
-		   RecLoop(RecLoop)
-	   end,
-    ?line Pid = spawn_link(Body),
+                   [{7,F1}] = ets:lookup(T, 7),
+                   [{8,F2}] = ets:lookup(T, 8),
+                   IdleLoop = fun() -> receive _X -> ok end end,
+                   RecLoop = fun(Again) ->
+                                     receive
+                                         call -> 110 = F1(3),
+                                                 100 = F2(-8),
+                                                 Again(Again);
+                                         {drop_funs,To} ->
+                                             To ! funs_dropped,
+                                             IdleLoop()
+                                     end
+                             end,
+                   true = erlang:check_process_code(self(), my_code_test),
+                   RecLoop(RecLoop)
+           end,
+    Pid = spawn_link(Body),
     receive after 1 -> ok end,
-    ?line true = erlang:check_process_code(Pid, my_code_test),
+    true = erlang:check_process_code(Pid, my_code_test),
     Pid ! call,
     Pid ! {drop_funs,self()},
 
     receive
-	funs_dropped -> ok;
-	Other -> ?t:fail({unexpected,Other})
+        funs_dropped -> ok;
+        Other -> ct:fail({unexpected,Other})
     after 10000 ->
-	    ?line ?t:fail(no_funs_dropped_answer)
+              ct:fail(no_funs_dropped_answer)
     end,
 
-    ?line false = erlang:check_process_code(Pid, my_code_test),
+    false = erlang:check_process_code(Pid, my_code_test),
     ok.
 
 fun_refc(F) ->
@@ -302,89 +292,89 @@ fun_refc(F) ->
 
 %% Test the erlang:check_old_code/1 BIF.
 t_check_old_code(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "my_code_test"),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "my_code_test"),
 
-    ?line erlang:purge_module(my_code_test),
-    ?line erlang:delete_module(my_code_test),
-    ?line catch erlang:purge_module(my_code_test),
+    erlang:purge_module(my_code_test),
+    erlang:delete_module(my_code_test),
+    catch erlang:purge_module(my_code_test),
+
+    false = erlang:check_old_code(my_code_test),
+
+    {ok,my_code_test,Code} = compile:file(File, [binary]),
+    {module,my_code_test} = code:load_binary(my_code_test, File, Code),
 
-    ?line false = erlang:check_old_code(my_code_test),
+    false = erlang:check_old_code(my_code_test),
+    {module,my_code_test} = code:load_binary(my_code_test, File, Code),
+    true = erlang:check_old_code(my_code_test),
 
-    ?line {ok,my_code_test,Code} = compile:file(File, [binary]),
-    ?line {module,my_code_test} = code:load_binary(my_code_test, File, Code),
-    
-    ?line false = erlang:check_old_code(my_code_test),
-    ?line {module,my_code_test} = code:load_binary(my_code_test, File, Code),
-    ?line true = erlang:check_old_code(my_code_test),
+    true = erlang:purge_module(my_code_test),
+    true = erlang:delete_module(my_code_test),
+    true = erlang:purge_module(my_code_test),
 
-    ?line true = erlang:purge_module(my_code_test),
-    ?line true = erlang:delete_module(my_code_test),
-    ?line true = erlang:purge_module(my_code_test),
+    {'EXIT',_} = (catch erlang:check_old_code([])),
 
-    ?line {'EXIT',_} = (catch erlang:check_old_code([])),
-    
     ok.
 
 external_fun(Config) when is_list(Config) ->
-    ?line false = erlang:function_exported(another_code_test, x, 1),
+    false = erlang:function_exported(another_code_test, x, 1),
     AnotherCodeTest = id(another_code_test),
     ExtFun = fun AnotherCodeTest:x/1,
-    ?line {'EXIT',{undef,_}} = (catch ExtFun(answer)),
-    ?line false = erlang:function_exported(another_code_test, x, 1),
-    ?line false = lists:member(another_code_test, erlang:loaded()),
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "another_code_test"),
-    ?line {ok,another_code_test,Code} = compile:file(File, [binary,report]),
-    ?line {module,another_code_test} = erlang:load_module(another_code_test, Code),
-    ?line 42 = ExtFun(answer),
+    {'EXIT',{undef,_}} = (catch ExtFun(answer)),
+    false = erlang:function_exported(another_code_test, x, 1),
+    false = lists:member(another_code_test, erlang:loaded()),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "another_code_test"),
+    {ok,another_code_test,Code} = compile:file(File, [binary,report]),
+    {module,another_code_test} = erlang:load_module(another_code_test, Code),
+    42 = ExtFun(answer),
     ok.
 
 get_chunk(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "my_code_test"),
-    ?line {ok,my_code_test,Code} = compile:file(File, [binary]),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "my_code_test"),
+    {ok,my_code_test,Code} = compile:file(File, [binary]),
 
     %% Should work.
-    ?line Chunk = get_chunk_ok("Atom", Code),
-    ?line Chunk = get_chunk_ok("Atom", make_sub_binary(Code)),
-    ?line Chunk = get_chunk_ok("Atom", make_unaligned_sub_binary(Code)),
+    Chunk = get_chunk_ok("Atom", Code),
+    Chunk = get_chunk_ok("Atom", make_sub_binary(Code)),
+    Chunk = get_chunk_ok("Atom", make_unaligned_sub_binary(Code)),
 
     %% Should fail.
-    ?line {'EXIT',{badarg,_}} = (catch code:get_chunk(bit_sized_binary(Code), "Atom")),
-    ?line {'EXIT',{badarg,_}} = (catch code:get_chunk(Code, "bad chunk id")),
+    {'EXIT',{badarg,_}} = (catch code:get_chunk(bit_sized_binary(Code), "Atom")),
+    {'EXIT',{badarg,_}} = (catch code:get_chunk(Code, "bad chunk id")),
 
     %% Invalid beam code or missing chunk should return 'undefined'.
-    ?line undefined = code:get_chunk(<<"not a beam module">>, "Atom"),
-    ?line undefined = code:get_chunk(Code, "XXXX"),
+    undefined = code:get_chunk(<<"not a beam module">>, "Atom"),
+    undefined = code:get_chunk(Code, "XXXX"),
 
     ok.
 
 get_chunk_ok(Chunk, Code) ->
     case code:get_chunk(Code, Chunk) of
-	Bin when is_binary(Bin) -> Bin
+        Bin when is_binary(Bin) -> Bin
     end.
 
 module_md5(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "my_code_test"),
-    ?line {ok,my_code_test,Code} = compile:file(File, [binary]),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "my_code_test"),
+    {ok,my_code_test,Code} = compile:file(File, [binary]),
 
     %% Should work.
-    ?line Chunk = module_md5_ok(Code),
-    ?line Chunk = module_md5_ok(make_sub_binary(Code)),
-    ?line Chunk = module_md5_ok(make_unaligned_sub_binary(Code)),
+    Chunk = module_md5_ok(Code),
+    Chunk = module_md5_ok(make_sub_binary(Code)),
+    Chunk = module_md5_ok(make_unaligned_sub_binary(Code)),
 
     %% Should fail.
-    ?line {'EXIT',{badarg,_}} = (catch code:module_md5(bit_sized_binary(Code))),
+    {'EXIT',{badarg,_}} = (catch code:module_md5(bit_sized_binary(Code))),
 
     %% Invalid beam code should return 'undefined'.
-    ?line undefined = code:module_md5(<<"not a beam module">>),
+    undefined = code:module_md5(<<"not a beam module">>),
     ok.
-    
+
 module_md5_ok(Code) ->
     case code:module_md5(Code) of
-	Bin when is_binary(Bin), size(Bin) =:= 16 -> Bin
+        Bin when is_binary(Bin), size(Bin) =:= 16 -> Bin
     end.
 
 
@@ -392,106 +382,106 @@ make_stub(Config) when is_list(Config) ->
     catch erlang:purge_module(my_code_test),
     MD5 = erlang:md5(<<>>),
 
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "my_code_test"),
-    ?line {ok,my_code_test,Code} = compile:file(File, [binary]),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "my_code_test"),
+    {ok,my_code_test,Code} = compile:file(File, [binary]),
 
-    ?line my_code_test = code:make_stub_module(my_code_test, Code, {[],[],MD5}),
-    ?line true = erlang:delete_module(my_code_test),
-    ?line true = erlang:purge_module(my_code_test),
+    my_code_test = code:make_stub_module(my_code_test, Code, {[],[],MD5}),
+    true = erlang:delete_module(my_code_test),
+    true = erlang:purge_module(my_code_test),
 
-    ?line my_code_test = code:make_stub_module(my_code_test, 
- 					       make_unaligned_sub_binary(Code),
- 					       {[],[],MD5}),
-    ?line true = erlang:delete_module(my_code_test),
-    ?line true = erlang:purge_module(my_code_test),
+    my_code_test = code:make_stub_module(my_code_test, 
+                                         make_unaligned_sub_binary(Code),
+                                         {[],[],MD5}),
+    true = erlang:delete_module(my_code_test),
+    true = erlang:purge_module(my_code_test),
 
-    ?line my_code_test = code:make_stub_module(my_code_test, zlib:gzip(Code),
- 					       {[],[],MD5}),
-    ?line true = erlang:delete_module(my_code_test),
-    ?line true = erlang:purge_module(my_code_test),
+    my_code_test = code:make_stub_module(my_code_test, zlib:gzip(Code),
+                                         {[],[],MD5}),
+    true = erlang:delete_module(my_code_test),
+    true = erlang:purge_module(my_code_test),
 
     %% Should fail.
-    ?line {'EXIT',{badarg,_}} =
-	(catch code:make_stub_module(my_code_test, <<"bad">>, {[],[],MD5})),
-    ?line {'EXIT',{badarg,_}} =
-	(catch code:make_stub_module(my_code_test,
-				     bit_sized_binary(Code),
-				     {[],[],MD5})),
-    ?line {'EXIT',{badarg,_}} =
-	(catch code:make_stub_module(my_code_test_with_wrong_name,
-				     Code, {[],[],MD5})),
+    {'EXIT',{badarg,_}} =
+    (catch code:make_stub_module(my_code_test, <<"bad">>, {[],[],MD5})),
+    {'EXIT',{badarg,_}} =
+    (catch code:make_stub_module(my_code_test,
+                                 bit_sized_binary(Code),
+                                 {[],[],MD5})),
+    {'EXIT',{badarg,_}} =
+    (catch code:make_stub_module(my_code_test_with_wrong_name,
+                                 Code, {[],[],MD5})),
     ok.
 
 make_stub_many_funs(Config) when is_list(Config) ->
     catch erlang:purge_module(many_funs),
     MD5 = erlang:md5(<<>>),
 
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "many_funs"),
-    ?line {ok,many_funs,Code} = compile:file(File, [binary]),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "many_funs"),
+    {ok,many_funs,Code} = compile:file(File, [binary]),
 
-    ?line many_funs = code:make_stub_module(many_funs, Code, {[],[],MD5}),
-    ?line true = erlang:delete_module(many_funs),
-    ?line true = erlang:purge_module(many_funs),
-    ?line many_funs = code:make_stub_module(many_funs, 
- 					       make_unaligned_sub_binary(Code),
- 					       {[],[],MD5}),
-    ?line true = erlang:delete_module(many_funs),
-    ?line true = erlang:purge_module(many_funs),
+    many_funs = code:make_stub_module(many_funs, Code, {[],[],MD5}),
+    true = erlang:delete_module(many_funs),
+    true = erlang:purge_module(many_funs),
+    many_funs = code:make_stub_module(many_funs, 
+                                      make_unaligned_sub_binary(Code),
+                                      {[],[],MD5}),
+    true = erlang:delete_module(many_funs),
+    true = erlang:purge_module(many_funs),
 
     %% Should fail.
-    ?line {'EXIT',{badarg,_}} =
-	(catch code:make_stub_module(many_funs, <<"bad">>, {[],[],MD5})),
-    ?line {'EXIT',{badarg,_}} =
-	(catch code:make_stub_module(many_funs,
-				     bit_sized_binary(Code),
-				     {[],[],MD5})),
+    {'EXIT',{badarg,_}} =
+    (catch code:make_stub_module(many_funs, <<"bad">>, {[],[],MD5})),
+    {'EXIT',{badarg,_}} =
+    (catch code:make_stub_module(many_funs,
+                                 bit_sized_binary(Code),
+                                 {[],[],MD5})),
     ok.
 
 constant_pools(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "literals"),
-    ?line {ok,literals,Code} = compile:file(File, [report,binary]),
-    ?line {module,literals} = erlang:load_module(literals,
-						 make_sub_binary(Code)),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "literals"),
+    {ok,literals,Code} = compile:file(File, [report,binary]),
+    {module,literals} = erlang:load_module(literals,
+                                           make_sub_binary(Code)),
 
     %% Initialize.
-    ?line A = literals:a(),
-    ?line B = literals:b(),
-    ?line C = literals:huge_bignum(),
-    ?line process_flag(trap_exit, true),
+    A = literals:a(),
+    B = literals:b(),
+    C = literals:huge_bignum(),
+    process_flag(trap_exit, true),
     Self = self(),
 
     %% Have a process WITHOUT old heap that references the literals
     %% in the 'literals' module.
-    ?line NoOldHeap = spawn_link(fun() -> no_old_heap(Self) end),
+    NoOldHeap = spawn_link(fun() -> no_old_heap(Self) end),
     receive go -> ok end,
-    ?line true = erlang:delete_module(literals),
-    ?line false = erlang:check_process_code(NoOldHeap, literals),
-    ?line erlang:check_process_code(self(), literals),
-    ?line true = erlang:purge_module(literals),
-    ?line NoOldHeap ! done,
-    ?line receive
-	      {'EXIT',NoOldHeap,{A,B,C}} ->
-		  ok;
-	      Other ->
-		  ?line ?t:fail({unexpected,Other})
-	  end,
-    ?line {module,literals} = erlang:load_module(literals, Code),
+    true = erlang:delete_module(literals),
+    false = erlang:check_process_code(NoOldHeap, literals),
+    erlang:check_process_code(self(), literals),
+    true = erlang:purge_module(literals),
+    NoOldHeap ! done,
+    receive
+        {'EXIT',NoOldHeap,{A,B,C}} ->
+            ok;
+        Other ->
+            ct:fail({unexpected,Other})
+    end,
+    {module,literals} = erlang:load_module(literals, Code),
 
     %% Have a process WITH an old heap that references the literals
     %% in the 'literals' module.
-    ?line OldHeap = spawn_link(fun() -> old_heap(Self) end),
+    OldHeap = spawn_link(fun() -> old_heap(Self) end),
     receive go -> ok end,
-    ?line true = erlang:delete_module(literals),
-    ?line false = erlang:check_process_code(OldHeap, literals),
-    ?line erlang:check_process_code(self(), literals),
-    ?line erlang:purge_module(literals),
-    ?line OldHeap ! done,
+    true = erlang:delete_module(literals),
+    false = erlang:check_process_code(OldHeap, literals),
+    erlang:check_process_code(self(), literals),
+    erlang:purge_module(literals),
+    OldHeap ! done,
     receive
-	{'EXIT',OldHeap,{A,B,C,[1,2,3|_]=Seq}} when length(Seq) =:= 16 ->
-	    ok
+        {'EXIT',OldHeap,{A,B,C,[1,2,3|_]=Seq}} when length(Seq) =:= 16 ->
+            ok
     end.
 
 no_old_heap(Parent) ->
@@ -500,8 +490,8 @@ no_old_heap(Parent) ->
     Res = {A,B,literals:huge_bignum()},
     Parent ! go,
     receive
-	done ->
-	    exit(Res)
+        done ->
+            exit(Res)
     end.
 
 old_heap(Parent) ->
@@ -511,16 +501,16 @@ old_heap(Parent) ->
     create_old_heap(),
     Parent ! go,
     receive
-	done ->
-	    exit(Res)
+        done ->
+            exit(Res)
     end.
 
 create_old_heap() ->
     case process_info(self(), [heap_size,total_heap_size]) of
-	[{heap_size,Sz},{total_heap_size,Total}] when Sz < Total ->
-	    ok;
-	_ ->
-	    create_old_heap()
+        [{heap_size,Sz},{total_heap_size,Total}] when Sz < Total ->
+            ok;
+        _ ->
+            create_old_heap()
     end.
 
 constant_refc_binaries(Config) when is_list(Config) ->
@@ -529,7 +519,7 @@ constant_refc_binaries(Config) when is_list(Config) ->
     io:format("Binary data (bytes) before test: ~p\n", [Bef]),
 
     %% Compile the the literals module.
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     File = filename:join(Data, "literals"),
     {ok,literals,Code} = compile:file(File, [report,binary]),
 
@@ -554,29 +544,29 @@ constant_refc_binaries(Config) when is_list(Config) ->
     io:format("Binary data (bytes) after test: ~p", [Aft]),
     Diff = Aft - Bef,
     if
-	Diff < 0 ->
-	    io:format("~p less bytes", [abs(Diff)]);
-	Diff > 0 ->
-	    io:format("~p more bytes", [Diff]);
-	true ->
-	    ok
+        Diff < 0 ->
+            io:format("~p less bytes", [abs(Diff)]);
+        Diff > 0 ->
+            io:format("~p more bytes", [Diff]);
+        true ->
+            ok
     end,
 
     %% Test for leaks. We must accept some natural variations in
     %% the size of allocated binaries.
     if
-	Diff > 64*1024 ->
-	    ?t:fail(binary_leak);
-	true ->
-	    ok
+        Diff > 64*1024 ->
+            ct:fail(binary_leak);
+        true ->
+            ok
     end.
 
 memory_binary() ->
     try
-	erlang:memory(binary)
+        erlang:memory(binary)
     catch
-	error:notsup ->
-	    0
+        error:notsup ->
+            0
     end.
 
 provoke_mem_leak(0, _, _) -> ok;
@@ -586,19 +576,19 @@ provoke_mem_leak(N, Code, Check) ->
     %% Create several processes with references to the literal binary.
     Self = self(),
     Pids = [spawn_link(fun() ->
-			       create_binaries(Self, NumRefs, Check)
-		       end) || NumRefs <- lists:seq(1, 10)],
+                               create_binaries(Self, NumRefs, Check)
+                       end) || NumRefs <- lists:seq(1, 10)],
     [receive {started,Pid} -> ok end || Pid <- Pids],
 
     %% Make the code old and remove references to the constant pool
     %% in all processes.
     true = erlang:delete_module(literals),
     Ms = [spawn_monitor(fun() ->
-				false = erlang:check_process_code(Pid, literals)
-			end) || Pid <- Pids],
+                                false = erlang:check_process_code(Pid, literals)
+                        end) || Pid <- Pids],
     [receive
-	 {'DOWN',R,process,P,normal} ->
-	     ok
+         {'DOWN',R,process,P,normal} ->
+             ok
      end || {P,R} <- Ms],
 
     %% Purge the code.
@@ -606,14 +596,14 @@ provoke_mem_leak(N, Code, Check) ->
 
     %% Tell the processes that the code has been purged.
     [begin
-	 monitor(process, Pid),
-	 Pid ! purged
+         monitor(process, Pid),
+         Pid ! purged
      end || Pid <- Pids],
 
     %% Wait for all processes to terminate.
     [receive
-	 {'DOWN',_,process,Pid,normal} ->
-	     ok
+         {'DOWN',_,process,Pid,normal} ->
+             ok
      end || Pid <- Pids],
 
     %% We now expect that the binary has been deallocated.
@@ -625,112 +615,112 @@ create_binaries(Parent, NumRefs, Check) ->
     {bits,Bits} = literals:bits(),
     Parent ! {started,self()},
     receive
-	purged ->
-	    %% The code has been purged. Now make sure that
-	    %% the binaries haven't been corrupted.
-	    Check = erlang:md5(Bin),
-	    [Bin = B || B <- Bins],
-	    <<42:13,Bin/binary>> = Bits,
-
-	    %% Remove all references to the binaries
-	    %% Doing it explicitly like this ensures that
-	    %% the binaries are gone when the parent process
-	    %% receives the 'DOWN' message.
-	    erlang:garbage_collect()
+        purged ->
+            %% The code has been purged. Now make sure that
+            %% the binaries haven't been corrupted.
+            Check = erlang:md5(Bin),
+            [Bin = B || B <- Bins],
+            <<42:13,Bin/binary>> = Bits,
+
+            %% Remove all references to the binaries
+            %% Doing it explicitly like this ensures that
+            %% the binaries are gone when the parent process
+            %% receives the 'DOWN' message.
+            erlang:garbage_collect()
     end.
 
 wait_for_memory_deallocations() ->
     try
-	erts_debug:set_internal_state(wait, deallocations)
+        erts_debug:set_internal_state(wait, deallocations)
     catch
-	error:undef ->
-	    erts_debug:set_internal_state(available_internal_state, true),
-	    wait_for_memory_deallocations()
+        error:undef ->
+            erts_debug:set_internal_state(available_internal_state, true),
+            wait_for_memory_deallocations()
     end.
 
 %% OTP-7559: c_p->cp could contain garbage and create a false dependency
 %% to a module in a process. (Thanks to Richard Carlsson.)
 false_dependency(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "cpbugx"),
-    ?line {ok,cpbugx,Code} = compile:file(File, [binary,report]),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "cpbugx"),
+    {ok,cpbugx,Code} = compile:file(File, [binary,report]),
 
     do_false_dependency(fun cpbugx:before/0, Code),
     do_false_dependency(fun cpbugx:before2/0, Code),
     do_false_dependency(fun cpbugx:before3/0, Code),
 
-%%     %% Spawn process. Make sure it has called cpbugx:before/0 and returned.
-%%     Parent = self(),
-%%     ?line Pid = spawn_link(fun() -> false_dependency_loop(Parent) end),
-%%     ?line receive initialized -> ok end,
+    %%     %% Spawn process. Make sure it has called cpbugx:before/0 and returned.
+    %%     Parent = self(),
+    %%     Pid = spawn_link(fun() -> false_dependency_loop(Parent) end),
+    %%     receive initialized -> ok end,
+
+    %%     %% Reload the module. Make sure the process is still alive.
+    %%     {module,cpbugx} = erlang:load_module(cpbugx, Bin),
+    %%     io:put_chars(binary_to_list(element(2, process_info(Pid, backtrace)))),
+    %%     true = is_process_alive(Pid),
 
-%%     %% Reload the module. Make sure the process is still alive.
-%%     ?line {module,cpbugx} = erlang:load_module(cpbugx, Bin),
-%%     ?line io:put_chars(binary_to_list(element(2, process_info(Pid, backtrace)))),
-%%     ?line true = is_process_alive(Pid),
+    %%     %% There should not be any dependency to cpbugx.
+    %%     false = erlang:check_process_code(Pid, cpbugx),
 
-%%     %% There should not be any dependency to cpbugx.
-%%     ?line false = erlang:check_process_code(Pid, cpbugx),
-    
 
 
 
-%%     %% Kill the process.
-%%     ?line unlink(Pid), exit(Pid, kill),
+    %%     %% Kill the process.
+    %%     unlink(Pid), exit(Pid, kill),
     ok.
 
 do_false_dependency(Init, Code) ->
-    ?line {module,cpbugx} = erlang:load_module(cpbugx, Code),
+    {module,cpbugx} = erlang:load_module(cpbugx, Code),
 
     %% Spawn process. Make sure it has the appropriate init function
     %% and returned. CP should not contain garbage after the return.
     Parent = self(),
-    ?line Pid = spawn_link(fun() -> false_dependency_loop(Parent, Init, true) end),
-    ?line receive initialized -> ok end,
+    Pid = spawn_link(fun() -> false_dependency_loop(Parent, Init, true) end),
+    receive initialized -> ok end,
 
     %% Reload the module. Make sure the process is still alive.
-    ?line {module,cpbugx} = erlang:load_module(cpbugx, Code),
-    ?line io:put_chars(binary_to_list(element(2, process_info(Pid, backtrace)))),
-    ?line true = is_process_alive(Pid),
+    {module,cpbugx} = erlang:load_module(cpbugx, Code),
+    io:put_chars(binary_to_list(element(2, process_info(Pid, backtrace)))),
+    true = is_process_alive(Pid),
 
     %% There should not be any dependency to cpbugx.
-    ?line false = erlang:check_process_code(Pid, cpbugx),
+    false = erlang:check_process_code(Pid, cpbugx),
 
     %% Kill the process and completely unload the code.
-    ?line unlink(Pid), exit(Pid, kill),
-    ?line true = erlang:purge_module(cpbugx),
-    ?line true = erlang:delete_module(cpbugx),
-    ?line code:is_module_native(cpbugx),  % test is_module_native on deleted code
-    ?line true = erlang:purge_module(cpbugx),
-    ?line code:is_module_native(cpbugx),  % test is_module_native on purged code
+    unlink(Pid), exit(Pid, kill),
+    true = erlang:purge_module(cpbugx),
+    true = erlang:delete_module(cpbugx),
+    code:is_module_native(cpbugx),  % test is_module_native on deleted code
+    true = erlang:purge_module(cpbugx),
+    code:is_module_native(cpbugx),  % test is_module_native on purged code
     ok.
-    
+
 false_dependency_loop(Parent, Init, SendInitAck) ->
     Init(),
     case SendInitAck of
-	true -> Parent ! initialized;
-	false -> void
-		 %% Just send one init-ack. I guess the point of this test
-		 %% wasn't to fill parents msg-queue (?). Seen to cause
-		 %% out-of-mem (on halfword-vm for some reason) by
-		 %% 91 million msg in queue. /sverker
+        true -> Parent ! initialized;
+        false -> void
+                 %% Just send one init-ack. I guess the point of this test
+                 %% wasn't to fill parents msg-queue (?). Seen to cause
+                 %% out-of-mem (on halfword-vm for some reason) by
+                 %% 91 million msg in queue. /sverker
     end,
     receive
-	_ -> false_dependency_loop(Parent, Init, false)
+        _ -> false_dependency_loop(Parent, Init, false)
     end.
 
 coverage(Config) when is_list(Config) ->
-    ?line code:is_module_native(?MODULE),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:purge_module({a,b,c})),
-    ?line {'EXIT',{badarg,_}} = (catch code:is_module_native({a,b,c})),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:check_process_code(not_a_pid, ?MODULE)),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:check_process_code(self(), [not_a_module])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:delete_module([a,b,c])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:module_loaded(42)),
+    code:is_module_native(?MODULE),
+    {'EXIT',{badarg,_}} = (catch erlang:purge_module({a,b,c})),
+    {'EXIT',{badarg,_}} = (catch code:is_module_native({a,b,c})),
+    {'EXIT',{badarg,_}} = (catch erlang:check_process_code(not_a_pid, ?MODULE)),
+    {'EXIT',{badarg,_}} = (catch erlang:check_process_code(self(), [not_a_module])),
+    {'EXIT',{badarg,_}} = (catch erlang:delete_module([a,b,c])),
+    {'EXIT',{badarg,_}} = (catch erlang:module_loaded(42)),
     ok.
 
 fun_confusion(Config) when is_list(Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     Src = filename:join(Data, "fun_confusion"),
     Mod = fun_confusion,
 
@@ -753,6 +743,80 @@ compile_load(Mod, Src, Ver) ->
     {module,Mod} = code:load_binary(Mod, "fun_confusion.beam", Code1),
     ok.
 
+
+t_copy_literals(Config) when is_list(Config) ->
+    %% Compile the the literals module.
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "literals"),
+    {ok,literals,Code} = compile:file(File, [report,binary]),
+    {module,literals} = erlang:load_module(literals, Code),
+
+    N   = 30,
+    Me  = self(),
+    %% reload literals code every 567 ms
+    Rel = spawn_link(fun() -> reloader(literals,Code,567) end),
+    %% add new literal msgs to the loop every 789 ms
+    Sat = spawn_link(fun() -> saturate(Me,789) end),
+    %% run for 10s
+    _   = spawn_link(fun() -> receive after 10000 -> Me ! done end end),
+    ok  = chase_msg(N, Me),
+    %% cleanup
+    Rel ! done,
+    Sat ! done,
+    ok  = flush(),
+    ok.
+
+
+chase_msg(0, Pid) ->
+    chase_loop(Pid);
+chase_msg(N, Master) ->
+    Pid = spawn_link(fun() -> chase_msg(N - 1,Master) end),
+    chase_loop(Pid).
+
+chase_loop(Pid) ->
+    receive
+        done ->
+            Pid ! done,
+            ok;
+        {_From,Msg} ->
+            Pid ! {self(), Msg},
+            ok = traverse(Msg),
+            chase_loop(Pid)
+    end.
+
+saturate(Pid,Time) ->
+    Es = [msg1,msg2,msg3,msg4,msg5],
+    Msg = [literals:E()||E <- Es],
+    Pid ! {self(), Msg},
+    receive
+        done -> ok
+    after Time ->
+              saturate(Pid,Time)
+    end.
+
+traverse([]) -> ok;
+traverse([H|T]) ->
+    ok = traverse(H),
+    traverse(T);
+traverse(T) when is_tuple(T) -> ok;
+traverse(B) when is_binary(B) -> ok;
+traverse(I) when is_integer(I) -> ok;
+traverse(#{ 1 := V1, b := V2 }) ->
+    ok = traverse(V1),
+    ok = traverse(V2),
+    ok.
+
+
+reloader(Mod,Code,Time) ->
+    receive
+        done -> ok
+    after Time ->
+              code:purge(Mod),
+              {module,Mod} = erlang:load_module(Mod, Code),
+              reloader(Mod,Code,Time)
+    end.
+
+
 %% Utilities.
 
 make_sub_binary(Bin) when is_binary(Bin) ->
@@ -775,4 +839,7 @@ bit_sized_binary(Bin0) ->
     BitSize = 8*size(Bin) + 1,
     Bin.
 
+flush() ->
+    receive _ -> flush() after 0 -> ok end.
+
 id(I) -> I.
diff --git a/erts/emulator/test/code_SUITE_data/literals.erl b/erts/emulator/test/code_SUITE_data/literals.erl
index 9802d9d3f9..a36bfe09dd 100644
--- a/erts/emulator/test/code_SUITE_data/literals.erl
+++ b/erts/emulator/test/code_SUITE_data/literals.erl
@@ -20,6 +20,7 @@
 
 -module(literals).
 -export([a/0,b/0,huge_bignum/0,binary/0,unused_binaries/0,bits/0]).
+-export([msg1/0,msg2/0,msg3/0,msg4/0,msg5/0]).
 
 a() ->
     {a,42.0,[7,38877938333399637266518333334747]}.
@@ -101,3 +102,9 @@ unused_binaries() ->
 
 bits() ->
     {bits,<<42:13,?MB_1>>}.
+
+msg1() -> "halloj".
+msg2() -> {"hello","world"}.
+msg3() -> <<"halloj">>.
+msg4() -> #{ 1=> "hello", b => "world"}.
+msg5() -> {1,2,3,4,5,6}.
diff --git a/erts/emulator/test/code_parallel_load_SUITE.erl b/erts/emulator/test/code_parallel_load_SUITE.erl
index b7ac0420cd..e9e7000434 100644
--- a/erts/emulator/test/code_parallel_load_SUITE.erl
+++ b/erts/emulator/test/code_parallel_load_SUITE.erl
@@ -19,49 +19,34 @@
 %%
 
 -module(code_parallel_load_SUITE).
--export([
-	all/0,
-	suite/0,
-	init_per_suite/1,
-	end_per_suite/1,
-	init_per_testcase/2,
-	end_per_testcase/2
-    ]).
-
--export([
-	multiple_load_check_purge_repeat/1,
-	many_load_distributed_only_once/1
-    ]).
+-export([all/0,
+         suite/0,
+         init_per_testcase/2,
+         end_per_testcase/2]).
+
+-export([multiple_load_check_purge_repeat/1,
+         many_load_distributed_only_once/1]).
 
 -define(model,       code_parallel_load_SUITE_model).
 -define(interval,    50).
 -define(number_of_processes, 160).
 -define(passes, 4).
 
+-include_lib("common_test/include/ct.hrl").
 
--include_lib("test_server/include/test_server.hrl").
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 4}}].
 
 all() ->
-    [
-	multiple_load_check_purge_repeat,
-	many_load_distributed_only_once
-    ].
-
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
+    [ multiple_load_check_purge_repeat,
+      many_load_distributed_only_once ].
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(3)),
-    [{watchdog, Dog}|Config].
+    Config.
 
 end_per_testcase(_Func, Config) ->
-    SConf = ?config(save_config, Config),
+    SConf = proplists:get_value(save_config, Config),
     Pids  = proplists:get_value(purge_pids, SConf),
 
     case check_old_code(?model) of
@@ -72,9 +57,7 @@ end_per_testcase(_Func, Config) ->
 	true -> check_and_purge_processes_code(Pids, ?model);
 	_ ->    ok
     end,
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
+    ok.
 
 multiple_load_check_purge_repeat(_Conf) ->
     Ts    = [v1,v2,v3,v4,v5,v6],
diff --git a/erts/emulator/test/crypto_SUITE.erl b/erts/emulator/test/crypto_SUITE.erl
index 3622592586..6212997272 100644
--- a/erts/emulator/test/crypto_SUITE.erl
+++ b/erts/emulator/test/crypto_SUITE.erl
@@ -20,65 +20,44 @@
 
 -module(crypto_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2,
-	 t_md5/1,t_md5_update/1,error/1,unaligned_context/1,random_lists/1,
-	 misc_errors/1]).
+-export([all/0, suite/0,
+         t_md5/1,t_md5_update/1,error/1,unaligned_context/1,random_lists/1,
+         misc_errors/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [t_md5, t_md5_update, error, unaligned_context,
      random_lists, misc_errors].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-
-misc_errors(doc) ->
-    ["Test crc32, adler32 and md5 error cases not covered by other tests"];
-misc_errors(suite) ->
-    [];
+%% Test crc32, adler32 and md5 error cases not covered by other tests"
 misc_errors(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(2)),
-    ?line 1 = erlang:adler32([]),
-    ?line L = lists:duplicate(600,3),
-    ?line 1135871753 = erlang:adler32(L),
-    ?line L2 = lists:duplicate(22000,3),
-    ?line 1100939744 = erlang:adler32(L2),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:adler32(L++[a])),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:crc32(L++[a])),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:crc32([1,2,3|<<25:7>>])),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:crc32([1,2,3|4])),
-    ?line Big = 111111111111111111111111111111,
-    ?line {'EXIT', {badarg,_}} = (catch erlang:crc32(Big,<<"hej">>)),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:crc32(25,[1,2,3|4])),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:crc32_combine(Big,3,3)),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:crc32_combine(3,Big,3)),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:crc32_combine(3,3,Big)),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:adler32(Big,<<"hej">>)),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:adler32(25,[1,2,3|4])),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:adler32_combine(Big,3,3)),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:adler32_combine(3,Big,3)),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:adler32_combine(3,3,Big)),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:md5_update(<<"hej">>,<<"hej">>)),
-    ?line {'EXIT', {badarg,_}} = (catch erlang:md5_final(<<"hej">>)),
-    ?line test_server:timetrap_cancel(Dog),
+    ct:timetrap({minutes, 2}),
+    1 = erlang:adler32([]),
+    L = lists:duplicate(600,3),
+    1135871753 = erlang:adler32(L),
+    L2 = lists:duplicate(22000,3),
+    1100939744 = erlang:adler32(L2),
+    {'EXIT', {badarg,_}} = (catch erlang:adler32(L++[a])),
+    {'EXIT', {badarg,_}} = (catch erlang:crc32(L++[a])),
+    {'EXIT', {badarg,_}} = (catch erlang:crc32([1,2,3|<<25:7>>])),
+    {'EXIT', {badarg,_}} = (catch erlang:crc32([1,2,3|4])),
+    Big = 111111111111111111111111111111,
+    {'EXIT', {badarg,_}} = (catch erlang:crc32(Big,<<"hej">>)),
+    {'EXIT', {badarg,_}} = (catch erlang:crc32(25,[1,2,3|4])),
+    {'EXIT', {badarg,_}} = (catch erlang:crc32_combine(Big,3,3)),
+    {'EXIT', {badarg,_}} = (catch erlang:crc32_combine(3,Big,3)),
+    {'EXIT', {badarg,_}} = (catch erlang:crc32_combine(3,3,Big)),
+    {'EXIT', {badarg,_}} = (catch erlang:adler32(Big,<<"hej">>)),
+    {'EXIT', {badarg,_}} = (catch erlang:adler32(25,[1,2,3|4])),
+    {'EXIT', {badarg,_}} = (catch erlang:adler32_combine(Big,3,3)),
+    {'EXIT', {badarg,_}} = (catch erlang:adler32_combine(3,Big,3)),
+    {'EXIT', {badarg,_}} = (catch erlang:adler32_combine(3,3,Big)),
+    {'EXIT', {badarg,_}} = (catch erlang:md5_update(<<"hej">>,<<"hej">>)),
+    {'EXIT', {badarg,_}} = (catch erlang:md5_final(<<"hej">>)),
     ok.
 
 
@@ -93,7 +72,7 @@ nicesplit(N,L) ->
 nicesplit(0,Tail,Acc) ->
     {lists:reverse(Acc),Tail};
 nicesplit(_,[],Acc) ->
-     {lists:reverse(Acc),[]};
+    {lists:reverse(Acc),[]};
 nicesplit(N,[H|Tail],Acc) ->
     nicesplit(N-1,Tail,[H|Acc]).
 
@@ -102,17 +81,17 @@ run_in_para([],_) ->
 run_in_para(FunList,Schedulers) ->
     {ThisTime,NextTime} = nicesplit(Schedulers,FunList),
     case length(ThisTime) of 
-	1 ->
-	    [{L,Fun}] = ThisTime,
-	    try
-		Fun()
+        1 ->
+            [{L,Fun}] = ThisTime,
+            try
+                Fun()
             catch
-		_:Reason ->
-		  exit({error_at_line,L,Reason})
-	    end;
+                _:Reason ->
+                    exit({error_at_line,L,Reason})
+            end;
         _ ->
-	    These = [ {L,erlang:spawn_monitor(F)} || {L,F} <- ThisTime ],
-	    collect_workers(These)
+            These = [ {L,erlang:spawn_monitor(F)} || {L,F} <- ThisTime ],
+            collect_workers(These)
     end,
     run_in_para(NextTime,Schedulers).
 
@@ -120,159 +99,147 @@ collect_workers([]) ->
     ok;
 collect_workers([{L,{Pid,Ref}}|T]) ->
     receive
-	{'DOWN',Ref,process,Pid,normal} ->
-	    collect_workers(T);
-	{'DOWN',Ref,process,Pid,Other} ->
-	    exit({error_at_line,L,Other})
+        {'DOWN',Ref,process,Pid,normal} ->
+            collect_workers(T);
+        {'DOWN',Ref,process,Pid,Other} ->
+            exit({error_at_line,L,Other})
     end.
 
-random_lists(doc) ->
-    ["Test crc32, adler32 and md5 on a number of pseudo-randomly generated "
-     "lists."];
-random_lists(suite) ->
-    [];
+%% Test crc32, adler32 and md5 on a number of pseudo-randomly generated lists.
 random_lists(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(5)),
-    ?line Num = erlang:system_info(schedulers_online),
-    ?line B = list_to_binary(
-		lists:duplicate(
-		  (erlang:system_info(context_reductions)*10) - 50,$!)),
-    ?line CRC32_1 = fun(L) -> erlang:crc32(L) end,
-    ?line CRC32_2 = fun(L) -> ?REF:crc32(L) end,
-    ?line ADLER32_1 = fun(L) -> erlang:adler32(L) end,
-    ?line ADLER32_2 = fun(L) -> ?REF:adler32(L) end,
-    ?line MD5_1 = fun(L) -> erlang:md5(L) end,
-    ?line MD5_2 = fun(L) -> ?REF:md5_final(
-			       ?REF:md5_update(?REF:md5_init(),L)) end,
-    ?line MD5_3 =  fun(L) -> erlang:md5_final(
-			       erlang:md5_update(erlang:md5_init(),L)) end,
-    ?line CRC32_1_L = fun(L) -> erlang:crc32([B|L]) end,
-    ?line CRC32_2_L = fun(L) -> ?REF:crc32([B|L]) end,
-    ?line ADLER32_1_L = fun(L) -> erlang:adler32([B|L]) end,
-    ?line ADLER32_2_L = fun(L) -> ?REF:adler32([B|L]) end,
-    ?line MD5_1_L = fun(L) -> erlang:md5([B|L]) end,
-    ?line MD5_2_L = fun(L) -> ?REF:md5_final(
-				 ?REF:md5_update(?REF:md5_init(),[B|L])) end,
-    ?line MD5_3_L =  fun(L) -> erlang:md5_final(
-				 erlang:md5_update(
-				   erlang:md5_init(),[B|L])) end,
-    ?line Wlist0 = 
-	[{?LINE, fun() -> random_iolist:run(150, CRC32_1, CRC32_2) end},
-	 {?LINE, fun() -> random_iolist:run(150, ADLER32_1, ADLER32_2) end},
-	 {?LINE, fun() -> random_iolist:run(150,MD5_1,MD5_2) end},
-	 {?LINE, fun() -> random_iolist:run(150,MD5_1,MD5_3) end},
-	 {?LINE, fun() -> random_iolist:run(150, CRC32_1_L, CRC32_2_L) end},
-	 {?LINE, 
-	  fun() -> random_iolist:run(150, ADLER32_1_L, ADLER32_2_L) end},
-	 {?LINE, fun() -> random_iolist:run(150,MD5_1_L,MD5_2_L) end},
-	 {?LINE, fun() -> random_iolist:run(150,MD5_1_L,MD5_3_L) end}],
-    ?line run_in_para(Wlist0,Num),
-    ?line CRC32_1_2 = fun(L1,L2) -> erlang:crc32([L1,L2]) end,
-    ?line CRC32_2_2 = fun(L1,L2) -> erlang:crc32(erlang:crc32(L1),L2) end,
-    ?line CRC32_3_2 = fun(L1,L2) -> erlang:crc32_combine(
-				      erlang:crc32(L1),
-				      erlang:crc32(L2),
-				      erlang:iolist_size(L2)) 
-		      end,
-    ?line ADLER32_1_2 = fun(L1,L2) -> erlang:adler32([L1,L2]) end,
-    ?line ADLER32_2_2 = fun(L1,L2) -> erlang:adler32(
-					erlang:adler32(L1),L2) end,
-    ?line ADLER32_3_2 = fun(L1,L2) -> erlang:adler32_combine(
-				      erlang:adler32(L1),
-				      erlang:adler32(L2),
-				      erlang:iolist_size(L2)) 
-			end,
-    ?line MD5_1_2 = fun(L1,L2) -> erlang:md5([L1,L2]) end,
-    ?line MD5_2_2 = fun(L1,L2) -> 
-			    erlang:md5_final(
-			      erlang:md5_update(
-				erlang:md5_update(
-				  erlang:md5_init(),
-				  L1),
-				L2)) 
-		    end,
-    ?line CRC32_1_L_2 = fun(L1,L2) -> erlang:crc32([[B|L1],[B|L2]]) end,
-    ?line CRC32_2_L_2 = fun(L1,L2) -> erlang:crc32(
-					erlang:crc32([B|L1]),[B|L2]) end,
-    ?line CRC32_3_L_2 = fun(L1,L2) -> erlang:crc32_combine(
-					erlang:crc32([B|L1]),
-					erlang:crc32([B|L2]),
-					erlang:iolist_size([B|L2])) 
-			end,
-    ?line ADLER32_1_L_2 = fun(L1,L2) -> erlang:adler32([[B|L1],[B|L2]]) end,
-    ?line ADLER32_2_L_2 = fun(L1,L2) -> erlang:adler32(
-					  erlang:adler32([B|L1]),
-					  [B|L2]) 
-			  end,
-    ?line ADLER32_3_L_2 = fun(L1,L2) -> erlang:adler32_combine(
-					  erlang:adler32([B|L1]),
-					  erlang:adler32([B|L2]),
-					  erlang:iolist_size([B|L2])) 
-			  end,
-    ?line MD5_1_L_2 = fun(L1,L2) -> erlang:md5([[B|L1],[B|L2]]) end,
-    ?line MD5_2_L_2 = fun(L1,L2) -> 
-			      erlang:md5_final(
-				erlang:md5_update(
-				  erlang:md5_update(
-				    erlang:md5_init(),
-				    [B|L1]),
-				  [B|L2])) 
-		      end,
-    ?line Wlist1 = 
-	[{?LINE, fun() -> random_iolist:run2(150,CRC32_1_2,CRC32_2_2) end},
-	 {?LINE, fun() -> random_iolist:run2(150,CRC32_1_2,CRC32_3_2) end},
-	 {?LINE, fun() -> random_iolist:run2(150,ADLER32_1_2,ADLER32_2_2) end},
-	 {?LINE, fun() -> random_iolist:run2(150,ADLER32_1_2,ADLER32_3_2) end},
-	 {?LINE, fun() -> random_iolist:run2(150,MD5_1_2,MD5_2_2) end},
-	 {?LINE, fun() -> random_iolist:run2(150,CRC32_1_L_2,CRC32_2_L_2) end},
-	 {?LINE, fun() -> random_iolist:run2(150,CRC32_1_L_2,CRC32_3_L_2) end},
-	 {?LINE, 
-	  fun() -> random_iolist:run2(150,ADLER32_1_L_2,ADLER32_2_L_2) end},
-	 {?LINE, 
-	  fun() -> random_iolist:run2(150,ADLER32_1_L_2,ADLER32_3_L_2) end},
-	 {?LINE, fun() -> random_iolist:run2(150,MD5_1_L_2,MD5_2_L_2) end}],
-    ?line run_in_para(Wlist1,Num),
-    ?line test_server:timetrap_cancel(Dog),
+    ct:timetrap({minutes, 5}),
+    Num = erlang:system_info(schedulers_online),
+    B = list_to_binary(
+          lists:duplicate(
+            (erlang:system_info(context_reductions)*10) - 50,$!)),
+    CRC32_1 = fun(L) -> erlang:crc32(L) end,
+    CRC32_2 = fun(L) -> ?REF:crc32(L) end,
+    ADLER32_1 = fun(L) -> erlang:adler32(L) end,
+    ADLER32_2 = fun(L) -> ?REF:adler32(L) end,
+    MD5_1 = fun(L) -> erlang:md5(L) end,
+    MD5_2 = fun(L) -> ?REF:md5_final(
+                         ?REF:md5_update(?REF:md5_init(),L)) end,
+    MD5_3 =  fun(L) -> erlang:md5_final(
+                         erlang:md5_update(erlang:md5_init(),L)) end,
+    CRC32_1_L = fun(L) -> erlang:crc32([B|L]) end,
+    CRC32_2_L = fun(L) -> ?REF:crc32([B|L]) end,
+    ADLER32_1_L = fun(L) -> erlang:adler32([B|L]) end,
+    ADLER32_2_L = fun(L) -> ?REF:adler32([B|L]) end,
+    MD5_1_L = fun(L) -> erlang:md5([B|L]) end,
+    MD5_2_L = fun(L) -> ?REF:md5_final(
+                           ?REF:md5_update(?REF:md5_init(),[B|L])) end,
+    MD5_3_L =  fun(L) -> erlang:md5_final(
+                           erlang:md5_update(
+                             erlang:md5_init(),[B|L])) end,
+    Wlist0 = 
+    [{?LINE, fun() -> random_iolist:run(150, CRC32_1, CRC32_2) end},
+     {?LINE, fun() -> random_iolist:run(150, ADLER32_1, ADLER32_2) end},
+     {?LINE, fun() -> random_iolist:run(150,MD5_1,MD5_2) end},
+     {?LINE, fun() -> random_iolist:run(150,MD5_1,MD5_3) end},
+     {?LINE, fun() -> random_iolist:run(150, CRC32_1_L, CRC32_2_L) end},
+     {?LINE, 
+      fun() -> random_iolist:run(150, ADLER32_1_L, ADLER32_2_L) end},
+     {?LINE, fun() -> random_iolist:run(150,MD5_1_L,MD5_2_L) end},
+     {?LINE, fun() -> random_iolist:run(150,MD5_1_L,MD5_3_L) end}],
+    run_in_para(Wlist0,Num),
+    CRC32_1_2 = fun(L1,L2) -> erlang:crc32([L1,L2]) end,
+    CRC32_2_2 = fun(L1,L2) -> erlang:crc32(erlang:crc32(L1),L2) end,
+    CRC32_3_2 = fun(L1,L2) -> erlang:crc32_combine(
+                                erlang:crc32(L1),
+                                erlang:crc32(L2),
+                                erlang:iolist_size(L2)) 
+                end,
+    ADLER32_1_2 = fun(L1,L2) -> erlang:adler32([L1,L2]) end,
+    ADLER32_2_2 = fun(L1,L2) -> erlang:adler32(
+                                  erlang:adler32(L1),L2) end,
+    ADLER32_3_2 = fun(L1,L2) -> erlang:adler32_combine(
+                                  erlang:adler32(L1),
+                                  erlang:adler32(L2),
+                                  erlang:iolist_size(L2)) 
+                  end,
+    MD5_1_2 = fun(L1,L2) -> erlang:md5([L1,L2]) end,
+    MD5_2_2 = fun(L1,L2) -> 
+                      erlang:md5_final(
+                        erlang:md5_update(
+                          erlang:md5_update(
+                            erlang:md5_init(),
+                            L1),
+                          L2)) 
+              end,
+    CRC32_1_L_2 = fun(L1,L2) -> erlang:crc32([[B|L1],[B|L2]]) end,
+    CRC32_2_L_2 = fun(L1,L2) -> erlang:crc32(
+                                  erlang:crc32([B|L1]),[B|L2]) end,
+    CRC32_3_L_2 = fun(L1,L2) -> erlang:crc32_combine(
+                                  erlang:crc32([B|L1]),
+                                  erlang:crc32([B|L2]),
+                                  erlang:iolist_size([B|L2])) 
+                  end,
+    ADLER32_1_L_2 = fun(L1,L2) -> erlang:adler32([[B|L1],[B|L2]]) end,
+    ADLER32_2_L_2 = fun(L1,L2) -> erlang:adler32(
+                                    erlang:adler32([B|L1]),
+                                    [B|L2]) 
+                    end,
+    ADLER32_3_L_2 = fun(L1,L2) -> erlang:adler32_combine(
+                                    erlang:adler32([B|L1]),
+                                    erlang:adler32([B|L2]),
+                                    erlang:iolist_size([B|L2])) 
+                    end,
+    MD5_1_L_2 = fun(L1,L2) -> erlang:md5([[B|L1],[B|L2]]) end,
+    MD5_2_L_2 = fun(L1,L2) -> 
+                        erlang:md5_final(
+                          erlang:md5_update(
+                            erlang:md5_update(
+                              erlang:md5_init(),
+                              [B|L1]),
+                            [B|L2])) 
+                end,
+    Wlist1 = 
+    [{?LINE, fun() -> random_iolist:run2(150,CRC32_1_2,CRC32_2_2) end},
+     {?LINE, fun() -> random_iolist:run2(150,CRC32_1_2,CRC32_3_2) end},
+     {?LINE, fun() -> random_iolist:run2(150,ADLER32_1_2,ADLER32_2_2) end},
+     {?LINE, fun() -> random_iolist:run2(150,ADLER32_1_2,ADLER32_3_2) end},
+     {?LINE, fun() -> random_iolist:run2(150,MD5_1_2,MD5_2_2) end},
+     {?LINE, fun() -> random_iolist:run2(150,CRC32_1_L_2,CRC32_2_L_2) end},
+     {?LINE, fun() -> random_iolist:run2(150,CRC32_1_L_2,CRC32_3_L_2) end},
+     {?LINE, 
+      fun() -> random_iolist:run2(150,ADLER32_1_L_2,ADLER32_2_L_2) end},
+     {?LINE, 
+      fun() -> random_iolist:run2(150,ADLER32_1_L_2,ADLER32_3_L_2) end},
+     {?LINE, fun() -> random_iolist:run2(150,MD5_1_L_2,MD5_2_L_2) end}],
+    run_in_para(Wlist1,Num),
     ok.
 
-%%
-%%
-t_md5(doc) ->
-    ["Generate MD5 message digests and check the result. Examples are "
-     "from RFC-1321."];
+%% Generate MD5 message digests and check the result. Examples are from RFC-1321.
 t_md5(Config) when is_list(Config) ->
-    ?line t_md5_test("", "d41d8cd98f00b204e9800998ecf8427e"),
-    ?line t_md5_test("a", "0cc175b9c0f1b6a831c399e269772661"),
-    ?line t_md5_test("abc", "900150983cd24fb0d6963f7d28e17f72"),
-    ?line t_md5_test(["message ","digest"], "f96b697d7cb7938d525a2f31aaf161d0"),
-    ?line t_md5_test(["message ",unaligned_sub_bin(<<"digest">>)],
-		   "f96b697d7cb7938d525a2f31aaf161d0"),
-    ?line t_md5_test("abcdefghijklmnopqrstuvwxyz",
-		   "c3fcd3d76192e4007dfb496cca67e13b"),
-    ?line t_md5_test("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-		       "0123456789",
-	    "d174ab98d277d9f5a5611c2c9f419d9f"),
-    ?line t_md5_test("12345678901234567890123456789012345678901234567890"
-		       "123456789012345678901234567890",
-	    "57edf4a22be3c955ac49da2e2107b67a"),
+    t_md5_test("", "d41d8cd98f00b204e9800998ecf8427e"),
+    t_md5_test("a", "0cc175b9c0f1b6a831c399e269772661"),
+    t_md5_test("abc", "900150983cd24fb0d6963f7d28e17f72"),
+    t_md5_test(["message ","digest"], "f96b697d7cb7938d525a2f31aaf161d0"),
+    t_md5_test(["message ",unaligned_sub_bin(<<"digest">>)],
+               "f96b697d7cb7938d525a2f31aaf161d0"),
+    t_md5_test("abcdefghijklmnopqrstuvwxyz",
+               "c3fcd3d76192e4007dfb496cca67e13b"),
+    t_md5_test("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+               "0123456789",
+               "d174ab98d277d9f5a5611c2c9f419d9f"),
+    t_md5_test("12345678901234567890123456789012345678901234567890"
+               "123456789012345678901234567890",
+               "57edf4a22be3c955ac49da2e2107b67a"),
     ok.
 
-%%
-%%
-t_md5_update(doc) ->
-    ["Generate MD5 message using md5_init, md5_update, and md5_final, and"
-     "check the result. Examples are from RFC-1321."];
+%% Generate MD5 message using md5_init, md5_update, and md5_final, and
+%% check the result. Examples are from RFC-1321.
 t_md5_update(Config) when is_list(Config) ->
-    ?line t_md5_update_1(fun(Str) -> Str end),
-    ?line t_md5_update_1(fun(Str) -> list_to_binary(Str) end),
-    ?line t_md5_update_1(fun(Str) -> unaligned_sub_bin(list_to_binary(Str)) end),
+    t_md5_update_1(fun(Str) -> Str end),
+    t_md5_update_1(fun(Str) -> list_to_binary(Str) end),
+    t_md5_update_1(fun(Str) -> unaligned_sub_bin(list_to_binary(Str)) end),
     ok.
 
 t_md5_update_1(Tr) when is_function(Tr, 1) ->
     Ctx = erlang:md5_init(),
     Ctx1 = erlang:md5_update(Ctx, Tr("ABCDEFGHIJKLMNOPQRSTUVWXYZ")),
     Ctx2 = erlang:md5_update(Ctx1, Tr("abcdefghijklmnopqrstuvwxyz"
-				      "0123456789")),
+                                      "0123456789")),
     m(erlang:md5_final(Ctx2),
       hexstr2bin("d174ab98d277d9f5a5611c2c9f419d9f")),
     ok.
@@ -280,28 +247,28 @@ t_md5_update_1(Tr) when is_function(Tr, 1) ->
 %%
 %%
 error(Config) when is_list(Config) ->
-    ?line {'EXIT',{badarg,_}} = (catch erlang:md5(bit_sized_binary(<<"abc">>))),
-    ?line Ctx0 = erlang:md5_init(),
-    ?line {'EXIT',{badarg,_}} =
-	(catch erlang:md5_update(Ctx0, bit_sized_binary(<<"abcfjldjd">>))),
-    ?line {'EXIT',{badarg,_}} =
-	(catch erlang:md5_update(Ctx0, ["something",bit_sized_binary(<<"abcfjldjd">>)])),
-    ?line {'EXIT',{badarg,_}} =
-	(catch erlang:md5_update(bit_sized_binary(Ctx0), "something")),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:md5_final(bit_sized_binary(Ctx0))),
-    ?line m(erlang:md5_final(Ctx0), hexstr2bin("d41d8cd98f00b204e9800998ecf8427e")),
+    {'EXIT',{badarg,_}} = (catch erlang:md5(bit_sized_binary(<<"abc">>))),
+    Ctx0 = erlang:md5_init(),
+    {'EXIT',{badarg,_}} =
+    (catch erlang:md5_update(Ctx0, bit_sized_binary(<<"abcfjldjd">>))),
+    {'EXIT',{badarg,_}} =
+    (catch erlang:md5_update(Ctx0, ["something",bit_sized_binary(<<"abcfjldjd">>)])),
+    {'EXIT',{badarg,_}} =
+    (catch erlang:md5_update(bit_sized_binary(Ctx0), "something")),
+    {'EXIT',{badarg,_}} = (catch erlang:md5_final(bit_sized_binary(Ctx0))),
+    m(erlang:md5_final(Ctx0), hexstr2bin("d41d8cd98f00b204e9800998ecf8427e")),
     ok.
 
 
 %%
 %%
 unaligned_context(Config) when is_list(Config) ->
-    ?line Ctx0 = erlang:md5_init(),
-    ?line Ctx1 = erlang:md5_update(unaligned_sub_bin(Ctx0), "ABCDEFGHIJKLMNOPQRSTUVWXYZ"),
-    ?line Ctx = erlang:md5_update(unaligned_sub_bin(Ctx1),
-				  "abcdefghijklmnopqrstuvwxyz0123456789"),
-    ?line m(erlang:md5_final(unaligned_sub_bin(Ctx)),
-	    hexstr2bin("d174ab98d277d9f5a5611c2c9f419d9f")),
+    Ctx0 = erlang:md5_init(),
+    Ctx1 = erlang:md5_update(unaligned_sub_bin(Ctx0), "ABCDEFGHIJKLMNOPQRSTUVWXYZ"),
+    Ctx = erlang:md5_update(unaligned_sub_bin(Ctx1),
+                            "abcdefghijklmnopqrstuvwxyz0123456789"),
+    m(erlang:md5_final(unaligned_sub_bin(Ctx)),
+      hexstr2bin("d174ab98d277d9f5a5611c2c9f419d9f")),
     ok.
 
 %%
@@ -347,5 +314,3 @@ bit_sized_binary(Bin0) ->
     Bin.
 
 id(I) -> I.
-    
-
diff --git a/erts/emulator/test/ddll_SUITE.erl b/erts/emulator/test/ddll_SUITE.erl
index cabd6472d4..6982178827 100644
--- a/erts/emulator/test/ddll_SUITE.erl
+++ b/erts/emulator/test/ddll_SUITE.erl
@@ -31,30 +31,31 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, ddll_test/1, errors/1,
-	 reference_count/1,
-	 kill_port/1, dont_kill_port/1]).
+-export([all/0, suite/0,
+         ddll_test/1, errors/1, reference_count/1,
+         kill_port/1, dont_kill_port/1]).
 -export([unload_on_process_exit/1, delayed_unload_with_ports/1, 
-	 unload_due_to_process_exit/1,
-	 no_unload_due_to_process_exit/1, no_unload_due_to_process_exit_2/1,
-	 unload_reload_thingie/1, unload_reload_thingie_2/1,
-	 unload_reload_thingie_3/1, reload_pending/1, reload_pending_kill/1,
-	 load_fail_init/1,
-	 reload_pending_fail_init/1,
-	 more_error_codes/1, forced_port_killing/1, 
-	 no_trap_exit_and_kill_ports/1,
-	 monitor_demonitor/1, monitor_demonitor_load/1, new_interface/1, 
-	 lock_driver/1]).
+         unload_due_to_process_exit/1,
+         no_unload_due_to_process_exit/1, no_unload_due_to_process_exit_2/1,
+         unload_reload_thingie/1, unload_reload_thingie_2/1,
+         unload_reload_thingie_3/1, reload_pending/1, reload_pending_kill/1,
+         load_fail_init/1,
+         reload_pending_fail_init/1,
+         more_error_codes/1, forced_port_killing/1, 
+         no_trap_exit_and_kill_ports/1,
+         monitor_demonitor/1, monitor_demonitor_load/1, new_interface/1, 
+         lock_driver/1]).
 
 % Private exports
 -export([echo_loader/2, nice_echo_loader/2 ,properties/1, load_and_unload/1]).
 
 -import(ordsets, [subtract/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 10}}].
 
 all() -> 
     [ddll_test, errors, reference_count, kill_port,
@@ -70,1057 +71,931 @@ all() ->
      no_trap_exit_and_kill_ports, monitor_demonitor,
      monitor_demonitor_load, new_interface, lock_driver].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-unload_on_process_exit(suite) ->
-    [];
-unload_on_process_exit(doc) ->
-    ["Check that the driver is unloaded on process exit"];
+%% Check that the driver is unloaded on process exit
 unload_on_process_exit(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line false = lists:member("echo_drv",element(2,erl_ddll:loaded_drivers())),
+    Path = proplists:get_value(data_dir, Config),
+    false = lists:member("echo_drv",element(2,erl_ddll:loaded_drivers())),
     Parent = self(),
-    ?line Pid = spawn(fun() ->
-			      receive go -> ok end,
-			      erl_ddll:try_load(Path, echo_drv, []),
-			      Parent ! gone,
-			      receive go -> ok end,
-			      erl_ddll:loaded_drivers(),
-			      exit(banan)
-		      end),
-    ?line Ref = erlang:monitor(process,Pid),
-    ?line false = lists:member("echo_drv",element(2,erl_ddll:loaded_drivers())),
+    Pid = spawn(fun() ->
+                        receive go -> ok end,
+                        erl_ddll:try_load(Path, echo_drv, []),
+                        Parent ! gone,
+                        receive go -> ok end,
+                        erl_ddll:loaded_drivers(),
+                        exit(banan)
+                end),
+    Ref = erlang:monitor(process,Pid),
+    false = lists:member("echo_drv",element(2,erl_ddll:loaded_drivers())),
     Pid ! go,
-    ?line receive
-	gone -> ok
+    receive
+        gone -> ok
     end,
-    ?line true = lists:member("echo_drv",element(2,erl_ddll:loaded_drivers())),
+    true = lists:member("echo_drv",element(2,erl_ddll:loaded_drivers())),
     Pid ! go,
-    ?line receive
-	{'DOWN', Ref, process, Pid, banan} ->
-	    ok
+    receive
+        {'DOWN', Ref, process, Pid, banan} ->
+            ok
     end,
     receive after 500 -> ok end,
-    ?line false = lists:member("echo_drv",element(2,erl_ddll:loaded_drivers())),
-    ?line test_server:timetrap_cancel(Dog),
+    false = lists:member("echo_drv",element(2,erl_ddll:loaded_drivers())),
     ok.
 
-delayed_unload_with_ports(suite) ->
-    [];
-delayed_unload_with_ports(doc) ->
-    ["Check that the driver is unloaded when the last port is closed"];
+%% Check that the driver is unloaded when the last port is closed
 delayed_unload_with_ports(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line erl_ddll:try_load(Path, echo_drv, []),
-    ?line erl_ddll:try_load(Path, echo_drv, []),
-    ?line Port = open_port({spawn, echo_drv}, [eof]),
-    ?line 1 = erl_ddll:info(echo_drv, port_count),
-    ?line Port2 = open_port({spawn, echo_drv}, [eof]),
-    ?line 2 = erl_ddll:info(echo_drv, port_count),
-    ?line {ok,pending_process} = erl_ddll:try_unload(echo_drv,[{monitor, pending_driver}]),
-    ?line {ok,pending_driver,Ref} = erl_ddll:try_unload(echo_drv,[{monitor, pending_driver}]),
-    ?line ok = receive _ -> false after 0 -> ok end,
-    ?line Port ! {self(), close},
-    ?line ok = receive {Port,closed} -> ok after 1000 -> false end,
-    ?line 1 = erl_ddll:info(echo_drv, port_count),
-    ?line Port2 ! {self(), close},
-    ?line ok = receive {Port2,closed} -> ok after 1000 -> false end,
-    ?line ok = receive {'DOWN', Ref, driver, echo_drv, unloaded} -> ok after 1000 -> false end,
-    ?line test_server:timetrap_cancel(Dog),
+    Path = proplists:get_value(data_dir, Config),
+    erl_ddll:try_load(Path, echo_drv, []),
+    erl_ddll:try_load(Path, echo_drv, []),
+    Port = open_port({spawn, echo_drv}, [eof]),
+    1 = erl_ddll:info(echo_drv, port_count),
+    Port2 = open_port({spawn, echo_drv}, [eof]),
+    2 = erl_ddll:info(echo_drv, port_count),
+    {ok,pending_process} = erl_ddll:try_unload(echo_drv,[{monitor, pending_driver}]),
+    {ok,pending_driver,Ref} = erl_ddll:try_unload(echo_drv,[{monitor, pending_driver}]),
+    ok = receive _ -> false after 0 -> ok end,
+    Port ! {self(), close},
+    ok = receive {Port,closed} -> ok after 1000 -> false end,
+    1 = erl_ddll:info(echo_drv, port_count),
+    Port2 ! {self(), close},
+    ok = receive {Port2,closed} -> ok after 1000 -> false end,
+    ok = receive {'DOWN', Ref, driver, echo_drv, unloaded} -> ok after 1000 -> false end,
     ok.
 
-unload_due_to_process_exit(suite) ->
-    [];
-unload_due_to_process_exit(doc) ->
-    ["Check that the driver with ports is unloaded on process exit"];
+%% Check that the driver with ports is unloaded on process exit
 unload_due_to_process_exit(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line Parent = self(),
-    ?line F3 = fun() -> 
-		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
-		       receive X -> Parent ! {got,X} end 
-	       end,
-    ?line Pid = spawn(fun() ->
-			      receive go -> ok end,
-			      {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
-			      spawn(F3),
-			      receive go -> ok end,
-			      _Port = open_port({spawn, echo_drv}, [eof]),
-			      _Port2 = open_port({spawn, echo_drv}, [eof]),
-			      exit(banan)
-		      end),
-    ?line Ref = erlang:monitor(process,Pid),
+    Path = proplists:get_value(data_dir, Config),
+    Parent = self(),
+    F3 = fun() -> 
+                 Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
+                 receive X -> Parent ! {got,X} end 
+         end,
+    Pid = spawn(fun() ->
+                        receive go -> ok end,
+                        {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
+                        spawn(F3),
+                        receive go -> ok end,
+                        _Port = open_port({spawn, echo_drv}, [eof]),
+                        _Port2 = open_port({spawn, echo_drv}, [eof]),
+                        exit(banan)
+                end),
+    Ref = erlang:monitor(process,Pid),
     Pid ! go,
-    ?line {ok,Ref2} = receive 
-			  R when is_reference(R) -> {ok,R}; 
-			  Other -> {error, Other} 
-		      after 500 -> {error, timeout} 
-		      end,
+    {ok,Ref2} = receive 
+                    R when is_reference(R) -> {ok,R}; 
+                    Other -> {error, Other} 
+                after 500 -> {error, timeout} 
+                end,
     Pid ! go,
-    ?line ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
-    ?line ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
-    ?line test_server:timetrap_cancel(Dog),
+    ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
+    ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
     ok.
 
-no_unload_due_to_process_exit(suite) ->
-    [];
-no_unload_due_to_process_exit(doc) ->
-    ["Check that a driver with driver loaded in another process is not unloaded on process exit"];
+%% Check that a driver with driver loaded in another process is not unloaded on process exit
 no_unload_due_to_process_exit(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line Parent = self(),
-    ?line F3 = fun() -> 
-		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
-		       receive X -> Parent ! {got,X} end 
-	       end,
-    ?line Pid = spawn(fun() ->
-			      receive go -> ok end,
-			      {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
-			      spawn(F3),
-			      receive go -> ok end,
-			      _Port = open_port({spawn, echo_drv}, [eof]),
-			      _Port2 = open_port({spawn, echo_drv}, [eof]),
-			      exit(banan)
-		      end),
-    ?line Ref = erlang:monitor(process,Pid),
+    Path = proplists:get_value(data_dir, Config),
+    Parent = self(),
+    F3 = fun() -> 
+                 Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
+                 receive X -> Parent ! {got,X} end 
+         end,
+    Pid = spawn(fun() ->
+                        receive go -> ok end,
+                        {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
+                        spawn(F3),
+                        receive go -> ok end,
+                        _Port = open_port({spawn, echo_drv}, [eof]),
+                        _Port2 = open_port({spawn, echo_drv}, [eof]),
+                        exit(banan)
+                end),
+    Ref = erlang:monitor(process,Pid),
     Pid ! go,
-    ?line {ok,Ref2} = receive 
-			  R when is_reference(R) -> {ok,R}; 
-			  Other -> {error, Other} 
-		      after 500 -> {error, timeout} 
-		      end,
-    ?line {ok, already_loaded} = erl_ddll:try_load(Path, echo_drv, []),
+    {ok,Ref2} = receive 
+                    R when is_reference(R) -> {ok,R}; 
+                    Other -> {error, Other} 
+                after 500 -> {error, timeout} 
+                end,
+    {ok, already_loaded} = erl_ddll:try_load(Path, echo_drv, []),
     Pid ! go,
-    ?line ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
-    ?line ok = receive X -> {error, X} after 300 -> ok end,
-    ?line ok = unload_expect_fast(echo_drv,[]),
-    ?line ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
-    ?line test_server:timetrap_cancel(Dog),
+    ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
+    ok = receive X -> {error, X} after 300 -> ok end,
+    ok = unload_expect_fast(echo_drv,[]),
+    ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
     ok.
 
-no_unload_due_to_process_exit_2(suite) ->
-    [];
-no_unload_due_to_process_exit_2(doc) ->
-    ["Check that a driver with open ports in another process is not unloaded on process exit"];
+%% Check that a driver with open ports in another process is not unloaded on process exit
 no_unload_due_to_process_exit_2(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line Parent = self(),
-    ?line F3 = fun() -> 
-		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
-		       receive X -> Parent ! {got,X} end 
-	       end,
-    ?line Pid = spawn(fun() ->
-			      receive go -> ok end,
-			      {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
-			      spawn(F3),
-			      receive go -> ok end,
-			      _Port = open_port({spawn, echo_drv}, [eof]),
-			      _Port2 = open_port({spawn, echo_drv}, [eof]),
-			      exit(banan)
-		      end),
-    ?line Ref = erlang:monitor(process,Pid),
+    Path = proplists:get_value(data_dir, Config),
+    Parent = self(),
+    F3 = fun() -> 
+                 Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
+                 receive X -> Parent ! {got,X} end 
+         end,
+    Pid = spawn(fun() ->
+                        receive go -> ok end,
+                        {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
+                        spawn(F3),
+                        receive go -> ok end,
+                        _Port = open_port({spawn, echo_drv}, [eof]),
+                        _Port2 = open_port({spawn, echo_drv}, [eof]),
+                        exit(banan)
+                end),
+    Ref = erlang:monitor(process,Pid),
     Pid ! go,
-    ?line {ok,Ref2} = receive 
-			  R when is_reference(R) -> {ok,R}; 
-			  Other -> {error, Other} 
-		      after 500 -> {error, timeout} 
-		      end,
-    ?line Port = open_port({spawn, echo_drv}, [eof]),
+    {ok,Ref2} = receive 
+                    R when is_reference(R) -> {ok,R}; 
+                    Other -> {error, Other} 
+                after 500 -> {error, timeout} 
+                end,
+    Port = open_port({spawn, echo_drv}, [eof]),
     Pid ! go,
-    ?line ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
-    ?line ok = receive X -> {error, X} after 300 -> ok end,
-    ?line erlang:port_close(Port),
-    ?line ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
-    ?line test_server:timetrap_cancel(Dog),
+    ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
+    ok = receive X -> {error, X} after 300 -> ok end,
+    erlang:port_close(Port),
+    ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
     ok.
 
-unload_reload_thingie(suite) ->
-    [];
-unload_reload_thingie(doc) ->
-    ["Check delayed unload and reload"];
+%% Check delayed unload and reload
 unload_reload_thingie(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line Parent = self(),
-    ?line {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
-    ?line F3 = fun() -> 
-		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded_only}), 
-		       receive X -> Parent ! {got,X} end 
-	       end,
-    ?line Pid = spawn(fun() ->
-			      receive go -> ok end,
-			      _Port = open_port({spawn, echo_drv}, [eof]),
-			      spawn(F3),
-			      receive go -> ok end,
-			      exit(banan)
-		      end),
-    ?line Ref = erlang:monitor(process,Pid),
+    Path = proplists:get_value(data_dir, Config),
+    Parent = self(),
+    {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
+    F3 = fun() -> 
+                 Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded_only}), 
+                 receive X -> Parent ! {got,X} end 
+         end,
+    Pid = spawn(fun() ->
+                        receive go -> ok end,
+                        _Port = open_port({spawn, echo_drv}, [eof]),
+                        spawn(F3),
+                        receive go -> ok end,
+                        exit(banan)
+                end),
+    Ref = erlang:monitor(process,Pid),
+    Pid ! go,
+    {ok,Ref2} = receive 
+                    R when is_reference(R) -> {ok,R}; 
+                    Other -> {error, Other} 
+                after 500 -> {error, timeout} 
+                end,
+    {ok,pending_driver,Ref3} = erl_ddll:try_unload(echo_drv,[{monitor,pending}]),
+    Ref4 = erl_ddll:monitor(driver,{echo_drv,loaded}),
+    ok = receive {'DOWN',Ref4, driver,echo_drv,load_cancelled} -> ok after 1000 -> false end,
+    {ok,already_loaded} = erl_ddll:try_load(Path, echo_drv, []),
+    ok = receive {'UP',Ref3, driver,echo_drv,unload_cancelled} -> ok after 1000 -> false end,
     Pid ! go,
-    ?line {ok,Ref2} = receive 
-			  R when is_reference(R) -> {ok,R}; 
-			  Other -> {error, Other} 
-		      after 500 -> {error, timeout} 
-		      end,
-    ?line {ok,pending_driver,Ref3} = erl_ddll:try_unload(echo_drv,[{monitor,pending}]),
-    ?line Ref4 = erl_ddll:monitor(driver,{echo_drv,loaded}),
-    ?line ok = receive {'DOWN',Ref4, driver,echo_drv,load_cancelled} -> ok after 1000 -> false end,
-    ?line {ok,already_loaded} = erl_ddll:try_load(Path, echo_drv, []),
-    ?line ok = receive {'UP',Ref3, driver,echo_drv,unload_cancelled} -> ok after 1000 -> false end,
-    ?line Pid ! go,
-    ?line ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
-    ?line [{Parent,1}] = erl_ddll:info(echo_drv, processes),
-    ?line 0 = erl_ddll:info(echo_drv, port_count),
-    ?line ok = unload_expect_fast(echo_drv,[{monitor,pending}]),
-    ?line ok = receive 
-		   {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok 
-	       after 300 -> error 
-	       end,
-    ?line ok = receive X -> {error, X} after 300 -> ok end,
-    ?line test_server:timetrap_cancel(Dog),
+    ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
+    [{Parent,1}] = erl_ddll:info(echo_drv, processes),
+    0 = erl_ddll:info(echo_drv, port_count),
+    ok = unload_expect_fast(echo_drv,[{monitor,pending}]),
+    ok = receive 
+             {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok 
+         after 300 -> error 
+         end,
+    ok = receive X -> {error, X} after 300 -> ok end,
     ok.
 
-unload_reload_thingie_2(suite) ->
-    [];
-unload_reload_thingie_2(doc) ->
-    ["Check delayed unload and reload"];
+%% Check delayed unload and reload
 unload_reload_thingie_2(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line Parent = self(),
-    ?line {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
-    ?line F3 = fun() -> 
-		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded_only}), 
-		       receive X -> Parent ! {got,X} end 
-	       end,
-    ?line Pid = spawn(fun() ->
-			      receive go -> ok end,
-			      _Port = open_port({spawn, echo_drv}, [eof]),
-			      spawn(F3),
-			      receive go -> ok end,
-			      exit(banan)
-		      end),
-    ?line Ref = erlang:monitor(process,Pid),
+    Path = proplists:get_value(data_dir, Config),
+    Parent = self(),
+    {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
+    F3 = fun() -> 
+                 Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded_only}), 
+                 receive X -> Parent ! {got,X} end 
+         end,
+    Pid = spawn(fun() ->
+                        receive go -> ok end,
+                        _Port = open_port({spawn, echo_drv}, [eof]),
+                        spawn(F3),
+                        receive go -> ok end,
+                        exit(banan)
+                end),
+    Ref = erlang:monitor(process,Pid),
+    Pid ! go,
+    {ok,Ref2} = receive 
+                    R when is_reference(R) -> {ok,R}; 
+                    Other -> {error, Other} 
+                after 500 -> {error, timeout} 
+                end,
+    {ok,pending_driver,Ref3} = erl_ddll:try_load(Path, echo_drv,
+                                                 [{monitor,pending_driver},{reload,pending_driver}]),
+    Ref4 = erl_ddll:monitor(driver,{echo_drv,unloaded}),
     Pid ! go,
-    ?line {ok,Ref2} = receive 
-			  R when is_reference(R) -> {ok,R}; 
-			  Other -> {error, Other} 
-		      after 500 -> {error, timeout} 
-		      end,
-    ?line {ok,pending_driver,Ref3} = erl_ddll:try_load(Path,echo_drv,[{monitor,pending_driver},{reload,pending_driver}]),
-    ?line Ref4 = erl_ddll:monitor(driver,{echo_drv,unloaded}),
-    ?line Pid ! go,
-    ?line ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
-    ?line ok = receive {'DOWN',Ref4, driver,echo_drv,unloaded} -> ok after 1000 -> false end,
-    ?line ok = receive {'UP',Ref3, driver,echo_drv,loaded} -> ok after 1000 -> false end,
-    ?line [{Parent,1}] = erl_ddll:info(echo_drv, processes),
-    ?line 0 = erl_ddll:info(echo_drv, port_count),
-    ?line ok = receive 
-		   {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok 
-	       after 300 -> error 
-	       end,
-    ?line ok = unload_expect_fast(echo_drv,[{monitor,pending}]),
-    ?line ok = receive X -> {error, X} after 300 -> ok end,
-    ?line test_server:timetrap_cancel(Dog),
+    ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
+    ok = receive {'DOWN',Ref4, driver,echo_drv,unloaded} -> ok after 1000 -> false end,
+    ok = receive {'UP',Ref3, driver,echo_drv,loaded} -> ok after 1000 -> false end,
+    [{Parent,1}] = erl_ddll:info(echo_drv, processes),
+    0 = erl_ddll:info(echo_drv, port_count),
+    ok = receive 
+             {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok 
+         after 300 -> error 
+         end,
+    ok = unload_expect_fast(echo_drv,[{monitor,pending}]),
+    ok = receive X -> {error, X} after 300 -> ok end,
     ok.
 
-unload_reload_thingie_3(suite) ->
-    [];
-unload_reload_thingie_3(doc) ->
-    ["Check delayed unload and reload failure"];
+%% Check delayed unload and reload failure
 unload_reload_thingie_3(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line Parent = self(),
-    ?line {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
-    ?line F3 = fun() -> 
-		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
-		       receive X -> Parent ! {got,X} end 
-	       end,
-    ?line Pid = spawn(fun() ->
-			      receive go -> ok end,
-			      _Port = open_port({spawn, echo_drv}, [eof]),
-			      spawn(F3),
-			      receive go -> ok end,
-			      exit(banan)
-		      end),
-    ?line Ref = erlang:monitor(process,Pid),
+    Path = proplists:get_value(data_dir, Config),
+    Parent = self(),
+    {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
+    F3 = fun() -> 
+                 Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
+                 receive X -> Parent ! {got,X} end 
+         end,
+    Pid = spawn(fun() ->
+                        receive go -> ok end,
+                        _Port = open_port({spawn, echo_drv}, [eof]),
+                        spawn(F3),
+                        receive go -> ok end,
+                        exit(banan)
+                end),
+    Ref = erlang:monitor(process,Pid),
+    Pid ! go,
+    {ok,Ref2} = receive 
+                    R when is_reference(R) -> {ok,R}; 
+                    Other -> {error, Other} 
+                after 500 -> {error, timeout} 
+                end,
+    {ok,pending_driver,Ref3} = erl_ddll:try_load(filename:join([Path,"skrumpf"]), echo_drv,
+                                                 [{monitor,pending_driver},{reload,pending_driver}]),
+    Ref4 = erl_ddll:monitor(driver,{echo_drv,unloaded}),
     Pid ! go,
-    ?line {ok,Ref2} = receive 
-			  R when is_reference(R) -> {ok,R}; 
-			  Other -> {error, Other} 
-		      after 500 -> {error, timeout} 
-		      end,
-    ?line {ok,pending_driver,Ref3} = erl_ddll:try_load(filename:join([Path,"skrumpf"]),echo_drv,[{monitor,pending_driver},{reload,pending_driver}]),
-    ?line Ref4 = erl_ddll:monitor(driver,{echo_drv,unloaded}),
-    ?line Pid ! go,
-    ?line ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
-    ?line ok = receive 
-		   {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok 
-	       after 300 -> error 
-	       end,
-    ?line ok = receive {'DOWN',Ref4,driver,echo_drv,unloaded} -> ok after 300 -> false end,
-    ?line ok = receive 
-		   {'DOWN',Ref3, driver,echo_drv,{load_failure,_}} -> ok 
-	       after 1000 -> false 
-	       end,
-    ?line {'EXIT',_} = (catch erl_ddll:info(echo_drv, port_count)),
-    ?line {error, not_loaded} = erl_ddll:try_unload(echo_drv,[{monitor,pending}]),
-    ?line ok = receive X -> {error, X} after 300 -> ok end,
-    ?line test_server:timetrap_cancel(Dog),
+    ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
+    ok = receive 
+             {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok 
+         after 300 -> error 
+         end,
+    ok = receive {'DOWN',Ref4,driver,echo_drv,unloaded} -> ok after 300 -> false end,
+    ok = receive 
+             {'DOWN',Ref3, driver,echo_drv,{load_failure,_}} -> ok 
+         after 1000 -> false 
+         end,
+    {'EXIT',_} = (catch erl_ddll:info(echo_drv, port_count)),
+    {error, not_loaded} = erl_ddll:try_unload(echo_drv,[{monitor,pending}]),
+    ok = receive X -> {error, X} after 300 -> ok end,
     ok.
 
-reload_pending(suite) -> [];
-reload_pending(doc) -> ["Reload a driver that is pending on a user"];
+%% Reload a driver that is pending on a user
 reload_pending(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line Parent = self(),
-    ?line F3 = fun() -> 
-		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
-		       receive X -> Parent ! {got,X} end 
-	       end,
-    ?line Pid = spawn(fun() ->
-			      receive go -> ok end,
-			      {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
-			      spawn(F3),
-			      receive go -> ok end,
-			      _Port = open_port({spawn, echo_drv}, [eof]),
-			      _Port2 = open_port({spawn, echo_drv}, [eof]),
-			      Parent ! opened,
-			      receive go -> ok end,
-			      exit(banan)
-		      end),
-    ?line Ref = erlang:monitor(process,Pid),
+    Path = proplists:get_value(data_dir, Config),
+    Parent = self(),
+    F3 = fun() -> 
+                 Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
+                 receive X -> Parent ! {got,X} end 
+         end,
+    Pid = spawn(fun() ->
+                        receive go -> ok end,
+                        {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
+                        spawn(F3),
+                        receive go -> ok end,
+                        _Port = open_port({spawn, echo_drv}, [eof]),
+                        _Port2 = open_port({spawn, echo_drv}, [eof]),
+                        Parent ! opened,
+                        receive go -> ok end,
+                        exit(banan)
+                end),
+    Ref = erlang:monitor(process,Pid),
     Pid ! go,
-    ?line {ok,Ref2} = receive 
-			  R when is_reference(R) -> {ok,R}; 
-			  Other -> {error, Other} 
-		      after 500 -> {error, timeout} 
-		      end,
-    ?line {ok, already_loaded} = erl_ddll:try_load(Path, echo_drv, []),
-    ?line Port = open_port({spawn, echo_drv}, [eof]),
+    {ok,Ref2} = receive 
+                    R when is_reference(R) -> {ok,R}; 
+                    Other -> {error, Other} 
+                after 500 -> {error, timeout} 
+                end,
+    {ok, already_loaded} = erl_ddll:try_load(Path, echo_drv, []),
+    Port = open_port({spawn, echo_drv}, [eof]),
     Pid ! go,
-    ?line receive opened -> ok end,
-    ?line {error, pending_process} = 
-	erl_ddll:try_load(Path, echo_drv,
-			  [{reload,pending_driver},
-			   {monitor,pending_driver}]),
-    ?line {ok, pending_process, Ref3} = 
-	erl_ddll:try_load(Path, echo_drv,
-			  [{reload,pending},
-			   {monitor,pending}]),
-    ?line ok = receive X -> {error, X} after 300 -> ok end,
+    receive opened -> ok end,
+    {error, pending_process} = 
+    erl_ddll:try_load(Path, echo_drv,
+                      [{reload,pending_driver},
+                       {monitor,pending_driver}]),
+    {ok, pending_process, Ref3} = 
+    erl_ddll:try_load(Path, echo_drv,
+                      [{reload,pending},
+                       {monitor,pending}]),
+    ok = receive X -> {error, X} after 300 -> ok end,
     Pid ! go,
-    ?line ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
-    ?line ok = receive Y -> {error, Y} after 300 -> ok end,
-    ?line erlang:port_close(Port),
-    ?line ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
-    ?line ok = receive {'UP', Ref3, driver, echo_drv, loaded} -> ok after 300 -> error end,
+    ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
+    ok = receive Y -> {error, Y} after 300 -> ok end,
+    erlang:port_close(Port),
+    ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
+    ok = receive {'UP', Ref3, driver, echo_drv, loaded} -> ok after 300 -> error end,
     [{Parent,1}] = erl_ddll:info(echo_drv,processes),
-    ?line ok = receive Z -> {error, Z} after 300 -> ok end,
-    ?line test_server:timetrap_cancel(Dog),
+    ok = receive Z -> {error, Z} after 300 -> ok end,
     ok.
 
-load_fail_init(suite) -> [];
-load_fail_init(doc) -> ["Tests failure in the init in driver struct."];
+%% Tests failure in the init in driver struct.
 load_fail_init(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line PathFailing = ?config(priv_dir, Config),
-    ?line [_|_] = AllFailInits = filelib:wildcard("echo_drv_fail_init.*",Path),
-    ?line lists:foreach(fun(Name) ->
-				Src = filename:join([Path,Name]),
-				Ext = filename:extension(Name),
-				Dst =filename:join([PathFailing,"echo_drv"++Ext]),
-				file:delete(Dst),
-				{ok,_} = file:copy(Src,Dst)
-			end,
-			AllFailInits),
-    ?line [_|_] = filelib:wildcard("echo_drv.*",PathFailing),
-    ?line {error, driver_init_failed} = erl_ddll:try_load(PathFailing, 
-							  echo_drv,
-							  [{monitor,pending}]),
-    ?line ok = receive XX ->
-		       {unexpected,XX}
-	       after 300 ->
-		       ok
-	       end,
-    ?line test_server:timetrap_cancel(Dog),
+    Path = proplists:get_value(data_dir, Config),
+    PathFailing = proplists:get_value(priv_dir, Config),
+    [_|_] = AllFailInits = filelib:wildcard("echo_drv_fail_init.*",Path),
+    lists:foreach(fun(Name) ->
+                          Src = filename:join([Path,Name]),
+                          Ext = filename:extension(Name),
+                          Dst =filename:join([PathFailing,"echo_drv"++Ext]),
+                          file:delete(Dst),
+                          {ok,_} = file:copy(Src,Dst)
+                  end,
+                  AllFailInits),
+    [_|_] = filelib:wildcard("echo_drv.*",PathFailing),
+    {error, driver_init_failed} = erl_ddll:try_load(PathFailing, 
+                                                    echo_drv,
+                                                    [{monitor,pending}]),
+    ok = receive XX ->
+                     {unexpected,XX}
+         after 300 ->
+                   ok
+         end,
     ok.
 
 
-reload_pending_fail_init(suite) -> [];
-reload_pending_fail_init(doc) -> ["Reload a driver that is pending but init fails"];
+%% Reload a driver that is pending but init fails
 reload_pending_fail_init(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line PathFailing = ?config(priv_dir, Config),
-    ?line [_|_] = AllFailInits = filelib:wildcard("echo_drv_fail_init.*",Path),
-    ?line lists:foreach(fun(Name) ->
-				Src = filename:join([Path,Name]),
-				Ext = filename:extension(Name),
-				Dst =filename:join([PathFailing,"echo_drv"++Ext]),
-				file:delete(Dst),
-				{ok,_} = file:copy(Src,Dst)
-			end,
-			AllFailInits),
-    ?line [_|_] = filelib:wildcard("echo_drv.*",PathFailing),
-    ?line Parent = self(),
-    ?line F3 = fun() -> 
-		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
-		       receive X -> Parent ! {got,X} end 
-	       end,
-    ?line Pid = spawn(fun() ->
-			      receive go -> ok end,
-			      {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
-			      spawn(F3),
-			      receive go -> ok end,
-			      _Port = open_port({spawn, echo_drv}, [eof]),
-			      _Port2 = open_port({spawn, echo_drv}, [eof]),
-			      Parent ! opened,
-			      receive go -> ok end,
-			      exit(banan)
-		      end),
-    ?line Ref = erlang:monitor(process,Pid),
+    Path = proplists:get_value(data_dir, Config),
+    PathFailing = proplists:get_value(priv_dir, Config),
+    [_|_] = AllFailInits = filelib:wildcard("echo_drv_fail_init.*",Path),
+    lists:foreach(fun(Name) ->
+                          Src = filename:join([Path,Name]),
+                          Ext = filename:extension(Name),
+                          Dst =filename:join([PathFailing,"echo_drv"++Ext]),
+                          file:delete(Dst),
+                          {ok,_} = file:copy(Src,Dst)
+                  end,
+                  AllFailInits),
+    [_|_] = filelib:wildcard("echo_drv.*",PathFailing),
+    Parent = self(),
+    F3 = fun() -> 
+                 Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
+                 receive X -> Parent ! {got,X} end 
+         end,
+    Pid = spawn(fun() ->
+                        receive go -> ok end,
+                        {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
+                        spawn(F3),
+                        receive go -> ok end,
+                        _Port = open_port({spawn, echo_drv}, [eof]),
+                        _Port2 = open_port({spawn, echo_drv}, [eof]),
+                        Parent ! opened,
+                        receive go -> ok end,
+                        exit(banan)
+                end),
+    Ref = erlang:monitor(process,Pid),
     Pid ! go,
-    ?line {ok,Ref2} = receive 
-			  R when is_reference(R) -> {ok,R}; 
-			  Other -> {error, Other} 
-		      after 500 -> {error, timeout} 
-		      end,
-    ?line {ok, already_loaded} = erl_ddll:try_load(Path, echo_drv, []),
-    ?line Port = open_port({spawn, echo_drv}, [eof]),
+    {ok,Ref2} = receive 
+                    R when is_reference(R) -> {ok,R}; 
+                    Other -> {error, Other} 
+                after 500 -> {error, timeout} 
+                end,
+    {ok, already_loaded} = erl_ddll:try_load(Path, echo_drv, []),
+    Port = open_port({spawn, echo_drv}, [eof]),
     Pid ! go,
-    ?line receive opened -> ok end,
-    ?line {ok, pending_process, Ref3} = 
-	erl_ddll:try_load(PathFailing, echo_drv,
-			  [{reload,pending},
-			   {monitor,pending}]),
-    ?line ok = receive X -> {error, X} after 300 -> ok end,
+    receive opened -> ok end,
+    {ok, pending_process, Ref3} = 
+    erl_ddll:try_load(PathFailing, echo_drv,
+                      [{reload,pending},
+                       {monitor,pending}]),
+    ok = receive X -> {error, X} after 300 -> ok end,
     Pid ! go,
-    ?line ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
-    ?line ok = receive Y -> {error, Y} after 300 -> ok end,
-    ?line erlang:port_close(Port),
-    ?line ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
-    ?line ok = receive {'DOWN', Ref3, driver, echo_drv, {load_failure,driver_init_failed}} -> ok  after 300 -> error end,
-    ?line {'EXIT',{badarg,_}} = (catch erl_ddll:info(echo_drv,processes)),
-
-    ?line ok = receive Z -> {error, Z} after 300 -> ok end,
-    ?line test_server:timetrap_cancel(Dog),
+    ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
+    ok = receive Y -> {error, Y} after 300 -> ok end,
+    erlang:port_close(Port),
+    ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
+    ok = receive {'DOWN', Ref3, driver, echo_drv, {load_failure,driver_init_failed}} -> ok  after 300 -> error end,
+    {'EXIT',{badarg,_}} = (catch erl_ddll:info(echo_drv,processes)),
+
+    ok = receive Z -> {error, Z} after 300 -> ok end,
     ok.
 
-reload_pending_kill(suite) -> [];
-reload_pending_kill(doc) -> ["Reload a driver with kill_ports option "
-			     "that is pending on a user"];
+%% Reload a driver with kill_ports option that is pending on a user
 reload_pending_kill(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line OldFlag = process_flag(trap_exit,true),
-    ?line Path = ?config(data_dir, Config),
-    ?line Parent = self(),
-    ?line F3 = fun() -> 
-		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
-		       receive X -> Parent ! {got,X} end 
-	       end,
-    ?line Pid = spawn(fun() ->
-			      process_flag(trap_exit,true),
-			      receive go -> ok end,
-			      {ok, loaded} = erl_ddll:try_load(Path, echo_drv, [{driver_options,[kill_ports]}]),
-			      spawn(F3),
-			      receive go -> ok end,
-			      Port = open_port({spawn, echo_drv}, [eof]),
-			      Port2 = open_port({spawn, echo_drv}, [eof]),
-			      Parent ! opened,
-			      receive go -> ok end,
-			      receive 
-				  {'EXIT', Port2, driver_unloaded} ->
-				      Parent ! first_exit 
-			      end,
-			      receive 
-				  {'EXIT', Port, driver_unloaded} ->
-				      Parent ! second_exit 
-			      end,
-			      receive go -> ok end,
-			      exit(banan)
-		      end),
-    ?line Ref = erlang:monitor(process,Pid),
+    OldFlag = process_flag(trap_exit,true),
+    Path = proplists:get_value(data_dir, Config),
+    Parent = self(),
+    F3 = fun() -> 
+                 Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
+                 receive X -> Parent ! {got,X} end 
+         end,
+    Pid = spawn(fun() ->
+                        process_flag(trap_exit,true),
+                        receive go -> ok end,
+                        {ok, loaded} = erl_ddll:try_load(Path, echo_drv, [{driver_options,[kill_ports]}]),
+                        spawn(F3),
+                        receive go -> ok end,
+                        Port = open_port({spawn, echo_drv}, [eof]),
+                        Port2 = open_port({spawn, echo_drv}, [eof]),
+                        Parent ! opened,
+                        receive go -> ok end,
+                        receive 
+                            {'EXIT', Port2, driver_unloaded} ->
+                                Parent ! first_exit 
+                        end,
+                        receive 
+                            {'EXIT', Port, driver_unloaded} ->
+                                Parent ! second_exit 
+                        end,
+                        receive go -> ok end,
+                        exit(banan)
+                end),
+    Ref = erlang:monitor(process,Pid),
     Pid ! go,
-    ?line {ok,Ref2} = receive 
-			  R when is_reference(R) -> {ok,R}; 
-			  Other -> {error, Other} 
-		      after 500 -> {error, timeout} 
-		      end,
-    ?line {ok, already_loaded} = erl_ddll:try_load(Path, echo_drv, [{driver_options,[kill_ports]}]),
-    ?line {error,inconsistent} = erl_ddll:try_load(Path, echo_drv, []),
-    ?line Port = open_port({spawn, echo_drv}, [eof]),
+    {ok,Ref2} = receive 
+                    R when is_reference(R) -> {ok,R}; 
+                    Other -> {error, Other} 
+                after 500 -> {error, timeout} 
+                end,
+    {ok, already_loaded} = erl_ddll:try_load(Path, echo_drv, [{driver_options,[kill_ports]}]),
+    {error,inconsistent} = erl_ddll:try_load(Path, echo_drv, []),
+    Port = open_port({spawn, echo_drv}, [eof]),
     Pid ! go,
-    ?line receive opened -> ok end,
-    ?line {error, pending_process} = 
-	erl_ddll:try_load(Path, echo_drv,
-			  [{driver_options,[kill_ports]},
-			   {reload,pending_driver},
-			   {monitor,pending_driver}]),
-    ?line {ok, pending_process, Ref3} = 
-	erl_ddll:try_load(Path, echo_drv,
-			  [{driver_options,[kill_ports]},
-			   {reload,pending},
-			   {monitor,pending}]),
-    ?line ok =  receive 
-		    {'EXIT', Port, driver_unloaded} ->
-			ok 
-		after 300 -> error
-		end,
+    receive opened -> ok end,
+    {error, pending_process} = 
+    erl_ddll:try_load(Path, echo_drv,
+                      [{driver_options,[kill_ports]},
+                       {reload,pending_driver},
+                       {monitor,pending_driver}]),
+    {ok, pending_process, Ref3} = 
+    erl_ddll:try_load(Path, echo_drv,
+                      [{driver_options,[kill_ports]},
+                       {reload,pending},
+                       {monitor,pending}]),
+    ok =  receive 
+              {'EXIT', Port, driver_unloaded} ->
+                  ok 
+          after 300 -> error
+          end,
     Pid ! go,
-    ?line ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
-    ?line ok = receive {'UP', Ref3, driver, echo_drv, loaded} -> ok after 300 -> error end,
-    ?line [_,_] = erl_ddll:info(echo_drv,processes),
-    ?line ok = receive first_exit -> ok after 300 -> error end,
-    ?line ok = receive second_exit -> ok after 300 -> error end,
-    ?line 0 = erl_ddll:info(echo_drv,port_count), 
-    ?line ok = receive X -> {error, X} after 300 -> ok end,
+    ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
+    ok = receive {'UP', Ref3, driver, echo_drv, loaded} -> ok after 300 -> error end,
+    [_,_] = erl_ddll:info(echo_drv,processes),
+    ok = receive first_exit -> ok after 300 -> error end,
+    ok = receive second_exit -> ok after 300 -> error end,
+    0 = erl_ddll:info(echo_drv,port_count), 
+    ok = receive X -> {error, X} after 300 -> ok end,
     Pid ! go,
-    ?line ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
-    ?line ok = receive Y -> {error, Y} after 300 -> ok end,
-    ?line Port2 = open_port({spawn, echo_drv}, [eof]),
-    ?line true = is_port(Port2),
+    ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
+    ok = receive Y -> {error, Y} after 300 -> ok end,
+    Port2 = open_port({spawn, echo_drv}, [eof]),
+    true = is_port(Port2),
     [{Parent,1}] = erl_ddll:info(echo_drv,processes),
-    ?line 1 = erl_ddll:info(echo_drv,port_count), 
-    ?line erlang:port_close(Port2),
-    ?line ok = receive {'EXIT', Port2, normal} -> ok after 300 -> error end,
-    ?line 0 = erl_ddll:info(echo_drv,port_count), 
-    ?line [{Parent,1}] = erl_ddll:info(echo_drv,processes),
-    ?line Port3 = open_port({spawn, echo_drv}, [eof]),
-    ?line {ok, pending_driver, Ref4} = 
-	erl_ddll:try_unload(echo_drv,[{monitor,pending_driver}]),
-    ?line ok =  receive 
-		    {'EXIT', Port3, driver_unloaded} ->
-			ok 
-		after 300 -> error
-		end,
-    ?line ok = receive {'DOWN', Ref4, driver, echo_drv, unloaded} -> ok after 300 -> error end,
+    1 = erl_ddll:info(echo_drv,port_count), 
+    erlang:port_close(Port2),
+    ok = receive {'EXIT', Port2, normal} -> ok after 300 -> error end,
+    0 = erl_ddll:info(echo_drv,port_count), 
+    [{Parent,1}] = erl_ddll:info(echo_drv,processes),
+    Port3 = open_port({spawn, echo_drv}, [eof]),
+    {ok, pending_driver, Ref4} = 
+    erl_ddll:try_unload(echo_drv,[{monitor,pending_driver}]),
+    ok =  receive 
+              {'EXIT', Port3, driver_unloaded} ->
+                  ok 
+          after 300 -> error
+          end,
+    ok = receive {'DOWN', Ref4, driver, echo_drv, unloaded} -> ok after 300 -> error end,
     io:format("Port = ~w, Port2 = ~w, Port3 = ~w~n",[Port,Port2,Port3]),
-    ?line ok = receive Z -> {error, Z} after 300 -> ok end,
-    ?line process_flag(trap_exit,OldFlag),
-    ?line test_server:timetrap_cancel(Dog),
+    ok = receive Z -> {error, Z} after 300 -> ok end,
+    process_flag(trap_exit,OldFlag),
     ok.
 
 
-more_error_codes(suite) ->
-    [];
-more_error_codes(doc) ->
-    ["Some more error code checking"];
+%% Some more error code checking
 more_error_codes(Config) when is_list(Config) ->
-    ?line {error,Err} = erl_ddll:try_load("./echo_dr",echo_dr,[]),
-    ?line true = is_list(erl_ddll:format_error(Err)),
-    ?line true = is_list(erl_ddll:format_error(not_loaded)),
+    {error,Err} = erl_ddll:try_load("./echo_dr",echo_dr,[]),
+    true = is_list(erl_ddll:format_error(Err)),
+    true = is_list(erl_ddll:format_error(not_loaded)),
     ok.
 
-forced_port_killing(suite) ->
-    [];
-forced_port_killing(doc) ->
-    ["Check kill_ports option to try_unload "];
+%% Check kill_ports option to try_unload
 forced_port_killing(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line OldFlag=process_flag(trap_exit,true),
-    ?line Parent = self(),
-    ?line F3 = fun() -> 
-		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
-		       receive X -> Parent ! {got,X} end 
-	       end,
-    ?line {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
-    ?line spawn(F3),
-    ?line {ok,Ref2} = receive 
-			  R when is_reference(R) -> {ok,R}; 
-			  Other -> {error, Other} 
-		      after 500 -> {error, timeout} 
-		      end,
-    ?line Port = open_port({spawn, echo_drv}, [eof]),
-    ?line Port2 = open_port({spawn, echo_drv}, [eof]),
-    ?line {ok, pending_driver, Ref1} = 
-	erl_ddll:try_unload(echo_drv,[{monitor,pending_driver},kill_ports]),
-    ?line ok = receive 
-		   {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok 
-	       after 300 -> error 
-	       end,
-    ?line ok = receive {'EXIT',Port,driver_unloaded} -> ok after 300 -> false end,
-    ?line ok = receive {'EXIT',Port2,driver_unloaded} -> ok after 300 -> false end,
-    ?line ok = receive {'DOWN',Ref1, driver, echo_drv, unloaded} -> ok after 300 -> false end,
-    ?line process_flag(trap_exit,OldFlag),
-    ?line ok = receive X -> {error, X} after 300 -> ok end,
-    ?line test_server:timetrap_cancel(Dog),
+    Path = proplists:get_value(data_dir, Config),
+    OldFlag=process_flag(trap_exit,true),
+    Parent = self(),
+    F3 = fun() -> 
+                 Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
+                 receive X -> Parent ! {got,X} end 
+         end,
+    {ok, loaded} = erl_ddll:try_load(Path, echo_drv, []),
+    spawn(F3),
+    {ok,Ref2} = receive 
+                    R when is_reference(R) -> {ok,R}; 
+                    Other -> {error, Other} 
+                after 500 -> {error, timeout} 
+                end,
+    Port = open_port({spawn, echo_drv}, [eof]),
+    Port2 = open_port({spawn, echo_drv}, [eof]),
+    {ok, pending_driver, Ref1} = 
+    erl_ddll:try_unload(echo_drv,[{monitor,pending_driver},kill_ports]),
+    ok = receive 
+             {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok 
+         after 300 -> error 
+         end,
+    ok = receive {'EXIT',Port,driver_unloaded} -> ok after 300 -> false end,
+    ok = receive {'EXIT',Port2,driver_unloaded} -> ok after 300 -> false end,
+    ok = receive {'DOWN',Ref1, driver, echo_drv, unloaded} -> ok after 300 -> false end,
+    process_flag(trap_exit,OldFlag),
+    ok = receive X -> {error, X} after 300 -> ok end,
     ok.
 
-no_trap_exit_and_kill_ports(suite) ->
-    [];
-no_trap_exit_and_kill_ports(doc) ->
-    ["Check delayed unload and reload with no trap_exit"];
+%% Check delayed unload and reload with no trap_exit
 no_trap_exit_and_kill_ports(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line Parent = self(),
-    ?line OldFlag=process_flag(trap_exit,true),
-    ?line F3 = fun() -> 
-		       Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
-		       receive X -> Parent ! {got,X} end 
-	       end,
-    ?line Pid = spawn(fun() ->
-			      process_flag(trap_exit,false),
-			      receive go -> ok end,
-			      {ok, loaded} = erl_ddll:try_load(Path, echo_drv, 
-							       [{driver_options,[kill_ports]}]),
-			      spawn(F3),
-			      receive go -> ok end,
-			      _Port = open_port({spawn, echo_drv}, [eof]),
-			      _Port2 = open_port({spawn, echo_drv}, [eof]),
-			      exit(banan)
-		      end),
-    ?line Ref = erlang:monitor(process,Pid),
+    Path = proplists:get_value(data_dir, Config),
+    Parent = self(),
+    OldFlag=process_flag(trap_exit,true),
+    F3 = fun() -> 
+                 Parent ! erl_ddll:monitor(driver,{echo_drv,unloaded}), 
+                 receive X -> Parent ! {got,X} end 
+         end,
+    Pid = spawn(fun() ->
+                        process_flag(trap_exit,false),
+                        receive go -> ok end,
+                        {ok, loaded} = erl_ddll:try_load(Path, echo_drv, 
+                                                         [{driver_options,[kill_ports]}]),
+                        spawn(F3),
+                        receive go -> ok end,
+                        _Port = open_port({spawn, echo_drv}, [eof]),
+                        _Port2 = open_port({spawn, echo_drv}, [eof]),
+                        exit(banan)
+                end),
+    Ref = erlang:monitor(process,Pid),
     Pid ! go,
-    ?line {ok,Ref2} = receive 
-			  R when is_reference(R) -> {ok,R}; 
-			  Other -> {error, Other} 
-		      after 500 -> {error, timeout} 
-		      end,
-    ?line {error, inconsistent} = erl_ddll:try_load(Path, echo_drv, []),
-    ?line MyPort = open_port({spawn, echo_drv}, [eof]),
+    {ok,Ref2} = receive 
+                    R when is_reference(R) -> {ok,R}; 
+                    Other -> {error, Other} 
+                after 500 -> {error, timeout} 
+                end,
+    {error, inconsistent} = erl_ddll:try_load(Path, echo_drv, []),
+    MyPort = open_port({spawn, echo_drv}, [eof]),
     Pid ! go,
-    ?line ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
-    ?line ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
-    ?line ok = receive {'EXIT',MyPort,driver_unloaded} -> ok after 300 -> error end,
-    ?line process_flag(trap_exit,OldFlag),
-    ?line test_server:timetrap_cancel(Dog),
+    ok = receive {'DOWN', Ref, process, Pid, banan} -> ok after 300 -> error end,
+    ok = receive {got,{'DOWN', Ref2, driver, echo_drv, unloaded}} -> ok after 300 -> error end,
+    ok = receive {'EXIT',MyPort,driver_unloaded} -> ok after 300 -> error end,
+    process_flag(trap_exit,OldFlag),
     ok.
 
-monitor_demonitor(suite) ->
-    [];
-monitor_demonitor(doc) ->
-    ["Check monitor and demonitor of drivers"];
+%% Check monitor and demonitor of drivers
 monitor_demonitor(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line erl_ddll:try_load(Path, echo_drv, []),
-    ?line Ref = erl_ddll:monitor(driver,{echo_drv,unloaded}),
-    ?line Self = self(),
-    ?line [{Self,1}] = erl_ddll:info(echo_drv,awaiting_unload),
-    ?line true = erl_ddll:demonitor(Ref),
-    ?line [] = erl_ddll:info(echo_drv,awaiting_unload),
-    ?line erl_ddll:try_unload(echo_drv,[]),
-    ?line ok = receive _ -> error after 300 -> ok end,
-    ?line test_server:timetrap_cancel(Dog),
+    Path = proplists:get_value(data_dir, Config),
+    erl_ddll:try_load(Path, echo_drv, []),
+    Ref = erl_ddll:monitor(driver,{echo_drv,unloaded}),
+    Self = self(),
+    [{Self,1}] = erl_ddll:info(echo_drv,awaiting_unload),
+    true = erl_ddll:demonitor(Ref),
+    [] = erl_ddll:info(echo_drv,awaiting_unload),
+    erl_ddll:try_unload(echo_drv,[]),
+    ok = receive _ -> error after 300 -> ok end,
     ok.
 
-monitor_demonitor_load(suite) ->
-    [];
-monitor_demonitor_load(doc) ->
-    ["Check monitor/demonitor of driver loading"];
+%% Check monitor/demonitor of driver loading
 monitor_demonitor_load(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line {ok,loaded} = erl_ddll:try_load(Path, echo_drv, []),
-    ?line Port = open_port({spawn, echo_drv}, [eof]),
-    ?line Ref = erl_ddll:monitor(driver,{echo_drv,loaded}),
-    ?line ok = receive {'UP',Ref,driver,echo_drv,loaded} -> ok after 500 -> error end,
-    ?line {ok, pending_driver} = erl_ddll:try_unload(echo_drv,[]),
-    ?line Ref2 = erl_ddll:monitor(driver,{echo_drv,loaded}),
-    ?line ok = receive {'DOWN',Ref2,driver,echo_drv,load_cancelled} -> ok after 0 -> error end,
-    ?line {ok,already_loaded} = erl_ddll:try_load(Path, echo_drv, []),
-    ?line {ok, pending_driver} = 
-	erl_ddll:try_load(Path, echo_drv, [{reload,pending_driver}]),
-    ?line Ref3 = erl_ddll:monitor(driver,{echo_drv,loaded}),
-    ?line Ref4 = erl_ddll:monitor(driver,{echo_drv,unloaded}),
-    ?line ok = receive _ -> error after 300 -> ok end,
-    ?line Self = self(),
-    ?line [{Self,1}] = erl_ddll:info(echo_drv,awaiting_load),
-    ?line true = erl_ddll:demonitor(Ref3),
-    ?line [] = erl_ddll:info(echo_drv,awaiting_load),
-    ?line erlang:port_close(Port),
-    ?line ok = receive {'DOWN',Ref4,driver,echo_drv,unloaded} -> ok after 300 -> error end,
-    ?line ok = receive _ -> error after 300 -> ok end,
-    ?line ok = unload_expect_fast(echo_drv,[]),
-    ?line test_server:timetrap_cancel(Dog),
+    Path = proplists:get_value(data_dir, Config),
+    {ok,loaded} = erl_ddll:try_load(Path, echo_drv, []),
+    Port = open_port({spawn, echo_drv}, [eof]),
+    Ref = erl_ddll:monitor(driver,{echo_drv,loaded}),
+    ok = receive {'UP',Ref,driver,echo_drv,loaded} -> ok after 500 -> error end,
+    {ok, pending_driver} = erl_ddll:try_unload(echo_drv,[]),
+    Ref2 = erl_ddll:monitor(driver,{echo_drv,loaded}),
+    ok = receive {'DOWN',Ref2,driver,echo_drv,load_cancelled} -> ok after 0 -> error end,
+    {ok,already_loaded} = erl_ddll:try_load(Path, echo_drv, []),
+    {ok, pending_driver} = 
+    erl_ddll:try_load(Path, echo_drv, [{reload,pending_driver}]),
+    Ref3 = erl_ddll:monitor(driver,{echo_drv,loaded}),
+    Ref4 = erl_ddll:monitor(driver,{echo_drv,unloaded}),
+    ok = receive _ -> error after 300 -> ok end,
+    Self = self(),
+    [{Self,1}] = erl_ddll:info(echo_drv,awaiting_load),
+    true = erl_ddll:demonitor(Ref3),
+    [] = erl_ddll:info(echo_drv,awaiting_load),
+    erlang:port_close(Port),
+    ok = receive {'DOWN',Ref4,driver,echo_drv,unloaded} -> ok after 300 -> error end,
+    ok = receive _ -> error after 300 -> ok end,
+    ok = unload_expect_fast(echo_drv,[]),
     ok.
 
-new_interface(suite) ->
-    [];
-new_interface(doc) ->
-    ["Test the new load/unload/reload interface"];
+%% Test the new load/unload/reload interface
 new_interface(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     % Typical scenario
-    ?line ok = erl_ddll:load(Path, echo_drv),
-    ?line Port = open_port({spawn, echo_drv}, [eof]),
-    ?line ok = erl_ddll:unload(echo_drv),
-    ?line Port ! {self(), {command, "text"}},
-    ?line ok = receive 
-		   {Port, {data, "text"}} -> ok;
-		   _ -> error
-	       after 
-		   1000 -> error
-	       end,
-    ?line Ref = erl_ddll:monitor(driver,{echo_drv,unloaded}),
-    ?line ok = receive X -> {error, X} after 300 -> ok end,
-    ?line erlang:port_close(Port),
-    ?line ok = receive {'DOWN', Ref, driver, echo_drv, unloaded} -> ok after 300 -> error end,
+    ok = erl_ddll:load(Path, echo_drv),
+    Port = open_port({spawn, echo_drv}, [eof]),
+    ok = erl_ddll:unload(echo_drv),
+    Port ! {self(), {command, "text"}},
+    ok = receive 
+             {Port, {data, "text"}} -> ok;
+             _ -> error
+         after 
+             1000 -> error
+         end,
+    Ref = erl_ddll:monitor(driver,{echo_drv,unloaded}),
+    ok = receive X -> {error, X} after 300 -> ok end,
+    erlang:port_close(Port),
+    ok = receive {'DOWN', Ref, driver, echo_drv, unloaded} -> ok after 300 -> error end,
     % More than one user
-    ?line ok = erl_ddll:load(Path, echo_drv),
-    ?line Ref2 = erl_ddll:monitor(driver,{echo_drv,unloaded}),
-    ?line ok = erl_ddll:load(Path, echo_drv),
-    ?line ok = erl_ddll:load(Path, echo_drv),
-    ?line Port2 = open_port({spawn, echo_drv}, [eof]),
-    ?line ok = erl_ddll:unload(echo_drv),
-    ?line Port2 ! {self(), {command, "text"}},
-    ?line ok = receive 
-		   {Port2, {data, "text"}} -> ok;
-		   _ -> error
-	       after 
-		   1000 -> error
-	       end,
-    ?line ok = erl_ddll:unload(echo_drv),
-    ?line Port2 ! {self(), {command, "text"}},
-    ?line ok = receive 
-		   {Port2, {data, "text"}} -> ok;
-		   _ -> error
-	       after 
-		   1000 -> error
-	       end,
-    ?line ok = erl_ddll:unload(echo_drv),
-    ?line Port2 ! {self(), {command, "text"}},
-    ?line ok = receive 
-		   {Port2, {data, "text"}} -> ok;
-		   _ -> error
-	       after 
-		   1000 -> error
-	       end,
-    ?line ok = receive X2 -> {error, X2} after 300 -> ok end,
-    ?line ok = erl_ddll:load(Path, echo_drv),
-    ?line ok = receive {'UP', Ref2, driver, echo_drv, unload_cancelled} -> ok after 300 -> error end,
-    ?line Ref3 = erl_ddll:monitor(driver,{echo_drv,unloaded_only}),
-    ?line erlang:port_close(Port2),
-    ?line ok = receive X3 -> {error, X3} after 300 -> ok end,
-    ?line ok = erl_ddll:unload(echo_drv),
-    ?line ok = receive {'DOWN', Ref3, driver, echo_drv, unloaded} -> ok after 300 -> error end,
-    ?line test_server:timetrap_cancel(Dog),
+    ok = erl_ddll:load(Path, echo_drv),
+    Ref2 = erl_ddll:monitor(driver,{echo_drv,unloaded}),
+    ok = erl_ddll:load(Path, echo_drv),
+    ok = erl_ddll:load(Path, echo_drv),
+    Port2 = open_port({spawn, echo_drv}, [eof]),
+    ok = erl_ddll:unload(echo_drv),
+    Port2 ! {self(), {command, "text"}},
+    ok = receive 
+             {Port2, {data, "text"}} -> ok;
+             _ -> error
+         after 
+             1000 -> error
+         end,
+    ok = erl_ddll:unload(echo_drv),
+    Port2 ! {self(), {command, "text"}},
+    ok = receive 
+             {Port2, {data, "text"}} -> ok;
+             _ -> error
+         after 
+             1000 -> error
+         end,
+    ok = erl_ddll:unload(echo_drv),
+    Port2 ! {self(), {command, "text"}},
+    ok = receive 
+             {Port2, {data, "text"}} -> ok;
+             _ -> error
+         after 
+             1000 -> error
+         end,
+    ok = receive X2 -> {error, X2} after 300 -> ok end,
+    ok = erl_ddll:load(Path, echo_drv),
+    ok = receive {'UP', Ref2, driver, echo_drv, unload_cancelled} -> ok after 300 -> error end,
+    Ref3 = erl_ddll:monitor(driver,{echo_drv,unloaded_only}),
+    erlang:port_close(Port2),
+    ok = receive X3 -> {error, X3} after 300 -> ok end,
+    ok = erl_ddll:unload(echo_drv),
+    ok = receive {'DOWN', Ref3, driver, echo_drv, unloaded} -> ok after 300 -> error end,
     ok.
-    
-    
+
+
 
 
 ddll_test(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
 
-    %?line {error,{already_started,ErlDdllPid}} = erl_ddll:start(),
-    %?line ErlDdllPid = whereis(ddll_server),
+    %{error,{already_started,ErlDdllPid}} = erl_ddll:start(),
+    %ErlDdllPid = whereis(ddll_server),
 
     %% Load the echo driver and verify that it was loaded.
     {ok,L1,L2}=load_echo_driver(Path),
 
     %% Verify that the driver works.
 
-     ?line Port = open_port({spawn, echo_drv}, [eof]),
-     ?line {hej, "hopp",4711,123445567436543653} = 
- 	erlang:port_call(Port,{hej, "hopp",4711,123445567436543653}),
-     ?line {hej, "hopp",4711,123445567436543653} = 
- 	erlang:port_call(Port,47,{hej, "hopp",4711,123445567436543653}),
-     ?line Port ! {self(), {command, "text"}},
-     ?line 1 = receive 
- 		  {Port, {data, "text"}} -> 1;
- 		  _Other -> 2
- 	      after 
- 		  1000 -> 2
- 	      end,
-     ?line Port ! {self(), close},
-     ?line receive {Port, closed} -> ok end,
-
-%%     %% Unload the driver and verify that it was unloaded.
-     ok = unload_echo_driver(L1,L2),
-
-%%     %?line {error, {already_started, _}} = erl_ddll:start(),
-
-    ?line test_server:timetrap_cancel(Dog),
+    Port = open_port({spawn, echo_drv}, [eof]),
+    {hej, "hopp",4711,123445567436543653} = 
+    erlang:port_call(Port,{hej, "hopp",4711,123445567436543653}),
+    {hej, "hopp",4711,123445567436543653} = 
+    erlang:port_call(Port,47,{hej, "hopp",4711,123445567436543653}),
+    Port ! {self(), {command, "text"}},
+    1 = receive 
+            {Port, {data, "text"}} -> 1;
+            _Other -> 2
+        after 
+            1000 -> 2
+        end,
+    Port ! {self(), close},
+    receive {Port, closed} -> ok end,
+
+    %%     %% Unload the driver and verify that it was unloaded.
+    ok = unload_echo_driver(L1,L2),
+
+    %%     %{error, {already_started, _}} = erl_ddll:start(),
     ok.
 
 %% Tests errors having to do with bad drivers.
 
 errors(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
 
-    ?line {ok, L1} = erl_ddll:loaded_drivers(),
+    {ok, L1} = erl_ddll:loaded_drivers(),
 
-    ?line {error, {open_error, _}} = erl_ddll:load_driver(Path, bad_name),
-    ?line {error, driver_init_failed} = erl_ddll:load_driver(Path, initfail_drv),
-    ?line {error, bad_driver_name} = erl_ddll:load_driver(Path, wrongname_drv),
+    {error, {open_error, _}} = erl_ddll:load_driver(Path, bad_name),
+    {error, driver_init_failed} = erl_ddll:load_driver(Path, initfail_drv),
+    {error, bad_driver_name} = erl_ddll:load_driver(Path, wrongname_drv),
 
     %% We assume that there is a statically linked driver named "ddll":
-    ?line {error, linked_in_driver} = erl_ddll:unload_driver(efile),
-    ?line {error, not_loaded} = erl_ddll:unload_driver("__pucko_driver__"),
-	
+    {error, linked_in_driver} = erl_ddll:unload_driver(efile),
+    {error, not_loaded} = erl_ddll:unload_driver("__pucko_driver__"),
+
     case os:type() of
-	{unix, _} ->
-	    ?line {error, no_driver_init} =
-		erl_ddll:load_driver(Path, noinit_drv);
-	_ ->
-	    ok
+        {unix, _} ->
+            {error, no_driver_init} =
+            erl_ddll:load_driver(Path, noinit_drv);
+        _ ->
+            ok
     end,
 
-    ?line {ok, L1} = erl_ddll:loaded_drivers(),
-
-    ?line test_server:timetrap_cancel(Dog),
+    {ok, L1} = erl_ddll:loaded_drivers(),
     ok.
 
-reference_count(doc) ->
-    ["Check that drivers are unloaded when their reference count ",
-     "reaches zero, and that they cannot be unloaded while ",
-     "they are still referenced."];
+%% Check that drivers are unloaded when their reference count
+%% reaches zero, and that they cannot be unloaded while
+%% they are still referenced.
 reference_count(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
 
     %% Spawn a process that loads the driver (and holds a reference
     %% to it).
     Pid1=spawn_link(?MODULE, echo_loader, [Path, self()]),
     receive
-	{Pid1, echo_loaded} -> ok
-    after 2000 -> test_server:fail("echo_loader failed to start.")
+        {Pid1, echo_loaded} -> ok
+    after 2000 -> ct:fail("echo_loader failed to start.")
     end,
 
     Pid1 ! {self(), die},
-    ?line test_server:sleep(200),   % Give time to unload.
+    test_server:sleep(200),   % Give time to unload.
     % Verify that the driver was automaticly unloaded when the
     % process died.
-    ?line {error, not_loaded}=erl_ddll:unload_driver(echo_drv),
-    
-    ?line test_server:timetrap_cancel(Dog),
+    {error, not_loaded}=erl_ddll:unload_driver(echo_drv),
     ok.
 
 % Loads the echo driver, send msg to started, sits and waits to
 % get a signal to die, then unloads the driver and terminates.
 echo_loader(Path, Starter) ->
-    ?line {ok, L1, L2}=load_echo_driver(Path),
-    ?line Starter ! {self(), echo_loaded},
+    {ok, L1, L2}=load_echo_driver(Path),
+    Starter ! {self(), echo_loaded},
     receive
-	{Starter, die} ->
-	    ?line unload_echo_driver(L1,L2)
+        {Starter, die} ->
+            unload_echo_driver(L1,L2)
     end.
 
 % Loads the echo driver, send msg to started, sits and waits to
 % get a signal to die, then unloads the driver and terminates.
 nice_echo_loader(Path, Starter) ->
-    ?line {ok, L1, L2}=load_nice_echo_driver(Path),
-    ?line Starter ! {self(), echo_loaded},
+    {ok, L1, L2}=load_nice_echo_driver(Path),
+    Starter ! {self(), echo_loaded},
     receive
-	{Starter, die} ->
-	    ?line unload_echo_driver(L1,L2)
+        {Starter, die} ->
+            unload_echo_driver(L1,L2)
     end.
 
 
-kill_port(doc) ->
-    ["Test that a port that uses a driver is killed when the ",
-     "process that loaded the driver dies."];
+%% Test that a port that uses a driver is killed when the
+%% process that loaded the driver dies.
 kill_port(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
 
     %% Spawn a process that loads the driver (and holds a reference
     %% to it).
-    ?line Pid1=spawn(?MODULE, echo_loader, [Path, self()]),
-    ?line receive
-	      {Pid1, echo_loaded} ->
-		  ok
-	  after 3000 ->
-		  ?line exit(Pid1, kill),
-		  ?line test_server:fail("echo_loader failed to start.")
-	  end,
+    Pid1=spawn(?MODULE, echo_loader, [Path, self()]),
+    receive
+        {Pid1, echo_loaded} ->
+            ok
+    after 3000 ->
+              exit(Pid1, kill),
+              ct:fail("echo_loader failed to start.")
+    end,
 
     % Spawn off a port that uses the driver.
-    ?line Port = open_port({spawn, echo_drv}, [eof]),
+    Port = open_port({spawn, echo_drv}, [eof]),
 
     % Kill the process / unload the driver.
-    ?line process_flag(trap_exit, true),
-    ?line exit(Pid1, kill),
-    ?line test_server:sleep(200),    % Give some time to unload.
-    ?line {error, not_loaded} = erl_ddll:unload_driver(echo_drv),
+    process_flag(trap_exit, true),
+    exit(Pid1, kill),
+    test_server:sleep(200),    % Give some time to unload.
+    {error, not_loaded} = erl_ddll:unload_driver(echo_drv),
 
     % See if the port is killed.
     receive
-	{'EXIT', Port, Reason} ->
-	    io:format("Port exited with reason ~w", [Reason])
+        {'EXIT', Port, Reason} ->
+            io:format("Port exited with reason ~w", [Reason])
     after 5000 ->
-	    ?line test_server:fail("Echo port did not terminate.")
+              ct:fail("Echo port did not terminate.")
     end,
-
-    %% Cleanup and exit.
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
-dont_kill_port(doc) ->
-    ["Test that a port that uses a driver is not killed when the ",
-     "process that loaded the driver dies and it's nicely opened."];
+%% Test that a port that uses a driver is not killed when the
+%% process that loaded the driver dies and it's nicely opened.
 dont_kill_port(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
 
     %% Spawn a process that loads the driver (and holds a reference
     %% to it).
-    ?line Pid1=spawn(?MODULE, nice_echo_loader, [Path, self()]),
-    ?line receive
-	      {Pid1, echo_loaded} ->
-		  ok
-	  after 3000 ->
-		  ?line exit(Pid1, kill),
-		  ?line test_server:fail("echo_loader failed to start.")
-	  end,
+    Pid1=spawn(?MODULE, nice_echo_loader, [Path, self()]),
+    receive
+        {Pid1, echo_loaded} ->
+            ok
+    after 3000 ->
+              exit(Pid1, kill),
+              ct:fail("echo_loader failed to start.")
+    end,
 
     % Spawn off a port that uses the driver.
-    ?line Port = open_port({spawn, echo_drv}, [eof]),
+    Port = open_port({spawn, echo_drv}, [eof]),
 
     % Kill the process / unload the driver.
-    ?line process_flag(trap_exit, true),
-    ?line exit(Pid1, kill),
-    ?line test_server:sleep(200),    % Give some time to unload.
-    ?line {hej, "hopp",4711,123445567436543653} = 
-	erlang:port_call(Port,{hej, "hopp",4711,123445567436543653}),
-    ?line [] = erl_ddll:info(echo_drv,processes),
+    process_flag(trap_exit, true),
+    exit(Pid1, kill),
+    test_server:sleep(200),    % Give some time to unload.
+    {hej, "hopp",4711,123445567436543653} = 
+    erlang:port_call(Port,{hej, "hopp",4711,123445567436543653}),
+    [] = erl_ddll:info(echo_drv,processes),
     %% unload should work with no owner
-    ?line ok = erl_ddll:unload_driver(echo_drv), %Kill ports while at it
+    ok = erl_ddll:unload_driver(echo_drv), %Kill ports while at it
 
     % See if the port is killed.
     receive
-	{'EXIT', Port, Reason} ->
-	    io:format("Port exited with reason ~w", [Reason])
+        {'EXIT', Port, Reason} ->
+            io:format("Port exited with reason ~w", [Reason])
     after 5000 ->
-	    ?line test_server:fail("Echo port did not terminate.")
+              ct:fail("Echo port did not terminate.")
     end,
-
-    %% Cleanup and exit.
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
-properties(doc) -> ["Test that a process that loaded a driver ",
-		    "is the only process that can unload it."];
+%% Test that a process that loaded a driver
+%% is the only process that can unload it.
 properties(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
 
     % Let another process load the echo driver.
     Pid=spawn_link(?MODULE, echo_loader, [Path, self()]),
     receive
-	{Pid, echo_loaded} -> ok
-    after 2000 -> test_server:fail("echo_loader failed to start.")
+        {Pid, echo_loaded} -> ok
+    after 2000 -> ct:fail("echo_loader failed to start.")
     end,
 
     % Try to unload the driver from this process (the wrong one).
-    ?line {error, _} = erl_ddll:unload_driver(echo_drv),
-    ?line {ok, Drivers} = erl_ddll:loaded_drivers(),
-    ?line case lists:member("echo_drv", Drivers) of
-	      true ->
-		  ok;
-	      false ->
-		  test_server:fail("Unload from wrong process "
-				   "succeeded.")
-	  end,
+    {error, _} = erl_ddll:unload_driver(echo_drv),
+    {ok, Drivers} = erl_ddll:loaded_drivers(),
+    case lists:member("echo_drv", Drivers) of
+        true ->
+            ok;
+        false ->
+            ct:fail("Unload from wrong process succeeded.")
+    end,
 
     % Unload the driver and terminate dummy process.
-    ?line Pid ! {self(), die},
-    ?line test_server:sleep(200),   % Give time to unload.
-    ?line test_server:timetrap_cancel(Dog),
+    Pid ! {self(), die},
+    test_server:sleep(200),   % Give time to unload.
     ok.
 
-load_and_unload(doc) -> ["Load two drivers and unload them in load order."];
+%% Load two drivers and unload them in load order.
 load_and_unload(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
-    ?line Path = ?config(data_dir, Config),
-    ?line {ok, Loaded_drivers1} = erl_ddll:loaded_drivers(),
-    ?line ok = erl_ddll:load_driver(Path, echo_drv),
-    ?line ok = erl_ddll:load_driver(Path, dummy_drv),
-    ?line ok = erl_ddll:unload_driver(echo_drv),
-    ?line ok = erl_ddll:unload_driver(dummy_drv),
-    ?line {ok, Loaded_drivers2} = erl_ddll:loaded_drivers(),
-    ?line Set1 = ordsets:from_list(Loaded_drivers1),
-    ?line Set2 = ordsets:from_list(Loaded_drivers2),
-    ?line io:format("~p == ~p\n", [Loaded_drivers1, Loaded_drivers2]),
-    ?line [] = ordsets:to_list(ordsets:subtract(Set2, Set1)),
-
-    ?line test_server:timetrap_cancel(Dog),
+    Path = proplists:get_value(data_dir, Config),
+    {ok, Loaded_drivers1} = erl_ddll:loaded_drivers(),
+    ok = erl_ddll:load_driver(Path, echo_drv),
+    ok = erl_ddll:load_driver(Path, dummy_drv),
+    ok = erl_ddll:unload_driver(echo_drv),
+    ok = erl_ddll:unload_driver(dummy_drv),
+    {ok, Loaded_drivers2} = erl_ddll:loaded_drivers(),
+    Set1 = ordsets:from_list(Loaded_drivers1),
+    Set2 = ordsets:from_list(Loaded_drivers2),
+    io:format("~p == ~p\n", [Loaded_drivers1, Loaded_drivers2]),
+    [] = ordsets:to_list(ordsets:subtract(Set2, Set1)),
     ok.    
 
-lock_driver(suite) ->
-    [];
-lock_driver(doc) ->
-    ["Check multiple calls to driver_lock_driver"];
+%% Check multiple calls to driver_lock_driver
 lock_driver(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line {ok, _} = erl_ddll:try_load(Path, lock_drv, []),
-    ?line Port1 = open_port({spawn, lock_drv}, [eof]),
-    ?line Port2 = open_port({spawn, lock_drv}, [eof]),
-    ?line true = erl_ddll:info(lock_drv,permanent),
-    ?line erlang:port_close(Port1),
-    ?line erlang:port_close(Port2),
-    ?line test_server:timetrap_cancel(Dog),
+    Path = proplists:get_value(data_dir, Config),
+    {ok, _} = erl_ddll:try_load(Path, lock_drv, []),
+    Port1 = open_port({spawn, lock_drv}, [eof]),
+    Port2 = open_port({spawn, lock_drv}, [eof]),
+    true = erl_ddll:info(lock_drv,permanent),
+    erlang:port_close(Port1),
+    erlang:port_close(Port2),
     ok.
-    
+
 
 % Load and unload the echo_drv driver.
 % Make sure that the driver doesn't exist before we load it,
 % and that it exists before we unload it.
 load_echo_driver(Path) ->
-    ?line {ok, L1} = erl_ddll:loaded_drivers(),
-    ?line ok = erl_ddll:load_driver(Path, echo_drv),
-    ?line {ok, L2} = erl_ddll:loaded_drivers(),
-    ?line ["echo_drv"] = ordsets:to_list(subtract(ordsets:from_list(L2), 
-						  ordsets:from_list(L1))),
+    {ok, L1} = erl_ddll:loaded_drivers(),
+    ok = erl_ddll:load_driver(Path, echo_drv),
+    {ok, L2} = erl_ddll:loaded_drivers(),
+    ["echo_drv"] = ordsets:to_list(subtract(ordsets:from_list(L2), 
+                                            ordsets:from_list(L1))),
     {ok,L1,L2}.
 
 load_nice_echo_driver(Path) ->
-    ?line {ok, L1} = erl_ddll:loaded_drivers(),
-    ?line ok = erl_ddll:load(Path, echo_drv),
-    ?line {ok, L2} = erl_ddll:loaded_drivers(),
-    ?line ["echo_drv"] = ordsets:to_list(subtract(ordsets:from_list(L2), 
-						  ordsets:from_list(L1))),
+    {ok, L1} = erl_ddll:loaded_drivers(),
+    ok = erl_ddll:load(Path, echo_drv),
+    {ok, L2} = erl_ddll:loaded_drivers(),
+    ["echo_drv"] = ordsets:to_list(subtract(ordsets:from_list(L2), 
+                                            ordsets:from_list(L1))),
     {ok,L1,L2}.
 
 unload_echo_driver(L1,L2) ->
-    ?line {ok, L2} = erl_ddll:loaded_drivers(),
-    ?line ok = erl_ddll:unload_driver(echo_drv),
-    ?line {ok, L3} = erl_ddll:loaded_drivers(),
-    ?line [] = ordsets:to_list(subtract(ordsets:from_list(L3),
-					ordsets:from_list(L1))),
+    {ok, L2} = erl_ddll:loaded_drivers(),
+    ok = erl_ddll:unload_driver(echo_drv),
+    {ok, L3} = erl_ddll:loaded_drivers(),
+    [] = ordsets:to_list(subtract(ordsets:from_list(L3),
+                                  ordsets:from_list(L1))),
     ok.
 
 unload_expect_fast(Driver,XFlags) ->
     {ok, pending_driver, Ref} = 
-	erl_ddll:try_unload(Driver,
-			    [{monitor,pending_driver}]++XFlags),
+    erl_ddll:try_unload(Driver,
+                        [{monitor,pending_driver}]++XFlags),
     receive
-	{'DOWN', Ref, driver, Driver, unloaded} ->
-	    case lists:member(atom_to_list(Driver),element(2,erl_ddll:loaded_drivers())) of
-		true ->
-		    {error, {still_there, Driver}};
-		false ->
-		    ok
-	    end
+        {'DOWN', Ref, driver, Driver, unloaded} ->
+            case lists:member(atom_to_list(Driver),element(2,erl_ddll:loaded_drivers())) of
+                true ->
+                    {error, {still_there, Driver}};
+                false ->
+                    ok
+            end
     after 1000 ->
-	    {error,{unable_to_unload, Driver}}
+              {error,{unable_to_unload, Driver}}
     end.
diff --git a/erts/emulator/test/decode_packet_SUITE.erl b/erts/emulator/test/decode_packet_SUITE.erl
index 6a5ca20ac3..ad592f7147 100644
--- a/erts/emulator/test/decode_packet_SUITE.erl
+++ b/erts/emulator/test/decode_packet_SUITE.erl
@@ -22,15 +22,16 @@
 
 -module(decode_packet_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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,
-	 basic/1, packet_size/1, neg/1, http/1, line/1, ssl/1, otp_8536/1,
+-export([all/0, suite/0,groups/0,
+         init_per_testcase/2,end_per_testcase/2,
+         basic/1, packet_size/1, neg/1, http/1, line/1, ssl/1, otp_8536/1,
          otp_9389/1, otp_9389_line/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() -> 
     [basic, packet_size, neg, http, line, ssl, otp_8536,
@@ -39,69 +40,49 @@ all() ->
 groups() -> 
     [].
 
-init_per_suite(Config) ->
+init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
+    rand:seed(exsplus),
+    io:format("*** SEED: ~p ***\n", [rand:export_seed()]),
     Config.
 
-end_per_suite(_Config) ->
+end_per_testcase(_Func, _Config) ->
     ok.
 
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Seed = {S1,S2,S3} = {erlang:monotonic_time(),
-			 erlang:time_offset(),
-			 erlang:unique_integer()},
-    random:seed(S1,S2,S3),
-    io:format("*** SEED: ~p ***\n", [Seed]),
-    Dog=?t:timetrap(?t:minutes(1)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
-basic(doc) -> [];
-basic(suite) -> [];
 basic(Config) when is_list(Config) ->
-    ?line Packet = <<101,22,203,54,175>>,
-    ?line Rest = <<123,34,0,250>>,
-    ?line Bin = <<Packet/binary,Rest/binary>>,
-    ?line {ok, Bin, <<>>} = decode_pkt(raw,Bin),
+    Packet = <<101,22,203,54,175>>,
+    Rest = <<123,34,0,250>>,
+    Bin = <<Packet/binary,Rest/binary>>,
+    {ok, Bin, <<>>} = decode_pkt(raw,Bin),
 
-    ?line {more, 5+1} = decode_pkt(1,<<5,1,2,3,4>>),
-    ?line {more, 5+2} = decode_pkt(2,<<0,5,1,2,3,4>>),
-    ?line {more, 5+4} = decode_pkt(4,<<0,0,0,5,1,2,3,4>>),
+    {more, 5+1} = decode_pkt(1,<<5,1,2,3,4>>),
+    {more, 5+2} = decode_pkt(2,<<0,5,1,2,3,4>>),
+    {more, 5+4} = decode_pkt(4,<<0,0,0,5,1,2,3,4>>),
 
-    ?line {more, undefined} = decode_pkt(1,<<>>),
-    ?line {more, undefined} = decode_pkt(2,<<0>>),
-    ?line {more, undefined} = decode_pkt(4,<<0,0,0>>),
+    {more, undefined} = decode_pkt(1,<<>>),
+    {more, undefined} = decode_pkt(2,<<0>>),
+    {more, undefined} = decode_pkt(4,<<0,0,0>>),
 
     Types = [1,2,4,asn1,sunrm,cdr,fcgi,tpkt,ssl_tls],
 
     %% Run tests for different header types and bit offsets.
 
     lists:foreach(fun({Type,Bits})->basic_pack(Type,Packet,Rest,Bits), 
-				    more_length(Type,Packet,Bits) end,
-		  [{T,B} || T<-Types, B<-lists:seq(0,32)]),
+                                    more_length(Type,Packet,Bits) end,
+                  [{T,B} || T<-Types, B<-lists:seq(0,32)]),
     ok.
 
 basic_pack(Type,Body,Rest,BitOffs) ->
-    ?line {Bin,Unpacked,_} = pack(Type,Body,Rest,BitOffs),
-    ?line {ok, Unpacked, Rest} = decode_pkt(Type,Bin),
+    {Bin,Unpacked,_} = pack(Type,Body,Rest,BitOffs),
+    {ok, Unpacked, Rest} = decode_pkt(Type,Bin),
     case Rest of
-	<<>> -> ok;
-	_ -> 
-	    ?line <<_:1,NRest/bits>> = Rest,
-	    basic_pack(Type,Body,NRest,BitOffs)
+        <<>> -> ok;
+        _ -> 
+            <<_:1,NRest/bits>> = Rest,
+            basic_pack(Type,Body,NRest,BitOffs)
     end.
 
 more_length(Type,Body,BitOffs) ->
-    ?line {Bin,_,_} = pack(Type,Body,<<>>,BitOffs),
+    {Bin,_,_} = pack(Type,Body,<<>>,BitOffs),
     HdrSize = byte_size(Bin) - byte_size(Body),
     more_length_do(Type,HdrSize,Bin,byte_size(Bin)).
 
@@ -110,17 +91,17 @@ more_length_do(_,_,_,0) ->
 more_length_do(Type,HdrSize,Bin,Size) ->
     TrySize = (Size*3) div 4,
     NSize = if TrySize < HdrSize -> Size - 1;
-	       true -> TrySize
-	    end,
+               true -> TrySize
+            end,
     {B1,_} = split_binary(Bin,NSize),
-    ?line {more, Length} = decode_pkt(Type,B1),
+    {more, Length} = decode_pkt(Type,B1),
     case Length of
-	L when L=:=byte_size(Bin) -> ok;
-	undefined when NSize<HdrSize -> ok
+        L when L=:=byte_size(Bin) -> ok;
+        undefined when NSize<HdrSize -> ok
     end,
     more_length_do(Type,HdrSize,Bin,NSize).
 
-   
+
 
 pack(Type,Packet,Rest) ->
     {Bin,Unpacked} = pack(Type,Packet),
@@ -136,7 +117,7 @@ pack(Type,Body,Rest,BitOffs) ->
     {Packet,Unpacked} = pack(Type,Body),
 
     %% Make Bin a sub-bin with an arbitrary bitoffset within Orig
-    Prefix = random:uniform(1 bsl BitOffs) - 1,
+    Prefix = rand:uniform(1 bsl BitOffs) - 1,
     Orig = <<Prefix:BitOffs,Packet/binary,Rest/bits>>,
     <<_:BitOffs,Bin/bits>> = Orig,
     {Bin,Unpacked,Orig}.
@@ -151,212 +132,206 @@ pack(4,Bin) ->
     Psz = byte_size(Bin),
     {<<Psz:32,Bin/binary>>, Bin};
 pack(asn1,Bin) ->
-    Ident = case random:uniform(3) of
-		1 -> <<17>>;
-		2 -> <<16#1f,16#81,17>>;
-		3 -> <<16#1f,16#81,16#80,16#80,17>>
-	    end,
+    Ident = case rand:uniform(3) of
+                1 -> <<17>>;
+                2 -> <<16#1f,16#81,17>>;
+                3 -> <<16#1f,16#81,16#80,16#80,17>>
+            end,
     Psz = byte_size(Bin),
-    Length = case random:uniform(4) of
-		 1 when Psz < 128 -> 
-		     <<Psz:8>>;
-		 R when R=<2 andalso Psz < 16#10000 ->
-		     <<16#82,Psz:16>>;
-		 R when R=<3 andalso Psz < 16#1000000 -> 
-		     <<16#83,Psz:24>>;
-		 _ when Psz < 16#100000000 ->
-		     <<16#84,Psz:32>>
-	     end,
+    Length = case rand:uniform(4) of
+                 1 when Psz < 128 -> 
+                     <<Psz:8>>;
+                 R when R=<2 andalso Psz < 16#10000 ->
+                     <<16#82,Psz:16>>;
+                 R when R=<3 andalso Psz < 16#1000000 -> 
+                     <<16#83,Psz:24>>;
+                 _ when Psz < 16#100000000 ->
+                     <<16#84,Psz:32>>
+             end,
     Res = <<Ident/binary,Length/binary,Bin/binary>>,
     {Res,Res};
 pack(sunrm,Bin) ->
     Psz = byte_size(Bin),
     Res = if Psz < 16#80000000 ->
-		  <<Psz:32,Bin/binary>>
-    end,
+                 <<Psz:32,Bin/binary>>
+          end,
     {Res,Res};
 pack(cdr,Bin) ->
     GIOP = <<"GIOP">>,
-    Major = random:uniform(256) - 1,
-    Minor = random:uniform(256) - 1,
-    MType = random:uniform(256) - 1,
+    Major = rand:uniform(256) - 1,
+    Minor = rand:uniform(256) - 1,
+    MType = rand:uniform(256) - 1,
     Psz = byte_size(Bin),
-    Res = case random:uniform(2) of 
-	      1 -> <<GIOP/binary,Major:8,Minor:8,0:8,MType:8,Psz:32/big,Bin/binary>>;
-	      2 -> <<GIOP/binary,Major:8,Minor:8,1:8,MType:8,Psz:32/little,Bin/binary>>
-	  end,
+    Res = case rand:uniform(2) of
+              1 -> <<GIOP/binary,Major:8,Minor:8,0:8,MType:8,Psz:32/big,Bin/binary>>;
+              2 -> <<GIOP/binary,Major:8,Minor:8,1:8,MType:8,Psz:32/little,Bin/binary>>
+          end,
     {Res,Res};
 pack(fcgi,Bin) ->
     Ver = 1,
-    Type = random:uniform(256) - 1,
-    Id = random:uniform(65536) - 1,
-    PaddSz = random:uniform(16) - 1,    
+    Type = rand:uniform(256) - 1,
+    Id = rand:uniform(65536) - 1,
+    PaddSz = rand:uniform(16) - 1,
     Psz = byte_size(Bin),
-    Reserv = random:uniform(256) - 1,
+    Reserv = rand:uniform(256) - 1,
     Padd = case PaddSz of
-	       0 -> <<>>;
-	       _ -> list_to_binary([random:uniform(256)-1
-				    || _<- lists:seq(1,PaddSz)])
-	   end,
+               0 -> <<>>;
+               _ -> list_to_binary([rand:uniform(256)-1
+                                    || _<- lists:seq(1,PaddSz)])
+           end,
     Res = <<Ver:8,Type:8,Id:16,Psz:16/big,PaddSz:8,Reserv:8,Bin/binary>>,
     {<<Res/binary,Padd/binary>>, Res};
 pack(tpkt,Bin) ->
     Ver = 3,
-    Reserv = random:uniform(256) - 1,
+    Reserv = rand:uniform(256) - 1,
     Size = byte_size(Bin) + 4,
     Res = <<Ver:8,Reserv:8,Size:16,Bin/binary>>,
     {Res, Res};
 pack(ssl_tls,Bin) ->
-    Content = case (random:uniform(256) - 1) of
-		  C when C<128 -> C;
-		  _ -> v2hello
-	      end,
-    Major = random:uniform(256) - 1,
-    Minor = random:uniform(256) - 1,
+    Content = case (rand:uniform(256) - 1) of
+                  C when C<128 -> C;
+                  _ -> v2hello
+              end,
+    Major = rand:uniform(256) - 1,
+    Minor = rand:uniform(256) - 1,
     pack_ssl(Content,Major,Minor,Bin).
 
 pack_ssl(Content, Major, Minor, Body) ->
     case Content of
-	v2hello ->
-	    Size = byte_size(Body),
-	    Res = <<1:1,(Size+3):15, 1:8, Major:8, Minor:8, Body/binary>>,
-	    C = 22,
-	    Data = <<1:8, (Size+2):24, Major:8, Minor:8, Body/binary>>;
-	C when is_integer(C) ->
-	    Size = byte_size(Body),
-	    Res = <<Content:8, Major:8, Minor:8, Size:16, Body/binary>>,
-	    Data = Body			    
+        v2hello ->
+            Size = byte_size(Body),
+            Res = <<1:1,(Size+3):15, 1:8, Major:8, Minor:8, Body/binary>>,
+            C = 22,
+            Data = <<1:8, (Size+2):24, Major:8, Minor:8, Body/binary>>;
+        C when is_integer(C) ->
+            Size = byte_size(Body),
+            Res = <<Content:8, Major:8, Minor:8, Size:16, Body/binary>>,
+            Data = Body			    
     end,
     {Res, {ssl_tls,[],C,{Major,Minor}, Data}}.
 
 
-packet_size(doc) -> [];
-packet_size(suite) -> [];
 packet_size(Config) when is_list(Config) ->
-    ?line Packet = <<101,22,203,54,175>>,
-    ?line Rest = <<123,34,0,250>>,
+    Packet = <<101,22,203,54,175>>,
+    Rest = <<123,34,0,250>>,
 
     F = fun({Type,Max})->
-		?line {Bin,Unpacked} = pack(Type,Packet,Rest),
-		?line case decode_pkt(Type,Bin,[{packet_size,Max}]) of
-			  {ok,Unpacked,Rest} when Max=:=0; Max>=byte_size(Packet) ->
-			      ok;
-			  {error,_} when Max<byte_size(Packet), Max=/=0 ->
-			      ok;
-			  {error,_} when Type=:=fcgi, Max=/=0 ->
-			      %% packet includes random amount of padding
-			      ok
-		      end
-	end,
-    ?line lists:foreach(F, [{T,D} || T<-[1,2,4,asn1,sunrm,cdr,fcgi,tpkt,ssl_tls],
-				     D<-lists:seq(0, byte_size(Packet)*2)]),
+                {Bin,Unpacked} = pack(Type,Packet,Rest),
+                case decode_pkt(Type,Bin,[{packet_size,Max}]) of
+                    {ok,Unpacked,Rest} when Max=:=0; Max>=byte_size(Packet) ->
+                        ok;
+                    {error,_} when Max<byte_size(Packet), Max=/=0 ->
+                        ok;
+                    {error,_} when Type=:=fcgi, Max=/=0 ->
+                        %% packet includes random amount of padding
+                        ok
+                end
+        end,
+    lists:foreach(F, [{T,D} || T<-[1,2,4,asn1,sunrm,cdr,fcgi,tpkt,ssl_tls],
+                               D<-lists:seq(0, byte_size(Packet)*2)]),
 
     %% Test OTP-8102, "negative" 4-byte sizes.
     lists:foreach(fun(Size) -> 
-			  ?line {error,_} = decode_pkt(4,<<Size:32,Packet/binary>>)
-		  end, 
-		  lists:seq(-10,-1)),
+                          {error,_} = decode_pkt(4,<<Size:32,Packet/binary>>)
+                  end, 
+                  lists:seq(-10,-1)),
 
     %% Test OTP-9389, long HTTP header lines.
     Opts = [{packet_size, 128}],
     Pkt = list_to_binary(["GET / HTTP/1.1\r\nHost: localhost\r\nLink: /",
                           string:chars($Y, 64), "\r\n\r\n"]),
     <<Pkt1:50/binary, Pkt2/binary>> = Pkt,
-    ?line {ok, {http_request,'GET',{abs_path,"/"},{1,1}}, Rest1} =
-        erlang:decode_packet(http, Pkt1, Opts),
-    ?line {ok, {http_header,_,'Host',_,"localhost"}, Rest2} =
-        erlang:decode_packet(httph, Rest1, Opts),
-    ?line {more, undefined} = erlang:decode_packet(httph, Rest2, Opts),
-    ?line {ok, {http_header,_,"Link",_,_}, _} =
-        erlang:decode_packet(httph, list_to_binary([Rest2, Pkt2]), Opts),
+    {ok, {http_request,'GET',{abs_path,"/"},{1,1}}, Rest1} =
+    erlang:decode_packet(http, Pkt1, Opts),
+    {ok, {http_header,_,'Host',_,"localhost"}, Rest2} =
+    erlang:decode_packet(httph, Rest1, Opts),
+    {more, undefined} = erlang:decode_packet(httph, Rest2, Opts),
+    {ok, {http_header,_,"Link",_,_}, _} =
+    erlang:decode_packet(httph, list_to_binary([Rest2, Pkt2]), Opts),
 
     Pkt3 = list_to_binary(["GET / HTTP/1.1\r\nHost: localhost\r\nLink: /",
                            string:chars($Y, 129), "\r\n\r\n"]),
-    ?line {ok, {http_request,'GET',{abs_path,"/"},{1,1}}, Rest3} =
-        erlang:decode_packet(http, Pkt3, Opts),
-    ?line {ok, {http_header,_,'Host',_,"localhost"}, Rest4} =
-        erlang:decode_packet(httph, Rest3, Opts),
-    ?line {error, invalid} = erlang:decode_packet(httph, Rest4, Opts),
+    {ok, {http_request,'GET',{abs_path,"/"},{1,1}}, Rest3} =
+    erlang:decode_packet(http, Pkt3, Opts),
+    {ok, {http_header,_,'Host',_,"localhost"}, Rest4} =
+    erlang:decode_packet(httph, Rest3, Opts),
+    {error, invalid} = erlang:decode_packet(httph, Rest4, Opts),
 
     ok.
 
 
-neg(doc) -> [];
-neg(suite) -> [];
 neg(Config) when is_list(Config) ->
-    ?line Bin = <<"dummy">>,
+    Bin = <<"dummy">>,
     Fun = fun()->dummy end,
-    
+
     BadargF = fun(T,B,Opts)-> {'EXIT',{badarg,_}} = (catch decode_pkt(T,B,Opts)) end,
 
     %% Invalid Type args
     lists:foreach(fun(T)-> BadargF(T,Bin,[]) end, 
-		  [3,-1,5,2.0,{2},unknown,[],"line",Bin,Fun,self()]),
+                  [3,-1,5,2.0,{2},unknown,[],"line",Bin,Fun,self()]),
 
     %% Invalid Bin args
     lists:foreach(fun(B)-> BadargF(0,B,[]) end, 
-		  [3,2.0,unknown,[],"Bin",[Bin],{Bin},Fun,self()]),
+                  [3,2.0,unknown,[],"Bin",[Bin],{Bin},Fun,self()]),
 
     %% Invalid options
     InvOpts = [2,false,self(),Bin,"Options",Fun,
-	       packet_size,{packet_size},{packet_size,0,false},
-	       {packet_size,-1},{packet_size,100.0},{packet_size,false},
-	       {line_length,-1},{line_length,100.0},{line_length,false}],
+               packet_size,{packet_size},{packet_size,0,false},
+               {packet_size,-1},{packet_size,100.0},{packet_size,false},
+               {line_length,-1},{line_length,100.0},{line_length,false}],
 
     lists:foreach(fun(Opt)-> BadargF(0,Bin,Opt),
-			     BadargF(0,Bin,[Opt]),
-			     BadargF(0,Bin,[Opt,{packet_size,1000}]),
-			     BadargF(0,Bin,[{packet_size,1000},Opt]) end,
-		  InvOpts),
+                             BadargF(0,Bin,[Opt]),
+                             BadargF(0,Bin,[Opt,{packet_size,1000}]),
+                             BadargF(0,Bin,[{packet_size,1000},Opt]) end,
+                  InvOpts),
     ok.
 
 
-http(doc) -> [];
-http(suite) -> [];
 http(Config) when is_list(Config) ->
-    ?line <<"foo">> = http_do(http_request("foo")),
-    ?line <<" bar">> = http_do(http_request(" bar")),
-    ?line <<"Hello!">> = http_do(http_response("Hello!")),
+    <<"foo">> = http_do(http_request("foo")),
+    <<" bar">> = http_do(http_request(" bar")),
+    <<"Hello!">> = http_do(http_response("Hello!")),
 
     %% Test all known header atoms
     Val = "dummy value",
     ValB = list_to_binary(Val),
     Rest = <<"Rest">>,    
     HdrF = fun(Str,N) ->  
-		   ?line StrA = list_to_atom(Str),
-		   ?line StrB = list_to_binary(Str),
-		   ?line Bin = <<StrB/binary,": ",ValB/binary,"\r\n",Rest/binary>>,
-		   ?line {ok, {http_header,N,StrA,undefined,Val}, Rest} = decode_pkt(httph,Bin),
-		   ?line {ok, {http_header,N,StrA,undefined,ValB}, Rest} = decode_pkt(httph_bin,Bin),
-		   ?line N + 1
-	   end,
-    ?line lists:foldl(HdrF, 1, http_hdr_strings()),
+                   StrA = list_to_atom(Str),
+                   StrB = list_to_binary(Str),
+                   Bin = <<StrB/binary,": ",ValB/binary,"\r\n",Rest/binary>>,
+                   {ok, {http_header,N,StrA,undefined,Val}, Rest} = decode_pkt(httph,Bin),
+                   {ok, {http_header,N,StrA,undefined,ValB}, Rest} = decode_pkt(httph_bin,Bin),
+                   N + 1
+           end,
+    lists:foldl(HdrF, 1, http_hdr_strings()),
 
     %% Test all known method atoms
     MethF = fun(Meth) ->  
-		    ?line MethA = list_to_atom(Meth),
-		    ?line MethB = list_to_binary(Meth),
-		    ?line Bin = <<MethB/binary," /invalid/url HTTP/1.0\r\n",Rest/binary>>,
-		    ?line {ok, {http_request,MethA,{abs_path,"/invalid/url"},{1,0}},
-			   Rest} = decode_pkt(http,Bin),
-		    ?line {ok, {http_request,MethA,{abs_path,<<"/invalid/url">>},{1,0}},
-			   Rest} = decode_pkt(http_bin,Bin)
-	    end,
-    ?line lists:foreach(MethF, http_meth_strings()),
+                    MethA = list_to_atom(Meth),
+                    MethB = list_to_binary(Meth),
+                    Bin = <<MethB/binary," /invalid/url HTTP/1.0\r\n",Rest/binary>>,
+                    {ok, {http_request,MethA,{abs_path,"/invalid/url"},{1,0}},
+                     Rest} = decode_pkt(http,Bin),
+                    {ok, {http_request,MethA,{abs_path,<<"/invalid/url">>},{1,0}},
+                     Rest} = decode_pkt(http_bin,Bin)
+            end,
+    lists:foreach(MethF, http_meth_strings()),
 
     %% Test all uri variants    
     UriF = fun({Str,ResL,ResB}) -> 
-		   Bin = <<"GET ",(list_to_binary(Str))/binary," HTTP/1.1\r\n",Rest/binary>>,
-		   {ok, {http_request, 'GET', ResL, {1,1}}, Rest} = decode_pkt(http,Bin),
-		   {ok, {http_request, 'GET', ResB, {1,1}}, Rest} = decode_pkt(http_bin,Bin) 
-	   end,
+                   Bin = <<"GET ",(list_to_binary(Str))/binary," HTTP/1.1\r\n",Rest/binary>>,
+                   {ok, {http_request, 'GET', ResL, {1,1}}, Rest} = decode_pkt(http,Bin),
+                   {ok, {http_request, 'GET', ResB, {1,1}}, Rest} = decode_pkt(http_bin,Bin) 
+           end,
     lists:foreach(UriF, http_uri_variants()),
 
     %% Response with empty phrase
-    ?line {ok,{http_response,{1,1},200,[]},<<>>} = decode_pkt(http, <<"HTTP/1.1 200\r\n">>, []),
-    ?line {ok,{http_response,{1,1},200,<<>>},<<>>} = decode_pkt(http_bin, <<"HTTP/1.1 200\r\n">>, []),
+    {ok,{http_response,{1,1},200,[]},<<>>} = decode_pkt(http, <<"HTTP/1.1 200\r\n">>, []),
+    {ok,{http_response,{1,1},200,<<>>},<<>>} = decode_pkt(http_bin, <<"HTTP/1.1 200\r\n">>, []),
     ok.
-	     
+
 http_with_bin(http) ->
     http_bin;
 http_with_bin(httph) ->
@@ -367,88 +342,88 @@ http_do(Tup) ->
 http_do({Bin, []}, _) ->
     Bin;
 http_do({Bin,[{_Line,PL,PB}|Tail]}, Type) ->
-    ?line {ok, PL, Rest} = decode_pkt(Type,Bin),
-    ?line {ok, PB, Rest} = decode_pkt(http_with_bin(Type),Bin),
+    {ok, PL, Rest} = decode_pkt(Type,Bin),
+    {ok, PB, Rest} = decode_pkt(http_with_bin(Type),Bin),
 
     %% Same tests again but as SubBin
-    PreLen = random:uniform(64),
-    Prefix = random:uniform(1 bsl PreLen) - 1,
-    SufLen = random:uniform(64),
-    Suffix = random:uniform(1 bsl SufLen) - 1,
+    PreLen = rand:uniform(64),
+    Prefix = rand:uniform(1 bsl PreLen) - 1,
+    SufLen = rand:uniform(64),
+    Suffix = rand:uniform(1 bsl SufLen) - 1,
     Orig = <<Prefix:PreLen, Bin/bits, Suffix:SufLen>>,
     BinLen = bit_size(Bin),
     <<_:PreLen, SubBin:BinLen/bits, _/bits>> = Orig, % Make SubBin
-    ?line SubBin = Bin, % just to make sure
+    SubBin = Bin, % just to make sure
 
-    ?line {ok, PL, Rest} = decode_pkt(Type,SubBin),
-    ?line {ok, PB, Rest} = decode_pkt(http_with_bin(Type),SubBin),
+    {ok, PL, Rest} = decode_pkt(Type,SubBin),
+    {ok, PB, Rest} = decode_pkt(http_with_bin(Type),SubBin),
     http_do({Rest, Tail}, httph).
 
 http_request(Msg) ->
     QnA = [{"POST /invalid/url HTTP/1.1\r\n",
-	  {http_request, 'POST', {abs_path,  "/invalid/url"  }, {1,1}},
-	  {http_request, 'POST', {abs_path,<<"/invalid/url">>}, {1,1}}},
-	 {"Connection: close\r\n",
-	  {http_header,2,'Connection',undefined,  "close"},
-	  {http_header,2,'Connection',undefined,<<"close">>}},	 
-	 {"Host\t : localhost:8000\r\n", % white space before :
-	  {http_header,14,'Host',undefined,  "localhost:8000"},
-	  {http_header,14,'Host',undefined,<<"localhost:8000">>}},
-	 {"User-Agent: perl post\r\n",
-	  {http_header,24,'User-Agent',undefined,  "perl post"},
-	  {http_header,24,'User-Agent',undefined,<<"perl post">>}},
-	 {"Content-Length: 4\r\n",
-	  {http_header,38,'Content-Length',undefined,  "4"},
-	  {http_header,38,'Content-Length',undefined,<<"4">>}},
-	 {"Content-Type: text/xml; charset=utf-8\r\n",
-	  {http_header,42,'Content-Type',undefined,  "text/xml; charset=utf-8"},
-	  {http_header,42,'Content-Type',undefined,<<"text/xml; charset=utf-8">>}},
-	 {"Other-Field: with some text\r\n",
-	  {http_header,0,  "Other-Field"  ,undefined,  "with some text"},
-	  {http_header,0,<<"Other-Field">>,undefined,<<"with some text">>}},
-	 {"Make-sure-a-LONG-HEaDer-fIeLd-is-fORMATTED-NicelY: with some text\r\n",
-	  {http_header,0,  "Make-Sure-A-Long-Header-Field-Is-Formatted-Nicely"  ,undefined,  "with some text"},
-	  {http_header,0,<<"Make-Sure-A-Long-Header-Field-Is-Formatted-Nicely">>,undefined,<<"with some text">>}},
-	 {"Multi-Line: Once upon a time in a land far far away,\r\n"
-	  " there lived a princess imprisoned in the highest tower\r\n"
-	  " of the most haunted castle.\r\n",
-	  {http_header,0,  "Multi-Line"  ,undefined,  "Once upon a time in a land far far away,\r\n there lived a princess imprisoned in the highest tower\r\n of the most haunted castle."},
-	  {http_header,0,<<"Multi-Line">>,undefined,<<"Once upon a time in a land far far away,\r\n there lived a princess imprisoned in the highest tower\r\n of the most haunted castle.">>}},
-	 {"\r\n",
-	  http_eoh,
-	  http_eoh}],
+            {http_request, 'POST', {abs_path,  "/invalid/url"  }, {1,1}},
+            {http_request, 'POST', {abs_path,<<"/invalid/url">>}, {1,1}}},
+           {"Connection: close\r\n",
+            {http_header,2,'Connection',undefined,  "close"},
+            {http_header,2,'Connection',undefined,<<"close">>}},	 
+           {"Host\t : localhost:8000\r\n", % white space before :
+            {http_header,14,'Host',undefined,  "localhost:8000"},
+            {http_header,14,'Host',undefined,<<"localhost:8000">>}},
+           {"User-Agent: perl post\r\n",
+            {http_header,24,'User-Agent',undefined,  "perl post"},
+            {http_header,24,'User-Agent',undefined,<<"perl post">>}},
+           {"Content-Length: 4\r\n",
+            {http_header,38,'Content-Length',undefined,  "4"},
+            {http_header,38,'Content-Length',undefined,<<"4">>}},
+           {"Content-Type: text/xml; charset=utf-8\r\n",
+            {http_header,42,'Content-Type',undefined,  "text/xml; charset=utf-8"},
+            {http_header,42,'Content-Type',undefined,<<"text/xml; charset=utf-8">>}},
+           {"Other-Field: with some text\r\n",
+            {http_header,0,  "Other-Field"  ,undefined,  "with some text"},
+            {http_header,0,<<"Other-Field">>,undefined,<<"with some text">>}},
+           {"Make-sure-a-LONG-HEaDer-fIeLd-is-fORMATTED-NicelY: with some text\r\n",
+            {http_header,0,  "Make-Sure-A-Long-Header-Field-Is-Formatted-Nicely"  ,undefined,  "with some text"},
+            {http_header,0,<<"Make-Sure-A-Long-Header-Field-Is-Formatted-Nicely">>,undefined,<<"with some text">>}},
+           {"Multi-Line: Once upon a time in a land far far away,\r\n"
+            " there lived a princess imprisoned in the highest tower\r\n"
+            " of the most haunted castle.\r\n",
+            {http_header,0,  "Multi-Line"  ,undefined,  "Once upon a time in a land far far away,\r\n there lived a princess imprisoned in the highest tower\r\n of the most haunted castle."},
+            {http_header,0,<<"Multi-Line">>,undefined,<<"Once upon a time in a land far far away,\r\n there lived a princess imprisoned in the highest tower\r\n of the most haunted castle.">>}},
+           {"\r\n",
+            http_eoh,
+            http_eoh}],
     Bin = lists:foldl(fun({Line,_,_},Acc) -> LineBin = list_to_binary(Line), 
-					     <<Acc/binary,LineBin/binary>> end,
-		      <<"">>, QnA),
+                                             <<Acc/binary,LineBin/binary>> end,
+                      <<"">>, QnA),
     MsgBin = list_to_binary(Msg),
     {<<Bin/binary,MsgBin/binary>>, QnA}.
 
 
 http_response(Msg) ->
     QnA = [{"HTTP/1.0 404 Object Not Found\r\n",
-	    {http_response, {1,0}, 404,   "Object Not Found"},
-	    {http_response, {1,0}, 404, <<"Object Not Found">>}},
-	   {"Server: inets/4.7.16\r\n",
-	    {http_header, 30, 'Server', undefined,   "inets/4.7.16"},
-	    {http_header, 30, 'Server', undefined, <<"inets/4.7.16">>}},
-	   {"Date: Fri, 04 Jul 2008 17:16:22 GMT\r\n",
-	    {http_header, 3, 'Date', undefined,   "Fri, 04 Jul 2008 17:16:22 GMT"},
-	    {http_header, 3, 'Date', undefined, <<"Fri, 04 Jul 2008 17:16:22 GMT">>}},
-	   {"Content-Type: text/html\r\n",
-	    {http_header, 42, 'Content-Type', undefined,   "text/html"},
-	    {http_header, 42, 'Content-Type', undefined, <<"text/html">>}},
-	   {"Content-Length: 207\r\n",
-	    {http_header, 38, 'Content-Length', undefined,   "207"},
-	    {http_header, 38, 'Content-Length', undefined, <<"207">>}},
-	   {"\r\n",
-	    http_eoh,
-	    http_eoh}],
+            {http_response, {1,0}, 404,   "Object Not Found"},
+            {http_response, {1,0}, 404, <<"Object Not Found">>}},
+           {"Server: inets/4.7.16\r\n",
+            {http_header, 30, 'Server', undefined,   "inets/4.7.16"},
+            {http_header, 30, 'Server', undefined, <<"inets/4.7.16">>}},
+           {"Date: Fri, 04 Jul 2008 17:16:22 GMT\r\n",
+            {http_header, 3, 'Date', undefined,   "Fri, 04 Jul 2008 17:16:22 GMT"},
+            {http_header, 3, 'Date', undefined, <<"Fri, 04 Jul 2008 17:16:22 GMT">>}},
+           {"Content-Type: text/html\r\n",
+            {http_header, 42, 'Content-Type', undefined,   "text/html"},
+            {http_header, 42, 'Content-Type', undefined, <<"text/html">>}},
+           {"Content-Length: 207\r\n",
+            {http_header, 38, 'Content-Length', undefined,   "207"},
+            {http_header, 38, 'Content-Length', undefined, <<"207">>}},
+           {"\r\n",
+            http_eoh,
+            http_eoh}],
 
 
 
     Bin = lists:foldl(fun({Line,_,_},Acc) -> LineBin = list_to_binary(Line), 
-					     <<Acc/binary,LineBin/binary>> end,
-		      <<"">>, QnA),
+                                             <<Acc/binary,LineBin/binary>> end,
+                      <<"">>, QnA),
     MsgBin = list_to_binary(Msg),
     {<<Bin/binary,MsgBin/binary>>, QnA}.
 
@@ -489,60 +464,56 @@ http_uri_variants() ->
      {"something_else", "something_else", <<"something_else">>}].
 
 
-line(doc) -> [];
-line(suite) -> [];
 line(Config) when is_list(Config) ->
     Text = <<"POST /invalid/url HTTP/1.1\r\n"
-	    "Connection: close\r\n"
-	    "Host\t : localhost:8000\r\n"
-	    "User-Agent: perl post\r\n"
-	    "Content-Length: 4\r\n"
-	    "Content-Type: text/xml; charset=utf-8\r\n"
-	    "Other-Field: with some text\r\n"
-	    "Multi-Line: Once upon a time in a land far far away,\r\n"
-	    " there lived a princess imprisoned in the highest tower\r\n"
-	    " of the most haunted castle.\r\n"
-	    "\r\nThe residue">>,
+             "Connection: close\r\n"
+             "Host\t : localhost:8000\r\n"
+             "User-Agent: perl post\r\n"
+             "Content-Length: 4\r\n"
+             "Content-Type: text/xml; charset=utf-8\r\n"
+             "Other-Field: with some text\r\n"
+             "Multi-Line: Once upon a time in a land far far away,\r\n"
+             " there lived a princess imprisoned in the highest tower\r\n"
+             " of the most haunted castle.\r\n"
+             "\r\nThe residue">>,
 
     lists:foreach(fun(MaxLen) -> line_do(Text,MaxLen) end,
-		  [0,7,19,29,37]),
+                  [0,7,19,29,37]),
     ok.
 
 line_do(Bin,MaxLen) ->
     Res = decode_pkt(line,Bin,[{line_length,MaxLen}]),
     MyRes = decode_line(Bin,MaxLen),
-    ?line MyRes = Res,
+    MyRes = Res,
     case Res of
-	{ok,_,Rest} ->
-	    line_do(Rest,MaxLen);
-	{more,undefined} ->
-	    ok
+        {ok,_,Rest} ->
+            line_do(Rest,MaxLen);
+        {more,undefined} ->
+            ok
     end.
-    
+
 % Emulates decode_packet(line,Bin,[{line_length,MaxLen}])
 decode_line(Bin,MaxLen) ->
-    ?line case find_in_binary($\n,Bin) of
-	notfound when MaxLen>0 andalso byte_size(Bin) >= MaxLen ->
-	    {LineB,Rest} = split_binary(Bin,MaxLen),
-	    {ok,LineB,Rest};
-	notfound ->
-	    {more,undefined};
-	Pos when MaxLen>0 andalso Pos > MaxLen ->
-	    {LineB,Rest} = split_binary(Bin,MaxLen),
-	    {ok,LineB,Rest};
-	Pos ->
-	    {LineB,Rest} = split_binary(Bin,Pos),
-	    {ok,LineB,Rest}
+    case find_in_binary($\n,Bin) of
+        notfound when MaxLen>0 andalso byte_size(Bin) >= MaxLen ->
+            {LineB,Rest} = split_binary(Bin,MaxLen),
+            {ok,LineB,Rest};
+        notfound ->
+            {more,undefined};
+        Pos when MaxLen>0 andalso Pos > MaxLen ->
+            {LineB,Rest} = split_binary(Bin,MaxLen),
+            {ok,LineB,Rest};
+        Pos ->
+            {LineB,Rest} = split_binary(Bin,Pos),
+            {ok,LineB,Rest}
     end.
 
 find_in_binary(Byte, Bin) ->
     case string:chr(binary_to_list(Bin),Byte) of
-	0 -> notfound;	    
-	P -> P
+        0 -> notfound;	    
+        P -> P
     end.    
 
-ssl(doc) -> [];
-ssl(suite) -> [];
 ssl(Config) when is_list(Config) ->
     Major = 34,
     Minor = 17,
@@ -550,15 +521,15 @@ ssl(Config) when is_list(Config) ->
     Rest = <<23,123,203,12,234>>,
 
     F = fun(Content) ->
-		{Packet,Unpacked} = pack_ssl(Content, Major, Minor, Body),
-		Bin = <<Packet/binary,Rest/binary>>,
-		?line {ok, Unpacked, Rest} = decode_pkt(ssl_tls, Bin)
-	end,    
+                {Packet,Unpacked} = pack_ssl(Content, Major, Minor, Body),
+                Bin = <<Packet/binary,Rest/binary>>,
+                {ok, Unpacked, Rest} = decode_pkt(ssl_tls, Bin)
+        end,    
     F(25),
     F(v2hello),
     ok.
 
-otp_8536(doc) -> ["Corrupt sub-binary-strings from httph_bin"];
+%% Corrupt sub-binary-strings from httph_bin
 otp_8536(Config) when is_list(Config) ->
     lists:foreach(fun otp_8536_do/1, lists:seq(1,50)),
     ok.
@@ -571,7 +542,7 @@ otp_8536_do(N) ->
     Bin = <<Hdr/binary, ": ", Data/binary, "\r\n\r\n">>,
 
     io:format("Bin='~p'\n",[Bin]),
-    ?line {ok,{http_header,0,Hdr2,undefined,Data2},<<"\r\n">>} = decode_pkt(httph_bin, Bin,  []),
+    {ok,{http_header,0,Hdr2,undefined,Data2},<<"\r\n">>} = decode_pkt(httph_bin, Bin,  []),
 
     %% Do something to trash the C-stack, how about another decode_packet:
     decode_pkt(httph_bin,<<Letters/binary, ": ", Data/binary, "\r\n\r\n">>, []),
@@ -587,8 +558,7 @@ decode_pkt(Type,Bin,Opts) ->
     %%io:format(" -> ~p\n",[Res]),
     Res.
 
-otp_9389(doc) -> ["Verify line_length works correctly for HTTP headers"];
-otp_9389(suite) -> [];
+%% Verify line_length works correctly for HTTP headers
 otp_9389(Config) when is_list(Config) ->
     Opts = [{packet_size, 16384}, {line_length, 3000}],
     Pkt = list_to_binary(["GET / HTTP/1.1\r\nHost: localhost\r\nLink: /",
@@ -596,26 +566,25 @@ otp_9389(Config) when is_list(Config) ->
                           "\r\nContent-Length: 0\r\n\r\n"]),
     <<Pkt1:5000/binary, Pkt2/binary>> = Pkt,
     {ok, {http_request,'GET',{abs_path,"/"},{1,1}}, Rest1} =
-        erlang:decode_packet(http, Pkt1, Opts),
+    erlang:decode_packet(http, Pkt1, Opts),
     {ok, {http_header,_,'Host',_,"localhost"}, Rest2} =
-        erlang:decode_packet(httph, Rest1, Opts),
+    erlang:decode_packet(httph, Rest1, Opts),
     {more, undefined} = erlang:decode_packet(httph, Rest2, Opts),
     {ok, {http_header,_,"Link",_,Link}, Rest3} =
-        erlang:decode_packet(httph, list_to_binary([Rest2, Pkt2]), Opts),
+    erlang:decode_packet(httph, list_to_binary([Rest2, Pkt2]), Opts),
     true = (length(Link) > 8000),
     {ok, {http_header,_,'Content-Length',_,"0"}, <<"\r\n">>} =
-        erlang:decode_packet(httph, Rest3, Opts),
+    erlang:decode_packet(httph, Rest3, Opts),
     ok.
 
-otp_9389_line(doc) -> ["Verify packet_size works correctly for line mode"];
-otp_9389_line(suite) -> [];
+%% Verify packet_size works correctly for line mode
 otp_9389_line(Config) when is_list(Config) ->
     Opts = [{packet_size, 20}],
     Line1 = <<"0123456789012345678\n">>,
     Line2 = <<"0123456789\n">>,
     Line3 = <<"01234567890123456789\n">>,
     Pkt = list_to_binary([Line1, Line2, Line3]),
-    ?line {ok, Line1, Rest1} = erlang:decode_packet(line, Pkt, Opts),
-    ?line {ok, Line2, Rest2} = erlang:decode_packet(line, Rest1, Opts),
-    ?line {error, invalid} = erlang:decode_packet(line, Rest2, Opts),
+    {ok, Line1, Rest1} = erlang:decode_packet(line, Pkt, Opts),
+    {ok, Line2, Rest2} = erlang:decode_packet(line, Rest1, Opts),
+    {error, invalid} = erlang:decode_packet(line, Rest2, Opts),
     ok.
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index d71cedbdc5..b068a4c8d2 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -33,41 +33,40 @@
 
 %% Tests distribution and the tcp driver.
 
--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,
-	 ping/1, bulk_send_small/1,
-	 bulk_send_big/1, bulk_send_bigbig/1,
-	 local_send_small/1, local_send_big/1,
-	 local_send_legal/1, link_to_busy/1, exit_to_busy/1,
-	 lost_exit/1, link_to_dead/1, link_to_dead_new_node/1,
-	 applied_monitor_node/1, ref_port_roundtrip/1, nil_roundtrip/1,
-	 trap_bif_1/1, trap_bif_2/1, trap_bif_3/1,
-	 stop_dist/1, 
-	 dist_auto_connect_never/1, dist_auto_connect_once/1,
-	 dist_parallel_send/1,
-	 atom_roundtrip/1,
-	 unicode_atom_roundtrip/1,
-	 atom_roundtrip_r15b/1,
-	 contended_atom_cache_entry/1,
-	 contended_unicode_atom_cache_entry/1,
-	 bad_dist_structure/1,
-	 bad_dist_ext_receive/1,
-	 bad_dist_ext_process_info/1,
-	 bad_dist_ext_control/1,
-	 bad_dist_ext_connection_id/1]).
-
--export([init_per_testcase/2, end_per_testcase/2]).
+-include_lib("common_test/include/ct.hrl").
+
+-export([all/0, suite/0, groups/0,
+         ping/1, bulk_send_small/1,
+         bulk_send_big/1, bulk_send_bigbig/1,
+         local_send_small/1, local_send_big/1,
+         local_send_legal/1, link_to_busy/1, exit_to_busy/1,
+         lost_exit/1, link_to_dead/1, link_to_dead_new_node/1,
+         applied_monitor_node/1, ref_port_roundtrip/1, nil_roundtrip/1,
+         trap_bif_1/1, trap_bif_2/1, trap_bif_3/1,
+         stop_dist/1, 
+         dist_auto_connect_never/1, dist_auto_connect_once/1,
+         dist_parallel_send/1,
+         atom_roundtrip/1,
+         unicode_atom_roundtrip/1,
+         atom_roundtrip_r15b/1,
+         contended_atom_cache_entry/1,
+         contended_unicode_atom_cache_entry/1,
+         bad_dist_structure/1,
+         bad_dist_ext_receive/1,
+         bad_dist_ext_process_info/1,
+         bad_dist_ext_control/1,
+         bad_dist_ext_connection_id/1]).
 
 %% Internal exports.
 -export([sender/3, receiver2/2, dummy_waiter/0, dead_process/0,
-	 roundtrip/1, bounce/1, do_dist_auto_connect/1, inet_rpc_server/1,
-	 dist_parallel_sender/3, dist_parallel_receiver/0,
-	 dist_evil_parallel_receiver/0,
+         roundtrip/1, bounce/1, do_dist_auto_connect/1, inet_rpc_server/1,
+         dist_parallel_sender/3, dist_parallel_receiver/0,
+         dist_evil_parallel_receiver/0,
          sendersender/4, sendersender2/4]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 4}}].
 
 all() -> 
     [ping, {group, bulk_send}, {group, local_send},
@@ -90,81 +89,55 @@ groups() ->
       [bad_dist_ext_receive, bad_dist_ext_process_info,
        bad_dist_ext_control, bad_dist_ext_connection_id]}].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
--define(DEFAULT_TIMETRAP, 4*60*1000).
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?DEFAULT_TIMETRAP),
-    [{watchdog, Dog},{testcase, Func}|Config].
-
-end_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
-ping(doc) ->
-    ["Tests pinging a node in different ways."];
+%% Tests pinging a node in different ways.
 ping(Config) when is_list(Config) ->
     Times = 1024,
 
     %% Ping a non-existing node many times.  This used to crash the emulator
     %% on Windows.
 
-    ?line Host = hostname(),
-    ?line BadName = list_to_atom("__pucko__@" ++ Host),
-    ?line io:format("Pinging ~s (assumed to not exist)", [BadName]),
-    ?line test_server:do_times(Times, fun() -> pang = net_adm:ping(BadName)
-			       end),
+    Host = hostname(),
+    BadName = list_to_atom("__pucko__@" ++ Host),
+    io:format("Pinging ~s (assumed to not exist)", [BadName]),
+    test_server:do_times(Times, fun() -> pang = net_adm:ping(BadName)
+                                end),
 
     %% Pings another node.
 
-    ?line {ok, OtherNode} = start_node(distribution_SUITE_other),
-    ?line io:format("Pinging ~s (assumed to exist)", [OtherNode]),
-    ?line test_server:do_times(Times, fun() -> pong = net_adm:ping(OtherNode) end),
-    ?line stop_node(OtherNode),
+    {ok, OtherNode} = start_node(distribution_SUITE_other),
+    io:format("Pinging ~s (assumed to exist)", [OtherNode]),
+    test_server:do_times(Times, fun() -> pong = net_adm:ping(OtherNode) end),
+    stop_node(OtherNode),
 
     %% Pings our own node many times.
 
-    ?line Node = node(),
-    ?line io:format("Pinging ~s (the same node)", [Node]),
-    ?line test_server:do_times(Times, fun() -> pong = net_adm:ping(Node) end),
+    Node = node(),
+    io:format("Pinging ~s (the same node)", [Node]),
+    test_server:do_times(Times, fun() -> pong = net_adm:ping(Node) end),
 
     ok.
 
 bulk_send_small(Config) when is_list(Config) ->
-    ?line bulk_send(64, 32).
+    bulk_send(64, 32).
 
 bulk_send_big(Config) when is_list(Config) ->
-    ?line bulk_send(32, 64).
+    bulk_send(32, 64).
 
 bulk_send_bigbig(Config) when is_list(Config) ->
-    ?line bulk_sendsend(32*5, 4).
+    bulk_sendsend(32*5, 4).
 
 bulk_send(Terms, BinSize) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(30)),
-
-    ?line io:format("Sending ~w binaries, each of size ~w K",
-		    [Terms, BinSize]),
-    ?line {ok, Node} = start_node(bulk_receiver),
-    ?line Recv = spawn(Node, erlang, apply, [fun receiver/2, [0, 0]]),
-    ?line Bin = list_to_binary(lists:duplicate(BinSize*1024, 253)),
-    ?line Size = Terms*size(Bin),
-    ?line {Elapsed, {Terms, Size}} = test_server:timecall(?MODULE, sender,
-							  [Recv, Bin, Terms]),
-    ?line stop_node(Node),
-
-    ?line test_server:timetrap_cancel(Dog),
-    {comment, integer_to_list(trunc(Size/1024/Elapsed+0.5)) ++ " K/s"}.
+    ct:timetrap({seconds, 30}),
+
+    io:format("Sending ~w binaries, each of size ~w K", [Terms, BinSize]),
+    {ok, Node} = start_node(bulk_receiver),
+    Recv = spawn(Node, erlang, apply, [fun receiver/2, [0, 0]]),
+    Bin = list_to_binary(lists:duplicate(BinSize*1024, 253)),
+    Size = Terms*size(Bin),
+    {Elapsed, {Terms, Size}} = test_server:timecall(?MODULE, sender,
+                                                    [Recv, Bin, Terms]),
+    stop_node(Node),
+    {comment, integer_to_list(trunc(Size/1024/max(1,Elapsed)+0.5)) ++ " K/s"}.
 
 bulk_sendsend(Terms, BinSize) ->
     {Rate1, MonitorCount1} = bulk_sendsend2(Terms, BinSize,   5),
@@ -173,29 +146,29 @@ bulk_sendsend(Terms, BinSize) ->
                true               -> MonitorCount1 / MonitorCount2
             end,
     Comment = integer_to_list(Rate1) ++ " K/s, " ++
-	integer_to_list(Rate2) ++ " K/s, " ++
-	integer_to_list(MonitorCount1) ++ " monitor msgs, " ++
-	integer_to_list(MonitorCount2) ++ " monitor msgs, " ++
-	float_to_list(Ratio) ++ " monitor ratio",
+    integer_to_list(Rate2) ++ " K/s, " ++
+    integer_to_list(MonitorCount1) ++ " monitor msgs, " ++
+    integer_to_list(MonitorCount2) ++ " monitor msgs, " ++
+    float_to_list(Ratio) ++ " monitor ratio",
     if
-	%% A somewhat arbitrary ratio, but hopefully one that will
-	%% accommodate a wide range of CPU speeds.
-	Ratio > 8.0 ->
-	    {comment,Comment};
-	true ->
-	    io:put_chars(Comment),
-	    ?line ?t:fail(ratio_too_low)
+        %% A somewhat arbitrary ratio, but hopefully one that will
+        %% accommodate a wide range of CPU speeds.
+        Ratio > 8.0 ->
+            {comment,Comment};
+        true ->
+            io:put_chars(Comment),
+            ct:fail(ratio_too_low)
     end.
 
 bulk_sendsend2(Terms, BinSize, BusyBufSize) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(30)),
+    ct:timetrap({seconds, 30}),
 
-    ?line io:format("Sending ~w binaries, each of size ~w K",
-		    [Terms, BinSize]),
-    ?line {ok, NodeRecv} = start_node(bulk_receiver),
-    ?line Recv = spawn(NodeRecv, erlang, apply, [fun receiver/2, [0, 0]]),
-    ?line Bin = list_to_binary(lists:duplicate(BinSize*1024, 253)),
-    %%?line Size = Terms*size(Bin),
+    io:format("Sending ~w binaries, each of size ~w K",
+              [Terms, BinSize]),
+    {ok, NodeRecv} = start_node(bulk_receiver),
+    Recv = spawn(NodeRecv, erlang, apply, [fun receiver/2, [0, 0]]),
+    Bin = list_to_binary(lists:duplicate(BinSize*1024, 253)),
+    %%Size = Terms*size(Bin),
 
     %% SLF LEFT OFF HERE.
     %% When the caller uses small hunks, like 4k via
@@ -206,23 +179,21 @@ bulk_sendsend2(Terms, BinSize, BusyBufSize) ->
     %% default busy size and "+zdbbl 5", and if the 5 case gets
     %% "many many more" monitor messages, then we know we're working.
 
-    ?line {ok, NodeSend} = start_node(bulk_sender, "+zdbbl " ++ integer_to_list(BusyBufSize)),
-    ?line _Send = spawn(NodeSend, erlang, apply, [fun sendersender/4, [self(), Recv, Bin, Terms]]),
-    ?line {Elapsed, {_TermsN, SizeN}, MonitorCount} =
-        receive {sendersender, BigRes} ->
+    {ok, NodeSend} = start_node(bulk_sender, "+zdbbl " ++ integer_to_list(BusyBufSize)),
+    _Send = spawn(NodeSend, erlang, apply, [fun sendersender/4, [self(), Recv, Bin, Terms]]),
+    {Elapsed, {_TermsN, SizeN}, MonitorCount} =
+    receive {sendersender, BigRes} ->
                 BigRes
-        end,
-    ?line stop_node(NodeRecv),
-    ?line stop_node(NodeSend),
-
-    ?line test_server:timetrap_cancel(Dog),
+    end,
+    stop_node(NodeRecv),
+    stop_node(NodeSend),
     {trunc(SizeN/1024/Elapsed+0.5), MonitorCount}.
 
 sender(To, _Bin, 0) ->
     To ! {done, self()},
     receive
-	Any ->
-	    Any
+        Any ->
+            Any
     end;
 sender(To, Bin, Left) ->
     To ! {term, Bin},
@@ -233,9 +204,9 @@ sender(To, Bin, Left) ->
 sendersender(Parent, To, Bin, Left) ->
     erlang:system_monitor(self(), [busy_dist_port]),
     [spawn(fun() -> sendersender2(To, Bin, Left, false) end) ||
-        _ <- lists:seq(1,1)],
+     _ <- lists:seq(1,1)],
     {USec, {Res, MonitorCount}} =
-        timer:tc(?MODULE, sendersender2, [To, Bin, Left, true]),
+    timer:tc(?MODULE, sendersender2, [To, Bin, Left, true]),
     Parent ! {sendersender, {USec/1000000, Res, MonitorCount}}.
 
 sendersender2(To, Bin, Left, SendDone) ->
@@ -243,22 +214,22 @@ sendersender2(To, Bin, Left, SendDone) ->
 
 sendersender3(To, _Bin, 0, SendDone, MonitorCount) ->
     if SendDone ->
-            To ! {done, self()};
+           To ! {done, self()};
        true ->
-            ok
+           ok
     end,
     receive
         {monitor, _Pid, _Type, _Info} ->
             sendersender3(To, _Bin, 0, SendDone, MonitorCount + 1)
     after 0 ->
-            if SendDone ->
-                    receive
-                        Any when is_tuple(Any), size(Any) == 2 ->
-                            {Any, MonitorCount}
-                    end;
-               true ->
-                    exit(normal)
-            end
+              if SendDone ->
+                     receive
+                         Any when is_tuple(Any), size(Any) == 2 ->
+                             {Any, MonitorCount}
+                     end;
+                 true ->
+                     exit(normal)
+              end
     end;
 sendersender3(To, Bin, Left, SendDone, MonitorCount) ->
     To ! {term, Bin},
@@ -269,80 +240,74 @@ sendersender3(To, Bin, Left, SendDone, MonitorCount) ->
 
 receiver(Terms, Size) ->
     receive
-	{term, Bin} ->
-	    receiver(Terms+1, Size+size(Bin));
-	{done, ReplyTo} ->
-	    ReplyTo ! {Terms, Size}
+        {term, Bin} ->
+            receiver(Terms+1, Size+size(Bin));
+        {done, ReplyTo} ->
+            ReplyTo ! {Terms, Size}
     end.
 
 
 
-local_send_big(doc) ->
-    ["Sends several big message to an non-registered process on ",
-     "the local node."];
+%% Sends several big message to an non-registered process on the local node.
 local_send_big(Config) when is_list(Config) ->
-    Data0=local_send_big(doc)++
-	["Tests sending small and big messages to a non-existing ",
-        "local registered process."],
+    Data0= ["Tests sending small and big messages to a non-existing ",
+            "local registered process."],
     Data1=[Data0,[Data0, Data0, [Data0], Data0],Data0],
     Data2=Data0++lists:flatten(Data1)++
-	list_to_binary(lists:flatten(Data1)),
+    list_to_binary(lists:flatten(Data1)),
     Func=fun() -> Data2= {arbitrary_name, node()} ! Data2 end,
-    ?line test_server:do_times(4096, Func),
+    test_server:do_times(4096, Func),
     ok.
 
-local_send_small(doc) ->
-    ["Sends a small message to an non-registered process on the ",
-     "local node."];
+%% Sends a small message to an non-registered process on the local node.
 local_send_small(Config) when is_list(Config) ->
     Data={some_stupid, "arbitrary", 'Data'},
     Func=fun() -> Data= {unregistered_name, node()} ! Data end,
-    ?line test_server:do_times(4096, Func),
+    test_server:do_times(4096, Func),
     ok.
 
-local_send_legal(doc) ->
-    ["Sends data to a registered process on the local node, ",
-     "as if it was on another node."];
+%% Sends data to a registered process on the local node, as if it was on another node.
 local_send_legal(Config) when is_list(Config) ->
     Times=16384,
-    Data={local_send_legal(doc), local_send_legal(doc)},
+    Txt = "Some Not so random Data",
+    Data={[Txt,Txt,Txt], [Txt,Txt,Txt]},
     Pid=spawn(?MODULE,receiver2, [0, 0]) ,
-    ?line true=register(registered_process, Pid),
+    true=register(registered_process, Pid),
 
     Func=fun() -> Data={registered_process, node()} ! Data end,
     TotalSize=size(Data)*Times,
-    ?line test_server:do_times(Times, Func),
+    test_server:do_times(Times, Func),
 
     % Check that all msgs really came through.
     Me=self(),
-    ?line {done, Me}=
-	{registered_process, node()} ! {done, Me},
+    {done, Me}=
+    {registered_process, node()} ! {done, Me},
     receive
-	{Times, TotalSize} ->
-	    ok;
-	_ ->
-	    test_server:fail("Wrong number of msgs received.")
+        {Times, TotalSize} ->
+            ok;
+        _ ->
+            ct:fail("Wrong number of msgs received.")
     end,
     ok.
 
 receiver2(Num, TotSize) ->
     receive
-	{done, ReplyTo} ->
-	    ReplyTo ! {Num, TotSize};
-	Stuff ->
-	    receiver2(Num+1, TotSize+size(Stuff))
+        {done, ReplyTo} ->
+            ReplyTo ! {Num, TotSize};
+        Stuff ->
+            receiver2(Num+1, TotSize+size(Stuff))
     end.
 
-link_to_busy(doc) -> "Test that link/1 to a busy distribution port works.";
+%% Test that link/1 to a busy distribution port works.
 link_to_busy(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
-    ?line {ok, Node} = start_node(link_to_busy),
-    ?line Recv = spawn(Node, erlang, apply, [fun sink/1, [link_to_busy_sink]]),
+    ct:timetrap({seconds, 60}),
+    {ok, Node} = start_node(link_to_busy),
+    Recv = spawn(Node, erlang, apply, [fun sink/1, [link_to_busy_sink]]),
 
     Tracer = case os:getenv("TRACE_BUSY_DIST_PORT") of
-		 "true" -> start_busy_dist_port_tracer();
-		 _ -> false
-	     end,
+                 "true" -> start_busy_dist_port_tracer();
+                 _ -> false
+             end,
 
     %% We will spawn off a process which will try to link to the other
     %% node.  The linker process will not actually run until this
@@ -351,20 +316,19 @@ link_to_busy(Config) when is_list(Config) ->
     %% process will block, too, because of the because busy port,
     %% and will later be restarted.
 
-    ?line do_busy_test(Node, fun () -> linker(Recv) end),
+    do_busy_test(Node, fun () -> linker(Recv) end),
 
     %% Same thing, but we apply link/1 instead of calling it directly.
 
-    ?line do_busy_test(Node, fun () -> applied_linker(Recv) end),
+    do_busy_test(Node, fun () -> applied_linker(Recv) end),
 
     %% Same thing again, but we apply link/1 in the tail of a function.
 
-    ?line do_busy_test(Node, fun () -> tail_applied_linker(Recv) end),
+    do_busy_test(Node, fun () -> tail_applied_linker(Recv) end),
 
     %% Done.
-    ?line stop_node(Node),
-    ?line stop_busy_dist_port_tracer(Tracer),
-    ?line test_server:timetrap_cancel(Dog),
+    stop_node(Node),
+    stop_busy_dist_port_tracer(Tracer),
     ok.
 
 linker(Pid) ->
@@ -379,16 +343,16 @@ applied_linker(Pid) ->
 
 tail_applied_linker(Pid) ->
     apply(erlang, link, [Pid]).
-    
-exit_to_busy(doc) -> "Test that exit/2 to a busy distribution port works.";
+
+%% Test that exit/2 to a busy distribution port works.
 exit_to_busy(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
-    ?line {ok, Node} = start_node(exit_to_busy),
+    ct:timetrap({seconds, 60}),
+    {ok, Node} = start_node(exit_to_busy),
 
     Tracer = case os:getenv("TRACE_BUSY_DIST_PORT") of
-		 "true" -> start_busy_dist_port_tracer();
-		 _ -> false
-	     end,
+                 "true" -> start_busy_dist_port_tracer();
+                 _ -> false
+             end,
 
     %% We will spawn off a process which will try to exit a process on
     %% the other node.  That process will not actually run until this
@@ -397,59 +361,58 @@ exit_to_busy(Config) when is_list(Config) ->
     %% too, because of the busy distribution port, and will be allowed
     %% to continue when the port becomes non-busy.
 
-    ?line Recv1 = spawn(Node, fun () -> sink(exit_to_busy_sink) end),
-    ?line M1 = erlang:monitor(process, Recv1),
-    ?line do_busy_test(Node, fun () -> joey_killer(Recv1) end),
-    ?line receive
-	      {'DOWN', M1, process, Recv1, R1} ->
-		  ?line joey_said_die = R1
-	  end,
+    Recv1 = spawn(Node, fun () -> sink(exit_to_busy_sink) end),
+    M1 = erlang:monitor(process, Recv1),
+    do_busy_test(Node, fun () -> joey_killer(Recv1) end),
+    receive
+        {'DOWN', M1, process, Recv1, R1} ->
+            joey_said_die = R1
+    end,
 
     %% Same thing, but tail call to exit/2.
-    ?line Recv2 = spawn(Node, fun () -> sink(exit_to_busy_sink) end),
-    ?line M2 = erlang:monitor(process, Recv2),
-    ?line do_busy_test(Node, fun () -> tail_joey_killer(Recv2) end),
-    ?line receive
-	      {'DOWN', M2, process, Recv2, R2} ->
-		  ?line joey_said_die = R2
-	  end,
+    Recv2 = spawn(Node, fun () -> sink(exit_to_busy_sink) end),
+    M2 = erlang:monitor(process, Recv2),
+    do_busy_test(Node, fun () -> tail_joey_killer(Recv2) end),
+    receive
+        {'DOWN', M2, process, Recv2, R2} ->
+            joey_said_die = R2
+    end,
 
     %% Same thing, but we apply exit/2 instead of calling it directly.
-    ?line Recv3 = spawn(Node, fun () -> sink(exit_to_busy_sink) end),
-    ?line M3 = erlang:monitor(process, Recv3),
-    ?line do_busy_test(Node, fun () -> applied_joey_killer(Recv3) end),
-    ?line receive
-	      {'DOWN', M3, process, Recv3, R3} ->
-		  ?line joey_said_die = R3
-	  end,
+    Recv3 = spawn(Node, fun () -> sink(exit_to_busy_sink) end),
+    M3 = erlang:monitor(process, Recv3),
+    do_busy_test(Node, fun () -> applied_joey_killer(Recv3) end),
+    receive
+        {'DOWN', M3, process, Recv3, R3} ->
+            joey_said_die = R3
+    end,
 
     %% Same thing again, but we apply exit/2 in the tail of a function.
-    ?line Recv4 = spawn(Node, fun () -> sink(exit_to_busy_sink) end),
-    ?line M4 = erlang:monitor(process, Recv4),
-    ?line do_busy_test(Node, fun () -> tail_applied_joey_killer(Recv4) end),
-    ?line receive
-	      {'DOWN', M4, process, Recv4, R4} ->
-		  ?line joey_said_die = R4
-	  end,
-    
+    Recv4 = spawn(Node, fun () -> sink(exit_to_busy_sink) end),
+    M4 = erlang:monitor(process, Recv4),
+    do_busy_test(Node, fun () -> tail_applied_joey_killer(Recv4) end),
+    receive
+        {'DOWN', M4, process, Recv4, R4} ->
+            joey_said_die = R4
+    end,
+
     %% Done.
-    ?line stop_node(Node),
-    ?line stop_busy_dist_port_tracer(Tracer),
-    ?line test_server:timetrap_cancel(Dog),
+    stop_node(Node),
+    stop_busy_dist_port_tracer(Tracer),
     ok.
 
 make_busy_data() ->
     Size = 1024*1024,
     Key = '__busy__port__data__',
     case get(Key) of
-	undefined ->
-	    Data = list_to_binary(lists:duplicate(Size, 253)),
-	    put(Key, Data),
-	    Data;
-	Data ->
-	    true = is_binary(Data),
-	    true = size(Data) == Size,
-	    Data
+        undefined ->
+            Data = list_to_binary(lists:duplicate(Size, 253)),
+            put(Key, Data),
+            Data;
+        Data ->
+            true = is_binary(Data),
+            true = size(Data) == Size,
+            Data
     end.
 
 make_busy(Node, Time) when is_integer(Time) ->
@@ -458,27 +421,27 @@ make_busy(Node, Time) when is_integer(Time) ->
     Data = make_busy_data(),
     %% first make port busy
     Pid = spawn_link(fun () ->
-			     forever(fun () ->
-					     dport_reg_send(Node,
-							    '__noone__',
-							    Data)
-				     end)
-		     end),
+                             forever(fun () ->
+                                             dport_reg_send(Node,
+                                                            '__noone__',
+                                                            Data)
+                                     end)
+                     end),
     receive after Own -> ok end,
     until(fun () ->
-		  case process_info(Pid, status) of
-		      {status, suspended} -> true;
-		      _ -> false
-		  end
-	  end),
+                  case process_info(Pid, status) of
+                      {status, suspended} -> true;
+                      _ -> false
+                  end
+          end),
     %% then dist entry
     make_busy(Node, [nosuspend], Data),
     Pid.
 
 make_busy(Node, Opts, Data) ->
     case erlang:send({'__noone__', Node}, Data, Opts) of
-	nosuspend -> nosuspend;
-	_ -> make_busy(Node, Opts, Data)
+        nosuspend -> nosuspend;
+        _ -> make_busy(Node, Opts, Data)
     end.
 
 unmake_busy(Pid) ->
@@ -491,29 +454,29 @@ do_busy_test(Node, Fun) ->
     receive after 100 -> ok end,
     Pinfo = process_info(P, [status, current_function]),
     unmake_busy(Busy),
-    ?t:format("~p : ~p~n", [P, Pinfo]),
+    io:format("~p : ~p~n", [P, Pinfo]),
     case Pinfo of
-	undefined ->
-	    receive
-		{'DOWN', M, process, P, Reason} ->
-		    ?t:format("~p died with exit reason ~p~n", [P, Reason])
-	    end,
-	    ?t:fail(premature_death);
-	_ ->
-	    %% Don't match arity; it is different in debug and
-	    %% optimized emulator
-	    [{status, suspended},
-	     {current_function, {erlang, bif_return_trap, _}}] = Pinfo,
-	    receive
-		{'DOWN', M, process, P, Reason} ->
-		    ?t:format("~p died with exit reason ~p~n", [P, Reason]),
-		    normal = Reason
-	    end
+        undefined ->
+            receive
+                {'DOWN', M, process, P, Reason} ->
+                    io:format("~p died with exit reason ~p~n", [P, Reason])
+            end,
+            ct:fail(premature_death);
+        _ ->
+            %% Don't match arity; it is different in debug and
+            %% optimized emulator
+            [{status, suspended},
+             {current_function, {erlang, bif_return_trap, _}}] = Pinfo,
+            receive
+                {'DOWN', M, process, P, Reason} ->
+                    io:format("~p died with exit reason ~p~n", [P, Reason]),
+                    normal = Reason
+            end
     end.
 
 remote_is_process_alive(Pid) ->
     rpc:call(node(Pid), erlang, is_process_alive,
-	     [Pid]).
+             [Pid]).
 
 joey_killer(Pid) ->
     exit(Pid, joey_said_die),
@@ -535,234 +498,227 @@ sink(Name) ->
 
 sink1() ->
     receive
-	_Any -> sink1()
+        _Any -> sink1()
     end.
 
-lost_exit(doc) ->
-    "Test that EXIT and DOWN messages send to another node are not lost if "
-	"the distribution port is busy.";
+%% Test that EXIT and DOWN messages send to another node are not lost if
+%% the distribution port is busy.
 lost_exit(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_node(lost_exit),
+    {ok, Node} = start_node(lost_exit),
 
     Tracer = case os:getenv("TRACE_BUSY_DIST_PORT") of
-		 "true" -> start_busy_dist_port_tracer();
-		 _ -> false
-	     end,
+                 "true" -> start_busy_dist_port_tracer();
+                 _ -> false
+             end,
 
     Self = self(),
     Die = make_ref(),
-    ?line R1 = spawn(fun () -> receive after infinity -> ok end end),
-    ?line MR1 = erlang:monitor(process, R1),
-    
-    ?line {L1, ML1} = spawn_monitor(fun() ->
-					    link(R1),
-					    Self ! {self(), linked},
-					    receive
-						Die ->
-						    exit(controlled_suicide)
-					    end
-				    end),
-
-    ?line R2 = spawn(fun () ->
-			     M = erlang:monitor(process, L1),
-			     receive
-				 {'DOWN', M, process, L1, R} ->
-				     Self ! {self(), got_down_message, L1, R}
-			     end
-		     end),
-
-    ?line receive {L1, linked} -> ok end,
-    
+    R1 = spawn(fun () -> receive after infinity -> ok end end),
+    MR1 = erlang:monitor(process, R1),
+
+    {L1, ML1} = spawn_monitor(fun() ->
+                                      link(R1),
+                                      Self ! {self(), linked},
+                                      receive
+                                          Die ->
+                                              exit(controlled_suicide)
+                                      end
+                              end),
+
+    R2 = spawn(fun () ->
+                       M = erlang:monitor(process, L1),
+                       receive
+                           {'DOWN', M, process, L1, R} ->
+                               Self ! {self(), got_down_message, L1, R}
+                       end
+               end),
+
+    receive {L1, linked} -> ok end,
+
     Busy = make_busy(Node, 2000),
     receive after 100 -> ok end,
     L1 ! Die,
-    ?line receive
-	      {'DOWN', ML1, process, L1, RL1} ->
-		  ?line controlled_suicide = RL1
-	  end,
+    receive
+        {'DOWN', ML1, process, L1, RL1} ->
+            controlled_suicide = RL1
+    end,
     receive after 500 -> ok end,
     unmake_busy(Busy),
 
-    ?line receive
-	      {'DOWN', MR1, process, R1, RR1} ->
-		  ?line controlled_suicide = RR1
-	  end,
-    
-    ?line receive
-	      {R2, got_down_message, L1, RR2} ->
-		  ?line controlled_suicide = RR2
-	  end,
+    receive
+        {'DOWN', MR1, process, R1, RR1} ->
+            controlled_suicide = RR1
+    end,
+
+    receive
+        {R2, got_down_message, L1, RR2} ->
+            controlled_suicide = RR2
+    end,
 
     %% Done.
-    ?line stop_busy_dist_port_tracer(Tracer),
-    ?line stop_node(Node),
+    stop_busy_dist_port_tracer(Tracer),
+    stop_node(Node),
     ok.
 
 dummy_waiter() ->
     receive
     after infinity ->
-	    ok
+              ok
     end.
 
-link_to_dead(doc) ->
-    ["Test that linking to a dead remote process gives an EXIT message ",
-     "AND that the link is teared down."];
+%% Test that linking to a dead remote process gives an EXIT message
+%% AND that the link is teared down.
 link_to_dead(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line {ok, Node} = start_node(link_to_dead),
-%    ?line monitor_node(Node, true),
-    ?line net_adm:ping(Node), %% Ts_cross_server workaround.
-    ?line Pid = spawn(Node, ?MODULE, dead_process, []),
+    process_flag(trap_exit, true),
+    {ok, Node} = start_node(link_to_dead),
+    %    monitor_node(Node, true),
+    net_adm:ping(Node), %% Ts_cross_server workaround.
+    Pid = spawn(Node, ?MODULE, dead_process, []),
     receive
     after 5000 -> ok
     end,
-    ?line link(Pid),
-    ?line receive
-	      {'EXIT', Pid, noproc} ->
-		  ok;
-	      Other ->
-		  ?line test_server:fail({unexpected_message, Other})
-	  after 5000 ->
-		  ?line test_server:fail(nothing_received)
-	  end,
-    ?line {links, Links} = process_info(self(), links),
-    ?line io:format("Pid=~p, links=~p", [Pid, Links]),
-    ?line false = lists:member(Pid, Links),
-    ?line stop_node(Node),
-    ?line receive
-	      Message ->
-		  ?line test_server:fail({unexpected_message, Message})
-	  after 3000 ->
-		  ok
-	  end,
+    link(Pid),
+    receive
+        {'EXIT', Pid, noproc} ->
+            ok;
+        Other ->
+            ct:fail({unexpected_message, Other})
+    after 5000 ->
+              ct:fail(nothing_received)
+    end,
+    {links, Links} = process_info(self(), links),
+    io:format("Pid=~p, links=~p", [Pid, Links]),
+    false = lists:member(Pid, Links),
+    stop_node(Node),
+    receive
+        Message ->
+            ct:fail({unexpected_message, Message})
+    after 3000 ->
+              ok
+    end,
     ok.
-    
+
 dead_process() ->
     erlang:error(die).
 
-link_to_dead_new_node(doc) ->
-    ["Test that linking to a pid on node that has gone and restarted gives ",
-     "the correct EXIT message (OTP-2304)."];
+%% Test that linking to a pid on node that has gone and restarted gives
+%% the correct EXIT message (OTP-2304).
 link_to_dead_new_node(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
+    process_flag(trap_exit, true),
 
     %% Start the node, get a Pid and stop the node again.
-    ?line {ok, Node} = start_node(link_to_dead_new_node),
-    ?line Pid = spawn(Node, ?MODULE, dead_process, []),
-    ?line stop_node(Node),
+    {ok, Node} = start_node(link_to_dead_new_node),
+    Pid = spawn(Node, ?MODULE, dead_process, []),
+    stop_node(Node),
 
     %% Start a new node with the same name.
-    ?line {ok, Node} = start_node(link_to_dead_new_node),
-    ?line link(Pid),
-    ?line receive
-	      {'EXIT', Pid, noproc} ->
-		  ok;
-	      Other ->
-		  ?line test_server:fail({unexpected_message, Other})
-	  after 5000 ->
-		  ?line test_server:fail(nothing_received)
-	  end,
+    {ok, Node} = start_node(link_to_dead_new_node),
+    link(Pid),
+    receive
+        {'EXIT', Pid, noproc} ->
+            ok;
+        Other ->
+            ct:fail({unexpected_message, Other})
+    after 5000 ->
+              ct:fail(nothing_received)
+    end,
 
     %% Make sure that the link wasn't created.
-    ?line {links, Links} = process_info(self(), links),
-    ?line io:format("Pid=~p, links=~p", [Pid, Links]),
-    ?line false = lists:member(Pid, Links),
-    ?line stop_node(Node),
-    ?line receive
-	      Message ->
-		  ?line test_server:fail({unexpected_message, Message})
-	  after 3000 ->
-		  ok
-	  end,
+    {links, Links} = process_info(self(), links),
+    io:format("Pid=~p, links=~p", [Pid, Links]),
+    false = lists:member(Pid, Links),
+    stop_node(Node),
+    receive
+        Message ->
+            ct:fail({unexpected_message, Message})
+    after 3000 ->
+              ok
+    end,
     ok.
 
-applied_monitor_node(doc) ->
-    "Test that monitor_node/2 works when applied.";
+%% Test that monitor_node/2 works when applied.
 applied_monitor_node(Config) when is_list(Config) ->
-    ?line NonExisting = list_to_atom("__non_existing__@" ++ hostname()),
+    NonExisting = list_to_atom("__non_existing__@" ++ hostname()),
 
     %% Tail-recursive call to apply (since the node is non-existing,
     %% there will be a trap).
 
-    ?line true = tail_apply(erlang, monitor_node, [NonExisting, true]),
-    ?line [{nodedown, NonExisting}] = test_server:messages_get(),
+    true = tail_apply(erlang, monitor_node, [NonExisting, true]),
+    [{nodedown, NonExisting}] = test_server:messages_get(),
 
     %% Ordinary call (with trap).
 
-    ?line true = apply(erlang, monitor_node, [NonExisting, true]),
-    ?line [{nodedown, NonExisting}] = test_server:messages_get(),
-    
+    true = apply(erlang, monitor_node, [NonExisting, true]),
+    [{nodedown, NonExisting}] = test_server:messages_get(),
+
     ok.
 
 tail_apply(M, F, A) ->
     apply(M, F, A).
 
-ref_port_roundtrip(doc) ->
-    "Test that sending a port or reference to another node and back again "
-	"doesn't correct them in any way.";
+%% Test that sending a port or reference to another node and back again
+%% doesn't correct them in any way.
 ref_port_roundtrip(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line Port = open_port({spawn, efile}, []),
-    ?line Ref = make_ref(),
-    ?line {ok, Node} = start_node(ref_port_roundtrip),
-    ?line net_adm:ping(Node),
-    ?line Term = {Port, Ref},
-    ?line io:format("Term before: ~p", [show_term(Term)]),
-    ?line Pid = spawn_link(Node, ?MODULE, roundtrip, [Term]),
-    ?line receive after 5000 -> ok end,
-    ?line stop_node(Node),
-    ?line receive
-	      {'EXIT', Pid, {Port, Ref}} ->
-		  ?line io:format("Term after: ~p", [show_term(Term)]),
-		  ok;
-	      Other ->
-		  ?line io:format("Term after: ~p", [show_term(Term)]),
-		  ?line test_server:fail({unexpected, Other})
-	  after 10000 ->
-		  ?line test_server:fail(timeout)
-	  end,
+    process_flag(trap_exit, true),
+    Port = open_port({spawn, efile}, []),
+    Ref = make_ref(),
+    {ok, Node} = start_node(ref_port_roundtrip),
+    net_adm:ping(Node),
+    Term = {Port, Ref},
+    io:format("Term before: ~p", [show_term(Term)]),
+    Pid = spawn_link(Node, ?MODULE, roundtrip, [Term]),
+    receive after 5000 -> ok end,
+    stop_node(Node),
+    receive
+        {'EXIT', Pid, {Port, Ref}} ->
+            io:format("Term after: ~p", [show_term(Term)]),
+            ok;
+        Other ->
+            io:format("Term after: ~p", [show_term(Term)]),
+            ct:fail({unexpected, Other})
+    after 10000 ->
+              ct:fail(timeout)
+    end,
     ok.
 
 roundtrip(Term) ->
     exit(Term).
 
-nil_roundtrip(doc) ->
-    "Test that the smallest external term [] aka NIL can be sent to "
-	"another node node and back again.";
+%% Test that the smallest external term [] aka NIL can be sent to
+%% another node node and back again.
 nil_roundtrip(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line {ok, Node} = start_node(nil_roundtrip),
-    ?line net_adm:ping(Node),
-    ?line Pid = spawn_link(Node, ?MODULE, bounce, [self()]),
-    ?line Pid ! [],
-    ?line receive
-	      [] ->
-		  ?line receive
-			    {'EXIT', Pid, []} ->
-				?line stop_node(Node),
-				ok
-			end
-	  end.
+    process_flag(trap_exit, true),
+    {ok, Node} = start_node(nil_roundtrip),
+    net_adm:ping(Node),
+    Pid = spawn_link(Node, ?MODULE, bounce, [self()]),
+    Pid ! [],
+    receive
+        [] ->
+            receive
+                {'EXIT', Pid, []} ->
+                    stop_node(Node),
+                    ok
+            end
+    end.
 
 bounce(Dest) ->
     receive Msg ->
-	    Dest ! Msg,
-	    exit(Msg)
+                Dest ! Msg,
+                exit(Msg)
     end.
 
 show_term(Term) ->
     binary_to_list(term_to_binary(Term)).
 
-stop_dist(doc) ->
-    ["Tests behaviour after net_kernel:stop (OTP-2586)."];
+%% Tests behaviour after net_kernel:stop (OTP-2586).
 stop_dist(Config) when is_list(Config) ->
-    ?line Str = os:cmd(atom_to_list(lib:progname())
-		       ++ " -noshell -pa "
-		       ++ ?config(data_dir, Config)
-		       ++ " -s run"),
+    Str = os:cmd(atom_to_list(lib:progname())
+                 ++ " -noshell -pa "
+                 ++ proplists:get_value(data_dir, Config)
+                 ++ " -s run"),
     %% The "true" may be followed by an error report, so ignore anything that
     %% follows it.
-    ?line "true\n"++_ = Str,
+    "true\n"++_ = Str,
 
     %% "May fail on FreeBSD due to differently configured name lookup - ask Arndt",
     %% if you can find him.
@@ -770,37 +726,31 @@ stop_dist(Config) when is_list(Config) ->
     ok.
 
 
-trap_bif_1(doc) ->
-    [""];
 trap_bif_1(Config) when is_list(Config) ->
-    ?line {true} = tr1(),
+    {true} = tr1(),
     ok.
 
-trap_bif_2(doc) ->
-    [""];
 trap_bif_2(Config) when is_list(Config) ->
-    ?line {true} = tr2(),
+    {true} = tr2(),
     ok.
 
-trap_bif_3(doc) ->
-    [""];
 trap_bif_3(Config) when is_list(Config) ->
-    ?line {hoo} = tr3(),
+    {hoo} = tr3(),
     ok.
 
 tr1() ->
-    ?line NonExisting = 'abc@boromir',
-    ?line X = erlang:monitor_node(NonExisting, true),
+    NonExisting = 'abc@boromir',
+    X = erlang:monitor_node(NonExisting, true),
     {X}.
 
 tr2() ->
-    ?line NonExisting = 'abc@boromir',
-    ?line X = apply(erlang, monitor_node, [NonExisting, true]),
+    NonExisting = 'abc@boromir',
+    X = apply(erlang, monitor_node, [NonExisting, true]),
     {X}.
 
 tr3() ->
-    ?line NonExisting = 'abc@boromir',
-    ?line X = {NonExisting, glirp} ! hoo,
+    NonExisting = 'abc@boromir',
+    X = {NonExisting, glirp} ! hoo,
     {X}.
 
 
@@ -821,60 +771,61 @@ tr3() ->
 % * n2 gets pang when pinging n1
 % * n2 forces connection by using net_kernel:connect_node (ovverrides)
 % * n2 gets pong when pinging n1.
-dist_auto_connect_once(doc) -> "Test the dist_auto_connect once kernel parameter";
+
+%% Test the dist_auto_connect once kernel parameter
 dist_auto_connect_once(Config) when is_list(Config) ->
-    ?line Sock = start_relay_node(dist_auto_connect_relay_node,[]),
-    ?line NN = inet_rpc_nodename(Sock),
-    ?line Sock2 = start_relay_node(dist_auto_connect_once_node,
-				   "-kernel dist_auto_connect once"),
-    ?line NN2 = inet_rpc_nodename(Sock2),
-    ?line {ok,[]} = do_inet_rpc(Sock,erlang,nodes,[]),
-    ?line {ok, pong} = do_inet_rpc(Sock2,net_adm,ping,[NN]),
-    ?line {ok,[NN2]} = do_inet_rpc(Sock,erlang,nodes,[]),
-    ?line {ok,[NN]} = do_inet_rpc(Sock2,erlang,nodes,[]),
-    ?line [_,HostPartPeer] = string:tokens(atom_to_list(NN),"@"),
-    ?line [_,MyHostPart] = string:tokens(atom_to_list(node()),"@"),
+    Sock = start_relay_node(dist_auto_connect_relay_node,[]),
+    NN = inet_rpc_nodename(Sock),
+    Sock2 = start_relay_node(dist_auto_connect_once_node,
+                             "-kernel dist_auto_connect once"),
+    NN2 = inet_rpc_nodename(Sock2),
+    {ok,[]} = do_inet_rpc(Sock,erlang,nodes,[]),
+    {ok, pong} = do_inet_rpc(Sock2,net_adm,ping,[NN]),
+    {ok,[NN2]} = do_inet_rpc(Sock,erlang,nodes,[]),
+    {ok,[NN]} = do_inet_rpc(Sock2,erlang,nodes,[]),
+    [_,HostPartPeer] = string:tokens(atom_to_list(NN),"@"),
+    [_,MyHostPart] = string:tokens(atom_to_list(node()),"@"),
     % Give net_kernel a chance to change the state of the node to up to.
-    ?line receive after 1000 -> ok end,
+    receive after 1000 -> ok end,
     case HostPartPeer of
-	MyHostPart ->
-	    ?line ok = stop_relay_node(Sock),
-	    ?line {ok,pang} = do_inet_rpc(Sock2,net_adm,ping,[NN]);
-	_ ->
-	    ?line {ok, true} = do_inet_rpc(Sock,net_kernel,disconnect,[NN2]),
-	    receive
-	    after 500 -> ok
-	    end
+        MyHostPart ->
+            ok = stop_relay_node(Sock),
+            {ok,pang} = do_inet_rpc(Sock2,net_adm,ping,[NN]);
+        _ ->
+            {ok, true} = do_inet_rpc(Sock,net_kernel,disconnect,[NN2]),
+            receive
+            after 500 -> ok
+            end
     end,
-    ?line {ok, []} = do_inet_rpc(Sock2,erlang,nodes,[]),
+    {ok, []} = do_inet_rpc(Sock2,erlang,nodes,[]),
     Sock3 = case HostPartPeer of
-		MyHostPart ->
-		    ?line start_relay_node(dist_auto_connect_relay_node,[]);
-		_ ->
-		    Sock
-	    end,
-    ?line TS1 = timestamp(),
-    ?line {ok, pang} = do_inet_rpc(Sock2,net_adm,ping,[NN]),
-    ?line TS2 = timestamp(),
+                MyHostPart ->
+                    start_relay_node(dist_auto_connect_relay_node,[]);
+                _ ->
+                    Sock
+            end,
+    TS1 = timestamp(),
+    {ok, pang} = do_inet_rpc(Sock2,net_adm,ping,[NN]),
+    TS2 = timestamp(),
     RefT = net_kernel:connecttime() - 1000,
-    ?line true = ((TS2 - TS1) < RefT),
-    ?line TS3 = timestamp(),
-    ?line {ok, true} = do_inet_rpc(Sock2,erlang,monitor_node,
-				   [NN,true,[allow_passive_connect]]),
-    ?line TS4 = timestamp(),
-    ?line true = ((TS4 - TS3) > RefT),
-    ?line {ok, pong} = do_inet_rpc(Sock3,net_adm,ping,[NN2]),
-    ?line {ok, pong} = do_inet_rpc(Sock2,net_adm,ping,[NN]),
-    ?line {ok, true} = do_inet_rpc(Sock3,net_kernel,disconnect,[NN2]),
+    true = ((TS2 - TS1) < RefT),
+    TS3 = timestamp(),
+    {ok, true} = do_inet_rpc(Sock2,erlang,monitor_node,
+                             [NN,true,[allow_passive_connect]]),
+    TS4 = timestamp(),
+    true = ((TS4 - TS3) > RefT),
+    {ok, pong} = do_inet_rpc(Sock3,net_adm,ping,[NN2]),
+    {ok, pong} = do_inet_rpc(Sock2,net_adm,ping,[NN]),
+    {ok, true} = do_inet_rpc(Sock3,net_kernel,disconnect,[NN2]),
     receive
     after 500 -> ok
     end,
-    ?line {ok, pang} = do_inet_rpc(Sock2,net_adm,ping,[NN]),
-    ?line {ok, true} = do_inet_rpc(Sock2,net_kernel,connect_node,[NN]),
-    ?line {ok, pong} = do_inet_rpc(Sock2,net_adm,ping,[NN]),
-    ?line stop_relay_node(Sock3),
-    ?line stop_relay_node(Sock2).
-    
+    {ok, pang} = do_inet_rpc(Sock2,net_adm,ping,[NN]),
+    {ok, true} = do_inet_rpc(Sock2,net_kernel,connect_node,[NN]),
+    {ok, pong} = do_inet_rpc(Sock2,net_adm,ping,[NN]),
+    stop_relay_node(Sock3),
+    stop_relay_node(Sock2).
+
 
 
 %% Start a relay node and a lonely (dist_auto_connect never) node.
@@ -883,51 +834,51 @@ dist_auto_connect_once(Config) when is_list(Config) ->
 %% Result is sent here through relay node.
 dist_auto_connect_never(Config) when is_list(Config) ->
     Self = self(),
-    ?line {ok, RelayNode} = 
-	start_node(dist_auto_connect_relay),
-    ?line spawn(RelayNode, 
-	      fun() ->
-		      register(dist_auto_connect_relay, self()),
-		      dist_auto_connect_relay(Self) 
-	      end),
-    ?line {ok, Handle} = dist_auto_connect_start(dist_auto_connect, never),
-    ?line Result = 
-	receive
-	    {do_dist_auto_connect, ok} ->
-		ok;
-	    {do_dist_auto_connect, Error} ->
-		{error, Error};
-	    Other ->
-		{error, Other}
-	after 32000 ->
-		timeout
-	end,
-    ?line stop_node(RelayNode),
-    ?line Stopped =  dist_auto_connect_stop(Handle),
-    ?line Junk = 
-	receive 
-	    {do_dist_auto_connect, _} = J -> 
-		J 
-	after 0 -> 
-		ok 
-	end,
-    ?line {ok, ok, ok} = {Result, Stopped, Junk},
+    {ok, RelayNode} = 
+    start_node(dist_auto_connect_relay),
+    spawn(RelayNode, 
+          fun() ->
+                  register(dist_auto_connect_relay, self()),
+                  dist_auto_connect_relay(Self) 
+          end),
+    {ok, Handle} = dist_auto_connect_start(dist_auto_connect, never),
+    Result = 
+    receive
+        {do_dist_auto_connect, ok} ->
+            ok;
+        {do_dist_auto_connect, Error} ->
+            {error, Error};
+        Other ->
+            {error, Other}
+    after 32000 ->
+              timeout
+    end,
+    stop_node(RelayNode),
+    Stopped =  dist_auto_connect_stop(Handle),
+    Junk = 
+    receive 
+        {do_dist_auto_connect, _} = J -> 
+            J 
+    after 0 -> 
+              ok 
+    end,
+    {ok, ok, ok} = {Result, Stopped, Junk},
     ok.
 
 
 do_dist_auto_connect([never]) ->
     Node = list_to_atom("dist_auto_connect_relay@" ++ hostname()),
     io:format("~p:do_dist_auto_connect([false]) Node=~p~n", 
-	      [?MODULE, Node]),
+              [?MODULE, Node]),
     Ping = net_adm:ping(Node),
     io:format("~p:do_dist_auto_connect([false]) Ping=~p~n", 
-	      [?MODULE, Ping]),
+              [?MODULE, Ping]),
     Result = case Ping of
-		 pang -> ok;
-		 _ -> {error, Ping}
-	     end,
+                 pang -> ok;
+                 _ -> {error, Ping}
+             end,
     io:format("~p:do_dist_auto_connect([false]) Result=~p~n", 
-	      [?MODULE, Result]),
+              [?MODULE, Result]),
     net_kernel:connect_node(Node),
     catch {dist_auto_connect_relay, Node} ! {do_dist_auto_connect, Result};
 %    receive after 1000 -> ok end,
@@ -935,10 +886,10 @@ do_dist_auto_connect([never]) ->
 
 do_dist_auto_connect(Arg) ->
     io:format("~p:do_dist_auto_connect(~p)~n", 
-	      [?MODULE, Arg]),
+              [?MODULE, Arg]),
     receive after 10000 -> ok end,
     halt().
-	    
+
 
 dist_auto_connect_start(Name, Value) when is_atom(Name) ->
     dist_auto_connect_start(atom_to_list(Name), Value);
@@ -948,16 +899,16 @@ dist_auto_connect_start(Name, Value) when is_list(Name), is_atom(Value) ->
     ValueStr = atom_to_list(Value),
     Cookie = atom_to_list(erlang:get_cookie()),
     Cmd = lists:concat(
-	    [%"xterm -e ",
-	     atom_to_list(lib:progname()),
-%	     " -noinput ",
-	     " -detached ", 
-	     long_or_short(), " ", Name,
-	     " -setcookie ", Cookie,
-	     " -pa ", ModuleDir,
-	     " -s ", atom_to_list(?MODULE), 
-	     " do_dist_auto_connect ", ValueStr,
-	     " -kernel dist_auto_connect ", ValueStr]),
+            [%"xterm -e ",
+             atom_to_list(lib:progname()),
+             %	     " -noinput ",
+             " -detached ", 
+             long_or_short(), " ", Name,
+             " -setcookie ", Cookie,
+             " -pa ", ModuleDir,
+             " -s ", atom_to_list(?MODULE), 
+             " do_dist_auto_connect ", ValueStr,
+             " -kernel dist_auto_connect ", ValueStr]),
     io:format("~p:dist_auto_connect_start() cmd: ~p~n", [?MODULE, Cmd]),
     Port = open_port({spawn, Cmd}, [stream]),
     {ok, {Port, Node}}.
@@ -975,102 +926,83 @@ dist_auto_connect_stop(Port, _Node, Pid, N) when is_integer(N), N =< 0 ->
     Result;
 dist_auto_connect_stop(Port, Node, Pid, N) when is_integer(N) ->
     case net_adm:ping(Node) of
-	pong ->
-	    receive after 100 -> ok end,
-	    dist_auto_connect_stop(Port, Node, Pid, N-100);
-	pang ->
-	    exit(Pid, normal),
-	    catch erlang:port_close(Port),
-	    io:format("~p:dist_auto_connect_stop() ok~n", [?MODULE]),
-	    ok
+        pong ->
+            receive after 100 -> ok end,
+            dist_auto_connect_stop(Port, Node, Pid, N-100);
+        pang ->
+            exit(Pid, normal),
+            catch erlang:port_close(Port),
+            io:format("~p:dist_auto_connect_stop() ok~n", [?MODULE]),
+            ok
     end.
 
 
 dist_auto_connect_relay(Parent) ->	    
     receive X ->
-	    catch Parent ! X
+                catch Parent ! X
     end,
     dist_auto_connect_relay(Parent).
 
 
-dist_parallel_send(doc) ->
-    [];
-dist_parallel_send(suite) ->
-    [];
 dist_parallel_send(Config) when is_list(Config) ->
-    ?line {ok, RNode} = start_node(dist_parallel_receiver),
-    ?line {ok, SNode} = start_node(dist_parallel_sender),
-    ?line WatchDog = spawn_link(
-		       fun () ->
-			       TRef = erlang:start_timer((?DEFAULT_TIMETRAP
-							  div 2),
-							 self(),
-							 oops),
-			       receive
-				   {timeout, TRef, _ } ->
-				       spawn(SNode,
-					     fun () ->
-						     abort(timeout)
-					     end),
-				       spawn(RNode,
-					     fun () ->
-						     abort(timeout)
-					     end)
-%%				       rpc:cast(SNode, erlang, halt,
-%%						["Timetrap (sender)"]),
-%%				       rpc:cast(RNode, erlang, halt,
-%%						["Timetrap (receiver)"])
-			       end
-		       end),
-    ?line MkSndrs = fun (Receiver) ->
-			    lists:map(fun (_) ->
-					      spawn_link(SNode,
-							 ?MODULE,
-							 dist_parallel_sender,
-							 [self(),
-							  Receiver,
-							  1000])
-				      end,
-				      lists:seq(1, 64))
-		    end,
-    ?line SndrsStart = fun (Sndrs) ->
-			       Parent = self(),
-			       spawn_link(
-				 SNode,
-				 fun () ->
-					 lists:foreach(fun (P) ->
-							       P ! {go, Parent}
-						       end,
-						       Sndrs)
-				 end)
-		       end,
-    ?line SndrsWait = fun (Sndrs) ->
-			      lists:foreach(fun (P) ->
-						    receive {P, done} -> ok end
-					    end,
-					    Sndrs)
-		      end,
-    ?line DPR = spawn_link(RNode, ?MODULE, dist_parallel_receiver, []),
-    ?line Sndrs1 = MkSndrs(DPR),
-    ?line SndrsStart(Sndrs1),
-    ?line SndrsWait(Sndrs1),
-    ?line unlink(DPR),
-    ?line exit(DPR, bang),
-
-    ?line DEPR = spawn_link(RNode, ?MODULE, dist_evil_parallel_receiver, []),
-    ?line Sndrs2 = MkSndrs(DEPR),
-    ?line SndrsStart(Sndrs2),
-    ?line SndrsWait(Sndrs2),
-    ?line unlink(DEPR),
-    ?line exit(DEPR, bang),
-
-    ?line unlink(WatchDog),
-    ?line exit(WatchDog, bang),
-
-    ?line stop_node(RNode),
-    ?line stop_node(SNode),
-
-    ?line ok.
+    {ok, RNode} = start_node(dist_parallel_receiver),
+    {ok, SNode} = start_node(dist_parallel_sender),
+    WatchDog = spawn_link(
+                 fun () ->
+                         TRef = erlang:start_timer((2*60*1000), self(), oops),
+                         receive
+                             {timeout, TRef, _ } ->
+                                 spawn(SNode, fun () -> abort(timeout) end),
+                                 spawn(RNode, fun () -> abort(timeout) end)
+                                 %%       rpc:cast(SNode, erlang, halt,
+                                 %%		["Timetrap (sender)"]),
+                                 %%       rpc:cast(RNode, erlang, halt,
+                                 %%		["Timetrap (receiver)"])
+                         end
+                 end),
+    MkSndrs = fun (Receiver) ->
+                      lists:map(fun (_) ->
+                                        spawn_link(SNode,
+                                                   ?MODULE,
+                                                   dist_parallel_sender,
+                                                   [self(), Receiver, 1000])
+                                end, lists:seq(1, 64))
+              end,
+    SndrsStart = fun (Sndrs) ->
+                         Parent = self(),
+                         spawn_link(SNode,
+                           fun () ->
+                                   lists:foreach(fun (P) ->
+                                                         P ! {go, Parent}
+                                                 end, Sndrs)
+                           end)
+                 end,
+    SndrsWait = fun (Sndrs) ->
+                        lists:foreach(fun (P) ->
+                                              receive {P, done} -> ok end
+                                      end, Sndrs)
+                end,
+    DPR = spawn_link(RNode, ?MODULE, dist_parallel_receiver, []),
+    Sndrs1 = MkSndrs(DPR),
+    SndrsStart(Sndrs1),
+    SndrsWait(Sndrs1),
+    unlink(DPR),
+    exit(DPR, bang),
+
+    DEPR = spawn_link(RNode, ?MODULE, dist_evil_parallel_receiver, []),
+    Sndrs2 = MkSndrs(DEPR),
+    SndrsStart(Sndrs2),
+    SndrsWait(Sndrs2),
+    unlink(DEPR),
+    exit(DEPR, bang),
+
+    unlink(WatchDog),
+    exit(WatchDog, bang),
+
+    stop_node(RNode),
+    stop_node(SNode),
+
+    ok.
 
 do_dist_parallel_sender(Parent, _Receiver, 0) ->
     Parent ! {self(), done};
@@ -1092,71 +1024,72 @@ dist_evil_parallel_receiver() ->
     dist_evil_parallel_receiver().
 
 atom_roundtrip(Config) when is_list(Config) ->
-    ?line AtomData = atom_data(),
-    ?line verify_atom_data(AtomData),
-    ?line {ok, Node} = start_node(Config),
-    ?line do_atom_roundtrip(Node, AtomData),
-    ?line stop_node(Node),
-    ?line ok.
+    AtomData = atom_data(),
+    verify_atom_data(AtomData),
+    {ok, Node} = start_node(Config),
+    do_atom_roundtrip(Node, AtomData),
+    stop_node(Node),
+    ok.
 
 atom_roundtrip_r15b(Config) when is_list(Config) ->
-    case ?t:is_release_available("r15b") of
-	true ->
-	    ?line AtomData = atom_data(),
-	    ?line verify_atom_data(AtomData),
-	    ?line {ok, Node} = start_node(Config, [], "r15b"),
-	    ?line do_atom_roundtrip(Node, AtomData),
-	    ?line stop_node(Node),
-	    ?line ok;
-	false ->
-	    ?line {skip,"No OTP R15B available"}
+    case test_server:is_release_available("r15b") of
+        true ->
+            ct:timetrap({minutes, 6}),
+            AtomData = atom_data(),
+            verify_atom_data(AtomData),
+            {ok, Node} = start_node(Config, [], "r15b"),
+            do_atom_roundtrip(Node, AtomData),
+            stop_node(Node),
+            ok;
+        false ->
+            {skip,"No OTP R15B available"}
     end.
 
 unicode_atom_roundtrip(Config) when is_list(Config) ->
-    ?line AtomData = unicode_atom_data(),
-    ?line verify_atom_data(AtomData),
-    ?line {ok, Node} = start_node(Config),
-    ?line do_atom_roundtrip(Node, AtomData),
-    ?line stop_node(Node),
-    ?line ok.
+    AtomData = unicode_atom_data(),
+    verify_atom_data(AtomData),
+    {ok, Node} = start_node(Config),
+    do_atom_roundtrip(Node, AtomData),
+    stop_node(Node),
+    ok.
 
 do_atom_roundtrip(Node, AtomData) ->
-    ?line Parent = self(),
-    ?line Proc = spawn_link(Node, fun () -> verify_atom_data_loop(Parent) end),
-    ?line Proc ! {self(), AtomData},
-    ?line receive {Proc, AD1} -> AtomData = AD1 end,
-    ?line Proc ! {self(), AtomData},
-    ?line receive {Proc, AD2} -> AtomData = AD2 end,
-    ?line RevAtomData = lists:reverse(AtomData),
-    ?line Proc ! {self(), RevAtomData},
-    ?line receive {Proc, RAD1} -> RevAtomData = RAD1 end,
-    ?line unlink(Proc),
-    ?line exit(Proc, bang),
-    ?line ok.
+    Parent = self(),
+    Proc = spawn_link(Node, fun () -> verify_atom_data_loop(Parent) end),
+    Proc ! {self(), AtomData},
+    receive {Proc, AD1} -> AtomData = AD1 end,
+    Proc ! {self(), AtomData},
+    receive {Proc, AD2} -> AtomData = AD2 end,
+    RevAtomData = lists:reverse(AtomData),
+    Proc ! {self(), RevAtomData},
+    receive {Proc, RAD1} -> RevAtomData = RAD1 end,
+    unlink(Proc),
+    exit(Proc, bang),
+    ok.
 
 verify_atom_data_loop(From) ->
     receive
-	{From, AtomData} ->
-	    verify_atom_data(AtomData),
-	    From ! {self(), AtomData},
-	    verify_atom_data_loop(From)
+        {From, AtomData} ->
+            verify_atom_data(AtomData),
+            From ! {self(), AtomData},
+            verify_atom_data_loop(From)
     end.
 
 atom_data() ->
     lists:map(fun (N) ->
-		      ATxt = "a"++integer_to_list(N),
-		      {list_to_atom(ATxt), ATxt}
-	      end,
-	      lists:seq(1, 2000)).
+                      ATxt = "a"++integer_to_list(N),
+                      {list_to_atom(ATxt), ATxt}
+              end,
+              lists:seq(1, 2000)).
 
 verify_atom_data(AtomData) ->
     lists:foreach(fun ({Atom, AtomTxt}) when is_atom(Atom) ->
-			  AtomTxt = atom_to_list(Atom);
-		      ({PPR, AtomTxt}) ->
-			  % Pid, Port, or Ref
-			  AtomTxt = atom_to_list(node(PPR))
-		  end,
-		  AtomData).
+                          AtomTxt = atom_to_list(Atom);
+                      ({PPR, AtomTxt}) ->
+                          % Pid, Port, or Ref
+                          AtomTxt = atom_to_list(node(PPR))
+                  end,
+                  AtomData).
 
 uc_atom_tup(ATxt) ->
     Atom = string_to_atom(ATxt),
@@ -1209,9 +1142,8 @@ unicode_atom_data() ->
      uc_atom_tup(lists:seq(65500, 65754)),
      uc_atom_tup(lists:seq(65500, 65563))
      | lists:map(fun (N) ->
-			 uc_atom_tup(lists:seq(64000+N, 64254+N))
-		 end,
-		 lists:seq(1, 2000))].
+                         uc_atom_tup(lists:seq(64000+N, 64254+N))
+                 end, lists:seq(1, 2000))].
 
 contended_atom_cache_entry(Config) when is_list(Config) ->
     contended_atom_cache_entry_test(Config, latin1).
@@ -1220,79 +1152,77 @@ contended_unicode_atom_cache_entry(Config) when is_list(Config) ->
     contended_atom_cache_entry_test(Config, unicode).
 
 contended_atom_cache_entry_test(Config, Type) ->
-    ?line TestServer = self(),
-    ?line ProcessPairs = 10,
-    ?line Msgs = 100000,
-    ?line {ok, SNode} = start_node(Config),
-    ?line {ok, RNode} = start_node(Config),
-    ?line Success = make_ref(),
-    ?line spawn_link(
-	    SNode,
-	    fun () ->
-		    erts_debug:set_internal_state(available_internal_state,
-						  true),
-		    Master = self(),
-		    CIX = get_cix(),
-		    TestAtoms = case Type of
-				    latin1 ->
-					get_conflicting_atoms(CIX,
-							      ProcessPairs);
-				    unicode ->
-					get_conflicting_unicode_atoms(CIX,
-								      ProcessPairs)
-				end,
-		    io:format("Testing with the following atoms all using "
-			      "cache index ~p:~n ~w~n",
-			      [CIX, TestAtoms]),
-		    Ps = lists:map(
-			   fun (A) ->
-				   Ref = make_ref(),
-				   R = spawn_link(
-					 RNode,
-					 fun () ->
-						 Atom = receive
-							    {Ref, txt, ATxt} ->
-								case Type of
-								    latin1 ->
-									list_to_atom(ATxt);
-								    unicode ->
-									string_to_atom(ATxt)
-								end
-							end,
-						 receive_ref_atom(Ref,
-								  Atom,
-								  Msgs),
-						 Master ! {self(), success}
-					 end),
-				   S = spawn_link(
-					 SNode,
-					 fun () ->
-						 receive go -> ok end,
-						 R ! {Ref,
-						      txt,
-						      atom_to_list(A)},
-						 send_ref_atom(R, Ref, A, Msgs)
-					 end),
-				   {S, R}
-			   end,
-			   TestAtoms),
-		    lists:foreach(fun ({S, _}) ->
-					  S ! go
-				  end,
-				  Ps),
-		    lists:foreach(fun ({_, R}) ->
-					  receive {R, success} -> ok end
-				  end,
-				  Ps),
-		    TestServer ! Success
-	    end),
-    ?line receive
-	      Success ->
-		  ok
-	  end,
-    ?line stop_node(SNode),
-    ?line stop_node(RNode),
-    ?line ok.
+    TestServer = self(),
+    ProcessPairs = 10,
+    Msgs = 100000,
+    {ok, SNode} = start_node(Config),
+    {ok, RNode} = start_node(Config),
+    Success = make_ref(),
+    spawn_link(
+      SNode,
+      fun () ->
+              erts_debug:set_internal_state(available_internal_state,
+                                            true),
+              Master = self(),
+              CIX = get_cix(),
+              TestAtoms = case Type of
+                              latin1 ->
+                                  get_conflicting_atoms(CIX,
+                                                        ProcessPairs);
+                              unicode ->
+                                  get_conflicting_unicode_atoms(CIX,
+                                                                ProcessPairs)
+                          end,
+              io:format("Testing with the following atoms all using "
+                        "cache index ~p:~n ~w~n",
+                        [CIX, TestAtoms]),
+              Ps = lists:map(
+                     fun (A) ->
+                             Ref = make_ref(),
+                             R = spawn_link(RNode,
+                                   fun () ->
+                                           Atom = receive
+                                                      {Ref, txt, ATxt} ->
+                                                          case Type of
+                                                              latin1 ->
+                                                                  list_to_atom(ATxt);
+                                                              unicode ->
+                                                                  string_to_atom(ATxt)
+                                                          end
+                                                  end,
+                                           receive_ref_atom(Ref,
+                                                            Atom,
+                                                            Msgs),
+                                           Master ! {self(), success}
+                                   end),
+                             S = spawn_link(SNode,
+                                   fun () ->
+                                           receive go -> ok end,
+                                           R ! {Ref,
+                                                txt,
+                                                atom_to_list(A)},
+                                           send_ref_atom(R, Ref, A, Msgs)
+                                   end),
+                             {S, R}
+                     end,
+                     TestAtoms),
+              lists:foreach(fun ({S, _}) ->
+                                    S ! go
+                            end,
+                            Ps),
+              lists:foreach(fun ({_, R}) ->
+                                    receive {R, success} -> ok end
+                            end,
+                            Ps),
+              TestServer ! Success
+      end),
+    receive
+        Success ->
+            ok
+    end,
+    stop_node(SNode),
+    stop_node(RNode),
+    ok.
 
 send_ref_atom(_To, _Ref, _Atom, 0) ->
     ok;
@@ -1304,11 +1234,11 @@ receive_ref_atom(_Ref, _Atom, 0) ->
     ok;
 receive_ref_atom(Ref, Atom, N) ->
     receive
-	{Ref, Value} ->
-	    Atom = Value
+        {Ref, Value} ->
+            Atom = Value
     end,
     receive_ref_atom(Ref, Atom, N-1).
-      
+
 get_cix() ->
     get_cix(1000).
 
@@ -1316,34 +1246,34 @@ get_cix(CIX) when is_integer(CIX), CIX < 0 ->
     get_cix(0);
 get_cix(CIX) when is_integer(CIX) ->
     get_cix(CIX,
-	    unwanted_cixs(),
-	    erts_debug:get_internal_state(max_atom_out_cache_index)).
+            unwanted_cixs(),
+            erts_debug:get_internal_state(max_atom_out_cache_index)).
 
 get_cix(CIX, Unwanted, MaxCIX) when CIX > MaxCIX ->
     get_cix(0, Unwanted, MaxCIX);
 get_cix(CIX, Unwanted, MaxCIX) ->
     case lists:member(CIX, Unwanted) of
-	true -> get_cix(CIX+1, Unwanted, MaxCIX);
-	false -> CIX
+        true -> get_cix(CIX+1, Unwanted, MaxCIX);
+        false -> CIX
     end.
 
 unwanted_cixs() ->
     lists:map(fun (Node) ->
-		      erts_debug:get_internal_state({atom_out_cache_index,
-						     Node})
-	      end,
-	      nodes()).
-    
-    
+                      erts_debug:get_internal_state({atom_out_cache_index,
+                                                     Node})
+              end,
+              nodes()).
+
+
 get_conflicting_atoms(_CIX, 0) ->
     [];
 get_conflicting_atoms(CIX, N) ->
     Atom = list_to_atom("atom" ++ integer_to_list(erlang:unique_integer([positive]))),
     case erts_debug:get_internal_state({atom_out_cache_index, Atom}) of
-	CIX ->
-	    [Atom|get_conflicting_atoms(CIX, N-1)];
-	_ ->
-	    get_conflicting_atoms(CIX, N)
+        CIX ->
+            [Atom|get_conflicting_atoms(CIX, N-1)];
+        _ ->
+            get_conflicting_atoms(CIX, N)
     end.
 
 get_conflicting_unicode_atoms(_CIX, 0) ->
@@ -1351,10 +1281,10 @@ get_conflicting_unicode_atoms(_CIX, 0) ->
 get_conflicting_unicode_atoms(CIX, N) ->
     Atom = string_to_atom([16#1f608] ++ "atom" ++ integer_to_list(erlang:unique_integer([positive]))),
     case erts_debug:get_internal_state({atom_out_cache_index, Atom}) of
-	CIX ->
-	    [Atom|get_conflicting_unicode_atoms(CIX, N-1)];
-	_ ->
-	    get_conflicting_unicode_atoms(CIX, N)
+        CIX ->
+            [Atom|get_conflicting_unicode_atoms(CIX, N-1)];
+        _ ->
+            get_conflicting_unicode_atoms(CIX, N)
     end.
 
 -define(COOKIE, '').
@@ -1376,482 +1306,474 @@ get_conflicting_unicode_atoms(CIX, N) ->
 -define(DOP_MONITOR_P_EXIT,	21).
 
 start_monitor(Offender,P) ->
-    ?line Parent = self(),
-    ?line Q = spawn(Offender,
-		    fun () -> 
-			    Ref = erlang:monitor(process,P),
-			    Parent ! {self(),ref,Ref},
-			    receive
-				just_stay_alive -> ok
-			    end
-		    end),
-    ?line Ref = receive
-		    {Q,ref,R} ->
-			R
-		after  5000 ->
-			error
-		end,
+    Parent = self(),
+    Q = spawn(Offender,
+              fun () -> 
+                      Ref = erlang:monitor(process,P),
+                      Parent ! {self(),ref,Ref},
+                      receive
+                          just_stay_alive -> ok
+                      end
+              end),
+    Ref = receive
+              {Q,ref,R} ->
+                  R
+          after  5000 ->
+                     error
+          end,
     io:format("Ref is ~p~n",[Ref]),
     ok.
 start_link(Offender,P) ->
-    ?line Parent = self(),
-    ?line Q = spawn(Offender,
-		    fun () ->
-			    process_flag(trap_exit,true),
-			    link(P),
-			    Parent ! {self(),ref,P},
-			    receive
-				just_stay_alive -> ok
-			    end
-		    end),
-    ?line Ref = receive
-		    {Q,ref,R} ->
-			R
-		after  5000 ->
-			error
-		end,
+    Parent = self(),
+    Q = spawn(Offender,
+              fun () ->
+                      process_flag(trap_exit,true),
+                      link(P),
+                      Parent ! {self(),ref,P},
+                      receive
+                          just_stay_alive -> ok
+                      end
+              end),
+    Ref = receive
+              {Q,ref,R} ->
+                  R
+          after  5000 ->
+                     error
+          end,
     io:format("Ref is ~p~n",[Ref]),
     ok.
 
-bad_dist_structure(suite) ->
-    [];
-bad_dist_structure(doc) ->
-    ["Test dist messages with valid structure (binary to term ok) but malformed"
-     "control content"];
+%% Test dist messages with valid structure (binary to term ok) but malformed control content
 bad_dist_structure(Config) when is_list(Config) ->
-    %process_flag(trap_exit,true),
-    ODog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(ODog),
-    Dog = ?t:timetrap(?t:seconds(15)),
-
-    ?line {ok, Offender} = start_node(bad_dist_structure_offender),
-    ?line {ok, Victim} = start_node(bad_dist_structure_victim),
-    ?line start_node_monitors([Offender,Victim]),
-    ?line Parent = self(),
-    ?line P = spawn(Victim,
-		    fun () ->
-			    process_flag(trap_exit,true),
-			    Parent ! {self(), started},
-			    receive check_msgs -> ok end,
-			    bad_dist_struct_check_msgs([one,
-							two]),
-			    Parent ! {self(), messages_checked},
-			    receive done -> ok end
-		    end),
-    ?line receive {P, started} -> ok end,
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line verify_up(Offender, Victim),
-    ?line true = lists:member(Offender, rpc:call(Victim, erlang, nodes, [])),
-    ?line start_monitor(Offender,P),
-    ?line P ! one,
-    ?line send_bad_structure(Offender, P,{?DOP_MONITOR_P_EXIT,'replace',P,normal},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line start_monitor(Offender,P),
-    ?line send_bad_structure(Offender, P,{?DOP_MONITOR_P_EXIT,'replace',P,normal,normal},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line start_link(Offender,P),
-    ?line send_bad_structure(Offender, P,{?DOP_LINK},0),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line start_link(Offender,P),
-    ?line send_bad_structure(Offender, P,{?DOP_UNLINK,'replace'},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line start_link(Offender,P),
-    ?line send_bad_structure(Offender, P,{?DOP_UNLINK,'replace',make_ref()},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line start_link(Offender,P),
-    ?line send_bad_structure(Offender, P,{?DOP_UNLINK,make_ref(),P},0),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line start_link(Offender,P),
-    ?line send_bad_structure(Offender, P,{?DOP_UNLINK,normal,normal},0),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line start_monitor(Offender,P),
-    ?line send_bad_structure(Offender, P,{?DOP_MONITOR_P,'replace',P},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line start_monitor(Offender,P),
-    ?line send_bad_structure(Offender, P,{?DOP_MONITOR_P,'replace',P,normal},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line start_monitor(Offender,P),
-    ?line send_bad_structure(Offender, P,{?DOP_DEMONITOR_P,'replace',P},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line start_monitor(Offender,P),
-    ?line send_bad_structure(Offender, P,{?DOP_DEMONITOR_P,'replace',P,normal},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_EXIT,'replace',P},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_EXIT,make_ref(),normal,normal},0),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_EXIT_TT,'replace',token,P},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_EXIT_TT,make_ref(),token,normal,normal},0),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_EXIT2,'replace',P},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_EXIT2,make_ref(),normal,normal},0),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_EXIT2_TT,'replace',token,P},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_EXIT2_TT,make_ref(),token,normal,normal},0),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_GROUP_LEADER,'replace'},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_GROUP_LEADER,'replace','atomic'},2),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_GROUP_LEADER,'replace',P},0),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_REG_SEND_TT,'replace','',name},2,{message}),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_REG_SEND_TT,'replace','',name,token},0,{message}),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace',''},2,{message}),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace','',P},0,{message}),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace','',name},0,{message}),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace','',name,{token}},2,{message}),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_SEND_TT,'',P},0,{message}),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_SEND_TT,'',name,token},0,{message}),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_SEND,''},0,{message}),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_SEND,'',name},0,{message}),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line send_bad_structure(Offender, P,{?DOP_SEND,'',P,{token}},0,{message}),
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line P ! two,
-    ?line P ! check_msgs,
-    ?line receive 
-	      {P, messages_checked} -> ok 
-	  after 5000 ->
-		  exit(victim_is_dead)
-	  end,
-
-    ?line {message_queue_len, 0}
-	= rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
-    
-    ?line unlink(P),
-    ?line P ! done,
-    ?line stop_node(Offender),
-    ?line stop_node(Victim),
-    ?t:timetrap_cancel(Dog),
+    ct:timetrap({seconds, 15}),
+
+    {ok, Offender} = start_node(bad_dist_structure_offender),
+    {ok, Victim} = start_node(bad_dist_structure_victim),
+    start_node_monitors([Offender,Victim]),
+    Parent = self(),
+    P = spawn(Victim,
+              fun () ->
+                      process_flag(trap_exit,true),
+                      Parent ! {self(), started},
+                      receive check_msgs -> ok end,
+                      bad_dist_struct_check_msgs([one,
+                                                  two]),
+                      Parent ! {self(), messages_checked},
+                      receive done -> ok end
+              end),
+    receive {P, started} -> ok end,
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    verify_up(Offender, Victim),
+    true = lists:member(Offender, rpc:call(Victim, erlang, nodes, [])),
+    start_monitor(Offender,P),
+    P ! one,
+    send_bad_structure(Offender, P,{?DOP_MONITOR_P_EXIT,'replace',P,normal},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    start_monitor(Offender,P),
+    send_bad_structure(Offender, P,{?DOP_MONITOR_P_EXIT,'replace',P,normal,normal},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    start_link(Offender,P),
+    send_bad_structure(Offender, P,{?DOP_LINK},0),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    start_link(Offender,P),
+    send_bad_structure(Offender, P,{?DOP_UNLINK,'replace'},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    start_link(Offender,P),
+    send_bad_structure(Offender, P,{?DOP_UNLINK,'replace',make_ref()},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    start_link(Offender,P),
+    send_bad_structure(Offender, P,{?DOP_UNLINK,make_ref(),P},0),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    start_link(Offender,P),
+    send_bad_structure(Offender, P,{?DOP_UNLINK,normal,normal},0),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    start_monitor(Offender,P),
+    send_bad_structure(Offender, P,{?DOP_MONITOR_P,'replace',P},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    start_monitor(Offender,P),
+    send_bad_structure(Offender, P,{?DOP_MONITOR_P,'replace',P,normal},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    start_monitor(Offender,P),
+    send_bad_structure(Offender, P,{?DOP_DEMONITOR_P,'replace',P},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    start_monitor(Offender,P),
+    send_bad_structure(Offender, P,{?DOP_DEMONITOR_P,'replace',P,normal},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_EXIT,'replace',P},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_EXIT,make_ref(),normal,normal},0),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_EXIT_TT,'replace',token,P},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_EXIT_TT,make_ref(),token,normal,normal},0),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_EXIT2,'replace',P},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_EXIT2,make_ref(),normal,normal},0),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_EXIT2_TT,'replace',token,P},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_EXIT2_TT,make_ref(),token,normal,normal},0),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_GROUP_LEADER,'replace'},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_GROUP_LEADER,'replace','atomic'},2),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_GROUP_LEADER,'replace',P},0),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_REG_SEND_TT,'replace','',name},2,{message}),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_REG_SEND_TT,'replace','',name,token},0,{message}),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace',''},2,{message}),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace','',P},0,{message}),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace','',name},0,{message}),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_REG_SEND,'replace','',name,{token}},2,{message}),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_SEND_TT,'',P},0,{message}),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_SEND_TT,'',name,token},0,{message}),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_SEND,''},0,{message}),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_SEND,'',name},0,{message}),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    send_bad_structure(Offender, P,{?DOP_SEND,'',P,{token}},0,{message}),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    P ! two,
+    P ! check_msgs,
+    receive 
+        {P, messages_checked} -> ok 
+    after 5000 ->
+              exit(victim_is_dead)
+    end,
+
+    {message_queue_len, 0}
+    = rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
+
+    unlink(P),
+    P ! done,
+    stop_node(Offender),
+    stop_node(Victim),
     ok.
 
 
 
 bad_dist_ext_receive(Config) when is_list(Config) ->
-    ?line {ok, Offender} = start_node(bad_dist_ext_receive_offender),
-    ?line {ok, Victim} = start_node(bad_dist_ext_receive_victim),
-    ?line start_node_monitors([Offender,Victim]),
-
-    ?line Parent = self(),
-
-    ?line P = spawn_link(Victim,
-			 fun () ->
-				 Parent ! {self(), started},
-				 receive check_msgs -> ok end,
-				 bad_dist_ext_check_msgs([one,
-							  two,
-							  three]),
-				 Parent ! {self(), messages_checked},
-				 receive done -> ok end
-			 end),
-
-    ?line receive {P, started} -> ok end,
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line verify_up(Offender, Victim),
-    ?line true = lists:member(Offender, rpc:call(Victim, erlang, nodes, [])),
-    ?line P ! one,
-    ?line send_bad_msg(Offender, P),
-    ?line P ! two,
-    ?line verify_down(Offender, connection_closed, Victim, killed),
-    ?line {message_queue_len, 2}
-	= rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
-
-    ?line Suspended = make_ref(),
-    ?line S = spawn(Victim,
-		     fun () ->
-			     erlang:suspend_process(P),
-			     Parent ! Suspended,
-			     receive after infinity -> ok end
-		     end),
-    ?line MS = erlang:monitor(process, S),
-    ?line receive Suspended -> ok end,
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line verify_up(Offender, Victim),
-    ?line true = lists:member(Offender, rpc:call(Victim, erlang, nodes, [])),
-    ?line send_bad_msgs(Offender, P, 5),
-    ?line true = lists:member(Offender, rpc:call(Victim, erlang, nodes, [])),
-    ?line P ! three,
-    ?line send_bad_msgs(Offender, P, 5),
+    {ok, Offender} = start_node(bad_dist_ext_receive_offender),
+    {ok, Victim} = start_node(bad_dist_ext_receive_victim),
+    start_node_monitors([Offender,Victim]),
+
+    Parent = self(),
+
+    P = spawn_link(Victim,
+                   fun () ->
+                           Parent ! {self(), started},
+                           receive check_msgs -> ok end,
+                           bad_dist_ext_check_msgs([one,
+                                                    two,
+                                                    three]),
+                           Parent ! {self(), messages_checked},
+                           receive done -> ok end
+                   end),
+
+    receive {P, started} -> ok end,
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    verify_up(Offender, Victim),
+    true = lists:member(Offender, rpc:call(Victim, erlang, nodes, [])),
+    P ! one,
+    send_bad_msg(Offender, P),
+    P ! two,
+    verify_down(Offender, connection_closed, Victim, killed),
+    {message_queue_len, 2}
+    = rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
+
+    Suspended = make_ref(),
+    S = spawn(Victim,
+              fun () ->
+                      erlang:suspend_process(P),
+                      Parent ! Suspended,
+                      receive after infinity -> ok end
+              end),
+    MS = erlang:monitor(process, S),
+    receive Suspended -> ok end,
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    verify_up(Offender, Victim),
+    true = lists:member(Offender, rpc:call(Victim, erlang, nodes, [])),
+    send_bad_msgs(Offender, P, 5),
+    true = lists:member(Offender, rpc:call(Victim, erlang, nodes, [])),
+    P ! three,
+    send_bad_msgs(Offender, P, 5),
 
     %% Make sure bad msgs has reached Victim
-    ?line rpc:call(Offender, rpc, call, [Victim, erlang, node, []]),
-
-    ?line verify_still_up(Offender, Victim),
-    ?line {message_queue_len, 13}
-	= rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
-    
-    ?line exit(S, bang),
-    ?line receive {'DOWN', MS, process, S, bang} -> ok end,
-    ?line verify_down(Offender, connection_closed, Victim, killed),
-    ?line {message_queue_len, 3}
-	= rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
-
-    ?line P ! check_msgs,
-    ?line receive {P, messages_checked} -> ok end,
-
-    ?line {message_queue_len, 0}
-	= rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
-    
-    ?line P ! done,
-    ?line unlink(P),
-    ?line verify_no_down(Offender, Victim),
-    ?line stop_node(Offender),
-    ?line stop_node(Victim).
+    rpc:call(Offender, rpc, call, [Victim, erlang, node, []]),
+
+    verify_still_up(Offender, Victim),
+    {message_queue_len, 13}
+    = rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
+
+    exit(S, bang),
+    receive {'DOWN', MS, process, S, bang} -> ok end,
+    verify_down(Offender, connection_closed, Victim, killed),
+    {message_queue_len, 3}
+    = rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
+
+    P ! check_msgs,
+    receive {P, messages_checked} -> ok end,
+
+    {message_queue_len, 0}
+    = rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
+
+    P ! done,
+    unlink(P),
+    verify_no_down(Offender, Victim),
+    stop_node(Offender),
+    stop_node(Victim).
 
 
 bad_dist_ext_process_info(Config) when is_list(Config) ->
-    ?line {ok, Offender} = start_node(bad_dist_ext_process_info_offender),
-    ?line {ok, Victim} = start_node(bad_dist_ext_process_info_victim),
-    ?line start_node_monitors([Offender,Victim]),
-
-    ?line Parent = self(),
-    ?line P = spawn_link(Victim,
-			 fun () ->
-				 Parent ! {self(), started},
-				 receive check_msgs -> ok end,
-				 bad_dist_ext_check_msgs([one, two]),
-				 Parent ! {self(), messages_checked},
-				 receive done -> ok end
-			 end),
-
-    ?line receive {P, started} -> ok end,
-    ?line P ! one,
-    
-    ?line Suspended = make_ref(),
-    ?line S = spawn(Victim,
-		     fun () ->
-			     erlang:suspend_process(P),
-			     Parent ! Suspended,
-			     receive after infinity -> ok end
-		     end),
-
-    ?line receive Suspended -> ok end,
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line verify_up(Offender, Victim),
-    ?line send_bad_msgs(Offender, P, 5),
-
-    ?line P ! two,
-    ?line send_bad_msgs(Offender, P, 5),
+    {ok, Offender} = start_node(bad_dist_ext_process_info_offender),
+    {ok, Victim} = start_node(bad_dist_ext_process_info_victim),
+    start_node_monitors([Offender,Victim]),
+
+    Parent = self(),
+    P = spawn_link(Victim,
+                   fun () ->
+                           Parent ! {self(), started},
+                           receive check_msgs -> ok end,
+                           bad_dist_ext_check_msgs([one, two]),
+                           Parent ! {self(), messages_checked},
+                           receive done -> ok end
+                   end),
+
+    receive {P, started} -> ok end,
+    P ! one,
+
+    Suspended = make_ref(),
+    S = spawn(Victim,
+              fun () ->
+                      erlang:suspend_process(P),
+                      Parent ! Suspended,
+                      receive after infinity -> ok end
+              end),
+
+    receive Suspended -> ok end,
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    verify_up(Offender, Victim),
+    send_bad_msgs(Offender, P, 5),
+
+    P ! two,
+    send_bad_msgs(Offender, P, 5),
 
     %% Make sure bad msgs has reached Victim
-    ?line rpc:call(Offender, rpc, call, [Victim, erlang, node, []]),
-
-    ?line verify_still_up(Offender, Victim),
-    ?line {message_queue_len, 12}
-	= rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
-    ?line verify_still_up(Offender, Victim),
-    ?line [{message_queue_len, 2},
-	   {messages, [one, two]}]
-	= rpc:call(Victim, erlang, process_info, [P, [message_queue_len,
-						      messages]]),
-    ?line verify_down(Offender, connection_closed, Victim, killed),
-
-    ?line P ! check_msgs,
-    ?line exit(S, bang),
-    ?line receive {P, messages_checked} -> ok end,
-
-    ?line {message_queue_len, 0}
-	= rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
-
-    ?line P ! done,
-    ?line unlink(P),
-    ?line verify_no_down(Offender, Victim),
-    ?line stop_node(Offender),
-    ?line stop_node(Victim).
+    rpc:call(Offender, rpc, call, [Victim, erlang, node, []]),
+
+    verify_still_up(Offender, Victim),
+    {message_queue_len, 12}
+    = rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
+    verify_still_up(Offender, Victim),
+    [{message_queue_len, 2},
+     {messages, [one, two]}]
+    = rpc:call(Victim, erlang, process_info, [P, [message_queue_len,
+                                                  messages]]),
+    verify_down(Offender, connection_closed, Victim, killed),
+
+    P ! check_msgs,
+    exit(S, bang),
+    receive {P, messages_checked} -> ok end,
+
+    {message_queue_len, 0}
+    = rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
+
+    P ! done,
+    unlink(P),
+    verify_no_down(Offender, Victim),
+    stop_node(Offender),
+    stop_node(Victim).
 
 bad_dist_ext_control(Config) when is_list(Config) ->
-    ?line {ok, Offender} = start_node(bad_dist_ext_control_offender),
-    ?line {ok, Victim} = start_node(bad_dist_ext_control_victim),
-    ?line start_node_monitors([Offender,Victim]),
+    {ok, Offender} = start_node(bad_dist_ext_control_offender),
+    {ok, Victim} = start_node(bad_dist_ext_control_victim),
+    start_node_monitors([Offender,Victim]),
 
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line verify_up(Offender, Victim),
-    ?line send_bad_dhdr(Offender, Victim),
-    ?line verify_down(Offender, connection_closed, Victim, killed),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    verify_up(Offender, Victim),
+    send_bad_dhdr(Offender, Victim),
+    verify_down(Offender, connection_closed, Victim, killed),
 
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line verify_up(Offender, Victim),
-    ?line send_bad_ctl(Offender, Victim),
-    ?line verify_down(Offender, connection_closed, Victim, killed),
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    verify_up(Offender, Victim),
+    send_bad_ctl(Offender, Victim),
+    verify_down(Offender, connection_closed, Victim, killed),
 
-    ?line verify_no_down(Offender, Victim),
-    ?line stop_node(Offender),
-    ?line stop_node(Victim).
+    verify_no_down(Offender, Victim),
+    stop_node(Offender),
+    stop_node(Victim).
 
 bad_dist_ext_connection_id(Config) when is_list(Config) ->
-    ?line {ok, Offender} = start_node(bad_dist_ext_connection_id_offender),
-    ?line {ok, Victim} = start_node(bad_dist_ext_connection_id_victim),
-    ?line start_node_monitors([Offender,Victim]),
-
-    ?line Parent = self(),
-    ?line P = spawn_link(Victim,
-			 fun () ->
-				 Parent ! {self(), started},
-				 receive check_msgs -> ok end,
-				 bad_dist_ext_check_msgs([]),
-				 Parent ! {self(), messages_checked},
-				 receive done -> ok end
-			 end),
-
-    ?line receive {P, started} -> ok end,
-    ?line Suspended = make_ref(),
-    ?line S = spawn(Victim,
-		    fun () ->
-			    erlang:suspend_process(P),
-			    Parent ! Suspended,
-			    receive after infinity -> ok end
-		    end),
-    ?line MS = erlang:monitor(process, S),
-    ?line receive Suspended -> ok end,
-    ?line pong = rpc:call(Victim, net_adm, ping, [Offender]),
-    ?line verify_up(Offender, Victim),
-    ?line send_bad_msg(Offender, P),
+    {ok, Offender} = start_node(bad_dist_ext_connection_id_offender),
+    {ok, Victim} = start_node(bad_dist_ext_connection_id_victim),
+    start_node_monitors([Offender,Victim]),
+
+    Parent = self(),
+    P = spawn_link(Victim,
+                   fun () ->
+                           Parent ! {self(), started},
+                           receive check_msgs -> ok end,
+                           bad_dist_ext_check_msgs([]),
+                           Parent ! {self(), messages_checked},
+                           receive done -> ok end
+                   end),
+
+    receive {P, started} -> ok end,
+    Suspended = make_ref(),
+    S = spawn(Victim,
+              fun () ->
+                      erlang:suspend_process(P),
+                      Parent ! Suspended,
+                      receive after infinity -> ok end
+              end),
+    MS = erlang:monitor(process, S),
+    receive Suspended -> ok end,
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    verify_up(Offender, Victim),
+    send_bad_msg(Offender, P),
 
     %% Make sure bad msg has reached Victim
-    ?line rpc:call(Offender, rpc, call, [Victim, erlang, node, []]),
+    rpc:call(Offender, rpc, call, [Victim, erlang, node, []]),
 
-    ?line {message_queue_len, 1}
-	= rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
+    {message_queue_len, 1}
+    = rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
 
-    ?line true = rpc:call(Offender, net_kernel, disconnect, [Victim]),
-    ?line verify_down(Offender, disconnect, Victim, connection_closed),
-    ?line pong = rpc:call(Offender, net_adm, ping, [Victim]),
+    true = rpc:call(Offender, net_kernel, disconnect, [Victim]),
+    verify_down(Offender, disconnect, Victim, connection_closed),
+    pong = rpc:call(Offender, net_adm, ping, [Victim]),
 
-    ?line verify_up(Offender, Victim),
+    verify_up(Offender, Victim),
     %% We have a new connection between Offender and Victim, bad message
     %% should not bring it down.
 
-    ?line {message_queue_len, 1}
-	= rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
+    {message_queue_len, 1}
+    = rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
 
-    ?line exit(S, bang),
-    ?line receive {'DOWN', MS, process, S, bang} -> ok end,
+    exit(S, bang),
+    receive {'DOWN', MS, process, S, bang} -> ok end,
     %% Wait for a while (if the connection is taken down it might take a
     %% while).
-    ?line receive after 2000 -> ok end,
-    ?line verify_still_up(Offender, Victim),
+    receive after 2000 -> ok end,
+    verify_still_up(Offender, Victim),
+
+    P ! check_msgs,
+    receive {P, messages_checked} -> ok end,
 
-    ?line P ! check_msgs,
-    ?line receive {P, messages_checked} -> ok end,
+    {message_queue_len, 0}
+    = rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
 
-    ?line {message_queue_len, 0}
-	= rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
-    
-    ?line verify_still_up(Offender, Victim),
-    ?line P ! done,
-    ?line unlink(P),
-    ?line verify_no_down(Offender, Victim),
-    ?line stop_node(Offender),
-    ?line stop_node(Victim).
+    verify_still_up(Offender, Victim),
+    P ! done,
+    unlink(P),
+    verify_no_down(Offender, Victim),
+    stop_node(Offender),
+    stop_node(Victim).
 
 
 bad_dist_struct_check_msgs([]) ->
     receive
-	Msg ->
-	    exit({unexpected_message, Msg})
+        Msg ->
+            exit({unexpected_message, Msg})
     after 0 ->
-	    ok
+              ok
     end;
 bad_dist_struct_check_msgs([M|Ms]) ->
     receive
-	{'EXIT',_,_} = EM ->
-	    io:format("Ignoring exit message: ~p~n",[EM]),
-	    bad_dist_struct_check_msgs([M|Ms]);
-	Msg ->
-	    M = Msg,
-	    bad_dist_struct_check_msgs(Ms)
+        {'EXIT',_,_} = EM ->
+            io:format("Ignoring exit message: ~p~n",[EM]),
+            bad_dist_struct_check_msgs([M|Ms]);
+        Msg ->
+            M = Msg,
+            bad_dist_struct_check_msgs(Ms)
     end.
 bad_dist_ext_check_msgs([]) ->
     receive
-	Msg ->
-	    exit({unexpected_message, Msg})
+        Msg ->
+            exit({unexpected_message, Msg})
     after 0 ->
-	    ok
+              ok
     end;
 bad_dist_ext_check_msgs([M|Ms]) ->
     receive
-	Msg ->
-	    M = Msg,
-	    bad_dist_ext_check_msgs(Ms)
+        Msg ->
+            M = Msg,
+            bad_dist_ext_check_msgs(Ms)
     end.
-    
+
 
 dport_reg_send(Node, Name, Msg) ->
     DPrt = case dport(Node) of
-	       undefined ->
-		   pong = net_adm:ping(Node),
-		   dport(Node);
-	       Prt ->
-		   Prt
-	   end,
+               undefined ->
+                   pong = net_adm:ping(Node),
+                   dport(Node);
+               Prt ->
+                   Prt
+           end,
     port_command(DPrt, [dmsg_hdr(),
-			dmsg_ext({?DOP_REG_SEND,
-				  self(),
-				  ?COOKIE,
-				  Name}),
-			dmsg_ext(Msg)]).
+                        dmsg_ext({?DOP_REG_SEND,
+                                  self(),
+                                  ?COOKIE,
+                                  Name}),
+                        dmsg_ext(Msg)]).
 
 
 dport_send(To, Msg) ->
     Node = node(To),
     DPrt = case dport(Node) of
-	       undefined ->
-		   pong = net_adm:ping(Node),
-		   dport(Node);
-	       Prt ->
-		   Prt
-	   end,
+               undefined ->
+                   pong = net_adm:ping(Node),
+                   dport(Node);
+               Prt ->
+                   Prt
+           end,
     port_command(DPrt, [dmsg_hdr(),
-			dmsg_ext({?DOP_SEND,
-				  ?COOKIE,
-				  To}),
-			dmsg_ext(Msg)]).
+                        dmsg_ext({?DOP_SEND,
+                                  ?COOKIE,
+                                  To}),
+                        dmsg_ext(Msg)]).
 send_bad_structure(Offender,Victim,Bad,WhereToPutSelf) ->
     send_bad_structure(Offender,Victim,Bad,WhereToPutSelf,[]).
 send_bad_structure(Offender,Victim,Bad,WhereToPutSelf,PayLoad) ->
     Parent = self(),
     Done = make_ref(),
     spawn(Offender,
-	  fun () ->
-		  Node = node(Victim),
-		  pong = net_adm:ping(Node),
-		  DPrt = dport(Node),
-		  Bad1 = case WhereToPutSelf of
-			     0 -> 
-				 Bad;
-			     N when N > 0 ->
-				 setelement(N,Bad,self())
-			 end,
-		  DData = [dmsg_hdr(),
-			   dmsg_ext(Bad1)] ++
-		      case PayLoad of
-			  [] -> [];
-			  _Other -> [dmsg_ext(PayLoad)]
-		      end,
-		  port_command(DPrt, DData),
-		  Parent ! {DData,Done}
-	  end),
+          fun () ->
+                  Node = node(Victim),
+                  pong = net_adm:ping(Node),
+                  DPrt = dport(Node),
+                  Bad1 = case WhereToPutSelf of
+                             0 -> 
+                                 Bad;
+                             N when N > 0 ->
+                                 setelement(N,Bad,self())
+                         end,
+                  DData = [dmsg_hdr(),
+                           dmsg_ext(Bad1)] ++
+                  case PayLoad of
+                      [] -> [];
+                      _Other -> [dmsg_ext(PayLoad)]
+                  end,
+                  port_command(DPrt, DData),
+                  Parent ! {DData,Done}
+          end),
     receive 
-	{WhatSent,Done} -> 
-	    io:format("Offender sent ~p~n",[WhatSent]),
-	    ok
+        {WhatSent,Done} -> 
+            io:format("Offender sent ~p~n",[WhatSent]),
+            ok
     after 5000 ->
-	    exit(unable_to_send)
+              exit(unable_to_send)
     end.
-   
+
 
 %% send_bad_msgs():
 %% Send a valid distribution header and control message
@@ -1861,21 +1783,21 @@ send_bad_msg(BadNode, To) ->
     send_bad_msgs(BadNode, To, 1).
 
 send_bad_msgs(BadNode, To, Repeat) when is_atom(BadNode),
-					is_pid(To),
-					is_integer(Repeat) ->
+                                        is_pid(To),
+                                        is_integer(Repeat) ->
     Parent = self(),
     Done = make_ref(),
     spawn_link(BadNode,
-	       fun () ->
-		       Node = node(To),
-		       pong = net_adm:ping(Node),
-		       DPrt = dport(Node),
-		       DData = [dmsg_hdr(),
-				dmsg_ext({?DOP_SEND, ?COOKIE, To}),
-				dmsg_bad_atom_cache_ref()],
-		       repeat(fun () -> port_command(DPrt, DData) end, Repeat),
-		       Parent ! Done
-	       end),
+               fun () ->
+                       Node = node(To),
+                       pong = net_adm:ping(Node),
+                       DPrt = dport(Node),
+                       DData = [dmsg_hdr(),
+                                dmsg_ext({?DOP_SEND, ?COOKIE, To}),
+                                dmsg_bad_atom_cache_ref()],
+                       repeat(fun () -> port_command(DPrt, DData) end, Repeat),
+                       Parent ! Done
+               end),
     receive Done -> ok end.
 
 %% send_bad_ctl():
@@ -1884,24 +1806,24 @@ send_bad_ctl(BadNode, ToNode) when is_atom(BadNode), is_atom(ToNode) ->
     Parent = self(),
     Done = make_ref(),
     spawn_link(BadNode,
-	       fun () ->
-		       pong = net_adm:ping(ToNode),
-		       %% We creat a valid ctl msg and replace an
-		       %% atom with an invalid atom cache reference
-		       <<131,Replace/binary>> = term_to_binary(replace),
-		       Ctl = dmsg_ext({?DOP_REG_SEND,
-				       self(),
-				       ?COOKIE,
-				       replace}),
-		       CtlBeginSize = size(Ctl) - size(Replace),
-		       <<CtlBegin:CtlBeginSize/binary, Replace/binary>> = Ctl,
-		       port_command(dport(ToNode),
-				    [dmsg_fake_hdr2(),
-				     CtlBegin,
-				     dmsg_bad_atom_cache_ref(),
-				     dmsg_ext({a, message})]),
-		       Parent ! Done
-	       end),
+               fun () ->
+                       pong = net_adm:ping(ToNode),
+                       %% We creat a valid ctl msg and replace an
+                       %% atom with an invalid atom cache reference
+                       <<131,Replace/binary>> = term_to_binary(replace),
+                       Ctl = dmsg_ext({?DOP_REG_SEND,
+                                       self(),
+                                       ?COOKIE,
+                                       replace}),
+                       CtlBeginSize = size(Ctl) - size(Replace),
+                       <<CtlBegin:CtlBeginSize/binary, Replace/binary>> = Ctl,
+                       port_command(dport(ToNode),
+                                    [dmsg_fake_hdr2(),
+                                     CtlBegin,
+                                     dmsg_bad_atom_cache_ref(),
+                                     dmsg_ext({a, message})]),
+                       Parent ! Done
+               end),
     receive Done -> ok end.
 
 %% send_bad_dhr():
@@ -1910,17 +1832,17 @@ send_bad_dhdr(BadNode, ToNode) when is_atom(BadNode), is_atom(ToNode) ->
     Parent = self(),
     Done = make_ref(),
     spawn_link(BadNode,
-	       fun () ->
-		       pong = net_adm:ping(ToNode),
-		       port_command(dport(ToNode), dmsg_bad_hdr()),
-		       Parent ! Done
-	       end),
+               fun () ->
+                       pong = net_adm:ping(ToNode),
+                       port_command(dport(ToNode), dmsg_bad_hdr()),
+                       Parent ! Done
+               end),
     receive Done -> ok end.
 
 dport(Node) when is_atom(Node) ->
     case catch erts_debug:get_internal_state(available_internal_state) of
-	true -> true;
-	_ -> erts_debug:set_internal_state(available_internal_state, true)
+        true -> true;
+        _ -> erts_debug:set_internal_state(available_internal_state, true)
     end,
     erts_debug:get_internal_state({dist_port, Node}).
 
@@ -1933,7 +1855,7 @@ dmsg_bad_hdr() ->
     [131, % Version Magic
      $D,  % Dist header
      255].  % 255 atom references
-    
+
 
 %% dmsg_fake_hdr1() ->
 %%     A = <<"fake header atom 1">>,
@@ -1974,21 +1896,21 @@ start_node(Name, Args, Rel) when is_atom(Name), is_list(Rel) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Cookie = atom_to_list(erlang:get_cookie()),
     RelArg = case Rel of
-		 [] -> [];
-		 _ -> [{erl,[{release,Rel}]}]
-	     end,
+                 [] -> [];
+                 _ -> [{erl,[{release,Rel}]}]
+             end,
     test_server:start_node(Name, slave, 
-			   [{args,
-			     Args++" -setcookie "++Cookie++" -pa \""++Pa++"\""}
-			    | RelArg]);
+                           [{args,
+                             Args++" -setcookie "++Cookie++" -pa \""++Pa++"\""}
+                            | RelArg]);
 start_node(Config, Args, Rel) when is_list(Config), is_list(Rel) ->
     Name = list_to_atom((atom_to_list(?MODULE)
-			 ++ "-"
-			 ++ atom_to_list(?config(testcase, Config))
-			 ++ "-"
-			 ++ integer_to_list(erlang:system_time(seconds))
-			 ++ "-"
-			 ++ integer_to_list(erlang:unique_integer([positive])))),
+                         ++ "-"
+                         ++ atom_to_list(proplists:get_value(testcase, Config))
+                         ++ "-"
+                         ++ integer_to_list(erlang:system_time(seconds))
+                         ++ "-"
+                         ++ integer_to_list(erlang:unique_integer([positive])))),
     start_node(Name, Args, Rel).
 
 stop_node(Node) ->
@@ -1999,13 +1921,13 @@ freeze_node(Node, MS) ->
     DoingIt = make_ref(),
     Freezer = self(),
     spawn_link(Node,
-	       fun () ->
-		       erts_debug:set_internal_state(available_internal_state,
-						     true),
-		       dport_send(Freezer, DoingIt),
-		       receive after Own -> ok end,
-		       erts_debug:set_internal_state(block, MS+Own)
-	       end),
+               fun () ->
+                       erts_debug:set_internal_state(available_internal_state,
+                                                     true),
+                       dport_send(Freezer, DoingIt),
+                       receive after Own -> ok end,
+                       erts_debug:set_internal_state(block, MS+Own)
+               end),
     receive DoingIt -> ok end,
     receive after Own -> ok end.
 
@@ -2016,46 +1938,46 @@ do_inet_rpc({_,_,Sock},M,F,A) ->
     Bin = term_to_binary({M,F,A}),
     gen_tcp:send(Sock,Bin),
     case gen_tcp:recv(Sock,0) of
-	{ok, Bin2} ->
-	    T = binary_to_term(Bin2),
-	    {ok,T};
-	Else ->
-	    {error, Else}
+        {ok, Bin2} ->
+            T = binary_to_term(Bin2),
+            {ok,T};
+        Else ->
+            {error, Else}
     end.
 
 inet_rpc_server([Host, PortList]) ->
     Port = list_to_integer(PortList),
     {ok, Sock} = gen_tcp:connect(Host, Port,[binary, {packet, 4}, 
-                                        {active, false}]),
+                                             {active, false}]),
     inet_rpc_server_loop(Sock).
 
 inet_rpc_server_loop(Sock) ->
     case gen_tcp:recv(Sock,0) of
-	{ok, Bin} ->
-	    {M,F,A} = binary_to_term(Bin),
-	    Res = (catch apply(M,F,A)),
-	    RB = term_to_binary(Res),
-	    gen_tcp:send(Sock,RB),
-	    inet_rpc_server_loop(Sock);
-	_ ->
-	    erlang:halt()
+        {ok, Bin} ->
+            {M,F,A} = binary_to_term(Bin),
+            Res = (catch apply(M,F,A)),
+            RB = term_to_binary(Res),
+            gen_tcp:send(Sock,RB),
+            inet_rpc_server_loop(Sock);
+        _ ->
+            erlang:halt()
     end.
-				 
+
 
 start_relay_node(Node, Args) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Cookie = "NOT"++atom_to_list(erlang:get_cookie()),
     {ok, LSock} = gen_tcp:listen(0, [binary, {packet, 4}, 
-                                        {active, false}]),
+                                     {active, false}]),
     {ok, Port} = inet:port(LSock),
     {ok, Host} = inet:gethostname(),
     RunArg = "-run " ++ atom_to_list(?MODULE) ++ " inet_rpc_server " ++
-	Host ++ " " ++ integer_to_list(Port),
+    Host ++ " " ++ integer_to_list(Port),
     {ok, NN} = 
-	test_server:start_node(Node, peer, 
-			       [{args, Args ++
-				 " -setcookie "++Cookie++" -pa "++Pa++" "++
-				 RunArg}]),
+    test_server:start_node(Node, peer, 
+                           [{args, Args ++
+                             " -setcookie "++Cookie++" -pa "++Pa++" "++
+                             RunArg}]),
     [N,H] = string:tokens(atom_to_list(NN),"@"),
     {ok, Sock} = gen_tcp:accept(LSock),
     pang = net_adm:ping(NN),
@@ -2070,28 +1992,28 @@ wait_dead(N,H,0) ->
     {error,{not_dead,N,H}};
 wait_dead(N,H,X) ->
     case erl_epmd:port_please(N,H) of
-	{port,_,_} ->
-	    receive 
-	    after 1000 ->
-		    ok
-	    end,
-	    wait_dead(N,H,X-1);
-	noport ->
-	    ok;
-	Else ->
-	    {error, {unexpected, Else}}
+        {port,_,_} ->
+            receive 
+            after 1000 ->
+                      ok
+            end,
+            wait_dead(N,H,X-1);
+        noport ->
+            ok;
+        Else ->
+            {error, {unexpected, Else}}
     end.
-    
+
 
 start_node_monitors(Nodes) ->
     Master = self(),
     lists:foreach(fun (Node) ->
-			  spawn(Node,
-				fun () ->
-					node_monitor(Master)
-				end)
-		  end,
-		  Nodes),
+                          spawn(Node,
+                                fun () ->
+                                        node_monitor(Master)
+                                end)
+                  end,
+                  Nodes),
     ok.
 
 node_monitor(Master) ->
@@ -2100,42 +2022,42 @@ node_monitor(Master) ->
     net_kernel:monitor_nodes(true, Opts),
     Nodes1 = nodes(connected),
     case lists:sort(Nodes0) == lists:sort(Nodes1) of
-	true ->
-	    lists:foreach(fun (Node) ->
-				  Master ! {nodeup, node(), Node}
-			  end,
-			  Nodes0),
-	    ?t:format("~p ~p: ~p~n", [node(), erlang:system_time(micro_seconds), Nodes0]),
-	    node_monitor_loop(Master);
-	false ->
-	    net_kernel:monitor_nodes(false, Opts),
-	    flush_node_changes(),
-	    node_monitor(Master)
+        true ->
+            lists:foreach(fun (Node) ->
+                                  Master ! {nodeup, node(), Node}
+                          end,
+                          Nodes0),
+            io:format("~p ~p: ~p~n", [node(), erlang:system_time(micro_seconds), Nodes0]),
+            node_monitor_loop(Master);
+        false ->
+            net_kernel:monitor_nodes(false, Opts),
+            flush_node_changes(),
+            node_monitor(Master)
     end.
 
 flush_node_changes() ->
     receive
-	{NodeChange, _Node, _InfoList} when NodeChange == nodeup;
-					    NodeChange == nodedown ->
-	    flush_node_changes()
+        {NodeChange, _Node, _InfoList} when NodeChange == nodeup;
+                                            NodeChange == nodedown ->
+            flush_node_changes()
     after 0 ->
-	    ok
+              ok
     end.
 
 node_monitor_loop(Master) ->
     receive
-	{nodeup, Node, _InfoList} = Msg ->
-	    Master ! {nodeup, node(), Node},
-	    ?t:format("~p ~p: ~p~n", [node(), erlang:system_time(micro_seconds), Msg]),
-	    node_monitor_loop(Master);
-	{nodedown, Node, InfoList} = Msg ->
-	    Reason = case lists:keysearch(nodedown_reason, 1, InfoList) of
-			 {value, {nodedown_reason, R}} -> R;
-			 _ -> undefined
-		     end,
-	    Master ! {nodedown, node(), Node, Reason},
-	    ?t:format("~p ~p: ~p~n", [node(), erlang:system_time(micro_seconds), Msg]),
-	    node_monitor_loop(Master)
+        {nodeup, Node, _InfoList} = Msg ->
+            Master ! {nodeup, node(), Node},
+            io:format("~p ~p: ~p~n", [node(), erlang:system_time(micro_seconds), Msg]),
+            node_monitor_loop(Master);
+        {nodedown, Node, InfoList} = Msg ->
+            Reason = case lists:keysearch(nodedown_reason, 1, InfoList) of
+                         {value, {nodedown_reason, R}} -> R;
+                         _ -> undefined
+                     end,
+            Master ! {nodedown, node(), Node, Reason},
+            io:format("~p ~p: ~p~n", [node(), erlang:system_time(micro_seconds), Msg]),
+            node_monitor_loop(Master)
     end.
 
 verify_up(A, B) ->
@@ -2149,16 +2071,16 @@ verify_still_up(A, B) ->
 
 verify_no_down(A, B) ->
     receive
-	{nodedown, A, B, _} = Msg0 ->
-	    ?t:fail(Msg0)
+        {nodedown, A, B, _} = Msg0 ->
+            ct:fail(Msg0)
     after 0 ->
-	    ok
+              ok
     end,
     receive
-	{nodedown, B, A, _} = Msg1 ->
-	    ?t:fail(Msg1)
+        {nodedown, B, A, _} = Msg1 ->
+            ct:fail(Msg1)
     after 0 ->
-	    ok
+              ok
     end.
 
 %% verify_down(A, B) ->
@@ -2167,12 +2089,12 @@ verify_no_down(A, B) ->
 
 verify_down(A, ReasonA, B, ReasonB) ->
     receive
-	{nodedown, A, B, _} = Msg0 ->
-	    {nodedown, A, B, ReasonA} = Msg0
+        {nodedown, A, B, _} = Msg0 ->
+            {nodedown, A, B, ReasonA} = Msg0
     end,
     receive
-	{nodedown, B, A, _} = Msg1 ->
-	    {nodedown, B, A, ReasonB} = Msg1
+        {nodedown, B, A, _} = Msg1 ->
+            {nodedown, B, A, ReasonB} = Msg1
     end,
     ok.
 
@@ -2192,17 +2114,17 @@ from(_, []) -> [].
 
 long_or_short() -> 
     case net_kernel:longnames() of
-	true -> " -name ";
-	false -> " -sname "
+        true -> " -name ";
+        false -> " -sname "
     end.
 
 until(Fun) ->
     case Fun() of
-	true ->
-	    ok;
-	false ->
-	    receive after 10 -> ok end,
-	    until(Fun)
+        true ->
+            ok;
+        false ->
+            receive after 10 -> ok end,
+            until(Fun)
     end.
 
 forever(Fun) ->
@@ -2227,9 +2149,9 @@ stop_busy_dist_port_tracer(_) ->
 
 busy_dist_port_tracer() ->
     receive
-	{monitor, _SuspendedProcess, busy_dist_port, _Port} = M ->
-	    erlang:display(M),
-	    busy_dist_port_tracer()
+        {monitor, _SuspendedProcess, busy_dist_port, _Port} = M ->
+            erlang:display(M),
+            busy_dist_port_tracer()
     end.
 
 repeat(_Fun, 0) ->
@@ -2242,38 +2164,38 @@ string_to_atom_ext(String) ->
     Utf8List = string_to_utf8_list(String),
     Len = length(Utf8List),
     case Len < 256 of
-	true ->
-	    [?SMALL_ATOM_UTF8_EXT, Len | Utf8List];
-	false ->
-	    [?ATOM_UTF8_EXT, Len bsr 8, Len band 16#ff | Utf8List]
+        true ->
+            [?SMALL_ATOM_UTF8_EXT, Len | Utf8List];
+        false ->
+            [?ATOM_UTF8_EXT, Len bsr 8, Len band 16#ff | Utf8List]
     end.
 
 string_to_atom(String) ->
     binary_to_term(list_to_binary([?VERSION_MAGIC
-				   | string_to_atom_ext(String)])).
+                                   | string_to_atom_ext(String)])).
 
 string_to_utf8_list([]) ->
     [];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   0 =< CP,
-				   CP =< 16#7F ->
+                                   0 =< CP,
+                                   CP =< 16#7F ->
     [CP | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#80 =< CP,
-				   CP =< 16#7FF ->
+                                   16#80 =< CP,
+                                   CP =< 16#7FF ->
     [16#C0 bor (CP bsr 6),
      16#80 bor (16#3F band CP)
      | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#800 =< CP,
-				   CP =< 16#FFFF ->
+                                   16#800 =< CP,
+                                   CP =< 16#FFFF ->
     [16#E0 bor (CP bsr 12),
      16#80 bor (16#3F band (CP bsr 6)),
      16#80 bor (16#3F band CP)
      | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#10000 =< CP,
-				   CP =< 16#10FFFF ->
+                                   16#10000 =< CP,
+                                   CP =< 16#10FFFF ->
     [16#F0 bor (CP bsr 18),
      16#80 bor (16#3F band (CP bsr 12)),
      16#80 bor (16#3F band (CP bsr 6)),
@@ -2283,47 +2205,47 @@ string_to_utf8_list([CP|CPs]) when is_integer(CP),
 utf8_list_to_string([]) ->
     [];
 utf8_list_to_string([B|Bs]) when is_integer(B),
-				 0 =< B,
-				 B =< 16#7F ->
+                                 0 =< B,
+                                 B =< 16#7F ->
     [B | utf8_list_to_string(Bs)];
 utf8_list_to_string([B0, B1 | Bs]) when is_integer(B0),
-					16#C0 =< B0,
-					B0 =< 16#DF,
-					is_integer(B1),
-					16#80 =< B1,
-					B1 =< 16#BF ->
+                                        16#C0 =< B0,
+                                        B0 =< 16#DF,
+                                        is_integer(B1),
+                                        16#80 =< B1,
+                                        B1 =< 16#BF ->
     [(((B0 band 16#1F) bsl 6)
-	  bor (B1 band 16#3F))
+      bor (B1 band 16#3F))
      | utf8_list_to_string(Bs)];
 utf8_list_to_string([B0, B1, B2 | Bs]) when is_integer(B0),
-					    16#E0 =< B0,
-					    B0 =< 16#EF,
-					    is_integer(B1),
-					    16#80 =< B1,
-					    B1 =< 16#BF,
-					    is_integer(B2),
-					    16#80 =< B2,
-					    B2 =< 16#BF ->
+                                            16#E0 =< B0,
+                                            B0 =< 16#EF,
+                                            is_integer(B1),
+                                            16#80 =< B1,
+                                            B1 =< 16#BF,
+                                            is_integer(B2),
+                                            16#80 =< B2,
+                                            B2 =< 16#BF ->
     [(((B0 band 16#F) bsl 12)
-	  bor ((B1 band 16#3F) bsl 6)
-	  bor (B2 band 16#3F))
+      bor ((B1 band 16#3F) bsl 6)
+      bor (B2 band 16#3F))
      | utf8_list_to_string(Bs)];
 utf8_list_to_string([B0, B1, B2, B3 | Bs]) when is_integer(B0),
-						16#F0 =< B0,
-						B0 =< 16#F7,
-						is_integer(B1),
-						16#80 =< B1,
-						B1 =< 16#BF,
-						is_integer(B2),
-						16#80 =< B2,
-						B2 =< 16#BF,
-						is_integer(B3),
-						16#80 =< B3,
-						B3 =< 16#BF ->
+                                                16#F0 =< B0,
+                                                B0 =< 16#F7,
+                                                is_integer(B1),
+                                                16#80 =< B1,
+                                                B1 =< 16#BF,
+                                                is_integer(B2),
+                                                16#80 =< B2,
+                                                B2 =< 16#BF,
+                                                is_integer(B3),
+                                                16#80 =< B3,
+                                                B3 =< 16#BF ->
     [(((B0 band 16#7) bsl 18)
-	  bor ((B1 band 16#3F) bsl 12)
-	  bor ((B2 band 16#3F) bsl 6)
-	  bor (B3 band 16#3F))
+      bor ((B1 band 16#3F) bsl 12)
+      bor ((B2 band 16#3F) bsl 6)
+      bor (B3 band 16#3F))
      | utf8_list_to_string(Bs)].
 
 mk_pid({NodeName, Creation}, Number, Serial) when is_atom(NodeName) ->
@@ -2331,17 +2253,17 @@ mk_pid({NodeName, Creation}, Number, Serial) when is_atom(NodeName) ->
     mk_pid({NodeNameExt, Creation}, Number, Serial);
 mk_pid({NodeNameExt, Creation}, Number, Serial) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?PID_EXT,
-					      NodeNameExt,
-					      uint32_be(Number),
-					      uint32_be(Serial),
-					      uint8(Creation)])) of
-	Pid when is_pid(Pid) ->
-	    Pid;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_pid, [{NodeNameExt, Creation}, Number, Serial]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?PID_EXT,
+                                              NodeNameExt,
+                                              uint32_be(Number),
+                                              uint32_be(Serial),
+                                              uint8(Creation)])) of
+        Pid when is_pid(Pid) ->
+            Pid;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_pid, [{NodeNameExt, Creation}, Number, Serial]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end.
 
 mk_port({NodeName, Creation}, Number) when is_atom(NodeName) ->
@@ -2349,59 +2271,59 @@ mk_port({NodeName, Creation}, Number) when is_atom(NodeName) ->
     mk_port({NodeNameExt, Creation}, Number);
 mk_port({NodeNameExt, Creation}, Number) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?PORT_EXT,
-					      NodeNameExt,
-					      uint32_be(Number),
-					      uint8(Creation)])) of
-	Port when is_port(Port) ->
-	    Port;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_port, [{NodeNameExt, Creation}, Number]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?PORT_EXT,
+                                              NodeNameExt,
+                                              uint32_be(Number),
+                                              uint8(Creation)])) of
+        Port when is_port(Port) ->
+            Port;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_port, [{NodeNameExt, Creation}, Number]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end.
 
 mk_ref({NodeName, Creation}, [Number] = NL) when is_atom(NodeName),
-						 is_integer(Creation),
-						 is_integer(Number) ->
+                                                 is_integer(Creation),
+                                                 is_integer(Number) ->
     <<?VERSION_MAGIC, NodeNameExt/binary>> = term_to_binary(NodeName),
     mk_ref({NodeNameExt, Creation}, NL);
 mk_ref({NodeNameExt, Creation}, [Number]) when is_integer(Creation),
-					       is_integer(Number) ->
+                                               is_integer(Number) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?REFERENCE_EXT,
-					      NodeNameExt,
-					      uint32_be(Number),
-					      uint8(Creation)])) of
-	Ref when is_reference(Ref) ->
-	    Ref;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_ref, [{NodeNameExt, Creation}, [Number]]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?REFERENCE_EXT,
+                                              NodeNameExt,
+                                              uint32_be(Number),
+                                              uint8(Creation)])) of
+        Ref when is_reference(Ref) ->
+            Ref;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_ref, [{NodeNameExt, Creation}, [Number]]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end;
 mk_ref({NodeName, Creation}, Numbers) when is_atom(NodeName),
-					   is_integer(Creation),
-					   is_list(Numbers) ->
+                                           is_integer(Creation),
+                                           is_list(Numbers) ->
     <<?VERSION_MAGIC, NodeNameExt/binary>> = term_to_binary(NodeName),
     mk_ref({NodeNameExt, Creation}, Numbers);
 mk_ref({NodeNameExt, Creation}, Numbers) when is_integer(Creation),
-					      is_list(Numbers) ->
+                                              is_list(Numbers) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?NEW_REFERENCE_EXT,
-					      uint16_be(length(Numbers)),
-					      NodeNameExt,
-					      uint8(Creation),
-					      lists:map(fun (N) ->
-								uint32_be(N)
-							end,
-							Numbers)])) of
-	Ref when is_reference(Ref) ->
-	    Ref;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_ref, [{NodeNameExt, Creation}, Numbers]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?NEW_REFERENCE_EXT,
+                                              uint16_be(length(Numbers)),
+                                              NodeNameExt,
+                                              uint8(Creation),
+                                              lists:map(fun (N) ->
+                                                                uint32_be(N)
+                                                        end,
+                                                        Numbers)])) of
+        Ref when is_reference(Ref) ->
+            Ref;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_ref, [{NodeNameExt, Creation}, Numbers]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end.
 
 
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index 4211c49848..c589470f5b 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -29,64 +29,64 @@
 
 -module(driver_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,
-
-	 a_test/1,
-	 outputv_echo/1,
-	 timer_measure/1,
-	 timer_cancel/1,
-	 timer_change/1,
-	 timer_delay/1,
-	 queue_echo/1,
-	 outputv_errors/1,
-	 driver_unloaded/1,
-	 io_ready_exit/1,
-	 use_fallback_pollset/1,
-	 bad_fd_in_pollset/1,
-	 driver_event/1,
-	 fd_change/1,
-	 steal_control/1,
-	 otp_6602/1,
-	 driver_system_info_base_ver/1,
-	 driver_system_info_prev_ver/1,
-	 driver_system_info_current_ver/1,
-	 driver_monitor/1,
-	
-	 ioq_exit_ready_input/1,
-	 ioq_exit_ready_output/1,
-	 ioq_exit_timeout/1,
-	 ioq_exit_ready_async/1,
-	 ioq_exit_event/1,
-	 ioq_exit_ready_input_async/1,
-	 ioq_exit_ready_output_async/1,
-	 ioq_exit_timeout_async/1,
-	 ioq_exit_event_async/1,
-	 zero_extended_marker_garb_drv/1,
-	 invalid_extended_marker_drv/1,
-	 larger_major_vsn_drv/1,
-	 larger_minor_vsn_drv/1,
-	 smaller_major_vsn_drv/1,
-	 smaller_minor_vsn_drv/1,
-	 peek_non_existing_queue/1,
-	 otp_6879/1,
-	 caller/1,
-	 many_events/1,
-	 missing_callbacks/1,
-	 smp_select/1,
-	 driver_select_use/1,
-	 thread_mseg_alloc_cache_clean/1,
-	 otp_9302/1,
-	 thr_free_drv/1,
-	 async_blast/1,
-	 thr_msg_blast/1,
-	 consume_timeslice/1,
-	 z_test/1]).
+         end_per_suite/1, init_per_group/2,end_per_group/2,
+         init_per_testcase/2,
+         end_per_testcase/2,
+
+         a_test/1,
+         outputv_echo/1,
+         timer_measure/1,
+         timer_cancel/1,
+         timer_change/1,
+         timer_delay/1,
+         queue_echo/1,
+         outputv_errors/1,
+         driver_unloaded/1,
+         io_ready_exit/1,
+         use_fallback_pollset/1,
+         bad_fd_in_pollset/1,
+         driver_event/1,
+         fd_change/1,
+         steal_control/1,
+         otp_6602/1,
+         driver_system_info_base_ver/1,
+         driver_system_info_prev_ver/1,
+         driver_system_info_current_ver/1,
+         driver_monitor/1,
+
+         ioq_exit_ready_input/1,
+         ioq_exit_ready_output/1,
+         ioq_exit_timeout/1,
+         ioq_exit_ready_async/1,
+         ioq_exit_event/1,
+         ioq_exit_ready_input_async/1,
+         ioq_exit_ready_output_async/1,
+         ioq_exit_timeout_async/1,
+         ioq_exit_event_async/1,
+         zero_extended_marker_garb_drv/1,
+         invalid_extended_marker_drv/1,
+         larger_major_vsn_drv/1,
+         larger_minor_vsn_drv/1,
+         smaller_major_vsn_drv/1,
+         smaller_minor_vsn_drv/1,
+         peek_non_existing_queue/1,
+         otp_6879/1,
+         caller/1,
+         many_events/1,
+         missing_callbacks/1,
+         smp_select/1,
+         driver_select_use/1,
+         thread_mseg_alloc_cache_clean/1,
+         otp_9302/1,
+         thr_free_drv/1,
+         async_blast/1,
+         thr_msg_blast/1,
+         consume_timeslice/1,
+         z_test/1]).
 
 -export([bin_prefix/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 
 % First byte in communication with the timer driver
@@ -119,22 +119,22 @@
 -define(heap_binary_size, 64).
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(2)),
     case catch erts_debug:get_internal_state(available_internal_state) of
-	true -> ok;
-	_ -> erts_debug:set_internal_state(available_internal_state, true)
+        true -> ok;
+        _ -> erts_debug:set_internal_state(available_internal_state, true)
     end,
     erlang:display({init_per_testcase, Case}),
-    ?line 0 = element(1, erts_debug:get_internal_state(check_io_debug)),
-    [{watchdog, Dog},{testcase, Case}|Config].
+    0 = element(1, erts_debug:get_internal_state(check_io_debug)),
+    [{testcase, Case}|Config].
 
 end_per_testcase(Case, Config) ->
-    Dog = ?config(watchdog, Config),
     erlang:display({end_per_testcase, Case}),
-    ?line 0 = element(1, erts_debug:get_internal_state(check_io_debug)),
-    ?t:timetrap_cancel(Dog).
+    0 = element(1, erts_debug:get_internal_state(check_io_debug)),
+    ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() -> %% Keep a_test first and z_test last...
     [a_test, outputv_errors, outputv_echo, queue_echo, {group, timer},
@@ -179,42 +179,42 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-outputv_errors(doc) -> "Test sending bad types to port with an outputv-capable driver.";
+%% Test sending bad types to port with an outputv-capable driver.
 outputv_errors(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
-    ?line erl_ddll:start(),
-    ?line ok = load_driver(Path, outputv_drv),
+    Path = proplists:get_value(data_dir, Config),
+    erl_ddll:start(),
+    ok = load_driver(Path, outputv_drv),
 
     outputv_bad_types(fun(T) ->
-			      ?line outputv_errors_1(T),
-			      ?line outputv_errors_1([1|T]),
-			      ?line L = [1,2,3],
-			      ?line outputv_errors_1([L,T]),
-			      ?line outputv_errors_1([L|T])
-		      end),
+                              outputv_errors_1(T),
+                              outputv_errors_1([1|T]),
+                              L = [1,2,3],
+                              outputv_errors_1([L,T]),
+                              outputv_errors_1([L|T])
+                      end),
     outputv_errors_1(42),
 
     %% Test iolists that do not fit in the address space.
     %% Unfortunately, it would be too slow to test in a 64-bit emulator.
     case erlang:system_info(wordsize) of
-	4 -> outputv_huge_iolists();
-	_ -> ok
+        4 -> outputv_huge_iolists();
+        _ -> ok
     end.
 
 outputv_bad_types(Test) ->
     Types = [-1,256,atom,42.0,{a,b,c},make_ref(),fun() -> 42 end,
-	     [1|2],<<1:1>>,<<1:9>>,<<1:15>>],
+             [1|2],<<1:1>>,<<1:9>>,<<1:15>>],
     _ = [Test(Type) || Type <- Types],
     ok.
 
 outputv_huge_iolists() ->
     FourGigs = 1 bsl 32,
-    ?line Sizes = [FourGigs+N || N <- lists:seq(0, 64)] ++
-	[1 bsl N || N <- lists:seq(33, 37)],
-    ?line Base = <<0:(1 bsl 20)/unit:8>>,
+    Sizes = [FourGigs+N || N <- lists:seq(0, 64)] ++
+    [1 bsl N || N <- lists:seq(33, 37)],
+    Base = <<0:(1 bsl 20)/unit:8>>,
     [begin
-	 ?line L = build_iolist(Sz, Base),
-	 ?line outputv_errors_1(L)
+         L = build_iolist(Sz, Base),
+         outputv_errors_1(L)
      end || Sz <- Sizes],
     ok.
 
@@ -224,95 +224,94 @@ outputv_errors_1(Term) ->
     port_close(Port).
 
 build_iolist(N, Base) when N < 16 ->
-    case random:uniform(3) of
-	1 ->
-	    <<Bin:N/binary,_/binary>> = Base,
-	    Bin;
-	_ ->
-	    lists:seq(1, N)
+    case rand:uniform(3) of
+        1 ->
+            <<Bin:N/binary,_/binary>> = Base,
+            Bin;
+        _ ->
+            lists:seq(1, N)
     end;
 build_iolist(N, Base) when N =< byte_size(Base) ->
-    case random:uniform(3) of
-	1 ->
-	    <<Bin:N/binary,_/binary>> = Base,
-	    Bin;
-	2 ->
-	    <<Bin:N/binary,_/binary>> = Base,
-	    [Bin];
-	3 ->
-	    case N rem 2 of
-		0 ->
-		    L = build_iolist(N div 2, Base),
-		    [L,L];
-		1 ->
-		    L = build_iolist(N div 2, Base),
-		    [L,L,45]
-	    end
+    case rand:uniform(3) of
+        1 ->
+            <<Bin:N/binary,_/binary>> = Base,
+            Bin;
+        2 ->
+            <<Bin:N/binary,_/binary>> = Base,
+            [Bin];
+        3 ->
+            case N rem 2 of
+                0 ->
+                    L = build_iolist(N div 2, Base),
+                    [L,L];
+                1 ->
+                    L = build_iolist(N div 2, Base),
+                    [L,L,45]
+            end
     end;
 build_iolist(N0, Base) ->
-    Small = random:uniform(15),
+    Small = rand:uniform(15),
     Seq = lists:seq(1, Small),
     N = N0 - Small,
     case N rem 2 of
-	0 ->
-	    L = build_iolist(N div 2, Base),
-	    [L,L|Seq];
-	1 ->
-	    L = build_iolist(N div 2, Base),
-	    [47,L,L|Seq]
+        0 ->
+            L = build_iolist(N div 2, Base),
+            [L,L|Seq];
+        1 ->
+            L = build_iolist(N div 2, Base),
+            [47,L,L|Seq]
     end.
 
-outputv_echo(doc) -> ["Test echoing data with a driver that supports outputv."];
+%% Test echoing data with a driver that supports outputv.
 outputv_echo(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(10)),
+    ct:timetrap({minutes, 10}),
     Name = 'outputv_drv',
     P = start_driver(Config, Name, true),
 
-    ?line ov_test(P, {bin,0}),
-    ?line ov_test(P, {bin,1}),
-    ?line ov_test(P, {bin,2}),
-    ?line ov_test(P, {bin,3}),
-    ?line ov_test(P, {bin,4}),
-    ?line ov_test(P, {bin,5}),
-    ?line ov_test(P, {bin,6}),
-    ?line ov_test(P, {bin,7}),
-    ?line ov_test(P, {bin,8}),
-    ?line ov_test(P, {bin,15}),
-    ?line ov_test(P, {bin,16}),
-    ?line ov_test(P, {bin,17}),
-
-    ?line ov_test(P, {list,0}),
-    ?line ov_test(P, {list,1}),
-    ?line ov_test(P, {list,2}),
-    ?line ov_test(P, [int,int,{list,0},int]),
-    ?line ov_test(P, [int,int,{list,1},int]),
-    ?line ov_test(P, [int,int,{list,2}]),
-    ?line ov_test(P, [{list,3},int,int,{list,2}]),
-    ?line ov_test(P, {list,33}),
-
-    ?line ov_test(P, [{bin,0}]),
-    ?line ov_test(P, [{bin,1}]),
-    ?line ov_test(P, [{bin,2}]),
-    ?line ov_test(P, [{bin,3}]),
-    ?line ov_test(P, [{bin,4}]),
-    ?line ov_test(P, [{bin,5}]),
-    ?line ov_test(P, [{bin,6},int]),
-    ?line ov_test(P, [int,{bin,3}]),
-    ?line ov_test(P, [int|{bin,4}]),
-    ?line ov_test(P, [{bin,17},int,{bin,13}|{bin,3}]),
-
-    ?line ov_test(P, [int,{bin,17},int,{bin,?heap_binary_size+1}|{bin,3}]),
+    ov_test(P, {bin,0}),
+    ov_test(P, {bin,1}),
+    ov_test(P, {bin,2}),
+    ov_test(P, {bin,3}),
+    ov_test(P, {bin,4}),
+    ov_test(P, {bin,5}),
+    ov_test(P, {bin,6}),
+    ov_test(P, {bin,7}),
+    ov_test(P, {bin,8}),
+    ov_test(P, {bin,15}),
+    ov_test(P, {bin,16}),
+    ov_test(P, {bin,17}),
+
+    ov_test(P, {list,0}),
+    ov_test(P, {list,1}),
+    ov_test(P, {list,2}),
+    ov_test(P, [int,int,{list,0},int]),
+    ov_test(P, [int,int,{list,1},int]),
+    ov_test(P, [int,int,{list,2}]),
+    ov_test(P, [{list,3},int,int,{list,2}]),
+    ov_test(P, {list,33}),
+
+    ov_test(P, [{bin,0}]),
+    ov_test(P, [{bin,1}]),
+    ov_test(P, [{bin,2}]),
+    ov_test(P, [{bin,3}]),
+    ov_test(P, [{bin,4}]),
+    ov_test(P, [{bin,5}]),
+    ov_test(P, [{bin,6},int]),
+    ov_test(P, [int,{bin,3}]),
+    ov_test(P, [int|{bin,4}]),
+    ov_test(P, [{bin,17},int,{bin,13}|{bin,3}]),
+
+    ov_test(P, [int,{bin,17},int,{bin,?heap_binary_size+1}|{bin,3}]),
 
     stop_driver(P, Name),
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 ov_test(Port, Template) ->
     Self = self(),
     spawn_opt(erlang, apply, [fun () -> ov_test(Self, Port, Template) end,[]],
-	      [link,{fullsweep_after,0}]),
+              [link,{fullsweep_after,0}]),
     receive
-	done -> ok
+        done -> ok
     end.
 
 ov_test(Parent, Port, Template) ->
@@ -354,21 +353,20 @@ ov_send_and_test(Port, Data, ExpectedResult) ->
     io:format("~p ! ~P", [Port,Data,12]),
     Port ! {self(),{command,Data}},
     receive 
-	{Port,{data,ReturnData}} ->
-	    io:format("~p returned ~P", [Port,ReturnData,12]),
-	    compare(ReturnData, ExpectedResult);
-	{Port,{data,OtherData}} ->
-	    io:format("~p returned WRONG data ~p", [Port,OtherData]),
-	    ?line test_server:fail();
-	Wrong ->
-	    ?line test_server:fail({unexpected_port_or_data,Wrong})
+        {Port,{data,ReturnData}} ->
+            io:format("~p returned ~P", [Port,ReturnData,12]),
+            compare(ReturnData, ExpectedResult);
+        {Port,{data,OtherData}} ->
+            ct:fail("~p returned WRONG data ~p", [Port,OtherData]);
+        Wrong ->
+            ct:fail({unexpected_port_or_data,Wrong})
     end.
 
 compare(Got, Expected) ->
     case {list_to_binary([Got]),list_to_binary([Expected])} of
-	{B,B} -> ok;
-	{_Gb,_Eb} ->
-	    ?t:fail(got_bad_data)
+        {B,B} -> ok;
+        {_Gb,_Eb} ->
+            ct:fail(got_bad_data)
     end.
 
 
@@ -377,146 +375,138 @@ compare(Got, Expected) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-timer_measure(doc) -> ["Check that timers time out in good time."];
+%% Check that timers time out in good time.
 timer_measure(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(1)),
     Name = 'timer_drv',
-    ?line Port = start_driver(Config, Name, false),
+    Port = start_driver(Config, Name, false),
 
-    ?line try_timeouts(Port, 8997),
+    try_timeouts(Port, 8997),
 
-    ?line stop_driver(Port, Name),
-    ?line test_server:timetrap_cancel(Dog),
+    stop_driver(Port, Name),
     ok.
 
 try_timeouts(_, 0) -> ok;
 try_timeouts(Port, Timeout) ->
-    ?line TimeBefore = erlang:monotonic_time(),
-    ?line erlang:port_command(Port, <<?START_TIMER,Timeout:32>>),
+    TimeBefore = erlang:monotonic_time(),
+    erlang:port_command(Port, <<?START_TIMER,Timeout:32>>),
     receive
-	{Port,{data,[?TIMER]}} ->
-	    ?line Elapsed = erl_millisecs() - erl_millisecs(TimeBefore),
-	    io:format("Elapsed: ~p Timeout: ~p\n", [Elapsed, Timeout]),
-	    if
-		Elapsed < Timeout ->
-		    ?line ?t:fail(too_short);
-		Elapsed > Timeout + ?delay ->
-		    ?line ?t:fail(too_long);
-		true ->
-		    try_timeouts(Port, Timeout div 2)
-	    end
+        {Port,{data,[?TIMER]}} ->
+            Elapsed = erl_millisecs() - erl_millisecs(TimeBefore),
+            io:format("Elapsed: ~p Timeout: ~p\n", [Elapsed, Timeout]),
+            if
+                Elapsed < Timeout ->
+                    ct:fail(too_short);
+                Elapsed > Timeout + ?delay ->
+                    ct:fail(too_long);
+                true ->
+                    try_timeouts(Port, Timeout div 2)
+            end
     after Timeout + ?delay ->
-	    ?line test_server:fail("driver failed to timeout")
+              ct:fail("driver failed to timeout")
     end.
 
-timer_cancel(doc) -> ["Try cancelling timers set in a driver."];
+%% Try cancelling timers set in a driver.
 timer_cancel(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(1)),
     Name = 'timer_drv',
-    ?line Port = start_driver(Config, Name, false),
+    Port = start_driver(Config, Name, false),
 
-    ?line try_cancel(Port, 10000),
+    try_cancel(Port, 10000),
 
-    ?line stop_driver(Port, Name),
-    ?line test_server:timetrap_cancel(Dog),
+    stop_driver(Port, Name),
     ok.
-    
+
 try_cancel(Port, Timeout) ->
-    ?line T_before = erl_millisecs(),
+    T_before = erl_millisecs(),
     Port ! {self(),{command,<<?START_TIMER,(Timeout + ?delay):32>>}},
     receive
-	{Port, {data, [?TIMER]}} ->
-	    ?line test_server:fail("driver timed out before cancelling it")
+        {Port, {data, [?TIMER]}} ->
+            ct:fail("driver timed out before cancelling it")
     after Timeout -> 
-	    Port ! {self(), {command, [?CANCEL_TIMER]}},
-	    receive 
-		{Port, {data, [?TIMER]}} ->
-		    ?line test_server:fail("driver timed out after cancelling it");
-		{Port, {data, [?CANCELLED]}} ->
-		    ?line Time_milli_secs = erl_millisecs() - T_before,
-
-		    io:format("Time_milli_secs: ~p Timeout: ~p\n",
-			      [Time_milli_secs, Timeout]), 
-		    if
-			Time_milli_secs > (Timeout + ?delay) ->
-			    ?line test_server:fail("too long real time");
-			Timeout == 0 -> ok;
-			true -> try_cancel(Port, Timeout div 2)
-		    end
-	    after ?delay ->
-		    test_server:fail("No message from driver")
-	    end
+              Port ! {self(), {command, [?CANCEL_TIMER]}},
+              receive 
+                  {Port, {data, [?TIMER]}} ->
+                      ct:fail("driver timed out after cancelling it");
+                  {Port, {data, [?CANCELLED]}} ->
+                      Time_milli_secs = erl_millisecs() - T_before,
+
+                      io:format("Time_milli_secs: ~p Timeout: ~p\n",
+                                [Time_milli_secs, Timeout]), 
+                      if
+                          Time_milli_secs > (Timeout + ?delay) ->
+                              ct:fail("too long real time");
+                          Timeout == 0 -> ok;
+                          true -> try_cancel(Port, Timeout div 2)
+                      end
+              after ?delay ->
+                        ct:fail("No message from driver")
+              end
     end.
 
 %% Test that timers don't time out too early if we do a sleep
 %% before setting a timer.
 
 timer_delay(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(1)),
     Name = 'timer_drv',
-    ?line Port = start_driver(Config, Name, false),
+    Port = start_driver(Config, Name, false),
 
-    ?line TimeBefore = erlang:monotonic_time(),
+    TimeBefore = erlang:monotonic_time(),
     Timeout0 = 350,
-    ?line erlang:port_command(Port, <<?DELAY_START_TIMER,Timeout0:32>>),
+    erlang:port_command(Port, <<?DELAY_START_TIMER,Timeout0:32>>),
     Timeout = Timeout0 +
-	case os:type() of
-	    {win32,_} -> 0;			%Driver doesn't sleep on Windows.
-	    _ -> 1000
-	end,
+    case os:type() of
+        {win32,_} -> 0;			%Driver doesn't sleep on Windows.
+        _ -> 1000
+    end,
     receive
-	{Port,{data,[?TIMER]}} ->
-	    ?line Elapsed = erl_millisecs() - erl_millisecs(TimeBefore),
-	    io:format("Elapsed time: ~p Timeout: ~p\n",
-		      [Elapsed,Timeout]), 
-	    if
-		Elapsed < Timeout ->
-		    ?line ?t:fail(too_short);
-		Elapsed > Timeout + ?delay ->
-		    ?line ?t:fail(too_long);
-		true ->
-		    ok
-	    end
+        {Port,{data,[?TIMER]}} ->
+            Elapsed = erl_millisecs() - erl_millisecs(TimeBefore),
+            io:format("Elapsed time: ~p Timeout: ~p\n",
+                      [Elapsed,Timeout]), 
+            if
+                Elapsed < Timeout ->
+                    ct:fail(too_short);
+                Elapsed > Timeout + ?delay ->
+                    ct:fail(too_long);
+                true ->
+                    ok
+            end
     end,
 
-    ?line stop_driver(Port, Name),
-    ?line test_server:timetrap_cancel(Dog),
+    stop_driver(Port, Name),
     ok.
 
 %% Test that driver_set_timer with new timout really changes
 %% the timer (ticket OTP-5942), it didn't work before
 
 timer_change(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(1)),
     Name = 'timer_drv',
-    ?line Port = start_driver(Config, Name, false),
+    Port = start_driver(Config, Name, false),
 
-    ?line try_change_timer(Port, 10000),
+    try_change_timer(Port, 10000),
 
-    ?line stop_driver(Port, Name),
-    ?line test_server:timetrap_cancel(Dog),
+    stop_driver(Port, Name),
     ok.
-    
+
 try_change_timer(_Port, 0) -> ok;
 try_change_timer(Port, Timeout) ->
-    ?line Timeout_3 = Timeout*3,
-    ?line TimeBefore = erlang:monotonic_time(),
-    ?line erlang:port_command(Port, <<?START_TIMER,Timeout_3:32>>),
-    ?line erlang:port_command(Port, <<?START_TIMER,Timeout:32>>),
+    Timeout_3 = Timeout*3,
+    TimeBefore = erlang:monotonic_time(),
+    erlang:port_command(Port, <<?START_TIMER,Timeout_3:32>>),
+    erlang:port_command(Port, <<?START_TIMER,Timeout:32>>),
     receive
-	{Port,{data,[?TIMER]}} ->
-	    ?line Elapsed = erl_millisecs() - erl_millisecs(TimeBefore),
-	    io:format("Elapsed: ~p Timeout: ~p\n", [Elapsed,Timeout]),
-	    if
-		Elapsed < Timeout ->
-		    ?line ?t:fail(too_short);
-		Elapsed > Timeout + ?delay ->
-		    ?line ?t:fail(too_long);
-		true ->
-		    try_timeouts(Port, Timeout div 2)
-	    end
+        {Port,{data,[?TIMER]}} ->
+            Elapsed = erl_millisecs() - erl_millisecs(TimeBefore),
+            io:format("Elapsed: ~p Timeout: ~p\n", [Elapsed,Timeout]),
+            if
+                Elapsed < Timeout ->
+                    ct:fail(too_short);
+                Elapsed > Timeout + ?delay ->
+                    ct:fail(too_long);
+                true ->
+                    try_timeouts(Port, Timeout div 2)
+            end
     after Timeout + ?delay ->
-	    ?line test_server:fail("driver failed to timeout")
+              ct:fail("driver failed to timeout")
     end.
 
 
@@ -524,49 +514,47 @@ try_change_timer(Port, Timeout) ->
 %% 		Queue test suites
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-queue_echo(doc) ->
-    ["1) Queue up data in a driver that uses the full driver_queue API to do this."
-     "2) Get the data back, a random amount at a time."];
+%% 1) Queue up data in a driver that uses the full driver_queue API to do this.
+%% 2) Get the data back, a random amount at a time.
 queue_echo(Config) when is_list(Config) ->
-    case ?t:is_native(?MODULE) of
-	true -> exit(crashes_native_code);
-	false -> queue_echo_1(Config)
+    case test_server:is_native(?MODULE) of
+        true -> exit(crashes_native_code);
+        false -> queue_echo_1(Config)
     end.
 
 queue_echo_1(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(10)),
+    ct:timetrap({minutes, 10}),
     Name = 'queue_drv',
-    ?line P = start_driver(Config, Name, true),
-
-    ?line q_echo(P, [{?ENQ, {list,1}},
-		     {?ENQ, {list,0}},
-		     {?ENQ, {bin,0}},
-		     {?ENQ, {bin,1}},
-		     {?ENQ, {bin,2}},
-		     {?ENQ, {bin,3}},
-		     {?ENQ, {bin,4}},
-		     {?ENQ, {bin,5}},
-		     {?ENQ, {bin,600}},
-		     {?PUSHQ, {list,0}},
-		     {?PUSHQ, {list,1}},
-		     {?PUSHQ, {bin,0}},
-		     {?PUSHQ, {bin,1}},
-		     {?PUSHQ, {bin,888}},
-		     {?ENQ_BIN, {bin,0}},
-		     {?ENQ_BIN, {bin,1}},
-		     {?ENQ_BIN, {bin,2}},
-		     {?ENQ_BIN, {bin,3}},
-		     {?ENQ_BIN, {bin,4}},
-		     {?ENQ_BIN, {bin,777}},
-		     {?PUSHQ_BIN, {bin,0}},
-		     {?PUSHQ_BIN, {bin,1}},
-		     {?PUSHQ_BIN, {bin,334}},
-		     {?ENQV, [{bin,0},{list,1},{bin,1},{bin,555}]},
-		     {?ENQV, [{bin,0},{list,1},{bin,1}]},
-		     {?PUSHQV, [{bin,0},{list,1},{bin,1},{bin,319}]}]),
-
-    ?line stop_driver(P, Name),
-    ?line test_server:timetrap_cancel(Dog),
+    P = start_driver(Config, Name, true),
+
+    q_echo(P, [{?ENQ, {list,1}},
+               {?ENQ, {list,0}},
+               {?ENQ, {bin,0}},
+               {?ENQ, {bin,1}},
+               {?ENQ, {bin,2}},
+               {?ENQ, {bin,3}},
+               {?ENQ, {bin,4}},
+               {?ENQ, {bin,5}},
+               {?ENQ, {bin,600}},
+               {?PUSHQ, {list,0}},
+               {?PUSHQ, {list,1}},
+               {?PUSHQ, {bin,0}},
+               {?PUSHQ, {bin,1}},
+               {?PUSHQ, {bin,888}},
+               {?ENQ_BIN, {bin,0}},
+               {?ENQ_BIN, {bin,1}},
+               {?ENQ_BIN, {bin,2}},
+               {?ENQ_BIN, {bin,3}},
+               {?ENQ_BIN, {bin,4}},
+               {?ENQ_BIN, {bin,777}},
+               {?PUSHQ_BIN, {bin,0}},
+               {?PUSHQ_BIN, {bin,1}},
+               {?PUSHQ_BIN, {bin,334}},
+               {?ENQV, [{bin,0},{list,1},{bin,1},{bin,555}]},
+               {?ENQV, [{bin,0},{list,1},{bin,1}]},
+               {?PUSHQV, [{bin,0},{list,1},{bin,1},{bin,319}]}]),
+
+    stop_driver(P, Name),
     ok.
 
 q_echo(Port, SpecList) ->
@@ -606,7 +594,7 @@ q_echo(Port, SpecList) ->
     feed_and_dequeue(Port, HeapData, 2),
     feed_and_dequeue(Port, HeapData, 3),
     feed_and_dequeue(Port, HeapData, 4),
-    
+
     io:format("\n").
 
 feed_and_dequeue(Port, Data, DeqSize) ->
@@ -626,9 +614,9 @@ feed_driver(Port, [], ExpectedInPort, Qb) ->
     {ExpectedInPort,Qb};
 feed_driver(Port, [{Method0,Data}|T], Expected_return, Qb_before) ->
     Method = case Method0 of
-		 ?RANDOM -> uniform(6)-1;
-		 Other -> Other
-	     end,
+                 ?RANDOM -> uniform(6)-1;
+                 Other -> Other
+             end,
     Size = size(list_to_binary([Data])),
 
     %% ***********************************************************************
@@ -643,22 +631,21 @@ feed_driver(Port, [{Method0,Data}|T], Expected_return, Qb_before) ->
 
     Qb_in_driver = bytes_queued(Port),
     case Qb_before + Size of
-	Qb_in_driver -> ok;
-	Sum ->
-	    io:format("Qb_before: ~p\n"
-		      "Qb_before+Size: ~p\n"
-		      "Qb_in_driver: ~p",
-		      [Qb_before,Sum,Qb_in_driver]),
-	    ?t:fail()
+        Qb_in_driver -> ok;
+        Sum ->
+            ct:fail("Qb_before: ~p\n"
+                    "Qb_before+Size: ~p\n"
+                    "Qb_in_driver: ~p",
+                    [Qb_before,Sum,Qb_in_driver])
     end,
     X_return = case Method of
-		   ?ENQ -> list_to_binary([Expected_return,Data]);
-		   ?PUSHQ -> list_to_binary([Data,Expected_return]);
-		   ?PUSHQ_BIN -> list_to_binary([Data,Expected_return]);
-		   ?ENQ_BIN -> list_to_binary([Expected_return,Data]);
-		   ?PUSHQV -> list_to_binary([Data,Expected_return]);
-		   ?ENQV -> list_to_binary([Expected_return,Data])
-	       end,
+                   ?ENQ -> list_to_binary([Expected_return,Data]);
+                   ?PUSHQ -> list_to_binary([Data,Expected_return]);
+                   ?PUSHQ_BIN -> list_to_binary([Data,Expected_return]);
+                   ?ENQ_BIN -> list_to_binary([Expected_return,Data]);
+                   ?PUSHQV -> list_to_binary([Data,Expected_return]);
+                   ?ENQV -> list_to_binary([Expected_return,Data])
+               end,
     feed_driver(Port, T, X_return, Qb_before + Size).
 
 %% method_name(0) -> pushq;
@@ -676,26 +663,22 @@ compare_return(Port, _Data_list, 0, _Back_len) ->
     0 = bytes_queued(Port);
 compare_return(Port, QueuedInPort0, Len_to_get, DeqSize) ->
     case bytes_queued(Port) of
-	Len_to_get -> ok;
-	BytesInQueue ->
-	    io:format("Len_to_get: ~p", [Len_to_get]),
-	    io:format("Bytes in queue: ~p", [BytesInQueue]),
-	    ?line test_server:fail()
+        Len_to_get -> ok;
+        BytesInQueue ->
+            ct:fail("Len_to_get: ~p\nBytes in queue: ~p", [Len_to_get,BytesInQueue])
     end,
     BytesToDequeue = if (DeqSize > Len_to_get) -> Len_to_get;
-			true -> DeqSize
-		     end,
+                        true -> DeqSize
+                     end,
     Dequeued = read_head(Port, BytesToDequeue),
     case bin_prefix(Dequeued, QueuedInPort0) of
-	true ->
-	    deq(Port, BytesToDequeue),
-	    <<_:BytesToDequeue/binary,QueuedInPort/binary>> = QueuedInPort0,
-	    compare_return(Port, QueuedInPort, Len_to_get - BytesToDequeue, DeqSize);
-	false ->
-	    io:format("Bytes to dequeue: ~p", [BytesToDequeue]),
-	    io:format("Dequeued: ~p", [Dequeued]),
-	    io:format("Queued in port: ~P", [QueuedInPort0,12]),
-	    ?t:fail()
+        true ->
+            deq(Port, BytesToDequeue),
+            <<_:BytesToDequeue/binary,QueuedInPort/binary>> = QueuedInPort0,
+            compare_return(Port, QueuedInPort, Len_to_get - BytesToDequeue, DeqSize);
+        false ->
+            ct:fail("Bytes to dequeue: ~p\nDequeued: ~p\nQueued in port: ~P",
+                    [BytesToDequeue, Dequeued, QueuedInPort0,12])
     end.
 
 %% bin_prefix(PrefixBinary, Binary)
@@ -713,8 +696,8 @@ queue_op(Port, Method, Data) ->
 
 bytes_queued(Port) ->
     case erlang:port_control(Port, ?BYTES_QUEUED, []) of
-	<<I:32>> -> I;
-	Bad -> ?t:fail({bad_result,Bad})
+        <<I:32>> -> I;
+        Bad -> ct:fail({bad_result,Bad})
     end.
 
 deq(Port, Size) ->
@@ -724,83 +707,77 @@ read_head(Port, Size) ->
     erlang:port_control(Port, ?READ_HEAD, <<Size:32>>).
 
 
-driver_unloaded(doc) ->
-    [];
-driver_unloaded(suite) ->
-    [];
 driver_unloaded(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line Drv = timer_drv,
-    ?line User = self(),
-    ?line Loaded = make_ref(),
-    ?line Die = make_ref(),
-    ?line Loader = spawn(fun () ->
-				 erl_ddll:start(),
-				 ok = load_driver(?config(data_dir,
-								   Config),
-							   Drv),
-				 User ! Loaded,
-				 receive Die -> exit(bye) end
-			 end),
-    ?line receive Loaded -> ok end,
-    ?line Port = open_port({spawn, Drv}, []),
-    ?line Loader ! Die,
-    ?line receive
-	      {'EXIT', Port, Reason} ->
-		  ?line driver_unloaded = Reason
-		  %% Reason used to be -1
-	  end.
-					 
-
-io_ready_exit(doc) -> [];
-io_ready_exit(suite) -> [];
+    process_flag(trap_exit, true),
+    Drv = timer_drv,
+    User = self(),
+    Loaded = make_ref(),
+    Die = make_ref(),
+    Loader = spawn(fun () ->
+                           erl_ddll:start(),
+                           ok = load_driver(proplists:get_value(data_dir,
+                                                                Config),
+                                            Drv),
+                           User ! Loaded,
+                           receive Die -> exit(bye) end
+                   end),
+    receive Loaded -> ok end,
+    Port = open_port({spawn, Drv}, []),
+    Loader ! Die,
+    receive
+        {'EXIT', Port, Reason} ->
+            driver_unloaded = Reason
+            %% Reason used to be -1
+    end.
+
+
 io_ready_exit(Config) when is_list(Config) ->
-    ?line OTE = process_flag(trap_exit, true),
-    ?line Test = self(),
-    ?line Dgawd = spawn(fun () ->
-				ok = dgawd_handler:install(),
-				Mon = erlang:monitor(process, Test),
-				Test ! dgawd_handler_started,
-				receive
-				    {'DOWN', Mon, _, _, _} -> ok;
-				    stop_dgawd_handler -> ok
-				end,
-				dgawd_handler:restore(),
-				Test ! dgawd_handler_stopped
-			end),
-    ?line receive dgawd_handler_started -> ok end,
-    ?line Drv = io_ready_exit_drv,
-    ?line erl_ddll:start(),
-    ?line ok = load_driver(?config(data_dir, Config), Drv),
-    ?line Port = open_port({spawn, Drv}, []),
-    ?line case erlang:port_control(Port, 0, "") of
-	      "ok" ->
-		  receive
-		      {'EXIT', Port, Reason} ->
-			  ?line case Reason of
-				    ready_output_driver_failure ->
-					?t:format("Exited in output_ready()~n"),
-					?line ok;
-				    ready_input_driver_failure ->
-					?t:format("Exited in input_ready()~n"),
-					?line ok;
-				    Error -> ?line ?t:fail(Error)
-				end
-		  end,
-		  receive after 2000 -> ok end,
-		  ?line false = dgawd_handler:got_dgawd_report(),
-		  ?line Dgawd ! stop_dgawd_handler,
-		  ?line receive dgawd_handler_stopped -> ok end,
-		  ?line process_flag(trap_exit, OTE),
-		  ?line ok;
-	      "nyiftos" ->
-		  ?line process_flag(trap_exit, OTE),
-		  ?line {skipped, "Not yet implemented for this OS"};
-	      Error ->
-		  ?line process_flag(trap_exit, OTE),
-		  ?line ?t:fail({unexpected_control_result, Error})
-	  end.
-    
+    OTE = process_flag(trap_exit, true),
+    Test = self(),
+    Dgawd = spawn(fun () ->
+                          ok = dgawd_handler:install(),
+                          Mon = erlang:monitor(process, Test),
+                          Test ! dgawd_handler_started,
+                          receive
+                              {'DOWN', Mon, _, _, _} -> ok;
+                              stop_dgawd_handler -> ok
+                          end,
+                          dgawd_handler:restore(),
+                          Test ! dgawd_handler_stopped
+                  end),
+    receive dgawd_handler_started -> ok end,
+    Drv = io_ready_exit_drv,
+    erl_ddll:start(),
+    ok = load_driver(proplists:get_value(data_dir, Config), Drv),
+    Port = open_port({spawn, Drv}, []),
+    case erlang:port_control(Port, 0, "") of
+        "ok" ->
+            receive
+                {'EXIT', Port, Reason} ->
+                    case Reason of
+                        ready_output_driver_failure ->
+                            io:format("Exited in output_ready()~n"),
+                            ok;
+                        ready_input_driver_failure ->
+                            io:format("Exited in input_ready()~n"),
+                            ok;
+                        Error -> ct:fail(Error)
+                    end
+            end,
+            receive after 2000 -> ok end,
+            false = dgawd_handler:got_dgawd_report(),
+            Dgawd ! stop_dgawd_handler,
+            receive dgawd_handler_stopped -> ok end,
+            process_flag(trap_exit, OTE),
+            ok;
+        "nyiftos" ->
+            process_flag(trap_exit, OTE),
+            {skipped, "Not yet implemented for this OS"};
+        Error ->
+            process_flag(trap_exit, OTE),
+            ct:fail({unexpected_control_result, Error})
+    end.
+
 
 -define(CHKIO_STOP, 0).
 -define(CHKIO_USE_FALLBACK_POLLSET, 1).
@@ -812,138 +789,128 @@ io_ready_exit(Config) when is_list(Config) ->
 -define(CHKIO_SMP_SELECT, 7).
 -define(CHKIO_DRV_USE, 8).
 
-use_fallback_pollset(doc) -> [];
-use_fallback_pollset(suite) -> [];
 use_fallback_pollset(Config) when is_list(Config) ->
     FlbkFun = fun () ->
-		      ChkIoDuring = erlang:system_info(check_io),
-		      case lists:keysearch(fallback_poll_set_size,
-					   1,
-					   ChkIoDuring) of
-			  {value,
-			   {fallback_poll_set_size, N}} when N > 0 ->
-			      ?line ok;
-			  Error ->
-			      ?line ?t:fail({failed_to_use_fallback, Error})
-		      end
-	      end,
-    ?line {BckupTest, Handel, OkRes}
-	= case chkio_test_init(Config) of
-	      {erts_poll_info, ChkIo} = Hndl ->
-		  case lists:keysearch(fallback, 1, ChkIo) of
-		      {value, {fallback, B}} when B =/= false ->
-			  ?line {FlbkFun, Hndl, ok};
-		      _ ->
-			  ?line {fun () -> ok end,
-				 Hndl,
-				 {comment,
-				  "This implementation does not use "
-				  "a fallback pollset"}}
-		  end;
-	      Skip ->
-		  {fun () -> ok end, Skip, ok}
-	  end,
-    ?line case chkio_test_fini(chkio_test(Handel,
-					  ?CHKIO_USE_FALLBACK_POLLSET,
-					  fun () ->
-						  ?line sleep(1000),
-						  ?line BckupTest()
-					  end)) of
-	      {skipped, _} = Res -> ?line Res;
-	      _ -> ?line OkRes
-	  end.
-
-bad_fd_in_pollset(doc) -> [];
-bad_fd_in_pollset(suite) -> [];
+                      ChkIoDuring = erlang:system_info(check_io),
+                      case lists:keysearch(fallback_poll_set_size,
+                                           1,
+                                           ChkIoDuring) of
+                          {value,
+                           {fallback_poll_set_size, N}} when N > 0 ->
+                              ok;
+                          Error ->
+                              ct:fail({failed_to_use_fallback, Error})
+                      end
+              end,
+    {BckupTest, Handel, OkRes}
+    = case chkio_test_init(Config) of
+          {erts_poll_info, ChkIo} = Hndl ->
+              case lists:keysearch(fallback, 1, ChkIo) of
+                  {value, {fallback, B}} when B =/= false ->
+                      {FlbkFun, Hndl, ok};
+                  _ ->
+                      {fun () -> ok end,
+                       Hndl,
+                       {comment,
+                        "This implementation does not use "
+                        "a fallback pollset"}}
+              end;
+          Skip ->
+              {fun () -> ok end, Skip, ok}
+      end,
+    case chkio_test_fini(chkio_test(Handel,
+                                    ?CHKIO_USE_FALLBACK_POLLSET,
+                                    fun () ->
+                                            sleep(1000),
+                                            BckupTest()
+                                    end)) of
+        {skipped, _} = Res -> Res;
+        _ -> OkRes
+    end.
+
 bad_fd_in_pollset(Config) when is_list(Config) ->
-    ?line chkio_test_fini(chkio_test(chkio_test_init(Config),
-				     ?CHKIO_BAD_FD_IN_POLLSET,
-				     fun () -> ?line sleep(1000) end)).
+    chkio_test_fini(chkio_test(chkio_test_init(Config),
+                               ?CHKIO_BAD_FD_IN_POLLSET,
+                               fun () -> sleep(1000) end)).
 
-driver_event(doc) -> [];
-driver_event(suite) -> [];
 driver_event(Config) when is_list(Config) ->
-    ?line chkio_test_fini(chkio_test(chkio_test_init(Config),
-				     ?CHKIO_DRIVER_EVENT,
-				     fun () -> ?line sleep(1000) end)).
+    chkio_test_fini(chkio_test(chkio_test_init(Config),
+                               ?CHKIO_DRIVER_EVENT,
+                               fun () -> sleep(1000) end)).
 
-fd_change(doc) -> [];
-fd_change(suite) -> [];
 fd_change(Config) when is_list(Config) ->
-    ?line chkio_test_fini(chkio_test(chkio_test_init(Config),
-				     ?CHKIO_FD_CHANGE,
-				     fun () -> ?line sleep(1000) end)).
+    chkio_test_fini(chkio_test(chkio_test_init(Config),
+                               ?CHKIO_FD_CHANGE,
+                               fun () -> sleep(1000) end)).
 
-steal_control(doc) -> [];
-steal_control(suite) -> [];
 steal_control(Config) when is_list(Config) ->
-    ?line chkio_test_fini(case chkio_test_init(Config) of
-			      {erts_poll_info, _} = Hndl ->
-				  ?line steal_control_test(Hndl);
-			      Skip ->
-				  ?line Skip
-			  end).
+    chkio_test_fini(case chkio_test_init(Config) of
+                        {erts_poll_info, _} = Hndl ->
+                            steal_control_test(Hndl);
+                        Skip ->
+                            Skip
+                    end).
 
 steal_control_test(Hndl = {erts_poll_info, Before}) ->
-    ?line Port = open_chkio_port(),
-    ?line case erlang:port_control(Port, ?CHKIO_STEAL_AUX, "") of
-	      [$f,$d,$s,$:| _] = FdList ->
-		  ?line chk_chkio_port(Port),
-		  sleep(500),
-		  ?line chk_chkio_port(Port),
-		  ?line Res = chkio_test(Hndl,
-					 ?CHKIO_STEAL,
-					 FdList,
-					 fun () ->
-						 ?line chk_chkio_port(Port),
-						 ?line sleep(500),
-						 ?line chk_chkio_port(Port)
-					 end),
-		  ?line case erlang:port_control(Port, ?CHKIO_STOP, "") of
-			    "ok" ->
-				?line chk_chkio_port(Port),
-				?line ok;
-			    StopErr ->
-				?line chk_chkio_port(Port),
-				?line ?t:fail({stop_error, StopErr})
-			end,
-		  ?line close_chkio_port(Port),
-		  ?line Res;
-	      [$s,$k,$i,$p,$:,$\ |Skip] ->
-		  ?line chk_chkio_port(Port),
-		  ?line close_chkio_port(Port),
-		  {chkio_test_result,
-		   {skipped, Skip},
-		   Before};
-	      StartErr ->
-		  ?line chk_chkio_port(Port),
-		  ?line ?t:fail({start_error, StartErr})
-	  end.
+    Port = open_chkio_port(),
+    case erlang:port_control(Port, ?CHKIO_STEAL_AUX, "") of
+        [$f,$d,$s,$:| _] = FdList ->
+            chk_chkio_port(Port),
+            sleep(500),
+            chk_chkio_port(Port),
+            Res = chkio_test(Hndl,
+                             ?CHKIO_STEAL,
+                             FdList,
+                             fun () ->
+                                     chk_chkio_port(Port),
+                                     sleep(500),
+                                     chk_chkio_port(Port)
+                             end),
+            case erlang:port_control(Port, ?CHKIO_STOP, "") of
+                "ok" ->
+                    chk_chkio_port(Port),
+                    ok;
+                StopErr ->
+                    chk_chkio_port(Port),
+                    ct:fail({stop_error, StopErr})
+            end,
+            close_chkio_port(Port),
+            Res;
+        [$s,$k,$i,$p,$:,$\ |Skip] ->
+            chk_chkio_port(Port),
+            close_chkio_port(Port),
+            {chkio_test_result,
+             {skipped, Skip},
+             Before};
+        StartErr ->
+            chk_chkio_port(Port),
+            ct:fail({start_error, StartErr})
+    end.
 
 chkio_test_init(Config) when is_list(Config) ->
-    ?line ChkIo = get_stable_check_io_info(),
-    ?line case catch lists:keysearch(name, 1, ChkIo) of
-	      {value, {name, erts_poll}} ->
-		  ?line ?t:format("Before test: ~p~n", [ChkIo]),
-		  ?line Path = ?config(data_dir, Config),
-		  ?line erl_ddll:start(),
-		  ?line ok = load_driver(Path, 'chkio_drv'),
-		  ?line process_flag(trap_exit, true),
-		  ?line {erts_poll_info, ChkIo};
-	      _ ->
-		  ?line {skipped, "Test written to test erts_poll() which isn't used"}
-	  end.
-		  
+    ChkIo = get_stable_check_io_info(),
+    case catch lists:keysearch(name, 1, ChkIo) of
+        {value, {name, erts_poll}} ->
+            io:format("Before test: ~p~n", [ChkIo]),
+            Path = proplists:get_value(data_dir, Config),
+            erl_ddll:start(),
+            ok = load_driver(Path, 'chkio_drv'),
+            process_flag(trap_exit, true),
+            {erts_poll_info, ChkIo};
+        _ ->
+            {skipped, "Test written to test erts_poll() which isn't used"}
+    end.
+
 
 chkio_test_fini({skipped, _} = Res) ->
     Res;
 chkio_test_fini({chkio_test_result, Res, Before}) ->
-    ?line ok = erl_ddll:unload_driver('chkio_drv'),
-    ?line ok = erl_ddll:stop(),
-    ?line After = get_stable_check_io_info(),
-    ?line ?t:format("After test: ~p~n", [After]),
-    ?line verify_chkio_state(Before, After),
-    ?line Res.
+    ok = erl_ddll:unload_driver('chkio_drv'),
+    ok = erl_ddll:stop(),
+    After = get_stable_check_io_info(),
+    io:format("After test: ~p~n", [After]),
+    verify_chkio_state(Before, After),
+    Res.
 
 open_chkio_port() ->
     open_port({spawn, 'chkio_drv'}, []).
@@ -951,269 +918,255 @@ open_chkio_port() ->
 close_chkio_port(Port) when is_port(Port) ->
     true = erlang:port_close(Port),
     receive
-	{'EXIT', Port, normal} ->
-	    ok;
-	{'EXIT', Port, Reason} ->
-	    ?t:fail({abnormal_port_exit, Port, Reason});
-	{Port, Message} ->
-	    ?t:fail({strange_message_from_port, Message})
+        {'EXIT', Port, normal} ->
+            ok;
+        {'EXIT', Port, Reason} ->
+            ct:fail({abnormal_port_exit, Port, Reason});
+        {Port, Message} ->
+            ct:fail({strange_message_from_port, Message})
     end.
 
 chk_chkio_port(Port) ->
     receive
-	{'EXIT', Port, Reason} when Reason /= normal ->
-	    ?t:fail({port_exited, Port, Reason})
+        {'EXIT', Port, Reason} when Reason /= normal ->
+            ct:fail({port_exited, Port, Reason})
     after 0 ->
-	    ok
+              ok
     end.
-	    
+
 
 chkio_test({skipped, _} = Res, _Test, _Fun) ->
-    ?line Res;
+    Res;
 chkio_test({erts_poll_info, _Before} = EPI, Test, Fun) when is_integer(Test) ->
     chkio_test(EPI, Test, "", Fun).
 
 chkio_test({skipped, _} = Res, _Test, _TestArgs, _Fun) ->
-    ?line Res;
+    Res;
 chkio_test({erts_poll_info, Before},
-	   Test,
-	   TestArgs,
-	   Fun) when is_integer(Test),
-		     is_list(TestArgs) ->
-    ?line Port = open_chkio_port(),
-    ?line case erlang:port_control(Port, Test, TestArgs) of
-	      "ok" ->
-		  ?line chk_chkio_port(Port),
-		  ?line Fun(),
-		  ?line During = erlang:system_info(check_io),
-		  ?line erlang:display(During),
-		  ?line 0 = element(1, erts_debug:get_internal_state(check_io_debug)),
-		  ?line ?t:format("During test: ~p~n", [During]),
-		  ?line chk_chkio_port(Port),
-		  ?line case erlang:port_control(Port, ?CHKIO_STOP, "") of
-			    Res when is_list(Res) ->
-				?line chk_chkio_port(Port),
-				?line ?t:format("~s", [Res]),
-				?line close_chkio_port(Port),
-				?line Res,
-				?line case Res of
-					  [$c,$o,$m,$m,$e,$n,$t,$:,$\ |Cmnt] ->
-					      ?line {chkio_test_result,
-						     {comment, Cmnt},
-						     Before};
-					  _ ->
-					      ?line {chkio_test_result,
-						     Res,
-						     Before}
-				      end;
-			    StopErr ->
-				?line chk_chkio_port(Port),
-				?line ?t:fail({stop_error, StopErr})
-			end;
-	      [$s,$k,$i,$p,$:,$\ |Skip] ->
-		  ?line chk_chkio_port(Port),
-		  ?line close_chkio_port(Port),
-		  {chkio_test_result,
-		   {skipped, Skip},
-		   Before};
-	      StartErr ->
-		  ?line chk_chkio_port(Port),
-		  ?line ?t:fail({start_error, StartErr})
-	  end.
+           Test,
+           TestArgs,
+           Fun) when is_integer(Test),
+                     is_list(TestArgs) ->
+    Port = open_chkio_port(),
+    case erlang:port_control(Port, Test, TestArgs) of
+        "ok" ->
+            chk_chkio_port(Port),
+            Fun(),
+            During = erlang:system_info(check_io),
+            erlang:display(During),
+            0 = element(1, erts_debug:get_internal_state(check_io_debug)),
+            io:format("During test: ~p~n", [During]),
+            chk_chkio_port(Port),
+            case erlang:port_control(Port, ?CHKIO_STOP, "") of
+                Res when is_list(Res) ->
+                    chk_chkio_port(Port),
+                    io:format("~s", [Res]),
+                    close_chkio_port(Port),
+                    Res,
+                    case Res of
+                        [$c,$o,$m,$m,$e,$n,$t,$:,$\ |Cmnt] ->
+                            {chkio_test_result,
+                             {comment, Cmnt},
+                             Before};
+                        _ ->
+                            {chkio_test_result,
+                             Res,
+                             Before}
+                    end;
+                StopErr ->
+                    chk_chkio_port(Port),
+                    ct:fail({stop_error, StopErr})
+            end;
+        [$s,$k,$i,$p,$:,$\ |Skip] ->
+            chk_chkio_port(Port),
+            close_chkio_port(Port),
+            {chkio_test_result,
+             {skipped, Skip},
+             Before};
+        StartErr ->
+            chk_chkio_port(Port),
+            ct:fail({start_error, StartErr})
+    end.
 
 verify_chkio_state(Before, After) ->
-    ?line TotSetSize = lists:keysearch(total_poll_set_size, 1, Before),
-    ?line TotSetSize = lists:keysearch(total_poll_set_size, 1, After),
-    ?line case lists:keysearch(fallback, 1, Before) of
-	      {value,{fallback,false}} ->
-		  ?line ok;
-	      _ ->
-		  ?line BckupSetSize = lists:keysearch(fallback_poll_set_size,
-						       1,
-						       Before),
-		  ?line BckupSetSize = lists:keysearch(fallback_poll_set_size,
-						       1,
-						       After)
-	  end,
-    ?line ok.
+    TotSetSize = lists:keysearch(total_poll_set_size, 1, Before),
+    TotSetSize = lists:keysearch(total_poll_set_size, 1, After),
+    case lists:keysearch(fallback, 1, Before) of
+        {value,{fallback,false}} ->
+            ok;
+        _ ->
+            BckupSetSize = lists:keysearch(fallback_poll_set_size,
+                                           1,
+                                           Before),
+            BckupSetSize = lists:keysearch(fallback_poll_set_size,
+                                           1,
+                                                       After)
+    end,
+    ok.
 
 get_stable_check_io_info() ->
     ChkIo = erlang:system_info(check_io),
     PendUpdNo = case lists:keysearch(pending_updates, 1, ChkIo) of
-		    {value, {pending_updates, PendNo}} ->
-			PendNo;
-		    false ->
-			0
-		end,
+                    {value, {pending_updates, PendNo}} ->
+                        PendNo;
+                    false ->
+                        0
+                end,
     {value, {active_fds, ActFds}} = lists:keysearch(active_fds, 1, ChkIo),
     case {PendUpdNo, ActFds} of
-	{0, 0} ->
-	    ChkIo;
-	_ ->
-	    receive after 10 -> ok end,
-	    get_stable_check_io_info()
+        {0, 0} ->
+            ChkIo;
+        _ ->
+            receive after 10 -> ok end,
+            get_stable_check_io_info()
     end.
 
-otp_6602(doc) -> ["Missed port lock when stealing control of fd from a "
-		  "driver that didn't use the same lock. The lock checker "
-		  "used to trigger on this and dump core."];
-otp_6602(suite) ->
-    [];
+%% Missed port lock when stealing control of fd from a
+%% driver that didn't use the same lock. The lock checker
+%% used to trigger on this and dump core.
 otp_6602(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_node(Config),
-    ?line Done = make_ref(),
-    ?line Parent = self(),
-    ?line Tester = spawn_link(Node,
-			      fun () ->
-				      %% Inet driver use port locking...
-				      {ok, S} = gen_udp:open(0),
-				      {ok, Fd} = inet:getfd(S),
-				      %% Steal fd (lock checker used to
-				      %% trigger here).
-				      {ok, _S2} = gen_udp:open(0,[{fd,Fd}]),
-				      Parent ! Done
-			      end),
-    ?line receive Done -> ok end,
-    ?line unlink(Tester),
-    ?line stop_node(Node),
-    ?line ok.
+    {ok, Node} = start_node(Config),
+    Done = make_ref(),
+    Parent = self(),
+    Tester = spawn_link(Node,
+                        fun () ->
+                                %% Inet driver use port locking...
+                                {ok, S} = gen_udp:open(0),
+                                {ok, Fd} = inet:getfd(S),
+                                %% Steal fd (lock checker used to
+                                %% trigger here).
+                                {ok, _S2} = gen_udp:open(0,[{fd,Fd}]),
+                                Parent ! Done
+                        end),
+    receive Done -> ok end,
+    unlink(Tester),
+    stop_node(Node),
+    ok.
 
 -define(EXPECTED_SYSTEM_INFO_NAMES1,
-	["drv_drv_vsn",
-	 "emu_drv_vsn",
-	 "erts_vsn",
-	 "otp_vsn",
-	 "thread",
-	 "smp"]).
+        ["drv_drv_vsn",
+         "emu_drv_vsn",
+         "erts_vsn",
+         "otp_vsn",
+         "thread",
+         "smp"]).
 -define(EXPECTED_SYSTEM_INFO_NAMES2,
-	(?EXPECTED_SYSTEM_INFO_NAMES1 ++
-	 ["async_thrs",
-	  "sched_thrs"])).
+        (?EXPECTED_SYSTEM_INFO_NAMES1 ++
+         ["async_thrs",
+          "sched_thrs"])).
 
 -define(EXPECTED_SYSTEM_INFO_NAMES3,
-	(?EXPECTED_SYSTEM_INFO_NAMES2 ++
-	 ["emu_nif_vsn"])).
+        (?EXPECTED_SYSTEM_INFO_NAMES2 ++
+         ["emu_nif_vsn"])).
 
 -define(EXPECTED_SYSTEM_INFO_NAMES4,
-	(?EXPECTED_SYSTEM_INFO_NAMES3 ++
-	 ["dirty_sched"])).
+        (?EXPECTED_SYSTEM_INFO_NAMES3 ++
+         ["dirty_sched"])).
 
 -define(EXPECTED_SYSTEM_INFO_NAMES, ?EXPECTED_SYSTEM_INFO_NAMES4).
 
-'driver_system_info_base_ver'(doc) ->
-    [];
-'driver_system_info_base_ver'(suite) ->
-    [];
 'driver_system_info_base_ver'(Config) when is_list(Config) ->
-    ?line driver_system_info_test(Config, sys_info_base_drv).
+ driver_system_info_test(Config, sys_info_base_drv).
 
-'driver_system_info_prev_ver'(doc) ->
-    [];
-'driver_system_info_prev_ver'(suite) ->
-    [];
 'driver_system_info_prev_ver'(Config) when is_list(Config) ->
-    ?line driver_system_info_test(Config, sys_info_prev_drv).
+ driver_system_info_test(Config, sys_info_prev_drv).
 
-driver_system_info_current_ver(doc) ->    
-    [];
-driver_system_info_current_ver(suite) ->
-    [];
 driver_system_info_current_ver(Config) when is_list(Config) ->
-    ?line driver_system_info_test(Config, sys_info_curr_drv).
+    driver_system_info_test(Config, sys_info_curr_drv).
 
 driver_system_info_test(Config, Name) ->
-    ?line Port = start_driver(Config, Name, false),
-    ?line case erlang:port_control(Port, 0, []) of
-	      [$o,$k,$:,_ | Result] ->
-		  ?line check_driver_system_info_result(Result);
-	      [$e,$r,$r,$o,$r,$:,_ | Error] ->
-		  ?line ?t:fail(Error);
-	      Unexpected ->
-		  ?line ?t:fail({unexpected_result, Unexpected})
-	  end,
-    ?line stop_driver(Port, Name),
-    ?line ok.
+    Port = start_driver(Config, Name, false),
+    case erlang:port_control(Port, 0, []) of
+        [$o,$k,$:,_ | Result] ->
+            check_driver_system_info_result(Result);
+        [$e,$r,$r,$o,$r,$:,_ | Error] ->
+            ct:fail(Error);
+        Unexpected ->
+            ct:fail({unexpected_result, Unexpected})
+    end,
+    stop_driver(Port, Name),
+    ok.
 
 check_driver_system_info_result(Result) ->
-    ?line ?t:format("All names: ~p~n", [?EXPECTED_SYSTEM_INFO_NAMES]),
-    ?line ?t:format("Result: ~p~n", [Result]),
-    ?line {[], Ns, DDVSN} = chk_sis(lists:map(fun (Str) ->
-						      string:tokens(Str, "=")
-					      end,
-					      string:tokens(Result, " ")),
-				    ?EXPECTED_SYSTEM_INFO_NAMES),
-    ?line case {DDVSN,
-		drv_vsn_str2tup(erlang:system_info(driver_version))} of
-	      {DDVSN, DDVSN} ->
-		  ?line [] = Ns;
-	      %% {{1, 0}, _} ->
-	      %% 	  ?line ExpNs = lists:sort(?EXPECTED_SYSTEM_INFO_NAMES
-	      %% 				   -- ?EXPECTED_SYSTEM_INFO_NAMES1),
-	      %% 	  ?line ExpNs = lists:sort(Ns);
-	      %% {{1, 1}, _} ->
-	      %% 	  ?line ExpNs = lists:sort(?EXPECTED_SYSTEM_INFO_NAMES
-	      %% 				   -- ?EXPECTED_SYSTEM_INFO_NAMES2),
-	      %% 	  ?line ExpNs = lists:sort(Ns);
-	      {{3, 0}, _} ->
-		  ?line ExpNs = lists:sort(?EXPECTED_SYSTEM_INFO_NAMES
-					   -- ?EXPECTED_SYSTEM_INFO_NAMES3),
-		  ?line ExpNs = lists:sort(Ns)
-	  end.
+    io:format("All names: ~p~n", [?EXPECTED_SYSTEM_INFO_NAMES]),
+    io:format("Result: ~p~n", [Result]),
+    {[], Ns, DDVSN} = chk_sis(lists:map(fun (Str) ->
+                                                string:tokens(Str, "=")
+                                        end,
+                                        string:tokens(Result, " ")),
+                              ?EXPECTED_SYSTEM_INFO_NAMES),
+    case {DDVSN,
+          drv_vsn_str2tup(erlang:system_info(driver_version))} of
+        {DDVSN, DDVSN} ->
+            [] = Ns;
+        %% {{1, 0}, _} ->
+        %% 	  ExpNs = lists:sort(?EXPECTED_SYSTEM_INFO_NAMES
+        %% 				   -- ?EXPECTED_SYSTEM_INFO_NAMES1),
+        %% 	  ExpNs = lists:sort(Ns);
+        %% {{1, 1}, _} ->
+        %% 	  ExpNs = lists:sort(?EXPECTED_SYSTEM_INFO_NAMES
+        %% 				   -- ?EXPECTED_SYSTEM_INFO_NAMES2),
+        %% 	  ExpNs = lists:sort(Ns);
+        {{3, 0}, _} ->
+            ExpNs = lists:sort(?EXPECTED_SYSTEM_INFO_NAMES
+                               -- ?EXPECTED_SYSTEM_INFO_NAMES3),
+            ExpNs = lists:sort(Ns)
+    end.
 
 chk_sis(SIs, Ns) ->
     chk_sis(SIs, Ns, unknown).
 
 chk_sis(SIs, [], DDVSN) ->
-    ?line {SIs, [], DDVSN};
+    {SIs, [], DDVSN};
 chk_sis([], Ns, DDVSN) ->
-    ?line {[], Ns, DDVSN};
+    {[], Ns, DDVSN};
 chk_sis([[N, _] = SI| SIs], Ns, DDVSN) ->
-    ?line true = lists:member(N, Ns),
-    ?line case check_si_res(SI) of
-	      {driver_version, NewDDVSN} ->
-		  ?line chk_sis(SIs, lists:delete(N, Ns), NewDDVSN);
-	      _ ->
-		  ?line chk_sis(SIs, lists:delete(N, Ns), DDVSN)
-	  end.
+    true = lists:member(N, Ns),
+    case check_si_res(SI) of
+        {driver_version, NewDDVSN} ->
+            chk_sis(SIs, lists:delete(N, Ns), NewDDVSN);
+        _ ->
+            chk_sis(SIs, lists:delete(N, Ns), DDVSN)
+    end.
 
 %% Data in first version of driver_system_info() (driver version 1.0)
 check_si_res(["drv_drv_vsn", Value]) ->
-    ?line DDVSN = drv_vsn_str2tup(Value),
-    ?line {Major, DMinor} = DDVSN,
-    ?line {Major, EMinor} = drv_vsn_str2tup(erlang:system_info(driver_version)),
-    ?line true = DMinor =< EMinor,
-    ?line {driver_version, DDVSN};
+    DDVSN = drv_vsn_str2tup(Value),
+    {Major, DMinor} = DDVSN,
+    {Major, EMinor} = drv_vsn_str2tup(erlang:system_info(driver_version)),
+    true = DMinor =< EMinor,
+    {driver_version, DDVSN};
 check_si_res(["emu_drv_vsn", Value]) ->
-    ?line Value = erlang:system_info(driver_version);
+    Value = erlang:system_info(driver_version);
 check_si_res(["erts_vsn", Value]) ->
-    ?line Value = erlang:system_info(version);
+    Value = erlang:system_info(version);
 check_si_res(["otp_vsn", Value]) ->
-    ?line Value = erlang:system_info(otp_release);
+    Value = erlang:system_info(otp_release);
 check_si_res(["thread", "true"]) ->
-    ?line true = erlang:system_info(threads);
+    true = erlang:system_info(threads);
 check_si_res(["thread", "false"]) ->
-    ?line false = erlang:system_info(threads);
+    false = erlang:system_info(threads);
 check_si_res(["smp", "true"]) ->
-    ?line true = erlang:system_info(smp_support);
+    true = erlang:system_info(smp_support);
 check_si_res(["smp", "false"]) ->
-    ?line false = erlang:system_info(smp_support);
+    false = erlang:system_info(smp_support);
 
 %% Data added in second version of driver_system_info() (driver version 1.1)
 check_si_res(["async_thrs", Value]) ->
-    ?line Value = integer_to_list(erlang:system_info(thread_pool_size));
+    Value = integer_to_list(erlang:system_info(thread_pool_size));
 check_si_res(["sched_thrs", Value]) ->
-    ?line Value = integer_to_list(erlang:system_info(schedulers));
+    Value = integer_to_list(erlang:system_info(schedulers));
 
 %% Data added in 3rd version of driver_system_info() (driver version 1.5)
 check_si_res(["emu_nif_vsn", Value]) ->
-    ?line Value = erlang:system_info(nif_version);
+    Value = erlang:system_info(nif_version);
 
 %% Data added in 4th version of driver_system_info() (driver version 3.1)
 check_si_res(["dirty_sched", _Value]) ->
     true;
 
 check_si_res(Unexpected) ->
-    ?line ?t:fail({unexpected_result, Unexpected}).
+    ct:fail({unexpected_result, Unexpected}).
 
 -define(MON_OP_I_AM_IPID,1).
 -define(MON_OP_MONITOR_ME,2).
@@ -1221,171 +1174,168 @@ check_si_res(Unexpected) ->
 -define(MON_OP_MONITOR_ME_LATER,4).
 -define(MON_OP_DO_DELAYED_MONITOR,5).
 
-driver_monitor(suite) ->
-    [];
-driver_monitor(doc) ->    
-    ["Test monitoring of processes from drivers"];
+%% Test monitoring of processes from drivers
 driver_monitor(Config) when is_list(Config) ->
-    ?line Name = monitor_drv,
-    ?line Port = start_driver(Config, Name, false),
-    ?line "ok" = port_control(Port,?MON_OP_I_AM_IPID,[]),
-    ?line "ok" = port_control(Port,?MON_OP_MONITOR_ME,[]),
-    ?line "ok" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
-    ?line {monitors, []} = erlang:port_info(Port,monitors),
-    
-    ?line "ok:"++Id1 = port_control(Port,?MON_OP_MONITOR_ME_LATER,[]),
-    ?line {monitored_by, []} = process_info(self(),monitored_by),
-    ?line "ok" = port_control(Port,?MON_OP_DO_DELAYED_MONITOR,Id1),
-    ?line {monitored_by, [Port]} = process_info(self(),monitored_by),
-    ?line "ok" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
-    ?line {monitored_by, []} = process_info(self(),monitored_by),
-    
-    ?line "ok" = port_control(Port,?MON_OP_MONITOR_ME,[]),
-    ?line Me = self(),
-    ?line {Pid1,Ref1} =
-	spawn_monitor(fun() ->
-			      Me ! port_control(Port,?MON_OP_MONITOR_ME,[]), 
-			      Me ! process_info(self(),monitored_by), 
-			      Me ! erlang:port_info(Port,monitors) 
-		      end),
-    ?line ok = receive
-		   "ok" ->
-		       ok
-	       after 1000 ->
-		       timeout
-	       end,
-    ?line ok = receive
-		   {monitored_by, L} ->
-		       L2 = lists:sort(L),
-		       L3 = lists:sort([Me,Port]),
-		       case L2 of
-			   L3 ->
-			       ok;
-			   _ ->
-			       mismatch
-		       end
-	       after 1000 ->
-		       timeout
-	       end,
-    ?line ok = receive
-		   {monitors, LL} ->
-		       LL2 = lists:sort(LL),
-		       LL3 = lists:sort([{process,Me},{process,Pid1}]),
-		       case LL2 of
-			   LL3 ->
-			       ok;
-			   _ ->
-			       mismatch
-		       end
-	       after 1000 ->
-		       timeout
-	       end,
-    ?line ok = receive
-		   {'DOWN', Ref1, process, Pid1, _} ->
-		       ok
-	       after 1000 ->
-		       timeout
-	       end,
-    ?line ok = receive
-		   {monitor_fired,Port,Pid1} ->
-		       ok
-	       after 1000 ->
-		       timeout
-	       end,
-    ?line "ok" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
-    ?line {monitors,[]} = erlang:port_info(Port,monitors),
-    ?line {monitored_by, []} = process_info(self(),monitored_by),
-
-    ?line "ok" = port_control(Port,?MON_OP_MONITOR_ME,[]),
-    ?line {Pid2,Ref2} =
-	spawn_monitor(fun() -> 			       
-			      receive go -> ok end,
-			      Me ! port_control(Port,?MON_OP_MONITOR_ME_LATER,[]), 
-			      Me ! process_info(self(),monitored_by), 
-			      Me ! erlang:port_info(Port,monitors) 
-		      end),
-    ?line Pid2 ! go,
-    ?line {ok,Id2} = receive
-		   "ok:"++II ->
-		       {ok,II}
-	       after 1000 ->
-		       timeout
-	       end,
-    ?line ok = receive
-		   {monitored_by, [Me]} ->
-		       ok
-	       after 1000 ->
-		       timeout
-	       end,
-    ?line ok = receive
-		   {monitors, [{process,Me}]} ->
-		       ok
-	       after 1000 ->
-		       timeout
-	       end,
-    ?line ok = receive
-		   {'DOWN', Ref2, process, Pid2, _} ->
-		       ok
-	       after 1000 ->
-		       timeout
-	       end,
-    ?line "noproc" = port_control(Port,?MON_OP_DO_DELAYED_MONITOR,Id2),
-    ?line {monitors,[{process,Me}]} = erlang:port_info(Port,monitors),
-    ?line "ok" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
-    ?line "not_monitored" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
-    ?line {monitors,[]} = erlang:port_info(Port,monitors),
-    ?line {monitored_by, []} = process_info(self(),monitored_by),
-
-
-    ?line "ok" = port_control(Port,?MON_OP_MONITOR_ME,[]),
-    ?line {Pid3,Ref3} =
-	spawn_monitor(fun() ->
-			      receive go -> ok end,
-			      Me ! port_control(Port,?MON_OP_MONITOR_ME_LATER,[]), 
-			      Me ! process_info(self(),monitored_by), 
-			      Me ! erlang:port_info(Port,monitors) ,
-			      receive die -> ok end
-		      end),
-    ?line Pid3 ! go,
-    ?line {ok,Id3} = receive
-		   "ok:"++III ->
-		       {ok,III}
-	       after 1000 ->
-		       timeout
-	       end,
-    ?line ok = receive
-		   {monitored_by, [Me]} ->
-		       ok
-	       after 1000 ->
-		       timeout
-	       end,
-    ?line ok = receive
-		   {monitors, [{process,Me}]} ->
-		       ok
-	       after 1000 ->
-		       timeout
-	       end,
-    ?line "ok" = port_control(Port,?MON_OP_DO_DELAYED_MONITOR,Id3),
-    ?line LLL1 = lists:sort([{process,Me},{process,Pid3}]),
-    ?line {monitors,LLL2} = erlang:port_info(Port,monitors),
-    ?line LLL1 = lists:sort(LLL2),
-    ?line "ok" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
-    ?line {monitors,[{process,Pid3}]} = erlang:port_info(Port,monitors),
-    ?line Pid3 ! die,
-    ?line ok = receive
-		   {'DOWN', Ref3, process, Pid3, _} ->
-		       ok
-	       after 1000 ->
-		       timeout
-	       end,
-    ?line "not_found" = port_control(Port,?MON_OP_DO_DELAYED_MONITOR,Id2),
-    ?line {monitors,[]} = erlang:port_info(Port,monitors),
-    ?line "not_monitored" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
-    ?line {monitors,[]} = erlang:port_info(Port,monitors),
-    ?line {monitored_by, []} = process_info(self(),monitored_by),
-    
-    ?line stop_driver(Port, Name),
-    ?line ok.
+    Name = monitor_drv,
+    Port = start_driver(Config, Name, false),
+    "ok" = port_control(Port,?MON_OP_I_AM_IPID,[]),
+    "ok" = port_control(Port,?MON_OP_MONITOR_ME,[]),
+    "ok" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
+    {monitors, []} = erlang:port_info(Port,monitors),
+
+    "ok:"++Id1 = port_control(Port,?MON_OP_MONITOR_ME_LATER,[]),
+    {monitored_by, []} = process_info(self(),monitored_by),
+    "ok" = port_control(Port,?MON_OP_DO_DELAYED_MONITOR,Id1),
+    {monitored_by, [Port]} = process_info(self(),monitored_by),
+    "ok" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
+    {monitored_by, []} = process_info(self(),monitored_by),
+
+    "ok" = port_control(Port,?MON_OP_MONITOR_ME,[]),
+    Me = self(),
+    {Pid1,Ref1} =
+    spawn_monitor(fun() ->
+                          Me ! port_control(Port,?MON_OP_MONITOR_ME,[]), 
+                          Me ! process_info(self(),monitored_by), 
+                          Me ! erlang:port_info(Port,monitors) 
+                  end),
+    ok = receive
+             "ok" ->
+                 ok
+         after 1000 ->
+                   timeout
+         end,
+    ok = receive
+             {monitored_by, L} ->
+                 L2 = lists:sort(L),
+                 L3 = lists:sort([Me,Port]),
+                 case L2 of
+                     L3 ->
+                         ok;
+                     _ ->
+                         mismatch
+                 end
+         after 1000 ->
+                   timeout
+         end,
+    ok = receive
+             {monitors, LL} ->
+                 LL2 = lists:sort(LL),
+                 LL3 = lists:sort([{process,Me},{process,Pid1}]),
+                 case LL2 of
+                     LL3 ->
+                         ok;
+                     _ ->
+                         mismatch
+                 end
+         after 1000 ->
+                   timeout
+         end,
+    ok = receive
+             {'DOWN', Ref1, process, Pid1, _} ->
+                 ok
+         after 1000 ->
+                   timeout
+         end,
+    ok = receive
+             {monitor_fired,Port,Pid1} ->
+                 ok
+         after 1000 ->
+                   timeout
+         end,
+    "ok" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
+    {monitors,[]} = erlang:port_info(Port,monitors),
+    {monitored_by, []} = process_info(self(),monitored_by),
+
+    "ok" = port_control(Port,?MON_OP_MONITOR_ME,[]),
+    {Pid2,Ref2} =
+    spawn_monitor(fun() -> 			       
+                          receive go -> ok end,
+                          Me ! port_control(Port,?MON_OP_MONITOR_ME_LATER,[]), 
+                          Me ! process_info(self(),monitored_by), 
+                          Me ! erlang:port_info(Port,monitors) 
+                  end),
+    Pid2 ! go,
+    {ok,Id2} = receive
+                   "ok:"++II ->
+                       {ok,II}
+               after 1000 ->
+                         timeout
+               end,
+    ok = receive
+             {monitored_by, [Me]} ->
+                 ok
+         after 1000 ->
+                   timeout
+         end,
+    ok = receive
+             {monitors, [{process,Me}]} ->
+                 ok
+         after 1000 ->
+                   timeout
+         end,
+    ok = receive
+             {'DOWN', Ref2, process, Pid2, _} ->
+                 ok
+         after 1000 ->
+                   timeout
+         end,
+    "noproc" = port_control(Port,?MON_OP_DO_DELAYED_MONITOR,Id2),
+    {monitors,[{process,Me}]} = erlang:port_info(Port,monitors),
+    "ok" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
+    "not_monitored" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
+    {monitors,[]} = erlang:port_info(Port,monitors),
+    {monitored_by, []} = process_info(self(),monitored_by),
+
+
+    "ok" = port_control(Port,?MON_OP_MONITOR_ME,[]),
+    {Pid3,Ref3} =
+    spawn_monitor(fun() ->
+                          receive go -> ok end,
+                          Me ! port_control(Port,?MON_OP_MONITOR_ME_LATER,[]), 
+                          Me ! process_info(self(),monitored_by), 
+                          Me ! erlang:port_info(Port,monitors) ,
+                          receive die -> ok end
+                  end),
+    Pid3 ! go,
+    {ok,Id3} = receive
+                   "ok:"++III ->
+                       {ok,III}
+               after 1000 ->
+                         timeout
+               end,
+    ok = receive
+             {monitored_by, [Me]} ->
+                 ok
+         after 1000 ->
+                   timeout
+         end,
+    ok = receive
+             {monitors, [{process,Me}]} ->
+                 ok
+         after 1000 ->
+                   timeout
+         end,
+    "ok" = port_control(Port,?MON_OP_DO_DELAYED_MONITOR,Id3),
+    LLL1 = lists:sort([{process,Me},{process,Pid3}]),
+    {monitors,LLL2} = erlang:port_info(Port,monitors),
+    LLL1 = lists:sort(LLL2),
+    "ok" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
+    {monitors,[{process,Pid3}]} = erlang:port_info(Port,monitors),
+    Pid3 ! die,
+    ok = receive
+             {'DOWN', Ref3, process, Pid3, _} ->
+                 ok
+         after 1000 ->
+                   timeout
+         end,
+    "not_found" = port_control(Port,?MON_OP_DO_DELAYED_MONITOR,Id2),
+    {monitors,[]} = erlang:port_info(Port,monitors),
+    "not_monitored" = port_control(Port,?MON_OP_DEMONITOR_ME,[]),
+    {monitors,[]} = erlang:port_info(Port,monitors),
+    {monitored_by, []} = process_info(self(),monitored_by),
+
+    stop_driver(Port, Name),
+    ok.
 
 
 -define(IOQ_EXIT_READY_INPUT, 1).
@@ -1399,726 +1349,663 @@ driver_monitor(Config) when is_list(Config) ->
 -define(IOQ_EXIT_EVENT_ASYNC, 9).
 
 ioq_exit_test(Config, TestNo) ->
-    ?line Drv = ioq_exit_drv,
-    ?line try
-	      begin
-		  ?line case load_driver(?config(data_dir, Config),
-						  Drv) of
-			    ok -> ?line ok;
-			    {error, permanent} -> ?line ok;
-			    LoadError -> ?line ?t:fail({load_error, LoadError})
-			end,
-		  case open_port({spawn, Drv}, []) of
-		      Port when is_port(Port) ->
-			      try port_control(Port, TestNo, "") of
-				  "ok" ->
-				      ?line ok;
-				  "nyiftos" ->
-				      ?line throw({skipped,
-						   "Not yet implemented for "
-						   "this OS"});
-				  [$s,$k,$i,$p,$:,$ | Comment] ->
-				      ?line throw({skipped, Comment});
-				  [$e,$r,$r,$o,$r,$:,$ | Error] ->
-				      ?line ?t:fail(Error)
-			      after
-				  Port ! {self(), close},
-				receive {Port, closed} -> ok end,
-				false = lists:member(Port, erlang:ports()),
-				ok
-			      end;
-		      Error ->
-			  ?line ?t:fail({open_port_failed, Error})
-		  end
-	      end
-	  catch
-	      throw:Term -> ?line Term
-	  after
-	      erl_ddll:unload_driver(Drv)
-	  end.
-
-ioq_exit_ready_input(doc) -> [];
-ioq_exit_ready_input(suite) -> [];
+    Drv = ioq_exit_drv,
+    try
+        begin
+            case load_driver(proplists:get_value(data_dir, Config),
+                             Drv) of
+                ok -> ok;
+                {error, permanent} -> ok;
+                LoadError -> ct:fail({load_error, LoadError})
+            end,
+            case open_port({spawn, Drv}, []) of
+                Port when is_port(Port) ->
+                    try port_control(Port, TestNo, "") of
+                        "ok" ->
+                            ok;
+                        "nyiftos" ->
+                            throw({skipped,
+                                   "Not yet implemented for "
+                                   "this OS"});
+                        [$s,$k,$i,$p,$:,$ | Comment] ->
+                            throw({skipped, Comment});
+                        [$e,$r,$r,$o,$r,$:,$ | Error] ->
+                            ct:fail(Error)
+                    after
+                        Port ! {self(), close},
+                        receive {Port, closed} -> ok end,
+                        false = lists:member(Port, erlang:ports()),
+                        ok
+                    end;
+                Error ->
+                    ct:fail({open_port_failed, Error})
+            end
+        end
+    catch
+        throw:Term -> Term
+    after
+        erl_ddll:unload_driver(Drv)
+    end.
+
 ioq_exit_ready_input(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_READY_INPUT).
 
-ioq_exit_ready_output(doc) -> [];
-ioq_exit_ready_output(suite) -> [];
 ioq_exit_ready_output(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_READY_OUTPUT).
 
-ioq_exit_timeout(doc) -> [];
-ioq_exit_timeout(suite) -> [];
 ioq_exit_timeout(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_TIMEOUT).
 
-ioq_exit_ready_async(doc) -> [];
-ioq_exit_ready_async(suite) -> [];
 ioq_exit_ready_async(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_READY_ASYNC).
 
-ioq_exit_event(doc) -> [];
-ioq_exit_event(suite) -> [];
 ioq_exit_event(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_EVENT).
 
-ioq_exit_ready_input_async(doc) -> [];
-ioq_exit_ready_input_async(suite) -> [];
 ioq_exit_ready_input_async(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_READY_INPUT_ASYNC).
 
-ioq_exit_ready_output_async(doc) -> [];
-ioq_exit_ready_output_async(suite) -> [];
 ioq_exit_ready_output_async(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_READY_OUTPUT_ASYNC).
 
-ioq_exit_timeout_async(doc) -> [];
-ioq_exit_timeout_async(suite) -> [];
 ioq_exit_timeout_async(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_TIMEOUT_ASYNC).
 
-ioq_exit_event_async(doc) -> [];
-ioq_exit_event_async(suite) -> [];
 ioq_exit_event_async(Config) when is_list(Config) ->
     ioq_exit_test(Config, ?IOQ_EXIT_EVENT_ASYNC).
 
 
 vsn_mismatch_test(Config, LoadResult) ->
-    ?line Path = ?config(data_dir, Config),
-    ?line DrvName = ?config(testcase, Config),
-    ?line LoadResult = load_driver(Path, DrvName),
-    ?line case LoadResult of
-	      ok ->
-		  ?line Port = open_port({spawn, DrvName}, []),
-		  ?line true = is_port(Port),
-		  ?line true = port_close(Port),
-		  ?line ok = erl_ddll:unload_driver(DrvName);
-	      _ ->
-		  ?line ok
-	  end.
-
-zero_extended_marker_garb_drv(doc) -> [];
-zero_extended_marker_garb_drv(suite) -> [];
+    Path = proplists:get_value(data_dir, Config),
+    DrvName = proplists:get_value(testcase, Config),
+    LoadResult = load_driver(Path, DrvName),
+    case LoadResult of
+        ok ->
+            Port = open_port({spawn, DrvName}, []),
+            true = is_port(Port),
+            true = port_close(Port),
+            ok = erl_ddll:unload_driver(DrvName);
+        _ ->
+            ok
+    end.
+
 zero_extended_marker_garb_drv(Config) when is_list(Config) ->
     vsn_mismatch_test(Config, {error, driver_incorrect_version}).
 
-invalid_extended_marker_drv(doc) -> [];
-invalid_extended_marker_drv(suite) -> [];
 invalid_extended_marker_drv(Config) when is_list(Config) ->
     vsn_mismatch_test(Config, {error, driver_incorrect_version}).
 
-larger_major_vsn_drv(doc) -> [];
-larger_major_vsn_drv(suite) -> [];
 larger_major_vsn_drv(Config) when is_list(Config) ->
     vsn_mismatch_test(Config, {error, driver_incorrect_version}).
 
-larger_minor_vsn_drv(doc) -> [];
-larger_minor_vsn_drv(suite) -> [];
 larger_minor_vsn_drv(Config) when is_list(Config) ->
     vsn_mismatch_test(Config, {error, driver_incorrect_version}).
 
-smaller_major_vsn_drv(doc) -> [];
-smaller_major_vsn_drv(suite) -> [];
 smaller_major_vsn_drv(Config) when is_list(Config) ->
     vsn_mismatch_test(Config, {error, driver_incorrect_version}).
 
-smaller_minor_vsn_drv(doc) -> [];
-smaller_minor_vsn_drv(suite) -> [];
 smaller_minor_vsn_drv(Config) when is_list(Config) ->
     DrvVsnStr = erlang:system_info(driver_version),
     case drv_vsn_str2tup(DrvVsnStr) of
-	{_, 0} ->
-	    {skipped,
-	     "Cannot perform test when minor driver version is 0. "
-	     "Current driver version is " ++ DrvVsnStr ++ "."};
-	_ ->
-	    vsn_mismatch_test(Config, ok)
+        {_, 0} ->
+            {skipped,
+             "Cannot perform test when minor driver version is 0. "
+             "Current driver version is " ++ DrvVsnStr ++ "."};
+        _ ->
+            vsn_mismatch_test(Config, ok)
     end.
 
 -define(PEEK_NONXQ_TEST, 0).
 -define(PEEK_NONXQ_WAIT, 1).
 
-peek_non_existing_queue(doc) -> [];
-peek_non_existing_queue(suite) -> [];
 peek_non_existing_queue(Config) when is_list(Config) ->
-    ?line OTE = process_flag(trap_exit, true),
-    ?line Drv = peek_non_existing_queue_drv,
-    ?line try
-	      begin
-		  ?line case load_driver(?config(data_dir, Config),
-						  Drv) of
-			    ok -> ?line ok;
-			    {error, permanent} -> ?line ok;
-			    LoadError -> ?line ?t:fail({load_error, LoadError})
-			end,
-		  case open_port({spawn, Drv}, []) of
-		      Port1 when is_port(Port1) ->
-			  try port_control(Port1, ?PEEK_NONXQ_TEST, "") of
-			      "ok" ->
-				  ?line ok;
-			      [$s,$k,$i,$p,$p,$e,$d,$:,$ | SkipReason] ->
-				  ?line throw({skipped, SkipReason});
-			      [$e,$r,$r,$o,$r,$:,$ | Error1] ->
-				  ?line ?t:fail(Error1)
-			  after
-			      exit(Port1, kill),
-			    receive {'EXIT', Port1, _} -> ok end
-			  end;
-		      Error1 ->
-			  ?line ?t:fail({open_port1_failed, Error1})
-		  end,
-		  case open_port({spawn, Drv}, []) of
-		      Port2 when is_port(Port2) ->
-			  try port_control(Port2, ?PEEK_NONXQ_WAIT, "") of
-			      "ok" ->
-				  ?line ok;
-			      [$e,$r,$r,$o,$r,$:,$ | Error2] ->
-				  ?line ?t:fail(Error2)
-			  after
-			      receive {Port2, test_successful} -> ok end,
-			    Port2 ! {self(), close},
-			    receive {Port2, closed} -> ok end
-			  end;
-		      Error2 ->
-			  ?line ?t:fail({open_port2_failed, Error2})
-		  end
-	      end
-	  catch
-	      throw:Term -> ?line Term
-	  after
-	      process_flag(trap_exit, OTE),
-	      erl_ddll:unload_driver(Drv)
-	  end.    
-
-otp_6879(doc) ->
-    [];
-otp_6879(suite) ->
-    [];
+    OTE = process_flag(trap_exit, true),
+    Drv = peek_non_existing_queue_drv,
+    try
+        begin
+            case load_driver(proplists:get_value(data_dir, Config),
+                             Drv) of
+                ok -> ok;
+                {error, permanent} -> ok;
+                LoadError -> ct:fail({load_error, LoadError})
+            end,
+            case open_port({spawn, Drv}, []) of
+                Port1 when is_port(Port1) ->
+                    try port_control(Port1, ?PEEK_NONXQ_TEST, "") of
+                        "ok" ->
+                            ok;
+                        [$s,$k,$i,$p,$p,$e,$d,$:,$ | SkipReason] ->
+                            throw({skipped, SkipReason});
+                        [$e,$r,$r,$o,$r,$:,$ | Error1] ->
+                            ct:fail(Error1)
+                    after
+                        exit(Port1, kill),
+                        receive {'EXIT', Port1, _} -> ok end
+                    end;
+                Error1 ->
+                    ct:fail({open_port1_failed, Error1})
+            end,
+            case open_port({spawn, Drv}, []) of
+                Port2 when is_port(Port2) ->
+                    try port_control(Port2, ?PEEK_NONXQ_WAIT, "") of
+                        "ok" ->
+                            ok;
+                        [$e,$r,$r,$o,$r,$:,$ | Error2] ->
+                            ct:fail(Error2)
+                    after
+                        receive {Port2, test_successful} -> ok end,
+                        Port2 ! {self(), close},
+                        receive {Port2, closed} -> ok end
+                    end;
+                Error2 ->
+                    ct:fail({open_port2_failed, Error2})
+            end
+        end
+    catch
+        throw:Term -> Term
+    after
+        process_flag(trap_exit, OTE),
+        erl_ddll:unload_driver(Drv)
+    end.    
+
 otp_6879(Config) when is_list(Config) ->
-    ?line Drv = 'otp_6879_drv',
-    ?line Parent = self(),
-    ?line ok = load_driver(?config(data_dir, Config), Drv),
-    ?line Procs = lists:map(
-		    fun (No) ->
-			    spawn_link(
-			      fun () ->
-				      case open_port({spawn, Drv}, []) of
-					  Port when is_port(Port) ->
-					      Res = otp_6879_call(Port, No, 10000),
-					      erlang:port_close(Port),
-					      Parent ! {self(), Res};
-					  _ ->
-					      Parent ! {self(),
-							open_port_failed}
-				      end
-			      end)
-		    end,
-		    lists:seq(1,10)),
-    ?line lists:foreach(fun (P) ->
-				?line receive
-					  {P, ok} ->
-					      ?line ok;
-					  {P, Error} ->
-					      ?line ?t:fail({P, Error})
-				      end
-			end,
-			Procs),
+    Drv = 'otp_6879_drv',
+    Parent = self(),
+    ok = load_driver(proplists:get_value(data_dir, Config), Drv),
+    Procs = lists:map(
+              fun (No) ->
+                      spawn_link(
+                        fun () ->
+                                case open_port({spawn, Drv}, []) of
+                                    Port when is_port(Port) ->
+                                        Res = otp_6879_call(Port, No, 10000),
+                                        erlang:port_close(Port),
+                                        Parent ! {self(), Res};
+                                    _ ->
+                                        Parent ! {self(),
+                                                  open_port_failed}
+                                end
+                        end)
+              end,
+              lists:seq(1,10)),
+    lists:foreach(fun (P) ->
+                          receive
+                              {P, ok} ->
+                                  ok;
+                              {P, Error} ->
+                                  ct:fail({P, Error})
+                          end
+                  end,
+                  Procs),
     %% Also try it when input exceeds default buffer (256 bytes)
-    ?line Data = lists:seq(1, 1000),
-    ?line case open_port({spawn, Drv}, []) of
-	      Port when is_port(Port) ->
-		  ?line ok = otp_6879_call(Port, Data, 10),
-		  ?line erlang:port_close(Port);
-	      _ ->
-		  ?line ?t:fail(open_port_failed)
-	  end,
-    ?line erl_ddll:unload_driver(Drv),
-    ?line ok.
+    Data = lists:seq(1, 1000),
+    case open_port({spawn, Drv}, []) of
+        Port when is_port(Port) ->
+            ok = otp_6879_call(Port, Data, 10),
+            erlang:port_close(Port);
+        _ ->
+            ct:fail(open_port_failed)
+    end,
+    erl_ddll:unload_driver(Drv),
+    ok.
 
 otp_6879_call(_Port, _Data, 0) ->
     ok;
 otp_6879_call(Port, Data, N) ->
     case catch erlang:port_call(Port, 0, Data) of
-	Data -> otp_6879_call(Port, Data, N-1);
-	BadData -> {mismatch, Data, BadData}
+        Data -> otp_6879_call(Port, Data, N-1);
+        BadData -> {mismatch, Data, BadData}
     end.
 
-caller(doc) ->
-    [];
-caller(suite) ->
-    [];
 caller(Config) when is_list(Config) ->
-    ?line run_caller_test(Config, false),
-    ?line run_caller_test(Config, true).
-    
+    run_caller_test(Config, false),
+    run_caller_test(Config, true).
+
 run_caller_test(Config, Outputv) ->
-    ?line Drv = 'caller_drv',
-    ?line Cmd = case Outputv of
-		    true ->
-			?line os:putenv("CALLER_DRV_USE_OUTPUTV",
-					"true"),
-			outputv;
-		    false ->
-			?line os:putenv("CALLER_DRV_USE_OUTPUTV",
-					"false"),
-			output
-		end,
-    ?line ok = load_driver(?config(data_dir, Config), Drv),
-    ?line Port = open_port({spawn, Drv}, []),
-    ?line true = is_port(Port),
-    ?line chk_caller(Port, start, self()),
-    ?line chk_caller(Port,
-		     Cmd,
-		     spawn_link(
-		       fun () ->
-			       port_command(Port, "")
-		       end)),
-    ?line Port ! {self(), {command, ""}},
-    ?line chk_caller(Port, Cmd, self()),
-    ?line chk_caller(Port,
-		     control,
-		     spawn_link(
-		       fun () ->
-			       port_control(Port, 0, "")
-		       end)),
-    ?line chk_caller(Port,
-		     call,
-		     spawn_link(
-		       fun () ->
-			       erlang:port_call(Port, 0, "")
-		       end)),
-    ?line true = port_close(Port),
-    ?line erl_ddll:unload_driver(Drv),
-    ?line ok.
+    Drv = 'caller_drv',
+    Cmd = case Outputv of
+              true ->
+                  os:putenv("CALLER_DRV_USE_OUTPUTV",
+                            "true"),
+                  outputv;
+              false ->
+                  os:putenv("CALLER_DRV_USE_OUTPUTV",
+                            "false"),
+                  output
+          end,
+    ok = load_driver(proplists:get_value(data_dir, Config), Drv),
+    Port = open_port({spawn, Drv}, []),
+    true = is_port(Port),
+    chk_caller(Port, start, self()),
+    chk_caller(Port,
+               Cmd,
+               spawn_link(
+                 fun () ->
+                         port_command(Port, "")
+                 end)),
+    Port ! {self(), {command, ""}},
+    chk_caller(Port, Cmd, self()),
+    chk_caller(Port,
+               control,
+               spawn_link(
+                 fun () ->
+                         port_control(Port, 0, "")
+                 end)),
+    chk_caller(Port,
+               call,
+               spawn_link(
+                 fun () ->
+                         erlang:port_call(Port, 0, "")
+                 end)),
+    true = port_close(Port),
+    erl_ddll:unload_driver(Drv),
+    ok.
 
 chk_caller(Port, Callback, ExpectedCaller) ->
     receive
-	{caller, Port, Callback, Caller} ->
-	    ExpectedCaller = Caller
+        {caller, Port, Callback, Caller} ->
+            ExpectedCaller = Caller
     end.
 
-many_events(suite) ->
-    [];
-many_events(doc) ->
-    ["Check that many simultaneously signalled events work (win32)"];
+%% Check that many simultaneously signalled events work (win32)
 many_events(Config) when is_list(Config) ->
-    ?line Name = 'many_events_drv',
-    ?line Port = start_driver(Config, Name, false),
+    Name = 'many_events_drv',
+    Port = start_driver(Config, Name, false),
     Number = "1000",
     Port ! {self(), {command, Number}},
     receive 
-	{Port, {data,Number}} ->
-	    ?line receive %% Just to make sure the emulator does not crash 
-		    %% after this case is run (if faulty)
-		      after 2000 ->
-			      ok
-		      end
+        {Port, {data,Number}} ->
+            receive %% Just to make sure the emulator does not crash 
+                %% after this case is run (if faulty)
+            after 2000 ->
+                      ok
+            end
     after 1000 ->
-	    ?line exit(the_driver_does_not_respond)
+              exit(the_driver_does_not_respond)
     end,
-    ?line stop_driver(Port, Name),
-    ?line ok.
-	     
-
-missing_callbacks(doc) ->
-    [];
-missing_callbacks(suite) ->
-    [];
+    stop_driver(Port, Name),
+    ok.
+
+
 missing_callbacks(Config) when is_list(Config) ->
-    ?line Name = 'missing_callback_drv',
-    ?line Port = start_driver(Config, Name, false),
+    Name = 'missing_callback_drv',
+    Port = start_driver(Config, Name, false),
 
-    ?line Port ! {self(), {command, "tjenix"}},
-    ?line true = erlang:port_command(Port, "halloj"),
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_control(Port, 4711, "mors")),
-    ?line {'EXIT', {badarg, _}} = (catch erlang:port_call(Port, 17, "hej")),
+    Port ! {self(), {command, "tjenix"}},
+    true = erlang:port_command(Port, "halloj"),
+    {'EXIT', {badarg, _}} = (catch erlang:port_control(Port, 4711, "mors")),
+    {'EXIT', {badarg, _}} = (catch erlang:port_call(Port, 17, "hej")),
 
-    ?line %% Give the (non-existing) ready_output(), ready_input(), event(),
-    ?line %% and timeout() some time to be called.
-    ?line receive after 1000 -> ok end,
+    %% Give the (non-existing) ready_output(), ready_input(), event(),
+    %% and timeout() some time to be called.
+    receive after 1000 -> ok end,
 
-    ?line stop_driver(Port, Name),
-    ?line ok.
+    stop_driver(Port, Name),
+    ok.
 
-smp_select(doc) ->
-    ["Test concurrent calls to driver_select."];
-smp_select(suite) ->
-    [];
+%% Test concurrent calls to driver_select.
 smp_select(Config) when is_list(Config) -> 
     case os:type() of
-	{win32,_} -> {skipped, "Test not implemented for this OS"};
-	_ -> smp_select0(Config)
+        {win32,_} -> {skipped, "Test not implemented for this OS"};
+        _ -> smp_select0(Config)
     end.
-    
+
 smp_select0(Config) ->
-    ?line DrvName = 'chkio_drv',
-    Path = ?config(data_dir, Config),
+    DrvName = 'chkio_drv',
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
-    ?line ok = load_driver(Path, DrvName),    
+    ok = load_driver(Path, DrvName),    
     Master = self(),
     ProcFun = fun()-> io:format("Worker ~p starting\n",[self()]),	
-		      ?line Port = open_port({spawn, DrvName}, []),
-		      smp_select_loop(Port, 100000),
-		      sleep(1000), % wait for driver to handle pending events
-		      ?line true = erlang:port_close(Port),
-		      Master ! {ok,self()},
-		      io:format("Worker ~p finished\n",[self()])
-	     end,
-    ?line Pids = lists:map(fun(_) -> spawn_link(ProcFun) end,
-			   lists:seq(1,4)),
+                      Port = open_port({spawn, DrvName}, []),
+                      smp_select_loop(Port, 100000),
+                      sleep(1000), % wait for driver to handle pending events
+                      true = erlang:port_close(Port),
+                      Master ! {ok,self()},
+                      io:format("Worker ~p finished\n",[self()])
+              end,
+    Pids = lists:map(fun(_) -> spawn_link(ProcFun) end,
+                     lists:seq(1,4)),
     TimeoutMsg = make_ref(),
     {ok,TRef} = timer:send_after(5*1000, TimeoutMsg), % Limit test duration on slow machines
     smp_select_wait(Pids, TimeoutMsg),
     timer:cancel(TRef),
-    ?line ok = erl_ddll:unload_driver(DrvName),
-    ?line ok = erl_ddll:stop(),
+    ok = erl_ddll:unload_driver(DrvName),
+    ok = erl_ddll:stop(),
     ok.
 
 smp_select_loop(_, 0) ->
     ok;
 smp_select_loop(Port, N) ->
-    ?line "ok" = erlang:port_control(Port, ?CHKIO_SMP_SELECT, []),
+    "ok" = erlang:port_control(Port, ?CHKIO_SMP_SELECT, []),
     receive
-	stop -> 
-	    io:format("Worker ~p stopped with ~p laps left\n",[self(), N]), 
-	    ok
+        stop -> 
+            io:format("Worker ~p stopped with ~p laps left\n",[self(), N]), 
+            ok
     after 0 ->
-	smp_select_loop(Port, N-1)
+              smp_select_loop(Port, N-1)
     end.
 
 smp_select_wait([], _) ->
     ok;
 smp_select_wait(Pids, TimeoutMsg) ->
     receive
-	{ok,Pid} when is_pid(Pid) ->
-	    smp_select_wait(lists:delete(Pid,Pids), TimeoutMsg);
-	TimeoutMsg ->
-	    lists:foreach(fun(Pid)-> Pid ! stop end,
-			  Pids),
-	    smp_select_wait(Pids, TimeoutMsg)
+        {ok,Pid} when is_pid(Pid) ->
+            smp_select_wait(lists:delete(Pid,Pids), TimeoutMsg);
+        TimeoutMsg ->
+            lists:foreach(fun(Pid)-> Pid ! stop end,
+                          Pids),
+            smp_select_wait(Pids, TimeoutMsg)
     end.
 
 
-driver_select_use(doc) ->
-    ["Test driver_select() with new ERL_DRV_USE flag."];
-driver_select_use(suite) ->
-    [];
+%% Test driver_select() with new ERL_DRV_USE flag.
 driver_select_use(Config) when is_list(Config) -> 
     case os:type() of
-	{win32,_} -> {skipped, "Test not implemented for this OS"};
-	_ -> driver_select_use0(Config)
+        {win32,_} -> {skipped, "Test not implemented for this OS"};
+        _ -> driver_select_use0(Config)
     end.
-    
+
 driver_select_use0(Config) ->
-    ?line DrvName = 'chkio_drv',
-    Path = ?config(data_dir, Config),
+    DrvName = 'chkio_drv',
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
-    ?line ok = load_driver(Path, DrvName),    
-    ?line Port = open_port({spawn, DrvName}, []),
-    ?line "ok" = erlang:port_control(Port, ?CHKIO_DRV_USE, []),
-    ?line {Port,{data,"TheEnd"}} = receive Msg -> Msg
-				   after 10000 -> timeout end,
-    ?line true = erlang:port_close(Port),
-    ?line ok = erl_ddll:unload_driver(DrvName),
-    ?line ok = erl_ddll:stop(),
+    ok = load_driver(Path, DrvName),    
+    Port = open_port({spawn, DrvName}, []),
+    "ok" = erlang:port_control(Port, ?CHKIO_DRV_USE, []),
+    {Port,{data,"TheEnd"}} = receive Msg -> Msg
+                             after 10000 -> timeout end,
+    true = erlang:port_close(Port),
+    ok = erl_ddll:unload_driver(DrvName),
+    ok = erl_ddll:stop(),
     ok.
 
 thread_mseg_alloc_cache_clean(Config) when is_list(Config) ->
     case {erlang:system_info(threads),
-	  erlang:system_info({allocator,mseg_alloc}),
-	  driver_alloc_sbct()} of
-	{_, false, _} ->
-	    ?line {skipped, "No mseg_alloc"};
-	{false, _, _} ->
-	    ?line {skipped, "No threads"};
-	{_, _, false} ->
-	    ?line {skipped, "driver_alloc() not using the alloc_util framework"};
-	{_, _, SBCT} when is_integer(SBCT), SBCT > 10*1024*1024 ->
-	    ?line {skipped, "driver_alloc() using too large single block threshold"};
-	{_, _, 0} ->
-	    ?line {skipped, "driver_alloc() using too low single block threshold"};
-	{true, _MsegAllocInfo, SBCT} ->
-	    ?line DrvName = 'thr_alloc_drv',
-	    ?line Path = ?config(data_dir, Config),
-	    ?line erl_ddll:start(),
-	    ?line ok = load_driver(Path, DrvName),   
-	    ?line Port = open_port({spawn, DrvName}, []),
-	    ?line CCI = 1000,
-	    ?line ?t:format("CCI = ~p~n", [CCI]),
-	    ?line CCC = mseg_alloc_ccc(),
-	    ?line ?t:format("CCC = ~p~n", [CCC]),
-	    ?line thread_mseg_alloc_cache_clean_test(Port,
-						     10,
-						     CCI,
-						     SBCT+100),
-	    ?line true = erlang:port_close(Port),
-	    ?line ok = erl_ddll:unload_driver(DrvName),
-	    ?line ok = erl_ddll:stop(),
-	    ?line ok
+          erlang:system_info({allocator,mseg_alloc}),
+          driver_alloc_sbct()} of
+        {_, false, _} ->
+            {skipped, "No mseg_alloc"};
+        {false, _, _} ->
+            {skipped, "No threads"};
+        {_, _, false} ->
+            {skipped, "driver_alloc() not using the alloc_util framework"};
+        {_, _, SBCT} when is_integer(SBCT), SBCT > 10*1024*1024 ->
+            {skipped, "driver_alloc() using too large single block threshold"};
+        {_, _, 0} ->
+            {skipped, "driver_alloc() using too low single block threshold"};
+        {true, _MsegAllocInfo, SBCT} ->
+            DrvName = 'thr_alloc_drv',
+            Path = proplists:get_value(data_dir, Config),
+            erl_ddll:start(),
+            ok = load_driver(Path, DrvName),   
+            Port = open_port({spawn, DrvName}, []),
+            CCI = 1000,
+            io:format("CCI = ~p~n", [CCI]),
+            CCC = mseg_alloc_ccc(),
+            io:format("CCC = ~p~n", [CCC]),
+            thread_mseg_alloc_cache_clean_test(Port,
+                                               10,
+                                               CCI,
+                                               SBCT+100),
+            true = erlang:port_close(Port),
+            ok = erl_ddll:unload_driver(DrvName),
+            ok = erl_ddll:stop(),
+            ok
     end.
 
 mseg_alloc_cci(MsegAllocInfo) ->
-    ?line {value,{options, OL}}
-	= lists:keysearch(options, 1, MsegAllocInfo),
-    ?line {value,{cci,CCI}} = lists:keysearch(cci,1,OL),
-    ?line CCI.
+    {value,{options, OL}}
+    = lists:keysearch(options, 1, MsegAllocInfo),
+    {value,{cci,CCI}} = lists:keysearch(cci,1,OL),
+    CCI.
 
 mseg_alloc_ccc() ->
     mseg_alloc_ccc(mseg_inst_info(0)).
 
 mseg_alloc_ccc(MsegAllocInfo) ->
-    ?line {value,{memkind, MKL}} = lists:keysearch(memkind,1,MsegAllocInfo),
-    ?line {value,{calls, CL}} = lists:keysearch(calls, 1, MKL),
-    ?line {value,{mseg_check_cache, GigaCCC, CCC}}
-	= lists:keysearch(mseg_check_cache, 1, CL),
-    ?line GigaCCC*1000000000 + CCC.
+    {value,{memkind, MKL}} = lists:keysearch(memkind,1,MsegAllocInfo),
+    {value,{calls, CL}} = lists:keysearch(calls, 1, MKL),
+    {value,{mseg_check_cache, GigaCCC, CCC}}
+    = lists:keysearch(mseg_check_cache, 1, CL),
+    GigaCCC*1000000000 + CCC.
 
 mseg_alloc_cached_segments() ->
     mseg_alloc_cached_segments(mseg_inst_info(0)).
 
 mseg_alloc_cached_segments(MsegAllocInfo) ->
-    MemName = case is_halfword_vm() of
-	true -> "high memory";
-	false -> "all memory"
-    end,
-    ?line [{memkind,DrvMem}]
-	= lists:filter(fun(E) -> case E of
-				    {memkind, [{name, MemName} | _]} -> true;
-				    _ -> false
-		       end end, MsegAllocInfo),
-    ?line {value,{status, SL}}
-	= lists:keysearch(status, 1, DrvMem),
-    ?line {value,{cached_segments, CS}}
-	= lists:keysearch(cached_segments, 1, SL),
-    ?line CS.
+    MemName = "all memory",
+    [{memkind,DrvMem}]
+    = lists:filter(fun(E) -> case E of
+                                 {memkind, [{name, MemName} | _]} -> true;
+                                 _ -> false
+                             end end, MsegAllocInfo),
+    {value,{status, SL}}
+    = lists:keysearch(status, 1, DrvMem),
+    {value,{cached_segments, CS}}
+    = lists:keysearch(cached_segments, 1, SL),
+    CS.
 
 mseg_inst_info(I) ->
     {value, {instance, I, Value}}
-	= lists:keysearch(I,
-			  2,
-			  erlang:system_info({allocator,mseg_alloc})),
+    = lists:keysearch(I,
+                      2,
+                      erlang:system_info({allocator,mseg_alloc})),
     Value.
 
-is_halfword_vm() ->
-    case {erlang:system_info({wordsize, internal}),
-	  erlang:system_info({wordsize, external})} of
-	{4, 8} -> true;
-	{WS, WS} -> false
-    end.
-
 driver_alloc_sbct() ->
     {_, _, _, As} = erlang:system_info(allocator),
     case lists:keysearch(driver_alloc, 1, As) of
-	{value,{driver_alloc,DAOPTs}} ->
-	    case lists:keysearch(sbct, 1, DAOPTs) of
-		{value,{sbct,SBCT}} ->
-		    SBCT;
-		_ ->
-		    false
-	    end;
-	_ ->
-	    false
+        {value,{driver_alloc,DAOPTs}} ->
+            case lists:keysearch(sbct, 1, DAOPTs) of
+                {value,{sbct,SBCT}} ->
+                    SBCT;
+                _ ->
+                    false
+            end;
+        _ ->
+            false
     end.
 
 thread_mseg_alloc_cache_clean_test(_Port, 0, _CCI, _Size) ->
-    ?line ok;
+    ok;
 thread_mseg_alloc_cache_clean_test(Port, N, CCI, Size) ->
-    ?line wait_until(fun () -> 0 == mseg_alloc_cached_segments() end),
-    ?line receive after CCI+500 -> ok end,
-    ?line OCCC = mseg_alloc_ccc(),
-    ?line "ok" = erlang:port_control(Port, 0, integer_to_list(Size)),
-    ?line receive after CCI+500 -> ok end,
-    ?line CCC = mseg_alloc_ccc(),
-    ?line ?t:format("CCC = ~p~n", [CCC]),
-    ?line true = CCC > OCCC,
-    ?line thread_mseg_alloc_cache_clean_test(Port, N-1, CCI, Size).
+    wait_until(fun () -> 0 == mseg_alloc_cached_segments() end),
+    receive after CCI+500 -> ok end,
+    OCCC = mseg_alloc_ccc(),
+    "ok" = erlang:port_control(Port, 0, integer_to_list(Size)),
+    receive after CCI+500 -> ok end,
+    CCC = mseg_alloc_ccc(),
+    io:format("CCC = ~p~n", [CCC]),
+    true = CCC > OCCC,
+    thread_mseg_alloc_cache_clean_test(Port, N-1, CCI, Size).
 
 otp_9302(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
-    ?line erl_ddll:start(),
-    ?line ok = load_driver(Path, otp_9302_drv),
-    ?line Port = open_port({spawn, otp_9302_drv}, []),
-    ?line true = is_port(Port),
-    ?line port_command(Port, ""),
-    ?line {msg, block} = get_port_msg(Port, infinity),
-    ?line {msg, job} = get_port_msg(Port, infinity),
-    ?line C = case erlang:system_info(thread_pool_size) of
-		  0 ->
-		      ?line {msg, cancel} = get_port_msg(Port, infinity),
-		      ?line {msg, job} = get_port_msg(Port, infinity),
-		      ?line false;
-		  _ ->
-		      case get_port_msg(Port, infinity) of
-			  {msg, cancel} -> %% Cancel always fail in Rel >= 15
-			      ?line {msg, job} = get_port_msg(Port, infinity),
-			      ?line false;
-			  {msg, job} ->
-			      ?line ok,
-			      ?line true
-		      end
-	      end,
-    ?line {msg, end_of_jobs} = get_port_msg(Port, infinity),
-    ?line no_msg = get_port_msg(Port, 2000),
-    ?line port_close(Port),
-    ?line case C of
-	      true ->
-		  ?line {comment, "Async job cancelled"};
-	      false ->
-		  ?line {comment, "Async job not cancelled"}
-	  end.
+    Path = proplists:get_value(data_dir, Config),
+    erl_ddll:start(),
+    ok = load_driver(Path, otp_9302_drv),
+    Port = open_port({spawn, otp_9302_drv}, []),
+    true = is_port(Port),
+    port_command(Port, ""),
+    {msg, block} = get_port_msg(Port, infinity),
+    {msg, job} = get_port_msg(Port, infinity),
+    C = case erlang:system_info(thread_pool_size) of
+            0 ->
+                {msg, cancel} = get_port_msg(Port, infinity),
+                {msg, job} = get_port_msg(Port, infinity),
+                false;
+            _ ->
+                case get_port_msg(Port, infinity) of
+                    {msg, cancel} -> %% Cancel always fail in Rel >= 15
+                        {msg, job} = get_port_msg(Port, infinity),
+                        false;
+                    {msg, job} ->
+                        ok,
+                        true
+                end
+        end,
+    {msg, end_of_jobs} = get_port_msg(Port, infinity),
+    no_msg = get_port_msg(Port, 2000),
+    port_close(Port),
+    case C of
+        true ->
+            {comment, "Async job cancelled"};
+        false ->
+            {comment, "Async job not cancelled"}
+    end.
 
 thr_free_drv(Config) when is_list(Config) ->
     case erlang:system_info(threads) of
-	false ->
-	    {skipped, "No thread support"};
-	true ->
-	    thr_free_drv_do(Config)
+        false ->
+            {skipped, "No thread support"};
+        true ->
+            thr_free_drv_do(Config)
     end.
 
 thr_free_drv_do(Config) ->
-    ?line Path = ?config(data_dir, Config),
-    ?line erl_ddll:start(),
-    ?line ok = load_driver(Path, thr_free_drv),
-    ?line MemBefore = driver_alloc_size(),
-%    io:format("SID=~p", [erlang:system_info(scheduler_id)]),
-    ?line Port = open_port({spawn, thr_free_drv}, []),
-    ?line MemPeek = driver_alloc_size(),
-    ?line true = is_port(Port),
-    ?line ok = thr_free_drv_control(Port, 0),
-    ?line port_close(Port),
-    ?line MemAfter = driver_alloc_size(),
-    ?line io:format("MemPeek=~p~n", [MemPeek]),
-    ?line io:format("MemBefore=~p, MemAfter=~p~n", [MemBefore, MemAfter]),
-    ?line MemBefore = MemAfter,
-    ?line case MemPeek of
-	      undefined -> ok;
-	      _ ->
-		  ?line true = MemPeek > MemBefore
-	  end,
-    ?line ok.
+    Path = proplists:get_value(data_dir, Config),
+    erl_ddll:start(),
+    ok = load_driver(Path, thr_free_drv),
+    MemBefore = driver_alloc_size(),
+    %    io:format("SID=~p", [erlang:system_info(scheduler_id)]),
+    Port = open_port({spawn, thr_free_drv}, []),
+    MemPeek = driver_alloc_size(),
+    true = is_port(Port),
+    ok = thr_free_drv_control(Port, 0),
+    port_close(Port),
+    MemAfter = driver_alloc_size(),
+    io:format("MemPeek=~p~n", [MemPeek]),
+    io:format("MemBefore=~p, MemAfter=~p~n", [MemBefore, MemAfter]),
+    MemBefore = MemAfter,
+    case MemPeek of
+        undefined -> ok;
+        _ ->
+            true = MemPeek > MemBefore
+    end,
+    ok.
 
 thr_free_drv_control(Port, N) ->
     case erlang:port_control(Port, 0, "") of
-	"done" ->
-	    ok;
-	"more" ->
-	    erlang:yield(),
-%	    io:format("N=~p, SID=~p", [N, erlang:system_info(scheduler_id)]),
-	    thr_free_drv_control(Port, N+1)
+        "done" ->
+            ok;
+        "more" ->
+            erlang:yield(),
+            %	    io:format("N=~p, SID=~p", [N, erlang:system_info(scheduler_id)]),
+            thr_free_drv_control(Port, N+1)
     end.
-	    
+
 async_blast(Config) when is_list(Config) ->
-    ?line Path = ?config(data_dir, Config),
-    ?line erl_ddll:start(),
-    ?line ok = load_driver(Path, async_blast_drv),
-    ?line SchedOnln = erlang:system_info(schedulers_online),
-    ?line MemBefore = driver_alloc_size(),
-    ?line Start = os:timestamp(),
-    ?line Blast = fun () ->
-			  Port = open_port({spawn, async_blast_drv}, []),
-			  true = is_port(Port),
-			  port_command(Port, ""),
-			  receive
-			      {Port, done} ->
-				  ok
-			  end,
-			  port_close(Port)
-		  end,
-    ?line Ps = lists:map(fun (N) ->
-				 spawn_opt(Blast,
-					   [{scheduler,
-					     (N rem SchedOnln)+ 1},
-					    monitor])
-			 end,
-			 lists:seq(1, 100)),
-    ?line MemMid = driver_alloc_size(),
-    ?line lists:foreach(fun ({Pid, Mon}) ->
-				receive
-				    {'DOWN',Mon,process,Pid,_} -> ok
-				end
-			end, Ps),
-    ?line End = os:timestamp(),
-    ?line MemAfter = driver_alloc_size(),
-    ?line io:format("MemBefore=~p, MemMid=~p, MemAfter=~p~n",
-		    [MemBefore, MemMid, MemAfter]),
-    ?line AsyncBlastTime = timer:now_diff(End,Start)/1000000,
-    ?line io:format("AsyncBlastTime=~p~n", [AsyncBlastTime]),
-    ?line MemBefore = MemAfter,
-    ?line erlang:display({async_blast_time, AsyncBlastTime}),
-    ?line ok.
+    Path = proplists:get_value(data_dir, Config),
+    erl_ddll:start(),
+    ok = load_driver(Path, async_blast_drv),
+    SchedOnln = erlang:system_info(schedulers_online),
+    MemBefore = driver_alloc_size(),
+    Start = os:timestamp(),
+    Blast = fun () ->
+                    Port = open_port({spawn, async_blast_drv}, []),
+                    true = is_port(Port),
+                    port_command(Port, ""),
+                    receive
+                        {Port, done} ->
+                            ok
+                    end,
+                    port_close(Port)
+            end,
+    Ps = lists:map(fun (N) ->
+                           spawn_opt(Blast,
+                                     [{scheduler,
+                                       (N rem SchedOnln)+ 1},
+                                      monitor])
+                   end,
+                   lists:seq(1, 100)),
+    MemMid = driver_alloc_size(),
+    lists:foreach(fun ({Pid, Mon}) ->
+                          receive
+                              {'DOWN',Mon,process,Pid,_} -> ok
+                          end
+                  end, Ps),
+    End = os:timestamp(),
+    MemAfter = driver_alloc_size(),
+    io:format("MemBefore=~p, MemMid=~p, MemAfter=~p~n",
+              [MemBefore, MemMid, MemAfter]),
+    AsyncBlastTime = timer:now_diff(End,Start)/1000000,
+    io:format("AsyncBlastTime=~p~n", [AsyncBlastTime]),
+    MemBefore = MemAfter,
+    erlang:display({async_blast_time, AsyncBlastTime}),
+    ok.
 
 thr_msg_blast_receiver(_Port, N, N) ->
     ok;
 thr_msg_blast_receiver(Port, N, Max) ->
     receive
-	{Port, hi} ->
-	    thr_msg_blast_receiver(Port, N+1, Max)
+        {Port, hi} ->
+            thr_msg_blast_receiver(Port, N+1, Max)
     end.
 
 thr_msg_blast_receiver_proc(Port, Max, Parent, Done) ->
     case port_control(Port, 0, "") of
-	"receiver" ->
-	    spawn(fun () ->
-			  thr_msg_blast_receiver_proc(Port, Max+1, Parent, Done)
-		  end),
-	    thr_msg_blast_receiver(Port, 0, Max);
-	"done" ->
-	    Parent ! Done
+        "receiver" ->
+            spawn(fun () ->
+                          thr_msg_blast_receiver_proc(Port, Max+1, Parent, Done)
+                  end),
+            thr_msg_blast_receiver(Port, 0, Max);
+        "done" ->
+            Parent ! Done
     end.
 
 thr_msg_blast(Config) when is_list(Config) ->
     case erlang:system_info(smp_support) of
-	false ->
-	    {skipped, "Non-SMP emulator; nothing to test..."};
-	true ->
-	    Path = ?config(data_dir, Config),
-	    erl_ddll:start(),
-	    ok = load_driver(Path, thr_msg_blast_drv),
-	    MemBefore = driver_alloc_size(),
-	    Start = os:timestamp(),
-	    Port = open_port({spawn, thr_msg_blast_drv}, []),
-	    true = is_port(Port),
-	    Done = make_ref(),
-	    Me = self(),
-	    spawn(fun () ->
-			  thr_msg_blast_receiver_proc(Port, 1, Me, Done)
-		  end),
-	    receive
-		Done -> ok
-	    end,
-	    ok = thr_msg_blast_receiver(Port, 0, 32*10000),
-	    port_close(Port),
-	    End = os:timestamp(),
-	    receive
-		Garbage ->
-		    ?t:fail({received_garbage, Port, Garbage})
-	    after 2000 ->
-		    ok
-	    end,
-	    MemAfter = driver_alloc_size(),
-	    io:format("MemBefore=~p, MemAfter=~p~n",
-		      [MemBefore, MemAfter]),
-	    ThrMsgBlastTime = timer:now_diff(End,Start)/1000000,
-	    io:format("ThrMsgBlastTime=~p~n", [ThrMsgBlastTime]),
-	    MemBefore = MemAfter,
-	    Res = {thr_msg_blast_time, ThrMsgBlastTime},
-	    erlang:display(Res),
-	    Res
+        false ->
+            {skipped, "Non-SMP emulator; nothing to test..."};
+        true ->
+            Path = proplists:get_value(data_dir, Config),
+            erl_ddll:start(),
+            ok = load_driver(Path, thr_msg_blast_drv),
+            MemBefore = driver_alloc_size(),
+            Start = os:timestamp(),
+            Port = open_port({spawn, thr_msg_blast_drv}, []),
+            true = is_port(Port),
+            Done = make_ref(),
+            Me = self(),
+            spawn(fun () ->
+                          thr_msg_blast_receiver_proc(Port, 1, Me, Done)
+                  end),
+            receive
+                Done -> ok
+            end,
+            ok = thr_msg_blast_receiver(Port, 0, 32*10000),
+            port_close(Port),
+            End = os:timestamp(),
+            receive
+                Garbage ->
+                    ct:fail({received_garbage, Port, Garbage})
+            after 2000 ->
+                      ok
+            end,
+            MemAfter = driver_alloc_size(),
+            io:format("MemBefore=~p, MemAfter=~p~n",
+                      [MemBefore, MemAfter]),
+            ThrMsgBlastTime = timer:now_diff(End,Start)/1000000,
+            io:format("ThrMsgBlastTime=~p~n", [ThrMsgBlastTime]),
+            MemBefore = MemAfter,
+            Res = {thr_msg_blast_time, ThrMsgBlastTime},
+            erlang:display(Res),
+            Res
     end.
 
 -define(IN_RANGE(LoW_, VaLuE_, HiGh_),
-	case in_range(LoW_, VaLuE_, HiGh_) of
-	    true -> ok;
-	    false ->
-		case erlang:system_info(lock_checking) of
-		    true ->
-			?t:format("~p:~p: Ignore bad sched count due to "
-				  "lock checking~n",
-				  [?MODULE,?LINE]);
-		    false ->
-			?t:fail({unexpected_sched_counts, VaLuE_})
-		end
-	end).
+        case in_range(LoW_, VaLuE_, HiGh_) of
+            true -> ok;
+            false ->
+                case erlang:system_info(lock_checking) of
+                    true ->
+                        io:format("~p:~p: Ignore bad sched count due to "
+                                  "lock checking~n",
+                                  [?MODULE,?LINE]);
+                    false ->
+                        ct:fail({unexpected_sched_counts, VaLuE_})
+                end
+        end).
 
 
 consume_timeslice(Config) when is_list(Config) ->
@@ -2150,7 +2037,7 @@ consume_timeslice(Config) when is_list(Config) ->
     %% the port instead.
     %%
 
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
     ok = load_driver(Path, consume_timeslice_drv),
     Port = open_port({spawn, consume_timeslice_drv}, [{parallelism, false}]),
@@ -2160,18 +2047,18 @@ consume_timeslice(Config) when is_list(Config) ->
 
     "enabled" = port_control(Port, $E, ""),
     Proc1 = spawn_link(fun () ->
-			       receive Go -> ok end,
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}}
-		       end),
+                               receive Go -> ok end,
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}}
+                       end),
     receive after 100 -> ok end,
     count_pp_sched_start(),
     Proc1 ! Go,
@@ -2182,18 +2069,18 @@ consume_timeslice(Config) when is_list(Config) ->
 
     "disabled" = port_control(Port, $D, ""),
     Proc2 = spawn_link(fun () ->
-			       receive Go -> ok end,
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}},
-			       Port ! {Parent, {command, ""}}
-		       end),
+                               receive Go -> ok end,
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}},
+                               Port ! {Parent, {command, ""}}
+                       end),
     receive after 100 -> ok end,
     count_pp_sched_start(),
     Proc2 ! Go,
@@ -2204,18 +2091,18 @@ consume_timeslice(Config) when is_list(Config) ->
 
     "enabled" = port_control(Port, $E, ""),
     Proc3 = spawn_link(fun () ->
-			       receive Go -> ok end,
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, "")
-		       end),
+                               receive Go -> ok end,
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, "")
+                       end),
     count_pp_sched_start(),
     Proc3 ! Go,
     wait_command_msgs(Port, 10),
@@ -2225,18 +2112,18 @@ consume_timeslice(Config) when is_list(Config) ->
 
     "disabled" = port_control(Port, $D, ""),
     Proc4 = spawn_link(fun () ->
-			       receive Go -> ok end,
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, ""),
-			       port_command(Port, "")
-		       end),
+                               receive Go -> ok end,
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, ""),
+                               port_command(Port, "")
+                       end),
     count_pp_sched_start(),
     Proc4 ! Go,
     wait_command_msgs(Port, 10),
@@ -2248,43 +2135,43 @@ consume_timeslice(Config) when is_list(Config) ->
     %% If only one scheduler use port with parallelism set to true,
     %% in order to trigger scheduling of command signals
     Port2 = case SOnl of
-		1 ->
-		    Port ! {self(), close},
-		    receive {Port, closed} -> ok end,
-		    open_port({spawn, consume_timeslice_drv},
-			      [{parallelism, true}]);
-		_ ->
-		    process_flag(scheduler, 1),
-		    1 = erlang:system_info(scheduler_id),
-		    Port
-	    end,
+                1 ->
+                    Port ! {self(), close},
+                    receive {Port, closed} -> ok end,
+                    open_port({spawn, consume_timeslice_drv},
+                              [{parallelism, true}]);
+                _ ->
+                    process_flag(scheduler, 1),
+                    1 = erlang:system_info(scheduler_id),
+                    Port
+            end,
     count_pp_sched_start(),
     "enabled" = port_control(Port2, $E, ""),
     W5 = case SOnl of
-	     1 ->
-		 false;
-	     _ ->
-		 W1= spawn_opt(fun () ->
-				       2 = erlang:system_info(scheduler_id),
-				       "sleeped" = port_control(Port2, $S, "")
-			       end, [link,{scheduler,2}]),
-		 receive after 100 -> ok end,
-		 W1
-	 end,
+             1 ->
+                 false;
+             _ ->
+                 W1= spawn_opt(fun () ->
+                                       2 = erlang:system_info(scheduler_id),
+                                       "sleeped" = port_control(Port2, $S, "")
+                               end, [link,{scheduler,2}]),
+                 receive after 100 -> ok end,
+                 W1
+         end,
     Proc5 = spawn_opt(fun () ->
-			      receive Go -> ok end,
-			      1 = erlang:system_info(scheduler_id),
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}}
-		      end, [link,{scheduler,1}]),
+                              receive Go -> ok end,
+                              1 = erlang:system_info(scheduler_id),
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}}
+                      end, [link,{scheduler,1}]),
     receive after 100 -> ok end,
     Proc5 ! Go,
     wait_procs_exit([W5, Proc5]),
@@ -2292,34 +2179,34 @@ consume_timeslice(Config) when is_list(Config) ->
     [{Port2, Sprt5}, {Proc5, Sproc5}] = count_pp_sched_stop([Port2, Proc5]),
     ?IN_RANGE(2, Sproc5, 3),
     ?IN_RANGE(6, Sprt5, 20),
-		  
+
     count_pp_sched_start(),
     "disabled" = port_control(Port2, $D, ""),
     W6 = case SOnl of
-	     1 ->
-		 false;
-	     _ ->
-		 W2= spawn_opt(fun () ->
-				       2 = erlang:system_info(scheduler_id),
-				       "sleeped" = port_control(Port2, $S, "")
-			       end, [link,{scheduler,2}]),
-		 receive after 100 -> ok end,
-		 W2
-	 end,
+             1 ->
+                 false;
+             _ ->
+                 W2= spawn_opt(fun () ->
+                                       2 = erlang:system_info(scheduler_id),
+                                       "sleeped" = port_control(Port2, $S, "")
+                               end, [link,{scheduler,2}]),
+                 receive after 100 -> ok end,
+                 W2
+         end,
     Proc6 = spawn_opt(fun () ->
-			      receive Go -> ok end,
-			      1 = erlang:system_info(scheduler_id),
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}},
-			      Port2 ! {Parent, {command, ""}}
-		      end, [link,{scheduler,1}]),
+                              receive Go -> ok end,
+                              1 = erlang:system_info(scheduler_id),
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}},
+                              Port2 ! {Parent, {command, ""}}
+                      end, [link,{scheduler,1}]),
     receive after 100 -> ok end,
     Proc6 ! Go,
     wait_procs_exit([W6, Proc6]),
@@ -2339,19 +2226,19 @@ wait_command_msgs(_, 0) ->
     ok;
 wait_command_msgs(Port, N) ->
     receive
-	{Port, command} ->
-	    wait_command_msgs(Port, N-1)
+        {Port, command} ->
+            wait_command_msgs(Port, N-1)
     end.
 
 in_range(Low, Val, High) when is_integer(Low),
-			      is_integer(Val),
-			      is_integer(High),
-			      Low =< Val,
-			      Val =< High ->
+                              is_integer(Val),
+                              is_integer(High),
+                              Low =< Val,
+                              Val =< High ->
     true;
 in_range(Low, Val, High) when is_integer(Low),
-			      is_integer(Val),
-			      is_integer(High) ->
+                              is_integer(Val),
+                              is_integer(High) ->
     false.
 
 count_pp_sched_start() ->
@@ -2364,7 +2251,7 @@ count_pp_sched_stop(Ps) ->
     PNs = lists:map(fun (P) -> {P, 0} end, Ps),
     receive {trace_delivered, all, Td} -> ok end,
     Res = count_proc_sched(Ps, PNs),
-    ?t:format("Scheduling counts: ~p~n", [Res]),
+    io:format("Scheduling counts: ~p~n", [Res]),
     erlang:display({scheduling_counts, Res}),
     Res.
 
@@ -2377,22 +2264,22 @@ do_inc_pn(P, [PN|PNs]) ->
 
 inc_pn(P, PNs) ->
     try
-	do_inc_pn(P, PNs)
+        do_inc_pn(P, PNs)
     catch
-	throw:undefined -> PNs
+        throw:undefined -> PNs
     end.
 
 count_proc_sched(Ps, PNs) ->
     receive
-	TT when element(1, TT) == trace, element(3, TT) == in ->
-%	    erlang:display(TT),
-	    count_proc_sched(Ps, inc_pn(element(2, TT), PNs));
-	TT when element(1, TT) == trace, element(3, TT) == out ->
-	    count_proc_sched(Ps, PNs)
+        TT when element(1, TT) == trace, element(3, TT) == in ->
+            %	    erlang:display(TT),
+            count_proc_sched(Ps, inc_pn(element(2, TT), PNs));
+        TT when element(1, TT) == trace, element(3, TT) == out ->
+            count_proc_sched(Ps, PNs)
     after 0 ->
-	    PNs
+              PNs
     end.
-    
+
 a_test(Config) when is_list(Config) ->
     check_io_debug().
 
@@ -2405,13 +2292,35 @@ z_test(Config) when is_list(Config) ->
 
 check_io_debug() ->
     get_stable_check_io_info(),
-    {NoErrorFds, NoUsedFds, NoDrvSelStructs, NoDrvEvStructs}
-	= erts_debug:get_internal_state(check_io_debug),
+    {NoErrorFds, NoUsedFds, NoDrvSelStructs, NoDrvEvStructs} = CheckIoDebug
+    = erts_debug:get_internal_state(check_io_debug),
+    HasGetHost = has_gethost(),
+    ct:log("check_io_debug: ~p~n"
+           "HasGetHost: ~p",[CheckIoDebug, HasGetHost]),
     0 = NoErrorFds,
-    NoUsedFds = NoDrvSelStructs,
+    if
+        NoUsedFds == NoDrvSelStructs ->
+            ok;
+        HasGetHost andalso (NoUsedFds == (NoDrvSelStructs - 1)) ->
+            %% If the inet_gethost port is alive, we may have
+            %% one extra used fd that is not selected on
+            ok
+    end,
     0 = NoDrvEvStructs,
     ok.
 
+has_gethost() ->
+    has_gethost(erlang:ports()).
+has_gethost([P|T]) ->
+    case erlang:port_info(P, name) of
+        {name,"inet_gethost"++_} ->
+            true;
+        _ ->
+            has_gethost(T)
+    end;
+has_gethost([]) ->
+    false.
+
 %flush_msgs() ->
 %    receive
 %	M ->
@@ -2426,26 +2335,26 @@ wait_procs_exit([]) ->
 wait_procs_exit([P|Ps]) when is_pid(P) ->
     Mon = erlang:monitor(process, P),
     receive
-	{'DOWN', Mon, process, P, _} ->
-	    wait_procs_exit(Ps)
+        {'DOWN', Mon, process, P, _} ->
+            wait_procs_exit(Ps)
     end;
 wait_procs_exit([_|Ps]) ->
     wait_procs_exit(Ps).
 
 get_port_msg(Port, Timeout) ->
     receive
-	{Port, What} ->
-	    {msg, What}
+        {Port, What} ->
+            {msg, What}
     after Timeout ->
-	    no_msg
+              no_msg
     end.
 
 wait_until(Fun) ->
     case Fun() of
-	true -> ok;
-	false ->
-	    receive after 100 -> ok end,
-	    wait_until(Fun)
+        true -> ok;
+        false ->
+            receive after 100 -> ok end,
+            wait_until(Fun)
     end.
 
 drv_vsn_str2tup(Str) ->
@@ -2476,11 +2385,11 @@ transform_bins(_Transform, Other) -> Other.
 
 make_sub_binaries(Term) ->
     MakeSub = fun(Bin0) ->
-		      Bin1 = <<243:8,0:3,Bin0/binary,31:5,19:8>>,
-		      Sz = size(Bin0),
-		      <<243:8,0:3,Bin:Sz/binary,31:5,19:8>> = id(Bin1),
-		      Bin
-	      end,
+                      Bin1 = <<243:8,0:3,Bin0/binary,31:5,19:8>>,
+                      Sz = size(Bin0),
+                      <<243:8,0:3,Bin:Sz/binary,31:5,19:8>> = id(Bin1),
+                      Bin
+              end,
     transform_bins(MakeSub, Term).
 
 id(I) -> I.
@@ -2512,14 +2421,7 @@ random_char() ->
     uniform(256) - 1.
 
 uniform(N) ->
-    case get(random_seed) of
-	undefined ->
-	    {X, Y, Z} = time(),
-	    random:seed(X, Y, Z);
-	_ ->
-	    ok
-    end,
-    random:uniform(N).
+    rand:uniform(N).
 
 erl_millisecs() ->
     erl_millisecs(erlang:monotonic_time()).
@@ -2529,7 +2431,7 @@ erl_millisecs(MonotonicTime) ->
 
 %% Start/stop drivers.
 start_driver(Config, Name, Binary) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
 
     %% Load the driver
@@ -2537,31 +2439,31 @@ start_driver(Config, Name, Binary) ->
 
     %% open port.
     case Binary of
-	true ->
-	    open_port({spawn, Name}, [binary]);
-	false ->
-	    open_port({spawn, Name}, [])
+        true ->
+            open_port({spawn, Name}, [binary]);
+        false ->
+            open_port({spawn, Name}, [])
     end.
 
 stop_driver(Port, Name) ->
-    ?line true = erlang:port_close(Port),
+    true = erlang:port_close(Port),
     receive
-	{Port,Message} ->
-	    ?t:fail({strange_message_from_port,Message})
+        {Port,Message} ->
+            ct:fail({strange_message_from_port,Message})
     after 0 ->
-	    ok
+              ok
     end,
 
     %% Unload the driver.
     ok = erl_ddll:unload_driver(Name),
-    ?line ok = erl_ddll:stop().
+    ok = erl_ddll:stop().
 
 load_driver(Dir, Driver) ->
     case erl_ddll:load_driver(Dir, Driver) of
-	ok -> ok;
-	{error, Error} = Res ->
-	    io:format("~s\n", [erl_ddll:format_error(Error)]),
-	    Res
+        ok -> ok;
+        {error, Error} = Res ->
+            io:format("~s\n", [erl_ddll:format_error(Error)]),
+            Res
     end.
 
 sleep() ->
@@ -2576,50 +2478,50 @@ sleep(Ms) when is_integer(Ms), Ms >= 0 ->
 start_node(Config) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
-			++ "-"
-			++ atom_to_list(?config(testcase, Config))
-			++ "-"
-			++ integer_to_list(erlang:system_time(seconds))
-			++ "-"
-			++ integer_to_list(erlang:unique_integer([positive]))),
-    ?t:start_node(Name, slave, [{args, "-pa "++Pa}]).
+                        ++ "-"
+                        ++ atom_to_list(proplists:get_value(testcase, Config))
+                        ++ "-"
+                        ++ integer_to_list(erlang:system_time(seconds))
+                        ++ "-"
+                        ++ integer_to_list(erlang:unique_integer([positive]))),
+    test_server:start_node(Name, slave, [{args, "-pa "++Pa}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 wait_deallocations() ->
     try
-	erts_debug:set_internal_state(wait, deallocations)
+        erts_debug:set_internal_state(wait, deallocations)
     catch error:undef ->
-	    erts_debug:set_internal_state(available_internal_state, true),
-	    wait_deallocations()
+              erts_debug:set_internal_state(available_internal_state, true),
+              wait_deallocations()
     end.
 
 driver_alloc_size() ->
     case erlang:system_info(smp_support) of
-	true ->
-	    ok;
-	false ->
-	    %% driver_alloc also used by elements in lock-free queues,
-	    %% give these some time to be deallocated...
-	    receive after 100 -> ok end
+        true ->
+            ok;
+        false ->
+            %% driver_alloc also used by elements in lock-free queues,
+            %% give these some time to be deallocated...
+            receive after 100 -> ok end
     end,
     wait_deallocations(),
     case erlang:system_info({allocator_sizes, driver_alloc}) of
-	false ->
-	    undefined;
-	MemInfo ->
-	    CS = lists:foldl(
-		   fun ({instance, _, L}, Acc) ->
-			   {value,{_,MBCS}} = lists:keysearch(mbcs, 1, L),
-			   {value,{_,SBCS}} = lists:keysearch(sbcs, 1, L),
-			   [MBCS,SBCS | Acc]
-		   end,
-		   [],
-		   MemInfo),
-	    lists:foldl(
-	      fun(L, Sz0) ->
-		      {value,{_,Sz,_,_}} = lists:keysearch(blocks_size, 1, L),
-		      Sz0+Sz
-	      end, 0, CS)
+        false ->
+            undefined;
+        MemInfo ->
+            CS = lists:foldl(
+                   fun ({instance, _, L}, Acc) ->
+                           {value,{_,MBCS}} = lists:keysearch(mbcs, 1, L),
+                           {value,{_,SBCS}} = lists:keysearch(sbcs, 1, L),
+                           [MBCS,SBCS | Acc]
+                   end,
+                   [],
+                   MemInfo),
+            lists:foldl(
+              fun(L, Sz0) ->
+                      {value,{_,Sz,_,_}} = lists:keysearch(blocks_size, 1, L),
+                      Sz0+Sz
+              end, 0, CS)
     end.
diff --git a/erts/emulator/test/efile_SUITE.erl b/erts/emulator/test/efile_SUITE.erl
index 4d8d89db9b..cefa35a3ee 100644
--- a/erts/emulator/test/efile_SUITE.erl
+++ b/erts/emulator/test/efile_SUITE.erl
@@ -18,34 +18,18 @@
 %% %CopyrightEnd%
 
 -module(efile_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]).
 -export([iter_max_files/1, async_dist/1]).
 
 -export([do_iter_max_files/2, do_async_dist/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [iter_max_files, async_dist].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 do_async_dist(Dir) ->
     X = 100,
     AT = erlang:system_info(thread_pool_size),
@@ -70,59 +54,58 @@ file_keys(Dir,Num,FdList,FnList) ->
     Name = "dummy"++integer_to_list(Num),
     FN = filename:join([Dir,Name]),
     case file:open(FN,[write,raw]) of
-	{ok,FD} ->
-	    {file_descriptor,prim_file,{Port,_}} = FD,
-	    <<X:32/integer-big>> = 
-		iolist_to_binary(erlang:port_control(Port,$K,[])),
-	    [X | file_keys(Dir,Num-1,[FD|FdList],[FN|FnList])];
-	{error,_} ->
-	    % Try freeing up FD's if there are any
-	    case FdList of 
-		[] ->
-		    exit({cannot_open_file,FN});
-		_ ->
-		    [ file:close(FD) || FD <- FdList ],
-		    [ file:delete(F) || F <- FnList ],
-		    file_keys(Dir,Num,[],[])
-	    end
+        {ok,FD} ->
+            {file_descriptor,prim_file,{Port,_}} = FD,
+            <<X:32/integer-big>> = 
+            iolist_to_binary(erlang:port_control(Port,$K,[])),
+            [X | file_keys(Dir,Num-1,[FD|FdList],[FN|FnList])];
+        {error,_} ->
+            % Try freeing up FD's if there are any
+            case FdList of 
+                [] ->
+                    exit({cannot_open_file,FN});
+                _ ->
+                    [ file:close(FD) || FD <- FdList ],
+                    [ file:delete(F) || F <- FnList ],
+                    file_keys(Dir,Num,[],[])
+            end
     end.
 
-async_dist(doc) ->
-    "Check that the distribution of files over async threads is fair";
+%% Check that the distribution of files over async threads is fair
 async_dist(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
     TestFile = filename:join(DataDir, "existing_file"),
     Dir = filename:dirname(code:which(?MODULE)),
     AsyncSizes = [7,10,100,255,256,64,63,65],
     Max = 0.5,
 
     lists:foreach(fun(Size) ->
-			  {ok,Node} = 
-			      test_server:start_node
-				(test_iter_max_files,slave,
-				 [{args,
-				   "+A "++integer_to_list(Size)++
-				   " -pa " ++ Dir}]),
-			  {Distr,SD} = rpc:call(Node,?MODULE,do_async_dist,
-						[DataDir]),
-			  test_server:stop_node(Node),
-			  if
-			      SD > Max ->
-				  io:format("Bad async queue distribution for "
-					    "~p async threads:~n"
-					    "    Standard deviation is ~p~n"
-					    "    Key distribution:~n    ~lp~n",
-					    [Size,SD,Distr]),
-				  exit({bad_async_dist,Size,SD,Distr});
-			      true ->
-				  io:format("OK async queue distribution for "
-					    "~p async threads:~n"
-					    "    Standard deviation is ~p~n"
-					    "    Key distribution:~n    ~lp~n",
-					    [Size,SD,Distr]),
-				  ok
-			  end
-		  end, AsyncSizes),
+                          {ok,Node} = 
+                          test_server:start_node
+                          (test_iter_max_files,slave,
+                           [{args,
+                             "+A "++integer_to_list(Size)++
+                             " -pa " ++ Dir}]),
+                          {Distr,SD} = rpc:call(Node,?MODULE,do_async_dist,
+                                                [DataDir]),
+                          test_server:stop_node(Node),
+                          if
+                              SD > Max ->
+                                  io:format("Bad async queue distribution for "
+                                            "~p async threads:~n"
+                                            "    Standard deviation is ~p~n"
+                                            "    Key distribution:~n    ~lp~n",
+                                            [Size,SD,Distr]),
+                                  exit({bad_async_dist,Size,SD,Distr});
+                              true ->
+                                  io:format("OK async queue distribution for "
+                                            "~p async threads:~n"
+                                            "    Standard deviation is ~p~n"
+                                            "    Key distribution:~n    ~lp~n",
+                                            [Size,SD,Distr]),
+                                  ok
+                          end
+                  end, AsyncSizes),
     ok.
 
 %%
@@ -130,54 +113,53 @@ async_dist(Config) when is_list(Config) ->
 %% that we get the same number of files every time.
 %%
 
-iter_max_files(suite) -> [];
 iter_max_files(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
     TestFile = filename:join(DataDir, "existing_file"),
     N = 10,
     %% Run on a different node in order to set the max ports
     Dir = filename:dirname(code:which(?MODULE)),
     {ok,Node} = test_server:start_node(test_iter_max_files,slave,
-				       [{args,"+Q 1524 -pa " ++ Dir}]),
+                                       [{args,"+Q 1524 -pa " ++ Dir}]),
     L = rpc:call(Node,?MODULE,do_iter_max_files,[N, TestFile]),
     test_server:stop_node(Node),
     io:format("Number of files opened in each test:~n~w\n", [L]),
     all_equal(L),
     Head = hd(L),
     if  Head >= 2 -> ok;
-	true -> ?line test_server:fail(too_few_files)
+        true -> ct:fail(too_few_files)
     end,
     {comment, "Max files: " ++ integer_to_list(hd(L))}.
 
 do_iter_max_files(N, Name) when N > 0 -> 
-    ?line [max_files(Name)| do_iter_max_files(N-1, Name)];
+    [max_files(Name)| do_iter_max_files(N-1, Name)];
 do_iter_max_files(_, _) ->
     [].
 
 all_equal([E, E| T]) ->
-    ?line all_equal([E| T]);
+    all_equal([E| T]);
 all_equal([_]) ->
     ok;
 all_equal([]) ->
     ok.
-    
+
 max_files(Name) ->
-    ?line Fds = open_files(Name),
-    ?line N = length(Fds),
-    ?line close_files(Fds),
+    Fds = open_files(Name),
+    N = length(Fds),
+    close_files(Fds),
     N.
 
 close_files([Fd| Fds]) ->
-    ?line file:close(Fd),
-    ?line close_files(Fds);
+    file:close(Fd),
+    close_files(Fds);
 close_files([]) ->
     ok.
 
 open_files(Name) ->
-    ?line case file:open(Name, [read,raw]) of
-	      {ok, Fd} ->
-		  [Fd| open_files(Name)];
-	      {error, _Reason} ->
-%		  io:format("Error reason: ~p", [_Reason]),
-		  []
-	  end.
+    case file:open(Name, [read,raw]) of
+        {ok, Fd} ->
+            [Fd| open_files(Name)];
+        {error, _Reason} ->
+            %		  io:format("Error reason: ~p", [_Reason]),
+            []
+    end.
diff --git a/erts/emulator/test/emulator.spec.ose b/erts/emulator/test/emulator.spec.ose
deleted file mode 100644
index 9f494609d9..0000000000
--- a/erts/emulator/test/emulator.spec.ose
+++ /dev/null
@@ -1,2 +0,0 @@
-{topcase, {dir, "../emulator_test"}}.
-{skip, {obsolete_SUITE, "Not on ose"}}.
diff --git a/erts/emulator/test/erl_drv_thread_SUITE.erl b/erts/emulator/test/erl_drv_thread_SUITE.erl
index 2cd569ce4f..294d9ee05f 100644
--- a/erts/emulator/test/erl_drv_thread_SUITE.erl
+++ b/erts/emulator/test/erl_drv_thread_SUITE.erl
@@ -20,12 +20,11 @@
 
 -module(erl_drv_thread_SUITE).
 -author('[email protected]').
--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]).
 
 -export([basic/1, rwlock/1, tsd/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(DEFAULT_TIMETRAP_SECS, 240).
 
@@ -34,38 +33,17 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     [basic, rwlock, tsd].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%                                                                        %%
 %% Testcases                                                              %%
 %%                                                                        %%
 
-basic(suite) -> [];
-basic(doc) ->   [];
-basic(Cfg) -> ?line drv_case(Cfg, basic).
+basic(Cfg) -> drv_case(Cfg, basic).
 
-rwlock(suite) -> [];
-rwlock(doc) ->   [];
-rwlock(Cfg) -> ?line drv_case(Cfg, rwlock).
+rwlock(Cfg) -> drv_case(Cfg, rwlock).
 
-tsd(suite) -> [];
-tsd(doc) ->   [];
-tsd(Cfg) -> ?line drv_case(Cfg, tsd).
+tsd(Cfg) -> drv_case(Cfg, tsd).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%                                                                        %%
@@ -81,58 +59,54 @@ drv_case(Config, CaseName, Command) when is_list(Command) ->
     drv_case(Config, CaseName, Command, ?DEFAULT_TIMETRAP_SECS).
 
 drv_case(Config, CaseName, TimeTrap, Command) when is_list(Command),
-						   is_integer(TimeTrap) ->
+                                                   is_integer(TimeTrap) ->
     drv_case(Config, CaseName, Command, TimeTrap);
 drv_case(Config, CaseName, Command, TimeTrap) when is_list(Config),
-						   is_atom(CaseName),
-						   is_list(Command),
-						   is_integer(TimeTrap) ->
-    case ?t:os_type() of
-	{Family, _} when Family == unix; Family == win32 ->
-	    ?line run_drv_case(Config, CaseName, Command, TimeTrap);
-	SkipOs ->
-	    ?line {skipped,
-		   lists:flatten(["Not run on "
-				  | io_lib:format("~p",[SkipOs])])}
+                                                   is_atom(CaseName),
+                                                   is_list(Command),
+                                                   is_integer(TimeTrap) ->
+    case os:type() of
+        {Family, _} when Family == unix; Family == win32 ->
+            run_drv_case(Config, CaseName, Command, TimeTrap);
+        SkipOs ->
+            {skipped, lists:flatten(["Not run on " | io_lib:format("~p",[SkipOs])])}
     end.
 
 run_drv_case(Config, CaseName, Command, TimeTrap) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(TimeTrap)),
-    ?line DataDir = ?config(data_dir,Config),
+    ct:timetrap({seconds, TimeTrap}),
+    DataDir = proplists:get_value(data_dir,Config),
     case erl_ddll:load_driver(DataDir, CaseName) of
-	ok -> ok;
-	{error, Error} ->
-	    io:format("~s\n", [erl_ddll:format_error(Error)]),
-	    ?line ?t:fail()
+        ok -> ok;
+        {error, Error} ->
+            ct:fail(erl_ddll:format_error(Error))
+    end,
+    Port = open_port({spawn, atom_to_list(CaseName)}, []),
+    true = is_port(Port),
+    Port ! {self(), {command, Command}},
+    Result = receive_drv_result(Port, CaseName),
+    Port ! {self(), close},
+    receive 
+        {Port, closed} ->
+            ok
     end,
-    ?line Port = open_port({spawn, atom_to_list(CaseName)}, []),
-    ?line true = is_port(Port),
-    ?line Port ! {self(), {command, Command}},
-    ?line Result = receive_drv_result(Port, CaseName),
-    ?line Port ! {self(), close},
-    ?line receive 
-	      {Port, closed} ->
-		  ok
-	  end,
-    ?line ok = erl_ddll:unload_driver(CaseName),
-    ?line test_server:timetrap_cancel(Dog),
-    ?line Result.
+    ok = erl_ddll:unload_driver(CaseName),
+    Result.
 
 receive_drv_result(Port, CaseName) ->
-    ?line receive
-	      {print, Port, CaseName, Str} ->
-		  ?line ?t:format("~s", [Str]),
-		  ?line receive_drv_result(Port, CaseName);
-	      {'EXIT', Port, Error} ->
-		  ?line ?t:fail(Error);
-	      {'EXIT', error, Error} ->
-		  ?line ?t:fail(Error);
-	      {failed, Port, CaseName, Comment} ->
-		  ?line ?t:fail(Comment);
-	      {skipped, Port, CaseName, Comment} ->
-		  ?line {skipped, Comment};
-	      {succeeded, Port, CaseName, ""} ->
-		  ?line succeeded;
-	      {succeeded, Port, CaseName, Comment} ->
-		  ?line {comment, Comment}
-	  end.
+    receive
+        {print, Port, CaseName, Str} ->
+            io:format("~s", [Str]),
+            receive_drv_result(Port, CaseName);
+        {'EXIT', Port, Error} ->
+            ct:fail(Error);
+        {'EXIT', error, Error} ->
+            ct:fail(Error);
+        {failed, Port, CaseName, Comment} ->
+            ct:fail(Comment);
+        {skipped, Port, CaseName, Comment} ->
+            {skipped, Comment};
+        {succeeded, Port, CaseName, ""} ->
+            succeeded;
+        {succeeded, Port, CaseName, Comment} ->
+            {comment, Comment}
+    end.
diff --git a/erts/emulator/test/erl_link_SUITE.erl b/erts/emulator/test/erl_link_SUITE.erl
index a7a45046ca..56fdfc35c0 100644
--- a/erts/emulator/test/erl_link_SUITE.erl
+++ b/erts/emulator/test/erl_link_SUITE.erl
@@ -29,24 +29,23 @@
 -author('[email protected]').
 
 %-define(line_trace, 1).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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, init_per_suite/1, end_per_suite/1]).
 
 % Test cases
 -export([links/1,
-	 dist_links/1,
-	 monitor_nodes/1,
-	 process_monitors/1,
-	 dist_process_monitors/1,
-	 busy_dist_port_monitor/1,
-	 busy_dist_port_link/1,
-	 otp_5772_link/1,
-	 otp_5772_dist_link/1,
-	 otp_5772_monitor/1,
-	 otp_5772_dist_monitor/1,
-	 otp_7946/1]).
+         dist_links/1,
+         monitor_nodes/1,
+         process_monitors/1,
+         dist_process_monitors/1,
+         busy_dist_port_monitor/1,
+         busy_dist_port_link/1,
+         otp_5772_link/1,
+         otp_5772_dist_link/1,
+         otp_5772_monitor/1,
+         otp_5772_dist_monitor/1,
+         otp_7946/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -65,21 +64,20 @@
 
 
 -record(erl_link, {type = ?LINK_UNDEF,
-		   pid = [],
-		   targets = []}).
+                   pid = [],
+                   targets = []}).
 
 % This is to be kept in sync with erl_bif_info.c (make_monitor_list)
 
--record(erl_monitor, {
-            type, % MON_ORIGIN or MON_TARGET (1 or 3)
-	    ref,
-	    pid, % Process or nodename
-	    name = [] % registered name or []
-          }).
+-record(erl_monitor, {type,        % MON_ORIGIN or MON_TARGET (1 or 3)
+                      ref,
+                      pid,         % Process or nodename
+                      name = []}). % registered name or []
 
 
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() -> 
     [links, dist_links, monitor_nodes, process_monitors,
@@ -87,8 +85,15 @@ all() ->
      busy_dist_port_link, otp_5772_link, otp_5772_dist_link,
      otp_5772_monitor, otp_5772_dist_monitor, otp_7946].
 
-groups() -> 
-    [].
+init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
+    case catch erts_debug:get_internal_state(available_internal_state) of
+        true -> ok;
+        _ -> erts_debug:set_internal_state(available_internal_state, true)
+    end,
+    Config.
+
+end_per_testcase(_Func, _Config) ->
+    ok.
 
 init_per_suite(Config) ->
     Config.
@@ -96,419 +101,397 @@ init_per_suite(Config) ->
 end_per_suite(_Config) ->
     catch erts_debug:set_internal_state(available_internal_state, false).
 
-init_per_group(_GroupName, Config) ->
-    Config.
 
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-links(doc) -> ["Tests node local links"];
-links(suite) -> [];
+%% Tests node local links
 links(Config) when is_list(Config) ->
-    ?line common_link_test(node(), node()),
-    ?line true = link(self()),
-    ?line [] = find_erl_link(self(), ?LINK_PID, self()),
-    ?line true = unlink(self()),
-    ?line ok.
-
-dist_links(doc) -> ["Tests distributed links"];
-dist_links(suite) -> [];
+    common_link_test(node(), node()),
+    true = link(self()),
+    [] = find_erl_link(self(), ?LINK_PID, self()),
+    true = unlink(self()),
+    ok.
+
+%% Tests distributed links
 dist_links(Config) when is_list(Config) ->
-    ?line [NodeName] = get_names(1, dist_link),
-    ?line {ok, Node} = start_node(NodeName),
-    ?line common_link_test(node(), Node),
-    ?line TP4 = spawn(?MODULE, test_proc, []),
-    ?line TP5 = spawn(?MODULE, test_proc, []),
-    ?line TP6 = spawn(Node, ?MODULE, test_proc, []),
-    ?line true = tp_call(TP6, fun() -> link(TP4) end),
-    ?line check_link(TP4, TP6),
-    ?line true = tp_call(TP5,
-			 fun() ->
-				 process_flag(trap_exit,true),
-				 link(TP6)
-			 end),
-    ?line check_link(TP5, TP6),
-    ?line rpc:cast(Node, erlang, halt, []),
-    ?line wait_until(fun () -> ?line is_proc_dead(TP4) end),
-    ?line check_unlink(TP4, TP6),
-    ?line true = tp_call(TP5,
-			 fun() ->
-				 receive
-				     {'EXIT', TP6, noconnection} ->
-					 true
-				 end
-			 end),
-    ?line check_unlink(TP5, TP6),
-    ?line tp_cast(TP5, fun() -> exit(normal) end),
-    ?line ok.
+    [NodeName] = get_names(1, dist_link),
+    {ok, Node} = start_node(NodeName),
+    common_link_test(node(), Node),
+    TP4 = spawn(?MODULE, test_proc, []),
+    TP5 = spawn(?MODULE, test_proc, []),
+    TP6 = spawn(Node, ?MODULE, test_proc, []),
+    true = tp_call(TP6, fun() -> link(TP4) end),
+    check_link(TP4, TP6),
+    true = tp_call(TP5,
+                   fun() ->
+                           process_flag(trap_exit,true),
+                           link(TP6)
+                   end),
+    check_link(TP5, TP6),
+    rpc:cast(Node, erlang, halt, []),
+    wait_until(fun () -> is_proc_dead(TP4) end),
+    check_unlink(TP4, TP6),
+    true = tp_call(TP5,
+                   fun() ->
+                           receive
+                               {'EXIT', TP6, noconnection} ->
+                                   true
+                           end
+                   end),
+    check_unlink(TP5, TP6),
+    tp_cast(TP5, fun() -> exit(normal) end),
+    ok.
 
 common_link_test(NodeA, NodeB) ->
-    ?line TP1 = spawn(NodeA, ?MODULE, test_proc, []),
-    ?line check_unlink(TP1, self()),
-    ?line TP2 = tp_call(TP1,
-			fun () ->
-				spawn_link(NodeB, ?MODULE, test_proc, [])
-			end),
-    ?line check_link(TP1, TP2),
-    ?line true = tp_call(TP2, fun() -> unlink(TP1) end),
-    ?line check_unlink(TP1, TP2),
-    ?line true = tp_call(TP2, fun() -> link(TP1) end),
-    ?line check_link(TP1, TP2),
-    ?line false = tp_call(TP2, fun() -> process_flag(trap_exit, true) end),
-    ?line tp_cast(TP1, fun () -> exit(died) end),
-    ?line true = tp_call(TP2, fun() ->
-				      receive 
-					  {'EXIT', TP1, died} ->
-					      true
-				      end
-			      end),
-    ?line check_unlink(TP1, TP2),
-    ?line TP3 = tp_call(TP2,
-			fun () ->
-				spawn_link(NodeA, ?MODULE, test_proc, [])
-			end),
-    ?line check_link(TP3, TP2),
-    ?line tp_cast(TP2, fun() -> exit(died) end),
-    ?line wait_until(fun () -> ?line is_proc_dead(TP3) end),
-    ?line check_unlink(TP3, TP2),
-    ?line ok.
-
-monitor_nodes(doc) -> ["Tests monitor of nodes"];
-monitor_nodes(suite) -> [];
+    TP1 = spawn(NodeA, ?MODULE, test_proc, []),
+    check_unlink(TP1, self()),
+    TP2 = tp_call(TP1,
+                  fun () ->
+                          spawn_link(NodeB, ?MODULE, test_proc, [])
+                  end),
+    check_link(TP1, TP2),
+    true = tp_call(TP2, fun() -> unlink(TP1) end),
+    check_unlink(TP1, TP2),
+    true = tp_call(TP2, fun() -> link(TP1) end),
+    check_link(TP1, TP2),
+    false = tp_call(TP2, fun() -> process_flag(trap_exit, true) end),
+    tp_cast(TP1, fun () -> exit(died) end),
+    true = tp_call(TP2, fun() ->
+                                receive 
+                                    {'EXIT', TP1, died} ->
+                                        true
+                                end
+                        end),
+    check_unlink(TP1, TP2),
+    TP3 = tp_call(TP2,
+                  fun () ->
+                          spawn_link(NodeA, ?MODULE, test_proc, [])
+                  end),
+    check_link(TP3, TP2),
+    tp_cast(TP2, fun() -> exit(died) end),
+    wait_until(fun () -> is_proc_dead(TP3) end),
+    check_unlink(TP3, TP2),
+    ok.
+
+%% Tests monitor of nodes
 monitor_nodes(Config) when is_list(Config) ->
-    ?line [An, Bn, Cn, Dn] = get_names(4, dist_link),
-    ?line {ok, A} = start_node(An),
-    ?line {ok, B} = start_node(Bn),
-    ?line C = list_to_atom(lists:concat([Cn, "@", hostname()])),
-    ?line D = list_to_atom(lists:concat([Dn, "@", hostname()])),
-    ?line 0 = no_of_monitor_node(self(), A),
-    ?line 0 = no_of_monitor_node(self(), B),
-    ?line monitor_node(A, true),
-    ?line monitor_node(B, true),
-    ?line monitor_node(D, true),
-    ?line monitor_node(D, true),
+    [An, Bn, Cn, Dn] = get_names(4, dist_link),
+    {ok, A} = start_node(An),
+    {ok, B} = start_node(Bn),
+    C = list_to_atom(lists:concat([Cn, "@", hostname()])),
+    D = list_to_atom(lists:concat([Dn, "@", hostname()])),
+    0 = no_of_monitor_node(self(), A),
+    0 = no_of_monitor_node(self(), B),
+    monitor_node(A, true),
+    monitor_node(B, true),
+    monitor_node(D, true),
+    monitor_node(D, true),
 
     %% Has been known to crash the emulator.
-    ?line {memory,_} = process_info(self(), memory),
-
-    ?line monitor_node(A, false),
-    ?line monitor_node(B, true),
-    ?line monitor_node(C, true),
-    ?line monitor_node(C, false),
-    ?line monitor_node(C, true),
-    ?line monitor_node(B, true),
-    ?line monitor_node(A, false),
-    ?line monitor_node(B, true),
-    ?line monitor_node(B, false),
-    ?line monitor_node(A, true),
-    ?line check_monitor_node(self(), A, 1),
-    ?line check_monitor_node(self(), B, 3),
-    ?line check_monitor_node(self(), C, 0),
-    ?line check_monitor_node(self(), D, 0),
-    ?line receive {nodedown, C} -> ok end,
-    ?line receive {nodedown, C} -> ok end,
-    ?line receive {nodedown, C} -> ok end,
-    ?line receive {nodedown, D} -> ok end,
-    ?line receive {nodedown, D} -> ok end,
-    ?line stop_node(A),
-    ?line receive {nodedown, A} -> ok end,
-    ?line check_monitor_node(self(), A, 0),
-    ?line check_monitor_node(self(), B, 3),
-    ?line stop_node(B),
-    ?line receive {nodedown, B} -> ok end,
-    ?line receive {nodedown, B} -> ok end,
-    ?line receive {nodedown, B} -> ok end,
-    ?line check_monitor_node(self(), B, 0),
-    ?line receive
-	      {nodedown, X} ->
-		  ?line ?t:fail({unexpected_nodedown, X})
-	  after 0 ->
-		  ?line ok
-	  end,
-    ?line ok.
-    
-
-process_monitors(doc) -> ["Tests node local process monitors"];
-process_monitors(suite) -> [];
+    {memory,_} = process_info(self(), memory),
+
+    monitor_node(A, false),
+    monitor_node(B, true),
+    monitor_node(C, true),
+    monitor_node(C, false),
+    monitor_node(C, true),
+    monitor_node(B, true),
+    monitor_node(A, false),
+    monitor_node(B, true),
+    monitor_node(B, false),
+    monitor_node(A, true),
+    check_monitor_node(self(), A, 1),
+    check_monitor_node(self(), B, 3),
+    check_monitor_node(self(), C, 0),
+    check_monitor_node(self(), D, 0),
+    receive {nodedown, C} -> ok end,
+    receive {nodedown, C} -> ok end,
+    receive {nodedown, C} -> ok end,
+    receive {nodedown, D} -> ok end,
+    receive {nodedown, D} -> ok end,
+    stop_node(A),
+    receive {nodedown, A} -> ok end,
+    check_monitor_node(self(), A, 0),
+    check_monitor_node(self(), B, 3),
+    stop_node(B),
+    receive {nodedown, B} -> ok end,
+    receive {nodedown, B} -> ok end,
+    receive {nodedown, B} -> ok end,
+    check_monitor_node(self(), B, 0),
+    receive
+        {nodedown, X} ->
+            ct:fail({unexpected_nodedown, X})
+    after 0 ->
+              ok
+    end,
+    ok.
+
+
+%% Tests node local process monitors
 process_monitors(Config) when is_list(Config) ->
-    ?line common_process_monitors(node(), node()),
-    ?line Mon1 = erlang:monitor(process,self()),
-    ?line [] = find_erl_monitor(self(), Mon1),
-    ?line [Name] = get_names(1, process_monitors),
-    ?line true = register(Name, self()),
-    ?line Mon2 = erlang:monitor(process, Name),
-    ?line [] = find_erl_monitor(self(), Mon2),
-    ?line receive
-	      {'DOWN', Mon1, _, _, _} = Msg ->
-		  ?line ?t:fail({unexpected_down_msg, Msg});
-	      {'DOWN', Mon2, _, _, _} = Msg ->
-		  ?line ?t:fail({unexpected_down_msg, Msg})
-	  after 500 ->
-		  ?line true = erlang:demonitor(Mon1),
-		  ?line true = erlang:demonitor(Mon2),
-		  ?line ok
-	  end.
-
-dist_process_monitors(doc) -> ["Tests distributed process monitors"];
-dist_process_monitors(suite) -> [];
+    common_process_monitors(node(), node()),
+    Mon1 = erlang:monitor(process,self()),
+    [] = find_erl_monitor(self(), Mon1),
+    [Name] = get_names(1, process_monitors),
+    true = register(Name, self()),
+    Mon2 = erlang:monitor(process, Name),
+    [] = find_erl_monitor(self(), Mon2),
+    receive
+        {'DOWN', Mon1, _, _, _} = Msg ->
+            ct:fail({unexpected_down_msg, Msg});
+        {'DOWN', Mon2, _, _, _} = Msg ->
+            ct:fail({unexpected_down_msg, Msg})
+    after 500 ->
+              true = erlang:demonitor(Mon1),
+              true = erlang:demonitor(Mon2),
+              ok
+    end.
+
+%% Tests distributed process monitors
 dist_process_monitors(Config) when is_list(Config) -> 
-    ?line [Name] = get_names(1,dist_process_monitors),
-    ?line {ok, Node} = start_node(Name),
-    ?line common_process_monitors(node(), Node),
-    ?line TP1 = spawn(Node, ?MODULE, test_proc, []),
-    ?line R1 = erlang:monitor(process, TP1),
-    ?line TP1O = get_down_object(TP1, self()),
-    ?line check_process_monitor(self(), TP1, R1),
-    ?line tp_cast(TP1, fun () -> halt() end),
-    ?line receive
-	      {'DOWN',R1,process,TP1O,noconnection} ->
-		  ?line ok
-	  end,
-    ?line check_process_demonitor(self(), TP1, R1),
-    ?line R2 = erlang:monitor(process, TP1),
-    ?line receive
-	      {'DOWN',R2,process,TP1O,noconnection} ->
-		  ?line ok
-	  end,
-    ?line check_process_demonitor(self(), TP1, R2),
-    ?line ok.
+    [Name] = get_names(1,dist_process_monitors),
+    {ok, Node} = start_node(Name),
+    common_process_monitors(node(), Node),
+    TP1 = spawn(Node, ?MODULE, test_proc, []),
+    R1 = erlang:monitor(process, TP1),
+    TP1O = get_down_object(TP1, self()),
+    check_process_monitor(self(), TP1, R1),
+    tp_cast(TP1, fun () -> halt() end),
+    receive
+        {'DOWN',R1,process,TP1O,noconnection} ->
+            ok
+    end,
+    check_process_demonitor(self(), TP1, R1),
+    R2 = erlang:monitor(process, TP1),
+    receive
+        {'DOWN',R2,process,TP1O,noconnection} ->
+            ok
+    end,
+    check_process_demonitor(self(), TP1, R2),
+    ok.
 
 
 common_process_monitors(NodeA, NodeB) ->
-    ?line TP1 = spawn(NodeA, ?MODULE, test_proc, []),
-    ?line TP2 = spawn(NodeB, ?MODULE, test_proc, []),
-    ?line run_common_process_monitors(TP1, TP2),
-    ?line TP3 = spawn(NodeA, ?MODULE, test_proc, []),
-    ?line TP4 = spawn(NodeB, ?MODULE, test_proc, []),
-    ?line [TP4N] = get_names(1, common_process_monitors),
-    ?line true = tp_call(TP4, fun () -> register(TP4N,self()) end),
-    ?line run_common_process_monitors(TP3,
-				      case node() == node(TP4) of
-					  true -> TP4N;
-					  false -> {TP4N, node(TP4)}
-				      end),
-    ?line ok.
+    TP1 = spawn(NodeA, ?MODULE, test_proc, []),
+    TP2 = spawn(NodeB, ?MODULE, test_proc, []),
+    run_common_process_monitors(TP1, TP2),
+    TP3 = spawn(NodeA, ?MODULE, test_proc, []),
+    TP4 = spawn(NodeB, ?MODULE, test_proc, []),
+    [TP4N] = get_names(1, common_process_monitors),
+    true = tp_call(TP4, fun () -> register(TP4N,self()) end),
+    run_common_process_monitors(TP3,
+                                case node() == node(TP4) of
+                                    true -> TP4N;
+                                    false -> {TP4N, node(TP4)}
+                                end),
+    ok.
 
 run_common_process_monitors(TP1, TP2) ->
-    ?line R1 = tp_call(TP1, fun () -> erlang:monitor(process, TP2) end),
-    ?line check_process_monitor(TP1, TP2, R1),
-
-    ?line tp_call(TP2, fun () -> catch erlang:demonitor(R1) end),
-    ?line check_process_monitor(TP1, TP2, R1),
-
-    ?line true = tp_call(TP1, fun () -> erlang:demonitor(R1) end),
-    ?line check_process_demonitor(TP1, TP2, R1),
-
-    ?line R2 = tp_call(TP1, fun () -> erlang:monitor(process, TP2) end),
-    ?line TP2O = get_down_object(TP2, TP1),
-    ?line check_process_monitor(TP1, TP2, R2),
-    ?line tp_cast(TP2, fun () -> exit(bye) end),
-    ?line wait_until(fun () -> ?line is_proc_dead(TP2) end),
-    ?line ok = tp_call(TP1, fun () ->
-				    ?line receive
-					      {'DOWN',R2,process,TP2O,bye} ->
-						  ?line ok
-				    end
-			    end),
-    ?line check_process_demonitor(TP1, TP2, R2),
-    
-    ?line R3 = tp_call(TP1, fun () -> erlang:monitor(process, TP2) end),
-    ?line ok = tp_call(TP1, fun () ->
-				    ?line receive
-					      {'DOWN',R3,process,TP2O,noproc} ->
-						  ?line ok
-				    end
-			    end),
-    ?line check_process_demonitor(TP1, TP2, R3),
-
-    ?line tp_cast(TP1, fun () -> exit(normal) end),
-    ?line wait_until(fun () -> ?line is_proc_dead(TP1) end),
-    ?line ok.
-    
-
-busy_dist_port_monitor(doc) -> ["Tests distributed monitor/2, demonitor/1, "
-				"and 'DOWN' message over busy distribution "
-				"port"];
-busy_dist_port_monitor(suite) -> [];
+    R1 = tp_call(TP1, fun () -> erlang:monitor(process, TP2) end),
+    check_process_monitor(TP1, TP2, R1),
+
+    tp_call(TP2, fun () -> catch erlang:demonitor(R1) end),
+    check_process_monitor(TP1, TP2, R1),
+
+    true = tp_call(TP1, fun () -> erlang:demonitor(R1) end),
+    check_process_demonitor(TP1, TP2, R1),
+
+    R2 = tp_call(TP1, fun () -> erlang:monitor(process, TP2) end),
+    TP2O = get_down_object(TP2, TP1),
+    check_process_monitor(TP1, TP2, R2),
+    tp_cast(TP2, fun () -> exit(bye) end),
+    wait_until(fun () -> is_proc_dead(TP2) end),
+    ok = tp_call(TP1, fun () ->
+                              receive
+                                  {'DOWN',R2,process,TP2O,bye} ->
+                                      ok
+                              end
+                      end),
+    check_process_demonitor(TP1, TP2, R2),
+
+    R3 = tp_call(TP1, fun () -> erlang:monitor(process, TP2) end),
+    ok = tp_call(TP1, fun () ->
+                              receive
+                                  {'DOWN',R3,process,TP2O,noproc} ->
+                                      ok
+                              end
+                      end),
+    check_process_demonitor(TP1, TP2, R3),
+
+    tp_cast(TP1, fun () -> exit(normal) end),
+    wait_until(fun () -> is_proc_dead(TP1) end),
+    ok.
+
+
+%% Tests distributed monitor/2, demonitor/1, and 'DOWN' message
+%% over busy distribution port
 busy_dist_port_monitor(Config) when is_list(Config) ->
 
-    ?line Tracer = case os:getenv("TRACE_BUSY_DIST_PORT") of
-		       "true" -> start_busy_dist_port_tracer();
-		       _ -> false
-		   end,
+    Tracer = case os:getenv("TRACE_BUSY_DIST_PORT") of
+                 "true" -> start_busy_dist_port_tracer();
+                 _ -> false
+             end,
 
-    ?line [An] = get_names(1, busy_dist_port_monitor),
-    ?line {ok, A} = start_node(An),
-    ?line TP1 = spawn(A, ?MODULE, test_proc, []),
+    [An] = get_names(1, busy_dist_port_monitor),
+    {ok, A} = start_node(An),
+    TP1 = spawn(A, ?MODULE, test_proc, []),
     %% Check monitor over busy port
-    ?line M1 = suspend_on_busy_test(A,
-				    "erlang:monitor(process, TP1)",
-				    fun () -> erlang:monitor(process, TP1) end),
-    ?line check_process_monitor(self(), TP1, M1),
+    M1 = suspend_on_busy_test(A,
+                              "erlang:monitor(process, TP1)",
+                              fun () -> erlang:monitor(process, TP1) end),
+    check_process_monitor(self(), TP1, M1),
     %% Check demonitor over busy port
-    ?line suspend_on_busy_test(A,
-			       "erlang:demonitor(M1)",
-			       fun () -> erlang:demonitor(M1) end),
-    ?line check_process_demonitor(self(), TP1, M1),
+    suspend_on_busy_test(A,
+                         "erlang:demonitor(M1)",
+                         fun () -> erlang:demonitor(M1) end),
+    check_process_demonitor(self(), TP1, M1),
     %% Check down message over busy port
-    ?line TP2 = spawn(?MODULE, test_proc, []),
-    ?line M2 = tp_call(TP1, fun () -> erlang:monitor(process, TP2) end),
-    ?line check_process_monitor(TP1, TP2, M2),
-    ?line Ref = make_ref(),
-    ?line Busy = make_busy(A, 1000),
-    ?line receive after 100 -> ok end,
-    ?line tp_cast(TP2, fun () -> exit(Ref) end),
-    ?line receive after 100 -> ok end,
-    ?line unmake_busy(Busy),
-    ?line Ref = tp_call(TP1, fun () ->
-				     receive
-					 {'DOWN', M2, process, TP2, Ref} ->
-					     Ref
-				     end
-			     end),
-    ?line tp_cast(TP1, fun () -> exit(normal) end),
-    ?line stop_node(A),
-    ?line stop_busy_dist_port_tracer(Tracer),
-    ?line ok.
-
-busy_dist_port_link(doc) -> ["Tests distributed link/1, unlink/1, and 'EXIT'",
-			     " message over busy distribution port"];
-busy_dist_port_link(suite) -> [];
+    TP2 = spawn(?MODULE, test_proc, []),
+    M2 = tp_call(TP1, fun () -> erlang:monitor(process, TP2) end),
+    check_process_monitor(TP1, TP2, M2),
+    Ref = make_ref(),
+    Busy = make_busy(A, 1000),
+    receive after 100 -> ok end,
+    tp_cast(TP2, fun () -> exit(Ref) end),
+    receive after 100 -> ok end,
+    unmake_busy(Busy),
+    Ref = tp_call(TP1, fun () ->
+                               receive
+                                   {'DOWN', M2, process, TP2, Ref} ->
+                                       Ref
+                               end
+                       end),
+    tp_cast(TP1, fun () -> exit(normal) end),
+    stop_node(A),
+    stop_busy_dist_port_tracer(Tracer),
+    ok.
+
+%% Tests distributed link/1, unlink/1, and 'EXIT'
+%% message over busy distribution port
 busy_dist_port_link(Config) when is_list(Config) ->
-    ?line Tracer = case os:getenv("TRACE_BUSY_DIST_PORT") of
-		       "true" -> start_busy_dist_port_tracer();
-		       _ -> false
-		   end,
-
-    ?line [An] = get_names(1, busy_dist_port_link),
-    ?line {ok, A} = start_node(An),
-    ?line TP1 = spawn(A, ?MODULE, test_proc, []),
+    Tracer = case os:getenv("TRACE_BUSY_DIST_PORT") of
+                 "true" -> start_busy_dist_port_tracer();
+                 _ -> false
+             end,
+
+    [An] = get_names(1, busy_dist_port_link),
+    {ok, A} = start_node(An),
+    TP1 = spawn(A, ?MODULE, test_proc, []),
     %% Check link over busy port
-    ?line suspend_on_busy_test(A,
-			       "link(TP1)",
-			       fun () -> link(TP1) end),
-    ?line check_link(self(), TP1),
+    suspend_on_busy_test(A,
+                         "link(TP1)",
+                         fun () -> link(TP1) end),
+    check_link(self(), TP1),
     %% Check unlink over busy port
-    ?line suspend_on_busy_test(A,
-			       "unlink(TP1)",
-			       fun () -> unlink(TP1) end),
-    ?line check_unlink(self(), TP1),
+    suspend_on_busy_test(A,
+                         "unlink(TP1)",
+                         fun () -> unlink(TP1) end),
+    check_unlink(self(), TP1),
     %% Check trap exit message over busy port
-    ?line TP2 = spawn(?MODULE, test_proc, []),
-    ?line ok = tp_call(TP1, fun () ->
-				    process_flag(trap_exit, true),
-				    link(TP2),
-				    ok
-			    end),
-    ?line check_link(TP1, TP2),
-    ?line Ref = make_ref(),
-    ?line Busy = make_busy(A, 1000),
-    ?line receive after 100 -> ok end,
-    ?line tp_cast(TP2, fun () -> exit(Ref) end),
-    ?line receive after 100 -> ok end,
-    ?line unmake_busy(Busy),
-    ?line Ref = tp_call(TP1, fun () ->
-				     receive
-					 {'EXIT', TP2, Ref} ->
-					     Ref
-				     end
-			     end),
-    ?line tp_cast(TP1, fun () -> exit(normal) end),
-    ?line stop_node(A),
-    ?line stop_busy_dist_port_tracer(Tracer),
-    ?line ok.
-
-
-otp_5772_link(doc) -> [];
-otp_5772_link(suite) -> [];
+    TP2 = spawn(?MODULE, test_proc, []),
+    ok = tp_call(TP1, fun () ->
+                              process_flag(trap_exit, true),
+                              link(TP2),
+                              ok
+                      end),
+    check_link(TP1, TP2),
+    Ref = make_ref(),
+    Busy = make_busy(A, 1000),
+    receive after 100 -> ok end,
+    tp_cast(TP2, fun () -> exit(Ref) end),
+    receive after 100 -> ok end,
+    unmake_busy(Busy),
+    Ref = tp_call(TP1, fun () ->
+                               receive
+                                   {'EXIT', TP2, Ref} ->
+                                       Ref
+                               end
+                       end),
+    tp_cast(TP1, fun () -> exit(normal) end),
+    stop_node(A),
+    stop_busy_dist_port_tracer(Tracer),
+    ok.
+
+
 otp_5772_link(Config) when is_list(Config) ->
-    ?line otp_5772_link_test(node()).
+    otp_5772_link_test(node()).
 
-otp_5772_dist_link(doc) -> [];
-otp_5772_dist_link(suite) -> [];
 otp_5772_dist_link(Config) when is_list(Config) ->
-    ?line [An] = get_names(1, otp_5772_dist_link),
-    ?line {ok, A} = start_node(An),
-    ?line otp_5772_link_test(A),
-    ?line stop_node(A).
+    [An] = get_names(1, otp_5772_dist_link),
+    {ok, A} = start_node(An),
+    otp_5772_link_test(A),
+    stop_node(A).
 
 otp_5772_link_test(Node) ->
-    ?line Prio = process_flag(priority, high),
-    ?line TE = process_flag(trap_exit, true),
-    ?line TP1 = spawn_opt(Node, ?MODULE, test_proc, [],
-			  [link, {priority, low}]),
+    Prio = process_flag(priority, high),
+    TE = process_flag(trap_exit, true),
+    TP1 = spawn_opt(Node, ?MODULE, test_proc, [],
+                    [link, {priority, low}]),
     exit(TP1, bang),
     unlink(TP1),
-    ?line receive
-	      {'EXIT', TP1, _} ->
-		  ?line ok
-	  after 0 ->
-		  ?line ok
-	  end,
-    ?line receive
-	      {'EXIT', TP1, _} = Exit ->
-		  ?line ?t:fail({got_late_exit_message, Exit})
-	  after 1000 ->
-		  ?line ok
-	  end,
-    ?line process_flag(trap_exit, TE),
-    ?line process_flag(priority, Prio),
-    ?line ok.
-
-otp_5772_monitor(doc) -> [];
-otp_5772_monitor(suite) -> [];
+    receive
+        {'EXIT', TP1, _} ->
+            ok
+    after 0 ->
+              ok
+    end,
+    receive
+        {'EXIT', TP1, _} = Exit ->
+            ct:fail({got_late_exit_message, Exit})
+    after 1000 ->
+              ok
+    end,
+    process_flag(trap_exit, TE),
+    process_flag(priority, Prio),
+    ok.
+
 otp_5772_monitor(Config) when is_list(Config) ->
-    ?line otp_5772_monitor_test(node()).
+    otp_5772_monitor_test(node()).
 
-otp_5772_dist_monitor(doc) -> [];
-otp_5772_dist_monitor(suite) -> [];
 otp_5772_dist_monitor(Config) when is_list(Config) ->
-    ?line [An] = get_names(1, otp_5772_dist_monitor),
-    ?line {ok, A} = start_node(An),
-    ?line otp_5772_monitor_test(A),
-    ?line stop_node(A),
-    ?line ok.
+    [An] = get_names(1, otp_5772_dist_monitor),
+    {ok, A} = start_node(An),
+    otp_5772_monitor_test(A),
+    stop_node(A),
+    ok.
 
 otp_5772_monitor_test(Node) ->
-    ?line Prio = process_flag(priority, high),
-    ?line TP1 = spawn_opt(Node, ?MODULE, test_proc, [], [{priority, low}]),
-    ?line M1 = erlang:monitor(process, TP1),
-    ?line exit(TP1, bang),
-    ?line erlang:demonitor(M1),
-    ?line receive
-	      {'DOWN', M1, _, _, _} ->
-		  ?line ok
-	  after 0 ->
-		  ?line ok
-	  end,
-    ?line receive
-	      {'DOWN', M1, _, _, _} = Down ->
-		  ?line ?t:fail({got_late_down_message, Down})
-	  after 1000 ->
-		  ?line ok
-	  end,
-    ?line process_flag(priority, Prio),
-    ?line ok.
+    Prio = process_flag(priority, high),
+    TP1 = spawn_opt(Node, ?MODULE, test_proc, [], [{priority, low}]),
+    M1 = erlang:monitor(process, TP1),
+    exit(TP1, bang),
+    erlang:demonitor(M1),
+    receive
+        {'DOWN', M1, _, _, _} ->
+            ok
+    after 0 ->
+              ok
+    end,
+    receive
+        {'DOWN', M1, _, _, _} = Down ->
+            ct:fail({got_late_down_message, Down})
+    after 1000 ->
+              ok
+    end,
+    process_flag(priority, Prio),
+    ok.
 
 otp_7946(Config) when is_list(Config) ->
-    ?line [NodeName] = get_names(1, otp_7946),
-    ?line {ok, Node} = start_node(NodeName),
-    ?line Proc = rpc:call(Node, erlang, whereis, [net_kernel]),
-    ?line Mon = erlang:monitor(process, Proc),
-    ?line rpc:cast(Node, erlang, halt, []),
-    ?line receive {'DOWN', Mon, process, Proc , _} -> ok end,
-    ?line {Linker, LMon} = spawn_monitor(fun () ->
-						 link(Proc),
-						 receive
-						 after infinity -> ok
-						 end
-					 end),
-    ?line receive
-	      {'DOWN', LMon, process, Linker, Reason} ->
-		  ?line ?t:format("Reason=~p~n", [Reason]),
-		  ?line Reason = noconnection
-	  end.
+    [NodeName] = get_names(1, otp_7946),
+    {ok, Node} = start_node(NodeName),
+    Proc = rpc:call(Node, erlang, whereis, [net_kernel]),
+    Mon = erlang:monitor(process, Proc),
+    rpc:cast(Node, erlang, halt, []),
+    receive {'DOWN', Mon, process, Proc , _} -> ok end,
+    {Linker, LMon} = spawn_monitor(fun () ->
+                                           link(Proc),
+                                           receive
+                                           after infinity -> ok
+                                           end
+                                   end),
+    receive
+        {'DOWN', LMon, process, Linker, Reason} ->
+            io:format("Reason=~p~n", [Reason]),
+            Reason = noconnection
+    end.
 
 %%
 %% -- Internal utils --------------------------------------------------------
@@ -519,27 +502,27 @@ otp_7946(Config) when is_list(Config) ->
 
 busy_data() ->
     case get(?BUSY_DATA_KEY) of
-	undefined ->
-	    set_busy_data([]);
-	Data ->
-	    true = is_binary(Data),
-	    true = size(Data) == ?BUSY_DATA_SIZE,
-	    Data
+        undefined ->
+            set_busy_data([]);
+        Data ->
+            true = is_binary(Data),
+            true = size(Data) == ?BUSY_DATA_SIZE,
+            Data
     end.
 
 set_busy_data(SetData) ->
     case get(?BUSY_DATA_KEY) of
-	undefined ->
-	    Data = case SetData of
-		       D when is_binary(D), size(D) == ?BUSY_DATA_SIZE ->
-			   SetData;
-		       _ ->
-			   list_to_binary(lists:duplicate(?BUSY_DATA_SIZE, 253))
-		   end,
-	    put(?BUSY_DATA_KEY, Data),
-	    Data;
-	OldData ->
-	    OldData
+        undefined ->
+            Data = case SetData of
+                       D when is_binary(D), size(D) == ?BUSY_DATA_SIZE ->
+                           SetData;
+                       _ ->
+                           list_to_binary(lists:duplicate(?BUSY_DATA_SIZE, 253))
+                   end,
+            put(?BUSY_DATA_KEY, Data),
+            Data;
+        OldData ->
+            OldData
     end.
 
 freeze_node(Node, MS) ->
@@ -547,13 +530,13 @@ freeze_node(Node, MS) ->
     DoingIt = make_ref(),
     Freezer = self(),
     spawn_link(Node,
-	       fun () ->
-		       erts_debug:set_internal_state(available_internal_state,
-						     true),
-		       dport_send(Freezer, DoingIt),
-		       receive after Own -> ok end,
-		       erts_debug:set_internal_state(block, MS+Own)
-	       end),
+               fun () ->
+                       erts_debug:set_internal_state(available_internal_state,
+                                                     true),
+                       dport_send(Freezer, DoingIt),
+                       receive after Own -> ok end,
+                       erts_debug:set_internal_state(block, MS+Own)
+               end),
     receive DoingIt -> ok end,
     receive after Own -> ok end.
 
@@ -563,27 +546,27 @@ make_busy(Node, Time) when is_integer(Time) ->
     Data = busy_data(),
     %% first make port busy
     Pid = spawn_link(fun () ->
-			     forever(fun () ->
-					     dport_reg_send(Node,
-							    '__noone__',
-							    Data)
-				     end)
-		     end),
+                             forever(fun () ->
+                                             dport_reg_send(Node,
+                                                            '__noone__',
+                                                            Data)
+                                     end)
+                     end),
     receive after Own -> ok end,
     wait_until(fun () ->
-		       case process_info(Pid, status) of
-			   {status, suspended} -> true;
-			   _ -> false
-		       end
-	       end),
+                       case process_info(Pid, status) of
+                           {status, suspended} -> true;
+                           _ -> false
+                       end
+               end),
     %% then dist entry
     make_busy(Node, [nosuspend], Data),
     Pid.
 
 make_busy(Node, Opts, Data) ->
     case erlang:send({'__noone__', Node}, Data, Opts) of
-	nosuspend -> nosuspend;
-	_ -> make_busy(Node, Opts, Data)
+        nosuspend -> nosuspend;
+        _ -> make_busy(Node, Opts, Data)
     end.
 
 unmake_busy(Pid) ->
@@ -596,33 +579,33 @@ suspend_on_busy_test(Node, Doing, Fun) ->
     Done = make_ref(),
     Data = busy_data(),
     spawn_link(fun () ->
-		       set_busy_data(Data),
-		       Busy = make_busy(Node, 1000),
-		       Tester ! DoIt,
-		       receive after 100 -> ok end,
-		       Info = process_info(Tester, [status, current_function]),
-		       unmake_busy(Busy),
-		       ?t:format("~p doing ~s: ~p~n", [Tester, Doing, Info]),
-		       Tester ! {Done, Info}
-	       end),
+                       set_busy_data(Data),
+                       Busy = make_busy(Node, 1000),
+                       Tester ! DoIt,
+                       receive after 100 -> ok end,
+                       Info = process_info(Tester, [status, current_function]),
+                       unmake_busy(Busy),
+                       io:format("~p doing ~s: ~p~n", [Tester, Doing, Info]),
+                       Tester ! {Done, Info}
+               end),
     receive DoIt -> ok end,
     Res = Fun(),
     receive
-	{Done, MyInfo} ->
-	    %% Don't match arity; it is different in
-	    %% debug and optimized emulator
-	    [{status, suspended},
-	     {current_function, {erlang, bif_return_trap, _}}] = MyInfo,
-	    ok
+        {Done, MyInfo} ->
+            %% Don't match arity; it is different in
+            %% debug and optimized emulator
+            [{status, suspended},
+             {current_function, {erlang, bif_return_trap, _}}] = MyInfo,
+            ok
     end,
     Res.
 
 % get_node(Name) when is_atom(Name) ->
-%     ?line node();
+%     node();
 % get_node({Name, Node}) when is_atom(Name) ->
-%     ?line Node;
+%     Node;
 % get_node(NC) when is_pid(NC); is_port(NC); is_reference(NC) ->
-%     ?line node(NC).
+%     node(NC).
 
 get_down_object(Item, _) when is_pid(Item) ->
     Item;
@@ -637,90 +620,78 @@ get_down_object(Item, Watcher) when is_atom(Item), is_atom(Watcher) ->
 
 is_proc_dead(P) ->
     case is_proc_alive(P) of
-	true -> false;
-	false -> true
+        true -> false;
+        false -> true
     end.
 
 is_proc_alive(Pid) when is_pid(Pid), node(Pid) == node() ->
-    ?line is_process_alive(Pid);
+    is_process_alive(Pid);
 is_proc_alive(Name) when is_atom(Name) ->
-    ?line case catch whereis(Name) of
-	      Pid when is_pid(Pid) ->
-		  ?line is_proc_alive(Pid);
-	      _ ->
-		  ?line false
-	  end;
+    case catch whereis(Name) of
+        Pid when is_pid(Pid) ->
+            is_proc_alive(Pid);
+        _ ->
+            false
+    end;
 is_proc_alive({Name, Node}) when is_atom(Name), Node == node() ->
-    ?line is_proc_alive(Name);
+    is_proc_alive(Name);
 is_proc_alive(Proc) ->
-    ?line is_remote_proc_alive(Proc).
+    is_remote_proc_alive(Proc).
 
 is_remote_proc_alive({Name, Node}) when is_atom(Name), is_atom(Node) ->
-    ?line is_remote_proc_alive(Name, Node);
+    is_remote_proc_alive(Name, Node);
 is_remote_proc_alive(Pid) when is_pid(Pid) ->
-    ?line is_remote_proc_alive(Pid, node(Pid));
+    is_remote_proc_alive(Pid, node(Pid));
 is_remote_proc_alive(_) ->
-    ?line false.
+    false.
 
 is_remote_proc_alive(PN, Node) ->		 
-    ?line S = self(),
-    ?line R = make_ref(),
-    ?line monitor_node(Node, true),
-    ?line _P = spawn(Node, fun () -> S ! {R, is_proc_alive(PN)} end),
-    ?line receive
-	      {R, Bool} ->
-		  ?line monitor_node(Node, false),
-		  ?line Bool;
-	      {nodedown, Node} ->
-		  ?line false
-	  end.
+    S = self(),
+    R = make_ref(),
+    monitor_node(Node, true),
+    _P = spawn(Node, fun () -> S ! {R, is_proc_alive(PN)} end),
+    receive
+        {R, Bool} ->
+            monitor_node(Node, false),
+            Bool;
+        {nodedown, Node} ->
+            false
+    end.
 
 wait_until(Fun) ->
-    ?line case Fun() of
-	      true ->
-		  ?line ok;
-	      _ ->
-		  ?line receive
-			after 100 ->
-				?line wait_until(Fun)
-			end
-	  end.
+    case Fun() of
+        true ->
+            ok;
+        _ ->
+            receive
+            after 100 ->
+                      wait_until(Fun)
+            end
+    end.
 
 forever(Fun) ->
     Fun(),
     forever(Fun).
 
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:minutes(1)),
-    case catch erts_debug:get_internal_state(available_internal_state) of
-	true -> ok;
-	_ -> erts_debug:set_internal_state(available_internal_state, true)
-    end,
-    ?line [{watchdog, Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    ?line Dog = ?config(watchdog, Config),
-    ?line ?t:timetrap_cancel(Dog).
-
 tp_call(Tp, Fun) ->
-    ?line R = make_ref(),
-    ?line Tp ! {call, self(), R, Fun},
-    ?line receive
-	      {R, Res} ->
-		  ?line Res
-	  end.
+    R = make_ref(),
+    Tp ! {call, self(), R, Fun},
+    receive
+        {R, Res} ->
+            Res
+    end.
 
 tp_cast(Tp, Fun) ->
-    ?line Tp ! {cast, Fun}.
+    Tp ! {cast, Fun}.
 
 test_proc() ->
-    ?line receive
-	      {call, From, Ref, Fun} ->
-		  ?line From ! {Ref, Fun()};
-	      {cast, Fun} ->
-		  ?line Fun()
-	  end,
-    ?line test_proc().
+    receive
+        {call, From, Ref, Fun} ->
+            From ! {Ref, Fun()};
+        {cast, Fun} ->
+            Fun()
+    end,
+    test_proc().
 
 expand_link_list([#erl_link{type = ?LINK_NODE, targets = N} = Rec | T]) ->
     lists:duplicate(N,Rec#erl_link{targets = []}) ++ expand_link_list(T);
@@ -728,7 +699,7 @@ expand_link_list([#erl_link{targets = [#erl_link{pid = Pid}]} = Rec | T]) ->
     [Rec#erl_link{targets = [Pid]} | expand_link_list(T)];
 expand_link_list([#erl_link{targets = [#erl_link{pid = Pid}|TT]} = Rec | T]) ->
     [ Rec#erl_link{targets = [Pid]} | expand_link_list( 
-				       [Rec#erl_link{targets = TT} | T])]; 
+                                        [Rec#erl_link{targets = TT} | T])]; 
 expand_link_list([#erl_link{targets = []} = Rec | T]) ->
     [Rec | expand_link_list(T)];
 expand_link_list([]) ->
@@ -736,19 +707,19 @@ expand_link_list([]) ->
 
 get_local_link_list(Obj) ->
     case catch erts_debug:get_internal_state({link_list, Obj}) of
-	LL when is_list(LL) ->
-	    expand_link_list(LL);
-	_ ->
-	    []
+        LL when is_list(LL) ->
+            expand_link_list(LL);
+        _ ->
+            []
     end.
 
 get_remote_link_list(Node, Obj) ->
     case catch rpc:call(Node, erts_debug, get_internal_state,
-			[{link_list, Obj}]) of
-	LL when is_list(LL) ->
-	    expand_link_list(LL);
-	_ ->
-	    []
+                        [{link_list, Obj}]) of
+        LL when is_list(LL) ->
+            expand_link_list(LL);
+        _ ->
+            []
     end.
 
 
@@ -758,30 +729,30 @@ get_link_list({Node, DistEntry}) when is_atom(Node), is_atom(DistEntry) ->
     get_remote_link_list(Node, DistEntry);
 get_link_list(P) when is_pid(P); is_port(P) ->
     case node(P) of
-	      Node when Node == node() ->
-		  get_local_link_list(P);
-	      Node ->
-		  get_remote_link_list(Node, P)
-	  end;
+        Node when Node == node() ->
+            get_local_link_list(P);
+        Node ->
+            get_remote_link_list(Node, P)
+    end;
 get_link_list(undefined) ->
     [].
 
 get_local_monitor_list(Obj) ->
     case catch erts_debug:get_internal_state({monitor_list, Obj}) of
-	      LL when is_list(LL) ->
-		  LL;
-	      _ ->
-		  []
-	  end.
+        LL when is_list(LL) ->
+            LL;
+        _ ->
+            []
+    end.
 
 get_remote_monitor_list(Node, Obj) ->
     case catch rpc:call(Node, erts_debug, get_internal_state,
-			[{monitor_list, Obj}]) of
-	      LL when is_list(LL) ->
-		  LL;
-	      _ ->
-		  []
-	  end.
+                        [{monitor_list, Obj}]) of
+        LL when is_list(LL) ->
+            LL;
+        _ ->
+            []
+    end.
 
 
 get_monitor_list({Node, DistEntry}) when Node == node(), is_atom(DistEntry) ->
@@ -790,242 +761,242 @@ get_monitor_list({Node, DistEntry}) when is_atom(Node), is_atom(DistEntry) ->
     get_remote_monitor_list(Node, DistEntry);
 get_monitor_list(P) when is_pid(P) ->
     case node(P) of
-	      Node when Node == node() ->
-		  get_local_monitor_list(P);
-	      Node ->
-		  get_remote_monitor_list(Node, P)
-	  end;
+        Node when Node == node() ->
+            get_local_monitor_list(P);
+        Node ->
+            get_remote_monitor_list(Node, P)
+    end;
 get_monitor_list(undefined) ->
     [].
 
 
 find_erl_monitor(Pid, Ref) when is_reference(Ref) ->
     lists:foldl(fun (#erl_monitor{ref = R} = EL, Acc) when R == Ref ->
-			      [EL|Acc];
-			  (_, Acc) ->
-			      Acc
-		      end,
-		      [],
-		      get_monitor_list(Pid)).
+                        [EL|Acc];
+                    (_, Acc) ->
+                        Acc
+                end,
+                [],
+                get_monitor_list(Pid)).
 
 % find_erl_link(Obj, Ref) when is_reference(Ref) -> 
-%     ?line lists:foldl(fun (#erl_link{ref = R} = EL, Acc) when R == Ref ->
-% 			      ?line [EL|Acc];
+%     lists:foldl(fun (#erl_link{ref = R} = EL, Acc) when R == Ref ->
+% 			      [EL|Acc];
 % 			  (_, Acc) ->
-% 			      ?line Acc
+% 			      Acc
 % 		      end,
 % 		      [],
 % 		      get_link_list(Obj)).
 
 find_erl_link(Obj, Type, [Item, Data]) when is_pid(Item);
-					    is_port(Item);
-					    is_atom(Item) -> 
+                                            is_port(Item);
+                                            is_atom(Item) -> 
     lists:foldl(fun (#erl_link{type = T, pid = I, targets = D} = EL,
-			   Acc) when T == Type, I == Item ->
-			      case Data of
-					D ->
-					    [EL|Acc];
-					[] ->
-					    [EL|Acc];
-					_ ->
-					    Acc
-				    end;
-			  (_, Acc) ->
-			      Acc
-		      end,
-		      [],
-		      get_link_list(Obj));
+                     Acc) when T == Type, I == Item ->
+                        case Data of
+                            D ->
+                                [EL|Acc];
+                            [] ->
+                                [EL|Acc];
+                            _ ->
+                                Acc
+                        end;
+                    (_, Acc) ->
+                        Acc
+                end,
+                [],
+                get_link_list(Obj));
 find_erl_link(Obj, Type, Item) when is_pid(Item); is_port(Item); is_atom(Item) ->
     find_erl_link(Obj, Type, [Item, []]). 
 
-	
+
 
 check_link(A, B) ->
-    ?line [#erl_link{type = ?LINK_PID,
-		      pid = B,
-		      targets = []}] = find_erl_link(A, ?LINK_PID, B),
-    ?line [#erl_link{type = ?LINK_PID,
-		      pid = A,
-		      targets = []}] = find_erl_link(B, ?LINK_PID, A),
-    ?line case node(A) == node(B) of
-	      false ->
-		  ?line [#erl_link{type = ?LINK_PID,
-				   pid = A,
-				   targets = [B]}] = find_erl_link({node(A),
-							       node(B)},
-							      ?LINK_PID,
-							      [A, [B]]),
-		  ?line [#erl_link{type = ?LINK_PID,
-				   pid = B,
-				   targets = [A]}] = find_erl_link({node(B),
-								    node(A)},
-								   ?LINK_PID,
-								   [B, [A]]);
-	      true ->
-		  ?line [] = find_erl_link({node(A), node(B)},
-					   ?LINK_PID,
-					   [A, [B]]),
-		  ?line [] = find_erl_link({node(B), node(A)},
-					   ?LINK_PID,
-					   [B, [A]])
-	  end,
-    ?line ok.
+    [#erl_link{type = ?LINK_PID,
+               pid = B,
+               targets = []}] = find_erl_link(A, ?LINK_PID, B),
+    [#erl_link{type = ?LINK_PID,
+               pid = A,
+               targets = []}] = find_erl_link(B, ?LINK_PID, A),
+    case node(A) == node(B) of
+        false ->
+            [#erl_link{type = ?LINK_PID,
+                       pid = A,
+                       targets = [B]}] = find_erl_link({node(A),
+                                                        node(B)},
+                                                       ?LINK_PID,
+                                                       [A, [B]]),
+            [#erl_link{type = ?LINK_PID,
+                       pid = B,
+                       targets = [A]}] = find_erl_link({node(B),
+                                                        node(A)},
+                                                       ?LINK_PID,
+                                                       [B, [A]]);
+        true ->
+            [] = find_erl_link({node(A), node(B)},
+                               ?LINK_PID,
+                               [A, [B]]),
+            [] = find_erl_link({node(B), node(A)},
+                               ?LINK_PID,
+                               [B, [A]])
+    end,
+    ok.
 
 check_unlink(A, B) ->
-    ?line [] = find_erl_link(A, ?LINK_PID, B),
-    ?line [] = find_erl_link(B, ?LINK_PID, A),
-    ?line [] = find_erl_link({node(A), node(B)}, ?LINK_PID, [A, [B]]),
-    ?line [] = find_erl_link({node(B), node(A)}, ?LINK_PID, [B, [A]]),
-    ?line ok.
+    [] = find_erl_link(A, ?LINK_PID, B),
+    [] = find_erl_link(B, ?LINK_PID, A),
+    [] = find_erl_link({node(A), node(B)}, ?LINK_PID, [A, [B]]),
+    [] = find_erl_link({node(B), node(A)}, ?LINK_PID, [B, [A]]),
+    ok.
 
 check_process_monitor(From, {Name, Node}, Ref) when is_pid(From),
-						    is_atom(Name),
-						    Node == node(From),
-						    is_reference(Ref) ->
-    ?line check_process_monitor(From, Name, Ref);
+                                                    is_atom(Name),
+                                                    Node == node(From),
+                                                    is_reference(Ref) ->
+    check_process_monitor(From, Name, Ref);
 check_process_monitor(From, {Name, Node}, Ref) when is_pid(From),
-						    is_atom(Name),
-						    is_atom(Node),
-						    is_reference(Ref) ->
-    ?line MonitoredPid = rpc:call(Node, erlang, whereis, [Name]),
-    ?line [#erl_monitor{type = ?MON_ORIGIN,
-			ref = Ref,
-			pid = Node,
-			name = Name}] = find_erl_monitor(From, Ref),
-    ?line [#erl_monitor{type = ?MON_TARGET,
-			ref = Ref,
-			pid = From,
-			name = Name}] = 	find_erl_monitor({node(From), Node}, Ref),
-    ?line [#erl_monitor{type = ?MON_ORIGIN,
-			ref = Ref,
-			pid = MonitoredPid,
-			name = Name}] = find_erl_monitor({Node, node(From)}, Ref),
-    ?line [#erl_monitor{type = ?MON_TARGET,
-			ref = Ref,
-			pid = From,
-			name = Name}] = find_erl_monitor(MonitoredPid, Ref),
-    ?line ok;
+                                                    is_atom(Name),
+                                                    is_atom(Node),
+                                                    is_reference(Ref) ->
+    MonitoredPid = rpc:call(Node, erlang, whereis, [Name]),
+    [#erl_monitor{type = ?MON_ORIGIN,
+                  ref = Ref,
+                  pid = Node,
+                  name = Name}] = find_erl_monitor(From, Ref),
+    [#erl_monitor{type = ?MON_TARGET,
+                  ref = Ref,
+                  pid = From,
+                  name = Name}] = 	find_erl_monitor({node(From), Node}, Ref),
+    [#erl_monitor{type = ?MON_ORIGIN,
+                  ref = Ref,
+                  pid = MonitoredPid,
+                  name = Name}] = find_erl_monitor({Node, node(From)}, Ref),
+    [#erl_monitor{type = ?MON_TARGET,
+                  ref = Ref,
+                  pid = From,
+                  name = Name}] = find_erl_monitor(MonitoredPid, Ref),
+    ok;
 check_process_monitor(From, Name, Ref) when is_pid(From),
-					    is_atom(Name),
-					    undefined /= Name,
-					    is_reference(Ref) ->
-    ?line MonitoredPid = rpc:call(node(From), erlang, whereis, [Name]),
-    
-    ?line [#erl_monitor{type = ?MON_ORIGIN,
-			ref = Ref,
-			pid = MonitoredPid,
-			name = Name}] = find_erl_monitor(From, Ref),
-
-
-    ?line [#erl_monitor{type = ?MON_TARGET,
-			ref = Ref,
-			pid = From,
-			name = Name}] = find_erl_monitor(MonitoredPid,Ref),
+                                            is_atom(Name),
+                                            undefined /= Name,
+                                            is_reference(Ref) ->
+    MonitoredPid = rpc:call(node(From), erlang, whereis, [Name]),
+
+    [#erl_monitor{type = ?MON_ORIGIN,
+                  ref = Ref,
+                  pid = MonitoredPid,
+                  name = Name}] = find_erl_monitor(From, Ref),
+
+
+    [#erl_monitor{type = ?MON_TARGET,
+                  ref = Ref,
+                  pid = From,
+                  name = Name}] = find_erl_monitor(MonitoredPid,Ref),
     ok;
 check_process_monitor(From, To, Ref) when is_pid(From),
-					  is_pid(To),
-					  is_reference(Ref) ->
-    ?line OriMon = [#erl_monitor{type = ?MON_ORIGIN,
-				 ref = Ref,
-				 pid = To}],
-
-    ?line OriMon = find_erl_monitor(From, Ref), 
-
-    ?line TargMon = [#erl_monitor{type = ?MON_TARGET,
-				 ref = Ref,
-				 pid = From}],
-    ?line TargMon = find_erl_monitor(To, Ref),
-			
-
-    ?line case node(From) == node(To) of
-	      false ->
-		  ?line TargMon = find_erl_monitor({node(From), node(To)}, Ref),
-		  ?line OriMon = find_erl_monitor({node(To), node(From)}, Ref);
-	      true ->
-		  ?line [] = find_erl_monitor({node(From), node(From)}, Ref)
-	  end,
-    ?line ok.
+                                          is_pid(To),
+                                          is_reference(Ref) ->
+    OriMon = [#erl_monitor{type = ?MON_ORIGIN,
+                           ref = Ref,
+                           pid = To}],
+
+    OriMon = find_erl_monitor(From, Ref), 
+
+    TargMon = [#erl_monitor{type = ?MON_TARGET,
+                            ref = Ref,
+                            pid = From}],
+    TargMon = find_erl_monitor(To, Ref),
+
+
+    case node(From) == node(To) of
+        false ->
+            TargMon = find_erl_monitor({node(From), node(To)}, Ref),
+            OriMon = find_erl_monitor({node(To), node(From)}, Ref);
+        true ->
+            [] = find_erl_monitor({node(From), node(From)}, Ref)
+    end,
+    ok.
 
 
 check_process_demonitor(From, {undefined, Node}, Ref) when is_pid(From),
-							   is_reference(Ref) ->
-    ?line [] = find_erl_monitor(From, Ref),
-    ?line case node(From) == Node of
-	      false ->
-		  ?line [] = find_erl_monitor({node(From), Node}, Ref),
-		  ?line [] = find_erl_monitor({Node, node(From)}, Ref);
-	      true ->
-		  ?line [] = find_erl_monitor({Node, Node}, Ref)
-	  end,
-    ?line ok;
+                                                           is_reference(Ref) ->
+    [] = find_erl_monitor(From, Ref),
+    case node(From) == Node of
+        false ->
+            [] = find_erl_monitor({node(From), Node}, Ref),
+            [] = find_erl_monitor({Node, node(From)}, Ref);
+        true ->
+            [] = find_erl_monitor({Node, Node}, Ref)
+    end,
+    ok;
 check_process_demonitor(From, {Name, Node}, Ref) when is_pid(From),
-						      is_atom(Name),
-						      Node == node(From),
-						      is_reference(Ref) ->
-    ?line MonitoredPid = rpc:call(Node, erlang, whereis, [Name]),
-    ?line case rpc:call(Node, erlang, whereis, [Name]) of
-	      undefined ->
-		  ?line check_process_demonitor(From, {undefined, Node}, Ref);
-	      MonitoredPid ->
-		  ?line check_process_demonitor(From, MonitoredPid, Ref)
-	  end;
+                                                      is_atom(Name),
+                                                      Node == node(From),
+                                                      is_reference(Ref) ->
+    MonitoredPid = rpc:call(Node, erlang, whereis, [Name]),
+    case rpc:call(Node, erlang, whereis, [Name]) of
+        undefined ->
+            check_process_demonitor(From, {undefined, Node}, Ref);
+        MonitoredPid ->
+            check_process_demonitor(From, MonitoredPid, Ref)
+    end;
 check_process_demonitor(From, {Name, Node}, Ref) when is_pid(From),
-						      is_atom(Name),
-						      is_atom(Node),
-						      is_reference(Ref) ->
-    ?line MonitoredPid = rpc:call(Node, erlang, whereis, [Name]),
-    ?line [] = find_erl_monitor(From, Ref),
-    ?line [] = find_erl_monitor({node(From), Node}, Ref),
-    ?line [] = find_erl_monitor({Node, node(From)}, Ref),
-    ?line [] = find_erl_monitor(MonitoredPid, Ref),
-    ?line ok;
+                                                      is_atom(Name),
+                                                      is_atom(Node),
+                                                      is_reference(Ref) ->
+    MonitoredPid = rpc:call(Node, erlang, whereis, [Name]),
+    [] = find_erl_monitor(From, Ref),
+    [] = find_erl_monitor({node(From), Node}, Ref),
+    [] = find_erl_monitor({Node, node(From)}, Ref),
+    [] = find_erl_monitor(MonitoredPid, Ref),
+    ok;
 check_process_demonitor(From, undefined, Ref) when is_pid(From),
-						   is_reference(Ref) ->
-    ?line [] = find_erl_monitor(From, Ref),
-    ?line case node(From) == node() of
-	      false ->
-		  ?line [] = find_erl_monitor({node(From), node()}, Ref),
-		  ?line [] = find_erl_monitor({node(), node(From)}, Ref);
-	      true ->
-		  ?line [] = find_erl_monitor({node(), node()}, Ref)
-	  end,
-    ?line ok;
+                                                   is_reference(Ref) ->
+    [] = find_erl_monitor(From, Ref),
+    case node(From) == node() of
+        false ->
+            [] = find_erl_monitor({node(From), node()}, Ref),
+            [] = find_erl_monitor({node(), node(From)}, Ref);
+        true ->
+            [] = find_erl_monitor({node(), node()}, Ref)
+    end,
+    ok;
 check_process_demonitor(From, Name, Ref) when is_pid(From),
-					      is_atom(Name),
-					      undefined /= Name,
-					      is_reference(Ref) ->
-    ?line check_process_demonitor(From, {Name, node()}, Ref);
+                                              is_atom(Name),
+                                              undefined /= Name,
+                                              is_reference(Ref) ->
+    check_process_demonitor(From, {Name, node()}, Ref);
 check_process_demonitor(From, To, Ref) when is_pid(From),
-					    is_pid(To),
-					    is_reference(Ref) ->
-    ?line [] = find_erl_monitor(From, Ref),
-    ?line [] = find_erl_monitor(To, Ref),
-    ?line case node(From) == node(To) of
-	      false ->
-		  ?line [] = find_erl_monitor({node(From), node(To)}, Ref),
-		  ?line [] = find_erl_monitor({node(To), node(From)}, Ref);
-	      true ->
-		  ?line [] = find_erl_monitor({node(From), node(From)}, Ref)
-	  end,
-    ?line ok.
+                                            is_pid(To),
+                                            is_reference(Ref) ->
+    [] = find_erl_monitor(From, Ref),
+    [] = find_erl_monitor(To, Ref),
+    case node(From) == node(To) of
+        false ->
+            [] = find_erl_monitor({node(From), node(To)}, Ref),
+            [] = find_erl_monitor({node(To), node(From)}, Ref);
+        true ->
+            [] = find_erl_monitor({node(From), node(From)}, Ref)
+    end,
+    ok.
 
 no_of_monitor_node(From, Node) when is_pid(From), is_atom(Node) ->
-    ?line length(find_erl_link(From, ?LINK_NODE, Node)).
+    length(find_erl_link(From, ?LINK_NODE, Node)).
 
 check_monitor_node(From, Node, No) when is_pid(From),
-					is_atom(Node),
-					is_integer(No),
-					No >= 0 ->
-    ?line LL = lists:duplicate(No, #erl_link{type = ?LINK_NODE, pid = Node}),
-    ?line DLL = lists:duplicate(No, #erl_link{type = ?LINK_NODE, pid = From}),
-    ?line LL = find_erl_link(From, ?LINK_NODE, Node),
-    ?line DLL = find_erl_link({node(From), Node}, ?LINK_NODE, From),
-    ?line ok.
+                                        is_atom(Node),
+                                        is_integer(No),
+                                        No >= 0 ->
+    LL = lists:duplicate(No, #erl_link{type = ?LINK_NODE, pid = Node}),
+    DLL = lists:duplicate(No, #erl_link{type = ?LINK_NODE, pid = From}),
+    LL = find_erl_link(From, ?LINK_NODE, Node),
+    DLL = find_erl_link({node(From), Node}, ?LINK_NODE, From),
+    ok.
 
 
 
 hostname() ->
-    ?line from($@, atom_to_list(node())).
+    from($@, atom_to_list(node())).
 
 from(H, [H | T]) -> T;
 from(H, [_ | T]) -> from(H, T);
@@ -1037,27 +1008,27 @@ get_names(0, _, Acc) ->
     Acc;
 get_names(N, T, Acc) ->
     get_names(N-1, T, [list_to_atom(atom_to_list(?MODULE)
-				    ++ "-"
-				    ++ atom_to_list(T)
-				    ++ "-"
-				    ++ integer_to_list(erlang:system_time(seconds))
-				    ++ "-"
-				    ++ integer_to_list(erlang:unique_integer([positive]))) | Acc]).
+                                    ++ "-"
+                                    ++ atom_to_list(T)
+                                    ++ "-"
+                                    ++ integer_to_list(erlang:system_time(seconds))
+                                    ++ "-"
+                                    ++ integer_to_list(erlang:unique_integer([positive]))) | Acc]).
 
 start_node(Name) ->
-    ?line start_node(Name, "").
+    start_node(Name, "").
 
 start_node(Name, Args) ->
-    ?line Pa = filename:dirname(code:which(?MODULE)),
-    ?line Res = ?t:start_node(Name, slave, [{args,  Args ++ " -pa " ++ Pa}]),
-    ?line {ok, Node} = Res,
-    ?line rpc:call(Node, erts_debug, set_internal_state,
-		   [available_internal_state, true]),
-    ?line Res.
-    
+    Pa = filename:dirname(code:which(?MODULE)),
+    Res = test_server:start_node(Name, slave, [{args,  Args ++ " -pa " ++ Pa}]),
+    {ok, Node} = Res,
+    rpc:call(Node, erts_debug, set_internal_state,
+             [available_internal_state, true]),
+    Res.
+
 
 stop_node(Node) ->
-    ?line ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 -define(COOKIE, '').
 -define(DOP_LINK,		1).
@@ -1080,37 +1051,37 @@ stop_node(Node) ->
 dport_send(To, Msg) ->
     Node = node(To),
     DPrt = case dport(Node) of
-	       undefined ->
-		   pong = net_adm:ping(Node),
-		   dport(Node);
-	       Prt ->
-		   Prt
-	   end,
+               undefined ->
+                   pong = net_adm:ping(Node),
+                   dport(Node);
+               Prt ->
+                   Prt
+           end,
     port_command(DPrt, [dmsg_hdr(),
-			dmsg_ext({?DOP_SEND,
-				  ?COOKIE,
-				  To}),
-			dmsg_ext(Msg)]).
+                        dmsg_ext({?DOP_SEND,
+                                  ?COOKIE,
+                                  To}),
+                        dmsg_ext(Msg)]).
 
 dport_reg_send(Node, Name, Msg) ->
     DPrt = case dport(Node) of
-	       undefined ->
-		   pong = net_adm:ping(Node),
-		   dport(Node);
-	       Prt ->
-		   Prt
-	   end,
+               undefined ->
+                   pong = net_adm:ping(Node),
+                   dport(Node);
+               Prt ->
+                   Prt
+           end,
     port_command(DPrt, [dmsg_hdr(),
-			dmsg_ext({?DOP_REG_SEND,
-				  self(),
-				  ?COOKIE,
-				  Name}),
-			dmsg_ext(Msg)]).
+                        dmsg_ext({?DOP_REG_SEND,
+                                  self(),
+                                  ?COOKIE,
+                                  Name}),
+                        dmsg_ext(Msg)]).
 
 dport(Node) when is_atom(Node) ->
     case catch erts_debug:get_internal_state(available_internal_state) of
-	true -> true;
-	_ -> erts_debug:set_internal_state(available_internal_state, true)
+        true -> true;
+        _ -> erts_debug:set_internal_state(available_internal_state, true)
     end,
     erts_debug:get_internal_state({dist_port, Node}).
 
@@ -1136,11 +1107,7 @@ stop_busy_dist_port_tracer(_) ->
 
 busy_dist_port_tracer() ->
     receive
-	{monitor, _SuspendedProcess, busy_dist_port, _Port} = M ->
-	    erlang:display(M),
-	    busy_dist_port_tracer()
+        {monitor, _SuspendedProcess, busy_dist_port, _Port} = M ->
+            erlang:display(M),
+            busy_dist_port_tracer()
     end.
-	    
-    
-
-
diff --git a/erts/emulator/test/erts_debug_SUITE.erl b/erts/emulator/test/erts_debug_SUITE.erl
index 35677f9953..e757ebdb3d 100644
--- a/erts/emulator/test/erts_debug_SUITE.erl
+++ b/erts/emulator/test/erts_debug_SUITE.erl
@@ -19,42 +19,18 @@
 %%
 
 -module(erts_debug_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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,
-	 test_size/1,flat_size_big/1,df/1,
+-export([all/0, suite/0,
+	 test_size/1,flat_size_big/1,df/1,term_type/1,
 	 instructions/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 2}}].
 
 all() -> 
-    [test_size, flat_size_big, df, instructions].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(2)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
+    [test_size, flat_size_big, df, instructions, term_type].
 
 test_size(Config) when is_list(Config) ->
     ConsCell1 = id([a|b]),
@@ -138,9 +114,50 @@ flat_size_big_1(Term, Size0, Limit) when Size0 < Limit ->
     end;
 flat_size_big_1(_, _, _) -> ok.
 
+
+term_type(Config) when is_list(Config) ->
+    Ts = [{fixnum, 1},
+          {fixnum, -1},
+          {bignum, 1 bsl 300},
+          {bignum, -(1 bsl 300)},
+          {hfloat, 0.0},
+          {hfloat, 0.0/-1},
+          {hfloat, 1.0/(1 bsl 302)},
+          {hfloat, 1.0*(1 bsl 302)},
+          {hfloat, -1.0/(1 bsl 302)},
+          {hfloat, -1.0*(1 bsl 302)},
+          {hfloat, 3.1416},
+          {hfloat, 1.0e18},
+          {hfloat, -3.1416},
+          {hfloat, -1.0e18},
+
+          {heap_binary, <<1,2,3>>},
+          {refc_binary, <<0:(8*80)>>},
+          {sub_binary,  <<5:7>>},
+
+          {flatmap, #{ a => 1}},
+          {hashmap, maps:from_list([{I,I}||I <- lists:seq(1,76)])},
+
+          {list, [1,2,3]},
+          {nil, []},
+          {tuple, {1,2,3}},
+          {tuple, {}},
+
+          {export, fun lists:sort/1},
+          {'fun', fun() -> ok end},
+          {pid, self()},
+          {atom, atom}],
+    lists:foreach(fun({E,Val}) ->
+                          R = erts_internal:term_type(Val),
+                          io:format("expecting term type ~w, got ~w (~p)~n", [E,R,Val]),
+                          E = R
+                  end, Ts),
+    ok.
+
+
 df(Config) when is_list(Config) ->
     P0 = pps(),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     ok = file:set_cwd(PrivDir),
 
     AllLoaded = [M || {M,_} <- code:all_loaded()],
diff --git a/erts/emulator/test/estone_SUITE.erl b/erts/emulator/test/estone_SUITE.erl
index dc8f0aaee9..93728b299b 100644
--- a/erts/emulator/test/estone_SUITE.erl
+++ b/erts/emulator/test/estone_SUITE.erl
@@ -19,9 +19,8 @@
 
 -module(estone_SUITE).
 %% Test functions
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2,estone/1,estone_bench/1]).
--export([init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0, groups/0,
+	 estone/1, estone_bench/1]).
 
 %% Internal exports for EStone tests
 -export([lists/1,
@@ -46,12 +45,9 @@
 	 run_micro/3,p1/1,ppp/3,macro/2,micros/0]).
 
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
-%% Test suite defines
--define(default_timeout, ?t:minutes(10)).
-
 %% EStone defines
 -define(TOTAL, (3000 * 1000 * 100)).   %% 300 secs
 -define(BIGPROCS, 2).
@@ -66,17 +62,9 @@
 	 str}).    %% Header string
 
 
-
-
-init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 4}}].
 
 all() -> 
     [estone].
@@ -84,34 +72,18 @@ all() ->
 groups() -> 
     [{estone_bench, [{repeat,50}],[estone_bench]}].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
 
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-estone(suite) ->
-    [];
-estone(doc) ->
-    ["EStone Test"];
+%% EStone Test
 estone(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir,Config),
-    ?line Mhz=get_cpu_speed(os:type(),DataDir),
-    ?line L = ?MODULE:macro(?MODULE:micros(),DataDir),
-    ?line {Total, Stones} = sum_micros(L, 0, 0),
-    ?line pp(Mhz,Total,Stones,L),
-    ?line {comment,Mhz ++ " MHz, " ++ 
-	   integer_to_list(Stones) ++ " ESTONES"}.
+    DataDir = proplists:get_value(data_dir,Config),
+    Mhz=get_cpu_speed(os:type(),DataDir),
+    L = ?MODULE:macro(?MODULE:micros(),DataDir),
+    {Total, Stones} = sum_micros(L, 0, 0),
+    pp(Mhz,Total,Stones,L),
+    {comment,Mhz ++ " MHz, " ++ integer_to_list(Stones) ++ " ESTONES"}.
 
 estone_bench(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
     L = ?MODULE:macro(?MODULE:micros(),DataDir),
     [ct_event:notify(
        #event{name = benchmark_data, 
@@ -382,11 +354,11 @@ apply_micro(M) ->
      {weight_percentage, M#micro.weight},
      {loops, M#micro.loops},
      {microsecs,MicroSecs},
-     {estones, (M#micro.weight * M#micro.weight * ?STONEFACTOR) div MicroSecs},
+     {estones, (M#micro.weight * M#micro.weight * ?STONEFACTOR) div max(1,MicroSecs)},
      {gcs, GC1 - GC0},
      {kilo_word_reclaimed, (Words1 - Words0) div 1000},
      {kilo_reductions, Reds div 1000},
-     {gc_intensity, gci(Elapsed, GC1 - GC0, Words1 - Words0)}].
+     {gc_intensity, gci(max(1,Elapsed), GC1 - GC0, Words1 - Words0)}].
 
 monotonic_time() ->
     try erlang:monotonic_time() catch error:undef -> erlang:now() end.
@@ -1136,4 +1108,3 @@ wait_for_pids([P|Tail]) ->
 
 send_procs([P|Tail], Msg) -> P ! Msg, send_procs(Tail, Msg);
 send_procs([], _) -> ok.
-			     
diff --git a/erts/emulator/test/evil_SUITE.erl b/erts/emulator/test/evil_SUITE.erl
index 484d2a8bf5..5f5a0ef305 100644
--- a/erts/emulator/test/evil_SUITE.erl
+++ b/erts/emulator/test/evil_SUITE.erl
@@ -19,23 +19,22 @@
 
 -module(evil_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,
-	 heap_frag/1,
-	 encode_decode_ext/1,
-	 decode_integer_ext/1,
-	 decode_small_big_ext/1,
-	 decode_large_big_ext/1,
-	 decode_small_big_ext_neg/1,
-	 decode_large_big_ext_neg/1,
-	 decode_too_small/1,
-	 decode_pos_neg_zero/1
-	]).
-
--include_lib("test_server/include/test_server.hrl").
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+-export([all/0, suite/0,
+         heap_frag/1,
+         encode_decode_ext/1,
+         decode_integer_ext/1,
+         decode_small_big_ext/1,
+         decode_large_big_ext/1,
+         decode_small_big_ext_neg/1,
+         decode_large_big_ext_neg/1,
+         decode_too_small/1,
+         decode_pos_neg_zero/1]).
+
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 30}}].
 
 all() -> 
     [heap_frag, encode_decode_ext, decode_integer_ext,
@@ -43,41 +42,16 @@ all() ->
      decode_small_big_ext_neg, decode_large_big_ext_neg,
      decode_too_small, decode_pos_neg_zero].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(_Case, Config) ->
-    ?line Dog = test_server:timetrap(?t:minutes(0.5)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
 heap_frag(Config) when is_list(Config) ->
     N = 512,
     Self = self(),
-    ?line Pid = spawn_link(fun() -> appender(Self, N) end),
+    Pid = spawn_link(fun() -> appender(Self, N) end),
     receive
-	{Pid,Res} ->
-	    ?line Res = my_appender(N);
-	Garbage ->
-	    io:format("Garbage: ~p\n", [Garbage]),
-	    ?line ?t:fail(got_garbage)
+        {Pid,Res} ->
+            Res = my_appender(N);
+        Garbage ->
+            io:format("Garbage: ~p\n", [Garbage]),
+            ct:fail(got_garbage)
     end.
 
 
@@ -87,29 +61,28 @@ heap_frag(Config) when is_list(Config) ->
 %% These test cases are not "evil" but the next test case is....
 
 encode_decode_ext(Config) when is_list(Config) ->
-    ?line enc_dec( 2,   0),               % SMALL_INTEGER_EXT smallest
-    ?line enc_dec( 2, 255),           	  % SMALL_INTEGER_EXT largest
-    ?line enc_dec( 5, 256),           	  % INTEGER_EXT smallest pos (*)
-    ?line enc_dec( 5,  -1),            	  % INTEGER_EXT largest  neg
-
-    ?line enc_dec( 5, 16#07ffffff),  	  % INTEGER_EXT largest (28 bits)
-    ?line enc_dec( 5,-16#08000000),  	  % INTEGER_EXT smallest
-    ?line enc_dec( 7, 16#08000000),  	  % SMALL_BIG_EXT smallest pos(*)
-    ?line enc_dec( 7,-16#08000001),  	  % SMALL_BIG_EXT largest neg (*)
-
-    ?line enc_dec( 7, 16#7fffffff),  	  % SMALL_BIG_EXT largest  i32
-    ?line enc_dec( 7,-16#80000000),  	  % SMALL_BIG_EXT smallest i32
-
-    ?line enc_dec( 7, 16#80000000),  	  % SMALL_BIG_EXT u32
-    ?line enc_dec( 7, 16#ffffffff),  	  % SMALL_BIG_EXT largest u32
-
-    ?line enc_dec( 9, 16#7fffffffffff),     % largest  i48
-    ?line enc_dec( 9,-16#800000000000),     % smallest i48
-    ?line enc_dec( 9, 16#ffffffffffff),     % largest  u48
-    ?line enc_dec(11, 16#7fffffffffffffff), % largest  i64
-    ?line enc_dec(11,-16#8000000000000000), % smallest i64
-    ?line enc_dec(11, 16#ffffffffffffffff), % largest  u64
-
+    enc_dec( 2,   0),               % SMALL_INTEGER_EXT smallest
+    enc_dec( 2, 255),           	  % SMALL_INTEGER_EXT largest
+    enc_dec( 5, 256),           	  % INTEGER_EXT smallest pos (*)
+    enc_dec( 5,  -1),            	  % INTEGER_EXT largest  neg
+
+    enc_dec( 5, 16#07ffffff),  	  % INTEGER_EXT largest (28 bits)
+    enc_dec( 5,-16#08000000),  	  % INTEGER_EXT smallest
+    enc_dec( 7, 16#08000000),  	  % SMALL_BIG_EXT smallest pos(*)
+    enc_dec( 7,-16#08000001),  	  % SMALL_BIG_EXT largest neg (*)
+
+    enc_dec( 7, 16#7fffffff),  	  % SMALL_BIG_EXT largest  i32
+    enc_dec( 7,-16#80000000),  	  % SMALL_BIG_EXT smallest i32
+
+    enc_dec( 7, 16#80000000),  	  % SMALL_BIG_EXT u32
+    enc_dec( 7, 16#ffffffff),  	  % SMALL_BIG_EXT largest u32
+
+    enc_dec( 9, 16#7fffffffffff),     % largest  i48
+    enc_dec( 9,-16#800000000000),     % smallest i48
+    enc_dec( 9, 16#ffffffffffff),     % largest  u48
+    enc_dec(11, 16#7fffffffffffffff), % largest  i64
+    enc_dec(11,-16#8000000000000000), % smallest i64
+    enc_dec(11, 16#ffffffffffffffff), % largest  u64
     ok.
 
 
@@ -125,213 +98,213 @@ encode_decode_ext(Config) when is_list(Config) ->
 %% erl_interface, i.e. not how it is encoded in the test case below.
 
 decode_integer_ext(Config) when is_list(Config) ->
-    ?line decode(  0, <<131,98,  0:32>>),	% SMALL_INTEGER_EXT
-    ?line decode( 42, <<131,98, 42:32>>),	% SMALL_INTEGER_EXT
-    ?line decode(255, <<131,98,255:32>>),	% SMALL_INTEGER_EXT
-    ?line decode( 16#08000000, <<131,98, 16#08000000:32>>), % SMALL_BIG_EXT
-    ?line decode(-16#08000001, <<131,98,-16#08000001:32>>), % SMALL_BIG_EXT
-    ?line decode( 16#7fffffff, <<131,98, 16#7fffffff:32>>), % SMALL_BIG_EXT
-    ?line decode(-16#80000000, <<131,98,-16#80000000:32>>), % SMALL_BIG_EXT
+    decode(  0, <<131,98,  0:32>>),	% SMALL_INTEGER_EXT
+    decode( 42, <<131,98, 42:32>>),	% SMALL_INTEGER_EXT
+    decode(255, <<131,98,255:32>>),	% SMALL_INTEGER_EXT
+    decode( 16#08000000, <<131,98, 16#08000000:32>>), % SMALL_BIG_EXT
+    decode(-16#08000001, <<131,98,-16#08000001:32>>), % SMALL_BIG_EXT
+    decode( 16#7fffffff, <<131,98, 16#7fffffff:32>>), % SMALL_BIG_EXT
+    decode(-16#80000000, <<131,98,-16#80000000:32>>), % SMALL_BIG_EXT
     ok.
 
 decode_small_big_ext(Config) when is_list(Config) ->
-    ?line decode(256,<<131,110,2,0,0,1>>),	% INTEGER_EXT
-    ?line decode(16#07ffffff,<<131,110,4,0,255,255,255,7>>), % INTEGER_EXT
-    ?line decode(16#7fffffff,<<131,110,4,0,255,255,255,127>>), % SMALL_BIG_EXT
-
-    ?line decode(42,<<131,110,1,0,42>>),	% SMALL_INTEGER_EXT
-    ?line decode(42,<<131,110,2,0,42,0>>),	% Redundant zeros from now on
-    ?line decode(42,<<131,110,3,0,42,0,0>>),
-    ?line decode(42,<<131,110,4,0,42,0,0,0>>),
-    ?line decode(42,<<131,110,5,0,42,0,0,0,0>>),
-    ?line decode(42,<<131,110,6,0,42,0,0,0,0,0>>),
-    ?line decode(42,<<131,110,7,0,42,0,0,0,0,0,0>>),
-    ?line decode(42,<<131,110,8,0,42,0,0,0,0,0,0,0>>),
+    decode(256,<<131,110,2,0,0,1>>),	% INTEGER_EXT
+    decode(16#07ffffff,<<131,110,4,0,255,255,255,7>>), % INTEGER_EXT
+    decode(16#7fffffff,<<131,110,4,0,255,255,255,127>>), % SMALL_BIG_EXT
+
+    decode(42,<<131,110,1,0,42>>),	% SMALL_INTEGER_EXT
+    decode(42,<<131,110,2,0,42,0>>),	% Redundant zeros from now on
+    decode(42,<<131,110,3,0,42,0,0>>),
+    decode(42,<<131,110,4,0,42,0,0,0>>),
+    decode(42,<<131,110,5,0,42,0,0,0,0>>),
+    decode(42,<<131,110,6,0,42,0,0,0,0,0>>),
+    decode(42,<<131,110,7,0,42,0,0,0,0,0,0>>),
+    decode(42,<<131,110,8,0,42,0,0,0,0,0,0,0>>),
     ok.
 
 decode_large_big_ext(Config) when is_list(Config) ->
-    ?line decode(256,<<131,111,2:32,0,0,1>>), % INTEGER_EXT
-    ?line decode(16#07ffffff,<<131,111,4:32,0,255,255,255,7>>), % INTEG_EXT
-    ?line decode(16#7fffffff,<<131,111,4:32,0,255,255,255,127>>), % SMA_BIG
-    ?line decode(16#ffffffff,<<131,111,4:32,0,255,255,255,255>>), % SMA_BIG
+    decode(256,<<131,111,2:32,0,0,1>>), % INTEGER_EXT
+    decode(16#07ffffff,<<131,111,4:32,0,255,255,255,7>>), % INTEG_EXT
+    decode(16#7fffffff,<<131,111,4:32,0,255,255,255,127>>), % SMA_BIG
+    decode(16#ffffffff,<<131,111,4:32,0,255,255,255,255>>), % SMA_BIG
 
     N = largest_small_big(),
-    ?line decode(N,<<131,111,255:32,0,N:2040/little>>), % SMALL_BIG_EXT
-
-    ?line decode(42,<<131,111,1:32,0,42>>),
-    ?line decode(42,<<131,111,2:32,0,42,0>>), % Redundant zeros from now on
-    ?line decode(42,<<131,111,3:32,0,42,0,0>>),
-    ?line decode(42,<<131,111,4:32,0,42,0,0,0>>),
-    ?line decode(42,<<131,111,5:32,0,42,0,0,0,0>>),
-    ?line decode(42,<<131,111,6:32,0,42,0,0,0,0,0>>),
-    ?line decode(42,<<131,111,7:32,0,42,0,0,0,0,0,0>>),
-    ?line decode(42,<<131,111,8:32,0,42,0,0,0,0,0,0,0>>),
+    decode(N,<<131,111,255:32,0,N:2040/little>>), % SMALL_BIG_EXT
+
+    decode(42,<<131,111,1:32,0,42>>),
+    decode(42,<<131,111,2:32,0,42,0>>), % Redundant zeros from now on
+    decode(42,<<131,111,3:32,0,42,0,0>>),
+    decode(42,<<131,111,4:32,0,42,0,0,0>>),
+    decode(42,<<131,111,5:32,0,42,0,0,0,0>>),
+    decode(42,<<131,111,6:32,0,42,0,0,0,0,0>>),
+    decode(42,<<131,111,7:32,0,42,0,0,0,0,0,0>>),
+    decode(42,<<131,111,8:32,0,42,0,0,0,0,0,0,0>>),
     ok.
 
 decode_small_big_ext_neg(Config) when is_list(Config) ->
-    ?line decode(-1,<<131,110,1,1,1>>),		% INTEGER_EXT
-    ?line decode(-16#08000000,<<131,110,4,1,0,0,0,8>>), % INTEGER_EXT
-    ?line decode(-16#80000000,<<131,110,4,1,0,0,0,128>>), % SMALL_BIG_EXT
-    ?line decode(-16#ffffffff,<<131,110,4,1,255,255,255,255>>), % SMALL_BIG_EXT
+    decode(-1,<<131,110,1,1,1>>),		% INTEGER_EXT
+    decode(-16#08000000,<<131,110,4,1,0,0,0,8>>), % INTEGER_EXT
+    decode(-16#80000000,<<131,110,4,1,0,0,0,128>>), % SMALL_BIG_EXT
+    decode(-16#ffffffff,<<131,110,4,1,255,255,255,255>>), % SMALL_BIG_EXT
 
     N = largest_small_big(),
-    ?line decode(-N,<<131,111,255:32,1,N:2040/little>>), % SMALL_BIG_EXT
-
-    ?line decode(-42,<<131,110,1,1,42>>),
-    ?line decode(-42,<<131,110,2,1,42,0>>),	% Redundant zeros from now on
-    ?line decode(-42,<<131,110,3,1,42,0,0>>),
-    ?line decode(-42,<<131,110,4,1,42,0,0,0>>),
-    ?line decode(-42,<<131,110,5,1,42,0,0,0,0>>),
-    ?line decode(-42,<<131,110,6,1,42,0,0,0,0,0>>),
-    ?line decode(-42,<<131,110,7,1,42,0,0,0,0,0,0>>),
-    ?line decode(-42,<<131,110,8,1,42,0,0,0,0,0,0,0>>),
+    decode(-N,<<131,111,255:32,1,N:2040/little>>), % SMALL_BIG_EXT
+
+    decode(-42,<<131,110,1,1,42>>),
+    decode(-42,<<131,110,2,1,42,0>>),	% Redundant zeros from now on
+    decode(-42,<<131,110,3,1,42,0,0>>),
+    decode(-42,<<131,110,4,1,42,0,0,0>>),
+    decode(-42,<<131,110,5,1,42,0,0,0,0>>),
+    decode(-42,<<131,110,6,1,42,0,0,0,0,0>>),
+    decode(-42,<<131,110,7,1,42,0,0,0,0,0,0>>),
+    decode(-42,<<131,110,8,1,42,0,0,0,0,0,0,0>>),
     ok.
 
 decode_large_big_ext_neg(Config) when is_list(Config) ->
-    ?line decode(-1,<<131,111,1:32,1,1>>),	% INTEGER_EXT
-    ?line decode(-16#08000000,<<131,111,4:32,1,0,0,0,8>>), % INTEGER_EXT
-    ?line decode(-16#80000000,<<131,111,4:32,1,0,0,0,128>>), % SMALL_BIG_EXT
-
-    ?line decode(-42,<<131,111,1:32,1,42>>),
-    ?line decode(-42,<<131,111,2:32,1,42,0>>), % Redundant zeros from now on
-    ?line decode(-42,<<131,111,3:32,1,42,0,0>>),
-    ?line decode(-42,<<131,111,4:32,1,42,0,0,0>>),
-    ?line decode(-42,<<131,111,5:32,1,42,0,0,0,0>>),
-    ?line decode(-42,<<131,111,6:32,1,42,0,0,0,0,0>>),
-    ?line decode(-42,<<131,111,7:32,1,42,0,0,0,0,0,0>>),
-    ?line decode(-42,<<131,111,8:32,1,42,0,0,0,0,0,0,0>>),
+    decode(-1,<<131,111,1:32,1,1>>),	% INTEGER_EXT
+    decode(-16#08000000,<<131,111,4:32,1,0,0,0,8>>), % INTEGER_EXT
+    decode(-16#80000000,<<131,111,4:32,1,0,0,0,128>>), % SMALL_BIG_EXT
+
+    decode(-42,<<131,111,1:32,1,42>>),
+    decode(-42,<<131,111,2:32,1,42,0>>), % Redundant zeros from now on
+    decode(-42,<<131,111,3:32,1,42,0,0>>),
+    decode(-42,<<131,111,4:32,1,42,0,0,0>>),
+    decode(-42,<<131,111,5:32,1,42,0,0,0,0>>),
+    decode(-42,<<131,111,6:32,1,42,0,0,0,0,0>>),
+    decode(-42,<<131,111,7:32,1,42,0,0,0,0,0,0>>),
+    decode(-42,<<131,111,8:32,1,42,0,0,0,0,0,0,0>>),
     ok.
 
 decode_pos_neg_zero(Config) when is_list(Config) ->
-    ?line decode( 0, <<131,110,0,0>>),		% SMALL_BIG_EXT (positive zero)
-    ?line decode( 0, <<131,110,1,0,0>>),	% SMALL_BIG_EXT (positive zero)
-    ?line decode( 0, <<131,110,0,1>>),		% SMALL_BIG_EXT (negative zero)
-    ?line decode( 0, <<131,110,1,1,0>>),	% SMALL_BIG_EXT (negative zero)
+    decode( 0, <<131,110,0,0>>),		% SMALL_BIG_EXT (positive zero)
+    decode( 0, <<131,110,1,0,0>>),	% SMALL_BIG_EXT (positive zero)
+    decode( 0, <<131,110,0,1>>),		% SMALL_BIG_EXT (negative zero)
+    decode( 0, <<131,110,1,1,0>>),	% SMALL_BIG_EXT (negative zero)
 
-    ?line decode( 0, <<131,111,0:32,0>>),	% SMALL_BIG_EXT (positive zero)
-    ?line decode( 0, <<131,111,1:32,0,0>>),	% SMALL_BIG_EXT (positive zero)
-    ?line decode( 0, <<131,111,0:32,1>>),	% SMALL_BIG_EXT (negative zero)
-    ?line decode( 0, <<131,111,1:32,1,0>>),	% SMALL_BIG_EXT (negative zero)
+    decode( 0, <<131,111,0:32,0>>),	% SMALL_BIG_EXT (positive zero)
+    decode( 0, <<131,111,1:32,0,0>>),	% SMALL_BIG_EXT (positive zero)
+    decode( 0, <<131,111,0:32,1>>),	% SMALL_BIG_EXT (negative zero)
+    decode( 0, <<131,111,1:32,1,0>>),	% SMALL_BIG_EXT (negative zero)
 
     N = largest_small_big(),
-    ?line decode( N,<<131,110,255,0,N:2040/little>>), % largest SMALL_BIG_EXT
-    ?line decode(-N,<<131,110,255,1,N:2040/little>>), % largest SMALL_BIG_EXT
+    decode( N,<<131,110,255,0,N:2040/little>>), % largest SMALL_BIG_EXT
+    decode(-N,<<131,110,255,1,N:2040/little>>), % largest SMALL_BIG_EXT
 
     ok.
 
 %% Test to decode uncompleted encodings for all in "erl_ext_dist.txt"
 
 decode_too_small(Config) when is_list(Config) ->
-    ?line decode_badarg(<<131, 97>>),
-    ?line decode_badarg(<<131, 98>>),
-    ?line decode_badarg(<<131, 98, 0>>),
-    ?line decode_badarg(<<131, 98, 0, 0>>),
-    ?line decode_badarg(<<131, 98, 0, 0, 0>>),
-    ?line decode_badarg(<<131, 99>>),
-    ?line decode_badarg(<<131, 99, 0>>),
-    ?line decode_badarg(<<131, 99, 0:240>>),
-
-    ?line decode_badarg(<<131,100>>),
-    ?line decode_badarg(<<131,100, 1:16/big>>),
-    ?line decode_badarg(<<131,100, 2:16/big>>),
-    ?line decode_badarg(<<131,100, 2:16/big, "A">>),
+    decode_badarg(<<131, 97>>),
+    decode_badarg(<<131, 98>>),
+    decode_badarg(<<131, 98, 0>>),
+    decode_badarg(<<131, 98, 0, 0>>),
+    decode_badarg(<<131, 98, 0, 0, 0>>),
+    decode_badarg(<<131, 99>>),
+    decode_badarg(<<131, 99, 0>>),
+    decode_badarg(<<131, 99, 0:240>>),
+
+    decode_badarg(<<131,100>>),
+    decode_badarg(<<131,100, 1:16/big>>),
+    decode_badarg(<<131,100, 2:16/big>>),
+    decode_badarg(<<131,100, 2:16/big, "A">>),
 
     % FIXME node name "A" seem ok, should it be?
-%    ?line decode_badarg(<<131,101,100,1:16/big,"A",42:32/big,0>>),
-
-    ?line decode_badarg(<<131,101>>),
-    ?line decode_badarg(<<131,101,106>>),
-    ?line decode_badarg(<<131,101,255>>),
-    ?line decode_badarg(<<131,101,106,42:8/big>>),
-    ?line decode_badarg(<<131,101,106,42:16/big>>),
-    ?line decode_badarg(<<131,101,255,42:24/big>>),
-    ?line decode_badarg(<<131,101,255,42:32/big,0>>),
-    ?line decode_badarg(<<131,101,100,1:16/big,"A">>),
-    ?line decode_badarg(<<131,101,100,1:16/big,"A",42:32/big>>),
-
-    ?line decode_badarg(<<131,102>>),
-    ?line decode_badarg(<<131,102,106,42:32/big,0>>),
-    ?line decode_badarg(<<131,102,255,42:32/big,0>>),
-    ?line decode_badarg(<<131,102,100,1:16/big,"A">>),
-    ?line decode_badarg(<<131,102,100,1:16/big,"A",42:32/big>>),
-
-    ?line decode_badarg(<<131,103>>),
-    ?line decode_badarg(<<131,103,106,42:32/big,0>>),
-    ?line decode_badarg(<<131,103,255,42:32/big,0>>),
-    ?line decode_badarg(<<131,103,100,1:16/big,"A">>),
-    ?line decode_badarg(<<131,103,100,1:16/big,"A",42:32/big>>),
-    ?line decode_badarg(<<131,103,100,1:16/big,"A",4:32/big,2:32/big>>),
-
-    ?line decode_badarg(<<131,104>>),
-    ?line decode_badarg(<<131,104, 1>>),
-    ?line decode_badarg(<<131,104, 2, 106>>),
-    ?line decode_badarg(<<131,105, 1:32/big>>),
-    ?line decode_badarg(<<131,105, 2:32/big, 106>>),
-
-    ?line decode_badarg(<<131,107>>),
-    ?line decode_badarg(<<131,107, 1:16/big>>),
-    ?line decode_badarg(<<131,107, 2:16/big>>),
-    ?line decode_badarg(<<131,107, 2:16/big, "A">>),
-
-    ?line decode_badarg(<<131,108>>),
-    ?line decode_badarg(<<131,108, 1:32/big>>),
-    ?line decode_badarg(<<131,108, 2:32/big>>),
-    ?line decode_badarg(<<131,108, 2:32/big, 106>>), % FIXME don't use NIL
-
-    ?line decode_badarg(<<131,109>>),
-    ?line decode_badarg(<<131,109, 1:32/big>>),
-    ?line decode_badarg(<<131,109, 2:32/big>>),
-    ?line decode_badarg(<<131,109, 2:32/big, 42>>),
+    %    decode_badarg(<<131,101,100,1:16/big,"A",42:32/big,0>>),
+
+    decode_badarg(<<131,101>>),
+    decode_badarg(<<131,101,106>>),
+    decode_badarg(<<131,101,255>>),
+    decode_badarg(<<131,101,106,42:8/big>>),
+    decode_badarg(<<131,101,106,42:16/big>>),
+    decode_badarg(<<131,101,255,42:24/big>>),
+    decode_badarg(<<131,101,255,42:32/big,0>>),
+    decode_badarg(<<131,101,100,1:16/big,"A">>),
+    decode_badarg(<<131,101,100,1:16/big,"A",42:32/big>>),
+
+    decode_badarg(<<131,102>>),
+    decode_badarg(<<131,102,106,42:32/big,0>>),
+    decode_badarg(<<131,102,255,42:32/big,0>>),
+    decode_badarg(<<131,102,100,1:16/big,"A">>),
+    decode_badarg(<<131,102,100,1:16/big,"A",42:32/big>>),
+
+    decode_badarg(<<131,103>>),
+    decode_badarg(<<131,103,106,42:32/big,0>>),
+    decode_badarg(<<131,103,255,42:32/big,0>>),
+    decode_badarg(<<131,103,100,1:16/big,"A">>),
+    decode_badarg(<<131,103,100,1:16/big,"A",42:32/big>>),
+    decode_badarg(<<131,103,100,1:16/big,"A",4:32/big,2:32/big>>),
+
+    decode_badarg(<<131,104>>),
+    decode_badarg(<<131,104, 1>>),
+    decode_badarg(<<131,104, 2, 106>>),
+    decode_badarg(<<131,105, 1:32/big>>),
+    decode_badarg(<<131,105, 2:32/big, 106>>),
+
+    decode_badarg(<<131,107>>),
+    decode_badarg(<<131,107, 1:16/big>>),
+    decode_badarg(<<131,107, 2:16/big>>),
+    decode_badarg(<<131,107, 2:16/big, "A">>),
+
+    decode_badarg(<<131,108>>),
+    decode_badarg(<<131,108, 1:32/big>>),
+    decode_badarg(<<131,108, 2:32/big>>),
+    decode_badarg(<<131,108, 2:32/big, 106>>), % FIXME don't use NIL
+
+    decode_badarg(<<131,109>>),
+    decode_badarg(<<131,109, 1:32/big>>),
+    decode_badarg(<<131,109, 2:32/big>>),
+    decode_badarg(<<131,109, 2:32/big, 42>>),
 
     N = largest_small_big(),
 
-    ?line decode_badarg(<<131,110>>),
-    ?line decode_badarg(<<131,110,1>>),
-    ?line decode_badarg(<<131,110,1,0>>),
-    ?line decode_badarg(<<131,110,1,1>>),
-    ?line decode_badarg(<<131,110,2,0,42>>),
-    ?line decode_badarg(<<131,110,2,1,42>>),
-    ?line decode_badarg(<<131,110,255,0,N:2032/little>>),
-    ?line decode_badarg(<<131,110,255,1,N:2032/little>>),
-
-    ?line decode_badarg(<<131,111>>),
-    ?line decode_badarg(<<131,111,  1:32/big>>),
-    ?line decode_badarg(<<131,111,  1:32/big,0>>),
-    ?line decode_badarg(<<131,111,  1:32/big,1>>),
-    ?line decode_badarg(<<131,111,  2:32/big,0,42>>),
-    ?line decode_badarg(<<131,111,  2:32/big,1,42>>),
-    ?line decode_badarg(<<131,111,256:32/big,0,N:2032/little>>),
-    ?line decode_badarg(<<131,111,256:32/big,1,N:2032/little>>),
-    ?line decode_badarg(<<131,111,256:32/big,0,N:2040/little>>),
-    ?line decode_badarg(<<131,111,256:32/big,1,N:2040/little>>),
-    ?line decode_badarg(<<131,111,257:32/big,0,N:2048/little>>),
-    ?line decode_badarg(<<131,111,257:32/big,1,N:2048/little>>),
+    decode_badarg(<<131,110>>),
+    decode_badarg(<<131,110,1>>),
+    decode_badarg(<<131,110,1,0>>),
+    decode_badarg(<<131,110,1,1>>),
+    decode_badarg(<<131,110,2,0,42>>),
+    decode_badarg(<<131,110,2,1,42>>),
+    decode_badarg(<<131,110,255,0,N:2032/little>>),
+    decode_badarg(<<131,110,255,1,N:2032/little>>),
+
+    decode_badarg(<<131,111>>),
+    decode_badarg(<<131,111,  1:32/big>>),
+    decode_badarg(<<131,111,  1:32/big,0>>),
+    decode_badarg(<<131,111,  1:32/big,1>>),
+    decode_badarg(<<131,111,  2:32/big,0,42>>),
+    decode_badarg(<<131,111,  2:32/big,1,42>>),
+    decode_badarg(<<131,111,256:32/big,0,N:2032/little>>),
+    decode_badarg(<<131,111,256:32/big,1,N:2032/little>>),
+    decode_badarg(<<131,111,256:32/big,0,N:2040/little>>),
+    decode_badarg(<<131,111,256:32/big,1,N:2040/little>>),
+    decode_badarg(<<131,111,257:32/big,0,N:2048/little>>),
+    decode_badarg(<<131,111,257:32/big,1,N:2048/little>>),
 
     % Emulator dies if trying to create large bignum....
-%    ?line decode_badarg(<<131,111,16#ffffffff:32/big,0>>),
-%    ?line decode_badarg(<<131,111,16#ffffffff:32/big,1>>),
-
-    ?line decode_badarg(<<131, 78>>),
-    ?line decode_badarg(<<131, 78, 42>>),
-    ?line decode_badarg(<<131, 78, 42, 1>>),
-    ?line decode_badarg(<<131, 78, 42, 1:16/big>>),
-    ?line decode_badarg(<<131, 78, 42, 2:16/big>>),
-    ?line decode_badarg(<<131, 78, 42, 2:16/big, "A">>),
-
-    ?line decode_badarg(<<131, 67>>),
-
-    ?line decode_badarg(<<131,114>>),
-    ?line decode_badarg(<<131,114,0>>),
-    ?line decode_badarg(<<131,114,1:16/big>>),
-    ?line decode_badarg(<<131,114,1:16/big,100>>),
-    ?line decode_badarg(<<131,114,1:16/big,100,1:16/big>>),
-    ?line decode_badarg(<<131,114,1:16/big,100,1:16/big,"A">>),
-    ?line decode_badarg(<<131,114,1:16/big,100,1:16/big,"A",0>>),
-    ?line decode_badarg(<<131,114,1:16/big,100,1:16/big,"A",0,42:8>>),
-    ?line decode_badarg(<<131,114,1:16/big,100,1:16/big,"A",0,42:16>>),
-    ?line decode_badarg(<<131,114,1:16/big,100,1:16/big,"A",0,42:24>>),
-
-    ?line decode_badarg(<<131,117>>),		% FIXME needs more tests
+    %    decode_badarg(<<131,111,16#ffffffff:32/big,0>>),
+    %    decode_badarg(<<131,111,16#ffffffff:32/big,1>>),
+
+    decode_badarg(<<131, 78>>),
+    decode_badarg(<<131, 78, 42>>),
+    decode_badarg(<<131, 78, 42, 1>>),
+    decode_badarg(<<131, 78, 42, 1:16/big>>),
+    decode_badarg(<<131, 78, 42, 2:16/big>>),
+    decode_badarg(<<131, 78, 42, 2:16/big, "A">>),
+
+    decode_badarg(<<131, 67>>),
+
+    decode_badarg(<<131,114>>),
+    decode_badarg(<<131,114,0>>),
+    decode_badarg(<<131,114,1:16/big>>),
+    decode_badarg(<<131,114,1:16/big,100>>),
+    decode_badarg(<<131,114,1:16/big,100,1:16/big>>),
+    decode_badarg(<<131,114,1:16/big,100,1:16/big,"A">>),
+    decode_badarg(<<131,114,1:16/big,100,1:16/big,"A",0>>),
+    decode_badarg(<<131,114,1:16/big,100,1:16/big,"A",0,42:8>>),
+    decode_badarg(<<131,114,1:16/big,100,1:16/big,"A",0,42:16>>),
+    decode_badarg(<<131,114,1:16/big,100,1:16/big,"A",0,42:24>>),
+
+    decode_badarg(<<131,117>>),		% FIXME needs more tests
 
     ok.
 
@@ -380,12 +353,11 @@ my_appender_1(N, T0) ->
     U = rnd_term(),
     T = [U|T0],
     my_appender_1(N-1, T).
-    
+
 seed() ->
-    random:seed(3172, 9815, 20129).
+    rand:seed(exsplus, {3172,9815,20129}).
 
 rnd_term() ->
-    U0 = random:uniform(),
+    U0 = rand:uniform(),
     B = <<U0/float>>,
     {U0,U0 * 2.5 + 3.14,[U0*2.3,B]}.
-
diff --git a/erts/emulator/test/exception_SUITE.erl b/erts/emulator/test/exception_SUITE.erl
index 11caea3698..1cad7e7920 100644
--- a/erts/emulator/test/exception_SUITE.erl
+++ b/erts/emulator/test/exception_SUITE.erl
@@ -20,67 +20,52 @@
 
 -module(exception_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 badmatch/1, pending_errors/1, nil_arith/1,
+-export([all/0, suite/0,
+         badmatch/1, pending_errors/1, nil_arith/1,
          stacktrace/1, nested_stacktrace/1, raise/1, gunilla/1, per/1,
-	 exception_with_heap_frag/1, line_numbers/1]).
+         exception_with_heap_frag/1, line_numbers/1]).
 
 -export([bad_guy/2]).
 -export([crash/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -import(lists, [foreach/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 10}}].
 
 all() -> 
     [badmatch, pending_errors, nil_arith, stacktrace,
      nested_stacktrace, raise, gunilla, per,
      exception_with_heap_frag, line_numbers].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 -define(try_match(E),
-	catch ?MODULE:bar(),
-	{'EXIT', {{badmatch, nomatch}, _}} = (catch E = id(nomatch))).
+        catch ?MODULE:bar(),
+        {'EXIT', {{badmatch, nomatch}, _}} = (catch E = id(nomatch))).
 
 %% Test that deliberately bad matches are reported correctly.
 
 badmatch(Config) when is_list(Config) ->
-    ?line ?try_match(a),
-    ?line ?try_match(42),
-    ?line ?try_match({a, b, c}),
-    ?line ?try_match([]),
-    ?line ?try_match(1.0),
+    ?try_match(a),
+    ?try_match(42),
+    ?try_match({a, b, c}),
+    ?try_match([]),
+    ?try_match(1.0),
     ok.
 
 %% Test various exceptions, in the presence of a previous error suppressed
 %% in a guard.
 pending_errors(Config) when is_list(Config) ->
-    ?line pending(e_badmatch, {badmatch, b}),
-    ?line pending(x, function_clause),
-    ?line pending(e_case, {case_clause, xxx}),
-    ?line pending(e_if, if_clause),
-    ?line pending(e_badarith, badarith),
-    ?line pending(e_undef, undef),
-    ?line pending(e_timeoutval, timeout_value),
-    ?line pending(e_badarg, badarg),
-    ?line pending(e_badarg_spawn, badarg),
+    pending(e_badmatch, {badmatch, b}),
+    pending(x, function_clause),
+    pending(e_case, {case_clause, xxx}),
+    pending(e_if, if_clause),
+    pending(e_badarith, badarith),
+    pending(e_undef, undef),
+    pending(e_timeoutval, timeout_value),
+    pending(e_badarg, badarg),
+    pending(e_badarg_spawn, badarg),
     ok.
 
 bad_guy(pe_badarith, Other) when Other+1 == 0 -> % badarith (suppressed)
@@ -89,11 +74,11 @@ bad_guy(pe_badarg, Other) when length(Other) > 0 -> % badarg (suppressed)
     ok;
 bad_guy(_, e_case) ->
     case id(xxx) of
-	ok -> ok
+        ok -> ok
     end;					% case_clause
 bad_guy(_, e_if) ->
     if
-	a == b -> ok
+        a == b -> ok
     end;					% if_clause
 bad_guy(_, e_badarith) ->
     1+b;					% badarith
@@ -101,9 +86,9 @@ bad_guy(_, e_undef) ->
     non_existing_module:foo();			% undef
 bad_guy(_, e_timeoutval) ->
     receive
-	after arne ->				% timeout_value
-		ok
-	end;
+    after arne ->				% timeout_value
+              ok
+    end;
 bad_guy(_, e_badarg) ->
     node(xxx);					% badarg
 bad_guy(_, e_badarg_spawn) ->
@@ -122,30 +107,30 @@ pending(First, Second, Expected) ->
 pending_catched(First, Second, Expected) ->
     ok = io:format("Catching bad_guy(~p, ~p)", [First, Second]),
     case catch bad_guy(First, Second) of
-	{'EXIT', Reason} ->
-	    pending(Reason, bad_guy, [First, Second], Expected);
-	Other ->
-	    test_server:fail({not_exit, Other})
+        {'EXIT', Reason} ->
+            pending(Reason, bad_guy, [First, Second], Expected);
+        Other ->
+            ct:fail({not_exit, Other})
     end.
 
 pending_exit_message(Args, Expected) ->
     ok = io:format("Trapping EXITs from spawn_link(~p, ~p, ~p)",
-		   [?MODULE, bad_guy, Args]),
+                   [?MODULE, bad_guy, Args]),
     process_flag(trap_exit, true),
     Pid = spawn_link(?MODULE, bad_guy, Args),
     receive
-	{'EXIT', Pid, Reason} ->
-	    pending(Reason, bad_guy, Args, Expected);
-	Other ->
-	    test_server:fail({unexpected_message, Other})
+        {'EXIT', Pid, Reason} ->
+            pending(Reason, bad_guy, Args, Expected);
+        Other ->
+            ct:fail({unexpected_message, Other})
     after 10000 ->
-	    test_server:fail(timeout)
+              ct:fail(timeout)
     end,
     process_flag(trap_exit, false).
 
 pending({badarg,[{erlang,Bif,BifArgs,Loc1},
-		 {?MODULE,Func,Arity,Loc2}|_]},
-	Func, Args, _Code)
+                 {?MODULE,Func,Arity,Loc2}|_]},
+        Func, Args, _Code)
   when is_atom(Bif), is_list(BifArgs), length(Args) =:= Arity,
        is_list(Loc1), is_list(Loc2) ->
     ok;
@@ -159,67 +144,67 @@ pending({Code,[{?MODULE,Func,Arity,Loc}|_]}, Func, Args, Code)
   when length(Args) =:= Arity, is_list(Loc) ->
     ok;
 pending(Reason, _Function, _Args, _Code) ->
-    test_server:fail({bad_exit_reason,Reason}).
+    ct:fail({bad_exit_reason,Reason}).
 
 %% Test that doing arithmetics on [] gives a badarith EXIT and not a crash.
 
 nil_arith(Config) when is_list(Config) ->
-    ?line ba_plus_minus_times([], []),
-
-    ?line ba_plus_minus_times([], 0),
-    ?line ba_plus_minus_times([], 42),
-    ?line ba_plus_minus_times([], 38724978123478923784),
-    ?line ba_plus_minus_times([], 38.72),
-
-    ?line ba_plus_minus_times(0, []),
-    ?line ba_plus_minus_times(334, []),
-    ?line ba_plus_minus_times(387249797813478923784, []),
-    ?line ba_plus_minus_times(344.22, []),
-
-    ?line ba_div_rem([], []),
-
-    ?line ba_div_rem([], 0),
-    ?line ba_div_rem([], 1),
-    ?line ba_div_rem([], 42),
-    ?line ba_div_rem([], 38724978123478923784),
-    ?line ba_div_rem(344.22, []),
-
-    ?line ba_div_rem(0, []),
-    ?line ba_div_rem(1, []),
-    ?line ba_div_rem(334, []),
-    ?line ba_div_rem(387249797813478923784, []),
-    ?line ba_div_rem(344.22, []),
-
-    ?line ba_div_rem(344.22, 0.0),
-    ?line ba_div_rem(1, 0.0),
-    ?line ba_div_rem(392873498733971, 0.0),
-    
-    ?line ba_bop([], []),
-    ?line ba_bop(0, []),
-    ?line ba_bop(42, []),
-    ?line ba_bop(-42342742987343, []),
-    ?line ba_bop(238.342, []),
-    ?line ba_bop([], 0),
-    ?line ba_bop([], -243),
-    ?line ba_bop([], 243),
-    ?line ba_bop([], 2438724982478933),
-    ?line ba_bop([], 3987.37),
-
-    ?line ba_bnot([]),
-    ?line ba_bnot(23.33),
-
-    ?line ba_shift([], []),
-    ?line ba_shift([], 0),
-    ?line ba_shift([], 4),
-    ?line ba_shift([], -4),
-    ?line ba_shift([], 2343333333333),
-    ?line ba_shift([], -333333333),
-    ?line ba_shift([], 234.00),
-    ?line ba_shift(23, []),
-    ?line ba_shift(0, []),
-    ?line ba_shift(-3433443433433323, []),
-    ?line ba_shift(433443433433323, []),
-    ?line ba_shift(343.93, []),
+    ba_plus_minus_times([], []),
+
+    ba_plus_minus_times([], 0),
+    ba_plus_minus_times([], 42),
+    ba_plus_minus_times([], 38724978123478923784),
+    ba_plus_minus_times([], 38.72),
+
+    ba_plus_minus_times(0, []),
+    ba_plus_minus_times(334, []),
+    ba_plus_minus_times(387249797813478923784, []),
+    ba_plus_minus_times(344.22, []),
+
+    ba_div_rem([], []),
+
+    ba_div_rem([], 0),
+    ba_div_rem([], 1),
+    ba_div_rem([], 42),
+    ba_div_rem([], 38724978123478923784),
+    ba_div_rem(344.22, []),
+
+    ba_div_rem(0, []),
+    ba_div_rem(1, []),
+    ba_div_rem(334, []),
+    ba_div_rem(387249797813478923784, []),
+    ba_div_rem(344.22, []),
+
+    ba_div_rem(344.22, 0.0),
+    ba_div_rem(1, 0.0),
+    ba_div_rem(392873498733971, 0.0),
+
+    ba_bop([], []),
+    ba_bop(0, []),
+    ba_bop(42, []),
+    ba_bop(-42342742987343, []),
+    ba_bop(238.342, []),
+    ba_bop([], 0),
+    ba_bop([], -243),
+    ba_bop([], 243),
+    ba_bop([], 2438724982478933),
+    ba_bop([], 3987.37),
+
+    ba_bnot([]),
+    ba_bnot(23.33),
+
+    ba_shift([], []),
+    ba_shift([], 0),
+    ba_shift([], 4),
+    ba_shift([], -4),
+    ba_shift([], 2343333333333),
+    ba_shift([], -333333333),
+    ba_shift([], 234.00),
+    ba_shift(23, []),
+    ba_shift(0, []),
+    ba_shift(-3433443433433323, []),
+    ba_shift(433443433433323, []),
+    ba_shift(343.93, []),
     ok.
 
 ba_plus_minus_times(A, B) ->
@@ -251,7 +236,7 @@ ba_shift(A, B) ->
     {'EXIT', {badarith, _}} = (catch A bsl B),
     io:format("~p bsr ~p", [A, B]),
     {'EXIT', {badarith, _}} = (catch A bsr B).
-    
+
 ba_bnot(A) ->
     io:format("bnot ~p", [A]),
     {'EXIT', {badarith, _}} = (catch bnot A).
@@ -260,38 +245,38 @@ ba_bnot(A) ->
 
 stacktrace(Conf) when is_list(Conf) ->
     Tag = make_ref(),
-    ?line {_,Mref} = spawn_monitor(fun() -> exit({Tag,erlang:get_stacktrace()}) end),
-    ?line {Tag,[]} = receive {'DOWN',Mref,_,_,Info} -> Info end,
+    {_,Mref} = spawn_monitor(fun() -> exit({Tag,erlang:get_stacktrace()}) end),
+    {Tag,[]} = receive {'DOWN',Mref,_,_,Info} -> Info end,
     V = [make_ref()|self()],
-    ?line {value2,{caught1,badarg,[{erlang,abs,[V],_}|_]=St1}} =
-	stacktrace_1({'abs',V}, error, {value,V}),
-    ?line St1 = erase(stacktrace1),
-    ?line St1 = erase(stacktrace2),
-    ?line St1 = erlang:get_stacktrace(),
-    ?line {caught2,{error,badarith},[{?MODULE,my_add,2,_}|_]=St2} =
-	stacktrace_1({'div',{1,0}}, error, {'add',{0,a}}),
-    ?line [{?MODULE,my_div,2,_}|_] = erase(stacktrace1),
-    ?line St2 = erase(stacktrace2),
-    ?line St2 = erlang:get_stacktrace(),
-    ?line {caught2,{error,{try_clause,V}},[{?MODULE,stacktrace_1,3,_}|_]=St3} =
-	stacktrace_1({value,V}, error, {value,V}),
-    ?line St3 = erase(stacktrace1),
-    ?line St3 = erase(stacktrace2),
-    ?line St3 = erlang:get_stacktrace(),
-    ?line {caught2,{throw,V},[{?MODULE,foo,1,_}|_]=St4} =
-	stacktrace_1({value,V}, error, {throw,V}),
-    ?line [{?MODULE,stacktrace_1,3,_}|_] = erase(stacktrace1),
-    ?line St4 = erase(stacktrace2),
-    ?line St4 = erlang:get_stacktrace(),
+    {value2,{caught1,badarg,[{erlang,abs,[V],_}|_]=St1}} =
+    stacktrace_1({'abs',V}, error, {value,V}),
+    St1 = erase(stacktrace1),
+    St1 = erase(stacktrace2),
+    St1 = erlang:get_stacktrace(),
+    {caught2,{error,badarith},[{?MODULE,my_add,2,_}|_]=St2} =
+    stacktrace_1({'div',{1,0}}, error, {'add',{0,a}}),
+    [{?MODULE,my_div,2,_}|_] = erase(stacktrace1),
+    St2 = erase(stacktrace2),
+    St2 = erlang:get_stacktrace(),
+    {caught2,{error,{try_clause,V}},[{?MODULE,stacktrace_1,3,_}|_]=St3} =
+    stacktrace_1({value,V}, error, {value,V}),
+    St3 = erase(stacktrace1),
+    St3 = erase(stacktrace2),
+    St3 = erlang:get_stacktrace(),
+    {caught2,{throw,V},[{?MODULE,foo,1,_}|_]=St4} =
+    stacktrace_1({value,V}, error, {throw,V}),
+    [{?MODULE,stacktrace_1,3,_}|_] = erase(stacktrace1),
+    St4 = erase(stacktrace2),
+    St4 = erlang:get_stacktrace(),
 
     try
-	?line stacktrace_2()
+        stacktrace_2()
     catch
-	error:{badmatch,_} ->
-	    [{?MODULE,stacktrace_2,0,_},
-	     {?MODULE,stacktrace,1,_}|_] =
-		erlang:get_stacktrace(),
-	    ok
+        error:{badmatch,_} ->
+            [{?MODULE,stacktrace_2,0,_},
+             {?MODULE,stacktrace,1,_}|_] =
+            erlang:get_stacktrace(),
+            ok
     end.
 
 stacktrace_1(X, C1, Y) ->
@@ -303,7 +288,7 @@ stacktrace_1(X, C1, Y) ->
             C1:D1 -> {caught1,D1,erlang:get_stacktrace()}
         after
             put(stacktrace1, erlang:get_stacktrace()),
-	    foo(Y)
+            foo(Y)
         end of
         V2 -> {value2,V2}
     catch
@@ -319,21 +304,21 @@ stacktrace_2() ->
 
 nested_stacktrace(Conf) when is_list(Conf) ->
     V = [{make_ref()}|[self()]],
-    ?line value1 =
-	nested_stacktrace_1({{value,{V,x1}},void,{V,x1}},
-			    {void,void,void}),
-    ?line {caught1,
-	   [{?MODULE,my_add,2,_}|_],
-	   value2,
-	   [{?MODULE,my_add,2,_}|_]} =
-	nested_stacktrace_1({{'add',{V,x1}},error,badarith},
-			    {{value,{V,x2}},void,{V,x2}}),
-    ?line {caught1,
-	   [{?MODULE,my_add,2,_}|_],
-	   {caught2,[{erlang,abs,[V],_}|_]},
-	   [{erlang,abs,[V],_}|_]} =
-	nested_stacktrace_1({{'add',{V,x1}},error,badarith},
-			    {{'abs',V},error,badarg}),
+    value1 =
+    nested_stacktrace_1({{value,{V,x1}},void,{V,x1}},
+                        {void,void,void}),
+    {caught1,
+     [{?MODULE,my_add,2,_}|_],
+     value2,
+     [{?MODULE,my_add,2,_}|_]} =
+    nested_stacktrace_1({{'add',{V,x1}},error,badarith},
+                        {{value,{V,x2}},void,{V,x2}}),
+    {caught1,
+     [{?MODULE,my_add,2,_}|_],
+     {caught2,[{erlang,abs,[V],_}|_]},
+     [{erlang,abs,[V],_}|_]} =
+    nested_stacktrace_1({{'add',{V,x1}},error,badarith},
+                        {{'abs',V},error,badarg}),
     ok.
 
 nested_stacktrace_1({X1,C1,V1}, {X2,C2,V2}) ->
@@ -341,64 +326,64 @@ nested_stacktrace_1({X1,C1,V1}, {X2,C2,V2}) ->
         V1 -> value1
     catch
         C1:V1 ->
-	    S1 = erlang:get_stacktrace(),
+            S1 = erlang:get_stacktrace(),
             T2 =
-                try foo(X2) of
-	            V2 -> value2
-                catch
-                    C2:V2 -> {caught2,erlang:get_stacktrace()}
-                end,
+            try foo(X2) of
+                V2 -> value2
+            catch
+                C2:V2 -> {caught2,erlang:get_stacktrace()}
+            end,
             {caught1,S1,T2,erlang:get_stacktrace()}
     end.
 
 
 
 raise(Conf) when is_list(Conf) ->
-    ?line erase(raise),
-    ?line A = 
-	try 
-	    ?line try foo({'div',{1,0}}) 
-		  catch
-		      error:badarith ->
-			  put(raise, A0 = erlang:get_stacktrace()),
-			  ?line erlang:raise(error, badarith, A0)
-		  end
-	catch
-	    error:badarith ->
-		?line A1 = erlang:get_stacktrace(),
-		?line A1 = get(raise)
-	end,
-    ?line A = erlang:get_stacktrace(),
-    ?line A = get(raise),
-    ?line [{?MODULE,my_div,2,_}|_] = A,
+    erase(raise),
+    A = 
+    try 
+        try foo({'div',{1,0}}) 
+        catch
+            error:badarith ->
+                put(raise, A0 = erlang:get_stacktrace()),
+                erlang:raise(error, badarith, A0)
+        end
+    catch
+        error:badarith ->
+            A1 = erlang:get_stacktrace(),
+            A1 = get(raise)
+    end,
+    A = erlang:get_stacktrace(),
+    A = get(raise),
+    [{?MODULE,my_div,2,_}|_] = A,
     %%
     N = 8, % Must be even
-    ?line N = erlang:system_flag(backtrace_depth, N),
-    ?line B = odd_even(N, []),
-    ?line try even(N) 
-	  catch error:function_clause -> ok
-	  end,
-    ?line B = erlang:get_stacktrace(),
+    N = erlang:system_flag(backtrace_depth, N),
+    B = odd_even(N, []),
+    try even(N) 
+    catch error:function_clause -> ok
+    end,
+    B = erlang:get_stacktrace(),
     %%
-    ?line C0 = odd_even(N+1, []),
-    ?line C = lists:sublist(C0, N),
-    ?line try odd(N+1) 
-	  catch error:function_clause -> ok
-	  end,
-    ?line C = erlang:get_stacktrace(),
-    ?line try erlang:raise(error, function_clause, C0)
-          catch error:function_clause -> ok
-          end,
-    ?line C = erlang:get_stacktrace(),
+    C0 = odd_even(N+1, []),
+    C = lists:sublist(C0, N),
+    try odd(N+1) 
+    catch error:function_clause -> ok
+    end,
+    C = erlang:get_stacktrace(),
+    try erlang:raise(error, function_clause, C0)
+    catch error:function_clause -> ok
+    end,
+    C = erlang:get_stacktrace(),
     ok.
 
 odd_even(N, R) when is_integer(N), N > 1 ->
     odd_even(N-1, 
-	     [if (N rem 2) == 0 ->
-		      {?MODULE,even,1,[{file,"odd_even.erl"},{line,3}]};
-		 true ->
-		      {?MODULE,odd,1,[{file,"odd_even.erl"},{line,6}]}
-	      end|R]);
+             [if (N rem 2) == 0 ->
+                     {?MODULE,even,1,[{file,"odd_even.erl"},{line,3}]};
+                 true ->
+                     {?MODULE,odd,1,[{file,"odd_even.erl"},{line,6}]}
+              end|R]);
 odd_even(1, R) ->
     [{?MODULE,odd,[1],[{file,"odd_even.erl"},{line,5}]}|R].
 
@@ -428,18 +413,18 @@ my_add(A, B) ->
 my_abs(X) -> abs(X).
 
 gunilla(Config) when is_list(Config) ->
-    ?line {throw,kalle} = gunilla_1(),
-    ?line [] = erlang:get_stacktrace(),
+    {throw,kalle} = gunilla_1(),
+    [] = erlang:get_stacktrace(),
     ok.
 
 gunilla_1() ->
     try try arne()
-	after
-	    pelle
-	end
+        after
+            pelle
+        end
     catch
-	C:R ->
-	    {C,R}
+        C:R ->
+            {C,R}
     end.
 
 arne() ->
@@ -448,18 +433,18 @@ arne() ->
 
 per(Config) when is_list(Config) ->
     try 
-	t1(0,pad,0),
-	t2(0,pad,0)
+        t1(0,pad,0),
+        t2(0,pad,0)
     catch
-	error:badarith ->
-	    ok
+        error:badarith ->
+            ok
     end.
 
 t1(_,X,_) ->
-   (1 bsl X) + 1.
+    (1 bsl X) + 1.
 
 t2(_,X,_) ->
-   (X bsl 1) + 1.
+    (X bsl 1) + 1.
 
 %%
 %% Make sure that even if a BIF builds an heap fragment, then causes an exception,
@@ -471,155 +456,155 @@ exception_with_heap_frag(Config) when is_list(Config) ->
 
     %% Floats are only validated when the heap fragment has been allocated.
     BadFloat = <<131,99,53,46,48,$X,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,101,45,48,49,0,0,0,0,0>>,
-    ?line do_exception_with_heap_frag(BadFloat, Sizes),
+    do_exception_with_heap_frag(BadFloat, Sizes),
 
     %% {Binary,BadFloat}: When the error in float is discovered, a refc-binary
     %% has been allocated and the list of refc-binaries goes through the
     %% heap fragment.
     BinAndFloat = 
-	<<131,104,2,109,0,0,1,0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,
-	 21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,
-	 46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,
-	 71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,
-	 96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,
-	 116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,
-	 135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,
-	 154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,
-	 173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
-	 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,
-	 211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,
-	 230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,
-	 249,250,251,252,253,254,255,99,51,46,49,52,$B,$l,$u,$r,$f,48,48,48,48,48,48,
-	 48,48,49,50,52,51,52,101,43,48,48,0,0,0,0,0>>,
-    ?line do_exception_with_heap_frag(BinAndFloat, Sizes),
+    <<131,104,2,109,0,0,1,0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,
+      21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,
+      46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,
+      71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,
+      96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,
+      116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,
+      135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,
+      154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,
+      173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+      192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,
+      211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,
+      230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,
+      249,250,251,252,253,254,255,99,51,46,49,52,$B,$l,$u,$r,$f,48,48,48,48,48,48,
+      48,48,49,50,52,51,52,101,43,48,48,0,0,0,0,0>>,
+    do_exception_with_heap_frag(BinAndFloat, Sizes),
 
     %% {Fun,BadFloat}
     FunAndFloat =
-	<<131,104,2,112,0,0,0,66,0,238,239,135,138,137,216,89,57,22,111,52,126,16,84,
-	 71,8,0,0,0,0,0,0,0,0,100,0,1,116,97,0,98,5,175,169,123,103,100,0,13,110,111,
-	 110,111,100,101,64,110,111,104,111,115,116,0,0,0,41,0,0,0,0,0,99,50,46,55,48,
-	 $Y,57,57,57,57,57,57,57,57,57,57,57,57,57,54,52,52,55,101,43,48,48,0,0,0,0,0>>,
-    ?line do_exception_with_heap_frag(FunAndFloat, Sizes),
+    <<131,104,2,112,0,0,0,66,0,238,239,135,138,137,216,89,57,22,111,52,126,16,84,
+      71,8,0,0,0,0,0,0,0,0,100,0,1,116,97,0,98,5,175,169,123,103,100,0,13,110,111,
+      110,111,100,101,64,110,111,104,111,115,116,0,0,0,41,0,0,0,0,0,99,50,46,55,48,
+      $Y,57,57,57,57,57,57,57,57,57,57,57,57,57,54,52,52,55,101,43,48,48,0,0,0,0,0>>,
+    do_exception_with_heap_frag(FunAndFloat, Sizes),
 
     %% [ExternalPid|BadFloat]
     ExtPidAndFloat =
-	<<131,108,0,0,0,1,103,100,0,13,107,97,108,108,101,64,115,116,114,105,100,101,
-	 114,0,0,0,36,0,0,0,0,2,99,48,46,$@,48,48,48,48,48,48,48,48,48,48,48,48,48,48,
-	 48,48,48,48,48,101,43,48,48,0,0,0,0,0>>,
-    ?line do_exception_with_heap_frag(ExtPidAndFloat, Sizes),
-    
+    <<131,108,0,0,0,1,103,100,0,13,107,97,108,108,101,64,115,116,114,105,100,101,
+      114,0,0,0,36,0,0,0,0,2,99,48,46,$@,48,48,48,48,48,48,48,48,48,48,48,48,48,48,
+      48,48,48,48,48,101,43,48,48,0,0,0,0,0>>,
+    do_exception_with_heap_frag(ExtPidAndFloat, Sizes),
+
     ok.
 
 do_exception_with_heap_frag(Bin, [Sz|Sizes]) ->
     Filler = erlang:make_tuple(Sz, a),
     spawn(fun() ->
-		  try
-		      binary_to_term(Bin)
-		  catch
-		      _:_ ->
-			  %% term_to_binary/1 is an easy way to traverse the
-			  %% entire stacktrace term to make sure that every part
-			  %% of it is OK.
-			  term_to_binary(erlang:get_stacktrace())
-		  end,
-		      id(Filler)
-		      end),
+                  try
+                      binary_to_term(Bin)
+                  catch
+                      _:_ ->
+                          %% term_to_binary/1 is an easy way to traverse the
+                          %% entire stacktrace term to make sure that every part
+                          %% of it is OK.
+                          term_to_binary(erlang:get_stacktrace())
+                  end,
+                  id(Filler)
+          end),
     do_exception_with_heap_frag(Bin, Sizes);
 do_exception_with_heap_frag(_, []) -> ok.
 
 line_numbers(Config) when is_list(Config) ->
     {'EXIT',{{case_clause,bad_tag},
-	     [{?MODULE,line1,2,
-	       [{file,"fake_file.erl"},{line,3}]},
-	      {?MODULE,line_numbers,1,_}|_]}} =
-	(catch line1(bad_tag, 0)),
+             [{?MODULE,line1,2,
+               [{file,"fake_file.erl"},{line,3}]},
+              {?MODULE,line_numbers,1,_}|_]}} =
+    (catch line1(bad_tag, 0)),
     {'EXIT',{badarith,
-	     [{?MODULE,line1,2,
-	       [{file,"fake_file.erl"},{line,5}]},
-	      {?MODULE,line_numbers,1,_}|_]}} =
-	(catch line1(a, not_an_integer)),
+             [{?MODULE,line1,2,
+               [{file,"fake_file.erl"},{line,5}]},
+              {?MODULE,line_numbers,1,_}|_]}} =
+    (catch line1(a, not_an_integer)),
     {'EXIT',{{badmatch,{ok,1}},
-	     [{?MODULE,line1,2,
-	       [{file,"fake_file.erl"},{line,7}]},
-	      {?MODULE,line_numbers,1,_}|_]}} =
-	(catch line1(a, 0)),
+             [{?MODULE,line1,2,
+               [{file,"fake_file.erl"},{line,7}]},
+              {?MODULE,line_numbers,1,_}|_]}} =
+    (catch line1(a, 0)),
     {'EXIT',{crash,
-	     [{?MODULE,crash,1,
-	       [{file,"fake_file.erl"},{line,14}]},
-	      {?MODULE,line_numbers,1,_}|_]}} =
-	(catch line1(a, 41)),
+             [{?MODULE,crash,1,
+               [{file,"fake_file.erl"},{line,14}]},
+              {?MODULE,line_numbers,1,_}|_]}} =
+    (catch line1(a, 41)),
 
     ModFile = ?MODULE_STRING++".erl",
     [{?MODULE,maybe_crash,1,[{file,"call.erl"},{line,28}]},
      {?MODULE,call1,0,[{file,"call.erl"},{line,14}]},
      {?MODULE,close_calls,1,[{file,"call.erl"},{line,5}]},
      {?MODULE,line_numbers,1,[{file,ModFile},{line,_}]}|_] =
-	close_calls(call1),
+    close_calls(call1),
     [{?MODULE,maybe_crash,1,[{file,"call.erl"},{line,28}]},
      {?MODULE,call2,0,[{file,"call.erl"},{line,18}]},
      {?MODULE,close_calls,1,[{file,"call.erl"},{line,6}]},
      {?MODULE,line_numbers,1,[{file,ModFile},{line,_}]}|_] =
-	close_calls(call2),
+    close_calls(call2),
     [{?MODULE,maybe_crash,1,[{file,"call.erl"},{line,28}]},
      {?MODULE,call3,0,[{file,"call.erl"},{line,22}]},
      {?MODULE,close_calls,1,[{file,"call.erl"},{line,7}]},
      {?MODULE,line_numbers,1,[{file,ModFile},{line,_}]}|_] =
-	close_calls(call3),
+    close_calls(call3),
     no_crash = close_calls(other),
 
     <<0,0>> = build_binary1(16),
     {'EXIT',{badarg,
-	     [{?MODULE,build_binary1,1,
-	       [{file,"bit_syntax.erl"},{line,72503}]},
-	      {?MODULE,line_numbers,1,
-	       [{file,ModFile},{line,_}]}|_]}} =
-	(catch build_binary1(bad_size)),
+             [{?MODULE,build_binary1,1,
+               [{file,"bit_syntax.erl"},{line,72503}]},
+              {?MODULE,line_numbers,1,
+               [{file,ModFile},{line,_}]}|_]}} =
+    (catch build_binary1(bad_size)),
 
     <<7,1,2,3>> = build_binary2(8, <<1,2,3>>),
     {'EXIT',{badarg,
-	     [{?MODULE,build_binary2,2,
-	       [{file,"bit_syntax.erl"},{line,72507}]},
-	      {?MODULE,line_numbers,1,
-	       [{file,ModFile},{line,_}]}|_]}} =
-	(catch build_binary2(bad_size, <<>>)),
+             [{?MODULE,build_binary2,2,
+               [{file,"bit_syntax.erl"},{line,72507}]},
+              {?MODULE,line_numbers,1,
+               [{file,ModFile},{line,_}]}|_]}} =
+    (catch build_binary2(bad_size, <<>>)),
     {'EXIT',{badarg,
-	     [{erlang,bit_size,[bad_binary],[]},
-	      {?MODULE,build_binary2,2,
-	       [{file,"bit_syntax.erl"},{line,72507}]},
-	      {?MODULE,line_numbers,1,
-	       [{file,ModFile},{line,_}]}|_]}} =
-	(catch build_binary2(8, bad_binary)),
+             [{erlang,bit_size,[bad_binary],[]},
+              {?MODULE,build_binary2,2,
+               [{file,"bit_syntax.erl"},{line,72507}]},
+              {?MODULE,line_numbers,1,
+               [{file,ModFile},{line,_}]}|_]}} =
+    (catch build_binary2(8, bad_binary)),
 
     <<"abc",357:16>> = build_binary3(<<"abc">>),
     {'EXIT',{badarg,[{?MODULE,build_binary3,1,
-		      [{file,"bit_syntax.erl"},{line,72511}]},
-		     {?MODULE,line_numbers,1,
-		      [{file,ModFile},{line,_}]}|_]}} =
-	(catch build_binary3(no_binary)),
+                      [{file,"bit_syntax.erl"},{line,72511}]},
+                     {?MODULE,line_numbers,1,
+                      [{file,ModFile},{line,_}]}|_]}} =
+    (catch build_binary3(no_binary)),
 
     {'EXIT',{function_clause,
-	     [{?MODULE,do_call_abs,[y,y],
-	       [{file,"gc_bif.erl"},{line,18}]},
-	      {?MODULE,line_numbers,1,_}|_]}} =
-	(catch do_call_abs(y, y)),
+             [{?MODULE,do_call_abs,[y,y],
+               [{file,"gc_bif.erl"},{line,18}]},
+              {?MODULE,line_numbers,1,_}|_]}} =
+    (catch do_call_abs(y, y)),
     {'EXIT',{badarg,
-	     [{erlang,abs,[[]],[]},
-	      {?MODULE,do_call_abs,2,
-	       [{file,"gc_bif.erl"},{line,19}]},
-	      {?MODULE,line_numbers,1,_}|_]}} =
-	(catch do_call_abs(x, [])),
+             [{erlang,abs,[[]],[]},
+              {?MODULE,do_call_abs,2,
+               [{file,"gc_bif.erl"},{line,19}]},
+              {?MODULE,line_numbers,1,_}|_]}} =
+    (catch do_call_abs(x, [])),
 
     {'EXIT',{{badmatch,"42"},
-	     [{MODULE,applied_bif_1,1,[{file,"applied_bif.erl"},{line,5}]},
-	      {?MODULE,line_numbers,1,_}|_]}} =
-	(catch applied_bif_1(42)),
+             [{MODULE,applied_bif_1,1,[{file,"applied_bif.erl"},{line,5}]},
+              {?MODULE,line_numbers,1,_}|_]}} =
+    (catch applied_bif_1(42)),
 
     {'EXIT',{{badmatch,{current_location,
-			{?MODULE,applied_bif_2,0,
-			 [{file,"applied_bif.erl"},{line,9}]}}},
-	     [{MODULE,applied_bif_2,0,[{file,"applied_bif.erl"},{line,10}]},
-	      {?MODULE,line_numbers,1,_}|_]}} =
-	(catch applied_bif_2()),
+                        {?MODULE,applied_bif_2,0,
+                         [{file,"applied_bif.erl"},{line,9}]}}},
+             [{MODULE,applied_bif_2,0,[{file,"applied_bif.erl"},{line,10}]},
+              {?MODULE,line_numbers,1,_}|_]}} =
+    (catch applied_bif_2()),
 
     ok.
 
@@ -646,13 +631,13 @@ odd(N) when is_integer(N), N > 1, (N rem 2) == 1 ->
 -file("fake_file.erl", 1).			%Line 1
 line1(Tag, X) ->				%Line 2
     case Tag of					%Line 3
-	a ->
-	    Y = X + 1,				%Line 5
-	    Res = id({ok,Y}),			%Line 6
-	    ?MODULE:crash({ok,42} = Res);	%Line 7
-	b ->
-	    x = id(x),				%Line 9
-	    ok					%Line 10
+        a ->
+            Y = X + 1,				%Line 5
+            Res = id({ok,Y}),			%Line 6
+            ?MODULE:crash({ok,42} = Res);	%Line 7
+        b ->
+            x = id(x),				%Line 9
+            ok					%Line 10
     end.					%Line 11
 
 crash(_) ->					%Line 13
@@ -662,12 +647,12 @@ crash(_) ->					%Line 13
 close_calls(Where) ->				%Line 2
     put(where_to_crash, Where),			%Line 3
     try
-	call1(),				%Line 5
-	call2(),				%Line 6
-	call3(),				%Line 7
-	no_crash				%Line 8
+        call1(),				%Line 5
+        call2(),				%Line 6
+        call3(),				%Line 7
+        no_crash				%Line 8
     catch error:crash ->
-	    erlang:get_stacktrace()		%Line 10
+              erlang:get_stacktrace()		%Line 10
     end.					%Line 11
 
 call1() ->					%Line 13
@@ -684,10 +669,10 @@ call3() ->					%Line 21
 
 maybe_crash(Name) ->				%Line 25
     case get(where_to_crash) of			%Line 26
-	Name ->
-	    erlang:error(crash);		%Line 28
-	_ ->
-	    ok					%Line 30
+        Name ->
+            erlang:error(crash);		%Line 28
+        _ ->
+            ok					%Line 30
     end.
 
 -file("bit_syntax.erl", 72500).			%Line 72500
diff --git a/erts/emulator/test/float_SUITE.erl b/erts/emulator/test/float_SUITE.erl
index c1a76b8af4..78dec8c725 100644
--- a/erts/emulator/test/float_SUITE.erl
+++ b/erts/emulator/test/float_SUITE.erl
@@ -20,63 +20,40 @@
 
 -module(float_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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,
-	 fpe/1,fp_drv/1,fp_drv_thread/1,denormalized/1,match/1,
-	 bad_float_unpack/1, write/1, cmp_zero/1, cmp_integer/1, cmp_bignum/1]).
+-export([all/0, suite/0, groups/0,
+         fpe/1,fp_drv/1,fp_drv_thread/1,denormalized/1,match/1,
+         t_mul_add_ops/1,
+         bad_float_unpack/1, write/1, cmp_zero/1, cmp_integer/1, cmp_bignum/1]).
 -export([otp_7178/1]).
 -export([hidden_inf/1]).
+-export([arith/1]).
 
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(3)),
-    [{watchdog, Dog},{testcase,Func}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 3}}].
 
 all() -> 
     [fpe, fp_drv, fp_drv_thread, otp_7178, denormalized,
      match, bad_float_unpack, write, {group, comparison}
      ,hidden_inf
-    ].
+     ,arith, t_mul_add_ops].
 
 groups() -> 
     [{comparison, [parallel], [cmp_zero, cmp_integer, cmp_bignum]}].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 %%
 %% OTP-7178, list_to_float on very small numbers should give 0.0
 %% instead of exception, i.e. ignore underflow.
 %%
-otp_7178(suite) ->
-    [];
-otp_7178(doc) ->
-    ["test that list_to_float on very small numbers give 0.0"];
+%% test that list_to_float on very small numbers give 0.0
 otp_7178(Config) when is_list(Config) ->
-    ?line X = list_to_float("1.0e-325"),
-    ?line true = (X < 0.00000001) and (X > -0.00000001),
-    ?line Y = list_to_float("1.0e-325325325"),
-    ?line true = (Y < 0.00000001) and (Y > -0.00000001),
-    ?line {'EXIT', {badarg,_}} = (catch list_to_float("1.0e83291083210")),
+    X = list_to_float("1.0e-325"),
+    true = (X < 0.00000001) and (X > -0.00000001),
+    Y = list_to_float("1.0e-325325325"),
+    true = (Y < 0.00000001) and (Y > -0.00000001),
+    {'EXIT', {badarg,_}} = (catch list_to_float("1.0e83291083210")),
     ok.
 
 %% Forces floating point exceptions and tests that subsequent, legal,
@@ -84,15 +61,15 @@ otp_7178(Config) when is_list(Config) ->
 %% Strollo.
 
 fpe(Config) when is_list(Config) ->
-    ?line 0.0 = math:log(1.0),
-    ?line {'EXIT', {badarith, _}} = (catch math:log(-1.0)),
-    ?line 0.0 = math:log(1.0),
-    ?line {'EXIT', {badarith, _}} = (catch math:log(0.0)),
-    ?line 0.0 = math:log(1.0),
-    ?line {'EXIT',{badarith,_}} = (catch 3.23e133 * id(3.57e257)),
-    ?line 0.0 = math:log(1.0),
-    ?line {'EXIT',{badarith,_}} = (catch 5.0/id(0.0)),
-    ?line 0.0 = math:log(1.0),
+    0.0 = math:log(1.0),
+    {'EXIT', {badarith, _}} = (catch math:log(-1.0)),
+    0.0 = math:log(1.0),
+    {'EXIT', {badarith, _}} = (catch math:log(0.0)),
+    0.0 = math:log(1.0),
+    {'EXIT',{badarith,_}} = (catch 3.23e133 * id(3.57e257)),
+    0.0 = math:log(1.0),
+    {'EXIT',{badarith,_}} = (catch 5.0/id(0.0)),
+    0.0 = math:log(1.0),
     ok.
 
 
@@ -100,70 +77,70 @@ fpe(Config) when is_list(Config) ->
 -define(ERTS_FP_THREAD_TEST, 1).
 
 fp_drv(Config) when is_list(Config) ->
-    fp_drv_test(?ERTS_FP_CONTROL_TEST, ?config(data_dir, Config)).
+    fp_drv_test(?ERTS_FP_CONTROL_TEST, proplists:get_value(data_dir, Config)).
 
 fp_drv_thread(Config) when is_list(Config) ->
     %% Run in a separate node since it used to crash the emulator...
-    ?line Parent = self(),
-    ?line DrvDir = ?config(data_dir, Config),
-    ?line {ok,Node} = start_node(Config),
-    ?line Tester = spawn_link(Node,
-			      fun () ->
-				      Parent !
-					  {self(),
-					   fp_drv_test(?ERTS_FP_THREAD_TEST,
-						       DrvDir)}
-			      end),
-    ?line Result = receive {Tester, Res} -> Res end,
-    ?line stop_node(Node),
-    ?line Result.
+    Parent = self(),
+    DrvDir = proplists:get_value(data_dir, Config),
+    {ok,Node} = start_node(Config),
+    Tester = spawn_link(Node,
+                        fun () ->
+                                Parent !
+                                {self(),
+                                 fp_drv_test(?ERTS_FP_THREAD_TEST,
+                                             DrvDir)}
+                        end),
+    Result = receive {Tester, Res} -> Res end,
+    stop_node(Node),
+    Result.
 
 fp_drv_test(Test, DrvDir) ->
-    ?line Drv = fp_drv,
-    ?line try
-	      begin
-		  ?line case erl_ddll:load_driver(DrvDir, Drv) of
-			    ok ->
-				ok;
-			    {error, permanent} ->
-				ok;
-			    {error, LoadError} ->
-				exit({load_error,
-				      erl_ddll:format_error(LoadError)});
-			     LoadError ->
-				exit({load_error, LoadError})
-			end,
-		  case open_port({spawn, Drv}, []) of
-		      Port when is_port(Port) ->
-			      try port_control(Port, Test, "") of
-				  "ok" ->
-				      0.0 = math:log(1.0),
-				      ok;
-				  [$s,$k,$i,$p,$:,$ | Reason] ->
-				      {skipped, Reason};
-				  Error ->
-				      exit(Error)
-			      after
-				  Port ! {self(), close},
-				receive {Port, closed} -> ok end,
-				false = lists:member(Port, erlang:ports()),
-				ok
-			      end;
-		      Error ->
-			  exit({open_port_failed, Error})
-		  end
-	      end
-	  catch
-	      throw:Term -> ?line Term
-	  after
-	      erl_ddll:unload_driver(Drv)
-	  end.
+    Drv = fp_drv,
+    try
+        begin
+            case erl_ddll:load_driver(DrvDir, Drv) of
+                ok ->
+                    ok;
+                {error, permanent} ->
+                    ok;
+                {error, LoadError} ->
+                    exit({load_error,
+                          erl_ddll:format_error(LoadError)});
+                LoadError ->
+                    exit({load_error, LoadError})
+            end,
+            case open_port({spawn, Drv}, []) of
+                Port when is_port(Port) ->
+                    try port_control(Port, Test, "") of
+                        "ok" ->
+                            0.0 = math:log(1.0),
+                            ok;
+                        [$s,$k,$i,$p,$:,$ | Reason] ->
+                            {skipped, Reason};
+                        Error ->
+                            exit(Error)
+                    after
+                        Port ! {self(), close},
+                        receive {Port, closed} -> ok end,
+                        false = lists:member(Port, erlang:ports()),
+                        ok
+                    end;
+                Error ->
+                    exit({open_port_failed, Error})
+            end
+        end
+    catch
+        throw:Term -> Term
+    after
+        erl_ddll:unload_driver(Drv)
+    end.
 
 denormalized(Config) when is_list(Config) ->
-    ?line Denormalized = 1.0e-307 / 1000,
-    ?line roundtrip(Denormalized),
-    ?line NegDenormalized = -1.0e-307 / 1000,
-    ?line roundtrip(NegDenormalized),
+    Denormalized = 1.0e-307 / 1000,
+    roundtrip(Denormalized),
+    NegDenormalized = -1.0e-307 / 1000,
+    roundtrip(NegDenormalized),
     ok.
 
 roundtrip(N) ->
@@ -171,12 +148,12 @@ roundtrip(N) ->
     N = binary_to_term(term_to_binary(N, [{minor_version,1}])).
 
 match(Config) when is_list(Config) ->
-    ?line one = match_1(1.0),
-    ?line two = match_1(2.0),
-    ?line a_lot = match_1(1000.0),
-    ?line {'EXIT',_} = (catch match_1(0.5)),
+    one = match_1(1.0),
+    two = match_1(2.0),
+    a_lot = match_1(1000.0),
+    {'EXIT',_} = (catch match_1(0.5)),
     ok.
-    
+
 match_1(1.0) -> one;
 match_1(2.0) -> two;
 match_1(1000.0) -> a_lot.
@@ -184,8 +161,8 @@ match_1(1000.0) -> a_lot.
 %% Thanks to Per Gustafsson.
 
 bad_float_unpack(Config) when is_list(Config) ->
-    ?line Bin = <<-1:64>>,
-    ?line -1 = bad_float_unpack_match(Bin),
+    Bin = <<-1:64>>,
+    -1 = bad_float_unpack_match(Bin),
     ok.
 
 bad_float_unpack_match(<<F:64/float>>) -> F;
@@ -237,75 +214,75 @@ span_cmp(Axis, Incr, Length) ->
 %% Diff: How much the float and int should differ when comparing
 span_cmp(Axis, Incr, Length, Diff) ->
     [begin
-	 cmp(round(Axis*-1.0)+Diff+I*Incr,Axis*-1.0+I*Incr),
-	 cmp(Axis*-1.0+I*Incr,round(Axis*-1.0)-Diff+I*Incr)
+         cmp(round(Axis*-1.0)+Diff+I*Incr,Axis*-1.0+I*Incr),
+         cmp(Axis*-1.0+I*Incr,round(Axis*-1.0)-Diff+I*Incr)
      end || I <- lists:seq((Length div 2)*-1,(Length div 2))],
     [begin
-	 cmp(round(Axis)+Diff+I*Incr,Axis+I*Incr),
-	 cmp(Axis+I*Incr,round(Axis)-Diff+I*Incr)
+         cmp(round(Axis)+Diff+I*Incr,Axis+I*Incr),
+         cmp(Axis+I*Incr,round(Axis)-Diff+I*Incr)
      end || I <- lists:seq((Length div 2)*-1,(Length div 2))].
 
 cmp(Big,Small) when is_float(Big) ->
     BigGtSmall = lists:flatten(
-		 io_lib:format("~f > ~p",[Big,Small])),
+                   io_lib:format("~f > ~p",[Big,Small])),
     BigLtSmall = lists:flatten(
-		 io_lib:format("~f < ~p",[Big,Small])),
+                   io_lib:format("~f < ~p",[Big,Small])),
     BigEqSmall = lists:flatten(
-		 io_lib:format("~f == ~p",[Big,Small])),
+                   io_lib:format("~f == ~p",[Big,Small])),
     SmallGtBig = lists:flatten(
-		   io_lib:format("~p > ~f",[Small,Big])),
+                   io_lib:format("~p > ~f",[Small,Big])),
     SmallLtBig = lists:flatten(
-		   io_lib:format("~p < ~f",[Small,Big])),
+                   io_lib:format("~p < ~f",[Small,Big])),
     SmallEqBig = lists:flatten(
-		   io_lib:format("~p == ~f",[Small,Big])),
+                   io_lib:format("~p == ~f",[Small,Big])),
     cmp(Big,Small,BigGtSmall,BigLtSmall,SmallGtBig,SmallLtBig,
-	SmallEqBig,BigEqSmall);
+        SmallEqBig,BigEqSmall);
 cmp(Big,Small) when is_float(Small) ->
     BigGtSmall = lists:flatten(
-		   io_lib:format("~p > ~f",[Big,Small])),
+                   io_lib:format("~p > ~f",[Big,Small])),
     BigLtSmall = lists:flatten(
-		   io_lib:format("~p < ~f",[Big,Small])),
+                   io_lib:format("~p < ~f",[Big,Small])),
     BigEqSmall = lists:flatten(
-		   io_lib:format("~p == ~f",[Big,Small])),
+                   io_lib:format("~p == ~f",[Big,Small])),
     SmallGtBig = lists:flatten(
-		   io_lib:format("~f > ~p",[Small,Big])),
+                   io_lib:format("~f > ~p",[Small,Big])),
     SmallLtBig = lists:flatten(
-		   io_lib:format("~f < ~p",[Small,Big])),
+                   io_lib:format("~f < ~p",[Small,Big])),
     SmallEqBig = lists:flatten(
-		   io_lib:format("~f == ~p",[Small,Big])),
+                   io_lib:format("~f == ~p",[Small,Big])),
     cmp(Big,Small,BigGtSmall,BigLtSmall,SmallGtBig,SmallLtBig,
-	SmallEqBig,BigEqSmall).
+        SmallEqBig,BigEqSmall).
 
 cmp(Big,Small,BigGtSmall,BigLtSmall,SmallGtBig,SmallLtBig,
     SmallEqBig,BigEqSmall) ->
     {_,_,_,true} = {Big,Small,BigGtSmall,
-		    Big > Small},
+                    Big > Small},
     {_,_,_,false} = {Big,Small,BigLtSmall,
-		     Big < Small},
+                     Big < Small},
     {_,_,_,false} = {Big,Small,SmallGtBig,
-		     Small > Big},
+                     Small > Big},
     {_,_,_,true} = {Big,Small,SmallLtBig,
-		    Small < Big},
+                    Small < Big},
     {_,_,_,false} = {Big,Small,SmallEqBig,
-		     Small == Big},
+                     Small == Big},
     {_,_,_,false} = {Big,Small,BigEqSmall,
-		     Big == Small}.
+                     Big == Small}.
 
 id(I) -> I.
-    
+
 start_node(Config) when is_list(Config) ->
-    ?line Pa = filename:dirname(code:which(?MODULE)),
-    ?line Name = list_to_atom(atom_to_list(?MODULE)
-			      ++ "-"
-			      ++ atom_to_list(?config(testcase, Config))
-			      ++ "-"
-			      ++ integer_to_list(erlang:system_time(seconds))
-			      ++ "-"
-			      ++ integer_to_list(erlang:unique_integer([positive]))),
-    ?line ?t:start_node(Name, slave, [{args, "-pa "++Pa}]).
+    Pa = filename:dirname(code:which(?MODULE)),
+    Name = list_to_atom(atom_to_list(?MODULE)
+                        ++ "-"
+                        ++ atom_to_list(proplists:get_value(testcase, Config))
+                        ++ "-"
+                        ++ integer_to_list(erlang:system_time(seconds))
+                        ++ "-"
+                        ++ integer_to_list(erlang:unique_integer([positive]))),
+    test_server:start_node(Name, slave, [{args, "-pa "++Pa}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 
 %% Test that operations that might hide infinite intermediate results
@@ -315,8 +292,8 @@ hidden_inf(Config) when is_list(Config) ->
     ZeroN = id(ZeroP) * (-1),
     [hidden_inf_1(A, B, Z, 9.23e307)
      || A <- [1.0, -1.0, 3.1415, -0.00001000131, 3.57e257, ZeroP, ZeroN],
-	B <- [1.0, -1.0, 3.1415, -0.00001000131, 3.57e257, ZeroP, ZeroN],
-	Z <- [ZeroP, ZeroN]],
+        B <- [1.0, -1.0, 3.1415, -0.00001000131, 3.57e257, ZeroP, ZeroN],
+        Z <- [ZeroP, ZeroN]],
     ok.
 
 hidden_inf_1(A, B, Zero, Huge) ->
@@ -328,3 +305,122 @@ hidden_inf_1(A, B, Zero, Huge) ->
     {'EXIT',{badarith,_}} = (catch (B * (Huge + Huge))),
     {'EXIT',{badarith,_}} = (catch (B / (-Huge - Huge))),
     {'EXIT',{badarith,_}} = (catch (B * (-Huge - Huge))).
+
+%% Improve code coverage in our different arithmetic functions
+%% and make sure they yield consistent results.
+arith(_Config) ->
+    _TAG_IMMED1_SIZE = 4,
+
+    <<FLOAT_MAX/float>> = <<0:1, 16#7fe:11, -1:52>>,
+    <<FLOAT_MIN/float>> = <<0:1, 0:11, 1:52>>,
+    <<FloatNegZero/float>> = <<1:1, 0:11, 0:52>>,
+
+    WORD_BITS = erlang:system_info(wordsize) * 8,
+    SMALL_BITS = (WORD_BITS - _TAG_IMMED1_SIZE),
+    SMALL_MAX = (1 bsl (SMALL_BITS-1)) - 1,
+    SMALL_MIN = -(1 bsl (SMALL_BITS-1)),
+    BIG1_MAX = (1 bsl WORD_BITS) - 1,
+    BIG2_MAX = (1 bsl (WORD_BITS*2)) - 1,
+
+    fixnum = erts_internal:term_type(SMALL_MAX),
+    fixnum = erts_internal:term_type(SMALL_MIN),
+    bignum = erts_internal:term_type(SMALL_MAX + 1),
+    bignum = erts_internal:term_type(SMALL_MIN - 1),
+
+    L = [0, 0.0, FloatNegZero, 1, 1.0, 17, 17.0, 0.17,
+         FLOAT_MIN, FLOAT_MAX,
+         SMALL_MAX, SMALL_MAX+1,
+         SMALL_MIN, SMALL_MIN-1,
+         BIG1_MAX, BIG1_MAX+1,
+         BIG2_MAX, BIG2_MAX+1,
+         trunc(FLOAT_MAX), trunc(FLOAT_MAX)+1, trunc(FLOAT_MAX)*2,
+         immed_badarg,
+         "list badarg",
+         {"boxed badarg"}],
+
+    foreach_pair(fun(A,B) -> do_bin_ops(A,B) end, L).
+
+foreach_pair(F, L) ->
+    lists:foreach(
+      fun(A) -> lists:foreach(fun(B) -> F(A,B) end, L) end,
+      L).
+
+do_bin_ops(A, B) ->
+    Fun = fun(Op) ->
+                  Op(A,B),
+                  is_number(A) andalso Op(-A,B),
+                  is_number(B) andalso Op(A,-B),
+                  is_number(A) andalso is_number(B) andalso Op(-A,-B)
+          end,
+    lists:foreach(Fun,
+                  [fun op_add/2, fun op_sub/2, fun op_mul/2, fun op_div/2]).
+
+op_add(A, B) ->
+    Info = [A,B],
+    R = unify(catch A + B, Info),
+    R = unify(my_apply(erlang,'+',[A,B]), Info),
+    case R of
+        _ when A + B =:= element(1,R) -> ok;
+        {{'EXIT',badarith}, Info} -> ok
+    end.
+
+op_sub(A, B) ->
+    Info = [A,B],
+    R = unify(catch A - B, Info),
+    R = unify(my_apply(erlang,'-',[A,B]), Info),
+    case R of
+        _ when A - B =:= element(1,R) -> ok;
+        {{'EXIT',badarith}, Info} -> ok
+    end.
+
+op_mul(A, B) ->
+    Info = [A,B],
+    R = unify(catch A * B, Info),
+    R = unify(my_apply(erlang,'*',[A,B]), Info),
+    case R of
+        _ when A * B =:= element(1,R) -> ok;
+        {{'EXIT',badarith}, Info} -> ok
+    end.
+
+op_div(A, B) ->
+    Info = [A,B],
+    R = unify(catch A / B, Info),
+    R = unify(my_apply(erlang,'/',[A,B]), Info),
+    case R of
+        _ when A / B =:= element(1,R) -> ok;
+        {{'EXIT',badarith}, Info} -> ok
+    end.
+
+my_apply(M, F, A) ->
+    catch apply(id(M), id(F), A).
+
+% Unify exceptions be removing stack traces.
+% and add argument info to make it easer to debug failed matches.
+unify({'EXIT',{Reason,_Stack}}, Info) ->
+    {{'EXIT', Reason}, Info};
+unify(Other, Info) ->
+    {Other, Info}.
+
+
+-define(epsilon, 1.0e-20).
+check_epsilon(R,Val) ->
+    if erlang:abs(R-Val) < ?epsilon -> ok;
+       true -> ct:fail({R,Val})
+    end.
+
+t_mul_add_ops(Config) when is_list(Config) ->
+    check_epsilon(op_mul_add(1, 2.0, 1.0, 0.0), 1.0),
+    check_epsilon(op_mul_add(2, 2.0, 1.0, 0.0), 3.0),
+    check_epsilon(op_mul_add(3, 2.0, 1.0, 0.0), 7.0),
+    check_epsilon(op_mul_add(4, 2.0, 1.0, 0.0), 15.0),
+    check_epsilon(op_mul_add(5, 2.0, 1.0, 0.0), 31.0),
+    check_epsilon(op_mul_add(6, 2.0, 1.0, 0.0), 63.0),
+    check_epsilon(op_mul_add(6, 2.0, 1.3, 0.0), 81.9),
+    check_epsilon(op_mul_add(6, 2.03, 1.3, 0.0), 87.06260151458997),
+    ok.
+
+
+op_mul_add(0, _, _, R) -> R;
+op_mul_add(N, A, B, R) when is_float(A), is_float(B), is_float(R) ->
+    op_mul_add(N - 1, A, B, R * A + B).
+
diff --git a/erts/emulator/test/float_SUITE_data/fp_drv.c b/erts/emulator/test/float_SUITE_data/fp_drv.c
index 5919dd8e2f..a91d622040 100644
--- a/erts/emulator/test/float_SUITE_data/fp_drv.c
+++ b/erts/emulator/test/float_SUITE_data/fp_drv.c
@@ -18,6 +18,7 @@
  */
 
 #if defined(DEBUG) || 0
+#  include <stdio.h>
 #  define PRINTF(X) printf X
 #else
 #  define PRINTF(X)
diff --git a/erts/emulator/test/fun_SUITE.erl b/erts/emulator/test/fun_SUITE.erl
index b18f9f5c6b..044c6aabca 100644
--- a/erts/emulator/test/fun_SUITE.erl
+++ b/erts/emulator/test/fun_SUITE.erl
@@ -21,11 +21,7 @@
 -module(fun_SUITE).
 -compile({nowarn_deprecated_function, {erlang,hash,2}}).
 
--define(default_timeout, ?t:minutes(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,
+-export([all/0, suite/0,
 	 bad_apply/1,bad_fun_call/1,badarity/1,ext_badarity/1,
 	 equality/1,ordering/1,
 	 fun_to_port/1,t_hash/1,t_phash/1,t_phash2/1,md5/1,
@@ -35,9 +31,12 @@
 
 -export([nothing/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [bad_apply, bad_fun_call, badarity, ext_badarity,
@@ -46,45 +45,18 @@ all() ->
      const_propagation, t_arity, t_is_function2, t_fun_info,
      t_fun_info_mfa].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(_Case, Config) ->
-    ?line Dog = test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-bad_apply(doc) ->
-    "Test that the correct EXIT code is returned for all types of bad funs.";
-bad_apply(suite) -> [];
+%% Test that the correct EXIT code is returned for all types of bad funs.
 bad_apply(Config) when is_list(Config) ->
-    ?line bad_apply_fc(42, [0]),
-    ?line bad_apply_fc(xx, [1]),
-    ?line bad_apply_fc({}, [2]),
-    ?line bad_apply_fc({1}, [3]),
-    ?line bad_apply_fc({1,2,3}, [4]),
-    ?line bad_apply_fc({1,2,3}, [5]),
-    ?line bad_apply_fc({1,2,3,4}, [6]),
-    ?line bad_apply_fc({1,2,3,4,5,6}, [7]),
-    ?line bad_apply_fc({1,2,3,4,5}, [8]),
-    ?line bad_apply_badarg({1,2}, [9]),
+    bad_apply_fc(42, [0]),
+    bad_apply_fc(xx, [1]),
+    bad_apply_fc({}, [2]),
+    bad_apply_fc({1}, [3]),
+    bad_apply_fc({1,2,3}, [4]),
+    bad_apply_fc({1,2,3}, [5]),
+    bad_apply_fc({1,2,3,4}, [6]),
+    bad_apply_fc({1,2,3,4,5,6}, [7]),
+    bad_apply_fc({1,2,3,4,5}, [8]),
+    bad_apply_badarg({1,2}, [9]),
     ok.
 
 bad_apply_fc(Fun, Args) ->
@@ -96,7 +68,7 @@ bad_apply_fc(Fun, Args) ->
 	    ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res]);
 	Other ->
 	    ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res]),
-	    ?t:fail({bad_result,Other})
+	    ct:fail({bad_result,Other})
     end.
 
 bad_apply_badarg(Fun, Args) ->
@@ -108,23 +80,21 @@ bad_apply_badarg(Fun, Args) ->
 	    ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res]);
 	Other ->
 	    ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res]),
-	    ?t:fail({bad_result, Other})
+	    ct:fail({bad_result, Other})
     end.
 
-bad_fun_call(doc) ->
-    "Try directly calling bad funs.";
-bad_fun_call(suite) -> [];
+%% Try directly calling bad funs.
 bad_fun_call(Config) when is_list(Config) ->
-    ?line bad_call_fc(42),
-    ?line bad_call_fc(xx),
-    ?line bad_call_fc({}),
-    ?line bad_call_fc({1}),
-    ?line bad_call_fc({1,2,3}),
-    ?line bad_call_fc({1,2,3}),
-    ?line bad_call_fc({1,2,3,4}),
-    ?line bad_call_fc({1,2,3,4,5,6}),
-    ?line bad_call_fc({1,2,3,4,5}),
-    ?line bad_call_fc({1,2}),
+    bad_call_fc(42),
+    bad_call_fc(xx),
+    bad_call_fc({}),
+    bad_call_fc({1}),
+    bad_call_fc({1,2,3}),
+    bad_call_fc({1,2,3}),
+    bad_call_fc({1,2,3,4}),
+    bad_call_fc({1,2,3,4,5,6}),
+    bad_call_fc({1,2,3,4,5}),
+    bad_call_fc({1,2}),
     ok.
 
 bad_call_fc(Fun) ->
@@ -135,74 +105,74 @@ bad_call_fc(Fun) ->
 	    ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]);
 	Other ->
 	    ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]),
-	    ?t:fail({bad_result,Other})
+	    ct:fail({bad_result,Other})
     end.
 
 %% Call and apply valid funs with wrong number of arguments.
 
 badarity(Config) when is_list(Config) ->
-    ?line Fun = fun() -> ok end,
-    ?line Stupid = {stupid,arguments},
-    ?line Args = [some,{stupid,arguments},here],
+    Fun = fun() -> ok end,
+    Stupid = {stupid,arguments},
+    Args = [some,{stupid,arguments},here],
 
     %% Simple call.
 
-    ?line Res = (catch Fun(some, Stupid, here)),
+    Res = (catch Fun(some, Stupid, here)),
     erlang:garbage_collect(),
     erlang:yield(),
     case Res of
 	{'EXIT',{{badarity,{Fun,Args}},_}} ->
-	    ?line ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]);
+	    ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]);
 	_ ->
-	    ?line ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]),
-	    ?line ?t:fail({bad_result,Res})
+	    ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]),
+	    ct:fail({bad_result,Res})
     end,
 
     %% Apply.
 
-    ?line Res2 = (catch apply(Fun, Args)),
+    Res2 = (catch apply(Fun, Args)),
     erlang:garbage_collect(),
     erlang:yield(),
     case Res2 of
 	{'EXIT',{{badarity,{Fun,Args}},_}} ->
-	    ?line ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res2]);
+	    ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res2]);
 	_ ->
-	    ?line ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res2]),
-	    ?line ?t:fail({bad_result,Res2})
+	    ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res2]),
+	    ct:fail({bad_result,Res2})
     end,
     ok.
 
 %% Call and apply valid external funs with wrong number of arguments.
 
 ext_badarity(Config) when is_list(Config) ->
-    ?line Fun = fun ?MODULE:nothing/0,
-    ?line Stupid = {stupid,arguments},
-    ?line Args = [some,{stupid,arguments},here],
+    Fun = fun ?MODULE:nothing/0,
+    Stupid = {stupid,arguments},
+    Args = [some,{stupid,arguments},here],
 
     %% Simple call.
 
-    ?line Res = (catch Fun(some, Stupid, here)),
+    Res = (catch Fun(some, Stupid, here)),
     erlang:garbage_collect(),
     erlang:yield(),
     case Res of
 	{'EXIT',{{badarity,{Fun,Args}},_}} ->
-	    ?line ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]);
+	    ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]);
 	_ ->
-	    ?line ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]),
-	    ?line ?t:fail({bad_result,Res})
+	    ok = io:format("~p(~p) -> ~p\n", [Fun,Args,Res]),
+	    ct:fail({bad_result,Res})
     end,
 
     %% Apply.
 
-    ?line Res2 = (catch apply(Fun, Args)),
+    Res2 = (catch apply(Fun, Args)),
     erlang:garbage_collect(),
     erlang:yield(),
     case Res2 of
 	{'EXIT',{{badarity,{Fun,Args}},_}} ->
-	    ?line ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res2]);
+	    ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res2]);
 	_ ->
-	    ?line ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res2]),
-	    ?line ?t:fail({bad_result,Res2})
+	    ok = io:format("apply(~p, ~p) -> ~p\n", [Fun,Args,Res2]),
+	    ct:fail({bad_result,Res2})
     end,
     ok.
 
@@ -214,29 +184,29 @@ nothing() ->
 equality(Config) when is_list(Config) ->
     F0 = fun() -> 1 end,
     F0_copy = copy_term(F0),
-    ?line true = eq(F0, F0),
-    ?line true = eq(F0, F0_copy),
+    true = eq(F0, F0),
+    true = eq(F0, F0_copy),
 
     %% Compare different arities.
     F1 = fun(X) -> X + 1 end,
-    ?line true = eq(F1, F1),
-    ?line false = eq(F0, F1),
-    ?line false = eq(F0_copy, F1),
+    true = eq(F1, F1),
+    false = eq(F0, F1),
+    false = eq(F0_copy, F1),
 
     %% Compare different environments.
     G1 = make_fun(1),
     G2 = make_fun(2),
-    ?line true = eq(G1, G1),
-    ?line true = eq(G2, G2),
-    ?line false = eq(G1, G2),
-    ?line false = eq(G2, G1),
+    true = eq(G1, G1),
+    true = eq(G2, G2),
+    false = eq(G1, G2),
+    false = eq(G2, G1),
     G1_copy = copy_term(G1),
-    ?line true = eq(G1, G1_copy),
+    true = eq(G1, G1_copy),
 
     %% Compare fun with binaries.
     B = list_to_binary([7,8,9]),
-    ?line false = eq(B, G1),
-    ?line false = eq(G1, B),
+    false = eq(B, G1),
+    false = eq(G1, B),
 
     %% Compare external funs.
     FF0 = fun aa:blurf/0,
@@ -246,23 +216,23 @@ equality(Config) when is_list(Config) ->
     FF3 = fun erlang:exit/2,
     FF4 = fun z:ff/0,
 
-    ?line true = eq(FF0, FF0),
-    ?line true = eq(FF0, FF0_copy),
-    ?line true = eq(FF1, FF1),
-    ?line true = eq(FF2, FF2),
-    ?line true = eq(FF3, FF3),
-    ?line true = eq(FF4, FF4),
-    ?line false = eq(FF0, FF1),
-    ?line false = eq(FF0, FF2),
-    ?line false = eq(FF0, FF3),
-    ?line false = eq(FF0, FF4),
-    ?line false = eq(FF1, FF0),
-    ?line false = eq(FF1, FF2),
-    ?line false = eq(FF1, FF3),
-    ?line false = eq(FF1, FF4),
-    ?line false = eq(FF2, FF3),
-    ?line false = eq(FF2, FF4),
-    ?line false = eq(FF3, FF4),
+    true = eq(FF0, FF0),
+    true = eq(FF0, FF0_copy),
+    true = eq(FF1, FF1),
+    true = eq(FF2, FF2),
+    true = eq(FF3, FF3),
+    true = eq(FF4, FF4),
+    false = eq(FF0, FF1),
+    false = eq(FF0, FF2),
+    false = eq(FF0, FF3),
+    false = eq(FF0, FF4),
+    false = eq(FF1, FF0),
+    false = eq(FF1, FF2),
+    false = eq(FF1, FF3),
+    false = eq(FF1, FF4),
+    false = eq(FF2, FF3),
+    false = eq(FF2, FF4),
+    false = eq(FF3, FF4),
 
     %% EEP37
     H1 = fun Fact(N) when N > 0 -> N * Fact(N - 1); Fact(0) -> 1 end,
@@ -285,7 +255,7 @@ copy_term(Term) ->
 make_fun(X) ->
     fun() -> X end.
 	    
-ordering(doc) -> "Tests ordering of funs.";
+%% Tests ordering of funs.
 ordering(Config) when is_list(Config) ->
     F1 = make_fun(1, 2),
     F1_copy = copy_term(F1),
@@ -298,140 +268,139 @@ ordering(Config) when is_list(Config) ->
     FF3 = fun erlang:exit/2,
     FF4 = fun z:ff/0,
 
-    ?line true = FF0 < FF1,
-    ?line true = FF1 < FF2,
-    ?line true = FF2 < FF3,
-    ?line true = FF3 < FF4,
+    true = FF0 < FF1,
+    true = FF1 < FF2,
+    true = FF2 < FF3,
+    true = FF3 < FF4,
 
-    ?line true = FF0 > F1,
-    ?line true = FF0 > F2,
-    ?line true = FF0 > F3,
-    ?line true = FF4 > F1,
-    ?line true = FF4 > F2,
-    ?line true = FF4 > F3,
+    true = FF0 > F1,
+    true = FF0 > F2,
+    true = FF0 > F3,
+    true = FF4 > F1,
+    true = FF4 > F2,
+    true = FF4 > F3,
 
-    ?line true = F1 == F1,
-    ?line true = F1 == F1_copy,
-    ?line true = F1 /= F2,
+    true = F1 == F1,
+    true = F1 == F1_copy,
+    true = F1 /= F2,
 
-    ?line true = F1 < F2,
-    ?line true = F2 > F1,
-    ?line true = F2 < F3,
-    ?line true = F3 > F2,
+    true = F1 < F2,
+    true = F2 > F1,
+    true = F2 < F3,
+    true = F3 > F2,
 
-    ?line false = F1 > F2,
-    ?line false = F2 > F3,
+    false = F1 > F2,
+    false = F2 > F3,
 
     %% Compare with binaries.
 
     B = list_to_binary([7,8,9,10]),
-    ?line false = B == F1,
-    ?line false = F1 == B,
+    false = B == F1,
+    false = F1 == B,
 
-    ?line true = F1 < B,
-    ?line true = B > F2,
+    true = F1 < B,
+    true = B > F2,
 
-    ?line false = F1 > B,
-    ?line false = B < F2,
+    false = F1 > B,
+    false = B < F2,
 
-    ?line false = F1 >= B,
-    ?line false = B =< F2,
+    false = F1 >= B,
+    false = B =< F2,
 
     %% Compare module funs with binaries.
-    ?line false = B == FF1,
-    ?line false = FF1 == B,
+    false = B == FF1,
+    false = FF1 == B,
 
-    ?line true = FF1 < B,
-    ?line true = B > FF2,
+    true = FF1 < B,
+    true = B > FF2,
 
-    ?line false = FF1 > B,
-    ?line false = B < FF2,
+    false = FF1 > B,
+    false = B < FF2,
 
-    ?line false = FF1 >= B,
-    ?line false = B =< FF2,
+    false = FF1 >= B,
+    false = B =< FF2,
 
     %% Create a port and ref.
 
-    ?line Path = ?config(priv_dir, Config),
-    ?line AFile = filename:join(Path, "vanilla_file"),
-    ?line P = open_port(AFile, [out]),
-    ?line R = make_ref(),
+    Path = proplists:get_value(priv_dir, Config),
+    AFile = filename:join(Path, "vanilla_file"),
+    P = open_port(AFile, [out]),
+    R = make_ref(),
 
     %% Compare funs with ports and refs.
 
-    ?line true = R < F3,
-    ?line true = F3 > R,
-    ?line true = F3 < P,
-    ?line true = P > F3,
+    true = R < F3,
+    true = F3 > R,
+    true = F3 < P,
+    true = P > F3,
 
-    ?line true = R =< F3,
-    ?line true = F3 >= R,
-    ?line true = F3 =< P,
-    ?line true = P >= F3,
+    true = R =< F3,
+    true = F3 >= R,
+    true = F3 =< P,
+    true = P >= F3,
 
-    ?line false = R > F3,
-    ?line false = F3 < R,
-    ?line false = F3 > P,
-    ?line false = P < F3,
+    false = R > F3,
+    false = F3 < R,
+    false = F3 > P,
+    false = P < F3,
 
     %% Compare funs with conses and nils.
 
-    ?line true = F1 < [a],
-    ?line true = F1 < [],
-    ?line true = [a,b] > F1,
-    ?line true = [] > F1,
+    true = F1 < [a],
+    true = F1 < [],
+    true = [a,b] > F1,
+    true = [] > F1,
 
-    ?line false = [1] < F1,
-    ?line false = [] < F1,
-    ?line false = F1 > [2],
-    ?line false = F1 > [],
+    false = [1] < F1,
+    false = [] < F1,
+    false = F1 > [2],
+    false = F1 > [],
 
-    ?line false = [1] =< F1,
-    ?line false = [] =< F1,
-    ?line false = F1 >= [2],
-    ?line false = F1 >= [],
+    false = [1] =< F1,
+    false = [] =< F1,
+    false = F1 >= [2],
+    false = F1 >= [],
 
     %% Compare module funs with conses and nils.
 
-    ?line true = FF1 < [a],
-    ?line true = FF1 < [],
-    ?line true = [a,b] > FF1,
-    ?line true = [] > FF1,
+    true = FF1 < [a],
+    true = FF1 < [],
+    true = [a,b] > FF1,
+    true = [] > FF1,
 
-    ?line false = [1] < FF1,
-    ?line false = [] < FF1,
-    ?line false = FF1 > [2],
-    ?line false = FF1 > [],
+    false = [1] < FF1,
+    false = [] < FF1,
+    false = FF1 > [2],
+    false = FF1 > [],
 
-    ?line false = [1] =< FF1,
-    ?line false = [] =< FF1,
-    ?line false = FF1 >= [2],
-    ?line false = FF1 >= [],
+    false = [1] =< FF1,
+    false = [] =< FF1,
+    false = FF1 >= [2],
+    false = FF1 >= [],
     ok.
 
 make_fun(X, Y) ->
     fun(A) -> A*X+Y end.
 
-fun_to_port(doc) -> "Try sending funs to ports (should fail).";
-fun_to_port(suite) -> [];
+%% Try sending funs to ports (should fail).
 fun_to_port(Config) when is_list(Config) ->
-    ?line fun_to_port(Config, xxx),
-    ?line fun_to_port(Config, fun() -> 42 end),
-    ?line fun_to_port(Config, [fun() -> 43 end]),
-    ?line fun_to_port(Config, [1,fun() -> 44 end]),
-    ?line fun_to_port(Config, [0,1|fun() -> 45 end]),
+    fun_to_port(Config, xxx),
+    fun_to_port(Config, fun() -> 42 end),
+    fun_to_port(Config, [fun() -> 43 end]),
+    fun_to_port(Config, [1,fun() -> 44 end]),
+    fun_to_port(Config, [0,1|fun() -> 45 end]),
     B64K = build_io_list(65536),
-    ?line fun_to_port(Config, [B64K,fun() -> 45 end]),
-    ?line fun_to_port(Config, [B64K|fun() -> 45 end]),
+    fun_to_port(Config, [B64K,fun() -> 45 end]),
+    fun_to_port(Config, [B64K|fun() -> 45 end]),
     ok.
 
 fun_to_port(Config, IoList) ->
-    Path = ?config(priv_dir, Config),
+    Path = proplists:get_value(priv_dir, Config),
     AFile = filename:join(Path, "vanilla_file"),
     Port = open_port(AFile, [out]),
     case catch port_command(Port, IoList) of
 	{'EXIT',{badarg,_}} -> ok;
-	Other -> ?t:fail({unexpected_retval,Other})
+	Other -> ct:fail({unexpected_retval,Other})
     end.
 
 build_io_list(0) -> [];
@@ -443,86 +412,83 @@ build_io_list(N) ->
 	1 -> [7,L|L]
     end.
 
-t_hash(doc) -> "Test the hash/2 BIF on funs.";
-t_hash(suite) -> [];
+%% Test the hash/2 BIF on funs.
 t_hash(Config) when is_list(Config) ->
     F1 = fun(_X) -> 1 end,
     F2 = fun(_X) -> 2 end,
-    ?line true = hash(F1) /= hash(F2),
+    true = hash(F1) /= hash(F2),
 
     G1 = make_fun(1, 2, 3),
     G2 = make_fun(1, 2, 3),
     G3 = make_fun(1, 2, 4),
-    ?line true = hash(G1) == hash(G2),
-    ?line true = hash(G2) /= hash(G3),
+    true = hash(G1) == hash(G2),
+    true = hash(G2) /= hash(G3),
 
     FF0 = fun erlang:abs/1,
     FF1 = fun erlang:exit/1,
     FF2 = fun erlang:exit/2,
     FF3 = fun blurf:exit/2,
-    ?line true = hash(FF0) =/= hash(FF1),
-    ?line true = hash(FF0) =/= hash(FF2),
-    ?line true = hash(FF0) =/= hash(FF3),
-    ?line true = hash(FF1) =/= hash(FF2),
-    ?line true = hash(FF1) =/= hash(FF3),
-    ?line true = hash(FF2) =/= hash(FF3),
+    true = hash(FF0) =/= hash(FF1),
+    true = hash(FF0) =/= hash(FF2),
+    true = hash(FF0) =/= hash(FF3),
+    true = hash(FF1) =/= hash(FF2),
+    true = hash(FF1) =/= hash(FF3),
+    true = hash(FF2) =/= hash(FF3),
     ok.
 
 hash(Term) ->
     erlang:hash(Term, 16#7ffffff).
 
-t_phash(doc) -> "Test the phash/2 BIF on funs.";
-t_phash(suite) -> [];
+%% Test the phash/2 BIF on funs.
 t_phash(Config) when is_list(Config) ->
     F1 = fun(_X) -> 1 end,
     F2 = fun(_X) -> 2 end,
-    ?line true = phash(F1) /= phash(F2),
+    true = phash(F1) /= phash(F2),
 
     G1 = make_fun(1, 2, 3),
     G2 = make_fun(1, 2, 3),
     G3 = make_fun(1, 2, 4),
-    ?line true = phash(G1) == phash(G2),
-    ?line true = phash(G2) /= phash(G3),
+    true = phash(G1) == phash(G2),
+    true = phash(G2) /= phash(G3),
 
     FF0 = fun erlang:abs/1,
     FF1 = fun erlang:exit/1,
     FF2 = fun erlang:exit/2,
     FF3 = fun blurf:exit/2,
-    ?line true = phash(FF0) =/= phash(FF1),
-    ?line true = phash(FF0) =/= phash(FF2),
-    ?line true = phash(FF0) =/= phash(FF3),
-    ?line true = phash(FF1) =/= phash(FF2),
-    ?line true = phash(FF1) =/= phash(FF3),
-    ?line true = phash(FF2) =/= phash(FF3),
+    true = phash(FF0) =/= phash(FF1),
+    true = phash(FF0) =/= phash(FF2),
+    true = phash(FF0) =/= phash(FF3),
+    true = phash(FF1) =/= phash(FF2),
+    true = phash(FF1) =/= phash(FF3),
+    true = phash(FF2) =/= phash(FF3),
     
     ok.
 
 phash(Term) ->
     erlang:phash(Term, 16#7ffffff).
 
-t_phash2(doc) -> "Test the phash2/2 BIF on funs.";
-t_phash2(suite) -> [];
+%% Test the phash2/2 BIF on funs.
 t_phash2(Config) when is_list(Config) ->
     F1 = fun(_X) -> 1 end,
     F2 = fun(_X) -> 2 end,
-    ?line true = phash2(F1) /= phash2(F2),
+    true = phash2(F1) /= phash2(F2),
 
     G1 = make_fun(1, 2, 3),
     G2 = make_fun(1, 2, 3),
     G3 = make_fun(1, 2, 4),
-    ?line true = phash2(G1) == phash2(G2),
-    ?line true = phash2(G2) /= phash2(G3),
+    true = phash2(G1) == phash2(G2),
+    true = phash2(G2) /= phash2(G3),
 
     FF0 = fun erlang:abs/1,
     FF1 = fun erlang:exit/1,
     FF2 = fun erlang:exit/2,
     FF3 = fun blurf:exit/2,
-    ?line true = phash2(FF0) =/= phash2(FF1),
-    ?line true = phash2(FF0) =/= phash2(FF2),
-    ?line true = phash2(FF0) =/= phash2(FF3),
-    ?line true = phash2(FF1) =/= phash2(FF2),
-    ?line true = phash2(FF1) =/= phash2(FF3),
-    ?line true = phash2(FF2) =/= phash2(FF3),
+    true = phash2(FF0) =/= phash2(FF1),
+    true = phash2(FF0) =/= phash2(FF2),
+    true = phash2(FF0) =/= phash2(FF3),
+    true = phash2(FF1) =/= phash2(FF2),
+    true = phash2(FF1) =/= phash2(FF3),
+    true = phash2(FF2) =/= phash2(FF3),
     
     ok.
 
@@ -532,52 +498,51 @@ phash2(Term) ->
 make_fun(X, Y, Z) ->
     fun() -> {X,Y,Z} end.
 
-md5(doc) -> "Test that MD5 bifs reject funs properly.";
-md5(suite) -> [];
+%% Test that MD5 bifs reject funs properly.
 md5(Config) when is_list(Config) ->
     _ = size(erlang:md5_init()),
 
     %% Try funs in the i/o list.
-    ?line bad_md5(fun(_X) -> 42 end),
-    ?line bad_md5([fun(_X) -> 43 end]),
-    ?line bad_md5([1,fun(_X) -> 44 end]),
-    ?line bad_md5([1|fun(_X) -> 45 end]),
-    ?line B64K = build_io_list(65536),
-    ?line bad_md5([B64K,fun(_X) -> 46 end]),
-    ?line bad_md5([B64K|fun(_X) -> 46 end]),
+    bad_md5(fun(_X) -> 42 end),
+    bad_md5([fun(_X) -> 43 end]),
+    bad_md5([1,fun(_X) -> 44 end]),
+    bad_md5([1|fun(_X) -> 45 end]),
+    B64K = build_io_list(65536),
+    bad_md5([B64K,fun(_X) -> 46 end]),
+    bad_md5([B64K|fun(_X) -> 46 end]),
     ok.
     
 bad_md5(Bad) ->
     {'EXIT',{badarg,_}} = (catch erlang:md5(Bad)).
 
 refc(Config) when is_list(Config) ->
-    ?line F1 = fun_factory(2),
-    ?line {refc,2} = erlang:fun_info(F1, refc),
-    ?line F2 = fun_factory(42),
-    ?line {refc,3} = erlang:fun_info(F1, refc),
+    F1 = fun_factory(2),
+    {refc,2} = erlang:fun_info(F1, refc),
+    F2 = fun_factory(42),
+    {refc,3} = erlang:fun_info(F1, refc),
 
-    ?line process_flag(trap_exit, true),
-    ?line Pid = spawn_link(fun() -> {refc,4} = erlang:fun_info(F1, refc) end),
+    process_flag(trap_exit, true),
+    Pid = spawn_link(fun() -> {refc,4} = erlang:fun_info(F1, refc) end),
     receive
 	{'EXIT',Pid,normal} -> ok;
-	Other -> ?line ?t:fail({unexpected,Other})
+	Other -> ct:fail({unexpected,Other})
     end,
-    ?line process_flag(trap_exit, false),
-    ?line {refc,3} = erlang:fun_info(F1, refc),
+    process_flag(trap_exit, false),
+    {refc,3} = erlang:fun_info(F1, refc),
 
     %% Garbage collect. Only the F2 fun will be left.
-    ?line 7 = F1(5),
-    ?line true = erlang:garbage_collect(),
-    ?line 40 = F2(-2),
-    ?line {refc,2} = erlang:fun_info(F2, refc),
+    7 = F1(5),
+    true = erlang:garbage_collect(),
+    40 = F2(-2),
+    {refc,2} = erlang:fun_info(F2, refc),
     ok.
 
 fun_factory(Const) ->
     fun(X) -> X + Const end.
 
 refc_ets(Config) when is_list(Config) ->
-    ?line F = fun(X) -> X + 33 end,
-    ?line {refc,2} = erlang:fun_info(F, refc),
+    F = fun(X) -> X + 33 end,
+    {refc,2} = erlang:fun_info(F, refc),
 
     refc_ets_set(F, [set]),
     refc_ets_set(F, [ordered_set]),
@@ -586,115 +551,112 @@ refc_ets(Config) when is_list(Config) ->
     ok.
 
 refc_ets_set(F1, Options) ->
-    ?line io:format("~p", [Options]),
-    ?line Tab = ets:new(kalle, Options),
-    ?line true = ets:insert(Tab, {a_key,F1}),
-    ?line 3 = fun_refc(F1),
-    ?line [{a_key,F3}] = ets:lookup(Tab, a_key),
-    ?line 4 = fun_refc(F1),
-    ?line true = ets:insert(Tab, {a_key,not_a_fun}),
-    ?line 3 = fun_refc(F1),
-    ?line true = ets:insert(Tab, {another_key,F1}),
-    ?line 4 = fun_refc(F1),
-    ?line true = ets:delete(Tab),
-    ?line 3 = fun_refc(F1),
-    ?line 10 = F3(-23),
-    ?line true = erlang:garbage_collect(),
-    ?line 2 = fun_refc(F1),
+    io:format("~p", [Options]),
+    Tab = ets:new(kalle, Options),
+    true = ets:insert(Tab, {a_key,F1}),
+    3 = fun_refc(F1),
+    [{a_key,F3}] = ets:lookup(Tab, a_key),
+    4 = fun_refc(F1),
+    true = ets:insert(Tab, {a_key,not_a_fun}),
+    3 = fun_refc(F1),
+    true = ets:insert(Tab, {another_key,F1}),
+    4 = fun_refc(F1),
+    true = ets:delete(Tab),
+    3 = fun_refc(F1),
+    10 = F3(-23),
+    true = erlang:garbage_collect(),
+    2 = fun_refc(F1),
     ok.
 
 refc_ets_bag(F1, Options) ->
-    ?line io:format("~p", [Options]),
-    ?line Tab = ets:new(kalle, Options),
-    ?line true = ets:insert(Tab, {a_key,F1}),
-    ?line 3 = fun_refc(F1),
-    ?line [{a_key,F3}] = ets:lookup(Tab, a_key),
-    ?line 4 = fun_refc(F1),
-    ?line true = ets:insert(Tab, {a_key,not_a_fun}),
-    ?line 4 = fun_refc(F1),
-    ?line true = ets:insert(Tab, {another_key,F1}),
-    ?line 5 = fun_refc(F1),
-    ?line true = ets:delete(Tab),
-    ?line 3 = fun_refc(F1),
-    ?line 10 = F3(-23),
-    ?line true = erlang:garbage_collect(),
-    ?line 2 = fun_refc(F1),
+    io:format("~p", [Options]),
+    Tab = ets:new(kalle, Options),
+    true = ets:insert(Tab, {a_key,F1}),
+    3 = fun_refc(F1),
+    [{a_key,F3}] = ets:lookup(Tab, a_key),
+    4 = fun_refc(F1),
+    true = ets:insert(Tab, {a_key,not_a_fun}),
+    4 = fun_refc(F1),
+    true = ets:insert(Tab, {another_key,F1}),
+    5 = fun_refc(F1),
+    true = ets:delete(Tab),
+    3 = fun_refc(F1),
+    10 = F3(-23),
+    true = erlang:garbage_collect(),
+    2 = fun_refc(F1),
     ok.
 
 refc_dist(Config) when is_list(Config) ->
-    ?line {ok,Node} = start_node(fun_SUITE_refc_dist),
-    ?line process_flag(trap_exit, true),
-    ?line Pid = spawn_link(Node,
-			   fun() -> receive
-					Fun when is_function(Fun) ->
-					    2 = fun_refc(Fun),
-					    exit({normal,Fun}) end
-			   end),
-    ?line F = fun() -> 42 end,
-    ?line 2 = fun_refc(F),
-    ?line Pid ! F,
+    {ok,Node} = start_node(fun_SUITE_refc_dist),
+    process_flag(trap_exit, true),
+    Pid = spawn_link(Node, fun() -> receive
+                                        Fun when is_function(Fun) ->
+                                            2 = fun_refc(Fun),
+                                            exit({normal,Fun}) end
+                           end),
+    F = fun() -> 42 end,
+    2 = fun_refc(F),
+    Pid ! F,
     F2 = receive
 	     {'EXIT',Pid,{normal,Fun}} -> Fun;
-	     Other -> ?line ?t:fail({unexpected,Other})
+	     Other -> ct:fail({unexpected,Other})
 	 end,
     %% dist.c:net_mess2 have a reference to Fun for a while since
     %% Fun is passed in an exit signal. Wait until it is gone.
-    ?line wait_until(fun () -> 4 =/= fun_refc(F2) end),
-    ?line 3 = fun_refc(F2),
-    ?line true = erlang:garbage_collect(),
-    ?line 2 = fun_refc(F),
+    wait_until(fun () -> 4 =/= fun_refc(F2) end),
+    3 = fun_refc(F2),
+    true = erlang:garbage_collect(),
+    2 = fun_refc(F),
     refc_dist_send(Node, F).
 
 refc_dist_send(Node, F) ->
-    ?line Pid = spawn_link(Node,
-			   fun() -> receive
-					{To,Fun} when is_function(Fun) ->
-					    wait_until(fun () ->
-							       2 =:= fun_refc(Fun)
-						       end),
-					    To ! Fun
-				    end
-			   end),
-    ?line 2 = fun_refc(F),
+    Pid = spawn_link(Node, fun() -> receive
+                                        {To,Fun} when is_function(Fun) ->
+                                            wait_until(fun () ->
+                                                               2 =:= fun_refc(Fun)
+                                                       end),
+                                            To ! Fun
+                                    end
+                           end),
+    2 = fun_refc(F),
     Pid ! {self(),F},
     F2 = receive
 	     Fun when is_function(Fun) -> Fun;
-	     Other -> ?line ?t:fail({unexpected,Other})
+	     Other -> ct:fail({unexpected,Other})
 	 end,
     receive {'EXIT',Pid,normal} -> ok end,
     %% No reference from dist.c:net_mess2 since Fun is passed
     %% in an ordinary message.
-    ?line 3 = fun_refc(F),
-    ?line 3 = fun_refc(F2),
+    3 = fun_refc(F),
+    3 = fun_refc(F2),
     refc_dist_reg_send(Node, F).
 
 refc_dist_reg_send(Node, F) ->
-    ?line true = erlang:garbage_collect(),
-    ?line 2 = fun_refc(F),
-    ?line Ref = make_ref(),
-    ?line Me = self(),
-    ?line Pid = spawn_link(Node,
-			   fun() ->
-				   true = register(my_fun_tester, self()),
-				   Me ! Ref,
-				   receive
-				       {Me,Fun} when is_function(Fun) ->
-					   2 = fun_refc(Fun),
-					   Me ! Fun
-				   end
-			   end),
+    true = erlang:garbage_collect(),
+    2 = fun_refc(F),
+    Ref = make_ref(),
+    Me = self(),
+    Pid = spawn_link(Node, fun() ->
+                                   true = register(my_fun_tester, self()),
+                                   Me ! Ref,
+                                   receive
+                                       {Me,Fun} when is_function(Fun) ->
+                                           2 = fun_refc(Fun),
+                                           Me ! Fun
+                                   end
+                           end),
     erlang:yield(),
-    ?line 2 = fun_refc(F),
+    2 = fun_refc(F),
     receive Ref -> ok end,
     {my_fun_tester,Node} ! {self(),F},
     F2 = receive
 	     Fun when is_function(Fun) -> Fun;
-	     Other -> ?line ?t:fail({unexpected,Other})
+	     Other -> ct:fail({unexpected,Other})
 	 end,
     receive {'EXIT',Pid,normal} -> ok end,
 
-    ?line 3 = fun_refc(F),
-    ?line 3 = fun_refc(F2),
+    3 = fun_refc(F),
+    3 = fun_refc(F2),
     ok.
     
 fun_refc(F) ->
@@ -702,67 +664,67 @@ fun_refc(F) ->
     Count.
 
 const_propagation(Config) when is_list(Config) ->
-    ?line Fun1 = fun start_node/1,
-    ?line 2 = fun_refc(Fun1),
-    ?line Fun2 = Fun1,
-    ?line my_cmp({Fun1,Fun2}),
-
-    ?line Fun3 = fun() -> ok end,
-    ?line 2 = fun_refc(Fun3),
-    ?line Fun4 = Fun3,
-    ?line my_cmp({Fun3,Fun4}),
+    Fun1 = fun start_node/1,
+    2 = fun_refc(Fun1),
+    Fun2 = Fun1,
+    my_cmp({Fun1,Fun2}),
+
+    Fun3 = fun() -> ok end,
+    2 = fun_refc(Fun3),
+    Fun4 = Fun3,
+    my_cmp({Fun3,Fun4}),
     ok.
 
 my_cmp({Fun,Fun}) -> ok;
 my_cmp({Fun1,Fun2}) ->
     io:format("Fun1: ~p", [erlang:fun_info(Fun1)]),
     io:format("Fun2: ~p", [erlang:fun_info(Fun2)]),
-    ?t:fail().
+    ct:fail(no_match).
 
 t_arity(Config) when is_list(Config) ->
-    ?line 0 = fun_arity(fun() -> ok end),
-    ?line 0 = fun_arity(fun() -> Config end),
-    ?line 1 = fun_arity(fun(X) -> X+1 end),
-    ?line 1 = fun_arity(fun(X) -> Config =:= X end),
+    0 = fun_arity(fun() -> ok end),
+    0 = fun_arity(fun() -> Config end),
+    1 = fun_arity(fun(X) -> X+1 end),
+    1 = fun_arity(fun(X) -> Config =:= X end),
     A = id(42),
 
     %% Test that the arity is transferred properly.
-    ?line process_flag(trap_exit, true),
-    ?line {ok,Node} = start_node(fun_test_arity),
-    ?line hello_world = spawn_call(Node, fun() -> hello_world end),
-    ?line 0 = spawn_call(Node, fun(X) -> X end),
-    ?line 42 = spawn_call(Node, fun(_X) -> A end),
-    ?line 43 = spawn_call(Node, fun(X, Y) -> A+X+Y end),
-    ?line 1 = spawn_call(Node, fun(X, Y) -> X+Y end),
-    ?line 45 = spawn_call(Node, fun(X, Y, Z) -> A+X+Y+Z end),
+    process_flag(trap_exit, true),
+    {ok,Node} = start_node(fun_test_arity),
+    hello_world = spawn_call(Node, fun() -> hello_world end),
+    0 = spawn_call(Node, fun(X) -> X end),
+    42 = spawn_call(Node, fun(_X) -> A end),
+    43 = spawn_call(Node, fun(X, Y) -> A+X+Y end),
+    1 = spawn_call(Node, fun(X, Y) -> X+Y end),
+    45 = spawn_call(Node, fun(X, Y, Z) -> A+X+Y+Z end),
     ok.
 
 t_is_function2(Config) when is_list(Config) ->
     false = is_function(id({a,b}), 0),
     false = is_function(id({a,b}), 234343434333433433),
-    ?line true = is_function(fun() -> ok end, 0),
-    ?line true = is_function(fun(_) -> ok end, 1),
-    ?line false = is_function(fun(_) -> ok end, 0),
+    true = is_function(fun() -> ok end, 0),
+    true = is_function(fun(_) -> ok end, 1),
+    false = is_function(fun(_) -> ok end, 0),
 
-    ?line true = is_function(fun erlang:abs/1, 1),
-    ?line true = is_function(fun erlang:abs/99, 99),
-    ?line false = is_function(fun erlang:abs/1, 0),
-    ?line false = is_function(fun erlang:abs/99, 0),
+    true = is_function(fun erlang:abs/1, 1),
+    true = is_function(fun erlang:abs/99, 99),
+    false = is_function(fun erlang:abs/1, 0),
+    false = is_function(fun erlang:abs/99, 0),
 
-    ?line false = is_function(id(self()), 0),
-    ?line false = is_function(id({a,b,c}), 0),
-    ?line false = is_function(id({a}), 0),
-    ?line false = is_function(id([a,b,c]), 0),
+    false = is_function(id(self()), 0),
+    false = is_function(id({a,b,c}), 0),
+    false = is_function(id({a}), 0),
+    false = is_function(id([a,b,c]), 0),
 
     %% Bad arity argument.
-    ?line bad_arity(a),
-    ?line bad_arity(-1),
-    ?line bad_arity(-9738974938734938793873498378),
-    ?line bad_arity([]),
-    ?line bad_arity(fun() -> ok end),
-    ?line bad_arity({}),
-    ?line bad_arity({a,b}),
-    ?line bad_arity(self()),
+    bad_arity(a),
+    bad_arity(-1),
+    bad_arity(-9738974938734938793873498378),
+    bad_arity([]),
+    bad_arity(fun() -> ok end),
+    bad_arity({}),
+    bad_arity({a,b}),
+    bad_arity(self()),
     ok.
 
 bad_arity(A) ->
@@ -771,59 +733,57 @@ bad_arity(A) ->
     ok.
 
 t_fun_info(Config) when is_list(Config) ->
-    ?line F = fun t_fun_info/1,
-    ?line try F(blurf) of
+    F = fun t_fun_info/1,
+    try F(blurf) of
 	      FAny ->
-		  io:format("should fail; returned ~p\n", [FAny]),
-		  ?line ?t:fail()
+		  ct:fail("should fail; returned ~p\n", [FAny])
 	  catch
 	      error:function_clause -> ok
 	  end,
-    ?line {module,?MODULE} = erlang:fun_info(F, module),
-    ?line case erlang:fun_info(F, name) of
+    {module,?MODULE} = erlang:fun_info(F, module),
+    case erlang:fun_info(F, name) of
 	      undefined ->
-		  ?line ?t:fail();
+		  ct:fail(no_fun_info);
 	      _ -> ok
 	  end,
-    ?line {arity,1} = erlang:fun_info(F, arity),
-    ?line {env,[]} = erlang:fun_info(F, env),
-    ?line verify_not_undef(F, index),
-    ?line verify_not_undef(F, uniq),
-    ?line verify_not_undef(F, new_index),
-    ?line verify_not_undef(F, new_uniq),
-    ?line verify_not_undef(F, refc),
-    ?line {'EXIT',_} = (catch erlang:fun_info(F, blurf)),    
+    {arity,1} = erlang:fun_info(F, arity),
+    {env,[]} = erlang:fun_info(F, env),
+    verify_not_undef(F, index),
+    verify_not_undef(F, uniq),
+    verify_not_undef(F, new_index),
+    verify_not_undef(F, new_uniq),
+    verify_not_undef(F, refc),
+    {'EXIT',_} = (catch erlang:fun_info(F, blurf)),    
 
     %% Module fun.
-    ?line FF = fun ?MODULE:t_fun_info/1,
-    ?line try FF(blurf) of
+    FF = fun ?MODULE:t_fun_info/1,
+    try FF(blurf) of
 	      FFAny ->
-		  io:format("should fail; returned ~p\n", [FFAny]),
-		  ?line ?t:fail()
+		  ct:fail("should fail; returned ~p\n", [FFAny])
 	  catch
 	      error:function_clause -> ok
 	  end,
 
-    ?line {module,?MODULE} = erlang:fun_info(FF, module),
-    ?line {name,t_fun_info} = erlang:fun_info(FF, name),
-    ?line {arity,1} = erlang:fun_info(FF, arity),
-    ?line {env,[]} = erlang:fun_info(FF, env),
-    ?line verify_undef(FF, index),
-    ?line verify_undef(FF, uniq),
-    ?line verify_undef(FF, new_index),
-    ?line verify_undef(FF, new_uniq),
-    ?line verify_undef(FF, refc),
-    ?line {'EXIT',_} = (catch erlang:fun_info(FF, blurf)),
+    {module,?MODULE} = erlang:fun_info(FF, module),
+    {name,t_fun_info} = erlang:fun_info(FF, name),
+    {arity,1} = erlang:fun_info(FF, arity),
+    {env,[]} = erlang:fun_info(FF, env),
+    verify_undef(FF, index),
+    verify_undef(FF, uniq),
+    verify_undef(FF, new_index),
+    verify_undef(FF, new_uniq),
+    verify_undef(FF, refc),
+    {'EXIT',_} = (catch erlang:fun_info(FF, blurf)),
 
     %% Not fun.
-    ?line bad_info(abc),
-    ?line bad_info(42),
-    ?line bad_info({fun erlang:list_to_integer/1}),
-    ?line bad_info([42]),
-    ?line bad_info([]),
-    ?line bad_info(self()),
-    ?line bad_info(<<>>),
-    ?line bad_info(<<1,2>>),
+    bad_info(abc),
+    bad_info(42),
+    bad_info({fun erlang:list_to_integer/1}),
+    bad_info([42]),
+    bad_info([]),
+    bad_info(self()),
+    bad_info(<<>>),
+    bad_info(<<1,2>>),
     ok.
 
 t_fun_info_mfa(Config) when is_list(Config) ->
@@ -847,8 +807,7 @@ t_fun_info_mfa(Config) when is_list(Config) ->
 bad_info(Term) ->
     try	erlang:fun_info(Term, module) of
 	Any ->
-	    io:format("should fail; returned ~p\n", [Any]),
-	    ?t:fail()
+	    ict:fail("should fail; returned ~p\n", [Any])
     catch
 	error:badarg -> ok
     end.
@@ -859,7 +818,7 @@ verify_undef(Fun, Tag) ->
 verify_not_undef(Fun, Tag) ->
     case erlang:fun_info(Fun, Tag) of
 	{Tag,undefined} ->
-	    ?t:fail();
+	    ct:fail("tag ~w not defined in fun_info", [Tag]);
 	{Tag,_} -> ok
     end.
 	    
@@ -884,15 +843,15 @@ spawn_call(Node, AFun) ->
     Pid ! {AFun,AFun,AFun},
     Res = receive
 	      {result,R} -> R;
-	      Other -> ?t:fail({bad_message,Other})
+	      Other -> ct:fail({bad_message,Other})
 	  after 10000 ->
-		  ?t:fail(timeout_waiting_for_result)
+		  ct:fail(timeout_waiting_for_result)
 	  end,
     receive
 	{'EXIT',Pid,normal} -> ok;
-	Other2 -> ?t:fail({bad_message_waiting_for_exit,Other2})
+	Other2 -> ct:fail({bad_message_waiting_for_exit,Other2})
     after 10000 ->
-	    ?t:fail(timeout_waiting_for_exit)
+	    ct:fail(timeout_waiting_for_exit)
     end,
     Res.
 
@@ -911,6 +870,3 @@ wait_until(Fun) ->
 	true -> ok;
 	_ -> receive after 100 -> wait_until(Fun) end
     end.
-
-% stop_node(Node) ->
-%    test_server:stop_node(Node).
diff --git a/erts/emulator/test/fun_r13_SUITE.erl b/erts/emulator/test/fun_r13_SUITE.erl
index 7ab5e65cb3..d66026705b 100644
--- a/erts/emulator/test/fun_r13_SUITE.erl
+++ b/erts/emulator/test/fun_r13_SUITE.erl
@@ -21,77 +21,53 @@
 -module(fun_r13_SUITE).
 -compile(r13).
 
--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,dist_old_release/1]).
+-export([all/0, suite/0,
+         dist_old_release/1]).
 
--define(default_timeout, ?t:minutes(1)).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() ->
     [dist_old_release].
 
-groups() ->
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(_Case, Config) ->
-    ?line Dog = test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
 dist_old_release(Config) when is_list(Config) ->
-    case ?t:is_release_available("r12b") of
-	true -> do_dist_old(Config);
-	false -> {skip,"No R12B found"}
+    case test_server:is_release_available("r12b") of
+        true -> do_dist_old(Config);
+        false -> {skip,"No R12B found"}
     end.
 
 do_dist_old(Config) when is_list(Config) ->
-    ?line Pa = filename:dirname(code:which(?MODULE)),
+    Pa = filename:dirname(code:which(?MODULE)),
     Name = fun_dist_r12,
-    ?line {ok,Node} = ?t:start_node(Name, peer,
-				    [{args,"-pa "++Pa},
-				     {erl,[{release,"r12b"}]}]),
-
-    ?line Pid = spawn_link(Node,
-			   fun() ->
-				   receive
-				       Fun when is_function(Fun) ->
-					   R12BFun = fun(H) -> cons(H, [b,c]) end,
-					   Fun(Fun, R12BFun)
-				   end
-			   end),
+    {ok,Node} = test_server:start_node(Name, peer,
+                                       [{args,"-pa "++Pa},
+                                        {erl,[{release,"r12b"}]}]),
+
+    Pid = spawn_link(Node,
+                     fun() ->
+                             receive
+                                 Fun when is_function(Fun) ->
+                                     R12BFun = fun(H) -> cons(H, [b,c]) end,
+                                     Fun(Fun, R12BFun)
+                             end
+                     end),
     Self = self(),
     Fun = fun(F, R12BFun) ->
-		  {pid,Self} = erlang:fun_info(F, pid),
-		  {module,?MODULE} = erlang:fun_info(F, module),
-		  Self ! {ok,F,R12BFun}
-	  end,
-    ?line Pid ! Fun,
-    ?line receive
-	      {ok,Fun,R12BFun} ->
-		  ?line [a,b,c] = R12BFun(a);
-	      Other ->
-		  ?line ?t:fail({bad_message,Other})
-	  end,
+                  {pid,Self} = erlang:fun_info(F, pid),
+                  {module,?MODULE} = erlang:fun_info(F, module),
+                  Self ! {ok,F,R12BFun}
+          end,
+    Pid ! Fun,
+    receive
+        {ok,Fun,R12BFun} ->
+            [a,b,c] = R12BFun(a);
+        Other ->
+            ct:fail({bad_message,Other})
+    end,
+    true = test_server:stop_node(Node),
     ok.
 
 cons(H, T) ->
diff --git a/erts/emulator/test/gc_SUITE.erl b/erts/emulator/test/gc_SUITE.erl
index 1e155e7b09..8e5f0b05a1 100644
--- a/erts/emulator/test/gc_SUITE.erl
+++ b/erts/emulator/test/gc_SUITE.erl
@@ -22,45 +22,27 @@
 
 -module(gc_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]).
-
--define(default_timeout, ?t:minutes(10)).
+-include_lib("common_test/include/ct.hrl").
+-export([all/0, suite/0]).
 
 -export([grow_heap/1, grow_stack/1, grow_stack_heap/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [grow_heap, grow_stack, grow_stack_heap].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
-grow_heap(doc) -> ["Produce a growing list of elements, ",
-		   "for X calls, then drop one item per call",
-		   "until the list is empty."];
+%% Produce a growing list of elements,
+%% for X calls, then drop one item per call
+%% until the list is empty.
 grow_heap(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:minutes(40)),
+    ct:timetrap({minutes, 40}),
     ok  = grow_heap1(256),
     ok  = grow_heap1(512),
     ok  = grow_heap1(1024),
     ok  = grow_heap1(2048),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 grow_heap1(Len) ->
@@ -86,14 +68,13 @@ grow_heap1([_|List], MaxLen, CurLen, down) ->
 
 
 
-grow_stack(doc) -> ["Increase and decrease stack size, and ",
-		    "drop off some garbage from time to time."];
+%% Increase and decrease stack size, and
+%% drop off some garbage from time to time.
 grow_stack(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:minutes(80)),
+    ct:timetrap({minutes, 80}),
     show_heap("before:"),
     grow_stack1(200, 0),
     show_heap("after:"),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 grow_stack1(0, _) ->
@@ -110,14 +91,12 @@ grow_stack1(Recs, CurRecs) ->
 
 
 %% Let's see how BEAM handles this one...
-grow_stack_heap(doc) -> ["While growing the heap, bounces the size ",
-			 "of the stack, and while reducing the heap",
-			 "bounces the stack usage."];
+%% While growing the heap, bounces the size of the
+%% stack, and while reducing the heap, bounces the stack usage.
 grow_stack_heap(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:minutes(40)),
+    ct:timetrap({minutes, 40}),
     grow_stack_heap1(16),
     grow_stack_heap1(32),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 grow_stack_heap1(MaxLen) ->
diff --git a/erts/emulator/test/guard_SUITE.erl b/erts/emulator/test/guard_SUITE.erl
index b3a85c6423..6ad4456e6b 100644
--- a/erts/emulator/test/guard_SUITE.erl
+++ b/erts/emulator/test/guard_SUITE.erl
@@ -20,12 +20,12 @@
 
 -module(guard_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, bad_arith/1, bad_tuple/1, 
+-export([all/0, suite/0,
+         bad_arith/1, bad_tuple/1,
 	 test_heap_guards/1, guard_bifs/1,
 	 type_tests/1,guard_bif_binary_part/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([init/3]).
 -import(lists, [member/2]).
@@ -36,27 +36,12 @@ all() ->
     [bad_arith, bad_tuple, test_heap_guards, guard_bifs,
      type_tests, guard_bif_binary_part].
 
-groups() -> 
-    [].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-bad_arith(doc) -> "Test that a bad arithmetic operation in a guard works correctly.";
+%% Test that a bad arithmetic operation in a guard works correctly.
 bad_arith(Config) when is_list(Config) ->
-    ?line 5 = bad_arith1(2, 3),
-    ?line 10 = bad_arith1(1, infinity),
-    ?line 10 = bad_arith1(infinity, 1),
+    5 = bad_arith1(2, 3),
+    10 = bad_arith1(1, infinity),
+    10 = bad_arith1(infinity, 1),
     ok.
 
 bad_arith1(T1, T2) when T1+T2 < 10 ->
@@ -64,12 +49,12 @@ bad_arith1(T1, T2) when T1+T2 < 10 ->
 bad_arith1(_, _) ->
     10.
 
-bad_tuple(doc) -> "Test that bad arguments to element/2 are handled correctly.";
+%% Test that bad arguments to element/2 are handled correctly.
 bad_tuple(Config) when is_list(Config) ->
-    ?line error = bad_tuple1(a),
-    ?line error = bad_tuple1({a, b}),
-    ?line x = bad_tuple1({x, b}),
-    ?line y = bad_tuple1({a, b, y}),
+    error = bad_tuple1(a),
+    error = bad_tuple1({a, b}),
+    x = bad_tuple1({x, b}),
+    y = bad_tuple1({a, b, y}),
     ok.
 
 bad_tuple1(T) when element(1, T) == x ->
@@ -79,26 +64,25 @@ bad_tuple1(T) when element(3, T) == y ->
 bad_tuple1(_) ->
     error.
 
-test_heap_guards(doc) -> "";
 test_heap_guards(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(2)),
+    ct:timetrap({minutes, 2}),
     
-    ?line process_flag(trap_exit, true),
-    ?line Tuple = {a, tuple, is, built, here, xxx},
-    ?line List = [a, list, is, built, here],
+    process_flag(trap_exit, true),
+    Tuple = {a, tuple, is, built, here, xxx},
+    List = [a, list, is, built, here],
 
-    ?line 'try'(fun a_case/1, [Tuple], [Tuple]),
-    ?line 'try'(fun a_case/1, [List], [List, List]),
-    ?line 'try'(fun a_case/1, [a], [a]),
+    'try'(fun a_case/1, [Tuple], [Tuple]),
+    'try'(fun a_case/1, [List], [List, List]),
+    'try'(fun a_case/1, [a], [a]),
 
-    ?line 'try'(fun an_if/1, [Tuple], [Tuple]),
-    ?line 'try'(fun an_if/1, [List], [List, List]),
-    ?line 'try'(fun an_if/1, [a], [a]),
+    'try'(fun an_if/1, [Tuple], [Tuple]),
+    'try'(fun an_if/1, [List], [List, List]),
+    'try'(fun an_if/1, [a], [a]),
 
-    ?line 'try'(fun receive_test/1, [Tuple], [Tuple]),
-    ?line 'try'(fun receive_test/1, [List], [List, List]),
-    ?line 'try'(fun receive_test/1, [a], [a]),
-    ?line test_server:timetrap_cancel(Dog).
+    'try'(fun receive_test/1, [Tuple], [Tuple]),
+    'try'(fun receive_test/1, [List], [List, List]),
+    'try'(fun receive_test/1, [a], [a]),
+    ok.
 
 a_case(V) ->
     case V of
@@ -143,12 +127,11 @@ a_receive() ->
     Pid = spawn_link(?MODULE, init, [Fun,Args,list_to_tuple(Filler)]),
     receive
 	{'EXIT', Pid, {result, Result}} ->
-	    ?line 'try'(Iter-1, Fun, Args, Result, [0|Filler]);
+	    'try'(Iter-1, Fun, Args, Result, [0|Filler]);
 	{result, Other} ->
-	    ?line io:format("Expected ~p; got ~p~n", [Result, Other]),
-	    ?line test_server:fail();
+	    ct:fail("Expected ~p; got ~p~n", [Result, Other]);
 	Other ->
-	    ?line test_server:fail({unexpected_message, Other})
+	    ct:fail({unexpected_message, Other})
     end.
 
 init(Fun, Args, Filler) ->
@@ -165,15 +148,14 @@ mask_error({'EXIT',{Err,_}}) ->
 mask_error(Else) ->
     Else.
 
-guard_bif_binary_part(doc) ->
-    ["Test the binary_part/2,3 guard BIF's extensively"];
+%% Test the binary_part/2,3 guard BIF's extensively
 guard_bif_binary_part(Config) when is_list(Config) ->
     %% Overflow tests that need to be unoptimized
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary_part(<<1,2,3>>,{16#FFFFFFFFFFFFFFFF,
 				 -16#7FFFFFFFFFFFFFFF-1})),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary_part(<<1,2,3>>,{16#FFFFFFFFFFFFFFFF,
 				 16#7FFFFFFFFFFFFFFF})),
@@ -198,66 +180,66 @@ guard_bif_binary_part(Config) when is_list(Config) ->
 
 
 do_binary_part_guard() ->
-    ?line 1 = bptest(<<1,2,3>>),
-    ?line 2 = bptest(<<2,1,3>>),
-    ?line error = bptest(<<1>>),
-    ?line error = bptest(<<>>),
-    ?line error = bptest(apa),
-    ?line 3 = bptest(<<2,3,3>>),
+    1 = bptest(<<1,2,3>>),
+    2 = bptest(<<2,1,3>>),
+    error = bptest(<<1>>),
+    error = bptest(<<>>),
+    error = bptest(apa),
+    3 = bptest(<<2,3,3>>),
     % With one variable (pos)
-    ?line 1 = bptest(<<1,2,3>>,1),
-    ?line 2 = bptest(<<2,1,3>>,1),
-    ?line error = bptest(<<1>>,1),
-    ?line error = bptest(<<>>,1),
-    ?line error = bptest(apa,1),
-    ?line 3 = bptest(<<2,3,3>>,1),
+    1 = bptest(<<1,2,3>>,1),
+    2 = bptest(<<2,1,3>>,1),
+    error = bptest(<<1>>,1),
+    error = bptest(<<>>,1),
+    error = bptest(apa,1),
+    3 = bptest(<<2,3,3>>,1),
     % With one variable (length)
-    ?line 1 = bptesty(<<1,2,3>>,1),
-    ?line 2 = bptesty(<<2,1,3>>,1),
-    ?line error = bptesty(<<1>>,1),
-    ?line error = bptesty(<<>>,1),
-    ?line error = bptesty(apa,1),
-    ?line 3 = bptesty(<<2,3,3>>,2),
+    1 = bptesty(<<1,2,3>>,1),
+    2 = bptesty(<<2,1,3>>,1),
+    error = bptesty(<<1>>,1),
+    error = bptesty(<<>>,1),
+    error = bptesty(apa,1),
+    3 = bptesty(<<2,3,3>>,2),
     % With one variable (whole tuple)
-    ?line 1 = bptestx(<<1,2,3>>,{1,1}),
-    ?line 2 = bptestx(<<2,1,3>>,{1,1}),
-    ?line error = bptestx(<<1>>,{1,1}),
-    ?line error = bptestx(<<>>,{1,1}),
-    ?line error = bptestx(apa,{1,1}),
-    ?line 3 = bptestx(<<2,3,3>>,{1,2}),
+    1 = bptestx(<<1,2,3>>,{1,1}),
+    2 = bptestx(<<2,1,3>>,{1,1}),
+    error = bptestx(<<1>>,{1,1}),
+    error = bptestx(<<>>,{1,1}),
+    error = bptestx(apa,{1,1}),
+    3 = bptestx(<<2,3,3>>,{1,2}),
     % With two variables
-    ?line 1 = bptest(<<1,2,3>>,1,1),
-    ?line 2 = bptest(<<2,1,3>>,1,1),
-    ?line error = bptest(<<1>>,1,1),
-    ?line error = bptest(<<>>,1,1),
-    ?line error = bptest(apa,1,1),
-    ?line 3 = bptest(<<2,3,3>>,1,2),
+    1 = bptest(<<1,2,3>>,1,1),
+    2 = bptest(<<2,1,3>>,1,1),
+    error = bptest(<<1>>,1,1),
+    error = bptest(<<>>,1,1),
+    error = bptest(apa,1,1),
+    3 = bptest(<<2,3,3>>,1,2),
     % Direct (autoimported) call, these will be evaluated by the compiler...
-    ?line <<2>> = binary_part(<<1,2,3>>,1,1),
-    ?line <<1>> = binary_part(<<2,1,3>>,1,1),
+    <<2>> = binary_part(<<1,2,3>>,1,1),
+    <<1>> = binary_part(<<2,1,3>>,1,1),
     % Compiler warnings due to constant evaluation expected (3)
-    ?line badarg = ?MASK_ERROR(binary_part(<<1>>,1,1)),
-    ?line badarg = ?MASK_ERROR(binary_part(<<>>,1,1)),
-    ?line badarg = ?MASK_ERROR(binary_part(apa,1,1)),
-    ?line <<3,3>> = binary_part(<<2,3,3>>,1,2),
+    badarg = ?MASK_ERROR(binary_part(<<1>>,1,1)),
+    badarg = ?MASK_ERROR(binary_part(<<>>,1,1)),
+    badarg = ?MASK_ERROR(binary_part(apa,1,1)),
+    <<3,3>> = binary_part(<<2,3,3>>,1,2),
     % Direct call through apply
-    ?line <<2>> = apply(erlang,binary_part,[<<1,2,3>>,1,1]),
-    ?line <<1>> = apply(erlang,binary_part,[<<2,1,3>>,1,1]),
+    <<2>> = apply(erlang,binary_part,[<<1,2,3>>,1,1]),
+    <<1>> = apply(erlang,binary_part,[<<2,1,3>>,1,1]),
     % Compiler warnings due to constant evaluation expected (3)
-    ?line badarg = ?MASK_ERROR(apply(erlang,binary_part,[<<1>>,1,1])),
-    ?line badarg = ?MASK_ERROR(apply(erlang,binary_part,[<<>>,1,1])),
-    ?line badarg = ?MASK_ERROR(apply(erlang,binary_part,[apa,1,1])),
-    ?line <<3,3>> = apply(erlang,binary_part,[<<2,3,3>>,1,2]),
+    badarg = ?MASK_ERROR(apply(erlang,binary_part,[<<1>>,1,1])),
+    badarg = ?MASK_ERROR(apply(erlang,binary_part,[<<>>,1,1])),
+    badarg = ?MASK_ERROR(apply(erlang,binary_part,[apa,1,1])),
+    <<3,3>> = apply(erlang,binary_part,[<<2,3,3>>,1,2]),
     % Constant propagation
-    ?line  Bin = <<1,2,3>>,
-    ?line  ok = if
+     Bin = <<1,2,3>>,
+     ok = if
 		    binary_part(Bin,1,1) =:= <<2>> ->
 			ok;
 		    %% Compiler warning, clause cannot match (expected)
 		    true ->
 			error
 		end,
-    ?line  ok = if
+     ok = if
 		    binary_part(Bin,{1,1}) =:= <<2>> ->
 			ok;
 		    %% Compiler warning, clause cannot match (expected)
@@ -323,91 +305,91 @@ bptest(_,_,_) ->
     error.
 
 
-guard_bifs(doc) -> "Test all guard bifs with nasty (but legal arguments).";
+%% Test all guard bifs with nasty (but legal arguments).
 guard_bifs(Config) when is_list(Config) ->
-    ?line Big = -237849247829874297658726487367328971246284736473821617265433,
-    ?line Float = 387924.874,
+    Big = -237849247829874297658726487367328971246284736473821617265433,
+    Float = 387924.874,
 
     %% Succeding use of guard bifs.
 
-    ?line try_gbif('abs/1', Big, -Big),
-    ?line try_gbif('float/1', Big, float(Big)),
-    ?line try_gbif('float/1', Big, float(id(Big))),
-    ?line try_gbif('trunc/1', Float, 387924.0),
-    ?line try_gbif('round/1', Float, 387925.0),
-    ?line try_gbif('length/1', [], 0),
+    try_gbif('abs/1', Big, -Big),
+    try_gbif('float/1', Big, float(Big)),
+    try_gbif('float/1', Big, float(id(Big))),
+    try_gbif('trunc/1', Float, 387924.0),
+    try_gbif('round/1', Float, 387925.0),
+    try_gbif('length/1', [], 0),
 
-    ?line try_gbif('length/1', [a], 1),
-    ?line try_gbif('length/1', [a, b], 2),
-    ?line try_gbif('length/1', lists:seq(0, 31), 32),
+    try_gbif('length/1', [a], 1),
+    try_gbif('length/1', [a, b], 2),
+    try_gbif('length/1', lists:seq(0, 31), 32),
 
-    ?line try_gbif('hd/1', [a], a),
-    ?line try_gbif('hd/1', [a, b], a),
+    try_gbif('hd/1', [a], a),
+    try_gbif('hd/1', [a, b], a),
 
-    ?line try_gbif('tl/1', [a], []),
-    ?line try_gbif('tl/1', [a, b], [b]),
-    ?line try_gbif('tl/1', [a, b, c], [b, c]),
+    try_gbif('tl/1', [a], []),
+    try_gbif('tl/1', [a, b], [b]),
+    try_gbif('tl/1', [a, b, c], [b, c]),
 
-    ?line try_gbif('size/1', {}, 0),
-    ?line try_gbif('size/1', {a}, 1),
-    ?line try_gbif('size/1', {a, b}, 2),
-    ?line try_gbif('size/1', {a, b, c}, 3),
-    ?line try_gbif('size/1', list_to_binary([]), 0),
-    ?line try_gbif('size/1', list_to_binary([1]), 1),
-    ?line try_gbif('size/1', list_to_binary([1, 2]), 2),
-    ?line try_gbif('size/1', list_to_binary([1, 2, 3]), 3),
+    try_gbif('size/1', {}, 0),
+    try_gbif('size/1', {a}, 1),
+    try_gbif('size/1', {a, b}, 2),
+    try_gbif('size/1', {a, b, c}, 3),
+    try_gbif('size/1', list_to_binary([]), 0),
+    try_gbif('size/1', list_to_binary([1]), 1),
+    try_gbif('size/1', list_to_binary([1, 2]), 2),
+    try_gbif('size/1', list_to_binary([1, 2, 3]), 3),
 
-    ?line try_gbif('bit_size/1', <<0:7>>, 7),
+    try_gbif('bit_size/1', <<0:7>>, 7),
 
-    ?line try_gbif('element/2', {x}, {1, x}),
-    ?line try_gbif('element/2', {x, y}, {1, x}),
-    ?line try_gbif('element/2', {x, y}, {2, y}),
+    try_gbif('element/2', {x}, {1, x}),
+    try_gbif('element/2', {x, y}, {1, x}),
+    try_gbif('element/2', {x, y}, {2, y}),
 
-    ?line try_gbif('self/0', 0, self()),
-    ?line try_gbif('node/0', 0, node()),
-    ?line try_gbif('node/1', self(), node()),
+    try_gbif('self/0', 0, self()),
+    try_gbif('node/0', 0, node()),
+    try_gbif('node/1', self(), node()),
 
     %% Failing use of guard bifs.
 
-    ?line try_fail_gbif('abs/1', Big, 1),
-    ?line try_fail_gbif('abs/1', [], 1),
+    try_fail_gbif('abs/1', Big, 1),
+    try_fail_gbif('abs/1', [], 1),
 
-    ?line try_fail_gbif('float/1', Big, 42),
-    ?line try_fail_gbif('float/1', [], 42),
+    try_fail_gbif('float/1', Big, 42),
+    try_fail_gbif('float/1', [], 42),
 
-    ?line try_fail_gbif('trunc/1', Float, 0.0),
-    ?line try_fail_gbif('trunc/1', [], 0.0),
+    try_fail_gbif('trunc/1', Float, 0.0),
+    try_fail_gbif('trunc/1', [], 0.0),
 
-    ?line try_fail_gbif('round/1', Float, 1.0),
-    ?line try_fail_gbif('round/1', [], a),
+    try_fail_gbif('round/1', Float, 1.0),
+    try_fail_gbif('round/1', [], a),
 
-    ?line try_fail_gbif('length/1', [], 1),
-    ?line try_fail_gbif('length/1', [a], 0),
-    ?line try_fail_gbif('length/1', a, 0),
-    ?line try_fail_gbif('length/1', {a}, 0),
+    try_fail_gbif('length/1', [], 1),
+    try_fail_gbif('length/1', [a], 0),
+    try_fail_gbif('length/1', a, 0),
+    try_fail_gbif('length/1', {a}, 0),
 
-    ?line try_fail_gbif('hd/1', [], 0),
-    ?line try_fail_gbif('hd/1', [a], x),
-    ?line try_fail_gbif('hd/1', x, x),
+    try_fail_gbif('hd/1', [], 0),
+    try_fail_gbif('hd/1', [a], x),
+    try_fail_gbif('hd/1', x, x),
 
-    ?line try_fail_gbif('tl/1', [], 0),
-    ?line try_fail_gbif('tl/1', [a], x),
-    ?line try_fail_gbif('tl/1', x, x),
+    try_fail_gbif('tl/1', [], 0),
+    try_fail_gbif('tl/1', [a], x),
+    try_fail_gbif('tl/1', x, x),
 
-    ?line try_fail_gbif('size/1', {}, 1),
-    ?line try_fail_gbif('size/1', [], 0),
-    ?line try_fail_gbif('size/1', [a], 1),
-    ?line try_fail_gbif('size/1', fun() -> 1 end, 0),
-    ?line try_fail_gbif('size/1', fun() -> 1 end, 1),
+    try_fail_gbif('size/1', {}, 1),
+    try_fail_gbif('size/1', [], 0),
+    try_fail_gbif('size/1', [a], 1),
+    try_fail_gbif('size/1', fun() -> 1 end, 0),
+    try_fail_gbif('size/1', fun() -> 1 end, 1),
 
-    ?line try_fail_gbif('element/2', {}, {1, x}),
-    ?line try_fail_gbif('element/2', {x}, {1, y}),
-    ?line try_fail_gbif('element/2', [], {1, z}),
+    try_fail_gbif('element/2', {}, {1, x}),
+    try_fail_gbif('element/2', {x}, {1, y}),
+    try_fail_gbif('element/2', [], {1, z}),
 
-    ?line try_fail_gbif('self/0', 0, list_to_pid("<0.0.0>")),
-    ?line try_fail_gbif('node/0', 0, xxxx),
-    ?line try_fail_gbif('node/1', self(), xxx),
-    ?line try_fail_gbif('node/1', yyy, xxx),
+    try_fail_gbif('self/0', 0, list_to_pid("<0.0.0>")),
+    try_fail_gbif('node/0', 0, xxxx),
+    try_fail_gbif('node/1', self(), xxx),
+    try_fail_gbif('node/1', yyy, xxx),
     ok.
 
 try_gbif(Id, X, Y) ->
@@ -415,9 +397,7 @@ try_gbif(Id, X, Y) ->
 	{Id, X, Y} ->
 	    io:format("guard_bif(~p, ~p, ~p) -- ok", [Id, X, Y]);
 	Other ->
-	    ?line ok = io:format("guard_bif(~p, ~p, ~p) -- bad result: ~p\n",
-				 [Id, X, Y, Other]),
-	    ?line test_server:fail()
+            ct:fail("guard_bif(~p, ~p, ~p) -- bad result: ~p\n", [Id, X, Y, Other])
     end.
 
 try_fail_gbif(Id, X, Y) ->
@@ -425,9 +405,7 @@ try_fail_gbif(Id, X, Y) ->
 	{'EXIT',{function_clause,[{?MODULE,guard_bif,[Id,X,Y],_}|_]}} ->
 	    io:format("guard_bif(~p, ~p, ~p) -- ok", [Id,X,Y]);
 	Other ->
-	    ?line ok = io:format("guard_bif(~p, ~p, ~p) -- bad result: ~p\n",
-				 [Id, X, Y, Other]),
-	    ?line test_server:fail()
+            ct:fail("guard_bif(~p, ~p, ~p) -- bad result: ~p\n", [Id, X, Y, Other])
     end.
 
 guard_bif('abs/1', X, Y) when abs(X) == Y ->
@@ -457,22 +435,20 @@ guard_bif('node/0', X, Y) when node() == Y ->
 guard_bif('node/1', X, Y) when node(X) == Y ->
     {'node/1', X, Y}.
 
-type_tests(doc) -> "Test the type tests.";
+%% Test the type tests.
 type_tests(Config) when is_list(Config) ->
-    ?line Types = all_types(),
-    ?line Tests = type_test_desc(),
-    ?line put(errors, 0),
-    ?line put(violations, 0),
-    ?line type_tests(Tests, Types),
-    ?line case {get(errors), get(violations)} of
+    Types = all_types(),
+    Tests = type_test_desc(),
+    put(errors, 0),
+    put(violations, 0),
+    type_tests(Tests, Types),
+    case {get(errors), get(violations)} of
 	      {0, 0} ->
 		  ok;
 	      {0, N} ->
 		  {comment, integer_to_list(N) ++ " standard violation(s)"};
 	      {Errors, Violations} ->
-		  io:format("~p sub test(s) failed, ~p violation(s)",
-			    [Errors, Violations]),
-		  ?line test_server:fail()
+		  ct:fail("~p sub test(s) failed, ~p violation(s)", [Errors, Violations])
 	  end.
 
 type_tests([{Test, AllowedTypes}| T], AllTypes) ->
@@ -499,7 +475,7 @@ type_tests(Test, [Type|T], Allowed) ->
 		when is_list(Loc) ->
 		    ok;
 		{'EXIT',Other} ->
-		    ?line test_server:fail({unexpected_error_reason,Other});
+		    ct:fail({unexpected_error_reason,Other});
 		tuple when is_function(Value) ->
 		    io:format("Standard violation: Test ~p(~p) should fail",
 			      [Test, Value]),
diff --git a/erts/emulator/test/hash_SUITE.erl b/erts/emulator/test/hash_SUITE.erl
index 2ea49467b8..be254f5543 100644
--- a/erts/emulator/test/hash_SUITE.erl
+++ b/erts/emulator/test/hash_SUITE.erl
@@ -50,7 +50,7 @@
 -define(config(A,B),config(A,B)).
 -export([config/2]).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -endif.
 
 -ifdef(debug).
@@ -70,86 +70,43 @@ config(priv_dir,_) ->
     ".".
 -else.
 %% When run in test server.
--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,
 	 test_basic/1,test_cmp/1,test_range/1,test_spread/1,
 	 test_phash2/1,otp_5292/1,bit_level_binaries/1,otp_7127/1,
-         test_hash_zero/1,
-	 end_per_testcase/2,init_per_testcase/2]).
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(test_server:minutes(10)),
-    [{watchdog, Dog}|Config].
- 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-suite() -> [{ct_hooks,[ts_install_cth]}].
+         test_hash_zero/1]).
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 10}}].
 
 all() -> 
     [test_basic, test_cmp, test_range, test_spread,
      test_phash2, otp_5292, bit_level_binaries, otp_7127,
-     test_hash_zero
-    ].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
+     test_hash_zero].
 
-test_basic(suite) ->
-    [];
-test_basic(doc) ->
-    ["Tests basic functionality of erlang:phash and that the "
-     "hashes has not changed (neither hash nor phash)"];
+%% Tests basic functionality of erlang:phash and that the
+%% hashes has not changed (neither hash nor phash)
 test_basic(Config) when is_list(Config) ->
     basic_test().
 
 
-test_cmp(suite) ->
-    [];
-test_cmp(doc) ->
-    ["Compares integer hashes made by erlang:phash with those of a reference "
-     "implementation"];
+%% Compares integer hashes made by erlang:phash with those of a reference implementation
 test_cmp(Config) when is_list(Config) ->
     cmp_test(10000).
 
-test_range(suite) ->
-    [];
-test_range(doc) ->
-    ["Tests ranges on erlang:phash from 1 to 2^32"];
+%% Tests ranges on erlang:phash from 1 to 2^32
 test_range(Config) when is_list(Config) ->
     range_test().
 
-test_spread(suite) ->
-    [];
-test_spread(doc) ->
-    ["Tests that the hashes are spread ok"];
+%% Tests that the hashes are spread ok
 test_spread(Config) when is_list(Config) ->
     spread_test(10).
 
-test_phash2(suite) ->
-    [];
-test_phash2(doc) ->
-    ["Tests phash2"];
+%% Tests phash2
 test_phash2(Config) when is_list(Config) ->
     phash2_test().
 
-otp_5292(suite) ->
-    [];
-otp_5292(doc) ->
-    ["Tests hash, phash and phash2 regarding integers."];
+%% Tests hash, phash and phash2 regarding integers.
 otp_5292(Config) when is_list(Config) ->
     otp_5292_test().
 
@@ -157,10 +114,7 @@ otp_5292(Config) when is_list(Config) ->
 bit_level_binaries(Config) when is_list(Config) ->
     bit_level_binaries_do().
 
-otp_7127(suite) ->
-    [];
-otp_7127(doc) ->
-    ["Tests phash2/1."];
+%% Tests phash2/1.
 otp_7127(Config) when is_list(Config) ->
     otp_7127_test().
 
@@ -223,11 +177,10 @@ basic_test() ->
 
 
 range_test() ->
-    random:seed(),
     F = fun(From,From,_FF) ->
 		ok;
 	   (From,To,FF) ->
-		R = random:uniform(16#FFFFFFFFFFFFFFFF),
+		R = rand:uniform(16#FFFFFFFFFFFFFFFF),
 		X = erlang:phash(R, From),
 		Y = erlang:phash(R, 16#100000000) - 1,
 		Z = (Y rem From) + 1,
@@ -265,14 +218,13 @@ spread_test(N) ->
 
 
 cmp_test(N) ->
-    % No need to save seed, the error indicates what number caused it.
-    random:seed(),
     do_cmp_hashes(N,8).
+
 do_cmp_hashes(0,_) ->
     ok;
 do_cmp_hashes(N,Steps) ->
-    R0 = random:uniform(1 bsl Steps - 1) + random:uniform(16#FFFFFFFF),
-    R = case random:uniform(2) of
+    R0 = rand:uniform(1 bsl Steps - 1) + rand:uniform(16#FFFFFFFF),
+    R = case rand:uniform(2) of
 	    1 ->
 		R0;
 	    _ ->
diff --git a/erts/emulator/test/hibernate_SUITE.erl b/erts/emulator/test/hibernate_SUITE.erl
index 4ac8c272db..45f0bdc4da 100644
--- a/erts/emulator/test/hibernate_SUITE.erl
+++ b/erts/emulator/test/hibernate_SUITE.erl
@@ -20,47 +20,25 @@
 
 -module(hibernate_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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,
 	 basic/1,dynamic_call/1,min_heap_size/1,bad_args/1,
-	 messages_in_queue/1,undefined_mfa/1,no_heap/1,wake_up_and_bif_trap/1]).
+	 messages_in_queue/1,undefined_mfa/1,no_heap/1,
+         wake_up_and_bif_trap/1]).
 
 %% Used by test cases.
--export([basic_hibernator/1,dynamic_call_hibernator/2,messages_in_queue_restart/2, no_heap_loop/0,characters_to_list_trap/1]).
+-export([basic_hibernator/1,dynamic_call_hibernator/2,messages_in_queue_restart/2,
+         no_heap_loop/0,characters_to_list_trap/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 3}}].
 
 all() -> 
     [basic, dynamic_call, min_heap_size, bad_args, messages_in_queue,
      undefined_mfa, no_heap, wake_up_and_bif_trap].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(3)),
-    [{watchdog,Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
 %%%
 %%% Testing the basic functionality of erlang:hibernate/3.
 %%%
@@ -69,9 +47,9 @@ basic(Config) when is_list(Config) ->
     Ref = make_ref(),
     Info = {self(),Ref},
     ExpectedHeapSz = erts_debug:size([Info]),
-    ?line Child = spawn_link(fun() -> basic_hibernator(Info) end),
-    ?line hibernate_wake_up(100, ExpectedHeapSz, Child),
-    ?line Child ! please_quit_now,
+    Child = spawn_link(fun() -> basic_hibernator(Info) end),
+    hibernate_wake_up(100, ExpectedHeapSz, Child),
+    Child ! please_quit_now,
     ok.
 
 hibernate_wake_up(0, _, _) -> ok;
@@ -85,35 +63,35 @@ hibernate_wake_up(N, ExpectedHeapSz, Child) ->
 	    end;
 	1 -> ok
     end,
-    ?line Child ! {hibernate,self()},
-    ?line wait_until(fun () ->
+    Child ! {hibernate,self()},
+    wait_until(fun () ->
 			     {current_function,{erlang,hibernate,3}} ==
 				 process_info(Child, current_function)
 		     end),
-    ?line {message_queue_len,0} = process_info(Child, message_queue_len),
-    ?line {status,waiting} = process_info(Child, status),
-    ?line {heap_size,ExpectedHeapSz} = process_info(Child, heap_size),
+    {message_queue_len,0} = process_info(Child, message_queue_len),
+    {status,waiting} = process_info(Child, status),
+    {heap_size,ExpectedHeapSz} = process_info(Child, heap_size),
     io:format("Before hibernation: ~p  After hibernation: ~p\n",
 	      [Before,ExpectedHeapSz]),
-    ?line Child ! {whats_up,self()},
-    ?line receive
-	      {all_fine,X,Child,_Ref} ->
-		  if
-		      N =:= 1 -> io:format("~p\n", [X]);
-		      true -> ok
-		  end,
-		  {backtrace,Bin} = process_info(Child, backtrace),
-		  if
-		      size(Bin) > 1000 ->
-			  io:format("~s\n", [binary_to_list(Bin)]),
-			  ?line ?t:fail(stack_is_growing);
-		      true ->
-			  hibernate_wake_up(N-1, ExpectedHeapSz, Child)
-		  end;
-	      Other ->
-		  ?line io:format("~p\n", [Other]),
-		  ?line ?t:fail(unexpected_message)
-	  end.
+    Child ! {whats_up,self()},
+    receive
+        {all_fine,X,Child,_Ref} ->
+            if
+                N =:= 1 -> io:format("~p\n", [X]);
+                true -> ok
+            end,
+            {backtrace,Bin} = process_info(Child, backtrace),
+            if
+                size(Bin) > 1000 ->
+                    io:format("~s\n", [binary_to_list(Bin)]),
+                    ct:fail(stack_is_growing);
+                true ->
+                    hibernate_wake_up(N-1, ExpectedHeapSz, Child)
+            end;
+        Other ->
+            io:format("~p\n", [Other]),
+            ct:fail(unexpected_message)
+    end.
 
 basic_hibernator(Info) ->
     {catchlevel,0} = process_info(self(), catchlevel),
@@ -165,9 +143,9 @@ dynamic_call(Config) when is_list(Config) ->
     Ref = make_ref(),
     Info = {self(),Ref},
     ExpectedHeapSz = erts_debug:size([Info]),
-    ?line Child = spawn_link(fun() -> ?MODULE:dynamic_call_hibernator(Info, hibernate) end),
-    ?line hibernate_wake_up(100, ExpectedHeapSz, Child),
-    ?line Child ! please_quit_now,
+    Child = spawn_link(fun() -> ?MODULE:dynamic_call_hibernator(Info, hibernate) end),
+    hibernate_wake_up(100, ExpectedHeapSz, Child),
+    Child ! please_quit_now,
     ok.
 
 dynamic_call_hibernator(Info, Function) ->
@@ -195,34 +173,32 @@ min_heap_size(Config) when is_list(Config) ->
     end.
 
 min_heap_size_1(Config) when is_list(Config) ->
-    ?line erlang:trace(new, true, [call]),
+    erlang:trace(new, true, [call]),
     MFA = {?MODULE,min_hibernator,1},
-    ?line 1 = erlang:trace_pattern(MFA, true, [local]),
+    1 = erlang:trace_pattern(MFA, true, [local]),
     Ref = make_ref(),
     Info = {self(),Ref},
-    ?line Child = spawn_opt(fun() -> min_hibernator(Info) end,
+    Child = spawn_opt(fun() -> min_hibernator(Info) end,
 			    [{min_heap_size,15000},link]),
     receive
-	{trace,Child,call,{?MODULE,min_hibernator,_}} ->
-	    ?line 1 = erlang:trace_pattern(MFA, false, [local]),
-	    ?line erlang:trace(new, false, [call])
+        {trace,Child,call,{?MODULE,min_hibernator,_}} ->
+            1 = erlang:trace_pattern(MFA, false, [local]),
+            erlang:trace(new, false, [call])
     end,
     {heap_size,HeapSz} = process_info(Child, heap_size),
     io:format("Heap size: ~p\n", [HeapSz]),
-    ?line if
-	      HeapSz < 20 -> ok
-	  end,
-    ?line Child ! wake_up,
+    if
+        HeapSz < 20 -> ok
+    end,
+    Child ! wake_up,
     receive
 	{heap_size,AfterSize} ->
 	    io:format("Heap size after wakeup: ~p\n", [AfterSize]),
-	    ?line
-		if
-		    AfterSize >= 15000 -> ok
-		end;
+            if
+                AfterSize >= 15000 -> ok
+            end;
 	Other ->
-	    io:format("Unexpected: ~p\n", [Other]),
-	    ?line ?t:fail()
+	    ct:fail("Unexpected: ~p\n", [Other])
     end.
 
 min_hibernator({Parent,_Ref}) ->
@@ -239,23 +215,23 @@ min_hibernator_recv(Parent) ->
 %%%
 
 bad_args(Config) when is_list(Config) ->
-    ?line bad_args(?MODULE, {name,glurf}, [0]),
-    ?line {'EXIT',{system_limit,_}} = 
+    bad_args(?MODULE, {name,glurf}, [0]),
+    {'EXIT',{system_limit,_}} = 
 	(catch erlang:hibernate(x, y, lists:duplicate(5122, xxx))),
-    ?line bad_args(42, name, [0]),
-    ?line bad_args(xx, 42, [1]),
-    ?line bad_args(xx, 42, glurf),
-    ?line bad_args(xx, 42, {}),
-    ?line bad_args({}, name, [2]),
-    ?line bad_args({1}, name,  [3]),
-    ?line bad_args({1,2,3}, name, [4]),
-    ?line bad_args({1,2,3}, name, [5]),
-    ?line bad_args({1,2,3,4}, name, [6]),
-    ?line bad_args({1,2,3,4,5,6}, name,[7]),
-    ?line bad_args({1,2,3,4,5}, name, [8]),
-    ?line bad_args({1,2}, name, [9]),
-    ?line bad_args([1,2], name, [9]),
-    ?line bad_args(55.0, name, [9]),
+    bad_args(42, name, [0]),
+    bad_args(xx, 42, [1]),
+    bad_args(xx, 42, glurf),
+    bad_args(xx, 42, {}),
+    bad_args({}, name, [2]),
+    bad_args({1}, name,  [3]),
+    bad_args({1,2,3}, name, [4]),
+    bad_args({1,2,3}, name, [5]),
+    bad_args({1,2,3,4}, name, [6]),
+    bad_args({1,2,3,4,5,6}, name,[7]),
+    bad_args({1,2,3,4,5}, name, [8]),
+    bad_args({1,2}, name, [9]),
+    bad_args([1,2], name, [9]),
+    bad_args(55.0, name, [9]),
     ok.
 
 bad_args(Mod, Name, Args) ->
@@ -266,7 +242,7 @@ bad_args(Mod, Name, Args) ->
 	    io:format("erlang:hibernate(~p, ~p, ~p) -> ~p\n", [Mod,Name,Args,Res]);
 	Other ->
 	    io:format("erlang:hibernate(~p, ~p, ~p) -> ~p\n", [Mod,Name,Args,Res]),
-	    ?t:fail({bad_result,Other})
+	    ct:fail({bad_result,Other})
     end.
 
 
@@ -283,8 +259,8 @@ messages_in_queue(Config) when is_list(Config) ->
     receive
 	done -> ok;
 	Other ->
-	    ?line io:format("~p\n", [Other]),
-	    ?line ?t:fail(unexpected_message)
+	    io:format("~p\n", [Other]),
+	    ct:fail(unexpected_message)
     end.
 
 messages_in_queue_1(Parent, ExpectedMsg) ->
@@ -296,13 +272,13 @@ messages_in_queue_1(Parent, ExpectedMsg) ->
 		     [Parent,ExpectedMsg]).
 
 messages_in_queue_restart(Parent, ExpectedMessage) ->
-    ?line receive
-	      ExpectedMessage ->
-		  Parent ! done;
-	      Other ->
-		  io:format("~p\n", [Other]),
-		  ?t:fail(unexpected_message)
-	  end,
+    receive
+        ExpectedMessage ->
+            Parent ! done;
+        Other ->
+            io:format("~p\n", [Other]),
+            ct:fail(unexpected_message)
+    end,
     ok.
 
 
@@ -312,36 +288,36 @@ messages_in_queue_restart(Parent, ExpectedMessage) ->
 %%%
 
 undefined_mfa(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line Pid = spawn_link(fun() ->
+    process_flag(trap_exit, true),
+    Pid = spawn_link(fun() ->
 				   %% Will be a call_only instruction.
 				   erlang:hibernate(?MODULE, blarf, []) end),
-    ?line Pid ! {a,message},
-    ?line receive
-	      {'EXIT',Pid,{undef,Undef}} ->
-		  io:format("~p\n", [Undef]),
-		  ok;
-	      Other ->
-		  ?line io:format("~p\n", [Other]),
-		  ?line ?t:fail(unexpected_message)
-	  end,
+    Pid ! {a,message},
+    receive
+        {'EXIT',Pid,{undef,Undef}} ->
+            io:format("~p\n", [Undef]),
+            ok;
+        Other ->
+            io:format("~p\n", [Other]),
+            ct:fail(unexpected_message)
+    end,
     undefined_mfa_1().
 
 undefined_mfa_1() ->
-    ?line Pid = spawn_link(fun() ->
+    Pid = spawn_link(fun() ->
 				   %% Force a call_last instruction by calling bar()
 				   %% (if that is not obvious).
 				   bar(),
 				   erlang:hibernate(?MODULE, blarf, [])
 			   end),
-    ?line Pid ! {another,message},
-    ?line receive
+    Pid ! {another,message},
+    receive
 	      {'EXIT',Pid,{undef,Undef}} ->
 		  io:format("~p\n", [Undef]),
 		  ok;
 	      Other ->
-		  ?line io:format("~p\n", [Other]),
-		  ?line ?t:fail(unexpected_message)
+		  io:format("~p\n", [Other]),
+		  ct:fail(unexpected_message)
 	  end,
     ok.
 
@@ -352,23 +328,17 @@ bar() ->
 %% No heap
 %%
 
-no_heap(doc) -> [];
-no_heap(suite) -> [];
 no_heap(Config) when is_list(Config) ->
-    ?line H = spawn_link(fun () -> clean_dict(), no_heap_loop() end),
-    ?line lists:foreach(fun (_) ->
-				wait_until(fun () -> is_hibernated(H) end),
-				?line [{heap_size,1},
-				       {total_heap_size,1}]
-				    = process_info(H,
-						   [heap_size,
-						    total_heap_size]),
-				receive after 10 -> ok end,
-				H ! again
-			end,
-			lists:seq(1, 100)),
-    ?line unlink(H),
-    ?line exit(H, bye).
+    H = spawn_link(fun () -> clean_dict(), no_heap_loop() end),
+    lists:foreach(fun (_) ->
+                          wait_until(fun () -> is_hibernated(H) end),
+                          [{heap_size,1}, {total_heap_size,1}]
+                              = process_info(H, [heap_size, total_heap_size]),
+                          receive after 10 -> ok end,
+                          H ! again
+                  end, lists:seq(1, 100)),
+    unlink(H),
+    exit(H, bye).
 
 no_heap_loop() ->
     flush(),
@@ -382,19 +352,17 @@ clean_dict() ->
 %% Wake up and then immediatly bif trap with a lengthy computation.
 %%
 
-wake_up_and_bif_trap(doc) -> [];
-wake_up_and_bif_trap(suite) -> [];
 wake_up_and_bif_trap(Config) when is_list(Config) ->
-    ?line Self = self(),
-    ?line Pid = spawn_link(fun() -> erlang:hibernate(?MODULE, characters_to_list_trap, [Self]) end),
-    ?line Pid ! wakeup,
-    ?line receive
+    Self = self(),
+    Pid = spawn_link(fun() -> erlang:hibernate(?MODULE, characters_to_list_trap, [Self]) end),
+    Pid ! wakeup,
+    receive
         {ok, Pid0} when Pid0 =:= Pid -> ok
     after 5000 ->
-        ?line ?t:fail(process_blocked)
+        ct:fail(process_blocked)
     end,
-    ?line unlink(Pid),
-    ?line exit(Pid, bye).
+    unlink(Pid),
+    exit(Pid, bye).
 
 %% Lengthy computation that traps (in characters_to_list_trap_3).
 characters_to_list_trap(Parent) ->
diff --git a/erts/emulator/test/ignore_cores.erl b/erts/emulator/test/ignore_cores.erl
index 13f34cd10f..da6f6850c6 100644
--- a/erts/emulator/test/ignore_cores.erl
+++ b/erts/emulator/test/ignore_cores.erl
@@ -28,7 +28,7 @@
 
 -module(ignore_cores).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([init/1, fini/1, setup/3, setup/4, restore/1, dir/1]).
 
@@ -53,7 +53,7 @@ init(Config) ->
 fini(Config) ->
     #ignore_cores{org_cwd = OrgCWD,
 		  org_path = OrgPath,
-		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+		  org_pwd_env = OrgPWD} = proplists:get_value(ignore_cores, Config),
     ok = file:set_cwd(OrgCWD),
     true = code:set_path(OrgPath),
     case OrgPWD of
@@ -70,10 +70,10 @@ setup(Suite, Testcase, Config, SetCwd) when is_atom(Suite),
                                             is_list(Config) ->
     #ignore_cores{org_cwd = OrgCWD,
 		  org_path = OrgPath,
-		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+		  org_pwd_env = OrgPWD} = proplists:get_value(ignore_cores, Config),
     Path = lists:map(fun (".") -> OrgCWD; (Dir) -> Dir end, OrgPath),
     true = code:set_path(Path),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     IgnDir = filename:join([PrivDir,
 			 atom_to_list(Suite)
 			 ++ "_"
@@ -94,7 +94,7 @@ setup(Suite, Testcase, Config, SetCwd) when is_atom(Suite),
     end,
     ok = file:write_file(filename:join([IgnDir, "ignore_core_files"]), <<>>),
     %% cores are dumped in /cores on MacOS X
-    CoresDir = case {?t:os_type(), filelib:is_dir("/cores")} of
+    CoresDir = case {os:type(), filelib:is_dir("/cores")} of
 		   {{unix,darwin}, true} ->
 		       filelib:fold_files("/cores",
 					  "^core.*$",
@@ -119,7 +119,7 @@ restore(Config) ->
 		  org_path = OrgPath,
 		  org_pwd_env = OrgPWD,
 		  ign_dir = IgnDir,
-		  cores_dir = CoresDir} = ?config(ignore_cores, Config),
+		  cores_dir = CoresDir} = proplists:get_value(ignore_cores, Config),
     try
 	case CoresDir of
 	    false ->
@@ -155,5 +155,5 @@ restore(Config) ->
 
 
 dir(Config) ->
-    #ignore_cores{ign_dir = Dir} = ?config(ignore_cores, Config),
+    #ignore_cores{ign_dir = Dir} = proplists:get_value(ignore_cores, Config),
     Dir.
diff --git a/erts/emulator/test/list_bif_SUITE.erl b/erts/emulator/test/list_bif_SUITE.erl
index 9e930822cf..1f64a6a8e5 100644
--- a/erts/emulator/test/list_bif_SUITE.erl
+++ b/erts/emulator/test/list_bif_SUITE.erl
@@ -19,149 +19,108 @@
 %%
 
 -module(list_bif_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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]).
 -export([hd_test/1,tl_test/1,t_length/1,t_list_to_pid/1,
 	 t_list_to_float/1,t_list_to_integer/1]).
 
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
+
 
 all() -> 
     [hd_test, tl_test, t_length, t_list_to_pid,
      t_list_to_float, t_list_to_integer].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(_Case, Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
-    [{watchdog,Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-t_list_to_integer(suite) ->
-    [];
-t_list_to_integer(doc) ->
-    ["tests list_to_integer and string:to_integer"];
+%% Tests list_to_integer and string:to_integer
 t_list_to_integer(Config) when is_list(Config) ->
-    ?line {'EXIT',{badarg,_}} = (catch list_to_integer("12373281903728109372810937209817320981321ABC")),
-    ?line 12373281903728109372810937209817320981321 = (catch list_to_integer("12373281903728109372810937209817320981321")),
-    ?line 12373 = (catch list_to_integer("12373")),
-    ?line -12373 =  (catch list_to_integer("-12373")),
-    ?line 12373 = (catch list_to_integer("+12373")),
-    ?line {'EXIT',{badarg,_}} = ( catch list_to_integer(abc)),
-    ?line {'EXIT',{badarg,_}} = (catch list_to_integer("")),
-    ?line {12373281903728109372810937209817320981321,"ABC"} = string:to_integer("12373281903728109372810937209817320981321ABC"),
-    ?line {-12373281903728109372810937209817320981321,"ABC"} = string:to_integer("-12373281903728109372810937209817320981321ABC"),
-    ?line {12,[345]} = string:to_integer([$1,$2,345]),
-    ?line {12,[a]} = string:to_integer([$1,$2,a]),
-    ?line {error,no_integer} = string:to_integer([$A]),
-    ?line {error,not_a_list} = string:to_integer($A),
+    {'EXIT',{badarg,_}} = (catch list_to_integer("12373281903728109372810937209817320981321ABC")),
+    12373281903728109372810937209817320981321 = (catch list_to_integer("12373281903728109372810937209817320981321")),
+    12373 = (catch list_to_integer("12373")),
+    -12373 =  (catch list_to_integer("-12373")),
+    12373 = (catch list_to_integer("+12373")),
+    {'EXIT',{badarg,_}} = ( catch list_to_integer(abc)),
+    {'EXIT',{badarg,_}} = (catch list_to_integer("")),
+    {12373281903728109372810937209817320981321,"ABC"} = string:to_integer("12373281903728109372810937209817320981321ABC"),
+    {-12373281903728109372810937209817320981321,"ABC"} = string:to_integer("-12373281903728109372810937209817320981321ABC"),
+    {12,[345]} = string:to_integer([$1,$2,345]),
+    {12,[a]} = string:to_integer([$1,$2,a]),
+    {error,no_integer} = string:to_integer([$A]),
+    {error,not_a_list} = string:to_integer($A),
     ok.
 
 %% Test hd/1 with correct and incorrect arguments.
 hd_test(Config) when is_list(Config) ->
-    ?line $h = hd(id("hejsan")),
-    ?line case catch hd(id($h)) of
-	      {'EXIT', {badarg, _}} -> ok;
-	      Res ->
-		  Str=io_lib:format("hd/1 with incorrect args "++
-				    "succeeded.~nResult: ~p", [Res]),
-		  test_server:fail(Str)
-	  end,
+    $h = hd(id("hejsan")),
+    case catch hd(id($h)) of
+        {'EXIT', {badarg, _}} -> ok;
+        Res ->
+            ct:fail("hd/1 with incorrect args succeeded.~nResult: ~p", [Res])
+    end,
     ok.
 
 
 %% Test tl/1 with correct and incorrect arguments.
 tl_test(Config) when is_list(Config) ->
-    ?line "ejsan" = tl(id("hejsan")),
-    ?line case catch tl(id(104)) of
-	      {'EXIT', {badarg, _}} ->
-		  ok;
-	      Res ->
-		  Str=io_lib:format("tl/1 with incorrect args "++
-				   "succeeded.~nResult: ~p", [Res]),
-		  test_server:fail(Str)
-	  end,
+    "ejsan" = tl(id("hejsan")),
+    case catch tl(id(104)) of
+        {'EXIT', {badarg, _}} ->
+            ok;
+        Res ->
+            ct:fail("tl/1 with incorrect args succeeded.~nResult: ~p", [Res])
+    end,
     ok.
 
 
 %% Test length/1 with correct and incorrect arguments.
 
 t_length(Config) when is_list(Config) ->
-    ?line 0 = length(""),
-    ?line 0 = length([]),
-    ?line 1 = length([1]),
-    ?line 2 = length([1,a]),
-    ?line 2 = length("ab"),
-    ?line 3 = length("abc"),
-    ?line 4 = length(id([x|"abc"])),
-    ?line 6 = length("hejsan"),
-    ?line {'EXIT',{badarg,_}} = (catch length(id([a,b|c]))),
-    ?line case catch length({tuple}) of
-	      {'EXIT', {badarg, _}} ->
-		  ok;
-	      Res ->
-		  Str = io_lib:format("length/1 with incorrect args "++
-				      "succeeded.~nResult: ~p", [Res]),
-		  ?line test_server:fail(Str)
-	  end,
+    0 = length(""),
+    0 = length([]),
+    1 = length([1]),
+    2 = length([1,a]),
+    2 = length("ab"),
+    3 = length("abc"),
+    4 = length(id([x|"abc"])),
+    6 = length("hejsan"),
+    {'EXIT',{badarg,_}} = (catch length(id([a,b|c]))),
+    case catch length({tuple}) of
+        {'EXIT', {badarg, _}} ->
+            ok;
+        Res ->
+            ct:fail("length/1 with incorrect args succeeded.~nResult: ~p", [Res])
+    end,
     ok.
 	      
 
 %% Test list_to_pid/1 with correct and incorrect arguments.
 
 t_list_to_pid(Config) when is_list(Config) ->
-    ?line Me = self(),
-    ?line MyListedPid = pid_to_list(Me),
-    ?line Me = list_to_pid(MyListedPid),
-    ?line case catch list_to_pid(id("Incorrect list")) of
-	      {'EXIT', {badarg, _}} ->
-		  ok;
-	      Res ->
-		  Str=io_lib:format("list_to_pid/1 with incorrect "++
-				   "arg succeeded.~nResult: ~p",
-				    [Res]),
-		  test_server:fail(Str)
-	  end,
+    Me = self(),
+    MyListedPid = pid_to_list(Me),
+    Me = list_to_pid(MyListedPid),
+    case catch list_to_pid(id("Incorrect list")) of
+        {'EXIT', {badarg, _}} ->
+            ok;
+        Res ->
+            ct:fail("list_to_pid/1 with incorrect arg succeeded.~nResult: ~p", [Res])
+    end,
     ok.
 
 
 %% Test list_to_float/1 with correct and incorrect arguments.
 
 t_list_to_float(Config) when is_list(Config) ->
-    ?line 5.89000 = list_to_float(id("5.89")),
-    ?line 5.89898 = list_to_float(id("5.89898")),
-    ?line case catch list_to_float(id("58")) of
-	      {'EXIT', {badarg, _}} -> ok;
-	      Res ->
-		  Str=io_lib:format("list_to_float with incorrect "++
-				   "arg succeeded.~nResult: ~p",
-				    [Res]),
-		  test_server:fail(Str)
-	  end,
+    5.89000 = list_to_float(id("5.89")),
+    5.89898 = list_to_float(id("5.89898")),
+    case catch list_to_float(id("58")) of
+        {'EXIT', {badarg, _}} -> ok;
+        Res ->
+            ct:fail("list_to_float with incorrect arg succeeded.~nResult: ~p", [Res])
+    end,
     ok.
 
 id(I) -> I.
-
-    
diff --git a/erts/emulator/test/lttng_SUITE.erl b/erts/emulator/test/lttng_SUITE.erl
new file mode 100644
index 0000000000..d0f6292d5b
--- /dev/null
+++ b/erts/emulator/test/lttng_SUITE.erl
@@ -0,0 +1,499 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1999-2011. 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%
+%%
+
+-module(lttng_SUITE).
+
+-export([all/0, suite/0]).
+-export([init_per_suite/1, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+-export([t_lttng_list/1,
+         t_carrier_pool/1,
+         t_memory_carrier/1,
+         t_async_io_pool/1,
+         t_driver_control_ready_async/1,
+         t_driver_start_stop/1,
+         t_driver_ready_input_output/1,
+         t_driver_timeout/1,
+         t_driver_caller/1,
+         t_driver_flush/1,
+         t_scheduler_poll/1]).
+
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 10}}].
+
+all() -> 
+    [t_lttng_list,
+     t_carrier_pool,
+     t_async_io_pool,
+     t_driver_start_stop,
+     t_driver_ready_input_output,
+     t_driver_control_ready_async,
+     t_driver_timeout,
+     t_driver_caller,
+     t_driver_flush,
+     t_scheduler_poll,
+     t_memory_carrier].
+
+
+init_per_suite(Config) ->
+    case erlang:system_info(dynamic_trace) of
+        lttng ->
+            ensure_lttng_stopped("--all"),
+            Config;
+        _ ->
+            {skip, "No LTTng configured on system."}
+    end.
+
+end_per_suite(_Config) ->
+    ensure_lttng_stopped("--all"),
+    ok.
+
+init_per_testcase(Case, Config) ->
+    Name = atom_to_list(Case),
+    ok = ensure_lttng_started(Name, Config),
+    [{session, Name}|Config].
+
+end_per_testcase(Case, _Config) ->
+    Name = atom_to_list(Case),
+    ok = ensure_lttng_stopped(Name),
+    ok.
+
+%% Not tested yet
+%%   com_ericsson_otp:driver_process_exit
+%%   com_ericsson_otp:driver_event
+
+%% tracepoints
+%%
+%%   com_ericsson_otp:carrier_pool_get
+%%   com_ericsson_otp:carrier_pool_put
+%%   com_ericsson_otp:carrier_destroy
+%%   com_ericsson_otp:carrier_create
+%%   com_ericsson_otp:aio_pool_add 
+%%   com_ericsson_otp:aio_pool_get 
+%%   com_ericsson_otp:driver_control
+%%   com_ericsson_otp:driver_call
+%%   com_ericsson_otp:driver_finish
+%%   com_ericsson_otp:driver_ready_async
+%%   com_ericsson_otp:driver_process_exit
+%%   com_ericsson_otp:driver_stop
+%%   com_ericsson_otp:driver_flush
+%%   com_ericsson_otp:driver_stop_select
+%%   com_ericsson_otp:driver_timeout
+%%   com_ericsson_otp:driver_event
+%%   com_ericsson_otp:driver_ready_output
+%%   com_ericsson_otp:driver_ready_input
+%%   com_ericsson_otp:driver_output
+%%   com_ericsson_otp:driver_outputv
+%%   com_ericsson_otp:driver_init
+%%   com_ericsson_otp:driver_start
+%%   com_ericsson_otp:scheduler_poll
+
+%%
+%% Testcases
+%%
+
+t_lttng_list(_Config) ->
+    {ok, _} = cmd("lttng list -u"),
+    ok.
+
+%% com_ericsson_otp:carrier_pool_get
+%% com_ericsson_otp:carrier_pool_put
+t_carrier_pool(Config) ->
+    case have_carriers() of
+        false ->
+            {skip, "No Memory Carriers configured on system."};
+        true ->
+            ok = lttng_start_event("com_ericsson_otp:carrier_pool*", Config),
+
+            ok = ets_load(),
+
+            Res = lttng_stop_and_view(Config),
+            ok = check_tracepoint("com_ericsson_otp:carrier_pool_get", Res),
+            ok = check_tracepoint("com_ericsson_otp:carrier_pool_put", Res),
+            ok
+    end.
+
+%% com_ericsson_otp:carrier_destroy
+%% com_ericsson_otp:carrier_create
+t_memory_carrier(Config) ->
+    case have_carriers() of
+        false ->
+            {skip, "No Memory Carriers configured on system."};
+        true ->
+            ok = lttng_start_event("com_ericsson_otp:carrier_*", Config),
+
+            ok = ets_load(),
+
+            Res = lttng_stop_and_view(Config),
+            ok = check_tracepoint("com_ericsson_otp:carrier_destroy", Res),
+            ok = check_tracepoint("com_ericsson_otp:carrier_create", Res),
+            ok
+    end.
+
+%% com_ericsson_otp:aio_pool_add
+%% com_ericsson_otp:aio_pool_get
+t_async_io_pool(Config) ->
+    case have_async_threads() of
+        false ->
+            {skip, "No Async Threads configured on system."};
+        true ->
+            ok = lttng_start_event("com_ericsson_otp:aio_pool_*", Config),
+
+            Path1 = proplists:get_value(priv_dir, Config),
+            {ok, [[Path2]]} = init:get_argument(home),
+            {ok, _} = file:list_dir(Path1),
+            {ok, _} = file:list_dir(Path2),
+            {ok, _} = file:list_dir(Path1),
+            {ok, _} = file:list_dir(Path2),
+
+            Res = lttng_stop_and_view(Config),
+            ok = check_tracepoint("com_ericsson_otp:aio_pool_add", Res),
+            ok = check_tracepoint("com_ericsson_otp:aio_pool_get", Res),
+            ok
+    end.
+
+
+%% com_ericsson_otp:driver_start
+%% com_ericsson_otp:driver_stop
+t_driver_start_stop(Config) ->
+    ok = lttng_start_event("com_ericsson_otp:driver_*", Config),
+    Path = proplists:get_value(priv_dir, Config),
+    Name = filename:join(Path, "sometext.txt"),
+    Bin  = txt(),
+    ok = file:write_file(Name, Bin),
+    {ok, Bin} = file:read_file(Name),
+    Res = lttng_stop_and_view(Config),
+    ok = check_tracepoint("com_ericsson_otp:driver_start", Res),
+    ok = check_tracepoint("com_ericsson_otp:driver_stop", Res),
+    ok = check_tracepoint("com_ericsson_otp:driver_control", Res),
+    ok = check_tracepoint("com_ericsson_otp:driver_outputv", Res),
+    ok = check_tracepoint("com_ericsson_otp:driver_ready_async", Res),
+    ok.
+
+%% com_ericsson_otp:driver_control
+%% com_ericsson_otp:driver_outputv
+%% com_ericsson_otp:driver_ready_async
+t_driver_control_ready_async(Config) ->
+    ok = lttng_start_event("com_ericsson_otp:driver_control", Config),
+    ok = lttng_start_event("com_ericsson_otp:driver_outputv", Config),
+    ok = lttng_start_event("com_ericsson_otp:driver_ready_async", Config),
+    Path = proplists:get_value(priv_dir, Config),
+    Name = filename:join(Path, "sometext.txt"),
+    Bin  = txt(),
+    ok = file:write_file(Name, Bin),
+    {ok, Bin} = file:read_file(Name),
+    Res = lttng_stop_and_view(Config),
+    ok = check_tracepoint("com_ericsson_otp:driver_control", Res),
+    ok = check_tracepoint("com_ericsson_otp:driver_outputv", Res),
+    ok = check_tracepoint("com_ericsson_otp:driver_ready_async", Res),
+    ok.
+
+%% com_ericsson_otp:driver_ready_input
+%% com_ericsson_otp:driver_ready_output
+t_driver_ready_input_output(Config) ->
+    ok = lttng_start_event("com_ericsson_otp:driver_ready_*", Config),
+    Me = self(),
+    Pid = spawn_link(fun() -> tcp_server(Me, active) end),
+    receive {Pid, accept} -> ok end,
+    Bin = txt(),
+    Sz  = byte_size(Bin),
+
+    {ok, Sock} = gen_tcp:connect("localhost", 5679, [binary, {packet, 2}]),
+    ok = gen_tcp:send(Sock, <<Sz:16, Bin/binary>>),
+    ok = gen_tcp:send(Sock, <<Sz:16, Bin/binary>>),
+    ok = gen_tcp:close(Sock),
+    receive {Pid, done} -> ok end,
+
+    Res = lttng_stop_and_view(Config),
+    ok = check_tracepoint("com_ericsson_otp:driver_ready_input", Res),
+    ok = check_tracepoint("com_ericsson_otp:driver_ready_output", Res),
+    ok.
+
+
+%% com_ericsson_otp:driver_stop_select
+%% com_ericsson_otp:driver_timeout
+t_driver_timeout(Config) ->
+    ok = lttng_start_event("com_ericsson_otp:driver_*", Config),
+    Me = self(),
+    Pid = spawn_link(fun() -> tcp_server(Me, timeout) end),
+    receive {Pid, accept} -> ok end,
+    {ok, Sock} = gen_tcp:connect("localhost", 5679, [binary]),
+    ok = gen_tcp:send(Sock, <<"hej">>),
+    receive {Pid, done} -> ok end,
+    ok = gen_tcp:close(Sock),
+    Res = lttng_stop_and_view(Config),
+    ok = check_tracepoint("com_ericsson_otp:driver_timeout", Res),
+    ok = check_tracepoint("com_ericsson_otp:driver_stop_select", Res),
+    ok.
+ 
+%% com_ericsson_otp:driver_call
+%% com_ericsson_otp:driver_output
+%% com_ericsson_otp:driver_init
+%% com_ericsson_otp:driver_finish
+t_driver_caller(Config) ->
+    ok = lttng_start_event("com_ericsson_otp:driver_*", Config),
+
+    Drv = 'caller_drv',
+    os:putenv("CALLER_DRV_USE_OUTPUTV", "false"),
+    
+    ok = load_driver(proplists:get_value(data_dir, Config), Drv),
+    Port = open_port({spawn, Drv}, []),
+    true = is_port(Port),
+
+    chk_caller(Port, start, self()),
+    chk_caller(Port, output, spawn_link(fun() ->
+                                                port_command(Port, "")
+                                        end)),
+    Port ! {self(), {command, ""}},
+    chk_caller(Port, output, self()),
+    chk_caller(Port, control, spawn_link(fun () ->
+                                                 port_control(Port, 0, "")
+                                         end)),
+    chk_caller(Port, call, spawn_link(fun() ->
+                                              erlang:port_call(Port, 0, "")
+                                      end)),
+ 
+    true = port_close(Port),
+    erl_ddll:unload_driver(Drv),
+
+    Res = lttng_stop_and_view(Config),
+    ok = check_tracepoint("com_ericsson_otp:driver_call", Res),
+    ok = check_tracepoint("com_ericsson_otp:driver_output", Res),
+    ok = check_tracepoint("com_ericsson_otp:driver_init", Res),
+    ok = check_tracepoint("com_ericsson_otp:driver_finish", Res),
+    ok.
+ 
+%% com_ericsson_otp:scheduler_poll
+t_scheduler_poll(Config) ->
+    ok = lttng_start_event("com_ericsson_otp:scheduler_poll", Config),
+
+    ok = memory_load(),
+
+    Res = lttng_stop_and_view(Config),
+    ok = check_tracepoint("com_ericsson_otp:scheduler_poll", Res),
+    ok.
+
+%% com_ericsson_otp:driver_flush
+t_driver_flush(Config) ->
+    ok = lttng_start_event("com_ericsson_otp:driver_flush", Config),
+
+    Me = self(),
+    Pid = spawn_link(fun() -> tcp_server(Me, passive_no_read) end),
+    receive {Pid, accept} -> ok end,
+    Bin = iolist_to_binary([txt() || _ <- lists:seq(1,100)]),
+    Sz  = byte_size(Bin),
+
+    %% We want to create a scenario where sendings stalls and we
+    %% queue packets in the driver.
+    %% When we close the socket it has to flush the queue.
+    {ok, Sock} = gen_tcp:connect("localhost", 5679, [binary, {packet, 2},
+                                                     {send_timeout, 10},
+                                                     {sndbuf, 10000000}]),
+    Pids = [spawn_link(fun() ->
+                               gen_tcp:send(Sock, <<Sz:16, Bin/binary>>),
+                               Me ! {self(), ok}
+                       end) || _ <- lists:seq(1,100)],
+    [receive {P, ok} -> ok end || P <- Pids],
+    ok = gen_tcp:close(Sock),
+    Pid ! die,
+    receive {Pid, done} -> ok end,
+
+    Res = lttng_stop_and_view(Config),
+    ok = check_tracepoint("com_ericsson_otp:driver_flush", Res),
+    ok.
+
+%%
+%% AUX
+%%
+
+chk_caller(Port, Callback, ExpectedCaller) ->
+    receive
+        {caller, Port, Callback, Caller} ->
+            ExpectedCaller = Caller
+    end.
+
+
+ets_load() ->
+    Tid = ets:new(ets_load, [public,set]),
+    N = erlang:system_info(schedulers_online),
+    Pids = [spawn_link(fun() -> ets_shuffle(Tid) end) || _ <- lists:seq(1,N)],
+    ok = ets_kill(Pids, 500),
+    ok.
+
+
+ets_kill([], _) -> ok;
+ets_kill([Pid|Pids], Time) ->
+    timer:sleep(Time),
+    Pid ! done,
+    ets_kill(Pids, Time).
+
+ets_shuffle(Tid) ->
+    Payload = lists:duplicate(100, $x),
+    ets_shuffle(Tid, 100, Payload).
+ets_shuffle(Tid, I, Data) ->
+    ets_shuffle(Tid, I, I, Data, Data).
+
+ets_shuffle(Tid, 0, N, _, Data) ->
+    ets_shuffle(Tid, N, N, Data, Data);
+ets_shuffle(Tid, I, N, Data, Data0) ->
+    receive
+        done -> ok
+    after 0 ->
+              Key = rand:uniform(1000),
+              Data1 = [I|Data],
+              ets:insert(Tid, {Key, Data1}),
+              ets_shuffle(Tid, I - 1, N, Data1, Data0)
+    end.
+
+
+
+
+memory_load() ->
+    Me = self(),
+    Pids0 = [spawn_link(fun() -> memory_loop(Me, 20, <<42>>) end) || _ <- lists:seq(1,30)],
+    timer:sleep(50),
+    Pids1 = [spawn_link(fun() -> memory_loop(Me, 20, <<42>>) end) || _ <- lists:seq(1,30)],
+    [receive {Pid, done} -> ok end || Pid <- Pids0 ++ Pids1],
+    timer:sleep(500),
+    ok.
+
+memory_loop(Parent, N, Bin) ->
+    memory_loop(Parent, N, Bin, []).
+
+memory_loop(Parent, 0, _Bin, _) ->
+    Parent ! {self(), done};
+memory_loop(Parent, N, Bin0, Ls) ->
+    Bin = binary:copy(<<Bin0/binary, Bin0/binary>>),
+    memory_loop(Parent, N - 1, Bin, [a,b,c|Ls]).
+
+tcp_server(Pid, Type) ->
+    {ok, LSock} = gen_tcp:listen(5679, [binary,
+                                        {reuseaddr, true},
+                                        {active, false}]),
+    Pid ! {self(), accept},
+    {ok, Sock} = gen_tcp:accept(LSock),
+    case Type of
+        passive_no_read ->
+            receive die -> ok end;
+        active ->
+            inet:setopts(Sock, [{active, once}, {packet,2}]),
+            receive Msg1 -> io:format("msg1: ~p~n", [Msg1]) end,
+            inet:setopts(Sock, [{active, once}, {packet,2}]),
+            receive Msg2 -> io:format("msg2: ~p~n", [Msg2]) end,
+            ok = gen_tcp:close(Sock);
+        timeout ->
+            Res = gen_tcp:recv(Sock, 2000, 1000),
+            io:format("res ~p~n", [Res])
+    end,
+    Pid ! {self(), done},
+    ok.
+
+txt() ->
+    <<"%% tracepoints\n"
+      "%%\n"
+      "%%   com_ericsson_otp:carrier_pool_get\n"
+      "%%   com_ericsson_otp:carrier_pool_put\n"
+      "%%   com_ericsson_otp:carrier_destroy\n"
+      "%%   com_ericsson_otp:carrier_create\n"
+      "%%   com_ericsson_otp:aio_pool_add\n"
+      "%%   com_ericsson_otp:aio_pool_get\n"
+      "%%   com_ericsson_otp:driver_control\n"
+      "%%   com_ericsson_otp:driver_call\n"
+      "%%   com_ericsson_otp:driver_finish\n"
+      "%%   com_ericsson_otp:driver_ready_async\n"
+      "%%   com_ericsson_otp:driver_process_exit\n"
+      "%%   com_ericsson_otp:driver_stop\n"
+      "%%   com_ericsson_otp:driver_flush\n"
+      "%%   com_ericsson_otp:driver_stop_select\n"
+      "%%   com_ericsson_otp:driver_timeout\n"
+      "%%   com_ericsson_otp:driver_event\n"
+      "%%   com_ericsson_otp:driver_ready_output\n"
+      "%%   com_ericsson_otp:driver_ready_input\n"
+      "%%   com_ericsson_otp:driver_output\n"
+      "%%   com_ericsson_otp:driver_outputv\n"
+      "%%   com_ericsson_otp:driver_init\n"
+      "%%   com_ericsson_otp:driver_start\n"
+      "%%   com_ericsson_otp:scheduler_poll">>.
+
+load_driver(Dir, Driver) ->
+    case erl_ddll:load_driver(Dir, Driver) of
+        ok -> ok;
+        {error, Error} = Res ->
+            io:format("~s\n", [erl_ddll:format_error(Error)]),
+            Res
+    end.
+
+%% check
+
+have_carriers() ->
+    Cap = element(3,erlang:system_info(allocator)),
+    case Cap -- [sys_alloc,sys_aligned_alloc] of
+        [] -> false;
+        _  -> true
+    end.
+
+have_async_threads() ->
+    Tps = erlang:system_info(thread_pool_size),
+    if Tps =:= 0 -> false;
+       true -> true
+    end.
+
+%% lttng
+lttng_stop_and_view(Config) ->
+    Path = proplists:get_value(priv_dir, Config),
+    Name = proplists:get_value(session, Config),
+    {ok,_} = cmd("lttng stop " ++ Name),
+    {ok,Res} = cmd("lttng view " ++ Name ++ " --trace-path=" ++ Path),
+    Res.
+
+check_tracepoint(TP, Data) ->
+    case re:run(Data, TP, [global]) of
+        {match, _} -> ok;
+        _ -> notfound
+    end.
+
+lttng_start_event(Event, Config) ->
+    Name = proplists:get_value(session, Config),
+    {ok, _} = cmd("lttng enable-event -u " ++ Event ++ " --session=" ++ Name),
+    {ok, _} = cmd("lttng start " ++ Name),
+    ok.
+
+ensure_lttng_started(Name, Config) ->
+    Out = case proplists:get_value(priv_dir, Config) of
+              undefined -> [];
+              Path -> "--output="++Path++" "
+          end,
+    {ok,_} = cmd("lttng create " ++ Out ++ Name),
+    ok.
+
+ensure_lttng_stopped(Name) ->
+    {ok,_} = cmd("lttng stop"),
+    {ok,_} = cmd("lttng destroy " ++ Name),
+    ok.
+
+cmd(Cmd) ->
+    io:format("<< ~ts~n", [Cmd]),
+    Res = os:cmd(Cmd),
+    io:format(">> ~ts~n", [Res]),
+    {ok,Res}.
diff --git a/erts/emulator/test/lttng_SUITE_data/Makefile.src b/erts/emulator/test/lttng_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..fe7a1b6ef3
--- /dev/null
+++ b/erts/emulator/test/lttng_SUITE_data/Makefile.src
@@ -0,0 +1,7 @@
+
+MISC_DRVS = caller_drv@dll@
+
+
+all: $(MISC_DRVS)
+
+@SHLIB_RULES@
diff --git a/erts/emulator/test/lttng_SUITE_data/caller_drv.c b/erts/emulator/test/lttng_SUITE_data/caller_drv.c
new file mode 100644
index 0000000000..86fd0a2995
--- /dev/null
+++ b/erts/emulator/test/lttng_SUITE_data/caller_drv.c
@@ -0,0 +1,159 @@
+/* ``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.
+ * 
+ * The Initial Developer of the Original Code is Ericsson Utvecklings AB.
+ * Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
+ * AB. All Rights Reserved.''
+ * 
+ *     $Id$
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "erl_driver.h"
+
+static int init();
+static void stop(ErlDrvData drv_data);
+static void finish();
+static void flush(ErlDrvData drv_data);
+static ErlDrvData start(ErlDrvPort port, char *command);
+static void output(ErlDrvData drv_data, char *buf, ErlDrvSizeT len);
+static void outputv(ErlDrvData drv_data, ErlIOVec *ev);
+static ErlDrvSSizeT control(ErlDrvData drv_data,
+			    unsigned int command, char *buf,
+			    ErlDrvSizeT len, char **rbuf, ErlDrvSizeT rlen);
+static ErlDrvSSizeT call(ErlDrvData drv_data,
+			 unsigned int command,
+			 char *buf, ErlDrvSizeT len,
+			 char **rbuf, ErlDrvSizeT rlen,
+			 unsigned int *flags);
+
+static ErlDrvEntry caller_drv_entry = { 
+    init,
+    start,
+    stop,
+    output,
+    NULL /* ready_input */,
+    NULL /* ready_output */,
+    "caller_drv",
+    finish,
+    NULL /* handle */,
+    control,
+    NULL /* timeout */,
+    outputv,
+    NULL /* ready_async */,
+    flush,
+    call,
+    NULL /* event */,
+    ERL_DRV_EXTENDED_MARKER,
+    ERL_DRV_EXTENDED_MAJOR_VERSION,
+    ERL_DRV_EXTENDED_MINOR_VERSION,
+    ERL_DRV_FLAG_USE_PORT_LOCKING,
+    NULL /* handle2 */,
+    NULL /* handle_monitor */
+};
+
+DRIVER_INIT(caller_drv)
+{
+    char buf[10];
+    size_t bufsz = sizeof(buf);
+    char *use_outputv;
+    use_outputv = (erl_drv_getenv("CALLER_DRV_USE_OUTPUTV", buf, &bufsz) == 0
+		   ? buf
+		   : "false");
+    if (strcmp(use_outputv, "true") != 0)
+	caller_drv_entry.outputv = NULL;
+    return &caller_drv_entry;
+}
+
+void
+send_caller(ErlDrvData drv_data, char *func)
+{
+    int res;
+    ErlDrvPort port = (ErlDrvPort) drv_data;
+    ErlDrvTermData msg[] = {
+	ERL_DRV_ATOM,	driver_mk_atom("caller"),
+	ERL_DRV_PORT,	driver_mk_port(port),
+	ERL_DRV_ATOM,	driver_mk_atom(func),
+	ERL_DRV_PID,	driver_caller(port),
+	ERL_DRV_TUPLE,	(ErlDrvTermData) 4
+    };
+    res = erl_drv_output_term(driver_mk_port(port), msg, sizeof(msg)/sizeof(ErlDrvTermData));
+    if (res <= 0)
+	driver_failure_atom(port, "erl_drv_output_term failed");
+}
+
+static int
+init() {
+    return 0;
+}
+
+static void
+stop(ErlDrvData drv_data)
+{
+
+}
+
+static void
+flush(ErlDrvData drv_data)
+{
+
+}
+
+static void
+finish()
+{
+
+}
+
+static ErlDrvData
+start(ErlDrvPort port, char *command)
+{
+    send_caller((ErlDrvData) port, "start");
+    return (ErlDrvData) port;
+}
+
+static void
+output(ErlDrvData drv_data, char *buf, ErlDrvSizeT len)
+{
+    send_caller(drv_data, "output");
+}
+
+static void
+outputv(ErlDrvData drv_data, ErlIOVec *ev)
+{
+    send_caller(drv_data, "outputv");
+}
+
+static ErlDrvSSizeT
+control(ErlDrvData drv_data,
+	unsigned int command, char *buf, 
+	ErlDrvSizeT len, char **rbuf, ErlDrvSizeT rlen)
+{
+    send_caller(drv_data, "control");
+    return 0;
+}
+
+static ErlDrvSSizeT
+call(ErlDrvData drv_data,
+     unsigned int command,
+     char *buf, ErlDrvSizeT len,
+     char **rbuf, ErlDrvSizeT rlen,
+     unsigned int *flags)
+{
+    /* echo call */
+    if (len > rlen)
+	*rbuf = driver_alloc(len);
+    memcpy((void *) *rbuf, (void *) buf, len);
+    send_caller(drv_data, "call");
+    return len;
+}
diff --git a/erts/emulator/test/map_SUITE.erl b/erts/emulator/test/map_SUITE.erl
index a256cf4195..956b82335c 100644
--- a/erts/emulator/test/map_SUITE.erl
+++ b/erts/emulator/test/map_SUITE.erl
@@ -17,73 +17,70 @@
 %% %CopyrightEnd%
 %%
 -module(map_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([
-	t_build_and_match_literals/1, t_build_and_match_literals_large/1,
-	t_update_literals/1, t_update_literals_large/1,
-        t_match_and_update_literals/1, t_match_and_update_literals_large/1,
-	t_update_map_expressions/1,
-	t_update_assoc/1, t_update_assoc_large/1,
-        t_update_exact/1, t_update_exact_large/1,
-	t_guard_bifs/1,
-        t_guard_sequence/1, t_guard_sequence_large/1,
-        t_guard_update/1, t_guard_update_large/1,
-	t_guard_receive/1, t_guard_receive_large/1,
-        t_guard_fun/1,
-        t_update_deep/1,
-	t_list_comprehension/1,
-	t_map_sort_literals/1,
-	t_map_equal/1,
-	t_map_compare/1,
-	t_map_size/1,
-	t_is_map/1,
-
-	%% Specific Map BIFs
-	t_bif_map_get/1,
-	t_bif_map_find/1,
-	t_bif_map_is_key/1,
-	t_bif_map_keys/1,
-	t_bif_map_merge/1,
-	t_bif_map_new/1,
-	t_bif_map_put/1,
-	t_bif_map_remove/1,
-	t_bif_map_update/1,
-	t_bif_map_values/1,
-	t_bif_map_to_list/1,
-	t_bif_map_from_list/1,
-
-	%% erlang
-	t_erlang_hash/1,
-	t_map_encode_decode/1,
-	t_gc_rare_map_overflow/1,
-
-	%% non specific BIF related
-	t_bif_build_and_check/1,
-	t_bif_merge_and_check/1,
-
-	%% maps module not bifs
-	t_maps_fold/1,
-	t_maps_map/1,
-	t_maps_size/1,
-	t_maps_without/1,
-
-	%% misc
-	t_hashmap_balance/1,
-        t_erts_internal_order/1,
-        t_erts_internal_hash/1,
-	t_pdict/1,
-	t_ets/1,
-	t_dets/1,
-	t_tracing/1,
-
-	%% instruction-level tests
-	t_has_map_fields/1,
-	y_regs/1,
-	badmap_17/1
-    ]).
+-export([all/0, suite/0]).
+-compile({nowarn_deprecated_function, {erlang,hash,2}}).
+
+-export([t_build_and_match_literals/1, t_build_and_match_literals_large/1,
+         t_update_literals/1, t_update_literals_large/1,
+         t_match_and_update_literals/1, t_match_and_update_literals_large/1,
+         t_update_map_expressions/1,
+         t_update_assoc/1, t_update_assoc_large/1,
+         t_update_exact/1, t_update_exact_large/1,
+         t_guard_bifs/1,
+         t_guard_sequence/1, t_guard_sequence_large/1,
+         t_guard_update/1, t_guard_update_large/1,
+         t_guard_receive/1, t_guard_receive_large/1,
+         t_guard_fun/1,
+         t_update_deep/1,
+         t_list_comprehension/1,
+         t_map_sort_literals/1,
+         t_map_equal/1,
+         t_map_compare/1,
+         t_map_size/1,
+         t_is_map/1,
+
+         %% Specific Map BIFs
+         t_bif_map_get/1,
+         t_bif_map_find/1,
+         t_bif_map_is_key/1,
+         t_bif_map_keys/1,
+         t_bif_map_merge/1,
+         t_bif_map_new/1,
+         t_bif_map_put/1,
+         t_bif_map_remove/1,
+         t_bif_map_update/1,
+         t_bif_map_values/1,
+         t_bif_map_to_list/1,
+         t_bif_map_from_list/1,
+
+         %% erlang
+         t_erlang_hash/1,
+         t_map_encode_decode/1,
+         t_gc_rare_map_overflow/1,
+
+         %% non specific BIF related
+         t_bif_build_and_check/1,
+         t_bif_merge_and_check/1,
+
+         %% maps module not bifs
+         t_maps_fold/1,
+         t_maps_map/1,
+         t_maps_size/1,
+         t_maps_without/1,
+
+         %% misc
+         t_hashmap_balance/1,
+         t_erts_internal_order/1,
+         t_erts_internal_hash/1,
+         t_pdict/1,
+         t_ets/1,
+         t_dets/1,
+         t_tracing/1,
+
+         %% instruction-level tests
+         t_has_map_fields/1,
+         y_regs/1,
+         badmap_17/1]).
 
 -include_lib("stdlib/include/ms_transform.hrl").
 
@@ -96,65 +93,55 @@
 
 suite() -> [].
 
-all() -> [
-	t_build_and_match_literals, t_build_and_match_literals_large,
-	t_update_literals, t_update_literals_large,
-        t_match_and_update_literals, t_match_and_update_literals_large,
-	t_update_map_expressions,
-	t_update_assoc, t_update_assoc_large,
-        t_update_exact, t_update_exact_large,
-	t_guard_bifs,
-        t_guard_sequence, t_guard_sequence_large,
-        t_guard_update, t_guard_update_large,
-	t_guard_receive, t_guard_receive_large,
-        t_guard_fun, t_list_comprehension,
-        t_update_deep,
-	t_map_equal, t_map_compare,
-	t_map_sort_literals,
-
-	%% Specific Map BIFs
-	t_bif_map_get,t_bif_map_find,t_bif_map_is_key,
-	t_bif_map_keys, t_bif_map_merge, t_bif_map_new,
-	t_bif_map_put,
-	t_bif_map_remove, t_bif_map_update,
-	t_bif_map_values,
-	t_bif_map_to_list, t_bif_map_from_list,
-
-	%% erlang
-	t_erlang_hash, t_map_encode_decode,
-	t_gc_rare_map_overflow,
-	t_map_size, t_is_map,
-
-	%% non specific BIF related
-	t_bif_build_and_check,
-	t_bif_merge_and_check,
-
-	%% maps module
-	t_maps_fold, t_maps_map,
-	t_maps_size, t_maps_without,
-
-
-        %% Other functions
-	t_hashmap_balance,
-        t_erts_internal_order,
-        t_erts_internal_hash,
-	t_pdict,
-	t_ets,
-	t_tracing,
-
-	%% instruction-level tests
-	t_has_map_fields,
-	y_regs,
-	badmap_17
-    ].
-
-groups() -> [].
-
-init_per_suite(Config) -> Config.
-end_per_suite(_Config) -> ok.
-
-init_per_group(_GroupName, Config) -> Config.
-end_per_group(_GroupName, Config) -> Config.
+all() -> [t_build_and_match_literals, t_build_and_match_literals_large,
+          t_update_literals, t_update_literals_large,
+          t_match_and_update_literals, t_match_and_update_literals_large,
+          t_update_map_expressions,
+          t_update_assoc, t_update_assoc_large,
+          t_update_exact, t_update_exact_large,
+          t_guard_bifs,
+          t_guard_sequence, t_guard_sequence_large,
+          t_guard_update, t_guard_update_large,
+          t_guard_receive, t_guard_receive_large,
+          t_guard_fun, t_list_comprehension,
+          t_update_deep,
+          t_map_equal, t_map_compare,
+          t_map_sort_literals,
+
+          %% Specific Map BIFs
+          t_bif_map_get,t_bif_map_find,t_bif_map_is_key,
+          t_bif_map_keys, t_bif_map_merge, t_bif_map_new,
+          t_bif_map_put,
+          t_bif_map_remove, t_bif_map_update,
+          t_bif_map_values,
+          t_bif_map_to_list, t_bif_map_from_list,
+
+          %% erlang
+          t_erlang_hash, t_map_encode_decode,
+          t_gc_rare_map_overflow,
+          t_map_size, t_is_map,
+
+          %% non specific BIF related
+          t_bif_build_and_check,
+          t_bif_merge_and_check,
+
+          %% maps module
+          t_maps_fold, t_maps_map,
+          t_maps_size, t_maps_without,
+
+
+          %% Other functions
+          t_hashmap_balance,
+          t_erts_internal_order,
+          t_erts_internal_hash,
+          t_pdict,
+          t_ets,
+          t_tracing,
+
+          %% instruction-level tests
+          t_has_map_fields,
+          y_regs,
+          badmap_17].
 
 %% tests
 
@@ -1511,11 +1498,8 @@ t_map_equal(Config) when is_list(Config) ->
 
 
 t_map_compare(Config) when is_list(Config) ->
-    Seed = {erlang:monotonic_time(),
-	    erlang:time_offset(),
-	    erlang:unique_integer()},
-    io:format("seed = ~p\n", [Seed]),
-    random:seed(Seed),
+    rand:seed(exsplus),
+    io:format("seed = ~p\n", [rand:export_seed()]),
     repeat(100, fun(_) -> float_int_compare() end, []),
     repeat(100, fun(_) -> recursive_compare() end, []),
     ok.
@@ -1533,7 +1517,7 @@ float_int_compare() ->
 
 numeric_keys(N) ->
     lists:foldl(fun(_,Acc) ->
-			Int = random:uniform(N*4) - N*2,
+			Int = rand:uniform(N*4) - N*2,
 			Float = float(Int),
 			[Int, Float, Float * 0.99, Float * 1.01 | Acc]
 		end,
@@ -1564,7 +1548,7 @@ do_compare([Gen1, Gen2]) ->
 
     %% Change one key from int to float (or vice versa) and check compare
     ML1 = maps:to_list(M1),
-    {K1,V1} = lists:nth(random:uniform(length(ML1)), ML1),
+    {K1,V1} = lists:nth(rand:uniform(length(ML1)), ML1),
     case K1 of
 	I when is_integer(I) ->
 	    case maps:find(float(I),M1) of
@@ -1655,9 +1639,9 @@ cmp_others(T1, T2, _) ->
 
 map_gen(Pairs, Size) ->
     {_,L} = lists:foldl(fun(_, {Keys, Acc}) ->
-				KI = random:uniform(size(Keys)),
+				KI = rand:uniform(size(Keys)),
 				K = element(KI,Keys),
-				KV = element(random:uniform(size(K)), K),
+				KV = element(rand:uniform(size(K)), K),
 				{erlang:delete_element(KI,Keys), [KV | Acc]}
 			end,
 			{Pairs, []},
@@ -1697,20 +1681,19 @@ term_gen_recursive(Leafs, Flags, Depth) ->
     MaxDepth = 10,
     Rnd = case {Flags, Depth} of
 	      {_, MaxDepth} -> % Only leafs
-		  random:uniform(size(Leafs)) + 3;
+		  rand:uniform(size(Leafs)) + 3;
 	      {0, 0} ->        % Only containers
-		  random:uniform(3);
+		  rand:uniform(3);
 	      {0,_} ->         % Anything
-		  random:uniform(size(Leafs)+3)
+		  rand:uniform(size(Leafs)+3)
 	  end,
     case Rnd of
 	1 -> % Make map
-	    Size = random:uniform(size(Leafs)),
+	    Size = rand:uniform(size(Leafs)),
 	    lists:foldl(fun(_, {Acc1,Acc2}) ->
 				{K1,K2} = term_gen_recursive(Leafs, Flags,
 							     Depth+1),
 				{V1,V2} = term_gen_recursive(Leafs, Flags, Depth+1),
-				%%ok = check_keys(K1,K2, 0),
 				{maps:put(K1,V1, Acc1), maps:put(K2,V2, Acc2)}
 			end,
 			{maps:new(), maps:new()},
@@ -1720,7 +1703,7 @@ term_gen_recursive(Leafs, Flags, Depth) ->
 	    {Cdr1,Cdr2} = term_gen_recursive(Leafs, Flags, Depth+1),
 	    {[Car1 | Cdr1], [Car2 | Cdr2]};
 	3 -> % Make tuple
-	    Size = random:uniform(size(Leafs)),
+	    Size = rand:uniform(size(Leafs)),
 	    L = lists:map(fun(_) -> term_gen_recursive(Leafs, Flags, Depth+1) end,
 			  lists:seq(1,Size)),
 	    {L1, L2} = lists:unzip(L),
@@ -1729,7 +1712,7 @@ term_gen_recursive(Leafs, Flags, Depth) ->
 	N -> % Make leaf
 	    case element(N-3, Leafs) of
 		I when is_integer(I) ->
-		    case random:uniform(4) of
+		    case rand:uniform(4) of
 			1 -> {I, float(I)};
 			2 -> {float(I), I};
 			_ -> {I,I}
@@ -1738,26 +1721,6 @@ term_gen_recursive(Leafs, Flags, Depth) ->
 	    end
     end.
 
-check_keys(K1, K2, _) when K1 =:= K2 ->
-    case erlang:phash3(K1) =:= erlang:phash3(K2) of
-	true -> ok;
-	false ->
-	    io:format("Same keys with different hash values !!!\nK1 = ~p\nK2 = ~p\n", [K1,K2]),
-	    error
-    end;
-check_keys(K1, K2, 0) ->
-    case {erlang:phash3(K1), erlang:phash3(K2)} of
-	{H,H} -> check_keys(K1, K2, 1);
-	{_,_} -> ok
-    end;
-check_keys(K1, K2, L) when L < 10 ->
-    case {erlang:phash3([L|K1]), erlang:phash3([L|K2])} of
-	{H,H} -> check_keys(K1, K2, L+1);
-	{_,_} -> ok
-    end;
-check_keys(K1, K2, L) ->
-    io:format("Same hash value at level ~p !!!\nK1 = ~p\nK2 = ~p\n", [L,K1,K2]),
-    error.
 
 %% BIFs
 t_bif_map_get(Config) when is_list(Config) ->
@@ -2598,7 +2561,7 @@ hashmap_balance(KeyFun) ->
     F = fun(I, {M0,Max0}) ->
 		Key = KeyFun(I),
 		M1 = M0#{Key => Key},
-		Max1 = case erts_internal:map_type(M1) of
+		Max1 = case erts_internal:term_type(M1) of
 			   hashmap ->
 			       Nodes = hashmap_nodes(M1),
 			       Avg = maps:size(M1) * 0.4,
@@ -2996,7 +2959,7 @@ id(I) -> I.
 %% OTP-13146
 %% Provoke major GC with a lot of "fat" maps on external format in msg queue
 %% causing heap fragments to be allocated.
-t_gc_rare_map_overflow(Config) ->
+t_gc_rare_map_overflow(Config) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     {ok, Node} = test_server:start_node(gc_rare_map_overflow, slave, [{args, "-pa \""++Pa++"\""}]),
     erts_debug:set_internal_state(available_internal_state, true),
@@ -3006,7 +2969,7 @@ t_gc_rare_map_overflow(Config) ->
 					      Loop()
 				end),
 	FatMap = fatmap(34),
-	false = (flatmap =:= erts_internal:map_type(FatMap)),
+	false = (flatmap =:= erts_internal:term_type(FatMap)),
 
 	t_gc_rare_map_overflow_do(Echo, FatMap, fun() -> erlang:garbage_collect() end),
 
@@ -3016,7 +2979,7 @@ t_gc_rare_map_overflow(Config) ->
 	unlink(Echo),
 
 	%% Test fatmap in exit signal
-	Exiter = spawn_link(Node, fun Loop() -> receive {From,Msg} ->
+	Exiter = spawn_link(Node, fun Loop() -> receive {_From,Msg} ->
 							"not_a_map" = Msg  % badmatch!
 						end,
 						Loop()
@@ -3034,7 +2997,7 @@ t_gc_rare_map_overflow(Config) ->
 
 t_gc_rare_map_overflow_do(Echo, FatMap, GcFun) ->
     Master = self(),
-    true = receive M -> false after 0 -> true end,   % assert empty msg queue
+    true = receive _M -> false after 0 -> true end,   % assert empty msg queue
     Echo ! {Master, token},
     repeat(1000, fun(_) -> Echo ! {Master, FatMap} end, void),
 
diff --git a/erts/emulator/test/match_spec_SUITE.erl b/erts/emulator/test/match_spec_SUITE.erl
index 3f986ca2ed..baa6eb8fe0 100644
--- a/erts/emulator/test/match_spec_SUITE.erl
+++ b/erts/emulator/test/match_spec_SUITE.erl
@@ -20,8 +20,7 @@
 
 -module(match_spec_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, not_run/1]).
+-export([all/0, suite/0, not_run/1]).
 -export([test_1/1, test_2/1, test_3/1, bad_match_spec_bin/1,
 	 trace_control_word/1, silent/1, silent_no_ms/1, silent_test/1,
 	 ms_trace2/1, ms_trace3/1, boxed_and_small/1,
@@ -39,20 +38,11 @@
 % This test suite assumes that tracing in general works. What we test is
 % the match spec functionality.
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
--export([init_per_testcase/2, end_per_testcase/2]).
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:seconds(30)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 30}}].
 
 all() -> 
     case test_server:is_native(match_spec_SUITE) of
@@ -69,106 +59,87 @@ all() ->
 	true -> [not_run]
     end.
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
 not_run(Config) when is_list(Config) ->
     {skipped, "Native Code"}.
 
-test_1(doc) ->
-    [""];
-test_1(suite) -> [];
 test_1(Config) when is_list(Config) ->
-    ?line tr(fun() -> ?MODULE:f1(a) end,
-	     {?MODULE, f1, 1},
-	     [],
-	     [{call, {?MODULE, f1, [a]}}]),
-
-    ?line tr(fun() -> ?MODULE:f2(a, a) end,
-	     {?MODULE, f2, 2},
-	     [{['$1','$1'],[{is_atom, '$1'}],[]}],
-	     [{call, {?MODULE, f2, [a, a]}}]),
-
-    ?line tr(fun() -> ?MODULE:f2(a, a) end,
-	     {?MODULE, f2, 2},
-	     [{['$1','$1'],[{is_atom, '$1'}],[{message, false}]}],
-	     []),
-
-    ?line tr(fun() -> ?MODULE:f2(a, a) end,
-	     {?MODULE, f2, 2},
-	     [{['$1','$1'],[{is_atom, '$1'}],[{message, 4711}]}],
-	     [{call, {?MODULE, f2, [a, a]}, 4711}]),
+    tr(fun() -> ?MODULE:f1(a) end,
+       {?MODULE, f1, 1},
+       [],
+       [{call, {?MODULE, f1, [a]}}]),
+
+    tr(fun() -> ?MODULE:f2(a, a) end,
+       {?MODULE, f2, 2},
+       [{['$1','$1'],[{is_atom, '$1'}],[]}],
+       [{call, {?MODULE, f2, [a, a]}}]),
+
+    tr(fun() -> ?MODULE:f2(a, a) end,
+       {?MODULE, f2, 2},
+       [{['$1','$1'],[{is_atom, '$1'}],[{message, false}]}],
+       []),
+
+    tr(fun() -> ?MODULE:f2(a, a) end,
+       {?MODULE, f2, 2},
+       [{['$1','$1'],[{is_atom, '$1'}],[{message, 4711}]}],
+       [{call, {?MODULE, f2, [a, a]}, 4711}]),
 
     Ref = make_ref(),
-    ?line tr(fun() -> ?MODULE:f2(Ref, Ref) end,
-	     {?MODULE, f2, 2},
-	     [{[Ref,'$1'],[{is_reference, '$1'}],[{message, 4711}]}],
-	     [{call, {?MODULE, f2, [Ref, Ref]}, 4711}]),
-    ?line tr(fun() -> ?MODULE:f2(Ref, Ref) end,
-	     {?MODULE, f2, 2},
-	     [{['$1',Ref],[{is_reference, '$1'}],[{message, 4711}]}],
-	     [{call, {?MODULE, f2, [Ref, Ref]}, 4711}]),
-
-    ?line tr(fun() -> ?MODULE:f2(a, a) end,
-	     {?MODULE, f2, 2},
-	     [{['$0','$0'],[{is_atom, '$0'}],[{message, 4711}]}],
-	     [{call, {?MODULE, f2, [a, a]}, 4711}]),
-
-    ?line tr(fun() -> ?MODULE:f2(a, b) end,
-	     {?MODULE, f2, 2},
-	     [{['_','_'],[],[]}],
-	     [{call, {?MODULE, f2, [a, b]}}]),
-
-    ?line tr(fun() -> ?MODULE:f2(a, b) end,
-	     {?MODULE, f2, 2},
-	     [{['_','_'],[],[{message, '$_'}]}],
-	     [{call, {?MODULE, f2, [a, b]}, [a, b]}]),
-
-    ?line tr(fun() -> ?MODULE:f2(a, '$_') end,
-	     {?MODULE, f2, 2},
-	     [{['$1','$_'],[{is_atom, '$1'}],[]}],
-	     [{call, {?MODULE, f2, [a, '$_']}}]),
-
-    ?line tr(fun() -> ?MODULE:f1({a}) end,
-	     {?MODULE, f1, 1},
-	     [{['$1'],[{'==', '$1', {const, {a}}}],[]}],
-	     [{call, {?MODULE, f1, [{a}]}}]),
-
-    ?line tr(fun() -> ?MODULE:f1({a}) end,
-	     {?MODULE, f1, 1},
-	     [{['$1'],[{'==', '$1', {{a}}}],[]}],
-	     [{call, {?MODULE, f1, [{a}]}}]),
-
-%% Undocumented, currently.
-    ?line tr(fun() -> ?MODULE:f2(a, a) end,
-	     {?MODULE, f2, 2},
-	     [{['$1','$1'],[{is_atom, '$1'}],[{message, 4711},
-					      {message, true}]}],
-	     [{call, {?MODULE, f2, [a, a]}}]),
-
-    ?line tr(fun() -> ?MODULE:f2(a, a) end,
-	     {?MODULE, f2, 2},
-	     [{['$1','$1'],[{is_atom, '$1'}],[{message, 4711},
-					      {message, false}]}],
-	     []),
-
-    ?line tr(fun() -> ?MODULE:f2(a, a) end,
-	     {?MODULE, f2, 2},
-	     [{['$1','$1'],[{is_atom, '$1'}],[kakalorum]}],
-	     [{call, {?MODULE, f2, [a, a]}}]),
+    tr(fun() -> ?MODULE:f2(Ref, Ref) end,
+       {?MODULE, f2, 2},
+       [{[Ref,'$1'],[{is_reference, '$1'}],[{message, 4711}]}],
+       [{call, {?MODULE, f2, [Ref, Ref]}, 4711}]),
+    tr(fun() -> ?MODULE:f2(Ref, Ref) end,
+       {?MODULE, f2, 2},
+       [{['$1',Ref],[{is_reference, '$1'}],[{message, 4711}]}],
+       [{call, {?MODULE, f2, [Ref, Ref]}, 4711}]),
+
+    tr(fun() -> ?MODULE:f2(a, a) end,
+       {?MODULE, f2, 2},
+       [{['$0','$0'],[{is_atom, '$0'}],[{message, 4711}]}],
+       [{call, {?MODULE, f2, [a, a]}, 4711}]),
+
+    tr(fun() -> ?MODULE:f2(a, b) end,
+       {?MODULE, f2, 2},
+       [{['_','_'],[],[]}],
+       [{call, {?MODULE, f2, [a, b]}}]),
+
+    tr(fun() -> ?MODULE:f2(a, b) end,
+       {?MODULE, f2, 2},
+       [{['_','_'],[],[{message, '$_'}]}],
+       [{call, {?MODULE, f2, [a, b]}, [a, b]}]),
+
+    tr(fun() -> ?MODULE:f2(a, '$_') end,
+       {?MODULE, f2, 2},
+       [{['$1','$_'],[{is_atom, '$1'}],[]}],
+       [{call, {?MODULE, f2, [a, '$_']}}]),
+
+    tr(fun() -> ?MODULE:f1({a}) end,
+       {?MODULE, f1, 1},
+       [{['$1'],[{'==', '$1', {const, {a}}}],[]}],
+       [{call, {?MODULE, f1, [{a}]}}]),
+
+    tr(fun() -> ?MODULE:f1({a}) end,
+       {?MODULE, f1, 1},
+       [{['$1'],[{'==', '$1', {{a}}}],[]}],
+       [{call, {?MODULE, f1, [{a}]}}]),
+
+    %% Undocumented, currently.
+    tr(fun() -> ?MODULE:f2(a, a) end,
+       {?MODULE, f2, 2},
+       [{['$1','$1'],[{is_atom, '$1'}],[{message, 4711},
+                                        {message, true}]}],
+       [{call, {?MODULE, f2, [a, a]}}]),
+
+    tr(fun() -> ?MODULE:f2(a, a) end,
+       {?MODULE, f2, 2},
+       [{['$1','$1'],[{is_atom, '$1'}],[{message, 4711},
+                                        {message, false}]}],
+       []),
+
+    tr(fun() -> ?MODULE:f2(a, a) end,
+       {?MODULE, f2, 2},
+       [{['$1','$1'],[{is_atom, '$1'}],[kakalorum]}],
+       [{call, {?MODULE, f2, [a, a]}}]),
 
     %% Verify that 'process_dump' can handle a matchstate on the stack.
     tr(fun() -> fbinmatch(<<0>>, 0) end,
@@ -176,56 +147,49 @@ test_1(Config) when is_list(Config) ->
        [{['_'],[],[{message, {process_dump}}]}],
        [fun({trace, _, call, {?MODULE, f1, [0]}, _Bin}) -> true end]),
 
-% Error cases
-    ?line errchk([{['$1','$1'],[{is_atom, '$1'}],[{banka, kanin}]}]),
-
+    % Error cases
+    errchk([{['$1','$1'],[{is_atom, '$1'}],[{banka, kanin}]}]),
     ok.
 
-test_2(doc) ->
-    [""];
-test_2(suite) -> [];
 test_2(Config) when is_list(Config) ->
-    ?line tr(fun() -> ?MODULE:f2(a, a) end,
-	     {?MODULE, f2, 2},
-	     [{['$1','$1'],[{is_atom, '$1'}],[{return_trace}]}],
-	     [{call, {?MODULE, f2, [a, a]}},
-	      {return_from, {?MODULE, f2, 2}, {a, a}}]),
+    tr(fun() -> ?MODULE:f2(a, a) end,
+       {?MODULE, f2, 2},
+       [{['$1','$1'],[{is_atom, '$1'}],[{return_trace}]}],
+       [{call, {?MODULE, f2, [a, a]}},
+        {return_from, {?MODULE, f2, 2}, {a, a}}]),
     ok.
 
-test_3(doc) ->
-    ["Test the enable_trace/2 and caller/0 PAM instructions"];
-test_3(suite) -> [];
+%% Test the enable_trace/2 and caller/0 PAM instructions
 test_3(Config) when is_list(Config) ->
-    ?line Fun1 = fun() -> 
+    Fun1 = fun() -> 
 		   register(fnoppelklopfer,self()),
 		   ?MODULE:f2(a, b),
 		   ?MODULE:f2(a, b) 
 	   end,
-    ?line P1 = spawn(?MODULE, runner, [self(), Fun1]),
-    ?line Pat = [{['$1','$1'],[],[{message,
-				   [{enable_trace, P1, call},{caller}]}]},
-		 {['_','_'],[],[{message,
-				 [{disable_trace, fnoppelklopfer, call}]}]}],
-    ?line Fun2 = fun() -> ?MODULE:f3(a, a) end,
-    ?line P2 = spawn(?MODULE, runner, [self(), Fun2]),
-    ?line erlang:trace(P2, true, [call]),
-    ?line erlang:trace_pattern({?MODULE, f2, 2}, Pat),
-    ?line collect(P2, [{trace, P2, call, {?MODULE, f2, [a, a]}, [true,
+    P1 = spawn(?MODULE, runner, [self(), Fun1]),
+    Pat = [{['$1','$1'],[],[{message,
+                             [{enable_trace, P1, call},{caller}]}]},
+           {['_','_'],[],[{message,
+                           [{disable_trace, fnoppelklopfer, call}]}]}],
+    Fun2 = fun() -> ?MODULE:f3(a, a) end,
+    P2 = spawn(?MODULE, runner, [self(), Fun2]),
+    erlang:trace(P2, true, [call]),
+    erlang:trace_pattern({?MODULE, f2, 2}, Pat),
+    collect(P2, [{trace, P2, call, {?MODULE, f2, [a, a]}, [true,
 							     {?MODULE,f3,2}]}]),
-    ?line collect(P1, [{trace, P1, call, {?MODULE, f2, [a, b]}, [true]}]),
-    ?line ok.
+    collect(P1, [{trace, P1, call, {?MODULE, f2, [a, b]}, [true]}]),
+    ok.
 
-otp_9422(doc) -> [];
 otp_9422(Config) when is_list(Config) ->
     Laps = 10000,
-    ?line Fun1 = fun() -> otp_9422_tracee() end,
-    ?line P1 = spawn_link(?MODULE, loop_runner, [self(), Fun1, Laps]),
+    Fun1 = fun() -> otp_9422_tracee() end,
+    P1 = spawn_link(?MODULE, loop_runner, [self(), Fun1, Laps]),
     io:format("spawned ~p as tracee\n", [P1]),
 
-    ?line erlang:trace(P1, true, [call, silent]),
+    erlang:trace(P1, true, [call, silent]),
 
-    ?line Fun2 = fun() -> otp_9422_trace_changer() end,
-    ?line P2 = spawn_link(?MODULE, loop_runner, [self(), Fun2, Laps]),
+    Fun2 = fun() -> otp_9422_trace_changer() end,
+    P2 = spawn_link(?MODULE, loop_runner, [self(), Fun2, Laps]),
     io:format("spawned ~p as trace_changer\n", [P2]),
 
     start_collect(P1),
@@ -244,9 +208,9 @@ otp_9422_tracee() ->
 
 otp_9422_trace_changer() ->
     Pat1 = [{[a], [], [{enable_trace, arity}]}],
-    ?line erlang:trace_pattern({?MODULE, f1, 1}, Pat1),
+    erlang:trace_pattern({?MODULE, f1, 1}, Pat1),
     Pat2 = [{[b], [], [{disable_trace, arity}]}],
-    ?line erlang:trace_pattern({?MODULE, f1, 1}, Pat2).
+    erlang:trace_pattern({?MODULE, f1, 1}, Pat2).
 
     
     
@@ -261,261 +225,227 @@ bad_match_spec_bin(Config) when is_list(Config) ->
 
 
 
-trace_control_word(doc) ->
-    ["Test the erlang:system_info(trace_control_word) and ",
-     "erlang:system_flag(trace_control_word, Value) BIFs, ", 
-     "as well as the get_tcw/0 and set_tcw/1 PAM instructions"];
-trace_control_word(suite) -> [];
+%% Test the erlang:system_info(trace_control_word) and
+%% erlang:system_flag(trace_control_word, Value) BIFs,
+%% as well as the get_tcw/0 and set_tcw/1 PAM instructions
 trace_control_word(Config) when is_list(Config) ->
-    ?line 32 = Bits = tcw_bits(),
-    ?line High = 1 bsl (Bits - 1),
-    ?line erlang:system_flag(trace_control_word, 17),
-    ?line tr(fun() -> ?MODULE:f1(a) end,
-	     {?MODULE, f1, 1},
-	     [{'_',[{'=:=', {get_tcw}, 17}],[]}],
-	     [{call, {?MODULE, f1, [a]}}]),
-    ?line tr(fun() -> ?MODULE:f1(a) end,
-	     {?MODULE, f1, 1},
-	     [{'_',[{'=:=', {get_tcw}, 18}],[]}],
-	     []),
-    ?line erlang:system_flag(trace_control_word, High),
-    ?line tr(fun() -> ?MODULE:f1(a) end,
-	     {?MODULE, f1, 1},
-	     [{'_',[{'=:=', {get_tcw}, High}],[]}],
-	     [{call, {?MODULE, f1, [a]}}]),
-    ?line erlang:system_flag(trace_control_word, 0),
-    ?line tr(fun() -> 
-		     ?MODULE:f1(a), 
-		     ?MODULE:f1(start), 
-		     ?MODULE:f1(b), 
-		     ?MODULE:f1(c), 
-		     ?MODULE:f1(high), 
-		     ?MODULE:f1(d),
-		     ?MODULE:f1(stop), 
-		     ?MODULE:f1(e) 
-	     end,
-	     {?MODULE, f1, 1},
-	     [{[start],
-	       [],
-	       [{message, {set_tcw, 17}}]},
-	      {[stop],
-	       [],
-	       [{message, {set_tcw, 0}}]},
-	      {[high],
-	       [],
-	       [{message, {set_tcw, High}}]},
-	      {['_'],
-	       [{'>', {get_tcw}, 0}],
-	       [{set_tcw, {'+', 1, {get_tcw}}}, {message, {get_tcw}}] }],
-	     [{call, {?MODULE, f1, [start]}, 0},
-	      {call, {?MODULE, f1, [b]}, 18},
-	      {call, {?MODULE, f1, [c]}, 19},
-	      {call, {?MODULE, f1, [high]}, 19},
-	      {call, {?MODULE, f1, [d]}, High + 1},
-	      {call, {?MODULE, f1, [stop]}, High + 1}]),
-    ?line 0 = erlang:system_info(trace_control_word),
+    32 = Bits = tcw_bits(),
+    High = 1 bsl (Bits - 1),
+    erlang:system_flag(trace_control_word, 17),
+    tr(fun() -> ?MODULE:f1(a) end,
+       {?MODULE, f1, 1},
+       [{'_',[{'=:=', {get_tcw}, 17}],[]}],
+       [{call, {?MODULE, f1, [a]}}]),
+    tr(fun() -> ?MODULE:f1(a) end,
+       {?MODULE, f1, 1},
+       [{'_',[{'=:=', {get_tcw}, 18}],[]}],
+       []),
+    erlang:system_flag(trace_control_word, High),
+    tr(fun() -> ?MODULE:f1(a) end,
+       {?MODULE, f1, 1},
+       [{'_',[{'=:=', {get_tcw}, High}],[]}],
+       [{call, {?MODULE, f1, [a]}}]),
+    erlang:system_flag(trace_control_word, 0),
+    tr(fun() -> 
+               ?MODULE:f1(a), 
+               ?MODULE:f1(start), 
+               ?MODULE:f1(b), 
+               ?MODULE:f1(c), 
+               ?MODULE:f1(high), 
+               ?MODULE:f1(d),
+               ?MODULE:f1(stop), 
+               ?MODULE:f1(e) 
+       end,
+       {?MODULE, f1, 1},
+       [{[start],
+         [],
+         [{message, {set_tcw, 17}}]},
+        {[stop],
+         [],
+         [{message, {set_tcw, 0}}]},
+        {[high],
+         [],
+         [{message, {set_tcw, High}}]},
+        {['_'],
+         [{'>', {get_tcw}, 0}],
+         [{set_tcw, {'+', 1, {get_tcw}}}, {message, {get_tcw}}] }],
+       [{call, {?MODULE, f1, [start]}, 0},
+        {call, {?MODULE, f1, [b]}, 18},
+        {call, {?MODULE, f1, [c]}, 19},
+        {call, {?MODULE, f1, [high]}, 19},
+        {call, {?MODULE, f1, [d]}, High + 1},
+        {call, {?MODULE, f1, [stop]}, High + 1}]),
+    0 = erlang:system_info(trace_control_word),
     ok.
 
 tcw_bits() ->
-    ?line tcw_bits(erlang:system_flag(trace_control_word, 0), 0, 0).
+    tcw_bits(erlang:system_flag(trace_control_word, 0), 0, 0).
 
 tcw_bits(Save, Prev, Bits) ->
-    ?line Curr = 1 bsl Bits,
-    ?line case catch erlang:system_flag(trace_control_word, Curr) of
-	      {'EXIT' , {badarg, _}} ->
-		  ?line Prev = erlang:system_flag(trace_control_word, Save),
-		  Bits;
-	      Prev ->
-		  ?line Curr = erlang:system_info(trace_control_word),
-		  tcw_bits(Save, Curr, Bits+1)
-	  end.
-
-
-
-silent(doc) ->
-    ["Test the erlang:trace(_, _, [silent]) flag ",
-     "as well as the silent/0 PAM instruction"];
-silent(suite) -> [];
+    Curr = 1 bsl Bits,
+    case catch erlang:system_flag(trace_control_word, Curr) of
+        {'EXIT' , {badarg, _}} ->
+            Prev = erlang:system_flag(trace_control_word, Save),
+            Bits;
+        Prev ->
+            Curr = erlang:system_info(trace_control_word),
+            tcw_bits(Save, Curr, Bits+1)
+    end.
+
+
+%% Test the erlang:trace(_, _, [silent]) flag
+%% as well as the silent/0 PAM instruction
 silent(Config) when is_list(Config) ->
     %% Global call trace
-    ?line tr(fun() -> 
-		     ?MODULE:f1(a),     % No trace - not active
-		     ?MODULE:f1(miss),  % No trace - no activation
-		     ?MODULE:f1(b),     % No trace - still not active
-		     ?MODULE:f1(start), % Trace    - activation
-		     ?MODULE:f1(c),     % Trace    - active
-		     f1(d),             % No trace - local call
-		     ?MODULE:f1(miss),  % Trace    - no inactivation
-		     ?MODULE:f1(e),     % Trace    - still active
-		     ?MODULE:f1(stop),  % No trace - inactivation
-		     ?MODULE:f1(f)      % No trace - not active
-	     end,
-	     {?MODULE, f1, 1},
-	     [call, silent],
-	     [{[start],
-	       [],
-	       [{silent, false}, {message, start}]},
-	      {[stop],
-	       [],
-	       [{silent, true}, {message, stop}]},
-	      {[miss],
-	       [],
-	       [{silent, neither_true_nor_false}, {message, miss}]},
-	      {['$1'],
-	       [],
-	       [{message, '$1'}] }],
-	     [global],
-	     [{call, {?MODULE, f1, [start]}, start},
-	      {call, {?MODULE, f1, [c]}, c},
-	      {call, {?MODULE, f1, [miss]}, miss},
-	      {call, {?MODULE, f1, [e]}, e} ]),
+    tr(fun() -> 
+               ?MODULE:f1(a),     % No trace - not active
+               ?MODULE:f1(miss),  % No trace - no activation
+               ?MODULE:f1(b),     % No trace - still not active
+               ?MODULE:f1(start), % Trace    - activation
+               ?MODULE:f1(c),     % Trace    - active
+               f1(d),             % No trace - local call
+               ?MODULE:f1(miss),  % Trace    - no inactivation
+               ?MODULE:f1(e),     % Trace    - still active
+               ?MODULE:f1(stop),  % No trace - inactivation
+               ?MODULE:f1(f)      % No trace - not active
+       end,
+       {?MODULE, f1, 1},
+       [call, silent],
+       [{[start],
+         [],
+         [{silent, false}, {message, start}]},
+        {[stop],
+         [],
+         [{silent, true}, {message, stop}]},
+        {[miss],
+         [],
+         [{silent, neither_true_nor_false}, {message, miss}]},
+        {['$1'],
+         [],
+         [{message, '$1'}] }],
+       [global],
+       [{call, {?MODULE, f1, [start]}, start},
+        {call, {?MODULE, f1, [c]}, c},
+        {call, {?MODULE, f1, [miss]}, miss},
+        {call, {?MODULE, f1, [e]}, e} ]),
     %% Local call trace
-    ?line tr(fun() -> 
-		     ?MODULE:f1(a),     % No trace - not active
-		     f1(b),             % No trace - not active
-		     ?MODULE:f1(start), % Trace    - activation
-		     ?MODULE:f1(c),     % Trace    - active
-		     f1(d),             % Trace    - active
-		     f1(stop),          % No trace - inactivation
-		     ?MODULE:f1(e),     % No trace - not active
-		     f1(f)              % No trace - not active
-	     end,
-	     {?MODULE, f1, 1},
-	     [call, silent],
-	     [{[start],
-	       [],
-	       [{silent, false}, {message, start}]},
-	      {[stop],
-	       [],
-	       [{silent, true}, {message, stop}]},
-	      {['$1'],
-	       [],
-	       [{message, '$1'}] }],
-	     [local],
-	     [{call, {?MODULE, f1, [start]}, start},
-	      {call, {?MODULE, f1, [c]}, c},
-	      {call, {?MODULE, f1, [d]}, d} ]),
+    tr(fun() -> 
+               ?MODULE:f1(a),     % No trace - not active
+               f1(b),             % No trace - not active
+               ?MODULE:f1(start), % Trace    - activation
+               ?MODULE:f1(c),     % Trace    - active
+               f1(d),             % Trace    - active
+               f1(stop),          % No trace - inactivation
+               ?MODULE:f1(e),     % No trace - not active
+               f1(f)              % No trace - not active
+       end,
+       {?MODULE, f1, 1},
+       [call, silent],
+       [{[start],
+         [],
+         [{silent, false}, {message, start}]},
+        {[stop],
+         [],
+         [{silent, true}, {message, stop}]},
+        {['$1'],
+         [],
+         [{message, '$1'}] }],
+       [local],
+       [{call, {?MODULE, f1, [start]}, start},
+        {call, {?MODULE, f1, [c]}, c},
+        {call, {?MODULE, f1, [d]}, d} ]),
     ok.
 
-silent_no_ms(doc) ->
-    ["Test the erlang:trace(_, _, [silent]) flag without match specs"];
-silent_no_ms(suite) -> [];
+%% Test the erlang:trace(_, _, [silent]) flag without match specs
 silent_no_ms(Config) when is_list(Config) ->
     %% Global call trace
     %%
     %% Trace f2/2 and erlang:integer_to_list/1 without match spec
     %% and use match spec on f1/1 to control silent flag.
-    ?line tr(
-	    fun () -> 
-		    ?MODULE:f1(a),
-		    ?MODULE:f2(b, c),
-		    _ = erlang:integer_to_list(id(1)),
-		    ?MODULE:f3(d, e),
-		    ?MODULE:f1(start),
-		    ?MODULE:f2(f, g),
-		    _ = erlang:integer_to_list(id(2)),
-		    ?MODULE:f3(h, i),
-		    ?MODULE:f1(stop),
-		    ?MODULE:f2(j, k),
-		    _ = erlang:integer_to_list(id(3)),
-		    ?MODULE:f3(l, m)
-	    end,
-	    fun (Tracee) ->
-		    ?line 1 = 
-			erlang:trace(Tracee, true, 
-				     [call,silent,return_to]),
-		    ?line 1 =
-			erlang:trace_pattern(
-			  {?MODULE,f2,2}, 
-			  [], 
-			  [global]),
-		    ?line 1 = 
-			erlang:trace_pattern(
-			  {erlang,integer_to_list,1}, 
-			  [], 
-			  [global]),
-		    ?line 1 = 
-			erlang:trace_pattern(
-			  {?MODULE,f1,1},
-			  [{[start],[],[{silent,false}]},
-			   {[stop],[],[{silent,true}]}],
-			  [global]),
-		    %%
-		    %% Expected: (no return_to for global call trace)
-		    %%
-		    ?line
-			[{trace,Tracee,call,{?MODULE,f1,[start]}},
-			 {trace,Tracee,call,{?MODULE,f2,[f,g]}},
-		         {trace,Tracee,call,{erlang,integer_to_list,[2]}},
-			 {trace,Tracee,call,{?MODULE,f2,[h,i]}}]
-	    end),
+    tr(
+      fun () -> 
+              ?MODULE:f1(a),
+              ?MODULE:f2(b, c),
+              _ = erlang:integer_to_list(id(1)),
+              ?MODULE:f3(d, e),
+              ?MODULE:f1(start),
+              ?MODULE:f2(f, g),
+              _ = erlang:integer_to_list(id(2)),
+              ?MODULE:f3(h, i),
+              ?MODULE:f1(stop),
+              ?MODULE:f2(j, k),
+              _ = erlang:integer_to_list(id(3)),
+              ?MODULE:f3(l, m)
+      end,
+      fun (Tracee) ->
+              1 = erlang:trace(Tracee, true, [call,silent,return_to]),
+              1 = erlang:trace_pattern( {?MODULE,f2,2}, [], [global]),
+              1 = erlang:trace_pattern( {erlang,integer_to_list,1}, [], [global]),
+              1 = erlang:trace_pattern(
+                    {?MODULE,f1,1},
+                    [{[start],[],[{silent,false}]},
+                     {[stop],[],[{silent,true}]}],
+                    [global]),
+              %%
+              %% Expected: (no return_to for global call trace)
+              %%
+              [{trace,Tracee,call,{?MODULE,f1,[start]}},
+               {trace,Tracee,call,{?MODULE,f2,[f,g]}},
+               {trace,Tracee,call,{erlang,integer_to_list,[2]}},
+               {trace,Tracee,call,{?MODULE,f2,[h,i]}}]
+      end),
     %% Local call trace
     %%
     %% Trace f2/2 and erlang:integer_to_list/1 without match spec
     %% and use match spec on f1/1 to control silent flag.
-    ?line tr(
-	    fun () -> 
-		    ?MODULE:f1(a),
-		    ?MODULE:f2(b, c),
-		    _ = erlang:integer_to_list(id(1)),
-		    ?MODULE:f3(d, e),
-		    ?MODULE:f1(start),
-		    ?MODULE:f2(f, g),
-		    _ = erlang:integer_to_list(id(2)),
-		    ?MODULE:f3(h, i),
-		    ?MODULE:f1(stop),
-		    ?MODULE:f2(j, k),
-		    _ = erlang:integer_to_list(id(3)),
-		    ?MODULE:f3(l, m)
-	    end,
-	    fun (Tracee) ->
-		    ?line 1 =
-			erlang:trace(Tracee, true, 
-				     [call,silent,return_to]),
-		    ?line 1 = 
-			erlang:trace_pattern(
-			  {?MODULE,f2,2}, 
-			  [], 
-			  [local]),
-		    ?line 1 = 
-			erlang:trace_pattern(
-			  {erlang,integer_to_list,1}, 
-			  [], 
-			  [local]),
-		    ?line 1 =
-			erlang:trace_pattern(
-			  {?MODULE,f1,1},
-			  [{[start],[],[{silent,false}]},
-			   {[stop],[],[{silent,true}]}],
-			  [local]),
-		    %%
-		    %% Expected:
-		    %%
-		    ?line
-			[{trace,Tracee,call,{?MODULE,f1,[start]}},
-			 {trace,Tracee,return_to,
-			  {?MODULE,'-silent_no_ms/1-fun-2-',0}},
-			 {trace,Tracee,call,{?MODULE,f2,[f,g]}},
-			 {trace,Tracee,return_to,
-			  {?MODULE,'-silent_no_ms/1-fun-2-',0}},
-		         {trace,Tracee,call,{erlang,integer_to_list,[2]}},
-			 {trace,Tracee,return_to,
-			  {?MODULE,'-silent_no_ms/1-fun-2-',0}},
-			 {trace,Tracee,call,{?MODULE,f2,[h,i]}},
-			 {trace,Tracee,return_to,{?MODULE,f3,2}}]
-	    end).
-
-silent_test(doc) ->
-    ["Test that match_spec_test does not activate silent"];
+    tr(
+      fun () -> 
+              ?MODULE:f1(a),
+              ?MODULE:f2(b, c),
+              _ = erlang:integer_to_list(id(1)),
+              ?MODULE:f3(d, e),
+              ?MODULE:f1(start),
+              ?MODULE:f2(f, g),
+              _ = erlang:integer_to_list(id(2)),
+              ?MODULE:f3(h, i),
+              ?MODULE:f1(stop),
+              ?MODULE:f2(j, k),
+              _ = erlang:integer_to_list(id(3)),
+              ?MODULE:f3(l, m)
+      end,
+      fun (Tracee) ->
+              1 = erlang:trace(Tracee, true, [call,silent,return_to]),
+              1 = erlang:trace_pattern( {?MODULE,f2,2}, [], [local]),
+              1 = erlang:trace_pattern( {erlang,integer_to_list,1}, [], [local]),
+              1 = erlang:trace_pattern(
+                    {?MODULE,f1,1},
+                    [{[start],[],[{silent,false}]},
+                     {[stop],[],[{silent,true}]}],
+                    [local]),
+              %%
+              %% Expected:
+              %%
+              [{trace,Tracee,call,{?MODULE,f1,[start]}},
+               {trace,Tracee,return_to,
+                {?MODULE,'-silent_no_ms/1-fun-2-',0}},
+               {trace,Tracee,call,{?MODULE,f2,[f,g]}},
+               {trace,Tracee,return_to,
+                {?MODULE,'-silent_no_ms/1-fun-2-',0}},
+               {trace,Tracee,call,{erlang,integer_to_list,[2]}},
+               {trace,Tracee,return_to,
+                {?MODULE,'-silent_no_ms/1-fun-2-',0}},
+               {trace,Tracee,call,{?MODULE,f2,[h,i]}},
+               {trace,Tracee,return_to,{?MODULE,f3,2}}]
+      end).
+
+%% Test that match_spec_test does not activate silent
 silent_test(_Config) ->
     {flags,[]} = erlang:trace_info(self(),flags),
     erlang:match_spec_test([],[{'_',[],[{silent,true}]}],trace),
     {flags,[]} = erlang:trace_info(self(),flags).
 
 
-ms_trace2(doc) ->
-    ["Test the match spec functions {trace/2}"];
-ms_trace2(suite) -> [];
+%% Test the match spec functions {trace/2}
 ms_trace2(Config) when is_list(Config) ->
     Tracer = self(),
     %% Meta trace init
@@ -523,75 +453,58 @@ ms_trace2(Config) when is_list(Config) ->
     %% Trace global f1/1, local f2/2, global erlang:integer_to_list/1
     %% without match spec. Use match spec functions
     %% {trace/2} to control trace through fn/2,3.
-    ?line tr(
-	    fun () -> 
-		    ?MODULE:f1(a),
-		    ?MODULE:f2(b, c),
-		    _ = erlang:integer_to_list(id(1)),
-		    ?MODULE:f3(d, e),
-		    fn([all], [call,return_to,{tracer,Tracer}]),
-		    ?MODULE:f1(f),
-		    f2(g, h),
-		    f1(i),
-		    _ = erlang:integer_to_list(id(2)),
-		    ?MODULE:f3(j, k),
-		    fn([call,return_to], []),
-		    ?MODULE:f1(l),
-		    ?MODULE:f2(m, n),
-		    _ = erlang:integer_to_list(id(3)),
-		    ?MODULE:f3(o, p)
-	    end,
-	    fun (Tracee) ->
-		    ?line 1 = 
-			erlang:trace(Tracee, false, [all]),
-		    ?line 1 =
-			erlang:trace_pattern(
-			  {?MODULE,f1,1}, 
-			  [], 
-			  [global]),
-		    ?line 1 =
-			erlang:trace_pattern(
-			  {?MODULE,f2,2}, 
-			  [], 
-			  [local]),
-		    ?line 1 = 
-			erlang:trace_pattern(
-			  {erlang,integer_to_list,1}, 
-			  [], 
-			  [global]),
-		    ?line 3 = 
-			erlang:trace_pattern(
-			  {?MODULE,fn,'_'},
-			  [{['$1','$2'],[],
-			    [{trace,'$1','$2'},{message,ms_trace2}]}],
-			  [meta]),
-		    %%
-		    %% Expected: (no return_to for global call trace)
-		    %%
-		    ?line Origin = {match_spec_SUITE,'-ms_trace2/1-fun-0-',1},
-		    ?line
-			[{trace_ts,Tracee,call,
-			  {?MODULE,fn,
-			   [[all],[call,return_to,{tracer,Tracer}]]},
-			  ms_trace2},
-			 {trace,Tracee,call,{?MODULE,f1,[f]}},
-			 {trace,Tracee,call,{?MODULE,f2,[g,h]}},
-			 {trace,Tracee,return_to,Origin},
-		         {trace,Tracee,call,{erlang,integer_to_list,[2]}},
-			 {trace,Tracee,call,{?MODULE,f2,[j,k]}},
-			 {trace,Tracee,return_to,{?MODULE,f3,2}},
-			 {trace_ts,Tracee,call,
-			  {?MODULE,fn,
-			   [[call,return_to],[]]},
-			  ms_trace2}]
-	    end),
+    tr(
+      fun () -> 
+              ?MODULE:f1(a),
+              ?MODULE:f2(b, c),
+              _ = erlang:integer_to_list(id(1)),
+              ?MODULE:f3(d, e),
+              fn([all], [call,return_to,{tracer,Tracer}]),
+              ?MODULE:f1(f),
+              f2(g, h),
+              f1(i),
+              _ = erlang:integer_to_list(id(2)),
+              ?MODULE:f3(j, k),
+              fn([call,return_to], []),
+              ?MODULE:f1(l),
+              ?MODULE:f2(m, n),
+              _ = erlang:integer_to_list(id(3)),
+              ?MODULE:f3(o, p)
+      end,
+      fun (Tracee) ->
+              1 = erlang:trace(Tracee, false, [all]),
+              1 = erlang:trace_pattern( {?MODULE,f1,1}, [], [global]),
+              1 = erlang:trace_pattern( {?MODULE,f2,2}, [], [local]),
+              1 = erlang:trace_pattern( {erlang,integer_to_list,1}, [], [global]),
+              3 = erlang:trace_pattern(
+                    {?MODULE,fn,'_'},
+                    [{['$1','$2'],[],
+                      [{trace,'$1','$2'},{message,ms_trace2}]}],
+                    [meta]),
+              %%
+              %% Expected: (no return_to for global call trace)
+              %%
+              Origin = {match_spec_SUITE,'-ms_trace2/1-fun-0-',1},
+              [{trace_ts,Tracee,call,
+                {?MODULE,fn,
+                 [[all],[call,return_to,{tracer,Tracer}]]},
+                ms_trace2},
+               {trace,Tracee,call,{?MODULE,f1,[f]}},
+               {trace,Tracee,call,{?MODULE,f2,[g,h]}},
+               {trace,Tracee,return_to,Origin},
+               {trace,Tracee,call,{erlang,integer_to_list,[2]}},
+               {trace,Tracee,call,{?MODULE,f2,[j,k]}},
+               {trace,Tracee,return_to,{?MODULE,f3,2}},
+               {trace_ts,Tracee,call,
+                {?MODULE,fn,
+                 [[call,return_to],[]]},
+                ms_trace2}]
+      end),
     ok.
 
 
 
-ms_trace3(doc) ->
-    ["Test the match spec functions {trace/3}"];
-ms_trace3(suite) -> [];
+%% Test the match spec functions {trace/3}
 ms_trace3(Config) when is_list(Config) ->
     TraceeName = 'match_spec_SUITE:ms_trace3',
     Tracer = self(),
@@ -602,134 +515,115 @@ ms_trace3(Config) when is_list(Config) ->
     %% {trace/2} to control trace through fn/2,3.
     Tag = make_ref(),
     Controller =
-	spawn_link(
-	  fun () ->
-		  receive 
-		      {Tracee,Tag,start} ->
-			  fn(TraceeName, [all], 
-			     [call,return_to,send,'receive',
-			      {tracer,Tracer}]),
-			  Tracee ! {self(),Tag,started},
-			  receive {Tracee,Tag,stop_1} -> ok end,
-			  fn(Tracee, [call,return_to], []),
-			  Tracee ! {self(),Tag,stopped_1},
-			  receive {Tracee,Tag,stop_2} -> ok end,
-			  fn(Tracee, [all], []),
-			  Tracee ! {self(),Tag,stopped_2}
-		  end
-	  end),
-    ?line tr(
-	    fun () -> %% Action
-		    register(TraceeName, self()),
-		    ?MODULE:f1(a),
-		    ?MODULE:f2(b, c),
-		    _ = erlang:integer_to_list(id(1)),
-		    ?MODULE:f3(d, e),
-		    Controller ! {self(),Tag,start},
-		    receive {Controller,Tag,started} -> ok end,
-		    ?MODULE:f1(f),
-		    f2(g, h),
-		    f1(i),
-		    _ = erlang:integer_to_list(id(2)),
-		    ?MODULE:f3(j, k),
-		    Controller ! {self(),Tag,stop_1},
-		    receive {Controller,Tag,stopped_1} -> ok end,
-		    ?MODULE:f1(l),
-		    ?MODULE:f2(m, n),
-		    _ = erlang:integer_to_list(id(3)),
-		    ?MODULE:f3(o, p),
-		    Controller ! {self(),Tag,stop_2},
-		    receive {Controller,Tag,stopped_2} -> ok end,
-		    ?MODULE:f1(q),
-		    ?MODULE:f2(r, s),
-		    _ = erlang:integer_to_list(id(4)),
-		    ?MODULE:f3(t, u)
-	    end,
-	    
-	    fun (Tracee) -> %% Startup
-		    ?line 1 = 
-			erlang:trace(Tracee, false, [all]),
-		    ?line 1 =
-			erlang:trace_pattern(
-			  {?MODULE,f1,1}, 
-			  [], 
-			  [global]),
-		    ?line 1 =
-			erlang:trace_pattern(
-			  {?MODULE,f2,2}, 
-			  [], 
-			  [local]),
-		    ?line 1 = 
-			erlang:trace_pattern(
-			  {erlang,integer_to_list,1}, 
-			  [], 
-			  [global]),
-		    ?line 3 = 
-			erlang:trace_pattern(
-			  {?MODULE,fn,'_'},
-			  [{['$1','$2','$3'],[],
-			    [{trace,'$1','$2','$3'},{message,Tag}]}],
-			  [meta]),
-		    %%
-		    %% Expected: (no return_to for global call trace)
-		    %%
-		    ?line Origin = {match_spec_SUITE,'-ms_trace3/1-fun-1-',2},
-		    ?line
-			[{trace_ts,Controller,call,
-			  {?MODULE,fn,[TraceeName,[all],
-				       [call,return_to,send,'receive',
-					{tracer,Tracer}]]},
-			  Tag},
-			 {trace,Tracee,'receive',{Controller,Tag,started}},
-			 {trace,Tracee,call,{?MODULE,f1,[f]}},
-			 {trace,Tracee,call,{?MODULE,f2,[g,h]}},
-			 {trace,Tracee,return_to,Origin},
-		         {trace,Tracee,call,{erlang,integer_to_list,[2]}},
-			 {trace,Tracee,call,{?MODULE,f2,[j,k]}},
-			 {trace,Tracee,return_to,{?MODULE,f3,2}},
-			 {trace,Tracee,send,{Tracee,Tag,stop_1},Controller},
-			 {trace_ts,Controller,call,
-			  {?MODULE,fn,[Tracee,[call,return_to],[]]},
-			  Tag},
-			 {trace_ts,Controller,call,
-			  {?MODULE,fn,[Tracee,[all],[]]},
-			  Tag}]
-	    end),
+    spawn_link(
+      fun () ->
+              receive 
+                  {Tracee,Tag,start} ->
+                      fn(TraceeName, [all], 
+                         [call,return_to,send,'receive',
+                          {tracer,Tracer}]),
+                      Tracee ! {self(),Tag,started},
+                      receive {Tracee,Tag,stop_1} -> ok end,
+                      fn(Tracee, [call,return_to], []),
+                      Tracee ! {self(),Tag,stopped_1},
+                      receive {Tracee,Tag,stop_2} -> ok end,
+                      fn(Tracee, [all], []),
+                      Tracee ! {self(),Tag,stopped_2}
+              end
+      end),
+    tr(
+      fun () -> %% Action
+              register(TraceeName, self()),
+              ?MODULE:f1(a),
+              ?MODULE:f2(b, c),
+              _ = erlang:integer_to_list(id(1)),
+              ?MODULE:f3(d, e),
+              Controller ! {self(),Tag,start},
+              receive {Controller,Tag,started} -> ok end,
+              ?MODULE:f1(f),
+              f2(g, h),
+              f1(i),
+              _ = erlang:integer_to_list(id(2)),
+              ?MODULE:f3(j, k),
+              Controller ! {self(),Tag,stop_1},
+              receive {Controller,Tag,stopped_1} -> ok end,
+              ?MODULE:f1(l),
+              ?MODULE:f2(m, n),
+              _ = erlang:integer_to_list(id(3)),
+              ?MODULE:f3(o, p),
+              Controller ! {self(),Tag,stop_2},
+              receive {Controller,Tag,stopped_2} -> ok end,
+              ?MODULE:f1(q),
+              ?MODULE:f2(r, s),
+              _ = erlang:integer_to_list(id(4)),
+              ?MODULE:f3(t, u)
+      end,
+
+      fun (Tracee) -> %% Startup
+              1 = erlang:trace(Tracee, false, [all]),
+              1 = erlang:trace_pattern( {?MODULE,f1,1}, [], [global]),
+              1 = erlang:trace_pattern( {?MODULE,f2,2}, [], [local]),
+              1 = erlang:trace_pattern( {erlang,integer_to_list,1}, [], [global]),
+              3 = erlang:trace_pattern(
+                    {?MODULE,fn,'_'},
+                    [{['$1','$2','$3'],[],
+                      [{trace,'$1','$2','$3'},{message,Tag}]}],
+                    [meta]),
+              %%
+              %% Expected: (no return_to for global call trace)
+              %%
+              Origin = {match_spec_SUITE,'-ms_trace3/1-fun-1-',2},
+              [{trace_ts,Controller,call,
+                {?MODULE,fn,[TraceeName,[all],
+                             [call,return_to,send,'receive',
+                              {tracer,Tracer}]]},
+                Tag},
+               {trace,Tracee,'receive',{Controller,Tag,started}},
+               {trace,Tracee,call,{?MODULE,f1,[f]}},
+               {trace,Tracee,call,{?MODULE,f2,[g,h]}},
+               {trace,Tracee,return_to,Origin},
+               {trace,Tracee,call,{erlang,integer_to_list,[2]}},
+               {trace,Tracee,call,{?MODULE,f2,[j,k]}},
+               {trace,Tracee,return_to,{?MODULE,f3,2}},
+               {trace,Tracee,send,{Tracee,Tag,stop_1},Controller},
+               {trace_ts,Controller,call,
+                {?MODULE,fn,[Tracee,[call,return_to],[]]},
+                Tag},
+               {trace_ts,Controller,call,
+                {?MODULE,fn,[Tracee,[all],[]]},
+                Tag}]
+      end),
     ok.
 
 
 
-destructive_in_test_bif(doc) ->
-    ["Test that destructive operations in test bif does not really happen"];
-destructive_in_test_bif(suite) -> [];
+%% Test that destructive operations in test bif does not really happen
 destructive_in_test_bif(Config) when is_list(Config) ->
-    ?line {ok,OldToken,_,_} = erlang:match_spec_test
+    {ok,OldToken,_,_} = erlang:match_spec_test
 				([],
 				 [{'_',[],[{message,{get_seq_token}}]}],trace),
-    ?line {ok,_,_,_} = erlang:match_spec_test
+    {ok,_,_,_} = erlang:match_spec_test
 			 ([],
 			  [{'_',[],[{message,{set_seq_token, label, 1}}]}],
 			  trace),
-    ?line {ok,OldToken,_,_} = erlang:match_spec_test
+    {ok,OldToken,_,_} = erlang:match_spec_test
 				([],
 				 [{'_',[],[{message,{get_seq_token}}]}],trace),
-    ?line {ok, OldTCW,_,_} = erlang:match_spec_test
+    {ok, OldTCW,_,_} = erlang:match_spec_test
 			       ([],[{'_',[],[{message,{get_tcw}}]}],trace),
-    ?line {ok,OldTCW,_,_} = erlang:match_spec_test
+    {ok,OldTCW,_,_} = erlang:match_spec_test
 			      ([],
 			       [{'_',[],[{message,{set_tcw, OldTCW+1}}]}],
 			       trace),
-    ?line {ok, OldTCW,_,_} = erlang:match_spec_test
+    {ok, OldTCW,_,_} = erlang:match_spec_test
 			       ([],[{'_',[],[{message,{get_tcw}}]}],trace),
     ok.
 
-boxed_and_small(doc) ->
-    ["Test that the comparision between boxed and small does not crash emulator"];
-boxed_and_small(suite) -> [];
+%% Test that the comparision between boxed and small does not crash emulator
 boxed_and_small(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_node(match_spec_suite_other),
-    ?line ok = rpc:call(Node,?MODULE,do_boxed_and_small,[]),
-    ?line stop_node(Node),
+    {ok, Node} = start_node(match_spec_suite_other),
+    ok = rpc:call(Node,?MODULE,do_boxed_and_small,[]),
+    stop_node(Node),
     ok.
 
 do_boxed_and_small() ->
@@ -739,13 +633,11 @@ do_boxed_and_small() ->
     {ok, false, _, _} = erlang:match_spec_test({0,3},[{{make_ref(),'_'},[],['$_']}],table),
     ok.
 
-faulty_seq_trace(doc) ->
-    ["Test that faulty seq_trace_call does not crash emulator"];
-faulty_seq_trace(suite) -> [];
+%% Test that faulty seq_trace_call does not crash emulator
 faulty_seq_trace(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_node(match_spec_suite_other),
-    ?line ok = rpc:call(Node,?MODULE,do_faulty_seq_trace,[]),
-    ?line stop_node(Node),
+    {ok, Node} = start_node(match_spec_suite_other),
+    ok = rpc:call(Node,?MODULE,do_faulty_seq_trace,[]),
+    stop_node(Node),
     ok.
 
 do_faulty_seq_trace() ->
@@ -757,63 +649,58 @@ errchk(Pat) ->
 	{'EXIT', {badarg, _}} ->
 	    ok;
 	Other ->
-	    test_server:fail({noerror, Other})
+	    ct:fail({noerror, Other})
     end.
 
-unary_minus(suite) ->
-    [];
-unary_minus(doc) ->
-    ["Checks that unary minus works"];
+%% Checks that unary minus works
 unary_minus(Config) when is_list(Config) ->
-    ?line {ok,true,[],[]} = erlang:match_spec_test
+    {ok,true,[],[]} = erlang:match_spec_test
 			      (5,
 			       [{'$1',
 				 [{'<',{'-','$1'},-4}],
 				 [true]}],
 			       table),
-    ?line {ok,false,[],[]} = erlang:match_spec_test
+    {ok,false,[],[]} = erlang:match_spec_test
 			      (5,
 			       [{'$1',
 				 [{'<',{'-','$1'},-6}],
 				 [true]}],
 			       table),
-    ?line {ok,true,[],[]} = erlang:match_spec_test
+    {ok,true,[],[]} = erlang:match_spec_test
 			      (5,
 			       [{'$1',
 				 [{'=:=',{'-','$1',2},3}],
 				 [true]}],
 			       table),
-    ?line {ok,false,[],[]} = erlang:match_spec_test
+    {ok,false,[],[]} = erlang:match_spec_test
 			      (hej,
 			       [{'$1',
 				 [{'=/=',{'-','$1'},0}],
 				 [true]}],
 			       table),
     ok.
-unary_plus(suite) ->
-    [];
-unary_plus(doc) ->
-    ["Checks that unary plus works"];
+
+%% Checks that unary plus works
 unary_plus(Config) when is_list(Config) ->
-    ?line {ok,true,[],[]} = erlang:match_spec_test
+    {ok,true,[],[]} = erlang:match_spec_test
 			      (5,
 			       [{'$1',
 				 [{'<',{'+','$1'},6}],
 				 [true]}],
 			       table),
-    ?line {ok,false,[],[]} = erlang:match_spec_test
+    {ok,false,[],[]} = erlang:match_spec_test
 			      (5,
 			       [{'$1',
 				 [{'<',{'+','$1'},4}],
 				 [true]}],
 			       table),
-    ?line {ok,true,[],[]} = erlang:match_spec_test
+    {ok,true,[],[]} = erlang:match_spec_test
 			      (5,
 			       [{'$1',
 				 [{'=:=',{'+','$1',2},7}],
 				 [true]}],
 			       table),
-    ?line {ok,false,[],[]} = erlang:match_spec_test
+    {ok,false,[],[]} = erlang:match_spec_test
 			      (hej,
 			       [{'$1',
 				 [{'=/=',{'+','$1'},0}],
@@ -824,53 +711,50 @@ unary_plus(Config) when is_list(Config) ->
 
     
 
-guard_exceptions(suite) ->
-    [];
-guard_exceptions(doc) ->
-    ["Checks that exceptions in guards are handled correctly"];
+%% Checks that exceptions in guards are handled correctly
 guard_exceptions(Config) when is_list(Config) ->
-    ?line {ok,false,[],[]} = erlang:match_spec_test
+    {ok,false,[],[]} = erlang:match_spec_test
 			       (5,
 				[{'$1',
 				  [{'or',{is_integer,'$1'},{'or','$1','$1'}}],
 				  [true]}],
 				table),
-    ?line {ok,true,[],[]} = erlang:match_spec_test
+    {ok,true,[],[]} = erlang:match_spec_test
 			       (5,
 				[{'$1',
 				  [{'orelse',{is_integer,'$1'},
 				    {'or','$1','$1'}}],
 				  [true]}],
 				table),
-    ?line {ok,false,[],[]} = erlang:match_spec_test
+    {ok,false,[],[]} = erlang:match_spec_test
 			       (5,
 				[{'$1',
 				  [{'orelse',{'or','$1',true},
 				    {is_integer,'$1'}}],
 				  [true]}],
 				table),
-    ?line {ok,false,[],[]} = erlang:match_spec_test
+    {ok,false,[],[]} = erlang:match_spec_test
 			       (5,
 				[{'$1',
 				  [{'or',{is_integer,'$1'},
 				    {'orelse','$1',true}}],
 				  [true]}],
 				table),
-    ?line {ok,true,[],[]} = erlang:match_spec_test
+    {ok,true,[],[]} = erlang:match_spec_test
 			       (5,
 				[{'$1',
 				  [{'or',{is_integer,'$1'},
 				    {'orelse',true,'$1'}}],
 				  [true]}],
 				table),
-    ?line {ok,true,[],[]} = erlang:match_spec_test
+    {ok,true,[],[]} = erlang:match_spec_test
 			       (5,
 				[{'$1',
 				  [{'or',{is_integer,'$1'},
 				    {'andalso',false,'$1'}}],
 				  [true]}],
 				table),
-    ?line {ok,false,[],[]} = erlang:match_spec_test
+    {ok,false,[],[]} = erlang:match_spec_test
 			       (5,
 				[{'$1',
 				  [{'or',{is_integer,'$1'},
@@ -878,7 +762,7 @@ guard_exceptions(Config) when is_list(Config) ->
 				  [true]}],
 				table),
 
-    ?line {ok,false,[],[]} = erlang:match_spec_test
+    {ok,false,[],[]} = erlang:match_spec_test
 			       (5,
 				[{'$1',
 				  [{'or',{is_integer,'$1'},
@@ -888,19 +772,16 @@ guard_exceptions(Config) when is_list(Config) ->
 
     ok.
 
-fpe(suite) ->
-    [];
-fpe(doc) ->
-    ["Checks floating point exceptions in match-specs"];
+%% Checks floating point exceptions in match-specs
 fpe(Config) when is_list(Config) ->
     MS = [{{'$1'},[],[{'/','$1',0}]}],
     case catch (['EXIT','EXIT'] = 
 		ets:match_spec_run([{1},{2}],ets:match_spec_compile(MS))) of 
-	{'EXIT',_} -> test_server:fail({error, 
-					"Floating point exceptions faulty"});
+	{'EXIT',_} -> ct:fail({error, "Floating point exceptions faulty"});
 	_ -> ok 
     end.
 
+%% Test maps in match-specs
 maps(Config) when is_list(Config) ->
     {ok,#{},[],[]} = erlang:match_spec_test(#{}, [{'_',[],['$_']}], table),
     {ok,#{},[],[]} = erlang:match_spec_test(#{}, [{#{},[],['$_']}], table),
@@ -980,11 +861,11 @@ moving_labels(Config) when is_list(Config) ->
     %% point at their correct target.
     %% 
     Ms = [{{'$1','$2'},[],[{{ok,{'andalso','$1','$2'},[1,2,3]}}]}],
-    ?line {ok,{ok,false,[1,2,3]},[],[]} =
+    {ok,{ok,false,[1,2,3]},[],[]} =
 	erlang:match_spec_test({true,false}, Ms, table),
 
     Ms2 = [{{'$1','$2'},[],[{{ok,{'orelse','$1','$2'},[1,2,3]}}]}],
-    ?line {ok,{ok,true,[1,2,3]},[],[]} =
+    {ok,{ok,true,[1,2,3]},[],[]} =
 	erlang:match_spec_test({true,false}, Ms2, table),
 
     ok.
@@ -995,13 +876,13 @@ tr(Fun, MFA, Pat, Expected) ->
 tr(Fun, MFA, TraceFlags, Pat, PatFlags, Expected0) ->
     tr(Fun,
        fun(P) ->
-	       erlang:trace(P, true, TraceFlags),
-	       erlang:trace_pattern(MFA, Pat, PatFlags),
-	       lists:map(
-		 fun(X) when is_function(X,1) -> X;
-		    (X) -> list_to_tuple([trace, P | tuple_to_list(X)])
-		 end,
-		 Expected0)
+               erlang:trace(P, true, TraceFlags),
+               erlang:trace_pattern(MFA, Pat, PatFlags),
+               lists:map(
+                 fun(X) when is_function(X,1) -> X;
+                    (X) -> list_to_tuple([trace, P | tuple_to_list(X)])
+                 end,
+                 Expected0)
        end).
 
 tr(RunFun, ControlFun) ->
@@ -1016,51 +897,51 @@ collect(P, TMs) ->
 collect([]) ->
     receive
 	M ->
-	    ?t:format("Got unexpected: ~p~n", [M]),
+	    io:format("Got unexpected: ~p~n", [M]),
 	    flush({got_unexpected,M})
     after 17 ->
 	    ok
     end;
 collect([TM | TMs]) ->
-    ?t:format(        "Expecting:      ~p~n", [TM]),
+    io:format(        "Expecting:      ~p~n", [TM]),
     receive
-	M0 ->
-	    M = case element(1, M0) of
-		    trace_ts ->
-			list_to_tuple(lists:reverse(
-					tl(lists:reverse(tuple_to_list(M0)))));
-		    _ -> M0
-		end,
-	    case is_function(TM,1) of
-		true ->
-		    case (catch TM(M)) of
-			true ->
-			    ?t:format("Got:            ~p~n", [M]),
-			    collect(TMs);
-			_ ->
-			    ?t:format("Got unexpected: ~p~n", [M]),
-			    flush({got_unexpected,M})
-		    end;
-
-		false ->
-		    case M of
-			TM ->
-			    ?t:format("Got:            ~p~n", [M]),
-			    collect(TMs);
-			_ ->
-			    ?t:format("Got unexpected: ~p~n", [M]),
-			    flush({got_unexpected,M})
-		    end
-	    end
+        M0 ->
+            M = case element(1, M0) of
+                    trace_ts ->
+                        list_to_tuple(lists:reverse(
+                                        tl(lists:reverse(tuple_to_list(M0)))));
+                    _ -> M0
+                end,
+            case is_function(TM,1) of
+                true ->
+                    case (catch TM(M)) of
+                        true ->
+                            io:format("Got:            ~p~n", [M]),
+                            collect(TMs);
+                        _ ->
+                            io:format("Got unexpected: ~p~n", [M]),
+                            flush({got_unexpected,M})
+                    end;
+
+                false ->
+                    case M of
+                        TM ->
+                            io:format("Got:            ~p~n", [M]),
+                            collect(TMs);
+                        _ ->
+                            io:format("Got unexpected: ~p~n", [M]),
+                            flush({got_unexpected,M})
+                    end
+            end
     end.
 
 flush(Reason) ->
     receive
-	M ->
-	    ?t:format("In queue:       ~p~n", [M]),
-	    flush(Reason)
+        M ->
+            io:format("In queue:       ~p~n", [M]),
+            flush(Reason)
     after 17 ->
-	    ?t:fail(Reason)
+              ct:fail(Reason)
     end.
 
 start_collect(P) ->
@@ -1071,33 +952,33 @@ stop_collect(P) ->
 stop_collect(P, Order) ->
     P ! {Order, self()},
     receive
-	{gone, P} ->
-	    ok
+        {gone, P} ->
+            ok
     end.
 
 
 runner(Collector, Fun) ->
     receive
-	{go, Collector} ->
-	    go
+        {go, Collector} ->
+            go
     end,
     Fun(),
     receive
-	{done, Collector} ->
-	    Collector ! {gone, self()}
+        {done, Collector} ->
+            Collector ! {gone, self()}
     end.
 
 loop_runner(Collector, Fun, Laps) ->
     receive
-	{go, Collector} ->
-	    go
+        {go, Collector} ->
+            go
     end,
     loop_runner_cont(Collector, Fun, 0, Laps).
 
 loop_runner_cont(Collector, _Fun, Laps, Laps) ->
     receive
-	{done, Collector} -> ok;
-	{abort, Collector} -> ok
+        {done, Collector} -> ok;
+        {abort, Collector} -> ok
     end,
     io:format("loop_runner ~p exit after ~p laps\n", [self(), Laps]),
     Collector ! {gone, self()};
@@ -1105,11 +986,11 @@ loop_runner_cont(Collector, _Fun, Laps, Laps) ->
 loop_runner_cont(Collector, Fun, N, Laps) ->
     Fun(),
     receive
-	{abort, Collector} ->
-	    io:format("loop_runner ~p aborted after ~p of ~p laps\n", [self(), N+1, Laps]),
-	    Collector ! {gone, self()}
+        {abort, Collector} ->
+            io:format("loop_runner ~p aborted after ~p of ~p laps\n", [self(), N+1, Laps]),
+            Collector ! {gone, self()}
     after 0 ->
-	    loop_runner_cont(Collector, Fun, N+1, Laps)
+              loop_runner_cont(Collector, Fun, N+1, Laps)
     end.
 
 
@@ -1141,7 +1022,7 @@ start_node(Name) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Cookie = atom_to_list(erlang:get_cookie()),
     test_server:start_node(Name, slave, 
-			   [{args, "-setcookie " ++ Cookie ++" -pa " ++ Pa}]).
+                           [{args, "-setcookie " ++ Cookie ++" -pa " ++ Pa}]).
 
 stop_node(Node) ->
     test_server:stop_node(Node).
diff --git a/erts/emulator/test/message_queue_data_SUITE.erl b/erts/emulator/test/message_queue_data_SUITE.erl
new file mode 100644
index 0000000000..12c42d24aa
--- /dev/null
+++ b/erts/emulator/test/message_queue_data_SUITE.erl
@@ -0,0 +1,213 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2014. 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%
+%%
+
+-module(message_queue_data_SUITE).
+
+-export([all/0, suite/0]).
+-export([basic/1, process_info_messages/1]).
+
+-export([basic_test/1]).
+
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 2}}].
+
+all() -> 
+    [basic, process_info_messages].
+
+%%
+%%
+%% Test cases
+%%
+%%
+
+basic(Config) when is_list(Config) ->
+
+    basic_test(erlang:system_info(message_queue_data)),
+
+    {ok, Node1} = start_node(Config, "+xmqd off_heap"),
+    ok = rpc:call(Node1, ?MODULE, basic_test, [off_heap]),
+    stop_node(Node1),
+
+    {ok, Node2} = start_node(Config, "+xmqd on_heap"),
+    ok = rpc:call(Node2, ?MODULE, basic_test, [on_heap]),
+    stop_node(Node2),
+
+    {ok, Node3} = start_node(Config, "+xmqd mixed"),
+    ok = rpc:call(Node3, ?MODULE, basic_test, [mixed]),
+    stop_node(Node3),
+
+    ok.
+
+is_valid_mqd_value(off_heap) ->
+    true;
+is_valid_mqd_value(on_heap) ->
+    true;
+is_valid_mqd_value(mixed) ->
+    true;
+is_valid_mqd_value(_) ->
+    false.
+
+
+basic_test(Default) ->
+
+    Default = erlang:system_info(message_queue_data),
+    true = is_valid_mqd_value(Default),
+
+    {message_queue_data, Default} = process_info(self(), message_queue_data),
+    Default = process_flag(message_queue_data, off_heap),
+    {message_queue_data, off_heap} = process_info(self(), message_queue_data),
+    off_heap = process_flag(message_queue_data, on_heap),
+    {message_queue_data, on_heap} = process_info(self(), message_queue_data),
+    on_heap = process_flag(message_queue_data, mixed),
+    {message_queue_data, mixed} = process_info(self(), message_queue_data),
+    mixed = process_flag(message_queue_data, Default),
+    {'EXIT', _} = (catch process_flag(message_queue_data, blupp)),
+
+    P1 = spawn_opt(fun () -> receive after infinity -> ok end end,
+		   [link]),
+    {message_queue_data, Default} = process_info(P1, message_queue_data),
+    unlink(P1),
+    exit(P1, bye),
+
+    P2 = spawn_opt(fun () -> receive after infinity -> ok end end,
+		   [link, {message_queue_data, off_heap}]),
+    {message_queue_data, off_heap} = process_info(P2, message_queue_data),
+    unlink(P2),
+    exit(P2, bye),
+
+    P3 = spawn_opt(fun () -> receive after infinity -> ok end end,
+		   [link, {message_queue_data, on_heap}]),
+    {message_queue_data, on_heap} = process_info(P3, message_queue_data),
+    unlink(P3),
+    exit(P3, bye),
+
+    P4 = spawn_opt(fun () -> receive after infinity -> ok end end,
+		   [link, {message_queue_data, mixed}]),
+    {message_queue_data, mixed} = process_info(P4, message_queue_data),
+    unlink(P4),
+    exit(P4, bye),
+
+    {'EXIT', _} = (catch spawn_opt(fun () -> receive after infinity -> ok end end,
+		   [link, {message_queue_data, blapp}])),
+
+    ok.
+
+process_info_messages(Config) when is_list(Config) ->
+    Tester = self(),
+    P1 = spawn_opt(fun () ->
+			   receive after 500 -> ok end,
+			   mixed = process_flag(message_queue_data, off_heap),
+			   Tester ! first,
+			   receive after 500 -> ok end,
+			   off_heap = process_flag(message_queue_data, on_heap),
+			   Tester ! second,
+			   receive after 500 -> ok end,
+			   on_heap = process_flag(message_queue_data, mixed),
+			   Tester ! third,
+			   receive after 500 -> ok end,
+			   mixed = process_flag(message_queue_data, off_heap),
+			   Tester ! fourth,
+			    
+			   receive after infinity -> ok end
+		   end,
+		   [link, {message_queue_data, mixed}]),
+    
+    P1 ! "A",
+    receive first -> ok end,
+    P1 ! "B",
+    receive second -> ok end,
+    P1 ! "C",
+    receive third -> ok end,
+    P1 ! "D",
+    receive fourth -> ok end,
+    P1 ! "E",
+
+    {messages, ["A", "B", "C", "D", "E"]} = process_info(P1, messages),
+
+    P2 = spawn_opt(fun () ->
+			   receive after 500 -> ok end,
+			   mixed = process_flag(message_queue_data, off_heap),
+			   Tester ! first,
+			   receive after 500 -> ok end,
+			   off_heap = process_flag(message_queue_data, on_heap),
+			   Tester ! second,
+			   receive after 500 -> ok end,
+			   on_heap = process_flag(message_queue_data, mixed),
+			   Tester ! third,
+			   receive after 500 -> ok end,
+			   mixed = process_flag(message_queue_data, off_heap),
+			   Tester ! fourth,
+			   receive after 500 -> ok end,
+
+			   Tester ! process_info(self(), messages),
+
+			   receive M1 -> M1 = "A" end,
+			   receive M2 -> M2 = "B" end,
+			   receive M3 -> M3 = "C" end,
+			   receive M4 -> M4 = "D" end,
+			   receive M5 -> M5 = "E" end,
+
+			   Tester ! self()
+		   end,
+		   [link, {message_queue_data, mixed}]),
+
+    P2 ! "A",
+    receive first -> ok end,
+    P2 ! "B",
+    receive second -> ok end,
+    P2 ! "C",
+    receive third -> ok end,
+    P2 ! "D",
+    receive fourth -> ok end,
+    P2 ! "E",
+
+    receive
+	Msg ->
+	    {messages, ["A", "B", "C", "D", "E"]} = Msg
+    end,
+    
+    receive P2 -> ok end,
+
+    ok.
+
+%%
+%%
+%% helpers
+%%
+%%
+
+start_node(Config) ->
+    start_node(Config, []).
+start_node(Config, Opts) when is_list(Config), is_list(Opts) ->
+    Pa = filename:dirname(code:which(?MODULE)),
+    Name = list_to_atom(atom_to_list(?MODULE)
+			++ "-"
+			++ atom_to_list(proplists:get_value(testcase, Config))
+			++ "-"
+			++ integer_to_list(erlang:system_time(seconds))
+			++ "-"
+			++ integer_to_list(erlang:unique_integer([positive]))),
+    test_server:start_node(Name, slave, [{args, Opts++" -pa "++Pa}]).
+
+stop_node(Node) ->
+    test_server:stop_node(Node).
diff --git a/erts/emulator/test/module_info_SUITE.erl b/erts/emulator/test/module_info_SUITE.erl
index 7c2101ca05..f8208c5866 100644
--- a/erts/emulator/test/module_info_SUITE.erl
+++ b/erts/emulator/test/module_info_SUITE.erl
@@ -20,11 +20,9 @@
 
 -module(module_info_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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,
 	 exports/1,functions/1,deleted/1,native/1,info/1]).
 
 %%-compile(native).
@@ -32,46 +30,23 @@
 %% Helper.
 -export([native_proj/1,native_filter/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 3}}].
 
 all() -> 
     modules().
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 modules() ->
     [exports, functions, deleted, native, info].
 
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(3)),
-    [{watchdog,Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
 %% Should return all functions exported from this module. (local)
 all_exported() ->
     All = add_arity(modules()),
-    lists:sort([{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},
-		{module_info,0},{module_info,1},{native_proj,1},
-		{native_filter,1}|All]).
+    lists:sort([{all,0},{suite,0},
+                {module_info,0},{module_info,1},
+                {native_proj,1},
+                {native_filter,1}|All]).
 
 %% Should return all functions in this module. (local)
 all_functions() ->
@@ -95,7 +70,7 @@ functions(Config) when is_list(Config) ->
 
 %% Test that deleted modules cause badarg
 deleted(Config) when is_list(Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     File = filename:join(Data, "module_info_test"),
     {ok,module_info_test,Code} = compile:file(File, [binary]),
     {module,module_info_test} = erlang:load_module(module_info_test, Code),
diff --git a/erts/emulator/test/monitor_SUITE.erl b/erts/emulator/test/monitor_SUITE.erl
index 4db17969c0..82e3a36c1e 100644
--- a/erts/emulator/test/monitor_SUITE.erl
+++ b/erts/emulator/test/monitor_SUITE.erl
@@ -20,21 +20,20 @@
 
 -module(monitor_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2,
-	 case_1/1, case_1a/1, case_2/1, case_2a/1, mon_e_1/1, demon_e_1/1, demon_1/1,
-	 demon_2/1, demon_3/1, demonitor_flush/1,
-	 local_remove_monitor/1, remote_remove_monitor/1, mon_1/1, mon_2/1,
-	 large_exit/1, list_cleanup/1, mixer/1, named_down/1, otp_5827/1,
-	 monitor_time_offset/1]).
-
--export([init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0, groups/0,
+         case_1/1, case_1a/1, case_2/1, case_2a/1, mon_e_1/1, demon_e_1/1, demon_1/1,
+         demon_2/1, demon_3/1, demonitor_flush/1,
+         local_remove_monitor/1, remote_remove_monitor/1, mon_1/1, mon_2/1,
+         large_exit/1, list_cleanup/1, mixer/1, named_down/1, otp_5827/1,
+         monitor_time_offset/1]).
 
 -export([y2/1, g/1, g0/0, g1/0, large_exit_sub/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 15}}].
 
 all() -> 
     [case_1, case_1a, case_2, case_2a, mon_e_1, demon_e_1,
@@ -47,132 +46,103 @@ groups() ->
     [{remove_monitor, [],
       [local_remove_monitor, remote_remove_monitor]}].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(15)),
-    [{watchdog, Dog},{testcase, Func}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
-case_1(doc) ->
-    "A monitors B, B kills A and then exits (yielded core dump)";
-case_1(suite) -> [];
+%% A monitors B, B kills A and then exits (yielded core dump)
 case_1(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line spawn_link(?MODULE, g0, []),
-    ?line receive _ -> ok end,
+    process_flag(trap_exit, true),
+    spawn_link(?MODULE, g0, []),
+    receive _ -> ok end,
     ok.
 
-case_1a(doc) ->
-    "A monitors B, B kills A and then exits (yielded core dump)";
+%% A monitors B, B kills A and then exits (yielded core dump)
 case_1a(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line spawn_link(?MODULE, g1, []),
-    ?line receive _ -> ok end,
+    process_flag(trap_exit, true),
+    spawn_link(?MODULE, g1, []),
+    receive _ -> ok end,
     ok.
 
 g0() ->
-    ?line B = spawn(?MODULE, g, [self()]),
-    ?line erlang:monitor(process, B),
-    ?line B ! ok,
-    ?line receive ok -> ok end,
+    B = spawn(?MODULE, g, [self()]),
+    erlang:monitor(process, B),
+    B ! ok,
+    receive ok -> ok end,
     ok.
 
 g1() ->
-    ?line {B,_} = spawn_monitor(?MODULE, g, [self()]),
-    ?line B ! ok,
-    ?line receive ok -> ok end,
+    {B,_} = spawn_monitor(?MODULE, g, [self()]),
+    B ! ok,
+    receive ok -> ok end,
     ok.
 
 g(Parent) ->
-    ?line receive ok -> ok end,
-    ?line exit(Parent, foo),
-    ?line ok.
+    receive ok -> ok end,
+    exit(Parent, foo),
+    ok.
 
 
-case_2(doc) ->
-    "A monitors B, B demonitors A (yielded core dump)";
+%% A monitors B, B demonitors A (yielded core dump)
 case_2(Config) when is_list(Config) ->
-    ?line B = spawn(?MODULE, y2, [self()]),
-    ?line R = erlang:monitor(process, B),
-    ?line B ! R,
-    ?line receive
-	      {'EXIT', _} -> ok;
-	      Other ->
-		  test_server:fail({rec, Other})
-	  end,
-    ?line expect_down(R, B, normal),
+    B = spawn(?MODULE, y2, [self()]),
+    R = erlang:monitor(process, B),
+    B ! R,
+    receive
+        {'EXIT', _} -> ok;
+        Other ->
+            ct:fail({rec, Other})
+    end,
+    expect_down(R, B, normal),
     ok.
 
-case_2a(doc) ->
-    "A monitors B, B demonitors A (yielded core dump)";
+%% A monitors B, B demonitors A (yielded core dump)
 case_2a(Config) when is_list(Config) ->
-    ?line {B,R} = spawn_monitor(?MODULE, y2, [self()]),
-    ?line B ! R,
-    ?line receive
-	      {'EXIT', _} -> ok;
-	      Other ->
-		  test_server:fail({rec, Other})
-	  end,
-    ?line expect_down(R, B, normal),
+    {B,R} = spawn_monitor(?MODULE, y2, [self()]),
+    B ! R,
+    receive
+        {'EXIT', _} -> ok;
+        Other ->
+            ct:fail({rec, Other})
+    end,
+    expect_down(R, B, normal),
     ok.
 
 y2(Parent) ->
-    ?line R = receive T -> T end,
-    ?line Parent ! (catch erlang:demonitor(R)),
+    R = receive T -> T end,
+    Parent ! (catch erlang:demonitor(R)),
     ok.
 
 expect_down(Ref, P) ->
     receive
-	{'DOWN', Ref, process, P, Reason} -> 
-	    Reason;
-	Other ->
-	    test_server:fail({rec, Other})
+        {'DOWN', Ref, process, P, Reason} -> 
+            Reason;
+        Other ->
+            ct:fail({rec, Other})
     end.
 
 expect_down(Ref, P, Reason) ->
     receive
-	{'DOWN', Ref, process, P, Reason} -> 
-	    ok;
-	Other ->
-	    test_server:fail({rec, Other})
+        {'DOWN', Ref, process, P, Reason} -> 
+            ok;
+        Other ->
+            ct:fail({rec, Other})
     end.
 
 expect_no_msg() ->
     receive
-	Msg ->
-	    test_server:fail({msg, Msg})
+        Msg ->
+            ct:fail({msg, Msg})
     after 0 ->
-	    ok
+              ok
     end.
 
 %%% Error cases for monitor/2
 
-mon_e_1(doc) ->
-    "Error cases for monitor/2";
-mon_e_1(suite) -> [];
 mon_e_1(Config) when is_list(Config) ->
-    ?line {ok, N} = test_server:start_node(hej, slave, []),
-    ?line mon_error(plutt, self()),
-    ?line mon_error(process, [bingo]),
-    ?line mon_error(process, {rex, N, junk}),
-    ?line mon_error(process, 1),
+    {ok, N} = test_server:start_node(hej, slave, []),
+    mon_error(plutt, self()),
+    mon_error(process, [bingo]),
+    mon_error(process, {rex, N, junk}),
+    mon_error(process, 1),
 
-    ?line true = test_server:stop_node(N),
+    true = test_server:stop_node(N),
     ok.
 
 %%% We would also like to have a test case that tries to monitor something
@@ -185,155 +155,142 @@ mon_e_1(Config) when is_list(Config) ->
 
 mon_error(Type, Item) ->
     case catch erlang:monitor(Type, Item) of
-	{'EXIT', _} ->
-	    ok;
-	Other ->
-	    test_server:fail({err, Other})
+        {'EXIT', _} ->
+            ok;
+        Other ->
+            ct:fail({err, Other})
     end.
 
 %%% Error cases for demonitor/1
 
-demon_e_1(doc) ->
-    "Error cases for demonitor/1";
-demon_e_1(suite) -> [];
 demon_e_1(Config) when is_list(Config) ->
-    ?line {ok, N} = test_server:start_node(hej, slave, []),
-    ?line demon_error(plutt, badarg),
-    ?line demon_error(1, badarg),
+    {ok, N} = test_server:start_node(hej, slave, []),
+    demon_error(plutt, badarg),
+    demon_error(1, badarg),
 
     %% Demonitor with ref created at other node
-    ?line R1 = rpc:call(N, erlang, make_ref, []),
-    ?line demon_error(R1, badarg),
+    R1 = rpc:call(N, erlang, make_ref, []),
+    demon_error(R1, badarg),
 
     %% Demonitor with ref created at wrong monitor link end
-    ?line P0 = self(),
-    ?line P2 = spawn(
-		 fun() ->
-			 P0 ! {self(), ref, erlang:monitor(process,P0)},
-			 receive {P0, stop} -> ok end
-		 end ),
-    ?line receive 
-	      {P2, ref, R2} -> 
-		  ?line demon_error(R2, badarg),
-		  ?line P2 ! {self(), stop};
-	      Other2 ->
-		  test_server:fail({rec, Other2})
-	  end,
-
-    ?line true = test_server:stop_node(N),
+    P0 = self(),
+    P2 = spawn(
+           fun() ->
+                   P0 ! {self(), ref, erlang:monitor(process,P0)},
+                   receive {P0, stop} -> ok end
+           end ),
+    receive 
+        {P2, ref, R2} -> 
+            demon_error(R2, badarg),
+            P2 ! {self(), stop};
+        Other2 ->
+            ct:fail({rec, Other2})
+    end,
+
+    true = test_server:stop_node(N),
     ok.
 
 demon_error(Ref, Reason) ->
     case catch erlang:demonitor(Ref) of
-	{'EXIT', {Reason, _}} ->
-	    ok;
-	Other ->
-	    test_server:fail({err, Other})
+        {'EXIT', {Reason, _}} ->
+            ok;
+        Other ->
+            ct:fail({err, Other})
     end.
 
 %%% No-op cases for demonitor/1
 
-demon_1(doc) ->
-    "demonitor/1";
-demon_1(suite) -> [];
 demon_1(Config) when is_list(Config) ->
-    ?line true = erlang:demonitor(make_ref()),
+    true = erlang:demonitor(make_ref()),
     ok.
 
 
 %%% Cases for demonitor/1
 
-demon_2(doc) ->
-    "Cases for demonitor/1";
-demon_2(suite) -> [];
 demon_2(Config) when is_list(Config) ->
-    ?line R1 = erlang:monitor(process, self()),
-    ?line true = erlang:demonitor(R1),
+    R1 = erlang:monitor(process, self()),
+    true = erlang:demonitor(R1),
     %% Extra demonitor
-    ?line true = erlang:demonitor(R1),
-    ?line expect_no_msg(),
+    true = erlang:demonitor(R1),
+    expect_no_msg(),
 
     %% Normal 'DOWN'
-    ?line P2 = spawn(timer, sleep, [1]),
-    ?line R2 = erlang:monitor(process, P2),
-    ?line case expect_down(R2, P2) of
-	      normal -> ?line ok;
-	      noproc -> ?line ok;
-	      BadReason -> ?line ?t:fail({bad_reason, BadReason})
-	  end,
-
-%% OTP-5772
-%     %% 'DOWN' before demonitor
-%     ?line P3 = spawn(timer, sleep, [100000]),
-%     ?line R3 = erlang:monitor(process, P3),
-%     ?line exit(P3, frop),
-%     ?line erlang:demonitor(R3),
-%     ?line expect_down(R3, P3, frop),
+    P2 = spawn(timer, sleep, [1]),
+    R2 = erlang:monitor(process, P2),
+    case expect_down(R2, P2) of
+        normal -> ok;
+        noproc -> ok;
+        BadReason -> ct:fail({bad_reason, BadReason})
+    end,
+
+    %% OTP-5772
+    %     %% 'DOWN' before demonitor
+    %     P3 = spawn(timer, sleep, [100000]),
+    %     R3 = erlang:monitor(process, P3),
+    %     exit(P3, frop),
+    %     erlang:demonitor(R3),
+    %     expect_down(R3, P3, frop),
 
     %% Demonitor before 'DOWN'
-    ?line P4 = spawn(timer, sleep, [100000]),
-    ?line R4 = erlang:monitor(process, P4),
-    ?line erlang:demonitor(R4),
-    ?line exit(P4, frop),
-    ?line expect_no_msg(),
+    P4 = spawn(timer, sleep, [100000]),
+    R4 = erlang:monitor(process, P4),
+    erlang:demonitor(R4),
+    exit(P4, frop),
+    expect_no_msg(),
 
     ok.
 
-demon_3(doc) ->
-    "Distributed case for demonitor/1 (OTP-3499)";
-demon_3(suite) -> [];
+%% Distributed case for demonitor/1 (OTP-3499)
 demon_3(Config) when is_list(Config) ->
-    ?line {ok, N} = test_server:start_node(hej, slave, []),
+    {ok, N} = test_server:start_node(hej, slave, []),
 
     %% 'DOWN' before demonitor
-    ?line P2 = spawn(N, timer, sleep, [100000]),
-    ?line R2 = erlang:monitor(process, P2),
-    ?line true = test_server:stop_node(N),
-    ?line true = erlang:demonitor(R2),
-    ?line expect_down(R2, P2, noconnection),
+    P2 = spawn(N, timer, sleep, [100000]),
+    R2 = erlang:monitor(process, P2),
+    true = test_server:stop_node(N),
+    true = erlang:demonitor(R2),
+    expect_down(R2, P2, noconnection),
 
-    ?line {ok, N2} = test_server:start_node(hej, slave, []),
+    {ok, N2} = test_server:start_node(hej, slave, []),
 
     %% Demonitor before 'DOWN'
-    ?line P3 = spawn(N2, timer, sleep, [100000]),
-    ?line R3 = erlang:monitor(process, P3),
-    ?line true = erlang:demonitor(R3),
-    ?line true = test_server:stop_node(N2),
-    ?line expect_no_msg(),
+    P3 = spawn(N2, timer, sleep, [100000]),
+    R3 = erlang:monitor(process, P3),
+    true = erlang:demonitor(R3),
+    true = test_server:stop_node(N2),
+    expect_no_msg(),
 
     ok.
 
-demonitor_flush(suite) -> [];
-demonitor_flush(doc) -> [];
 demonitor_flush(Config) when is_list(Config) ->
-    ?line {'EXIT', {badarg, _}} = (catch erlang:demonitor(make_ref(), flush)),
-    ?line {'EXIT', {badarg, _}} = (catch erlang:demonitor(make_ref(), [flus])),
-    ?line {'EXIT', {badarg, _}} = (catch erlang:demonitor(x, [flush])),
-    ?line {ok, N} = test_server:start_node(demonitor_flush, slave, []),
-    ?line ok = demonitor_flush_test(N),
-    ?line true = test_server:stop_node(N),
-    ?line ok = demonitor_flush_test(node()).
-    
+    {'EXIT', {badarg, _}} = (catch erlang:demonitor(make_ref(), flush)),
+    {'EXIT', {badarg, _}} = (catch erlang:demonitor(make_ref(), [flus])),
+    {'EXIT', {badarg, _}} = (catch erlang:demonitor(x, [flush])),
+    {ok, N} = test_server:start_node(demonitor_flush, slave, []),
+    ok = demonitor_flush_test(N),
+    true = test_server:stop_node(N),
+    ok = demonitor_flush_test(node()).
+
 demonitor_flush_test(Node) ->
-    ?line P = spawn(Node, timer, sleep, [100000]),
-    ?line M1 = erlang:monitor(process, P),
-    ?line M2 = erlang:monitor(process, P),
-    ?line M3 = erlang:monitor(process, P),
-    ?line M4 = erlang:monitor(process, P),
-    ?line true = erlang:demonitor(M1, [flush, flush]),
-    ?line exit(P, bang),
-    ?line receive {'DOWN', M2, process, P, bang} -> ok end,
-    ?line receive after 100 -> ok end,
-    ?line true = erlang:demonitor(M3, [flush]),
-    ?line true = erlang:demonitor(M4, []),
-    ?line receive {'DOWN', M4, process, P, bang} -> ok end,
-    ?line receive
-	      {'DOWN', M, _, _, _} =DM when M == M1,
-					    M == M3 ->
-		  ?line ?t:fail({unexpected_down_message, DM})
-	  after 100 ->
-		  ?line ok
-	  end.
+    P = spawn(Node, timer, sleep, [100000]),
+    M1 = erlang:monitor(process, P),
+    M2 = erlang:monitor(process, P),
+    M3 = erlang:monitor(process, P),
+    M4 = erlang:monitor(process, P),
+    true = erlang:demonitor(M1, [flush, flush]),
+    exit(P, bang),
+    receive {'DOWN', M2, process, P, bang} -> ok end,
+    receive after 100 -> ok end,
+    true = erlang:demonitor(M3, [flush]),
+    true = erlang:demonitor(M4, []),
+    receive {'DOWN', M4, process, P, bang} -> ok end,
+    receive
+        {'DOWN', M, _, _, _} =DM when M == M1,
+                                      M == M3 ->
+            ct:fail({unexpected_down_message, DM})
+    after 100 ->
+              ok
+    end.
 
 -define(RM_MON_GROUPS, 100).
 -define(RM_MON_GPROCS, 100).
@@ -341,33 +298,33 @@ demonitor_flush_test(Node) ->
 
 local_remove_monitor(Config) when is_list(Config) ->
     Gs = generate(fun () -> start_remove_monitor_group(node()) end,
-		  ?RM_MON_GROUPS),
+                  ?RM_MON_GROUPS),
     {True, False} = lists:foldl(fun (G, {T, F}) ->
-					receive
-					    {rm_mon_res, G, {GT, GF}} ->
-						{T+GT, F+GF}
-					end
-				end,
-				{0, 0},
-				Gs),
+                                        receive
+                                            {rm_mon_res, G, {GT, GF}} ->
+                                                {T+GT, F+GF}
+                                        end
+                                end,
+                                {0, 0},
+                                Gs),
     erlang:display({local_remove_monitor, True, False}),
     {comment,
      "True = "++integer_to_list(True)++"; False = "++integer_to_list(False)}.
-	
+
 remote_remove_monitor(Config) when is_list(Config) ->
-    ?line {ok, N} = test_server:start_node(demonitor_flush, slave, []),
+    {ok, N} = test_server:start_node(demonitor_flush, slave, []),
     Gs = generate(fun () -> start_remove_monitor_group(node()) end,
-		  ?RM_MON_GROUPS),
+                  ?RM_MON_GROUPS),
     {True, False} = lists:foldl(fun (G, {T, F}) ->
-					receive
-					    {rm_mon_res, G, {GT, GF}} ->
-						{T+GT, F+GF}
-					end
-				end,
-				{0, 0},
-				Gs),
+                                        receive
+                                            {rm_mon_res, G, {GT, GF}} ->
+                                                {T+GT, F+GF}
+                                        end
+                                end,
+                                {0, 0},
+                                Gs),
     erlang:display({remote_remove_monitor, True, False}),
-    ?line true = test_server:stop_node(N),
+    true = test_server:stop_node(N),
     {comment,
      "True = "++integer_to_list(True)++"; False = "++integer_to_list(False)}.
 
@@ -375,161 +332,153 @@ start_remove_monitor_group(Node) ->
     Master = self(),
     spawn_link(
       fun () ->
-	      Ms = generate(fun () ->
-				    P = spawn(Node, fun () -> ok end),
-				    erlang:monitor(process, P)
-			    end, ?RM_MON_GPROCS),
-	      Res = lists:foldl(fun (M, {T, F}) ->
-					case erlang:demonitor(M, [info]) of
-					    true ->
-						receive
-						    {'DOWN', M, _, _, _} ->
-							exit(down_msg_found)
-						after 0 ->
-							ok
-						end,
-						{T+1, F};
-					    false ->
-						receive
-						    {'DOWN', M, _, _, _} ->
-							ok
-						after 0 ->
-							exit(no_down_msg_found)
-						end,
-						{T, F+1}
-					end
-				end,
-				{0,0},
-				Ms),
-	      Master ! {rm_mon_res, self(), Res}
+              Ms = generate(fun () ->
+                                    P = spawn(Node, fun () -> ok end),
+                                    erlang:monitor(process, P)
+                            end, ?RM_MON_GPROCS),
+              Res = lists:foldl(fun (M, {T, F}) ->
+                                        case erlang:demonitor(M, [info]) of
+                                            true ->
+                                                receive
+                                                    {'DOWN', M, _, _, _} ->
+                                                        exit(down_msg_found)
+                                                after 0 ->
+                                                          ok
+                                                end,
+                                                {T+1, F};
+                                            false ->
+                                                receive
+                                                    {'DOWN', M, _, _, _} ->
+                                                        ok
+                                                after 0 ->
+                                                          exit(no_down_msg_found)
+                                                end,
+                                                {T, F+1}
+                                        end
+                                end,
+                                {0,0},
+                                Ms),
+              Master ! {rm_mon_res, self(), Res}
       end).
-					  
-				      
+
+
 %%% Cases for monitor/2
 
-mon_1(doc) ->
-    "Cases for monitor/2";
-mon_1(suite) -> [];
 mon_1(Config) when is_list(Config) ->
     %% Normal case
-    ?line P2 = spawn(timer, sleep, [1]),
-    ?line R2 = erlang:monitor(process, P2),
-    ?line case expect_down(R2, P2) of
-	      normal -> ?line ok;
-	      noproc -> ?line ok;
-	      BadReason -> ?line ?t:fail({bad_reason, BadReason})
-	  end,
-    ?line {P2A,R2A} = spawn_monitor(timer, sleep, [1]),
-    ?line expect_down(R2A, P2A, normal),
+    P2 = spawn(timer, sleep, [1]),
+    R2 = erlang:monitor(process, P2),
+    case expect_down(R2, P2) of
+        normal -> ok;
+        noproc -> ok;
+        BadReason -> ct:fail({bad_reason, BadReason})
+    end,
+    {P2A,R2A} = spawn_monitor(timer, sleep, [1]),
+    expect_down(R2A, P2A, normal),
 
     %% 'DOWN' with other reason
-    ?line P3 = spawn(timer, sleep, [100000]),
-    ?line R3 = erlang:monitor(process, P3),
-    ?line exit(P3, frop),
-    ?line expect_down(R3, P3, frop),
-    ?line {P3A,R3A} = spawn_monitor(timer, sleep, [100000]),
-    ?line exit(P3A, frop),
-    ?line expect_down(R3A, P3A, frop),
+    P3 = spawn(timer, sleep, [100000]),
+    R3 = erlang:monitor(process, P3),
+    exit(P3, frop),
+    expect_down(R3, P3, frop),
+    {P3A,R3A} = spawn_monitor(timer, sleep, [100000]),
+    exit(P3A, frop),
+    expect_down(R3A, P3A, frop),
 
     %% Monitor fails because process is dead
-    ?line R4 = erlang:monitor(process, P3),
-    ?line expect_down(R4, P3, noproc),
+    R4 = erlang:monitor(process, P3),
+    expect_down(R4, P3, noproc),
 
     %% Normal case (named process)
-    ?line P5 = start_jeeves(jeeves),
-    ?line R5 = erlang:monitor(process, jeeves),
-    ?line tell_jeeves(P5, stop),
-    ?line expect_down(R5, {jeeves, node()}, normal),
+    P5 = start_jeeves(jeeves),
+    R5 = erlang:monitor(process, jeeves),
+    tell_jeeves(P5, stop),
+    expect_down(R5, {jeeves, node()}, normal),
 
     %% 'DOWN' with other reason and node explicit activation
-    ?line P6 = start_jeeves(jeeves),
-    ?line R6 = erlang:monitor(process, {jeeves, node()}),
-    ?line tell_jeeves(P6, {exit, frop}),
-    ?line expect_down(R6, {jeeves, node()}, frop),
+    P6 = start_jeeves(jeeves),
+    R6 = erlang:monitor(process, {jeeves, node()}),
+    tell_jeeves(P6, {exit, frop}),
+    expect_down(R6, {jeeves, node()}, frop),
 
     %% Monitor (named process) fails because process is dead
-    ?line R7 = erlang:monitor(process, {jeeves, node()}),
-    ?line expect_down(R7, {jeeves, node()}, noproc),
+    R7 = erlang:monitor(process, {jeeves, node()}),
+    expect_down(R7, {jeeves, node()}, noproc),
 
     ok.
 
-mon_2(doc) ->
-    "Distributed cases for monitor/2";
-mon_2(suite) -> [];
+%% Distributed cases for monitor/2
 mon_2(Config) when is_list(Config) ->
-    ?line {ok, N1} = test_server:start_node(hej1, slave, []),
+    {ok, N1} = test_server:start_node(hej1, slave, []),
 
     %% Normal case
-    ?line P2 = spawn(N1, timer, sleep, [4000]),
-    ?line R2 = erlang:monitor(process, P2),
-    ?line expect_down(R2, P2, normal),
+    P2 = spawn(N1, timer, sleep, [4000]),
+    R2 = erlang:monitor(process, P2),
+    expect_down(R2, P2, normal),
 
     %% 'DOWN' with other reason
-    ?line P3 = spawn(N1, timer, sleep, [100000]),
-    ?line R3 = erlang:monitor(process, P3),
-    ?line exit(P3, frop),
-    ?line expect_down(R3, P3, frop),
+    P3 = spawn(N1, timer, sleep, [100000]),
+    R3 = erlang:monitor(process, P3),
+    exit(P3, frop),
+    expect_down(R3, P3, frop),
 
     %% Monitor fails because process is dead
-    ?line R4 = erlang:monitor(process, P3),
-    ?line expect_down(R4, P3, noproc),
+    R4 = erlang:monitor(process, P3),
+    expect_down(R4, P3, noproc),
 
     %% Other node goes down
-    ?line P5 = spawn(N1, timer, sleep, [100000]),
-    ?line R5 = erlang:monitor(process, P5),
+    P5 = spawn(N1, timer, sleep, [100000]),
+    R5 = erlang:monitor(process, P5),
 
-    ?line true = test_server:stop_node(N1),
+    true = test_server:stop_node(N1),
 
-    ?line expect_down(R5, P5, noconnection),
+    expect_down(R5, P5, noconnection),
 
     %% Monitor fails because other node is dead
-    ?line P6 = spawn(N1, timer, sleep, [100000]),
-    ?line R6 = erlang:monitor(process, P6),
-    ?line R6_Reason = expect_down(R6, P6),
-    ?line true = (R6_Reason == noconnection) orelse (R6_Reason == noproc),
+    P6 = spawn(N1, timer, sleep, [100000]),
+    R6 = erlang:monitor(process, P6),
+    R6_Reason = expect_down(R6, P6),
+    true = (R6_Reason == noconnection) orelse (R6_Reason == noproc),
 
     %% Start a new node that can load code in this module
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok, N2} = test_server:start_node
-		       (hej2, slave, [{args, "-pa " ++ PA}]),
+    PA = filename:dirname(code:which(?MODULE)),
+    {ok, N2} = test_server:start_node
+    (hej2, slave, [{args, "-pa " ++ PA}]),
 
     %% Normal case (named process)
-    ?line P7 = start_jeeves({jeeves, N2}),
-    ?line R7 = erlang:monitor(process, {jeeves, N2}),
-    ?line tell_jeeves(P7, stop),
-    ?line expect_down(R7, {jeeves, N2}, normal),
+    P7 = start_jeeves({jeeves, N2}),
+    R7 = erlang:monitor(process, {jeeves, N2}),
+    tell_jeeves(P7, stop),
+    expect_down(R7, {jeeves, N2}, normal),
 
     %% 'DOWN' with other reason (named process)
-    ?line P8 = start_jeeves({jeeves, N2}),
-    ?line R8 = erlang:monitor(process, {jeeves, N2}),
-    ?line tell_jeeves(P8, {exit, frop}),
-    ?line expect_down(R8, {jeeves, N2}, frop),
+    P8 = start_jeeves({jeeves, N2}),
+    R8 = erlang:monitor(process, {jeeves, N2}),
+    tell_jeeves(P8, {exit, frop}),
+    expect_down(R8, {jeeves, N2}, frop),
 
     %% Monitor (named process) fails because process is dead
-    ?line R9 = erlang:monitor(process, {jeeves, N2}),
-    ?line expect_down(R9, {jeeves, N2}, noproc),
+    R9 = erlang:monitor(process, {jeeves, N2}),
+    expect_down(R9, {jeeves, N2}, noproc),
 
     %% Other node goes down (named process)
-    ?line _P10 = start_jeeves({jeeves, N2}),
-    ?line R10 = erlang:monitor(process, {jeeves, N2}),
+    _P10 = start_jeeves({jeeves, N2}),
+    R10 = erlang:monitor(process, {jeeves, N2}),
 
-    ?line true = test_server:stop_node(N2),
+    true = test_server:stop_node(N2),
 
-    ?line expect_down(R10, {jeeves, N2}, noconnection),
+    expect_down(R10, {jeeves, N2}, noconnection),
 
     %% Monitor (named process) fails because other node is dead
-    ?line R11 = erlang:monitor(process, {jeeves, N2}),
-    ?line expect_down(R11, {jeeves, N2}, noconnection),
+    R11 = erlang:monitor(process, {jeeves, N2}),
+    expect_down(R11, {jeeves, N2}, noconnection),
 
     ok.
 
 %%% Large exit reason. Crashed first attempt to release R5B.
 
-large_exit(doc) ->
-    "Large exit reason";
-large_exit(suite) -> [];
 large_exit(Config) when is_list(Config) ->
-    ?line f(100),
+    f(100),
     ok.
 
 f(0) ->
@@ -539,23 +488,23 @@ f(N) ->
     f(N-1).
 
 f() ->
-    ?line S0 = {big, tuple, with, [list, 4563784278]},
-    ?line S = {S0, term_to_binary(S0)},
-    ?line P = spawn(?MODULE, large_exit_sub, [S]),
-    ?line R = erlang:monitor(process, P),
-    ?line P ! hej,
+    S0 = {big, tuple, with, [list, 4563784278]},
+    S = {S0, term_to_binary(S0)},
+    P = spawn(?MODULE, large_exit_sub, [S]),
+    R = erlang:monitor(process, P),
+    P ! hej,
     receive
-	{'DOWN', R, process, P, X} ->
-	    ?line io:format(" -> ~p~n", [X]),
-	    if
-		X == S ->
-		    ok;
-		true ->
-		    test_server:fail({X, S})
-	    end;
-	Other ->
-	    ?line io:format(" -> ~p~n", [Other]),
-	    exit({answer, Other})
+        {'DOWN', R, process, P, X} ->
+            io:format(" -> ~p~n", [X]),
+            if
+                X == S ->
+                    ok;
+                true ->
+                    ct:fail({X, S})
+            end;
+        Other ->
+            io:format(" -> ~p~n", [Other]),
+            exit({answer, Other})
     end.
 
 large_exit_sub(S) ->
@@ -566,105 +515,99 @@ large_exit_sub(S) ->
 %%% by using erlang:process_info(self(), monitors)
 %%% and      erlang:process_info(self(), monitored_by)
 
-list_cleanup(doc) ->
-    "Testing of monitor link list cleanup by using " ++
-    "erlang:process_info/2";
-list_cleanup(suite) -> [];
 list_cleanup(Config) when is_list(Config) ->
-    ?line P0 = self(),
-    ?line M  = node(),
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line true = register(master_bertie, self()),
+    P0 = self(),
+    M  = node(),
+    PA = filename:dirname(code:which(?MODULE)),
+    true = register(master_bertie, self()),
 
     %% Normal local case, monitor and demonitor
-    ?line P1 = start_jeeves(jeeves),
-    ?line {[], []} = monitors(),
-    ?line expect_jeeves(P1, monitors, {monitors, {[], []}}),
-    ?line R1a = erlang:monitor(process, P1),
-    ?line {[{process, P1}], []} = monitors(),
-    ?line expect_jeeves(P1, monitors, {monitors, {[], [P0]}}),
-    ?line true = erlang:demonitor(R1a),
-    ?line expect_no_msg(),
-    ?line {[], []} = monitors(),
-    ?line expect_jeeves(P1, monitors, {monitors, {[], []}}),
+    P1 = start_jeeves(jeeves),
+    {[], []} = monitors(),
+    expect_jeeves(P1, monitors, {monitors, {[], []}}),
+    R1a = erlang:monitor(process, P1),
+    {[{process, P1}], []} = monitors(),
+    expect_jeeves(P1, monitors, {monitors, {[], [P0]}}),
+    true = erlang:demonitor(R1a),
+    expect_no_msg(),
+    {[], []} = monitors(),
+    expect_jeeves(P1, monitors, {monitors, {[], []}}),
     %% Remonitor named and try again, now exiting the monitored process
-    ?line R1b = erlang:monitor(process, jeeves),
-    ?line {[{process, {jeeves, M}}], []} = monitors(),
-    ?line expect_jeeves(P1, monitors, {monitors, {[], [P0]}}),
-    ?line tell_jeeves(P1, stop),
-    ?line expect_down(R1b, {jeeves, node()}, normal),
-    ?line {[], []} = monitors(),
+    R1b = erlang:monitor(process, jeeves),
+    {[{process, {jeeves, M}}], []} = monitors(),
+    expect_jeeves(P1, monitors, {monitors, {[], [P0]}}),
+    tell_jeeves(P1, stop),
+    expect_down(R1b, {jeeves, node()}, normal),
+    {[], []} = monitors(),
 
     %% Slightly weird local case - the monitoring process crashes
-    ?line P2 = start_jeeves(jeeves),
-    ?line {[], []} = monitors(),
-    ?line expect_jeeves(P2, monitors, {monitors, {[], []}}),
-    ?line {monitor_process, _R2} = 
-	ask_jeeves(P2, {monitor_process, master_bertie}),
-    ?line {[], [P2]} = monitors(),
-    ?line expect_jeeves(P2, monitors,
-			{monitors, {[{process, {master_bertie, node()}}], []}}),
-    ?line tell_jeeves(P2, {exit, frop}),
+    P2 = start_jeeves(jeeves),
+    {[], []} = monitors(),
+    expect_jeeves(P2, monitors, {monitors, {[], []}}),
+    {monitor_process, _R2} = 
+    ask_jeeves(P2, {monitor_process, master_bertie}),
+    {[], [P2]} = monitors(),
+    expect_jeeves(P2, monitors,
+                  {monitors, {[{process, {master_bertie, node()}}], []}}),
+    tell_jeeves(P2, {exit, frop}),
     timer:sleep(2000),
-    ?line {[], []} = monitors(),
+    {[], []} = monitors(),
 
     %% Start a new node that can load code in this module
-    ?line {ok, J} = test_server:start_node
-		       (jeeves, slave, [{args, "-pa " ++ PA}]),
+    {ok, J} = test_server:start_node
+    (jeeves, slave, [{args, "-pa " ++ PA}]),
 
     %% Normal remote case, monitor and demonitor
-    ?line P3 = start_jeeves({jeeves, J}),
-    ?line {[], []} = monitors(),
-    ?line expect_jeeves(P3, monitors, {monitors, {[], []}}),
-    ?line R3a = erlang:monitor(process, P3),
-    ?line {[{process, P3}], []} = monitors(),
-    ?line expect_jeeves(P3, monitors, {monitors, {[], [P0]}}),
-    ?line true = erlang:demonitor(R3a),
-    ?line expect_no_msg(),
-    ?line {[], []} = monitors(),
-    ?line expect_jeeves(P3, monitors, {monitors, {[], []}}),
+    P3 = start_jeeves({jeeves, J}),
+    {[], []} = monitors(),
+    expect_jeeves(P3, monitors, {monitors, {[], []}}),
+    R3a = erlang:monitor(process, P3),
+    {[{process, P3}], []} = monitors(),
+    expect_jeeves(P3, monitors, {monitors, {[], [P0]}}),
+    true = erlang:demonitor(R3a),
+    expect_no_msg(),
+    {[], []} = monitors(),
+    expect_jeeves(P3, monitors, {monitors, {[], []}}),
     %% Remonitor named and try again, now exiting the monitored process
-    ?line R3b = erlang:monitor(process, {jeeves, J}),
-    ?line {[{process, {jeeves, J}}], []} = monitors(),
-    ?line expect_jeeves(P3, monitors, {monitors, {[], [P0]}}),
-    ?line tell_jeeves(P3, stop),
-    ?line expect_down(R3b, {jeeves, J}, normal),
-    ?line {[], []} = monitors(),
+    R3b = erlang:monitor(process, {jeeves, J}),
+    {[{process, {jeeves, J}}], []} = monitors(),
+    expect_jeeves(P3, monitors, {monitors, {[], [P0]}}),
+    tell_jeeves(P3, stop),
+    expect_down(R3b, {jeeves, J}, normal),
+    {[], []} = monitors(),
 
     %% Slightly weird remote case - the monitoring process crashes
-    ?line P4 = start_jeeves({jeeves, J}),
-    ?line {[], []} = monitors(),
-    ?line expect_jeeves(P4, monitors, {monitors, {[], []}}),
-    ?line {monitor_process, _R4} = 
-	ask_jeeves(P4, {monitor_process, {master_bertie, M}}),
-    ?line {[], [P4]} = monitors(),
-    ?line expect_jeeves(P4, monitors, 
-			{monitors, {[{process, {master_bertie, M}}], []}} ),
-    ?line tell_jeeves(P4, {exit, frop}),
+    P4 = start_jeeves({jeeves, J}),
+    {[], []} = monitors(),
+    expect_jeeves(P4, monitors, {monitors, {[], []}}),
+    {monitor_process, _R4} = 
+    ask_jeeves(P4, {monitor_process, {master_bertie, M}}),
+    {[], [P4]} = monitors(),
+    expect_jeeves(P4, monitors, 
+                  {monitors, {[{process, {master_bertie, M}}], []}} ),
+    tell_jeeves(P4, {exit, frop}),
     timer:sleep(2000),
-    ?line {[], []} = monitors(),
-    
+    {[], []} = monitors(),
+
     %% Now, the monitoring remote node crashes
-    ?line P5 = start_jeeves({jeeves, J}),
-    ?line {[], []} = monitors(),
-    ?line expect_jeeves(P5, monitors, {monitors, {[], []}}),
-    ?line {monitor_process, _R5} = 
-	ask_jeeves(P5, {monitor_process, P0}),
-    ?line {[], [P5]} = monitors(),
-    ?line expect_jeeves(P5, monitors, 
-			{monitors, {[{process, P0}], []}} ),
-    ?line test_server:stop_node(J),
+    P5 = start_jeeves({jeeves, J}),
+    {[], []} = monitors(),
+    expect_jeeves(P5, monitors, {monitors, {[], []}}),
+    {monitor_process, _R5} = 
+    ask_jeeves(P5, {monitor_process, P0}),
+    {[], [P5]} = monitors(),
+    expect_jeeves(P5, monitors, 
+                  {monitors, {[{process, P0}], []}} ),
+    test_server:stop_node(J),
     timer:sleep(4000),
-    ?line {[], []} = monitors(),
-    
-    ?line true = unregister(master_bertie),
+    {[], []} = monitors(),
+
+    true = unregister(master_bertie),
     ok.
 
-    
+
 %%% Mixed internal and external monitors
 
-mixer(doc) ->
-    "Test mixing of internal and external monitors.";
 mixer(Config) when is_list(Config) ->
     PA = filename:dirname(code:which(?MODULE)),
     NN = [j0,j1,j2],
@@ -748,115 +691,112 @@ mixer(Config) when is_list(Config) ->
     [test_server:stop_node(K) || K <- NL0],
     ok.
 
-named_down(doc) -> ["Test that DOWN message for a named monitor isn't"
-		    " delivered until name has been unregistered"];
-named_down(suite) -> [];
+%% Test that DOWN message for a named monitor isn't
+%%  delivered until name has been unregistered
 named_down(Config) when is_list(Config) ->
-    ?line Name = list_to_atom(atom_to_list(?MODULE)
-			      ++ "-named_down-"
-			      ++ integer_to_list(erlang:system_time(seconds))
-			      ++ "-" ++ integer_to_list(erlang:unique_integer([positive]))),
-    ?line Prio = process_flag(priority,high),
+    Name = list_to_atom(atom_to_list(?MODULE)
+                        ++ "-named_down-"
+                        ++ integer_to_list(erlang:system_time(seconds))
+                        ++ "-" ++ integer_to_list(erlang:unique_integer([positive]))),
+    Prio = process_flag(priority,high),
     %% Spawn a bunch of high prio cpu bound processes to prevent
     %% normal prio processes from terminating during the next
     %% 500 ms...
-    ?line Self = self(),
-    ?line spawn_opt(fun () ->
-			    WFun = fun
-				       (F, hej) -> F(F, hopp);
-				       (F, hopp) -> F(F, hej)
-				   end,
-			    NoSchedulers = erlang:system_info(schedulers_online),
-			    lists:foreach(fun (_) ->
-						  spawn_opt(fun () ->
-								    WFun(WFun,
-									 hej)
-							    end,
-							    [{priority,high},
-							     link])
-					  end,
-					  lists:seq(1, NoSchedulers)),
-			    receive after 500 -> ok end,
-			    unlink(Self),
-			    exit(bang)
-		     end,
-		    [{priority,high}, link]),
-    ?line NamedProc = spawn_link(fun () ->
-					 receive after infinity -> ok end
-				 end),
-    ?line true = register(Name, NamedProc),
-    ?line unlink(NamedProc),
-    ?line exit(NamedProc, bang),
-    ?line Mon = erlang:monitor(process, Name),
-    ?line receive {'DOWN',Mon, _, _, _} -> ok end,
-    ?line true = register(Name, self()),
-    ?line true = unregister(Name),
-    ?line process_flag(priority,Prio),
+    Self = self(),
+    spawn_opt(fun () ->
+                      WFun = fun
+                                 (F, hej) -> F(F, hopp);
+(F, hopp) -> F(F, hej)
+                             end,
+                      NoSchedulers = erlang:system_info(schedulers_online),
+                      lists:foreach(fun (_) ->
+                                            spawn_opt(fun () ->
+                                                              WFun(WFun,
+                                                                   hej)
+                                                      end,
+                                                      [{priority,high},
+                                                       link])
+                                    end,
+                                    lists:seq(1, NoSchedulers)),
+                      receive after 500 -> ok end,
+                      unlink(Self),
+                      exit(bang)
+              end,
+              [{priority,high}, link]),
+    NamedProc = spawn_link(fun () ->
+                                   receive after infinity -> ok end
+                           end),
+    true = register(Name, NamedProc),
+    unlink(NamedProc),
+    exit(NamedProc, bang),
+    Mon = erlang:monitor(process, Name),
+    receive {'DOWN',Mon, _, _, _} -> ok end,
+    true = register(Name, self()),
+    true = unregister(Name),
+    process_flag(priority,Prio),
     ok.
 
-otp_5827(doc) -> [];
-otp_5827(suite) -> [];
 otp_5827(Config) when is_list(Config) ->
     %% Make a pid with the same nodename but with another creation
-    ?line [CreEnd | RPTail]
-	= lists:reverse(binary_to_list(term_to_binary(self()))),
-    ?line NewCreEnd = case CreEnd of
-		    0 -> 1;
-		    1 -> 2;
-		    _ -> CreEnd - 1
-		end,
-    ?line OtherCreationPid
-	= binary_to_term(list_to_binary(lists:reverse([NewCreEnd | RPTail]))),
+    [CreEnd | RPTail]
+    = lists:reverse(binary_to_list(term_to_binary(self()))),
+    NewCreEnd = case CreEnd of
+                    0 -> 1;
+                    1 -> 2;
+                    _ -> CreEnd - 1
+                end,
+    OtherCreationPid
+    = binary_to_term(list_to_binary(lists:reverse([NewCreEnd | RPTail]))),
     %% If the bug is present erlang:monitor(process, OtherCreationPid)
     %% will hang...
-    ?line Parent = self(),
-    ?line Ok = make_ref(),
-    ?line spawn(fun () ->
-			Mon = erlang:monitor(process, OtherCreationPid),
-			% Should get the DOWN message right away
-			receive
-			    {'DOWN', Mon, process, OtherCreationPid, noproc} ->
-				Parent ! Ok
-			end
-		end),
-    ?line receive
-	      Ok ->
-		  ?line ok
-	  after 1000 ->
-		  ?line ?t:fail("erlang:monitor/2 hangs")
-	  end.
+    Parent = self(),
+    Ok = make_ref(),
+    spawn(fun () ->
+                  Mon = erlang:monitor(process, OtherCreationPid),
+                  % Should get the DOWN message right away
+                  receive
+                      {'DOWN', Mon, process, OtherCreationPid, noproc} ->
+                          Parent ! Ok
+                  end
+          end),
+    receive
+        Ok ->
+            ok
+    after 1000 ->
+              ct:fail("erlang:monitor/2 hangs")
+    end.
 
 monitor_time_offset(Config) when is_list(Config) ->
     {ok, Node} = start_node(Config, "+C single_time_warp"),
     Me = self(),
     PMs = lists:map(fun (_) ->
-			    Pid = spawn(Node,
-					fun () ->
-						check_monitor_time_offset(Me)
-					end),
-			    {Pid, erlang:monitor(process, Pid)}
-		    end,
-		    lists:seq(1, 100)),
+                            Pid = spawn(Node,
+                                        fun () ->
+                                                check_monitor_time_offset(Me)
+                                        end),
+                            {Pid, erlang:monitor(process, Pid)}
+                    end,
+                    lists:seq(1, 100)),
     lists:foreach(fun ({P, _M}) ->
-			  P ! check_no_change_message
-		  end, PMs),
+                          P ! check_no_change_message
+                  end, PMs),
     lists:foreach(fun ({P, M}) ->
-			  receive
-			      {no_change_message_received, P} ->
-				  ok;
-			      {'DOWN', M, process, P, Reason} ->
-				  ?t:fail(Reason)
-			  end
-		  end, PMs),
+                          receive
+                              {no_change_message_received, P} ->
+                                  ok;
+                              {'DOWN', M, process, P, Reason} ->
+                                  ct:fail(Reason)
+                          end
+                  end, PMs),
     preliminary = rpc:call(Node, erlang, system_flag, [time_offset, finalize]),
     lists:foreach(fun ({P, M}) ->
-			  receive
-			      {change_messages_received, P} ->
-				  erlang:demonitor(M, [flush]);
-			      {'DOWN', M, process, P, Reason} ->
-				  ?t:fail(Reason)
-			  end
-		  end, PMs),
+                          receive
+                              {change_messages_received, P} ->
+                                  erlang:demonitor(M, [flush]);
+                              {'DOWN', M, process, P, Reason} ->
+                                  ct:fail(Reason)
+                          end
+                  end, PMs),
     stop_node(Node),
     ok.
 
@@ -867,42 +807,42 @@ check_monitor_time_offset(Leader) ->
     Mon4 = erlang:monitor(time_offset, clock_service),
 
     erlang:demonitor(Mon2, [flush]),
-    
+
     Mon5 = erlang:monitor(time_offset, clock_service),
     Mon6 = erlang:monitor(time_offset, clock_service),
     Mon7 = erlang:monitor(time_offset, clock_service),
 
     receive check_no_change_message -> ok end,
     receive
-	{'CHANGE', _, time_offset, clock_service, _} ->
-	    exit(unexpected_change_message_received)
+        {'CHANGE', _, time_offset, clock_service, _} ->
+            exit(unexpected_change_message_received)
     after 0 ->
-	    Leader ! {no_change_message_received, self()}
+              Leader ! {no_change_message_received, self()}
     end,
     receive after 100 -> ok end,
     erlang:demonitor(Mon4, [flush]),
     receive
-	{'CHANGE', Mon3, time_offset, clock_service, _} ->
-	    ok
+        {'CHANGE', Mon3, time_offset, clock_service, _} ->
+            ok
     end,
     receive
-	{'CHANGE', Mon6, time_offset, clock_service, _} ->
-	    ok
+        {'CHANGE', Mon6, time_offset, clock_service, _} ->
+            ok
     end,
     erlang:demonitor(Mon5, [flush]),
     receive
-	{'CHANGE', Mon7, time_offset, clock_service, _} ->
-	    ok
+        {'CHANGE', Mon7, time_offset, clock_service, _} ->
+            ok
     end,
     receive
-	{'CHANGE', Mon1, time_offset, clock_service, _} ->
-	    ok
+        {'CHANGE', Mon1, time_offset, clock_service, _} ->
+            ok
     end,
     receive
-	{'CHANGE', _, time_offset, clock_service, _} ->
-	    exit(unexpected_change_message_received)
+        {'CHANGE', _, time_offset, clock_service, _} ->
+            exit(unexpected_change_message_received)
     after 1000 ->
-	    ok
+              ok
     end,
     Leader ! {change_messages_received, self()}.
 
@@ -916,17 +856,17 @@ wait_for_m(Monitors, MonitoredBy, N) ->
     {monitors,M0}  = process_info(self(),monitors),
     {monitored_by,MB0} = process_info(self(),monitored_by),
     case lists:sort(M0) of
-	Monitors ->
-	    case lists:sort(MB0) of
-		MonitoredBy ->
-		    ok;
-		_ ->
-		    receive after 100 -> ok end,
-		    wait_for_m(Monitors,MonitoredBy,N-1)
-	    end;
-	_ ->
-	    receive after 100 -> ok end,
-	    wait_for_m(Monitors,MonitoredBy,N-1)
+        Monitors ->
+            case lists:sort(MB0) of
+                MonitoredBy ->
+                    ok;
+                _ ->
+                    receive after 100 -> ok end,
+                    wait_for_m(Monitors,MonitoredBy,N-1)
+            end;
+        _ ->
+            receive after 100 -> ok end,
+            wait_for_m(Monitors,MonitoredBy,N-1)
     end.
 
 % All permutations of a list...
@@ -950,32 +890,32 @@ jeeves(Parent, Name, Ref)
   when is_pid(Parent), (is_atom(Name) or (Name =:= [])), is_reference(Ref) ->
     %%io:format("monitor_SUITE:jeeves(~p, ~p)~n", [Parent, Name]),
     case Name of
-	Atom when is_atom(Atom) ->
-	    register(Name, self());
-	[] ->
-	    ok
+        Atom when is_atom(Atom) ->
+            register(Name, self());
+        [] ->
+            ok
     end,
     Parent ! {self(), Ref},
     jeeves_loop(Parent).
 
 jeeves_loop(Parent) ->
     receive
-	{Parent, monitors} ->
-	    Parent ! {self(), {monitors, monitors()}},
-	    jeeves_loop(Parent);
-	{Parent, {monitor_process, P}} ->
-	    Parent ! {self(), {monitor_process, 
-			       catch erlang:monitor(process, P) }},
-	    jeeves_loop(Parent);
-	{Parent, {demonitor, Ref}} ->
-	    Parent ! {self(), {demonitor, catch erlang:demonitor(Ref)}},
-	    jeeves_loop(Parent);
-	{Parent, stop} ->
-	    ok;
-	{Parent, {exit, Reason}} ->
-	    exit(Reason);
-	Other ->
-	    io:format("~p:jeeves_loop received ~p~n", [?MODULE, Other])
+        {Parent, monitors} ->
+            Parent ! {self(), {monitors, monitors()}},
+            jeeves_loop(Parent);
+        {Parent, {monitor_process, P}} ->
+            Parent ! {self(), {monitor_process, 
+                               catch erlang:monitor(process, P) }},
+            jeeves_loop(Parent);
+        {Parent, {demonitor, Ref}} ->
+            Parent ! {self(), {demonitor, catch erlang:demonitor(Ref)}},
+            jeeves_loop(Parent);
+        {Parent, stop} ->
+            ok;
+        {Parent, {exit, Reason}} ->
+            exit(Reason);
+        Other ->
+            io:format("~p:jeeves_loop received ~p~n", [?MODULE, Other])
     end.
 
 
@@ -985,10 +925,10 @@ start_jeeves({Name, Node})
     Ref = make_ref(),
     Pid = spawn(Node, fun() -> jeeves(Parent, Name, Ref) end),
     receive 
-	{Pid, Ref} -> 
-	    ok;
-	Other ->
-	    test_server:fail({rec, Other})
+        {Pid, Ref} -> 
+            ok;
+        Other ->
+            ct:fail({rec, Other})
     end,
     Pid;
 start_jeeves(Name) when is_atom(Name) ->
@@ -1002,20 +942,20 @@ tell_jeeves(Pid, What) when is_pid(Pid) ->
 ask_jeeves(Pid, Request) when is_pid(Pid) ->
     Pid ! {self(), Request},
     receive
-	{Pid, Response} ->
-	    Response;
-	Other ->
-	    test_server:fail({rec, Other})
+        {Pid, Response} ->
+            Response;
+        Other ->
+            ct:fail({rec, Other})
     end.
 
 
 expect_jeeves(Pid, Request, Response) when is_pid(Pid) ->
     Pid ! {self(), Request},
     receive 
-	{Pid, Response} -> 
-	    ok;
-	Other ->
-	    test_server:fail({rec, Other})
+        {Pid, Response} -> 
+            ok;
+        Other ->
+            ct:fail({rec, Other})
     end.
 
 
@@ -1036,20 +976,20 @@ start_node(Config) ->
     start_node(Config, "").
 
 start_node(Config, Args) ->
-    TestCase = ?config(testcase, Config),
+    TestCase = proplists:get_value(testcase, Config),
     PA = filename:dirname(code:which(?MODULE)),
     ESTime = erlang:monotonic_time(1) + erlang:time_offset(1),
     Unique = erlang:unique_integer([positive]),
     Name = list_to_atom(atom_to_list(?MODULE)
-			++ "-"
-			++ atom_to_list(TestCase)
-			++ "-"
-			++ integer_to_list(ESTime)
-			++ "-"
-			++ integer_to_list(Unique)),
+                        ++ "-"
+                        ++ atom_to_list(TestCase)
+                        ++ "-"
+                        ++ integer_to_list(ESTime)
+                        ++ "-"
+                        ++ integer_to_list(Unique)),
     test_server:start_node(Name,
-			   slave,
-			   [{args, "-pa " ++ PA ++ " " ++ Args}]).
+                           slave,
+                           [{args, "-pa " ++ PA ++ " " ++ Args}]).
 
 stop_node(Node) ->
     test_server:stop_node(Node).
diff --git a/erts/emulator/test/mtx_SUITE.erl b/erts/emulator/test/mtx_SUITE.erl
index 87dace4721..a17b11f3bf 100644
--- a/erts/emulator/test/mtx_SUITE.erl
+++ b/erts/emulator/test/mtx_SUITE.erl
@@ -29,9 +29,8 @@
 
 -include_lib("common_test/include/ct.hrl").
 
--export([all/0,suite/0,groups/0,
-	 init_per_group/2,end_per_group/2, init_per_suite/1, 
-	 end_per_suite/1, init_per_testcase/2, end_per_testcase/2]).
+-export([all/0,suite/0, init_per_suite/1, end_per_suite/1,
+         init_per_testcase/2, end_per_testcase/2]).
 
 -export([long_rwlock/1,
 	 hammer_ets_rwlock/1,
@@ -56,8 +55,30 @@
 	 hammer_sched_freqread_tryrwlock/1,
 	 hammer_sched_freqread_tryrwlock_check/1]).
 
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 15}}].
+
+all() ->
+    [long_rwlock, hammer_rwlock_check, hammer_rwlock,
+     hammer_tryrwlock_check, hammer_tryrwlock,
+     hammer_ets_rwlock, hammer_sched_long_rwlock_check,
+     hammer_sched_long_rwlock,
+     hammer_sched_long_freqread_rwlock_check,
+     hammer_sched_long_freqread_rwlock,
+     hammer_sched_long_tryrwlock_check,
+     hammer_sched_long_tryrwlock,
+     hammer_sched_long_freqread_tryrwlock_check,
+     hammer_sched_long_freqread_tryrwlock,
+     hammer_sched_rwlock_check, hammer_sched_rwlock,
+     hammer_sched_freqread_rwlock_check,
+     hammer_sched_freqread_rwlock,
+     hammer_sched_tryrwlock_check, hammer_sched_tryrwlock,
+     hammer_sched_freqread_tryrwlock_check,
+     hammer_sched_freqread_tryrwlock].
+
 init_per_suite(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Lib = filename:join([DataDir, atom_to_list(?MODULE)]),
     case {erlang:load_nif(Lib, none),erlang:system_info(threads)} of
 	{{error,_},false} ->
@@ -71,15 +92,13 @@ end_per_suite(Config) when is_list(Config) ->
     Config.
 
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(15)),
     %% Wait for deallocations to complete since we measure
     %% runtime in test cases.
     wait_deallocations(),
-    [{watchdog, Dog}|Config].
+    Config.
 
 end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
+    ok.
 
 wait_deallocations() ->
     try
@@ -90,45 +109,15 @@ wait_deallocations() ->
 	    wait_deallocations()
     end.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [long_rwlock, hammer_rwlock_check, hammer_rwlock,
-     hammer_tryrwlock_check, hammer_tryrwlock,
-     hammer_ets_rwlock, hammer_sched_long_rwlock_check,
-     hammer_sched_long_rwlock,
-     hammer_sched_long_freqread_rwlock_check,
-     hammer_sched_long_freqread_rwlock,
-     hammer_sched_long_tryrwlock_check,
-     hammer_sched_long_tryrwlock,
-     hammer_sched_long_freqread_tryrwlock_check,
-     hammer_sched_long_freqread_tryrwlock,
-     hammer_sched_rwlock_check, hammer_sched_rwlock,
-     hammer_sched_freqread_rwlock_check,
-     hammer_sched_freqread_rwlock,
-     hammer_sched_tryrwlock_check, hammer_sched_tryrwlock,
-     hammer_sched_freqread_tryrwlock_check,
-     hammer_sched_freqread_tryrwlock].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
 long_rwlock(Config) when is_list(Config) ->
     statistics(runtime),
     LLRes = long_rw_test(),
     {_, RunTime} = statistics(runtime),
     %% A very short run time is expected, since
     %% threads in the test mostly wait
-    ?t:format("RunTime=~p~n", [RunTime]),
-    ?line true = RunTime < 400,
-    ?line RunTimeStr = "Run-time during test was "++integer_to_list(RunTime)++" ms.",
+    io:format("RunTime=~p~n", [RunTime]),
+    true = RunTime < 400,
+    RunTimeStr = "Run-time during test was "++integer_to_list(RunTime)++" ms.",
     case LLRes of
 	ok ->
 	    {comment, RunTimeStr};
@@ -198,100 +187,100 @@ hammer_sched_long_freqread_tryrwlock_check(Config) when is_list(Config) ->
 
 hammer_sched_rwlock_test(FreqRead, LockCheck, Blocking, WaitLocked, WaitUnlocked) ->
     case create_rwlock(FreqRead, LockCheck) of
-	enotsup ->
-	    {skipped, "Not supported."};
-	RWLock ->
-	    Onln = erlang:system_info(schedulers_online),
-	    NWPs = case Onln div 3 of
-		       1 -> case Onln < 4 of
-				true -> 1;
-				false -> 2
-			    end;
-		       X -> X
-		   end,
-	    NRPs = Onln - NWPs,
-	    NoLockOps = ((((50000000 div Onln)
-			       div case {Blocking, WaitLocked} of
-				       {false, 0} -> 1;
-				       _ -> 10
-				   end)
-			      div (case WaitLocked == 0 of
-				       true -> 1;
-				       false -> WaitLocked*250
-				   end))
-			     div handicap()),
-	    ?t:format("NoLockOps=~p~n", [NoLockOps]),
-	    Sleep = case Blocking of
-			true -> NoLockOps;
-			false -> NoLockOps div 10
-		    end,
-	    WPs = lists:map(
-		    fun (Sched) ->
-			    spawn_opt(
-			      fun () ->
-				      io:format("Writer on scheduler ~p.~n",
-						[Sched]),
-				      Sched = erlang:system_info(scheduler_id),
-				      receive go -> gone end,
-				      hammer_sched_rwlock_proc(RWLock,
-							       Blocking,
-							       true,
-							       WaitLocked,
-							       WaitUnlocked,
-							       NoLockOps,
-							       Sleep),
-				      Sched = erlang:system_info(scheduler_id)
-			      end,
-			      [link, {scheduler, Sched}])
-		    end,
-		    lists:seq(1, NWPs)),
-	    RPs = lists:map(
-		    fun (Sched) ->
-			    spawn_opt(
-			      fun () ->
-				      io:format("Reader on scheduler ~p.~n",
-						[Sched]),
-				      Sched = erlang:system_info(scheduler_id),
-				      receive go -> gone end,
-				      hammer_sched_rwlock_proc(RWLock,
-							       Blocking,
-							       false,
-							       WaitLocked,
-							       WaitUnlocked,
-							       NoLockOps,
-							       Sleep),
-				      Sched = erlang:system_info(scheduler_id)
-			      end,
-			      [link, {scheduler, Sched}])
-		    end,
-		    lists:seq(NWPs + 1, NWPs + NRPs)),
-	    Procs = WPs ++ RPs,
-	    case {Blocking, WaitLocked} of
-		{_, 0} -> ok;
-		{false, _} -> ok;
-		_ -> statistics(runtime)
-	    end,
-	    lists:foreach(fun (P) -> P ! go end, Procs),
-	    lists:foreach(fun (P) ->
-				  M = erlang:monitor(process, P),
-				  receive
-				      {'DOWN', M, process, P, _} ->
-					  ok
-				  end
-			  end,
-			  Procs),
-	    case {Blocking, WaitLocked} of
-		{_, 0} -> ok;
-		{false, _} -> ok;
-		_ ->
-		    {_, RunTime} = statistics(runtime),
-		    ?t:format("RunTime=~p~n", [RunTime]),
-		    ?line true = RunTime < 700,
-		    {comment,
-		     "Run-time during test was "
-		     ++ integer_to_list(RunTime)
-		     ++ " ms."}
-	    end
+        enotsup ->
+            {skipped, "Not supported."};
+        RWLock ->
+            Onln = erlang:system_info(schedulers_online),
+            NWPs = case Onln div 3 of
+                       1 -> case Onln < 4 of
+                                true -> 1;
+                                false -> 2
+                            end;
+                       X -> X
+                   end,
+            NRPs = Onln - NWPs,
+            NoLockOps = ((((50000000 div Onln)
+                           div case {Blocking, WaitLocked} of
+                                   {false, 0} -> 1;
+                                   _ -> 10
+                               end)
+                          div (case WaitLocked == 0 of
+                                   true -> 1;
+                                   false -> WaitLocked*250
+                               end))
+                         div handicap()),
+            io:format("NoLockOps=~p~n", [NoLockOps]),
+            Sleep = case Blocking of
+                        true -> NoLockOps;
+                        false -> NoLockOps div 10
+                    end,
+            WPs = lists:map(
+                    fun (Sched) ->
+                            spawn_opt(
+                              fun () ->
+                                      io:format("Writer on scheduler ~p.~n",
+                                                [Sched]),
+                                      Sched = erlang:system_info(scheduler_id),
+                                      receive go -> gone end,
+                                      hammer_sched_rwlock_proc(RWLock,
+                                                               Blocking,
+                                                               true,
+                                                               WaitLocked,
+                                                               WaitUnlocked,
+                                                               NoLockOps,
+                                                               Sleep),
+                                      Sched = erlang:system_info(scheduler_id)
+                              end,
+                              [link, {scheduler, Sched}])
+                    end,
+                    lists:seq(1, NWPs)),
+            RPs = lists:map(
+                    fun (Sched) ->
+                            spawn_opt(
+                              fun () ->
+                                      io:format("Reader on scheduler ~p.~n",
+                                                [Sched]),
+                                      Sched = erlang:system_info(scheduler_id),
+                                      receive go -> gone end,
+                                      hammer_sched_rwlock_proc(RWLock,
+                                                               Blocking,
+                                                               false,
+                                                               WaitLocked,
+                                                               WaitUnlocked,
+                                                               NoLockOps,
+                                                               Sleep),
+                                      Sched = erlang:system_info(scheduler_id)
+                              end,
+                              [link, {scheduler, Sched}])
+                    end,
+                    lists:seq(NWPs + 1, NWPs + NRPs)),
+            Procs = WPs ++ RPs,
+            case {Blocking, WaitLocked} of
+                {_, 0} -> ok;
+                {false, _} -> ok;
+                _ -> statistics(runtime)
+            end,
+            lists:foreach(fun (P) -> P ! go end, Procs),
+            lists:foreach(fun (P) ->
+                                  M = erlang:monitor(process, P),
+                                  receive
+                                      {'DOWN', M, process, P, _} ->
+                                          ok
+                                  end
+                          end,
+                          Procs),
+            case {Blocking, WaitLocked} of
+                {_, 0} -> ok;
+                {false, _} -> ok;
+                _ ->
+                    {_, RunTime} = statistics(runtime),
+                    io:format("RunTime=~p~n", [RunTime]),
+                    true = RunTime < 700,
+                    {comment,
+                     "Run-time during test was "
+                     ++ integer_to_list(RunTime)
+                     ++ " ms."}
+            end
     end.
 
 hammer_sched_rwlock_proc(_RWLock,
@@ -343,9 +332,9 @@ hammer_ets_rwlock(Config) when is_list(Config) ->
 		       3 -> {2000, 50};
 		       _ -> {200, 50}
 		   end,
-    ?t:format("Procs=~p~nOps=~p~n", [Procs, Ops]),
+    io:format("Procs=~p~nOps=~p~n", [Procs, Ops]),
     lists:foreach(fun (XOpts) ->
-			  ?t:format("Running with extra opts: ~p", [XOpts]),
+			  io:format("Running with extra opts: ~p", [XOpts]),
 			  hammer_ets_rwlock_test(XOpts, true, 2, Ops,
 						 Procs, false)
 		  end,
@@ -408,65 +397,65 @@ hammer_ets_rwlock_init(_T, _N) ->
 hammer_ets_rwlock_test(XOpts, UW, C, N, NP, SC) ->
     receive after 100 -> ok end,
     {TP, TM} = spawn_monitor(
-		 fun () ->
-			 _L = repeat_list(
-				fun () ->
-					Caller = self(),
-					T = fun () ->
-						    Parent = self(),
-						    hammer_ets_rwlock_put_data(),
-						    T=ets:new(x, [public | XOpts]),
-						    hammer_ets_rwlock_init(T, 0),
-						    Ps0 = repeat_list(
-							    fun () ->
-								    spawn_link(
-								      fun () ->
-									      hammer_ets_rwlock_put_data(),
-									      receive go -> ok end,
-									      hammer_ets_rwlock_ops(T, UW, N, C, C, N),
-									      Parent ! {done, self()},
-									      receive after infinity -> ok end
-								      end)
-							    end,
-							    NP - case SC of
-								     false -> 0;
-								     _ -> 1
-								 end),
-						    Ps = case SC of
-							     false -> Ps0;
-							     _ -> [spawn_link(fun () ->
-										      hammer_ets_rwlock_put_data(),
-										      receive go -> ok end,
-										      hammer_ets_rwlock_ops(T, UW, N, SC, SC, N),
-										      Parent ! {done, self()},
-										      receive after infinity -> ok end
-									      end) | Ps0]
-							 end,
-						    Start = erlang:monotonic_time(),
-						    lists:foreach(fun (P) -> P ! go end, Ps),
-						    lists:foreach(fun (P) -> receive {done, P} -> ok end end, Ps),
-						    Stop = erlang:monotonic_time(),
-						    lists:foreach(fun (P) ->
-									  unlink(P),
-									  exit(P, bang),
-									  M = erlang:monitor(process, P),
-									  receive
-									      {'DOWN', M, process, P, _} -> ok
-									  end
-								  end, Ps),
-						    Res = (Stop-Start)/erlang:convert_time_unit(1,seconds,native),
-						    Caller ! {?MODULE, self(), Res}
-					    end,
-					TP = spawn_link(T),
-					receive
-					    {?MODULE, TP, Res} ->
-						Res
-					end
-				end,
-				?HAMMER_ETS_RWLOCK_REPEAT_TIMES)
-		 end),
+                 fun () ->
+                         _L = repeat_list(
+                                fun () ->
+                                        Caller = self(),
+                                        T = fun () ->
+                                                    Parent = self(),
+                                                    hammer_ets_rwlock_put_data(),
+                                                    T=ets:new(x, [public | XOpts]),
+                                                    hammer_ets_rwlock_init(T, 0),
+                                                    Ps0 = repeat_list(
+                                                            fun () ->
+                                                                    spawn_link(
+                                                                      fun () ->
+                                                                              hammer_ets_rwlock_put_data(),
+                                                                              receive go -> ok end,
+                                                                              hammer_ets_rwlock_ops(T, UW, N, C, C, N),
+                                                                              Parent ! {done, self()},
+                                                                              receive after infinity -> ok end
+                                                                      end)
+                                                            end,
+                                                            NP - case SC of
+                                                                     false -> 0;
+                                                                     _ -> 1
+                                                                 end),
+                                                    Ps = case SC of
+                                                             false -> Ps0;
+                                                             _ -> [spawn_link(fun () ->
+                                                                                      hammer_ets_rwlock_put_data(),
+                                                                                      receive go -> ok end,
+                                                                                      hammer_ets_rwlock_ops(T, UW, N, SC, SC, N),
+                                                                                      Parent ! {done, self()},
+                                                                                      receive after infinity -> ok end
+                                                                              end) | Ps0]
+                                                         end,
+                                                    Start = erlang:monotonic_time(),
+                                                    lists:foreach(fun (P) -> P ! go end, Ps),
+                                                    lists:foreach(fun (P) -> receive {done, P} -> ok end end, Ps),
+                                                    Stop = erlang:monotonic_time(),
+                                                    lists:foreach(fun (P) ->
+                                                                          unlink(P),
+                                                                          exit(P, bang),
+                                                                          M = erlang:monitor(process, P),
+                                                                          receive
+                                                                              {'DOWN', M, process, P, _} -> ok
+                                                                          end
+                                                                  end, Ps),
+                                                    Res = (Stop-Start)/erlang:convert_time_unit(1,seconds,native),
+                                                    Caller ! {?MODULE, self(), Res}
+                                            end,
+                                        TP = spawn_link(T),
+                                        receive
+                                            {?MODULE, TP, Res} ->
+                                                Res
+                                        end
+                                end,
+                                ?HAMMER_ETS_RWLOCK_REPEAT_TIMES)
+                 end),
     receive
-	{'DOWN', TM, process, TP, _} -> ok
+        {'DOWN', TM, process, TP, _} -> ok
     end.
 
 repeat_list(Fun, N) ->
@@ -480,18 +469,17 @@ repeat_list(Fun, N, Acc) ->
 
 handicap() ->
     X0 = case catch (erlang:system_info(logical_processors_available) >=
-			 erlang:system_info(schedulers_online)) of
-	     true -> 1;
-	     _ -> 2
-	 end,
+                     erlang:system_info(schedulers_online)) of
+             true -> 1;
+             _ -> 2
+         end,
     case erlang:system_info(build_type) of
-	opt ->
-	    X0;
-	ReallySlow when ReallySlow == debug;
-			ReallySlow == valgrind;
-			ReallySlow == purify ->
-	    X0*3;
-	_Slow ->
-	    X0*2
+        opt ->
+            X0;
+        ReallySlow when ReallySlow == debug;
+                        ReallySlow == valgrind;
+                        ReallySlow == purify ->
+            X0*3;
+        _Slow ->
+            X0*2
     end.
-		
diff --git a/erts/emulator/test/multi_load_SUITE.erl b/erts/emulator/test/multi_load_SUITE.erl
new file mode 100644
index 0000000000..e8769ea208
--- /dev/null
+++ b/erts/emulator/test/multi_load_SUITE.erl
@@ -0,0 +1,181 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2012. 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%
+%%
+
+-module(multi_load_SUITE).
+-export([all/0, suite/0, many/1, on_load/1, errors/1]).
+
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [many,on_load,errors].
+
+many(_Config) ->
+    Ms = make_modules(100, fun many_module/1),
+
+    io:put_chars("Light load\n"
+		 "=========="),
+    many_measure(Ms),
+
+    _ = [spawn_link(fun many_worker/0) || _ <- lists:seq(1, 8)],
+    erlang:yield(),
+    io:put_chars("Heavy load\n"
+		 "=========="),
+    many_measure(Ms),
+    ok.
+
+many_module(M) ->
+    ["-module("++M++").",
+     "-compile(export_all).",
+     "f1() -> ok.",
+     "f2() -> ok.",
+     "f3() -> ok.",
+     "f4() -> ok."].
+
+many_measure(Ms) ->
+    many_purge(Ms),
+    MsPrep1 = prepare_modules(Ms),
+    Us1 = ms(fun() -> many_load_seq(MsPrep1) end),
+    many_try_call(Ms),
+    many_purge(Ms),
+    MsPrep2 = prepare_modules(Ms),
+    Us2 = ms(fun() -> many_load_par(MsPrep2) end),
+    many_try_call(Ms),
+    io:format("# modules:  ~9w\n"
+	      "Sequential: ~9w µs\n"
+	      "Parallel:   ~9w µs\n"
+	      "Ratio:      ~9w\n",
+	      [length(Ms),Us1,Us2,divide(Us1,Us2)]),
+    ok.
+
+divide(A,B) when B > 0 -> A div B;
+divide(_,_) -> inf.
+
+many_load_seq(Ms) ->
+    [erlang:finish_loading([M]) || M <- Ms],
+    ok.
+
+many_load_par(Ms) ->
+    erlang:finish_loading(Ms).
+
+many_purge(Ms) ->
+    _ = [catch erlang:purge_module(M) || {M,_} <- Ms],
+    ok.
+
+many_try_call(Ms) ->
+    _ = [begin
+	     ok = M:f1(),
+	     ok = M:f2(),
+	     ok = M:f3(),
+	     ok = M:f4()
+	 end || {M,_} <- Ms],
+    ok.
+
+many_worker() ->
+    many_worker(lists:seq(1, 100)).
+
+many_worker(L) ->
+    N0 = length(L),
+    N1 = N0 * N0 * N0,
+    N2 = N1 div (N0 * N0),
+    N3 = N2 + 10,
+    _ = N3 - 10,
+    many_worker(L).
+
+
+on_load(_Config) ->
+    On = make_modules(2, fun on_load_module/1),
+    OnPrep = prepare_modules(On),
+    {'EXIT',{system_limit,_}} = (catch erlang:finish_loading(OnPrep)),
+
+    Normal = make_modules(1, fun on_load_normal/1),
+    Mixed = Normal ++ tl(On),
+    MixedPrep = prepare_modules(Mixed),
+    {'EXIT',{system_limit,_}} = (catch erlang:finish_loading(MixedPrep)),
+
+    [false,true] = [erlang:has_prepared_code_on_load(Code) ||
+		       Code <- MixedPrep],
+    {'EXIT',{badarg,_}} = (catch erlang:has_prepared_code_on_load(<<1,2,3>>)),
+    Magic = ets:match_spec_compile([{'_',[true],['$_']}]),
+    {'EXIT',{badarg,_}} = (catch erlang:has_prepared_code_on_load(Magic)),
+
+    SingleOnPrep = tl(OnPrep),
+    {on_load,[OnLoadMod]} = erlang:finish_loading(SingleOnPrep),
+    ok = erlang:call_on_load_function(OnLoadMod),
+    ok.
+
+on_load_module(M) ->
+    ["-module("++M++").",
+     "-on_load(f/0).",
+     "f() -> ok."].
+
+on_load_normal(M) ->
+    ["-module("++M++")."].
+
+
+errors(_Config) ->
+    finish_loading_badarg(x),
+    finish_loading_badarg([x|y]),
+    finish_loading_badarg([x]),
+    finish_loading_badarg([<<>>]),
+
+    Mods = make_modules(2, fun errors_module/1),
+    Ms = lists:sort([M || {M,_} <- Mods]),
+    Prep = prepare_modules(Mods),
+    {duplicated,Dups} = erlang:finish_loading(Prep ++ Prep),
+    Ms = lists:sort(Dups),
+    ok.
+
+finish_loading_badarg(Arg) ->
+    {'EXIT',{badarg,[{erlang,finish_loading,[Arg],_}|_]}} =
+	(catch erlang:finish_loading(Arg)).
+
+errors_module(M) ->
+    ["-module("++M++").",
+     "-export([f/0]).",
+     "f() -> ok."].
+
+%%%
+%%% Common utilities
+%%%
+
+ms(Fun) ->
+    {Ms,ok} = timer:tc(Fun),
+    Ms.
+
+make_modules(0, _) ->
+    [];
+make_modules(N, Fun) ->
+    U = erlang:unique_integer([positive]),
+    M0 = "m__" ++ integer_to_list(N) ++ "_" ++ integer_to_list(U),
+    Contents = Fun(M0),
+    Forms = [make_form(S) || S <- Contents],
+    {ok,M,Code} = compile:forms(Forms),
+    [{M,Code}|make_modules(N-1, Fun)].
+
+make_form(S) ->
+    {ok,Toks,_} = erl_scan:string(S),
+    {ok,Form} = erl_parse:parse_form(Toks),
+    Form.
+
+prepare_modules(Ms) ->
+    [erlang:prepare_loading(M, Code) || {M,Code} <- Ms].
diff --git a/erts/emulator/test/nested_SUITE.erl b/erts/emulator/test/nested_SUITE.erl
index 7cfa837ee5..c13e19f857 100644
--- a/erts/emulator/test/nested_SUITE.erl
+++ b/erts/emulator/test/nested_SUITE.erl
@@ -20,90 +20,74 @@
 
 -module(nested_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 case_in_case/1, case_in_after/1, catch_in_catch/1, bif_in_bif/1]).
+-export([all/0, suite/0,
+         case_in_case/1, case_in_after/1, catch_in_catch/1, bif_in_bif/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 10}}].
 
 all() -> 
     [case_in_case, case_in_after, catch_in_catch,
      bif_in_bif].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 case_in_case(suite) -> [];
 case_in_case(Config) when is_list(Config) ->
-    ?line done = search_any([a], [{a, 1}]),
-    ?line done = search_any([x], [{a, 1}]),
+    done = search_any([a], [{a, 1}]),
+    done = search_any([x], [{a, 1}]),
     ok.
 
 search_any([Key|Rest], List) ->
-    ?line case case lists:keysearch(Key, 1, List) of
-		   {value, _} -> 
-		       true;
-		   _ ->
-		       false
-	       end of
-	      true ->
-		  ok;
-	      false ->
-		  error;
-	      Other ->
-		  test_server:fail({other_result, Other})
-	  end,
-    ?line search_any(Rest, List);
+    case case lists:keysearch(Key, 1, List) of
+             {value, _} -> 
+                 true;
+             _ ->
+                 false
+         end of
+        true ->
+            ok;
+        false ->
+            error;
+        Other ->
+            ct:fail({other_result, Other})
+    end,
+    search_any(Rest, List);
 search_any([], _) ->
     done.
 
 case_in_after(suite) -> [];
 case_in_after(Config) when is_list(Config) ->
     receive
-	after case {x, y, z} of
-		  {x, y, z} -> 0
-	      end ->
-		ok
-	end,
+    after case {x, y, z} of
+              {x, y, z} -> 0
+          end ->
+              ok
+    end,
     ok.
 
-catch_in_catch(doc) -> "Test a catch within a catch in the same function.";
-catch_in_catch(suite) -> [];
+%% Test a catch within a catch in the same function.
 catch_in_catch(Config) when is_list(Config) ->
-    ?line {outer, inner_exit} = catcher(),
+    {outer, inner_exit} = catcher(),
     ok.
 
 catcher() ->
     case (catch 
-	  case (catch ?MODULE:non_existing()) of    % bogus function
-	      {'EXIT', _} ->
-		  inner_exit;
-	      Res1 ->
-		  {inner, Res1}
-	  end) of
-	{'EXIT', _} ->
-	    outer_exit;
-	Res2 ->
-	    {outer, Res2}
+          case (catch ?MODULE:non_existing()) of    % bogus function
+              {'EXIT', _} ->
+                  inner_exit;
+              Res1 ->
+                  {inner, Res1}
+          end) of
+        {'EXIT', _} ->
+            outer_exit;
+        Res2 ->
+            {outer, Res2}
     end.
 
-bif_in_bif(doc) -> "Test a BIF call within a BIF call.";
-bif_in_bif(suite) -> [];
+%% Test a BIF call within a BIF call.
 bif_in_bif(Config) when is_list(Config) ->
     Self = self(),
     put(pid, Self),
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl
index af2b955184..a185b72341 100644
--- a/erts/emulator/test/nif_SUITE.erl
+++ b/erts/emulator/test/nif_SUITE.erl
@@ -22,14 +22,13 @@
 
 %%-define(line_trace,true).
 -define(CHECK(Exp,Got), check(Exp,Got,?LINE)).
-%%-define(CHECK(Exp,Got), ?line Exp = Got).
+%%-define(CHECK(Exp,Got), Exp = Got).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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, basic/1, reload/1, upgrade/1, heap_frag/1,
+-export([all/0, suite/0,
+	 init_per_testcase/2, end_per_testcase/2,
+         basic/1, reload/1, upgrade/1, heap_frag/1,
 	 types/1, many_args/1, binaries/1, get_string/1, get_atom/1,
 	 maps/1,
 	 api_macros/1,
@@ -42,7 +41,12 @@
 	 otp_9668/1, consume_timeslice/1, dirty_nif/1, dirty_nif_send/1,
 	 dirty_nif_exception/1, call_dirty_nif_exception/1, nif_schedule/1,
 	 nif_exception/1, call_nif_exception/1,
-	 nif_nan_and_inf/1, nif_atom_too_long/1
+	 nif_nan_and_inf/1, nif_atom_too_long/1,
+	 nif_monotonic_time/1, nif_time_offset/1, nif_convert_time_unit/1,
+         nif_now_time/1, nif_cpu_time/1, nif_unique_integer/1,
+         nif_is_process_alive/1, nif_is_port_alive/1,
+         nif_term_to_binary/1, nif_binary_to_term/1,
+         nif_port_command/1
 	]).
 
 -export([many_args_100/100]).
@@ -72,182 +76,164 @@ all() ->
      otp_9828,
      otp_9668, consume_timeslice,
      nif_schedule, dirty_nif, dirty_nif_send, dirty_nif_exception,
-     nif_exception, nif_nan_and_inf, nif_atom_too_long
+     nif_exception, nif_nan_and_inf, nif_atom_too_long,
+     nif_monotonic_time, nif_time_offset, nif_convert_time_unit,
+     nif_now_time, nif_cpu_time, nif_unique_integer,
+     nif_is_process_alive, nif_is_port_alive,
+     nif_term_to_binary, nif_binary_to_term,
+     nif_port_command
     ].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 init_per_testcase(_Case, Config) ->
-%    ?line Dog = ?t:timetrap(?t:seconds(60*60*24)),
     Config.
 
 end_per_testcase(_Func, _Config) ->
-    %%Dog = ?config(watchdog, Config),
-    %%?t:timetrap_cancel(Dog),
     P1 = code:purge(nif_mod),
     Del = code:delete(nif_mod),
     P2 = code:purge(nif_mod),
     io:format("fin purged=~p, deleted=~p and then purged=~p\n",[P1,Del,P2]).
 
-basic(doc) -> ["Basic smoke test of load_nif and a simple NIF call"];
-basic(suite) -> [];
+%% Basic smoke test of load_nif and a simple NIF call
 basic(Config) when is_list(Config) ->
     ensure_lib_loaded(Config),
-    ?line true = (lib_version() =/= undefined),
-    ?line [{load,1,1,101},{lib_version,1,2,102}] = call_history(),
-    ?line [] = call_history(),
-    ?line true = lists:member(?MODULE, erlang:system_info(taints)),
+    true = (lib_version() =/= undefined),
+    [{load,1,1,101},{lib_version,1,2,102}] = call_history(),
+    [] = call_history(),
+    true = lists:member(?MODULE, erlang:system_info(taints)),
     ok.
 
-reload(doc) -> ["Test reload callback in nif lib"];
-reload(suite) -> [];  
+%% Test reload callback in nif lib
 reload(Config) when is_list(Config) ->    
     TmpMem = tmpmem(),
     ensure_lib_loaded(Config),
 
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "nif_mod"),
-    ?line {ok,nif_mod,Bin} = compile:file(File, [binary,return_errors]),
-    ?line {module,nif_mod} = erlang:load_module(nif_mod,Bin),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "nif_mod"),
+    {ok,nif_mod,Bin} = compile:file(File, [binary,return_errors]),
+    {module,nif_mod} = erlang:load_module(nif_mod,Bin),
 
-    ?line ok = nif_mod:load_nif_lib(Config, 1),
+    ok = nif_mod:load_nif_lib(Config, 1),
 
-    ?line hold_nif_mod_priv_data(nif_mod:get_priv_data_ptr()),
-    ?line [{load,1,1,101},{get_priv_data_ptr,1,2,102}] = nif_mod_call_history(),    
+    hold_nif_mod_priv_data(nif_mod:get_priv_data_ptr()),
+    [{load,1,1,101},{get_priv_data_ptr,1,2,102}] = nif_mod_call_history(),    
         
-    ?line ok = nif_mod:load_nif_lib(Config, 2),
-    ?line 2 = nif_mod:lib_version(),
-    ?line [{reload,2,1,201},{lib_version,2,2,202}] = nif_mod_call_history(),    
+    ok = nif_mod:load_nif_lib(Config, 2),
+    2 = nif_mod:lib_version(),
+    [{reload,2,1,201},{lib_version,2,2,202}] = nif_mod_call_history(),    
 
-    ?line ok = nif_mod:load_nif_lib(Config, 1),
-    ?line 1 = nif_mod:lib_version(),
-    ?line [{reload,1,1,101},{lib_version,1,2,102}] = nif_mod_call_history(),    
+    ok = nif_mod:load_nif_lib(Config, 1),
+    1 = nif_mod:lib_version(),
+    [{reload,1,1,101},{lib_version,1,2,102}] = nif_mod_call_history(),    
 
-    ?line true = erlang:delete_module(nif_mod),
-    ?line [] = nif_mod_call_history(),    
+    true = erlang:delete_module(nif_mod),
+    [] = nif_mod_call_history(),    
 
-    %%?line false= check_process_code(Pid, nif_mod),
-    ?line true = erlang:purge_module(nif_mod),
-    ?line [{unload,1,3,103}] = nif_mod_call_history(),    
+    %%false= check_process_code(Pid, nif_mod),
+    true = erlang:purge_module(nif_mod),
+    [{unload,1,3,103}] = nif_mod_call_history(),    
 
-    ?line true = lists:member(?MODULE, erlang:system_info(taints)),
-    ?line true = lists:member(nif_mod, erlang:system_info(taints)),
-    ?line verify_tmpmem(TmpMem),
+    true = lists:member(?MODULE, erlang:system_info(taints)),
+    true = lists:member(nif_mod, erlang:system_info(taints)),
+    verify_tmpmem(TmpMem),
     ok.
 
-upgrade(doc) -> ["Test upgrade callback in nif lib"];
-upgrade(suite) -> [];  
+%% Test upgrade callback in nif lib
 upgrade(Config) when is_list(Config) ->    
     TmpMem = tmpmem(),
     ensure_lib_loaded(Config),
 
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "nif_mod"),
-    ?line {ok,nif_mod,Bin} = compile:file(File, [binary,return_errors]),
-    ?line {module,nif_mod} = erlang:load_module(nif_mod,Bin),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "nif_mod"),
+    {ok,nif_mod,Bin} = compile:file(File, [binary,return_errors]),
+    {module,nif_mod} = erlang:load_module(nif_mod,Bin),
 
-    ?line ok = nif_mod:load_nif_lib(Config, 1),
-    ?line {Pid,MRef} = nif_mod:start(),
-    ?line 1 = call(Pid,lib_version),
+    ok = nif_mod:load_nif_lib(Config, 1),
+    {Pid,MRef} = nif_mod:start(),
+    1 = call(Pid,lib_version),
 
-    ?line hold_nif_mod_priv_data(nif_mod:get_priv_data_ptr()),
-    ?line [{load,1,1,101},{lib_version,1,2,102},{get_priv_data_ptr,1,3,103}] = nif_mod_call_history(),    
+    hold_nif_mod_priv_data(nif_mod:get_priv_data_ptr()),
+    [{load,1,1,101},{lib_version,1,2,102},{get_priv_data_ptr,1,3,103}] = nif_mod_call_history(),    
         
     %% Module upgrade with same lib-version
-    ?line {module,nif_mod} = erlang:load_module(nif_mod,Bin),
-    ?line undefined = nif_mod:lib_version(),
-    ?line 1 = call(Pid,lib_version),
-    ?line [{lib_version,1,4,104}] = nif_mod_call_history(),
+    {module,nif_mod} = erlang:load_module(nif_mod,Bin),
+    undefined = nif_mod:lib_version(),
+    1 = call(Pid,lib_version),
+    [{lib_version,1,4,104}] = nif_mod_call_history(),
 
-    ?line ok = nif_mod:load_nif_lib(Config, 1),
-    ?line 1 = nif_mod:lib_version(),
-    ?line [{upgrade,1,5,105},{lib_version,1,6,106}] = nif_mod_call_history(),
+    ok = nif_mod:load_nif_lib(Config, 1),
+    1 = nif_mod:lib_version(),
+    [{upgrade,1,5,105},{lib_version,1,6,106}] = nif_mod_call_history(),
 
-    ?line upgraded = call(Pid,upgrade),
-    ?line false = check_process_code(Pid, nif_mod),
-    ?line true = erlang:purge_module(nif_mod),
-    ?line [{unload,1,7,107}] = nif_mod_call_history(),
+    upgraded = call(Pid,upgrade),
+    false = check_process_code(Pid, nif_mod),
+    true = erlang:purge_module(nif_mod),
+    [{unload,1,7,107}] = nif_mod_call_history(),
 
-    ?line 1 = nif_mod:lib_version(),
-    ?line [{lib_version,1,8,108}] = nif_mod_call_history(),
+    1 = nif_mod:lib_version(),
+    [{lib_version,1,8,108}] = nif_mod_call_history(),
 
-    ?line true = erlang:delete_module(nif_mod),
-    ?line [] = nif_mod_call_history(),    
+    true = erlang:delete_module(nif_mod),
+    [] = nif_mod_call_history(),    
 
-    ?line Pid ! die,
-    ?line {'DOWN', MRef, process, Pid, normal} = receive_any(),
-    ?line false = check_process_code(Pid, nif_mod),
-    ?line true = erlang:purge_module(nif_mod),
-    ?line [{unload,1,9,109}] = nif_mod_call_history(),    
+    Pid ! die,
+    {'DOWN', MRef, process, Pid, normal} = receive_any(),
+    false = check_process_code(Pid, nif_mod),
+    true = erlang:purge_module(nif_mod),
+    [{unload,1,9,109}] = nif_mod_call_history(),    
 
     %% Module upgrade with different lib version
-    ?line {module,nif_mod} = erlang:load_module(nif_mod,Bin),
-    ?line undefined = nif_mod:lib_version(),
-    ?line {Pid2,MRef2} = nif_mod:start(),
-    ?line undefined = call(Pid2,lib_version),
-
-    ?line ok = nif_mod:load_nif_lib(Config, 1),
-    ?line hold_nif_mod_priv_data(nif_mod:get_priv_data_ptr()),
-    ?line 1 = call(Pid2,lib_version),
-    ?line [{load,1,1,101},{get_priv_data_ptr,1,2,102},{lib_version,1,3,103}] = nif_mod_call_history(),
-
-    ?line {module,nif_mod} = erlang:load_module(nif_mod,Bin),
-    ?line undefined = nif_mod:lib_version(),
-    ?line [] = nif_mod_call_history(),
-    ?line 1 = call(Pid2,lib_version),
-    ?line [{lib_version,1,4,104}] = nif_mod_call_history(),
-
-    ?line ok = nif_mod:load_nif_lib(Config, 2),
-    ?line 2 = nif_mod:lib_version(),
-    ?line [{upgrade,2,1,201},{lib_version,2,2,202}] = nif_mod_call_history(),
-
-    ?line 1 = call(Pid2,lib_version),
-    ?line [{lib_version,1,5,105}] = nif_mod_call_history(),
-
-    ?line upgraded = call(Pid2,upgrade),
-    ?line false = check_process_code(Pid2, nif_mod),
-    ?line true = erlang:purge_module(nif_mod),
-    ?line [{unload,1,6,106}] = nif_mod_call_history(),
-
-    ?line 2 = nif_mod:lib_version(),
-    ?line [{lib_version,2,3,203}] = nif_mod_call_history(),
-
-    ?line true = erlang:delete_module(nif_mod),
-    ?line [] = nif_mod_call_history(),    
-
-    ?line Pid2 ! die,
-    ?line {'DOWN', MRef2, process, Pid2, normal} = receive_any(),
-    ?line false= check_process_code(Pid2, nif_mod),
-    ?line true = erlang:purge_module(nif_mod),
-    ?line [{unload,2,4,204}] = nif_mod_call_history(),    
-
-    ?line true = lists:member(?MODULE, erlang:system_info(taints)),
-    ?line true = lists:member(nif_mod, erlang:system_info(taints)),
-    ?line verify_tmpmem(TmpMem),
+    {module,nif_mod} = erlang:load_module(nif_mod,Bin),
+    undefined = nif_mod:lib_version(),
+    {Pid2,MRef2} = nif_mod:start(),
+    undefined = call(Pid2,lib_version),
+
+    ok = nif_mod:load_nif_lib(Config, 1),
+    hold_nif_mod_priv_data(nif_mod:get_priv_data_ptr()),
+    1 = call(Pid2,lib_version),
+    [{load,1,1,101},{get_priv_data_ptr,1,2,102},{lib_version,1,3,103}] = nif_mod_call_history(),
+
+    {module,nif_mod} = erlang:load_module(nif_mod,Bin),
+    undefined = nif_mod:lib_version(),
+    [] = nif_mod_call_history(),
+    1 = call(Pid2,lib_version),
+    [{lib_version,1,4,104}] = nif_mod_call_history(),
+
+    ok = nif_mod:load_nif_lib(Config, 2),
+    2 = nif_mod:lib_version(),
+    [{upgrade,2,1,201},{lib_version,2,2,202}] = nif_mod_call_history(),
+
+    1 = call(Pid2,lib_version),
+    [{lib_version,1,5,105}] = nif_mod_call_history(),
+
+    upgraded = call(Pid2,upgrade),
+    false = check_process_code(Pid2, nif_mod),
+    true = erlang:purge_module(nif_mod),
+    [{unload,1,6,106}] = nif_mod_call_history(),
+
+    2 = nif_mod:lib_version(),
+    [{lib_version,2,3,203}] = nif_mod_call_history(),
+
+    true = erlang:delete_module(nif_mod),
+    [] = nif_mod_call_history(),    
+
+    Pid2 ! die,
+    {'DOWN', MRef2, process, Pid2, normal} = receive_any(),
+    false= check_process_code(Pid2, nif_mod),
+    true = erlang:purge_module(nif_mod),
+    [{unload,2,4,204}] = nif_mod_call_history(),    
+
+    true = lists:member(?MODULE, erlang:system_info(taints)),
+    true = lists:member(nif_mod, erlang:system_info(taints)),
+    verify_tmpmem(TmpMem),
     ok.
 
-heap_frag(doc) -> ["Test NIF building heap fragments"];
-heap_frag(suite) -> [];  
+%% Test NIF building heap fragments
 heap_frag(Config) when is_list(Config) ->    
     TmpMem = tmpmem(),
     ensure_lib_loaded(Config),
     
     heap_frag_do(1,1000000),
-    ?line verify_tmpmem(TmpMem),
+    verify_tmpmem(TmpMem),
     ok.
 
 heap_frag_do(N, Max) when N > Max ->
@@ -258,12 +244,11 @@ heap_frag_do(N, Max) ->
     L = list_seq(N),
     heap_frag_do(((N*5) div 4) + 1, Max).
 
-types(doc) -> ["Type tests"];
-types(suite) -> [];
+%% Type tests
 types(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
     ensure_lib_loaded(Config),
-    ?line ok = type_test(),
+    ok = type_test(),
     lists:foreach(fun(Tpl) ->
                     Lst = erlang:tuple_to_list(Tpl),                 
                     Lst = tuple_2_list(Tpl)
@@ -288,18 +273,18 @@ types(Config) when is_list(Config) ->
 			  R1 = echo_int(I),
 			  %%io:format("echo_int(~p) -> ~p\n", [I, R1]),
 			  R2 = my_echo_int(I, Limits),
-			  ?line R1 = R2,
-			  ?line true = (R1 =:= R2),
-			  ?line true = (R1 == R2)
+			  R1 = R2,
+			  true = (R1 =:= R2),
+			  true = (R1 == R2)
 		  end, int_list()),
 
-    ?line verify_tmpmem(TmpMem),
-    ?line true = (compare(-1294536544000, -1178704800000) < 0),
-    ?line true = (compare(-1178704800000, -1294536544000) > 0),
-    ?line true = (compare(-295147905179352825856, -36893488147419103232) < 0),
-    ?line true = (compare(-36893488147419103232, -295147905179352825856) > 0),
-    ?line true = (compare(-29514790517935282585612345678, -36893488147419103232) < 0),
-    ?line true = (compare(-36893488147419103232, -29514790517935282585612345678) > 0),
+    verify_tmpmem(TmpMem),
+    true = (compare(-1294536544000, -1178704800000) < 0),
+    true = (compare(-1178704800000, -1294536544000) > 0),
+    true = (compare(-295147905179352825856, -36893488147419103232) < 0),
+    true = (compare(-36893488147419103232, -295147905179352825856) > 0),
+    true = (compare(-29514790517935282585612345678, -36893488147419103232) < 0),
+    true = (compare(-36893488147419103232, -29514790517935282585612345678) > 0),
     ok.
 
 int_list() ->
@@ -327,15 +312,15 @@ eq_cmp(A,B) ->
     eq_cmp_do({A,B},{A,B}).
 
 eq_cmp_do(A,B) ->
-    %%?t:format("compare ~p and ~p\n",[A,B]),
+    %%io:format("compare ~p and ~p\n",[A,B]),
     Eq = (A =:= B),
-    ?line Eq = is_identical(A,B),
-    ?line Cmp = if
+    Eq = is_identical(A,B),
+    Cmp = if
             A < B -> -1;
             A == B -> 0;
             A > B -> 1
         end,
-    ?line Cmp = case compare(A,B) of
+    Cmp = case compare(A,B) of
                     C when is_integer(C), C < 0 -> -1;
                     0 -> 0;
                     C when is_integer(C) -> 1
@@ -343,47 +328,45 @@ eq_cmp_do(A,B) ->
     ok. 
 
 
-many_args(doc) -> ["Test NIF with many arguments"];
-many_args(suite) -> [];
+%% Test NIF with many arguments
 many_args(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
-    ?line ensure_lib_loaded(Config ,1),
-    ?line ok = apply(?MODULE,many_args_100,lists:seq(1,100)),
-    ?line ok = many_args_100(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100),
-    ?line verify_tmpmem(TmpMem),
+    ensure_lib_loaded(Config ,1),
+    ok = apply(?MODULE,many_args_100,lists:seq(1,100)),
+    ok = many_args_100(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100),
+    verify_tmpmem(TmpMem),
     ok.
 
-binaries(doc) -> ["Test NIF binary handling."];
-binaries(suite) -> [];
+%% Test NIF binary handling.
 binaries(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
-    ?line ensure_lib_loaded(Config, 1),
-    ?line RefcBin = list_to_binary(lists:seq(1,255)),
-    ?line RefcBin = clone_bin(RefcBin),
-    ?line HeapBin = list_to_binary(lists:seq(1,20)),
-    ?line HeapBin = clone_bin(HeapBin),
-    ?line <<_:8,Sub1:6/binary,_/binary>> = RefcBin, 
-    ?line <<_:8,Sub2:6/binary,_/binary>> = HeapBin,
-    ?line Sub1 = Sub2,
-    ?line Sub1 = clone_bin(Sub1),
-    ?line Sub2 = clone_bin(Sub2),
-    ?line <<_:9,Sub3:6/binary,_/bitstring>> = RefcBin, 
-    ?line <<_:9,Sub4:6/binary,_/bitstring>> = HeapBin,
-    ?line Sub3 = Sub4,
-    ?line Sub3 = clone_bin(Sub3),
-    ?line Sub4 = clone_bin(Sub4),
+    ensure_lib_loaded(Config, 1),
+    RefcBin = list_to_binary(lists:seq(1,255)),
+    RefcBin = clone_bin(RefcBin),
+    HeapBin = list_to_binary(lists:seq(1,20)),
+    HeapBin = clone_bin(HeapBin),
+    <<_:8,Sub1:6/binary,_/binary>> = RefcBin, 
+    <<_:8,Sub2:6/binary,_/binary>> = HeapBin,
+    Sub1 = Sub2,
+    Sub1 = clone_bin(Sub1),
+    Sub2 = clone_bin(Sub2),
+    <<_:9,Sub3:6/binary,_/bitstring>> = RefcBin, 
+    <<_:9,Sub4:6/binary,_/bitstring>> = HeapBin,
+    Sub3 = Sub4,
+    Sub3 = clone_bin(Sub3),
+    Sub4 = clone_bin(Sub4),
     %% When NIFs get bitstring support
-    %%?line <<_:8,Sub5:27/bitstring,_/bitstring>> = RefcBin, 
-    %%?line <<_:8,Sub6:27/bitstring,_/bitstring>> = HeapBin,
-    %%?line Sub5 = Sub6,
-    %%?line Sub5 = clone_bin(Sub5),
-    %%?line Sub6 = clone_bin(Sub6),
-    %%?line <<_:9,Sub7:27/bitstring,_/bitstring>> = RefcBin, 
-    %%?line <<_:9,Sub8:27/bitstring,_/bitstring>> = HeapBin,
-    %%?line Sub7 = Sub8,
-    %%?line Sub7 = clone_bin(Sub7),
-    %%?line Sub8 = clone_bin(Sub8),
-    %%?line <<>> = clone_bin(<<>>),
+    %%<<_:8,Sub5:27/bitstring,_/bitstring>> = RefcBin, 
+    %%<<_:8,Sub6:27/bitstring,_/bitstring>> = HeapBin,
+    %%Sub5 = Sub6,
+    %%Sub5 = clone_bin(Sub5),
+    %%Sub6 = clone_bin(Sub6),
+    %%<<_:9,Sub7:27/bitstring,_/bitstring>> = RefcBin, 
+    %%<<_:9,Sub8:27/bitstring,_/bitstring>> = HeapBin,
+    %%Sub7 = Sub8,
+    %%Sub7 = clone_bin(Sub7),
+    %%Sub8 = clone_bin(Sub8),
+    %%<<>> = clone_bin(<<>>),
 
     <<_:8,SubBinA:200/binary,_/binary>> = RefcBin,
     <<_:9,SubBinB:200/binary,_/bitstring>> = RefcBin,
@@ -396,56 +379,53 @@ binaries(Config) when is_list(Config) ->
     test_make_sub_bin(SubBinC),
     test_make_sub_bin(SubBinD),
     
-    ?line verify_tmpmem(TmpMem),
+    verify_tmpmem(TmpMem),
     ok.
 
 test_make_sub_bin(Bin) ->
     Size = byte_size(Bin),
     Rest10 = Size - 10,
     Rest1 = Size - 1,
-    ?line Bin = make_sub_bin(Bin, 0, Size),
+    Bin = make_sub_bin(Bin, 0, Size),
     <<_:10/binary,Sub0:Rest10/binary>> = Bin,
-    ?line Sub0 = make_sub_bin(Bin, 10, Rest10),
+    Sub0 = make_sub_bin(Bin, 10, Rest10),
     <<Sub1:10/binary,_/binary>> = Bin,
-    ?line Sub1 = make_sub_bin(Bin, 0, 10),
+    Sub1 = make_sub_bin(Bin, 0, 10),
     <<_:7/binary,Sub2:10/binary,_/binary>> = Bin,
-    ?line Sub2 = make_sub_bin(Bin, 7, 10),
-    ?line <<>> = make_sub_bin(Bin, 0, 0),
-    ?line <<>> = make_sub_bin(Bin, 10, 0),
-    ?line <<>> = make_sub_bin(Bin, Rest1, 0),
-    ?line <<>> = make_sub_bin(Bin, Size, 0),
+    Sub2 = make_sub_bin(Bin, 7, 10),
+    <<>> = make_sub_bin(Bin, 0, 0),
+    <<>> = make_sub_bin(Bin, 10, 0),
+    <<>> = make_sub_bin(Bin, Rest1, 0),
+    <<>> = make_sub_bin(Bin, Size, 0),
     ok.
     
-get_string(doc) -> ["Test enif_get_string"];
-get_string(suite) -> [];
+%% Test enif_get_string
 get_string(Config) when is_list(Config) ->
-    ?line ensure_lib_loaded(Config, 1),
-    ?line {7, <<"hejsan",0,_:3/binary>>} = string_to_bin("hejsan",10),
-    ?line {7, <<"hejsan",0,_>>} = string_to_bin("hejsan",8),
-    ?line {7, <<"hejsan",0>>} = string_to_bin("hejsan",7),
-    ?line {-6, <<"hejsa",0>>} = string_to_bin("hejsan",6),
-    ?line {-5, <<"hejs",0>>} = string_to_bin("hejsan",5),
-    ?line {-1, <<0>>} = string_to_bin("hejsan",1),
-    ?line {0, <<>>} = string_to_bin("hejsan",0),
-    ?line {1, <<0>>} = string_to_bin("",1),
-    ?line {0, <<>>} = string_to_bin("",0),
+    ensure_lib_loaded(Config, 1),
+    {7, <<"hejsan",0,_:3/binary>>} = string_to_bin("hejsan",10),
+    {7, <<"hejsan",0,_>>} = string_to_bin("hejsan",8),
+    {7, <<"hejsan",0>>} = string_to_bin("hejsan",7),
+    {-6, <<"hejsa",0>>} = string_to_bin("hejsan",6),
+    {-5, <<"hejs",0>>} = string_to_bin("hejsan",5),
+    {-1, <<0>>} = string_to_bin("hejsan",1),
+    {0, <<>>} = string_to_bin("hejsan",0),
+    {1, <<0>>} = string_to_bin("",1),
+    {0, <<>>} = string_to_bin("",0),
     ok.
 
-get_atom(doc) -> ["Test enif_get_atom"];
-get_atom(suite) -> [];
+%% Test enif_get_atom
 get_atom(Config) when is_list(Config) ->
-    ?line ensure_lib_loaded(Config, 1),
-    ?line {7, <<"hejsan",0,_:3/binary>>} = atom_to_bin(hejsan,10),
-    ?line {7, <<"hejsan",0,_>>} = atom_to_bin(hejsan,8),
-    ?line {7, <<"hejsan",0>>} = atom_to_bin(hejsan,7),
-    ?line {0, <<_:6/binary>>} = atom_to_bin(hejsan,6),
-    ?line {0, <<>>} = atom_to_bin(hejsan,0),
-    ?line {1, <<0>>} = atom_to_bin('',1),
-    ?line {0, <<>>} = atom_to_bin('',0),
+    ensure_lib_loaded(Config, 1),
+    {7, <<"hejsan",0,_:3/binary>>} = atom_to_bin(hejsan,10),
+    {7, <<"hejsan",0,_>>} = atom_to_bin(hejsan,8),
+    {7, <<"hejsan",0>>} = atom_to_bin(hejsan,7),
+    {0, <<_:6/binary>>} = atom_to_bin(hejsan,6),
+    {0, <<>>} = atom_to_bin(hejsan,0),
+    {1, <<0>>} = atom_to_bin('',1),
+    {0, <<>>} = atom_to_bin('',0),
     ok.
 
-maps(doc) -> ["Test NIF maps handling."];
-maps(suite) -> [];
+%% Test NIF maps handling.
 maps(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
     Pairs = [{adam, "bert"}] ++
@@ -492,31 +472,28 @@ maps(Config) when is_list(Config) ->
 
     ok.
  
-api_macros(doc) -> ["Test macros enif_make_list<N> and enif_make_tuple<N>"];
-api_macros(suite) -> [];
+%% Test macros enif_make_list<N> and enif_make_tuple<N>
 api_macros(Config) when is_list(Config) ->
-    ?line ensure_lib_loaded(Config, 1),
+    ensure_lib_loaded(Config, 1),
     Expected = {[lists:seq(1,N) || N <- lists:seq(1,9)],
 		[list_to_tuple(lists:seq(1,N)) || N <- lists:seq(1,9)]
 	       },
-    ?line Expected = macros(list_to_tuple(lists:seq(1,9))),
+    Expected = macros(list_to_tuple(lists:seq(1,9))),
     ok.
 
-from_array(doc) -> ["enif_make_[tuple|list]_from_array"];
-from_array(suite) -> [];
+%% enif_make_[tuple|list]_from_array
 from_array(Config) when is_list(Config) ->
-    ?line ensure_lib_loaded(Config, 1),
+    ensure_lib_loaded(Config, 1),
     lists:foreach(fun(Tpl) ->
 			  Lst = tuple_to_list(Tpl),
-			  ?line {Lst,Tpl} = tuple_2_list_and_tuple(Tpl)
+			  {Lst,Tpl} = tuple_2_list_and_tuple(Tpl)
 		  end,
 		  [{}, {1,2,3}, {[4,5],[],{},{6,7}}, {{}}, {[]}]),
     ok.
 
-iolist_as_binary(doc) -> ["enif_inspect_iolist_as_binary"];
-iolist_as_binary(suite) -> [];
+%% enif_inspect_iolist_as_binary
 iolist_as_binary(Config) when is_list(Config) ->
-    ?line ensure_lib_loaded(Config, 1),
+    ensure_lib_loaded(Config, 1),
     TmpMem = tmpmem(),
     List = [<<"hejsan">>, <<>>, [], [17], [<<>>],
 	    [127,128,255,0],
@@ -525,18 +502,17 @@ iolist_as_binary(Config) when is_list(Config) ->
 	    
     lists:foreach(fun(IoL) ->
 			  B1 = erlang:iolist_to_binary(IoL),
-			  ?line B2 = iolist_2_bin(IoL),
-			  ?line B1 = B2
+			  B2 = iolist_2_bin(IoL),
+			  B1 = B2
 		  end,
 		  List),
-    ?line verify_tmpmem(TmpMem),
+    verify_tmpmem(TmpMem),
     ok.
 
-resource(doc) -> ["Test memory managed objects, aka 'resources'"];
-resource(suite) -> [];
+%% Test memory managed objects, aka 'resources'
 resource(Config) when is_list(Config) ->
-    ?line ensure_lib_loaded(Config, 1),
-    ?line Type = get_resource_type(0),
+    ensure_lib_loaded(Config, 1),
+    Type = get_resource_type(0),
     resource_hugo(Type),
     resource_otto(Type),
     resource_new(Type),
@@ -546,76 +522,75 @@ resource(Config) when is_list(Config) ->
 resource_hugo(Type) ->
     DtorCall = resource_hugo_do(Type),
     erlang:garbage_collect(),
-    ?line DtorCall = last_resource_dtor_call(),
+    DtorCall = last_resource_dtor_call(),
     ok.
 
 resource_hugo_do(Type) ->
     HugoBin = <<"Hugo Hacker">>,
-    ?line HugoPtr = alloc_resource(Type, HugoBin),
-    ?line Hugo = make_resource(HugoPtr),
-    ?line <<>> = Hugo,
+    HugoPtr = alloc_resource(Type, HugoBin),
+    Hugo = make_resource(HugoPtr),
+    <<>> = Hugo,
     release_resource(HugoPtr),
     erlang:garbage_collect(),
-    ?line {HugoPtr,HugoBin} = get_resource(Type,Hugo),
+    {HugoPtr,HugoBin} = get_resource(Type,Hugo),
     Pid = spawn_link(fun() -> 			     
-			     receive {Pid, Type, Resource, Ptr, Bin} ->
-				     Pid ! {self(), got_it},
-				     receive {Pid, check_it} ->
-					     ?line {Ptr,Bin} = get_resource(Type,Resource),
-					     Pid ! {self(), ok}
-				     end
-			     end
-		     end),
+                             receive {Pid, Type, Resource, Ptr, Bin} ->
+                                         Pid ! {self(), got_it},
+                                         receive {Pid, check_it} ->
+                                                     {Ptr,Bin} = get_resource(Type,Resource),
+                                                     Pid ! {self(), ok}
+                                         end
+                             end
+                     end),
     Pid ! {self(), Type, Hugo, HugoPtr, HugoBin},
-    ?line {Pid, got_it} = receive_any(),
+    {Pid, got_it} = receive_any(),
     erlang:garbage_collect(),   % just to make our ProcBin move in memory
     Pid ! {self(), check_it},
-    ?line {Pid, ok} = receive_any(),
-    ?line [] = last_resource_dtor_call(),
-    ?line {HugoPtr,HugoBin} = get_resource(Type,Hugo),
+    {Pid, ok} = receive_any(),
+    [] = last_resource_dtor_call(),
+    {HugoPtr,HugoBin} = get_resource(Type,Hugo),
     {HugoPtr, HugoBin, 1}.
 
 resource_otto(Type) ->
     {OttoPtr, OttoBin} = resource_otto_do(Type),
     erlang:garbage_collect(),
-    ?line [] = last_resource_dtor_call(),
+    [] = last_resource_dtor_call(),
     release_resource(OttoPtr),
-    ?line {OttoPtr,OttoBin,1} = last_resource_dtor_call(),
+    {OttoPtr,OttoBin,1} = last_resource_dtor_call(),
     ok.
     
 resource_otto_do(Type) ->
     OttoBin = <<"Otto Ordonnans">>,
-    ?line OttoPtr = alloc_resource(Type, OttoBin),
-    ?line Otto = make_resource(OttoPtr),
-    ?line <<>> = Otto,
+    OttoPtr = alloc_resource(Type, OttoBin),
+    Otto = make_resource(OttoPtr),
+    <<>> = Otto,
     %% forget resource term but keep referenced by NIF
     {OttoPtr, OttoBin}.    
 
 resource_new(Type) ->
-    ?line {PtrB,BinB} = resource_new_do1(Type),
+    {PtrB,BinB} = resource_new_do1(Type),
     erlang:garbage_collect(),
-    ?line {PtrB,BinB,1} = last_resource_dtor_call(),
+    {PtrB,BinB,1} = last_resource_dtor_call(),
     ok.
     
 resource_new_do1(Type) ->
-    ?line {{PtrA,BinA}, {ResB,PtrB,BinB}} = resource_new_do2(Type),
+    {{PtrA,BinA}, {ResB,PtrB,BinB}} = resource_new_do2(Type),
     erlang:garbage_collect(),
-    ?line {PtrA,BinA,1} = last_resource_dtor_call(),
-    ?line {PtrB,BinB} = get_resource(Type, ResB),
+    {PtrA,BinA,1} = last_resource_dtor_call(),
+    {PtrB,BinB} = get_resource(Type, ResB),
     %% forget ResB and make it garbage
     {PtrB,BinB}.
     
 resource_new_do2(Type) ->
     BinA = <<"NewA">>,
     BinB = <<"NewB">>,
-    ?line ResA = make_new_resource(Type, BinA),
-    ?line ResB = make_new_resource(Type, BinB),
-    ?line <<>> = ResA,
-    ?line <<>> = ResB,
-    ?line {PtrA,BinA} = get_resource(Type, ResA),
-    ?line {PtrB,BinB} = get_resource(Type, ResB),
-    ?line true = (PtrA =/= PtrB),
-    ?line [] = last_resource_dtor_call(),
+    ResA = make_new_resource(Type, BinA),
+    ResB = make_new_resource(Type, BinB),
+    <<>> = ResA,
+    <<>> = ResB,
+    {PtrA,BinA} = get_resource(Type, ResA),
+    {PtrB,BinB} = get_resource(Type, ResB),
+    true = (PtrA =/= PtrB),
     %% forget ResA and make it garbage
     {{PtrA,BinA}, {ResB,PtrB,BinB}}.
 
@@ -624,22 +599,21 @@ resource_neg(TypeA) ->
 
     catch exit(42), % dummy exception to purge saved stacktraces from earlier exception
     erlang:garbage_collect(),
-    ?line {_,_,2} = last_resource_dtor_call(),
+    {_,_,2} = last_resource_dtor_call(),
     ok.
 
 resource_neg_do(TypeA) ->
     TypeB = get_resource_type(1),
     ResA = make_new_resource(TypeA, <<"Arnold">>),
     ResB= make_new_resource(TypeB, <<"Bobo">>),
-    ?line {'EXIT',{badarg,_}} = (catch get_resource(TypeA, ResB)),
-    ?line {'EXIT',{badarg,_}} = (catch get_resource(TypeB, ResA)),
+    {'EXIT',{badarg,_}} = (catch get_resource(TypeA, ResB)),
+    {'EXIT',{badarg,_}} = (catch get_resource(TypeB, ResA)),
     ok.
 
-resource_binary(doc) -> ["Test enif_make_resource_binary"];
-resource_binary(suite) -> [];
+%% Test enif_make_resource_binary
 resource_binary(Config) when is_list(Config) ->
-    ?line ensure_lib_loaded(Config, 1),
-    ?line {Ptr,Bin} = resource_binary_do(),
+    ensure_lib_loaded(Config, 1),
+    {Ptr,Bin} = resource_binary_do(),
     erlang:garbage_collect(),
     Last = last_resource_dtor_call(),
     ?CHECK({Ptr,Bin,1}, Last),
@@ -647,58 +621,57 @@ resource_binary(Config) when is_list(Config) ->
 
 resource_binary_do() ->
     Bin = <<"Hej Hopp i lingonskogen">>,
-    ?line {Ptr,ResBin1} = make_new_resource_binary(Bin),
-    ?line ResBin1 = Bin,          
-    ?line ResInfo = {Ptr,_} = get_resource(binary_resource_type,ResBin1),
+    {Ptr,ResBin1} = make_new_resource_binary(Bin),
+    ResBin1 = Bin,          
+    ResInfo = {Ptr,_} = get_resource(binary_resource_type,ResBin1),
 
     Papa = self(),
     Forwarder = spawn_link(fun() -> forwarder(Papa) end),
     io:format("sending to forwarder pid=~p\n",[Forwarder]),  
     Forwarder ! ResBin1,
     ResBin2 = receive_any(),
-    ?line ResBin2 = ResBin1,
-    ?line ResInfo = get_resource(binary_resource_type,ResBin2),
+    ResBin2 = ResBin1,
+    ResInfo = get_resource(binary_resource_type,ResBin2),
     Forwarder ! terminate,
-    ?line {Forwarder, 1} = receive_any(),
+    {Forwarder, 1} = receive_any(),
     erlang:garbage_collect(),
-    ?line ResInfo = get_resource(binary_resource_type,ResBin1),
-    ?line ResInfo = get_resource(binary_resource_type,ResBin2),
+    ResInfo = get_resource(binary_resource_type,ResBin1),
+    ResInfo = get_resource(binary_resource_type,ResBin2),
     ResInfo.
 
     
 -define(RT_CREATE,1).
 -define(RT_TAKEOVER,2).
 
-resource_takeover(doc) -> ["Test resource takeover by module reload and upgrade"];
-resource_takeover(suite) -> [];  
+%% Test resource takeover by module reload and upgrade
 resource_takeover(Config) when is_list(Config) ->    
     TmpMem = tmpmem(),
     ensure_lib_loaded(Config),
 
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "nif_mod"),
-    ?line {ok,nif_mod,ModBin} = compile:file(File, [binary,return_errors]),
-    ?line {module,nif_mod} = erlang:load_module(nif_mod,ModBin),
-
-    ?line ok = nif_mod:load_nif_lib(Config, 1, 
-				    [{resource_type, 0, ?RT_CREATE, "resource_type_A",resource_dtor_A,
-				      ?RT_CREATE},
-				     {resource_type, 1, ?RT_CREATE, "resource_type_null_A",null,
-				      ?RT_CREATE},
-				     {resource_type, 2, ?RT_CREATE bor ?RT_TAKEOVER, "resource_type_A_null",resource_dtor_A,
-				      ?RT_CREATE},
-				     {resource_type, 3, ?RT_CREATE, "resource_type_B_goneX",resource_dtor_B,
-				      ?RT_CREATE},
-				     {resource_type, 4, ?RT_CREATE, "resource_type_null_goneX",null,
-				      ?RT_CREATE},
-				     {resource_type, null, ?RT_TAKEOVER, "Pink unicorn", resource_dtor_A,
-				      ?RT_TAKEOVER}
-				    ]),
-
-    ?line hold_nif_mod_priv_data(nif_mod:get_priv_data_ptr()),
-    ?line [{load,1,1,101},{get_priv_data_ptr,1,2,102}] = nif_mod_call_history(),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "nif_mod"),
+    {ok,nif_mod,ModBin} = compile:file(File, [binary,return_errors]),
+    {module,nif_mod} = erlang:load_module(nif_mod,ModBin),
 
-    ?line {Holder, _MRef} = spawn_opt(fun resource_holder/0, [link, monitor]),
+    ok = nif_mod:load_nif_lib(Config, 1, 
+                              [{resource_type, 0, ?RT_CREATE, "resource_type_A",resource_dtor_A,
+                                ?RT_CREATE},
+                               {resource_type, 1, ?RT_CREATE, "resource_type_null_A",null,
+                                ?RT_CREATE},
+                               {resource_type, 2, ?RT_CREATE bor ?RT_TAKEOVER, "resource_type_A_null",resource_dtor_A,
+                                ?RT_CREATE},
+                               {resource_type, 3, ?RT_CREATE, "resource_type_B_goneX",resource_dtor_B,
+                                ?RT_CREATE},
+                               {resource_type, 4, ?RT_CREATE, "resource_type_null_goneX",null,
+                                ?RT_CREATE},
+                               {resource_type, null, ?RT_TAKEOVER, "Pink unicorn", resource_dtor_A,
+                                ?RT_TAKEOVER}
+                              ]),
+
+    hold_nif_mod_priv_data(nif_mod:get_priv_data_ptr()),
+    [{load,1,1,101},{get_priv_data_ptr,1,2,102}] = nif_mod_call_history(),
+
+    {Holder, _MRef} = spawn_opt(fun resource_holder/0, [link, monitor]),
 
     {A1,BinA1} = make_resource(0,Holder,"A1"),
     {A2,BinA2} = make_resource(0,Holder,"A2"),
@@ -718,91 +691,91 @@ resource_takeover(Config) when is_list(Config) ->
     {NGX1,_BinNGX1} = make_resource(4,Holder,"NGX1"),
     {NGX2,_BinNGX2} = make_resource(4,Holder,"NGX2"),
 
-    ?line [] = nif_mod_call_history(),
+    [] = nif_mod_call_history(),
 
-    ?line ok = forget_resource(A1),
-    ?line [{{resource_dtor_A_v1,BinA1},1,3,103}] = nif_mod_call_history(),    
+    ok = forget_resource(A1),
+    [{{resource_dtor_A_v1,BinA1},1,3,103}] = nif_mod_call_history(),    
 
-    ?line ok = forget_resource(NA1),
-    ?line [] = nif_mod_call_history(), % no dtor
+    ok = forget_resource(NA1),
+    [] = nif_mod_call_history(), % no dtor
 
-    ?line ok = forget_resource(AN1),
+    ok = forget_resource(AN1),
     ?CHECK([{{resource_dtor_A_v1,BinAN1},1,4,104}] , nif_mod_call_history()),
 
-    ?line ok = forget_resource(BGX1),
+    ok = forget_resource(BGX1),
     ?CHECK([{{resource_dtor_B_v1,BinBGX1},1,5,105}], nif_mod_call_history()),
 
-    ?line ok = forget_resource(NGX1),
+    ok = forget_resource(NGX1),
     ?CHECK([], nif_mod_call_history()), % no dtor
 
-    ?line ok = nif_mod:load_nif_lib(Config, 2,
-				    [{resource_type, 0, ?RT_TAKEOVER, "resource_type_A",resource_dtor_A,
-				      ?RT_TAKEOVER},
-				     {resource_type, 1, ?RT_TAKEOVER bor ?RT_CREATE, "resource_type_null_A",resource_dtor_A,
-				      ?RT_TAKEOVER},
-				     {resource_type, 2, ?RT_TAKEOVER, "resource_type_A_null",null,
-				      ?RT_TAKEOVER},
-				     {resource_type, null, ?RT_TAKEOVER, "Pink unicorn", resource_dtor_A,
-				      ?RT_TAKEOVER},
-				     {resource_type, null, ?RT_CREATE, "resource_type_B_goneX",resource_dtor_B,
-				      ?RT_CREATE},
-				     {resource_type, null, ?RT_CREATE, "resource_type_null_goneX",null,
-				      ?RT_CREATE},
-				     {resource_type, 3, ?RT_CREATE, "resource_type_B_goneY",resource_dtor_B,
-				      ?RT_CREATE},
-				     {resource_type, 4, ?RT_CREATE, "resource_type_null_goneY",null,
-				      ?RT_CREATE}
-				    ]),
+    ok = nif_mod:load_nif_lib(Config, 2,
+                              [{resource_type, 0, ?RT_TAKEOVER, "resource_type_A",resource_dtor_A,
+                                ?RT_TAKEOVER},
+                               {resource_type, 1, ?RT_TAKEOVER bor ?RT_CREATE, "resource_type_null_A",resource_dtor_A,
+                                ?RT_TAKEOVER},
+                               {resource_type, 2, ?RT_TAKEOVER, "resource_type_A_null",null,
+                                ?RT_TAKEOVER},
+                               {resource_type, null, ?RT_TAKEOVER, "Pink unicorn", resource_dtor_A,
+                                ?RT_TAKEOVER},
+                               {resource_type, null, ?RT_CREATE, "resource_type_B_goneX",resource_dtor_B,
+                                ?RT_CREATE},
+                               {resource_type, null, ?RT_CREATE, "resource_type_null_goneX",null,
+                                ?RT_CREATE},
+                               {resource_type, 3, ?RT_CREATE, "resource_type_B_goneY",resource_dtor_B,
+                                ?RT_CREATE},
+                               {resource_type, 4, ?RT_CREATE, "resource_type_null_goneY",null,
+                                ?RT_CREATE}
+                              ]),
     ?CHECK([{reload,2,1,201}], nif_mod_call_history()),
 
-    ?line BinA2 = read_resource(0,A2),
-    ?line ok = forget_resource(A2),
+    BinA2 = read_resource(0,A2),
+    ok = forget_resource(A2),
     ?CHECK([{{resource_dtor_A_v2,BinA2},2,2,202}], nif_mod_call_history()),    
 
-    ?line ok = forget_resource(NA2),
+    ok = forget_resource(NA2),
     ?CHECK([{{resource_dtor_A_v2,BinNA2},2,3,203}], nif_mod_call_history()),    
 
-    ?line ok = forget_resource(AN2),
+    ok = forget_resource(AN2),
     ?CHECK([], nif_mod_call_history()),    % no dtor
 
-    ?line ok = forget_resource(BGX2),  % calling dtor in orphan library v1 still loaded
+    ok = forget_resource(BGX2),  % calling dtor in orphan library v1 still loaded
     ?CHECK([{{resource_dtor_B_v1,BinBGX2},1,6,106}], nif_mod_call_history()),
     % How to test that lib v1 is closed here?
 
-    ?line ok = forget_resource(NGX2),
+    ok = forget_resource(NGX2),
     ?CHECK([], nif_mod_call_history()),  % no dtor
 
     {BGY1,BinBGY1} = make_resource(3,Holder,"BGY1"),
     {NGY1,_BinNGY1} = make_resource(4,Holder,"NGY1"),
 
     %% Module upgrade with same lib-version
-    ?line {module,nif_mod} = erlang:load_module(nif_mod,ModBin),
-    ?line undefined = nif_mod:lib_version(),
-    ?line ok = nif_mod:load_nif_lib(Config, 2,
-				    [{resource_type, 2, ?RT_TAKEOVER, "resource_type_A",resource_dtor_B,
-				      ?RT_TAKEOVER},
-				     {resource_type, 0, ?RT_TAKEOVER bor ?RT_CREATE, "resource_type_null_A",null,
-				      ?RT_TAKEOVER},
-				     {resource_type, 1, ?RT_TAKEOVER, "resource_type_A_null",resource_dtor_A,
-				      ?RT_TAKEOVER},
-				     {resource_type, null, ?RT_TAKEOVER, "Pink elephant", resource_dtor_A,
-				      ?RT_TAKEOVER},
-				     {resource_type, 3, ?RT_CREATE, "resource_type_B_goneZ",resource_dtor_B,
-				      ?RT_CREATE},
-				     {resource_type, 4, ?RT_CREATE, "resource_type_null_goneZ",null,
-				      ?RT_CREATE}
-				    ]),
-
-    ?line 2 = nif_mod:lib_version(),
+    {module,nif_mod} = erlang:load_module(nif_mod,ModBin),
+    undefined = nif_mod:lib_version(),
+    ok = nif_mod:load_nif_lib(Config, 2,
+                              [{resource_type, 2, ?RT_TAKEOVER, "resource_type_A",resource_dtor_B,
+                                ?RT_TAKEOVER},
+                               {resource_type, 0, ?RT_TAKEOVER bor ?RT_CREATE, "resource_type_null_A",null,
+                                ?RT_TAKEOVER},
+                               {resource_type, 1, ?RT_TAKEOVER, "resource_type_A_null",resource_dtor_A,
+                                ?RT_TAKEOVER},
+                               {resource_type, null, ?RT_TAKEOVER, "Pink elephant", resource_dtor_A,
+                                ?RT_TAKEOVER},
+                               {resource_type, 3, ?RT_CREATE, "resource_type_B_goneZ",resource_dtor_B,
+                                ?RT_CREATE},
+                               {resource_type, 4, ?RT_CREATE, "resource_type_null_goneZ",null,
+                                ?RT_CREATE}
+                              ]),
+
+    2 = nif_mod:lib_version(),
     ?CHECK([{upgrade,2,4,204},{lib_version,2,5,205}], nif_mod_call_history()),
 
-    ?line ok = forget_resource(A3),
+    ok = forget_resource(A3),
     ?CHECK([{{resource_dtor_B_v2,BinA3},2,6,206}], nif_mod_call_history()),    
 
-    ?line ok = forget_resource(NA3),
+    ok = forget_resource(NA3),
     ?CHECK([], nif_mod_call_history()),    
 
-    ?line ok = forget_resource(AN3),
+    ok = forget_resource(AN3),
     ?CHECK([{{resource_dtor_A_v2,BinAN3},2,7,207}], nif_mod_call_history()),
 
     {A4,BinA4} = make_resource(2,Holder, "A4"),
@@ -812,19 +785,19 @@ resource_takeover(Config) when is_list(Config) ->
     {BGZ1,BinBGZ1} = make_resource(3,Holder,"BGZ1"),
     {NGZ1,_BinNGZ1} = make_resource(4,Holder,"NGZ1"),
 
-    ?line false = code:purge(nif_mod),
-    ?line [] = nif_mod_call_history(),
+    false = code:purge(nif_mod),
+    [] = nif_mod_call_history(),
 
-    ?line ok = forget_resource(NGY1),
-    ?line [] = nif_mod_call_history(),
+    ok = forget_resource(NGY1),
+    [] = nif_mod_call_history(),
 
-    ?line ok = forget_resource(BGY1),  % calling dtor in orphan library v2 still loaded
-    ?line [{{resource_dtor_B_v2,BinBGY1},2,8,208},{unload,2,9,209}] = nif_mod_call_history(),
+    ok = forget_resource(BGY1),  % calling dtor in orphan library v2 still loaded
+    [{{resource_dtor_B_v2,BinBGY1},2,8,208},{unload,2,9,209}] = nif_mod_call_history(),
 
     %% Module upgrade with other lib-version
-    ?line {module,nif_mod} = erlang:load_module(nif_mod,ModBin),
-    ?line undefined = nif_mod:lib_version(),
-    ?line ok = nif_mod:load_nif_lib(Config, 1,
+    {module,nif_mod} = erlang:load_module(nif_mod,ModBin),
+    undefined = nif_mod:lib_version(),
+    ok = nif_mod:load_nif_lib(Config, 1,
 				    [{resource_type, 2, ?RT_TAKEOVER, "resource_type_A",resource_dtor_A,
 				      ?RT_TAKEOVER},
 				     {resource_type, 0, ?RT_TAKEOVER bor ?RT_CREATE, "resource_type_null_A",resource_dtor_A,
@@ -835,28 +808,28 @@ resource_takeover(Config) when is_list(Config) ->
 				      ?RT_TAKEOVER}
 				    ]),
 
-    ?line 1 = nif_mod:lib_version(),
-    ?line [{upgrade,1,1,101},{lib_version,1,2,102}] = nif_mod_call_history(),
+    1 = nif_mod:lib_version(),
+    [{upgrade,1,1,101},{lib_version,1,2,102}] = nif_mod_call_history(),
 
-    %%?line false= check_process_code(Pid, nif_mod),
-    ?line false = code:purge(nif_mod),
+    %%false= check_process_code(Pid, nif_mod),
+    false = code:purge(nif_mod),
     %% no unload here as we still have instances with destructors
-    ?line [] = nif_mod_call_history(),
+    [] = nif_mod_call_history(),
 
-    ?line ok = forget_resource(BGZ1),  % calling dtor in orphan library v2 still loaded
-    ?line [{{resource_dtor_B_v2,BinBGZ1},2,10,210},{unload,2,11,211}] = nif_mod_call_history(),
+    ok = forget_resource(BGZ1),  % calling dtor in orphan library v2 still loaded
+    [{{resource_dtor_B_v2,BinBGZ1},2,10,210},{unload,2,11,211}] = nif_mod_call_history(),
 
-    ?line ok = forget_resource(NGZ1),
-    ?line [] = nif_mod_call_history(),
+    ok = forget_resource(NGZ1),
+    [] = nif_mod_call_history(),
 
-    ?line ok = forget_resource(A4),
-    ?line [{{resource_dtor_A_v1,BinA4},1,3,103}] = nif_mod_call_history(),
+    ok = forget_resource(A4),
+    [{{resource_dtor_A_v1,BinA4},1,3,103}] = nif_mod_call_history(),
 
-    ?line ok = forget_resource(NA4),
-    ?line [{{resource_dtor_A_v1,BinNA4},1,4,104}] = nif_mod_call_history(),
+    ok = forget_resource(NA4),
+    [{{resource_dtor_A_v1,BinNA4},1,4,104}] = nif_mod_call_history(),
 
-    ?line ok = forget_resource(AN4),
-    ?line [] = nif_mod_call_history(),
+    ok = forget_resource(AN4),
+    [] = nif_mod_call_history(),
 
 
     %%
@@ -978,8 +951,8 @@ resource_takeover(Config) when is_list(Config) ->
 			       {return, 0}  % SUCCESS
 			      ]),
 
-    ?line hold_nif_mod_priv_data(nif_mod:get_priv_data_ptr()),
-    ?line [{load,1,1,101},{get_priv_data_ptr,1,2,102}] = nif_mod_call_history(),
+    hold_nif_mod_priv_data(nif_mod:get_priv_data_ptr()),
+    [{load,1,1,101},{get_priv_data_ptr,1,2,102}] = nif_mod_call_history(),
 
     {NA7,BinNA7} = make_resource(0, Holder, "NA7"),
     {AN7,BinAN7} = make_resource(1, Holder, "AN7"),
@@ -990,15 +963,15 @@ resource_takeover(Config) when is_list(Config) ->
     ok = forget_resource(AN7),
     [] = nif_mod_call_history(),
 
-    ?line true = lists:member(?MODULE, erlang:system_info(taints)),
-    ?line true = lists:member(nif_mod, erlang:system_info(taints)),
-    ?line verify_tmpmem(TmpMem),    
+    true = lists:member(?MODULE, erlang:system_info(taints)),
+    true = lists:member(nif_mod, erlang:system_info(taints)),
+    verify_tmpmem(TmpMem),    
     ok.
 
 make_resource(Type,Holder,Str) when is_list(Str) ->
     Bin = list_to_binary(Str),
     A1 = make_resource_do(Type,Holder,Bin),
-    ?line Bin = read_resource(Type,A1),
+    Bin = read_resource(Type,A1),
     {A1,Bin}.
 
 make_resource_do(Type, Holder, Bin) ->
@@ -1025,7 +998,7 @@ resource_holder(List) ->
     %%io:format("resource_holder got ~p with list = ~p\n", [Msg,List]),
     case Msg of
 	{Pid, make, Type, Bin} ->	    
-	    ?line Resource = nif_mod:make_new_resource(Type, Bin),
+	    Resource = nif_mod:make_new_resource(Type, Bin),
 	    Id = {make_ref(),Bin},
 	    Pid ! {self(), make_ok, Id},
 	    resource_holder([{Id,Resource} | List]);
@@ -1047,7 +1020,7 @@ resource_holder(Pid,Reply,List) ->
     resource_holder(List).
 
 
-threading(doc) -> ["Test the threading API functions (reuse tests from driver API)"];
+%% Test the threading API functions (reuse tests from driver API)
 threading(Config) when is_list(Config) ->
     case erlang:system_info(threads) of
     	true -> threading_do(Config);
@@ -1055,53 +1028,53 @@ threading(Config) when is_list(Config) ->
     end.
 
 threading_do(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "tester"),
-    ?line {ok,tester,ModBin} = compile:file(File, [binary,return_errors]),
-    ?line {module,tester} = erlang:load_module(tester,ModBin),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "tester"),
+    {ok,tester,ModBin} = compile:file(File, [binary,return_errors]),
+    {module,tester} = erlang:load_module(tester,ModBin),
 
-    ?line ok = tester:load_nif_lib(Config, "basic"),   
-    ?line ok = tester:run(),
+    ok = tester:load_nif_lib(Config, "basic"),   
+    ok = tester:run(),
 
-    ?line ok = tester:load_nif_lib(Config, "rwlock"),
-    ?line ok = tester:run(),
+    ok = tester:load_nif_lib(Config, "rwlock"),
+    ok = tester:run(),
 
-    ?line ok = tester:load_nif_lib(Config, "tsd"),
-    ?line ok = tester:run().
+    ok = tester:load_nif_lib(Config, "tsd"),
+    ok = tester:run().
 
-send(doc) -> ["Test NIF message sending"];
+%% Test NIF message sending
 send(Config) when is_list(Config) ->    
     ensure_lib_loaded(Config),
 
     N = 1500,
     List = lists:seq(1,N),
-    ?line {ok,1} = send_list_seq(N, self),
-    ?line {ok,1} = send_list_seq(N, self()),
-    ?line List = receive_any(),
-    ?line List = receive_any(),
+    {ok,1} = send_list_seq(N, self),
+    {ok,1} = send_list_seq(N, self()),
+    List = receive_any(),
+    List = receive_any(),
     Papa = self(),
-    spawn_link(fun() -> ?line {ok,1} = send_list_seq(N, Papa) end),
-    ?line List = receive_any(),
+    spawn_link(fun() -> {ok,1} = send_list_seq(N, Papa) end),
+    List = receive_any(),
 
-    ?line {ok, 1, BlobS} = send_new_blob(self(), other_term()),
-    ?line BlobR = receive_any(),
+    {ok, 1, BlobS} = send_new_blob(self(), other_term()),
+    BlobR = receive_any(),
     io:format("Sent ~p\nGot ~p\n", [BlobS, BlobR]),
-    ?line BlobR = BlobS,
+    BlobR = BlobS,
 
     %% send to dead pid
     {DeadPid, DeadMon} = spawn_monitor(fun() -> void end),
-    ?line {'DOWN', DeadMon, process, DeadPid, normal} = receive_any(),
+    {'DOWN', DeadMon, process, DeadPid, normal} = receive_any(),
     {ok,0} = send_list_seq(7, DeadPid),
     ok.
 
-send2(doc) -> ["More NIF message sending"];
+%% More NIF message sending
 send2(Config) when is_list(Config) ->
     ensure_lib_loaded(Config),
 
     send2_do1(fun send_blob_dbg/2),
     ok.
 
-send_threaded(doc) -> ["Send msg from user thread"];
+%% Send msg from user thread
 send_threaded(Config) when is_list(Config) ->
     case erlang:system_info(smp_support) of
 	true ->
@@ -1122,44 +1095,44 @@ send2_do1(SendBlobF) ->
     io:format("sending to forwarder pid=~p\n",[Forwarder]),
     send2_do2(SendBlobF, Forwarder),
     Forwarder ! terminate,
-    ?line {Forwarder, 4} = receive_any(),
+    {Forwarder, 4} = receive_any(),
     ok.
 
 send2_do2(SendBlobF, To) ->   
     MsgEnv = alloc_msgenv(),
     repeat(50, fun(_) -> grow_blob(MsgEnv,other_term()) end, []),
-    ?line {ok,1,Blob0} = SendBlobF(MsgEnv, To),
-    ?line Blob1 = receive_any(),
-    ?line Blob1 = Blob0,
+    {ok,1,Blob0} = SendBlobF(MsgEnv, To),
+    Blob1 = receive_any(),
+    Blob1 = Blob0,
     
     clear_msgenv(MsgEnv),
     repeat(50, fun(_) -> grow_blob(MsgEnv,other_term()) end, []),
-    ?line {ok,1,Blob2} = SendBlobF(MsgEnv, To),
-    ?line Blob3 = receive_any(),
-    ?line Blob3 = Blob2,
+    {ok,1,Blob2} = SendBlobF(MsgEnv, To),
+    Blob3 = receive_any(),
+    Blob3 = Blob2,
 
     clear_msgenv(MsgEnv),
     repeat(50, fun(_) -> grow_blob(MsgEnv,other_term()) end, []),
 
     clear_msgenv(MsgEnv),
     repeat(50, fun(_) -> grow_blob(MsgEnv,other_term()) end, []),
-    ?line {ok,1,Blob4} = SendBlobF(MsgEnv, To),
-    ?line Blob5 = receive_any(),
-    ?line Blob5 = Blob4,
+    {ok,1,Blob4} = SendBlobF(MsgEnv, To),
+    Blob5 = receive_any(),
+    Blob5 = Blob4,
 
     clear_msgenv(MsgEnv),
     clear_msgenv(MsgEnv),
     repeat(50, fun(_) -> grow_blob(MsgEnv,other_term()) end, []),
-    ?line {ok,1,Blob6} = SendBlobF(MsgEnv, To),
-    ?line Blob7 = receive_any(),
-    ?line Blob7 = Blob6,
+    {ok,1,Blob6} = SendBlobF(MsgEnv, To),
+    Blob7 = receive_any(),
+    Blob7 = Blob6,
 
     ok.
 
 
 send_blob_thread_and_join(MsgEnv, To) ->
-    ?line {ok,Blob} = send_blob_thread_dbg(MsgEnv, To, no_join),
-    ?line {ok,SendRes} = join_send_thread(MsgEnv),
+    {ok,Blob} = send_blob_thread_dbg(MsgEnv, To, no_join),
+    {ok,SendRes} = join_send_thread(MsgEnv),
     {ok,SendRes,Blob}.
 
 send_blob_dbg(MsgEnv, To) ->
@@ -1187,21 +1160,18 @@ forwarder(To, N) ->
 other_term() ->
     {fun(X,Y) -> X*Y end, make_ref()}.
 
-send3(doc) -> ["Message sending stress test"];
+%% Message sending stress test
 send3(Config) when is_list(Config) ->
     %% Let a number of processes send random message blobs between each other
     %% using enif_send. Kill and spawn new ones randomly to keep a ~constant
     %% number of workers running.
-    Seed = {erlang:monotonic_time(),
-	    erlang:time_offset(),
-	    erlang:unique_integer()},
-    io:format("seed: ~p\n",[Seed]), 
-    random:seed(Seed),    
+    rand:seed(exsplus),
+    io:format("seed: ~p\n",[rand:export_seed()]),
     ets:new(nif_SUITE,[named_table,public]),
-    ?line true = ets:insert(nif_SUITE,{send3,0,0,0,0}),
+    true = ets:insert(nif_SUITE,{send3,0,0,0,0}),
     timer:send_after(10000, timeout), % Run for 10 seconds
     SpawnCnt = send3_controller(0, [], [], 20),
-    ?line [{_,Rcv,SndOk,SndFail,Balance}] = ets:lookup(nif_SUITE,send3),
+    [{_,Rcv,SndOk,SndFail,Balance}] = ets:lookup(nif_SUITE,send3),
     io:format("spawns=~p received=~p, sent=~p send-failure=~p balance=~p\n",
               [SpawnCnt,Rcv,SndOk,SndFail,Balance]),
     ets:delete(nif_SUITE).
@@ -1229,13 +1199,13 @@ send3_controller(SpawnCnt0, Mons0, Pids0, Tick) ->
     after Tick -> 
         Max = 20,
         N = length(Pids0),
-        PidN = random:uniform(Max),
+        PidN = rand:uniform(Max),
         %%io:format("N=~p PidN=~p Pids0=~p\n", [N,PidN,Pids0]), 
         case PidN > N of
             true ->
                 {NewPid,Mon} = spawn_opt(fun send3_proc/0, [link,monitor]),                
                 lists:foreach(fun(P) -> P ! {is_born,NewPid} end, Pids0),
-                ?line Balance = ets:lookup_element(nif_SUITE,send3,5),
+                Balance = ets:lookup_element(nif_SUITE,send3,5),
                 Inject = (Balance =< 0),
                 case Inject of
                     true ->  ok;
@@ -1261,7 +1231,7 @@ send3_proc(Pids0, Counters={Rcv,SndOk,SndFail}, State0) ->
     receive 
         {pids, Pids1, Inject} ->
             %%io:format("~p: got ~p Inject=~p\n", [self(), Pids1, Inject]), 
-            ?line Pids0 = [self()],
+            Pids0 = [self()],
             Pids2 = [self() | Pids1],
             case Inject of
                 true -> send3_proc_send(Pids2, Counters, State0);
@@ -1293,7 +1263,7 @@ send3_proc(Pids0, Counters={Rcv,SndOk,SndFail}, State0) ->
     end.
 
 send3_proc_send(Pids, {Rcv,SndOk,SndFail}, State0) ->
-    To = lists:nth(random:uniform(length(Pids)),Pids),
+    To = lists:nth(rand:uniform(length(Pids)),Pids),
     Blob = send3_make_blob(),
     State1 = send3_new_state(State0,Blob), 
     case send3_send(To, Blob) of
@@ -1305,12 +1275,12 @@ send3_proc_send(Pids, {Rcv,SndOk,SndFail}, State0) ->
 
 
 send3_make_blob() ->    
-    case random:uniform(20)-1 of
+    case rand:uniform(20)-1 of
         0 -> {term,[]};
         N ->
             MsgEnv = alloc_msgenv(), 
             repeat(N bsr 1,
-                   fun(_) -> grow_blob(MsgEnv,other_term(),random:uniform(1 bsl 20))
+                   fun(_) -> grow_blob(MsgEnv,other_term(),rand:uniform(1 bsl 20))
                    end, void),
             case (N band 1) of
                 0 -> {term,copy_blob(MsgEnv)};
@@ -1320,7 +1290,7 @@ send3_make_blob() ->
 
 send3_send(Pid, Msg) ->
     %% 90% enif_send and 10% normal bang
-    case random:uniform(10) of
+    case rand:uniform(10) of
         1 -> send3_send_bang(Pid,Msg);
         _ -> send3_send_nif(Pid,Msg)
     end.
@@ -1341,103 +1311,105 @@ send3_send_bang(Pid, {msgenv,MsgEnv}) ->
     true.
 
 send3_new_state(State, Blob) ->
-    case random:uniform(5+2) of
+    case rand:uniform(5+2) of
         N when N =< 5-> setelement(N, State, Blob);
         _ -> State  % Don't store blob
     end.
 
-neg(doc) -> ["Negative testing of load_nif"];
+%% Negative testing of load_nif
 neg(Config) when is_list(Config) ->
     TmpMem = tmpmem(),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:load_nif(badarg, 0)),
-    ?line {error,{load_failed,_}} = erlang:load_nif("pink_unicorn", 0),
+    {'EXIT',{badarg,_}} = (catch erlang:load_nif(badarg, 0)),
+    {error,{load_failed,_}} = erlang:load_nif("pink_unicorn", 0),
     
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "nif_mod"),
-    ?line {ok,nif_mod,Bin} = compile:file(File, [binary,return_errors]),
-    ?line {module,nif_mod} = erlang:load_module(nif_mod,Bin),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "nif_mod"),
+    {ok,nif_mod,Bin} = compile:file(File, [binary,return_errors]),
+    {module,nif_mod} = erlang:load_module(nif_mod,Bin),
 
-    ?line {error,{bad_lib,_}} = nif_mod:load_nif_lib(Config, no_init),    
-    ?line verify_tmpmem(TmpMem),
-    ?line ok.
+    {error,{bad_lib,_}} = nif_mod:load_nif_lib(Config, no_init),    
+    verify_tmpmem(TmpMem),
+    ok.
 
-is_checks(doc) -> ["Test all enif_is functions"];
+%% Test all enif_is functions
 is_checks(Config) when is_list(Config) ->
-    ?line ensure_lib_loaded(Config, 1),
-    ?line ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
+    ensure_lib_loaded(Config, 1),
+    ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
 			self(), hd(erlang:ports()), [], [1,9,9,8],
 			{hejsan, "hejsan", [$h,"ejs",<<"an">>]}, 12),
-    ?line ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
+    ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
 			self(), hd(erlang:ports()), [], [1,9,9,8],
 			{hejsan, "hejsan", [$h,"ejs",<<"an">>]}, -12),
-    ?line ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
+    ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
 			self(), hd(erlang:ports()), [], [1,9,9,8],
 			{hejsan, "hejsan", [$h,"ejs",<<"an">>]}, 18446744073709551617),
-    ?line ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
+    ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
 			self(), hd(erlang:ports()), [], [1,9,9,8],
 			{hejsan, "hejsan", [$h,"ejs",<<"an">>]}, -18446744073709551617),
-    ?line ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
+    ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
 			self(), hd(erlang:ports()), [], [1,9,9,8],
 			{hejsan, "hejsan", [$h,"ejs",<<"an">>]}, 99.146),
-    ?line ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
+    ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
 			self(), hd(erlang:ports()), [], [1,9,9,8],
 			{hejsan, "hejsan", [$h,"ejs",<<"an">>]}, -99.146),
-    ?line ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
+    ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
 			self(), hd(erlang:ports()), [], [1,9,9,8],
 			{hejsan, "hejsan", [$h,"ejs",<<"an">>]}, 18446744073709551616.2e2),
-    ?line ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
+    ok = check_is(hejsan, <<19,98>>, make_ref(), ok, fun() -> ok end,
 			self(), hd(erlang:ports()), [], [1,9,9,8],
 			{hejsan, "hejsan", [$h,"ejs",<<"an">>]}, -18446744073709551616.2e2),
     try
-        ?line check_is_exception(),
-        ?line throw(expected_badarg)
+        check_is_exception(),
+        throw(expected_badarg)
     catch
         error:badarg ->
-            ?line ok
+            ok
     end.
 
-get_length(doc) -> ["Test all enif_get_length functions"];
+%% Test all enif_get_length functions
 get_length(Config) when is_list(Config) ->
-    ?line ensure_lib_loaded(Config, 1),
-    ?line ok = length_test(hejsan, "hejsan", [], [], not_a_list).
+    ensure_lib_loaded(Config, 1),
+    ok = length_test(hejsan, "hejsan", [], [], not_a_list, [1,2|3]).
 
 ensure_lib_loaded(Config) ->
     ensure_lib_loaded(Config, 1).
 ensure_lib_loaded(Config, Ver) ->
-    ?line case lib_version() of
-	      undefined ->
-		  ?line Path = ?config(data_dir, Config),    
-		  ?line Lib = "nif_SUITE." ++ integer_to_list(Ver),
-		  ?line ok = erlang:load_nif(filename:join(Path,Lib), []);
-	      Ver when is_integer(Ver) ->
-		  ok
-	  end.
+    Path = ?config(data_dir, Config),
+    case lib_version() of
+        undefined ->
+            Lib = "nif_SUITE." ++ integer_to_list(Ver),
+            ok = erlang:load_nif(filename:join(Path,Lib), []);
+        Ver when is_integer(Ver) ->
+            ok
+    end,
+    erl_ddll:try_load(Path, echo_drv, []),
+    ok.
 
 make_atom(Config) when is_list(Config) ->
-    ?line ensure_lib_loaded(Config, 1),
+    ensure_lib_loaded(Config, 1),
     An0Atom = an0atom,
     An0Atom0 = 'an\000atom\000',
-    ?line Atoms = make_atoms(),
-    ?line 7 = size(Atoms),
-    ?line Atoms = {An0Atom,An0Atom,An0Atom,An0Atom0,An0Atom,An0Atom,An0Atom0}.
+    Atoms = make_atoms(),
+    7 = size(Atoms),
+    Atoms = {An0Atom,An0Atom,An0Atom,An0Atom0,An0Atom,An0Atom,An0Atom0}.
 
 make_string(Config) when is_list(Config) ->
-    ?line ensure_lib_loaded(Config, 1),
-    ?line Strings = make_strings(),
-    ?line 5 = size(Strings),
+    ensure_lib_loaded(Config, 1),
+    Strings = make_strings(),
+    5 = size(Strings),
     A0String = "a0string",
     A0String0 = [$a,0,$s,$t,$r,$i,$n,$g,0],
     AStringWithAccents = [$E,$r,$l,$a,$n,$g,$ ,16#e4,$r,$ ,$e,$t,$t,$ ,$g,$e,$n,$e,$r,$e,$l,$l,$t,$ ,$p,$r,$o,$g,$r,$a,$m,$s,$p,$r,16#e5,$k],
-    ?line Strings = {A0String,A0String,A0String,A0String0, AStringWithAccents}.
+    Strings = {A0String,A0String,A0String,A0String0, AStringWithAccents}.
 
 reverse_list_test(Config) ->
-    ?line ensure_lib_loaded(Config, 1),
+    ensure_lib_loaded(Config, 1),
     List = lists:seq(1,100),
     RevList = lists:reverse(List),
-    ?line RevList = reverse_list(List),
-    ?line badarg = reverse_list(foo).
+    RevList = reverse_list(List),
+    badarg = reverse_list(foo).
 
-otp_9668(doc) -> ["Memory leak of tmp-buffer when inspecting iolist or unaligned binary in unbound environment"];
+%% Memory leak of tmp-buffer when inspecting iolist or unaligned binary in unbound environment
 otp_9668(Config) ->
     ensure_lib_loaded(Config, 1),
     TmpMem = tmpmem(),
@@ -1447,13 +1419,12 @@ otp_9668(Config) ->
     <<_:5/bitstring,UnalignedBin:10/binary,_/bitstring>> = <<"Abuse me as unaligned">>,
     otp_9668_nif(UnalignedBin),
 
-    ?line verify_tmpmem(TmpMem),
+    verify_tmpmem(TmpMem),
     ok.
 
-otp_9828(doc) -> ["Copy of writable binary"];
+%% Copy of writable binary
 otp_9828(Config) ->
     ensure_lib_loaded(Config, 1),
-
     otp_9828_loop(<<"I'm alive!">>, 1000).
 
 otp_9828_loop(Bin, 0) ->
@@ -1472,68 +1443,68 @@ consume_timeslice(Config) when is_list(Config) ->
     Done = make_ref(),
     DummyMFA = {?MODULE,dummy_call,1},
     P = spawn(fun () ->
-		      receive Go -> ok end,
-		      {reductions, R1} = process_info(self(), reductions),
-		      1 = consume_timeslice_nif(100, false),
-		      dummy_call(111),
-		      0 = consume_timeslice_nif(90, false),
-		      dummy_call(222),
-		      1 = consume_timeslice_nif(10, false),
-		      dummy_call(333),
-		      0 = consume_timeslice_nif(25, false),
-		      0 = consume_timeslice_nif(25, false),
-		      0 = consume_timeslice_nif(25, false),
-		      1 = consume_timeslice_nif(25, false),
-		      0 = consume_timeslice_nif(25, false),
-
-		      ok = case consume_timeslice_nif(1, true) of
-			       Cnt when Cnt > 70, Cnt < 80 -> ok;
-			       Other -> Other
-			   end,
-		      dummy_call(444),
-
-		      {reductions, R2} = process_info(self(), reductions),
-		      Me ! {RedDiff, R2 - R1},
-		      exit(Done)
-	end),
+                      receive Go -> ok end,
+                      {reductions, R1} = process_info(self(), reductions),
+                      1 = consume_timeslice_nif(100, false),
+                      dummy_call(111),
+                      0 = consume_timeslice_nif(90, false),
+                      dummy_call(222),
+                      1 = consume_timeslice_nif(10, false),
+                      dummy_call(333),
+                      0 = consume_timeslice_nif(25, false),
+                      0 = consume_timeslice_nif(25, false),
+                      0 = consume_timeslice_nif(25, false),
+                      1 = consume_timeslice_nif(25, false),
+                      0 = consume_timeslice_nif(25, false),
+
+                      ok = case consume_timeslice_nif(1, true) of
+                               Cnt when Cnt > 70, Cnt < 80 -> ok;
+                               Other -> Other
+                           end,
+                      dummy_call(444),
+
+                      {reductions, R2} = process_info(self(), reductions),
+                      Me ! {RedDiff, R2 - R1},
+                      exit(Done)
+              end),
     erlang:yield(),
 
     erlang:trace_pattern(DummyMFA, [], [local]),
-    ?line 1 = erlang:trace(P, true, [call, running, procs, {tracer, self()}]),
+    1 = erlang:trace(P, true, [call, running, procs, {tracer, self()}]),
 
     P ! Go,
 
     %% receive Go -> ok end,
-    ?line {trace, P, in, _} = next_tmsg(P),
+    {trace, P, in, _} = next_tmsg(P),
     
     %% consume_timeslice_nif(100),
     %% dummy_call(111)
-    ?line {trace, P, out, _} = next_tmsg(P),
-    ?line {trace, P, in, _} = next_tmsg(P),
-    ?line {trace, P, call, {?MODULE,dummy_call,[111]}} = next_tmsg(P),
+    {trace, P, out, _} = next_tmsg(P),
+    {trace, P, in, _} = next_tmsg(P),
+    {trace, P, call, {?MODULE,dummy_call,[111]}} = next_tmsg(P),
 
     %% consume_timeslice_nif(90),
     %% dummy_call(222)
-    ?line {trace, P, call, {?MODULE,dummy_call,[222]}} = next_tmsg(P),
+    {trace, P, call, {?MODULE,dummy_call,[222]}} = next_tmsg(P),
 
     %% consume_timeslice_nif(10),
     %% dummy_call(333)
-    ?line {trace, P, out, _} = next_tmsg(P),
-    ?line {trace, P, in, _} = next_tmsg(P),
-    ?line {trace, P, call, {?MODULE,dummy_call,[333]}} = next_tmsg(P),
+    {trace, P, out, _} = next_tmsg(P),
+    {trace, P, in, _} = next_tmsg(P),
+    {trace, P, call, {?MODULE,dummy_call,[333]}} = next_tmsg(P),
 
     %% 25,25,25,25, 25
-    ?line {trace, P, out, {?MODULE,consume_timeslice_nif,2}} = next_tmsg(P),
-    ?line {trace, P, in, {?MODULE,consume_timeslice_nif,2}} = next_tmsg(P),
+    {trace, P, out, {?MODULE,consume_timeslice_nif,2}} = next_tmsg(P),
+    {trace, P, in, {?MODULE,consume_timeslice_nif,2}} = next_tmsg(P),
 
     %% consume_timeslice(1,true)
     %% dummy_call(444)
-    ?line {trace, P, out, DummyMFA} = next_tmsg(P),
-    ?line {trace, P, in, DummyMFA} = next_tmsg(P),
-    ?line {trace, P, call, {?MODULE,dummy_call,[444]}} = next_tmsg(P),
+    {trace, P, out, DummyMFA} = next_tmsg(P),
+    {trace, P, in, DummyMFA} = next_tmsg(P),
+    {trace, P, call, {?MODULE,dummy_call,[444]}} = next_tmsg(P),
 
     %% exit(Done)
-    ?line {trace, P, exit, Done} = next_tmsg(P),
+    {trace, P, exit, Done} = next_tmsg(P),
 
     ExpReds = (100 + 90 + 10 + 25*5 + 75) * CONTEXT_REDS div 100,
     receive
@@ -1541,7 +1512,7 @@ consume_timeslice(Config) when is_list(Config) ->
 	    io:format("Reductions = ~p~n", [Reductions]),
 	    ok;
 	{RedDiff, Reductions} ->
-	    ?t:fail({unexpected_reduction_count, Reductions})
+	    ct:fail({unexpected_reduction_count, Reductions})
     end,
     
     none = next_msg(P),
@@ -1598,38 +1569,38 @@ dirty_nif_send(Config) when is_list(Config) ->
 
 dirty_nif_exception(Config) when is_list(Config) ->
     try erlang:system_info(dirty_cpu_schedulers) of
-	N when is_integer(N) ->
-	    ensure_lib_loaded(Config),
-	    try
-		%% this checks that the expected exception occurs when the
-		%% dirty NIF returns the result of enif_make_badarg
-		%% directly
-	        call_dirty_nif_exception(1),
-	        ?t:fail(expected_badarg)
-	    catch
-	        error:badarg ->
-		    [{?MODULE,call_dirty_nif_exception,[1],_}|_] =
-			erlang:get_stacktrace(),
-		    ok
-	    end,
-	    try
-		%% this checks that the expected exception occurs when the
-		%% dirty NIF calls enif_make_badarg at some point but then
-		%% returns a value that isn't an exception
-	        call_dirty_nif_exception(0),
-	        ?t:fail(expected_badarg)
-	    catch
-	        error:badarg ->
-		    [{?MODULE,call_dirty_nif_exception,[0],_}|_] =
-			erlang:get_stacktrace(),
-		    ok
-	    end,
-	    %% this checks that a dirty NIF can raise various terms as
-	    %% exceptions
-	    ok = nif_raise_exceptions(call_dirty_nif_exception)
+        N when is_integer(N) ->
+            ensure_lib_loaded(Config),
+            try
+                %% this checks that the expected exception occurs when the
+                %% dirty NIF returns the result of enif_make_badarg
+                %% directly
+                call_dirty_nif_exception(1),
+                ct:fail(expected_badarg)
+            catch
+                error:badarg ->
+                    [{?MODULE,call_dirty_nif_exception,[1],_}|_] =
+                    erlang:get_stacktrace(),
+                    ok
+            end,
+            try
+                %% this checks that the expected exception occurs when the
+                %% dirty NIF calls enif_make_badarg at some point but then
+                %% returns a value that isn't an exception
+                call_dirty_nif_exception(0),
+                ct:fail(expected_badarg)
+            catch
+                error:badarg ->
+                    [{?MODULE,call_dirty_nif_exception,[0],_}|_] =
+                    erlang:get_stacktrace(),
+                    ok
+            end,
+            %% this checks that a dirty NIF can raise various terms as
+            %% exceptions
+            ok = nif_raise_exceptions(call_dirty_nif_exception)
     catch
-	error:badarg ->
-	    {skipped,"No dirty scheduler support"}
+        error:badarg ->
+            {skipped,"No dirty scheduler support"}
     end.
 
 nif_exception(Config) when is_list(Config) ->
@@ -1639,7 +1610,7 @@ nif_exception(Config) when is_list(Config) ->
 	%% calls enif_make_badarg at some point but then tries to return a
 	%% value that isn't an exception
 	call_nif_exception(0),
-	?t:fail(expected_badarg)
+	ct:fail(expected_badarg)
     catch
 	error:badarg ->
 	    ok
@@ -1652,21 +1623,21 @@ nif_nan_and_inf(Config) when is_list(Config) ->
     ensure_lib_loaded(Config),
     try
 	call_nif_nan_or_inf(nan),
-	?t:fail(expected_badarg)
+	ct:fail(expected_badarg)
     catch
 	error:badarg ->
 	    ok
     end,
     try
 	call_nif_nan_or_inf(inf),
-	?t:fail(expected_badarg)
+	ct:fail(expected_badarg)
     catch
 	error:badarg ->
 	    ok
     end,
     try
 	call_nif_nan_or_inf(tuple),
-	?t:fail(expected_badarg)
+	ct:fail(expected_badarg)
     catch
 	error:badarg ->
 	    ok
@@ -1676,14 +1647,14 @@ nif_atom_too_long(Config) when is_list(Config) ->
     ensure_lib_loaded(Config),
     try
 	call_nif_atom_too_long(all),
-	?t:fail(expected_badarg)
+	ct:fail(expected_badarg)
     catch
 	error:badarg ->
 	    ok
     end,
     try
 	call_nif_atom_too_long(len),
-	?t:fail(expected_badarg)
+	ct:fail(expected_badarg)
     catch
 	error:badarg ->
 	    ok
@@ -1691,19 +1662,19 @@ nif_atom_too_long(Config) when is_list(Config) ->
 
 next_msg(_Pid) ->
     receive
-	M -> M
+        M -> M
     after 100 ->
-	  none
+              none
     end.
 
 next_tmsg(Pid) ->    
     receive TMsg when is_tuple(TMsg),
-		      element(1, TMsg) == trace,
-		      element(2, TMsg) == Pid ->
-     	    TMsg
-     after 100 ->
-     	    none
-     end.
+                      element(1, TMsg) == trace,
+                      element(2, TMsg) == Pid ->
+                TMsg
+    after 100 ->
+              none
+    end.
 
 dummy_call(_) ->    
     ok.
@@ -1713,7 +1684,9 @@ tmpmem() ->
 	false -> undefined;
 	MemInfo ->
 	    MSBCS = lists:foldl(
-		      fun ({instance, _, L}, Acc) ->
+		      fun ({instance, 0, _}, Acc) ->
+			      Acc; % Ignore instance 0
+			  ({instance, _, L}, Acc) ->
 			      {value,{_,MBCS}} = lists:keysearch(mbcs, 1, L),
 			      {value,{_,SBCS}} = lists:keysearch(sbcs, 1, L),
 			      [MBCS,SBCS | Acc]
@@ -1741,9 +1714,7 @@ verify_tmpmem(MemInfo) ->
 		    ok
 	    end;
 	Other ->
-	    io:format("Expected: ~p", [MemInfo]),
-	    io:format("Actual:   ~p", [Other]),
-	    ?t:fail()
+            ct:fail("Expected: ~p\nActual:   ~p", [MemInfo, Other])
     end.
 
 call(Pid,Cmd) ->
@@ -1771,17 +1742,282 @@ check(Exp,Got,Line) ->
 
 nif_raise_exceptions(NifFunc) ->
     ExcTerms = [{error, test}, "a string", <<"a binary">>,
-		42, [1,2,3,4,5], [{p,1},{p,2},{p,3}]],
+                42, [1,2,3,4,5], [{p,1},{p,2},{p,3}]],
     lists:foldl(fun(Term, ok) ->
-			try
-			    erlang:apply(?MODULE,NifFunc,[Term]),
-			    ?t:fail({expected,Term})
-			catch
-			    error:Term ->
-				[{?MODULE,NifFunc,[Term],_}|_] = erlang:get_stacktrace(),
-				ok
-			end
-		end, ok, ExcTerms).
+                        try
+                            erlang:apply(?MODULE,NifFunc,[Term]),
+                            ct:fail({expected,Term})
+                        catch
+                            error:Term ->
+                                [{?MODULE,NifFunc,[Term],_}|_] = erlang:get_stacktrace(),
+                                ok
+                        end
+                end, ok, ExcTerms).
+
+-define(ERL_NIF_TIME_ERROR, -9223372036854775808).
+-define(TIME_UNITS, [seconds, milli_seconds, micro_seconds, nano_seconds]).
+
+nif_monotonic_time(Config) ->
+    ?ERL_NIF_TIME_ERROR = monotonic_time(invalid_time_unit),
+    mtime_loop(1000000).
+
+mtime_loop(0) ->
+    ok;
+mtime_loop(N) ->
+    chk_mtime(?TIME_UNITS),
+    mtime_loop(N-1).
+
+chk_mtime([]) ->
+    ok;
+chk_mtime([TU|TUs]) ->
+    A = erlang:monotonic_time(TU),
+    B = monotonic_time(TU),
+    C = erlang:monotonic_time(TU),
+    try
+	true = A =< B,
+	true = B =< C
+    catch
+	_ : _ ->
+	    ct:fail({monotonic_time_missmatch, TU, A, B, C})
+    end,
+    chk_mtime(TUs).
+
+nif_time_offset(Config) ->
+    ?ERL_NIF_TIME_ERROR = time_offset(invalid_time_unit),
+    toffs_loop(1000000).
+
+toffs_loop(0) ->
+    ok;
+toffs_loop(N) ->
+    chk_toffs(?TIME_UNITS),
+    toffs_loop(N-1).
+
+chk_toffs([]) ->
+    ok;
+chk_toffs([TU|TUs]) ->
+    TO = erlang:time_offset(TU),
+    NifTO = time_offset(TU),
+    case TO =:= NifTO of
+        true ->
+            ok;
+        false ->
+            case erlang:system_info(time_warp_mode) of
+                no_time_warp ->
+                    ct:fail({time_offset_mismatch, TU, TO, NifTO});
+                _ ->
+                    %% Most frequent time offset change
+                    %% is currently only every 15:th
+                    %% second so this should currently
+                    %% work...
+                    NTO = erlang:time_offset(TU),
+                    case NifTO =:= NTO of
+                        true ->
+                            ok;
+                        false ->
+                            ct:fail({time_offset_mismatch, TU, TO, NifTO, NTO})
+                    end
+            end
+    end,
+    chk_toffs(TUs).
+
+nif_convert_time_unit(Config) ->
+    ?ERL_NIF_TIME_ERROR = convert_time_unit(0, seconds, invalid_time_unit),
+    ?ERL_NIF_TIME_ERROR = convert_time_unit(0, invalid_time_unit, seconds),
+    ?ERL_NIF_TIME_ERROR = convert_time_unit(0, invalid_time_unit, invalid_time_unit),
+    lists:foreach(fun (Offset) ->
+                          lists:foreach(fun (Diff) ->
+                                                chk_ctu(Diff+(Offset*1000*1000*1000))
+                                        end,
+                                        [999999999999,
+                                         99999999999,
+                                         9999999999,
+                                         999999999,
+                                         99999999,
+                                         9999999,
+                                         999999,
+                                         99999,
+                                         999,
+                                         99,
+                                         9,
+                                         1,
+                                         11,
+                                         101,
+                                         1001,
+                                         10001,
+                                         100001,
+                                         1000001,
+                                         10000001,
+                                         100000001,
+                                         1000000001,
+                                         100000000001,
+                                         1000000000001,
+                                         5,
+                                         50,
+                                         500,
+                                         5000,
+                                         50000,
+                                         500000,
+                                         5000000,
+                                         50000000,
+                                         500000000,
+                                         5000000000,
+                                         50000000000,
+                                         500000000000])
+                  end,
+                  [-4711, -1000, -475, -5, -4, -3, -2, -1, 0,
+                   1, 2, 3, 4, 5, 475, 1000, 4711]),
+    ctu_loop(1000000).
+
+ctu_loop(0) ->
+    ok;
+ctu_loop(N) ->
+    chk_ctu(erlang:monotonic_time(nano_seconds)),
+    ctu_loop(N-1).
+
+chk_ctu(Time) ->
+    chk_ctu(Time, ?TIME_UNITS).
+
+chk_ctu(_Time, []) ->
+    ok;
+chk_ctu(Time, [FromTU|FromTUs]) ->
+    chk_ctu(Time, FromTU, ?TIME_UNITS),
+    chk_ctu(Time, FromTUs).
+
+chk_ctu(_Time, _FromTU, []) ->
+    ok;
+chk_ctu(Time, FromTU, [ToTU|ToTUs]) ->
+    T = erlang:convert_time_unit(Time, nano_seconds, FromTU),
+    TE = erlang:convert_time_unit(T, FromTU, ToTU),
+    TN = convert_time_unit(T, FromTU, ToTU),
+    case TE =:= TN of
+	false ->
+	    ct:fail({conversion_mismatch, FromTU, T, ToTU, TE, TN});
+	true ->
+	    chk_ctu(Time, FromTU, ToTUs)
+    end.
+
+nif_now_time(Config) ->
+    ensure_lib_loaded(Config),
+
+    N1 = now(),
+    NifN1 = now_time(),
+    NifN2 = now_time(),
+    N2 = now(),
+    true = N1 < NifN1,
+    true = NifN1 < NifN2,
+    true = NifN2 < N2.
+
+nif_cpu_time(Config) ->
+    ensure_lib_loaded(Config),
+
+    try cpu_time() of
+        {_, _, _} ->
+            ok
+    catch error:badarg ->
+            {comment, "cpu_time not supported"}
+    end.
+
+nif_unique_integer(Config) ->
+    ensure_lib_loaded(Config),
+
+    UM1 = erlang:unique_integer([monotonic]),
+    UM2 = unique_integer_nif([monotonic]),
+    UM3 = erlang:unique_integer([monotonic]),
+
+    true = UM1 < UM2,
+    true = UM2 < UM3,
+
+    UMP1 = erlang:unique_integer([monotonic, positive]),
+    UMP2 = unique_integer_nif([monotonic, positive]),
+    UMP3 = erlang:unique_integer([monotonic, positive]),
+
+    true = 0 =< UMP1,
+    true = UMP1 < UMP2,
+    true = UMP2 < UMP3,
+
+    UP1 = erlang:unique_integer([positive]),
+    UP2 = unique_integer_nif([positive]),
+    UP3 = erlang:unique_integer([positive]),
+
+    true = 0 =< UP1,
+    true = 0 =< UP2,
+    true = 0 =< UP3,
+
+    true = is_integer(unique_integer_nif([])),
+    true = is_integer(unique_integer_nif([])),
+    true = is_integer(unique_integer_nif([])).
+
+nif_is_process_alive(Config) ->
+    ensure_lib_loaded(Config),
+
+    {Pid,_} = spawn_monitor(fun() -> receive ok -> nok end end),
+    true = is_process_alive_nif(Pid),
+    exit(Pid, die),
+    receive _ -> ok end, %% Clear monitor
+    false = is_process_alive_nif(Pid).
+
+nif_is_port_alive(Config) ->
+    ensure_lib_loaded(Config),
+
+    Port = open_port({spawn,echo_drv},[eof]),
+    true = is_port_alive_nif(Port),
+    port_close(Port),
+    false = is_port_alive_nif(Port).
+
+nif_term_to_binary(Config) ->
+    ensure_lib_loaded(Config),
+    T = {#{ok => nok}, <<0:8096>>, lists:seq(1,100)},
+    Bin = term_to_binary(T),
+    ct:log("~p",[Bin]),
+    Bin = term_to_binary_nif(T, undefined),
+    true = term_to_binary_nif(T, self()),
+    receive Bin -> ok end.
+
+-define(ERL_NIF_BIN2TERM_SAFE, 16#20000000).
+
+nif_binary_to_term(Config) ->
+    ensure_lib_loaded(Config),
+    T = {#{ok => nok}, <<0:8096>>, lists:seq(1,100)},
+    Bin = term_to_binary(T),
+    Len = byte_size(Bin),
+    {Len,T} = binary_to_term_nif(Bin, undefined, 0),
+    Len = binary_to_term_nif(Bin, self(), 0),
+    T = receive M -> M after 1000 -> timeout end,
+
+    {Len, T} = binary_to_term_nif(Bin, undefined, ?ERL_NIF_BIN2TERM_SAFE),
+    false = binary_to_term_nif(<<131,100,0,14,"undefined_atom">>,
+			   undefined, ?ERL_NIF_BIN2TERM_SAFE),
+    false = binary_to_term_nif(Bin, undefined, 1),
+    ok.
+
+nif_port_command(Config) ->
+    ensure_lib_loaded(Config),
+
+    Port = open_port({spawn,echo_drv},[eof]),
+    true = port_command_nif(Port, "hello\n"),
+    receive {Port,{data,"hello\n"}} -> ok
+    after 1000 -> ct:fail(timeout) end,
+
+    RefcBin = lists:flatten([lists:duplicate(100, "hello"),"\n"]),
+    true = port_command_nif(Port, iolist_to_binary(RefcBin)),
+    receive {Port,{data,RefcBin}} -> ok
+    after 1000 -> ct:fail(timeout) end,
+
+    %% Test that invalid arguments correctly returns
+    %% badarg and that the port survives.
+    {'EXIT', {badarg, _}} = (catch port_command_nif(Port, [ok])),
+
+    IoList = [lists:duplicate(100,<<"hello">>),"\n"],
+    true = port_command_nif(Port, [IoList]),
+    FlatIoList = binary_to_list(iolist_to_binary(IoList)),
+    receive {Port,{data,FlatIoList}} -> ok
+    after 1000 -> ct:fail(timeout) end,
+
+    port_close(Port),
+
+    {'EXIT', {badarg, _}} = (catch port_command_nif(Port, "hello\n")),
+
+    ok.
 
 %% The NIFs:
 lib_version() -> undefined.
@@ -1810,7 +2046,7 @@ last_resource_dtor_call() -> ?nif_stub.
 make_new_resource(_,_) -> ?nif_stub.
 check_is(_,_,_,_,_,_,_,_,_,_,_) -> ?nif_stub.
 check_is_exception() -> ?nif_stub.
-length_test(_,_,_,_,_) -> ?nif_stub.
+length_test(_,_,_,_,_,_) -> ?nif_stub.
 make_atoms() -> ?nif_stub.
 make_strings() -> ?nif_stub.
 make_new_resource_binary(_) -> ?nif_stub.
@@ -1840,6 +2076,12 @@ call_dirty_nif_zero_args() -> ?nif_stub.
 call_nif_exception(_) -> ?nif_stub.
 call_nif_nan_or_inf(_) -> ?nif_stub.
 call_nif_atom_too_long(_) -> ?nif_stub.
+unique_integer_nif(_) -> ?nif_stub.
+is_process_alive_nif(_) -> ?nif_stub.
+is_port_alive_nif(_) -> ?nif_stub.
+term_to_binary_nif(_, _) -> ?nif_stub.
+binary_to_term_nif(_, _, _) -> ?nif_stub.
+port_command_nif(_, _) -> ?nif_stub.
 
 %% maps
 is_map_nif(_) -> ?nif_stub.
@@ -1852,6 +2094,12 @@ make_map_remove_nif(_,_) -> ?nif_stub.
 maps_from_list_nif(_) -> ?nif_stub.
 sorted_list_from_maps_nif(_) -> ?nif_stub.
 
+%% Time
+monotonic_time(_) -> ?nif_stub.
+time_offset(_) -> ?nif_stub.
+convert_time_unit(_,_,_) -> ?nif_stub.
+now_time() -> ?nif_stub.
+cpu_time() -> ?nif_stub.
 
 nif_stub_error(Line) ->
     exit({nif_not_loaded,module,?MODULE,line,Line}).
diff --git a/erts/emulator/test/nif_SUITE_data/Makefile.src b/erts/emulator/test/nif_SUITE_data/Makefile.src
index ab4ff77add..fbb8978771 100644
--- a/erts/emulator/test/nif_SUITE_data/Makefile.src
+++ b/erts/emulator/test/nif_SUITE_data/Makefile.src
@@ -4,8 +4,7 @@ NIF_LIBS = nif_SUITE.1@dll@ \
            nif_mod.2@dll@ \
            nif_mod.3@dll@
 
-all: $(NIF_LIBS) basic@dll@ rwlock@dll@ tsd@dll@
-
+all: $(NIF_LIBS) basic@dll@ rwlock@dll@ tsd@dll@ echo_drv@dll@
 
 @SHLIB_RULES@
 
diff --git a/erts/emulator/test/nif_SUITE_data/echo_drv.c b/erts/emulator/test/nif_SUITE_data/echo_drv.c
new file mode 100644
index 0000000000..2b3510c641
--- /dev/null
+++ b/erts/emulator/test/nif_SUITE_data/echo_drv.c
@@ -0,0 +1,62 @@
+#include <stdio.h>
+#include "erl_driver.h"
+
+static ErlDrvPort erlang_port;
+static ErlDrvData echo_start(ErlDrvPort, char *);
+static void from_erlang(ErlDrvData, char*, ErlDrvSizeT);
+static ErlDrvSSizeT echo_call(ErlDrvData drv_data, unsigned int command,
+			      char *buf, ErlDrvSizeT len,
+			      char **rbuf, ErlDrvSizeT rlen, unsigned *ret_flags);
+static ErlDrvEntry echo_driver_entry = { 
+    NULL,			/* Init */
+    echo_start,
+    NULL,			/* Stop */
+    from_erlang,
+    NULL,			/* Ready input */
+    NULL,			/* Ready output */
+    "echo_drv",
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    echo_call,
+    NULL,
+    ERL_DRV_EXTENDED_MARKER,
+    ERL_DRV_EXTENDED_MAJOR_VERSION,
+    ERL_DRV_EXTENDED_MINOR_VERSION,
+    0,
+    NULL,
+    NULL,
+    NULL
+};
+
+DRIVER_INIT(echo_drv)
+{
+    return &echo_driver_entry;
+}
+
+static ErlDrvData
+echo_start(ErlDrvPort port, char *buf)
+{
+    return (ErlDrvData) port;
+}
+
+static void
+from_erlang(ErlDrvData data, char *buf, ErlDrvSizeT count)
+{
+    driver_output((ErlDrvPort) data, buf, count);
+}
+
+static ErlDrvSSizeT
+echo_call(ErlDrvData drv_data, unsigned int command,
+	  char *buf, ErlDrvSizeT len, char **rbuf, ErlDrvSizeT rlen,
+	  unsigned *ret_flags)
+{
+    *rbuf = buf;
+    *ret_flags |= DRIVER_CALL_KEEP_BUFFER;
+    return len;
+}
+
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
index 98e1efe18f..b3c6cc5ba3 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -30,10 +30,15 @@ static int static_cntA; /* zero by default */
 static int static_cntB = NIF_SUITE_LIB_VER * 100;
 
 static ERL_NIF_TERM atom_false;
+static ERL_NIF_TERM atom_true;
 static ERL_NIF_TERM atom_self;
 static ERL_NIF_TERM atom_ok;
 static ERL_NIF_TERM atom_join;
 static ERL_NIF_TERM atom_binary_resource_type;
+static ERL_NIF_TERM atom_seconds;
+static ERL_NIF_TERM atom_milli_seconds;
+static ERL_NIF_TERM atom_micro_seconds;
+static ERL_NIF_TERM atom_nano_seconds;
 
 
 typedef struct
@@ -134,10 +139,15 @@ static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
 						    msgenv_dtor,
 						    ERL_NIF_RT_CREATE, NULL);
     atom_false = enif_make_atom(env,"false");
+    atom_true = enif_make_atom(env,"true");
     atom_self = enif_make_atom(env,"self");
     atom_ok = enif_make_atom(env,"ok");
     atom_join = enif_make_atom(env,"join");
     atom_binary_resource_type = enif_make_atom(env,"binary_resource_type");
+    atom_seconds = enif_make_atom(env,"seconds");
+    atom_milli_seconds = enif_make_atom(env,"milli_seconds");
+    atom_micro_seconds = enif_make_atom(env,"micro_seconds");
+    atom_nano_seconds = enif_make_atom(env,"nano_seconds");
 
     *priv_data = data;
     return 0;
@@ -906,6 +916,7 @@ static ERL_NIF_TERM check_is_exception(ErlNifEnv* env, int argc, const ERL_NIF_T
  * argv[2] empty list
  * argv[3] not an atom
  * argv[4] not a list
+ * argv[5] improper list
  */
 static ERL_NIF_TERM length_test(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
@@ -926,6 +937,9 @@ static ERL_NIF_TERM length_test(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg
     if (enif_get_list_length(env, argv[4], &len))
 	return enif_make_badarg(env);
 
+    if (enif_get_list_length(env, argv[5], &len))
+	return enif_make_badarg(env);
+
     return enif_make_atom(env, "ok");
 }
 
@@ -1885,6 +1899,204 @@ static ERL_NIF_TERM sorted_list_from_maps_nif(ErlNifEnv* env, int argc, const ER
     return enif_make_tuple2(env, list_f, list_b);
 }
 
+
+static ERL_NIF_TERM monotonic_time(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifTimeUnit time_unit;
+
+    if (argc != 1)
+	return atom_false;
+
+    if (enif_compare(argv[0], atom_seconds) == 0)
+	time_unit = ERL_NIF_SEC;
+    else if (enif_compare(argv[0], atom_milli_seconds) == 0)
+	time_unit = ERL_NIF_MSEC;
+    else if (enif_compare(argv[0], atom_micro_seconds) == 0)
+	time_unit = ERL_NIF_USEC;
+    else if (enif_compare(argv[0], atom_nano_seconds) == 0)
+	time_unit = ERL_NIF_NSEC;
+    else
+	time_unit = 4711; /* invalid time unit */
+
+    return enif_make_int64(env, enif_monotonic_time(time_unit));
+}
+
+static ERL_NIF_TERM time_offset(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifTimeUnit time_unit;
+
+    if (argc != 1)
+	return atom_false;
+
+    if (enif_compare(argv[0], atom_seconds) == 0)
+	time_unit = ERL_NIF_SEC;
+    else if (enif_compare(argv[0], atom_milli_seconds) == 0)
+	time_unit = ERL_NIF_MSEC;
+    else if (enif_compare(argv[0], atom_micro_seconds) == 0)
+	time_unit = ERL_NIF_USEC;
+    else if (enif_compare(argv[0], atom_nano_seconds) == 0)
+	time_unit = ERL_NIF_NSEC;
+    else
+	time_unit = 4711; /* invalid time unit */
+    return enif_make_int64(env, enif_time_offset(time_unit));
+}
+
+static ERL_NIF_TERM convert_time_unit(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifSInt64 i64;
+    ErlNifTime val;
+    ErlNifTimeUnit from, to;
+
+    if (argc != 3)
+	return atom_false;
+
+    if (!enif_get_int64(env, argv[0], &i64))
+	return enif_make_badarg(env);
+
+    val = (ErlNifTime) i64;
+
+    if (enif_compare(argv[1], atom_seconds) == 0)
+	from = ERL_NIF_SEC;
+    else if (enif_compare(argv[1], atom_milli_seconds) == 0)
+	from = ERL_NIF_MSEC;
+    else if (enif_compare(argv[1], atom_micro_seconds) == 0)
+	from = ERL_NIF_USEC;
+    else if (enif_compare(argv[1], atom_nano_seconds) == 0)
+	from = ERL_NIF_NSEC;
+    else
+	from = 4711; /* invalid time unit */
+
+    if (enif_compare(argv[2], atom_seconds) == 0)
+	to = ERL_NIF_SEC;
+    else if (enif_compare(argv[2], atom_milli_seconds) == 0)
+	to = ERL_NIF_MSEC;
+    else if (enif_compare(argv[2], atom_micro_seconds) == 0)
+	to = ERL_NIF_USEC;
+    else if (enif_compare(argv[2], atom_nano_seconds) == 0)
+	to = ERL_NIF_NSEC;
+    else
+	to = 4711; /* invalid time unit */
+
+    return enif_make_int64(env, enif_convert_time_unit(val, from, to));
+}
+
+static ERL_NIF_TERM now_time(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    return enif_now_time(env);
+}
+
+static ERL_NIF_TERM cpu_time(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    return enif_cpu_time(env);
+}
+
+static ERL_NIF_TERM unique_integer(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ERL_NIF_TERM atom_pos = enif_make_atom(env,"positive"),
+        atom_mon = enif_make_atom(env,"monotonic");
+    ERL_NIF_TERM opts = argv[0], opt;
+    ErlNifUniqueInteger properties = 0;
+
+    while (!enif_is_empty_list(env, opts)) {
+	if (!enif_get_list_cell(env, opts, &opt, &opts))
+            return enif_make_badarg(env);
+
+        if (enif_compare(opt, atom_pos) == 0)
+            properties |= ERL_NIF_UNIQUE_POSITIVE;
+        if (enif_compare(opt, atom_mon) == 0)
+            properties |= ERL_NIF_UNIQUE_MONOTONIC;
+    }
+
+    return enif_make_unique_integer(env, properties);
+}
+
+static ERL_NIF_TERM is_process_alive(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifPid pid;
+    if (!enif_get_local_pid(env, argv[0], &pid))
+        return enif_make_badarg(env);
+    if (enif_is_process_alive(env, &pid))
+        return atom_true;
+    return atom_false;
+}
+
+static ERL_NIF_TERM is_port_alive(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifPort port;
+    if (!enif_get_local_port(env, argv[0], &port))
+        return enif_make_badarg(env);
+    if (enif_is_port_alive(env, &port))
+        return atom_true;
+    return atom_false;
+}
+
+static ERL_NIF_TERM term_to_binary(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifBinary bin;
+    ErlNifPid pid;
+    ErlNifEnv *msg_env = env;
+    ERL_NIF_TERM term;
+
+    if (enif_get_local_pid(env, argv[1], &pid))
+        msg_env = enif_alloc_env();
+
+    if (!enif_term_to_binary(msg_env, argv[0], &bin))
+        return enif_make_badarg(env);
+
+    term = enif_make_binary(msg_env, &bin);
+
+    if (msg_env != env) {
+        enif_send(env, &pid, msg_env, term);
+        enif_free_env(msg_env);
+        return atom_true;
+    } else {
+        return term;
+    }
+}
+
+static ERL_NIF_TERM binary_to_term(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifBinary bin;
+    ERL_NIF_TERM term, ret_term;
+    ErlNifPid pid;
+    ErlNifEnv *msg_env = env;
+    unsigned int opts;
+    ErlNifUInt64 ret;
+
+    if (enif_get_local_pid(env, argv[1], &pid))
+        msg_env = enif_alloc_env();
+
+    if (!enif_inspect_binary(env, argv[0], &bin)
+	|| !enif_get_uint(env, argv[2], &opts))
+        return enif_make_badarg(env);
+
+    ret = enif_binary_to_term(msg_env, bin.data, bin.size, &term,
+			      (ErlNifBinaryToTerm)opts);
+    if (!ret)
+	return atom_false;
+
+    ret_term = enif_make_uint64(env, ret);
+    if (msg_env != env) {
+        enif_send(env, &pid, msg_env, term);
+        enif_free_env(msg_env);
+        return ret_term;
+    } else {
+        return enif_make_tuple2(env, ret_term, term);
+    }
+}
+
+static ERL_NIF_TERM port_command(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifPort port;
+
+    if (!enif_get_local_port(env, argv[0], &port))
+        return enif_make_badarg(env);
+
+    if (!enif_port_command(env, &port, NULL, argv[1]))
+        return enif_make_badarg(env);
+    return atom_true;
+}
+
 static ErlNifFunc nif_funcs[] =
 {
     {"lib_version", 0, lib_version},
@@ -1913,7 +2125,7 @@ static ErlNifFunc nif_funcs[] =
     {"make_new_resource", 2, make_new_resource},
     {"check_is", 11, check_is},
     {"check_is_exception", 0, check_is_exception},
-    {"length_test", 5, length_test},
+    {"length_test", 6, length_test},
     {"make_atoms", 0, make_atoms},
     {"make_strings", 0, make_strings},
     {"make_new_resource", 2, make_new_resource},
@@ -1954,8 +2166,18 @@ static ErlNifFunc nif_funcs[] =
     {"make_map_update_nif", 3, make_map_update_nif},
     {"make_map_remove_nif", 2, make_map_remove_nif},
     {"maps_from_list_nif", 1, maps_from_list_nif},
-    {"sorted_list_from_maps_nif", 1, sorted_list_from_maps_nif}
+    {"sorted_list_from_maps_nif", 1, sorted_list_from_maps_nif},
+    {"monotonic_time", 1, monotonic_time},
+    {"time_offset", 1, time_offset},
+    {"convert_time_unit", 3, convert_time_unit},
+    {"now_time", 0, now_time},
+    {"cpu_time", 0, cpu_time},
+    {"unique_integer_nif", 1, unique_integer},
+    {"is_process_alive_nif", 1, is_process_alive},
+    {"is_port_alive_nif", 1, is_port_alive},
+    {"term_to_binary_nif", 2, term_to_binary},
+    {"binary_to_term_nif", 3, binary_to_term},
+    {"port_command_nif", 2, port_command}
 };
 
 ERL_NIF_INIT(nif_SUITE,nif_funcs,load,reload,upgrade,unload)
-
diff --git a/erts/emulator/test/nif_SUITE_data/nif_mod.erl b/erts/emulator/test/nif_SUITE_data/nif_mod.erl
index e65d4577c7..b6de046388 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_mod.erl
+++ b/erts/emulator/test/nif_SUITE_data/nif_mod.erl
@@ -20,7 +20,7 @@
 
 -module(nif_mod).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([load_nif_lib/2, load_nif_lib/3, start/0, lib_version/0, call_history/0,
 	 get_priv_data_ptr/0, make_new_resource/2, get_resource/2]).
@@ -33,7 +33,7 @@ load_nif_lib(Config, Ver) ->
     load_nif_lib(Config, Ver, []).
 
 load_nif_lib(Config, Ver, LoadInfo) ->
-    ?line Path = ?config(data_dir, Config),    
+    Path = proplists:get_value(data_dir, Config),
     erlang:load_nif(filename:join(Path,libname(Ver)), LoadInfo).
 
 libname(no_init) -> libname(3);
diff --git a/erts/emulator/test/nif_SUITE_data/tester.erl b/erts/emulator/test/nif_SUITE_data/tester.erl
index b393e29b82..f955f99c9a 100644
--- a/erts/emulator/test/nif_SUITE_data/tester.erl
+++ b/erts/emulator/test/nif_SUITE_data/tester.erl
@@ -1,12 +1,11 @@
 -module(tester).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([load_nif_lib/2, run/0]).
 
-
 load_nif_lib(Config, LibName) ->
-    ?line Path = ?config(data_dir, Config),    
+    Path = proplists:get_value(data_dir, Config),
     erlang:load_nif(filename:join(Path,LibName), []).
 
 run() ->
diff --git a/erts/emulator/test/node_container_SUITE.erl b/erts/emulator/test/node_container_SUITE.erl
index fecaad5232..662e5423b9 100644
--- a/erts/emulator/test/node_container_SUITE.erl
+++ b/erts/emulator/test/node_container_SUITE.erl
@@ -28,37 +28,34 @@
 -module(node_container_SUITE).
 -author('[email protected]').
 
-%-define(line_trace, 1).
+-include_lib("common_test/include/ct.hrl").
 
--include_lib("test_server/include/test_server.hrl").
-
-%-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,
-	 node_container_refc_check/1]).
+-export([all/0, suite/0, init_per_suite/1, end_per_suite/1,
+         init_per_testcase/2, end_per_testcase/2,
+         node_container_refc_check/1]).
 
 -export([term_to_binary_to_term_eq/1,
-	 round_trip_eq/1,
-	 cmp/1,
-	 ref_eq/1,
-	 node_table_gc/1,
-	 dist_link_refc/1,
-	 dist_monitor_refc/1,
-	 node_controller_refc/1,
-	 ets_refc/1,
-	 match_spec_refc/1,
-	 timer_refc/1,
-	 otp_4715/1,
-	 pid_wrap/1,
-	 port_wrap/1,
-	 bad_nc/1,
-	 unique_pid/1,
-	 iter_max_procs/1]).
-
--define(DEFAULT_TIMEOUT, ?t:minutes(10)).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+         round_trip_eq/1,
+         cmp/1,
+         ref_eq/1,
+         node_table_gc/1,
+         dist_link_refc/1,
+         dist_monitor_refc/1,
+         node_controller_refc/1,
+         ets_refc/1,
+         match_spec_refc/1,
+         timer_refc/1,
+         otp_4715/1,
+         pid_wrap/1,
+         port_wrap/1,
+         bad_nc/1,
+         unique_pid/1,
+         iter_max_procs/1]).
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 12}}].
+
 
 all() -> 
     [term_to_binary_to_term_eq, round_trip_eq, cmp, ref_eq,
@@ -67,9 +64,6 @@ all() ->
      timer_refc, otp_4715, pid_wrap, port_wrap, bad_nc,
      unique_pid, iter_max_procs].
 
-groups() -> 
-    [].
-
 init_per_suite(Config) ->
     Config.
 
@@ -78,36 +72,26 @@ end_per_suite(_Config) ->
     erts_debug:set_internal_state(node_tab_delayed_delete, -1), %% restore original value
     available_internal_state(false).
 
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 available_internal_state(Bool) when Bool == true; Bool == false ->
     case {Bool,
-	  (catch erts_debug:get_internal_state(available_internal_state))} of
-	{true, true} ->
-	    true;
-	{false, true} ->
-	    erts_debug:set_internal_state(available_internal_state, false),
-	    true;
-	{true, _} ->
-	    erts_debug:set_internal_state(available_internal_state, true),
-	    false;
-	{false, _} ->
-	    false
+          (catch erts_debug:get_internal_state(available_internal_state))} of
+        {true, true} ->
+            true;
+        {false, true} ->
+            erts_debug:set_internal_state(available_internal_state, false),
+            true;
+        {true, _} ->
+            erts_debug:set_internal_state(available_internal_state, true),
+            false;
+        {false, _} ->
+            false
     end.
 
 init_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
     available_internal_state(true),
-    [{watchdog, Dog}|Config].
+    Config.
 
 end_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
     ok.
 
 %%%
@@ -119,111 +103,103 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %%
 %% Test case: term_to_binary_to_term_eq
 %%
-term_to_binary_to_term_eq(doc) ->
-    ["Tests that node container terms that are converted to external format "
-     "and back stay equal to themselves."];
-term_to_binary_to_term_eq(suite) -> [];
+%% Tests that node container terms that are converted to external format
+%% and back stay equal to themselves.
 term_to_binary_to_term_eq(Config) when is_list(Config) ->
-    ?line ThisNode = {node(), erlang:system_info(creation)},
+    ThisNode = {node(), erlang:system_info(creation)},
     % Get local node containers
-    ?line LPid = self(),
-    ?line LXPid = mk_pid(ThisNode, 32767, 8191),
-    ?line LPort = hd(erlang:ports()),
-    ?line LXPort = mk_port(ThisNode, 268435455),
-    ?line LLRef = make_ref(),
-    ?line LHLRef = mk_ref(ThisNode, [47, 11]),
-    ?line LSRef = mk_ref(ThisNode, [4711]),
+    LPid = self(),
+    LXPid = mk_pid(ThisNode, 32767, 8191),
+    LPort = hd(erlang:ports()),
+    LXPort = mk_port(ThisNode, 268435455),
+    LLRef = make_ref(),
+    LHLRef = mk_ref(ThisNode, [47, 11]),
+    LSRef = mk_ref(ThisNode, [4711]),
     % Test local nc:s
-    ?line LPid = binary_to_term(term_to_binary(LPid)),
-    ?line LXPid = binary_to_term(term_to_binary(LXPid)),
-    ?line LPort = binary_to_term(term_to_binary(LPort)),
-    ?line LXPort = binary_to_term(term_to_binary(LXPort)),
-    ?line LLRef = binary_to_term(term_to_binary(LLRef)),
-    ?line LHLRef = binary_to_term(term_to_binary(LHLRef)),
-    ?line LSRef = binary_to_term(term_to_binary(LSRef)),
+    LPid = binary_to_term(term_to_binary(LPid)),
+    LXPid = binary_to_term(term_to_binary(LXPid)),
+    LPort = binary_to_term(term_to_binary(LPort)),
+    LXPort = binary_to_term(term_to_binary(LXPort)),
+    LLRef = binary_to_term(term_to_binary(LLRef)),
+    LHLRef = binary_to_term(term_to_binary(LHLRef)),
+    LSRef = binary_to_term(term_to_binary(LSRef)),
     % Get remote node containers
-    ?line RNode = {get_nodename(), 3},
-    ?line RPid = mk_pid(RNode, 4711, 1),
-    ?line RXPid = mk_pid(RNode, 32767, 8191),
-    ?line RPort = mk_port(RNode, 4711),
-    ?line RXPort = mk_port(RNode, 268435455),
-    ?line RLRef = mk_ref(RNode, [4711, 4711, 4711]),
-    ?line RHLRef = mk_ref(RNode, [4711, 4711]),
-    ?line RSRef = mk_ref(RNode, [4711]),
+    RNode = {get_nodename(), 3},
+    RPid = mk_pid(RNode, 4711, 1),
+    RXPid = mk_pid(RNode, 32767, 8191),
+    RPort = mk_port(RNode, 4711),
+    RXPort = mk_port(RNode, 268435455),
+    RLRef = mk_ref(RNode, [4711, 4711, 4711]),
+    RHLRef = mk_ref(RNode, [4711, 4711]),
+    RSRef = mk_ref(RNode, [4711]),
     % Test remote nc:s
-    ?line RPid = binary_to_term(term_to_binary(RPid)),
-    ?line RXPid = binary_to_term(term_to_binary(RXPid)),
-    ?line RPort = binary_to_term(term_to_binary(RPort)),
-    ?line RXPort = binary_to_term(term_to_binary(RXPort)),
-    ?line RLRef = binary_to_term(term_to_binary(RLRef)),
-    ?line RHLRef = binary_to_term(term_to_binary(RHLRef)),
-    ?line RSRef = binary_to_term(term_to_binary(RSRef)),
-    ?line nc_refc_check(node()),
-    ?line ok.
+    RPid = binary_to_term(term_to_binary(RPid)),
+    RXPid = binary_to_term(term_to_binary(RXPid)),
+    RPort = binary_to_term(term_to_binary(RPort)),
+    RXPort = binary_to_term(term_to_binary(RXPort)),
+    RLRef = binary_to_term(term_to_binary(RLRef)),
+    RHLRef = binary_to_term(term_to_binary(RHLRef)),
+    RSRef = binary_to_term(term_to_binary(RSRef)),
+    nc_refc_check(node()),
+    ok.
 
 
 %%
 %% Test case: round_trip_eq
 %%
-round_trip_eq(doc) ->
-    ["Tests that node containers that are sent beteen nodes stay equal to "
-     "themselves."];
-round_trip_eq(suite) -> [];
+%% Tests that node containers that are sent beteen nodes stay equal to themselves.
 round_trip_eq(Config) when is_list(Config) ->
-    ?line ThisNode = {node(), erlang:system_info(creation)},
-    ?line NodeFirstName = get_nodefirstname(),
-    ?line ?line {ok, Node} = start_node(NodeFirstName),
-    ?line Self = self(),
-    ?line RPid = spawn_link(Node,
-			    fun () ->
-				    receive
-					{Self, Data} ->
-					    Self ! {self(), Data}
-				    end
-			    end),
-    ?line SentPid = self(),
-    ?line SentXPid = mk_pid(ThisNode, 17471, 8190),
-    ?line SentPort = hd(erlang:ports()),
-    ?line SentXPort = mk_port(ThisNode, 268435451),
-    ?line SentLRef = make_ref(),
-    ?line SentHLRef = mk_ref(ThisNode, [4711, 17]),
-    ?line SentSRef = mk_ref(ThisNode, [4711]),
-    ?line RPid ! {Self, {SentPid,
-			 SentXPid,
-			 SentPort,
-			 SentXPort,
-			 SentLRef,
-			 SentHLRef,
-			 SentSRef}},
+    ThisNode = {node(), erlang:system_info(creation)},
+    NodeFirstName = get_nodefirstname(),
+    {ok, Node} = start_node(NodeFirstName),
+    Self = self(),
+    RPid = spawn_link(Node,
+                      fun () ->
+                              receive
+                                  {Self, Data} ->
+                                      Self ! {self(), Data}
+                              end
+                      end),
+    SentPid = self(),
+    SentXPid = mk_pid(ThisNode, 17471, 8190),
+    SentPort = hd(erlang:ports()),
+    SentXPort = mk_port(ThisNode, 268435451),
+    SentLRef = make_ref(),
+    SentHLRef = mk_ref(ThisNode, [4711, 17]),
+    SentSRef = mk_ref(ThisNode, [4711]),
+    RPid ! {Self, {SentPid,
+                   SentXPid,
+                   SentPort,
+                   SentXPort,
+                   SentLRef,
+                   SentHLRef,
+                   SentSRef}},
     receive
-	{RPid, {RecPid,
-		RecXPid,
-		RecPort,
-		RecXPort,
-		RecLRef,
-		RecHLRef,
-		RecSRef}} ->
-	    ?line stop_node(Node),
-	    ?line SentPid = RecPid,
-	    ?line SentXPid = RecXPid,
-	    ?line SentPort = RecPort,
-	    ?line SentXPort = RecXPort,
-	    ?line SentLRef = RecLRef,
-	    ?line SentHLRef = RecHLRef,
-	    ?line SentSRef = RecSRef,
-	    ?line nc_refc_check(node()),
-	    ?line ok
+        {RPid, {RecPid,
+                RecXPid,
+                RecPort,
+                RecXPort,
+                RecLRef,
+                RecHLRef,
+                RecSRef}} ->
+            stop_node(Node),
+            SentPid = RecPid,
+            SentXPid = RecXPid,
+            SentPort = RecPort,
+            SentXPort = RecXPort,
+            SentLRef = RecLRef,
+            SentHLRef = RecHLRef,
+            SentSRef = RecSRef,
+            nc_refc_check(node()),
+            ok
     end.
-	    
+
 
 
 %%
 %% Test case: cmp
 %%
-cmp(doc) ->
-    ["Tests that Erlang term comparison works as it should on node "
-     "containers."];
-cmp(suite) -> [];
+%% Tests that Erlang term comparison works as it should on node containers.
 cmp(Config) when is_list(Config) ->
 
     %% Inter type comparison ---------------------------------------------------
@@ -234,103 +210,103 @@ cmp(Config) when is_list(Config) ->
 
     IRef = make_ref(),
     ERef = mk_ref({get_nodename(), 2}, [1,2,3]),
-    
+
     IPid = self(),
     EPid = mk_pid(RNode, 1, 2),
 
     IPort = hd(erlang:ports()),
     EPort = mk_port(RNode, 1),
-    
+
     %% Test pids ----------------------------------------------------
-    ?line true = 1 < IPid,
-    ?line true = 1.3 < IPid,
-    ?line true = (1 bsl 64) < IPid,
-    ?line true = an_atom < IPid,
-    ?line true = IRef < IPid,
-    ?line true = ERef < IPid,
-    ?line true = fun () -> a_fun end < IPid,
-    ?line true = IPort < IPid,
-    ?line true = EPort < IPid,
-    ?line true = IPid < {a, tuple},
-    ?line true = IPid < [],
-    ?line true = IPid < [a|cons],
-    ?line true = IPid < <<"a binary">>,
-
-    ?line true = 1 < EPid,
-    ?line true = 1.3 < EPid,
-    ?line true = (1 bsl 64) < EPid,
-    ?line true = an_atom < EPid,
-    ?line true = IRef < EPid,
-    ?line true = ERef < EPid,
-    ?line true = fun () -> a_fun end < EPid,
-    ?line true = IPort < EPid,
-    ?line true = EPort < EPid,
-    ?line true = EPid < {a, tuple},
-    ?line true = EPid < [],
-    ?line true = EPid < [a|cons],
-    ?line true = EPid < <<"a binary">>,
+    true = 1 < IPid,
+    true = 1.3 < IPid,
+    true = (1 bsl 64) < IPid,
+    true = an_atom < IPid,
+    true = IRef < IPid,
+    true = ERef < IPid,
+    true = fun () -> a_fun end < IPid,
+    true = IPort < IPid,
+    true = EPort < IPid,
+    true = IPid < {a, tuple},
+    true = IPid < [],
+    true = IPid < [a|cons],
+    true = IPid < <<"a binary">>,
+
+    true = 1 < EPid,
+    true = 1.3 < EPid,
+    true = (1 bsl 64) < EPid,
+    true = an_atom < EPid,
+    true = IRef < EPid,
+    true = ERef < EPid,
+    true = fun () -> a_fun end < EPid,
+    true = IPort < EPid,
+    true = EPort < EPid,
+    true = EPid < {a, tuple},
+    true = EPid < [],
+    true = EPid < [a|cons],
+    true = EPid < <<"a binary">>,
 
     %% Test ports --------------------------------------------------
-    ?line true = 1 < IPort,
-    ?line true = 1.3 < IPort,
-    ?line true = (1 bsl 64) < IPort,
-    ?line true = an_atom < IPort,
-    ?line true = IRef < IPort,
-    ?line true = ERef < IPort,
-    ?line true = fun () -> a_fun end < IPort,
-    ?line true = IPort < IPid,
-    ?line true = IPort < EPid,
-    ?line true = IPort < {a, tuple},
-    ?line true = IPort < [],
-    ?line true = IPort < [a|cons],
-    ?line true = IPort < <<"a binary">>,
-
-    ?line true = 1 < EPort,
-    ?line true = 1.3 < EPort,
-    ?line true = (1 bsl 64) < EPort,
-    ?line true = an_atom < EPort,
-    ?line true = IRef < EPort,
-    ?line true = ERef < EPort,
-    ?line true = fun () -> a_fun end < EPort,
-    ?line true = EPort < IPid,
-    ?line true = EPort < EPid,
-    ?line true = EPort < {a, tuple},
-    ?line true = EPort < [],
-    ?line true = EPort < [a|cons],
-    ?line true = EPort < <<"a binary">>,
+    true = 1 < IPort,
+    true = 1.3 < IPort,
+    true = (1 bsl 64) < IPort,
+    true = an_atom < IPort,
+    true = IRef < IPort,
+    true = ERef < IPort,
+    true = fun () -> a_fun end < IPort,
+    true = IPort < IPid,
+    true = IPort < EPid,
+    true = IPort < {a, tuple},
+    true = IPort < [],
+    true = IPort < [a|cons],
+    true = IPort < <<"a binary">>,
+
+    true = 1 < EPort,
+    true = 1.3 < EPort,
+    true = (1 bsl 64) < EPort,
+    true = an_atom < EPort,
+    true = IRef < EPort,
+    true = ERef < EPort,
+    true = fun () -> a_fun end < EPort,
+    true = EPort < IPid,
+    true = EPort < EPid,
+    true = EPort < {a, tuple},
+    true = EPort < [],
+    true = EPort < [a|cons],
+    true = EPort < <<"a binary">>,
 
     %% Test refs ----------------------------------------------------
-    ?line true = 1 < IRef,
-    ?line true = 1.3 < IRef,
-    ?line true = (1 bsl 64) < IRef,
-    ?line true = an_atom < IRef,
-    ?line true = IRef < fun () -> a_fun end,
-    ?line true = IRef < IPort,
-    ?line true = IRef < EPort,
-    ?line true = IRef < IPid,
-    ?line true = IRef < EPid,
-    ?line true = IRef < {a, tuple},
-    ?line true = IRef < [],
-    ?line true = IRef < [a|cons],
-    ?line true = IRef < <<"a binary">>,
-
-    ?line true = 1 < ERef,
-    ?line true = 1.3 < ERef,
-    ?line true = (1 bsl 64) < ERef,
-    ?line true = an_atom < ERef,
-    ?line true = ERef < fun () -> a_fun end,
-    ?line true = ERef < IPort,
-    ?line true = ERef < EPort,
-    ?line true = ERef < IPid,
-    ?line true = ERef < EPid,
-    ?line true = ERef < {a, tuple},
-    ?line true = ERef < [],
-    ?line true = ERef < [a|cons],
-    ?line true = ERef < <<"a binary">>,
+    true = 1 < IRef,
+    true = 1.3 < IRef,
+    true = (1 bsl 64) < IRef,
+    true = an_atom < IRef,
+    true = IRef < fun () -> a_fun end,
+    true = IRef < IPort,
+    true = IRef < EPort,
+    true = IRef < IPid,
+    true = IRef < EPid,
+    true = IRef < {a, tuple},
+    true = IRef < [],
+    true = IRef < [a|cons],
+    true = IRef < <<"a binary">>,
+
+    true = 1 < ERef,
+    true = 1.3 < ERef,
+    true = (1 bsl 64) < ERef,
+    true = an_atom < ERef,
+    true = ERef < fun () -> a_fun end,
+    true = ERef < IPort,
+    true = ERef < EPort,
+    true = ERef < IPid,
+    true = ERef < EPid,
+    true = ERef < {a, tuple},
+    true = ERef < [],
+    true = ERef < [a|cons],
+    true = ERef < <<"a binary">>,
 
 
     %% Intra type comparison ---------------------------------------------------
-	
+
 
     %% Test pids ----------------------------------------------------
     %%
@@ -338,13 +314,13 @@ cmp(Config) when is_list(Config) ->
     %%   serial, number, nodename, creation
     %%
 
-    ?line Pid = mk_pid({b@b, 2}, 4711, 1),
+    Pid = mk_pid({b@b, 2}, 4711, 1),
 
-    ?line true = mk_pid({a@b, 1}, 4710, 2) > Pid,
-    ?line true = mk_pid({a@b, 1}, 4712, 1) > Pid,
-    ?line true = mk_pid({c@b, 1}, 4711, 1) > Pid,
-    ?line true = mk_pid({b@b, 3}, 4711, 1) > Pid,
-    ?line true = mk_pid({b@b, 2}, 4711, 1) =:= Pid,
+    true = mk_pid({a@b, 1}, 4710, 2) > Pid,
+    true = mk_pid({a@b, 1}, 4712, 1) > Pid,
+    true = mk_pid({c@b, 1}, 4711, 1) > Pid,
+    true = mk_pid({b@b, 3}, 4711, 1) > Pid,
+    true = mk_pid({b@b, 2}, 4711, 1) =:= Pid,
 
     %% Test ports ---------------------------------------------------
     %%
@@ -356,12 +332,12 @@ cmp(Config) when is_list(Config) ->
     %%      Significance used to be: dist_slot, number,
     %%      creation.
 
-    ?line Port = mk_port({b@b, 2}, 4711),
+    Port = mk_port({b@b, 2}, 4711),
 
-    ?line true = mk_port({c@b, 1}, 4710) > Port,
-    ?line true = mk_port({b@b, 3}, 4710) > Port,
-    ?line true = mk_port({b@b, 2}, 4712) > Port,
-    ?line true = mk_port({b@b, 2}, 4711) =:= Port,
+    true = mk_port({c@b, 1}, 4710) > Port,
+    true = mk_port({b@b, 3}, 4710) > Port,
+    true = mk_port({b@b, 2}, 4712) > Port,
+    true = mk_port({b@b, 2}, 4711) =:= Port,
 
     %% Test refs ----------------------------------------------------
     %% Significance (most -> least):
@@ -373,99 +349,96 @@ cmp(Config) when is_list(Config) ->
     %%      creation.
     %%
 
-    ?line Ref = mk_ref({b@b, 2}, [4711, 4711, 4711]),
+    Ref = mk_ref({b@b, 2}, [4711, 4711, 4711]),
 
-    ?line true = mk_ref({c@b, 1}, [4710, 4710, 4710]) > Ref,
-    ?line true = mk_ref({b@b, 3}, [4710, 4710, 4710]) > Ref,
-    ?line true = mk_ref({b@b, 2}, [4710, 4710, 4712]) > Ref,
-    ?line true = mk_ref({b@b, 2}, [4710, 4712, 4711]) > Ref,
-    ?line true = mk_ref({b@b, 2}, [4712, 4711, 4711]) > Ref,
-    ?line true = mk_ref({b@b, 2}, [4711, 4711, 4711]) =:= Ref,
+    true = mk_ref({c@b, 1}, [4710, 4710, 4710]) > Ref,
+    true = mk_ref({b@b, 3}, [4710, 4710, 4710]) > Ref,
+    true = mk_ref({b@b, 2}, [4710, 4710, 4712]) > Ref,
+    true = mk_ref({b@b, 2}, [4710, 4712, 4711]) > Ref,
+    true = mk_ref({b@b, 2}, [4712, 4711, 4711]) > Ref,
+    true = mk_ref({b@b, 2}, [4711, 4711, 4711]) =:= Ref,
 
     ok.
 
 %%
 %% Test case: ref_eq
 %%
-ref_eq(doc) -> ["Test that one word refs \"works\"."];
-ref_eq(suite) -> [];
+%% Test that one word refs works
 ref_eq(Config) when is_list(Config) ->
-    ?line ThisNode = {node(), erlang:system_info(creation)},
-    ?line AnotherNode = {get_nodename(),2},
-    ?line LLongRef = mk_ref(ThisNode, [4711, 0, 0]),
-    ?line LHalfLongRef = mk_ref(ThisNode, [4711, 0]),
-    ?line LShortRef = mk_ref(ThisNode, [4711]),
-    ?line true = LLongRef =:= LShortRef,
-    ?line true = LLongRef =:= LHalfLongRef,
-    ?line true = LLongRef =:= LLongRef,
-    ?line true = LHalfLongRef =:= LShortRef,
-    ?line true = LHalfLongRef =:= LHalfLongRef,
-    ?line true = LShortRef =:= LShortRef,
-    ?line false = LShortRef == mk_ref(ThisNode, [4711, 0, 1]), % Not any more
-    ?line RLongRef = mk_ref(AnotherNode, [4711, 0, 0]),
-    ?line RHalfLongRef = mk_ref(AnotherNode, [4711, 0]),
-    ?line RShortRef = mk_ref(AnotherNode, [4711]),
-    ?line true = RLongRef =:= RShortRef,
-    ?line true = RLongRef =:= RHalfLongRef,
-    ?line true = RLongRef =:= RLongRef,
-    ?line true = RHalfLongRef =:= RShortRef,
-    ?line true = RHalfLongRef =:= RHalfLongRef,
-    ?line true = RShortRef =:= RShortRef,
-    ?line false = RShortRef == mk_ref(AnotherNode, [4711, 0, 1]), % Not any more
-    ?line nc_refc_check(node()),
-    ?line ok.
-    
+    ThisNode = {node(), erlang:system_info(creation)},
+    AnotherNode = {get_nodename(),2},
+    LLongRef = mk_ref(ThisNode, [4711, 0, 0]),
+    LHalfLongRef = mk_ref(ThisNode, [4711, 0]),
+    LShortRef = mk_ref(ThisNode, [4711]),
+    true = LLongRef =:= LShortRef,
+    true = LLongRef =:= LHalfLongRef,
+    true = LLongRef =:= LLongRef,
+    true = LHalfLongRef =:= LShortRef,
+    true = LHalfLongRef =:= LHalfLongRef,
+    true = LShortRef =:= LShortRef,
+    false = LShortRef == mk_ref(ThisNode, [4711, 0, 1]), % Not any more
+    RLongRef = mk_ref(AnotherNode, [4711, 0, 0]),
+    RHalfLongRef = mk_ref(AnotherNode, [4711, 0]),
+    RShortRef = mk_ref(AnotherNode, [4711]),
+    true = RLongRef =:= RShortRef,
+    true = RLongRef =:= RHalfLongRef,
+    true = RLongRef =:= RLongRef,
+    true = RHalfLongRef =:= RShortRef,
+    true = RHalfLongRef =:= RHalfLongRef,
+    true = RShortRef =:= RShortRef,
+    false = RShortRef == mk_ref(AnotherNode, [4711, 0, 1]), % Not any more
+    nc_refc_check(node()),
+    ok.
+
 %%
 %% Test case: node_table_gc
 %%
-node_table_gc(doc) ->
-    ["Tests that node tables are garbage collected."];
-node_table_gc(suite) -> [];
+%% Tests that node tables are garbage collected.
 node_table_gc(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
     erts_debug:set_internal_state(node_tab_delayed_delete, 0),
-    ?line PreKnown = nodes(known),
-    ?line ?t:format("PreKnown = ~p~n", [PreKnown]),
-    ?line make_node_garbage(0, 200000, 1000, []),
-    ?line PostKnown = nodes(known),
-    ?line PostAreas = erlang:system_info(allocated_areas),
-    ?line ?t:format("PostKnown = ~p~n", [PostKnown]),
-    ?line ?t:format("PostAreas = ~p~n", [PostAreas]),
-    ?line true = length(PostKnown) =< length(PreKnown),
-    ?line nc_refc_check(node()),
+    PreKnown = nodes(known),
+    io:format("PreKnown = ~p~n", [PreKnown]),
+    make_node_garbage(0, 200000, 1000, []),
+    PostKnown = nodes(known),
+    PostAreas = erlang:system_info(allocated_areas),
+    io:format("PostKnown = ~p~n", [PostKnown]),
+    io:format("PostAreas = ~p~n", [PostAreas]),
+    true = length(PostKnown) =< length(PreKnown),
+    nc_refc_check(node()),
     erts_debug:set_internal_state(node_tab_delayed_delete, -1), %% restore original value
-    ?line ok.
+    ok.
 
 make_node_garbage(N, L, I, Ps) when N < L ->
-    ?line Self = self(),
-    ?line P = spawn_link(fun () ->
-				 % Generate two node entries and one dist
-				 % entry per node name
-				 ?line PL1 = make_faked_pid_list(N,
-								 I div 2,
-								 1),
-				 ?line put(a, PL1),
-				 ?line PL2 = make_faked_pid_list(N,
-								 I div 2,
-								 2),
-				 ?line put(b, PL2),
-				 ?line Self ! {self(), length(nodes(known))}
-			 end),
-    ?line receive
-	      {P, KnownLength} ->
-		  ?line true = KnownLength >= I div 2
-	  end,
-    ?line make_node_garbage(N+(I div 2)*2, L, I, [P|Ps]);
+    Self = self(),
+    P = spawn_link(fun () ->
+                           % Generate two node entries and one dist
+                           % entry per node name
+                           PL1 = make_faked_pid_list(N,
+                                                     I div 2,
+                                                     1),
+                           put(a, PL1),
+                           PL2 = make_faked_pid_list(N,
+                                                     I div 2,
+                                                     2),
+                           put(b, PL2),
+                           Self ! {self(), length(nodes(known))}
+                   end),
+    receive
+        {P, KnownLength} ->
+            true = KnownLength >= I div 2
+    end,
+    make_node_garbage(N+(I div 2)*2, L, I, [P|Ps]);
 make_node_garbage(_, _, _, Ps) ->
     %% Cleanup garbage...
     ProcIsCleanedUp
-	= fun (Proc) ->
-		  undefined == erts_debug:get_internal_state({process_status,
-							      Proc})
-	  end,
+    = fun (Proc) ->
+              undefined == erts_debug:get_internal_state({process_status,
+                                                          Proc})
+      end,
     lists:foreach(fun (P) -> wait_until(fun () -> ProcIsCleanedUp(P) end) end,
-		  Ps),
-    ?line ok.
+                  Ps),
+    ok.
 
 
 make_faked_pid_list(Start, No, Creation) ->
@@ -475,292 +448,274 @@ make_faked_pid_list(_Start, 0, _Creation, Acc) ->
     Acc;
 make_faked_pid_list(Start, No, Creation, Acc) ->
     make_faked_pid_list(Start+1,
-			No-1,
-			Creation,
-			[mk_pid({"faked_node-"
-				 ++ integer_to_list(Start rem 50000)
-				 ++ "@"
-				 ++ atom_to_list(?MODULE),
-				 Creation},
-				4711,
-				3) | Acc]).
+                        No-1,
+                        Creation,
+                        [mk_pid({"faked_node-"
+                                 ++ integer_to_list(Start rem 50000)
+                                 ++ "@"
+                                 ++ atom_to_list(?MODULE),
+                                 Creation},
+                                4711,
+                                3) | Acc]).
 
 %%
 %% Test case: dist_link_refc
 %%
-dist_link_refc(doc) ->
-    ["Tests that external reference counts are incremented and decremented "
-     "as they should for distributed links"];
-dist_link_refc(suite) -> [];
+%% Tests that external reference counts are incremented and decremented
+%% as they should for distributed links
 dist_link_refc(Config) when is_list(Config) ->
-    ?line NodeFirstName = get_nodefirstname(),
-    ?line ?line {ok, Node} = start_node(NodeFirstName),
-    ?line RP = spawn_execer(Node),
-    ?line LP = spawn_link_execer(node()),
-    ?line true = sync_exec(RP, fun () -> link(LP) end),
-    ?line wait_until(fun () ->
-			     ?line {links, Links} = process_info(LP, links),
-			     ?line lists:member(RP, Links)
-		     end),
-    ?line NodeCre = sync_exec(RP, fun() -> erlang:system_info(creation) end),
-    ?line 1 = reference_type_count(
-		link,
-		refering_entity_id({process, LP},
-				   get_node_references({Node, NodeCre}))),
-    ?line exec(RP, fun() -> exit(normal) end),
-    ?line wait_until(fun () ->
-			     ?line {links, Links} = process_info(LP, links),
-			     ?line not lists:member(RP, Links)
-		     end),
-    ?line 0 = reference_type_count(
-		link,
-		refering_entity_id({process, LP},
-				   get_node_references({Node, NodeCre}))),
-    ?line exit(LP, normal),
-    ?line stop_node(Node),
-    ?line nc_refc_check(node()),
-    ?line ok.
+    NodeFirstName = get_nodefirstname(),
+    {ok, Node} = start_node(NodeFirstName),
+    RP = spawn_execer(Node),
+    LP = spawn_link_execer(node()),
+    true = sync_exec(RP, fun () -> link(LP) end),
+    wait_until(fun () ->
+                       {links, Links} = process_info(LP, links),
+                       lists:member(RP, Links)
+               end),
+    NodeCre = sync_exec(RP, fun() -> erlang:system_info(creation) end),
+    1 = reference_type_count(
+          link,
+          refering_entity_id({process, LP},
+                             get_node_references({Node, NodeCre}))),
+    exec(RP, fun() -> exit(normal) end),
+    wait_until(fun () ->
+                       {links, Links} = process_info(LP, links),
+                       not lists:member(RP, Links)
+               end),
+    0 = reference_type_count(
+          link,
+          refering_entity_id({process, LP},
+                             get_node_references({Node, NodeCre}))),
+    exit(LP, normal),
+    stop_node(Node),
+    nc_refc_check(node()),
+    ok.
 
 
 %%
 %% Test case: dist_monitor_refc
 %%
-dist_monitor_refc(doc) ->
-    ["Tests that external reference counts are incremented and decremented "
-     "as they should for distributed monitors"];
-dist_monitor_refc(suite) -> [];
+%% Tests that external reference counts are incremented and decremented
+%% as they should for distributed monitors
 dist_monitor_refc(Config) when is_list(Config) ->
-    ?line NodeFirstName = get_nodefirstname(),
-    ?line {ok, Node} = start_node(NodeFirstName),
-    ?line RP = spawn_execer(Node),
-    ?line LP = spawn_link_execer(node()),
-    ?line RMon = sync_exec(RP, fun () -> erlang:monitor(process, LP) end),
-    ?line true = is_reference(RMon),
-    ?line LMon = sync_exec(LP, fun () -> erlang:monitor(process, RP) end),
-    ?line true = is_reference(LMon),
-    ?line NodeCre = sync_exec(RP, fun() -> erlang:system_info(creation) end),
-    ?line wait_until(fun () ->
-			     ?line {monitored_by, MonBy}
-				 = process_info(LP, monitored_by),
-			     ?line {monitors, Mon}
-				 = process_info(LP, monitors),
-			     ?line (lists:member(RP, MonBy)
-				    and lists:member({process,RP}, Mon))
-		     end),
-    ?line 3 = reference_type_count(
-		monitor,
-		refering_entity_id({process, LP},
-				   get_node_references({Node, NodeCre}))),
-    ?line exec(RP, fun () -> exit(normal) end),
-    ?line wait_until(fun () ->
-			     ?line {monitored_by, MonBy}
-				 = process_info(LP, monitored_by),
-			     ?line {monitors, Mon}
-				 = process_info(LP, monitors),
-			     ?line ((not lists:member(RP, MonBy))
-				    and (not lists:member({process,RP}, Mon)))
-		     end),
-    ?line ok = sync_exec(LP,
-			 fun () ->
-				 receive
-				     {'DOWN', LMon, process, _, _} ->
-					 ok
-				 end
-			 end),
-    ?line 0 = reference_type_count(
-		link,
-		refering_entity_id({process, LP},
-				   get_node_references({Node, NodeCre}))),
-    ?line exit(LP, normal),
-    ?line stop_node(Node),
-    ?line nc_refc_check(node()),
-    ?line ok.
+    NodeFirstName = get_nodefirstname(),
+    {ok, Node} = start_node(NodeFirstName),
+    RP = spawn_execer(Node),
+    LP = spawn_link_execer(node()),
+    RMon = sync_exec(RP, fun () -> erlang:monitor(process, LP) end),
+    true = is_reference(RMon),
+    LMon = sync_exec(LP, fun () -> erlang:monitor(process, RP) end),
+    true = is_reference(LMon),
+    NodeCre = sync_exec(RP, fun() -> erlang:system_info(creation) end),
+    wait_until(fun () ->
+                       {monitored_by, MonBy}
+                       = process_info(LP, monitored_by),
+                       {monitors, Mon}
+                       = process_info(LP, monitors),
+                       (lists:member(RP, MonBy)
+                        and lists:member({process,RP}, Mon))
+               end),
+    3 = reference_type_count(
+          monitor,
+          refering_entity_id({process, LP},
+                             get_node_references({Node, NodeCre}))),
+    exec(RP, fun () -> exit(normal) end),
+    wait_until(fun () ->
+                       {monitored_by, MonBy}
+                       = process_info(LP, monitored_by),
+                       {monitors, Mon}
+                       = process_info(LP, monitors),
+                       ((not lists:member(RP, MonBy))
+                        and (not lists:member({process,RP}, Mon)))
+               end),
+    ok = sync_exec(LP,
+                   fun () ->
+                           receive
+                               {'DOWN', LMon, process, _, _} ->
+                                   ok
+                           end
+                   end),
+    0 = reference_type_count(
+          link,
+          refering_entity_id({process, LP},
+                             get_node_references({Node, NodeCre}))),
+    exit(LP, normal),
+    stop_node(Node),
+    nc_refc_check(node()),
+    ok.
 
 
 %%
 %% Test case: node_controller_refc
 %%
-node_controller_refc(doc) ->
-    ["Tests that external reference counts are incremented and decremented "
-     "as they should for entities controlling a connections."];
-node_controller_refc(suite) -> [];
+%% Tests that external reference counts are incremented and decremented
+%% as they should for entities controlling a connections.
 node_controller_refc(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
     erts_debug:set_internal_state(node_tab_delayed_delete, 0),
-    ?line NodeFirstName = get_nodefirstname(),
-    ?line ?line {ok, Node} = start_node(NodeFirstName),
-    ?line true = lists:member(Node, nodes()),
-    ?line 1 = reference_type_count(control, get_dist_references(Node)),
-    ?line P = spawn_link_execer(node()),
-    ?line Node
-	= sync_exec(P,
-		    fun () ->
-			    put(remote_net_kernel,
-				rpc:call(Node,erlang,whereis,[net_kernel])),
-			    node(get(remote_net_kernel))
-		    end),
-    ?line Creation = rpc:call(Node, erlang, system_info, [creation]),
-    ?line monitor_node(Node,true),
-    ?line stop_node(Node),
-    ?line receive {nodedown, Node} -> ok end,
-    ?line DistRefs = get_dist_references(Node),
-    ?line true = reference_type_count(node, DistRefs) > 0,
-    ?line 0 = reference_type_count(control, DistRefs),
+    NodeFirstName = get_nodefirstname(),
+    {ok, Node} = start_node(NodeFirstName),
+    true = lists:member(Node, nodes()),
+    1 = reference_type_count(control, get_dist_references(Node)),
+    P = spawn_link_execer(node()),
+    Node
+    = sync_exec(P,
+                fun () ->
+                        put(remote_net_kernel,
+                            rpc:call(Node,erlang,whereis,[net_kernel])),
+                        node(get(remote_net_kernel))
+                end),
+    Creation = rpc:call(Node, erlang, system_info, [creation]),
+    monitor_node(Node,true),
+    stop_node(Node),
+    receive {nodedown, Node} -> ok end,
+    DistRefs = get_dist_references(Node),
+    true = reference_type_count(node, DistRefs) > 0,
+    0 = reference_type_count(control, DistRefs),
     % Get rid of all references to Node
-    ?line exec(P, fun () -> exit(normal) end),
-    ?line wait_until(fun () -> not is_process_alive(P) end),
+    exec(P, fun () -> exit(normal) end),
+    wait_until(fun () -> not is_process_alive(P) end),
     lists:foreach(fun (Proc) -> garbage_collect(Proc) end, processes()),
-    ?line false = get_node_references({Node,Creation}),
-    ?line false = get_dist_references(Node),
-    ?line false = lists:member(Node, nodes(known)),
-    ?line nc_refc_check(node()),
+    false = get_node_references({Node,Creation}),
+    false = get_dist_references(Node),
+    false = lists:member(Node, nodes(known)),
+    nc_refc_check(node()),
     erts_debug:set_internal_state(node_tab_delayed_delete, -1), %% restore original value
-    ?line ok.
+    ok.
 
 %%
 %% Test case: ets_refc
 %%
-ets_refc(doc) ->
-    ["Tests that external reference counts are incremented and decremented "
-     "as they should for data stored in ets tables."];
-ets_refc(suite) -> [];
+%% Tests that external reference counts are incremented and decremented
+%% as they should for data stored in ets tables.
 ets_refc(Config) when is_list(Config) ->
-    ?line RNode = {get_nodename(), 1},
-    ?line RPid = mk_pid(RNode, 4711, 2),
-    ?line RPort = mk_port(RNode, 4711),
-    ?line RRef = mk_ref(RNode, [4711, 47, 11]),
-    ?line Tab = ets:new(ets_refc, []),
-    ?line 0 = reference_type_count(ets, get_node_references(RNode)),
-    ?line true = ets:insert(Tab, [{a, self()},
-				  {b, RPid},
-				  {c, hd(erlang:ports())},
-				  {d, RPort},
-				  {e, make_ref()}]),
-    ?line 2 = reference_type_count(ets, get_node_references(RNode)),
-    ?line true = ets:insert(Tab, {f, RRef}),
-    ?line 3 = reference_type_count(ets, get_node_references(RNode)),
-    ?line true = ets:delete(Tab, d),
-    ?line 2 = reference_type_count(ets, get_node_references(RNode)),
-    ?line true = ets:delete_all_objects(Tab),
-    ?line 0 = reference_type_count(ets, get_node_references(RNode)),
-    ?line true = ets:insert(Tab, [{b, RPid}, {e, make_ref()}]),
-    ?line 1 = reference_type_count(ets, get_node_references(RNode)),
-    ?line true = ets:delete(Tab),
-    ?line 0 = reference_type_count(ets, get_node_references(RNode)),
-    ?line nc_refc_check(node()),
-    ?line ok.
+    RNode = {get_nodename(), 1},
+    RPid = mk_pid(RNode, 4711, 2),
+    RPort = mk_port(RNode, 4711),
+    RRef = mk_ref(RNode, [4711, 47, 11]),
+    Tab = ets:new(ets_refc, []),
+    0 = reference_type_count(ets, get_node_references(RNode)),
+    true = ets:insert(Tab, [{a, self()},
+                            {b, RPid},
+                            {c, hd(erlang:ports())},
+                            {d, RPort},
+                            {e, make_ref()}]),
+    2 = reference_type_count(ets, get_node_references(RNode)),
+    true = ets:insert(Tab, {f, RRef}),
+    3 = reference_type_count(ets, get_node_references(RNode)),
+    true = ets:delete(Tab, d),
+    2 = reference_type_count(ets, get_node_references(RNode)),
+    true = ets:delete_all_objects(Tab),
+    0 = reference_type_count(ets, get_node_references(RNode)),
+    true = ets:insert(Tab, [{b, RPid}, {e, make_ref()}]),
+    1 = reference_type_count(ets, get_node_references(RNode)),
+    true = ets:delete(Tab),
+    0 = reference_type_count(ets, get_node_references(RNode)),
+    nc_refc_check(node()),
+    ok.
 
 %%
 %% Test case: match_spec_refc
 %%
-match_spec_refc(doc) ->
-    ["Tests that external reference counts are incremented and decremented "
-     "as they should for data stored in match specifications."];
-match_spec_refc(suite) -> [];
+%% Tests that external reference counts are incremented and decremented
+%% as they should for data stored in match specifications.
 match_spec_refc(Config) when is_list(Config) ->
-    ?line RNode = {get_nodename(), 1},
-    ?line RPid = mk_pid(RNode, 4711, 2),
-    ?line RPort = mk_port(RNode, 4711),
-    ?line RRef = mk_ref(RNode, [4711, 47, 11]),
-    ?line ok = do_match_spec_test(RNode, RPid, RPort, RRef),
-    ?line garbage_collect(),
-    ?line NodeRefs = get_node_references(RNode),
-    ?line 0 = reference_type_count(binary, NodeRefs),
-    ?line 0 = reference_type_count(ets, NodeRefs),
-    ?line nc_refc_check(node()),
-    ?line ok.
+    RNode = {get_nodename(), 1},
+    RPid = mk_pid(RNode, 4711, 2),
+    RPort = mk_port(RNode, 4711),
+    RRef = mk_ref(RNode, [4711, 47, 11]),
+    ok = do_match_spec_test(RNode, RPid, RPort, RRef),
+    garbage_collect(),
+    NodeRefs = get_node_references(RNode),
+    0 = reference_type_count(binary, NodeRefs),
+    0 = reference_type_count(ets, NodeRefs),
+    nc_refc_check(node()),
+    ok.
 
 do_match_spec_test(RNode, RPid, RPort, RRef) ->
-    ?line Tab = ets:new(match_spec_refc, []),
-    ?line true = ets:insert(Tab, [{a, RPid, RPort, RRef},
-				  {b, self(), RPort, RRef},
-				  {c, RPid, RPort, make_ref()},
-				  {d, RPid, RPort, RRef}]),
-    ?line {M1, C1} = ets:select(Tab, [{{'$1',RPid,RPort,RRef},[],['$1']}], 1),
-    ?line NodeRefs = get_node_references(RNode),
-    ?line 3 = reference_type_count(binary, NodeRefs),
-    ?line 10 = reference_type_count(ets, NodeRefs),
-    ?line {M2, C2} = ets:select(C1),
-    ?line '$end_of_table' = ets:select(C2),
-    ?line ets:delete(Tab),
-    ?line [a,d] = lists:sort(M1++M2),
-    ?line ok.
-    
+    Tab = ets:new(match_spec_refc, []),
+    true = ets:insert(Tab, [{a, RPid, RPort, RRef},
+                            {b, self(), RPort, RRef},
+                            {c, RPid, RPort, make_ref()},
+                            {d, RPid, RPort, RRef}]),
+    {M1, C1} = ets:select(Tab, [{{'$1',RPid,RPort,RRef},[],['$1']}], 1),
+    NodeRefs = get_node_references(RNode),
+    3 = reference_type_count(binary, NodeRefs),
+    10 = reference_type_count(ets, NodeRefs),
+    {M2, C2} = ets:select(C1),
+    '$end_of_table' = ets:select(C2),
+    ets:delete(Tab),
+    [a,d] = lists:sort(M1++M2),
+    ok.
+
 
 %%
 %% Test case: ets_refc
 %%
-timer_refc(doc) ->
-    ["Tests that external reference counts are incremented and decremented "
-     "as they should for data stored in bif timers."];
-timer_refc(suite) -> [];
+%% Tests that external reference counts are incremented and decremented
+%% as they should for data stored in bif timers.
 timer_refc(Config) when is_list(Config) ->
-    ?line RNode = {get_nodename(), 1},
-    ?line RPid = mk_pid(RNode, 4711, 2),
-    ?line RPort = mk_port(RNode, 4711),
-    ?line RRef = mk_ref(RNode, [4711, 47, 11]),
-    ?line 0 = reference_type_count(timer, get_node_references(RNode)),
-    ?line Pid = spawn(fun () -> receive after infinity -> ok end end),
-    ?line erlang:start_timer(10000, Pid, {RPid, RPort, RRef}),
-    ?line 3 = reference_type_count(timer, get_node_references(RNode)),
-    ?line exit(Pid, kill),
-    ?line Mon = erlang:monitor(process, Pid),
-    ?line receive {'DOWN', Mon, process, Pid, _} -> ok end,
-    ?line 0 = reference_type_count(timer, get_node_references(RNode)),
-    ?line erlang:send_after(500, Pid, {timer, RPid, RPort, RRef}),
-    ?line 0 = reference_type_count(timer, get_node_references(RNode)),
-    ?line erlang:send_after(500, self(), {timer, RPid, RPort, RRef}),
-    ?line erlang:send_after(400, bananfluga, {timer, RPid, RPort, RRef}),
-    ?line 6 = reference_type_count(timer, get_node_references(RNode)),
-    ?line receive {timer, RPid, RPort, RRef} -> ok end,
-    ?line 0 = reference_type_count(timer, get_node_references(RNode)),
-    ?line nc_refc_check(node()),
-    ?line ok.
-
-otp_4715(doc) -> [];
-otp_4715(suite) -> [];
+    RNode = {get_nodename(), 1},
+    RPid = mk_pid(RNode, 4711, 2),
+    RPort = mk_port(RNode, 4711),
+    RRef = mk_ref(RNode, [4711, 47, 11]),
+    0 = reference_type_count(timer, get_node_references(RNode)),
+    Pid = spawn(fun () -> receive after infinity -> ok end end),
+    erlang:start_timer(10000, Pid, {RPid, RPort, RRef}),
+    3 = reference_type_count(timer, get_node_references(RNode)),
+    exit(Pid, kill),
+    Mon = erlang:monitor(process, Pid),
+    receive {'DOWN', Mon, process, Pid, _} -> ok end,
+    0 = reference_type_count(timer, get_node_references(RNode)),
+    erlang:send_after(500, Pid, {timer, RPid, RPort, RRef}),
+    0 = reference_type_count(timer, get_node_references(RNode)),
+    erlang:send_after(500, self(), {timer, RPid, RPort, RRef}),
+    erlang:send_after(400, bananfluga, {timer, RPid, RPort, RRef}),
+    6 = reference_type_count(timer, get_node_references(RNode)),
+    receive {timer, RPid, RPort, RRef} -> ok end,
+    0 = reference_type_count(timer, get_node_references(RNode)),
+    nc_refc_check(node()),
+    ok.
+
 otp_4715(Config) when is_list(Config) ->
-    case ?t:is_release_available("r9b") of
-	true -> otp_4715_1(Config);
-	false -> {skip,"No R9B found"}
+    case test_server:is_release_available("r9b") of
+        true -> otp_4715_1(Config);
+        false -> {skip,"No R9B found"}
     end.
 
 otp_4715_1(Config) ->
     case erlang:system_info(compat_rel) of
-	9 ->
-	    ?line run_otp_4715(Config);
-	_ ->
-	    ?line Pa = filename:dirname(code:which(?MODULE)),
-	    ?line ?t:run_on_shielded_node(fun () ->
-						  run_otp_4715(Config)
-					  end,
-					  "+R9 -pa " ++ Pa)
+        9 ->
+            run_otp_4715(Config);
+        _ ->
+            Pa = filename:dirname(code:which(?MODULE)),
+            test_server:run_on_shielded_node(fun () ->
+                                                     run_otp_4715(Config)
+                                             end,
+                                             "+R9 -pa " ++ Pa)
     end.
 
 run_otp_4715(Config) when is_list(Config) ->
-    ?line erts_debug:set_internal_state(available_internal_state, true),
-    ?line PidList = [mk_pid({a@b, 1}, 4710, 2),
-		     mk_pid({a@b, 1}, 4712, 1),
-		     mk_pid({c@b, 1}, 4711, 1),
-		     mk_pid({b@b, 3}, 4711, 1),
-		     mk_pid({b@b, 2}, 4711, 1)],
-
-    ?line R9Sorted = old_mod:sort_on_old_node(PidList),
-    ?line R9Sorted = lists:sort(PidList).
-
-pid_wrap(doc) -> [];
-pid_wrap(suite) -> [];
-pid_wrap(Config) when is_list(Config) -> ?line pp_wrap(pid).
-
-port_wrap(doc) -> [];
-port_wrap(suite) -> [];
+    erts_debug:set_internal_state(available_internal_state, true),
+    PidList = [mk_pid({a@b, 1}, 4710, 2),
+               mk_pid({a@b, 1}, 4712, 1),
+               mk_pid({c@b, 1}, 4711, 1),
+               mk_pid({b@b, 3}, 4711, 1),
+               mk_pid({b@b, 2}, 4711, 1)],
+
+    R9Sorted = old_mod:sort_on_old_node(PidList),
+    R9Sorted = lists:sort(PidList).
+
+pid_wrap(Config) when is_list(Config) -> pp_wrap(pid).
+
 port_wrap(Config) when is_list(Config) ->
-    ?line case ?t:os_type() of
-	      {unix, _} ->
-		  ?line pp_wrap(port);
-	      _ ->
-		  ?line {skip, "Only run on unix"}
-	  end.
+    case os:type() of
+        {unix, _} ->
+            pp_wrap(port);
+        _ ->
+            {skip, "Only run on unix"}
+    end.
 
 get_next_id(pid) ->
     erts_debug:get_internal_state(next_pid);
@@ -773,167 +728,160 @@ set_next_id(port, N) ->
     erts_debug:set_internal_state(next_port, N).
 
 pp_wrap(What) ->
-    ?line N = set_high_pp_next(What),
-    ?line Cre = N + 100,
-    ?line ?t:format("no creations = ~p~n", [Cre]),
-    ?line PreCre = get_next_id(What),
-    ?line ?t:format("pre creations = ~p~n", [PreCre]),
-    ?line true = is_integer(PreCre),
-    ?line do_pp_creations(What, Cre),
-    ?line PostCre = get_next_id(What),
-    ?line ?t:format("post creations = ~p~n", [PostCre]),
-    ?line true = is_integer(PostCre),
-    ?line true = PreCre > PostCre,
-    ?line Now = set_next_id(What, ?MAX_PIDS_PORTS div 2),
-    ?line ?t:format("reset to = ~p~n", [Now]),
-    ?line true = is_integer(Now),
-    ?line ok.
+    N = set_high_pp_next(What),
+    Cre = N + 100,
+    io:format("no creations = ~p~n", [Cre]),
+    PreCre = get_next_id(What),
+    io:format("pre creations = ~p~n", [PreCre]),
+    true = is_integer(PreCre),
+    do_pp_creations(What, Cre),
+    PostCre = get_next_id(What),
+    io:format("post creations = ~p~n", [PostCre]),
+    true = is_integer(PostCre),
+    true = PreCre > PostCre,
+    Now = set_next_id(What, ?MAX_PIDS_PORTS div 2),
+    io:format("reset to = ~p~n", [Now]),
+    true = is_integer(Now),
+    ok.
 
 set_high_pp_next(What) ->
-    ?line set_high_pp_next(What, ?MAX_PIDS_PORTS-1).
-    
+    set_high_pp_next(What, ?MAX_PIDS_PORTS-1).
+
 set_high_pp_next(What, N) ->
-    ?line M = set_next_id(What, N),
-    ?line true = is_integer(M),
-    ?line case {M >= N, M =< ?MAX_PIDS_PORTS} of
-	      {true, true} ->
-		  ?line ?MAX_PIDS_PORTS - M + 1;
-	      _ ->
-		  ?line set_high_pp_next(What, N - 100)
-	  end.
+    M = set_next_id(What, N),
+    true = is_integer(M),
+    case {M >= N, M =< ?MAX_PIDS_PORTS} of
+        {true, true} ->
+            ?MAX_PIDS_PORTS - M + 1;
+        _ ->
+            set_high_pp_next(What, N - 100)
+    end.
 
 do_pp_creations(_What, N) when is_integer(N), N =< 0 ->
-    ?line done;
+    done;
 do_pp_creations(pid, N) when is_integer(N) ->
     %% Create new pid and make sure it works...
-    ?line Me = self(),
-    ?line Ref = make_ref(),
-    ?line Pid = spawn_link(fun () ->
-				   receive
-				       Ref ->
-					   Me ! Ref
-				   end
-			   end),
-    ?line Pid ! Ref,
-    ?line receive
-	      Ref ->
-		  ?line do_pp_creations(pid, N - 1)
-	  end;
+    Me = self(),
+    Ref = make_ref(),
+    Pid = spawn_link(fun () ->
+                             receive
+                                 Ref ->
+                                     Me ! Ref
+                             end
+                     end),
+    Pid ! Ref,
+    receive
+        Ref ->
+            do_pp_creations(pid, N - 1)
+    end;
 do_pp_creations(port, N) when is_integer(N) ->
     %% Create new port and make sure it works...
-    ?line "hej" = os:cmd("echo hej") -- "\n",
-    ?line do_pp_creations(port, N - 1).
+    "hej" = os:cmd("echo hej") -- "\n",
+    do_pp_creations(port, N - 1).
 
-bad_nc(doc) -> [];
-bad_nc(suite) -> [];
 bad_nc(Config) when is_list(Config) ->
     % Make sure emulator don't crash on bad node containers...
-    ?line MaxPidNum = (1 bsl 15) - 1,
-    ?line MaxPidSer = ?MAX_PIDS_PORTS bsr 15,
-    ?line ThisNode = {node(), erlang:system_info(creation)},
-    ?line {'EXIT', {badarg, mk_pid, _}}
-	= (catch mk_pid(ThisNode, MaxPidNum + 1, 17)),
-    ?line {'EXIT', {badarg, mk_pid, _}}
-	= (catch mk_pid(ThisNode, 4711, MaxPidSer + 1)),
-    ?line {'EXIT', {badarg, mk_port, _}}
-	= (catch mk_port(ThisNode, ?MAX_PIDS_PORTS + 1)),
-    ?line {'EXIT', {badarg, mk_ref, _}}
-	= (catch mk_ref(ThisNode,[(1 bsl 18), 4711, 4711])),
-    ?line {'EXIT', {badarg, mk_ref, _}}
-	= (catch mk_ref(ThisNode, [4711, 4711, 4711, 4711, 4711, 4711, 4711])),
-    ?line RemNode = {x@y, 2},
-    ?line {'EXIT', {badarg, mk_pid, _}}
-	= (catch mk_pid(RemNode, MaxPidNum + 1, MaxPidSer)),
-    ?line {'EXIT', {badarg, mk_pid, _}}
-	= (catch mk_pid(RemNode, MaxPidNum, MaxPidSer + 1)),
-    ?line {'EXIT', {badarg, mk_port, _}}
-	= (catch mk_port(RemNode, ?MAX_PIDS_PORTS + 1)),
-    ?line {'EXIT', {badarg, mk_ref, _}}
-	= (catch mk_ref(RemNode, [(1 bsl 18), 4711, 4711])),
-    ?line {'EXIT', {badarg, mk_ref, _}}
-	= (catch mk_ref(RemNode, [4711, 4711, 4711, 4711, 4711, 4711, 4711])),
-    ?line BadNode = {x@y, 4},
-    ?line {'EXIT', {badarg, mk_pid, _}}
-	= (catch mk_pid(BadNode, 4711, 17)),
-    ?line {'EXIT', {badarg, mk_port, _}}
-	= (catch mk_port(BadNode, 4711)),
-    ?line {'EXIT', {badarg, mk_ref, _}}
-	= (catch mk_ref(BadNode, [4711, 4711, 17])),
-    ?line ok.
+    MaxPidNum = (1 bsl 15) - 1,
+    MaxPidSer = ?MAX_PIDS_PORTS bsr 15,
+    ThisNode = {node(), erlang:system_info(creation)},
+    {'EXIT', {badarg, mk_pid, _}}
+    = (catch mk_pid(ThisNode, MaxPidNum + 1, 17)),
+    {'EXIT', {badarg, mk_pid, _}}
+    = (catch mk_pid(ThisNode, 4711, MaxPidSer + 1)),
+    {'EXIT', {badarg, mk_port, _}}
+    = (catch mk_port(ThisNode, ?MAX_PIDS_PORTS + 1)),
+    {'EXIT', {badarg, mk_ref, _}}
+    = (catch mk_ref(ThisNode,[(1 bsl 18), 4711, 4711])),
+    {'EXIT', {badarg, mk_ref, _}}
+    = (catch mk_ref(ThisNode, [4711, 4711, 4711, 4711, 4711, 4711, 4711])),
+    RemNode = {x@y, 2},
+    {'EXIT', {badarg, mk_pid, _}}
+    = (catch mk_pid(RemNode, MaxPidNum + 1, MaxPidSer)),
+    {'EXIT', {badarg, mk_pid, _}}
+    = (catch mk_pid(RemNode, MaxPidNum, MaxPidSer + 1)),
+    {'EXIT', {badarg, mk_port, _}}
+    = (catch mk_port(RemNode, ?MAX_PIDS_PORTS + 1)),
+    {'EXIT', {badarg, mk_ref, _}}
+    = (catch mk_ref(RemNode, [(1 bsl 18), 4711, 4711])),
+    {'EXIT', {badarg, mk_ref, _}}
+    = (catch mk_ref(RemNode, [4711, 4711, 4711, 4711, 4711, 4711, 4711])),
+    BadNode = {x@y, 4},
+    {'EXIT', {badarg, mk_pid, _}}
+    = (catch mk_pid(BadNode, 4711, 17)),
+    {'EXIT', {badarg, mk_port, _}}
+    = (catch mk_port(BadNode, 4711)),
+    {'EXIT', {badarg, mk_ref, _}}
+    = (catch mk_ref(BadNode, [4711, 4711, 17])),
+    ok.
 
 
 
 -define(NO_PIDS, 1000000).
 
-unique_pid(doc) -> [];
-unique_pid(suite) -> [];
 unique_pid(Config) when is_list(Config) ->
     case catch erlang:system_info(modified_timing_level) of
-	Level when is_integer(Level) ->
-	    {skip,
-	     "Modified timing (level " ++ integer_to_list(Level)
-	     ++ ") is enabled. spawn() is too slow for this "
-	     " test when modified timing is enabled."};
-	_ ->
-	    ?line ?NO_PIDS = length(lists:usort(mkpidlist(?NO_PIDS, []))),
-	    ?line ok
+        Level when is_integer(Level) ->
+            {skip,
+             "Modified timing (level " ++ integer_to_list(Level)
+             ++ ") is enabled. spawn() is too slow for this "
+             " test when modified timing is enabled."};
+        _ ->
+            ?NO_PIDS = length(lists:usort(mkpidlist(?NO_PIDS, []))),
+            ok
     end.
-    
+
 mkpidlist(0, Ps) -> Ps;
 mkpidlist(N, Ps) -> mkpidlist(N-1, [spawn(fun () -> ok end)|Ps]).
 
 
-iter_max_procs(doc) -> [];
-iter_max_procs(suite) -> [];
 iter_max_procs(Config) when is_list(Config) ->
-    ?line NoMoreTests = make_ref(),
-    ?line erlang:send_after(10000, self(), NoMoreTests),
-    ?line Res = chk_max_proc_line(),
-    ?line Res = chk_max_proc_line(),
-    ?line done = chk_max_proc_line_until(NoMoreTests, Res),
-    ?line {comment,
-	   io_lib:format("max processes = ~p; "
-			 "process line length = ~p",
-			 [element(2, Res), element(1, Res)])}.
-    
-    
+    NoMoreTests = make_ref(),
+    erlang:send_after(10000, self(), NoMoreTests),
+    Res = chk_max_proc_line(),
+    Res = chk_max_proc_line(),
+    done = chk_max_proc_line_until(NoMoreTests, Res),
+    Cmt = io_lib:format("max processes = ~p; "
+                        "process line length = ~p",
+                        [element(2, Res), element(1, Res)]),
+    {comment, lists:flatten(Cmt)}.
+
 max_proc_line(Root, Parent, N) ->
     Me = self(),
     case catch spawn_link(fun () -> max_proc_line(Root, Me, N+1) end) of
-	{'EXIT', {system_limit, _}} when Root /= self() ->
-	    Root ! {proc_line_length, N, self()},
-	    receive remove_proc_line -> Parent ! {exiting, Me} end;
-	P when is_pid(P), Root =/= self() ->
-	    receive {exiting, P} -> Parent ! {exiting, Me} end;
-	P when is_pid(P) ->
-	    P;
-	Unexpected ->
-	    exit({unexpected_spawn_result, Unexpected})
+        {'EXIT', {system_limit, _}} when Root /= self() ->
+            Root ! {proc_line_length, N, self()},
+            receive remove_proc_line -> Parent ! {exiting, Me} end;
+        P when is_pid(P), Root =/= self() ->
+            receive {exiting, P} -> Parent ! {exiting, Me} end;
+        P when is_pid(P) ->
+            P;
+        Unexpected ->
+            exit({unexpected_spawn_result, Unexpected})
     end.
 
 chk_max_proc_line() ->
-    ?line Child = max_proc_line(self(), self(), 0),
-    ?line receive
-	      {proc_line_length, PLL, End} ->
-		  ?line PC = erlang:system_info(process_count),
-		  ?line LP = length(processes()),
-		  ?line ?t:format("proc line length = ~p; "
-				  "process count = ~p; "
-				  "length processes = ~p~n",
-				  [PLL, PC, LP]),
-		  ?line End ! remove_proc_line,
-		  ?line PC = LP,
-		  ?line receive {exiting, Child} -> ok end,
-		  ?line {PLL, PC}
-	  end.
+    Child = max_proc_line(self(), self(), 0),
+    receive
+        {proc_line_length, PLL, End} ->
+            PC = erlang:system_info(process_count),
+            LP = length(processes()),
+            io:format("proc line length = ~p; "
+                      "process count = ~p; "
+                      "length processes = ~p~n",
+                      [PLL, PC, LP]),
+                  End ! remove_proc_line,
+                  PC = LP,
+                  receive {exiting, Child} -> ok end,
+                  {PLL, PC}
+    end.
 
 chk_max_proc_line_until(NoMoreTests, Res) ->
     receive
-	NoMoreTests ->
-	    ?line done
+        NoMoreTests ->
+            done
     after 0 ->
-	    ?line Res = chk_max_proc_line(),
-	    ?line chk_max_proc_line_until(NoMoreTests, Res)
+              Res = chk_max_proc_line(),
+              chk_max_proc_line_until(NoMoreTests, Res)
     end.
 
 %%
@@ -950,126 +898,126 @@ node_container_refc_check(Node) when is_atom(Node) ->
 nc_refc_check(Node) when is_atom(Node) ->
     Ref = make_ref(),
     Self = self(),
-    ?t:format("Starting reference count check of node ~w~n", [Node]),
+    io:format("Starting reference count check of node ~w~n", [Node]),
     spawn_link(Node,
-	       fun () ->
-		       {{node_references, NodeRefs},
-			{dist_references, DistRefs}} = ?ND_REFS,
-		       check_nd_refc({node(), erlang:system_info(creation)},
-				     NodeRefs,
-				     DistRefs,
-				     fun (ErrMsg) ->
-					     Self ! {Ref, ErrMsg, failed},
-					     exit(normal)
-				     end),
-		       Self ! {Ref, succeded}
-	       end),
+               fun () ->
+                       {{node_references, NodeRefs},
+                        {dist_references, DistRefs}} = ?ND_REFS,
+                       check_nd_refc({node(), erlang:system_info(creation)},
+                                     NodeRefs,
+                                     DistRefs,
+                                     fun (ErrMsg) ->
+                                             Self ! {Ref, ErrMsg, failed},
+                                             exit(normal)
+                                     end),
+                       Self ! {Ref, succeded}
+               end),
     receive
-	{Ref, ErrorMsg, failed} ->
-	    ?t:format("~s~n", [ErrorMsg]),
-	    ?t:fail(reference_count_check_failed);
-	{Ref, succeded} ->
-	    ?t:format("Reference count check of node ~w succeded!~n", [Node]),
-	    ok
+        {Ref, ErrorMsg, failed} ->
+            io:format("~s~n", [ErrorMsg]),
+            ct:fail(reference_count_check_failed);
+        {Ref, succeded} ->
+            io:format("Reference count check of node ~w succeded!~n", [Node]),
+            ok
     end.
 
 check_nd_refc({ThisNodeName, ThisCreation}, NodeRefs, DistRefs, Fail) ->
     case catch begin
-		   check_refc(ThisNodeName,ThisCreation,"node table",NodeRefs),
-		   check_refc(ThisNodeName,ThisCreation,"dist table",DistRefs),
-		   ok
-	       end of
-	ok ->
-	    ok;
-	{'EXIT', Reason} ->
-	    {Y,Mo,D} = date(),
-	    {H,Mi,S} = time(),
-	    ErrMsg = io_lib:format("~n"
-				   "*** Reference count check of node ~w "
-				   "failed (~p) at ~w~w~w ~w:~w:~w~n"
-				   "*** Node table references:~n ~p~n"
-				   "*** Dist table references:~n ~p~n",
-				   [node(), Reason, Y, Mo, D, H, Mi, S,
-				    NodeRefs, DistRefs]),
-	    Fail(lists:flatten(ErrMsg))
+                   check_refc(ThisNodeName,ThisCreation,"node table",NodeRefs),
+                   check_refc(ThisNodeName,ThisCreation,"dist table",DistRefs),
+                   ok
+               end of
+        ok ->
+            ok;
+        {'EXIT', Reason} ->
+            {Y,Mo,D} = date(),
+            {H,Mi,S} = time(),
+            ErrMsg = io_lib:format("~n"
+                                   "*** Reference count check of node ~w "
+                                   "failed (~p) at ~w~w~w ~w:~w:~w~n"
+                                   "*** Node table references:~n ~p~n"
+                                   "*** Dist table references:~n ~p~n",
+                                   [node(), Reason, Y, Mo, D, H, Mi, S,
+                                    NodeRefs, DistRefs]),
+            Fail(lists:flatten(ErrMsg))
     end.
 
 
 check_refc(ThisNodeName,ThisCreation,Table,EntryList) when is_list(EntryList) ->
     lists:foreach(
       fun ({Entry, Refc, ReferrerList}) ->
-	      {DelayedDeleteTimer,
-	       FoundRefs} =
-		  lists:foldl(
-		    fun ({Referrer, ReferencesList}, {DDT, A1}) ->
-			    {case Referrer of
-				 {system,delayed_delete_timer} ->
-				     true;
-				 _ ->
-				     DDT
-			     end,
-			     A1 + lists:foldl(fun ({_T,Rs},A2) ->
-						      A2+Rs
-					      end,
-					      0,
-					      ReferencesList)}
-		    end,
-		    {false, 0},
-		    ReferrerList),
-	      
-	      %% Reference count equals found references?
-	      case {Refc, FoundRefs, DelayedDeleteTimer} of
-		  {X, X, _} ->
-		      ok;
-		  {0, 1, true} ->
-		      ok;
-		  _ ->
-		      exit({invalid_reference_count, Table, Entry})
-	      end,
-
-	      %% All entries in table referred to?
-	      case {Entry, Refc} of
-		  {ThisNodeName, 0} -> ok;
-		  {{ThisNodeName, ThisCreation}, 0} -> ok;
-		  {_, 0} when DelayedDeleteTimer == false ->
-		      exit({not_referred_entry_in_table, Table, Entry});
-		  {_, _} -> ok 
-	      end
+              {DelayedDeleteTimer,
+               FoundRefs} =
+              lists:foldl(
+                fun ({Referrer, ReferencesList}, {DDT, A1}) ->
+                        {case Referrer of
+                             {system,delayed_delete_timer} ->
+                                 true;
+                             _ ->
+                                 DDT
+                         end,
+                         A1 + lists:foldl(fun ({_T,Rs},A2) ->
+                                                  A2+Rs
+                                          end,
+                                          0,
+                                          ReferencesList)}
+                end,
+                {false, 0},
+                ReferrerList),
+
+              %% Reference count equals found references?
+              case {Refc, FoundRefs, DelayedDeleteTimer} of
+                  {X, X, _} ->
+                      ok;
+                  {0, 1, true} ->
+                      ok;
+                  _ ->
+                      exit({invalid_reference_count, Table, Entry})
+              end,
+
+              %% All entries in table referred to?
+              case {Entry, Refc} of
+                  {ThisNodeName, 0} -> ok;
+                  {{ThisNodeName, ThisCreation}, 0} -> ok;
+                  {_, 0} when DelayedDeleteTimer == false ->
+                      exit({not_referred_entry_in_table, Table, Entry});
+                  {_, _} -> ok 
+              end
 
       end,
       EntryList),
     ok.
 
 get_node_references({NodeName, Creation} = Node) when is_atom(NodeName),
-						      is_integer(Creation) ->
+                                                      is_integer(Creation) ->
     {{node_references, NodeRefs},
-	   {dist_references, DistRefs}} = ?ND_REFS,
+     {dist_references, DistRefs}} = ?ND_REFS,
     check_nd_refc({node(), erlang:system_info(creation)},
-			NodeRefs,
-			DistRefs,
-			fun (ErrMsg) ->
-				?t:format("~s", [ErrMsg]),
-				?t:fail(reference_count_check_failed)
-			end),
+                  NodeRefs,
+                  DistRefs,
+                  fun (ErrMsg) ->
+                          io:format("~s", [ErrMsg]),
+                          ct:fail(reference_count_check_failed)
+                  end),
     find_references(Node, NodeRefs).
 
 get_dist_references(NodeName) when is_atom(NodeName) ->
-    ?line {{node_references, NodeRefs},
-	   {dist_references, DistRefs}} = ?ND_REFS,
-    ?line check_nd_refc({node(), erlang:system_info(creation)},
-			NodeRefs,
-			DistRefs,
-			fun (ErrMsg) ->
-				?line ?t:format("~s", [ErrMsg]),
-				?line ?t:fail(reference_count_check_failed)
-			end),
-    ?line find_references(NodeName, DistRefs).
+    {{node_references, NodeRefs},
+     {dist_references, DistRefs}} = ?ND_REFS,
+    check_nd_refc({node(), erlang:system_info(creation)},
+                  NodeRefs,
+                  DistRefs,
+                  fun (ErrMsg) ->
+                          io:format("~s", [ErrMsg]),
+                          ct:fail(reference_count_check_failed)
+                  end),
+    find_references(NodeName, DistRefs).
 
 find_references(N, NRefList) ->
     case lists:keysearch(N, 1, NRefList) of
-	      {value, {N, _, ReferrersList}} -> ReferrersList;
-	      _ -> false
-	  end.
+        {value, {N, _, ReferrersList}} -> ReferrersList;
+        _ -> false
+    end.
 
 %% Currently unused
 % refering_entity_type(RefererType, ReferingEntities) ->
@@ -1081,7 +1029,7 @@ find_references(N, NRefList) ->
 % 		 ReferingEntities).
 
 refering_entity_id(ReferingEntityId, [{ReferingEntityId,_} = ReferingEntity
-				      | _ReferingEntities]) ->
+                                      | _ReferingEntities]) ->
     ReferingEntity;
 refering_entity_id(ReferingEntityId, [_ | ReferingEntities]) ->
     refering_entity_id(ReferingEntityId, ReferingEntities);
@@ -1094,34 +1042,34 @@ reference_type_count(Type, {_, _ReferenceCountList} = ReferingEntity) ->
     reference_type_count(Type, [ReferingEntity]);
 reference_type_count(Type, ReferingEntities) when is_list(ReferingEntities) ->
     lists:foldl(fun ({_, ReferenceCountList}, Acc1) ->
-			lists:foldl(fun ({T, N}, Acc2) when T == Type ->
-					    N + Acc2;
-					(_, Acc2) ->
-					    Acc2
-				    end,
-				    Acc1,
-				    ReferenceCountList)
-		end,
-		0,
-		ReferingEntities).
+                        lists:foldl(fun ({T, N}, Acc2) when T == Type ->
+                                            N + Acc2;
+                                        (_, Acc2) ->
+                                            Acc2
+                                    end,
+                                    Acc1,
+                                    ReferenceCountList)
+                end,
+                0,
+                ReferingEntities).
 
 
 start_node(Name, Args) ->
-    ?line Pa = filename:dirname(code:which(?MODULE)),
-    ?line Res = test_server:start_node(Name,
-				       slave,
-				       [{args, "-pa "++Pa++" "++Args}]),
-    ?line {ok, Node} = Res,
-    ?line rpc:call(Node, erts_debug, set_internal_state,
-		   [available_internal_state, true]),
-    ?line Res.
-    
+    Pa = filename:dirname(code:which(?MODULE)),
+    Res = test_server:start_node(Name,
+                                 slave,
+                                 [{args, "-pa "++Pa++" "++Args}]),
+    {ok, Node} = Res,
+    rpc:call(Node, erts_debug, set_internal_state,
+             [available_internal_state, true]),
+    Res.
+
 start_node(Name) ->
-    ?line start_node(Name, "").
+    start_node(Name, "").
 
 stop_node(Node) ->
-    ?line nc_refc_check(Node),
-    ?line true = test_server:stop_node(Node).
+    nc_refc_check(Node),
+    true = test_server:stop_node(Node).
 
 hostname() ->
     from($@, atom_to_list(node())).
@@ -1132,25 +1080,25 @@ from(_H, []) -> [].
 
 wait_until(Pred) ->
     case Pred() of
-	true -> ok;
-	false -> receive after 100 -> wait_until(Pred) end
+        true -> ok;
+        false -> receive after 100 -> wait_until(Pred) end
     end.
 
 get_nodefirstname_string() ->
     atom_to_list(?MODULE)
-	++ "-"
-	++ integer_to_list(erlang:system_time(seconds))
-	++ "-"
-	++ integer_to_list(erlang:unique_integer([positive])).
+    ++ "-"
+    ++ integer_to_list(erlang:system_time(seconds))
+    ++ "-"
+    ++ integer_to_list(erlang:unique_integer([positive])).
 
 get_nodefirstname() ->
     list_to_atom(get_nodefirstname_string()).
 
 get_nodename() ->
     list_to_atom(get_nodefirstname_string()
-		 ++ "@"
-		 ++ hostname()).
-    
+                 ++ "@"
+                 ++ hostname()).
+
 
 
 -define(VERSION_MAGIC,       131).
@@ -1187,88 +1135,88 @@ mk_pid({NodeName, Creation}, Number, Serial) when is_atom(NodeName) ->
     mk_pid({atom_to_list(NodeName), Creation}, Number, Serial);
 mk_pid({NodeName, Creation}, Number, Serial) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					?PID_EXT,
-					?ATOM_EXT,
-					uint16_be(length(NodeName)),
-					NodeName,
-					uint32_be(Number),
-					uint32_be(Serial),
-					uint8(Creation)])) of
-	Pid when is_pid(Pid) ->
-	    Pid;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_pid, [{NodeName, Creation}, Number, Serial]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?PID_EXT,
+                                              ?ATOM_EXT,
+                                              uint16_be(length(NodeName)),
+                                              NodeName,
+                                              uint32_be(Number),
+                                              uint32_be(Serial),
+                                              uint8(Creation)])) of
+        Pid when is_pid(Pid) ->
+            Pid;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_pid, [{NodeName, Creation}, Number, Serial]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end.
 
 mk_port({NodeName, Creation}, Number) when is_atom(NodeName) ->
     mk_port({atom_to_list(NodeName), Creation}, Number);
 mk_port({NodeName, Creation}, Number) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?PORT_EXT,
-					      ?ATOM_EXT,
-					      uint16_be(length(NodeName)),
-					      NodeName,
-					      uint32_be(Number),
-					      uint8(Creation)])) of
-	Port when is_port(Port) ->
-	    Port;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_port, [{NodeName, Creation}, Number]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?PORT_EXT,
+                                              ?ATOM_EXT,
+                                              uint16_be(length(NodeName)),
+                                              NodeName,
+                                              uint32_be(Number),
+                                              uint8(Creation)])) of
+        Port when is_port(Port) ->
+            Port;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_port, [{NodeName, Creation}, Number]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end.
 
 mk_ref({NodeName, Creation}, Numbers) when is_atom(NodeName),
-					   is_integer(Creation),
-					   is_list(Numbers) ->
+                                           is_integer(Creation),
+                                           is_list(Numbers) ->
     mk_ref({atom_to_list(NodeName), Creation}, Numbers);
 mk_ref({NodeName, Creation}, [Number]) when is_list(NodeName),
-					    is_integer(Creation),
-					    is_integer(Number) ->
+                                            is_integer(Creation),
+                                            is_integer(Number) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?REFERENCE_EXT,
-					      ?ATOM_EXT,
-					      uint16_be(length(NodeName)),
-					      NodeName,
-					      uint32_be(Number),
-					      uint8(Creation)])) of
-	Ref when is_reference(Ref) ->
-	    Ref;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_ref, [{NodeName, Creation}, [Number]]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?REFERENCE_EXT,
+                                              ?ATOM_EXT,
+                                              uint16_be(length(NodeName)),
+                                              NodeName,
+                                              uint32_be(Number),
+                                              uint8(Creation)])) of
+        Ref when is_reference(Ref) ->
+            Ref;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_ref, [{NodeName, Creation}, [Number]]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end;
 mk_ref({NodeName, Creation}, Numbers) when is_list(NodeName),
-					   is_integer(Creation),
-					   is_list(Numbers) ->
+                                           is_integer(Creation),
+                                           is_list(Numbers) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?NEW_REFERENCE_EXT,
-					      uint16_be(length(Numbers)),
-					      ?ATOM_EXT,
-					      uint16_be(length(NodeName)),
-					      NodeName,
-					      uint8(Creation),
-					      lists:map(fun (N) ->
-								uint32_be(N)
-							end,
-							Numbers)])) of
-	Ref when is_reference(Ref) ->
-	    Ref;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_ref, [{NodeName, Creation}, Numbers]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?NEW_REFERENCE_EXT,
+                                              uint16_be(length(Numbers)),
+                                              ?ATOM_EXT,
+                                              uint16_be(length(NodeName)),
+                                              NodeName,
+                                              uint8(Creation),
+                                              lists:map(fun (N) ->
+                                                                uint32_be(N)
+                                                        end,
+                                                        Numbers)])) of
+        Ref when is_reference(Ref) ->
+            Ref;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_ref, [{NodeName, Creation}, Numbers]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end.
 
 exec_loop() ->
     receive
-	{exec_fun, Fun} when is_function(Fun) ->
-	    Fun();
-	{sync_exec_fun, From, Fun} when is_pid(From), is_function(Fun)  ->
-	    From ! {sync_exec_fun_res, self(), Fun()}
+        {exec_fun, Fun} when is_function(Fun) ->
+            Fun();
+        {sync_exec_fun, From, Fun} when is_pid(From), is_function(Fun)  ->
+            From ! {sync_exec_fun_res, self(), Fun()}
     end,
     exec_loop().
 
@@ -1284,6 +1232,6 @@ exec(Pid, Fun) when is_pid(Pid), is_function(Fun) ->
 sync_exec(Pid, Fun) when is_pid(Pid), is_function(Fun) ->
     Pid ! {sync_exec_fun, self(), Fun},
     receive
-	{sync_exec_fun_res, Pid, Res} ->
-	    Res
+        {sync_exec_fun_res, Pid, Res} ->
+            Res
     end.
diff --git a/erts/emulator/test/nofrag_SUITE.erl b/erts/emulator/test/nofrag_SUITE.erl
index 3660a58c56..9cc851f9cf 100644
--- a/erts/emulator/test/nofrag_SUITE.erl
+++ b/erts/emulator/test/nofrag_SUITE.erl
@@ -20,57 +20,33 @@
 
 -module(nofrag_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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,
-	 error_handler/1,error_handler_apply/1,
-	 error_handler_fixed_apply/1,error_handler_fun/1,
-	 debug_breakpoint/1]).
+-export([all/0, suite/0,
+         error_handler/1,error_handler_apply/1,
+         error_handler_fixed_apply/1,error_handler_fun/1,
+         debug_breakpoint/1]).
 
 %% Exported functions for an error_handler module.
 -export([undefined_function/3,undefined_lambda/3,breakpoint/3]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 3}}].
 
 all() -> 
     [error_handler, error_handler_apply,
      error_handler_fixed_apply, error_handler_fun,
      debug_breakpoint].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(3)),
-    [{watchdog,Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
 error_handler(Config) when is_list(Config) ->
-    ?line process_flag(error_handler, ?MODULE),
+    process_flag(error_handler, ?MODULE),
     %% The term_to_binary/1 - binary_to_term/1 roundtrip is a good way
     %% to traverse the entire term.
-    ?line Term = collect(1024),
-    ?line Term = binary_to_term(term_to_binary(Term)),
-    ?line 1024 = length(Term),
-    ?line [[a,b,c,d,[e,f,g]]] = lists:usort(Term),
+    Term = collect(1024),
+    Term = binary_to_term(term_to_binary(Term)),
+    1024 = length(Term),
+    [[a,b,c,d,[e,f,g]]] = lists:usort(Term),
     ok.
 
 collect(0) ->
@@ -105,25 +81,25 @@ collect_apply(N, Mod) ->
     [C|Res].
 
 error_handler_apply(Config) when is_list(Config) ->
-    ?line process_flag(error_handler, ?MODULE),
+    process_flag(error_handler, ?MODULE),
 
     %% The term_to_binary/1 - binary_to_term/1 roundtrip is a good way
     %% to traverse the entire term.
-    ?line Term = collect_apply(1024, fooblurfbar),
-    ?line Term = binary_to_term(term_to_binary(Term)),
-    ?line 1024 = length(Term),
-    ?line [[{a,42},b,c,d,[e,f,g]]] = lists:usort(Term),
+    Term = collect_apply(1024, fooblurfbar),
+    Term = binary_to_term(term_to_binary(Term)),
+    1024 = length(Term),
+    [[{a,42},b,c,d,[e,f,g]]] = lists:usort(Term),
     ok.
 
 error_handler_fixed_apply(Config) when is_list(Config) ->
-    ?line process_flag(error_handler, ?MODULE),
+    process_flag(error_handler, ?MODULE),
 
     %% The term_to_binary/1 - binary_to_term/1 roundtrip is a good way
     %% to traverse the entire term.
-    ?line Term = collect_fixed_apply(1024, fooblurfbar),
-    ?line Term = binary_to_term(term_to_binary(Term)),
-    ?line 1024 = length(Term),
-    ?line [[{a,2},b,c,d,[e,f,g]]] = lists:usort(Term),
+    Term = collect_fixed_apply(1024, fooblurfbar),
+    Term = binary_to_term(term_to_binary(Term)),
+    1024 = length(Term),
+    [[{a,2},b,c,d,[e,f,g]]] = lists:usort(Term),
     ok.
 
 collect_fixed_apply(0, _) ->
@@ -145,19 +121,19 @@ undefined_function(_Mod, _Name, Args) ->
     Args.
 
 error_handler_fun(Config) when is_list(Config) ->
-    ?line process_flag(error_handler, ?MODULE),
+    process_flag(error_handler, ?MODULE),
 
     %% fun(A, B, C) -> {A,B,C,X} end in module foobarblurf.
     B = <<131,112,0,0,0,84,3,109,96,69,208,5,175,207,75,36,93,112,218,232,222,22,251,0,
-	 0,0,0,0,0,0,1,100,0,11,102,111,111,98,97,114,98,108,117,114,102,97,0,98,5,
-	 244,197,144,103,100,0,13,110,111,110,111,100,101,64,110,111,104,111,115,116,
-	 0,0,0,46,0,0,0,0,0,104,3,97,1,97,2,97,3>>,
-    ?line Fun = binary_to_term(B),
-    ?line Term = collect_fun(1024, Fun),
-    ?line Term = binary_to_term(term_to_binary(Term)),
-    ?line 1024 = length(Term),
-    ?line [[{foo,bar},{99,1.0},[e,f,g]]] = lists:usort(Term),
-    ?line {env,[{1,2,3}]} = erlang:fun_info(Fun, env),
+          0,0,0,0,0,0,1,100,0,11,102,111,111,98,97,114,98,108,117,114,102,97,0,98,5,
+          244,197,144,103,100,0,13,110,111,110,111,100,101,64,110,111,104,111,115,116,
+          0,0,0,46,0,0,0,0,0,104,3,97,1,97,2,97,3>>,
+    Fun = binary_to_term(B),
+    Term = collect_fun(1024, Fun),
+    Term = binary_to_term(term_to_binary(Term)),
+    1024 = length(Term),
+    [[{foo,bar},{99,1.0},[e,f,g]]] = lists:usort(Term),
+    {env,[{1,2,3}]} = erlang:fun_info(Fun, env),
     ok.
 
 collect_fun(0, _) ->
@@ -179,13 +155,13 @@ undefined_lambda(foobarblurf, Fun, Args) when is_function(Fun) ->
     Args.
 
 debug_breakpoint(Config) when is_list(Config) ->
-    ?line process_flag(error_handler, ?MODULE),
-    ?line erts_debug:breakpoint({?MODULE,foobar,5}, true),
-    ?line Term = break_collect(1024),
-    ?line Term = binary_to_term(term_to_binary(Term)),
-    ?line 1024 = length(Term),
-    ?line [[a,b,c,{d,e},[f,g,h]]] = lists:usort(Term),
-    ?line erts_debug:breakpoint({?MODULE,foobar,5}, false),
+    process_flag(error_handler, ?MODULE),
+    erts_debug:breakpoint({?MODULE,foobar,5}, true),
+    Term = break_collect(1024),
+    Term = binary_to_term(term_to_binary(Term)),
+    1024 = length(Term),
+    [[a,b,c,{d,e},[f,g,h]]] = lists:usort(Term),
+    erts_debug:breakpoint({?MODULE,foobar,5}, false),
     ok.
 
 break_collect(0) ->
@@ -202,5 +178,3 @@ foobar(_, _, _, _, _) ->
     exit(dont_execute_me).
 
 id(I) -> I.
-
-    
diff --git a/erts/emulator/test/num_bif_SUITE.erl b/erts/emulator/test/num_bif_SUITE.erl
index 90b6a36262..04a6f9d18d 100644
--- a/erts/emulator/test/num_bif_SUITE.erl
+++ b/erts/emulator/test/num_bif_SUITE.erl
@@ -1,8 +1,8 @@
 %%
 %% %CopyrightBegin%
-%% 
+%%
 %% Copyright Ericsson AB 1997-2014. 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
@@ -14,13 +14,13 @@
 %% 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%
 %%
 
 -module(num_bif_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Tests the BIFs:
 %% 	abs/1
@@ -36,22 +36,22 @@
 %%	integer_to_binary/2
 %%	binary_to_integer/1
 
--export([all/0, suite/0, groups/0, init_per_suite/1, end_per_suite/1, 
+-export([all/0, suite/0, groups/0, init_per_suite/1, end_per_suite/1,
 	 init_per_group/2, end_per_group/2, t_abs/1, t_float/1,
 	 t_float_to_string/1, t_integer_to_string/1,
-	 t_string_to_integer/1,
+	 t_string_to_integer/1, t_list_to_integer_edge_cases/1,
 	 t_string_to_float_safe/1, t_string_to_float_risky/1,
 	 t_round/1, t_trunc/1
      ]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
+all() ->
     [t_abs, t_float, t_float_to_string, t_integer_to_string,
      {group, t_string_to_float}, t_string_to_integer, t_round,
-     t_trunc].
+     t_trunc, t_list_to_integer_edge_cases].
 
-groups() -> 
+groups() ->
     [{t_string_to_float, [],
       [t_string_to_float_safe, t_string_to_float_risky]}].
 
@@ -73,7 +73,7 @@ t_abs(Config) when is_list(Config) ->
     5.5 = abs(id(5.5)),
     0.0 = abs(id(0.0)),
     100.0 = abs(id(-100.0)),
-    
+
     %% Integers.
     5 = abs(id(5)),
     0 = abs(id(0)),
@@ -93,7 +93,7 @@ t_abs(Config) when is_list(Config) ->
     BigNum = abs(BigNum),
     BigNum = abs(-BigNum),
     ok.
-    
+
 t_float(Config) when is_list(Config) ->
     0.0 = float(id(0)),
     2.5 = float(id(2.5)),
@@ -109,7 +109,7 @@ t_float(Config) when is_list(Config) ->
     %% Extremly big bignums.
     Big = id(list_to_integer(id(lists:duplicate(2000, $1)))),
     {'EXIT', {badarg, _}} = (catch float(Big)),
-    
+
     ok.
 
 
@@ -183,7 +183,7 @@ t_float_to_string(Config) when is_list(Config) ->
     test_fts("1.2300000000e+20",1.23e20, [{scientific, 10}, compact]),
     test_fts("1.23000000000000000000e+20",1.23e20, []),
     ok.
-    
+
 test_fts(Expect, Float) ->
     Expect = float_to_list(Float),
     BinExpect = list_to_binary(Expect),
@@ -255,7 +255,7 @@ t_round(Config) when is_list(Config) ->
     256 = round(id(255.6)),
     -1033 = round(id(-1033.3)),
     -1034 = round(id(-1033.6)),
-    
+
     % OTP-3722:
     X = id((1 bsl 27) - 1),
     MX = -X,
@@ -345,9 +345,9 @@ t_integer_to_string(Config) when is_list(Config) ->
 
     %% Invalid types
     lists:foreach(fun(Value) ->
-			  {'EXIT', {badarg, _}} = 
+			  {'EXIT', {badarg, _}} =
 			      (catch erlang:integer_to_binary(Value)),
-			  {'EXIT', {badarg, _}} = 
+			  {'EXIT', {badarg, _}} =
 			      (catch erlang:integer_to_list(Value))
 		  end,[atom,1.2,0.0,[$1,[$2]]]),
 
@@ -416,27 +416,27 @@ t_string_to_integer(Config) when is_list(Config) ->
 
     %% Invalid types
     lists:foreach(fun(Value) ->
-			  {'EXIT', {badarg, _}} = 
+			  {'EXIT', {badarg, _}} =
 			      (catch binary_to_integer(Value)),
-			  {'EXIT', {badarg, _}} = 
+			  {'EXIT', {badarg, _}} =
 			      (catch erlang:list_to_integer(Value))
 		  end,[atom,1.2,0.0,[$1,[$2]]]),
-    
+
     % Default base error cases
     lists:foreach(fun(Value) ->
-			  {'EXIT', {badarg, _}} = 
+			  {'EXIT', {badarg, _}} =
 			      (catch erlang:binary_to_integer(
 				       list_to_binary(Value))),
-			  {'EXIT', {badarg, _}} = 
+			  {'EXIT', {badarg, _}} =
 			      (catch erlang:list_to_integer(Value))
 		  end,["1.0"," 1"," -1","","+"]),
-    
+
     % Custom base error cases
     lists:foreach(fun({Value,Base}) ->
-			  {'EXIT', {badarg, _}} = 
+			  {'EXIT', {badarg, _}} =
 			      (catch binary_to_integer(
 				       list_to_binary(Value),Base)),
-			  {'EXIT', {badarg, _}} = 
+			  {'EXIT', {badarg, _}} =
 			      (catch erlang:list_to_integer(Value,Base))
 		  end,[{" 1",1},{" 1",37},{"2",2},{"C",11},
 		       {"1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111z",16},
@@ -449,10 +449,61 @@ t_string_to_integer(Config) when is_list(Config) ->
 
     ok.
 
+%% Tests edge cases for list_to_integer; compares with known good values
+
+t_list_to_integer_edge_cases(Config) when is_list(Config) ->
+    %% Take integer literals and compare to their representation in ExtTerm
+    T = [
+        {16, "0", <<131,97,0>>},
+        {16, "-0", <<131,97,0>>},
+
+        {16, "f", <<131,97,15>>},
+        {16, "-f", <<131,98,255,255,255,241>>},
+
+        {16, "0000000000000000000000000000000000000000000000000f",
+            <<131,97,15>>},
+        {16, "-0000000000000000000000000000000000000000000000000f",
+            <<131,98,255,255,255,241>>},
+
+        {16, "ffffffff", <<131,110,4,0,255,255,255,255>>},
+        {16, "-ffffffff", <<131,110,4,1,255,255,255,255>>},
+
+        {16, "7fffffff", <<131,110,4,0,255,255,255,127>>},
+        {16, "-7fffffff", <<131,98,128,0,0,1>>},
+
+        {16, "ffffffffffffffff",
+            <<131,110,8,0,255,255,255,255,255,255,255,255>>},
+        {16, "-ffffffffffffffff",
+            <<131,110,8,1,255,255,255,255,255,255,255,255>>},
+
+        {16, "7fffffffffffffff",
+            <<131,110,8,0,255,255,255,255,255,255,255,127>>},
+        {16, "-7fffffffffffffff",
+            <<131,110,8,1,255,255,255,255,255,255,255,127>>},
+
+        %% Alleged 32-bit corner case (should not happen on 64-bit). At 32-4
+        %% bits we may corrupt sign bit and fall out of SMALL_INT range.
+        {2, "1000000000000000000000000000", <<131,98,8,0,0,0>>},
+        {2, "-1000000000000000000000000000", <<131,98,248,0,0,0>>},
+
+        %% 64-bit corner case (should not happen on 32-bit) at 64-4 bits we
+        %% corrupt sign bit and fall out of SMALL_INT range (bam! all dead)
+        {2, "100000000000000000000000000000000000000000000000000000000000",
+            <<131,110,8,0,0,0,0,0,0,0,0,8>>},
+        {2, "-100000000000000000000000000000000000000000000000000000000000",
+            <<131,110,8,1,0,0,0,0,0,0,0,8>>}
+    ],
+    [begin
+         io:format("~s base ~p vs ~p~n", [Str, Base, Bin]),
+         FromStr = list_to_integer(Str, Base),
+         FromStr = binary_to_term(Bin)
+     end || {Base, Str, Bin} <- T],
+    ok.
+
 test_sti(Num) ->
     [begin
 	 io:format("Testing ~p:~p",[Num,Base]),
-	 test_sti(Num,Base) 
+	 test_sti(Num,Base)
      end|| Base <- lists:seq(2,36)].
 
 test_sti(Num,Base) ->
diff --git a/erts/emulator/test/old_mod.erl b/erts/emulator/test/old_mod.erl
index 1586a024d8..0da40ec430 100644
--- a/erts/emulator/test/old_mod.erl
+++ b/erts/emulator/test/old_mod.erl
@@ -23,26 +23,26 @@
 
 -export([sort_on_old_node/1, sorter/3]).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 sorter(Receiver, Ref, List) ->
     Receiver ! {Ref, lists:sort(List)}.
 
 sort_on_old_node(List) when is_list(List) ->
     OldVersion = "r10",
-    ?line Pa = filename:dirname(code:which(?MODULE)),
-    ?line {X, Y, Z} = now(),
-    ?line NodeName = list_to_atom(OldVersion 
-				  ++ "_"
-				  ++ integer_to_list(X)
-				  ++ integer_to_list(Y)
-				  ++ integer_to_list(Z)),
-    ?line {ok, Node} = ?t:start_node(NodeName,
-				     peer,
-				     [{args, " -pa " ++ Pa},
-				      {erl, [{release, OldVersion++"b_patched"}]}]),
-    ?line Ref = make_ref(),
-    ?line spawn_link(Node, ?MODULE, sorter, [self(), Ref, List]),
-    ?line SortedPids = receive {Ref, SP} -> SP end,
-    ?line true = ?t:stop_node(Node),
-    ?line SortedPids.
+    Pa = filename:dirname(code:which(?MODULE)),
+    {X, Y, Z} = now(),
+    NodeName = list_to_atom(OldVersion 
+                            ++ "_"
+                            ++ integer_to_list(X)
+                            ++ integer_to_list(Y)
+                            ++ integer_to_list(Z)),
+    {ok, Node} = test_server:start_node(NodeName,
+                                        peer,
+                                        [{args, " -pa " ++ Pa},
+                                         {erl, [{release, OldVersion++"b_patched"}]}]),
+    Ref = make_ref(),
+    spawn_link(Node, ?MODULE, sorter, [self(), Ref, List]),
+    SortedPids = receive {Ref, SP} -> SP end,
+    true = test_server:stop_node(Node),
+    SortedPids.
diff --git a/erts/emulator/test/old_scheduler_SUITE.erl b/erts/emulator/test/old_scheduler_SUITE.erl
index 97c99fe07b..9d40417d0a 100644
--- a/erts/emulator/test/old_scheduler_SUITE.erl
+++ b/erts/emulator/test/old_scheduler_SUITE.erl
@@ -20,43 +20,27 @@
 
 -module(old_scheduler_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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,
+         init_per_testcase/2, end_per_testcase/2]).
 -export([equal/1, many_low/1, few_low/1, max/1, high/1]).
 
--define(default_timeout, ?t:minutes(11)).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 11}}].
 
 all() -> 
     case catch erlang:system_info(modified_timing_level) of
-	Level when is_integer(Level) ->
-	    {skipped,
-	     "Modified timing (level " ++
-		 integer_to_list(Level) ++
-		 ") is enabled. Testcases gets messed "
-	     "up by modfied timing."};
-	_ -> [equal, many_low, few_low, max, high]
+        Level when is_integer(Level) ->
+            {skipped,
+             "Modified timing (level " ++
+             integer_to_list(Level) ++
+             ") is enabled. Testcases gets messed "
+             "up by modfied timing."};
+        _ -> [equal, many_low, few_low, max, high]
     end.
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 %%-----------------------------------------------------------------------------------
 %% TEST SUITE DESCRIPTION
@@ -78,35 +62,30 @@ end_per_group(_GroupName, Config) ->
 %%-----------------------------------------------------------------------------------
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = test_server:timetrap(?default_timeout),
     %% main test process needs max prio
-    ?line Prio = process_flag(priority, max),
-    ?line MS = erlang:system_flag(multi_scheduling, block),
-    [{prio,Prio},{watchdog,Dog},{multi_scheduling, MS}|Config].
+    Prio = process_flag(priority, max),
+    MS = erlang:system_flag(multi_scheduling, block),
+    [{prio,Prio},{multi_scheduling, MS}|Config].
 
 end_per_testcase(_Case, Config) ->
     erlang:system_flag(multi_scheduling, unblock),
-    Dog=?config(watchdog, Config),
-    Prio=?config(prio, Config),
+    Prio=proplists:get_value(prio, Config),
     process_flag(priority, Prio),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 ok(Config) when is_list(Config) ->
-    case ?config(multi_scheduling, Config) of
-	blocked ->
-	    {comment,
-	     "Multi-scheduling blocked during test. This testcase was not "
-	     "written to work with multiple schedulers."};
-	_ -> ok
+    case proplists:get_value(multi_scheduling, Config) of
+        blocked ->
+            {comment,
+             "Multi-scheduling blocked during test. This testcase was not "
+             "written to work with multiple schedulers."};
+        _ -> ok
     end.
 
 %% Run equal number of low and normal prio processes.
 
-equal(suite) -> [];
-equal(doc) -> [];
 equal(Config) when is_list(Config) ->
-    ?line Self = self(),
+    Self = self(),
 
     %% specify number of test processes to run
     Normal = {normal,500},
@@ -116,102 +95,96 @@ equal(Config) when is_list(Config) ->
     Time = 30,
 
     %% start controllers
-    ?line Receiver = 
-	spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, Normal, Low) end),
-    ?line Starter =
-	spawn(fun() -> starter(Normal, Low, Receiver) end),
+    Receiver = 
+    spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, Normal, Low) end),
+    Starter =
+    spawn(fun() -> starter(Normal, Low, Receiver) end),
 
     %% receive test data from Receiver
-    ?line {NRs,NAvg,LRs,LAvg,Ratio} = 
-	receive
-	    {Receiver,Res} -> Res
-	end,
+    {NRs,NAvg,LRs,LAvg,Ratio} = 
+    receive
+        {Receiver,Res} -> Res
+    end,
 
     %% stop controllers and test processes
-    ?line exit(Starter, kill),
-    ?line exit(Receiver, kill),
+    exit(Starter, kill),
+    exit(Receiver, kill),
 
     io:format("Reports: ~w normal (~w/proc), ~w low (~w/proc). Ratio: ~w~n", 
-	      [NRs,NAvg,LRs,LAvg,Ratio]),
+              [NRs,NAvg,LRs,LAvg,Ratio]),
 
     %% runtime ratio between normal and low should be ~8
     if Ratio < 7.5 ; Ratio > 8.5 ->	
-	    ?t:fail({bad_ratio,Ratio});
+           ct:fail({bad_ratio,Ratio});
        true ->
-	    ok(Config)
+           ok(Config)
     end.
 
 
 %% Run many low and few normal prio processes.
 
-many_low(suite) -> [];
-many_low(doc) -> [];
 many_low(Config) when is_list(Config) ->
-    ?line Self = self(),
+    Self = self(),
     Normal = {normal,1},
     Low    = {low,1000},
 
     %% specify time of test (in seconds)
     Time = 30,
 
-    ?line Receiver = 
-	spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, Normal, Low) end),
-    ?line Starter =
-	spawn(fun() -> starter(Normal, Low, Receiver) end),
-    ?line {NRs,NAvg,LRs,LAvg,Ratio} = 
-	receive
-	    {Receiver,Res} -> Res
-	end,
-    ?line exit(Starter, kill),
-    ?line exit(Receiver, kill),
+    Receiver = 
+    spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, Normal, Low) end),
+    Starter =
+    spawn(fun() -> starter(Normal, Low, Receiver) end),
+    {NRs,NAvg,LRs,LAvg,Ratio} = 
+    receive
+        {Receiver,Res} -> Res
+    end,
+    exit(Starter, kill),
+    exit(Receiver, kill),
     io:format("Reports: ~w normal (~w/proc), ~w low (~w/proc). Ratio: ~w~n", 
-	      [NRs,NAvg,LRs,LAvg,Ratio]),
+              [NRs,NAvg,LRs,LAvg,Ratio]),
     if Ratio < 7.5 ; Ratio > 8.5 ->
-	    ?t:fail({bad_ratio,Ratio});
+           ct:fail({bad_ratio,Ratio});
        true ->
-	    ok(Config)
+           ok(Config)
     end.
 
 
 %% Run few low and many normal prio processes.
 
-few_low(suite) -> [];
-few_low(doc) -> [];
 few_low(Config) when is_list(Config) ->
-    ?line Self = self(),
+    Self = self(),
     Normal = {normal,1000},
     Low    = {low,1},
 
     %% specify time of test (in seconds)
     Time = 30,
 
-    ?line Receiver = 
-	spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, Normal, Low) end),
-    ?line Starter =
-	spawn(fun() -> starter(Normal, Low, Receiver) end),
-    ?line {NRs,NAvg,LRs,LAvg,Ratio} = 
-	receive
-	    {Receiver,Res} -> Res
-	end,
-    ?line exit(Starter, kill),
-    ?line exit(Receiver, kill),
+    Receiver = 
+    spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, Normal, Low) end),
+    Starter =
+    spawn(fun() -> starter(Normal, Low, Receiver) end),
+    {NRs,NAvg,LRs,LAvg,Ratio} = 
+    receive
+        {Receiver,Res} -> Res
+    end,
+    exit(Starter, kill),
+    exit(Receiver, kill),
     io:format("Reports: ~w normal (~w/proc), ~w low (~w/proc). Ratio: ~w~n", 
-	      [NRs,NAvg,LRs,LAvg,Ratio]),
+              [NRs,NAvg,LRs,LAvg,Ratio]),
     if Ratio < 7.0 ; Ratio > 8.5 ->
-	    ?t:fail({bad_ratio,Ratio});
+           ct:fail({bad_ratio,Ratio});
        true ->
-	    ok(Config)
+           ok(Config)
     end.
 
 
 %% Run max prio processes and verify they get at least as much 
 %% runtime as high, normal and low.
 
-max(suite) -> [];
-max(doc) -> [];
 max(Config) when is_list(Config) ->
     max = process_flag(priority, max),		% should already be max (init_per_tc)
-    ?line Self = self(),
+    Self = self(),
     Max    = {max,2},
     High   = {high,2},
     Normal = {normal,100},
@@ -220,69 +193,67 @@ max(Config) when is_list(Config) ->
     %% specify time of test (in seconds)
     Time = 30,
 
-    ?line Receiver1 = 
-	spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, Max, High) end),
-    ?line Starter1 =
-	spawn(fun() -> starter(Max, High, Receiver1) end),
-    ?line {M1Rs,M1Avg,HRs,HAvg,Ratio1} = 
-	receive
-	    {Receiver1,Res1} -> Res1
-	end,
-    ?line exit(Starter1, kill),
-    ?line exit(Receiver1, kill),
+    Receiver1 = 
+    spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, Max, High) end),
+    Starter1 =
+    spawn(fun() -> starter(Max, High, Receiver1) end),
+    {M1Rs,M1Avg,HRs,HAvg,Ratio1} = 
+    receive
+        {Receiver1,Res1} -> Res1
+    end,
+    exit(Starter1, kill),
+    exit(Receiver1, kill),
     io:format("Reports: ~w max (~w/proc), ~w high (~w/proc). Ratio: ~w~n", 
-	      [M1Rs,M1Avg,HRs,HAvg,Ratio1]),
+              [M1Rs,M1Avg,HRs,HAvg,Ratio1]),
     if Ratio1 < 1.0 ->
-	    ?t:fail({bad_ratio,Ratio1});
+           ct:fail({bad_ratio,Ratio1});
        true ->
-	    ok(Config)
+           ok(Config)
     end,
 
-    ?line Receiver2 = 
-	spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, Max, Normal) end),
-    ?line Starter2 =
-	spawn(fun() -> starter(Max, Normal, Receiver2) end),
-    ?line {M2Rs,M2Avg,NRs,NAvg,Ratio2} = 
-	receive
-	    {Receiver2,Res2} -> Res2
-	end,
-    ?line exit(Starter2, kill),
-    ?line exit(Receiver2, kill),
+    Receiver2 = 
+    spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, Max, Normal) end),
+    Starter2 =
+    spawn(fun() -> starter(Max, Normal, Receiver2) end),
+    {M2Rs,M2Avg,NRs,NAvg,Ratio2} = 
+    receive
+        {Receiver2,Res2} -> Res2
+    end,
+    exit(Starter2, kill),
+    exit(Receiver2, kill),
     io:format("Reports: ~w max (~w/proc), ~w normal (~w/proc). Ratio: ~w~n", 
-	      [M2Rs,M2Avg,NRs,NAvg,Ratio2]),
+              [M2Rs,M2Avg,NRs,NAvg,Ratio2]),
     if Ratio2 < 1.0 ->
-	    ?t:fail({bad_ratio,Ratio2});
+           ct:fail({bad_ratio,Ratio2});
        true ->
-	    ok
+           ok
     end,
 
-    ?line Receiver3 = 
-	spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, Max, Low) end),
-    ?line Starter3 =
-	spawn(fun() -> starter(Max, Low, Receiver3) end),
-    ?line {M3Rs,M3Avg,LRs,LAvg,Ratio3} = 
-	receive
-	    {Receiver3,Res3} -> Res3
-	end,
-    ?line exit(Starter3, kill),
-    ?line exit(Receiver3, kill),
+    Receiver3 = 
+    spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, Max, Low) end),
+    Starter3 =
+    spawn(fun() -> starter(Max, Low, Receiver3) end),
+    {M3Rs,M3Avg,LRs,LAvg,Ratio3} = 
+    receive
+        {Receiver3,Res3} -> Res3
+    end,
+    exit(Starter3, kill),
+    exit(Receiver3, kill),
     io:format("Reports: ~w max (~w/proc), ~w low (~w/proc). Ratio: ~w~n", 
-	      [M3Rs,M3Avg,LRs,LAvg,Ratio3]),
+              [M3Rs,M3Avg,LRs,LAvg,Ratio3]),
     if Ratio3 < 1.0 ->
-	    ?t:fail({bad_ratio,Ratio3});
+           ct:fail({bad_ratio,Ratio3});
        true ->
-	    ok(Config)
+           ok(Config)
     end.
 
 
 %% Run high prio processes and verify they get at least as much 
 %% runtime as normal and low.
 
-high(suite) -> [];
-high(doc) -> [];
 high(Config) when is_list(Config) ->
     max = process_flag(priority, max),		% should already be max (init_per_tc)
-    ?line Self = self(),
+    Self = self(),
     High   = {high,2},
     Normal = {normal,100},
     Low    = {low,100},
@@ -290,40 +261,40 @@ high(Config) when is_list(Config) ->
     %% specify time of test (in seconds)
     Time = 30,
 
-    ?line Receiver1 = 
-	spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, High, Normal) end),
-    ?line Starter1 =
-	spawn(fun() -> starter(High, Normal, Receiver1) end),
-    ?line {H1Rs,H1Avg,NRs,NAvg,Ratio1} = 
-	receive
-	    {Receiver1,Res1} -> Res1
-	end,
-    ?line exit(Starter1, kill),
-    ?line exit(Receiver1, kill),
+    Receiver1 = 
+    spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, High, Normal) end),
+    Starter1 =
+    spawn(fun() -> starter(High, Normal, Receiver1) end),
+    {H1Rs,H1Avg,NRs,NAvg,Ratio1} = 
+    receive
+        {Receiver1,Res1} -> Res1
+    end,
+    exit(Starter1, kill),
+    exit(Receiver1, kill),
     io:format("Reports: ~w high (~w/proc), ~w normal (~w/proc). Ratio: ~w~n", 
-	      [H1Rs,H1Avg,NRs,NAvg,Ratio1]),
+              [H1Rs,H1Avg,NRs,NAvg,Ratio1]),
     if Ratio1 < 1.0 ->
-	    ?t:fail({bad_ratio,Ratio1});
+           ct:fail({bad_ratio,Ratio1});
        true ->
-	    ok
+           ok
     end,
 
-    ?line Receiver2 = 
-	spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, High, Low) end),
-    ?line Starter2 =
-	spawn(fun() -> starter(High, Low, Receiver2) end),
-    ?line {H2Rs,H2Avg,LRs,LAvg,Ratio2} = 
-	receive
-	    {Receiver2,Res2} -> Res2
-	end,
-    ?line exit(Starter2, kill),
-    ?line exit(Receiver2, kill),
+    Receiver2 = 
+    spawn(fun() -> receiver(erlang:monotonic_time(), Time, Self, High, Low) end),
+    Starter2 =
+    spawn(fun() -> starter(High, Low, Receiver2) end),
+    {H2Rs,H2Avg,LRs,LAvg,Ratio2} = 
+    receive
+        {Receiver2,Res2} -> Res2
+    end,
+    exit(Starter2, kill),
+    exit(Receiver2, kill),
     io:format("Reports: ~w high (~w/proc), ~w low (~w/proc). Ratio: ~w~n", 
-	      [H2Rs,H2Avg,LRs,LAvg,Ratio2]),
+              [H2Rs,H2Avg,LRs,LAvg,Ratio2]),
     if Ratio2 < 1.0 ->
-	    ?t:fail({bad_ratio,Ratio2});
+           ct:fail({bad_ratio,Ratio2});
        true ->
-	    ok(Config)
+           ok(Config)
     end.
 
 
@@ -338,38 +309,38 @@ receiver(T0, TimeSec, Main, {P1,P1N}, {P2,P2N}) ->
 
 %% uncomment lines below to get life sign (debug)
 receiver(T0, Time, Main, P1,P1N,P1Rs, P2,P2N,P2Rs, 0) ->
-%    T = erlang:convert_time_unit(erlang:monotonic_time() - T0, native, milli_seconds),
-%    erlang:display({round(T/1000),P1Rs,P2Rs}),
+    %    T = erlang:convert_time_unit(erlang:monotonic_time() - T0, native, milli_seconds),
+    %    erlang:display({round(T/1000),P1Rs,P2Rs}),
     receiver(T0, Time, Main, P1,P1N,P1Rs, P2,P2N,P2Rs, 100000);
 
 receiver(T0, Time, Main, P1,P1N,P1Rs, P2,P2N,P2Rs, C) ->
     Remain = Time - erlang:convert_time_unit(erlang:monotonic_time() - T0,
-					     native, milli_seconds), % test time remaining
+                                             native, milli_seconds), % test time remaining
     Remain1 = if Remain < 0 ->
-		      0;
-		 true ->
-		      Remain
-	      end,
+                     0;
+                 true ->
+                     Remain
+              end,
     {P1Rs1,P2Rs1} = 
-	receive
-	    {_Pid,P1} ->			% report from a P1 process
-		{P1Rs+1,P2Rs};
-	    {_Pid,P2} ->			% report from a P2 process
-		{P1Rs,P2Rs+1}
-	after Remain1 ->
-		{P1Rs,P2Rs}
-	end,
+    receive
+        {_Pid,P1} ->			% report from a P1 process
+            {P1Rs+1,P2Rs};
+        {_Pid,P2} ->			% report from a P2 process
+            {P1Rs,P2Rs+1}
+    after Remain1 ->
+              {P1Rs,P2Rs}
+    end,
     if Remain > 0 ->				% keep going
-	    receiver(T0, Time, Main, P1,P1N,P1Rs1, P2,P2N,P2Rs1, C-1);
+           receiver(T0, Time, Main, P1,P1N,P1Rs1, P2,P2N,P2Rs1, C-1);
        true ->					% finish
-	    %% calculate results and send to main test process
-	    P1Avg = P1Rs1/P1N,
-	    P2Avg = P2Rs1/P2N,
-	    Ratio = if P2Avg < 1.0 -> P1Avg;
-		       true -> P1Avg/P2Avg
-		    end,
-	    Main ! {self(),{P1Rs1,round(P1Avg),P2Rs1,round(P2Avg),Ratio}},
-	    flush_loop()
+           %% calculate results and send to main test process
+           P1Avg = P1Rs1/P1N,
+           P2Avg = P2Rs1/P2N,
+           Ratio = if P2Avg < 1.0 -> P1Avg;
+                      true -> P1Avg/P2Avg
+                   end,
+           Main ! {self(),{P1Rs1,round(P1Avg),P2Rs1,round(P2Avg),Ratio}},
+           flush_loop()
     end.
 
 starter({P1,P1N}, {P2,P2N}, Receiver) ->
@@ -395,8 +366,8 @@ p_loop(100, Prio, Receiver) ->
     receive after 0 -> ok end,
     %% if Receiver gone, we're done
     case is_process_alive(Receiver) of
-	false -> exit(bye);
-	true -> ok
+        false -> exit(bye);
+        true -> ok
     end,
     %% send report
     Receiver ! {self(),Prio},
@@ -404,10 +375,10 @@ p_loop(100, Prio, Receiver) ->
 
 p_loop(N, Prio, Receiver) ->
     p_loop(N+1, Prio, Receiver).
-    		       
+
 
 flush_loop() ->
     receive _ ->
-	    ok
+                ok
     end,
     flush_loop().
diff --git a/erts/emulator/test/op_SUITE.erl b/erts/emulator/test/op_SUITE.erl
index 6eda78a57b..cb683b9cbf 100644
--- a/erts/emulator/test/op_SUITE.erl
+++ b/erts/emulator/test/op_SUITE.erl
@@ -20,68 +20,51 @@
 
 -module(op_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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,
-	 bsl_bsr/1,logical/1,t_not/1,relop_simple/1,relop/1,complex_relop/1]).
+-export([all/0, suite/0,
+         bsl_bsr/1,logical/1,t_not/1,relop_simple/1,relop/1,complex_relop/1]).
 
 -export([]).
 -import(lists, [foldl/3,flatmap/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 5}}].
 
 all() -> 
     [bsl_bsr, logical, t_not, relop_simple, relop,
      complex_relop].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(3)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
 %% Test the bsl and bsr operators.
 bsl_bsr(Config) when is_list(Config) ->
     Vs = [unvalue(V) || V <- [-16#8000009-2,-1,0,1,2,73,16#8000000,bad,[]]],
-    Cases = [{Op,X,Y} || Op <- ['bsr','bsl'], X <- Vs, Y <- Vs],
-    ?line run_test_module(Cases, false),
-    {comment,integer_to_list(length(Cases)) ++ " cases"}.
+    %% Try to use less memory by splitting the cases
+
+    Cases1 = [{Op,X,Y} || Op <- ['bsl'], X <- Vs, Y <- Vs],
+    N1 = length(Cases1),
+    run_test_module(Cases1, false),
 
-logical(doc) -> "Test the logical operators and internal BIFs.";
+    Cases2 = [{Op,X,Y} || Op <- ['bsr'], X <- Vs, Y <- Vs],
+    N2 = length(Cases2),
+    run_test_module(Cases2, false),
+    {comment,integer_to_list(N1 + N2) ++ " cases"}.
+
+%% Test the logical operators and internal BIFs.
 logical(Config) when is_list(Config) ->
     Vs0 = [true,false,bad],
     Vs = [unvalue(V) || V <- Vs0],
     Cases = [{Op,X,Y} || Op <- ['and','or','xor'], X <- Vs, Y <- Vs],
-    ?line run_test_module(Cases, false),
+    run_test_module(Cases, false),
     {comment,integer_to_list(length(Cases)) ++ " cases"}.
 
-t_not(doc) -> "Test the not operator and internal BIFs.";
+%% Test the not operator and internal BIFs.
 t_not(Config) when is_list(Config) ->
-    ?line Cases = [{'not',unvalue(V)} || V <- [true,false,42,bad]],
-    ?line run_test_module(Cases, false),
+    Cases = [{'not',unvalue(V)} || V <- [true,false,42,bad]],
+    run_test_module(Cases, false),
     {comment,integer_to_list(length(Cases)) ++ " cases"}.
 
-relop_simple(doc) -> "Test that simlpe relations between relation operators hold.";
+%% Test that simlpe relations between relation operators hold.
 relop_simple(Config) when is_list(Config) ->
     Big1 = 19738924729729787487784874,
     Big2 = 38374938373887374983978484,
@@ -90,51 +73,52 @@ relop_simple(Config) when is_list(Config) ->
     T1 = erlang:make_tuple(3,87),
     T2 = erlang:make_tuple(3,87),
     Terms = [-F2,Big2,-F1,-Big1,-33,-33.0,0,0.0,42,42.0,Big1,F1,Big2,F2,a,b,
-	     {T1,a},{T2,b},[T1,Big1],[T2,Big2]],
-    
-    ?line Combos = [{V1,V2} || V1 <- Terms, V2 <- Terms],
-    
+             {T1,a},{T2,b},[T1,Big1],[T2,Big2]],
+
+    Combos = [{V1,V2} || V1 <- Terms, V2 <- Terms],
+
     lists:foreach(fun({A,B}) -> relop_simple_do(A,B) end,
-		  Combos),
-
-    repeat(fun() -> Size = random:uniform(100),
-		    Rnd1 = make_rand_term(Size),
-		    {Rnd2,0} = clone_and_mutate(Rnd1, random:uniform(Size)),
-		    relop_simple_do(Rnd1,Rnd2)
-	   end,
-	   1000),
+                  Combos),
+
+    repeat(fun() ->
+                   Size = rand:uniform(100),
+                   Rnd1 = make_rand_term(Size),
+                   {Rnd2,0} = clone_and_mutate(Rnd1, rand:uniform(Size)),
+                   relop_simple_do(Rnd1,Rnd2)
+           end,
+           1000),
     ok.
 
 relop_simple_do(V1,V2) ->
     %%io:format("compare ~p\n   and  ~p\n",[V1,V2]),
 
     L = V1 < V2,
-    ?line L = not (V1 >= V2),
-    ?line L = V2 > V1,
-    ?line L = not (V2 =< V1),
+    L = not (V1 >= V2),
+    L = V2 > V1,
+    L = not (V2 =< V1),
 
     G = V1 > V2,
-    ?line G = not (V1 =< V2),
-    ?line G = V2 < V1,
-    ?line G = not (V2 >= V1),
-    
+    G = not (V1 =< V2),
+    G = V2 < V1,
+    G = not (V2 >= V1),
+
     ID = V1 =:= V2,
-    ?line ID = V2 =:= V1,
-    ?line ID = not (V1 =/= V2),
-    ?line ID = not (V2 =/= V1),
-    
+    ID = V2 =:= V1,
+    ID = not (V1 =/= V2),
+    ID = not (V2 =/= V1),
+
     EQ = V1 == V2,
-    ?line EQ = V2 == V1,
-    ?line EQ = not (V1 /= V2),
-    ?line EQ = not (V2 /= V1),
-
-    ?line case {L, EQ, ID, G, cmp_emu(V1,V2)} of
-	      { true, false, false, false, -1} -> ok;
-	      {false, true,  false, false,  0} -> ok;
-	      {false, true,   true, false,  0} -> ok;
-	      {false, false, false, true,  +1} -> ok
-	  end.
-    
+    EQ = V2 == V1,
+    EQ = not (V1 /= V2),
+    EQ = not (V2 /= V1),
+
+    case {L, EQ, ID, G, cmp_emu(V1,V2)} of
+        { true, false, false, false, -1} -> ok;
+        {false, true,  false, false,  0} -> ok;
+        {false, true,   true, false,  0} -> ok;
+        {false, false, false, true,  +1} -> ok
+    end.
+
 %% Emulate internal "cmp"
 cmp_emu(A,B) when is_tuple(A), is_tuple(B) ->
     SA = size(A),
@@ -145,8 +129,8 @@ cmp_emu(A,B) when is_tuple(A), is_tuple(B) ->
     end;
 cmp_emu([A|TA],[B|TB]) ->
     case cmp_emu(A,B) of
-	0   -> cmp_emu(TA,TB);
-	CMP -> CMP
+        0   -> cmp_emu(TA,TB);
+        CMP -> CMP
     end;
 cmp_emu(A,B) ->
     %% We cheat and use real "cmp" for the primitive types.
@@ -154,48 +138,48 @@ cmp_emu(A,B) ->
        A > B -> +1;
        true -> 0
     end.					              
-    
+
 make_rand_term(1) ->
     make_rand_term_single();
 make_rand_term(Arity) ->
-    case random:uniform(3) of
-	1 ->
-	    make_rand_list(Arity);
-	2 ->
-	    list_to_tuple(make_rand_list(Arity));
-	3 ->
-	    {Car,Rest} = make_rand_term_rand_size(Arity),
-	    [Car|make_rand_term(Rest)]
+    case rand:uniform(3) of
+        1 ->
+            make_rand_list(Arity);
+        2 ->
+            list_to_tuple(make_rand_list(Arity));
+        3 ->
+            {Car,Rest} = make_rand_term_rand_size(Arity),
+            [Car|make_rand_term(Rest)]
     end.
 
 make_rand_term_single() ->
-    Range = 1 bsl random:uniform(200),
-    case random:uniform(12) of
-	1 -> random;
-	2 -> uniform;
-	3 -> random:uniform(Range) - (Range div 2);
-	4 -> Range * (random:uniform() - 0.5);
-	5 -> 0;
-	6 -> 0.0;
-	7 -> make_ref();
-	8 -> self();
-	9 -> term_to_binary(random:uniform(Range));
-	10 -> fun(X) -> X*Range end; 
-	11 -> fun(X) -> X/Range end;
-	12 -> []
+    Range = 1 bsl rand:uniform(200),
+    case rand:uniform(12) of
+        1 -> random;
+        2 -> uniform;
+        3 -> rand:uniform(Range) - (Range div 2);
+        4 -> Range * (rand:uniform() - 0.5);
+        5 -> 0;
+        6 -> 0.0;
+        7 -> make_ref();
+        8 -> self();
+        9 -> term_to_binary(rand:uniform(Range));
+        10 -> fun(X) -> X*Range end; 
+        11 -> fun(X) -> X/Range end;
+        12 -> []
     end.	    
 
 make_rand_term_rand_size(1) ->
     {make_rand_term(1), 0};
 make_rand_term_rand_size(MaxArity) ->
-    Arity = random:uniform(MaxArity-1),
+    Arity = rand:uniform(MaxArity-1),
     {make_rand_term(Arity), MaxArity-Arity}.
 
 make_rand_list(0) -> [];
 make_rand_list(Arity) ->
     {Term, Rest} = make_rand_term_rand_size(Arity),
     [Term | make_rand_list(Rest)].
-	    
+
 
 clone_and_mutate(Term, 0) ->
     {clone(Term), 0};
@@ -218,82 +202,81 @@ clone(Term) ->
 my_list_to_tuple(List) ->
     try list_to_tuple(List)
     catch
-	error:badarg -> 
-	    %%io:format("my_list_to_tuple got badarg exception.\n"),
-	    list_to_tuple(purify_list(List))
+        error:badarg -> 
+            %%io:format("my_list_to_tuple got badarg exception.\n"),
+            list_to_tuple(purify_list(List))
     end.
-	
+
 purify_list(List) ->
     lists:reverse(purify_list(List, [])).
 purify_list([], Acc) -> Acc;
 purify_list([H|T], Acc) -> purify_list(T, [H|Acc]);
 purify_list(Other, Acc) -> [Other|Acc].
-    
 
-relop(doc) -> "Test the relational operators and internal BIFs on literals.";
+
+%% Test the relational operators and internal BIFs on literals.
 relop(Config) when is_list(Config) ->
     Big1 = -38374938373887374983978484,
     Big2 = 19738924729729787487784874,
     F1 = float(Big1),
     F2 = float(Big2),
     Vs0 = [a,b,-33,-33.0,0,0.0,42,42.0,Big1,Big2,F1,F2],
-    ?line Vs = [unvalue(V) || V <- Vs0],
+    Vs = [unvalue(V) || V <- Vs0],
     Ops = ['==', '/=', '=:=', '=/=', '<', '=<', '>', '>='],
-    ?line binop(Ops, Vs).
+    binop(Ops, Vs).
 
-complex_relop(doc) ->
-    "Test the relational operators and internal BIFs on lists and tuples.";
+%% Test the relational operators and internal BIFs on lists and tuples.
 complex_relop(Config) when is_list(Config) ->
     Big = 99678557475484872464269855544643333,
     Float = float(Big),
     Vs0 = [an_atom,42.0,42,Big,Float],
     Vs = flatmap(fun(X) -> [unvalue({X}),unvalue([X])] end, Vs0),
     Ops = ['==', '/=', '=:=', '=/=', '<', '=<', '>', '>='],
-    ?line binop(Ops, Vs).
+    binop(Ops, Vs).
 
 binop(Ops, Vs) ->
-    Run = fun(Op, N) -> ?line Cases = [{Op,V1,V2} || V1 <- Vs, V2 <- Vs],
-			?line run_test_module(Cases, true),
-			N + length(Cases) end,
-    ?line NumCases = foldl(Run, 0, Ops),
+    Run = fun(Op, N) -> Cases = [{Op,V1,V2} || V1 <- Vs, V2 <- Vs],
+                        run_test_module(Cases, true),
+                        N + length(Cases) end,
+    NumCases = foldl(Run, 0, Ops),
     {comment,integer_to_list(NumCases) ++ " cases"}.
-    
+
 run_test_module(Cases, GuardsOk) ->
-    ?line Es = [expr(C) || C <- Cases],
-    ?line Ok = unvalue(ok),
-    ?line Gts = case GuardsOk of
-		    true ->
-			Ges = [guard_expr(C) || C <- Cases],
-			?line lists:foldr(fun guard_test/2, [Ok], Ges);
-		    false ->
-			[Ok]
-		end,
-    ?line Fun1 = make_function(guard_tests, Gts),
-    ?line Bts = lists:foldr(fun body_test/2, [Ok], Es),
-    ?line Fun2 = make_function(body_tests, Bts),
-    ?line Bbts = lists:foldr(fun internal_bif/2, [Ok], Es),
-    ?line Fun3 = make_function(bif_tests, Bbts),
-    ?line Id = {function,1,id,1,[{clause,1,[{var,1,'I'}],[],[{var,1,'I'}]}]},
+    Es = [expr(C) || C <- Cases],
+    Ok = unvalue(ok),
+    Gts = case GuardsOk of
+              true ->
+                  Ges = [guard_expr(C) || C <- Cases],
+                  lists:foldr(fun guard_test/2, [Ok], Ges);
+              false ->
+                  [Ok]
+          end,
+    Fun1 = make_function(guard_tests, Gts),
+    Bts = lists:foldr(fun body_test/2, [Ok], Es),
+    Fun2 = make_function(body_tests, Bts),
+    Bbts = lists:foldr(fun internal_bif/2, [Ok], Es),
+    Fun3 = make_function(bif_tests, Bbts),
+    Id = {function,1,id,1,[{clause,1,[{var,1,'I'}],[],[{var,1,'I'}]}]},
     Module0 = make_module(op_tests, [Fun1,Fun2,Fun3,Id]),
     Module = erl_parse:new_anno(Module0),
-    ?line lists:foreach(fun(F) -> io:put_chars([erl_pp:form(F),"\n"]) end, Module),
+    lists:foreach(fun(F) -> io:put_chars([erl_pp:form(F),"\n"]) end, Module),
 
     %% Compile, load, and run the generated module.
 
-    Native = case ?t:is_native(?MODULE) of
-		 true -> [native];
-		 false -> []
-	     end,
-    ?line {ok,Mod,Code1} = compile:forms(Module, [time|Native]),
-    ?line code:delete(Mod),
-    ?line code:purge(Mod),
-    ?line {module,Mod} = code:load_binary(Mod, Mod, Code1),
-    ?line run_function(Mod, guard_tests),
-    ?line run_function(Mod, body_tests),
-    ?line run_function(Mod, bif_tests),
-
-    ?line true = code:delete(Mod),
-    ?line code:purge(Mod),
+    Native = case test_server:is_native(?MODULE) of
+                 true -> [native];
+                 false -> []
+             end,
+    {ok,Mod,Code1} = compile:forms(Module, [time|Native]),
+    code:delete(Mod),
+    code:purge(Mod),
+    {module,Mod} = code:load_binary(Mod, Mod, Code1),
+    run_function(Mod, guard_tests),
+    run_function(Mod, body_tests),
+    run_function(Mod, bif_tests),
+
+    true = code:delete(Mod),
+    code:purge(Mod),
 
     ok.
 
@@ -317,19 +300,19 @@ guard_expr({Op,X,Y}) ->
 
 run_function(Mod, Name) ->
     case catch Mod:Name() of
-	{'EXIT',Reason} ->
-	    io:format("~p", [get(last)]),
-	    ?t:fail({'EXIT',Reason});
-	_Other ->
-	    ok
+        {'EXIT',Reason} ->
+            io:format("~p", [get(last)]),
+            ct:fail({'EXIT',Reason});
+        _Other ->
+            ok
     end.
-    
+
 guard_test({E,Expr,Res}, Tail) ->
     True = unvalue(true),
     [save_term(Expr),
      {match,1,unvalue(Res),
       {'if',1,[{clause,1,[],[[E]],[True]},
-	       {clause,1,[],[[True]],[unvalue(false)]}]}}|Tail].
+               {clause,1,[],[[True]],[unvalue(false)]}]}}|Tail].
 
 body_test({E,Expr,{'EXIT',_}}, Tail) ->
     [save_term(Expr),
@@ -355,8 +338,8 @@ internal_bif(Op, Args, Expr, Res, Tail) ->
 
 save_term(Term) ->
     {call,1,
-       {atom,1,put},
-       [{atom,1,last},unvalue(Term)]}.
+     {atom,1,put},
+     [{atom,1,last},unvalue(Term)]}.
 
 make_module(Name, Funcs) ->
     [{attribute,1,module,Name},
@@ -366,18 +349,18 @@ make_module(Name, Funcs) ->
 
 make_function(Name, Body) ->
     {function,1,Name,0,[{clause,1,[],[],Body}]}.
-       
+
 eval(E0) ->
     E = erl_parse:new_anno(E0),
-    ?line case catch erl_eval:exprs(E, []) of
-	      {'EXIT',Reason} -> {'EXIT',Reason};
-	      {value,Val,_Bs} -> Val
-	  end.
+    case catch erl_eval:exprs(E, []) of
+        {'EXIT',Reason} -> {'EXIT',Reason};
+        {value,Val,_Bs} -> Val
+    end.
 
 unvalue(V) ->
     Abstr = erl_parse:abstract(V),
     erl_parse:anno_to_term(Abstr).
-    
+
 value({nil,_}) -> [];
 value({integer,_,X}) -> X;
 value({string,_,X}) -> X;
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index 3d0509a28c..cfbc664b56 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -74,25 +74,26 @@
 %%
 
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 init_per_testcase/2, end_per_testcase/2,
-	 init_per_suite/1, end_per_suite/1,
-	 stream_small/1, stream_big/1,
-	 basic_ping/1, slow_writes/1, bad_packet/1, bad_port_messages/1,
-	 mul_basic/1, mul_slow_writes/1,
-	 dying_port/1, port_program_with_path/1,
-	 open_input_file_port/1, open_output_file_port/1,
-	 iter_max_ports/1, eof/1, input_only/1, output_only/1,
-	 name1/1,
-	 t_binary/1, parallell/1, t_exit/1,
-	 env/1, bad_env/1, cd/1, exit_status/1,
-	 tps_16_bytes/1, tps_1K/1, line/1, stderr_to_stdout/1,
-	 otp_3906/1, otp_4389/1, win_massive/1, win_massive_client/1,
-	 mix_up_ports/1, otp_5112/1, otp_5119/1, otp_6224/1,
-	 exit_status_multi_scheduling_block/1, ports/1,
-	 spawn_driver/1, spawn_executable/1, close_deaf_port/1,
-	 port_setget_data/1,
-	 unregister_name/1, parallelism_option/1]).
+-export([all/0, suite/0, groups/0,
+         init_per_testcase/2, end_per_testcase/2,
+         init_per_suite/1, end_per_suite/1,
+         stream_small/1, stream_big/1,
+         basic_ping/1, slow_writes/1, bad_packet/1, bad_port_messages/1,
+         mul_basic/1, mul_slow_writes/1,
+         dying_port/1, port_program_with_path/1,
+         open_input_file_port/1, open_output_file_port/1,
+         count_fds/1,
+         iter_max_ports/1, eof/1, input_only/1, output_only/1,
+         name1/1,
+         t_binary/1, parallell/1, t_exit/1,
+         env/1, huge_env/1, bad_env/1, cd/1, exit_status/1,
+         tps_16_bytes/1, tps_1K/1, line/1, stderr_to_stdout/1,
+         otp_3906/1, otp_4389/1, win_massive/1, win_massive_client/1,
+         mix_up_ports/1, otp_5112/1, otp_5119/1, otp_6224/1,
+         exit_status_multi_scheduling_block/1, ports/1,
+         spawn_driver/1, spawn_executable/1, close_deaf_port/1,
+         port_setget_data/1,
+         unregister_name/1, parallelism_option/1]).
 
 -export([do_iter_max_ports/2]).
 
@@ -101,18 +102,20 @@
 -export([otp_3906_forker/5, otp_3906_start_forker_starter/4]).
 -export([env_slave_main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 10}}].
 
 all() -> 
     [otp_6224, {group, stream}, basic_ping, slow_writes,
      bad_packet, bad_port_messages, {group, options},
      {group, multiple_packets}, parallell, dying_port,
      port_program_with_path, open_input_file_port,
-     open_output_file_port, name1, env, bad_env, cd,
-     exit_status, iter_max_ports, t_exit, {group, tps}, line,
+     open_output_file_port, name1, env, huge_env, bad_env, cd,
+     exit_status, iter_max_ports, count_fds, t_exit, {group, tps}, line,
      stderr_to_stdout, otp_3906, otp_4389, win_massive,
      mix_up_ports, otp_5112, otp_5119,
      exit_status_multi_scheduling_block, ports, spawn_driver,
@@ -126,15 +129,6 @@ groups() ->
      {multiple_packets, [], [mul_basic, mul_slow_writes]},
      {tps, [], [tps_16_bytes, tps_1K]}].
 
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
--define(DEFAULT_TIMEOUT, ?t:minutes(5)).
-
 init_per_testcase(Case, Config) ->
     [{testcase, Case} |Config].
 
@@ -154,69 +148,63 @@ end_per_suite(Config) when is_list(Config) ->
 %% on a Windows machine given the correct environment.
 win_massive(Config) when is_list(Config) ->
     case os:type() of
-	{win32,_} ->
-	    do_win_massive();
-	_ ->
-	    {skip,"Only on Windows."}
+        {win32,_} ->
+            do_win_massive();
+        _ ->
+            {skip,"Only on Windows."}
     end.
 
 do_win_massive() ->
-    Dog = test_server:timetrap(test_server:seconds(360)),
+    ct:timetrap({minutes, 6}),
     SuiteDir = filename:dirname(code:which(?MODULE)),
     Ports = " +Q 8192",
     {ok, Node} = 
-	test_server:start_node(win_massive,
-			       slave,
-			       [{args, " -pa " ++ SuiteDir ++ Ports}]),
+    test_server:start_node(win_massive,
+                           slave,
+                           [{args, " -pa " ++ SuiteDir ++ Ports}]),
     ok = rpc:call(Node,?MODULE,win_massive_client,[3000]),
     test_server:stop_node(Node),
-    test_server:timetrap_cancel(Dog),
     ok.
-    
+
 win_massive_client(N) ->
     {ok,P}=gen_tcp:listen(?WIN_MASSIVE_PORT,[{reuseaddr,true}]), 
     L = win_massive_loop(P,N),
     Len = length(L),
     lists:foreach(fun(E) ->
-			  gen_tcp:close(E)
-		  end,
-		  L),
+                          gen_tcp:close(E)
+                  end,
+                  L),
     case Len div 2 of
-	N ->
-	    ok;
-	_Else ->
-	    {too_few, Len}
+        N ->
+            ok;
+        _Else ->
+            {too_few, Len}
     end.
 
 win_massive_loop(_,0) ->
     [];
 win_massive_loop(P,N) ->
     case (catch gen_tcp:connect("localhost",?WIN_MASSIVE_PORT,[])) of
-	{ok,A} ->
-	    case (catch gen_tcp:accept(P)) of
-		{ok,B} ->
-		    %erlang:display(N),
-		    [A,B|win_massive_loop(P,N-1)];
-		_Else ->
-		    [A]
-	    end;
-	_Else0 ->
-	    []
+        {ok,A} ->
+            case (catch gen_tcp:accept(P)) of
+                {ok,B} ->
+                    %erlang:display(N),
+                    [A,B|win_massive_loop(P,N-1)];
+                _Else ->
+                    [A]
+            end;
+        _Else0 ->
+            []
     end.
-	    
-    
-
 
 
 %% Test that we can send a stream of bytes and get it back.
 %% We will send only a small amount of data, to avoid deadlock.
 
 stream_small(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
     stream_ping(Config, 512, "", []),
     stream_ping(Config, 1777, "", []),
     stream_ping(Config, 1777, "-s512", []),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Send big amounts of data (much bigger than the buffer size in port test).
@@ -224,22 +212,20 @@ stream_small(Config) when is_list(Config) ->
 %% non-blocking reads and writes.
 
 stream_big(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(180)),
+    ct:timetrap({seconds, 180}),
     stream_ping(Config, 43755, "", []),
     stream_ping(Config, 100000, "", []),
     stream_ping(Config, 77777, " -s40000", []),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Sends packet with header size of 1, 2, and 4, with packets of various
 %% sizes.
 
 basic_ping(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(120)),
+    ct:timetrap({minutes, 2}),
     ping(Config, sizes(1), 1, "", []),
     ping(Config, sizes(2), 2, "", []),
     ping(Config, sizes(4), 4, "", []),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Let the port program insert delays between characters sent back to
@@ -247,17 +233,13 @@ basic_ping(Config) when is_list(Config) ->
 %% small chunks rather than all at once.
 
 slow_writes(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(20)),
     ping(Config, [8], 4, "-s1", []),
     ping(Config, [10], 2, "-s2", []),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-bad_packet(doc) ->
-    ["Test that we get {'EXIT', Port, einval} if we try to send a bigger "
-     "packet than the packet header allows."];
+%% Test that we get {'EXIT', Port, einval} if we try to send a bigger
+%% packet than the packet header allows.
 bad_packet(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
     PortTest = port_test(Config),
     process_flag(trap_exit, true),
 
@@ -265,16 +247,14 @@ bad_packet(Config) when is_list(Config) ->
     bad_packet(PortTest, 1, 257),
     bad_packet(PortTest, 2, 65536),
     bad_packet(PortTest, 2, 65537),
-
-    test_server:timetrap_cancel(Dog),
     ok.
 
 bad_packet(PortTest, HeaderSize, PacketSize) ->
     P = open_port({spawn, PortTest}, [{packet, HeaderSize}]),
     P ! {self(), {command, make_zero_packet(PacketSize)}},
     receive
-	{'EXIT', P, einval} -> ok;
-	Other -> test_server:fail({unexpected_message, Other})
+        {'EXIT', P, einval} -> ok;
+        Other -> ct:fail({unexpected_message, Other})
     end.
 
 make_zero_packet(0) -> [];
@@ -287,7 +267,6 @@ make_zero_packet(N) ->
 
 %% Test sending bad messages to a port.
 bad_port_messages(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
     PortTest = port_test(Config),
     process_flag(trap_exit, true),
 
@@ -295,16 +274,14 @@ bad_port_messages(Config) when is_list(Config) ->
     bad_message(PortTest, {a}),
     bad_message(PortTest, {self(),{command,bad_command}}),
     bad_message(PortTest, {self(),{connect,no_pid}}),
-
-    test_server:timetrap_cancel(Dog),
     ok.
 
 bad_message(PortTest, Message) ->    
     P = open_port({spawn,PortTest}, []),
     P ! Message,
     receive
-	{'EXIT',P,badsig} -> ok;
-	Other -> test_server:fail({unexpected_message, Other})
+        {'EXIT',P,badsig} -> ok;
+        Other -> ct:fail({unexpected_message, Other})
     end.
 
 %% Tests various options (stream and {packet, Number} are implicitly
@@ -314,7 +291,7 @@ bad_message(PortTest, Message) ->
 %% Tests the 'binary' option for a port.
 
 t_binary(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(300)),
+    ct:timetrap({seconds, 300}),
 
     %% Packet mode.
     ping(Config, sizes(1), 1, "", [binary]),
@@ -325,12 +302,10 @@ t_binary(Config) when is_list(Config) ->
     stream_ping(Config, 435, "", [binary]),
     stream_ping(Config, 43755, "", [binary]),
     stream_ping(Config, 100000, "", [binary]),
-
-    test_server:timetrap_cancel(Dog),
     ok.
 
 name1(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(100)),
+    ct:timetrap({seconds, 100}),
     PortTest = port_test(Config),
     Command = lists:concat([PortTest, " "]),
     P = open_port({spawn, Command}, []),
@@ -347,13 +322,12 @@ name1(Config) when is_list(Config) ->
         {P, closed} -> ok
     end,
     undefined = whereis(myport),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Test that the 'eof' option works.
 
 eof(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(100)),
+    ct:timetrap({seconds, 100}),
     PortTest = port_test(Config),
     Command = lists:concat([PortTest, " -h0 -q"]),
     P = open_port({spawn, Command}, [eof]),
@@ -365,47 +339,49 @@ eof(Config) when is_list(Config) ->
     receive
         {P, closed} -> ok
     end,
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Tests that the 'in' option for a port works.
 
 input_only(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(300)),
+    ct:timetrap({seconds, 300}),
     expect_input(Config, [0, 1, 10, 13, 127, 128, 255], 1, "", [in]),
     expect_input(Config, [0, 1, 255, 2048], 2, "", [in]),
     expect_input(Config, [0, 1, 255, 2048], 4, "", [in]),
     expect_input(Config, [0, 1, 10, 13, 127, 128, 255],
                  1, "", [in, binary]),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Tests that the 'out' option for a port works.
 
 output_only(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(100)),
-    Dir = ?config(priv_dir, Config),
+    ct:timetrap({seconds, 100}),
+    Dir = proplists:get_value(priv_dir, Config),
+
+    %% First we test that the port program gets the data
     Filename = filename:join(Dir, "output_only_stream"),
-    output_and_verify(Config, Filename, "-h0",
-          	    random_packet(35777, "echo")),
-    test_server:timetrap_cancel(Dog),
+    Data = random_packet(35777, "echo"),
+    output_and_verify(Config, ["-h0 -o", Filename], Data),
+    Wait_time = 500,
+    test_server:sleep(Wait_time),
+    {ok, Written} = file:read_file(Filename),
+    Data = binary_to_list(Written),
+
+    %% Then we test that any writes to stdout from
+    %% the port program is not sent to erlang
+    output_and_verify(Config, ["-h0"], Data),
     ok.
 
-output_and_verify(Config, Filename, Options, Data) ->
+output_and_verify(Config, Options, Data) ->
     PortTest = port_test(Config),
-    Command = lists:concat([PortTest, " ",
-          		  Options, " -o", Filename]),
+    Command = lists:concat([PortTest, " " | Options]),
     Port = open_port({spawn, Command}, [out]),
     Port ! {self(), {command, Data}},
     Port ! {self(), close},
     receive
-        {Port, closed} -> ok
-    end,
-    Wait_time = 500,
-    test_server:sleep(Wait_time),
-    {ok, Written} = file:read_file(Filename),
-    Data = binary_to_list(Written),
-    ok.
+        {Port, closed} -> ok;
+        Msg -> ct:fail({received_unexpected_message, Msg})
+    end.
 
 %% Test that receiving several packages written in the same
 %% write operation works.
@@ -414,11 +390,10 @@ output_and_verify(Config, Filename, Options, Data) ->
 %% Basic test of receiving multiple packages, written in
 %% one operation by the other end.
 mul_basic(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(600)),
+    ct:timetrap({minutes, 10}),
     expect_input(Config, [0, 1, 255, 10, 13], 1, "", []),
     expect_input(Config, [0, 10, 13, 1600, 32767, 65535], 2, "", []),
     expect_input(Config, [10, 70000], 4, "", []),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Test reading a buffer consisting of several packets, some
@@ -427,9 +402,8 @@ mul_basic(Config) when is_list(Config) ->
 %% delays in between.)
 
 mul_slow_writes(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(250)),
+    ct:timetrap({minutes, 4}),
     expect_input(Config, [0, 20, 255, 10, 1], 1, "-s64", []),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Runs several port tests in parallell.  Each individual test
@@ -437,27 +411,26 @@ mul_slow_writes(Config) when is_list(Config) ->
 %% should also finish in about 5 seconds.
 
 parallell(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(300)),
+    ct:timetrap({minutes, 5}),
     Testers = [
-	fun() -> stream_ping(Config, 1007, "-s100", []) end,
-	fun() -> stream_ping(Config, 10007, "-s1000", []) end,
-	fun() -> stream_ping(Config, 10007, "-s1000", []) end,
+               fun() -> stream_ping(Config, 1007, "-s100", []) end,
+               fun() -> stream_ping(Config, 10007, "-s1000", []) end,
+               fun() -> stream_ping(Config, 10007, "-s1000", []) end,
 
-	fun() -> expect_input(Config, [21, 22, 23, 24, 25], 1,
-		    "-s10", [in]) end,
+               fun() -> expect_input(Config, [21, 22, 23, 24, 25], 1,
+                                     "-s10", [in]) end,
 
-	fun() -> ping(Config, [10], 1, "-d", []) end,
-	fun() -> ping(Config, [20000], 2, "-d", []) end,
-	fun() -> ping(Config, [101], 1, "-s10", []) end,
-	fun() -> ping(Config, [1001], 2, "-s100", []) end,
-	fun() -> ping(Config, [10001], 4, "-s1000", []) end,
+               fun() -> ping(Config, [10], 1, "-d", []) end,
+               fun() -> ping(Config, [20000], 2, "-d", []) end,
+               fun() -> ping(Config, [101], 1, "-s10", []) end,
+               fun() -> ping(Config, [1001], 2, "-s100", []) end,
+               fun() -> ping(Config, [10001], 4, "-s1000", []) end,
 
-	fun() -> ping(Config, [501, 501], 2, "-s100", []) end,
-	fun() -> ping(Config, [11, 12, 13, 14, 11], 1, "-s5", []) end],
+               fun() -> ping(Config, [501, 501], 2, "-s100", []) end,
+               fun() -> ping(Config, [11, 12, 13, 14, 11], 1, "-s5", []) end],
     process_flag(trap_exit, true),
     Pids = lists:map(fun fun_spawn/1, Testers),
     wait_for(Pids),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 wait_for([]) ->
@@ -465,18 +438,17 @@ wait_for([]) ->
 wait_for(Pids) ->
     io:format("Waiting for ~p", [Pids]),
     receive
-	{'EXIT', Pid, normal} ->
-	    wait_for(lists:delete(Pid, Pids));
-	Other ->
-	    test_server:fail({bad_exit, Other})
+        {'EXIT', Pid, normal} ->
+            wait_for(lists:delete(Pid, Pids));
+        Other ->
+            ct:fail({bad_exit, Other})
     end.
 
 %% Tests starting port programs that terminate by themselves.
 %% This used to cause problems on Windows.
 
-dying_port(suite) -> [];
 dying_port(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(150)),
+    ct:timetrap({minutes, 2}),
     process_flag(trap_exit, true),
 
     P1 = make_dying_port(Config),
@@ -497,14 +469,12 @@ dying_port(Config) when is_list(Config) ->
     wait_for_port_exit(P3),
     wait_for_port_exit(P4),
     wait_for_port_exit(P5),
-
-    test_server:timetrap_cancel(Dog),
     ok.
 
 wait_for_port_exit(Port) ->
     receive
-	{'EXIT', Port, _} ->
-	    ok
+        {'EXIT', Port, _} ->
+            ok
     end.
 
 make_dying_port(Config) when is_list(Config) ->
@@ -523,22 +493,21 @@ make_dying_port(Config) when is_list(Config) ->
 %%
 %% This testcase works on Unix, but is not very useful.
 
-port_program_with_path(suite) -> [];
 port_program_with_path(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(100)),
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
-    
+    ct:timetrap({minutes, 2}),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
+
     %% Create a copy of the port test program in a directory not
     %% included in PATH (i.e. in priv_dir), with the name 'my_port_test.exe'.
     %% Also, place a file named 'my_port_test' in the same directory.
     %% This used to confuse the CreateProcess() call in spawn driver.
     %% (On Unix, there will be a single file created, which will be
     %% a copy of the port program.)
-    
+
     PortTest = os:find_executable("port_test", DataDir),
     io:format("os:find_executable(~p, ~p) returned ~p",
-	      ["port_test", DataDir, PortTest]),
+              ["port_test", DataDir, PortTest]),
     {ok, PortTestPgm} = file:read_file(PortTest),
     NewName = filename:join(PrivDir, filename:basename(PortTest)),
     RedHerring = filename:rootname(NewName),
@@ -546,12 +515,12 @@ port_program_with_path(Config) when is_list(Config) ->
     ok = file:write_file(NewName, PortTestPgm),
     ok = file:write_file_info(NewName, #file_info{mode=8#111}),
     PgmWithPathAndNoExt = filename:rootname(NewName),
-    
+
     %% Open the port using the path to the copied port test program,
     %% but without the .exe extension, and verified that it was started.
     %%
     %% If the bug is present the open_port call will fail with badarg.
-    
+
     Command = lists:concat([PgmWithPathAndNoExt, " -h2"]),
     P = open_port({spawn, Command}, [{packet, 2}]),
     Message = "echo back to me",
@@ -560,17 +529,14 @@ port_program_with_path(Config) when is_list(Config) ->
         {P, {data, Message}} ->
             ok
     end,
-    test_server:timetrap_cancel(Dog),
     ok.
 
 
 %% Tests that files can be read using open_port(Filename, [in]).
 %% This used to fail on Windows.
-open_input_file_port(suite) -> [];
 open_input_file_port(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
-    PrivDir = ?config(priv_dir, Config),
-    
+    PrivDir = proplists:get_value(priv_dir, Config),
+
     %% Create a file with the file driver and read it back using
     %% open_port/2.
 
@@ -578,20 +544,18 @@ open_input_file_port(Config) when is_list(Config) ->
     FileData1 = "An input file",
     ok = file:write_file(MyFile1, FileData1),
     case open_port(MyFile1, [in]) of
-	InputPort when is_port(InputPort) ->
-	    receive
-		{InputPort, {data, FileData1}} ->
-		    ok
-	    end
+        InputPort when is_port(InputPort) ->
+            receive
+                {InputPort, {data, FileData1}} ->
+                    ok
+            end
     end,
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Tests that files can be written using open_port(Filename, [out]).
-open_output_file_port(suite) -> [];
 open_output_file_port(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(100)),
-    PrivDir = ?config(priv_dir, Config),
+    ct:timetrap({minutes, 2}),
+    PrivDir = proplists:get_value(priv_dir, Config),
 
     %% Create a file with open_port/2 and read it back with
     %% the file driver.
@@ -606,16 +570,44 @@ open_output_file_port(Config) when is_list(Config) ->
     OutputPort ! {self(), close},
     {ok, Bin} = file:read_file(MyFile2),
     FileData2 = binary_to_list(Bin),
-
-    test_server:timetrap_cancel(Dog),
     ok.
 
+%% Tests that all appropriate fd's have been closed in the port program
+count_fds(Config) when is_list(Config) ->
+    case os:type() of
+        {unix, _} ->
+            PrivDir = proplists:get_value(priv_dir, Config),
+            Filename = filename:join(PrivDir, "my_fd_counter"),
+
+            RunTest = fun(PortOpts) ->
+                              PortTest = port_test(Config),
+                              Command = lists:concat([PortTest, " -n -f -o", Filename]),
+                              Port = open_port({spawn, Command}, PortOpts),
+                              Port ! {self(), close},
+                              receive
+                                  {Port, closed} -> ok
+                              end,
+                              test_server:sleep(500),
+                              {ok, Written} = file:read_file(Filename),
+                              Written
+                      end,
+            <<4:32/native>> = RunTest([out, nouse_stdio]),
+            <<4:32/native>> = RunTest([in, nouse_stdio]),
+            <<5:32/native>> = RunTest([in, out, nouse_stdio]),
+            <<3:32/native>> = RunTest([out, use_stdio]),
+            <<3:32/native>> = RunTest([in, use_stdio]),
+            <<3:32/native>> = RunTest([in, out, use_stdio]),
+            <<3:32/native>> = RunTest([in, out, use_stdio, stderr_to_stdout]),
+            <<3:32/native>> = RunTest([out, use_stdio, stderr_to_stdout]);
+        _ ->
+            {skip, "Skipped on windows"}
+    end.
+
 %%
 %% Open as many ports as possible. Do this several times and check
 %% that we get the same number of ports every time.
 %%
 
-iter_max_ports(suite) -> [];
 iter_max_ports(Config) when is_list(Config) ->
     %% The child_setup program might dump core if we get out of memory.
     %% This is hard to do anything about and is harmless. We run this test
@@ -624,31 +616,30 @@ iter_max_ports(Config) when is_list(Config) ->
     %%
     Config2 = ignore_cores:setup(?MODULE, iter_max_ports, Config, true),
     try
-	iter_max_ports_test(Config2)
+        iter_max_ports_test(Config2)
     after
-	ignore_cores:restore(Config2)
+        ignore_cores:restore(Config2)
     end.
-    
-    
+
+
 iter_max_ports_test(Config) ->
-    Dog = test_server:timetrap(test_server:minutes(30)),
+    ct:timetrap({minutes, 30}),
     PortTest = port_test(Config),
     Command = lists:concat([PortTest, " -h0 -q"]),
     Iters = case os:type() of
-		      {win32,_} -> 4;
-		      _ -> 10
-		  end,
+                {win32,_} -> 4;
+                _ -> 10
+            end,
     %% Run on a different node in order to limit the effect if this test fails.
     Dir = filename:dirname(code:which(?MODULE)),
     {ok,Node} = test_server:start_node(test_iter_max_socks,slave,
-				       [{args,"+Q 2048 -pa " ++ Dir}]),
+                                       [{args,"+Q 2048 -pa " ++ Dir}]),
     L = rpc:call(Node,?MODULE,do_iter_max_ports,[Iters, Command]),
     test_server:stop_node(Node),
 
     io:format("Result: ~p",[L]),
     all_equal(L),
     all_equal(L),
-    test_server:timetrap_cancel(Dog),
     {comment, "Max ports: " ++ integer_to_list(hd(L))}.
 
 do_iter_max_ports(N, Command) when N > 0 ->
@@ -672,46 +663,54 @@ max_ports(Command) ->
 close_ports([P|Ps]) ->
     P ! {self(), close},
     receive
-	{P,closed} ->
-	    ok
+        {P,closed} ->
+            ok
     end,
     close_ports(Ps);
 close_ports([]) ->
     ok.
 
 open_ports(Name, Settings) ->
-    test_server:sleep(5),
+    case os:type() of
+        {unix, freebsd} ->
+            %% FreeBsd has issues with sendmsg/recvmsg in fork
+            %% implementation and we therefor have to spawn
+            %% slower to make sure that we always hit the same
+            %% make roof.
+            test_server:sleep(10);
+        _ ->
+            test_server:sleep(5)
+    end,
     case catch open_port(Name, Settings) of
-	P when is_port(P) ->
-	    [P| open_ports(Name, Settings)];
-	{'EXIT', {Code, _}} ->
-	    case Code of
-		enfile ->
-		    [];
-		emfile ->
-		    [];
-		system_limit ->
-		    [];
-		enomem ->
-		    [];
-		Other ->
-		    test_server:fail({open_ports, Other})
-	    end;
-	Other ->
-	    test_server:fail({open_ports, Other})
+        P when is_port(P) ->
+            [P| open_ports(Name, Settings)];
+        {'EXIT', {Code, _}} ->
+            case Code of
+                enfile ->
+                    [];
+                emfile ->
+                    [];
+                system_limit ->
+                    [];
+                enomem ->
+                    [];
+                Other ->
+                    ct:fail({open_ports, Other})
+            end;
+        Other ->
+            ct:fail({open_ports, Other})
     end.
 
 %% Tests that exit(Port, Term) works (has been known to crash the emulator).
 
-t_exit(suite) -> [];
 t_exit(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     Pid = fun_spawn(fun suicide_port/1, [Config]),
     receive
-	{'EXIT', Pid, die} ->
-	    ok;
-	Other ->
-	    test_server:fail({bad_message, Other})
+        {'EXIT', Pid, die} ->
+            ok;
+        Other ->
+            ct:fail({bad_message, Other})
     end.
 
 suicide_port(Config) when is_list(Config) ->
@@ -720,118 +719,105 @@ suicide_port(Config) when is_list(Config) ->
     receive after infinity -> ok end.
 
 
-tps_16_bytes(doc) -> "";
-tps_16_bytes(suite) -> [];
 tps_16_bytes(Config) when is_list(Config) ->
     tps(16, Config).
 
-tps_1K(doc) -> "";
-tps_1K(suite) -> [];
 tps_1K(Config) when is_list(Config) ->
     tps(1024, Config).
 
 tps(Size, Config) ->
-    Dog = test_server:timetrap(test_server:seconds(300)),
+    ct:timetrap({minutes, 5}),
     PortTest = port_test(Config),
     Packet = list_to_binary(random_packet(Size, "e")),
     Port = open_port({spawn, PortTest}, [binary, {packet, 2}]),
     Transactions = 10000,
     {Elapsed, ok} = test_server:timecall(?MODULE, tps,
-					       [Port, Packet, Transactions]),
-    test_server:timetrap_cancel(Dog),
+                                         [Port, Packet, Transactions]),
     {comment, integer_to_list(trunc(Transactions/Elapsed+0.5)) ++ " transactions/s"}.
 
 tps(_Port, _Packet, 0) -> ok;
 tps(Port, Packet, N) ->
     port_command(Port, Packet),
     receive
-	{Port, {data, Packet}} ->
-	    tps(Port, Packet, N-1);
-	Other ->
-	    test_server:fail({bad_message, Other})
+        {Port, {data, Packet}} ->
+            tps(Port, Packet, N-1);
+        Other ->
+            ct:fail({bad_message, Other})
     end.
 
 %% Line I/O test
 line(Config) when is_list(Config) ->
+    ct:timetrap({minutes, 5}),
     Siz = 110,
-    Dog = test_server:timetrap(test_server:seconds(300)),
     Packet1 = random_packet(Siz),
     Packet2 = random_packet(Siz div 2),
     %% Test that packets are split into lines
     port_expect(Config,[{lists:append([Packet1, io_lib:nl(), Packet2,
-					     io_lib:nl()]),
-			       [{eol, Packet1}, {eol, Packet2}]}],
-		      0, "", [{line,Siz}]),
+                                       io_lib:nl()]),
+                         [{eol, Packet1}, {eol, Packet2}]}],
+                0, "", [{line,Siz}]),
     %% Test the same for binaries
     port_expect(Config,[{lists:append([Packet1, io_lib:nl(), Packet2,
-					     io_lib:nl()]),
-			       [{eol, Packet1}, {eol, Packet2}]}],
-		      0, "", [{line,Siz},binary]),
+                                       io_lib:nl()]),
+                         [{eol, Packet1}, {eol, Packet2}]}],
+                0, "", [{line,Siz},binary]),
     %% Test that too long lines get split
     port_expect(Config,[{lists:append([Packet1, io_lib:nl(), Packet1,
-					     Packet2, io_lib:nl()]),
-			       [{eol, Packet1}, {noeol, Packet1},
-				{eol, Packet2}]}], 0, "", [{line,Siz}]),
+                                       Packet2, io_lib:nl()]),
+                         [{eol, Packet1}, {noeol, Packet1},
+                          {eol, Packet2}]}], 0, "", [{line,Siz}]),
     %% Test that last output from closing port program gets received.
     L1 = lists:append([Packet1, io_lib:nl(), Packet2]),
     S1 = lists:flatten(io_lib:format("-l~w", [length(L1)])),
     io:format("S1 = ~w, L1 = ~w~n", [S1,L1]),
     port_expect(Config,[{L1,
-			       [{eol, Packet1}, {noeol, Packet2}, eof]}], 0, 
-		      S1, [{line,Siz},eof]),
+                         [{eol, Packet1}, {noeol, Packet2}, eof]}], 0, 
+                S1, [{line,Siz},eof]),
     %% Test that lonely <CR> Don't get treated as newlines
     port_expect(Config,[{lists:append([Packet1, [13], Packet2,
-					     io_lib:nl()]),
-			       [{noeol, Packet1}, {eol, [13 |Packet2]}]}],
-		      0, "", [{line,Siz}]),
+                                       io_lib:nl()]),
+                         [{noeol, Packet1}, {eol, [13 |Packet2]}]}],
+                0, "", [{line,Siz}]),
     %% Test that packets get built up to lines (delayed output from
     %% port program)
     port_expect(Config,[{Packet2,[]},
-			      {lists:append([Packet2, io_lib:nl(),
-					     Packet1, io_lib:nl()]),
-			       [{eol, lists:append(Packet2, Packet2)},
-				{eol, Packet1}]}], 0, "-d", [{line,Siz}]),
+                        {lists:append([Packet2, io_lib:nl(),
+                                       Packet1, io_lib:nl()]),
+                         [{eol, lists:append(Packet2, Packet2)},
+                          {eol, Packet1}]}], 0, "-d", [{line,Siz}]),
     %% Test that we get badarg if trying both packet and line
     bad_argument(Config, [{packet, 5}, {line, 5}]),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-%%% Redirection of stderr test
-stderr_to_stdout(suite) ->
-    [];
-stderr_to_stdout(doc) ->
-    "Test that redirection of standard error to standard output works.";
+%% Test that redirection of standard error to standard output works.
 stderr_to_stdout(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(60)),
+    ct:timetrap({minutes, 1}),
     %% See that it works
     Packet = random_packet(10),
     port_expect(Config,[{Packet,[Packet]}], 0, "-e -l10",
-		      [stderr_to_stdout]),
+                [stderr_to_stdout]),
     %% stream_ping(Config, 10, "-e", [stderr_to_stdout]),
     %% See that it doesn't always happen (will generate garbage on stderr)
     port_expect(Config,[{Packet,[eof]}], 0, "-e -l10", [line,eof]),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 
 bad_argument(Config, ArgList) ->
     PortTest = port_test(Config),
     case catch open_port({spawn, PortTest}, ArgList) of
-	{'EXIT', {badarg, _}} ->
-	    ok
+        {'EXIT', {badarg, _}} ->
+            ok
     end.
-    
+
 
 %% 'env' option
 %% (Can perhaps be made smaller by calling the other utility functions
 %% in this module.)
-env(suite) ->
-    [];
-env(doc) ->
-    ["Test that the 'env' option works"];
+%%
+%% Test that the 'env' option works
 env(Config)  when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(60)),
-    Priv = ?config(priv_dir, Config),
+    ct:timetrap({minutes, 1}),
+    Priv = proplists:get_value(priv_dir, Config),
     Temp = filename:join(Priv, "env_fun.bin"),
 
     PluppVal = "dirty monkey",
@@ -841,36 +827,34 @@ env(Config)  when is_list(Config) ->
     os:putenv(Long, "nisse"),
 
     env_slave(Temp, [{"plupp",PluppVal},
-	    {"DIR_PLUPP","###glurfrik"}],
-	fun() ->
-		PluppVal = os:getenv("plupp"),
-		"###glurfrik" = os:getenv("DIR_PLUPP"),
-		"nisse" = os:getenv(Long)
-	end),
+                     {"DIR_PLUPP","###glurfrik"}],
+              fun() ->
+                      PluppVal = os:getenv("plupp"),
+                      "###glurfrik" = os:getenv("DIR_PLUPP"),
+                      "nisse" = os:getenv(Long)
+              end),
 
 
     env_slave(Temp, [{"must_define_something","some_value"},
-	    {"certainly_not_existing",false},
-	    {"ends_with_equal", "value="},
-	    {Long,false},
-	    {"glurf","a glorfy string"}]),
+                     {"certainly_not_existing",false},
+                     {"ends_with_equal", "value="},
+                     {Long,false},
+                     {"glurf","a glorfy string"}]),
 
     %% A lot of non existing variables (mingled with existing)
     NotExistingList = [{lists:flatten(io_lib:format("V~p_not_existing",[X])),false} 
-                        ||  X <- lists:seq(1,150)],
+                       ||  X <- lists:seq(1,150)],
     ExistingList = [{lists:flatten(io_lib:format("V~p_existing",[X])),"a_value"} 
-                        ||  X <- lists:seq(1,150)],
+                    ||  X <- lists:seq(1,150)],
     env_slave(Temp, lists:sort(ExistingList ++ NotExistingList)),
-
-    test_server:timetrap_cancel(Dog),
     ok.
 
 env_slave(File, Env) ->
     F = fun() ->
-		lists:foreach(fun({Name,Val}) ->
-				      Val = os:getenv(Name)
-			      end, Env)
-	end,
+                lists:foreach(fun({Name,Val}) ->
+                                      Val = os:getenv(Name)
+                              end, Env)
+        end,
     env_slave(File, Env, F).
 
 env_slave(File, Env, Body) ->
@@ -878,27 +862,26 @@ env_slave(File, Env, Body) ->
     Program = atom_to_list(lib:progname()),
     Dir = filename:dirname(code:which(?MODULE)),
     Cmd = Program ++ " -pz " ++ Dir ++
-	" -noinput -run " ++ ?MODULE_STRING ++ " env_slave_main " ++
-	File ++ " -run erlang halt",
+    " -noinput -run " ++ ?MODULE_STRING ++ " env_slave_main " ++
+    File ++ " -run erlang halt",
     Port = open_port({spawn, Cmd}, [{env,Env},{line,256}]),
     receive
-	{Port,{data,{eol,"ok"}}} ->
-	    ok;
-	{Port,{data,{eol,Error}}} ->
-	    io:format("~p\n", [Error]),
-	    test_server:fail();
-	Other ->
-	    test_server:fail(Other)
+        {Port,{data,{eol,"ok"}}} ->
+            ok;
+        {Port,{data,{eol,Error}}} ->
+            ct:fail("eol error ~p\n", [Error]);
+        Other ->
+            ct:fail(Other)
     end.
 
 env_slave_main([File]) ->
     {ok,Body0} = file:read_file(File),
     Body = binary_to_term(Body0),
     case Body() of
-	{'EXIT',Reason} ->
-	    io:format("Error: ~p\n", [Reason]);
-	_ ->
-	    io:format("ok\n")
+        {'EXIT',Reason} ->
+            io:format("Error: ~p\n", [Reason]);
+        _ ->
+            io:format("ok\n")
     end,
     init:stop().
 
@@ -920,62 +903,93 @@ bad_env(Config) when is_list(Config) ->
 try_bad_env(Env) ->
     try open_port({spawn,"ls"}, [{env,Env}])
     catch
-	error:badarg -> ok
+        error:badarg -> ok
+    end.
+
+%% Test that we can handle a very very large environment gracefully.
+huge_env(Config) when is_list(Config) ->
+    ct:timetrap({minutes, 2}),
+    Vars = case os:type() of
+               {win32,_} -> 500;
+               _ ->
+                   %% We create a huge environment,
+                   %% 20000 variables is about 25MB
+                   %% which seems to be the limit on Linux.
+                   20000
+           end,
+    Env = [{[$a + I div (25*25*25*25) rem 25,
+             $a + I div (25*25*25) rem 25,
+             $a + I div (25*25) rem 25,
+             $a+I div 25 rem 25, $a+I rem 25],
+            lists:duplicate(100,$a+I rem 25)}
+           || I <- lists:seq(1,Vars)],
+    try erlang:open_port({spawn,"ls"},[exit_status, {env, Env}]) of
+        P ->
+            receive
+                {P, {exit_status,N}} = M ->
+                    %% We test that the exit status is an integer, this means
+                    %% that the child program has started. If we get an atom
+                    %% something went wrong in the driver which is not ok.
+                    ct:log("Got ~p",[M]),
+                    true = is_integer(N)
+            end
+    catch E:R ->
+              %% Have to catch the error here, as printing the stackdump
+              %% in the ct log is way to heavy for some test machines.
+              ct:fail("Open port failed ~p:~p",[E,R])
     end.
 
+
+
 %% 'cd' option
 %% (Can perhaps be made smaller by calling the other utility functions
 %% in this module.)
-cd(suite) ->
-    [];
-cd(doc) ->
-    ["Test that the 'cd' option works"];
+%%
+%% Test that the 'cd' option works
 cd(Config)  when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(60)),
+    ct:timetrap({minutes, 1}),
 
     Program = atom_to_list(lib:progname()),
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     TestDir = filename:join(DataDir, "dir"),
     Cmd = Program ++ " -pz " ++ DataDir ++
-        " -noshell -s port_test pwd -s erlang halt",
+    " -noshell -s port_test pwd -s erlang halt",
     _ = open_port({spawn, Cmd},
-	[{cd, TestDir},
-	    {line, 256}]),
+                  [{cd, TestDir},
+                   {line, 256}]),
     receive
-	{_, {data, {eol, String}}} ->
-	    case filename_equal(String, TestDir) of
-		true ->
-		    ok;
-		false ->
-		    test_server:fail({cd, String})
-	    end;
-	Other2 ->
-	    test_server:fail({env, Other2})
+        {_, {data, {eol, String}}} ->
+            case filename_equal(String, TestDir) of
+                true ->
+                    ok;
+                false ->
+                    ct:fail({cd, String})
+            end;
+        Other2 ->
+            ct:fail({env, Other2})
     end,
     _ = open_port({spawn, Cmd},
-		  [{cd, unicode:characters_to_binary(TestDir)},
-		   {line, 256}]),
+                  [{cd, unicode:characters_to_binary(TestDir)},
+                   {line, 256}]),
     receive
-	{_, {data, {eol, String2}}} ->
-	    case filename_equal(String2, TestDir) of
-		true ->
-		    ok;
-		false ->
-		    test_server:fail({cd, String2})
-	    end;
-	Other3 ->
-	    test_server:fail({env, Other3})
+        {_, {data, {eol, String2}}} ->
+            case filename_equal(String2, TestDir) of
+                true ->
+                    ok;
+                false ->
+                    ct:fail({cd, String2})
+            end;
+        Other3 ->
+            ct:fail({env, Other3})
     end,
-
-    test_server:timetrap_cancel(Dog),
     ok.
 
 filename_equal(A, B) ->
     case os:type() of
-	{win32, _} ->
-	    win_filename_equal(A, B);
-	_ ->
-	    A == B
+        {win32, _} ->
+            win_filename_equal(A, B);
+        _ ->
+            A == B
     end.
 
 win_filename_equal([], []) ->
@@ -986,10 +1000,10 @@ win_filename_equal(_, []) ->
     false;
 win_filename_equal([C1 | Rest1], [C2 | Rest2]) ->
     case tolower(C1) == tolower(C2) of
-	true ->
-	    win_filename_equal(Rest1, Rest2);
-	false ->
-	    false
+        true ->
+            win_filename_equal(Rest1, Rest2);
+        false ->
+            false
     end.
 
 tolower(C) when C >= $A, C =< $Z ->
@@ -997,17 +1011,14 @@ tolower(C) when C >= $A, C =< $Z ->
 tolower(C) ->
     C.
 
-otp_3906(suite) ->
-    [];
-otp_3906(doc) ->
-    ["Tests that child process deaths are managed correctly when there are "
-     " a large amount of concurrently dying children. See ticket OTP-3906."];
+%% Tests that child process deaths are managed correctly when there are
+%%  a large amount of concurrently dying children. See ticket OTP-3906.
 otp_3906(Config)  when is_list(Config) ->
     case os:type() of
-	{unix, OSName} ->
-	    otp_3906(Config, OSName);
-	_ ->
-	    {skipped, "Only run on Unix systems"}
+        {unix, OSName} ->
+            otp_3906(Config, OSName);
+        _ ->
+            {skipped, "Only run on Unix systems"}
     end.
 
 -define(OTP_3906_CHILDREN,     1000).
@@ -1020,83 +1031,83 @@ otp_3906(Config)  when is_list(Config) ->
 otp_3906(Config, OSName) ->
     DataDir = filename:dirname(proplists:get_value(data_dir,Config)),
     {ok, Variables} = file:consult(
-			      filename:join([DataDir,"..","..",
-					     "test_server","variables"])),
+                        filename:join([DataDir,"..","..",
+                                       "test_server","variables"])),
     case lists:keysearch('CC', 1, Variables) of
-	{value,{'CC', CC}} ->
-	    SuiteDir = filename:dirname(code:which(?MODULE)),
-	    PrivDir = ?config(priv_dir, Config),
-	    Prog = otp_3906_make_prog(CC, PrivDir),
-	    {ok, Node} = test_server:start_node(otp_3906,
-						slave,
-						[{args, " -pa " ++ SuiteDir},
-						 {linked, false}]),
-	    OP = process_flag(priority, max),
-	    OTE = process_flag(trap_exit, true),
-	    FS = spawn_link(Node,
-			    ?MODULE,
-			    otp_3906_start_forker_starter,
-			    [?OTP_3906_CHILDREN, [], self(), Prog]),
-	    Result = receive
-			 {'EXIT', _ForkerStarter, Reason} ->
-			     {failed, Reason};
-			 {emulator_pid, EmPid} ->
-			     case otp_3906_wait_result(FS, 0, 0) of
-				 {succeded,
-				  ?OTP_3906_CHILDREN,
-				  ?OTP_3906_CHILDREN} ->
-				     succeded;
-				 {succeded, Forked, Exited} ->
-				     otp_3906_list_defunct(EmPid, OSName),
-				     {failed,
-				      {mismatch,
-				       {forked, Forked},
-				       {exited, Exited}}};
-				 Res ->
-				     otp_3906_list_defunct(EmPid, OSName),
-				     Res
-			     end
-		     end,
-	    process_flag(trap_exit, OTE),
-	    process_flag(priority, OP),
-	    test_server:stop_node(Node),
-	    case Result of
-		succeded ->
-		    ok;
-		_ ->
-		    test_server:fail(Result)
-	    end;
-	_ ->
-	    {skipped, "No C compiler found"}
+        {value,{'CC', CC}} ->
+            SuiteDir = filename:dirname(code:which(?MODULE)),
+            PrivDir = proplists:get_value(priv_dir, Config),
+            Prog = otp_3906_make_prog(CC, PrivDir),
+            {ok, Node} = test_server:start_node(otp_3906,
+                                                slave,
+                                                [{args, " -pa " ++ SuiteDir},
+                                                 {linked, false}]),
+            OP = process_flag(priority, max),
+            OTE = process_flag(trap_exit, true),
+            FS = spawn_link(Node,
+                            ?MODULE,
+                            otp_3906_start_forker_starter,
+                            [?OTP_3906_CHILDREN, [], self(), Prog]),
+            Result = receive
+                         {'EXIT', _ForkerStarter, Reason} ->
+                             {failed, Reason};
+                         {emulator_pid, EmPid} ->
+                             case otp_3906_wait_result(FS, 0, 0) of
+                                 {succeded,
+                                  ?OTP_3906_CHILDREN,
+                                  ?OTP_3906_CHILDREN} ->
+                                     succeded;
+                                 {succeded, Forked, Exited} ->
+                                     otp_3906_list_defunct(EmPid, OSName),
+                                     {failed,
+                                      {mismatch,
+                                       {forked, Forked},
+                                       {exited, Exited}}};
+                                 Res ->
+                                     otp_3906_list_defunct(EmPid, OSName),
+                                     Res
+                             end
+                     end,
+            process_flag(trap_exit, OTE),
+            process_flag(priority, OP),
+            test_server:stop_node(Node),
+            case Result of
+                succeded ->
+                    ok;
+                _ ->
+                    ct:fail(Result)
+            end;
+        _ ->
+            {skipped, "No C compiler found"}
     end.
 
 otp_3906_list_defunct(EmPid, OSName) ->
     % Guess ps switches to use and what to grep for (could be improved)
     {Switches, Zombie} = case OSName of
-			     BSD when BSD == darwin;
-				      BSD == openbsd;
-				      BSD == netbsd;
-				      BSD == freebsd ->
-				 {"-ajx", "Z"};
-			     _ ->
-				 {"-ef", "[dD]efunct"}
-			 end,
-    test_server:format("Emulator pid: ~s~n"
-		       "Listing of zombie processes:~n"
-		       "~s~n",
-		       [EmPid,
-			otp_3906_htmlize(os:cmd("ps "
-						++ Switches
-						++ " | grep "
-						++ Zombie))]).
+                             BSD when BSD == darwin;
+                                      BSD == openbsd;
+                                      BSD == netbsd;
+                                      BSD == freebsd ->
+                                 {"-ajx", "Z"};
+                             _ ->
+                                 {"-ef", "[dD]efunct"}
+                         end,
+    io:format("Emulator pid: ~s~n"
+              "Listing of zombie processes:~n"
+              "~s~n",
+              [EmPid,
+               otp_3906_htmlize(os:cmd("ps "
+                                       ++ Switches
+                                       ++ " | grep "
+                                       ++ Zombie))]).
 
 otp_3906_htmlize([]) ->
     [];
 otp_3906_htmlize([C | Cs]) ->
     case [C] of
-	"<" -> "&lt;" ++ otp_3906_htmlize(Cs);
-	">" -> "&gt;" ++ otp_3906_htmlize(Cs);
-	_ ->   [C | otp_3906_htmlize(Cs)]
+        "<" -> "&lt;" ++ otp_3906_htmlize(Cs);
+        ">" -> "&gt;" ++ otp_3906_htmlize(Cs);
+        _ ->   [C | otp_3906_htmlize(Cs)]
     end.
 
 otp_3906_make_prog(CC, PrivDir) ->
@@ -1104,12 +1115,12 @@ otp_3906_make_prog(CC, PrivDir) ->
     TrgtFileName = filename:join(PrivDir, ?OTP_3906_PROGNAME),
     {ok, SrcFile} = file:open(SrcFileName, write),
     io:format(SrcFile,
-	      "int           ~n"
-	      "main(void)    ~n"
-	      "{             ~n"
-	      "   return ~p; ~n"
-	      "}             ~n",
-	      [?OTP_3906_EXIT_STATUS]),
+              "int           ~n"
+              "main(void)    ~n"
+              "{             ~n"
+              "   return ~p; ~n"
+              "}             ~n",
+              [?OTP_3906_EXIT_STATUS]),
     file:close(SrcFile),
     os:cmd(CC ++ " " ++ SrcFileName ++ " -o " ++ TrgtFileName),
     TrgtFileName.
@@ -1117,21 +1128,21 @@ otp_3906_make_prog(CC, PrivDir) ->
 
 otp_3906_wait_result(ForkerStarter, F, E) ->
     receive
-	{'EXIT', ForkerStarter, Reason} ->
-	    {failed, {Reason, {forked, F}, {exited, E}}};
-	forked ->
-	    otp_3906_wait_result(ForkerStarter, F+1, E);
-	exited ->
-	    otp_3906_wait_result(ForkerStarter, F, E+1);
-	tick ->
-	    otp_3906_wait_result(ForkerStarter, F, E);
-	succeded ->
-	    {succeded, F, E}
+        {'EXIT', ForkerStarter, Reason} ->
+            {failed, {Reason, {forked, F}, {exited, E}}};
+        forked ->
+            otp_3906_wait_result(ForkerStarter, F+1, E);
+        exited ->
+            otp_3906_wait_result(ForkerStarter, F, E+1);
+        tick ->
+            otp_3906_wait_result(ForkerStarter, F, E);
+        succeded ->
+            {succeded, F, E}
     after
-	?OTP_3906_TICK_TIMEOUT ->
-	    unlink(ForkerStarter),
-	    exit(ForkerStarter, timeout),
-	    {failed, {timeout, {forked, F}, {exited, E}}}
+        ?OTP_3906_TICK_TIMEOUT ->
+            unlink(ForkerStarter),
+            exit(ForkerStarter, timeout),
+            {failed, {timeout, {forked, F}, {exited, E}}}
     end.
 
 otp_3906_collect([], _) ->
@@ -1141,17 +1152,17 @@ otp_3906_collect(RefList, Sup) ->
 
 otp_3906_collect_one(RefList, Sup) ->
     receive
-	Ref when is_reference(Ref) ->
-	    Sup ! tick,
-	    lists:delete(Ref, RefList)
+        Ref when is_reference(Ref) ->
+            Sup ! tick,
+            lists:delete(Ref, RefList)
     end.
-    
+
 otp_3906_start_forker(N, Sup, Prog) ->
     Ref = make_ref(),
     spawn_opt(?MODULE,
-	      otp_3906_forker,
-	      [N, self(), Ref, Sup, Prog],
-	      [link, {priority, max}]),
+              otp_3906_forker,
+              [N, self(), Ref, Sup, Prog],
+              [link, {priority, max}]),
     Ref.
 
 otp_3906_start_forker_starter(N, RefList, Sup, Prog) ->
@@ -1170,18 +1181,18 @@ otp_3906_forker_starter(N, RefList, Sup, Prog)
 otp_3906_forker_starter(N, RefList, Sup, Prog)
   when is_integer(N), N > ?OTP_3906_OSP_P_ERLP ->
     otp_3906_forker_starter(N-?OTP_3906_OSP_P_ERLP,
-			    [otp_3906_start_forker(?OTP_3906_OSP_P_ERLP,
-						   Sup,
-						   Prog)|RefList],
-			    Sup,
-			    Prog);
+                            [otp_3906_start_forker(?OTP_3906_OSP_P_ERLP,
+                                                   Sup,
+                                                   Prog)|RefList],
+                            Sup,
+                            Prog);
 otp_3906_forker_starter(N, RefList, Sup, Prog) when is_integer(N) ->
     otp_3906_forker_starter(0,
-			    [otp_3906_start_forker(N,
-						   Sup,
-						   Prog)|RefList],
-			    Sup,
-			    Prog).
+                            [otp_3906_start_forker(N,
+                                                   Sup,
+                                                   Prog)|RefList],
+                            Sup,
+                            Prog).
 
 otp_3906_forker(0, Parent, Ref, _, _) ->
     unlink(Parent),
@@ -1190,183 +1201,165 @@ otp_3906_forker(N, Parent, Ref, Sup, Prog) ->
     Port = erlang:open_port({spawn, Prog}, [exit_status, in]),
     Sup ! forked,
     receive
-	{Port, {exit_status, ?OTP_3906_EXIT_STATUS}} ->
-	    Sup ! exited,
-	    otp_3906_forker(N-1, Parent, Ref, Sup, Prog);
-	{Port, Res} ->
-	    exit(Res);
-	Other ->
-	    exit(Other)
+        {Port, {exit_status, ?OTP_3906_EXIT_STATUS}} ->
+            Sup ! exited,
+            otp_3906_forker(N-1, Parent, Ref, Sup, Prog);
+        {Port, Res} ->
+            exit(Res);
+        Other ->
+            exit(Other)
     end.
 
 
-otp_4389(suite) -> [];
-otp_4389(doc) -> [];
 otp_4389(Config)  when is_list(Config) ->
     case os:type() of
-	{unix, _} ->
-	    Dog = test_server:timetrap(test_server:seconds(240)),
-	    TCR = self(),
-	    case get_true_cmd() of
-		True when is_list(True) ->
-		    lists:foreach(
-			    fun (P) ->
-				    receive
-					      {P, ok} ->  ok;
-					      {P, Err} -> ?t:fail(Err)
-					  end
-			    end,
-			    lists:map(
-			      fun(_) ->
-				      spawn_link(
-					fun() ->
-						process_flag(trap_exit, true),
-						case catch open_port({spawn, True},
-								     [stream,exit_status]) of
-						    P when is_port(P) ->
-							receive
-							    {P,{exit_status,_}} ->
-								TCR ! {self(),ok};
-							    {'EXIT',_,{R2,_}} when R2 == emfile;
-										   R2 == eagain ->
-								TCR ! {self(),ok};
-							    Err2 ->
-								TCR ! {self(),{msg,Err2}}
-							end;
-						    {'EXIT',{R1,_}} when R1 == emfile;
-									 R1 == eagain ->
-							TCR ! {self(),ok};
-						    Err1 ->
-							TCR ! {self(), {open_port,Err1}}
-						end
-					end)
-			      end,
-			      lists:duplicate(1000,[]))),
-		    test_server:timetrap_cancel(Dog),
-		    {comment,
-		     "This test case doesn't always fail when the bug that "
-		     "it tests for is present (it is most likely to fail on"
-		     " a multi processor machine). If the test case fails it"
-		     " will fail by deadlocking the emulator."};
-		_ ->
-		    {skipped, "\"true\" command not found"}
-	    end;
-	_ ->
-	    {skip,"Only run on Unix"}
+        {unix, _} ->
+            ct:timetrap({minutes, 4}),
+            TCR = self(),
+            case get_true_cmd() of
+                True when is_list(True) ->
+                    lists:foreach(
+                      fun (P) ->
+                              receive
+                                  {P, ok} ->  ok;
+                                  {P, Err} -> ct:fail(Err)
+                              end
+                      end,
+                      lists:map(
+                        fun(_) ->
+                                spawn_link(
+                                  fun() ->
+                                          process_flag(trap_exit, true),
+                                          case catch open_port({spawn, True},
+                                                               [stream,exit_status]) of
+                                              P when is_port(P) ->
+                                                  receive
+                                                      {P,{exit_status,_}} ->
+                                                          TCR ! {self(),ok};
+                                                      {'EXIT',_,{R2,_}} when R2 == emfile;
+                                                                             R2 == eagain;
+                                                                             R2 == enomem ->
+                                                          TCR ! {self(),ok};
+                                                      Err2 ->
+                                                          TCR ! {self(),{msg,Err2}}
+                                                  end;
+                                              {'EXIT',{R1,_}} when R1 == emfile;
+                                                                   R1 == eagain;
+                                                                   R1 == enomem ->
+                                                  TCR ! {self(),ok};
+                                              Err1 ->
+                                                  TCR ! {self(), {open_port,Err1}}
+                                          end
+                                  end)
+                        end,
+                        lists:duplicate(1000,[]))),
+                    {comment,
+                     "This test case doesn't always fail when the bug that "
+                     "it tests for is present (it is most likely to fail on"
+                     " a multi processor machine). If the test case fails it"
+                     " will fail by deadlocking the emulator."};
+                _ ->
+                    {skipped, "\"true\" command not found"}
+            end;
+        _ ->
+            {skip,"Only run on Unix"}
     end.
 
 get_true_cmd() ->
     DoFileExist = fun (FileName) ->
- 			  case file:read_file_info(FileName) of
- 			      {ok, _} -> throw(FileName);
- 			      _ -> not_found
- 			  end
- 		  end,
+                          case file:read_file_info(FileName) of
+                              {ok, _} -> throw(FileName);
+                              _ -> not_found
+                          end
+                  end,
     catch begin
- 	      %% First check in /usr/bin and /bin
- 	      DoFileExist("/usr/bin/true"),
- 	      DoFileExist("/bin/true"),
- 	      %% Try which
- 	      case filename:dirname(os:cmd("which true")) of
- 		  "." -> not_found;
- 		  TrueDir -> filename:join(TrueDir, "true")
- 	      end
- 	  end.
+              %% First check in /usr/bin and /bin
+              DoFileExist("/usr/bin/true"),
+              DoFileExist("/bin/true"),
+              %% Try which
+              case filename:dirname(os:cmd("which true")) of
+                  "." -> not_found;
+                  TrueDir -> filename:join(TrueDir, "true")
+              end
+          end.
 
 %% 'exit_status' option
-exit_status(suite) ->
-    [];
-exit_status(doc) ->
-    ["Test that the 'exit_status' option works"];
+%%
+%% Test that the 'exit_status' option works
 exit_status(Config)  when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(60)),
-    port_expect(Config,[{"x",
-			       [{exit_status, 5}]}],
-		      1, "", [exit_status]),
-    test_server:timetrap_cancel(Dog),
+    ct:timetrap({minutes, 1}),
+    port_expect(Config,
+                [{"x", [{exit_status, 5}]}],
+                1, "", [exit_status]),
     ok.
 
-spawn_driver(suite) ->
-    [];
-spawn_driver(doc) ->
-    ["Test spawning a driver specifically"];
+%% Test spawning a driver specifically
 spawn_driver(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "echo_drv"),
     Port = erlang:open_port({spawn_driver, "echo_drv"}, []),
     Port ! {self(), {command, "Hello port!"}},
     receive 
-	      {Port, {data, "Hello port!"}} = Msg1 -> 
-		  io:format("~p~n", [Msg1]),
-		  ok; 
-	      Other ->
-		  test_server:fail({unexpected, Other})
-	  end,
+        {Port, {data, "Hello port!"}} = Msg1 -> 
+            io:format("~p~n", [Msg1]),
+            ok; 
+        Other ->
+            ct:fail({unexpected, Other})
+    end,
     Port ! {self(), close},
     receive {Port, closed} -> ok end,
 
     Port2 = erlang:open_port({spawn_driver, "echo_drv -Hello port?"}, 
-				   []),
+                             []),
     receive 
-	      {Port2, {data, "Hello port?"}} = Msg2 -> 
-		  io:format("~p~n", [Msg2]),
-		  ok; 
-	      Other2 ->
-		  test_server:fail({unexpected2, Other2})
-	  end,
+        {Port2, {data, "Hello port?"}} = Msg2 -> 
+            io:format("~p~n", [Msg2]),
+            ok; 
+        Other2 ->
+            ct:fail({unexpected2, Other2})
+    end,
     Port2 ! {self(), close},
     receive {Port2, closed} -> ok end,
     {'EXIT',{badarg,_}} = (catch erlang:open_port({spawn_driver, "ls"}, [])),
     {'EXIT',{badarg,_}} = (catch erlang:open_port({spawn_driver, "cmd"}, [])),
     {'EXIT',{badarg,_}} = (catch erlang:open_port({spawn_driver, os:find_executable("erl")}, [])),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-parallelism_option(suite) ->
-    [];
-parallelism_option(doc) ->
-    ["Test parallelism option of open_port"];
+%% Test parallelism option of open_port
 parallelism_option(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
-    ?line ok = load_driver(Path, "echo_drv"),
-    ?line Port = erlang:open_port({spawn_driver, "echo_drv"},
-				  [{parallelism, true}]),
-    ?line {parallelism, true} = erlang:port_info(Port, parallelism),
-    ?line Port ! {self(), {command, "Hello port!"}},
-    ?line receive 
-	      {Port, {data, "Hello port!"}} = Msg1 -> 
-		  io:format("~p~n", [Msg1]),
-		  ok; 
-	      Other ->
-		  test_server:fail({unexpected, Other})
-	  end,
-    ?line Port ! {self(), close},
-    ?line receive {Port, closed} -> ok end,
-
-    ?line Port2 = erlang:open_port({spawn_driver, "echo_drv -Hello port?"}, 
-				   [{parallelism, false}]),
-    ?line {parallelism, false} = erlang:port_info(Port2, parallelism),
-    ?line receive 
-	      {Port2, {data, "Hello port?"}} = Msg2 -> 
-		  io:format("~p~n", [Msg2]),
-		  ok; 
-	      Other2 ->
-		  test_server:fail({unexpected2, Other2})
-	  end,
-    ?line Port2 ! {self(), close},
-    ?line receive {Port2, closed} -> ok end,
-    ?line test_server:timetrap_cancel(Dog),
+    Path = proplists:get_value(data_dir, Config),
+    ok = load_driver(Path, "echo_drv"),
+    Port = erlang:open_port({spawn_driver, "echo_drv"},
+                            [{parallelism, true}]),
+    {parallelism, true} = erlang:port_info(Port, parallelism),
+    Port ! {self(), {command, "Hello port!"}},
+    receive 
+        {Port, {data, "Hello port!"}} = Msg1 -> 
+            io:format("~p~n", [Msg1]),
+            ok; 
+        Other ->
+            ct:fail({unexpected, Other})
+    end,
+    Port ! {self(), close},
+    receive {Port, closed} -> ok end,
+
+    Port2 = erlang:open_port({spawn_driver, "echo_drv -Hello port?"}, 
+                             [{parallelism, false}]),
+    {parallelism, false} = erlang:port_info(Port2, parallelism),
+    receive 
+        {Port2, {data, "Hello port?"}} = Msg2 -> 
+            io:format("~p~n", [Msg2]),
+            ok; 
+        Other2 ->
+            ct:fail({unexpected2, Other2})
+    end,
+    Port2 ! {self(), close},
+    receive {Port2, closed} -> ok end,
     ok.
 
-spawn_executable(suite) ->
-    [];
-spawn_executable(doc) ->
-    ["Test spawning an executable specifically"];
+%% Test spawning an executable specifically
 spawn_executable(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     EchoArgs1 = filename:join([DataDir,"echo_args"]),
     ExactFile1 = filename:nativename(os:find_executable(EchoArgs1)),
     [ExactFile1] = run_echo_args(DataDir,[]),
@@ -1376,25 +1369,25 @@ spawn_executable(Config) when is_list(Config) ->
     ["echo_arguments"] = run_echo_args(DataDir,["echo_arguments"]),
     ["echo_arguments"] = run_echo_args(DataDir,[binary, "echo_arguments"]),
     [ExactFile1,"hello world","dlrow olleh"] = 
-	run_echo_args(DataDir,[ExactFile1,"hello world","dlrow olleh"]),
+    run_echo_args(DataDir,[ExactFile1,"hello world","dlrow olleh"]),
     [ExactFile1] = run_echo_args(DataDir,[default]),
     [ExactFile1] = run_echo_args(DataDir,[binary, default]),
     [ExactFile1,"hello world","dlrow olleh"] = 
-	run_echo_args(DataDir,[switch_order,ExactFile1,"hello world",
-			       "dlrow olleh"]),
+    run_echo_args(DataDir,[switch_order,ExactFile1,"hello world",
+                           "dlrow olleh"]),
     [ExactFile1,"hello world","dlrow olleh"] = 
-	run_echo_args(DataDir,[binary,switch_order,ExactFile1,"hello world",
-			       "dlrow olleh"]),
+    run_echo_args(DataDir,[binary,switch_order,ExactFile1,"hello world",
+                           "dlrow olleh"]),
     [ExactFile1,"hello world","dlrow olleh"] =
-	run_echo_args(DataDir,[default,"hello world","dlrow olleh"]),
+    run_echo_args(DataDir,[default,"hello world","dlrow olleh"]),
 
     [ExactFile1,"hello world","dlrow olleh"] = 
-	run_echo_args_2("\""++ExactFile1++"\" "++"\"hello world\" \"dlrow olleh\""),
+    run_echo_args_2("\""++ExactFile1++"\" "++"\"hello world\" \"dlrow olleh\""),
     [ExactFile1,"hello world","dlrow olleh"] =
-	run_echo_args_2(unicode:characters_to_binary("\""++ExactFile1++"\" "++"\"hello world\" \"dlrow olleh\"")),
+    run_echo_args_2(unicode:characters_to_binary("\""++ExactFile1++"\" "++"\"hello world\" \"dlrow olleh\"")),
 
-    PrivDir = ?config(priv_dir, Config),
-    SpaceDir =filename:join([PrivDir,"With Spaces"]),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    SpaceDir = filename:join([PrivDir,"With Spaces"]),
     file:make_dir(SpaceDir),
     Executable = filename:basename(ExactFile1),
     file:copy(ExactFile1,filename:join([SpaceDir,Executable])),
@@ -1405,33 +1398,32 @@ spawn_executable(Config) when is_list(Config) ->
     ["echo_args"] = run_echo_args(SpaceDir,["echo_args"]),
     ["echo_arguments"] = run_echo_args(SpaceDir,["echo_arguments"]),
     [ExactFile2,"hello world","dlrow olleh"] = 
-	run_echo_args(SpaceDir,[ExactFile2,"hello world","dlrow olleh"]),
+    run_echo_args(SpaceDir,[ExactFile2,"hello world","dlrow olleh"]),
     [ExactFile2,"hello world","dlrow olleh"] =
-	run_echo_args(SpaceDir,[binary, ExactFile2,"hello world","dlrow olleh"]),
+    run_echo_args(SpaceDir,[binary, ExactFile2,"hello world","dlrow olleh"]),
 
     [ExactFile2,"hello \"world\"","\"dlrow\" olleh"] =
-	run_echo_args(SpaceDir,[binary, ExactFile2,"hello \"world\"","\"dlrow\" olleh"]),
+    run_echo_args(SpaceDir,[binary, ExactFile2,"hello \"world\"","\"dlrow\" olleh"]),
     [ExactFile2,"hello \"world\"","\"dlrow\" olleh"] =
-	run_echo_args(SpaceDir,[binary, ExactFile2,"hello \"world\"","\"dlrow\" olleh"]),
+    run_echo_args(SpaceDir,[binary, ExactFile2,"hello \"world\"","\"dlrow\" olleh"]),
 
     [ExactFile2] = run_echo_args(SpaceDir,[default]),
     [ExactFile2,"hello world","dlrow olleh"] = 
-	run_echo_args(SpaceDir,[switch_order,ExactFile2,"hello world",
-			       "dlrow olleh"]),
+    run_echo_args(SpaceDir,[switch_order,ExactFile2,"hello world", "dlrow olleh"]),
     [ExactFile2,"hello world","dlrow olleh"] = 
-	run_echo_args(SpaceDir,[default,"hello world","dlrow olleh"]),
+    run_echo_args(SpaceDir,[default,"hello world","dlrow olleh"]),
     [ExactFile2,"hello world","dlrow olleh"] = 
-	run_echo_args_2("\""++ExactFile2++"\" "++"\"hello world\" \"dlrow olleh\""),
+    run_echo_args_2("\""++ExactFile2++"\" "++"\"hello world\" \"dlrow olleh\""),
     [ExactFile2,"hello world","dlrow olleh"] =
-	run_echo_args_2(unicode:characters_to_binary("\""++ExactFile2++"\" "++"\"hello world\" \"dlrow olleh\"")),
+    run_echo_args_2(unicode:characters_to_binary("\""++ExactFile2++"\" "++"\"hello world\" \"dlrow olleh\"")),
 
     ExeExt = 
-	case string:to_lower(lists:last(string:tokens(ExactFile2,"."))) of
-	    "exe" ->
-		".exe";
-	    _ ->
-		""
-	end,
+    case string:to_lower(lists:last(string:tokens(ExactFile2,"."))) of
+        "exe" ->
+            ".exe";
+        _ ->
+            ""
+    end,
     Executable2 = "spoky name"++ExeExt,
     file:copy(ExactFile1,filename:join([SpaceDir,Executable2])),
     ExactFile3 = filename:nativename(filename:join([SpaceDir,Executable2])),
@@ -1440,38 +1432,37 @@ spawn_executable(Config) when is_list(Config) ->
     ["echo_args"] = run_echo_args(SpaceDir,Executable2,["echo_args"]),
     ["echo_arguments"] = run_echo_args(SpaceDir,Executable2,["echo_arguments"]),
     [ExactFile3,"hello world","dlrow olleh"] = 
-	run_echo_args(SpaceDir,Executable2,[ExactFile3,"hello world","dlrow olleh"]),
+    run_echo_args(SpaceDir,Executable2,[ExactFile3,"hello world","dlrow olleh"]),
     [ExactFile3] = run_echo_args(SpaceDir,Executable2,[default]),
     [ExactFile3,"hello world","dlrow olleh"] = 
-	run_echo_args(SpaceDir,Executable2,
-		      [switch_order,ExactFile3,"hello world",
-		       "dlrow olleh"]),
+    run_echo_args(SpaceDir,Executable2,
+                  [switch_order,ExactFile3,"hello world",
+                   "dlrow olleh"]),
     [ExactFile3,"hello world","dlrow olleh"] = 
-	run_echo_args(SpaceDir,Executable2,
-		      [default,"hello world","dlrow olleh"]),
+    run_echo_args(SpaceDir,Executable2,
+                  [default,"hello world","dlrow olleh"]),
     [ExactFile3,"hello world","dlrow olleh"] = 
-	run_echo_args_2("\""++ExactFile3++"\" "++"\"hello world\" \"dlrow olleh\""),
+    run_echo_args_2("\""++ExactFile3++"\" "++"\"hello world\" \"dlrow olleh\""),
     [ExactFile3,"hello world","dlrow olleh"] =
-	run_echo_args_2(unicode:characters_to_binary("\""++ExactFile3++"\" "++"\"hello world\" \"dlrow olleh\"")),
+    run_echo_args_2(unicode:characters_to_binary("\""++ExactFile3++"\" "++"\"hello world\" \"dlrow olleh\"")),
     {'EXIT',{enoent,_}} = (catch run_echo_args(SpaceDir,"fnurflmonfi",
-						     [default,"hello world",
-						      "dlrow olleh"])),
+                                               [default,"hello world",
+                                                "dlrow olleh"])),
 
     NonExec = "kronxfrt"++ExeExt,
     file:write_file(filename:join([SpaceDir,NonExec]),
-			  <<"Not an executable">>),
+                    <<"Not an executable">>),
     {'EXIT',{eacces,_}} = (catch run_echo_args(SpaceDir,NonExec,
-						     [default,"hello world",
-						      "dlrow olleh"])),
+                                               [default,"hello world",
+                                                "dlrow olleh"])),
     {'EXIT',{enoent,_}} = (catch open_port({spawn_executable,"cmd"},[])),
     {'EXIT',{enoent,_}} = (catch open_port({spawn_executable,"sh"},[])),
     case os:type() of
-	{win32,_} ->
-	    test_bat_file(SpaceDir);
-	{unix,_} ->
-	    test_sh_file(SpaceDir)
+        {win32,_} ->
+            test_bat_file(SpaceDir);
+        {unix,_} ->
+            test_sh_file(SpaceDir)
     end,
-    test_server:timetrap_cancel(Dog),
     ok.
 
 unregister_name(Config) when is_list(Config) ->
@@ -1482,29 +1473,29 @@ test_bat_file(Dir) ->
     FN = "tf.bat",
     Full = filename:join([Dir,FN]),
     D = [<<"@echo off\r\n">>,
-	 <<"echo argv[0]:^|%0^|\r\n">>,
-	 <<"if \"%1\" == \"\" goto done\r\n">>,
-	 <<"echo argv[1]:^|%1^|\r\n">>,
-	 <<"if \"%2\" == \"\" goto done\r\n">>,
-	 <<"echo argv[2]:^|%2^|\r\n">>,
-	 <<"if \"%3\" == \"\" goto done\r\n">>,
-	 <<"echo argv[3]:^|%3^|\r\n">>,
-	 <<"if \"%4\" == \"\" goto done\r\n">>,
-	 <<"echo argv[4]:^|%4^|\r\n">>,
-	 <<"if \"%5\" == \"\" goto done\r\n">>,
-	 <<"echo argv[5]:^|%5^|\r\n">>,
-	 <<"\r\n">>,
-	 <<":done\r\n">>,
-	 <<"\r\n">>],
+         <<"echo argv[0]:^|%0^|\r\n">>,
+         <<"if \"%1\" == \"\" goto done\r\n">>,
+         <<"echo argv[1]:^|%1^|\r\n">>,
+         <<"if \"%2\" == \"\" goto done\r\n">>,
+         <<"echo argv[2]:^|%2^|\r\n">>,
+         <<"if \"%3\" == \"\" goto done\r\n">>,
+         <<"echo argv[3]:^|%3^|\r\n">>,
+         <<"if \"%4\" == \"\" goto done\r\n">>,
+         <<"echo argv[4]:^|%4^|\r\n">>,
+         <<"if \"%5\" == \"\" goto done\r\n">>,
+         <<"echo argv[5]:^|%5^|\r\n">>,
+         <<"\r\n">>,
+         <<":done\r\n">>,
+         <<"\r\n">>],
     file:write_file(Full,list_to_binary(D)),
     EF = filename:basename(FN),
     [DN,"hello","world"] = 
-	run_echo_args(Dir,FN,
-		      [default,"hello","world"]),
+    run_echo_args(Dir,FN,
+                  [default,"hello","world"]),
     %% The arg0 argumant should be ignored when running batch files
     [DN,"hello","world"] = 
-	run_echo_args(Dir,FN,
-		      ["knaskurt","hello","world"]),
+    run_echo_args(Dir,FN,
+                  ["knaskurt","hello","world"]),
     EF = filename:basename(DN),
     ok.
 
@@ -1512,40 +1503,40 @@ test_sh_file(Dir) ->
     FN = "tf.sh",
     Full = filename:join([Dir,FN]),
     D = [<<"#! /bin/sh\n">>,
-	 <<"echo 'argv[0]:|'$0'|'\n">>,
-	 <<"i=1\n">>,
-	 <<"while [ '!' -z \"$1\" ]; do\n">>,
-	 <<"    echo 'argv['$i']:|'\"$1\"'|'\n">>,
-	 <<"    shift\n">>,
-	 <<"    i=`expr $i + 1`\n">>,
-	 <<"done\n">>],
+         <<"echo 'argv[0]:|'$0'|'\n">>,
+         <<"i=1\n">>,
+         <<"while [ '!' -z \"$1\" ]; do\n">>,
+         <<"    echo 'argv['$i']:|'\"$1\"'|'\n">>,
+         <<"    shift\n">>,
+         <<"    i=`expr $i + 1`\n">>,
+         <<"done\n">>],
     file:write_file(Full,list_to_binary(D)),
     chmodplusx(Full),
     [Full,"hello","world"] = 
-	run_echo_args(Dir,FN,
-		      [default,"hello","world"]),
+    run_echo_args(Dir,FN,
+                  [default,"hello","world"]),
     [Full,"hello","world of spaces"] = 
-	run_echo_args(Dir,FN,
-		      [default,"hello","world of spaces"]),
+    run_echo_args(Dir,FN,
+                  [default,"hello","world of spaces"]),
     file:write_file(filename:join([Dir,"testfile1"]),<<"testdata1">>),
     file:write_file(filename:join([Dir,"testfile2"]),<<"testdata2">>),
     Pattern = filename:join([Dir,"testfile*"]),
     L = filelib:wildcard(Pattern),
     2 = length(L),
     [Full,"hello",Pattern] = 
-	run_echo_args(Dir,FN,
-		      [default,"hello",Pattern]),
-     ok.
+    run_echo_args(Dir,FN,
+                  [default,"hello",Pattern]),
+    ok.
+
 
-    
 
 chmodplusx(Filename) ->
     case file:read_file_info(Filename) of
-	{ok,FI} ->
-	    FI2 = FI#file_info{mode = ((FI#file_info.mode) bor 8#00100)},
-	    file:write_file_info(Filename,FI2);
-	_ ->
-	    ok
+        {ok,FI} ->
+            FI2 = FI#file_info{mode = ((FI#file_info.mode) bor 8#00100)},
+            file:write_file_info(Filename,FI2);
+        _ ->
+            ok
     end.
 
 run_echo_args_2(FullnameAndArgs) ->
@@ -1554,7 +1545,7 @@ run_echo_args_2(FullnameAndArgs) ->
     Port ! {self(), close},
     receive {Port, closed} -> ok end,
     parse_echo_args_output(Data).
-    
+
 
 run_echo_args(Where,Args) ->
     run_echo_args(Where,"echo_args",Args).
@@ -1562,9 +1553,9 @@ run_echo_args(Where,Prog,Args) ->
     {Binary, ArgvArg} = pack_argv(Args),
     Command0 = filename:join([Where,Prog]),
     Command = case Binary of
-		  true -> unicode:characters_to_binary(Command0);
-		  false -> Command0
-	      end,
+                  true -> unicode:characters_to_binary(Command0);
+                  false -> Command0
+              end,
     Port = open_port({spawn_executable,Command},ArgvArg++[eof]),
     Data = collect_data(Port),
     Port ! {self(), close},
@@ -1578,14 +1569,14 @@ pack_argv(Args) ->
 
 pack_argv(Args, Binary) ->
     case Args of
-	[] ->
-	    [];
-	[default|T] ->
-	    [{args,[make_bin(Arg,Binary) || Arg <- T]}];
-	[switch_order,H|T] ->
-	    [{args,[make_bin(Arg,Binary) || Arg <- T]},{arg0,make_bin(H,Binary)}];
-	[H|T] ->
-	    [{arg0,make_bin(H,Binary)},{args,[make_bin(Arg,Binary) || Arg <- T]}]
+        [] ->
+            [];
+        [default|T] ->
+            [{args,[make_bin(Arg,Binary) || Arg <- T]}];
+        [switch_order,H|T] ->
+            [{args,[make_bin(Arg,Binary) || Arg <- T]},{arg0,make_bin(H,Binary)}];
+        [H|T] ->
+            [{arg0,make_bin(H,Binary)},{args,[make_bin(Arg,Binary) || Arg <- T]}]
     end.
 
 make_bin(Str, false) -> Str;
@@ -1593,54 +1584,49 @@ make_bin(Str, true) ->  unicode:characters_to_binary(Str).
 
 collect_data(Port) ->
     receive
-	{Port, {data, Data}} ->
-	    Data ++ collect_data(Port);
-	{Port, eof} ->
-	    []
+        {Port, {data, Data}} ->
+            Data ++ collect_data(Port);
+        {Port, eof} ->
+            []
     end.
 
 parse_echo_args_output(Data) ->
     [lists:last(string:tokens(S,"|")) || S <- string:tokens(Data,"\r\n")].
 
-mix_up_ports(suite) ->
-    [];
-mix_up_ports(doc) ->
-    ["Test that the emulator does not mix up ports when the port table wraps"];
+%% Test that the emulator does not mix up ports when the port table wraps
 mix_up_ports(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "echo_drv"),
     Port = erlang:open_port({spawn, "echo_drv"}, []),
     Port ! {self(), {command, "Hello port!"}},
     receive 
-	      {Port, {data, "Hello port!"}} = Msg1 -> 
-		  io:format("~p~n", [Msg1]),
-		  ok; 
-	      Other ->
-		  test_server:fail({unexpected, Other})
-	  end,
+        {Port, {data, "Hello port!"}} = Msg1 -> 
+            io:format("~p~n", [Msg1]),
+            ok; 
+        Other ->
+            ct:fail({unexpected, Other})
+    end,
     Port ! {self(), close},
     receive {Port, closed} -> ok end,
     loop(start, done,
-	       fun(P) ->
-		       Q = 
-			   (catch erlang:open_port({spawn, "echo_drv"}, [])),
-%%		       io:format("~p ", [Q]),
-		       if is_port(Q) ->
-			       Q;
-			  true ->
-			       io:format("~p~n", [P]),
-			       done
-		       end
-	       end),
+         fun(P) ->
+                 Q = 
+                 (catch erlang:open_port({spawn, "echo_drv"}, [])),
+                 %%		       io:format("~p ", [Q]),
+                 if is_port(Q) ->
+                        Q;
+                    true ->
+                        io:format("~p~n", [P]),
+                        done
+                 end
+         end),
     Port ! {self(), {command, "Hello again port!"}},
     receive 
-	      Msg2 ->
-		  test_server:fail({unexpected, Msg2})
-	  after 1000 ->
-		  ok
-	  end,
-    test_server:timetrap_cancel(Dog),
+        Msg2 ->
+            ct:fail({unexpected, Msg2})
+    after 1000 ->
+              ok
+    end,
     ok.
 
 loop(Stop, Stop, Fun) when is_function(Fun) ->
@@ -1649,131 +1635,118 @@ loop(Start, Stop, Fun) when is_function(Fun) ->
     loop(Fun(Start), Stop, Fun).
 
 
-otp_5112(suite) ->
-    [];
-otp_5112(doc) ->
-    ["Test that link to connected process is taken away when port calls",
-     "driver_exit() also when the port index has wrapped"];
+%% Test that link to connected process is taken away when port calls
+%% driver_exit() also when the port index has wrapped
 otp_5112(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "exit_drv"),
     Port = otp_5112_get_wrapped_port(),
-    ?t:format("Max ports: ~p~n",[max_ports()]),
-    ?t:format("Port: ~p~n",[Port]),
+    io:format("Max ports: ~p~n",[max_ports()]),
+    io:format("Port: ~p~n",[Port]),
     {links, Links1} = process_info(self(),links),
-    ?t:format("Links1: ~p~n",[Links1]),
+    io:format("Links1: ~p~n",[Links1]),
     true = lists:member(Port, Links1),
     Port ! {self(), {command, ""}},
-    ?line wait_until(fun () -> lists:member(Port, erlang:ports()) == false end),
+    wait_until(fun () -> lists:member(Port, erlang:ports()) == false end),
     {links, Links2} = process_info(self(),links),
-    ?t:format("Links2: ~p~n",[Links2]),
+    io:format("Links2: ~p~n",[Links2]),
     false = lists:member(Port, Links2), %% This used to fail
-    test_server:timetrap_cancel(Dog),
     ok.
 
 otp_5112_get_wrapped_port() ->
     P1 = erlang:open_port({spawn, "exit_drv"}, []),
     case port_ix(P1) < max_ports() of
-	      true ->
-		  ?t:format("Need to wrap port index (~p)~n", [P1]),
-		  otp_5112_wrap_port_ix([P1]),
-		  P2 = erlang:open_port({spawn, "exit_drv"}, []),
-		  false = port_ix(P2) < max_ports(),
-		  P2;
-	      false ->
-		  ?t:format("Port index already wrapped (~p)~n", [P1]),
-		  P1
-	  end.
+        true ->
+            io:format("Need to wrap port index (~p)~n", [P1]),
+            otp_5112_wrap_port_ix([P1]),
+            P2 = erlang:open_port({spawn, "exit_drv"}, []),
+            false = port_ix(P2) < max_ports(),
+            P2;
+        false ->
+            io:format("Port index already wrapped (~p)~n", [P1]),
+            P1
+    end.
 
 otp_5112_wrap_port_ix(Ports) ->
     case (catch erlang:open_port({spawn, "exit_drv"}, [])) of
-	      Port when is_port(Port) ->
-		  otp_5112_wrap_port_ix([Port|Ports]);
-	      _ ->
-		  %% Port table now full; empty port table
-		  lists:foreach(fun (P) ->  P ! {self(), close} end,
-				      Ports),
-		  ok
-	  end.
+        Port when is_port(Port) ->
+            otp_5112_wrap_port_ix([Port|Ports]);
+        _ ->
+            %% Port table now full; empty port table
+            lists:foreach(fun (P) ->  P ! {self(), close} end,
+                          Ports),
+            ok
+    end.
 
 
-otp_5119(suite) ->
-    [];
-otp_5119(doc) ->
-    ["Test that port index is not unnecessarily wrapped"];
+%% Test that port index is not unnecessarily wrapped
 otp_5119(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "exit_drv"),
     PI1 = port_ix(otp_5119_fill_empty_port_tab([])),
     Port2 = erlang:open_port({spawn, "exit_drv"}, []),
     PI2 = port_ix(Port2),
     {PortIx1, PortIx2} = case PI2 > PI1 of
-	true ->
-	    {PI1, PI2};
-	false ->
-	    {port_ix(otp_5119_fill_empty_port_tab([Port2])),
-		port_ix(erlang:open_port({spawn, "exit_drv"}, []))}
-    end,
+                             true ->
+                                 {PI1, PI2};
+                             false ->
+                                 {port_ix(otp_5119_fill_empty_port_tab([Port2])),
+                                  port_ix(erlang:open_port({spawn, "exit_drv"}, []))}
+                         end,
     MaxPorts = max_ports(),
-    ?t:format("PortIx1 = ~p ~p~n", [PI1, PortIx1]),
-    ?t:format("PortIx2 = ~p ~p~n", [PI2, PortIx2]),
-    ?t:format("MaxPorts = ~p~n", [MaxPorts]),
+    io:format("PortIx1 = ~p ~p~n", [PI1, PortIx1]),
+    io:format("PortIx2 = ~p ~p~n", [PI2, PortIx2]),
+    io:format("MaxPorts = ~p~n", [MaxPorts]),
     true = PortIx2 > PortIx1,
     true = PortIx2 =< PortIx1 + MaxPorts,
-    test_server:timetrap_cancel(Dog),
     ok.
 
 otp_5119_fill_empty_port_tab(Ports) ->
     case (catch erlang:open_port({spawn, "exit_drv"}, [])) of
-	      Port when is_port(Port) ->
-		  otp_5119_fill_empty_port_tab([Port|Ports]);
-	      _ ->
-		  %% Port table now full; empty port table
-		  lists:foreach(fun (P) ->  P ! {self(), close} end,
-				      Ports),
-		  [LastPort|_] = Ports,
-		  LastPort
-	  end.
+        Port when is_port(Port) ->
+            otp_5119_fill_empty_port_tab([Port|Ports]);
+        _ ->
+            %% Port table now full; empty port table
+            lists:foreach(fun (P) ->  P ! {self(), close} end,
+                          Ports),
+            [LastPort|_] = Ports,
+            LastPort
+    end.
 
 max_ports() ->
     erlang:system_info(port_limit).
 
 port_ix(Port) when is_port(Port) ->
     ["#Port",_,PortIxStr] = string:tokens(erlang:port_to_list(Port),
-						"<.>"),
+                                          "<.>"),
     list_to_integer(PortIxStr).
 
 
-otp_6224(doc) -> ["Check that port command failure doesn't crash the emulator"];
-otp_6224(suite) -> [];
+%% Check that port command failure doesn't crash the emulator
 otp_6224(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "failure_drv"),
     Go = make_ref(),
     Failer = spawn(fun () ->
-				 receive Go -> ok end,
-				 Port = open_port({spawn, "failure_drv"},
-							[]),
-				 Port ! {self(), {command, "Fail, please!"}},
-				 otp_6224_loop()
-			 end),
+                           receive Go -> ok end,
+                           Port = open_port({spawn, "failure_drv"},
+                                            []),
+                           Port ! {self(), {command, "Fail, please!"}},
+                           otp_6224_loop()
+                   end),
     Mon = erlang:monitor(process, Failer),
     Failer ! Go,
     receive
-	      {'DOWN', Mon, process, Failer, Reason} ->
-		  case Reason of
-			    {driver_failed, _} -> ok;
-			    driver_failed -> ok;
-			    _ -> ?t:fail({unexpected_exit_reason,
-						Reason})
-			end
-	  end,
-    test_server:timetrap_cancel(Dog),
+        {'DOWN', Mon, process, Failer, Reason} ->
+            case Reason of
+                {driver_failed, _} -> ok;
+                driver_failed -> ok;
+                _ -> ct:fail({unexpected_exit_reason,
+                              Reason})
+            end
+    end,
     ok.
-    
+
 otp_6224_loop() ->
     receive _ -> ok after 0 -> ok end,
     otp_6224_loop().
@@ -1782,29 +1755,26 @@ otp_6224_loop() ->
 -define(EXIT_STATUS_MSB_MAX_PROCS, 64).
 -define(EXIT_STATUS_MSB_MAX_PORTS, 300).
 
-exit_status_multi_scheduling_block(doc) -> [];
-exit_status_multi_scheduling_block(suite) -> [];
 exit_status_multi_scheduling_block(Config) when is_list(Config) ->
     Repeat = 3,
-    case ?t:os_type() of
-	      {unix, _} ->
-		  Dog = ?t:timetrap(test_server:minutes(2*Repeat)),
-		  SleepSecs = 6,
-		  try
-		      lists:foreach(fun (_) ->
-					    exit_status_msb_test(Config,
-								 SleepSecs)
-				    end,
-				    lists:seq(1, Repeat))
-		  after
-		      %% Wait for the system to recover (regardless
-		      %% of success or not) otherwise later testcases
-		      %% may unnecessarily fail.
-		      ?t:timetrap_cancel(Dog),
-		      receive after SleepSecs+500 -> ok end
-		  end;
-	      _ -> {skip, "Not implemented for this OS"}
-	  end.
+    case os:type() of
+        {unix, _} ->
+            ct:timetrap({minutes, 2*Repeat}),
+            SleepSecs = 6,
+            try
+                lists:foreach(fun (_) ->
+                                      exit_status_msb_test(Config,
+                                                           SleepSecs)
+                              end,
+                              lists:seq(1, Repeat))
+            after
+                %% Wait for the system to recover (regardless
+                %% of success or not) otherwise later testcases
+                %% may unnecessarily fail.
+                receive after SleepSecs+500 -> ok end
+            end;
+        _ -> {skip, "Not implemented for this OS"}
+    end.
 
 exit_status_msb_test(Config, SleepSecs) when is_list(Config) ->
     %%
@@ -1814,131 +1784,131 @@ exit_status_msb_test(Config, SleepSecs) when is_list(Config) ->
     %% 
     NoSchedsOnln = erlang:system_info(schedulers_online),
     Parent = self(),
-    ?t:format("SleepSecs = ~p~n", [SleepSecs]),
+    io:format("SleepSecs = ~p~n", [SleepSecs]),
     PortProg = "sleep " ++ integer_to_list(SleepSecs),
     Start = erlang:monotonic_time(micro_seconds),
     NoProcs = case NoSchedsOnln of
-			NProcs when NProcs < ?EXIT_STATUS_MSB_MAX_PROCS ->
-			    NProcs;
-			_ ->
-			    ?EXIT_STATUS_MSB_MAX_PROCS
-		    end,
+                  NProcs when NProcs < ?EXIT_STATUS_MSB_MAX_PROCS ->
+                      NProcs;
+                  _ ->
+                      ?EXIT_STATUS_MSB_MAX_PROCS
+              end,
     NoPortsPerProc = case 20*NoProcs of
-			       TNPorts when TNPorts < ?EXIT_STATUS_MSB_MAX_PORTS -> 20;
-			       _ -> ?EXIT_STATUS_MSB_MAX_PORTS div NoProcs
-			   end,
-    ?t:format("NoProcs = ~p~nNoPortsPerProc = ~p~n",
-		    [NoProcs, NoPortsPerProc]),
+                         TNPorts when TNPorts < ?EXIT_STATUS_MSB_MAX_PORTS -> 20;
+                         _ -> ?EXIT_STATUS_MSB_MAX_PORTS div NoProcs
+                     end,
+    io:format("NoProcs = ~p~nNoPortsPerProc = ~p~n",
+              [NoProcs, NoPortsPerProc]),
     ProcFun
-	= fun () ->
-		  PrtSIds = lists:map(
-			      fun (_) ->
-				      erlang:yield(),
-				      case catch open_port({spawn, PortProg},
-							   [exit_status]) of
-					  Prt when is_port(Prt) ->
-					      {Prt,
-					       erlang:system_info(scheduler_id)};
-					  {'EXIT', {Err, _}} when Err == eagain;
-								  Err == emfile ->
-					      noop;
-					  {'EXIT', Err} when Err == eagain;
-							     Err == emfile ->
-					      noop;
-					  Error ->
-					      ?t:fail(Error)
-				      end
-			      end,
-			      lists:seq(1, NoPortsPerProc)),
-		  SIds = lists:filter(fun (noop) -> false;
-					  (_) -> true
-				      end,
-				      lists:map(fun (noop) -> noop;
-						    ({_, SId}) -> SId
-						end,
-						PrtSIds)),
-		  process_flag(scheduler, 0),
-		  Parent ! {self(), started, SIds},
-		  lists:foreach(
-		    fun (noop) ->
-			    noop;
-			({Port, _}) ->
-			    receive
-				{Port, {exit_status, 0}} ->
-				    ok;
-				{Port, {exit_status, Status}} when Status > 128 ->
-				    %% Sometimes happens when we have created
-				    %% too many ports.
-				    ok;
-				{Port, {exit_status, _}} = ESMsg ->
-				    {Port, {exit_status, 0}} = ESMsg
-			    end
-		    end,
-		    PrtSIds),
-		  Parent ! {self(), done}
-	  end,
+    = fun () ->
+              PrtSIds = lists:map(
+                          fun (_) ->
+                                  erlang:yield(),
+                                  case catch open_port({spawn, PortProg},
+                                                       [exit_status]) of
+                                      Prt when is_port(Prt) ->
+                                          {Prt,
+                                           erlang:system_info(scheduler_id)};
+                                      {'EXIT', {Err, _}} when Err == eagain;
+                                                              Err == emfile;
+                                                              Err == enomem ->
+                                          noop;
+                                      {'EXIT', Err} when Err == eagain;
+                                                         Err == emfile;
+                                                         Err == enomem ->
+                                          noop;
+                                      Error ->
+                                          ct:fail(Error)
+                                  end
+                          end,
+                          lists:seq(1, NoPortsPerProc)),
+              SIds = lists:filter(fun (noop) -> false;
+                                      (_) -> true
+                                  end,
+                                  lists:map(fun (noop) -> noop;
+                                                ({_, SId}) -> SId
+                                            end,
+                                            PrtSIds)),
+              process_flag(scheduler, 0),
+              Parent ! {self(), started, SIds},
+              lists:foreach(
+                fun (noop) ->
+                        noop;
+                    ({Port, _}) ->
+                        receive
+                            {Port, {exit_status, 0}} ->
+                                ok;
+                            {Port, {exit_status, Status}} when Status > 128 ->
+                                %% Sometimes happens when we have created
+                                %% too many ports.
+                                ok;
+                            {Port, {exit_status, _}} = ESMsg ->
+                                {Port, {exit_status, 0}} = ESMsg
+                        end
+                end,
+                PrtSIds),
+              Parent ! {self(), done}
+      end,
     Procs = lists:map(fun (N) ->
-				    spawn_opt(ProcFun,
-					      [link,
-					       {scheduler,
-						(N rem NoSchedsOnln)+1}])
-			    end,
-			    lists:seq(1, NoProcs)),
+                              spawn_opt(ProcFun,
+                                        [link,
+                                         {scheduler,
+                                          (N rem NoSchedsOnln)+1}])
+                      end,
+                      lists:seq(1, NoProcs)),
     SIds = lists:map(fun (P) ->
-				   receive {P, started, SIds} -> SIds end
-			   end,
-			   Procs),
+                             receive {P, started, SIds} -> SIds end
+                     end,
+                     Procs),
     StartedTime = (erlang:monotonic_time(micro_seconds) - Start)/1000000,
-    ?t:format("StartedTime = ~p~n", [StartedTime]),
+    io:format("StartedTime = ~p~n", [StartedTime]),
     true = StartedTime < SleepSecs,
     erlang:system_flag(multi_scheduling, block),
     lists:foreach(fun (P) -> receive {P, done} -> ok end end, Procs),
     DoneTime = (erlang:monotonic_time(micro_seconds) - Start)/1000000,
-    ?t:format("DoneTime = ~p~n", [DoneTime]),
+    io:format("DoneTime = ~p~n", [DoneTime]),
     true = DoneTime > SleepSecs,
     ok = verify_multi_scheduling_blocked(),
     erlang:system_flag(multi_scheduling, unblock),
     case {length(lists:usort(lists:flatten(SIds))), NoSchedsOnln} of
-	      {N, N} ->
-		  ok;
-	      {N, M} ->
-		  ?t:fail("Failed to create ports on all"
-				++ integer_to_list(M) ++ " available"
-				"schedulers. Only created ports on "
-				++ integer_to_list(N) ++ " schedulers.")
-	  end.
+        {N, N} ->
+            ok;
+        {N, M} ->
+            ct:fail("Failed to create ports on all ~w available"
+                    "schedulers. Only created ports on ~w schedulers.", [M, N])
+    end.
 
 save_sid(SIds) ->
     SId = erlang:system_info(scheduler_id),
     case lists:member(SId, SIds) of
-	true -> SIds;
-	false -> [SId|SIds]
+        true -> SIds;
+        false -> [SId|SIds]
     end.
 
 sid_proc(SIds) ->
     NewSIds = save_sid(SIds),
     receive
-	{From, want_sids} ->
-	    From ! {self(), sids, NewSIds}
+        {From, want_sids} ->
+            From ! {self(), sids, NewSIds}
     after 0 ->
-	    sid_proc(NewSIds)
+              sid_proc(NewSIds)
     end.
 
 verify_multi_scheduling_blocked() ->
     Procs = lists:map(fun (_) ->
-				    spawn_link(fun () -> sid_proc([]) end)
-			    end,
-			    lists:seq(1, 3*erlang:system_info(schedulers_online))),
+                              spawn_link(fun () -> sid_proc([]) end)
+                      end,
+                      lists:seq(1, 3*erlang:system_info(schedulers_online))),
     receive after 1000 -> ok end,
     SIds = lists:map(fun (P) ->
-				   P ! {self(), want_sids},
-				   receive {P, sids, PSIds} -> PSIds end
-			   end,
-			   Procs),
+                             P ! {self(), want_sids},
+                             receive {P, sids, PSIds} -> PSIds end
+                     end,
+                     Procs),
     1 = length(lists:usort(lists:flatten(SIds))),
     ok.
-		      
-    
+
+
 %%% Pinging functions.
 
 stream_ping(Config, Size, CmdLine, Options) ->
@@ -1947,10 +1917,10 @@ stream_ping(Config, Size, CmdLine, Options) ->
 
 ping(Config, Sizes, HSize, CmdLine, Options) ->
     Actions = lists:map(fun(Size) ->
-				[$p|Packet] = random_packet(Size, "ping"),
-				{[$p|Packet], [[$P|Packet]]}
-				end,
-			Sizes),
+                                [$p|Packet] = random_packet(Size, "ping"),
+                                {[$p|Packet], [[$P|Packet]]}
+                        end,
+                        Sizes),
     port_expect(Config, Actions, HSize, CmdLine, Options).
 
 %% expect_input(Sizes, HSize, CmdLine, Options)
@@ -1972,7 +1942,7 @@ expect_input1(Config, [Size|Rest], Params, Expect, ReplyCommand) ->
 expect_input1(Config, [], {HSize, CmdLine0, Options}, Expect, ReplyCommand) ->
     CmdLine = build_cmd_line(CmdLine0, ReplyCommand, []),
     port_expect(Config, [{false, lists:reverse(Expect)}],
-		HSize, CmdLine, Options).
+                HSize, CmdLine, Options).
 
 build_cmd_line(FixedCmdLine, [Cmd|Rest], []) ->
     build_cmd_line(FixedCmdLine, Rest, [Cmd]);
@@ -1995,15 +1965,15 @@ build_cmd_line(FixedCmdLine, [], Result) ->
 %% Returns the port.
 
 port_expect(Config, Actions, HSize, CmdLine, Options0) ->
-%    io:format("port_expect(~p, ~p, ~p, ~p)",
-%		[Actions, HSize, CmdLine, Options0]),
+    %    io:format("port_expect(~p, ~p, ~p, ~p)",
+    %		[Actions, HSize, CmdLine, Options0]),
     PortTest = port_test(Config),
     Cmd = lists:concat([PortTest, " -h", HSize, " ", CmdLine]),
     PortType =
-	case HSize of
-	    0 -> stream;
-	    _ -> {packet, HSize}
-	end,
+    case HSize of
+        0 -> stream;
+        _ -> {packet, HSize}
+    end,
     Options = [PortType|Options0],
     io:format("open_port({spawn, ~p}, ~p)", [Cmd, Options]),
     Port = open_port({spawn, Cmd}, Options),
@@ -2014,11 +1984,11 @@ port_expect(Port, [{Send, Expects}|Rest], Options) when is_list(Expects) ->
     port_send(Port, Send),
     IsBinaryPort = lists:member(binary, Options),
     Receiver =
-	case {lists:member(stream, Options), line_option(Options)} of
-	    {false, _} -> fun receive_all/2;
-	    {true,false}  -> fun stream_receive_all/2;
-	    {_, true} -> fun receive_all/2
-	end,
+    case {lists:member(stream, Options), line_option(Options)} of
+        {false, _} -> fun receive_all/2;
+        {true,false}  -> fun stream_receive_all/2;
+        {_, true} -> fun receive_all/2
+    end,
     Receiver(Port, maybe_to_binary(Expects, IsBinaryPort)),
     port_expect(Port, Rest, Options);
 port_expect(_, [], _) ->
@@ -2046,34 +2016,34 @@ maybe_to_binary(Expects, false) ->
 
 port_send(_Port, false) -> ok;
 port_send(Port, Send) when is_list(Send) ->
-%    io:format("port_send(~p, ~p)", [Port, Send]),
+    %    io:format("port_send(~p, ~p)", [Port, Send]),
     Port ! {self(), {command, Send}}.
 
 receive_all(Port, [Expect|Rest]) ->
-%    io:format("receive_all(~p, [~p|Rest])", [Port, Expect]),
+    %    io:format("receive_all(~p, [~p|Rest])", [Port, Expect]),
     receive
-	{Port, {data, Expect}} ->
-	    io:format("Received ~s", [format(Expect)]),
-	    ok;
-	{Port, {data, Other}} ->
-	    io:format("Received ~s; expected ~s",
-		      [format(Other), format(Expect)]),
-	    test_server:fail(bad_message);
-	Other ->
-	    %% (We're not yet prepared for receiving both 'eol' and
-	    %% 'exit_status'; remember that they may appear in any order.)
-	    case {Expect, Rest, Other} of
-		{eof, [], {Port, eof}} ->
-		    io:format("Received soft EOF.",[]),
-		    ok;
-		{{exit_status, S}, [], {Port, {exit_status, S}}} ->
-		    io:format("Received exit status ~p.",[S]),
-		    ok;
-		_ ->
-%%%	            io:format("Unexpected message: ~s", [format(Other)]),
-		    io:format("Unexpected message: ~w", [Other]),
-		    test_server:fail(unexpected_message)
-	    end
+        {Port, {data, Expect}} ->
+            io:format("Received ~s", [format(Expect)]),
+            ok;
+        {Port, {data, Other}} ->
+            io:format("Received ~s; expected ~s",
+                      [format(Other), format(Expect)]),
+            ct:fail(bad_message);
+        Other ->
+            %% (We're not yet prepared for receiving both 'eol' and
+            %% 'exit_status'; remember that they may appear in any order.)
+            case {Expect, Rest, Other} of
+                {eof, [], {Port, eof}} ->
+                    io:format("Received soft EOF.",[]),
+                    ok;
+                {{exit_status, S}, [], {Port, {exit_status, S}}} ->
+                    io:format("Received exit status ~p.",[S]),
+                    ok;
+                _ ->
+                    %%%	            io:format("Unexpected message: ~s", [format(Other)]),
+                    io:format("Unexpected message: ~w", [Other]),
+                    ct:fail(unexpected_message)
+            end
     end,
     receive_all(Port, Rest);
 receive_all(_Port, []) ->
@@ -2088,30 +2058,30 @@ stream_receive_all1(_Port, []) ->
     ok;
 stream_receive_all1(Port, Expect) ->
     receive
-	{Port, {data, Data}} ->
-	    Remaining = compare(Data, Expect),
-	    stream_receive_all1(Port, Remaining);
-	Other ->
-	    test_server:fail({bad_message, Other})
+        {Port, {data, Data}} ->
+            Remaining = compare(Data, Expect),
+            stream_receive_all1(Port, Remaining);
+        Other ->
+            ct:fail({bad_message, Other})
     end.
 
 compare(B1, B2) when is_binary(B1), is_binary(B2), byte_size(B1) =< byte_size(B2) ->
     case split_binary(B2, size(B1)) of
-	{B1,Remaining} ->
-	    Remaining;
-	_Other ->
-	    test_server:fail(nomatch)
+        {B1,Remaining} ->
+            Remaining;
+        _Other ->
+            ct:fail(nomatch)
     end;
 compare(B1, B2) when is_binary(B1), is_binary(B2) ->
-    test_server:fail(too_much_data);
+    ct:fail(too_much_data);
 compare([X|Rest1], [X|Rest2]) ->
     compare(Rest1, Rest2);
 compare([_|_], [_|_]) ->
-    test_server:fail(nomatch);
+    ct:fail(nomatch);
 compare([], Remaining) ->
     Remaining;
 compare(_Data, []) ->
-    test_server:fail(too_much_data).
+    ct:fail(too_much_data).
 
 maybe_to_list(Bin) when is_binary(Bin) ->
     binary_to_list(Bin);
@@ -2122,10 +2092,10 @@ format({Eol,List}) ->
     io_lib:format("tuple<~w,~s>",[Eol, maybe_to_list(List)]);
 format(List) when is_list(List) ->
     case list_at_least(50, List) of
-	true ->
-	    io_lib:format("\"~-50s...\"", [List]);
-	false ->
-	    io_lib:format("~p", [List])
+        true ->
+            io_lib:format("\"~-50s...\"", [List]);
+        false ->
+            io_lib:format("~p", [List])
     end;
 format(Bin) when is_binary(Bin), size(Bin) >= 50 ->
     io_lib:format("binary<~-50s...>", [binary_to_list(Bin, 1, 50)]);
@@ -2152,17 +2122,17 @@ build_packet(0, Result, _NextChar) ->
     lists:reverse(Result);
 build_packet(Left, Result, NextChar0) ->
     NextChar =
-	if
-	    NextChar0 >= 126 ->
-		33;
-	    true ->
-		NextChar0+1
-	end,
+    if
+        NextChar0 >= 126 ->
+            33;
+        true ->
+            NextChar0+1
+    end,
     build_packet(Left-1, [NextChar0|Result], NextChar).
 
 sizes() ->
     [10, 13, 64, 127, 128, 255, 256, 1023, 1024,
-	32767, 32768, 65535, 65536].
+     32767, 32768, 65535, 65536].
 
 sizes(Header_Size) ->
     sizes(Header_Size, sizes(), []).
@@ -2183,15 +2153,14 @@ random_char(Chars) ->
     lists:nth(uniform(length(Chars)), Chars).
 
 uniform(N) ->
-    case get(random_seed) of
-	undefined ->	    
-	    {X, Y, Z} = Seed = time(),
-	    io:format("Random seed = ~p\n",[Seed]),
-	    random:seed(X, Y, Z);
-	_ ->
-	    ok
+    case rand:export_seed() of
+        undefined ->
+            rand:seed(exsplus),
+            io:format("Random seed = ~p\n", [rand:export_seed()]);
+        _ ->
+            ok
     end,
-    random:uniform(N).
+    rand:uniform(N).
 
 fun_spawn(Fun) ->
     fun_spawn(Fun, []).
@@ -2200,13 +2169,11 @@ fun_spawn(Fun, Args) ->
     spawn_link(erlang, apply, [Fun, Args]).
 
 port_test(Config) when is_list(Config) ->
-    filename:join(?config(data_dir, Config), "port_test").
-
+    filename:join(proplists:get_value(data_dir, Config), "port_test").
 
-ports(doc) -> "Test that erlang:ports/0 returns a consistent snapshot of ports";
-ports(suite) -> [];
+%% Test that erlang:ports/0 returns a consistent snapshot of ports
 ports(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, "exit_drv"),
 
     receive after 1000 -> ok end, % Wait for other ports to stabilize
@@ -2233,7 +2200,7 @@ ports_snapshots(Iter, TrafficPid, OtherPorts) ->
 
     TrafficPid ! {self(), stop},
     receive {TrafficPid, EventList, TrafficPorts} -> ok end,
-    
+
     %%io:format("Snapshot=~p\n", [Snapshot]),
     ports_verify(Snapshot, OtherPorts ++ TrafficPorts, EventList),
 
@@ -2245,78 +2212,77 @@ ports_traffic(MaxPorts) ->
 
 ports_traffic_stopped(MaxPorts, {PortList, PortCnt}) ->
     receive
-	start ->
-	    %%io:format("Traffic started in ~p\n",[self()]),
-	    ports_traffic_started(MaxPorts, {PortList, PortCnt}, []);
-	{Pid,die} ->
-	    lists:foreach(fun(Port)-> erlang:port_close(Port) end,
-				PortList),
-	    Pid ! {self(),dead}
+        start ->
+            %%io:format("Traffic started in ~p\n",[self()]),
+            ports_traffic_started(MaxPorts, {PortList, PortCnt}, []);
+        {Pid,die} ->
+            lists:foreach(fun(Port)-> erlang:port_close(Port) end,
+                          PortList),
+            Pid ! {self(),dead}
     end.
 
 ports_traffic_started(MaxPorts, {PortList, PortCnt}, EventList) ->
     receive 
-	{Pid, stop} ->
-	    %%io:format("Traffic stopped in ~p\n",[self()]),
-	    Pid ! {self(), EventList, PortList},
-	    ports_traffic_stopped(MaxPorts, {PortList, PortCnt})
+        {Pid, stop} ->
+            %%io:format("Traffic stopped in ~p\n",[self()]),
+            Pid ! {self(), EventList, PortList},
+            ports_traffic_stopped(MaxPorts, {PortList, PortCnt})
 
     after 0 ->
-	    ports_traffic_do(MaxPorts, {PortList, PortCnt}, EventList)
+              ports_traffic_do(MaxPorts, {PortList, PortCnt}, EventList)
     end.
 
 ports_traffic_do(MaxPorts, {PortList, PortCnt}, EventList) ->
     N = uniform(MaxPorts),
     case N > PortCnt of
-	true -> % Open port	    
-	    P = open_port({spawn, "exit_drv"}, []),
-	    %%io:format("Created port ~p\n",[P]),
-	    ports_traffic_started(MaxPorts, {[P|PortList], PortCnt+1},
-				  [{open,P}|EventList]);
-	
-	false -> % Close port
-	    P = lists:nth(N, PortList),
-	    %%io:format("Close port ~p\n",[P]),
-	    true = erlang:port_close(P),
-	    ports_traffic_started(MaxPorts, {lists:delete(P,PortList), PortCnt-1},
-				  [{close,P}|EventList])
+        true -> % Open port	    
+            P = open_port({spawn, "exit_drv"}, []),
+            %%io:format("Created port ~p\n",[P]),
+            ports_traffic_started(MaxPorts, {[P|PortList], PortCnt+1},
+                                  [{open,P}|EventList]);
+
+        false -> % Close port
+            P = lists:nth(N, PortList),
+            %%io:format("Close port ~p\n",[P]),
+            true = erlang:port_close(P),
+            ports_traffic_started(MaxPorts, {lists:delete(P,PortList), PortCnt-1},
+                                  [{close,P}|EventList])
     end.
 
 ports_verify(Ports, PortsAfter, EventList) ->    
     %%io:format("Candidate=~p\nEvents=~p\n", [PortsAfter, EventList]),
     case lists:sort(Ports) =:= lists:sort(PortsAfter) of
-	true ->
-	    io:format("Snapshot of ~p ports verified ok.\n",[length(Ports)]),
-	    ok;
-	false ->
-	    %% Note that we track the event list "backwards", undoing open/close:
-	    case EventList of
-		[{open,P} | Tail] ->
-		    ports_verify(Ports, lists:delete(P,PortsAfter), Tail);		    
-
-		[{close,P} | Tail] ->
-		    ports_verify(Ports, [P | PortsAfter], Tail);		    
-
-		[] ->
-		    test_server:fail("Inconsistent snapshot from erlang:ports()")
-	    end
+        true ->
+            io:format("Snapshot of ~p ports verified ok.\n",[length(Ports)]),
+            ok;
+        false ->
+            %% Note that we track the event list "backwards", undoing open/close:
+            case EventList of
+                [{open,P} | Tail] ->
+                    ports_verify(Ports, lists:delete(P,PortsAfter), Tail);		    
+
+                [{close,P} | Tail] ->
+                    ports_verify(Ports, [P | PortsAfter], Tail);		    
+
+                [] ->
+                    ct:fail("Inconsistent snapshot from erlang:ports()")
+            end
     end.
 
 load_driver(Dir, Driver) ->
     case erl_ddll:load_driver(Dir, Driver) of
-	ok -> ok;
-	{error, Error} = Res ->
-	    io:format("~s\n", [erl_ddll:format_error(Error)]),
-	    Res
+        ok -> ok;
+        {error, Error} = Res ->
+            io:format("~s\n", [erl_ddll:format_error(Error)]),
+            Res
     end.
 
 
-close_deaf_port(doc) -> ["Send data to port program that does not read it, then close port."
-			 "Primary targeting Windows to test threaded_handle_closer in sys.c"];
-close_deaf_port(suite) -> [];
+%% Send data to port program that does not read it, then close port.
+%% Primary targeting Windows to test threaded_handle_closer in sys.c
 close_deaf_port(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(100)),
-    DataDir = ?config(data_dir, Config),
+    ct:timetrap({minutes, 2}),
+    DataDir = proplists:get_value(data_dir, Config),
     DeadPort = os:find_executable("dead_port", DataDir),
     Port = open_port({spawn,DeadPort++" 60"},[]),
     erlang:port_command(Port,"Hello, can you hear me!?!?"),
@@ -2325,83 +2291,82 @@ close_deaf_port(Config) when is_list(Config) ->
     Res = close_deaf_port_1(0, DeadPort),
     io:format("Waiting for OS procs to terminate...\n"),
     receive after 5*1000 -> ok end,
-    test_server:timetrap_cancel(Dog),
     Res.
 
 close_deaf_port_1(200, _) ->
     ok;
 close_deaf_port_1(N, Cmd) ->
-    Timeout = integer_to_list(random:uniform(5*1000)),
+    Timeout = integer_to_list(rand:uniform(5*1000)),
     try open_port({spawn_executable,Cmd},[{args,[Timeout]}]) of
-    	Port ->
-	    erlang:port_command(Port,"Hello, can you hear me!?!?"),
-	    port_close(Port),
-	    close_deaf_port_1(N+1, Cmd)
+        Port ->
+            erlang:port_command(Port,"Hello, can you hear me!?!?"),
+            port_close(Port),
+            close_deaf_port_1(N+1, Cmd)
     catch
-    	_:eagain ->
-	    {comment, "Could not spawn more than " ++ integer_to_list(N) ++ " OS processes."}
+        _:eagain ->
+            {comment, "Could not spawn more than " ++ integer_to_list(N) ++ " OS processes."}
     end.
 
 %% Test undocumented port_set_data/2 and port_get_data/1
 %% Hammer from multiple processes a while
 %% and then abrubtly close the port (OTP-12208).
 port_setget_data(Config) when is_list(Config) ->
-    ok = load_driver(?config(data_dir, Config), "echo_drv"),
+    ok = load_driver(proplists:get_value(data_dir, Config), "echo_drv"),
     Port = erlang:open_port({spawn_driver, "echo_drv"}, []),
 
     NSched = erlang:system_info(schedulers_online),
     HeapData = {1,2,3,<<"A heap binary">>,fun()->"This is fun"end,
-	       list_to_binary(lists:seq(1,100))},
+                list_to_binary(lists:seq(1,100))},
     PRs = lists:map(fun(I) ->
-			    spawn_opt(fun() -> port_setget_data_hammer(Port,HeapData,false,1) end,
-				      [monitor, {scheduler, I rem NSched}])
-		    end,
-		    lists:seq(1,10)),
+                            spawn_opt(fun() -> port_setget_data_hammer(Port,HeapData,false,1) end,
+                                      [monitor, {scheduler, I rem NSched}])
+                    end,
+                    lists:seq(1,10)),
     receive after 100 -> ok end,
     Papa = self(),
     lists:foreach(fun({Pid,_}) -> Pid ! {Papa,prepare_for_close} end, PRs),
     lists:foreach(fun({Pid,_}) ->
-			  receive {Pid,prepare_for_close} -> ok end
-		  end,
-		  PRs),
+                          receive {Pid,prepare_for_close} -> ok end
+                  end,
+                  PRs),
     port_close(Port),
     lists:foreach(fun({Pid,Ref}) ->
-			  receive {'DOWN', Ref, process, Pid, normal} -> ok end
-		  end,
-		  PRs),
+                          receive {'DOWN', Ref, process, Pid, normal} -> ok end
+                  end,
+                  PRs),
     ok.
 
 port_setget_data_hammer(Port, HeapData, IsSet0, N) ->
-    Rand = random:uniform(3),
+    Rand = rand:uniform(3),
     IsSet1 = try case Rand of
-		     1 -> true = erlang:port_set_data(Port, atom), true;
-		     2 -> true = erlang:port_set_data(Port, HeapData), true;
-		     3 -> case erlang:port_get_data(Port) of
-			      atom -> true;
-			      HeapData -> true;
-			      undefined -> false=IsSet0
-			  end
-		 end
-    catch
-	error:badarg ->
-	    true = get(prepare_for_close),
-	    io:format("~p did ~p rounds before port closed\n", [self(), N]),
-	    exit(normal)
-    end,
+                     1 -> true = erlang:port_set_data(Port, atom), true;
+                     2 -> true = erlang:port_set_data(Port, HeapData), true;
+                     3 -> case erlang:port_get_data(Port) of
+                              atom -> true;
+                              HeapData -> true;
+                              undefined -> false=IsSet0
+                          end
+                 end
+             catch
+                 error:badarg ->
+                     true = get(prepare_for_close),
+                     io:format("~p did ~p rounds before port closed\n", [self(), N]),
+                     exit(normal)
+             end,
     receive {Papa, prepare_for_close} ->
-	    put(prepare_for_close, true),
-	    Papa ! {self(),prepare_for_close}
+                put(prepare_for_close, true),
+                Papa ! {self(),prepare_for_close}
     after 0 ->
-	    ok
+              ok
     end,
     port_setget_data_hammer(Port, HeapData, IsSet1, N+1).
 
 
 wait_until(Fun) ->
     case catch Fun() of
-	true ->
-	    ok;
-	_ ->
-	    receive after 100 -> ok end,
-	    wait_until(Fun)
+        true ->
+            ok;
+        _ ->
+            receive after 100 -> ok end,
+            wait_until(Fun)
     end.
diff --git a/erts/emulator/test/port_SUITE_data/port_test.c b/erts/emulator/test/port_SUITE_data/port_test.c
index 7abefab2e3..cc3ebdf0f8 100644
--- a/erts/emulator/test/port_SUITE_data/port_test.c
+++ b/erts/emulator/test/port_SUITE_data/port_test.c
@@ -13,6 +13,7 @@
 
 #ifndef __WIN32__
 #include <unistd.h>
+#include <limits.h>
 
 #include <sys/time.h>
 
@@ -48,6 +49,7 @@ typedef struct {
 				 * after reading the header for a packet
 				 * before reading the rest.
 				 */
+    int fd_count;               /* Count the number of open fds */
     int break_mode;		/* If set, this program will close standard
 				 * input, which should case broken pipe
 				 * error in the writer.
@@ -107,7 +109,7 @@ MAIN(argc, argv)
 int argc;
 char *argv[];
 {
-  int ret;
+  int ret, fd_count;
   if((port_data = (PORT_TEST_DATA *) malloc(sizeof(PORT_TEST_DATA))) == NULL) {
     fprintf(stderr, "Couldn't malloc for port_data");
     exit(1);
@@ -115,6 +117,7 @@ char *argv[];
   port_data->header_size = 0;
   port_data->io_buf_size = 0;	
   port_data->delay_mode = 0;	
+  port_data->fd_count = 0;
   port_data->break_mode = 0;	
   port_data->quit_mode = 0;	
   port_data->slow_writes = 0;	
@@ -144,6 +147,9 @@ char *argv[];
     case 'e': 
       port_data->fd_to_erl = 2;
       break;
+    case 'f':
+      port_data->fd_count = 1;
+      break;
     case 'h':			/* Header size for packets. */
       switch (argv[1][2]) {
       case '0': port_data->header_size = 0; break;
@@ -189,18 +195,31 @@ char *argv[];
     /* XXX Add error printout here */
   }
 
+  if (port_data->fd_count) {
+#ifdef __WIN32__
+      DWORD handles;
+      GetProcessHandleCount(GetCurrentProcess(), &handles);
+      fd_count = handles;
+#else
+      int i;
+      for (i = 0, fd_count = 0; i < 1024; i++)
+          if (fcntl(i, F_GETFD) >= 0) {
+              fd_count++;
+          }
+#endif
+  }
+
+  if (port_data->output_file)
+      replace_stdout(port_data->output_file);
+
+  if (port_data->fd_count)
+      reply(&fd_count, sizeof(fd_count));
+
   if (port_data->no_packet_loop){
       free(port_data);
       exit(0);
   }
 
-  /*
-   * If an output file was given, let it replace standard output.
-   */
-
-  if (port_data->output_file)
-    replace_stdout(port_data->output_file);
-
   ret = packet_loop();
   if(port_data->io_buf_size > 0)
       free(port_data->io_buf);
diff --git a/erts/emulator/test/port_bif_SUITE.erl b/erts/emulator/test/port_bif_SUITE.erl
index b65a22a528..9b794be415 100644
--- a/erts/emulator/test/port_bif_SUITE.erl
+++ b/erts/emulator/test/port_bif_SUITE.erl
@@ -21,8 +21,8 @@
 -module(port_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, command/1,
+-export([all/0, suite/0, groups/0,
+         command/1,
 	 command_e_1/1, command_e_2/1, command_e_3/1, command_e_4/1,
 	 port_info1/1, port_info2/1,
 	 port_info_os_pid/1, port_info_race/1,
@@ -30,11 +30,11 @@
 
 -export([do_command_e_1/1, do_command_e_2/1, do_command_e_4/1]).
 
--export([init_per_testcase/2, end_per_testcase/2]).
+-include_lib("common_test/include/ct.hrl").
 
--include_lib("test_server/include/test_server.hrl").
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 10}}].
 
 all() -> 
     [command, {group, port_info}, connect, control,
@@ -46,27 +46,6 @@ groups() ->
      {port_info, [],
       [port_info1, port_info2, port_info_os_pid, port_info_race]}].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-
-init_per_testcase(_Func, Config) when is_list(Config) ->
-    Dog=test_server:timetrap(test_server:minutes(10)),
-    [{watchdog, Dog}|Config].
-end_per_testcase(_Func, Config) when is_list(Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog).
-
 command(Config) when is_list(Config) ->
     load_control_drv(Config),
 
@@ -87,17 +66,17 @@ do_command(P, Data) ->
 	{P,{data,Data0}} ->
 	    case {list_to_binary(Data0),list_to_binary([Data])} of
 		{B,B} -> ok;
-		_ -> test_server:fail({unexpected_data,Data0})
+		_ -> ct:fail({unexpected_data,Data0})
 	    end;
 	Other ->
-	    test_server:fail({unexpected_message,Other})
+	    ct:fail({unexpected_message,Other})
     end.
 
 
 
 %% port_command/2: badarg 1st arg
 command_e_1(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Program = filename:join(DataDir, "port_test"),
 
     process_flag(trap_exit, true),
@@ -106,9 +85,9 @@ command_e_1(Config) when is_list(Config) ->
         {'EXIT', Pid, {badarg, _}} when is_pid(Pid) ->
             ok;
         Other ->
-            test_server:fail(Other)
+            ct:fail(Other)
     after 10000 ->
-            test_server:fail(timeout)
+            ct:fail(timeout)
     end,
     ok.
 
@@ -119,7 +98,7 @@ do_command_e_1(Program) ->
 
 %% port_command/2: badarg 2nd arg
 command_e_2(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Program = filename:join(DataDir, "port_test"),
 
     process_flag(trap_exit, true),
@@ -128,9 +107,9 @@ command_e_2(Config) when is_list(Config) ->
         {'EXIT', Pid, {badarg, _}} when is_pid(Pid) ->
             ok;
         Other ->
-            test_server:fail(Other)
+            ct:fail(Other)
     after 10000 ->
-            test_server:fail(timeout)
+            ct:fail(timeout)
     end,
     ok.
 
@@ -141,7 +120,7 @@ do_command_e_2(Program) ->
 
 %% port_command/2: Posix signals trapped
 command_e_3(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Program = filename:join(DataDir, "port_test"),
 
     process_flag(trap_exit, true),
@@ -152,15 +131,15 @@ command_e_3(Config) when is_list(Config) ->
         {'EXIT', Port, einval} when is_port(Port) ->
             ok;
         Other ->
-            test_server:fail(Other)
+            ct:fail(Other)
     after 10000 ->
-            test_server:fail(timeout)
+            ct:fail(timeout)
     end,
     ok.
 
 %% port_command/2: Posix exit signals not trapped
 command_e_4(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Program = filename:join(DataDir, "port_test"),
 
     process_flag(trap_exit, true),
@@ -169,9 +148,9 @@ command_e_4(Config) when is_list(Config) ->
         {'EXIT', Pid, {einval, _}} when is_pid(Pid) ->
             ok;
         Other ->
-            test_server:fail(Other)
+            ct:fail(Other)
     after 10000 ->
-            test_server:fail(timeout)
+            ct:fail(timeout)
     end,
     ok.
 
@@ -248,7 +227,7 @@ do_port_info_os_pid() ->
     {os_pid, InfoOSPid} = erlang:port_info(P, os_pid),
     EchoPidStr = receive
 	    {P, {data, EchoPidStr0}} -> EchoPidStr0
-	    after 10000 -> test_server:fail(timeout)
+	    after 10000 -> ct:fail(timeout)
     end,
     {ok, [EchoPid], []} = io_lib:fread("~u\n", EchoPidStr),
     {value,{os_pid, InfoOSPid}}=lists:keysearch(os_pid, 1, A),
@@ -257,7 +236,7 @@ do_port_info_os_pid() ->
     ok.
 
 port_info_race(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Program = filename:join(DataDir, "port_test"),
     Top = self(),
     P1 = open_port({spawn,Program}, [{packet,1}]),
@@ -283,10 +262,9 @@ output_test(_, _, Input, Output) when Output > 16#1fffffff ->
 output_test(P, Bin, Input0, Output0) ->
     erlang:port_command(P, Bin),
     receive
-	{P,{data,Bin}} -> ok;
-	Other ->
-	    io:format("~p", [Other]),
-	    ?t:fail()
+        {P,{data,Bin}} -> ok;
+        Other ->
+            ct:fail("~p", [Other])
     end,
     Input = Input0 + size(Bin),
     Output = Output0 + size(Bin),
@@ -296,8 +274,8 @@ output_test(P, Bin, Input0, Output0) ->
     %% We can't test much here, but hopefully a debug-built emulator will crasch
     %% if there is something wrong with the heap allocation.
     case erlang:statistics(io) of
-	{{input,In},{output,Out}} when is_integer(In), is_integer(Out) ->
-	    ok
+        {{input,In},{output,Out}} when is_integer(In), is_integer(Out) ->
+            ok
     end,
     output_test(P, Bin, Input, Output).
 
@@ -345,7 +323,7 @@ connect(Config) when is_list(Config) ->
     exit(P, you_should_die),
     receive
         {'EXIT',RecPid,you_should_die} -> ok;
-        Other -> ?line ?t:fail({bad_message,Other})
+        Other -> ct:fail({bad_message,Other})
     end,
 
     %% Done.
@@ -410,7 +388,7 @@ test_op(P, Op) ->
     <<Op:32>> = list_to_binary(R).
 
 echo_to_busy(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
+    ct:timetrap({seconds, 10}),
     load_control_drv(Config),
     P = open_port({spawn, control_drv}, []),
     erlang:port_control(P, $b, [1]),	% Set to busy.
@@ -422,11 +400,10 @@ echo_to_busy(Config) when is_list(Config) ->
         {Echoer, done} ->
             ok;
         {Echoer, Other} ->
-            test_server:fail(Other);
+            ct:fail(Other);
         Other ->
-            test_server:fail({unexpected_message, Other})
+            ct:fail({unexpected_message, Other})
     end,
-    test_server:timetrap_cancel(Dog),
     ok.
 
 echoer(P, ReplyTo) ->
@@ -451,7 +428,7 @@ echo(P, Size) ->
     Packet = erlang:port_control(P, $e, [unaligned_sub_bin(Bin)]).
 
 load_control_drv(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
     ok = load_driver(DataDir, "control_drv").
 
@@ -485,14 +462,7 @@ random_char(Chars) ->
     lists:nth(uniform(length(Chars)), Chars).
 
 uniform(N) ->
-    case get(random_seed) of
-	undefined ->
-	    {X, Y, Z} = time(),
-	    random:seed(X, Y, Z);
-	_ ->
-	    ok
-    end,
-    random:uniform(N).
+    rand:uniform(N).
 
 unaligned_sub_bin(Bin0) ->
     Bin1 = <<0:3,Bin0/binary,31:5>>,
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index 97aa5e573e..789fa7cf06 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -26,7 +26,7 @@
 %%	process_info/1,2
 %%	register/2 (partially)
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(heap_binary_size, 64).
 
@@ -41,6 +41,7 @@
 	 process_info_2_list/1, process_info_lock_reschedule/1,
 	 process_info_lock_reschedule2/1,
 	 process_info_lock_reschedule3/1,
+         process_info_garbage_collection/1,
 	 bump_reductions/1, low_prio/1, binary_owner/1, yield/1, yield2/1,
 	 process_status_exiting/1,
 	 otp_4725/1, bad_register/1, garbage_collect/1, otp_6237/1,
@@ -66,7 +67,9 @@
 -export([hangaround/2, processes_bif_test/0, do_processes/1,
 	 processes_term_proc_list_test/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 9}}].
 
 all() -> 
     [spawn_with_binaries, t_exit_1, {group, t_exit_2},
@@ -75,7 +78,9 @@ all() ->
      process_info_other_dist_msg, process_info_2_list,
      process_info_lock_reschedule,
      process_info_lock_reschedule2,
-     process_info_lock_reschedule3, process_status_exiting,
+     process_info_lock_reschedule3,
+     process_info_garbage_collection,
+     process_status_exiting,
      bump_reductions, low_prio, yield, yield2, otp_4725,
      bad_register, garbage_collect, process_info_messages,
      process_flag_badarg, process_flag_heap_size,
@@ -113,7 +118,7 @@ init_per_suite(Config) ->
     [{started_apps, A}|Config].
 
 end_per_suite(Config) ->
-    As = ?config(started_apps, Config),
+    As = proplists:get_value(started_apps, Config),
     lists:foreach(fun (A) -> application:stop(A) end, As),
     catch erts_debug:set_internal_state(available_internal_state, false),
     Config.
@@ -125,12 +130,10 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(10)),
-    [{watchdog, Dog},{testcase, Func}|Config].
+    [{testcase, Func}|Config].
 
 end_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
+    ok.
 
 fun_spawn(Fun) ->
     spawn_link(erlang, apply, [Fun, []]).
@@ -155,11 +158,10 @@ binary_owner(Bin) when is_binary(Bin) ->
 
 %% Tests exit/1 with a big message.
 t_exit_1(Config) when is_list(Config) ->
+    ct:timetrap({seconds, 20}),
     start_spawner(),
-    Dog = test_server:timetrap(test_server:seconds(20)),
     process_flag(trap_exit, true),
     test_server:do_times(10, fun t_exit_1/0),
-    test_server:timetrap_cancel(Dog),
     stop_spawner(),
     ok.
 
@@ -173,11 +175,10 @@ t_exit_1() ->
 
 %% Tests exit/2 with a lot of data in the exit message.
 t_exit_2_other(Config) when is_list(Config) ->
+    ct:timetrap({seconds, 20}),
     start_spawner(),
-    Dog = test_server:timetrap(test_server:seconds(20)),
     process_flag(trap_exit, true),
     test_server:do_times(10, fun t_exit_2_other/0),
-    test_server:timetrap_cancel(Dog),
     stop_spawner(),
     ok.
 
@@ -191,34 +192,32 @@ t_exit_2_other() ->
 
 %% Tests that exit(Pid, normal) does not kill another process.;
 t_exit_2_other_normal(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(20)),
+    ct:timetrap({seconds, 20}),
     process_flag(trap_exit, true),
     Pid = fun_spawn(fun() -> receive x -> ok end end),
     exit(Pid, normal),
     receive
 	      {'EXIT', Pid, Reason} ->
-		  test_server:fail({process_died, Reason})
+		  ct:fail({process_died, Reason})
 	  after 1000 ->
 		  ok
 	  end,
     case process_info(Pid) of
 	      undefined ->
-		  test_server:fail(process_died_on_normal);
+		  ct:fail(process_died_on_normal);
 	      List when is_list(List) ->
 		  ok
 	  end,
     exit(Pid, kill),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Tests that we can trap an exit message sent with exit/2 from
 %% the same process.
 self_exit(Config) when is_list(Config) ->
+    ct:timetrap({seconds, 10}),
     start_spawner(),
-    Dog = test_server:timetrap(test_server:seconds(10)),
     process_flag(trap_exit, true),
     test_server:do_times(200, fun self_exit/0),
-    test_server:timetrap_cancel(Dog),
     stop_spawner(),
     ok.
 
@@ -237,7 +236,7 @@ normal_suicide_exit(Config) when is_list(Config) ->
     Pid = fun_spawn(fun() -> exit(self(), normal) end),
     receive
 	      {'EXIT', Pid, normal} -> ok;
-	      Other -> test_server:fail({bad_message, Other})
+	      Other -> ct:fail({bad_message, Other})
 	  end.
 
 %% Tests exit(self(), Term) is equivalent to exit(Term) for a process
@@ -248,7 +247,7 @@ abnormal_suicide_exit(Config) when is_list(Config) ->
     Pid = fun_spawn(fun() -> exit(self(), Garbage) end),
     receive
 	      {'EXIT', Pid, Garbage} -> ok;
-	      Other -> test_server:fail({bad_message, Other})
+	      Other -> ct:fail({bad_message, Other})
 	  end.
 
 %% Tests that exit(self(), die) cannot be catched.
@@ -257,21 +256,20 @@ t_exit_2_catch(Config) when is_list(Config) ->
     Pid = fun_spawn(fun() -> catch exit(self(), die) end),
     receive
 	      {'EXIT', Pid, normal} ->
-		  test_server:fail(catch_worked);
+		  ct:fail(catch_worked);
 	      {'EXIT', Pid, die} ->
 		  ok;
 	      Other ->
-		  test_server:fail({bad_message, Other})
+		  ct:fail({bad_message, Other})
 	  end.
 
 %% Tests trapping of an 'EXIT' message generated by a bad argument to
 %% the abs/1 bif.  The 'EXIT' message will intentionally be very big.
 trap_exit_badarg(Config) when is_list(Config) ->
+    ct:timetrap({seconds, 10}),
     start_spawner(),
-    Dog = test_server:timetrap(test_server:seconds(10)),
     process_flag(trap_exit, true),
     test_server:do_times(10, fun trap_exit_badarg/0),
-    test_server:timetrap_cancel(Dog),
     stop_spawner(),
     ok.
 
@@ -285,7 +283,7 @@ trap_exit_badarg() ->
 		  ok;
 	      Other ->
 		  ok = io:format("Bad EXIT message: ~P", [Other, 30]),
-		  test_server:fail(bad_exit_message)
+		  ct:fail(bad_exit_message)
 	  end.
 
 bad_guy(Arg) ->
@@ -317,10 +315,9 @@ big_binary(N, Acc) ->
 
 %% Test receiving an EXIT message when spawning a BIF with bad arguments.
 trap_exit_badarg_in_bif(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
+    ct:timetrap({seconds, 10}),
     process_flag(trap_exit, true),
     test_server:do_times(10, fun trap_exit_badarg_bif/0),
-    test_server:timetrap_cancel(Dog),
     ok.
     
 trap_exit_badarg_bif() ->
@@ -329,7 +326,7 @@ trap_exit_badarg_bif() ->
 	      {'EXIT', Pid, {badarg, _}} ->
 		  ok;
 	      Other ->
-		  test_server:fail({unexpected, Other})
+		  ct:fail({unexpected, Other})
 	  end.
 
 %% The following sequences of events have crasched Beam.
@@ -342,15 +339,13 @@ trap_exit_badarg_bif() ->
 %% 3) The process will crash the next time it executes 'receive'.
 
 exit_and_timeout(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(20)),
+    ct:timetrap({seconds, 20}),
 
     process_flag(trap_exit, true),
     Parent = self(),
     Low = fun_spawn(fun() -> eat_low(Parent) end),
     High = fun_spawn(fun() -> eat_high(Low) end),
     eat_wait_for(Low, High),
-
-    test_server:timetrap_cancel(Dog),
     ok.
 
 
@@ -361,7 +356,7 @@ eat_wait_for(Low, High) ->
 	{'EXIT', High, normal} ->
 	    eat_wait_for(Low, High);
 	Other ->
-	    test_server:fail({bad_message, Other})
+	    ct:fail({bad_message, Other})
     end.
 
 eat_low(_Parent) ->
@@ -394,14 +389,12 @@ loop(StopTime) ->
 %% Tries to send two different exit messages to a process.
 %% (The second one should be ignored.)
 exit_twice(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(20)),
+    ct:timetrap({seconds, 20}),
 
     process_flag(trap_exit, true),
     Low = fun_spawn(fun etwice_low/0),
     High = fun_spawn(fun() -> etwice_high(Low) end),
     etwice_wait_for(Low, High),
-
-    test_server:timetrap_cancel(Dog),
     ok.
 
 etwice_wait_for(Low, High) ->
@@ -409,11 +402,11 @@ etwice_wait_for(Low, High) ->
 	{'EXIT', Low, first} ->
 	    ok;
 	{'EXIT', Low, Other} ->
-	    test_server:fail({wrong_exit_reason, Other});
+	    ct:fail({wrong_exit_reason, Other});
 	{'EXIT', High, normal} ->
 	    etwice_wait_for(Low, High);
 	Other ->
-	    test_server:fail({bad_message, Other})
+	    ct:fail({bad_message, Other})
     end.
 
 etwice_low() ->
@@ -666,10 +659,6 @@ chk_pi_order([],[]) ->
 chk_pi_order([{Arg, _}| Values], [Arg|Args]) ->
     chk_pi_order(Values, Args).
 
-process_info_2_list(doc) ->
-    [];
-process_info_2_list(suite) ->
-    [];
 process_info_2_list(Config) when is_list(Config) ->
     Proc = spawn(fun () -> receive after infinity -> ok end end),
     register(process_SUITE_process_info_2_list1, self()),
@@ -702,10 +691,6 @@ process_info_2_list(Config) when is_list(Config) ->
     lists:foreach(fun ({backtrace, _}) -> ok end, V3),
     ok.
     
-process_info_lock_reschedule(doc) ->
-    [];
-process_info_lock_reschedule(suite) ->
-    [];
 process_info_lock_reschedule(Config) when is_list(Config) ->
     %% We need a process that is running and an item that requires
     %% process_info to take the main process lock.
@@ -738,7 +723,7 @@ process_info_lock_reschedule(Config) when is_list(Config) ->
 	    exit(Target2, bang),
 	    OkStatus;
 	{status, BadStatus} ->
-	    ?t:fail(BadStatus)
+	    ct:fail(BadStatus)
     end.
 
 pi_loop(_Name, _Pid, 0) ->
@@ -747,10 +732,6 @@ pi_loop(Name, Pid, N) ->
     {registered_name, Name} = process_info(Pid, registered_name),
     pi_loop(Name, Pid, N-1).
 
-process_info_lock_reschedule2(doc) ->
-    [];
-process_info_lock_reschedule2(suite) ->
-    [];
 process_info_lock_reschedule2(Config) when is_list(Config) ->
     Parent = self(),
     Fun = fun () ->
@@ -806,10 +787,6 @@ do_pi_msg_len(PT, AT) ->
     lists:map(fun (_) -> ok end, [a,b,c,d]),
     {message_queue_len, _} = process_info(element(2,PT), element(2,AT)).
     
-process_info_lock_reschedule3(doc) ->
-    [];
-process_info_lock_reschedule3(suite) ->
-    [];
 process_info_lock_reschedule3(Config) when is_list(Config) ->
     %% We need a process that is running and an item that requires
     %% process_info to take the main process lock.
@@ -840,7 +817,7 @@ process_info_lock_reschedule3(Config) when is_list(Config) ->
 		  exit(Target2, bang),
 		  OkStatus;
 	      {status, BadStatus} ->
-		  ?t:fail(BadStatus)
+		  ct:fail(BadStatus)
 	  end.
 
 process_status_exiting(Config) when is_list(Config) ->
@@ -932,6 +909,48 @@ start_spawner() ->
 stop_spawner() ->
     ok.
 
+%% Tests erlang:process_info(Pid, garbage_collection_info)
+process_info_garbage_collection(_Config) ->
+    Parent = self(),
+    Pid = spawn_link(
+            fun() ->
+                    receive go -> ok end,
+                    (fun F(0) ->
+                             Parent ! deep,
+                             receive ok -> ok end,
+                             [];
+                         F(N) ->
+                             timer:sleep(1),
+                             [lists:seq(1,100) | F(N-1)]
+                     end)(1000),
+                    Parent ! shallow,
+                    receive done -> ok end
+            end),
+    {garbage_collection_info, Before} =
+        erlang:process_info(Pid, garbage_collection_info),
+    Pid ! go, receive deep -> ok end,
+    {_, Deep} = erlang:process_info(Pid, garbage_collection_info),
+    Pid ! ok, receive shallow -> ok end,
+    {_, After} = erlang:process_info(Pid, garbage_collection_info),
+    Pid ! done,
+
+    %% Do some general checks to see if everything seems to be roughly correct
+    ct:log("Before: ~p",[Before]),
+    ct:log("Deep: ~p",[Deep]),
+    ct:log("After: ~p",[After]),
+
+    %% Check stack_size
+    true = proplists:get_value(stack_size, Before) < proplists:get_value(stack_size, Deep),
+    true = proplists:get_value(stack_size, After) < proplists:get_value(stack_size, Deep),
+
+    %% Check used heap size
+    true = proplists:get_value(heap_size, Before) + proplists:get_value(old_heap_size, Before)
+        < proplists:get_value(heap_size, Deep) + proplists:get_value(old_heap_size, Deep),
+    true = proplists:get_value(heap_size, Before) + proplists:get_value(old_heap_size, Before)
+        < proplists:get_value(heap_size, After) + proplists:get_value(old_heap_size, After),
+
+    ok.
+
 %% Tests erlang:bump_reductions/1.
 bump_reductions(Config) when is_list(Config) ->
     erlang:garbage_collect(),
@@ -942,10 +961,10 @@ bump_reductions(Config) when is_list(Config) ->
     case R2-R1 of
 	      Diff when Diff < 100 ->
 		  ok = io:format("R1 = ~w, R2 = ~w", [R1, R2]),
-		  test_server:fail({small_diff, Diff});
+		  ct:fail({small_diff, Diff});
 	      Diff when Diff > 110 ->
 		  ok = io:format("R1 = ~w, R2 = ~w", [R1, R2]),
-		  test_server:fail({big_diff, Diff});
+		  ct:fail({big_diff, Diff});
 	      Diff ->
 		  io:format("~p\n", [Diff]),
 		  ok
@@ -984,7 +1003,7 @@ low_prio_test(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     S = spawn_link(?MODULE, prio_server, [0, 0]),
     PCs = spawn_prio_clients(S, erlang:system_info(schedulers_online)),
-    timer:sleep(2000),
+    ct:sleep({seconds,3}),
     lists:foreach(fun (P) -> exit(P, kill) end, PCs),
     S ! exit,
     receive {'EXIT', S, {A, B}} -> check_prio(A, B) end,
@@ -1032,8 +1051,7 @@ make_unaligned_sub_binary(Bin0) ->
     <<0:3,Bin:Sz/binary,31:5>> = id(Bin1),
     Bin.
 
-yield(doc) ->
-    "Tests erlang:yield/1.";
+%% Tests erlang:yield/1
 yield(Config) when is_list(Config) ->
     case catch erlang:system_info(modified_timing_level) of
 	Level when is_integer(Level) ->
@@ -1074,7 +1092,7 @@ yield_test() ->
 	{Diff, _} ->
 	    ok = io:format("R1 = ~w, R2 = ~w, Schedcnt = ~w", 
 		[R1, R2, Schedcnt]),
-	    test_server:fail({measurement_error, Diff, Schedcnt})
+	    ct:fail({measurement_error, Diff, Schedcnt})
     end.
 
 call_yield() ->
@@ -1111,8 +1129,6 @@ schedcnt(stop, {Ref, Pid}) when is_reference(Ref), is_pid(Pid) ->
 	    Cnt
     end.
 
-yield2(doc) -> [];
-yield2(suite) -> [];
 yield2(Config) when is_list(Config) ->
     Me = self(),
     Go = make_ref(),
@@ -1163,7 +1179,7 @@ yield2(Config) when is_list(Config) ->
 		  io:format("Reductions = ~p~n", [Reductions]),
 		  ok;
 	      {RedDiff, Reductions} ->
-		  ?t:fail({unexpected_reduction_count, Reductions})
+		  ct:fail({unexpected_reduction_count, Reductions})
 	  end,
 
     none = next_tmsg(P),
@@ -1204,8 +1220,6 @@ fail_register(Name, Process) ->
     {'EXIT',{badarg,_}} = (catch Name ! anything_goes),
     ok.
 
-garbage_collect(doc) -> [];
-garbage_collect(suite) -> [];
 garbage_collect(Config) when is_list(Config) ->
     Prio = process_flag(priority, high),
     true = erlang:garbage_collect(),
@@ -1244,10 +1258,7 @@ garbage_collect(Config) when is_list(Config) ->
     process_flag(priority, Prio),
     ok.
 
-process_info_messages(doc) ->
-    ["This used to cause the nofrag emulator to dump core"];
-process_info_messages(suite) ->
-    [];
+%% This used to cause the nofrag emulator to dump core
 process_info_messages(Config) when is_list(Config) ->
     process_info_messages_test(),
     ok.
@@ -1305,10 +1316,6 @@ process_info_messages_test() ->
 chk_badarg(Fun) ->
     try Fun(), exit(no_badarg) catch error:badarg -> ok end.
 
-process_flag_badarg(doc) ->
-    [];
-process_flag_badarg(suite) ->
-    [];
 process_flag_badarg(Config) when is_list(Config) ->
     chk_badarg(fun () -> process_flag(gurka, banan) end),
     chk_badarg(fun () -> process_flag(trap_exit, gurka) end),
@@ -1326,8 +1333,6 @@ process_flag_badarg(Config) when is_list(Config) ->
 
 -include_lib("stdlib/include/ms_transform.hrl").
 
-otp_6237(doc) -> [];
-otp_6237(suite) -> [];
 otp_6237(Config) when is_list(Config) ->
     Slctrs = lists:map(fun (_) ->
 		spawn_link(fun () ->
@@ -1394,10 +1399,6 @@ otp_6237_select_loop() ->
 			     conses_per_red,
 			     debug_level}).
 
-processes_large_tab(doc) ->
-    [];
-processes_large_tab(suite) ->
-    [];
 processes_large_tab(Config) when is_list(Config) ->
     sys_mem_cond_run(2048, fun () -> processes_large_tab_test(Config) end).
 
@@ -1425,7 +1426,7 @@ processes_large_tab_test(Config) ->
 		       #ptab_list_bif_info{debug_level = Lvl} when Lvl > MaxDbgLvl ->
 			   20;
 		       #ptab_list_bif_info{debug_level = Lvl} when Lvl < 0 ->
-			   ?t:fail({debug_level, Lvl});
+			   ct:fail({debug_level, Lvl});
 		       #ptab_list_bif_info{debug_level = Lvl} ->
 			   Lvl
 		   end,
@@ -1443,15 +1444,11 @@ processes_large_tab_test(Config) ->
 			[processes_bif_info]) of
 	      #ptab_list_bif_info{tab_chunks = Chunks} when is_integer(Chunks),
 							    Chunks > 1 -> ok;
-	      PBInfo -> ?t:fail(PBInfo)
+	      PBInfo -> ct:fail(PBInfo)
 	  end,
     stop_node(LargeNode),
     chk_processes_bif_test_res(Res).
 
-processes_default_tab(doc) ->
-    [];
-processes_default_tab(suite) ->
-    [];
 processes_default_tab(Config) when is_list(Config) ->
     sys_mem_cond_run(1024, fun () -> processes_default_tab_test(Config) end).
 
@@ -1461,10 +1458,6 @@ processes_default_tab_test(Config) ->
     stop_node(DefaultNode),
     chk_processes_bif_test_res(Res).
 
-processes_small_tab(doc) ->
-    [];
-processes_small_tab(suite) ->
-    [];
 processes_small_tab(Config) when is_list(Config) ->
     {ok, SmallNode} = start_node(Config, "+P 1024"),
     Res    = rpc:call(SmallNode, ?MODULE, processes_bif_test, []),
@@ -1473,10 +1466,6 @@ processes_small_tab(Config) when is_list(Config) ->
     true = PBInfo#ptab_list_bif_info.tab_chunks < 10,
     chk_processes_bif_test_res(Res).
 
-processes_this_tab(doc) ->
-    [];
-processes_this_tab(suite) ->
-    [];
 processes_this_tab(Config) when is_list(Config) ->
     Mem = case {erlang:system_info(build_type),
                 erlang:system_info(allocator)} of
@@ -1490,7 +1479,7 @@ processes_this_tab(Config) when is_list(Config) ->
 
 chk_processes_bif_test_res(ok) -> ok;
 chk_processes_bif_test_res({comment, _} = Comment) -> Comment;
-chk_processes_bif_test_res(Failure) -> ?t:fail(Failure).
+chk_processes_bif_test_res(Failure) -> ct:fail(Failure).
 
 print_processes_bif_info(#ptab_list_bif_info{min_start_reds = MinStartReds,
 					     tab_chunks = TabChunks,
@@ -1501,7 +1490,7 @@ print_processes_bif_info(#ptab_list_bif_info{min_start_reds = MinStartReds,
 					     term_procs_max_reds = TPMaxReds,
 					     conses_per_red = ConsesPerRed,
 					     debug_level = DbgLvl}) ->
-    ?t:format("processes/0 bif info on node ~p:~n"
+    io:format("processes/0 bif info on node ~p:~n"
 	      "Min start reductions = ~p~n"
 	      "Process table chunks = ~p~n"
 	      "Process table chunks size = ~p~n"
@@ -1542,7 +1531,7 @@ processes_unexpected_result(CorrectProcs, Procs) ->
 		status,
 		priority],
     MissingProcs = CorrectProcs -- Procs,
-    ?t:format("Missing processes: ~p",
+    io:format("Missing processes: ~p",
 	      [lists:map(fun (Pid) ->
 				 [{pid, Pid}
 				  | case process_info(Pid, ProcInfo) of
@@ -1552,7 +1541,7 @@ processes_unexpected_result(CorrectProcs, Procs) ->
 			 end,
 			 MissingProcs)]),
     SuperfluousProcs = Procs -- CorrectProcs,
-    ?t:format("Superfluous processes: ~p",
+    io:format("Superfluous processes: ~p",
 	      [lists:map(fun (Pid) ->
 				 [{pid, Pid}
 				  | case process_info(Pid, ProcInfo) of
@@ -1561,7 +1550,7 @@ processes_unexpected_result(CorrectProcs, Procs) ->
 				    end]
 			 end,
 			 SuperfluousProcs)]),
-    ?t:fail(unexpected_result).
+    ct:fail(unexpected_result).
 
 hangaround(Cleaner, Type) ->
     %% Type is only used to distinguish different processes from
@@ -1666,7 +1655,7 @@ do_processes_bif_test(WantReds, DieTest, Processes) ->
 	DoIt = make_ref(),
 	GetGoing = make_ref(),
 	{NoTestProcs, TestProcs} = spawn_initial_hangarounds(Cleaner),
-	?t:format("Testing with ~p processes~n", [NoTestProcs]),
+	io:format("Testing with ~p processes~n", [NoTestProcs]),
 	SpawnHangAround = fun () ->
 		spawn(?MODULE, hangaround, [Cleaner, new_hangaround])
 	end,
@@ -1708,7 +1697,7 @@ do_processes_bif_test(WantReds, DieTest, Processes) ->
 	Procs = lists:sort(Procs0),
 	CorrectProcs = lists:sort(CorrectProcs0),
 	LengthCorrectProcs = length(CorrectProcs),
-	?t:format("~p = length(CorrectProcs)~n", [LengthCorrectProcs]),
+	io:format("~p = length(CorrectProcs)~n", [LengthCorrectProcs]),
 	true = LengthCorrectProcs > NoTestProcs,
 	case CorrectProcs =:= Procs of
 	    true ->
@@ -1729,12 +1718,12 @@ do_processes_bif_test(WantReds, DieTest, Processes) ->
 
 
 do_processes_bif_die_test(false, _Processes) ->
-    ?t:format("Skipping test killing process executing processes/0~n",[]),
+    io:format("Skipping test killing process executing processes/0~n",[]),
     ok;
 do_processes_bif_die_test(true, Processes) ->
     do_processes_bif_die_test(5, Processes);
 do_processes_bif_die_test(N, Processes) ->
-    ?t:format("Doing test killing process executing processes/0~n",[]),
+    io:format("Doing test killing process executing processes/0~n",[]),
     try
 	Tester = self(),
 	Oooh_Nooooooo = make_ref(),
@@ -1784,8 +1773,8 @@ do_processes_bif_die_test(N, Processes) ->
 	ok
     catch
 	throw:{kill_in_trap, R} when N > 0 ->
-	    ?t:format("Failed to kill in trap: ~p~n", [R]),
-	    ?t:format("Trying again~n", []),
+	    io:format("Failed to kill in trap: ~p~n", [R]),
+	    io:format("Trying again~n", []),
 	    do_processes_bif_die_test(N-1, Processes)
     end.
 	    
@@ -1815,7 +1804,7 @@ wait_until_system_recover(Tmr) ->
 	    receive
 		{timeout, Tmr, _} ->
 		    Comment = "WARNING: Test processes still hanging around!",
-		    ?t:format("~s~n", [Comment]),
+		    io:format("~s~n", [Comment]),
 		    put(processes_bif_testcase_comment, Comment),
 		    lists:foreach(
 		      fun (P) when P == self() ->
@@ -1823,7 +1812,7 @@ wait_until_system_recover(Tmr) ->
 			  (P) ->
 			      case process_info(P, initial_call) of
 				  {initial_call,{?MODULE, _, _} = MFA} ->
-				      ?t:format("~p ~p~n", [P, MFA]);
+				      io:format("~p ~p~n", [P, MFA]);
 				  {initial_call,{_, _, _}} ->
 				      ok;
 				  undefined ->
@@ -1839,10 +1828,6 @@ wait_until_system_recover(Tmr) ->
     receive {timeout, Tmr, _} -> ok after 0 -> ok end,
     ok.
 
-processes_last_call_trap(doc) ->
-    [];
-processes_last_call_trap(suite) ->
-    [];
 processes_last_call_trap(Config) when is_list(Config) ->
     enable_internal_state(),
     Processes = fun () -> processes() end,
@@ -1865,10 +1850,6 @@ processes_last_call_trap(Config) when is_list(Config) ->
 my_processes() ->
     processes().
 
-processes_apply_trap(doc) ->
-    [];
-processes_apply_trap(suite) ->
-    [];
 processes_apply_trap(Config) when is_list(Config) ->
     enable_internal_state(),
     PBInfo = erts_debug:get_internal_state(processes_bif_info),
@@ -1883,10 +1864,6 @@ processes_apply_trap(Config) when is_list(Config) ->
 		apply(erlang, processes, [])
 	end, lists:seq(1,100)).
 
-processes_gc_trap(doc) ->
-    [];
-processes_gc_trap(suite) ->
-    [];
 processes_gc_trap(Config) when is_list(Config) ->
     Tester = self(),
     enable_internal_state(),
@@ -1925,10 +1902,6 @@ processes_gc_trap(Config) when is_list(Config) ->
     exit(Suspendee, bang),
     ok.
 
-process_flag_heap_size(doc) ->
-    [];
-process_flag_heap_size(suite) ->
-    [];
 process_flag_heap_size(Config) when is_list(Config) ->
     HSize  = 2586,   % must be gc fib+ number
     VHSize = 318187, % must be gc fib+ number
@@ -1940,10 +1913,6 @@ process_flag_heap_size(Config) when is_list(Config) ->
     VHSize = erlang:process_flag(min_bin_vheap_size, OldVHmin),
     ok.
 
-spawn_opt_heap_size(doc) ->
-    [];
-spawn_opt_heap_size(suite) ->
-    [];
 spawn_opt_heap_size(Config) when is_list(Config) ->
     HSize  = 987,   % must be gc fib+ number
     VHSize = 46422, % must be gc fib+ number
@@ -1954,10 +1923,6 @@ spawn_opt_heap_size(Config) when is_list(Config) ->
     Pid ! stop,
     ok.
 
-processes_term_proc_list(doc) ->
-    [];
-processes_term_proc_list(suite) ->
-    [];
 processes_term_proc_list(Config) when is_list(Config) ->
     Tester = self(),
     as_expected = processes_term_proc_list_test(false),
@@ -2107,24 +2072,12 @@ processes_term_proc_list_test(MustChk) ->
     as_expected.
 
 
-otp_7738_waiting(doc) ->
-    [];
-otp_7738_waiting(suite) ->
-    [];
 otp_7738_waiting(Config) when is_list(Config) ->
     otp_7738_test(waiting).
 
-otp_7738_suspended(doc) ->
-    [];
-otp_7738_suspended(suite) ->
-    [];
 otp_7738_suspended(Config) when is_list(Config) ->
     otp_7738_test(suspended).
 
-otp_7738_resume(doc) ->
-    [];
-otp_7738_resume(suite) ->
-    [];
 otp_7738_resume(Config) when is_list(Config) ->
     otp_7738_test(resume).
 
@@ -2193,8 +2146,8 @@ do_otp_7738_test(Type) ->
 		  ok
 	  after 2000 ->
 		  I = process_info(R, [status, message_queue_len]),
-		  ?t:format("~p~n", [I]),
-		  ?t:fail(no_progress)
+		  io:format("~p~n", [I]),
+		  ct:fail(no_progress)
 	  end,
     ok.
 
@@ -2281,7 +2234,7 @@ no_priority_inversion2(Config) when is_list(Config) ->
     RH = request_gc(PL, high),
     receive
 	{garbage_collect, _, _} ->
-	    ?t:fail(unexpected_gc)
+	    ct:fail(unexpected_gc)
     after 1000 ->
 	    ok
     end,
@@ -2390,7 +2343,7 @@ gc_request_when_gc_disabled(Config) when is_list(Config) ->
     async = garbage_collect(P, [{async, ReqId}]),
     receive
 	{garbage_collect, ReqId, Result} ->
-	    ?t:fail({unexpected_gc, Result});
+	    ct:fail({unexpected_gc, Result});
 	{P, gc_state, true} ->
 	    ok
     end,
@@ -2460,15 +2413,15 @@ start_node(Config, Args) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
 			      ++ "-"
-			      ++ atom_to_list(?config(testcase, Config))
+			      ++ atom_to_list(proplists:get_value(testcase, Config))
 			      ++ "-"
 			      ++ integer_to_list(erlang:system_time(seconds))
 			      ++ "-"
 			      ++ integer_to_list(erlang:unique_integer([positive]))),
-    ?t:start_node(Name, slave, [{args, "-pa "++Pa++" "++Args}]).
+    test_server:start_node(Name, slave, [{args, "-pa "++Pa++" "++Args}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 enable_internal_state() ->
     case catch erts_debug:get_internal_state(available_internal_state) of
diff --git a/erts/emulator/test/random_iolist.erl b/erts/emulator/test/random_iolist.erl
index 9a0f034e72..6da7da04de 100644
--- a/erts/emulator/test/random_iolist.erl
+++ b/erts/emulator/test/random_iolist.erl
@@ -36,7 +36,7 @@ run2(Iter,Fun1,Fun2) ->
     compare2(Iter,Fun1,Fun2).
 
 random_byte() ->
-     random:uniform(256) - 1.
+     rand:uniform(256) - 1.
 
 random_list(0,Acc) ->
     Acc;
@@ -45,7 +45,7 @@ random_list(N,Acc) ->
 
 random_binary(N) ->
     B = list_to_binary(random_list(N,[])),
-    case {random:uniform(2),size(B)} of
+    case {rand:uniform(2),size(B)} of
 	{2,M} when M > 1 ->
 	    S = M-1,
 	    <<_:3,C:S/binary,_:5>> = B,
@@ -57,7 +57,7 @@ random_list(N) ->
     random_list(N,[]).
 
 front() ->
-    case random:uniform(10) of
+    case rand:uniform(10) of
 	10 ->
 	    false;
 	_ ->
@@ -65,7 +65,7 @@ front() ->
     end.
 
 any_type() ->
-    case random:uniform(10) of
+    case rand:uniform(10) of
 	1 ->
 	    list;
 	2 ->
@@ -77,7 +77,7 @@ any_type() ->
     end.
 
 tail_type() ->
-    case random:uniform(5) of
+    case rand:uniform(5) of
 	1 ->
 	    list;
 	2 ->
@@ -90,9 +90,9 @@ random_length(N) ->
     UpperLimit = 255,
     case N of
 	M when M > UpperLimit ->
-	    random:uniform(UpperLimit+1) - 1;
+	    rand:uniform(UpperLimit+1) - 1;
 	_ ->
-	    random:uniform(N+1) - 1
+	    rand:uniform(N+1) - 1
     end.
 
 random_iolist(0,Acc) ->
@@ -139,7 +139,7 @@ random_iolist(N) ->
     
 
 standard_seed() ->
-    random:seed(1201,855653,380975).
+    rand:seed(exsplus, {1201,855653,380975}).
 
 do_comp(List,F1,F2) ->
     X = F1(List),
diff --git a/erts/emulator/test/receive_SUITE.erl b/erts/emulator/test/receive_SUITE.erl
index ccae0df72e..6097e54219 100644
--- a/erts/emulator/test/receive_SUITE.erl
+++ b/erts/emulator/test/receive_SUITE.erl
@@ -22,15 +22,14 @@
 
 %% Tests receive after.
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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,
 	 call_with_huge_message_queue/1,receive_in_between/1]).
 
--export([init_per_testcase/2,end_per_testcase/2]).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 3}}].
 
 all() -> 
     [call_with_huge_message_queue, receive_in_between].
@@ -38,27 +37,6 @@ all() ->
 groups() -> 
     [].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(3)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
 call_with_huge_message_queue(Config) when is_list(Config) ->
     Pid = spawn_link(fun echo_loop/0),
 
@@ -77,8 +55,7 @@ call_with_huge_message_queue(Config) when is_list(Config) ->
 	Q when Q < 10 ->
 	    ok;
 	Q ->
-	    io:format("Best Q = ~p", [Q]),
-	    ?t:fail()
+	    ct:fail("Best Q = ~p", [Q])
     end,
     ok.
 
diff --git a/erts/emulator/test/ref_SUITE.erl b/erts/emulator/test/ref_SUITE.erl
index 1042c23d65..287a2ffb73 100644
--- a/erts/emulator/test/ref_SUITE.erl
+++ b/erts/emulator/test/ref_SUITE.erl
@@ -20,54 +20,29 @@
 
 -module(ref_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]).
 -export([wrap_1/1]).
 
 -export([loop_ref/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-init_per_testcase(_, Config) ->
-    ?line Dog=test_server:timetrap(test_server:minutes(2)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 2}}].
 
 all() -> 
     [wrap_1].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-wrap_1(doc) -> "Check that refs don't wrap around easily.";
+%% Check that refs don't wrap around easily.
 wrap_1(Config) when is_list(Config) ->
-    ?line spawn_link(?MODULE, loop_ref, [self()]),
-    ?line receive
-	      done ->
-		  test_server:fail(wrapfast)
-	  after 30000 ->
-		  ok
-	  end,
+    spawn_link(?MODULE, loop_ref, [self()]),
+    receive
+        done ->
+            ct:fail(wrapfast)
+    after 30000 ->
+              ok
+    end,
     ok.
 
 loop_ref(Parent) ->
diff --git a/erts/emulator/test/register_SUITE.erl b/erts/emulator/test/register_SUITE.erl
index 5ecca0f547..ad8a9c29f3 100644
--- a/erts/emulator/test/register_SUITE.erl
+++ b/erts/emulator/test/register_SUITE.erl
@@ -23,47 +23,20 @@
 
 %-define(line_trace, 1).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %-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]).
 
 -export([otp_8099/1]).
 
--define(DEFAULT_TIMEOUT, ?t:minutes(2)).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 2}}].
 
 all() -> 
     [otp_8099].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(Case, Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, Dog}, {testcase, Case} | Config].
-
-end_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
 %%
 %% Test cases
 %%
@@ -83,25 +56,20 @@ otp_8099(Config) when is_list(Config) ->
 otp_8099_test(0) ->
     ok;
 otp_8099_test(N) ->
-    ?line P = spawn(fun () -> otp_8099_proc() end),
-    ?line case catch register(?OTP_8099_NAME, P) of
+    P = spawn(fun () -> otp_8099_proc() end),
+    case catch register(?OTP_8099_NAME, P) of
 	      true ->
-		  ?line ok;
+		  ok;
 	      _ ->
-		  ?line OP = whereis(?OTP_8099_NAME),
-		  ?line (catch unregister(?OTP_8099_NAME)),
-		  ?line (catch exit(OP, kill)),
-		  ?line true = (catch register(?OTP_8099_NAME, P))
+		  OP = whereis(?OTP_8099_NAME),
+		  (catch unregister(?OTP_8099_NAME)),
+		  (catch exit(OP, kill)),
+		  true = (catch register(?OTP_8099_NAME, P))
 	  end,
-    ?line P = whereis(?OTP_8099_NAME),
-    ?line exit(P, kill),
-    ?line otp_8099_test(N-1).
+    P = whereis(?OTP_8099_NAME),
+    exit(P, kill),
+    otp_8099_test(N-1).
 
 otp_8099_proc() ->
     receive _ -> ok end,
     otp_8099_proc().
-
-%%
-%% Utils
-%%
-
diff --git a/erts/emulator/test/save_calls_SUITE.erl b/erts/emulator/test/save_calls_SUITE.erl
index 544d841f16..3199fe9ca1 100644
--- a/erts/emulator/test/save_calls_SUITE.erl
+++ b/erts/emulator/test/save_calls_SUITE.erl
@@ -20,12 +20,9 @@
 
 -module(save_calls_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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, init_per_testcase/2,end_per_testcase/2]).
 
 -export([save_calls_1/1,dont_break_reductions/1]).
 
@@ -36,36 +33,21 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     [save_calls_1, dont_break_reductions].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 init_per_testcase(dont_break_reductions,Config) ->
     %% Skip on --enable-native-libs as hipe rescedules after each
     %% function call.
     case erlang:system_info(hipe_architecture) of
-	undefined ->
-	    Config;
-	Architecture ->
-	    {lists, ListsBinary, _ListsFilename} = code:get_object_code(lists),
-	    ChunkName = hipe_unified_loader:chunk_name(Architecture),
-	    NativeChunk = beam_lib:chunks(ListsBinary, [ChunkName]),
-	    case NativeChunk of
-		{ok,{_,[{_,Bin}]}} when is_binary(Bin) ->
-		    {skip,"Does not work for --enable-native-libs"};
-		{error, beam_lib, _} -> Config
-	    end
+        undefined ->
+            Config;
+        Architecture ->
+            {lists, ListsBinary, _ListsFilename} = code:get_object_code(lists),
+            ChunkName = hipe_unified_loader:chunk_name(Architecture),
+            NativeChunk = beam_lib:chunks(ListsBinary, [ChunkName]),
+            case NativeChunk of
+                {ok,{_,[{_,Bin}]}} when is_binary(Bin) ->
+                    {skip,"Does not work for --enable-native-libs"};
+                {error, beam_lib, _} -> Config
+            end
     end;
 init_per_testcase(_,Config) ->
     Config.
@@ -73,91 +55,99 @@ init_per_testcase(_,Config) ->
 end_per_testcase(_,_Config) ->
     ok.
 
-dont_break_reductions(suite) ->
-    [];
-dont_break_reductions(doc) ->
-    ["Check that save_calls dont break reduction-based scheduling"];
+%% Check that save_calls dont break reduction-based scheduling
 dont_break_reductions(Config) when is_list(Config) ->
-    ?line RPS1 = reds_per_sched(0),
-    ?line RPS2 = reds_per_sched(20),
-    ?line Diff = abs(RPS1 - RPS2),
-    ?line true = (Diff < (0.05 * RPS1)),
+    RPS1 = reds_per_sched(0),
+    RPS2 = reds_per_sched(20),
+    Diff = abs(RPS1 - RPS2),
+    true = (Diff < (0.05 * RPS1)),
     ok.
 
 
 reds_per_sched(SaveCalls) ->
-    ?line Parent = self(),
-    ?line HowMany = 10000,
-    ?line Pid = spawn(fun() -> 
-			process_flag(save_calls,SaveCalls), 
-			receive 
-			    go -> 
-				carmichaels_below(HowMany), 
-				Parent ! erlang:process_info(self(),reductions)
-			end 
-		end),
-    ?line TH = spawn(fun() -> trace_handler(0,Parent,Pid) end),
-    ?line erlang:trace(Pid, true,[running,procs,{tracer,TH}]),
-    ?line Pid ! go,
-    ?line {Sched,Reds} = receive 
-		       {accumulated,X} -> 
-			   receive {reductions,Y} -> 
-				   {X,Y} 
-			   after 30000 -> 
-				   timeout 
-			   end 
-		   after 30000 -> 
-			   timeout 
-		   end,
-    ?line Reds div Sched.
+    Parent = self(),
+    HowMany = 10000,
+    Pid = spawn(fun() -> 
+                        process_flag(save_calls,SaveCalls), 
+                        receive 
+                            go -> 
+                                carmichaels_below(HowMany), 
+                                Parent ! erlang:process_info(self(),reductions)
+                        end 
+                end),
+    TH = spawn(fun() -> trace_handler(0,Parent,Pid) end),
+    erlang:trace(Pid, true,[running,procs,{tracer,TH}]),
+    Pid ! go,
+    {Sched,Reds} = receive 
+                       {accumulated,X} -> 
+                           receive {reductions,Y} -> 
+                                       {X,Y} 
+                           after 30000 -> 
+                                     timeout 
+                           end 
+                   after 30000 -> 
+                             timeout 
+                   end,
+    Reds div Sched.
 
 
 
 trace_handler(Acc,Parent,Client) ->
     receive
-	{trace,Client,out,_} ->
-	    trace_handler(Acc+1,Parent,Client);
-	{trace,Client,exit,_} ->
-	    Parent ! {accumulated, Acc};
-	_ ->
-	    trace_handler(Acc,Parent,Client)
+        {trace,Client,out,_} ->
+            trace_handler(Acc+1,Parent,Client);
+        {trace,Client,exit,_} ->
+            Parent ! {accumulated, Acc};
+        _ ->
+            trace_handler(Acc,Parent,Client)
     after 10000 ->
-	    ok
+              ok
     end.
 
-save_calls_1(doc) -> "Test call saving.";
+%% Test call saving.
 save_calls_1(Config) when is_list(Config) ->
     case test_server:is_native(?MODULE) of
-	true -> {skipped,"Native code"};
-	false -> save_calls_1()
+        true -> {skipped,"Native code"};
+        false -> save_calls_1()
     end.
-	    
+
 save_calls_1() ->
-    ?line erlang:process_flag(self(), save_calls, 0),
-    ?line {last_calls, false} = process_info(self(), last_calls),
-
-    ?line erlang:process_flag(self(), save_calls, 10),
-    ?line {last_calls, _L1} = process_info(self(), last_calls),
-    ?line ?MODULE:do_bipp(),
-    ?line {last_calls, L2} = process_info(self(), last_calls),
-    ?line L21 = lists:filter(fun is_local_function/1, L2),
-    ?line case L21 of
-	      [{?MODULE,do_bipp,0},
-	       timeout,
-	       'send',
-	       {?MODULE,do_bopp,1},
-	       'receive',
-	       timeout,
-	       {?MODULE,do_bepp,0}] ->
-		  ok;
-	      X ->
-		  test_server:fail({l21, X})
-	  end,
-
-    ?line erlang:process_flag(self(), save_calls, 10),
-    ?line {last_calls, L3} = process_info(self(), last_calls),
-    ?line L31 = lists:filter(fun is_local_function/1, L3),
-    ?line [] = L31,
+    erlang:process_flag(self(), save_calls, 0),
+    {last_calls, false} = process_info(self(), last_calls),
+    
+    erlang:process_flag(self(), save_calls, 10),
+    {last_calls, _L1} = process_info(self(), last_calls),
+    ?MODULE:do_bipp(),
+    {last_calls, L2} = process_info(self(), last_calls),
+    L21 = lists:filter(fun is_local_function/1, L2),
+    case L21 of
+        [{?MODULE,do_bipp,0},
+         timeout,
+         'send',
+         {?MODULE,do_bopp,1},
+         'receive',
+         timeout,
+         {?MODULE,do_bepp,0}] ->
+            ok;
+        X ->
+            ct:fail({l21, X})
+    end,
+    
+    erlang:process_flag(self(), save_calls, 10),
+    {last_calls, L3} = process_info(self(), last_calls),
+    true = (L3 /= false),
+    L31 = lists:filter(fun is_local_function/1, L3),
+    [] = L31,
+    erlang:process_flag(self(), save_calls, 0),
+
+    %% Also check that it works on another process ...
+    Pid = spawn(fun () -> receive after infinity -> ok end end),
+    erlang:process_flag(Pid, save_calls, 10),
+    {last_calls, L4} = process_info(Pid, last_calls),
+    true = (L4 /= false),
+    L41 = lists:filter(fun is_local_function/1, L4),
+    [] = L41,
+    exit(Pid,kill),
     ok.
 
 do_bipp() ->
@@ -172,7 +162,7 @@ do_bapp() ->
 
 do_bopp(T) ->
     receive
-	X -> X
+        X -> X
     after T -> ok
     end.
 
@@ -189,25 +179,25 @@ is_local_function(_) ->
 
 % Number crunching for reds test.
 carmichaels_below(N) ->
-    random:seed(3172,9814,20125),
+    rand:seed(exsplus, {3172,9814,20125}),
     carmichaels_below(1,N).
 
 carmichaels_below(N,N2) when N >= N2 ->
     0;
 carmichaels_below(N,N2) ->
     X = case fast_prime(N,10) of
-	false -> 0;
-	true ->
-	    case fast_prime2(N,10) of
-		true ->
-		    %io:format("Prime: ~p~n",[N]),
-		    0;
-		false ->
-		    io:format("Carmichael: ~p (dividable by ~p)~n",
-			      [N,smallest_divisor(N)]),
-		    1
-	    end
-    end,
+            false -> 0;
+            true ->
+                case fast_prime2(N,10) of
+                    true ->
+                        %io:format("Prime: ~p~n",[N]),
+                        0;
+                    false ->
+                        io:format("Carmichael: ~p (dividable by ~p)~n",
+                                  [N,smallest_divisor(N)]),
+                        1
+                end
+        end,
     X+carmichaels_below(N+2,N2).
 
 expmod(_,E,_) when E == 0 ->
@@ -219,7 +209,7 @@ expmod(Base,Exp,Mod) ->
     (Base * expmod(Base,Exp - 1,Mod)) rem Mod.
 
 uniform(N) ->
-    random:uniform(N-1).
+    rand:uniform(N-1).
 
 fermat(N) ->    
     R = uniform(N),
@@ -231,30 +221,30 @@ do_fast_prime(_N,0) ->
     true;
 do_fast_prime(N,Times) ->
     case fermat(N) of
-	true ->
-	    do_fast_prime(N,Times-1);
-	false ->
-	    false
+        true ->
+            do_fast_prime(N,Times-1);
+        false ->
+            false
     end.
-    
+
 fast_prime(N,T) ->
     do_fast_prime(N,T).
 
 expmod2(_,E,_) when E == 0 ->
     1;
 expmod2(Base,Exp,Mod) when (Exp rem 2) == 0 ->
-%% Uncomment the code below to simulate scheduling bug!
-%     case erlang:process_info(self(),last_calls) of
-% 	{last_calls,false} -> ok;
-% 	_ -> erlang:yield()
-%     end,
+    %% Uncomment the code below to simulate scheduling bug!
+    %     case erlang:process_info(self(),last_calls) of
+    % 	{last_calls,false} -> ok;
+    % 	_ -> erlang:yield()
+    %     end,
     X = expmod2(Base,Exp div 2,Mod),
     Y=(X*X) rem Mod,
     if 
-	Y == 1, X =/= 1, X =/= (Mod - 1) ->
-	    0;
-	true ->
-	    Y rem Mod
+        Y == 1, X =/= 1, X =/= (Mod - 1) ->
+            0;
+        true ->
+            Y rem Mod
     end;
 expmod2(Base,Exp,Mod) -> 
     (Base * expmod2(Base,Exp - 1,Mod)) rem Mod.
@@ -269,12 +259,12 @@ do_fast_prime2(_N,0) ->
     true;
 do_fast_prime2(N,Times) ->
     case miller_rabbin(N) of
-	true ->
-	    do_fast_prime2(N,Times-1);
-	false ->
-	    false
+        true ->
+            do_fast_prime2(N,Times-1);
+        false ->
+            false
     end.
-    
+
 fast_prime2(N,T) ->
     do_fast_prime2(N,T).
 
@@ -283,17 +273,16 @@ smallest_divisor(N) ->
 
 find_divisor(N,TD) ->
     if 
-	TD*TD > N ->
-	    N;
-	true ->
-	    case divides(TD,N) of
-		true ->
-		    TD;
-		false ->
-		    find_divisor(N,TD+1)
-	    end
+        TD*TD > N ->
+            N;
+        true ->
+            case divides(TD,N) of
+                true ->
+                    TD;
+                false ->
+                    find_divisor(N,TD+1)
+            end
     end.
 
 divides(A,B) ->
     (B rem A) == 0.
-
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl
index 986a73ebb1..0b4b302908 100644
--- a/erts/emulator/test/scheduler_SUITE.erl
+++ b/erts/emulator/test/scheduler_SUITE.erl
@@ -31,12 +31,12 @@
 
 %-define(line_trace, 1).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %-compile(export_all).
--export([all/0, suite/0,groups/0,init_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 init_per_testcase/2, end_per_testcase/2, end_per_suite/1]).
+-export([all/0, suite/0, groups/0,
+         init_per_suite/1, end_per_suite/1,
+         init_per_testcase/2, end_per_testcase/2]).
 
 -export([equal/1,
 	 few_low/1,
@@ -54,23 +54,25 @@
 	 sct_cmd/1,
 	 sbt_cmd/1,
 	 scheduler_threads/1,
+	 scheduler_suspend_basic/1,
 	 scheduler_suspend/1,
 	 dirty_scheduler_threads/1,
+	 dirty_scheduler_exit/1,
 	 reader_groups/1]).
 
--define(DEFAULT_TIMEOUT, ?t:minutes(15)).
-
--define(MIN_SCHEDULER_TEST_TIMEOUT, ?t:minutes(1)).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 15}}].
 
 all() -> 
     [equal, few_low, many_low, equal_with_part_time_high,
      equal_with_part_time_max,
      equal_and_high_with_part_time_max, equal_with_high,
-     equal_with_high_max, bound_process,
-     {group, scheduler_bind}, scheduler_threads, scheduler_suspend,
-     dirty_scheduler_threads,
+     equal_with_high_max,
+     bound_process,
+     {group, scheduler_bind}, scheduler_threads,
+     scheduler_suspend_basic, scheduler_suspend,
+     dirty_scheduler_threads, dirty_scheduler_exit,
      reader_groups].
 
 groups() -> 
@@ -85,12 +87,6 @@ end_per_suite(Config) ->
     catch erts_debug:set_internal_state(available_internal_state, false),
     Config.
 
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 init_per_testcase(update_cpu_info, Config) ->
     case os:find_executable("taskset") of
 	false ->
@@ -102,15 +98,12 @@ init_per_testcase(Case, Config) when is_list(Config) ->
     init_per_tc(Case, Config).
 
 init_per_tc(Case, Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
     process_flag(priority, max),
     erlang:display({'------------', ?MODULE, Case, '------------'}),
     OkRes = ok,
-    [{watchdog, Dog}, {testcase, Case}, {ok_res, OkRes} |Config].
+    [{testcase, Case}, {ok_res, OkRes} |Config].
 
 end_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
     ok.
 
 -define(ERTS_RUNQ_CHECK_BALANCE_REDS_PER_SCHED, (2000*2000)).
@@ -130,130 +123,130 @@ many_low(Config) when is_list(Config) ->
     low_normal_test(Config, 2*active_schedulers(), 1000).
 
 low_normal_test(Config, NW, LW) ->
-    ?line Tracer = start_tracer(),
-    ?line Low = workers(LW, low),
-    ?line Normal = workers(NW, normal),
-    ?line Res = do_it(Tracer, Low, Normal, [], []),
-    ?line chk_result(Res, LW, NW, 0, 0, true, false, false),
-    ?line workers_exit([Low, Normal]),
-    ?line ok(Res, Config).
+    Tracer = start_tracer(),
+    Low = workers(LW, low),
+    Normal = workers(NW, normal),
+    Res = do_it(Tracer, Low, Normal, [], []),
+    chk_result(Res, LW, NW, 0, 0, true, false, false),
+    workers_exit([Low, Normal]),
+    ok(Res, Config).
 
 equal_with_part_time_high(Config) when is_list(Config) ->
-    ?line NW = 500,
-    ?line LW = 500,
-    ?line HW = 1,
-    ?line Tracer = start_tracer(),
-    ?line Normal = workers(NW, normal),
-    ?line Low = workers(LW, low),
-    ?line High = part_time_workers(HW, high),
-    ?line Res = do_it(Tracer, Low, Normal, High, []),
-    ?line chk_result(Res, LW, NW, HW, 0, true, true, false),
-    ?line workers_exit([Low, Normal, High]),
-    ?line ok(Res, Config).
+    NW = 500,
+    LW = 500,
+    HW = 1,
+    Tracer = start_tracer(),
+    Normal = workers(NW, normal),
+    Low = workers(LW, low),
+    High = part_time_workers(HW, high),
+    Res = do_it(Tracer, Low, Normal, High, []),
+    chk_result(Res, LW, NW, HW, 0, true, true, false),
+    workers_exit([Low, Normal, High]),
+    ok(Res, Config).
 
 equal_and_high_with_part_time_max(Config) when is_list(Config) ->
-    ?line NW = 500,
-    ?line LW = 500,
-    ?line HW = 500,
-    ?line MW = 1,
-    ?line Tracer = start_tracer(),
-    ?line Low = workers(LW, low),
-    ?line Normal = workers(NW, normal),
-    ?line High = workers(HW, high),
-    ?line Max = part_time_workers(MW, max),
-    ?line Res = do_it(Tracer, Low, Normal, High, Max),
-    ?line chk_result(Res, LW, NW, HW, MW, false, true, true),
-    ?line workers_exit([Low, Normal, Max]),
-    ?line ok(Res, Config).
+    NW = 500,
+    LW = 500,
+    HW = 500,
+    MW = 1,
+    Tracer = start_tracer(),
+    Low = workers(LW, low),
+    Normal = workers(NW, normal),
+    High = workers(HW, high),
+    Max = part_time_workers(MW, max),
+    Res = do_it(Tracer, Low, Normal, High, Max),
+    chk_result(Res, LW, NW, HW, MW, false, true, true),
+    workers_exit([Low, Normal, Max]),
+    ok(Res, Config).
 
 equal_with_part_time_max(Config) when is_list(Config) ->
-    ?line NW = 500,
-    ?line LW = 500,
-    ?line MW = 1,
-    ?line Tracer = start_tracer(),
-    ?line Low = workers(LW, low),
-    ?line Normal = workers(NW, normal),
-    ?line Max = part_time_workers(MW, max),
-    ?line Res = do_it(Tracer, Low, Normal, [], Max),
-    ?line chk_result(Res, LW, NW, 0, MW, true, false, true),
-    ?line workers_exit([Low, Normal, Max]),
-    ?line ok(Res, Config).
+    NW = 500,
+    LW = 500,
+    MW = 1,
+    Tracer = start_tracer(),
+    Low = workers(LW, low),
+    Normal = workers(NW, normal),
+    Max = part_time_workers(MW, max),
+    Res = do_it(Tracer, Low, Normal, [], Max),
+    chk_result(Res, LW, NW, 0, MW, true, false, true),
+    workers_exit([Low, Normal, Max]),
+    ok(Res, Config).
 
 equal_with_high(Config) when is_list(Config) ->
-    ?line NW = 500,
-    ?line LW = 500,
-    ?line HW = 1,
-    ?line Tracer = start_tracer(),
-    ?line Low = workers(LW, low),
-    ?line Normal = workers(NW, normal),
-    ?line High = workers(HW, high),
-    ?line Res = do_it(Tracer, Low, Normal, High, []),
-    ?line LNExe = case active_schedulers() of
+    NW = 500,
+    LW = 500,
+    HW = 1,
+    Tracer = start_tracer(),
+    Low = workers(LW, low),
+    Normal = workers(NW, normal),
+    High = workers(HW, high),
+    Res = do_it(Tracer, Low, Normal, High, []),
+    LNExe = case active_schedulers() of
 		      S when S =< HW -> false;
 		      _ -> true
 		  end,
-    ?line chk_result(Res, LW, NW, HW, 0, LNExe, true, false),
-    ?line workers_exit([Low, Normal, High]),
-    ?line ok(Res, Config).
+    chk_result(Res, LW, NW, HW, 0, LNExe, true, false),
+    workers_exit([Low, Normal, High]),
+    ok(Res, Config).
 
 equal_with_high_max(Config) when is_list(Config) ->
-    ?line NW = 500,
-    ?line LW = 500,
-    ?line HW = 1,
-    ?line MW = 1,
-    ?line Tracer = start_tracer(),
-    ?line Normal = workers(NW, normal),
-    ?line Low = workers(LW, low),
-    ?line High = workers(HW, high),
-    ?line Max = workers(MW, max),
-    ?line Res = do_it(Tracer, Low, Normal, High, Max),
-    ?line {LNExe, HExe} = case active_schedulers() of
+    NW = 500,
+    LW = 500,
+    HW = 1,
+    MW = 1,
+    Tracer = start_tracer(),
+    Normal = workers(NW, normal),
+    Low = workers(LW, low),
+    High = workers(HW, high),
+    Max = workers(MW, max),
+    Res = do_it(Tracer, Low, Normal, High, Max),
+    {LNExe, HExe} = case active_schedulers() of
 			      S when S =< MW -> {false, false};
 			      S when S =< (MW + HW) -> {false, true};
 			      _ -> {true, true}
 			  end,
-    ?line chk_result(Res, LW, NW, HW, MW, LNExe, HExe, true),
-    ?line workers_exit([Low, Normal, Max]),
-    ?line ok(Res, Config).
+    chk_result(Res, LW, NW, HW, MW, LNExe, HExe, true),
+    workers_exit([Low, Normal, Max]),
+    ok(Res, Config).
 
 bound_process(Config) when is_list(Config) ->
     case erlang:system_info(run_queues) == erlang:system_info(schedulers) of
-	true ->
-	    ?line NStartBase = 20000,
-	    ?line NStart = case {erlang:system_info(debug_compiled),
-				 erlang:system_info(lock_checking)} of
-			       {true, true} -> NStartBase div 100;
-			       {_, true} -> NStartBase div 10;
-			       _ -> NStartBase
-			   end,
-	    ?line MStart = 100,
-	    ?line Seq = lists:seq(1, 100),
-	    ?line Tester = self(),
-	    ?line Procs = lists:map(
-			    fun (N) when N rem 2 == 0 ->
-				    spawn_opt(fun () ->
-						      bound_loop(NStart,
-								 NStart,
-								 MStart,
-								 1),
-						      Tester ! {self(), done}
-					      end,
-					      [{scheduler, 1}, link]);
-				(_N) ->
-				    spawn_link(fun () ->
-						       bound_loop(NStart,
-								  NStart,
-								  MStart,
-								  false),
-						       Tester ! {self(), done}
-					       end)
-			    end,
-			    Seq),
-	    ?line lists:foreach(fun (P) -> receive {P, done} -> ok end end,
-				Procs),
-	    ?line ok;
-	false ->
-	    {skipped, "Functionality not supported"}
+        true ->
+            NStartBase = 20000,
+            NStart = case {erlang:system_info(debug_compiled),
+                           erlang:system_info(lock_checking)} of
+                         {true, true} -> NStartBase div 100;
+                         {_, true} -> NStartBase div 10;
+                         _ -> NStartBase
+                     end,
+            MStart = 100,
+            Seq = lists:seq(1, 100),
+            Tester = self(),
+            Procs = lists:map(
+                      fun (N) when N rem 2 == 0 ->
+                              spawn_opt(fun () ->
+                                                bound_loop(NStart,
+                                                           NStart,
+                                                           MStart,
+                                                           1),
+                                                Tester ! {self(), done}
+                                        end,
+                                        [{scheduler, 1}, link]);
+                          (_N) ->
+                              spawn_link(fun () ->
+                                                 bound_loop(NStart,
+                                                            NStart,
+                                                            MStart,
+                                                            false),
+                                                 Tester ! {self(), done}
+                                         end)
+                      end,
+                      Seq),
+            lists:foreach(fun (P) -> receive {P, done} -> ok end end,
+                          Procs),
+            ok;
+        false ->
+            {skipped, "Functionality not supported"}
     end.
 
 bound_loop(_, 0, 0, _) ->
@@ -487,59 +480,59 @@ bound_loop(NS, N, M, Sched) ->
 	":L30-31t0-1c15n3p0").
 
 -define(TOPOLOGY_F_TERM,
-	[{processor,[{node,[{core,[{thread,{logical,0}},
-				   {thread,{logical,1}}]},
-			    {core,[{thread,{logical,2}},
-				   {thread,{logical,3}}]},
-			    {core,[{thread,{logical,4}},
-				   {thread,{logical,5}}]},
-			    {core,[{thread,{logical,6}},
-				   {thread,{logical,7}}]}]},
-		     {node,[{core,[{thread,{logical,8}},
-				   {thread,{logical,9}}]},
-			    {core,[{thread,{logical,10}},
-				   {thread,{logical,11}}]},
-			    {core,[{thread,{logical,12}},
-				   {thread,{logical,13}}]},
-			    {core,[{thread,{logical,14}},
-				   {thread,{logical,15}}]}]},
-		     {node,[{core,[{thread,{logical,16}},
-				   {thread,{logical,17}}]},
-			    {core,[{thread,{logical,18}},
-				   {thread,{logical,19}}]},
-			    {core,[{thread,{logical,20}},
-				   {thread,{logical,21}}]},
-			    {core,[{thread,{logical,22}},
-				   {thread,{logical,23}}]}]},
-		     {node,[{core,[{thread,{logical,24}},
-				   {thread,{logical,25}}]},
-			    {core,[{thread,{logical,26}},
-				   {thread,{logical,27}}]},
-			    {core,[{thread,{logical,28}},
-				   {thread,{logical,29}}]},
-			    {core,[{thread,{logical,30}},
-				   {thread,{logical,31}}]}]}]}]).
+        [{processor,[{node,[{core,[{thread,{logical,0}},
+                                   {thread,{logical,1}}]},
+                            {core,[{thread,{logical,2}},
+                                   {thread,{logical,3}}]},
+                            {core,[{thread,{logical,4}},
+                                   {thread,{logical,5}}]},
+                            {core,[{thread,{logical,6}},
+                                   {thread,{logical,7}}]}]},
+                     {node,[{core,[{thread,{logical,8}},
+                                   {thread,{logical,9}}]},
+                            {core,[{thread,{logical,10}},
+                                   {thread,{logical,11}}]},
+                            {core,[{thread,{logical,12}},
+                                   {thread,{logical,13}}]},
+                            {core,[{thread,{logical,14}},
+                                   {thread,{logical,15}}]}]},
+                     {node,[{core,[{thread,{logical,16}},
+                                   {thread,{logical,17}}]},
+                            {core,[{thread,{logical,18}},
+                                   {thread,{logical,19}}]},
+                            {core,[{thread,{logical,20}},
+                                   {thread,{logical,21}}]},
+                            {core,[{thread,{logical,22}},
+                                   {thread,{logical,23}}]}]},
+                     {node,[{core,[{thread,{logical,24}},
+                                   {thread,{logical,25}}]},
+                            {core,[{thread,{logical,26}},
+                                   {thread,{logical,27}}]},
+                            {core,[{thread,{logical,28}},
+                                   {thread,{logical,29}}]},
+                            {core,[{thread,{logical,30}},
+                                   {thread,{logical,31}}]}]}]}]).
 
 bindings(Node, BindType) ->
     Parent = self(),
     Ref = make_ref(),
     Pid = spawn_link(Node,
-		     fun () ->
-			     enable_internal_state(),
-			     Res = (catch erts_debug:get_internal_state(
-					    {fake_scheduler_bindings,
-					     BindType})),
-			     Parent ! {Ref, Res}
-		     end),
+                     fun () ->
+                             enable_internal_state(),
+                             Res = (catch erts_debug:get_internal_state(
+                                            {fake_scheduler_bindings,
+                                             BindType})),
+                             Parent ! {Ref, Res}
+                     end),
     receive
-	{Ref, Res} ->
-	    ?t:format("~p: ~p~n", [BindType, Res]),
-	    unlink(Pid),
-	    Res
+        {Ref, Res} ->
+            io:format("~p: ~p~n", [BindType, Res]),
+            unlink(Pid),
+            Res
     end.
 
 scheduler_bind_types(Config) when is_list(Config) ->
-    ?line OldRelFlags = clear_erl_rel_flags(),
+    OldRelFlags = clear_erl_rel_flags(),
     try
 	scheduler_bind_types_test(Config,
 				  ?TOPOLOGY_A_TERM,
@@ -568,267 +561,267 @@ scheduler_bind_types(Config) when is_list(Config) ->
     after
 	restore_erl_rel_flags(OldRelFlags)
     end,
-    ?line ok.
+    ok.
 
 scheduler_bind_types_test(Config, Topology, CmdLine, TermLetter) ->
-    ?line ?t:format("Testing (~p): ~p~n", [TermLetter, Topology]),
-    ?line {ok, Node0} = start_node(Config),
-    ?line _ = rpc:call(Node0, erlang, system_flag, [cpu_topology, Topology]),
-    ?line cmp(Topology, rpc:call(Node0, erlang, system_info, [cpu_topology])),
-    ?line check_bind_types(Node0, TermLetter),
-    ?line stop_node(Node0),
-    ?line {ok, Node1} = start_node(Config, CmdLine),
-    ?line cmp(Topology, rpc:call(Node1, erlang, system_info, [cpu_topology])),
-    ?line check_bind_types(Node1, TermLetter),
-    ?line stop_node(Node1).
+    io:format("Testing (~p): ~p~n", [TermLetter, Topology]),
+    {ok, Node0} = start_node(Config),
+    _ = rpc:call(Node0, erlang, system_flag, [cpu_topology, Topology]),
+    cmp(Topology, rpc:call(Node0, erlang, system_info, [cpu_topology])),
+    check_bind_types(Node0, TermLetter),
+    stop_node(Node0),
+    {ok, Node1} = start_node(Config, CmdLine),
+    cmp(Topology, rpc:call(Node1, erlang, system_info, [cpu_topology])),
+    check_bind_types(Node1, TermLetter),
+    stop_node(Node1).
 
 check_bind_types(Node, a) ->
-    ?line {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}
-	= bindings(Node, no_spread),
-    ?line {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
-	= bindings(Node, thread_spread),
-    ?line {0,4,8,12,2,6,10,14,1,5,9,13,3,7,11,15}
-	= bindings(Node, processor_spread),
-    ?line {0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15}
-	= bindings(Node, spread),
-    ?line {0,2,4,6,1,3,5,7,8,10,12,14,9,11,13,15}
-	= bindings(Node, no_node_thread_spread),
-    ?line {0,4,2,6,1,5,3,7,8,12,10,14,9,13,11,15}
-	= bindings(Node, no_node_processor_spread),
-    ?line {0,4,2,6,8,12,10,14,1,5,3,7,9,13,11,15}
-	= bindings(Node, thread_no_node_processor_spread),
-    ?line {0,4,2,6,8,12,10,14,1,5,3,7,9,13,11,15}
-	= bindings(Node, default_bind),
-    ?line ok;
+    {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}
+    = bindings(Node, no_spread),
+    {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
+    = bindings(Node, thread_spread),
+    {0,4,8,12,2,6,10,14,1,5,9,13,3,7,11,15}
+    = bindings(Node, processor_spread),
+    {0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15}
+    = bindings(Node, spread),
+    {0,2,4,6,1,3,5,7,8,10,12,14,9,11,13,15}
+    = bindings(Node, no_node_thread_spread),
+    {0,4,2,6,1,5,3,7,8,12,10,14,9,13,11,15}
+    = bindings(Node, no_node_processor_spread),
+    {0,4,2,6,8,12,10,14,1,5,3,7,9,13,11,15}
+    = bindings(Node, thread_no_node_processor_spread),
+    {0,4,2,6,8,12,10,14,1,5,3,7,9,13,11,15}
+    = bindings(Node, default_bind),
+    ok;
 check_bind_types(Node, b) ->
-    ?line {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}
-	= bindings(Node, no_spread),
-    ?line {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
-	= bindings(Node, thread_spread),
-    ?line {0,8,2,10,4,12,6,14,1,9,3,11,5,13,7,15}
-	= bindings(Node, processor_spread),
-    ?line {0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15}
-	= bindings(Node, spread),
-    ?line {0,2,1,3,4,6,5,7,8,10,9,11,12,14,13,15}
-	= bindings(Node, no_node_thread_spread),
-    ?line {0,2,1,3,4,6,5,7,8,10,9,11,12,14,13,15}
-	= bindings(Node, no_node_processor_spread),
-    ?line {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
-	= bindings(Node, thread_no_node_processor_spread),
-    ?line {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
-	= bindings(Node, default_bind),
-    ?line ok;
+    {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}
+    = bindings(Node, no_spread),
+    {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
+    = bindings(Node, thread_spread),
+    {0,8,2,10,4,12,6,14,1,9,3,11,5,13,7,15}
+    = bindings(Node, processor_spread),
+    {0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15}
+    = bindings(Node, spread),
+    {0,2,1,3,4,6,5,7,8,10,9,11,12,14,13,15}
+    = bindings(Node, no_node_thread_spread),
+    {0,2,1,3,4,6,5,7,8,10,9,11,12,14,13,15}
+    = bindings(Node, no_node_processor_spread),
+    {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
+    = bindings(Node, thread_no_node_processor_spread),
+    {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
+    = bindings(Node, default_bind),
+    ok;
 check_bind_types(Node, c) ->
-    ?line {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,
-	   25,26,27,28,29,30,31} = bindings(Node, no_spread),
-    ?line {0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,1,3,5,7,9,11,13,15,
-	   17,19,21,23,25,27,29,31} = bindings(Node, thread_spread),
-    ?line {0,4,8,16,20,24,2,6,10,18,22,26,12,28,14,30,1,5,9,17,21,25,
-	   3,7,11,19,23,27,13,29,15,31} = bindings(Node, processor_spread),
-    ?line {0,8,16,24,4,20,12,28,2,10,18,26,6,22,14,30,1,9,17,25,5,21,13,29,3,11,
-	   19,27,7,23,15,31} = bindings(Node, spread),
-    ?line {0,2,4,6,1,3,5,7,8,10,9,11,12,14,13,15,16,18,20,22,17,19,21,23,24,26,
-	   25,27,28,30,29,31} = bindings(Node, no_node_thread_spread),
-    ?line {0,4,2,6,1,5,3,7,8,10,9,11,12,14,13,15,16,20,18,22,17,21,19,23,24,26,
-	   25,27,28,30,29,31} = bindings(Node, no_node_processor_spread),
-    ?line {0,4,2,6,8,10,12,14,16,20,18,22,24,26,28,30,1,5,3,7,9,11,13,15,17,21,
-	   19,23,25,27,29,31} = bindings(Node, thread_no_node_processor_spread),
-    ?line {0,4,2,6,8,10,12,14,16,20,18,22,24,26,28,30,1,5,3,7,9,11,13,15,17,21,
-	   19,23,25,27,29,31} = bindings(Node, default_bind),
-    ?line ok;
+    {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,
+     25,26,27,28,29,30,31} = bindings(Node, no_spread),
+    {0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,1,3,5,7,9,11,13,15,
+     17,19,21,23,25,27,29,31} = bindings(Node, thread_spread),
+    {0,4,8,16,20,24,2,6,10,18,22,26,12,28,14,30,1,5,9,17,21,25,
+     3,7,11,19,23,27,13,29,15,31} = bindings(Node, processor_spread),
+    {0,8,16,24,4,20,12,28,2,10,18,26,6,22,14,30,1,9,17,25,5,21,13,29,3,11,
+     19,27,7,23,15,31} = bindings(Node, spread),
+    {0,2,4,6,1,3,5,7,8,10,9,11,12,14,13,15,16,18,20,22,17,19,21,23,24,26,
+     25,27,28,30,29,31} = bindings(Node, no_node_thread_spread),
+    {0,4,2,6,1,5,3,7,8,10,9,11,12,14,13,15,16,20,18,22,17,21,19,23,24,26,
+     25,27,28,30,29,31} = bindings(Node, no_node_processor_spread),
+    {0,4,2,6,8,10,12,14,16,20,18,22,24,26,28,30,1,5,3,7,9,11,13,15,17,21,
+     19,23,25,27,29,31} = bindings(Node, thread_no_node_processor_spread),
+    {0,4,2,6,8,10,12,14,16,20,18,22,24,26,28,30,1,5,3,7,9,11,13,15,17,21,
+     19,23,25,27,29,31} = bindings(Node, default_bind),
+    ok;
 check_bind_types(Node, d) ->
-    ?line {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,
-	   25,26,27,28,29,30,31} = bindings(Node, no_spread),
-    ?line {0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,1,3,5,7,9,11,13,15,
-	   17,19,21,23,25,27,29,31} = bindings(Node, thread_spread),
-    ?line {0,8,12,16,24,28,2,10,14,18,26,30,4,20,6,22,1,9,13,17,25,29,3,11,15,
-	   19,27,31,5,21,7,23} = bindings(Node, processor_spread),
-    ?line {0,8,16,24,12,28,4,20,2,10,18,26,14,30,6,22,1,9,17,25,13,29,5,21,3,11,
-	   19,27,15,31,7,23} = bindings(Node, spread),
-    ?line {0,2,1,3,4,6,5,7,8,10,12,14,9,11,13,15,16,18,17,19,20,22,21,23,24,26,
-	   28,30,25,27,29,31} = bindings(Node, no_node_thread_spread),
-    ?line {0,2,1,3,4,6,5,7,8,12,10,14,9,13,11,15,16,18,17,19,20,22,21,23,24,28,
-	   26,30,25,29,27,31} = bindings(Node, no_node_processor_spread),
-    ?line {0,2,4,6,8,12,10,14,16,18,20,22,24,28,26,30,1,3,5,7,9,13,11,15,17,19,
-	   21,23,25,29,27,31} = bindings(Node, thread_no_node_processor_spread),
-    ?line {0,2,4,6,8,12,10,14,16,18,20,22,24,28,26,30,1,3,5,7,9,13,11,15,17,19,
-	   21,23,25,29,27,31} = bindings(Node, default_bind),
-    ?line ok;
+    {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,
+     25,26,27,28,29,30,31} = bindings(Node, no_spread),
+    {0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,1,3,5,7,9,11,13,15,
+     17,19,21,23,25,27,29,31} = bindings(Node, thread_spread),
+    {0,8,12,16,24,28,2,10,14,18,26,30,4,20,6,22,1,9,13,17,25,29,3,11,15,
+     19,27,31,5,21,7,23} = bindings(Node, processor_spread),
+    {0,8,16,24,12,28,4,20,2,10,18,26,14,30,6,22,1,9,17,25,13,29,5,21,3,11,
+     19,27,15,31,7,23} = bindings(Node, spread),
+    {0,2,1,3,4,6,5,7,8,10,12,14,9,11,13,15,16,18,17,19,20,22,21,23,24,26,
+     28,30,25,27,29,31} = bindings(Node, no_node_thread_spread),
+    {0,2,1,3,4,6,5,7,8,12,10,14,9,13,11,15,16,18,17,19,20,22,21,23,24,28,
+     26,30,25,29,27,31} = bindings(Node, no_node_processor_spread),
+    {0,2,4,6,8,12,10,14,16,18,20,22,24,28,26,30,1,3,5,7,9,13,11,15,17,19,
+     21,23,25,29,27,31} = bindings(Node, thread_no_node_processor_spread),
+    {0,2,4,6,8,12,10,14,16,18,20,22,24,28,26,30,1,3,5,7,9,13,11,15,17,19,
+     21,23,25,29,27,31} = bindings(Node, default_bind),
+    ok;
 check_bind_types(Node, e) ->
-    ?line {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}
-	= bindings(Node, no_spread),
-    ?line {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
-	= bindings(Node, thread_spread),
-    ?line {0,8,2,10,4,12,6,14,1,9,3,11,5,13,7,15}
-	= bindings(Node, processor_spread),
-    ?line {0,8,2,10,4,12,6,14,1,9,3,11,5,13,7,15}
-	= bindings(Node, spread),
-    ?line {0,2,4,6,1,3,5,7,8,10,12,14,9,11,13,15}
-	= bindings(Node, no_node_thread_spread),
-    ?line {0,2,4,6,1,3,5,7,8,10,12,14,9,11,13,15}
-	= bindings(Node, no_node_processor_spread),
-    ?line {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
-	= bindings(Node, thread_no_node_processor_spread),
-    ?line {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
-	= bindings(Node, default_bind),
-    ?line ok;
+    {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}
+    = bindings(Node, no_spread),
+    {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
+    = bindings(Node, thread_spread),
+    {0,8,2,10,4,12,6,14,1,9,3,11,5,13,7,15}
+    = bindings(Node, processor_spread),
+    {0,8,2,10,4,12,6,14,1,9,3,11,5,13,7,15}
+    = bindings(Node, spread),
+    {0,2,4,6,1,3,5,7,8,10,12,14,9,11,13,15}
+    = bindings(Node, no_node_thread_spread),
+    {0,2,4,6,1,3,5,7,8,10,12,14,9,11,13,15}
+    = bindings(Node, no_node_processor_spread),
+    {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
+    = bindings(Node, thread_no_node_processor_spread),
+    {0,2,4,6,8,10,12,14,1,3,5,7,9,11,13,15}
+    = bindings(Node, default_bind),
+    ok;
 check_bind_types(Node, f) ->
-    ?line {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,
-	   25,26,27,28,29,30,31} = bindings(Node, no_spread),
-    ?line {0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,1,3,5,7,9,11,13,15,
-	   17,19,21,23,25,27,29,31} = bindings(Node, thread_spread),
-    ?line {0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,1,3,5,7,9,11,13,
-	   15,17,19,21,23,25,27,29,31} = bindings(Node, processor_spread),
-    ?line {0,8,16,24,2,10,18,26,4,12,20,28,6,14,22,30,1,9,17,25,3,11,19,27,5,13,
-	   21,29,7,15,23,31} = bindings(Node, spread),
-    ?line {0,2,4,6,1,3,5,7,8,10,12,14,9,11,13,15,16,18,20,22,17,19,21,23,24,26,
-	   28,30,25,27,29,31} = bindings(Node, no_node_thread_spread),
-    ?line {0,2,4,6,1,3,5,7,8,10,12,14,9,11,13,15,16,18,20,22,17,19,21,23,24,26,
-	   28,30,25,27,29,31} = bindings(Node, no_node_processor_spread),
-    ?line {0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,1,3,5,7,9,11,13,15,17,19,
-	   21,23,25,27,29,31} = bindings(Node, thread_no_node_processor_spread),
-    ?line {0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,1,3,5,7,9,11,13,15,17,19,
-	   21,23,25,27,29,31} = bindings(Node, default_bind),
-    ?line ok;
+    {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,
+     25,26,27,28,29,30,31} = bindings(Node, no_spread),
+    {0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,1,3,5,7,9,11,13,15,
+     17,19,21,23,25,27,29,31} = bindings(Node, thread_spread),
+    {0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,1,3,5,7,9,11,13,
+     15,17,19,21,23,25,27,29,31} = bindings(Node, processor_spread),
+    {0,8,16,24,2,10,18,26,4,12,20,28,6,14,22,30,1,9,17,25,3,11,19,27,5,13,
+     21,29,7,15,23,31} = bindings(Node, spread),
+    {0,2,4,6,1,3,5,7,8,10,12,14,9,11,13,15,16,18,20,22,17,19,21,23,24,26,
+     28,30,25,27,29,31} = bindings(Node, no_node_thread_spread),
+    {0,2,4,6,1,3,5,7,8,10,12,14,9,11,13,15,16,18,20,22,17,19,21,23,24,26,
+     28,30,25,27,29,31} = bindings(Node, no_node_processor_spread),
+    {0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,1,3,5,7,9,11,13,15,17,19,
+     21,23,25,27,29,31} = bindings(Node, thread_no_node_processor_spread),
+    {0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,1,3,5,7,9,11,13,15,17,19,
+     21,23,25,27,29,31} = bindings(Node, default_bind),
+    ok;
 check_bind_types(Node, _) ->
-    ?line bindings(Node, no_spread),
-    ?line bindings(Node, thread_spread),
-    ?line bindings(Node, processor_spread),
-    ?line bindings(Node, spread),
-    ?line bindings(Node, no_node_thread_spread),
-    ?line bindings(Node, no_node_processor_spread),
-    ?line bindings(Node, thread_no_node_processor_spread),
-    ?line bindings(Node, default_bind),
-    ?line ok.
+    bindings(Node, no_spread),
+    bindings(Node, thread_spread),
+    bindings(Node, processor_spread),
+    bindings(Node, spread),
+    bindings(Node, no_node_thread_spread),
+    bindings(Node, no_node_processor_spread),
+    bindings(Node, thread_no_node_processor_spread),
+    bindings(Node, default_bind),
+    ok.
 
 cpu_topology(Config) when is_list(Config) ->
-    ?line OldRelFlags = clear_erl_rel_flags(),
+    OldRelFlags = clear_erl_rel_flags(),
     try
-	?line cpu_topology_test(
-		Config,
-		[{node,[{processor,[{core,{logical,0}},
-				    {core,{logical,1}}]}]},
-		 {processor,[{node,[{core,{logical,2}},
-				    {core,{logical,3}}]}]},
-		 {node,[{processor,[{core,{logical,4}},
-				    {core,{logical,5}}]}]},
-		 {processor,[{node,[{core,{logical,6}},
-				    {core,{logical,7}}]}]}],
-		"+sct "
-		"L0-1c0-1p0n0"
-		":L2-3c0-1n1p1"
-		":L4-5c0-1p2n2"
-		":L6-7c0-1n3p3"),
-	?line cpu_topology_test(
-		Config,
-		[{node,[{processor,[{core,{logical,0}},
-				    {core,{logical,1}}]},
-			{processor,[{core,{logical,2}},
-				    {core,{logical,3}}]}]},
-		 {processor,[{node,[{core,{logical,4}},
-				    {core,{logical,5}}]},
-			     {node,[{core,{logical,6}},
-				    {core,{logical,7}}]}]},
-		 {node,[{processor,[{core,{logical,8}},
-				    {core,{logical,9}}]},
-			{processor,[{core,{logical,10}},
-				    {core,{logical,11}}]}]},
-		 {processor,[{node,[{core,{logical,12}},
-				    {core,{logical,13}}]},
-			     {node,[{core,{logical,14}},
-				    {core,{logical,15}}]}]}],
-		"+sct "
-		"L0-1c0-1p0n0"
-		":L2-3c0-1p1n0"
-		":L4-5c0-1n1p2"
-		":L6-7c2-3n2p2"
-		":L8-9c0-1p3n3"
-		":L10-11c0-1p4n3"
-		":L12-13c0-1n4p5"
-		":L14-15c2-3n5p5"),
-	?line cpu_topology_test(
-		Config,
-		[{node,[{processor,[{core,{logical,0}},
-				    {core,{logical,1}}]}]},
-		 {processor,[{node,[{core,{logical,2}},
-				    {core,{logical,3}}]}]},
-		 {processor,[{node,[{core,{logical,4}},
-				    {core,{logical,5}}]}]},
-		 {node,[{processor,[{core,{logical,6}},
-				    {core,{logical,7}}]}]},
-		 {node,[{processor,[{core,{logical,8}},
-				    {core,{logical,9}}]}]},
-		 {processor,[{node,[{core,{logical,10}},
-				    {core,{logical,11}}]}]}],
-		"+sct "
-		"L0-1c0-1p0n0"
-		":L2-3c0-1n1p1"
-		":L4-5c0-1n2p2"
-		":L6-7c0-1p3n3"
-		":L8-9c0-1p4n4"
-		":L10-11c0-1n5p5")
+        cpu_topology_test(
+          Config,
+          [{node,[{processor,[{core,{logical,0}},
+                              {core,{logical,1}}]}]},
+           {processor,[{node,[{core,{logical,2}},
+                              {core,{logical,3}}]}]},
+           {node,[{processor,[{core,{logical,4}},
+                              {core,{logical,5}}]}]},
+           {processor,[{node,[{core,{logical,6}},
+                              {core,{logical,7}}]}]}],
+          "+sct "
+          "L0-1c0-1p0n0"
+          ":L2-3c0-1n1p1"
+          ":L4-5c0-1p2n2"
+          ":L6-7c0-1n3p3"),
+        cpu_topology_test(
+          Config,
+          [{node,[{processor,[{core,{logical,0}},
+                              {core,{logical,1}}]},
+                  {processor,[{core,{logical,2}},
+                              {core,{logical,3}}]}]},
+           {processor,[{node,[{core,{logical,4}},
+                              {core,{logical,5}}]},
+                       {node,[{core,{logical,6}},
+                              {core,{logical,7}}]}]},
+           {node,[{processor,[{core,{logical,8}},
+                              {core,{logical,9}}]},
+                  {processor,[{core,{logical,10}},
+                              {core,{logical,11}}]}]},
+           {processor,[{node,[{core,{logical,12}},
+                              {core,{logical,13}}]},
+                       {node,[{core,{logical,14}},
+                              {core,{logical,15}}]}]}],
+          "+sct "
+          "L0-1c0-1p0n0"
+          ":L2-3c0-1p1n0"
+          ":L4-5c0-1n1p2"
+          ":L6-7c2-3n2p2"
+          ":L8-9c0-1p3n3"
+          ":L10-11c0-1p4n3"
+          ":L12-13c0-1n4p5"
+          ":L14-15c2-3n5p5"),
+        cpu_topology_test(
+          Config,
+          [{node,[{processor,[{core,{logical,0}},
+                              {core,{logical,1}}]}]},
+           {processor,[{node,[{core,{logical,2}},
+                              {core,{logical,3}}]}]},
+           {processor,[{node,[{core,{logical,4}},
+                              {core,{logical,5}}]}]},
+           {node,[{processor,[{core,{logical,6}},
+                              {core,{logical,7}}]}]},
+           {node,[{processor,[{core,{logical,8}},
+                              {core,{logical,9}}]}]},
+           {processor,[{node,[{core,{logical,10}},
+                              {core,{logical,11}}]}]}],
+          "+sct "
+          "L0-1c0-1p0n0"
+          ":L2-3c0-1n1p1"
+          ":L4-5c0-1n2p2"
+          ":L6-7c0-1p3n3"
+          ":L8-9c0-1p4n4"
+          ":L10-11c0-1n5p5")
     after
-	restore_erl_rel_flags(OldRelFlags)
+        restore_erl_rel_flags(OldRelFlags)
     end,
-    ?line ok.
+    ok.
 
 cpu_topology_test(Config, Topology, Cmd) ->
-    ?line ?t:format("Testing~n ~p~n ~p~n", [Topology, Cmd]),
-    ?line cpu_topology_bif_test(Config, Topology),
-    ?line cpu_topology_cmdline_test(Config, Topology, Cmd),
-    ?line ok.
+    io:format("Testing~n ~p~n ~p~n", [Topology, Cmd]),
+    cpu_topology_bif_test(Config, Topology),
+    cpu_topology_cmdline_test(Config, Topology, Cmd),
+    ok.
 
 cpu_topology_bif_test(_Config, false) ->
-    ?line ok;
+    ok;
 cpu_topology_bif_test(Config, Topology) ->
-    ?line {ok, Node} = start_node(Config),
-    ?line _ = rpc:call(Node, erlang, system_flag, [cpu_topology, Topology]),
-    ?line cmp(Topology, rpc:call(Node, erlang, system_info, [cpu_topology])),
-    ?line stop_node(Node),
-    ?line ok.
+    {ok, Node} = start_node(Config),
+    _ = rpc:call(Node, erlang, system_flag, [cpu_topology, Topology]),
+    cmp(Topology, rpc:call(Node, erlang, system_info, [cpu_topology])),
+    stop_node(Node),
+    ok.
 
 cpu_topology_cmdline_test(_Config, _Topology, false) ->
-    ?line ok;
+    ok;
 cpu_topology_cmdline_test(Config, Topology, Cmd) ->
-    ?line {ok, Node} = start_node(Config, Cmd),
-    ?line cmp(Topology, rpc:call(Node, erlang, system_info, [cpu_topology])),
-    ?line stop_node(Node),
-    ?line ok.
+    {ok, Node} = start_node(Config, Cmd),
+    cmp(Topology, rpc:call(Node, erlang, system_info, [cpu_topology])),
+    stop_node(Node),
+    ok.
 
 update_cpu_info(Config) when is_list(Config) ->
-    ?line OldOnline = erlang:system_info(schedulers_online),
-    ?line OldAff = get_affinity_mask(),
-    ?line ?t:format("START - Affinity mask: ~p - Schedulers online: ~p - Scheduler bindings: ~p~n",
+    OldOnline = erlang:system_info(schedulers_online),
+    OldAff = get_affinity_mask(),
+    io:format("START - Affinity mask: ~p - Schedulers online: ~p - Scheduler bindings: ~p~n",
 		    [OldAff, OldOnline, erlang:system_info(scheduler_bindings)]),
-    ?line case {erlang:system_info(logical_processors_available), OldAff} of
+    case {erlang:system_info(logical_processors_available), OldAff} of
 	      {Avail, _} when Avail == unknown; OldAff == unknown ->
 		  %% Nothing much to test; just a smoke test
 		  case erlang:system_info(update_cpu_info) of
-		      unchanged -> ?line ok;
-		      changed -> ?line ok
+		      unchanged -> ok;
+		      changed -> ok
 		  end;
 	      _ ->
 		  try
-		      ?line adjust_schedulers_online(),
+		      adjust_schedulers_online(),
 		      case erlang:system_info(schedulers_online) of
 			  1 ->
 			      %% Nothing much to test; just a smoke test
-			      ?line ok;
+			      ok;
 			  Onln0 ->
 			      %% unset least significant bit
-			      ?line Aff = (OldAff band (OldAff - 1)),
-			      ?line set_affinity_mask(Aff),
-			      ?line Onln1 = Onln0 - 1,
-			      ?line case adjust_schedulers_online() of
+			      Aff = (OldAff band (OldAff - 1)),
+			      set_affinity_mask(Aff),
+			      Onln1 = Onln0 - 1,
+			      case adjust_schedulers_online() of
 					{Onln0, Onln1} ->
-					    ?line Onln1 = erlang:system_info(schedulers_online),
-					    ?line receive after 500 -> ok end,
-					    ?line ?t:format("TEST - Affinity mask: ~p - Schedulers online: ~p - Scheduler bindings: ~p~n",
+					    Onln1 = erlang:system_info(schedulers_online),
+					    receive after 500 -> ok end,
+					    io:format("TEST - Affinity mask: ~p - Schedulers online: ~p - Scheduler bindings: ~p~n",
 							    [Aff, Onln1, erlang:system_info(scheduler_bindings)]),
-					    ?line unchanged = adjust_schedulers_online(),
-					    ?line ok;
+					    unchanged = adjust_schedulers_online(),
+					    ok;
 					Fail ->
-					    ?line ?t:fail(Fail)
+					    ct:fail(Fail)
 				    end
 		      end
 		  after
@@ -836,7 +829,7 @@ update_cpu_info(Config) when is_list(Config) ->
 		      adjust_schedulers_online(),
 		      erlang:system_flag(schedulers_online, OldOnline),
 		      receive after 500 -> ok end,
-		      ?t:format("END - Affinity mask: ~p - Schedulers online: ~p - Scheduler bindings: ~p~n",
+		      io:format("END - Affinity mask: ~p - Schedulers online: ~p - Scheduler bindings: ~p~n",
 				[get_affinity_mask(),
 				 erlang:system_info(schedulers_online),
 				 erlang:system_info(scheduler_bindings)])
@@ -883,7 +876,7 @@ get_affinity_mask(_Port, _Status, Affinity) ->
     Affinity.
 
 get_affinity_mask() ->
-    case ?t:os_type() of
+    case os:type() of
 	{unix, linux} ->
 	    case catch open_port({spawn, "taskset -p " ++ os:getpid()},
 				 [exit_status]) of
@@ -927,21 +920,21 @@ set_affinity_mask(Mask) ->
     end.
 
 sct_cmd(Config) when is_list(Config) ->
-    ?line Topology = ?TOPOLOGY_A_TERM,
-    ?line OldRelFlags = clear_erl_rel_flags(),
+    Topology = ?TOPOLOGY_A_TERM,
+    OldRelFlags = clear_erl_rel_flags(),
     try
-	?line {ok, Node} = start_node(Config, ?TOPOLOGY_A_CMD),
-	?line cmp(Topology,
+	{ok, Node} = start_node(Config, ?TOPOLOGY_A_CMD),
+	cmp(Topology,
 		  rpc:call(Node, erlang, system_info, [cpu_topology])),
-	?line cmp(Topology,
+	cmp(Topology,
 		  rpc:call(Node, erlang, system_flag, [cpu_topology, Topology])),
-	?line cmp(Topology,
+	cmp(Topology,
 		  rpc:call(Node, erlang, system_info, [cpu_topology])),
-	?line stop_node(Node)
+	stop_node(Node)
     after
 	restore_erl_rel_flags(OldRelFlags)
     end,
-    ?line ok.
+    ok.
 
 -define(BIND_TYPES,
 	[{"u", unbound},
@@ -965,7 +958,7 @@ sbt_cmd(Config) when is_list(Config) ->
 	  end,
     case Bind of
 	notsup ->
-	    ?line {skipped, "Binding of schedulers not supported"};
+	    {skipped, "Binding of schedulers not supported"};
 	go_for_it ->
 	    CpuTCmd = case erlang:system_info({cpu_topology,detected}) of
 			  undefined ->
@@ -988,14 +981,14 @@ sbt_cmd(Config) when is_list(Config) ->
 		      end,
 	    case CpuTCmd of
 		false ->
-		    ?line {skipped, "Don't know how to create cpu topology"};
+		    {skipped, "Don't know how to create cpu topology"};
 		_ ->
 		    case erlang:system_info(logical_processors) of
 			LP when is_integer(LP) ->
 			    OldRelFlags = clear_erl_rel_flags(),
 			    try
 				lists:foreach(fun ({ClBt, Bt}) ->
-						      ?line sbt_test(Config,
+						      sbt_test(Config,
 								     CpuTCmd,
 								     ClBt,
 								     Bt,
@@ -1005,44 +998,44 @@ sbt_cmd(Config) when is_list(Config) ->
 			    after
 				restore_erl_rel_flags(OldRelFlags)
 			    end,
-			    ?line ok;
+			    ok;
 			_ ->
-			    ?line {skipped,
+			    {skipped,
 				   "Don't know the amount of logical processors"}
 		    end
 	    end
     end.
 
 sbt_test(Config, CpuTCmd, ClBt, Bt, LP) ->
-    ?line ?t:format("Testing +sbt ~s (~p)~n", [ClBt, Bt]),
-    ?line LPS = integer_to_list(LP),
-    ?line Cmd = CpuTCmd++" +sbt "++ClBt++" +S"++LPS++":"++LPS,
-    ?line {ok, Node} = start_node(Config, Cmd),
-    ?line Bt = rpc:call(Node,
+    io:format("Testing +sbt ~s (~p)~n", [ClBt, Bt]),
+    LPS = integer_to_list(LP),
+    Cmd = CpuTCmd++" +sbt "++ClBt++" +S"++LPS++":"++LPS,
+    {ok, Node} = start_node(Config, Cmd),
+    Bt = rpc:call(Node,
 			erlang,
 			system_info,
 			[scheduler_bind_type]),
-    ?line SB = rpc:call(Node,
+    SB = rpc:call(Node,
 			erlang,
 			system_info,
 			[scheduler_bindings]),
-    ?line ?t:format("scheduler bindings: ~p~n", [SB]),
-    ?line BS = case {Bt, erlang:system_info(logical_processors_available)} of
+    io:format("scheduler bindings: ~p~n", [SB]),
+    BS = case {Bt, erlang:system_info(logical_processors_available)} of
 		   {unbound, _} -> 0;
 		   {_, Int} when is_integer(Int) -> Int;
 		   {_, _} -> LP
 		end,
-    ?line lists:foldl(fun (S, 0) ->
-			      ?line unbound = S,
+    lists:foldl(fun (S, 0) ->
+			      unbound = S,
 			      0;
 			  (S, N) ->
-			      ?line true = is_integer(S),
+			      true = is_integer(S),
 			      N-1
 		      end,
 		      BS,
 		      tuple_to_list(SB)),
-    ?line stop_node(Node),
-    ?line ok.
+    stop_node(Node),
+    ok.
 
 scheduler_threads(Config) when is_list(Config) ->
     SmpSupport = erlang:system_info(smp_support),
@@ -1130,6 +1123,7 @@ dirty_schedulers_online_test(true) ->
     dirty_schedulers_online_smp_test(erlang:system_info(schedulers_online)).
 dirty_schedulers_online_smp_test(SchedOnln) when SchedOnln < 4 -> ok;
 dirty_schedulers_online_smp_test(SchedOnln) ->
+    receive after 500 -> ok end,
     DirtyCPUSchedOnln = erlang:system_info(dirty_cpu_schedulers_online),
     SchedOnln = DirtyCPUSchedOnln,
     HalfSchedOnln = SchedOnln div 2,
@@ -1138,9 +1132,11 @@ dirty_schedulers_online_smp_test(SchedOnln) ->
     HalfDirtyCPUSchedOnln = erlang:system_flag(schedulers_online, SchedOnln),
     DirtyCPUSchedOnln = erlang:system_flag(dirty_cpu_schedulers_online,
 					   HalfDirtyCPUSchedOnln),
+    receive after 500 -> ok end,
     HalfDirtyCPUSchedOnln = erlang:system_info(dirty_cpu_schedulers_online),
     QrtrDirtyCPUSchedOnln = HalfDirtyCPUSchedOnln div 2,
     SchedOnln = erlang:system_flag(schedulers_online, HalfSchedOnln),
+    receive after 500 -> ok end,
     QrtrDirtyCPUSchedOnln = erlang:system_info(dirty_cpu_schedulers_online),
     ok.
 
@@ -1166,49 +1162,208 @@ get_dsstate(Config, Cmd) ->
     stop_node(Node),
     {DSCPU, DSCPUOnln, DSIO}.
 
+dirty_scheduler_exit(Config) when is_list(Config) ->
+    try
+        erlang:system_info(dirty_cpu_schedulers),
+        dirty_scheduler_exit_test(Config)
+    catch
+        error:badarg ->
+            {skipped, "No dirty scheduler support"}
+    end.
+
+dirty_scheduler_exit_test(Config) ->
+    {ok, Node} = start_node(Config, "+SDio 1"),
+    [ok] = mcall(Node,
+                 [fun() ->
+                          Path = proplists:get_value(data_dir, Config),
+                          Lib = atom_to_list(?MODULE),
+                          ok = erlang:load_nif(filename:join(Path,Lib), []),
+                          ok = test_dirty_scheduler_exit()
+                  end]),
+    stop_node(Node),
+    ok.
+
+test_dirty_scheduler_exit() ->
+    process_flag(trap_exit,true),
+    test_dse(10,[]).
+test_dse(0,Pids) ->
+    timer:sleep(100),
+    kill_dse(Pids,[]);
+test_dse(N,Pids) ->
+    Pid = spawn_link(fun dirty_sleeper/0),
+    test_dse(N-1,[Pid|Pids]).
+kill_dse([],Killed) ->
+    wait_dse(Killed);
+kill_dse([Pid|Pids],AlreadyKilled) ->
+    exit(Pid,kill),
+    kill_dse(Pids,[Pid|AlreadyKilled]).
+wait_dse([]) ->
+    ok;
+wait_dse([Pid|Pids]) ->
+    receive
+        {'EXIT',Pid,killed} ->
+            ok
+    end,
+    wait_dse(Pids).
+
+dirty_sleeper() ->
+    erlang:nif_error({error,?MODULE}).
+
+scheduler_suspend_basic(Config) when is_list(Config) ->
+    case erlang:system_info(multi_scheduling) of
+	disabled ->
+	    {skip, "Nothing to test"};
+	_ ->
+	    Onln = erlang:system_info(schedulers_online),
+	    try
+		scheduler_suspend_basic_test()
+	    after
+		erlang:system_flag(schedulers_online, Onln)
+	    end
+    end.
+
+scheduler_suspend_basic_test() ->
+    %% The receives after setting scheduler states are there
+    %% since the operation is not fully synchronous. For example,
+    %% we do not wait for dirty cpu schedulers online to complete
+    %% before returning from erlang:system_flag(schedulers_online, _).
+
+    erlang:system_flag(schedulers_online,
+		       erlang:system_info(schedulers)),
+    try
+	erlang:system_flag(dirty_cpu_schedulers_online,
+			   erlang:system_info(dirty_cpu_schedulers)),
+	receive after 500 -> ok end
+    catch
+	_ : _ ->
+	    ok
+    end,
+
+    S0 = sched_state(),
+    io:format("~p~n", [S0]),
+    {{normal,NTot0,NOnln0,NAct0},
+     {dirty_cpu,DCTot0,DCOnln0,DCAct0},
+     {dirty_io,DITot0,DIOnln0,DIAct0}} = S0,
+    enabled = erlang:system_info(multi_scheduling),
+
+    DCOne = case DCTot0 of
+		0 -> 0;
+		_ -> 1
+	    end,
+
+    blocked_normal = erlang:system_flag(multi_scheduling, block_normal),
+    blocked_normal = erlang:system_info(multi_scheduling),
+    {{normal,NTot0,NOnln0,1},
+     {dirty_cpu,DCTot0,DCOnln0,DCAct0},
+     {dirty_io,DITot0,DIOnln0,DIAct0}} = sched_state(),
+
+    NOnln0 = erlang:system_flag(schedulers_online, 1),
+    receive after 500 -> ok end,
+    {{normal,NTot0,1,1},
+     {dirty_cpu,DCTot0,DCOne,DCOne},
+     {dirty_io,DITot0,DIOnln0,DIAct0}} = sched_state(),
+
+    1 = erlang:system_flag(schedulers_online, NOnln0),
+    receive after 500 -> ok end,
+    {{normal,NTot0,NOnln0,1},
+     {dirty_cpu,DCTot0,DCOnln0,DCAct0},
+     {dirty_io,DITot0,DIOnln0,DIAct0}} = sched_state(),
+
+    blocked = erlang:system_flag(multi_scheduling, block),
+    blocked = erlang:system_info(multi_scheduling),
+    receive after 500 -> ok end,
+    {{normal,NTot0,NOnln0,1},
+     {dirty_cpu,DCTot0,DCOnln0,0},
+     {dirty_io,DITot0,DIOnln0,0}} = sched_state(),
+
+    NOnln0 = erlang:system_flag(schedulers_online, 1),
+    receive after 500 -> ok end,
+    {{normal,NTot0,1,1},
+     {dirty_cpu,DCTot0,DCOne,0},
+     {dirty_io,DITot0,DIOnln0,0}} = sched_state(),
+
+    1 = erlang:system_flag(schedulers_online, NOnln0),
+    receive after 500 -> ok end,
+    {{normal,NTot0,NOnln0,1},
+     {dirty_cpu,DCTot0,DCOnln0,0},
+     {dirty_io,DITot0,DIOnln0,0}} = sched_state(),
+
+    blocked = erlang:system_flag(multi_scheduling, unblock_normal),
+    blocked = erlang:system_info(multi_scheduling),
+    {{normal,NTot0,NOnln0,1},
+     {dirty_cpu,DCTot0,DCOnln0,0},
+     {dirty_io,DITot0,DIOnln0,0}} = sched_state(),
+
+    enabled = erlang:system_flag(multi_scheduling, unblock),
+    enabled = erlang:system_info(multi_scheduling),
+    receive after 500 -> ok end,
+    {{normal,NTot0,NOnln0,NAct0},
+     {dirty_cpu,DCTot0,DCOnln0,DCAct0},
+     {dirty_io,DITot0,DIOnln0,DIAct0}} = sched_state(),
+
+    NOnln0 = erlang:system_flag(schedulers_online, 1),
+    receive after 500 -> ok end,
+    {{normal,NTot0,1,1},
+     {dirty_cpu,DCTot0,DCOne,DCOne},
+     {dirty_io,DITot0,DIOnln0,DIAct0}} = sched_state(),
+
+    1 = erlang:system_flag(schedulers_online, NOnln0),
+    receive after 500 -> ok end,
+    {{normal,NTot0,NOnln0,NAct0},
+     {dirty_cpu,DCTot0,DCOnln0,DCAct0},
+     {dirty_io,DITot0,DIOnln0,DIAct0}} = sched_state(),
+
+    ok.
+    
+
 scheduler_suspend(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:minutes(5)),
-    ?line lists:foreach(fun (S) -> scheduler_suspend_test(Config, S) end,
+    ct:timetrap({minutes, 5}),
+    lists:foreach(fun (S) -> scheduler_suspend_test(Config, S) end,
 			[64, 32, 16, default]),
-    ?line ?t:timetrap_cancel(Dog),
-    ?line ok.
+    ok.
 scheduler_suspend_test(Config, Schedulers) ->
-    ?line Cmd = case Schedulers of
+    Cmd = case Schedulers of
 		    default ->
 			"";
 		    _ ->
 			S = integer_to_list(Schedulers),
 			"+S"++S++":"++S
 		end,
-    ?line {ok, Node} = start_node(Config, Cmd),
-    ?line [SState] = mcall(Node, [fun () ->
-					  erlang:system_info(schedulers_state)
-				  end]),
-    ?line ?t:format("SState=~p~n", [SState]),
-    ?line {Sched, SchedOnln, _SchedAvail} = SState,
-    ?line true = is_integer(Sched),
-    ?line [ok] = mcall(Node, [fun () -> sst0_loop(300) end]),
-    ?line [ok] = mcall(Node, [fun () -> sst1_loop(300) end]),
-    ?line [ok] = mcall(Node, [fun () -> sst2_loop(300) end]),
-    ?line [ok, ok, ok, ok, ok] = mcall(Node,
-				       [fun () -> sst0_loop(200) end,
-					fun () -> sst1_loop(200) end,
-					fun () -> sst2_loop(200) end,
-					fun () -> sst2_loop(200) end,
-					fun () -> sst3_loop(Sched, 200) end]),
-    ?line [SState] = mcall(Node, [fun () ->
-					  case Sched == SchedOnln of
-					      false ->
-						  Sched = erlang:system_flag(
-							    schedulers_online,
-							    SchedOnln);
-					      true ->
-						  ok
-					  end,
-					  erlang:system_info(schedulers_state)
-				  end]),
-    ?line stop_node(Node),
-    ?line ok.
+    {ok, Node} = start_node(Config, Cmd),
+    [SState] = mcall(Node, [fun () ->
+                                    erlang:system_info(schedulers_state)
+                            end]),
+
+    io:format("SState=~p~n", [SState]),
+    {Sched, SchedOnln, _SchedAvail} = SState,
+    true = is_integer(Sched),
+    [ok] = mcall(Node, [fun () -> sst0_loop(300) end]),
+    [ok] = mcall(Node, [fun () -> sst1_loop(300) end]),
+    [ok] = mcall(Node, [fun () -> sst2_loop(300) end]),
+    [ok] = mcall(Node, [fun () -> sst4_loop(300) end]),
+    [ok] = mcall(Node, [fun () -> sst5_loop(300) end]),
+    [ok, ok, ok, ok,
+     ok, ok, ok] = mcall(Node,
+                         [fun () -> sst0_loop(200) end,
+                          fun () -> sst1_loop(200) end,
+                          fun () -> sst2_loop(200) end,
+                          fun () -> sst2_loop(200) end,
+                          fun () -> sst3_loop(Sched, 200) end,
+                          fun () -> sst4_loop(200) end,
+                          fun () -> sst5_loop(200) end]),
+    [SState] = mcall(Node, [fun () ->
+                                    case Sched == SchedOnln of
+                                        false ->
+                                            Sched = erlang:system_flag(
+                                                      schedulers_online,
+                                                      SchedOnln);
+                                        true ->
+                                            ok
+                                    end,
+                                    erlang:system_info(schedulers_state)
+                            end]),
+    stop_node(Node),
+    ok.
     
 
 sst0_loop(0) ->
@@ -1272,270 +1427,283 @@ sst3_loop_with_dirty_schedulers(S, DS, N) ->
     erlang:system_flag(dirty_cpu_schedulers_online, DS),
     sst3_loop_with_dirty_schedulers(S, DS, N-1).
 
+sst4_loop(0) ->
+    ok;
+sst4_loop(N) ->
+    erlang:system_flag(multi_scheduling, block_normal),
+    erlang:system_flag(multi_scheduling, unblock_normal),
+    sst4_loop(N-1).
+
+sst5_loop(0) ->
+    ok;
+sst5_loop(N) ->
+    erlang:system_flag(multi_scheduling, block_normal),
+    erlang:system_flag(multi_scheduling, unblock_normal),
+    sst5_loop(N-1).
+
 reader_groups(Config) when is_list(Config) ->
     %% White box testing. These results are correct, but other results
     %% could be too...
 
     %% The actual tilepro64 topology
     CPUT0 = [{processor,[{node,[{core,{logical,0}},
-				{core,{logical,1}},
-				{core,{logical,2}},
-				{core,{logical,8}},
-				{core,{logical,9}},
-				{core,{logical,10}},
-				{core,{logical,11}},
-				{core,{logical,16}},
-				{core,{logical,17}},
-				{core,{logical,18}},
-				{core,{logical,19}},
-				{core,{logical,24}},
-				{core,{logical,25}},
-				{core,{logical,27}},
-				{core,{logical,29}}]},
-			 {node,[{core,{logical,3}},
-				{core,{logical,4}},
-				{core,{logical,5}},
-				{core,{logical,6}},
-				{core,{logical,7}},
-				{core,{logical,12}},
-				{core,{logical,13}},
-				{core,{logical,14}},
-				{core,{logical,15}},
-				{core,{logical,20}},
-				{core,{logical,21}},
-				{core,{logical,22}},
-				{core,{logical,23}},
-				{core,{logical,28}},
-				{core,{logical,30}}]},
-			 {node,[{core,{logical,31}},
-				{core,{logical,36}},
-				{core,{logical,37}},
-				{core,{logical,38}},
-				{core,{logical,44}},
-				{core,{logical,45}},
-				{core,{logical,46}},
-				{core,{logical,47}},
-				{core,{logical,51}},
-				{core,{logical,52}},
-				{core,{logical,53}},
-				{core,{logical,54}},
-				{core,{logical,55}},
-				{core,{logical,60}},
-				{core,{logical,61}}]},
-			 {node,[{core,{logical,26}},
-				{core,{logical,32}},
-				{core,{logical,33}},
-				{core,{logical,34}},
-				{core,{logical,35}},
-				{core,{logical,39}},
-				{core,{logical,40}},
-				{core,{logical,41}},
-				{core,{logical,42}},
-				{core,{logical,43}},
-				{core,{logical,48}},
-				{core,{logical,49}},
-				{core,{logical,50}},
-				{core,{logical,58}}]}]}],
-
-    ?line [{0,1},{1,1},{2,1},{3,3},{4,3},{5,3},{6,3},{7,3},{8,1},{9,1},{10,1},
-	   {11,1},{12,3},{13,3},{14,4},{15,4},{16,2},{17,2},{18,2},{19,2},
-	   {20,4},{21,4},{22,4},{23,4},{24,2},{25,2},{26,7},{27,2},{28,4},
-	   {29,2},{30,4},{31,5},{32,7},{33,7},{34,7},{35,7},{36,5},{37,5},
-	   {38,5},{39,7},{40,7},{41,8},{42,8},{43,8},{44,5},{45,5},{46,5},
-	   {47,6},{48,8},{49,8},{50,8},{51,6},{52,6},{53,6},{54,6},{55,6},
-	   {58,8},{60,6},{61,6}]
-	= reader_groups_map(CPUT0, 8),
+                                {core,{logical,1}},
+                                {core,{logical,2}},
+                                {core,{logical,8}},
+                                {core,{logical,9}},
+                                {core,{logical,10}},
+                                {core,{logical,11}},
+                                {core,{logical,16}},
+                                {core,{logical,17}},
+                                {core,{logical,18}},
+                                {core,{logical,19}},
+                                {core,{logical,24}},
+                                {core,{logical,25}},
+                                {core,{logical,27}},
+                                {core,{logical,29}}]},
+                         {node,[{core,{logical,3}},
+                                {core,{logical,4}},
+                                {core,{logical,5}},
+                                {core,{logical,6}},
+                                {core,{logical,7}},
+                                {core,{logical,12}},
+                                {core,{logical,13}},
+                                {core,{logical,14}},
+                                {core,{logical,15}},
+                                {core,{logical,20}},
+                                {core,{logical,21}},
+                                {core,{logical,22}},
+                                {core,{logical,23}},
+                                {core,{logical,28}},
+                                {core,{logical,30}}]},
+                         {node,[{core,{logical,31}},
+                                {core,{logical,36}},
+                                {core,{logical,37}},
+                                {core,{logical,38}},
+                                {core,{logical,44}},
+                                {core,{logical,45}},
+                                {core,{logical,46}},
+                                {core,{logical,47}},
+                                {core,{logical,51}},
+                                {core,{logical,52}},
+                                {core,{logical,53}},
+                                {core,{logical,54}},
+                                {core,{logical,55}},
+                                {core,{logical,60}},
+                                {core,{logical,61}}]},
+                         {node,[{core,{logical,26}},
+                                {core,{logical,32}},
+                                {core,{logical,33}},
+                                {core,{logical,34}},
+                                {core,{logical,35}},
+                                {core,{logical,39}},
+                                {core,{logical,40}},
+                                {core,{logical,41}},
+                                {core,{logical,42}},
+                                {core,{logical,43}},
+                                {core,{logical,48}},
+                                {core,{logical,49}},
+                                {core,{logical,50}},
+                                {core,{logical,58}}]}]}],
+
+    [{0,1},{1,1},{2,1},{3,3},{4,3},{5,3},{6,3},{7,3},{8,1},{9,1},{10,1},
+     {11,1},{12,3},{13,3},{14,4},{15,4},{16,2},{17,2},{18,2},{19,2},
+     {20,4},{21,4},{22,4},{23,4},{24,2},{25,2},{26,7},{27,2},{28,4},
+     {29,2},{30,4},{31,5},{32,7},{33,7},{34,7},{35,7},{36,5},{37,5},
+     {38,5},{39,7},{40,7},{41,8},{42,8},{43,8},{44,5},{45,5},{46,5},
+     {47,6},{48,8},{49,8},{50,8},{51,6},{52,6},{53,6},{54,6},{55,6},
+     {58,8},{60,6},{61,6}]
+    = reader_groups_map(CPUT0, 8),
 
     CPUT1 = [n([p([c([t(l(0)),t(l(1)),t(l(2)),t(l(3))]),
-		   c([t(l(4)),t(l(5)),t(l(6)),t(l(7))]),
-		   c([t(l(8)),t(l(9)),t(l(10)),t(l(11))]),
-		   c([t(l(12)),t(l(13)),t(l(14)),t(l(15))])]),
-		p([c([t(l(16)),t(l(17)),t(l(18)),t(l(19))]),
-		   c([t(l(20)),t(l(21)),t(l(22)),t(l(23))]),
-		   c([t(l(24)),t(l(25)),t(l(26)),t(l(27))]),
-		   c([t(l(28)),t(l(29)),t(l(30)),t(l(31))])])]),
-	     n([p([c([t(l(32)),t(l(33)),t(l(34)),t(l(35))]),
-		   c([t(l(36)),t(l(37)),t(l(38)),t(l(39))]),
-		   c([t(l(40)),t(l(41)),t(l(42)),t(l(43))]),
-		   c([t(l(44)),t(l(45)),t(l(46)),t(l(47))])]),
-		p([c([t(l(48)),t(l(49)),t(l(50)),t(l(51))]),
-		   c([t(l(52)),t(l(53)),t(l(54)),t(l(55))]),
-		   c([t(l(56)),t(l(57)),t(l(58)),t(l(59))]),
-		   c([t(l(60)),t(l(61)),t(l(62)),t(l(63))])])]),
-	     n([p([c([t(l(64)),t(l(65)),t(l(66)),t(l(67))]),
-		   c([t(l(68)),t(l(69)),t(l(70)),t(l(71))]),
-		   c([t(l(72)),t(l(73)),t(l(74)),t(l(75))]),
-		   c([t(l(76)),t(l(77)),t(l(78)),t(l(79))])]),
-		p([c([t(l(80)),t(l(81)),t(l(82)),t(l(83))]),
-		   c([t(l(84)),t(l(85)),t(l(86)),t(l(87))]),
-		   c([t(l(88)),t(l(89)),t(l(90)),t(l(91))]),
-		   c([t(l(92)),t(l(93)),t(l(94)),t(l(95))])])]),
-	     n([p([c([t(l(96)),t(l(97)),t(l(98)),t(l(99))]),
-		   c([t(l(100)),t(l(101)),t(l(102)),t(l(103))]),
-		   c([t(l(104)),t(l(105)),t(l(106)),t(l(107))]),
-		   c([t(l(108)),t(l(109)),t(l(110)),t(l(111))])]),
-		p([c([t(l(112)),t(l(113)),t(l(114)),t(l(115))]),
-		   c([t(l(116)),t(l(117)),t(l(118)),t(l(119))]),
-		   c([t(l(120)),t(l(121)),t(l(122)),t(l(123))]),
-		   c([t(l(124)),t(l(125)),t(l(126)),t(l(127))])])])],
-
-    ?line [{0,1},{1,1},{2,1},{3,1},{4,2},{5,2},{6,2},{7,2},{8,3},{9,3},
-	   {10,3},{11,3},{12,4},{13,4},{14,4},{15,4},{16,5},{17,5},{18,5},
-	   {19,5},{20,6},{21,6},{22,6},{23,6},{24,7},{25,7},{26,7},{27,7},
-	   {28,8},{29,8},{30,8},{31,8},{32,9},{33,9},{34,9},{35,9},{36,10},
-	   {37,10},{38,10},{39,10},{40,11},{41,11},{42,11},{43,11},{44,12},
-	   {45,12},{46,12},{47,12},{48,13},{49,13},{50,13},{51,13},{52,14},
-	   {53,14},{54,14},{55,14},{56,15},{57,15},{58,15},{59,15},{60,16},
-	   {61,16},{62,16},{63,16},{64,17},{65,17},{66,17},{67,17},{68,18},
-	   {69,18},{70,18},{71,18},{72,19},{73,19},{74,19},{75,19},{76,20},
-	   {77,20},{78,20},{79,20},{80,21},{81,21},{82,21},{83,21},{84,22},
-	   {85,22},{86,22},{87,22},{88,23},{89,23},{90,23},{91,23},{92,24},
-	   {93,24},{94,24},{95,24},{96,25},{97,25},{98,25},{99,25},{100,26},
-	   {101,26},{102,26},{103,26},{104,27},{105,27},{106,27},{107,27},
-	   {108,28},{109,28},{110,28},{111,28},{112,29},{113,29},{114,29},
-	   {115,29},{116,30},{117,30},{118,30},{119,30},{120,31},{121,31},
-	   {122,31},{123,31},{124,32},{125,32},{126,32},{127,32}]
-	= reader_groups_map(CPUT1, 128),
-
-    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{9,1},{10,1},
-	   {11,1},{12,1},{13,1},{14,1},{15,1},{16,1},{17,1},{18,1},{19,1},
-	   {20,1},{21,1},{22,1},{23,1},{24,1},{25,1},{26,1},{27,1},{28,1},
-	   {29,1},{30,1},{31,1},{32,1},{33,1},{34,1},{35,1},{36,1},{37,1},
-	   {38,1},{39,1},{40,1},{41,1},{42,1},{43,1},{44,1},{45,1},{46,1},
-	   {47,1},{48,1},{49,1},{50,1},{51,1},{52,1},{53,1},{54,1},{55,1},
-	   {56,1},{57,1},{58,1},{59,1},{60,1},{61,1},{62,1},{63,1},{64,2},
-	   {65,2},{66,2},{67,2},{68,2},{69,2},{70,2},{71,2},{72,2},{73,2},
-	   {74,2},{75,2},{76,2},{77,2},{78,2},{79,2},{80,2},{81,2},{82,2},
-	   {83,2},{84,2},{85,2},{86,2},{87,2},{88,2},{89,2},{90,2},{91,2},
-	   {92,2},{93,2},{94,2},{95,2},{96,2},{97,2},{98,2},{99,2},{100,2},
-	   {101,2},{102,2},{103,2},{104,2},{105,2},{106,2},{107,2},{108,2},
-	   {109,2},{110,2},{111,2},{112,2},{113,2},{114,2},{115,2},{116,2},
-	   {117,2},{118,2},{119,2},{120,2},{121,2},{122,2},{123,2},{124,2},
-	   {125,2},{126,2},{127,2}]
-	= reader_groups_map(CPUT1, 2),
-
-    ?line [{0,1},{1,1},{2,1},{3,1},{4,2},{5,2},{6,2},{7,2},{8,3},{9,3},{10,3},
-	   {11,3},{12,3},{13,3},{14,3},{15,3},{16,4},{17,4},{18,4},{19,4},
-	   {20,4},{21,4},{22,4},{23,4},{24,5},{25,5},{26,5},{27,5},{28,5},
-	   {29,5},{30,5},{31,5},{32,6},{33,6},{34,6},{35,6},{36,6},{37,6},
-	   {38,6},{39,6},{40,7},{41,7},{42,7},{43,7},{44,7},{45,7},{46,7},
-	   {47,7},{48,8},{49,8},{50,8},{51,8},{52,8},{53,8},{54,8},{55,8},
-	   {56,9},{57,9},{58,9},{59,9},{60,9},{61,9},{62,9},{63,9},{64,10},
-	   {65,10},{66,10},{67,10},{68,10},{69,10},{70,10},{71,10},{72,11},
-	   {73,11},{74,11},{75,11},{76,11},{77,11},{78,11},{79,11},{80,12},
-	   {81,12},{82,12},{83,12},{84,12},{85,12},{86,12},{87,12},{88,13},
-	   {89,13},{90,13},{91,13},{92,13},{93,13},{94,13},{95,13},{96,14},
-	   {97,14},{98,14},{99,14},{100,14},{101,14},{102,14},{103,14},
-	   {104,15},{105,15},{106,15},{107,15},{108,15},{109,15},{110,15},
-	   {111,15},{112,16},{113,16},{114,16},{115,16},{116,16},{117,16},
-	   {118,16},{119,16},{120,17},{121,17},{122,17},{123,17},{124,17},
-	   {125,17},{126,17},{127,17}]
-	= reader_groups_map(CPUT1, 17),
-
-    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{9,1},{10,1},
-	   {11,1},{12,1},{13,1},{14,1},{15,1},{16,2},{17,2},{18,2},{19,2},
-	   {20,2},{21,2},{22,2},{23,2},{24,2},{25,2},{26,2},{27,2},{28,2},
-	   {29,2},{30,2},{31,2},{32,3},{33,3},{34,3},{35,3},{36,3},{37,3},
-	   {38,3},{39,3},{40,3},{41,3},{42,3},{43,3},{44,3},{45,3},{46,3},
-	   {47,3},{48,4},{49,4},{50,4},{51,4},{52,4},{53,4},{54,4},{55,4},
-	   {56,4},{57,4},{58,4},{59,4},{60,4},{61,4},{62,4},{63,4},{64,5},
-	   {65,5},{66,5},{67,5},{68,5},{69,5},{70,5},{71,5},{72,5},{73,5},
-	   {74,5},{75,5},{76,5},{77,5},{78,5},{79,5},{80,6},{81,6},{82,6},
-	   {83,6},{84,6},{85,6},{86,6},{87,6},{88,6},{89,6},{90,6},{91,6},
-	   {92,6},{93,6},{94,6},{95,6},{96,7},{97,7},{98,7},{99,7},{100,7},
-	   {101,7},{102,7},{103,7},{104,7},{105,7},{106,7},{107,7},{108,7},
-	   {109,7},{110,7},{111,7},{112,7},{113,7},{114,7},{115,7},{116,7},
-	   {117,7},{118,7},{119,7},{120,7},{121,7},{122,7},{123,7},{124,7},
-	   {125,7},{126,7},{127,7}]
-	= reader_groups_map(CPUT1, 7),
-
-    ?line CPUT2 = [p([c(l(0)),c(l(1)),c(l(2)),c(l(3)),c(l(4))]),
-		   p([t(l(5)),t(l(6)),t(l(7)),t(l(8)),t(l(9))]),
-		   p([t(l(10))]),
-		   p([c(l(11)),c(l(12)),c(l(13))]),
-		   p([c(l(14)),c(l(15))])],
-
-    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},
-	   {5,2},{6,2},{7,2},{8,2},{9,2},
-	   {10,3},
-	   {11,4},{12,4},{13,4},
-	   {14,5},{15,5}] = reader_groups_map(CPUT2, 5),
-
-
-    ?line [{0,1},{1,1},{2,2},{3,2},{4,2},
-	   {5,3},{6,3},{7,3},{8,3},{9,3},
-	   {10,4},
-	   {11,5},{12,5},{13,5},
-	   {14,6},{15,6}] = reader_groups_map(CPUT2, 6),
-
-    ?line [{0,1},{1,1},{2,2},{3,2},{4,2},
-	   {5,3},{6,3},{7,3},{8,3},{9,3},
-	   {10,4},
-	   {11,5},{12,6},{13,6},
-	   {14,7},{15,7}] = reader_groups_map(CPUT2, 7),
-
-    ?line [{0,1},{1,1},{2,2},{3,2},{4,2},
-	   {5,3},{6,3},{7,3},{8,3},{9,3},
-	   {10,4},
-	   {11,5},{12,6},{13,6},
-	   {14,7},{15,8}] = reader_groups_map(CPUT2, 8),
-
-    ?line [{0,1},{1,2},{2,2},{3,3},{4,3},
-	   {5,4},{6,4},{7,4},{8,4},{9,4},
-	   {10,5},
-	   {11,6},{12,7},{13,7},
-	   {14,8},{15,9}] = reader_groups_map(CPUT2, 9),
-
-    ?line [{0,1},{1,2},{2,2},{3,3},{4,3},
-	   {5,4},{6,4},{7,4},{8,4},{9,4},
-	   {10,5},
-	   {11,6},{12,7},{13,8},
-	   {14,9},{15,10}] = reader_groups_map(CPUT2, 10),
-
-    ?line [{0,1},{1,2},{2,3},{3,4},{4,4},
-	   {5,5},{6,5},{7,5},{8,5},{9,5},
-	   {10,6},
-	   {11,7},{12,8},{13,9},
-	   {14,10},{15,11}] = reader_groups_map(CPUT2, 11),
-
-    ?line [{0,1},{1,2},{2,3},{3,4},{4,5},
-	   {5,6},{6,6},{7,6},{8,6},{9,6},
-	   {10,7},
-	   {11,8},{12,9},{13,10},
-	   {14,11},{15,12}] = reader_groups_map(CPUT2, 100),
+                   c([t(l(4)),t(l(5)),t(l(6)),t(l(7))]),
+                   c([t(l(8)),t(l(9)),t(l(10)),t(l(11))]),
+                   c([t(l(12)),t(l(13)),t(l(14)),t(l(15))])]),
+                p([c([t(l(16)),t(l(17)),t(l(18)),t(l(19))]),
+                   c([t(l(20)),t(l(21)),t(l(22)),t(l(23))]),
+                   c([t(l(24)),t(l(25)),t(l(26)),t(l(27))]),
+                   c([t(l(28)),t(l(29)),t(l(30)),t(l(31))])])]),
+             n([p([c([t(l(32)),t(l(33)),t(l(34)),t(l(35))]),
+                   c([t(l(36)),t(l(37)),t(l(38)),t(l(39))]),
+                   c([t(l(40)),t(l(41)),t(l(42)),t(l(43))]),
+                   c([t(l(44)),t(l(45)),t(l(46)),t(l(47))])]),
+                p([c([t(l(48)),t(l(49)),t(l(50)),t(l(51))]),
+                   c([t(l(52)),t(l(53)),t(l(54)),t(l(55))]),
+                   c([t(l(56)),t(l(57)),t(l(58)),t(l(59))]),
+                   c([t(l(60)),t(l(61)),t(l(62)),t(l(63))])])]),
+             n([p([c([t(l(64)),t(l(65)),t(l(66)),t(l(67))]),
+                   c([t(l(68)),t(l(69)),t(l(70)),t(l(71))]),
+                   c([t(l(72)),t(l(73)),t(l(74)),t(l(75))]),
+                   c([t(l(76)),t(l(77)),t(l(78)),t(l(79))])]),
+                p([c([t(l(80)),t(l(81)),t(l(82)),t(l(83))]),
+                   c([t(l(84)),t(l(85)),t(l(86)),t(l(87))]),
+                   c([t(l(88)),t(l(89)),t(l(90)),t(l(91))]),
+                   c([t(l(92)),t(l(93)),t(l(94)),t(l(95))])])]),
+             n([p([c([t(l(96)),t(l(97)),t(l(98)),t(l(99))]),
+                   c([t(l(100)),t(l(101)),t(l(102)),t(l(103))]),
+                   c([t(l(104)),t(l(105)),t(l(106)),t(l(107))]),
+                   c([t(l(108)),t(l(109)),t(l(110)),t(l(111))])]),
+                p([c([t(l(112)),t(l(113)),t(l(114)),t(l(115))]),
+                   c([t(l(116)),t(l(117)),t(l(118)),t(l(119))]),
+                   c([t(l(120)),t(l(121)),t(l(122)),t(l(123))]),
+                   c([t(l(124)),t(l(125)),t(l(126)),t(l(127))])])])],
+
+    [{0,1},{1,1},{2,1},{3,1},{4,2},{5,2},{6,2},{7,2},{8,3},{9,3},
+     {10,3},{11,3},{12,4},{13,4},{14,4},{15,4},{16,5},{17,5},{18,5},
+     {19,5},{20,6},{21,6},{22,6},{23,6},{24,7},{25,7},{26,7},{27,7},
+     {28,8},{29,8},{30,8},{31,8},{32,9},{33,9},{34,9},{35,9},{36,10},
+     {37,10},{38,10},{39,10},{40,11},{41,11},{42,11},{43,11},{44,12},
+     {45,12},{46,12},{47,12},{48,13},{49,13},{50,13},{51,13},{52,14},
+     {53,14},{54,14},{55,14},{56,15},{57,15},{58,15},{59,15},{60,16},
+     {61,16},{62,16},{63,16},{64,17},{65,17},{66,17},{67,17},{68,18},
+     {69,18},{70,18},{71,18},{72,19},{73,19},{74,19},{75,19},{76,20},
+     {77,20},{78,20},{79,20},{80,21},{81,21},{82,21},{83,21},{84,22},
+     {85,22},{86,22},{87,22},{88,23},{89,23},{90,23},{91,23},{92,24},
+     {93,24},{94,24},{95,24},{96,25},{97,25},{98,25},{99,25},{100,26},
+     {101,26},{102,26},{103,26},{104,27},{105,27},{106,27},{107,27},
+     {108,28},{109,28},{110,28},{111,28},{112,29},{113,29},{114,29},
+     {115,29},{116,30},{117,30},{118,30},{119,30},{120,31},{121,31},
+     {122,31},{123,31},{124,32},{125,32},{126,32},{127,32}]
+    = reader_groups_map(CPUT1, 128),
+
+    [{0,1},{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{9,1},{10,1},
+     {11,1},{12,1},{13,1},{14,1},{15,1},{16,1},{17,1},{18,1},{19,1},
+     {20,1},{21,1},{22,1},{23,1},{24,1},{25,1},{26,1},{27,1},{28,1},
+     {29,1},{30,1},{31,1},{32,1},{33,1},{34,1},{35,1},{36,1},{37,1},
+     {38,1},{39,1},{40,1},{41,1},{42,1},{43,1},{44,1},{45,1},{46,1},
+     {47,1},{48,1},{49,1},{50,1},{51,1},{52,1},{53,1},{54,1},{55,1},
+     {56,1},{57,1},{58,1},{59,1},{60,1},{61,1},{62,1},{63,1},{64,2},
+     {65,2},{66,2},{67,2},{68,2},{69,2},{70,2},{71,2},{72,2},{73,2},
+     {74,2},{75,2},{76,2},{77,2},{78,2},{79,2},{80,2},{81,2},{82,2},
+     {83,2},{84,2},{85,2},{86,2},{87,2},{88,2},{89,2},{90,2},{91,2},
+     {92,2},{93,2},{94,2},{95,2},{96,2},{97,2},{98,2},{99,2},{100,2},
+     {101,2},{102,2},{103,2},{104,2},{105,2},{106,2},{107,2},{108,2},
+     {109,2},{110,2},{111,2},{112,2},{113,2},{114,2},{115,2},{116,2},
+     {117,2},{118,2},{119,2},{120,2},{121,2},{122,2},{123,2},{124,2},
+     {125,2},{126,2},{127,2}]
+    = reader_groups_map(CPUT1, 2),
+
+    [{0,1},{1,1},{2,1},{3,1},{4,2},{5,2},{6,2},{7,2},{8,3},{9,3},{10,3},
+     {11,3},{12,3},{13,3},{14,3},{15,3},{16,4},{17,4},{18,4},{19,4},
+     {20,4},{21,4},{22,4},{23,4},{24,5},{25,5},{26,5},{27,5},{28,5},
+     {29,5},{30,5},{31,5},{32,6},{33,6},{34,6},{35,6},{36,6},{37,6},
+     {38,6},{39,6},{40,7},{41,7},{42,7},{43,7},{44,7},{45,7},{46,7},
+     {47,7},{48,8},{49,8},{50,8},{51,8},{52,8},{53,8},{54,8},{55,8},
+     {56,9},{57,9},{58,9},{59,9},{60,9},{61,9},{62,9},{63,9},{64,10},
+     {65,10},{66,10},{67,10},{68,10},{69,10},{70,10},{71,10},{72,11},
+     {73,11},{74,11},{75,11},{76,11},{77,11},{78,11},{79,11},{80,12},
+     {81,12},{82,12},{83,12},{84,12},{85,12},{86,12},{87,12},{88,13},
+     {89,13},{90,13},{91,13},{92,13},{93,13},{94,13},{95,13},{96,14},
+     {97,14},{98,14},{99,14},{100,14},{101,14},{102,14},{103,14},
+     {104,15},{105,15},{106,15},{107,15},{108,15},{109,15},{110,15},
+     {111,15},{112,16},{113,16},{114,16},{115,16},{116,16},{117,16},
+     {118,16},{119,16},{120,17},{121,17},{122,17},{123,17},{124,17},
+     {125,17},{126,17},{127,17}]
+    = reader_groups_map(CPUT1, 17),
+
+    [{0,1},{1,1},{2,1},{3,1},{4,1},{5,1},{6,1},{7,1},{8,1},{9,1},{10,1},
+     {11,1},{12,1},{13,1},{14,1},{15,1},{16,2},{17,2},{18,2},{19,2},
+     {20,2},{21,2},{22,2},{23,2},{24,2},{25,2},{26,2},{27,2},{28,2},
+     {29,2},{30,2},{31,2},{32,3},{33,3},{34,3},{35,3},{36,3},{37,3},
+     {38,3},{39,3},{40,3},{41,3},{42,3},{43,3},{44,3},{45,3},{46,3},
+     {47,3},{48,4},{49,4},{50,4},{51,4},{52,4},{53,4},{54,4},{55,4},
+     {56,4},{57,4},{58,4},{59,4},{60,4},{61,4},{62,4},{63,4},{64,5},
+     {65,5},{66,5},{67,5},{68,5},{69,5},{70,5},{71,5},{72,5},{73,5},
+     {74,5},{75,5},{76,5},{77,5},{78,5},{79,5},{80,6},{81,6},{82,6},
+     {83,6},{84,6},{85,6},{86,6},{87,6},{88,6},{89,6},{90,6},{91,6},
+     {92,6},{93,6},{94,6},{95,6},{96,7},{97,7},{98,7},{99,7},{100,7},
+     {101,7},{102,7},{103,7},{104,7},{105,7},{106,7},{107,7},{108,7},
+     {109,7},{110,7},{111,7},{112,7},{113,7},{114,7},{115,7},{116,7},
+     {117,7},{118,7},{119,7},{120,7},{121,7},{122,7},{123,7},{124,7},
+     {125,7},{126,7},{127,7}]
+    = reader_groups_map(CPUT1, 7),
+
+    CPUT2 = [p([c(l(0)),c(l(1)),c(l(2)),c(l(3)),c(l(4))]),
+             p([t(l(5)),t(l(6)),t(l(7)),t(l(8)),t(l(9))]),
+             p([t(l(10))]),
+             p([c(l(11)),c(l(12)),c(l(13))]),
+             p([c(l(14)),c(l(15))])],
+
+    [{0,1},{1,1},{2,1},{3,1},{4,1},
+     {5,2},{6,2},{7,2},{8,2},{9,2},
+     {10,3},
+     {11,4},{12,4},{13,4},
+     {14,5},{15,5}] = reader_groups_map(CPUT2, 5),
+
+
+    [{0,1},{1,1},{2,2},{3,2},{4,2},
+     {5,3},{6,3},{7,3},{8,3},{9,3},
+     {10,4},
+     {11,5},{12,5},{13,5},
+     {14,6},{15,6}] = reader_groups_map(CPUT2, 6),
+
+    [{0,1},{1,1},{2,2},{3,2},{4,2},
+     {5,3},{6,3},{7,3},{8,3},{9,3},
+     {10,4},
+     {11,5},{12,6},{13,6},
+     {14,7},{15,7}] = reader_groups_map(CPUT2, 7),
+
+    [{0,1},{1,1},{2,2},{3,2},{4,2},
+     {5,3},{6,3},{7,3},{8,3},{9,3},
+     {10,4},
+     {11,5},{12,6},{13,6},
+     {14,7},{15,8}] = reader_groups_map(CPUT2, 8),
+
+    [{0,1},{1,2},{2,2},{3,3},{4,3},
+     {5,4},{6,4},{7,4},{8,4},{9,4},
+     {10,5},
+     {11,6},{12,7},{13,7},
+     {14,8},{15,9}] = reader_groups_map(CPUT2, 9),
+
+    [{0,1},{1,2},{2,2},{3,3},{4,3},
+     {5,4},{6,4},{7,4},{8,4},{9,4},
+     {10,5},
+     {11,6},{12,7},{13,8},
+     {14,9},{15,10}] = reader_groups_map(CPUT2, 10),
+
+    [{0,1},{1,2},{2,3},{3,4},{4,4},
+     {5,5},{6,5},{7,5},{8,5},{9,5},
+     {10,6},
+     {11,7},{12,8},{13,9},
+     {14,10},{15,11}] = reader_groups_map(CPUT2, 11),
+
+    [{0,1},{1,2},{2,3},{3,4},{4,5},
+     {5,6},{6,6},{7,6},{8,6},{9,6},
+     {10,7},
+     {11,8},{12,9},{13,10},
+     {14,11},{15,12}] = reader_groups_map(CPUT2, 100),
 
     CPUT3 = [p([t(l(5)),t(l(6)),t(l(7)),t(l(8)),t(l(9))]),
-	     p([t(l(10))]),
-	     p([c(l(11)),c(l(12)),c(l(13))]),
-	     p([c(l(14)),c(l(15))]),
-	     p([c(l(0)),c(l(1)),c(l(2)),c(l(3)),c(l(4))])],
+             p([t(l(10))]),
+             p([c(l(11)),c(l(12)),c(l(13))]),
+             p([c(l(14)),c(l(15))]),
+             p([c(l(0)),c(l(1)),c(l(2)),c(l(3)),c(l(4))])],
 
-    ?line [{0,5},{1,5},{2,6},{3,6},{4,6},
-	   {5,1},{6,1},{7,1},{8,1},{9,1},
-	   {10,2},{11,3},{12,3},{13,3},
-	   {14,4},{15,4}] = reader_groups_map(CPUT3, 6),
+    [{0,5},{1,5},{2,6},{3,6},{4,6},
+     {5,1},{6,1},{7,1},{8,1},{9,1},
+     {10,2},{11,3},{12,3},{13,3},
+     {14,4},{15,4}] = reader_groups_map(CPUT3, 6),
 
     CPUT4 = [p([t(l(0)),t(l(1)),t(l(2)),t(l(3)),t(l(4))]),
-	     p([t(l(5))]),
-	     p([c(l(6)),c(l(7)),c(l(8))]),
-	     p([c(l(9)),c(l(10))]),
-	     p([c(l(11)),c(l(12)),c(l(13)),c(l(14)),c(l(15))])],
-
-    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},
-	   {5,2},
-	   {6,3},{7,3},{8,3},
-	   {9,4},{10,4},
-	   {11,5},{12,5},{13,6},{14,6},{15,6}] = reader_groups_map(CPUT4, 6),
-
-    ?line [{0,1},{1,1},{2,1},{3,1},{4,1},
-	   {5,2},
-	   {6,3},{7,4},{8,4},
-	   {9,5},{10,5},
-	   {11,6},{12,6},{13,7},{14,7},{15,7}] = reader_groups_map(CPUT4, 7),
-
-    ?line [{0,1},{65535,2}] = reader_groups_map([c(l(0)),c(l(65535))], 10),
-
-    ?line ok.
+             p([t(l(5))]),
+             p([c(l(6)),c(l(7)),c(l(8))]),
+             p([c(l(9)),c(l(10))]),
+             p([c(l(11)),c(l(12)),c(l(13)),c(l(14)),c(l(15))])],
+
+    [{0,1},{1,1},{2,1},{3,1},{4,1},
+     {5,2},
+     {6,3},{7,3},{8,3},
+     {9,4},{10,4},
+     {11,5},{12,5},{13,6},{14,6},{15,6}] = reader_groups_map(CPUT4, 6),
+
+    [{0,1},{1,1},{2,1},{3,1},{4,1},
+     {5,2},
+     {6,3},{7,4},{8,4},
+     {9,5},{10,5},
+     {11,6},{12,6},{13,7},{14,7},{15,7}] = reader_groups_map(CPUT4, 7),
+
+    [{0,1},{65535,2}] = reader_groups_map([c(l(0)),c(l(65535))], 10),
+    ok.
     
 
 reader_groups_map(CPUT, Groups) ->
@@ -1550,6 +1718,34 @@ reader_groups_map(CPUT, Groups) ->
 %% Utils
 %%
 
+sched_state() ->
+    sched_state(erlang:system_info(all_schedulers_state),
+		undefined,
+		{dirty_cpu,0,0,0},
+		{dirty_io,0,0,0}).
+
+	    
+sched_state([], N, DC, DI) ->
+    try
+	chk_basic(N),
+	chk_basic(DC),
+	chk_basic(DI),
+	{N, DC, DI}
+    catch
+	_ : _ ->
+	    ct:fail({inconsisten_scheduler_state, {N, DC, DI}})
+    end;
+sched_state([{normal, _, _, _} = S | Rest], _S, DC, DI) ->
+    sched_state(Rest, S, DC, DI);
+sched_state([{dirty_cpu, _, _, _} = DC | Rest], S, _DC, DI) ->
+    sched_state(Rest, S, DC, DI);
+sched_state([{dirty_io, _, _, _} = DI | Rest], S, DC, _DI) ->
+    sched_state(Rest, S, DC, DI).
+
+chk_basic({_Type, Tot, Onln, Act}) ->
+    true = Tot >= Onln,
+    true = Onln >= Act.
+
 l(Id) ->
     {logical, Id}.
 
@@ -1568,21 +1764,21 @@ n(X) ->
 mcall(Node, Funs) ->
     Parent = self(),
     Refs = lists:map(fun (Fun) ->
-			     Ref = make_ref(),
-			     spawn_link(Node,
-					fun () ->
-						Res = Fun(),
-						unlink(Parent),
-						Parent ! {Ref, Res}
-					end),
-			     Ref
-		     end, Funs),
+                             Ref = make_ref(),
+                             spawn_link(Node,
+                                        fun () ->
+                                                Res = Fun(),
+                                                unlink(Parent),
+                                                Parent ! {Ref, Res}
+                                        end),
+                             Ref
+                     end, Funs),
     lists:map(fun (Ref) ->
-		      receive
-			  {Ref, Res} ->
-			      Res
-		      end
-	      end, Refs).
+                      receive
+                          {Ref, Res} ->
+                              Res
+                      end
+              end, Refs).
 
 erl_rel_flag_var() ->
     "ERL_OTP"++erlang:system_info(otp_release)++"_FLAGS".
@@ -1606,101 +1802,101 @@ restore_erl_rel_flags(OldValue) ->
 ok(too_slow, _Config) ->
     {comment, "Too slow system to do any actual testing..."};
 ok(_Res, Config) ->
-    ?config(ok_res, Config).
+    proplists:get_value(ok_res, Config).
 
 chk_result(too_slow,
-	   _LWorkers,
-	   _NWorkers,
-	   _HWorkers,
-	   _MWorkers,
-	   _LNShouldWork,
-	   _HShouldWork,
-	   _MShouldWork) ->
-    ?line ok;
+           _LWorkers,
+           _NWorkers,
+           _HWorkers,
+           _MWorkers,
+           _LNShouldWork,
+           _HShouldWork,
+           _MShouldWork) ->
+    ok;
 chk_result([{low, L, Lmin, _Lmax},
-	    {normal, N, Nmin, _Nmax},
-	    {high, H, Hmin, _Hmax},
-	    {max, M, Mmin, _Mmax}] = Res,
-	   LWorkers,
-	   NWorkers,
-	   HWorkers,
-	   MWorkers,
-	   LNShouldWork,
-	   HShouldWork,
-	   MShouldWork) ->
-    ?line ?t:format("~p~n", [Res]),
-    ?line Relax = relax_limits(),
+            {normal, N, Nmin, _Nmax},
+            {high, H, Hmin, _Hmax},
+            {max, M, Mmin, _Mmax}] = Res,
+           LWorkers,
+           NWorkers,
+           HWorkers,
+           MWorkers,
+           LNShouldWork,
+           HShouldWork,
+           MShouldWork) ->
+    io:format("~p~n", [Res]),
+    Relax = relax_limits(),
     case {L, N} of
-	{0, 0} ->
-	    ?line false = LNShouldWork;
-	_ ->
-	    ?line {LminRatioLim,
-		   NminRatioLim,
-		   LNRatioLimMin,
-		   LNRatioLimMax} = case Relax of
-					false -> {0.5, 0.5, 0.05, 0.25};
-					true -> {0.05, 0.05, 0.01, 0.4}
-				    end,
-	    ?line Lavg = L/LWorkers,
-	    ?line Navg = N/NWorkers,
-	    ?line Ratio = Lavg/Navg,
-	    ?line LminRatio = Lmin/Lavg,
-	    ?line NminRatio = Nmin/Navg,
-	    ?line ?t:format("low min ratio=~p~n"
-			    "normal min ratio=~p~n"
-			    "low avg=~p~n"
-			    "normal avg=~p~n"
-			    "low/normal ratio=~p~n",
-			    [LminRatio, NminRatio, Lavg, Navg, Ratio]),
-	    erlang:display({low_min_ratio, LminRatio}),
-	    erlang:display({normal_min_ratio, NminRatio}),
-	    erlang:display({low_avg, Lavg}),
-	    erlang:display({normal_avg, Navg}),
-	    erlang:display({low_normal_ratio, Ratio}),
-	    ?line chk_lim(LminRatioLim, LminRatio, 1.0, low_min_ratio),
-	    ?line chk_lim(NminRatioLim, NminRatio, 1.0, normal_min_ratio),
-	    ?line chk_lim(LNRatioLimMin, Ratio, LNRatioLimMax, low_normal_ratio),
-	    ?line true = LNShouldWork,
-	    ?line ok
+        {0, 0} ->
+            false = LNShouldWork;
+        _ ->
+            {LminRatioLim,
+             NminRatioLim,
+             LNRatioLimMin,
+             LNRatioLimMax} = case Relax of
+                                  false -> {0.5, 0.5, 0.05, 0.25};
+                                  true -> {0.05, 0.05, 0.01, 0.4}
+                              end,
+            Lavg = L/LWorkers,
+            Navg = N/NWorkers,
+            Ratio = Lavg/Navg,
+            LminRatio = Lmin/Lavg,
+            NminRatio = Nmin/Navg,
+            io:format("low min ratio=~p~n"
+                      "normal min ratio=~p~n"
+                      "low avg=~p~n"
+                      "normal avg=~p~n"
+                      "low/normal ratio=~p~n",
+                      [LminRatio, NminRatio, Lavg, Navg, Ratio]),
+            erlang:display({low_min_ratio, LminRatio}),
+            erlang:display({normal_min_ratio, NminRatio}),
+            erlang:display({low_avg, Lavg}),
+            erlang:display({normal_avg, Navg}),
+            erlang:display({low_normal_ratio, Ratio}),
+            chk_lim(LminRatioLim, LminRatio, 1.0, low_min_ratio),
+            chk_lim(NminRatioLim, NminRatio, 1.0, normal_min_ratio),
+            chk_lim(LNRatioLimMin, Ratio, LNRatioLimMax, low_normal_ratio),
+            true = LNShouldWork,
+            ok
     end,
     case H of
-	0 ->
-	    ?line false = HShouldWork;
-	_ ->
-	    ?line HminRatioLim = case Relax of
-				     false -> 0.5;
-				     true -> 0.1
-				 end,
-	    ?line Havg = H/HWorkers,
-	    ?line HminRatio = Hmin/Havg,
-	    erlang:display({high_min_ratio, HminRatio}),
-	    ?line chk_lim(HminRatioLim, HminRatio, 1.0, high_min_ratio),
-	    ?line true = HShouldWork,
-	    ?line ok
+        0 ->
+            false = HShouldWork;
+        _ ->
+            HminRatioLim = case Relax of
+                               false -> 0.5;
+                               true -> 0.1
+                           end,
+            Havg = H/HWorkers,
+            HminRatio = Hmin/Havg,
+            erlang:display({high_min_ratio, HminRatio}),
+            chk_lim(HminRatioLim, HminRatio, 1.0, high_min_ratio),
+            true = HShouldWork,
+            ok
     end,
     case M of
-	0 ->
-	    ?line false = MShouldWork;
-	_ ->
-	    ?line MminRatioLim = case Relax of
-				     false -> 0.5;
-				     true -> 0.1
-				 end,
-	    ?line Mavg = M/MWorkers,
-	    ?line MminRatio = Mmin/Mavg,
-	    erlang:display({max_min_ratio, MminRatio}),
-	    ?line chk_lim(MminRatioLim, MminRatio, 1.0, max_min_ratio),
-	    ?line true = MShouldWork,
-	    ?line ok
+        0 ->
+            false = MShouldWork;
+        _ ->
+            MminRatioLim = case Relax of
+                               false -> 0.5;
+                               true -> 0.1
+                           end,
+            Mavg = M/MWorkers,
+            MminRatio = Mmin/Mavg,
+            erlang:display({max_min_ratio, MminRatio}),
+            chk_lim(MminRatioLim, MminRatio, 1.0, max_min_ratio),
+            true = MShouldWork,
+            ok
     end,
-    ?line ok.
+    ok.
 
 	    
 	    
 chk_lim(Min, V, Max, _What) when Min =< V, V =< Max ->
     ok;
 chk_lim(_Min, V, _Max, What) ->
-    ?t:fail({bad, What, V}).
+    ct:fail({bad, What, V}).
 
 snd(_Msg, []) ->
     [];
@@ -1711,7 +1907,7 @@ snd(Msg, [P|Ps]) ->
 relax_limits() ->
     case strange_system_scale() of
 	Scale when Scale > 1 ->
-	    ?t:format("Relaxing limits~n", []),
+	    io:format("Relaxing limits~n", []),
 	    true;
 	_ ->
 	    false
@@ -1836,8 +2032,8 @@ do_it(Tracer, Low, Normal, High, Max, RedsPerSchedLimit) ->
     EndWait = erlang:monotonic_time(milli_seconds),
     BalanceWait = EndWait-StartWait,
     erlang:display({balance_wait, BalanceWait}),
-    Timeout = ?DEFAULT_TIMEOUT - ?t:minutes(4) - BalanceWait,
-    Res = case Timeout < ?MIN_SCHEDULER_TEST_TIMEOUT of
+    Timeout = (15 - 4)*60*1000 - BalanceWait,
+    Res = case Timeout < 60*1000 of
 	      true ->
 		  stop_work(Low, Normal, High, Max),
 		  too_slow;
@@ -1907,55 +2103,55 @@ part_time_workers(N, Prio) ->
 
 tracer(Low, Normal, High, Max) ->
     receive
-	{tracees, Prio, Tracees} ->
-	    save_tracees(Prio, Tracees),
-	    case Prio of
-		low -> tracer(Tracees++Low, Normal, High, Max);
-		normal -> tracer(Low, Tracees++Normal, High, Max);
-		high -> tracer(Low, Normal, Tracees++High, Max);
-		max -> tracer(Low, Normal, High, Tracees++Max)
-	    end;
-	{get_result, Ref, Who} ->
-	    Delivered = erlang:trace_delivered(all),
-	    receive
-		{trace_delivered, all, Delivered} ->
-		    ok
-	    end,
-	    {Lc, Nc, Hc, Mc} = read_trace(),
-	    GetMinMax
-		= fun (Prio, Procs) ->
-			  LargeNum = 1 bsl 64,
-			  case lists:foldl(fun (P, {Mn, Mx} = MnMx) ->
-						   {Prio, C} = get(P),
-						   case C < Mn of
-						       true ->
-							   case C > Mx of
-							       true ->
-								   {C, C};
-							       false ->
-								   {C, Mx}
-							   end;
-						       false ->
-							   case C > Mx of
-							       true -> {Mn, C};
-							       false -> MnMx
-							   end
-						   end
-					   end,
-					   {LargeNum, 0},
-					   Procs) of
-			      {LargeNum, 0} -> {0, 0};
-			      Res -> Res
-			  end
-		  end,
-	    {Lmin, Lmax} = GetMinMax(low, Low),
-	    {Nmin, Nmax} = GetMinMax(normal, Normal),
-	    {Hmin, Hmax} = GetMinMax(high, High),
-	    {Mmin, Mmax} = GetMinMax(max, Max),
-	    Who ! {trace_result, Ref, [{low, Lc, Lmin, Lmax},
-				       {normal, Nc, Nmin, Nmax},
-				       {high, Hc, Hmin, Hmax},
-				       {max, Mc, Mmin, Mmax}]}
+        {tracees, Prio, Tracees} ->
+            save_tracees(Prio, Tracees),
+            case Prio of
+                low -> tracer(Tracees++Low, Normal, High, Max);
+                normal -> tracer(Low, Tracees++Normal, High, Max);
+                high -> tracer(Low, Normal, Tracees++High, Max);
+                max -> tracer(Low, Normal, High, Tracees++Max)
+            end;
+        {get_result, Ref, Who} ->
+            Delivered = erlang:trace_delivered(all),
+            receive
+                {trace_delivered, all, Delivered} ->
+                    ok
+            end,
+            {Lc, Nc, Hc, Mc} = read_trace(),
+            GetMinMax
+            = fun (Prio, Procs) ->
+                      LargeNum = 1 bsl 64,
+                      case lists:foldl(fun (P, {Mn, Mx} = MnMx) ->
+                                               {Prio, C} = get(P),
+                                               case C < Mn of
+                                                   true ->
+                                                       case C > Mx of
+                                                           true ->
+                                                               {C, C};
+                                                           false ->
+                                                               {C, Mx}
+                                                       end;
+                                                   false ->
+                                                       case C > Mx of
+                                                           true -> {Mn, C};
+                                                           false -> MnMx
+                                                       end
+                                               end
+                                       end,
+                                       {LargeNum, 0},
+                                       Procs) of
+                          {LargeNum, 0} -> {0, 0};
+                          Res -> Res
+                      end
+              end,
+            {Lmin, Lmax} = GetMinMax(low, Low),
+            {Nmin, Nmax} = GetMinMax(normal, Normal),
+            {Hmin, Hmax} = GetMinMax(high, High),
+            {Mmin, Mmax} = GetMinMax(max, Max),
+            Who ! {trace_result, Ref, [{low, Lc, Lmin, Lmax},
+                                       {normal, Nc, Nmin, Nmax},
+                                       {high, Hc, Hmin, Hmax},
+                                       {max, Mc, Mmin, Mmax}]}
     end.
 
 read_trace() ->
@@ -2031,15 +2227,15 @@ start_node(Config, Args) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
 			++ "-"
-			++ atom_to_list(?config(testcase, Config))
+			++ atom_to_list(proplists:get_value(testcase, Config))
 			++ "-"
 			++ integer_to_list(erlang:system_time(seconds))
 			++ "-"
 			++ integer_to_list(erlang:unique_integer([positive]))),
-    ?line ?t:start_node(Name, slave, [{args, "-pa "++Pa++" "++Args}]).
+    test_server:start_node(Name, slave, [{args, "-pa "++Pa++" "++Args}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 
 enable_internal_state() ->
@@ -2051,7 +2247,7 @@ enable_internal_state() ->
 cmp(X, X) ->
     ok;
 cmp(X, Y) ->
-    ?t:format("cmp failed:~n X=~p~n Y=~p~n", [X,Y]),
+    io:format("cmp failed:~n X=~p~n Y=~p~n", [X,Y]),
     cmp_aux(X, Y).
 
 
@@ -2063,7 +2259,7 @@ cmp_aux(T0, T1) when is_tuple(T0), is_tuple(T1), size(T0) == size(T1) ->
 cmp_aux(X, X) ->
     ok;
 cmp_aux(F0, F1) ->
-    ?t:fail({no_match, F0, F1}).
+    ct:fail({no_match, F0, F1}).
 
 cmp_tuple(_T0, _T1, N, Sz) when N > Sz ->
     ok;
diff --git a/erts/emulator/test/scheduler_SUITE_data/Makefile.src b/erts/emulator/test/scheduler_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..859112cf19
--- /dev/null
+++ b/erts/emulator/test/scheduler_SUITE_data/Makefile.src
@@ -0,0 +1,8 @@
+
+SCHEDULER_LIBS = scheduler_SUITE@dll@
+
+all: $(SCHEDULER_LIBS)
+
+@SHLIB_RULES@
+
+$(SCHEDULER_LIBS): scheduler_SUITE.c
diff --git a/erts/emulator/test/scheduler_SUITE_data/scheduler_SUITE.c b/erts/emulator/test/scheduler_SUITE_data/scheduler_SUITE.c
new file mode 100644
index 0000000000..ab4863337f
--- /dev/null
+++ b/erts/emulator/test/scheduler_SUITE_data/scheduler_SUITE.c
@@ -0,0 +1,37 @@
+#ifndef __WIN32__
+#include <unistd.h>
+#endif
+#include "erl_nif.h"
+
+static int
+load(ErlNifEnv* env, void** priv, ERL_NIF_TERM info)
+{
+    ErlNifSysInfo sys_info;
+    enif_system_info(&sys_info, sizeof(ErlNifSysInfo));
+    if (!sys_info.smp_support || !sys_info.dirty_scheduler_support)
+        return 1;
+    return 0;
+}
+
+static ERL_NIF_TERM
+dirty_sleeper(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+#ifdef ERL_NIF_DIRTY_SCHEDULER_SUPPORT
+#ifdef __WIN32__
+    Sleep(3000);
+#else
+    sleep(3);
+#endif
+#endif
+    return enif_make_atom(env, "ok");
+}
+
+static ErlNifFunc funcs[] = {
+#ifdef ERL_NIF_DIRTY_SCHEDULER_SUPPORT
+    {"dirty_sleeper", 0, dirty_sleeper, ERL_NIF_DIRTY_JOB_IO_BOUND}
+#else
+    {"dirty_sleeper", 0, dirty_sleeper, 0}
+#endif
+};
+
+ERL_NIF_INIT(scheduler_SUITE, funcs, &load, NULL, NULL, NULL);
diff --git a/erts/emulator/test/send_term_SUITE.erl b/erts/emulator/test/send_term_SUITE.erl
index 670865cd3f..75161389b1 100644
--- a/erts/emulator/test/send_term_SUITE.erl
+++ b/erts/emulator/test/send_term_SUITE.erl
@@ -20,49 +20,25 @@
 
 -module(send_term_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2,basic/1]).
--export([init_per_testcase/2,end_per_testcase/2]).
+-export([all/0, suite/0, basic/1]).
 
 -export([generate_external_terms_files/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(3)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 3}}].
 
 all() -> 
     [basic].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 basic(Config) when is_list(Config) ->
     Drv = "send_term_drv",
-    ?line P = start_driver(Config, Drv),
+    P = start_driver(Config, Drv),
 
-    ?line [] = term(P, 0),
-    ?line Self = self(),
+    [] = term(P, 0),
+    Self = self(),
     {blurf,42,[],[-42,{}|"abc"++P],"kalle",3.1416,Self,#{}} = term(P, 1),
 
     Map41 = maps:from_list([{blurf, 42},
@@ -76,36 +52,36 @@ basic(Config) when is_list(Config) ->
 			    {3.1416, Self},
 			    {#{}, blurf}]),
     Map42 = term(P, 42),
-    ?line Deep = lists:seq(0, 199),
-    ?line Deep = term(P, 2),
-    ?line {B1,B2} = term(P, 3),
-    ?line B1 = list_to_binary(lists:seq(0, 255)),
-    ?line B2 = list_to_binary(lists:seq(23, 255-17)),
+    Deep = lists:seq(0, 199),
+    Deep = term(P, 2),
+    {B1,B2} = term(P, 3),
+    B1 = list_to_binary(lists:seq(0, 255)),
+    B2 = list_to_binary(lists:seq(23, 255-17)),
 
     %% Pid sending. We need another process.
-    ?line Child = spawn_link(fun() ->
+    Child = spawn_link(fun() ->
 				     erlang:port_command(P, [4])
 			     end),
-    ?line {Self,Child} = receive_any(),
+    {Self,Child} = receive_any(),
 
     %% ERL_DRV_EXT2TERM
-    ?line ExpectExt2Term = expected_ext2term_drv(?config(data_dir, Config)),
-    ?line ExpectExt2Term = term(P, 5),
+    ExpectExt2Term = expected_ext2term_drv(proplists:get_value(data_dir, Config)),
+    ExpectExt2Term = term(P, 5),
 
     %% ERL_DRV_INT, ERL_DRV_UINT
-    ?line case erlang:system_info({wordsize, external}) of
+    case erlang:system_info({wordsize, external}) of
 	      4 ->
-		  ?line {-1, 4294967295} = term(P, 6);
+		  {-1, 4294967295} = term(P, 6);
 	      8 ->
-		  ?line {-1, 18446744073709551615} = term(P, 6)
+		  {-1, 18446744073709551615} = term(P, 6)
 	  end,
 
     %% ERL_DRV_BUF2BINARY
-    ?line ExpectedBinTup = {<<>>,
+    ExpectedBinTup = {<<>>,
 			    <<>>,
 			    list_to_binary(lists:duplicate(17,17)),
 			    list_to_binary(lists:duplicate(1024,17))},
-    ?line ExpectedBinTup = term(P, 7),
+    ExpectedBinTup = term(P, 7),
 
     %% single terms
     Singles = [{[], 8}, % ERL_DRV_NIL
@@ -140,35 +116,34 @@ basic(Config) when is_list(Config) ->
                {-20233590931456, 38}, % ERL_DRV_INT64
                {-9223372036854775808, 39},
 	       {#{}, 40}], % ERL_DRV_MAP
-    ?line {Terms, Ops} = lists:unzip(Singles),
-    ?line Terms = term(P,Ops),
+    {Terms, Ops} = lists:unzip(Singles),
+    Terms = term(P,Ops),
 
     AFloat = term(P, 26), % ERL_DRV_FLOAT
-    ?line true = AFloat < 0.001,
-    ?line true = AFloat > -0.001,
+    true = AFloat < 0.001,
+    true = AFloat > -0.001,
 
     %% Failure cases.
-    ?line [] = term(P, 127),
-    ?line receive
+    [] = term(P, 127),
+    receive
 	      Any ->
-		  ?line io:format("Unexpected: ~p\n", [Any]),
-		  ?line ?t:fail()
+		  ct:fail("Unexpected: ~p\n", [Any])
 	  after 0 ->
 		  ok
 	  end,
 
-    ?line ok = chk_temp_alloc(),
+    ok = chk_temp_alloc(),
 
     %% In a private heap system, verify that there are no binaries
     %% left for the process.
-    ?line erlang:garbage_collect(),		%Get rid of binaries.
+    erlang:garbage_collect(),		%Get rid of binaries.
     case erlang:system_info(heap_type) of
 	private ->
-	    ?line {binary,[]} = process_info(self(), binary);
+	    {binary,[]} = process_info(self(), binary);
 	_ -> ok
     end,
 
-    ?line stop_driver(P, Drv),
+    stop_driver(P, Drv),
     ok.
 
 term(P, Op) ->
@@ -184,28 +159,28 @@ chk_temp_alloc() ->
     case erlang:system_info({allocator,temp_alloc}) of
 	false ->
 	    %% Temp alloc is not enabled
-	    ?line ok;
+	    ok;
 	TIL ->
 	    %% Verify that we havn't got anything allocated by temp_alloc
 	    lists:foreach(
 	      fun ({instance, _, TI}) ->
-		      ?line {value, {mbcs, MBCInfo}}
+		      {value, {mbcs, MBCInfo}}
 			  = lists:keysearch(mbcs, 1, TI),
-		      ?line {value, {blocks, 0, _, _}}
+		      {value, {blocks, 0, _, _}}
 			  = lists:keysearch(blocks, 1, MBCInfo),
-		      ?line {value, {sbcs, SBCInfo}}
+		      {value, {sbcs, SBCInfo}}
 			  = lists:keysearch(sbcs, 1, TI),
-		      ?line {value, {blocks, 0, _, _}}
+		      {value, {blocks, 0, _, _}}
 			  = lists:keysearch(blocks, 1, SBCInfo)
 	      end,
 	      TIL),
-	    ?line ok
+	    ok
     end.
 	    
 
 %% Start/stop drivers.
 start_driver(Config, Name) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
     ok = load_driver(Path, Name),
     open_port({spawn, Name}, []).
@@ -219,17 +194,17 @@ load_driver(Dir, Driver) ->
     end.
 
 stop_driver(Port, Name) ->
-    ?line true = erlang:port_close(Port),
+    true = erlang:port_close(Port),
     receive
 	{Port,Message} ->
-	    ?t:fail({strange_message_from_port,Message})
+	    ct:fail({strange_message_from_port,Message})
     after 0 ->
 	    ok
     end,
 
     %% Unload the driver.
     ok = erl_ddll:unload_driver(Name),
-    ?line ok = erl_ddll:stop().
+    ok = erl_ddll:stop().
 
 get_external_terms(DataDir) ->    
     {ok, Bin} = file:read_file([DataDir, "ext_terms.bin"]),
@@ -261,37 +236,36 @@ generate_external_terms_files(BaseDir) ->
     RPort = hd(rpc:call(Node, erlang, ports, [])),
     true = is_port(RPort),
     slave:stop(Node),
-    Terms =
-	[{4711, -4711, [an_atom, "a list"]},
-	 [1000000000000000000000,-1111111111111111, "blupp!", blipp],
-	 {RPid, {RRef, RPort}, self(), hd(erlang:ports()), make_ref()},
-	 {{}, [], [], fun () -> ok end, <<"hej hopp trallalaaaaaaaaaaaaaaa">>},
-	 [44444444444444444444444,-44444444444, "b!", blippppppp],
-	 {4711, RPid, {RRef, RPort}, -4711, [an_atom, "a list"]},
-	 {RPid, {RRef, RPort}, hd(processes()), hd(erlang:ports())},
-	 {4711, -4711, [an_atom, "a list"]},
-	 {4711, -4711, [atom, "list"]},
-	 {RPid, {RRef, RPort}, hd(processes()), hd(erlang:ports())},
-	 {4444444444444444444,-44444, {{{{{{{{{{{{}}}}}}}}}}}}, make_ref()},
-	 {444444444444444444444,-44444, [[[[[[[[[[[1]]]]]]]]]]], make_ref()},
-	 {444444444444444444,-44444, {{{{{{{{{{{{2}}}}}}}}}}}}, make_ref()},
-	 {4444444444444444444444,-44444, {{{{{{{{{{{{3}}}}}}}}}}}}, make_ref()},
-	 {44444444444444444444,-44444, {{{{{{{{{{{{4}}}}}}}}}}}}, make_ref()},
-	 {4444444444444444,-44444, [[[[[[[[[[[5]]]]]]]]]]], make_ref()},
-	 {444444444444444444444,-44444, {{{{{{{{{{{{6}}}}}}}}}}}}, make_ref()},
-	 {444444444444444,-44444, {{{{{{{{{{{{7}}}}}}}}}}}}, make_ref()},
-	 {4444444444444444444,-44444, {{{{{{{{{{{{8}}}}}}}}}}}}, make_ref()},
-         #{},
-	 #{1 => 11, 2 => 22, 3 => 33},
-	 maps:from_list([{K,K*11} || K <- lists:seq(1,100)])],
+    Terms = [{4711, -4711, [an_atom, "a list"]},
+             [1000000000000000000000,-1111111111111111, "blupp!", blipp],
+             {RPid, {RRef, RPort}, self(), hd(erlang:ports()), make_ref()},
+             {{}, [], [], fun () -> ok end, <<"hej hopp trallalaaaaaaaaaaaaaaa">>},
+             [44444444444444444444444,-44444444444, "b!", blippppppp],
+             {4711, RPid, {RRef, RPort}, -4711, [an_atom, "a list"]},
+             {RPid, {RRef, RPort}, hd(processes()), hd(erlang:ports())},
+             {4711, -4711, [an_atom, "a list"]},
+             {4711, -4711, [atom, "list"]},
+             {RPid, {RRef, RPort}, hd(processes()), hd(erlang:ports())},
+             {4444444444444444444,-44444, {{{{{{{{{{{{}}}}}}}}}}}}, make_ref()},
+             {444444444444444444444,-44444, [[[[[[[[[[[1]]]]]]]]]]], make_ref()},
+             {444444444444444444,-44444, {{{{{{{{{{{{2}}}}}}}}}}}}, make_ref()},
+             {4444444444444444444444,-44444, {{{{{{{{{{{{3}}}}}}}}}}}}, make_ref()},
+             {44444444444444444444,-44444, {{{{{{{{{{{{4}}}}}}}}}}}}, make_ref()},
+             {4444444444444444,-44444, [[[[[[[[[[[5]]]]]]]]]]], make_ref()},
+             {444444444444444444444,-44444, {{{{{{{{{{{{6}}}}}}}}}}}}, make_ref()},
+             {444444444444444,-44444, {{{{{{{{{{{{7}}}}}}}}}}}}, make_ref()},
+             {4444444444444444444,-44444, {{{{{{{{{{{{8}}}}}}}}}}}}, make_ref()},
+             #{},
+             #{1 => 11, 2 => 22, 3 => 33},
+             maps:from_list([{K,K*11} || K <- lists:seq(1,100)])],
     ok = file:write_file(filename:join([BaseDir,
-					"send_term_SUITE_data",
-					"ext_terms.bin"]),
-			 term_to_binary(Terms, [compressed])),
+                                        "send_term_SUITE_data",
+                                        "ext_terms.bin"]),
+                         term_to_binary(Terms, [compressed])),
     {ok, IoDev} = file:open(filename:join([BaseDir,
-					   "send_term_SUITE_data",
-					   "ext_terms.h"]),
-			    [write]),
+                                           "send_term_SUITE_data",
+                                           "ext_terms.h"]),
+                            [write]),
     write_ext_terms_h(IoDev, Terms),
     file:close(IoDev).
 
@@ -301,12 +275,12 @@ write_ext_terms_h(IoDev, Terms) ->
     io:format(IoDev, "#define EXT_TERMS_H__~n",[]),
     {ExtTerms, MaxSize} = make_ext_terms(Terms),
     io:format(IoDev,
-	      "static struct {~n"
-	      "  unsigned char ext[~p];~n"
-	      "  int ext_size;~n"
-	      "  unsigned char cext[~p];~n"
-	      "  int cext_size;~n"
-	      "} ext_terms[] = {~n",[MaxSize, MaxSize]),
+              "static struct {~n"
+              "  unsigned char ext[~p];~n"
+              "  int ext_size;~n"
+              "  unsigned char cext[~p];~n"
+              "  int cext_size;~n"
+              "} ext_terms[] = {~n",[MaxSize, MaxSize]),
     E = write_ext_terms_h(IoDev, ExtTerms, 0),
     io:format(IoDev, "};~n",[]),
     io:format(IoDev, "#define NO_OF_EXT_TERMS ~p~n", [E]),
diff --git a/erts/emulator/test/sensitive_SUITE.erl b/erts/emulator/test/sensitive_SUITE.erl
index 2e51712737..e2236774a7 100644
--- a/erts/emulator/test/sensitive_SUITE.erl
+++ b/erts/emulator/test/sensitive_SUITE.erl
@@ -20,28 +20,20 @@
 
 -module(sensitive_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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,
-	 stickiness/1,send_trace/1,recv_trace/1,proc_trace/1,call_trace/1,
-	 meta_trace/1,running_trace/1,gc_trace/1,seq_trace/1,
-	 t_process_info/1,t_process_display/1,save_calls/1]).
+-export([all/0, suite/0,
+         stickiness/1,send_trace/1,recv_trace/1,proc_trace/1,call_trace/1,
+         meta_trace/1,running_trace/1,gc_trace/1,seq_trace/1,
+         t_process_info/1,t_process_display/1,save_calls/1]).
 
 -export([remote_process_display/0,an_exported_function/1]).
 
 -import(lists, [keysearch/3,foreach/2,sort/1]).
 
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(5)),
-    [{watchdog,Dog}|Config].
-
-end_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 5}}].
 
 all() -> 
     [stickiness, send_trace, recv_trace, proc_trace,
@@ -49,164 +41,148 @@ all() ->
      seq_trace, t_process_info, t_process_display,
      save_calls].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-    
 stickiness(Config) when is_list(Config) ->
-    ?line {Tracer,Mref} = spawn_monitor(fun() ->
-						receive after infinity -> ok end
-					end),
-    ?line false = process_flag(sensitive, true),
+    {Tracer,Mref} = spawn_monitor(fun() ->
+                                          receive after infinity -> ok end
+                                  end),
+    false = process_flag(sensitive, true),
     put(foo, bar),
 
     Flags = sort([send,'receive',procs,call,running,garbage_collection,
-		  set_on_spawn,set_on_first_spawn,set_on_link,set_on_first_link]),
-    ?line foreach(fun(F) ->
-			  1 = erlang:trace(self(), true, [F,{tracer,Tracer}])
-		  end, Flags),
-    ?line foreach(fun(F) ->
-			  1 = erlang:trace(self(), false, [F,{tracer,Tracer}])
-		  end, Flags),
-    ?line 1 = erlang:trace(self(), true, [{tracer,Tracer}|Flags]),
-    ?line 1 = erlang:trace(self(), false, [{tracer,Tracer}|Flags]),
-
-    ?line {messages,[]} = process_info(Tracer, messages),
+                  set_on_spawn,set_on_first_spawn,set_on_link,set_on_first_link]),
+    foreach(fun(F) ->
+                    1 = erlang:trace(self(), true, [F,{tracer,Tracer}])
+            end, Flags),
+    foreach(fun(F) ->
+                    1 = erlang:trace(self(), false, [F,{tracer,Tracer}])
+            end, Flags),
+    1 = erlang:trace(self(), true, [{tracer,Tracer}|Flags]),
+    1 = erlang:trace(self(), false, [{tracer,Tracer}|Flags]),
+
+    {messages,[]} = process_info(Tracer, messages),
     exit(Tracer, kill),
     receive {'DOWN',Mref,_,_,_} -> ok end,
-    
+
     case process_info(self(), dictionary) of
-	{dictionary,[]} -> ok;
-	{dictionary,_} -> ?line ?t:fail(sensitive_flag_cleared)
+        {dictionary,[]} -> ok;
+        {dictionary,_} -> ct:fail(sensitive_flag_cleared)
     end,
 
     NewTracer = spawn_link(fun() -> receive after infinity -> ok end end),
-    ?line 1 = erlang:trace(self(), true, [{tracer,NewTracer}|Flags]),
-    ?line Flags = sort(element(2, erlang:trace_info(self(), flags))),
-    ?line {tracer,NewTracer} = erlang:trace_info(self(), tracer),
+    1 = erlang:trace(self(), true, [{tracer,NewTracer}|Flags]),
+    Flags = sort(element(2, erlang:trace_info(self(), flags))),
+    {tracer,NewTracer} = erlang:trace_info(self(), tracer),
 
     %% Process still sensitive. Tracer should disappear when we clear
     %% all trace flags.
-    ?line 1 = erlang:trace(self(), false, [{tracer,NewTracer}|Flags]),
-    ?line {tracer,[]} = erlang:trace_info(self(), tracer),
+    1 = erlang:trace(self(), false, [{tracer,NewTracer}|Flags]),
+    {tracer,[]} = erlang:trace_info(self(), tracer),
 
-    ?line unlink(NewTracer), exit(NewTracer, kill),
+    unlink(NewTracer), exit(NewTracer, kill),
     ok.
 
 send_trace(Config) when is_list(Config) ->
-    ?line {Dead,Mref} = spawn_monitor(fun() -> ok end),
+    {Dead,Mref} = spawn_monitor(fun() -> ok end),
     receive {'DOWN',Mref,_,_,_} -> ok end,
-    ?line Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
-    ?line Sink = spawn_link(fun() -> receive after infinity -> ok end end),
+    Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
+    Sink = spawn_link(fun() -> receive after infinity -> ok end end),
     Self = self(),
 
-    ?line 1 = erlang:trace(self(), true, [send,{tracer,Tracer}]),
-    ?line Dead ! before,
-    ?line Sink ! before,
-    ?line false = process_flag(sensitive, true),
-    ?line Sink ! {blurf,lists:seq(1, 50)},
-    ?line true = process_flag(sensitive, true),
-    ?line Sink ! lists:seq(1, 100),
-    ?line Dead ! forget_me,
-    ?line true = process_flag(sensitive, false),
-    ?line Sink ! after1,
-    ?line false = process_flag(sensitive, false),
-    ?line Sink ! after2,
-    ?line Dead ! after2,
-    ?line wait_trace(Self),
-
-    ?line {messages,Messages} = process_info(Tracer, messages),
-    ?line [{trace,Self,send_to_non_existing_process,before,Dead},
-	   {trace,Self,send,before,Sink},
-	   {trace,Self,send,after1,Sink},
-	   {trace,Self,send,after2,Sink},
-	   {trace,Self,send_to_non_existing_process,after2,Dead}] = Messages,
-
-    ?line unlink(Tracer), exit(Tracer, kill),
-    ?line unlink(Sink), exit(Sink, kill),
+    1 = erlang:trace(self(), true, [send,{tracer,Tracer}]),
+    Dead ! before,
+    Sink ! before,
+    false = process_flag(sensitive, true),
+    Sink ! {blurf,lists:seq(1, 50)},
+    true = process_flag(sensitive, true),
+    Sink ! lists:seq(1, 100),
+    Dead ! forget_me,
+    true = process_flag(sensitive, false),
+    Sink ! after1,
+    false = process_flag(sensitive, false),
+    Sink ! after2,
+    Dead ! after2,
+    wait_trace(Self),
+
+    {messages,Messages} = process_info(Tracer, messages),
+    [{trace,Self,send_to_non_existing_process,before,Dead},
+     {trace,Self,send,before,Sink},
+     {trace,Self,send,after1,Sink},
+     {trace,Self,send,after2,Sink},
+     {trace,Self,send_to_non_existing_process,after2,Dead}] = Messages,
+
+    unlink(Tracer), exit(Tracer, kill),
+    unlink(Sink), exit(Sink, kill),
     ok.
 
 recv_trace(Config) when is_list(Config) ->
     Parent = self(),
-    ?line Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
-    ?line Sender = spawn_link(fun() -> recv_trace_sender(Parent) end),
+    Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
+    Sender = spawn_link(fun() -> recv_trace_sender(Parent) end),
 
-    ?line 1 = erlang:trace(self(), true, ['receive',{tracer,Tracer}]),
+    1 = erlang:trace(self(), true, ['receive',{tracer,Tracer}]),
 
     Sender ! 1,
     receive a -> wait_trace(Sender) end,
 
-    ?line false = process_flag(sensitive, true),
+    false = process_flag(sensitive, true),
 
     Sender ! 2,
     receive {b,[x,y,z]} -> wait_trace(Sender) end,
-    
-    ?line true = process_flag(sensitive, false),
+
+    true = process_flag(sensitive, false),
 
     Sender ! 3,
     receive c -> wait_trace(Sender) end,
-    
-    ?line {messages,Messages} = process_info(Tracer, messages),
+
+    {messages,Messages} = process_info(Tracer, messages),
     [{trace,Parent,'receive',a},
      {trace,Parent,'receive',{trace_delivered,_,_}},
      {trace,Parent,'receive',c}|_] = Messages,
 
-    ?line unlink(Tracer), exit(Tracer, kill),
-    ?line unlink(Sender), exit(Sender, kill),
+    unlink(Tracer), exit(Tracer, kill),
+    unlink(Sender), exit(Sender, kill),
     ok.
 
 recv_trace_sender(Pid) ->
     receive
-	1 -> Pid ! a;
-	2 -> Pid ! {b,[x,y,z]};
-	3 -> Pid ! c
+        1 -> Pid ! a;
+        2 -> Pid ! {b,[x,y,z]};
+        3 -> Pid ! c
     end,
     recv_trace_sender(Pid).
 
 proc_trace(Config) when is_list(Config) ->
     Self = self(),
-    ?line Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
+    Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
 
-    ?line 1 = erlang:trace(self(), true, [procs,{tracer,Tracer}]),
-    ?line false = process_flag(sensitive, true),
+    1 = erlang:trace(self(), true, [procs,{tracer,Tracer}]),
+    false = process_flag(sensitive, true),
 
     spawn(fun() -> ok end),
-    ?line register(nisse, self()),
-    ?line unregister(nisse),
-    ?line link(Tracer),
-    ?line unlink(Tracer),
-    ?line Linker0 = spawn_link(fun() -> ok end),
+    register(nisse, self()),
+    unregister(nisse),
+    link(Tracer),
+    unlink(Tracer),
+    Linker0 = spawn_link(fun() -> ok end),
     Mref0 = erlang:monitor(process, Linker0),
 
-    ?line {_,Mref} = spawn_monitor(fun() -> link(Self), unlink(Self) end),
+    {_,Mref} = spawn_monitor(fun() -> link(Self), unlink(Self) end),
 
     receive {'DOWN',Mref0,_,_,_} -> ok end,
 
     receive {'DOWN',Mref,_,_,_} -> ok end,
 
-    ?line true = process_flag(sensitive, false),
+    true = process_flag(sensitive, false),
 
     Dead = spawn(fun() -> ok end),
-    ?line register(arne, self()),
-    ?line unregister(arne),
-    ?line {Linker,Mref2} = spawn_monitor(fun() -> link(Self), unlink(Self) end),
+    register(arne, self()),
+    unregister(arne),
+    {Linker,Mref2} = spawn_monitor(fun() -> link(Self), unlink(Self) end),
     receive {'DOWN',Mref2,_,_,_} -> ok end,
-    ?line Last = spawn_link(fun() -> ok end),
+    Last = spawn_link(fun() -> ok end),
     receive after 10 -> ok end,
-    ?line wait_trace(all),
-    ?line {messages,Messages} = process_info(Tracer, messages),    
+    wait_trace(all),
+    {messages,Messages} = process_info(Tracer, messages),    
     [{trace,Self,spawn,Dead,{erlang,apply,_}},
      {trace,Self,register,arne},
      {trace,Self,unregister,arne},
@@ -217,80 +193,80 @@ proc_trace(Config) when is_list(Config) ->
      {trace,Self,link,Last},
      {trace,Self,getting_unlinked,Last}] = Messages,
 
-    ?line unlink(Tracer), exit(Tracer, kill),
+    unlink(Tracer), exit(Tracer, kill),
     ok.
 
 call_trace(Config) when is_list(Config) ->
     Self = self(),
-    ?line Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
-
-    ?line 1 = erlang:trace(self(), true, [call,{tracer,Tracer}]),
-    ?line 1 = erlang:trace_pattern({?MODULE,an_exported_function,1},
-				   true, [global]),
-    ?line 1 = erlang:trace_pattern({erlang,list_to_binary,1}, true, [global]),
-    ?line 1 = erlang:trace_pattern({erlang,binary_to_list,1}, true, [local]),
-    ?line Local = erlang:trace_pattern({?MODULE,'_','_'}, true, [local]),
-
-    ?line false = process_flag(sensitive, true),
-    ?line {ok,42} = a_local_function(42),
-    ?line 7 = an_exported_function(6),
-    ?line <<7,8,9,10>> = list_to_binary(id([7,8,9,10])),
-    ?line [42,43] = binary_to_list(id(<<42,43>>)),
-    ?line true = process_flag(sensitive, false),
-
-    ?line {ok,{a,b}} = a_local_function({a,b}),
-    ?line 1 = an_exported_function(0),
-    ?line <<1,2,3>> = list_to_binary(id([1,2,3])),
-    ?line [42,43,44] = binary_to_list(id(<<42,43,44>>)),
-
-    ?line wait_trace(Self),
-
-    ?line {messages,Messages} = process_info(Tracer, messages),    
-    ?line [{trace,Self,call,{?MODULE,a_local_function,[{a,b}]}},
-	   {trace,Self,call,{?MODULE,an_exported_function,[0]}},
-	   {trace,Self,call,{?MODULE,id,[_]}},
-	   {trace,Self,call,{erlang,list_to_binary,[[1,2,3]]}},
-	   {trace,Self,call,{sensitive_SUITE,id,[<<42,43,44>>]}},
-	   {trace,Self,call,{erlang,binary_to_list,[<<42,43,44>>]}},
-	   {trace,Self,call,{?MODULE,wait_trace,[Self]}}] = Messages,
-
-    ?line Local = erlang:trace_pattern({?MODULE,'_','_'}, false, [local]),
-    ?line erlang:trace_pattern({erlang,'_','_'}, false, [local]),
-    ?line erlang:trace_pattern({'_','_','_'}, false, [global]),
-
-    ?line unlink(Tracer), exit(Tracer, kill),
+    Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
+
+    1 = erlang:trace(self(), true, [call,{tracer,Tracer}]),
+    1 = erlang:trace_pattern({?MODULE,an_exported_function,1},
+                             true, [global]),
+    1 = erlang:trace_pattern({erlang,list_to_binary,1}, true, [global]),
+    1 = erlang:trace_pattern({erlang,binary_to_list,1}, true, [local]),
+    Local = erlang:trace_pattern({?MODULE,'_','_'}, true, [local]),
+
+    false = process_flag(sensitive, true),
+    {ok,42} = a_local_function(42),
+    7 = an_exported_function(6),
+    <<7,8,9,10>> = list_to_binary(id([7,8,9,10])),
+    [42,43] = binary_to_list(id(<<42,43>>)),
+    true = process_flag(sensitive, false),
+
+    {ok,{a,b}} = a_local_function({a,b}),
+    1 = an_exported_function(0),
+    <<1,2,3>> = list_to_binary(id([1,2,3])),
+    [42,43,44] = binary_to_list(id(<<42,43,44>>)),
+
+    wait_trace(Self),
+
+    {messages,Messages} = process_info(Tracer, messages),    
+    [{trace,Self,call,{?MODULE,a_local_function,[{a,b}]}},
+     {trace,Self,call,{?MODULE,an_exported_function,[0]}},
+     {trace,Self,call,{?MODULE,id,[_]}},
+     {trace,Self,call,{erlang,list_to_binary,[[1,2,3]]}},
+     {trace,Self,call,{sensitive_SUITE,id,[<<42,43,44>>]}},
+     {trace,Self,call,{erlang,binary_to_list,[<<42,43,44>>]}},
+     {trace,Self,call,{?MODULE,wait_trace,[Self]}}] = Messages,
+
+    Local = erlang:trace_pattern({?MODULE,'_','_'}, false, [local]),
+    erlang:trace_pattern({erlang,'_','_'}, false, [local]),
+    erlang:trace_pattern({'_','_','_'}, false, [global]),
+
+    unlink(Tracer), exit(Tracer, kill),
     ok.
 
 meta_trace(Config) when is_list(Config) ->
     Self = self(),
-    ?line Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
-
-    ?line Local = erlang:trace_pattern({?MODULE,'_','_'}, true, [{meta,Tracer}]),
-    ?line 1 = erlang:trace_pattern({erlang,list_to_binary,1}, true, [{meta,Tracer}]),
-
-    ?line false = process_flag(sensitive, true),
-    ?line {ok,blurf} = a_local_function(blurf),
-    ?line 100 = an_exported_function(99),
-    ?line <<8,9,10>> = list_to_binary(id([8,9,10])),
-    ?line true = process_flag(sensitive, false),
-
-    ?line {ok,{x,y}} = a_local_function({x,y}),
-    ?line 1 = an_exported_function(0),
-    ?line <<10>> = list_to_binary(id([10])),
-    ?line wait_trace(Self),
-
-    ?line Local = erlang:trace_pattern({?MODULE,'_','_'}, false, [meta]),
-    ?line 1 = erlang:trace_pattern({erlang,list_to_binary,1}, false, [meta]),
-    ?line a_local_function(0),
-
-    ?line {messages,Messages} = process_info(Tracer, messages),    
-    ?line [{trace_ts,Self,call,{?MODULE,a_local_function,[{x,y}]},{_,_,_}},
-	   {trace_ts,Self,call,{?MODULE,an_exported_function,[0]},{_,_,_}},
-	   {trace_ts,Self,call,{?MODULE,id,[_]},{_,_,_}},
-	   {trace_ts,Self,call,{erlang,list_to_binary,[[10]]},{_,_,_}},
-	   {trace_ts,Self,call,{?MODULE,wait_trace,[Self]},{_,_,_}}] = Messages,
-
-    ?line unlink(Tracer), exit(Tracer, kill),
+    Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
+
+    Local = erlang:trace_pattern({?MODULE,'_','_'}, true, [{meta,Tracer}]),
+    1 = erlang:trace_pattern({erlang,list_to_binary,1}, true, [{meta,Tracer}]),
+
+    false = process_flag(sensitive, true),
+    {ok,blurf} = a_local_function(blurf),
+    100 = an_exported_function(99),
+    <<8,9,10>> = list_to_binary(id([8,9,10])),
+    true = process_flag(sensitive, false),
+
+    {ok,{x,y}} = a_local_function({x,y}),
+    1 = an_exported_function(0),
+    <<10>> = list_to_binary(id([10])),
+    wait_trace(Self),
+
+    Local = erlang:trace_pattern({?MODULE,'_','_'}, false, [meta]),
+    1 = erlang:trace_pattern({erlang,list_to_binary,1}, false, [meta]),
+    a_local_function(0),
+
+    {messages,Messages} = process_info(Tracer, messages),    
+    [{trace_ts,Self,call,{?MODULE,a_local_function,[{x,y}]},{_,_,_}},
+     {trace_ts,Self,call,{?MODULE,an_exported_function,[0]},{_,_,_}},
+     {trace_ts,Self,call,{?MODULE,id,[_]},{_,_,_}},
+     {trace_ts,Self,call,{erlang,list_to_binary,[[10]]},{_,_,_}},
+     {trace_ts,Self,call,{?MODULE,wait_trace,[Self]},{_,_,_}}] = Messages,
+
+    unlink(Tracer), exit(Tracer, kill),
     ok.
 
 a_local_function(A) ->
@@ -301,66 +277,66 @@ an_exported_function(X) ->
 
 running_trace(Config) when is_list(Config) ->
     Self = self(),
-    ?line Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
+    Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
 
-    ?line false = process_flag(sensitive, true),
-    ?line 1 = erlang:trace(Self, true, [running,{tracer,Tracer}]),
+    false = process_flag(sensitive, true),
+    1 = erlang:trace(Self, true, [running,{tracer,Tracer}]),
     erlang:yield(), erlang:yield(), erlang:yield(), erlang:yield(),
     erlang:yield(), erlang:yield(), erlang:yield(), erlang:yield(),
-    ?line true = process_flag(sensitive, false),
+    true = process_flag(sensitive, false),
     erlang:yield(),
-    ?line 1 = erlang:trace(Self, false, [running,{tracer,Tracer}]),
+    1 = erlang:trace(Self, false, [running,{tracer,Tracer}]),
 
-    ?line wait_trace(Self),
-    ?line {messages,Messages} = process_info(Tracer, messages),    
-    ?line [{trace,Self,out,{sensitive_SUITE,running_trace,1}},
-	   {trace,Self,in,{sensitive_SUITE,running_trace,1}}] = Messages,
+    wait_trace(Self),
+    {messages,Messages} = process_info(Tracer, messages),    
+    [{trace,Self,out,{sensitive_SUITE,running_trace,1}},
+     {trace,Self,in,{sensitive_SUITE,running_trace,1}}] = Messages,
 
-    ?line unlink(Tracer), exit(Tracer, kill),
+    unlink(Tracer), exit(Tracer, kill),
     ok.
 
 gc_trace(Config) when is_list(Config) ->
     Self = self(),
-    ?line Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
+    Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
 
-    ?line false = process_flag(sensitive, true),
-    ?line 1 = erlang:trace(Self, true, [garbage_collection,{tracer,Tracer}]),
+    false = process_flag(sensitive, true),
+    1 = erlang:trace(Self, true, [garbage_collection,{tracer,Tracer}]),
     erlang:garbage_collect(), erlang:garbage_collect(),
     erlang:garbage_collect(), erlang:garbage_collect(),
     erlang:garbage_collect(), erlang:garbage_collect(),
     erlang:garbage_collect(), erlang:garbage_collect(),
-    ?line true = process_flag(sensitive, false),
+    true = process_flag(sensitive, false),
     erlang:garbage_collect(),
-    ?line 1 = erlang:trace(Self, false, [garbage_collection,{tracer,Tracer}]),
+    1 = erlang:trace(Self, false, [garbage_collection,{tracer,Tracer}]),
 
-    ?line wait_trace(Self),
-    ?line {messages,Messages} = process_info(Tracer, messages),    
-    ?line [{trace,Self,gc_start,_},{trace,Self,gc_end,_}] = Messages,
+    wait_trace(Self),
+    {messages,Messages} = process_info(Tracer, messages),    
+    [{trace,Self,gc_start,_},{trace,Self,gc_end,_}] = Messages,
 
-    ?line unlink(Tracer), exit(Tracer, kill),
+    unlink(Tracer), exit(Tracer, kill),
     ok.
 
 seq_trace(Config) when is_list(Config) ->
     Self = self(),
-    ?line Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
-    ?line seq_trace:set_system_tracer(Tracer),
-
-    ?line false = process_flag(sensitive, true),
-
-    ?line Echo = spawn_link(fun() ->
-				    receive
-					{Pid,Message} ->
-					    Pid ! {reply,Message}
-				    end
-			    end),
-    ?line Sender = spawn_link(fun() ->
-				      seq_trace:set_token(label, 42),
-				      seq_trace:set_token('receive', true),
-				      seq_trace:set_token(send, true),
-				      seq_trace:set_token(print, true),
-				      seq_trace:print(42, "trace started"),
-				      Self ! blurf
-			    end),
+    Tracer = spawn_link(fun() -> receive after infinity -> ok end end),
+    seq_trace:set_system_tracer(Tracer),
+
+    false = process_flag(sensitive, true),
+
+    Echo = spawn_link(fun() ->
+                              receive
+                                  {Pid,Message} ->
+                                      Pid ! {reply,Message}
+                              end
+                      end),
+    Sender = spawn_link(fun() ->
+                                seq_trace:set_token(label, 42),
+                                seq_trace:set_token('receive', true),
+                                seq_trace:set_token(send, true),
+                                seq_trace:set_token(print, true),
+                                seq_trace:print(42, "trace started"),
+                                Self ! blurf
+                        end),
     seq_trace:set_token(label, 17),
     seq_trace:set_token('receive', true),
     seq_trace:set_token(send, true),
@@ -370,49 +346,49 @@ seq_trace(Config) when is_list(Config) ->
     receive {reply,hello} -> ok end,
     receive blurf -> ok end,
 
-    ?line wait_trace(all),
+    wait_trace(all),
+
+    {messages,Messages} = process_info(Tracer, messages),
+    [{seq_trace,17,{'receive',{0,2},Self,Echo,{Self,hello}}},
+     {seq_trace,17,{send,{2,3},Echo,Self,{reply,hello}}}] =
+    [M || {seq_trace,17,_}=M <- Messages],
 
-    ?line {messages,Messages} = process_info(Tracer, messages),
-    ?line [{seq_trace,17,{'receive',{0,2},Self,Echo,{Self,hello}}},
-	   {seq_trace,17,{send,{2,3},Echo,Self,{reply,hello}}}] =
-	[M || {seq_trace,17,_}=M <- Messages],
+    [{seq_trace,42,{print,{0,1},Sender,[],"trace started"}},
+     {seq_trace,42,{send,{0,2},Sender,Self,blurf}}] =
+    [M || {seq_trace,42,_}=M <- Messages],
 
-    ?line [{seq_trace,42,{print,{0,1},Sender,[],"trace started"}},
-	   {seq_trace,42,{send,{0,2},Sender,Self,blurf}}] =
-	[M || {seq_trace,42,_}=M <- Messages],
-    
-    ?line unlink(Tracer), exit(Tracer, kill),
-    ?line unlink(Echo), exit(Echo, kill),
-    ?line unlink(Sender), exit(Sender, kill),
+    unlink(Tracer), exit(Tracer, kill),
+    unlink(Echo), exit(Echo, kill),
+    unlink(Sender), exit(Sender, kill),
     ok.
 
 t_process_info(Config) when is_list(Config) ->
     Parent = self(),
-    ?line Pid = spawn_link(fun() ->
-				   put(foo, bar),
-				   false = process_flag(sensitive, true),
-				   Parent ! go,
-				   receive
-				       revert ->
-					   true = process_flag(sensitive, false),
-					   Parent ! go_again,
-					   receive never -> ok end
-				   end end),
+    Pid = spawn_link(fun() ->
+                             put(foo, bar),
+                             false = process_flag(sensitive, true),
+                             Parent ! go,
+                             receive
+                                 revert ->
+                                     true = process_flag(sensitive, false),
+                                     Parent ! go_again,
+                                     receive never -> ok end
+                             end end),
     receive go -> ok end,
 
-    ?line put(foo, bar),
-    ?line self() ! Pid ! {i,am,a,message},
+    put(foo, bar),
+    self() ! Pid ! {i,am,a,message},
 
-    ?line false = process_flag(sensitive, true),
-    ?line t_process_info_suppressed(self()),
-    ?line t_process_info_suppressed(Pid),
+    false = process_flag(sensitive, true),
+    t_process_info_suppressed(self()),
+    t_process_info_suppressed(Pid),
 
-    ?line true = process_flag(sensitive, false),
+    true = process_flag(sensitive, false),
     Pid ! revert,
     receive go_again -> ok end,
 
-    ?line t_process_info_normal(self()),
-    ?line t_process_info_normal(Pid),
+    t_process_info_normal(self()),
+    t_process_info_normal(Pid),
     ok.
 
 t_process_info_suppressed(Pid) ->
@@ -423,7 +399,7 @@ t_process_info_suppressed(Pid) ->
 t_process_info_normal(Pid) ->
     {value,{foo,bar}} = keysearch(foo, 1, my_process_info(Pid, dictionary)),
     case process_info(Pid, backtrace) of
-	{backtrace,Bin} when size(Bin) > 20 -> ok
+        {backtrace,Bin} when size(Bin) > 20 -> ok
     end,
     [{i,am,a,message}] = my_process_info(Pid, messages).
 
@@ -431,16 +407,16 @@ my_process_info(Pid, Tag) ->
     {Tag,Value} = process_info(Pid, Tag),
     All = process_info(Pid),
     case keysearch(Tag, 1, All) of
-	false -> Value;
-	{value,{Tag,Value}} -> Value
+        false -> Value;
+        {value,{Tag,Value}} -> Value
     end.
 
 t_process_display(Config) when is_list(Config) ->
-    ?line Dir = filename:dirname(code:which(?MODULE)),
-    ?line Cmd = atom_to_list(lib:progname()) ++ " -noinput -pa " ++ Dir ++
-	" -run " ++ ?MODULE_STRING ++ " remote_process_display",
-    ?line io:put_chars(Cmd),
-    ?line P = open_port({spawn,Cmd}, [in,stderr_to_stdout,eof]),
+    Dir = filename:dirname(code:which(?MODULE)),
+    Cmd = atom_to_list(lib:progname()) ++ " -noinput -pa " ++ Dir ++
+    " -run " ++ ?MODULE_STRING ++ " remote_process_display",
+    io:put_chars(Cmd),
+    P = open_port({spawn,Cmd}, [in,stderr_to_stdout,eof]),
     <<"done",_/binary>> = get_all(P),
     ok.
 
@@ -456,27 +432,26 @@ get_all(P) ->
 
 get_all(P, Acc) ->
     receive
-	{P,{data,S}} ->
-	    get_all(P, [Acc|S]);
-	{P,eof} ->
-	    iolist_to_binary(Acc)
+        {P,{data,S}} ->
+            get_all(P, [Acc|S]);
+        {P,eof} ->
+            iolist_to_binary(Acc)
     end.
 
 save_calls(Config) when is_list(Config) ->
     process_flag(save_calls, 10),
 
     false = process_flag(sensitive, true),
-    ?line {last_calls,LastCalls} = process_info(self(), last_calls),
-    ?line [{erlang,process_flag,2}] = LastCalls,
-    ?line [2,4,6] = lists:map(fun(E) -> 2*E end, [1,2,3]),
-    ?line {last_calls,LastCalls} = process_info(self(), last_calls),
+    {last_calls,LastCalls} = process_info(self(), last_calls),
+    [{erlang,process_flag,2}] = LastCalls,
+    [2,4,6] = lists:map(fun(E) -> 2*E end, [1,2,3]),
+    {last_calls,LastCalls} = process_info(self(), last_calls),
     ok.
 
 wait_trace(Pid) ->
     Ref = erlang:trace_delivered(Pid),
     receive
-	{trace_delivered,Pid,Ref} -> ok
+        {trace_delivered,Pid,Ref} -> ok
     end.
-    
+
 id(I) -> I.
-    
diff --git a/erts/emulator/test/signal_SUITE.erl b/erts/emulator/test/signal_SUITE.erl
index 4aa690fb0f..63397fbbb4 100644
--- a/erts/emulator/test/signal_SUITE.erl
+++ b/erts/emulator/test/signal_SUITE.erl
@@ -28,12 +28,10 @@
 -module(signal_SUITE).
 -author('[email protected]').
 
--define(DEFAULT_TIMEOUT_SECONDS, 120).
-
 %-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]).
+-include_lib("common_test/include/ct.hrl").
+-export([all/0, suite/0,init_per_suite/1, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 % Test cases
 -export([xm_sig_order/1,
@@ -51,16 +49,12 @@
 	 pending_exit_group_leader/1,
 	 exit_before_pending_exit/1]).
 
--export([init_per_testcase/2, end_per_testcase/2]).
-
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(?DEFAULT_TIMEOUT_SECONDS)),
     available_internal_state(true),
-    ?line [{testcase, Func},{watchdog, Dog}|Config].
+    [{testcase, Func}|Config].
 
 end_per_testcase(_Func, Config) ->
-    ?line Dog = ?config(watchdog, Config),
-    ?line ?t:timetrap_cancel(Dog).
+    ok.
 
 init_per_suite(Config) ->
     Config.
@@ -70,7 +64,9 @@ end_per_suite(_Config) ->
     catch erts_debug:set_internal_state(not_running_optimization, true),
     available_internal_state(false).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 2}}].
 
 all() -> 
     [xm_sig_order, pending_exit_unlink_process,
@@ -83,41 +79,30 @@ all() ->
      pending_exit_process_info_2, pending_exit_group_leader,
      exit_before_pending_exit].
 
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
 
-
-xm_sig_order(doc) -> ["Test that exit signals and messages are received "
-		      "in correct order"];
-xm_sig_order(suite) -> [];
+%% Test that exit signals and messages are received in correct order
 xm_sig_order(Config) when is_list(Config) ->
-    ?line LNode = node(),
-    ?line repeat(fun () -> xm_sig_order_test(LNode) end, 1000),
-    ?line {ok, RNode} = start_node(Config),
-    ?line repeat(fun () -> xm_sig_order_test(RNode) end, 1000),
-    ?line stop_node(RNode),
-    ?line ok.
+    LNode = node(),
+    repeat(fun () -> xm_sig_order_test(LNode) end, 1000),
+    {ok, RNode} = start_node(Config),
+    repeat(fun () -> xm_sig_order_test(RNode) end, 1000),
+    stop_node(RNode),
+    ok.
     
 
 xm_sig_order_test(Node) ->
-    ?line P = spawn(Node, fun () -> xm_sig_order_proc() end),
-    ?line M = erlang:monitor(process, P),
-    ?line P ! may_reach,
-    ?line P ! may_reach,
-    ?line P ! may_reach,
-    ?line exit(P, good_signal_order),
-    ?line P ! may_not_reach,
-    ?line P ! may_not_reach,
-    ?line P ! may_not_reach,
-    ?line receive
+    P = spawn(Node, fun () -> xm_sig_order_proc() end),
+    M = erlang:monitor(process, P),
+    P ! may_reach,
+    P ! may_reach,
+    P ! may_reach,
+    exit(P, good_signal_order),
+    P ! may_not_reach,
+    P ! may_not_reach,
+    P ! may_not_reach,
+    receive
 	      {'DOWN', M, process, P, R} ->
-		  ?line good_signal_order = R
+		  good_signal_order = R
 	  end.
 
 xm_sig_order_proc() ->
@@ -128,168 +113,149 @@ xm_sig_order_proc() ->
     end,
     xm_sig_order_proc().
 
-pending_exit_unlink_process(doc) -> [];
-pending_exit_unlink_process(suite) -> [];
 pending_exit_unlink_process(Config) when is_list(Config) ->
-    ?line pending_exit_test(self(), unlink).
+    pending_exit_test(self(), unlink).
 
-pending_exit_unlink_dist_process(doc) -> [];
-pending_exit_unlink_dist_process(suite) -> [];
 pending_exit_unlink_dist_process(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_node(Config),
-    ?line From = spawn(Node, fun () -> receive after infinity -> ok end end),
-    ?line Res = pending_exit_test(From, unlink),
-    ?line stop_node(Node),
-    ?line Res.
-
-pending_exit_unlink_port(doc) -> [];
-pending_exit_unlink_port(suite) -> [];
+    {ok, Node} = start_node(Config),
+    From = spawn(Node, fun () -> receive after infinity -> ok end end),
+    Res = pending_exit_test(From, unlink),
+    stop_node(Node),
+    Res.
+
 pending_exit_unlink_port(Config) when is_list(Config) ->
-    ?line pending_exit_test(hd(erlang:ports()), unlink).
+    pending_exit_test(hd(erlang:ports()), unlink).
 
-pending_exit_trap_exit(doc) -> [];
-pending_exit_trap_exit(suite) -> [];
 pending_exit_trap_exit(Config) when is_list(Config) ->
-    ?line pending_exit_test(self(), trap_exit).
+    pending_exit_test(self(), trap_exit).
 
-pending_exit_receive(doc) -> [];
-pending_exit_receive(suite) -> [];
 pending_exit_receive(Config) when is_list(Config) ->
-    ?line pending_exit_test(self(), 'receive').
+    pending_exit_test(self(), 'receive').
 
-pending_exit_exit(doc) -> [];
-pending_exit_exit(suite) -> [];
 pending_exit_exit(Config) when is_list(Config) ->
-    ?line pending_exit_test(self(), exit).
+    pending_exit_test(self(), exit).
 
-pending_exit_gc(doc) -> [];
-pending_exit_gc(suite) -> [];
 pending_exit_gc(Config) when is_list(Config) ->
-    ?line pending_exit_test(self(), gc).
+    pending_exit_test(self(), gc).
 
 pending_exit_test(From, Type) ->
-    ?line case catch erlang:system_info(smp_support) of
-	      true ->
-		  ?line OTE = process_flag(trap_exit, true),
-		  ?line Ref = make_ref(),
-		  ?line Master = self(),
-		  ?line ExitBySignal = case Type of
-					   gc ->
-					       lists:duplicate(10000,
-							       exit_by_signal);
-					   _ ->
-					       exit_by_signal
-				       end,
-		  ?line Pid = spawn_link(
-				fun () ->
-					receive go -> ok end,
-					false = have_pending_exit(),
-					exit = fake_exit(From,
-							 self(),
-							 ExitBySignal),
-					true = have_pending_exit(),
-					Master ! {self(), Ref, Type},
-					case Type of
-					    gc ->
-						force_gc(),
-						erlang:yield();
-					    unlink ->
-						unlink(From);
-					    trap_exit ->
-						process_flag(trap_exit, true);
-					    'receive' ->
-						receive _ -> ok
-						after 0 -> ok
-						end;
-					    exit ->
-						ok
-					end,
-					exit(exit_by_myself)
-				end),
-		  ?line Mon = erlang:monitor(process, Pid),
-		  ?line Pid ! go,
-		  ?line Reason = receive
-				     {'DOWN', Mon, process, Pid, R} ->
-					 ?line receive
-						   {Pid, Ref, Type} ->
-						       ?line ok
-					       after 0 ->
-						       ?line ?t:fail(premature_exit)
-					       end,
-					 ?line case Type of
-						   exit ->
-						       ?line exit_by_myself = R;
-						   _ ->
-						       ?line ExitBySignal = R
-					       end
-				 end,
-		  ?line receive
-			    {'EXIT', Pid, R2} ->
-				?line Reason = R2
-			end,
-		  ?line process_flag(trap_exit, OTE),
-		  ?line ok,
-		  {comment,
-		   "Test only valid with current SMP emulator."};
-	      _ ->
-		  {skipped,
-		   "SMP support not enabled. "
-		   "Test only valid with current SMP emulator."}
-	  end.
+    case catch erlang:system_info(smp_support) of
+        true ->
+            OTE = process_flag(trap_exit, true),
+            Ref = make_ref(),
+            Master = self(),
+            ExitBySignal = case Type of
+                               gc ->
+                                   lists:duplicate(10000,
+                                                   exit_by_signal);
+                               _ ->
+                                   exit_by_signal
+                           end,
+            Pid = spawn_link(
+                    fun () ->
+                            receive go -> ok end,
+                            false = have_pending_exit(),
+                            exit = fake_exit(From,
+                                             self(),
+                                             ExitBySignal),
+                            true = have_pending_exit(),
+                            Master ! {self(), Ref, Type},
+                            case Type of
+                                gc ->
+                                    force_gc(),
+                                    erlang:yield();
+                                unlink ->
+                                    unlink(From);
+                                trap_exit ->
+                                    process_flag(trap_exit, true);
+                                'receive' ->
+                                    receive _ -> ok
+                                    after 0 -> ok
+                                    end;
+                                exit ->
+                                    ok
+                            end,
+                            exit(exit_by_myself)
+                    end),
+            Mon = erlang:monitor(process, Pid),
+            Pid ! go,
+            Reason = receive
+                         {'DOWN', Mon, process, Pid, R} ->
+                             receive
+                                 {Pid, Ref, Type} ->
+                                     ok
+                             after 0 ->
+                                       ct:fail(premature_exit)
+                             end,
+                             case Type of
+                                 exit ->
+                                     exit_by_myself = R;
+                                 _ ->
+                                     ExitBySignal = R
+                             end
+                     end,
+            receive
+                {'EXIT', Pid, R2} ->
+                    Reason = R2
+            end,
+            process_flag(trap_exit, OTE),
+            ok,
+            {comment, "Test only valid with current SMP emulator."};
+        _ ->
+            {skipped, "SMP support not enabled. Test only valid with current SMP emulator."}
+    end.
 
 
 
-exit_before_pending_exit(doc) -> [];
-exit_before_pending_exit(suite) -> [];
 exit_before_pending_exit(Config) when is_list(Config) ->
     %% This is a testcase testcase very specific to the smp
     %% implementation as it is of the time of writing.
     %%
     %% The testcase tries to check that a process can
     %% exit by itself even though it has a pending exit.
-    ?line OTE = process_flag(trap_exit, true),
-    ?line Master = self(),
-    ?line Tester = spawn_link(
-		     fun () ->
-			     Opts = case {erlang:system_info(run_queues),
-					  erlang:system_info(schedulers_online)} of
-					{RQ, SO} when RQ =:= 1; SO =:= 1 -> [];
-					_ ->
-					    process_flag(scheduler, 1),
-					    [{scheduler, 2}]
-				    end,
-			     P = self(),
-			     Exiter = spawn_opt(fun () ->
-							receive
-							    {exit_me, P, R} ->
-								exit(P, R)
-							end
-						end, Opts),
-			     erlang:yield(),
-			     Exiter ! {exit_me, self(), exited_by_exiter},
-			     %% We want to get a pending exit
-			     %% before we exit ourselves. We
-			     %% don't want to be scheduled out
-			     %% since we will then see the
-			     %% pending exit.
-			     %%
-			     %% Do something that takes
-			     %% relatively long time but
-			     %% consumes few reductions...
-			     repeat(fun() -> erlang:system_info(procs) end,10),
-			     %% ... then exit.
-			     Master ! {self(),
-				       pending_exit,
-				       have_pending_exit()},
-			     exit(exited_by_myself)
-		     end),
-    ?line PendingExit = receive {Tester, pending_exit, PE} -> PE end,
-    ?line receive
+    OTE = process_flag(trap_exit, true),
+    Master = self(),
+    Tester = spawn_link(
+               fun () ->
+                       Opts = case {erlang:system_info(run_queues),
+                                    erlang:system_info(schedulers_online)} of
+                                  {RQ, SO} when RQ =:= 1; SO =:= 1 -> [];
+                                  _ ->
+                                      process_flag(scheduler, 1),
+                                      [{scheduler, 2}]
+                              end,
+                       P = self(),
+                       Exiter = spawn_opt(fun () ->
+                                                  receive
+                                                      {exit_me, P, R} ->
+                                                          exit(P, R)
+                                                  end
+                                          end, Opts),
+                       erlang:yield(),
+                       Exiter ! {exit_me, self(), exited_by_exiter},
+                       %% We want to get a pending exit
+                       %% before we exit ourselves. We
+                       %% don't want to be scheduled out
+                       %% since we will then see the
+                       %% pending exit.
+                       %%
+                       %% Do something that takes
+                       %% relatively long time but
+                       %% consumes few reductions...
+                       repeat(fun() -> erlang:system_info(procs) end,10),
+                       %% ... then exit.
+                       Master ! {self(),
+                                 pending_exit,
+                                 have_pending_exit()},
+                       exit(exited_by_myself)
+               end),
+    PendingExit = receive {Tester, pending_exit, PE} -> PE end,
+    receive
 	      {'EXIT', Tester, exited_by_myself} ->
-		  ?line process_flag(trap_exit, OTE),
-		  ?line ok;
+		  process_flag(trap_exit, OTE),
+		  ok;
 	      Msg ->
-		  ?line ?t:fail({unexpected_message, Msg})
+		  ct:fail({unexpected_message, Msg})
 	  end,
     NoScheds = integer_to_list(erlang:system_info(schedulers_online)),
     {comment,
@@ -304,101 +270,101 @@ exit_before_pending_exit(Config) when is_list(Config) ->
 -define(PE_INFO_REPEAT, 100).
 
 pending_exit_is_process_alive(Config) when is_list(Config) ->
-    ?line S = exit_op_test_init(),
-    ?line TestFun = fun (P) -> false = is_process_alive(P) end,
-    ?line repeated_exit_op_test(TestFun, ?PE_INFO_REPEAT),
-    ?line verify_pending_exit_success(S),
-    ?line comment().
+    S = exit_op_test_init(),
+    TestFun = fun (P) -> false = is_process_alive(P) end,
+    repeated_exit_op_test(TestFun, ?PE_INFO_REPEAT),
+    verify_pending_exit_success(S),
+    comment().
 
 pending_exit_process_info_1(Config) when is_list(Config) ->
-    ?line S = exit_op_test_init(),
-    ?line TestFun = fun (P) ->
+    S = exit_op_test_init(),
+    TestFun = fun (P) ->
 			    undefined = process_info(P)
 		    end,
-    ?line repeated_exit_op_test(TestFun, ?PE_INFO_REPEAT),
-    ?line verify_pending_exit_success(S),
-    ?line comment().
+    repeated_exit_op_test(TestFun, ?PE_INFO_REPEAT),
+    verify_pending_exit_success(S),
+    comment().
 
 pending_exit_process_info_2(Config) when is_list(Config) ->
-    ?line S0 = exit_op_test_init(),
-    ?line repeated_exit_op_test(fun (P) ->
+    S0 = exit_op_test_init(),
+    repeated_exit_op_test(fun (P) ->
 					undefined = process_info(P, messages)
 				end, ?PE_INFO_REPEAT),
-    ?line S1 = verify_pending_exit_success(S0),
-    ?line repeated_exit_op_test(fun (P) ->
+    S1 = verify_pending_exit_success(S0),
+    repeated_exit_op_test(fun (P) ->
 					undefined = process_info(P, status)
 				end, ?PE_INFO_REPEAT),
-    ?line S2 = verify_pending_exit_success(S1),
-    ?line repeated_exit_op_test(fun (P) ->
+    S2 = verify_pending_exit_success(S1),
+    repeated_exit_op_test(fun (P) ->
 					undefined = process_info(P, links)
 				end, ?PE_INFO_REPEAT),
-    ?line S3 = verify_pending_exit_success(S2),
-    ?line repeated_exit_op_test(fun (P) ->
+    S3 = verify_pending_exit_success(S2),
+    repeated_exit_op_test(fun (P) ->
 					undefined = process_info(P, [messages])
 				end, ?PE_INFO_REPEAT),
-    ?line S4 = verify_pending_exit_success(S3),
-    ?line repeated_exit_op_test(fun (P) ->
+    S4 = verify_pending_exit_success(S3),
+    repeated_exit_op_test(fun (P) ->
 					undefined = process_info(P, [status])
 				end, ?PE_INFO_REPEAT),
-    ?line S5 = verify_pending_exit_success(S4),
-    ?line repeated_exit_op_test(fun (P) ->
+    S5 = verify_pending_exit_success(S4),
+    repeated_exit_op_test(fun (P) ->
 					undefined = process_info(P, [links])
 				end, ?PE_INFO_REPEAT),
-    ?line S6 = verify_pending_exit_success(S5),
-    ?line repeated_exit_op_test(fun (P) ->
+    S6 = verify_pending_exit_success(S5),
+    repeated_exit_op_test(fun (P) ->
 					undefined = process_info(P, [status,
 								     links])
 				end, ?PE_INFO_REPEAT),
-    ?line S7 = verify_pending_exit_success(S6),
-    ?line repeated_exit_op_test(fun (P) ->
+    S7 = verify_pending_exit_success(S6),
+    repeated_exit_op_test(fun (P) ->
 					undefined = process_info(P, [messages,
 								     status])
 				end, ?PE_INFO_REPEAT),
-    ?line S8 = verify_pending_exit_success(S7),
-    ?line repeated_exit_op_test(fun (P) ->
+    S8 = verify_pending_exit_success(S7),
+    repeated_exit_op_test(fun (P) ->
 					undefined = process_info(P, [messages,
 								     links])
 				end, ?PE_INFO_REPEAT),
-    ?line S9 = verify_pending_exit_success(S8),
-    ?line repeated_exit_op_test(
+    S9 = verify_pending_exit_success(S8),
+    repeated_exit_op_test(
 	    fun (P) ->
 		    undefined = process_info(P, [message_queue_len,
 						 status])
 	    end, ?PE_INFO_REPEAT),
-    ?line S10 = verify_pending_exit_success(S9),
-    ?line repeated_exit_op_test(fun (P) ->
+    S10 = verify_pending_exit_success(S9),
+    repeated_exit_op_test(fun (P) ->
 					undefined = process_info(P, [messages,
 								     links,
 								     status])
 				end, ?PE_INFO_REPEAT),
-    ?line verify_pending_exit_success(S10),
-    ?line comment().
+    verify_pending_exit_success(S10),
+    comment().
 
 pending_exit_process_display(Config) when is_list(Config) ->
-    ?line S = exit_op_test_init(),
-    ?line TestFun = fun (P) ->
+    S = exit_op_test_init(),
+    TestFun = fun (P) ->
 			    badarg = try
 					 erlang:process_display(P, backtrace)
 				     catch
 					 error:badarg -> badarg
 				     end
 		    end,
-    ?line repeated_exit_op_test(TestFun, ?PE_INFO_REPEAT),
-    ?line verify_pending_exit_success(S),
-    ?line comment().
+    repeated_exit_op_test(TestFun, ?PE_INFO_REPEAT),
+    verify_pending_exit_success(S),
+    comment().
 
 pending_exit_group_leader(Config) when is_list(Config) ->
-    ?line S = exit_op_test_init(),
-    ?line TestFun = fun (P) ->
+    S = exit_op_test_init(),
+    TestFun = fun (P) ->
 			    badarg = try
 					 group_leader(self(), P)
 				     catch
 					 error:badarg -> badarg
 				     end
 		    end,
-    ?line repeated_exit_op_test(TestFun, ?PE_INFO_REPEAT),
-    ?line verify_pending_exit_success(S),
-    ?line comment().
+    repeated_exit_op_test(TestFun, ?PE_INFO_REPEAT),
+    verify_pending_exit_success(S),
+    comment().
 
 %%
 %% -- Internal utils --------------------------------------------------------
@@ -517,14 +483,14 @@ repeat(Fun, N) when is_integer(N)  ->
 
 start_node(Config) ->
     Name = list_to_atom(atom_to_list(?MODULE)
-			++ "-" ++ atom_to_list(?config(testcase, Config))
+			++ "-" ++ atom_to_list(proplists:get_value(testcase, Config))
 			++ "-" ++ integer_to_list(erlang:system_time(seconds))
 			++ "-" ++ integer_to_list(erlang:unique_integer([positive]))),
     Pa = filename:dirname(code:which(?MODULE)),
-    ?t:start_node(Name, slave, [{args,  "-pa " ++ Pa}]).
+    test_server:start_node(Name, slave, [{args,  "-pa " ++ Pa}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 have_pending_exit() ->
     have_pending_exit(self()).
@@ -540,15 +506,15 @@ fake_exit(From, To, Reason) ->
 
 available_internal_state(Bool) when Bool == true; Bool == false ->
     case {Bool,
-	  (catch erts_debug:get_internal_state(available_internal_state))} of
-	{true, true} ->
-	    true;
-	{false, true} ->
-	    erts_debug:set_internal_state(available_internal_state, false),
-	    true;
-	{true, _} ->
-	    erts_debug:set_internal_state(available_internal_state, true),
-	    false;
-	{false, _} ->
-	    false
+          (catch erts_debug:get_internal_state(available_internal_state))} of
+        {true, true} ->
+            true;
+        {false, true} ->
+            erts_debug:set_internal_state(available_internal_state, false),
+            true;
+        {true, _} ->
+            erts_debug:set_internal_state(available_internal_state, true),
+            false;
+        {false, _} ->
+            false
     end.
diff --git a/erts/emulator/test/smoke_test_SUITE.erl b/erts/emulator/test/smoke_test_SUITE.erl
index 5bb98e5ad9..900dd124c0 100644
--- a/erts/emulator/test/smoke_test_SUITE.erl
+++ b/erts/emulator/test/smoke_test_SUITE.erl
@@ -20,38 +20,21 @@
 
 -module(smoke_test_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %-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, 
+-export([all/0, suite/0,
 	 init_per_testcase/2, end_per_testcase/2]).
 
 -export([boot_combo/1, native_atomics/1, jump_table/1]).
 
--define(DEFAULT_TIMEOUT, ?t:minutes(2)).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 2}}].
 
 all() -> 
     [boot_combo, native_atomics, jump_table].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 init_per_testcase(boot_combo = Case, Config) when is_list(Config) ->
     case erlang:system_info(build_type) of
 	opt ->
@@ -63,12 +46,9 @@ init_per_testcase(Case, Config) when is_list(Config) ->
     init_per_tc(Case, Config).
 
 init_per_tc(Case, Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
-    [{testcase, Case},{watchdog, Dog}|Config].
+    [{testcase, Case}|Config].
 
 end_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
     ok.
 
 %%%
@@ -111,13 +91,13 @@ native_atomics(Config) when is_list(Config) ->
     NA64Key = "64-bit native atomics",
     DWNAKey = "Double word native atomics",
     EthreadInfo = erlang:system_info(ethread_info),
-    ?t:format("~p~n", [EthreadInfo]),
+    io:format("~p~n", [EthreadInfo]),
     {value,{NA32Key, NA32, _}} = lists:keysearch(NA32Key, 1, EthreadInfo),
     {value,{NA64Key, NA64, _}} = lists:keysearch(NA64Key, 1, EthreadInfo),
     {value,{DWNAKey, DWNA, _}} = lists:keysearch(DWNAKey, 1, EthreadInfo),
     case {erlang:system_info(build_type), erlang:system_info(smp_support), NA32, NA64, DWNA} of
 	{opt, true, "no", "no", _} ->
-	    ?t:fail(optimized_smp_runtime_without_native_atomics);
+	    ct:fail(optimized_smp_runtime_without_native_atomics);
 	{_, false, "no", "no", _} ->
 	    {comment, "No native atomics"};
 	_ ->
@@ -134,7 +114,7 @@ jump_table(Config) when is_list(Config) ->
 	false ->
 	    case erlang:system_info(build_type) of
 		opt ->
-		    ?t:fail(optimized_without_beam_jump_table);
+		    ct:fail(optimized_without_beam_jump_table);
 		BT ->
 		    {comment, "No beam jump table, but build type is " ++ atom_to_list(BT)}
 	    end
@@ -149,7 +129,7 @@ chk_boot(Config, Args, Fun) ->
     true = os:putenv("ERL_ZFLAGS", Args),
     Success = make_ref(),
     Parent = self(),
-    ?t:format("--- Testing ~s~n", [Args]),
+    io:format("--- Testing ~s~n", [Args]),
     {ok, Node} = start_node(Config),
     Pid = spawn_link(Node, fun () ->
 				   Fun(),
@@ -159,7 +139,7 @@ chk_boot(Config, Args, Fun) ->
 	{Pid, Success} ->
 	    Node = node(Pid),
 	    stop_node(Node),
-	    ?t:format("--- Success!~n", []),
+	    io:format("--- Success!~n", []),
 	    ok
     end.
 
@@ -170,14 +150,14 @@ start_node(Config, Args) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
 	      ++ "-"
-	      ++ atom_to_list(?config(testcase, Config))
+	      ++ atom_to_list(proplists:get_value(testcase, Config))
 	      ++ "-"
 	      ++ integer_to_list(erlang:system_time(seconds))
 	      ++ "-"
 	      ++ integer_to_list(erlang:unique_integer([positive]))),
     Opts = [{args, "-pa "++Pa++" "++Args}],
-    ?t:start_node(Name, slave, Opts).
+    test_server:start_node(Name, slave, Opts).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
diff --git a/erts/emulator/test/statistics_SUITE.erl b/erts/emulator/test/statistics_SUITE.erl
index 53c9ba8715..7d5b07f21f 100644
--- a/erts/emulator/test/statistics_SUITE.erl
+++ b/erts/emulator/test/statistics_SUITE.erl
@@ -22,40 +22,31 @@
 
 %% Tests the statistics/1 bif.
 
--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,
 	 wall_clock_zero_diff/1, wall_clock_update/1,
 	 runtime_zero_diff/1,
 	 runtime_update/1, runtime_diff/1,
 	 run_queue_one/1,
 	 scheduler_wall_time/1,
 	 reductions/1, reductions_big/1, garbage_collection/1, io/1,
-	 badarg/1, run_queues_lengths_active_tasks/1]).
+	 badarg/1, run_queues_lengths_active_tasks/1, msacc/1]).
 
 %% Internal exports.
 
 -export([hog/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-init_per_testcase(_, Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(300)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 4}}].
 
 all() -> 
     [{group, wall_clock}, {group, runtime}, reductions,
      reductions_big, {group, run_queue}, scheduler_wall_time,
      garbage_collection, io, badarg,
-     run_queues_lengths_active_tasks].
+     run_queues_lengths_active_tasks,
+     msacc].
 
 groups() -> 
     [{wall_clock, [],
@@ -64,61 +55,42 @@ groups() ->
       [runtime_zero_diff, runtime_update, runtime_diff]},
      {run_queue, [], [run_queue_one]}].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-
 %%% Testing statistics(wall_clock).
 
-
-
-wall_clock_zero_diff(doc) ->
-    "Tests that the 'Wall clock since last call' element of the result "
-    "is zero when statistics(runtime) is called twice in succession.";
+%% Tests that the 'Wall clock since last call' element of the result
+%% is zero when statistics(runtime) is called twice in succession.
 wall_clock_zero_diff(Config) when is_list(Config) ->
     wall_clock_zero_diff1(16).
 
 wall_clock_zero_diff1(N) when N > 0 ->
-    ?line {Time, _} = statistics(wall_clock),
-    ?line case statistics(wall_clock) of
-	      {Time, 0} -> ok;
-	      _ -> wall_clock_zero_diff1(N-1)
+    {Time, _} = statistics(wall_clock),
+    case statistics(wall_clock) of
+        {Time, 0} -> ok;
+        _ -> wall_clock_zero_diff1(N-1)
     end;
 wall_clock_zero_diff1(0) ->
-    ?line test_server:fail("Difference never zero.").
+    ct:fail("Difference never zero.").
 
-wall_clock_update(doc) ->
-    "Test that the time differences returned by two calls to "
-    "statistics(wall_clock) are compatible, and are within a small number "
-    "of ms of the amount of real time we waited for.";
+%% Test that the time differences returned by two calls to
+%% statistics(wall_clock) are compatible, and are within a small number
+%% of ms of the amount of real time we waited for.
 wall_clock_update(Config) when is_list(Config) ->
     wall_clock_update1(6).
 
 wall_clock_update1(N) when N > 0 ->
-    ?line {T1_wc_time, _} = statistics(wall_clock),
-    ?line receive after 1000 -> ok end,
-    ?line {T2_wc_time, Wc_Diff} = statistics(wall_clock),
-
-    ?line Wc_Diff = T2_wc_time - T1_wc_time,
-    ?line test_server:format("Wall clock diff = ~p; should be  = 1000..1040~n",
-			     [Wc_Diff]),
-    case ?t:is_debug() of
-	false ->
-	    ?line true = Wc_Diff =< 1040;
-	true ->
-	    ?line true = Wc_Diff =< 2000	%Be more tolerant in debug-compiled emulator.
+    {T1_wc_time, _} = statistics(wall_clock),
+    receive after 1000 -> ok end,
+    {T2_wc_time, Wc_Diff} = statistics(wall_clock),
+
+    Wc_Diff = T2_wc_time - T1_wc_time,
+    io:format("Wall clock diff = ~p; should be  = 1000..1040~n", [Wc_Diff]),
+    case test_server:is_debug() of
+        false ->
+            true = Wc_Diff =< 1040;
+        true ->
+            true = Wc_Diff =< 2000	%Be more tolerant in debug-compiled emulator.
     end,
-    ?line true = Wc_Diff >= 1000,
+    true = Wc_Diff >= 1000,
     wall_clock_update1(N-1);
 wall_clock_update1(0) ->
     ok.
@@ -127,64 +99,60 @@ wall_clock_update1(0) ->
 %%% Test statistics(runtime).
 
 
-runtime_zero_diff(doc) ->
-    "Tests that the difference between the times returned from two consectuitive "
-	"calls to statistics(runtime) is zero.";
+%% Tests that the difference between the times returned from two consectuitive
+%% calls to statistics(runtime) is zero.
 runtime_zero_diff(Config) when is_list(Config) ->
-    ?line runtime_zero_diff1(16).
+    runtime_zero_diff1(16).
 
 runtime_zero_diff1(N) when N > 0 ->
-    ?line {T1, _} = statistics(runtime),
-    ?line case statistics(runtime) of
-	      {T1, 0} -> ok;
-	      _ -> runtime_zero_diff1(N-1)
-	  end;
+    {T1, _} = statistics(runtime),
+    case statistics(runtime) of
+        {T1, 0} -> ok;
+        _ -> runtime_zero_diff1(N-1)
+    end;
 runtime_zero_diff1(0) ->
-    ?line test_server:fail("statistics(runtime) never returned zero difference").
+    ct:fail("statistics(runtime) never returned zero difference").
 
-runtime_update(doc) ->
-    "Test that the statistics(runtime) returns a substanstially "
-	"updated difference after running a process that takes all CPU "
-	" power of the Erlang process for a second.";
+%% Test that the statistics(runtime) returns a substanstially
+%% updated difference after running a process that takes all CPU
+%% power of the Erlang process for a second.
 runtime_update(Config) when is_list(Config) ->
-    case ?t:is_cover() of
-	false ->
-	    ?line process_flag(priority, high),
-	    do_runtime_update(10);
-	true ->
-	    {skip,"Cover-compiled"}
+    case test_server:is_cover() of
+        false ->
+            process_flag(priority, high),
+            do_runtime_update(10);
+        true ->
+            {skip,"Cover-compiled"}
     end.
 
 do_runtime_update(0) ->
     {comment,"Never close enough"};
 do_runtime_update(N) ->
-    ?line {T1,Diff0} = statistics(runtime),
-    ?line spawn_link(fun cpu_heavy/0),
+    {T1,Diff0} = statistics(runtime),
+    spawn_link(fun cpu_heavy/0),
     receive after 1000 -> ok end,
-    ?line {T2,Diff} = statistics(runtime),
-    ?line true = is_integer(T1+T2+Diff0+Diff),
-    ?line test_server:format("T1 = ~p, T2 = ~p, Diff = ~p, T2-T1 = ~p",
-			     [T1,T2,Diff,T2-T1]),
-    ?line if
-	      T2 - T1 =:= Diff, 900 =< Diff, Diff =< 1500 -> ok;
-	      true -> do_runtime_update(N-1)
-	  end.
-    
+    {T2,Diff} = statistics(runtime),
+    true = is_integer(T1+T2+Diff0+Diff),
+    io:format("T1 = ~p, T2 = ~p, Diff = ~p, T2-T1 = ~p", [T1,T2,Diff,T2-T1]),
+    if
+        T2 - T1 =:= Diff, 900 =< Diff, Diff =< 1500 -> ok;
+        true -> do_runtime_update(N-1)
+    end.
+
 cpu_heavy() ->
     cpu_heavy().
 
-runtime_diff(doc) ->
-    "Test that the difference between two consecutive absolute runtimes is "
-    "equal to the last relative runtime. The loop runs a lot of times since "
-    "the bug which this test case tests for showed up only rarely.";
+%% Test that the difference between two consecutive absolute runtimes is
+%% equal to the last relative runtime. The loop runs a lot of times since
+%% the bug which this test case tests for showed up only rarely.
 runtime_diff(Config) when is_list(Config) ->
     runtime_diff1(1000).
 
 runtime_diff1(N) when N > 0 ->
-    ?line {T1_wc_time, _} = statistics(runtime),
-    ?line do_much(),
-    ?line {T2_wc_time, Wc_Diff} = statistics(runtime),
-    ?line Wc_Diff = T2_wc_time - T1_wc_time,
+    {T1_wc_time, _} = statistics(runtime),
+    do_much(),
+    {T2_wc_time, Wc_Diff} = statistics(runtime),
+    Wc_Diff = T2_wc_time - T1_wc_time,
     runtime_diff1(N-1);
 runtime_diff1(0) ->
     ok.
@@ -202,10 +170,9 @@ do_much(N) ->
     do_much(N-1).
 
 
-reductions(doc) ->
-    "Test that statistics(reductions) is callable, and that "
-	"Total_Reductions and Reductions_Since_Last_Call make sense. "
-	"(This to fail on pre-R3A version of JAM.";
+%% Test that statistics(reductions) is callable, and that
+%% Total_Reductions and Reductions_Since_Last_Call make sense.
+%% This to fail on pre-R3A version of JAM.
 reductions(Config) when is_list(Config) ->
     {Reductions, _} = statistics(reductions),
 
@@ -218,13 +185,13 @@ reductions(Config) when is_list(Config) ->
     reductions(300, Reductions, Mask).
 
 reductions(N, Previous, Mask) when N > 0 ->
-    ?line {Reductions, Diff} = statistics(reductions),
-    ?line build_some_garbage(),
-    ?line if Reductions > 0 -> ok end,
-    ?line if Diff >= 0 -> ok end,
+    {Reductions, Diff} = statistics(reductions),
+    build_some_garbage(),
+    if Reductions > 0 -> ok end,
+    if Diff >= 0 -> ok end,
     io:format("Previous = ~p, Reductions = ~p, Diff = ~p, DiffShouldBe = ~p",
-	      [Previous, Reductions, Diff, (Reductions-Previous) band Mask]),
-    ?line if Reductions == ((Previous+Diff) band Mask) -> reductions(N-1, Reductions, Mask) end;
+              [Previous, Reductions, Diff, (Reductions-Previous) band Mask]),
+    if Reductions == ((Previous+Diff) band Mask) -> reductions(N-1, Reductions, Mask) end;
 reductions(0, _, _) ->
     ok.
 
@@ -233,126 +200,123 @@ build_some_garbage() ->
     %% a garbage collection in the scheduler.
     processes().
 
-reductions_big(doc) ->
-    "Test that the number of reductions can be returned as a big number.";
+%% Test that the number of reductions can be returned as a big number.
 reductions_big(Config) when is_list(Config) ->
-    ?line reductions_big_loop(),
+    reductions_big_loop(),
     ok.
 
 reductions_big_loop() ->
     erlang:yield(),
     case statistics(reductions) of
-	{Red, Diff} when Red >= 16#7ffFFFF ->
-	    ok = io:format("Reductions = ~w, Diff = ~w", [Red, Diff]);
-	_ ->
-	    reductions_big_loop()
+        {Red, Diff} when Red >= 16#7ffFFFF ->
+            ok = io:format("Reductions = ~w, Diff = ~w", [Red, Diff]);
+        _ ->
+            reductions_big_loop()
     end.
 
 
 %%% Tests of statistics(run_queue).
 
 
-run_queue_one(doc) ->
-    "Tests that statistics(run_queue) returns 1 if we start a "
-    "CPU-bound process.";
+%% Tests that statistics(run_queue) returns 1 if we start a
+%% CPU-bound process.
 run_queue_one(Config) when is_list(Config) ->
-    ?line MS = erlang:system_flag(multi_scheduling, block),
-    ?line run_queue_one_test(Config),
-    ?line erlang:system_flag(multi_scheduling, unblock),
+    MS = erlang:system_flag(multi_scheduling, block),
+    run_queue_one_test(Config),
+    erlang:system_flag(multi_scheduling, unblock),
     case MS of
-	blocked ->
-	    {comment,
-	     "Multi-scheduling blocked during test. This test-case "
-	     "was not written to work with multiple schedulers."};
-	_ -> ok
+        blocked ->
+            {comment,
+             "Multi-scheduling blocked during test. This test-case "
+             "was not written to work with multiple schedulers."};
+        _ -> ok
     end.
-    
+
 
 run_queue_one_test(Config) when is_list(Config) ->
-    ?line _Hog = spawn_link(?MODULE, hog, [self()]),
-    ?line receive
-	      hog_started -> ok
-	  end,
-    ?line receive after 100 -> ok end,		% Give hog a head start.
-    ?line case statistics(run_queue) of
-	      N when N >= 1 -> ok;
-	      Other -> ?line ?t:fail({unexpected,Other})
-	  end,
+    _Hog = spawn_link(?MODULE, hog, [self()]),
+    receive
+        hog_started -> ok
+    end,
+    receive after 100 -> ok end,		% Give hog a head start.
+    case statistics(run_queue) of
+        N when N >= 1 -> ok;
+        Other -> ct:fail({unexpected,Other})
+    end,
     ok.
 
 %% CPU-bound process, going at low priority.  It will always be ready
 %% to run.
 
 hog(Pid) ->
-    ?line process_flag(priority, low),
-    ?line Pid ! hog_started,
-    ?line Mon = erlang:monitor(process, Pid),
-    ?line hog_iter(0, Mon).
+    process_flag(priority, low),
+    Pid ! hog_started,
+    Mon = erlang:monitor(process, Pid),
+    hog_iter(0, Mon).
 
 hog_iter(N, Mon) when N > 0 ->
     receive
-	{'DOWN', Mon, _, _, _} ->  ok
+        {'DOWN', Mon, _, _, _} ->  ok
     after 0 ->
-	    ?line hog_iter(N-1, Mon)
+              hog_iter(N-1, Mon)
     end;
 hog_iter(0, Mon) ->
-    ?line hog_iter(10000, Mon).
+    hog_iter(10000, Mon).
 
 %%% Tests of statistics(scheduler_wall_time).
 
-scheduler_wall_time(doc) ->
-    "Tests that statistics(scheduler_wall_time) works as intended";
+%% Tests that statistics(scheduler_wall_time) works as intended
 scheduler_wall_time(Config) when is_list(Config) ->
     %% Should return undefined if system_flag is not turned on yet
     undefined = statistics(scheduler_wall_time),
     %% Turn on statistics
     false = erlang:system_flag(scheduler_wall_time, true),
     try
-	Schedulers = erlang:system_info(schedulers_online),
-	%% Let testserver and everyone else finish their work
-	timer:sleep(1500),
-	%% Empty load
-	EmptyLoad = get_load(),
-	{false, _} = {lists:any(fun(Load) -> Load > 50 end, EmptyLoad),EmptyLoad},
-	MeMySelfAndI = self(),
-	StartHog = fun() ->
-			   Pid = spawn(?MODULE, hog, [self()]),
-			   receive hog_started -> MeMySelfAndI ! go end,
-			   Pid
-		   end,
-	P1 = StartHog(),
-	%% Max on one, the other schedulers empty (hopefully)
-	%% Be generous the process can jump between schedulers
-	%% which is ok and we don't want the test to fail for wrong reasons
-	_L1 = [S1Load|EmptyScheds1] = get_load(),
-	{true,_}  = {S1Load > 50,S1Load},
-	{false,_} = {lists:any(fun(Load) -> Load > 50 end, EmptyScheds1),EmptyScheds1},
-	{true,_}  = {lists:sum(EmptyScheds1) < 60,EmptyScheds1},
-
-	%% 50% load
-	HalfHogs = [StartHog() || _ <- lists:seq(1, (Schedulers-1) div 2)],
-	HalfLoad = lists:sum(get_load()) div Schedulers,
-	if Schedulers < 2, HalfLoad > 80 -> ok; %% Ok only one scheduler online and one hog
-	   %% We want roughly 50% load
-	   HalfLoad > 40, HalfLoad < 60 -> ok;
-	   true -> exit({halfload, HalfLoad})
-	end,
-
-	%% 100% load
-	LastHogs = [StartHog() || _ <- lists:seq(1, Schedulers div 2)],
-	FullScheds = get_load(),
-	{false,_} = {lists:any(fun(Load) -> Load < 80 end, FullScheds),FullScheds},
-	FullLoad = lists:sum(FullScheds) div Schedulers,
-	if FullLoad > 90 -> ok;
-	   true -> exit({fullload, FullLoad})
-	end,
-
-	[exit(Pid, kill) || Pid <- [P1|HalfHogs++LastHogs]],
-	AfterLoad = get_load(),
-	{false,_} = {lists:any(fun(Load) -> Load > 25 end, AfterLoad),AfterLoad},
-	true = erlang:system_flag(scheduler_wall_time, false)
+        Schedulers = erlang:system_info(schedulers_online),
+        %% Let testserver and everyone else finish their work
+        timer:sleep(1500),
+        %% Empty load
+        EmptyLoad = get_load(),
+        {false, _} = {lists:any(fun(Load) -> Load > 50 end, EmptyLoad),EmptyLoad},
+        MeMySelfAndI = self(),
+        StartHog = fun() ->
+                           Pid = spawn(?MODULE, hog, [self()]),
+                           receive hog_started -> MeMySelfAndI ! go end,
+                           Pid
+                   end,
+        P1 = StartHog(),
+        %% Max on one, the other schedulers empty (hopefully)
+        %% Be generous the process can jump between schedulers
+        %% which is ok and we don't want the test to fail for wrong reasons
+        _L1 = [S1Load|EmptyScheds1] = get_load(),
+        {true,_}  = {S1Load > 50,S1Load},
+        {false,_} = {lists:any(fun(Load) -> Load > 50 end, EmptyScheds1),EmptyScheds1},
+        {true,_}  = {lists:sum(EmptyScheds1) < 60,EmptyScheds1},
+
+        %% 50% load
+        HalfHogs = [StartHog() || _ <- lists:seq(1, (Schedulers-1) div 2)],
+        HalfLoad = lists:sum(get_load()) div Schedulers,
+        if Schedulers < 2, HalfLoad > 80 -> ok; %% Ok only one scheduler online and one hog
+           %% We want roughly 50% load
+           HalfLoad > 40, HalfLoad < 60 -> ok;
+           true -> exit({halfload, HalfLoad})
+        end,
+
+        %% 100% load
+        LastHogs = [StartHog() || _ <- lists:seq(1, Schedulers div 2)],
+        FullScheds = get_load(),
+        {false,_} = {lists:any(fun(Load) -> Load < 80 end, FullScheds),FullScheds},
+        FullLoad = lists:sum(FullScheds) div Schedulers,
+        if FullLoad > 90 -> ok;
+           true -> exit({fullload, FullLoad})
+        end,
+
+        [exit(Pid, kill) || Pid <- [P1|HalfHogs++LastHogs]],
+        AfterLoad = get_load(),
+        {false,_} = {lists:any(fun(Load) -> Load > 25 end, AfterLoad),AfterLoad},
+        true = erlang:system_flag(scheduler_wall_time, false)
     after
-	erlang:system_flag(scheduler_wall_time, false)
+        erlang:system_flag(scheduler_wall_time, false)
     end.
 
 get_load() ->
@@ -366,62 +330,59 @@ load_percentage([{Id, WN, TN}|Ss], [{Id, WP, TP}|Ps]) ->
 load_percentage([], []) -> [].
 
 
-garbage_collection(doc) ->
-    "Tests that statistics(garbage_collection) is callable. "
-    "It is not clear how to test anything more.";
+%% Tests that statistics(garbage_collection) is callable.
+%% It is not clear how to test anything more.
 garbage_collection(Config) when is_list(Config) ->
-    ?line Bin = list_to_binary(lists:duplicate(19999, 42)),
-    ?line case statistics(garbage_collection) of
-	      {Gcs0,R,0} when is_integer(Gcs0), is_integer(R) ->
-		  ?line io:format("Reclaimed: ~p", [R]),
-		  ?line Gcs = garbage_collection_1(Gcs0, Bin),
-		  ?line io:format("Reclaimed: ~p",
-				  [element(2, statistics(garbage_collection))]),
-		  {comment,integer_to_list(Gcs-Gcs0)++" GCs"}
-	  end.
+    Bin = list_to_binary(lists:duplicate(19999, 42)),
+    case statistics(garbage_collection) of
+        {Gcs0,R,0} when is_integer(Gcs0), is_integer(R) ->
+            io:format("Reclaimed: ~p", [R]),
+            Gcs = garbage_collection_1(Gcs0, Bin),
+            io:format("Reclaimed: ~p",
+                      [element(2, statistics(garbage_collection))]),
+            {comment,integer_to_list(Gcs-Gcs0)++" GCs"}
+    end.
 
 garbage_collection_1(Gcs0, Bin) ->
     case statistics(garbage_collection) of
-	{Gcs,Reclaimed,0} when Gcs >= Gcs0 ->
-	    if
-		Reclaimed > 16#7ffffff ->
-		    Gcs;
-		true ->
-		    _ = binary_to_list(Bin),
-		    erlang:garbage_collect(),
-		    garbage_collection_1(Gcs, Bin)
-	    end
+        {Gcs,Reclaimed,0} when Gcs >= Gcs0 ->
+            if
+                Reclaimed > 16#7ffffff ->
+                    Gcs;
+                true ->
+                    _ = binary_to_list(Bin),
+                    erlang:garbage_collect(),
+                    garbage_collection_1(Gcs, Bin)
+            end
     end.
 
-io(doc) ->
-    "Tests that statistics(io) is callable. "
-    "This could be improved to test something more.";
+%% Tests that statistics(io) is callable.
+%% This could be improved to test something more.
 io(Config) when is_list(Config) ->
-    ?line case statistics(io) of
-	      {{input,In},{output,Out}} when is_integer(In), is_integer(Out) -> ok
-	  end.
+    case statistics(io) of
+        {{input,In},{output,Out}} when is_integer(In), is_integer(Out) -> ok
+    end.
 
-badarg(doc) ->
-    "Tests that some illegal arguments to statistics fails.";
+%% Tests that some illegal arguments to statistics fails.
 badarg(Config) when is_list(Config) ->
-    ?line case catch statistics(1) of
-	      {'EXIT', {badarg, _}} -> ok
-	  end,
-    ?line case catch statistics(bad_atom) of
-	      {'EXIT', {badarg, _}} -> ok
-	  end.
+    case catch statistics(1) of
+        {'EXIT', {badarg, _}} -> ok
+    end,
+    case catch statistics(bad_atom) of
+        {'EXIT', {badarg, _}} -> ok
+    end.
 
 tok_loop() ->
     tok_loop().
 
 run_queues_lengths_active_tasks(Config) ->
     TokLoops = lists:map(fun (_) ->
-				 spawn_opt(fun () ->
-						   tok_loop()
-					   end,
-					   [link, {priority, low}])
-			 end,
-			 lists:seq(1,10)),
+                                 spawn_opt(fun () ->
+                                                   tok_loop()
+                                           end,
+                                           [link, {priority, low}])
+                         end,
+                         lists:seq(1,10)),
 
     TRQLs0 = statistics(total_run_queue_lengths),
     TATs0 = statistics(total_active_tasks),
@@ -440,6 +401,10 @@ run_queues_lengths_active_tasks(Config) ->
 
     SO = erlang:system_flag(schedulers_online, 1),
 
+    %% Give newly suspended schedulers some time to
+    %% migrate away work from their run queues...
+    receive after 1000 -> ok end,
+
     TRQLs1 = statistics(total_run_queue_lengths),
     TATs1 = statistics(total_active_tasks),
     true = TRQLs1 >= 10,
@@ -460,9 +425,119 @@ run_queues_lengths_active_tasks(Config) ->
     erlang:system_flag(schedulers_online, SO),
 
     lists:foreach(fun (P) ->
-			  unlink(P),
-			  exit(P, bang)
-		  end,
-		  TokLoops),
+                          unlink(P),
+                          exit(P, bang)
+                  end,
+                  TokLoops),
 
     ok.
+
+%% Tests that statistics(microstate_statistics) works.
+msacc(Config) ->
+
+    %% Test if crypto nif is available
+    Niff = try crypto:strong_rand_bytes(1), ok catch _:_ -> nok end,
+    TmpFile = filename:join(proplists:get_value(priv_dir,Config),"file.tmp"),
+
+    false = erlang:system_flag(microstate_accounting, true),
+
+    msacc_test(TmpFile),
+
+    true = erlang:system_flag(microstate_accounting, false),
+
+    MsaccStats = erlang:statistics(microstate_accounting),
+
+    case os:type() of
+        {win32, _} ->
+            %% Some windows have a very poor accuracy on their
+            %% timing primitives, so we just make sure that
+            %% some state besides sleep has been triggered.
+            Sum = lists:sum(
+                    lists:map(fun({sleep, _V}) -> 0;
+                                 ({_, V}) -> V
+                              end, maps:to_list(msacc_sum_states()))
+                   ),
+            if Sum > 0 ->
+                   ok;
+               true ->
+                   ct:fail({no_states_triggered, MsaccStats})
+            end;
+        _ ->
+
+            %% Make sure that all states were triggered at least once
+            maps:map(fun(nif, 0) ->
+                             case Niff of
+                                 ok ->
+                                     ct:fail({zero_state,nif});
+                                 nok ->
+                                     ok
+                             end;
+                        (aux, 0) ->
+                             %% aux will be zero if we do not have smp support
+                             %% or no async threads
+                             case erlang:system_info(smp_support) orelse
+                                  erlang:system_info(thread_pool_size) > 0
+                             of
+                                 false ->
+                                     ok;
+                                 true ->
+                                     ct:log("msacc: ~p",[MsaccStats]),
+                                     ct:fail({zero_state,aux})
+                             end;
+                        (Key, 0) ->
+                             ct:log("msacc: ~p",[MsaccStats]),
+                             ct:fail({zero_state,Key});
+                        (_,_) -> ok
+                     end, msacc_sum_states())
+    end,
+
+    erlang:system_flag(microstate_accounting, reset),
+
+    msacc_test(TmpFile),
+
+    %% Make sure all counters are zero after stopping and resetting
+    maps:map(fun(_Key, 0) -> ok;
+                (Key,_) ->
+                     ct:log("msacc: ~p",[erlang:statistics(microstate_accounting)]),
+                     ct:fail({non_zero_state,Key})
+             end,msacc_sum_states()).
+
+%% This test tries to make sure to trigger all of the different available states
+msacc_test(TmpFile) ->
+
+    %% We write some data
+    [file:write_file(TmpFile,<<0:(1024*1024*8)>>,[raw]) || _ <- lists:seq(1,100)],
+
+    %% Do some ETS operations
+    Tid = ets:new(table, []),
+    ets:insert(Tid, {1, hello}),
+    ets:delete(Tid),
+
+    %% Collect some garbage
+    [erlang:garbage_collect() || _ <- lists:seq(1,100)],
+
+    %% Send some messages
+    [begin self() ! {hello},receive _ -> ok end end ||  _ <- lists:seq(1,100)],
+
+    %% Setup some timers
+    Refs = [erlang:send_after(10000,self(),ok) ||  _ <- lists:seq(1,100)],
+
+    %% Do some nif work
+    catch [crypto:strong_rand_bytes(128) || _ <- lists:seq(1,100)],
+
+    %% Cancel some timers
+    [erlang:cancel_timer(R) ||  R <- Refs],
+
+    %% Wait for a while
+    timer:sleep(100).
+
+msacc_sum_states() ->
+    Stats = erlang:statistics(microstate_accounting),
+    [#{ counters := C }|_] = Stats,
+    InitialCounters = maps:map(fun(_,_) -> 0 end,C),
+    lists:foldl(fun(#{ counters := Counters }, Cnt) ->
+                        maps:fold(fun(Key, Value, Acc) ->
+                                          NewValue = Value+maps:get(Key,Acc),
+                                          maps:update(Key, NewValue, Acc)
+                                  end, Cnt, Counters)
+                end,InitialCounters,Stats).
diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl
index bee42c07d9..ffea5bc15b 100644
--- a/erts/emulator/test/system_info_SUITE.erl
+++ b/erts/emulator/test/system_info_SUITE.erl
@@ -31,55 +31,25 @@
 
 %-define(line_trace, 1).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-%-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]).
 
--export([process_count/1, system_version/1, misc_smoke_tests/1, heap_size/1, wordsize/1, memory/1,
-         ets_limit/1]).
+-export([process_count/1, system_version/1, misc_smoke_tests/1,
+         heap_size/1, wordsize/1, memory/1, ets_limit/1]).
 
--define(DEFAULT_TIMEOUT, ?t:minutes(2)).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 2}}].
 
 all() -> 
     [process_count, system_version, misc_smoke_tests,
      heap_size, wordsize, memory, ets_limit].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
 %%%
 %%% The test cases -------------------------------------------------------------
 %%%
 
-process_count(doc) -> [];
-process_count(suite) -> [];
 process_count(Config) when is_list(Config) ->
     case catch erlang:system_info(modified_timing_level) of
 	Level when is_integer(Level) ->
@@ -92,37 +62,37 @@ process_count(Config) when is_list(Config) ->
     end.
 
 process_count_test() ->
-    ?line OldPrio = process_flag(priority, max),
-    ?line check_procs(10),
-    ?line check_procs(11234),
-    ?line check_procs(57),
-    ?line check_procs(1030),
-    ?line check_procs(687),
-    ?line check_procs(7923),
-    ?line check_procs(5302),
-    ?line check_procs(12456),
-    ?line check_procs(14),
-    ?line check_procs(1125),
-    ?line check_procs(236),
-    ?line check_procs(125),
-    ?line check_procs(2346),
-    ?line process_flag(priority, OldPrio),
-    ?line ok.
+    OldPrio = process_flag(priority, max),
+    check_procs(10),
+    check_procs(11234),
+    check_procs(57),
+    check_procs(1030),
+    check_procs(687),
+    check_procs(7923),
+    check_procs(5302),
+    check_procs(12456),
+    check_procs(14),
+    check_procs(1125),
+    check_procs(236),
+    check_procs(125),
+    check_procs(2346),
+    process_flag(priority, OldPrio),
+    ok.
     
 
 check_procs(N) ->
-    ?line CP = length(processes()),
-    ?line Procs = start_procs(N),
-    ?line check_pc(CP+N),
-    ?line stop_procs(Procs),
-    ?line check_pc(CP).
+    CP = length(processes()),
+    Procs = start_procs(N),
+    check_pc(CP+N),
+    stop_procs(Procs),
+    check_pc(CP).
 
 check_pc(E) ->
-    ?line P = length(processes()),
-    ?line SI = erlang:system_info(process_count),
-    ?line ?t:format("E=~p; P=~p; SI=~p~n", [E, P, SI]),
-    ?line E = P,
-    ?line P = SI.
+    P = length(processes()),
+    SI = erlang:system_info(process_count),
+    io:format("E=~p; P=~p; SI=~p~n", [E, P, SI]),
+    E = P,
+    P = SI.
 
 start_procs(N) ->
     lists:map(fun (_) ->
@@ -143,55 +113,44 @@ stop_procs(PMs) ->
 		  end, PMs).
 
 
-system_version(doc) -> [];
-system_version(suite) -> [];
 system_version(Config) when is_list(Config) ->
-    ?line {comment, erlang:system_info(system_version)}.
+    {comment, erlang:system_info(system_version)}.
 
-misc_smoke_tests(doc) -> [];
-misc_smoke_tests(suite) -> [];
 misc_smoke_tests(Config) when is_list(Config) ->
-    ?line true = is_binary(erlang:system_info(info)),
-    ?line true = is_binary(erlang:system_info(procs)),
-    ?line true = is_binary(erlang:system_info(loaded)),
-    ?line true = is_binary(erlang:system_info(dist)),
-    ?line ok = try erlang:system_info({cpu_topology,erts_get_cpu_topology_error_case}), fail catch error:badarg -> ok end,
+    true = is_binary(erlang:system_info(info)),
+    true = is_binary(erlang:system_info(procs)),
+    true = is_binary(erlang:system_info(loaded)),
+    true = is_binary(erlang:system_info(dist)),
+    ok = try erlang:system_info({cpu_topology,erts_get_cpu_topology_error_case}), fail catch error:badarg -> ok end,
     true = lists:member(erlang:system_info(tolerant_timeofday), [enabled, disabled]),
-    ?line ok.
+    ok.
     
 
-heap_size(doc) -> [];
-heap_size(suite) -> [];
 heap_size(Config) when is_list(Config) ->
-   ?line {min_bin_vheap_size, VHmin} = erlang:system_info(min_bin_vheap_size),
-   ?line {min_heap_size, Hmin} =  erlang:system_info(min_heap_size),
-   ?line GCinf =  erlang:system_info(garbage_collection),
-   ?line VHmin = proplists:get_value(min_bin_vheap_size, GCinf),
-   ?line Hmin  = proplists:get_value(min_heap_size, GCinf),
+   {min_bin_vheap_size, VHmin} = erlang:system_info(min_bin_vheap_size),
+   {min_heap_size, Hmin} =  erlang:system_info(min_heap_size),
+   GCinf =  erlang:system_info(garbage_collection),
+   VHmin = proplists:get_value(min_bin_vheap_size, GCinf),
+   Hmin  = proplists:get_value(min_heap_size, GCinf),
    ok.
 
-wordsize(suite) ->
-    [];
-wordsize(doc) ->
-    ["Tests the various wordsize variants"];
+%% Tests the various wordsize variants
 wordsize(Config) when is_list(Config) ->
-    ?line A = erlang:system_info(wordsize),
-    ?line true = is_integer(A),
-    ?line A = erlang:system_info({wordsize,internal}),
-    ?line B = erlang:system_info({wordsize,external}),
-    ?line true = A =< B,
+    A = erlang:system_info(wordsize),
+    true = is_integer(A),
+    A = erlang:system_info({wordsize,internal}),
+    B = erlang:system_info({wordsize,external}),
+    true = A =< B,
     case {B,A} of
 	{4,4} ->
 	    {comment, "True 32-bit emulator"};
 	{8,8} ->
 	    {comment, "True 64-bit emulator"};
-	{8,4} ->
-	    {comment, "Halfword 64-bit emulator"};
 	Other ->
 	    exit({unexpected_wordsizes,Other})
     end.
 
-memory(doc) -> ["Verify that erlang:memory/0 and memory results in crashdump produce are similar"];
+%% Verify that erlang:memory/0 and memory results in crashdump produce are similar
 memory(Config) when is_list(Config) ->
     %%
     %% Verify that erlang:memory/0 and memory results in
@@ -246,8 +205,7 @@ memory_test(_Config) ->
 						      end)
 					end,
 					1000 div erlang:system_info(schedulers_online))
-			   end,
-			   []),
+			   end, []),
     cmp_memory(MWs, "spawn procs"),
 
     Ps = lists:flatten(DPs),
@@ -255,14 +213,12 @@ memory_test(_Config) ->
     mem_workers_call(MWs, 
 		     fun () ->
 			     lists:foreach(fun (P) -> link(P) end, Ps)
-		     end,
-		     []),
+		     end, []),
     cmp_memory(MWs, "link procs"),
     mem_workers_call(MWs,
 		     fun () ->
 			     lists:foreach(fun (P) -> unlink(P) end, Ps)
-		     end,
-		     []),
+		     end, []),
     cmp_memory(MWs, "unlink procs"),
 
     mem_workers_call(MWs, 
@@ -279,8 +235,7 @@ memory_test(_Config) ->
 				       true = is_reference(Tmr),
 				       put('BIF_TMRS', [Tmr|Tmrs])
 			       end, Ps)
-		     end,
-		     []),
+		     end, []),
     cmp_memory(MWs, "start BIF timer procs"),
 
     mem_workers_call(MWs, 
@@ -291,8 +246,7 @@ memory_test(_Config) ->
 					   end, get('BIF_TMRS')),
 			     put('BIF_TMRS', undefined),
 			     garbage_collect()
-		     end,
-		     []),
+		     end, []),
     erts_debug:set_internal_state(wait, deallocations),
     cmp_memory(MWs, "cancel BIF timer procs"),
 
@@ -301,8 +255,7 @@ memory_test(_Config) ->
 				   lists:map(fun (P) ->
 						     monitor(process, P)
 					     end, Ps)
-			   end,
-			   []),
+			   end, []),
     cmp_memory(MWs, "monitor procs"),
     Ms = lists:flatten(DMs),
     mem_workers_call(MWs,
@@ -310,8 +263,7 @@ memory_test(_Config) ->
 			     lists:foreach(fun (M) ->
 						   demonitor(M)
 					   end, Ms)
-		     end,
-		     []),
+		     end, []),
     cmp_memory(MWs, "demonitor procs"),
 
     mem_workers_call(MWs,
@@ -319,8 +271,7 @@ memory_test(_Config) ->
 			     lists:foreach(fun (P) ->
 						   P ! {a, "message", make_ref()}
 					   end, Ps)
-		     end,
-		     []),
+		     end, []),
     cmp_memory(MWs, "message procs"),
 
     mem_workers_call(MWs,
@@ -343,8 +294,7 @@ memory_test(_Config) ->
 		     fun () ->
 			     put(binary_data,
 				 mapn(fun (_) -> list_to_binary(lists:duplicate(256,$?)) end, 100))
-		     end,
-		     []),
+		     end, []),
 
     cmp_memory(MWs, "store binary data"),
 
@@ -352,8 +302,7 @@ memory_test(_Config) ->
 		     fun () ->
 			     put(binary_data, false),
 			     garbage_collect()
-		     end,
-		     []),
+		     end, []),
     cmp_memory(MWs, "release binary data"),
 
     mem_workers_call(MWs,
@@ -361,8 +310,7 @@ memory_test(_Config) ->
 			     list_to_atom("an ugly atom "++integer_to_list(erlang:system_info(scheduler_id))),
 			     list_to_atom("another ugly atom "++integer_to_list(erlang:system_info(scheduler_id))),
 			     list_to_atom("yet another ugly atom "++integer_to_list(erlang:system_info(scheduler_id)))
-		     end,
-		     []),
+		     end, []),
     cmp_memory(MWs, "new atoms"),
 
 
@@ -373,16 +321,14 @@ memory_test(_Config) ->
 			     ets:insert(T, {banan, lists:seq(1,1024)}),
 			     ets:insert(T, {appelsin, make_ref()}),
 			     put(ets_id, T)
-		     end,
-		     []),
+		     end, []),
     cmp_memory(MWs, "store ets data"),
 
     mem_workers_call(MWs,
 		     fun () ->
 			     ets:delete(get(ets_id)),
 			     put(ets_id, false)
-		     end,
-		     []),
+		     end, []),
     cmp_memory(MWs, "remove ets data"),
 
     lists:foreach(fun (MW) ->
@@ -392,8 +338,7 @@ memory_test(_Config) ->
 			  receive
 			      {'DOWN', Mon, _, _, _} -> ok
 			  end
-		  end,
-		  MWs),
+		  end, MWs),
     ok.
 
 mem_worker() ->
@@ -408,22 +353,19 @@ mem_worker() ->
 
 mem_workers_call(MWs, Fun, Args) ->
     lists:foreach(fun (MW) ->
-			  MW ! {call, self(), Fun, Args}
-		  end,
-		  MWs),
+                          MW ! {call, self(), Fun, Args}
+                  end, MWs),
     lists:map(fun (MW) ->
-		      receive
-			  {reply, MW, Res} ->
-			      Res
-		      end
-	      end,
-	      MWs).
+                      receive
+                          {reply, MW, Res} ->
+                              Res
+                      end
+              end, MWs).
 
 mem_workers_cast(MWs, Fun, Args) ->
     lists:foreach(fun (MW) ->
 			  MW ! {cast, self(), Fun, Args}
-		  end,
-		  MWs).
+		  end, MWs).
 
 spawn_mem_workers() ->
     spawn_mem_workers(erlang:system_info(schedulers_online)).
@@ -436,7 +378,6 @@ spawn_mem_workers(N) ->
 		link]) | spawn_mem_workers(N-1)].
 
 
-
 mem_get(X, Mem) ->
     case lists:keyfind(X, 1, Mem) of
 	{X, Val} -> Val;
@@ -504,25 +445,25 @@ cmp_memory(MWs, Str) ->
 	      "crash dump memory = ~p~n",
 	      [Str, EM, EDM]),
 
-    ?line check_sane_memory(EM),
-    ?line check_sane_memory(EDM),
+    check_sane_memory(EM),
+    check_sane_memory(EDM),
 
     %% We expect these to always give us exactly the same result
 
-    ?line cmp_memory(atom, EM, EDM, 1),
-    ?line cmp_memory(atom_used, EM, EDM, 1),
-    ?line cmp_memory(binary, EM, EDM, 1),
-    ?line cmp_memory(code, EM, EDM, 1),
-    ?line cmp_memory(ets, EM, EDM, 1),
+    cmp_memory(atom, EM, EDM, 1),
+    cmp_memory(atom_used, EM, EDM, 1),
+    cmp_memory(binary, EM, EDM, 1),
+    cmp_memory(code, EM, EDM, 1),
+    cmp_memory(ets, EM, EDM, 1),
 
     %% Total, processes, processes_used, and system will seldom
     %% give us exactly the same result since the two readings
     %% aren't taken atomically.
 
-    ?line cmp_memory(total, EM, EDM, 1.05),
-    ?line cmp_memory(processes, EM, EDM, 1.05),
-    ?line cmp_memory(processes_used, EM, EDM, 1.05),
-    ?line cmp_memory(system, EM, EDM, 1.05),
+    cmp_memory(total, EM, EDM, 1.05),
+    cmp_memory(processes, EM, EDM, 1.05),
+    cmp_memory(processes_used, EM, EDM, 1.05),
+    cmp_memory(system, EM, EDM, 1.05),
 
     ok.
     
@@ -531,9 +472,7 @@ mapn(_Fun, 0) ->
 mapn(Fun, N) ->
     [Fun(N) | mapn(Fun, N-1)].
 
-ets_limit(doc) ->
-    "Verify system_info(ets_limit) reflects max ETS table settings.";
-ets_limit(suite) -> [];
+%% Verify system_info(ets_limit) reflects max ETS table settings.
 ets_limit(Config0) when is_list(Config0) ->
     Config = [{testcase,ets_limit}|Config0],
     true = is_integer(get_ets_limit(Config)),
@@ -567,12 +506,12 @@ start_node(Config, Envs) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
                         ++ "-"
-                        ++ atom_to_list(?config(testcase, Config))
+                        ++ atom_to_list(proplists:get_value(testcase, Config))
                         ++ "-"
                         ++ integer_to_list(erlang:system_time(seconds))
                         ++ "-"
                         ++ integer_to_list(erlang:unique_integer([positive]))),
-    ?t:start_node(Name, peer, [{args, "-pa "++Pa}, {env, Envs}]).
+    test_server:start_node(Name, peer, [{args, "-pa "++Pa}, {env, Envs}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
diff --git a/erts/emulator/test/system_profile_SUITE.erl b/erts/emulator/test/system_profile_SUITE.erl
index e4b6511d1f..6d80d436ba 100644
--- a/erts/emulator/test/system_profile_SUITE.erl
+++ b/erts/emulator/test/system_profile_SUITE.erl
@@ -23,61 +23,28 @@
 
 -module(system_profile_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,
 	system_profile_on_and_off/1,
-	runnable_procs/1,
-	runnable_ports/1,
+	runnable_procs/1, runnable_ports/1,
 	dont_profile_profiler/1,
-	scheduler/1
-        ]).
-
--export([init_per_testcase/2, end_per_testcase/2]).
+	scheduler/1]).
 
 -export([profiler_process/1, ring_loop/1, port_echo_start/0, 
 	 list_load/0, run_load/2]).
 
--include_lib("test_server/include/test_server.hrl").
-
--define(default_timeout, ?t:minutes(1)).
-
-init_per_testcase(_Case, Config) ->
-    Dog=?t:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() -> 
     [system_profile_on_and_off, runnable_procs,
      runnable_ports, scheduler, dont_profile_profiler].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 %% No specification clause needed for an init function in a conf case!!!
 
 %% Test switching system_profiling on and off.
-system_profile_on_and_off(suite) ->
-    [];
-system_profile_on_and_off(doc) ->
-    ["Tests switching system_profiling on and off."];
 system_profile_on_and_off(Config) when is_list(Config) ->
     Pid = start_profiler_process(),
     
@@ -106,20 +73,29 @@ system_profile_on_and_off(Config) when is_list(Config) ->
     exit(Pid,kill),
     ok.
 
-%% Test runnable_procs
-
-runnable_procs(suite) ->
-    [];
-runnable_procs(doc) ->
-    ["Tests system_profiling with runnable_procs."];
+%% Tests system_profiling with runnable_procs.
 runnable_procs(Config) when is_list(Config) ->
+    lists:foreach(fun (TsType) ->
+			  Arg = case TsType of
+				    no_timestamp ->
+					{timestamp, []};
+				    _ ->
+					{TsType, [TsType]}
+				end,
+			  do_runnable_procs(Arg),
+			  receive after 1000 -> ok end
+		  end,
+		  [no_timestamp, timestamp, monotonic_timestamp,
+		   strict_monotonic_timestamp]).
+
+do_runnable_procs({TsType, TsTypeFlag}) ->
     Pid = start_profiler_process(),
     % start a ring of processes
     % FIXME: Set #laps and #nodes in config file
     Nodes = 10,
     Laps = 10,
     Master = ring(Nodes),
-    undefined = erlang:system_profile(Pid, [runnable_procs]),
+    undefined = erlang:system_profile(Pid, [runnable_procs]++TsTypeFlag),
     % loop a message
     ok = ring_message(Master, message, Laps),
     Events = get_profiler_events(),
@@ -127,20 +103,31 @@ runnable_procs(Config) when is_list(Config) ->
     erlang:system_profile(undefined, []),
     put(master, Master),
     put(laps, Laps),
-    true = has_runnable_event(Events),
+    true = has_runnable_event(TsType, Events),
     Pids = sort_events_by_pid(Events),
-    ok = check_events(Pids),
+    ok = check_events(TsType, Pids),
     erase(),
     exit(Pid,kill),
     ok.
 
-runnable_ports(suite) ->
-    [];
-runnable_ports(doc) ->
-    ["Tests system_profiling with runnable_port."];
+%% Tests system_profiling with runnable_port.
 runnable_ports(Config) when is_list(Config) ->
+    lists:foreach(fun (TsType) ->
+			  Arg = case TsType of
+				    no_timestamp ->
+					{timestamp, []};
+				    _ ->
+					{TsType, [TsType]}
+				end,
+			  do_runnable_ports(Arg, Config),
+			  receive after 1000 -> ok end
+		  end,
+		  [no_timestamp, timestamp, monotonic_timestamp,
+		   strict_monotonic_timestamp]).
+
+do_runnable_ports({TsType, TsTypeFlag}, Config) ->
     Pid = start_profiler_process(),
-    undefined = erlang:system_profile(Pid, [runnable_ports]),
+    undefined = erlang:system_profile(Pid, [runnable_ports]++TsTypeFlag),
     EchoPid = echo(Config),
     % FIXME: Set config to number_of_echos
     Laps = 10,
@@ -149,32 +136,36 @@ runnable_ports(Config) when is_list(Config) ->
     Events = get_profiler_events(),
     kill_em_all = kill_echo(EchoPid),
     erlang:system_profile(undefined, []),
-    true = has_runnable_event(Events),
+    true = has_runnable_event(TsType, Events),
     Pids = sort_events_by_pid(Events),
-    ok = check_events(Pids),
+    ok = check_events(TsType, Pids),
     erase(),
     exit(Pid,kill),
     ok.
 
-scheduler(suite) ->
-    [];
-scheduler(doc) ->
-    ["Tests system_profiling with scheduler."];
+%% Tests system_profiling with scheduler.
 scheduler(Config) when is_list(Config) ->
     case {erlang:system_info(smp_support), erlang:system_info(schedulers_online)} of
 	{false,_} -> {skipped, "No need for scheduler test when smp support is disabled."};
 	{_,    1} -> {skipped, "No need for scheduler test when only one scheduler online."};
 	_ ->
 	    Nodes = 10,
-	    ok = check_block_system(Nodes),
-	    ok = check_multi_scheduling_block(Nodes)
+	    lists:foreach(fun (TsType) ->
+				  Arg = case TsType of
+					    no_timestamp ->
+						{timestamp, []};
+					    _ ->
+						{TsType, [TsType]}
+					end,
+				  ok = check_block_system(Arg, Nodes),
+				  ok = check_multi_scheduling_block(Arg, Nodes),
+				  receive after 1000 -> ok end
+			      end,
+			  [no_timestamp, timestamp, monotonic_timestamp,
+			   strict_monotonic_timestamp])
     end.
 
-% the profiler pid should not be profiled
-dont_profile_profiler(suite) ->
-    [];
-dont_profile_profiler(doc) ->
-    ["Ensure system profiler process is not profiled."];
+%% Ensure system profiler process is not profiled.
 dont_profile_profiler(Config) when is_list(Config) ->
     Pid = start_profiler_process(),
 
@@ -195,9 +186,9 @@ dont_profile_profiler(Config) when is_list(Config) ->
 
 %%% Check scheduler profiling
 
-check_multi_scheduling_block(Nodes) ->
+check_multi_scheduling_block({TsType, TsTypeFlag}, Nodes) ->
     Pid = start_profiler_process(),
-    undefined = erlang:system_profile(Pid, [scheduler]),
+    undefined = erlang:system_profile(Pid, [scheduler]++TsTypeFlag),
     {ok, Supervisor} = start_load(Nodes),
     wait(600),
     erlang:system_flag(multi_scheduling, block),
@@ -205,23 +196,23 @@ check_multi_scheduling_block(Nodes) ->
     erlang:system_flag(multi_scheduling, unblock),
     {Pid, [scheduler]} = erlang:system_profile(undefined, []),
     Events = get_profiler_events(),
-    true = has_scheduler_event(Events),
+    true = has_scheduler_event(TsType, Events),
     stop_load(Supervisor),
     exit(Pid,kill),
     erase(),
     ok.
 
-check_block_system(Nodes) ->
+check_block_system({TsType, TsTypeFlag}, Nodes) ->
     Dummy = spawn(?MODULE, profiler_process, [[]]),
     Pid = start_profiler_process(),
-    undefined = erlang:system_profile(Pid, [scheduler]),
+    undefined = erlang:system_profile(Pid, [scheduler]++TsTypeFlag),
     {ok, Supervisor} = start_load(Nodes),
     wait(300),
     undefined = erlang:system_monitor(Dummy, [busy_port]),
     {Dummy, [busy_port]} = erlang:system_monitor(undefined, []),
     {Pid, [scheduler]} = erlang:system_profile(undefined, []),
     Events = get_profiler_events(),
-    true = has_scheduler_event(Events),
+    true = has_scheduler_event(TsType, Events),
     stop_load(Supervisor),
     exit(Pid,kill),
     exit(Dummy,kill),
@@ -230,40 +221,49 @@ check_block_system(Nodes) ->
 
 %%% Check events
 
-check_events([]) -> ok;
-check_events([Pid | Pids]) ->
+check_events(_TsType, []) -> ok;
+check_events(TsType, [Pid | Pids]) ->
     Master = get(master),
     Laps = get(laps),
     CheckPids = get(pids),
     {Events, N} = get_pid_events(Pid),
     ok = check_event_flow(Events),
-    ok = check_event_ts(Events),
+    ok = check_event_ts(TsType, Events),
     IsMember = lists:member(Pid, CheckPids),
     case Pid of
     	Master ->
 	    io:format("Expected ~p and got ~p profile events from ~p: ok~n", [Laps*2+2, N, Pid]),
 	    N = Laps*2 + 2,
-    	    check_events(Pids);
+    	    check_events(TsType, Pids);
 	Pid when IsMember == true ->
 	    io:format("Expected ~p and got ~p profile events from ~p: ok~n", [Laps*2, N, Pid]),
 	    N = Laps*2,
-    	    check_events(Pids);
+    	    check_events(TsType, Pids);
 	Pid ->
-	    check_events(Pids)
+	    check_events(TsType, Pids)
     end.
 
 %% timestamp consistency check for descending timestamps
 
-check_event_ts(Events) ->
-    check_event_ts(Events, undefined).
-check_event_ts([], _) -> ok;
-check_event_ts([Event | Events], undefined) ->
-    check_event_ts(Events, Event);
-check_event_ts([{Pid, _, _, TS1}=Event | Events], {Pid,_,_,TS0}) ->
-    Time = timer:now_diff(TS1, TS0),
+check_event_ts(TsType, Events) ->
+    check_event_ts(TsType, Events, undefined).
+check_event_ts(_TsType, [], _) -> ok;
+check_event_ts(TsType, [Event | Events], undefined) ->
+    check_event_ts(TsType, Events, Event);
+check_event_ts(TsType, [{Pid, _, _, TS1}=Event | Events], {Pid,_,_,TS0}) ->
+    Time = case TsType of
+	       timestamp ->
+		   timer:now_diff(TS1, TS0);
+	       monotonic_timestamp ->
+		   TS1 - TS0;
+	       strict_monotonic_timestamp ->
+		   {MT1, _} = TS1,
+		   {MT0, _} = TS0,
+		   MT1 - MT0
+	   end,
     if 
     	Time < 0.0 -> timestamp_error;
-    	true -> check_event_ts(Events, Event)
+    	true -> check_event_ts(TsType, Events, Event)
     end.
 
 %% consistency check for active vs. inactive activity (runnable)
@@ -373,7 +373,7 @@ ring_loop(RelayTo) ->
 %% API
 
 echo(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:load_driver(Path, echo_drv),
     Pid = spawn_link(?MODULE, port_echo_start, []),
     Pid ! {self(), get_ports},
@@ -428,6 +428,44 @@ port_echo_loop(Port) ->
 %% Helpers
 %%%
 
+check_ts(no_timestamp, Ts) ->
+    try
+	no_timestamp = Ts
+    catch
+	_ : _ ->
+	    ct:fail({unexpected_timestamp, Ts})
+    end,
+    ok;
+check_ts(timestamp, Ts) ->
+    try
+	{Ms,S,Us} = Ts,
+	true = is_integer(Ms),
+	true = is_integer(S),
+	true = is_integer(Us)
+    catch
+	_ : _ ->
+	    ct:fail({unexpected_timestamp, Ts})
+    end,
+    ok;
+check_ts(monotonic_timestamp, Ts) ->
+    try
+	true = is_integer(Ts)
+    catch
+	_ : _ ->
+	    ct:fail({unexpected_timestamp, Ts})
+    end,
+    ok;
+check_ts(strict_monotonic_timestamp, Ts) ->
+    try
+	{MT, UMI} = Ts,
+	true = is_integer(MT),
+	true = is_integer(UMI)
+    catch
+	_ : _ ->
+	    ct:fail({unexpected_timestamp, Ts})
+    end,
+    ok.
+
 start_load(N) ->
    Pid = spawn_link(?MODULE, run_load, [N, []]),
    {ok, Pid}.
@@ -448,27 +486,30 @@ run_load(N, Pids) ->
     run_load(N - 1, [Pid | Pids]).
 
 list_load() -> 
-    ok = case math:sin(random:uniform(32451)) of
+    ok = case math:sin(rand:uniform(32451)) of
     	A when is_float(A) -> ok;
 	_ -> ok
     end,
     list_load().
 
-
-has_scheduler_event(Events) ->
+has_scheduler_event(TsType, Events) ->
     lists:any(
     	fun (Pred) ->
 	    case Pred of 
-	    	{profile, scheduler, _ID, _Activity, _NR, _TS} -> true;
+	    	{profile, scheduler, _ID, _Activity, _NR, TS} ->
+		    check_ts(TsType, TS),
+		    true;
 		_ -> false
 	    end
 	end, Events).
 
-has_runnable_event(Events) ->
+has_runnable_event(TsType, Events) ->
     lists:any(
     	fun (Pred) ->
 	    case Pred of
-	    	{profile, _Pid, _Activity, _MFA, _TS} -> true;
+	    	{profile, _Pid, _Activity, _MFA, TS} ->
+		    check_ts(TsType, TS),
+		    true;
 	    	_ -> false
 	    end
         end, Events).
diff --git a/erts/emulator/test/time_SUITE.erl b/erts/emulator/test/time_SUITE.erl
index 787870588d..e6da5e89fa 100644
--- a/erts/emulator/test/time_SUITE.erl
+++ b/erts/emulator/test/time_SUITE.erl
@@ -48,7 +48,7 @@
 
 -export([local_to_univ_utc/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([linear_time/1]).
 
@@ -69,7 +69,7 @@
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     [{testcase, Func}|Config].
 
-end_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, _Config) ->
     ok.
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
@@ -103,32 +103,29 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-local_to_univ_utc(suite) ->
-    [];
-local_to_univ_utc(doc) ->
-    ["Test that DST = true on timezones without DST is ignored"];
+%% Test that DST = true on timezones without DST is ignored
 local_to_univ_utc(Config) when is_list(Config) ->
     case os:type() of
 	{unix,_} ->
 	    %% TZ variable has a meaning
-	    ?line {ok, Node} =
+	    {ok, Node} =
 		test_server:start_node(local_univ_utc,peer,
 				       [{args, "-env TZ UTC"}]),
-	    ?line {{2008,8,1},{0,0,0}} =
+	    {{2008,8,1},{0,0,0}} =
 		rpc:call(Node,
 			 erlang,localtime_to_universaltime,
 			 [{{2008, 8, 1}, {0, 0, 0}},
 			  false]),
-	    ?line {{2008,8,1},{0,0,0}} =
+	    {{2008,8,1},{0,0,0}} =
 		rpc:call(Node,
 			 erlang,localtime_to_universaltime,
 			 [{{2008, 8, 1}, {0, 0, 0}},
 			  true]),
-	    ?line [{{2008,8,1},{0,0,0}}] =
+	    [{{2008,8,1},{0,0,0}}] =
 		rpc:call(Node,
 			 calendar,local_time_to_universal_time_dst,
 			 [{{2008, 8, 1}, {0, 0, 0}}]),
-	    ?line test_server:stop_node(Node),
+	    test_server:stop_node(Node),
 	    ok;
 	_ ->
 	    {skip,"Only valid on Unix"}
@@ -138,24 +135,24 @@ local_to_univ_utc(Config) when is_list(Config) ->
 %% Tests conversion from univeral to local time.
 
 univ_to_local(Config) when is_list(Config) ->
-    ?line test_univ_to_local(test_data()).
+    test_univ_to_local(test_data()).
 
 test_univ_to_local([{Utc, Local}|Rest]) ->
-    ?line io:format("Testing ~p => ~p~n", [Local, Utc]),
-    ?line Local = erlang:universaltime_to_localtime(Utc),
-    ?line test_univ_to_local(Rest);
+    io:format("Testing ~p => ~p~n", [Local, Utc]),
+    Local = erlang:universaltime_to_localtime(Utc),
+    test_univ_to_local(Rest);
 test_univ_to_local([]) ->
     ok.
 
 %% Tests conversion from local to universal time.
 
 local_to_univ(Config) when is_list(Config) ->
-    ?line test_local_to_univ(test_data()).
+    test_local_to_univ(test_data()).
 
 test_local_to_univ([{Utc, Local}|Rest]) ->
-    ?line io:format("Testing ~p => ~p~n", [Utc, Local]),
-    ?line Utc = erlang:localtime_to_universaltime(Local),
-    ?line test_local_to_univ(Rest);
+    io:format("Testing ~p => ~p~n", [Utc, Local]),
+    Utc = erlang:localtime_to_universaltime(Local),
+    test_local_to_univ(Rest);
 test_local_to_univ([]) ->
     ok.
 
@@ -163,11 +160,11 @@ test_local_to_univ([]) ->
 %% generate a badarg.
 
 bad_univ_to_local(Config) when is_list(Config) ->
-    ?line bad_test_univ_to_local(bad_dates()).
+    bad_test_univ_to_local(bad_dates()).
 
 bad_test_univ_to_local([Utc|Rest]) ->
-    ?line io:format("Testing ~p~n", [Utc]),
-    ?line case catch erlang:universaltime_to_localtime(Utc) of
+    io:format("Testing ~p~n", [Utc]),
+    case catch erlang:universaltime_to_localtime(Utc) of
 	      {'EXIT', {badarg, _}} -> bad_test_univ_to_local(Rest)
 	  end;
 bad_test_univ_to_local([]) ->
@@ -177,11 +174,11 @@ bad_test_univ_to_local([]) ->
 %% generate a badarg.
 
 bad_local_to_univ(Config) when is_list(Config) ->
-    ?line bad_test_local_to_univ(bad_dates()).
+    bad_test_local_to_univ(bad_dates()).
 
 bad_test_local_to_univ([Local|Rest]) ->
-    ?line io:format("Testing ~p~n", [Local]),
-    ?line case catch erlang:localtime_to_universaltime(Local) of
+    io:format("Testing ~p~n", [Local]),
+    case catch erlang:localtime_to_universaltime(Local) of
 	      {'EXIT', {badarg, _}} -> bad_test_local_to_univ(Rest)
 	  end;
 bad_test_local_to_univ([]) ->
@@ -227,13 +224,13 @@ consistency(Config) when is_list(Config) ->
     %%	        Daylight-saving calculations are incorrect from the last
     %%		Sunday of March and October to the end of the month.
 
-    ?line ok = compare_date_time_and_localtime(16),
-    ?line ok = compare_local_and_universal(16).
+    ok = compare_date_time_and_localtime(16),
+    ok = compare_local_and_universal(16).
 
 compare_date_time_and_localtime(Times) when Times > 0 ->
-    ?line {Year, Mon, Day} = date(),
-    ?line {Hour, Min, Sec} = time(),
-    ?line case erlang:localtime() of
+    {Year, Mon, Day} = date(),
+    {Hour, Min, Sec} = time(),
+    case erlang:localtime() of
 	{{Year, Mon, Day}, {Hour, Min, Sec}} -> ok;
 	_ -> compare_date_time_and_localtime(Times-1)
     end;
@@ -315,10 +312,7 @@ effective_timezone1(_) ->
 %% Test (the bif) os:timestamp/0, which is something quite like, but not
 %% similar to erlang:now...
 
-timestamp(suite) ->
-    [];
-timestamp(doc) ->
-    ["Test that os:timestamp works."];
+%% Test that os:timestamp works.
 timestamp(Config) when is_list(Config) ->
     try
 	repeating_timestamp_check(100000)
@@ -334,7 +328,7 @@ timestamp(Config) when is_list(Config) ->
 		true ->
 		    {skip, "Seems to be time warp test run..."};
 		false ->
-		    test_server:fail(Failure)
+		    ct:fail(Failure)
 	    end
     end.
 
@@ -368,9 +362,7 @@ repeating_timestamp_check(N) ->
 	C < 1000000 ->
 	    ok;
 	true ->
-	    test_server:fail(
-	      lists:flatten(
-		io_lib:format("Strange return from os:timestamp/0 ~w~n",[TS])))
+	    ct:fail("Strange return from os:timestamp/0 ~w~n",[TS])
     end,
     %% I assume the now and timestamp should not differ more than 1 hour,
     %% which is safe assuming the system has not had a large time-warp
@@ -403,22 +395,22 @@ repeating_timestamp_check(N) ->
 %% times (in microseconds).
 
 now_unique(Config) when is_list(Config) ->
-    ?line now_unique(1000, now(), []),
-    ?line fast_now_unique(100000, now()).
+    now_unique(1000, now(), []),
+    fast_now_unique(100000, now()).
 
 now_unique(N, Previous, Result) when N > 0 ->
-    ?line case now() of
+    case now() of
 	      Previous ->
-		  test_server:fail("now/0 returned the same value twice");
+		  ct:fail("now/0 returned the same value twice");
 	      New ->
 		  now_unique(N-1, New, [New|Result])
 	  end;
 now_unique(0, _, [Then|Rest]) ->
-    ?line now_calc_increment(Rest, microsecs(Then), []).
+    now_calc_increment(Rest, microsecs(Then), []).
 
 now_calc_increment([Then|Rest], Previous, _Result) ->
-    ?line This = microsecs(Then),
-    ?line now_calc_increment(Rest, This, [Previous-This]);
+    This = microsecs(Then),
+    now_calc_increment(Rest, This, [Previous-This]);
 now_calc_increment([], _, Differences) ->
     {comment, "Median increment: " ++ integer_to_list(median(Differences))}.
 
@@ -426,15 +418,15 @@ fast_now_unique(0, _) -> ok;
 fast_now_unique(N, Then) ->
     case now() of
 	Then ->
-	    ?line ?t:fail("now/0 returned the same value twice");
+	    ct:fail("now/0 returned the same value twice");
 	Now ->
 	    fast_now_unique(N-1, Now)
     end.
 
 median(Unsorted_List) ->
-    ?line Length = length(Unsorted_List),
-    ?line List = lists:sort(Unsorted_List),
-    ?line case Length rem 2 of
+    Length = length(Unsorted_List),
+    List = lists:sort(Unsorted_List),
+    case Length rem 2 of
 	0 ->					% Even length.
 	    [A, B] = lists:nthtail((Length div 2)-1, List),
 	    (A+B)/2;
@@ -450,31 +442,30 @@ microsecs({Mega_Secs, Secs, Microsecs}) ->
 %% calls to erlang:localtime().
 
 now_update(Config) when is_list(Config) ->
-    case ?t:is_debug() of
-	false -> ?line now_update1(10);
+    case test_server:is_debug() of
+	false -> now_update1(10);
 	true -> {skip,"Unreliable in DEBUG build"}
     end.
 
 
 now_update1(N) when N > 0 ->
-    ?line T1_linear = linear_time(erlang:localtime()),
-    ?line T1_now = microsecs(now()),
+    T1_linear = linear_time(erlang:localtime()),
+    T1_now = microsecs(now()),
 
-    ?line receive after 1008 -> ok end,
+    receive after 1008 -> ok end,
 
-    ?line T2_linear = linear_time(erlang:localtime()),
-    ?line T2_now = microsecs(now()),
+    T2_linear = linear_time(erlang:localtime()),
+    T2_now = microsecs(now()),
 
-    ?line Linear_Diff = (T2_linear-T1_linear)*1000000,
-    ?line Now_Diff = T2_now-T1_now,
-    test_server:format("Localtime diff = ~p; now() diff = ~p",
-		       [Linear_Diff, Now_Diff]),
-    ?line case abs(Linear_Diff - Now_Diff) of
+    Linear_Diff = (T2_linear-T1_linear)*1000000,
+    Now_Diff = T2_now-T1_now,
+    io:format("Localtime diff = ~p; now() diff = ~p", [Linear_Diff, Now_Diff]),
+    case abs(Linear_Diff - Now_Diff) of
 	      Abs_Delta when Abs_Delta =< 40000 -> ok;
 	      _ -> now_update1(N-1)
 	  end;
 now_update1(0) ->
-    ?line test_server:fail().
+    ct:fail("now_update zero").
 
 time_warp_modes(Config) when is_list(Config) ->
     %% All time warp modes always supported in
@@ -551,14 +542,14 @@ check_time_warp_mode(Config, TimeCorrection, TimeWarpMode) ->
 	    io:format("Uptime inconsistency", []),
 	    case {TimeCorrection, erlang:system_info(time_correction)} of
 		{true, true} ->
-		    ?t:fail(uptime_inconsistency);
+		    ct:fail(uptime_inconsistency);
 		{true, false} ->
 		    _ = erlang:time_offset(),
 		    receive
 			{'CHANGE', Mon, time_offset, clock_service, _} ->
 			    ignore
 		    after 1000 ->
-			    ?t:fail(uptime_inconsistency)
+			    ct:fail(uptime_inconsistency)
 		    end;
 		_ ->
 		    ignore
@@ -728,10 +719,10 @@ check_time_offset_res_conv(Mon, Res) ->
 	TORes2 ->
 	    case check_time_offset_change(Mon, TO, 1000) of
 		{TO, false} ->
-		    ?t:fail({time_unit_conversion_inconsistency,
+		    ct:fail({time_unit_conversion_inconsistency,
 			     TO, TORes, TORes2});
 		{_NewTO, true} ->
-		    ?t:format("time_offset changed", []),
+		    io:format("time_offset changed", []),
 		    check_time_offset_res_conv(Mon, Res)
 	    end
     end.
@@ -776,25 +767,21 @@ chk_strc(Res0, Res1) ->
     ok.
 
 chk_random_values(FR, TR) ->
-%    case (FR rem TR == 0) orelse (TR rem FR == 0) of
-%	true ->
-	    io:format("rand values ~p -> ~p~n", [FR, TR]),
-	    random:seed(268438039, 268440479, 268439161),
-	    Values = lists:map(fun (_) -> random:uniform(1 bsl 65) - (1 bsl 64) end,
-			       lists:seq(1, 100000)),
-	    CheckFun = fun (V) ->
-			       CV = erlang:convert_time_unit(V, FR, TR),
-			       case {(FR*CV) div TR =< V,
-				     (FR*(CV+1)) div TR >= V} of
-				   {true, true} ->
-				       ok;
-				   Failure ->
-				       ?t:fail({Failure, CV, V, FR, TR})
-			       end
-		       end,
-	    lists:foreach(CheckFun, Values).%;
-%	false -> ok
-%    end.
+    io:format("rand values ~p -> ~p~n", [FR, TR]),
+    rand:seed(exsplus, {268438039,268440479,268439161}),
+    Values = lists:map(fun (_) -> rand:uniform(1 bsl 65) - (1 bsl 64) end,
+		       lists:seq(1, 100000)),
+    CheckFun = fun (V) ->
+                       CV = erlang:convert_time_unit(V, FR, TR),
+                       case {(FR*CV) div TR =< V,
+                             (FR*(CV+1)) div TR >= V} of
+                           {true, true} ->
+                               ok;
+                           Failure ->
+                               ct:fail({Failure, CV, V, FR, TR})
+                       end
+               end,
+    lists:foreach(CheckFun, Values).
 		       
 
 chk_values_per_value(_FromRes, _ToRes,
@@ -805,7 +792,7 @@ chk_values_per_value(_FromRes, _ToRes,
     case ((MinFromValuesPerToValue =< FromValueCount)
 	  andalso (FromValueCount =< MaxFromValuesPerToValue)) of
 	false ->
-	    ?t:fail({MinFromValuesPerToValue,
+	    ct:fail({MinFromValuesPerToValue,
 		     FromValueCount,
 		     MaxFromValuesPerToValue});
 	true ->
@@ -815,28 +802,28 @@ chk_values_per_value(FromRes, ToRes, Value, EndValue,
 		     MinFromValuesPerToValue, MaxFromValuesPerToValue,
 		     ToValue, FromValueCount) ->
     case erlang:convert_time_unit(Value, FromRes, ToRes) of
-	ToValue ->
-	    chk_values_per_value(FromRes, ToRes,
-				 Value+1, EndValue,
-				 MinFromValuesPerToValue,
-				 MaxFromValuesPerToValue,
-				 ToValue, FromValueCount+1);
-	NewToValue ->
-	    case ((MinFromValuesPerToValue =< FromValueCount)
-		  andalso (FromValueCount =< MaxFromValuesPerToValue)) of
-		false ->
-		    ?t:fail({MinFromValuesPerToValue,
-			     FromValueCount,
-			     MaxFromValuesPerToValue});
-		true ->
-%		    io:format("~p -> ~p [~p]~n",
-%			      [Value, NewToValue, FromValueCount]),
-		    chk_values_per_value(FromRes, ToRes,
-					 Value+1, EndValue,
-					 MinFromValuesPerToValue,
-					 MaxFromValuesPerToValue,
-					 NewToValue, 1)
-	    end
+        ToValue ->
+            chk_values_per_value(FromRes, ToRes,
+                                 Value+1, EndValue,
+                                 MinFromValuesPerToValue,
+                                 MaxFromValuesPerToValue,
+                                 ToValue, FromValueCount+1);
+        NewToValue ->
+            case ((MinFromValuesPerToValue =< FromValueCount)
+                  andalso (FromValueCount =< MaxFromValuesPerToValue)) of
+                false ->
+                    ct:fail({MinFromValuesPerToValue,
+                             FromValueCount,
+                             MaxFromValuesPerToValue});
+                true ->
+                    %		    io:format("~p -> ~p [~p]~n",
+                    %			      [Value, NewToValue, FromValueCount]),
+                    chk_values_per_value(FromRes, ToRes,
+                                         Value+1, EndValue,
+                                         MinFromValuesPerToValue,
+                                         MaxFromValuesPerToValue,
+                                         NewToValue, 1)
+            end
     end.
 
 erlang_timestamp(Config) when is_list(Config) ->
@@ -849,11 +836,11 @@ erlang_timestamp(Config) when is_list(Config) ->
 
 check_erlang_timestamp(Done, Mon, TO) ->
     receive
-	{timeout, Done, timeout} ->
-	    erlang:demonitor(Mon, [flush]),
-	    ok
+        {timeout, Done, timeout} ->
+            erlang:demonitor(Mon, [flush]),
+            ok
     after 0 ->
-	    do_check_erlang_timestamp(Done, Mon, TO)
+              do_check_erlang_timestamp(Done, Mon, TO)
     end.
 
 do_check_erlang_timestamp(Done, Mon, TO) ->
@@ -878,13 +865,13 @@ do_check_erlang_timestamp(Done, Mon, TO) ->
 	    check_erlang_timestamp(Done, Mon, NewTO);
 	false ->
 	    io:format("TsMin=~p TsTime=~p TsMax=~p~n", [TsMin, TsTime, TsMax]),
-	    ?t:format("Detected inconsistency; "
+	    io:format("Detected inconsistency; "
 		      "checking for time_offset change...", []),
 	    case check_time_offset_change(Mon, TO, 1000) of
 		{TO, false} ->
-		    ?t:fail(timestamp_inconsistency);
+		    ct:fail(timestamp_inconsistency);
 		{NewTO, true} ->
-		    ?t:format("time_offset changed", []),
+		    io:format("time_offset changed", []),
 		    check_erlang_timestamp(Done, Mon, NewTO)
 	    end
     end.
@@ -925,13 +912,13 @@ test_data() ->
 	    _ ->
 		{?timezone,?dst_timezone}
 	end,
-    ?line test_data(nondst_dates(), TZ) ++
+    test_data(nondst_dates(), TZ) ++
 	test_data(dst_dates(), DSTTZ) ++
 	crossover_test_data(crossover_dates(), TZ).    
 
 
 %% test_data1() ->
-%%     ?line test_data(nondst_dates(), ?timezone) ++
+%%     test_data(nondst_dates(), ?timezone) ++
 %% 	test_data(dst_dates(), ?dst_timezone) ++
 %% 	crossover_test_data(crossover_dates(), ?timezone).
 
@@ -939,16 +926,16 @@ crossover_test_data([{Year, Month, Day}|Rest], TimeZone) when TimeZone > 0 ->
     Hour = 23,
     Min = 35,
     Sec = 55,
-    ?line Utc = {{Year, Month, Day}, {Hour, Min, Sec}},
-    ?line Local = {{Year, Month, Day+1}, {Hour+TimeZone-24, Min, Sec}},
-    ?line [{Utc, Local}|crossover_test_data(Rest, TimeZone)];
+    Utc = {{Year, Month, Day}, {Hour, Min, Sec}},
+    Local = {{Year, Month, Day+1}, {Hour+TimeZone-24, Min, Sec}},
+    [{Utc, Local}|crossover_test_data(Rest, TimeZone)];
 crossover_test_data([{Year, Month, Day}|Rest], TimeZone) when TimeZone < 0 ->
     Hour = 0,
     Min = 23,
     Sec = 12,
-    ?line Utc = {{Year, Month, Day}, {Hour, Min, Sec}},
-    ?line Local = {{Year, Month, Day-1}, {Hour+TimeZone+24, Min, Sec}},
-    ?line [{Utc, Local}|crossover_test_data(Rest, TimeZone)];
+    Utc = {{Year, Month, Day}, {Hour, Min, Sec}},
+    Local = {{Year, Month, Day-1}, {Hour+TimeZone+24, Min, Sec}},
+    [{Utc, Local}|crossover_test_data(Rest, TimeZone)];
 crossover_test_data([], _) ->
     [].
 
@@ -956,9 +943,9 @@ test_data([Date|Rest], TimeZone) ->
     Hour = 12,
     Min = 45,
     Sec = 7,
-    ?line Utc = {Date, {Hour, Min, Sec}},
-    ?line Local = {Date, {Hour+TimeZone, Min, Sec}},
-    ?line [{Utc, Local}|test_data(Rest, TimeZone)];
+    Utc = {Date, {Hour, Min, Sec}},
+    Local = {Date, {Hour+TimeZone, Min, Sec}},
+    [{Utc, Local}|test_data(Rest, TimeZone)];
 test_data([], _) ->
     [].
     
@@ -1049,7 +1036,7 @@ start_node(Config) ->
     start_node(Config, "").
 
 start_node(Config, Args) ->
-    TestCase = ?config(testcase, Config),
+    TestCase = proplists:get_value(testcase, Config),
     PA = filename:dirname(code:which(?MODULE)),
     ESTime = erlang:monotonic_time(1) + erlang:time_offset(1),
     Unique = erlang:unique_integer([positive]),
diff --git a/erts/emulator/test/timer_bif_SUITE.erl b/erts/emulator/test/timer_bif_SUITE.erl
index 51d59f09f3..fa72700604 100644
--- a/erts/emulator/test/timer_bif_SUITE.erl
+++ b/erts/emulator/test/timer_bif_SUITE.erl
@@ -20,8 +20,7 @@
 
 -module(timer_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, init_per_suite/1, end_per_suite/1,
 	 init_per_testcase/2,end_per_testcase/2]).
 -export([start_timer_1/1, send_after_1/1, send_after_2/1, send_after_3/1,
 	 cancel_timer_1/1,
@@ -33,23 +32,20 @@
 %	 same_time_yielding_with_cancel_other_accessor/1,
 	 auto_cancel_yielding/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(SHORT_TIMEOUT, 5000). %% Bif timers as short as this may be pre-allocated
 -define(TIMEOUT_YIELD_LIMIT, 100).
 -define(AUTO_CANCEL_YIELD_LIMIT, 100).
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(test_server:seconds(30)),
     case catch erts_debug:get_internal_state(available_internal_state) of
 	true -> ok;
 	_ -> erts_debug:set_internal_state(available_internal_state, true)
     end,
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
 init_per_suite(Config) ->
@@ -59,7 +55,9 @@ init_per_suite(Config) ->
 end_per_suite(_Config) ->
     catch erts_debug:set_internal_state(available_internal_state, false).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 5}}].
 
 all() -> 
     [start_timer_1, send_after_1, send_after_2,
@@ -72,17 +70,8 @@ all() ->
 %     same_time_yielding_with_cancel_other_accessor,
      auto_cancel_yielding].
 
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
-start_timer_1(doc) -> ["Basic start_timer/3 functionality"];
+%% Basic start_timer/3 functionality
 start_timer_1(Config) when is_list(Config) ->
     Ref1 = erlang:start_timer(1000, self(), plopp),
     ok   = get(1100, {timeout, Ref1, plopp}),
@@ -102,54 +91,54 @@ start_timer_1(Config) when is_list(Config) ->
     no_message = get(900, {timeout, Ref3, plopp}),
     ok.
 
-send_after_1(doc) -> ["Basic send_after/3 functionality"];
+%% Basic send_after/3 functionality
 send_after_1(Config) when is_list(Config) ->
-    ?line Ref3 = erlang:send_after(1000, self(), plipp),
-    ?line ok = get(1500, plipp),
-    ?line false = erlang:read_timer(Ref3),
+    Ref3 = erlang:send_after(1000, self(), plipp),
+    ok = get(1500, plipp),
+    false = erlang:read_timer(Ref3),
     ok.
 
-start_timer_big(doc) -> ["Big timeouts for start_timer/3"];
+%% Big timeouts for start_timer/3
 start_timer_big(Config) when is_list(Config) ->
-    ?line Big = 1 bsl 31,
-    ?line R = erlang:start_timer(Big, self(), hej),
-    ?line timer:sleep(200),
-    ?line Left = erlang:cancel_timer(R),
-    ?line case Big - Left of
-	      Diff when Diff >= 200, Diff < 10000 ->
-		  ok;
-	      _Diff ->
-		  test_server:fail({big, Big, Left})
-	  end,
+    Big = 1 bsl 31,
+    R = erlang:start_timer(Big, self(), hej),
+    timer:sleep(200),
+    Left = erlang:cancel_timer(R),
+    case Big - Left of
+        Diff when Diff >= 200, Diff < 10000 ->
+            ok;
+        _Diff ->
+            ct:fail({big, Big, Left})
+    end,
     ok.
 
-send_after_big(doc) -> ["Big timeouts for send_after/3"];
+%% Big timeouts for send_after/3
 send_after_big(Config) when is_list(Config) ->
-    ?line Big = 1 bsl 31,
-    ?line R = erlang:send_after(Big, self(), hej),
-    ?line timer:sleep(200),
-    ?line Left = erlang:cancel_timer(R),
-    ?line case Big - Left of
-	      Diff when Diff >= 200, Diff < 10000 ->
-		  ok;
-	      _Diff ->
-		  test_server:fail({big, Big, Left})
-	  end,
+    Big = 1 bsl 31,
+    R = erlang:send_after(Big, self(), hej),
+    timer:sleep(200),
+    Left = erlang:cancel_timer(R),
+    case Big - Left of
+        Diff when Diff >= 200, Diff < 10000 ->
+            ok;
+        _Diff ->
+            ct:fail({big, Big, Left})
+    end,
     ok.
 
-send_after_2(doc) -> ["send_after/3: messages in the right order, kind version"];
+%% send_after/3: messages in the right order, kind version
 send_after_2(Config) when is_list(Config) ->
-    ?line _ = erlang:send_after(5000, self(), last),
-    ?line _ = erlang:send_after(0, self(), a0),
-    ?line _ = erlang:send_after(200, self(), a2),
-    ?line _ = erlang:send_after(100, self(), a1),
-    ?line _ = erlang:send_after(500, self(), a5),
-    ?line _ = erlang:send_after(300, self(), a3),
-    ?line _ = erlang:send_after(400, self(), a4),
-    ?line [a0,a1,a2,a3,a4,a5,last] = collect(last),
+    _ = erlang:send_after(5000, self(), last),
+    _ = erlang:send_after(0, self(), a0),
+    _ = erlang:send_after(200, self(), a2),
+    _ = erlang:send_after(100, self(), a1),
+    _ = erlang:send_after(500, self(), a5),
+    _ = erlang:send_after(300, self(), a3),
+    _ = erlang:send_after(400, self(), a4),
+    [a0,a1,a2,a3,a4,a5,last] = collect(last),
     ok.
 
-send_after_3(doc) -> ["send_after/3: messages in the right order, worse than send_after_2"];
+%% send_after/3: messages in the right order, worse than send_after_2
 send_after_3(Config) when is_list(Config) ->
     _ = erlang:send_after(100, self(), b1),
     _ = erlang:send_after(101, self(), b2),
@@ -157,74 +146,70 @@ send_after_3(Config) when is_list(Config) ->
     _ = erlang:send_after(103, self(), last),
     [b1, b2, b3, last] = collect(last),
 
-% This behaviour is not guaranteed:
-%    ?line _ = erlang:send_after(100, self(), c1),
-%    ?line _ = erlang:send_after(100, self(), c2),
-%    ?line _ = erlang:send_after(100, self(), c3),
-%    ?line _ = erlang:send_after(100, self(), last),
-%    ?line [c1, c2, c3, last] = collect(last),
+    % This behaviour is not guaranteed:
+    %    _ = erlang:send_after(100, self(), c1),
+    %    _ = erlang:send_after(100, self(), c2),
+    %    _ = erlang:send_after(100, self(), c3),
+    %    _ = erlang:send_after(100, self(), last),
+    %    [c1, c2, c3, last] = collect(last),
 
     ok.
 
-cancel_timer_1(doc) -> ["Check trivial cancel_timer/1 behaviour"];
+%% Check trivial cancel_timer/1 behaviour
 cancel_timer_1(Config) when is_list(Config) ->
-    ?line false = erlang:cancel_timer(make_ref()),
+    false = erlang:cancel_timer(make_ref()),
 
     ok.
 
-start_timer_e(doc) -> ["Error cases for start_timer/3"];
+%% Error cases for start_timer/3
 start_timer_e(Config) when is_list(Config) ->
-    ?line {'EXIT', _} = (catch erlang:start_timer(-4, self(), hej)),
-    ?line {'EXIT', _} = (catch erlang:start_timer(1 bsl 64,
-						  self(), hej)),
+    {'EXIT', _} = (catch erlang:start_timer(-4, self(), hej)),
+    {'EXIT', _} = (catch erlang:start_timer(1 bsl 64,
+                                            self(), hej)),
 
-    ?line {'EXIT', _} = (catch erlang:start_timer(4.5, self(), hej)),
-    ?line {'EXIT', _} = (catch erlang:start_timer(a, self(), hej)),
+    {'EXIT', _} = (catch erlang:start_timer(4.5, self(), hej)),
+    {'EXIT', _} = (catch erlang:start_timer(a, self(), hej)),
 
-    ?line Node = start_slave(),
-    ?line Pid = spawn(Node, timer, sleep, [10000]),
-    ?line {'EXIT', _} = (catch erlang:start_timer(1000, Pid, hej)),
-    ?line stop_slave(Node),
+    Node = start_slave(),
+    Pid = spawn(Node, timer, sleep, [10000]),
+    {'EXIT', _} = (catch erlang:start_timer(1000, Pid, hej)),
+    stop_slave(Node),
 
 
     ok.
 
-send_after_e(doc) -> ["Error cases for send_after/3"];
-send_after_e(suite) -> [];
+%% Error cases for send_after/3
 send_after_e(Config) when is_list(Config) ->
-    ?line {'EXIT', _} = (catch erlang:send_after(-4, self(), hej)),
-    ?line {'EXIT', _} = (catch erlang:send_after(1 bsl 64,
-						 self(), hej)),
+    {'EXIT', _} = (catch erlang:send_after(-4, self(), hej)),
+    {'EXIT', _} = (catch erlang:send_after(1 bsl 64,
+                                           self(), hej)),
 
-    ?line {'EXIT', _} = (catch erlang:send_after(4.5, self(), hej)),
-    ?line {'EXIT', _} = (catch erlang:send_after(a, self(), hej)),
+    {'EXIT', _} = (catch erlang:send_after(4.5, self(), hej)),
+    {'EXIT', _} = (catch erlang:send_after(a, self(), hej)),
 
-    ?line Node = start_slave(),
-    ?line Pid = spawn(Node, timer, sleep, [10000]),
-    ?line {'EXIT', _} = (catch erlang:send_after(1000, Pid, hej)),
-    ?line stop_slave(Node),
+    Node = start_slave(),
+    Pid = spawn(Node, timer, sleep, [10000]),
+    {'EXIT', _} = (catch erlang:send_after(1000, Pid, hej)),
+    stop_slave(Node),
     ok.
 
-cancel_timer_e(doc) -> ["Error cases for cancel_timer/1"];
-cancel_timer_e(suite) -> [];
+%% Error cases for cancel_timer/1
 cancel_timer_e(Config) when is_list(Config) ->
-    ?line {'EXIT', _} = (catch erlang:cancel_timer(1)),
-    ?line {'EXIT', _} = (catch erlang:cancel_timer(self())),
-    ?line {'EXIT', _} = (catch erlang:cancel_timer(a)),
+    {'EXIT', _} = (catch erlang:cancel_timer(1)),
+    {'EXIT', _} = (catch erlang:cancel_timer(self())),
+    {'EXIT', _} = (catch erlang:cancel_timer(a)),
     ok.
 
-read_timer_trivial(doc) -> ["Trivial and error test cases for read_timer/1."];
-read_timer_trivial(suite) -> [];
+%% Trivial and error test cases for read_timer/1.
 read_timer_trivial(Config) when is_list(Config) ->
-    ?line false = erlang:read_timer(make_ref()),
-    ?line {'EXIT', _} = (catch erlang:read_timer(42)),
-    ?line {'EXIT', _} = (catch erlang:read_timer(423497834744444444457667444444)),
-    ?line {'EXIT', _} = (catch erlang:read_timer(self())),
-    ?line {'EXIT', _} = (catch erlang:read_timer(ab)),
+    false = erlang:read_timer(make_ref()),
+    {'EXIT', _} = (catch erlang:read_timer(42)),
+    {'EXIT', _} = (catch erlang:read_timer(423497834744444444457667444444)),
+    {'EXIT', _} = (catch erlang:read_timer(self())),
+    {'EXIT', _} = (catch erlang:read_timer(ab)),
     ok.
 
-read_timer(doc) -> ["Test that read_timer/1 seems to return the correct values."];
-read_timer(suite) -> [];
+%% Test that read_timer/1 seems to return the correct values.
 read_timer(Config) when is_list(Config) ->
     process_flag(scheduler, 1),
     Big = 1 bsl 31,
@@ -234,22 +219,21 @@ read_timer(Config) when is_list(Config) ->
     Left = erlang:read_timer(R),
     Left2 = erlang:cancel_timer(R),
     case Left == Left2 of
-	true -> ok;
-	false -> Left = Left2 + 1
+        true -> ok;
+        false -> Left = Left2 + 1
     end,
     false = erlang:read_timer(R),
 
     case Big - Left of
-	Diff when Diff >= 200, Diff < 10000 ->
-	    ok;
-	_Diff ->
-	    test_server:fail({big, Big, Left})
+        Diff when Diff >= 200, Diff < 10000 ->
+            ok;
+        _Diff ->
+            ct:fail({big, Big, Left})
     end,
     process_flag(scheduler, 0),
     ok.
 
-read_timer_async(doc) -> ["Test that read_timer/1 seems to return the correct values."];
-read_timer_async(suite) -> [];
+%% Test that read_timer/1 seems to return the correct values.
 read_timer_async(Config) when is_list(Config) ->
     process_flag(scheduler, 1),
     Big = 1 bsl 33,
@@ -266,73 +250,69 @@ read_timer_async(Config) when is_list(Config) ->
     {read_timer, R, Left} = receive_one(),
     {cancel_timer, R, Left2} = receive_one(),
     case Left == Left2 of
-	true -> ok;
-	false -> Left = Left2 + 1
+        true -> ok;
+        false -> Left = Left2 + 1
     end,
     {read_timer, R, false} = receive_one(),
 
     case Big - Left of
-	Diff when Diff >= 200, Diff < 10000 ->
-	    ok;
-	_Diff ->
-	    test_server:fail({big, Big, Left})
+        Diff when Diff >= 200, Diff < 10000 ->
+            ok;
+        _Diff ->
+            ct:fail({big, Big, Left})
     end,
     process_flag(scheduler, 0),
     ok.
 
-cleanup(doc) -> [];
-cleanup(suite) -> [];
 cleanup(Config) when is_list(Config) ->
-    ?line Mem = mem(),
+    Mem = mem(),
     %% Timer on dead process
-    ?line P1 = spawn(fun () -> ok end),
-    ?line wait_until(fun () -> process_is_cleaned_up(P1) end),
-    ?line T1 = erlang:start_timer(?SHORT_TIMEOUT*2, P1, "hej"),
-    ?line T2 = erlang:send_after(?SHORT_TIMEOUT*2, P1, "hej"),
+    P1 = spawn(fun () -> ok end),
+    wait_until(fun () -> process_is_cleaned_up(P1) end),
+    T1 = erlang:start_timer(?SHORT_TIMEOUT*2, P1, "hej"),
+    T2 = erlang:send_after(?SHORT_TIMEOUT*2, P1, "hej"),
     receive after 1000 -> ok end,
-    ?line Mem = mem(),
-    ?line false = erlang:read_timer(T1),
-    ?line false = erlang:read_timer(T2),
-    ?line Mem = mem(),
+    Mem = mem(),
+    false = erlang:read_timer(T1),
+    false = erlang:read_timer(T2),
+    Mem = mem(),
     %% Process dies before timeout
-    ?line P2 = spawn(fun () -> receive after (?SHORT_TIMEOUT div 10) -> ok end end),
-    ?line T3 = erlang:start_timer(?SHORT_TIMEOUT*2, P2, "hej"),
-    ?line T4 = erlang:send_after(?SHORT_TIMEOUT*2, P2, "hej"),
-    ?line true = mem_larger_than(Mem),
-    ?line true = is_integer(erlang:read_timer(T3)),
-    ?line true = is_integer(erlang:read_timer(T4)),
-    ?line wait_until(fun () -> process_is_cleaned_up(P2) end),
+    P2 = spawn(fun () -> receive after (?SHORT_TIMEOUT div 10) -> ok end end),
+    T3 = erlang:start_timer(?SHORT_TIMEOUT*2, P2, "hej"),
+    T4 = erlang:send_after(?SHORT_TIMEOUT*2, P2, "hej"),
+    true = mem_larger_than(Mem),
+    true = is_integer(erlang:read_timer(T3)),
+    true = is_integer(erlang:read_timer(T4)),
+    wait_until(fun () -> process_is_cleaned_up(P2) end),
     receive after 1000 -> ok end,
-    ?line false = erlang:read_timer(T3),
-    ?line false = erlang:read_timer(T4),
-    ?line Mem = mem(),
+    false = erlang:read_timer(T3),
+    false = erlang:read_timer(T4),
+    Mem = mem(),
     %% Cancel timer
-    ?line P3 = spawn(fun () -> receive after ?SHORT_TIMEOUT*4 -> ok end end),
-    ?line T5 = erlang:start_timer(?SHORT_TIMEOUT*2, P3, "hej"),
-    ?line T6 = erlang:send_after(?SHORT_TIMEOUT*2, P3, "hej"),
-    ?line true = mem_larger_than(Mem),
-    ?line true = is_integer(erlang:cancel_timer(T5)),
-    ?line true = is_integer(erlang:cancel_timer(T6)),
-    ?line false = erlang:read_timer(T5),
-    ?line false = erlang:read_timer(T6),
-    ?line exit(P3, kill),
-    ?line wait_until(fun () -> process_is_cleaned_up(P3) end),
-    ?line Mem = mem(),
+    P3 = spawn(fun () -> receive after ?SHORT_TIMEOUT*4 -> ok end end),
+    T5 = erlang:start_timer(?SHORT_TIMEOUT*2, P3, "hej"),
+    T6 = erlang:send_after(?SHORT_TIMEOUT*2, P3, "hej"),
+    true = mem_larger_than(Mem),
+    true = is_integer(erlang:cancel_timer(T5)),
+    true = is_integer(erlang:cancel_timer(T6)),
+    false = erlang:read_timer(T5),
+    false = erlang:read_timer(T6),
+    exit(P3, kill),
+    wait_until(fun () -> process_is_cleaned_up(P3) end),
+    Mem = mem(),
     %% Timeout
-    ?line Ref = make_ref(),
-    ?line T7 = erlang:start_timer(?SHORT_TIMEOUT+1, self(), Ref),
-    ?line T8 = erlang:send_after(?SHORT_TIMEOUT+1, self(), Ref),
-    ?line true = mem_larger_than(Mem),
-    ?line true = is_integer(erlang:read_timer(T7)),
-    ?line true = is_integer(erlang:read_timer(T8)),
-    ?line receive {timeout, T7, Ref} -> ok end,
-    ?line receive Ref -> ok end,
-    ?line Mem = mem(),
-    ?line ok.
-
-
-evil_timers(doc) -> [];
-evil_timers(suite) -> [];
+    Ref = make_ref(),
+    T7 = erlang:start_timer(?SHORT_TIMEOUT+1, self(), Ref),
+    T8 = erlang:send_after(?SHORT_TIMEOUT+1, self(), Ref),
+    true = mem_larger_than(Mem),
+    true = is_integer(erlang:read_timer(T7)),
+    true = is_integer(erlang:read_timer(T8)),
+    receive {timeout, T7, Ref} -> ok end,
+    receive Ref -> ok end,
+    Mem = mem(),
+    ok.
+
+
 evil_timers(Config) when is_list(Config) ->
     %% Create a composite term consisting of at least:
     %% * externals (remote pids, ports, and refs)
@@ -344,38 +324,38 @@ evil_timers(Config) when is_list(Config) ->
     %% * lists
     %% since data of these types have to be adjusted if moved
     %% in memory
-    ?line Self = self(),
-    ?line R1 = make_ref(),
-    ?line Node = start_slave(),
-    ?line spawn_link(Node,
-		     fun () ->
-			     Self ! {R1,
-				     [lists:sublist(erlang:ports(), 3),
-				      [make_ref(), make_ref(), make_ref()],
-				      lists:sublist(processes(), 3),
-				      [fun () -> gurka end,
-				       fun (A) -> A + 1 end,
-				       fun (A, B) -> A + B end]]}
-		     end),
-    ?line ExtList = receive {R1, L} -> L end,
-    ?line stop_slave(Node),
-    ?line BinList = [<<"bla">>,
-		     <<"blipp">>,
-		     <<"blupp">>,
-		     list_to_binary(lists:duplicate(1000000,$a)),
-		     list_to_binary(lists:duplicate(1000000,$b)),
-		     list_to_binary(lists:duplicate(1000000,$c))],
-    ?line FunList = [fun () -> gurka end,
-		     fun (A) -> A + 1 end,
-		     fun (A, B) -> A + B end],
-    ?line PidList = lists:sublist(processes(), 3),
-    ?line PortList = lists:sublist(erlang:ports(), 3),
-    ?line RefList = [make_ref(), make_ref(), make_ref()],
-    ?line BigList = [111111111111, 22222222222222, 333333333333333333],
-    ?line Msg = {BinList,[FunList,{RefList,ExtList,PidList,PortList,BigList}]},
-    %% ?line ?t:format("Msg=~p~n",[Msg]),
-
-    ?line Prio = process_flag(priority, max),
+    Self = self(),
+    R1 = make_ref(),
+    Node = start_slave(),
+    spawn_link(Node,
+               fun () ->
+                       Self ! {R1,
+                               [lists:sublist(erlang:ports(), 3),
+                                [make_ref(), make_ref(), make_ref()],
+                                lists:sublist(processes(), 3),
+                                [fun () -> gurka end,
+                                 fun (A) -> A + 1 end,
+                                 fun (A, B) -> A + B end]]}
+               end),
+    ExtList = receive {R1, L} -> L end,
+    stop_slave(Node),
+    BinList = [<<"bla">>,
+               <<"blipp">>,
+               <<"blupp">>,
+               list_to_binary(lists:duplicate(1000000,$a)),
+               list_to_binary(lists:duplicate(1000000,$b)),
+               list_to_binary(lists:duplicate(1000000,$c))],
+    FunList = [fun () -> gurka end,
+               fun (A) -> A + 1 end,
+               fun (A, B) -> A + B end],
+    PidList = lists:sublist(processes(), 3),
+    PortList = lists:sublist(erlang:ports(), 3),
+    RefList = [make_ref(), make_ref(), make_ref()],
+    BigList = [111111111111, 22222222222222, 333333333333333333],
+    Msg = {BinList,[FunList,{RefList,ExtList,PidList,PortList,BigList}]},
+    %% io:format("Msg=~p~n",[Msg]),
+
+    Prio = process_flag(priority, max),
     %%
     %% In the smp case there are four major cases we want to test:
     %%
@@ -388,8 +368,8 @@ evil_timers(Config) when is_list(Config) ->
     %%    be allocated in the previously allocated message buffer along
     %%    with Msg, i.e. the previously allocated message buffer will be
     %%    reallocated and potentially moved.
-    ?line TimeOutMsgs0 = evil_setup_timers(200, Self, Msg),
-    ?line RecvTimeOutMsgs0 = evil_recv_timeouts(200),
+    TimeOutMsgs0 = evil_setup_timers(200, Self, Msg),
+    RecvTimeOutMsgs0 = evil_recv_timeouts(200),
     %% 2. A timer started with erlang:start_timer(Time, Receiver, Msg),
     %%    where Msg is an immediate term, expires, and the receivers main
     %%    lock *can not* be acquired immediately (typically when the
@@ -397,8 +377,8 @@ evil_timers(Config) when is_list(Config) ->
     %%
     %%    The wrap tuple will in this case be allocated in a new
     %%    message buffer.
-    ?line TimeOutMsgs1 = evil_setup_timers(200, Self, immediate),
-    ?line RecvTimeOutMsgs1 = evil_recv_timeouts(200),
+    TimeOutMsgs1 = evil_setup_timers(200, Self, immediate),
+    RecvTimeOutMsgs1 = evil_recv_timeouts(200),
     %% 3. A timer started with erlang:start_timer(Time, Receiver, Msg),
     %%    where Msg is a composite term, expires, and the receivers main
     %%    lock *can* be acquired immediately (typically when the receiver
@@ -407,13 +387,13 @@ evil_timers(Config) when is_list(Config) ->
     %%    The wrap tuple will in this case be allocated on the receivers
     %%    heap, and Msg is passed in the previously allocated message
     %%    buffer.
-    ?line R2 = make_ref(),
-    ?line spawn_link(fun () ->
-			     Self ! {R2, evil_setup_timers(200, Self, Msg)}
-		     end),
-    ?line receive after 1000 -> ok end,
-    ?line TimeOutMsgs2 = receive {R2, TOM2} -> TOM2 end,
-    ?line RecvTimeOutMsgs2 = evil_recv_timeouts(200),
+    R2 = make_ref(),
+    spawn_link(fun () ->
+                       Self ! {R2, evil_setup_timers(200, Self, Msg)}
+               end),
+    receive after 1000 -> ok end,
+    TimeOutMsgs2 = receive {R2, TOM2} -> TOM2 end,
+    RecvTimeOutMsgs2 = evil_recv_timeouts(200),
     %% 4. A timer started with erlang:start_timer(Time, Receiver, Msg),
     %%    where Msg is an immediate term, expires, and the Receivers main
     %%    lock *can* be acquired immediately (typically when the receiver
@@ -421,109 +401,107 @@ evil_timers(Config) when is_list(Config) ->
     %%
     %%    The wrap tuple will in this case be allocated on the receivers
     %%    heap.
-    ?line R3 = make_ref(),
-    ?line spawn_link(fun () ->
-			     Self ! {R3, evil_setup_timers(200,Self,immediate)}
-		     end),
-    ?line receive after 1000 -> ok end,
-    ?line TimeOutMsgs3 = receive {R3, TOM3} -> TOM3 end,
-    ?line RecvTimeOutMsgs3 = evil_recv_timeouts(200),
+    R3 = make_ref(),
+    spawn_link(fun () ->
+                       Self ! {R3, evil_setup_timers(200,Self,immediate)}
+               end),
+    receive after 1000 -> ok end,
+    TimeOutMsgs3 = receive {R3, TOM3} -> TOM3 end,
+    RecvTimeOutMsgs3 = evil_recv_timeouts(200),
 
     %% Garge collection will hopefully crash the emulator if something
     %% is wrong...
-    ?line garbage_collect(),
-    ?line garbage_collect(),
-    ?line garbage_collect(),
+    garbage_collect(),
+    garbage_collect(),
+    garbage_collect(),
 
     %% Make sure we got the timeouts we expected
     %%
     %% Note timeouts are *not* guaranteed to be delivered in order
-    ?line ok = match(lists:sort(RecvTimeOutMsgs0), lists:sort(TimeOutMsgs0)),
-    ?line ok = match(lists:sort(RecvTimeOutMsgs1), lists:sort(TimeOutMsgs1)),
-    ?line ok = match(lists:sort(RecvTimeOutMsgs2), lists:sort(TimeOutMsgs2)),
-    ?line ok = match(lists:sort(RecvTimeOutMsgs3), lists:sort(TimeOutMsgs3)),
+    ok = match(lists:sort(RecvTimeOutMsgs0), lists:sort(TimeOutMsgs0)),
+    ok = match(lists:sort(RecvTimeOutMsgs1), lists:sort(TimeOutMsgs1)),
+    ok = match(lists:sort(RecvTimeOutMsgs2), lists:sort(TimeOutMsgs2)),
+    ok = match(lists:sort(RecvTimeOutMsgs3), lists:sort(TimeOutMsgs3)),
 
-    ?line process_flag(priority, Prio),
-    ?line ok.
+    process_flag(priority, Prio),
+    ok.
 
 evil_setup_timers(N, Receiver, Msg) ->
-    ?line evil_setup_timers(0, N, Receiver, Msg, []).
+    evil_setup_timers(0, N, Receiver, Msg, []).
 
 evil_setup_timers(N, N, _Receiver, _Msg, TOs) ->
-    ?line TOs;
+    TOs;
 evil_setup_timers(N, Max, Receiver, Msg, TOs) ->
-    ?line TRef = erlang:start_timer(N, Receiver, Msg),
-    ?line evil_setup_timers(N+1, Max, Receiver, Msg, [{timeout,TRef,Msg}|TOs]).
+    TRef = erlang:start_timer(N, Receiver, Msg),
+    evil_setup_timers(N+1, Max, Receiver, Msg, [{timeout,TRef,Msg}|TOs]).
 
 
 evil_recv_timeouts(M) ->
-    ?line evil_recv_timeouts([], 0, M).
+    evil_recv_timeouts([], 0, M).
 
 evil_recv_timeouts(TOs, N, N) ->
-    ?line TOs;
+    TOs;
 evil_recv_timeouts(TOs, N, M) ->
-    ?line receive
-	      {timeout, _, _} = TO ->
-		  ?line evil_recv_timeouts([TO|TOs], N+1, M)
-	  after 0 ->
-		  ?line evil_recv_timeouts(TOs, N, M)
-	  end.
-
-registered_process(doc) -> [];
-registered_process(suite) -> [];
+    receive
+        {timeout, _, _} = TO ->
+            evil_recv_timeouts([TO|TOs], N+1, M)
+    after 0 ->
+              evil_recv_timeouts(TOs, N, M)
+    end.
+
 registered_process(Config) when is_list(Config) ->
-    ?line Mem = mem(),
+    Mem = mem(),
     %% Cancel
-    ?line T1 = erlang:start_timer(?SHORT_TIMEOUT+1, ?MODULE, "hej"),
-    ?line T2 = erlang:send_after(?SHORT_TIMEOUT+1, ?MODULE, "hej"),
-    ?line undefined = whereis(?MODULE),
-    ?line true = mem_larger_than(Mem),
-    ?line true = is_integer(erlang:cancel_timer(T1)),
-    ?line true = is_integer(erlang:cancel_timer(T2)),
-    ?line false = erlang:read_timer(T1),
-    ?line false = erlang:read_timer(T2),
-    ?line Mem = mem(),
+    T1 = erlang:start_timer(?SHORT_TIMEOUT+1, ?MODULE, "hej"),
+    T2 = erlang:send_after(?SHORT_TIMEOUT+1, ?MODULE, "hej"),
+    undefined = whereis(?MODULE),
+    true = mem_larger_than(Mem),
+    true = is_integer(erlang:cancel_timer(T1)),
+    true = is_integer(erlang:cancel_timer(T2)),
+    false = erlang:read_timer(T1),
+    false = erlang:read_timer(T2),
+    Mem = mem(),
     %% Timeout register after start
-    ?line Ref1 = make_ref(),
-    ?line T3 = erlang:start_timer(?SHORT_TIMEOUT+1, ?MODULE, Ref1),
-    ?line T4 = erlang:send_after(?SHORT_TIMEOUT+1, ?MODULE, Ref1),
-    ?line undefined = whereis(?MODULE),
-    ?line true = mem_larger_than(Mem),
-    ?line true = is_integer(erlang:read_timer(T3)),
-    ?line true = is_integer(erlang:read_timer(T4)),
-    ?line true = register(?MODULE, self()),
-    ?line receive {timeout, T3, Ref1} -> ok end,
-    ?line receive Ref1 -> ok end,
-    ?line Mem = mem(),
+    Ref1 = make_ref(),
+    T3 = erlang:start_timer(?SHORT_TIMEOUT+1, ?MODULE, Ref1),
+    T4 = erlang:send_after(?SHORT_TIMEOUT+1, ?MODULE, Ref1),
+    undefined = whereis(?MODULE),
+    true = mem_larger_than(Mem),
+    true = is_integer(erlang:read_timer(T3)),
+    true = is_integer(erlang:read_timer(T4)),
+    true = register(?MODULE, self()),
+    receive {timeout, T3, Ref1} -> ok end,
+    receive Ref1 -> ok end,
+    Mem = mem(),
     %% Timeout register before start
-    ?line Ref2 = make_ref(),
-    ?line T5 = erlang:start_timer(?SHORT_TIMEOUT+1, ?MODULE, Ref2),
-    ?line T6 = erlang:send_after(?SHORT_TIMEOUT+1, ?MODULE, Ref2),
-    ?line true = mem_larger_than(Mem),
-    ?line true = is_integer(erlang:read_timer(T5)),
-    ?line true = is_integer(erlang:read_timer(T6)),
-    ?line receive {timeout, T5, Ref2} -> ok end,
-    ?line receive Ref2 -> ok end,
-    ?line Mem = mem(),
-    ?line true = unregister(?MODULE),
-    ?line ok.
+    Ref2 = make_ref(),
+    T5 = erlang:start_timer(?SHORT_TIMEOUT+1, ?MODULE, Ref2),
+    T6 = erlang:send_after(?SHORT_TIMEOUT+1, ?MODULE, Ref2),
+    true = mem_larger_than(Mem),
+    true = is_integer(erlang:read_timer(T5)),
+    true = is_integer(erlang:read_timer(T6)),
+    receive {timeout, T5, Ref2} -> ok end,
+    receive Ref2 -> ok end,
+    Mem = mem(),
+    true = unregister(?MODULE),
+    ok.
 
 same_time_yielding(Config) when is_list(Config) ->
     Mem = mem(),
     SchdlrsOnln = erlang:system_info(schedulers_online),
     Tmo = erlang:monotonic_time(milli_seconds) + 3000,
     Tmrs = lists:map(fun (I) ->
-			     process_flag(scheduler, (I rem SchdlrsOnln) + 1),
-			     erlang:start_timer(Tmo, self(), hej, [{abs, true}])
-		     end,
-		     lists:seq(1, (?TIMEOUT_YIELD_LIMIT*3+1)*SchdlrsOnln)),
+                             process_flag(scheduler, (I rem SchdlrsOnln) + 1),
+                             erlang:start_timer(Tmo, self(), hej, [{abs, true}])
+                     end,
+                     lists:seq(1, (?TIMEOUT_YIELD_LIMIT*3+1)*SchdlrsOnln)),
     true = mem_larger_than(Mem),
     lists:foreach(fun (Tmr) -> receive {timeout, Tmr, hej} -> ok end end, Tmrs),
     Done = erlang:monotonic_time(milli_seconds),
     true = Done >= Tmo,
     case erlang:system_info(build_type) of
-	opt -> true = Done < Tmo + 200;
-	_ -> true = Done < Tmo + 1000
+        opt -> true = Done < Tmo + 200;
+        _ -> true = Done < Tmo + 1000
     end,
     Mem = mem(),
     ok.
@@ -539,19 +517,19 @@ same_time_yielding_with_cancel_other(Config) when is_list(Config) ->
 
 do_cancel_tmrs(Tmo, Tmrs, Tester) ->
     BeginCancel = erlang:convert_time_unit(Tmo,
-					   milli_seconds,
-					   micro_seconds) - 100,
+                                           milli_seconds,
+                                           micro_seconds) - 100,
     busy_wait_until(fun () ->
-			    erlang:monotonic_time(micro_seconds) >= BeginCancel
-		    end),
+                            erlang:monotonic_time(micro_seconds) >= BeginCancel
+                    end),
     lists:foreach(fun (Tmr) ->
-			  erlang:cancel_timer(Tmr,
-					      [{async, true},
-					       {info, true}])
-		  end, Tmrs),
+                          erlang:cancel_timer(Tmr,
+                                              [{async, true},
+                                               {info, true}])
+                  end, Tmrs),
     case Tester == self() of
-	true -> ok;
-	false -> forward_msgs(Tester)
+        true -> ok;
+        false -> forward_msgs(Tester)
     end.
 
 same_time_yielding_with_cancel_test(Other, Accessor) ->
@@ -560,57 +538,57 @@ same_time_yielding_with_cancel_test(Other, Accessor) ->
     Tmo = erlang:monotonic_time(milli_seconds) + 3000,
     Tester = self(),
     Cancelor = case Other of
-		   false ->
-		       Tester;
-		   true ->
-		       spawn(fun () ->
-				     receive
-					 {timers, Tmrs} ->
-					     do_cancel_tmrs(Tmo, Tmrs, Tester)
-				     end
-			     end)
-	       end,
+                   false ->
+                       Tester;
+                   true ->
+                       spawn(fun () ->
+                                     receive
+                                         {timers, Tmrs} ->
+                                             do_cancel_tmrs(Tmo, Tmrs, Tester)
+                                     end
+                             end)
+               end,
     Opts = case Accessor of
-	       false -> [{abs, true}];
-	       true -> [{accessor, Cancelor}, {abs, true}]
-	   end,
+               false -> [{abs, true}];
+               true -> [{accessor, Cancelor}, {abs, true}]
+           end,
     Tmrs = lists:map(fun (I) ->
-			     process_flag(scheduler, (I rem SchdlrsOnln) + 1),
-			     erlang:start_timer(Tmo, self(), hej, Opts)
-		     end,
-		     lists:seq(1, (?TIMEOUT_YIELD_LIMIT*3+1)*SchdlrsOnln)),
+                             process_flag(scheduler, (I rem SchdlrsOnln) + 1),
+                             erlang:start_timer(Tmo, self(), hej, Opts)
+                     end,
+                     lists:seq(1, (?TIMEOUT_YIELD_LIMIT*3+1)*SchdlrsOnln)),
     true = mem_larger_than(Mem),
     case Other of
-	false ->
-	    do_cancel_tmrs(Tmo, Tmrs, Tester);
-	true ->
-	    Cancelor ! {timers, Tmrs}
+        false ->
+            do_cancel_tmrs(Tmo, Tmrs, Tester);
+        true ->
+            Cancelor ! {timers, Tmrs}
     end,
     {Tmos, Cncls} = lists:foldl(fun (Tmr, {T, C}) ->
-					receive
-					    {timeout, Tmr, hej} ->
-						receive
-						    {cancel_timer, Tmr, Info} ->
-							false = Info,
-							{T+1, C}
-						end;
-					    {cancel_timer, Tmr, false} ->
-						receive
-						    {timeout, Tmr, hej} ->
-							{T+1, C}
-						end;
-					    {cancel_timer, Tmr, TimeLeft} ->
-						true = is_integer(TimeLeft),
-						{T, C+1}
-					end
-				end,
-				{0, 0},
-				Tmrs),
+                                        receive
+                                            {timeout, Tmr, hej} ->
+                                                receive
+                                                    {cancel_timer, Tmr, Info} ->
+                                                        false = Info,
+                                                        {T+1, C}
+                                                end;
+                                            {cancel_timer, Tmr, false} ->
+                                                receive
+                                                    {timeout, Tmr, hej} ->
+                                                        {T+1, C}
+                                                end;
+                                            {cancel_timer, Tmr, TimeLeft} ->
+                                                true = is_integer(TimeLeft),
+                                                {T, C+1}
+                                        end
+                                end,
+                                {0, 0},
+                                Tmrs),
     io:format("Timeouts: ~p Cancels: ~p~n", [Tmos, Cncls]),
     Mem = mem(),
     case Other of
-	true -> exit(Cancelor, bang);
-	false -> ok
+        true -> exit(Cancelor, bang);
+        false -> ok
     end,
     {comment,
      "Timeouts: " ++ integer_to_list(Tmos) ++ " Cancels: "
@@ -620,16 +598,16 @@ auto_cancel_yielding(Config) when is_list(Config) ->
     Mem = mem(),
     SchdlrsOnln = erlang:system_info(schedulers_online),
     P = spawn(fun () ->
-		      lists:foreach(
-			fun (I) ->
-				process_flag(scheduler, (I rem SchdlrsOnln)+1),
-				erlang:start_timer((1 bsl 28)+I*10, self(), hej)
-			end,
-			lists:seq(1,
-				  ((?AUTO_CANCEL_YIELD_LIMIT*3+1)
-				   *SchdlrsOnln))),
-		      receive after infinity -> ok end
-	      end),
+                      lists:foreach(
+                        fun (I) ->
+                                process_flag(scheduler, (I rem SchdlrsOnln)+1),
+                                erlang:start_timer((1 bsl 28)+I*10, self(), hej)
+                        end,
+                        lists:seq(1,
+                                  ((?AUTO_CANCEL_YIELD_LIMIT*3+1)
+                                   *SchdlrsOnln))),
+                      receive after infinity -> ok end
+              end),
     true = mem_larger_than(Mem),
     exit(P, bang),
     wait_until(fun () -> process_is_cleaned_up(P) end),
@@ -641,46 +619,46 @@ process_is_cleaned_up(P) when is_pid(P) ->
 
 wait_until(Pred) when is_function(Pred) ->
     case catch Pred() of
-	true -> ok;
-	_ -> receive after 50 -> ok end, wait_until(Pred)
+        true -> ok;
+        _ -> receive after 50 -> ok end, wait_until(Pred)
     end.
 
 busy_wait_until(Pred) when is_function(Pred) ->
     case catch Pred() of
-	true -> ok;
-	_ -> busy_wait_until(Pred)
+        true -> ok;
+        _ -> busy_wait_until(Pred)
     end.
 
 forward_msgs(To) ->
     receive
-	Msg ->
-	    To ! Msg
+        Msg ->
+            To ! Msg
     end,
     forward_msgs(To).
 
 get(Time, Msg) ->
     receive 
-	Msg ->
-	    ok
+        Msg ->
+            ok
     after Time
-	  ->
-	    no_message
+          ->
+              no_message
     end.
 
 get_msg() ->
     receive
-	Msg ->
-	    {ok, Msg}
+        Msg ->
+            {ok, Msg}
     after 0 ->
-	    empty
+              empty
     end.
 
 start_slave() ->
-    ?line Pa = filename:dirname(code:which(?MODULE)),
-    ?line Name = atom_to_list(?MODULE)
-	++ "-" ++ integer_to_list(erlang:system_time(seconds))
-	++ "-" ++ integer_to_list(erlang:unique_integer([positive])),
-    {ok, Node} = ?t:start_node(Name, slave, [{args, "-pa " ++ Pa}]),
+    Pa = filename:dirname(code:which(?MODULE)),
+    Name = atom_to_list(?MODULE)
+    ++ "-" ++ integer_to_list(erlang:system_time(seconds))
+    ++ "-" ++ integer_to_list(erlang:unique_integer([positive])),
+    {ok, Node} = test_server:start_node(Name, slave, [{args, "-pa " ++ Pa}]),
     Node.
 
 stop_slave(Node) ->
@@ -691,18 +669,18 @@ collect(Last) ->
 
 receive_one() ->
     receive
-	Msg ->
-	    Msg
+        Msg ->
+            Msg
     end.
 
 collect(Last, Msgs0) ->
     Msg = receive_one(),
     Msgs = Msgs0 ++ [Msg],
     case Msg of
-	Last ->
-	    Msgs;
-	_ ->
-	    collect(Last, Msgs)
+        Last ->
+            Msgs;
+        _ ->
+            collect(Last, Msgs)
     end.
 
 match(X, X) ->
@@ -751,8 +729,8 @@ mem() ->
     erts_debug:set_internal_state(wait, timer_cancellations),
     erts_debug:set_internal_state(wait, deallocations),
     case mem_get() of
-	{-1, -1} -> no_fix_alloc;
-	{A, U} -> io:format("mem = ~p ~p~n", [A, U]), U
+        {-1, -1} -> no_fix_alloc;
+        {A, U} -> io:format("mem = ~p ~p~n", [A, U]), U
     end.
 
 mem_get() ->
@@ -765,8 +743,8 @@ mem_recv(0, _Ref, AU) ->
     AU;
 mem_recv(N, Ref, AU) ->
     receive
-	{Ref, _, IL} ->
-	    mem_recv(N-1, Ref, mem_parse_ilists(IL, AU))
+        {Ref, _, IL} ->
+            mem_recv(N-1, Ref, mem_parse_ilists(IL, AU))
     end.
 
 
@@ -779,19 +757,19 @@ mem_parse_ilist({fix_alloc, false}, _) ->
     {-1, -1};
 mem_parse_ilist({fix_alloc, _, IDL}, {A, U}) ->
     case lists:keyfind(fix_types, 1, IDL) of
-	{fix_types, TL} ->
-	    {ThisA, ThisU} = mem_get_btm_aus(TL, 0, 0),
-	    {ThisA + A, ThisU + U};
-	{fix_types, Mask, TL} ->
-	    {ThisA, ThisU} = mem_get_btm_aus(TL, 0, 0),
-	    {(ThisA + A) band Mask , (ThisU + U) band Mask}
+        {fix_types, TL} ->
+            {ThisA, ThisU} = mem_get_btm_aus(TL, 0, 0),
+            {ThisA + A, ThisU + U};
+        {fix_types, Mask, TL} ->
+            {ThisA, ThisU} = mem_get_btm_aus(TL, 0, 0),
+            {(ThisA + A) band Mask , (ThisU + U) band Mask}
     end.
 
 mem_get_btm_aus([], A, U) ->
     {A, U};
 mem_get_btm_aus([{BtmType, BtmA, BtmU} | Types],
-	    A, U) when BtmType == bif_timer;
-		       BtmType == accessor_bif_timer ->
+                A, U) when BtmType == bif_timer;
+                           BtmType == accessor_bif_timer ->
     mem_get_btm_aus(Types, BtmA+A, BtmU+U);
 mem_get_btm_aus([_|Types], A, U) ->
     mem_get_btm_aus(Types, A, U).
diff --git a/erts/emulator/test/trace_SUITE.erl b/erts/emulator/test/trace_SUITE.erl
index 6eae182e45..dcd5e95434 100644
--- a/erts/emulator/test/trace_SUITE.erl
+++ b/erts/emulator/test/trace_SUITE.erl
@@ -24,8 +24,8 @@
 %%% Tests the trace BIF.
 %%%
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, receive_trace/1, self_send/1,
+-export([all/0, suite/0,
+	 receive_trace/1, self_send/1,
 	 timeout_trace/1, send_trace/1,
 	 procs_trace/1, dist_procs_trace/1,
 	 suspend/1, mutual_suspend/1, suspend_exit/1, suspender_exit/1,
@@ -38,12 +38,14 @@
 	 system_monitor_long_schedule/1,
 	 bad_flag/1, trace_delivered/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %%% Internal exports
 -export([process/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 5}}].
 
 all() -> 
     [cpu_timestamp, receive_trace, self_send, timeout_trace,
@@ -54,133 +56,101 @@ all() ->
      set_on_first_spawn, system_monitor_args,
      more_system_monitor_args, system_monitor_long_gc_1,
      system_monitor_long_gc_2, system_monitor_large_heap_1,
-      system_monitor_long_schedule,
+     system_monitor_long_schedule,
      system_monitor_large_heap_2, bad_flag, trace_delivered].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 
 %% No longer testing anything, just reporting whether cpu_timestamp
 %% is enabled or not.
 cpu_timestamp(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-
     %% Test whether cpu_timestamp is implemented on this platform.
-    ?line Works = try erlang:trace(all, true, [cpu_timestamp]) of
-		      _ ->
-			  ?line erlang:trace(all, false, [cpu_timestamp]),
-			  true
-		  catch
-		      error:badarg -> false
-		  end,
-
-    ?line test_server:timetrap_cancel(Dog),
+    Works = try erlang:trace(all, true, [cpu_timestamp]) of
+                _ ->
+                    erlang:trace(all, false, [cpu_timestamp]),
+                    true
+            catch
+                error:badarg -> false
+            end,
     {comment,case Works of
-		 false -> "cpu_timestamp is NOT implemented/does not work";
-		 true -> "cpu_timestamp works"
-	     end}.
+                 false -> "cpu_timestamp is NOT implemented/does not work";
+                 true -> "cpu_timestamp works"
+             end}.
 
 
 %% Tests that trace(Pid, How, ['receive']) works.
 
 receive_trace(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line Receiver = fun_spawn(fun receiver/0),
-    ?line process_flag(trap_exit, true),
+    Receiver = fun_spawn(fun receiver/0),
+    process_flag(trap_exit, true),
 
     %% Trace the process; make sure that we receive the trace messages.
-    ?line 1 = erlang:trace(Receiver, true, ['receive']),
-    ?line Hello = {hello, world},
-    ?line Receiver ! Hello,
-    ?line {trace, Receiver, 'receive', Hello} = receive_first(),
-    ?line Hello2 = {hello, again, world},
-    ?line Receiver ! Hello2,
-    ?line {trace, Receiver, 'receive', Hello2} = receive_first(),
-    ?line receive_nothing(),
+    1 = erlang:trace(Receiver, true, ['receive']),
+    Hello = {hello, world},
+    Receiver ! Hello,
+    {trace, Receiver, 'receive', Hello} = receive_first(),
+    Hello2 = {hello, again, world},
+    Receiver ! Hello2,
+    {trace, Receiver, 'receive', Hello2} = receive_first(),
+    receive_nothing(),
 
     %% Another process should not be able to trace Receiver.
-    ?line Intruder = fun_spawn(fun() -> erlang:trace(Receiver, true, ['receive']) end),
-    ?line {'EXIT', Intruder, {badarg, _}} = receive_first(),
+    Intruder = fun_spawn(fun() -> erlang:trace(Receiver, true, ['receive']) end),
+    {'EXIT', Intruder, {badarg, _}} = receive_first(),
 
     %% Untrace the process; we should not receive anything.
-    ?line 1 = erlang:trace(Receiver, false, ['receive']),
-    ?line Receiver ! {hello, there},
-    ?line Receiver ! any_garbage,
-    ?line receive_nothing(),
-
-    %% Done.
-    ?line test_server:timetrap_cancel(Dog),
+    1 = erlang:trace(Receiver, false, ['receive']),
+    Receiver ! {hello, there},
+    Receiver ! any_garbage,
+    receive_nothing(),
     ok.
 
-self_send(doc) -> ["Test that traces are generated for messages sent ",
-		    "and received to/from self()."];
+%% Test that traces are generated for messages sent
+%% and received to/from self().
 self_send(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line Fun =
-	fun(Self, Parent) -> receive
-			   go_ahead ->
-				     self() ! from_myself,
-				     Self(Self, Parent);
-			   from_myself ->
-				     Parent ! done
-		       end
-	end,
-    ?line Self = self(),
-    ?line SelfSender = fun_spawn(Fun, [Fun, Self]),
-    ?line erlang:trace(SelfSender, true, ['receive', 'send']),
-    ?line SelfSender ! go_ahead,
-    ?line receive {trace, SelfSender, 'receive', go_ahead} -> ok end,
-    ?line receive {trace, SelfSender, 'receive', from_myself} -> ok end,
-    ?line receive
-	      {trace,SelfSender,send,from_myself,SelfSender} -> ok
-	  end,
-    ?line receive {trace,SelfSender,send,done,Self} -> ok end,
-    ?line receive done -> ok end,
-
-    ?line test_server:timetrap_cancel(Dog),
+    Fun =
+    fun(Self, Parent) -> receive
+                             go_ahead ->
+                                 self() ! from_myself,
+                                 Self(Self, Parent);
+                             from_myself ->
+                                 Parent ! done
+                         end
+    end,
+    Self = self(),
+    SelfSender = fun_spawn(Fun, [Fun, Self]),
+    erlang:trace(SelfSender, true, ['receive', 'send']),
+    SelfSender ! go_ahead,
+    receive {trace, SelfSender, 'receive', go_ahead} -> ok end,
+    receive {trace, SelfSender, 'receive', from_myself} -> ok end,
+    receive
+        {trace,SelfSender,send,from_myself,SelfSender} -> ok
+    end,
+    receive {trace,SelfSender,send,done,Self} -> ok end,
+    receive done -> ok end,
     ok.
 
 %% Test that we can receive timeout traces.
 timeout_trace(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-
-    ?line Process = fun_spawn(fun process/0),
-    ?line 1 = erlang:trace(Process, true, ['receive']),
-    ?line Process ! timeout_please,
-    ?line {trace, Process, 'receive', timeout_please} = receive_first(),
-    ?line {trace, Process, 'receive', timeout} = receive_first(),
-    ?line receive_nothing(),
-
-    ?line test_server:timetrap_cancel(Dog),
+    Process = fun_spawn(fun process/0),
+    1 = erlang:trace(Process, true, ['receive']),
+    Process ! timeout_please,
+    {trace, Process, 'receive', timeout_please} = receive_first(),
+    {trace, Process, 'receive', timeout} = receive_first(),
+    receive_nothing(),
     ok.
 
 %% Tests that trace(Pid, How, [send]) works.
 
 send_trace(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line process_flag(trap_exit, true),
-    ?line Sender = fun_spawn(fun sender/0),
-    ?line Receiver = fun_spawn(fun receiver/0),
+    process_flag(trap_exit, true),
+    Sender = fun_spawn(fun sender/0),
+    Receiver = fun_spawn(fun receiver/0),
 
     %% Check that a message sent to another process is traced.
-    ?line 1 = erlang:trace(Sender, true, [send]),
-    ?line Sender ! {send_please, Receiver, to_receiver},
-    ?line {trace, Sender, send, to_receiver, Receiver} = receive_first(),
-    ?line receive_nothing(),
+    1 = erlang:trace(Sender, true, [send]),
+    Sender ! {send_please, Receiver, to_receiver},
+    {trace, Sender, send, to_receiver, Receiver} = receive_first(),
+    receive_nothing(),
 
     %% Check that a message sent to another registered process is traced.
     register(?MODULE,Receiver),
@@ -190,11 +160,11 @@ send_trace(Config) when is_list(Config) ->
     unregister(?MODULE),
 
     %% Check that a message sent to this process is traced.
-    ?line Sender ! {send_please, self(), to_myself},
-    ?line receive to_myself -> ok end,
-    ?line Self = self(),
-    ?line {trace, Sender, send, to_myself, Self} = receive_first(),
-    ?line receive_nothing(),
+    Sender ! {send_please, self(), to_myself},
+    receive to_myself -> ok end,
+    Self = self(),
+    {trace, Sender, send, to_myself, Self} = receive_first(),
+    receive_nothing(),
 
     %% Check that a message sent to dead process is traced.
     {Pid,Ref} = spawn_monitor(fun() -> ok end),
@@ -212,174 +182,166 @@ send_trace(Config) when is_list(Config) ->
     receive_nothing(),
 
     %% Another process should not be able to trace Sender.
-    ?line Intruder = fun_spawn(fun() -> erlang:trace(Sender, true, [send]) end),
-    ?line {'EXIT', Intruder, {badarg, _}} = receive_first(),
+    Intruder = fun_spawn(fun() -> erlang:trace(Sender, true, [send]) end),
+    {'EXIT', Intruder, {badarg, _}} = receive_first(),
 
     %% Untrace the sender process and make sure that we receive no more
     %% trace messages.
-    ?line 1 = erlang:trace(Sender, false, [send]),
-    ?line Sender ! {send_please, Receiver, to_receiver},
-    ?line Sender ! {send_please, self(), to_myself_again},
-    ?line receive to_myself_again -> ok end,
-    ?line receive_nothing(),
-    
-    %% Done.
-    ?line test_server:timetrap_cancel(Dog),
+    1 = erlang:trace(Sender, false, [send]),
+    Sender ! {send_please, Receiver, to_receiver},
+    Sender ! {send_please, self(), to_myself_again},
+    receive to_myself_again -> ok end,
+    receive_nothing(),
     ok.
 
 %% Test trace(Pid, How, [procs]).
 procs_trace(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line Name = list_to_atom(atom_to_list(?MODULE)++"_procs_trace"),
-    ?line Self = self(),
-    ?line process_flag(trap_exit, true),
+    Name = list_to_atom(atom_to_list(?MODULE)++"_procs_trace"),
+    Self = self(),
+    process_flag(trap_exit, true),
     %%
-    ?line Proc1 = spawn_link(?MODULE, process, [Self]),
-    ?line io:format("Proc1 = ~p ~n", [Proc1]),
-    ?line Proc2 = spawn(?MODULE, process, [Self]),
-    ?line io:format("Proc2 = ~p ~n", [Proc2]),
+    Proc1 = spawn_link(?MODULE, process, [Self]),
+    io:format("Proc1 = ~p ~n", [Proc1]),
+    Proc2 = spawn(?MODULE, process, [Self]),
+    io:format("Proc2 = ~p ~n", [Proc2]),
     %%
-    ?line 1 = erlang:trace(Proc1, true, [procs]),
-    ?line MFA = {?MODULE, process, [Self]},
+    1 = erlang:trace(Proc1, true, [procs]),
+    MFA = {?MODULE, process, [Self]},
     %%
     %% spawn, link
-    ?line Proc1 ! {spawn_link_please, Self, MFA},
-    ?line Proc3 = receive {spawned, Proc1, P3} -> P3 end,
-    ?line {trace, Proc1, spawn, Proc3, MFA} = receive_first(),
-    ?line io:format("Proc3 = ~p ~n", [Proc3]),
-    ?line {trace, Proc1, link, Proc3} = receive_first(),
-    ?line receive_nothing(),
+    Proc1 ! {spawn_link_please, Self, MFA},
+    Proc3 = receive {spawned, Proc1, P3} -> P3 end,
+    {trace, Proc1, spawn, Proc3, MFA} = receive_first(),
+    io:format("Proc3 = ~p ~n", [Proc3]),
+    {trace, Proc1, link, Proc3} = receive_first(),
+    receive_nothing(),
     %%
     %% getting_unlinked by exit()
-    ?line Proc1 ! {trap_exit_please, true},
-    ?line Reason3 = make_ref(),
-    ?line Proc1 ! {send_please, Proc3, {exit_please, Reason3}},
-    ?line receive {Proc1, {'EXIT', Proc3, Reason3}} -> ok end,
-    ?line {trace, Proc1, getting_unlinked, Proc3} = receive_first(),
-    ?line Proc1 ! {trap_exit_please, false},
-    ?line receive_nothing(),
+    Proc1 ! {trap_exit_please, true},
+    Reason3 = make_ref(),
+    Proc1 ! {send_please, Proc3, {exit_please, Reason3}},
+    receive {Proc1, {'EXIT', Proc3, Reason3}} -> ok end,
+    {trace, Proc1, getting_unlinked, Proc3} = receive_first(),
+    Proc1 ! {trap_exit_please, false},
+    receive_nothing(),
     %%
     %% link
-    ?line Proc1 ! {link_please, Proc2},
-    ?line {trace, Proc1, link, Proc2} = receive_first(),
-    ?line receive_nothing(),
+    Proc1 ! {link_please, Proc2},
+    {trace, Proc1, link, Proc2} = receive_first(),
+    receive_nothing(),
     %%
     %% unlink
-    ?line Proc1 ! {unlink_please, Proc2},
-    ?line {trace, Proc1, unlink, Proc2} = receive_first(),
-    ?line receive_nothing(),
+    Proc1 ! {unlink_please, Proc2},
+    {trace, Proc1, unlink, Proc2} = receive_first(),
+    receive_nothing(),
     %%
     %% getting_linked
-    ?line Proc2 ! {link_please, Proc1},
-    ?line {trace, Proc1, getting_linked, Proc2} = receive_first(),
-    ?line receive_nothing(),
+    Proc2 ! {link_please, Proc1},
+    {trace, Proc1, getting_linked, Proc2} = receive_first(),
+    receive_nothing(),
     %%
     %% getting_unlinked
-    ?line Proc2 ! {unlink_please, Proc1},
-    ?line {trace, Proc1, getting_unlinked, Proc2} = receive_first(),
-    ?line receive_nothing(),
+    Proc2 ! {unlink_please, Proc1},
+    {trace, Proc1, getting_unlinked, Proc2} = receive_first(),
+    receive_nothing(),
     %%
     %% register
-    ?line true = register(Name, Proc1),
-    ?line {trace, Proc1, register, Name} = receive_first(),
-    ?line receive_nothing(),
+    true = register(Name, Proc1),
+    {trace, Proc1, register, Name} = receive_first(),
+    receive_nothing(),
     %%
     %% unregister
-    ?line true = unregister(Name),
-    ?line {trace, Proc1, unregister, Name} = receive_first(),
-    ?line receive_nothing(),
+    true = unregister(Name),
+    {trace, Proc1, unregister, Name} = receive_first(),
+    receive_nothing(),
     %%
     %% exit (with registered name, due to link)
-    ?line Reason4 = make_ref(),
-    ?line Proc1 ! {spawn_link_please, Self, MFA},
-    ?line Proc4 = receive {spawned, Proc1, P4} -> P4 end,
-    ?line {trace, Proc1, spawn, Proc4, MFA} = receive_first(),
-    ?line io:format("Proc4 = ~p ~n", [Proc4]),
-    ?line {trace, Proc1, link, Proc4} = receive_first(),
-    ?line Proc1 ! {register_please, Name, Proc1},
-    ?line {trace, Proc1, register, Name} = receive_first(),
-    ?line Proc4 ! {exit_please, Reason4},
-    ?line receive {'EXIT', Proc1, Reason4} -> ok end,
-    ?line {trace, Proc1, exit, Reason4} = receive_first(),
-    ?line {trace, Proc1, unregister, Name} = receive_first(),
-    ?line receive_nothing(),
+    Reason4 = make_ref(),
+    Proc1 ! {spawn_link_please, Self, MFA},
+    Proc4 = receive {spawned, Proc1, P4} -> P4 end,
+    {trace, Proc1, spawn, Proc4, MFA} = receive_first(),
+    io:format("Proc4 = ~p ~n", [Proc4]),
+    {trace, Proc1, link, Proc4} = receive_first(),
+    Proc1 ! {register_please, Name, Proc1},
+    {trace, Proc1, register, Name} = receive_first(),
+    Proc4 ! {exit_please, Reason4},
+    receive {'EXIT', Proc1, Reason4} -> ok end,
+    {trace, Proc1, exit, Reason4} = receive_first(),
+    {trace, Proc1, unregister, Name} = receive_first(),
+    receive_nothing(),
     %%
     %% exit (not linked to tracing process)
-    ?line 1 = erlang:trace(Proc2, true, [procs]),
-    ?line Reason2 = make_ref(),
-    ?line Proc2 ! {exit_please, Reason2},
-    ?line {trace, Proc2, exit, Reason2} = receive_first(),
-    ?line receive_nothing(),
-    %%
-    %% Done.
-    ?line test_server:timetrap_cancel(Dog),
+    1 = erlang:trace(Proc2, true, [procs]),
+    Reason2 = make_ref(),
+    Proc2 ! {exit_please, Reason2},
+    {trace, Proc2, exit, Reason2} = receive_first(),
+    receive_nothing(),
     ok.
 
 
 dist_procs_trace(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(15)),
-    ?line OtherName = atom_to_list(?MODULE)++"_dist_procs_trace",
-    ?line {ok, OtherNode} = start_node(OtherName),
-    ?line Self = self(),
-    ?line process_flag(trap_exit, true),
+    ct:timetrap({seconds, 15}),
+    OtherName = atom_to_list(?MODULE)++"_dist_procs_trace",
+    {ok, OtherNode} = start_node(OtherName),
+    Self = self(),
+    process_flag(trap_exit, true),
     %%
-    ?line Proc1 = spawn_link(?MODULE, process, [Self]),
-    ?line io:format("Proc1 = ~p ~n", [Proc1]),
-    ?line Proc2 = spawn(OtherNode, ?MODULE, process, [Self]),
-    ?line io:format("Proc2 = ~p ~n", [Proc2]),
+    Proc1 = spawn_link(?MODULE, process, [Self]),
+    io:format("Proc1 = ~p ~n", [Proc1]),
+    Proc2 = spawn(OtherNode, ?MODULE, process, [Self]),
+    io:format("Proc2 = ~p ~n", [Proc2]),
     %%
-    ?line 1 = erlang:trace(Proc1, true, [procs]),
-    ?line MFA = {?MODULE, process, [Self]},
+    1 = erlang:trace(Proc1, true, [procs]),
+    MFA = {?MODULE, process, [Self]},
     %%
     %% getting_unlinked by exit()
-    ?line Proc1 ! {spawn_link_please, Self, OtherNode, MFA},
-    ?line Proc1 ! {trap_exit_please, true},
-    ?line Proc3 = receive {spawned, Proc1, P3} -> P3 end,
-    ?line io:format("Proc3 = ~p ~n", [Proc3]),
-    ?line {trace, Proc1, getting_linked, Proc3} = receive_first(),
-    ?line Reason3 = make_ref(),
-    ?line Proc1 ! {send_please, Proc3, {exit_please, Reason3}},
-    ?line receive {Proc1, {'EXIT', Proc3, Reason3}} -> ok end,
-    ?line {trace, Proc1, getting_unlinked, Proc3} = receive_first(),
-    ?line Proc1 ! {trap_exit_please, false},
-    ?line receive_nothing(),
+    Proc1 ! {spawn_link_please, Self, OtherNode, MFA},
+    Proc1 ! {trap_exit_please, true},
+    Proc3 = receive {spawned, Proc1, P3} -> P3 end,
+    io:format("Proc3 = ~p ~n", [Proc3]),
+    {trace, Proc1, getting_linked, Proc3} = receive_first(),
+    Reason3 = make_ref(),
+    Proc1 ! {send_please, Proc3, {exit_please, Reason3}},
+    receive {Proc1, {'EXIT', Proc3, Reason3}} -> ok end,
+    {trace, Proc1, getting_unlinked, Proc3} = receive_first(),
+    Proc1 ! {trap_exit_please, false},
+    receive_nothing(),
     %%
     %% link
-    ?line Proc1 ! {link_please, Proc2},
-    ?line {trace, Proc1, link, Proc2} = receive_first(),
-    ?line receive_nothing(),
+    Proc1 ! {link_please, Proc2},
+    {trace, Proc1, link, Proc2} = receive_first(),
+    receive_nothing(),
     %%
     %% unlink
-    ?line Proc1 ! {unlink_please, Proc2},
-    ?line {trace, Proc1, unlink, Proc2} = receive_first(),
-    ?line receive_nothing(),
+    Proc1 ! {unlink_please, Proc2},
+    {trace, Proc1, unlink, Proc2} = receive_first(),
+    receive_nothing(),
     %%
     %% getting_linked
-    ?line Proc2 ! {link_please, Proc1},
-    ?line {trace, Proc1, getting_linked, Proc2} = receive_first(),
-    ?line receive_nothing(),
+    Proc2 ! {link_please, Proc1},
+    {trace, Proc1, getting_linked, Proc2} = receive_first(),
+    receive_nothing(),
     %%
     %% getting_unlinked
-    ?line Proc2 ! {unlink_please, Proc1},
-    ?line {trace, Proc1, getting_unlinked, Proc2} = receive_first(),
-    ?line receive_nothing(),
+    Proc2 ! {unlink_please, Proc1},
+    {trace, Proc1, getting_unlinked, Proc2} = receive_first(),
+    receive_nothing(),
     %%
     %% exit (with registered name, due to link)
-    ?line Name = list_to_atom(OtherName),
-    ?line Reason2 = make_ref(),
-    ?line Proc1 ! {link_please, Proc2},
-    ?line {trace, Proc1, link, Proc2} = receive_first(),
-    ?line Proc1 ! {register_please, Name, Proc1},
-    ?line {trace, Proc1, register, Name} = receive_first(),
-    ?line Proc2 ! {exit_please, Reason2},
-    ?line receive {'EXIT', Proc1, Reason2} -> ok end,
-    ?line {trace, Proc1, exit, Reason2} = receive_first(),
-    ?line {trace, Proc1, unregister, Name} = receive_first(),
-    ?line receive_nothing(),
+    Name = list_to_atom(OtherName),
+    Reason2 = make_ref(),
+    Proc1 ! {link_please, Proc2},
+    {trace, Proc1, link, Proc2} = receive_first(),
+    Proc1 ! {register_please, Name, Proc1},
+    {trace, Proc1, register, Name} = receive_first(),
+    Proc2 ! {exit_please, Reason2},
+    receive {'EXIT', Proc1, Reason2} -> ok end,
+    {trace, Proc1, exit, Reason2} = receive_first(),
+    {trace, Proc1, unregister, Name} = receive_first(),
+    receive_nothing(),
     %%
     %% Done.
-    ?line true = stop_node(OtherNode),
-    ?line test_server:timetrap_cancel(Dog),
+    true = stop_node(OtherNode),
     ok.
 
 
@@ -388,134 +350,117 @@ dist_procs_trace(Config) when is_list(Config) ->
 %% Tests trace(Pid, How, [set_on_spawn]).
 
 set_on_spawn(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line Listener = fun_spawn(fun process/0),
+    Listener = fun_spawn(fun process/0),
 
     %% Create and trace a process with the set_on_spawn flag.
     %% Make sure it is traced.
-    ?line Father_SOS = fun_spawn(fun process/0),
-    ?line 1 = erlang:trace(Father_SOS, true, [send, set_on_spawn]),
-    ?line true = is_send_traced(Father_SOS, Listener, sos_father),
+    Father_SOS = fun_spawn(fun process/0),
+    1 = erlang:trace(Father_SOS, true, [send, set_on_spawn]),
+    true = is_send_traced(Father_SOS, Listener, sos_father),
 
     %% Have the process spawn of two children and test that they
     %% are traced.
-    ?line [Child1, Child2] = spawn_children(Father_SOS, 2),
-    ?line true = is_send_traced(Child1, Listener, child1),
-    ?line true = is_send_traced(Child2, Listener, child2),
+    [Child1, Child2] = spawn_children(Father_SOS, 2),
+    true = is_send_traced(Child1, Listener, child1),
+    true = is_send_traced(Child2, Listener, child2),
 
     %% Second generation.
     [Child11, Child12] = spawn_children(Child1, 2),
-    ?line true = is_send_traced(Child11, Listener, child11),
-    ?line true = is_send_traced(Child12, Listener, child12),
-
-    %% Done.
-    ?line test_server:timetrap_cancel(Dog),
+    true = is_send_traced(Child11, Listener, child11),
+    true = is_send_traced(Child12, Listener, child12),
     ok.
 
 %% Tests trace(Pid, How, [set_on_first_spawn]).
 
 set_on_first_spawn(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Listener = fun_spawn(fun process/0),
+    ct:timetrap({seconds, 10}),
+    Listener = fun_spawn(fun process/0),
 
     %% Create and trace a process with the set_on_first_spawn flag.
     %% Make sure it is traced.
-    ?line Parent = fun_spawn(fun process/0),
-    ?line 1 = erlang:trace(Parent, true, [send, set_on_first_spawn]),
-    ?line is_send_traced(Parent, Listener, sos_father),
+    Parent = fun_spawn(fun process/0),
+    1 = erlang:trace(Parent, true, [send, set_on_first_spawn]),
+    is_send_traced(Parent, Listener, sos_father),
 
     %% Have the process spawn off three children and test that the
     %% first is traced.
-    ?line [Child1, Child2, Child3] = spawn_children(Parent, 3),
-    ?line true = is_send_traced(Child1, Listener, child1),
-    ?line false = is_send_traced(Child2, Listener, child2),
-    ?line false = is_send_traced(Child3, Listener, child3),
-    ?line receive_nothing(),
-
-    %% Done.
-    ?line test_server:timetrap_cancel(Dog),
+    [Child1, Child2, Child3] = spawn_children(Parent, 3),
+    true = is_send_traced(Child1, Listener, child1),
+    false = is_send_traced(Child2, Listener, child2),
+    false = is_send_traced(Child3, Listener, child3),
+    receive_nothing(),
     ok.
 
 
-system_monitor_args(doc) ->
-    ["Tests arguments to erlang:system_monitor/0-2)"];
+%% Tests arguments to erlang:system_monitor/0,1,2
 system_monitor_args(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line Self = self(),
+    Self = self(),
     %%
-    ?line OldMonitor = erlang:system_monitor(undefined),
-    ?line undefined = erlang:system_monitor(Self, [{long_gc,0}]),
-    ?line MinT = case erlang:system_monitor() of
-		     {Self,[{long_gc,T}]} when is_integer(T), T > 0 -> T;
-		     Other1 -> test_server:fault(Other1)
-		 end,
-    ?line {Self,[{long_gc,MinT}]} = erlang:system_monitor(),
-    ?line {Self,[{long_gc,MinT}]} = 
-	erlang:system_monitor({Self,[{large_heap,0}]}),
-    ?line MinN = case erlang:system_monitor() of
-		  {Self,[{large_heap,N}]} when is_integer(N), N > 0 -> N;
-		  Other2 -> test_server:fault(Other2)
-	      end,
-    ?line {Self,[{large_heap,MinN}]} = erlang:system_monitor(),
-    ?line {Self,[{large_heap,MinN}]} = 
-	erlang:system_monitor(Self, [busy_port]),
-    ?line {Self,[busy_port]} = erlang:system_monitor(),
-    ?line {Self,[busy_port]} = 
-	erlang:system_monitor({Self,[busy_dist_port]}),
-    ?line {Self,[busy_dist_port]} = erlang:system_monitor(),
-    ?line All = lists:sort([busy_port,busy_dist_port,
-			    {long_gc,1},{large_heap,65535}]),
-    ?line {Self,[busy_dist_port]} = erlang:system_monitor(Self, All),
-    ?line {Self,A1} = erlang:system_monitor(),
-    ?line All = lists:sort(A1),
-    ?line {Self,A1} = erlang:system_monitor(Self, []),
-    ?line Pid = spawn(fun () -> receive {Self,die} -> exit(die) end end),
-    ?line Mref = erlang:monitor(process, Pid),
-    ?line undefined = erlang:system_monitor(Pid, All),
-    ?line {Pid,A2} = erlang:system_monitor(),
-    ?line All = lists:sort(A2),
-    ?line Pid ! {Self,die},
-    ?line receive {'DOWN',Mref,_,_,_} -> ok end,
-    ?line undefined = erlang:system_monitor(OldMonitor),
-    ?line erlang:yield(),
-    ?line OldMonitor = erlang:system_monitor(),
+    OldMonitor = erlang:system_monitor(undefined),
+    undefined = erlang:system_monitor(Self, [{long_gc,0}]),
+    MinT = case erlang:system_monitor() of
+               {Self,[{long_gc,T}]} when is_integer(T), T > 0 -> T;
+               Other1 -> test_server:fault(Other1)
+           end,
+    {Self,[{long_gc,MinT}]} = erlang:system_monitor(),
+    {Self,[{long_gc,MinT}]} = 
+    erlang:system_monitor({Self,[{large_heap,0}]}),
+    MinN = case erlang:system_monitor() of
+               {Self,[{large_heap,N}]} when is_integer(N), N > 0 -> N;
+               Other2 -> test_server:fault(Other2)
+           end,
+    {Self,[{large_heap,MinN}]} = erlang:system_monitor(),
+    {Self,[{large_heap,MinN}]} = 
+    erlang:system_monitor(Self, [busy_port]),
+    {Self,[busy_port]} = erlang:system_monitor(),
+    {Self,[busy_port]} = 
+    erlang:system_monitor({Self,[busy_dist_port]}),
+    {Self,[busy_dist_port]} = erlang:system_monitor(),
+    All = lists:sort([busy_port,busy_dist_port,
+                      {long_gc,1},{large_heap,65535}]),
+    {Self,[busy_dist_port]} = erlang:system_monitor(Self, All),
+    {Self,A1} = erlang:system_monitor(),
+    All = lists:sort(A1),
+    {Self,A1} = erlang:system_monitor(Self, []),
+    Pid = spawn(fun () -> receive {Self,die} -> exit(die) end end),
+    Mref = erlang:monitor(process, Pid),
+    undefined = erlang:system_monitor(Pid, All),
+    {Pid,A2} = erlang:system_monitor(),
+    All = lists:sort(A2),
+    Pid ! {Self,die},
+    receive {'DOWN',Mref,_,_,_} -> ok end,
+    undefined = erlang:system_monitor(OldMonitor),
+    erlang:yield(),
+    OldMonitor = erlang:system_monitor(),
     %%
-    ?line {'EXIT',{badarg,_}} = (catch erlang:system_monitor(atom)),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:system_monitor({})),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:system_monitor({1})),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:system_monitor({1,2,3})),
-    ?line {'EXIT',{badarg,_}} = 
-	(catch erlang:system_monitor({Self,atom})),
-    ?line {'EXIT',{badarg,_}} = 
-	(catch erlang:system_monitor(atom, atom)),
-    ?line {'EXIT',{badarg,_}} = 
-	(catch erlang:system_monitor({Self,[busy_port|busy_dist_port]})),
-    ?line {'EXIT',{badarg,_}} = 
-	(catch erlang:system_monitor(Self, [{long_gc,-1}])),
-    ?line {'EXIT',{badarg,_}} = 
-	(catch erlang:system_monitor({Self,[{long_gc,atom}]})),
-    ?line {'EXIT',{badarg,_}} = 
-	(catch erlang:system_monitor(Self,[{large_heap,-1}])),
-    ?line {'EXIT',{badarg,_}} = 
-	(catch erlang:system_monitor({Self,[{large_heap,atom}]})),
-    %% Done.
-    ?line test_server:timetrap_cancel(Dog),
+    {'EXIT',{badarg,_}} = (catch erlang:system_monitor(atom)),
+    {'EXIT',{badarg,_}} = (catch erlang:system_monitor({})),
+    {'EXIT',{badarg,_}} = (catch erlang:system_monitor({1})),
+    {'EXIT',{badarg,_}} = (catch erlang:system_monitor({1,2,3})),
+    {'EXIT',{badarg,_}} = 
+    (catch erlang:system_monitor({Self,atom})),
+    {'EXIT',{badarg,_}} = 
+    (catch erlang:system_monitor(atom, atom)),
+    {'EXIT',{badarg,_}} = 
+    (catch erlang:system_monitor({Self,[busy_port|busy_dist_port]})),
+    {'EXIT',{badarg,_}} = 
+    (catch erlang:system_monitor(Self, [{long_gc,-1}])),
+    {'EXIT',{badarg,_}} = 
+    (catch erlang:system_monitor({Self,[{long_gc,atom}]})),
+    {'EXIT',{badarg,_}} = 
+    (catch erlang:system_monitor(Self,[{large_heap,-1}])),
+    {'EXIT',{badarg,_}} = 
+    (catch erlang:system_monitor({Self,[{large_heap,atom}]})),
     ok.
 
 
-more_system_monitor_args(doc) ->
-    ["Tests arguments to erlang:system_monitor/0-2)"];
+%% Tests arguments to erlang:system_monitor/0,1,2
 more_system_monitor_args(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    
-    ?line try_l(64000),
-    ?line try_l(16#7ffffff),
-    ?line try_l(16#3fffffff),
-    ?line try_l(16#7fffffff),
-    ?line try_l(16#ffffffff),
-
-    %% Done.
-    ?line test_server:timetrap_cancel(Dog),
+    try_l(64000),
+    try_l(16#7ffffff),
+    try_l(16#3fffffff),
+    try_l(16#7fffffff),
+    try_l(16#ffffffff),
     ok.
 
 try_l(Val) ->
@@ -523,29 +468,29 @@ try_l(Val) ->
     Arbitrary1 = 77777,
     Arbitrary2 = 88888,
 
-    ?line erlang:system_monitor(undefined),
+    erlang:system_monitor(undefined),
 
-    ?line undefined = erlang:system_monitor(Self, [{long_gc,Val},{large_heap,Arbitrary1}]),
+    undefined = erlang:system_monitor(Self, [{long_gc,Val},{large_heap,Arbitrary1}]),
 
-    ?line {Self,Comb0} = erlang:system_monitor(Self, [{long_gc,Arbitrary2},{large_heap,Val}]),
-    ?line [{large_heap,Arbitrary1},{long_gc,Val}] = lists:sort(Comb0),
+    {Self,Comb0} = erlang:system_monitor(Self, [{long_gc,Arbitrary2},{large_heap,Val}]),
+    [{large_heap,Arbitrary1},{long_gc,Val}] = lists:sort(Comb0),
 
-    ?line {Self,Comb1} = erlang:system_monitor(undefined),
-    ?line [{large_heap,Val},{long_gc,Arbitrary2}] = lists:sort(Comb1).
+    {Self,Comb1} = erlang:system_monitor(undefined),
+    [{large_heap,Val},{long_gc,Arbitrary2}] = lists:sort(Comb1).
 
 monitor_sys(Parent) ->
     receive 
-	{monitor,Pid,long_schedule,Data} when is_pid(Pid) -> 
-	    io:format("Long schedule of ~w: ~w~n",[Pid,Data]),
-	    Parent ! {Pid,Data},
-	    monitor_sys(Parent);
-	{monitor,Port,long_schedule,Data} when is_port(Port) -> 
-	    {name,Name} = erlang:port_info(Port,name),
-	    io:format("Long schedule of ~w (~p): ~w~n",[Port,Name,Data]),
-	    Parent ! {Port,Data},
-	    monitor_sys(Parent);
-	Other ->
-	    erlang:display(Other)
+        {monitor,Pid,long_schedule,Data} when is_pid(Pid) -> 
+            io:format("Long schedule of ~w: ~w~n",[Pid,Data]),
+            Parent ! {Pid,Data},
+            monitor_sys(Parent);
+        {monitor,Port,long_schedule,Data} when is_port(Port) -> 
+            {name,Name} = erlang:port_info(Port,name),
+            io:format("Long schedule of ~w (~p): ~w~n",[Port,Name,Data]),
+            Parent ! {Port,Data},
+            monitor_sys(Parent);
+        Other ->
+            erlang:display(Other)
     end.
 
 start_monitor() ->
@@ -555,18 +500,15 @@ start_monitor() ->
     erlang:yield(), % Need to be rescheduled for the trace to take
     ok.
 
-system_monitor_long_schedule(suite) ->
-    [];
-system_monitor_long_schedule(doc) ->
-    ["Tests erlang:system_monitor(Pid, [{long_schedule,Time}])"];
+%% Tests erlang:system_monitor(Pid, [{long_schedule,Time}])
 system_monitor_long_schedule(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     erl_ddll:start(),
     case (catch load_driver(Path, slow_drv)) of
-	ok ->
-	    do_system_monitor_long_schedule();
-	_Error ->
-	    {skip, "Unable to load slow_drv (windows or no usleep()?)"}
+        ok ->
+            do_system_monitor_long_schedule();
+        _Error ->
+            {skip, "Unable to load slow_drv (windows or no usleep()?)"}
     end.
 do_system_monitor_long_schedule() ->
     start_monitor(),
@@ -574,18 +516,18 @@ do_system_monitor_long_schedule() ->
     "ok" = erlang:port_control(Port,0,[]),
     Self = self(),
     receive
-	{Self,L} when is_list(L) ->
-	    ok
+        {Self,L} when is_list(L) ->
+            ok
     after 1000 ->
-	    ?t:fail(no_trace_of_pid)
+              ct:fail(no_trace_of_pid)
     end,
     "ok" = erlang:port_control(Port,1,[]),
     "ok" = erlang:port_control(Port,2,[]),
     receive
-	{Port,LL} when is_list(LL) ->
-	    ok
+        {Port,LL} when is_list(LL) ->
+            ok
     after 1000 ->
-	    ?t:fail(no_trace_of_port)
+              ct:fail(no_trace_of_port)
     end,
     port_close(Port),
     erlang:system_monitor(undefined),
@@ -594,214 +536,200 @@ do_system_monitor_long_schedule() ->
 
 -define(LONG_GC_SLEEP, 670).
 
-system_monitor_long_gc_1(suite) ->
-    [];
-system_monitor_long_gc_1(doc) ->
-    ["Tests erlang:system_monitor(Pid, [{long_gc,Time}])"];
+%% Tests erlang:system_monitor(Pid, [{long_gc,Time}])
 system_monitor_long_gc_1(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
     try 
-	case erts_debug:get_internal_state(force_heap_frags) of
-	    true ->
-		{skip,"emulator with FORCE_HEAP_FRAGS defined"};
-	    false ->
-		%% Add ?LONG_GC_SLEEP ms to all gc
-		?line erts_debug:set_internal_state(test_long_gc_sleep,
-						    ?LONG_GC_SLEEP),
-		?line LoadFun = fun () -> 
-					garbage_collect(),
-					self() 
-				end,
-		?line long_gc(LoadFun, false)
-	end
+        case erts_debug:get_internal_state(force_heap_frags) of
+            true ->
+                {skip,"emulator with FORCE_HEAP_FRAGS defined"};
+            false ->
+                %% Add ?LONG_GC_SLEEP ms to all gc
+                erts_debug:set_internal_state(test_long_gc_sleep,
+                                              ?LONG_GC_SLEEP),
+                LoadFun = fun () -> 
+                                  garbage_collect(),
+                                  self() 
+                          end,
+                long_gc(LoadFun, false)
+        end
     after
-	erts_debug:set_internal_state(test_long_gc_sleep, 0),
-	erts_debug:set_internal_state(available_internal_state, false)	
+        erts_debug:set_internal_state(test_long_gc_sleep, 0),
+        erts_debug:set_internal_state(available_internal_state, false)	
     end.
 
-system_monitor_long_gc_2(suite) ->
-    [];
-system_monitor_long_gc_2(doc) ->
-    ["Tests erlang:system_monitor(Pid, [{long_gc,Time}])"];
+%% Tests erlang:system_monitor(Pid, [{long_gc,Time}])
 system_monitor_long_gc_2(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
     try
-	case erts_debug:get_internal_state(force_heap_frags) of
-	    true ->
-		{skip,"emulator with FORCE_HEAP_FRAGS defined"};
-	    false ->
-		%% Add ?LONG_GC_SLEEP ms to all gc
-		?line erts_debug:set_internal_state(test_long_gc_sleep,
-						    ?LONG_GC_SLEEP),
-		?line Parent = self(),
-		?line LoadFun =
-		    fun () ->
-			    Ref = make_ref(),
-			    Pid = 
-				spawn_link(
-				  fun () ->
-					  garbage_collect(),
-					  Parent ! {Ref, self()}
-				  end),
-			    receive {Ref, Pid} -> Pid end
-		    end,
-		?line long_gc(LoadFun, true),
-		?line long_gc(LoadFun, true),
-		?line long_gc(LoadFun, true)
-	end
+        case erts_debug:get_internal_state(force_heap_frags) of
+            true ->
+                {skip,"emulator with FORCE_HEAP_FRAGS defined"};
+            false ->
+                %% Add ?LONG_GC_SLEEP ms to all gc
+                erts_debug:set_internal_state(test_long_gc_sleep,
+                                              ?LONG_GC_SLEEP),
+                Parent = self(),
+                LoadFun =
+                fun () ->
+                        Ref = make_ref(),
+                        Pid = 
+                        spawn_link(
+                          fun () ->
+                                  garbage_collect(),
+                                  Parent ! {Ref, self()}
+                          end),
+                        receive {Ref, Pid} -> Pid end
+                end,
+                long_gc(LoadFun, true),
+                long_gc(LoadFun, true),
+                long_gc(LoadFun, true)
+        end
     after
-	erts_debug:set_internal_state(test_long_gc_sleep, 0),
-	erts_debug:set_internal_state(available_internal_state, false)
+        erts_debug:set_internal_state(test_long_gc_sleep, 0),
+        erts_debug:set_internal_state(available_internal_state, false)
     end.
 
 long_gc(LoadFun, ExpectMonMsg) ->
-    ?line Self = self(),
-    ?line Time = 1,
-    ?line OldMonitor = erlang:system_monitor(Self, [{long_gc,Time}]),
-    ?line Pid = LoadFun(),
-    ?line Ref = erlang:trace_delivered(Pid),
-    ?line receive {trace_delivered, Pid, Ref} -> ok end,
-    ?line {Self,[{long_gc,Time}]} = erlang:system_monitor(OldMonitor),
-    ?line case {long_gc_check(Pid, Time, undefined), ExpectMonMsg} of
-	      {ok, true} when Pid =/= Self ->
-		  ok;
-	      {ok, false} ->
-		  ?line ?t:fail(unexpected_system_monitor_message_received);
-	      {undefined, false} ->
-		  ok;
-	      {undefined, true} ->
-		  ?line ?t:fail(no_system_monitor_message_received)
-	  end.
+    Self = self(),
+    Time = 1,
+    OldMonitor = erlang:system_monitor(Self, [{long_gc,Time}]),
+    Pid = LoadFun(),
+    Ref = erlang:trace_delivered(Pid),
+    receive {trace_delivered, Pid, Ref} -> ok end,
+    {Self,[{long_gc,Time}]} = erlang:system_monitor(OldMonitor),
+    case {long_gc_check(Pid, Time, undefined), ExpectMonMsg} of
+        {ok, true} when Pid =/= Self ->
+            ok;
+        {ok, false} ->
+            ct:fail(unexpected_system_monitor_message_received);
+        {undefined, false} ->
+            ok;
+        {undefined, true} ->
+            ct:fail(no_system_monitor_message_received)
+    end.
 
 long_gc_check(Pid, Time, Result) ->
     receive
-	{monitor,Pid,long_gc,L} = Monitor ->
-	    case lists:foldl(
-		   fun (_, error) ->
-			   error;
-		       ({timeout,T}, N) when is_integer(T),
-					     Time =< T, T =< 10*?LONG_GC_SLEEP ->
-			   %% OTP-7622. The time T must be within reasonable limits
-			   %% for the test to pass.
-			   N-1;
-		       ({heap_size,_}, N) ->
-			   N-1;
-		       ({old_heap_size,_}, N) ->
-			   N-1;
-		       ({stack_size,_}, N) ->
-			   N-1;
-		       ({mbuf_size,_}, N) ->
-			   N-1;
-		       ({heap_block_size,_}, N) ->
-			   N-1;
-		       ({old_heap_block_size,_}, N) ->
-			   N-1;
-		       (_, _) ->
-			   error
-		   end, 7, L) of
-		0 ->
-		    long_gc_check(Pid, Time, ok);
-		error ->
-		    {error,Monitor}
-	    end;
-	{monitor,_,long_gc,_} ->
-	    long_gc_check(Pid, Time, Result);
-	Other ->
-	    {error,Other}
+        {monitor,Pid,long_gc,L} = Monitor ->
+            case lists:foldl(
+                   fun (_, error) ->
+                           error;
+                       ({timeout,T}, N) when is_integer(T),
+                                             Time =< T, T =< 10*?LONG_GC_SLEEP ->
+                           %% OTP-7622. The time T must be within reasonable limits
+                           %% for the test to pass.
+                           N-1;
+                       ({heap_size,_}, N) ->
+                           N-1;
+                       ({old_heap_size,_}, N) ->
+                           N-1;
+                       ({stack_size,_}, N) ->
+                           N-1;
+                       ({mbuf_size,_}, N) ->
+                           N-1;
+                       ({heap_block_size,_}, N) ->
+                           N-1;
+                       ({old_heap_block_size,_}, N) ->
+                           N-1;
+                       (_, _) ->
+                           error
+                   end, 7, L) of
+                0 ->
+                    long_gc_check(Pid, Time, ok);
+                error ->
+                    {error,Monitor}
+            end;
+        {monitor,_,long_gc,_} ->
+            long_gc_check(Pid, Time, Result);
+        Other ->
+            {error,Other}
     after 0 ->
-	    Result
+              Result
     end.
 
-system_monitor_large_heap_1(suite) ->
-    [];
-system_monitor_large_heap_1(doc) ->
-    ["Tests erlang:system_monitor(Pid, [{large_heap,Size}])"];
+%% Tests erlang:system_monitor(Pid, [{large_heap,Size}])
 system_monitor_large_heap_1(Config) when is_list(Config) ->
-    ?line LoadFun =
-	fun (Size) -> 
-		List = seq(1,2*Size),
-		garbage_collect(),
-		true = lists:prefix([1], List),
-		self() 
-	end,
-    ?line large_heap(LoadFun, false).
-
-system_monitor_large_heap_2(suite) ->
-    [];
-system_monitor_large_heap_2(doc) ->
-    ["Tests erlang:system_monitor(Pid, [{large_heap,Size}])"];
+    LoadFun =
+    fun (Size) -> 
+            List = seq(1,2*Size),
+            garbage_collect(),
+            true = lists:prefix([1], List),
+            self() 
+    end,
+    large_heap(LoadFun, false).
+
+%% Tests erlang:system_monitor(Pid, [{large_heap,Size}])
 system_monitor_large_heap_2(Config) when is_list(Config) ->
-    ?line Parent = self(),
-    ?line LoadFun =
-	fun (Size) ->
-		Ref = make_ref(),
-		Pid = 
-		    spawn_opt(fun () ->
-				      garbage_collect(),
-				      Parent ! {Ref, self()}
-			      end,
-			      [link, {min_heap_size, 2*Size}]),
-		receive {Ref, Pid} -> Pid end
-	end,
-    ?line large_heap(LoadFun, true).
+    Parent = self(),
+    LoadFun =
+    fun (Size) ->
+            Ref = make_ref(),
+            Pid = 
+            spawn_opt(fun () ->
+                              garbage_collect(),
+                              Parent ! {Ref, self()}
+                      end,
+                      [link, {min_heap_size, 2*Size}]),
+            receive {Ref, Pid} -> Pid end
+    end,
+    large_heap(LoadFun, true).
 
 large_heap(LoadFun, ExpectMonMsg) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(20)),
+    ct:timetrap({seconds, 20}),
     %%
-    ?line Size = 65535,
-    ?line Self = self(),
-    ?line NewMonitor = {Self,[{large_heap,Size}]},
-    ?line OldMonitor = erlang:system_monitor(NewMonitor),
-    ?line Pid = LoadFun(Size),
-    ?line Ref = erlang:trace_delivered(Pid),
-    ?line receive {trace_delivered, Pid, Ref} -> ok end,
-    ?line {Self,[{large_heap,Size}]} = erlang:system_monitor(OldMonitor),
-    ?line case {large_heap_check(Pid, Size, undefined), ExpectMonMsg} of
-	      {ok, true} when Pid =/= Self ->
-		  ?line ok;
-	      {ok, false} ->
-		  ?line ?t:fail(unexpected_system_monitor_message_received);
-	      {undefined, false} ->
-		  ?line ok;
-	      {undefined, true} ->
-		  ?line ?t:fail(no_system_monitor_message_received)
-	  end,
-    %%
-    ?line test_server:timetrap_cancel(Dog),
+    Size = 65535,
+    Self = self(),
+    NewMonitor = {Self,[{large_heap,Size}]},
+    OldMonitor = erlang:system_monitor(NewMonitor),
+    Pid = LoadFun(Size),
+    Ref = erlang:trace_delivered(Pid),
+    receive {trace_delivered, Pid, Ref} -> ok end,
+    {Self,[{large_heap,Size}]} = erlang:system_monitor(OldMonitor),
+    case {large_heap_check(Pid, Size, undefined), ExpectMonMsg} of
+        {ok, true} when Pid =/= Self ->
+            ok;
+        {ok, false} ->
+            ct:fail(unexpected_system_monitor_message_received);
+        {undefined, false} ->
+            ok;
+        {undefined, true} ->
+            ct:fail(no_system_monitor_message_received)
+    end,
     ok.
 
 large_heap_check(Pid, Size, Result) ->
     receive
-	{monitor,Pid,large_heap,L} = Monitor ->
-	    case lists:foldl(
-		   fun (_, error) ->
-			   error;
-		       ({heap_size,_}, N) ->
-			   N-1;
-		       ({old_heap_size,_}, N) ->
-			   N-1;
-		       ({stack_size,_}, N) ->
-			   N-1;
-		       ({mbuf_size,_}, N) ->
-			   N-1;
-		       ({heap_block_size,_}, N) ->
-			   N-1;
-		       ({old_heap_block_size,_}, N) ->
-			   N-1;
-		       (_, _) ->
-			   error
-		   end, 6, L) of
-		0 ->
-		    large_heap_check(Pid, Size, ok);
-		error ->
-		    {error,Monitor}
-	    end;
-	{monitor,_,large_heap,_} ->
-	    large_heap_check(Pid, Size, Result);
-	Other ->
-	    {error,Other}
+        {monitor,Pid,large_heap,L} = Monitor ->
+            case lists:foldl(
+                   fun (_, error) ->
+                           error;
+                       ({heap_size,_}, N) ->
+                           N-1;
+                       ({old_heap_size,_}, N) ->
+                           N-1;
+                       ({stack_size,_}, N) ->
+                           N-1;
+                       ({mbuf_size,_}, N) ->
+                           N-1;
+                       ({heap_block_size,_}, N) ->
+                           N-1;
+                       ({old_heap_block_size,_}, N) ->
+                           N-1;
+                       (_, _) ->
+                           error
+                   end, 6, L) of
+                0 ->
+                    large_heap_check(Pid, Size, ok);
+                error ->
+                    {error,Monitor}
+            end;
+        {monitor,_,large_heap,_} ->
+            large_heap_check(Pid, Size, Result);
+        Other ->
+            {error,Other}
     after 0 ->
-	    Result
+              Result
     end.
 
 seq(N, M) ->
@@ -816,11 +744,11 @@ seq(N, M, R) ->
 is_send_traced(Pid, Listener, Msg) ->
     Pid ! {send_please, Listener, Msg},
     receive
-	Any ->
-	    {trace, Pid, send, Msg, Listener} = Any,
-	    true
+        Any ->
+            {trace, Pid, send, Msg, Listener} = Any,
+            true
     after 1000 ->
-	    false
+              false
     end.
 
 %% This procedure assumes that the Parent process is send traced.
@@ -834,146 +762,131 @@ spawn_children(Parent, Number, Result) ->
     Self = self(),
     Parent ! {spawn_please, Self, fun process/0},
     Child = 
-	receive
-	    {trace, Parent, send, {spawned, Pid}, Self} -> Pid
-	end,
     receive
-	{spawned, Child} ->
-	    spawn_children(Parent, Number-1, [Child|Result])
+        {trace, Parent, send, {spawned, Pid}, Self} -> Pid
+    end,
+    receive
+        {spawned, Child} ->
+            spawn_children(Parent, Number-1, [Child|Result])
     end.
 
-suspend(doc) -> "Test erlang:suspend/1 and erlang:resume/1.";
+%% Test erlang:suspend/1 and erlang:resume/1.
 suspend(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(2)),
-
-    ?line Worker = fun_spawn(fun worker/0),
+    ct:timetrap({minutes,2}),
+    Worker = fun_spawn(fun worker/0),
     %% Suspend a process and test that it is suspended.
-    ?line ok = do_suspend(Worker, 10000),
-
-    %% Done.
-    ?line test_server:timetrap_cancel(Dog),
+    ok = do_suspend(Worker, 10000),
     ok.
 
 do_suspend(_Pid, 0) ->
-    ?line ok;
+    ok;
 do_suspend(Pid, N) ->
     %% Suspend a process and test that it is suspended.
-    ?line true = erlang:suspend_process(Pid),
-    ?line {status, suspended} = process_info(Pid, status),
+    true = erlang:suspend_process(Pid),
+    {status, suspended} = process_info(Pid, status),
 
     %% Unsuspend the process and make sure it starts working.
-    ?line true = erlang:resume_process(Pid),
-    ?line case process_info(Pid, status) of
-	      {status, runnable} -> ?line ok;
-	      {status, running} -> ?line ok;
-	      {status, garbage_collecting} -> ?line ok;
-	      ST -> ?line ?t:fail(ST)
-	  end,
-    ?line erlang:yield(),
-    ?line do_suspend(Pid, N-1).
-
-
-
-mutual_suspend(doc) ->
-    [];
-mutual_suspend(suite) ->
-    [];
+    true = erlang:resume_process(Pid),
+    case process_info(Pid, status) of
+        {status, runnable} -> ok;
+        {status, running} -> ok;
+        {status, garbage_collecting} -> ok;
+        ST -> ct:fail(ST)
+    end,
+    erlang:yield(),
+    do_suspend(Pid, N-1).
+
+
+
 mutual_suspend(Config) when is_list(Config) ->
-    ?line TimeoutSecs = 5*60,
-    ?line Dog = test_server:timetrap(test_server:minutes(TimeoutSecs)),
-    ?line Parent = self(),
-    ?line Fun = fun () ->
-			receive
-			    {go, Pid} ->
-				do_mutual_suspend(Pid, 100000)
-			end,
-			Parent ! {done, self()},
-			receive after infinity -> ok end
-		end,
-    ?line P1 = spawn_link(Fun),
-    ?line P2 = spawn_link(Fun),
-    ?line T1 = erlang:start_timer((TimeoutSecs - 5)*1000, self(), oops),
-    ?line T2 = erlang:start_timer((TimeoutSecs - 5)*1000, self(), oops),
-    ?line P1 ! {go, P2},
-    ?line P2 ! {go, P1},
-    ?line Res1 = receive
-		    {done, P1} -> done;
-		    {timeout,T1,_} -> timeout
-		end,
-    ?line Res2 = receive
-		     {done, P2} -> done;
-		     {timeout,T2,_} -> timeout
-		 end,
-    ?line P1S = process_info(P1, status),
-    ?line P2S = process_info(P2, status),
-    ?line ?t:format("P1S=~p P2S=~p", [P1S, P2S]),
-    ?line false = {status, suspended} == P1S,
-    ?line false = {status, suspended} == P2S,
-    ?line unlink(P1), exit(P1, bang),
-    ?line unlink(P2), exit(P2, bang),
-    ?line done = Res1,
-    ?line done = Res2,
-    %% Done.
-    ?line test_server:timetrap_cancel(Dog),
-    ?line ok.
-    
+    TimeoutSecs = 5*60,
+    ct:timetrap({seconds, TimeoutSecs}),
+    Parent = self(),
+    Fun = fun () ->
+                  receive
+                      {go, Pid} ->
+                          do_mutual_suspend(Pid, 100000)
+                  end,
+                  Parent ! {done, self()},
+                  receive after infinity -> ok end
+          end,
+    P1 = spawn_link(Fun),
+    P2 = spawn_link(Fun),
+    T1 = erlang:start_timer((TimeoutSecs - 5)*1000, self(), oops),
+    T2 = erlang:start_timer((TimeoutSecs - 5)*1000, self(), oops),
+    P1 ! {go, P2},
+    P2 ! {go, P1},
+    Res1 = receive
+               {done, P1} -> done;
+               {timeout,T1,_} -> timeout
+           end,
+    Res2 = receive
+               {done, P2} -> done;
+               {timeout,T2,_} -> timeout
+           end,
+    P1S = process_info(P1, status),
+    P2S = process_info(P2, status),
+    io:format("P1S=~p P2S=~p", [P1S, P2S]),
+    false = {status, suspended} == P1S,
+    false = {status, suspended} == P2S,
+    unlink(P1), exit(P1, bang),
+    unlink(P2), exit(P2, bang),
+    done = Res1,
+    done = Res2,
+    ok.
+
 do_mutual_suspend(_Pid, 0) ->
-    ?line ok;
+    ok;
 do_mutual_suspend(Pid, N) ->
     %% Suspend a process and test that it is suspended.
-    ?line true = erlang:suspend_process(Pid),
-    ?line {status, suspended} = process_info(Pid, status),
+    true = erlang:suspend_process(Pid),
+    {status, suspended} = process_info(Pid, status),
     %% Unsuspend the process.
-    ?line true = erlang:resume_process(Pid),
-    ?line do_mutual_suspend(Pid, N-1).		
+    true = erlang:resume_process(Pid),
+    do_mutual_suspend(Pid, N-1).		
 
-suspend_exit(doc) ->
-    [];
-suspend_exit(suite) ->
-    [];
 suspend_exit(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(2)),
-    ?line random:seed(4711,17,4711),
-    ?line do_suspend_exit(5000),
-    ?line test_server:timetrap_cancel(Dog),
-    ?line ok.
+    ct:timetrap({minutes, 2}),
+    rand:seed(exsplus, {4711,17,4711}),
+    do_suspend_exit(5000),
+    ok.
 
 do_suspend_exit(0) ->
-    ?line ok;
+    ok;
 do_suspend_exit(N) ->
-    ?line Work = random:uniform(50),
-    ?line Parent = self(),
-    ?line {Suspendee, Mon2}
-	= spawn_monitor(fun () ->
-				suspend_exit_work(Work),
-				exit(normal)
-			end),
-    ?line {Suspender, Mon1}
-	= spawn_monitor(
-	    fun () ->
-		    suspend_exit_work(Work div 2),
-		    Parent ! {doing_suspend, self()},
-		    case catch erlang:suspend_process(Suspendee) of
-			{'EXIT', _} ->
-			    ok;
-			true ->
-			    ?line erlang:resume_process(Suspendee)
-		    end
-	    end),
-    ?line receive
-	      {doing_suspend, Suspender} ->
-		  case N rem 2 of
-		      0 -> exit(Suspender, bang);
-		      1 -> ok
-		  end
-	  end,
-    ?line receive {'DOWN', Mon1, process, Suspender, _} -> ok end,
-    ?line receive {'DOWN', Mon2, process, Suspendee, _} -> ok end,
-    ?line do_suspend_exit(N-1).
-				 
-
-
- 
+    Work = rand:uniform(50),
+    Parent = self(),
+    {Suspendee, Mon2}
+    = spawn_monitor(fun () ->
+                            suspend_exit_work(Work),
+                            exit(normal)
+                    end),
+    {Suspender, Mon1}
+    = spawn_monitor(
+        fun () ->
+                suspend_exit_work(Work div 2),
+                Parent ! {doing_suspend, self()},
+                case catch erlang:suspend_process(Suspendee) of
+                    {'EXIT', _} ->
+                        ok;
+                    true ->
+                        erlang:resume_process(Suspendee)
+                end
+        end),
+    receive
+        {doing_suspend, Suspender} ->
+            case N rem 2 of
+                0 -> exit(Suspender, bang);
+                1 -> ok
+            end
+    end,
+    receive {'DOWN', Mon1, process, Suspender, _} -> ok end,
+    receive {'DOWN', Mon2, process, Suspendee, _} -> ok end,
+    do_suspend_exit(N-1).
+
+
+
+
 suspend_exit_work(0) ->
     ok;
 suspend_exit_work(N) ->
@@ -985,320 +898,305 @@ suspend_exit_work(N) ->
 chk_suspended(P, Bool, Line) ->
     {Bool, Line} = {({status, suspended} == process_info(P, status)), Line}.
 
-suspender_exit(doc) ->
-    [];
-suspender_exit(suite) ->
-    [];
 suspender_exit(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(3)),
-    ?line P1 = spawn_link(fun () -> receive after infinity -> ok end end),
-    ?line {'EXIT', _} = (catch erlang:resume_process(P1)),
-    ?line {P2, M2} = spawn_monitor(
-		       fun () ->
-			       ?CHK_SUSPENDED(P1, false),
-			       erlang:suspend_process(P1),
-			       ?CHK_SUSPENDED(P1, true),
-			       erlang:suspend_process(P1),
-			       erlang:suspend_process(P1),
-			       erlang:suspend_process(P1),
-			       ?CHK_SUSPENDED(P1, true),
-			       erlang:resume_process(P1),
-			       erlang:resume_process(P1),
-			       erlang:resume_process(P1),
-			       ?CHK_SUSPENDED(P1, true),
-			       erlang:resume_process(P1),
-			       ?CHK_SUSPENDED(P1, false),
-			       erlang:suspend_process(P1),
-			       erlang:suspend_process(P1),
-			       erlang:suspend_process(P1),
-			       ?CHK_SUSPENDED(P1, true),
-			       exit(bang)
-		 end),
-    ?line receive
-	      {'DOWN', M2,process,P2,R2} ->
-		  ?line bang = R2,
-		  ?line ?CHK_SUSPENDED(P1, false)
-	  end,
-    ?line Parent = self(),
-    ?line {P3, M3} = spawn_monitor(
-		       fun () ->
-			       erlang:suspend_process(P1),
-			       ?CHK_SUSPENDED(P1, true),
-			       Parent ! self(),
-			       receive after infinity -> ok end
-		       end),
-    ?line {P4, M4} = spawn_monitor(
-		       fun () ->
-			       erlang:suspend_process(P1),
-			       ?CHK_SUSPENDED(P1, true),
-			       Parent ! self(),
-			       receive after infinity -> ok end
-		       end),
-    ?line {P5, M5} = spawn_monitor(
-		       fun () ->
-			       erlang:suspend_process(P1),
-			       ?CHK_SUSPENDED(P1, true),
-			       Parent ! self(),
-			       receive after infinity -> ok end
-		       end),
-    ?line {P6, M6} = spawn_monitor(
-		       fun () ->
-			       erlang:suspend_process(P1),
-			       ?CHK_SUSPENDED(P1, true),
-			       Parent ! self(),
-			       receive after infinity -> ok end
-		       end),
-    ?line {P7, M7} = spawn_monitor(
-		       fun () ->
-			       erlang:suspend_process(P1),
-			       ?CHK_SUSPENDED(P1, true),
-			       Parent ! self(),
-			       receive after infinity -> ok end
-		       end),
-    ?line receive P3 -> ok end,
-    ?line receive P4 -> ok end,
-    ?line receive P5 -> ok end,
-    ?line receive P6 -> ok end,
-    ?line receive P7 -> ok end,
-    ?line ?CHK_SUSPENDED(P1, true),
-    ?line exit(P3, bang),
-    ?line receive
-	      {'DOWN',M3,process,P3,R3} ->
-		  ?line bang = R3,
-		  ?line ?CHK_SUSPENDED(P1, true)
-	  end,
-    ?line exit(P4, bang),
-    ?line receive
-	      {'DOWN',M4,process,P4,R4} ->
-		  ?line bang = R4,
-		  ?line ?CHK_SUSPENDED(P1, true)
-	  end,
-    ?line exit(P5, bang),
-    ?line receive
-	      {'DOWN',M5,process,P5,R5} ->
-		  ?line bang = R5,
-		  ?line ?CHK_SUSPENDED(P1, true)
-	  end,
-    ?line exit(P6, bang),
-    ?line receive
-	      {'DOWN',M6,process,P6,R6} ->
-		  ?line bang = R6,
-		  ?line ?CHK_SUSPENDED(P1, true)
-	  end,
-    ?line exit(P7, bang),
-    ?line receive
-	      {'DOWN',M7,process,P7,R7} ->
-		  ?line bang = R7,
-		  ?line ?CHK_SUSPENDED(P1, false)
-	  end,
-    ?line unlink(P1),
-    ?line exit(P1, bong),
-    ?line test_server:timetrap_cancel(Dog),
-    ?line ok.
-			 
-suspend_system_limit(doc) ->			 
-    [];
-suspend_system_limit(suite) ->
-    [];
+    ct:timetrap({minutes, 3}),
+    P1 = spawn_link(fun () -> receive after infinity -> ok end end),
+    {'EXIT', _} = (catch erlang:resume_process(P1)),
+    {P2, M2} = spawn_monitor(
+                 fun () ->
+                         ?CHK_SUSPENDED(P1, false),
+                         erlang:suspend_process(P1),
+                         ?CHK_SUSPENDED(P1, true),
+                         erlang:suspend_process(P1),
+                         erlang:suspend_process(P1),
+                         erlang:suspend_process(P1),
+                         ?CHK_SUSPENDED(P1, true),
+                         erlang:resume_process(P1),
+                         erlang:resume_process(P1),
+                         erlang:resume_process(P1),
+                         ?CHK_SUSPENDED(P1, true),
+                         erlang:resume_process(P1),
+                         ?CHK_SUSPENDED(P1, false),
+                         erlang:suspend_process(P1),
+                         erlang:suspend_process(P1),
+                         erlang:suspend_process(P1),
+                         ?CHK_SUSPENDED(P1, true),
+                         exit(bang)
+                 end),
+    receive
+        {'DOWN', M2,process,P2,R2} ->
+            bang = R2,
+            ?CHK_SUSPENDED(P1, false)
+    end,
+    Parent = self(),
+    {P3, M3} = spawn_monitor(
+                 fun () ->
+                         erlang:suspend_process(P1),
+                         ?CHK_SUSPENDED(P1, true),
+                         Parent ! self(),
+                         receive after infinity -> ok end
+                 end),
+    {P4, M4} = spawn_monitor(
+                 fun () ->
+                         erlang:suspend_process(P1),
+                         ?CHK_SUSPENDED(P1, true),
+                         Parent ! self(),
+                         receive after infinity -> ok end
+                 end),
+    {P5, M5} = spawn_monitor(
+                 fun () ->
+                         erlang:suspend_process(P1),
+                         ?CHK_SUSPENDED(P1, true),
+                         Parent ! self(),
+                         receive after infinity -> ok end
+                 end),
+    {P6, M6} = spawn_monitor(
+                 fun () ->
+                         erlang:suspend_process(P1),
+                         ?CHK_SUSPENDED(P1, true),
+                         Parent ! self(),
+                         receive after infinity -> ok end
+                 end),
+    {P7, M7} = spawn_monitor(
+                 fun () ->
+                         erlang:suspend_process(P1),
+                         ?CHK_SUSPENDED(P1, true),
+                         Parent ! self(),
+                         receive after infinity -> ok end
+                 end),
+    receive P3 -> ok end,
+    receive P4 -> ok end,
+    receive P5 -> ok end,
+    receive P6 -> ok end,
+    receive P7 -> ok end,
+    ?CHK_SUSPENDED(P1, true),
+    exit(P3, bang),
+    receive
+        {'DOWN',M3,process,P3,R3} ->
+            bang = R3,
+            ?CHK_SUSPENDED(P1, true)
+    end,
+    exit(P4, bang),
+    receive
+        {'DOWN',M4,process,P4,R4} ->
+            bang = R4,
+            ?CHK_SUSPENDED(P1, true)
+    end,
+    exit(P5, bang),
+    receive
+        {'DOWN',M5,process,P5,R5} ->
+            bang = R5,
+            ?CHK_SUSPENDED(P1, true)
+    end,
+    exit(P6, bang),
+    receive
+        {'DOWN',M6,process,P6,R6} ->
+            bang = R6,
+            ?CHK_SUSPENDED(P1, true)
+    end,
+    exit(P7, bang),
+    receive
+        {'DOWN',M7,process,P7,R7} ->
+            bang = R7,
+            ?CHK_SUSPENDED(P1, false)
+    end,
+    unlink(P1),
+    exit(P1, bong),
+    ok.
+
 suspend_system_limit(Config) when is_list(Config) ->
     case os:getenv("ERL_EXTREME_TESTING") of
-	"true" ->
-	    ?line Dog = test_server:timetrap(test_server:minutes(3*60)),
-	    ?line P = spawn_link(fun () -> receive after infinity -> ok end end),
-	    ?line suspend_until_system_limit(P),
-	    ?line unlink(P),
-	    ?line exit(P, bye),
-	    ?line test_server:timetrap_cancel(Dog),
-	    ?line ok;
-	_ ->
-	    {skip, "Takes too long time for normal testing"}
+        "true" ->
+            ct:timetrap({minutes, 3*60}),
+            P = spawn_link(fun () -> receive after infinity -> ok end end),
+            suspend_until_system_limit(P),
+            unlink(P),
+            exit(P, bye),
+            ok;
+        _ ->
+            {skip, "Takes too long time for normal testing"}
     end.
 
 suspend_until_system_limit(P) ->
-    ?line suspend_until_system_limit(P, 0, 0).
+    suspend_until_system_limit(P, 0, 0).
 
 suspend_until_system_limit(P, N, M) ->
     NewM = case M of
-	       1 ->
-		   ?line ?CHK_SUSPENDED(P, true), 2;
-	       1000000 ->
-		   erlang:display(N), 1;
-	       _ ->
-		   M+1
-	   end,
-    ?line case catch erlang:suspend_process(P) of
-	      true ->
-		  suspend_until_system_limit(P, N+1, NewM);
-	      {'EXIT', R} when R == system_limit;
-			       element(1, R) == system_limit ->
-		  ?line ?t:format("system limit at ~p~n", [N]),
-		  ?line resume_from_system_limit(P, N, 0);
-	      Error ->
-		  ?line ?t:fail(Error)
-	  end.
+               1 ->
+                   ?CHK_SUSPENDED(P, true), 2;
+               1000000 ->
+                   erlang:display(N), 1;
+               _ ->
+                   M+1
+           end,
+    case catch erlang:suspend_process(P) of
+        true ->
+            suspend_until_system_limit(P, N+1, NewM);
+        {'EXIT', R} when R == system_limit;
+                         element(1, R) == system_limit ->
+            io:format("system limit at ~p~n", [N]),
+            resume_from_system_limit(P, N, 0);
+        Error ->
+            ct:fail(Error)
+    end.
 
 resume_from_system_limit(P, 0, _) ->
-    ?line ?CHK_SUSPENDED(P, false),
-    ?line {'EXIT', _} = (catch erlang:resume_process(P)),
-    ?line ok;
+    ?CHK_SUSPENDED(P, false),
+    {'EXIT', _} = (catch erlang:resume_process(P)),
+    ok;
 resume_from_system_limit(P, N, M) ->
-    ?line NewM = case M of
-		     1 ->
-			 ?line ?CHK_SUSPENDED(P, true), 2;
-		     1000000 ->
-			 erlang:display(N), 1;
-		     _ ->
-			 M+1
-		 end,
-    ?line erlang:resume_process(P),
-    ?line resume_from_system_limit(P, N-1, NewM).
+    NewM = case M of
+               1 ->
+                   ?CHK_SUSPENDED(P, true), 2;
+               1000000 ->
+                   erlang:display(N), 1;
+               _ ->
+                   M+1
+           end,
+    erlang:resume_process(P),
+    resume_from_system_limit(P, N-1, NewM).
 
 -record(susp_info, {async = 0,
-		    dbl_async = 0,
-		    synced = 0,
-		    async_once = 0}).
-
-suspend_opts(doc) ->
-    [];
-suspend_opts(suite) ->
-    [];
+                    dbl_async = 0,
+                    synced = 0,
+                    async_once = 0}).
+
 suspend_opts(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(3)),
-    ?line Self = self(),
-    ?line wait_for_empty_runq(10),
-    ?line Tok = spawn_link(fun () ->
-				   Self ! self(),
-				   tok_trace_loop(Self, 0, 1000000000)
-			   end),
-    ?line TC = 1000,
-    ?line receive Tok -> ok end,
-    ?line SF = fun (N, #susp_info {async = A,
-				   dbl_async = AA,
-				   synced = S,
-				   async_once = AO} = Acc) ->
-		       ?line erlang:suspend_process(Tok, [asynchronous]),
-		       ?line Res = case {suspend_count(Tok), N rem 4} of
-				       {0, 2} ->
-					   ?line erlang:suspend_process(Tok,
-									[asynchronous]),
-					   case suspend_count(Tok) of
-					       2 ->
-						   ?line erlang:resume_process(Tok),
-						   ?line Acc#susp_info{async = A+1};
-					       0 ->
-						   ?line erlang:resume_process(Tok),
-						   ?line Acc#susp_info{async = A+1,
-								       dbl_async = AA+1}
-					   end;
-				       {0, 1} ->
-					   ?line erlang:suspend_process(Tok,
-									[asynchronous,
-									 unless_suspending]),
-					   case suspend_count(Tok) of
-					       1 ->
-						   ?line Acc#susp_info{async = A+1};
-					       0 ->
-						   ?line Acc#susp_info{async = A+1,
-								       async_once = AO+1}
-					   end;
-				       {0, 0} ->
-					   ?line erlang:suspend_process(Tok,
-									[unless_suspending]),
-					   ?line 1 = suspend_count(Tok),
-					   ?line Acc#susp_info{async = A+1,
-							       synced = S+1};
-				       {0, _} ->
-					   ?line Acc#susp_info{async = A+1};
-				       _ ->
-					   Acc
-				   end,
-		       ?line erlang:resume_process(Tok),
-		       ?line erlang:yield(),
-		       ?line Res
-	       end,
-    ?line SI = repeat_acc(SF, TC, #susp_info{}),
-    ?line erlang:suspend_process(Tok, [asynchronous]),
+    ct:timetrap({minutes, 3}),
+    Self = self(),
+    wait_for_empty_runq(10),
+    Tok = spawn_link(fun () ->
+                             Self ! self(),
+                             tok_trace_loop(Self, 0, 1000000000)
+                     end),
+    TC = 1000,
+    receive Tok -> ok end,
+    SF = fun (N, #susp_info {async = A,
+                             dbl_async = AA,
+                             synced = S,
+                             async_once = AO} = Acc) ->
+                 erlang:suspend_process(Tok, [asynchronous]),
+                 Res = case {suspend_count(Tok), N rem 4} of
+                           {0, 2} ->
+                               erlang:suspend_process(Tok,
+                                                      [asynchronous]),
+                               case suspend_count(Tok) of
+                                   2 ->
+                                       erlang:resume_process(Tok),
+                                       Acc#susp_info{async = A+1};
+                                   0 ->
+                                       erlang:resume_process(Tok),
+                                       Acc#susp_info{async = A+1,
+                                                     dbl_async = AA+1}
+                               end;
+                           {0, 1} ->
+                               erlang:suspend_process(Tok,
+                                                      [asynchronous,
+                                                       unless_suspending]),
+                               case suspend_count(Tok) of
+                                   1 ->
+                                       Acc#susp_info{async = A+1};
+                                   0 ->
+                                       Acc#susp_info{async = A+1,
+                                                     async_once = AO+1}
+                               end;
+                           {0, 0} ->
+                               erlang:suspend_process(Tok,
+                                                      [unless_suspending]),
+                               1 = suspend_count(Tok),
+                               Acc#susp_info{async = A+1,
+                                             synced = S+1};
+                           {0, _} ->
+                               Acc#susp_info{async = A+1};
+                           _ ->
+                               Acc
+                       end,
+                 erlang:resume_process(Tok),
+                 erlang:yield(),
+                 Res
+         end,
+    SI = repeat_acc(SF, TC, #susp_info{}),
+    erlang:suspend_process(Tok, [asynchronous]),
     %% Verify that it eventually suspends
-    ?line WaitTime0 = 10,
-    ?line WaitTime1 = case {erlang:system_info(debug_compiled),
-			    erlang:system_info(lock_checking)} of
-			  {false, false} ->
-			      WaitTime0;
-			  {false, true} ->
-			      WaitTime0*5;
-			  _ ->
-			      WaitTime0*10
-		      end,
-    ?line WaitTime = case {erlang:system_info(schedulers_online),
-			   erlang:system_info(logical_processors)} of
-			 {Schdlrs, CPUs} when is_integer(CPUs),
-					      Schdlrs =< CPUs ->
-			     WaitTime1;
-			 _ ->
-			     WaitTime1*10
-		     end,
-    ?line receive after WaitTime -> ok end,
-    ?line 1 = suspend_count(Tok),
-    ?line erlang:suspend_process(Tok, [asynchronous]),
-    ?line 2 = suspend_count(Tok),
-    ?line erlang:suspend_process(Tok, [asynchronous]),
-    ?line 3 = suspend_count(Tok),
-    ?line erlang:suspend_process(Tok),
-    ?line 4 = suspend_count(Tok),
-    ?line erlang:suspend_process(Tok),
-    ?line 5 = suspend_count(Tok),
-    ?line erlang:suspend_process(Tok, [unless_suspending]),
-    ?line 5 = suspend_count(Tok),
-    ?line erlang:suspend_process(Tok, [unless_suspending,
-				       asynchronous]),
-    ?line 5 = suspend_count(Tok),
-    ?line erlang:resume_process(Tok),
-    ?line erlang:resume_process(Tok),
-    ?line erlang:resume_process(Tok),
-    ?line erlang:resume_process(Tok),
-    ?line 1 = suspend_count(Tok),
-    ?line ?t:format("Main suspends: ~p~n"
-		    "Main async: ~p~n"
-		    "Double async: ~p~n"
-		    "Async once: ~p~n"
-		    "Synced: ~p~n",
-		    [TC,
-		     SI#susp_info.async,
-		     SI#susp_info.dbl_async,
-		     SI#susp_info.async_once,
-		     SI#susp_info.synced]),
-    ?line case erlang:system_info(schedulers_online) of
-	      1 ->
-		  ?line ok;
-	      _ ->
-		  ?line true = SI#susp_info.async =/= 0
-	  end,
-    ?line unlink(Tok),
-    ?line exit(Tok, bang),
-    ?line test_server:timetrap_cancel(Dog),
-    ?line ok.
+    WaitTime0 = 10,
+    WaitTime1 = case {erlang:system_info(debug_compiled),
+                      erlang:system_info(lock_checking)} of
+                    {false, false} ->
+                        WaitTime0;
+                    {false, true} ->
+                        WaitTime0*5;
+                    _ ->
+                        WaitTime0*10
+                end,
+    WaitTime = case {erlang:system_info(schedulers_online),
+                     erlang:system_info(logical_processors)} of
+                   {Schdlrs, CPUs} when is_integer(CPUs),
+                                        Schdlrs =< CPUs ->
+                       WaitTime1;
+                   _ ->
+                       WaitTime1*10
+               end,
+    receive after WaitTime -> ok end,
+    1 = suspend_count(Tok),
+    erlang:suspend_process(Tok, [asynchronous]),
+    2 = suspend_count(Tok),
+    erlang:suspend_process(Tok, [asynchronous]),
+    3 = suspend_count(Tok),
+    erlang:suspend_process(Tok),
+    4 = suspend_count(Tok),
+    erlang:suspend_process(Tok),
+    5 = suspend_count(Tok),
+    erlang:suspend_process(Tok, [unless_suspending]),
+    5 = suspend_count(Tok),
+    erlang:suspend_process(Tok, [unless_suspending,
+                                 asynchronous]),
+    5 = suspend_count(Tok),
+    erlang:resume_process(Tok),
+    erlang:resume_process(Tok),
+    erlang:resume_process(Tok),
+    erlang:resume_process(Tok),
+    1 = suspend_count(Tok),
+    io:format("Main suspends: ~p~n"
+              "Main async: ~p~n"
+              "Double async: ~p~n"
+              "Async once: ~p~n"
+              "Synced: ~p~n",
+              [TC,
+               SI#susp_info.async,
+               SI#susp_info.dbl_async,
+               SI#susp_info.async_once,
+               SI#susp_info.synced]),
+    case erlang:system_info(schedulers_online) of
+        1 ->
+            ok;
+        _ ->
+            true = SI#susp_info.async =/= 0
+    end,
+    unlink(Tok),
+    exit(Tok, bang),
+    ok.
 
 suspend_count(Suspendee) ->
     suspend_count(self(), Suspendee).
 
 suspend_count(Suspender, Suspendee) ->
     {suspending, SList} = process_info(Suspender, suspending),
-    
+
     case lists:keysearch(Suspendee, 1, SList) of
-	{value, {_Suspendee, 0, 0}} ->
-	    ?line ?t:fail({bad_suspendee_list, SList});
-	{value, {Suspendee, Count, 0}} when is_integer(Count), Count > 0 ->
-	    {status, suspended} = process_info(Suspendee, status),
-	    Count;
-	{value, {Suspendee, 0, Outstanding}} when is_integer(Outstanding),
-	                                          Outstanding > 0 ->
-	    0;
-	false ->
-	    0;
-	Error ->
-	    ?line ?t:fail({bad_suspendee_list, Error, SList})
+        {value, {_Suspendee, 0, 0}} ->
+            ct:fail({bad_suspendee_list, SList});
+        {value, {Suspendee, Count, 0}} when is_integer(Count), Count > 0 ->
+            {status, suspended} = process_info(Suspendee, status),
+            Count;
+        {value, {Suspendee, 0, Outstanding}} when is_integer(Outstanding),
+                                                  Outstanding > 0 ->
+            0;
+        false ->
+            0;
+        Error ->
+            ct:fail({bad_suspendee_list, Error, SList})
     end.
-    
+
 repeat_acc(Fun, N, Acc) ->
     repeat_acc(Fun, 0, N, Acc).
 
@@ -1306,121 +1204,100 @@ repeat_acc(_Fun, N, N, Acc) ->
     Acc;
 repeat_acc(Fun, N, M, Acc) ->
     repeat_acc(Fun, N+1, M, Fun(N, Acc)).
-		   
+
 %% Tests that waiting process can be suspended
 %% (bug in R2D and earlier; see OTP-1488).
 
-suspend_waiting(doc) -> "Test that a waiting process can be suspended.";
+%% Test that a waiting process can be suspended.
 suspend_waiting(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-
-    ?line Process = fun_spawn(fun process/0),
-    ?line receive after 1 -> ok end,
-    ?line true = erlang:suspend_process(Process),
-    ?line {status, suspended} = process_info(Process, status),
-
-    %% Done.
-    ?line test_server:timetrap_cancel(Dog),
+    Process = fun_spawn(fun process/0),
+    receive after 1 -> ok end,
+    true = erlang:suspend_process(Process),
+    {status, suspended} = process_info(Process, status),
     ok.
 
 
-
-new_clear(doc) ->
-    "Test that erlang:trace(new, true, ...) is cleared when tracer dies.";
+%% Test that erlang:trace(new, true, ...) is cleared when tracer dies.
 new_clear(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-
-    ?line Tracer = spawn(fun receiver/0),
-    ?line 0 = erlang:trace(new, true, [send, {tracer, Tracer}]),
-    ?line {flags, [send]} = erlang:trace_info(new, flags),
-    ?line {tracer, Tracer} = erlang:trace_info(new, tracer),
-    ?line Mref = erlang:monitor(process, Tracer),
-    ?line true = exit(Tracer, done),
+    Tracer = spawn(fun receiver/0),
+    0 = erlang:trace(new, true, [send, {tracer, Tracer}]),
+    {flags, [send]} = erlang:trace_info(new, flags),
+    {tracer, Tracer} = erlang:trace_info(new, tracer),
+    Mref = erlang:monitor(process, Tracer),
+    true = exit(Tracer, done),
     receive
-	{'DOWN',Mref,_,_,_} -> ok
+        {'DOWN',Mref,_,_,_} -> ok
     end,
-    ?line {flags, []} = erlang:trace_info(new, flags),
-    ?line {tracer, []} = erlang:trace_info(new, tracer),
-
-    %% Done.
-    ?line test_server:timetrap_cancel(Dog),
-
+    {flags, []} = erlang:trace_info(new, flags),
+    {tracer, []} = erlang:trace_info(new, tracer),
     ok.
 
 
 
-existing_clear(doc) ->
-    "Test that erlang:trace(all, false, ...) works without tracer.";
+%% Test that erlang:trace(all, false, ...) works without tracer.
 existing_clear(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line Self = self(),
-
-    ?line Tracer = fun_spawn(fun receiver/0),
-    ?line N = erlang:trace(existing, true, [send, {tracer, Tracer}]),
-    ?line {flags, [send]} = erlang:trace_info(Self, flags),
-    ?line {tracer, Tracer} = erlang:trace_info(Self, tracer),
-    ?line M = erlang:trace(all, false, [all]),
-    ?line io:format("Started trace on ~p processes and stopped on ~p~n", 
-		    [N, M]),
-    ?line {flags, []} = erlang:trace_info(Self, flags),
-    ?line {tracer, []} = erlang:trace_info(Self, tracer),
-    ?line M = N + 1, % Since trace could not be enabled on the tracer.
+    Self = self(),
 
-    %% Done.
-    ?line test_server:timetrap_cancel(Dog),
+    Tracer = fun_spawn(fun receiver/0),
+    N = erlang:trace(existing, true, [send, {tracer, Tracer}]),
+    {flags, [send]} = erlang:trace_info(Self, flags),
+    {tracer, Tracer} = erlang:trace_info(Self, tracer),
+    M = erlang:trace(all, false, [all]),
+    io:format("Started trace on ~p processes and stopped on ~p~n", 
+              [N, M]),
+    {flags, []} = erlang:trace_info(Self, flags),
+    {tracer, []} = erlang:trace_info(Self, tracer),
+    M = N + 1, % Since trace could not be enabled on the tracer.
     ok.
 
-bad_flag(doc) -> "Test that an invalid flag cause badarg";
-bad_flag(suite) -> [];
+%% Test that an invalid flag cause badarg
 bad_flag(Config) when is_list(Config) ->
     %% A bad flag could deadlock the SMP emulator in erts-5.5
-    ?line {'EXIT', {badarg, _}} = (catch erlang:trace(new,
-						      true,
-						      [not_a_valid_flag])),
-    ?line ok.
+    {'EXIT', {badarg, _}} = (catch erlang:trace(new,
+                                                true,
+                                                [not_a_valid_flag])),
+    ok.
 
-trace_delivered(doc) -> "Test erlang:trace_delivered/1";
-trace_delivered(suite) -> [];
+%% Test erlang:trace_delivered/1
 trace_delivered(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
-    ?line TokLoops = 10000,
-    ?line Go = make_ref(),
-    ?line Parent = self(),
-    ?line Tok = spawn(fun () ->
-			      receive Go -> gone end,
-			      tok_trace_loop(Parent, 0, TokLoops)
-		      end),
-    ?line 1 = erlang:trace(Tok, true, [procs]),
-    ?line Mon = erlang:monitor(process, Tok),
-    ?line NoOfTraceMessages = 4*TokLoops + 1,
-    ?line io:format("Expect a total of ~p trace messages~n",
-		    [NoOfTraceMessages]),
-    ?line Tok ! Go,
-    ?line NoOfTraceMessages = drop_trace_until_down(Tok, Mon),
-    ?line receive
-	      Msg ->
-		  ?line ?t:fail({unexpected_message, Msg})
-	  after 1000 ->
-		  ?line test_server:timetrap_cancel(Dog),
-		  ?line ok
-	  end.
+    ct:timetrap({minutes, 1}),
+    TokLoops = 10000,
+    Go = make_ref(),
+    Parent = self(),
+    Tok = spawn(fun () ->
+                        receive Go -> gone end,
+                        tok_trace_loop(Parent, 0, TokLoops)
+                end),
+    1 = erlang:trace(Tok, true, [procs]),
+    Mon = erlang:monitor(process, Tok),
+    NoOfTraceMessages = 4*TokLoops + 1,
+    io:format("Expect a total of ~p trace messages~n",
+              [NoOfTraceMessages]),
+    Tok ! Go,
+    NoOfTraceMessages = drop_trace_until_down(Tok, Mon),
+    receive
+        Msg ->
+            ct:fail({unexpected_message, Msg})
+    after 1000 ->
+              ok
+    end.
 
 drop_trace_until_down(Proc, Mon) ->
     drop_trace_until_down(Proc, Mon, false, 0, 0).
 
 drop_trace_until_down(Proc, Mon, TDRef, N, D) ->
     case receive Msg -> Msg end of
-	{trace_delivered, Proc, TDRef} ->
-	    io:format("~p trace messages on 'DOWN'~n", [D]),
-	    io:format("Got a total of ~p trace messages~n", [N]),
-	    N;
-	{'DOWN', Mon, process, Proc, _} ->
-	    Ref = erlang:trace_delivered(Proc),
-	    drop_trace_until_down(Proc, Mon, Ref, N, N);
-	Trace when is_tuple(Trace),
-		   element(1, Trace) == trace,
-		   element(2, Trace) == Proc ->
-	    drop_trace_until_down(Proc, Mon, TDRef, N+1, D)
+        {trace_delivered, Proc, TDRef} ->
+            io:format("~p trace messages on 'DOWN'~n", [D]),
+            io:format("Got a total of ~p trace messages~n", [N]),
+            N;
+        {'DOWN', Mon, process, Proc, _} ->
+            Ref = erlang:trace_delivered(Proc),
+            drop_trace_until_down(Proc, Mon, Ref, N, N);
+        Trace when is_tuple(Trace),
+                   element(1, Trace) == trace,
+                   element(2, Trace) == Proc ->
+            drop_trace_until_down(Proc, Mon, TDRef, N+1, D)
     end.
 
 tok_trace_loop(_, N, N) ->
@@ -1437,17 +1314,17 @@ tok_trace_loop(Parent, N, M) ->
 
 receive_first() ->
     receive
-	Any -> Any
+        Any -> Any
     end.
 
 %% Ensures that there is no message in the message queue.
 
 receive_nothing() ->
     receive
-	Any ->
-	    test_server:fail({unexpected_message, Any})
+        Any ->
+            ct:fail({unexpected_message, Any})
     after 200 ->
-	    ok
+              ok
     end.
 
 
@@ -1455,39 +1332,39 @@ receive_nothing() ->
 
 process(Dest) ->
     receive
-	{send_please, To, What} ->
-	    To ! What,
-	    process(Dest);
-	{spawn_link_please, ReplyTo, {M, F, A}} ->
-	    Pid = spawn_link(M, F, A),
-	    ReplyTo ! {spawned, self(), Pid},
-	    process(Dest);
-	{spawn_link_please, ReplyTo, Node, {M, F, A}} ->
-	    Pid = spawn_link(Node, M, F, A),
-	    ReplyTo ! {spawned, self(), Pid},
-	    process(Dest);
-	{link_please, Pid} ->
-	    link(Pid),
-	    process(Dest);
-	{unlink_please, Pid} ->
-	    unlink(Pid),
-	    process(Dest);
-	{register_please, Name, Pid} ->
-	    register(Name, Pid),
-	    process(Dest);
-	{unregister_please, Name} ->
-	    unregister(Name),
-	    process(Dest);
-	{exit_please, Reason} ->
-	    exit(Reason);
-	{trap_exit_please, State} ->
-	    process_flag(trap_exit, State),
-	    process(Dest);
-	Other ->
-	    Dest ! {self(), Other},
-	    process(Dest)
+        {send_please, To, What} ->
+            To ! What,
+            process(Dest);
+        {spawn_link_please, ReplyTo, {M, F, A}} ->
+            Pid = spawn_link(M, F, A),
+            ReplyTo ! {spawned, self(), Pid},
+            process(Dest);
+        {spawn_link_please, ReplyTo, Node, {M, F, A}} ->
+            Pid = spawn_link(Node, M, F, A),
+            ReplyTo ! {spawned, self(), Pid},
+            process(Dest);
+        {link_please, Pid} ->
+            link(Pid),
+            process(Dest);
+        {unlink_please, Pid} ->
+            unlink(Pid),
+            process(Dest);
+        {register_please, Name, Pid} ->
+            register(Name, Pid),
+            process(Dest);
+        {unregister_please, Name} ->
+            unregister(Name),
+            process(Dest);
+        {exit_please, Reason} ->
+            exit(Reason);
+        {trap_exit_please, State} ->
+            process_flag(trap_exit, State),
+            process(Dest);
+        Other ->
+            Dest ! {self(), Other},
+            process(Dest)
     after 3000 ->
-	    exit(timeout)
+              exit(timeout)
     end.
 
 
@@ -1495,17 +1372,17 @@ process(Dest) ->
 
 process() ->
     receive
-	{spawn_please, ReplyTo, Fun} ->
-	    Pid = fun_spawn(Fun),
-	    ReplyTo ! {spawned, Pid},
-	    process();
-	{send_please, To, What} ->
-	    To ! What,
-	    process();
-	timeout_please ->
-	    receive after 1 -> process() end;
-	_Other ->
-	    process()
+        {spawn_please, ReplyTo, Fun} ->
+            Pid = fun_spawn(Fun),
+            ReplyTo ! {spawned, Pid},
+            process();
+        {send_please, To, What} ->
+            To ! What,
+            process();
+        timeout_please ->
+            receive after 1 -> process() end;
+        _Other ->
+            process()
     end.
 
 
@@ -1513,9 +1390,9 @@ process() ->
 
 sender() ->
     receive
-	{send_please, To, What} ->
-	    To ! What,
-	    sender()
+        {send_please, To, What} ->
+            To ! What,
+            sender()
     end.
 
 
@@ -1523,7 +1400,7 @@ sender() ->
 
 receiver() ->
     receive
-	_Any -> receiver()
+        _Any -> receiver()
     end.
 
 %% Works as long as it receives CPU time.  Will always be RUNNABLE.
@@ -1545,7 +1422,7 @@ start_node(Name) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Cookie = atom_to_list(erlang:get_cookie()),
     test_server:start_node(Name, slave, 
-			   [{args, "-setcookie " ++ Cookie ++" -pa " ++ Pa}]).
+                           [{args, "-setcookie " ++ Cookie ++" -pa " ++ Pa}]).
 
 stop_node(Node) ->
     test_server:stop_node(Node).
@@ -1553,11 +1430,11 @@ stop_node(Node) ->
 
 wait_for_empty_runq(DeadLine) ->
     case statistics(run_queue) of
-	0 -> true;
-	RQLen ->
-	    erlang:display("Waiting for empty run queue"),
-	    MSDL = DeadLine*1000,
-	    wait_for_empty_runq(MSDL, MSDL, RQLen)
+        0 -> true;
+        RQLen ->
+            erlang:display("Waiting for empty run queue"),
+            MSDL = DeadLine*1000,
+            wait_for_empty_runq(MSDL, MSDL, RQLen)
     end.
 
 wait_for_empty_runq(DeadLine, Left, RQLen) when Left =< 0 ->
@@ -1568,48 +1445,48 @@ wait_for_empty_runq(DeadLine, Left, _RQLen) ->
     UntilDeadLine = Left - Wait,
     receive after Wait -> ok end,
     case statistics(run_queue) of
-	0 ->
-	    erlang:display("Waited for "
-			   ++ integer_to_list(DeadLine
-					      - UntilDeadLine)
-			   ++ " ms for empty run queue."),
-	    true;
-	NewRQLen ->
-	    wait_for_empty_runq(DeadLine,
-				UntilDeadLine,
-				NewRQLen)
+        0 ->
+            erlang:display("Waited for "
+                           ++ integer_to_list(DeadLine
+                                              - UntilDeadLine)
+                           ++ " ms for empty run queue."),
+            true;
+        NewRQLen ->
+            wait_for_empty_runq(DeadLine,
+                                UntilDeadLine,
+                                NewRQLen)
     end.
 
 issue_non_empty_runq_warning(DeadLine, RQLen) ->
     PIs = lists:foldl(
-	    fun (P, Acc) ->
-		    case process_info(P,
-				      [status,
-				       initial_call,
-				       current_function,
-				       registered_name,
-				       reductions,
-				       message_queue_len]) of
-			[{status, Runnable} | _] = PI when Runnable /= waiting,
-							   Runnable /= suspended ->
-			    [[{pid, P} | PI] | Acc];
-			_ ->
-			    Acc
-		    end
-	    end,
-	    [],
-	    processes()),
-    ?t:format("WARNING: Unexpected runnable processes in system (waited ~p sec).~n"
-	      "         Run queue length: ~p~n"
-	      "         Self: ~p~n"
-	      "         Processes info: ~p~n",
-	      [DeadLine div 1000, RQLen, self(), PIs]),
+            fun (P, Acc) ->
+                    case process_info(P,
+                                      [status,
+                                       initial_call,
+                                       current_function,
+                                       registered_name,
+                                       reductions,
+                                       message_queue_len]) of
+                        [{status, Runnable} | _] = PI when Runnable /= waiting,
+                                                           Runnable /= suspended ->
+                            [[{pid, P} | PI] | Acc];
+                        _ ->
+                            Acc
+                    end
+            end,
+            [],
+            processes()),
+    io:format("WARNING: Unexpected runnable processes in system (waited ~p sec).~n"
+              "         Run queue length: ~p~n"
+              "         Self: ~p~n"
+              "         Processes info: ~p~n",
+              [DeadLine div 1000, RQLen, self(), PIs]),
     receive after 1000 -> ok end.
 
 load_driver(Dir, Driver) ->
     case erl_ddll:load_driver(Dir, Driver) of
-	ok -> ok;
-	{error, Error} = Res ->
-	    io:format("~s\n", [erl_ddll:format_error(Error)]),
-	    Res
+        ok -> ok;
+        {error, Error} = Res ->
+            io:format("~s\n", [erl_ddll:format_error(Error)]),
+            Res
     end.
diff --git a/erts/emulator/test/trace_bif_SUITE.erl b/erts/emulator/test/trace_bif_SUITE.erl
index a12c41a3aa..b774210456 100644
--- a/erts/emulator/test/trace_bif_SUITE.erl
+++ b/erts/emulator/test/trace_bif_SUITE.erl
@@ -20,10 +20,9 @@
 
 -module(trace_bif_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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]).
 -export([trace_bif/1, trace_bif_timestamp/1, trace_on_and_off/1, 
 	 trace_bif_local/1,
 	 trace_bif_timestamp_local/1, trace_bif_return/1, not_run/1,
@@ -42,252 +41,307 @@ all() ->
 	     trace_bif_return, trace_info_old_code]
     end.
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
-trace_on_and_off(doc) -> 
-    "Tests switching tracing on and off.";
+%% Tests switching tracing on and off.
 trace_on_and_off(Config) when is_list(Config) ->
-    ?line Pid = spawn(?MODULE, bif_process, []),
-    ?line Self = self(),
-    ?line 1 = erlang:trace(Pid, true, [call,timestamp]),
-    ?line {flags,[timestamp,call]} =  erlang:trace_info(Pid,flags),
-    ?line {tracer, Self} = erlang:trace_info(Pid,tracer),
-    ?line 1 = erlang:trace(Pid, false, [timestamp]),
-    ?line {flags,[call]} =  erlang:trace_info(Pid,flags),
-    ?line {tracer, Self} = erlang:trace_info(Pid,tracer),
-    ?line 1 = erlang:trace(Pid, false, [call]),
-    ?line {flags,[]} =  erlang:trace_info(Pid,flags),
-    ?line {tracer, []} = erlang:trace_info(Pid,tracer),
-    ?line exit(Pid,kill),
+    Pid = spawn(?MODULE, bif_process, []),
+    Self = self(),
+    1 = erlang:trace(Pid, true, [call,timestamp]),
+    {flags, Flags} = erlang:trace_info(Pid,flags),
+    [call,timestamp] = lists:sort(Flags),
+    {tracer, Self} = erlang:trace_info(Pid,tracer),
+    1 = erlang:trace(Pid, false, [timestamp]),
+    {flags,[call]} =  erlang:trace_info(Pid,flags),
+    {tracer, Self} = erlang:trace_info(Pid,tracer),
+    1 = erlang:trace(Pid, false, [call]),
+    {flags,[]} =  erlang:trace_info(Pid,flags),
+    {tracer, []} = erlang:trace_info(Pid,tracer),
+    exit(Pid,kill),
     ok.
 
-trace_bif(doc) -> "Test tracing BIFs.";
+%% Test tracing BIFs.
 trace_bif(Config) when is_list(Config) ->
     do_trace_bif([]).
 
-trace_bif_local(doc) -> "Test tracing BIFs with local flag.";
+%% Test tracing BIFs with local flag.
 trace_bif_local(Config) when is_list(Config) ->
     do_trace_bif([local]).
 
 do_trace_bif(Flags) ->
-    ?line Pid = spawn(?MODULE, bif_process, []),
-    ?line 1 = erlang:trace(Pid, true, [call]),
-    ?line erlang:trace_pattern({erlang,'_','_'}, [], Flags),
-    ?line Pid ! {do_bif, time, []},
-    ?line receive_trace_msg({trace,Pid,call,{erlang,time, []}}),
-    ?line Pid ! {do_bif, statistics, [runtime]},
-    ?line receive_trace_msg({trace,Pid,call,
-			     {erlang,statistics, [runtime]}}),
-
-    ?line Pid ! {do_time_bif},
-    ?line receive_trace_msg({trace,Pid,call,
-			     {erlang,time, []}}),
-
-    ?line Pid ! {do_statistics_bif},
-    ?line receive_trace_msg({trace,Pid,call,
-			     {erlang,statistics, [runtime]}}),
-
-    ?line 1 = erlang:trace(Pid, false, [call]),
-    ?line erlang:trace_pattern({erlang,'_','_'}, false, Flags),
-    ?line exit(Pid, die),
+    Pid = spawn(?MODULE, bif_process, []),
+    1 = erlang:trace(Pid, true, [call]),
+    erlang:trace_pattern({erlang,'_','_'}, [], Flags),
+    Pid ! {do_bif, time, []},
+    receive_trace_msg({trace,Pid,call,{erlang,time, []}}),
+    Pid ! {do_bif, statistics, [runtime]},
+    receive_trace_msg({trace,Pid,call,
+                       {erlang,statistics, [runtime]}}),
+
+    Pid ! {do_time_bif},
+    receive_trace_msg({trace,Pid,call,
+                       {erlang,time, []}}),
+
+    Pid ! {do_statistics_bif},
+    receive_trace_msg({trace,Pid,call,
+                       {erlang,statistics, [runtime]}}),
+
+    1 = erlang:trace(Pid, false, [call]),
+    erlang:trace_pattern({erlang,'_','_'}, false, Flags),
+    exit(Pid, die),
     ok.
 
-trace_bif_timestamp(doc) -> "Test tracing BIFs with timestamps.";
+%% Test tracing BIFs with timestamps.
 trace_bif_timestamp(Config) when is_list(Config) ->
-    do_trace_bif_timestamp([]).
-
-trace_bif_timestamp_local(doc) -> 
-    "Test tracing BIFs with timestamps and local flag.";
+    do_trace_bif_timestamp([], timestamp, [timestamp]),
+    do_trace_bif_timestamp([], timestamp,
+                           [timestamp,
+                            monotonic_timestamp,
+                            strict_monotonic_timestamp]),
+    do_trace_bif_timestamp([], strict_monotonic_timestamp,
+                           [strict_monotonic_timestamp]),
+    do_trace_bif_timestamp([], strict_monotonic_timestamp,
+                           [monotonic_timestamp, strict_monotonic_timestamp]),
+    do_trace_bif_timestamp([], monotonic_timestamp, [monotonic_timestamp]).
+
+%% Test tracing BIFs with timestamps and local flag.
 trace_bif_timestamp_local(Config) when is_list(Config) ->
-    do_trace_bif_timestamp([local]).
-
-do_trace_bif_timestamp(Flags) ->
-    ?line Pid=spawn(?MODULE, bif_process, []),
-    ?line 1 = erlang:trace(Pid, true, [call,timestamp]),
-    ?line erlang:trace_pattern({erlang,'_','_'}, [], Flags),
-
-    ?line Pid ! {do_bif, time, []},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,{erlang,time,[]}}),
-
-    ?line Pid ! {do_bif, statistics, [runtime]},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,
-			     {erlang,statistics, [runtime]}}),
-
-    ?line Pid ! {do_time_bif},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,
-			     {erlang,time, []}}),
-
-    ?line Pid ! {do_statistics_bif},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,
-			     {erlang,statistics, [runtime]}}),
+    do_trace_bif_timestamp([local], timestamp, [timestamp]),
+    do_trace_bif_timestamp([local], timestamp,
+                           [timestamp,
+                            monotonic_timestamp,
+                            strict_monotonic_timestamp]),
+    do_trace_bif_timestamp([local], strict_monotonic_timestamp,
+                           [strict_monotonic_timestamp]),
+    do_trace_bif_timestamp([local], strict_monotonic_timestamp,
+                           [monotonic_timestamp, strict_monotonic_timestamp]),
+    do_trace_bif_timestamp([local], monotonic_timestamp, [monotonic_timestamp]).
+
+do_trace_bif_timestamp(Flags, TsType, TsFlags) ->
+    io:format("Testing with TsType=~p TsFlags=~p~n", [TsType, TsFlags]),
+    Pid=spawn(?MODULE, bif_process, []),
+    1 = erlang:trace(Pid, true, [call]++TsFlags),
+    erlang:trace_pattern({erlang,'_','_'}, [], Flags),
+
+    Ts0 = make_ts(TsType),
+    Pid ! {do_bif, time, []},
+    Ts1 = receive_trace_msg_ts({trace_ts,Pid,call,{erlang,time,[]}},
+                               Ts0,TsType),
+
+    Pid ! {do_bif, statistics, [runtime]},
+    Ts2 = receive_trace_msg_ts({trace_ts,Pid,call,
+                                {erlang,statistics, [runtime]}},
+                               Ts1, TsType),
+
+    Pid ! {do_time_bif},
+    Ts3 = receive_trace_msg_ts({trace_ts,Pid,call,
+                                {erlang,time, []}},
+                               Ts2, TsType),
+
+    Pid ! {do_statistics_bif},
+    Ts4 = receive_trace_msg_ts({trace_ts,Pid,call,
+                                {erlang,statistics, [runtime]}},
+                               Ts3, TsType),
+
+    check_ts(TsType, Ts4, make_ts(TsType)),
 
     %% We should be able to turn off the timestamp.
-    ?line 1 = erlang:trace(Pid, false, [timestamp]),
+    1 = erlang:trace(Pid, false, TsFlags),
 
-    ?line Pid ! {do_statistics_bif},
-    ?line receive_trace_msg({trace,Pid,call,
-			     {erlang,statistics, [runtime]}}),
+    Pid ! {do_statistics_bif},
+    receive_trace_msg({trace,Pid,call,
+                       {erlang,statistics, [runtime]}}),
 
-    ?line Pid ! {do_bif, statistics, [runtime]},
-    ?line receive_trace_msg({trace,Pid,call,
-			     {erlang,statistics, [runtime]}}),
+    Pid ! {do_bif, statistics, [runtime]},
+    receive_trace_msg({trace,Pid,call,
+                       {erlang,statistics, [runtime]}}),
 
-    ?line 1 = erlang:trace(Pid, false, [call]),
-    ?line erlang:trace_pattern({erlang,'_','_'}, false, Flags),
+    1 = erlang:trace(Pid, false, [call]),
+    erlang:trace_pattern({erlang,'_','_'}, false, Flags),
 
-    ?line exit(Pid, die),
+    exit(Pid, die),
     ok.
 
-trace_bif_return(doc) -> 
-    "Test tracing BIF's with return/return_to trace.";
+%% Test tracing BIF's with return/return_to trace.
 trace_bif_return(Config) when is_list(Config) ->
-    ?line Pid=spawn(?MODULE, bif_process, []),
-    ?line 1 = erlang:trace(Pid, true, [call,timestamp,return_to]),
-    ?line erlang:trace_pattern({erlang,'_','_'}, [{'_',[],[{return_trace}]}], 
-			       [local]),
-
-
-    ?line Pid ! {do_bif, time, []},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,{erlang,time,[]}}),
-    ?line receive_trace_msg_ts_return_from({trace_ts,Pid,return_from,
-					    {erlang,time,0}}),
-    ?line receive_trace_msg_ts_return_to({trace_ts,Pid,return_to, 
-					  {?MODULE, bif_process,0}}),
-
-
-    ?line Pid ! {do_bif, statistics, [runtime]},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,
-			     {erlang,statistics, [runtime]}}),
-    ?line receive_trace_msg_ts_return_from({trace_ts,Pid,return_from,
-					    {erlang,statistics,1}}),
-    ?line receive_trace_msg_ts_return_to({trace_ts,Pid,return_to, 
-					  {?MODULE, bif_process,0}}),
-
-
-    ?line Pid ! {do_time_bif},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,
-			     {erlang,time, []}}),
-    ?line receive_trace_msg_ts_return_from({trace_ts,Pid,return_from,
-					    {erlang,time,0}}),
-    ?line receive_trace_msg_ts_return_to({trace_ts,Pid,return_to, 
-					  {?MODULE, bif_process,0}}),
-
-
-
-    ?line Pid ! {do_statistics_bif},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,
-			     {erlang,statistics, [runtime]}}),
-    ?line receive_trace_msg_ts_return_from({trace_ts,Pid,return_from,
-					    {erlang,statistics,1}}),
-    ?line receive_trace_msg_ts_return_to({trace_ts,Pid,return_to, 
-					  {?MODULE, bif_process,0}}),
+    do_trace_bif_return(timestamp, [timestamp]),
+    do_trace_bif_return(timestamp,
+                        [timestamp,
+                         monotonic_timestamp,
+                         strict_monotonic_timestamp]),
+    do_trace_bif_return(strict_monotonic_timestamp,
+                        [strict_monotonic_timestamp]),
+    do_trace_bif_return(strict_monotonic_timestamp,
+                        [monotonic_timestamp, strict_monotonic_timestamp]),
+    do_trace_bif_return(monotonic_timestamp, [monotonic_timestamp]).
+
+do_trace_bif_return(TsType, TsFlags) ->
+    io:format("Testing with TsType=~p TsFlags=~p~n", [TsType, TsFlags]),
+    Pid=spawn(?MODULE, bif_process, []),
+    1 = erlang:trace(Pid, true, [call,return_to]++TsFlags),
+    erlang:trace_pattern({erlang,'_','_'}, [{'_',[],[{return_trace}]}], 
+                         [local]),
+
+    Ts0 = make_ts(TsType),
+    Pid ! {do_bif, time, []},
+    Ts1 = receive_trace_msg_ts({trace_ts,Pid,call,{erlang,time,[]}},
+                               Ts0, TsType),
+    Ts2 = receive_trace_msg_ts_return_from({trace_ts,Pid,return_from,
+                                            {erlang,time,0}},
+                                           Ts1, TsType),
+    Ts3 = receive_trace_msg_ts_return_to({trace_ts,Pid,return_to, 
+                                          {?MODULE, bif_process,0}},
+                                         Ts2, TsType),
+
+
+    Pid ! {do_bif, statistics, [runtime]},
+    Ts4 = receive_trace_msg_ts({trace_ts,Pid,call,
+                                {erlang,statistics, [runtime]}},
+                               Ts3, TsType),
+    Ts5 = receive_trace_msg_ts_return_from({trace_ts,Pid,return_from,
+                                            {erlang,statistics,1}},
+                                           Ts4, TsType),
+    Ts6 = receive_trace_msg_ts_return_to({trace_ts,Pid,return_to, 
+                                          {?MODULE, bif_process,0}},
+                                         Ts5, TsType),
+
+
+    Pid ! {do_time_bif},
+    Ts7 = receive_trace_msg_ts({trace_ts,Pid,call,
+                                {erlang,time, []}},
+                               Ts6, TsType),
+    Ts8 = receive_trace_msg_ts_return_from({trace_ts,Pid,return_from,
+                                            {erlang,time,0}},
+                                           Ts7, TsType),
+    Ts9 = receive_trace_msg_ts_return_to({trace_ts,Pid,return_to, 
+                                          {?MODULE, bif_process,0}},
+                                         Ts8, TsType),
+
+
+
+    Pid ! {do_statistics_bif},
+    Ts10 = receive_trace_msg_ts({trace_ts,Pid,call,
+                                 {erlang,statistics, [runtime]}},
+                                Ts9, TsType),
+    Ts11 = receive_trace_msg_ts_return_from({trace_ts,Pid,return_from,
+                                             {erlang,statistics,1}},
+                                            Ts10, TsType),
+    Ts12 = receive_trace_msg_ts_return_to({trace_ts,Pid,return_to, 
+                                           {?MODULE, bif_process,0}},
+                                          Ts11, TsType),
+    check_ts(TsType, Ts12, make_ts(TsType)),
     ok.
-    
-    
+
+
 receive_trace_msg(Mess) ->
     receive
-	Mess ->
-	    ok;
-	Other ->
-	    io:format("Expected: ~p,~nGot: ~p~n", [Mess, Other]),
-	    ?t:fail()
+        Mess ->
+            ok;
+        Other ->
+            ct:fail("Expected: ~p,~nGot: ~p~n", [Mess, Other])
     after 5000 ->
-	    io:format("Expected: ~p,~nGot: timeout~n", [Mess]),
-	    ?t:fail()
+              ct:fail("Expected: ~p,~nGot: timeout~n", [Mess])
     end.
 
-receive_trace_msg_ts({trace_ts, Pid, call, {erlang,F,A}}) ->
+receive_trace_msg_ts({trace_ts, Pid, call, {erlang,F,A}}, PrevTs, TsType) ->
     receive
-	{trace_ts, Pid, call, {erlang, F, A}, _Ts} ->
-	    ok;
-	Other ->
-	    io:format("Expected: {trace, ~p, call, {~p, ~p, ~p}, TimeStamp}},~n"
-		      "Got: ~p~n",
-		      [Pid, erlang, F, A, Other]),
-	    ?t:fail()
-	after 5000 ->
-	    io:format("Got timeout~n", []),
-	    ?t:fail()
+        {trace_ts, Pid, call, {erlang, F, A}, Ts} ->
+            check_ts(TsType, PrevTs, Ts),
+            Ts;
+        Other ->
+            ct:fail("Expected: {trace, ~p, call, {~p, ~p, ~p}, TimeStamp}},~n"
+                    "Got: ~p~n",
+                    [Pid, erlang, F, A, Other])
+    after 5000 ->
+              ct:fail("Got timeout~n", [])
     end.
 
-receive_trace_msg_ts_return_from({trace_ts, Pid, return_from, {erlang,F,A}}) ->
+receive_trace_msg_ts_return_from({trace_ts, Pid, return_from, {erlang,F,A}}, PrevTs, TsType) ->
     receive
-	{trace_ts, Pid, return_from, {erlang, F, A}, _Value, _Ts} ->
-	    ok;
-	Other ->
-	    io:format("Expected: {trace_ts, ~p, return_from, {~p, ~p, ~p}, Value, TimeStamp}},~n"
-		      "Got: ~p~n",
-		      [Pid, erlang, F, A, Other]),
-	    ?t:fail()
-	after 5000 ->
-	    io:format("Got timeout~n", []),
-	    ?t:fail()
+        {trace_ts, Pid, return_from, {erlang, F, A}, _Value, Ts} ->
+            check_ts(TsType, PrevTs, Ts),
+            Ts;
+        Other ->
+            ct:fail("Expected: {trace_ts, ~p, return_from, {~p, ~p, ~p}, Value, TimeStamp}},~n"
+                    "Got: ~p~n", [Pid, erlang, F, A, Other])
+    after 5000 ->
+              ct:fail("Got timeout~n", [])
     end.
 
-receive_trace_msg_ts_return_to({trace_ts, Pid, return_to, {M,F,A}}) ->
+receive_trace_msg_ts_return_to({trace_ts, Pid, return_to, {M,F,A}}, PrevTs, TsType) ->
     receive
-	{trace_ts, Pid, return_to, {M, F, A}, _Ts} ->
-	    ok;
-	Other ->
-	    io:format("Expected: {trace_ts, ~p, return_to, {~p, ~p, ~p}, TimeStamp}},~n"
-		      "Got: ~p~n",
-		      [Pid, M, F, A, Other]),
-	    ?t:fail()
-	after 5000 ->
-	    io:format("Got timeout~n", []),
-	    ?t:fail()
+        {trace_ts, Pid, return_to, {M, F, A}, Ts} ->
+            check_ts(TsType, PrevTs, Ts),
+            Ts;
+        Other ->
+            ct:fail("Expected: {trace_ts, ~p, return_to, {~p, ~p, ~p}, TimeStamp}},~n"
+                    "Got: ~p~n", [Pid, M, F, A, Other])
+    after 5000 ->
+              ct:fail("Got timeout~n", [])
     end.
 
+make_ts(timestamp) ->
+    erlang:now();
+make_ts(monotonic_timestamp) ->
+    erlang:monotonic_time(nano_seconds);
+make_ts(strict_monotonic_timestamp) ->
+    MT = erlang:monotonic_time(nano_seconds),
+    UMI = erlang:unique_integer([monotonic]),
+    {MT, UMI}.
+
+check_ts(timestamp, PrevTs, Ts) ->
+    {Ms, S, Us} = Ts,
+    true = is_integer(Ms),
+    true = is_integer(S),
+    true = is_integer(Us),
+    true = PrevTs < Ts,
+    Ts;
+check_ts(monotonic_timestamp, PrevTs, Ts) ->
+    true = is_integer(Ts),
+    true = PrevTs =< Ts,
+    Ts;
+check_ts(strict_monotonic_timestamp, PrevTs, Ts) ->
+    {MT, UMI} = Ts,
+    true = is_integer(MT),
+    true = is_integer(UMI),
+    true = PrevTs < Ts,
+    Ts.
+
 bif_process() ->
     receive
-	{do_bif, Name, Args} ->
-	    apply(erlang, Name, Args),
-	    bif_process();
-	{do_time_bif} ->
-	    %% Match the return value to ensure that the time() call
-	    %% is not optimized away.
-	    {_,_,_} = time(),
-	    bif_process();
-	{do_statistics_bif} ->
-	    statistics(runtime),
-	    bif_process();
-	_Stuff ->
-	    bif_process()
+        {do_bif, Name, Args} ->
+            apply(erlang, Name, Args),
+            bif_process();
+        {do_time_bif} ->
+            %% Match the return value to ensure that the time() call
+            %% is not optimized away.
+            {_,_,_} = time(),
+            bif_process();
+        {do_statistics_bif} ->
+            statistics(runtime),
+            bif_process();
+        _Stuff ->
+            bif_process()
     end.
-    
 
 
-trace_info_old_code(doc) -> "trace_info on deleted module (OTP-5057).";
+
+%% trace_info on deleted module (OTP-5057).
 trace_info_old_code(Config) when is_list(Config) ->
-    ?line MFA = {M,F,0} = {test,foo,0},
-    ?line Fname = atom_to_list(M)++".erl",
-    ?line AbsForms = 
-	[{attribute,a(1),module,M},                % -module(M).
-	 {attribute,a(2),export,[{F,0}]},          % -export([F/0]).
-	 {function,a(3),F,0,                       % F() ->
-	  [{clause,a(4),[],[],[{atom,a(4),F}]}]}], %     F.
+    MFA = {M,F,0} = {test,foo,0},
+    Fname = atom_to_list(M)++".erl",
+    AbsForms = 
+    [{attribute,a(1),module,M},                % -module(M).
+     {attribute,a(2),export,[{F,0}]},          % -export([F/0]).
+     {function,a(3),F,0,                       % F() ->
+      [{clause,a(4),[],[],[{atom,a(4),F}]}]}], %     F.
     %%
-    ?line {ok,M,Mbin} = compile:forms(AbsForms),
-    ?line {module,M} = code:load_binary(M, Fname, Mbin),
-    ?line true  = erlang:delete_module(M),
-    ?line {traced,undefined} = erlang:trace_info(MFA, traced),
+    {ok,M,Mbin} = compile:forms(AbsForms),
+    {module,M} = code:load_binary(M, Fname, Mbin),
+    true  = erlang:delete_module(M),
+    {traced,undefined} = erlang:trace_info(MFA, traced),
     ok.
 
 a(L) ->
diff --git a/erts/emulator/test/trace_call_count_SUITE.erl b/erts/emulator/test/trace_call_count_SUITE.erl
index c7881bbd70..c849668e84 100644
--- a/erts/emulator/test/trace_call_count_SUITE.erl
+++ b/erts/emulator/test/trace_call_count_SUITE.erl
@@ -43,7 +43,7 @@
 -define(config(A,B),config(A,B)).
 -export([config/2]).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -endif.
  
 -ifdef(debug).
@@ -70,18 +70,17 @@ config(priv_dir,_) ->
 	 pause_and_restart/1, combo/1]).
 	 
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(test_server:seconds(30)),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, _Config) ->
     erlang:trace_pattern({'_','_','_'}, false, [local,meta,call_count]),
     erlang:trace_pattern(on_load, false, [local,meta,call_count]),
     erlang:trace(all, false, [all]),
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 4}}].
 
 all() -> 
     case test_server:is_native(trace_call_count_SUITE) of
@@ -109,38 +108,23 @@ end_per_group(_GroupName, Config) ->
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
-basic(suite) ->
-    [];
-basic(doc) ->
-    ["Tests basic call count trace"];
+%% Tests basic call count trace
 basic(Config) when is_list(Config) ->
     basic_test().
 
-on_and_off(suite) ->
-    [];
-on_and_off(doc) ->
-    ["Tests turning trace parameters on and off"];
+%% Tests turning trace parameters on and off
 on_and_off(Config) when is_list(Config) ->
     on_and_off_test().
  
-info(suite) ->
-    [];
-info(doc) ->
-    ["Tests the trace_info BIF"];
+%% Tests the trace_info BIF
 info(Config) when is_list(Config) ->
     info_test().
  
-pause_and_restart(suite) ->
-    [];
-pause_and_restart(doc) ->
-    ["Tests pausing and restarting call counters"];
+%% Tests pausing and restarting call counters
 pause_and_restart(Config) when is_list(Config) ->
     pause_and_restart_test().
  
-combo(suite) ->
-    [];
-combo(doc) ->
-    ["Tests combining local call trace and meta trace with call count trace"];
+%% Tests combining local call trace and meta trace with call count trace
 combo(Config) when is_list(Config) ->
     combo_test().
 
@@ -161,168 +145,168 @@ combo(Config) when is_list(Config) ->
 %%%
 
 basic_test() ->
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
-    ?line M = 1000,
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
+    M = 1000,
     %%
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, true, [call_count]),
-    ?line 2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, true, [call_count]),
-    ?line L = seq(1, M, fun(X) -> X+1 end),
-    ?line {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line {call_count,0} = erlang:trace_info({?MODULE,seq_r,3}, call_count),
-    ?line Lr = seq_r(1, M, fun(X) -> X+1 end),
-    ?line {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line {call_count,1} = erlang:trace_info({?MODULE,seq_r,3}, call_count),
-    ?line {call_count,M} = erlang:trace_info({?MODULE,seq_r,4}, call_count),
-    ?line L = lists:reverse(Lr),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, true, [call_count]),
+    2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, true, [call_count]),
+    L = seq(1, M, fun(X) -> X+1 end),
+    {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    {call_count,0} = erlang:trace_info({?MODULE,seq_r,3}, call_count),
+    Lr = seq_r(1, M, fun(X) -> X+1 end),
+    {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    {call_count,1} = erlang:trace_info({?MODULE,seq_r,3}, call_count),
+    {call_count,M} = erlang:trace_info({?MODULE,seq_r,4}, call_count),
+    L = lists:reverse(Lr),
     %%
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 on_and_off_test() ->
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
-    ?line M = 100,
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
+    M = 100,
     %%
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, true, [call_count]),
-    ?line L = seq(1, M, fun(X) -> X+1 end),
-    ?line {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line N = erlang:trace_pattern({?MODULE,'_','_'}, true, [call_count]),
-    ?line L = seq(1, M, fun(X) -> X+1 end),
-    ?line {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line P = erlang:trace_pattern({'_','_','_'}, true, [call_count]),
-    ?line L = seq(1, M, fun(X) -> X+1 end),
-    ?line {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, false, [call_count]),
-    ?line {call_count,false} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line L = seq(1, M, fun(X) -> X+1 end),
-    ?line {call_count,false} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line {call_count,0} = erlang:trace_info({?MODULE,seq_r,4}, call_count),
-    ?line Lr = seq_r(1, M, fun(X) -> X+1 end),
-    ?line {call_count,M} = erlang:trace_info({?MODULE,seq_r,4}, call_count),
-    ?line N = erlang:trace_pattern({?MODULE,'_','_'}, false, [call_count]),
-    ?line {call_count,false} = erlang:trace_info({?MODULE,seq_r,4}, call_count),
-    ?line Lr = seq_r(1, M, fun(X) -> X+1 end),
-    ?line {call_count,false} = erlang:trace_info({?MODULE,seq_r,4}, call_count),
-    ?line L = lists:reverse(Lr),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, true, [call_count]),
+    L = seq(1, M, fun(X) -> X+1 end),
+    {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    N = erlang:trace_pattern({?MODULE,'_','_'}, true, [call_count]),
+    L = seq(1, M, fun(X) -> X+1 end),
+    {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    P = erlang:trace_pattern({'_','_','_'}, true, [call_count]),
+    L = seq(1, M, fun(X) -> X+1 end),
+    {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, false, [call_count]),
+    {call_count,false} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    L = seq(1, M, fun(X) -> X+1 end),
+    {call_count,false} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    {call_count,0} = erlang:trace_info({?MODULE,seq_r,4}, call_count),
+    Lr = seq_r(1, M, fun(X) -> X+1 end),
+    {call_count,M} = erlang:trace_info({?MODULE,seq_r,4}, call_count),
+    N = erlang:trace_pattern({?MODULE,'_','_'}, false, [call_count]),
+    {call_count,false} = erlang:trace_info({?MODULE,seq_r,4}, call_count),
+    Lr = seq_r(1, M, fun(X) -> X+1 end),
+    {call_count,false} = erlang:trace_info({?MODULE,seq_r,4}, call_count),
+    L = lists:reverse(Lr),
     %%
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 info_test() ->
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
     %%
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,3}, true, [call_count]),
-    ?line {call_count,0} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, pause, [call_count]),
-    ?line {call_count,0} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line {all,[_|_]=L} = erlang:trace_info({?MODULE,seq,3}, all),
-    ?line {value,{call_count,0}} = lists:keysearch(call_count, 1, L),
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, restart, [call_count]),
-    ?line {call_count,0} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, false, [call_count]),
-    ?line {call_count,false} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line {all,false} = erlang:trace_info({?MODULE,seq,3}, all),
+    1 = erlang:trace_pattern({?MODULE,seq,3}, true, [call_count]),
+    {call_count,0} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, pause, [call_count]),
+    {call_count,0} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    {all,[_|_]=L} = erlang:trace_info({?MODULE,seq,3}, all),
+    {value,{call_count,0}} = lists:keysearch(call_count, 1, L),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, restart, [call_count]),
+    {call_count,0} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, false, [call_count]),
+    {call_count,false} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    {all,false} = erlang:trace_info({?MODULE,seq,3}, all),
     %%
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 pause_and_restart_test() ->
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
-    ?line M = 100,
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
+    M = 100,
     %%
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, true, [call_count]),
-    ?line {call_count,0} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line L = seq(1, M, fun(X) -> X+1 end),
-    ?line {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, pause, [call_count]),
-    ?line {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line L = seq(1, M, fun(X) -> X+1 end),
-    ?line {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, restart, [call_count]),
-    ?line {call_count,0} = erlang:trace_info({?MODULE,seq,3}, call_count),
-    ?line L = seq(1, M, fun(X) -> X+1 end),
-    ?line {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, true, [call_count]),
+    {call_count,0} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    L = seq(1, M, fun(X) -> X+1 end),
+    {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, pause, [call_count]),
+    {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    L = seq(1, M, fun(X) -> X+1 end),
+    {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, restart, [call_count]),
+    {call_count,0} = erlang:trace_info({?MODULE,seq,3}, call_count),
+    L = seq(1, M, fun(X) -> X+1 end),
+    {call_count,M} = erlang:trace_info({?MODULE,seq,3}, call_count),
     %%
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_count]),
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 combo_test() ->
-    ?line Self = self(),
-    
-    ?line MetaMatchSpec = [{'_',[],[{return_trace}]}],
-    ?line Flags = lists:sort([call, return_to]),
-    ?line LocalTracer = spawn_link(fun () -> relay_n(5, Self) end),
-    ?line MetaTracer = spawn_link(fun () -> relay_n(9, Self) end),
-    ?line 2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, [], [local]),
-    ?line 2 = erlang:trace_pattern({?MODULE,seq_r,'_'},
-				   MetaMatchSpec,
-				   [{meta,MetaTracer}, call_count]),
-    ?line 1 = erlang:trace(Self, true, [{tracer,LocalTracer} | Flags]),
+    Self = self(),
+
+    MetaMatchSpec = [{'_',[],[{return_trace}]}],
+    Flags = lists:sort([call, return_to]),
+    LocalTracer = spawn_link(fun () -> relay_n(5, Self) end),
+    MetaTracer = spawn_link(fun () -> relay_n(9, Self) end),
+    2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, [], [local]),
+    2 = erlang:trace_pattern({?MODULE,seq_r,'_'},
+                             MetaMatchSpec,
+                             [{meta,MetaTracer}, call_count]),
+    1 = erlang:trace(Self, true, [{tracer,LocalTracer} | Flags]),
     %%
-    ?line {traced,local} = 
-	erlang:trace_info({?MODULE,seq_r,3}, traced),
-    ?line {match_spec,[]} = 
-	erlang:trace_info({?MODULE,seq_r,3}, match_spec),
-    ?line {meta,MetaTracer} = 
-	erlang:trace_info({?MODULE,seq_r,3}, meta),
-    ?line {meta_match_spec,MetaMatchSpec} = 
-	erlang:trace_info({?MODULE,seq_r,3}, meta_match_spec),
-    ?line {call_count,0} = 
-	erlang:trace_info({?MODULE,seq_r,3}, call_count),
+    {traced,local} = 
+    erlang:trace_info({?MODULE,seq_r,3}, traced),
+    {match_spec,[]} = 
+    erlang:trace_info({?MODULE,seq_r,3}, match_spec),
+    {meta,MetaTracer} = 
+    erlang:trace_info({?MODULE,seq_r,3}, meta),
+    {meta_match_spec,MetaMatchSpec} = 
+    erlang:trace_info({?MODULE,seq_r,3}, meta_match_spec),
+    {call_count,0} = 
+    erlang:trace_info({?MODULE,seq_r,3}, call_count),
     %%
-    ?line {all,[_|_]=TraceInfo} = 
-	erlang:trace_info({?MODULE,seq_r,3}, all),
-    ?line {value,{traced,local}} = 
-	lists:keysearch(traced, 1, TraceInfo),
-    ?line {value,{match_spec,[]}} = 
-	lists:keysearch(match_spec, 1, TraceInfo),
-    ?line {value,{meta,MetaTracer}} = 
-	lists:keysearch(meta, 1, TraceInfo),
-    ?line {value,{meta_match_spec,MetaMatchSpec}} = 
-	lists:keysearch(meta_match_spec, 1, TraceInfo),
-    ?line {value,{call_count,0}} = 
-	lists:keysearch(call_count, 1, TraceInfo),
+    {all,[_|_]=TraceInfo} = 
+    erlang:trace_info({?MODULE,seq_r,3}, all),
+    {value,{traced,local}} = 
+    lists:keysearch(traced, 1, TraceInfo),
+    {value,{match_spec,[]}} = 
+    lists:keysearch(match_spec, 1, TraceInfo),
+    {value,{meta,MetaTracer}} = 
+    lists:keysearch(meta, 1, TraceInfo),
+    {value,{meta_match_spec,MetaMatchSpec}} = 
+    lists:keysearch(meta_match_spec, 1, TraceInfo),
+    {value,{call_count,0}} = 
+    lists:keysearch(call_count, 1, TraceInfo),
     %%
-    ?line [3,2,1] = seq_r(1, 3, fun(X) -> X+1 end),
+    [3,2,1] = seq_r(1, 3, fun(X) -> X+1 end),
     %%
-    ?line List = collect(100),
-    ?line {MetaR, LocalR} = 
-	lists:foldl(
-	  fun ({P,X}, {M,L}) when P == MetaTracer ->
-		  {[X|M],L};
-	      ({P,X}, {M,L}) when P == LocalTracer ->
-		  {M,[X|L]}
-	  end,
-	  {[],[]},
-	  List),
-    ?line Meta = lists:reverse(MetaR),
-    ?line Local = lists:reverse(LocalR),
-    ?line [?CTT(Self,{?MODULE,seq_r,[1,3,_]}),
-	   ?CTT(Self,{?MODULE,seq_r,[1,3,_,[]]}),
-	   ?CTT(Self,{?MODULE,seq_r,[2,3,_,[1]]}),
-	   ?CTT(Self,{?MODULE,seq_r,[3,3,_,[2,1]]}),
-	   ?RFT(Self,{?MODULE,seq_r,4},[3,2,1]),
-	   ?RFT(Self,{?MODULE,seq_r,4},[3,2,1]),
-	   ?RFT(Self,{?MODULE,seq_r,4},[3,2,1]),
-	   ?RFT(Self,{?MODULE,seq_r,3},[3,2,1])] = Meta,
-    ?line [?CT(Self,{?MODULE,seq_r,[1,3,_]}),
-	   ?CT(Self,{?MODULE,seq_r,[1,3,_,[]]}),
-	   ?CT(Self,{?MODULE,seq_r,[2,3,_,[1]]}),
-	   ?CT(Self,{?MODULE,seq_r,[3,3,_,[2,1]]}),
-	   ?RT(Self,{?MODULE,combo_test,0})] = Local,
-    ?line {call_count,1} = erlang:trace_info({?MODULE,seq_r,3}, call_count),
-    ?line {call_count,3} = erlang:trace_info({?MODULE,seq_r,4}, call_count),
+    List = collect(100),
+    {MetaR, LocalR} = 
+    lists:foldl(
+      fun ({P,X}, {M,L}) when P == MetaTracer ->
+              {[X|M],L};
+          ({P,X}, {M,L}) when P == LocalTracer ->
+              {M,[X|L]}
+      end,
+      {[],[]},
+      List),
+    Meta = lists:reverse(MetaR),
+    Local = lists:reverse(LocalR),
+    [?CTT(Self,{?MODULE,seq_r,[1,3,_]}),
+     ?CTT(Self,{?MODULE,seq_r,[1,3,_,[]]}),
+     ?CTT(Self,{?MODULE,seq_r,[2,3,_,[1]]}),
+     ?CTT(Self,{?MODULE,seq_r,[3,3,_,[2,1]]}),
+     ?RFT(Self,{?MODULE,seq_r,4},[3,2,1]),
+     ?RFT(Self,{?MODULE,seq_r,4},[3,2,1]),
+     ?RFT(Self,{?MODULE,seq_r,4},[3,2,1]),
+     ?RFT(Self,{?MODULE,seq_r,3},[3,2,1])] = Meta,
+    [?CT(Self,{?MODULE,seq_r,[1,3,_]}),
+     ?CT(Self,{?MODULE,seq_r,[1,3,_,[]]}),
+     ?CT(Self,{?MODULE,seq_r,[2,3,_,[1]]}),
+     ?CT(Self,{?MODULE,seq_r,[3,3,_,[2,1]]}),
+     ?RT(Self,{?MODULE,combo_test,0})] = Local,
+    {call_count,1} = erlang:trace_info({?MODULE,seq_r,3}, call_count),
+    {call_count,3} = erlang:trace_info({?MODULE,seq_r,4}, call_count),
     %%
-    ?line erlang:trace_pattern({'_','_','_'}, false, [local,meta,call_count]),
-    ?line erlang:trace_pattern(on_load, false, [local,meta,call_count]),
-    ?line erlang:trace(all, false, [all]),
+    erlang:trace_pattern({'_','_','_'}, false, [local,meta,call_count]),
+    erlang:trace_pattern(on_load, false, [local,meta,call_count]),
+    erlang:trace(all, false, [all]),
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -352,8 +336,8 @@ relay_n(0, _) ->
     ok;
 relay_n(N, Dest) ->
     receive Msg ->
-	    Dest ! {self(), Msg},
-	    relay_n(N-1, Dest)
+                Dest ! {self(), Msg},
+                relay_n(N-1, Dest)
     end.
 
 
@@ -367,15 +351,15 @@ collect(Time) ->
 
 collect(A, 0) ->
     receive
-	Mess ->
-	    collect([Mess | A], 0)
+        Mess ->
+            collect([Mess | A], 0)
     after 0 ->
-	    A
+              A
     end;
 collect(A, Ref) ->
     receive
-	{timeout, Ref, done} ->
-	    collect(A, 0);
-	Mess ->
-	    collect([Mess | A], Ref)
+        {timeout, Ref, done} ->
+            collect(A, 0);
+        Mess ->
+            collect([Mess | A], Ref)
     end.
diff --git a/erts/emulator/test/trace_call_time_SUITE.erl b/erts/emulator/test/trace_call_time_SUITE.erl
index f359e1bd80..38972c9c02 100644
--- a/erts/emulator/test/trace_call_time_SUITE.erl
+++ b/erts/emulator/test/trace_call_time_SUITE.erl
@@ -58,32 +58,30 @@
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% When run in test server.
--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,
 	 init_per_testcase/2, end_per_testcase/2, not_run/1]).
 -export([basic/1, on_and_off/1, info/1,
 	 pause_and_restart/1, scheduling/1, called_function/1, combo/1, 
 	 bif/1, nif/1]).
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(test_server:seconds(400)),
     erlang:trace_pattern({'_','_','_'}, false, [local,meta,call_time,call_count]),
     erlang:trace_pattern(on_load, false, [local,meta,call_time,call_count]),
     timer:now_diff(now(),now()),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, _Config) ->
     erlang:trace_pattern({'_','_','_'}, false, [local,meta,call_time,call_count]),
     erlang:trace_pattern(on_load, false, [local,meta,call_time,call_count]),
     erlang:trace(all, false, [all]),
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 10}}].
 
 all() -> 
     case test_server:is_native(trace_call_time_SUITE) of
@@ -93,382 +91,339 @@ all() ->
 	     combo, bif, nif, called_function, dead_tracer]
     end.
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 not_run(Config) when is_list(Config) ->
     {skipped,"Native code"}.
 
-basic(suite) ->
-    [];
-basic(doc) ->
-    ["Tests basic call count trace"];
+%% Tests basic call time trace
 basic(Config) when is_list(Config) ->
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
-    ?line M = 1000,
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    M = 1000,
     %%
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,  '_'}, true, [call_time]),
-    ?line 2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, true, [call_time]),
-    ?line Pid = setup(),
-    ?line {L,  T1} = execute(Pid, fun() -> seq(1, M, fun(X) -> (X+1) end) end),
-    ?line ok = check_trace_info({?MODULE, seq,   3}, [{Pid, M, 0, 0}], T1),
-    ?line ok = check_trace_info({?MODULE, seq_r, 3}, [], none),
-
-    ?line {Lr, T2} = execute(Pid, fun() -> seq_r(1, M, fun(X) -> (X+1) end) end),
-    ?line ok = check_trace_info({?MODULE, seq,   3}, [{Pid, M, 0, 0}], T1),
-    ?line ok = check_trace_info({?MODULE, seq_r, 3}, [{Pid, 1, 0, 0}], T2/M),
-    ?line ok = check_trace_info({?MODULE, seq_r, 4}, [{Pid, M, 0, 0}], T2),
-    ?line L = lists:reverse(Lr),
+    1 = erlang:trace_pattern({?MODULE,seq,  '_'}, true, [call_time]),
+    2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, true, [call_time]),
+    Pid = setup(),
+    {L,  T1} = execute(Pid, fun() -> seq(1, M, fun(X) -> (X+1) end) end),
+    ok = check_trace_info({?MODULE, seq,   3}, [{Pid, M, 0, 0}], T1),
+    ok = check_trace_info({?MODULE, seq_r, 3}, [], none),
+
+    {Lr, T2} = execute(Pid, fun() -> seq_r(1, M, fun(X) -> (X+1) end) end),
+    ok = check_trace_info({?MODULE, seq,   3}, [{Pid, M, 0, 0}], T1),
+    ok = check_trace_info({?MODULE, seq_r, 3}, [{Pid, 1, 0, 0}], T2/M),
+    ok = check_trace_info({?MODULE, seq_r, 4}, [{Pid, M, 0, 0}], T2),
+    L = lists:reverse(Lr),
 
     %%
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
-    ?line Pid ! quit,
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    Pid ! quit,
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-on_and_off(suite) ->
-    [];
-on_and_off(doc) ->
-    ["Tests turning trace parameters on and off"];
+%% "Tests turning trace parameters on and off
 on_and_off(Config) when is_list(Config) ->
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
-    ?line M = 100,
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    M = 100,
     %%
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, true, [call_time]),
-    ?line Pid = setup(),
-    ?line {L, T1} = execute(Pid, {?MODULE, seq, [1, M, fun(X) -> X+1 end]}),
-    ?line ok = check_trace_info({?MODULE, seq, 3}, [{Pid, M, 0, 0}], T1),
-
-    ?line N = erlang:trace_pattern({?MODULE,'_','_'}, true, [call_time]),
-    ?line {L, T2} = execute(Pid, fun() -> seq(1, M, fun(X) -> X+1 end) end),
-    ?line ok = check_trace_info({?MODULE, seq, 3}, [{Pid, M, 0, 0}], T2),
-
-    ?line P = erlang:trace_pattern({'_','_','_'}, true, [call_time]),
-    ?line {L, T3} = execute(Pid, fun() -> seq(1, M, fun(X) -> X+1 end) end),
-    ?line ok = check_trace_info({?MODULE, seq, 3}, [{Pid, M, 0, 0}], T3),
-
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, false, [call_time]),
-    ?line ok = check_trace_info({?MODULE, seq, 3}, false, none),
-    ?line {L, _T4} = execute(Pid, fun() -> seq(1, M, fun(X) -> X+1 end) end),
-    ?line ok = check_trace_info({?MODULE, seq, 3}, false, none),
-    ?line ok = check_trace_info({?MODULE, seq_r, 4}, [], none),
-    ?line {Lr, T5} = execute(Pid, fun() -> seq_r(1, M, fun(X) -> X+1 end) end),
-    ?line ok = check_trace_info({?MODULE, seq_r, 4}, [{Pid,M,0,0}], T5),
-
-    ?line N = erlang:trace_pattern({?MODULE,'_','_'}, false, [call_time]),
-    ?line ok = check_trace_info({?MODULE, seq_r, 4}, false, none),
-    ?line {Lr, _T6} = execute(Pid, fun() -> seq_r(1, M, fun(X) -> X+1 end) end),
-    ?line ok = check_trace_info({?MODULE, seq_r, 4}, false, none),
-    ?line L = lists:reverse(Lr),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, true, [call_time]),
+    Pid = setup(),
+    {L, T1} = execute(Pid, {?MODULE, seq, [1, M, fun(X) -> X+1 end]}),
+    ok = check_trace_info({?MODULE, seq, 3}, [{Pid, M, 0, 0}], T1),
+
+    N = erlang:trace_pattern({?MODULE,'_','_'}, true, [call_time]),
+    {L, T2} = execute(Pid, fun() -> seq(1, M, fun(X) -> X+1 end) end),
+    ok = check_trace_info({?MODULE, seq, 3}, [{Pid, M, 0, 0}], T2),
+
+    P = erlang:trace_pattern({'_','_','_'}, true, [call_time]),
+    {L, T3} = execute(Pid, fun() -> seq(1, M, fun(X) -> X+1 end) end),
+    ok = check_trace_info({?MODULE, seq, 3}, [{Pid, M, 0, 0}], T3),
+
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, false, [call_time]),
+    ok = check_trace_info({?MODULE, seq, 3}, false, none),
+    {L, _T4} = execute(Pid, fun() -> seq(1, M, fun(X) -> X+1 end) end),
+    ok = check_trace_info({?MODULE, seq, 3}, false, none),
+    ok = check_trace_info({?MODULE, seq_r, 4}, [], none),
+    {Lr, T5} = execute(Pid, fun() -> seq_r(1, M, fun(X) -> X+1 end) end),
+    ok = check_trace_info({?MODULE, seq_r, 4}, [{Pid,M,0,0}], T5),
+
+    N = erlang:trace_pattern({?MODULE,'_','_'}, false, [call_time]),
+    ok = check_trace_info({?MODULE, seq_r, 4}, false, none),
+    {Lr, _T6} = execute(Pid, fun() -> seq_r(1, M, fun(X) -> X+1 end) end),
+    ok = check_trace_info({?MODULE, seq_r, 4}, false, none),
+    L = lists:reverse(Lr),
     %%
-    ?line Pid ! quit,
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    Pid ! quit,
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-info(suite) ->
-    [];
-info(doc) ->
-    ["Tests the trace_info BIF"];
+%% Tests the trace_info BIF
 info(Config) when is_list(Config) ->
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
     %%
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,3}, true, [call_time]),
-    ?line {call_time,[]} = erlang:trace_info({?MODULE,seq,3}, call_time),
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, pause, [call_time]),
-    ?line {call_time,[]} = erlang:trace_info({?MODULE,seq,3}, call_time),
-    ?line {all,[_|_]=L} = erlang:trace_info({?MODULE,seq,3}, all),
-    ?line {value,{call_time,[]}} = lists:keysearch(call_time, 1, L),
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, restart, [call_time]),
-    ?line {call_time,[]} = erlang:trace_info({?MODULE,seq,3}, call_time),
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, false, [call_time]),
-    ?line {call_time,false} = erlang:trace_info({?MODULE,seq,3}, call_time),
-    ?line {all,false} = erlang:trace_info({?MODULE,seq,3}, all),
+    1 = erlang:trace_pattern({?MODULE,seq,3}, true, [call_time]),
+    {call_time,[]} = erlang:trace_info({?MODULE,seq,3}, call_time),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, pause, [call_time]),
+    {call_time,[]} = erlang:trace_info({?MODULE,seq,3}, call_time),
+    {all,[_|_]=L} = erlang:trace_info({?MODULE,seq,3}, all),
+    {value,{call_time,[]}} = lists:keysearch(call_time, 1, L),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, restart, [call_time]),
+    {call_time,[]} = erlang:trace_info({?MODULE,seq,3}, call_time),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, false, [call_time]),
+    {call_time,false} = erlang:trace_info({?MODULE,seq,3}, call_time),
+    {all,false} = erlang:trace_info({?MODULE,seq,3}, all),
     %%
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-pause_and_restart(suite) ->
-    [];
-pause_and_restart(doc) ->
-    ["Tests pausing and restarting call time counters"];
+%% Tests pausing and restarting call time counters
 pause_and_restart(Config) when is_list(Config) ->
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
-    ?line M = 100,
-    ?line Pid = setup(),
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    M = 100,
+    Pid = setup(),
     %%
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, true, [call_time]),
-    ?line ok = check_trace_info({?MODULE, seq, 3}, [], none),
-    ?line {L, T1} = execute(Pid, fun() -> seq(1, M, fun(X) -> X+1 end) end),
-    ?line ok = check_trace_info({?MODULE, seq, 3}, [{Pid,M,0,0}], T1),
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, pause, [call_time]),
-    ?line ok = check_trace_info({?MODULE, seq, 3}, [{Pid,M,0,0}], T1),
-    ?line {L, T2} = execute(Pid, fun() -> seq(1, M, fun(X) -> X+1 end) end),
-    ?line ok = check_trace_info({?MODULE, seq, 3}, [{Pid,M,0,0}], T2),
-    ?line 1 = erlang:trace_pattern({?MODULE,seq,'_'}, restart, [call_time]),
-    ?line ok = check_trace_info({?MODULE, seq, 3}, [], none),
-    ?line {L, T3} = execute(Pid, fun() -> seq(1, M, fun(X) -> X+1 end) end),
-    ?line ok = check_trace_info({?MODULE, seq, 3}, [{Pid,M,0,0}], T3),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, true, [call_time]),
+    ok = check_trace_info({?MODULE, seq, 3}, [], none),
+    {L, T1} = execute(Pid, fun() -> seq(1, M, fun(X) -> X+1 end) end),
+    ok = check_trace_info({?MODULE, seq, 3}, [{Pid,M,0,0}], T1),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, pause, [call_time]),
+    ok = check_trace_info({?MODULE, seq, 3}, [{Pid,M,0,0}], T1),
+    {L, T2} = execute(Pid, fun() -> seq(1, M, fun(X) -> X+1 end) end),
+    ok = check_trace_info({?MODULE, seq, 3}, [{Pid,M,0,0}], T2),
+    1 = erlang:trace_pattern({?MODULE,seq,'_'}, restart, [call_time]),
+    ok = check_trace_info({?MODULE, seq, 3}, [], none),
+    {L, T3} = execute(Pid, fun() -> seq(1, M, fun(X) -> X+1 end) end),
+    ok = check_trace_info({?MODULE, seq, 3}, [{Pid,M,0,0}], T3),
     %%
-    ?line Pid ! quit,
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    Pid ! quit,
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-scheduling(suite) ->
-    [];
-scheduling(doc) ->
-    ["Tests in/out scheduling of call time counters"];
+%% Tests in/out scheduling of call time counters
 scheduling(Config) when is_list(Config) ->
-    ?line P  = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
-    ?line M  = 1000000,
-    ?line Np = erlang:system_info(schedulers_online),
-    ?line F  = 12,
+    P  = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    M  = 1000000,
+    Np = erlang:system_info(schedulers_online),
+    F  = 12,
 
     %% setup load processes
     %% (single, no internal calls)
 
-    ?line erlang:trace_pattern({?MODULE,loaded,1}, true, [call_time]),
+    erlang:trace_pattern({?MODULE,loaded,1}, true, [call_time]),
 
-    ?line Pids     = [setup() || _ <- lists:seq(1, F*Np)],
-    ?line {_Ls,T1} = execute(Pids, {?MODULE,loaded,[M]}),
-    ?line [Pid ! quit || Pid <- Pids],
+    Pids     = [setup() || _ <- lists:seq(1, F*Np)],
+    {_Ls,T1} = execute(Pids, {?MODULE,loaded,[M]}),
+    [Pid ! quit || Pid <- Pids],
 
     %% logic dictates that each process will get ~ 1/F of the schedulers time
 
-    ?line {call_time, CT} = erlang:trace_info({?MODULE,loaded,1}, call_time),
-
-    ?line lists:foreach(fun (Pid) ->
-	    ?line ok = case check_process_time(lists:keysearch(Pid, 1, CT), M, F, T1) of
-		schedule_time_error ->
-		    test_server:comment("Warning: Failed time ratio"),
-		    ok;
-		Other -> Other
-	    end
-	end, Pids),
-    ?line P  = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    {call_time, CT} = erlang:trace_info({?MODULE,loaded,1}, call_time),
+
+    lists:foreach(fun (Pid) ->
+                          ok = case check_process_time(lists:keysearch(Pid, 1, CT), M, F, T1) of
+                                   schedule_time_error ->
+                                       test_server:comment("Warning: Failed time ratio"),
+                                       ok;
+                                   Other -> Other
+                               end
+                  end, Pids),
+    P  = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-combo(suite) ->
-    [];
-combo(doc) ->
-    ["Tests combining local call trace and meta trace with call time trace"];
+%% "Tests combining local call trace and meta trace with call time trace
 combo(Config) when is_list(Config) ->
-    ?line Self = self(),
-    ?line Nbc = 3,
-    ?line MetaMs = [{'_',[],[{return_trace}]}],
-    ?line Flags = lists:sort([call, return_to]),
-    ?line LocalTracer = spawn_link(fun () -> relay_n(5 + Nbc + 3, Self) end),
-    ?line MetaTracer = spawn_link(fun () -> relay_n(9 + Nbc + 3, Self) end),
-    ?line 2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, [], [local]),
-    ?line 2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, true, [call_time]),
-    ?line 2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, MetaMs, [{meta,MetaTracer}]),
-    ?line 2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, true, [call_count]),
+    Self = self(),
+    Nbc = 3,
+    MetaMs = [{'_',[],[{return_trace}]}],
+    Flags = lists:sort([call, return_to]),
+    LocalTracer = spawn_link(fun () -> relay_n(5 + Nbc + 3, Self) end),
+    MetaTracer = spawn_link(fun () -> relay_n(9 + Nbc + 3, Self) end),
+    2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, [], [local]),
+    2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, true, [call_time]),
+    2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, MetaMs, [{meta,MetaTracer}]),
+    2 = erlang:trace_pattern({?MODULE,seq_r,'_'}, true, [call_count]),
 
     % bifs
-    ?line 2 = erlang:trace_pattern({erlang, term_to_binary, '_'}, [], [local]),
-    ?line 2 = erlang:trace_pattern({erlang, term_to_binary, '_'}, true, [call_time]),
-    ?line 2 = erlang:trace_pattern({erlang, term_to_binary, '_'}, MetaMs, [{meta,MetaTracer}]),
+    2 = erlang:trace_pattern({erlang, term_to_binary, '_'}, [], [local]),
+    2 = erlang:trace_pattern({erlang, term_to_binary, '_'}, true, [call_time]),
+    2 = erlang:trace_pattern({erlang, term_to_binary, '_'}, MetaMs, [{meta,MetaTracer}]),
     %% not implemented
-    %?line 2 = erlang:trace_pattern({erlang, term_to_binary, '_'}, true, [call_count]),
+    %2 = erlang:trace_pattern({erlang, term_to_binary, '_'}, true, [call_count]),
 
-    ?line 1 = erlang:trace(Self, true, [{tracer,LocalTracer} | Flags]),
+    1 = erlang:trace(Self, true, [{tracer,LocalTracer} | Flags]),
     %%
-    ?line {traced,local} =
-	erlang:trace_info({?MODULE,seq_r,3}, traced),
-    ?line {match_spec,[]} =
-	erlang:trace_info({?MODULE,seq_r,3}, match_spec),
-    ?line {meta,MetaTracer} =
-	erlang:trace_info({?MODULE,seq_r,3}, meta),
-    ?line {meta_match_spec,MetaMs} =
-	erlang:trace_info({?MODULE,seq_r,3}, meta_match_spec),
-    ?line ok = check_trace_info({?MODULE, seq_r, 3}, [], none),
+    {traced,local} =
+    erlang:trace_info({?MODULE,seq_r,3}, traced),
+    {match_spec,[]} =
+    erlang:trace_info({?MODULE,seq_r,3}, match_spec),
+    {meta,MetaTracer} =
+    erlang:trace_info({?MODULE,seq_r,3}, meta),
+    {meta_match_spec,MetaMs} =
+    erlang:trace_info({?MODULE,seq_r,3}, meta_match_spec),
+    ok = check_trace_info({?MODULE, seq_r, 3}, [], none),
 
     %% check empty trace_info for ?MODULE:seq_r/3
-    ?line {all,[_|_]=TraceInfo}     = erlang:trace_info({?MODULE,seq_r,3}, all),
-    ?line {value,{traced,local}}    = lists:keysearch(traced, 1, TraceInfo),
-    ?line {value,{match_spec,[]}}   = lists:keysearch(match_spec, 1, TraceInfo),
-    ?line {value,{meta,MetaTracer}} = lists:keysearch(meta, 1, TraceInfo),
-    ?line {value,{meta_match_spec,MetaMs}} = lists:keysearch(meta_match_spec, 1, TraceInfo),
-    ?line {value,{call_count,0}} = lists:keysearch(call_count, 1, TraceInfo),
-    ?line {value,{call_time,[]}} = lists:keysearch(call_time, 1, TraceInfo),
+    {all,[_|_]=TraceInfo}     = erlang:trace_info({?MODULE,seq_r,3}, all),
+    {value,{traced,local}}    = lists:keysearch(traced, 1, TraceInfo),
+    {value,{match_spec,[]}}   = lists:keysearch(match_spec, 1, TraceInfo),
+    {value,{meta,MetaTracer}} = lists:keysearch(meta, 1, TraceInfo),
+    {value,{meta_match_spec,MetaMs}} = lists:keysearch(meta_match_spec, 1, TraceInfo),
+    {value,{call_count,0}} = lists:keysearch(call_count, 1, TraceInfo),
+    {value,{call_time,[]}} = lists:keysearch(call_time, 1, TraceInfo),
 
     %% check empty trace_info for erlang:term_to_binary/1
-    ?line {all, [_|_] = TraceInfoBif} = erlang:trace_info({erlang, term_to_binary, 1}, all),
-    ?line {value,{traced,local}}     = lists:keysearch(traced, 1, TraceInfoBif),
-    ?line {value,{match_spec,[]}}    = lists:keysearch(match_spec, 1, TraceInfoBif),
-    ?line {value,{meta, MetaTracer}}  = lists:keysearch(meta, 1, TraceInfoBif),
-    ?line {value,{meta_match_spec,MetaMs}} = lists:keysearch(meta_match_spec, 1, TraceInfoBif),
+    {all, [_|_] = TraceInfoBif} = erlang:trace_info({erlang, term_to_binary, 1}, all),
+    {value,{traced,local}}     = lists:keysearch(traced, 1, TraceInfoBif),
+    {value,{match_spec,[]}}    = lists:keysearch(match_spec, 1, TraceInfoBif),
+    {value,{meta, MetaTracer}}  = lists:keysearch(meta, 1, TraceInfoBif),
+    {value,{meta_match_spec,MetaMs}} = lists:keysearch(meta_match_spec, 1, TraceInfoBif),
     %% not implemented
-    ?line {value,{call_count,false}} = lists:keysearch(call_count, 1, TraceInfoBif),
-    %?line {value,{call_count,0}} = lists:keysearch(call_count, 1, TraceInfoBif),
-    ?line {value,{call_time,[]}} = lists:keysearch(call_time, 1, TraceInfoBif),
+    {value,{call_count,false}} = lists:keysearch(call_count, 1, TraceInfoBif),
+    %{value,{call_count,0}} = lists:keysearch(call_count, 1, TraceInfoBif),
+    {value,{call_time,[]}} = lists:keysearch(call_time, 1, TraceInfoBif),
 
     %%
-    ?line [3,2,1] = seq_r(1, 3, fun(X) -> X+1 end),
-    ?line T0 = erlang:monotonic_time(),
-    ?line with_bif(Nbc),
-    ?line T1 = erlang:monotonic_time(),
-    ?line TimeB = erlang:convert_time_unit(T1-T0, native, micro_seconds),
+    [3,2,1] = seq_r(1, 3, fun(X) -> X+1 end),
+    T0 = erlang:monotonic_time(),
+    with_bif(Nbc),
+    T1 = erlang:monotonic_time(),
+    TimeB = erlang:convert_time_unit(T1-T0, native, micro_seconds),
     %%
 
-    ?line List = collect(100),
-    ?line {MetaR, LocalR} =
-	lists:foldl(
-	  fun ({P,X}, {M,L}) when P == MetaTracer ->
-		  {[X|M],L};
-	      ({P,X}, {M,L}) when P == LocalTracer ->
-		  {M,[X|L]}
-	  end,
-	  {[],[]},
-	  List),
-    ?line Meta = lists:reverse(MetaR),
-    ?line Local = lists:reverse(LocalR),
-
-    ?line [?CTT(Self,{?MODULE,seq_r,[1,3,_]}),
-	   ?CTT(Self,{?MODULE,seq_r,[1,3,_,[]]}),
-	   ?CTT(Self,{?MODULE,seq_r,[2,3,_,[1]]}),
-	   ?CTT(Self,{?MODULE,seq_r,[3,3,_,[2,1]]}),
-	   ?RFT(Self,{?MODULE,seq_r,4},[3,2,1]),
-	   ?RFT(Self,{?MODULE,seq_r,4},[3,2,1]),
-	   ?RFT(Self,{?MODULE,seq_r,4},[3,2,1]),
-	   ?RFT(Self,{?MODULE,seq_r,3},[3,2,1]),
-	   ?CTT(Self,{erlang,term_to_binary,[3]}), % bif
-	   ?RFT(Self,{erlang,term_to_binary,1},<<131,97,3>>),
-	   ?CTT(Self,{erlang,term_to_binary,[2]}),
-	   ?RFT(Self,{erlang,term_to_binary,1},<<131,97,2>>)
-	] = Meta,
-
-    ?line [?CT(Self,{?MODULE,seq_r,[1,3,_]}),
-	   ?CT(Self,{?MODULE,seq_r,[1,3,_,[]]}),
-	   ?CT(Self,{?MODULE,seq_r,[2,3,_,[1]]}),
-	   ?CT(Self,{?MODULE,seq_r,[3,3,_,[2,1]]}),
-	   ?RT(Self,{?MODULE,combo,1}),
-	   ?CT(Self,{erlang,term_to_binary,[3]}), % bif
-	   ?RT(Self,{?MODULE,with_bif,1}),
-	   ?CT(Self,{erlang,term_to_binary,[2]}),
-	   ?RT(Self,{?MODULE,with_bif,1})
-	] = Local,
-
-    ?line ok = check_trace_info({?MODULE, seq_r, 3}, [{Self,1,0,0}], 1),
-    ?line ok = check_trace_info({?MODULE, seq_r, 4}, [{Self,3,0,0}], 1),
-    ?line ok = check_trace_info({?MODULE, seq_r, 3}, [{Self,1,0,0}], 1),
-    ?line ok = check_trace_info({?MODULE, seq_r, 4}, [{Self,3,0,0}], 1),
-    ?line ok = check_trace_info({erlang, term_to_binary, 1}, [{self(), Nbc - 1, 0, 0}], TimeB),
+    List = collect(100),
+    {MetaR, LocalR} =
+    lists:foldl(
+      fun ({P,X}, {M,L}) when P == MetaTracer ->
+              {[X|M],L};
+          ({P,X}, {M,L}) when P == LocalTracer ->
+              {M,[X|L]}
+      end,
+      {[],[]},
+      List),
+    Meta = lists:reverse(MetaR),
+    Local = lists:reverse(LocalR),
+
+    [?CTT(Self,{?MODULE,seq_r,[1,3,_]}),
+     ?CTT(Self,{?MODULE,seq_r,[1,3,_,[]]}),
+     ?CTT(Self,{?MODULE,seq_r,[2,3,_,[1]]}),
+     ?CTT(Self,{?MODULE,seq_r,[3,3,_,[2,1]]}),
+     ?RFT(Self,{?MODULE,seq_r,4},[3,2,1]),
+     ?RFT(Self,{?MODULE,seq_r,4},[3,2,1]),
+     ?RFT(Self,{?MODULE,seq_r,4},[3,2,1]),
+     ?RFT(Self,{?MODULE,seq_r,3},[3,2,1]),
+     ?CTT(Self,{erlang,term_to_binary,[3]}), % bif
+     ?RFT(Self,{erlang,term_to_binary,1},<<131,97,3>>),
+     ?CTT(Self,{erlang,term_to_binary,[2]}),
+     ?RFT(Self,{erlang,term_to_binary,1},<<131,97,2>>)
+    ] = Meta,
+
+    [?CT(Self,{?MODULE,seq_r,[1,3,_]}),
+     ?CT(Self,{?MODULE,seq_r,[1,3,_,[]]}),
+     ?CT(Self,{?MODULE,seq_r,[2,3,_,[1]]}),
+     ?CT(Self,{?MODULE,seq_r,[3,3,_,[2,1]]}),
+     ?RT(Self,{?MODULE,combo,1}),
+     ?CT(Self,{erlang,term_to_binary,[3]}), % bif
+     ?RT(Self,{?MODULE,with_bif,1}),
+     ?CT(Self,{erlang,term_to_binary,[2]}),
+     ?RT(Self,{?MODULE,with_bif,1})
+    ] = Local,
+
+    ok = check_trace_info({?MODULE, seq_r, 3}, [{Self,1,0,0}], 1),
+    ok = check_trace_info({?MODULE, seq_r, 4}, [{Self,3,0,0}], 1),
+    ok = check_trace_info({?MODULE, seq_r, 3}, [{Self,1,0,0}], 1),
+    ok = check_trace_info({?MODULE, seq_r, 4}, [{Self,3,0,0}], 1),
+    ok = check_trace_info({erlang, term_to_binary, 1}, [{self(), Nbc - 1, 0, 0}], TimeB),
     %%
-    ?line erlang:trace_pattern({'_','_','_'}, false, [local,meta,call_time]),
-    ?line erlang:trace_pattern(on_load, false, [local,meta,call_time]),
-    ?line erlang:trace(all, false, [all]),
+    erlang:trace_pattern({'_','_','_'}, false, [local,meta,call_time]),
+    erlang:trace_pattern(on_load, false, [local,meta,call_time]),
+    erlang:trace(all, false, [all]),
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-bif(suite) ->
-    [];
-bif(doc) ->
-    ["Tests tracing of bifs"];
+%% Tests tracing of bifs
 bif(Config) when is_list(Config) ->
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
-    ?line M = 1000000,
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    M = 1000000,
     %%
-    ?line 2 = erlang:trace_pattern({erlang, binary_to_term, '_'}, true, [call_time]),
-    ?line 2 = erlang:trace_pattern({erlang, term_to_binary, '_'}, true, [call_time]),
-    ?line Pid = setup(),
-    ?line {L, T1} = execute(Pid, fun() -> with_bif(M) end),
+    2 = erlang:trace_pattern({erlang, binary_to_term, '_'}, true, [call_time]),
+    2 = erlang:trace_pattern({erlang, term_to_binary, '_'}, true, [call_time]),
+    Pid = setup(),
+    {L, T1} = execute(Pid, fun() -> with_bif(M) end),
 
-    ?line ok = check_trace_info({erlang, binary_to_term, 1}, [{Pid, M - 1, 0, 0}], T1/2),
-    ?line ok = check_trace_info({erlang, term_to_binary, 1}, [{Pid, M - 1, 0, 0}], T1/2),
+    ok = check_trace_info({erlang, binary_to_term, 1}, [{Pid, M - 1, 0, 0}], T1/2),
+    ok = check_trace_info({erlang, term_to_binary, 1}, [{Pid, M - 1, 0, 0}], T1/2),
 
     % disable term2binary
 
-    ?line 2 = erlang:trace_pattern({erlang, term_to_binary, '_'}, false, [call_time]),
+    2 = erlang:trace_pattern({erlang, term_to_binary, '_'}, false, [call_time]),
 
-    ?line {L, T2} = execute(Pid, fun() -> with_bif(M) end),
+    {L, T2} = execute(Pid, fun() -> with_bif(M) end),
 
-    ?line ok = check_trace_info({erlang, binary_to_term, 1}, [{Pid, M*2 - 2, 0, 0}], T1/2 + T2),
-    ?line ok = check_trace_info({erlang, term_to_binary, 1}, false, none),
+    ok = check_trace_info({erlang, binary_to_term, 1}, [{Pid, M*2 - 2, 0, 0}], T1/2 + T2),
+    ok = check_trace_info({erlang, term_to_binary, 1}, false, none),
 
     %%
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
-    ?line Pid ! quit,
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    Pid ! quit,
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-nif(suite) ->
-    [];
-nif(doc) ->
-    ["Tests tracing of nifs"];
+%% Tests tracing of nifs
 nif(Config) when is_list(Config) ->
     load_nif(Config),
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
-    ?line M = 1000000,
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    M = 1000000,
     %%
-    ?line 1 = erlang:trace_pattern({?MODULE, nif_dec,  '_'}, true, [call_time]),
-    ?line 1 = erlang:trace_pattern({?MODULE, with_nif, '_'}, true, [call_time]),
-    ?line Pid = setup(),
-    ?line {_, T1} = execute(Pid, fun() -> with_nif(M) end),
+    1 = erlang:trace_pattern({?MODULE, nif_dec,  '_'}, true, [call_time]),
+    1 = erlang:trace_pattern({?MODULE, with_nif, '_'}, true, [call_time]),
+    Pid = setup(),
+    {_, T1} = execute(Pid, fun() -> with_nif(M) end),
 
     % the nif is called M - 1 times, the last time the function with 'with_nif'
     % returns ok and does not call the nif.
-    ?line ok = check_trace_info({?MODULE, nif_dec,  1}, [{Pid, M-1, 0, 0}], T1/5*4),
-    ?line ok = check_trace_info({?MODULE, with_nif, 1}, [{Pid, M, 0, 0}], T1/5),
+    ok = check_trace_info({?MODULE, nif_dec,  1}, [{Pid, M-1, 0, 0}], T1/5*4),
+    ok = check_trace_info({?MODULE, with_nif, 1}, [{Pid, M, 0, 0}], T1/5),
 
     %%
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
-    ?line Pid ! quit,
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    Pid ! quit,
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-called_function(suite) ->
-    [];
-called_function(doc) ->
-    ["Tests combining nested function calls and that the time accumulates to the right function"];
+%% Tests combining nested function calls and that the time accumulates to the right function
 called_function(Config) when is_list(Config) ->
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
-    ?line M = 2100,
-    ?line Pid = setup(),
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    M = 2100,
+    Pid = setup(),
     %%
-    ?line 1 = erlang:trace_pattern({?MODULE,a_function,'_'}, true, [call_time]),
-    ?line {L, T1} = execute(Pid, {?MODULE, a_function, [M]}),
-    ?line ok = check_trace_info({?MODULE, a_function, 1}, [{Pid, M, 0, 0}], T1),
+    1 = erlang:trace_pattern({?MODULE,a_function,'_'}, true, [call_time]),
+    {L, T1} = execute(Pid, {?MODULE, a_function, [M]}),
+    ok = check_trace_info({?MODULE, a_function, 1}, [{Pid, M, 0, 0}], T1),
 
-    ?line 1 = erlang:trace_pattern({?MODULE,a_called_function,'_'}, true, [call_time]),
-    ?line {L, T2} = execute(Pid, {?MODULE, a_function, [M]}),
-    ?line ok = check_trace_info({?MODULE, a_function, 1}, [{Pid, M+M, 0, 0}], T1 + M*?SINGLE_CALL_US_TIME),
-    ?line ok = check_trace_info({?MODULE, a_called_function, 1}, [{Pid, M, 0, 0}], T2),
+    1 = erlang:trace_pattern({?MODULE,a_called_function,'_'}, true, [call_time]),
+    {L, T2} = execute(Pid, {?MODULE, a_function, [M]}),
+    ok = check_trace_info({?MODULE, a_function, 1}, [{Pid, M+M, 0, 0}], T1 + M*?SINGLE_CALL_US_TIME),
+    ok = check_trace_info({?MODULE, a_called_function, 1}, [{Pid, M, 0, 0}], T2),
 
 
-    ?line 1 = erlang:trace_pattern({?MODULE,dec,'_'}, true, [call_time]),
-    ?line {L, T3} = execute(Pid, {?MODULE, a_function, [M]}),
-    ?line ok = check_trace_info({?MODULE, a_function, 1}, [{Pid, M+M+M, 0, 0}], T1 + (M+M)*?SINGLE_CALL_US_TIME),
-    ?line ok = check_trace_info({?MODULE, a_called_function, 1}, [{Pid, M+M, 0, 0}], T2 + M*?SINGLE_CALL_US_TIME ),
-    ?line ok = check_trace_info({?MODULE, dec, 1}, [{Pid, M, 0, 0}], T3),
+    1 = erlang:trace_pattern({?MODULE,dec,'_'}, true, [call_time]),
+    {L, T3} = execute(Pid, {?MODULE, a_function, [M]}),
+    ok = check_trace_info({?MODULE, a_function, 1}, [{Pid, M+M+M, 0, 0}], T1 + (M+M)*?SINGLE_CALL_US_TIME),
+    ok = check_trace_info({?MODULE, a_called_function, 1}, [{Pid, M+M, 0, 0}], T2 + M*?SINGLE_CALL_US_TIME ),
+    ok = check_trace_info({?MODULE, dec, 1}, [{Pid, M, 0, 0}], T3),
 
-    ?line Pid ! quit,
-    ?line P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
+    Pid ! quit,
+    P = erlang:trace_pattern({'_','_','_'}, false, [call_time]),
     ok.
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -482,8 +437,8 @@ dead_tracer(Config) when is_list(Config) ->
     Ref = erlang:monitor(process, FirstTracer),
     FirstTracer ! quit,
     receive
-	{'DOWN',Ref,process,FirstTracer,normal} ->
-	    ok
+        {'DOWN',Ref,process,FirstTracer,normal} ->
+            ok
     end,
     erlang:yield(),
 
@@ -513,26 +468,26 @@ dead_tracer(Config) when is_list(Config) ->
 
 other_than_self(Info) ->
     [{Pid,MFA} || {MFA,[{Pid,_,_,_}]} <- Info,
-		  Pid =/= self()].
+                  Pid =/= self()].
 
 tell_tracer(Tracer, Fun) ->
     Tracer ! {execute,self(),Fun},
     receive
-	{Tracer,executed} ->
-	    ok
+        {Tracer,executed} ->
+            ok
     end.
 
 tracer() ->
     spawn_link(fun Loop() ->
-		      receive
-			  quit ->
-			      ok;
-			  {execute,From,Fun} ->
-			      Fun(),
-			      From ! {self(),executed},
-			      Loop()
-		      end
-	      end).
+                      receive
+                          quit ->
+                              ok;
+                          {execute,From,Fun} ->
+                              Fun(),
+                              From ! {self(),executed},
+                              Loop()
+                      end
+              end).
 
 turn_on_tracing(Pid) ->
     _ = erlang:trace(Pid, true, [call,set_on_spawn]),
@@ -542,18 +497,18 @@ turn_on_tracing(Pid) ->
 
 collect_all_info() ->
     collect_all_info([{?MODULE,F,A} || {F,A} <- module_info(functions)] ++
-			 erlang:system_info(snifs)).
+                     erlang:system_info(snifs)).
 
 collect_all_info([MFA|T]) ->
     CallTime = erlang:trace_info(MFA, call_time),
     erlang:trace_pattern(MFA, restart, [call_time]),
     case CallTime of
-	{call_time,false} ->
-	    collect_all_info(T);
-	{call_time,[]} ->
-	    collect_all_info(T);
-	{call_time,[_|_]=List} ->
-	    [{MFA,List}|collect_all_info(T)]
+        {call_time,false} ->
+            collect_all_info(T);
+        {call_time,[]} ->
+            collect_all_info(T);
+        {call_time,[_|_]=List} ->
+            [{MFA,List}|collect_all_info(T)]
     end;
 collect_all_info([]) -> [].
 
@@ -566,8 +521,8 @@ collect_all_info([]) -> [].
 %% Local helpers
 
 load_nif(Config) ->
-    ?line Path = ?config(data_dir, Config),
-    ?line ok = erlang:load_nif(filename:join(Path,"trace_nif"), 0).
+    Path = proplists:get_value(data_dir, Config),
+    ok = erlang:load_nif(filename:join(Path,"trace_nif"), 0).
 
 
 %% Stack recursive seq
@@ -614,39 +569,39 @@ seq_r(Start, Stop, Succ, R) ->
 % Check call time tracing data and print mismatches
 check_trace_info(Mfa, [{Pid, C,_,_}] = Expect, Time) ->
     case erlang:trace_info(Mfa, call_time) of
-	% Time tests are somewhat problematic. We want to know if Time (EXPECTED_TIME) and S*1000000 + Us (ACTUAL_TIME)
-	% is the same.
-	% If the ratio EXPECTED_TIME/ACTUAL_TIME is ~ 1 or if EXPECTED_TIME - ACTUAL_TIME is near zero, the test is ok.
-	{call_time,[{Pid,C,S,Us}]} when S >= 0, Us >= 0,  abs(1 - Time/(S*1000000 + Us)) < ?R_ERROR; abs(Time - S*1000000 - Us) < ?US_ERROR ->
-	    ok;
-	{call_time,[{Pid,C,S,Us}]} ->
-	    Sum = S*1000000 + Us,
-	    io:format("Expected ~p -> {call_time, ~p (Time ~p us)}~n - got ~w s. ~w us. = ~w us. - ~w -> delta ~w (ratio ~.2f, should be 1.0)~n",
-		[Mfa, Expect, Time, S, Us, Sum, Time, Sum - Time, Time/Sum]),
-	    time_error;
-	Other ->
-	    io:format("Expected ~p -> {call_time, ~p (Time ~p us)}~n - got ~p~n", [ Mfa, Expect, Time, Other]),
-	    time_count_error
+        % Time tests are somewhat problematic. We want to know if Time (EXPECTED_TIME) and S*1000000 + Us (ACTUAL_TIME)
+        % is the same.
+        % If the ratio EXPECTED_TIME/ACTUAL_TIME is ~ 1 or if EXPECTED_TIME - ACTUAL_TIME is near zero, the test is ok.
+        {call_time,[{Pid,C,S,Us}]} when S >= 0, Us >= 0,  abs(1 - Time/(S*1000000 + Us)) < ?R_ERROR; abs(Time - S*1000000 - Us) < ?US_ERROR ->
+            ok;
+        {call_time,[{Pid,C,S,Us}]} ->
+            Sum = S*1000000 + Us,
+            io:format("Expected ~p -> {call_time, ~p (Time ~p us)}~n - got ~w s. ~w us. = ~w us. - ~w -> delta ~w (ratio ~.2f, should be 1.0)~n",
+                      [Mfa, Expect, Time, S, Us, Sum, Time, Sum - Time, Time/Sum]),
+            time_error;
+        Other ->
+            io:format("Expected ~p -> {call_time, ~p (Time ~p us)}~n - got ~p~n", [ Mfa, Expect, Time, Other]),
+            time_count_error
     end;
 check_trace_info(Mfa, Expect, _) ->
     case erlang:trace_info(Mfa, call_time) of
-	{call_time, Expect} ->
-	    ok;
-	Other ->
-	    io:format("Expected ~p -> {call_time, ~p}~n - got ~p~n", [Mfa, Expect, Other]),
-	    result_not_expected_error
+        {call_time, Expect} ->
+            ok;
+        Other ->
+            io:format("Expected ~p -> {call_time, ~p}~n - got ~p~n", [Mfa, Expect, Other]),
+            result_not_expected_error
     end.
 
 
 %check process time
 check_process_time({value,{Pid, M, S, Us}}, M, F, Time) ->
-    ?line Sum = S*1000000 + Us,
+    Sum = S*1000000 + Us,
     if
-	abs(1 - (F/(Time/Sum))) < ?R_ERROR ->
-	    ok;
-	true ->
-	    io:format("- Pid ~p, Got ratio ~.2f, expected ratio ~w~n", [Pid, Time/Sum,F]),
-	    schedule_time_error
+        abs(1 - (F/(Time/Sum))) < ?R_ERROR ->
+            ok;
+        true ->
+            io:format("- Pid ~p, Got ratio ~.2f, expected ratio ~w~n", [Pid, Time/Sum,F]),
+            schedule_time_error
     end;
 check_process_time(Other, M, _, _) ->
     io:format(" - Got ~p, expected count ~w~n", [Other, M]),
@@ -659,8 +614,8 @@ relay_n(0, _) ->
     ok;
 relay_n(N, Dest) ->
     receive Msg ->
-	    Dest ! {self(), Msg},
-	    relay_n(N-1, Dest)
+                Dest ! {self(), Msg},
+                relay_n(N-1, Dest)
     end.
 
 
@@ -674,17 +629,17 @@ collect(Time) ->
 
 collect(A, 0) ->
     receive
-	Mess ->
-	    collect([Mess | A], 0)
+        Mess ->
+            collect([Mess | A], 0)
     after 0 ->
-	    A
+              A
     end;
 collect(A, Ref) ->
     receive
-	{timeout, Ref, done} ->
-	    collect(A, 0);
-	Mess ->
-	    collect([Mess | A], Ref)
+        {timeout, Ref, done} ->
+            collect(A, 0);
+        Mess ->
+            collect([Mess | A], Ref)
     end.
 
 setup() ->
@@ -712,12 +667,12 @@ execute(P, Mfa) ->
 
 loop() ->
     receive
-	quit ->
-	    ok;
-	{Pid, execute, Fun } when is_function(Fun) ->
-	    Pid ! {self(), answer, erlang:apply(Fun, [])},
-	    loop();
-	{Pid, execute, {M, F, A}} ->
-	    Pid ! {self(), answer, erlang:apply(M, F, A)},
-	    loop()
+        quit ->
+            ok;
+        {Pid, execute, Fun } when is_function(Fun) ->
+            Pid ! {self(), answer, erlang:apply(Fun, [])},
+            loop();
+        {Pid, execute, {M, F, A}} ->
+            Pid ! {self(), answer, erlang:apply(M, F, A)},
+            loop()
     end.
diff --git a/erts/emulator/test/trace_local_SUITE.erl b/erts/emulator/test/trace_local_SUITE.erl
index 7431099340..24864dcbef 100644
--- a/erts/emulator/test/trace_local_SUITE.erl
+++ b/erts/emulator/test/trace_local_SUITE.erl
@@ -29,69 +29,44 @@
 -export([exported/1, exported_wrap/1, loop/4, apply_slave_async/5,
 	 match/2, clause/2, id/1, undef/1, lists_reverse/2]).
 
-%%
-%% Define to run outside of test server
-%%
-%% (rotten feature)
-%%
-%%-define(STANDALONE,1).
- 
+
 %%
 %% Define for debug output
 %%
 %%-define(debug,1).
  
--ifdef(STANDALONE).
--define(config(A,B),config(A,B)).
--export([config/2]).
--define(DEFAULT_RECEIVE_TIMEOUT, 1000).
--else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(DEFAULT_RECEIVE_TIMEOUT, infinity).
--endif.
- 
+
 -ifdef(debug).
--ifdef(STANDALONE).
--define(line, erlang:display({?MODULE,?LINE}), ).
--endif.
 -define(dbgformat(A,B),io:format(A,B)).
 -else.
--ifdef(STANDALONE).
--define(line, noop, ).
--endif.
 -define(dbgformat(A,B),noop).
 -endif.
- 
--ifdef(STANDALONE).
-config(priv_dir,_) ->
-    ".".
--else.
 
 %%% When run in test server %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, basic/1, bit_syntax/1,
-	 return/1, on_and_off/1, systematic_on_off/1,
-	 stack_grow/1,info/1, delete/1,
-	 exception/1, exception_apply/1,
-	 exception_function/1, exception_apply_function/1,
-	 exception_nocatch/1, exception_nocatch_apply/1,
-	 exception_nocatch_function/1, exception_nocatch_apply_function/1,
-	 exception_meta/1, exception_meta_apply/1,
-	 exception_meta_function/1, exception_meta_apply_function/1,
-	 exception_meta_nocatch/1, exception_meta_nocatch_apply/1,
-	 exception_meta_nocatch_function/1,
-	 exception_meta_nocatch_apply_function/1,
-	 concurrency/1,
-	 init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,
+         basic/1, bit_syntax/1,
+         return/1, on_and_off/1, systematic_on_off/1,
+         stack_grow/1,info/1, delete/1,
+         exception/1, exception_apply/1,
+         exception_function/1, exception_apply_function/1,
+         exception_nocatch/1, exception_nocatch_apply/1,
+         exception_nocatch_function/1, exception_nocatch_apply_function/1,
+         exception_meta/1, exception_meta_apply/1,
+         exception_meta_function/1, exception_meta_apply_function/1,
+         exception_meta_nocatch/1, exception_meta_nocatch_apply/1,
+         exception_meta_nocatch_function/1,
+         exception_meta_nocatch_apply_function/1,
+         concurrency/1,
+         init_per_testcase/2, end_per_testcase/2]).
+
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(test_server:minutes(2)),
-    [{watchdog, Dog}|Config].
+    Config.
 
 end_per_testcase(_Case, Config) ->
     shutdown(),
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
 
     %% Reloading the module will clear all trace patterns, and
     %% in a debug-compiled emulator run assertions of the counters
@@ -99,168 +74,127 @@ end_per_testcase(_Case, Config) ->
 
     c:l(?MODULE).
 
-
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 2}}].
 
 all() -> 
     case test_server:is_native(trace_local_SUITE) of
-	true -> [not_run];
-	false ->
-	    [basic, bit_syntax, return, on_and_off, systematic_on_off,
-	     stack_grow,
-	     info, delete, exception, exception_apply,
-	     exception_function, exception_apply_function,
-	     exception_nocatch, exception_nocatch_apply,
-	     exception_nocatch_function,
-	     exception_nocatch_apply_function, exception_meta,
-	     exception_meta_apply, exception_meta_function,
-	     exception_meta_apply_function, exception_meta_nocatch,
-	     exception_meta_nocatch_apply,
-	     exception_meta_nocatch_function,
-	     exception_meta_nocatch_apply_function,
-	     concurrency]
+        true -> [not_run];
+        false ->
+            [basic, bit_syntax, return, on_and_off, systematic_on_off,
+             stack_grow,
+             info, delete, exception, exception_apply,
+             exception_function, exception_apply_function,
+             exception_nocatch, exception_nocatch_apply,
+             exception_nocatch_function,
+             exception_nocatch_apply_function, exception_meta,
+             exception_meta_apply, exception_meta_function,
+             exception_meta_apply_function, exception_meta_nocatch,
+             exception_meta_nocatch_apply,
+             exception_meta_nocatch_function,
+             exception_meta_nocatch_apply_function,
+             concurrency]
     end.
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
-basic(doc) ->
-    ["Tests basic local call-trace"];
+%% Tests basic local call-trace
 basic(Config) when is_list(Config) ->
     basic_test().
 
-bit_syntax(doc) ->
-    "OTP-7399: Make sure that code that uses the optimized bit syntax matching "
-	"can be traced without crashing the emulator.";
+%% OTP-7399: Make sure that code that uses the optimized bit syntax matching
+%% can be traced without crashing the emulator.
 bit_syntax(Config) when is_list(Config) ->
     bit_syntax_test().
 
-return(doc) ->
-    ["Tests the different types of return trace"];
+%% Tests the different types of return trace
 return(Config) when is_list(Config) ->
     return_test().
- 
-on_and_off(doc) ->
-    ["Tests turning trace parameters on and off, "
-     "both for trace and trace_pattern"];
+
+%% Tests turning trace parameters on and off,
+%% both for trace and trace_pattern
 on_and_off(Config) when is_list(Config) ->
     on_and_off_test().
- 
-stack_grow(doc) ->
-    ["Tests the stack growth during return traces"];
+
+%% Tests the stack growth during return traces
 stack_grow(Config) when is_list(Config) ->
     stack_grow_test().
- 
-info(doc) ->
-    ["Tests the trace_info BIF"];
+
+%% Tests the trace_info BIF
 info(Config) when is_list(Config) ->
     info_test().
- 
-delete(doc) ->
-    ["Tests putting trace on deleted modules"];
+
+%% Tests putting trace on deleted modules
 delete(Config) when is_list(Config) ->
     delete_test(Config).
 
-exception(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception(Config) when is_list(Config) ->
     exception_test([]).
 
-exception_apply(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_apply(Config) when is_list(Config) ->
     exception_test([apply]).
 
-exception_function(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_function(Config) when is_list(Config) ->
     exception_test([function]).
 
-exception_apply_function(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_apply_function(Config) when is_list(Config) ->
     exception_test([apply,function]).
 
-exception_nocatch(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_nocatch(Config) when is_list(Config) ->
     exception_test([nocatch]).
 
-exception_nocatch_apply(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_nocatch_apply(Config) when is_list(Config) ->
     exception_test([nocatch,apply]).
 
-exception_nocatch_function(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_nocatch_function(Config) when is_list(Config) ->
     exception_test([nocatch,function]).
 
-exception_nocatch_apply_function(doc) ->
-    ["Tests exception_trace"];
+%% Tests exception_trace
 exception_nocatch_apply_function(Config) when is_list(Config) ->
     exception_test([nocatch,apply,function]).
 
-exception_meta(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta(Config) when is_list(Config) ->
     exception_test([meta]).
 
-exception_meta_apply(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_apply(Config) when is_list(Config) ->
     exception_test([meta,apply]).
 
-exception_meta_function(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_function(Config) when is_list(Config) ->
     exception_test([meta,function]).
 
-exception_meta_apply_function(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_apply_function(Config) when is_list(Config) ->
     exception_test([meta,apply,function]).
 
-exception_meta_nocatch(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_nocatch(Config) when is_list(Config) ->
     exception_test([meta,nocatch]).
 
-exception_meta_nocatch_apply(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_nocatch_apply(Config) when is_list(Config) ->
     exception_test([meta,nocatch,apply]).
 
-exception_meta_nocatch_function(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_nocatch_function(Config) when is_list(Config) ->
     exception_test([meta,nocatch,function]).
 
-exception_meta_nocatch_apply_function(doc) ->
-    ["Tests meta exception_trace"];
+%% Tests meta exception_trace
 exception_meta_nocatch_apply_function(Config) when is_list(Config) ->
     exception_test([meta,nocatch,apply,function]).
 
--endif.
-
-
 
 %%% Message patterns and expect functions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -309,28 +243,28 @@ expect_pid(Pid, Msg) when is_tuple(Msg) ->
     same(Msg, expect_receive(Pid));
 expect_pid(Pid, Fun) when is_function(Fun, 1) ->
     case Fun(expect_receive(Pid)) of
-	next ->
-	    expect_pid(Pid, Fun);
-	done ->
-	    ok;
-	Other ->
-	    expect_pid(Pid, Other)
+        next ->
+            expect_pid(Pid, Fun);
+        done ->
+            ok;
+        Other ->
+            expect_pid(Pid, Other)
     end.
 
 expect_receive(Pid) when is_pid(Pid) ->
     receive
-	Msg when is_tuple(Msg), 
-		 element(1, Msg) == trace, 
-		 element(2, Msg) =/= Pid;
-		 %%
-		 is_tuple(Msg), 
-		 element(1, Msg) == trace_ts, 
-		 element(2, Msg) =/= Pid ->
-	    expect_receive(Pid);
-	Msg ->
-	    expect_msg(Pid, Msg)
+        Msg when is_tuple(Msg), 
+                 element(1, Msg) == trace, 
+                 element(2, Msg) =/= Pid;
+                 %%
+                 is_tuple(Msg), 
+                 element(1, Msg) == trace_ts, 
+                 element(2, Msg) =/= Pid ->
+            expect_receive(Pid);
+        Msg ->
+            expect_msg(Pid, Msg)
     after 100 ->
-	    {nm}
+              {nm}
     end.
 
 expect_msg(P, ?pCT(P,M,F,Args))       -> {ct,{M,F},Args};
@@ -343,18 +277,18 @@ expect_msg(P, ?pRT(P,M,F,Arity))      -> {rt,{M,F,Arity}};
 expect_msg(P, ?pRTT(P,M,F,Arity))     -> {rtt,{M,F,Arity}};
 expect_msg(P, Msg) when is_tuple(Msg) ->
     case tuple_to_list(Msg) of
-	[trace,P|T] ->
-	    list_to_tuple([trace|T]);
-	[trace_ts,P|[_|_]=T] ->
-	    list_to_tuple([trace_ts|reverse(tl(reverse(T)))]);
-	_ ->
-	    Msg
+        [trace,P|T] ->
+            list_to_tuple([trace|T]);
+        [trace_ts,P|[_|_]=T] ->
+            list_to_tuple([trace_ts|reverse(tl(reverse(T)))]);
+        _ ->
+            Msg
     end.
 
 same(A, B) ->
     case [A|B] of
-	[X|X] ->
-	    ok
+        [X|X] ->
+            ok
     end.
 
 
@@ -362,73 +296,73 @@ same(A, B) ->
 %%% tests %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 basic_test() ->
-    ?line setup([call]),
+    setup([call]),
     NumMatches = erlang:trace_pattern({?MODULE,'_','_'},[],[local]),
     NumMatches = erlang:trace_pattern({?MODULE,'_','_'},[],[local]),
-    ?line erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
-    ?line [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
-    ?line ?CT(?MODULE,exported_wrap,[1]),
-    ?line ?CT(?MODULE,exported,[1]),
-    ?line ?CT(?MODULE,local,[1]),
-    ?line ?CT(?MODULE,local2,[1]),
-    ?line ?CT(?MODULE,local_tail,[1]),
-    ?line erlang:trace_pattern({?MODULE,'_','_'},[],[]),
-    ?line erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
-    ?line [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
-    ?line ?CT(?MODULE,exported_wrap,[1]),
-    ?line [1,1,1,1] = lambda_slave(fun() ->
-					   exported_wrap(1)
-				   end),
-    ?line ?NM, 
-    ?line erlang:trace_pattern({?MODULE,'_','_'},[],[local]),
-    ?line erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
-    ?line [1,1,1,1] = lambda_slave(fun() ->
-					   exported_wrap(1)
-				   end),
-    ?line ?CT(?MODULE,_,_), %% The fun
-    ?line ?CT(?MODULE,exported_wrap,[1]),
-    ?line ?CT(?MODULE,exported,[1]),
-    ?line ?CT(?MODULE,local,[1]),
-    ?line ?CT(?MODULE,local2,[1]),
-    ?line ?CT(?MODULE,local_tail,[1]),
-    ?line erlang:trace_pattern({?MODULE,'_','_'},false,[local]),
-    ?line shutdown(),
-    ?line ?NM,
+    erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
+    [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
+    ?CT(?MODULE,exported_wrap,[1]),
+    ?CT(?MODULE,exported,[1]),
+    ?CT(?MODULE,local,[1]),
+    ?CT(?MODULE,local2,[1]),
+    ?CT(?MODULE,local_tail,[1]),
+    erlang:trace_pattern({?MODULE,'_','_'},[],[]),
+    erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
+    [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
+    ?CT(?MODULE,exported_wrap,[1]),
+    [1,1,1,1] = lambda_slave(fun() ->
+                                     exported_wrap(1)
+                             end),
+    ?NM, 
+    erlang:trace_pattern({?MODULE,'_','_'},[],[local]),
+    erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
+    [1,1,1,1] = lambda_slave(fun() ->
+                                     exported_wrap(1)
+                             end),
+    ?CT(?MODULE,_,_), %% The fun
+    ?CT(?MODULE,exported_wrap,[1]),
+    ?CT(?MODULE,exported,[1]),
+    ?CT(?MODULE,local,[1]),
+    ?CT(?MODULE,local2,[1]),
+    ?CT(?MODULE,local_tail,[1]),
+    erlang:trace_pattern({?MODULE,'_','_'},false,[local]),
+    shutdown(),
+    ?NM,
     ok.
 
 %% OTP-7399.
 bit_syntax_test() ->
-    ?line setup([call]),
-    ?line erlang:trace_pattern({?MODULE,'_','_'},[],[local]),
-    ?line erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
-
-    ?line lambda_slave(fun() ->
-			       6 = bs_sum_a(<<1,2,3>>, 0),
-			       10 = bs_sum_b(0, <<1,2,3,4>>),
-			       26 = bs_sum_c(<<3:4,5:4,7:4,11:4>>, 0)
-		       end),
-    ?line ?CT(?MODULE,_,[]),		      %Ignore call to the fun.
-
-    ?line ?CT(?MODULE,bs_sum_a,[<<1,2,3>>,0]),
-    ?line ?CT(?MODULE,bs_sum_a,[<<2,3>>,1]),
-    ?line ?CT(?MODULE,bs_sum_a,[<<3>>,3]),
-    ?line ?CT(?MODULE,bs_sum_a,[<<>>,6]),
-
-    ?line ?CT(?MODULE,bs_sum_b,[0,<<1,2,3,4>>]),
-    ?line ?CT(?MODULE,bs_sum_b,[1,<<2,3,4>>]),
-    ?line ?CT(?MODULE,bs_sum_b,[3,<<3,4>>]),
-    ?line ?CT(?MODULE,bs_sum_b,[6,<<4>>]),
-    ?line ?CT(?MODULE,bs_sum_b,[10,<<>>]),
-
-    ?line ?CT(?MODULE,bs_sum_c,[<<3:4,5:4,7:4,11:4>>, 0]),
-    ?line ?CT(?MODULE,bs_sum_c,[<<5:4,7:4,11:4>>, 3]),
-    ?line ?CT(?MODULE,bs_sum_c,[<<7:4,11:4>>, 8]),
-    ?line ?CT(?MODULE,bs_sum_c,[<<11:4>>, 15]),
-    ?line ?CT(?MODULE,bs_sum_c,[<<>>, 26]),
-
-    ?line erlang:trace_pattern({?MODULE,'_','_'},false,[local]),
-    ?line shutdown(),
-    ?line ?NM,
+    setup([call]),
+    erlang:trace_pattern({?MODULE,'_','_'},[],[local]),
+    erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
+
+    lambda_slave(fun() ->
+                         6 = bs_sum_a(<<1,2,3>>, 0),
+                         10 = bs_sum_b(0, <<1,2,3,4>>),
+                         26 = bs_sum_c(<<3:4,5:4,7:4,11:4>>, 0)
+                 end),
+    ?CT(?MODULE,_,[]),		      %Ignore call to the fun.
+
+    ?CT(?MODULE,bs_sum_a,[<<1,2,3>>,0]),
+    ?CT(?MODULE,bs_sum_a,[<<2,3>>,1]),
+    ?CT(?MODULE,bs_sum_a,[<<3>>,3]),
+    ?CT(?MODULE,bs_sum_a,[<<>>,6]),
+
+    ?CT(?MODULE,bs_sum_b,[0,<<1,2,3,4>>]),
+    ?CT(?MODULE,bs_sum_b,[1,<<2,3,4>>]),
+    ?CT(?MODULE,bs_sum_b,[3,<<3,4>>]),
+    ?CT(?MODULE,bs_sum_b,[6,<<4>>]),
+    ?CT(?MODULE,bs_sum_b,[10,<<>>]),
+
+    ?CT(?MODULE,bs_sum_c,[<<3:4,5:4,7:4,11:4>>, 0]),
+    ?CT(?MODULE,bs_sum_c,[<<5:4,7:4,11:4>>, 3]),
+    ?CT(?MODULE,bs_sum_c,[<<7:4,11:4>>, 8]),
+    ?CT(?MODULE,bs_sum_c,[<<11:4>>, 15]),
+    ?CT(?MODULE,bs_sum_c,[<<>>, 26]),
+
+    erlang:trace_pattern({?MODULE,'_','_'},false,[local]),
+    shutdown(),
+    ?NM,
 
     ok.
 
@@ -442,149 +376,149 @@ bs_sum_c(<<H:4,T/bits>>, Acc) -> bs_sum_c(T, H+Acc);
 bs_sum_c(<<>>, Acc) -> Acc.
 
 return_test() ->
-    ?line setup([call]),
-    ?line erlang:trace_pattern({?MODULE,'_','_'},[{'_',[],[{return_trace}]}],
-			 [local]),
-    ?line erlang:trace_pattern({erlang,hash,'_'},[{'_',[],[{return_trace}]}],
-			 [local]),
-    ?line erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
-    ?line [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
-    ?line ?CT(?MODULE,exported_wrap,[1]), 
-    ?line ?CT(?MODULE,exported,[1]),
-    ?line ?CT(?MODULE,local,[1]),
-    ?line ?CT(?MODULE,local2,[1]),
-    ?line ?CT(?MODULE,local_tail,[1]),
-    ?line ?CT(erlang,hash,[1,1]),
-    ?line ?RF(erlang,hash,2,1),
-    ?line ?RF(?MODULE,local_tail,1,[1,1]),
-    ?line ?RF(?MODULE,local2,1,[1,1]),
-    ?line ?RF(?MODULE,local,1,[1,1,1]),
-    ?line ?RF(?MODULE,exported,1,[1,1,1,1]),
-    ?line ?RF(?MODULE,exported_wrap,1,[1,1,1,1]),
-    ?line shutdown(),
-    ?line setup([call,return_to]),
-    ?line erlang:trace_pattern({?MODULE,'_','_'},[],
-			       [local]),
-    ?line erlang:trace_pattern({erlang,hash,'_'},[],
-			       [local]),
-    ?line erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
-    ?line [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
-    ?line ?CT(?MODULE,exported_wrap,[1]), 
-    ?line ?CT(?MODULE,exported,[1]),
-    ?line ?CT(?MODULE,local,[1]),
-    ?line ?CT(?MODULE,local2,[1]),
-    ?line ?CT(?MODULE,local_tail,[1]),
-    ?line ?CT(erlang,hash,[1,1]),
-    ?line ?RT(?MODULE,local_tail,1),
-    ?line ?RT(?MODULE,local,1),
-    ?line ?RT(?MODULE,exported,1),
-    ?line ?RT(?MODULE,slave,2),
-    ?line shutdown(),
-    ?line setup([call,return_to]),
-    ?line erlang:trace_pattern({?MODULE,'_','_'},[{'_',[],[{return_trace}]}],
-			       [local]),
-    ?line erlang:trace_pattern({erlang,hash,'_'},[{'_',[],[{return_trace}]}],
-			       [local]),
-    ?line erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
-    ?line [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
-    ?line ?CT(?MODULE,exported_wrap,[1]), 
-    ?line ?CT(?MODULE,exported,[1]),
-    ?line ?CT(?MODULE,local,[1]),
-    ?line ?CT(?MODULE,local2,[1]),
-    ?line ?CT(?MODULE,local_tail,[1]),
-    ?line ?CT(erlang,hash,[1,1]),
-    ?line ?RF(erlang,hash,2,1),
-    ?line ?RT(?MODULE,local_tail,1),
-    ?line ?RF(?MODULE,local_tail,1,[1,1]),
-    ?line ?RF(?MODULE,local2,1,[1,1]),
-    ?line ?RT(?MODULE,local,1),
-    ?line ?RF(?MODULE,local,1,[1,1,1]),
-    ?line ?RT(?MODULE,exported,1),
-    ?line ?RF(?MODULE,exported,1,[1,1,1,1]),
-    ?line ?RF(?MODULE,exported_wrap,1,[1,1,1,1]),
-    ?line ?RT(?MODULE,slave,2),
-    ?line shutdown(),
-    ?line ?NM,
+    setup([call]),
+    erlang:trace_pattern({?MODULE,'_','_'},[{'_',[],[{return_trace}]}],
+                         [local]),
+    erlang:trace_pattern({erlang,hash,'_'},[{'_',[],[{return_trace}]}],
+                         [local]),
+    erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
+    [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
+    ?CT(?MODULE,exported_wrap,[1]), 
+    ?CT(?MODULE,exported,[1]),
+    ?CT(?MODULE,local,[1]),
+    ?CT(?MODULE,local2,[1]),
+    ?CT(?MODULE,local_tail,[1]),
+    ?CT(erlang,hash,[1,1]),
+    ?RF(erlang,hash,2,1),
+    ?RF(?MODULE,local_tail,1,[1,1]),
+    ?RF(?MODULE,local2,1,[1,1]),
+    ?RF(?MODULE,local,1,[1,1,1]),
+    ?RF(?MODULE,exported,1,[1,1,1,1]),
+    ?RF(?MODULE,exported_wrap,1,[1,1,1,1]),
+    shutdown(),
+    setup([call,return_to]),
+    erlang:trace_pattern({?MODULE,'_','_'},[],
+                         [local]),
+    erlang:trace_pattern({erlang,hash,'_'},[],
+                         [local]),
+    erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
+    [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
+    ?CT(?MODULE,exported_wrap,[1]), 
+    ?CT(?MODULE,exported,[1]),
+    ?CT(?MODULE,local,[1]),
+    ?CT(?MODULE,local2,[1]),
+    ?CT(?MODULE,local_tail,[1]),
+    ?CT(erlang,hash,[1,1]),
+    ?RT(?MODULE,local_tail,1),
+    ?RT(?MODULE,local,1),
+    ?RT(?MODULE,exported,1),
+    ?RT(?MODULE,slave,2),
+    shutdown(),
+    setup([call,return_to]),
+    erlang:trace_pattern({?MODULE,'_','_'},[{'_',[],[{return_trace}]}],
+                         [local]),
+    erlang:trace_pattern({erlang,hash,'_'},[{'_',[],[{return_trace}]}],
+                         [local]),
+    erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
+    [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
+    ?CT(?MODULE,exported_wrap,[1]), 
+    ?CT(?MODULE,exported,[1]),
+    ?CT(?MODULE,local,[1]),
+    ?CT(?MODULE,local2,[1]),
+    ?CT(?MODULE,local_tail,[1]),
+    ?CT(erlang,hash,[1,1]),
+    ?RF(erlang,hash,2,1),
+    ?RT(?MODULE,local_tail,1),
+    ?RF(?MODULE,local_tail,1,[1,1]),
+    ?RF(?MODULE,local2,1,[1,1]),
+    ?RT(?MODULE,local,1),
+    ?RF(?MODULE,local,1,[1,1,1]),
+    ?RT(?MODULE,exported,1),
+    ?RF(?MODULE,exported,1,[1,1,1,1]),
+    ?RF(?MODULE,exported_wrap,1,[1,1,1,1]),
+    ?RT(?MODULE,slave,2),
+    shutdown(),
+    ?NM,
     ok.
 
 on_and_off_test() ->
-    ?line Pid = setup([call]),
-    ?line 1 = erlang:trace_pattern({?MODULE,local_tail,1},[],[local]),
-    ?line erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
-    ?line LocalTail = fun() ->
-			      local_tail(1)
-		      end,
-    ?line [1,1] = lambda_slave(LocalTail),
-    ?line ?CT(?MODULE,local_tail,[1]),
-    ?line erlang:trace(Pid,true,[return_to]),
-    ?line [1,1] = lambda_slave(LocalTail),
-    ?line ?CT(?MODULE,local_tail,[1]),
-    ?line ?RT(?MODULE,_,_),
-    ?line 0 = erlang:trace_pattern({?MODULE,local_tail,1},[],[global]),
-    ?line [1,1] = lambda_slave(LocalTail),
-    ?line ?NM,
-    ?line 1 = erlang:trace_pattern({?MODULE,exported_wrap,1},[],[global]),
-    ?line [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
-    ?line ?CT(?MODULE,exported_wrap,[1]),
-    ?line 1 = erlang:trace_pattern({?MODULE,exported_wrap,1},[],[local]),
-    ?line [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
-    ?line ?CT(?MODULE,exported_wrap,[1]),
-    ?line ?RT(?MODULE,slave,2),
-    ?line 1 = erlang:trace_pattern({erlang,hash,2},[],[local]),
-    ?line [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
-    ?line ?CT(?MODULE,exported_wrap,[1]),
-    ?line ?CT(erlang,hash,[1,1]),
-    ?line ?RT(?MODULE,local_tail,1),
-    ?line ?RT(?MODULE,slave,2),
-    ?line erlang:trace(Pid,true,[timestamp]),
-    ?line [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
-    ?line ?CTT(?MODULE,exported_wrap,[1]),
-    ?line ?CTT(erlang,hash,[1,1]),
-    ?line ?RTT(?MODULE,local_tail,1),
-    ?line ?RTT(?MODULE,slave,2),
-    ?line erlang:trace(Pid,false,[return_to,timestamp]),
-    ?line [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
-    ?line ?CT(?MODULE,exported_wrap,[1]),
-    ?line ?CT(erlang,hash,[1,1]),
-    ?line erlang:trace(Pid,true,[return_to]),
-    ?line 1 = erlang:trace_pattern({erlang,hash,2},[],[]),
-    ?line [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
-    ?line ?CT(?MODULE,exported_wrap,[1]),
-    ?line ?CT(erlang,hash,[1,1]),
-    ?line ?RT(?MODULE,slave,2),
-    ?line 1 = erlang:trace_pattern({?MODULE,exported_wrap,1},[],[]),
-    ?line [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
-    ?line ?CT(?MODULE,exported_wrap,[1]),
-    ?line ?CT(erlang,hash,[1,1]),
-    ?line shutdown(),
-    ?line erlang:trace_pattern({'_','_','_'},false,[local]),
-    ?line N = erlang:trace_pattern({erlang,'_','_'},true,[local]),
-    ?line case erlang:trace_pattern({erlang,'_','_'},false,[local]) of
-	      N -> 
-		  ok;
-	      Else ->
-		  exit({number_mismatch, {expected, N}, {got, Else}})
-	  end,
-    ?line case erlang:trace_pattern({erlang,'_','_'},false,[local]) of
-	      N -> 
-		  ok;
-	      Else2 ->
-		  exit({number_mismatch, {expected, N}, {got, Else2}})
-	  end,
-    ?line M = erlang:trace_pattern({erlang,'_','_'},true,[]),
-    ?line case erlang:trace_pattern({erlang,'_','_'},false,[]) of
-	      M -> 
-		  ok;
-	      Else3 ->
-		  exit({number_mismatch, {expected, N}, {got, Else3}})
-	  end,
-    ?line case erlang:trace_pattern({erlang,'_','_'},false,[]) of
-	      M -> 
-		  ok;
-	      Else4 ->
-		  exit({number_mismatch, {expected, N}, {got, Else4}})
-	  end,
-    ?line ?NM,
+    Pid = setup([call]),
+    1 = erlang:trace_pattern({?MODULE,local_tail,1},[],[local]),
+    erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
+    LocalTail = fun() ->
+                        local_tail(1)
+                end,
+    [1,1] = lambda_slave(LocalTail),
+    ?CT(?MODULE,local_tail,[1]),
+    erlang:trace(Pid,true,[return_to]),
+    [1,1] = lambda_slave(LocalTail),
+    ?CT(?MODULE,local_tail,[1]),
+    ?RT(?MODULE,_,_),
+    0 = erlang:trace_pattern({?MODULE,local_tail,1},[],[global]),
+    [1,1] = lambda_slave(LocalTail),
+    ?NM,
+    1 = erlang:trace_pattern({?MODULE,exported_wrap,1},[],[global]),
+    [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
+    ?CT(?MODULE,exported_wrap,[1]),
+    1 = erlang:trace_pattern({?MODULE,exported_wrap,1},[],[local]),
+    [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
+    ?CT(?MODULE,exported_wrap,[1]),
+    ?RT(?MODULE,slave,2),
+    1 = erlang:trace_pattern({erlang,hash,2},[],[local]),
+    [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
+    ?CT(?MODULE,exported_wrap,[1]),
+    ?CT(erlang,hash,[1,1]),
+    ?RT(?MODULE,local_tail,1),
+    ?RT(?MODULE,slave,2),
+    erlang:trace(Pid,true,[timestamp]),
+    [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
+    ?CTT(?MODULE,exported_wrap,[1]),
+    ?CTT(erlang,hash,[1,1]),
+    ?RTT(?MODULE,local_tail,1),
+    ?RTT(?MODULE,slave,2),
+    erlang:trace(Pid,false,[return_to,timestamp]),
+    [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
+    ?CT(?MODULE,exported_wrap,[1]),
+    ?CT(erlang,hash,[1,1]),
+    erlang:trace(Pid,true,[return_to]),
+    1 = erlang:trace_pattern({erlang,hash,2},[],[]),
+    [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
+    ?CT(?MODULE,exported_wrap,[1]),
+    ?CT(erlang,hash,[1,1]),
+    ?RT(?MODULE,slave,2),
+    1 = erlang:trace_pattern({?MODULE,exported_wrap,1},[],[]),
+    [1,1,1,1] = apply_slave(?MODULE,exported_wrap,[1]),
+    ?CT(?MODULE,exported_wrap,[1]),
+    ?CT(erlang,hash,[1,1]),
+    shutdown(),
+    erlang:trace_pattern({'_','_','_'},false,[local]),
+    N = erlang:trace_pattern({erlang,'_','_'},true,[local]),
+    case erlang:trace_pattern({erlang,'_','_'},false,[local]) of
+        N -> 
+            ok;
+        Else ->
+            exit({number_mismatch, {expected, N}, {got, Else}})
+    end,
+    case erlang:trace_pattern({erlang,'_','_'},false,[local]) of
+        N -> 
+            ok;
+        Else2 ->
+            exit({number_mismatch, {expected, N}, {got, Else2}})
+    end,
+    M = erlang:trace_pattern({erlang,'_','_'},true,[]),
+    case erlang:trace_pattern({erlang,'_','_'},false,[]) of
+        M -> 
+            ok;
+        Else3 ->
+            exit({number_mismatch, {expected, N}, {got, Else3}})
+    end,
+    case erlang:trace_pattern({erlang,'_','_'},false,[]) of
+        M -> 
+            ok;
+        Else4 ->
+            exit({number_mismatch, {expected, N}, {got, Else4}})
+    end,
+    ?NM,
     ok.
 
 systematic_on_off(Config) when is_list(Config) ->
@@ -634,12 +568,12 @@ systematic_on_off_1(Local) ->
 
 verify_trace_info(Global, Local) ->
     case erlang:trace_info({?MODULE,exported_wrap,1}, all) of
-	{all,false} ->
-	    false = Global,
-	    [] = Local;
-	{all,Ps} ->
-	    io:format("~p\n", [Ps]),
-	    [verify_trace_info(P, Global, Local) || P <- Ps]
+        {all,false} ->
+            false = Global,
+            [] = Local;
+        {all,Ps} ->
+            io:format("~p\n", [Ps]),
+            [verify_trace_info(P, Global, Local) || P <- Ps]
     end,
     global_call(Global, Local),
     local_call(Local),
@@ -651,12 +585,10 @@ verify_trace_info({match_spec,[]}, _, _) -> ok;
 verify_trace_info({meta_match_spec,[]}, _, _) -> ok;
 verify_trace_info({LocalFlag,Bool}, _, Local) when is_boolean(Bool) ->
     try
-	Bool = lists:member(LocalFlag, Local)
+        Bool = lists:member(LocalFlag, Local)
     catch
-	error:_ ->
-	    io:format("Line ~p: {~p,~p}, false, ~p\n",
-		      [?LINE,LocalFlag,Bool,Local]),
-	    ?t:fail()
+        error:_ ->
+            ct:fail("Line ~p: {~p,~p}, false, ~p\n", [?LINE,LocalFlag,Bool,Local])
     end;
 verify_trace_info({meta,Pid}, false, Local) when is_pid(Pid) ->
     true = lists:member(meta, Local);
@@ -668,10 +600,10 @@ verify_trace_info({call_count,_}, false, Local) ->
 global_call(Global, Local) ->
     apply_slave(?MODULE, exported_wrap, [global_call]),
     case Global of
-	false ->
-	    recv_local_call(Local, [global_call]);
-	true ->
-	    ?CT(?MODULE, exported_wrap, [global_call])
+        false ->
+            recv_local_call(Local, [global_call]);
+        true ->
+            ?CT(?MODULE, exported_wrap, [global_call])
     end.
 
 local_call(Local) ->
@@ -680,16 +612,16 @@ local_call(Local) ->
 
 recv_local_call(Local, Args) ->
     case lists:member(local, Local) of
-	false ->
-	    ok;
-	true ->
-	    ?CT(?MODULE, exported_wrap, Args)
+        false ->
+            ok;
+        true ->
+            ?CT(?MODULE, exported_wrap, Args)
     end,
     case lists:member(meta, Local) of
-	false ->
-	    ok;
-	true ->
-	    ?CTT(?MODULE, exported_wrap, Args)
+        false ->
+            ok;
+        true ->
+            ?CTT(?MODULE, exported_wrap, Args)
     end,
     ok.
 
@@ -698,99 +630,99 @@ combinations([_]=One) ->
 combinations([H|T]) ->
     Cs = combinations(T),
     [[H|C] || C <- Cs] ++ Cs.
-    
+
 stack_grow_test() ->    
-    ?line setup([call,return_to]),
-    ?line 1 = erlang:trace_pattern({?MODULE,loop,4},
-				   [{'_',[],[{return_trace}]}],[local]),
-    ?line erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
-    ?line Num = 1 bsl 15,
-    ?line Fun = 
-	fun(_F,0) -> ok; 
-	   (F,N) -> 
-		receive _A -> 
-			receive _B -> 
-				receive _C ->
-					F(F,N-1) 
-				end
-			end 
-		end 
-	end, 
-    ?line apply_slave_async(?MODULE,loop,[{hej,hopp},[a,b,c],4.5,Num]),
-    ?line Fun(Fun,Num + 1),
-    ?line ?NM, 
+    setup([call,return_to]),
+    1 = erlang:trace_pattern({?MODULE,loop,4},
+                             [{'_',[],[{return_trace}]}],[local]),
+    erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
+    Num = 1 bsl 15,
+    Fun = 
+    fun(_F,0) -> ok; 
+       (F,N) -> 
+            receive _A -> 
+                        receive _B -> 
+                                    receive _C ->
+                                                F(F,N-1) 
+                                    end
+                        end 
+            end 
+    end, 
+    apply_slave_async(?MODULE,loop,[{hej,hopp},[a,b,c],4.5,Num]),
+    Fun(Fun,Num + 1),
+    ?NM, 
     ok.
 
 
 info_test() ->
-    ?line Flags1 = lists:sort([call,return_to]),
-    ?line Pid = setup(Flags1),
-    ?line Prog = [{['$1'],[{is_integer,'$1'}],[{message, false}]},
-		  {'_',[],[]}],
-    ?line erlang:trace_pattern({?MODULE,exported_wrap,1},Prog,[local]),
-    ?line erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
-    ?line Self = self(),
-    ?line {flags,L} = erlang:trace_info(Pid,flags),
-    ?line case lists:sort(L) of
-	      Flags1 ->
-		  ok;
-	      Wrong1 ->
-		  exit({bad_result, {erlang,trace_info,[Pid,flags]},
-			{expected, Flags1}, {got, Wrong1}})
-	  end,
-    ?line {tracer,Tracer} = erlang:trace_info(Pid,tracer),
-    ?line case Tracer of
-	      Self ->
-		  ok;
-	      Wrong2 ->
-		  exit({bad_result, {erlang,trace_info,[Pid,tracer]},
-			{expected, Self}, {got, Wrong2}})
-	  end,
-    ?line {traced,local} = erlang:trace_info({?MODULE,exported_wrap,1},traced),
-    ?line {match_spec, MS} = 
-	erlang:trace_info({?MODULE,exported_wrap,1},match_spec),
-    ?line case MS of
-	      Prog ->
-		  ok;
-	      Wrong3 ->
-		  exit({bad_result, {erlang,trace_info,
-				     [{?MODULE,exported_wrap,1},
-				      match_spec]},
-			{expected, Prog}, {got, Wrong3}})
-	  end,
-    ?line erlang:garbage_collect(self()),
-    ?line receive
-	  after 1 ->
-		  ok
-	  end,
-    ?line io:format("~p~n",[MS]),
-    ?line {match_spec,MS2} = 
-	erlang:trace_info({?MODULE,exported_wrap,1},match_spec),
-    ?line io:format("~p~n",[MS2]),
-    ?line erlang:trace_pattern({?MODULE,exported_wrap,1},[],[]),
-    ?line {traced,global} = 
-	erlang:trace_info({?MODULE,exported_wrap,1},traced),
-    ?line {match_spec,[]} = 
-	erlang:trace_info({?MODULE,exported_wrap,1},match_spec),
-    ?line {traced,undefined} = 
-	erlang:trace_info({?MODULE,exported_wrap,2},traced),
-    ?line {match_spec,undefined} = 
-	erlang:trace_info({?MODULE,exported_wrap,2},match_spec),
-    ?line {traced,false} = erlang:trace_info({?MODULE,exported,1},traced),
-    ?line {match_spec,false} = 
-	erlang:trace_info({?MODULE,exported,1},match_spec),
-    ?line shutdown(),
+    Flags1 = lists:sort([call,return_to]),
+    Pid = setup(Flags1),
+    Prog = [{['$1'],[{is_integer,'$1'}],[{message, false}]},
+            {'_',[],[]}],
+    erlang:trace_pattern({?MODULE,exported_wrap,1},Prog,[local]),
+    erlang:trace_pattern({?MODULE,slave,'_'},false,[local]),
+    Self = self(),
+    {flags,L} = erlang:trace_info(Pid,flags),
+    case lists:sort(L) of
+        Flags1 ->
+            ok;
+        Wrong1 ->
+            exit({bad_result, {erlang,trace_info,[Pid,flags]},
+                  {expected, Flags1}, {got, Wrong1}})
+    end,
+    {tracer,Tracer} = erlang:trace_info(Pid,tracer),
+    case Tracer of
+        Self ->
+            ok;
+        Wrong2 ->
+            exit({bad_result, {erlang,trace_info,[Pid,tracer]},
+                  {expected, Self}, {got, Wrong2}})
+    end,
+    {traced,local} = erlang:trace_info({?MODULE,exported_wrap,1},traced),
+    {match_spec, MS} = 
+    erlang:trace_info({?MODULE,exported_wrap,1},match_spec),
+    case MS of
+        Prog ->
+            ok;
+        Wrong3 ->
+            exit({bad_result, {erlang,trace_info,
+                               [{?MODULE,exported_wrap,1},
+                                match_spec]},
+                  {expected, Prog}, {got, Wrong3}})
+    end,
+    erlang:garbage_collect(self()),
+    receive
+    after 1 ->
+              ok
+    end,
+    io:format("~p~n",[MS]),
+    {match_spec,MS2} = 
+    erlang:trace_info({?MODULE,exported_wrap,1},match_spec),
+    io:format("~p~n",[MS2]),
+    erlang:trace_pattern({?MODULE,exported_wrap,1},[],[]),
+    {traced,global} = 
+    erlang:trace_info({?MODULE,exported_wrap,1},traced),
+    {match_spec,[]} = 
+    erlang:trace_info({?MODULE,exported_wrap,1},match_spec),
+    {traced,undefined} = 
+    erlang:trace_info({?MODULE,exported_wrap,2},traced),
+    {match_spec,undefined} = 
+    erlang:trace_info({?MODULE,exported_wrap,2},match_spec),
+    {traced,false} = erlang:trace_info({?MODULE,exported,1},traced),
+    {match_spec,false} = 
+    erlang:trace_info({?MODULE,exported,1},match_spec),
+    shutdown(),
     ok.
 
 delete_test(Config) ->
-    ?line Priv = ?config(priv_dir, Config),
-    ?line Data = ?config(data_dir, Config),
-    ?line File = filename:join(Data, "trace_local_dummy"),
-    ?line {ok,trace_local_dummy} = c:c(File, [{outdir,Priv}]),
-    ?line code:purge(trace_local_dummy),
-    ?line code:delete(trace_local_dummy),
-    ?line 0 = erlang:trace_pattern({trace_local_dummy,'_','_'},true,[local]),
-    ?line ?NM,
+    Priv = proplists:get_value(priv_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
+    File = filename:join(Data, "trace_local_dummy"),
+    {ok,trace_local_dummy} = c:c(File, [{outdir,Priv}]),
+    code:purge(trace_local_dummy),
+    code:delete(trace_local_dummy),
+    0 = erlang:trace_pattern({trace_local_dummy,'_','_'},true,[local]),
+    ?NM,
     ok.
 
 
@@ -798,34 +730,34 @@ delete_test(Config) ->
 %%% exception_test %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 exception_test(Opts) ->
-    ?line {ProcFlags,PatFlags} = 
-	case proplists:get_bool(meta, Opts) of
-	    true  -> {[timestamp],[meta]};
-	    false -> {[call,return_to,timestamp],[local]}
-	end,
-    ?line case proplists:get_bool(nocatch, Opts) of
-	      false ->
-		  ?line Exceptions = exceptions(),
-		  ?line exception_test_setup(ProcFlags, PatFlags),
-		  ?line lists:foreach(
-			  fun ({Func,Args}) ->
-				  ?line exception_test(Opts, Func, Args)
-			  end,
-			  Exceptions),
-		  ?line shutdown();
-	      true ->
-		  ?line Exceptions = exceptions(),
-		  ?line lists:foreach(
-			  fun ({Func,Args}) ->
-				  ?line exception_test_setup(
-					  [procs|ProcFlags],
-					  PatFlags),
-				  ?line exception_test(Opts, Func, Args),
-				  ?line shutdown()
-			  end,
-			  Exceptions)
-	  end,
-    ?line ok.
+    {ProcFlags,PatFlags} = 
+    case proplists:get_bool(meta, Opts) of
+        true  -> {[timestamp],[meta]};
+        false -> {[call,return_to,timestamp],[local]}
+    end,
+    case proplists:get_bool(nocatch, Opts) of
+        false ->
+            Exceptions = exceptions(),
+            exception_test_setup(ProcFlags, PatFlags),
+            lists:foreach(
+              fun ({Func,Args}) ->
+                      exception_test(Opts, Func, Args)
+              end,
+              Exceptions),
+            shutdown();
+        true ->
+            Exceptions = exceptions(),
+            lists:foreach(
+              fun ({Func,Args}) ->
+                      exception_test_setup(
+                        [procs|ProcFlags],
+                        PatFlags),
+                      exception_test(Opts, Func, Args),
+                      shutdown()
+              end,
+              Exceptions)
+    end,
+    ok.
 
 exceptions() ->
     Ref = make_ref(),
@@ -848,65 +780,65 @@ exceptions() ->
      {{?MODULE,lists_reverse}, [LL,[]]}].
 
 exception_test_setup(ProcFlags, PatFlags) ->
-    ?line Pid = setup(ProcFlags),
-    ?line io:format("=== exception_test_setup(~p, ~p): ~p~n", 
-		    [ProcFlags,PatFlags,Pid]),
-    ?line Mprog = [{'_',[],[{exception_trace}]}],
-    ?line erlang:trace_pattern({?MODULE,'_','_'}, Mprog, PatFlags),
-    ?line erlang:trace_pattern({?MODULE,slave,'_'},false,PatFlags),
-    ?line [1,1,1,1,1] =
-	[erlang:trace_pattern({erlang,F,A}, Mprog, PatFlags)
-	 || {F,A} <- [{exit,1},{error,1},{error,2},{throw,1},{'++',2}]],
-    ?line 1 = erlang:trace_pattern({lists,reverse,2}, Mprog, PatFlags),
-    ?line ok.
+    Pid = setup(ProcFlags),
+    io:format("=== exception_test_setup(~p, ~p): ~p~n", 
+              [ProcFlags,PatFlags,Pid]),
+    Mprog = [{'_',[],[{exception_trace}]}],
+    erlang:trace_pattern({?MODULE,'_','_'}, Mprog, PatFlags),
+    erlang:trace_pattern({?MODULE,slave,'_'},false,PatFlags),
+    [1,1,1,1,1] =
+    [erlang:trace_pattern({erlang,F,A}, Mprog, PatFlags)
+     || {F,A} <- [{exit,1},{error,1},{error,2},{throw,1},{'++',2}]],
+    1 = erlang:trace_pattern({lists,reverse,2}, Mprog, PatFlags),
+    ok.
 
 -record(exc_opts, {nocatch=false, meta=false}).
 
 exception_test(Opts, Func0, Args0) ->
-    ?line io:format("=== exception_test(~p, ~p, ~p)~n", 
-		    [Opts,Func0,abbr(Args0)]),
-    ?line Apply = proplists:get_bool(apply, Opts),
-    ?line Function = proplists:get_bool(function, Opts),
-    ?line Nocatch = proplists:get_bool(nocatch, Opts),
-    ?line Meta = proplists:get_bool(meta, Opts),
-    ?line ExcOpts = #exc_opts{nocatch=Nocatch,meta=Meta},
-    
+    io:format("=== exception_test(~p, ~p, ~p)~n", 
+              [Opts,Func0,abbr(Args0)]),
+    Apply = proplists:get_bool(apply, Opts),
+    Function = proplists:get_bool(function, Opts),
+    Nocatch = proplists:get_bool(nocatch, Opts),
+    Meta = proplists:get_bool(meta, Opts),
+    ExcOpts = #exc_opts{nocatch=Nocatch,meta=Meta},
+
     %% Func0 and Args0 are for the innermost call, now we will
     %% wrap them in wrappers...
-    ?line {Func1,Args1} =
-	case Function of
-	    true  -> {fun exc/2,[Func0,Args0]};
-	    false -> {Func0,Args0}
-	end,
-    
-    ?line {Func,Args} = 
-	case Apply of
-	    true  -> {{erlang,apply},[Func1,Args1]};
-	    false -> {Func1,Args1}
-	end,
-    
-    ?line R1 = exc_slave(ExcOpts, Func, Args),
-    ?line Stack2 = [{?MODULE,exc_top,3,[]},{?MODULE,slave,2,[]}],
-    ?line Stack3 = [{?MODULE,exc,2,[]}|Stack2],
-    ?line Rs = 
-	case x_exc_top(ExcOpts, Func, Args) of % Emulation
-	    {crash,{Reason,Stack}}=R when is_list(Stack) ->
-		[R,
-		 {crash,{Reason,Stack++Stack2}},
-		 {crash,{Reason,Stack++Stack3}}];
-	    R ->
-		[R]
-	end,
-    ?line exception_validate(R1, Rs),
-    ?line case R1 of
-	      {crash,Crash} ->
-		  ?line expect({trace_ts,exit,Crash});
-	      _ when not Meta ->
-		  ?line expect({rtt,{?MODULE,slave,2}});
-	      _ ->
-		  ok
-	  end,
-    ?line expect({nm}).
+    {Func1,Args1} =
+    case Function of
+        true  -> {fun exc/2,[Func0,Args0]};
+        false -> {Func0,Args0}
+    end,
+
+    {Func,Args} = 
+    case Apply of
+        true  -> {{erlang,apply},[Func1,Args1]};
+        false -> {Func1,Args1}
+    end,
+
+    R1 = exc_slave(ExcOpts, Func, Args),
+    Stack2 = [{?MODULE,exc_top,3,[]},{?MODULE,slave,2,[]}],
+    Stack3 = [{?MODULE,exc,2,[]}|Stack2],
+    Rs = 
+    case x_exc_top(ExcOpts, Func, Args) of % Emulation
+        {crash,{Reason,Stack}}=R when is_list(Stack) ->
+            [R,
+             {crash,{Reason,Stack++Stack2}},
+             {crash,{Reason,Stack++Stack3}}];
+        R ->
+            [R]
+    end,
+    exception_validate(R1, Rs),
+    case R1 of
+        {crash,Crash} ->
+            expect({trace_ts,exit,Crash});
+        _ when not Meta ->
+            expect({rtt,{?MODULE,slave,2}});
+        _ ->
+            ok
+    end,
+    expect({nm}).
 
 exception_validate(R0, Rs0) ->
     R = clean_location(R0),
@@ -915,16 +847,16 @@ exception_validate(R0, Rs0) ->
 
 exception_validate_1(R1, [R2|Rs]) ->
     case [R1|R2] of
-	[R|R] ->
-	    ok;
-	[{crash,{badarg,[{lists,reverse,[L1a,L1b],_}|T]}}|
-	 {crash,{badarg,[{lists,reverse,[L2a,L2b],_}|T]}}] ->
-	    same({crash,{badarg,[{lists,reverse,
-				  [lists:reverse(L1b, L1a),[]],[]}|T]}},
-		 {crash,{badarg,[{lists,reverse,
-				  [lists:reverse(L2b, L2a),[]],[]}|T]}});
-	_ when is_list(Rs), Rs =/= [] ->
-	    exception_validate(R1, Rs)
+        [R|R] ->
+            ok;
+        [{crash,{badarg,[{lists,reverse,[L1a,L1b],_}|T]}}|
+         {crash,{badarg,[{lists,reverse,[L2a,L2b],_}|T]}}] ->
+            same({crash,{badarg,[{lists,reverse,
+                                  [lists:reverse(L1b, L1a),[]],[]}|T]}},
+                 {crash,{badarg,[{lists,reverse,
+                                  [lists:reverse(L2b, L2a),[]],[]}|T]}});
+        _ when is_list(Rs), Rs =/= [] ->
+            exception_validate(R1, Rs)
     end.
 
 clean_location({crash,{Reason,Stk0}}) ->
@@ -942,20 +874,20 @@ concurrency(_Config) ->
     %% if an aligned word-sized write is not atomic.
 
     Ps0 = [spawn_monitor(fun() -> infinite_loop() end) ||
-	      _ <- lists:seq(1, 2*N)],
+           _ <- lists:seq(1, 2*N)],
     OnAndOff = fun() -> concurrency_on_and_off() end,
     Ps1 = [spawn_monitor(OnAndOff)|Ps0],
-    ?t:sleep(1000),
+    timer:sleep(1000),
 
     %% Now spawn off N more processes that turn on off and off
     %% a local trace pattern.
     Ps = [spawn_monitor(OnAndOff) || _ <- lists:seq(1, N)] ++ Ps1,
-    ?t:sleep(1000),
+    timer:sleep(1000),
 
     %% Clean up.
     [exit(Pid, kill) || {Pid,_} <- Ps],
     [receive
-	 {'DOWN',Ref,process,Pid,killed} -> ok
+         {'DOWN',Ref,process,Pid,killed} -> ok
      end || {Pid,Ref} <- Ps],
     erlang:trace_pattern({?MODULE,infinite_loop,0}, false, [local]),
     ok.
@@ -999,16 +931,16 @@ local_tail(Val) ->
 
 exc_top(ExcOpts, Func, Args) ->
     case ExcOpts#exc_opts.nocatch of
-	false ->
-	    try exc_jump(Func, Args) of
-		Value ->
-		    {value,Value}
-	    catch
-		Class:Reason ->
-		    {Class,Reason}
-	    end;
-	true ->
-	    {value,exc_jump(Func, Args)}
+        false ->
+            try exc_jump(Func, Args) of
+                Value ->
+                    {value,Value}
+            catch
+                Class:Reason ->
+                    {Class,Reason}
+            end;
+        true ->
+            {value,exc_jump(Func, Args)}
     end.
 
 %% x_* functions emulate the non-x_* ones.
@@ -1017,42 +949,42 @@ exc_top(ExcOpts, Func, Args) ->
 %% The only possible place for exception
 %% is below exc/2.
 x_exc_top(ExcOpts, Func, Args) ->
-    ?line Rtt = not ExcOpts#exc_opts.meta,
-    ?line expect({ctt,{?MODULE,exc_top},[ExcOpts,Func,Args]}),
-    ?line case x_exc_jump(ExcOpts, Func, Args) of
-	      Result when not ExcOpts#exc_opts.nocatch ->
-		  ?line expect([Rtt,{rtt,{?MODULE,exc_top,3}},
-				?LINE,{rft,{?MODULE,exc_top,3},Result}]),
-		  ?line Result;
-	      {value,_}=Result ->
-		  
-		  ?line expect([Rtt,{rtt,{?MODULE,exc_top,3}},
-				?LINE,{rft,{?MODULE,exc_top,3},Result}]),
-		  ?line Result;
-	      {exit,Reason}=CR ->
-		  ?line expect({eft,{?MODULE,exc_top,3},CR}),
-		  ?line {crash,Reason};
-	      {error,Reason}=CR ->
-		  ?line expect({eft,{?MODULE,exc_top,3},CR}),
-		  ?line {crash,{Reason,x_exc_stacktrace()}};
-	      CR ->
-		  ?line expect({eft,{?MODULE,exc_top,3},CR}),
-		  ?line {crash,CR}
-	  end.
+    Rtt = not ExcOpts#exc_opts.meta,
+    expect({ctt,{?MODULE,exc_top},[ExcOpts,Func,Args]}),
+    case x_exc_jump(ExcOpts, Func, Args) of
+        Result when not ExcOpts#exc_opts.nocatch ->
+            expect([Rtt,{rtt,{?MODULE,exc_top,3}},
+                    ?LINE,{rft,{?MODULE,exc_top,3},Result}]),
+            Result;
+        {value,_}=Result ->
+
+            expect([Rtt,{rtt,{?MODULE,exc_top,3}},
+                    ?LINE,{rft,{?MODULE,exc_top,3},Result}]),
+            Result;
+        {exit,Reason}=CR ->
+            expect({eft,{?MODULE,exc_top,3},CR}),
+            {crash,Reason};
+        {error,Reason}=CR ->
+            expect({eft,{?MODULE,exc_top,3},CR}),
+            {crash,{Reason,x_exc_stacktrace()}};
+        CR ->
+            expect({eft,{?MODULE,exc_top,3},CR}),
+            {crash,CR}
+    end.
 
 exc_jump(Func, Args) ->
     exc(Func, Args, jump).
 
 x_exc_jump(ExcOpts, Func, Args) ->
-    ?line expect({ctt,{?MODULE,exc_jump},[Func,Args]}),
-    ?line case x_exc(ExcOpts, Func, Args, jump) of
-	      {value,Value}=Result ->
-		  ?line expect({rft,{?MODULE,exc_jump,2},Value}),
-		  ?line Result;
-	      CR ->
-		  ?line expect({eft,{?MODULE,exc_jump,2},CR}),
-		  ?line CR
-	  end.
+    expect({ctt,{?MODULE,exc_jump},[Func,Args]}),
+    case x_exc(ExcOpts, Func, Args, jump) of
+        {value,Value}=Result ->
+            expect({rft,{?MODULE,exc_jump,2},Value}),
+            Result;
+        CR ->
+            expect({eft,{?MODULE,exc_jump,2},CR}),
+            CR
+    end.
 
 exc(Func, Args, jump) ->
     exc(Func, Args, do);
@@ -1060,25 +992,25 @@ exc(Func, Args, do) ->
     exc(Func, Args).
 
 x_exc(ExcOpts, Func, Args, jump) ->
-    ?line expect({ctt,{?MODULE,exc},[Func,Args,jump]}),
-    ?line case x_exc(ExcOpts, Func, Args, do) of
-	      {value,Value}=Result ->
-		  ?line expect({rft,{?MODULE,exc,3},Value}),
-		  ?line Result;
-	      CR ->
-		  ?line expect({eft,{?MODULE,exc,3},CR}),
-		  ?line CR
-	  end;
+    expect({ctt,{?MODULE,exc},[Func,Args,jump]}),
+    case x_exc(ExcOpts, Func, Args, do) of
+        {value,Value}=Result ->
+            expect({rft,{?MODULE,exc,3},Value}),
+            Result;
+        CR ->
+            expect({eft,{?MODULE,exc,3},CR}),
+            CR
+    end;
 x_exc(ExcOpts, Func, Args, do) ->
-    ?line expect({ctt,{?MODULE,exc},[Func,Args,do]}),
-    ?line case x_exc(ExcOpts, Func, Args) of
-	      {value,Value}=Result ->
-		  ?line expect({rft,{?MODULE,exc,3},Value}),
-		  ?line Result;
-	      CR ->
-		  ?line expect({eft,{?MODULE,exc,3},CR}),
-		  ?line CR
-	  end.
+    expect({ctt,{?MODULE,exc},[Func,Args,do]}),
+    case x_exc(ExcOpts, Func, Args) of
+        {value,Value}=Result ->
+            expect({rft,{?MODULE,exc,3},Value}),
+            Result;
+        CR ->
+            expect({eft,{?MODULE,exc,3},CR}),
+            CR
+    end.
 
 exc({erlang,apply}, [{M,F},A]) ->
     erlang:apply(M, F, id(A));
@@ -1108,114 +1040,114 @@ exc(Func, [A,B]) when is_function(Func, 2) ->
     Func(A, id(B)).
 
 x_exc(ExcOpts, {erlang,apply}=Func0, [{_,_}=Func,Args]=Args0) ->
-    ?line expect({ctt,{?MODULE,exc},[Func0,Args0]}),
-    ?line x_exc_body(ExcOpts, Func, Args, true);
+    expect({ctt,{?MODULE,exc},[Func0,Args0]}),
+    x_exc_body(ExcOpts, Func, Args, true);
 x_exc(ExcOpts, {erlang,apply}=Func0, [Func,Args]=Args0) 
   when is_function(Func, 2)->
-    ?line expect({ctt,{?MODULE,exc},[Func0,Args0]}),
-    ?line x_exc_func(ExcOpts, Func, Args, Args);
+    expect({ctt,{?MODULE,exc},[Func0,Args0]}),
+    x_exc_func(ExcOpts, Func, Args, Args);
 x_exc(ExcOpts, {_,_}=Func, Args) ->
-    ?line expect({ctt,{?MODULE,exc},[Func,Args]}),
-    ?line x_exc_body(ExcOpts, Func, Args, false);
+    expect({ctt,{?MODULE,exc},[Func,Args]}),
+    x_exc_body(ExcOpts, Func, Args, false);
 x_exc(ExcOpts, Func0, [_,Args]=Args0)
   when is_function(Func0, 2) ->
-    ?line expect({ctt,{?MODULE,exc},[Func0,Args0]}),
-    ?line x_exc_func(ExcOpts, Func0, Args0, Args).
+    expect({ctt,{?MODULE,exc},[Func0,Args0]}),
+    x_exc_func(ExcOpts, Func0, Args0, Args).
 
 x_exc_func(ExcOpts, Func, [Func1,Args1]=Args, Id) ->
     %% Assumes the called fun =:= fun exc/2,
     %% will utterly fail otherwise.
-    ?line Rtt = not ExcOpts#exc_opts.meta,
-    ?line {module,M} = erlang:fun_info(Func, module),
-    ?line {name,F} = erlang:fun_info(Func, name),
-    ?line expect([{ctt,{?MODULE,id},[Id]},
-		  ?LINE,{rft,{?MODULE,id,1},Id},
-		  ?LINE,Rtt,{rtt,{?MODULE,exc,2}},
-		  ?LINE,{ctt,{M,F},Args}]),
-    ?line case x_exc(ExcOpts, Func1, Args1) of
-	      {value,Value}=Result ->
-		  ?line expect([{rft,{M,F,2},Value},
-				?LINE,{rft,{?MODULE,exc,2},Value}]),
-		  ?line Result;
-	      CR ->
-		  ?line expect([{eft,{M,F,2},CR},
-				?LINE,{eft,{?MODULE,exc,2},CR}]),
-		  ?line CR
-	  end.
+    Rtt = not ExcOpts#exc_opts.meta,
+    {module,M} = erlang:fun_info(Func, module),
+    {name,F} = erlang:fun_info(Func, name),
+    expect([{ctt,{?MODULE,id},[Id]},
+            ?LINE,{rft,{?MODULE,id,1},Id},
+            ?LINE,Rtt,{rtt,{?MODULE,exc,2}},
+            ?LINE,{ctt,{M,F},Args}]),
+    case x_exc(ExcOpts, Func1, Args1) of
+        {value,Value}=Result ->
+            expect([{rft,{M,F,2},Value},
+                    ?LINE,{rft,{?MODULE,exc,2},Value}]),
+            Result;
+        CR ->
+            expect([{eft,{M,F,2},CR},
+                    ?LINE,{eft,{?MODULE,exc,2},CR}]),
+            CR
+    end.
 
 x_exc_body(ExcOpts, {M,F}=Func, Args, Apply) ->
-    ?line Nocatch = ExcOpts#exc_opts.nocatch,
-    ?line Rtt = not ExcOpts#exc_opts.meta,
-    ?line Id = case Apply of
-		   true  -> Args;
-		   false -> lists:last(Args)
-	       end,
-    ?line expect([{ctt,{?MODULE,id},[Id]},
-		  ?LINE,{rft,{?MODULE,id,1},Id},
-		  ?LINE,Rtt,{rtt,{?MODULE,exc,2}},
-		  ?LINE,{ctt,{M,F},Args}]),
-    ?line Arity = length(Args),
-    ?line try exc(Func, Args) of
-	      Value ->
-		  ?line x_exc_value(Rtt, M, F, Args, Arity, Value),
-		  ?line case expect() of
-			    {rtt,{M,F,Arity}} when Rtt, Apply ->
-				%% We may get the above when
-				%% applying a BIF.
-				?line expect({rft,{?MODULE,exc,2},Value});
-			    {rtt,{?MODULE,exc,2}} when Rtt, not Apply ->
-				%% We may get the above when
-				%% calling a BIF.
-				?line expect({rft,{?MODULE,exc,2},Value});
-			    {rft,{?MODULE,exc,2},Value} ->
-				?line ok
-			end,
-		  ?line {value,Value}
-	  catch
-	      Thrown when Nocatch ->
-		  ?line CR = {error,{nocatch,Thrown}},
-		  ?line x_exc_exception(Rtt, M, F, Args, Arity, CR),
-		  ?line expect({eft,{?MODULE,exc,2},CR}),
-		  ?line CR;
-	      Class:Reason ->
-		  ?line CR = {Class,Reason},
-		  ?line x_exc_exception(Rtt, M, F, Args, Arity, CR),
-		  ?line expect({eft,{?MODULE,exc,2},CR}),
-		  ?line CR
-	  end.
+    Nocatch = ExcOpts#exc_opts.nocatch,
+    Rtt = not ExcOpts#exc_opts.meta,
+    Id = case Apply of
+             true  -> Args;
+             false -> lists:last(Args)
+         end,
+    expect([{ctt,{?MODULE,id},[Id]},
+            ?LINE,{rft,{?MODULE,id,1},Id},
+            ?LINE,Rtt,{rtt,{?MODULE,exc,2}},
+            ?LINE,{ctt,{M,F},Args}]),
+    Arity = length(Args),
+    try exc(Func, Args) of
+        Value ->
+            x_exc_value(Rtt, M, F, Args, Arity, Value),
+            case expect() of
+                {rtt,{M,F,Arity}} when Rtt, Apply ->
+                    %% We may get the above when
+                    %% applying a BIF.
+                    expect({rft,{?MODULE,exc,2},Value});
+                {rtt,{?MODULE,exc,2}} when Rtt, not Apply ->
+                    %% We may get the above when
+                    %% calling a BIF.
+                    expect({rft,{?MODULE,exc,2},Value});
+                {rft,{?MODULE,exc,2},Value} ->
+                    ok
+            end,
+            {value,Value}
+    catch
+        Thrown when Nocatch ->
+            CR = {error,{nocatch,Thrown}},
+            x_exc_exception(Rtt, M, F, Args, Arity, CR),
+            expect({eft,{?MODULE,exc,2},CR}),
+            CR;
+        Class:Reason ->
+            CR = {Class,Reason},
+            x_exc_exception(Rtt, M, F, Args, Arity, CR),
+            expect({eft,{?MODULE,exc,2},CR}),
+            CR
+    end.
 
 x_exc_value(Rtt, ?MODULE, lists_reverse, [La,Lb], 2, R) ->
-    ?line L = lists:reverse(Lb, La),
-    ?line expect([fun ({ctt,{lists,reverse},[L1,L2]}) ->
-			  ?line same(L, lists:reverse(L2, L1)),
-			  ?line next;
-		      (Msg) ->
-			  ?line same({rft,{lists,reverse,2},R}, Msg),
-			  ?line same(R, lists:reverse(L, [])),
-			  ?line done
-		  end,
-		  ?LINE,Rtt,{rtt,{?MODULE,lists_reverse,2}},
-		  ?LINE,{rft,{?MODULE,lists_reverse,2},R}]);
+    L = lists:reverse(Lb, La),
+    expect([fun ({ctt,{lists,reverse},[L1,L2]}) ->
+                    same(L, lists:reverse(L2, L1)),
+                    next;
+                (Msg) ->
+                    same({rft,{lists,reverse,2},R}, Msg),
+                    same(R, lists:reverse(L, [])),
+                    done
+            end,
+            ?LINE,Rtt,{rtt,{?MODULE,lists_reverse,2}},
+            ?LINE,{rft,{?MODULE,lists_reverse,2},R}]);
 x_exc_value(_Rtt, M, F, _, Arity, Value) ->
-    ?line expect({rft,{M,F,Arity},Value}).
+    expect({rft,{M,F,Arity},Value}).
 
 x_exc_exception(_Rtt, ?MODULE, lists_reverse, [La,Lb], 2, CR) ->
-    ?line L = lists:reverse(Lb, La),
-    ?line expect([fun ({ctt,{lists,reverse},[L1,L2]}) ->
-			  ?line same(L, lists:reverse(L2, L1)),
-			  ?line next;
-		      (Msg) ->
-			  ?line same({eft,{lists,reverse,2},CR}, Msg),
-			  ?line done
-		  end,
-		  ?LINE,{eft,{?MODULE,lists_reverse,2},CR}]);
+    L = lists:reverse(Lb, La),
+    expect([fun ({ctt,{lists,reverse},[L1,L2]}) ->
+                    same(L, lists:reverse(L2, L1)),
+                    next;
+                (Msg) ->
+                    same({eft,{lists,reverse,2},CR}, Msg),
+                    done
+            end,
+            ?LINE,{eft,{?MODULE,lists_reverse,2},CR}]);
 x_exc_exception(Rtt, ?MODULE, undef, [_], 1, {Class,Reason}=CR) ->
-    ?line expect([{ctt,{erlang,Class},[Reason]},
-		  ?LINE,{eft,{erlang,Class,1},CR},
-		  ?LINE,Rtt,{rtt,{error_handler,crash,1}},
-		  ?LINE,{eft,{?MODULE,undef,1},CR}]);
+    expect([{ctt,{erlang,Class},[Reason]},
+            ?LINE,{eft,{erlang,Class,1},CR},
+            ?LINE,Rtt,{rtt,{error_handler,crash,1}},
+            ?LINE,{eft,{?MODULE,undef,1},CR}]);
 x_exc_exception(_Rtt, M, F, _, Arity, CR) ->
-    ?line expect({eft,{M,F,Arity},CR}).
+    expect({eft,{M,F,Arity},CR}).
 
 x_exc_stacktrace() ->
     x_exc_stacktrace(erlang:get_stacktrace()).
@@ -1252,24 +1184,24 @@ lists_reverse(A, B) ->
 slave(Dest, Sync) ->
     Dest ! Sync,
     receive
-	{From,Tag,{apply,M,F,A}} when is_pid(From) ->
-	    ?line ?dbgformat("Apply: ~p:~p/~p (~p)~n",[M,F,length(A),A]),
-	    ?line Res = apply(M,F,A),
-	    ?line ?dbgformat("done Apply: ~p:~p/~p (~p)~n",[M,F,length(A),A]),
-	    From ! {Tag,Res},
-	    slave(From, Tag);
-	{From,Tag,{lambda,Fun}} when is_pid(From) ->
-	    Res = Fun(),
-	    From ! {Tag,Res},
-	    slave(From, Tag);
-	{From,Tag,{exc_top,Catch,Func,Args}} when is_pid(From) ->
-	    ?line ?dbgformat("Exc: ~p ~p~p ~n",[Catch,Func,Args]),
-	    ?line Res = exc_top(Catch, Func, Args),
-	    ?line ?dbgformat("done Exc: ~p ~p~p ~n",[Catch,Func,Args]),
-	    From ! {Tag,Res},
-	    slave(From,Tag);
-	die ->
-	    exit(normal)
+        {From,Tag,{apply,M,F,A}} when is_pid(From) ->
+            ?dbgformat("Apply: ~p:~p/~p (~p)~n",[M,F,length(A),A]),
+            Res = apply(M,F,A),
+            ?dbgformat("done Apply: ~p:~p/~p (~p)~n",[M,F,length(A),A]),
+            From ! {Tag,Res},
+            slave(From, Tag);
+        {From,Tag,{lambda,Fun}} when is_pid(From) ->
+            Res = Fun(),
+            From ! {Tag,Res},
+            slave(From, Tag);
+        {From,Tag,{exc_top,Catch,Func,Args}} when is_pid(From) ->
+            ?dbgformat("Exc: ~p ~p~p ~n",[Catch,Func,Args]),
+            Res = exc_top(Catch, Func, Args),
+            ?dbgformat("done Exc: ~p ~p~p ~n",[Catch,Func,Args]),
+            From ! {Tag,Res},
+            slave(From,Tag);
+        die ->
+            exit(normal)
     end.
 
 setup(ProcFlags) ->
@@ -1280,30 +1212,30 @@ setup(ProcFlags) ->
     Pid = spawn(fun () -> slave(Self, Sync) end),
     Mref = erlang:monitor(process, Pid),
     receive 
-	Sync ->
-	    put(slave, {Pid,Mref}),
-	    case ProcFlags of
-		[] -> ok;
-		_ ->
-		    erlang:trace(Pid, true, ProcFlags)
-	    end,
-	    Pid
+        Sync ->
+            put(slave, {Pid,Mref}),
+            case ProcFlags of
+                [] -> ok;
+                _ ->
+                    erlang:trace(Pid, true, ProcFlags)
+            end,
+            Pid
     end.
 
 shutdown() ->
     trace_off(),
     {Pid,Mref} = get(slave),
     try erlang:is_process_alive(Pid) of
-	true ->
-	    Pid ! die,
-	    receive
-		{'DOWN',Mref,process,Pid,Reason} ->
-		    Reason
-	    end;
-	_ ->
-	    not_alive
+        true ->
+            Pid ! die,
+            receive
+                {'DOWN',Mref,process,Pid,Reason} ->
+                    Reason
+            end;
+        _ ->
+            not_alive
     catch _:_ ->
-	    undefined
+              undefined
     end.
 
 trace_off() ->
@@ -1311,7 +1243,7 @@ trace_off() ->
     erlang:trace_pattern({'_','_','_'},false,[local]),
     erlang:trace_pattern({'_','_','_'},false,[meta]),
     erlang:trace(all, false, [all]).
-    
+
 
 apply_slave_async(M,F,A) ->
     {Pid,Mref} = get(slave),
@@ -1332,8 +1264,8 @@ lambda_slave(Fun) ->
 exc_slave(Opts, Func, Args) ->
     try request({exc_top,Opts,Func,Args})
     catch
-	Reason ->
-	    {crash,Reason}
+        Reason ->
+            {crash,Reason}
     end.
 
 request(Request) ->
@@ -1344,13 +1276,13 @@ request(Request) ->
 
 result(Tag, Mref) ->
     receive
-	{Tag,Result} ->
-	    receive
-		Tag ->
-		    Result
-	    end;
-	{'DOWN',Mref,process,_Pid,Reason} ->
-	    throw(Reason)
+        {Tag,Result} ->
+            receive
+                Tag ->
+                    Result
+            end;
+        {'DOWN',Mref,process,_Pid,Reason} ->
+            throw(Reason)
     end.
 
 
@@ -1363,25 +1295,25 @@ receive_next() ->
 
 receive_next(TO) ->
     receive
-	M ->
-	    M
+        M ->
+            M
     after TO ->
-	    ?t:fail(timeout)
+              ct:fail(timeout)
     end.
 
 receive_no_next(TO) ->
     receive M ->
-	    ?t:fail({unexpected_message,[M|flush(TO)]})
+                ct:fail({unexpected_message,[M|flush(TO)]})
     after TO ->
-	    ok
+              ok
     end.
 
 flush(T) ->
     receive
-	M ->
-	    [M|flush(T)]
+        M ->
+            [M|flush(T)]
     after T ->
-	    []
+              []
     end.
 
 
@@ -1416,19 +1348,19 @@ abbr(Term, _) -> Term.
 %%
 abbr_tuple(Tuple, N, J) when J =< size(Tuple) ->
     if J > N; N =< 0 ->
-	    ['...'];
+           ['...'];
        true ->
-	    [abbr(element(J, Tuple), N-1)|abbr_tuple(Tuple, J+1, N)]
+           [abbr(element(J, Tuple), N-1)|abbr_tuple(Tuple, J+1, N)]
     end;
 abbr_tuple(_, _, _) ->
     [].
 %%
 abbr_list(_, 0, R) ->
     case io_lib:printable_list(R) of
-	true ->
-	    reverse(R, "...");
-	false ->
-	    reverse(R, '...')
+        true ->
+            reverse(R, "...");
+        false ->
+            reverse(R, '...')
     end;
 abbr_list([H|T], N, R) ->
     M = N-1,
diff --git a/erts/emulator/test/trace_meta_SUITE.erl b/erts/emulator/test/trace_meta_SUITE.erl
index 3b105ec6fe..dcc2cc807b 100644
--- a/erts/emulator/test/trace_meta_SUITE.erl
+++ b/erts/emulator/test/trace_meta_SUITE.erl
@@ -46,7 +46,7 @@
 -define(config(A,B),config(A,B)).
 -export([config/2]).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -endif.
  
 -ifdef(debug).
@@ -66,22 +66,21 @@ config(priv_dir,_) ->
     ".".
 -else.
 %% When run in test server.
--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,
 	 init_per_testcase/2, end_per_testcase/2, not_run/1]).
 -export([basic/1, return/1, on_and_off/1, stack_grow/1, 
 	 info/1, tracer/1, combo/1, nosilent/1]).
 	 
 init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(test_server:minutes(5)),
-    [{watchdog, Dog}|Config].
+    Config.
 
 end_per_testcase(_Case, Config) ->
     shutdown(),
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
     ok.
-suite() -> [{ct_hooks,[ts_install_cth]}].
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 5}}].
 
 all() -> 
 case test_server:is_native(trace_meta_SUITE) of
@@ -91,74 +90,39 @@ case test_server:is_native(trace_meta_SUITE) of
        combo, nosilent]
 end.
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
 
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
-basic(suite) ->
-    [];
-basic(doc) ->
-    ["Tests basic meta trace"];
+%% Tests basic meta trace
 basic(Config) when is_list(Config) ->
     basic_test().
 
-return(suite) ->
-    [];
-return(doc) ->
-    ["Tests return trace"];
+%% Tests return trace
 return(Config) when is_list(Config) ->
     return_test().
  
-on_and_off(suite) ->
-    [];
-on_and_off(doc) ->
-    ["Tests turning trace parameters on and off"];
+%% Tests turning trace parameters on and off
 on_and_off(Config) when is_list(Config) ->
     on_and_off_test().
  
-stack_grow(doc) ->
-    ["Tests the stack growth during return traces"];
+%% Tests the stack growth during return traces
 stack_grow(Config) when is_list(Config) ->
     stack_grow_test().
  
-info(doc) ->
-    ["Tests the trace_info BIF"];
+%% Tests the trace_info BIF
 info(Config) when is_list(Config) ->
     info_test().
  
-tracer(suite) ->
-    [];
-tracer(doc) ->
-    ["Tests stopping and changing tracer process"];
+%% Tests stopping and changing tracer process
 tracer(Config) when is_list(Config) ->
     tracer_test().
 
-combo(suite) ->
-    [];
-combo(doc) ->
-    ["Tests combining local call trace with meta trace"];
+%% Tests combining local call trace with meta trace
 combo(Config) when is_list(Config) ->
     combo_test().
 
-nosilent(suite) ->
-    [];
-nosilent(doc) ->
-    ["Tests that meta trace is not silenced by the silent process flag"];
+%% Tests that meta trace is not silenced by the silent process flag
 nosilent(Config) when is_list(Config) ->
     nosilent_test().
 
@@ -546,7 +510,7 @@ combo_test() ->
 	      {?RT(Slave,{?MODULE,receiver,1}),
 	       ?RF(Slave,{erlang,phash2,2},0)} ->
 		ok;
-	      Error1 -> ?t:fail({unexpected_message, Error1})
+	      Error1 -> ct:fail({unexpected_message, Error1})
 	end,
     case {receive_next_bytag(LocalTracer),
 		receive_next_bytag(LocalTracer)} of
@@ -556,7 +520,7 @@ combo_test() ->
 	      {?RT(Slave,{?MODULE,slave,1}),
 	       ?RF(Slave,{?MODULE,receiver,1},Ref)} ->
 		  ok;
-	      Error2 -> ?t:fail({unexpected_message, Error2})
+	      Error2 -> ct:fail({unexpected_message, Error2})
 	  end,
     shutdown(),
     ?NM,
@@ -745,13 +709,13 @@ receive_next(TO) ->
 	M ->
 	    M
     after TO ->
-	    ?t:fail(timeout)
+	    ct:fail(timeout)
     end.
 
 receive_no_next(TO) ->
     receive
 	M ->
-	    ?t:fail({unexpected_message, M})
+	    ct:fail({unexpected_message, M})
     after
 	TO ->
 	    ok
diff --git a/erts/emulator/test/trace_nif_SUITE.erl b/erts/emulator/test/trace_nif_SUITE.erl
index 1cd50350e3..49757a414d 100644
--- a/erts/emulator/test/trace_nif_SUITE.erl
+++ b/erts/emulator/test/trace_nif_SUITE.erl
@@ -20,10 +20,9 @@
 
 -module(trace_nif_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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]).
 -export([trace_nif/1,
 	 trace_nif_timestamp/1,
 	 trace_nif_local/1,
@@ -45,259 +44,230 @@ all() ->
 	     trace_nif_return]
     end.
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
 
-trace_nif(doc) -> "Test tracing NIFs.";
+%% Test tracing NIFs.
 trace_nif(Config) when is_list(Config) ->
     load_nif(Config),
-    
+
     do_trace_nif([]).
 
-trace_nif_local(doc) -> "Test tracing NIFs with local flag.";
+%% Test tracing NIFs with local flag.
 trace_nif_local(Config) when is_list(Config) ->
     load_nif(Config),
     do_trace_nif([local]).
 
-trace_nif_meta(doc) -> "Test tracing NIFs with meta flag.";
+%% Test tracing NIFs with meta flag.
 trace_nif_meta(Config) when is_list(Config) ->
     load_nif(Config),
-    ?line Pid=spawn_link(?MODULE, nif_process, []),
-    ?line erlang:trace_pattern({?MODULE,nif,'_'}, [], [meta]),
-    
-    ?line Pid ! {apply_nif, nif, []},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,{?MODULE,nif,[]}}),
-    
-    ?line Pid ! {apply_nif, nif, ["Arg1"]},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,
-				{?MODULE,nif, ["Arg1"]}}),
-    
-    ?line Pid ! {call_nif, nif, []},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,
-				{?MODULE,nif, []}}),
-    
-    ?line Pid ! {call_nif, nif, ["Arg1"]},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,
-				{?MODULE,nif, ["Arg1"]}}),
+    Pid=spawn_link(?MODULE, nif_process, []),
+    erlang:trace_pattern({?MODULE,nif,'_'}, [], [meta]),
+
+    Pid ! {apply_nif, nif, []},
+    receive_trace_msg_ts({trace_ts,Pid,call,{?MODULE,nif,[]}}),
+
+    Pid ! {apply_nif, nif, ["Arg1"]},
+    receive_trace_msg_ts({trace_ts,Pid,call,
+                          {?MODULE,nif, ["Arg1"]}}),
+
+    Pid ! {call_nif, nif, []},
+    receive_trace_msg_ts({trace_ts,Pid,call,
+                          {?MODULE,nif, []}}),
+
+    Pid ! {call_nif, nif, ["Arg1"]},
+    receive_trace_msg_ts({trace_ts,Pid,call,
+                          {?MODULE,nif, ["Arg1"]}}),
     ok.
 do_trace_nif(Flags) ->
-    ?line Pid = spawn(?MODULE, nif_process, []),
-    ?line 1 = erlang:trace(Pid, true, [call]),
-    ?line erlang:trace_pattern({?MODULE,nif,'_'}, [], Flags),
-    ?line Pid ! {apply_nif, nif, []},
-    ?line receive_trace_msg({trace,Pid,call,{?MODULE,nif, []}}),
-    ?line Pid ! {apply_nif, nif, ["Arg1"]},
-    ?line receive_trace_msg({trace,Pid,call,{?MODULE,nif, ["Arg1"]}}),
+    Pid = spawn(?MODULE, nif_process, []),
+    1 = erlang:trace(Pid, true, [call]),
+    erlang:trace_pattern({?MODULE,nif,'_'}, [], Flags),
+    Pid ! {apply_nif, nif, []},
+    receive_trace_msg({trace,Pid,call,{?MODULE,nif, []}}),
+    Pid ! {apply_nif, nif, ["Arg1"]},
+    receive_trace_msg({trace,Pid,call,{?MODULE,nif, ["Arg1"]}}),
+
+    Pid ! {call_nif, nif, []},
+    receive_trace_msg({trace, Pid, call, {?MODULE,nif, []}}),
 
-    ?line Pid ! {call_nif, nif, []},
-    ?line receive_trace_msg({trace, Pid, call, {?MODULE,nif, []}}),
+    Pid ! {call_nif, nif, ["Arg1"]},
+    receive_trace_msg({trace, Pid, call, {?MODULE,nif, ["Arg1"]}}),
 
-    ?line Pid ! {call_nif, nif, ["Arg1"]},
-    ?line receive_trace_msg({trace, Pid, call, {?MODULE,nif, ["Arg1"]}}),
 
-    
     %% Switch off
-    ?line 1 = erlang:trace(Pid, false, [call]),
+    1 = erlang:trace(Pid, false, [call]),
 
-    ?line Pid ! {apply_nif, nif, []},
+    Pid ! {apply_nif, nif, []},
     receive_nothing(),
-    ?line Pid ! {apply_nif, nif, ["Arg1"]},
+    Pid ! {apply_nif, nif, ["Arg1"]},
     receive_nothing(),
-    ?line Pid ! {call_nif, nif, []},
+    Pid ! {call_nif, nif, []},
     receive_nothing(),
-    ?line Pid ! {call_nif, nif, ["Arg1"]},
+    Pid ! {call_nif, nif, ["Arg1"]},
     receive_nothing(),
 
     %% Switch on again
-    ?line 1 = erlang:trace(Pid, true, [call]),
-    ?line erlang:trace_pattern({?MODULE,nif,'_'}, [], Flags),
-    ?line Pid ! {apply_nif, nif, []},
-    ?line receive_trace_msg({trace,Pid,call,{?MODULE,nif, []}}),
-    ?line Pid ! {apply_nif, nif, ["Arg1"]},
-    ?line receive_trace_msg({trace,Pid,call,{?MODULE,nif, ["Arg1"]}}),
-
-    ?line Pid ! {call_nif, nif, []},
-    ?line receive_trace_msg({trace, Pid, call, {?MODULE,nif, []}}),
-
-    ?line Pid ! {call_nif, nif, ["Arg1"]},
-    ?line receive_trace_msg({trace, Pid, call, {?MODULE,nif, ["Arg1"]}}),
-    
-    ?line 1 = erlang:trace(Pid, false, [call]),
-    ?line erlang:trace_pattern({?MODULE,nif,'_'}, false, Flags),
-    ?line exit(Pid, die),
+    1 = erlang:trace(Pid, true, [call]),
+    erlang:trace_pattern({?MODULE,nif,'_'}, [], Flags),
+    Pid ! {apply_nif, nif, []},
+    receive_trace_msg({trace,Pid,call,{?MODULE,nif, []}}),
+    Pid ! {apply_nif, nif, ["Arg1"]},
+    receive_trace_msg({trace,Pid,call,{?MODULE,nif, ["Arg1"]}}),
+
+    Pid ! {call_nif, nif, []},
+    receive_trace_msg({trace, Pid, call, {?MODULE,nif, []}}),
+
+    Pid ! {call_nif, nif, ["Arg1"]},
+    receive_trace_msg({trace, Pid, call, {?MODULE,nif, ["Arg1"]}}),
+
+    1 = erlang:trace(Pid, false, [call]),
+    erlang:trace_pattern({?MODULE,nif,'_'}, false, Flags),
+    exit(Pid, die),
     ok.
 
-trace_nif_timestamp(doc) -> "Test tracing NIFs with timestamps.";
+%% Test tracing NIFs with timestamps.
 trace_nif_timestamp(Config) when is_list(Config) ->
     load_nif(Config),
     do_trace_nif_timestamp([]).
 
-trace_nif_timestamp_local(doc) -> 
-    "Test tracing NIFs with timestamps and local flag.";
+%% Test tracing NIFs with timestamps and local flag.
 trace_nif_timestamp_local(Config) when is_list(Config) ->
     load_nif(Config),
     do_trace_nif_timestamp([local]).
 
 do_trace_nif_timestamp(Flags) ->
-    ?line Pid=spawn(?MODULE, nif_process, []),
-    ?line 1 = erlang:trace(Pid, true, [call,timestamp]),
-    ?line erlang:trace_pattern({?MODULE,nif,'_'}, [], Flags),
-    
-    ?line Pid ! {apply_nif, nif, []},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,{?MODULE,nif,[]}}),
-    
-    ?line Pid ! {apply_nif, nif, ["Arg1"]},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,
-				{?MODULE,nif, ["Arg1"]}}),
-    
-    ?line Pid ! {call_nif, nif, []},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,
-				{?MODULE,nif, []}}),
-    
-    ?line Pid ! {call_nif, nif, ["Arg1"]},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,
-				{?MODULE,nif, ["Arg1"]}}),
-    
+    Pid=spawn(?MODULE, nif_process, []),
+    1 = erlang:trace(Pid, true, [call,timestamp]),
+    erlang:trace_pattern({?MODULE,nif,'_'}, [], Flags),
+
+    Pid ! {apply_nif, nif, []},
+    receive_trace_msg_ts({trace_ts,Pid,call,{?MODULE,nif,[]}}),
+
+    Pid ! {apply_nif, nif, ["Arg1"]},
+    receive_trace_msg_ts({trace_ts,Pid,call,
+                          {?MODULE,nif, ["Arg1"]}}),
+
+    Pid ! {call_nif, nif, []},
+    receive_trace_msg_ts({trace_ts,Pid,call,
+                          {?MODULE,nif, []}}),
+
+    Pid ! {call_nif, nif, ["Arg1"]},
+    receive_trace_msg_ts({trace_ts,Pid,call,
+                          {?MODULE,nif, ["Arg1"]}}),
+
     %% We should be able to turn off the timestamp.
-    ?line 1 = erlang:trace(Pid, false, [timestamp]),
-    
-    ?line Pid ! {call_nif, nif, []},
-    ?line receive_trace_msg({trace,Pid,call,
- 			     {?MODULE,nif, []}}),
-    
-    ?line Pid ! {apply_nif, nif, ["tjoho"]},
-    ?line receive_trace_msg({trace,Pid,call,
- 			     {?MODULE,nif, ["tjoho"]}}),
-    
-    ?line 1 = erlang:trace(Pid, false, [call]),
-    ?line erlang:trace_pattern({erlang,'_','_'}, false, Flags),
-    
-    ?line exit(Pid, die),
+    1 = erlang:trace(Pid, false, [timestamp]),
+
+    Pid ! {call_nif, nif, []},
+    receive_trace_msg({trace,Pid,call,
+                       {?MODULE,nif, []}}),
+
+    Pid ! {apply_nif, nif, ["tjoho"]},
+    receive_trace_msg({trace,Pid,call,
+                       {?MODULE,nif, ["tjoho"]}}),
+
+    1 = erlang:trace(Pid, false, [call]),
+    erlang:trace_pattern({erlang,'_','_'}, false, Flags),
+
+    exit(Pid, die),
     ok.
 
-trace_nif_return(doc) -> 
-    "Test tracing NIF's with return/return_to trace.";
+%% Test tracing NIF's with return/return_to trace.
 trace_nif_return(Config) when is_list(Config) ->
     load_nif(Config),
 
-    ?line Pid=spawn(?MODULE, nif_process, []),
-    ?line 1 = erlang:trace(Pid, true, [call,timestamp,return_to]),
-    ?line erlang:trace_pattern({?MODULE,nif,'_'}, [{'_',[],[{return_trace}]}], 
- 			       [local]),
-
-    ?line Pid ! {apply_nif, nif, []},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,{?MODULE,nif,[]}}),
-    ?line receive_trace_msg_ts_return_from({trace_ts,Pid,return_from,
- 					    {?MODULE,nif,0}}),
-    ?line receive_trace_msg_ts_return_to({trace_ts,Pid,return_to, 
- 					  {?MODULE, nif_process,0}}),
-        
-    ?line Pid ! {call_nif, nif, ["Arg1"]},
-    ?line receive_trace_msg_ts({trace_ts,Pid,call,
-				{?MODULE,nif, ["Arg1"]}}),
-    ?line receive_trace_msg_ts_return_from({trace_ts,Pid,return_from,
-					    {?MODULE,nif,1}}),
-    ?line receive_trace_msg_ts_return_to({trace_ts,Pid,return_to, 
- 					  {?MODULE, nif_process,0}}),
+    Pid=spawn(?MODULE, nif_process, []),
+    1 = erlang:trace(Pid, true, [call,timestamp,return_to]),
+    erlang:trace_pattern({?MODULE,nif,'_'}, [{'_',[],[{return_trace}]}], 
+                         [local]),
+
+    Pid ! {apply_nif, nif, []},
+    receive_trace_msg_ts({trace_ts,Pid,call,{?MODULE,nif,[]}}),
+    receive_trace_msg_ts_return_from({trace_ts,Pid,return_from,
+                                      {?MODULE,nif,0}}),
+    receive_trace_msg_ts_return_to({trace_ts,Pid,return_to, 
+                                    {?MODULE, nif_process,0}}),
+
+    Pid ! {call_nif, nif, ["Arg1"]},
+    receive_trace_msg_ts({trace_ts,Pid,call,
+                          {?MODULE,nif, ["Arg1"]}}),
+    receive_trace_msg_ts_return_from({trace_ts,Pid,return_from,
+                                      {?MODULE,nif,1}}),
+    receive_trace_msg_ts_return_to({trace_ts,Pid,return_to, 
+                                    {?MODULE, nif_process,0}}),
     ok.
 
 
 receive_trace_msg(Mess) ->
     receive
- 	Mess ->
- 	    ok;
- 	Other ->
- 	    io:format("Expected: ~p,~nGot: ~p~n", [Mess, Other]),
- 	    ?t:fail()
+        Mess ->
+            ok;
+        Other ->
+            ct:fail("Expected: ~p,~nGot: ~p~n", [Mess, Other])
     after 5000 ->
- 	    io:format("Expected: ~p,~nGot: timeout~n", [Mess]),
- 	    ?t:fail()
+              ct:fail("Expected: ~p,~nGot: timeout~n", [Mess])
     end.
 
 receive_nothing() ->
-    ?line timeout = receive M -> M after 100 -> timeout end.
+    timeout = receive M -> M after 100 -> timeout end.
 
 receive_trace_msg_ts({trace_ts, Pid, call, {M,F,A}}) ->
     receive
- 	{trace_ts, Pid, call, {M, F, A}, _Ts} ->
- 	    ok;
- 	Other ->
- 	    io:format("Expected: {trace, ~p, call, {~p, ~p, ~p}, TimeStamp}},~n"
- 		      "Got: ~p~n",
- 		      [Pid, M, F, A, Other]),
- 	    ?t:fail()
+        {trace_ts, Pid, call, {M, F, A}, _Ts} ->
+            ok;
+        Other ->
+            ct:fail("Expected: {trace, ~p, call, {~p, ~p, ~p}, TimeStamp}},~n"
+                    "Got: ~p~n", [Pid, M, F, A, Other])
     after 5000 ->
- 	    io:format("Got timeout~n", []),
- 	    ?t:fail()
+              ct:fail("Got timeout~n", [])
     end.
 
 receive_trace_msg_ts_return_from({trace_ts, Pid, return_from, {M,F,A}}) ->
     receive
- 	{trace_ts, Pid, return_from, {M, F, A}, _Value, _Ts} ->
- 	    ok;
- 	Other ->
- 	    io:format("Expected: {trace_ts, ~p, return_from, {~p, ~p, ~p}, Value, TimeStamp}},~n"
- 		      "Got: ~p~n",
- 		      [Pid, M, F, A, Other]),
- 	    ?t:fail()
+        {trace_ts, Pid, return_from, {M, F, A}, _Value, _Ts} ->
+            ok;
+        Other ->
+            ct:fail("Expected: {trace_ts, ~p, return_from, {~p, ~p, ~p}, Value, TimeStamp}},~n"
+                    "Got: ~p~n", [Pid, M, F, A, Other])
     after 5000 ->
- 	    io:format("Got timeout~n", []),
- 	    ?t:fail()
+              ct:fail("Got timeout~n", [])
     end.
 
 receive_trace_msg_ts_return_to({trace_ts, Pid, return_to, {M,F,A}}) ->
     receive
- 	{trace_ts, Pid, return_to, {M, F, A}, _Ts} ->
- 	    ok;
- 	Other ->
- 	    io:format("Expected: {trace_ts, ~p, return_to, {~p, ~p, ~p}, TimeStamp}},~n"
- 		      "Got: ~p~n",
- 		      [Pid, M, F, A, Other]),
- 	    ?t:fail()
+        {trace_ts, Pid, return_to, {M, F, A}, _Ts} ->
+            ok;
+        Other ->
+            ct:fail("Expected: {trace_ts, ~p, return_to, {~p, ~p, ~p}, TimeStamp}},~n"
+                    "Got: ~p~n", [Pid, M, F, A, Other])
     after 5000 ->
- 	    io:format("Got timeout~n", []),
- 	    ?t:fail()
+              ct:fail("Got timeout~n", [])
     end.
 
 nif_process() ->
     receive
-	{apply_nif, Name, Args} ->
-	    ?line {ok,Args} = apply(?MODULE, Name, Args);
-
-	{call_nif, Name, []} ->
-	    ?line {ok, []} = ?MODULE:Name();
-	
-	{call_nif, Name, [A1]} ->
-	    ?line {ok, [A1]} = ?MODULE:Name(A1);
-	
-	{call_nif, Name, [A1,A2]} ->
-	    ?line {ok,[A1,A2]} = ?MODULE:Name(A1,A2);
-	
-	{call_nif, Name, [A1,A2,A3]} ->
-	    ?line {ok,[A1,A2,A3]} = ?MODULE:Name(A1,A2,A3)    
+        {apply_nif, Name, Args} ->
+            {ok,Args} = apply(?MODULE, Name, Args);
+
+        {call_nif, Name, []} ->
+            {ok, []} = ?MODULE:Name();
+
+        {call_nif, Name, [A1]} ->
+            {ok, [A1]} = ?MODULE:Name(A1);
+
+        {call_nif, Name, [A1,A2]} ->
+            {ok,[A1,A2]} = ?MODULE:Name(A1,A2);
+
+        {call_nif, Name, [A1,A2,A3]} ->
+            {ok,[A1,A2,A3]} = ?MODULE:Name(A1,A2,A3)    
     end,
     nif_process().    
 
 load_nif(Config) ->    
-    ?line Path = ?config(data_dir, Config),
-    
-    ?line ok = erlang:load_nif(filename:join(Path,"trace_nif"), 0).
+    Path = proplists:get_value(data_dir, Config),
+
+    ok = erlang:load_nif(filename:join(Path,"trace_nif"), 0).
 
 
 nif() ->
@@ -305,4 +275,3 @@ nif() ->
 
 nif(A1) ->
     {"Stub1",[A1]}. %exit(["nif/1 stub called",A1]).
-
diff --git a/erts/emulator/test/trace_port_SUITE.erl b/erts/emulator/test/trace_port_SUITE.erl
index a77710205e..d33f18543a 100644
--- a/erts/emulator/test/trace_port_SUITE.erl
+++ b/erts/emulator/test/trace_port_SUITE.erl
@@ -21,9 +21,7 @@
 
 -module(trace_port_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,
 	 call_trace/1,
 	 return_trace/1,
 	 send/1,
@@ -38,9 +36,13 @@
 	 default_tracer/1,
 	 tracer_port_crash/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-test_cases() -> 
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 30}}].
+
+all() ->
     [call_trace, return_trace, send, receive_trace,
      process_events, schedule, fake_schedule,
      fake_schedule_after_register,
@@ -48,212 +50,183 @@ test_cases() ->
      fake_schedule_after_getting_unlinked, gc,
      default_tracer, tracer_port_crash].
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    test_cases().
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog = ?t:timetrap(?t:seconds(30)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
-call_trace(doc) -> "Test sending call trace messages to a port.";
+%% Test sending call trace messages to a port.
 call_trace(Config) when is_list(Config) ->
     case test_server:is_native(?MODULE) orelse
-	test_server:is_native(lists) of
-	true -> 
-	    {skip,"Native code"};
-	false ->
-	    ?line start_tracer(Config),
-	    Self = self(),
-	    ?line trace_func({lists,reverse,1}, []),
-	    ?line trace_pid(Self, true, [call]),
-	    ?line trace_info(Self, flags),
-	    ?line trace_info(Self, tracer),
-	    ?line [b,a] = lists:reverse([a,b]),
-	    ?line expect({trace,Self,call,{lists,reverse,[[a,b]]}}),
-	    
-	    ?line trace_pid(Self, true, [timestamp]),
-	    ?line trace_info(Self, flags),
-	    ?line Huge = huge_data(),
-	    ?line lists:reverse(Huge),
-	    ?line expect({trace_ts,Self,call,{lists,reverse,[Huge]},ts}),
-	    
-	    ?line trace_pid(Self, true, [arity]),
-	    ?line trace_info(Self, flags),
-	    ?line [y,x] = lists:reverse([x,y]),
-	    ?line expect({trace_ts,Self,call,{lists,reverse,1},ts}),
-	    
-	    ?line trace_pid(Self, false, [timestamp]),
-	    ?line trace_info(Self, flags),
-	    ?line [z,y,x] = lists:reverse([x,y,z]),
-	    ?line expect({trace,Self,call,{lists,reverse,1}}),
-
-	    %% OTP-7399. Delayed sub-binary creation optimization.
-	    ?line trace_pid(Self, false, [arity]),
-	    ?line trace_info(Self, flags),
-	    ?line trace_func({?MODULE,bs_sum_c,2}, [], [local]),
-	    ?line 26 = bs_sum_c(<<3:4,5:4,7:4,11:4>>, 0),
-	    ?line trace_func({?MODULE,bs_sum_c,2}, false, [local]),
-	    ?line expect({trace,Self,call,{?MODULE,bs_sum_c,[<<3:4,5:4,7:4,11:4>>,0]}}),
-	    ?line expect({trace,Self,call,{?MODULE,bs_sum_c,[<<5:4,7:4,11:4>>,3]}}),
-	    ?line expect({trace,Self,call,{?MODULE,bs_sum_c,[<<7:4,11:4>>,8]}}),
-	    ?line expect({trace,Self,call,{?MODULE,bs_sum_c,[<<11:4>>,15]}}),
-	    ?line expect({trace,Self,call,{?MODULE,bs_sum_c,[<<>>,26]}}),
-	    
-	    ?line trace_func({lists,reverse,1}, false),
-	    ok
+         test_server:is_native(lists) of
+        true -> 
+            {skip,"Native code"};
+        false ->
+            start_tracer(Config),
+            Self = self(),
+            trace_func({lists,reverse,1}, []),
+            trace_pid(Self, true, [call]),
+            trace_info(Self, flags),
+            trace_info(Self, tracer),
+            [b,a] = lists:reverse([a,b]),
+            expect({trace,Self,call,{lists,reverse,[[a,b]]}}),
+
+            trace_pid(Self, true, [timestamp]),
+            trace_info(Self, flags),
+            Huge = huge_data(),
+            lists:reverse(Huge),
+            expect({trace_ts,Self,call,{lists,reverse,[Huge]},ts}),
+
+            trace_pid(Self, true, [arity]),
+            trace_info(Self, flags),
+            [y,x] = lists:reverse([x,y]),
+            expect({trace_ts,Self,call,{lists,reverse,1},ts}),
+
+            trace_pid(Self, false, [timestamp]),
+            trace_info(Self, flags),
+            [z,y,x] = lists:reverse([x,y,z]),
+            expect({trace,Self,call,{lists,reverse,1}}),
+
+            %% OTP-7399. Delayed sub-binary creation optimization.
+            trace_pid(Self, false, [arity]),
+            trace_info(Self, flags),
+            trace_func({?MODULE,bs_sum_c,2}, [], [local]),
+            26 = bs_sum_c(<<3:4,5:4,7:4,11:4>>, 0),
+            trace_func({?MODULE,bs_sum_c,2}, false, [local]),
+            expect({trace,Self,call,{?MODULE,bs_sum_c,[<<3:4,5:4,7:4,11:4>>,0]}}),
+            expect({trace,Self,call,{?MODULE,bs_sum_c,[<<5:4,7:4,11:4>>,3]}}),
+            expect({trace,Self,call,{?MODULE,bs_sum_c,[<<7:4,11:4>>,8]}}),
+            expect({trace,Self,call,{?MODULE,bs_sum_c,[<<11:4>>,15]}}),
+            expect({trace,Self,call,{?MODULE,bs_sum_c,[<<>>,26]}}),
+
+            trace_func({lists,reverse,1}, false),
+            ok
     end.
 
 bs_sum_c(<<H:4,T/bits>>, Acc) -> bs_sum_c(T, H+Acc);
 bs_sum_c(<<>>, Acc) -> Acc.
 
 
-return_trace(doc) -> "Test the new return trace.";
+%% Test the new return trace.
 return_trace(Config) when is_list(Config) ->
     case test_server:is_native(?MODULE) orelse
-	test_server:is_native(lists) of
-	true -> 
-	    {skip,"Native code"};
-	false ->
-	    ?line start_tracer(Config),
-	    Self = self(),
-	    MFA = {lists,reverse,1},
-	    
-	    %% Plain (no timestamp, small data).
-	    
-	    ?line trace_func(MFA, [{['$1'],[],[{return_trace},
-					       {message,false}]}]),
-	    ?line trace_pid(Self, true, [call]),
-	    ?line trace_info(Self, flags),
-	    ?line trace_info(Self, tracer),
-	    ?line trace_info(MFA, match_spec),
-	    ?line {traced,global} = trace_info(MFA, traced),
-	    ?line [b,a] = lists:reverse([a,b]),
-	    ?line expect({trace,Self,return_from,MFA,[b,a]}),
-	    
-	    %% Timestamp, huge data.
-	    ?line trace_pid(Self, true, [timestamp]),
-	    ?line Result = lists:reverse(huge_data()),
-	    ?line expect({trace_ts,Self,return_from,MFA,Result,ts}),
-	    
-	    %% Turn off trace.
-	    ?line trace_func(MFA, false),
-	    ?line trace_info(MFA, match_spec),
-	    ?line {traced,false} = trace_info(MFA, traced),
-	    ok
+         test_server:is_native(lists) of
+        true -> 
+            {skip,"Native code"};
+        false ->
+            start_tracer(Config),
+            Self = self(),
+            MFA = {lists,reverse,1},
+
+            %% Plain (no timestamp, small data).
+
+            trace_func(MFA, [{['$1'],[],[{return_trace},
+                                         {message,false}]}]),
+            trace_pid(Self, true, [call]),
+            trace_info(Self, flags),
+            trace_info(Self, tracer),
+            trace_info(MFA, match_spec),
+            {traced,global} = trace_info(MFA, traced),
+            [b,a] = lists:reverse([a,b]),
+            expect({trace,Self,return_from,MFA,[b,a]}),
+
+            %% Timestamp, huge data.
+            trace_pid(Self, true, [timestamp]),
+            Result = lists:reverse(huge_data()),
+            expect({trace_ts,Self,return_from,MFA,Result,ts}),
+
+            %% Turn off trace.
+            trace_func(MFA, false),
+            trace_info(MFA, match_spec),
+            {traced,false} = trace_info(MFA, traced),
+            ok
     end.
 
-send(doc) -> "Test sending send trace messages to a port.";
+%% Test sending send trace messages to a port.
 send(Config) when is_list(Config) ->
-    ?line Tracer = start_tracer(Config),
+    Tracer = start_tracer(Config),
     Self = self(),
-    ?line Sender = fun_spawn(fun sender/0),
-    ?line trac(Sender, true, [send]),
+    Sender = fun_spawn(fun sender/0),
+    trac(Sender, true, [send]),
 
     %% Simple message, no timestamp.
 
-    ?line Bin = list_to_binary(lists:seq(1, 10)),
-    ?line Msg = {some_data,Bin},
+    Bin = list_to_binary(lists:seq(1, 10)),
+    Msg = {some_data,Bin},
     Sender ! {send_please,self(),Msg},
     receive Msg -> ok end,
-    ?line expect({trace,Sender,send,Msg,Self}),
+    expect({trace,Sender,send,Msg,Self}),
 
     %% Timestamp.
 
     BiggerMsg = {even_bigger,Msg},
-    ?line trac(Sender, true, [send,timestamp]),
+    trac(Sender, true, [send,timestamp]),
     Sender ! {send_please,self(),BiggerMsg},
     receive BiggerMsg -> ok end,
-    ?line expect({trace_ts,Sender,send,BiggerMsg,Self,ts}),
+    expect({trace_ts,Sender,send,BiggerMsg,Self,ts}),
 
     %% Huge message.
 
-    ?line HugeMsg = huge_data(),
+    HugeMsg = huge_data(),
     Sender ! {send_please,self(),HugeMsg},
     receive HugeMsg -> ok end,
-    ?line expect({trace_ts,Sender,send,HugeMsg,Self,ts}),
+    expect({trace_ts,Sender,send,HugeMsg,Self,ts}),
 
     %% Kill trace port and force a trace.  The emulator should not crasch.
 
-    ?line unlink(Tracer),
-    ?line exit(Tracer, kill),
+    unlink(Tracer),
+    exit(Tracer, kill),
     erlang:yield(),				% Make sure that port gets killed.
     Sender ! {send_please,Self,good_bye},
     receive good_bye -> ok end,
     ok.
 
-receive_trace(doc) -> "Test sending receive traces to a port.";
+%% Test sending receive traces to a port.
 receive_trace(Config) when is_list(Config) ->
-    ?line start_tracer(Config),
-    ?line Receiver = fun_spawn(fun receiver/0),
-    ?line trac(Receiver, true, ['receive']),
+    start_tracer(Config),
+    Receiver = fun_spawn(fun receiver/0),
+    trac(Receiver, true, ['receive']),
 
     Receiver ! {hello,world},
-    ?line expect({trace,Receiver,'receive',{hello,world}}),
+    expect({trace,Receiver,'receive',{hello,world}}),
 
-    ?line trac(Receiver, true, ['receive',timestamp]),
+    trac(Receiver, true, ['receive',timestamp]),
     Huge = {hello,huge_data()},
     Receiver ! {hello,huge_data()},
-    ?line expect({trace_ts,Receiver,'receive',Huge,ts}),
+    expect({trace_ts,Receiver,'receive',Huge,ts}),
     ok.
 
-process_events(doc) -> "Tests a few process events (like getting linked).";
+%% Tests a few process events (like getting linked).
 process_events(Config) when is_list(Config) ->
-    ?line start_tracer(Config),
+    start_tracer(Config),
     Self = self(),
-    ?line Receiver = fun_spawn(fun receiver/0),
-    ?line trac(Receiver, true, [procs]),
+    Receiver = fun_spawn(fun receiver/0),
+    trac(Receiver, true, [procs]),
 
     unlink(Receiver),				%It is already linked.
-    ?line expect({trace,Receiver,getting_unlinked,Self}),
+    expect({trace,Receiver,getting_unlinked,Self}),
     link(Receiver),
-    ?line expect({trace,Receiver,getting_linked,Self}),
-    ?line trac(Receiver, true, [procs,timestamp]),
+    expect({trace,Receiver,getting_linked,Self}),
+    trac(Receiver, true, [procs,timestamp]),
     unlink(Receiver),
-    ?line expect({trace_ts,Receiver,getting_unlinked,Self,ts}),
+    expect({trace_ts,Receiver,getting_unlinked,Self,ts}),
     link(Receiver),
-    ?line expect({trace_ts,Receiver,getting_linked,Self,ts}),
+    expect({trace_ts,Receiver,getting_linked,Self,ts}),
 
     unlink(Receiver),
-    ?line expect({trace_ts,Receiver,getting_unlinked,Self,ts}),
+    expect({trace_ts,Receiver,getting_unlinked,Self,ts}),
     Huge = huge_data(),
     exit(Receiver, Huge),
-    ?line expect({trace_ts,Receiver,exit,Huge,ts}),
+    expect({trace_ts,Receiver,exit,Huge,ts}),
 
     ok.
 
-schedule(doc) -> "Test sending scheduling events to a port.";
+%% Test sending scheduling events to a port.
 schedule(Config) when is_list(Config) ->
-    ?line start_tracer(Config),
-    ?line Receiver = fun_spawn(fun receiver/0),
-    ?line trac(Receiver, true, [running]),
+    start_tracer(Config),
+    Receiver = fun_spawn(fun receiver/0),
+    trac(Receiver, true, [running]),
 
     Receiver ! hi,
     expect({trace,Receiver,in,{?MODULE,receiver,0}}),
     expect({trace,Receiver,out,{?MODULE,receiver,0}}),
 
-    ?line trac(Receiver, true, [running,timestamp]),
+    trac(Receiver, true, [running,timestamp]),
 
     Receiver ! hi_again,
     expect({trace_ts,Receiver,in,{?MODULE,receiver,0},ts}),
@@ -262,252 +235,248 @@ schedule(Config) when is_list(Config) ->
     ok.
 
 run_fake_sched_test(Fun, Config) when is_function(Fun), is_list(Config) ->
-    ?line case catch erlang:system_info(smp_support) of
-	      true ->
-		  ?line {skipped,
-			 "No need for faked schedule out/in trace messages "
-			 "when smp support is enabled"};
-	      _ ->
-		  ?line Fun(Config)
-	  end.
-
-fake_schedule(doc) -> "Tests time compensating fake out/in scheduling.";
+    case catch erlang:system_info(smp_support) of
+        true ->
+            {skipped,
+             "No need for faked schedule out/in trace messages "
+             "when smp support is enabled"};
+        _ ->
+            Fun(Config)
+    end.
+
+%% Tests time compensating fake out/in scheduling.
 fake_schedule(Config) when is_list(Config) ->
-    ?line run_fake_sched_test(fun fake_schedule_test/1, Config).
+    run_fake_sched_test(fun fake_schedule_test/1, Config).
 
 fake_schedule_test(Config) when is_list(Config) ->
-    ?line Tracer = start_tracer(Config),
-    ?line Port = get(tracer_port),
-    ?line General = fun_spawn(fun general/0),
+    Tracer = start_tracer(Config),
+    Port = get(tracer_port),
+    General = fun_spawn(fun general/0),
     %%
-    ?line trac(General, true, [send, running]),
+    trac(General, true, [send, running]),
     %%
     %% Test that fake out/in scheduling is not generated unless
     %% both 'running' and 'timestamp' is active.
-    ?line [] = erlang:port_control(Port, $h, []),
-    ?line General ! nop,
-    ?line expect({trace, General, in, {?MODULE, general, 0}}),
-    ?line expect({trace, General, out, {?MODULE, general, 0}}),
-    ?line expect(),
+    [] = erlang:port_control(Port, $h, []),
+    General ! nop,
+    expect({trace, General, in, {?MODULE, general, 0}}),
+    expect({trace, General, out, {?MODULE, general, 0}}),
+    expect(),
     %%
-    ?line trac(General, false, [running]),
-    ?line trac(General, true, [timestamp]),
+    trac(General, false, [running]),
+    trac(General, true, [timestamp]),
     %%
-    ?line Ref1 = make_ref(),
-    ?line Msg1 = {Port, {data, term_to_binary(Ref1)}},
-    ?line [] = erlang:port_control(Port, $h, []),
-    ?line General ! {send, Tracer, Msg1},
-    ?line expect({trace_ts, General, send, Msg1, Tracer, ts}),
-    ?line expect(Ref1),
-    ?line expect(),
+    Ref1 = make_ref(),
+    Msg1 = {Port, {data, term_to_binary(Ref1)}},
+    [] = erlang:port_control(Port, $h, []),
+    General ! {send, Tracer, Msg1},
+    expect({trace_ts, General, send, Msg1, Tracer, ts}),
+    expect(Ref1),
+    expect(),
     %%
-    ?line trac(General, true, [running]),
+    trac(General, true, [running]),
     %%
     %% Test that fake out/in scheduling can be generated by the driver
-    ?line Ref2 = make_ref(),
-    ?line Msg2 = {Port, {data, term_to_binary(Ref2)}},
-    ?line [] = erlang:port_control(Port, $h, []),
-    ?line General ! {send, Tracer, Msg2},
-    ?line {_,_,_,_,Ts} = 
-	expect({trace_ts, General, in, {?MODULE, general, 0}, ts}),
-    ?line expect({trace_ts, General, out, 0, Ts}),
-    ?line expect({trace_ts, General, in, 0, ts}),
-    ?line expect({trace_ts, General, send, Msg2, Tracer, ts}),
-    ?line expect(Ref2),
-    ?line expect({trace_ts, General, out, {?MODULE, general, 0}, ts}),
-    ?line expect(),
+    Ref2 = make_ref(),
+    Msg2 = {Port, {data, term_to_binary(Ref2)}},
+    [] = erlang:port_control(Port, $h, []),
+    General ! {send, Tracer, Msg2},
+    {_,_,_,_,Ts} = 
+    expect({trace_ts, General, in, {?MODULE, general, 0}, ts}),
+    expect({trace_ts, General, out, 0, Ts}),
+    expect({trace_ts, General, in, 0, ts}),
+    expect({trace_ts, General, send, Msg2, Tracer, ts}),
+    expect(Ref2),
+    expect({trace_ts, General, out, {?MODULE, general, 0}, ts}),
+    expect(),
     %%
     %% Test that fake out/in scheduling is not generated after an
     %% 'out' scheduling event
-    ?line Ref3 = make_ref(),
-    ?line Msg3 = {Port, {data, term_to_binary(Ref3)}},
-    ?line General ! {apply, {erlang, port_control, [Port, $h, []]}},
-    ?line expect({trace_ts, General, in, {?MODULE, general, 0}, ts}),
-    ?line expect({trace_ts, General, out, {?MODULE, general, 0}, ts}),
-    ?line General ! {send, Tracer, Msg3},
-    ?line expect({trace_ts, General, in, {?MODULE, general, 0}, ts}),
-    ?line expect({trace_ts, General, send, Msg3, Tracer, ts}),
-    ?line expect(Ref3),
-    ?line expect({trace_ts, General, out, {?MODULE, general, 0}, ts}),
-    ?line expect(),
+    Ref3 = make_ref(),
+    Msg3 = {Port, {data, term_to_binary(Ref3)}},
+    General ! {apply, {erlang, port_control, [Port, $h, []]}},
+    expect({trace_ts, General, in, {?MODULE, general, 0}, ts}),
+    expect({trace_ts, General, out, {?MODULE, general, 0}, ts}),
+    General ! {send, Tracer, Msg3},
+    expect({trace_ts, General, in, {?MODULE, general, 0}, ts}),
+    expect({trace_ts, General, send, Msg3, Tracer, ts}),
+    expect(Ref3),
+    expect({trace_ts, General, out, {?MODULE, general, 0}, ts}),
+    expect(),
     %%
     ok.
 
-fake_schedule_after_register(doc) -> 
-    "Tests fake out/in scheduling contents.";
+%% Tests fake out/in scheduling contents.
 fake_schedule_after_register(Config) when is_list(Config) ->
-    ?line run_fake_sched_test(fun fake_schedule_after_register_test/1, Config).
+    run_fake_sched_test(fun fake_schedule_after_register_test/1, Config).
 
 fake_schedule_after_register_test(Config) when is_list(Config) ->
-    ?line start_tracer(Config),
-    ?line Port = get(tracer_port),
-    ?line G1 = fun_spawn(fun general/0),
-    ?line G2 = fun_spawn(fun general/0),
+    start_tracer(Config),
+    Port = get(tracer_port),
+    G1 = fun_spawn(fun general/0),
+    G2 = fun_spawn(fun general/0),
     %%
-    ?line trac(G1, true, [running, timestamp, procs]),
-    ?line trac(G2, true, [running, timestamp]),
+    trac(G1, true, [running, timestamp, procs]),
+    trac(G2, true, [running, timestamp]),
     %%
     %% Test fake out/in scheduling after certain messages
-    ?line erlang:yield(),
-    ?line G2 ! {apply, {erlang, port_control, [Port, $h, []]}},
-    ?line G2 ! {apply, {erlang, register, [fake_schedule_after_register, G1]}},
-    ?line expect({trace_ts, G2, in, {?MODULE, general, 0}, ts}),
-    ?line {_,_,_,_,Ts} = 
-	expect({trace_ts, G1, register, fake_schedule_after_register, ts}),
-    ?line expect({trace_ts, G2, out, 0, Ts}),
-    ?line expect({trace_ts, G2, in, 0, ts}),
-    ?line expect({trace_ts, G2, out, {?MODULE, general, 0}, ts}),
-    ?line expect(),
+    erlang:yield(),
+    G2 ! {apply, {erlang, port_control, [Port, $h, []]}},
+    G2 ! {apply, {erlang, register, [fake_schedule_after_register, G1]}},
+    expect({trace_ts, G2, in, {?MODULE, general, 0}, ts}),
+    {_,_,_,_,Ts} = 
+    expect({trace_ts, G1, register, fake_schedule_after_register, ts}),
+    expect({trace_ts, G2, out, 0, Ts}),
+    expect({trace_ts, G2, in, 0, ts}),
+    expect({trace_ts, G2, out, {?MODULE, general, 0}, ts}),
+    expect(),
     %%
     ok.
 
-fake_schedule_after_getting_linked(doc) -> 
-    "Tests fake out/in scheduling contents.";
+%% Tests fake out/in scheduling contents.
 fake_schedule_after_getting_linked(Config) when is_list(Config) ->
-    ?line run_fake_sched_test(fun fake_schedule_after_getting_linked_test/1,
-			      Config).
+    run_fake_sched_test(fun fake_schedule_after_getting_linked_test/1,
+                        Config).
 
 fake_schedule_after_getting_linked_test(Config) when is_list(Config) ->
-    ?line start_tracer(Config),
-    ?line Port = get(tracer_port),
-    ?line G1 = fun_spawn(fun general/0),
-    ?line G2 = fun_spawn(fun general/0),
+    start_tracer(Config),
+    Port = get(tracer_port),
+    G1 = fun_spawn(fun general/0),
+    G2 = fun_spawn(fun general/0),
     %%
-    ?line trac(G1, true, [running, timestamp, procs]),
-    ?line trac(G2, true, [running, timestamp]),
+    trac(G1, true, [running, timestamp, procs]),
+    trac(G2, true, [running, timestamp]),
     %%
     %% Test fake out/in scheduling after certain messages
-    ?line erlang:yield(),
-    ?line G2 ! {apply, {erlang, port_control, [Port, $h, []]}},
-    ?line G2 ! {apply, {erlang, link, [G1]}},
-    ?line expect({trace_ts, G2, in, {?MODULE, general, 0}, ts}),
-    ?line {_,_,_,_,Ts} = 
-	expect({trace_ts, G1, getting_linked, G2, ts}),
-    ?line expect({trace_ts, G2, out, 0, Ts}),
-    ?line expect({trace_ts, G2, in, 0, ts}),
-    ?line expect({trace_ts, G2, out, {?MODULE, general, 0}, ts}),
-    ?line expect(),
+    erlang:yield(),
+    G2 ! {apply, {erlang, port_control, [Port, $h, []]}},
+    G2 ! {apply, {erlang, link, [G1]}},
+    expect({trace_ts, G2, in, {?MODULE, general, 0}, ts}),
+    {_,_,_,_,Ts} = 
+    expect({trace_ts, G1, getting_linked, G2, ts}),
+    expect({trace_ts, G2, out, 0, Ts}),
+    expect({trace_ts, G2, in, 0, ts}),
+    expect({trace_ts, G2, out, {?MODULE, general, 0}, ts}),
+    expect(),
     %%
     ok.
 
-fake_schedule_after_getting_unlinked(doc) -> 
-    "Tests fake out/in scheduling contents.";
+%% Tests fake out/in scheduling contents.
 fake_schedule_after_getting_unlinked(Config) when is_list(Config) ->
-    ?line run_fake_sched_test(fun fake_schedule_after_getting_unlinked_test/1,
-			      Config).
+    run_fake_sched_test(fun fake_schedule_after_getting_unlinked_test/1,
+                        Config).
 
 fake_schedule_after_getting_unlinked_test(Config) when is_list(Config) ->
-    ?line start_tracer(Config),
-    ?line Port = get(tracer_port),
-    ?line G1 = fun_spawn(fun general/0),
-    ?line G2 = fun_spawn(fun general/0),
+    start_tracer(Config),
+    Port = get(tracer_port),
+    G1 = fun_spawn(fun general/0),
+    G2 = fun_spawn(fun general/0),
     %%
-    ?line trac(G1, true, [running, procs]),
-    ?line trac(G2, true, [running, timestamp]),
+    trac(G1, true, [running, procs]),
+    trac(G2, true, [running, timestamp]),
     %%
     %% Test fake out/in scheduling after certain messages
-    ?line erlang:yield(),
-    ?line G2 ! {apply, {erlang, link, [G1]}},
-    ?line G2 ! {apply, {erlang, port_control, [Port, $h, []]}},
-    ?line G2 ! {apply, {erlang, unlink, [G1]}},
-    ?line expect({trace_ts, G2, in, {?MODULE, general, 0}, ts}),
-    ?line expect({trace, G1, getting_linked, G2}),
-    ?line expect({trace, G1, getting_unlinked, G2}),
-    ?line expect({trace_ts, G2, out, 0, ts}),
-    ?line expect({trace_ts, G2, in, 0, ts}),
-    ?line expect({trace_ts, G2, out, {?MODULE, general, 0}, ts}),
-    ?line expect(),
+    erlang:yield(),
+    G2 ! {apply, {erlang, link, [G1]}},
+    G2 ! {apply, {erlang, port_control, [Port, $h, []]}},
+    G2 ! {apply, {erlang, unlink, [G1]}},
+    expect({trace_ts, G2, in, {?MODULE, general, 0}, ts}),
+    expect({trace, G1, getting_linked, G2}),
+    expect({trace, G1, getting_unlinked, G2}),
+    expect({trace_ts, G2, out, 0, ts}),
+    expect({trace_ts, G2, in, 0, ts}),
+    expect({trace_ts, G2, out, {?MODULE, general, 0}, ts}),
+    expect(),
     %%
     ok.
 
-gc(doc) -> "Test sending garbage collection events to a port.";
+%% Test sending garbage collection events to a port.
 gc(Config) when is_list(Config) ->
-    ?line start_tracer(Config),
-    ?line Garber = fun_spawn(fun garber/0, [{min_heap_size, 5000}]),
-    ?line trac(Garber, true, [garbage_collection]),
-    ?line trace_info(Garber, flags),
+    start_tracer(Config),
+    Garber = fun_spawn(fun garber/0, [{min_heap_size, 5000}]),
+    trac(Garber, true, [garbage_collection]),
+    trace_info(Garber, flags),
 
-    ?line trace_info(Garber, flags),
+    trace_info(Garber, flags),
     Garber ! hi,
     expect({trace,Garber,gc_start,info}),
     expect({trace,Garber,gc_end,info}),
 
-    ?line trac(Garber, true, [garbage_collection,timestamp]),
+    trac(Garber, true, [garbage_collection,timestamp]),
     Garber ! hi,
     expect({trace_ts,Garber,gc_start,info,ts}),
     expect({trace_ts,Garber,gc_end,info,ts}),
 
     ok.
 
-default_tracer(doc) ->
-    "Test a port as default tracer.";
+%% Test a port as default tracer.
 default_tracer(Config) when is_list(Config) ->
-    ?line Tracer = start_tracer(Config),
-    ?line TracerMonitor = erlang:monitor(process, Tracer),
-    ?line Port = get(tracer_port),
+    Tracer = start_tracer(Config),
+    TracerMonitor = erlang:monitor(process, Tracer),
+    Port = get(tracer_port),
     %%
-    ?line N = erlang:trace(all, true, [send, {tracer, Port}]),
-    ?line {flags, [send]} = erlang:trace_info(self(), flags),
-    ?line {tracer, Port} = erlang:trace_info(self(), tracer),
-    ?line {flags, [send]} = erlang:trace_info(new, flags),
-    ?line {tracer, Port} = erlang:trace_info(new, tracer),
-    ?line G1 = fun_spawn(fun general/0),
-    ?line {flags, [send]} = erlang:trace_info(G1, flags),
-    ?line {tracer, Port} = erlang:trace_info(G1, tracer),
-    ?line unlink(Tracer),
-    ?line exit(Port, done),
-    ?line receive
-	      {'DOWN', TracerMonitor, process, Tracer, TracerExitReason} ->
-		  ?line done = TracerExitReason
-	  end,
-    ?line {flags, []} = erlang:trace_info(self(), flags),
-    ?line {tracer, []} = erlang:trace_info(self(), tracer),
-    ?line {flags, []} = erlang:trace_info(new, flags),
-    ?line {tracer, []} = erlang:trace_info(new, tracer),
-    ?line M = erlang:trace(all, false, [all]),
-    ?line {flags, []} = erlang:trace_info(self(), flags),
-    ?line {tracer, []} = erlang:trace_info(self(), tracer),
-    ?line {flags, []} = erlang:trace_info(G1, flags),
-    ?line {tracer, []} = erlang:trace_info(G1, tracer),
-    ?line G1 ! {apply,{erlang,exit,[normal]}},
-    ?line io:format("~p = ~p.~n", [M, N]),
-    ?line M = N,
+    N = erlang:trace(all, true, [send, {tracer, Port}]),
+    {flags, [send]} = erlang:trace_info(self(), flags),
+    {tracer, Port} = erlang:trace_info(self(), tracer),
+    {flags, [send]} = erlang:trace_info(new, flags),
+    {tracer, Port} = erlang:trace_info(new, tracer),
+    G1 = fun_spawn(fun general/0),
+    {flags, [send]} = erlang:trace_info(G1, flags),
+    {tracer, Port} = erlang:trace_info(G1, tracer),
+    unlink(Tracer),
+    exit(Port, done),
+    receive
+        {'DOWN', TracerMonitor, process, Tracer, TracerExitReason} ->
+            done = TracerExitReason
+    end,
+    {flags, []} = erlang:trace_info(self(), flags),
+    {tracer, []} = erlang:trace_info(self(), tracer),
+    {flags, []} = erlang:trace_info(new, flags),
+    {tracer, []} = erlang:trace_info(new, tracer),
+    M = erlang:trace(all, false, [all]),
+    {flags, []} = erlang:trace_info(self(), flags),
+    {tracer, []} = erlang:trace_info(self(), tracer),
+    {flags, []} = erlang:trace_info(G1, flags),
+    {tracer, []} = erlang:trace_info(G1, tracer),
+    G1 ! {apply,{erlang,exit,[normal]}},
+    io:format("~p = ~p.~n", [M, N]),
+    M = N,
     ok.
 
 tracer_port_crash(Config) when is_list(Config) ->
     case test_server:is_native(?MODULE) orelse
-	test_server:is_native(lists) of
-	true -> 
-	    {skip,"Native code"};
-	false ->
-	    Tr = start_tracer(Config),
-	    Port = get(tracer_port),
-	    Tracee = spawn(fun () ->
-				   register(trace_port_linker, self()),
-				   link(Port),
-				   receive go -> ok end,
-				   lists:reverse([1,b,c]),
-				   receive die -> ok end
-			   end),
-	    Tr ! {unlink_tracer_port, self()},
-	    receive {unlinked_tracer_port, Tr} -> ok end,
-	    port_control(Port, $c, []), %% Make port commands crash tracer port...
-	    trace_func({lists,reverse,1}, []),
-	    trace_pid(Tracee, true, [call]),
-	    trace_info(Tracee, flags),
-	    trace_info(self(), tracer),
-	    Tracee ! go,
-	    receive after 1000 -> ok end,
-	    case whereis(trace_port_linker) of
-		undefined ->
-		    ok;
-		Id ->
-%		    erts_debug:set_internal_state(available_internal_state, true),
-%		    erts_debug:set_internal_state(abort, {trace_port_linker, Id})
-		    ?t:fail({trace_port_linker, Id})
-	    end,
-	    undefined = process_info(Tracee),
-	    ok
+         test_server:is_native(lists) of
+        true -> 
+            {skip,"Native code"};
+        false ->
+            Tr = start_tracer(Config),
+            Port = get(tracer_port),
+            Tracee = spawn(fun () ->
+                                   register(trace_port_linker, self()),
+                                   link(Port),
+                                   receive go -> ok end,
+                                   lists:reverse([1,b,c]),
+                                   receive die -> ok end
+                           end),
+            Tr ! {unlink_tracer_port, self()},
+            receive {unlinked_tracer_port, Tr} -> ok end,
+            port_control(Port, $c, []), %% Make port commands crash tracer port...
+            trace_func({lists,reverse,1}, []),
+            trace_pid(Tracee, true, [call]),
+            trace_info(Tracee, flags),
+            trace_info(self(), tracer),
+            Tracee ! go,
+            receive after 1000 -> ok end,
+            case whereis(trace_port_linker) of
+                undefined ->
+                    ok;
+                Id ->
+                    %		    erts_debug:set_internal_state(available_internal_state, true),
+                    %		    erts_debug:set_internal_state(abort, {trace_port_linker, Id})
+                    ct:fail({trace_port_linker, Id})
+            end,
+            undefined = process_info(Tracee),
+            ok
     end.
 
 %%% Help functions.
@@ -523,106 +492,106 @@ huge_data(N) ->
 
 expect() ->
     receive
-	Other ->
-	    ok = io:format("Unexpected; got ~p", [Other]),
-	    test_server:fail({unexpected, Other})
+        Other ->
+            ok = io:format("Unexpected; got ~p", [Other]),
+            ct:fail({unexpected, Other})
     after 200 ->
-	    ok
+              ok
     end.
 
 expect({trace_ts,E1,E2,info,ts}=Message) ->
     receive
-	{trace_ts,E1,E2,_Info,_Ts}=MessageTs ->
-	    ok = io:format("Expected and got ~p", [MessageTs]),
-	    MessageTs;
-	Other ->
-	    io:format("Expected ~p; got ~p", [Message,Other]),
-	    test_server:fail({unexpected,Other})
+        {trace_ts,E1,E2,_Info,_Ts}=MessageTs ->
+            ok = io:format("Expected and got ~p", [MessageTs]),
+            MessageTs;
+        Other ->
+            io:format("Expected ~p; got ~p", [Message,Other]),
+            ct:fail({unexpected,Other})
     after 5000 ->
-	    io:format("Expected ~p; got nothing", [Message]),
-	    test_server:fail(no_trace_message)
+              io:format("Expected ~p; got nothing", [Message]),
+              ct:fail(no_trace_message)
     end;
 expect({trace,E1,E2,info}=Message) ->
     receive
-	{trace,E1,E2,_Info}=MessageTs ->
-	    ok = io:format("Expected and got ~p", [MessageTs]),
-	    MessageTs;
-	Other ->
-	    io:format("Expected ~p; got ~p", [Message,Other]),
-	    test_server:fail({unexpected,Other})
+        {trace,E1,E2,_Info}=MessageTs ->
+            ok = io:format("Expected and got ~p", [MessageTs]),
+            MessageTs;
+        Other ->
+            io:format("Expected ~p; got ~p", [Message,Other]),
+            ct:fail({unexpected,Other})
     after 5000 ->
-	    io:format("Expected ~p; got nothing", [Message]),
-	    test_server:fail(no_trace_message)
+              io:format("Expected ~p; got nothing", [Message]),
+              ct:fail(no_trace_message)
     end;
 expect({trace_ts,E1,E2,E3,ts}=Message) ->
     receive
-	{trace_ts,E1,E2,E3,_Ts}=MessageTs ->
-	    ok = io:format("Expected and got ~p", [MessageTs]),
-	    MessageTs;
-	Other ->
-	    io:format("Expected ~p; got ~p", [Message,Other]),
-	    test_server:fail({unexpected,Other})
+        {trace_ts,E1,E2,E3,_Ts}=MessageTs ->
+            ok = io:format("Expected and got ~p", [MessageTs]),
+            MessageTs;
+        Other ->
+            io:format("Expected ~p; got ~p", [Message,Other]),
+            ct:fail({unexpected,Other})
     after 5000 ->
-	    io:format("Expected ~p; got nothing", [Message]),
-	    test_server:fail(no_trace_message)
+              io:format("Expected ~p; got nothing", [Message]),
+              ct:fail(no_trace_message)
     end;
 expect({trace_ts,E1,E2,E3,E4,ts}=Message) ->
     receive
-	{trace_ts,E1,E2,E3,E4,_Ts}=MessageTs ->
-	    ok = io:format("Expected and got ~p", [MessageTs]),
-	    MessageTs;
-	Other ->
-	    io:format("Expected ~p; got ~p", [Message,Other]),
-	    test_server:fail({unexpected,Other})
+        {trace_ts,E1,E2,E3,E4,_Ts}=MessageTs ->
+            ok = io:format("Expected and got ~p", [MessageTs]),
+            MessageTs;
+        Other ->
+            io:format("Expected ~p; got ~p", [Message,Other]),
+            ct:fail({unexpected,Other})
     after 5000 ->
-	    io:format("Expected ~p; got nothing", [Message]),
-	    test_server:fail(no_trace_message)
+              io:format("Expected ~p; got nothing", [Message]),
+              ct:fail(no_trace_message)
     end;
 expect(Message) ->
     receive
-	Message ->
-	    ok = io:format("Expected and got ~p", [Message]),
-	    Message;
-	Other ->
-	    io:format("Expected ~p; got ~p", [Message,Other]),
-	    test_server:fail({unexpected,Other})
+        Message ->
+            ok = io:format("Expected and got ~p", [Message]),
+            Message;
+        Other ->
+            io:format("Expected ~p; got ~p", [Message,Other]),
+            ct:fail({unexpected,Other})
     after 5000 ->
-	    io:format("Expected ~p; got nothing", [Message]),
-	    test_server:fail(no_trace_message)
+              io:format("Expected ~p; got nothing", [Message]),
+              ct:fail(no_trace_message)
     end.
 
 trac(What, On, Flags0) ->
     Flags = [{tracer,get(tracer_port)}|Flags0],
     get(tracer) ! {apply,self(),{erlang,trace,[What,On,Flags]}},
     Res = receive
-	      {apply_result,Result} -> Result
-	  end,
+              {apply_result,Result} -> Result
+          end,
     ok = io:format("erlang:trace(~p, ~p, ~p) -> ~p",
-		   [What,On,Flags,Res]),
+                   [What,On,Flags,Res]),
     Res.
-    
+
 trace_info(What, Key) ->
     get(tracer) ! {apply,self(),{erlang,trace_info,[What,Key]}},
     Res = receive
-	      {apply_result,Result} -> Result
-	  end,
+              {apply_result,Result} -> Result
+          end,
     ok = io:format("erlang:trace_info(~p, ~p) -> ~p",
-		   [What,Key,Res]),
+                   [What,Key,Res]),
     Res.
-    
+
 trace_func(MFA, MatchProg) ->
     get(tracer) ! {apply,self(),{erlang,trace_pattern,[MFA,MatchProg]}},
     Res = receive
-	      {apply_result,Result} -> Result
-	  end,
+              {apply_result,Result} -> Result
+          end,
     ok = io:format("erlang:trace_pattern(~p, ~p) -> ~p", [MFA,MatchProg,Res]),
     Res.
 
 trace_func(MFA, MatchProg, Flags) ->
     get(tracer) ! {apply,self(),{erlang,trace_pattern,[MFA,MatchProg,Flags]}},
     Res = receive
-	      {apply_result,Result} -> Result
-	  end,
+              {apply_result,Result} -> Result
+          end,
     ok = io:format("erlang:trace_pattern(~p, ~p) -> ~p", [MFA,MatchProg,Res]),
     Res.
 
@@ -630,29 +599,29 @@ trace_pid(Pid, On, Flags0) ->
     Flags = [{tracer,get(tracer_port)}|Flags0],
     get(tracer) ! {apply,self(),{erlang,trace,[Pid,On,Flags]}},
     Res = receive
-	      {apply_result,Result} -> Result
-	  end,
+              {apply_result,Result} -> Result
+          end,
     ok = io:format("erlang:trace(~p, ~p, ~p) -> ~p",
-		   [Pid,On,Flags,Res]),
+                   [Pid,On,Flags,Res]),
     Res.
 
 start_tracer(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = load_driver(Path, echo_drv),
     Self = self(),
     put(tracer, fun_spawn(fun() -> tracer(Self) end)),
     receive
-	{started,Port} ->
-	    put(tracer_port, Port)
+        {started,Port} ->
+            put(tracer_port, Port)
     end,
     get(tracer).
 
 load_driver(Dir, Driver) ->
     case erl_ddll:load_driver(Dir, Driver) of
-	ok -> ok;
-	{error, Error} = Res ->
-	    io:format("~s\n", [erl_ddll:format_error(Error)]),
-	    Res
+        ok -> ok;
+        {error, Error} = Res ->
+            io:format("~s\n", [erl_ddll:format_error(Error)]),
+            Res
     end.
 
 tracer(RelayTo) ->
@@ -662,18 +631,18 @@ tracer(RelayTo) ->
 
 tracer_loop(RelayTo, Port) ->
     receive
-	{apply,From,{M,F,A}} ->
-	    From ! {apply_result,apply(M, F, A)},
-	    tracer_loop(RelayTo, Port);
-	{Port,{data,Msg}} ->
-	    RelayTo ! binary_to_term(Msg),
-	    tracer_loop(RelayTo, Port);
-	{unlink_tracer_port, From} ->
-	    unlink(Port),
-	    From ! {unlinked_tracer_port, self()},
-	    tracer_loop(RelayTo, Port);
-	Other ->
-	    exit({bad_message,Other})
+        {apply,From,{M,F,A}} ->
+            From ! {apply_result,apply(M, F, A)},
+            tracer_loop(RelayTo, Port);
+        {Port,{data,Msg}} ->
+            RelayTo ! binary_to_term(Msg),
+            tracer_loop(RelayTo, Port);
+        {unlink_tracer_port, From} ->
+            unlink(Port),
+            From ! {unlinked_tracer_port, self()},
+            tracer_loop(RelayTo, Port);
+        Other ->
+            exit({bad_message,Other})
     end.
 
 fun_spawn(Fun) ->
@@ -697,43 +666,43 @@ fun_spawn(Fun, Opts) ->
 
 sender() ->
     receive
-	{send_please, To, What} ->
-	    To ! What,
-	    sender()
+        {send_please, To, What} ->
+            To ! What,
+            sender()
     end.
 
 %% Just consumes messages from its message queue.
 
 receiver() ->
     receive
-	_Any -> receiver()
+        _Any -> receiver()
     end.
 
 %% Does a garbage collection when it receives a message.
 
 garber() ->
     receive
-	_Any ->
-	    lists:seq(1, 100),
-	    erlang:garbage_collect(),
-	    garber()
+        _Any ->
+            lists:seq(1, 100),
+            erlang:garbage_collect(),
+            garber()
     end.
 
 %% All-purpose process
 
 general() ->
     receive
-	{apply, {M, F, Args}} ->
-	    erlang:apply(M, F, Args),
-	    general();
-	{send, Dest, Msg} ->
-	    Dest ! Msg,
-	    general();
-	{call_f_1, Arg} ->
-	    f(Arg),
-	    general();
-	nop ->
-	    general()
+        {apply, {M, F, Args}} ->
+            erlang:apply(M, F, Args),
+            general();
+        {send, Dest, Msg} ->
+            Dest ! Msg,
+            general();
+        {call_f_1, Arg} ->
+            f(Arg),
+            general();
+        nop ->
+            general()
     end.
 
 f(Arg) ->
diff --git a/erts/emulator/test/tuple_SUITE.erl b/erts/emulator/test/tuple_SUITE.erl
index f1f077be6b..d59d7d12d3 100644
--- a/erts/emulator/test/tuple_SUITE.erl
+++ b/erts/emulator/test/tuple_SUITE.erl
@@ -26,7 +26,7 @@
 	 t_make_tuple_2/1, t_make_upper_boundry_tuple_2/1, t_make_tuple_3/1,
 	 t_append_element/1, t_append_element_upper_boundry/1,
 	 build_and_match/1, tuple_with_case/1, tuple_in_guard/1]).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Tests tuples and the BIFs:
 %%
@@ -64,7 +64,7 @@ init_per_suite(Config) ->
     [{started_apps, A}|Config].
 
 end_per_suite(Config) ->
-    As = ?config(started_apps, Config),
+    As = proplists:get_value(started_apps, Config),
     lists:foreach(fun (A) -> application:stop(A) end, As),
     Config.
 
@@ -259,7 +259,7 @@ t_make_tuple(Size, Element) ->
     lists:foreach(fun(El) when El =:= Element ->
 			  ok;
 		     (Other) ->
-			  test_server:fail({got, Other, expected, Element})
+			  ct:fail({got, Other, expected, Element})
 		  end, tuple_to_list(Tuple)).
 
 %% Tests the erlang:make_tuple/3 BIF.
@@ -385,14 +385,14 @@ tuple_in_guard(Config) when is_list(Config) ->
 	Tuple1 == {element(1, Tuple2),element(2, Tuple2)} ->
 	    ok;
 	true ->
-	    test_server:fail()
+	    ct:fail("failed")
     end,
     if
 	Tuple2 == {element(1, Tuple2),element(2, Tuple2),
 	    element(3, Tuple2)} ->
 	    ok;
 	true ->
-	    test_server:fail()
+	    ct:fail("failed")
     end,
     ok.
 
diff --git a/erts/emulator/test/unique_SUITE.erl b/erts/emulator/test/unique_SUITE.erl
index 6fa634b886..e8537e6152 100644
--- a/erts/emulator/test/unique_SUITE.erl
+++ b/erts/emulator/test/unique_SUITE.erl
@@ -20,38 +20,25 @@
 
 -module(unique_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, init_per_suite/1, end_per_suite/1]).
 -export([unique_monotonic_integer_white_box/1,
 	 unique_integer_white_box/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %-define(P(V), V).
 -define(P(V), print_ret_val(?FILE, ?LINE, V)).
 
 -define(PRINT(V), print_ret_val(?FILE, ?LINE, V)).
 
-
-init_per_testcase(Case, Config) ->
-    ?line Dog=test_server:timetrap(test_server:minutes(2)),
-    [{watchdog, Dog}, {testcase, Case}|Config].
-
-end_per_testcase(_, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 4}}].
 
 all() -> 
     [unique_monotonic_integer_white_box,
      unique_integer_white_box].
 
-groups() -> 
-    [].
-
 init_per_suite(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
     Config.
@@ -60,12 +47,6 @@ end_per_suite(_Config) ->
     erts_debug:set_internal_state(available_internal_state, false),
     ok.
 
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 %%
 %%
 %% Unique counter white box test case
@@ -80,15 +61,15 @@ unique_monotonic_integer_white_box(Config) when is_list(Config) ->
     %% the system when moving the strict monotonic counter
     %% around in a non-strict monotonic way...
     Test = spawn(Node,
-		 fun () ->
-			 unique_monotonic_integer_white_box_test(TestServer, Success)
-		 end),
+                 fun () ->
+                         unique_monotonic_integer_white_box_test(TestServer, Success)
+                 end),
     Mon = erlang:monitor(process, Test),
     receive
-	{'DOWN', Mon, process, Test, Error} ->
-	    ?t:fail(Error);
-	Success ->
-	    ok
+        {'DOWN', Mon, process, Test, Error} ->
+            ct:fail(Error);
+        Success ->
+            ok
     end,
     erlang:demonitor(Mon, [flush]),
     stop_node(Node),
@@ -96,9 +77,9 @@ unique_monotonic_integer_white_box(Config) when is_list(Config) ->
 
 set_unique_monotonic_integer_state(MinCounter, NextValue) ->
     true = erts_debug:set_internal_state(unique_monotonic_integer_state,
-					 NextValue-MinCounter-1).
-    
-    
+                                         NextValue-MinCounter-1).
+
+
 
 unique_monotonic_integer_white_box_test(TestServer, Success) ->
     erts_debug:set_internal_state(available_internal_state, true),
@@ -130,10 +111,10 @@ unique_monotonic_integer_white_box_test(TestServer, Success) ->
     ?PRINT({max_counter, MaxCounter}),
 
     case WordSize of
-	4 ->
-	    MinCounter = MinSint64;
-	8 ->
-	    MinCounter = MinSmall
+        4 ->
+            MinCounter = MinSint64;
+        8 ->
+            MinCounter = MinSmall
     end,
 
     StartState = erts_debug:get_internal_state(unique_monotonic_integer_state),
@@ -141,20 +122,20 @@ unique_monotonic_integer_white_box_test(TestServer, Success) ->
     %% Verify that we get expected results over all internal limits...
 
     case MinCounter < MinSmall of
-	false ->
-	    8 = WordSize,
-	    ok;
-	true ->
-	    4 = WordSize,
-	    ?PRINT(over_min_small),
-	    set_unique_monotonic_integer_state(MinCounter, MinSmall-2),
-	    true = (?P(erlang:unique_integer([monotonic])) == MinSmall - 2),
-	    true = (?P(erlang:unique_integer([monotonic])) == MinSmall - 1),
-	    true = (?P(erlang:unique_integer([monotonic])) == MinSmall),
-	    true = (?P(erlang:unique_integer([monotonic]))  == MinSmall + 1),
-	    true = (?P(erlang:unique_integer([monotonic]))  == MinSmall + 2),
-	    garbage_collect(),
-	    ok
+        false ->
+            8 = WordSize,
+            ok;
+        true ->
+            4 = WordSize,
+            ?PRINT(over_min_small),
+            set_unique_monotonic_integer_state(MinCounter, MinSmall-2),
+            true = (?P(erlang:unique_integer([monotonic])) == MinSmall - 2),
+            true = (?P(erlang:unique_integer([monotonic])) == MinSmall - 1),
+            true = (?P(erlang:unique_integer([monotonic])) == MinSmall),
+            true = (?P(erlang:unique_integer([monotonic]))  == MinSmall + 1),
+            true = (?P(erlang:unique_integer([monotonic]))  == MinSmall + 2),
+            garbage_collect(),
+            ok
     end,
 
     ?PRINT(over_zero), %% Not really an interesting limit, but...
@@ -176,27 +157,27 @@ unique_monotonic_integer_white_box_test(TestServer, Success) ->
     garbage_collect(),
 
     case MaxCounter > MaxSint64 of
-	false ->
-	    4 = WordSize,
-	    ok;
-	true ->
-	    8 = WordSize,
-	    ?PRINT(over_max_sint64),
-	    set_unique_monotonic_integer_state(MinCounter, MaxSint64-2),
-	    true = (?P(erlang:unique_integer([monotonic])) == MaxSint64 - 2),
-	    true = (?P(erlang:unique_integer([monotonic])) == MaxSint64 - 1),
-	    true = (?P(erlang:unique_integer([monotonic])) == MaxSint64),
-	    true = (?P(erlang:unique_integer([monotonic])) == MaxSint64 + 1),
-	    true = (?P(erlang:unique_integer([monotonic])) == MaxSint64 + 2),
-	    garbage_collect()
+        false ->
+            4 = WordSize,
+            ok;
+        true ->
+            8 = WordSize,
+            ?PRINT(over_max_sint64),
+            set_unique_monotonic_integer_state(MinCounter, MaxSint64-2),
+            true = (?P(erlang:unique_integer([monotonic])) == MaxSint64 - 2),
+            true = (?P(erlang:unique_integer([monotonic])) == MaxSint64 - 1),
+            true = (?P(erlang:unique_integer([monotonic])) == MaxSint64),
+            true = (?P(erlang:unique_integer([monotonic])) == MaxSint64 + 1),
+            true = (?P(erlang:unique_integer([monotonic])) == MaxSint64 + 2),
+            garbage_collect()
     end,
 
     ?PRINT(over_max_min_counter),
     set_unique_monotonic_integer_state(MinCounter, if MaxCounter == MaxSint64 ->
-							   MaxCounter-2;
-						      true ->
-							   MinCounter-3
-						   end),
+                                                          MaxCounter-2;
+                                                      true ->
+                                                          MinCounter-3
+                                                   end),
     true = (?P(erlang:unique_integer([monotonic])) == MaxCounter - 2),
     true = (?P(erlang:unique_integer([monotonic])) == MaxCounter - 1),
     true = (?P(erlang:unique_integer([monotonic])) == MaxCounter),
@@ -208,7 +189,7 @@ unique_monotonic_integer_white_box_test(TestServer, Success) ->
     %% Restore initial state and hope we didn't mess it up for the
     %% system...
     true = erts_debug:set_internal_state(unique_monotonic_integer_state,
-					 StartState),
+                                         StartState),
 
     TestServer ! Success.
 
@@ -219,16 +200,16 @@ unique_monotonic_integer_white_box_test(TestServer, Success) ->
 %%
 
 -record(uniqint_info, {min_int,
-		       max_int,
-		       max_small,
-		       schedulers,
-		       sched_bits}).
+                       max_int,
+                       max_small,
+                       schedulers,
+                       sched_bits}).
 
 unique_integer_white_box(Config) when is_list(Config) ->
     UinqintInfo = init_uniqint_info(),
     #uniqint_info{min_int = MinInt,
-		  max_int = MaxInt,
-		  max_small = MaxSmall} = UinqintInfo,
+                  max_int = MaxInt,
+                  max_small = MaxSmall} = UinqintInfo,
     io:format("****************************************************~n", []),
     io:format("*** Around MIN_UNIQ_INT ~p ***~n", [MinInt]),
     io:format("****************************************************~n", []),
@@ -258,7 +239,7 @@ unique_integer_white_box(Config) when is_list(Config) ->
     io:format("****************************************************~n", []),
     check_unique_integer_around(MaxInt, UinqintInfo),
     ok.
-	
+
 
 %%% Internal unique_integer_white_box/1 test case
 
@@ -267,10 +248,21 @@ calc_sched_bits(NoScheds, Shift) when NoScheds < 1 bsl Shift ->
 calc_sched_bits(NoScheds, Shift) ->
     calc_sched_bits(NoScheds, Shift+1).
 
+schedulers() ->
+    S = erlang:system_info(schedulers),
+    try
+        DCPUS = erlang:system_info(dirty_cpu_schedulers),
+        DIOS = erlang:system_info(dirty_io_schedulers),
+        S+DCPUS+DIOS
+    catch
+        _ : _ ->
+            S
+    end.
+
 init_uniqint_info() ->
     SmallBits = erlang:system_info({wordsize, internal})*8-4,
     io:format("SmallBits=~p~n", [SmallBits]),
-    Schedulers = erlang:system_info(schedulers),
+    Schedulers = schedulers(),
     io:format("Schedulers=~p~n", [Schedulers]),
     MinSmall = -1*(1 bsl (SmallBits-1)),
     io:format("MinSmall=~p~n", [MinSmall]),
@@ -281,33 +273,33 @@ init_uniqint_info() ->
     MaxInt = ((((1 bsl 64) - 1) bsl SchedBits) bor Schedulers) + MinSmall,
     io:format("MaxInt=~p~n", [MaxInt]),
     #uniqint_info{min_int = MinSmall,
-		  max_int = MaxInt,
-		  max_small = MaxSmall,
-		  schedulers = Schedulers,
-		  sched_bits = SchedBits}.
+                  max_int = MaxInt,
+                  max_small = MaxSmall,
+                  schedulers = Schedulers,
+                  sched_bits = SchedBits}.
 
 valid_uniqint(Int, #uniqint_info{min_int = MinInt} = UinqintInfo) when Int < MinInt ->
     valid_uniqint(MinInt, UinqintInfo);
 valid_uniqint(Int, #uniqint_info{min_int = MinInt,
-				 sched_bits = SchedBits,
-				 schedulers = Scheds}) ->
+                                 sched_bits = SchedBits,
+                                 schedulers = Scheds}) ->
     Int1 = Int - MinInt,
     {Inc, ThreadNo} = case Int1 band ((1 bsl SchedBits) - 1) of
-			  TN when TN > Scheds ->
-			      {1, Scheds};
-			  TN ->
-			      {0, TN}
-		      end,
+                          TN when TN > Scheds ->
+                              {1, Scheds};
+                          TN ->
+                              {0, TN}
+                      end,
     Counter = ((Int1 bsr SchedBits) + Inc) rem (1 bsl 64),
     ((Counter bsl SchedBits) bor ThreadNo) + MinInt.
 
 smaller_valid_uniqint(Int, UinqintInfo) ->
     Cand = Int-1,
     case valid_uniqint(Cand, UinqintInfo) of
-	RI when RI < Int ->
-	    RI;
-	_ ->
-	    smaller_valid_uniqint(Cand, UinqintInfo)
+        RI when RI < Int ->
+            RI;
+        _ ->
+            smaller_valid_uniqint(Cand, UinqintInfo)
     end.
 
 int32_to_bigendian_list(Int) ->
@@ -318,7 +310,7 @@ int32_to_bigendian_list(Int) ->
      Int band 16#ff].
 
 mk_uniqint(Int, #uniqint_info {min_int = MinInt,
-			       sched_bits = SchedBits} = _UinqintInfo) ->
+                               sched_bits = SchedBits} = _UinqintInfo) ->
     Int1 = Int - MinInt,
     ThrId = Int1 band ((1 bsl SchedBits) - 1),
     Value = (Int1 bsr SchedBits) band ((1 bsl 64) - 1),
@@ -334,36 +326,36 @@ check_uniqint(Int, UinqintInfo) ->
     UniqInt = mk_uniqint(Int, UinqintInfo),
     io:format("UniqInt=~p ", [UniqInt]),
     case UniqInt =:= Int of
-	true ->
-	    io:format("OK~n~n", []);
-	false ->
-	    io:format("result UniqInt=~p FAILED~n", [UniqInt]),
-	    exit(badres)
+        true ->
+            io:format("OK~n~n", []);
+        false ->
+            io:format("result Int=~p FAILED~n", [Int]),
+            exit(badres)
     end.
 
 check_unique_integer_around(Int, #uniqint_info{min_int = MinInt,
-					       max_int = MaxInt} = UinqintInfo) ->
+                                               max_int = MaxInt} = UinqintInfo) ->
     {Start, End} = case {Int =< MinInt+100, Int >= MaxInt-100} of
-		       {true, false} ->
-			   {MinInt, MinInt+100};
-		       {false, false} ->
-			   {smaller_valid_uniqint(Int-100, UinqintInfo),
-			    valid_uniqint(Int+100, UinqintInfo)};
-		       {false, true} ->
-			   {MaxInt-100, MaxInt}
-		   end,
+                       {true, false} ->
+                           {MinInt, MinInt+100};
+                       {false, false} ->
+                           {smaller_valid_uniqint(Int-100, UinqintInfo),
+                            valid_uniqint(Int+100, UinqintInfo)};
+                       {false, true} ->
+                           {MaxInt-100, MaxInt}
+                   end,
     lists:foldl(fun (I, OldRefInt) ->
-			RefInt = valid_uniqint(I, UinqintInfo),
-			case OldRefInt =:= RefInt of
-			    true ->
-				ok;
-			    false ->
-				check_uniqint(RefInt, UinqintInfo)
-			end,
-			RefInt
-		end,
-		none,
-		lists:seq(Start, End)).
+                        RefInt = valid_uniqint(I, UinqintInfo),
+                        case OldRefInt =:= RefInt of
+                            true ->
+                                ok;
+                            false ->
+                                check_uniqint(RefInt, UinqintInfo)
+                        end,
+                        RefInt
+                end,
+                none,
+                lists:seq(Start, End)).
 
 
 %% helpers
@@ -375,17 +367,17 @@ print_ret_val(File, Line, Value) ->
 start_node(Config) ->
     start_node(Config, []).
 start_node(Config, Opts) when is_list(Config), is_list(Opts) ->
-    ?line Pa = filename:dirname(code:which(?MODULE)),
-    ?line A = erlang:monotonic_time(1) + erlang:time_offset(1),
-    ?line B = erlang:unique_integer([positive]),
-    ?line Name = list_to_atom(atom_to_list(?MODULE)
-			      ++ "-"
-			      ++ atom_to_list(?config(testcase, Config))
-			      ++ "-"
-			      ++ integer_to_list(A)
-			      ++ "-"
-			      ++ integer_to_list(B)),
-    ?line ?t:start_node(Name, slave, [{args, Opts++" -pa "++Pa}]).
+    Pa = filename:dirname(code:which(?MODULE)),
+    A = erlang:monotonic_time(1) + erlang:time_offset(1),
+    B = erlang:unique_integer([positive]),
+    Name = list_to_atom(atom_to_list(?MODULE)
+                        ++ "-"
+                        ++ atom_to_list(proplists:get_value(testcase, Config))
+                        ++ "-"
+                        ++ integer_to_list(A)
+                        ++ "-"
+                        ++ integer_to_list(B)),
+    test_server:start_node(Name, slave, [{args, Opts++" -pa "++Pa}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
diff --git a/erts/emulator/test/z_SUITE.erl b/erts/emulator/test/z_SUITE.erl
index f4d9030255..93a03e8f91 100644
--- a/erts/emulator/test/z_SUITE.erl
+++ b/erts/emulator/test/z_SUITE.erl
@@ -30,148 +30,117 @@
 
 %-define(line_trace, 1).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-%-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]).
 
 -export([schedulers_alive/1, node_container_refc_check/1,
 	 long_timers/1, pollset_size/1,
 	 check_io_debug/1, get_check_io_info/0]).
 
--define(DEFAULT_TIMEOUT, ?t:minutes(5)).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 5}}].
 
 all() -> 
     [schedulers_alive, node_container_refc_check,
      long_timers, pollset_size, check_io_debug].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
 %%%
 %%% The test cases -------------------------------------------------------------
 %%%
 
-schedulers_alive(doc) -> ["Tests that all schedulers are actually used"];
-schedulers_alive(suite) -> [];
+%% Tests that all schedulers are actually used
 schedulers_alive(Config) when is_list(Config) ->
-    ?line Master = self(),
-    ?line NoSchedulersOnline = erlang:system_flag(
-				 schedulers_online,
-				 erlang:system_info(schedulers)),
-    ?line NoSchedulers = erlang:system_info(schedulers),
+    Master = self(),
+    NoSchedulersOnline = erlang:system_flag(
+                           schedulers_online,
+                           erlang:system_info(schedulers)),
+    NoSchedulers = erlang:system_info(schedulers),
     UsedScheds =
-	try
-	    ?line ?t:format("Number of schedulers configured: ~p~n", [NoSchedulers]),
-	    ?line case erlang:system_info(multi_scheduling) of
-		      blocked ->
-			  ?line ?t:fail(multi_scheduling_blocked);
-		      disabled ->
-			  ?line ok;
-		      enabled ->
-			  ?t:format("Testing blocking process exit~n"),
-			  BF = fun () ->
-				       blocked = erlang:system_flag(multi_scheduling,
-								    block),
-				       Master ! {self(), blocking},
-				       receive after infinity -> ok end
-			       end,
-			  ?line Blocker = spawn_link(BF),
-			  ?line Mon = erlang:monitor(process, Blocker),
-			  ?line receive {Blocker, blocking} -> ok end,
-			  ?line [Blocker]
-			      = erlang:system_info(multi_scheduling_blockers),
-			  ?line unlink(Blocker),
-			  ?line exit(Blocker, kill),
-			  ?line receive {'DOWN', Mon, _, _, _} -> ok end,
-			  ?line enabled = erlang:system_info(multi_scheduling),
-			  ?line [] = erlang:system_info(multi_scheduling_blockers),
-			  ?line ok
-		  end,
-	    ?t:format("Testing blocked~n"),
-	    ?line erlang:system_flag(multi_scheduling, block),
-	    ?line case erlang:system_info(multi_scheduling) of
-		      enabled ->
-			  ?line ?t:fail(multi_scheduling_enabled);
-		      blocked ->
-			  ?line [Master] = erlang:system_info(multi_scheduling_blockers);
-		      disabled -> ?line ok
-		  end,
-	    ?line Ps = lists:map(
-			 fun (_) ->
-				 spawn_link(fun () ->
-						    run_on_schedulers(none,
-								      [],
-								      Master)
-					    end)
-			 end,
-			 lists:seq(1,NoSchedulers)),
-	    ?line receive after 1000 -> ok end,
-	    ?line {_, 1} = verify_all_schedulers_used({[],0}, 1),
-	    ?line lists:foreach(fun (P) ->
-					unlink(P),
-					exit(P, bang)
-				end,
-				Ps),
-	    ?line case erlang:system_flag(multi_scheduling, unblock) of
-		      blocked -> ?line ?t:fail(multi_scheduling_blocked);
-		      disabled -> ?line ok;
-		      enabled -> ?line ok
-		  end,
-	    erts_debug:set_internal_state(available_internal_state, true),
-	    %% node_and_dist_references will use emulator interal thread blocking...
-	    erts_debug:get_internal_state(node_and_dist_references), 
-	    erts_debug:set_internal_state(available_internal_state, false),
-	    ?t:format("Testing not blocked~n"),
-	    ?line Ps2 = lists:map(
-			  fun (_) ->
-				  spawn_link(fun () ->
-						     run_on_schedulers(none,
-								       [],
-								       Master)
-					     end)
-			  end,
-			  lists:seq(1,NoSchedulers)),
-	    ?line receive after 1000 -> ok end,
-	    ?line {_, NoSIDs} = verify_all_schedulers_used({[],0},NoSchedulers),
-	    ?line lists:foreach(fun (P) ->
-					unlink(P),
-					exit(P, bang)
-				end,
-				Ps2),
-	    NoSIDs
-	after
-	    NoSchedulers = erlang:system_flag(schedulers_online,
-					      NoSchedulersOnline),
-	    NoSchedulersOnline = erlang:system_info(schedulers_online)
-	end,
-    ?line {comment, "Number of schedulers " ++ integer_to_list(UsedScheds)}.
+      try
+          io:format("Number of schedulers configured: ~p~n", [NoSchedulers]),
+          case erlang:system_info(multi_scheduling) of
+              blocked ->
+                  ct:fail(multi_scheduling_blocked);
+              disabled ->
+                  ok;
+              enabled ->
+                  io:format("Testing blocking process exit~n"),
+                  BF = fun () ->
+                               blocked = erlang:system_flag(multi_scheduling,
+                                                            block),
+                               Master ! {self(), blocking},
+                               receive after infinity -> ok end
+                       end,
+                  Blocker = spawn_link(BF),
+                  Mon = erlang:monitor(process, Blocker),
+                  receive {Blocker, blocking} -> ok end,
+                  [Blocker]
+                  = erlang:system_info(multi_scheduling_blockers),
+                  unlink(Blocker),
+                  exit(Blocker, kill),
+                  receive {'DOWN', Mon, _, _, _} -> ok end,
+                  enabled = erlang:system_info(multi_scheduling),
+                  [] = erlang:system_info(multi_scheduling_blockers),
+                  ok
+          end,
+          io:format("Testing blocked~n"),
+          erlang:system_flag(multi_scheduling, block),
+          case erlang:system_info(multi_scheduling) of
+              enabled ->
+                  ct:fail(multi_scheduling_enabled);
+              blocked ->
+                  [Master] = erlang:system_info(multi_scheduling_blockers);
+              disabled -> ok
+          end,
+          Ps = lists:map(
+                 fun (_) ->
+                         spawn_link(fun () ->
+                                            run_on_schedulers(none,
+                                                              [],
+                                                              Master)
+                                    end)
+                 end,
+                 lists:seq(1,NoSchedulers)),
+          receive after 1000 -> ok end,
+          {_, 1} = verify_all_schedulers_used({[],0}, 1),
+          lists:foreach(fun (P) ->
+                                unlink(P),
+                                exit(P, bang)
+                        end, Ps),
+          case erlang:system_flag(multi_scheduling, unblock) of
+              blocked -> ct:fail(multi_scheduling_blocked);
+              disabled -> ok;
+              enabled -> ok
+          end,
+          erts_debug:set_internal_state(available_internal_state, true),
+          %% node_and_dist_references will use emulator interal thread blocking...
+          erts_debug:get_internal_state(node_and_dist_references), 
+          erts_debug:set_internal_state(available_internal_state, false),
+          io:format("Testing not blocked~n"),
+          Ps2 = lists:map(
+                  fun (_) ->
+                          spawn_link(fun () ->
+                                             run_on_schedulers(none,
+                                                               [],
+                                                               Master)
+                                     end)
+                  end,
+                  lists:seq(1,NoSchedulers)),
+          receive after 1000 -> ok end,
+          {_, NoSIDs} = verify_all_schedulers_used({[],0},NoSchedulers),
+          lists:foreach(fun (P) ->
+                                unlink(P),
+                                exit(P, bang)
+                        end, Ps2),
+          NoSIDs
+      after
+          NoSchedulers = erlang:system_flag(schedulers_online,
+                                            NoSchedulersOnline),
+          NoSchedulersOnline = erlang:system_info(schedulers_online)
+      end,
+        {comment, "Number of schedulers " ++ integer_to_list(UsedScheds)}.
 
 
 run_on_schedulers(LastSID, SIDs, ReportTo) ->
@@ -198,65 +167,56 @@ wait_on_used_scheduler({SIDs, SIDsLen} = State) ->
 		true ->
 		    wait_on_used_scheduler(State);
 		false ->
-		    ?t:format("Scheduler ~p used~n", [SID]),
+		    io:format("Scheduler ~p used~n", [SID]),
 		    {[SID|SIDs], SIDsLen+1}
 	    end
     end.
 
 verify_all_schedulers_used({UsedSIDs, UsedSIDsLen} = State, NoSchedulers) ->
-    ?line case NoSchedulers of
+    case NoSchedulers of
 	      UsedSIDsLen ->
-		  ?line State;
+		  State;
 	      NoSchdlrs when NoSchdlrs < UsedSIDsLen ->
-		  ?line ?t:fail({more_schedulers_used_than_exist,
+		  ct:fail({more_schedulers_used_than_exist,
 				 {existing_schedulers, NoSchdlrs},
 				 {used_schedulers, UsedSIDsLen},
 				 {used_scheduler_ids, UsedSIDs}});
 	      _ ->
-		  ?line NewState = wait_on_used_scheduler(State),
-		  ?line verify_all_schedulers_used(NewState, NoSchedulers)
+		  NewState = wait_on_used_scheduler(State),
+		  verify_all_schedulers_used(NewState, NoSchedulers)
 	  end.
 
-node_container_refc_check(doc) -> [];
-node_container_refc_check(suite) -> [];
 node_container_refc_check(Config) when is_list(Config) ->
-    ?line node_container_SUITE:node_container_refc_check(node()),
-    ?line ok.
+    node_container_SUITE:node_container_refc_check(node()),
+    ok.
 
-long_timers(doc) ->
-    [];
-long_timers(suite) ->
-    [];
 long_timers(Config) when is_list(Config) ->
-    ?line ok = long_timers_test:check_result().
+    ok = long_timers_test:check_result().
 
-pollset_size(doc) ->
-    [];
-pollset_size(suite) ->
-    [];
 pollset_size(Config) when is_list(Config) ->
-    ?line Name = pollset_size_testcase_initial_state_holder,
-    ?line Mon = erlang:monitor(process, Name),
-    ?line (catch Name ! {get_initial_check_io_result, self()}),
-    ?line InitChkIo = receive
+    Name = pollset_size_testcase_initial_state_holder,
+    Mon = erlang:monitor(process, Name),
+    (catch Name ! {get_initial_check_io_result, self()}),
+    InitChkIo = receive
 			  {initial_check_io_result, ICIO} ->
-			      ?line erlang:demonitor(Mon, [flush]),
-			      ?line ICIO;
+			      erlang:demonitor(Mon, [flush]),
+			      ICIO;
 			  {'DOWN', Mon, _, _, Reason} ->
-			      ?line ?t:fail({non_existing, Name, Reason})
+			      ct:fail({non_existing, Name, Reason})
 		      end,
-    ?line FinChkIo = get_check_io_info(),
-    ?line io:format("Initial: ~p~nFinal: ~p~n", [InitChkIo, FinChkIo]),
-    ?line InitPollsetSize = lists:keysearch(total_poll_set_size, 1, InitChkIo),
-    ?line FinPollsetSize = lists:keysearch(total_poll_set_size, 1, FinChkIo),
-    ?line case InitPollsetSize =:= FinPollsetSize of
+    FinChkIo = get_check_io_info(),
+    io:format("Initial: ~p~nFinal: ~p~n", [InitChkIo, FinChkIo]),
+    InitPollsetSize = lists:keysearch(total_poll_set_size, 1, InitChkIo),
+    FinPollsetSize = lists:keysearch(total_poll_set_size, 1, FinChkIo),
+    HasGethost = case has_gethost() of true -> 1; _ -> 0 end,
+    case InitPollsetSize =:= FinPollsetSize of
 	      true ->
 		  case InitPollsetSize of
 		      {value, {total_poll_set_size, Size}} ->
-			  ?line {comment,
+			  {comment,
 				 "Pollset size: " ++ integer_to_list(Size)};
 		      _ ->
-			  ?line {skipped,
+			  {skipped,
 				 "Pollset size information not available"}
 		  end;
 	      false ->
@@ -265,40 +225,59 @@ pollset_size(Config) when is_list(Config) ->
 		  %% that is ok as long as there are at least 2
 		  %% descriptors (dist listen socket and
 		  %% epmd socket) in the pollset.
-		  ?line {value, {total_poll_set_size, InitSize}}
+		  {value, {total_poll_set_size, InitSize}}
 		      = InitPollsetSize,
-		  ?line {value, {total_poll_set_size, FinSize}}
+		  {value, {total_poll_set_size, FinSize}}
 		      = FinPollsetSize,
-		  ?line true = FinSize < InitSize,
-		  ?line true = 2 =< FinSize,
-		  ?line {comment,
+		  true = FinSize < (InitSize + HasGethost),
+		  true = 2 =< FinSize,
+		  {comment,
 			 "Start pollset size: "
 			 ++ integer_to_list(InitSize)
 			 ++ " End pollset size: "
 			 ++ integer_to_list(FinSize)}
 	  end.
 
-check_io_debug(doc) ->
-    [];
-check_io_debug(suite) ->
-    [];
 check_io_debug(Config) when is_list(Config) ->
-    ?line case lists:keysearch(name, 1, erlang:system_info(check_io)) of
-	      {value, {name, erts_poll}} -> ?line check_io_debug_test();
-	      _ -> ?line {skipped, "Not implemented in this emulator"}
+    case lists:keysearch(name, 1, erlang:system_info(check_io)) of
+	      {value, {name, erts_poll}} -> check_io_debug_test();
+	      _ -> {skipped, "Not implemented in this emulator"}
 	  end.
 
 check_io_debug_test() ->
-    ?line erlang:display(get_check_io_info()),
-    ?line erts_debug:set_internal_state(available_internal_state, true),
-    ?line {NoErrorFds, NoUsedFds, NoDrvSelStructs, NoDrvEvStructs}
+    erlang:display(get_check_io_info()),
+    erts_debug:set_internal_state(available_internal_state, true),
+    {NoErrorFds, NoUsedFds, NoDrvSelStructs, NoDrvEvStructs} = CheckIoDebug
 	= erts_debug:get_internal_state(check_io_debug),
-    ?line erts_debug:set_internal_state(available_internal_state, false),
-    ?line 0 = NoErrorFds,
-    ?line NoUsedFds = NoDrvSelStructs,
-    ?line 0 = NoDrvEvStructs,
-    ?line ok.
+    erts_debug:set_internal_state(available_internal_state, false),
+    HasGetHost = has_gethost(),
+    ct:log("check_io_debug: ~p~n"
+           "HasGetHost: ~p",[CheckIoDebug, HasGetHost]),
+    0 = NoErrorFds,
+    if
+        NoUsedFds == NoDrvSelStructs ->
+            ok;
+        HasGetHost andalso (NoUsedFds == (NoDrvSelStructs - 1)) ->
+            %% If the inet_gethost port is alive, we may have
+            %% one extra used fd that is not selected on.
+            %% This happens when the initial setup of the
+            %% port returns an EAGAIN
+            ok
+    end,
+    0 = NoDrvEvStructs,
+    ok.
 
+has_gethost() ->
+    has_gethost(erlang:ports()).
+has_gethost([P|T]) ->
+    case erlang:port_info(P, name) of
+        {name,"inet_gethost"++_} ->
+            true;
+        _ ->
+            has_gethost(T)
+    end;
+has_gethost([]) ->
+    false.
 
 
 %%
@@ -332,6 +311,3 @@ get_check_io_info() ->
 	    receive after 100 -> ok end,
 	    get_check_io_info()
     end.
-
-
-
diff --git a/erts/emulator/utils/beam_makeops b/erts/emulator/utils/beam_makeops
index 9a8c3585e6..2e7073a8f0 100755
--- a/erts/emulator/utils/beam_makeops
+++ b/erts/emulator/utils/beam_makeops
@@ -48,12 +48,17 @@ $pack_shift[4] = ['0', 'BEAM_LOOSE_SHIFT', # Only for 64 bit wordsize
 		  '(3*BEAM_LOOSE_SHIFT)'];
 
 $pack_mask[2]  = ['BEAM_LOOSE_MASK', $WHOLE_WORD];
-$pack_mask[3]  = ['BEAM_TIGHT_MASK', 'BEAM_TIGHT_MASK', 'BEAM_TIGHT_MASK'];
+$pack_mask[3]  = ['BEAM_TIGHT_MASK', 'BEAM_TIGHT_MASK', $WHOLE_WORD];
 $pack_mask[4]  = ['BEAM_LOOSE_MASK', # Only for 64 bit wordsize
 		  'BEAM_LOOSE_MASK',
 		  'BEAM_LOOSE_MASK',
 		  $WHOLE_WORD];
 
+# Mapping from packagable arguments to number of packed arguments per
+# word.  Initialized after the wordsize is known.
+
+my @args_per_word;
+
 # There are two types of instructions: generic and specific.
 # The generic instructions are those generated by the Beam compiler.
 # Corresponding to each generic instruction, there is generally a
@@ -108,7 +113,6 @@ my @if_line;
 #
 my $te_max_vars = 0;		# Max number of variables ever needed.
 my %gen_transform;
-my %min_window;
 my %match_engine_ops;		# All opcodes for the match engine.
 my %gen_transform_offset;
 my @transformations;
@@ -176,11 +180,12 @@ sub define_type_bit {
     }
 
     # Composed types.
-    define_type_bit('d', $type_bit{'x'} | $type_bit{'y'} | $type_bit{'r'});
+    define_type_bit('d', $type_bit{'x'} | $type_bit{'y'});
     define_type_bit('c', $type_bit{'i'} | $type_bit{'a'} |
 		    $type_bit{'n'} | $type_bit{'q'});
     define_type_bit('s', $type_bit{'d'} | $type_bit{'i'} |
-		    $type_bit{'a'} | $type_bit{'n'});
+		    $type_bit{'a'} | $type_bit{'n'} |
+		    $type_bit{'q'});
     define_type_bit('j', $type_bit{'f'} | $type_bit{'p'});
 
     # Aliases (for matching purposes).
@@ -236,6 +241,20 @@ while (@ARGV && $ARGV[0] =~ /^-(.*)/) {
 }
 
 #
+# Initialize number of arguments per packed word.
+#
+
+$args_per_word[2] = 2;
+$args_per_word[3] = 3;
+$args_per_word[4] = 2;
+$args_per_word[5] = 3;
+$args_per_word[6] = 3;
+
+if ($wordsize == 64) {
+    $args_per_word[4] = 4;
+}
+
+#
 # Parse the input files.
 #
 
@@ -362,7 +381,6 @@ while (<>) {
 	    $gen_arity{$name} = $arity;
 	    $gen_to_spec{"$name/$arity"} = undef;
 	    $num_specific{"$name/$arity"} = 0;
-	    $min_window{"$name/$arity"} = 255;
 	    $obsolete[$op_num] = defined $obsolete;
 	} else {		# Unnumbered generic operation.
 	    push(@unnumbered_generic, [$name, $arity]);
@@ -420,7 +438,6 @@ $num_file_opcodes = @gen_opname;
 	$gen_arity{$name} = $arity;
 	$gen_to_spec{"$name/$arity"} = undef;
 	$num_specific{"$name/$arity"} = 0;
-	$min_window{"$name/$arity"} = 255;
     }
 }
 
@@ -527,12 +544,16 @@ sub emulator_output {
 
 	    my(@bits) = (0) x ($max_spec_operands/2);
 	    my($i);
+	    my $involves_r = 0;
 	    for ($i = 0; $i < $max_spec_operands && defined $args[$i]; $i++) {
 		my $t = $args[$i];
-		if (defined $type_bit{$t}) {
-		    my $shift = $max_genop_types * ($i % 2);
-		    $bits[int($i/2)] |= $type_bit{$t} << $shift;
+		my $bits = $type_bit{$t};
+		if ($t eq 'r') {
+		    $bits |= $type_bit{'x'};
+		    $involves_r |= 1 << $i;
 		}
+		my $shift = $max_genop_types * ($i % 2);
+		$bits[int($i/2)] |= $bits << $shift;
 	    }
 
 	    printf "/* %3d */  ", $spec_opnum;
@@ -544,7 +565,7 @@ sub emulator_output {
 		$sep = ",";
 	    }
 	    $init .= "}";
-	    &init_item($print_name, $init, $size, $pack, $sign, 0);
+	    init_item($print_name, $init, $involves_r, $size, $pack, $sign, 0);
 	    $op_to_name[$spec_opnum] = $instr;
 	    $spec_opnum++;
 	}
@@ -583,7 +604,7 @@ sub emulator_output {
 		$is_transformed{$name,$arity} or
 		error("instruction $key has no specific instruction");
 	    $spec_op = -1 unless defined $spec_op;
-	    &init_item($name, $arity, $spec_op, $num_specific, $tr, $min_window{$key});
+	    &init_item($name, $arity, $spec_op, $num_specific, $tr);
 	}
     }
     print "};\n";
@@ -601,15 +622,12 @@ sub emulator_output {
     print "#define MAX_GENERIC_OPCODE ", $num_file_opcodes-1, "\n";
     print "#define NUM_GENERIC_OPS ", scalar(@gen_opname), "\n";
     print "#define NUM_SPECIFIC_OPS ", scalar(@op_to_name), "\n";
+    print "#define SCRATCH_X_REG 1023\n";
     print "\n";
     print "#ifdef ARCH_64\n";
     print "#  define BEAM_WIDE_MASK 0xFFFFUL\n";
-    print "#  define BEAM_LOOSE_MASK 0x1FFFUL\n";
-    print "#if HALFWORD_HEAP\n";
-    print "#  define BEAM_TIGHT_MASK 0x1FFCUL\n";
-    print "#else\n";
-    print "#  define BEAM_TIGHT_MASK 0x1FF8UL\n";
-    print "#endif\n";
+    print "#  define BEAM_LOOSE_MASK 0xFFFFUL\n";
+    print "#  define BEAM_TIGHT_MASK 0xFFFFUL\n";
     print "#  define BEAM_WIDE_SHIFT 32\n";
     print "#  define BEAM_LOOSE_SHIFT 16\n";
     print "#  define BEAM_TIGHT_SHIFT 16\n";
@@ -734,7 +752,7 @@ sub init_item {
 	    print "${sep}NULL";
 	} elsif (/^\{/) {
 	    print "$sep$_";
-	} elsif (/^-?\d/) {
+	} elsif (/^-?\d+$/) {
 	    print "$sep$_";
 	} else {
 	    print "$sep\"$_\"";
@@ -896,6 +914,7 @@ sub basic_generator {
     my($var_decls) = '';
     my($gen_dest_arg) = 'StoreSimpleDest';
     my($i);
+    my($no_prefetch) = 0;
 
     # The following argument types should be included as macro arguments.
     my(%incl_arg) = ('c' => 1,
@@ -994,6 +1013,7 @@ sub basic_generator {
     #
 
     $flags =~ /-fail_action/ and do {
+	$no_prefetch = 1;
 	if (!defined $fail_type) {
 	    my($i);
 	    for ($i = 0; $i < @f_types; $i++) {
@@ -1040,6 +1060,12 @@ sub basic_generator {
 			 "I += $size + 1;",
 			 "goto $goto;",
 			 "}");
+	} elsif ($no_prefetch) {
+	    $code = join("\n",
+			 "{ $var_decls",
+			 $macro_code,
+			 "Next($size);",
+			 "}", "");
 	} else {
 	    $code = join("\n",
 			 "{ $var_decls",
@@ -1061,6 +1087,7 @@ sub do_pack {
     my($packable_args) = 0;
     my @is_packable;		# Packability (boolean) for each argument.
     my $wide_packing = 0;
+    my(@orig_args) = @args;
 
     #
     # Count the number of packable arguments.  If we encounter any 's' or 'd'
@@ -1081,6 +1108,18 @@ sub do_pack {
 	    }
 	} elsif ($arg =~ /^[sd]/) {
 	    return ('', '', @args);
+	} elsif ($arg =~ /^[scq]/ and $packable_args > 0) {
+	    # When packing, this operand will be picked up from the
+	    # code array, put onto the packing stack, and later put
+	    # back into a different location in the code. The problem
+	    # is that if this operand is a literal, the original
+	    # location in the code would have been remembered in a
+	    # literal patch.  For packing to work, we would have to
+	    # adjust the position in the literal patch. For the
+	    # moment, adding additional instructions to the packing
+	    # engine to handle this does not seem worth it, so we will
+	    # just turn off packing.
+	    return ('', '', @args);
 	} else {
 	    push @is_packable, 0;
 	}
@@ -1090,7 +1129,6 @@ sub do_pack {
     # Get out of here if too few or too many arguments.
     #
     return ('', '', @args) if $packable_args < 2;
-    &error("too many packable arguments") if $packable_args > 4;
 
     my($size) = 0;
     my($pack_prefix) = '';
@@ -1098,14 +1136,8 @@ sub do_pack {
 				# beginning).
     my($up) = '';		# Pack commands (storing back while
 				# moving forward).
-    my $args_per_word;
-    if ($packable_args < 4 or $wordsize == 64) {
-	$args_per_word = $packable_args;
-    } else {
-	# 4 packable argument, 32 bit wordsize. Need 2 words.
-	$args_per_word = 2;
-    }
 
+    my $args_per_word = $args_per_word[$packable_args];
     my @shift;
     my @mask;
     my @instr;
@@ -1299,6 +1331,8 @@ sub tr_parse_op {
 	foreach (split('', $type)) {
 	    &error("bad type in $op")
 		unless defined $type_bit{$_} or $type eq '*';
+	    $_ eq 'r' and
+		error("$op: 'r' is not allowed in transformations")
 	}
     }
 
@@ -1332,7 +1366,10 @@ sub tr_parse_op {
     }
 
     # Get an optional value. (In destination.)
+    $type_val = $type eq 'x' ? 1023 : 0;
     if (/^=(.*)/) {
+	error("value not allowed in source: $op")
+	    if $src;
 	$type_val = $1;
 	$_ = '';
     }
@@ -1351,11 +1388,6 @@ sub tr_parse_op {
 	    if $var && $type;
     }
 
-    # Test that source has no values.
-    if ($src) {
-	error("value not allowed in source: $op")
-	    if $type_val;
-    }
     ($var,$type,$type_val,$cond,$cond_val);
 }
 
@@ -1370,8 +1402,7 @@ sub tr_gen {
 
     foreach $ref (@g) {
 	my($line, $orig_transform, $from_ref, $to_ref) = @$ref;
-	my $used_ref = used_vars($from_ref, $to_ref);
-	my $so_far = tr_gen_from($line, $used_ref, @$from_ref);
+	my $so_far = tr_gen_from($line, @$from_ref);
 	tr_gen_to($line, $orig_transform, $so_far, @$to_ref);
     }
 
@@ -1422,58 +1453,14 @@ sub tr_gen {
     print "};\n\n";
 }
 
-sub used_vars {
-    my($from_ref,$to_ref) = @_;
-    my %used;
-    my %seen;
-
-    foreach my $ref (@$from_ref) {
-	my($name,$arity,@ops) = @$ref;
-	if ($name =~ /^[.]/) {
-	    foreach my $var (@ops) {
-		$used{$var} = 1;
-	    }
-	} else {
-	    # Any variable that is used at least twice on the
-	    # left-hand side is used. (E.g. "move R R".)
-	    foreach my $op (@ops) {
-		my($var, $type, $type_val) = @$op;
-		next if $var eq '';
-		$used{$var} = 1 if $seen{$var};
-		$seen{$var} = 1;
-	    }
-	}
-    }
-
-    foreach my $ref (@$to_ref) {
-	my($name, $arity, @ops) = @$ref;
-	if ($name =~ /^[.]/) {
-	    foreach my $var (@ops) {
-		$used{$var} = 1;
-	    }
-	} else {
-	    foreach my $op (@ops) {
-		my($var, $type, $type_val) = @$op;
-		next if $var eq '';
-		$used{$var} = 1;
-	    }
-	}
-    }
-    \%used;
-}
-
 sub tr_gen_from {
-    my($line,$used_ref,@tr) = @_;
+    my($line,@tr) = @_;
     my(%var) = ();
     my(%var_type);
     my($var_num) = 0;
     my(@code);
-    my($min_window) = 0;
-    my(@fix_rest_args);
-    my(@fix_pred_funcs);
     my($op, $ref);		# Loop variables.
     my $where = "left side of transformation in line $line: ";
-    my %var_used = %$used_ref;
     my $may_fail = 0;
     my $is_first = 1;
 
@@ -1495,8 +1482,20 @@ sub tr_gen_from {
 	    my $var;
 	    my(@args);
 
-	    push(@fix_pred_funcs, scalar(@code));
-	    push(@code, [$name, @ops]);
+	    foreach $var (@ops) {
+		error($where, "variable '$var' unbound")
+		    unless defined $var{$var};
+		if ($var_type{$var} eq 'scalar') {
+		    push(@args, "var[$var{$var}]");
+		} else {
+		    push(@args, "rest_args");
+		}
+	    }
+	    my $pi = tr_next_index(\@pred_table, \%pred_table, $name, @args);
+	    my $op = make_op("$name()", 'pred', $pi);
+	    my @slots = grep(/^\d+/, map { $var{$_} } @ops);
+	    op_slot_usage($op, @slots);
+	    push(@code, $op);
 	    next;
 	}
 
@@ -1509,7 +1508,6 @@ sub tr_gen_from {
 	$opnum = $gen_opnum{$name,$arity};
 
 	push(@code, make_op("$name/$arity", 'next_instr', $opnum));
-	$min_window++;
 	foreach $op (@ops) {
 	    my($var, $type, $type_val, $cond, $val) = @$op;
 	    my $ignored_var = "$var (ignored)";
@@ -1558,15 +1556,21 @@ sub tr_gen_from {
 		if (defined $var{$var}) {
 		    $ignored_var = '';
 		    $may_fail = 1;
-		    push(@code, &make_op($var, 'is_same_var', $var{$var}));
+		    my $op = make_op($var, 'is_same_var', $var{$var});
+		    op_slot_usage($op, $var{$var});
+		    push(@code, $op);
 		} elsif ($type eq '*') {
-		    #
-		    # Reserve a hole for a 'rest_args' instruction.
-		    #
+		    foreach my $type (values %var_type) {
+			error("only one use of a '*' variable is " .
+			      "allowed on the left hand side of " .
+			      "a transformation")
+			    if $type eq 'array';
+		    }
 		    $ignored_var = '';
-		    push(@fix_rest_args, scalar(@code));
-		    push(@code, $var);
-		} elsif ($var_used{$var}) {
+		    $var{$var} = 'unnumbered';
+		    $var_type{$var} = 'array';
+		    push(@code, make_op($var, 'rest_args'));
+		} else {
 		    $ignored_var = '';
 		    $var_type{$var} = 'scalar';
 		    $var{$var} = $var_num;
@@ -1594,46 +1598,14 @@ sub tr_gen_from {
     #
     push(@code, make_op($may_fail ? '' : 'always reached', 'commit'));
 
-    #
-    # If there is an rest_args instruction, we must insert its correct
-    # variable number (higher than any other).
-    #
-    my $index;
-    &error("only one use of a '*' variable is allowed on the left hand side of a transformation")
-	if @fix_rest_args > 1;
-    foreach $index (@fix_rest_args) {
-	my $var = $code[$index];
-	$var{$var} = $var_num++;
-	$var_type{$var} = 'array';
-	splice(@code, $index, 1, &make_op($var, 'rest_args', $var{$var}));
-    }
-
-    foreach $index (@fix_pred_funcs) {
-	my($name, @ops) = @{$code[$index]};
-	my(@args);
-	my $var;
-
-	foreach $var (@ops) {
-	    &error($where, "variable '$var' unbound")
-		unless defined $var{$var};
-	    if ($var_type{$var} eq 'scalar') {
-		push(@args, "var[$var{$var}]");
-	    } else {
-		push(@args, "var+$var{$var}");
-	    }
-	}
-	my $pi = tr_next_index(\@pred_table, \%pred_table, $name, @args);
-	splice(@code, $index, 1, make_op("$name()", 'pred', $pi));
-    }
-
     $te_max_vars = $var_num
 	if $te_max_vars < $var_num;
-    [$min_window, \%var, \%var_type, \@code];
+    [\%var, \%var_type, \@code];
 }
 
 sub tr_gen_to {
     my($line, $orig_transform, $so_far, @tr) = @_;
-    my($min_window, $var_ref, $var_type_ref, $code_ref) = @$so_far;
+    my($var_ref, $var_type_ref, $code_ref) = @$so_far;
     my(%var) = %$var_ref;
     my(%var_type) = %$var_type_ref;
     my(@code) = @$code_ref;
@@ -1662,13 +1634,16 @@ sub tr_gen_to {
 		if ($var_type{$var} eq 'scalar') {
 		    push(@args, "var[$var{$var}]");
 		} else {
-		    push(@args, "var+$var{$var}");
+		    push(@args, "rest_args");
 		}
 	    }
 	    pop(@code);	# Get rid of 'commit' instruction
 	    my $index = tr_next_index(\@call_table, \%call_table,
 				      $name, @args);
-	    push(@code, make_op("$name()", 'call_end', $index));
+	    my $op = make_op("$name()", 'call_end', $index);
+	    my @slots = grep(/^\d+/, map { $var{$_} } @ops);
+	    op_slot_usage($op, @slots);
+	    push(@code, $op);
 	    last;
 	}
 
@@ -1690,11 +1665,13 @@ sub tr_gen_to {
 	    my($var, $type, $type_val) = @$op;
 
 	    if ($type eq '*') {
-		push(@code, make_op($var, 'store_rest_args', $var{$var}));
+		push(@code, make_op($var, 'store_rest_args'));
 	    } elsif ($var ne '') {
 		&error($where, "variable '$var' unbound")
 		    unless defined $var{$var};
-		push(@code, &make_op($var, 'store_var_next_arg', $var{$var}));
+		my $op = make_op($var, 'store_var_next_arg', $var{$var});
+		op_slot_usage($op, $var{$var});
+		push(@code, $op);
 	    } elsif ($type ne '') {
 		push(@code, &make_op('', 'store_type', "TAG_$type"));
 		if ($type_val) {
@@ -1709,6 +1686,10 @@ sub tr_gen_to {
     push(@code, make_op('', 'end'))
 	unless is_instr($code[$#code], 'call_end');
 
+    tr_maybe_keep(\@code);
+    tr_maybe_rename(\@code);
+    tr_remove_unused(\@code);
+
     #
     # Chain together all codes segments having the same first operation.
     #
@@ -1717,8 +1698,6 @@ sub tr_gen_to {
     my($dummy, $arity);
     ($dummy, $op, $arity) = @$first;
     my($comment) = "\n/*\n * Line $line:\n *   $orig_transform\n */\n\n";
-    $min_window{$key} = $min_window
-	if $min_window{$key} > $min_window;
 
     my $prev_last;
     $prev_last = pop(@{$gen_transform{$key}})
@@ -1736,6 +1715,148 @@ sub tr_gen_to {
     push(@{$gen_transform{$key}}, @code),
 }
 
+sub tr_maybe_keep {
+    my($ref) = @_;
+    my @last_instr;
+    my $pos;
+    my $reused_instr;
+
+    for (my $i = 0; $i < @$ref; $i++) {
+	my $instr = $$ref[$i];
+	my($size, $instr_ref, $comment) = @$instr;
+	my($op, @args) = @$instr_ref;
+	if ($op eq 'next_instr') {
+	    @last_instr = ($args[0]);
+	} elsif ($op eq 'set_var_next_arg') {
+	    push @last_instr, $args[0];
+	} elsif ($op eq 'next_arg') {
+	    push @last_instr, 'ignored';
+	} elsif ($op eq 'new_instr') {
+	    unless (defined $pos) {
+		# 'new_instr' immediately after 'commit'.
+		$reused_instr = $args[0];
+		return unless shift(@last_instr) == $reused_instr;
+		$pos = $i - 1;
+	    } else {
+		# Second 'new_instr' after 'commit'. The instructions
+		# from $pos up to and including $i - 1 rebuilds the
+		# existing instruction exactly.
+		my $name = $gen_opname[$reused_instr];
+		my $arity = $gen_arity[$reused_instr];
+		my $reuse = make_op("$name/$arity", 'keep');
+		splice @$ref, $pos, $i-$pos, ($reuse);
+		return;
+	    }
+	} elsif ($op eq 'store_var_next_arg') {
+	    return unless shift(@last_instr) eq $args[0];
+	} elsif (defined $pos) {
+	    return;
+	}
+    }
+}
+
+sub tr_maybe_rename {
+    my($ref) = @_;
+    my $s = 'left';
+    my $a = 0;
+    my $num_args = 0;
+    my $new_instr;
+    my $first;
+    my $i;
+
+    for ($i = 1; $i < @$ref; $i++) {
+	my $instr = $$ref[$i];
+	my($size, $instr_ref, $comment) = @$instr;
+	my($op, @args) = @$instr_ref;
+
+	if ($s eq 'left') {
+	    if ($op eq 'set_var_next_arg') {
+		if ($num_args == $a and $args[0] == $a) {
+		    $num_args++;
+		}
+		$a++;
+	    } elsif ($op eq 'next_arg') {
+		$a++;
+	    } elsif ($op eq 'commit') {
+		$a = 0;
+		$first = $i;
+		$s = 'committed';
+	    } elsif ($op eq 'next_instr') {
+		return;
+	    }
+	} elsif ($s eq 'committed') {
+	    if ($op eq 'new_instr') {
+		$new_instr = $args[0];
+		$a = 0;
+		$s = 'right';
+	    } else {
+		return;
+	    }
+	} elsif ($s eq 'right') {
+	    if ($op eq 'store_var_next_arg' && $args[0] == $a) {
+		$a++;
+	    } elsif ($op eq 'end' && $a <= $num_args) {
+		my $name = $gen_opname[$new_instr];
+		my $arity = $gen_arity[$new_instr];
+		my $new_op = make_op("$name/$arity", 'rename', $new_instr);
+		splice @$ref, $first, $i-$first+1, ($new_op);
+		return;
+	    } else {
+		return;
+	    }
+	}
+    }
+}
+
+sub tr_remove_unused {
+    my($ref) = @_;
+    my %used;
+
+    # Collect all used variables.
+    for my $instr (@$ref) {
+	my $uref = $$instr[3];
+	for my $slot (@$uref) {
+	    $used{$slot} = 1;
+	}
+    }
+
+    # Replace 'set_var_next_arg' with 'next_arg' if the variable
+    # is never used.
+    for my $instr (@$ref) {
+	my($size, $instr_ref, $comment) = @$instr;
+	my($op, @args) = @$instr_ref;
+	if ($op eq 'set_var_next_arg') {
+	    my $var = $args[0];
+	    next if $used{$var};
+	    $instr = make_op("$comment (ignored)", 'next_arg');
+	}
+    }
+
+    # Delete a sequence of 'next_arg' instructions when they are
+    # redundant before instructions such as 'commit'.
+    my @opcode;
+    my %ending = (call_end => 1,
+		  commit => 1,
+		  next_instr => 1,
+		  pred => 1,
+		  rename => 1,
+		  keep => 1);
+    for (my $i = 0; $i < @$ref; $i++) {
+	my $instr = $$ref[$i];
+	my($size, $instr_ref, $comment) = @$instr;
+	my($opcode) = @$instr_ref;
+
+	if ($ending{$opcode}) {
+	    my $first = $i;
+	    $first-- while $first > 0 and $opcode[$first-1] eq 'next_arg';
+	    my $n = $i - $first;
+	    splice @$ref, $first, $n;
+	    $i -= $n;
+	}
+	$opcode[$i] = $opcode;
+    }
+}
+
 sub tr_code_len {
     my($sum) = 0;
     my($ref);
@@ -1748,7 +1869,12 @@ sub tr_code_len {
 
 sub make_op {
     my($comment, @op) = @_;
-    [scalar(@op), [@op], $comment];
+    [scalar(@op), [@op], $comment, []];
+}
+
+sub op_slot_usage {
+    my($op_ref, @slots) = @_;
+    $$op_ref[3] = \@slots;
 }
 
 sub is_instr {
diff --git a/erts/emulator/valgrind/suppress.halfword b/erts/emulator/valgrind/suppress.halfword
deleted file mode 100644
index 8fe448d897..0000000000
--- a/erts/emulator/valgrind/suppress.halfword
+++ /dev/null
@@ -1,56 +0,0 @@
-# Extra suppressions specific for the halfword emulator.
-
-# --- Suppress all offheap binaries ---
-# Valgrinds leak check does not recognize pointers that are stored
-# at unaligned addresses. In halfword emulator we store 64-bit pointers
-# to offheap data on 32-bit aligned heaps.
-# We solve this by suppressing allocation of all offheap structures
-# that are not referenced by other tables (ie binaries).
-
-{
-Halfword erts_bin_nrml_alloc
-Memcheck:Leak
-...
-fun:erts_bin_nrml_alloc
-...
-}
-
-{
-Halfword erts_bin_realloc
-Memcheck:Leak
-...
-fun:erts_bin_realloc
-...
-}
-
-{
-Halfword erts_bin_realloc_fnf
-Memcheck:Leak
-...
-fun:erts_bin_realloc_fnf
-...
-}
-
-{
-Halfword erts_bin_drv_alloc
-Memcheck:Leak
-...
-fun:erts_bin_drv_alloc
-...
-}
-
-{
-Halfword erts_bin_drv_alloc_fnf
-Memcheck:Leak
-...
-fun:erts_bin_drv_alloc_fnf
-...
-}
-
-{
-Halfword erts_create_magic_binary
-Memcheck:Leak
-...
-fun:erts_create_magic_binary
-...
-}
diff --git a/erts/emulator/valgrind/suppress.patched.3.6.0 b/erts/emulator/valgrind/suppress.patched.3.6.0
index 16cecf2dba..fcde4a0123 100644
--- a/erts/emulator/valgrind/suppress.patched.3.6.0
+++ b/erts/emulator/valgrind/suppress.patched.3.6.0
@@ -368,7 +368,7 @@ Memcheck:Addr4
 ...
 fun:erts_print_scheduler_info
 ...
-fun:erl_exit
+fun:erts_exit
 fun:broken_halt_test
 fun:erts_debug_set_internal_state_2
 fun:process_main
diff --git a/erts/emulator/valgrind/suppress.standard b/erts/emulator/valgrind/suppress.standard
index a1f3f82364..bb07c92fc1 100644
--- a/erts/emulator/valgrind/suppress.standard
+++ b/erts/emulator/valgrind/suppress.standard
@@ -336,7 +336,7 @@ Memcheck:Addr4
 ...
 fun:erts_print_scheduler_info
 ...
-fun:erl_exit
+fun:erts_exit
 fun:broken_halt_test
 fun:erts_debug_set_internal_state_2
 fun:process_main
diff --git a/erts/epmd/src/Makefile.in b/erts/epmd/src/Makefile.in
index b6e3ba7762..1266be44cb 100644
--- a/erts/epmd/src/Makefile.in
+++ b/erts/epmd/src/Makefile.in
@@ -19,10 +19,6 @@
 #
 include $(ERL_TOP)/make/target.mk
 
-ifeq ($(findstring ose,$(TARGET)),ose)
-include $(ERL_TOP)/make/$(TARGET)/ose_lm.mk
-endif
-
 ifeq ($(TYPE),debug)
 PURIFY     =
 TYPEMARKER = .debug
@@ -32,21 +28,13 @@ else
 ifeq ($(TYPE),purify)
 PURIFY     = purify
 TYPEMARKER =
-ifeq ($(findstring ose,$(TARGET)),ose)
-  TYPE_FLAGS = -DPURIFY
-else
-  TYPE_FLAGS = -O2 -DPURIFY
-endif
+TYPE_FLAGS = -O2 -DPURIFY
 else
 
 override TYPE = opt
 PURIFY     =
 TYPEMARKER =
-ifeq ($(findstring ose,$(TARGET)),ose)
-  TYPE_FLAGS =
-else
-  TYPE_FLAGS = -O2
-endif
+TYPE_FLAGS = -O2
 endif
 endif
 
@@ -68,13 +56,9 @@ else
 ifeq ($(findstring vxworks,$(TARGET)),vxworks)
 ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
 else
-ifeq ($(findstring ose,$(TARGET)),ose)
-ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@
-else
 ERTS_INTERNAL_LIBS=-L../../lib/internal/$(TARGET) -lerts_internal$(ERTS_LIB_TYPEMARKER) @ERTS_INTERNAL_X_LIBS@ -lm
 endif
 endif
-endif
 
 ERTS_LIB = $(ERL_TOP)/erts/lib_src/obj/$(TARGET)/$(TYPE)/MADE
 
@@ -82,11 +66,7 @@ CC      = @CC@
 WFLAGS  = @WFLAGS@
 CFLAGS  = @CFLAGS@ @DEFS@ $(TYPE_FLAGS) $(WFLAGS) $(ERTS_INCL)
 LD      = @LD@
-ifeq ($(findstring ose,$(TARGET)),ose)
-LIBS    = $(ERTS_INTERNAL_LIBS) @LIBS@
-else
 LIBS    = @LIBS@ @SYSTEMD_DAEMON_LIBS@ $(ERTS_INTERNAL_LIBS)
-endif
 LDFLAGS = @LDFLAGS@
 
 
@@ -135,25 +115,12 @@ clean:
 	rm -f *.o
 	rm -f *~ core
 
-ifeq ($(findstring ose,$(TARGET)),ose)
-$(OBJDIR)/ose_confd.o: $(OSE_CONFD)
-	$(V_CC) $(CFLAGS) -o $@ -c $<
-$(OBJDIR)/crt0_lm.o: $(CRT0_LM)
-	$(V_CC) $(CFLAGS) -o $@ -c $<
-OSE_LM_OBJS += $(OBJDIR)/ose_confd.o $(OBJDIR)/crt0_lm.o
-endif
-
 #
 # Objects & executables
 #
 
-ifeq ($(findstring ose,$(TARGET)),ose)
-$(BINDIR)/$(EPMD): $(EPMD_OBJS) $(ERTS_LIB) $(OSE_LM_OBJS)
-	$(call build-ose-load-module, $@, $(EPMD_OBJS) $(OSE_LM_OBJS), $(LIBS), $(EPMD_LMCONF))
-else
 $(BINDIR)/$(EPMD): $(EPMD_OBJS) $(ERTS_LIB)
 	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(EPMD_OBJS) $(LIBS)
-endif
 
 $(OBJDIR)/%.o: %.c epmd.h epmd_int.h
 	$(V_CC) $(CFLAGS) $(EPMD_FLAGS) -o $@ -c $<
diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
index 63ec18d939..324ae6ac40 100644
--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
@@ -343,7 +343,7 @@ static void run_daemon(EpmdVars *g)
     for (fd = 0; fd < g->max_conn ; fd++) /* close all files ... */
         close(fd);
     /* Syslog on linux will try to write to whatever if we dont
-       inform it of that the log is closed. */
+       inform it that the log is closed. */
     closelog();
 
     /* These shouldn't be needed but for safety... */
@@ -397,7 +397,7 @@ static void run_daemon(EpmdVars *g)
 }
 #endif
 
-#if defined(VXWORKS) || defined(__OSE__)
+#if defined(VXWORKS)
 static void run_daemon(EpmdVars *g)
 {
     run(g);
diff --git a/erts/epmd/src/epmd_cli.c b/erts/epmd/src/epmd_cli.c
index a8fe865d9a..6fc05e153e 100644
--- a/erts/epmd/src/epmd_cli.c
+++ b/erts/epmd/src/epmd_cli.c
@@ -136,19 +136,33 @@ void epmd_call(EpmdVars *g,int what)
 static int conn_to_epmd(EpmdVars *g)
 {
     struct EPMD_SOCKADDR_IN address;
+    size_t salen = 0;
     int connect_sock;
-    
-    connect_sock = socket(FAMILY, SOCK_STREAM, 0);
-    if (connect_sock<0)
-	goto error;
+    unsigned short sport = g->port;
+
+#if defined(EPMD6)
+    SET_ADDR6(address, in6addr_loopback, sport);
+    salen = sizeof(struct sockaddr_in6);
+
+    connect_sock = socket(AF_INET6, SOCK_STREAM, 0);
+    if (connect_sock>=0) {
+
+    if (connect(connect_sock, (struct sockaddr*)&address, salen) == 0)
+	return connect_sock;
 
-    { /* store port number in unsigned short */
-      unsigned short sport = g->port;
-      SET_ADDR(address, EPMD_ADDR_LOOPBACK, sport);
+    close(connect_sock);
     }
+#endif
+    SET_ADDR(address, htonl(INADDR_LOOPBACK), sport);
+    salen = sizeof(struct sockaddr_in);
 
-    if (connect(connect_sock, (struct sockaddr*)&address, sizeof address) < 0) 
+    connect_sock = socket(AF_INET, SOCK_STREAM, 0);
+    if (connect_sock<0)
 	goto error;
+
+    if (connect(connect_sock, (struct sockaddr*)&address, salen) < 0)
+	goto error;
+
     return connect_sock;
 
  error:
diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h
index 26100afc93..e127eff097 100644
--- a/erts/epmd/src/epmd_int.h
+++ b/erts/epmd/src/epmd_int.h
@@ -37,13 +37,6 @@
 #define DONT_USE_MAIN
 #endif
 
-#ifdef __OSE__
-#  define NO_DAEMON
-#  define NO_SYSLOG
-#  define NO_SYSCONF
-#  define NO_FCNTL
-#endif
-
 /* ************************************************************************ */
 /* Standard includes                                                        */
 
@@ -55,6 +48,7 @@
 #  ifndef WINDOWS_H_INCLUDES_WINSOCK2_H
 #    include <winsock2.h>
 #  endif
+#  include <ws2tcpip.h>
 #  include <windows.h>
 #  include <process.h>
 #endif
@@ -100,12 +94,7 @@
 #endif /* ! WIN32 */
 
 #include <ctype.h>
-
-#if !defined(__OSE__)
-#  include <signal.h>
-#endif
-
-
+#include <signal.h>
 #include <errno.h>
 
 #ifdef HAVE_SYSLOG_H
@@ -122,14 +111,14 @@
 
 #include <stdarg.h>
 
-#ifdef __OSE__
-#  include "sys/select.h"
-#endif
-
 #ifdef HAVE_SYSTEMD_DAEMON
 #  include <systemd/sd-daemon.h>
 #endif /* HAVE_SYSTEMD_DAEMON */
 
+#if defined(HAVE_IN6) && defined(AF_INET6) && defined(HAVE_INET_PTON)
+#  define EPMD6
+#endif
+
 /* ************************************************************************ */
 /* Replace some functions by others by making the function name a macro */
 
@@ -183,33 +172,53 @@
 /* ************************************************************************ */
 /* Macros that let us use IPv6                                              */
 
-#if defined(HAVE_IN6) && defined(AF_INET6) && defined(EPMD6)
+#if HAVE_IN6
+#  if ! defined(HAVE_IN6ADDR_ANY) || ! HAVE_IN6ADDR_ANY
+#    if HAVE_DECL_IN6ADDR_ANY_INIT
+static const struct in6_addr in6addr_any = { { IN6ADDR_ANY_INIT } };
+#    else
+static const struct in6_addr in6addr_any =
+    { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
+#    endif /* HAVE_IN6ADDR_ANY_INIT */
+#  endif /* ! HAVE_DECL_IN6ADDR_ANY */
+
+#  if ! defined(HAVE_IN6ADDR_LOOPBACK) || ! HAVE_IN6ADDR_LOOPBACK
+#    if HAVE_DECL_IN6ADDR_LOOPBACK_INIT
+static const struct in6_addr in6addr_loopback =
+    { { IN6ADDR_LOOPBACK_INIT } };
+#    else
+static const struct in6_addr in6addr_loopback =
+    { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } };
+#    endif /* HAVE_IN6ADDR_LOOPBACK_INIT */
+#  endif /* ! HAVE_DECL_IN6ADDR_LOOPBACK */
+#endif /* HAVE_IN6 */
+
+#define IS_ADDR_LOOPBACK(addr) ((addr).s_addr == htonl(INADDR_LOOPBACK))
 
-#define EPMD_SOCKADDR_IN sockaddr_in6
-#define EPMD_IN_ADDR in6_addr
-#define EPMD_S_ADDR s6_addr
-#define EPMD_ADDR_LOOPBACK in6addr_loopback.s6_addr
-#define EPMD_ADDR_ANY in6addr_any.s6_addr
+#if defined(EPMD6)
+
+#define EPMD_SOCKADDR_IN sockaddr_storage
 #define FAMILY AF_INET6
 
-#define SET_ADDR(dst, addr, port) do { \
-    memset((char*)&(dst), 0, sizeof(dst)); \
-    memcpy((char*)&(dst).sin6_addr.s6_addr, (char*)&(addr), 16); \
-    (dst).sin6_family = AF_INET6; \
-    (dst).sin6_flowinfo = 0; \
-    (dst).sin6_port = htons(port); \
+#define SET_ADDR6(dst, addr, port) do { \
+    struct sockaddr_in6 *sa = (struct sockaddr_in6 *)&(dst); \
+    memset(sa, 0, sizeof(dst)); \
+    sa->sin6_family = AF_INET6; \
+    sa->sin6_addr = (addr); \
+    sa->sin6_port = htons(port); \
  } while(0)
 
-#define IS_ADDR_LOOPBACK(addr) \
-    (memcmp((addr).s6_addr, in6addr_loopback.s6_addr, 16) == 0)
+#define SET_ADDR(dst, addr, port) do { \
+    struct sockaddr_in *sa = (struct sockaddr_in *)&(dst); \
+    memset(sa, 0, sizeof(dst)); \
+    sa->sin_family = AF_INET; \
+    sa->sin_addr.s_addr = (addr); \
+    sa->sin_port = htons(port); \
+ } while(0)
 
 #else /* Not IP v6 */
 
 #define EPMD_SOCKADDR_IN sockaddr_in
-#define EPMD_IN_ADDR in_addr
-#define EPMD_S_ADDR s_addr
-#define EPMD_ADDR_LOOPBACK htonl(INADDR_LOOPBACK)
-#define EPMD_ADDR_ANY htonl(INADDR_ANY)
 #define FAMILY AF_INET
 
 #define SET_ADDR(dst, addr, port) do { \
@@ -219,8 +228,6 @@
     (dst).sin_port = htons(port); \
  } while(0)
 
-#define IS_ADDR_LOOPBACK(addr) ((addr).s_addr == htonl(INADDR_LOOPBACK))
-
 #endif /* Not IP v6 */
 
 /* ************************************************************************ */
diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
index 5b58554590..75a33f28cb 100644
--- a/erts/epmd/src/epmd_srv.c
+++ b/erts/epmd/src/epmd_srv.c
@@ -30,11 +30,6 @@
 #  define INADDR_NONE 0xffffffff
 #endif
 
-#if defined(__OSE__)
-#  include "sys/ioctl.h"
-#  define sleep(x) delay(x*1000)
-#endif
-
 /*
  *  
  *  This server is a local name server for Erlang nodes. Erlang nodes can
@@ -76,6 +71,7 @@ static time_t current_time(EpmdVars*);
 
 static Connection *conn_init(EpmdVars*);
 static int conn_open(EpmdVars*,int);
+static int conn_local_peer_check(EpmdVars*, int);
 static int conn_close_fd(EpmdVars*,int);
 
 static void node_init(EpmdVars*);
@@ -206,10 +202,11 @@ void run(EpmdVars *g)
 {
   struct EPMD_SOCKADDR_IN iserv_addr[MAX_LISTEN_SOCKETS];
   int listensock[MAX_LISTEN_SOCKETS];
-  int num_sockets;
+  int num_sockets = 0;
   int i;
   int opt;
   unsigned short sport = g->port;
+  int bound = 0;
 
   node_init(g);
   g->conn = conn_init(g);
@@ -252,70 +249,88 @@ void run(EpmdVars *g)
   if (g->addresses != NULL && /* String contains non-separator characters if: */
       g->addresses[strspn(g->addresses," ,")] != '\000')
     {
-      char *tmp;
-      char *token;
-      int loopback_ok = 0;
+      char *tmp = NULL;
+      char *token = NULL;
+
+      /* Always listen on the loopback. */
+      SET_ADDR(iserv_addr[num_sockets],htonl(INADDR_LOOPBACK),sport);
+      num_sockets++;
+#if defined(EPMD6)
+      SET_ADDR6(iserv_addr[num_sockets],in6addr_loopback,sport);
+      num_sockets++;
+#endif
 
-      if ((tmp = (char *)malloc(strlen(g->addresses) + 1)) == NULL)
+	  if ((tmp = strdup(g->addresses)) == NULL)
 	{
 	  dbg_perror(g,"cannot allocate memory");
 	  epmd_cleanup_exit(g,1);
 	}
-      strcpy(tmp,g->addresses);
 
-      for(token = strtok(tmp,", "), num_sockets = 0;
+      for(token = strtok(tmp,", ");
 	  token != NULL;
-	  token = strtok(NULL,", "), num_sockets++)
+	  token = strtok(NULL,", "))
 	{
-	  struct EPMD_IN_ADDR addr;
-#ifdef HAVE_INET_PTON
-	  int ret;
+	  struct in_addr addr;
+#if defined(EPMD6)
+	  struct in6_addr addr6;
+	  struct sockaddr_storage *sa = &iserv_addr[num_sockets];
 
-	  if ((ret = inet_pton(FAMILY,token,&addr)) == -1)
+	  if (inet_pton(AF_INET6,token,&addr6) == 1)
 	    {
-	      dbg_perror(g,"cannot convert IP address to network format");
-	      epmd_cleanup_exit(g,1);
+	      SET_ADDR6(iserv_addr[num_sockets],addr6,sport);
+	    }
+	  else if (inet_pton(AF_INET,token,&addr) == 1)
+	    {
+	      SET_ADDR(iserv_addr[num_sockets],addr.s_addr,sport);
+	    }
+	  else
+#else
+	  if ((addr.s_addr = inet_addr(token)) != INADDR_NONE)
+	    {
+	      SET_ADDR(iserv_addr[num_sockets],addr.s_addr,sport);
 	    }
-	  else if (ret == 0)
-#elif !defined(EPMD6)
-	  if ((addr.EPMD_S_ADDR = inet_addr(token)) == INADDR_NONE)
+	  else
 #endif
 	    {
 	      dbg_tty_printf(g,0,"cannot parse IP address \"%s\"",token);
 	      epmd_cleanup_exit(g,1);
 	    }
 
+#if defined(EPMD6)
+	  if (sa->ss_family == AF_INET6 && IN6_IS_ADDR_LOOPBACK(&addr6))
+	      continue;
+
+	  if (sa->ss_family == AF_INET)
+#endif
 	  if (IS_ADDR_LOOPBACK(addr))
-	    loopback_ok = 1;
+	    continue;
+
+	  num_sockets++;
 
-	  if (num_sockets - loopback_ok == MAX_LISTEN_SOCKETS - 1)
+	  if (num_sockets >= MAX_LISTEN_SOCKETS)
 	    {
 	      dbg_tty_printf(g,0,"cannot listen on more than %d IP addresses",
 			     MAX_LISTEN_SOCKETS);
 	      epmd_cleanup_exit(g,1);
 	    }
-
-	  SET_ADDR(iserv_addr[num_sockets],addr.EPMD_S_ADDR,sport);
 	}
 
       free(tmp);
-
-      if (!loopback_ok)
-	{
-	  SET_ADDR(iserv_addr[num_sockets],EPMD_ADDR_LOOPBACK,sport);
-	  num_sockets++;
-	}
     }
   else
     {
-      SET_ADDR(iserv_addr[0],EPMD_ADDR_ANY,sport);
-      num_sockets = 1;
+      SET_ADDR(iserv_addr[num_sockets],htonl(INADDR_ANY),sport);
+      num_sockets++;
+#if defined(EPMD6)
+      SET_ADDR6(iserv_addr[num_sockets],in6addr_any,sport);
+      num_sockets++;
+#endif
     }
 #ifdef HAVE_SYSTEMD_DAEMON
     }
 #endif /* HAVE_SYSTEMD_DAEMON */
 
-#if !defined(__WIN32__) && !defined(__OSE__)
+#if !defined(__WIN32__)
   /* We ignore the SIGPIPE signal that is raised when we call write
      twice on a socket closed by the other end. */
   signal(SIGPIPE, SIG_IGN);
@@ -340,13 +355,39 @@ void run(EpmdVars *g)
 #endif /* HAVE_SYSTEMD_DAEMON */
   for (i = 0; i < num_sockets; i++)
     {
-      if ((listensock[i] = socket(FAMILY,SOCK_STREAM,0)) < 0)
+      struct sockaddr *sa = (struct sockaddr *)&iserv_addr[i];
+#if defined(EPMD6)
+      size_t salen = (sa->sa_family == AF_INET6 ?
+              sizeof(struct sockaddr_in6) :
+              sizeof(struct sockaddr_in));
+#else
+      size_t salen = sizeof(struct sockaddr_in);
+#endif
+
+      if ((listensock[i] = socket(sa->sa_family,SOCK_STREAM,0)) < 0)
 	{
-	  dbg_perror(g,"error opening stream socket");
+	  switch (errno) {
+	      case EAFNOSUPPORT:
+	      case EPROTONOSUPPORT:
+	          continue;
+	      default:
+	          dbg_perror(g,"error opening stream socket");
+	          epmd_cleanup_exit(g,1);
+	  }
+	}
+      g->listenfd[bound++] = listensock[i];
+
+#if HAVE_DECL_IPV6_V6ONLY
+      opt = 1;
+      if (sa->sa_family == AF_INET6 &&
+          setsockopt(listensock[i],IPPROTO_IPV6,IPV6_V6ONLY,&opt,
+              sizeof(opt)) <0)
+	{
+	  dbg_perror(g,"can't set IPv6 only socket option");
 	  epmd_cleanup_exit(g,1);
 	}
-      g->listenfd[i] = listensock[i];
-  
+#endif
+
       /*
        * Note that we must not enable the SO_REUSEADDR on Windows,
        * because addresses will be reused even if they are still in use.
@@ -378,8 +419,7 @@ void run(EpmdVars *g)
 	dbg_perror(g,"failed to set non-blocking mode of listening socket %d",
 		   listensock[i]);
 
-      if (bind(listensock[i], (struct sockaddr*) &iserv_addr[i],
-	  sizeof(iserv_addr[i])) < 0)
+      if (bind(listensock[i], (struct sockaddr*) &iserv_addr[i], salen) < 0)
 	{
 	  if (errno == EADDRINUSE)
 	    {
@@ -400,6 +440,11 @@ void run(EpmdVars *g)
       }
       select_fd_set(g, listensock[i]);
     }
+  if (bound == 0) {
+      dbg_perror(g,"unable to bind any address");
+      epmd_cleanup_exit(g,1);
+  }
+  num_sockets = bound;
 #ifdef HAVE_SYSTEMD_DAEMON
     }
     sd_notifyf(0, "READY=1\n"
@@ -444,8 +489,8 @@ void run(EpmdVars *g)
 	}
 
 	for (i = 0; i < num_sockets; i++)
-	  if (FD_ISSET(listensock[i],&read_mask)) {
-	    if (do_accept(g, listensock[i]) && g->active_conn < g->max_conn) {
+	  if (FD_ISSET(g->listenfd[i],&read_mask)) {
+	    if (do_accept(g, g->listenfd[i]) && g->active_conn < g->max_conn) {
 	      /*
 	       * The accept() succeeded, and we have at least one file
 	       * descriptor still free, which means that another accept()
@@ -702,6 +747,7 @@ static void do_request(g, fd, s, buf, bsize)
   
 	if (reply(g, fd, wbuf, 4) != 4)
 	  {
+            node_unreg(g, name);
 	    dbg_tty_printf(g,1,"** failed to send ALIVE2_RESP for \"%s\"",
 			   name);
 	    return;
@@ -1004,15 +1050,6 @@ static int conn_open(EpmdVars *g,int fd)
 
   for (i = 0; i < g->max_conn; i++) {
     if (g->conn[i].open == EPMD_FALSE) {
-      struct sockaddr_in si;
-      struct sockaddr_in di;
-#ifdef HAVE_SOCKLEN_T
-      socklen_t st;
-#else
-      int st;
-#endif
-      st = sizeof(si);
-
       g->active_conn++;
       s = &g->conn[i];
      
@@ -1023,20 +1060,7 @@ static int conn_open(EpmdVars *g,int fd)
       s->open = EPMD_TRUE;
       s->keep = EPMD_FALSE;
 
-      /* Determine if connection is from localhost */
-      if (getpeername(s->fd,(struct sockaddr*) &si,&st) ||
-	  st < sizeof(si)) {
-	  /* Failure to get peername is regarded as non local host */
-	  s->local_peer = EPMD_FALSE;
-      } else {
-	  /* Only 127.x.x.x and connections from the host's IP address
-	     allowed, no false positives */
-	  s->local_peer =
-	      (((((unsigned) ntohl(si.sin_addr.s_addr)) & 0xFF000000U) ==
-	       0x7F000000U) ||
-	       (getsockname(s->fd,(struct sockaddr*) &di,&st) ?
-	       EPMD_FALSE : si.sin_addr.s_addr == di.sin_addr.s_addr));
-      }
+      s->local_peer = conn_local_peer_check(g, s->fd);
       dbg_tty_printf(g,2,(s->local_peer) ? "Local peer connected" :
 		     "Non-local peer connected");
 
@@ -1044,7 +1068,7 @@ static int conn_open(EpmdVars *g,int fd)
       s->got  = 0;
       s->mod_time = current_time(g); /* Note activity */
 
-      s->buf = (char *)malloc(INBUF_SIZE);
+      s->buf = malloc(INBUF_SIZE);
 
       if (s->buf == NULL) {
 	dbg_printf(g,0,"epmd: Insufficient memory");
@@ -1062,6 +1086,60 @@ static int conn_open(EpmdVars *g,int fd)
   return EPMD_FALSE;
 }
 
+static int conn_local_peer_check(EpmdVars *g, int fd)
+{
+  struct EPMD_SOCKADDR_IN si;
+  struct EPMD_SOCKADDR_IN di;
+
+  struct sockaddr_in *si4 = (struct sockaddr_in *)&si;
+  struct sockaddr_in *di4 = (struct sockaddr_in *)&di;
+
+#if defined(EPMD6)
+  struct sockaddr_in6 *si6 = (struct sockaddr_in6 *)&si;
+  struct sockaddr_in6 *di6 = (struct sockaddr_in6 *)&di;
+#endif
+
+#ifdef HAVE_SOCKLEN_T
+  socklen_t st;
+#else
+  int st;
+#endif
+
+  st = sizeof(si);
+
+  /* Determine if connection is from localhost */
+  if (getpeername(fd,(struct sockaddr*) &si,&st) ||
+	  st > sizeof(si)) {
+	  /* Failure to get peername is regarded as non local host */
+	  return EPMD_FALSE;
+  }
+
+  /* Only 127.x.x.x and connections from the host's IP address
+	 allowed, no false positives */
+#if defined(EPMD6)
+  if (si.ss_family == AF_INET6 && IN6_IS_ADDR_LOOPBACK(&(si6->sin6_addr)))
+	  return EPMD_TRUE;
+
+  if (si.ss_family == AF_INET)
+#endif
+  if ((((unsigned) ntohl(si4->sin_addr.s_addr)) & 0xFF000000U) ==
+	  0x7F000000U)
+	  return EPMD_TRUE;
+
+  if (getsockname(fd,(struct sockaddr*) &di,&st))
+	  return EPMD_FALSE;
+
+#if defined(EPMD6)
+  if (si.ss_family == AF_INET6)
+      return IN6_ARE_ADDR_EQUAL( &(si6->sin6_addr), &(di6->sin6_addr));
+  if (si.ss_family == AF_INET)
+#endif
+  return si4->sin_addr.s_addr == di4->sin_addr.s_addr;
+#if defined(EPMD6)
+  return EPMD_FALSE;
+#endif
+}
+
 static int conn_close_fd(EpmdVars *g,int fd)
 {
   int i;
diff --git a/erts/epmd/test/epmd_SUITE.erl b/erts/epmd/test/epmd_SUITE.erl
index e8bbfdbb18..44d3c5a880 100644
--- a/erts/epmd/test/epmd_SUITE.erl
+++ b/erts/epmd/test/epmd_SUITE.erl
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 %%
 -module(epmd_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
 
@@ -43,6 +43,7 @@
 -export(
    [
     register_name/1,
+    register_name_ipv6/1,
     register_names_1/1,
     register_names_2/1,
     register_duplicate_name/1,
@@ -76,7 +77,9 @@
     buffer_overrun_2/1,
     no_nonlocal_register/1,
     no_nonlocal_kill/1,
-    no_live_killing/1
+    no_live_killing/1,
+
+    socket_reset_before_alive2_reply_is_written/1
    ]).
 
 
@@ -111,7 +114,8 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [register_name, register_names_1, register_names_2,
+    [register_name, register_name_ipv6,
+     register_names_1, register_names_2,
      register_duplicate_name, unicode_name, long_unicode_name,
      get_port_nr, slow_get_port_nr,
      unregister_others_name_1, unregister_others_name_2,
@@ -123,7 +127,8 @@ all() ->
      returns_valid_populated_extra_with_nulls,
      names_stdout,
      {group, buffer_overrun}, no_nonlocal_register,
-     no_nonlocal_kill, no_live_killing].
+     no_nonlocal_kill, no_live_killing,
+     socket_reset_before_alive2_reply_is_written].
 
 groups() -> 
     [{buffer_overrun, [],
@@ -169,6 +174,24 @@ register_name(Config) when is_list(Config) ->
     ?line ok = close(Sock),			% Unregister
     ok.
 
+register_name_ipv6(doc) ->
+    ["Register a name over IPv6"];
+register_name_ipv6(suite) ->
+    [];
+register_name_ipv6(Config) when is_list(Config) ->
+    % Test if the host has an IPv6 loopback address
+    Res = gen_tcp:listen(0, [inet6, {ip, {0,0,0,0,0,0,0,1}}]),
+    case Res of
+    {ok,LSock} ->
+	    gen_tcp:close(LSock),
+	    ?line ok = epmdrun(),
+	    ?line {ok,Sock} = register_node6("foobar6"),
+	    ?line ok = close(Sock),         % Unregister
+	    ok;
+    _Error ->
+	    {skip, "Host does not have an IPv6 loopback address"}
+    end.
+
 register_names_1(doc) ->
     ["Register and unregister two nodes"];
 register_names_1(suite) ->
@@ -242,13 +265,14 @@ register_node(Name) ->
 register_node(Name,Port) ->
     register_node_v2(Port,$M,0,5,5,Name,"").
 
+register_node6(Name) ->
+    register_node_v2({0,0,0,0,0,0,0,1},?DUMMY_PORT,$M,0,5,5,Name,"").
+
 register_node_v2(Port, NodeType, Prot, HVsn, LVsn, Name, Extra) ->
-    Utf8Name = unicode:characters_to_binary(Name),
-    Req = [?EPMD_ALIVE2_REQ, put16(Port), NodeType, Prot,
-	   put16(HVsn), put16(LVsn),
-	   put16(size(Utf8Name)), binary_to_list(Utf8Name),
-	   size16(Extra), Extra],
-    case send_req(Req) of
+    register_node_v2("localhost", Port, NodeType, Prot, HVsn, LVsn, Name, Extra).
+register_node_v2(Addr, Port, NodeType, Prot, HVsn, LVsn, Name, Extra) ->
+    Req = alive2_req(Port, NodeType, Prot, HVsn, LVsn, Name, Extra),
+    case send_req(Req, Addr) of
 	{ok,Sock} ->
 	    case recv(Sock,4) of
 		{ok, [?EPMD_ALIVE2_RESP,_Res=0,_C0,_C1]} ->
@@ -938,6 +962,42 @@ no_live_killing(Config) when is_list(Config) ->
     ?line close(Sock3),
     ok.
 
+socket_reset_before_alive2_reply_is_written(doc) ->
+    ["Check for regression - don't make zombie from node which "
+     "sends TCP RST at wrong time"];
+socket_reset_before_alive2_reply_is_written(suite) ->
+    [];
+socket_reset_before_alive2_reply_is_written(Config) when is_list(Config) ->
+    %% - delay_write for easier triggering of race condition
+    %% - relaxed_command_check for gracefull shutdown of epmd even if there
+    %%   is stuck node.
+    ?line ok = epmdrun("-delay_write 1 -relaxed_command_check"),
+
+    %% We can't use send_req/1 directly as we want to do inet:setopts/2
+    %% on our socket.
+    ?line {ok, Sock} = connect(),
+
+    %% Issuing close/1 on such socket will result in immediate RST packet.
+    ?line ok = inet:setopts(Sock, [{linger, {true, 0}}]),
+
+    Req = alive2_req(4711, 77, 0, 5, 5, "test", []),
+    ?line ok = send(Sock, [size16(Req), Req]),
+
+    timer:sleep(500), %% Wait for the first 1/2 of delay_write before closing
+    ?line ok = close(Sock),
+
+    timer:sleep(500 + ?SHORT_PAUSE), %% Wait for the other 1/2 of delay_write
+
+    %% Wait another delay_write interval, due to delay doubling in epmd.
+    %% Should be removed when this is issue is fixed there.
+    timer:sleep(1000),
+
+    ?line {ok, SockForNames} = connect_active(),
+
+    %% And there should be no stuck nodes
+    ?line {ok, []} = do_get_names(SockForNames),
+    ?line ok = close(SockForNames),
+    ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Terminate all tests with killing epmd.
@@ -1151,7 +1211,9 @@ send_direct(Sock, Bytes) ->
     end.
 
 send_req(Req) ->
-    case connect() of
+    send_req(Req, "localhost").
+send_req(Req, Addr) ->
+    case connect(Addr) of
 	{ok,Sock} ->
 	    case send(Sock, [size16(Req), Req]) of
 		ok ->
@@ -1200,3 +1262,12 @@ flat_count([_|T], N) ->
     flat_count(T, N);
 flat_count([], N) -> N.
     
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+alive2_req(Port, NodeType, Prot, HVsn, LVsn, Name, Extra) ->
+    Utf8Name = unicode:characters_to_binary(Name),
+    [?EPMD_ALIVE2_REQ, put16(Port), NodeType, Prot,
+     put16(HVsn), put16(LVsn),
+     put16(size(Utf8Name)), binary_to_list(Utf8Name),
+     size16(Extra), Extra].
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index 8e55fa78c9..05d925f19f 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -21,10 +21,6 @@
 include $(ERL_TOP)/make/output.mk
 include $(ERL_TOP)/make/target.mk
 
-ifeq ($(findstring ose,$(TARGET)),ose)
-include $(ERL_TOP)/make/$(TARGET)/ose_lm.mk
-endif
-
 ERTS_LIB_TYPEMARKER=.$(TYPE)
 
 USING_MINGW=@MIXED_CYGWIN_MINGW@
@@ -85,18 +81,13 @@ EMUOSDIR  = $(ERL_TOP)/erts/emulator/@ERLANG_OSTYPE@
 SYSDIR    = $(ERL_TOP)/erts/emulator/sys/@ERLANG_OSTYPE@
 DRVDIR    = $(ERL_TOP)/erts/emulator/drivers/@ERLANG_OSTYPE@
 UXETC     = ../unix
-OSEETC	  = ../ose
 WINETC	  = ../win32
 
 ifeq ($(TARGET), win32)
 ETC       = $(WINETC)
 else
-ifeq ($(findstring ose,$(TARGET)),ose)
-ETC       = $(OSEETC)
-else
 ETC       = $(UXETC)
 endif
-endif
 
 ifeq ($(TARGET), win32)
 ERLEXEC = erlexec.dll
@@ -180,25 +171,6 @@ PORT_ENTRY_POINT=erl_port_entry
 ENTRY_LDFLAGS=-entry:$(PORT_ENTRY_POINT)
 
 else
-ifeq ($(findstring ose,$(TARGET)),ose)
-ENTRY_LDFLAGS=
-ENTRY_OBJ=
-ERLSRV_OBJECTS=
-MC_OUTPUTS=
-INET_GETHOST =
-INSTALL_EMBEDDED_PROGS = $(BINDIR)/run_erl_lm
-INSTALL_EMBEDDED_DATA =
-INSTALL_TOP = Install
-INSTALL_TOP_BIN =
-INSTALL_MISC =
-INSTALL_SRC =
-ERLEXECDIR = .
-INSTALL_LIBS =
-INSTALL_OBJS =
-INSTALL_INCLUDES =
-TEXTFILES = Install erl.src
-INSTALL_PROGS = $(INSTALL_EMBEDDED_PROGS)
-else # UNIX (!win32 && !ose)
 ENTRY_LDFLAGS=
 ENTRY_OBJ=
 ERLSRV_OBJECTS= 
@@ -223,7 +195,6 @@ INSTALL_PROGS =              \
 	$(BINDIR)/$(ERLEXEC) \
 	$(INSTALL_EMBEDDED_PROGS)
 endif
-endif
 
 .PHONY: etc
 etc:	$(ENTRY_OBJ) $(INSTALL_PROGS) $(INSTALL_LIBS) $(TEXTFILES) $(INSTALL_TOP_BIN)
@@ -269,8 +240,8 @@ endif
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/to_erl.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/dyn_erl.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/safe_string.o
-	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/run_erl_common.o
-	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/to_erl_common.o
+	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/run_erl.o
+	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/to_erl.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/typer.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/ct_run.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/vxcall.o
@@ -423,28 +394,24 @@ $(BINDIR)/inet_gethost@EXEEXT@: $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(ERTS_LIB
 	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
 # run_erl
-$(BINDIR)/run_erl: $(OBJDIR)/safe_string.o $(OBJDIR)/run_erl.o $(OBJDIR)/run_erl_common.o
-	$(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-$(OBJDIR)/run_erl.o: $(ETC)/run_erl.c ../common/run_erl_common.h $(RC_GENERATED)
-	$(V_CC) $(CFLAGS) -I ../common/ -o $@ -c $(ETC)/run_erl.c
-$(OBJDIR)/run_erl_common.o: ../common/run_erl_common.c ../common/run_erl_common.h $(RC_GENERATED)
-	$(V_CC) $(CFLAGS) -o $@ -c $<
+$(BINDIR)/run_erl: $(OBJDIR)/safe_string.o $(OBJDIR)/run_erl.o
+	$(V_LD) $(LDFLAGS) -o $@ $(OBJDIR)/safe_string.o $(OBJDIR)/run_erl.o $(LIBS)
+$(OBJDIR)/run_erl.o: $(ETC)/run_erl.c $(RC_GENERATED)
+	$(V_CC) $(CFLAGS) -o $@ -c $(ETC)/run_erl.c
 
 # to_erl
-$(BINDIR)/to_erl: $(OBJDIR)/safe_string.o $(OBJDIR)/to_erl.o $(OBJDIR)/to_erl_common.o
-	$(V_LD) $(LDFLAGS) -o $@  $^
-$(OBJDIR)/to_erl.o: $(ETC)/to_erl.c ../common/safe_string.h $(RC_GENERATED)
-	$(V_CC) $(CFLAGS) -I ../common/ -o $@ -c $(ETC)/to_erl.c
-$(OBJDIR)/to_erl_common.o: ../common/to_erl_common.c ../common/to_erl_common.h $(RC_GENERATED)
-	$(V_CC) $(CFLAGS) -o $@ -c $<
+$(BINDIR)/to_erl: $(OBJDIR)/safe_string.o $(OBJDIR)/to_erl.o
+	$(V_LD) $(LDFLAGS) -o $@  $(OBJDIR)/safe_string.o $(OBJDIR)/to_erl.o
+$(OBJDIR)/to_erl.o: $(ETC)/to_erl.c $(RC_GENERATED)
+	$(V_CC) $(CFLAGS) -o $@ -c $(ETC)/to_erl.c
 
 # dyn_erl
 $(BINDIR)/dyn_erl: $(OBJDIR)/safe_string.o $(OBJDIR)/dyn_erl.o
 	$(V_LD) $(LDFLAGS) -o $@  $(OBJDIR)/safe_string.o $(OBJDIR)/dyn_erl.o
 $(OBJDIR)/dyn_erl.o: $(UXETC)/dyn_erl.c $(RC_GENERATED)
 	$(V_CC) $(CFLAGS) -o $@ -c $(UXETC)/dyn_erl.c
-$(OBJDIR)/safe_string.o: ../common/safe_string.c $(RC_GENERATED)
-	$(V_CC) $(CFLAGS) -o $@ -c ../common/safe_string.c
+$(OBJDIR)/safe_string.o: $(ETC)/safe_string.c $(RC_GENERATED)
+	$(V_CC) $(CFLAGS) -o $@ -c $(ETC)/safe_string.c
 
 ifneq ($(TARGET),win32)
 $(BINDIR)/$(ERLEXEC): $(OBJDIR)/$(ERLEXEC).o $(ERTS_LIB)
@@ -499,30 +466,6 @@ erl.src: $(UXETC)/erl.src.src ../../vsn.mk $(TARGET)/Makefile
             -e 's;%VSN%;$(VSN);' \
                   $(UXETC)/erl.src.src > erl.src
 
-#---------------------------------------------------------
-# OSE specific targets
-#---------------------------------------------------------
-ifeq ($(findstring ose,$(TARGET)),ose)
-$(OBJDIR)/ose_confd.o: $(OSE_CONFD)
-	$(V_CC) $(CFLAGS) -o $@ -c $<
-$(OBJDIR)/crt0_lm.o: $(CRT0_LM)
-	$(V_CC) $(CFLAGS) -o $@ -c $<
-OSE_LM_OBJS += $(OBJDIR)/ose_confd.o $(OBJDIR)/crt0_lm.o
-
-$(BINDIR)/run_erl_lm: $(OBJDIR)/run_erl_main.o $(OBJDIR)/safe_string.o $(OBJDIR)/run_erl.o $(OBJDIR)/run_erl_common.o $(OBJDIR)/to_erl_common.o $(OSE_LM_OBJS)
-	$(call build-ose-load-module, $@, $^, $(LIBS), $(RUN_ERL_LMCONF))
-
-
-$(OBJDIR)/run_erl_main.o: $(OSEETC)/run_erl_main.c $(OSEETC)/run_erl.h ../common/to_erl_common.h $(RC_GENERATED)
-	$(V_CC) $(CFLAGS) -I ../common/ -o $@ -c $(OSEETC)/run_erl_main.c
-
-endif
-
-#---------------------------------------------------------
-# End of ose specific targets.
-#---------------------------------------------------------
-
-
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
@@ -537,11 +480,9 @@ endif
 	$(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/bin"
 ifneq ($(TARGET), win32)
 ifneq ($(findstring vxworks,$(TARGET)), vxworks)
-ifneq ($(findstring ose,$(TARGET)), ose)
 	$(INSTALL_SCRIPT) erl.src "$(RELEASE_PATH)/erts-$(VSN)/bin"
 endif
 endif
-endif
 ifneq ($(INSTALL_PROGS),)
 	$(INSTALL_PROGRAM) $(INSTALL_PROGS) "$(RELEASE_PATH)/erts-$(VSN)/bin"
 endif
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index af1c198281..54da59e50d 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -65,6 +65,7 @@
 static const char plusM_au_allocs[]= {
     'u',	/* all alloc_util allocators */
     'B',	/* binary_alloc		*/
+    'I',	/* literal_alloc	*/
     'D',	/* std_alloc		*/
     'E',	/* ets_alloc		*/
     'F',	/* fix_alloc		*/
@@ -121,6 +122,7 @@ static char *plusM_other_switches[] = {
     "Ym",
     "Ytp",
     "Ytt",
+    "Iscs",
     NULL
 };
 
@@ -156,6 +158,12 @@ static char *plusr_val_switches[] = {
     NULL
 };
 
+/* +x arguments with values */
+static char *plusx_val_switches[] = {
+    "mqd",
+    NULL
+};
+
 /* +z arguments with values */
 static char *plusz_val_switches[] = {
     "dbbl",
@@ -976,6 +984,20 @@ int main(int argc, char **argv)
 		      add_Eargs(argv[i+1]);
 		      i++;
 		      break;
+		  case 'x':
+		      if (!is_one_of_strings(&argv[i][2], plusx_val_switches)) {
+			  goto the_default;
+		      } else {
+			  if (i+1 >= argc
+			      || argv[i+1][0] == '-'
+			      || argv[i+1][0] == '+')
+			      usage(argv[i]);
+			  argv[i][0] = '-';
+			  add_Eargs(argv[i]);
+			  add_Eargs(argv[i+1]);
+			  i++;
+		      }
+		      break;
 		  case 'z':
 		      if (!is_one_of_strings(&argv[i][2], plusz_val_switches)) {
 			  goto the_default;
@@ -1176,7 +1198,7 @@ usage_aux(void)
 	  "[+S NO_SCHEDULERS:NO_SCHEDULERS_ONLINE] "
 	  "[+SP PERCENTAGE_SCHEDULERS:PERCENTAGE_SCHEDULERS_ONLINE] "
 	  "[+T LEVEL] [+V] [+v] "
-	  "[+W<i|w|e>] [+z MISC_OPTION] [args ...]\n");
+	  "[+W<i|w|e>]  [+x DEFAULT_PROC_FLAGS] [+z MISC_OPTION] [args ...]\n");
   exit(1);
 }
 
diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c
index 9571b83ffd..1a826221fb 100644
--- a/erts/etc/common/heart.c
+++ b/erts/etc/common/heart.c
@@ -472,10 +472,6 @@ message_loop(erlin_fd, erlout_fd)
 			switch (mp->op) {
 			case HEART_BEAT:
 				timestamp(&last_received);
-#ifdef USE_WATCHDOG
-				/* reset the hardware watchdog timer */
-				wd_reset();
-#endif
 				break;
 			case SHUT_DOWN:
 				return R_SHUT_DOWN;
diff --git a/erts/etc/common/run_erl_common.c b/erts/etc/common/run_erl_common.c
deleted file mode 100644
index c03d5e3ae2..0000000000
--- a/erts/etc/common/run_erl_common.c
+++ /dev/null
@@ -1,696 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2014. 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%
- */
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
-#include <unistd.h>
-
-#ifdef __ANDROID__
-#  include <termios.h>
-#endif
-
-#ifdef HAVE_SYSLOG_H
-#  include <syslog.h>
-#endif
-
-#ifdef HAVE_SYS_IOCTL_H
-#  include <sys/ioctl.h>
-#endif
-
-#ifdef __OSE__
-#  include "ramlog.h"
-#endif
-
-#include "run_erl_common.h"
-#include "safe_string.h"
-
-#define DEFAULT_LOG_GENERATIONS 5
-#define LOG_MAX_GENERATIONS     1000      /* No more than 1000 log files */
-#define LOG_MIN_GENERATIONS     2         /* At least two to switch between */
-#define DEFAULT_LOG_MAXSIZE     100000
-#define LOG_MIN_MAXSIZE         1000      /* Smallast value for changing log file */
-#define LOG_STUBNAME            "erlang.log."
-#define LOG_PERM                0664
-#define DEFAULT_LOG_ACTIVITY_MINUTES    5
-#define DEFAULT_LOG_ALIVE_MINUTES       15
-#define DEFAULT_LOG_ALIVE_FORMAT        "%a %b %e %T %Z %Y"
-#define ALIVE_BUFFSIZ                   1024
-
-#define STATUSFILENAME  "/run_erl.log"
-
-#define PIPE_STUBNAME   "erlang.pipe"
-#define PIPE_STUBLEN    strlen(PIPE_STUBNAME)
-#define PERM            (S_IWUSR | S_IRUSR | S_IWOTH | S_IROTH | S_IWGRP | S_IRGRP)
-
-/* OSE has defined O_SYNC but it is not recognized by open */
-#if !defined(O_SYNC) || defined(__OSE__)
-#undef O_SYNC
-#define O_SYNC 0
-#define USE_FSYNC 1
-#endif
-
-/* Global variable definitions
- * We need this complex way of handling global variables because of how
- * OSE works here. We want to make it possible to run the shell command
- * run_erl multiple times with different global variables without them
- * effecting eachother.
- */
-
-#define STATUSFILE           (RE_DATA->statusfile)
-#define LOG_DIR              (RE_DATA->log_dir)
-#define STDSTATUS            (RE_DATA->stdstatus)
-#define LOG_GENERATIONS      (RE_DATA->log_generations)
-#define LOG_MAXSIZE          (RE_DATA->log_maxsize)
-#define LOG_ACTIVITY_MINUTES (RE_DATA->log_activity_minutes)
-#define LOG_ALIVE_IN_GMT     (RE_DATA->log_alive_in_gmt)
-#define LOG_ALIVE_FORMAT     (RE_DATA->log_alive_format)
-#define RUN_DAEMON           (RE_DATA->run_daemon)
-#define LOG_ALIVE_MINUTES    (RE_DATA->log_alive_minutes)
-#define LOG_NUM              (RE_DATA->log_num)
-#define LFD                  (RE_DATA->lfd)
-#define PROTOCOL_VER         (RE_DATA->protocol_ver)
-
-struct run_erl_ {
-  /* constant config data */
-  char statusfile[FILENAME_BUFSIZ];
-  char log_dir[FILENAME_BUFSIZ];
-  FILE *stdstatus;
-  int log_generations;
-  int log_maxsize;
-  int log_activity_minutes;
-  int log_alive_in_gmt;
-  char log_alive_format[ALIVE_BUFFSIZ+1];
-  int run_daemon;
-  int log_alive_minutes;
-  /* Current log number and log fd */
-  int log_num;
-  int lfd;
-  unsigned protocol_ver;
-};
-
-typedef struct run_erl_ run_erl;
-
-#ifdef __OSE__
-static OSPPDKEY run_erl_pp_key;
-#define RE_DATA (*(run_erl**)ose_get_ppdata(run_erl_pp_key))
-#else
-static run_erl re;
-#define RE_DATA (&re)
-#endif
-
-/* prototypes */
-
-static int next_log(int log_num);
-static int prev_log(int log_num);
-static int find_next_log_num(void);
-static int open_log(int log_num, int flags);
-
-/*
- * getenv_int:
- */
-static char *getenv_int(const char *name) {
-#ifdef __OSE__
-   return get_env(get_bid(current_process()),name);
-#else
-   return getenv(name);
-#endif
-}
-
-/*
- * next_log:
- * Returns the index number that follows the given index number.
- * (Wrapping after log_generations)
- */
-static int next_log(int log_num) {
-  return log_num>=LOG_GENERATIONS?1:log_num+1;
-}
-
-/*
- * prev_log:
- * Returns the index number that precedes the given index number.
- * (Wrapping after log_generations)
- */
-static int prev_log(int log_num) {
-  return log_num<=1?LOG_GENERATIONS:log_num-1;
-}
-
-/*
- * find_next_log_num()
- * Searches through the log directory to check which logs that already
- * exist. It finds the "hole" in the sequence, and returns the index
- * number for the last log in the log sequence. If there is no hole, index
- * 1 is returned.
- */
-static int find_next_log_num(void) {
-  int i, next_gen, log_gen;
-  DIR *dirp;
-  struct dirent *direntp;
-  int log_exists[LOG_MAX_GENERATIONS+1];
-  int stub_len = strlen(LOG_STUBNAME);
-
-  /* Initialize exiting log table */
-
-  for(i=LOG_GENERATIONS; i>=0; i--)
-    log_exists[i] = 0;
-  dirp = opendir(LOG_DIR);
-  if(!dirp) {
-    ERRNO_ERR1(LOG_ERR,"Can't access log directory '%s'", LOG_DIR);
-    exit(1);
-  }
-
-  /* Check the directory for existing logs */
-
-  while((direntp=readdir(dirp)) != NULL) {
-    if(strncmp(direntp->d_name,LOG_STUBNAME,stub_len)==0) {
-      int num = atoi(direntp->d_name+stub_len);
-      if(num < 1 || num > LOG_GENERATIONS)
-	continue;
-      log_exists[num] = 1;
-    }
-  }
-  closedir(dirp);
-
-  /* Find out the next available log file number */
-
-  next_gen = 0;
-  for(i=LOG_GENERATIONS; i>=0; i--) {
-    if(log_exists[i])
-      if(next_gen)
-	break;
-      else
-	;
-    else
-      next_gen = i;
-  }
-
-  /* Find out the current log file number */
-
-  if(next_gen)
-    log_gen = prev_log(next_gen);
-  else
-    log_gen = 1;
-
-  return log_gen;
-} /* find_next_log_num() */
-
-static int open_log(int log_num, int flags)
-{
-  char buf[FILENAME_MAX];
-  time_t now;
-  struct tm *tmptr;
-  char log_buffer[ALIVE_BUFFSIZ+1];
-
-  /* Remove the next log (to keep a "hole" in the log sequence) */
-  sn_printf(buf, sizeof(buf), "%s/%s%d",
-	    LOG_DIR, LOG_STUBNAME, next_log(log_num));
-  unlink(buf);
-
-  /* Create or continue on the current log file */
-  sn_printf(buf, sizeof(buf), "%s/%s%d", LOG_DIR, LOG_STUBNAME, log_num);
-
-  LFD = sf_open(buf, flags, LOG_PERM);
-
-  if(LFD <0){
-      ERRNO_ERR1(LOG_ERR,"Can't open log file '%s'.", buf);
-    exit(1);
-  }
-
-  /* Write a LOGGING STARTED and time stamp into the log file */
-  time(&now);
-  if (LOG_ALIVE_IN_GMT) {
-      tmptr = gmtime(&now);
-  } else {
-      tmptr = localtime(&now);
-  }
-  if (!strftime(log_buffer, ALIVE_BUFFSIZ, LOG_ALIVE_FORMAT,
-		tmptr)) {
-      strn_cpy(log_buffer, sizeof(log_buffer),
-	      "(could not format time in 256 positions "
-	      "with current format string.)");
-  }
-  log_buffer[ALIVE_BUFFSIZ] = '\0';
-
-  sn_printf(buf, sizeof(buf), "\n=====\n===== LOGGING STARTED %s\n=====\n",
-	    log_buffer);
-  if (erts_run_erl_write_all(LFD, buf, strlen(buf)) < 0)
-      erts_run_erl_log_status("Error in writing to log.\n");
-
-#if USE_FSYNC
-  fsync(LFD);
-#endif
-
-  return LFD;
-}
-
-/* Instead of making sure basename exists, we do our own */
-char *simple_basename(char *path)
-{
-    char *ptr;
-    for (ptr = path; *ptr != '\0'; ++ptr) {
-	if (*ptr == '/') {
-	    path = ptr + 1;
-	}
-    }
-    return path;
-}
-
-ssize_t sf_read(int fd, void *buffer, size_t len) {
-    ssize_t n = 0;
-
-    do { n = read(fd, buffer, len); } while (n < 0 && errno == EINTR);
-
-    return n;
-}
-
-ssize_t sf_write(int fd, const void *buffer, size_t len) {
-    ssize_t n = 0;
-
-    do { n = write(fd, buffer, len); } while (n < 0 && errno == EINTR);
-
-    return n;
-}
-
-int sf_open(const char *path, int type, mode_t mode) {
-    int fd = 0;
-
-    do { fd = open(path, type, mode); } while(fd < 0 && errno == EINTR);
-
-    return fd;
-}
-
-int sf_close(int fd) {
-    int res = 0;
-
-    do { res = close(fd); } while(res < 0 && errno == EINTR);
-
-    return res;
-}
-
-/* Call write() until entire buffer has been written or error.
- * Return len or -1.
- */
-int erts_run_erl_write_all(int fd, const char* buf, int len)
-{
-    int left = len;
-    int written;
-    for (;;) {
-        do {
-	  written = write(fd,buf,left);
-	} while (written < 0 && errno == EINTR);
-	if (written == left) {
-	    return len;
-	}
-	if (written < 0) {
-	    return -1;
-	}
-	left -= written;
-	buf += written;
-    }
-    return written;
-}
-
-/* erts_run_erl_log_status()
- * Prints the arguments to a status file
- * Works like printf (see vfrpintf)
- */
-void erts_run_erl_log_status(const char *format,...)
-{
-  va_list args;
-  time_t now;
-
-  if (STDSTATUS == NULL)
-    STDSTATUS = fopen(STATUSFILE, "w");
-  if (STDSTATUS == NULL)
-    return;
-  now = time(NULL);
-  fprintf(STDSTATUS, "run_erl [%d] %s",
-#ifdef __OSE__
-	  (int)current_process(),
-#else
-	  (int)getpid(),
-#endif
-	  ctime(&now));
-  va_start(args, format);
-  vfprintf(STDSTATUS, format, args);
-  va_end(args);
-  fflush(STDSTATUS);
-  return;
-}
-
-/* Fetch the current log alive minutes */
-int erts_run_erl_log_alive_minutes() {
-  return LOG_ALIVE_MINUTES;
-}
-
-/* error_logf()
- * Prints the arguments to stderr or syslog
- * Works like printf (see vfprintf)
- */
-void erts_run_erl_log_error(int priority, int line, const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-
-#ifdef HAVE_SYSLOG_H
-    if (RUN_DAEMON) {
-	vsyslog(priority,format,args);
-    }
-    else
-#endif
-#ifdef __OSE__
-    if (RUN_DAEMON) {
-      char *buff = malloc(sizeof(char)*1024);
-      vsnprintf(buff,1024,format, args);
-      ramlog_printf(buff);
-    }
-    else
-#endif
-    {
-	time_t now = time(NULL);
-	fprintf(stderr, "run_erl:%d [%d] %s", line,
-#ifdef __OSE__
-		(int)current_process(),
-#else
-		(int)getpid(),
-#endif
-		ctime(&now));
-	vfprintf(stderr, format, args);
-    }
-    va_end(args);
-}
-
-/* erts_run_erl_log_write()
- * Writes a message to lfd. If the current log file is full,
- * a new log file is opened.
- */
-int erts_run_erl_log_write(char* buf, size_t len)
-{
-  int size;
-  ssize_t res;
-  /* Decide if new logfile needed, and open if so */
-
-  size = lseek(LFD,0,SEEK_END);
-  if(size+len > LOG_MAXSIZE) {
-    int res;
-    do {
-      res = close(LFD);
-    } while (res < 0 && errno == EINTR);
-    LOG_NUM = next_log(LOG_NUM);
-    LFD = open_log(LOG_NUM, O_RDWR|O_CREAT|O_TRUNC|O_SYNC);
-  }
-
-  /* Write to log file */
-
-  if ((res = erts_run_erl_write_all(LFD, buf, len)) < 0) {
-    erts_run_erl_log_status("Error in writing to log.\n");
-  }
-
-#if USE_FSYNC
-  fsync(LFD);
-#endif
-  return res;
-}
-
-int erts_run_erl_log_activity(int timeout,time_t now,time_t last_activity) {
-  char log_alive_buffer[ALIVE_BUFFSIZ+1];
-  char buf[BUFSIZ];
-
-  if (timeout || now - last_activity > LOG_ACTIVITY_MINUTES*60) {
-    /* Either a time out: 15 minutes without action, */
-    /* or something is coming in right now, but it's a long time */
-    /* since last time, so let's write a time stamp this message */
-    struct tm *tmptr;
-    if (LOG_ALIVE_IN_GMT) {
-      tmptr = gmtime(&now);
-    } else {
-      tmptr = localtime(&now);
-    }
-    if (!strftime(log_alive_buffer, ALIVE_BUFFSIZ, LOG_ALIVE_FORMAT,
-		  tmptr)) {
-      strn_cpy(log_alive_buffer, sizeof(log_alive_buffer),
-	       "(could not format time in 256 positions "
-	       "with current format string.)");
-    }
-    log_alive_buffer[ALIVE_BUFFSIZ] = '\0';
-
-    sn_printf(buf, sizeof(buf), "\n===== %s%s\n",
-	      timeout?"ALIVE ":"", log_alive_buffer);
-    return erts_run_erl_log_write(buf, strlen(buf));
-  }
-  return 0;
-}
-
-int erts_run_erl_log_open() {
-
-  LOG_NUM = find_next_log_num();
-  LFD = open_log(LOG_NUM, O_RDWR|O_APPEND|O_CREAT|O_SYNC);
-  return 0;
-}
-
-int erts_run_erl_log_init(int daemon, char* logdir) {
-  char *p;
-
-#ifdef __OSE__
-  run_erl **re_pp;
-  if (!run_erl_pp_key)
-     ose_create_ppdata("run_erl_ppdata",&run_erl_pp_key);
-  re_pp = (run_erl **)ose_get_ppdata(run_erl_pp_key);
-  *re_pp = malloc(sizeof(run_erl));
-#endif
-
-  STDSTATUS = NULL;
-  LOG_GENERATIONS = DEFAULT_LOG_GENERATIONS;
-  LOG_MAXSIZE     = DEFAULT_LOG_MAXSIZE;
-  LOG_ACTIVITY_MINUTES = DEFAULT_LOG_ACTIVITY_MINUTES;
-  LOG_ALIVE_IN_GMT = 0;
-  RUN_DAEMON = 0;
-  LOG_ALIVE_MINUTES = DEFAULT_LOG_ALIVE_MINUTES;
-  LFD = 0;
-  PROTOCOL_VER = RUN_ERL_LO_VER; /* assume lowest to begin with */
-
-  /* Get values for LOG file handling from the environment */
-  if ((p = getenv_int("RUN_ERL_LOG_ALIVE_MINUTES"))) {
-      LOG_ALIVE_MINUTES = atoi(p);
-      if (!LOG_ALIVE_MINUTES) {
-	  ERROR1(LOG_ERR,"Minimum value for RUN_ERL_LOG_ALIVE_MINUTES is 1 "
-		 "(current value is %s)",p);
-      }
-      LOG_ACTIVITY_MINUTES = LOG_ALIVE_MINUTES / 3;
-      if (!LOG_ACTIVITY_MINUTES) {
-	  ++LOG_ACTIVITY_MINUTES;
-      }
-  }
-  if ((p = getenv_int(
-		   "RUN_ERL_LOG_ACTIVITY_MINUTES"))) {
-     LOG_ACTIVITY_MINUTES = atoi(p);
-      if (!LOG_ACTIVITY_MINUTES) {
-	  ERROR1(LOG_ERR,"Minimum value for RUN_ERL_LOG_ACTIVITY_MINUTES is 1 "
-		 "(current value is %s)",p);
-      }
-  }
-  if ((p = getenv_int("RUN_ERL_LOG_ALIVE_FORMAT"))) {
-      if (strlen(p) > ALIVE_BUFFSIZ) {
-	  ERROR1(LOG_ERR, "RUN_ERL_LOG_ALIVE_FORMAT can contain a maximum of "
-		 "%d characters", ALIVE_BUFFSIZ);
-      }
-      strn_cpy(LOG_ALIVE_FORMAT, sizeof(LOG_ALIVE_FORMAT), p);
-  } else {
-      strn_cpy(LOG_ALIVE_FORMAT, sizeof(LOG_ALIVE_FORMAT),
-	       DEFAULT_LOG_ALIVE_FORMAT);
-  }
-  if ((p = getenv_int("RUN_ERL_LOG_ALIVE_IN_UTC"))
-      && strcmp(p,"0")) {
-      ++LOG_ALIVE_IN_GMT;
-  }
-  if ((p = getenv_int("RUN_ERL_LOG_GENERATIONS"))) {
-    LOG_GENERATIONS = atoi(p);
-    if (LOG_GENERATIONS < LOG_MIN_GENERATIONS)
-      ERROR1(LOG_ERR,"Minimum RUN_ERL_LOG_GENERATIONS is %d",
-	     LOG_MIN_GENERATIONS);
-    if (LOG_GENERATIONS > LOG_MAX_GENERATIONS)
-      ERROR1(LOG_ERR,"Maximum RUN_ERL_LOG_GENERATIONS is %d",
-	     LOG_MAX_GENERATIONS);
-  }
-
-  if ((p = getenv_int("RUN_ERL_LOG_MAXSIZE"))) {
-    LOG_MAXSIZE = atoi(p);
-    if (LOG_MAXSIZE < LOG_MIN_MAXSIZE)
-      ERROR1(LOG_ERR,"Minimum RUN_ERL_LOG_MAXSIZE is %d", LOG_MIN_MAXSIZE);
-  }
-
-  RUN_DAEMON = daemon;
-
-  strn_cpy(LOG_DIR, sizeof(LOG_DIR), logdir);
-  strn_cpy(STATUSFILE, sizeof(STATUSFILE), LOG_DIR);
-  strn_cat(STATUSFILE, sizeof(STATUSFILE), STATUSFILENAME);
-
-  return 0;
-}
-
-/* create_fifo()
- * Creates a new fifo with the given name and permission.
- */
-static int create_fifo(char *name, int perm)
-{
-  if ((mkfifo(name, perm) < 0) && (errno != EEXIST))
-    return -1;
-  return 0;
-}
-
-/*
- * w- and r_pipename have to be pre-allocated of atleast FILENAME_MAX size
- */
-int erts_run_erl_open_fifo(char *pipename,char *w_pipename,char *r_pipename) {
-  int calculated_pipename = 0;
-  int highest_pipe_num = 0;
-  int fd;
-
-  /*
-   * Create FIFOs and open them
-   */
-
-  if(*pipename && pipename[strlen(pipename)-1] == '/') {
-    /* The user wishes us to find a unique pipe name in the specified */
-    /* directory */
-    DIR *dirp;
-    struct dirent *direntp;
-
-    calculated_pipename = 1;
-    dirp = opendir(pipename);
-    if(!dirp) {
-      ERRNO_ERR1(LOG_ERR,"Can't access pipe directory '%s'.", pipename);
-      return 1;
-    }
-
-    /* Check the directory for existing pipes */
-
-    while((direntp=readdir(dirp)) != NULL) {
-      if(strncmp(direntp->d_name,PIPE_STUBNAME,PIPE_STUBLEN)==0) {
-	int num = atoi(direntp->d_name+PIPE_STUBLEN+1);
-	if(num > highest_pipe_num)
-	  highest_pipe_num = num;
-      }
-    }
-    closedir(dirp);
-    strn_catf(pipename, BUFSIZ, "%s.%d",
-	      PIPE_STUBNAME, highest_pipe_num+1);
-  } /* if */
-
-  for(;;) {
-      /* write FIFO - is read FIFO for `to_erl' program */
-      strn_cpy(w_pipename, BUFSIZ, pipename);
-      strn_cat(w_pipename, BUFSIZ, ".r");
-      if (create_fifo(w_pipename, PERM) < 0) {
-	  ERRNO_ERR1(LOG_ERR,"Cannot create FIFO %s for writing.",
-		     w_pipename);
-	  return 1;
-      }
-
-      /* read FIFO - is write FIFO for `to_erl' program */
-      strn_cpy(r_pipename, BUFSIZ, pipename);
-      strn_cat(r_pipename, BUFSIZ, ".w");
-
-      /* Check that nobody is running run_erl already */
-      if ((fd = sf_open(r_pipename, O_WRONLY|DONT_BLOCK_PLEASE, 0)) >= 0) {
-	  /* Open as client succeeded -- run_erl is already running! */
-	  sf_close(fd);
-	  if (calculated_pipename) {
-	      ++highest_pipe_num;
-	      strn_catf(pipename, BUFSIZ, "%s.%d",
-			PIPE_STUBNAME, highest_pipe_num+1);
-	      continue;
-	  }
-	  ERROR1(LOG_ERR, "Erlang already running on pipe %s.\n", pipename);
-	  unlink(w_pipename);
-	  return 1;
-      }
-      if (create_fifo(r_pipename, PERM) < 0) {
-	  unlink(w_pipename);
-	  ERRNO_ERR1(LOG_ERR,"Cannot create FIFO %s for reading.",
-		     r_pipename);
-	  return 1;
-      }
-      break;
-  }
-  return 0;
-}
-
-/* Extract any control sequences that are ment only for run_erl
- * and should not be forwarded to the pty.
- */
-int erts_run_erl_extract_ctrl_seq(char* buf, int len, int mfd)
-{
-    static const char prefix[] = "\033_";
-    static const char suffix[] = "\033\\";
-    char* bufend = buf + len;
-    char* start = buf;
-    char* command;
-    char* end;
-
-    for (;;) {
-	start = find_str(start, bufend-start, prefix);
-	if (!start) break;
-
-	command = start + strlen(prefix);
-	end = find_str(command, bufend-command, suffix);
-	if (end) {
-	    unsigned col, row;
-	    if (sscanf(command,"version=%u", &PROTOCOL_VER)==1) {
-		/*fprintf(stderr,"to_erl v%u\n", protocol_ver);*/
-	    }
-	    else if (sscanf(command,"winsize=%u,%u", &col, &row)==2) {
-#ifdef TIOCSWINSZ
-	      struct winsize ws;
-	      ws.ws_col = col;
-	      ws.ws_row = row;
-	      if (ioctl(mfd, TIOCSWINSZ, &ws) < 0) {
-		ERRNO_ERR0(LOG_ERR,"Failed to set window size");
-	      }
-#endif
-	    }
-	    else {
-		ERROR2(LOG_ERR, "Ignoring unknown ctrl command '%.*s'\n",
-		       (int)(end-command), command);
-	    }
-
-	    /* Remove ctrl sequence from buf */
-	    end += strlen(suffix);
-	    memmove(start, end, bufend-end);
-	    bufend -= end - start;
-	}
-	else {
-	    ERROR2(LOG_ERR, "Missing suffix in ctrl sequence '%.*s'\n",
-		   (int)(bufend-start), start);
-	    break;
-	}
-    }
-    return bufend - buf;
-}
diff --git a/erts/etc/common/run_erl_common.h b/erts/etc/common/run_erl_common.h
deleted file mode 100644
index cecf7521f9..0000000000
--- a/erts/etc/common/run_erl_common.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2013. 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%
- */
-/*
- * Functions that are common to both OSE and unix implementations of run_erl
- */
-#ifndef ERL_RUN_ERL_LOG_H
-#define ERL_RUN_ERL_LOG_H
-
-#include <stdio.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "run_erl_vsn.h"
-
-/* Log handling */
-int erts_run_erl_log_init(int run_daemon, char* logdir);
-int erts_run_erl_log_open(void);
-int erts_run_erl_log_close(void);
-int erts_run_erl_log_write(char *buff, size_t len);
-int erts_run_erl_log_activity(int timeout, time_t now, time_t last_activity);
-
-void erts_run_erl_log_status(const char *format,...);
-void erts_run_erl_log_error(int priority, int line, const char *format,...);
-
-int erts_run_erl_open_fifo(char *pipename,char *w_pipename,char *r_pipename);
-int erts_run_erl_log_alive_minutes(void);
-int erts_run_erl_extract_ctrl_seq(char* buf, int len, int mfd);
-
-/* File operations */
-ssize_t sf_read(int fd, void *buffer, size_t len);
-ssize_t sf_write(int fd, const void *buffer, size_t len);
-int sf_open(const char *path, int type, mode_t mode);
-int sf_close(int fd);
-int erts_run_erl_write_all(int fd, const char* buf, int len);
-char *simple_basename(char *path);
-
-#ifndef LOG_ERR
-#ifdef __OSE__
-#define LOG_ERR 0
-#else
-#define LOG_ERR NULL
-#endif
-#endif
-
-#define ERROR0(Prio,Format) erts_run_erl_log_error(Prio,__LINE__,Format"\n")
-#define ERROR1(Prio,Format,A1) erts_run_erl_log_error(Prio,__LINE__,Format"\n",A1)
-#define ERROR2(Prio,Format,A1,A2) erts_run_erl_log_error(Prio,__LINE__,Format"\n",A1,A2)
-
-#ifdef HAVE_STRERROR
-#    define ADD_ERRNO(Format) "errno=%d '%s'\n"Format"\n",errno,strerror(errno)
-#else
-#    define ADD_ERRNO(Format) "errno=%d\n"Format"\n",errno
-#endif
-#define ERRNO_ERR0(Prio,Format) erts_run_erl_log_error(Prio,__LINE__,ADD_ERRNO(Format))
-#define ERRNO_ERR1(Prio,Format,A1) erts_run_erl_log_error(Prio,__LINE__,ADD_ERRNO(Format),A1)
-#define ERRNO_ERR2(Prio,Format,A1,A2) erts_run_erl_log_error(Prio,__LINE__,ADD_ERRNO(Format),A1,A2)
-
-#define RUN_ERL_USAGE \
-  "%s (pipe_name|pipe_dir/) log_dir \"command [parameters ...]\"" \
-  "\n\nDESCRIPTION:\n"							\
-  "You may also set the environment variables RUN_ERL_LOG_GENERATIONS\n" \
-  "and RUN_ERL_LOG_MAXSIZE to the number of log files to use and the\n"	\
-  "size of the log file when to switch to the next log file\n"
-
-#ifndef FILENAME_MAX
-#define FILENAME_MAX 250
-#endif
-
-#define FILENAME_BUFSIZ FILENAME_MAX
-
-#ifdef O_NONBLOCK
-#  define DONT_BLOCK_PLEASE O_NONBLOCK
-#else
-#  define DONT_BLOCK_PLEASE O_NDELAY
-#  ifndef EAGAIN
-#    define EAGAIN -3898734
-#  endif
-#endif
-
-#endif
diff --git a/erts/etc/common/to_erl_common.c b/erts/etc/common/to_erl_common.c
deleted file mode 100644
index 8aa94ccfa4..0000000000
--- a/erts/etc/common/to_erl_common.c
+++ /dev/null
@@ -1,717 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 1996-2013. 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%
- */
-/*
- * Module: to_erl.c
- *
- * This module implements a process that opens two specified FIFOs, one
- * for reading and one for writing; reads from its stdin, and writes what
- * it has read to the write FIF0; reads from the read FIFO, and writes to
- * its stdout.
- *
-  ________                            _________
- |        |--<-- pipe.r (fifo1) --<--|         |
- | to_erl |                          | run_erl | (parent)
- |________|-->-- pipe.w (fifo2) -->--|_________|
-                                          ^ master pty
-                                          |
-                                          | slave pty
-                                      ____V____
-                                     |         |
-                                     |  "erl"  | (child)
-                                     |_________|
- */
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dirent.h>
-#include <errno.h>
-
-#ifdef __OSE__
-#include <aio.h>
-#include "ose.h"
-#include "efs.h"
-#include "ose_spi/fm.sig"
-#else /* __UNIX__ */
-#include <termios.h>
-#include <signal.h>
-#endif
-
-#ifdef HAVE_SYS_IOCTL_H
-#  include <sys/ioctl.h>
-#endif
-
-#include "to_erl_common.h"
-#include "run_erl_vsn.h"
-#include "safe_string.h"   /* strn_cpy, strn_catf, sn_printf, etc. */
-
-#if defined(O_NONBLOCK)
-# define DONT_BLOCK_PLEASE O_NONBLOCK
-#else
-# define DONT_BLOCK_PLEASE O_NDELAY
-# if !defined(EAGAIN)
-#  define EAGAIN -3898734
-# endif
-#endif
-
-#ifdef HAVE_STRERROR
-#  define STRERROR(x) strerror(x)
-#else
-#  define STRERROR(x) ""
-#endif
-
-#define noDEBUG
-
-#ifdef __OSE__
-#define PIPE_DIR        "/pipe/"
-#else
-#define PIPE_DIR        "/tmp/"
-#endif
-#define PIPE_STUBNAME   "erlang.pipe"
-#define PIPE_STUBLEN    strlen(PIPE_STUBNAME)
-
-#ifdef DEBUG
-#define STATUS(s)  { fprintf(stderr, (s)); fflush(stderr); }
-#else
-#define STATUS(s)
-#endif
-
-#ifndef FILENAME_MAX
-#define FILENAME_MAX 250
-#endif
-
-static int tty_eof = 0;
-static int protocol_ver = RUN_ERL_LO_VER; /* assume lowest to begin with */
-
-static int write_all(int fd, const char* buf, int len);
-static int version_handshake(char* buf, int len, int wfd);
-
-
-#ifdef __OSE__
-
-#define SET_AIO(REQ,FD,SIZE,BUFF)					\
-  /* Make sure to clean data structure of previous request */		\
-  memset(&(REQ),0,sizeof(REQ));						\
-  (REQ).aio_fildes = FD;						\
-  (REQ).aio_offset = FM_POSITION_CURRENT;				\
-  (REQ).aio_nbytes = SIZE;						\
-  (REQ).aio_buf = BUFF;							\
-  (REQ).aio_sigevent.sigev_notify = SIGEV_NONE
-
-#define READ_AIO(REQ,FD,SIZE,BUFF)					\
-  SET_AIO(REQ,FD,SIZE,BUFF);						\
-  if (aio_read(&(REQ)) != 0)						\
-    fprintf(stderr,"aio_read of child_read_req(%d) failed"		\
-	    "with error %d\n",FD,errno)
-
-union SIGNAL {
-  SIGSELECT signo;
-  struct FmReadPtr fm_read_ptr;
-};
-
-#else /* __UNIX__ */
-static int recv_sig = 0;
-static struct termios tty_smode, tty_rmode;
-static int window_size_seq(char* buf, size_t bufsz);
-#ifdef DEBUG
-static void show_terminal_settings(struct termios *);
-#endif
-
-static void handle_ctrlc(int sig)
-{
-    /* Reinstall the handler, and signal break flag */
-    signal(SIGINT,handle_ctrlc);
-    recv_sig = SIGINT;
-}
-
-static void handle_sigwinch(int sig)
-{
-    recv_sig = SIGWINCH;
-}
-#endif
-
-static void usage(char *pname)
-{
-    fprintf(stderr, "Usage: ");
-    fprintf(stderr,TO_ERL_USAGE,pname);
-}
-
-int to_erl(int argc, char **argv)
-{
-    char  FIFO1[FILENAME_MAX], FIFO2[FILENAME_MAX];
-    int i, len, wfd, rfd;
-    char pipename[FILENAME_MAX];
-    int pipeIx = 1;
-    int force_lock = 0;
-    int got_some = 0;
-
-#ifdef __OSE__
-    struct aiocb stdin_read_req, pipe_read_req;
-    FmHandle stdin_fh, pipe_fh;
-    char *stdin_buf, *pipe_buf;
-    char *buf;
-    union SIGNAL *sig;
-#else /* __UNIX__ */
-    char buf[BUFSIZ];
-    fd_set readfds;
-#endif
-
-    if (argc >= 2 && argv[1][0]=='-') {
-	switch (argv[1][1]) {
-	case 'h':
-	    usage(argv[0]);
-	    exit(1);
-	case 'F':
-	    force_lock = 1;
-	    break;
-	default:
-	    fprintf(stderr,"Invalid option '%s'\n",argv[1]);
-	    exit(1);
-	}
-	pipeIx = 2;
-    }
-
-#ifdef DEBUG
-    fprintf(stderr, "%s: pid is : %d\n", argv[0],(int)
-#ifdef __OSE__
-	    current_process()
-#else /* __UNIX__ */
-	    getpid()
-#endif
-	    );
-#endif
-
-    strn_cpy(pipename, sizeof(pipename),
-	     (argv[pipeIx] ? argv[pipeIx] : PIPE_DIR));
-
-    if(*pipename && pipename[strlen(pipename)-1] == '/') {
-	/* The user wishes us to find a pipe name in the specified */
-	/* directory */
-	int highest_pipe_num = 0;
-	DIR *dirp;
-	struct dirent *direntp;
-
-	dirp = opendir(pipename);
-	if(!dirp) {
-	    fprintf(stderr, "Can't access pipe directory %s: %s\n", pipename, strerror(errno));
-	    exit(1);
-	}
-
-	/* Check the directory for existing pipes */
-
-	while((direntp=readdir(dirp)) != NULL) {
-	    if(strncmp(direntp->d_name,PIPE_STUBNAME,PIPE_STUBLEN)==0) {
-		int num = atoi(direntp->d_name+PIPE_STUBLEN+1);
-		if(num > highest_pipe_num)
-		    highest_pipe_num = num;
-	    }
-	}
-	closedir(dirp);
-	strn_catf(pipename, sizeof(pipename), (highest_pipe_num?"%s.%d":"%s"),
-		  PIPE_STUBNAME, highest_pipe_num);
-    } /* if */
-
-    /* read FIFO */
-    sn_printf(FIFO1,sizeof(FIFO1),"%s.r",pipename);
-    /* write FIFO */
-    sn_printf(FIFO2,sizeof(FIFO2),"%s.w",pipename);
-
-#ifndef __OSE__
-    /* Check that nobody is running to_erl on this pipe already */
-    if ((wfd = open (FIFO1, O_WRONLY|DONT_BLOCK_PLEASE, 0)) >= 0) {
-	/* Open as server succeeded -- to_erl is already running! */
-	close(wfd);
-	fprintf(stderr, "Another to_erl process already attached to pipe "
-			"%s.\n", pipename);
-	if (force_lock) {
-	    fprintf(stderr, "But we proceed anyway by force (-F).\n");
-	}
-	else {
-	    exit(1);
-	}
-    }
-#endif
-
-    if ((rfd = open (FIFO1, O_RDONLY|DONT_BLOCK_PLEASE, 0)) < 0) {
-#ifdef DEBUG
-	fprintf(stderr, "Could not open FIFO %s for reading.\n", FIFO1);
-#endif
-	fprintf(stderr, "No running Erlang on pipe %s: %s\n", pipename, strerror(errno));
-	exit(1);
-    }
-#ifdef DEBUG
-    fprintf(stderr, "to_erl: %s opened for reading\n", FIFO1);
-#endif
-
-    if ((wfd = open (FIFO2, O_WRONLY|DONT_BLOCK_PLEASE, 0)) < 0) {
-#ifdef DEBUG
-	fprintf(stderr, "Could not open FIFO %s for writing.\n", FIFO2);
-#endif
-	fprintf(stderr, "No running Erlang on pipe %s: %s\n", pipename, strerror(errno));
-	close(rfd);
-	exit(1);
-    }
-#ifdef DEBUG
-    fprintf(stderr, "to_erl: %s opened for writing\n", FIFO2);
-#endif
-
-#ifndef __OSE__
-    fprintf(stderr, "Attaching to %s (^D to exit)\n\n", pipename);
-#else
-    fprintf(stderr, "Attaching to %s (^C to exit)\n\n", pipename);
-#endif
-
-#ifndef __OSE__
-    /* Set break handler to our handler */
-    signal(SIGINT,handle_ctrlc);
-
-    /*
-     * Save the current state of the terminal, and set raw mode.
-     */
-    if (tcgetattr(0, &tty_rmode) , 0) {
-	fprintf(stderr, "Cannot get terminals current mode\n");
-	exit(-1);
-    }
-    tty_smode = tty_rmode;
-    tty_eof = '\004'; /* Ctrl+D to exit */
-#ifdef DEBUG
-    show_terminal_settings(&tty_rmode);
-#endif
-    tty_smode.c_iflag =
-	1*BRKINT |/*Signal interrupt on break.*/
-	    1*IGNPAR |/*Ignore characters with parity errors.*/
-		1*ISTRIP |/*Strip character.*/
-		    0;
-
-#if 0
-0*IGNBRK |/*Ignore break condition.*/
-0*PARMRK |/*Mark parity errors.*/
-0*INPCK  |/*Enable input parity check.*/
-0*INLCR  |/*Map NL to CR on input.*/
-0*IGNCR  |/*Ignore CR.*/
-0*ICRNL  |/*Map CR to NL on input.*/
-0*IUCLC  |/*Map upper-case to lower-case on input.*/
-0*IXON   |/*Enable start/stop output control.*/
-0*IXANY  |/*Enable any character to restart output.*/
-0*IXOFF  |/*Enable start/stop input control.*/
-0*IMAXBEL|/*Echo BEL on input line too long.*/
-#endif
-
-    tty_smode.c_oflag =
-	1*OPOST  |/*Post-process output.*/
-	    1*ONLCR  |/*Map NL to CR-NL on output.*/
-#ifdef XTABS
-		1*XTABS  |/*Expand tabs to spaces. (Linux)*/
-#endif
-#ifdef OXTABS
-		    1*OXTABS  |/*Expand tabs to spaces. (FreeBSD)*/
-#endif
-#ifdef NL0
-			1*NL0    |/*Select newline delays*/
-#endif
-#ifdef CR0
-			    1*CR0    |/*Select carriage-return delays*/
-#endif
-#ifdef TAB0
-				1*TAB0   |/*Select horizontal tab delays*/
-#endif
-#ifdef BS0
-				    1*BS0    |/*Select backspace delays*/
-#endif
-#ifdef VT0
-					1*VT0    |/*Select vertical tab delays*/
-#endif
-#ifdef FF0
-					    1*FF0    |/*Select form feed delays*/
-#endif
-											    0;
-
-#if 0
-0*OLCUC  |/*Map lower case to upper on output.*/
-0*OCRNL  |/*Map CR to NL on output.*/
-0*ONOCR  |/*No CR output at column 0.*/
-0*ONLRET |/*NL performs CR function.*/
-0*OFILL  |/*Use fill characters for delay.*/
-0*OFDEL  |/*Fill is DEL, else NULL.*/
-0*NL1    |
-0*CR1    |
-0*CR2    |
-0*CR3    |
-0*TAB1   |
-0*TAB2   |
-0*TAB3   |/*Expand tabs to spaces.*/
-0*BS1    |
-0*VT1    |
-0*FF1    |
-#endif
-
-    /* JALI: removed setting the tty_smode.c_cflag flags, since this is not */
-    /* advisable if this is a *real* terminal, such as the console. In fact */
-    /* this may hang the entire machine, deep, deep down (signalling break */
-    /* or toggling the abort switch doesn't help) */
-
-    tty_smode.c_lflag =
-									0;
-
-#if 0
-0*ISIG   |/*Enable signals.*/
-0*ICANON |/*Canonical input (erase and kill processing).*/
-0*XCASE  |/*Canonical upper/lower presentation.*/
-0*ECHO   |/*Enable echo.*/
-0*ECHOE  |/*Echo erase character as BS-SP-BS.*/
-0*ECHOK  |/*Echo NL after kill character.*/
-0*ECHONL |/*Echo NL.*/
-0*NOFLSH |/*Disable flush after interrupt or quit.*/
-0*TOSTOP |/*Send SIGTTOU for background output.*/
-0*ECHOCTL|/*Echo control characters as ^char, delete as ^?.*/
-0*ECHOPRT|/*Echo erase character as character erased.*/
-0*ECHOKE |/*BS-SP-BS erase entire line on line kill.*/
-0*FLUSHO |/*Output is being flushed.*/
-0*PENDIN |/*Retype pending input at next read or input character.*/
-0*IEXTEN |/*Enable extended (implementation-defined) functions.*/
-#endif
-
-    tty_smode.c_cc[VMIN]      =0;/* Note that VMIN is the same as VEOF! */
-    tty_smode.c_cc[VTIME]     =0;/* Note that VTIME is the same as VEOL! */
-    tty_smode.c_cc[VINTR]     =3;
-
-    tcsetattr(0, TCSADRAIN, &tty_smode);
-
-#ifdef DEBUG
-    show_terminal_settings(&tty_smode);
-#endif
-
-#endif /* !__OSE__ */
-    /*
-     * 	 "Write a ^L to the FIFO which causes the other end to redisplay
-     *    the input line."
-     * This does not seem to work as was intended in old comment above.
-     * However, this control character is now (R12B-3) used by run_erl
-     * to trigger the version handshaking between to_erl and run_erl
-     * at the start of every new to_erl-session.
-     */
-
-    if (write(wfd, "\014", 1) < 0) {
-	fprintf(stderr, "Error in writing ^L to FIFO.\n");
-    }
-
-#ifdef __OSE__
-    /* we have a tiny stack so we malloc the buffers */
-    stdin_buf = malloc(sizeof(char) * BUFSIZ);
-    pipe_buf = malloc(sizeof(char) * BUFSIZ);
-
-    efs_examine_fd(rfd,FLIB_FD_HANDLE,&pipe_fh);
-    efs_examine_fd(0,FLIB_FD_HANDLE,&stdin_fh);
-    READ_AIO(stdin_read_req,0,BUFSIZ,stdin_buf);
-    READ_AIO(pipe_read_req,rfd,BUFSIZ,pipe_buf);
-#endif
-
-    /*
-     * read and write
-     */
-    while (1) {
-#ifndef __OSE__
-	FD_ZERO(&readfds);
-	FD_SET(0, &readfds);
-	FD_SET(rfd, &readfds);
-	if (select(rfd + 1, &readfds, NULL, NULL, NULL) < 0) {
-	    if (recv_sig) {
-		FD_ZERO(&readfds);
-	    }
-	    else {
-		fprintf(stderr, "Error in select.\n");
-		break;
-	    }
-	}
-	len = 0;
-
-	/*
-	 * Read from terminal and write to FIFO
-         */
-	if (recv_sig) {
-	    switch (recv_sig) {
-	    case SIGINT:
-		fprintf(stderr, "[Break]\n\r");
-		buf[0] = '\003';
-		len = 1;
-		break;
-	    case SIGWINCH:
-		len = window_size_seq(buf,sizeof(buf));
-		break;
-	    default:
-		fprintf(stderr,"Unexpected signal: %u\n",recv_sig);
-	    }
-	    recv_sig = 0;
-	}
-	else
-#else /* __OSE__ */
-	SIGSELECT sigsel[] = {0};
-	sig = receive(sigsel);
-	len = 0;
-#endif
-#ifndef __OSE__
-	  if (FD_ISSET(0,&readfds)) {
-	    len = read(0, buf, sizeof(buf));
-#else /* __OSE__ */
-	  if (sig->signo == FM_READ_PTR_REPLY &&
-	      sig->fm_read_ptr.handle == stdin_fh) {
-	    len = sig->fm_read_ptr.status == EFS_SUCCESS ? sig->fm_read_ptr.actual : -1;
-	    buf = sig->fm_read_ptr.buffer;
-#endif
-	    if (len <= 0) {
-		close(rfd);
-		close(wfd);
-		if (len < 0) {
-		    fprintf(stderr, "Error in reading from stdin.\n");
-		} else {
-		    fprintf(stderr, "[EOF]\n\r");
-		}
-		break;
-	    }
-	    /* check if there is an eof character in input */
-	    for (i = 0; i < len-1 && buf[i] != tty_eof; i++);
-	    if (buf[i] == tty_eof) {
-		fprintf(stderr, "[Quit]\n\r");
-		break;
-	    }
-	}
-
-	if (len) {
-#ifdef DEBUG
-	    if(write(1, buf, len));
-#endif
-	    if (write_all(wfd, buf, len) != len) {
-		fprintf(stderr, "Error in writing to FIFO.\n");
-		close(rfd);
-		close(wfd);
-		break;
-	    }
-	    STATUS("\" OK\r\n");
-#ifdef __OSE__
-	    aio_dispatch(sig);
-	    READ_AIO(stdin_read_req, 0, BUFSIZ, stdin_buf);
-#endif
-	}
-
-	/*
-	 * Read from FIFO, write to terminal.
-	 */
-#ifndef __OSE__
-	if (FD_ISSET(rfd, &readfds)) {
-	    STATUS("FIFO read: ");
-	    len = read(rfd, buf, BUFSIZ);
-#else /* __OSE__ */
-        if (sig->signo == FM_READ_PTR_REPLY &&
-	    sig->fm_read_ptr.handle == pipe_fh) {
-	    len = sig->fm_read_ptr.status == EFS_SUCCESS ? sig->fm_read_ptr.actual : -1;
-	    buf = sig->fm_read_ptr.buffer;
-#endif
-	    if (len < 0 && errno == EAGAIN) {
-		/*
-		 * No data this time, but the writing end of the FIFO is still open.
-		 * Do nothing.
-		 */
-		;
-	    } else if (len <= 0) {
-		/*
-		 * Either an error or end of file. In either case, break out
-		 * of the loop.
-		 */
-		close(rfd);
-		close(wfd);
-		if (len < 0) {
-		    fprintf(stderr, "Error in reading from FIFO.\n");
-		} else
-		    fprintf(stderr, "[End]\n\r");
-		break;
-	    } else {
-		if (!got_some) {
-		    if ((len=version_handshake(buf,len,wfd)) < 0) {
-			close(rfd);
-			close(wfd);
-			break;
-		    }
-#ifndef __OSE__
-		    if (protocol_ver >= 1) {
-			/* Tell run_erl size of terminal window */
-			signal(SIGWINCH, handle_sigwinch);
-			raise(SIGWINCH);
-		    }
-#endif
-		    got_some = 1;
-		}
-
-		/*
-		 * We successfully read at least one character. Write what we got.
-		 */
-		STATUS("Terminal write: \"");
-		if (write_all(1, buf, len) != len) {
-		    fprintf(stderr, "Error in writing to terminal.\n");
-		    close(rfd);
-		    close(wfd);
-		    break;
-		}
-		STATUS("\" OK\r\n");
-#ifdef __OSE__
-		aio_dispatch(sig);
-		READ_AIO(pipe_read_req, rfd, BUFSIZ, pipe_buf);
-#endif
-	    }
-	}
-    }
-
-#ifndef __OSE__
-    /*
-     * Reset terminal characterstics
-     * XXX
-     */
-    tcsetattr(0, TCSADRAIN, &tty_rmode);
-#endif
-    return 0;
-}
-
-/* Call write() until entire buffer has been written or error.
- * Return len or -1.
- */
-static int write_all(int fd, const char* buf, int len)
-{
-    int left = len;
-    int written;
-    while (left) {
-	written = write(fd,buf,left);
-	if (written < 0) {
-	    return -1;
-	}
-	left -= written;
-	buf += written;
-    }
-    return len;
-}
-
-#ifndef __OSE__
-static int window_size_seq(char* buf, size_t bufsz)
-{
-#ifdef TIOCGWINSZ
-    struct winsize ws;
-    static const char prefix[] = "\033_";
-    static const char suffix[] = "\033\\";
-    /* This Esc sequence is called "Application Program Command"
-       and seems suitable to use for our own customized stuff. */
-
-    if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) == 0) {
-	int len = sn_printf(buf, bufsz, "%swinsize=%u,%u%s",
-			    prefix, ws.ws_col, ws.ws_row, suffix);
-	return len;
-    }
-#endif /* TIOCGWINSZ */
-    return 0;
-}
-#endif /* !__OSE__ */
-
-/*   to_erl                     run_erl
- *     |                           |
- *     |---------- '\014' -------->| (session start)
- *     |                           |
- *     |<---- "[run_erl v1-0]" ----| (version interval)
- *     |                           |
- *     |--- Esc_"version=1"Esc\ -->| (common version)
- *     |                           |
- */
-static int version_handshake(char* buf, int len, int wfd)
-{
-    unsigned re_high=0, re_low;
-    char *end = find_str(buf,len,"]\n");
-
-    if (end && sscanf(buf,"[run_erl v%u-%u",&re_high,&re_low)==2) {
-	char wbuf[30];
-	int wlen;
-
-	if (re_low > RUN_ERL_HI_VER || re_high < RUN_ERL_LO_VER) {
-	    fprintf(stderr,"Incompatible versions: to_erl=v%u-%u run_erl=v%u-%u\n",
-		    RUN_ERL_HI_VER, RUN_ERL_LO_VER, re_high, re_low);
-	    return -1;
-	}
-	/* Choose highest common version */
-	protocol_ver = re_high < RUN_ERL_HI_VER ? re_high : RUN_ERL_HI_VER;
-
-	wlen = sn_printf(wbuf, sizeof(wbuf), "\033_version=%u\033\\",
-			 protocol_ver);
-	if (write_all(wfd, wbuf, wlen) < 0) {
-	    fprintf(stderr,"Failed to send version handshake\n");
-	    return -1;
-	}
-	end += 2;
-	len -= (end-buf);
-	memmove(buf,end,len);
-
-    }
-    else {  /* we assume old run_erl without version handshake */
-	protocol_ver = 0;
-    }
-
-    if (re_high != RUN_ERL_HI_VER) {
-	fprintf(stderr,"run_erl has different version, "
-		"using common protocol level %u\n", protocol_ver);
-    }
-
-    return len;
-}
-
-
-#if defined(DEBUG) && !defined(__OSE__)
-#define S(x)  ((x) > 0 ? 1 : 0)
-
-static void show_terminal_settings(struct termios *t)
-{
-  fprintf(stderr,"c_iflag:\n");
-  fprintf(stderr,"Signal interrupt on break:   BRKINT  %d\n", S(t->c_iflag & BRKINT));
-  fprintf(stderr,"Map CR to NL on input:       ICRNL   %d\n", S(t->c_iflag & ICRNL));
-  fprintf(stderr,"Ignore break condition:      IGNBRK  %d\n", S(t->c_iflag & IGNBRK));
-  fprintf(stderr,"Ignore CR:                   IGNCR   %d\n", S(t->c_iflag & IGNCR));
-  fprintf(stderr,"Ignore char with par. err's: IGNPAR  %d\n", S(t->c_iflag & IGNPAR));
-  fprintf(stderr,"Map NL to CR on input:       INLCR   %d\n", S(t->c_iflag & INLCR));
-  fprintf(stderr,"Enable input parity check:   INPCK   %d\n", S(t->c_iflag & INPCK));
-  fprintf(stderr,"Strip character              ISTRIP  %d\n", S(t->c_iflag & ISTRIP));
-  fprintf(stderr,"Enable start/stop input ctrl IXOFF   %d\n", S(t->c_iflag & IXOFF));
-  fprintf(stderr,"ditto output ctrl            IXON    %d\n", S(t->c_iflag & IXON));
-  fprintf(stderr,"Mark parity errors           PARMRK  %d\n", S(t->c_iflag & PARMRK));
-  fprintf(stderr,"\n");
-  fprintf(stderr,"c_oflag:\n");
-  fprintf(stderr,"Perform output processing    OPOST   %d\n", S(t->c_oflag & OPOST));
-  fprintf(stderr,"\n");
-  fprintf(stderr,"c_cflag:\n");
-  fprintf(stderr,"Ignore modem status lines    CLOCAL  %d\n", S(t->c_cflag & CLOCAL));
-  fprintf(stderr,"\n");
-  fprintf(stderr,"c_local:\n");
-  fprintf(stderr,"Enable echo                  ECHO    %d\n", S(t->c_lflag & ECHO));
-  fprintf(stderr,"\n");
-  fprintf(stderr,"c_cc:\n");
-  fprintf(stderr,"c_cc[VEOF]                           %d\n", t->c_cc[VEOF]);
-}
-#endif /* DEBUG && !__OSE__ */
diff --git a/erts/etc/common/to_erl_common.h b/erts/etc/common/to_erl_common.h
deleted file mode 100644
index a139da418f..0000000000
--- a/erts/etc/common/to_erl_common.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2013. 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%
- */
-#ifndef ERL_TO_ERL_H
-#define ERL_TO_ERL_H
-
-#define TO_ERL_USAGE "to_erl [-h|-F] %s\n"			\
-  "\t-h\tThis help text.\n"						\
-  "\t-f\tForce connection even though pipe is locked by other to_erl process."
-
-int to_erl(int argc, char **argv);
-
-#endif
diff --git a/erts/etc/ose/etc.lmconf b/erts/etc/ose/etc.lmconf
deleted file mode 100644
index b402b325b1..0000000000
--- a/erts/etc/ose/etc.lmconf
+++ /dev/null
@@ -1,20 +0,0 @@
-OSE_LM_STACK_SIZES=256,512,1024,2048,4096,8192,16384,65536
-OSE_LM_SIGNAL_SIZES=31,63,127,255,1023,4095,16383,65535
-OSE_LM_POOL_SIZE=0x200000
-OSE_LM_MAIN_NAME=main
-OSE_LM_MAIN_STACK_SIZE=0xF000
-OSE_LM_MAIN_PRIORITY=20
-## Has to be of a type that allows MAM
-OSE_LM_PROGRAM_TYPE=APP_RAM
-OSE_LM_DATA_INIT=YES
-OSE_LM_BSS_INIT=YES
-OSE_LM_EXEC_MODEL=SHARED
-HEAP_MAX_SIZE=1000000000
-HEAP_SMALL_BUF_INIT_SIZE=64000000
-HEAP_LARGE_BUF_THRESHOLD=16000000
-HEAP_LOCK_TYPE=2
-
-# Setting the environment variable EFS_RESOLVE_TMO on the block to 0.
-# This will eliminiate delays when trying to open files on not mounted
-# volumes.
-EFS_RESOLVE_TMO=0
diff --git a/erts/etc/ose/run_erl.c b/erts/etc/ose/run_erl.c
deleted file mode 100644
index 6775525297..0000000000
--- a/erts/etc/ose/run_erl.c
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2013. 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%
- */
-/*
- * Module: run_erl.c
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-/* System includes */
-#include <aio.h>
-#include <errno.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-/* OSE includes */
-#include "ose.h"
-#include "ose_spi/ose_spi.h"
-#include "efs.h"
-#include "pm.h"
-#include "ose_spi/fm.sig"
-
-/* erts includes */
-#include "run_erl.h"
-#include "run_erl_common.h"
-#include "safe_string.h"    /* sn_printf, strn_cpy, strn_cat, etc */
-
-typedef struct RunErlSetup_ {
-  SIGSELECT signo;
-  int run_daemon;
-  char *logdir;
-  char *command;
-  char *pipename;
-  char *blockname;
-} RunErlSetup;
-
-typedef struct ProgramState_ {
-  /* child process */
-  int ifd, ofd;
-  OSDOMAIN domain;
-  PROCESS progpid, mainbid;
-  struct PmProgramInfo *info;
-  /* to_erl */
-  char w_pipe[FILENAME_BUFSIZ],
-       r_pipe[FILENAME_BUFSIZ];
-} ProgramState;
-
-union SIGNAL {
-  SIGSELECT signo;
-  RunErlSetup setup;
-  struct FmReadPtr fm_read_ptr;
-  struct FmWritePtr fm_write_ptr;
-};
-
-static OSBOOLEAN hunt_in_block(char *block_name,
-			       char *process_name,
-			       PROCESS *pid);
-static int create_child_process(char *command_string, char *blockname,
-				ProgramState *state);
-
-
-static OSBOOLEAN hunt_in_block(char *block_name,
-			       char *process_name,
-			       PROCESS *pid) {
-  struct OS_pid_list *list;
-  PROCESS block_id = OSE_ILLEGAL_PROCESS;
-  int i;
-  char *name;
-
-  *pid = OSE_ILLEGAL_PROCESS;
-
-  list = get_bid_list(0);
-
-  if (!list)
-    return 0;
-
-  for (i = 0; i < list->count; i++) {
-
-    if (list->list[i] == get_bid(current_process()))
-      continue;
-
-    name = (char*)get_pid_info(list->list[i], OSE_PI_NAME);
-    if (name) {
-      if (strcmp(name,block_name) == 0) {
-	block_id = list->list[i];
-	free_buf((union SIGNAL**)&name);
-	break;
-      }
-      free_buf((union SIGNAL**)&name);
-    }
-  }
-
-  free_buf((union SIGNAL**)&list);
-
-  if (block_id == OSE_ILLEGAL_PROCESS)
-    return 0;
-
-  list = get_pid_list(block_id);
-
-  if (!list)
-    return 0;
-
-  for (i = 0; i < list->count; i++) {
-    name = (char*)get_pid_info(list->list[i], OSE_PI_NAME);
-    if (name) {
-      if (strcmp(name,process_name) == 0) {
-	*pid = list->list[i];
-	free_buf((union SIGNAL**)&name);
-	break;
-      }
-      free_buf((union SIGNAL**)&name);
-    }
-  }
-
-  free_buf((union SIGNAL**)&list);
-
-  if (*pid == OSE_ILLEGAL_PROCESS)
-    return 0;
-
-  return 1;
-
-}
-
-
-static int create_child_process(char *command_string,  char *blockname,
-				ProgramState *state) {
-  char *command = command_string;
-  char *argv;
-  int i = 0;
-  int ret_status;
-  PmStatus pm_status;
-  int tmp_io[2];
-  int fd_arr[3];
-  int ifd[2], ofd[2];
-  char *handle;
-  struct PmLoadModuleInfoReply *mod_info;
-
-  /* Parse out cmd and argv from the command string */
-  while (1) {
-    if (command[i] == ' ' || command[i] == '\0') {
-      if (command[i] == '\0')
-	argv = NULL;
-      else {
-	command[i] = '\0';
-	argv = command_string + i + 1;
-      }
-      break;
-    }
-    i++;
-  }
-
-  if (blockname)
-    handle = blockname;
-  else
-    handle = simple_basename(command);
-
-  if (ose_pm_load_module_info(handle,&mod_info) == PM_SUCCESS) {
-    /* Already installed */
-    free_buf((union SIGNAL**)&mod_info);
-  } else if ((pm_status = ose_pm_install_load_module(0,"ELF",command,handle,0,0,NULL))
-	     != PM_SUCCESS) {
-      ERROR1(LOG_ERR,"ose_pm_install_load_module failed - pmstatus: 0x%08x\n",
-	     pm_status);
-      return 0;
-  }
-
-  state->domain = PM_NEW_DOMAIN;
-
-  pm_status = ose_pm_create_program(&state->domain, handle, 0, 0 , NULL,
-				    &state->progpid, &state->mainbid);
-
-  if (pm_status != PM_SUCCESS) {
-    if (pm_status == PM_EINSTALL_HANDLE_IN_USE)
-      ERROR1(LOG_ERR,"ose_pm_create_program failed - "
-	     "install handle \"%s\" is in use. You can specify another "
-	     "install handle by using the -block option to run_erl.\n",handle);
-    else
-      ERROR1(LOG_ERR,"ose_pm_create_program failed - pmstatus: 0x%08x\n",
-	     pm_status);
-    return 0;
-  }
-
-  pm_status = ose_pm_program_info(state->progpid, &state->info);
-  /* FIXME don't forget to free this ((union SIGNAL **)&info) */
-  if (pm_status != PM_SUCCESS) {
-    ERROR1(LOG_ERR,"ose_pm_program_info failed - pmstatus: 0x%08x\n",
-	   pm_status);
-    return 0;
-  }
-
-  /* We only clone stdin+stdout, what about stderr? */
-
-  /* create pipes */
-  if (pipe(ifd) < 0) {
-    if (errno == ENOENT)
-      ERRNO_ERR0(LOG_ERR,"The /pipe file system is not available\n");
-    else
-      ERRNO_ERR0(LOG_ERR,"pipe ifd failed\n");
-    return 0;
-  }
-
-  if (pipe(ofd) < 0) {
-    ERRNO_ERR0(LOG_ERR,"pipe ofd failed\n");
-    return 0;
-  }
-
-  /* FIXME Lock? */
-
-  /* backup our stdin stdout */
-  if ((tmp_io[0] = dup(0)) < 0) {
-    ERRNO_ERR0(LOG_ERR,"dup 0 failed\n");
-    return 0;
-  }
-
-  if ((tmp_io[1] = dup(1)) < 0) {
-    ERRNO_ERR0(LOG_ERR,"dup 1 failed\n");
-    return 0;
-  }
-
-  /* set new pipe to fd 0,1 */
-  if (dup2(ifd[1], 1) < 0) {
-    ERRNO_ERR0(LOG_ERR,"dup2 1 failed\n");
-    return 0;
-  }
-
-  if (dup2(ofd[0], 0) < 0) {
-    ERRNO_ERR0(LOG_ERR,"dup2 0 failed\n");
-    return 0;
-  }
-
-  /* clone array to newly created */
-  fd_arr[0] = 2; /* Number of fd's */
-  fd_arr[1] = 0;
-  fd_arr[2] = 1;
-
-  if ((ret_status = efs_clone_array(state->info->main_process, fd_arr))
-      != EFS_SUCCESS) {
-    ERROR1(LOG_ERR,"efs_close_array filed, errcode: %d\n", ret_status);
-    return 0;
-  }
-
-  if (dup2(tmp_io[1], 1) < 0) {
-    ERRNO_ERR0(LOG_ERR,"restoring dup2 1 failed\n");
-    return 0;
-  }
-
-  if (dup2(tmp_io[0], 0) < 0) {
-    ERRNO_ERR0(LOG_ERR,"restoring dup2 1 failed\n");
-    return 0;
-  }
-
-  /* close loose-ends */
-  sf_close(tmp_io[0]);
-  sf_close(tmp_io[1]);
-  sf_close(ifd[1]);
-  sf_close(ofd[0]);
-  state->ifd = ifd[0];
-  state->ofd = ofd[1];
-
-  if (argv && set_env(state->progpid, "ARGV", argv)) {
-    ERRNO_ERR0(LOG_ERR,"something went wrong with set_env\n");
-  }
-
-  /*
-   * Start the program.
-   */
-  pm_status = ose_pm_start_program(state->progpid);
-  if (pm_status != PM_SUCCESS) {
-    ERROR1(LOG_ERR,"ose_pm_install_load_module failed - pmstatus: 0x%08x\n",
-	   pm_status);
-    return 0;
-  }
-
-  return 1;
-}
-
-#define SET_AIO(REQ,FD,SIZE,BUFF)					\
-  /* Make sure to clean data structure of previous request */		\
-  memset(&(REQ),0,sizeof(REQ));						\
-  (REQ).aio_fildes = FD;						\
-  (REQ).aio_offset = FM_POSITION_CURRENT;				\
-  (REQ).aio_nbytes = SIZE;						\
-  (REQ).aio_buf = BUFF;							\
-  (REQ).aio_sigevent.sigev_notify = SIGEV_NONE
-
-#define READ_AIO(REQ,FD,SIZE,BUFF) do {					\
-  SET_AIO(REQ,FD,SIZE,BUFF);						\
-  if (aio_read(&(REQ)) != 0)						\
-    ERRNO_ERR1(LOG_ERR,"aio_read of child_read_req(%d) failed\n",FD);	\
-  } while (0)
-
-#define WRITE_AIO(FD,SIZE,BUFF) do {					\
-    struct aiocb *write_req = malloc(sizeof(struct aiocb));		\
-    char *write_buff = malloc(sizeof(char)*SIZE);			\
-    memcpy(write_buff,BUFF,SIZE);					\
-    SET_AIO(*write_req,FD,SIZE,write_buff);				\
-    if (aio_write(write_req) != 0)					\
-      ERRNO_ERR1(LOG_ERR,"aio_write of write_req(%d) failed\n",FD);	\
-  } while(0)
-
-int pass_on(ProgramState *state);
-int pass_on(ProgramState *s) {
-  SIGSELECT sigsel[] = {0,FM_READ_PTR_REPLY};
-  union SIGNAL *sig;
-  char child_read_buff[BUFSIZ], pipe_read_buff[BUFSIZ];
-  struct aiocb child_read_req, pipe_read_req;
-  int rfd, wfd = 0;
-  FmHandle rfh, child_rfh;
-  int outstanding_writes = 0, got_some = 0, child_done = 0;
-
-  if ((rfd = sf_open(s->r_pipe, O_RDONLY, 0)) < 0) {
-    ERRNO_ERR1(LOG_ERR,"Could not open FIFO '%s' for reading.\n", s->r_pipe);
-    rfd = 0;
-    return 1;
-  }
-
-  attach(NULL,s->progpid);
-
-  /* Open the log file */
-  erts_run_erl_log_open();
-
-  efs_examine_fd(rfd,FLIB_FD_HANDLE,&rfh);
-  efs_examine_fd(s->ifd,FLIB_FD_HANDLE,&child_rfh);
-
-  READ_AIO(child_read_req,s->ifd,BUFSIZ,child_read_buff);
-  READ_AIO(pipe_read_req,rfd,BUFSIZ,pipe_read_buff);
-
-  while (1) {
-    time_t now,last_activity;
-
-    time(&last_activity);
-    sig = receive_w_tmo(erts_run_erl_log_alive_minutes()*60000,sigsel);
-
-    time(&now);
-
-    if (sig) {
-      erts_run_erl_log_activity(0,now,last_activity);
-    } else {
-      /* timeout */
-      erts_run_erl_log_activity(1,now,last_activity);
-      continue;
-    }
-
-    switch (sig->signo) {
-    case OS_ATTACH_SIG: {
-      if (rfd) { sf_close(rfd); rfd = 0; }
-      free_buf(&sig);
-      child_done = 1;
-      /* Make sure to to let all outstanding write request finish */
-      if (outstanding_writes)
-	break;
-      if (wfd) sf_close(wfd);
-      return 0;
-    }
-    case FM_WRITE_PTR_REPLY: {
-      if (sig->fm_write_ptr.status == EFS_SUCCESS) {
-	if (sig->fm_write_ptr.actual < sig->fm_write_ptr.requested) {
-	  WRITE_AIO(wfd, sig->fm_write_ptr.requested-sig->fm_write_ptr.actual,
-		    sig->fm_write_ptr.buffer+sig->fm_write_ptr.actual);
-	}
-      } else {
-	/* Assume to_erl has terminated. */
-	sf_close(wfd);
-	wfd = 0;
-      }
-      free((char*)sig->fm_write_ptr.buffer);
-      aio_dispatch(sig);
-      if ((--outstanding_writes == 0) && child_done) {
-	if (wfd) sf_close(wfd);
-	return 0;
-      }
-      break;
-    }
-    case FM_READ_PTR_REPLY: {
-      /* Child fd */
-      if (sig->fm_read_ptr.handle == child_rfh) {
-
-	/* Child terminated */
-	if (sig->fm_read_ptr.status != EFS_SUCCESS ||
-	    sig->fm_read_ptr.actual == 0) {
-
-	  if (rfd) { sf_close(rfd); rfd = 0; }
-
-	  if (sig->fm_read_ptr.status != EFS_SUCCESS) {
-	    ERROR0(LOG_ERR,"Erlang closed the connection.");
-	    aio_dispatch(sig);
-	    return 1;
-	  }
-
-	  /* child closed connection gracefully */
-	  aio_dispatch(sig);
-	  if (outstanding_writes) {
-	    child_done = 1;
-	    break;
-	  }
-
-	  if (wfd) sf_close(wfd);
-
-	  return 0;
-	} else {
-	  erts_run_erl_log_write(sig->fm_read_ptr.buffer,
-				 sig->fm_read_ptr.actual);
-	  if (wfd) {
-	    WRITE_AIO(wfd, sig->fm_read_ptr.actual, sig->fm_read_ptr.buffer);
-	    outstanding_writes++;
-	  }
-	  aio_dispatch(sig);
-	  READ_AIO(child_read_req, s->ifd,BUFSIZ, child_read_buff);
-	}
-      /* pipe fd */
-      } else if (sig->fm_read_ptr.handle == rfh) {
-	if (sig->fm_read_ptr.status != EFS_SUCCESS) {
-	  if(rfd) sf_close(rfd);
-	  if(wfd) sf_close(wfd);
-	  aio_dispatch(sig);
-	  ERRNO_ERR0(LOG_ERR,"Error in reading from FIFO.");
-	  return 1;
-	}
-	if (sig->fm_read_ptr.actual == 0) {
-	  /* to_erl closed its end of the pipe */
-	  aio_dispatch(sig);
-	  sf_close(rfd);
-	  rfd = sf_open(s->r_pipe,O_RDONLY|DONT_BLOCK_PLEASE, 0);
-	  if (rfd < 0) {
-	    ERRNO_ERR1(LOG_ERR,"Could not open FIFO '%s' for reading.",
-		       s->r_pipe);
-	    rfd = 0;
-	  } else {
-	    READ_AIO(pipe_read_req,rfd,BUFSIZ,pipe_read_buff);
-	  }
-	  got_some = 0; /* reset for next session */
-	} else {
-	  int len = sig->fm_read_ptr.actual;
-	  char *buffer = sig->fm_read_ptr.buffer;
-	  if (!wfd) {
-	    /* Try to open the write pipe to to_erl. Now that we got some data
-	     * from to_erl, to_erl should already be reading this pipe - open
-	     * should succeed. But in case of error, we just ignore it.
-	     */
-	    if ((wfd = sf_open(s->w_pipe, O_WRONLY|DONT_BLOCK_PLEASE, 0)) < 0) {
-	      erts_run_erl_log_status("Client expected on FIFO %s, "
-				      "but can't open (len=%d)\n",
-				      s->w_pipe, sig->fm_read_ptr.actual);
-	      sf_close(rfd);
-	      rfd = sf_open(s->r_pipe, O_RDONLY|DONT_BLOCK_PLEASE, 0);
-	      if (rfd < 0) {
-		ERRNO_ERR1(LOG_ERR,"Could not open FIFO '%s' for reading.",
-			   s->r_pipe);
-		return 1;
-	      }
-	      wfd = 0;
-	    } else {
-#ifdef DEBUG
-	      erts_run_erl_log_status("run_erl: %s opened for writing\n",
-				      s->w_pipe);
-#endif
-	    }
-	  }
-
-	  if (!got_some && wfd && buffer[0] == '\014') {
-	    char wbuf[30];
-	    int wlen = sn_printf(wbuf,sizeof(wbuf),"[run_erl v%u-%u]\n",
-				 RUN_ERL_HI_VER, RUN_ERL_LO_VER);
-	    /* For some reason this, the first write aio seems to
-	       not get an FM_WRITE_PTR_REPLY, so we do not do:
-	       outstanding_writes++;
-	    */
-	    WRITE_AIO(wfd, wlen, wbuf);
-	  }
-	  got_some = 1;
-
-	  /* Write the message */
-#ifdef DEBUG
-	  erts_run_erl_log_status("Pty master write; ");
-#endif
-	  len = erts_run_erl_extract_ctrl_seq(buffer,len, s->ofd);
-
-	  if (len > 0) {
-	    int wlen = erts_run_erl_write_all(s->ofd, buffer, len);
-	    if (wlen != len) {
-	      aio_dispatch(sig);
-	      ERRNO_ERR0(LOG_ERR,"Error in writing to terminal.");
-	      if(rfd) sf_close(rfd);
-	      if(wfd) sf_close(wfd);
-	      return 1;
-	    }
-	  }
-#ifdef DEBUG
-	  erts_run_erl_log_status("OK\n");
-#endif
-	  aio_dispatch(sig);
-	  READ_AIO(pipe_read_req,rfd,BUFSIZ,pipe_read_buff);
-	}
-	}
-      break;
-    }
-    default: {
-      free_buf(&sig);
-      break;
-    }
-    }
-  }
-}
-
-OS_PROCESS(run_erl_process) {
-  char *logdir, *command, *blockname;
-  SIGSELECT sigsel[] = {1,ERTS_SIGNAL_RUN_ERL_SETUP};
-  union SIGNAL *sig = receive(sigsel);
-  ProgramState state;
-  char pipename[FILENAME_BUFSIZ];
-
-  state.info = NULL;
-
-  logdir = strdup(sig->setup.logdir);
-  command = strdup(sig->setup.command);
-  strn_cpy(pipename,sizeof(pipename),sig->setup.pipename);
-
-  if (sig->setup.blockname)
-    blockname = strdup(sig->setup.blockname);
-  else
-    blockname = NULL;
-
-  erts_run_erl_log_init(sig->setup.run_daemon, logdir);
-
-  free_buf(&sig);
-
-  if (erts_run_erl_open_fifo(pipename,state.w_pipe,state.r_pipe))
-    kill_proc(current_process());
-
-  if (create_child_process(command,blockname,&state))
-    pass_on(&state);
-
-  free(logdir);
-  free(command);
-  if (blockname)
-    free(blockname);
-
-  if (state.info)
-    free_buf(((union SIGNAL**)&state.info));
-
-  sf_close(state.ifd);
-  sf_close(state.ofd);
-
-  unlink(state.w_pipe);
-  unlink(state.r_pipe);
-
-  kill_proc(current_process());
-}
-
-int run_erl(int argc,char **argv) {
-  char *pipename, *logdir, *command, *blockname = NULL;
-  int pipename_len, logdir_len, command_len, blockname_len = 0;
-  int i = 1, run_daemon = 0;
-  PROCESS pid;
-  SIGSELECT sigsel[] = {0};
-  union SIGNAL *sig;
-
-  if(argc < 4) {
-    fprintf(stderr,RUN_ERL_USAGE,"run_erl");
-    return 1;
-  }
-
-  while (1) {
-    if (argv[i][0] != '-')
-      break;
-    if (!strcmp(argv[i],"-daemon")) {
-      run_daemon = 1;
-      i++;
-      continue;
-    }
-    if (!strcmp(argv[i],"-block")) {
-      blockname = argv[i+1];
-      blockname_len = strlen(argv[i+1]) + 1;
-      i+=2;
-      continue;
-    }
-    fprintf(stderr,RUN_ERL_USAGE,"run_erl");
-    return 1;
-  }
-
-  pipename = argv[i++];
-  logdir = argv[i++];
-  command = argv[i++];
-
-  /* + 1 to include NULL at end */
-  logdir_len = strlen(logdir) + 1;
-  command_len = strlen(command) + 1;
-  pipename_len = strlen(pipename) + 1;
-
-  if (run_daemon) {
-    /* We request that the run_erl_process should be started from the
-       main process so that it does not die when the shell command
-       returns */
-    PROCESS main_pid;
-    hunt_in_block("run_erl","main",&main_pid);
-    sig = alloc(sizeof(*sig),ERTS_SIGNAL_RUN_ERL_DAEMON);
-    send(&sig,main_pid);
-    sig = receive(sigsel);
-    pid = sender(&sig);
-    free_buf(&sig);
-  } else {
-    pid = create_process(OS_BG_PROC,"run_erl_process",
-			 run_erl_process, 0x800,
-			 0, 0, 0, NULL, 0, 0);
-  }
-
-  sig = alloc(sizeof(RunErlSetup)+
-	      logdir_len+command_len+pipename_len+blockname_len,
-	      ERTS_SIGNAL_RUN_ERL_SETUP);
-  sig->setup.run_daemon = run_daemon;
-  sig->setup.logdir = ((char*)sig)+sizeof(RunErlSetup);
-  sig->setup.command = ((char*)sig)+sizeof(RunErlSetup)+logdir_len;
-  sig->setup.pipename = ((char*)sig)+sizeof(RunErlSetup)+logdir_len+command_len;
-  if (blockname)
-    sig->setup.blockname = ((char*)sig)+sizeof(RunErlSetup)+
-      logdir_len+command_len+pipename_len;
-  else
-    sig->setup.blockname = NULL;
-
-  strcpy(sig->setup.logdir,logdir);
-  strcpy(sig->setup.command,command);
-  strcpy(sig->setup.pipename,pipename);
-  if (blockname) strcpy(sig->setup.blockname,blockname);
-
-  send(&sig,pid);
-
-  if (run_daemon) {
-    /* We are a daemon, error msgs will be sent to ramlog */
-    start(pid);
-    return 1;
-  }
-
-  /* We are not daemon, error msgs will be sent to stderr and we block here */
-  efs_clone(pid);
-  start(pid);
-
-  attach(NULL,pid);
-  sig = receive(sigsel);
-
-  return 1;
-}
diff --git a/erts/etc/ose/run_erl_main.c b/erts/etc/ose/run_erl_main.c
deleted file mode 100644
index 8895c773a1..0000000000
--- a/erts/etc/ose/run_erl_main.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2013. 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%
- */
-/*
- * Module: run_erl_main.c
- *
- * Container for load module that installs both run_erl and to_erl command.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <stdio.h>
-
-#include "ose.h"
-#include "shell.h"
-
-#include "run_erl_common.h"
-#include "run_erl.h"
-#include "to_erl_common.h"
-
-union SIGNAL {
-  SIGSELECT signo;
-};
-
-int main(int argc, char **argv)
-{
-
-  char run_erl_usage[320],
-    to_erl_usage[120];
-
-  (void)stdin;(void)stdout;(void)stderr;
-
-  sprintf(run_erl_usage,RUN_ERL_USAGE,"run_erl [-daemon] [-block blockname]");
-  sprintf(to_erl_usage,TO_ERL_USAGE,"pipename");
-
-  shell_add_cmd_attrs(
-    "run_erl",run_erl_usage,
-    "Redirect Erlang input and output streams",
-    run_erl,DEFAULT_PROC_TYPE,DEFAULT_PRIORITY,DEFAULT_STACK_SIZE);
-
-  shell_add_cmd_attrs(
-    "to_erl",to_erl_usage,
-    "Attach to redirected Erlang input and output streams",
-    to_erl,DEFAULT_PROC_TYPE,DEFAULT_PRIORITY,DEFAULT_STACK_SIZE);
-
-  while (1) {
-    static const SIGSELECT sigsel[] = {0};
-    union SIGNAL *sig = receive(sigsel);
-
-    if (sig->signo == ERTS_SIGNAL_RUN_ERL_DAEMON) {
-      PROCESS pid = create_process(OS_BG_PROC,"run_erl_daemon",
-				   run_erl_process, 0x800,
-				   0, 0, 0, NULL, 0, 0);
-      send_w_s(&sig,pid,sender(&sig));
-    } else {
-      printf("Got unexpected signal!");
-      free_buf(&sig);
-    }
-  }
-
-  return 1;
-}
diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index 19d67de92f..cfacc8b79b 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -774,9 +774,9 @@ define etp-pid-1
 #
   set $etp_pid_1 = (Eterm)($arg0)
   if ($etp_pid_1 & 0xF) == 0x3
-    if (etp_arch_bits == 64 && etp_halfword == 0)
+    if (etp_arch_bits == 64)
       if (etp_big_endian)
-      	set $etp_pid_data = (unsigned) ((((Uint64) $etp_pid_1) >> 36) & 0x0fffffff)
+      	set $etp_pid_data = (unsigned) ((((Uint64) $etp_pid_1) >> 35) & 0x0fffffff)
       else
         set $etp_pid_data = (unsigned) ((((Uint64) $etp_pid_1) >> 4) & 0x0fffffff)
       end
@@ -834,7 +834,7 @@ define etp-port-1
 #
   set $etp_port_1 = (Eterm)($arg0)
   if ($etp_port_1 & 0xF) == 0x7
-    if (etp_arch_bits == 64 && etp_halfword == 0)
+    if (etp_arch_bits == 64)
       if (etp_big_endian)
       	set $etp_port_data = (unsigned) ((((Uint64) $etp_port_1) >> 36) & 0x0fffffff)
       else
@@ -1577,7 +1577,7 @@ define etp-term-dump-pid
 #
   set $etp_pid_1 = (Eterm)($arg0)
   if ($etp_pid_1 & 0xF) == 0x3
-    if (etp_arch_bits == 64 && etp_halfword == 0)
+    if (etp_arch_bits == 64)
       if (etp_big_endian)
         set $etp_pid_data = (unsigned) ((((Uint64) $etp_pid_1) >> 36) & 0x0fffffff)
       else
@@ -1622,7 +1622,7 @@ end
 define etp-pid2pix-1
 # Args: Eterm
 #
-   if (etp_arch_bits == 64 && etp_halfword == 0)
+   if (etp_arch_bits == 64)
       if (etp_big_endian)
       	 set $etp_pix = (int) (((Uint64) $arg0) & 0x0fffffff)
       else
@@ -1965,7 +1965,7 @@ end
 define etp-port-id2pix-1
 # Args: Eterm
 #
-   if (etp_arch_bits == 64 && etp_halfword == 0)
+   if (etp_arch_bits == 64)
       if (etp_big_endian)
       	 set $etp_pix = (int) (((Uint64) $arg0) & 0x0fffffff)
       elser
@@ -2493,12 +2493,6 @@ define etp-system-info
     printf "Little\n"
   end
   printf "Word size: %d-bit\n", etp_arch_bits
-  printf "Halfword: "
-  if (etp_halfword)
-    printf "yes\n"
-  else
-    printf "no\n"
-  end
   printf "HiPE support: "
   if (etp_hipe)
     printf "yes\n"
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index c8414030ca..30210ac172 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2015. 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.
@@ -41,13 +41,16 @@
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
-
 #ifdef HAVE_WORKING_POSIX_OPENPT
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 600 
-#endif
+#  ifndef _XOPEN_SOURCE
+     /* On OS X and BSD, we must leave _XOPEN_SOURCE undefined in order for
+      * the prototype of vsyslog() to be included.
+      */
+#    if !(defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__))
+#      define _XOPEN_SOURCE 600
+#    endif
+#  endif
 #endif
-
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
@@ -65,6 +68,7 @@
 #include <dirent.h>
 #include <termios.h>
 #include <time.h>
+
 #ifdef HAVE_SYSLOG_H
 #  include <syslog.h>
 #endif
@@ -74,6 +78,9 @@
 #ifdef HAVE_UTMP_H
 #  include <utmp.h>
 #endif
+#ifdef HAVE_LIBUTIL_H
+#  include <libutil.h>
+#endif
 #ifdef HAVE_UTIL_H
 #  include <util.h>
 #endif
@@ -84,25 +91,81 @@
 #  include <stropts.h>
 #endif
 
-#include "run_erl_common.h"
+#include "run_erl.h"
 #include "safe_string.h"    /* sn_printf, strn_cpy, strn_cat, etc */
 
+#ifdef O_NONBLOCK
+#  define DONT_BLOCK_PLEASE O_NONBLOCK
+#else
+#  define DONT_BLOCK_PLEASE O_NDELAY
+#  ifndef EAGAIN
+#    define EAGAIN -3898734
+#  endif
+#endif
+
+#define noDEBUG
+
+#define DEFAULT_LOG_GENERATIONS 5
+#define LOG_MAX_GENERATIONS     1000      /* No more than 1000 log files */
+#define LOG_MIN_GENERATIONS     2         /* At least two to switch between */
+#define DEFAULT_LOG_MAXSIZE     100000
+#define LOG_MIN_MAXSIZE         1000      /* Smallast value for changing log file */
+#define LOG_STUBNAME            "erlang.log."
+#define LOG_PERM                0664
+#define DEFAULT_LOG_ACTIVITY_MINUTES    5
+#define DEFAULT_LOG_ALIVE_MINUTES       15
+#define DEFAULT_LOG_ALIVE_FORMAT        "%a %b %e %T %Z %Y"
+#define ALIVE_BUFFSIZ                   256
+
+#define PERM            0600
+#define STATUSFILENAME  "/run_erl.log"
+#define PIPE_STUBNAME   "erlang.pipe"
+#define PIPE_STUBLEN    strlen(PIPE_STUBNAME)
+
+#ifndef FILENAME_MAX
+#define FILENAME_MAX 250
+#endif
+
+#ifndef O_SYNC
+#define O_SYNC 0
+#define USE_FSYNC 1
+#endif
+
 #define MAX(x,y)  ((x) > (y) ? (x) : (y))
 
+#define FILENAME_BUFSIZ FILENAME_MAX
+
 /* prototypes */
 static void usage(char *);
+static int create_fifo(char *name, int perm);
 static int open_pty_master(char **name, int *sfd);
 static int open_pty_slave(char *name);
 static void pass_on(pid_t);
 static void exec_shell(char **);
+static void status(const char *format,...);
+static void error_logf(int priority, int line, const char *format,...);
 static void catch_sigchild(int);
+static int next_log(int log_num);
+static int prev_log(int log_num);
+static int find_next_log_num(void);
+static int open_log(int log_num, int flags);
+static void write_to_log(int* lfd, int* log_num, char* buf, int len);
 static void daemon_init(void);
+static char *simple_basename(char *path);
 static void init_outbuf(void);
 static int outbuf_size(void);
 static void clear_outbuf(void);
 static char* outbuf_first(void);
 static void outbuf_delete(int bytes);
 static void outbuf_append(const char* bytes, int n);
+static int write_all(int fd, const char* buf, int len);
+static int extract_ctrl_seq(char* buf, int len);
+static void set_window_size(unsigned col, unsigned row);
+
+static ssize_t sf_write(int fd, const void *buffer, size_t len);
+static ssize_t sf_read(int fd, void *buffer, size_t len);
+static int sf_open(const char *path, int flags, mode_t mode);
+static int sf_close(int fd);
 
 #ifdef DEBUG
 static void show_terminal_settings(struct termios *t);
@@ -110,11 +173,20 @@ static void show_terminal_settings(struct termios *t);
 
 /* static data */
 static char fifo1[FILENAME_BUFSIZ], fifo2[FILENAME_BUFSIZ];
+static char statusfile[FILENAME_BUFSIZ];
+static char log_dir[FILENAME_BUFSIZ];
 static char pipename[FILENAME_BUFSIZ];
 static FILE *stdstatus = NULL;
+static int log_generations = DEFAULT_LOG_GENERATIONS;
+static int log_maxsize     = DEFAULT_LOG_MAXSIZE;
+static int log_alive_minutes = DEFAULT_LOG_ALIVE_MINUTES;
+static int log_activity_minutes = DEFAULT_LOG_ACTIVITY_MINUTES;
+static int log_alive_in_gmt = 0;
+static char log_alive_format[ALIVE_BUFFSIZ+1];
 static int run_daemon = 0;
 static char *program_name;
 static int mfd; /* master pty fd */
+static unsigned protocol_ver = RUN_ERL_LO_VER; /* assume lowest to begin with */
 
 /*
  * Output buffer.
@@ -145,13 +217,29 @@ static char* outbuf_in;
                                   LOG_PID|LOG_CONS|LOG_NOWAIT,LOG_USER)
 #endif
 
+#define ERROR0(Prio,Format) error_logf(Prio,__LINE__,Format"\n")
+#define ERROR1(Prio,Format,A1) error_logf(Prio,__LINE__,Format"\n",A1)
+#define ERROR2(Prio,Format,A1,A2) error_logf(Prio,__LINE__,Format"\n",A1,A2)
+
+#ifdef HAVE_STRERROR
+#    define ADD_ERRNO(Format) "errno=%d '%s'\n"Format"\n",errno,strerror(errno)
+#else
+#    define ADD_ERRNO(Format) "errno=%d\n"Format"\n",errno
+#endif
+#define ERRNO_ERR0(Prio,Format) error_logf(Prio,__LINE__,ADD_ERRNO(Format))
+#define ERRNO_ERR1(Prio,Format,A1) error_logf(Prio,__LINE__,ADD_ERRNO(Format),A1)
+
+
 int main(int argc, char **argv)
 {
   int childpid;
   int sfd = -1;
-  char *ptyslave=NULL;
+  int fd;
+  char *p, *ptyslave=NULL;
   int i = 1;
   int off_argv;
+  int calculated_pipename = 0;
+  int highest_pipe_num = 0;
 
   program_name = argv[0];
 
@@ -169,16 +257,122 @@ int main(int argc, char **argv)
 
   off_argv = i;
   strn_cpy(pipename, sizeof(pipename), argv[i++]);
-
-  erts_run_erl_log_init(run_daemon,argv[i]);
+  strn_cpy(log_dir, sizeof(log_dir), argv[i]);
+  strn_cpy(statusfile, sizeof(statusfile), log_dir);
+  strn_cat(statusfile, sizeof(statusfile), STATUSFILENAME);
 
 #ifdef DEBUG
-  erts_run_erl_log_status("%s: pid is : %d\n", argv[0], getpid());
+  status("%s: pid is : %d\n", argv[0], getpid());
 #endif
 
-  /* Open read and write fifo */
-  if (erts_run_erl_open_fifo(pipename,fifo1,fifo2))
-    exit(1);
+  /* Get values for LOG file handling from the environment */
+  if ((p = getenv("RUN_ERL_LOG_ALIVE_MINUTES"))) {
+      log_alive_minutes = atoi(p);
+      if (!log_alive_minutes) {
+	  ERROR1(LOG_ERR,"Minimum value for RUN_ERL_LOG_ALIVE_MINUTES is 1 "
+		 "(current value is %s)",p);
+      }
+      log_activity_minutes = log_alive_minutes / 3;
+      if (!log_activity_minutes) {
+	  ++log_activity_minutes;
+      }
+  }
+  if ((p = getenv("RUN_ERL_LOG_ACTIVITY_MINUTES"))) {
+     log_activity_minutes = atoi(p);
+      if (!log_activity_minutes) {
+	  ERROR1(LOG_ERR,"Minimum value for RUN_ERL_LOG_ACTIVITY_MINUTES is 1 "
+		 "(current value is %s)",p);
+      }
+  } 
+  if ((p = getenv("RUN_ERL_LOG_ALIVE_FORMAT"))) {
+      if (strlen(p) > ALIVE_BUFFSIZ) {
+	  ERROR1(LOG_ERR, "RUN_ERL_LOG_ALIVE_FORMAT can contain a maximum of "
+		 "%d characters", ALIVE_BUFFSIZ);
+      }
+      strn_cpy(log_alive_format, sizeof(log_alive_format), p);
+  } else {
+      strn_cpy(log_alive_format, sizeof(log_alive_format), DEFAULT_LOG_ALIVE_FORMAT);
+  }
+  if ((p = getenv("RUN_ERL_LOG_ALIVE_IN_UTC")) && strcmp(p,"0")) {
+      ++log_alive_in_gmt;
+  }
+  if ((p = getenv("RUN_ERL_LOG_GENERATIONS"))) {
+    log_generations = atoi(p);
+    if (log_generations < LOG_MIN_GENERATIONS)
+      ERROR1(LOG_ERR,"Minimum RUN_ERL_LOG_GENERATIONS is %d", LOG_MIN_GENERATIONS);
+    if (log_generations > LOG_MAX_GENERATIONS)
+      ERROR1(LOG_ERR,"Maximum RUN_ERL_LOG_GENERATIONS is %d", LOG_MAX_GENERATIONS);
+  }
+
+  if ((p = getenv("RUN_ERL_LOG_MAXSIZE"))) {
+    log_maxsize = atoi(p);
+    if (log_maxsize < LOG_MIN_MAXSIZE)
+      ERROR1(LOG_ERR,"Minimum RUN_ERL_LOG_MAXSIZE is %d", LOG_MIN_MAXSIZE);
+  }
+
+  /*
+   * Create FIFOs and open them 
+   */
+
+  if(*pipename && pipename[strlen(pipename)-1] == '/') {
+    /* The user wishes us to find a unique pipe name in the specified */
+    /* directory */
+    DIR *dirp;
+    struct dirent *direntp;
+
+    calculated_pipename = 1;
+    dirp = opendir(pipename);
+    if(!dirp) {
+      ERRNO_ERR1(LOG_ERR,"Can't access pipe directory '%s'.", pipename);
+      exit(1);
+    }
+
+    /* Check the directory for existing pipes */
+    
+    while((direntp=readdir(dirp)) != NULL) {
+      if(strncmp(direntp->d_name,PIPE_STUBNAME,PIPE_STUBLEN)==0) {
+	int num = atoi(direntp->d_name+PIPE_STUBLEN+1);
+	if(num > highest_pipe_num)
+	  highest_pipe_num = num;
+      }
+    }	
+    closedir(dirp);
+    strn_catf(pipename, sizeof(pipename), "%s.%d",
+	      PIPE_STUBNAME, highest_pipe_num+1);
+  } /* if */
+
+  for(;;) {
+      /* write FIFO - is read FIFO for `to_erl' program */
+      strn_cpy(fifo1, sizeof(fifo1), pipename);
+      strn_cat(fifo1, sizeof(fifo1), ".r");
+      if (create_fifo(fifo1, PERM) < 0) {
+	  ERRNO_ERR1(LOG_ERR,"Cannot create FIFO %s for writing.", fifo1);
+	  exit(1);
+      }
+      
+      /* read FIFO - is write FIFO for `to_erl' program */
+      strn_cpy(fifo2, sizeof(fifo2), pipename);
+      strn_cat(fifo2, sizeof(fifo2), ".w");
+      
+      /* Check that nobody is running run_erl already */
+      if ((fd = sf_open(fifo2, O_WRONLY|DONT_BLOCK_PLEASE, 0)) >= 0) {
+	  /* Open as client succeeded -- run_erl is already running! */
+	  sf_close(fd);
+	  if (calculated_pipename) {
+	      ++highest_pipe_num;
+	      strn_catf(pipename, sizeof(pipename), "%s.%d",
+			PIPE_STUBNAME, highest_pipe_num+1);
+	      continue;
+	  } 
+	  fprintf(stderr, "Erlang already running on pipe %s.\n", pipename);
+	  exit(1);
+      }
+      if (create_fifo(fifo2, PERM) < 0) { 
+	  ERRNO_ERR1(LOG_ERR,"Cannot create FIFO %s for reading.", fifo2);
+	  exit(1);
+      }
+      break;
+  }
 
   /*
    * Open master pseudo-terminal
@@ -250,7 +444,7 @@ int main(int argc, char **argv)
     sf_close(2);
 
     if (dup(sfd) != 0 || dup(sfd) != 1 || dup(sfd) != 2) {
-      erts_run_erl_log_status("Cannot dup\n");
+      status("Cannot dup\n");
     }
     sf_close(sfd);
     exec_shell(argv+off_argv); /* exec_shell expects argv[2] to be */
@@ -293,7 +487,9 @@ static void pass_on(pid_t childpid)
     struct timeval timeout;
     time_t last_activity;
     char buf[BUFSIZ];
-    int rfd, wfd=0;
+    char log_alive_buffer[ALIVE_BUFFSIZ+1];
+    int lognum;
+    int rfd, wfd=0, lfd=0;
     int maxfd;
     int ready;
     int got_some = 0; /* from to_erl */
@@ -308,12 +504,13 @@ static void pass_on(pid_t childpid)
     }
     
 #ifdef DEBUG
-    erts_run_erl_log_status("run_erl: %s opened for reading\n", fifo2);
+    status("run_erl: %s opened for reading\n", fifo2);
 #endif
     
     /* Open the log file */
     
-    erts_run_erl_log_open();
+    lognum = find_next_log_num();
+    lfd = open_log(lognum, O_RDWR|O_APPEND|O_CREAT|O_SYNC);
     
     /* Enter the work loop */
     
@@ -332,8 +529,7 @@ static void pass_on(pid_t childpid)
 	    writefds_ptr = &writefds;
 	}
 	time(&last_activity);
-	/* don't assume old BSD bug */
-	timeout.tv_sec  = erts_run_erl_log_alive_minutes()*60;
+	timeout.tv_sec  = log_alive_minutes*60; /* don't assume old BSD bug */
 	timeout.tv_usec = 0;
 	ready = select(maxfd + 1, &readfds, writefds_ptr, NULL, &timeout);
 	if (ready < 0) {
@@ -363,7 +559,28 @@ static void pass_on(pid_t childpid)
 
 	    /* Check how long time we've been inactive */
 	    time(&now);
-	    erts_run_erl_log_activity(!ready,now,last_activity);
+	    if(!ready || now - last_activity > log_activity_minutes*60) {
+		/* Either a time out: 15 minutes without action, */
+		/* or something is coming in right now, but it's a long time */
+		/* since last time, so let's write a time stamp this message */
+		struct tm *tmptr;
+		if (log_alive_in_gmt) {
+		    tmptr = gmtime(&now);
+		} else {
+		    tmptr = localtime(&now);
+		}
+		if (!strftime(log_alive_buffer, ALIVE_BUFFSIZ, log_alive_format,
+			      tmptr)) {
+		    strn_cpy(log_alive_buffer, sizeof(log_alive_buffer),
+			     "(could not format time in 256 positions "
+			     "with current format string.)");
+		}
+		log_alive_buffer[ALIVE_BUFFSIZ] = '\0';
+
+		sn_printf(buf, sizeof(buf), "\n===== %s%s\n", 
+			  ready?"":"ALIVE ", log_alive_buffer);
+		write_to_log(&lfd, &lognum, buf, strlen(buf));
+	    }
 	}
 
 	/*
@@ -398,7 +615,7 @@ static void pass_on(pid_t childpid)
 	 */
 	if (FD_ISSET(mfd, &readfds)) {
 #ifdef DEBUG
-	    erts_run_erl_log_status("Pty master read; ");
+	    status("Pty master read; ");
 #endif
 	    if ((len = sf_read(mfd, buf, BUFSIZ)) <= 0) {
 		sf_close(rfd);
@@ -416,7 +633,7 @@ static void pass_on(pid_t childpid)
 		exit(0);
 	    }
 
-	    erts_run_erl_log_write(buf, len);
+	    write_to_log(&lfd, &lognum, buf, len);
 
 	    /*
 	     * Save in the output queue.
@@ -432,7 +649,7 @@ static void pass_on(pid_t childpid)
 	 */
 	if (FD_ISSET(rfd, &readfds)) {
 #ifdef DEBUG
-	    erts_run_erl_log_status("FIFO read; ");
+	    status("FIFO read; ");
 #endif
 	    if ((len = sf_read(rfd, buf, BUFSIZ)) < 0) {
 		sf_close(rfd);
@@ -461,7 +678,7 @@ static void pass_on(pid_t childpid)
 		     * should succeed. But in case of error, we just ignore it.
 		     */
 		    if ((wfd = sf_open(fifo1, O_WRONLY|DONT_BLOCK_PLEASE, 0)) < 0) {
-			erts_run_erl_log_status("Client expected on FIFO %s, but can't open (len=%d)\n",
+			status("Client expected on FIFO %s, but can't open (len=%d)\n",
 			       fifo1, len);
 			sf_close(rfd);
 			rfd = sf_open(fifo2, O_RDONLY|DONT_BLOCK_PLEASE, 0);
@@ -473,7 +690,7 @@ static void pass_on(pid_t childpid)
 		    } 
 		    else {
 #ifdef DEBUG
-			erts_run_erl_log_status("run_erl: %s opened for writing\n", fifo1);
+			status("run_erl: %s opened for writing\n", fifo1);
 #endif
 		    }
 		}
@@ -489,15 +706,14 @@ static void pass_on(pid_t childpid)
 
 		/* Write the message */
 #ifdef DEBUG
-		erts_run_erl_log_status("Pty master write; ");
+		status("Pty master write; ");
 #endif
-		len = erts_run_erl_extract_ctrl_seq(buf, len, mfd);
+		len = extract_ctrl_seq(buf, len);
 
 		if(len==1 && buf[0] == '\003') {
 		    kill(childpid,SIGINT);
-		}
-		else if (len>0 && erts_run_erl_write_all(mfd, buf, len) != len)
-		  {
+		} 
+		else if (len>0 && write_all(mfd, buf, len) != len) {
 		    ERRNO_ERR0(LOG_ERR,"Error in writing to terminal.");
 		    sf_close(rfd);
 		    if(wfd) sf_close(wfd);
@@ -506,7 +722,7 @@ static void pass_on(pid_t childpid)
 		}
 	    }
 #ifdef DEBUG
-	    erts_run_erl_log_status("OK\n");
+	    status("OK\n");
 #endif
 	}
     }
@@ -516,6 +732,173 @@ static void catch_sigchild(int sig)
 {
 }
 
+/*
+ * next_log:
+ * Returns the index number that follows the given index number.
+ * (Wrapping after log_generations)
+ */
+static int next_log(int log_num) {
+  return log_num>=log_generations?1:log_num+1;
+}
+
+/*
+ * prev_log:
+ * Returns the index number that precedes the given index number.
+ * (Wrapping after log_generations)
+ */
+static int prev_log(int log_num) {
+  return log_num<=1?log_generations:log_num-1;
+}
+
+/*
+ * find_next_log_num()
+ * Searches through the log directory to check which logs that already
+ * exist. It finds the "hole" in the sequence, and returns the index
+ * number for the last log in the log sequence. If there is no hole, index
+ * 1 is returned.
+ */
+static int find_next_log_num(void) {
+  int i, next_gen, log_gen;
+  DIR *dirp;
+  struct dirent *direntp;
+  int log_exists[LOG_MAX_GENERATIONS+1];
+  int stub_len = strlen(LOG_STUBNAME);
+
+  /* Initialize exiting log table */
+
+  for(i=log_generations; i>=0; i--)
+    log_exists[i] = 0;
+  dirp = opendir(log_dir);
+  if(!dirp) {
+    ERRNO_ERR1(LOG_ERR,"Can't access log directory '%s'", log_dir);
+    exit(1);
+  }
+
+  /* Check the directory for existing logs */
+
+  while((direntp=readdir(dirp)) != NULL) {
+    if(strncmp(direntp->d_name,LOG_STUBNAME,stub_len)==0) {
+      int num = atoi(direntp->d_name+stub_len);
+      if(num < 1 || num > log_generations)
+	continue;
+      log_exists[num] = 1;
+    }
+  }	
+  closedir(dirp);
+
+  /* Find out the next available log file number */
+
+  next_gen = 0;
+  for(i=log_generations; i>=0; i--) {
+    if(log_exists[i])
+      if(next_gen)
+	break;
+      else 
+	;
+    else
+      next_gen = i;
+  }
+
+  /* Find out the current log file number */
+
+  if(next_gen)
+    log_gen = prev_log(next_gen);
+  else
+    log_gen = 1;
+
+  return log_gen;
+} /* find_next_log_num() */
+
+/* open_log()
+ * Opens a log file (with given index) for writing. Writing may be
+ * at the end or a trucnating write, according to flags.
+ * A LOGGING STARTED and time stamp message is inserted into the log file
+ */
+static int open_log(int log_num, int flags)
+{
+  char buf[FILENAME_MAX];
+  time_t now;
+  struct tm *tmptr;
+  char log_buffer[ALIVE_BUFFSIZ+1];
+  int lfd;
+
+  /* Remove the next log (to keep a "hole" in the log sequence) */
+  sn_printf(buf, sizeof(buf), "%s/%s%d",
+	    log_dir, LOG_STUBNAME, next_log(log_num));
+  unlink(buf);
+
+  /* Create or continue on the current log file */
+  sn_printf(buf, sizeof(buf), "%s/%s%d", log_dir, LOG_STUBNAME, log_num);
+  if((lfd = sf_open(buf, flags, LOG_PERM))<0){
+      ERRNO_ERR1(LOG_ERR,"Can't open log file '%s'.", buf);
+    exit(1);
+  }
+
+  /* Write a LOGGING STARTED and time stamp into the log file */
+  time(&now);
+  if (log_alive_in_gmt) {
+      tmptr = gmtime(&now);
+  } else {
+      tmptr = localtime(&now);
+  }
+  if (!strftime(log_buffer, ALIVE_BUFFSIZ, log_alive_format,
+		tmptr)) {
+      strn_cpy(log_buffer, sizeof(log_buffer),
+	      "(could not format time in 256 positions "
+	      "with current format string.)");
+  }
+  log_buffer[ALIVE_BUFFSIZ] = '\0';
+
+  sn_printf(buf, sizeof(buf), "\n=====\n===== LOGGING STARTED %s\n=====\n",
+	    log_buffer);
+  if (write_all(lfd, buf, strlen(buf)) < 0)
+      status("Error in writing to log.\n");
+
+#if USE_FSYNC
+  fsync(lfd);
+#endif
+
+  return lfd;
+}
+
+/* write_to_log()
+ * Writes a message to a log file. If the current log file is full,
+ * a new log file is opened.
+ */
+static void write_to_log(int* lfd, int* log_num, char* buf, int len)
+{
+  int size;
+
+  /* Decide if new logfile needed, and open if so */
+  
+  size = lseek(*lfd,0,SEEK_END);
+  if(size+len > log_maxsize) {
+    sf_close(*lfd);
+    *log_num = next_log(*log_num);
+    *lfd = open_log(*log_num, O_RDWR|O_CREAT|O_TRUNC|O_SYNC); 
+  }
+
+  /* Write to log file */
+
+  if (write_all(*lfd, buf, len) < 0) {
+    status("Error in writing to log.\n");
+  }
+
+#if USE_FSYNC
+  fsync(*lfd);
+#endif
+}
+
+/* create_fifo()
+ * Creates a new fifo with the given name and permission.
+ */
+static int create_fifo(char *name, int perm)
+{
+  if ((mkfifo(name, perm) < 0) && (errno != EEXIST))
+    return -1;
+  return 0;
+}
+
 
 /* open_pty_master()
  * Find a master device, open and return fd and slave device name.
@@ -712,9 +1095,9 @@ static void exec_shell(char **argv)
   else
     argv[0] = sh;
   argv[1] = "-c";
-  erts_run_erl_log_status("Args before exec of shell:\n");
+  status("Args before exec of shell:\n");
   for (vp = argv, i = 0; *vp; vp++, i++)
-    erts_run_erl_log_status("argv[%d] = %s\n", i, *vp);
+    status("argv[%d] = %s\n", i, *vp);
   if (stdstatus) {
       fclose(stdstatus);
   }
@@ -725,6 +1108,26 @@ static void exec_shell(char **argv)
   ERRNO_ERR0(LOG_ERR,"Could not execv");
 }
 
+/* status()
+ * Prints the arguments to a status file
+ * Works like printf (see vfrpintf)
+ */
+static void status(const char *format,...)
+{
+  va_list args;
+  time_t now;
+
+  if (stdstatus == NULL)
+    stdstatus = fopen(statusfile, "w");
+  if (stdstatus == NULL)
+    return;
+  now = time(NULL);
+  fprintf(stdstatus, "run_erl [%d] %s", (int)getpid(), ctime(&now));
+  va_start(args, format);
+  vfprintf(stdstatus, format, args);
+  va_end(args);
+  fflush(stdstatus);
+}
 
 static void daemon_init(void) 
      /* As R Stevens wants it, to a certain extent anyway... */ 
@@ -764,10 +1167,47 @@ static void daemon_init(void)
     run_daemon = 1;
 }
 
+/* error_logf()
+ * Prints the arguments to stderr or syslog
+ * Works like printf (see vfprintf)
+ */
+static void error_logf(int priority, int line, const char *format, ...)
+{
+    va_list args;
+    va_start(args, format);
+
+#ifdef HAVE_SYSLOG_H
+    if (run_daemon) {
+	vsyslog(priority,format,args);
+    }
+    else
+#endif
+    {
+	time_t now = time(NULL);
+	fprintf(stderr, "run_erl:%d [%d] %s", line, (int)getpid(), ctime(&now));
+	vfprintf(stderr, format, args);
+    }
+    va_end(args);
+}	
+
 static void usage(char *pname)
 {
-  fprintf(stderr, "Usage: ");
-  fprintf(stderr, RUN_ERL_USAGE, pname);
+  fprintf(stderr, "Usage: %s (pipe_name|pipe_dir/) log_dir \"command [parameters ...]\"\n", pname);
+  fprintf(stderr, "\nYou may also set the environment variables RUN_ERL_LOG_GENERATIONS\n");
+  fprintf(stderr, "and RUN_ERL_LOG_MAXSIZE to the number of log files to use and the\n");
+  fprintf(stderr, "size of the log file when to switch to the next log file\n");
+}
+
+/* Instead of making sure basename exists, we do our own */
+static char *simple_basename(char *path)
+{
+    char *ptr;
+    for (ptr = path; *ptr != '\0'; ++ptr) {
+	if (*ptr == '/') {
+	    path = ptr + 1;
+	}
+    }
+    return path;
 }
 
 static void init_outbuf(void)
@@ -838,6 +1278,114 @@ static void outbuf_append(const char* buf, int n)
     outbuf_in += n;
 }
 
+/* Call write() until entire buffer has been written or error.
+ * Return len or -1.
+ */
+static int write_all(int fd, const char* buf, int len)
+{
+    int left = len;
+    int written;
+    for (;;) {
+	written = sf_write(fd,buf,left);
+	if (written == left) {
+	    return len;
+	}
+	if (written < 0) {
+	    return -1;
+	}
+	left -= written;
+	buf += written;
+    }
+}
+
+static ssize_t sf_read(int fd, void *buffer, size_t len) {
+    ssize_t n = 0;
+
+    do { n = read(fd, buffer, len); } while (n < 0 && errno == EINTR);
+
+    return n;
+}
+
+static ssize_t sf_write(int fd, const void *buffer, size_t len) {
+    ssize_t n = 0;
+
+    do { n = write(fd, buffer, len); } while (n < 0 && errno == EINTR);
+
+    return n;
+}
+
+static int sf_open(const char *path, int type, mode_t mode) {
+    int fd = 0;
+
+    do { fd = open(path, type, mode); } while(fd < 0 && errno == EINTR);
+
+    return fd;
+}
+static int sf_close(int fd) {
+    int res = 0;
+
+    do { res = close(fd); } while(fd < 0 && errno == EINTR);
+
+    return res;
+}
+/* Extract any control sequences that are ment only for run_erl
+ * and should not be forwarded to the pty.
+ */
+static int extract_ctrl_seq(char* buf, int len)
+{
+    static const char prefix[] = "\033_";
+    static const char suffix[] = "\033\\";
+    char* bufend = buf + len;
+    char* start = buf;
+    char* command;
+    char* end;
+    
+    for (;;) {
+	start = find_str(start, bufend-start, prefix);
+	if (!start) break;
+	
+	command = start + strlen(prefix);
+	end = find_str(command, bufend-command, suffix);
+	if (end) {
+	    unsigned col, row;
+	    if (sscanf(command,"version=%u", &protocol_ver)==1) {
+		/*fprintf(stderr,"to_erl v%u\n", protocol_ver);*/
+	    }
+	    else if (sscanf(command,"winsize=%u,%u", &col, &row)==2) {
+		set_window_size(col,row);
+	    }
+	    else {
+		ERROR2(LOG_ERR, "Ignoring unknown ctrl command '%.*s'\n",
+		       (int)(end-command), command);
+	    }
+	  
+	    /* Remove ctrl sequence from buf */
+	    end += strlen(suffix);
+	    memmove(start, end, bufend-end);
+	    bufend -= end - start;
+	}
+	else {
+	    ERROR2(LOG_ERR, "Missing suffix in ctrl sequence '%.*s'\n",
+		   (int)(bufend-start), start);
+	    break;
+	}
+    }
+    return bufend - buf;
+}
+
+static void set_window_size(unsigned col, unsigned row)
+{
+#ifdef TIOCSWINSZ	
+    struct winsize ws;
+    ws.ws_col = col;
+    ws.ws_row = row;
+    if (ioctl(mfd, TIOCSWINSZ, &ws) < 0) {
+	ERRNO_ERR0(LOG_ERR,"Failed to set window size");
+    }
+#endif
+}
+
+
 #ifdef DEBUG
 
 #define S(x)  ((x) > 0 ? 1 : 0)
diff --git a/erts/etc/common/run_erl_vsn.h b/erts/etc/unix/run_erl.h
index 2c3e67e81c..cc70a98e52 100644
--- a/erts/etc/common/run_erl_vsn.h
+++ b/erts/etc/unix/run_erl.h
@@ -1,8 +1,8 @@
 /*
  * %CopyrightBegin%
- *
+ * 
  * Copyright Ericsson AB 2008-2009. 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
@@ -14,7 +14,7 @@
  * 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%
  */
 
@@ -28,3 +28,4 @@
  * 0: Older, without version handshake
  * 1: R12B-3, version handshake + window size ctrl
  */
+
diff --git a/erts/etc/common/safe_string.c b/erts/etc/unix/safe_string.c
index cdcdbf16f0..a5c11d41d8 100644
--- a/erts/etc/common/safe_string.c
+++ b/erts/etc/unix/safe_string.c
@@ -1,8 +1,8 @@
 /*
  * %CopyrightBegin%
- *
+ * 
  * Copyright Ericsson AB 2008-2009. 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
@@ -14,12 +14,12 @@
  * 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%
  */
-/*
+/* 
  * Module: safe_string.c
- *
+ * 
  * This is a bunch of generic string operation
  * that are safe regarding buffer overflow.
  *
@@ -121,3 +121,4 @@ void* memmove(void *dest, const void *src, size_t n)
     return dest;
 }
 #endif /* HAVE_MEMMOVE */
+
diff --git a/erts/etc/common/safe_string.h b/erts/etc/unix/safe_string.h
index f9d2b2023a..5a471f10de 100644
--- a/erts/etc/common/safe_string.h
+++ b/erts/etc/unix/safe_string.h
@@ -1,8 +1,8 @@
 /*
  * %CopyrightBegin%
- *
+ * 
  * Copyright Ericsson AB 2008-2009. 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
@@ -14,12 +14,12 @@
  * 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%
  */
-/*
+/* 
  * Module: safe_string.h
- *
+ * 
  * This is an interface to a bunch of generic string operation
  * that are safe regarding buffer overflow.
  *
@@ -63,3 +63,4 @@ char* find_str(const char* haystack, int size, const char* needle);
 #ifndef HAVE_MEMMOVE
 void* memmove(void *dest, const void *src, size_t n);
 #endif
+
diff --git a/erts/etc/unix/to_erl.c b/erts/etc/unix/to_erl.c
index 82d3218964..0bd469727c 100644
--- a/erts/etc/unix/to_erl.c
+++ b/erts/etc/unix/to_erl.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2015. 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.
@@ -17,9 +17,592 @@
  * 
  * %CopyrightEnd%
  */
+/* 
+ * Module: to_erl.c
+ * 
+ * This module implements a process that opens two specified FIFOs, one
+ * for reading and one for writing; reads from its stdin, and writes what
+ * it has read to the write FIF0; reads from the read FIFO, and writes to
+ * its stdout.
+ *
+  ________                            _________ 
+ |        |--<-- pipe.r (fifo1) --<--|         |
+ | to_erl |                          | run_erl | (parent)
+ |________|-->-- pipe.w (fifo2) -->--|_________|
+                                          ^ master pty
+                                          |
+                                          | slave pty
+                                      ____V____ 
+                                     |         |
+                                     |  "erl"  | (child)
+                                     |_________|
+ */
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <termios.h>
+#include <dirent.h>
+#include <signal.h>
+#include <errno.h>
+#ifdef HAVE_SYS_IOCTL_H
+#  include <sys/ioctl.h>
+#endif
+
+#include "run_erl.h"
+#include "safe_string.h"   /* strn_cpy, strn_catf, sn_printf, etc. */
+
+#if defined(O_NONBLOCK)
+# define DONT_BLOCK_PLEASE O_NONBLOCK
+#else
+# define DONT_BLOCK_PLEASE O_NDELAY
+# if !defined(EAGAIN)
+#  define EAGAIN -3898734
+# endif
+#endif
+
+#ifdef HAVE_STRERROR
+#  define STRERROR(x) strerror(x)
+#else
+#  define STRERROR(x) ""
+#endif
+
+#define noDEBUG
+
+#define PIPE_DIR        "/tmp/"
+#define PIPE_STUBNAME   "erlang.pipe"
+#define PIPE_STUBLEN    strlen(PIPE_STUBNAME)
+
+#ifdef DEBUG
+#define STATUS(s)  { fprintf(stderr, (s)); fflush(stderr); }
+#else
+#define STATUS(s)
+#endif
+
+#ifndef FILENAME_MAX
+#define FILENAME_MAX 250
+#endif
+
+static struct termios tty_smode, tty_rmode;
+static int tty_eof = 0;
+static int recv_sig = 0;
+static int protocol_ver = RUN_ERL_LO_VER; /* assume lowest to begin with */
+
+static int write_all(int fd, const char* buf, int len);
+static int window_size_seq(char* buf, size_t bufsz);
+static int version_handshake(char* buf, int len, int wfd);
+#ifdef DEBUG
+static void show_terminal_settings(struct termios *);
+#endif
+
+static void handle_ctrlc(int sig)
+{
+    /* Reinstall the handler, and signal break flag */
+    signal(SIGINT,handle_ctrlc);
+    recv_sig = SIGINT;
+}  
+
+static void handle_sigwinch(int sig)
+{
+    recv_sig = SIGWINCH;
+}
+
+static void usage(char *pname)
+{
+    fprintf(stderr, "Usage: %s [-h|-F] [pipe_name|pipe_dir/]\n", pname);
+    fprintf(stderr, "\t-h\tThis help text.\n");
+    fprintf(stderr, "\t-F\tForce connection even though pipe is locked by other to_erl process.\n");
+}
+
+int main(int argc, char **argv)
+{
+    char  FIFO1[FILENAME_MAX], FIFO2[FILENAME_MAX];
+    int i, len, wfd, rfd;
+    fd_set readfds;
+    char buf[BUFSIZ];
+    char pipename[FILENAME_MAX];
+    int pipeIx = 1;
+    int force_lock = 0;
+    int got_some = 0;
+
+    if (argc >= 2 && argv[1][0]=='-') {
+	switch (argv[1][1]) {
+	case 'h':
+	    usage(argv[0]);
+	    exit(1);
+	case 'F':
+	    force_lock = 1;
+	    break;
+	default:
+	    fprintf(stderr,"Invalid option '%s'\n",argv[1]);
+	    exit(1);
+	}
+	pipeIx = 2;
+    }
+    
+#ifdef DEBUG
+    fprintf(stderr, "%s: pid is : %d\n", argv[0], (int)getpid());
+#endif
+    
+    strn_cpy(pipename, sizeof(pipename),
+	     (argv[pipeIx] ? argv[pipeIx] : PIPE_DIR));
+    
+    if(*pipename && pipename[strlen(pipename)-1] == '/') {
+	/* The user wishes us to find a pipe name in the specified */
+	/* directory */
+	int highest_pipe_num = 0;
+	DIR *dirp;
+	struct dirent *direntp;
+
+	dirp = opendir(pipename);
+	if(!dirp) {
+	    fprintf(stderr, "Can't access pipe directory %s: %s\n", pipename, strerror(errno));
+	    exit(1);
+	}
+
+	/* Check the directory for existing pipes */
+    
+	while((direntp=readdir(dirp)) != NULL) {
+	    if(strncmp(direntp->d_name,PIPE_STUBNAME,PIPE_STUBLEN)==0) {
+		int num = atoi(direntp->d_name+PIPE_STUBLEN+1);
+		if(num > highest_pipe_num)
+		    highest_pipe_num = num;
+	    }
+	}	
+	closedir(dirp);
+	strn_catf(pipename, sizeof(pipename), (highest_pipe_num?"%s.%d":"%s"),
+		  PIPE_STUBNAME, highest_pipe_num);
+    } /* if */
+
+    /* read FIFO */
+    sn_printf(FIFO1,sizeof(FIFO1),"%s.r",pipename);
+    /* write FIFO */
+    sn_printf(FIFO2,sizeof(FIFO2),"%s.w",pipename);
+
+    /* Check that nobody is running to_erl on this pipe already */
+    if ((wfd = open (FIFO1, O_WRONLY|DONT_BLOCK_PLEASE, 0)) >= 0) {
+	/* Open as server succeeded -- to_erl is already running! */
+	close(wfd);
+	fprintf(stderr, "Another to_erl process already attached to pipe "
+			"%s.\n", pipename);
+	if (force_lock) {
+	    fprintf(stderr, "But we proceed anyway by force (-F).\n");
+	} 
+	else {
+	    exit(1);
+	}
+    }
+
+    if ((rfd = open (FIFO1, O_RDONLY|DONT_BLOCK_PLEASE, 0)) < 0) {
+#ifdef DEBUG
+	fprintf(stderr, "Could not open FIFO %s for reading.\n", FIFO1);
+#endif
+	fprintf(stderr, "No running Erlang on pipe %s: %s\n", pipename, strerror(errno));
+	exit(1);
+    }
+#ifdef DEBUG
+    fprintf(stderr, "to_erl: %s opened for reading\n", FIFO1);
+#endif
+    
+    if ((wfd = open (FIFO2, O_WRONLY|DONT_BLOCK_PLEASE, 0)) < 0) {
+#ifdef DEBUG
+	fprintf(stderr, "Could not open FIFO %s for writing.\n", FIFO2);
+#endif
+	fprintf(stderr, "No running Erlang on pipe %s: %s\n", pipename, strerror(errno));
+	close(rfd);
+	exit(1);
+    }
+#ifdef DEBUG
+    fprintf(stderr, "to_erl: %s opened for writing\n", FIFO2);
+#endif
+    
+    fprintf(stderr, "Attaching to %s (^D to exit)\n\n", pipename);
+    
+    /* Set break handler to our handler */
+    signal(SIGINT,handle_ctrlc);
+
+    /* 
+     * Save the current state of the terminal, and set raw mode.
+     */
+    if (tcgetattr(0, &tty_rmode) , 0) {
+	fprintf(stderr, "Cannot get terminals current mode\n");
+	exit(-1);
+    }
+    tty_smode = tty_rmode;
+    tty_eof = '\004'; /* Ctrl+D to exit */
+#ifdef DEBUG
+    show_terminal_settings(&tty_rmode);
+#endif
+    tty_smode.c_iflag =
+	1*BRKINT |/*Signal interrupt on break.*/
+	    1*IGNPAR |/*Ignore characters with parity errors.*/
+		1*ISTRIP |/*Strip character.*/
+		    0;
+    
+#if 0
+0*IGNBRK |/*Ignore break condition.*/
+0*PARMRK |/*Mark parity errors.*/
+0*INPCK  |/*Enable input parity check.*/
+0*INLCR  |/*Map NL to CR on input.*/
+0*IGNCR  |/*Ignore CR.*/
+0*ICRNL  |/*Map CR to NL on input.*/
+0*IUCLC  |/*Map upper-case to lower-case on input.*/
+0*IXON   |/*Enable start/stop output control.*/
+0*IXANY  |/*Enable any character to restart output.*/
+0*IXOFF  |/*Enable start/stop input control.*/
+0*IMAXBEL|/*Echo BEL on input line too long.*/
+#endif
+						
+    tty_smode.c_oflag =
+	1*OPOST  |/*Post-process output.*/
+	    1*ONLCR  |/*Map NL to CR-NL on output.*/
+#ifdef XTABS
+		1*XTABS  |/*Expand tabs to spaces. (Linux)*/
+#endif
+#ifdef OXTABS
+		    1*OXTABS  |/*Expand tabs to spaces. (FreeBSD)*/
+#endif
+#ifdef NL0
+			1*NL0    |/*Select newline delays*/
+#endif
+#ifdef CR0
+			    1*CR0    |/*Select carriage-return delays*/
+#endif
+#ifdef TAB0
+				1*TAB0   |/*Select horizontal tab delays*/
+#endif
+#ifdef BS0
+				    1*BS0    |/*Select backspace delays*/
+#endif
+#ifdef VT0
+					1*VT0    |/*Select vertical tab delays*/
+#endif
+#ifdef FF0
+					    1*FF0    |/*Select form feed delays*/
+#endif
+											    0;
+    
+#if 0
+0*OLCUC  |/*Map lower case to upper on output.*/
+0*OCRNL  |/*Map CR to NL on output.*/
+0*ONOCR  |/*No CR output at column 0.*/
+0*ONLRET |/*NL performs CR function.*/
+0*OFILL  |/*Use fill characters for delay.*/
+0*OFDEL  |/*Fill is DEL, else NULL.*/
+0*NL1    |
+0*CR1    |
+0*CR2    |
+0*CR3    |
+0*TAB1   |
+0*TAB2   |
+0*TAB3   |/*Expand tabs to spaces.*/
+0*BS1    |
+0*VT1    |
+0*FF1    |
+#endif
+								    
+    /* JALI: removed setting the tty_smode.c_cflag flags, since this is not */
+    /* advisable if this is a *real* terminal, such as the console. In fact */
+    /* this may hang the entire machine, deep, deep down (signalling break */
+    /* or toggling the abort switch doesn't help) */
+    
+    tty_smode.c_lflag =
+									0;
+    
+#if 0
+0*ISIG   |/*Enable signals.*/
+0*ICANON |/*Canonical input (erase and kill processing).*/
+0*XCASE  |/*Canonical upper/lower presentation.*/
+0*ECHO   |/*Enable echo.*/
+0*ECHOE  |/*Echo erase character as BS-SP-BS.*/
+0*ECHOK  |/*Echo NL after kill character.*/
+0*ECHONL |/*Echo NL.*/
+0*NOFLSH |/*Disable flush after interrupt or quit.*/
+0*TOSTOP |/*Send SIGTTOU for background output.*/
+0*ECHOCTL|/*Echo control characters as ^char, delete as ^?.*/
+0*ECHOPRT|/*Echo erase character as character erased.*/
+0*ECHOKE |/*BS-SP-BS erase entire line on line kill.*/
+0*FLUSHO |/*Output is being flushed.*/
+0*PENDIN |/*Retype pending input at next read or input character.*/
+0*IEXTEN |/*Enable extended (implementation-defined) functions.*/
+#endif
+								
+    tty_smode.c_cc[VMIN]      =0;/* Note that VMIN is the same as VEOF! */
+    tty_smode.c_cc[VTIME]     =0;/* Note that VTIME is the same as VEOL! */
+    tty_smode.c_cc[VINTR]     =3;
+    
+    tcsetattr(0, TCSADRAIN, &tty_smode);
+    
+#ifdef DEBUG
+    show_terminal_settings(&tty_smode);
+#endif
+    /*
+     * 	 "Write a ^L to the FIFO which causes the other end to redisplay
+     *    the input line."
+     * This does not seem to work as was intended in old comment above.
+     * However, this control character is now (R12B-3) used by run_erl
+     * to trigger the version handshaking between to_erl and run_erl
+     * at the start of every new to_erl-session.
+     */
+
+    if (write(wfd, "\014", 1) < 0) {
+	fprintf(stderr, "Error in writing ^L to FIFO.\n");
+    }
+
+    /*
+     * read and write
+     */
+    while (1) {
+	FD_ZERO(&readfds);
+	FD_SET(0, &readfds);
+	FD_SET(rfd, &readfds);
+	if (select(rfd + 1, &readfds, NULL, NULL, NULL) < 0) {
+	    if (recv_sig) {
+		FD_ZERO(&readfds);
+	    }
+	    else {
+		fprintf(stderr, "Error in select.\n");
+		break;
+	    }
+	}
+	len = 0;
+
+	/*
+	 * Read from terminal and write to FIFO
+         */
+	if (recv_sig) {
+	    switch (recv_sig) {
+	    case SIGINT:
+		fprintf(stderr, "[Break]\n\r");
+		buf[0] = '\003';
+		len = 1;
+		break;
+	    case SIGWINCH:
+		len = window_size_seq(buf,sizeof(buf));
+		break;
+	    default:
+		fprintf(stderr,"Unexpected signal: %u\n",recv_sig);
+	    }
+	    recv_sig = 0;
+	}
+	else if (FD_ISSET(0, &readfds)) {
+	    len = read(0, buf, sizeof(buf));
+	    if (len <= 0) {
+		close(rfd);
+		close(wfd);
+		if (len < 0) {
+		    fprintf(stderr, "Error in reading from stdin.\n");
+		} else {
+		    fprintf(stderr, "[EOF]\n\r");
+		}
+		break;
+	    }
+	    /* check if there is an eof character in input */
+	    for (i = 0; i < len && buf[i] != tty_eof; i++);
+	    if (buf[i] == tty_eof) {
+		fprintf(stderr, "[Quit]\n\r");
+		break;
+	    }
+	}
+
+	if (len) {
+#ifdef DEBUG
+	    if(write(1, buf, len));
+#endif
+	    if (write_all(wfd, buf, len) != len) {
+		fprintf(stderr, "Error in writing to FIFO.\n");
+		close(rfd);
+		close(wfd);
+		break;
+	    }
+	    STATUS("\" OK\r\n");
+	}
+
+	/*
+	 * Read from FIFO, write to terminal.
+	 */
+	if (FD_ISSET(rfd, &readfds)) {
+	    STATUS("FIFO read: ");
+	    len = read(rfd, buf, BUFSIZ);
+	    if (len < 0 && errno == EAGAIN) {
+		/*
+		 * No data this time, but the writing end of the FIFO is still open.
+		 * Do nothing.
+		 */
+		;
+	    } else if (len <= 0) {
+		/*
+		 * Either an error or end of file. In either case, break out
+		 * of the loop.
+		 */
+		close(rfd);
+		close(wfd);
+		if (len < 0) {
+		    fprintf(stderr, "Error in reading from FIFO.\n");
+		} else
+		    fprintf(stderr, "[End]\n\r");
+		break;
+	    } else {
+		if (!got_some) {
+		    if ((len=version_handshake(buf,len,wfd)) < 0) {
+			close(rfd);
+			close(wfd);
+			break;
+		    }
+		    if (protocol_ver >= 1) {
+			/* Tell run_erl size of terminal window */
+			signal(SIGWINCH, handle_sigwinch);
+			raise(SIGWINCH);
+		    }
+		    got_some = 1;
+		}
+
+		/*
+		 * We successfully read at least one character. Write what we got.
+		 */
+		STATUS("Terminal write: \"");
+		if (write_all(1, buf, len) != len) {
+		    fprintf(stderr, "Error in writing to terminal.\n");
+		    close(rfd);
+		    close(wfd);
+		    break;
+		}
+		STATUS("\" OK\r\n");
+	    }
+	}
+    }
+
+    /* 
+     * Reset terminal characterstics 
+     * XXX
+     */
+    tcsetattr(0, TCSADRAIN, &tty_rmode);
+    return 0;
+}
+
+/* Call write() until entire buffer has been written or error.
+ * Return len or -1.
+ */
+static int write_all(int fd, const char* buf, int len)
+{
+    int left = len;
+    int written;
+    while (left) {
+	written = write(fd,buf,left);
+	if (written < 0) {
+	    return -1;
+	}
+	left -= written;
+	buf += written;
+    }
+    return len;
+}
+
+static int window_size_seq(char* buf, size_t bufsz)
+{
+#ifdef TIOCGWINSZ
+    struct winsize ws;
+    static const char prefix[] = "\033_";
+    static const char suffix[] = "\033\\";
+    /* This Esc sequence is called "Application Program Command"
+       and seems suitable to use for our own customized stuff. */
+
+    if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) == 0) {
+	int len = sn_printf(buf, bufsz, "%swinsize=%u,%u%s",
+			    prefix, ws.ws_col, ws.ws_row, suffix);
+	return len;
+    }
+#endif /* TIOCGWINSZ */
+    return 0;
+}
+
+/*   to_erl                     run_erl
+ *     |                           |
+ *     |---------- '\014' -------->| (session start)
+ *     |                           |
+ *     |<---- "[run_erl v1-0]" ----| (version interval)
+ *     |                           |
+ *     |--- Esc_"version=1"Esc\ -->| (common version)
+ *     |                           |
+ */
+static int version_handshake(char* buf, int len, int wfd)
+{
+    unsigned re_high=0, re_low;
+    char *end = find_str(buf,len,"]\n");
+    
+    if (end && sscanf(buf,"[run_erl v%u-%u",&re_high,&re_low)==2) {
+	char wbuf[30];
+	int wlen;
+
+	if (re_low > RUN_ERL_HI_VER || re_high < RUN_ERL_LO_VER) {
+	    fprintf(stderr,"Incompatible versions: to_erl=v%u-%u run_erl=v%u-%u\n",
+		    RUN_ERL_HI_VER, RUN_ERL_LO_VER, re_high, re_low);
+	    return -1;
+	}
+	/* Choose highest common version */
+	protocol_ver = re_high < RUN_ERL_HI_VER ? re_high : RUN_ERL_HI_VER;
+
+	wlen = sn_printf(wbuf, sizeof(wbuf), "\033_version=%u\033\\",
+			 protocol_ver);
+	if (write_all(wfd, wbuf, wlen) < 0) {
+	    fprintf(stderr,"Failed to send version handshake\n");
+	    return -1;
+	}
+	end += 2;
+	len -= (end-buf);
+	memmove(buf,end,len);
+
+    }
+    else {  /* we assume old run_erl without version handshake */
+	protocol_ver = 0;
+    }
+
+    if (re_high != RUN_ERL_HI_VER) {
+	fprintf(stderr,"run_erl has different version, "
+		"using common protocol level %u\n", protocol_ver);
+    }
+
+    return len;
+}
+
 
-#include "to_erl_common.h"
+#ifdef DEBUG
+#define S(x)  ((x) > 0 ? 1 : 0)
 
-int main(int argc,char **argv) {
-  return to_erl(argc,argv);
+static void show_terminal_settings(struct termios *t)
+{
+  fprintf(stderr,"c_iflag:\n");
+  fprintf(stderr,"Signal interrupt on break:   BRKINT  %d\n", S(t->c_iflag & BRKINT));
+  fprintf(stderr,"Map CR to NL on input:       ICRNL   %d\n", S(t->c_iflag & ICRNL));
+  fprintf(stderr,"Ignore break condition:      IGNBRK  %d\n", S(t->c_iflag & IGNBRK));
+  fprintf(stderr,"Ignore CR:                   IGNCR   %d\n", S(t->c_iflag & IGNCR));
+  fprintf(stderr,"Ignore char with par. err's: IGNPAR  %d\n", S(t->c_iflag & IGNPAR));
+  fprintf(stderr,"Map NL to CR on input:       INLCR   %d\n", S(t->c_iflag & INLCR));
+  fprintf(stderr,"Enable input parity check:   INPCK   %d\n", S(t->c_iflag & INPCK));
+  fprintf(stderr,"Strip character              ISTRIP  %d\n", S(t->c_iflag & ISTRIP));
+  fprintf(stderr,"Enable start/stop input ctrl IXOFF   %d\n", S(t->c_iflag & IXOFF));
+  fprintf(stderr,"ditto output ctrl            IXON    %d\n", S(t->c_iflag & IXON));
+  fprintf(stderr,"Mark parity errors           PARMRK  %d\n", S(t->c_iflag & PARMRK));
+  fprintf(stderr,"\n");
+  fprintf(stderr,"c_oflag:\n");
+  fprintf(stderr,"Perform output processing    OPOST   %d\n", S(t->c_oflag & OPOST));
+  fprintf(stderr,"\n");
+  fprintf(stderr,"c_cflag:\n");
+  fprintf(stderr,"Ignore modem status lines    CLOCAL  %d\n", S(t->c_cflag & CLOCAL));
+  fprintf(stderr,"\n");
+  fprintf(stderr,"c_local:\n");
+  fprintf(stderr,"Enable echo                  ECHO    %d\n", S(t->c_lflag & ECHO));
+  fprintf(stderr,"\n");
+  fprintf(stderr,"c_cc:\n");
+  fprintf(stderr,"c_cc[VEOF]                           %d\n", t->c_cc[VEOF]);
 }
+#endif
diff --git a/erts/etc/win32/cygwin_tools/vc/cc.sh b/erts/etc/win32/cygwin_tools/vc/cc.sh
index 48a579d5f0..651b6e098d 100755
--- a/erts/etc/win32/cygwin_tools/vc/cc.sh
+++ b/erts/etc/win32/cygwin_tools/vc/cc.sh
@@ -267,7 +267,7 @@ for x in $SOURCES; do
 		echo
 		echo 
 		after_sed=`date '+%s'`
-		echo Made dependencises for $x':' `expr $after_sed '-' $start_time` 's' >&2
+		echo Made dependencies for $x':' `expr $after_sed '-' $start_time` 's' >&2
 	    fi 
 	else
 	    cat $MSG_FILE
diff --git a/erts/etc/win32/msys_tools/vc/cc.sh b/erts/etc/win32/msys_tools/vc/cc.sh
index ac89aac34e..72005862ed 100644
--- a/erts/etc/win32/msys_tools/vc/cc.sh
+++ b/erts/etc/win32/msys_tools/vc/cc.sh
@@ -268,7 +268,7 @@ for x in $SOURCES; do
 		echo
 		echo 
 		after_sed=`date '+%s'`
-		echo Made dependencises for $x':' `expr $after_sed '-' $start_time` 's' >&2
+		echo Made dependencies for $x':' `expr $after_sed '-' $start_time` 's' >&2
 	    fi 
 	else
 	    cat $MSG_FILE
diff --git a/erts/include/erl_int_sizes_config.h.in b/erts/include/erl_int_sizes_config.h.in
index b18f5ebc00..88c74cdeff 100644
--- a/erts/include/erl_int_sizes_config.h.in
+++ b/erts/include/erl_int_sizes_config.h.in
@@ -35,6 +35,3 @@
 
 /* The size of a pointer. */
 #undef SIZEOF_VOID_P
-
-/* Define if building a halfword-heap 64bit emulator (needed for NIF's) */
-#undef HALFWORD_HEAP_EMULATOR
diff --git a/erts/include/internal/erl_printf_format.h b/erts/include/internal/erl_printf_format.h
index efd926be99..953022017a 100644
--- a/erts/include/internal/erl_printf_format.h
+++ b/erts/include/internal/erl_printf_format.h
@@ -44,7 +44,6 @@ typedef long long          ErlPfSWord;
 #error Found no appropriate type to use for 'Eterm', 'Uint' and 'Sint'
 #endif
 
-
 typedef int (*fmtfn_t)(void*, char*, size_t);
 
 extern int erts_printf_format(fmtfn_t, void*, char*, va_list);
@@ -57,17 +56,9 @@ extern int erts_printf_uword(fmtfn_t, void*, char, int, int, ErlPfUWord);
 extern int erts_printf_sword(fmtfn_t, void*, char, int, int, ErlPfSWord);
 extern int erts_printf_double(fmtfn_t, void *, char, int, int, double);
 
-#ifdef HALFWORD_HEAP_EMULATOR
-#  if SIZEOF_INT != 4
-#    error Unsupported integer size for HALFWORD_HEAP_EMULATOR
-#  endif
-typedef unsigned int ErlPfEterm;
-#else
 typedef ErlPfUWord ErlPfEterm;
-#endif
-
-extern int (*erts_printf_eterm_func)(fmtfn_t, void*, ErlPfEterm, long, ErlPfEterm*);
 
+extern int (*erts_printf_eterm_func)(fmtfn_t, void*, ErlPfEterm, long);
 
 #endif /* ERL_PRINTF_FORMAT_H__ */
 
diff --git a/erts/include/internal/ethr_internal.h b/erts/include/internal/ethr_internal.h
index d4ded6ff05..693b34df61 100644
--- a/erts/include/internal/ethr_internal.h
+++ b/erts/include/internal/ethr_internal.h
@@ -92,7 +92,6 @@ void ethr_run_exit_handlers__(void);
 void ethr_ts_event_destructor__(void *vtsep);
 
 #if defined(ETHR_X86_RUNTIME_CONF__)
-int ethr_x86_have_cpuid__(void);
 void ethr_x86_cpuid__(int *eax, int *ebx, int *ecx, int *edx);
 #endif
 
diff --git a/erts/include/internal/ethr_mutex.h b/erts/include/internal/ethr_mutex.h
index f76c4262ca..b402a139f5 100644
--- a/erts/include/internal/ethr_mutex.h
+++ b/erts/include/internal/ethr_mutex.h
@@ -98,7 +98,7 @@ void LeaveCriticalSection(CRITICAL_SECTION *);
 #if 0
 #  define ETHR_MTX_Q_LOCK_SPINLOCK__
 #  define ETHR_MTX_QLOCK_TYPE__ ethr_spinlock_t
-#elif defined(ETHR_PTHREADS) || defined(ETHR_OSE_THREADS)
+#elif defined(ETHR_PTHREADS)
 #  define ETHR_MTX_Q_LOCK_PTHREAD_MUTEX__
 #  define ETHR_MTX_QLOCK_TYPE__ pthread_mutex_t
 #elif defined(ETHR_WIN32_THREADS)
@@ -211,7 +211,7 @@ struct ethr_cond_ {
 #endif
 };
 
-#elif (defined(ETHR_PTHREADS) || defined(ETHR_OSE_THREADS)) && !defined(ETHR_DBG_WIN_MTX_WITH_PTHREADS)
+#elif defined(ETHR_PTHREADS) && !defined(ETHR_DBG_WIN_MTX_WITH_PTHREADS)
 
 typedef struct ethr_mutex_ ethr_mutex;
 struct ethr_mutex_ {
@@ -355,7 +355,7 @@ void ethr_rwmutex_rwunlock(ethr_rwmutex *);
 
 #ifdef ETHR_MTX_HARD_DEBUG
 #define ETHR_MTX_HARD_ASSERT(A) \
-  ((void) ((A) ? 1 : ethr_assert_failed(__FILE__, __LINE__, __func__,#A)))
+  ((void) ((A) ? 1 : ethr_assert_failed(__FILE__, __LINE__, __func__, #A)))
 #else
 #define ETHR_MTX_HARD_ASSERT(A) ((void) 1)
 #endif
@@ -634,7 +634,7 @@ ETHR_INLINE_MTX_FUNC_NAME_(ethr_mutex_unlock)(ethr_mutex *mtx)
 
 #endif /* ETHR_TRY_INLINE_FUNCS */
 
-#elif (defined(ETHR_PTHREADS) || defined(ETHR_OSE_THREADS)) && !defined(ETHR_DBG_WIN_MTX_WITH_PTHREADS)
+#elif defined(ETHR_PTHREADS) && !defined(ETHR_DBG_WIN_MTX_WITH_PTHREADS)
 
 #if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_MUTEX_IMPL__)
 
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h
index 8964f95652..b23644d361 100644
--- a/erts/include/internal/ethread.h
+++ b/erts/include/internal/ethread.h
@@ -112,6 +112,10 @@ int ethr_assert_failed(const char *file, int line, const char *func, char *a);
 #error "_GNU_SOURCE not defined. Please, compile all files with -D_GNU_SOURCE."
 #endif
 
+#ifdef ETHR_HAVE_PTHREAD_SETNAME_NP_1
+#define _DARWIN_C_SOURCE
+#endif
+
 #if defined(ETHR_NEED_NPTL_PTHREAD_H)
 #include <nptl/pthread.h>
 #elif defined(ETHR_HAVE_MIT_PTHREAD_H)
@@ -194,28 +198,6 @@ typedef DWORD ethr_tsd_key;
 
 #define ETHR_YIELD() (Sleep(0), 0)
 
-#elif defined(ETHR_OSE_THREADS)
-
-#include "ose.h"
-#undef NIL
-
-#if defined(ETHR_HAVE_PTHREAD_H)
-#include <pthread.h>
-#endif
-
-typedef struct {
-  PROCESS id;
-  unsigned int tsd_key_index;
-  void *res;
-} ethr_tid;
-
-typedef OSPPDKEY ethr_tsd_key;
-
-#undef ETHR_HAVE_ETHR_SIG_FUNCS
-
-/* Out own RW mutexes are probably faster, but use OSEs mutexes */
-#define ETHR_USE_OWN_RWMTX_IMPL__
-
 #else /* No supported thread lib found */
 
 #ifdef ETHR_NO_SUPP_THR_LIB_NOT_FATAL
@@ -296,14 +278,40 @@ ETHR_PROTO_NORETURN__ ethr_fatal_error__(const char *file,
      || (defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64))))
 #  define ETHR_X86_RUNTIME_CONF__
 
-#  define ETHR_X86_RUNTIME_CONF_HAVE_DW_CMPXCHG__ \
-  (__builtin_expect(ethr_runtime__.conf.have_dw_cmpxchg != 0, 1))
-#  define ETHR_X86_RUNTIME_CONF_HAVE_NO_DW_CMPXCHG__ \
-  (__builtin_expect(ethr_runtime__.conf.have_dw_cmpxchg == 0, 0))
-#  define ETHR_X86_RUNTIME_CONF_HAVE_SSE2__ \
-  (__builtin_expect(ethr_runtime__.conf.have_sse2 != 0, 1))
-#  define ETHR_X86_RUNTIME_CONF_HAVE_NO_SSE2__ \
-  (__builtin_expect(ethr_runtime__.conf.have_sse2 == 0, 0))
+#  define ETHR_X86_RUNTIME_CONF_HAVE_META(feature)              \
+    (__builtin_expect(ethr_runtime__.conf.have_##feature != 0, 1))
+#  define ETHR_X86_RUNTIME_CONF_HAVE_NO_META(feature)           \
+    (__builtin_expect(ethr_runtime__.conf.have_##feature == 0, 0))
+
+#  define ETHR_X86_RUNTIME_CONF_HAVE_DW_CMPXCHG__       \
+    ETHR_X86_RUNTIME_CONF_HAVE_META(dw_cmpxchg)
+#  define ETHR_X86_RUNTIME_CONF_HAVE_NO_DW_CMPXCHG__    \
+    ETHR_X86_RUNTIME_CONF_HAVE_NO_META(dw_cmpxchg)
+#  define ETHR_X86_RUNTIME_CONF_HAVE_SSE2__     \
+    ETHR_X86_RUNTIME_CONF_HAVE_META(sse2)
+#  define ETHR_X86_RUNTIME_CONF_HAVE_NO_SSE2__  \
+    ETHR_X86_RUNTIME_CONF_HAVE_NO_META(sse2)
+#  define ETHR_X86_RUNTIME_CONF_HAVE_RDTSCP__   \
+    ETHR_X86_RUNTIME_CONF_HAVE_META(rdtscp)
+#  define ETHR_X86_RUNTIME_CONF_HAVE_NO_RDTSCP__        \
+    ETHR_X86_RUNTIME_CONF_HAVE_NO_META(rdtscp)
+#  define ETHR_X86_RUNTIME_CONF_HAVE_CONSTANT_TSC__     \
+    ETHR_X86_RUNTIME_CONF_HAVE_META(constant_tsc)
+#  define ETHR_X86_RUNTIME_CONF_HAVE_NO_CONSTANT_TSC__   \
+    ETHR_X86_RUNTIME_CONF_HAVE_NO_META(nonstop_tsc)
+#  define ETHR_X86_RUNTIME_CONF_HAVE_NONSTOP_TSC__     \
+    ETHR_X86_RUNTIME_CONF_HAVE_META(nonstop_tsc)
+#  define ETHR_X86_RUNTIME_CONF_HAVE_NO_NONSTOP_TSC__   \
+    ETHR_X86_RUNTIME_CONF_HAVE_NO_META(nonstop_tsc)
+#  define ETHR_X86_RUNTIME_CONF_HAVE_TSC_RELIABLE__     \
+    ETHR_X86_RUNTIME_CONF_HAVE_META(tsc_reliable)
+#  define ETHR_X86_RUNTIME_CONF_HAVE_NO_TSC_RELIABLE_TSC__   \
+    ETHR_X86_RUNTIME_CONF_HAVE_NO_META(tsc_reliable)
+#  define ETHR_X86_RUNTIME_CONF_HAVE_NONSTOP_TSC_S3__     \
+    ETHR_X86_RUNTIME_CONF_HAVE_META(nonstop_tsc_s3)
+#  define ETHR_X86_RUNTIME_CONF_HAVE_NO_NONSTOP_TSC_S3__        \
+    ETHR_X86_RUNTIME_CONF_HAVE_NO_META(nonstop_tsc_s3)
+
 #endif
 
 #if (defined(__GNUC__) \
@@ -322,6 +330,11 @@ typedef struct {
 #if defined(ETHR_X86_RUNTIME_CONF__)
     int have_dw_cmpxchg;
     int have_sse2;
+    int have_rdtscp;
+    int have_constant_tsc;
+    int have_tsc_reliable;
+    int have_nonstop_tsc;
+    int have_nonstop_tsc_s3;
 #endif
 #if defined(ETHR_PPC_RUNTIME_CONF__)
     int have_lwsync;
@@ -383,19 +396,7 @@ extern ethr_runtime_t ethr_runtime__;
 
 #include "ethr_atomics.h" /* The atomics API */
 
-#if defined (ETHR_OSE_THREADS)
-static ETHR_INLINE void
-ose_yield(void)
-{
-    if (get_ptype(current_process()) == OS_PRI_PROC) {
-        set_pri(get_pri(current_process()));
-    } else {
-        delay(1);
-    }
-}
-#endif
-
-#if defined(__GNUC__) && !defined(ETHR_OSE_THREADS)
+#if defined(__GNUC__)
 #  ifndef ETHR_SPIN_BODY
 #    if defined(__i386__) || defined(__x86_64__)
 #      define ETHR_SPIN_BODY __asm__ __volatile__("rep;nop" : : : "memory")
@@ -411,20 +412,9 @@ ose_yield(void)
 #  ifndef ETHR_SPIN_BODY
 #    define ETHR_SPIN_BODY do {YieldProcessor();ETHR_COMPILER_BARRIER;} while(0)
 #  endif
-#elif defined(ETHR_OSE_THREADS)
-#  ifndef ETHR_SPIN_BODY
-#    define ETHR_SPIN_BODY ose_yield()
-#  else
-#    error "OSE should use ose_yield()"
-#  endif
 #endif
 
-#ifndef ETHR_OSE_THREADS
 #define ETHR_YIELD_AFTER_BUSY_LOOPS 50
-#else
-#define ETHR_YIELD_AFTER_BUSY_LOOPS 0
-#endif
-
 
 #ifndef ETHR_SPIN_BODY
 #  define ETHR_SPIN_BODY ETHR_COMPILER_BARRIER
@@ -447,18 +437,13 @@ ose_yield(void)
 #    else
 #      define ETHR_YIELD() (pthread_yield(), 0)
 #    endif
-#  elif defined(ETHR_OSE_THREADS)
-#    define ETHR_YIELD() (ose_yield(), 0)
 #  else
 #    define ETHR_YIELD() (ethr_compiler_barrier(), 0)
 #  endif
 #endif
 
-#if defined(VALGRIND) || defined(ETHR_OSE_THREADS)
-/* mutex as fallback for spinlock for VALGRIND and OSE.
-   OSE cannot use spinlocks as processes working on the
-   same execution unit have a tendency to deadlock.
- */
+#if defined(VALGRIND)
+/* mutex as fallback for spinlock for VALGRIND. */
 #  undef ETHR_HAVE_NATIVE_SPINLOCKS
 #  undef ETHR_HAVE_NATIVE_RWSPINLOCKS
 #else
@@ -505,16 +490,9 @@ typedef struct {
     int detached;			/* boolean (default false) */
     int suggested_stack_size;		/* kilo words (default sys dependent) */
     char *name;                         /* max 14 char long (default no-name) */
-#ifdef ETHR_OSE_THREADS
-    U32 coreNo;
-#endif
 } ethr_thr_opts;
 
-#if defined(ETHR_OSE_THREADS)
-#define ETHR_THR_OPTS_DEFAULT_INITER {0, -1, NULL, 0}
-#else
 #define ETHR_THR_OPTS_DEFAULT_INITER {0, -1, NULL}
-#endif
 
 #if !defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_AUX_IMPL__)
 #  define ETHR_NEED_SPINLOCK_PROTOTYPES__
@@ -628,8 +606,6 @@ typedef struct ethr_ts_event_ ethr_ts_event; /* Needed by ethr_mutex.h */
 #  include "win/ethr_event.h"
 #elif defined(ETHR_PTHREADS)
 #  include "pthread/ethr_event.h"
-#elif defined(ETHR_OSE_THREADS)
-#  include "ose/ethr_event.h"
 #endif
 
 int ethr_set_main_thr_status(int, int);
@@ -719,37 +695,6 @@ ETHR_INLINE_FUNC_NAME_(ethr_leave_ts_event)(ethr_ts_event *tsep)
 
 #endif
 
-#elif  defined (ETHR_OSE_THREADS)
-
-#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHREAD_IMPL__)
-
-extern ethr_tsd_key ethr_ts_event_key__;
-
-static ETHR_INLINE ethr_ts_event *
-ETHR_INLINE_FUNC_NAME_(ethr_get_ts_event)(void)
-{
-    ethr_ts_event *tsep = *(ethr_ts_event**)ose_get_ppdata(ethr_ts_event_key__);
-    if (!tsep) {
-	int res = ethr_get_tmp_ts_event__(&tsep);
-	if (res != 0)
-	    ETHR_FATAL_ERROR__(res);
-	ETHR_ASSERT(tsep);
-    }
-    return tsep;
-}
-
-static ETHR_INLINE void
-ETHR_INLINE_FUNC_NAME_(ethr_leave_ts_event)(ethr_ts_event *tsep)
-{
-    if (tsep->iflgs & ETHR_TS_EV_TMP) {
-	int res = ethr_free_ts_event__(tsep);
-	if (res != 0)
-	    ETHR_FATAL_ERROR__(res);
-    }
-}
-
-#endif
-
 #endif
 
 #include "ethr_mutex.h" /* Need atomic declarations and tse */
diff --git a/erts/include/internal/ethread_header_config.h.in b/erts/include/internal/ethread_header_config.h.in
index 9cabd0591a..f4b08cfced 100644
--- a/erts/include/internal/ethread_header_config.h.in
+++ b/erts/include/internal/ethread_header_config.h.in
@@ -166,6 +166,10 @@
 /* Define if you use a gcc that supports the double word cmpxchg instruction */
 #undef ETHR_GCC_HAVE_DW_CMPXCHG_ASM_SUPPORT
 
+/* Define if gcc wont let you clobber ebx with cmpxchg8b and position
+   independent code */
+#undef ETHR_CMPXCHG8B_PIC_NO_CLOBBER_EBX
+
 /* Define if you get a register shortage with cmpxchg8b and position independent code */
 #undef ETHR_CMPXCHG8B_REGISTER_SHORTAGE
 
diff --git a/erts/include/internal/i386/ethr_dw_atomic.h b/erts/include/internal/i386/ethr_dw_atomic.h
index e8c4119ef0..5444a6345c 100644
--- a/erts/include/internal/i386/ethr_dw_atomic.h
+++ b/erts/include/internal/i386/ethr_dw_atomic.h
@@ -115,13 +115,19 @@ ethr_native_dw_atomic_addr(ethr_native_dw_atomic_t *var)
     return (ethr_sint_t *) ETHR_DW_NATMC_MEM__(var);
 }
 
-#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__
+#if defined(ETHR_CMPXCHG8B_PIC_NO_CLOBBER_EBX) && defined(__PIC__) && __PIC__
+#if ETHR_SIZEOF_PTR != 4
+#  error unexpected pic issue
+#endif
 /*
  * When position independent code is used in 32-bit mode, the EBX register
- * is used for storage of global offset table address, and we may not
- * use it as input or output in an asm. We need to save and restore the
- * EBX register explicitly (for some reason gcc doesn't provide this
- * service to us).
+ * is used for storage of global offset table address. When compiling with
+ * an old gcc (< vsn 5) we may not use it as input or output in an inline
+ * asm. We then need to save and restore the EBX register explicitly (for
+ * some reason old gcc compilers didn't provide this service to us).
+ * ETHR_CMPXCHG8B_PIC_NO_CLOBBER_EBX will be defined if we need to
+ * explicitly manage EBX ourselves.
+ *
  */
 #  define ETHR_NO_CLOBBER_EBX__ 1
 #else
@@ -151,36 +157,53 @@ ethr_native_dw_atomic_cmpxchg_mb(ethr_native_dw_atomic_t *var,
 
     ETHR_DW_DBG_ALIGNED__(p);
 
+#if ETHR_NO_CLOBBER_EBX__ && ETHR_CMPXCHG8B_REGISTER_SHORTAGE
+    /*
+     * gcc wont let us use ebx as input and we
+     * get a register shortage
+     */
+
     __asm__ __volatile__(
-#if ETHR_NO_CLOBBER_EBX__
 	"pushl %%ebx\n\t"
-#  if ETHR_CMPXCHG8B_REGISTER_SHORTAGE
 	"movl (%7), %%ebx\n\t"
 	"movl 4(%7), %%ecx\n\t"
-#  else
-	"movl %8, %%ebx\n\t"
-#  endif
-#endif
-	"lock; cmpxchg" ETHR_DW_CMPXCHG_SFX__ " %0\n\t"
+	"lock; cmpxchg8b %0\n\t"
 	"setz %3\n\t"
-#if ETHR_NO_CLOBBER_EBX__
 	"popl %%ebx\n\t"
-#endif
 	: "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=c"(xchgd)
-	: "m"(*p), "1"(xchg[1]), "2"(xchg[0]),
-#if ETHR_NO_CLOBBER_EBX__
-#  if ETHR_CMPXCHG8B_REGISTER_SHORTAGE
-	  "3"(new)
-#  else
-	  "3"(new[1]),
-	  "r"(new[0])
-#  endif
+	: "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "r"(new)
+	: "cc", "memory");
+
+#elif ETHR_NO_CLOBBER_EBX__
+    /*
+     * gcc wont let us use ebx as input
+     */
+
+    __asm__ __volatile__(
+	"pushl %%ebx\n\t"
+	"movl %8, %%ebx\n\t"
+	"lock; cmpxchg8b %0\n\t"
+	"setz %3\n\t"
+	"popl %%ebx\n\t"
+	: "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=q"(xchgd)
+	: "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "c"(new[1]), "r"(new[0])
+	: "cc", "memory");
+
 #else
-	  "3"(new[1]),
-	  "b"(new[0])
-#endif
+    /*
+     * gcc lets us place values in the registers where
+     * we want them
+     */
+
+    __asm__ __volatile__(
+	"lock; cmpxchg" ETHR_DW_CMPXCHG_SFX__ " %0\n\t"
+	"setz %3\n\t"
+	: "=m"(*p), "=d"(xchg[1]), "=a"(xchg[0]), "=q"(xchgd)
+	: "m"(*p), "1"(xchg[1]), "2"(xchg[0]), "c"(new[1]), "b"(new[0])
 	: "cc", "memory");
 
+#endif
+
     return (int) xchgd;
 }
 
diff --git a/erts/include/internal/ose/ethr_event.h b/erts/include/internal/ose/ethr_event.h
deleted file mode 100644
index c18f30aa4a..0000000000
--- a/erts/include/internal/ose/ethr_event.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2009-2011. 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%
- */
-
-/*
- * Author: Rickard Green
- */
-
-//#define USE_PTHREAD_API
-
-#define ETHR_EVENT_OFF_WAITER__		-1L
-#define ETHR_EVENT_OFF__		1L
-#define ETHR_EVENT_ON__ 		0L
-
-#ifdef USE_PTHREAD_API
-
-typedef struct {
-    ethr_atomic32_t state;
-    pthread_mutex_t mtx;
-    pthread_cond_t cnd;
-} ethr_event;
-
-#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_EVENT_IMPL__)
-
-static void ETHR_INLINE
-ETHR_INLINE_FUNC_NAME_(ethr_event_set)(ethr_event *e)
-{
-    ethr_sint32_t val;
-    val = ethr_atomic32_xchg_mb(&e->state, ETHR_EVENT_ON__);
-    if (val == ETHR_EVENT_OFF_WAITER__) {
-	int res = pthread_mutex_lock(&e->mtx);
-	if (res != 0)
-	    ETHR_FATAL_ERROR__(res);
-	res = pthread_cond_signal(&e->cnd);
-	if (res != 0)
-	    ETHR_FATAL_ERROR__(res);
-	res = pthread_mutex_unlock(&e->mtx);
-	if (res != 0)
-	    ETHR_FATAL_ERROR__(res);
-    }
-}
-
-static void ETHR_INLINE
-ETHR_INLINE_FUNC_NAME_(ethr_event_reset)(ethr_event *e)
-{
-    ethr_atomic32_set(&e->state, ETHR_EVENT_OFF__);
-    ETHR_MEMORY_BARRIER;
-}
-
-#endif
-
-#else
-
-typedef struct {
-    ethr_atomic32_t state;
-    PROCESS proc;
-} ethr_event;
-
-#if defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_EVENT_IMPL__)
-
-static void ETHR_INLINE
-ETHR_INLINE_FUNC_NAME_(ethr_event_set)(ethr_event *e)
-{
-    ethr_sint32_t val = ethr_atomic32_xchg_mb(&e->state, ETHR_EVENT_ON__);
-    if (val == ETHR_EVENT_OFF_WAITER__) {
-#ifdef DEBUG
-      OSFSEMVAL fsem_val = get_fsem(e->proc);
-
-      /* There is a race in this assert.
-	 This is because the state is set before the wait call in wait__.
-	 We hope that a delay of 10 ms is enough */
-      if (fsem_val == 0)
-	delay(10);
-      ETHR_ASSERT(get_fsem(e->proc) == -1);
-#endif
-      signal_fsem(e->proc);
-    }
-}
-
-static void ETHR_INLINE
-ETHR_INLINE_FUNC_NAME_(ethr_event_reset)(ethr_event *e)
-{
-    ethr_atomic32_set(&e->state, ETHR_EVENT_OFF__);
-    ETHR_MEMORY_BARRIER;
-}
-
-#endif
-
-#endif
-
-int ethr_event_init(ethr_event *e);
-int ethr_event_destroy(ethr_event *e);
-int ethr_event_wait(ethr_event *e);
-int ethr_event_swait(ethr_event *e, int spincount);
-#if !defined(ETHR_TRY_INLINE_FUNCS) || defined(ETHR_EVENT_IMPL__)
-void ethr_event_set(ethr_event *e);
-void ethr_event_reset(ethr_event *e);
-#endif
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c
index 1262c50718..053217304b 100644
--- a/erts/lib_src/common/erl_misc_utils.c
+++ b/erts/lib_src/common/erl_misc_utils.c
@@ -160,8 +160,6 @@ erts_milli_sleep(long ms)
     if (ms > 0) {
 #ifdef __WIN32__
 	Sleep((DWORD) ms);
-#elif defined(__OSE__)
-	delay(ms);
 #else
 	struct timeval tv;
 	tv.tv_sec = ms / 1000;
@@ -320,10 +318,6 @@ erts_cpu_info_update(erts_cpu_info_t *cpuinfo)
 	    online = 0;
 #endif
     }
-#elif defined(__OSE__)
-    online = ose_num_cpus();
-    configured = ose_num_cpus();
-    available = ose_num_cpus();
 #endif
 
     if (online > configured)
diff --git a/erts/lib_src/common/erl_printf_format.c b/erts/lib_src/common/erl_printf_format.c
index 307680505c..e7d5d4413e 100644
--- a/erts/lib_src/common/erl_printf_format.c
+++ b/erts/lib_src/common/erl_printf_format.c
@@ -78,15 +78,7 @@
 #endif
 
 #ifndef ERTS_SIZEOF_ETERM
-#  ifdef HALFWORD_HEAP_EMULATOR
-#    if SIZEOF_VOID_P == 8
-#      define ERTS_SIZEOF_ETERM 4
-#    else
-#      error "HALFWORD_HEAP_EMULATOR only allowed on 64-bit architecture"
-#    endif
-#  else
-#    define ERTS_SIZEOF_ETERM SIZEOF_VOID_P
-#  endif
+#define ERTS_SIZEOF_ETERM SIZEOF_VOID_P
 #endif
 
 #if defined(__GNUC__)
@@ -102,7 +94,7 @@
 #endif
 
 #define FMTC_d    0x0000
-#define FMTC_R    0x0001
+/*empty           0x0001 was RELATIVE */
 #define FMTC_o    0x0002
 #define FMTC_u    0x0003
 #define FMTC_x    0x0004
@@ -166,7 +158,7 @@ static char heX[] = "0123456789ABCDEF";
 #define SIGN(X) ((X) > 0 ? 1 : ((X) < 0 ? -1 : 0)) 
 #define USIGN(X) ((X) == 0 ? 0 : 1)
 
-int (*erts_printf_eterm_func)(fmtfn_t, void*, ErlPfEterm, long, ErlPfEterm*) = NULL;
+int (*erts_printf_eterm_func)(fmtfn_t, void*, ErlPfEterm, long) = NULL;
 
 static int
 noop_fn(void *vfp, char* buf, size_t len)
@@ -645,7 +637,6 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 	    case 'p': ptr++; fmt |= FMTC_p; break;
 	    case 'n': ptr++; fmt |= FMTC_n; break;
 	    case 'T': ptr++; fmt |= FMTC_T; break;
-	    case 'R': ptr++; fmt |= FMTC_R; break;
 	    case '%':
 		FMT(fn,arg,ptr,1,count);
 		ptr++;
@@ -820,11 +811,9 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 		default: *va_arg(ap,int*) = count; break;
 		}
 		break;
-	    case FMTC_T:    /* Eterm */
-	    case FMTC_R: {  /* Eterm, Eterm* base  (base ignored if !HALFWORD_HEAP) */
+	    case FMTC_T: {    /* Eterm */
 		long prec;
 		ErlPfEterm eterm;
-		ErlPfEterm* eterm_base;
 		
 		if (!erts_printf_eterm_func)
 		    return -EINVAL;
@@ -835,16 +824,14 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap)
 		else
 		    prec = (long) precision;
 		eterm = va_arg(ap, ErlPfEterm);
-		eterm_base = ((fmt & FMTC_MASK) == FMTC_R) ?
-		    va_arg(ap, ErlPfEterm*) : NULL;
 		if (width > 0 && !(fmt & FMTF_adj)) {
-		    res = (*erts_printf_eterm_func)(noop_fn, NULL, eterm, prec, eterm_base);
+		    res = (*erts_printf_eterm_func)(noop_fn, NULL, eterm, prec);
 		    if (res < 0)
 			return res;
 		    if (width > res)
 			BLANKS(fn, arg, width - res, count);
 		}
-		res = (*erts_printf_eterm_func)(fn, arg, eterm, prec, eterm_base);
+		res = (*erts_printf_eterm_func)(fn, arg, eterm, prec);
 		if (res < 0)
 		    return res;
 		count += res;
diff --git a/erts/lib_src/common/ethr_aux.c b/erts/lib_src/common/ethr_aux.c
index 0cbb1b2fb8..3e7aad16c7 100644
--- a/erts/lib_src/common/ethr_aux.c
+++ b/erts/lib_src/common/ethr_aux.c
@@ -139,6 +139,38 @@ x86_init(void)
 #endif
     /* bit 26 of edx is set if we have sse2 */
     ethr_runtime__.conf.have_sse2 = (edx & (1 << 26));
+
+    /* check if we have extended feature set */
+    eax = 0x80000000;
+    ethr_x86_cpuid__(&eax, &ebx, &ecx, &edx);
+
+    if (eax < 0x80000001)
+        return;
+
+    if (eax >= 0x80000007) {
+        /* Advanced Power Management Information */
+        eax = 0x80000007;
+	ethr_x86_cpuid__(&eax, &ebx, &ecx, &edx);
+
+        /* I got the values below from:
+           http://lxr.free-electrons.com/source/arch/x86/include/asm/cpufeature.h
+           They can be gotten from the intel/amd manual as well.
+        */
+
+        ethr_runtime__.conf.have_constant_tsc  = (edx & (1 <<  8));
+        ethr_runtime__.conf.have_tsc_reliable   = (edx & (1 << 23));
+        ethr_runtime__.conf.have_nonstop_tsc    = (edx & (1 << 24));
+        ethr_runtime__.conf.have_nonstop_tsc_s3 = (edx & (1 << 30));
+
+    }
+
+    /* Extended Processor Info and Feature Bits */
+    eax = 0x80000001;
+    ethr_x86_cpuid__(&eax, &ebx, &ecx, &edx);
+
+    /* bit 27 of edx is set if we have rdtscp */
+    ethr_runtime__.conf.have_rdtscp = (edx & (1 << 27));
+
 }
 
 #endif /* ETHR_X86_RUNTIME_CONF__ */
@@ -207,18 +239,7 @@ ethr_init_common__(ethr_init_data *id)
 
     ethr_min_stack_size__ = ETHR_B2KW(ethr_min_stack_size__);
 
-#ifdef __OSE__
-    /* For supervisor processes, OSE adds a number of bytes to the requested stack. With this
-     * addition, the resulting size must not exceed the largest available stack size. The number
-     * of bytes that will be added  is configured in the monolith and can therefore not be
-     * specified here. We simply assume that it is less than 0x1000. The available stack sizes
-     * are configured in the .lmconf file and the largest one is usually 65536 bytes.
-     * Consequently, the requested stack size is limited to 0xF000.
-     */
-    ethr_max_stack_size__ = 0xF000;
-#else
     ethr_max_stack_size__ = 32*1024*1024;
-#endif
 #if SIZEOF_VOID_P == 8
     ethr_max_stack_size__ *= 2;
 #endif
@@ -664,10 +685,6 @@ ETHR_IMPL_NORETURN__ ethr_fatal_error__(const char *file,
 int ethr_assert_failed(const char *file, int line, const char *func, char *a)
 {
     fprintf(stderr, "%s:%d: %s(): Assertion failed: %s\n", file, line, func, a);
-#ifdef __OSE__
-    ramlog_printf("%d: %s:%d: %s(): Assertion failed: %s\n",
-		  current_process(),file, line, func, a);
-#endif
     ethr_abort__();
     return 0;
 }
diff --git a/erts/lib_src/common/ethr_mutex.c b/erts/lib_src/common/ethr_mutex.c
index 72aa34ec1c..a596e6c31c 100644
--- a/erts/lib_src/common/ethr_mutex.c
+++ b/erts/lib_src/common/ethr_mutex.c
@@ -1250,7 +1250,7 @@ ethr_cond_wait(ethr_cond *cnd, ethr_mutex *mtx)
     return 0;
 }
 
-#elif (defined(ETHR_PTHREADS) || defined(ETHR_OSE_THREADS)) && !defined(ETHR_DBG_WIN_MTX_WITH_PTHREADS)
+#elif defined(ETHR_PTHREADS) && !defined(ETHR_DBG_WIN_MTX_WITH_PTHREADS)
 /* -- pthread mutex and condition variables -------------------------------- */
 
 int
diff --git a/erts/lib_src/ose/ethr_event.c b/erts/lib_src/ose/ethr_event.c
deleted file mode 100644
index 24ea191c4b..0000000000
--- a/erts/lib_src/ose/ethr_event.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2009-2010. 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%
- */
-
-/*
- * Author: Rickard Green
- */
-
-#define ETHR_INLINE_FUNC_NAME_(X) X ## __
-#define ETHR_EVENT_IMPL__
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "ethread.h"
-
-#ifdef USE_PTHREAD_API
-
-int
-ethr_event_init(ethr_event *e)
-{
-    int res;
-    ethr_atomic32_init(&e->state, ETHR_EVENT_OFF__);
-    res = pthread_mutex_init(&e->mtx, NULL);
-    if (res != 0)
-	return res;
-    res = pthread_cond_init(&e->cnd, NULL);
-    if (res != 0) {
-	pthread_mutex_destroy(&e->mtx);
-	return res;
-    }
-    return 0;
-}
-
-int
-ethr_event_destroy(ethr_event *e)
-{
-    int res;
-    res = pthread_mutex_destroy(&e->mtx);
-    if (res != 0)
-	return res;
-    res = pthread_cond_destroy(&e->cnd);
-    if (res != 0)
-	return res;
-    return 0;
-}
-
-static ETHR_INLINE int
-wait__(ethr_event *e, int spincount)
-{
-    int sc = spincount;
-    ethr_sint32_t val;
-    int res, ulres;
-    int until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
-
-    if (spincount < 0)
-	ETHR_FATAL_ERROR__(EINVAL);
-
-    while (1) {
-	val = ethr_atomic32_read(&e->state);
-	if (val == ETHR_EVENT_ON__)
-	    return 0;
-	if (sc == 0)
-	    break;
-	sc--;
-	ETHR_SPIN_BODY;
-	if (--until_yield == 0) {
-	    until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
-	    res = ETHR_YIELD();
-	    if (res != 0)
-		ETHR_FATAL_ERROR__(res);
-	}
-    }
-
-    if (val != ETHR_EVENT_OFF_WAITER__) {
-	val = ethr_atomic32_cmpxchg(&e->state,
-				    ETHR_EVENT_OFF_WAITER__,
-				    ETHR_EVENT_OFF__);
-	if (val == ETHR_EVENT_ON__)
-	    return 0;
-	ETHR_ASSERT(val == ETHR_EVENT_OFF__);
-    }
-
-    ETHR_ASSERT(val == ETHR_EVENT_OFF_WAITER__
-		|| val == ETHR_EVENT_OFF__);
-
-    res = pthread_mutex_lock(&e->mtx);
-    if (res != 0)
-	ETHR_FATAL_ERROR__(res);
-
-    while (1) {
-
-	val = ethr_atomic32_read(&e->state);
-	if (val == ETHR_EVENT_ON__)
-	    break;
-
-	res = pthread_cond_wait(&e->cnd, &e->mtx);
-	if (res == EINTR)
-	    break;
-	if (res != 0)
-	    ETHR_FATAL_ERROR__(res);
-    }
-
-    ulres = pthread_mutex_unlock(&e->mtx);
-    if (ulres != 0)
-	ETHR_FATAL_ERROR__(ulres);
-
-    return res; /* 0 || EINTR */
-}
-
-#else
-/* --- OSE implementation of events ---------------------------- */
-
-#ifdef DEBUG
-union SIGNAL {
-  SIGSELECT signo;
-};
-#endif
-
-int
-ethr_event_init(ethr_event *e)
-{
-    ethr_atomic32_init(&e->state, ETHR_EVENT_OFF__);
-    e->proc = current_process();
-    return 0;
-}
-
-int
-ethr_event_destroy(ethr_event *e)
-{
-  return 0;
-}
-
-static ETHR_INLINE int
-wait__(ethr_event *e, int spincount)
-{
-    int sc = spincount;
-    int res;
-    int until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
-
-    if (spincount < 0)
-	ETHR_FATAL_ERROR__(EINVAL);
-
-    ETHR_ASSERT(e->proc == current_process());
-    ETHR_ASSERT(get_fsem(current_process()) == 0);
-
-    while (1) {
-      ethr_sint32_t val;
-      while (1) {
-        val = ethr_atomic32_read(&e->state);
-	if (val == ETHR_EVENT_ON__)
-	  return 0;
-	if (sc == 0)
-	  break;
-	sc--;
-	ETHR_SPIN_BODY;
-	if (--until_yield == 0) {
-	  until_yield = ETHR_YIELD_AFTER_BUSY_LOOPS;
-	  res = ETHR_YIELD();
-	  if (res != 0)
-	    ETHR_FATAL_ERROR__(res);
-	}
-      }
-      if (val != ETHR_EVENT_OFF_WAITER__) {
-	val = ethr_atomic32_cmpxchg(&e->state,
-				    ETHR_EVENT_OFF_WAITER__,
-				    ETHR_EVENT_OFF__);
-	if (val == ETHR_EVENT_ON__)
-	  return 0;
-	ETHR_ASSERT(val == ETHR_EVENT_OFF__);
-      }
-
-      wait_fsem(1);
-
-      ETHR_ASSERT(get_fsem(current_process()) == 0);
-    }
-}
-
-#endif
-
-void
-ethr_event_reset(ethr_event *e)
-{
-    ethr_event_reset__(e);
-}
-
-void
-ethr_event_set(ethr_event *e)
-{
-    ethr_event_set__(e);
-}
-
-int
-ethr_event_wait(ethr_event *e)
-{
-    return wait__(e, 0);
-}
-
-int
-ethr_event_swait(ethr_event *e, int spincount)
-{
-    return wait__(e, spincount);
-}
diff --git a/erts/lib_src/ose/ethread.c b/erts/lib_src/ose/ethread.c
deleted file mode 100644
index dc16acdd08..0000000000
--- a/erts/lib_src/ose/ethread.c
+++ /dev/null
@@ -1,833 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Ericsson AB 2010-2011. 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%
- */
-
-/*
- * Description: OSE implementation of the ethread library
- * Author: Lukas Larsson
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "stdio.h"
-#ifdef ETHR_TIME_WITH_SYS_TIME
-#  include "time.h"
-#  include "sys/time.h"
-#else
-#  ifdef ETHR_HAVE_SYS_TIME_H
-#    include "sys/time.h"
-#  else
-#    include "time.h"
-#  endif
-#endif
-#include "sys/types.h"
-#include "unistd.h"
-
-#include "limits.h"
-
-#define ETHR_INLINE_FUNC_NAME_(X) X ## __
-#define ETHREAD_IMPL__
-
-#include "ethread.h"
-#include "ethr_internal.h"
-
-#include "erl_printf.h"
-#include "efs.h"
-#include "ose.h"
-
-#include "ose_spi.h"
-
-#include "string.h"
-#include "ctype.h"
-#include "stdlib.h"
-
-#ifndef ETHR_HAVE_ETHREAD_DEFINES
-#error Missing configure defines
-#endif
-
-#define ETHR_INVALID_TID_ID -1
-
-#define DEFAULT_PRIO_NAME        "ERTS_ETHR_DEFAULT_PRIO"
-
-/* Set the define to 1 to get some logging */
-#if 0
-#include "ramlog.h"
-#define LOG(output) ramlog_printf output
-#else
-#define LOG(output)
-#endif
-
-static ethr_tid main_thr_tid;
-static const char* own_tid_key = "ethread_own_tid";
-ethr_tsd_key ethr_ts_event_key__;
-
-#define ETHREADWRAPDATASIG 1
-
-/* Init data sent to thr_wrapper() */
-typedef struct {
-    SIGSELECT sig_no;
-    ethr_ts_event *tse;
-    ethr_tid *tid;
-    ethr_sint32_t result;
-    void *(*thr_func)(void *);
-    void *arg;
-    void *prep_func_res;
-    const char *name;
-} ethr_thr_wrap_data__;
-
-union SIGNAL {
-  SIGSELECT sig_no;
-  ethr_thr_wrap_data__ data;
-};
-
-#define ETHR_GET_OWN_TID__	((ethr_tid *) get_envp(current_process(),\
-						       own_tid_key))
-
-/*
- * --------------------------------------------------------------------------
- * Static functions
- * --------------------------------------------------------------------------
- */
-
-/* Will retrive the instrinsic name by removing the 'prefix' and the
- * suffix from 'name'.
- * The 'prefix' is given as an inparameter. If NULL or an empty string no
- * prefix will be removed.
- * If 'strip_suffix' is 1 suffixes in the form of '_123' will be removed.
- * Will return a pointer to a newly allocated buffer containing the intrinsic
- * name in uppercase characters.
- * The caller must remember to free this buffer when no lnger needed.
- */
-static char *
-ethr_intrinsic_name(const char *name, const char *prefix, int strip_suffix)
-{
-   const char *start = name;
-   const char *end  = name + strlen(name);
-   char *intrinsic_name = NULL;
-   int i;
-
-   if (name == NULL) {
-      LOG(("ERTS - ethr_intrinsic_namNo input name.\n"));
-      return NULL;
-   }
-
-   /* take care of the prefix */
-   if ((prefix != NULL) && (*prefix != '\0')) {
-      const char *found = strstr(name, prefix);
-
-      if (found == name) {
-         /* found the prefix at the beginning */
-         start += strlen(prefix);
-      }
-   }
-
-   /* take care of the suffix */
-   if (strip_suffix) {
-      const char *suffix_start = strrchr(start, '_');
-
-      if (suffix_start != NULL) {
-         const char *ch;
-         int only_numbers = 1;
-
-         for (ch = suffix_start + 1; *ch != '\0'; ch++) {
-            if (strchr("0123456789", *ch) == NULL) {
-               only_numbers = 0;
-               break;
-            }
-         }
-
-         if (only_numbers) {
-            end = suffix_start;
-         }
-      }
-   }
-
-   intrinsic_name = malloc(end - start + 1);
-   for (i = 0; (start + i) < end; i++) {
-      intrinsic_name[i] = toupper(start[i]);
-   }
-   intrinsic_name[i] = '\0';
-
-   return intrinsic_name;
-}
-
-static char *
-ethr_get_amended_env(const char *name, const char *prefix, const char *suffix)
-{
-   unsigned len;
-   char *env_name = NULL;
-   char *env_value = NULL;
-
-   if (name == NULL) {
-      return NULL;
-   }
-
-   len = strlen(name);
-
-   if (prefix != NULL) {
-      len += strlen(prefix);
-   }
-
-   if (suffix != NULL) {
-      len += strlen(suffix);
-   }
-
-   env_name = malloc(len + 1);
-   sprintf(env_name, "%s%s%s", (prefix != NULL) ? prefix : "",
-                               name,
-                               (suffix != NULL) ? suffix : "");
-   env_value = get_env(get_bid(current_process()), env_name);
-
-   if (env_value == NULL) {
-      LOG(("ERTS - ethr_get_amended_env(): %s environment variable not present\n", env_name));
-   } else {
-      LOG(("ERTS - ethr_get_amended_env(): Found %s environment variable: %s.\n", env_name, env_value));
-   }
-   free(env_name);
-
-   return env_value;
-}
-
-/* Reads the environment variable derived from 'name' and interprets it as as an
- * OSE priority. If successfull it will update 'out_prio'.
- * Returns:  0 if successfull
- *          -1 orherwise.
- */
-static int
-ethr_get_prio(const char *name, OSPRIORITY *out_prio)
-{
-   int rc = -1;
-   char *intrinsic_name = NULL;
-   char *prio_env = NULL;
-   long prio;
-   char *endptr = NULL;
-
-   LOG(("ERTS - ethr_get_prio(): name: %s.\n", name));
-
-   intrinsic_name = ethr_intrinsic_name(name, NULL, 1);
-   LOG(("ERTS - ethr_get_prio(): Intrinsic name: %s.\n", intrinsic_name));
-
-   prio_env = ethr_get_amended_env(intrinsic_name, "ERTS_", "_PRIO");
-   if (prio_env == NULL) {
-      goto fini;
-   }
-
-   prio = efs_str_to_long(prio_env, (const char **)&endptr);
-   if (endptr != NULL) {
-      LOG(("ERTS - ethr_get_prio(): Environment varible for '%s' includes "
-           "non-numerical characters: '%s'.\n", intrinsic_name, prio_env));
-      goto fini;
-   }
-
-   if ((prio < 0) || (prio > 32)) {
-      LOG(("ERTS - ethr_get_prio(): prio for '%s' (%d) is out of bounds (0-32).\n",
-               intrinsic_name, prio));
-      goto fini;
-   }
-
-   /* Success */
-   *out_prio = (OSPRIORITY)prio;
-   rc = 0;
-
-fini:
-   if (intrinsic_name != NULL) {
-      free(intrinsic_name);
-   }
-   if (prio_env != NULL) {
-      free_buf((union SIGNAL **) &prio_env);
-   }
-
-   return rc;
-}
-
-static PROCESS blockId(void) {
-   static PROCESS bid = (PROCESS)0;
-
-   /* For now we only use the same block. */
-   /*   if (bid == 0) {
-      bid = create_block("Erlang-VM", 0, 0, 0, 0);
-   }
-   return bid; */
-   return 0;
-}
-
-static void thr_exit_cleanup(ethr_tid *tid, void *res)
-{
-
-     ETHR_ASSERT(tid == ETHR_GET_OWN_TID__);
-
-     tid->res = res;
-
-     ethr_run_exit_handlers__();
-     ethr_ts_event_destructor__((void *) ethr_get_tse__());
-}
-
-//static OS_PROCESS(thr_wrapper);
-static OS_PROCESS(thr_wrapper)
-{
-    ethr_tid my_tid;
-    ethr_sint32_t result;
-    void *res;
-    void *(*thr_func)(void *);
-    void *arg;
-    ethr_ts_event *tsep = NULL;
-
-#ifdef DEBUG
-    {
-       PROCESS pid = current_process();
-
-       const char *execMode;
-
-       PROCESS     bid      = get_bid(pid);
-
-       /* In the call below, 16 is a secret number provided by frbr that makes
-        * the function return current domain. */
-       OSADDRESS   domain   = get_pid_info(current_process(), 16);
-
-#ifdef HAVE_OSE_SPI_H
-       execMode = get_pid_info(pid, OSE_PI_SUPERVISOR)
-          ? "Supervisor"
-          : "User";
-#else
-       execMode = "unknown";
-#endif
-
-       fprintf(stderr,"[0x%x] New process. Bid:0x%x, domain:%d, exec mode:%s\n",
-               current_process(), bid, domain, execMode);
-    }
-#endif
-
-    {
-       SIGSELECT sigsel[] = {1,ETHREADWRAPDATASIG};
-       union SIGNAL *init_msg = receive(sigsel);
-
-       thr_func = init_msg->data.thr_func;
-       arg      = init_msg->data.arg;
-
-       result = (ethr_sint32_t) ethr_make_ts_event__(&tsep);
-
-       if (result == 0) {
-          tsep->iflgs |= ETHR_TS_EV_ETHREAD;
-          my_tid = *init_msg->data.tid;
-          set_envp(current_process(), own_tid_key, (OSADDRESS)&my_tid);
-          if (ethr_thr_child_func__)
-             ethr_thr_child_func__(init_msg->data.prep_func_res);
-       }
-
-       init_msg->data.result = result;
-
-       send(&init_msg,sender(&init_msg));
-    }
-
-    /* pthread mutex api says we have to do this */
-    signal_fsem(current_process());
-    ETHR_ASSERT(get_fsem(current_process()) == 0);
-
-    res = result == 0 ? (*thr_func)(arg) : NULL;
-
-    ethr_thr_exit(&res);
-}
-
-/* internal exports */
-
-int ethr_set_tse__(ethr_ts_event *tsep)
-{
-  return ethr_tsd_set(ethr_ts_event_key__,(void *) tsep);
-}
-
-ethr_ts_event *ethr_get_tse__(void)
-{
-  return (ethr_ts_event *) ethr_tsd_get(ethr_ts_event_key__);
-}
-
-#if defined(ETHR_PPC_RUNTIME_CONF__)
-
-static int
-ppc_init__(void)
-{
-    int pid;
-
-
-    ethr_runtime__.conf.have_lwsync = 0;
-
-    return 0;
-}
-
-#endif
-
-#if defined(ETHR_X86_RUNTIME_CONF__)
-
-void
-ethr_x86_cpuid__(int *eax, int *ebx, int *ecx, int *edx)
-{
-#if ETHR_SIZEOF_PTR == 4
-    int have_cpuid;
-    /*
-     * If it is possible to toggle eflags bit 21,
-     * we have the cpuid instruction.
-     */
-    __asm__ ("pushf\n\t"
-             "popl %%eax\n\t"
-             "movl %%eax, %%ecx\n\t"
-             "xorl $0x200000, %%eax\n\t"
-             "pushl %%eax\n\t"
-             "popf\n\t"
-             "pushf\n\t"
-             "popl %%eax\n\t"
-             "movl $0x0, %0\n\t"
-             "xorl %%ecx, %%eax\n\t"
-             "jz no_cpuid\n\t"
-	     "movl $0x1, %0\n\t"
-             "no_cpuid:\n\t"
-             : "=r"(have_cpuid)
-             :
-             : "%eax", "%ecx", "cc");
-    if (!have_cpuid) {
-	*eax = *ebx = *ecx = *edx = 0;
-	return;
-    }
-#endif
-#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__
-    /*
-     * When position independet code is used in 32-bit mode, the B register
-     * is used for storage of global offset table address, and we may not
-     * use it as input or output in an asm. We need to save and restore the
-     * B register explicitly (for some reason gcc doesn't provide this
-     * service to us).
-     */
-    __asm__ ("pushl %%ebx\n\t"
-	     "cpuid\n\t"
-	     "movl %%ebx, %1\n\t"
-	     "popl %%ebx\n\t"
-	     : "=a"(*eax), "=r"(*ebx), "=c"(*ecx), "=d"(*edx)
-	     : "0"(*eax)
-	     : "cc");
-#else
-    __asm__ ("cpuid\n\t"
-	     : "=a"(*eax), "=b"(*ebx), "=c"(*ecx), "=d"(*edx)
-	     : "0"(*eax)
-	     : "cc");
-#endif
-}
-
-#endif /* ETHR_X86_RUNTIME_CONF__ */
-
-/*
- * --------------------------------------------------------------------------
- * Exported functions
- * --------------------------------------------------------------------------
- */
-
-int
-ethr_init(ethr_init_data *id)
-{
-    int res;
-
-    if (!ethr_not_inited__)
-	return EINVAL;
-
-
-#if defined(ETHR_PPC_RUNTIME_CONF__)
-    res = ppc_init__();
-    if (res != 0)
-	goto error;
-#endif
-
-    res = ethr_init_common__(id);
-    if (res != 0)
-	goto error;
-
-    main_thr_tid.id = current_process();
-    main_thr_tid.tsd_key_index = 0;
-
-    set_envp(current_process(),own_tid_key,(OSADDRESS)&main_thr_tid);
-    signal_fsem(current_process());
-
-
-    ETHR_ASSERT(&main_thr_tid == ETHR_GET_OWN_TID__);
-
-    ethr_not_inited__ = 0;
-
-    ethr_tsd_key_create(&ethr_ts_event_key__,"ethread_tse");
-
-    return 0;
- error:
-    ethr_not_inited__ = 1;
-    return res;
-
-}
-
-int
-ethr_late_init(ethr_late_init_data *id)
-{
-    int res = ethr_late_init_common__(id);
-    if (res != 0)
-	return res;
-    ethr_not_completely_inited__ = 0;
-    return res;
-}
-
-int
-ethr_thr_create(ethr_tid *tid, void * (*func)(void *), void *arg,
-		ethr_thr_opts *opts)
-{
-    int res;
-    int use_stack_size = (opts && opts->suggested_stack_size >= 0
-			  ? opts->suggested_stack_size
-			  : 0x200 /* Use system default */);
-    OSPRIORITY use_prio;
-    char *use_name;
-    char default_thr_name[20];
-    static int no_of_thr = 0;
-    cpuid_t use_core;
-
-    union SIGNAL *init_msg;
-    SIGSELECT sigsel[] = {1,ETHREADWRAPDATASIG};
-    void *prep_func_res;
-
-
-    if (opts != NULL) {
-        LOG(("ERTS - ethr_thr_create(): opts supplied: name: %s, coreNo: %u.\n",
-                      opts->name, opts->coreNo));
-        use_name = opts->name;
-        use_core = opts->coreNo;
-        if (0 != ethr_get_prio(use_name, &use_prio)) {
-           if (0 != ethr_get_prio("DEFAULT", &use_prio)) {
-              use_prio = get_pri(current_process());
-              LOG(("ERTS - ethr_thr_create(): Using current process' prio: %d.\n", use_prio));
-           } else {
-              LOG(("ERTS - ethr_thr_create(): Using default prio: %d.\n", use_prio));
-           }
-        } else {
-           LOG(("ERTS - ethr_thr_create(): Using configured prio: %d.\n", use_prio));
-        }
-    } else {
-        LOG(("ERTS - ethr_thr_create(): opts not supplied. Using defaults.\n"));
-        no_of_thr++;
-        sprintf(default_thr_name, "ethread_%d", no_of_thr);
-        use_name = default_thr_name;
-        use_core = ose_cpu_id();
-
-        if (0 != ethr_get_prio("DEFAULT", &use_prio)) {
-           use_prio = get_pri(current_process());
-           LOG(("ERTS - ethr_thr_create(): Using current process' prio: %d.\n", use_prio));
-        }
-    }
-
-#ifdef ETHR_MODIFIED_DEFAULT_STACK_SIZE
-    if (use_stack_size < 0)
-	use_stack_size = ETHR_MODIFIED_DEFAULT_STACK_SIZE;
-#endif
-
-#if ETHR_XCHK
-    if (ethr_not_completely_inited__) {
-	ETHR_ASSERT(0);
-	return EACCES;
-    }
-    if (!tid || !func) {
-	ETHR_ASSERT(0);
-	return EINVAL;
-    }
-#endif
-
-    if (use_stack_size >= 0) {
-	size_t suggested_stack_size = (size_t) use_stack_size;
-	size_t stack_size;
-#ifdef ETHR_DEBUG
-	suggested_stack_size /= 2; /* Make sure we got margin */
-#endif
-#ifdef ETHR_STACK_GUARD_SIZE
-	/* The guard is at least on some platforms included in the stack size
-	   passed when creating threads */
-	suggested_stack_size += ETHR_B2KW(ETHR_STACK_GUARD_SIZE);
-#endif
-
-	if (suggested_stack_size < ethr_min_stack_size__)
-	    stack_size = ETHR_KW2B(ethr_min_stack_size__);
-	else if (suggested_stack_size > ethr_max_stack_size__)
-	    stack_size = ETHR_KW2B(ethr_max_stack_size__);
-	else
-	    stack_size = ETHR_PAGE_ALIGN(ETHR_KW2B(suggested_stack_size));
-	use_stack_size = stack_size;
-    }
-
-    init_msg = alloc(sizeof(ethr_thr_wrap_data__), ETHREADWRAPDATASIG);
-
-    /* Call prepare func if it exist */
-    if (ethr_thr_prepare_func__)
-	init_msg->data.prep_func_res = ethr_thr_prepare_func__();
-    else
-	init_msg->data.prep_func_res = NULL;
-
-    LOG(("ERTS - ethr_thr_create(): Process [0x%x] is creating '%s', coreNo = %u, prio:%u\n",
-                  current_process(), use_name, use_core, use_prio));
-
-    tid->id = create_process(OS_PRI_PROC, use_name, thr_wrapper,
-			     use_stack_size, use_prio, 0,
-                             get_bid(current_process()), NULL, 0, 0);
-      if (ose_bind_process(tid->id, use_core)) {
-         LOG(("ERTS - ethr_thr_create(): Bound pid 0x%x (%s) to core no %u.\n",
-              tid->id, use_name, use_core));
-      } else {
-            LOG(("ERTS - ethr_thr_create(): Failed binding pid 0x%x (%s) to core no %u.\n",
-                 tid->id, use_name, use_core));
-      }
-
-    /*FIXME!!! Normally this shouldn't be used in shared mode. Still there is
-     * a problem with stdin fd in fd_ processes which should be further
-     * investigated */
-    efs_clone(tid->id);
-
-    tid->tsd_key_index = 0;
-    tid->res = NULL;
-
-    init_msg->data.tse      = ethr_get_ts_event();
-    init_msg->data.thr_func = func;
-    init_msg->data.arg      = arg;
-    init_msg->data.tid      = tid;
-    init_msg->data.name     = opts->name;
-
-    send(&init_msg, tid->id);
-
-    start(tid->id);
-    init_msg = receive(sigsel);
-
-    res = init_msg->data.result;
-    prep_func_res = init_msg->data.prep_func_res;
-
-    free_buf(&init_msg);
-    /* Cleanup... */
-
-    if (ethr_thr_parent_func__)
-	ethr_thr_parent_func__(prep_func_res);
-
-    LOG(("ERTS - ethr_thr_create(): Exiting.\n"));
-    return res;
-}
-
-int
-ethr_thr_join(ethr_tid tid, void **res)
-{
-    SIGSELECT sigsel[] = {1,OS_ATTACH_SIG};
-#if ETHR_XCHK
-    if (ethr_not_inited__) {
-	ETHR_ASSERT(0);
-	return EACCES;
-    }
-#endif
-
-    if (tid.id == ETHR_INVALID_TID_ID)
-      return EINVAL;
-
-    attach(NULL,tid.id);
-    receive(sigsel);
-
-    if (res)
-      *res = tid.res;
-
-    return 0;
-}
-
-int
-ethr_thr_detach(ethr_tid tid)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited__) {
-	ETHR_ASSERT(0);
-	return EACCES;
-    }
-#endif
-    return 0;
-}
-
-void
-ethr_thr_exit(void *res)
-{
-    ethr_tid *tid;
-#if ETHR_XCHK
-    if (ethr_not_inited__) {
-	ETHR_ASSERT(0);
-	return;
-    }
-#endif
-    tid = ETHR_GET_OWN_TID__;
-    if (!tid) {
-	ETHR_ASSERT(0);
-	kill_proc(current_process());
-    }
-    thr_exit_cleanup(tid, res);
-    /* Harakiri possible? */
-    kill_proc(current_process());
-}
-
-ethr_tid
-ethr_self(void)
-{
-    ethr_tid *tid;
-#if ETHR_XCHK
-    if (ethr_not_inited__) {
-      ethr_tid dummy_tid = {ETHR_INVALID_TID_ID, 0, NULL};
-	ETHR_ASSERT(0);
-	return dummy_tid;
-    }
-#endif
-    tid = ETHR_GET_OWN_TID__;
-    if (!tid) {
-	ethr_tid dummy_tid = {ETHR_INVALID_TID_ID, 0, NULL};
-	return dummy_tid;
-    }
-    return *tid;
-}
-
-int
-ethr_equal_tids(ethr_tid tid1, ethr_tid tid2)
-{
-    return tid1.id == tid2.id && tid1.id != ETHR_INVALID_TID_ID;
-}
-
-
-/*
- * Thread specific events
- */
-
-ethr_ts_event *
-ethr_get_ts_event(void)
-{
-    return ethr_get_ts_event__();
-}
-
-void
-ethr_leave_ts_event(ethr_ts_event *tsep)
-{
-    ethr_leave_ts_event__(tsep);
-}
-
-/*
- * Thread specific data
- */
-
-int
-ethr_tsd_key_create(ethr_tsd_key *keyp, char *keyname)
-{
-
-#if ETHR_XCHK
-    if (ethr_not_inited__) {
-	ETHR_ASSERT(0);
-	return EACCES;
-    }
-    if (!keyp) {
-	ETHR_ASSERT(0);
-	return EINVAL;
-    }
-#endif
-
-    ose_create_ppdata(keyname,keyp);
-
-    return 0;
-}
-
-int
-ethr_tsd_key_delete(ethr_tsd_key key)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited__) {
-	ETHR_ASSERT(0);
-	return EACCES;
-    }
-#endif
-    /* Not possible to delete ppdata */
-
-    return 0;
-}
-
-int
-ethr_tsd_set(ethr_tsd_key key, void *value)
-{
-    void **ppdp;
-#if ETHR_XCHK
-    if (ethr_not_inited__) {
-	ETHR_ASSERT(0);
-	return EACCES;
-    }
-#endif
-    ppdp = (void **)ose_get_ppdata(key);
-    *ppdp = value;
-    return 0;
-}
-
-void *
-ethr_tsd_get(ethr_tsd_key key)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited__) {
-	ETHR_ASSERT(0);
-	return NULL;
-    }
-#endif
-    return *(void**)ose_get_ppdata(key);
-}
-
-/*
- * Signal functions
- */
-
-#if ETHR_HAVE_ETHR_SIG_FUNCS
-
-int ethr_sigmask(int how, const sigset_t *set, sigset_t *oset)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited__) {
-	ETHR_ASSERT(0);
-	return EACCES;
-    }
-    if (!set && !oset) {
-	ETHR_ASSERT(0);
-	return EINVAL;
-    }
-#endif
-  return pthread_sigmask(how, set, oset);
-}
-
-int ethr_sigwait(const sigset_t *set, int *sig)
-{
-#if ETHR_XCHK
-    if (ethr_not_inited__) {
-	ETHR_ASSERT(0);
-	return EACCES;
-    }
-    if (!set || !sig) {
-	ETHR_ASSERT(0);
-	return EINVAL;
-    }
-#endif
-    if (sigwait(set, sig) < 0)
-	return errno;
-    return 0;
-}
-
-#endif /* #if ETHR_HAVE_ETHR_SIG_FUNCS */
-
-ETHR_IMPL_NORETURN__
-ethr_abort__(void)
-{
-    abort();
-}
diff --git a/erts/lib_src/pthread/ethr_event.c b/erts/lib_src/pthread/ethr_event.c
index 0629b4dfcd..69e7be342c 100644
--- a/erts/lib_src/pthread/ethr_event.c
+++ b/erts/lib_src/pthread/ethr_event.c
@@ -94,6 +94,9 @@ wait__(ethr_event *e, int spincount, ethr_sint64_t timeout)
 	tsp = NULL;
     }
     else {
+#ifdef ETHR_HAVE_ETHR_GET_MONOTONIC_TIME
+	start = ethr_get_monotonic_time();
+#endif
 	tsp = &ts;
 	time = timeout;
 	if (spincount == 0) {
@@ -102,9 +105,6 @@ wait__(ethr_event *e, int spincount, ethr_sint64_t timeout)
 		goto return_event_on;
 	    goto set_timeout;
 	}
-#ifdef ETHR_HAVE_ETHR_GET_MONOTONIC_TIME
-	start = ethr_get_monotonic_time();
-#endif
     }
 
     while (1) {
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index 4a6fb6109f..f224178c4f 100644
--- a/erts/preloaded/ebin/erl_prim_loader.beam
+++ b/erts/preloaded/ebin/erl_prim_loader.beam
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 58516c0ff3..7ceb6daaa3 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/ebin/erts_code_purger.beam b/erts/preloaded/ebin/erts_code_purger.beam
new file mode 100644
index 0000000000..4188e5fd9b
--- /dev/null
+++ b/erts/preloaded/ebin/erts_code_purger.beam
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index 32d5d70122..88da34b192 100644
--- a/erts/preloaded/ebin/erts_internal.beam
+++ b/erts/preloaded/ebin/erts_internal.beam
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index 9b0fc82bed..7d73ca2234 100644
--- a/erts/preloaded/ebin/init.beam
+++ b/erts/preloaded/ebin/init.beam
diff --git a/erts/preloaded/ebin/otp_ring0.beam b/erts/preloaded/ebin/otp_ring0.beam
index c8166d5ed7..3cd2515ba8 100644
--- a/erts/preloaded/ebin/otp_ring0.beam
+++ b/erts/preloaded/ebin/otp_ring0.beam
diff --git a/erts/preloaded/ebin/prim_eval.beam b/erts/preloaded/ebin/prim_eval.beam
index ddcc3886a4..9a208d1545 100644
--- a/erts/preloaded/ebin/prim_eval.beam
+++ b/erts/preloaded/ebin/prim_eval.beam
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index 97170551bf..426e764127 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam
index 72065661c5..d68d18ecba 100644
--- a/erts/preloaded/ebin/prim_inet.beam
+++ b/erts/preloaded/ebin/prim_inet.beam
diff --git a/erts/preloaded/ebin/prim_zip.beam b/erts/preloaded/ebin/prim_zip.beam
index 2a0b33279d..01b3b1feb8 100644
--- a/erts/preloaded/ebin/prim_zip.beam
+++ b/erts/preloaded/ebin/prim_zip.beam
diff --git a/erts/preloaded/ebin/zlib.beam b/erts/preloaded/ebin/zlib.beam
index 0d3d1d9343..7252d866bb 100644
--- a/erts/preloaded/ebin/zlib.beam
+++ b/erts/preloaded/ebin/zlib.beam
diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
index 52034a0881..31383dda83 100644
--- a/erts/preloaded/src/Makefile
+++ b/erts/preloaded/src/Makefile
@@ -41,6 +41,7 @@ PRE_LOADED_ERL_MODULES = \
 	zlib \
 	prim_zip \
 	otp_ring0 \
+	erts_code_purger \
 	erlang \
 	erts_internal
 
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index 9f6cba33bd..641abae7b1 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -42,7 +42,7 @@
 -include("inet_boot.hrl").
 
 %% Public
--export([start/3, set_path/1, get_path/0, get_file/1, get_files/2,
+-export([start/0, set_path/1, get_path/0, get_file/1,
          list_dir/1, read_file_info/1, read_link_info/1, get_cwd/0, get_cwd/1]).
 
 %% Used by erl_boot_server
@@ -50,30 +50,31 @@
          prim_read_file_info/3, prim_get_cwd/2]).
 
 %% Used by escript and code
--export([set_primary_archive/4, release_archives/0]).
+-export([set_primary_archive/4]).
+
+%% Used by test suites
+-export([purge_archive_cache/0]).
+
+%% Used by init and the code server.
+-export([get_modules/2,get_modules/3]).
 
 -include_lib("kernel/include/file.hrl").
 
 -type host() :: atom().
 
 -record(prim_state, {debug :: boolean(),
-		     cache,
 		     primary_archive}).
 -type prim_state() :: #prim_state{}.
 
 -record(state, 
         {loader            :: 'efile' | 'inet',
          hosts = []        :: [host()], % hosts list (to boot from)
-         id,                      % not used any more?
          data              :: 'noport' | port(), % data port etc
-         timeout           :: timeout(),         % idle timeout
-	 %% Number of timeouts before archives are released
-	 n_timeouts        :: non_neg_integer(),
-         multi_get = false :: boolean(),
+         timeout           :: timeout(),	 % idle timeout
          prim_state        :: prim_state()}).    % state for efile code loader
 
--define(IDLE_TIMEOUT, 60000).  %% tear inet connection after 1 minutes
--define(N_TIMEOUTS, 6).        %% release efile archive after 6 minutes
+-define(EFILE_IDLE_TIMEOUT, (6*60*1000)).	%purge archives
+-define(INET_IDLE_TIMEOUT, (60*1000)). 		%tear down connection timeout
 
 %% Defines for inet as prim_loader
 -define(INET_FAMILY, inet).
@@ -103,26 +104,13 @@ debug(#prim_state{debug = Deb}, Term) ->
 %%% Interface Functions. 
 %%% --------------------------------------------------------
 
--spec start(Id, Loader, Hosts) ->
+-spec start() ->
 	    {'ok', Pid} | {'error', What} when
-      Id :: term(),
-      Loader :: atom() | string(),
-      Hosts :: Host | [Host],
-      Host :: host(),
       Pid :: pid(),
       What :: term().
-start(Id, Pgm, Hosts) when is_atom(Hosts) ->
-    start(Id, Pgm, [Hosts]);
-start(Id, Pgm0, Hosts) ->
-    Pgm = if
-              is_atom(Pgm0) ->
-                  atom_to_list(Pgm0);
-              true ->
-                  Pgm0
-          end,
+start() ->
     Self = self(),
-    Pid = spawn_link(fun() -> start_it(Pgm, Id, Self, Hosts) end),
-    register(erl_prim_loader, Pid),
+    Pid = spawn_link(fun() -> start_it(Self) end),
     receive
         {Pid,ok} ->
             {ok,Pid};
@@ -130,26 +118,39 @@ start(Id, Pgm0, Hosts) ->
             {error,Reason}
     end.
 
-%% Hosts must be a list of form ['1.2.3.4' ...]
-start_it("inet", Id, Pid, Hosts) ->
+start_it(Parent) ->
     process_flag(trap_exit, true),
-    ?dbg(inet, {Id,Pid,Hosts}),
+    register(erl_prim_loader, self()),
+    Loader = case init:get_argument(loader) of
+		 {ok,[[Loader0]]} ->
+		     Loader0;
+		 error ->
+		     "efile"
+	     end,
+    case Loader of
+	"efile" -> start_efile(Parent);
+	"inet" -> start_inet(Parent)
+    end.
+
+%% Hosts must be a list of form ['1.2.3.4' ...]
+start_inet(Parent) ->
+    Hosts = case init:get_argument(hosts) of
+		{ok,[Hosts0]} -> Hosts0;
+		_ -> []
+	    end,
     AL = ipv4_list(Hosts),
     ?dbg(addresses, AL),
     {ok,Tcp} = find_master(AL),
-    init_ack(Pid),
+    init_ack(Parent),
     PS = prim_init(),
     State = #state {loader = inet,
                     hosts = AL,
-                    id = Id,
                     data = Tcp,
-                    timeout = ?IDLE_TIMEOUT,
-		    n_timeouts = ?N_TIMEOUTS,
+                    timeout = ?INET_IDLE_TIMEOUT,
                     prim_state = PS},
-    loop(State, Pid, []);
+    loop(State, Parent, []).
 
-start_it("efile", Id, Pid, _Hosts) ->
-    process_flag(trap_exit, true),
+start_efile(Parent) ->
     {ok, Port} = prim_file:start(),
     %% Check that we started in a valid directory.
     case prim_file:get_cwd(Port) of
@@ -160,20 +161,14 @@ start_it("efile", Id, Pid, _Hosts) ->
 	    erlang:display(Report),
 	    exit({error, invalid_current_directory});
 	_ ->
-	    init_ack(Pid)
+	    init_ack(Parent)
     end,
-    MultiGet = case erlang:system_info(thread_pool_size) of
-                   0 -> false;
-                   _ -> true
-               end,
     PS = prim_init(),
     State = #state {loader = efile,
-                    id = Id,
                     data = Port,
-                    timeout = infinity,
-                    multi_get = MultiGet,
+                    timeout = ?EFILE_IDLE_TIMEOUT,
                     prim_state = PS},
-    loop(State, Pid, []).
+    loop(State, Parent, []).
 
 init_ack(Pid) ->
     Pid ! {self(),ok},
@@ -198,20 +193,6 @@ get_file(File) when is_atom(File) ->
 get_file(File) ->
     check_file_result(get_file, File, request({get_file,File})).
 
--spec get_files([{atom(), string()}],
-		fun((atom(),binary(),string()) -> 'ok' | {'error', atom()})) ->
-			'ok' | {'error', atom()}.
-get_files(ModFiles, Fun) ->
-    case request({get_files,{ModFiles,Fun}}) of
-        E = {error,_M} ->
-            E;
-        {error,Reason,M} ->
-            check_file_result(get_files, M, {error,Reason}),
-            {error,M};
-        ok ->
-            ok
-    end.
-
 -spec list_dir(Dir) -> {'ok', Filenames} | 'error' when
       Dir :: string(),
       Filenames :: [Filename :: string()].
@@ -250,10 +231,30 @@ set_primary_archive(File, ArchiveBin, FileInfo, ParserFun)
   when is_list(File), is_binary(ArchiveBin), is_record(FileInfo, file_info) ->
     request({set_primary_archive, File, ArchiveBin, FileInfo, ParserFun}).
 
--spec release_archives() -> 'ok' | {'error', _}.
+%% NOTE: Does not close the primary archive. Only closes all
+%% open zip files kept in the cache. Should be called before an archive
+%% file is to be removed (for example in the test suites).
 
-release_archives() ->
-    request(release_archives).
+-spec purge_archive_cache() -> 'ok' | {'error', _}.
+purge_archive_cache() ->
+    request(purge_archive_cache).
+
+-spec get_modules([module()],
+		  fun((atom(), string(), binary()) ->
+			     {'ok',any()} | {'error',any()})) ->
+			 {'ok',{[any()],[any()]}}.
+
+get_modules(Modules, Fun) ->
+    request({get_modules,{Modules,Fun}}).
+
+-spec get_modules([module()],
+		  fun((atom(), string(), binary()) ->
+			     {'ok',any()} | {'error',any()}),
+		  [string()]) ->
+			 {'ok',{[any()],[any()]}}.
+
+get_modules(Modules, Fun, Path) ->
+    request({get_modules,{Modules,Fun,Path}}).
 
 request(Req) ->
     Loader = whereis(erl_prim_loader),
@@ -310,76 +311,63 @@ check_file_result(_, _, Other) ->
 %%% The main loop.
 %%% --------------------------------------------------------
 
-loop(State, Parent, Paths) ->
+loop(St0, Parent, Paths) ->
     receive
+	{Pid,{set_path,NewPaths}} when is_pid(Pid) ->
+	    Pid ! {self(),ok},
+	    loop(St0, Parent, to_strs(NewPaths));
         {Pid,Req} when is_pid(Pid) ->
-            %% erlang:display(Req),
-            {Resp,State2,Paths2} =
-                case Req of
-                    {set_path,NewPaths} ->
-                        {ok,State,to_strs(NewPaths)};
-                    {get_path,_} ->
-                        {{ok,Paths},State,Paths};
-                    {get_file,File} ->
-                        {Res,State1} = handle_get_file(State, Paths, File),
-                        {Res,State1,Paths};
-                    {get_files,{ModFiles,Fun}} ->
-                        {Res,State1} = handle_get_files(State, ModFiles, Paths, Fun),
-                        {Res,State1,Paths};
-                    {list_dir,Dir} ->
-                        {Res,State1} = handle_list_dir(State, Dir),
-                        {Res,State1,Paths};
-                    {read_file_info,File} ->
-                        {Res,State1} = handle_read_file_info(State, File),
-                        {Res,State1,Paths};
-                    {read_link_info,File} ->
-                        {Res,State1} = handle_read_link_info(State, File),
-                        {Res,State1,Paths};
-                    {get_cwd,[]} ->
-                        {Res,State1} = handle_get_cwd(State, []),
-                        {Res,State1,Paths};
-                    {get_cwd,[_]=Args} ->
-                        {Res,State1} = handle_get_cwd(State, Args),
-                        {Res,State1,Paths};
-                    {set_primary_archive,File,ArchiveBin,FileInfo,ParserFun} ->
-                        {Res,State1} =
-			    handle_set_primary_archive(State, File,
-						       ArchiveBin, FileInfo,
-						       ParserFun),
-                        {Res,State1,Paths};
-                    release_archives ->
-                        {Res,State1} = handle_release_archives(State),
-                        {Res,State1,Paths};
-                    _Other ->
-                        {ignore,State,Paths}
-                end,
-            if Resp =:= ignore -> ok;
-               true -> Pid ! {self(),Resp}, ok
-            end,
-            if 
-                is_record(State2, state) ->
-                    loop(State2, Parent, Paths2);
-                true ->
-                    exit({bad_state, Req, State2})          
+	    case handle_request(Req, Paths, St0) of
+		ignore ->
+		    ok;
+		{Resp,#state{}=St1} ->
+		    Pid ! {self(),Resp},
+                    loop(St1, Parent, Paths);
+		{_,State2,_} ->
+                    exit({bad_state,Req,State2})
             end;
         {'EXIT',Parent,W} ->
-            _State1 = handle_stop(State),
+            _ = handle_stop(St0),
             exit(W);
         {'EXIT',P,W} ->
-            State1 = handle_exit(State, P, W),
-            loop(State1, Parent, Paths);
+            St1 = handle_exit(St0, P, W),
+            loop(St1, Parent, Paths);
         _Message ->
-            loop(State, Parent, Paths)
-    after State#state.timeout ->
-            State1 = handle_timeout(State, Parent),
-            loop(State1, Parent, Paths)
+            loop(St0, Parent, Paths)
+    after St0#state.timeout ->
+            St1 = handle_timeout(St0, Parent),
+            loop(St1, Parent, Paths)
+    end.
+
+handle_request(Req, Paths, St0) ->
+    case Req of
+	{get_path,_} ->
+	    {{ok,Paths},St0};
+	{get_file,File} ->
+	    handle_get_file(St0, Paths, File);
+	{get_modules,{Modules,Fun}} ->
+	    handle_get_modules(St0, Modules, Fun, Paths);
+	{get_modules,{Modules,Fun,ModPaths}} ->
+	    handle_get_modules(St0, Modules, Fun, ModPaths);
+	{list_dir,Dir} ->
+	    handle_list_dir(St0, Dir);
+	{read_file_info,File} ->
+	    handle_read_file_info(St0, File);
+	{read_link_info,File} ->
+	    handle_read_link_info(St0, File);
+	{get_cwd,[]} ->
+	    handle_get_cwd(St0, []);
+	{get_cwd,[_]=Args} ->
+	    handle_get_cwd(St0, Args);
+	{set_primary_archive,File,ArchiveBin,FileInfo,ParserFun} ->
+	    handle_set_primary_archive(St0, File, ArchiveBin,
+				       FileInfo, ParserFun);
+	purge_archive_cache ->
+	    handle_purge_archive_cache(St0);
+	_ ->
+	    ignore
     end.
 
-handle_get_files(State = #state{multi_get = true}, ModFiles, Paths, Fun) ->
-    ?SAFE2(efile_multi_get_file_from_port(State, ModFiles, Paths, Fun), State);
-handle_get_files(State, _ModFiles, _Paths, _Fun) ->     % no multi get
-    {{error,no_multi_get},State}.
-    
 handle_get_file(State = #state{loader = efile}, Paths, File) ->
     ?SAFE2(efile_get_file_from_port(State, File, Paths), State);
 handle_get_file(State = #state{loader = inet}, Paths, File) ->
@@ -388,8 +376,9 @@ handle_get_file(State = #state{loader = inet}, Paths, File) ->
 handle_set_primary_archive(State= #state{loader = efile}, File, ArchiveBin, FileInfo, ParserFun) ->
     ?SAFE2(efile_set_primary_archive(State, File, ArchiveBin, FileInfo, ParserFun), State).
 
-handle_release_archives(State= #state{loader = efile}) ->
-    ?SAFE2(efile_release_archives(State), State).
+handle_purge_archive_cache(#state{loader = efile}=State) ->
+    prim_purge_cache(),
+    {ok,State}.
 
 handle_list_dir(State = #state{loader = efile}, Dir) ->
     ?SAFE2(efile_list_dir(State, Dir), State);
@@ -430,53 +419,6 @@ handle_timeout(State = #state{loader = inet}, Parent) ->
 %%% Functions which handle efile as prim_loader (default).
 %%% --------------------------------------------------------
 
-%%% Reading many files in parallel is an optimization. 
-%%% See also comment in init.erl.
-
-%% -> {ok,State} | {{error,Module},State} | {{error,Reason,Module},State}
-efile_multi_get_file_from_port(State, ModFiles, Paths, Fun) ->
-    Ref = make_ref(),
-    %% More than 200 processes is no gain.
-    Max = erlang:min(200, erlang:system_info(thread_pool_size)),
-    efile_multi_get_file_from_port2(ModFiles, 0, Max, State, Paths, Fun, Ref, ok).
-
-efile_multi_get_file_from_port2([MF | MFs], Out, Max, State, Paths, Fun, Ref, Ret) when Out < Max ->
-    Self = self(),
-    _Pid = spawn(fun() -> efile_par_get_file(Ref, State, MF, Paths, Self, Fun) end),
-    efile_multi_get_file_from_port2(MFs, Out+1, Max, State, Paths, Fun, Ref, Ret);
-efile_multi_get_file_from_port2(MFs, Out, Max, _State, Paths, Fun, Ref, Ret) when Out > 0 ->
-    receive 
-        {Ref, ok, State1} ->
-            efile_multi_get_file_from_port2(MFs, Out-1, Max, State1, Paths, Fun, Ref, Ret);
-        {Ref, {error,_Mod} = Error, State1} ->
-            efile_multi_get_file_from_port2(MFs, Out-1, Max, State1, Paths, Fun, Ref, Error);
-        {Ref, MF, {error,emfile,State1}} ->
-            %% Max can take negative values. Out cannot.
-            efile_multi_get_file_from_port2([MF | MFs], Out-1, Max-1, State1, Paths, Fun, Ref, Ret);
-        {Ref, {M,_F}, {error,Error,State1}} -> 
-            efile_multi_get_file_from_port2(MFs, Out-1, 0, State1, Paths, Fun, Ref, {error,Error,M})
-    end;
-efile_multi_get_file_from_port2(_MFs, 0, _Max, State, _Paths, _Fun, _Ref, Ret) ->
-    {Ret,State}.
-
-efile_par_get_file(Ref, State, {Mod,File} = MF, Paths, Pid, Fun) ->
-    %% One port for each file read in "parallel":
-    case prim_file:start() of
-        {ok, Port} ->
-            Port0 = State#state.data,
-            State1 = State#state{data = Port},
-            R = case efile_get_file_from_port(State1, File, Paths) of
-                    {{error,Reason},State2} -> 
-                        {Ref,MF,{error,Reason,State2}};
-                    {{ok,BinFile,Full},State2} -> 
-                        %% Fun(...) -> ok | {error,Mod}
-                        {Ref,Fun(Mod, BinFile, Full),State2#state{data=Port0}}
-                end,
-            prim_file:close(Port),
-            Pid ! R;
-        {error, Error} ->
-            Pid ! {Ref,MF,{error,Error,State}}
-    end.
 
 %% -> {{ok,BinFile,File},State} | {{error,Reason},State}
 efile_get_file_from_port(State, File, Paths) ->
@@ -521,10 +463,6 @@ efile_set_primary_archive(#state{prim_state = PS} = State, File,
 					  FileInfo, ParserFun),
     {Res,State#state{prim_state = PS2}}.
 
-efile_release_archives(#state{prim_state = PS} = State) ->
-    {Res, PS2} = prim_release_archives(PS),
-    {Res,State#state{prim_state = PS2}}.
-
 efile_list_dir(#state{prim_state = PS} = State, Dir) ->
     {Res, PS2} = prim_list_dir(PS, Dir),
     {Res, State#state{prim_state = PS2}}.
@@ -546,15 +484,128 @@ efile_exit_port(State, Port, Reason) when State#state.data =:= Port ->
 efile_exit_port(State, _Port, _Reason) ->
     State.
 
-efile_timeout_handler(#state{n_timeouts = N} = State, _Parent) ->
-    if
-	N =< 0 ->
-	    {_Res, State2} = efile_release_archives(State),
-	    State2#state{n_timeouts = ?N_TIMEOUTS};
-	true ->
-	    State#state{n_timeouts = N - 1}
+efile_timeout_handler(State, _Parent) ->
+    prim_purge_cache(),
+    State.
+
+%%% --------------------------------------------------------
+%%% Read and process severals modules in parallel.
+%%% --------------------------------------------------------
+
+handle_get_modules(#state{loader=efile}=St, Ms, Process, Paths) ->
+    Primary = (St#state.prim_state)#prim_state.primary_archive,
+    Res = case efile_any_archives(Paths, Primary) of
+	      false ->
+		  efile_get_mods_par(Ms, Process, Paths);
+	      true ->
+		  Get = fun efile_get_file_from_port/3,
+		  gm_get_mods(St, Get, Ms, Process, Paths)
+	  end,
+    {Res,St};
+handle_get_modules(#state{loader=inet}=St, Ms, Process, Paths) ->
+    Get = fun inet_get_file_from_port/3,
+    {gm_get_mods(St, Get, Ms, Process, Paths),St}.
+
+efile_get_mods_par(Ms, Process, Paths) ->
+    Self = self(),
+    Ref = make_ref(),
+    GmSpawn = fun() ->
+		      efile_gm_spawn({Self,Ref}, Ms, Process, Paths)
+	      end,
+    _ = spawn_link(GmSpawn),
+    N = length(Ms),
+    efile_gm_recv(N, Ref, [], []).
+
+efile_any_archives([H|T], Primary) ->
+    case name_split(Primary, H) of
+	{file,_} -> efile_any_archives(T, Primary);
+	{archive,_,_} -> true
+    end;
+efile_any_archives([], _) ->
+    false.
+
+efile_gm_recv(0, _Ref, Succ, Fail) ->
+    {ok,{Succ,Fail}};
+efile_gm_recv(N, Ref, Succ, Fail) ->
+    receive
+	{Ref,Mod,{ok,Res}} ->
+	    efile_gm_recv(N-1, Ref, [{Mod,Res}|Succ], Fail);
+	{Ref,Mod,{error,Res}} ->
+	    efile_gm_recv(N-1, Ref, Succ, [{Mod,Res}|Fail])
     end.
 
+efile_gm_spawn(ParentRef, Ms, Process, Paths) ->
+    efile_gm_spawn_1(0, Ms, ParentRef, Process, Paths).
+
+efile_gm_spawn_1(N, Ms, ParentRef, Process, Paths) when N >= 32 ->
+    receive
+	{'DOWN',_,process,_,_} ->
+	    efile_gm_spawn_1(N-1, Ms, ParentRef, Process, Paths)
+    end;
+efile_gm_spawn_1(N, [M|Ms], ParentRef, Process, Paths) ->
+    Get = fun() -> efile_gm_get(Paths, M, ParentRef, Process) end,
+    _ = spawn_monitor(Get),
+    efile_gm_spawn_1(N+1, Ms, ParentRef, Process, Paths);
+efile_gm_spawn_1(_, [], _, _, _) ->
+    ok.
+
+efile_gm_get(Paths, Mod, ParentRef, Process) ->
+    File = atom_to_list(Mod) ++ init:objfile_extension(),
+    efile_gm_get_1(Paths, File, Mod, ParentRef, Process).
+
+efile_gm_get_1([P|Ps], File0, Mod, {Parent,Ref}=PR, Process) ->
+    File = join(P, File0),
+    Res = try prim_file:read_file(File) of
+	      {ok,Bin} ->
+		  gm_process(Mod, File, Bin, Process);
+	      {error,enoent} ->
+		  efile_gm_get_1(Ps, File0, Mod, PR, Process);
+	      Error ->
+		  check_file_result(get_modules, File, Error),
+		  Error
+	  catch
+	      _:Reason ->
+		  {error,{crash,Reason}}
+	  end,
+    Parent ! {Ref,Mod,Res};
+efile_gm_get_1([], _, Mod, {Parent,Ref}, _Process) ->
+    Parent ! {Ref,Mod,{error,enoent}}.
+
+gm_get_mods(St, Get, Ms, Process, Paths) ->
+    gm_get_mods(St, Get, Ms, Process, Paths, [], []).
+
+gm_get_mods(St, Get, [M|Ms], Process, Paths, Succ, Fail) ->
+    File = atom_to_list(M) ++ init:objfile_extension(),
+    case gm_arch_get(St, Get, M, File, Paths, Process) of
+	{ok,Res} ->
+	    gm_get_mods(St, Get, Ms, Process, Paths,
+			[{M,Res}|Succ], Fail);
+	{error,Res} ->
+	    gm_get_mods(St, Get, Ms, Process, Paths,
+			Succ, [{M,Res}|Fail])
+    end;
+gm_get_mods(_St, _Get, [], _, _, Succ, Fail) ->
+    {ok,{Succ,Fail}}.
+
+gm_arch_get(St, Get, Mod, File, Paths, Process) ->
+    case Get(St, File, Paths) of
+	{{error,_}=E,_} ->
+	    E;
+	{{ok,Bin,Full},_} ->
+	    gm_process(Mod, Full, Bin, Process)
+    end.
+
+gm_process(Mod, File, Bin, Process) ->
+    try Process(Mod, File, Bin) of
+	{ok,_}=Res -> Res;
+	{error,_}=Res -> Res;
+	Other -> {error,{bad_return,Other}}
+    catch
+	_:Error ->
+	    {error,{crash,Error}}
+    end.
+
+
 %%% --------------------------------------------------------
 %%% Functions which handle inet prim_loader
 %%% --------------------------------------------------------
@@ -694,7 +745,7 @@ inet_get_file_from_port1(_File, [], State) ->
 inet_send_and_rcv(Msg, Tag, State) when State#state.data =:= noport ->
     {ok,Tcp} = find_master(State#state.hosts),     %% reconnect
     inet_send_and_rcv(Msg, Tag, State#state{data = Tcp,
-					    timeout = ?IDLE_TIMEOUT});
+					    timeout = ?INET_IDLE_TIMEOUT});
 inet_send_and_rcv(Msg, Tag, #state{data = Tcp, timeout = Timeout} = State) ->
     prim_inet:send(Tcp, term_to_binary(Msg)),
     receive
@@ -819,32 +870,19 @@ prim_init() ->
         end,
     cache_new(#prim_state{debug = Deb}).
 
-prim_release_archives(PS) ->
-    debug(PS, release_archives),
-    {Res, PS2} = prim_do_release_archives(PS, get(), []),
-    debug(PS2, {return, Res}),
-    {Res, PS2}.
-
-prim_do_release_archives(PS, [{ArchiveFile, DictVal} | KeyVals], Acc) ->
-    Res = 
-	case DictVal of
-	    {primary, _PrimZip, _FI, _ParserFun} ->
-		ok; % Keep primary archive
-	    {Cache, _FI} ->
-		debug(PS, {release, cache, ArchiveFile}),
-		erase(ArchiveFile),
-		clear_cache(ArchiveFile, Cache)
-	end,
-    case Res of
-	ok ->
-	    prim_do_release_archives(PS, KeyVals, Acc);
-	{error, Reason} ->
-	    prim_do_release_archives(PS, KeyVals, [{ArchiveFile, Reason} | Acc])
-    end;
-prim_do_release_archives(PS, [], []) ->
-    {ok, PS#prim_state{primary_archive = undefined}};
-prim_do_release_archives(PS, [], Errors) ->
-    {{error, Errors}, PS#prim_state{primary_archive = undefined}}.
+prim_purge_cache() ->
+    do_prim_purge_cache(get()).
+
+do_prim_purge_cache([{Key,Val}|T]) ->
+    case Val of
+	{Cache,_FI} ->
+	    catch clear_cache(Key, Cache);
+	_ ->
+	    ok
+    end,
+    do_prim_purge_cache(T);
+do_prim_purge_cache([]) ->
+    ok.
 
 prim_set_primary_archive(PS, undefined, undefined, undefined, _ParserFun) ->
     debug(PS, {set_primary_archive, clean}),
@@ -1287,70 +1325,62 @@ path_join([Path],Acc) ->
 path_join([Path|Paths],Acc) ->
     path_join(Paths,"/" ++ reverse(Path) ++ Acc).
 
-name_split(ArchiveFile, File0) ->
-    File = absname(File0),
-    do_name_split(ArchiveFile, File).
-    
-do_name_split(undefined, File) ->
+name_split(undefined, File) ->
     %% Ignore primary archive
-    case string_split(File, init:archive_extension(), []) of
+    RevExt = reverse(init:archive_extension()),
+    case archive_split(File, RevExt, []) of
         no_split ->
-            %% Plain file
             {file, File};
-        {split, _RevArchiveBase, RevArchiveFile, []} ->
-            %% Top dir in archive
-            ArchiveFile = reverse(RevArchiveFile),
-            {archive, ArchiveFile, []};
-        {split, _RevArchiveBase, RevArchiveFile, [$/ | FileInArchive]} ->
-            %% File in archive
-            ArchiveFile = reverse(RevArchiveFile),
-            {archive, ArchiveFile, FileInArchive};
-        {split, _RevArchiveBase, _RevArchiveFile, _FileInArchive} ->
-	    %% False match. Assume plain file
-            {file, File}
+	Archive ->
+	    Archive
     end;
-do_name_split(ArchiveFile, File) ->
+name_split(ArchiveFile, File0) ->
     %% Look first in primary archive
-    case string_match(real_path(File), ArchiveFile, []) of
+    File = absname(File0),
+    case string_match(real_path(File), ArchiveFile) of
         no_match ->
             %% Archive or plain file
-            do_name_split(undefined, File);
-        {match, _RevPrimArchiveFile, FileInArchive} ->
+            name_split(undefined, File);
+        {match, FileInArchive} ->
             %% Primary archive
 	    {archive, ArchiveFile, FileInArchive}
     end.
 
-string_match([Char | File], [Char | Archive], RevTop) ->
-    string_match(File, Archive, [Char | RevTop]);
-string_match([] = File, [], RevTop) ->
-    {match, RevTop, File};
-string_match([$/ | File], [], RevTop) ->
-    {match, RevTop, File};
-string_match(_File, _Archive, _RevTop) ->
+string_match([Char | File], [Char | Archive]) ->
+    string_match(File, Archive);
+string_match([] = File, []) ->
+    {match, File};
+string_match([$/ | File], []) ->
+    {match, File};
+string_match(_File, _Archive) ->
     no_match.
 
-string_split([Char | File], [Char | Ext] = FullExt, RevTop) ->
-    RevTop2 = [Char | RevTop],
-    string_split2(File, Ext, RevTop, RevTop2, File, FullExt, RevTop2);
-string_split([Char | File], Ext, RevTop) ->
-    string_split(File, Ext, [Char | RevTop]);
-string_split([], _Ext, _RevTop) ->
-    no_split.
-
-string_split2([Char | File], [Char | Ext], RevBase, RevTop, SaveFile, SaveExt, SaveTop) ->
-    string_split2(File, Ext, RevBase, [Char | RevTop], SaveFile, SaveExt, SaveTop);
-string_split2(File, [], RevBase, RevTop, _SaveFile, _SaveExt, _SaveTop) ->
-    {split, RevBase, RevTop, File};
-string_split2(_, _Ext, _RevBase, _RevTop, SaveFile, SaveExt, SaveTop) ->
-    string_split(SaveFile, SaveExt, SaveTop).
+archive_split("/"++File, RevExt, Acc) ->
+    case is_prefix(RevExt, Acc) of
+	false ->
+	    archive_split(File, RevExt, [$/|Acc]);
+	true ->
+	    ArchiveFile = absname(reverse(Acc)),
+	    {archive, ArchiveFile, File}
+    end;
+archive_split([H|T], RevExt, Acc) ->
+    archive_split(T, RevExt, [H|Acc]);
+archive_split([], RevExt, Acc) ->
+    case is_prefix(RevExt, Acc) of
+	false ->
+	    no_split;
+	true ->
+	    ArchiveFile = absname(reverse(Acc)),
+	    {archive, ArchiveFile, []}
+    end.
+
+is_prefix([H|T1], [H|T2]) -> is_prefix(T1, T2);
+is_prefix([_|_], _) -> false;
+is_prefix([], _ ) -> true.
 
 %% Parse list of ipv4 addresses 
 ipv4_list([H | T]) ->
-    IPV = if is_atom(H) -> ipv4_address(atom_to_list(H));
-             is_list(H) -> ipv4_address(H);
-             true -> {error,einal}
-          end,
-    case IPV of
+    case ipv4_address(H) of
         {ok,IP} -> [IP | ipv4_list(T)];
         _ -> ipv4_list(T)
     end;
@@ -1415,8 +1445,6 @@ absname_vr([Drive, $\: | NameRest], _) ->
 %% Assumes normalized name
 pathtype(Name) when is_list(Name) -> 
     case erlang:system_info(os_type) of
-	{ose, _}  ->
-	    unix_pathtype(Name);
 	{unix, _}  -> 
 	    unix_pathtype(Name);
 	{win32, _} ->
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 5fc6d14938..50b01703ac 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -71,7 +71,8 @@
       | 'milli_seconds'
       | 'micro_seconds'
       | 'nano_seconds'
-      | 'native'.
+      | 'native'
+      | 'perf_counter'.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Native code BIF stubs and their types
@@ -104,7 +105,9 @@
 -export([garbage_collect/0, garbage_collect/1, garbage_collect/2]).
 -export([garbage_collect_message_area/0, get/0, get/1, get_keys/0, get_keys/1]).
 -export([get_module_info/1, get_stacktrace/0, group_leader/0]).
--export([group_leader/2, halt/0, halt/1, halt/2, hash/2, hibernate/3]).
+-export([group_leader/2]).
+-export([halt/0, halt/1, halt/2, hash/2,
+	 has_prepared_code_on_load/1, hibernate/3]).
 -export([insert_element/3]).
 -export([integer_to_binary/1, integer_to_list/1]).
 -export([iolist_size/1, iolist_to_binary/1]).
@@ -185,6 +188,8 @@
       'receive' |
       'print' |
       'timestamp' |
+      'monotonic_timestamp' |
+      'strict_monotonic_timestamp' |
       'label' |
       'serial'.
 
@@ -198,7 +203,10 @@
       'exclusive' |
       'runnable_ports' |
       'runnable_procs' |
-      'scheduler'.
+      'scheduler' |
+      'timestamp' |
+      'monotonic_timestamp' |
+      'strict_monotonic_timestamp'.
 
 -type system_monitor_option() ::
       'busy_port' |
@@ -230,6 +238,8 @@
       garbage_collection |
       timestamp |
       cpu_timestamp |
+      monotonic_timestamp |
+      strict_monotonic_timestamp |
       arity |
       set_on_spawn |
       set_on_first_spawn |
@@ -258,6 +268,8 @@
       running |
       garbage_collection |
       timestamp |
+      monotonic_timestamp |
+      strict_monotonic_timestamp |
       arity.
 
 -type trace_info_return() ::
@@ -460,7 +472,7 @@ check_old_code(_Module) ->
       CheckResult :: boolean().
 check_process_code(Pid, Module) ->
     try
-	erlang:check_process_code(Pid, Module, [{allow_gc, true}])
+	erts_internal:check_process_code(Pid, Module, [{allow_gc, true}])
     catch
 	error:Error -> erlang:error(Error, [Pid, Module])
     end.
@@ -475,51 +487,11 @@ check_process_code(Pid, Module) ->
       CheckResult :: boolean() | aborted.
 check_process_code(Pid, Module, OptionList)  ->
     try
-	{Async, AllowGC} = get_cpc_opts(OptionList, sync, true),
-	case Async of
-	    {async, ReqId} ->
-		{priority, Prio} = erlang:process_info(erlang:self(),
-						       priority),
-		erts_internal:request_system_task(Pid,
-						  Prio,
-						  {check_process_code,
-						   ReqId,
-						   Module,
-						   AllowGC}),
-		async;
-	    sync ->
-		case Pid == erlang:self() of
-		    true ->
-			erts_internal:check_process_code(Module,
-							 [{allow_gc, AllowGC}]);
-		    false ->
-			{priority, Prio} = erlang:process_info(erlang:self(),
-							       priority),
-			ReqId = erlang:make_ref(),
-			erts_internal:request_system_task(Pid,
-							  Prio,
-							  {check_process_code,
-							   ReqId,
-							   Module,
-							   AllowGC}),
-			receive
-			    {check_process_code, ReqId, CheckResult} ->
-				CheckResult
-			end
-		end
-	end
+	erts_internal:check_process_code(Pid, Module, OptionList)
     catch
 	error:Error -> erlang:error(Error, [Pid, Module, OptionList])
     end.
 
-% gets async and allow_gc opts and verify valid option list
-get_cpc_opts([{async, _ReqId} = AsyncTuple | Options], _OldAsync, AllowGC) ->
-    get_cpc_opts(Options, AsyncTuple, AllowGC);
-get_cpc_opts([{allow_gc, AllowGC} | Options], Async, _OldAllowGC) ->
-    get_cpc_opts(Options, Async, AllowGC);
-get_cpc_opts([], Async, AllowGC) ->
-    {Async, AllowGC}.
-
 %% crc32/1
 -spec erlang:crc32(Data) -> non_neg_integer() when
       Data :: iodata().
@@ -1027,6 +999,12 @@ halt(_Status, _Options) ->
 hash(_Term, _Range) ->
     erlang:nif_error(undefined).
 
+%% has_prepared_code_on_load/1
+-spec erlang:has_prepared_code_on_load(PreparedCode) -> boolean() when
+      PreparedCode :: binary().
+has_prepared_code_on_load(_PreparedCode) ->
+    erlang:nif_error(undefined).
+
 %% hibernate/3
 -spec erlang:hibernate(Module, Function, Args) -> no_return() when
       Module :: module(),
@@ -1378,6 +1356,7 @@ convert_time_unit(Time, FromUnit, ToUnit) ->
     try
 	FU = case FromUnit of
 		 native -> erts_internal:time_unit();
+                 perf_counter -> erts_internal:perf_counter_unit();
 		 nano_seconds -> 1000*1000*1000;
 		 micro_seconds -> 1000*1000;
 		 milli_seconds -> 1000;
@@ -1386,6 +1365,7 @@ convert_time_unit(Time, FromUnit, ToUnit) ->
 	     end,
 	TU = case ToUnit of
 		 native -> erts_internal:time_unit();
+                 perf_counter -> erts_internal:perf_counter_unit();
 		 nano_seconds -> 1000*1000*1000;
 		 micro_seconds -> 1000*1000;
 		 milli_seconds -> 1000;
@@ -1464,8 +1444,16 @@ processes() ->
 %% purge_module/1
 -spec purge_module(Module) -> true when
       Module :: atom().
-purge_module(_Module) ->
-    erlang:nif_error(undefined).
+purge_module(Module) when erlang:is_atom(Module) ->
+    case erts_code_purger:purge(Module) of
+	{false, _} ->
+	    erlang:error(badarg, [Module]);
+	{true, _} ->
+	    true
+    end;
+purge_module(Arg) ->
+    erlang:error(badarg, [Arg]).
+
 
 %% put/2
 -spec put(Key, Val) -> term() when
@@ -2027,12 +2015,21 @@ nodes(_Arg) ->
            | eof
 	   | {parallelism, Boolean :: boolean()}
 	   | hide.
-open_port(_PortName,_PortSettings) ->
-    erlang:nif_error(undefined).
+open_port(PortName, PortSettings) ->
+    case case erts_internal:open_port(PortName, PortSettings) of
+	     Ref when erlang:is_reference(Ref) -> receive {Ref, Res} -> Res end;
+	     Res -> Res
+	 end of
+	Port when erlang:is_port(Port) -> Port;
+	Error -> erlang:error(Error, [PortName, PortSettings])
+    end.
 
 -type priority_level() ::
       low | normal | high | max.
 
+-type message_queue_data() ::
+	off_heap | on_heap | mixed.
+
 -spec process_flag(trap_exit, Boolean) -> OldBoolean when
       Boolean :: boolean(),
       OldBoolean :: boolean();
@@ -2045,6 +2042,9 @@ open_port(_PortName,_PortSettings) ->
                   (min_bin_vheap_size, MinBinVHeapSize) -> OldMinBinVHeapSize when
       MinBinVHeapSize :: non_neg_integer(),
       OldMinBinVHeapSize :: non_neg_integer();
+                  (message_queue_data, MQD) -> OldMQD when
+      MQD :: message_queue_data(),
+      OldMQD :: message_queue_data();
                   (priority, Level) -> OldLevel when
       Level :: priority_level(),
       OldLevel :: priority_level();
@@ -2071,6 +2071,7 @@ process_flag(_Flag, _Value) ->
       dictionary |
       error_handler |
       garbage_collection |
+      garbage_collection_info |
       group_leader |
       heap_size |
       initial_call |
@@ -2083,6 +2084,7 @@ process_flag(_Flag, _Value) ->
       min_bin_vheap_size |
       monitored_by |
       monitors |
+      message_queue_data |
       priority |
       reductions |
       registered_name |
@@ -2110,6 +2112,7 @@ process_flag(_Flag, _Value) ->
       {dictionary, Dictionary :: [{Key :: term(), Value :: term()}]} |
       {error_handler, Module :: module()} |
       {garbage_collection, GCInfo :: [{atom(),non_neg_integer()}]} |
+      {garbage_collection_info, GCInfo :: [{atom(),non_neg_integer()}]} |
       {group_leader, GroupLeader :: pid()} |
       {heap_size, Size :: non_neg_integer()} |
       {initial_call, mfa()} |
@@ -2124,9 +2127,10 @@ process_flag(_Flag, _Value) ->
       {monitors,
        Monitors :: [{process, Pid :: pid() |
                                      {RegName :: atom(), Node :: node()}}]} |
+      {message_queue_data, MQD :: message_queue_data()} |
       {priority, Level :: priority_level()} |
       {reductions, Number :: non_neg_integer()} |
-      {registered_name, Atom :: atom()} |
+      {registered_name, [] | (Atom :: atom())} |
       {sequential_trace_token, [] | (SequentialTraceToken :: term())} |
       {stack_size, Size :: non_neg_integer()} |
       {status, Status :: exiting | garbage_collecting | waiting | running | runnable | suspended} |
@@ -2178,6 +2182,8 @@ send(_Dest,_Msg,_Options) ->
                     ('receive') -> {'receive', boolean()};
                     (print) -> {print, boolean()};
                     (timestamp) -> {timestamp, boolean()};
+                    (monotonic_timestamp) -> {timestamp, boolean()};
+                    (strict_monotonic_timestamp) -> {strict_monotonic_timestamp, boolean()};
                     (label) -> [] | {label, non_neg_integer()};
                     (serial) -> [] | {serial, {non_neg_integer(), non_neg_integer()}}.
 seq_trace_info(_What) ->
@@ -2219,6 +2225,16 @@ spawn_opt(_Tuple) ->
                 (io) -> {{input, Input}, {output, Output}} when
       Input :: non_neg_integer(),
       Output :: non_neg_integer();
+                (microstate_accounting) -> [MSAcc_Thread] | undefined when
+      MSAcc_Thread :: #{ type => MSAcc_Thread_Type,
+                        id => MSAcc_Thread_Id,
+                        counters => MSAcc_Counters},
+      MSAcc_Thread_Type :: scheduler | async | aux,
+      MSAcc_Thread_Id :: non_neg_integer(),
+      MSAcc_Counters :: #{ MSAcc_Thread_State => non_neg_integer() },
+      MSAcc_Thread_State :: alloc | aux | bif | busy_wait | check_io |
+                            emulator | ets | gc | gc_fullsweep | nif |
+                            other | port | send | sleep | timers;
                 (reductions) -> {Total_Reductions,
                                  Reductions_Since_Last_Call} when
       Total_Reductions :: non_neg_integer(),
@@ -2273,6 +2289,9 @@ subtract(_,_) ->
                         (fullsweep_after, Number) -> OldNumber when
       Number :: non_neg_integer(),
       OldNumber :: non_neg_integer();
+                        (microstate_accounting, Action) -> OldState when
+      Action :: true | false | reset,
+      OldState :: true | false;
                         (min_heap_size, MinHeapSize) -> OldMinHeapSize when
       MinHeapSize :: non_neg_integer(),
       OldMinHeapSize :: non_neg_integer();
@@ -2281,8 +2300,8 @@ subtract(_,_) ->
       MinBinVHeapSize :: non_neg_integer(),
       OldMinBinVHeapSize :: non_neg_integer();
                         (multi_scheduling, BlockState) -> OldBlockState when
-      BlockState :: block | unblock,
-      OldBlockState :: block | unblock | enabled;
+      BlockState :: block | unblock | block_normal | unblock_normal,
+      OldBlockState :: blocked | disabled | enabled;
                         (scheduler_bind_type, How) -> OldBindType when
       How :: scheduler_bind_type() | default_bind,
       OldBindType :: scheduler_bind_type();
@@ -2427,13 +2446,15 @@ tuple_to_list(_Tuple) ->
           logical_processors_available |
           logical_processors_online) -> unknown | pos_integer();
          (machine) -> string();
+         (message_queue_data) -> message_queue_data();
          (min_heap_size) -> {min_heap_size, MinHeapSize :: pos_integer()};
          (min_bin_vheap_size) -> {min_bin_vheap_size,
                                   MinBinVHeapSize :: pos_integer()};
          (modified_timing_level) -> integer() | undefined;
-         (multi_scheduling) -> disabled | blocked | enabled;
+         (multi_scheduling) -> disabled | blocked | blocked_normal | enabled;
          (multi_scheduling_blockers) -> [Pid :: pid()];
          (nif_version) -> string();
+         (normal_multi_scheduling_blockers) -> [Pid :: pid()];
          (otp_release) -> string();
          (os_monotonic_time_source) -> [{atom(),term()}];
          (os_system_time_source) -> [{atom(),term()}];
@@ -2561,14 +2582,19 @@ spawn_monitor(M, F, A) when erlang:is_atom(M),
 spawn_monitor(M, F, A) ->
     erlang:error(badarg, [M,F,A]).
 
+
+-type spawn_opt_option() ::
+	link
+      | monitor
+      | {priority, Level :: priority_level()}
+      | {fullsweep_after, Number :: non_neg_integer()}
+      | {min_heap_size, Size :: non_neg_integer()}
+      | {min_bin_vheap_size, VSize :: non_neg_integer()}
+      | {message_queue_data, MQD :: message_queue_data()}.
+
 -spec spawn_opt(Fun, Options) -> pid() | {pid(), reference()} when
       Fun :: function(),
-      Options :: [Option],
-      Option :: link | monitor
-              | {priority, Level :: priority_level()}
-              | {fullsweep_after, Number :: non_neg_integer()}
-              | {min_heap_size, Size :: non_neg_integer()}
-              | {min_bin_vheap_size, VSize :: non_neg_integer()}.
+      Options :: [spawn_opt_option()].
 spawn_opt(F, O) when erlang:is_function(F) ->
     spawn_opt(erlang, apply, [F, []], O);
 spawn_opt({M,F}=MF, O) when erlang:is_atom(M), erlang:is_atom(F) ->
@@ -2581,12 +2607,7 @@ spawn_opt(F, O) ->
 -spec spawn_opt(Node, Fun, Options) -> pid() | {pid(), reference()} when
       Node :: node(),
       Fun :: function(),
-      Options :: [Option],
-      Option :: link | monitor
-              | {priority, Level :: priority_level()}
-              | {fullsweep_after, Number :: non_neg_integer()}
-              | {min_heap_size, Size :: non_neg_integer()}
-              | {min_bin_vheap_size, VSize :: non_neg_integer()}.
+      Options :: [spawn_opt_option()].
 spawn_opt(N, F, O) when N =:= erlang:node() ->
     spawn_opt(F, O);
 spawn_opt(N, F, O) when erlang:is_function(F) ->
@@ -2673,12 +2694,7 @@ spawn_link(N,M,F,A) ->
       Module :: module(),
       Function :: atom(),
       Args :: [term()],
-      Options :: [Option],
-      Option :: link | monitor
-              | {priority, Level :: priority_level()}
-              | {fullsweep_after, Number :: non_neg_integer()}
-              | {min_heap_size, Size :: non_neg_integer()}
-              | {min_bin_vheap_size, VSize :: non_neg_integer()}.
+      Options :: [spawn_opt_option()].
 spawn_opt(M, F, A, Opts) ->
     case catch erlang:spawn_opt({M,F,A,Opts}) of
 	{'EXIT',{Reason,_}} ->
@@ -2693,12 +2709,7 @@ spawn_opt(M, F, A, Opts) ->
       Module :: module(),
       Function :: atom(),
       Args :: [term()],
-      Options :: [Option],
-      Option :: link | monitor
-              | {priority, Level :: priority_level()}
-              | {fullsweep_after, Number :: non_neg_integer()}
-              | {min_heap_size, Size :: non_neg_integer()}
-              | {min_bin_vheap_size, VSize :: non_neg_integer()}.
+      Options :: [spawn_opt_option()].
 spawn_opt(N, M, F, A, O) when N =:= erlang:node(),
 			      erlang:is_atom(M), erlang:is_atom(F),
                               erlang:is_list(A), erlang:is_list(O) ->
diff --git a/erts/preloaded/src/erts.app.src b/erts/preloaded/src/erts.app.src
index 8442aaf7e8..e53b6e5bab 100644
--- a/erts/preloaded/src/erts.app.src
+++ b/erts/preloaded/src/erts.app.src
@@ -27,6 +27,7 @@
 		erts_internal,
 		init,
 		otp_ring0,
+		erts_code_purger,
 		prim_eval,
 		prim_file,
 		prim_inet,
diff --git a/erts/preloaded/src/erts_code_purger.erl b/erts/preloaded/src/erts_code_purger.erl
new file mode 100644
index 0000000000..d1e64342e0
--- /dev/null
+++ b/erts/preloaded/src/erts_code_purger.erl
@@ -0,0 +1,299 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 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%
+%%
+-module(erts_code_purger).
+
+%% Purpose : Implement system process erts_code_purger
+%%           to handle code module purging.
+
+-export([start/0, purge/1, soft_purge/1]).
+
+-spec start() -> term().
+start() ->
+    register(erts_code_purger, self()),
+    process_flag(trap_exit, true),
+    loop().
+
+loop() ->
+    _ = receive
+	{purge,Mod,From,Ref} when is_atom(Mod), is_pid(From) ->
+	    Res = do_purge(Mod),
+	    From ! {reply, purge, Res, Ref};
+
+	{soft_purge,Mod,From,Ref} when is_atom(Mod), is_pid(From) ->
+	    Res = do_soft_purge(Mod),
+	    From ! {reply, soft_purge, Res, Ref};
+
+	_Other -> ignore
+    end,
+    loop().
+
+
+%% purge(Module)
+%%  Kill all processes running code from *old* Module, and then purge the
+%%  module. Return {WasOld, DidKill}:
+%%  {false, false} there was no old module to purge
+%%  {true, false} module purged, no process killed
+%%  {true, true} module purged, at least one process killed
+
+purge(Mod) when is_atom(Mod) ->
+    Ref = make_ref(),
+    erts_code_purger ! {purge, Mod, self(), Ref},
+    receive
+	{reply, purge, Result, Ref} ->
+	    Result
+    end.
+
+
+do_purge(Mod) ->
+    case erts_internal:copy_literals(Mod, true) of
+        false ->
+            {false, false};
+        true ->
+            DidKill = check_proc_code(erlang:processes(), Mod, true),
+            true = erts_internal:copy_literals(Mod, false),
+	    WasPurged = erts_internal:purge_module(Mod),
+            {WasPurged, DidKill}
+    end.
+
+%% soft_purge(Module)
+%% Purge old code only if no procs remain that run old code.
+%% Return true in that case, false if procs remain (in this
+%% case old code is not purged)
+
+soft_purge(Mod) ->
+    Ref = make_ref(),
+    erts_code_purger ! {soft_purge, Mod, self(), Ref},
+    receive
+	{reply, soft_purge, Result, Ref} ->
+	    Result
+    end.
+
+
+do_soft_purge(Mod) ->
+    case erts_internal:copy_literals(Mod, true) of
+	false ->
+	    true;
+	true ->
+	    DoPurge = check_proc_code(erlang:processes(), Mod, false),
+	    true = erts_internal:copy_literals(Mod, false),
+	    case DoPurge of
+		false ->
+		    false;
+		true ->
+		    erts_internal:purge_module(Mod),
+		    true
+	    end
+    end.
+
+%%
+%% check_proc_code(Pids, Mod, Hard) - Send asynchronous
+%%   requests to all processes to perform a check_process_code
+%%   operation. Each process will check their own state and
+%%   reply with the result. If 'Hard' equals
+%%   - true, processes that refer 'Mod' will be killed. If
+%%     any processes were killed true is returned; otherwise,
+%%     false.
+%%   - false, and any processes refer 'Mod', false will
+%%     returned; otherwise, true.
+%%
+%%   Requests will be sent to all processes identified by
+%%   Pids at once, but without allowing GC to be performed.
+%%   Check process code operations that are aborted due to
+%%   GC need, will be restarted allowing GC. However, only
+%%   ?MAX_CPC_GC_PROCS outstanding operation allowing GC at
+%%   a time will be allowed. This in order not to blow up
+%%   memory wise.
+%%
+%%   We also only allow ?MAX_CPC_NO_OUTSTANDING_KILLS
+%%   outstanding kills. This both in order to avoid flooding
+%%   our message queue with 'DOWN' messages and limiting the
+%%   amount of memory used to keep references to all
+%%   outstanding kills.
+%%
+
+%% We maybe should allow more than two outstanding
+%% GC requests, but for now we play it safe...
+-define(MAX_CPC_GC_PROCS, 2).
+-define(MAX_CPC_NO_OUTSTANDING_KILLS, 10).
+
+-record(cpc_static, {hard, module, tag}).
+
+-record(cpc_kill, {outstanding = [],
+		   no_outstanding = 0,
+		   waiting = [],
+		   killed = false}).
+
+check_proc_code(Pids, Mod, Hard) ->
+    Tag = erlang:make_ref(),
+    CpcS = #cpc_static{hard = Hard,
+		       module = Mod,
+		       tag = Tag},
+    check_proc_code(CpcS, cpc_init(CpcS, Pids, 0), 0, [], #cpc_kill{}, true).
+
+check_proc_code(#cpc_static{hard = true}, 0, 0, [],
+		#cpc_kill{outstanding = [], waiting = [], killed = Killed},
+		true) ->
+    %% No outstanding requests. We did a hard check, so result is whether or
+    %% not we killed any processes...
+    Killed;
+check_proc_code(#cpc_static{hard = false}, 0, 0, [], _KillState, Success) ->
+    %% No outstanding requests and we did a soft check...
+    Success;
+check_proc_code(#cpc_static{hard = false, tag = Tag} = CpcS, NoReq0, NoGcReq0,
+		[], _KillState, false) ->
+    %% Failed soft check; just cleanup the remaining replies corresponding
+    %% to the requests we've sent...
+    {NoReq1, NoGcReq1} = receive
+			     {check_process_code, {Tag, _P, GC}, _Res} ->
+				 case GC of
+				     false -> {NoReq0-1, NoGcReq0};
+				     true -> {NoReq0, NoGcReq0-1}
+				 end
+			 end,
+    check_proc_code(CpcS, NoReq1, NoGcReq1, [], _KillState, false);
+check_proc_code(#cpc_static{tag = Tag} = CpcS, NoReq0, NoGcReq0, NeedGC0,
+		KillState0, Success) ->
+
+    %% Check if we should request a GC operation
+    {NoGcReq1, NeedGC1} = case NoGcReq0 < ?MAX_CPC_GC_PROCS of
+			      GcOpAllowed when GcOpAllowed == false;
+					       NeedGC0 == [] ->
+				  {NoGcReq0, NeedGC0};
+			      _ ->
+				  {NoGcReq0+1, cpc_request_gc(CpcS,NeedGC0)}
+			  end,
+
+    %% Wait for a cpc reply or 'DOWN' message
+    {NoReq1, NoGcReq2, Pid, Result, KillState1} = cpc_recv(Tag,
+							   NoReq0,
+							   NoGcReq1,
+							   KillState0),
+
+    %% Check the result of the reply
+    case Result of
+	aborted ->
+	    %% Operation aborted due to the need to GC in order to
+	    %% determine if the process is referring the module.
+	    %% Schedule the operation for restart allowing GC...
+	    check_proc_code(CpcS, NoReq1, NoGcReq2, [Pid|NeedGC1], KillState1,
+			    Success);
+	false ->
+	    %% Process not referring the module; done with this process...
+	    check_proc_code(CpcS, NoReq1, NoGcReq2, NeedGC1, KillState1,
+			    Success);
+	true ->
+	    %% Process referring the module...
+	    case CpcS#cpc_static.hard of
+		false ->
+		    %% ... and soft check. The whole operation failed so
+		    %% no point continuing; clean up and fail...
+		    check_proc_code(CpcS, NoReq1, NoGcReq2, [], KillState1,
+				    false);
+		true ->
+		    %% ... and hard check; schedule kill of it...
+		    check_proc_code(CpcS, NoReq1, NoGcReq2, NeedGC1,
+				    cpc_sched_kill(Pid, KillState1), Success)
+	    end;
+	'DOWN' ->
+	    %% Handled 'DOWN' message
+	    check_proc_code(CpcS, NoReq1, NoGcReq2, NeedGC1,
+			    KillState1, Success)
+    end.
+
+cpc_recv(Tag, NoReq, NoGcReq, #cpc_kill{outstanding = []} = KillState) ->
+    receive
+	{check_process_code, {Tag, Pid, GC}, Res} ->
+	    cpc_handle_cpc(NoReq, NoGcReq, GC, Pid, Res, KillState)
+    end;
+cpc_recv(Tag, NoReq, NoGcReq,
+	 #cpc_kill{outstanding = [R0, R1, R2, R3, R4 | _]} = KillState) ->
+    receive
+	{'DOWN', R, process, _, _} when R == R0;
+					R == R1;
+					R == R2;
+					R == R3;
+					R == R4 ->
+	    cpc_handle_down(NoReq, NoGcReq, R, KillState);
+	{check_process_code, {Tag, Pid, GC}, Res} ->
+	    cpc_handle_cpc(NoReq, NoGcReq, GC, Pid, Res, KillState)
+    end;
+cpc_recv(Tag, NoReq, NoGcReq, #cpc_kill{outstanding = [R|_]} = KillState) ->
+    receive
+	{'DOWN', R, process, _, _} ->
+	    cpc_handle_down(NoReq, NoGcReq, R, KillState);
+	{check_process_code, {Tag, Pid, GC}, Res} ->
+	    cpc_handle_cpc(NoReq, NoGcReq, GC, Pid, Res, KillState)
+    end.
+
+cpc_handle_down(NoReq, NoGcReq, R, #cpc_kill{outstanding = Rs,
+					     no_outstanding = N} = KillState) ->
+    {NoReq, NoGcReq, undefined, 'DOWN',
+     cpc_sched_kill_waiting(KillState#cpc_kill{outstanding = cpc_list_rm(R, Rs),
+					       no_outstanding = N-1})}.
+
+cpc_list_rm(R, [R|Rs]) ->
+    Rs;
+cpc_list_rm(R0, [R1|Rs]) ->
+    [R1|cpc_list_rm(R0, Rs)].
+
+cpc_handle_cpc(NoReq, NoGcReq, false, Pid, Res, KillState) ->
+    {NoReq-1, NoGcReq, Pid, Res, KillState};
+cpc_handle_cpc(NoReq, NoGcReq, true, Pid, Res, KillState) ->
+    {NoReq, NoGcReq-1, Pid, Res, KillState}.
+
+cpc_sched_kill_waiting(#cpc_kill{waiting = []} = KillState) ->
+    KillState;
+cpc_sched_kill_waiting(#cpc_kill{outstanding = Rs,
+				 no_outstanding = N,
+				 waiting = [P|Ps]} = KillState) ->
+    R = erlang:monitor(process, P),
+    exit(P, kill),
+    KillState#cpc_kill{outstanding = [R|Rs],
+		       no_outstanding = N+1,
+		       waiting = Ps,
+		       killed = true}.
+
+cpc_sched_kill(Pid, #cpc_kill{no_outstanding = N, waiting = Pids} = KillState)
+  when N >= ?MAX_CPC_NO_OUTSTANDING_KILLS ->
+    KillState#cpc_kill{waiting = [Pid|Pids]};
+cpc_sched_kill(Pid,
+	       #cpc_kill{outstanding = Rs, no_outstanding = N} = KillState) ->
+    R = erlang:monitor(process, Pid),
+    exit(Pid, kill),
+    KillState#cpc_kill{outstanding = [R|Rs],
+		       no_outstanding = N+1,
+		       killed = true}.
+
+cpc_request(#cpc_static{tag = Tag, module = Mod}, Pid, AllowGc) ->
+    erts_internal:check_process_code(Pid, Mod, [{async, {Tag, Pid, AllowGc}},
+						{allow_gc, AllowGc},
+						{copy_literals, true}]).
+
+cpc_request_gc(CpcS, [Pid|Pids]) ->
+    cpc_request(CpcS, Pid, true),
+    Pids.
+
+cpc_init(_CpcS, [], NoReqs) ->
+    NoReqs;
+cpc_init(CpcS, [Pid|Pids], NoReqs) ->
+    cpc_request(CpcS, Pid, false),
+    cpc_init(CpcS, Pids, NoReqs+1).
+
+% end of check_proc_code() implementation.
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index 7ed4efea4b..330fcc4a9c 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -31,22 +31,33 @@
 
 -export([await_port_send_result/3]).
 -export([cmp_term/2]).
--export([map_to_tuple_keys/1, map_type/1, map_hashmap_children/1]).
--export([port_command/3, port_connect/2, port_close/1,
+-export([map_to_tuple_keys/1, term_type/1, map_hashmap_children/1]).
+-export([open_port/2, port_command/3, port_connect/2, port_close/1,
 	 port_control/3, port_call/3, port_info/1, port_info/2]).
 
+-export([system_check/1,
+         gather_system_check_result/1]).
+
 -export([request_system_task/3]).
 
--export([check_process_code/2]).
+-export([check_process_code/3]).
+-export([copy_literals/2]).
+-export([purge_module/1]).
 
 -export([flush_monitor_messages/3]).
 
 -export([await_result/1, gather_io_bytes/2]).
 
--export([time_unit/0]).
+-export([time_unit/0, perf_counter_unit/0]).
 
 -export([is_system_process/1]).
 
+-export([await_microstate_accounting_modifications/3,
+	 gather_microstate_accounting_result/2]).
+
+%% Auto-import name clash
+-export([check_process_code/2]).
+
 %%
 %% Await result of send to port
 %%
@@ -88,6 +99,13 @@ gather_io_bytes(Ref, No, InAcc, OutAcc) ->
 %% Statically linked port NIFs
 %%
 
+-spec erts_internal:open_port(PortName, PortSettings) -> Result when
+      PortName :: tuple(),
+      PortSettings :: term(),
+      Result :: port() | reference() | atom().
+open_port(_PortName, _PortSettings) ->
+    erlang:nif_error(undefined).
+
 -spec erts_internal:port_command(Port, Data, OptionList) -> Result when
       Port :: port() | atom(),
       Data :: iodata(),
@@ -184,19 +202,105 @@ port_info(_Result, _Item) ->
 -spec request_system_task(Pid, Prio, Request) -> 'ok' when
       Prio :: 'max' | 'high' | 'normal' | 'low',
       Request :: {'garbage_collect', term()}
-	       | {'check_process_code', term(), module(), boolean()},
+	       | {'check_process_code', term(), module(), non_neg_integer()},
       Pid :: pid().
 
 request_system_task(_Pid, _Prio, _Request) ->
     erlang:nif_error(undefined).
 
--spec check_process_code(Module, OptionList) -> boolean() when
+-define(ERTS_CPC_ALLOW_GC, (1 bsl 0)).
+-define(ERTS_CPC_COPY_LITERALS, (1 bsl 1)).
+
+-spec check_process_code(Module, Flags) -> boolean() when
       Module :: module(),
-      Option :: {allow_gc, boolean()},
-      OptionList :: [Option].
-check_process_code(_Module, _OptionList) ->
+      Flags :: non_neg_integer().
+check_process_code(_Module, _Flags) ->
     erlang:nif_error(undefined).
 
+-spec check_process_code(Pid, Module, OptionList) -> CheckResult | async when
+      Pid :: pid(),
+      Module :: module(),
+      RequestId :: term(),
+      Option :: {async, RequestId} | {allow_gc, boolean()} | {copy_literals, boolean()},
+      OptionList :: [Option],
+      CheckResult :: boolean() | aborted.
+check_process_code(Pid, Module, OptionList)  ->
+    {Async, Flags} = get_cpc_opts(OptionList, sync, ?ERTS_CPC_ALLOW_GC),
+    case Async of
+	{async, ReqId} ->
+	    {priority, Prio} = erlang:process_info(erlang:self(),
+						   priority),
+	    erts_internal:request_system_task(Pid,
+					      Prio,
+					      {check_process_code,
+					       ReqId,
+					       Module,
+					       Flags}),
+	    async;
+	sync ->
+	    case Pid == erlang:self() of
+		true ->
+		    erts_internal:check_process_code(Module, Flags);
+		false ->
+		    {priority, Prio} = erlang:process_info(erlang:self(),
+							   priority),
+		    ReqId = erlang:make_ref(),
+		    erts_internal:request_system_task(Pid,
+						      Prio,
+						      {check_process_code,
+						       ReqId,
+						       Module,
+						       Flags}),
+		    receive
+			{check_process_code, ReqId, CheckResult} ->
+			    CheckResult
+		    end
+	    end
+    end.
+
+% gets async and flag opts and verify valid option list
+get_cpc_opts([{async, _ReqId} = AsyncTuple | Options], _OldAsync, Flags) ->
+    get_cpc_opts(Options, AsyncTuple, Flags);
+get_cpc_opts([{allow_gc, AllowGC} | Options], Async, Flags) ->
+    get_cpc_opts(Options, Async, cpc_flags(Flags, ?ERTS_CPC_ALLOW_GC, AllowGC));
+get_cpc_opts([{copy_literals, CopyLit} | Options], Async, Flags) ->
+    get_cpc_opts(Options, Async, cpc_flags(Flags, ?ERTS_CPC_COPY_LITERALS, CopyLit));
+get_cpc_opts([], Async, Flags) ->
+    {Async, Flags}.
+
+cpc_flags(OldFlags, Bit, true) ->
+    OldFlags bor Bit;
+cpc_flags(OldFlags, Bit, false) ->
+    OldFlags band (bnot Bit).
+
+-spec copy_literals(Module,Bool) -> 'true' | 'false' | 'aborted' when
+      Module :: module(),
+      Bool :: boolean().
+copy_literals(_Mod, _Bool) ->
+    erlang:nif_error(undefined).
+
+-spec purge_module(Module) -> boolean() when
+      Module :: module().
+purge_module(_Module) ->
+    erlang:nif_error(undefined).
+
+-spec system_check(Type) -> 'ok' when
+      Type :: 'schedulers'.
+
+system_check(_Type) ->
+    erlang:nif_error(undefined).
+
+gather_system_check_result(Ref) when is_reference(Ref) ->
+    gather_system_check_result(Ref, erlang:system_info(schedulers)).
+
+gather_system_check_result(_Ref, 0) ->
+    ok;
+gather_system_check_result(Ref, N) ->
+    receive
+        Ref ->
+            gather_system_check_result(Ref, N - 1)
+    end.
+
 %% term compare where integer() < float() = true
 
 -spec cmp_term(A,B) -> Result when
@@ -215,12 +319,18 @@ cmp_term(_A,_B) ->
 map_to_tuple_keys(_M) ->
     erlang:nif_error(undefined).
 
-%% return the internal map type
--spec map_type(M) -> Type when
-    M :: map(),
-    Type :: 'flatmap' | 'hashmap' | 'hashmap_node'.
-
-map_type(_M) ->
+%% return the internal term type
+-spec term_type(T) -> Type when
+    T :: term(),
+    Type :: 'flatmap' | 'hashmap' | 'hashmap_node'
+          | 'fixnum'  | 'bignum'  | 'hfloat'
+          | 'list' | 'tuple' | 'export' | 'fun'
+          | 'refc_binary' | 'heap_binary' | 'sub_binary'
+          | 'reference'   | 'external_reference'
+          | 'pid' | 'external_pid' | 'port' | 'external_port'
+          | 'atom' | 'catch' | 'nil'.
+
+term_type(_T) ->
     erlang:nif_error(undefined).
 
 %% return the internal hashmap sub-nodes from
@@ -258,8 +368,38 @@ flush_monitor_messages(Ref, Multi, Res) when is_reference(Ref) ->
 time_unit() ->
     erlang:nif_error(undefined).
 
+-spec erts_internal:perf_counter_unit() -> pos_integer().
+
+perf_counter_unit() ->
+    erlang:nif_error(undefined).
+
 -spec erts_internal:is_system_process(Pid) -> boolean() when
       Pid :: pid().
 
 is_system_process(_Pid) ->
     erlang:nif_error(undefined).
+
+-spec await_microstate_accounting_modifications(Ref, Result, Threads) -> boolean() when
+      Ref :: reference(),
+      Result :: boolean(),
+      Threads :: pos_integer().
+
+await_microstate_accounting_modifications(Ref, Result, Threads) ->
+    _ = microstate_accounting(Ref,Threads),
+    Result.
+
+-spec gather_microstate_accounting_result(Ref, Threads) -> [#{}] when
+      Ref :: reference(),
+      Threads :: pos_integer().
+
+gather_microstate_accounting_result(Ref, Threads) ->
+    microstate_accounting(Ref, Threads).
+
+microstate_accounting(_Ref, 0) ->
+    [];
+microstate_accounting(Ref, Threads) ->
+    receive
+        Ref -> microstate_accounting(Ref, Threads - 1);
+        {Ref, Res} ->
+	    [Res | microstate_accounting(Ref, Threads - 1)]
+    end.
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index 0ad5824ad1..915f1183d6 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -23,7 +23,6 @@
 %% a local file or distributed from another erlang node.
 %% 
 %% Flags:
-%%        -id Identity   : identity of the system.
 %%        -boot File     : Absolute file name of the boot script.
 %%        -boot_var Var Value
 %%                       : $Var in the boot script is expanded to
@@ -75,6 +74,19 @@
 		subscribed = []}).
 -type state() :: #state{}.
 
+%% Data for eval_script/2.
+-record(es,
+	{init,
+	 debug,
+	 path,
+	 pa,
+	 pz,
+	 path_choice,
+	 prim_load,
+	 load_mode,
+	 vars
+	}).
+
 -define(ON_LOAD_HANDLER, init__boot__on_load_handler).
 
 debug(false, _) -> ok;
@@ -117,7 +129,7 @@ bs2ss(L) ->
 get_status() ->
     request(get_status).
 
--spec fetch_loaded() -> [atom()].
+-spec fetch_loaded() -> [{module(),file:filename()}].
 fetch_loaded() ->
     request(fetch_loaded).
 
@@ -169,8 +181,7 @@ boot(BootArgs) ->
     process_flag(trap_exit, true),
     {Start0,Flags,Args} = parse_boot_args(BootArgs),
     Start = map(fun prepare_run_args/1, Start0),
-    Flags0 = flags_to_atoms_again(Flags),
-    boot(Start,Flags0,Args).
+    boot(Start, Flags, Args).
 
 prepare_run_args({eval, [Expr]}) ->
     {eval,Expr};
@@ -202,16 +213,6 @@ map(_F, []) ->
 map(F, [X|Rest]) ->
     [F(X) | map(F, Rest)].
 
-flags_to_atoms_again([]) ->
-    [];
-flags_to_atoms_again([{F0,L0}|Rest]) ->
-    L = L0,
-    F = b2a(F0),
-    [{F,L}|flags_to_atoms_again(Rest)];
-flags_to_atoms_again([{F0}|Rest]) ->
-    F = b2a(F0),
-    [{F}|flags_to_atoms_again(Rest)].
-
 -spec code_path_choice() -> 'relaxed' | 'strict'.
 code_path_choice() ->
     case get_argument(code_path_choice) of
@@ -296,9 +297,9 @@ crash(String, List) ->
 -spec boot_loop(pid(), state()) -> no_return().
 boot_loop(BootPid, State) ->
     receive
-	{BootPid,loaded,ModLoaded} ->
-	    Loaded = State#state.loaded,
-	    boot_loop(BootPid,State#state{loaded = [ModLoaded|Loaded]});
+	{BootPid,loaded,NewlyLoaded} ->
+	    Loaded = NewlyLoaded ++ State#state.loaded,
+	    boot_loop(BootPid, State#state{loaded = Loaded});
 	{BootPid,started,KernelPid} ->
 	    boot_loop(BootPid, new_kernelpid(KernelPid, BootPid, State));
 	{BootPid,progress,started} ->
@@ -337,12 +338,25 @@ boot_loop(BootPid, State) ->
     end.
 
 ensure_loaded(Module, Loaded) ->
-    File = concat([Module,objfile_extension()]),
-    case catch load_mod(Module,File) of
-	{ok, FullName} ->
-	    {{module, Module}, [{Module, FullName}|Loaded]};
-	Res ->
-	    {Res, Loaded}
+    case erlang:module_loaded(Module) of
+	true ->
+	    {{module, Module}, Loaded};
+	false ->
+	    do_ensure_loaded(Module, Loaded)
+    end.
+
+do_ensure_loaded(Module, Loaded) ->
+    File = atom_to_list(Module) ++ objfile_extension(),
+    case erl_prim_loader:get_file(File) of
+	{ok,BinCode,FullName} ->
+	    case do_load_module(Module, BinCode) of
+		ok ->
+		    {{module, Module}, [{Module, FullName}|Loaded]};
+		error ->
+		    {error, [{Module, FullName}|Loaded]}
+	    end;
+	Error ->
+	    {Error, Loaded}
     end.
 
 %% Tell subscribed processes the system has started.
@@ -451,9 +465,9 @@ do_handle_msg(Msg,State) ->
 %%% -------------------------------------------------
 
 make_permanent(Boot,Config,Flags0,State) ->
-    case set_flag('-boot',Boot,Flags0) of
+    case set_flag(boot, Boot, Flags0) of
 	{ok,Flags1} ->
-	    case set_flag('-config',Config,Flags1) of
+	    case set_flag(config, Config, Flags1) of
 		{ok,Flags} ->
 		    {ok,State#state{flags = Flags}};
 		Error ->
@@ -635,9 +649,9 @@ unload(_) ->
     do_unload(sub([heart|erlang:pre_loaded()],erlang:loaded())).
 
 do_unload([M|Mods]) ->
-    catch erlang:purge_module(M),
+    catch erts_internal:purge_module(M),
     catch erlang:delete_module(M),
-    catch erlang:purge_module(M),
+    catch erts_internal:purge_module(M),
     do_unload(Mods);
 do_unload([]) ->
     purge_all_hipe_refs(),
@@ -691,17 +705,15 @@ sleep(T) -> receive after T -> ok end.
 %%% The loader shall run for ever!
 %%% -------------------------------------------------
 
-start_prim_loader(Init,Id,Pgm,Nodes,Path,{Pa,Pz}) ->
-    case erl_prim_loader:start(Id,Pgm,Nodes) of
-	{ok,Pid} when Path =:= false ->
-	    InitPath = append(Pa,["."|Pz]),
-	    erl_prim_loader:set_path(InitPath),
-	    add_to_kernel(Init,Pid),
-	    Pid;
+start_prim_loader(Init, Path0, {Pa,Pz}) ->
+    Path = case Path0 of
+	       false -> Pa ++ ["."|Pz];
+	       _ -> Path0
+	   end,
+    case erl_prim_loader:start() of
 	{ok,Pid} ->
 	    erl_prim_loader:set_path(Path),
-	    add_to_kernel(Init,Pid),
-	    Pid;
+	    add_to_kernel(Init, Pid);
 	{error,Reason} ->
 	    erlang:display({"cannot start loader",Reason}),
 	    exit(Reason)
@@ -715,13 +727,6 @@ add_to_kernel(Init,Pid) ->
 	    ok
     end.
 
-prim_load_flags(Flags) ->
-    PortPgm = get_flag('-loader',Flags,<<"efile">>),
-    Hosts = get_flag_list('-hosts', Flags, []),
-    Id = get_flag('-id',Flags,none),
-    Path = get_flag_list('-path',Flags,false),
-    {PortPgm, Hosts, Id, Path}.
-
 %%% -------------------------------------------------
 %%% The boot process fetches a boot script and loads
 %%% all modules specified and starts spec. processes.
@@ -734,24 +739,23 @@ do_boot(Flags,Start) ->
 
 do_boot(Init,Flags,Start) ->
     process_flag(trap_exit,true),
-    {Pgm0,Nodes,Id,Path} = prim_load_flags(Flags),
-    Root = b2s(get_flag('-root',Flags)),
-    PathFls = path_flags(Flags),
-    Pgm = b2s(Pgm0),
-    _Pid = start_prim_loader(Init,b2a(Id),Pgm,bs2as(Nodes),
-			     bs2ss(Path),PathFls),
+    Root = get_root(Flags),
+    Path = get_flag_list(path, Flags, false),
+    {Pa,Pz} = PathFls = path_flags(Flags),
+    start_prim_loader(Init, bs2ss(Path), PathFls),
     BootFile = bootfile(Flags,Root),
     BootList = get_boot(BootFile,Root),
-    LoadMode = b2a(get_flag('-mode',Flags,false)),
-    Deb = b2a(get_flag('-init_debug',Flags,false)),
+    LoadMode = b2a(get_flag(mode, Flags, false)),
+    Deb = b2a(get_flag(init_debug, Flags, false)),
     catch ?ON_LOAD_HANDLER ! {init_debug_flag,Deb},
-    BootVars = get_flag_args('-boot_var',Flags),
-    ParallelLoad = 
-	(Pgm =:= "efile") and (erlang:system_info(thread_pool_size) > 0),
+    BootVars = get_boot_vars(Root, Flags),
 
     PathChoice = code_path_choice(),
-    eval_script(BootList,Init,PathFls,{Root,BootVars},Path,
-		{true,LoadMode,ParallelLoad},Deb,PathChoice),
+    Es = #es{init=Init,debug=Deb,path=Path,pa=Pa,pz=Pz,
+	     path_choice=PathChoice,
+	     prim_load=true,load_mode=LoadMode,
+	     vars=BootVars},
+    eval_script(BootList, Es),
 
     %% To help identifying Purify windows that pop up,
     %% print the node name into the Purify log.
@@ -759,21 +763,43 @@ do_boot(Init,Flags,Start) ->
 
     start_em(Start).
 
+get_root(Flags) ->
+    case get_argument(root, Flags) of
+	{ok,[[Root]]} ->
+	    Root;
+	_ ->
+	    exit(no_or_multiple_root_variables)
+    end.
+
+get_boot_vars(Root, Flags) ->
+    BootVars = get_boot_vars_1(#{}, Flags),
+    RootKey = <<"ROOT">>,
+    BootVars#{RootKey=>Root}.
+
+get_boot_vars_1(Vars, [{boot_var,[Key,Value]}|T]) ->
+    get_boot_vars_1(Vars#{Key=>Value}, T);
+get_boot_vars_1(_, [{boot_var,_}|_]) ->
+    exit(invalid_boot_var_argument);
+get_boot_vars_1(Vars, [_|T]) ->
+    get_boot_vars_1(Vars, T);
+get_boot_vars_1(Vars, []) ->
+    Vars.
+
 bootfile(Flags,Root) ->
-    b2s(get_flag('-boot',Flags,concat([Root,"/bin/start"]))).
+    b2s(get_flag(boot, Flags, Root++"/bin/start")).
 
 path_flags(Flags) ->
-    Pa = append(reverse(get_flag_args('-pa',Flags))),
-    Pz = append(get_flag_args('-pz',Flags)),
+    Pa = append(reverse(get_flag_args(pa, Flags))),
+    Pz = append(get_flag_args(pz, Flags)),
     {bs2ss(Pa),bs2ss(Pz)}.
 
 get_boot(BootFile0,Root) ->
-    BootFile = concat([BootFile0,".boot"]),
+    BootFile = BootFile0 ++ ".boot",
     case get_boot(BootFile) of
 	{ok, CmdList} ->
 	    CmdList;
 	not_found -> %% Check for default.
-	    BootF = concat([Root,"/bin/",BootFile]),
+	    BootF = Root ++ "/bin/" ++ BootFile,
 	    case get_boot(BootF)  of
 		{ok, CmdList} ->
 		    CmdList;
@@ -807,91 +833,88 @@ get_boot(BootFile) ->
 %% boot process hangs (we want to ensure syncronicity).
 %%
 
-eval_script([{progress,Info}|CfgL],Init,PathFs,Vars,P,Ph,Deb,PathChoice) ->
-    debug(Deb,{progress,Info}),
+eval_script([{progress,Info}=Progress|T], #es{debug=Deb}=Es) ->
+    debug(Deb, Progress),
     init ! {self(),progress,Info},
-    eval_script(CfgL,Init,PathFs,Vars,P,Ph,Deb,PathChoice);
-eval_script([{preLoaded,_}|CfgL],Init,PathFs,Vars,P,Ph,Deb,PathChoice) ->
-    eval_script(CfgL,Init,PathFs,Vars,P,Ph,Deb,PathChoice);
-eval_script([{path,Path}|CfgL],Init,{Pa,Pz},Vars,false,Ph,Deb,PathChoice) ->
+    eval_script(T, Es);
+eval_script([{preLoaded,_}|T], #es{}=Es) ->
+    eval_script(T, Es);
+eval_script([{path,Path}|T], #es{path=false,pa=Pa,pz=Pz,
+				 path_choice=PathChoice,
+				 vars=Vars}=Es) ->
     RealPath0 = make_path(Pa, Pz, Path, Vars),
     RealPath = patch_path(RealPath0, PathChoice),
     erl_prim_loader:set_path(RealPath),
-    eval_script(CfgL,Init,{Pa,Pz},Vars,false,Ph,Deb,PathChoice);
-eval_script([{path,_}|CfgL],Init,PathFs,Vars,P,Ph,Deb,PathChoice) ->
+    eval_script(T, Es);
+eval_script([{path,_}|T], #es{}=Es) ->
     %% Ignore, use the command line -path flag.
-    eval_script(CfgL,Init,PathFs,Vars,P,Ph,Deb,PathChoice);
-eval_script([{kernel_load_completed}|CfgL],Init,PathFs,Vars,P,{_,embedded,Par},Deb,PathChoice) ->
-    eval_script(CfgL,Init,PathFs,Vars,P,{true,embedded,Par},Deb,PathChoice);
-eval_script([{kernel_load_completed}|CfgL],Init,PathFs,Vars,P,{_,E,Par},Deb,PathChoice) ->
-    eval_script(CfgL,Init,PathFs,Vars,P,{false,E,Par},Deb,PathChoice);
-eval_script([{primLoad,Mods}|CfgL],Init,PathFs,Vars,P,{true,E,Par},Deb,PathChoice)
+    eval_script(T, Es);
+eval_script([{kernel_load_completed}|T], #es{load_mode=Mode}=Es0) ->
+    Es = case Mode of
+	     embedded -> Es0;
+	     _ -> Es0#es{prim_load=false}
+	 end,
+    eval_script(T, Es);
+eval_script([{primLoad,Mods}|T], #es{init=Init,prim_load=PrimLoad}=Es)
   when is_list(Mods) ->
-    if 
-	Par =:= true ->
-	    par_load_modules(Mods,Init);
+    case PrimLoad of
 	true ->
-	    load_modules(Mods)
+	    load_modules(Mods, Init);
+	false ->
+	    %% Do not load now, code_server does that dynamically!
+	    ok
     end,
-    eval_script(CfgL,Init,PathFs,Vars,P,{true,E,Par},Deb,PathChoice);
-eval_script([{primLoad,_Mods}|CfgL],Init,PathFs,Vars,P,{false,E,Par},Deb,PathChoice) ->
-    %% Do not load now, code_server does that dynamically!
-    eval_script(CfgL,Init,PathFs,Vars,P,{false,E,Par},Deb,PathChoice);
-eval_script([{kernelProcess,Server,{Mod,Fun,Args}}|CfgL],Init,
-	    PathFs,Vars,P,Ph,Deb,PathChoice) ->
-    debug(Deb,{start,Server}),
-    start_in_kernel(Server,Mod,Fun,Args,Init),
-    eval_script(CfgL,Init,PathFs,Vars,P,Ph,Deb,PathChoice);
-eval_script([{apply,{Mod,Fun,Args}}|CfgL],Init,PathFs,Vars,P,Ph,Deb,PathChoice) ->
-    debug(Deb,{apply,{Mod,Fun,Args}}),
-    apply(Mod,Fun,Args),
-    eval_script(CfgL,Init,PathFs,Vars,P,Ph,Deb,PathChoice);
-eval_script([],_,_,_,_,_,_,_) ->
+    eval_script(T, Es);
+eval_script([{kernelProcess,Server,{Mod,Fun,Args}}|T],
+	    #es{init=Init,debug=Deb}=Es) ->
+    debug(Deb, {start,Server}),
+    start_in_kernel(Server, Mod, Fun, Args, Init),
+    eval_script(T, Es);
+eval_script([{apply,{Mod,Fun,Args}}=Apply|T], #es{debug=Deb}=Es) ->
+    debug(Deb, Apply),
+    apply(Mod, Fun, Args),
+    eval_script(T, Es);
+eval_script([], #es{}) ->
     ok;
-eval_script(What,_,_,_,_,_,_,_) ->
+eval_script(What, #es{}) ->
     exit({'unexpected command in bootfile',What}).
 
-load_modules([Mod|Mods]) ->
-    File = concat([Mod,objfile_extension()]),
-    {ok,Full} = load_mod(Mod,File),
-    init ! {self(),loaded,{Mod,Full}},  %% Tell init about loaded module
-    load_modules(Mods);
-load_modules([]) ->
+load_modules(Mods0, Init) ->
+    Mods = [M || M <- Mods0, not erlang:module_loaded(M)],
+    F = prepare_loading_fun(),
+    case erl_prim_loader:get_modules(Mods, F) of
+	{ok,{Prep0,[]}} ->
+	    Prep = [Code || {_,{prepared,Code,_}} <- Prep0],
+	    ok = erlang:finish_loading(Prep),
+	    Loaded = [{Mod,Full} || {Mod,{_,_,Full}} <- Prep0],
+	    Init ! {self(),loaded,Loaded},
+	    Beams = [{M,Beam,Full} || {M,{on_load,Beam,Full}} <- Prep0],
+	    load_rest(Beams, Init);
+	{ok,{_,[_|_]=Errors}} ->
+	    Ms = [M || {M,_} <- Errors],
+	    exit({load_failed,Ms})
+    end.
+
+load_rest([{Mod,Beam,Full}|T], Init) ->
+    do_load_module(Mod, Beam),
+    Init ! {self(),loaded,[{Mod,Full}]},
+    load_rest(T, Init);
+load_rest([], _) ->
     ok.
 
-%%% An optimization: erl_prim_loader gets the chance of loading many
-%%% files in parallel, using threads. This will reduce the seek times,
-%%% and loaded code can be processed while other threads are waiting
-%%% for the disk. The optimization is not tried unless the loader is
-%%% "efile" and there is a non-empty pool of threads.
-%%%
-%%% Many threads are needed to get a good result, so it would be
-%%% beneficial to load several applications in parallel. However,
-%%% measurements show that the file system handles one directory at a
-%%% time, regardless if parallel threads are created for files on
-%%% several directories (a guess: writing the meta information when
-%%% the file was last read ('mtime'), forces the file system to sync
-%%% between directories).
-
-par_load_modules(Mods,Init) ->
-    Ext = objfile_extension(),
-    ModFiles = [{Mod,concat([Mod,Ext])} || Mod <- Mods,
-					   not erlang:module_loaded(Mod)],
-    Self = self(),
-    Fun = fun(Mod, BinCode, FullName) ->
-		  case catch load_mod_code(Mod, BinCode, FullName) of
-		      {ok, _} ->
-			  Init ! {Self,loaded,{Mod,FullName}},
-			  ok;
-		      _EXIT ->
-			  {error, Mod}
-		  end
-	  end,
-    case erl_prim_loader:get_files(ModFiles, Fun) of
-	ok ->
-	    ok;
-	{error,Mod} ->
-	    exit({'cannot load',Mod,get_files})
+prepare_loading_fun() ->
+    fun(Mod, FullName, Beam) ->
+	    case erlang:prepare_loading(Mod, Beam) of
+		Prepared when is_binary(Prepared) ->
+		    case erlang:has_prepared_code_on_load(Prepared) of
+			true ->
+			    {ok,{on_load,Beam,FullName}};
+			false ->
+			    {ok,{prepared,Prepared,FullName}}
+		    end;
+		{error,_}=Error ->
+		    Error
+	    end
     end.
 
 make_path(Pa, Pz, Path, Vars) ->
@@ -908,34 +931,25 @@ fix_path([Path|Ps], Vars) ->
 fix_path(_, _) ->
     [].
 
-add_var("$ROOT/" ++ Path, {Root,_}) ->
-    concat([Root, "/", Path]);
-add_var([$$|Path0], {_,VarList}) ->
-    {Var,Path} = extract_var(Path0,[]),
-    Value = b2s(get_var_value(list_to_binary(Var),VarList)),
-    concat([Value, "/", Path]);
-add_var(Path, _)   ->
+add_var("$"++Path0, Vars) ->
+    {Var,Path} = extract_var(Path0, []),
+    Key = list_to_binary(Var),
+    case Vars of
+	#{Key:=Value0} ->
+	    Value = b2s(Value0),
+	    Value ++ "/" ++ Path;
+	_ ->
+	    Error0 = "cannot expand $" ++ Var ++ " in bootfile",
+	    Error = list_to_atom(Error0),
+	    exit(Error)
+    end;
+add_var(Path, _) ->
     Path.
 
 extract_var([$/|Path],Var) -> {reverse(Var),Path};
 extract_var([H|T],Var)     -> extract_var(T,[H|Var]);
 extract_var([],Var)        -> {reverse(Var),[]}.
 
-%% get_var_value(Var, [Vars]) where Vars == [atom()]
-get_var_value(Var,[Vars|VarList]) ->
-    case get_var_val(Var,Vars) of
-	{ok, Value} ->
-	    Value;
-	_ ->
-	    get_var_value(Var,VarList)
-    end;
-get_var_value(Var,[]) ->
-    exit(list_to_atom(concat(["cannot expand \$", Var, " in bootfile"]))).
-
-get_var_val(Var,[Var,Value|_]) -> {ok, Value};
-get_var_val(Var,[_,_|Vars])    -> get_var_val(Var,Vars);
-get_var_val(_,_)               -> false.
-
 patch_path(Dirs, strict) ->
     Dirs;
 patch_path(Dirs, relaxed) ->
@@ -1049,49 +1063,23 @@ start_it({eval,Bin}) ->
     {value, _Value, _Bs} = erl_eval:exprs(Expr, erl_eval:new_bindings()),
     ok;
 start_it([_|_]=MFA) ->
-    Ref = make_ref(),
-    case catch {Ref,case MFA of
-			[M]        -> M:start();
-			[M,F]      -> M:F();
-			[M,F|Args] -> M:F(Args)	% Args is a list
-		    end} of
-	{Ref,R} ->
-	    R;
-	{'EXIT',Reason} ->
-	    exit(Reason);
-	Other ->
-	    throw(Other)
+    case MFA of
+	[M]        -> M:start();
+	[M,F]      -> M:F();
+	[M,F|Args] -> M:F(Args)	% Args is a list
     end.
 
-%%
-%% Fetch a module and load it into the system.
-%%
-load_mod(Mod, File) ->
-    case erlang:module_loaded(Mod) of
-	false ->
-	    case erl_prim_loader:get_file(File) of
-		{ok,BinCode,FullName} ->
-		    load_mod_code(Mod, BinCode, FullName);
-		_ ->
-		    exit({'cannot load',Mod,get_file})
-	    end;
-	_ -> % Already loaded.
-	    {ok,File}
-    end.
+%% Load a module.
 
-load_mod_code(Mod, BinCode, FullName) ->
-    case erlang:module_loaded(Mod) of
-	false ->
-	    case erlang:load_module(Mod, BinCode) of
-		{module,Mod} -> {ok,FullName};
-		{error,on_load} ->
-		    ?ON_LOAD_HANDLER ! {loaded,Mod},
-		    {ok,FullName};
-		Other ->
-		    exit({'cannot load',Mod,Other})
-	    end;
-	_ -> % Already loaded.
-	    {ok,FullName}
+do_load_module(Mod, BinCode) ->
+    case erlang:load_module(Mod, BinCode) of
+	{module,Mod} ->
+	    ok;
+	{error,on_load} ->
+	    ?ON_LOAD_HANDLER ! {loaded,Mod},
+	    ok;
+	_ ->
+	    error
     end.
 
 %% --------------------------------------------------------
@@ -1102,7 +1090,7 @@ load_mod_code(Mod, BinCode, FullName) ->
 %% --------------------------------------------------------
 
 shutdown_timer(Flags) ->
-    case get_flag('-shutdown_time',Flags,infinity) of
+    case get_flag(shutdown_time, Flags, infinity) of
 	infinity ->
 	    self();
 	Time ->
@@ -1152,14 +1140,10 @@ parse_boot_args([B|Bs], Ss, Fs, As) ->
 	eval_arg ->
 	    {Expr,Rest} = get_args(Bs, []),
 	    parse_boot_args(Rest, [{eval, Expr}|Ss], Fs, As);
-	flag ->
+	{flag,A} ->
 	    {F,Rest} = get_args(Bs, []),
-	    Fl = case F of
-		     []   -> [B];
-		     FF   -> [B,FF]
-		 end,
-	    parse_boot_args(Rest, Ss,  
-			    [list_to_tuple(Fl)|Fs], As);
+	    Fl = {A,F},
+	    parse_boot_args(Rest, Ss, [Fl|Fs], As);
 	arg ->
 	    parse_boot_args(Bs, Ss, Fs, [B|As]);
 	end_args ->
@@ -1173,12 +1157,8 @@ check(<<"-s">>) -> start_arg;
 check(<<"-run">>) -> start_arg2;
 check(<<"-eval">>) -> eval_arg;
 check(<<"--">>) -> end_args;
-check(X) when is_binary(X) ->
-    case binary_to_list(X) of
-	[$-|_Rest] -> flag;
-	_Chars     -> arg			%Even empty atoms
-    end;
-check(_X) -> arg.				%This should never occur
+check(<<"-",Flag/binary>>) -> {flag,b2a(Flag)};
+check(_) -> arg.
 
 get_args([B|Bs], As) ->
     case check(B) of
@@ -1187,7 +1167,7 @@ get_args([B|Bs], As) ->
 	start_arg2 -> {reverse(As), [B|Bs]};
 	eval_arg -> {reverse(As), [B|Bs]};
 	end_args -> {reverse(As), Bs};
-	flag -> {reverse(As), [B|Bs]};
+	{flag,_} -> {reverse(As), [B|Bs]};
 	arg ->
 	    get_args(Bs, [B|As])
     end;
@@ -1199,44 +1179,28 @@ get_args([], As) -> {reverse(As),[]}.
 %%         atom() if a single arg was given.
 %%         list(atom()) if several args were given.
 %%
-get_flag(F,Flags,Default) ->
-    case catch get_flag(F,Flags) of
-	{'EXIT',_} ->
-	    Default;
-	Value ->
-	    Value
-    end.
-
-get_flag(F,Flags) ->
-    case search(F,Flags) of
-	{value,{F,[V]}} ->
+get_flag(F, Flags, Default) ->
+    case lists:keyfind(F, 1, Flags) of
+	{F,[]} ->
+	    true;
+	{F,[V]} ->
 	    V;
-	{value,{F,V}} ->
+	{F,V} ->
 	    V;
-	{value,{F}} -> % Flag given!
-	    true;
 	_ ->
-	    exit(list_to_atom(concat(["no ",F," flag"])))
+	    Default
     end.
 
 %%
 %% Internal get_flag function, with default value.
 %% Return: list(atom()) 
 %%
-get_flag_list(F,Flags,Default) ->
-    case catch get_flag_list(F,Flags) of
-	{'EXIT',_} ->
-	    Default;
-	Value ->
-	    Value
-    end.
-
-get_flag_list(F,Flags) ->
-    case search(F,Flags) of
-	{value,{F,V}} ->
+get_flag_list(F, Flags, Default) ->
+    case lists:keyfind(F, 1, Flags) of
+	{F,[_|_]=V} ->
 	    V;
 	_ ->
-	    exit(list_to_atom(concat(["no ",F," flag"])))
+	    Default
     end.
 
 %%
@@ -1246,21 +1210,15 @@ get_flag_list(F,Flags) ->
 %%
 get_flag_args(F,Flags) -> get_flag_args(F,Flags,[]).
 
-get_flag_args(F,[{F,V}|Flags],Acc) when is_list(V) ->
-    get_flag_args(F,Flags,[V|Acc]);
 get_flag_args(F,[{F,V}|Flags],Acc) ->
-    get_flag_args(F,Flags,[[V]|Acc]);
+    get_flag_args(F,Flags,[V|Acc]);
 get_flag_args(F,[_|Flags],Acc) ->
     get_flag_args(F,Flags,Acc);
 get_flag_args(_,[],Acc) ->
     reverse(Acc).
 
 get_arguments([{F,V}|Flags]) ->
-    [$-|Fl] = atom_to_list(F),
-    [{list_to_atom(Fl),to_strings(V)}|get_arguments(Flags)];
-get_arguments([{F}|Flags]) ->
-    [$-|Fl] = atom_to_list(F),
-    [{list_to_atom(Fl),[]}|get_arguments(Flags)];
+    [{F,to_strings(V)}|get_arguments(Flags)];
 get_arguments([]) ->
     [].
 
@@ -1268,44 +1226,26 @@ to_strings([H|T]) when is_atom(H) -> [atom_to_list(H)|to_strings(T)];
 to_strings([H|T]) when is_binary(H) -> [b2s(H)|to_strings(T)];
 to_strings([])    -> [].
 
-get_argument(Arg,Flags) ->
-    Args = get_arguments(Flags),
-    case get_argument1(Arg,Args) of
-	[] ->
-	    error;
-	Value ->
-	    {ok,Value}
+get_argument(Arg, Flags) ->
+    case get_argument1(Arg, Flags) of
+	[] -> error;
+	Value -> {ok,Value}
     end.
 
-get_argument1(Arg,[{Arg,V}|Args]) ->
-    [V|get_argument1(Arg,Args)];
-get_argument1(Arg,[_|Args]) ->
-    get_argument1(Arg,Args);
-get_argument1(_,[]) ->
+get_argument1(Arg, [{Arg,V}|Args]) ->
+    [to_strings(V)|get_argument1(Arg, Args)];
+get_argument1(Arg, [_|Args]) ->
+    get_argument1(Arg, Args);
+get_argument1(_, []) ->
     [].
 
 set_argument([{Flag,_}|Flags],Flag,Value) ->
     [{Flag,[Value]}|Flags];
-set_argument([{Flag}|Flags],Flag,Value) ->
-    [{Flag,[Value]}|Flags];
 set_argument([Item|Flags],Flag,Value) ->
     [Item|set_argument(Flags,Flag,Value)];
 set_argument([],Flag,Value) ->
     [{Flag,[Value]}].
 
-concat([A|T]) when is_atom(A) ->
-    atom_to_list(A) ++ concat(T);
-concat([C|T]) when is_integer(C), 0 =< C, C =< 255 ->
-    [C|concat(T)];
-concat([Bin|T]) when is_binary(Bin) ->
-    binary_to_list(Bin) ++ concat(T);
-concat([S|T]) ->
-    S ++ concat(T);
-concat([]) ->
-    [].
-
-append(L, Z) -> L ++ Z.
-
 append([E]) -> E;
 append([H|T]) ->
     H ++ append(T);
@@ -1320,13 +1260,6 @@ reverse([A, B]) ->
 reverse([A, B | L]) ->
     lists:reverse(L, [B, A]). % BIF
 			
-search(Key, [H|_T]) when is_tuple(H), element(1, H) =:= Key ->
-    {value, H};
-search(Key, [_|T]) ->
-    search(Key, T);
-search(_Key, []) ->
-    false.
-
 -spec objfile_extension() -> nonempty_string().
 objfile_extension() ->
     ".beam".
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index c87b2645ec..ab5359ebbc 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2000-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.
@@ -1276,6 +1276,7 @@ lseek_position(_) ->
 %% Translates the response from the driver into 
 %% {ok, Result} or {error, Reason}.
 
+-dialyzer({no_improper_lists, translate_response/2}).
 translate_response(?FILE_RESP_OK, []) ->
     ok;
 translate_response(?FILE_RESP_ERROR, List) when is_list(List) ->
diff --git a/erts/test/Makefile b/erts/test/Makefile
index 5263d8cd4f..a01d67e34f 100644
--- a/erts/test/Makefile
+++ b/erts/test/Makefile
@@ -54,7 +54,7 @@ RELSYSDIR = $(RELEASE_PATH)/system_test
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 # ----------------------------------------------------
 # Targets
diff --git a/erts/test/erl_print_SUITE.erl b/erts/test/erl_print_SUITE.erl
index 3b0c083702..f68a85b3e5 100644
--- a/erts/test/erl_print_SUITE.erl
+++ b/erts/test/erl_print_SUITE.erl
@@ -28,153 +28,133 @@
 -module(erl_print_SUITE).
 -author('[email protected]').
 
+-export([all/0, suite/0, init_per_testcase/2, end_per_testcase/2]).
 
-%-define(line_trace, 1).
+-export([erlang_display/1, integer/1, float/1,
+         string/1, character/1, snprintf/1, quote/1]).
 
--define(DEFAULT_TIMEOUT, ?t:minutes(10)).
+-include_lib("common_test/include/ct.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([erlang_display/1, integer/1, float/1, 
-	 string/1, character/1, snprintf/1, quote/1]).
-
--include_lib("test_server/include/test_server.hrl").
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 10}}].
 
 all() -> 
-    test_cases().
-
-groups() -> 
-    [].
+    [erlang_display, integer, float, string, character,
+     snprintf, quote].
 
-init_per_suite(Config) ->
-    Config.
+init_per_testcase(Case, Config) ->
+    [{testcase, Case}|Config].
 
-end_per_suite(_Config) ->
+end_per_testcase(_Case, _Config) ->
     ok.
 
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 %%
 %%
 %% Test cases
 %%
 %%
 
-test_cases() -> 
-    [erlang_display, integer, float, string, character,
-     snprintf, quote].
-
-erlang_display(doc) -> [];
-erlang_display(suite) -> [];
 erlang_display(Config) when is_list(Config) ->
-    ?line put(erlang_display_test, ok),
+    put(erlang_display_test, ok),
     OAIS = erts_debug:set_internal_state(available_internal_state, true),
 
     %% atoms
-    ?line chk_display(atom, "atom"),
-    ?line chk_display(true, "true"),
-    ?line chk_display(false, "false"),
-    ?line chk_display('DOWN', "'DOWN'"),
-    ?line chk_display('EXIT', "'EXIT'"),
-    ?line chk_display('asdDofw $@{}][', "'asdDofw $@{}]['"),
+    chk_display(atom, "atom"),
+    chk_display(true, "true"),
+    chk_display(false, "false"),
+    chk_display('DOWN', "'DOWN'"),
+    chk_display('EXIT', "'EXIT'"),
+    chk_display('asdDofw $@{}][', "'asdDofw $@{}]['"),
 
     %% integers
-    ?line chk_display(0, "0"),
-    ?line chk_display(1, "1"),
-    ?line chk_display(4711, "4711"),
-    ?line chk_display(((1 bsl 27) - 1), "134217727"),
-    ?line chk_display((1 bsl 27), "134217728"),
-    ?line chk_display((1 bsl 32), "4294967296"),
-    ?line chk_display(11111111111, "11111111111"),
-    ?line chk_display((1 bsl 59) - 1, "576460752303423487"),
-    ?line chk_display(1 bsl 59, "576460752303423488"),
-    ?line chk_display(111111111111111111111, "111111111111111111111"),
-    ?line chk_display(123456789012345678901234567890,
-		      "123456789012345678901234567890"),
-    ?line chk_display(1 bsl 10000, str_1_bsl_10000()),
-    ?line chk_display(-1, "-1"),
-    ?line chk_display(-4711, "-4711"),
-    ?line chk_display(-(1 bsl 27), "-134217728"),
-    ?line chk_display(-((1 bsl 27) + 1), "-134217729"),
-    ?line chk_display(-(1 bsl 32), "-4294967296"),
-    ?line chk_display(-11111111111, "-11111111111"),
-    ?line chk_display(-(1 bsl 59), "-576460752303423488"),
-    ?line chk_display(-((1 bsl 59) + 1), "-576460752303423489"),
-    ?line chk_display(-111111111111111111111, "-111111111111111111111"),
-    ?line chk_display(-123456789012345678901234567890,
-		      "-123456789012345678901234567890"),
-    ?line chk_display(-(1 bsl 10000), [$- | str_1_bsl_10000()]),
-
-    ?line MyCre = my_cre(),
+    chk_display(0, "0"),
+    chk_display(1, "1"),
+    chk_display(4711, "4711"),
+    chk_display(((1 bsl 27) - 1), "134217727"),
+    chk_display((1 bsl 27), "134217728"),
+    chk_display((1 bsl 32), "4294967296"),
+    chk_display(11111111111, "11111111111"),
+    chk_display((1 bsl 59) - 1, "576460752303423487"),
+    chk_display(1 bsl 59, "576460752303423488"),
+    chk_display(111111111111111111111, "111111111111111111111"),
+    chk_display(123456789012345678901234567890,
+                "123456789012345678901234567890"),
+    chk_display(1 bsl 10000, str_1_bsl_10000()),
+    chk_display(-1, "-1"),
+    chk_display(-4711, "-4711"),
+    chk_display(-(1 bsl 27), "-134217728"),
+    chk_display(-((1 bsl 27) + 1), "-134217729"),
+    chk_display(-(1 bsl 32), "-4294967296"),
+    chk_display(-11111111111, "-11111111111"),
+    chk_display(-(1 bsl 59), "-576460752303423488"),
+    chk_display(-((1 bsl 59) + 1), "-576460752303423489"),
+    chk_display(-111111111111111111111, "-111111111111111111111"),
+    chk_display(-123456789012345678901234567890,
+                "-123456789012345678901234567890"),
+    chk_display(-(1 bsl 10000), [$- | str_1_bsl_10000()]),
+
+    MyCre = my_cre(),
 
     %% pids
-    ?line chk_display(mk_pid_xstr({node(), MyCre}, 4711, 42)),
-    ?line chk_display(mk_pid_xstr({node(), oth_cre(MyCre)}, 4711, 42)),
-    ?line chk_display(mk_pid_xstr({node(), oth_cre(oth_cre(MyCre))}, 4711, 42)),
+    chk_display(mk_pid_xstr({node(), MyCre}, 4711, 42)),
+    chk_display(mk_pid_xstr({node(), oth_cre(MyCre)}, 4711, 42)),
+    chk_display(mk_pid_xstr({node(), oth_cre(oth_cre(MyCre))}, 4711, 42)),
 
-    ?line chk_display(mk_pid_xstr({a@b, MyCre}, 4711, 42)),
-    ?line chk_display(mk_pid_xstr({a@b, oth_cre(MyCre)}, 4711, 42)),
-    ?line chk_display(mk_pid_xstr({a@b, oth_cre(oth_cre(MyCre))}, 4711, 42)),
+    chk_display(mk_pid_xstr({a@b, MyCre}, 4711, 42)),
+    chk_display(mk_pid_xstr({a@b, oth_cre(MyCre)}, 4711, 42)),
+    chk_display(mk_pid_xstr({a@b, oth_cre(oth_cre(MyCre))}, 4711, 42)),
 
     %% ports
-    ?line chk_display(mk_port_xstr({node(), MyCre}, 4711)),
-    ?line chk_display(mk_port_xstr({node(), oth_cre(MyCre)}, 4711)),
-    ?line chk_display(mk_port_xstr({node(), oth_cre(oth_cre(MyCre))}, 4711)),
+    chk_display(mk_port_xstr({node(), MyCre}, 4711)),
+    chk_display(mk_port_xstr({node(), oth_cre(MyCre)}, 4711)),
+    chk_display(mk_port_xstr({node(), oth_cre(oth_cre(MyCre))}, 4711)),
 
-    ?line chk_display(mk_port_xstr({c@d, MyCre}, 4711)),
-    ?line chk_display(mk_port_xstr({c@d, oth_cre(MyCre)}, 4711)),
-    ?line chk_display(mk_port_xstr({c@d, oth_cre(oth_cre(MyCre))}, 4711)),
+    chk_display(mk_port_xstr({c@d, MyCre}, 4711)),
+    chk_display(mk_port_xstr({c@d, oth_cre(MyCre)}, 4711)),
+    chk_display(mk_port_xstr({c@d, oth_cre(oth_cre(MyCre))}, 4711)),
 
     %% refs
-    ?line chk_display(mk_ref_xstr({node(), MyCre}, [1,2,3])),
-    ?line chk_display(mk_ref_xstr({node(), oth_cre(MyCre)}, [1,2,3])),
-    ?line chk_display(mk_ref_xstr({node(), oth_cre(oth_cre(MyCre))}, [1,2,3])),
+    chk_display(mk_ref_xstr({node(), MyCre}, [1,2,3])),
+    chk_display(mk_ref_xstr({node(), oth_cre(MyCre)}, [1,2,3])),
+    chk_display(mk_ref_xstr({node(), oth_cre(oth_cre(MyCre))}, [1,2,3])),
 
-    ?line chk_display(mk_ref_xstr({e@f, MyCre},[1,2,3] )),
-    ?line chk_display(mk_ref_xstr({e@f, oth_cre(MyCre)}, [1,2,3])),
-    ?line chk_display(mk_ref_xstr({e@f, oth_cre(oth_cre(MyCre))}, [1,2,3])),
+    chk_display(mk_ref_xstr({e@f, MyCre},[1,2,3] )),
+    chk_display(mk_ref_xstr({e@f, oth_cre(MyCre)}, [1,2,3])),
+    chk_display(mk_ref_xstr({e@f, oth_cre(oth_cre(MyCre))}, [1,2,3])),
 
     %% Compund terms
-    ?line {Pid, PidStr} = mk_pid_xstr({x@y, oth_cre(MyCre)}, 4712, 41),
-    ?line {Port, PortStr} = mk_port_xstr({x@y, oth_cre(MyCre)}, 4712),
-    ?line {Ref, RefStr} = mk_ref_xstr({e@f, oth_cre(MyCre)}, [11,12,13]),
-
-    ?line chk_display({atom,-4711,Ref,{"hej",[Pid,222222222222222222222222,Port,4711]}},
-		      "{atom,-4711,"++RefStr++",{\"hej\",["++PidStr++",222222222222222222222222,"++PortStr++",4711]}}"),
-    ?line chk_display({{{{{{{{{{{{{{{{{{{{{{{hi}}}}}}}}}}}}}}}}}}}}}}},
-		      "{{{{{{{{{{{{{{{{{{{{{{{hi}}}}}}}}}}}}}}}}}}}}}}}"),
-    ?line chk_display([[[[[[[[[[[[[[[[[[[[[[[yo]]]]]]]]]]]]]]]]]]]]]]],
-		      "[[[[[[[[[[[[[[[[[[[[[[[yo]]]]]]]]]]]]]]]]]]]]]]]"),
-    ?line chk_display({[{[{[{[{[{[{[{[{[{[{[{[ii]}]}]}]}]}]}]}]}]}]}]}]},
-		      "{[{[{[{[{[{[{[{[{[{[{[{[ii]}]}]}]}]}]}]}]}]}]}]}]}"),
-    ?line chk_display([], "[]"), % Not really a compound term :)
-    ?line chk_display([a|b], "[a|b]"),
-    ?line chk_display([a,b,c|z], "[a,b,c|z]"),
-    ?line chk_display([a,b,c], "[a,b,c]"),
-    ?line chk_display([Pid,Port,Ref],
-		      "["++PidStr++","++PortStr++","++RefStr++"]"),
-    ?line chk_display("abcdefghijklmnopqrstuvwxyz",
-		      "\"abcdefghijklmnopqrstuvwxyz\""),
-    ?line chk_display("ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-		      "\"ABCDEFGHIJKLMNOPQRSTUVWXYZ\""),
-    ?line chk_display("H E J", "\"H E J\""),
-    ?line chk_display("asdDofw $@{}][", "\"asdDofw $@{}][\""),
-    
+    {Pid, PidStr} = mk_pid_xstr({x@y, oth_cre(MyCre)}, 4712, 41),
+    {Port, PortStr} = mk_port_xstr({x@y, oth_cre(MyCre)}, 4712),
+    {Ref, RefStr} = mk_ref_xstr({e@f, oth_cre(MyCre)}, [11,12,13]),
+
+    chk_display({atom,-4711,Ref,{"hej",[Pid,222222222222222222222222,Port,4711]}},
+                "{atom,-4711,"++RefStr++",{\"hej\",["++PidStr++",222222222222222222222222,"++PortStr++",4711]}}"),
+    chk_display({{{{{{{{{{{{{{{{{{{{{{{hi}}}}}}}}}}}}}}}}}}}}}}},
+                "{{{{{{{{{{{{{{{{{{{{{{{hi}}}}}}}}}}}}}}}}}}}}}}}"),
+    chk_display([[[[[[[[[[[[[[[[[[[[[[[yo]]]]]]]]]]]]]]]]]]]]]]],
+                "[[[[[[[[[[[[[[[[[[[[[[[yo]]]]]]]]]]]]]]]]]]]]]]]"),
+    chk_display({[{[{[{[{[{[{[{[{[{[{[{[ii]}]}]}]}]}]}]}]}]}]}]}]},
+                "{[{[{[{[{[{[{[{[{[{[{[{[ii]}]}]}]}]}]}]}]}]}]}]}]}"),
+    chk_display([], "[]"), % Not really a compound term :)
+    chk_display([a|b], "[a|b]"),
+    chk_display([a,b,c|z], "[a,b,c|z]"),
+    chk_display([a,b,c], "[a,b,c]"),
+    chk_display([Pid,Port,Ref],
+                "["++PidStr++","++PortStr++","++RefStr++"]"),
+    chk_display("abcdefghijklmnopqrstuvwxyz",
+                "\"abcdefghijklmnopqrstuvwxyz\""),
+    chk_display("ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+                "\"ABCDEFGHIJKLMNOPQRSTUVWXYZ\""),
+    chk_display("H E J", "\"H E J\""),
+    chk_display("asdDofw $@{}][", "\"asdDofw $@{}][\""),
+
     %%
     %% TODO: Check binaries, fun and floats...
     %%
 
     erts_debug:set_internal_state(available_internal_state, OAIS),
-    ?line ok = get(erlang_display_test).
+    ok = get(erlang_display_test).
 
 get_chnl_no(NodeName) when is_atom(NodeName) ->
     erts_debug:get_internal_state({channel_number, NodeName}).
@@ -182,20 +162,20 @@ get_chnl_no(NodeName) when is_atom(NodeName) ->
 chk_display(Term, Expect) when is_list(Expect) ->
     Dstr = erts_debug:display(Term),
     case Expect ++ io_lib:nl() of
-	Dstr ->
-	    ?t:format("Test of \"~p\" succeeded.~n"
-		      "  Expected and got: ~s~n",
-		      [Term, io_lib:write_string(Dstr)]);
-	DoExpect ->
-	    ?t:format("***~n"
-		      "*** Test of \"~p\" failed!~n"
-		      "***       Expected: ~s~n"
-		      "***            Got: ~s~n"
-		      "***~n",
-		      [Term,
-		       io_lib:write_string(DoExpect),
-		       io_lib:write_string(Dstr)]),
-	    put(erlang_display_test, failed)
+        Dstr ->
+            io:format("Test of \"~p\" succeeded.~n"
+                      "  Expected and got: ~s~n",
+                      [Term, io_lib:write_string(Dstr)]);
+        DoExpect ->
+            io:format("***~n"
+                      "*** Test of \"~p\" failed!~n"
+                      "***       Expected: ~s~n"
+                      "***            Got: ~s~n"
+                      "***~n",
+                      [Term,
+                       io_lib:write_string(DoExpect),
+                       io_lib:write_string(Dstr)]),
+            put(erlang_display_test, failed)
     end.
 
 chk_display({Term, Expect}) ->
@@ -204,20 +184,20 @@ chk_display({Term, Expect}) ->
 mk_pid_xstr({NodeName, Creation}, Number, Serial) ->
     Pid = mk_pid({NodeName, Creation}, Number, Serial),
     XStr = "<" ++ integer_to_list(get_chnl_no(NodeName))
-	++ "." ++ integer_to_list(Number)
-	++ "." ++ integer_to_list(Serial) ++ ">",
+    ++ "." ++ integer_to_list(Number)
+    ++ "." ++ integer_to_list(Serial) ++ ">",
     {Pid, XStr}.
 
 mk_port_xstr({NodeName, Creation}, Number) ->
     Port = mk_port({NodeName, Creation}, Number),
     XStr = "#Port<" ++ integer_to_list(get_chnl_no(NodeName))
-	++ "." ++ integer_to_list(Number) ++ ">",
+    ++ "." ++ integer_to_list(Number) ++ ">",
     {Port, XStr}.
 
 mk_ref_xstr({NodeName, Creation}, Numbers) ->
     Ref = mk_ref({NodeName, Creation}, Numbers),
     XStr = "#Ref<" ++ integer_to_list(get_chnl_no(NodeName))
-	++ ref_numbers_xstr(Numbers) ++ ">",
+    ++ ref_numbers_xstr(Numbers) ++ ">",
     {Ref, XStr}.
 
 ref_numbers_xstr([]) ->
@@ -240,18 +220,7 @@ ref_numbers_xstr([N | Ns]) ->
 %%
 %%
 
-default_testcase_impl(doc) -> [];
-default_testcase_impl(suite) -> [];
-default_testcase_impl(Config) when is_list(Config) -> ?line run_case(Config).
-
-init_per_testcase(Case, Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
-    [{testcase, Case}, {watchdog, Dog} |Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
+default_testcase_impl(Config) when is_list(Config) -> run_case(Config).
 
 -define(TESTPROG, "erl_print_tests").
 -define(FAILED_MARKER, $E,$P,$-,$T,$E,$S,$T,$-,$F,$A,$I,$L,$U,$R,$E).
@@ -260,62 +229,62 @@ end_per_testcase(_Case, Config) ->
 -define(PID_MARKER, $E,$P,$-,$T,$E,$S,$T,$-,$P,$I,$D).
 
 port_prog_killer(EProc, OSProc) when is_pid(EProc), is_list(OSProc) ->
-    ?line process_flag(trap_exit, true),
-    ?line Ref = erlang:monitor(process, EProc),
-    ?line receive
-	      {'DOWN', Ref, _, _, Reason} when is_tuple(Reason),
-					       element(1, Reason)
-					       == timetrap_timeout ->
-		  ?line Cmd = "kill -9 " ++ OSProc,
-		  ?line ?t:format("Test case timed out. "
-				  "Trying to kill port program.~n"
-				  "  Executing: ~p~n", [Cmd]),
-		  ?line case os:cmd(Cmd) of
-			    [] ->
-				ok;
-			    OsCmdRes ->
-				?line ?t:format("             ~s", [OsCmdRes])
-			end;
-	      {'DOWN', Ref, _, _, _} ->
-		  %% OSProc is assumed to have terminated by itself
-		  ?line ok 
-	  end.
+    process_flag(trap_exit, true),
+    Ref = erlang:monitor(process, EProc),
+    receive
+        {'DOWN', Ref, _, _, Reason} when is_tuple(Reason),
+                                         element(1, Reason)
+                                         == timetrap_timeout ->
+            Cmd = "kill -9 " ++ OSProc,
+            io:format("Test case timed out. "
+                      "Trying to kill port program.~n"
+                      "  Executing: ~p~n", [Cmd]),
+            case os:cmd(Cmd) of
+                [] ->
+                    ok;
+                OsCmdRes ->
+                    io:format("             ~s", [OsCmdRes])
+            end;
+        {'DOWN', Ref, _, _, _} ->
+            %% OSProc is assumed to have terminated by itself
+            ok
+    end.
 
 get_line(_Port, eol, Data) ->
-    ?line Data;
+    Data;
 get_line(Port, noeol, Data) ->
-    ?line receive
-	      {Port, {data, {Flag, NextData}}} ->
-		  ?line get_line(Port, Flag, Data ++ NextData);
-	      {Port, eof} ->
-		  ?line ?t:fail(port_prog_unexpectedly_closed)
-	  end.
+    receive
+        {Port, {data, {Flag, NextData}}} ->
+            get_line(Port, Flag, Data ++ NextData);
+        {Port, eof} ->
+            ct:fail(port_prog_unexpectedly_closed)
+    end.
 
 read_case_data(Port, TestCase) ->
-    ?line receive
-	      {Port, {data, {eol, [?SUCCESS_MARKER]}}} ->
-		  ?line ok;
-	      {Port, {data, {Flag, [?SUCCESS_MARKER | CommentStart]}}} ->
-		  ?line {comment, get_line(Port, Flag, CommentStart)};
-	      {Port, {data, {Flag, [?SKIPPED_MARKER | CommentStart]}}} ->
-		  ?line {skipped, get_line(Port, Flag, CommentStart)};
-	      {Port, {data, {Flag, [?FAILED_MARKER | ReasonStart]}}} ->
-		  ?line ?t:fail(get_line(Port, Flag, ReasonStart));
-	      {Port, {data, {eol, [?PID_MARKER | PidStr]}}} ->
-		  ?line ?t:format("Port program pid: ~s~n", [PidStr]),
-		  ?line CaseProc = self(),
-		  ?line _ = list_to_integer(PidStr), % Sanity check
-		  spawn_opt(fun () ->
-				    port_prog_killer(CaseProc, PidStr)
-			    end,
-			    [{priority, max}, link]),
-		  read_case_data(Port, TestCase);
-	      {Port, {data, {Flag, LineStart}}} ->
-		  ?line ?t:format("~s~n", [get_line(Port, Flag, LineStart)]),
-		  read_case_data(Port, TestCase);
-	      {Port, eof} ->
-		  ?line ?t:fail(port_prog_unexpectedly_closed)
-	  end.
+    receive
+        {Port, {data, {eol, [?SUCCESS_MARKER]}}} ->
+            ok;
+        {Port, {data, {Flag, [?SUCCESS_MARKER | CommentStart]}}} ->
+            {comment, get_line(Port, Flag, CommentStart)};
+        {Port, {data, {Flag, [?SKIPPED_MARKER | CommentStart]}}} ->
+            {skipped, get_line(Port, Flag, CommentStart)};
+        {Port, {data, {Flag, [?FAILED_MARKER | ReasonStart]}}} ->
+            ct:fail(get_line(Port, Flag, ReasonStart));
+        {Port, {data, {eol, [?PID_MARKER | PidStr]}}} ->
+            io:format("Port program pid: ~s~n", [PidStr]),
+            CaseProc = self(),
+            _ = list_to_integer(PidStr), % Sanity check
+            spawn_opt(fun () ->
+                              port_prog_killer(CaseProc, PidStr)
+                      end,
+                      [{priority, max}, link]),
+            read_case_data(Port, TestCase);
+        {Port, {data, {Flag, LineStart}}} ->
+            io:format("~s~n", [get_line(Port, Flag, LineStart)]),
+            read_case_data(Port, TestCase);
+        {Port, eof} ->
+            ct:fail(port_prog_unexpectedly_closed)
+    end.
 
 run_case(Config) ->
     run_case(Config, "").
@@ -324,27 +293,27 @@ run_case(Config, TestArgs) ->
     run_case(Config, TestArgs, fun (_Port) -> ok end).
 
 run_case(Config, TestArgs, Fun) ->
-    Test = atom_to_list(?config(testcase, Config)),
-    TestProg = filename:join([?config(data_dir, Config),
-			      ?TESTPROG
-			      ++ "."
-			      ++ atom_to_list(erlang:system_info(threads))]),
+    Test = atom_to_list(proplists:get_value(testcase, Config)),
+    TestProg = filename:join([proplists:get_value(data_dir, Config),
+                              ?TESTPROG
+                              ++ "."
+                              ++ atom_to_list(erlang:system_info(threads))]),
     Cmd = TestProg ++ " " ++ Test ++ " " ++ TestArgs,
     case catch open_port({spawn, Cmd}, [stream,
-					use_stdio,
-					stderr_to_stdout,
-					eof,
-					{line, 1024}]) of
-	Port when is_port(Port) ->
-	    ?line Fun(Port),
-	    ?line CaseResult = read_case_data(Port, Test),
-	    ?line receive
-		      {Port, eof} ->
-			  ?line ok
-		  end,
-	    ?line CaseResult;
-	Error ->
-	    ?line ?t:fail({open_port_failed, Error})
+                                        use_stdio,
+                                        stderr_to_stdout,
+                                        eof,
+                                        {line, 1024}]) of
+        Port when is_port(Port) ->
+            Fun(Port),
+            CaseResult = read_case_data(Port, Test),
+            receive
+                {Port, eof} ->
+                    ok
+            end,
+            CaseResult;
+        Error ->
+            ct:fail({open_port_failed, Error})
     end.
 
 
@@ -382,80 +351,80 @@ mk_pid({NodeName, Creation}, Number, Serial) when is_atom(NodeName) ->
     mk_pid({atom_to_list(NodeName), Creation}, Number, Serial);
 mk_pid({NodeName, Creation}, Number, Serial) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?PID_EXT,
-					      ?ATOM_EXT,
-					      uint16_be(length(NodeName)),
-					      NodeName,
-					      uint32_be(Number),
-					      uint32_be(Serial),
-					      uint8(Creation)])) of
-	Pid when is_pid(Pid) ->
-	    Pid;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_pid, [{NodeName, Creation}, Number, Serial]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?PID_EXT,
+                                              ?ATOM_EXT,
+                                              uint16_be(length(NodeName)),
+                                              NodeName,
+                                              uint32_be(Number),
+                                              uint32_be(Serial),
+                                              uint8(Creation)])) of
+        Pid when is_pid(Pid) ->
+            Pid;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_pid, [{NodeName, Creation}, Number, Serial]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end.
 
 mk_port({NodeName, Creation}, Number) when is_atom(NodeName) ->
     mk_port({atom_to_list(NodeName), Creation}, Number);
 mk_port({NodeName, Creation}, Number) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?PORT_EXT,
-					      ?ATOM_EXT,
-					      uint16_be(length(NodeName)),
-					      NodeName,
-					      uint32_be(Number),
-					      uint8(Creation)])) of
-	Port when is_port(Port) ->
-	    Port;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_port, [{NodeName, Creation}, Number]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?PORT_EXT,
+                                              ?ATOM_EXT,
+                                              uint16_be(length(NodeName)),
+                                              NodeName,
+                                              uint32_be(Number),
+                                              uint8(Creation)])) of
+        Port when is_port(Port) ->
+            Port;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_port, [{NodeName, Creation}, Number]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end.
 
 mk_ref({NodeName, Creation}, Numbers) when is_atom(NodeName),
-					   is_integer(Creation),
-					   is_list(Numbers) ->
+                                           is_integer(Creation),
+                                           is_list(Numbers) ->
     mk_ref({atom_to_list(NodeName), Creation}, Numbers);
 mk_ref({NodeName, Creation}, [Number]) when is_list(NodeName),
-					    is_integer(Creation),
-					    is_integer(Number) ->
+                                            is_integer(Creation),
+                                            is_integer(Number) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?REFERENCE_EXT,
-					      ?ATOM_EXT,
-					      uint16_be(length(NodeName)),
-					      NodeName,
-					      uint32_be(Number),
-					      uint8(Creation)])) of
-	Ref when is_reference(Ref) ->
-	    Ref;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_ref, [{NodeName, Creation}, [Number]]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?REFERENCE_EXT,
+                                              ?ATOM_EXT,
+                                              uint16_be(length(NodeName)),
+                                              NodeName,
+                                              uint32_be(Number),
+                                              uint8(Creation)])) of
+        Ref when is_reference(Ref) ->
+            Ref;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_ref, [{NodeName, Creation}, [Number]]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end;
 mk_ref({NodeName, Creation}, Numbers) when is_list(NodeName),
-					   is_integer(Creation),
-					   is_list(Numbers) ->
+                                           is_integer(Creation),
+                                           is_list(Numbers) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?NEW_REFERENCE_EXT,
-					      uint16_be(length(Numbers)),
-					      ?ATOM_EXT,
-					      uint16_be(length(NodeName)),
-					      NodeName,
-					      uint8(Creation),
-					      lists:map(fun (N) ->
-								uint32_be(N)
-							end,
-							Numbers)])) of
-	Ref when is_reference(Ref) ->
-	    Ref;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_ref, [{NodeName, Creation}, Numbers]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?NEW_REFERENCE_EXT,
+                                              uint16_be(length(Numbers)),
+                                              ?ATOM_EXT,
+                                              uint16_be(length(NodeName)),
+                                              NodeName,
+                                              uint8(Creation),
+                                              lists:map(fun (N) ->
+                                                                uint32_be(N)
+                                                        end,
+                                                        Numbers)])) of
+        Ref when is_reference(Ref) ->
+            Ref;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_ref, [{NodeName, Creation}, Numbers]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end.
 
 my_cre() -> erlang:system_info(creation).
diff --git a/erts/test/erlc_SUITE.erl b/erts/test/erlc_SUITE.erl
index c21064fd3f..0750bf2836 100644
--- a/erts/test/erlc_SUITE.erl
+++ b/erts/test/erlc_SUITE.erl
@@ -22,12 +22,12 @@
 %% Tests the erlc command by compiling various types of files.
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, compile_erl/1,
-	 compile_yecc/1, compile_script/1,
-	 compile_mib/1, good_citizen/1, deep_cwd/1, arg_overflow/1,
-	 make_dep_options/1]).
+         init_per_group/2,end_per_group/2, compile_erl/1,
+         compile_yecc/1, compile_script/1,
+         compile_mib/1, good_citizen/1, deep_cwd/1, arg_overflow/1,
+         make_dep_options/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -57,113 +57,109 @@ end_per_group(_GroupName, Config) ->
 %% Tests that compiling Erlang source code works.
 
 compile_erl(Config) when is_list(Config) ->
-    ?line {SrcDir, OutDir, Cmd} = get_cmd(Config),
-    ?line FileName = filename:join(SrcDir, "erl_test_ok.erl"),
+    {SrcDir, OutDir, Cmd} = get_cmd(Config),
+    FileName = filename:join(SrcDir, "erl_test_ok.erl"),
 
     %% By default, warnings are now turned on.
-    ?line run(Config, Cmd, FileName, "",
-	      ["Warning: function foo/0 is unused\$",
-	       "_OK_"]),
+    run(Config, Cmd, FileName, "",
+        ["Warning: function foo/0 is unused\$", "_OK_"]),
 
     %% Test that the compiled file is where it should be,
     %% and that it is runnable.
 
-    ?line {module, erl_test_ok} = code:load_abs(filename:join(OutDir,
-							      "erl_test_ok")),
-    ?line 42 = erl_test_ok:shoe_size(#person{shoe_size=42}),
-    ?line code:purge(erl_test_ok),
+    {module, erl_test_ok} = code:load_abs(filename:join(OutDir, "erl_test_ok")),
+    42 = erl_test_ok:shoe_size(#person{shoe_size=42}),
+    code:purge(erl_test_ok),
 
     %% Try disabling warnings.
 
-    ?line run(Config, Cmd, FileName, "-W0", ["_OK_"]),
+    run(Config, Cmd, FileName, "-W0", ["_OK_"]),
 
     %% Try treating warnings as errors.
 
-    ?line run(Config, Cmd, FileName, "-Werror",
-	      ["compile: warnings being treated as errors\$",
-	       "function foo/0 is unused\$",
-	       "_ERROR_"]),
+    run(Config, Cmd, FileName, "-Werror",
+        ["compile: warnings being treated as errors\$",
+         "function foo/0 is unused\$", "_ERROR_"]),
 
     %% Check a bad file.
 
-    ?line BadFile = filename:join(SrcDir, "erl_test_bad.erl"),
-    ?line run(Config, Cmd, BadFile, "", ["function non_existing/1 undefined\$",
-				 "_ERROR_"]),
+    BadFile = filename:join(SrcDir, "erl_test_bad.erl"),
+    run(Config, Cmd, BadFile, "", ["function non_existing/1 undefined\$",
+                                   "_ERROR_"]),
 
     ok.
 
 %% Test that compiling yecc source code works.
 
 compile_yecc(Config) when is_list(Config) ->
-    ?line {SrcDir, _, OutDir} = get_dirs(Config),
-    ?line Cmd = erlc() ++ " -o" ++ OutDir ++ " ",
-    ?line FileName = filename:join(SrcDir, "yecc_test_ok.yrl"),
-    ?line run(Config, Cmd, FileName, "-W0", ["_OK_"]),
-    ?line true = exists(filename:join(OutDir, "yecc_test_ok.erl")),
-
-    ?line BadFile = filename:join(SrcDir, "yecc_test_bad.yrl"),
-    ?line run(Config, Cmd, BadFile, "-W0", 
-	      ["rootsymbol form is not a nonterminal\$",
-               "undefined nonterminal: form\$",
-               "Nonterminals is missing\$",
-               "_ERROR_"]),
-    ?line exists(filename:join(OutDir, "yecc_test_ok.erl")),
-
+    {SrcDir, _, OutDir} = get_dirs(Config),
+    Cmd = erlc() ++ " -o" ++ OutDir ++ " ",
+    FileName = filename:join(SrcDir, "yecc_test_ok.yrl"),
+    run(Config, Cmd, FileName, "-W0", ["_OK_"]),
+    true = exists(filename:join(OutDir, "yecc_test_ok.erl")),
+
+    BadFile = filename:join(SrcDir, "yecc_test_bad.yrl"),
+    run(Config, Cmd, BadFile, "-W0",
+        ["rootsymbol form is not a nonterminal\$",
+         "undefined nonterminal: form\$",
+         "Nonterminals is missing\$",
+         "_ERROR_"]),
+    exists(filename:join(OutDir, "yecc_test_ok.erl")),
     ok.
 
 %% Test that compiling start scripts works.
 
 compile_script(Config) when is_list(Config) ->
-    ?line {SrcDir, OutDir, Cmd} = get_cmd(Config),
-    ?line FileName = filename:join(SrcDir, "start_ok.script"),
-    ?line run(Config, Cmd, FileName, "", ["_OK_"]),
-    ?line true = exists(filename:join(OutDir, "start_ok.boot")),
+    {SrcDir, OutDir, Cmd} = get_cmd(Config),
+    FileName = filename:join(SrcDir, "start_ok.script"),
+    run(Config, Cmd, FileName, "", ["_OK_"]),
+    true = exists(filename:join(OutDir, "start_ok.boot")),
 
-    ?line BadFile = filename:join(SrcDir, "start_bad.script"),
-    ?line run(Config, Cmd, BadFile, "", ["syntax error before:", "_ERROR_"]),
+    BadFile = filename:join(SrcDir, "start_bad.script"),
+    run(Config, Cmd, BadFile, "", ["syntax error before:", "_ERROR_"]),
     ok.
 
 %% Test that compiling SNMP mibs works.
 
 compile_mib(Config) when is_list(Config) ->
-    ?line {SrcDir, OutDir, Cmd} = get_cmd(Config),
-    ?line FileName = filename:join(SrcDir, "GOOD-MIB.mib"),
-    ?line run(Config, Cmd, FileName, "", ["_OK_"]),
-    ?line Output = filename:join(OutDir, "GOOD-MIB.bin"),
-    ?line true = exists(Output),
+    {SrcDir, OutDir, Cmd} = get_cmd(Config),
+    FileName = filename:join(SrcDir, "GOOD-MIB.mib"),
+    run(Config, Cmd, FileName, "", ["_OK_"]),
+    Output = filename:join(OutDir, "GOOD-MIB.bin"),
+    true = exists(Output),
 
     %% Try -W option.
 
-    ?line ok = file:delete(Output),
-    ?line run(Config, Cmd, FileName, "-W",
-	      ["_OK_"]),
-    ?line true = exists(Output),
+    ok = file:delete(Output),
+    run(Config, Cmd, FileName, "-W",
+        ["_OK_"]),
+    true = exists(Output),
 
     %% Try -W option and more verbose.
 
-    ?line ok = file:delete(Output),
-    ?line case test_server:os_type() of
-	      {unix,_} ->
-		  ?line run(Config, Cmd, FileName, "-W +'{verbosity,info}'",
-			    ["\\[GOOD-MIB[.]mib\\]\\[INF\\]: No accessfunction for 'sysDescr' => using default",
-			     "_OK_"]),
-		  ?line true = exists(Output),
-		  ?line ok = file:delete(Output);
-	      _ -> ok				%Don't bother -- too much work.
-	  end,
+    ok = file:delete(Output),
+    case test_server:os_type() of
+        {unix,_} ->
+            run(Config, Cmd, FileName, "-W +'{verbosity,info}'",
+                ["\\[GOOD-MIB[.]mib\\]\\[INF\\]: No accessfunction for 'sysDescr' => using default",
+                 "_OK_"]),
+            true = exists(Output),
+            ok = file:delete(Output);
+        _ -> ok				%Don't bother -- too much work.
+    end,
 
     %% Try a bad file.
 
-    ?line BadFile = filename:join(SrcDir, "BAD-MIB.mib"),
-    ?line run(Config, Cmd, BadFile, "",
-	      ["BAD-MIB.mib: 1: syntax error before: mibs\$",
-	       "compilation_failed_ERROR_"]),
+    BadFile = filename:join(SrcDir, "BAD-MIB.mib"),
+    run(Config, Cmd, BadFile, "",
+        ["BAD-MIB.mib: 1: syntax error before: mibs\$",
+         "compilation_failed_ERROR_"]),
 
     %% Make sure that no -I option works.
 
-    ?line NewCmd = erlc() ++ " -o" ++ OutDir ++ " ",
-    ?line run(Config, NewCmd, FileName, "", ["_OK_"]),
-    ?line true = exists(Output),
+    NewCmd = erlc() ++ " -o" ++ OutDir ++ " ",
+    run(Config, NewCmd, FileName, "", ["_OK_"]),
+    true = exists(Output),
 
     ok.
 
@@ -171,91 +167,91 @@ compile_mib(Config) when is_list(Config) ->
 %% shell script with redirected input).
 good_citizen(Config) when is_list(Config) ->
     case os:type() of
-	{unix, _} ->
-	    ?line PrivDir = ?config(priv_dir, Config),
-	    ?line Answer = filename:join(PrivDir, "answer"),
-	    ?line Script = filename:join(PrivDir, "test_script"),
-	    ?line Test = filename:join(PrivDir, "test.erl"),
-	    ?line S = ["#! /bin/sh\n", "erlc ", Test, "\n",
-		       "read reply\n", "echo $reply\n"],
-	    ?line ok = file:write_file(Script, S),
-	    ?line ok = file:write_file(Test, "-module(test).\n"),
-	    ?line Cmd = "echo y | sh " ++ Script ++ " > " ++ Answer,
-	    ?line os:cmd(Cmd),
-	    ?line {ok, Answer0} = file:read_file(Answer),
-	    ?line [$y|_] = binary_to_list(Answer0),
-	    ok;
-	_ ->
-	    {skip, "Unix specific"}
+        {unix, _} ->
+            PrivDir = proplists:get_value(priv_dir, Config),
+            Answer = filename:join(PrivDir, "answer"),
+            Script = filename:join(PrivDir, "test_script"),
+            Test = filename:join(PrivDir, "test.erl"),
+            S = ["#! /bin/sh\n", "erlc ", Test, "\n",
+                 "read reply\n", "echo $reply\n"],
+            ok = file:write_file(Script, S),
+            ok = file:write_file(Test, "-module(test).\n"),
+            Cmd = "echo y | sh " ++ Script ++ " > " ++ Answer,
+            os:cmd(Cmd),
+            {ok, Answer0} = file:read_file(Answer),
+            [$y|_] = binary_to_list(Answer0),
+            ok;
+        _ ->
+            {skip, "Unix specific"}
     end.
 
 %% Make sure that compiling an Erlang module deep down in
 %% in a directory with more than 255 characters works.
 deep_cwd(Config) when is_list(Config) ->
     case os:type() of
-	{unix, _} ->
-	    PrivDir = ?config(priv_dir, Config),
-	    deep_cwd_1(PrivDir);
-	_ ->
-	    {skip, "Only a problem on Unix"}
+        {unix, _} ->
+            PrivDir = proplists:get_value(priv_dir, Config),
+            deep_cwd_1(PrivDir);
+        _ ->
+            {skip, "Only a problem on Unix"}
     end.
 
 deep_cwd_1(PrivDir) ->
-    ?line DeepDir0 = filename:join(PrivDir, lists:duplicate(128, $a)),
-    ?line DeepDir = filename:join(DeepDir0, lists:duplicate(128, $b)),
-    ?line ok = file:make_dir(DeepDir0),
-    ?line ok = file:make_dir(DeepDir),
-    ?line ok = file:set_cwd(DeepDir),
-    ?line ok = file:write_file("test.erl", "-module(test).\n\n"),
-    ?line io:format("~s\n", [os:cmd("erlc test.erl")]),
-    ?line true = filelib:is_file("test.beam"),
+    DeepDir0 = filename:join(PrivDir, lists:duplicate(128, $a)),
+    DeepDir = filename:join(DeepDir0, lists:duplicate(128, $b)),
+    ok = file:make_dir(DeepDir0),
+    ok = file:make_dir(DeepDir),
+    ok = file:set_cwd(DeepDir),
+    ok = file:write_file("test.erl", "-module(test).\n\n"),
+    io:format("~s\n", [os:cmd("erlc test.erl")]),
+    true = filelib:is_file("test.beam"),
     ok.
 
 %% Test that a large number of command line switches does not
 %% overflow the argument buffer
 arg_overflow(Config) when is_list(Config) ->
-    ?line {SrcDir, _OutDir, Cmd} = get_cmd(Config),
-    ?line FileName = filename:join(SrcDir, "erl_test_ok.erl"),
+    {SrcDir, _OutDir, Cmd} = get_cmd(Config),
+    FileName = filename:join(SrcDir, "erl_test_ok.erl"),
     %% Each -D option will be expanded to three arguments when
     %% invoking 'erl'.
-    ?line NumDOptions = num_d_options(),
-    ?line Args = lists:flatten([ ["-D", integer_to_list(N, 36), "=1 "] ||
-            N <- lists:seq(1, NumDOptions) ]),
-    ?line run(Config, Cmd, FileName, Args,
-	      ["Warning: function foo/0 is unused\$",
-	       "_OK_"]),
+    NumDOptions = num_d_options(),
+    Args = lists:flatten([ ["-D", integer_to_list(N, 36), "=1 "] ||
+                           N <- lists:seq(1, NumDOptions) ]),
+    run(Config, Cmd, FileName, Args,
+        ["Warning: function foo/0 is unused\$",
+         "_OK_"]),
     ok.
 
 num_d_options() ->
     case {os:type(),os:version()} of
-	{{win32,_},_} ->
-	    %% The maximum size of a command line in the command
-	    %% shell on Windows is 8191 characters.
-	    %% Each -D option is expanded to "@dv NN 1", i.e.
-	    %% 8 characters. (Numbers up to 1295 can be expressed
-	    %% as two 36-base digits.)
-	    1000;
-	{{unix,linux},Version} when Version < {2,6,23} ->
-	    %% On some older 64-bit versions of Linux, the maximum number
-	    %% of arguments is 16383.
-	    %% See: http://www.in-ulm.de/~mascheck/various/argmax/
-	    5440;
-	{{unix,darwin},{Major,_,_}} when Major >= 11 ->
-	    %% "getconf ARG_MAX" still reports 262144 (as in previous
-	    %% version of MacOS X), but the useful space seem to have
-	    %% shrunk significantly (or possibly the number of arguments).
-	    %% 7673
-	    7500;
-	{_,_} ->
-	    12000
+        {{win32,_},_} ->
+            %% The maximum size of a command line in the command
+            %% shell on Windows is 8191 characters.
+            %% Each -D option is expanded to "@dv NN 1", i.e.
+            %% 8 characters. (Numbers up to 1295 can be expressed
+            %% as two 36-base digits.)
+            1000;
+        {{unix,linux},Version} when Version < {2,6,23} ->
+            %% On some older 64-bit versions of Linux, the maximum number
+            %% of arguments is 16383.
+            %% See: http://www.in-ulm.de/~mascheck/various/argmax/
+            5440;
+        {{unix,darwin},{Major,_,_}} when Major >= 11 ->
+            %% "getconf ARG_MAX" still reports 262144 (as in previous
+            %% version of MacOS X), but the useful space seem to have
+            %% shrunk significantly (or possibly the number of arguments).
+            %% 7673
+            7500;
+        {_,_} ->
+            12000
     end.
 
 erlc() ->
     case os:find_executable("erlc") of
-	false ->
-	    test_server:fail("Can't find erlc");
-	Erlc ->
-	    "\"" ++ Erlc ++ "\""
+        false ->
+            ct:fail("Can't find erlc");
+        Erlc ->
+            "\"" ++ Erlc ++ "\""
     end.
 
 make_dep_options(Config) ->
@@ -264,30 +260,30 @@ make_dep_options(Config) ->
 
 
     DepRE = ["/erl_test_ok[.]beam: \\\\$",
-	     "/system_test/erlc_SUITE_data/src/erl_test_ok[.]erl \\\\$",
-	     "/system_test/erlc_SUITE_data/include/erl_test[.]hrl$",
-	     "_OK_"],
+             "/system_test/erlc_SUITE_data/src/erl_test_ok[.]erl \\\\$",
+             "/system_test/erlc_SUITE_data/include/erl_test[.]hrl$",
+             "_OK_"],
 
     DepRETarget =
-	["^target: \\\\$",
-	 "/system_test/erlc_SUITE_data/src/erl_test_ok[.]erl \\\\$",
-	 "/system_test/erlc_SUITE_data/include/erl_test[.]hrl$",
-	 "_OK_"],
+    ["^target: \\\\$",
+     "/system_test/erlc_SUITE_data/src/erl_test_ok[.]erl \\\\$",
+     "/system_test/erlc_SUITE_data/include/erl_test[.]hrl$",
+     "_OK_"],
 
     DepREMP =
-	["/erl_test_ok[.]beam: \\\\$",
-	 "/system_test/erlc_SUITE_data/src/erl_test_ok[.]erl \\\\$",
-	 "/system_test/erlc_SUITE_data/include/erl_test[.]hrl$",
-	 [],
-	 "/system_test/erlc_SUITE_data/include/erl_test.hrl:$",
-	 "_OK_"],
+    ["/erl_test_ok[.]beam: \\\\$",
+     "/system_test/erlc_SUITE_data/src/erl_test_ok[.]erl \\\\$",
+     "/system_test/erlc_SUITE_data/include/erl_test[.]hrl$",
+     [],
+     "/system_test/erlc_SUITE_data/include/erl_test.hrl:$",
+     "_OK_"],
 
     DepREMissing =
-	["/erl_test_missing_header[.]beam: \\\\$",
-	 "/system_test/erlc_SUITE_data/src/erl_test_missing_header[.]erl \\\\$",
-	 "/system_test/erlc_SUITE_data/include/erl_test[.]hrl \\\\$",
-	 "missing.hrl$",
-	 "_OK_"],
+    ["/erl_test_missing_header[.]beam: \\\\$",
+     "/system_test/erlc_SUITE_data/src/erl_test_missing_header[.]erl \\\\$",
+     "/system_test/erlc_SUITE_data/include/erl_test[.]hrl \\\\$",
+     "missing.hrl$",
+     "_OK_"],
 
     %% Test plain -M
     run(Config, Cmd, FileName, "-M", DepRE),
@@ -309,7 +305,7 @@ make_dep_options(Config) ->
     %% Test -MF File -MT Target
     TargetDepFile = filename:join(OutDir, "target.deps"),
     run(Config, Cmd, FileName, "-MF "++TargetDepFile++" -MT target",
-	["_OK_"]),
+        ["_OK_"]),
     {ok,TargetBin} = file:read_file(TargetDepFile),
     verify_result(binary_to_list(TargetBin)++["_OK_"], DepRETarget),
 
@@ -358,33 +354,33 @@ split([], Current, Lines) ->
 
 match_messages([Msg|Rest1], [Regexp|Rest2]) ->
     case re:run(Msg, Regexp, [{capture,none}, unicode]) of
-	match ->
-	    ok;
-	nomatch ->
-	    io:format("Not matching: ~s\n", [Msg]),
-	    io:format("Regexp      : ~s\n", [Regexp]),
-	    test_server:fail(message_mismatch)
+        match ->
+            ok;
+        nomatch ->
+            io:format("Not matching: ~s\n", [Msg]),
+            io:format("Regexp      : ~s\n", [Regexp]),
+            ct:fail(message_mismatch)
     end,
     match_messages(Rest1, Rest2);
 match_messages([], [Expect|Rest]) ->
-    test_server:fail({too_few_messages, [Expect|Rest]});
+    ct:fail({too_few_messages, [Expect|Rest]});
 match_messages([Msg|Rest], []) ->
-    test_server:fail({too_many_messages, [Msg|Rest]});
+    ct:fail({too_many_messages, [Msg|Rest]});
 match_messages([], []) ->
     ok.
 
 get_cmd(Cfg) ->
-    ?line {SrcDir, IncDir, OutDir} = get_dirs(Cfg),
-    ?line Cmd = erlc() ++ " -I" ++ IncDir ++ " -o" ++ OutDir ++ " ",
+    {SrcDir, IncDir, OutDir} = get_dirs(Cfg),
+    Cmd = erlc() ++ " -I" ++ IncDir ++ " -o" ++ OutDir ++ " ",
     {SrcDir, OutDir, Cmd}.
 
 get_dirs(Cfg) ->
-    ?line DataDir = ?config(data_dir, Cfg),
-    ?line PrivDir = ?config(priv_dir, Cfg),
-    ?line SrcDir = filename:join(DataDir, "src"),
-    ?line IncDir = filename:join(DataDir, "include"),
+    DataDir = proplists:get_value(data_dir, Cfg),
+    PrivDir = proplists:get_value(priv_dir, Cfg),
+    SrcDir = filename:join(DataDir, "src"),
+    IncDir = filename:join(DataDir, "include"),
     {SrcDir, IncDir, PrivDir}.
-    
+
 exists(Name) ->
     filelib:is_file(Name).
 
@@ -396,7 +392,7 @@ exists(Name) ->
 %% a non-zero exit status.
 
 run_command(Config, Cmd) ->
-    TmpDir = filename:join(?config(priv_dir, Config), "tmp"),
+    TmpDir = filename:join(proplists:get_value(priv_dir, Config), "tmp"),
     file:make_dir(TmpDir),
     {RunFile, Run, Script} = run_command(TmpDir, os:type(), Cmd),
     ok = file:write_file(filename:join(TmpDir, RunFile), unicode:characters_to_binary(Script)),
@@ -405,7 +401,7 @@ run_command(Config, Cmd) ->
 run_command(Dir, {win32, _}, Cmd) ->
     BatchFile = filename:join(Dir, "run.bat"),
     Run = re:replace(filename:rootname(BatchFile), "/", "\\",
-		     [global,{return,list}]),
+                     [global,{return,list}]),
     {BatchFile,
      Run,
      ["@echo off\r\n",
@@ -426,5 +422,4 @@ run_command(Dir, {unix, _}, Cmd) ->
       "  *) echo '_ERROR_';;\n",
       "esac\n"]};
 run_command(_Dir, Other, _Cmd) ->
-    M = io_lib:format("Don't know how to test exit code for ~p", [Other]),
-    test_server:fail(lists:flatten(M)).
+    ct:fail("Don't know how to test exit code for ~p", [Other]).
diff --git a/erts/test/erlexec_SUITE.erl b/erts/test/erlexec_SUITE.erl
index 9279872d25..a80d3b43a5 100644
--- a/erts/test/erlexec_SUITE.erl
+++ b/erts/test/erlexec_SUITE.erl
@@ -27,71 +27,46 @@
 %%%-------------------------------------------------------------------
 -module(erlexec_SUITE).
 
+-export([all/0, suite/0, init_per_testcase/2, end_per_testcase/2]).
 
-%-define(line_trace, 1).
+-export([args_file/1, evil_args_file/1, env/1, args_file_env/1,
+         otp_7461/1, otp_7461_remote/1, otp_8209/1,
+         zdbbl_dist_buf_busy_limit/1]).
 
--define(DEFAULT_TIMEOUT, ?t:minutes(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]).
-
--export([args_file/1, evil_args_file/1, env/1, args_file_env/1, otp_7461/1, otp_7461_remote/1, otp_8209/1, zdbbl_dist_buf_busy_limit/1]).
-
--include_lib("test_server/include/test_server.hrl").
-    
+-include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(Case, Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
     SavedEnv = save_env(),
-    [{testcase, Case}, {watchdog, Dog}, {erl_flags_env, SavedEnv} |Config].
+    [{testcase, Case},{erl_flags_env, SavedEnv}|Config].
 
 end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    SavedEnv = ?config(erl_flags_env, Config),
+    SavedEnv = proplists:get_value(erl_flags_env, Config),
     restore_env(SavedEnv),
     cleanup_nodes(),
-    ?t:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() -> 
     [args_file, evil_args_file, env, args_file_env,
      otp_7461, otp_8209, zdbbl_dist_buf_busy_limit].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-otp_8209(doc) ->
-    ["Test that plain first argument does not "
-     "destroy -home switch [OTP-8209]"];
-otp_8209(suite) ->
-    [];
+%% Test that plain first argument does not
+%% destroy -home switch [OTP-8209]
 otp_8209(Config) when is_list(Config) ->
-    ?line {ok,[[PName]]} = init:get_argument(progname),
-    ?line SNameS = "erlexec_test_01",
-    ?line SName = list_to_atom(SNameS++"@"++
+    {ok,[[PName]]} = init:get_argument(progname),
+    SNameS = "erlexec_test_01",
+    SName = list_to_atom(SNameS++"@"++
 			 hd(tl(string:tokens(atom_to_list(node()),"@")))),
-    ?line Cmd = PName ++ " dummy_param -sname "++SNameS++" -setcookie "++
+    Cmd = PName ++ " dummy_param -sname "++SNameS++" -setcookie "++
 	atom_to_list(erlang:get_cookie()),
-    ?line open_port({spawn,Cmd},[]),
-    ?line pong = loop_ping(SName,40),
-    ?line {ok,[[_]]} = rpc:call(SName,init,get_argument,[home]),
-    ?line ["dummy_param"] = rpc:call(SName,init,get_plain_arguments,[]),
-    ?line ok = cleanup_nodes(),
+    open_port({spawn,Cmd},[]),
+    pong = loop_ping(SName,40),
+    {ok,[[_]]} = rpc:call(SName,init,get_argument,[home]),
+    ["dummy_param"] = rpc:call(SName,init,get_plain_arguments,[]),
+    ok = cleanup_nodes(),
     ok.
 
 cleanup_nodes() ->
@@ -123,17 +98,14 @@ loop_ping(Node,N) ->
 	    pong
     end.
 
-args_file(doc) -> [];
-args_file(suite) -> [];
 args_file(Config) when is_list(Config) ->
-    ?line AFN1 = privfile("1", Config),
-    ?line AFN2 = privfile("2", Config),
-    ?line AFN3 = privfile("3", Config),
-    ?line AFN4 = privfile("4", Config),
-    ?line AFN5 = privfile("5", Config),
-    ?line AFN6 = privfile("6", Config),
-    ?line write_file(AFN1,
-		     "-MiscArg2~n"
+    AFN1 = privfile("1", Config),
+    AFN2 = privfile("2", Config),
+    AFN3 = privfile("3", Config),
+    AFN4 = privfile("4", Config),
+    AFN5 = privfile("5", Config),
+    AFN6 = privfile("6", Config),
+    write_file(AFN1, "-MiscArg2~n"
 		     "# a comment +\\#1000~n"
 		     "+\\#200 # another comment~n"
 		     "~n"
@@ -145,7 +117,7 @@ args_file(Config) when is_list(Config) ->
 		     "+\\#700~n"
 		     "-extra +XtraArg6~n",
 	       [AFN2]),
-    ?line write_file(AFN2,
+    write_file(AFN2,
 		     "-MiscArg3~n"
 		     "+\\#300~n"
 		     "-args_file ~s~n"
@@ -156,61 +128,59 @@ args_file(Config) when is_list(Config) ->
 		     "-args_file ~s~n"
 		     "-extra +XtraArg5~n",
 		     [AFN3, AFN4, AFN5, AFN6]),
-    ?line write_file(AFN3,
+    write_file(AFN3,
 		     "# comment again~n"
 		     " -MiscArg4 +\\#400 -extra +XtraArg1"),
-    ?line write_file(AFN4,
+    write_file(AFN4,
 		     " -MiscArg6 +\\#600 -extra +XtraArg2~n"
 		     "+XtraArg3~n"
 		     "+XtraArg4~n"
 		     "# comment again~n"),
-    ?line write_file(AFN5, ""),
-    ?line write_file(AFN6, "-extra # +XtraArg10~n"),
-    ?line CmdLine = "+#100 -MiscArg1 "
+    write_file(AFN5, ""),
+    write_file(AFN6, "-extra # +XtraArg10~n"),
+    CmdLine = "+#100 -MiscArg1 "
 	++ "-args_file " ++ AFN1
 	++ " +#800 -MiscArg8 -extra +XtraArg7 +XtraArg8",
-    ?line {Emu, Misc, Extra} = emu_args(CmdLine),
-    ?line verify_args(["-#100", "-#200", "-#300", "-#400",
+    {Emu, Misc, Extra} = emu_args(CmdLine),
+    verify_args(["-#100", "-#200", "-#300", "-#400",
 		       "-#500", "-#600", "-#700", "-#800"], Emu),
-    ?line verify_args(["-MiscArg1", "-MiscArg2", "-MiscArg3", "-MiscArg4",
+    verify_args(["-MiscArg1", "-MiscArg2", "-MiscArg3", "-MiscArg4",
 		       "-MiscArg5", "-MiscArg6", "-MiscArg7", "-MiscArg8"],
 		      Misc),
-    ?line verify_args(["+XtraArg1", "+XtraArg2", "+XtraArg3", "+XtraArg4",
+    verify_args(["+XtraArg1", "+XtraArg2", "+XtraArg3", "+XtraArg4",
 		       "+XtraArg5", "+XtraArg6", "+XtraArg7", "+XtraArg8"],
 		      Extra),
-    ?line verify_not_args(["-MiscArg10", "-#1000", "+XtraArg10",
+    verify_not_args(["-MiscArg10", "-#1000", "+XtraArg10",
 			   "-MiscArg1", "-MiscArg2", "-MiscArg3", "-MiscArg4",
 			   "-MiscArg5", "-MiscArg6", "-MiscArg7", "-MiscArg8",
 			   "+XtraArg1", "+XtraArg2", "+XtraArg3", "+XtraArg4",
 			   "+XtraArg5", "+XtraArg6", "+XtraArg7", "+XtraArg8"],
 			  Emu),
-    ?line verify_not_args(["-MiscArg10", "-#1000", "+XtraArg10",
+    verify_not_args(["-MiscArg10", "-#1000", "+XtraArg10",
 			   "-#100", "-#200", "-#300", "-#400",
 			   "-#500", "-#600", "-#700", "-#800",
 			   "+XtraArg1", "+XtraArg2", "+XtraArg3", "+XtraArg4",
 			   "+XtraArg5", "+XtraArg6", "+XtraArg7", "+XtraArg8"],
 			  Misc),
-    ?line verify_not_args(["-MiscArg10", "-#1000", "+XtraArg10",
+    verify_not_args(["-MiscArg10", "-#1000", "+XtraArg10",
 			   "-#100", "-#200", "-#300", "-#400",
 			   "-#500", "-#600", "-#700", "-#800",
 			   "-MiscArg1", "-MiscArg2", "-MiscArg3", "-MiscArg4",
 			   "-MiscArg5", "-MiscArg6", "-MiscArg7", "-MiscArg8"],
 			  Extra),
-    ?line ok.
+    ok.
 
-evil_args_file(doc) -> [];
-evil_args_file(suite) -> [];
 evil_args_file(Config) when is_list(Config) ->
-    ?line Lim = 300,
-    ?line FNums = lists:seq(1, Lim),
+    Lim = 300,
+    FNums = lists:seq(1, Lim),
     lists:foreach(fun (End) when End == Lim ->
-			  ?line AFN = privfile(integer_to_list(End), Config),
-			  ?line write_file(AFN,
+			  AFN = privfile(integer_to_list(End), Config),
+			  write_file(AFN,
 					   "-MiscArg~p ",
 					   [End]);
 		      (I) ->
-			  ?line AFNX = privfile(integer_to_list(I), Config),
-			  ?line AFNY = privfile(integer_to_list(I+1), Config),
+			  AFNX = privfile(integer_to_list(I), Config),
+			  AFNY = privfile(integer_to_list(I+1), Config),
 			  {Frmt, Args} =
 			      case I rem 2 of
 				  0 ->
@@ -220,65 +190,59 @@ evil_args_file(Config) when is_list(Config) ->
 				      {"-MiscArg~p -args_file ~s",
 				       [I, AFNY]}
 			      end,
-			  ?line write_file(AFNX, Frmt, Args)
+			  write_file(AFNX, Frmt, Args)
 		  end,
 		  FNums),
-    ?line {_Emu, Misc, _Extra} = emu_args("-args_file "
+    {_Emu, Misc, _Extra} = emu_args("-args_file "
 					  ++ privfile("1", Config)),
-    ?line ANums = FNums
+    ANums = FNums
 	++ lists:reverse(lists:filter(fun (I) when I == Lim -> false;
 					  (I) when I rem 2 == 0 -> true;
 					  (_) -> false
 				      end, FNums)),
-    ?line verify_args(lists:map(fun (I) -> "-MiscArg"++integer_to_list(I) end,
+    verify_args(lists:map(fun (I) -> "-MiscArg"++integer_to_list(I) end,
 				ANums),
 		      Misc),
-    ?line ok.
+    ok.
 		      
 			  
 
-env(doc) -> [];
-env(suite) -> [];
 env(Config) when is_list(Config) ->
-    ?line os:putenv("ERL_AFLAGS", "-MiscArg1 +#100 -extra +XtraArg1 +XtraArg2"),
-    ?line CmdLine = "+#200 -MiscArg2 -extra +XtraArg3 +XtraArg4",
-    ?line os:putenv("ERL_FLAGS", "-MiscArg3 +#300 -extra +XtraArg5"),
-    ?line os:putenv("ERL_ZFLAGS", "-MiscArg4 +#400 -extra +XtraArg6"),
-    ?line {Emu, Misc, Extra} = emu_args(CmdLine),
-    ?line verify_args(["-#100", "-#200", "-#300", "-#400"], Emu),
-    ?line verify_args(["-MiscArg1", "-MiscArg2", "-MiscArg3", "-MiscArg4"],
+    os:putenv("ERL_AFLAGS", "-MiscArg1 +#100 -extra +XtraArg1 +XtraArg2"),
+    CmdLine = "+#200 -MiscArg2 -extra +XtraArg3 +XtraArg4",
+    os:putenv("ERL_FLAGS", "-MiscArg3 +#300 -extra +XtraArg5"),
+    os:putenv("ERL_ZFLAGS", "-MiscArg4 +#400 -extra +XtraArg6"),
+    {Emu, Misc, Extra} = emu_args(CmdLine),
+    verify_args(["-#100", "-#200", "-#300", "-#400"], Emu),
+    verify_args(["-MiscArg1", "-MiscArg2", "-MiscArg3", "-MiscArg4"],
 		      Misc),
-    ?line verify_args(["+XtraArg1", "+XtraArg2", "+XtraArg3", "+XtraArg4",
+    verify_args(["+XtraArg1", "+XtraArg2", "+XtraArg3", "+XtraArg4",
 		       "+XtraArg5", "+XtraArg6"],
 		      Extra),
-    ?line ok.
+    ok.
 
-args_file_env(doc) -> [];
-args_file_env(suite) -> [];
 args_file_env(Config) when is_list(Config) ->
-    ?line AFN1 = privfile("1", Config),
-    ?line AFN2 = privfile("2", Config),
-    ?line write_file(AFN1, "-MiscArg2 +\\#200 -extra +XtraArg1"),
-    ?line write_file(AFN2, "-MiscArg3 +\\#400 -extra +XtraArg3"),
-    ?line os:putenv("ERL_AFLAGS",
+    AFN1 = privfile("1", Config),
+    AFN2 = privfile("2", Config),
+    write_file(AFN1, "-MiscArg2 +\\#200 -extra +XtraArg1"),
+    write_file(AFN2, "-MiscArg3 +\\#400 -extra +XtraArg3"),
+    os:putenv("ERL_AFLAGS",
 		    "-MiscArg1 +#100 -args_file "++AFN1++ " -extra +XtraArg2"),
-    ?line CmdLine = "+#300 -args_file "++AFN2++" -MiscArg4 -extra +XtraArg4",
-    ?line os:putenv("ERL_FLAGS", "-MiscArg5 +#500 -extra +XtraArg5"),
-    ?line os:putenv("ERL_ZFLAGS", "-MiscArg6 +#600 -extra +XtraArg6"),
-    ?line {Emu, Misc, Extra} = emu_args(CmdLine),
-    ?line verify_args(["-#100", "-#200", "-#300", "-#400",
+    CmdLine = "+#300 -args_file "++AFN2++" -MiscArg4 -extra +XtraArg4",
+    os:putenv("ERL_FLAGS", "-MiscArg5 +#500 -extra +XtraArg5"),
+    os:putenv("ERL_ZFLAGS", "-MiscArg6 +#600 -extra +XtraArg6"),
+    {Emu, Misc, Extra} = emu_args(CmdLine),
+    verify_args(["-#100", "-#200", "-#300", "-#400",
 		       "-#500", "-#600"], Emu),
-    ?line verify_args(["-MiscArg1", "-MiscArg2", "-MiscArg3", "-MiscArg4",
+    verify_args(["-MiscArg1", "-MiscArg2", "-MiscArg3", "-MiscArg4",
 		       "-MiscArg5", "-MiscArg6"],
 		      Misc),
-    ?line verify_args(["+XtraArg1", "+XtraArg2", "+XtraArg3", "+XtraArg4",
+    verify_args(["+XtraArg1", "+XtraArg2", "+XtraArg3", "+XtraArg4",
 		       "+XtraArg5", "+XtraArg6"],
 		      Extra),
-    ?line ok.
+    ok.
 
 %% Make sure "erl -detached" survives when parent process group gets killed
-otp_7461(doc) -> [];
-otp_7461(suite) -> [];
 otp_7461(Config) when is_list(Config) ->   
     case os:type() of
     	{unix,_} ->
@@ -302,9 +266,9 @@ otp_7461(Config) when is_list(Config) ->
 	
 otp_7461_do(Config) ->
     io:format("alive=~p node=~p\n",[is_alive(), node()]),
-    TestProg = filename:join([?config(data_dir, Config), "erlexec_tests"]),
+    TestProg = filename:join([proplists:get_value(data_dir, Config), "erlexec_tests"]),
     {ok, [[ErlProg]]} = init:get_argument(progname),
-    ?line Cmd = TestProg ++ " " ++ ErlProg ++
+    Cmd = TestProg ++ " " ++ ErlProg ++
 	" -detached -sname " ++ get_nodename(otp_7461) ++
 	" -setcookie " ++ atom_to_list(erlang:get_cookie()) ++
 	" -pa " ++ filename:dirname(code:which(?MODULE)) ++
@@ -314,29 +278,31 @@ otp_7461_do(Config) ->
     %%          open_port                 fork+exec
     
     io:format("spawn port prog ~p\n",[Cmd]),
-    ?line Port = open_port({spawn, Cmd}, [eof]),
+    Port = open_port({spawn, Cmd}, [eof]),
     
     io:format("Wait for node to connect...\n",[]),    
-    ?line {nodeup, Slave} = receive Msg -> Msg
+    {nodeup, Slave} = receive Msg -> Msg
 			    after 20*1000 -> timeout end,
     io:format("Node alive: ~p\n", [Slave]),
     
-    ?line pong = net_adm:ping(Slave),
+    pong = net_adm:ping(Slave),
     io:format("Ping ok towards ~p\n", [Slave]),
     
-    ?line Port ! { self(), {command, "K"}}, % Kill child process group
-    ?line {Port, {data, "K"}} = receive Msg2 -> Msg2 end,
-    ?line port_close(Port),
+    Port ! { self(), {command, "K"}}, % Kill child process group
+    {Port, {data, "K"}} = receive Msg2 -> Msg2 end,
+    port_close(Port),
     
     %% Now the actual test. Detached node should still be alive.
-    ?line pong = net_adm:ping(Slave),
+    pong = net_adm:ping(Slave),
     io:format("Ping still ok towards ~p\n", [Slave]),
     
     %% Halt node
-    ?line rpc:cast(Slave, ?MODULE, otp_7461_remote, [[halt, self()]]),
+    rpc:cast(Slave, ?MODULE, otp_7461_remote, [[halt, self()]]),
     
-    ?line {nodedown, Slave} = receive Msg3 -> Msg3 
-			      after 20*1000 -> timeout end,
+    {nodedown, Slave} = receive
+                            Msg3 -> Msg3
+                        after 20*1000 -> timeout
+                        end,
     io:format("Node dead: ~p\n", [Slave]),
     ok.
 
@@ -349,24 +315,21 @@ otp_7461_remote([halt, Pid]) ->
     io:format("halt order from ~p to node ~p\n",[Pid,node()]),
     halt().
 
-zdbbl_dist_buf_busy_limit(doc) ->    
-    ["Check +zdbbl flag"];
-zdbbl_dist_buf_busy_limit(suite) ->
-    [];
+%% Check +zdbbl flag
 zdbbl_dist_buf_busy_limit(Config) when is_list(Config) ->
     LimKB = 1122233,
     LimB = LimKB*1024,
-    ?line {ok,[[PName]]} = init:get_argument(progname),
-    ?line SNameS = "erlexec_test_02",
-    ?line SName = list_to_atom(SNameS++"@"++
+    {ok,[[PName]]} = init:get_argument(progname),
+    SNameS = "erlexec_test_02",
+    SName = list_to_atom(SNameS++"@"++
                          hd(tl(string:tokens(atom_to_list(node()),"@")))),
-    ?line Cmd = PName ++ " -sname "++SNameS++" -setcookie "++
+    Cmd = PName ++ " -sname "++SNameS++" -setcookie "++
         atom_to_list(erlang:get_cookie()) ++
 	" +zdbbl " ++ integer_to_list(LimKB),
-    ?line open_port({spawn,Cmd},[]),
-    ?line pong = loop_ping(SName,40),
-    ?line LimB = rpc:call(SName,erlang,system_info,[dist_buf_busy_limit]),
-    ?line ok = cleanup_node(SNameS, 10),
+    open_port({spawn,Cmd},[]),
+    pong = loop_ping(SName,40),
+    LimB = rpc:call(SName,erlang,system_info,[dist_buf_busy_limit]),
+    ok = cleanup_node(SNameS, 10),
     ok.
     
 
@@ -404,8 +367,8 @@ restore_env({erl_flags, AFlgs, Flgs, RFlgs, ZFlgs}) ->
     ok.
 
 privfile(Name, Config) ->
-    filename:join([?config(priv_dir, Config),
-		   atom_to_list(?config(testcase, Config)) ++ "." ++ Name]).
+    filename:join([proplists:get_value(priv_dir, Config),
+		   atom_to_list(proplists:get_value(testcase, Config)) ++ "." ++ Name]).
 
 write_file(FileName, Frmt) ->
     write_file(FileName, Frmt, []).
@@ -430,8 +393,7 @@ verify_not_args(Xs, Ys) ->
 			      true -> exit({arg_present, X});
 			      false -> ok
 			  end
-		  end,
-		  Xs).
+		  end, Xs).
 
 emu_args(CmdLineArgs) ->
     io:format("CmdLineArgs = ~ts~n", [CmdLineArgs]),
diff --git a/erts/test/ethread_SUITE.erl b/erts/test/ethread_SUITE.erl
index 4a40dbb11e..7bea9e0ecf 100644
--- a/erts/test/ethread_SUITE.erl
+++ b/erts/test/ethread_SUITE.erl
@@ -28,13 +28,7 @@
 -module(ethread_SUITE).
 -author('[email protected]').
 
-%-define(line_trace, 1).
-
--define(DEFAULT_TIMEOUT, ?t:minutes(10)).
-
--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, init_per_testcase/2, end_per_testcase/2]).
 
 -export([create_join_thread/1,
 	 equal_tids/1,
@@ -51,9 +45,13 @@
 	 atomic/1,
 	 dw_atomic_massage/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 10}}].
 
-tests() ->
+all() ->
     [create_join_thread,
      equal_tids,
      mutex,
@@ -69,110 +67,50 @@ tests() ->
      atomic,
      dw_atomic_massage].
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    tests().
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
+init_per_testcase(Case, Config) ->
+    case inet:gethostname() of
+	{ok,"fenris"} when Case == max_threads ->
+	    %% Cannot use os:type+os:version as not all
+	    %% solaris10 machines are buggy.
+	    {skip, "This machine is buggy"};
+	_Else ->
+            Config
+    end.
 
-end_per_suite(_Config) ->
+end_per_testcase(_Case, _Config) ->
     ok.
 
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 %%
 %%
 %% The test-cases
 %%
 %%
 
-create_join_thread(doc) ->
-    ["Tests ethr_thr_create and ethr_thr_join."];
-create_join_thread(suite) ->
-    [];
+%% Tests ethr_thr_create and ethr_thr_join.
 create_join_thread(Config) ->
     run_case(Config, "create_join_thread", "").
 
-equal_tids(doc) ->
-    ["Tests ethr_equal_tids."];
-equal_tids(suite) ->
-    [];
+%% Tests ethr_equal_tids.
 equal_tids(Config) ->
     run_case(Config, "equal_tids", "").
 
-mutex(doc) ->
-    ["Tests mutexes."];
-mutex(suite) ->
-    [];
+%% Tests mutexes.
 mutex(Config) ->
     run_case(Config, "mutex", "").
 
-try_lock_mutex(doc) ->
-    ["Tests try lock on mutex."];
-try_lock_mutex(suite) ->
-    [];
+%% Tests try lock on mutex.
 try_lock_mutex(Config) ->
     run_case(Config, "try_lock_mutex", "").
 
-%% Remove dead code?
-
-% wd_dispatch(P) ->
-%     receive
-% 	bye ->
-% 	    ?line true = port_command(P, "-1 "),
-% 	    ?line bye;
-% 	L when is_list(L) ->
-% 	    ?line true = port_command(P, L),
-% 	    ?line wd_dispatch(P)
-%     end.
-% 
-% watchdog(Port) ->
-%     ?line process_flag(priority, max),
-%     ?line receive after 500 -> ok end,
-% 
-%     ?line random:seed(),
-%     ?line true = port_command(Port, "0 "),
-%     ?line lists:foreach(fun (T) ->
-% 				erlang:send_after(T,
-% 						  self(),
-% 						  integer_to_list(T)
-% 						  ++ " ")
-% 			end,
-% 			lists:usort(lists:map(fun (_) ->
-% 						      random:uniform(4500)+500
-% 					      end,
-% 					      lists:duplicate(50,0)))),
-%     ?line erlang:send_after(5100, self(), bye),
-% 
-%     wd_dispatch(Port).
-
-cond_wait(doc) ->
-    ["Tests ethr_cond_wait with ethr_cond_signal and ethr_cond_broadcast."];
-cond_wait(suite) ->
-    [];
+%% Tests ethr_cond_wait with ethr_cond_signal and ethr_cond_broadcast.
 cond_wait(Config) ->
     run_case(Config, "cond_wait", "").
 
-broadcast(doc) ->
-    ["Tests that a ethr_cond_broadcast really wakes up all waiting threads"];
-broadcast(suite) ->
-    [];
+%% Tests that a ethr_cond_broadcast really wakes up all waiting threads
 broadcast(Config) ->
     run_case(Config, "broadcast", "").
 
-detached_thread(doc) ->
-    ["Tests detached threads."];
-detached_thread(suite) ->
-    [];
+%% Tests detached threads.
 detached_thread(Config) ->
     case {os:type(), os:version()} of
 	{{unix,darwin}, {9, _, _}} ->
@@ -184,10 +122,7 @@ detached_thread(Config) ->
 	    run_case(Config, "detached_thread", "")
     end.
 
-max_threads(doc) ->
-    ["Tests maximum number of threads."];
-max_threads(suite) ->
-    [];
+%% Tests maximum number of threads.
 max_threads(Config) ->
     case {os:type(), os:version()} of
 	{{unix,darwin}, {9, _, _}} ->
@@ -199,45 +134,27 @@ max_threads(Config) ->
 	    run_case(Config, "max_threads", "")
     end.
 
-tsd(doc) ->
-    ["Tests thread specific data."];
-tsd(suite) ->
-    [];
+%% Tests thread specific data.
 tsd(Config) ->
     run_case(Config, "tsd", "").
 
-spinlock(doc) ->
-    ["Tests spinlocks."];
-spinlock(suite) ->
-    [];
+%% Tests spinlocks.
 spinlock(Config) ->
     run_case(Config, "spinlock", "").
 
-rwspinlock(doc) ->
-    ["Tests rwspinlocks."];
-rwspinlock(suite) ->
-    [];
+%% Tests rwspinlocks.
 rwspinlock(Config) ->
     run_case(Config, "rwspinlock", "").
 
-rwmutex(doc) ->
-    ["Tests rwmutexes."];
-rwmutex(suite) ->
-    [];
+%% Tests rwmutexes.
 rwmutex(Config) ->
     run_case(Config, "rwmutex", "").
 
-atomic(doc) ->
-    ["Tests atomics."];
-atomic(suite) ->
-    [];
+%% Tests atomics.
 atomic(Config) ->
     run_case(Config, "atomic", "").
 
-dw_atomic_massage(doc) ->
-    ["Massage double word atomics"];
-dw_atomic_massage(suite) ->
-    [];
+%% Massage double word atomics
 dw_atomic_massage(Config) ->
     run_case(Config, "dw_atomic_massage", "").
 
@@ -247,22 +164,6 @@ dw_atomic_massage(Config) ->
 %%
 %%
 
-init_per_testcase(Case, Config) ->
-    case inet:gethostname() of
-	{ok,"fenris"} when Case == max_threads ->
-	    %% Cannot use os:type+os:version as not all
-	    %% solaris10 machines are buggy.
-	    {skip, "This machine is buggy"};
-	_Else ->
-	    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
-	    [{watchdog, Dog}|Config]
-    end.
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
 -define(TESTPROG, "ethread_tests").
 -define(FAILED_MARKER, $E,$T,$H,$R,$-,$T,$E,$S,$T,$-,$F,$A,$I,$L,$U,$R,$E).
 -define(SKIPPED_MARKER, $E,$T,$H,$R,$-,$T,$E,$S,$T,$-,$S,$K,$I,$P).
@@ -270,68 +171,68 @@ end_per_testcase(_Case, Config) ->
 -define(PID_MARKER, $E,$T,$H,$R,$-,$T,$E,$S,$T,$-,$P,$I,$D).
 
 port_prog_killer(EProc, OSProc) when is_pid(EProc), is_list(OSProc) ->
-    ?line process_flag(trap_exit, true),
-    ?line Ref = erlang:monitor(process, EProc),
-    ?line receive
-	      {'DOWN', Ref, _, _, Reason} when is_tuple(Reason),
-					       element(1, Reason)
-					       == timetrap_timeout ->
-		  ?line Cmd = "kill -9 " ++ OSProc,
-		  ?line ?t:format("Test case timed out. "
-				  "Trying to kill port program.~n"
-				  "  Executing: ~p~n", [Cmd]),
-		  ?line case os:cmd(Cmd) of
-			    [] ->
-				ok;
-			    OsCmdRes ->
-				?line ?t:format("             ~s", [OsCmdRes])
-			end;
-	      {'DOWN', Ref, _, _, _} ->
-		  %% OSProc is assumed to have terminated by itself
-		  ?line ok 
-	  end.
+    process_flag(trap_exit, true),
+    Ref = erlang:monitor(process, EProc),
+    receive
+        {'DOWN', Ref, _, _, Reason} when is_tuple(Reason),
+                                         element(1, Reason)
+                                         == timetrap_timeout ->
+            Cmd = "kill -9 " ++ OSProc,
+            io:format("Test case timed out. "
+                      "Trying to kill port program.~n"
+                      "  Executing: ~p~n", [Cmd]),
+            case os:cmd(Cmd) of
+                [] ->
+                    ok;
+                OsCmdRes ->
+                    io:format("             ~s", [OsCmdRes])
+            end;
+        %% OSProc is assumed to have terminated by itself
+        {'DOWN', Ref, _, _, _} ->
+            ok
+    end.
 
 get_line(_Port, eol, Data) ->
-    ?line Data;
+    Data;
 get_line(Port, noeol, Data) ->
-    ?line receive
+    receive
 	      {Port, {data, {Flag, NextData}}} ->
-		  ?line get_line(Port, Flag, Data ++ NextData);
+		  get_line(Port, Flag, Data ++ NextData);
 	      {Port, eof} ->
-		  ?line ?t:fail(port_prog_unexpectedly_closed)
+		  ct:fail(port_prog_unexpectedly_closed)
 	  end.
 
 read_case_data(Port, TestCase) ->
-    ?line receive
-	      {Port, {data, {eol, [?SUCCESS_MARKER]}}} ->
-		  ?line ok;
-	      {Port, {data, {Flag, [?SUCCESS_MARKER | CommentStart]}}} ->
-		  ?line {comment, get_line(Port, Flag, CommentStart)};
-	      {Port, {data, {Flag, [?SKIPPED_MARKER | CommentStart]}}} ->
-		  ?line {skipped, get_line(Port, Flag, CommentStart)};
-	      {Port, {data, {Flag, [?FAILED_MARKER | ReasonStart]}}} ->
-		  ?line ?t:fail(get_line(Port, Flag, ReasonStart));
-	      {Port, {data, {eol, [?PID_MARKER | PidStr]}}} ->
-		  ?line ?t:format("Port program pid: ~s~n", [PidStr]),
-		  ?line CaseProc = self(),
-		  ?line _ = list_to_integer(PidStr), % Sanity check
-		  spawn_opt(fun () ->
-				    port_prog_killer(CaseProc, PidStr)
-			    end,
-			    [{priority, max}, link]),
-		  read_case_data(Port, TestCase);
-	      {Port, {data, {Flag, LineStart}}} ->
-		  ?line ?t:format("~s~n", [get_line(Port, Flag, LineStart)]),
-		  read_case_data(Port, TestCase);
-	      {Port, eof} ->
-		  ?line ?t:fail(port_prog_unexpectedly_closed)
-	  end.
+    receive
+        {Port, {data, {eol, [?SUCCESS_MARKER]}}} ->
+            ok;
+        {Port, {data, {Flag, [?SUCCESS_MARKER | CommentStart]}}} ->
+            {comment, get_line(Port, Flag, CommentStart)};
+        {Port, {data, {Flag, [?SKIPPED_MARKER | CommentStart]}}} ->
+            {skipped, get_line(Port, Flag, CommentStart)};
+        {Port, {data, {Flag, [?FAILED_MARKER | ReasonStart]}}} ->
+            ct:fail(get_line(Port, Flag, ReasonStart));
+        {Port, {data, {eol, [?PID_MARKER | PidStr]}}} ->
+            io:format("Port program pid: ~s~n", [PidStr]),
+            CaseProc = self(),
+            _ = list_to_integer(PidStr), % Sanity check
+            spawn_opt(fun () ->
+                              port_prog_killer(CaseProc, PidStr)
+                      end,
+                      [{priority, max}, link]),
+            read_case_data(Port, TestCase);
+        {Port, {data, {Flag, LineStart}}} ->
+            io:format("~s~n", [get_line(Port, Flag, LineStart)]),
+            read_case_data(Port, TestCase);
+        {Port, eof} ->
+            ct:fail(port_prog_unexpectedly_closed)
+    end.
 
 run_case(Config, Test, TestArgs) ->
     run_case(Config, Test, TestArgs, fun (_Port) -> ok end).
 
 run_case(Config, Test, TestArgs, Fun) ->
-    TestProg = filename:join([?config(data_dir, Config), ?TESTPROG]),
+    TestProg = filename:join([proplists:get_value(data_dir, Config), ?TESTPROG]),
     Cmd = TestProg ++ " " ++ Test ++ " " ++ TestArgs,
     case catch open_port({spawn, Cmd}, [stream,
 					use_stdio,
@@ -339,17 +240,13 @@ run_case(Config, Test, TestArgs, Fun) ->
 					eof,
 					{line, 1024}]) of
 	Port when is_port(Port) ->
-	    ?line Fun(Port),
-	    ?line CaseResult = read_case_data(Port, Test),
-	    ?line receive
-		      {Port, eof} ->
-			  ?line ok
-		  end,
-	    ?line CaseResult;
+	    Fun(Port),
+	    CaseResult = read_case_data(Port, Test),
+            receive
+                {Port, eof} ->
+                    ok
+            end,
+	    CaseResult;
 	Error ->
-	    ?line ?t:fail({open_port_failed, Error})
+	    ct:fail({open_port_failed, Error})
     end.
-	    
-
-
-
diff --git a/erts/test/ignore_cores.erl b/erts/test/ignore_cores.erl
index 13f34cd10f..da6f6850c6 100644
--- a/erts/test/ignore_cores.erl
+++ b/erts/test/ignore_cores.erl
@@ -28,7 +28,7 @@
 
 -module(ignore_cores).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([init/1, fini/1, setup/3, setup/4, restore/1, dir/1]).
 
@@ -53,7 +53,7 @@ init(Config) ->
 fini(Config) ->
     #ignore_cores{org_cwd = OrgCWD,
 		  org_path = OrgPath,
-		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+		  org_pwd_env = OrgPWD} = proplists:get_value(ignore_cores, Config),
     ok = file:set_cwd(OrgCWD),
     true = code:set_path(OrgPath),
     case OrgPWD of
@@ -70,10 +70,10 @@ setup(Suite, Testcase, Config, SetCwd) when is_atom(Suite),
                                             is_list(Config) ->
     #ignore_cores{org_cwd = OrgCWD,
 		  org_path = OrgPath,
-		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+		  org_pwd_env = OrgPWD} = proplists:get_value(ignore_cores, Config),
     Path = lists:map(fun (".") -> OrgCWD; (Dir) -> Dir end, OrgPath),
     true = code:set_path(Path),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     IgnDir = filename:join([PrivDir,
 			 atom_to_list(Suite)
 			 ++ "_"
@@ -94,7 +94,7 @@ setup(Suite, Testcase, Config, SetCwd) when is_atom(Suite),
     end,
     ok = file:write_file(filename:join([IgnDir, "ignore_core_files"]), <<>>),
     %% cores are dumped in /cores on MacOS X
-    CoresDir = case {?t:os_type(), filelib:is_dir("/cores")} of
+    CoresDir = case {os:type(), filelib:is_dir("/cores")} of
 		   {{unix,darwin}, true} ->
 		       filelib:fold_files("/cores",
 					  "^core.*$",
@@ -119,7 +119,7 @@ restore(Config) ->
 		  org_path = OrgPath,
 		  org_pwd_env = OrgPWD,
 		  ign_dir = IgnDir,
-		  cores_dir = CoresDir} = ?config(ignore_cores, Config),
+		  cores_dir = CoresDir} = proplists:get_value(ignore_cores, Config),
     try
 	case CoresDir of
 	    false ->
@@ -155,5 +155,5 @@ restore(Config) ->
 
 
 dir(Config) ->
-    #ignore_cores{ign_dir = Dir} = ?config(ignore_cores, Config),
+    #ignore_cores{ign_dir = Dir} = proplists:get_value(ignore_cores, Config),
     Dir.
diff --git a/erts/test/install_SUITE.erl b/erts/test/install_SUITE.erl
index b380b064bd..a9a90dcf1e 100644
--- a/erts/test/install_SUITE.erl
+++ b/erts/test/install_SUITE.erl
@@ -28,11 +28,9 @@
 %%%-------------------------------------------------------------------
 -module(install_SUITE).
 
-%-define(line_trace, 1).
-
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 init_per_suite/1, end_per_suite/1,
-	 init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,
+         init_per_suite/1, end_per_suite/1,
+         init_per_testcase/2, end_per_testcase/2]).
 
 -export([bin_default/1,
 	 bin_default_dirty/1,
@@ -49,10 +47,9 @@
 	 bin_dirname_fail/1,
 	 bin_no_use_dirname_fail/1]).
 
--define(DEFAULT_TIMEOUT, ?t:minutes(1)).
 -define(JOIN(A,B,C), filename:join(A, B, C)).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record(inst, {mkdirs = true,
 	       symlinks = true,
@@ -77,49 +74,42 @@ dont_need_symlink_cases() ->
      bin_unreasonable_path, 'bin white space',
      bin_no_srcfile].
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() -> 
     dont_need_symlink_cases() ++ need_symlink_cases().
 
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 %%
 %% The test cases
 %%
 
 bin_default(Config) when is_list(Config) ->
-    ?line E = "/usr/local",
-    ?line Bs = "/usr/local/bin",
-    ?line Be = Bs,
-    ?line EBs = "/usr/local/lib/erlang/bin",
-    ?line EBe = EBs,
-    ?line RP = "../lib/erlang/bin",
+    E = "/usr/local",
+    Bs = "/usr/local/bin",
+    Be = Bs,
+    EBs = "/usr/local/lib/erlang/bin",
+    EBe = EBs,
+    RP = "../lib/erlang/bin",
     ChkRes = fun (Res, #inst{test_prefix = TP,
 			     destdir = D,
 			     extra_prefix = EP,
 			     bindir_symlinks = BSL,
 			     symlinks = SL}) ->
-		     ?line B = join([TP, D, EP, Be]),
+		     B = join([TP, D, EP, Be]),
 		     Expct = case {SL, BSL} of
 				 {false, _} when BSL == "relative";
 						 BSL == "absolute" ->
-				     ?line {error, no_ln_s};
+				     {error, no_ln_s};
 				 {false, _} ->
-				     ?line {ok,{absolute,
+				     {ok,{absolute,
 						B,join([TP,D,EP,EBe])}};
 				 {true, "absolute"} ->
-				     ?line {ok,{absolute,B,join([TP,EP,EBe])}};
+				     {ok,{absolute,B,join([TP,EP,EBe])}};
 				 {true, _} ->
-				     ?line {ok,{relative,B,RP}}
+				     {ok,{relative,B,RP}}
 			       end,
 		     expect(Expct, Res)
 	     end,
@@ -128,30 +118,30 @@ bin_default(Config) when is_list(Config) ->
 			      erlang_bindir = EBs}, ChkRes).
 
 bin_default_dirty(Config) when is_list(Config) ->
-    ?line E = "/usr/./local/lib/..",
-    ?line Bs = "/usr/local//lib/../lib/erlang/../../bin",
-    ?line Be = "/usr/local/lib/../lib/erlang/../../bin",
-    ?line EBs = "/usr/local/lib/../lib/erlang/../erlang/bin/x/y/../..//",
-    ?line EBe = "/usr/local/lib/../lib/erlang/../erlang/bin/x/y/../..",
-    ?line RP = "../lib/erlang/bin",
+    E = "/usr/./local/lib/..",
+    Bs = "/usr/local//lib/../lib/erlang/../../bin",
+    Be = "/usr/local/lib/../lib/erlang/../../bin",
+    EBs = "/usr/local/lib/../lib/erlang/../erlang/bin/x/y/../..//",
+    EBe = "/usr/local/lib/../lib/erlang/../erlang/bin/x/y/../..",
+    RP = "../lib/erlang/bin",
     ChkRes = fun (Res, #inst{test_prefix = TP,
 			     destdir = D,
 			     extra_prefix = EP,
 			     bindir_symlinks = BSL,
 			     symlinks = SL}) ->
-		     ?line B = join([TP, D, EP, Be]),
+		     B = join([TP, D, EP, Be]),
 		     Expct = case {SL, BSL} of
 				 {false, _} when BSL == "relative";
 						 BSL == "absolute" ->
-				     ?line {error, no_ln_s};
+				     {error, no_ln_s};
 				 {false, _} ->
-				     ?line {ok,{absolute,
+				     {ok,{absolute,
 						B,join([TP,D,EP,EBe])}};
 				 {true, "absolute"} ->
-				     ?line {ok,{absolute,
+				     {ok,{absolute,
 						B,join([TP,EP,EBe])}};
 				 {true, _} ->
-				     ?line {ok,{relative,B,RP}}
+				     {ok,{relative,B,RP}}
 			       end,
 		     expect(Expct, Res)
 	     end,
@@ -161,29 +151,29 @@ bin_default_dirty(Config) when is_list(Config) ->
 
 
 bin_outside_eprfx(Config) when is_list(Config) ->
-    ?line E = "/usr/local",
-    ?line Bs = "/usr/bin",
-    ?line Be = Bs,
-    ?line EBs = "/usr/local/lib/erlang/bin",
-    ?line EBe = EBs,
-    ?line RP = "../local/lib/erlang/bin",
+    E = "/usr/local",
+    Bs = "/usr/bin",
+    Be = Bs,
+    EBs = "/usr/local/lib/erlang/bin",
+    EBe = EBs,
+    RP = "../local/lib/erlang/bin",
     ChkRes = fun (Res, #inst{test_prefix = TP,
 			     destdir = D,
 			     extra_prefix = EP,
 			     bindir_symlinks = BSL,
 			     symlinks = SL}) ->
-		     ?line B = join([TP, D, EP, Be]),
+		     B = join([TP, D, EP, Be]),
 		     Expct = case {SL, BSL} of
 				 {false, _} when BSL == "relative";
 						 BSL == "absolute" ->
-				     ?line {error, no_ln_s};
+				     {error, no_ln_s};
 				 {false, _} ->
-				     ?line {ok,{absolute,
+				     {ok,{absolute,
 						B,join([TP,D,EP,EBe])}};
 				 {true, "relative"} ->
-				     ?line {ok,{relative,B,RP}};
+				     {ok,{relative,B,RP}};
 				 {true, _} ->
-				     ?line {ok,{absolute,B,join([TP,EP,EBe])}}
+				     {ok,{absolute,B,join([TP,EP,EBe])}}
 			       end,
 		     expect(Expct, Res)
 	     end,
@@ -193,29 +183,29 @@ bin_outside_eprfx(Config) when is_list(Config) ->
 
 
 bin_outside_eprfx_dirty(Config) when is_list(Config) ->
-    ?line E = "/usr/local/lib/..",
-    ?line Bs = "/usr/local/lib/../../bin",
-    ?line Be = Bs,
-    ?line EBs = "/usr/local/lib/erlang/bin",
-    ?line EBe = EBs,
-    ?line RP = "../local/lib/erlang/bin",
+    E = "/usr/local/lib/..",
+    Bs = "/usr/local/lib/../../bin",
+    Be = Bs,
+    EBs = "/usr/local/lib/erlang/bin",
+    EBe = EBs,
+    RP = "../local/lib/erlang/bin",
     ChkRes = fun (Res, #inst{test_prefix = TP,
 			     destdir = D,
 			     extra_prefix = EP,
 			     bindir_symlinks = BSL,
 			     symlinks = SL}) ->
-		     ?line B = join([TP, D, EP, Be]),
+		     B = join([TP, D, EP, Be]),
 		     Expct = case {SL, BSL} of
 				 {false, _} when BSL == "relative";
 						 BSL == "absolute" ->
-				     ?line {error, no_ln_s};
+				     {error, no_ln_s};
 				 {false, _} ->
-				     ?line {ok,{absolute,
+				     {ok,{absolute,
 						B,join([TP,D,EP,EBe])}};
 				 {true, "relative"} ->
-				     ?line {ok,{relative,B,RP}};
+				     {ok,{relative,B,RP}};
 				 {true, _} ->
-				     ?line {ok,{absolute,B,join([TP,EP,EBe])}}
+				     {ok,{absolute,B,join([TP,EP,EBe])}}
 			       end,
 		     expect(Expct, Res)
 	     end,
@@ -224,33 +214,33 @@ bin_outside_eprfx_dirty(Config) when is_list(Config) ->
 			      erlang_bindir = EBs}, ChkRes).
 
 bin_unreasonable_path(Config) when is_list(Config) ->
-    ?line E = "/usr/local/../../..",
-    ?line Bs = "/usr/local/../../../bin",
-    ?line Be = Bs,
-    ?line EBs = "/usr/local/../../../bin_unreasonable_path/usr/local/lib/erlang/bin",
-    ?line EBe = EBs,
-    ?line RP = "../bin_unreasonable_path/usr/local/lib/erlang/bin",
+    E = "/usr/local/../../..",
+    Bs = "/usr/local/../../../bin",
+    Be = Bs,
+    EBs = "/usr/local/../../../bin_unreasonable_path/usr/local/lib/erlang/bin",
+    EBe = EBs,
+    RP = "../bin_unreasonable_path/usr/local/lib/erlang/bin",
     ChkRes = fun (Res, #inst{test_prefix = TP,
 			     destdir = D,
 			     extra_prefix = EP,
 			     bindir_symlinks = BSL,
 			     symlinks = SL}) ->
-		     ?line B = join([TP, D, EP, Be]),
+		     B = join([TP, D, EP, Be]),
 		     Expct = case {TP, SL, BSL} of
 				 {_, false, _} when BSL == "relative";
 						 BSL == "absolute" ->
-				     ?line {error, no_ln_s};
+				     {error, no_ln_s};
 				 {_, false, _} ->
-				     ?line {ok,{absolute,
+				     {ok,{absolute,
 						B,join([TP,D,EP,EBe])}};
 				 {"", true, "relative"} ->
 				     {error, unreasonable_path};
 				 {"", true, _} ->
-				     ?line {ok,{absolute,B,join([TP,EP,EBe])}};
+				     {ok,{absolute,B,join([TP,EP,EBe])}};
 				 {_, true, "absolute"} ->
-				     ?line {ok,{absolute,B,join([TP,EP,EBe])}};
+				     {ok,{absolute,B,join([TP,EP,EBe])}};
 				 _ ->
-				     ?line {ok,{relative,B,RP}}
+				     {ok,{relative,B,RP}}
 			       end,
 		     expect(Expct, Res)
 	     end,
@@ -259,7 +249,7 @@ bin_unreasonable_path(Config) when is_list(Config) ->
 			      erlang_bindir = EBs}, ChkRes).
 
 bin_unreachable_absolute(Config) when is_list(Config) ->
-    TDir = ?config(test_dir, Config),
+    TDir = proplists:get_value(test_dir, Config),
     make_dirs(TDir, "/opt/local/lib/erlang/usr/bin"),
     make_dirs(TDir, "/opt/local/lib/erlang/bin"),
     Erl = join([TDir, "/opt/local/lib/erlang/bin/erl"]),
@@ -270,28 +260,28 @@ bin_unreachable_absolute(Config) when is_list(Config) ->
     ok = file:write_file(Erlc, "erlc"),
     ok = file:make_symlink("../../../opt/local/lib/erlang/usr",
 			   join([TDir, "/usr/local/lib/erlang"])),
-    ?line E = "/usr/local",
-    ?line Bs = "/usr/local/bin",
-    ?line Be = Bs,
-    ?line EBs = "/usr/local/lib/erlang/../bin",
-    ?line EBe = EBs,
+    E = "/usr/local",
+    Bs = "/usr/local/bin",
+    Be = Bs,
+    EBs = "/usr/local/lib/erlang/../bin",
+    EBe = EBs,
     ChkRes = fun (Res, #inst{test_prefix = TP,
 			     destdir = D,
 			     extra_prefix = EP,
 			     bindir_symlinks = BSL,
 			     symlinks = SL}) ->
-		     ?line B = join([TP, D, EP, Be]),
+		     B = join([TP, D, EP, Be]),
 		     Expct = case {SL, BSL} of
 				 {false, _} when BSL == "relative";
 						 BSL == "absolute" ->
-				     ?line {error, no_ln_s};
+				     {error, no_ln_s};
 				 {false, _} ->
-				     ?line {ok,{absolute,
+				     {ok,{absolute,
 						B,join([TP,D,EP,EBe])}};
 				 {true, "relative"} ->
 				     {error, unreachable_absolute};
 				 {true, _} ->
-				     ?line {ok,{absolute,B,join([TP,EP,EBe])}}
+				     {ok,{absolute,B,join([TP,EP,EBe])}}
 			       end,
 		     expect(Expct, Res)
 	     end,
@@ -300,7 +290,7 @@ bin_unreachable_absolute(Config) when is_list(Config) ->
 			      erlang_bindir = EBs}, ChkRes).
 
 bin_unreachable_relative(Config) when is_list(Config) ->
-    TDir = ?config(test_dir, Config),
+    TDir = proplists:get_value(test_dir, Config),
     make_dirs(TDir, "/opt/local/lib/erlang/bin"),
     make_dirs(TDir, "/opt/local/bin"),
     make_dirs(TDir, "/usr/local/lib/erlang/bin"),
@@ -311,28 +301,28 @@ bin_unreachable_relative(Config) when is_list(Config) ->
     ok = file:make_symlink("../../opt/local/bin",
 			   join([TDir, "/usr/local/bin"])),
 
-    ?line E = "/usr/local",
-    ?line Bs = "/usr/local/bin",
-    ?line Be = Bs,
-    ?line EBs = "/usr/local/lib/erlang/bin",
-    ?line EBe = EBs,
+    E = "/usr/local",
+    Bs = "/usr/local/bin",
+    Be = Bs,
+    EBs = "/usr/local/lib/erlang/bin",
+    EBe = EBs,
     ChkRes = fun (Res, #inst{test_prefix = TP,
 			     destdir = D,
 			     extra_prefix = EP,
 			     bindir_symlinks = BSL,
 			     symlinks = SL}) ->
-		     ?line B = join([TP, D, EP, Be]),
+		     B = join([TP, D, EP, Be]),
 		     Expct = case {SL, BSL} of
 				 {false, _} when BSL == "relative";
 						 BSL == "absolute" ->
-				     ?line {error, no_ln_s};
+				     {error, no_ln_s};
 				 {false, _} ->
-				     ?line {ok,{absolute,
+				     {ok,{absolute,
 						B,join([TP,D,EP,EBe])}};
 				 {true, "relative"} ->
 				     {error, unreachable_relative};
 				 {true, _} ->
-				     ?line {ok,{absolute,B,join([TP,EP,EBe])}}
+				     {ok,{absolute,B,join([TP,EP,EBe])}}
 			       end,
 		     expect(Expct, Res)
 	     end,
@@ -341,7 +331,7 @@ bin_unreachable_relative(Config) when is_list(Config) ->
 			      erlang_bindir = EBs}, ChkRes).
 
 bin_ok_symlink(Config) when is_list(Config) ->
-    TDir = ?config(test_dir, Config),
+    TDir = proplists:get_value(test_dir, Config),
     make_dirs(TDir, "/usr/local/bin"),
     make_dirs(TDir, "/opt/local/lib/erlang/bin"),
     Erl = join([TDir, "/opt/local/lib/erlang/bin/erl"]),
@@ -350,29 +340,29 @@ bin_ok_symlink(Config) when is_list(Config) ->
     ok = file:write_file(Erlc, "erlc"),
     ok = file:make_symlink("../../opt/local/lib",
 			   join([TDir, "/usr/local/lib"])),
-    ?line E = "/usr/local",
-    ?line Bs = "/usr/local/bin",
-    ?line Be = Bs,
-    ?line EBs = "/usr/local/lib/erlang/bin",
-    ?line EBe = EBs,
-    ?line RP = "../lib/erlang/bin",
+    E = "/usr/local",
+    Bs = "/usr/local/bin",
+    Be = Bs,
+    EBs = "/usr/local/lib/erlang/bin",
+    EBe = EBs,
+    RP = "../lib/erlang/bin",
     ChkRes = fun (Res, #inst{test_prefix = TP,
 			     destdir = D,
 			     extra_prefix = EP,
 			     bindir_symlinks = BSL,
 			     symlinks = SL}) ->
-		     ?line B = join([TP, D, EP, Be]),
+		     B = join([TP, D, EP, Be]),
 		     Expct = case {SL, BSL} of
 				 {false, _} when BSL == "relative";
 						 BSL == "absolute" ->
-				     ?line {error, no_ln_s};
+				     {error, no_ln_s};
 				 {false, _} ->
-				     ?line {ok,{absolute,
+				     {ok,{absolute,
 						B,join([TP,D,EP,EBe])}};
 				 {true, "absolute"} ->
-				     ?line {ok,{absolute,B,join([TP,EP,EBe])}};
+				     {ok,{absolute,B,join([TP,EP,EBe])}};
 				 {true, _} ->
-				     ?line {ok,{relative,B,RP}}
+				     {ok,{relative,B,RP}}
 			       end,
 		     expect(Expct, Res)
 	     end,
@@ -381,7 +371,7 @@ bin_ok_symlink(Config) when is_list(Config) ->
 			      erlang_bindir = EBs}, ChkRes).
 
 bin_same_dir(Config) when is_list(Config) ->
-    TDir = ?config(test_dir, Config),
+    TDir = proplists:get_value(test_dir, Config),
     make_dirs(TDir, "/usr/local/bin"),
     make_dirs(TDir, "/usr/local/lib"),
     ok = file:make_symlink("..", join([TDir, "/usr/local/lib/erlang"])),
@@ -417,29 +407,29 @@ bin_not_abs(Config) when is_list(Config) ->
 
 
 'bin white space'(Config) when is_list(Config) ->
-    ?line E = "/u s r/local",
-    ?line Bs = "/u s r/local/b	i	n",
-    ?line Be = Bs,
-    ?line EBs = "/u s r/local/lib/erl	ang/bin",
-    ?line EBe = EBs,
-    ?line RP = "../lib/erl	ang/bin",
+    E = "/u s r/local",
+    Bs = "/u s r/local/b	i	n",
+    Be = Bs,
+    EBs = "/u s r/local/lib/erl	ang/bin",
+    EBe = EBs,
+    RP = "../lib/erl	ang/bin",
     ChkRes = fun (Res, #inst{test_prefix = TP,
 			     destdir = D,
 			     extra_prefix = EP,
 			     bindir_symlinks = BSL,
 			     symlinks = SL}) ->
-		     ?line B = join([TP, D, EP, Be]),
+		     B = join([TP, D, EP, Be]),
 		     Expct = case {SL, BSL} of
 				 {false, _} when BSL == "relative";
 						 BSL == "absolute" ->
-				     ?line {error, no_ln_s};
+				     {error, no_ln_s};
 				 {false, _} ->
-				     ?line {ok,{absolute,
+				     {ok,{absolute,
 						B,join([TP,D,EP,EBe])}};
 				 {true, "absolute"} ->
-				     ?line {ok,{absolute,B,join([TP,EP,EBe])}};
+				     {ok,{absolute,B,join([TP,EP,EBe])}};
 				 {true, _} ->
-				     ?line {ok,{relative,B,RP}}
+				     {ok,{relative,B,RP}}
 			       end,
 		     expect(Expct, Res)
 	     end,
@@ -448,29 +438,29 @@ bin_not_abs(Config) when is_list(Config) ->
 			      erlang_bindir = EBs}, ChkRes).
 
 bin_dirname_fail(Config) when is_list(Config) ->
-    ?line E = "/opt",
-    ?line Bs = "/opt/lib/../bin",
-    ?line Be = Bs,
-    ?line EBs = "/opt/lib/erlang/otp/bin",
-    ?line EBe = EBs,
-    ?line CMDPRFX = "PATH=\""++?config(data_dir,Config)++":"++os:getenv("PATH")++"\"",
+    E = "/opt",
+    Bs = "/opt/lib/../bin",
+    Be = Bs,
+    EBs = "/opt/lib/erlang/otp/bin",
+    EBe = EBs,
+    CMDPRFX = "PATH=\""++proplists:get_value(data_dir,Config)++":"++os:getenv("PATH")++"\"",
     ChkRes = fun (Res, #inst{test_prefix = TP,
 			     destdir = D,
 			     extra_prefix = EP,
 			     bindir_symlinks = BSL,
 			     symlinks = SL}) ->
-		     ?line B = join([TP, D, EP, Be]),
+		     B = join([TP, D, EP, Be]),
 		     Expct = case {SL, BSL} of
 				 {false, _} when BSL == "relative";
 						 BSL == "absolute" ->
-				     ?line {error, no_ln_s};
+				     {error, no_ln_s};
 				 {false, _} ->
-				     ?line {ok,{absolute,
+				     {ok,{absolute,
 						B,join([TP,D,EP,EBe])}};
 				 {true, "relative"} ->
-				     ?line {error, dirname_failed};
+				     {error, dirname_failed};
 				 {true, _} ->
-				     ?line {ok,{absolute,B,join([TP,EP,EBe])}}
+				     {ok,{absolute,B,join([TP,EP,EBe])}}
 			       end,
 		     expect(Expct, Res)
 	     end,
@@ -480,30 +470,30 @@ bin_dirname_fail(Config) when is_list(Config) ->
 			      erlang_bindir = EBs}, ChkRes).
 
 bin_no_use_dirname_fail(Config) when is_list(Config) ->
-    ?line E = "/opt",
-    ?line Bs = "/opt/bin",
-    ?line Be = Bs,
-    ?line EBs = "/opt/lib/erlang/otp/bin",
-    ?line EBe = EBs,
-    ?line RP = "../lib/erlang/otp/bin",
-    ?line CMDPRFX = "PATH=\""++?config(data_dir,Config)++":"++os:getenv("PATH")++"\"",
+    E = "/opt",
+    Bs = "/opt/bin",
+    Be = Bs,
+    EBs = "/opt/lib/erlang/otp/bin",
+    EBe = EBs,
+    RP = "../lib/erlang/otp/bin",
+    CMDPRFX = "PATH=\""++proplists:get_value(data_dir,Config)++":"++os:getenv("PATH")++"\"",
     ChkRes = fun (Res, #inst{test_prefix = TP,
 			     destdir = D,
 			     extra_prefix = EP,
 			     bindir_symlinks = BSL,
 			     symlinks = SL}) ->
-		     ?line B = join([TP, D, EP, Be]),
+		     B = join([TP, D, EP, Be]),
 		     Expct = case {SL, BSL} of
 				 {false, _} when BSL == "relative";
 						 BSL == "absolute" ->
-				     ?line {error, no_ln_s};
+				     {error, no_ln_s};
 				 {false, _} ->
-				     ?line {ok,{absolute,
+				     {ok,{absolute,
 						B,join([TP,D,EP,EBe])}};
 				 {true, "absolute"} ->
-				     ?line {ok,{absolute,B,join([TP,EP,EBe])}};
+				     {ok,{absolute,B,join([TP,EP,EBe])}};
 				 {true, _} ->
-				     ?line {ok,{relative,B,RP}}
+				     {ok,{relative,B,RP}}
 			       end,
 		     expect(Expct, Res)
 	     end,
@@ -513,7 +503,7 @@ bin_no_use_dirname_fail(Config) when is_list(Config) ->
 			      erlang_bindir = EBs}, ChkRes).
 
 bin_no_srcfile(Config) when is_list(Config) ->
-    TDir = ?config(test_dir, Config),
+    TDir = proplists:get_value(test_dir, Config),
     make_dirs(TDir, "/opt/local/bin"),
     make_dirs(TDir, "/opt/local/lib/erlang/bin"),
     Erl = join([TDir, "/opt/local/lib/erlang/bin/erl"]),
@@ -525,13 +515,13 @@ bin_no_srcfile(Config) when is_list(Config) ->
 		     Expct = case {SL, BSL} of
 				 {false, _} when BSL == "relative";
 						 BSL == "absolute" ->
-				     ?line {error, no_ln_s};
+				     {error, no_ln_s};
 				 {false,_} ->
-				     ?line {error,{no_srcfile, Erlc}};
+				     {error,{no_srcfile, Erlc}};
 				 {true, "absolute"} ->
-				     ?line {error,{no_srcfile, Erlc}};
+				     {error,{no_srcfile, Erlc}};
 				 {true, _} ->
-				     ?line {error,{no_srcfile, RP_Erlc}}
+				     {error,{no_srcfile, RP_Erlc}}
 			     end,
 		     expect(Expct, Res)
 	     end,
@@ -549,34 +539,34 @@ bin_no_srcfile(Config) when is_list(Config) ->
 %%
 
 expect(X, X) ->
-    ?t:format("result: ~p~n", [X]),
-    ?t:format("-----------------------------------------------~n", []),
+    io:format("result: ~p~n", [X]),
+    io:format("-----------------------------------------------~n", []),
     ok;
 expect(X, Y) ->
-    ?t:format("expected: ~p~n", [X]),
-    ?t:format("got     : ~p~n", [Y]),
-    ?t:format("-----------------------------------------------~n", []),
-    ?t:fail({X,Y}).
+    io:format("expected: ~p~n", [X]),
+    io:format("got     : ~p~n", [Y]),
+    io:format("-----------------------------------------------~n", []),
+    ct:fail({X,Y}).
     
 init_per_suite(Config) ->
-    PD = ?config(priv_dir, Config),
-    SymLinks = case ?t:os_type() of
-		   {win32, _} -> false;
-		   _ ->
-		       case file:make_symlink("nothing",
-					      filename:join(PD,
-							    "symlink_test")) of
-			   ok -> true;
-			   _ -> false
-		       end
-	       end,
+    PD = proplists:get_value(priv_dir, Config),
+    SymLinks = case os:type() of
+                   {win32, _} -> false;
+                   _ ->
+                       case file:make_symlink("nothing",
+                                              filename:join(PD, "symlink_test")) of
+                           ok -> true;
+                           _ -> false
+                       end
+               end,
     [{symlinks, SymLinks} | Config].
 
 end_per_suite(_Config) ->
     ok.
 
 init_per_testcase(Case, Config) ->
-    init_per_testcase_aux(?config(symlinks,Config),?t:os_type(),Case,Config).
+    init_per_testcase_aux(proplists:get_value(symlinks,Config),
+                          os:type(),Case,Config).
 
 init_per_testcase_aux(_, {win32, _}, _Case, _Config) ->
     {skip, "Not on windows"};
@@ -586,18 +576,13 @@ init_per_testcase_aux(false, OsType, Case, Config) ->
 	true -> {skip, "Cannot create symbolic links"}
     end;
 init_per_testcase_aux(true, _OsType, Case, Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, Dog},
-     {testcase, Case},
-     {test_dir, make_dirs(?config(priv_dir, Config), atom_to_list(Case))}
+    [{testcase, Case},
+     {test_dir, make_dirs(proplists:get_value(priv_dir, Config), atom_to_list(Case))}
      | Config].
 
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-
 make_dirs(Root, Suffix) ->
     do_make_dirs(Root, string:tokens(Suffix, [$/])).
 
@@ -616,9 +601,9 @@ install_bin(Config, #inst{mkdirs = MkDirs,
 			  exec_prefix = EXEC_PREFIX,
 			  bindir = BINDIR,
 			  erlang_bindir = ERLANG_BINDIR} = Inst, ChkRes) ->
-    PDir = ?config(priv_dir, Config),
-    TDir = ?config(test_dir, Config),
-    TD = atom_to_list(?config(testcase, Config)),
+    PDir = proplists:get_value(priv_dir, Config),
+    TDir = proplists:get_value(test_dir, Config),
+    TD = atom_to_list(proplists:get_value(testcase, Config)),
     case MkDirs of
 	false -> ok;
 	true ->
@@ -641,7 +626,7 @@ install_bin(Config, #inst{mkdirs = MkDirs,
 			   bindir = join([TDir, BINDIR]),
 			   erlang_bindir = join([TDir, ERLANG_BINDIR])},
 		 ChkRes),
-    case ?config(symlinks, Config) of
+    case proplists:get_value(symlinks, Config) of
 	true -> ok;
 	false -> {comment, "No symlink tests run, since symlinks not working"}
     end.
@@ -664,7 +649,7 @@ install_bin2(Config, Inst, ChkRes) ->
     install_bin3(Config, Inst#inst{symlinks = false,
 				   ln_s = "cp -p",
 				   bindir_symlinks = "absolute"}, ChkRes),
-    case ?config(symlinks, Config) of
+    case proplists:get_value(symlinks, Config) of
 	true ->
 	    install_bin3(Config, Inst#inst{symlinks = true,
 					   ln_s = "ln -s"}, ChkRes),
@@ -690,9 +675,9 @@ install_bin3(Config,
 		       erlang_bindir = ERLANG_BINDIR,
 		       bindir_symlinks = BINDIR_SYMLINKS} = Inst,
 		 ChkRes) ->
-    Test = ?config(testcase, Config),
-    DDir = ?config(data_dir, Config),
-    TDir = ?config(test_dir, Config),
+    Test = proplists:get_value(testcase, Config),
+    DDir = proplists:get_value(data_dir, Config),
+    TDir = proplists:get_value(test_dir, Config),
     InstallBin = filename:join(DDir, "install_bin"),
     ResFile = filename:join(TDir, atom_to_list(Test) ++ "-result.txt"),
     Cmd = CMD_PRFX ++ " "
@@ -705,7 +690,7 @@ install_bin3(Config,
 	++ "\" --exec-prefix \"" ++ EXEC_PREFIX
 	++ "\" --test-file \"" ++ ResFile ++ "\" erl erlc",
 
-    ?t:format("CMD_PRFX        = \"~s\"~n"
+    io:format("CMD_PRFX        = \"~s\"~n"
 	      "LN_S            = \"~s\"~n" 
 	      "BINDIR_SYMLINKS = \"~s\"~n"
 	      "exec_prefix     = \"~s\"~n"
@@ -716,9 +701,9 @@ install_bin3(Config,
 	      [CMD_PRFX, LN_S, BINDIR_SYMLINKS, EXEC_PREFIX, BINDIR,
 	       ERLANG_BINDIR, EXTRA_PREFIX, DESTDIR]),
 
-    ?t:format("$ ~s~n", [Cmd]),
+    io:format("$ ~s~n", [Cmd]),
     CmdOutput = os:cmd(Cmd),
-    ?t:format("~s~n", [CmdOutput]),    
+    io:format("~s~n", [CmdOutput]),
     ChkRes(case file:consult(ResFile) of
 	       {ok, [Res]} -> Res;
 	       Err -> exit({result, Err})
@@ -731,4 +716,3 @@ join([""|Ds]) ->
     join(Ds);
 join([D|Ds]) ->
     "/" ++ string:strip(D, both, $/) ++ join(Ds).
-
diff --git a/erts/test/nt_SUITE.erl b/erts/test/nt_SUITE.erl
index dbae8df7fe..be24018b5d 100644
--- a/erts/test/nt_SUITE.erl
+++ b/erts/test/nt_SUITE.erl
@@ -20,58 +20,39 @@
 %%% Purpose: Test NT specific utilities
 -module(nt_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.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,nt/1,handle_eventlog/2,
-	 middleman/1,service_basic/1, service_env/1, user_env/1, synced/1, 
-	 service_prio/1, 
-	 logout/1, debug/1, restart/1, restart_always/1,stopaction/1,
-	 shutdown_io/0,do_shutdown_io/0]).
--define(TEST_TIMEOUT, ?t:seconds(180)).
+-export([all/0, suite/0,
+         init_per_testcase/2, end_per_testcase/2,
+         nt/1,handle_eventlog/2,
+         middleman/1,service_basic/1, service_env/1, user_env/1, synced/1,
+         service_prio/1,
+         logout/1, debug/1, restart/1, restart_always/1,stopaction/1,
+         shutdown_io/0,do_shutdown_io/0]).
 
 -define(TEST_SERVICES, [1,2,3,4,5,6,7,8,9,10,11]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 3}}].
 
 all() -> 
     case os:type() of
-	{win32, nt} ->
-	    [nt, service_basic, service_env, user_env, synced,
-	     service_prio, logout, debug, restart, restart_always,
-	     stopaction];
-	_ -> [nt]
+        {win32, nt} ->
+            [nt, service_basic, service_env, user_env, synced,
+             service_prio, logout, debug, restart, restart_always,
+             stopaction];
+        _ -> [nt]
     end.
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 init_per_testcase(_Func, Config) ->
-    Dog = test_server:timetrap(?TEST_TIMEOUT),
-    [{watchdog, Dog} | Config].
+    Config.
 
-end_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, _Config) ->
     lists:foreach(fun(X) -> 
-			  catch remove_service("test_service_" ++ 
-					 integer_to_list(X)) end,
-		  ?TEST_SERVICES),
-    Dog = ?config(watchdog, Config),
-    catch test_server:timetrap_cancel(Dog),
+                          catch remove_service("test_service_" ++ integer_to_list(X))
+                  end, ?TEST_SERVICES),
     ok.    
 
 erlsrv() ->
@@ -80,19 +61,18 @@ erlsrv() ->
 
 recv_prog_output(Port) -> 
     receive
-	{Port, {data, {eol,Data}}} ->
-	    %%io:format("Got data: ~s~n", [Data]),
-	    [ Data | recv_prog_output(Port)];
-	_X ->
-	    %%io:format("Got data: ~p~n", [_X]),
-	    Port ! {self(), close},
-	    receive
-		_ ->
-		    []
-	    end
+        {Port, {data, {eol,Data}}} ->
+            %%io:format("Got data: ~s~n", [Data]),
+            [ Data | recv_prog_output(Port)];
+        _X ->
+            %%io:format("Got data: ~p~n", [_X]),
+            Port ! {self(), close},
+            receive
+                _ ->
+                    []
+            end
     end.
 
-	    
 %%% X == parameters to erlsrv
 %%% returns command output without stderr
 do_command(X) ->
@@ -100,11 +80,11 @@ do_command(X) ->
     Port = open_port({spawn, erlsrv() ++ " " ++ X}, [stream, {line, 100}, eof, in]), 
     Res = recv_prog_output(Port),
     case Res of
-	[] ->
-	    failed;
-	_Y ->
-	    %%io:format("~p~n",[_Y]),
-	    ok
+        [] ->
+            failed;
+        _Y ->
+            %%io:format("~p~n",[_Y]),
+            ok
     end.
 
 
@@ -123,13 +103,13 @@ do_wait_for_it(_,0) ->
     false;
 do_wait_for_it(FullName,N) ->
     case net_adm:ping(FullName) of
-	pong ->
-	    true;
-	_ ->
-	    receive 
-	    after 1000 ->
-		    do_wait_for_it(FullName,N-1)
-	    end
+        pong ->
+            true;
+        _ ->
+            receive
+            after 1000 ->
+                      do_wait_for_it(FullName,N-1)
+            end
     end.
 
 wait_for_node(Name) ->
@@ -139,309 +119,280 @@ wait_for_node(Name) ->
 make_full_name(Name) ->
     [_,Suffix] = string:tokens(atom_to_list(node()),"@"),
     list_to_atom(Name ++ "@" ++ Suffix).
-    
+
 
 %%% The following tests are only run on NT:
 
-service_basic(doc) ->
-    ["Check some basic (cosmetic) service parameters"];
-service_basic(suite) -> [];
+%% Check some basic (cosmetic) service parameters
 service_basic(Config) when is_list(Config) ->
-    ?line Name = "test_service_20",
-    ?line IntName = Name++"_internal",
-    ?line Service = [{servicename,Name},
-		     {args, ["-setcookie", 
-		      atom_to_list(erlang:get_cookie())]},
-		     {internalservicename,IntName},
-		     {comment,"Epic comment"}],
-    ?line ok = erlsrv:store_service(Service),
-    ?line start_service(Name),
-    ?line true = wait_for_node(Name),
-    ?line S2 = erlsrv:get_service(Name),
-    ?line {value,{comment,"Epic comment"}} = lists:keysearch(comment,1,S2),
-    ?line {value,{internalservicename,IntName}} =
-	lists:keysearch(internalservicename,1,S2),
-    ?line S3 = lists:keyreplace(comment,1,S2,{comment,"Basic comment"}),
-    ?line S4 = lists:keyreplace(internalservicename,1,S3,
-				{internalservicename,"WillNotHappen"}),
-    ?line ok = erlsrv:store_service(S4),
-    ?line S5 = erlsrv:get_service(Name),
-    ?line {value,{comment,"Basic comment"}} = lists:keysearch(comment,1,S5),
-    ?line {value,{internalservicename,IntName}} =
-	lists:keysearch(internalservicename,1,S5),
-    ?line NewName = "test_service_21",
-    ?line S6 = erlsrv:new_service(NewName,S5,[]), % should remove 
-						  % internalservicename
-    ?line ok = erlsrv:store_service(S6),
-    ?line S7 = erlsrv:get_service(NewName),
-    ?line {value,{comment,"Basic comment"}} = lists:keysearch(comment,1,S7),
-    ?line {value,{internalservicename,[$t,$e,$s,$t | _]}} =
-	lists:keysearch(internalservicename,1,S7),
-    ?line remove_service(Name),
-    ?line remove_service(NewName),
+    Name = "test_service_20",
+    IntName = Name++"_internal",
+    Service = [{servicename,Name},
+               {args, ["-setcookie", atom_to_list(erlang:get_cookie())]},
+               {internalservicename,IntName},
+               {comment,"Epic comment"}],
+    ok = erlsrv:store_service(Service),
+    start_service(Name),
+    true = wait_for_node(Name),
+    S2 = erlsrv:get_service(Name),
+    {value,{comment,"Epic comment"}} = lists:keysearch(comment,1,S2),
+    {value,{internalservicename,IntName}} =
+    lists:keysearch(internalservicename,1,S2),
+    S3 = lists:keyreplace(comment,1,S2,{comment,"Basic comment"}),
+    S4 = lists:keyreplace(internalservicename,1,S3,
+                          {internalservicename,"WillNotHappen"}),
+    ok = erlsrv:store_service(S4),
+    S5 = erlsrv:get_service(Name),
+    {value,{comment,"Basic comment"}} = lists:keysearch(comment,1,S5),
+    {value,{internalservicename,IntName}} =
+    lists:keysearch(internalservicename,1,S5),
+    NewName = "test_service_21",
+    S6 = erlsrv:new_service(NewName,S5,[]), % should remove
+    % internalservicename
+    ok = erlsrv:store_service(S6),
+    S7 = erlsrv:get_service(NewName),
+    {value,{comment,"Basic comment"}} = lists:keysearch(comment,1,S7),
+    {value,{internalservicename,[$t,$e,$s,$t | _]}} =
+    lists:keysearch(internalservicename,1,S7),
+    remove_service(Name),
+    remove_service(NewName),
     ok.
 
-service_env(doc) ->
-    ["Check that service name and executable is in the environment of the " ++ 
-     "erlang process created by erlsrv."];
-service_env(suite) -> [];
+%% Check that service name and executable is in the environment of the
+%% erlang process created by erlsrv.
 service_env(Config) when is_list(Config) ->
-    ?line Name = "test_service_2",
-    ?line Service = [{servicename,Name},
-		     {args, ["-setcookie", 
-		      atom_to_list(erlang:get_cookie())]}],
-    ?line ok = erlsrv:store_service(Service),
-    ?line start_service(Name),
-    ?line true = wait_for_node(Name),
-    ?line Name = rpc:call(make_full_name(Name),os,getenv,
-			  ["ERLSRV_SERVICE_NAME"]),
-    ?line "erlsrv.exe" = filename:basename(
-			   hd(
-			     string:tokens(
-			       rpc:call(make_full_name(Name),
-					os,
-					getenv,
-					["ERLSRV_EXECUTABLE"]),
-			       "\""))),
-    ?line remove_service(Name),
+    Name = "test_service_2",
+    Service = [{servicename,Name},
+               {args, ["-setcookie", atom_to_list(erlang:get_cookie())]}],
+    ok = erlsrv:store_service(Service),
+    start_service(Name),
+    true = wait_for_node(Name),
+    Name = rpc:call(make_full_name(Name),os,getenv,
+                    ["ERLSRV_SERVICE_NAME"]),
+    "erlsrv.exe" = filename:basename(
+                     hd(
+                       string:tokens(
+                         rpc:call(make_full_name(Name),
+                                  os,
+                                  getenv,
+                                  ["ERLSRV_EXECUTABLE"]),
+                         "\""))),
+    remove_service(Name),
     ok.
-user_env(doc) ->
-    ["Check that the user defined environment is ADDED to the service's"++
-     " normal dito."];
-user_env(suite) -> [];
+
+%% Check that the user defined environment is ADDED to the service's
+%% normal dito.
 user_env(Config) when is_list(Config) ->
-    ?line Name = "test_service_3",
-    ?line Service = [{servicename,Name},{env,[{"HUBBA","BUBBA"}]},
-		     {args, ["-setcookie", 
-		      atom_to_list(erlang:get_cookie())]}],
-    ?line ok = erlsrv:store_service(Service),
-    ?line start_service(Name),
-    ?line true = wait_for_node(Name),
-    ?line true = rpc:call(make_full_name(Name),os,getenv,
-			  ["SystemDrive"]) =/= false,
-    ?line "BUBBA" = rpc:call(make_full_name(Name),os,getenv,["HUBBA"]),
-    ?line remove_service(Name),
+    Name = "test_service_3",
+    Service = [{servicename,Name},{env,[{"HUBBA","BUBBA"}]},
+               {args, ["-setcookie", atom_to_list(erlang:get_cookie())]}],
+    ok = erlsrv:store_service(Service),
+    start_service(Name),
+    true = wait_for_node(Name),
+    true = rpc:call(make_full_name(Name),os,getenv,
+                    ["SystemDrive"]) =/= false,
+    "BUBBA" = rpc:call(make_full_name(Name),os,getenv,["HUBBA"]),
+    remove_service(Name),
     ok.
-synced(doc) -> 
-    ["Check that services are stopped and started syncronous and that"++
-     " failed stopactions kill the erlang machine anyway."];
-synced(suite) -> [];
+
+%% Check that services are stopped and started syncronous and that
+%% failed stopactions kill the erlang machine anyway.
 synced(Config) when is_list(Config) ->
-    ?line Name0 = "test_service_4",
-    ?line Service0 = [{servicename,Name0},
-		      {machine, "N:\\nickeNyfikenPaSjukhus"}],
-    ?line ok = erlsrv:store_service(Service0),
-    ?line true = (catch start_service(Name0)) =/= ok,
-    ?line remove_service(Name0),
-    ?line Name = "test_service_5",
-    ?line Service = [{servicename,Name},
-		     {stopaction,"erlang:info(garbage_collection)."},
-		     {args, ["-setcookie",      
-			     atom_to_list(erlang:get_cookie())]}],
-    ?line ok = erlsrv:store_service(Service),
-    ?line start_service(Name),
-    ?line true = wait_for_node(Name),
-    ?line T1 = calendar:datetime_to_gregorian_seconds(
-		 calendar:universal_time()),
-    ?line stop_service(Name),
-    ?line Diff1 = calendar:datetime_to_gregorian_seconds(
-		    calendar:universal_time()) - T1,
-    ?line true = Diff1 > 30,
-    ?line start_service(Name),
-    ?line true = wait_for_node(Name),
-    ?line T2 = calendar:datetime_to_gregorian_seconds(
-		 calendar:universal_time()),
-    ?line remove_service(Name),
-    ?line Diff2 = calendar:datetime_to_gregorian_seconds(
-		    calendar:universal_time()) - T2,
-    ?line true = Diff2 > 30,
+    Name0 = "test_service_4",
+    Service0 = [{servicename,Name0},
+                {machine, "N:\\nickeNyfikenPaSjukhus"}],
+    ok = erlsrv:store_service(Service0),
+    true = (catch start_service(Name0)) =/= ok,
+    remove_service(Name0),
+    Name = "test_service_5",
+    Service = [{servicename,Name},
+               {stopaction,"erlang:info(garbage_collection)."},
+               {args, ["-setcookie", atom_to_list(erlang:get_cookie())]}],
+    ok = erlsrv:store_service(Service),
+    start_service(Name),
+    true = wait_for_node(Name),
+    T1 = calendar:datetime_to_gregorian_seconds(
+           calendar:universal_time()),
+    stop_service(Name),
+    Diff1 = calendar:datetime_to_gregorian_seconds(
+              calendar:universal_time()) - T1,
+    true = Diff1 > 30,
+    start_service(Name),
+    true = wait_for_node(Name),
+    T2 = calendar:datetime_to_gregorian_seconds(
+           calendar:universal_time()),
+    remove_service(Name),
+    Diff2 = calendar:datetime_to_gregorian_seconds(
+              calendar:universal_time()) - T2,
+    true = Diff2 > 30,
     ok.
-service_prio(doc) ->
-    ["Check that a service with higher prio create port programs with "
-     "higher prio."]; 
-service_prio(suite) -> [];
+
+%% Check that a service with higher prio create port programs with
+%% higher prio.
 service_prio(Config) when is_list(Config) ->
-    ?line Name = "test_service_6",
-    ?line Service = [{servicename,Name},{prio,"high"},
-		     {env, [{"HEART_COMMAND","echo off"}]},
-		     {args, ["-setcookie", 
-			     atom_to_list(erlang:get_cookie()),
-			     "-heart"]}],
-    ?line ok = erlsrv:store_service(Service),
-    ?line {ok, OldProcs} = get_current_procs(Config),
-    ?line start_service(Name),
-    ?line {ok, NewProcs} = get_current_procs(Config),
+    Name = "test_service_6",
+    Service = [{servicename,Name},{prio,"high"},
+               {env, [{"HEART_COMMAND","echo off"}]},
+               {args, ["-setcookie", atom_to_list(erlang:get_cookie()),
+                       "-heart"]}],
+    ok = erlsrv:store_service(Service),
+    {ok, OldProcs} = get_current_procs(Config),
+    start_service(Name),
+    {ok, NewProcs} = get_current_procs(Config),
     timer:sleep(2000),
-    ?line {ok, NewProcs2} = get_current_procs(Config),
-    ?line remove_service(Name),
-    ?line Diff = arrived_procs(OldProcs,NewProcs),
+    {ok, NewProcs2} = get_current_procs(Config),
+    remove_service(Name),
+    Diff = arrived_procs(OldProcs,NewProcs),
     io:format("NewProcs ~p~n after sleep~n ~p~n",[Diff, arrived_procs(OldProcs,NewProcs2)]),
     %% Not really correct, could fail if another heart is
     %% started at the same time...
-    ?line {value, {"heart.exe",_,"high"}} = 
-	lists:keysearch("heart.exe",1,Diff),
+    {value, {"heart.exe",_,"high"}} = lists:keysearch("heart.exe",1,Diff),
     ok.
-logout(doc) -> 
-    ["Check that logout does not kill services"];
-logout(suite) -> [];
+
+%% Check that logout does not kill services
 logout(Config) when is_list(Config) ->
-    ?line {comment, "Have to be run manually by registering a service with " ++
-	   "heart, logout and log in again and then examine that the heart " ++
-	   "process id is not changed."}.
-debug(doc) ->
-    ["Check the debug options to erlsrv."];
-debug(suite) -> [];
+    {comment, "Have to be run manually by registering a service with " ++
+     "heart, logout and log in again and then examine that the heart " ++
+     "process id is not changed."}.
+
+%% Check the debug options to erlsrv.
 debug(Config) when is_list(Config) ->
-    ?line Name0 = "test_service_7",
+    Name0 = "test_service_7",
 
     %% We used to set the privdir as temporary directory, but for some
     %% reason we don't seem to have write access to that directory,
     %% so we'll use the directory specified in the next line.
-    ?line TempDir = "C:/TEMP",
-    ?line Service0 = [{servicename,Name0},
-  		      {workdir,filename:nativename(TempDir)},
-		      {debugtype,"reuse"},
-		      {args, ["-setcookie", 
-			      atom_to_list(erlang:get_cookie())]}],
-    ?line ok = erlsrv:store_service(Service0),
-    ?line T1 = calendar:datetime_to_gregorian_seconds(
-		 calendar:local_time()),
+    TempDir = "C:/TEMP",
+    Service0 = [{servicename,Name0},
+                {workdir,filename:nativename(TempDir)},
+                {debugtype,"reuse"},
+                {args, ["-setcookie", atom_to_list(erlang:get_cookie())]}],
+    ok = erlsrv:store_service(Service0),
+    T1 = calendar:datetime_to_gregorian_seconds(
+           calendar:local_time()),
     %% sleep a little
-    ?line receive after 2000 -> ok end,
-    ?line start_service(Name0),
-    ?line true = wait_for_node(Name0),
-    ?line LF = filename:join(TempDir, Name0++".debug"),
-    ?line {ok,Info0} = file:read_file_info(LF),
-    ?line T2 = calendar:datetime_to_gregorian_seconds(
-		 Info0#file_info.mtime),
-    ?line true = T2 > T1,
-    ?line remove_service(Name0),
-    ?line file:delete(LF),
-    ?line Name1 = "test_service_8",
-    ?line Service1 = [{servicename,Name1},
-		      {workdir, filename:nativename(TempDir)},
-		      {debugtype,"new"},
-		      {args, ["-setcookie", 
-			      atom_to_list(erlang:get_cookie())]}],
-    ?line ok = erlsrv:store_service(Service1),
-    ?line T3 = calendar:datetime_to_gregorian_seconds(
-		 calendar:local_time()),
+    receive after 2000 -> ok end,
+    start_service(Name0),
+    true = wait_for_node(Name0),
+    LF = filename:join(TempDir, Name0++".debug"),
+    {ok,Info0} = file:read_file_info(LF),
+    T2 = calendar:datetime_to_gregorian_seconds(
+           Info0#file_info.mtime),
+    true = T2 > T1,
+    remove_service(Name0),
+    file:delete(LF),
+    Name1 = "test_service_8",
+    Service1 = [{servicename,Name1},
+                {workdir, filename:nativename(TempDir)},
+                {debugtype,"new"},
+                {args, ["-setcookie", atom_to_list(erlang:get_cookie())]}],
+    ok = erlsrv:store_service(Service1),
+    T3 = calendar:datetime_to_gregorian_seconds(
+           calendar:local_time()),
     %% sleep a little
-    ?line receive after 2000 -> ok end,
-    ?line NF = next_logfile(TempDir, Name1),
-    ?line start_service(Name1),
-    ?line true = wait_for_node(Name1),
-    ?line {ok,Info1} = file:read_file_info(NF),
-    ?line T4 = calendar:datetime_to_gregorian_seconds(
-		 Info1#file_info.mtime),
-    ?line true = T4 > T3,
-    ?line remove_service(Name1),
-    ?line file:delete(NF),
+    receive after 2000 -> ok end,
+    NF = next_logfile(TempDir, Name1),
+    start_service(Name1),
+    true = wait_for_node(Name1),
+    {ok,Info1} = file:read_file_info(NF),
+    T4 = calendar:datetime_to_gregorian_seconds(
+           Info1#file_info.mtime),
+    true = T4 > T3,
+    remove_service(Name1),
+    file:delete(NF),
     ok.
 
-restart(doc) ->
-    ["Check the restart options to erlsrv"];
-restart(suite) -> [];
+%% Check the restart options to erlsrv
 restart(Config) when is_list(Config) ->
-    ?line Name = "test_service_9",
-    ?line Service = [{servicename,Name},
-		     {workdir, filename:nativename(logdir(Config))},
-		     {onfail,"restart"},
-		     {args, ["-setcookie", 
-			     atom_to_list(erlang:get_cookie())]}],
-    ?line ok = erlsrv:store_service(Service),
-    ?line start_service(Name),
-    ?line true = wait_for_node(Name),
-    ?line receive after 20000 -> ok end,
-    ?line rpc:call(make_full_name(Name),erlang,halt,[]),
-    ?line receive after 1000 -> ok end,
-    ?line true = wait_for_node(Name),
-    ?line rpc:call(make_full_name(Name),erlang,halt,[]),
-    ?line receive after 1000 -> ok end,
-    ?line false = wait_for_node(Name),
-    ?line remove_service(Name),
+    Name = "test_service_9",
+    Service = [{servicename,Name},
+               {workdir, filename:nativename(logdir(Config))},
+               {onfail,"restart"},
+               {args, ["-setcookie", atom_to_list(erlang:get_cookie())]}],
+    ok = erlsrv:store_service(Service),
+    start_service(Name),
+    true = wait_for_node(Name),
+    receive after 20000 -> ok end,
+    rpc:call(make_full_name(Name),erlang,halt,[]),
+    receive after 1000 -> ok end,
+    true = wait_for_node(Name),
+    rpc:call(make_full_name(Name),erlang,halt,[]),
+    receive after 1000 -> ok end,
+    false = wait_for_node(Name),
+    remove_service(Name),
     ok.
 
-restart_always(doc) ->
-    ["Check the restart options to erlsrv"];
-restart_always(suite) -> [];
+%% Check the restart options to erlsrv
 restart_always(Config) when is_list(Config) ->
-    ?line Name = "test_service_10",
-    ?line Service = [{servicename,Name},
-		     {workdir, filename:nativename(logdir(Config))},
-		     {onfail,"restart_always"},
-		     {args, ["-setcookie", 
-			     atom_to_list(erlang:get_cookie())]}],
-    ?line ok = erlsrv:store_service(Service),
-    ?line start_service(Name),
-    ?line true = wait_for_node(Name),
-    ?line rpc:call(make_full_name(Name),erlang,halt,[]),
-    ?line receive after 1000 -> ok end,
-    ?line true = wait_for_node(Name),
-    ?line rpc:call(make_full_name(Name),erlang,halt,[]),
-    ?line receive after 1000 -> ok end,
-    ?line true = wait_for_node(Name),
-    ?line remove_service(Name),
+    Name = "test_service_10",
+    Service = [{servicename,Name},
+               {workdir, filename:nativename(logdir(Config))},
+               {onfail,"restart_always"},
+               {args, ["-setcookie", atom_to_list(erlang:get_cookie())]}],
+    ok = erlsrv:store_service(Service),
+    start_service(Name),
+    true = wait_for_node(Name),
+    rpc:call(make_full_name(Name),erlang,halt,[]),
+    receive after 1000 -> ok end,
+    true = wait_for_node(Name),
+    rpc:call(make_full_name(Name),erlang,halt,[]),
+    receive after 1000 -> ok end,
+    true = wait_for_node(Name),
+    remove_service(Name),
     ok.
-stopaction(doc) ->
-    ["Check that stopaction does not hang output while shutting down"];
-stopaction(suite) -> [];
+
+%% Check that stopaction does not hang output while shutting down
 stopaction(Config) when is_list(Config) ->
-    ?line Name = "test_service_11",
+    Name = "test_service_11",
     %% Icky, I prepend the first element in the codepath, cause
     %% I "suppose" it's the one to where I am. 
-    ?line Service = [{servicename,Name},
-		     {stopaction,atom_to_list(?MODULE) ++ ":shutdown_io()."},
-		     {args, ["-setcookie", 
-			     atom_to_list(erlang:get_cookie()),
-			     "-pa", hd(code:get_path())]}],
-    ?line ok = erlsrv:store_service(Service),
-    ?line start_service(Name),
-    ?line true = wait_for_node(Name),
-    ?line T1 = calendar:datetime_to_gregorian_seconds(
-		 calendar:universal_time()),
-    ?line stop_service(Name),
-    ?line Diff1 = calendar:datetime_to_gregorian_seconds(
-		    calendar:universal_time()) - T1,
-    ?line true = Diff1 < 30,
-    ?line remove_service(Name),
+    Service = [{servicename,Name},
+               {stopaction,atom_to_list(?MODULE) ++ ":shutdown_io()."},
+               {args, ["-setcookie", atom_to_list(erlang:get_cookie()),
+                       "-pa", hd(code:get_path())]}],
+    ok = erlsrv:store_service(Service),
+    start_service(Name),
+    true = wait_for_node(Name),
+    T1 = calendar:datetime_to_gregorian_seconds(
+           calendar:universal_time()),
+    stop_service(Name),
+    Diff1 = calendar:datetime_to_gregorian_seconds(
+              calendar:universal_time()) - T1,
+    true = Diff1 < 30,
+    remove_service(Name),
     ok.
 
 
 %%% This test is run on all platforms, but just gives a comment on 
 %%% other platforms than NT.
 
-nt(doc) ->
-    ["Run NT specific tests."];
-nt(suite) ->
-    [];
 nt(Config) when is_list(Config) ->
     case os:type() of
-	{win32,nt} ->
-	    nt_run();
-	_ ->
-	    {skipped, "This test case is intended for Win NT only."}
+        {win32,nt} ->
+            nt_run();
+        _ ->
+            {skipped, "This test case is intended for Win NT only."}
     end.
 
 
 nt_run() ->
-    ?line start_all(),
-    ?line create_service("test_service_1"),
-    ?line R = start_look_for_single("System","ErlSrv","Informational",
-				    ".*test_service_1.*started.*"),
-    ?line start_service("test_service_1"),
-    ?line Res = look_for_single(R),
-    ?line io:format("Result from eventlog: ~p~n",
-	      [Res]),
-    ?line remove_service("test_service_1"),
-    ?line stop_all(),
+    start_all(),
+    create_service("test_service_1"),
+    R = start_look_for_single("System","ErlSrv","Informational",
+                              ".*test_service_1.*started.*"),
+    start_service("test_service_1"),
+    Res = look_for_single(R),
+    io:format("Result from eventlog: ~p~n",
+              [Res]),
+    remove_service("test_service_1"),
+    stop_all(),
     ok.
 
 start_all() ->
     Pid1 = spawn_link(?MODULE,middleman,[[]]),
     register(?MODULE,Pid1),
     _Pid2 = nteventlog:start("log_testing",
-			     {?MODULE,handle_eventlog,[Pid1]}).
+                             {?MODULE,handle_eventlog,[Pid1]}).
 
 stop_all() ->
     ?MODULE ! stop,
@@ -454,10 +405,10 @@ start_look_for_single(Cat,Fac,Sev,MessRE) ->
 
 look_for_single(Ref) ->
     receive
-	{Ref,Time,Mes} ->
-	    {Time,Mes}
+        {Ref,Time,Mes} ->
+            {Time,Mes}
     after 60000 ->
-	    timeout
+              timeout
     end.
 
 
@@ -468,25 +419,25 @@ handle_eventlog(Mes,Pid) ->
 %%% Waitfor = [{Pid, Ref, {Category,Facility,Severity,MessageRE}} ...]
 middleman(Waitfor) ->
     receive 
-	{Time,Category,Facility,Severity,Message} ->
-	    io:format("Middleman got ~s...", [Message]),
-	    case match_event({Time,Category,Facility,Severity,Message},
-			     Waitfor) of
-		{ok, {Pid,Ref,Time,Mes}, Rest} ->
-		    io:format("matched~n"),
-		    Pid ! {Ref,Time,Mes},
-		    middleman(Rest);
-		_ ->
-		    io:format("no match~n"),
-		    middleman(Waitfor)
-	    end;
-	{lookfor, X} ->
-	    io:format("Middleman told to look for ~p~n", [X]),
-	    middleman([X|Waitfor]);
-	stop ->
-	    stopped;
-	_ ->
-	    middleman(Waitfor)
+        {Time,Category,Facility,Severity,Message} ->
+            io:format("Middleman got ~s...", [Message]),
+            case match_event({Time,Category,Facility,Severity,Message},
+                             Waitfor) of
+                {ok, {Pid,Ref,Time,Mes}, Rest} ->
+                    io:format("matched~n"),
+                    Pid ! {Ref,Time,Mes},
+                    middleman(Rest);
+                _ ->
+                    io:format("no match~n"),
+                    middleman(Waitfor)
+            end;
+        {lookfor, X} ->
+            io:format("Middleman told to look for ~p~n", [X]),
+            middleman([X|Waitfor]);
+        stop ->
+            stopped;
+        _ ->
+            middleman(Waitfor)
     end.
 
 
@@ -495,81 +446,81 @@ match_event(_X, []) ->
     nomatch;
 match_event({Time,Cat,Fac,Sev,Mes},[{Pid,Ref,{Cat,Fac,Sev,MesRE}} | Tail]) ->
     case re:run(Mes,MesRE,[{capture,none}]) of
-	match ->
-	    %%io:format("Match!~n"),
-	    {ok,{Pid,Ref,Time,Mes},Tail};
-	nomatch ->
-	    %%io:format("No match~n"),
-	    case match_event({Time,Cat,Fac,Sev,Mes},Tail) of
-		{ok,X,Rest} ->
-		    {ok,X,[{Pid,Ref,{Cat,Fac,Sev,MesRE}} | Rest]};
-		X ->
-		    X
-	    end
+        match ->
+            %%io:format("Match!~n"),
+            {ok,{Pid,Ref,Time,Mes},Tail};
+        nomatch ->
+            %%io:format("No match~n"),
+            case match_event({Time,Cat,Fac,Sev,Mes},Tail) of
+                {ok,X,Rest} ->
+                    {ok,X,[{Pid,Ref,{Cat,Fac,Sev,MesRE}} | Rest]};
+                X ->
+                    X
+            end
     end;
 match_event(X,[Y | T]) ->
     %%io:format("X == ~p, Y == ~p~n",[X,Y]),
     case match_event(X,T) of
-	{ok,Z,R} ->
-	    {ok,Z,[Y|R]};
-	XX ->
-	    XX
+        {ok,Z,R} ->
+            {ok,Z,[Y|R]};
+        XX ->
+            XX
     end.
 
 arrived_procs(_,[]) ->
     [];
 arrived_procs(OldProcs,[{Executable, Pid, Priority} | TNewProcs]) ->
     case lists:keysearch(Pid,2,OldProcs) of
-	{value, _} ->
-	    arrived_procs(OldProcs, TNewProcs);
-	false ->
-	    [{Executable, Pid, Priority} | arrived_procs(OldProcs, TNewProcs)]
+        {value, _} ->
+            arrived_procs(OldProcs, TNewProcs);
+        false ->
+            [{Executable, Pid, Priority} | arrived_procs(OldProcs, TNewProcs)]
     end.
-    
+
 
 get_current_procs(Config) -> 
-    ?line P = open_port({spawn,nt_info(Config) ++ " -E"},
-			[{line,10000}]),
-    ?line L = receive
-		  {P,{data,{eol,D}}} ->
-		      D;
-		  _ -> "error. "
-	      end,
-    ?line P ! {self(), close},
-    ?line receive
-	      {P, closed} -> ok
-	  end,
-    ?line {done,{ok,Tok,_},_} = erl_scan:tokens([],L,0),
-    ?line erl_parse:parse_term(Tok).
+    P = open_port({spawn,nt_info(Config) ++ " -E"},
+                  [{line,10000}]),
+    L = receive
+            {P,{data,{eol,D}}} ->
+                D;
+            _ -> "error. "
+        end,
+    P ! {self(), close},
+    receive
+        {P, closed} -> ok
+    end,
+    {done,{ok,Tok,_},_} = erl_scan:tokens([],L,0),
+    erl_parse:parse_term(Tok).
 
 nt_info(Config) when is_list(Config) ->
-    ?line "\"" ++ filename:join(?config(data_dir, Config), "nt_info") ++ "\"".
+    "\"" ++ filename:join(proplists:get_value(data_dir, Config), "nt_info") ++ "\"".
 
 
 logdir(Config) ->
-    ?line ?config(priv_dir, Config).
+    proplists:get_value(priv_dir, Config).
 
 look_for_next(Template,L,N) ->
-    ?line FN = Template ++ integer_to_list(N),
-    ?line case lists:member(FN,L) of
-	true ->
-	    ?line look_for_next(Template,L,N+1);
-	false ->
-	    ?line FN
+    FN = Template ++ integer_to_list(N),
+    case lists:member(FN,L) of
+        true ->
+            look_for_next(Template,L,N+1);
+        false ->
+            FN
     end.
 
 next_logfile(LD, Servicename) ->
-    ?line {ok, Files} = file:list_dir(LD),
-    ?line Ftmpl = Servicename ++ ".debug.",
-    ?line filename:join(LD,look_for_next(Ftmpl,Files,1)).
+    {ok, Files} = file:list_dir(LD),
+    Ftmpl = Servicename ++ ".debug.",
+    filename:join(LD,look_for_next(Ftmpl,Files,1)).
 
 %%% Functions run by the service
 
 do_shutdown_io() ->
     receive
     after 2000 ->
-	    io:format("IO in shutting down...~n"),
-	    erlang:halt()
+              io:format("IO in shutting down...~n"),
+              erlang:halt()
     end.
 
 shutdown_io() ->
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index 69a0d19719..7ca0f50263 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -20,18 +20,20 @@
 
 -module(otp_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
-	 init_per_suite/1,end_per_suite/1]).
+-export([all/0, suite/0,
+         init_per_suite/1,end_per_suite/1]).
 -export([undefined_functions/1,deprecated_not_in_obsolete/1,
-	 obsolete_but_not_deprecated/1,call_to_deprecated/1,
+         obsolete_but_not_deprecated/1,call_to_deprecated/1,
          call_to_size_1/1,call_to_now_0/1,strong_components/1,
-	 erl_file_encoding/1,xml_file_encoding/1,runtime_dependencies/1]).
+         erl_file_encoding/1,xml_file_encoding/1,runtime_dependencies/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -import(lists, [filter/2,foldl/3,foreach/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 10}}].
 
 all() -> 
     [undefined_functions, deprecated_not_in_obsolete,
@@ -40,54 +42,41 @@ all() ->
      erl_file_encoding, xml_file_encoding,
      runtime_dependencies].
 
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 init_per_suite(Config) ->
-    Dog = test_server:timetrap(?t:minutes(10)),
     Root = code:root_dir(),
     Server = daily_xref,
-    ?line xref:start(Server),
-    ?line xref:set_default(Server, [{verbose,false},
-                                    {warnings,false},
-                                    {builtins,true}]),
-    ?line {ok,_Relname} = xref:add_release(Server, Root, {name,otp}),
+    xref:start(Server),
+    xref:set_default(Server, [{verbose,false},
+                              {warnings,false},
+                              {builtins,true}]),
+    {ok,_Relname} = xref:add_release(Server, Root, {name,otp}),
 
     %% If we are running the tests in the source tree, the ERTS application
     %% is not in the code path. We must add it explicitly.
     case code:lib_dir(erts) of
-	{error,bad_name} ->
-	    Erts = filename:join([code:root_dir(),"erts","preloaded","ebin"]),
-	    ?line {ok,_} = xref:add_directory(Server, Erts, []);
-	_ ->
-	    ok
+        {error,bad_name} ->
+            Erts = filename:join([code:root_dir(),"erts","preloaded","ebin"]),
+            {ok,_} = xref:add_directory(Server, Erts, []);
+        _ ->
+            ok
     end,
-	    
-    ?line ?t:timetrap_cancel(Dog),
     [{xref_server,Server}|Config].
 
 end_per_suite(Config) ->
-    Server = ?config(xref_server, Config),
+    Server = proplists:get_value(xref_server, Config),
     catch xref:stop(Server),
     Config.
 
 undefined_functions(Config) when is_list(Config) ->
-    Server = ?config(xref_server, Config),
+    Server = proplists:get_value(xref_server, Config),
 
     %% Exclude calls from generated modules in the SSL application.
     ExcludeFrom = "SSL-PKIX|PKIX.*|ssl_pkix_oid",
-    ?line UndefS = xref_base:analysis(undefined_function_calls),
-    ?line Q = io_lib:format("Undef = ~s,"
-		      "ExcludedFrom = ~p:_/_,"
-		      "Undef - Undef | ExcludedFrom", 
-		      [UndefS,ExcludeFrom]),
+    UndefS = xref_base:analysis(undefined_function_calls),
+    Q = io_lib:format("Undef = ~s,"
+                      "ExcludedFrom = ~p:_/_,"
+                      "Undef - Undef | ExcludedFrom",
+                      [UndefS,ExcludeFrom]),
     {ok,Undef0} = xref:q(Server, lists:flatten(Q)),
     Undef1 = hipe_filter(Undef0),
     Undef2 = ssl_crypto_filter(Undef1),
@@ -99,124 +88,124 @@ undefined_functions(Config) when is_list(Config) ->
     Undef = diameter_filter(Undef7),
 
     case Undef of
-	[] -> ok;
-	_ ->
-	    Fd = open_log(Config, "undefined_functions"),
-	    foreach(fun ({MFA1,MFA2}) ->
-			    io:format("~s calls undefined ~s",
-				      [format_mfa(Server, MFA1),
-				       format_mfa(MFA2)]),
-			    io:format(Fd, "~s ~s\n",
-				      [format_mfa(Server, MFA1),
-				       format_mfa(MFA2)])
-		    end, Undef),
-	    close_log(Fd),
-	    ?line ?t:fail({length(Undef),undefined_functions_in_otp})
+        [] -> ok;
+        _ ->
+            Fd = open_log(Config, "undefined_functions"),
+            foreach(fun ({MFA1,MFA2}) ->
+                            io:format("~s calls undefined ~s",
+                                      [format_mfa(Server, MFA1),
+                                       format_mfa(MFA2)]),
+                            io:format(Fd, "~s ~s\n",
+                                      [format_mfa(Server, MFA1),
+                                       format_mfa(MFA2)])
+                    end, Undef),
+            close_log(Fd),
+            ct:fail({length(Undef),undefined_functions_in_otp})
     end.
 
 hipe_filter(Undef) ->
     case erlang:system_info(hipe_architecture) of
-	undefined ->
-	    filter(fun ({_,{hipe_bifs,_,_}}) -> false;
-		       ({_,{hipe,_,_}}) -> false;
-		       ({_,{hipe_consttab,_,_}}) -> false;
-		       ({_,{hipe_converters,_,_}}) -> false;
-		       ({{code,_,_},{Mod,_,_}}) ->
-			   not is_hipe_module(Mod);
-		       ({{code_server,_,_},{Mod,_,_}}) ->
-			   not is_hipe_module(Mod);
-		       ({{compile,_,_},{Mod,_,_}}) ->
-			   not is_hipe_module(Mod);
-		       ({{hipe,_,_},{Mod,_,_}}) ->
-			   %% See comment for the next clause.
-			   not is_hipe_module(Mod);
-		       ({{cerl_to_icode,translate_flags1,2},
-			 {hipe_rtl_arch,endianess,0}}) ->
-			   false;
-		       ({{Caller,_,_},{Callee,_,_}}) ->
-			   %% Part of the hipe application is here
-			   %% for the sake of Dialyzer. There are many
-			   %% undefined calls within the hipe application.
-			   not is_hipe_module(Caller) orelse
-			       not is_hipe_module(Callee);
-		       (_) -> true
-		   end, Undef);
-	_Arch ->
-	    filter(fun ({{Mod,_,_},{hipe_bifs,write_u64,2}}) ->
-			   %% Unavailable except in 64 bit AMD. Ignore it.
-			   not is_hipe_module(Mod);
-		       (_) -> true
-		   end, Undef)
+        undefined ->
+            filter(fun ({_,{hipe_bifs,_,_}}) -> false;
+                       ({_,{hipe,_,_}}) -> false;
+                       ({_,{hipe_consttab,_,_}}) -> false;
+                       ({_,{hipe_converters,_,_}}) -> false;
+                       ({{code,_,_},{Mod,_,_}}) ->
+                           not is_hipe_module(Mod);
+                       ({{code_server,_,_},{Mod,_,_}}) ->
+                           not is_hipe_module(Mod);
+                       ({{compile,_,_},{Mod,_,_}}) ->
+                           not is_hipe_module(Mod);
+                       ({{hipe,_,_},{Mod,_,_}}) ->
+                           %% See comment for the next clause.
+                           not is_hipe_module(Mod);
+                       ({{cerl_to_icode,translate_flags1,2},
+                         {hipe_rtl_arch,endianess,0}}) ->
+                           false;
+                       ({{Caller,_,_},{Callee,_,_}}) ->
+                           %% Part of the hipe application is here
+                           %% for the sake of Dialyzer. There are many
+                           %% undefined calls within the hipe application.
+                           not is_hipe_module(Caller) orelse
+                           not is_hipe_module(Callee);
+                       (_) -> true
+                   end, Undef);
+        _Arch ->
+            filter(fun ({{Mod,_,_},{hipe_bifs,write_u64,2}}) ->
+                           %% Unavailable except in 64 bit AMD. Ignore it.
+                           not is_hipe_module(Mod);
+                       (_) -> true
+                   end, Undef)
     end.
 
 is_hipe_module(Mod) ->
     case atom_to_list(Mod) of
-	"hipe_"++_ -> true;
-	_ -> false
+        "hipe_"++_ -> true;
+        _ -> false
     end.
 
 ssl_crypto_filter(Undef) ->
     case {app_exists(crypto),app_exists(ssl)} of
-	{false,false} ->
-	    filter(fun({_,{ssl,_,_}}) -> false;
-		      ({_,{crypto,_,_}}) -> false;
-		      ({_,{ssh,_,_}}) -> false;
-		      ({_,{ssh_connection,_,_}}) -> false;
-		      ({_,{ssh_sftp,_,_}}) -> false;
-		      (_) -> true
-		   end, Undef);
-	{_,_} -> Undef
+        {false,false} ->
+            filter(fun({_,{ssl,_,_}}) -> false;
+                      ({_,{crypto,_,_}}) -> false;
+                      ({_,{ssh,_,_}}) -> false;
+                      ({_,{ssh_connection,_,_}}) -> false;
+                      ({_,{ssh_sftp,_,_}}) -> false;
+                      (_) -> true
+                   end, Undef);
+        {_,_} -> Undef
     end.
 
 edoc_filter(Undef) ->
     %% Filter away function call that is catched.
     filter(fun({{edoc_lib,uri_get_http,1},{http,request_sync,2}}) -> false;
-	      (_) -> true
-	   end, Undef).
+              (_) -> true
+           end, Undef).
 
 eunit_filter(Undef) ->
     filter(fun({{eunit_test,wrapper_test_exported_,0},
-		{eunit_test,nonexisting_function,0}}) -> false;
-	      (_) -> true
-	   end, Undef).
+                {eunit_test,nonexisting_function,0}}) -> false;
+              (_) -> true
+           end, Undef).
 
 dialyzer_filter(Undef) ->
     case app_exists(dialyzer) of
-	false ->
-	    filter(fun({_,{dialyzer_callgraph,_,_}}) -> false;
-		      ({_,{dialyzer_codeserver,_,_}}) -> false;
-		      ({_,{dialyzer_contracts,_,_}}) -> false;
-		      ({_,{dialyzer_cl_parse,_,_}}) -> false;
-		      ({_,{dialyzer_timing,_,_}}) -> false;
-		      ({_,{dialyzer_plt,_,_}}) -> false;
-		      ({_,{dialyzer_succ_typings,_,_}}) -> false;
-		      ({_,{dialyzer_utils,_,_}}) -> false;
-		      (_) -> true
-		   end, Undef);
-	_ -> Undef
+        false ->
+            filter(fun({_,{dialyzer_callgraph,_,_}}) -> false;
+                      ({_,{dialyzer_codeserver,_,_}}) -> false;
+                      ({_,{dialyzer_contracts,_,_}}) -> false;
+                      ({_,{dialyzer_cl_parse,_,_}}) -> false;
+                      ({_,{dialyzer_timing,_,_}}) -> false;
+                      ({_,{dialyzer_plt,_,_}}) -> false;
+                      ({_,{dialyzer_succ_typings,_,_}}) -> false;
+                      ({_,{dialyzer_utils,_,_}}) -> false;
+                      (_) -> true
+                   end, Undef);
+        _ -> Undef
     end.
 
 wx_filter(Undef) ->
     case app_exists(wx) of
-	false ->
-	    filter(fun({_,{MaybeWxModule,_,_}}) ->
-			   case atom_to_list(MaybeWxModule) of
-			       "wx"++_ -> false;
-			       _ -> true
-			   end
-		   end, Undef);
-	_ -> Undef
+        false ->
+            filter(fun({_,{MaybeWxModule,_,_}}) ->
+                           case atom_to_list(MaybeWxModule) of
+                               "wx"++_ -> false;
+                               _ -> true
+                           end
+                   end, Undef);
+        _ -> Undef
     end.
-				   
+
 gs_filter(Undef) ->
     case code:lib_dir(gs) of
-	{error,bad_name} ->
-	    filter(fun({_,{gs,_,_}}) -> false;
-		      ({_,{gse,_,_}}) -> false;
+        {error,bad_name} ->
+            filter(fun({_,{gs,_,_}}) -> false;
+                      ({_,{gse,_,_}}) -> false;
                       ({_,{tool_utils,_,_}}) -> false;
-		      (_) -> true
-		   end, Undef);
-	_ -> Undef
+                      (_) -> true
+                   end, Undef);
+        _ -> Undef
     end.
 
 diameter_filter(Undef) ->
@@ -229,80 +218,82 @@ diameter_filter(Undef) ->
                    false;
               ({{diameter_lib,_,_},{erlang,time_offset,0}}) ->
                    false;
-	      (_) -> true
-	   end, Undef).
+              (_) -> true
+           end, Undef).
 
 deprecated_not_in_obsolete(Config) when is_list(Config) ->
-    ?line Server = ?config(xref_server, Config),
-    ?line {ok,DeprecatedFunctions} = xref:q(Server, "DF"),
-
-    ?line L = foldl(fun({M,F,A}=MFA, Acc) ->
-			    case otp_internal:obsolete(M, F, A) of
-				no -> [MFA|Acc];
-				_ -> Acc
-			    end
-		    end, [], DeprecatedFunctions),
+    Server = proplists:get_value(xref_server, Config),
+    {ok,DeprecatedFunctions} = xref:q(Server, "DF"),
+
+    L = foldl(fun({M,F,A}=MFA, Acc) ->
+                      case otp_internal:obsolete(M, F, A) of
+                          no -> [MFA|Acc];
+                          _ -> Acc
+                      end
+              end, [], DeprecatedFunctions),
     case L of
-	[] -> ok;
-	_ ->
-	    io:put_chars("The following functions have -deprecated() attributes,\n"
-			 "but are not listed in otp_internal:obsolete/3.\n"),
-	    print_mfas(group_leader(), Server, L),
-	    Fd = open_log(Config, "deprecated_not_obsolete"),
-	    print_mfas(Fd, Server, L),
-	    close_log(Fd),
-	    ?line ?t:fail({length(L),deprecated_but_not_obsolete})
+        [] -> ok;
+        _ ->
+            io:put_chars("The following functions have -deprecated() attributes,\n"
+                         "but are not listed in otp_internal:obsolete/3.\n"),
+            print_mfas(group_leader(), Server, L),
+            Fd = open_log(Config, "deprecated_not_obsolete"),
+            print_mfas(Fd, Server, L),
+            close_log(Fd),
+            ct:fail({length(L),deprecated_but_not_obsolete})
     end.
 
 obsolete_but_not_deprecated(Config) when is_list(Config) ->
-    ?line Server = ?config(xref_server, Config),
-    ?line {ok,NotDeprecated} = xref:q(Server, "X - DF"),
+    Server = proplists:get_value(xref_server, Config),
+    {ok,NotDeprecated} = xref:q(Server, "X - DF"),
 
-    ?line L = foldl(fun({M,F,A}=MFA, Acc) ->
-			    case otp_internal:obsolete(M, F, A) of
-				no -> Acc;
-				_ -> [MFA|Acc]
-			    end
-		    end, [], NotDeprecated),
+    L = foldl(fun({M,F,A}=MFA, Acc) ->
+                      case otp_internal:obsolete(M, F, A) of
+                          no -> Acc;
+                          _ -> [MFA|Acc]
+                      end
+              end, [], NotDeprecated),
 
     case L of
-	[] -> ok;
-	_ ->
-	    io:put_chars("The following functions are listed "
-			 "in otp_internal:obsolete/3,\n"
-			 "but don't have -deprecated() attributes.\n"),
-	    print_mfas(group_leader(), Server, L),
-	    Fd = open_log(Config, "obsolete_not_deprecated"),
-	    print_mfas(Fd, Server, L),
-	    close_log(Fd),
-	    ?line ?t:fail({length(L),obsolete_but_not_deprecated})
+        [] -> ok;
+        _ ->
+            io:put_chars("The following functions are listed "
+                         "in otp_internal:obsolete/3,\n"
+                         "but don't have -deprecated() attributes.\n"),
+            print_mfas(group_leader(), Server, L),
+            Fd = open_log(Config, "obsolete_not_deprecated"),
+            print_mfas(Fd, Server, L),
+            close_log(Fd),
+            ct:fail({length(L),obsolete_but_not_deprecated})
     end.
-    
+
 call_to_deprecated(Config) when is_list(Config) ->
-    Server = ?config(xref_server, Config),
-    ?line {ok,DeprecatedCalls} = xref:q(Server, "strict(E || DF)"),
+    Server = proplists:get_value(xref_server, Config),
+    {ok,DeprecatedCalls} = xref:q(Server, "strict(E || DF)"),
     foreach(fun ({MFA1,MFA2}) ->
-		    io:format("~s calls deprecated ~s",
-			      [format_mfa(MFA1),format_mfa(MFA2)])
-	    end, DeprecatedCalls),
+                    io:format("~s calls deprecated ~s",
+                              [format_mfa(MFA1),format_mfa(MFA2)])
+            end, DeprecatedCalls),
     {comment,integer_to_list(length(DeprecatedCalls))++" calls to deprecated functions"}.
 
 call_to_size_1(Config) when is_list(Config) ->
     %% Applications that do not call erlang:size/1:
     Apps = [asn1,compiler,debugger,kernel,observer,parsetools,
-	    runtime_tools,stdlib,tools,webtool],
+            runtime_tools,stdlib,tools],
     not_recommended_calls(Config, Apps, {erlang,size,1}).
 
 call_to_now_0(Config) when is_list(Config) ->
     %% Applications that do not call erlang:now/1:
     Apps = [asn1,common_test,compiler,debugger,dialyzer,
-	    gs,kernel,mnesia,observer,parsetools,reltool,
-	    runtime_tools,sasl,stdlib,syntax_tools,
-	    test_server,tools,webtool],
+            gs,kernel,mnesia,observer,parsetools,reltool,
+            runtime_tools,sasl,stdlib,syntax_tools,
+            tools],
     not_recommended_calls(Config, Apps, {erlang,now,0}).
 
-not_recommended_calls(Config, Apps, MFA) ->
-    Server = ?config(xref_server, Config),
+not_recommended_calls(Config, Apps0, MFA) ->
+    Server = proplists:get_value(xref_server, Config),
+
+    Apps = [App || App <- Apps0, is_present_application(App, Server)],
 
     Fs = [MFA],
 
@@ -313,14 +304,14 @@ not_recommended_calls(Config, Apps, MFA) ->
     {ok,CallsToMFA} = xref:q(Server, lists:flatten(Q2)),
 
     case CallsToMFA of
-	[] -> 
+        [] ->
             ok;
-	_ ->
+        _ ->
             io:format("These calls are not allowed:\n"),
-	    foreach(fun ({MFA1,MFA2}) ->
-			    io:format("~s calls non-recommended ~s",
-				      [format_mfa(MFA1),format_mfa(MFA2)])
-		    end, CallsToMFA)
+            foreach(fun ({MFA1,MFA2}) ->
+                            io:format("~s calls non-recommended ~s",
+                                      [format_mfa(MFA1),format_mfa(MFA2)])
+                    end, CallsToMFA)
     end,
 
     %% Enumerate calls to MFA from other applications than
@@ -336,15 +327,32 @@ not_recommended_calls(Config, Apps, MFA) ->
                     end, Calls)
     end,
     case CallsToMFA of
-	[] -> 
-            ok;
-	_ ->
-	    ?t:fail({length(CallsToMFA),calls_to_size_1})
+        [] ->
+            SkippedApps = ordsets:subtract(ordsets:from_list(Apps0),
+                                           ordsets:from_list(Apps)),
+            case SkippedApps of
+                [] ->
+                    ok;
+                _ ->
+                    AppStrings = [atom_to_list(A) || A <- SkippedApps],
+                    Mess = io_lib:format("Application(s) not present: ~s\n",
+                                         [string:join(AppStrings, ", ")]),
+                    {comment, Mess}
+            end;
+        _ ->
+            ct:fail({length(CallsToMFA),calls_to_size_1})
+    end.
+
+is_present_application(Name, Server) ->
+    Q = io_lib:format("~w : App", [Name]),
+    case xref:q(Server, lists:flatten(Q)) of
+        {ok,[Name]} -> true;
+        {error,_,_} -> false
     end.
 
 strong_components(Config) when is_list(Config) ->
-    Server = ?config(xref_server, Config),
-    ?line {ok,Cs} = xref:q(Server, "components AE"),
+    Server = proplists:get_value(xref_server, Config),
+    {ok,Cs} = xref:q(Server, "components AE"),
     io:format("\n\nStrong components:\n\n~p\n", [Cs]),
     ok.
 
@@ -352,41 +360,41 @@ erl_file_encoding(_Config) ->
     Root = code:root_dir(),
     Wc = filename:join([Root,"**","*.erl"]),
     ErlFiles = ordsets:subtract(ordsets:from_list(filelib:wildcard(Wc)),
-				release_files(Root, "*.erl")),
+                                release_files(Root, "*.erl")),
     {ok, MP} = re:compile(".*lib/(ic)|(orber)|(cos).*", [unicode]),
     Fs = [F || F <- ErlFiles,
-	       filter_use_latin1_coding(F, MP),
-	       case epp:read_encoding(F) of
-		   none -> false;
-		   _ -> true
-	       end],
+               filter_use_latin1_coding(F, MP),
+               case epp:read_encoding(F) of
+                   none -> false;
+                   _ -> true
+               end],
     case Fs of
-	[] ->
-	    ok;
-	[_|_] ->
-	    io:put_chars("Files with \"coding:\":\n"),
-	    [io:put_chars(F) || F <- Fs],
-	    ?t:fail()
+        [] ->
+            ok;
+        [_|_] ->
+            io:put_chars("Files with \"coding:\":\n"),
+            [io:put_chars(F) || F <- Fs],
+            ct:fail(failed)
     end.
 
 filter_use_latin1_coding(F, MP) ->
     case re:run(F, MP) of
-	nomatch ->
-	    true;
+        nomatch ->
+            true;
         {match, _} ->
-	    false
+            false
     end.
 
 xml_file_encoding(_Config) ->
     XmlFiles = xml_files(),
     Fs = [F || F <- XmlFiles, is_bad_encoding(F)],
     case Fs of
-	[] ->
-	    ok;
-	[_|_] ->
-	    io:put_chars("Encoding should be \"utf-8\" or \"UTF-8\":\n"),
-	    [io:put_chars(F) || F <- Fs],
-	    ?t:fail()
+        [] ->
+            ok;
+        [_|_] ->
+            io:put_chars("Encoding should be \"utf-8\" or \"UTF-8\":\n"),
+            [io:put_chars(F) || F <- Fs],
+            ct:fail(failed)
     end.
 
 xml_files() ->
@@ -398,7 +406,7 @@ xml_files() ->
     XmerlWc = filename:join([Root,"lib","xmerl","**","*.xml"]),
     XmerlXmlFiles = ordsets:from_list(filelib:wildcard(XmerlWc)),
     Ignore = ordsets:union([TestXmlFiles,XmerlXmlFiles,
-			    release_files(Root, "*.xml")]),
+                            release_files(Root, "*.xml")]),
     ordsets:subtract(AllXmlFiles, Ignore).
 
 release_files(Root, Ext) ->
@@ -408,12 +416,12 @@ release_files(Root, Ext) ->
 is_bad_encoding(File) ->
     {ok,Bin} = file:read_file(File),
     case Bin of
-	<<"<?xml version=\"1.0\" encoding=\"utf-8\"",_/binary>> ->
-	    false;
-	<<"<?xml version=\"1.0\" encoding=\"UTF-8\"",_/binary>> ->
-	    false;
-	_ ->
-	    true
+        <<"<?xml version=\"1.0\" encoding=\"utf-8\"",_/binary>> ->
+            false;
+        <<"<?xml version=\"1.0\" encoding=\"UTF-8\"",_/binary>> ->
+            false;
+        _ ->
+            true
     end.
 
 runtime_dependencies(Config) ->
@@ -425,59 +433,31 @@ runtime_dependencies(Config) ->
     %% Verify that (at least) OTP application runtime dependencies found
     %% by xref are listed in the runtime_dependencies field of the .app file
     %% of each application.
-    Server = ?config(xref_server, Config),
+    Server = proplists:get_value(xref_server, Config),
     {ok, AE} = xref:q(Server, "AE"),
     SAE = lists:keysort(1, AE),
     put(ignored_failures, []),
     {AppDep, AppDeps} = lists:foldl(fun ({App, App}, Acc) ->
-					    Acc;
-					({App, Dep}, {undefined, []}) ->
-					    {{App, [Dep]}, []};
-					({App, Dep}, {{App, Deps}, AppDeps}) ->
-					    {{App, [Dep|Deps]}, AppDeps};
-					({App, Dep}, {AppDep, AppDeps}) ->
-					    {{App, [Dep]}, [AppDep | AppDeps]}
-				    end,
-				    {undefined, []},
-				    SAE),
-    [] = lists:filter(fun ({missing_runtime_dependency,
-			    AppFile,
-			    common_test}) ->
-			      %% The test_server app is contaminated by
-			      %% common_test when run in a source tree. It
-			      %% should however *not* be contaminated
-			      %% when run in an installation.
-			      case {filename:basename(AppFile),
-				    is_run_in_src_tree()} of
-				  {"test_server.app", true} ->
-				      false;
-				  _ ->
-				      true
-			      end;
-			  (_) ->
-			      true
-		      end,
-		      check_apps_deps([AppDep|AppDeps], IgnoreApps)),
+                                            Acc;
+                                        ({App, Dep}, {undefined, []}) ->
+                                            {{App, [Dep]}, []};
+                                        ({App, Dep}, {{App, Deps}, AppDeps}) ->
+                                            {{App, [Dep|Deps]}, AppDeps};
+                                        ({App, Dep}, {AppDep, AppDeps}) ->
+                                            {{App, [Dep]}, [AppDep | AppDeps]}
+                                    end,
+                                    {undefined, []},
+                                    SAE),
+    check_apps_deps([AppDep|AppDeps], IgnoreApps),
     case IgnoreApps of
-	[] ->
-	    ok;
-	_ ->
-	    Comment = lists:flatten(io_lib:format("Ignored applications: ~p "
-						  "Ignored failures: ~p",
-						  [IgnoreApps,
-						   get(ignored_failures)])),
-	    {comment, Comment}
-    end.
-
-is_run_in_src_tree() ->
-    %% At least currently run_erl is not present in <code-root>/bin
-    %% in the source tree, but present in <code-root>/bin of an
-    %% ordinary installation.
-    case file:read_file_info(filename:join([code:root_dir(),
-					    "bin",
-					    "run_erl"])) of
-	{ok, _} -> false;
-	{error, _} -> true
+        [] ->
+            ok;
+        _ ->
+            Comment = lists:flatten(io_lib:format("Ignored applications: ~p "
+                                                  "Ignored failures: ~p",
+                                                  [IgnoreApps,
+                                                   get(ignored_failures)])),
+            {comment, Comment}
     end.
 
 have_rdep(_App, [], _Dep) ->
@@ -485,11 +465,11 @@ have_rdep(_App, [], _Dep) ->
 have_rdep(App, [RDep | RDeps], Dep) ->		    
     [AppStr, _VsnStr] = string:tokens(RDep, "-"),
     case Dep == list_to_atom(AppStr) of
-	true ->
-	    io:format("~p -> ~s~n", [App, RDep]),
-	    true;
-	false ->
-	    have_rdep(App, RDeps, Dep)
+        true ->
+            io:format("~p -> ~s~n", [App, RDep]),
+            true;
+        false ->
+            have_rdep(App, RDeps, Dep)
     end.
 
 check_app_deps(_App, _AppFile, _AFDeps, [], _IgnoreApps) ->
@@ -497,17 +477,17 @@ check_app_deps(_App, _AppFile, _AFDeps, [], _IgnoreApps) ->
 check_app_deps(App, AppFile, AFDeps, [XRDep | XRDeps], IgnoreApps) ->
     ResOtherDeps = check_app_deps(App, AppFile, AFDeps, XRDeps, IgnoreApps),
     case have_rdep(App, AFDeps, XRDep) of
-	true ->
-	    ResOtherDeps;
-	false ->
-	    Failure = {missing_runtime_dependency, AppFile, XRDep},
-	    case lists:member(App, IgnoreApps) of
-		true ->
-		    put(ignored_failures, [Failure | get(ignored_failures)]),
-		    ResOtherDeps;
-		false ->
-		    [Failure | ResOtherDeps]
-	    end
+        true ->
+            ResOtherDeps;
+        false ->
+            Failure = {missing_runtime_dependency, AppFile, XRDep},
+            case lists:member(App, IgnoreApps) of
+                true ->
+                    put(ignored_failures, [Failure | get(ignored_failures)]),
+                    ResOtherDeps;
+                false ->
+                    [Failure | ResOtherDeps]
+            end
     end.
 
 check_apps_deps([], _IgnoreApps) ->
@@ -517,24 +497,24 @@ check_apps_deps([{App, Deps}|AppDeps], IgnoreApps) ->
     AppFile = code:where_is_file(atom_to_list(App) ++ ".app"),
     {ok,[{application, App, Info}]} = file:consult(AppFile),
     case lists:keyfind(runtime_dependencies, 1, Info) of
-	{runtime_dependencies, RDeps} ->
-	    check_app_deps(App, AppFile, RDeps, Deps, IgnoreApps)
-		++ ResOtherApps;
-	false ->
-	    Failure = {missing_runtime_dependencies_key, AppFile},
-	    case lists:member(App, IgnoreApps) of
-		true ->
-		    put(ignored_failures, [Failure | get(ignored_failures)]),
-		    ResOtherApps;
-		false ->
-		    [Failure | ResOtherApps]
-	    end
+        {runtime_dependencies, RDeps} ->
+            check_app_deps(App, AppFile, RDeps, Deps, IgnoreApps)
+            ++ ResOtherApps;
+        false ->
+            Failure = {missing_runtime_dependencies_key, AppFile},
+            case lists:member(App, IgnoreApps) of
+                true ->
+                    put(ignored_failures, [Failure | get(ignored_failures)]),
+                    ResOtherApps;
+                false ->
+                    [Failure | ResOtherApps]
+            end
     end.
 
 %%%
 %%% Common help functions.
 %%%
-    
+
 print_mfas(Fd, Server, MFAs) ->
     [io:format(Fd, "~s\n", [format_mfa(Server, MFA)]) || MFA <- MFAs],
     ok.
@@ -546,13 +526,13 @@ format_mfa(Server, MFA) ->
     MFAString = format_mfa(MFA),
     AQ = "(App)" ++ MFAString,
     AppPrefix = case xref:q(Server, AQ) of
-		    {ok,[App]} -> "[" ++ atom_to_list(App) ++ "]";
-		    _ -> ""
-		end,
+                    {ok,[App]} -> "[" ++ atom_to_list(App) ++ "]";
+                    _ -> ""
+                end,
     AppPrefix ++ MFAString.
 
 open_log(Config, Name) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     RunDir = filename:dirname(filename:dirname(PrivDir)),
     Path = filename:join(RunDir, "system_"++Name++".log"),
     {ok,Fd} = file:open(Path, [write]),
@@ -563,13 +543,13 @@ close_log(Fd) ->
 
 app_exists(AppAtom) ->
     case code:lib_dir(AppAtom) of
-	{error,bad_name} ->
-	    false;
-	Path ->
-	    case file:read_file_info(filename:join(Path,"ebin")) of
-		{ok,_} ->
-		    true;
-		_ ->
-		    false
-	    end
+        {error,bad_name} ->
+            false;
+        Path ->
+            case file:read_file_info(filename:join(Path,"ebin")) of
+                {ok,_} ->
+                    true;
+                _ ->
+                    false
+            end
     end.
diff --git a/erts/test/run_erl_SUITE.erl b/erts/test/run_erl_SUITE.erl
index 328477d870..5cd0068280 100644
--- a/erts/test/run_erl_SUITE.erl
+++ b/erts/test/run_erl_SUITE.erl
@@ -20,43 +20,19 @@
 
 -module(run_erl_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,
-	 basic/1,heavy/1,heavier/1,defunct/1]).
+-export([all/0, suite/0]).
+-export([basic/1,heavy/1,heavier/1,defunct/1]).
 -export([ping_me_back/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(2)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 2}}].
 
 all() -> 
     [basic, heavy, heavier, defunct].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 basic(Config) when is_list(Config) ->
     case os:type() of
@@ -65,16 +41,16 @@ basic(Config) when is_list(Config) ->
     end.
 
 basic_1(Config) ->
-    ?line {Node,Pipe} = do_run_erl(Config, "basic"),
+    {Node,Pipe} = do_run_erl(Config, "basic"),
 
-    ?line ToErl = open_port({spawn,"to_erl "++Pipe}, []),
-    ?line erlang:port_command(ToErl, "halt().\r\n"),
+    ToErl = open_port({spawn,"to_erl "++Pipe}, []),
+    erlang:port_command(ToErl, "halt().\r\n"),
 
     receive
 	{nodedown,Node} ->
-	    ?line io:format("Down: ~p\n", [Node])
+	    io:format("Down: ~p\n", [Node])
     after 10000 ->
-	    ?line ?t:fail()
+	    ct:fail(timeout)
     end,
 
     ok.
@@ -86,29 +62,28 @@ heavy(Config) when is_list(Config) ->
     end.
 
 heavy_1(Config) ->
-    ?line {Node,Pipe} = do_run_erl(Config, "heavy"),
+    {Node,Pipe} = do_run_erl(Config, "heavy"),
 
-    ?line ToErl = open_port({spawn,"to_erl "++Pipe}, []),
+    ToErl = open_port({spawn,"to_erl "++Pipe}, []),
     IoFormat = "io:format(\"~s\n\", [lists:duplicate(10000, 10)]).\r\n",
-    ?line erlang:port_command(ToErl, IoFormat),
-    ?line erlang:port_command(ToErl, IoFormat),
-    ?line erlang:port_command(ToErl, IoFormat),
-    ?line erlang:port_command(ToErl, "init:stop().\r\n"),
+    erlang:port_command(ToErl, IoFormat),
+    erlang:port_command(ToErl, IoFormat),
+    erlang:port_command(ToErl, IoFormat),
+    erlang:port_command(ToErl, "init:stop().\r\n"),
     
     receive
 	{nodedown,Node} ->
-	    ?line io:format("Down: ~p\n", [Node])
+	    io:format("Down: ~p\n", [Node])
     after 10000 ->
-	    ?line ?t:fail()
+	    ct:fail(timeout)
     end,
 
-    ?line case count_new_lines(ToErl, 0) of
-	      Nls when Nls > 30000 ->
-		  ok;
-	      Nls ->
-		  ?line io:format("new_lines: ~p\n", [Nls]),
-		  ?line ?t:fail()
-	  end.
+    case count_new_lines(ToErl, 0) of
+        Nls when Nls > 30000 ->
+            ok;
+        Nls ->
+            ct:fail("new_lines: ~p\n", [Nls])
+    end.
     
 
 ping_me_back([Node]) when is_atom(Node) ->
@@ -137,18 +112,16 @@ heavier(Config) when is_list(Config) ->
     end.
 
 heavier_1(Config) ->
-    ?line {Node,Pipe} = do_run_erl(Config, "heavier"),
+    {Node,Pipe} = do_run_erl(Config, "heavier"),
 
-    ?line ToErl = open_port({spawn,"to_erl "++Pipe}, []),
+    ToErl = open_port({spawn,"to_erl "++Pipe}, []),
     io:format("ToErl = ~p\n", [ToErl]),
-    X = 1,
-    Y = 555,
-    Z = 42,
-    ?line random:seed(X, Y, Z),
-    SeedCmd = lists:flatten(io_lib:format("random:seed(~p, ~p, ~p). \r\n",
-					  [X,Y,Z])),
-    ?line io:format("~p\n", [SeedCmd]),
-    ?line erlang:port_command(ToErl, SeedCmd),
+    Seed = {1,555,42},
+    rand:seed(exsplus, Seed),
+    SeedCmd = lists:flatten(io_lib:format("rand:seed(exsplus, ~p). \r\n",
+					  [Seed])),
+    io:format("~p\n", [SeedCmd]),
+    erlang:port_command(ToErl, SeedCmd),
 
     Iter = 1000,
     MaxLen = 2048,
@@ -157,9 +130,9 @@ heavier_1(Config) ->
 	"F = fun(F,0) -> ok; "++
 	       "(F,N) -> " ++
 	           "io:format(\"\\\"~s\\\"~n\","++
-	                     "[[35|[random:uniform(25)+65 || " ++
+	                     "[[35|[rand:uniform(25)+65 || " ++
 	                     "_ <- lists:seq(1, "++
-	                                "random:uniform("++
+	                                "rand:uniform("++
                                              integer_to_list(MaxLen)++
                                         "))]]]), "++
 	           "F(F,N-1) "++
@@ -167,19 +140,19 @@ heavier_1(Config) ->
         "F(F,"++integer_to_list(Iter)++")."++" \r\n",
 
 
-    ?line io:format("~p\n", [Random]),
-    ?line erlang:port_command(ToErl, Random),
+    io:format("~p\n", [Random]),
+    erlang:port_command(ToErl, Random),
 
     %% Finish.
     
-    ?line erlang:port_command(ToErl, "init:stop().\r\n"),
-    ?line receive_all(Iter, ToErl, MaxLen),
+    erlang:port_command(ToErl, "init:stop().\r\n"),
+    receive_all(Iter, ToErl, MaxLen),
     receive
 	{nodedown,Node} ->
-	    ?line io:format("Down: ~p\n", [Node])
+	    io:format("Down: ~p\n", [Node])
     after 10000 ->
-	    ?line c:flush(),
-	    ?line ?t:fail()
+	    c:flush(),
+	    ct:fail(timeout)
     end,
 
     ok.
@@ -189,8 +162,8 @@ receive_all(Iter, ToErl, MaxLen) ->
 
 receive_all_1(0, _, _, _) -> ok;
 receive_all_1(Iter, Line, ToErl, MaxLen) ->
-    NumChars = random:uniform(MaxLen),
-    Pattern = [random:uniform(25)+65 || _ <- lists:seq(1, NumChars)],
+    NumChars = rand:uniform(MaxLen),
+    Pattern = [rand:uniform(25)+65 || _ <- lists:seq(1, NumChars)],
     receive_all_2(Iter, {NumChars,Pattern}, Line, ToErl, MaxLen).
     
 
@@ -206,9 +179,7 @@ receive_all_2(Iter, {NumChars,Pattern}, Line0, ToErl, MaxLen) ->
 		    %%io:format("Recv: ~p\n", [S]),
 		    receive_all_2(Iter, {NumChars,Pattern}, Line++S, ToErl, MaxLen)		    
 	    after 10000 ->
-		    io:format("Timeout waiting for\n~p\ngot\n~p\n",
-			      [Pattern, Line]),
-		    ?line ?t:fail()    
+		    ct:fail("Timeout waiting for\n~p\ngot\n~p\n", [Pattern, Line])
 	    end
     end.
 
@@ -243,49 +214,47 @@ defunct_1(Config) ->
     end.
 
 defunct_2(Config, Perl) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line RunErlTest = filename:join(Data, "run_erl_test.pl"),
-    ?line Defuncter = filename:join(Data, "defuncter.pl"),
-    ?line Priv = ?config(priv_dir, Config),
-    ?line LogDir = filename:join(Priv, "defunct"),
-    ?line ok = file:make_dir(LogDir),
-    ?line Pipe = LogDir ++ "/",
-    ?line RunErl = os:find_executable(run_erl),
-    ?line Cmd = Perl ++ " " ++ RunErlTest ++ " \"" ++ RunErl ++ "\" " ++
+    Data = proplists:get_value(data_dir, Config),
+    RunErlTest = filename:join(Data, "run_erl_test.pl"),
+    Defuncter = filename:join(Data, "defuncter.pl"),
+    Priv = proplists:get_value(priv_dir, Config),
+    LogDir = filename:join(Priv, "defunct"),
+    ok = file:make_dir(LogDir),
+    Pipe = LogDir ++ "/",
+    RunErl = os:find_executable(run_erl),
+    Cmd = Perl ++ " " ++ RunErlTest ++ " \"" ++ RunErl ++ "\" " ++
 	Defuncter ++ " " ++ Pipe ++ " " ++ LogDir,
-    ?line io:format("~p", [Cmd]),
-    ?line Res = os:cmd(Cmd),
-    ?line io:format("~p\n", [Res]),
+    io:format("~p", [Cmd]),
+    Res = os:cmd(Cmd),
+    io:format("~p\n", [Res]),
     "OK"++_ = Res,
     ok.
 
 %%% Utilities.
 
 do_run_erl(Config, Case) ->
-    ?line Priv = ?config(priv_dir, Config),
-    ?line LogDir = filename:join(Priv, Case),
-    ?line ok = file:make_dir(LogDir),
-    ?line Pipe = LogDir ++ "/",
-    ?line NodeName = "run_erl_node_" ++ Case,
-    ?line Cmd = "run_erl "++Pipe++" "++LogDir++" \"erl -sname " ++ NodeName ++
+    Priv = proplists:get_value(priv_dir, Config),
+    LogDir = filename:join(Priv, Case),
+    ok = file:make_dir(LogDir),
+    Pipe = LogDir ++ "/",
+    NodeName = "run_erl_node_" ++ Case,
+    Cmd = "run_erl "++Pipe++" "++LogDir++" \"erl -sname " ++ NodeName ++
 	" -pa " ++ filename:dirname(code:which(?MODULE)) ++
 	" -s " ++ ?MODULE_STRING ++ " ping_me_back " ++
 	atom_to_list(node()) ++ "\"",
-    ?line io:format("~p\n", [Cmd]),
+    io:format("~p\n", [Cmd]),
     
-    ?line net_kernel:monitor_nodes(true),
-    ?line open_port({spawn,Cmd}, []),
-    ?line [_,Host] = string:tokens(atom_to_list(node()), "@"),
-    ?line Node = list_to_atom(NodeName++"@"++Host),
+    net_kernel:monitor_nodes(true),
+    open_port({spawn,Cmd}, []),
+    [_,Host] = string:tokens(atom_to_list(node()), "@"),
+    Node = list_to_atom(NodeName++"@"++Host),
 
     receive
 	{nodeup,Node} ->
-	    ?line io:format("Up: ~p\n", [Node]);
+	    io:format("Up: ~p\n", [Node]);
 	Other ->
-	    ?line io:format("Unexpected: ~p\n", [Other]),
-	    ?line ?t:fail()
+	    ct:fail("Unexpected: ~p\n", [Other])
     after 10000 ->
-	    ?line ?t:fail()
+	    ct:fail(timeout)
     end,
-
     {Node,Pipe}.
diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index 83cd2359d8..1d5be8f018 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -50,12 +50,12 @@ init_per_suite(Config) ->
 	    %% Fake release, no applications
 	    {skip, "Need a real release running to create other releases"};
 	_ ->
-	    rm_rf(filename:join([?config(data_dir,Config),priv_dir])),
+	    rm_rf(filename:join([proplists:get_value(data_dir,Config),priv_dir])),
 	    Config
     end.
 
 init_per_testcase(Case,Config) ->
-    PrivDir = filename:join([?config(data_dir,Config),priv_dir,Case]),
+    PrivDir = filename:join([proplists:get_value(data_dir,Config),priv_dir,Case]),
     CreateDir = filename:join([PrivDir,create]),
     InstallDir = filename:join([PrivDir,install]),
     ok = filelib:ensure_dir(filename:join(CreateDir,"*")),
@@ -66,10 +66,10 @@ init_per_testcase(Case,Config) ->
 end_per_testcase(_Case,Config) ->
     Nodes = nodes(),
     [test_server:stop_node(Node) || Node <- Nodes],
-    case ?config(tc_status,Config) of
+    case proplists:get_value(tc_status,Config) of
 	ok ->
 	    %% Note that priv_dir here is per test case!
-	    rm_rf(?config(priv_dir,Config));
+	    rm_rf(proplists:get_value(priv_dir,Config));
 	_fail ->
 	    %% Test case data can be found under DataDir/priv_dir/Case
 	    ok
@@ -115,15 +115,15 @@ upgrade_test(FromVsn,ToVsn,Config) ->
     case OldRel of
 	false ->
 	    %% Note that priv_dir here is per test case!
-	    rm_rf(?config(priv_dir,Config)),
+	    rm_rf(proplists:get_value(priv_dir,Config)),
 	    {skip, "no previous release available"};
 	_ ->
 	    upgrade_test1(FromVsn,ToVsn,[{old_rel,OldRel}|Config])
     end.
 
 upgrade_test1(FromVsn,ToVsn,Config) ->
-    CreateDir = ?config(create_dir,Config),
-    InstallDir = ?config(install_dir,Config),
+    CreateDir = proplists:get_value(create_dir,Config),
+    InstallDir = proplists:get_value(install_dir,Config),
     FromRelName = "otp-"++FromVsn,
     ToRelName = "otp-"++ToVsn,
 
@@ -141,7 +141,7 @@ upgrade_test1(FromVsn,ToVsn,Config) ->
 %%% - chmod 'start' and 'start_erl'
 target_system(RelName0,RelVsn,CreateDir,InstallDir,Config) ->
     {ok,Node} = test_server:start_node(list_to_atom(RelName0),peer,
-				       [{erl,[?config(old_rel,Config)]}]),
+				       [{erl,[proplists:get_value(old_rel,Config)]}]),
 
     {RelName,Apps,ErtsVsn} = create_relfile(Node,CreateDir,RelName0,RelVsn),
  
@@ -184,7 +184,7 @@ target_system(RelName0,RelVsn,CreateDir,InstallDir,Config) ->
     write_file(SysConfig, "[]."),
     
     %% Insert 'start' script from data_dir - modified to add sname and heart
-    copy_file(filename:join(?config(data_dir,Config),"start.src"),
+    copy_file(filename:join(proplists:get_value(data_dir,Config),"start.src"),
 	      filename:join(ErtsBinDir,"start.src")),
     ok = file:change_mode(filename:join(ErtsBinDir,"start.src"),8#0755),
 
diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl
index 7f3260e4cb..de3e1c24a4 100644
--- a/erts/test/z_SUITE.erl
+++ b/erts/test/z_SUITE.erl
@@ -24,8 +24,6 @@
 %% This suite expects to be run as the last suite of all suites.
 %%
 
-%-define(line_trace, 1).
-
 -include_lib("kernel/include/file.hrl").
 	    
 -record(core_search_conf, {search_dir,
@@ -34,52 +32,19 @@
 			   file,
 			   run_by_ts}).
 
--define(DEFAULT_TIMEOUT, ?t:minutes(5)).
-
--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]).
 
 -export([search_for_core_files/1, core_files/1]).
 
 -include_lib("common_test/include/ct.hrl").
     
-
-init_per_testcase(Case, Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
-    [{testcase, Case}, {watchdog, Dog} |Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 5}}].
 
 all() -> 
     [core_files].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-
-core_files(doc) ->
-    [];
-core_files(suite) ->
-    [];
 core_files(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
@@ -354,7 +319,7 @@ core_file_search(#core_search_conf{search_dir = Base,
 	    case {RunByTS, ICores, FCores} of
 		{true, [], []} -> ok;
 		{true, _, []} -> {comment, Res};
-		{true, _, _} -> ?t:fail(Res);
+		{true, _, _} -> ct:fail(Res);
 		_ -> Res
 	    end
     end.
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 94b5d0b169..6ad3680213 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2013. All Rights Reserved.
+# Copyright Ericsson AB 1997-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.
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 7.2.1
+VSN = 8.0
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/Makefile b/lib/Makefile
index 34c2fe9a9e..82c7cb6e18 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -25,8 +25,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 ERTS_APPLICATIONS = stdlib sasl kernel compiler
 
 # Then these have to be build
-ERLANG_APPLICATIONS = tools test_server common_test runtime_tools \
-			inets parsetools
+ERLANG_APPLICATIONS = tools common_test runtime_tools inets parsetools
 
 # These are only build if -a is given to otp_build or make is used directly
 ALL_ERLANG_APPLICATIONS = xmerl edoc erl_docgen snmp otp_mibs erl_interface \
@@ -35,8 +34,8 @@ ALL_ERLANG_APPLICATIONS = xmerl edoc erl_docgen snmp otp_mibs erl_interface \
 	          ic mnesia crypto orber os_mon syntax_tools \
 	          public_key ssl observer odbc diameter \
 	          cosTransactions cosEvent cosTime cosNotification \
-	          cosProperty cosFileTransfer cosEventDomain et megaco webtool \
-		  eunit ssh typer percept eldap dialyzer hipe ose
+	          cosProperty cosFileTransfer cosEventDomain et megaco \
+		  eunit ssh typer percept eldap dialyzer hipe
 
 ifdef BUILD_ALL
   ERLANG_APPLICATIONS += $(ALL_ERLANG_APPLICATIONS)
diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
index 2b72e1a214..e0d4f09a70 100644
--- a/lib/asn1/c_src/Makefile
+++ b/lib/asn1/c_src/Makefile
@@ -97,12 +97,7 @@ endif
 
 _create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
-ifneq ($(findstring ose,$(TARGET)),ose)
 opt: $(NIF_SHARED_OBJ_FILE)
-else
-# Do not build dynamic files on OSE
-opt:
-endif
 
 debug: opt
 
@@ -140,9 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
-ifneq ($(findstring ose,$(TARGET)),ose)
 	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
-endif
 	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
 	$(INSTALL_DATA) *.c "$(RELSYSDIR)/c_src"
 
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 315c472465..78d856b0be 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -32,6 +32,33 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
+<section><title>Asn1 4.0.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    When compiling to the PER format, the ASN.1 compiler
+	    would crash when attempting to compile an ASN.1 module
+	    with a constrained INTEGER with more than 65536 values
+	    and named values. (Thanks to Ingars for reporting this
+	    bug.)</p>
+          <p>
+	    Own Id: OTP-13257</p>
+        </item>
+        <item>
+	    <p>The ASN.1 compiler will now emit Dialyzer suppressions
+	    for improper lists. Thus, there is no longer any need to
+	    use <c>--Wno_improper_lists</c> when analyzing modules
+	    generated by the ASN.1 compiler.</p>
+          <p>
+	    Own Id: OTP-13324</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Asn1 4.0.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index 4d17cfb966..f2c895bfaa 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -1552,9 +1552,11 @@ match_syntax_objset_1(_, {object,_,_}=Object, ClassDef) ->
 make_objset(ClassDef, Set) ->
     #typedef{typespec=#'ObjectSet'{class=ClassDef,set=Set}}.
 
+-spec syntax_match_error(_) -> no_return().
 syntax_match_error(S) ->
     asn1_error(S, syntax_nomatch).
 
+-spec syntax_match_error(_, _) -> no_return().
 syntax_match_error(S, What0) ->
     What = printable_string(What0),
     asn1_error(S, {syntax_nomatch,What}).
@@ -5745,6 +5747,7 @@ return_asn1_error(#state{mname=Where}, Item, Error) ->
     Pos = asn1ct:get_pos_of_def(Item),
     {structured_error,{Where,Pos},?MODULE,Error}.
 
+-spec asn1_error(_, _) -> no_return().
 asn1_error(S, Error) ->
     throw({error,return_asn1_error(S, Error)}).
 
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index 093bcb5a6c..6d5062a118 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -1289,6 +1289,7 @@ gen_head(Erules,Mod,Hrl) ->
     emit({"-module('",Mod,"').",nl}),
     put(currmod,Mod),
     emit({"-compile(nowarn_unused_vars).",nl}),
+    emit({"-dialyzer(no_improper_lists).",nl}),
     case Hrl of
 	0 -> ok;
 	_ -> emit({"-include(\"",Mod,".hrl\").",nl})
diff --git a/lib/asn1/src/asn1ct_value.erl b/lib/asn1/src/asn1ct_value.erl
index 7f20d57b1e..61a5661a11 100644
--- a/lib/asn1/src/asn1ct_value.erl
+++ b/lib/asn1/src/asn1ct_value.erl
@@ -353,10 +353,7 @@ random_unnamed_bit_string(M, C) ->
 %%     end.
 
 random(Upper) ->
-    _ = random:seed(erlang:phash2([erlang:node()]),
-		    erlang:monotonic_time(),
-		    erlang:unique_integer()),
-    random:uniform(Upper).
+    rand:uniform(Upper).
 
 size_random(C) ->
     case get_constraint(C,'SizeConstraint') of
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index ce87fd3180..4d5120221d 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -28,13 +28,15 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %%------------------------------------------------------------------------------
 %% Suite definition
 %%------------------------------------------------------------------------------
 
-suite() -> [{ct_hooks, [ts_install_cth]}].
+suite() ->
+    [{ct_hooks, [ts_install_cth]},
+     {timetrap,{minutes,60}}].
 
 all() ->
     [{group, compile},
@@ -194,18 +196,15 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 init_per_testcase(Func, Config) ->
-    CaseDir = filename:join(?config(priv_dir, Config), Func),
+    CaseDir = filename:join(proplists:get_value(priv_dir, Config), Func),
     ok = filelib:ensure_dir(filename:join([CaseDir, dummy_file])),
     true = code:add_patha(CaseDir),
-
-    Dog = case Func of
-              testRfcs -> ct:timetrap({minutes, 90});
-              _        -> ct:timetrap({minutes, 60})
-          end,
-    [{case_dir, CaseDir}, {watchdog, Dog}|Config].
+    [{case_dir, CaseDir}|Config].
 
 end_per_testcase(_Func, Config) ->
-    code:del_path(?config(case_dir, Config)).
+    CaseDir = proplists:get_value(case_dir, Config),
+    asn1_test_lib:rm_dirs([CaseDir]),
+    code:del_path(CaseDir).
 
 %%------------------------------------------------------------------------------
 %% Test runners
@@ -243,7 +242,7 @@ opts(Rule) when is_atom(Rule) -> [];
 opts({_Rule, Opts})         -> Opts.
 
 run_case(Config, Fun, Rule, Opts) ->
-    CaseDir = ?config(case_dir, Config),
+    CaseDir = proplists:get_value(case_dir, Config),
     Dir = filename:join([CaseDir, join(Rule, Opts)]),
     ok = filelib:ensure_dir(filename:join([Dir, dummy_file])),
     replace_path(CaseDir, Dir),
@@ -465,7 +464,7 @@ testSeqExtension(Config, Rule, Opts) ->
 			       "SeqExtension2"],
 			      Config,
                               [Rule|Opts]),
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     testSeqExtension:main(Rule, DataDir, [Rule|Opts]).
 
 testSeqOptional(Config) -> test(Config, fun testSeqOptional/3).
@@ -585,8 +584,8 @@ constraint_equivalence(Config, Rule, Opts) ->
     asn1_test_lib:compile(M, Config, [Rule|Opts]).
 
 constraint_equivalence_abs(Config) ->
-    DataDir = ?config(data_dir, Config),
-    CaseDir = ?config(case_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    CaseDir = proplists:get_value(case_dir, Config),
     Asn1Spec = "ConstraintEquivalence",
     Asn1Src = filename:join(DataDir, Asn1Spec),
     ok = asn1ct:compile(Asn1Src, [abs,{outdir,CaseDir}]),
@@ -628,12 +627,22 @@ ber_other(Config, Rule, Opts) ->
 der(Config) ->
     asn1_test_lib:compile_all(ber_modules(), Config, [der]).
 
-module_test(M, Config, Rule, Opts) ->
-    asn1_test_lib:compile(M, Config, [Rule|Opts]),
-    case asn1ct:test(list_to_atom(M), [{i, ?config(case_dir, Config)}]) of
-        ok    -> ok;
-        Error ->
-            erlang:error({test_failed, M, Opts, Error})
+module_test(M0, Config, Rule, Opts) ->
+    asn1_test_lib:compile(M0, Config, [Rule|Opts]),
+    case list_to_atom(M0) of
+	'LDAP' ->
+	    %% Because of the recursive definition of 'Filter' in
+	    %% the LDAP module, the construction of a sample
+	    %% value for 'Filter' is not guaranteed to terminate.
+	    ok;
+	M ->
+	    TestOpts = [{i, proplists:get_value(case_dir, Config)}],
+	    case asn1ct:test(M, TestOpts) of
+		ok ->
+		    ok;
+		Error ->
+		    erlang:error({test_failed, M, Opts, Error})
+	    end
     end.
 
 
@@ -758,7 +767,7 @@ testInfObjectClass(Config, Rule, Opts) ->
 
 testUniqueObjectSets(Config) -> test(Config, fun testUniqueObjectSets/3).
 testUniqueObjectSets(Config, Rule, Opts) ->
-    CaseDir = ?config(case_dir, Config),
+    CaseDir = proplists:get_value(case_dir, Config),
     testUniqueObjectSets:main(CaseDir, Rule, Opts).
 
 testInfObjExtract(Config) -> test(Config, fun testInfObjExtract/3).
@@ -983,6 +992,9 @@ testS1AP(Config, Rule, Opts) ->
 	    ok
     end.
 
+testRfcs() ->
+    [{timetrap,{minutes,90}}].
+
 testRfcs(Config) ->  test(Config, fun testRfcs/3, [{ber,[der]}]).
 testRfcs(Config, Rule, Opts) ->
     case erlang:system_info(system_architecture) of
@@ -1126,7 +1138,7 @@ test_modules() ->
      "CCSNARG3"].
 
 test_OTP_9688(Config) ->
-    PrivDir = ?config(case_dir, Config),
+    PrivDir = proplists:get_value(case_dir, Config),
     Data = "
 OTP-9688 DEFINITIONS ::= BEGIN
 
@@ -1162,12 +1174,10 @@ testTimer_uper(Config) ->
     testTimer:go().
 
 %% Test of multiple-line comment, OTP-8043
-testComment(suite) -> [];
 testComment(Config) ->
     asn1_test_lib:compile("Comment", Config, []),
     asn1_test_lib:roundtrip('Comment', 'Seq', {'Seq',12,true}).
 
-testName2Number(suite) -> [];
 testName2Number(Config) ->
     N2NOptions = [{n2n,Type} || Type <- ['CauseMisc', 'CauseProtocol',
                                          'CauseRadioNetwork',
diff --git a/lib/asn1/test/asn1_SUITE_data/test_records.erl b/lib/asn1/test/asn1_SUITE_data/test_records.erl
index adfc98600c..8f65d887c9 100644
--- a/lib/asn1/test/asn1_SUITE_data/test_records.erl
+++ b/lib/asn1/test/asn1_SUITE_data/test_records.erl
@@ -23,9 +23,6 @@
 
 -export(['check_record_names_OTP-5812'/1]).
 
-%-include("test_server.hrl").
-%-include_lib("test_server/include/test_server.hrl").
-
 -define(line,put(test_server_loc,{?MODULE,?LINE}),).
 
 -include("NBAP-PDU-Discriptions.hrl").
@@ -48,19 +45,19 @@ check_record_names({initiatingMessage,
 					 transactionID = _TransactionID,
 					 value = Value}}) ->
     
-    ?line ok = check_record_ProcedureID(ProcedureID),
-    ?line ok = check_record_Value(Value).
+    ok = check_record_ProcedureID(ProcedureID),
+    ok = check_record_Value(Value).
 
 check_record_ProcedureID(#'ProcedureID'{}) ->
     ok;
 check_record_ProcedureID(_) -> false.
 
 check_record_Value(#'ResourceStatusIndication'{protocolIEs = ProtocolIEs}) ->
-    ?line ok = check_record_ProtocolIEs(ProtocolIEs);
+    ok = check_record_ProtocolIEs(ProtocolIEs);
 check_record_Value(_) -> false.
 
 check_record_ProtocolIEs([#'ProtocolIE-Field'{value =IndicationType}|_]) ->
-    ?line ok = check_record_NFResourceStatusInd(IndicationType);
+    ok = check_record_NFResourceStatusInd(IndicationType);
 check_record_ProtocolIEs(_) -> false.
 
 check_record_NFResourceStatusInd({'no-Failure',#'No-Failure-ResourceStatusInd'{'local-Cell-InformationList'=[LCIPF]}}) ->
@@ -68,13 +65,13 @@ check_record_NFResourceStatusInd({'no-Failure',#'No-Failure-ResourceStatusInd'{'
 check_record_NFResourceStatusInd(_) -> false.
 
 'check_record_NFResourceStatusInd_ProtocolIE-Field'(#'ProtocolIE-Field'{value=LCI}) ->
-    ?line ok = check_record_LCInfoResourceStatusInd(LCI);
+    ok = check_record_LCInfoResourceStatusInd(LCI);
 'check_record_NFResourceStatusInd_ProtocolIE-Field'(_) -> false.
 
 check_record_LCInfoResourceStatusInd(#'Local-Cell-InformationItem-ResourceStatusInd'{commonChannelsCapacityConsumptionLaw=[CCCCL],dedicatedChannelsCapacityConsumptionLaw=[DCCCL],'iE-Extensions' = [LCIRE]}) ->
-    ?line ok = check_record_CCCCL(CCCCL),
-    ?line ok = check_record_DCCCL(DCCCL),
-    ?line ok = check_record_LCIRE(LCIRE).
+    ok = check_record_CCCCL(CCCCL),
+    ok = check_record_DCCCL(DCCCL),
+    ok = check_record_LCIRE(LCIRE).
 
 check_record_CCCCL(#'CommonChannelsCapacityConsumptionLaw_SEQOF'{}) -> 
     ok;
diff --git a/lib/asn1/test/asn1_app_test.erl b/lib/asn1/test/asn1_app_test.erl
index 71aad5c62f..f226652b02 100644
--- a/lib/asn1/test/asn1_app_test.erl
+++ b/lib/asn1/test/asn1_app_test.erl
@@ -42,8 +42,6 @@ end_per_group(_GroupName, Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
 init_per_suite(Config) when is_list(Config) ->
     case is_app(asn1) of
 	{ok, AppFile} ->
@@ -64,18 +62,13 @@ is_app(App) ->
     end.
 
 
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
 end_per_suite(Config) when is_list(Config) ->
     Config.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-fields(suite) ->
-    [];
-fields(doc) ->
-    [];
+%% .
 fields(Config) when is_list(Config) ->
     AppFile = key1search(app_file, Config),
     Fields = [vsn, description, modules, registered, applications],
@@ -103,10 +96,7 @@ check_field(Name, AppFile, Missing) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-modules(suite) ->
-    [];
-modules(doc) ->
-    [];
+%% .
 modules(Config) when is_list(Config) ->
     AppFile  = key1search(app_file, Config),
     Mods     = key1search(modules, AppFile),
@@ -176,10 +166,7 @@ extra_modules(Mods, [Mod|Ebins], Extra) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-exportall(suite) ->
-    [];
-exportall(doc) ->
-    [];
+%% .
 exportall(Config) when is_list(Config) ->
     AppFile = key1search(app_file, Config),
     Mods    = key1search(modules, AppFile),
@@ -209,10 +196,7 @@ check_export_all([Mod|Mods]) ->
 	    
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-app_depend(suite) ->
-    [];
-app_depend(doc) ->
-    [];
+%% .
 app_depend(Config) when is_list(Config) ->
     AppFile = key1search(app_file, Config),
     Apps    = key1search(applications, AppFile),
diff --git a/lib/asn1/test/asn1_appup_test.erl b/lib/asn1/test/asn1_appup_test.erl
index 7df6190f92..94c84f7c45 100644
--- a/lib/asn1/test/asn1_appup_test.erl
+++ b/lib/asn1/test/asn1_appup_test.erl
@@ -42,14 +42,10 @@ end_per_group(_GroupName, Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
 init_per_suite(Config) when is_list(Config) ->
     Config.
     
 
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
 end_per_suite(Config) when is_list(Config) ->
     Config.
 
diff --git a/lib/asn1/test/asn1_test_lib.erl b/lib/asn1/test/asn1_test_lib.erl
index 4fee5a64cc..b151546140 100644
--- a/lib/asn1/test/asn1_test_lib.erl
+++ b/lib/asn1/test/asn1_test_lib.erl
@@ -21,12 +21,13 @@
 -module(asn1_test_lib).
 
 -export([compile/3,compile_all/3,compile_erlang/3,
+	 rm_dirs/1,
 	 hex_to_bin/1,
 	 match_value/2,
 	 parallel/0,
 	 roundtrip/3,roundtrip/4,roundtrip_enc/3,roundtrip_enc/4]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 run_dialyzer() ->
     false.
@@ -34,8 +35,8 @@ run_dialyzer() ->
 compile(File, Config, Options) -> compile_all([File], Config, Options).
 
 compile_all(Files, Config, Options) ->
-    DataDir = ?config(data_dir, Config),
-    CaseDir = ?config(case_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    CaseDir = proplists:get_value(case_dir, Config),
     [compile_file(filename:join(DataDir, F), [{outdir, CaseDir},
 					      debug_info|Options])
          || F <- Files],
@@ -58,7 +59,7 @@ dialyze(Files) ->
     Beams0 = [code:which(module(F)) || F <- Files],
     Beams = [code:which(asn1rt_nif)|Beams0],
     case dialyzer:run([{files,Beams},
-		       {warnings,[no_improper_lists]},
+		       {warnings,[]},
 		       {get_warnings,true}]) of
 	[] ->
 	    ok;
@@ -99,12 +100,24 @@ compile_file(File, Options) ->
     end.
 
 compile_erlang(Mod, Config, Options) ->
-    DataDir = ?config(data_dir, Config),
-    CaseDir = ?config(case_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    CaseDir = proplists:get_value(case_dir, Config),
     M = list_to_atom(Mod),
     {ok, M} = compile:file(filename:join(DataDir, Mod),
                            [report,{i,CaseDir},{outdir,CaseDir}|Options]).
 
+rm_dirs([Dir|Dirs]) ->
+    {ok,L0} = file:list_dir(Dir),
+    L = [filename:join(Dir, F) || F <- L0],
+    IsDir = fun(F) -> filelib:is_dir(F) end,
+    {Subdirs,Files} = lists:partition(IsDir, L),
+    _ = [ok = file:delete(F) || F <- Files],
+    rm_dirs(Subdirs),
+    ok = file:del_dir(Dir),
+    rm_dirs(Dirs);
+rm_dirs([]) ->
+    ok.
+
 hex_to_bin(S) ->
     << <<(hex2num(C)):4>> || C <- S, C =/= $\s >>.
 
diff --git a/lib/asn1/test/error_SUITE.erl b/lib/asn1/test/error_SUITE.erl
index a3413d1b3d..a8c6b894f1 100644
--- a/lib/asn1/test/error_SUITE.erl
+++ b/lib/asn1/test/error_SUITE.erl
@@ -27,7 +27,7 @@
 	 object_sets/1,parameterization/1,
 	 syntax/1,table_constraints/1,tags/1,values/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks, [ts_install_cth]}].
 
@@ -929,8 +929,8 @@ values(Config) ->
 
 run({Mod,Spec}, Config) ->
     Base = atom_to_list(Mod) ++ ".asn1",
-    File = filename:join(?config(priv_dir, Config), Base),
-    Include0 = filename:dirname(?config(data_dir, Config)),
+    File = filename:join(proplists:get_value(priv_dir, Config), Base),
+    Include0 = filename:dirname(proplists:get_value(data_dir, Config)),
     Include = filename:join(filename:dirname(Include0), "asn1_SUITE_data"),
     ok = file:write_file(File, Spec),
     asn1ct:compile(File, [{i, Include}]).
diff --git a/lib/asn1/test/h323test.erl b/lib/asn1/test/h323test.erl
index 39097a9330..566abd9714 100644
--- a/lib/asn1/test/h323test.erl
+++ b/lib/asn1/test/h323test.erl
@@ -21,7 +21,7 @@
 -module(h323test).
 
 -export([run/1]).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 run(per)     -> run();
 run(_Rules)  -> ok.
diff --git a/lib/asn1/test/syntax_SUITE.erl b/lib/asn1/test/syntax_SUITE.erl
index 2c23416433..56b8f32ff7 100644
--- a/lib/asn1/test/syntax_SUITE.erl
+++ b/lib/asn1/test/syntax_SUITE.erl
@@ -33,7 +33,7 @@
 	 types/1,
 	 values/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks, [ts_install_cth]}].
 
@@ -305,7 +305,7 @@ run(List, File, Config) ->
 
 run(List, File0, Config, Module) ->
     Base = File0 ++ ".asn1",
-    File = filename:join(?config(priv_dir, Config), Base),
+    File = filename:join(proplists:get_value(priv_dir, Config), Base),
     case run_1(List, Base, File, Module, 0) of
 	0 -> ok;
 	Errors -> ?t:fail(Errors)
diff --git a/lib/asn1/test/testChoExtension.erl b/lib/asn1/test/testChoExtension.erl
index 33515403d1..f4dc00b33c 100644
--- a/lib/asn1/test/testChoExtension.erl
+++ b/lib/asn1/test/testChoExtension.erl
@@ -22,7 +22,7 @@
 
 -export([extension/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 
 extension(_Rules) ->
diff --git a/lib/asn1/test/testChoExternal.erl b/lib/asn1/test/testChoExternal.erl
index 980b837475..fd9bcf4406 100644
--- a/lib/asn1/test/testChoExternal.erl
+++ b/lib/asn1/test/testChoExternal.erl
@@ -21,7 +21,7 @@
 -module(testChoExternal).
 -export([external/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("External.hrl").
 
 external(_Rules) ->
diff --git a/lib/asn1/test/testChoPrim.erl b/lib/asn1/test/testChoPrim.erl
index abf3fcdb81..14518285aa 100644
--- a/lib/asn1/test/testChoPrim.erl
+++ b/lib/asn1/test/testChoPrim.erl
@@ -23,7 +23,7 @@
 -export([bool/1]).
 -export([int/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 bool(Rules) ->
     roundtrip('ChoCon', {bool0,true}),
diff --git a/lib/asn1/test/testChoRecursive.erl b/lib/asn1/test/testChoRecursive.erl
index a307d448ed..040aeabe48 100644
--- a/lib/asn1/test/testChoRecursive.erl
+++ b/lib/asn1/test/testChoRecursive.erl
@@ -23,7 +23,7 @@
 
 -export([recursive/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('ChoRec_something',{a, b, c}).
 -record('ChoRec2_something',{a, b, c}).
diff --git a/lib/asn1/test/testChoTypeRefCho.erl b/lib/asn1/test/testChoTypeRefCho.erl
index 378a43fa59..b0a9fd68bd 100644
--- a/lib/asn1/test/testChoTypeRefCho.erl
+++ b/lib/asn1/test/testChoTypeRefCho.erl
@@ -22,7 +22,7 @@
 
 -export([choice/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 choice(_Rules) ->
     roundtrip('ChoTRcho', {choCho,{choInt,88}}),
diff --git a/lib/asn1/test/testChoTypeRefPrim.erl b/lib/asn1/test/testChoTypeRefPrim.erl
index 3541277674..59d23a8683 100644
--- a/lib/asn1/test/testChoTypeRefPrim.erl
+++ b/lib/asn1/test/testChoTypeRefPrim.erl
@@ -22,7 +22,7 @@
 
 -export([prim/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 prim(_Rules) ->
     roundtrip('ChoTR', {bool,true}),
diff --git a/lib/asn1/test/testChoTypeRefSeq.erl b/lib/asn1/test/testChoTypeRefSeq.erl
index c582d6f0fc..87c94fc888 100644
--- a/lib/asn1/test/testChoTypeRefSeq.erl
+++ b/lib/asn1/test/testChoTypeRefSeq.erl
@@ -22,7 +22,7 @@
 
 -export([seq/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('ChoSeq', {seqInt, seqOs}).
 -record('ChoSeqImp', {seqInt, seqOs}).
diff --git a/lib/asn1/test/testChoTypeRefSet.erl b/lib/asn1/test/testChoTypeRefSet.erl
index 2d4f6cce4b..d2ff48af91 100644
--- a/lib/asn1/test/testChoTypeRefSet.erl
+++ b/lib/asn1/test/testChoTypeRefSet.erl
@@ -22,7 +22,7 @@
 
 -export([set/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('ChoSet', {setInt, setOs}).
 -record('ChoSetImp', {setInt, setOs}).
diff --git a/lib/asn1/test/testChoiceIndefinite.erl b/lib/asn1/test/testChoiceIndefinite.erl
index d796871620..f5ae3ff882 100644
--- a/lib/asn1/test/testChoiceIndefinite.erl
+++ b/lib/asn1/test/testChoiceIndefinite.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 main(per) -> ok;
 main(ber) ->
diff --git a/lib/asn1/test/testConstraints.erl b/lib/asn1/test/testConstraints.erl
index 60b7994929..7da3ea3d38 100644
--- a/lib/asn1/test/testConstraints.erl
+++ b/lib/asn1/test/testConstraints.erl
@@ -23,7 +23,7 @@
 -export([int_constraints/1,refed_NNL_name/1]).
 
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 int_constraints(Rules) ->
 
diff --git a/lib/asn1/test/testContextSwitchingTypes.erl b/lib/asn1/test/testContextSwitchingTypes.erl
index f1af6cf0e5..62fe4c2168 100644
--- a/lib/asn1/test/testContextSwitchingTypes.erl
+++ b/lib/asn1/test/testContextSwitchingTypes.erl
@@ -22,7 +22,7 @@
 
 -export([test/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 test(Config) ->
     ValT_1 = 'ContextSwitchingTypes':'val1-T'(),
@@ -38,7 +38,7 @@ test(Config) ->
     check_EXTERNAL(enc_dec('T', ValT_4)),
 
     {ok,ValT2} = asn1ct:value('ContextSwitchingTypes', 'T',
-			      [{i,?config(case_dir, Config)}]),
+			      [{i,proplists:get_value(case_dir, Config)}]),
     io:format("ValT2 ~p~n",[ValT2]),
     check_EXTERNAL(enc_dec('T', ValT2)),
 
diff --git a/lib/asn1/test/testDER.erl b/lib/asn1/test/testDER.erl
index 195d8fe5a4..edaaa12eba 100644
--- a/lib/asn1/test/testDER.erl
+++ b/lib/asn1/test/testDER.erl
@@ -22,7 +22,7 @@
 
 -export([test/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 test() ->
     Val = {'Set',12,{version,214},true},
diff --git a/lib/asn1/test/testDeepTConstr.erl b/lib/asn1/test/testDeepTConstr.erl
index 50291bf645..ed37df7204 100644
--- a/lib/asn1/test/testDeepTConstr.erl
+++ b/lib/asn1/test/testDeepTConstr.erl
@@ -24,7 +24,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 main(_Erule) ->
     Val1 = {substrings,
diff --git a/lib/asn1/test/testDef.erl b/lib/asn1/test/testDef.erl
index c07665d097..5fa5711473 100644
--- a/lib/asn1/test/testDef.erl
+++ b/lib/asn1/test/testDef.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('Def1',{bool0, 
 		bool1 = asn1_DEFAULT, 
diff --git a/lib/asn1/test/testDoubleEllipses.erl b/lib/asn1/test/testDoubleEllipses.erl
index 8dcd979d6a..4a054a14ed 100644
--- a/lib/asn1/test/testDoubleEllipses.erl
+++ b/lib/asn1/test/testDoubleEllipses.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('Seq',{a, c}).
 -record('SeqV1',{a, b}).
diff --git a/lib/asn1/test/testEnumExt.erl b/lib/asn1/test/testEnumExt.erl
index 122d198205..057fcb694b 100644
--- a/lib/asn1/test/testEnumExt.erl
+++ b/lib/asn1/test/testEnumExt.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 main(Rule) when Rule =:= per; Rule =:= uper ->
     io:format("main(~p)~n",[Rule]),
diff --git a/lib/asn1/test/testINSTANCE_OF.erl b/lib/asn1/test/testINSTANCE_OF.erl
index afff05a4c5..b9079d8e95 100644
--- a/lib/asn1/test/testINSTANCE_OF.erl
+++ b/lib/asn1/test/testINSTANCE_OF.erl
@@ -21,7 +21,7 @@
 -module(testINSTANCE_OF).
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 main(_Erule) ->
     Int = roundtrip('Int', 3),
diff --git a/lib/asn1/test/testInfObjectClass.erl b/lib/asn1/test/testInfObjectClass.erl
index 271be63fc8..a7d0f2b6bd 100644
--- a/lib/asn1/test/testInfObjectClass.erl
+++ b/lib/asn1/test/testInfObjectClass.erl
@@ -24,7 +24,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 main(Rule) ->
     %% this test is added for OTP-4591, to test that elements in decoded
diff --git a/lib/asn1/test/testMegaco.erl b/lib/asn1/test/testMegaco.erl
index b1b1c866be..e298622a0f 100644
--- a/lib/asn1/test/testMegaco.erl
+++ b/lib/asn1/test/testMegaco.erl
@@ -23,7 +23,7 @@
 
 -export([compile/3,main/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 compile(Config, Erule, Options) ->
     asn1_test_lib:compile("MEDIA-GATEWAY-CONTROL.asn", Config, [Erule|Options]),
@@ -32,13 +32,13 @@ compile(Config, Erule, Options) ->
 
 main(no_module,_) -> ok;
 main('OLD-MEDIA-GATEWAY-CONTROL',Config) ->
-    CaseDir = ?config(case_dir, Config),
+    CaseDir = proplists:get_value(case_dir, Config),
     {ok,Msg} = asn1ct:value('OLD-MEDIA-GATEWAY-CONTROL','MegacoMessage',
                             [{i, CaseDir}]),
     asn1_test_lib:roundtrip('OLD-MEDIA-GATEWAY-CONTROL', 'MegacoMessage', Msg),
     ok;
 main('MEDIA-GATEWAY-CONTROL'=Mod, Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Files = filelib:wildcard(filename:join([DataDir,megacomessages,"*.val"])),
     lists:foreach(fun(File) ->
 			  {ok,Bin} = file:read_file(File),
diff --git a/lib/asn1/test/testMergeCompile.erl b/lib/asn1/test/testMergeCompile.erl
index 6bf7aaa1d6..1feac361e1 100644
--- a/lib/asn1/test/testMergeCompile.erl
+++ b/lib/asn1/test/testMergeCompile.erl
@@ -23,7 +23,7 @@
 
 -export([main/1,mvrasn/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('InitiatingMessage',{procedureCode,criticality,value}).
 -record('Iu-ReleaseCommand',{protocolIEs,protocolExtensions}).
@@ -66,16 +66,16 @@ main(Erule) ->
 mvrasn(Erule) ->
     case Erule of
 	ber ->
-	    ?line ok = test(isd),
-	    ?line ok = test(isd2),
-	    ?line ok = test(dsd),
-	    ?line ok = test(ul_res),
-	    ?line ok = test(seqofseq),
-	    ?line ok = test('InsertSubscriberDataArg');
+	    ok = test(isd),
+	    ok = test(isd2),
+	    ok = test(dsd),
+	    ok = test(ul_res),
+	    ok = test(seqofseq),
+	    ok = test('InsertSubscriberDataArg');
 	_ ->
 	    ok
     end,
-    ?line ok = test(mvrasn6,'InsertSubscriberDataArg').
+    ok = test(mvrasn6,'InsertSubscriberDataArg').
 
 test(isd)->
     EncPdu = <<48,128,129,7,145,148,113,50,1,0,241,131,1,0,176,128,5,0,
diff --git a/lib/asn1/test/testNBAPsystem.erl b/lib/asn1/test/testNBAPsystem.erl
index e0eeb9fe0c..956da1e632 100644
--- a/lib/asn1/test/testNBAPsystem.erl
+++ b/lib/asn1/test/testNBAPsystem.erl
@@ -22,7 +22,7 @@
 
 -export([compile/2,test/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('InitiatingMessage',{
 procedureID, criticality, messageDiscriminator, transactionID, value}).
@@ -92,23 +92,23 @@ compile(Config, Options) ->
 
 
 test(_Erule,Config) ->
-    ?line ok = enc_audit_req_msg(),
-    ?line ok = cell_setup_req_msg_test(),
+    ok = enc_audit_req_msg(),
+    ok = cell_setup_req_msg_test(),
     ticket_5812(Config).
 
 ticket_5812(Config) ->
-    ?line Msg = v_5812(),
+    Msg = v_5812(),
     {ok,B2} = 'NBAP-PDU-Discriptions':encode('NBAP-PDU', Msg),
     V = <<0,28,74,0,3,48,0,0,1,0,123,64,41,0,0,0,126,64,35,95,208,2,89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,145,0,1,205,0,0,0,0,2,98,64,1,128>>,
-    ?line ok = compare(V,B2),
+    ok = compare(V,B2),
     {ok,Msg2} = 'NBAP-PDU-Discriptions':decode('NBAP-PDU', B2),
-    ?line ok = check_record_names(Msg2,Config).
+    ok = check_record_names(Msg2,Config).
 
 enc_audit_req_msg() ->
     Msg = {initiatingMessage, audit_req_msg()},
     {ok,B} = 'NBAP-PDU-Discriptions':encode('NBAP-PDU', Msg),
     {ok,_Msg} = 'NBAP-PDU-Discriptions':decode('NBAP-PDU', B),
-    ?line {initiatingMessage,
+    {initiatingMessage,
 	   #'InitiatingMessage'{value=#'AuditRequest'{protocolIEs=[{_,114,ignore,_}],
 						      protocolExtensions = asn1_NOVALUE}}} = _Msg,
     io:format("Msg: ~n~P~n~n_Msg:~n~P~n",[Msg,15,_Msg,15]),
@@ -285,8 +285,8 @@ compare(_,_) ->
     false.
 
 check_record_names(Msg,Config) ->
-    DataDir = ?config(data_dir,Config),
-    CaseDir = ?config(case_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
+    CaseDir = proplists:get_value(case_dir,Config),
     {ok, test_records} = compile:file(filename:join([DataDir, "test_records"]),
                                       [{i, CaseDir}]),
     ok = test_records:'check_record_names_OTP-5812'(Msg).
diff --git a/lib/asn1/test/testOpenTypeImplicitTag.erl b/lib/asn1/test/testOpenTypeImplicitTag.erl
index 01e0a5e07f..fc2f2a81e6 100644
--- a/lib/asn1/test/testOpenTypeImplicitTag.erl
+++ b/lib/asn1/test/testOpenTypeImplicitTag.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 main(_Rules) ->
     roundtrip('Seq', {'Seq',<<1,1,255>>,<<1,1,255>>,12,<<1,1,255>>}),
diff --git a/lib/asn1/test/testOpt.erl b/lib/asn1/test/testOpt.erl
index 1f96331966..a15aa28f02 100644
--- a/lib/asn1/test/testOpt.erl
+++ b/lib/asn1/test/testOpt.erl
@@ -21,7 +21,7 @@
 -module(testOpt).
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('Opt1',{bool0, 
 		bool1 = asn1_NOVALUE, 
diff --git a/lib/asn1/test/testParamBasic.erl b/lib/asn1/test/testParamBasic.erl
index f4a696ff38..768c5ad2fa 100644
--- a/lib/asn1/test/testParamBasic.erl
+++ b/lib/asn1/test/testParamBasic.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('T11',{number, string=asn1_DEFAULT}).
 -record('T12',{number, string=asn1_DEFAULT}).
diff --git a/lib/asn1/test/testParameterizedInfObj.erl b/lib/asn1/test/testParameterizedInfObj.erl
index 592dc693f0..d7bcde963b 100644
--- a/lib/asn1/test/testParameterizedInfObj.erl
+++ b/lib/asn1/test/testParameterizedInfObj.erl
@@ -23,7 +23,7 @@
 
 -export([main/2,param/1,ranap/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('AllocationOrRetentionPriority',{priorityLevel,iE_Extensions}).
 -record('ProtocolExtensionField',{id,criticality,extensionValue}).
@@ -97,7 +97,7 @@ roundtrip(T, V) ->
 
 ranap(_Erule) ->    
     PIEVal2 = [{'ProtocolIE-Field',4,ignore,{radioNetwork,'rab-pre-empted'}}],
-    ?line Val2 = 
+    Val2 =
 	#'InitiatingMessage'{procedureCode=1,
 			     criticality=ignore,
 			     value=#'Iu-ReleaseCommand'{protocolIEs=PIEVal2,
@@ -121,8 +121,8 @@ param2(Config, Erule) ->
 		       {'ProtocolIE-Field',101,true}]}),
 
     %% Now remove the data after the extension mark in the object set.
-    DataDir = ?config(data_dir, Config),
-    CaseDir = ?config(case_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    CaseDir = proplists:get_value(case_dir, Config),
     Asn1SrcBase = "Param2.asn1",
     Asn1SrcFile0 = filename:join(DataDir, Asn1SrcBase),
     {ok,Src0} = file:read_file(Asn1SrcFile0),
diff --git a/lib/asn1/test/testPrim.erl b/lib/asn1/test/testPrim.erl
index dc2e0fa2e7..82da953ca1 100644
--- a/lib/asn1/test/testPrim.erl
+++ b/lib/asn1/test/testPrim.erl
@@ -28,7 +28,7 @@
 -export([null/1]).
 -export([real/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 bool(Rules) ->
     Types = ['Bool','BoolCon','BoolPri','BoolApp',
diff --git a/lib/asn1/test/testPrimExternal.erl b/lib/asn1/test/testPrimExternal.erl
index 56252241d4..79c8a3a045 100644
--- a/lib/asn1/test/testPrimExternal.erl
+++ b/lib/asn1/test/testPrimExternal.erl
@@ -22,7 +22,7 @@
 
 -export([external/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 external(_Rules) ->
     Types = ['NT',
diff --git a/lib/asn1/test/testPrimStrings.erl b/lib/asn1/test/testPrimStrings.erl
index 46793c6bff..042b1757ba 100644
--- a/lib/asn1/test/testPrimStrings.erl
+++ b/lib/asn1/test/testPrimStrings.erl
@@ -33,7 +33,7 @@
 -export([utf8_string/1]).
 -export([fragmented/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 fragmented(Rules) ->
     Lens = fragmented_lengths(),
@@ -54,7 +54,7 @@ fragmented_strings(Len, Types) ->
     ok.
 
 make_ns_value(0) -> [];
-make_ns_value(N) -> [($0 - 1) + random:uniform(10)|make_ns_value(N-1)].
+make_ns_value(N) -> [($0 - 1) + rand:uniform(10)|make_ns_value(N-1)].
 
 fragmented_lengths() ->
     K16 = 1 bsl 14,
diff --git a/lib/asn1/test/testRfcs.erl b/lib/asn1/test/testRfcs.erl
index 20eaee9982..e110f87edd 100644
--- a/lib/asn1/test/testRfcs.erl
+++ b/lib/asn1/test/testRfcs.erl
@@ -23,15 +23,15 @@
 
 -export([compile/3,test/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 compile(Config, Erules, Options0) ->
     Options = [no_ok_wrapper|Options0],
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Specs0 = filelib:wildcard("*.asn1", filename:join(DataDir, rfcs)),
     Specs = [filename:join(rfcs, Spec) || Spec <- Specs0],
     122 = length(Specs),
-    CaseDir = ?config(case_dir, Config),
+    CaseDir = proplists:get_value(case_dir, Config),
     asn1_test_lib:compile_all(Specs, Config, [Erules,{i,CaseDir}|Options]).
 
 test() ->
diff --git a/lib/asn1/test/testSSLspecs.erl b/lib/asn1/test/testSSLspecs.erl
index 9e51021ad2..5d5f749d37 100644
--- a/lib/asn1/test/testSSLspecs.erl
+++ b/lib/asn1/test/testSSLspecs.erl
@@ -23,11 +23,11 @@
 
 -export([compile/2,run/1,compile_combined/2,run_combined/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 compile(Config, Options) ->
-    DataDir = ?config(data_dir, Config),
-    CaseDir = ?config(case_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    CaseDir = proplists:get_value(case_dir, Config),
     NewOptions = [{i, DataDir}, {i, CaseDir}|Options],
 
     asn1_test_lib:compile_all(["SSL-PKIX", "PKIXAttributeCertificate"],
@@ -44,16 +44,16 @@ compile(Config, Options) ->
                               Config, NewOptions).
 
 compile_combined(Config, ber=Rule) ->
-    DataDir = ?config(data_dir, Config),
-    CaseDir = ?config(case_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    CaseDir = proplists:get_value(case_dir, Config),
     Options = [{i, CaseDir}, {i, DataDir}, Rule,
                der, compact_bit_string, asn1config],
     ok = remove_db_files_combined(CaseDir),
     asn1_test_lib:compile("OTP-PKIX.set.asn", Config, Options).
 
 remove_db_files(Dir) ->
-    ?line ok = remove_db_file(Dir ++ "PKIX1Explicit93.asn1db"),
-    ?line ok = remove_db_file(Dir ++ "PKIX1Implicit93.asn1db").
+    ok = remove_db_file(Dir ++ "PKIX1Explicit93.asn1db"),
+    ok = remove_db_file(Dir ++ "PKIX1Implicit93.asn1db").
 remove_db_file(File) ->
     case file:delete(File) of
 	ok ->
@@ -65,23 +65,23 @@ remove_db_file(File) ->
     end.
 
 remove_db_files_combined(Dir) ->
-    ?line ok = remove_db_file(Dir ++ "OTP-PKIX.asn1db"),
-    ?line ok = remove_db_file(Dir ++ "SSL-PKIX.asn1db"),
-    ?line ok = remove_db_file(Dir ++ "PKIXAttributeCertificate.asn1db"),
-    ?line ok = remove_db_file(Dir ++ "PKIX1Algorithms88.asn1db"),
-    ?line ok = remove_db_file(Dir ++ "PKIX1Explicit88.asn1db"),
-    ?line ok = remove_db_file(Dir ++ "PKIX1Implicit88.asn1db").
+    ok = remove_db_file(Dir ++ "OTP-PKIX.asn1db"),
+    ok = remove_db_file(Dir ++ "SSL-PKIX.asn1db"),
+    ok = remove_db_file(Dir ++ "PKIXAttributeCertificate.asn1db"),
+    ok = remove_db_file(Dir ++ "PKIX1Algorithms88.asn1db"),
+    ok = remove_db_file(Dir ++ "PKIX1Explicit88.asn1db"),
+    ok = remove_db_file(Dir ++ "PKIX1Implicit88.asn1db").
 
 run(ber) ->
     run1(1).
 
 run1(6) ->
-    ?line f1(6),
-    ?line f2(6),
-    ?line transform4(ex(7));
+    f1(6),
+    f2(6),
+    transform4(ex(7));
 run1(N) ->
-    ?line f1(N),
-    ?line f2(N),
+    f1(N),
+    f2(N),
     run1(N+1).
 
 
@@ -93,22 +93,22 @@ f2(N) ->
 
 
 transform1(ATAV) ->
-    ?line {ok, ATAVEnc} = 'PKIX1Explicit88':encode('AttributeTypeAndValue',
+    {ok, ATAVEnc} = 'PKIX1Explicit88':encode('AttributeTypeAndValue',
 ATAV),
-    ?line {ok, _ATAVDec} = 'SSL-PKIX':decode('AttributeTypeAndValue',
+    {ok, _ATAVDec} = 'SSL-PKIX':decode('AttributeTypeAndValue',
                                       ATAVEnc).
 
 transform2(ATAV) ->
-    ?line {ok, ATAVEnc} = 'PKIX1Explicit88':encode('AttributeTypeAndValue',
+    {ok, ATAVEnc} = 'PKIX1Explicit88':encode('AttributeTypeAndValue',
 ATAV),
-    ?line {ok, _ATAVDec} = 'PKIX1Explicit88':decode('AttributeTypeAndValue',
+    {ok, _ATAVDec} = 'PKIX1Explicit88':decode('AttributeTypeAndValue',
                                              ATAVEnc).
 
 
 transform4(ATAV) ->
-    ?line {ok, ATAVEnc} = 'PKIX1Explicit88':encode('Attribute',
+    {ok, ATAVEnc} = 'PKIX1Explicit88':encode('Attribute',
 ATAV),
-    ?line {ok, _ATAVDec} = 'PKIX1Explicit88':decode('Attribute',
+    {ok, _ATAVDec} = 'PKIX1Explicit88':decode('Attribute',
                                              ATAVEnc).
 
 
@@ -144,8 +144,8 @@ ex(7) ->
 
 run_combined(ber) ->
     Cert = cert(),
-    ?line {ok,{'CertificatePKIX1Explicit88',{Type,UnDec},_,_}} = 'OTP-PKIX':decode_TBSCert_exclusive(Cert),
-    ?line {ok,_} = 'OTP-PKIX':decode_part(Type,UnDec),
+    {ok,{'CertificatePKIX1Explicit88',{Type,UnDec},_,_}} = 'OTP-PKIX':decode_TBSCert_exclusive(Cert),
+    {ok,_} = 'OTP-PKIX':decode_part(Type,UnDec),
     ok.
 
 cert() ->
diff --git a/lib/asn1/test/testSelectionTypes.erl b/lib/asn1/test/testSelectionTypes.erl
index d33cfcc694..7039f6da4e 100644
--- a/lib/asn1/test/testSelectionTypes.erl
+++ b/lib/asn1/test/testSelectionTypes.erl
@@ -21,7 +21,7 @@
 -module(testSelectionTypes).
 -export([test/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 test() ->
     ["Es"] = Val2 = ['SelectionType':einsteinium()],
diff --git a/lib/asn1/test/testSeq2738.erl b/lib/asn1/test/testSeq2738.erl
index 3c9e4a744e..a75d058259 100644
--- a/lib/asn1/test/testSeq2738.erl
+++ b/lib/asn1/test/testSeq2738.erl
@@ -21,7 +21,7 @@
 -module(testSeq2738).
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SeqOptFake',{int, opt = asn1_NOVALUE}).
 -record('OptSeqFake',{bool = false}).
diff --git a/lib/asn1/test/testSeqDefault.erl b/lib/asn1/test/testSeqDefault.erl
index db0914bf0a..ac3cf202b7 100644
--- a/lib/asn1/test/testSeqDefault.erl
+++ b/lib/asn1/test/testSeqDefault.erl
@@ -23,7 +23,7 @@
 -include("External.hrl").
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SeqDef1',{bool1 = asn1_DEFAULT, int1, seq1 = asn1_DEFAULT}).
 -record('SeqDef1Imp',{bool1 = asn1_DEFAULT, int1, seq1 = asn1_DEFAULT}).
diff --git a/lib/asn1/test/testSeqExtension.erl b/lib/asn1/test/testSeqExtension.erl
index 6b49b29047..a84b6fb27c 100644
--- a/lib/asn1/test/testSeqExtension.erl
+++ b/lib/asn1/test/testSeqExtension.erl
@@ -23,7 +23,7 @@
 -include("External.hrl").
 -export([main/3]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SeqExt1',{}).
 -record('SeqExt2',{bool, int}).
diff --git a/lib/asn1/test/testSeqExternal.erl b/lib/asn1/test/testSeqExternal.erl
index a48794924f..9ad2c03208 100644
--- a/lib/asn1/test/testSeqExternal.erl
+++ b/lib/asn1/test/testSeqExternal.erl
@@ -23,7 +23,7 @@
 -include("External.hrl").
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SeqXSet1',{set, bool, int}).
 -record('SeqXSet2',{bool, set, int}).
diff --git a/lib/asn1/test/testSeqOf.erl b/lib/asn1/test/testSeqOf.erl
index 898b8c1e15..f4a4181f51 100644
--- a/lib/asn1/test/testSeqOf.erl
+++ b/lib/asn1/test/testSeqOf.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('Seq1',{bool1, int1, seq1 = asn1_DEFAULT}).
 -record('Seq2',{seq2 = asn1_DEFAULT, bool2, int2}).
diff --git a/lib/asn1/test/testSeqOfCho.erl b/lib/asn1/test/testSeqOfCho.erl
index 82ac56ac50..7bd1ce7aa6 100644
--- a/lib/asn1/test/testSeqOfCho.erl
+++ b/lib/asn1/test/testSeqOfCho.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SeqChoDef',{bool1, int1, seq1 = asn1_DEFAULT}).
 -record('SeqChoOpt',{bool1, int1, seq1 = asn1_NOVALUE}).
diff --git a/lib/asn1/test/testSeqOfExternal.erl b/lib/asn1/test/testSeqOfExternal.erl
index 560fdecb64..de95e081d5 100644
--- a/lib/asn1/test/testSeqOfExternal.erl
+++ b/lib/asn1/test/testSeqOfExternal.erl
@@ -21,7 +21,7 @@
 -module(testSeqOfExternal).
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("External.hrl").
 
 -record('NT',{os, bool}).
diff --git a/lib/asn1/test/testSeqOfIndefinite.erl b/lib/asn1/test/testSeqOfIndefinite.erl
index 4a0101834a..e28b9e0fd3 100644
--- a/lib/asn1/test/testSeqOfIndefinite.erl
+++ b/lib/asn1/test/testSeqOfIndefinite.erl
@@ -22,16 +22,16 @@
 
 -export([main/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 main() ->
-    ?line ok = test(isd),
-    ?line ok = test(isd2),
-    ?line ok = test(dsd),
-    ?line ok = test(ul_res),
-    ?line ok = test(prim),
-    ?line ok = test(seqofseq),
-    ?line ok = test('InsertSubscriberDataArg'). % OTP-4232
+    ok = test(isd),
+    ok = test(isd2),
+    ok = test(dsd),
+    ok = test(ul_res),
+    ok = test(prim),
+    ok = test(seqofseq),
+    ok = test('InsertSubscriberDataArg'). % OTP-4232
 
 test(isd)->
     EncPdu = <<48,128,129,7,145,148,113,50,1,0,241,131,1,0,176,128,5,0,
diff --git a/lib/asn1/test/testSeqOfTag.erl b/lib/asn1/test/testSeqOfTag.erl
index 55f807199f..cacbc85093 100644
--- a/lib/asn1/test/testSeqOfTag.erl
+++ b/lib/asn1/test/testSeqOfTag.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("External.hrl").
 
 
diff --git a/lib/asn1/test/testSeqOptional.erl b/lib/asn1/test/testSeqOptional.erl
index db615d6e4d..92b49e9c0d 100644
--- a/lib/asn1/test/testSeqOptional.erl
+++ b/lib/asn1/test/testSeqOptional.erl
@@ -23,7 +23,7 @@
 -include("External.hrl").
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SeqOpt1',{bool1 = asn1_NOVALUE, int1, seq1 = asn1_NOVALUE}).
 -record('SeqOpt1Imp',{bool1 = asn1_NOVALUE, int1, seq1 = asn1_NOVALUE}).
diff --git a/lib/asn1/test/testSeqPrim.erl b/lib/asn1/test/testSeqPrim.erl
index 6af0ce9287..5872902ce7 100644
--- a/lib/asn1/test/testSeqPrim.erl
+++ b/lib/asn1/test/testSeqPrim.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('Seq',{bool, boolCon, boolPri, boolApp, boolExpCon, boolExpPri, boolExpApp}).
 -record('Empty',{}).
diff --git a/lib/asn1/test/testSeqSetDefaultVal.erl b/lib/asn1/test/testSeqSetDefaultVal.erl
index 86ab07a4a8..1c41f64078 100644
--- a/lib/asn1/test/testSeqSetDefaultVal.erl
+++ b/lib/asn1/test/testSeqSetDefaultVal.erl
@@ -22,7 +22,7 @@
 -export([main/2]).
 
 -include("External.hrl").
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SeqInts',{a = asn1_DEFAULT, 
 		   b = asn1_DEFAULT, 
diff --git a/lib/asn1/test/testSeqSetIndefinite.erl b/lib/asn1/test/testSeqSetIndefinite.erl
index 8948e10ece..41e09f7796 100644
--- a/lib/asn1/test/testSeqSetIndefinite.erl
+++ b/lib/asn1/test/testSeqSetIndefinite.erl
@@ -21,7 +21,7 @@
 -module(testSeqSetIndefinite).
 -export([main/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 main() ->
     seq_indefinite(),
diff --git a/lib/asn1/test/testSeqTag.erl b/lib/asn1/test/testSeqTag.erl
index baa79ed428..6959e2f7e2 100644
--- a/lib/asn1/test/testSeqTag.erl
+++ b/lib/asn1/test/testSeqTag.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("External.hrl").
 
 -record('SeqTag',{nt, imp, exp}).
diff --git a/lib/asn1/test/testSeqTypeRefCho.erl b/lib/asn1/test/testSeqTypeRefCho.erl
index 372be0c637..4a9ba53291 100644
--- a/lib/asn1/test/testSeqTypeRefCho.erl
+++ b/lib/asn1/test/testSeqTypeRefCho.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("External.hrl").
 
 -record('SeqTRcho',{seqCho, seqChoE, 'seqCho-E', 'seqChoE-E'}).
diff --git a/lib/asn1/test/testSeqTypeRefPrim.erl b/lib/asn1/test/testSeqTypeRefPrim.erl
index 42554e758e..e0c3277156 100644
--- a/lib/asn1/test/testSeqTypeRefPrim.erl
+++ b/lib/asn1/test/testSeqTypeRefPrim.erl
@@ -21,7 +21,7 @@
 -module(testSeqTypeRefPrim).
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SeqTR',{octStr, octStrI, octStrE, 'octStr-I', 'octStrI-I', 'octStrE-I', 'octStr-E', 'octStrI-E', 'octStrE-E'}).
 
diff --git a/lib/asn1/test/testSeqTypeRefSeq.erl b/lib/asn1/test/testSeqTypeRefSeq.erl
index ee30937af5..befbe5f457 100644
--- a/lib/asn1/test/testSeqTypeRefSeq.erl
+++ b/lib/asn1/test/testSeqTypeRefSeq.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('Seq1',{bool1, int1, seq1}).
 -record('Seq2',{seq2, bool2, int2}).
diff --git a/lib/asn1/test/testSeqTypeRefSet.erl b/lib/asn1/test/testSeqTypeRefSet.erl
index ba690b4503..48c94a8b06 100644
--- a/lib/asn1/test/testSeqTypeRefSet.erl
+++ b/lib/asn1/test/testSeqTypeRefSet.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SeqTRset',{seqSet, seqSetI, seqSetE, 'seqSet-I', 'seqSetI-I', 'seqSetE-I', 'seqSet-E', 'seqSetI-E', 'seqSetE-E'}).
 -record('SeqSet',{setInt, setOs}).
diff --git a/lib/asn1/test/testSetDefault.erl b/lib/asn1/test/testSetDefault.erl
index 4e34c01a52..e91a526add 100644
--- a/lib/asn1/test/testSetDefault.erl
+++ b/lib/asn1/test/testSetDefault.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SetDef1',{bool1 = asn1_DEFAULT, int1, set1 = asn1_DEFAULT}).
 -record('SetDef2',{set2 = asn1_DEFAULT, bool2, int2}).
diff --git a/lib/asn1/test/testSetExtension.erl b/lib/asn1/test/testSetExtension.erl
index 67977a2a31..89f27a7fef 100644
--- a/lib/asn1/test/testSetExtension.erl
+++ b/lib/asn1/test/testSetExtension.erl
@@ -22,7 +22,7 @@
 -include("External.hrl").
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SetExt1',{}).
 -record('SetExt2',{bool, int}).
diff --git a/lib/asn1/test/testSetExternal.erl b/lib/asn1/test/testSetExternal.erl
index e265cf1f3e..f5d01e23a8 100644
--- a/lib/asn1/test/testSetExternal.erl
+++ b/lib/asn1/test/testSetExternal.erl
@@ -22,7 +22,7 @@
 -export([main/1]).
 
 -include("External.hrl").
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SetXSeq1',{seq, bool, int}).
 -record('SetXSeq2',{bool, seq, int}).
diff --git a/lib/asn1/test/testSetOf.erl b/lib/asn1/test/testSetOf.erl
index 4ff90676aa..02009dc8d5 100644
--- a/lib/asn1/test/testSetOf.erl
+++ b/lib/asn1/test/testSetOf.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('Set1',{bool1, int1, set1 = asn1_DEFAULT}).
 -record('Set2',{set2 = asn1_DEFAULT, bool2, int2}).
diff --git a/lib/asn1/test/testSetOfCho.erl b/lib/asn1/test/testSetOfCho.erl
index 002fa9be0a..be199b4688 100644
--- a/lib/asn1/test/testSetOfCho.erl
+++ b/lib/asn1/test/testSetOfCho.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SetChoDef',{bool1, int1, set1 = asn1_DEFAULT}).
 -record('SetChoOpt',{bool1, int1, set1 = asn1_NOVALUE}).
diff --git a/lib/asn1/test/testSetOfExternal.erl b/lib/asn1/test/testSetOfExternal.erl
index 60bde33962..7abed66167 100644
--- a/lib/asn1/test/testSetOfExternal.erl
+++ b/lib/asn1/test/testSetOfExternal.erl
@@ -21,7 +21,7 @@
 -module(testSetOfExternal).
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("External.hrl").
 
 -record('NT',{os, bool}).
diff --git a/lib/asn1/test/testSetOfTag.erl b/lib/asn1/test/testSetOfTag.erl
index 96dc9942d7..ce77e2848f 100644
--- a/lib/asn1/test/testSetOfTag.erl
+++ b/lib/asn1/test/testSetOfTag.erl
@@ -21,7 +21,7 @@
 -module(testSetOfTag).
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("External.hrl").
 
 -record('SetTagNt',{nt}).
diff --git a/lib/asn1/test/testSetPrim.erl b/lib/asn1/test/testSetPrim.erl
index a4b8bb2f09..47913178f3 100644
--- a/lib/asn1/test/testSetPrim.erl
+++ b/lib/asn1/test/testSetPrim.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('Set',{bool, boolCon, boolPri, boolApp, boolExpCon, boolExpPri, boolExpApp}).
 -record('Empty',{}).
diff --git a/lib/asn1/test/testSetTag.erl b/lib/asn1/test/testSetTag.erl
index b963ecb4b3..2e95fb6793 100644
--- a/lib/asn1/test/testSetTag.erl
+++ b/lib/asn1/test/testSetTag.erl
@@ -21,7 +21,7 @@
 -module(testSetTag).
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("External.hrl").
 
 -record('SetTag',{nt, imp, exp}).
diff --git a/lib/asn1/test/testSetTypeRefCho.erl b/lib/asn1/test/testSetTypeRefCho.erl
index adffb646fb..ac5bf5ab02 100644
--- a/lib/asn1/test/testSetTypeRefCho.erl
+++ b/lib/asn1/test/testSetTypeRefCho.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("External.hrl").
 
 -record('SetTRcho',{setCho, setChoE, 'setCho-E', 'setChoE-E'}).
diff --git a/lib/asn1/test/testSetTypeRefPrim.erl b/lib/asn1/test/testSetTypeRefPrim.erl
index e20b6c57ab..51190e2ba4 100644
--- a/lib/asn1/test/testSetTypeRefPrim.erl
+++ b/lib/asn1/test/testSetTypeRefPrim.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SetTR',{octStr, octStrI, octStrE, 'octStr-I', 'octStrI-I', 'octStrE-I', 'octStr-E', 'octStrI-E', 'octStrE-E'}).
 
diff --git a/lib/asn1/test/testSetTypeRefSeq.erl b/lib/asn1/test/testSetTypeRefSeq.erl
index 0d2bd6b32d..44a7910526 100644
--- a/lib/asn1/test/testSetTypeRefSeq.erl
+++ b/lib/asn1/test/testSetTypeRefSeq.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('SetTRseq',{setSeq, setSeqI, setSeqE, 'setSeq-I', 'setSeqI-I', 'setSeqE-I', 'setSeq-E', 'setSeqI-E', 'setSeqE-E'}).
 -record('SetSeq',{seqInt, seqOs}).
diff --git a/lib/asn1/test/testSetTypeRefSet.erl b/lib/asn1/test/testSetTypeRefSet.erl
index 85d9bf52cd..7a67e6434c 100644
--- a/lib/asn1/test/testSetTypeRefSet.erl
+++ b/lib/asn1/test/testSetTypeRefSet.erl
@@ -22,7 +22,7 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -record('Set1',{bool1, int1, set1}).
 -record('Set2',{set2, bool2, int2}).
diff --git a/lib/asn1/test/testTCAP.erl b/lib/asn1/test/testTCAP.erl
index 6c66d73feb..48a9f049ca 100644
--- a/lib/asn1/test/testTCAP.erl
+++ b/lib/asn1/test/testTCAP.erl
@@ -22,7 +22,7 @@
 
 -export([compile/2,test/2,compile_asn1config/2,test_asn1config/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 compile(Config, Options) ->
     Files = ["Remote-Operations-Information-Objects",
@@ -39,7 +39,6 @@ compile_asn1config(Config, Options) ->
     asn1_test_lib:compile_erlang("TCAPPackage_msg", Config, []).
 
 test(Erule,_Config) ->
-%    ?line OutDir = ?config(priv_dir,Config),
     %% testing OTP-4798, open type encoded with indefinite length
     {ok,_Res} = 'TCAPMessages-simple':decode('MessageType',
 					     val_OTP_4798(Erule)),
@@ -49,20 +48,17 @@ test(Erule,_Config) ->
 					      val_OTP_4799(Erule)),
 
     %% testing vance shipley's problems. Parameterized object sets.
-    ?line Val3 = 'TCAPPackage_msg':val('PackageType',unidirectional),
+    Val3 = 'TCAPPackage_msg':val('PackageType',unidirectional),
     Res3 = enc_dec('PackageType', Val3),
-    ?line ok = 'TCAPPackage_msg':check_result('PackageType',unidirectional,Res3),
-%%    ?line io:format("Res3:~n~p~n~n",[Res3]),
+    ok = 'TCAPPackage_msg':check_result('PackageType',unidirectional,Res3),
     
-    ?line Val4 = 'TCAPPackage_msg':val('PackageType',abort),
+    Val4 = 'TCAPPackage_msg':val('PackageType',abort),
     Res4 = enc_dec('PackageType', Val4),
-    ?line ok = 'TCAPPackage_msg':check_result('PackageType',abort,Res4),
-%%    ?line io:format("Res4:~n~p~n~n",[Res4]),
+    ok = 'TCAPPackage_msg':check_result('PackageType',abort,Res4),
 
-    ?line Val5 = 'TCAPPackage_msg':val('PackageType',response),
+    Val5 = 'TCAPPackage_msg':val('PackageType',response),
     Res5 = enc_dec('PackageType', Val5),
-    ?line ok = 'TCAPPackage_msg':check_result('PackageType',response,Res5).
-%%    ?line io:format("Res5:~n~p~n~n",[Res5]).
+    ok = 'TCAPPackage_msg':check_result('PackageType',response,Res5).
 
 val_OTP_4798(ber) ->
     [100,129,176,73,4,57,3,17,80,107,42,40,40,6,7,0,17,134,5,1,1,1,160,29,97,27,128,2,7,128,161,9,6,7,4,0,0,1,0,14,2,162,3,2,1,0,163,5,161,3,2,1,0,108,128,162,120,2,1,0,48,115,2,1,56,48,128,48,34,4,16,203,87,215,196,217,93,235,90,64,131,106,145,39,26,25,236,4,4,197,241,81,112,4,8,78,225,34,196,215,212,200,0,48,34,4,16,145,125,27,67,42,144,6,161,207,112,55,75,200,191,191,28,4,4,226,219,242,123,4,8,72,46,130,28,206,178,168,0,48,34,4,16,1,8,20,29,70,160,218,160,125,188,244,174,113,115,253,245,4,4,26,5,90,160,4,8,252,75,149,98,153,224,140,0,0,0,0,0];
diff --git a/lib/asn1/test/testTimer.erl b/lib/asn1/test/testTimer.erl
index 30e31796e2..6fecee3d78 100644
--- a/lib/asn1/test/testTimer.erl
+++ b/lib/asn1/test/testTimer.erl
@@ -21,7 +21,7 @@
 -module(testTimer).
 -export([go/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(times, 5000).
 
diff --git a/lib/asn1/test/test_compile_options.erl b/lib/asn1/test/test_compile_options.erl
index 8be3a29763..ea67514229 100644
--- a/lib/asn1/test/test_compile_options.erl
+++ b/lib/asn1/test/test_compile_options.erl
@@ -21,7 +21,7 @@
 
 -module(test_compile_options).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 
 -export([wrong_path/1,comp/2,path/1,ticket_6143/1,noobj/1,
@@ -39,50 +39,49 @@ wrong_path(Config) ->
     end.
 
 comp(Parent,Config) ->
-    DataDir = ?config(data_dir,Config),
-    OutDir = ?config(priv_dir,Config),
-    ?line Err=asn1ct:compile(DataDir++"NoImport",[{i,OutDir},{i,filename:join([DataDir,"subdir"])},{outdir,OutDir}]),
+    DataDir = proplists:get_value(data_dir,Config),
+    OutDir = proplists:get_value(priv_dir,Config),
+    Err=asn1ct:compile(DataDir++"NoImport",[{i,OutDir},{i,filename:join([DataDir,"subdir"])},{outdir,OutDir}]),
     Parent!Err.
 
 %% OTP-5701
 
 path(Config) ->
-    DataDir = ?config(data_dir,Config),
-    OutDir = ?config(priv_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
+    OutDir = proplists:get_value(priv_dir,Config),
     {ok,CWD} = file:get_cwd(),
-    ?line file:set_cwd(filename:join([DataDir,subdir])),
+    file:set_cwd(filename:join([DataDir,subdir])),
 
     ok = asn1ct:compile("../MyMerge.set.asn",[{outdir,OutDir}]),
 
-    ?line ok=outfiles_check(OutDir),
-    ?line outfiles_remove(OutDir),
+    ok=outfiles_check(OutDir),
+    outfiles_remove(OutDir),
 
     file:set_cwd(filename:join([DataDir,subdir,subsubdir])),
     ok = asn1ct:compile('../../MyMerge.set.asn',[{i,'..'},{outdir,OutDir}]),
 
-    ?line ok=outfiles_check(OutDir,outfiles2()),
+    ok=outfiles_check(OutDir,outfiles2()),
     file:set_cwd(CWD),
     ok.
 
 ticket_6143(Config) -> asn1_test_lib:compile("AA1", Config, []).
 
 noobj(Config) ->
-    DataDir = ?config(data_dir,Config),
-    OutDir = ?config(priv_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
+    OutDir = proplists:get_value(priv_dir,Config),
     
     code:purge('P-Record'),
     file:delete(filename:join([OutDir,'P-Record.erl'])),
     file:delete(filename:join([OutDir,'P-Record.beam'])),
-    ?line ok=asn1ct:compile(filename:join([DataDir,"P-Record"]),
+    ok=asn1ct:compile(filename:join([DataDir,"P-Record"]),
 			    [noobj,{outdir,OutDir}]),
-%    ?line false = code:is_loaded('P-Record'),
-    ?line {ok,_} = file:read_file_info(filename:join([OutDir,
+    {ok,_} = file:read_file_info(filename:join([OutDir,
 						      "P-Record.erl"])),
-    ?line {error,enoent} =
+    {error,enoent} =
 	file:read_file_info(filename:join([OutDir,"P-Record.beam"])),
-    ?line {ok,_} = c:c(filename:join([OutDir,'P-Record']),
+    {ok,_} = c:c(filename:join([OutDir,'P-Record']),
 		       [{i,OutDir},{outdir,OutDir}]),
-    ?line {file,_} = code:is_loaded('P-Record'),
+    {file,_} = code:is_loaded('P-Record'),
     
     code:purge('P-Record'),
     code:delete('P-Record'),
@@ -94,43 +93,41 @@ noobj(Config) ->
     file:delete(filename:join([OutDir,'p_record.beam'])),
     ok = asn1ct:compile(filename:join([DataDir,"p_record.set.asn"]),
 			[asn1config,ber,noobj,{outdir,OutDir}]),
-%%     ?line false = code:is_loaded('P-Record'),
-%%     ?line false = code:is_loaded('p_record'),
-    ?line {error,enoent} =
+    {error,enoent} =
 	file:read_file_info(filename:join([OutDir,"P-Record.beam"])),
-    ?line {error,enoent} =
+    {error,enoent} =
 	file:read_file_info(filename:join([OutDir,"P-Record.erl"])),
-    ?line {error,enoent} =
+    {error,enoent} =
 	file:read_file_info(filename:join([OutDir,"p_record.beam"])),
     io:format("read_file_info: p_record.erl~n",[]),
-    ?line {ok,_} =
+    {ok,_} =
 	file:read_file_info(filename:join([OutDir,"p_record.erl"])),
     io:format("c:c: p_record.erl~n",[]),
-    ?line {ok,_} = c:c(filename:join([OutDir,'p_record']),
+    {ok,_} = c:c(filename:join([OutDir,'p_record']),
 		       [{i,OutDir},{outdir,OutDir}]),
     io:format("code:is_loaded: p_record.erl~n",[]),
-    ?line {file,_} = code:is_loaded('p_record'),
+    {file,_} = code:is_loaded('p_record'),
     io:format("file:delete: p_record.erl~n",[]),
     file:delete(filename:join([OutDir,'p_record.erl'])),
     file:delete(filename:join([OutDir,'p_record.beam'])).
 
 verbose(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir,Config),
-    OutDir = ?config(priv_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
+    OutDir = proplists:get_value(priv_dir,Config),
     Asn1File = filename:join([DataDir,"Comment.asn"]),
 
     %% Test verbose compile
-    ?line test_server:capture_start(),
-    ?line ok = asn1ct:compile(Asn1File, [{i,DataDir},{outdir,OutDir},noobj,verbose]),
-    ?line test_server:capture_stop(),
-    ?line [Line0|_] = test_server:capture_get(),
-    ?line true = lists:prefix("Erlang ASN.1 compiler", Line0),
+    test_server:capture_start(),
+    ok = asn1ct:compile(Asn1File, [{i,DataDir},{outdir,OutDir},noobj,verbose]),
+    test_server:capture_stop(),
+    [Line0|_] = test_server:capture_get(),
+    true = lists:prefix("Erlang ASN.1 compiler", Line0),
 
     %% Test non-verbose compile
-    ?line test_server:capture_start(),
-    ?line ok = asn1ct:compile(Asn1File, [{i,DataDir},{outdir,OutDir},noobj]),
-    ?line test_server:capture_stop(),
-    ?line [] = test_server:capture_get(),
+    test_server:capture_start(),
+    ok = asn1ct:compile(Asn1File, [{i,DataDir},{outdir,OutDir},noobj]),
+    test_server:capture_stop(),
+    [] = test_server:capture_get(),
     ok.
 
 outfiles_check(OutDir) ->
@@ -141,7 +138,7 @@ outfiles_check(_OutDir,[])->
     ok;
 outfiles_check(OutDir,[H|T]) ->
     io:format("File: ~p~n",[filename:join([OutDir,H])]),
-    ?line {ok,_}=file:read_file_info(filename:join([OutDir,H])),
+    {ok,_}=file:read_file_info(filename:join([OutDir,H])),
     outfiles_check(OutDir,T).
 
 outfiles1() ->
@@ -155,8 +152,8 @@ outfiles_remove(OutDir) ->
 		  outfiles1()).
 
 record_name_prefix(Config) ->
-    DataDir = ?config(data_dir,Config),
-    OutDir = ?config(priv_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
+    OutDir = proplists:get_value(priv_dir,Config),
     ok = b_SeqIn(DataDir,OutDir),
     ok = a_SeqIn(DataDir,OutDir).
 
@@ -165,15 +162,15 @@ b_SeqIn(DataDir,OutDir) ->
 		   [{record_name_prefix,"b_"},{outdir,OutDir}]),
     io:format("FileName: ~p~nOutDir:~p~n",
 	      [filename:join([DataDir,'b_SeqIn']),OutDir]),
-    ?line {ok,_} = compile:file(filename:join([DataDir,'b_SeqIn']),
+    {ok,_} = compile:file(filename:join([DataDir,'b_SeqIn']),
 			  [{i,OutDir}]),
-    ?line 'b_SeqIn' = b_SeqIn:record_name(),
+    'b_SeqIn' = b_SeqIn:record_name(),
     ok.
 
 a_SeqIn(DataDir,OutDir) -> 
     asn1ct:compile(filename:join([DataDir,'Seq']),
 		   [{record_name_prefix,"a_"},{outdir,OutDir}]),
-    ?line {ok,_} = compile:file(filename:join([DataDir,'a_SeqIn']),
+    {ok,_} = compile:file(filename:join([DataDir,'a_SeqIn']),
 			  [{i,OutDir}]),
-    ?line 'a_SeqIn' = a_SeqIn:record_name(),
+    'a_SeqIn' = a_SeqIn:record_name(),
     ok.
diff --git a/lib/asn1/test/test_modified_x420.erl b/lib/asn1/test/test_modified_x420.erl
index f9a29d1436..a83d522764 100644
--- a/lib/asn1/test/test_modified_x420.erl
+++ b/lib/asn1/test/test_modified_x420.erl
@@ -21,10 +21,10 @@
 -module(test_modified_x420).
 -export([test/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 test(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
 
     Der = read_pem(filename:join([DataDir,modified_x420,"p7_signed_data.pem"])),
     {ok,{_,_,SignedData}} = 'PKCS7':decode( 'ContentInfo', Der),
diff --git a/lib/asn1/test/test_partial_incomplete_decode.erl b/lib/asn1/test/test_partial_incomplete_decode.erl
index d5eacc5a4d..2b1c3bd8c5 100644
--- a/lib/asn1/test/test_partial_incomplete_decode.erl
+++ b/lib/asn1/test/test_partial_incomplete_decode.erl
@@ -22,7 +22,7 @@
 
 -export([test/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 test(Config) ->
     FMsg = msg('F'),
@@ -67,7 +67,7 @@ test(Config) ->
     ok.
 
 test_megaco(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Files = filelib:wildcard(filename:join([DataDir,megacomessages,"*.val"])),
     Mod = 'MEDIA-GATEWAY-CONTROL',
     lists:foreach(fun(File) ->
@@ -81,72 +81,72 @@ test_megaco(Config) ->
 exclusive_decode(Bin,F) ->
     Mod='MEDIA-GATEWAY-CONTROL',
     io:format("Encoding message: ~p~n",[F]),
-    ?line {ok,{_,_,{_,_VsnNo,{MsgMidKey,MsgMid},{MsgMBodyKey,MsgMBody}}}}=
+    {ok,{_,_,{_,_VsnNo,{MsgMidKey,MsgMid},{MsgMBodyKey,MsgMBody}}}}=
 	Mod:decode_MegacoMessage_exclusive(Bin),
-    ?line {ok,_} = Mod:decode_part(MsgMidKey,MsgMid),
-    ?line {ok,_} = Mod:decode_part(MsgMBodyKey,MsgMBody),
+    {ok,_} = Mod:decode_part(MsgMidKey,MsgMid),
+    {ok,_} = Mod:decode_part(MsgMBodyKey,MsgMBody),
     ok.
 
 decode_parts('F',PartDecMsg) ->
-    ?line {fb,{'E',35,{NameE_b,ListBinE_b},false,{NameE_d,BinE_d}}} = PartDecMsg,
-    ?line {ok,[{'D',3,true}|_]} = 'PartialDecSeq':decode_part(NameE_b,ListBinE_b),
-    ?line {ok,{'D',3,true}} = 'PartialDecSeq':decode_part(NameE_b,
+    {fb,{'E',35,{NameE_b,ListBinE_b},false,{NameE_d,BinE_d}}} = PartDecMsg,
+    {ok,[{'D',3,true}|_]} = 'PartialDecSeq':decode_part(NameE_b,ListBinE_b),
+    {ok,{'D',3,true}} = 'PartialDecSeq':decode_part(NameE_b,
 							  hd(ListBinE_b)),
-    ?line {ok,{da,[{'A',16,{'D',17,true}}]}} = 
+    {ok,{da,[{'A',16,{'D',17,true}}]}} =
 	'PartialDecSeq':decode_part(NameE_d,BinE_d),
     ok;
 decode_parts('F2',PartDecMsg) ->
-    ?line {fb,{'E',35,{E_bkey,E_b},false,{da,{E_d_akey,E_d_a}}}} = PartDecMsg,
-    ?line {ok,[{'D',3,true},{'D',4,false},{'D',5,true},{'D',6,true},{'D',7,false},{'D',8,true},{'D',9,true},{'D',10,false},{'D',11,true},{'D',12,true},{'D',13,false},{'D',14,true}]} = 'PartialDecSeq':decode_part(E_bkey,E_b),
-    ?line {ok,[{'A',16,{'D',17,true}}]} = 'PartialDecSeq':decode_part(E_d_akey,E_d_a);
+    {fb,{'E',35,{E_bkey,E_b},false,{da,{E_d_akey,E_d_a}}}} = PartDecMsg,
+    {ok,[{'D',3,true},{'D',4,false},{'D',5,true},{'D',6,true},{'D',7,false},{'D',8,true},{'D',9,true},{'D',10,false},{'D',11,true},{'D',12,true},{'D',13,false},{'D',14,true}]} = 'PartialDecSeq':decode_part(E_bkey,E_b),
+    {ok,[{'A',16,{'D',17,true}}]} = 'PartialDecSeq':decode_part(E_d_akey,E_d_a);
 
 decode_parts('F3',PartDecMsg) ->
-    ?line {fb,{'E',10,{E_bkey,E_b},false,{dc,{'E_d_dc',13,true,{E_d_dc_dcckey,E_d_dc_dcc}}}}} = PartDecMsg,
-    ?line {ok,[{'D',11,true},{'D',12,false}]} = 'PartialDecSeq':decode_part(E_bkey,E_b),
-    ?line {ok,{'E_d_dc_dcc',14,15}} = 'PartialDecSeq':decode_part(E_d_dc_dcckey,E_d_dc_dcc);
+    {fb,{'E',10,{E_bkey,E_b},false,{dc,{'E_d_dc',13,true,{E_d_dc_dcckey,E_d_dc_dcc}}}}} = PartDecMsg,
+    {ok,[{'D',11,true},{'D',12,false}]} = 'PartialDecSeq':decode_part(E_bkey,E_b),
+    {ok,{'E_d_dc_dcc',14,15}} = 'PartialDecSeq':decode_part(E_d_dc_dcckey,E_d_dc_dcc);
 
 
 decode_parts('D',PartDecMsg) ->
-    ?line {'D',{NameD_a,BinD_a},true} = PartDecMsg,
-    ?line {ok,123} = 'PartialDecSeq':decode_part(NameD_a,BinD_a),
+    {'D',{NameD_a,BinD_a},true} = PartDecMsg,
+    {ok,123} = 'PartialDecSeq':decode_part(NameD_a,BinD_a),
     ok;
 decode_parts('A',PartDecMsg) ->
-    ?line {'A',12,{c,{'S',true,false}},{b,{NameA_c_b,BinA_c_b}}} = PartDecMsg,
-    ?line {ok,{'A_c_b',false,false}} = 
+    {'A',12,{c,{'S',true,false}},{b,{NameA_c_b,BinA_c_b}}} = PartDecMsg,
+    {ok,{'A_c_b',false,false}} =
 	'PartialDecSeq2':decode_part(NameA_c_b,BinA_c_b),
     ok;
 decode_parts('GetRequest',PartDecMsg) ->
-    ?line {'GetRequest',true,false,
+    {'GetRequest',true,false,
 	   {'AcceptTypes',[html,'plain-text',gif,jpeg],
 	    {NameAcceptTypes_others,ListBinAcceptTypes_others}},
 	   "IamfineThankYOu"} = PartDecMsg,
-    ?line {ok,["hell","othe","reho","peyo","uare","fine"]} = 
+    {ok,["hell","othe","reho","peyo","uare","fine"]} =
 	'PartialDecMyHTTP':decode_part(NameAcceptTypes_others,
 				       ListBinAcceptTypes_others),
-    ?line {ok,"hell"} = 
+    {ok,"hell"} =
 	'PartialDecMyHTTP':decode_part(NameAcceptTypes_others,
 				       hd(ListBinAcceptTypes_others)),
     ok;
 decode_parts('S1_1',PartDecMsg) ->
-    ?line {'S1',14,{'S2',false,12,{NameS2c,BinS2c}},
+    {'S1',14,{'S2',false,12,{NameS2c,BinS2c}},
 	   {_,{NameS1c_a,ListBinS1c_a}},{NameS1d,BinS1d}} = PartDecMsg,
-    ?line {ok,[{'S3',10,"PrintableString","OCTETSTRING",
+    {ok,[{'S3',10,"PrintableString","OCTETSTRING",
 		[one,two,three,four]}|_Rest1]} = 
 	'PartialDecSeq3':decode_part(NameS2c,BinS2c),
-    ?line {ok,[{'S3',10,"PrintableString","OCTETSTRING",
+    {ok,[{'S3',10,"PrintableString","OCTETSTRING",
 		[one,two,three,four]}|_Rest2]} = 
 	'PartialDecSeq3':decode_part(NameS1c_a,ListBinS1c_a),
-    ?line {ok,{'S3',10,"PrintableString","OCTETSTRING",
+    {ok,{'S3',10,"PrintableString","OCTETSTRING",
 	       [one,two,three,four]}} =
 	'PartialDecSeq3':decode_part(NameS1c_a,hd(ListBinS1c_a)),
-    ?line {ok,[{'Name',"Hans","HCA","Andersen"}|_Rest3]} =
+    {ok,[{'Name',"Hans","HCA","Andersen"}|_Rest3]} =
 	'PartialDecSeq3':decode_part(NameS1d,BinS1d),
     ok;
 decode_parts('S1_2',PartDecMsg) ->
-    ?line {'S1',14,{'S2',false,12,_S2c},S1c_b,{NameS1d,BinS1d}} = PartDecMsg,
-    ?line {b,{'C1_b',11,true,
+    {'S1',14,{'S2',false,12,_S2c},S1c_b,{NameS1d,BinS1d}} = PartDecMsg,
+    {b,{'C1_b',11,true,
 	      {'S4',{'Name',"Hans","HCA","Andersen"},"MSc"}}}=S1c_b,
-    ?line {ok,[{'Name',"Hans","HCA","Andersen"}|_Rest3]} =
+    {ok,[{'Name',"Hans","HCA","Andersen"}|_Rest3]} =
 	'PartialDecSeq3':decode_part(NameS1d,BinS1d),
     ok.
     
diff --git a/lib/asn1/test/test_selective_decode.erl b/lib/asn1/test/test_selective_decode.erl
index 079351db19..d7870057a8 100644
--- a/lib/asn1/test/test_selective_decode.erl
+++ b/lib/asn1/test/test_selective_decode.erl
@@ -21,7 +21,7 @@
 -module(test_selective_decode).
 -export([test/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 test() ->
     FMsg = msg('F'),
diff --git a/lib/asn1/test/test_special_decode_performance.erl b/lib/asn1/test/test_special_decode_performance.erl
index 7bb324c902..55e64b61e0 100644
--- a/lib/asn1/test/test_special_decode_performance.erl
+++ b/lib/asn1/test/test_special_decode_performance.erl
@@ -22,34 +22,34 @@
 
 -export([go/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 go(all) ->
     {Time_S_s,Time_S_e,Time_S_c}=go(10000,'PartialDecSeq'),
     {Time_MGC_s,Time_MGC_e,Time_MGC_c}=go(10000,'MEDIA-GATEWAY-CONTROL'),
-    ?line do_comment({Time_S_s,Time_MGC_s},
+    do_comment({Time_S_s,Time_MGC_s},
 		     {Time_S_e,Time_MGC_e},
 		     {Time_S_c,Time_MGC_c}).
 
 go(N,Mod) ->
     {Type,Val} = val(Mod),
     {ok,B} = Mod:encode(Type, Val),
-    ?line go(Mod,B,N).
+    go(Mod,B,N).
 
 go(Mod,Bin,N) ->
-    ?line FsS = get_selective_funcs(Mod),
-    ?line FsE = get_exclusive_funcs(Mod),
-    ?line io:format("~nSize of value for module ~p: ~p bytes.~n~n",[Mod,size(Bin)]),
-    ?line Time_s=go1(selective,Mod,FsS,Bin,N,0),
-    ?line Time_e=go1(exclusive,Mod,FsE,Bin,N,0),
-    ?line Time_c=go1(common,Mod,[decode],Bin,N,0),
-    ?line {Time_s/length(FsS),Time_e/length(FsE),Time_c}.
+    FsS = get_selective_funcs(Mod),
+    FsE = get_exclusive_funcs(Mod),
+    io:format("~nSize of value for module ~p: ~p bytes.~n~n",[Mod,size(Bin)]),
+    Time_s=go1(selective,Mod,FsS,Bin,N,0),
+    Time_e=go1(exclusive,Mod,FsE,Bin,N,0),
+    Time_c=go1(common,Mod,[decode],Bin,N,0),
+    {Time_s/length(FsS),Time_e/length(FsE),Time_c}.
 
 go1(_,_,[],_,_,AccTime) ->
-    ?line AccTime;
+    AccTime;
 %% go1 for common decode
 go1(common,Mod,_,Bin,N,_) ->
-    ?line TT=get_top_type(Mod),
+    TT=get_top_type(Mod),
     {Time,Result} = timer:tc(fun() -> loop1(Mod, decode, TT, Bin, N) end),
     case Result of
 	{ok,_R1} ->
diff --git a/lib/asn1/test/test_undecoded_rest.erl b/lib/asn1/test/test_undecoded_rest.erl
index 6264530fff..9711fd3e8c 100644
--- a/lib/asn1/test/test_undecoded_rest.erl
+++ b/lib/asn1/test/test_undecoded_rest.erl
@@ -22,14 +22,14 @@
 
 -export([test/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 
 %% testing OTP-5104
 
 test(Opts, Config) ->
     {ok,Msg} = asn1ct:value('P-Record', 'PersonnelRecord',
-			    [{i,?config(case_dir, Config)}]),
+			    [{i,proplists:get_value(case_dir, Config)}]),
     Bytes0 = encode(Opts, 'PersonnelRecord', Msg),
     Bytes1 = iolist_to_binary([Bytes0, <<55,55,55>>]),
     case proplists:get_bool(undec_rest, Opts) of
diff --git a/lib/asn1/test/test_x691.erl b/lib/asn1/test/test_x691.erl
index 56c1b9bf71..8ef62960ff 100644
--- a/lib/asn1/test/test_x691.erl
+++ b/lib/asn1/test/test_x691.erl
@@ -21,7 +21,7 @@
 -module(test_x691).
 -export([cases/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 cases(Erule) ->
     _ = [begin
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 87a229424c..ab2c127ca2 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 4.0.1
+ASN1_VSN = 4.0.2
diff --git a/lib/common_test/doc/src/Makefile b/lib/common_test/doc/src/Makefile
index cedddd75ac..a0c89b1222 100644
--- a/lib/common_test/doc/src/Makefile
+++ b/lib/common_test/doc/src/Makefile
@@ -36,26 +36,24 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 
-# REMEMBER: links to HTML files for these modules in ref_man.xml
-CT_MODULES = \
-	ct \
-	ct_master \
-	ct_cover \
-	ct_telnet \
-	ct_ftp \
-	ct_ssh \
-	ct_rpc \
-	ct_snmp \
-	unix_telnet \
-	ct_slave \
-	ct_property_test \
-	ct_netconfc
-
 CT_XML_FILES = $(CT_MODULES:=.xml)
 
 XML_APPLICATION_FILES = ref_man.xml
 XML_REF1_FILES = ct_run.xml
-XML_REF3_FILES = $(CT_XML_FILES) ct_hooks.xml
+# REMEMBER: links to HTML files for these modules in ref_man.xml
+XML_REF3_FILES = ct.xml \
+	ct_master.xml \
+	ct_cover.xml \
+	ct_telnet.xml \
+	ct_ftp.xml \
+	ct_ssh.xml \
+	ct_rpc.xml \
+	ct_snmp.xml \
+	unix_telnet.xml \
+	ct_slave.xml \
+	ct_property_test.xml \
+	ct_netconfc.xml \
+	ct_hooks.xml
 XML_REF6_FILES = common_test_app.xml
 
 XML_PART_FILES = part.xml 
@@ -80,8 +78,6 @@ XML_CHAPTER_FILES = \
 	notes.xml \
 	notes_history.xml 
 
-MAKE_EDOC = make_edoc
-
 BOOK_FILES = book.xml
 
 GIF_FILES = \
@@ -92,7 +88,7 @@ GIF_FILES = \
 INSTALL_NOTES = ../../notes.html
 
 XML_FILES=$(XML_APPLICATION_FILES) $(XML_REF1_FILES)  $(XML_REF3_FILES) $(XML_REF6_FILES) \
-	$(XML_PART_FILES) $(XML_CHAPTER_FILES) $(XML_REF_FILES) $(BOOK_FILES)
+	$(XML_PART_FILES) $(XML_CHAPTER_FILES) $(BOOK_FILES)
 
 # ----------------------------------------------------
 
@@ -119,19 +115,11 @@ DVIPS_FLAGS +=
 # Targets
 # ----------------------------------------------------
 
-CT_SRC_DIR = $(ERL_TOP)/../internal_tools/common_test/src
-
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
 docs: pdf html man
 
-$(CT_XML_FILES): %.xml: ../../src/%.erl
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -preprocess true -i $(XMERL_DIR)/include \
-		-i ../../../test_server/include -i  ../../include \
-		-i ../../../../erts/lib/kernel/include -i ../../../../lib/kernel/include \
-		-i ../../../../erts/lib/snmp/include -i ../../../../lib/snmp/include ../../src/$(@:%.xml=%.erl)
-
 $(TOP_PDF_FILE): $(XML_FILES)
 
 pdf: $(TOP_PDF_FILE)
@@ -146,7 +134,6 @@ man: $(MAN6_FILES) $(MAN3_FILES) $(MAN1_FILES)
 debug opt: 
 
 clean clean_docs:
-	rm -f $(CT_XML_FILES)
 	rm -rf $(HTMLDIR)/*
 	rm -f $(MAN1DIR)/*
 	rm -f $(MAN3DIR)/*
diff --git a/lib/common_test/doc/src/basics_chapter.xml b/lib/common_test/doc/src/basics_chapter.xml
index a01e3a9272..1a5a686fa0 100644
--- a/lib/common_test/doc/src/basics_chapter.xml
+++ b/lib/common_test/doc/src/basics_chapter.xml
@@ -31,74 +31,74 @@
   </header>
   <marker id="basics"></marker>
   <section>
-    <title>Introduction</title>
+    <title>General</title>
 
-    <p>The <em>Common Test</em> framework (CT) is a tool which supports
-      implementation and automated execution of test cases towards arbitrary
-      types of target systems. The CT framework is based on the OTP Test
-      Server and it's the main tool being used in all testing- and verification
-      activities that are part of Erlang/OTP system development- and maintenance.
+    <p>The <c>Common Test</c> framework is a tool that supports
+      implementation and automated execution of test cases to any
+      types of target systems. <c>Common Test</c> is the main tool being used 
+      in all testing- and verification activities that are part of Erlang/OTP 
+      system development and maintenance.
     </p>
 
-    <p>Test cases can be executed individually or in batches. Common Test
-      also features a distributed testing mode with central control and logging
-      (a feature that makes it possible to test multiple systems independently in
-      one common session, useful e.g. for running automated large-scale regression
-      tests).
+    <p>Test cases can be executed individually or in batches. <c>Common Test</c>
+      also features a distributed testing mode with central control and logging.
+      With this feature, multiple systems can be tested independently in
+      one common session. This is useful, for example, when running automated 
+      large-scale regression tests.
     </p>
 
     <p>
-      The SUT (System Under Test) may consist of one or several target
-      nodes. CT contains a generic test server which, together with
-      other test utilities, is used to perform test case execution. 
-      It is possible to start the tests from a GUI or from the OS- or
+      The System Under Test (SUT) can consist of one or more target
+      nodes. <c>Common Test</c> contains a generic test server that, 
+      together with other test utilities, is used to perform test case execution. 
+      The tests can be started from a GUI, from the OS shell, or from an
       Erlang shell. <em>Test suites</em> are files (Erlang
       modules) that contain the <em>test cases</em> (Erlang functions)
       to be executed. <em>Support modules</em> provide functions
-      that the test cases utilize in order to carry out the tests.
+      that the test cases use to do the tests.
     </p>
     
-    <p>In a black-box testing scenario, CT based test programs connect to
-      the target system(s) via standard O&amp;M and CLI protocols. CT
+    <p>In a black-box testing scenario, <c>Common Test</c>-based test programs connect to
+      the target system(s) through standard O&amp;M and CLI protocols. <c>Common Test</c>
       provides implementations of, and wrapper interfaces to, some of these
-      protocols (most of which exist as stand-alone components and
+      protocols (most of which exist as standalone components and
       applications in OTP). The wrappers simplify configuration and add
-      verbosity for logging purposes. CT will be continously extended with
-      useful support modules. (Note however that it's
-      a straightforward task to use any arbitrary Erlang/OTP component
-      for testing purposes with Common Test, without needing a CT wrapper
-      for it. It's as simple as calling Erlang functions). There
-      are a number of target independent interfaces supported in CT, such as
-      Generic Telnet, FTP, etc, which can be specialized or used
-      directly for controlling instruments, traffic load generators, etc.
+      verbosity for logging purposes. <c>Common Test</c> is continously extended with
+      useful support modules. However, notice that it is
+      a straightforward task to use any Erlang/OTP component
+      for testing purposes with <c>Common Test</c>, without needing a <c>Common Test</c> 
+      wrapper for it. It is as simple as calling Erlang functions. A number of 
+      target-independent interfaces are supported in <c>Common Test</c>, such as
+      Generic Telnet and FTP. These can be specialized or used
+      directly for controlling instruments, traffic load generators, and so on.
     </p> 
     
-    <p>Common Test is also a very useful tool for white-box testing Erlang
-      code (e.g. module testing), since the test programs can call exported Erlang
-      functions directly and there's very little overhead required for
+    <p><c>Common Test</c> is also a very useful tool for white-box testing Erlang
+      code (for example, module testing), as the test programs can call exported Erlang
+      functions directly. there is very little overhead required for
       implementing basic test suites and executing simple tests. For black-box
-      testing Erlang software, Erlang RPC as well as standard O&amp;M interfaces
-      can for example be used.
+      testing Erlang software, Erlang RPC and standard O&amp;M interfaces
+      can be used for example.
     </p>
     
-    <p>A test case can handle several connections towards one or
-      several target systems, instruments and traffic generators in
-      parallel in order to perform the necessary actions for a
-      test. The handling of many connections in parallel is one of
-      the major strengths of Common Test (thanks to the efficient
-      support for concurrency in the Erlang runtime system - which CT users
-      can take great advantage of!).
+    <p>A test case can handle several connections to one or
+      more target systems, instruments, and traffic generators in
+      parallel to perform the necessary actions for a test. 
+      The handling of many connections in parallel is one of
+      the major strengths of <c>Common Test</c>, thanks to the efficient
+      support for concurrency in the Erlang runtime system, which <c>Common Test</c> 
+      users can take great advantage of.
     </p>
   </section>
 
   <section>
     <title>Test Suite Organisation</title>
     <p>
-      The test suites are organized in test directories and each test suite
-      may have a separate data directory. Typically, these files and directories
-      are version controlled similarly to other forms of source code (possibly by
-      means of a version control system like GIT or Subversion). However, CT does 
-      not itself put any requirements on (or has any form of awareness of) 
+      Test suites are organized in test directories and each test suite
+      can have a separate data directory. Typically, these files and directories
+      are version-controlled similar to other forms of source code (possibly by
+      a version control system like GIT or Subversion). However, <c>Common Test</c> 
+      does not itself put any requirements on (or has any awareness of) 
       possible file and directory versions.
     </p>
   </section>
@@ -109,8 +109,8 @@
       Support libraries contain functions that are useful for all test suites,
       or for test suites in a specific functional area or subsystem.
       In addition to the general support libraries provided by the
-      CT framework, and the various libraries and applications provided by
-      Erlang/OTP, there might also be a need for customized (user specific) 
+      <c>Common Test</c> framework, and the various libraries and applications provided by
+      Erlang/OTP, there can also be a need for customized (user specific) 
       support libraries. 
     </p>
   </section>
@@ -121,118 +121,122 @@
       Testing is performed by running test suites (sets of test cases) or 
       individual test cases. A test suite is implemented as an Erlang module named 
       <c><![CDATA[<suite_name>_SUITE.erl]]></c> which contains a number of test cases.
-      A test case is an Erlang function which tests one or more things. 
-      The test case is the smallest unit that the CT test server deals with.
+      A test case is an Erlang function that tests one or more things. 
+      The test case is the smallest unit that the <c>Common Test</c> test server deals with.
     </p>
     <p>
-      Subsets of test cases, called test case groups, may also be defined. A test case 
+      Subsets of test cases, called test case groups, can also be defined. A test case 
       group can have execution properties associated with it. Execution properties 
-      specify whether the test cases in the group should be executed in
-      random order, in parallel, in sequence, and if the execution of the group 
-      should be repeated. Test case groups may also be nested (i.e. a group may,
-      besides test cases, contain sub-groups).
+      specify if the test cases in the group are to be executed in
+      random order, in parallel, or in sequence, and if the execution of the group 
+      is to be repeated. Test case groups can also be nested (that is, a group can,
+      besides test cases, contain subgroups).
     </p>
     <p>
-      Besides test cases and groups, the test suite may also contain configuration 
+      Besides test cases and groups, the test suite can also contain configuration 
       functions. These functions are meant to be used for setting up (and verifying)
-      environment and state on the SUT (and/or the CT host node), required for 
-      the tests to execute correctly. Examples of operations: Opening a connection
-      to the SUT, initializing a database, running an installation script, etc.
-      Configuration may be performed per suite, per test case group and per 
-      individual test case.
+      environment and state in the SUT (and/or the <c>Common Test</c> host node), 
+      required for the tests to execute correctly. Examples of operations are: 
+      Opening a connection to the SUT, initializing a database, running an installation 
+      script, and so on. Configuration can be performed per suite, per test case group,
+      and per individual test case.
     </p>
     <p>
       The test suite module must conform to a
       <seealso marker="common_test">callback interface</seealso>
-      specified by the CT test server. See the 
-      <seealso marker="write_test_chapter#intro">Writing Test Suites</seealso> chapter
-      for more information.
+      specified by the <c>Common Test</c> test server. For details, see section
+      <seealso marker="write_test_chapter#intro">Writing Test Suites</seealso>.
     </p>
 
     <p>
       A test case is considered successful if it returns to the caller, no matter 
-      what the returned value is. A few return values have special meaning however
-      (such as <c>{skip,Reason}</c> which indicates that the test case is skipped,
-      <c>{comment,Comment}</c> which prints a comment in the log for the test case and 
-      <c>{save_config,Config}</c> which makes the CT test server pass <c>Config</c> to 
-      the next test case). 
+      what the returned value is. However, a few return values have special meaning
+      as follows:</p>
+      <list type="bulleted">
+       <item><c>{skip,Reason}</c> indicates that the test case is skipped.</item>
+       <item><c>{comment,Comment}</c> prints a comment in the log for the test case.</item>
+       <item><c>{save_config,Config}</c> makes the <c>Common Test</c> test server pass 
+       <c>Config</c> to the next test case.</item>
+     </list>
+     <p>
       A test case failure is specified as a runtime error (a crash), no matter what 
       the reason for termination is. If you use Erlang pattern matching effectively,
-      you can take advantage of this property. The result will be concise and 
+      you can take advantage of this property. The result is concise and 
       readable test case functions that look much more like scripts than actual programs. 
-      Simple example:
+      A simple example:
     </p>
     <pre>
-      session(_Config) ->
-          {started,ServerId} = my_server:start(),
-          {clients,[]} = my_server:get_clients(ServerId),
-          MyId = self(),
-          connected = my_server:connect(ServerId, MyId),
-          {clients,[MyId]} = my_server:get_clients(ServerId),
-          disconnected = my_server:disconnect(ServerId, MyId),
-          {clients,[]} = my_server:get_clients(ServerId),
-          stopped = my_server:stop(ServerId).
-    </pre>
+ session(_Config) ->
+     {started,ServerId} = my_server:start(),
+     {clients,[]} = my_server:get_clients(ServerId),
+     MyId = self(),
+     connected = my_server:connect(ServerId, MyId),
+     {clients,[MyId]} = my_server:get_clients(ServerId),
+     disconnected = my_server:disconnect(ServerId, MyId),
+     {clients,[]} = my_server:get_clients(ServerId),
+     stopped = my_server:stop(ServerId).</pre>
     <p>
       As a test suite runs, all information (including output to <c>stdout</c>) is 
-      recorded in several different log files. A minimum of information is displayed 
+      recorded in many different log files. A minimum of information is displayed 
       in the user console (only start and stop information, plus a note 
       for each failed test case).
     </p>
     <p>
       The result from each test case is recorded in a dedicated HTML log file, created 
       for the particular test run. An overview page displays each test case represented 
-      by row in a table showing total execution time, whether the case was successful,
-      failed or skipped, plus an optional user comment. (For a failed test case, the 
-      reason for termination is also printed in the comment field). The overview page
+      by a table row showing total execution time, if the case was successful,
+      failed, or skipped, plus an optional user comment. For a failed test case, the 
+      reason for termination is also printed in the comment field. The overview page
       has a link to each test case log file, providing simple navigation with any standard
       HTML browser.
     </p>
     </section>
 
   <section>
+<marker id="External_Interfaces"></marker>
     <title>External Interfaces</title>
     <p>
-      The CT test server requires that the test suite defines and exports the 
+      The <c>Common Test</c> test server requires that the test suite defines and exports the 
       following mandatory or optional callback functions:
     </p>
     
     <taglist>
-      <tag>all()</tag>
-        <item>Returns a list of all test cases and groups in the suite. (Mandatory)</item>
-      <tag>suite()</tag>
-        <item>Info function used to return properties for the suite. (Optional)</item>
-      <tag>groups()</tag>
-        <item>For declaring test case groups. (Optional)</item>
-      <tag>init_per_suite(Config)</tag>
-        <item>Suite level configuration function, executed before the first 
-	test case. (Optional)</item>
-      <tag>end_per_suite(Config)</tag>
-        <item>Suite level configuration function, executed after the last 
-	test case. (Optional)</item>
-      <tag>group(GroupName)</tag>
-        <item>Info function used to return properties for a test case group. (Optional)</item>	
-      <tag>init_per_group(GroupName, Config)</tag>
-        <item>Configuration function for a group, executed before the first 
-	test case. (Optional)</item>
-      <tag>end_per_group(GroupName, Config)</tag>
-        <item>Configuration function for a group, executed after the last 
-	test case. (Optional)</item>
-      <tag>init_per_testcase(TestCase, Config)</tag>
-        <item>Configuration function for a testcase, executed before each 
-	test case. (Optional)</item>
-      <tag>end_per_testcase(TestCase, Config)</tag>
-      <item>Configuration function for a testcase, executed after each 
-      test case. (Optional)</item> 
+      <tag><c>all()</c></tag>
+        <item><p>Returns a list of all test cases and groups in the suite. (Mandatory)</p></item>
+      <tag><c>suite()</c></tag>
+        <item><p>Information function used to return properties for the suite. (Optional)</p></item>
+      <tag><c>groups()</c></tag>
+        <item><p>For declaring test case groups. (Optional)</p></item>
+      <tag><c>init_per_suite(Config)</c></tag>
+        <item><p>Suite level configuration function, executed before the first 
+	test case. (Optional)</p></item>
+      <tag><c>end_per_suite(Config)</c></tag>
+        <item><p>Suite level configuration function, executed after the last 
+	test case. (Optional)</p></item>
+      <tag><c>group(GroupName)</c></tag>
+        <item><p>Information function used to return properties for a test case group. (Optional)</p></item>	
+      <tag><c>init_per_group(GroupName, Config)</c></tag>
+        <item><p>Configuration function for a group, executed before the first 
+	test case. (Optional)</p></item>
+      <tag><c>end_per_group(GroupName, Config)</c></tag>
+        <item><p>Configuration function for a group, executed after the last 
+	test case. (Optional)</p></item>
+      <tag><c>init_per_testcase(TestCase, Config)</c></tag>
+        <item><p>Configuration function for a testcase, executed before each 
+	test case. (Optional)</p></item>
+      <tag><c>end_per_testcase(TestCase, Config)</c></tag>
+      <item><p>Configuration function for a testcase, executed after each 
+      test case. (Optional)</p></item> 
     </taglist>
       <p>
-	For each test case the CT test server expects these functions:
+	For each test case, the <c>Common Test</c> test server expects the
+	following functions:
       </p>
       <taglist>
 	<tag>Testcasename()</tag>
-	  <item>Info function that returns a list of test case properties. (Optional)</item>
+	  <item><p>Information function that returns a list of test case properties. (Optional)</p></item>
 	<tag>Testcasename(Config)</tag> 
-	  <item>The actual test case function.</item> 
+	  <item><p>The test case function.</p></item> 
       </taglist>
     </section>
 </chapter>
diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index cc554eb84e..10c93e2ed1 100644
--- a/lib/common_test/doc/src/common_test_app.xml
+++ b/lib/common_test/doc/src/common_test_app.xml
@@ -33,89 +33,84 @@
     <file>common_test_app.sgml</file>
   </header>
   <module>common_test</module> 
-  <modulesummary>A framework for automated testing of arbitrary target nodes</modulesummary>
+  <modulesummary>A framework for automated testing of any target nodes.</modulesummary>
 
   <description>
 
-    <p>The <em>Common Test</em> framework is an environment for
+    <p>The <c>Common Test</c> framework is an environment for
       implementing and performing automatic and semi-automatic execution of
-      test cases.
+      test cases.</p>
 
-      Common Test uses the OTP Test Server as engine for test case 
-      execution and logging.</p>
-
-    <p>In brief, Common Test supports:</p>
+    <p>In brief, <c>Common Test</c> supports:</p>
 
     <list>
-      <item>Automated execution of test suites (sets of test cases).</item>
-      <item>Logging of the events during execution.</item>
-      <item>HTML presentation of test suite results.</item>
-      <item>HTML presentation of test suite code.</item>
-      <item>Support functions for test suite authors.</item>
-      <item>Step by step execution of test cases.</item>
+      <item>Automated execution of test suites (sets of test cases)</item>
+      <item>Logging of events during execution</item>
+      <item>HTML presentation of test suite results</item>
+      <item>HTML presentation of test suite code</item>
+      <item>Support functions for test suite authors</item>
+      <item>Step-by-step execution of test cases</item>
     </list>
-    
-    <p>The following sections describe the mandatory and optional test suite
-      functions Common Test will call during test execution. For more details
-      see <seealso marker="write_test_chapter">Common Test User's
-      Guide.</seealso> </p>
-    
+
+    <p>The following section describes the mandatory and optional test suite
+      functions that <c>Common Test</c> calls during test execution.
+      For more details, see section
+      <seealso marker="write_test_chapter">Writing Test Suites</seealso>
+      in the User's Guide.</p>
+
   </description>
 
   <section>
-    <title>TEST CASE CALLBACK FUNCTIONS</title>
+    <title>Test Case Callback Functions</title>
     <p>The following functions define the callback interface
       for a test suite.</p>
   </section>
-  
+
   <funcs>
     <func>
       <name>Module:all() -> Tests | {skip,Reason} </name>
       <fsummary>Returns the list of all test case groups and test cases
 	in the module.</fsummary>
       <type>
-	<v>Tests = [TestCase | {group,GroupName} |
-	            {group,GroupName,Properties} |
-	            {group,GroupName,Properties,SubGroups}]</v>
+	<v>Tests = [TestCase | {group,GroupName} | {group,GroupName,Properties} | {group,GroupName,Properties,SubGroups}]</v>
 	<v>TestCase = atom()</v>
 	<v>GroupName = atom()</v>
-	<v>Properties = [parallel | sequence | Shuffle | {RepeatType,N}] |
-	                default</v>
-	<v>SubGroups = [{GroupName,Properties} |
-	                {GroupName,Properties,SubGroups}]</v>
+	<v>Properties = [parallel | sequence | Shuffle | {RepeatType,N}] | default</v>
+	<v>SubGroups = [{GroupName,Properties} | {GroupName,Properties,SubGroups}]</v>
 	<v>Shuffle = shuffle | {shuffle,Seed}</v>
 	<v>Seed = {integer(),integer(),integer()}</v>
-	<v>RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
-                        repeat_until_any_ok | repeat_until_any_fail</v>
+	<v>RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail | repeat_until_any_ok | repeat_until_any_fail</v>
 	<v>N = integer() | forever</v>
 	<v>Reason = term()</v>
       </type>
-      
+
       <desc>	
-	<p> MANDATORY </p>
-	
-	<p>This function must return the list of all test cases and test
-	  case groups in the test suite module that are to be executed.
-	  This list also specifies the order the cases and groups will
-	  be executed by Common Test. A test case is represented by an atom,
+	<p>MANDATORY</p>
+
+	<p>Returns the list of all test cases and test case groups in the
+          test suite module to be executed. This list also specifies the
+          order the cases and groups are executed by <c>Common Test</c>.
+          A test case is represented by an atom,
 	  the name of the test case function. A test case group is
 	  represented by a <c>group</c> tuple, where <c>GroupName</c>,
-	  an atom, is the name of the group (defined in <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>).
-	  Execution properties for groups may also be specified, both
-	  for a top level group and for any of its sub-groups.
-	  Group execution properties specified here, will override
-	  properties in the group definition (see <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>).
+	  an atom, is the name of the group (defined in
+	  <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>).
+	  Execution properties for groups can also be specified, both
+	  for a top-level group and for any of its subgroups.
+	  Group execution properties specified here override
+	  properties in the group definition (see
+	  <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>).
 	  (With value <c>default</c>, the group definition properties
-	  will be used).</p>
-	
-	<p> If <c>{skip,Reason}</c> is returned, all test cases
-          in the module will be skipped, and the <c>Reason</c> will
-          be printed on the HTML result page.</p>
-
-	<p>For details on groups, see 
-	  <seealso marker="write_test_chapter#test_case_groups">Test case 
-	  groups</seealso> in the User's Guide.</p>
-      
+	  are used).</p>
+
+	<p>If <c>{skip,Reason}</c> is returned, all test cases
+          in the module are skipped and <c>Reason</c>
+          is printed on the HTML result page.</p>
+
+	<p>For details on groups, see section
+	  <seealso marker="write_test_chapter#test_case_groups">Test Case
+	  Groups</seealso> in the User's Guide.</p>
+
     </desc>
     </func>
 
@@ -123,25 +118,24 @@
       <name>Module:groups() -> GroupDefs</name>
       <fsummary>Returns a list of test case group definitions.</fsummary>
       <type>
-      <v>GroupDefs = [Group]</v>
-      <v>Group = {GroupName,Properties,GroupsAndTestCases}</v>
-      <v>GroupName = atom()</v>
-      <v>Properties = [parallel | sequence | Shuffle | {RepeatType,N}]</v>
-      <v>GroupsAndTestCases = [Group | {group,GroupName} | TestCase]</v>
-      <v>TestCase = atom()</v>
-      <v>Shuffle = shuffle | {shuffle,Seed}</v>
-      <v>Seed = {integer(),integer(),integer()}</v>
-      <v>RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
-         repeat_until_any_ok | repeat_until_any_fail</v>
-      <v>N = integer() | forever</v>
+        <v>GroupDefs = [Group]</v>
+        <v>Group = {GroupName,Properties,GroupsAndTestCases}</v>
+        <v>GroupName = atom()</v>
+        <v>Properties = [parallel | sequence | Shuffle | {RepeatType,N}]</v>
+        <v>GroupsAndTestCases = [Group | {group,GroupName} | TestCase]</v>
+        <v>TestCase = atom()</v>
+        <v>Shuffle = shuffle | {shuffle,Seed}</v>
+        <v>Seed = {integer(),integer(),integer()}</v>
+        <v>RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail | repeat_until_any_ok | repeat_until_any_fail</v>
+        <v>N = integer() | forever</v>
       </type>
-      
+
       <desc>	
-	<p> OPTIONAL </p>
-	
-	<p>Function for defining test case groups. Please see
-	  <seealso marker="write_test_chapter#test_case_groups">Test case 
-	  groups</seealso> in the User's Guide for details.</p>      
+	<p>OPTIONAL</p>
+
+	<p>Defines test case groups. For details, see section
+	  <seealso marker="write_test_chapter#test_case_groups">Test Case 
+	  Groups</seealso> in the User's Guide.</p>      
       </desc>
     </func>
 
@@ -150,75 +144,71 @@
 	<fsummary>Test suite info function (providing default data
 	  for the suite).</fsummary>
 	<type>
-	<v> Info = {timetrap,Time} | {require,Required} | 
-	    {require,Name,Required} | {userdata,UserData} |
-	    {silent_connections,Conns} | {stylesheet,CSSFile} | 
-	    {ct_hooks, CTHs}</v>
-	<v> Time = TimeVal | TimeFunc</v>
-	<v> TimeVal = MilliSec | {seconds,integer()} | {minutes,integer()} |
-	    {hours,integer()}</v>
-	<v> TimeFunc = {Mod,Func,Args} | Fun</v>
-	<v> MilliSec = integer()</v>
-	<v> Mod = atom()</v>
-	<v> Func = atom()</v>
-	<v> Args = list()</v>
-	<v> Fun = fun()</v>
-	<v> Required = Key | {Key,SubKeys} | {Key,SubKey} | {Key,SubKey,SubKeys}</v>
-	<v> Key = atom()</v>
-	<v> SubKeys = SubKey | [SubKey]</v>
-	<v> SubKey = atom()</v>
-	<v> Name = atom()</v>
-	<v> UserData = term()</v>
-	<v> Conns = [atom()]</v>
-	<v> CSSFile = string()</v>
-	<v> CTHs = [CTHModule |</v>
-        <v>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{CTHModule, CTHInitArgs} |</v>
-        <v>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{CTHModule, CTHInitArgs, CTHPriority}]</v>
-	<v> CTHModule = atom()</v>
-	<v> CTHInitArgs = term()</v>
+	  <v>Info = {timetrap,Time} | {require,Required} | {require,Name,Required} | {userdata,UserData} | {silent_connections,Conns} | {stylesheet,CSSFile} | {ct_hooks, CTHs}</v>
+	  <v>Time = TimeVal | TimeFunc</v>
+	  <v>TimeVal = MilliSec | {seconds,integer()} | {minutes,integer()} | {hours,integer()}</v>
+	  <v>TimeFunc = {Mod,Func,Args} | Fun</v>
+	  <v>MilliSec = integer()</v>
+	  <v>Mod = atom()</v>
+	  <v>Func = atom()</v>
+	  <v>Args = list()</v>
+	  <v>Fun = fun()</v>
+	  <v>Required = Key | {Key,SubKeys} | {Key,SubKey} | {Key,SubKey,SubKeys}</v>
+	  <v>Key = atom()</v>
+	  <v>SubKeys = SubKey | [SubKey]</v>
+	  <v>SubKey = atom()</v>
+	  <v>Name = atom()</v>
+	  <v>UserData = term()</v>
+	  <v>Conns = [atom()]</v>
+	  <v>CSSFile = string()</v>
+	  <v>CTHs = [CTHModule |</v>
+	  <v>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{CTHModule, CTHInitArgs} |</v>
+	  <v>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{CTHModule, CTHInitArgs, CTHPriority}]</v>
+	  <v>CTHModule = atom()</v>
+	  <v>CTHInitArgs = term()</v>
 	</type>
 	<desc>	
-	  
-	  <p> OPTIONAL </p>
-	  
-	<p>This is the test suite info function. It is supposed to 
-	  return a list of tagged tuples that specify various properties
-	  related to the execution of this test suite (common for all
-	  test cases in the suite).</p>
-	  
-	<p>The <c>timetrap</c> tag sets the maximum time each
-	  test case is allowed to execute (including <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
-	  and <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso>). If the timetrap time is
-	  exceeded, the test case fails with reason
+
+        <p>OPTIONAL</p>
+
+	<p>The test suite information function.	Returns a list of tagged
+          tuples specifying various properties related to the execution of
+          this test suite (common for all test cases in the suite).</p>
+
+	<p>Tag <c>timetrap</c> sets the maximum time that each
+	  test case is allowed to execute (including
+	  <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+	  and
+	  <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso>).
+	  If the timetrap time is exceeded, the test case fails with reason
 	  <c>timetrap_timeout</c>. A <c>TimeFunc</c> function can be used to
-	  set a new timetrap by returning a <c>TimeVal</c>. It may also be
-	  used to trigger a timetrap timeout by, at some point, returning a
-	  value other than a <c>TimeVal</c>. (See the
-	  <seealso marker="write_test_chapter#timetraps">User's Guide</seealso>
-	  for details).
-	</p>
-	
-	<p>The <c>require</c> tag specifies configuration variables
-	  that are required by test cases (and/or configuration functions)
+	  set a new timetrap by returning a <c>TimeVal</c>. It can also be
+	  used to trigger a timetrap time-out by, at some point, returning a
+	  value other than a <c>TimeVal</c>. For details, see section
+	  <seealso marker="write_test_chapter#timetraps">Timetrap Time-Outs</seealso>
+	  in the User's Guide.</p>
+
+	<p>Tag <c>require</c> specifies configuration variables
+	  required by test cases (or configuration functions)
 	  in the suite. If the required configuration variables are not found
-	  in any of the configuration files, all test cases are skipped. For more
-	  information about the 'require' functionality, see the
-	  reference manual for the function
-	  <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.</p>
+	  in any of the configuration files, all test cases are skipped.
+	  For details about the <c>require</c> functionality, see funtion
+	  <seealso marker="ct#require-1"><c>ct:require/1,2</c></seealso>.</p>
 
-	<p>With <c>userdata</c>, it is possible for the user to
-	  specify arbitrary test suite related information which can be 
-	  read by calling <seealso marker="ct#userdata-2"><c>ct:userdata/2</c></seealso>.</p>
+	<p>With <c>userdata</c>, the user can
+	  specify any test suite-related information, which can be
+	  read by calling
+	  <seealso marker="ct#userdata-2"><c>ct:userdata/2</c></seealso>.</p>
 
-	  <p>The <c>ct_hooks</c> tag specifies which 
+	<p>Tag <c>ct_hooks</c> specifies the
 	  <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso>
-	  are to be run together with this suite.</p>
-	
-	<p>Other tuples than the ones defined will simply be ignored.</p>
+	  to be run with this suite.</p>
 
-	<p>For more information about the test suite info function,
-	  see <seealso marker="write_test_chapter#suite">Test
-	  suite info function</seealso> in the User's Guide.</p>
+	<p>Other tuples than the ones defined are ignored.</p>
+
+	<p>For details about the test suite information function, see section
+	  <seealso marker="write_test_chapter#suite">Test
+	  Suite Information Function</seealso> in the User's Guide.</p>
     </desc>      
     </func>
 
@@ -227,129 +217,133 @@
 	  {skip_and_save,Reason,SaveConfig}</name>
 	<fsummary>Test suite initializations.</fsummary>
 	<type>
-	  <v> Config = NewConfig = SaveConfig = [{Key,Value}]</v>
-	  <v> Key = atom()</v>
-	  <v> Value = term()</v>
-	  <v> Reason = term()</v>
+	  <v>Config = NewConfig = SaveConfig = [{Key,Value}]</v>
+	  <v>Key = atom()</v>
+	  <v>Value = term()</v>
+	  <v>Reason = term()</v>
 	</type>
 	<desc>	
-	  
-	  <p> OPTIONAL </p>
-	  
+
+	  <p>OPTIONAL</p>
+
 	  <p>This configuration function is called as the first function in the
-	  suite. It typically contains initializations which are common for
-	  all test cases in the suite, and which shall only be done
-	  once. The <c>Config</c> parameter is the configuration data
-	  which can be modified here. Whatever is returned from this
-	  function is given as <c>Config</c> to all configuration functions
-	  and test cases in the suite. If <c>{skip,Reason}</c> 
-	  is returned, all test cases in the suite will be skipped
-	  and <c>Reason</c> printed in the overview log for the suite.</p>
-	  <p>For information on <c>save_config</c> and <c>skip_and_save</c>, 
-	  please see 
-	  <seealso marker="dependencies_chapter#save_config">Dependencies 
-	  between Test Cases and Suites</seealso> in the User's Guide.</p>
-    </desc>      
+	  suite. It typically contains initializations that are common for
+	  all test cases in the suite, and that must only be done
+	  once. Parameter <c>Config</c> is the configuration data
+	  that can be modified. Whatever is returned from this
+	  function is specified as <c>Config</c> to all configuration functions
+	  and test cases in the suite.</p>
+
+	  <p>If <c>{skip,Reason}</c>
+	  is returned, all test cases in the suite are skipped
+	  and <c>Reason</c> is printed in the overview log for the suite.</p>
+
+	  <p>For information on <c>save_config</c> and <c>skip_and_save</c>,
+	  see section
+	  <seealso marker="dependencies_chapter#save_config">Saving
+	  Configuration Data</seealso> in the User's Guide.</p>
+    </desc>
     </func>
-      
+
     <func>
       <name>Module:end_per_suite(Config) -> term() | 
 	{save_config,SaveConfig}</name>
-      <fsummary>Test suite finalization. </fsummary>
+      <fsummary>Test suite finalization.</fsummary>
       <type>
-	<v> Config = SaveConfig = [{Key,Value}]</v>
-	<v> Key = atom()</v>
-	<v> Value = term()</v>
+	<v>Config = SaveConfig = [{Key,Value}]</v>
+	<v>Key = atom()</v>
+	<v>Value = term()</v>
       </type>
-      
+
       <desc>	
-	<p> OPTIONAL </p>
+	<p>OPTIONAL</p>
 	
 	<p>This function is called as the last test case in the
 	  suite. It is meant to be used for cleaning up after
-	  <seealso marker="#Module:init_per_suite-1"><c>init_per_suite/1</c></seealso>.
-	  For information on <c>save_config</c>, please see 
-	  <seealso marker="dependencies_chapter#save_config">Dependencies
-	    between Test Cases and Suites</seealso> in the User's Guide.</p>
+	  <seealso marker="#Module:init_per_suite-1"><c>init_per_suite/1</c></seealso>.</p>
+	<p>For information on <c>save_config</c>, see section
+	  <seealso marker="dependencies_chapter#save_config">Saving
+	  Configuration Data</seealso> in the User's Guide.</p>
       </desc>
     </func>
 
     <func>
       <name>Module:group(GroupName) -> [Info] </name>
-      <fsummary>Test case group info function (providing default data
-	for a test case group, i.e. its test cases and sub-groups).</fsummary>
+      <fsummary>Test case group information function (providing default data
+        for a test case group, that is, its test cases and
+        subgroups).</fsummary>
       <type>
-	<v> Info = {timetrap,Time} | {require,Required} | 
-	  {require,Name,Required} | {userdata,UserData} |
-	  {silent_connections,Conns} | {stylesheet,CSSFile} | 
-	  {ct_hooks, CTHs}</v>
-	<v> Time = TimeVal | TimeFunc</v>
-	<v> TimeVal = MilliSec | {seconds,integer()} | {minutes,integer()} |
-	  {hours,integer()}</v>
-	<v> TimeFunc = {Mod,Func,Args} | Fun</v>
-	<v> MilliSec = integer()</v>
-	<v> Mod = atom()</v>
-	<v> Func = atom()</v>
-	<v> Args = list()</v>
-	<v> Fun = fun()</v>
-	<v> Required = Key | {Key,SubKeys} | {Key,Subkey} | {Key,Subkey,SubKeys}</v>
-	<v> Key = atom()</v>
-	<v> SubKeys = SubKey | [SubKey]</v>
-	<v> SubKey = atom()</v>
-	<v> Name = atom()</v>
-	<v> UserData = term()</v>
-	<v> Conns = [atom()]</v>
-	<v> CSSFile = string()</v>
-	<v> CTHs = [CTHModule |</v>
-        <v> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{CTHModule, CTHInitArgs} |</v>
-	<v> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{CTHModule, CTHInitArgs, CTHPriority}]</v>
-	<v> CTHModule = atom()</v>
-	<v> CTHInitArgs = term()</v>
-	</type>
-	<desc>	
-	  
-	  <p> OPTIONAL </p>
-	  
-	<p>This is the test case group info function. It is supposed to 
+	<v>Info = {timetrap,Time} | {require,Required} | {require,Name,Required} | {userdata,UserData} | {silent_connections,Conns} | {stylesheet,CSSFile} | {ct_hooks, CTHs}</v>
+	<v>Time = TimeVal | TimeFunc</v>
+	<v>TimeVal = MilliSec | {seconds,integer()} | {minutes,integer()} | {hours,integer()}</v>
+	<v>TimeFunc = {Mod,Func,Args} | Fun</v>
+	<v>MilliSec = integer()</v>
+	<v>Mod = atom()</v>
+	<v>Func = atom()</v>
+	<v>Args = list()</v>
+	<v>Fun = fun()</v>
+	<v>Required = Key | {Key,SubKeys} | {Key,Subkey} | {Key,Subkey,SubKeys}</v>
+	<v>Key = atom()</v>
+	<v>SubKeys = SubKey | [SubKey]</v>
+	<v>SubKey = atom()</v>
+	<v>Name = atom()</v>
+	<v>UserData = term()</v>
+	<v>Conns = [atom()]</v>
+	<v>CSSFile = string()</v>
+	<v>CTHs = [CTHModule |</v>
+	<v>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{CTHModule, CTHInitArgs} |</v>
+	<v>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{CTHModule, CTHInitArgs, CTHPriority}]</v>
+	<v>CTHModule = atom()</v>
+	<v>CTHInitArgs = term()</v>
+      </type>
+      <desc>	
+
+	<p>OPTIONAL</p>
+
+	<p>The test case group information function. It is supposed to
 	  return a list of tagged tuples that specify various properties
-	  related to the execution of a test case group (i.e. its test cases
-	  and sub-groups). Properties set by
+	  related to the execution of a test case group (that is, its test
+	  cases and subgroups). Properties set by
 	  <seealso marker="#Module:group-1"><c>group/1</c></seealso> override
-	  properties with the same key that have been previously set by
+	  properties with the same key that have been set previously by
 	  <seealso marker="#Module:suite-0"><c>suite/0</c></seealso>.</p>
 	  
-	<p>The <c>timetrap</c> tag sets the maximum time each
-	  test case is allowed to execute (including <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
-	  and <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso>). If the timetrap time is
+	<p>Tag <c>timetrap</c> sets the maximum time that each
+	  test case is allowed to execute (including
+	  <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+	  and
+	  <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso>).
+	  If the timetrap time is
 	  exceeded, the test case fails with reason
 	  <c>timetrap_timeout</c>. A <c>TimeFunc</c> function can be used to
-	  set a new timetrap by returning a <c>TimeVal</c>. It may also be
-	  used to trigger a timetrap timeout by, at some point, returning a
-	  value other than a <c>TimeVal</c>. (See the
-	  <seealso marker="write_test_chapter#timetraps">User's Guide</seealso>
-	  for details).</p>
+	  set a new timetrap by returning a <c>TimeVal</c>. It can also be
+	  used to trigger a timetrap time-out by, at some point, returning a
+	  value other than a <c>TimeVal</c>. For details, see section
+	  <seealso marker="write_test_chapter#timetraps">Timetrap
+	  Time-Outs</seealso> in the User's Guide.</p>
 	
-	<p>The <c>require</c> tag specifies configuration variables
-	  that are required by test cases (and/or configuration functions)
+	<p>Tag <c>require</c> specifies configuration variables
+	  required by test cases (or configuration functions)
 	  in the suite. If the required configuration variables are not found
-	  in any of the configuration files, all test cases in this group are skipped.
-	  For more information about the 'require' functionality, see the
-	  reference manual for the function
-	  <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.</p>
+	  in any of the configuration files, all test cases in this group are
+	  skipped. For details about the <c>require</c> functionality, see
+	  function
+	  <seealso marker="ct#require-1"><c>ct:require/1,2</c></seealso>.</p>
 
-	<p>With <c>userdata</c>, it is possible for the user to
-	  specify arbitrary test case group related information which can be 
-	  read by calling <seealso marker="ct#userdata-2"><c>ct:userdata/2</c></seealso>.</p>
+	<p>With <c>userdata</c>, the user can
+	  specify any test case group related information that can be 
+	  read by calling
+	  <seealso marker="ct#userdata-2"><c>ct:userdata/2</c></seealso>.</p>
 
-	  <p>The <c>ct_hooks</c> tag specifies which 
+	<p>Tag <c>ct_hooks</c> specifies the
 	  <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso>
-	  are to be run together with this suite.</p>
-	
-	<p>Other tuples than the ones defined will simply be ignored.</p>
+	  to be run with this suite.</p>
 
-	<p>For more information about the test case group info function,
-	  see <seealso marker="write_test_chapter#suite">Test
-	  case group info function</seealso> in the User's Guide.</p>
+	<p>Other tuples than the ones defined are ignored.</p>
+
+	<p>For details about the test case group information function,
+	  see section <seealso marker="write_test_chapter#group_info">Group
+	  Information Function</seealso> in the User's Guide.</p>
     </desc>      
     </func>
 
@@ -358,59 +352,66 @@
 	  {skip,Reason}</name>
 	<fsummary>Test case group initializations.</fsummary>
 	<type>
-	  <v> GroupName = atom()</v>
-	  <v> Config = NewConfig = [{Key,Value}]</v>
-	  <v> Key = atom()</v>
-	  <v> Value = term()</v>
-	  <v> Reason = term()</v>
+	  <v>GroupName = atom()</v>
+	  <v>Config = NewConfig = [{Key,Value}]</v>
+	  <v>Key = atom()</v>
+	  <v>Value = term()</v>
+	  <v>Reason = term()</v>
 	</type>
 	<desc>	
-	  
-	  <p> OPTIONAL </p>
-	  
+
+	  <p>OPTIONAL</p>
+
 	  <p>This configuration function is called before execution of a
-	    test case group. It typically contains initializations which are 
-	    common for all test cases and sub-groups in the group, and which
-	    shall only be performed once. <c>GroupName</c> is the name of the
-	    group, as specified in the group definition (see <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>). The
-	    <c>Config</c> parameter is the configuration data which can be modified
-	    here. The return value of this function is given as <c>Config</c> 
-	    to all test cases and sub-groups in the group. If <c>{skip,Reason}</c>
-	    is returned, all test cases in the group will be skipped and
-	    <c>Reason</c> printed in the overview log for the group.</p>
-
-	  <p>For information about test case groups, please see 
-	    <seealso marker="write_test_chapter#test_case_groups">Test case 
-	    groups</seealso> chapter in the User's Guide.</p> 
+	    test case group. It typically contains initializations that are 
+	    common for all test cases and subgroups in the group, and that
+	    must only be performed once. <c>GroupName</c> is the name of the
+	    group, as specified in the group definition (see
+	    <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>).
+	    Parameter <c>Config</c> is the configuration data that can be
+	    modified.
+	    The return value of this function is given as <c>Config</c>
+	    to all test cases and subgroups in the group.</p>
+
+	  <p>If <c>{skip,Reason}</c>
+	    is returned, all test cases in the group are skipped and
+	    <c>Reason</c> is printed in the overview log for the group.</p>
+
+	  <p>For information about test case groups, see section 
+	    <seealso marker="write_test_chapter#test_case_groups">Test Case 
+	    Groups</seealso> in the User's Guide.</p> 
     </desc>      
     </func>
-      
+
       <func>
 	<name>Module:end_per_group(GroupName, Config) -> term() |
 	  {return_group_result,Status}</name>
 	<fsummary>Test case group finalization.</fsummary>
 	<type>
-	  <v> GroupName = atom()</v>
-	  <v> Config = [{Key,Value}]</v>
-	  <v> Key = atom()</v>
-	  <v> Value = term()</v>
-	  <v> Status = ok | skipped | failed</v>
+	  <v>GroupName = atom()</v>
+	  <v>Config = [{Key,Value}]</v>
+	  <v>Key = atom()</v>
+	  <v>Value = term()</v>
+	  <v>Status = ok | skipped | failed</v>
 	</type>
-	
+
 	<desc>	
-	  <p> OPTIONAL </p>
-	  
-	  <p>This function is called after the execution of a test case group is finished.
-	    It is meant to be used for cleaning up after <seealso marker="#Module:init_per_group-2"><c>init_per_group/2</c></seealso>.
-	    By means of <c>{return_group_result,Status}</c>, it is possible to return a 
-	    status value for a nested sub-group. The status can be retrieved in
-	    <seealso marker="#Module:end_per_group-2"><c>end_per_group/2</c></seealso> for the group on the level above. The status will also
-	    be used by Common Test for deciding if execution of a group should proceed in
-	    case the property <c>sequence</c> or <c>repeat_until_*</c> is set.</p>
-
-	  <p>For more information about test case groups, please see 
-	    <seealso marker="write_test_chapter#test_case_groups">Test case 
-	    groups</seealso> chapter in the User's Guide.</p> 
+	  <p>OPTIONAL</p>
+
+	  <p>This function is called after the execution of a test case group
+	    is finished. It is meant to be used for cleaning up after
+	    <seealso marker="#Module:init_per_group-2"><c>init_per_group/2</c></seealso>.
+	    A status value for a nested subgroup can be returned with
+	    <c>{return_group_result,Status}</c>. The status can be retrieved in
+	    <seealso marker="#Module:end_per_group-2"><c>end_per_group/2</c></seealso>
+	    for the group on the level above. The status is also used by
+	    <c>Common Test</c> for deciding if execution of a group is to
+	    proceed if property <c>sequence</c> or <c>repeat_until_*</c>
+	    is set.</p>
+
+	  <p>For details about test case groups, see section 
+	    <seealso marker="write_test_chapter#test_case_groups">Test Case
+	    Groups</seealso> in the User's Guide.</p> 
        </desc>
     </func>
 
@@ -424,168 +425,173 @@
 	  <v> Value = term()</v>
 	  <v> Reason = term()</v>
 	</type>
-	<desc>	
-	  
+	<desc>
+
 	  <p>OPTIONAL</p>
-	  
-	  <p>This function is called before each test case. The
-	  <c>TestCase</c> argument is the name of the test case, and
+
+	  <p>This function is called before each test case. Argument
+	  <c>TestCase</c> is the test case name, and
 	  <c>Config</c> (list of key-value tuples) is the configuration
-	  data that can be modified here. The <c>NewConfig</c> list returned
+	  data that can be modified. The <c>NewConfig</c> list returned
 	  from this function is given as <c>Config</c> to the test case.
 	  If <c>{fail,Reason}</c> is returned, the test case is
-	  marked as failed without being executed. If <c>{skip,Reason}</c> is
-	  returned, the test case will be skipped and <c>Reason</c> printed
-	  in the overview log for the suite.</p>
+	  marked as failed without being executed.</p>
+
+	  <p>If <c>{skip,Reason}</c> is returned, the test case is skipped
+	    and <c>Reason</c> is printed in the overview log for the suite.</p>
     </desc>
     </func>
-      
+
       <func>
 	<name>Module:end_per_testcase(TestCase, Config) -> term() | {fail,Reason} | {save_config,SaveConfig}</name>
 	<fsummary>Test case finalization.</fsummary>
 	<type>
-	  <v> TestCase = atom()</v>
-	  <v> Config = SaveConfig = [{Key,Value}]</v>
-	  <v> Key = atom()</v>
-	  <v> Value = term()</v>
-	  <v> Reason = term()</v>
+	  <v>TestCase = atom()</v>
+	  <v>Config = SaveConfig = [{Key,Value}]</v>
+	  <v>Key = atom()</v>
+	  <v>Value = term()</v>
+	  <v>Reason = term()</v>
 	</type>
 	<desc>	
-	  
-	  <p> OPTIONAL </p>
-	  
-	  <p> This function is called after each test case, and can be used
-	    to clean up after <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso> and the test case.
-	    Any return value (besides <c>{fail,Reason}</c> and <c>{save_config,SaveConfig}</c>) 
-	    is ignored. By returning <c>{fail,Reason}</c>, <c>TestCase</c> will be marked as
-	    failed (even though it was actually successful in the sense that it returned
-	    a value instead of terminating). For information on <c>save_config</c>, please see 
-	    <seealso marker="dependencies_chapter#save_config">Dependencies between 
-	    Test Cases and Suites</seealso> in the User's Guide</p>
+
+	  <p>OPTIONAL</p>
+
+	  <p>This function is called after each test case, and can be used
+	    to clean up after
+	    <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+	    and the test case. Any return value (besides <c>{fail,Reason}</c>
+	    and <c>{save_config,SaveConfig}</c>) is ignored. By returning
+	    <c>{fail,Reason}</c>, <c>TestCase</c> is marked as faulty (even
+	    though it was successful in the sense that it returned
+	    a value instead of terminating).</p>
+
+	<p>For information on <c>save_config</c>, see section
+	  <seealso marker="dependencies_chapter#save_config">Saving
+	  Configuration Data</seealso> in the User's Guide.</p>
 	</desc>
       </func>
-      
+
     <func>
       <name>Module:Testcase() -> [Info] </name>
-      <fsummary>Test case info function. </fsummary>
+      <fsummary>Test case information function.</fsummary>
       <type>
-	<v> Info = {timetrap,Time} | {require,Required} | 
-	    {require,Name,Required} | {userdata,UserData} |
-	    {silent_connections,Conns}</v>
-	<v> Time = TimeVal | TimeFunc</v>
-	<v> TimeVal = MilliSec | {seconds,integer()} | {minutes,integer()} |
-	    {hours,integer()}</v>
-	<v> TimeFunc = {Mod,Func,Args} | Fun</v>
-	<v> MilliSec = integer()</v>
-	<v> Mod = atom()</v>
-	<v> Func = atom()</v>
-	<v> Args = list()</v>
-	<v> Fun = fun()</v>
-	<v> Required = Key | {Key,SubKeys} | {Key,Subkey} | {Key,Subkey,SubKeys}</v>
-	<v> Key = atom()</v>
-	<v> SubKeys = SubKey | [SubKey]</v>
-	<v> SubKey = atom()</v>
-	<v> Name = atom()</v>
-	<v> UserData = term()</v>
-	<v> Conns = [atom()]</v>
+	<v>Info = {timetrap,Time} | {require,Required} | {require,Name,Required} | {userdata,UserData} | {silent_connections,Conns}</v>
+	<v>Time = TimeVal | TimeFunc</v>
+	<v>TimeVal = MilliSec | {seconds,integer()} | {minutes,integer()} | {hours,integer()}</v>
+	<v>TimeFunc = {Mod,Func,Args} | Fun</v>
+	<v>MilliSec = integer()</v>
+	<v>Mod = atom()</v>
+	<v>Func = atom()</v>
+	<v>Args = list()</v>
+	<v>Fun = fun()</v>
+	<v>Required = Key | {Key,SubKeys} | {Key,Subkey} | {Key,Subkey,SubKeys}</v>
+	<v>Key = atom()</v>
+	<v>SubKeys = SubKey | [SubKey]</v>
+	<v>SubKey = atom()</v>
+	<v>Name = atom()</v>
+	<v>UserData = term()</v>
+	<v>Conns = [atom()]</v>
       </type>
-      
-      <desc>	
+
+      <desc>
 	
 	<p>OPTIONAL</p>
-	  
-	<p>This is the test case info function. It is supposed to 
+
+	<p>The test case information function. It is supposed to
 	  return a list of tagged tuples that specify various properties
 	  related to the execution of this particular test case.
-	  Properties set by <seealso marker="#Module:Testcase-0"><c>Testcase/0</c></seealso> override
-	  properties that have been previously set for the test case
-	  by <seealso marker="#Module:group-1"><c>group/1</c></seealso> or <seealso marker="#Module:suite-0"><c>suite/0</c></seealso>.</p>
-	  
-	<p>The <c>timetrap</c> tag sets the maximum time the
+	  Properties set by
+	  <seealso marker="#Module:Testcase-0"><c>Testcase/0</c></seealso>
+	  override properties set previously for the test case by
+	  <seealso marker="#Module:group-1"><c>group/1</c></seealso> or
+	  <seealso marker="#Module:suite-0"><c>suite/0</c></seealso>.</p>
+
+	<p>Tag <c>timetrap</c> sets the maximum time that the
 	  test case is allowed to execute. If the timetrap time is
-	  exceeded, the test case fails with reason
-	  <c>timetrap_timeout</c>. <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
-	  and <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso> are included in the
-	  timetrap time. A <c>TimeFunc</c> function can be used to
-	  set a new timetrap by returning a <c>TimeVal</c>. It may also be
-	  used to trigger a timetrap timeout by, at some point, returning a
-	  value other than a <c>TimeVal</c>. (See the
-	  <seealso marker="write_test_chapter#timetraps">User's Guide</seealso>
-	  for details).</p>
+	  exceeded, the test case fails with reason <c>timetrap_timeout</c>.
+	  <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+	  and
+	  <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso>
+	  are included in the timetrap time.
+	  A <c>TimeFunc</c> function can be used to
+	  set a new timetrap by returning a <c>TimeVal</c>. It can also be
+	  used to trigger a timetrap time-out by, at some point, returning a
+	  value other than a <c>TimeVal</c>. For details, see section
+	  <seealso marker="write_test_chapter#timetraps">Timetrap
+	  Time-Outs</seealso> in the User's Guide.</p>
 	
-	<p>The <c>require</c> tag specifies configuration variables
-	  that are required by the test case (and/or <c>init/end_per_testcase/2</c>).
+	<p>Tag <c>require</c> specifies configuration variables
+	  that are required by the test case (or <c>init_per_testcase/2</c>
+	  or <c>end_per_testcase/2</c>).
 	  If the required configuration variables are not found in any of the
-	  configuration files, the test case is skipped. For more
-	  information about the 'require' functionality, see the
-	  reference manual for the function
-	  <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.</p>
-
-	<p>If <c>timetrap</c> and/or <c>require</c> is not set, the
-	  default values specified by <seealso marker="#Module:suite-0"><c>suite/0</c></seealso> (or
-	  <seealso marker="#Module:group-1"><c>group/1</c></seealso>) will be used.</p>
-
-	<p>With <c>userdata</c>, it is possible for the user to
-	  specify arbitrary test case related information which can be 
-	  read by calling <seealso marker="ct#userdata-3"><c>ct:userdata/3</c></seealso>.</p>
-	
-	<p>Other tuples than the ones defined will simply be ignored.</p>
+	  configuration files, the test case is skipped. For details about
+	  the <c>require</c> functionality, see function
+	  <seealso marker="ct#require-1"><c>ct:require/1,2</c></seealso>.</p>
+
+	<p>If <c>timetrap</c> or <c>require</c> is not set, the
+	  default values specified by
+	  <seealso marker="#Module:suite-0"><c>suite/0</c></seealso> (or
+	  <seealso marker="#Module:group-1"><c>group/1</c></seealso>) are used.</p>
+
+	<p>With <c>userdata</c>, the user can specify any test case-related
+	  information that can be read by calling
+	  <seealso marker="ct#userdata-3"><c>ct:userdata/3</c></seealso>.</p>
+
+	<p>Other tuples than the ones defined are ignored.</p>
 
-	<p>For more information about the test case info function,
-	  see <seealso marker="write_test_chapter#info_function">Test
-	  case info function</seealso> in the User's Guide.</p>
+	<p>For details about the test case information function, see section
+	  <seealso marker="write_test_chapter#info_function">Test
+	  Case Information Function</seealso> in the User's Guide.</p>
       </desc>
     </func>
-      
-    
+
     <func>
 	<name>Module:Testcase(Config) ->  term() | {skip,Reason} | {comment,Comment} | {save_config,SaveConfig} | {skip_and_save,Reason,SaveConfig} | exit() </name>
-      <fsummary>A test case</fsummary>
+      <fsummary>A test case.</fsummary>
       <type>
-	<v> Config = SaveConfig = [{Key,Value}]</v>
-	<v> Key = atom()</v>
-	<v> Value = term()</v>
-	<v> Reason = term()</v>
-	<v> Comment = string()</v>
+	<v>Config = SaveConfig = [{Key,Value}]</v>
+	<v>Key = atom()</v>
+	<v>Value = term()</v>
+	<v>Reason = term()</v>
+	<v>Comment = string()</v>
       </type>
-      
+
       <desc>	  
-	<p> MANDATORY </p>
-	
-	<p>This is the implementation of a test case. Here you must
-	  call the functions you want to test, and do whatever you
-	  need to check the result. If something fails, make sure the
-	  function causes a runtime error, or call <seealso marker="ct#fail-1"><c>ct:fail/1/2</c></seealso>
+	<p>MANDATORY</p>
+
+	<p>The implementation of a test case. Call the functions to test and
+	  check the result. If something fails, ensure the
+	  function causes a runtime error or call
+	  <seealso marker="ct#fail-1"><c>ct:fail/1,2</c></seealso>
 	  (which also causes the test case process to terminate).</p>
-	
-	<p>Elements from the <c>Config</c> list can e.g. be read
-	  with <c>proplists:get_value/2</c> (or the macro <c>?config</c>
-	  defined in <c>ct.hrl</c>).</p>
 
-	<p>You can return <c>{skip,Reason}</c> if you decide not to
-	  run the test case after all. <c>Reason</c> will then be
-	  printed in 'Comment' field on the HTML result page.</p>
-	
-	<p>You can return <c>{comment,Comment}</c> if you wish to
-	  print some information in the 'Comment' field on the HTML
-	  result page.</p>
-	
-	<p>If the function returns anything else, the test case is 
-	  considered successful. (The return value always gets printed 
-	  in the test case log file).</p>
+	<p>Elements from the <c>Config</c> list can, for example, be read
+	  with <c>proplists:get_value/2</c> in <c>STDLIB</c>
+	  (or the macro <c>?config</c> defined in <c>ct.hrl</c>).</p>
+
+	<p>If you decide not to run the test case after all, return
+	  <c>{skip,Reason}</c>. <c>Reason</c> is then
+	  printed in field <c>Comment</c> on the HTML result page.</p>
+
+	<p>To print some information in field <c>Comment</c> on the HTML
+	  result page, return <c>{comment,Comment}</c>.</p>
 
-	<p>For more information about test case implementation, please
-	  see <seealso marker="write_test_chapter#test_cases">Test
-	  cases</seealso> in the User's Guide.</p>
+	<p>If the function returns anything else, the test case is
+	  considered successful. The return value always gets printed
+	  in the test case log file.</p>
 
-	<p>For information on <c>save_config</c> and <c>skip_and_save</c>, please see 
-	  <seealso marker="dependencies_chapter#save_config">Dependencies between 
-	  Test Cases and Suites</seealso> in the User's Guide.</p>
+	<p>For details about test case implementation, see section
+	  <seealso marker="write_test_chapter#test_cases">Test Cases</seealso>
+	  in the User's Guide.</p>
+
+	<p>For information on <c>save_config</c> and <c>skip_and_save</c>,
+	  see section
+	  <seealso marker="dependencies_chapter#save_config">Saving
+	  Configuration Data</seealso> in the User's Guide.</p>
       </desc>
     </func>
-     
+
   </funcs>
 
 </erlref>
 
-
diff --git a/lib/common_test/doc/src/config_file_chapter.xml b/lib/common_test/doc/src/config_file_chapter.xml
index c7fd6e0b28..62ebfccb98 100644
--- a/lib/common_test/doc/src/config_file_chapter.xml
+++ b/lib/common_test/doc/src/config_file_chapter.xml
@@ -35,18 +35,18 @@
   <section>
     <title>General</title>
 
-    <p>To avoid hard coding data values related to the test and/or SUT (System
-    Under Test) in the test suites, the data may instead be specified by means
-    of configuration files or strings that Common Test reads before
+    <p>To avoid hard-coding data values related to the test and/or System
+    Under Test (SUT) in the test suites, the data can instead be specified through
+    configuration files or strings that <c>Common Test</c> reads before
     the start of a test run. External configuration data makes it possible to
-    change test properties without having to modify the actual test suites
-    using the data. Examples of configuration data:</p>
+    change test properties without modifying the test suites
+    using the data. Examples of configuration data follows:</p>
 
-    <list>
+    <list type="bulleted">
       <item>Addresses to the test plant or other instruments</item>
       <item>User login information</item>
       <item>Names of files needed by the test</item>
-      <item>Names of programs that should be executed during the test</item>
+      <item>Names of programs to be executed during the test</item>
       <item>Any other variable needed by the test</item>
     </list>
 
@@ -57,154 +57,150 @@
 
     <p>A configuration file can contain any number of elements of the type:</p>
     <pre>
-      {CfgVarName,Value}.</pre>
+ {CfgVarName,Value}.</pre>
 
     <p>where</p>
     <pre>
-      CfgVarName = atom()
-      Value = term() | [{CfgVarName,Value}]</pre>
+ CfgVarName = atom()
+ Value = term() | [{CfgVarName,Value}]</pre>
 
   </section>
 
   <section>
-    <title>Requiring and reading configuration data</title>
+    <title>Requiring and Reading Configuration Data</title>
     <marker id="require_config_data"></marker>
 
     <p>In a test suite, one must <em>require</em> that a configuration 
-    variable (<c>CfgVarName</c> in the definition above) exists before
-    attempting to read the associated value in a test case or config function.</p>
-
-    <p><c>require</c> is an assert statement that can be part of the <seealso
-    marker="write_test_chapter#suite">test suite info function</seealso> or
-    <seealso marker="write_test_chapter#info_function">test case info
-    function</seealso>. If the required variable is not available, the
-    test is skipped (unless a default value has been specified, see the
-    <seealso marker="write_test_chapter#info_function">test case info
-    function</seealso> chapter for details). There is also a function
-    <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso> which can be called from a test case
-    in order to check if a specific variable is available. The return 
+    variable (<c>CfgVarName</c> in the previous definition) exists before
+    attempting to read the associated value in a test case or configuration function.</p>
+
+    <p><c>require</c> is an assert statement, which can be part of the <seealso
+    marker="write_test_chapter#suite">Test Suite Information Function</seealso> or
+    <seealso marker="write_test_chapter#info_function">Test Case Information
+    Function</seealso>. If the required variable is unavailable, the
+    test is skipped (unless a default value has been specified, see section
+    <seealso marker="write_test_chapter#info_function">Test Case Information
+    Function</seealso> for details). Also, function
+    <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso> can be called 
+    from a test case to check if a specific variable is available. The return 
     value from this function must be checked explicitly and appropriate 
-    action be taken depending on the result (e.g. to skip the test case
-    if the variable in question doesn't exist).</p>
+    action be taken depending on the result (for example, to skip the test case
+    if the variable in question does not exist).</p>
 
-    <p>A <c>require</c> statement in the test suite info- or test case 
-    info-list should look like this:
+    <p>A <c>require</c> statement in the test suite information case or test case 
+    information-list is to look like
     <c>{require,CfgVarName}</c> or <c>{require,AliasName,CfgVarName}</c>.
     The arguments <c>AliasName</c> and <c>CfgVarName</c> are the same as the
-    arguments to <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso> which are described in the
-    reference manual for <seealso marker="ct">ct</seealso>.
+    arguments to <seealso marker="ct#require-1"><c>ct:require/1,2</c></seealso>. 
     <c>AliasName</c> becomes an alias for the configuration variable,
     and can be used as reference to the configuration data value.
-    The configuration variable may be associated with an
-    arbitrary number of alias names, but each name must be unique within
-    the same test suite. There are two main uses for alias names:</p>
-    <list>
-      <item>They may be introduced to identify connections (see below).</item>
-      <item>They may used to help adapt configuration data to a test suite 
+    The configuration variable can be associated with any
+    number of alias names, but each name must be unique within
+    the same test suite. The two main uses for alias names follows:</p>
+    <list type="bulleted">
+      <item>To identify connections (described later).</item>
+      <item>To help adapt configuration data to a test suite 
         (or test case) and improve readability.</item>
     </list>
-    <p>To read the value of a config variable, use the function
-    <seealso marker="ct#get_config-1"><c>get_config/1/2/3</c></seealso>
-    which is also described in the reference
-    manual for <seealso marker="ct">ct</seealso>.</p>
-    <p>Example:</p>
+    <p>To read the value of a configuration variable, use function
+    <seealso marker="ct#get_config-1"><c>get_config/1,2,3</c></seealso>.
+    </p>
+    <p><em>Example:</em></p>
     <pre>
-      suite() -> 
-          [{require, domain, 'CONN_SPEC_DNS_SUFFIX'}].
+ suite() -> 
+     [{require, domain, 'CONN_SPEC_DNS_SUFFIX'}].
 
-      ...
-      
-      testcase(Config) ->
-          Domain = ct:get_config(domain),
-	  ...</pre>      
+ ...
+
+ testcase(Config) ->
+     Domain = ct:get_config(domain),
+     ...</pre>      
   </section>
 
   <section>
-  <title>Using configuration variables defined in multiple files</title>
+  <title>Using Configuration Variables Defined in Multiple Files</title>
     <p>If a configuration variable is defined in multiple files and you 
-      want to access all possible values, you may use the <seealso marker="ct#get_config-3"><c>ct:get_config/3</c></seealso>
-      function and specify <c>all</c> in the options list. The values will then
-      be returned in a list and the order of the elements corresponds to the order 
-      that the config files were specified at startup. Please see 
-      the <seealso marker="ct">ct</seealso> reference manual for details.</p>
+      want to access all possible values, use function
+      <seealso marker="ct#get_config-3"><c>ct:get_config/3</c></seealso>
+      and specify <c>all</c> in the options list. The values are then
+      returned in a list and the order of the elements corresponds to the order 
+      that the configuration files were specified at startup.</p>
   </section>
 
   <section>
-    <title>Encrypted configuration files</title>
+    <title>Encrypted Configuration Files</title>
     <marker id="encrypted_config_files"></marker>
-    <p>It is possible to encrypt configuration files containing sensitive data
-      if these files must be stored in open and shared directories.</p> 
-      <p>Call <seealso marker="ct#encrypt_config_file-2"><c>ct:encrypt_config_file/2/3</c></seealso> to have Common Test encrypt a
-      specified file using the DES3 function in the OTP <c>crypto</c> application.
-      The encrypted file can then be used as a regular configuration file,
-      in combination with other encrypted files or normal text files. The key
-      for decrypting the configuration file must be provided when running the test,
-      however. This can be done by means of the <c>decrypt_key</c> or
-      <c>decrypt_file</c> flag/option, or a key file in a predefined location.</p>
+      <p>Configuration files containing sensitive data can be encrypted 
+      if they must be stored in open and shared directories.</p> 
+       <p>To have <c>Common Test</c> encrypt a
+      specified file using function <c>DES3</c> in application <c>Crypto</c>,
+      call <seealso marker="ct#encrypt_config_file-2"><c>ct:encrypt_config_file/2,3</c></seealso>
+      The encrypted file can then be used as a regular configuration file
+      in combination with other encrypted files or normal text files. However, the 
+      key for decrypting the configuration file must be provided when running the test.
+      This can be done with flag/option <c>decrypt_key</c> or
+      <c>decrypt_file</c>, or a key file in a predefined location.</p>
       
-      <p>Common Test also provides decryption functions, 
-      <seealso marker="ct#decrypt_config_file-2"><c>ct:decrypt_config_file/2/3</c></seealso>, for recreating the original text
-      files.</p> 
-
-      <p>Please see the <seealso marker="ct">ct</seealso> reference manual for
-      more information.</p>
+      <p><c>Common Test</c> also provides decryption functions, 
+      <seealso marker="ct#decrypt_config_file-2"><c>ct:decrypt_config_file/2,3</c></seealso>, 
+      for recreating the original text files.</p> 
   </section>
 
   <section>
-    <title>Opening connections by using configuration data</title>
-    <p>There are two different methods for opening a connection
-      by means of the support functions in e.g. <seealso marker="ct_ssh"><c>ct_ssh</c></seealso>, <seealso marker="ct_ftp"><c>ct_ftp</c></seealso>,
-      and <seealso marker="ct_telnet"><c>ct_telnet</c></seealso>:</p>
-    <list>
+    <title>Opening Connections Using Configuration Data</title>
+    <p>Two different methods for opening a connection using the support functions 
+       in, for example, <seealso marker="ct_ssh"><c>ct_ssh</c></seealso>, 
+       <seealso marker="ct_ftp"><c>ct_ftp</c></seealso>, and 
+    <seealso marker="ct_telnet"><c>ct_telnet</c></seealso> follows:</p>
+    <list type="bulleted">
       <item>Using a configuration target name (an alias) as reference.</item>
       <item>Using the configuration variable as reference.</item>
     </list>    
     <p>When a target name is used for referencing the configuration data
-      (that specifies the connection to be opened), the same name may be used 
+      (that specifies the connection to be opened), the same name can be used 
       as connection identity in all subsequent calls related to the connection
-      (also for closing it). It's only possible to have one open connection
-      per target name. If attempting to open a new connection using a name
-      already associated with an open connection, Common Test will
-      return the already existing handle so that the previously opened connection
-      will be used. This is a practical feature since it makes it possible to
+      (also for closing it). Only one open connection per target name 
+      is possible. If you attempt to open a new connection using a name
+      already associated with an open connection, <c>Common Test</c>
+      returns the already existing handle so the previously opened connection
+      is used. This feature makes it possible to
       call the function for opening a particular connection whenever 
-      useful. An action like this will not necessarily open any new 
-      connections unless it's required (which could be the case if e.g. the 
-      previous connection has been closed unexpectedly by the server).
-      Another benefit of using named connections is that it's not
-      necessary to pass handle references around in the suite for these 
-      connections.
+      useful. An action like this does not necessarily open any new 
+      connections unless it is required (which could be the case if, for example,
+      the previous connection has been closed unexpectedly by the server).
+      Using named connections also removes the need to pass handle references 
+      around in the suite for these connections.
     </p>
     <p>When a configuration variable name is used as reference to the data
       specifying the connection, the handle returned as a result of opening
       the connection must be used in all subsequent calls (also for closing
       the connection). Repeated calls to the open function with the same
-      variable name as reference will result in multiple connections
-      being opened. This can be useful e.g. if a test case needs to open
+      variable name as reference results in multiple connections being opened. 
+      This can be useful, for example, if a test case needs to open
       multiple connections to the same server on the target node (using the
       same configuration data for each connection).
     </p>
   </section>
 
   <section>
-    <title>User specific configuration data formats</title>
+    <title>User-Specific Configuration Data Formats</title>
 
-    <p>It is possible for the user to specify configuration data on a
+    <p>The user can specify configuration data on a
       different format than key-value tuples in a text file, as described
-      so far. The data can e.g. be read from arbitrary files, fetched from
-      the web over http, or requested from a user specific process.
-      To support this, Common Test provides a callback module plugin
+      so far. The data can, for example, be read from any files, fetched from
+      the web over HTTP, or requested from a user-specific process.
+      To support this, <c>Common Test</c> provides a callback module plugin
       mechanism to handle configuration data.</p>
 
     <section>
-      <title>Default callback modules for handling configuration data</title>
-      <p>The Common Test application includes default callback modules
-	for handling configuration data specified in standard config files
-	(see above) and in xml files:</p>
-      <list>
+      <title>Default Callback Modules for Handling Configuration Data</title>
+      <p><c>Common Test</c> includes default callback modules
+	for handling configuration data specified in standard configuration files
+	(described earlier) and in XML files as follows:</p>
+      <list type="bulleted">
         <item>
           <c>ct_config_plain</c> - for reading configuration files with
-          key-value tuples (standard format). This handler will be used to
+          key-value tuples (standard format). This handler is used to
           parse configuration files if no user callback is specified.
         </item>
         <item>
@@ -215,59 +211,59 @@
     </section>
 
     <section>
-      <title>Using XML configuration files</title>
-      <p>This is an example of an XML configuration file:</p>
-      <pre><![CDATA[
-<config>
+      <title>Using XML Configuration Files</title>
+      <p>An example of an XML configuration file follows:</p>
+      <pre>
+ <![CDATA[
+ <config>
     <ftp_host>
         <ftp>"targethost"</ftp>
         <username>"tester"</username>
         <password>"letmein"</password>
     </ftp_host>
     <lm_directory>"/test/loadmodules"</lm_directory>
-</config>]]></pre>
+ </config>]]></pre>
 
-      <p>This configuration file, once read, will produce the same configuration
+      <p>Once read, this file produces the same configuration
       variables as the following text file:</p>
       <pre>
-{ftp_host, [{ftp,"targethost"},
-            {username,"tester"},
-            {password,"letmein"}]}.
+ {ftp_host, [{ftp,"targethost"},
+             {username,"tester"},
+             {password,"letmein"}]}.
 
-{lm_directory, "/test/loadmodules"}.</pre>
+ {lm_directory, "/test/loadmodules"}.</pre>
     </section>
 
     <section>
-      <title>How to implement a user specific handler</title>
+      <title>Implement a User-Specific Handler</title>
 
-      <p>The user specific handler can be written to handle special
+      <p>The user-specific handler can be written to handle special
 	configuration file formats. The parameter can be either file
-	name(s) or configuration string(s) (the empty list is valid).</p>
+	names or configuration strings (the empty list is valid).</p>
 
       <p>The callback module implementing the handler is responsible for
-	checking correctness of configuration strings.</p>
+	checking the correctness of configuration strings.</p>
 
-      <p>To perform validation of the configuration strings, the callback module
-	should have the following function exported:</p>
+      <p>To validate the configuration strings, the callback module
+	is to have function <c>Callback:check_parameter/1</c> exported.</p>
 
-      <p><c>Callback:check_parameter/1</c></p>
-      <p>The input argument will be passed from Common Test, as defined in the test
-	specification or given as an option to <c>ct_run</c> or <c>ct:run_test</c>.</p>
+       <p>The input argument is passed from <c>Common Test</c>, as defined in the test
+	specification, or specified as an option to <c>ct_run</c> or <c>ct:run_test</c>.</p>
 
-      <p>The return value should be any of the following values indicating if given
+      <p>The return value is to be any of the following values, indicating if the specified
 	configuration parameter is valid:</p>
-      <list>
+      <list type="bulleted">
         <item>
-          <c>{ok, {file, FileName}}</c> - parameter is a file name and
-          the file exists,
+          <c>{ok, {file, FileName}}</c> - the parameter is a file name and
+          the file exists.
         </item>
         <item>
-          <c>{ok, {config, ConfigString}}</c> - parameter is a config string
-          and it is correct,
+          <c>{ok, {config, ConfigString}}</c> - the parameter is a configuration string
+          and it is correct.
         </item>
         <item>
-          <c>{error, {nofile, FileName}}</c> - there is no file with the given
-          name in the current directory,
+          <c>{error, {nofile, FileName}}</c> - there is no file with the specified
+          name in the current directory.
         </item>
         <item>
           <c>{error, {wrong_config, ConfigString}}</c> - the configuration string
@@ -275,196 +271,196 @@
         </item>
       </list>
 
-      <p>To perform reading of configuration data - initially before the tests
-	start, or as a result of data being reloaded during test execution -
-	the following function should be exported from the callback module:</p>
-
-      <p><c>Callback:read_config/1</c></p>
+      <p>The function <c>Callback:read_config/1</c> is to be exported from the 
+         callback module to read configuration data, initially before the tests
+         start, or as a result of data being reloaded during test execution.
+         The input argument is the same as for function <c>check_parameter/1</c>.</p>
 
-      <p>The input argument is the same as for the <c>check_parameter/1</c> function.</p>
-      <p>The return value should be either:</p>
+      <p>The return value is to be either of the following:</p>
 
-      <list>
+      <list type="bulleted">
         <item>
-          <c>{ok, Config}</c> - if the configuration variables are read successfully,
+          <c>{ok, Config}</c> - if the configuration variables are read successfully.
         </item>
         <item>
           <c>{error, {Error, ErrorDetails}}</c> - if the callback module fails to
-          proceed with the given configuration parameters.
+          proceed with the specified configuration parameters.
         </item>
       </list>
       <p><c>Config</c> is the proper Erlang key-value list, with possible
-	key-value sublists as values, like for the configuration file
-	example above:</p>
+	key-value sublists as values, like the earlier configuration file
+	example:</p>
 
       <pre>
-        [{ftp_host, [{ftp, "targethost"}, {username, "tester"}, {password, "letmein"}]},
-         {lm_directory, "/test/loadmodules"}]</pre>
+ [{ftp_host, [{ftp, "targethost"}, {username, "tester"}, {password, "letmein"}]},
+  {lm_directory, "/test/loadmodules"}]</pre>
 
     </section>
 
   </section>
 
   <section>
-    <title>Examples of configuration data handling</title>
+    <title>Examples of Configuration Data Handling</title>
 
-    <p>A config file for using the FTP client to access files on a remote
-      host could look like this:</p>
+    <p>A configuration file for using the FTP client to access files on a remote
+      host can look as follows:</p>
 
     <pre>
-    {ftp_host, [{ftp,"targethost"},
-                {username,"tester"},
-                {password,"letmein"}]}.
+ {ftp_host, [{ftp,"targethost"},
+	     {username,"tester"},
+	     {password,"letmein"}]}.
 
-    {lm_directory, "/test/loadmodules"}.</pre>
+ {lm_directory, "/test/loadmodules"}.</pre>
 
-    <p>The XML version shown in the chapter above can also be used, but it should be
+    <p>The XML version shown earlier can also be used, but it is to be
     explicitly specified that the <c>ct_config_xml</c> callback module is to be
-    used by Common Test.</p>
+    used by <c>Common Test</c>.</p>
 
-    <p>Example of how to assert that the configuration data is available and
-      use it for an FTP session:</p>
+    <p>The following is an example of how to assert that the configuration data is available
+      and can be used for an FTP session:</p>
     <pre>
-    init_per_testcase(ftptest, Config) ->
-        {ok,_} = ct_ftp:open(ftp),
-        Config.
-
-    end_per_testcase(ftptest, _Config) ->
-        ct_ftp:close(ftp).
-
-    ftptest() ->
-        [{require,ftp,ftp_host},
-         {require,lm_directory}].
-
-    ftptest(Config) ->
-        Remote = filename:join(ct:get_config(lm_directory), "loadmodX"),
-        Local = filename:join(?config(priv_dir,Config), "loadmodule"),
-        ok = ct_ftp:recv(ftp, Remote, Local),
-        ...</pre>
+ init_per_testcase(ftptest, Config) ->
+     {ok,_} = ct_ftp:open(ftp),
+     Config.
+
+ end_per_testcase(ftptest, _Config) ->
+     ct_ftp:close(ftp).
+
+ ftptest() ->
+     [{require,ftp,ftp_host},
+      {require,lm_directory}].
+
+ ftptest(Config) ->
+     Remote = filename:join(ct:get_config(lm_directory), "loadmodX"),
+     Local = filename:join(?config(priv_dir,Config), "loadmodule"),
+     ok = ct_ftp:recv(ftp, Remote, Local),
+     ...</pre>
     
-    <p>An example of how the above functions could be rewritten
-      if necessary to open multiple connections to the FTP server:</p>
+    <p>The following is an example of how the functions in the previous example 
+       can be rewritten if it is necessary to open multiple connections to the 
+       FTP server:</p>
     <pre>
-    init_per_testcase(ftptest, Config) ->
-        {ok,Handle1} = ct_ftp:open(ftp_host),
-        {ok,Handle2} = ct_ftp:open(ftp_host),
-        [{ftp_handles,[Handle1,Handle2]} | Config].
-
-    end_per_testcase(ftptest, Config) ->
-        lists:foreach(fun(Handle) -> ct_ftp:close(Handle) end, 
-                      ?config(ftp_handles,Config)).
-
-    ftptest() ->
-        [{require,ftp_host},
-         {require,lm_directory}].
-
-    ftptest(Config) ->
-        Remote = filename:join(ct:get_config(lm_directory), "loadmodX"),
-        Local = filename:join(?config(priv_dir,Config), "loadmodule"),
-        [Handle | MoreHandles] = ?config(ftp_handles,Config),
-        ok = ct_ftp:recv(Handle, Remote, Local),
-        ...</pre>
+ init_per_testcase(ftptest, Config) ->
+     {ok,Handle1} = ct_ftp:open(ftp_host),
+     {ok,Handle2} = ct_ftp:open(ftp_host),
+     [{ftp_handles,[Handle1,Handle2]} | Config].
+
+ end_per_testcase(ftptest, Config) ->
+     lists:foreach(fun(Handle) -> ct_ftp:close(Handle) end, 
+                   ?config(ftp_handles,Config)).
+
+ ftptest() ->
+     [{require,ftp_host},
+      {require,lm_directory}].
+
+ ftptest(Config) ->
+     Remote = filename:join(ct:get_config(lm_directory), "loadmodX"),
+     Local = filename:join(?config(priv_dir,Config), "loadmodule"),
+     [Handle | MoreHandles] = ?config(ftp_handles,Config),
+     ok = ct_ftp:recv(Handle, Remote, Local),
+     ...</pre>
       
   </section>
 
   <section>
-    <title>Example of user specific configuration handler</title>
-    <p>A simple configuration handling driver which will ask an external server for
-      configuration data can be implemented this way:</p>
+    <title>Example of User-Specific Configuration Handler</title>
+    <p>A simple configuration handling driver, asking an external server for
+      configuration data, can be implemented as follows:</p>
     <pre>
--module(config_driver).
--export([read_config/1, check_parameter/1]).
-
-read_config(ServerName)->
-    ServerModule = list_to_atom(ServerName),
-    ServerModule:start(),
-    ServerModule:get_config().
-
-check_parameter(ServerName)->
-    ServerModule = list_to_atom(ServerName),
-    case code:is_loaded(ServerModule) of
-        {file, _}->
-            {ok, {config, ServerName}};
-        false->
-            case code:load_file(ServerModule) of
-                {module, ServerModule}->
-                    {ok, {config, ServerName}};
-                {error, nofile}->
-                    {error, {wrong_config, "File not found: " ++ ServerName ++ ".beam"}}
-            end
-    end.</pre>
-
-    <p>The configuration string for this driver may be "config_server", if the
-      config_server.erl module below is compiled and exists in the code path
+ -module(config_driver).
+ -export([read_config/1, check_parameter/1]).
+
+ read_config(ServerName)->
+     ServerModule = list_to_atom(ServerName),
+     ServerModule:start(),
+     ServerModule:get_config().
+
+ check_parameter(ServerName)->
+     ServerModule = list_to_atom(ServerName),
+     case code:is_loaded(ServerModule) of
+         {file, _}->
+             {ok, {config, ServerName}};
+         false->
+             case code:load_file(ServerModule) of
+                 {module, ServerModule}->
+                     {ok, {config, ServerName}};
+                 {error, nofile}->
+                     {error, {wrong_config, "File not found: " ++ ServerName ++ ".beam"}}
+             end
+     end.</pre>
+
+    <p>The configuration string for this driver can be <c>config_server</c>, if the
+      <c>config_server.erl</c> module that follows is compiled and exists in the code path
       during test execution:</p>
     <pre>
--module(config_server).
--export([start/0, stop/0, init/1, get_config/0, loop/0]).
-
--define(REGISTERED_NAME, ct_test_config_server).
-
-start()->
-    case whereis(?REGISTERED_NAME) of
-        undefined->
-            spawn(?MODULE, init, [?REGISTERED_NAME]),
-            wait();
-        _Pid->
-        ok
-    end,
-    ?REGISTERED_NAME.
-
-init(Name)->
-    register(Name, self()),
-    loop().
-
-get_config()->
-    call(self(), get_config).
-
-stop()->
-    call(self(), stop).
-
-call(Client, Request)->
-    case whereis(?REGISTERED_NAME) of
-        undefined->
-            {error, {not_started, Request}};
-        Pid->
-            Pid ! {Client, Request},
-            receive
-                Reply->
-                    {ok, Reply}
-            after 4000->
-                {error, {timeout, Request}}
-            end
-    end.
-
-loop()->
-    receive
-        {Pid, stop}->
-            Pid ! ok;
-        {Pid, get_config}->
-            {D,T} = erlang:localtime(),
-            Pid !
-                [{localtime, [{date, D}, {time, T}]},
-                 {node, erlang:node()},
-                 {now, erlang:now()},
-                 {config_server_pid, self()},
-                 {config_server_vsn, ?vsn}],
-            ?MODULE:loop()
-    end.
-
-wait()->
-    case whereis(?REGISTERED_NAME) of
-        undefined->
-            wait();
-        _Pid->
-            ok
-    end.</pre>
-
-    <p>In this example, the handler also provides the ability to dynamically reload
-      configuration variables. If <c>ct:reload_config(localtime)</c> is called from
+ -module(config_server).
+ -export([start/0, stop/0, init/1, get_config/0, loop/0]).
+
+ -define(REGISTERED_NAME, ct_test_config_server).
+
+ start()->
+     case whereis(?REGISTERED_NAME) of
+         undefined->
+             spawn(?MODULE, init, [?REGISTERED_NAME]),
+             wait();
+         _Pid->
+         ok
+     end,
+     ?REGISTERED_NAME.
+
+ init(Name)->
+     register(Name, self()),
+     loop().
+
+ get_config()->
+     call(self(), get_config).
+
+ stop()->
+     call(self(), stop).
+
+ call(Client, Request)->
+     case whereis(?REGISTERED_NAME) of
+         undefined->
+             {error, {not_started, Request}};
+         Pid->
+             Pid ! {Client, Request},
+             receive
+                 Reply->
+                     {ok, Reply}
+             after 4000->
+                 {error, {timeout, Request}}
+             end
+     end.
+
+ loop()->
+     receive
+         {Pid, stop}->
+             Pid ! ok;
+         {Pid, get_config}->
+             {D,T} = erlang:localtime(),
+             Pid !
+                 [{localtime, [{date, D}, {time, T}]},
+                  {node, erlang:node()},
+                  {now, erlang:now()},
+                  {config_server_pid, self()},
+                  {config_server_vsn, ?vsn}],
+             ?MODULE:loop()
+     end.
+
+ wait()->
+     case whereis(?REGISTERED_NAME) of
+         undefined->
+             wait();
+         _Pid->
+             ok
+     end.</pre>
+
+    <p>Here, the handler also provides for dynamically reloading of
+      configuration variables. If 
+      <seealso marker="ct#reload_config-1"><c>ct:reload_config(localtime)</c></seealso> is called from
       the test case function, all variables loaded with <c>config_driver:read_config/1</c>
-      will be updated with their latest values, and the new value for variable
-      <c>localtime</c> will be returned.</p>
+      are updated with their latest values, and the new value for variable
+      <c>localtime</c> is returned.</p>
   </section>
 
 </chapter>
diff --git a/lib/common_test/doc/src/cover_chapter.xml b/lib/common_test/doc/src/cover_chapter.xml
index f164fff0ad..094aa7d80c 100644
--- a/lib/common_test/doc/src/cover_chapter.xml
+++ b/lib/common_test/doc/src/cover_chapter.xml
@@ -33,256 +33,251 @@
   <section>
     <marker id="cover"></marker>
       <title>General</title>
-      <p>Although Common Test was created primarly for the purpose of
-	black box testing, nothing prevents it from working perfectly as
-	a white box testing tool as well.  This is especially true when
+      <p>Although <c>Common Test</c> was created primarily for
+	black-box testing, nothing prevents it from working perfectly as
+	a white-box testing tool as well. This is especially true when
 	the application to test is written in Erlang. Then the test
-	ports are easily realized by means of Erlang function calls.</p>
+	ports are easily realized with Erlang function calls.</p>
       
-      <p>When white box testing an Erlang application, it is useful to
-	be able to measure the code coverage of the test. Common Test
+      <p>When white-box testing an Erlang application, it is useful to
+	be able to measure the code coverage of the test. <c>Common Test</c>
 	provides simple access to the OTP Cover tool for this
-	purpose. Common Test handles all necessary communication with
-	the Cover tool (starting, compiling, analysing, etc). All the
-	Common Test user needs to do is to specify the extent of the
+	purpose. <c>Common Test</c> handles all necessary communication with
+	the Cover tool (starting, compiling, analysing, and so on).
+	The <c>Common Test</c> user only needs to specify the extent of the
 	code coverage analysis.</p>
   </section>
   
   <section>
-    <title>Usage</title> 
-    <p>To specify what modules should be included
-    in the code coverage test, you provide a cover specification
-    file. Using this file you can point out specific modules or
-    specify directories that contain modules which should all be
-    included in the analysis. You can also, in the same fashion,
-    specify modules that should be excluded from the analysis.</p>
+    <title>Use</title> 
+    <p>To specify the modules to be included in the code coverage test, 
+    provide a cover specification file. With this file you can point 
+    out specific modules or specify directories containing modules to be
+    included in the analysis. You can also specify modules to be excluded 
+    from the analysis.</p>
     
     <p>If you are testing a distributed Erlang application, it is
       likely that code you want included in the code coverage analysis
-      gets executed on an Erlang node other than the one Common Test
-      is running on. If this is the case you need to specify these
-      other nodes in the cover specification file or add them
-      dynamically to the code coverage set of nodes. See the
-      <c>ct_cover</c> page in the reference manual for details on the
-      latter.</p>
+      gets executed on another Erlang node than the one <c>Common Test</c>
+      is running on. If so, you must specify these other nodes in the 
+      cover specification file or add them dynamically to the code coverage 
+      set of nodes. For details on the latter, see module 
+      <seealso marker="ct_cover"><c>ct_cover</c></seealso>.</p>
 
     <p>In the cover specification file you can also specify your
       required level of the code coverage analysis; <c>details</c> or
       <c>overview</c>. In detailed mode, you get a coverage overview
-      page, showing you per module and total coverage percentages, as
-      well as one HTML file printed for each module included in the
-      analysis that shows exactly what parts of the code have been
+      page, showing per module and total coverage percentages.
+      You also get an HTML file printed for each module included in the
+      analysis showing exactly what parts of the code have been
       executed during the test. In overview mode, only the code
-      coverage overview page gets printed.</p>
+      coverage overview page is printed.</p>
 
     <p>You can choose to export and import code coverage data between
       tests. If you specify the name of an export file in the cover
-      specification file, Common Test will export collected coverage
-      data to this file at the end of the test. You may similarly
-      specify that previously exported data should be imported and
-      included in the analysis for a test (you can specify multiple
-      import files). This way it is possible to analyse total code coverage
-      without necessarily running all tests at once.</p>
-
-    <p>To activate the code coverage support, you simply specify the
-      name of the cover specification file as you start Common Test.
-      This you do either by using the <c>-cover</c> flag with <c>ct_run</c>.
-      Example:</p>
-
-    <p><c>$ ct_run -dir $TESTOBJS/db -cover $TESTOBJS/db/config/db.coverspec</c></p>
+      specification file, <c>Common Test</c> exports collected coverage
+      data to this file at the end of the test. You can similarly
+      specify previously exported data to be imported and
+      included in the analysis for a test (multiple import files can be specified). 
+      This way, the total code coverage can be analyzed without necessarily 
+      running all tests at once.</p>
+
+    <p>To activate the code coverage support, specify the name of the cover 
+      specification file as you start <c>Common Test</c>.
+      Do this by using flag <c>-cover</c> with 
+      <seealso marker="ct_run"><c>ct_run</c></seealso>, 
+      for example:</p>
+      <pre>
+ $ ct_run -dir $TESTOBJS/db -cover $TESTOBJS/db/config/db.coverspec</pre>
     
-    <p>You may also pass the cover specification file name in a
-      call to <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, by adding a <c>{cover,CoverSpec}</c>
-      tuple to the <c>Opts</c> argument. Also, you can of course 
-      enable code coverage in your test specifications (read
-      more in the chapter about 
-      <seealso marker="run_test_chapter#test_specifications">using test
-      specifications</seealso>).</p>
+    <p>You can also pass the cover specification file name in a
+      call to <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, 
+      by adding a <c>{cover,CoverSpec}</c> tuple to argument <c>Opts</c>.</p>
+      <p>You can also enable code coverage in your test specifications (see section 
+      <seealso marker="run_test_chapter#test_specifications">Test Specifications</seealso>
+      in section Running Tests and Analyzing Results).</p>
   </section>
 
   <section>
   <marker id="cover_stop"></marker>
-    <title>Stopping the cover tool when tests are completed</title>
-    <p>By default the Cover tool is automatically stopped when the
-      tests are completed. This causes the original (non cover
-      compiled) modules to be loaded back in to the test node. If a
-      process at this point is still running old code of any of the
+    <title>Stopping the Cover Tool When Tests Are Completed</title>
+    <p>By default, the Cover tool is automatically stopped when the
+      tests are completed. This causes the original (non-cover
+      compiled) modules to be loaded back into the test node. If a
+      process at this point still runs old code of any of the
       modules that are cover compiled, meaning that it has not done
       any fully qualified function call after the cover compilation,
-      the process will now be killed. To avoid this it is possible to
-      set the value of the <c>cover_stop</c> option to
-      <c>false</c>. This means that the modules will stay cover
-      compiled, and it is therefore only recommended if the erlang
-      node(s) under test is terminated after the test is completed
-      or if cover can be manually stopped.</p>
-
-    <p>The option can be set by using the <c>-cover_stop</c> flag with
-      <c>ct_run</c>, by adding <c>{cover_stop,true|false}</c> to the
-      Opts argument to <seealso
-      marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, or by adding
-      a <c>cover_stop</c> term in your test specification (see chapter
-      about <seealso
-      marker="run_test_chapter#test_specifications">test
-      specifications</seealso>).</p>
+      the process is killed. To avoid this, set the value of option 
+      <c>cover_stop</c> to <c>false</c>. This means that the 
+      modules stay cover compiled. Therefore, this is only recommended 
+      if the Erlang nodes under test are terminated after the test is 
+      completed, or if cover can be manually stopped.</p>
+
+    <p>The option can be set by using flag <c>-cover_stop</c> with
+      <c>ct_run</c>, by adding <c>{cover_stop,true|false}</c> to argument
+      <c>Opts</c> to 
+      <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, 
+      or by adding a <c>cover_stop</c> term in the test specification (see section
+      <seealso marker="run_test_chapter#test_specifications">Test Specifications</seealso>
+      in section Running Tests and Analyzing Results).</p>
 
   </section>
 
   <section>
-    <title>The cover specification file</title>
-    <p>These are the terms allowed in a cover specification file:</p>
+    <title>The Cover Specification File</title>
+    <p>The following terms are allowed in a cover specification file:</p>
 
     <pre>
-      %% List of Nodes on which cover will be active during test.
-      %% Nodes = [atom()]
-      {nodes, Nodes}.       
-
-      %% Files with previously exported cover data to include in analysis.
-      %% CoverDataFiles = [string()]
-      {import, CoverDataFiles}.
-
-      %% Cover data file to export from this session.
-      %% CoverDataFile = string()
-      {export, CoverDataFile}.
-
-      %% Cover analysis level.
-      %% Level = details | overview
-      {level, Level}.       
-
-      %% Directories to include in cover.
-      %% Dirs = [string()]
-      {incl_dirs, Dirs}.
-
-      %% Directories, including subdirectories, to include.
-      {incl_dirs_r, Dirs}.
-
-      %% Specific modules to include in cover.
-      %% Mods = [atom()]
-      {incl_mods, Mods}.
-
-      %% Directories to exclude in cover.
-      {excl_dirs, Dirs}.
-
-      %% Directories, including subdirectories, to exclude.
-      {excl_dirs_r, Dirs}.
-
-      %% Specific modules to exclude in cover.
-      {excl_mods, Mods}.
-
-      %% Cross cover compilation
-      %% Tag = atom(), an identifier for a test run
-      %% Mod = [atom()], modules to compile for accumulated analysis
-      {cross,[{Tag,Mods}]}.
-    </pre>
-
-    <p>The <c>incl_dirs_r</c> and <c>excl_dirs_r</c> terms tell Common
-      Test to search the given directories recursively and include 
-      or exclude any module found during the search. The
-      <c>incl_dirs</c> and <c>excl_dirs</c> terms result in a
-      non-recursive search for modules (i.e. only modules found in 
-      the given directories are included or excluded).</p>
-    <p><em>Note:</em> Directories containing Erlang modules that are
-       to be included in a code coverage test must exist in the code
-       server path, or the cover tool will fail to recompile the modules.
-       (It is not sufficient to specify these directories in the cover 
-       specification file for Common Test).</p>
+ %% List of Nodes on which cover will be active during test.
+ %% Nodes = [atom()]
+ {nodes, Nodes}.       
+
+ %% Files with previously exported cover data to include in analysis.
+ %% CoverDataFiles = [string()]
+ {import, CoverDataFiles}.
+
+ %% Cover data file to export from this session.
+ %% CoverDataFile = string()
+ {export, CoverDataFile}.
+
+ %% Cover analysis level.
+ %% Level = details | overview
+ {level, Level}.       
+
+ %% Directories to include in cover.
+ %% Dirs = [string()]
+ {incl_dirs, Dirs}.
+
+ %% Directories, including subdirectories, to include.
+ {incl_dirs_r, Dirs}.
+
+ %% Specific modules to include in cover.
+ %% Mods = [atom()]
+ {incl_mods, Mods}.
+
+ %% Directories to exclude in cover.
+ {excl_dirs, Dirs}.
+
+ %% Directories, including subdirectories, to exclude.
+ {excl_dirs_r, Dirs}.
+
+ %% Specific modules to exclude in cover.
+ {excl_mods, Mods}.
+
+ %% Cross cover compilation
+ %% Tag = atom(), an identifier for a test run
+ %% Mod = [atom()], modules to compile for accumulated analysis
+ {cross,[{Tag,Mods}]}.</pre>
+
+    <p>The terms <c>incl_dirs_r</c> and <c>excl_dirs_r</c> tell <c>Common
+      Test</c> to search the specified directories recursively and include 
+      or exclude any module found during the search. The terms
+      <c>incl_dirs</c> and <c>excl_dirs</c> result in a
+      non-recursive search for modules (that is, only modules found in 
+      the specified directories are included or excluded).</p>
+    <note><p>Directories containing Erlang modules to be included in a code 
+      coverage test must exist in the code server path. Otherwise, 
+      the Cover tool fails to recompile the modules. It is not sufficient to 
+      specify these directories in the cover specification file for 
+      <c>Common Test</c>.</p></note>
   </section>
 
   <section>
   <marker id="cross_cover"/>
-    <title>Cross cover analysis</title>
+    <title>Cross Cover Analysis</title>
     <p>The cross cover mechanism allows cover analysis of modules
-    across multiple tests. It is useful if some code, e.g. a library
-    module, is used by many different tests and the accumulated cover
-    result is desirable.</p>
+    across multiple tests. It is useful if some code, for example, a 
+    library module, is used by many different tests and the accumulated 
+    cover result is desirable.</p>
 
-    <p>This can of course also be achieved in a more customized way by
-    using the <c>export</c> parameter in the cover specification and
-    analysing the result off line, but the cross cover mechanism is a
-    build in solution which also provides the logging.</p>
+    <p>This can also be achieved in a more customized way by
+    using parameter <c>export</c> in the cover specification and
+    analysing the result off line. However, the cross cover mechanism is a
+    built-in solution that also provides logging.</p>
 
-    <p>The mechanism is easiest explained via an example:</p>
+    <p>The mechanism is easiest explained by an example:</p>
 
-    <p>Let's say that there are two systems, <c>s1</c> and <c>s2</c>,
-    which are tested in separate test runs. System <c>s1</c> contains
-    a library module <c>m1</c> which is tested by the <c>s1</c> test
-    run and is included in <c>s1</c>'s cover specification:</p>
+    <p>Assume that there are two systems, <c>s1</c> and <c>s2</c>,
+    that are tested in separate test runs. System <c>s1</c> contains
+    a library module <c>m1</c> tested by test run <c>s1</c> and 
+    is included in the cover specification of <c>s1</c> as follows:</p>
 
 <code type="none">
-s1.cover:
-  {incl_mods,[m1]}.</code>
+ s1.cover:
+   {incl_mods,[m1]}.</code>
 
     <p>When analysing code coverage, the result for <c>m1</c> can be
     seen in the cover log in the <c>s1</c> test result.</p>
 
-    <p>Now, let's imagine that since <c>m1</c> is a library module, it
-    is also used quite a bit by system <c>s2</c>. The <c>s2</c> test
-    run does not specifically test <c>m1</c>, but it might still be
-    interesting to see which parts of <c>m1</c> is actually covered by
-    the <c>s2</c> tests. To do this, <c>m1</c> could be included also
-    in <c>s2</c>'s cover specification:</p>
+    <p>Now, imagine that as <c>m1</c> is a library module, it
+    is also often used by system <c>s2</c>. Test run <c>s2</c>
+    does not specifically test <c>m1</c>, but it can still be
+    interesting to see which parts of <c>m1</c> that are covered 
+    by the <c>s2</c> tests. To do this, <c>m1</c> can be included also
+    in the cover specification of <c>s2</c> as follows:</p>
 
 <code type="none">
-s2.cover:
-  {incl_mods,[m1]}.</code>
+ s2.cover:
+   {incl_mods,[m1]}.</code>
 
-    <p>This would give an entry for <c>m1</c> also in the cover log
-    for the <c>s2</c> test run. The problem is that this would only
-    reflect the coverage by <c>s2</c> tests, not the accumulated
-    result over <c>s1</c> and <c>s2</c>. And this is where the cross
+    <p>This gives an entry for <c>m1</c> also in the cover log
+    for test run <c>s2</c>. The problem is that this only
+    reflects the coverage by <c>s2</c> tests, not the accumulated
+    result over <c>s1</c> and <c>s2</c>. This is where the cross
     cover mechanism comes in handy.</p>
 
-    <p>If instead the cover specification for <c>s2</c> was like
-    this:</p>
+    <p>If instead the cover specification for <c>s2</c> is like
+    the following:</p>
 
 <code type="none">
-s2.cover:
-  {cross,[{s1,[m1]}]}.</code>
+ s2.cover:
+   {cross,[{s1,[m1]}]}.</code>
 
-    <p>then <c>m1</c> would be cover compiled in the <c>s2</c> test
-    run, but not shown in the coverage log. Instead, if
-    <c>ct_cover:cross_cover_analyse/2</c> is called after both
-    <c>s1</c> and <c>s2</c> test runs are completed, the accumulated
-    result for <c>m1</c> would be available in the cross cover log for
-    the <c>s1</c> test run.</p>
+    <p>Then <c>m1</c> is cover compiled in test run <c>s2</c>,
+    but not shown in the coverage log. Instead, if
+    <seealso marker="ct_cover#cross_cover_analyse-2"><c>ct_cover:cross_cover_analyse/2</c></seealso> 
+    is called after both <c>s1</c> and <c>s2</c> test runs are completed, 
+    the accumulated result for <c>m1</c> is available in the cross cover 
+    log for test run <c>s1</c>.</p>
 
-    <p>The call to the analyse function must be like this:</p>
+    <p>The call to the analyze function must be as follows:</p>
 
 <code type="none">
-ct_cover:cross_cover_analyse(Level, [{s1,S1LogDir},{s2,S2LogDir}]).</code>
+ ct_cover:cross_cover_analyse(Level, [{s1,S1LogDir},{s2,S2LogDir}]).</code>
 
-    <p>where <c>S1LogDir</c> and <c>S2LogDir</c> are the directories
+    <p>Here, <c>S1LogDir</c> and <c>S2LogDir</c> are the directories
     named <c>&lt;TestName&gt;.logs</c> for each test respectively.</p>
 
-    <p>Note the tags <c>s1</c> and <c>s2</c> which are used in the
+    <p>Notice the tags <c>s1</c> and <c>s2</c>, which are used in the
     cover specification file and in the call to
-    <c>ct_cover:cross_cover_analyse/2</c>. The point of these are only
+    <c>ct_cover:cross_cover_analyse/2</c>. The purpose of these is only
     to map the modules specified in the cover specification to the log
-    directory specified in the call to the analyse function. The name
-    of the tag has no meaning beyond this.</p>
+    directory specified in the call to the analyze function. The tag name
+    has no meaning beyond this.</p>
 
   </section>
 
   <section>
     <title>Logging</title>
     <p>To view the result of a code coverage test, click the button
-      labled "COVER LOG" in the top level index page for the test run.</p>
+      labeled "COVER LOG" in the top-level index page for the test run.</p>
 
-    <p>Prior to Erlang/OTP 17.1, if your test run consisted of
+    <p>Before Erlang/OTP 17.1, if your test run consisted of
       multiple tests, cover would be started and stopped for each test
-      within the test run. Separate logs would be available via the
+      within the test run. Separate logs would be available through the
       "Coverage log" link on the test suite result pages. These links
       are still available, but now they all point to the same page as
-      the button on the top level index page. The log contains the
-      accumulated results for the complete test run. See the release
-      notes for more information about this change.</p>
+      the button on the top-level index page. The log contains the
+      accumulated results for the complete test run. For details about 
+      this change, see the release notes.</p>
 
-    <p>The buttonc takes you to the code coverage overview page. If you
-      have successfully performed a detailed coverage analysis, you
-      find links to each individual module coverage page here.</p>
+    <p>The button takes you to the code coverage overview page. If you
+      have successfully performed a detailed coverage analysis,
+      links to each individual module coverage page are found here.</p>
 
-    <p>If cross cover analysis has been performed, and there are
-      accumulated coverage results for the current test, then the -
-      "Coverdata collected over all tests" link will take you to these
+    <p>If cross cover analysis is performed, and there are
+      accumulated coverage results for the current test, the link
+      "Coverdata collected over all tests" takes you to these
       results.</p>
   </section>
 
diff --git a/lib/common_test/doc/src/ct.xml b/lib/common_test/doc/src/ct.xml
new file mode 100644
index 0000000000..a87be21d73
--- /dev/null
+++ b/lib/common_test/doc/src/ct.xml
@@ -0,0 +1,1412 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2010</year><year>2012</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+
+    </legalnotice>
+
+    <title>ct</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>ct.xml</file>
+  </header>
+  <module>ct</module>
+  <modulesummary>Main user interface for the Common Test framework.</modulesummary>
+
+  <description>
+
+     <p>Main user interface for the <c>Common Test</c> framework.</p>
+
+     <p>This module implements the command-line interface for running
+       tests and basic functions for <c>Common Test</c> case issues, such as
+       configuration and logging.</p>
+
+     <p><em>Test Suite Support Macros</em></p> 
+
+     <p>The <c>config</c> macro is defined in <c>ct.hrl</c>. This macro is
+       to be used to retrieve information from the <c>Config</c> variable sent
+       to all test cases. It is used with two arguments; the first is the name
+       of the configuration variable to retrieve, the second is the
+       <c>Config</c> variable supplied to the test case.</p>
+
+    <p>Possible configuration variables include:</p>
+
+    <list type="bulleted">
+      <item><p><c>data_dir</c> - Data file directory</p></item>
+      <item><p><c>priv_dir</c> - Scratch file directory</p></item>
+      <item><p>Whatever added by
+      <seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite/1</c></seealso>
+      or
+      <seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+      in the test suite.</p></item>
+    </list>
+
+  </description>
+
+  <section>
+    <title>Data Types</title>
+    <marker id="types"/>
+    <taglist>
+
+      <tag><c>handle() = pid()</c></tag>
+        <item><marker id="type-handle"/>
+          <p>The identity (handle) of a connection.</p></item>
+
+      <tag><c>target_name() = atom()</c></tag>
+        <item><marker id="type-target_name"/>
+          <p>A name and association to configuration data introduced
+            through a require statement, or a call to
+            <seealso marker="#require-2"><c>ct:require/2</c></seealso>,
+            for example,
+            <c>ct:require(mynodename,{node,[telnet]})</c>.</p></item>
+
+    </taglist>
+  </section>
+
+  <funcs>
+    <func>
+      <name>abort_current_testcase(Reason) -&gt; ok | {error, ErrorReason}</name>
+      <fsummary>Aborts the currently executing test case.</fsummary>
+      <type>
+        <v>Reason = term()</v>
+        <v>ErrorReason = no_testcase_running | parallel_group</v>
+      </type>
+      <desc><marker id="abort_current_testcase-1"/>
+        <p>Aborts the currently executing test case. The user must know with
+          certainty which test case is currently executing. The function is
+          therefore only safe to call from a function that has been called
+          (or synchronously invoked) by the test case.</p>
+
+        <p><c>Reason</c>, the reason for aborting the test case, is printed
+          in the test case log.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>add_config(Callback, Config) -&gt; ok | {error, Reason}</name>
+      <fsummary>Loads configuration variables using the specified callback
+        module and configuration string.</fsummary>
+      <type>
+        <v>Callback = atom()</v>
+        <v>Config = string()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="add_config-2"/>
+        <p>Loads configuration variables using the specified callback module and
+          configuration string. The callback module is to be either loaded or
+          present in the code part. Loaded configuration variables can later
+          be removed using function
+          <seealso marker="#remove_config-2"><c>ct:remove_config/2</c></seealso>.
+        </p>
+      </desc>
+    </func>
+
+    <func>
+      <name>break(Comment) -&gt; ok | {error, Reason}</name>
+      <fsummary>Cancels any active timetrap and pause the execution of the
+        current test case until the user calls function continue/0.</fsummary>
+      <type>
+        <v>Comment = string()</v>
+        <v>Reason = {multiple_cases_running, TestCases} | 'enable break with release_shell option'</v>
+        <v>TestCases = [atom()]</v>
+      </type>
+      <desc><marker id="break-1"/>
+        <p>Cancels any active timetrap and pauses the execution of the
+          current test case until the user calls function <c>continue/0</c>.
+          The user can then interact with the Erlang node running the tests,
+          for example, for debugging purposes or for manually executing a
+          part of the test case. If a parallel group is executing,
+          <seealso marker="#break-2"><c>ct:break/2</c></seealso> is to be
+          called instead.</p>
+       <p>A cancelled timetrap is not automatically reactivated after the
+         break, but must be started exlicitly with
+         <seealso marker="#timetrap-1"><c>ct:timetrap/1</c></seealso>.</p>
+       <p>In order for the break/continue functionality to work, <c>Common
+         Test</c> must release the shell process controlling <c>stdin</c>.
+         This is done by setting start option <c>release_shell</c>
+         to <c>true</c>. For details, see section
+         <seealso marker="run_test_chapter#erlang_shell_or_program">Running
+         Tests from the Erlang Shell or from an Erlang Program</seealso>
+         in the User's Guide.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>break(TestCase, Comment) -&gt; ok | {error, Reason}</name>
+      <fsummary>Works the same way as break/1, only argument TestCase makes it
+        possible to pause a test case executing in a parallel group.</fsummary>
+      <type>
+        <v>TestCase = atom()</v>
+        <v>Comment = string()</v>
+        <v>Reason = 'test case not running' | 'enable break with release_shell option'</v>
+      </type>
+      <desc><marker id="break-2"/>
+        <p>Works the same way as
+          <seealso marker="#break-1"><c>ct:break/1</c></seealso>, only
+          argument <c>TestCase</c> makes it possible to pause a test case
+          executing in a parallel group. Function
+          <seealso marker="#continue-1"><c>ct:continue/1</c></seealso> is to
+          be used to resume execution of <c>TestCase</c>.</p>
+
+        <p>For details, see
+          <seealso marker="#break/1"><c>ct:break/1</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>capture_get() -&gt; ListOfStrings</name>
+      <fsummary>Equivalent to capture_get([default]).</fsummary>
+      <type>
+        <v>ListOfStrings = [string()]</v>
+      </type>
+      <desc><marker id="capture_get-0"/>
+        <p>Equivalent to
+          <seealso marker="#capture_get-1">ct:capture_get([default])</seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>capture_get(ExclCategories) -&gt; ListOfStrings</name>
+      <fsummary>Returns and purges the list of text strings buffered during
+        the latest session of capturing printouts to stdout.</fsummary>
+      <type>
+        <v>ExclCategories = [atom()]</v>
+        <v>ListOfStrings = [string()]</v>
+      </type>
+      <desc><marker id="capture_get-1"/>
+        <p>Returns and purges the list of text strings buffered during the
+          latest session of capturing printouts to <c>stdout</c>. Log
+          categories that are to be ignored in <c>ListOfStrings</c> can be
+          specified with <c>ExclCategories</c>.
+          If <c>ExclCategories = []</c>, no filtering takes place.</p>
+
+        <p>See also
+          <seealso marker="#capture_start-0"><c>ct:capture_start/0</c></seealso>,
+          <seealso marker="#capture_stop-0"><c>ct:capture_stop/0</c></seealso>,
+          <seealso marker="#log-3"><c>ct:log/3</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>capture_start() -&gt; ok</name>
+      <fsummary>Starts capturing all text strings printed to stdout
+        during execution of the test case.</fsummary>
+        <desc><marker id="capture_start-0"/>
+        <p>Starts capturing all text strings printed to <c>stdout</c>
+          during execution of the test case.</p>
+
+        <p>See also
+          <seealso marker="#capture_get-1"><c>ct:capture_get/1</c></seealso>,
+          <seealso marker="#capture_stop-0"><c>ct:capture_stop/0</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>capture_stop() -&gt; ok</name>
+      <fsummary>Stops capturing text strings (a session started with
+        capture_start/0).</fsummary>
+      <desc><marker id="capture_stop-0"/>
+        <p>Stops capturing text strings (a session started with
+          <c>capture_start/0</c>).</p>
+
+        <p>See also
+          <seealso marker="#capture_get-1"><c>ct:capture_get/1</c></seealso>,
+          <seealso marker="#capture_start-0"><c>ct:capture_start/0</c></seealso>.</p>
+       </desc>
+    </func>
+
+    <func>
+      <name>comment(Comment) -&gt; ok</name>
+      <fsummary>Prints the specified Comment in the comment field in the
+        table on the test suite result page.</fsummary>
+      <type>
+        <v>Comment = term()</v>
+      </type>
+      <desc><marker id="comment-1"/>
+        <p>Prints the specified <c>Comment</c> in the comment field in the
+          table on the test suite result page.</p>
+
+        <p>If called several times, only the last comment is printed. The
+          test case return value <c>{comment,Comment}</c> overwrites the
+          string set by this function.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>comment(Format, Args) -&gt; ok</name>
+      <fsummary>Prints the formatted string in the comment field in the
+        table on the test suite result page.</fsummary>
+      <type>
+        <v>Format = string()</v>
+        <v>Args = list()</v>
+      </type>
+      <desc><marker id="comment-2"/>
+        <p>Prints the formatted string in the comment field in the table
+          on the test suite result page.</p>
+
+        <p>Arguments <c>Format</c> and <c>Args</c> are used in a call to
+          <c>io_lib:format/2</c> to create the comment string. The behavior
+          of <c>comment/2</c> is otherwise the same as function
+          <seealso marker="#comment-1"><c>ct:comment/1</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>continue() -&gt; ok</name>
+      <fsummary>This function must be called to continue after a test
+        case (not executing in a parallel group) has called break/1.</fsummary>
+      <desc><marker id="continue-0"/>
+        <p>This function must be called to continue after a test case
+          (not executing in a parallel group) has called function
+          <seealso marker="#break-1"><c>ct:break/1</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>continue(TestCase) -&gt; ok</name>
+      <fsummary>This function must be called to continue after a test case
+        has called break/2.</fsummary>
+      <type>
+        <v>TestCase = atom()</v>
+      </type>
+      <desc><marker id="continue-1"/>
+        <p>This function must be called to continue after a test case has
+          called <seealso marker="#break-2"><c>ct:break/2</c></seealso>.
+          If the paused test case, <c>TestCase</c>, executes in a parallel
+          group, this function, rather than <c>continue/0</c>, must be used
+          to let the test case proceed.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>decrypt_config_file(EncryptFileName, TargetFileName) -&gt; ok | {error, Reason}</name>
+      <fsummary>Decrypts EncryptFileName, previously generated with
+        encrypt_config_file/2,3.</fsummary>
+      <type>
+        <v>EncryptFileName = string()</v>
+        <v>TargetFileName = string()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="decrypt_config_file-2"/>
+        <p>Decrypts <c>EncryptFileName</c>, previously generated with
+          <seealso marker="#encrypt_config_file-2"><c>ct:encrypt_config_file/2,3</c></seealso>.
+          The original file contents is saved in the target file. The
+          encryption key, a string, must be available in a text file named
+          <c>.ct_config.crypt</c>, either in the current directory, or the
+          home directory of the user (it is searched for in that order).</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile) -&gt; ok | {error, Reason}</name>
+      <fsummary>Decrypts EncryptFileName, previously generated with
+        encrypt_config_file/2,3.</fsummary>
+      <type>
+        <v>EncryptFileName = string()</v>
+        <v>TargetFileName = string()</v>
+        <v>KeyOrFile = {key, string()} | {file, string()}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="decrypt_config_file-3"/>
+        <p>Decrypts <c>EncryptFileName</c>, previously generated with
+          <seealso marker="#encrypt_config_file-2"><c>ct:encrypt_config_file/2,3</c></seealso>.
+          The original file contents is saved in the target file. The key
+          must have the same value as that used for encryption.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>encrypt_config_file(SrcFileName, EncryptFileName) -&gt; ok | {error, Reason}</name>
+      <fsummary>Encrypts the source configuration file with DES3 and saves the
+        result in file EncryptFileName.</fsummary>
+      <type>
+        <v>SrcFileName = string()</v>
+        <v>EncryptFileName = string()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="encrypt_config_file-2"/>
+        <p>Encrypts the source configuration file with DES3 and saves the result
+          in file <c>EncryptFileName</c>. The key, a string, must be
+          available in a text file named <c>.ct_config.crypt</c>, either
+          in the current directory, or the home directory of the user (it
+          is searched for in that order).</p>
+
+        <p>For information about using encrypted configuration files when
+          running tests, see section
+          <seealso marker="config_file_chapter#encrypted_config_files">Encrypted
+          Configuration Files</seealso> in the User's Guide.</p>
+
+        <p>For details on DES3 encryption/decryption, see application
+          <seealso marker="crypto:index"><c>Crypto</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile) -&gt; ok | {error, Reason}</name>
+      <fsummary>Encrypts the source configuration file with DES3 and saves the
+       result in the target file EncryptFileName.</fsummary>
+      <type>
+        <v>SrcFileName = string()</v>
+        <v>EncryptFileName = string()</v>
+        <v>KeyOrFile = {key, string()} | {file, string()}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="encrypt_config_file-3"/>
+        <p>Encrypts the source configuration file with DES3 and saves the result
+          in the target file <c>EncryptFileName</c>. The encryption key
+          to use is either the value in <c>{key,Key}</c> or the value
+          stored in the file specified by <c>{file,File}</c>.</p>
+
+        <p>For information about using encrypted configuration files when
+          running tests, see section
+          <seealso marker="config_file_chapter#encrypted_config_files">Encrypted
+          Configuration Files</seealso> in the User's Guide.</p>
+
+        <p>For details on DES3 encryption/decryption, see application
+          <seealso marker="crypto:index"><c>Crypto</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>fail(Reason) -&gt; ok</name>
+      <fsummary>Terminates a test case with the specified error
+        Reason.</fsummary>
+      <type>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="fail-1"/>
+        <p>Terminates a test case with the specified error <c>Reason</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>fail(Format, Args) -&gt; ok</name>
+      <fsummary>Terminates a test case with an error message specified by
+        a format string and a list of values (used as arguments to
+        io_lib:format/2).</fsummary>
+        <type>
+          <v>Format = string()</v>
+          <v>Args = list()</v>
+       </type>
+      <desc><marker id="fail-2"/>
+        <p>Terminates a test case with an error message specified by a
+          format string and a list of values (used as arguments to
+          <c>io_lib:format/2</c>).</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_config(Required) -&gt; Value</name>
+      <fsummary>Equivalent to get_config(Required, undefined, []).</fsummary>
+      <desc><marker id="get_config-1"/>
+        <p>Equivalent to <seealso marker="#get_config-3"><c>ct:get_config(Required,
+          undefined, [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_config(Required, Default) -&gt; Value</name>
+      <fsummary>Equivalent to get_config(Required, Default, []).</fsummary>
+      <desc><marker id="get_config-2"/>
+        <p>Equivalent to <seealso marker="#get_config-3"><c>ct:get_config(Required,
+          Default, [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_config(Required, Default, Opts) -&gt; ValueOrElement</name>
+      <fsummary>Reads configuration data values.</fsummary>
+      <type>
+        <v>Required = KeyOrName | {KeyOrName, SubKey} | {KeyOrName, SubKey, SubKey}</v>
+        <v>KeyOrName = atom()</v>
+        <v>SubKey = atom()</v>
+        <v>Default = term()</v>
+        <v>Opts = [Opt] | []</v>
+        <v>Opt = element | all</v>
+        <v>ValueOrElement = term() | Default</v>
+      </type>
+      <desc><marker id="get_config-3"/>
+        <p>Reads configuration data values.</p>
+
+        <p>Returns the matching values or configuration elements, given a
+          configuration variable key or its associated name (if one has been
+          specified with
+          <seealso marker="#require-2"><c>ct:require/2</c></seealso>
+          or a <c>require</c> statement).</p>
+
+        <p><em>Example:</em></p>
+
+        <p>Given the following configuration file:</p>
+
+        <pre>
+ {unix,[{telnet,IpAddr},
+        {user,[{username,Username},
+               {password,Password}]}]}.</pre>
+
+        <p>Then:</p>
+
+        <pre>
+ ct:get_config(unix,Default) -&gt; [{telnet,IpAddr}, 
+  {user, [{username,Username}, {password,Password}]}]
+ ct:get_config({unix,telnet},Default) -&gt; IpAddr
+ ct:get_config({unix,user,username},Default) -&gt; Username
+ ct:get_config({unix,ftp},Default) -&gt; Default
+ ct:get_config(unknownkey,Default) -&gt; Default</pre>
+
+        <p>If a configuration variable key has been associated with a name (by
+          <seealso marker="#require-2"><c>ct:require/2</c></seealso>
+          or a <c>require</c> statement), the name can be used instead
+          of the key to read the value:</p>
+
+        <pre>
+ ct:require(myuser,{unix,user}) -&gt; ok.
+ ct:get_config(myuser,Default) -&gt; [{username,Username}, {password,Password}]</pre>
+  
+        <p>If a configuration variable is defined in multiple files, use option
+         <c>all</c> to access all possible values. The values are returned
+          in a list. The order of the elements corresponds to the order
+          that the configuration files were specified at startup.</p>
+
+        <p>If configuration elements (key-value tuples) are to be returned as
+          result instead of values, use option <c>element</c>. The
+          returned elements are then on the form <c>{Required,Value}</c>.</p>
+
+        <p>See also
+          <seealso marker="#get_config-1"><c>ct:get_config/1</c></seealso>,
+          <seealso marker="#get_config-2"><c>ct:get_config/2</c></seealso>,
+          <seealso marker="#require-1"><c>ct:require/1</c></seealso>,
+          <seealso marker="#require-2"><c>ct:require/2</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_event_mgr_ref() -&gt; EvMgrRef</name>
+      <fsummary>Gets a reference to the <c>Common Test</c> event manager.</fsummary>
+        <type>
+          <v>EvMgrRef = atom()</v>
+        </type>
+        <desc><marker id="get_event_mgr_ref-0"/>
+          <p>Gets a reference to the <c>Common Test</c> event manager.
+            The reference can be used to, for example, add a user-specific
+            event handler while tests are running.</p>
+
+          <p><em>Example:</em></p>
+
+          <pre>
+ gen_event:add_handler(ct:get_event_mgr_ref(), my_ev_h, [])</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_status() -&gt; TestStatus | {error, Reason} | no_tests_running</name>
+      <fsummary>Returns status of ongoing test.</fsummary>
+      <type>
+        <v>TestStatus = [StatusElem]</v>
+        <v>StatusElem = {current, TestCaseInfo} | {successful, Successful} | {failed, Failed} | {skipped, Skipped} | {total, Total}</v>
+        <v>TestCaseInfo = {Suite, TestCase} | [{Suite, TestCase}]</v>
+        <v>Suite = atom()</v>
+        <v>TestCase = atom()</v>
+        <v>Successful = integer()</v>
+        <v>Failed = integer()</v>
+        <v>Skipped = {UserSkipped, AutoSkipped}</v>
+        <v>UserSkipped = integer()</v>
+        <v>AutoSkipped = integer()</v>
+        <v>Total = integer()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="get_status-0"/>
+        <p>Returns status of ongoing test. The returned list contains
+          information about which test case is executing (a list of cases
+          when a parallel test case group is executing), as well as
+          counters for successful, failed, skipped, and total test cases
+          so far.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_target_name(Handle) -&gt; {ok, TargetName} | {error, Reason}</name>
+      <fsummary>Returns the name of the target that the specified connection
+        belongs to.</fsummary>
+      <type>
+        <v>Handle = handle()</v>
+        <v>TargetName = target_name()</v>
+      </type>
+      <desc><marker id="get_target_name-1"/>
+        <p>Returns the name of the target that the specified connection
+          belongs to.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_testspec_terms() -&gt; TestSpecTerms | undefined</name>
+      <fsummary>Gets a list of all test specification terms used to
+        configure and run this test.</fsummary>
+      <type>
+        <v>TestSpecTerms = [{Tag, Value}]</v>
+        <v>Value = [term()]</v>
+      </type>
+      <desc><marker id="get_testspec_terms-0"/>
+        <p>Gets a list of all test specification terms used to configure
+          and run this test.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_testspec_terms(Tags) -&gt; TestSpecTerms | undefined</name>
+      <fsummary>Reads one or more terms from the test specification used to
+        configure and run this test.</fsummary>
+      <type>
+        <v>Tags = [Tag] | Tag</v>
+        <v>Tag = atom()</v>
+        <v>TestSpecTerms = [{Tag, Value}] | {Tag, Value}</v>
+        <v>Value = [{Node, term()}] | [term()]</v>
+        <v>Node = atom()</v>
+      </type>
+      <desc><marker id="get_testspec_terms-1"/>
+        <p>Reads one or more terms from the test specification used to
+          configure and run this test. <c>Tag</c> is any valid test
+          specification tag, for example, <c>label</c>, <c>config</c>, or
+          <c>logdir</c>. User-specific terms are also available to read if
+          option <c>allow_user_terms</c> is set.</p>
+        <p>All value tuples returned, except user terms, have the node
+          name as first element.</p>
+        <p>To read test terms, use <c>Tag = tests</c> (rather than
+          <c>suites</c>, <c>groups</c>, or <c>cases</c>). <c>Value</c> is
+          then the list of <em>all</em> tests on the form
+          <c>[{Node,Dir,[{TestSpec,GroupsAndCases1},...]},...]</c>, where
+          <c>GroupsAndCases = [{Group,[Case]}] | [Case]</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_timetrap_info() -&gt; {Time, Scale}</name>
+      <fsummary>Reads information about the timetrap set for the current
+        test case.</fsummary>
+      <type>
+        <v>Time = integer() | infinity</v>
+        <v>Scale = true | false</v>
+      </type>
+     <desc><marker id="get_timetrap_info-0"/>
+        <p>Reads information about the timetrap set for the current test
+          case. <c>Scale</c> indicates if <c>Common Test</c> will attempt
+          to compensate timetraps automatically for runtime delays
+          introduced by, for example, tools like cover.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>install(Opts) -&gt; ok | {error, Reason}</name>
+      <fsummary>Installs configuration files and event handlers.</fsummary>
+      <type>
+        <v>Opts = [Opt]</v>
+        <v>Opt = {config, ConfigFiles} | {event_handler, Modules} | {decrypt, KeyOrFile}</v>
+        <v>ConfigFiles = [ConfigFile]</v>
+        <v>ConfigFile = string()</v>
+        <v>Modules = [atom()]</v>
+        <v>KeyOrFile = {key, Key} | {file, KeyFile}</v>
+        <v>Key = string()</v>
+        <v>KeyFile = string()</v>
+      </type>
+      <desc><marker id="install-1"/>
+        <p>Installs configuration files and event handlers.</p>
+
+        <p>Run this function once before the first test.</p>
+
+        <p><em>Example:</em></p>
+
+        <pre>
+ install([{config,["config_node.ctc","config_user.ctc"]}])</pre>
+
+        <p>This function is automatically run by program <c>ct_run</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>listenv(Telnet) -&gt; [Env]</name>
+      <fsummary>Performs command listenv on the specified Telnet connection
+        and returns the result as a list of key-value pairs.</fsummary>
+      <type>
+        <v>Telnet = term()</v>
+        <v>Env = {Key, Value}</v>
+        <v>Key = string()</v>
+        <v>Value = string()</v>
+      </type>
+      <desc><marker id="listenv-1"/>
+        <p>Performs command <c>listenv</c> on the specified Telnet connection
+          and returns the result as a list of key-value pairs.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>log(Format) -&gt; ok</name>
+      <fsummary>Equivalent to log(default, 50, Format, [], []).</fsummary>
+      <desc><marker id="log-1"/>
+        <p>Equivalent to
+          <seealso marker="#log-5"><c>ct:log(default, 50, Format, [], [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>log(X1, X2) -&gt; ok</name>
+      <fsummary>Equivalent to log(Category, Importance, Format,
+        FormatArgs, []).</fsummary>
+      <type>
+        <v>X1 = Category | Importance | Format</v>
+        <v>X2 = Format | FormatArgs</v>
+      </type>
+      <desc><marker id="log-2"/>
+        <p>Equivalent to <seealso marker="#log-5"><c>ct:log(Category,
+          Importance, Format, FormatArgs, [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>log(X1, X2, X3) -&gt; ok</name>
+      <fsummary>Equivalent to log(Category, Importance, Format,
+        FormatArgs, Opts).</fsummary>
+      <type>
+        <v>X1 = Category | Importance</v>
+        <v>X2 = Importance | Format</v>
+        <v>X3 = Format | FormatArgs | Opts</v>
+      </type>
+      <desc><marker id="log-3"/>
+        <p>Equivalent to <seealso marker="#log-5"><c>ct:log(Category,
+          Importance, Format, FormatArgs, Opts)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>log(X1, X2, X3, X4) -&gt; ok</name>
+      <fsummary>Equivalent to log(Category, Importance, Format,
+        FormatArgs, Opts).</fsummary>
+      <type>
+        <v>X1 = Category | Importance</v>
+        <v>X2 = Importance | Format</v>
+        <v>X3 = Format | FormatArgs</v>
+	<v>X4 = FormatArgs | Opts</v>
+      </type>
+      <desc><marker id="log-4"/>
+        <p>Equivalent to <seealso marker="#log-5"><c>ct:log(Category,
+          Importance, Format, FormatArgs, Opts)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>log(Category, Importance, Format, FormatArgs, Opts) -&gt; ok</name>
+      <fsummary>Prints from a test case to the log file.</fsummary>
+      <type>
+        <v>Category = atom()</v>
+        <v>Importance = integer()</v>
+        <v>Format = string()</v>
+        <v>FormatArgs = list()</v>
+        <v>Opts = [Opt]</v>
+	<v>Opt = no_css | esc_chars</v>
+      </type>
+      <desc><marker id="log-5"/>
+        <p>Prints from a test case to the log file.</p>
+
+        <p>This function is meant for printing a string directly from a
+          test case to the test case log file.</p>
+
+        <p>Default <c>Category</c> is <c>default</c>,
+          default <c>Importance</c> is <c>?STD_IMPORTANCE</c>,
+          and default value for <c>FormatArgs</c> is <c>[]</c>.</p>
+
+        <p>For details on <c>Category</c>, <c>Importance</c> and the <c>no_css</c>
+	option, see section <seealso marker="write_test_chapter#logging">
+	Logging - Categories and Verbosity Levels</seealso> in the User's Guide.</p>
+
+	<p>Common Test will not escape special HTML characters (&lt;, &gt; and &amp;)
+	   in the text printed with this function, unless the <c>esc_chars</c>
+	   option is used.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>make_priv_dir() -&gt; ok | {error, Reason}</name>
+      <fsummary>If the test has been started with option create_priv_dir
+        set to manual_per_tc, in order for the test case to use the private
+        directory, it must first create it by calling this function.</fsummary>
+      <type>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="make_priv_dir-0"/>
+        <p>If the test is started with option <c>create_priv_dir</c>
+          set to <c>manual_per_tc</c>, in order for the test case to use
+          the private directory, it must first create it by calling this
+          function.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>notify(Name, Data) -&gt; ok</name>
+      <fsummary>Sends an asynchronous notification of type Name with Data
+        to the <c>Common Test</c> event manager.</fsummary>
+      <type>
+        <v>Name = atom()</v>
+        <v>Data = term()</v>
+      </type>
+      <desc><marker id="notify-2"/>
+        <p>Sends an asynchronous notification of type <c>Name</c> with
+          <c>Data</c>to the Common Test event manager. This can later be
+          caught by any installed event manager.</p>
+
+        <p>See also
+          <seealso marker="stdlib:gen_event"><c>stdlib:gen_event(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>pal(Format) -&gt; ok</name>
+      <fsummary>Equivalent to pal(default, 50, Format, []).</fsummary>
+      <desc><marker id="pal-1"/>
+        <p>Equivalent to
+          <seealso marker="#pal-4"><c>ct:pal(default, 50, Format,
+            [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>pal(X1, X2) -&gt; ok</name>
+      <fsummary>Equivalent to pal(Category, Importance, Format,
+        FormatArgs).</fsummary>
+      <type>
+        <v>X1 = Category | Importance | Format</v>
+        <v>X2 = Format | FormatArgs</v>
+      </type>
+      <desc><marker id="pal-2"/>
+        <p>Equivalent to <seealso marker="#pal-4"><c>ct:pal(Category,
+          Importance, Format, FormatArgs)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>pal(X1, X2, X3) -&gt; ok</name>
+      <fsummary>Equivalent to pal(Category, Importance, Format,
+        FormatArgs).</fsummary>
+      <type>
+        <v>X1 = Category | Importance</v>
+        <v>X2 = Importance | Format</v>
+        <v>X3 = Format | FormatArgs</v>
+      </type>
+      <desc><marker id="pal-3"/>
+        <p>Equivalent to <seealso marker="#pal-4"><c>ct:pal(Category,
+          Importance, Format, FormatArgs)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>pal(Category, Importance, Format, FormatArgs) -&gt; ok</name>
+      <fsummary>Prints and logs from a test case.</fsummary>
+      <type>
+        <v>Category = atom()</v>
+        <v>Importance = integer()</v>
+        <v>Format = string()</v>
+        <v>FormatArgs = list()</v>
+      </type>
+      <desc><marker id="pal-4"/>
+        <p>Prints and logs from a test case.</p>
+
+        <p>This function is meant for printing a string from a test case,
+          both to the test case log file and to the console.</p>
+
+        <p>Default <c>Category</c> is <c>default</c>,
+          default <c>Importance</c> is <c>?STD_IMPORTANCE</c>,
+          and default value for <c>FormatArgs</c> is <c>[]</c>.</p>
+
+        <p>For details on <c>Category</c> and <c>Importance</c>, see section
+          <seealso marker="write_test_chapter#logging">Logging - Categories
+          and Verbosity Levels</seealso> in the User's Guide.</p>
+
+	<p>Note that special characters in the text (&lt;, &gt; and &amp;) will
+	   be escaped by Common Test before the text is printed to the log
+	   file.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>parse_table(Data) -&gt; {Heading, Table}</name>
+      <fsummary>Parses the printout from an SQL table and returns a list of
+        tuples.</fsummary>
+      <type>
+        <v>Data = [string()]</v>
+        <v>Heading = tuple()</v>
+        <v>Table = [tuple()]</v>
+      </type>
+      <desc><marker id="parse_table-1"/>
+        <p>Parses the printout from an SQL table and returns a list of
+          tuples.</p>
+
+        <p>The printout to parse is typically the result of a <c>select</c>
+          command in SQL. The returned <c>Table</c> is a list of tuples,
+          where each tuple is a row in the table.</p>
+
+        <p><c>Heading</c> is a tuple of strings representing the headings
+          of each column in the table.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>print(Format) -&gt; ok</name>
+      <fsummary>Equivalent to print(default, 50, Format, []).</fsummary>
+      <desc><marker id="print-1"/>
+        <p>Equivalent to <seealso marker="#print-4"><c>ct:print(default,
+        50, Format, [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>print(X1, X2) -&gt; ok</name>
+      <fsummary>Equivalent to print(Category, Importance, Format,
+        FormatArgs).</fsummary>
+      <type>
+        <v>X1 = Category | Importance | Format</v>
+        <v>X2 = Format | FormatArgs</v>
+      </type>
+      <desc><marker id="print-2"/>
+        <p>Equivalent to <seealso marker="#print-4"><c>ct:print(Category,
+          Importance, Format, FormatArgs)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>print(X1, X2, X3) -&gt; ok</name>
+      <fsummary>Equivalent to print(Category, Importance, Format,
+        FormatArgs).</fsummary>
+      <type>
+        <v>X1 = Category | Importance</v>
+        <v>X2 = Importance | Format</v>
+        <v>X3 = Format | FormatArgs</v>
+      </type>
+      <desc><marker id="print-3"/>
+        <p>Equivalent to <seealso marker="#print-4"><c>ct:print(Category,
+          Importance, Format, FormatArgs)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>print(Category, Importance, Format, FormatArgs) -&gt; ok</name>
+      <fsummary>Prints from a test case to the console.</fsummary>
+      <type>
+        <v>Category = atom()</v>
+        <v>Importance = integer()</v>
+        <v>Format = string()</v>
+        <v>FormatArgs = list()</v>
+      </type>
+      <desc><marker id="print-4"/>
+        <p>Prints from a test case to the console.</p>
+
+        <p>This function is meant for printing a string from a test case to
+          the console.</p>
+
+        <p>Default <c>Category</c> is <c>default</c>,
+          default <c>Importance</c> is <c>?STD_IMPORTANCE</c>,
+          and default value for <c>FormatArgs</c> is <c>[]</c>.</p>
+
+        <p>For details on <c>Category</c> and <c>Importance</c>, see section
+          <seealso marker="write_test_chapter#logging">Logging - Categories
+          and Verbosity Levels</seealso> in the User's Guide.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>reload_config(Required) -&gt; ValueOrElement</name>
+      <fsummary>Reloads configuration file containing specified configuration
+        key.</fsummary>
+      <type>
+        <v>Required = KeyOrName | {KeyOrName, SubKey} | {KeyOrName, SubKey, SubKey}</v>
+        <v>KeyOrName = atom()</v>
+        <v>SubKey = atom()</v>
+        <v>ValueOrElement = term()</v>
+      </type>
+      <desc><marker id="reload_config-1"/>
+        <p>Reloads configuration file containing specified configuration key.</p>
+
+        <p>This function updates the configuration data from which the
+          specified configuration variable was read, and returns the (possibly)
+          new value of this variable.</p>
+
+        <p>If some variables were present in the configuration, but are
+          not loaded using this function, they are removed from the
+          configuration table together with their aliases.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>remove_config(Callback, Config) -&gt; ok</name>
+      <fsummary>Removes configuration variables (together with
+        their aliases) that were loaded with specified callback module and
+        configuration string.</fsummary>
+      <type>
+        <v>Callback = atom()</v>
+        <v>Config = string()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="remove_config-2"/>
+        <p>Removes configuration variables (together wih their aliases)
+          that were loaded with specified callback module and configuration
+          string.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>require(Required) -&gt; ok | {error, Reason}</name>
+      <fsummary>Checks if the required configuration is available.</fsummary>
+      <type>
+        <v>Required = Key | {Key, SubKeys} | {Key, SubKey, SubKeys}</v>
+        <v>Key = atom()</v>
+        <v>SubKeys = SubKey | [SubKey]</v>
+        <v>SubKey = atom()</v>
+      </type>
+      <desc><marker id="require-1"/>
+        <p>Checks if the required configuration is available. Arbitrarily
+          deep tuples can be specified as <c>Required</c>. Only the last
+          element of the tuple can be a list of <c>SubKey</c>s.</p>
+
+        <p><em>Example 1.</em> Require the variable <c>myvar</c>:</p>
+
+        <pre>
+ ok = ct:require(myvar).</pre>
+ 
+        <p>In this case the configuration file must at least contain:</p>
+
+        <pre>
+ {myvar,Value}.</pre>
+  
+        <p><em>Example 2.</em> Require key <c>myvar</c> with subkeys
+          <c>sub1</c> and <c>sub2</c>:</p>
+
+        <pre>
+ ok = ct:require({myvar,[sub1,sub2]}).</pre>
+
+        <p>In this case the configuration file must at least contain:</p>
+
+        <pre>
+ {myvar,[{sub1,Value},{sub2,Value}]}.</pre>
+
+        <p><em>Example 3.</em> Require key <c>myvar</c> with subkey
+          <c>sub1</c> with <c>subsub1</c>:</p>
+
+        <pre>
+ ok = ct:require({myvar,sub1,sub2}).</pre>
+
+        <p>In this case the configuration file must at least contain:</p>
+
+        <pre>
+ {myvar,[{sub1,[{sub2,Value}]}]}.</pre>
+
+        <p>See also
+          <seealso marker="#get_config-1"><c>ct:get_config/1</c></seealso>,
+          <seealso marker="#get_config-2"><c>ct:get_config/2</c></seealso>,
+          <seealso marker="#get_config-3"><c>ct:get_config/3</c></seealso>,
+          <seealso marker="#require-2"><c>ct:require/2</c></seealso>.</p>
+        </desc>
+    </func>
+
+    <func>
+      <name>require(Name, Required) -&gt; ok | {error, Reason}</name>
+      <fsummary>Checks if the required configuration is available and gives
+        it a name.</fsummary>
+      <type>
+        <v>Name = atom()</v>
+        <v>Required = Key | {Key, SubKey} | {Key, SubKey, SubKey}</v>
+        <v>SubKey = Key</v>
+        <v>Key = atom()</v>
+      </type>
+      <desc><marker id="require-2"/>
+        <p>Checks if the required configuration is available and gives it a
+          name. The semantics for <c>Required</c> is the same as in
+          <seealso marker="#require-1"><c>ct:require/1</c></seealso> except
+          that a list of <c>SubKey</c>s cannot be specified.</p>
+
+       <p>If the requested data is available, the subentry is associated
+         with <c>Name</c> so that the value of the element can be read with
+         <seealso marker="#get_config-1"><c>ct:get_config/1,2</c></seealso>
+         provided <c>Name</c> is used instead of the whole <c>Required</c>
+         term.</p>
+
+       <p><em>Example:</em></p>
+
+       <p>Require one node with a Telnet connection and an FTP connection.
+         Name the node <c>a</c>:</p>
+
+       <pre>
+ ok = ct:require(a,{machine,node}).</pre>
+
+        <p>All references to this node can then use the node name. For
+          example, a file over FTP is fetched like follows:</p>
+
+        <pre>
+ ok = ct:ftp_get(a,RemoteFile,LocalFile).</pre>
+
+        <p>For this to work, the configuration file must at least contain:</p>
+
+        <pre>
+ {machine,[{node,[{telnet,IpAddr},{ftp,IpAddr}]}]}.</pre>
+
+        <note><p>The behavior of this function changed radically in
+          <c>Common Test</c> 1.6.2. To keep some backwards compatability,
+          it is still possible to do:<br/>
+          <c>ct:require(a,{node,[telnet,ftp]}).</c><br/>
+          This associates the name <c>a</c> with the top-level <c>node</c>
+          entry. For this to work, the configuration file must at least
+          contain:<br/>
+          <c>{node,[{telnet,IpAddr},{ftp,IpAddr}]}.</c></p>
+        </note>
+
+        <p>See also
+          <seealso marker="#get_config-1"><c>ct:get_config/1</c></seealso>,
+          <seealso marker="#get_config-2"><c>ct:get_config/2</c></seealso>,
+          <seealso marker="#get_config-3"><c>ct:get_config/3</c></seealso>,
+          <seealso marker="#require-1"><c>ct:require/1</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>run(TestDirs) -&gt; Result</name>
+      <fsummary>Runs all test cases in all suites in the specified
+        directories.</fsummary>
+      <type>
+        <v>TestDirs = TestDir | [TestDir]</v>
+      </type>
+      <desc><marker id="run-1"/>
+        <p>Runs all test cases in all suites in the specified directories.</p>
+
+        <p>See also <seealso marker="#run-3"><c>ct:run/3</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>run(TestDir, Suite) -&gt; Result</name>
+      <fsummary>Runs all test cases in the specified suite.</fsummary>
+      <desc><marker id="run-2"/>
+        <p>Runs all test cases in the specified suite.</p>
+
+        <p>See also <seealso marker="#run-3"><c>ct:run/3</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>run(TestDir, Suite, Cases) -&gt; Result</name>
+      <fsummary>Runs the specified test cases.</fsummary>
+      <type>
+        <v>TestDir = string()</v>
+        <v>Suite = atom()</v>
+        <v>Cases = atom() | [atom()]</v>
+        <v>Result = [TestResult] | {error, Reason}</v>
+      </type>
+      <desc><marker id="run-3"/>
+        <p>Runs the specified test cases.</p>
+
+        <p>Requires that
+          <seealso marker="#install-1"><c>ct:install/1</c></seealso> has been
+            run first.</p>
+
+        <p>Suites (<c>*_SUITE.erl</c>) files must be stored in <c>TestDir</c>
+          or <c>TestDir/test</c>. All suites are compiled when the test is
+          run.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>run_test(Opts) -&gt; Result</name>
+      <fsummary>Runs tests as specified by the combination of options in
+        Opts.</fsummary>
+      <type>
+        <v>Opts = [OptTuples]</v>
+        <v>OptTuples = {dir, TestDirs} | {suite, Suites} | {group, Groups} | {testcase, Cases} | {spec, TestSpecs} | {join_specs, Bool} | {label, Label} | {config, CfgFiles} | {userconfig, UserConfig} | {allow_user_terms, Bool} | {logdir, LogDir} | {silent_connections, Conns} | {stylesheet, CSSFile} | {cover, CoverSpecFile} | {cover_stop, Bool} | {step, StepOpts} | {event_handler, EventHandlers} | {include, InclDirs} | {auto_compile, Bool} | {abort_if_missing_suites, Bool} | {create_priv_dir, CreatePrivDir} | {multiply_timetraps, M} | {scale_timetraps, Bool} | {repeat, N} | {duration, DurTime} | {until, StopTime} | {force_stop, ForceStop} | {decrypt, DecryptKeyOrFile} | {refresh_logs, LogDir} | {logopts, LogOpts} | {verbosity, VLevels} | {basic_html, Bool} | {ct_hooks, CTHs} | {enable_builtin_hooks, Bool} | {release_shell, Bool}</v>
+        <v>TestDirs = [string()] | string()</v>
+        <v>Suites = [string()] | [atom()] | string() | atom()</v>
+        <v>Cases = [atom()] | atom()</v>
+        <v>Groups = GroupNameOrPath | [GroupNameOrPath]</v>
+        <v>GroupNameOrPath = [atom()] | atom() | all</v>
+        <v>TestSpecs = [string()] | string()</v>
+        <v>Label = string() | atom()</v>
+        <v>CfgFiles = [string()] | string()</v>
+        <v>UserConfig = [{CallbackMod, CfgStrings}] | {CallbackMod, CfgStrings}</v>
+        <v>CallbackMod = atom()</v>
+        <v>CfgStrings = [string()] | string()</v>
+        <v>LogDir = string()</v>
+        <v>Conns = all | [atom()]</v>
+        <v>CSSFile = string()</v>
+        <v>CoverSpecFile = string()</v>
+        <v>StepOpts = [StepOpt] | []</v>
+        <v>StepOpt = config | keep_inactive</v>
+        <v>EventHandlers = EH | [EH]</v>
+        <v>EH = atom() | {atom(), InitArgs} | {[atom()], InitArgs}</v>
+        <v>InitArgs = [term()]</v>
+        <v>InclDirs = [string()] | string()</v>
+        <v>CreatePrivDir = auto_per_run | auto_per_tc | manual_per_tc</v>
+        <v>M = integer()</v>
+        <v>N = integer()</v>
+        <v>DurTime = string(HHMMSS)</v>
+        <v>StopTime = string(YYMoMoDDHHMMSS) | string(HHMMSS)</v>
+        <v>ForceStop = skip_rest | Bool</v>
+        <v>DecryptKeyOrFile = {key, DecryptKey} | {file, DecryptFile}</v>
+        <v>DecryptKey = string()</v>
+        <v>DecryptFile = string()</v>
+        <v>LogOpts = [LogOpt]</v>
+        <v>LogOpt = no_nl | no_src</v>
+        <v>VLevels = VLevel | [{Category, VLevel}]</v>
+        <v>VLevel = integer()</v>
+        <v>Category = atom()</v>
+        <v>CTHs = [CTHModule | {CTHModule, CTHInitArgs}]</v>
+        <v>CTHModule = atom()</v>
+        <v>CTHInitArgs = term()</v>
+        <v>Result = {Ok, Failed, {UserSkipped, AutoSkipped}} | TestRunnerPid | {error, Reason}</v>
+        <v>Ok = integer()</v>
+        <v>Failed = integer()</v>
+        <v>UserSkipped = integer()</v>
+        <v>AutoSkipped = integer()</v>
+        <v>TestRunnerPid = pid()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="run_test-1"/>
+        <p>Runs tests as specified by the combination of options in
+          <c>Opts</c>. The options are the same as those used with program
+          <c>ct_run</c>, see <seealso marker="ct_run#ct_run">Run Tests from
+          Command Line</seealso> in the <c>ct_run</c> manual page.</p>
+        <p>Here a <c>TestDir</c> can be used to point out the path to a
+          <c>Suite</c>. Option <c>testcase</c> corresponds to option
+          <c>-case</c> in program <c>ct_run</c>. Configuration files
+          specified in <c>Opts</c> are installed automatically at startup.</p>
+
+        <p><c>TestRunnerPid</c> is returned if <c>release_shell == true</c>.
+          For details, see
+          <seealso marker="#break-1"><c>ct:break/1</c></seealso>.</p>
+
+        <p><c>Reason</c> indicates the type of error encountered.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>run_testspec(TestSpec) -&gt; Result</name>
+      <fsummary>Runs a test specified by TestSpec.</fsummary>
+      <type>
+        <v>TestSpec = [term()]</v>
+        <v>Result = {Ok, Failed, {UserSkipped, AutoSkipped}} | {error, Reason}</v>
+        <v>Ok = integer()</v>
+        <v>Failed = integer()</v>
+        <v>UserSkipped = integer()</v>
+        <v>AutoSkipped = integer()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="run_testspec-1"/>
+        <p>Runs a test specified by <c>TestSpec</c>. The same terms are used
+          as in test specification files.</p>
+
+        <p><c>Reason</c> indicates the type of error encountered.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>sleep(Time) -&gt; ok</name>
+      <fsummary>This function, similar to timer:sleep/1, suspends the
+        test case for a specified time.</fsummary>
+      <type>
+        <v>Time = {hours, Hours} | {minutes, Mins} | {seconds, Secs} | Millisecs | infinity</v>
+        <v>Hours = integer()</v>
+        <v>Mins = integer()</v>
+        <v>Secs = integer()</v>
+        <v>Millisecs = integer() | float()</v>
+      </type>
+      <desc><marker id="sleep-1"/>
+        <p>This function, similar to <c>timer:sleep/1</c> in <c>STDLIB</c>, 
+          suspends the test case for a specified time.
+          However, this function also multiplies <c>Time</c> with the
+          <c>multiply_timetraps</c> value (if set) and under certain
+          circumstances also scales up the time automatically if
+          <c>scale_timetraps</c> is set to <c>true</c> (default is
+          <c>false</c>).</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>start_interactive() -&gt; ok</name>
+      <fsummary>Starts <c>Common Test</c> in interactive mode.</fsummary>
+      <desc><marker id="start_interactive-0"/>
+        <p>Starts <c>Common Test</c> in interactive mode.</p>
+
+        <p>From this mode, all test case support functions can be executed
+          directly from the Erlang shell. The interactive mode can also be
+          started from the OS command line with <c>ct_run -shell
+          [-config File...]</c>.</p>
+
+        <p>If any functions (for example, Telnet or FTP) using
+          "required configuration data" are to be called from the Erlang shell,
+          configuration data must first be required with
+          <seealso marker="#require-2"><c>ct:require/2</c></seealso>.</p>
+
+        <p><em>Example:</em></p>
+
+        <pre>
+ &gt; ct:require(unix_telnet, unix).
+ ok
+ &gt; ct_telnet:open(unix_telnet).
+ {ok,&lt;0.105.0&gt;}
+ &gt; ct_telnet:cmd(unix_telnet, "ls .").
+ {ok,["ls","file1  ...",...]}</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name>step(TestDir, Suite, Case) -&gt; Result</name>
+      <fsummary>Steps through a test case with the debugger.</fsummary>
+      <type>
+        <v>Case = atom()</v>
+      </type>
+      <desc><marker id="step-3"/>
+        <p>Steps through a test case with the debugger.</p>
+
+        <p>See also <seealso marker="#run-3"><c>ct:run/3</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>step(TestDir, Suite, Case, Opts) -&gt; Result</name>
+      <fsummary>Steps through a test case with the debugger.</fsummary>
+      <type>
+        <v>Case = atom()</v>
+        <v>Opts = [Opt] | []</v>
+        <v>Opt = config | keep_inactive</v>
+      </type>
+      <desc><marker id="step-4"/>
+        <p>Steps through a test case with the debugger. If option
+          <c>config</c> has been specifed, breakpoints are also set on
+          the configuration functions in <c>Suite</c>.</p>
+
+        <p>See also <seealso marker="#run-3"><c>ct:run/3</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>stop_interactive() -&gt; ok</name>
+      <fsummary>Exits the interactive mode.</fsummary>
+      <desc><marker id="stop_interactive-0"/>
+        <p>Exits the interactive mode.</p>
+
+        <p>See also
+          <seealso marker="#start_interactive-0"><c>ct:start_interactive/0</c></seealso>.
+        </p>
+      </desc>
+    </func>
+
+    <func>
+      <name>sync_notify(Name, Data) -&gt; ok</name>
+      <fsummary>Sends a synchronous notification of type Name with Data to
+        the <c>Common Test</c> event manager.</fsummary>
+      <type>
+        <v>Name = atom()</v>
+        <v>Data = term()</v>
+      </type>
+      <desc><marker id="sync_notify-2"/>
+        <p>Sends a synchronous notification of type <c>Name</c> with
+          <c>Data</c> to the <c>Common Test</c> event manager. This can later be
+          caught by any installed event manager.</p>
+
+        <p>See also
+          <seealso marker="stdlib:gen_event"><c>stdlib:gen_event(3)</c></seealso>.
+        </p>
+      </desc>
+    </func>
+
+    <func>
+      <name>testcases(TestDir, Suite) -&gt; Testcases | {error, Reason}</name>
+      <fsummary>Returns all test cases in the specified suite.</fsummary>
+      <type>
+        <v>TestDir = string()</v>
+        <v>Suite = atom()</v>
+        <v>Testcases = list()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="testcases-2"/>
+        <p>Returns all test cases in the specified suite.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>timetrap(Time) -&gt; ok</name>
+      <fsummary>Sets a new timetrap for the running test case.</fsummary>
+      <type>
+        <v>Time = {hours, Hours} | {minutes, Mins} | {seconds, Secs} | Millisecs | infinity | Func</v>
+        <v>Hours = integer()</v>
+        <v>Mins = integer()</v>
+        <v>Secs = integer()</v>
+        <v>Millisecs = integer() | float()</v>
+        <v>Func = {M, F, A} | function()</v>
+        <v>M = atom()</v>
+        <v>F = atom()</v>
+        <v>A = list()</v>
+      </type>
+      <desc><marker id="timetrap-1"/>
+        <p>Sets a new timetrap for the running test case.</p>
+
+        <p>If the argument is <c>Func</c>, the timetrap is triggered when
+          this function returns. <c>Func</c> can also return a new
+          <c>Time</c> value, which in that case is the value for the new
+          timetrap.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>userdata(TestDir, Suite) -&gt; SuiteUserData | {error, Reason}</name>
+      <fsummary>Returns any data specified with tag userdata in the list of
+        tuples returned from Suite:suite/0.</fsummary>
+      <type>
+        <v>TestDir = string()</v>
+        <v>Suite = atom()</v>
+        <v>SuiteUserData = [term()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="userdata-2"/>
+        <p>Returns any data specified with tag <c>userdata</c> in the list
+          of tuples returned from
+          <seealso marker="common_test#Module:suite-0"><c>suite/0</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>userdata(TestDir, Suite, Case::GroupOrCase) -&gt; TCUserData | {error, Reason}</name>
+      <fsummary>Returns any data specified with tag userdata in the list of
+        tuples returned from Suite:group(GroupName) or Suite:Case().</fsummary>
+      <type>
+        <v>TestDir = string()</v>
+        <v>Suite = atom()</v>
+        <v>GroupOrCase = {group, GroupName} | atom()</v>
+        <v>GroupName = atom()</v>
+        <v>TCUserData = [term()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="userdata-3"/>
+        <p>Returns any data specified with tag <c>userdata</c> in the list
+          of tuples returned from <c>Suite:group(GroupName)</c> or
+          <c>Suite:Case()</c>.</p>
+      </desc>
+    </func>
+  </funcs>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/ct_cover.xml b/lib/common_test/doc/src/ct_cover.xml
new file mode 100644
index 0000000000..be09c08a68
--- /dev/null
+++ b/lib/common_test/doc/src/ct_cover.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2010</year><year>2012</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+
+    </legalnotice>
+
+    <title>ct_cover</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>ct_cover.xml</file>
+  </header>
+  <module>ct_cover</module>
+  <modulesummary>Common Test framework code coverage support module.
+  </modulesummary>
+
+<description>
+
+    <p><c>Common Test</c> framework code coverage support module.</p>
+
+    <p>This module exports help functions for performing code coverage
+      analysis.</p>
+
+</description>
+
+  <funcs>
+    <func>
+    <name>add_nodes(Nodes) -&gt; {ok, StartedNodes} | {error, Reason}</name>
+    <fsummary>Adds nodes to current cover test (only works if cover support
+      is active).</fsummary>
+      <type>
+        <v>Nodes = [atom()]</v>
+        <v>StartedNodes = [atom()]</v>
+        <v>Reason = cover_not_running | not_main_node</v>
+      </type>
+      <desc><marker id="add_nodes-1"/>
+        <p>Adds nodes to current cover test. Notice that this only works if
+          cover support is active.</p>
+
+        <p>To have effect, this function is to be called from
+          <c>init_per_suite/1</c> (see
+          <seealso marker="common_test"><c>common_test</c></seealso>)
+          before any tests are performed.</p>
+      </desc>
+    </func>
+
+    <func>
+    <name>cross_cover_analyse(Level, Tests) -&gt; ok</name>
+    <fsummary>Accumulates cover results over multiple tests.</fsummary>
+      <type>
+        <v>Level = overview | details</v>
+        <v>Tests = [{Tag, Dir}]</v>
+        <v>Tag = atom()</v>
+        <v>Dir = string()</v>
+      </type>
+      <desc><marker id="cross_cover_analyse-2"/>
+        <p>Accumulates cover results over multiple tests. See section
+          <seealso marker="cover_chapter#cross_cover">Cross Cover
+          Analysis</seealso> in the Users's Guide.</p>
+      </desc>
+    </func>
+
+    <func>
+    <name>remove_nodes(Nodes) -&gt; ok | {error, Reason}</name>
+    <fsummary>Removes nodes from the current cover test.</fsummary>
+      <type>
+        <v>Nodes = [atom()]</v>
+        <v>Reason = cover_not_running | not_main_node</v>
+      </type>
+      <desc><marker id="remove_nodes-1"/>
+        <p>Removes nodes from the current cover test.</p>
+
+        <p>Call this function to stop cover test on nodes previously
+          added with
+          <seealso marker="#add_nodes-1"><c>ct_cover:add_nodes/1</c></seealso>.
+          Results on the remote node are transferred to the <c>Common Test</c>
+          node.</p>
+      </desc>
+    </func>
+  </funcs>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/ct_ftp.xml b/lib/common_test/doc/src/ct_ftp.xml
new file mode 100644
index 0000000000..0598dcbe3e
--- /dev/null
+++ b/lib/common_test/doc/src/ct_ftp.xml
@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2010</year><year>2012</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+
+    </legalnotice>
+
+    <title>ct_ftp</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>ct_ftp.xml</file>
+  </header>
+  <module>ct_ftp</module>
+  <modulesummary>FTP client module (based on the FTP support of the Inets
+    application).</modulesummary>
+
+  <description>
+
+    <p>FTP client module (based on the FTP support of the <c>Inets</c>
+      application).</p>
+
+  </description>
+
+  <section>
+    <title>Data Types</title>
+    <marker id="types"/>
+    <taglist>
+      <tag><c>connection() = handle() | target_name()</c></tag>
+        <item><marker id="type-connection"/>
+          <p>For <c>target_name</c>, see module
+            <seealso marker="ct"><c>ct</c></seealso>.</p></item>
+
+      <tag><c>handle() = handle()</c></tag>
+        <item><marker id="type-handle"/>
+          <p>Handle for a specific FTP connection, see module
+            <seealso marker="ct"><c>ct</c></seealso>.</p></item>
+    </taglist>
+  </section>
+
+  <funcs>
+    <func>
+      <name>cd(Connection, Dir) -&gt; ok | {error, Reason}</name>
+      <fsummary>Changes directory on remote host.</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+        <v>Dir = string()</v>
+      </type>
+      <desc><marker id="cd-2"/>
+        <p>Changes directory on remote host.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>close(Connection) -&gt; ok | {error, Reason}</name>
+      <fsummary>Closes the FTP connection.</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+      </type>
+      <desc><marker id="close-1"/>
+        <p>Closes the FTP connection.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>delete(Connection, File) -&gt; ok | {error, Reason}</name>
+      <fsummary>Deletes a file on remote host.</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+        <v>File = string()</v>
+      </type>
+      <desc><marker id="delete-2"/>
+        <p>Deletes a file on remote host.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get(KeyOrName, RemoteFile, LocalFile) -&gt; ok | {error, Reason}</name>
+      <fsummary>Opens an FTP connection and fetches a file from the remote
+        host.</fsummary>
+      <type>
+        <v>KeyOrName = Key | Name</v>
+        <v>Key = atom()</v>
+        <v>Name = target_name()</v>
+        <v>RemoteFile = string()</v>
+        <v>LocalFile = string()</v>
+      </type>
+      <desc><marker id="get-3"/>
+        <p>Opens an FTP connection and fetches a file from the remote
+          host.</p>
+
+        <p><c>RemoteFile</c> and <c>LocalFile</c> must be absolute paths.</p>
+
+        <p>The configuration file must be as for
+          <seealso marker="#put-3"><c>ct_ftp:put/3</c></seealso>.</p>
+
+        <p>For <c>target_name</c>, see module
+          <seealso marker="ct"><c>ct</c></seealso>.</p>
+
+        <p>See also
+          <seealso marker="ct#require-2"><c>ct:require/2</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>ls(Connection, Dir) -&gt; {ok, Listing} | {error, Reason}</name>
+      <fsummary>Lists directory Dir.</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+        <v>Dir = string()</v>
+        <v>Listing = string()</v>
+      </type>
+      <desc><marker id="ls-2"/>
+        <p>Lists directory <c>Dir</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>open(KeyOrName) -&gt; {ok, Handle} | {error, Reason}</name>
+      <fsummary>Opens an FTP connection to the specified node.</fsummary>
+      <type>
+        <v>KeyOrName = Key | Name</v>
+        <v>Key = atom()</v>
+        <v>Name = target_name()</v>
+        <v>Handle = handle()</v>
+      </type>
+      <desc><marker id="open-1"/>
+        <p>Opens an FTP connection to the specified node.</p>
+
+        <p>You can open a connection for a particular <c>Name</c> and use the
+          same name as reference for all following subsequent operations.
+          If you want
+          the connection to be associated with <c>Handle</c> instead (if you,
+          for example, need to open multiple connections to a host), use
+          <c>Key</c>, the configuration variable name, to specify the target.
+          A connection without an associated target name can only be closed
+          with the handle value.</p>
+
+        <p>For information on how to create a new <c>Name</c>, see
+          <seealso marker="ct#require-2"><c>ct:require/2</c></seealso>.</p>
+
+        <p>For <c>target_name</c>, see module
+          <seealso marker="ct"><c>ct</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>put(KeyOrName, LocalFile, RemoteFile) -&gt; ok | {error, Reason}</name>
+      <fsummary>Opens an FTP connection and sends a file to the remote
+        host.</fsummary>
+      <type>
+        <v>KeyOrName = Key | Name</v>
+        <v>Key = atom()</v>
+        <v>Name = target_name()</v>
+        <v>LocalFile = string()</v>
+        <v>RemoteFile = string()</v>
+      </type>
+      <desc><marker id="put-3"/>
+        <p>Opens an FTP connection and sends a file to the remote host.</p>
+
+        <p><c>LocalFile</c> and <c>RemoteFile</c> must be absolute paths.</p>
+
+        <p>For <c>target_name</c>, see module
+          <seealso marker="ct"><c>ct</c></seealso>.</p>
+
+        <p>If the target host is a "special" node, the FTP address must be
+          specified in the configuration file as follows:</p>
+
+        <pre>
+ {node,[{ftp,IpAddr}]}.</pre>
+
+        <p>If the target host is something else, for example, a UNIX host,
+          the configuration file must also include the username and password
+          (both strings):</p>
+
+        <pre>
+ {unix,[{ftp,IpAddr},
+        {username,Username},
+        {password,Password}]}.</pre>
+
+        <p>See also
+          <seealso marker="ct#require-2"><c>ct:require/2</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>recv(Connection, RemoteFile) -&gt; ok | {error, Reason}</name>
+      <fsummary>Fetches a file over FTP.</fsummary>
+      <desc><marker id="recv-2"/>
+        <p>Fetches a file over FTP.</p>
+
+        <p>The file gets the same name on the local host.</p>
+
+        <p>See also <seealso marker="#recv-3"><c>ct_ftp:recv/3</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>recv(Connection, RemoteFile, LocalFile) -&gt; ok | {error, Reason}</name>
+      <fsummary>Fetches a file over FTP.</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+        <v>RemoteFile = string()</v>
+        <v>LocalFile = string()</v>
+      </type>
+      <desc><marker id="recv-3"/>
+        <p>Fetches a file over FTP.</p>
+
+        <p>The file is named <c>LocalFile</c> on the local host.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send(Connection, LocalFile) -&gt; ok | {error, Reason}</name>
+      <fsummary>Sends a file over FTP.</fsummary>
+      <desc><marker id="send-2"/>
+        <p>Sends a file over FTP.</p>
+
+        <p>The file gets the same name on the remote host.</p>
+
+        <p>See also
+          <seealso marker="#send-3"><c>ct_ftp:send/3</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send(Connection, LocalFile, RemoteFile) -&gt; ok | {error, Reason}</name>
+      <fsummary>Sends a file over FTP.</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+        <v>LocalFile = string()</v>
+        <v>RemoteFile = string()</v>
+      </type>
+      <desc><marker id="send-3"/>
+        <p>Sends a file over FTP.</p>
+
+        <p>The file is named <c>RemoteFile</c> on the remote host.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>type(Connection, Type) -&gt; ok | {error, Reason}</name>
+      <fsummary>Changes the file transfer type.</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+        <v>Type = ascii | binary</v>
+      </type>
+      <desc><marker id="type-2"/>
+        <p>Changes the file transfer type.</p>
+      </desc>
+    </func>
+  </funcs>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/ct_hooks.xml b/lib/common_test/doc/src/ct_hooks.xml
index a9f9450dd7..12ec3bcec3 100644
--- a/lib/common_test/doc/src/ct_hooks.xml
+++ b/lib/common_test/doc/src/ct_hooks.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -12,7 +11,7 @@
       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
@@ -34,539 +33,572 @@
     <file>ct_hooks.sgml</file>
   </header>
   <module>ct_hooks</module> 
-  <modulesummary>A callback interface on top of Common Test</modulesummary>
+  <modulesummary>A callback interface on top of Common Test.</modulesummary>
 
   <description>
 
-    <p>The <em>Common Test Hook</em> (henceforth called CTH) framework allows 
-      extensions of the default behaviour of Common Test by means of callbacks 
-      before and after all test suite calls. It is meant for advanced users of
-      Common Test which want to abstract out behaviour which is common to
-      multiple test suites. </p>
+    <p>The <em>Common Test Hook (CTH)</em> framework allows extensions of the
+      default behavior of <c>Common Test</c> by callbacks before and after all
+      test suite calls. It is intended for advanced users of <c>Common Test</c>
+      who want to abstract out behavior that is common to multiple test suites.
+    </p>
 
-    <p>In brief, Common Test Hooks allows you to:</p>
+    <p>In brief, CTH allows you to:</p>
 
-    <list>
-      <item>Manipulate the runtime config before each suite 
-      configuration call</item>
-      <item>Manipulate the return of all suite configuration calls and in 
-      extension the result of the test themselves.</item>
+    <list type="bulleted">
+      <item><p>Manipulate the runtime configuration before each suite
+        configuration call.</p></item>
+      <item><p>Manipulate the return of all suite configuration calls and by
+        extension the result of the test themselves.</p></item>
     </list>
     
     <p>The following sections describe the mandatory and optional CTH
-    functions Common Test will call during test execution. For more details
-    see <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso> in 
-    the User's Guide.</p>
+      functions that <c>Common Test</c> calls during test execution.
+      For more details, see section
+      <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso> in the
+      User's Guide.</p>
 
-    <p>For information about how to add a CTH to your suite see 
-    <seealso marker="ct_hooks_chapter#installing">Installing a CTH
-    </seealso> in the User's Guide.</p>
+    <p>For information about how to add a CTH to your suite, see section
+      <seealso marker="ct_hooks_chapter#installing">Installing a CTH</seealso>
+      in the User's Guide.</p>
+
+    <note><p>For a minimal example of a CTH, see section
+      <seealso marker="ct_hooks_chapter#example">Example CTH</seealso>
+      in the User's Guide.</p></note>
 
-    <note><p>See the
-	<seealso marker="ct_hooks_chapter#example">Example CTH</seealso>
-	in the User's Guide for a minimal example of a CTH. </p></note>
-    
   </description>
 
   <section>
-    <title>CALLBACK FUNCTIONS</title>
-    <p>The following functions define the callback interface
-      for a Common Test Hook.</p>
+    <title>Callback Functions</title>
+    <p>The following functions define the callback interface for a CTH.</p>
   </section>
   
   <funcs>
     <func>
-      <name>Module:init(Id, Opts) -&gt; {ok, State} | 
-      {ok, State, Priority}</name>
-      <fsummary>Initiates the Common Test Hook</fsummary>
+      <name>Module:init(Id, Opts) -&gt; {ok, State} | {ok, State, Priority}</name>
+      <fsummary>Initiates the Common Test Hook.</fsummary>
       <type>
-	<v>Id = reference() | term()</v>
-	<v>Opts = term()</v>
-	<v>State = term()</v>
-	<v>Priority = integer()</v>
+        <v>Id = reference() | term()</v>
+        <v>Opts = term()</v>
+        <v>State = term()</v>
+        <v>Priority = integer()</v>
       </type>
-      
       <desc>	
-	<p> MANDATORY </p>
-
-	<p>Always called before any other callback function. 
-	  Use this to initiate any common state. 
-	  It should return a state for this CTH.</p>
-
-	<p><c>Id</c> is the return value of 
-	  <seealso marker="#Module:id-1">id/1</seealso>, or a <c>reference</c>
-	  (created using 
-	  <seealso marker="erts:erlang#make_ref-0">make_ref/0</seealso>)
-	  if <seealso marker="#Module:id-1">id/1</seealso> is not implemented.
-	</p>
-
-	<p><c>Priority</c> is the relative priority of this hook. Hooks with a
-	lower priority will be executed first. If no priority is given, 
-	it will be set to 0. </p>
-
-	<p>For details about when init is called see
-	  <seealso marker="ct_hooks_chapter#scope">scope</seealso>
-	  in the User's Guide.</p>
-	      
+        <p>MANDATORY</p>
+
+        <p>This function is always called before any other callback function.
+          Use it to initiate any common state. It is to return a state for
+          this CTH.</p>
+
+        <p><c>Id</c> is either the return value of
+          <seealso marker="#Module:id-1"><c>ct_hooks:id/1</c></seealso>,
+          or a <c>reference</c> (created using
+          <seealso marker="erts:erlang#make_ref-0">erlang:make_ref/0</seealso>
+          in <c>ERTS</c>) if
+          <seealso marker="#Module:id-1"><c>ct_hooks:id/1</c></seealso>
+          is not implemented.</p>
+
+        <p><c>Priority</c> is the relative priority of this hook. Hooks with a
+          lower priority are executed first. If no priority is specified, it 
+          is set to <c>0</c>.</p>
+
+        <p>For details about when <c>init</c> is called, see section
+          <seealso marker="ct_hooks_chapter#scope">CTH Scope</seealso>
+          in the User's Guide.</p>    
       </desc>
     </func>
 
     <func>
-      <name>Module:pre_init_per_suite(SuiteName, InitData, CTHState) -&gt;
-              Result</name>
-      <fsummary>Called before init_per_suite</fsummary>
+      <name>Module:pre_init_per_suite(SuiteName, InitData, CTHState) -&gt; Result</name>
+      <fsummary>Called before init_per_suite.</fsummary>
       <type>
-	<v>SuiteName = atom()</v>
-	<v>InitData = Config | SkipOrFail</v>
-	<v>Config = NewConfig = [{Key,Value}]</v>
-	<v>CTHState = NewCTHState = term()</v>
-	<v>Result = {Return, NewCTHState}</v>
-	<v>Return = NewConfig | SkipOrFail</v>
-	<v>SkipOrFail = {fail, Reason} | {skip, Reason}</v>
-	<v>Key = atom()</v>
-	<v>Value = term()</v>
-	<v>Reason = term()</v>
+        <v>SuiteName = atom()</v>
+        <v>InitData = Config | SkipOrFail</v>
+        <v>Config = NewConfig = [{Key,Value}]</v>
+        <v>CTHState = NewCTHState = term()</v>
+        <v>Result = {Return, NewCTHState}</v>
+        <v>Return = NewConfig | SkipOrFail</v>
+        <v>SkipOrFail = {fail, Reason} | {skip, Reason}</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+        <v>Reason = term()</v>
       </type>
-      
       <desc>	
-	<p> OPTIONAL </p>
-
-	<p>This function is called before 
-	<seealso marker="common_test#Module:init_per_suite-1">
-	  init_per_suite</seealso> if it exists. 
-	It typically contains initialization/logging which needs to be done 
-	before init_per_suite is called. 
-	If <c>{skip,Reason}</c> or <c>{fail,Reason}</c> is returned, 
-	init_per_suite and all test cases of the suite will be skipped and
-	Reason printed in the overview log of the suite.</p>
-	
-	<p><c>SuiteName</c> is the name of the suite to be run.</p>
-
-	<p><c>InitData</c> is the original config list of the test suite, or
-	a <c>SkipOrFail</c> tuple if a previous CTH has returned this.</p>
-
-	<p><c>CTHState</c> is the current internal state of the CTH.</p>
-
-	<p><c>Return</c> is the result of the init_per_suite function.
-	If it is <c>{skip,Reason}</c> or <c>{fail,Reason}</c> 
-	<seealso marker="common_test#Module:init_per_suite-1">init_per_suite
-	</seealso> will never be called, instead the initiation is considered 
-	to be skipped/failed respectively. If a <c>NewConfig</c> list
-	is returned, <seealso marker="common_test#Module:init_per_suite-1">
-	init_per_suite</seealso> will be called with that <c>NewConfig</c> list.
-	See <seealso marker="ct_hooks_chapter#pre">
-	Pre Hooks</seealso> in the User's Guide for more details.</p>
-	
-	
-	<p>Note that this function is only called if the CTH has been added 
-	before init_per_suite is run, see 
-	<seealso marker="ct_hooks_chapter#scope">CTH Scoping</seealso> 
-	in the User's Guide for details.</p>
+        <p>OPTIONAL</p>
+
+        <p>This function is called before
+          <seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite</c></seealso>
+          if it exists. It typically contains initialization/logging that must
+          be done before <c>init_per_suite</c> is called. If
+          <c>{skip,Reason}</c> or <c>{fail,Reason}</c> is returned,
+          <c>init_per_suite</c> and all test cases of the suite are skipped
+          and <c>Reason</c> printed in the overview log of the suite.</p>
+
+        <p><c>SuiteName</c> is the name of the suite to be run.</p>
+
+        <p><c>InitData</c> is the original configuration list of the test
+          suite, or a <c>SkipOrFail</c> tuple if a previous CTH has returned
+          this.</p>
+
+        <p><c>CTHState</c> is the current internal state of the CTH.</p>
+
+        <p><c>Return</c> is the result of the <c>init_per_suite</c> function.
+          If it is <c>{skip,Reason}</c> or <c>{fail,Reason}</c>, 
+          <seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite</c></seealso>
+          is never called, instead the initiation is considered to be
+          skipped or failed, respectively. If a <c>NewConfig</c> list is
+          returned,
+          <seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite</c></seealso>
+          is called with that <c>NewConfig</c> list. For more details, see
+          section <seealso marker="ct_hooks_chapter#pre">Pre Hooks</seealso>
+          in the User's Guide.</p>
+
+        <p>This function is called only if the CTH is added before
+          <c>init_per_suite is run</c>. For details, see section
+          <seealso marker="ct_hooks_chapter#scope">CTH Scope</seealso>
+          in the User's Guide.</p>
       </desc>
     </func>
-    
+
     <func>
-      <name>Module:post_init_per_suite(SuiteName, Config, Return, CTHState) -&gt; 
-              Result</name>
-      <fsummary>Called after init_per_suite</fsummary>
+      <name>Module:post_init_per_suite(SuiteName, Config, Return, CTHState) -&gt; Result</name>
+      <fsummary>Called after init_per_suite.</fsummary>
       <type>
-	<v>SuiteName = atom()</v>
-	<v>Config = [{Key,Value}]</v>
-	<v>Return = NewReturn = Config | SkipOrFail | term()</v>
-	<v>SkipOrFail = {fail, Reason} | {skip, Reason} | term()</v>
-	<v>CTHState = NewCTHState = term()</v>
-	<v>Result = {NewReturn, NewCTHState}</v>
-	<v>Key = atom()</v>
-	<v>Value = term()</v>
-	<v>Reason = term()</v>
+        <v>SuiteName = atom()</v>
+        <v>Config = [{Key,Value}]</v>
+        <v>Return = NewReturn = Config | SkipOrFail | term()</v>
+        <v>SkipOrFail = {fail, Reason} | {skip, Reason} | term()</v>
+        <v>CTHState = NewCTHState = term()</v>
+        <v>Result = {NewReturn, NewCTHState}</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+        <v>Reason = term()</v>
       </type>
-      
       <desc>	
-	<p> OPTIONAL </p>
+        <p>OPTIONAL</p>
+
+        <p>This function is called after
+          <seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite</c></seealso>
+          if it exists. It typically contains extra checks to ensure that all
+          the correct dependencies are started correctly.</p>
+
+        <p><c>Return</c> is what
+          <seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite</c></seealso>
+          returned, that is, <c>{fail,Reason}</c>, <c>{skip,Reason}</c>, a
+          <c>Config</c> list, or a term describing how
+          <seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite</c></seealso>
+          failed.</p>
+
+        <p><c>NewReturn</c> is the possibly modified return value of
+          <seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite</c></seealso>.
+          To recover from a failure in
+          <seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite</c></seealso>,
+          return <c>ConfigList</c> with the <c>tc_status</c> element removed.
+          For more details, see
+          <seealso marker="ct_hooks_chapter#post"> Post Hooks</seealso> in
+          section "Manipulating Tests" in the User's Guide.</p>
+
+        <p><c>CTHState</c> is the current internal state of the CTH.</p>
+
+        <p>This function is called only if the CTH is added before or in
+          <c>init_per_suite</c>. For details, see section
+          <seealso marker="ct_hooks_chapter#scope">CTH Scope</seealso>
+          in the User's Guide.</p>
+      </desc>
+    </func>
 
-	<p>This function is called after
-	<seealso marker="common_test#Module:init_per_suite-1">
-	  init_per_suite</seealso> if it exists. It typically contains extra 
-	checks to make sure that all the correct dependencies have
-	been started correctly.</p>
-	
-	<p><c>Return</c> is what 
-	<seealso marker="common_test#Module:init_per_suite-1">init_per_suite
-	</seealso> returned, i.e. {fail,Reason}, {skip,Reason}, a <c>Config</c>
-	list or a term describing how 
-	<seealso marker="common_test#Module:init_per_suite-1">init_per_suite
-	</seealso> failed.</p>
-
-	<p><c>NewReturn</c> is the possibly modified return value of
-	<seealso marker="common_test#Module:init_per_suite-1">init_per_suite
-	</seealso>. It is here possible to recover from a failure in 
-	<seealso marker="common_test#Module:init_per_suite-1">init_per_suite
-	</seealso> by returning the <c>ConfigList</c> with the <c>tc_status</c>
-	element removed. See <seealso marker="ct_hooks_chapter#post">
-	Post Hooks</seealso> in the User's Guide for more details.</p>
-
-	<p><c>CTHState</c> is the current internal state of the CTH.</p>
-
-	<p>Note that this function is only called if the CTH has been added 
-	before or in init_per_suite, see 
-	<seealso marker="ct_hooks_chapter#scope">CTH Scoping</seealso> 
-	in the User's Guide for details.</p>
+    <func>
+      <name>Module:pre_init_per_group(GroupName, InitData, CTHState) -&gt; Result</name>
+      <fsummary>Called before init_per_group.</fsummary>
+      <type>
+        <v>GroupName = atom()</v>
+        <v>InitData = Config | SkipOrFail</v>
+        <v>Config = NewConfig = [{Key,Value}]</v>
+        <v>CTHState = NewCTHState = term()</v>
+        <v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
+        <v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>	
+        <p>OPTIONAL</p>
+
+        <p>This function is called before
+          <seealso marker="common_test#Module:init_per_group-2"><c>init_per_group</c></seealso>
+          if it exists. It behaves the same way as
+          <seealso marker="ct_hooks#Module:pre_init_per_suite-3"><c>pre_init_per_suite</c></seealso>,
+          but for function
+          <seealso marker="common_test#Module:init_per_group-2"><c>init_per_group</c></seealso>
+          instead.</p>
       </desc>
     </func>
-    
+
     <func>
-      <name>Module:pre_init_per_group(GroupName, InitData, CTHState) -&gt;
-              Result</name>
-      <fsummary>Called before init_per_group</fsummary>
+      <name>Module:post_init_per_group(GroupName, Config, Return, CTHState) -&gt; Result</name>
+      <fsummary>Called after init_per_group.</fsummary>
       <type>
-	<v>GroupName = atom()</v>
-	<v>InitData = Config | SkipOrFail</v>
-	<v>Config = NewConfig = [{Key,Value}]</v>
-	<v>CTHState = NewCTHState = term()</v>
-	<v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
-	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
-	<v>Key = atom()</v>
-	<v>Value = term()</v>
-	<v>Reason = term()</v>
+        <v>GroupName = atom()</v>
+        <v>Config = [{Key,Value}]</v>
+        <v>Return = NewReturn = Config | SkipOrFail | term()</v>
+        <v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+        <v>CTHState = NewCTHState = term()</v>
+        <v>Result = {NewReturn, NewCTHState}</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+        <v>Reason = term()</v>
       </type>
-      
       <desc>	
-	<p> OPTIONAL </p>
-	
-	<p>This function is called before
-	<seealso marker="common_test#Module:init_per_group-2">
-	  init_per_group</seealso> if it exists. It behaves the same way as 
-	<seealso marker="ct_hooks#Module:pre_init_per_suite-3">
-	pre_init_per_suite</seealso>, but for the
-	<seealso marker="common_test#Module:init_per_group-2">
-	init_per_group</seealso> instead.</p>
+        <p>OPTIONAL</p>
+
+        <p>This function is called after
+          <seealso marker="common_test#Module:init_per_group-2"><c>init_per_group</c></seealso>
+          if it exists. It behaves the same way as
+          <seealso marker="ct_hooks#Module:post_init_per_suite-4"><c>post_init_per_suite</c></seealso>,
+          but for function
+          <seealso marker="common_test#Module:init_per_group-2"><c>init_per_group</c></seealso>
+          instead.</p>
       </desc>
     </func>
-    
+
     <func>
-      <name>Module:post_init_per_group(GroupName, Config, Return, CTHState) -&gt; 
-              Result</name>
-      <fsummary>Called after init_per_group</fsummary>
+      <name>Module:pre_init_per_testcase(TestcaseName, InitData, CTHState) -&gt; Result</name>
+      <fsummary>Called before init_per_testcase.</fsummary>
       <type>
-	<v>GroupName = atom()</v>
-	<v>Config = [{Key,Value}]</v>
-	<v>Return = NewReturn = Config | SkipOrFail | term()</v>
-	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
-	<v>CTHState = NewCTHState = term()</v>
-	<v>Result = {NewReturn, NewCTHState}</v>
-	<v>Key = atom()</v>
-	<v>Value = term()</v>
-	<v>Reason = term()</v>
+        <v>TestcaseName = atom()</v>
+        <v>InitData = Config | SkipOrFail</v>
+        <v>Config = NewConfig = [{Key,Value}]</v>
+        <v>CTHState = NewCTHState = term()</v>
+        <v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
+        <v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+        <v>Reason = term()</v>
       </type>
-      
       <desc>	
-	<p> OPTIONAL </p>
-
-	<p>This function is called after
-	<seealso marker="common_test#Module:init_per_group-2">
-	  init_per_group</seealso> if it exists. It behaves the same way as 
-	<seealso marker="ct_hooks#Module:post_init_per_suite-4">
-	post_init_per_suite</seealso>, but for the
-	<seealso marker="common_test#Module:init_per_group-2">
-	init_per_group</seealso> instead.</p>
+        <p>OPTIONAL</p>
+
+        <p>This function is called before
+          <seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase</c></seealso>
+          if it exists. It behaves the same way as
+          <seealso marker="ct_hooks#Module:pre_init_per_suite-3"><c>pre_init_per_suite</c></seealso>,
+          but for function
+          <seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase</c></seealso>
+          instead.</p>
+
+        <p>CTHs cannot be added here right now. That feature may be added in
+          a later release, but it would right now break backwards
+          compatibility.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:pre_init_per_testcase(TestcaseName, InitData, CTHState) -&gt;
-              Result</name>
-      <fsummary>Called before init_per_testcase</fsummary>
+      <name>Module:post_init_per_testcase(TestcaseName, Config, Return, CTHState) -&gt; Result</name>
+      <fsummary>Called after init_per_testcase.</fsummary>
       <type>
-	<v>TestcaseName = atom()</v>
-	<v>InitData = Config | SkipOrFail</v>
-	<v>Config = NewConfig = [{Key,Value}]</v>
-	<v>CTHState = NewCTHState = term()</v>
-	<v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
-	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
-	<v>Key = atom()</v>
-	<v>Value = term()</v>
-	<v>Reason = term()</v>
+        <v>TestcaseName = atom()</v>
+        <v>Config = [{Key,Value}]</v>
+        <v>Return = NewReturn = Config | SkipOrFail | term()</v>
+        <v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+        <v>CTHState = NewCTHState = term()</v>
+        <v>Result = {NewReturn, NewCTHState}</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+        <v>Reason = term()</v>
       </type>
-      
       <desc>	
-	<p> OPTIONAL </p>
-
-	<p>This function is called before
-	<seealso marker="common_test#Module:init_per_testcase-2">
-	  init_per_testcase</seealso> if it exists. It behaves the same way as 
-	<seealso marker="ct_hooks#Module:pre_init_per_suite-3">
-	pre_init_per_suite</seealso>, but for the
-	<seealso marker="common_test#Module:init_per_testcase-2">
-	init_per_testcase</seealso> function instead.</p>
-
-	<p>Note that it is not possible to add CTH's here right now, 
-	that feature might be added later, 
-	but it would right now break backwards compatibility.</p>
+        <p>OPTIONAL</p>
+
+        <p>This function is called after
+          <seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase</c></seealso>
+          if it exists. It behaves the same way as
+          <seealso marker="ct_hooks#Module:post_init_per_suite-4"><c>post_init_per_suite</c></seealso>,
+          but for function
+          <seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase</c></seealso>
+          instead.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:post_end_per_testcase(TestcaseName, Config, Return, CTHState)
-               -&gt; Result</name>
-      <fsummary>Called after end_per_testcase</fsummary>
+      <name>Module:pre_end_per_testcase(TestcaseName, InitData, CTHState) -&gt; Result</name>
+      <fsummary>Called before end_per_testcase.</fsummary>
       <type>
-	<v>TestcaseName = atom()</v>
-	<v>Config = [{Key,Value}]</v>
-	<v>Return = NewReturn = Config | SkipOrFail | term()</v>
-	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
-	<v>CTHState = NewCTHState = term()</v>
-	<v>Result = {NewReturn, NewCTHState}</v>
-	<v>Key = atom()</v>
-	<v>Value = term()</v>
-	<v>Reason = term()</v>
+        <v>TestcaseName = atom()</v>
+        <v>InitData = Config</v>
+        <v>Config = NewConfig = [{Key,Value}]</v>
+        <v>CTHState = NewCTHState = term()</v>
+        <v>Result = {NewConfig, NewCTHState}</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+        <v>Reason = term()</v>
       </type>
-      
       <desc>	
-	<p> OPTIONAL </p>
-
-	<p>This function is called after
-	<seealso marker="common_test#Module:end_per_testcase-2">
-	  end_per_testcase</seealso> if it exists. It behaves the same way as 
-	<seealso marker="ct_hooks#Module:post_init_per_suite-4">
-	post_init_per_suite</seealso>, but for the
-	<seealso marker="common_test#Module:end_per_testcase-2">
-	end_per_testcase</seealso> function instead.</p>
+        <p>OPTIONAL</p>
+
+        <p>This function is called before
+          <seealso marker="common_test#Module:end_per_testcase-2"><c>end_per_testcase</c></seealso>
+          if it exists. It behaves the same way as
+          <seealso marker="ct_hooks#Module:pre_end_per_suite-3"><c>pre_end_per_suite</c></seealso>,
+          but for function
+          <seealso marker="common_test#Module:end_per_testcase-2"><c>end_per_testcase</c></seealso>
+          instead.</p>
+
+        <p>This function can not change the result of the test case by returning skip or fail
+	tuples, but it may insert items in <c>Config</c> that can be read in
+	<c>end_per_testcase/2</c> or in <c>post_end_per_testcase/4</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:pre_end_per_group(GroupName, EndData, CTHState) -&gt;
-              Result</name>
-      <fsummary>Called before end_per_group</fsummary>
+      <name>Module:post_end_per_testcase(TestcaseName, Config, Return, CTHState) -&gt; Result</name>
+      <fsummary>Called after end_per_testcase.</fsummary>
       <type>
-	<v>GroupName = atom()</v>
-	<v>EndData = Config | SkipOrFail</v>
-	<v>Config = NewConfig = [{Key,Value}]</v>
-	<v>CTHState = NewCTHState = term()</v>
-	<v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
-	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
-	<v>Key = atom()</v>
-	<v>Value = term()</v>
-	<v>Reason = term()</v>
+        <v>TestcaseName = atom()</v>
+        <v>Config = [{Key,Value}]</v>
+        <v>Return = NewReturn = Config | SkipOrFail | term()</v>
+        <v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+        <v>CTHState = NewCTHState = term()</v>
+        <v>Result = {NewReturn, NewCTHState}</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+        <v>Reason = term()</v>
       </type>
-      
       <desc>	
-	<p> OPTIONAL </p>
-	
-	<p>This function is called before
-	<seealso marker="common_test#Module:end_per_group-2">
-	end_per_group</seealso> if it exists. It behaves the same way as 
-	<seealso marker="ct_hooks#Module:pre_init_per_suite-3">
-	pre_init_per_suite</seealso>, but for the
-	<seealso marker="common_test#Module:end_per_group-2">
-	end_per_group</seealso> function instead.</p>
+        <p>OPTIONAL</p>
+
+        <p>This function is called after
+          <seealso marker="common_test#Module:end_per_testcase-2"><c>end_per_testcase</c></seealso>
+          if it exists. It behaves the same way as
+          <seealso marker="ct_hooks#Module:post_end_per_suite-4"><c>post_end_per_suite</c></seealso>,
+          but for function
+          <seealso marker="common_test#Module:end_per_testcase-2"><c>end_per_testcase</c></seealso>
+          instead.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:pre_end_per_group(GroupName, EndData, CTHState) -&gt; Result</name>
+      <fsummary>Called before end_per_group.</fsummary>
+      <type>
+        <v>GroupName = atom()</v>
+        <v>EndData = Config | SkipOrFail</v>
+        <v>Config = NewConfig = [{Key,Value}]</v>
+        <v>CTHState = NewCTHState = term()</v>
+        <v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
+        <v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>	
+        <p>OPTIONAL</p>
+
+        <p>This function is called before
+          <seealso marker="common_test#Module:end_per_group-2"><c>end_per_group</c></seealso>
+          if it exists. It behaves the same way as
+          <seealso marker="ct_hooks#Module:pre_init_per_suite-3"><c>pre_init_per_suite</c></seealso>,
+          but for function
+          <seealso marker="common_test#Module:end_per_group-2"><c>end_per_group</c></seealso>
+          instead.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:post_end_per_group(GroupName, Config, Return, CTHState) -&gt; 
-              Result</name>
-      <fsummary>Called after end_per_group</fsummary>
+      <name>Module:post_end_per_group(GroupName, Config, Return, CTHState) -&gt; Result</name>
+      <fsummary>Called after end_per_group.</fsummary>
       <type>
-	<v>GroupName = atom()</v>
-	<v>Config = [{Key,Value}]</v>
-	<v>Return = NewReturn = Config | SkipOrFail | term()</v>
-	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
-	<v>CTHState = NewCTHState = term()</v>
-	<v>Result = {NewReturn, NewCTHState}</v>
-	<v>Key = atom()</v>
-	<v>Value = term()</v>
-	<v>Reason = term()</v>
+        <v>GroupName = atom()</v>
+        <v>Config = [{Key,Value}]</v>
+        <v>Return = NewReturn = Config | SkipOrFail | term()</v>
+        <v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+        <v>CTHState = NewCTHState = term()</v>
+        <v>Result = {NewReturn, NewCTHState}</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+        <v>Reason = term()</v>
       </type>
-      
       <desc>	
-	<p> OPTIONAL </p>
-
-	<p>This function is called after
-	<seealso marker="common_test#Module:end_per_group-2">
-	  end_per_group</seealso> if it exists. It behaves the same way as 
-	<seealso marker="ct_hooks#Module:post_init_per_suite-4">
-	post_init_per_suite</seealso>, but for the
-	<seealso marker="common_test#Module:end_per_group-2">
-	end_per_group</seealso> function instead.</p>
+        <p>OPTIONAL</p>
+
+        <p>This function is called after
+          <seealso marker="common_test#Module:end_per_group-2"><c>end_per_group</c></seealso>
+          if it exists. It behaves the same way as
+          <seealso marker="ct_hooks#Module:post_init_per_suite-4"><c>post_init_per_suite</c></seealso>,
+          but for function
+          <seealso marker="common_test#Module:end_per_group-2">end_per_group</seealso>
+          instead.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:pre_end_per_suite(SuiteName, EndData, CTHState) -&gt;
-              Result</name>
-      <fsummary>Called before end_per_suite</fsummary>
+      <name>Module:pre_end_per_suite(SuiteName, EndData, CTHState) -&gt; Result</name>
+      <fsummary>Called before end_per_suite.</fsummary>
       <type>
-	<v>SuiteName = atom()</v>
-	<v>EndData = Config | SkipOrFail</v>
-	<v>Config = NewConfig = [{Key,Value}]</v>
-	<v>CTHState = NewCTHState = term()</v>
-	<v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
-	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
-	<v>Key = atom()</v>
-	<v>Value = term()</v>
-	<v>Reason = term()</v>
+        <v>SuiteName = atom()</v>
+        <v>EndData = Config | SkipOrFail</v>
+        <v>Config = NewConfig = [{Key,Value}]</v>
+        <v>CTHState = NewCTHState = term()</v>
+        <v>Result = {NewConfig | SkipOrFail, NewCTHState}</v>
+        <v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+        <v>Reason = term()</v>
       </type>
-      
       <desc>	
-	<p> OPTIONAL </p>
-
-	<p>This function is called before
-	<seealso marker="common_test#Module:end_per_suite-1">
-	  end_per_suite</seealso> if it exists. It behaves the same way as 
-	<seealso marker="ct_hooks#Module:pre_init_per_suite-3">
-	pre_init_per_suite</seealso>, but for the
-	<seealso marker="common_test#Module:end_per_suite-1">
-	end_per_suite</seealso> function instead.</p>
+        <p>OPTIONAL</p>
+
+        <p>This function is called before
+          <seealso marker="common_test#Module:end_per_suite-1"><c>end_per_suite</c></seealso>
+          if it exists. It behaves the same way as
+          <seealso marker="ct_hooks#Module:pre_init_per_suite-3"><c>pre_init_per_suite</c></seealso>,
+          but for function
+          <seealso marker="common_test#Module:end_per_suite-1"><c>end_per_suite</c></seealso>
+          instead.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:post_end_per_suite(SuiteName, Config, Return, CTHState) -&gt; 
-              Result</name>
-      <fsummary>Called after end_per_suite</fsummary>
+      <name>Module:post_end_per_suite(SuiteName, Config, Return, CTHState) -&gt; Result</name>
+      <fsummary>Called after end_per_suite.</fsummary>
       <type>
-	<v>SuiteName = atom()</v>
-	<v>Config = [{Key,Value}]</v>
-	<v>Return = NewReturn = Config | SkipOrFail | term()</v>
-	<v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
-	<v>CTHState = NewCTHState = term()</v>
-	<v>Result = {NewReturn, NewCTHState}</v>
-	<v>Key = atom()</v>
-	<v>Value = term()</v>
-	<v>Reason = term()</v>
+        <v>SuiteName = atom()</v>
+        <v>Config = [{Key,Value}]</v>
+        <v>Return = NewReturn = Config | SkipOrFail | term()</v>
+        <v>SkipOrFail = {fail,Reason} | {skip, Reason}</v>
+        <v>CTHState = NewCTHState = term()</v>
+        <v>Result = {NewReturn, NewCTHState}</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+        <v>Reason = term()</v>
       </type>
-      
       <desc>	
-	<p> OPTIONAL </p>
-
-	<p>This function is called after
-	<seealso marker="common_test#Module:end_per_suite-1">
-	  end_per_suite</seealso> if it exists. It behaves the same way as 
-	<seealso marker="ct_hooks#Module:post_init_per_suite-4">
-	post_init_per_suite</seealso>, but for the
-	<seealso marker="common_test#Module:end_per_suite-1">
-	end_per_suite</seealso> function instead.</p>
+        <p>OPTIONAL</p>
+
+        <p>This function is called after
+          <seealso marker="common_test#Module:end_per_suite-1"><c>end_per_suite</c></seealso>
+          if it exists. It behaves the same way as
+          <seealso marker="ct_hooks#Module:post_init_per_suite-4"><c>post_init_per_suite</c></seealso>,
+          but for function
+          <seealso marker="common_test#Module:end_per_suite-1"><c>end_per_suite</c></seealso>
+          instead.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:on_tc_fail(TestName, Reason, CTHState) -&gt; 
-              NewCTHState</name>
-      <fsummary>Called after the CTH scope ends</fsummary>
+      <name>Module:on_tc_fail(TestName, Reason, CTHState) -&gt; NewCTHState</name>
+      <fsummary>Called after the CTH scope ends.</fsummary>
       <type>
-	<v>TestName = init_per_suite | end_per_suite |
-                      {init_per_group,GroupName} | {end_per_group,GroupName} |
-                      {FuncName,GroupName} | FuncName</v>
-	<v>FuncName = atom()</v>
-	<v>GroupName = atom()</v>
-	<v>Reason = term()</v>
-	<v>CTHState = NewCTHState = term()</v>
+        <v>TestName = init_per_suite | end_per_suite | {init_per_group,GroupName} | {end_per_group,GroupName} | {FuncName,GroupName} | FuncName</v>
+        <v>FuncName = atom()</v>
+        <v>GroupName = atom()</v>
+        <v>Reason = term()</v>
+        <v>CTHState = NewCTHState = term()</v>
       </type>
-      
       <desc>	
-	<p> OPTIONAL </p>
-
-	<p>This function is called whenever a test case (or config function)
-	  fails. It is called after the post function has been called for 
-	  the failed test case. I.e. if init_per_suite fails, this function
-	  is called after 
-	<seealso marker="#Module:post_init_per_suite-4">
-	  post_init_per_suite</seealso>, and if a test case fails, it is called 
-	  after <seealso marker="#Module:post_end_per_testcase-4">
-	  post_end_per_testcase</seealso>. If the failed test case belongs
-	  to a test case group, the first argument is a tuple
-	  <c>{FuncName,GroupName}</c>, otherwise simply the function name.</p>
-
-	<p>The data which comes with the Reason follows the same format as the
-	<seealso marker="event_handler_chapter#failreason">FailReason
-	</seealso> in the <seealso marker="event_handler_chapter#tc_done">tc_done</seealso> event.
-	See <seealso marker="event_handler_chapter#events">Event Handling
-	</seealso> in the User's Guide for details.</p>
+        <p>OPTIONAL</p>
+
+        <p>This function is called whenever a test case (or configuration
+          function) fails. It is called after the post function is called
+          for the failed test case, that is:</p>
+
+        <list type="bulleted">
+          <item><p>If <c>init_per_suite</c> fails, this function is called after
+            <seealso marker="#Module:post_init_per_suite-4"><c>post_init_per_suite</c></seealso>.</p></item>
+          <item><p>If a test case fails, this funcion is called after
+          <seealso marker="#Module:post_end_per_testcase-4"><c>post_end_per_testcase</c></seealso>.</p></item>
+        </list>
+
+         <p>If the failed test case belongs to a test case group, the first
+          argument is a tuple <c>{FuncName,GroupName}</c>, otherwise only
+          the function name.</p>
+
+        <p>The data that comes with <c>Reason</c> follows the same format as
+          <seealso marker="event_handler_chapter#failreason"><c>FailReason</c></seealso>
+          in event
+          <seealso marker="event_handler_chapter#tc_done"><c>tc_done</c></seealso>.
+          For details, see section
+          <seealso marker="event_handler_chapter#events">Event Handling</seealso>
+          in the User's Guide.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:on_tc_skip(TestName, Reason, CTHState) -&gt; 
-              NewCTHState</name>
-      <fsummary>Called after the CTH scope ends</fsummary>
+      <name>Module:on_tc_skip(TestName, Reason, CTHState) -&gt; NewCTHState</name>
+      <fsummary>Called after the CTH scope ends.</fsummary>
       <type>
-	<v>TestName = init_per_suite | end_per_suite |
-                      {init_per_group,GroupName} | {end_per_group,GroupName} |
-                      {FuncName,GroupName} | FuncName</v>
-	<v>FuncName = atom()</v>
-	<v>GroupName = atom()</v>
-	<v>Reason = {tc_auto_skip | tc_user_skip, term()}</v>
-	<v>CTHState = NewCTHState = term()</v>
+        <v>TestName = init_per_suite | end_per_suite | {init_per_group,GroupName} | {end_per_group,GroupName} | {FuncName,GroupName} | FuncName</v>
+        <v>FuncName = atom()</v>
+        <v>GroupName = atom()</v>
+        <v>Reason = {tc_auto_skip | tc_user_skip, term()}</v>
+        <v>CTHState = NewCTHState = term()</v>
       </type>
-      
       <desc>	
-	<p> OPTIONAL </p>
-
-	<p>This function is called whenever a test case (or config function)
-	  is skipped. It is called after the post function has been called
-	  for the skipped test case. I.e. if init_per_group is skipped, this
-	  function is called after 
-	  <seealso marker="#Module:post_init_per_group-4">
-	    post_init_per_group</seealso>, and if a test case is skipped,
-	  it is called after 
-	<seealso marker="#Module:post_end_per_testcase-4">
-	  post_end_per_testcase</seealso>. If the skipped test case belongs to a
-	test case group, the first argument is a tuple <c>{FuncName,GroupName}</c>,
-	otherwise simply the function name.</p>
-
-	<p>The data which comes with the Reason follows the same format as 
-	<seealso marker="event_handler_chapter#tc_auto_skip">tc_auto_skip
-	</seealso> and <seealso marker="event_handler_chapter#tc_user_skip">
-	tc_user_skip</seealso> events.
-	See <seealso marker="event_handler_chapter#events">Event Handling
-	</seealso> in the User's Guide for details.</p>
+        <p>OPTIONAL</p>
+
+        <p>This function is called whenever a test case (or configuration
+          function) is skipped. It is called after the post function is called
+          for the skipped test case, that is:</p>
+
+        <list type="bulleted">
+          <item><p>If <c>init_per_group</c> is skipped, this function is
+            called after 
+            <seealso marker="#Module:post_init_per_group-4"><c>post_init_per_group</c></seealso>.</p></item>
+          <item><p>If a test case is skipped, this function is called after
+          <seealso marker="#Module:post_end_per_testcase-4"><c>post_end_per_testcase</c></seealso>.</p></item>
+        </list>
+
+        <p>If the skipped test case belongs to a test case group, the first
+          argument is a tuple <c>{FuncName,GroupName}</c>, otherwise only
+          the function name.</p>
+
+        <p>The data that comes with <c>Reason</c> follows the same format as
+          events
+          <seealso marker="event_handler_chapter#tc_auto_skip"><c>tc_auto_skip</c></seealso>
+          and
+          <seealso marker="event_handler_chapter#tc_user_skip"><c>tc_user_skip</c></seealso>
+          For details, see section
+          <seealso marker="event_handler_chapter#events">Event Handling</seealso>
+          in the User's Guide.</p>
       </desc>
     </func>
 
     <func>
       <name>Module:terminate(CTHState)</name>
-      <fsummary>Called after the CTH scope ends</fsummary>
+      <fsummary>Called after the CTH scope ends.</fsummary>
       <type>
-	<v>CTHState = term()</v>
+        <v>CTHState = term()</v>
       </type>
-      
       <desc>	
-	<p> OPTIONAL </p>
+        <p>OPTIONAL</p>
 
-	<p>This function is called at the end of a CTH's 
-	<seealso marker="ct_hooks_chapter#scope">scope</seealso>. 
-	</p>
+        <p>This function is called at the end of a CTH
+          <seealso marker="ct_hooks_chapter#scope">scope</seealso>.</p>
       </desc>
     </func>
 
     <func>
       <name>Module:id(Opts) -&gt; Id</name>
-      <fsummary>Called before the init function of a CTH</fsummary>
+      <fsummary>Called before the init function of a CTH.</fsummary>
       <type>
-	<v>Opts = term()</v>
-	<v>Id = term()</v>
+        <v>Opts = term()</v>
+        <v>Id = term()</v>
       </type>
-      
       <desc>
-	<p> OPTIONAL </p>
-	
-	<p>The <c>Id</c> is used to uniquely identify a CTH instance, 
-	if two CTH's return the same <c>Id</c> the second CTH is ignored
-	and subsequent calls to the CTH will only be made to the first
-	instance. For more information see 
-	<seealso marker="ct_hooks_chapter#installing">Installing a CTH
-	</seealso> in the User's Guide.
-        </p>
-
-	<p>This function should NOT have any side effects as it might 
-	be called multiple times by Common Test.</p>
+       <p>OPTIONAL</p>
 	
-	<p>If not implemented the CTH will act as if this function returned a
-	  call to <c>make_ref/0</c>.</p>
-      </desc>
+       <p>The <c>Id</c> identifies a CTH instance uniquely. If two CTHs return
+         the same <c>Id</c>, the second CTH is ignored and subsequent calls to
+         the CTH are only made to the first instance. For details, see section
+         <seealso marker="ct_hooks_chapter#installing">Installing a CTH</seealso>
+         in the User's Guide.</p>
+
+       <p>This function is <em>not</em> to have any side effects, as it can 
+         be called multiple times by <c>Common Test</c>.</p>
+
+       <p>If not implemented, the CTH acts as if this function returned a call
+         to <c>make_ref/0</c>.</p>
+       </desc>
     </func>
-
   </funcs>
 
 </erlref>
diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml
index 3905e23dcc..3eb1945a61 100644
--- a/lib/common_test/doc/src/ct_hooks_chapter.xml
+++ b/lib/common_test/doc/src/ct_hooks_chapter.xml
@@ -34,28 +34,28 @@
     <marker id="general"></marker>
     <title>General</title>
     <p>
-      The <em>Common Test Hook</em> (henceforth called CTH) framework allows 
-      extensions of the default behaviour of Common Test by means of hooks 
-      before and after all test suite calls. CTHs allow advanced Common Test
-      users to abstract out behaviour which is common to multiple test suites
-      without littering all test suites with library calls. Some example 
-      usages are: logging, starting and monitoring external systems, 
-      building C files needed by the tests and much more!</p>
-
-    <p>In brief, Common Test Hooks allows you to:</p>
-
-    <list>
-      <item>Manipulate the runtime config before each suite 
-      configuration call</item>
-      <item>Manipulate the return of all suite configuration calls and in 
-      extension the result of the test themselves.</item>
+      The <em>Common Test Hook (CTH)</em> framework allows 
+      extensions of the default behavior of <c>Common Test</c> using hooks 
+      before and after all test suite calls. CTHs allow advanced <c>Common Test</c>
+      users to abstract out behavior that is common to multiple test suites
+      without littering all test suites with library calls. this can be used 
+      for logging, starting, and monitoring external systems, 
+      building C files needed by the tests, and so on.</p>
+
+    <p>In brief, CTH allows you to do the following:</p>
+
+    <list type="bulleted">
+      <item>Manipulate the runtime configuration before each suite 
+      configuration call.</item>
+      <item>Manipulate the return of all suite configuration calls, and in 
+      extension, the result of the tests themselves.</item>
     </list>
     
-    <p>The following sections describe how to use CTHs, when they are run 
-      and how to manipulate your test results in a CTH</p>
+    <p>The following sections describe how to use CTHs, when they are run,
+      and how to manipulate the test results in a CTH.</p>
 
-    <warning><p>When executing within a CTH all timetraps are shutoff. So
-	if your CTH never returns, the entire test run will be stalled!</p>
+    <warning><p>When executing within a CTH, all timetraps are shut off. So
+	if your CTH never returns, the entire test run is stalled.</p>
     </warning>
 
   </section>
@@ -63,144 +63,148 @@
   <section>
     <marker id="installing"></marker>
     <title>Installing a CTH</title>
-    <p>There are multiple ways to install a CTH in your test run. You can do it
-      for all tests in a run, for specific test suites and for specific groups 
+    <p>A CTH can be installed in multiple ways in your test run. You can do it
+      for all tests in a run, for specific test suites, and for specific groups 
       within a test suite. If you want a CTH to be present in all test suites 
-      within your test run there are three different ways to accomplish that.
+      within your test run, there are three ways to accomplish that, as follows:
     </p>
 
-    <list>
+    <list type="bulleted">
       <item>Add <c>-ct_hooks</c> as an argument to 
       <seealso marker="run_test_chapter#ct_run">ct_run</seealso>. 
-      To add multiple CTHs using this method append them to each other
-      using the keyword <c>and</c>, i.e. 
+      To add multiple CTHs using this method, append them to each other
+      using the keyword <c>and</c>, that is, 
       <c>ct_run -ct_hooks cth1 [{debug,true}] and cth2 ...</c>.</item>
-      <item>Add the <c>ct_hooks</c> tag to your 
+      <item>Add tag <c>ct_hooks</c> to your 
       <seealso marker="run_test_chapter#test_specifications">
-      Test Specification</seealso></item>
-      <item>Add the <c>ct_hooks</c> tag to your call to 
-      <seealso marker="ct#run_test-1">ct:run_test/1</seealso></item>
+      Test Specification</seealso>.</item>
+      <item>Add tag <c>ct_hooks</c> to your call to 
+      <seealso marker="ct#run_test-1">ct:run_test/1</seealso>.</item>
     </list>
 
-    <p>You can also add CTHs within a test suite. This is done by returning
-    <c>{ct_hooks,[CTH]}</c> in the config list from 
+    <p>CTHs can also be added within a test suite. This is done by returning
+    <c>{ct_hooks,[CTH]}</c> in the configuration list from 
     <seealso marker="common_test#Module:suite-0">suite/0</seealso>,
     <seealso marker="common_test#Module:init_per_suite-1">
-      init_per_suite/1</seealso> or
+      init_per_suite/1</seealso>, or
       <seealso marker="common_test#Module:init_per_group-2">
-    init_per_group/2</seealso>. <c>CTH</c> in this case can be either
-    only the module name of the CTH or a tuple with the module name and the
-    initial arguments and optionally the hook priority of the CTH. Eg:
-    <c>{ct_hooks,[my_cth_module]}</c> or 
-    <c>{ct_hooks,[{my_cth_module,[{debug,true}]}]}</c> or 
-    <c>{ct_hooks,[{my_cth_module,[{debug,true}],500}]}</c>
-    </p>
+    init_per_group/2</seealso>.</p>
+
+    <p>In this case, <c>CTH</c> can either be only the module name of the CTH 
+    or a tuple with the module name and the initial arguments, and optionally 
+    the hook priority of the CTH. For example, one of the following:</p>
+    <list type="bulleted">
+    <item><c>{ct_hooks,[my_cth_module]}</c></item> 
+    <item><c>{ct_hooks,[{my_cth_module,[{debug,true}]}]}</c></item>
+    <item><c>{ct_hooks,[{my_cth_module,[{debug,true}],500}]}</c></item>
+    </list>
 
     <section>
       <title>Overriding CTHs</title>
-      <p>By default each installation of a CTH will cause a new instance of it
-	to be activated. This can cause problems if you want to be able to 
-	override CTHs in test specifications while still having them in the
-	suite info function. The 
+      <p>By default, each installation of a CTH causes a new instance of it
+	to be activated. This can cause problems if you want to override 
+	CTHs in test specifications while still having them in the
+	suite information function. The 
 	<seealso marker="ct_hooks#Module:id-1">id/1</seealso>
 	callback exists to address this problem. By returning the same
-	<c>id</c> in both places, Common Test knows that this CTH
-	has already been installed and will not try to install it again.</p>
+	<c>id</c> in both places, <c>Common Test</c> knows that this CTH
+	is already installed and does not try to install it again.</p>
     </section>
    
     <section>
-      <title>CTH Execution order</title>
-      <p>By default each CTH installed will be executed in the order which
+      <title>CTH Execution Order</title>
+      <p>By default, each CTH installed is executed in the order that
       they are installed for init calls, and then reversed for end calls.
-      This is not always wanted so common_test allows
+      This is not always desired, so <c>Common Test</c> allows
       the user to specify a priority for each hook. The priority can either
-      be specified in the CTH <seealso marker="ct_hooks#Module:init-2">init/2
-      </seealso> function or when installing the hook. The priority given at
-      installation will override the priority returned by the CTH. </p>
+      be specified in the CTH function 
+      <seealso marker="ct_hooks#Module:init-2">init/2</seealso> or when 
+      installing the hook. The priority specified at installation overrides the 
+      priority returned by the CTH.</p>
     </section>
   </section>
 
   <section>
     <marker id="scope"/>
     <title>CTH Scope</title>
-    <p>Once the CTH is installed into a certain test run it will be there until
+    <p>Once the CTH is installed into a certain test run it remains there until
       its scope is expired. The scope of a CTH depends on when it is 
-      installed.
-      The <seealso marker="ct_hooks#Module:init-2">init/2</seealso> is 
-      called at the beginning of the scope and the 
-      <seealso marker="ct_hooks#Module:terminate-1">terminate/1
-    </seealso> function is called when the scope ends.</p>
+      installed, see the following table.
+      Function <seealso marker="ct_hooks#Module:init-2">init/2</seealso> is 
+      called at the beginning of the scope and function
+      <seealso marker="ct_hooks#Module:terminate-1">terminate/1</seealso> 
+      is called when the scope ends.</p>
     <table>
       <row>
-	<cell><em>CTH Installed in</em></cell>
+	<cell><em>CTH installed in</em></cell>
 	<cell><em>CTH scope begins before</em></cell>
 	<cell><em>CTH scope ends after</em></cell>
       </row>
       <row>
 	<cell><seealso marker="run_test_chapter#ct_run">ct_run</seealso></cell>
-	<cell>the first test suite is to be run.</cell>
-	<cell>the last test suite has been run.</cell>
+	<cell>the first test suite is to be run</cell>
+	<cell>the last test suite has been run</cell>
       </row>
       <row>
 	<cell><seealso marker="ct#run_test-1">ct:run_test</seealso></cell>
-	<cell>the first test suite is to be run.</cell>
-	<cell>the last test suite has been run.</cell>
+	<cell>the first test suite is run</cell>
+	<cell>the last test suite has been run</cell>
       </row>
       <row>
 	<cell><seealso marker="run_test_chapter#test_specifications">
 	  Test Specification</seealso></cell>
-	<cell>the first test suite is to be run.</cell>
-	<cell>the last test suite has been run.</cell>
+	<cell>the first test suite is run</cell>
+	<cell>the last test suite has been run</cell>
       </row>
       <row>
 	<cell><seealso marker="common_test#Module:suite-0">suite/0
 	</seealso></cell>
 	<cell><seealso marker="ct_hooks#Module:pre_init_per_suite-3">
-	    pre_init_per_suite/3</seealso> is called.</cell>
+	    pre_init_per_suite/3</seealso> is called</cell>
 	<cell><seealso marker="ct_hooks#Module:post_end_per_suite-4">
-	  post_end_per_suite/4</seealso> has been called for that test suite.</cell>
+	  post_end_per_suite/4</seealso> has been called for that test suite</cell>
       </row>
       <row>
 	<cell><seealso marker="common_test#Module:init_per_suite-1">
 	  init_per_suite/1</seealso></cell>
 	<cell><seealso marker="ct_hooks#Module:post_init_per_suite-4">
-	    post_init_per_suite/4</seealso> is called.</cell>
+	    post_init_per_suite/4</seealso> is called</cell>
 	<cell><seealso marker="ct_hooks#Module:post_end_per_suite-4">
-	  post_end_per_suite/4</seealso> has been called for that test suite.</cell>
+	  post_end_per_suite/4</seealso> has been called for that test suite</cell>
       </row>
       <row>
 	<cell><seealso marker="common_test#Module:init_per_group-2">
 	  init_per_group/2</seealso></cell>
 	<cell><seealso marker="ct_hooks#Module:post_init_per_group-4">
-	    post_init_per_group/4</seealso> is called.</cell>
+	    post_init_per_group/4</seealso> is called</cell>
 	<cell><seealso marker="ct_hooks#Module:post_end_per_suite-4">
-	  post_end_per_group/4</seealso> has been called for that group.</cell>
+	  post_end_per_group/4</seealso> has been called for that group</cell>
       </row>
     <tcaption>Scope of a CTH</tcaption>
     </table>
     
     <section>
       <title>CTH Processes and Tables</title>
-      <p>CTHs are run with the same process scoping as normal test suites
-	i.e. a different process will execute the init_per_suite hooks then the
-	init_per_group or per_testcase hooks. So if you want to spawn a 
-	process in the CTH you cannot link with the CTH process as it will exit 
-	after the post hook ends. Also if you for some reason need an ETS 
-	table with your CTH, you will have to spawn a process which handles 
-	it.</p>
+      <p>CTHs are run with the same process scoping as normal test suites,
+	that is, a different process executes the <c>init_per_suite</c> hooks then the
+	<c>init_per_group</c> or <c>per_testcase</c> hooks. So if you want to spawn a 
+	process in the CTH, you cannot link with the CTH process, as it exits 
+	after the post hook ends. Also, if you for some reason need an ETS 
+	table with your CTH, you must spawn a process that handles it.</p>
     </section>
     
     <section>
-      <title>External configuration data and Logging</title>
-      <p>It's possible in the CTH to read configuration data values
-	by calling <seealso marker="ct#get_config-1"><c>ct:get_config/1/2/3</c></seealso> (as explained in the
-	<seealso marker="config_file_chapter#require_config_data">
-	  External configuration data</seealso>
-	chapter). The config variables in question must, as always, first have been
-	<c>required</c> by means of a suite-, group-, or test case info function,
-	or the <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso> function. Note that the latter can also be used
-	in CT hook functions.</p>
-      <p>The CT hook functions may call any of the logging functions available
+      <title>External Configuration Data and Logging</title>
+      <p>Configuration data values in the CTH can be read
+	by calling 
+	<seealso marker="ct#get_config-1"><c>ct:get_config/1,2,3</c></seealso> 
+	(as explained in section
+	<seealso marker="config_file_chapter#require_config_data">Requiring and Reading Configuration Data</seealso>).
+	The configuration variables in question must, as always, first have been
+	required by a suite-, group-, or test case information function,
+	or by function <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.
+	The latter can also be used in CT hook functions.</p>
+      <p>The CT hook functions can call any logging function
 	in the <c>ct</c> interface to print information to the log files, or to
 	add comments in the suite overview page.
       </p>
@@ -209,306 +213,327 @@
   </section>
 
   <section>
-    <marker id="manipulating"/>
-    <title>Manipulating tests</title>
-    <p>It is through CTHs possible to manipulate the results of tests and 
-    configuration functions. The main purpose of doing this with CTHs is to
-    allow common patterns to be abstracted out from test test suites and applied to
-    multiple test suites without duplicating any code. All of the callback
-    functions for a CTH follow a common interface, this interface is 
-    described below.</p>
-
-    <p>Common Test will always call all available hook functions, even pre- and post
-      hooks for configuration functions that are not implemented in the suite.
+     <marker id="manipulating"/>
+    <title>Manipulating Tests</title>
+    <p>Through CTHs the results of tests and configuration functions can be manipulated. 
+    The main purpose to do this with CTHs is to allow common 
+    patterns to be abstracted out from test suites and applied to
+    multiple test suites without duplicating any code. All the callback
+    functions for a CTH follow a common interface described hereafter.</p>
+
+    <p><c>Common Test</c> always calls all available hook functions, even pre- 
+      and post hooks for configuration functions that are not implemented in the suite.
       For example, <c>pre_init_per_suite(x_SUITE, ...)</c> and
-      <c>post_init_per_suite(x_SUITE, ...)</c> will be called for test suite
-      <c>x_SUITE</c>, even if it doesn't export <c>init_per_suite/1</c>. This feature
-      makes it possible to use hooks as configuration fallbacks, or even
-      completely replace all configuration functions with hook functions.</p>
+      <c>post_init_per_suite(x_SUITE, ...)</c> are called for test suite
+      <c>x_SUITE</c>, even if it does not export <c>init_per_suite/1</c>. 
+      With this feature hooks can be used as configuration fallbacks, and all
+      configuration functions can be replaced with hook functions.</p>
 
     <section>
       <marker id="pre"/>
       <title>Pre Hooks</title>
       <p>
-	It is possible in a CTH to hook in behaviour before 
-	<seealso marker="common_test#Module:init_per_suite-1">init_per_suite</seealso>, 
-	<seealso marker="common_test#Module:init_per_suite-1">init_per_group</seealso>, 
-	<seealso marker="common_test#Module:init_per_suite-1">init_per_testcase</seealso>, 
-	<seealso marker="common_test#Module:init_per_suite-1">end_per_group</seealso> and 
-	<seealso marker="common_test#Module:init_per_suite-1">end_per_suite</seealso>. 
+	In a CTH, the behavior can be hooked in before the following functions:</p>
+
+     <list type="bulleted">
+       <item><seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite</c></seealso></item>
+       <item><seealso marker="common_test#Module:init_per_group-2"><c>init_per_group</c></seealso></item>
+       <item><seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase</c></seealso></item>
+       <item><seealso marker="common_test#Module:end_per_testcase-2"><c>end_per_testcase</c></seealso></item>
+       <item><seealso marker="common_test#Module:end_per_group-2"><c>end_per_group</c></seealso></item>
+       <item><seealso marker="common_test#Module:end_per_suite-1"><c>end_per_suite</c></seealso></item>
+     </list>
+
+        <p>
 	This is done in the CTH functions called pre_&lt;name of function&gt;.
-	All of these functions take the same three arguments: <c>Name</c>, 
-	<c>Config</c> and <c>CTHState</c>. The return value of the CTH function
-	is always a combination of an result for the suite/group/test and an 
-	updated <c>CTHState</c>. If you want the test suite to continue on 
-	executing you should return the config list which you want the test to 
-	use as the result. If you for some reason want to skip/fail the test, 
-	return a tuple with <c>skip</c> or <c>fail</c> and a reason as the 
-	result. Example:
-      </p>
-      <code>pre_init_per_suite(SuiteName, Config, CTHState) -&gt;
-  case db:connect() of
-    {error,_Reason} -&gt;
-      {{fail, "Could not connect to DB"}, CTHState};
-    {ok, Handle} -&gt;
-      {[{db_handle, Handle} | Config], CTHState#state{ handle = Handle }}
-  end.</code>
-  <note><p>If using multiple CTHs, the first part of the return tuple will be
-  used as input for the next CTH. So in the case above the next CTH might
+	These functions take the same three arguments, <c>Name</c>, 
+	<c>Config</c>, and <c>CTHState</c>. The return value of the CTH function
+	is always a combination of a result for the suite/group/test and an 
+	updated <c>CTHState</c>.</p>
+
+	<p>To let the test suite continue on executing, return the configuration 
+	list that you want the test to use as the result. To skip or 
+	fail the test, return a tuple with <c>skip</c> or <c>fail</c>, and a reason 
+	as the result.</p>
+
+	<p><em>Example:</em></p>
+	<code>
+ pre_init_per_suite(SuiteName, Config, CTHState) -&gt;
+   case db:connect() of
+     {error,_Reason} -&gt;
+       {{fail, "Could not connect to DB"}, CTHState};
+     {ok, Handle} -&gt;
+       {[{db_handle, Handle} | Config], CTHState#state{ handle = Handle }}
+   end.</code>
+
+  <note><p>If you use multiple CTHs, the first part of the return tuple is
+  used as input for the next CTH. So in the previous example the next CTH can
   get <c>{fail,Reason}</c> as the second parameter. If you have many CTHs
-  which interact, it might be a good idea to not let each CTH return
-  <c>fail</c> or <c>skip</c>. Instead return that an action should be taken
-  through the <c>Config</c> list and implement a CTH which at the end takes
-  the correct action.</p></note>
+  interacting, do not let each CTH return <c>fail</c> or <c>skip</c>. 
+  Instead, return that an action is to be taken through the <c>Config</c> 
+  list and implement a CTH that, at the end, takes the correct action.</p></note>
 	
     </section>
     
     <section>
       <marker id="post"/>
       <title>Post Hooks</title>
-      <p>It is also possible in a CTH to hook in behaviour after 
-      <seealso marker="common_test#Module:init_per_suite-1">init_per_suite</seealso>, 
-      <seealso marker="common_test#Module:init_per_suite-1">init_per_group</seealso>, 
-      <seealso marker="common_test#Module:init_per_suite-1">end_per_testcase</seealso>, 
-      <seealso marker="common_test#Module:init_per_suite-1">end_per_group</seealso> and 
-      <seealso marker="common_test#Module:init_per_suite-1">end_per_suite</seealso>.
-      This is done in the CTH functions called post_&lt;name of function&gt;. 
-      All of these function take the same four arguments: <c>Name</c>, 
-      <c>Config</c>, <c>Return</c> and <c>CTHState</c>. <c>Config</c> in this
+      <p>In a CTH, behavior can be hooked in after the following functions:</p>
+      <list type="bulleted">
+       <item><seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite</c></seealso></item>
+       <item><seealso marker="common_test#Module:init_per_group-2"><c>init_per_group</c></seealso></item>
+       <item><seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase</c></seealso></item>
+       <item><seealso marker="common_test#Module:end_per_testcase-2"><c>end_per_testcase</c></seealso></item>
+       <item><seealso marker="common_test#Module:end_per_group-2"><c>end_per_group</c></seealso></item>
+       <item><seealso marker="common_test#Module:end_per_suite-1"><c>end_per_suite</c></seealso></item>
+     </list>
+
+     <p>
+      This is done in the CTH functions called <c>post_&lt;name of function&gt;</c>. 
+      These functions take the same four arguments, <c>Name</c>, 
+      <c>Config</c>, <c>Return</c>, and <c>CTHState</c>. <c>Config</c> in this
       case is the same <c>Config</c> as the testcase is called with. 
       <c>Return</c> is the value returned by the testcase. If the testcase 
-      failed by crashing, <c>Return</c> will be 
+      fails by crashing, <c>Return</c> is
       <c>{'EXIT',{{Error,Reason},Stacktrace}}</c>.</p>
       
-      <p>The return value of the CTH function is always a combination of an
+      <p>The return value of the CTH function is always a combination of a
 	result for the suite/group/test and an updated <c>CTHState</c>. If
-	you want the callback to not affect the outcome of the test you should
+	you do not want the callback to affect the outcome of the test,
 	return the <c>Return</c> data as it is given to the CTH. You can also
-	modify the result of the test. By returning the <c>Config</c> list
-	with the <c>tc_status</c> element removed you can recover from a test 
+	modify the test result. By returning the <c>Config</c> list
+	with element <c>tc_status</c> removed, you can recover from a test 
 	failure. As in all the pre hooks, it is also possible to fail/skip
-	the test case in the post hook. Example: </p>
-
-      <code>post_end_per_testcase(_TC, Config, {'EXIT',{_,_}}, CTHState) -&gt;
-  case db:check_consistency() of
-    true ->
-      %% DB is good, pass the test.
-      {proplists:delete(tc_status, Config), CTHState};
-    false ->
-      %% DB is not good, mark as skipped instead of failing
-      {{skip, "DB is inconsisten!"}, CTHState}
-  end;
-post_end_per_testcase(_TC, Config, Return, CTHState) -&gt;
-  %% Do nothing if tc does not crash.
-  {Return, CTHState}.</code>
-
-      <note><p>Recovering from a testcase failure using CTHs should only be done as
-	a last resort. If used wrongly it could become very difficult to 
-	determine which tests pass or fail in a test run</p></note>
+	the test case in the post hook.</p>
+	
+	<p><em>Example:</em></p>
+	<code>
+ post_end_per_testcase(_TC, Config, {'EXIT',{_,_}}, CTHState) -&gt;
+   case db:check_consistency() of
+     true ->
+       %% DB is good, pass the test.
+       {proplists:delete(tc_status, Config), CTHState};
+     false ->
+       %% DB is not good, mark as skipped instead of failing
+       {{skip, "DB is inconsisten!"}, CTHState}
+   end;
+ post_end_per_testcase(_TC, Config, Return, CTHState) -&gt;
+   %% Do nothing if tc does not crash.
+   {Return, CTHState}.</code>
+
+      <note><p>Do recover from a testcase failure using CTHs only a last resort. 
+      If used wrongly, it can be very difficult to determine which tests that 
+      pass or fail in a test run.</p></note>
   
     </section>
 
     <section>
-      <marker id="skip_n_fail"/>
-      <title>Skip and Fail hooks</title>
+      <title>Skip and Fail Hooks</title>
       <p>
 	After any post hook has been executed for all installed CTHs, 
 	<seealso marker="ct_hooks#Module:on_tc_fail-3">on_tc_fail</seealso>
-	or <seealso marker="ct_hooks#Module:on_tc_fail-3">on_tc_skip</seealso> 
-	might be called if the testcase failed or was skipped 
-	respectively. You cannot affect the outcome of the tests any further at 
-	this point. 
+	or <seealso marker="ct_hooks#Module:on_tc_skip-3">on_tc_skip</seealso> 
+	is called if the testcase failed or was skipped, respectively. 
+	You cannot affect the outcome of the tests any further at this point. 
       </p>
     </section>
 
   </section>
 
   <section>
-    <marker id="synchronizing"/>
-    <title>Synchronizing external user applications with Common Test</title>
+     <marker id="synchronizing"/>
+    <title>Synchronizing External User Applications with Common Test</title>
     <p>CTHs can be used to synchronize test runs with external user applications.
-    The init function may e.g. start and/or communicate with an application that
-    has the purpose of preparing the SUT for an upcoming test run, or maybe
+    The init function can, for example, start and/or communicate with an application that
+    has the purpose of preparing the SUT for an upcoming test run, or 
     initialize a database for saving test data to during the test run. The
-    terminate function may similarly order such an application to reset the SUT
+    terminate function can similarly order such an application to reset the SUT
     after the test run, and/or tell the application to finish active sessions
     and terminate.
     Any system error- or progress reports generated during the init- or
-    termination stage will be saved in the 
-    <seealso marker="run_test_chapter#pre_post_test_io_log">Pre-
-    and post test I/O log</seealso>. (This is also true for any printouts made
+    termination stage are saved in the 
+    <seealso marker="run_test_chapter#pre_post_test_io_log">Pre- and Post Test I/O Log</seealso>. 
+    (This is also true for any printouts made
     with <c>ct:log/2</c> and <c>ct:pal/2</c>).</p>
-    <p>In order to ensure that Common Test doesn't start executing tests, or
+
+    <p>To ensure that <c>Common Test</c> does not start executing tests, or
     closes its log files and shuts down, before the external application
-    is ready for it, Common Test may be synchronized with the application. 
-    During startup and shutdown, Common Test can be suspended, simply by
+    is ready for it, <c>Common Test</c> can be synchronized with the application. 
+    During startup and shutdown, <c>Common Test</c> can be suspended, simply by
     having a CTH evaluate a <c>receive</c> expression in the init- or terminate
     function. The macros <c>?CT_HOOK_INIT_PROCESS</c> (the process executing the hook
     init function) and <c>?CT_HOOK_TERMINATE_PROCESS</c> (the process executing
-    the hook terminate function), each specifies the name of the correct Common Test
-    process to send a message to in order to return from the <c>receive</c>.
+    the hook terminate function) each specifies the name of the correct <c>Common Test</c>
+    process to send a message to. This is done to return from the <c>receive</c>.
     These macros are defined in <c>ct.hrl</c>.
     </p>
   </section>
 
   <section>
-     <marker id="example"/>
+    <marker id="example"/>
      <title>Example CTH</title>
-     <p>The CTH below will log information about a test run into a format 
-       parseable by <seealso marker="kernel:file#consult-1">file:consult/1</seealso>.
+     <p>The following CTH logs information about a test run into a format 
+       parseable by <seealso marker="kernel:file#consult-1">file:consult/1</seealso> 
+       (in <c>Kernel</c>):
      </p>
-     <code>%%% @doc Common Test Example Common Test Hook module.
--module(example_cth).
-
-%% Callbacks
--export([id/1]).
--export([init/2]).
-
--export([pre_init_per_suite/3]).
--export([post_init_per_suite/4]).
--export([pre_end_per_suite/3]).
--export([post_end_per_suite/4]).
-
--export([pre_init_per_group/3]).
--export([post_init_per_group/4]).
--export([pre_end_per_group/3]).
--export([post_end_per_group/4]).
-
--export([pre_init_per_testcase/3]).
--export([post_end_per_testcase/4]).
-
--export([on_tc_fail/3]).
--export([on_tc_skip/3]).
-
--export([terminate/1]).
-
--record(state, { file_handle, total, suite_total, ts, tcs, data }).
-
-%% @doc Return a unique id for this CTH.
-id(Opts) ->
-  proplists:get_value(filename, Opts, "/tmp/file.log").
-
-%% @doc Always called before any other callback function. Use this to initiate
-%% any common state. 
-init(Id, Opts) ->
-    {ok,D} = file:open(Id,[write]),
-    {ok, #state{ file_handle = D, total = 0, data = [] }}.
-
-%% @doc Called before init_per_suite is called. 
-pre_init_per_suite(Suite,Config,State) ->
-    {Config, State#state{ suite_total = 0, tcs = [] }}.
-
-%% @doc Called after init_per_suite.
-post_init_per_suite(Suite,Config,Return,State) ->
-    {Return, State}.
-
-%% @doc Called before end_per_suite. 
-pre_end_per_suite(Suite,Config,State) ->
-    {Config, State}.
-
-%% @doc Called after end_per_suite. 
-post_end_per_suite(Suite,Config,Return,State) ->
-    Data = {suites, Suite, State#state.suite_total, lists:reverse(State#state.tcs)},
-    {Return, State#state{ data = [Data | State#state.data] ,
-                          total = State#state.total + State#state.suite_total } }.
-
-%% @doc Called before each init_per_group.
-pre_init_per_group(Group,Config,State) ->
-    {Config, State}.
-
-%% @doc Called after each init_per_group.
-post_init_per_group(Group,Config,Return,State) ->
-    {Return, State}.
-
-%% @doc Called after each end_per_group. 
-pre_end_per_group(Group,Config,State) ->
-    {Config, State}.
-
-%% @doc Called after each end_per_group. 
-post_end_per_group(Group,Config,Return,State) ->
-    {Return, State}.
-
-%% @doc Called before each test case.
-pre_init_per_testcase(TC,Config,State) ->
-    {Config, State#state{ ts = now(), total = State#state.suite_total + 1 } }.
-
-%% @doc Called after each test case.
-post_end_per_testcase(TC,Config,Return,State) ->
-    TCInfo = {testcase, TC, Return, timer:now_diff(now(), State#state.ts)},
-    {Return, State#state{ ts = undefined, tcs = [TCInfo | State#state.tcs] } }.
-
-%% @doc Called after post_init_per_suite, post_end_per_suite, post_init_per_group,
-%% post_end_per_group and post_end_per_testcase if the suite, group or test case failed.
-on_tc_fail(TC, Reason, State) ->
-    State.
-
-%% @doc Called when a test case is skipped by either user action
-%% or due to an init function failing.  
-on_tc_skip(TC, Reason, State) ->
-    State.
-
-%% @doc Called when the scope of the CTH is done
-terminate(State) ->
-    io:format(State#state.file_handle, "~p.~n",
-               [{test_run, State#state.total, State#state.data}]),
-    file:close(State#state.file_handle),
-    ok.</code>
+     <code>
+ %%% @doc Common Test Example Common Test Hook module.
+ -module(example_cth).
+
+ %% Callbacks
+ -export([id/1]).
+ -export([init/2]).
+
+ -export([pre_init_per_suite/3]).
+ -export([post_init_per_suite/4]).
+ -export([pre_end_per_suite/3]).
+ -export([post_end_per_suite/4]).
+
+ -export([pre_init_per_group/3]).
+ -export([post_init_per_group/4]).
+ -export([pre_end_per_group/3]).
+ -export([post_end_per_group/4]).
+
+ -export([pre_init_per_testcase/3]).
+ -export([post_init_per_testcase/4]).
+ -export([pre_end_per_testcase/3]).
+ -export([post_end_per_testcase/4]).
+
+ -export([on_tc_fail/3]).
+ -export([on_tc_skip/3]).
+
+ -export([terminate/1]).
+
+ -record(state, { file_handle, total, suite_total, ts, tcs, data }).
+
+ %% @doc Return a unique id for this CTH.
+ id(Opts) ->
+   proplists:get_value(filename, Opts, "/tmp/file.log").
+
+ %% @doc Always called before any other callback function. Use this to initiate
+ %% any common state. 
+ init(Id, Opts) ->
+     {ok,D} = file:open(Id,[write]),
+     {ok, #state{ file_handle = D, total = 0, data = [] }}.
+
+ %% @doc Called before init_per_suite is called. 
+ pre_init_per_suite(Suite,Config,State) ->
+     {Config, State#state{ suite_total = 0, tcs = [] }}.
+
+ %% @doc Called after init_per_suite.
+ post_init_per_suite(Suite,Config,Return,State) ->
+     {Return, State}.
+
+ %% @doc Called before end_per_suite. 
+ pre_end_per_suite(Suite,Config,State) ->
+     {Config, State}.
+
+ %% @doc Called after end_per_suite. 
+ post_end_per_suite(Suite,Config,Return,State) ->
+     Data = {suites, Suite, State#state.suite_total, lists:reverse(State#state.tcs)},
+     {Return, State#state{ data = [Data | State#state.data] ,
+                           total = State#state.total + State#state.suite_total } }.
+
+ %% @doc Called before each init_per_group.
+ pre_init_per_group(Group,Config,State) ->
+     {Config, State}.
+
+ %% @doc Called after each init_per_group.
+ post_init_per_group(Group,Config,Return,State) ->
+     {Return, State}.
+
+ %% @doc Called before each end_per_group. 
+ pre_end_per_group(Group,Config,State) ->
+     {Config, State}.
+
+ %% @doc Called after each end_per_group. 
+ post_end_per_group(Group,Config,Return,State) ->
+     {Return, State}.
+
+ %% @doc Called before each init_per_testcase.
+ pre_init_per_testcase(TC,Config,State) ->
+     {Config, State#state{ ts = now(), total = State#state.suite_total + 1 } }.
+
+ %% Called after each init_per_testcase (immediately before the test case).
+ post_init_per_testcase(TC,Config,Return,State) ->
+     {Return, State}
+
+%% @doc Called before each end_per_testcase (immediately after the test case).
+ pre_end_per_testcase(TC,Config,State) ->
+     {Config, State}.
+
+ %% @doc Called after each end_per_testcase.
+ post_end_per_testcase(TC,Config,Return,State) ->
+     TCInfo = {testcase, TC, Return, timer:now_diff(now(), State#state.ts)},
+     {Return, State#state{ ts = undefined, tcs = [TCInfo | State#state.tcs] } }.
+
+ %% @doc Called after post_init_per_suite, post_end_per_suite, post_init_per_group,
+ %% post_end_per_group and post_end_per_testcase if the suite, group or test case failed.
+ on_tc_fail(TC, Reason, State) ->
+     State.
+
+ %% @doc Called when a test case is skipped by either user action
+ %% or due to an init function failing.  
+ on_tc_skip(TC, Reason, State) ->
+     State.
+
+ %% @doc Called when the scope of the CTH is done
+ terminate(State) ->
+     io:format(State#state.file_handle, "~p.~n",
+                [{test_run, State#state.total, State#state.data}]),
+     file:close(State#state.file_handle),
+     ok.</code>
   </section>
 
   <section>
-    <marker id="builtin_cths"/>
-    <title>Built-in CTHs</title>
-    <p>Common Test is delivered with a couple of general purpose CTHs that
-    can be enabled by the user to provide some generic testing functionality.
-    Some of these are enabled by default when starting running common_test,
-    they can be disabled by setting <c>enable_builtin_hooks</c> to
-    <c>false</c> on the command line or in the test specification. In the
-    table below there is a list of all current CTHs which are delivered with
-    Common Test.</p>
-
-    <table>
-      <row>
-	<cell align="left"><em>CTH Name</em></cell>
-	<cell align="left"><em>Is Built-in</em></cell>
-	<cell align="left"><em>Description</em></cell>
-      </row>
-      <row>
-	<cell align="left">cth_log_redirect</cell>
-	<cell align="left">yes</cell>
-	<cell align="left">Captures all error_logger and SASL logging events and prints them
-	to the current test case log. If an event can not be associated with a
-	testcase it will be printed in the common test framework log. This will
-	happen for testcases which are run in parallel and events which occur
-	inbetween testcases. You can configure the level of
-	<seealso marker="sasl:sasl_app">SASL</seealso> events report
-	using the normal SASL mechanisms. </cell>
-      </row>
-      <row>
-	<cell align="left">cth_surefire</cell>
-	<cell align="left">no</cell>
-	<cell align="left"><p>Captures all test results and outputs them as surefire
-	XML into a file. The file which is created is by default
-	called junit_report.xml. The file name can be changed by
-	setting the <c>path</c> option for this hook, e.g.</p>
-
-	<code>-ct_hooks cth_surefire [{path,"/tmp/report.xml"}]</code>
-
-	<p>If the <c>url_base</c> option is set, an additional
-	attribute named <c>url</c> will be added to each
-	<c>testsuite</c> and <c>testcase</c> XML element. The value will
-	be constructed from the <c>url_base</c> and a relative path
-	to the test suite or test case log respectively, e.g.</p>
-
-	<code>-ct_hooks cth_surefire [{url_base, "http://myserver.com/"}]</code>
-	<p>will give a url attribute value similar to</p>
-
-	<code>"http://myserver.com/[email protected]_11.19.39/
-x86_64-unknown-linux-gnu.my_test.logs/run.2012-12-12_11.19.39/suite.log.html"</code>
-
-	<p>Surefire XML can for instance be used by Jenkins to display test
-	results.</p></cell>
-      </row>
-    </table>
+     <marker id="builtin_cths"/>
+    <title>Built-In CTHs</title>
+    <p><c>Common Test</c> is delivered with some general-purpose CTHs that
+    can be enabled by the user to provide generic testing functionality.
+    Some of these CTHs are enabled by default when <c>common_test</c> is started to run.
+    They can be disabled by setting <c>enable_builtin_hooks</c> to
+    <c>false</c> on the command line or in the test specification. The following
+    two CTHs are delivered with <c>Common Test</c>:</p>
+
+    <taglist>
+       <tag><c>cth_log_redirect</c></tag>
+       <item>
+       <p>Built-in</p>
+       <p>Captures all <c>error_logger</c> and <c>SASL</c> logging 
+	events and prints them to the current test case log. If an event cannot be 
+	associated with a test case, it is printed in the <c>Common Test</c> framework log. 
+	This happens for test cases running in parallel and events occuring
+	in-between test cases. You can configure the level of
+	<seealso marker="sasl:sasl_app"><c>SASL</c></seealso> events report
+	using the normal <c>SASL</c> mechanisms.</p>
+       </item>
+       <tag><c>cth_surefire</c></tag>
+       <item>
+       <p>Not built-in</p>
+       <p>Captures all test results and outputs them as surefire
+	XML into a file. The created file is by default
+	called <c>junit_report.xml</c>. The file name can be changed by
+	setting option <c>path</c> for this hook, for example:</p>
+
+	<p><c>-ct_hooks cth_surefire [{path,"/tmp/report.xml"}]</c></p>
+
+	<p>If option <c>url_base</c> is set, an extra
+	attribute named <c>url</c> is added to each
+	<c>testsuite</c> and <c>testcase</c> XML element. The value
+	is constructed from <c>url_base</c> and a relative path
+	to the test suite or test case log, respectively, for example:</p>
+
+	<p><c>-ct_hooks cth_surefire [{url_base, "http://myserver.com/"}]</c></p>
+
+	<p>gives an URL attribute value similar to</p>
+
+	<p><c>"http://myserver.com/[email protected]_11.19.39/
+x86_64-unknown-linux-gnu.my_test.logs/run.2012-12-12_11.19.39/suite.log.html"</c></p>
+
+	<p>Surefire XML can, for example, be used by Jenkins to display test
+	results.</p>
+       </item>
+     </taglist>
 
   </section>
 
diff --git a/lib/common_test/doc/src/ct_master.xml b/lib/common_test/doc/src/ct_master.xml
new file mode 100644
index 0000000000..06f9b04f1b
--- /dev/null
+++ b/lib/common_test/doc/src/ct_master.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2010</year><year>2012</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+
+    </legalnotice>
+
+    <title>ct_master</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>ct_master.xml</file>
+  </header>
+  <module>ct_master</module>
+  <modulesummary>Distributed test execution control for Common Test.</modulesummary>
+
+<description>
+
+    <p>Distributed test execution control for <c>Common Test</c>.</p>
+
+    <p>This module exports functions for running <c>Common Test</c> nodes on
+      multiple hosts in parallel.</p>
+
+</description>
+
+  <funcs>
+    <func>
+      <name>abort() -&gt; ok</name>
+      <fsummary>Stops all running tests.</fsummary>
+      <desc><marker id="abort-0"/>
+        <p>Stops all running tests.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>abort(Nodes) -&gt; ok</name>
+      <fsummary>Stops tests on specified nodes.</fsummary>
+      <type>
+        <v>Nodes = atom() | [atom()]</v>
+      </type>
+      <desc><marker id="abort-1"/>
+        <p>Stops tests on specified nodes.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>basic_html(Bool) -&gt; ok</name>
+      <fsummary>If set to true, the ct_master logs are written on a primitive
+        HTML format, not using the <c>Common Test</c> CSS style sheet.</fsummary>
+      <type>
+        <v>Bool = true | false</v>
+      </type>
+      <desc><marker id="basic_html-1"/>
+        <p>If set to <c>true</c>, the <c>ct_master logs</c> are written on a
+          primitive HTML format, not using the <c>Common Test</c> CSS style
+          sheet.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_event_mgr_ref() -&gt; MasterEvMgrRef</name>
+      <fsummary>Gets a reference to the <c>Common Test</c> master event
+        manager.</fsummary>
+      <type>
+        <v>MasterEvMgrRef = atom()</v>
+      </type>
+      <desc><marker id="get_event_mgr_ref-0"/>
+        <p>Gets a reference to the <c>Common Test</c> master event manager.
+          The reference can be used to, for example, add a user-specific
+          event handler while tests are running.</p>
+
+        <p><em>Example:</em></p>
+
+        <pre>
+ gen_event:add_handler(ct_master:get_event_mgr_ref(), my_ev_h, [])</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name>progress() -&gt; [{Node, Status}]</name>
+      <fsummary>Returns test progress.</fsummary>
+      <type>
+        <v>Node = atom()</v>
+        <v>Status = finished_ok | ongoing | aborted | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="progress-0"/>
+        <p>Returns test progress. If <c>Status</c> is <c>ongoing</c>, tests
+          are running on the node and are not yet finished.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>run(TestSpecs) -&gt; ok</name>
+      <fsummary>Equivalent to run(TestSpecs, false, [], []).</fsummary>
+      <type>
+        <v>TestSpecs = string() | [SeparateOrMerged]</v>
+      </type>
+      <desc><marker id="run-1"/>
+        <p>Equivalent to <seealso marker="#run-4"><c>ct_master:run(TestSpecs,
+          false, [], [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>run(TestSpecs, InclNodes, ExclNodes) -&gt; ok</name>
+      <fsummary>Equivalent to run(TestSpecs, false, InclNodes, ExclNodes).
+      </fsummary>
+      <type>
+        <v>TestSpecs = string() | [SeparateOrMerged]</v>
+        <v>SeparateOrMerged = string() | [string()]</v>
+        <v>InclNodes = [atom()]</v>
+        <v>ExclNodes = [atom()]</v>
+      </type>
+      <desc><marker id="run-3"/>
+        <p>Equivalent to <seealso marker="#run-4"><c>ct_master:run(TestSpecs,
+          false, InclNodes, ExclNodes)</c></seealso>.</p>
+      </desc>
+     </func>
+
+     <func>
+       <name>run(TestSpecs, AllowUserTerms, InclNodes, ExclNodes) -&gt; ok</name>
+       <fsummary>Tests are spawned on the nodes as specified in TestSpecs.
+       </fsummary>
+       <type>
+         <v>TestSpecs = string() | [SeparateOrMerged]</v>
+         <v>SeparateOrMerged = string() | [string()]</v>
+         <v>AllowUserTerms = bool()</v>
+         <v>InclNodes = [atom()]</v>
+         <v>ExclNodes = [atom()]</v>
+      </type>
+      <desc><marker id="run-4"/>
+        <p>Tests are spawned on the nodes as specified in <c>TestSpecs</c>.
+          Each specification in <c>TestSpec</c> is handled separately.
+          However, it is also possible to specify a list of specifications to
+          be merged into one specification before the tests are executed. Any
+          test without a particular node specification is also executed on
+          the nodes in <c>InclNodes</c>. Nodes in the <c>ExclNodes</c> list
+          are excluded from the test.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>run_on_node(TestSpecs, Node) -&gt; ok</name>
+      <fsummary>Equivalent to run_on_node(TestSpecs, false, Node).</fsummary>
+      <type>
+        <v>TestSpecs = string() | [SeparateOrMerged]</v>
+        <v>SeparateOrMerged = string() | [string()]</v>
+        <v>Node = atom()</v>
+      </type>
+      <desc><marker id="run_on_node-2"/>
+        <p>Equivalent to
+          <seealso marker="#run_on_node-3"><c>ct_master:run_on_node(TestSpecs,
+          false, Node)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>run_on_node(TestSpecs, AllowUserTerms, Node) -&gt; ok</name>
+      <fsummary>Tests are spawned on Node according to TestSpecs.</fsummary>
+      <type>
+        <v>TestSpecs = string() | [SeparateOrMerged]</v>
+        <v>SeparateOrMerged = string() | [string()]</v>
+        <v>AllowUserTerms = bool()</v>
+        <v>Node = atom()</v>
+      </type>
+      <desc><marker id="run_on_node-3"/>
+        <p>Tests are spawned on <c>Node</c> according to <c>TestSpecs</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>run_test(Node, Opts) -&gt; ok</name>
+      <fsummary>Tests are spawned on Node using ct:run_test/1.</fsummary>
+      <type>
+        <v>Node = atom()</v>
+        <v>Opts = [OptTuples]</v>
+        <v>OptTuples = {config, CfgFiles} | {dir, TestDirs} | {suite, Suites} | {testcase, Cases} | {spec, TestSpecs} | {allow_user_terms, Bool} | {logdir, LogDir} | {event_handler, EventHandlers} | {silent_connections, Conns} | {cover, CoverSpecFile} | {cover_stop, Bool} | {userconfig, UserCfgFiles}</v>
+        <v>CfgFiles = string() | [string()]</v>
+        <v>TestDirs = string() | [string()]</v>
+        <v>Suites = atom() | [atom()]</v>
+        <v>Cases = atom() | [atom()]</v>
+        <v>TestSpecs = string() | [string()]</v>
+        <v>LogDir = string()</v>
+        <v>EventHandlers = EH | [EH]</v>
+        <v>EH = atom() | {atom(), InitArgs} | {[atom()], InitArgs}</v>
+        <v>InitArgs = [term()]</v>
+        <v>Conns = all | [atom()]</v>
+      </type>
+      <desc><marker id="run_test-2"/>
+        <p>Tests are spawned on <c>Node</c> using
+          <seealso marker="ct:run_test-1"><c>ct:run_test/1</c></seealso></p>
+      </desc>
+    </func>
+  </funcs>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/ct_master_chapter.xml b/lib/common_test/doc/src/ct_master_chapter.xml
index 16492f39b8..99555164e0 100644
--- a/lib/common_test/doc/src/ct_master_chapter.xml
+++ b/lib/common_test/doc/src/ct_master_chapter.xml
@@ -22,7 +22,7 @@
 
     </legalnotice>
 
-    <title>Using Common Test for Large Scale Testing</title>
+    <title>Using Common Test for Large-Scale Testing</title>
     <prepared>Peter Andersson</prepared>
     <docno></docno>
     <date></date>
@@ -33,217 +33,220 @@
   <section>
     <marker id="general"></marker>
     <title>General</title>
-    <p>Large scale automated testing requires running multiple independent 
+    <p>Large-scale automated testing requires running multiple independent 
       test sessions in parallel. This is accomplished by running
-      a number of Common Test nodes on one or more hosts, testing
-      different target systems. Configuring, starting and controlling the
+      some <c>Common Test</c> nodes on one or more hosts, testing
+      different target systems. Configuring, starting, and controlling the
       test nodes independently can be a cumbersome operation. To aid
-      this kind of automated large scale testing, CT offers a master test 
-      node component, CT Master, that handles central configuration and control
-      in a system of distributed CT nodes.</p>
+      this kind of automated large-scale testing, <c>Common Test</c> offers a master 
+      test node component, <c>Common Test</c> Master, which handles central configuration and control
+      in a system of distributed <c>Common Test</c> nodes.</p>
 
-    <p>The CT Master server runs on one dedicated Erlang node and uses distributed
-      Erlang to communicate with any number of CT test nodes, each hosting a regular
-      CT server. Test specifications are used as input to specify what to test on which 
+    <p>The <c>Common Test</c> Master server runs on one dedicated Erlang node and uses distributed
+      Erlang to communicate with any number of <c>Common Test</c> test nodes, each hosting a regular
+      <c>Common Test</c> server. Test specifications are used as input to specify what to test on which 
       test nodes, using what configuration.</p> 
 
-    <p>The CT Master server writes progress information to HTML log files similarly 
-      to the regular CT server. The logs contain test statistics and links to the 
-      log files written by each independent CT server.</p>
+    <p>The <c>Common Test</c> Master server writes progress information to HTML log files similarly 
+      to the regular <c>Common Test</c> server. The logs contain test statistics and links to the 
+      log files written by each independent <c>Common Test</c> server.</p>
 
-    <p>The CT master API is exported by the <c>ct_master</c> module.</p>
+    <p>The <c>Common Test</c> Master API is exported by module 
+    <seealso marker="ct_master"><c>ct_master</c></seealso>.</p>
   </section>
   <section>
-    <title>Usage</title>
-    <p>CT Master requires all test nodes to be on the same network and share a common 
-      file system. As of this date, CT Master can not start test nodes
-      automatically. The nodes must have been started in advance for CT Master to be 
+    <title>Use</title>
+    <p><c>Common Test</c> Master requires all test nodes to be on the same network and share a common 
+      file system. <c>Common Test</c> Master cannot start test nodes
+      automatically. The nodes must be started in advance for <c>Common Test</c> Master to be 
       able to start test sessions on them.</p>
       
-    <p>Tests are started by calling:</p>
-    
-    <p><c>ct_master:run(TestSpecs)</c> or 
-       <c>ct_master:run(TestSpecs, InclNodes, ExclNodes)</c></p>
+    <p>Tests are started by calling 
+     <seealso marker="ct_master#run-1"><c>ct_master:run(TestSpecs)</c></seealso> or 
+     <seealso marker="ct_master#run-3"><c>ct_master:run(TestSpecs, InclNodes, ExclNodes)</c></seealso></p>
     
     <p><c>TestSpecs</c> is either the name of a test specification file (string) or a list 
-      of test specifications. In case of a list, the specifications will be handled (and
+      of test specifications. If it is a list, the specifications are handled (and
       the corresponding tests executed) in sequence. An element in a <c>TestSpecs</c> list 
-      can also be list of test specifications. The specifications in such a list will be 
-      merged into one combined specification prior to test execution. For example:</p>
-      
-    <p><c>ct_master:run(["ts1","ts2",["ts3","ts4"]])</c></p>
+      can also be list of test specifications. The specifications in such a list are 
+      merged into one combined specification before test execution.</p>
 
-    <p>means first the tests specified by "ts1" will run, then the tests specified by "ts2" 
+    <p><em>Example:</em></p>  
+    <pre>
+ ct_master:run(["ts1","ts2",["ts3","ts4"]])</pre>
+
+    <p>Here, the tests specified by "ts1" run first, then the tests specified by "ts2",
       and finally the tests specified by both "ts3" and "ts4".</p>
 
-    <p>The <c>InclNodes</c> argument to <c>run/3</c> is a list of node names. The <c>run/3</c> 
-      function runs the tests in <c>TestSpecs</c> just like <c>run/1</c> but will also 
-      take any test in <c>TestSpecs</c> that's not explicitly tagged with a particular 
-      node name and execute it on the nodes listed in <c>InclNodes</c>. By using <c>run/3</c> 
-      this way it is possible to use any test specification, with or without node information, 
-      in a large scale test environment! <c>ExclNodes</c> is a list of nodes that should be
-      excluded from the test. I.e. tests that have been specified in the test specification 
-      to run on a particular node will not be performed if that node is at runtime
-      listed in <c>ExclNodes</c>.</p>
-
-      <p>If CT Master fails initially to connect to any of the test nodes specified in a 
-      test specification or in the <c>InclNodes</c> list, the operator will be prompted with 
-      the option to either start over again (after manually checking the status of the 
-      node(s) in question), to run without the missing nodes, or to abort the operation.</p>
+    <p>The <c>InclNodes</c> argument to <c>run/3</c> is a list of node names. Function
+      <c>run/3</c> runs the tests in <c>TestSpecs</c> just like <c>run/1</c>, but also 
+      takes any test in <c>TestSpecs</c>, which is not explicitly tagged with a particular 
+      node name, and execute it on the nodes listed in <c>InclNodes</c>. By using <c>run/3</c> 
+      this way, any test specification can be used, with or without node information, 
+      in a large-scale test environment.</p>
+      
+      <p><c>ExclNodes</c> is a list of nodes to be
+      excluded from the test. That is, tests that are specified in the test specification 
+      to run on a particular node are not performed if that node is 
+      listed in <c>ExclNodes</c> at runtime.</p>
 
-      <p>When tests start, CT Master prints information to console about the nodes that are 
-      involved. CT Master also reports when tests finish, successfully or unsuccessfully. If
-      connection is lost to a node, the test on that node is considered finished. CT Master 
-      will not attempt to reestablish contact with the failing node. At any time to get the
-      current status of the test nodes, call the function:</p>
+      <p>If <c>Common Test</c> Master fails initially to connect to any of the test nodes specified in a 
+      test specification or in the <c>InclNodes</c> list, the operator is prompted with 
+      the option to either start over again (after manually checking the status of the 
+      nodes in question), to run without the missing nodes, or to abort the operation.</p>
 
-      <p><c>ct_master:progress()</c></p>
+      <p>When tests start, <c>Common Test</c> Master displays information to console about the involved nodes.  
+      <c>Common Test</c> Master also reports when tests finish, successfully or unsuccessfully. If
+      connection is lost to a node, the test on that node is considered finished. <c>Common Test</c> Master 
+      does not attempt to re-establish contact with the failing node.</p>
 
-      <p>To stop one or more tests, use:</p>
+      <p>At any time, to get the current status of the test nodes, call function 
+      <seealso marker="ct_master#progress-0"><c>ct_master:progress()</c></seealso>.</p>
 
-      <p><c>ct_master:abort()</c> (stop all) or <c>ct_master:abort(Nodes)</c></p>
+      <p>To stop one or more tests, use function
+      <seealso marker="ct_master#abort-0"><c>ct_master:abort()</c></seealso> (to stop all) or
+      <seealso marker="ct_master#abort-1"><c>ct_master:abort(Nodes)</c></seealso>.</p>
 
-      <p>For detailed information about the <c>ct_master</c> API, please see the 
-      <seealso marker="ct_master">manual page</seealso> for this module.</p>
+      <p>For details about the <c>Common Test</c> Master API, see module
+      <seealso marker="ct_master"><c>ct_master</c></seealso>.</p>
   </section>
   <section>
     <marker id="test_specifications"></marker>
     <title>Test Specifications</title>
-    <p>The test specifications used as input to CT Master are fully compatible with the
-    specifications used as input to the regular CT server. The syntax is described in the 
-    <seealso marker="run_test_chapter#test_specifications">Running Test Suites</seealso>
-    chapter.</p>
+    <p>The test specifications used as input to <c>Common Test</c> Master are fully compatible with the
+    specifications used as input to the regular <c>Common Test</c> server. The syntax is described in section 
+    <seealso marker="run_test_chapter#test_specifications">Test Specifications</seealso>
+    in section Running Tests and Analyzing Results.</p>
 
     <p>All test specification terms can have a <c>NodeRefs</c> element. This element
     specifies which node or nodes a configuration operation or a test is to be executed 
-    on. <c>NodeRefs</c> is defined as:</p>
+    on. <c>NodeRefs</c> is defined as follows:</p>
     
     <p><c>NodeRefs = all_nodes | [NodeRef] | NodeRef</c></p>
-    
-    <p>where</p>
 
     <p><c>NodeRef = NodeAlias | node() | master</c></p>
 
     <p>A <c>NodeAlias</c> (<c>atom()</c>) is used in a test specification as a 
-    reference to a node name (so the actual node name only needs to be declared once,
-      which can of course also be achieved using constants). 
-    The alias is declared with a <c>node</c> term:</p>
+    reference to a node name (so the node name only needs to be declared once,
+    which also can be achieved using constants). 
+    The alias is declared with a <c>node</c> term as follows:</p>
 
     <p><c>{node, NodeAlias, NodeName}</c></p>
 
-    <p>If <c>NodeRefs</c> has the value <c>all_nodes</c>, the operation or test will
-    be performed on all given test nodes. (Declaring a term without a <c>NodeRefs</c> 
-    element actually has the same effect). If <c>NodeRefs</c> has the value 
-    <c>master</c>, the operation is only performed on the CT Master node (namely set 
+    <p>If <c>NodeRefs</c> has the value <c>all_nodes</c>, the operation or test
+    is performed on all specified test nodes. (Declaring a term without a <c>NodeRefs</c> 
+    element has the same effect). If <c>NodeRefs</c> has the value 
+    <c>master</c>, the operation is only performed on the <c>Common Test</c> Master node (namely set 
     the log directory or install an event handler).</p>
 
-    <p>Consider the example in the 
-    <seealso marker="run_test_chapter#test_specifications">Running Test Suites</seealso>
-    chapter, now extended with node information and intended to be executed by the
-    CT Master:</p>
+    <p>Consider the example in section 
+    <seealso marker="run_test_chapter#test_specifications">Test Specifications</seealso>
+    in section Running Tests and Analysing Results,
+     now extended with node information and intended to be executed by
+    <c>Common Test</c> Master:</p>
 
     <pre>
-      {define, 'Top', "/home/test"}.
-      {define, 'T1', "'Top'/t1"}.
-      {define, 'T2', "'Top'/t2"}.
-      {define, 'T3', "'Top'/t3"}.
-      {define, 'CfgFile', "config.cfg"}.
-      {define, 'Node', ct_node}.
-
-      {node, node1, 'Node@host_x'}.
-      {node, node2, 'Node@host_y'}.
-
-      {logdir, master, "'Top'/master_logs"}.
-      {logdir, "'Top'/logs"}.
-      
-      {config, node1, "'T1'/'CfgFile'"}.
-      {config, node2, "'T2'/'CfgFile'"}.
-      {config, "'T3'/'CfgFile'"}.
-      
-      {suites, node1, 'T1', all}.
-      {skip_suites, node1, 'T1', [t1B_SUITE,t1D_SUITE], "Not implemented"}.
-      {skip_cases, node1, 'T1', t1A_SUITE, [test3,test4], "Irrelevant"}.
-      {skip_cases, node1, 'T1', t1C_SUITE, [test1], "Ignore"}.
-      
-      {suites, node2, 'T2', [t2B_SUITE,t2C_SUITE]}.
-      {cases, node2, 'T2', t2A_SUITE, [test4,test1,test7]}.
-      
-      {skip_suites, 'T3', all, "Not implemented"}.</pre>
+ {define, 'Top', "/home/test"}.
+ {define, 'T1', "'Top'/t1"}.
+ {define, 'T2', "'Top'/t2"}.
+ {define, 'T3', "'Top'/t3"}.
+ {define, 'CfgFile', "config.cfg"}.
+ {define, 'Node', ct_node}.
+
+ {node, node1, 'Node@host_x'}.
+ {node, node2, 'Node@host_y'}.
+
+ {logdir, master, "'Top'/master_logs"}.
+ {logdir, "'Top'/logs"}.
+
+ {config, node1, "'T1'/'CfgFile'"}.
+ {config, node2, "'T2'/'CfgFile'"}.
+ {config, "'T3'/'CfgFile'"}.
+
+ {suites, node1, 'T1', all}.
+ {skip_suites, node1, 'T1', [t1B_SUITE,t1D_SUITE], "Not implemented"}.
+ {skip_cases, node1, 'T1', t1A_SUITE, [test3,test4], "Irrelevant"}.
+ {skip_cases, node1, 'T1', t1C_SUITE, [test1], "Ignore"}.
+
+ {suites, node2, 'T2', [t2B_SUITE,t2C_SUITE]}.
+ {cases, node2, 'T2', t2A_SUITE, [test4,test1,test7]}.
+
+ {skip_suites, 'T3', all, "Not implemented"}.</pre>
 
     <p>This example specifies the same tests as the original example. But 
-    now if started with a call to <c>ct_master:run(TestSpecName)</c>, the 
-    t1 test will be executed on node <c>ct_node@host_x</c> (node1), the
-    t2 test on <c>ct_node@host_y</c> (node2) and the t3 test on both
-    node1 and node2. The t1 config file will only be read on
-    node1 and the t2 config file only on node2, while the t3 config file
-    will be read on both node1 and node2. Both test nodes will write log 
-    files to the same directory. (The CT Master node will however use a 
-    different log directory than the test nodes).</p>
+    now if started with a call to <c>ct_master:run(TestSpecName)</c>, test 
+    <c>t1</c> is executed on node <c>ct_node@host_x</c> (<c>node1</c>), test
+    <c>t2</c> on <c>ct_node@host_y</c> (<c>node2</c>) and test <c>t3</c>
+    on both <c>node1</c> and <c>node2</c>. Configuration file <c>t1</c> is only read on
+    <c>node1</c> and configuration file <c>t2</c> only on <c>node2</c>, while the 
+    configuration file <c>t3</c> is read on both <c>node1</c> and <c>node2</c>. 
+    Both test nodes write log files to the same directory. (However, the <c>Common Test</c> Master 
+    node uses a different log directory than the test nodes.)</p>
 
     <p>If the test session is instead started with a call to 
     <c>ct_master:run(TestSpecName, [ct_node@host_z], [ct_node@host_x])</c>, 
-    the result is that the t1 test does not run on 
-    <c>ct_node@host_x</c> (or any other node) while the t3 test runs on
+    the result is that test <c>t1</c> does not run on 
+    <c>ct_node@host_x</c> (or any other node) while test <c>t3</c> runs on both
     <c>ct_node@host_y</c> and <c>ct_node@host_z</c>.</p>
     
     <p>A nice feature is that a test specification that includes node 
-      information can still be used as input to the regular Common Test server 
-      (as described in the
-    <seealso marker="run_test_chapter#test_specifications">Running Test Suites</seealso>
-    chapter). The result is that any test specified to run on a node with the same
-    name as the Common Test node in question (typically <c>ct@somehost</c> if started
-    with the <c>ct_run</c> program), will be performed. Tests without explicit
-    node association will always be performed too of course!</p>
+      information can still be used as input to the regular <c>Common Test</c> server 
+      (as described in section
+    <seealso marker="run_test_chapter#test_specifications">Test Specifications</seealso>). 
+    The result is that any test specified to run on a node with the same
+    name as the <c>Common Test</c> node in question (typically <c>ct@somehost</c> if started
+    with the <c>ct_run</c> program), is performed. Tests without explicit
+    node association are always performed too, of course.</p>
   </section>
 
   <section>
-    <title>Automatic startup of test target nodes</title>
+    <title>Automatic Startup of Test Target Nodes</title>
     <marker id="ct_slave"></marker>
-    <p>It is possible to automatically start, and perform initial actions, on
-      test target nodes by using the test specification term <c>init</c>.</p>
-    <p>Currently, two sub-terms are supported, <c>node_start</c> and <c>eval</c>.</p>
-    <p>Example:</p>
+    <p>Initial actions can be started and performed automatically on
+      test target nodes using test specification term <c>init</c>.</p>
+    <p>Two subterms are supported, <c>node_start</c> and <c>eval</c>.</p>
+    <p><em>Example:</em></p>
     <pre>
-     {node, node1, node1@host1}.
-     {node, node2, node1@host2}.
-     {node, node3, node2@host2}.
-     {node, node4, node1@host3}.
-     {init, node1, [{node_start, [{callback_module, my_slave_callback}]}]}.
-     {init, [node2, node3], {node_start, [{username, "ct_user"}, {password, "ct_password"}]}}.
-     {init, node4, {eval, {module, function, []}}}.</pre>
+ {node, node1, node1@host1}.
+ {node, node2, node1@host2}.
+ {node, node3, node2@host2}.
+ {node, node4, node1@host3}.
+ {init, node1, [{node_start, [{callback_module, my_slave_callback}]}]}.
+ {init, [node2, node3], {node_start, [{username, "ct_user"}, {password, "ct_password"}]}}.
+ {init, node4, {eval, {module, function, []}}}.</pre>
 
     <p>This test specification declares that <c>node1@host1</c> is to be started using
       the user callback function <c>callback_module:my_slave_callback/0</c>, and nodes
-      <c>node1@host2</c> and <c>node2@host2</c> will be started with the default callback
-      module <c>ct_slave</c>. The given user name and password is used to log into remote
-      host <c>host2</c>. Also, the function <c>module:function/0</c> will be evaluated on
-      <c>node1@host3</c>, and the result of this call will be printed to the log.</p>
+      <c>node1@host2</c> and <c>node2@host2</c> are to be started with the default callback
+      module <c>ct_slave</c>. The specified username and password are used to log on to remote
+      host <c>host2</c>. Also, function <c>module:function/0</c> is evaluated on
+      <c>node1@host3</c>, and the result of this call is printed to the log.</p>
 
-    <p>The default <seealso marker="ct_slave">ct_slave</seealso> callback module,
-      which is part of the Common Test application, has the following features:
+    <p>The default callback module <seealso marker="ct_slave">ct_slave</seealso>,
+       has the following features:
     </p>
-    <list>
+    <list type="bulleted">
      <item>Starting Erlang target nodes on local or remote hosts
-       (ssh is used for communication).
+       (application <c>SSH</c> is used for communication).
      </item>
-     <item>Ability to start an Erlang emulator with additional flags
+     <item>Ability to start an Erlang emulator with more flags
        (any flags supported by <c>erl</c> are supported).
      </item>
-     <item>Supervision of a node being started by means of internal callback
-        functions. Used to prevent hanging nodes. (Configurable).
+     <item>Supervision of a node being started using internal callback
+        functions. Used to prevent hanging nodes. (Configurable.)
      </item>
-     <item>Monitoring of the master node by the slaves. A slave node may be
-        stopped in case the master node terminates. (Configurable).
+     <item>Monitoring of the master node by the slaves. A slave node can be
+        stopped if the master node terminates. (Configurable.)
      </item>
-     <item>Execution of user functions after a slave node is started.
-        Functions can be given as a list of {Module, Function, Arguments} tuples.
+     <item>Execution of user functions after a slave node is started. Functions can 
+     be specified as a list of <c>{Module, Function, Arguments}</c> tuples.
      </item>
     </list>
-    <p>Note that it is possible to specify an <c>eval</c> term for the node as well
-    as <c>startup_functions</c> in the <c>node_start</c> options list. In this
-    case first the node will be started, then the <c>startup_functions</c> are
+    <note><p>An <c>eval</c> term for the node and
+    <c>startup_functions</c> in the <c>node_start</c> options list can be specified. 
+    In this case, the node is started first, then the <c>startup_functions</c> are
     executed, and finally functions specified with <c>eval</c> are called.
-    </p>
+    </p></note>
   </section>
 
 </chapter>
diff --git a/lib/common_test/doc/src/ct_netconfc.xml b/lib/common_test/doc/src/ct_netconfc.xml
new file mode 100644
index 0000000000..d8c82c7f2c
--- /dev/null
+++ b/lib/common_test/doc/src/ct_netconfc.xml
@@ -0,0 +1,1039 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2010</year><year>2012</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+
+    </legalnotice>
+
+    <title>ct_netconfc</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>ct_netconfc.xml</file>
+  </header>
+  <module>ct_netconfc</module>
+  <modulesummary>NETCONF client module.</modulesummary>
+
+<description>
+
+    <p>NETCONF client module.</p>
+
+    <p>The NETCONF client is compliant with RFC 4741 NETCONF Configuration
+      Protocol and RFC 4742 Using the NETCONF Configuration Protocol over
+      Secure SHell (SSH)..</p>
+
+    <p>For each server to test against, the following entry can be added to a
+      configuration file:</p>
+
+    <pre>
+ {server_id(),options()}.</pre>
+
+    <p>The <c>server_id()</c> or an associated <c>target_name()</c> (see
+      module <seealso marker="ct"><c>ct</c></seealso>) must then be used
+      in calls to
+      <seealso marker="#open-2"><c>ct_netconfc:open/2</c></seealso>.</p>
+
+    <p>If no configuration exists for a server, a session can still be
+      opened by calling
+      <seealso marker="#open-2"><c>ct_netconfc:open/2</c></seealso> with
+      all necessary options specified in the call. The first argument to
+      <seealso marker="#open-2"><c>ct_netconfc:open/2</c></seealso> can
+      then be any atom.</p>
+
+  </description>
+
+  <section>
+  <marker id="Logging"/>
+    <title>Logging</title> 
+    <p>The NETCONF server uses <c>error_logger</c> for logging of NETCONF
+      traffic. A special purpose error handler is implemented in
+      <c>ct_conn_log_h</c>. To use this error handler, add the
+      <c>cth_conn_log</c> hook in the test suite, for example:</p>
+
+    <pre>
+ suite() -&gt;
+    [{ct_hooks, [{cth_conn_log, [{conn_mod(),hook_options()}]}]}].</pre>
+
+    <p><c>conn_mod()</c> is the name of the <c>Common Test</c> module
+      implementing the connection protocol, for example, <c>ct_netconfc</c>.</p>
+
+    <p>Hook option <c>log_type</c> specifies the type of logging:</p>
+
+    <taglist>
+      <tag><c>raw</c></tag>
+      <item><p>The sent and received NETCONF data is logged to a separate
+        text file "as is" without any formatting. A link to the file is
+        added to the test case HTML log.</p>.</item>
+
+      <tag><c>pretty</c></tag>
+      <item><p>The sent and received NETCONF data is logged to a separate
+        text file with XML data nicely indented. A link to the file is
+        added to the test case HTML log.</p></item>
+
+      <tag><c>html (default)</c></tag>
+      <item><p>The sent and received NETCONF traffic is pretty printed
+        directly in the test case HTML log.</p></item>
+
+      <tag><c>silent</c></tag>
+      <item><p>NETCONF traffic is not logged.</p></item>
+    </taglist>
+
+    <p>By default, all NETCONF traffic is logged in one single log file.
+      However, different connections can be logged in separate files.
+      To do this, use hook option <c>hosts</c> and list the names of the
+      servers/connections to be used in the suite. The connections
+      must be named for this to work, that is, they must be opened with
+      <seealso marker="#open-2"><c>ct_netconfc:open/2</c></seealso>.</p>
+
+    <p>Option <c>hosts</c> has no effect if <c>log_type</c> is set to
+      <c>html</c> or <c>silent</c>.</p>
+
+    <p>The hook options can also be specified in a configuration file with
+      configuration variable <c>ct_conn_log</c>:</p>
+
+    <pre>
+ {ct_conn_log,[{conn_mod(),hook_options()}]}.</pre>
+
+    <p>For example:</p>
+
+    <pre>
+ {ct_conn_log,[{ct_netconfc,[{log_type,pretty},
+                             {hosts,[key_or_name()]}]}]}</pre>
+
+    <note>
+      <p>Hook options specified in a configuration file overwrite the
+        hard-coded hook options in the test suite.</p>
+    </note>
+
+    <p><em>Logging Example 1:</em></p>
+    <marker id="Logging_example_1"/>
+
+    <p>The following <c>ct_hooks</c> statement causes pretty printing of
+      NETCONF traffic to separate logs for the connections named
+      <c>nc_server1</c> and <c>nc_server2</c>. Any other connections are
+      logged to default NETCONF log.</p>
+
+    <pre>
+ suite() -&gt;
+    [{ct_hooks, [{cth_conn_log, [{ct_netconfc,[{log_type,pretty}},
+                                               {hosts,[nc_server1,nc_server2]}]}
+                                ]}]}].</pre>
+
+    <p>Connections must be opened as follows:</p>
+
+    <pre>
+ open(nc_server1,[...]),
+ open(nc_server2,[...]).</pre>
+
+    <p><em>Logging Example 2:</em></p>
+    <marker id="Logging_example_2"/>
+
+    <p>The following configuration file causes raw logging of all NETCONF 
+      traffic in to one single text file:</p>
+
+    <pre>
+ {ct_conn_log,[{ct_netconfc,[{log_type,raw}]}]}.</pre>
+
+    <p>The <c>ct_hooks</c> statement must look as follows:</p>
+
+    <pre>
+ suite() -&gt;
+    [{ct_hooks, [{cth_conn_log, []}]}].</pre>
+
+    <p>The same <c>ct_hooks</c> statement without the configuration file
+      would cause HTML logging of all NETCONF connections in to the test
+      case HTML log.</p>
+  </section>
+
+  <section>
+  <marker id="Notifications"/>
+    <title>Notifications</title>
+
+    <p>The NETCONF client is also compliant with RFC 5277 NETCONF Event
+      Notifications, which defines a mechanism for an asynchronous message 
+      notification delivery service for the NETCONF protocol.</p>
+
+    <p>Specific functions to support this are
+      <seealso marker="#create_subscription-6"><c>ct_netconfc:create_subscription/6</c></seealso>
+      and
+      <seealso marker="#get_event_streams-3"><c>ct_netconfc:get_event_streams/3</c></seealso>.
+      (The functions also exist with other arities.)</p>
+  </section>
+
+  <section>
+    <title>Data Types</title>
+    <marker id="types"/>
+    <taglist>
+      <tag><c>client() = handle() | key_or_name()</c></tag>
+      <item><marker id="type-client"/>
+        <p>For <c>handle()</c>, see module
+          <seealso marker="ct"><c>ct</c></seealso>.</p></item>
+
+      <tag><c>error_reason() = term()</c></tag>
+      <item><marker id="type-error_reason"/> </item>
+      <tag><c>event_time() = {eventTime, xml_attributes(), [xs_datetime()]}</c></tag>
+      <item><marker id="type-event_time"/> </item>
+
+      <tag><c>handle() = term()</c></tag>
+      <item><marker id="type-handle"/>
+        <p>Opaque reference for a connection (NETCONF session). For more
+          information, see module <seealso marker="ct"><c>ct</c></seealso>.</p>
+      </item>
+
+      <tag><c>host() = <seealso marker="kernel:inet#type-hostname"><c>inet:hostname()</c></seealso> | <seealso marker="kernel:inet#type-ip_address"><c>inet:ip_address()</c></seealso></c></tag>
+      <item><marker id="type-host"/></item>
+
+      <tag><c>key_or_name() = server_id() | target_name()</c></tag>
+      <item><marker id="type-key_or_name"/>
+        <p>For <c>target_name</c>, see module
+          <seealso marker="ct"><c>ct</c></seealso>.</p></item>
+
+      <tag><c>netconf_db() = running | startup | candidate</c></tag>
+      <item><marker id="type-netconf_db"/> </item>
+
+      <tag><c>notification() = {notification, xml_attributes(), notification_content()}</c></tag>
+      <item><marker id="type-notification"/> </item>
+
+      <tag><c>notification_content() = [event_time() | simple_xml()]</c></tag> 
+      <item><marker id="type-notification_content"/> </item>
+
+      <tag><c>option() = {ssh, host()} | {port, <seealso marker="kernel:inet#type-port_number"><c>inet:port_number()</c></seealso>} | {timeout, timeout()} | SshConnectOption</c></tag>
+      <item><marker id="type-option"/>
+
+        <p><c>SshConnectOption</c> is any valid option to
+          <seealso marker="ssh:ssh#connect-3"><c>ssh:connect/3,4</c></seealso>.
+	  Common options used are <c>user</c>, <c>password</c>
+	  and <c>user_dir</c>. The <c>SshConnectOptions</c> are
+	  verfied by the SSH application.</p></item>
+
+      <tag><c>options() = [option()]</c></tag>
+      <item><marker id="type-options"/>
+        <p>Options used for setting up an SSH connection to a NETCONF
+          server.</p></item>
+
+      <tag><c>server_id() = atom()</c></tag>
+      <item><marker id="type-server_id"/>
+        <p>The identity of a server, specified in a configuration
+          file.</p></item>
+
+      <tag><c>simple_xml() = {xml_tag(), xml_attributes(), xml_content()} | {xml_tag(), xml_content()} | xml_tag()</c></tag>
+      <item><marker id="type-simple_xml"/>
+        <p>This type is further described in application
+          <seealso marker="xmerl:index"><c>xmerl</c></seealso>.</p></item>
+
+      <tag><c>stream_data() = {description, string()} | {replaySupport, string()} | {replayLogCreationTime, string()} | {replayLogAgedTime, string()}</c></tag>
+      <item><marker id="type-stream_data"/>
+        <p>For details about the data format for the string values, see
+          "XML Schema for Event Notifications" in RFC 5277.</p></item>
+
+      <tag><c>stream_name() = string()</c></tag>
+      <item><marker id="type-stream_name"/> </item>
+
+      <tag><c>streams() = [{stream_name(), [stream_data()]}]</c></tag>
+      <item><marker id="type-streams"/> </item>
+
+      <tag><c>xml_attribute_tag() = atom()</c></tag>
+      <item><marker id="type-xml_attribute_tag"/> </item>
+
+      <tag><c>xml_attribute_value() = string()</c></tag>
+      <item><marker id="type-xml_attribute_value"/> </item>
+
+      <tag><c>xml_attributes() = [{xml_attribute_tag(), xml_attribute_value()}]</c></tag>
+      <item><marker id="type-xml_attributes"/> </item>
+
+      <tag><c>xml_content() = [simple_xml() | iolist()]</c></tag>
+      <item><marker id="type-xml_content"/> </item>
+
+      <tag><c>xml_tag() = atom()</c></tag>
+      <item><marker id="type-xml_tag"/> </item>
+
+      <tag><c>xpath() = {xpath, string()}</c></tag>
+      <item><marker id="type-xpath"/> </item>
+
+      <tag><c>xs_datetime() = string()</c></tag>
+      <item><marker id="type-xs_datetime"/>
+        <p>This date and time identifier has the same format as the XML type
+          <c>dateTime</c> and is compliant with RFC 3339 Date and Time on
+          the Internet Timestamps. The format is as follows:</p>
+      <pre>
+ [-]CCYY-MM-DDThh:mm:ss[.s][Z|(+|-)hh:mm]</pre>
+      </item>
+    </taglist>
+  </section>
+
+  <funcs>
+    <func>
+      <name>action(Client, Action) -&gt; Result</name>
+      <fsummary>Equivalent to action(Client, Action, infinity).</fsummary>
+      <desc><marker id="action-2"/>
+        <p>Equivalent to
+          <seealso marker="#action-3"><c>ct_netconfc:action(Client, Action,
+          infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>action(Client, Action, Timeout) -&gt; Result</name>
+      <fsummary>Executes an action.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Action = simple_xml()</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = ok | {ok, [simple_xml()]} | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="action-3"/>
+        <p>Executes an action. If the return type is void, <c>ok</c> is
+          returned instead of <c>{ok,[simple_xml()]}</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>close_session(Client) -&gt; Result</name>
+      <fsummary>Equivalent to close_session(Client, infinity).</fsummary>
+      <desc><marker id="close_session-1"/>
+        <p>Equivalent to
+          <seealso marker="#close_session-2"><c>ct_netconfc:close_session(Client,
+            infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>close_session(Client, Timeout) -&gt; Result</name>
+      <fsummary>Requests graceful termination of the session associated with
+        the client.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = ok | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="close_session-2"/>
+        <p>Requests graceful termination of the session associated with the
+          client.</p>
+
+        <p>When a NETCONF server receives a <c>close-session</c> request, it
+          gracefully closes the session.  The server releases any locks and
+          resources associated with the session and gracefully closes any
+          associated connections. Any NETCONF requests received after a
+          <c>close-session</c> request are ignored.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>copy_config(Client, Source, Target) -&gt; Result</name>
+      <fsummary>Equivalent to copy_config(Client, Source, Target,
+        infinity).</fsummary>
+      <desc><marker id="copy_config-3"/>
+        <p>Equivalent to
+          <seealso marker="#copy_config-4"><c>ct_netconfc:copy_config(Client,
+            Source, Target, infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>copy_config(Client, Target, Source, Timeout) -&gt; Result</name>
+      <fsummary>Copies configuration data.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Target = netconf_db()</v>
+        <v>Source = netconf_db()</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = ok | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="copy_config-4"/>
+        <p>Copies configuration data.</p>
+
+        <p>Which source and target options that can be issued depends on the
+          capabilities supported by the server. That is, <c>:candidate</c>
+          and/or <c>:startup</c> are required.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>create_subscription(Client) -&gt; term()</name>
+      <fsummary>Creates a subscription for event notifications.</fsummary>
+      <desc><marker id="create_subscription-1"/></desc>
+    </func>
+
+    <func>
+      <name>create_subscription(Client, Timeout) -&gt; term()</name>
+      <fsummary>Creates a subscription for event notifications.</fsummary>
+      <desc><marker id="create_subscription-2"/></desc>
+    </func>
+
+    <func>
+      <name>create_subscription(Client, Stream, Timeout) -&gt; term()</name>
+      <fsummary>Creates a subscription for event notifications.</fsummary>
+      <desc><marker id="create_subscription-3"/></desc>
+    </func>
+
+    <func>
+      <name>create_subscription(Client, StartTime, StopTime, Timeout) -&gt; term()</name>
+      <fsummary>Creates a subscription for event notifications.</fsummary>
+      <desc><marker id="create_subscription-4"/></desc>
+    </func>
+
+    <func>
+      <name>create_subscription(Client, Stream, StartTime, StopTime, Timeout) -&gt; term()</name>
+      <fsummary>Creates a subscription for event notifications.</fsummary>
+      <desc><marker id="create_subscription-5"/></desc>
+    </func>
+
+    <func>
+      <name>create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout) -&gt; Result</name>
+      <fsummary>Creates a subscription for event notifications.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Stream = stream_name()</v>
+        <v>Filter = simple_xml() | [simple_xml()]</v>
+        <v>StartTime = xs_datetime()</v>
+        <v>StopTime = xs_datetime()</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = ok | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="create_subscription-6"/>
+        <p>Creates a subscription for event notifications.</p>
+
+        <p>This function sets up a subscription for NETCONF event
+          notifications of the specified stream type, matching the specified
+          filter. The calling process receives notifications as messages of
+          type <c>notification()</c>.</p>
+
+        <taglist>
+          <tag><c>Stream</c></tag>
+          <item><p>Optional parameter that indicates which stream of event
+            is of interest. If not present, events in the default NETCONF
+            stream are sent.</p></item>
+          <tag><c>Filter</c></tag>
+          <item><p>Optional parameter that indicates which subset of all
+            possible events is of interest. The parameter format is the
+            same as that of the filter parameter in the NETCONF protocol
+            operations. If not present, all events not precluded by other
+            parameters are sent.</p></item>
+          <tag><c>StartTime</c></tag>
+          <item><p>Optional parameter used to trigger the replay feature and
+              indicate that the replay is to start at the time specified.
+              If <c>StartTime</c> is not present, this is not a replay
+              subscription.</p>
+            <p>It is not valid to specify start times that are later than
+              the current time. If <c>StartTime</c> is specified earlier
+              than the log can support, the replay begins with the earliest
+              available notification.</p>
+            <p>This parameter is of type <c>dateTime</c> and compliant to
+              RFC 3339. Implementations must support time zones.</p></item>
+          <tag><c>StopTime</c></tag>
+          <item><p>Optional parameter used with the optional replay feature
+              to indicate the newest notifications of interest. If
+              <c>StopTime</c> is not present, the notifications continues
+              until the subscription is terminated.</p>
+            <p>Must be used with and be later than <c>StartTime</c>. Values
+              of <c>StopTime</c> in the future are valid. This parameter is
+              of type <c>dateTime</c> and compliant to RFC 3339.
+              Implementations must support time zones.</p></item>
+        </taglist>
+
+        <p>For more details about the event notification mechanism, see
+          RFC 5277.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>delete_config(Client, Target) -&gt; Result</name>
+      <fsummary>Equivalent to delete_config(Client, Target,
+        infinity).</fsummary>
+      <desc><marker id="delete_config-2"/>
+        <p>Equivalent to
+          <seealso marker="#delete_config-3"><c>ct_netconfc:delete_config(Client, Target, infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>delete_config(Client, Target, Timeout) -&gt; Result</name>
+      <fsummary>Deletes configuration data.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Target = startup | candidate</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = ok | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="delete_config-3"/>
+        <p>Deletes configuration data.</p>
+
+        <p>The running configuration cannot be deleted and <c>:candidate</c>
+          or <c>:startup</c> must be advertised by the server.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>edit_config(Client, Target, Config) -&gt; Result</name>
+        <fsummary>Equivalent to edit_config(Client, Target, Config, [],
+          infinity).</fsummary>
+      <desc><marker id="edit_config-3"/>
+        <p>Equivalent to
+          <seealso marker="#edit_config-5"><c>ct_netconfc:edit_config(Client,
+          Target, Config, [], infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>edit_config(Client, Target, Config, OptParamsOrTimeout) -&gt; Result</name>
+      <fsummary>If OptParamsOrTimeout is a time-out value, this function is
+        equivalent to ct_netconfc:edit_config(Client, Target, Config, [],
+        Timeout).</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Target = netconf_db()</v>
+        <v>Config = simple_xml()</v>
+        <v>OptParamsOrTimeout = [simple_xml()] | timeout()</v>
+        <v>Result = ok | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="edit_config-4"/>
+        <p>If <c>OptParamsOrTimeout</c> is a time-out value, this function is
+          equivalent to
+          <seealso marker="#edit_config-5"><c>ct_netconfc:edit_config(Client,
+          Target, Config, [], Timeout)</c></seealso>.</p>
+
+        <p>If <c>OptParamsOrTimeout</c> is a list of simple XML, this
+          function is equivalent to
+          <seealso marker="#edit_config-5"><c>ct_netconfc:edit_config(Client,
+          Target, Config, OptParams, infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>edit_config(Client, Target, Config, OptParams, Timeout) -&gt; Result</name>
+      <fsummary>Edits configuration data.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Target = netconf_db()</v>
+        <v>Config = simple_xml()</v>
+        <v>OptParams = [simple_xml()]</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = ok | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="edit_config-5"/>
+        <p>Edits configuration data.</p>
+
+        <p>By default only the running target is available, unless the server
+          includes <c>:candidate</c> or <c>:startup</c> in its list of
+          capabilities.</p>
+
+        <p><c>OptParams</c> can be used for specifying optional parameters
+          (<c>default-operation</c>, <c>test-option</c>, or
+          <c>error-option</c>) to be added to the <c>edit-config</c>
+          request. The value must be a list containing valid simple XML,
+          for example:</p>
+
+        <pre>
+ [{'default-operation', ["none"]},
+  {'error-option', ["rollback-on-error"]}]</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name>get(Client, Filter) -&gt; Result</name>
+      <fsummary>Equivalent to get(Client, Filter, infinity).</fsummary>
+      <desc><marker id="get-2"/>
+        <p>Equivalent to
+          <seealso marker="#get-3"><c>ct_netconfc:get(Client, Filter,
+            infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get(Client, Filter, Timeout) -&gt; Result</name>
+      <fsummary>Gets data.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Filter = simple_xml() | xpath()</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = {ok, [simple_xml()]} | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="get-3"/>
+        <p>Gets data.</p>
+ 
+        <p>This operation returns both configuration and state data from the
+          server.</p>
+
+        <p>Filter type <c>xpath</c> can be used only if the server supports
+          <c>:xpath</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_capabilities(Client) -&gt; Result</name>
+      <fsummary>Equivalent to get_capabilities(Client, infinity).</fsummary>
+      <desc><marker id="get_capabilities-1"/>
+        <p>Equivalent to
+          <seealso marker="#get_capabilities-2"><c>ct_netconfc:get_capabilities(Client,
+          infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_capabilities(Client, Timeout) -&gt; Result</name>
+      <fsummary>Returns the server side capabilities.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = [string()] | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="get_capabilities-2"/>
+        <p>Returns the server side capabilities.</p>
+
+        <p>The following capability identifiers, defined in RFC 4741 NETCONF
+          Configuration Protocol, can be returned:</p>
+
+        <list>
+          <item><p><c>"urn:ietf:params:netconf:base:1.0"</c></p></item>
+          <item><p><c>"urn:ietf:params:netconf:capability:writable-running:1.0"</c></p></item>
+          <item><p><c>"urn:ietf:params:netconf:capability:candidate:1.0"</c></p></item>
+          <item><p><c>"urn:ietf:params:netconf:capability:confirmed-commit:1.0"</c></p></item>
+          <item><p><c>"urn:ietf:params:netconf:capability:rollback-on-error:1.0"</c></p></item>
+          <item><p><c>"urn:ietf:params:netconf:capability:startup:1.0"</c></p></item>
+          <item><p><c>"urn:ietf:params:netconf:capability:url:1.0"</c></p></item>
+          <item><p><c>"urn:ietf:params:netconf:capability:xpath:1.0"</c></p></item>
+        </list>
+ 
+        <p>More identifiers can exist, for example, server-side namespace.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_config(Client, Source, Filter) -&gt; Result</name>
+      <fsummary>Equivalent to get_config(Client, Source, Filter,
+        infinity).</fsummary>
+      <desc><marker id="get_config-3"/>
+        <p>Equivalent to
+          <seealso marker="#get_config-4"><c>ct_netconfc:get_config(Client, Source, Filter, infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_config(Client, Source, Filter, Timeout) -&gt; Result</name>
+      <fsummary>Gets configuration data.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Source = netconf_db()</v>
+        <v>Filter = simple_xml() | xpath()</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = {ok, [simple_xml()]} | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="get_config-4"/>
+        <p>Gets configuration data.</p>
+
+        <p>To be able to access another source than <c>running</c>, the
+          server must advertise <c>:candidate</c> and/or <c>:startup</c>.</p>
+
+        <p>Filter type <c>xpath</c> can be used only if the server supports
+          <c>:xpath</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_event_streams(Client, Timeout) -&gt; Result</name>
+      <fsummary>Equivalent to get_event_streams(Client, [], Timeout).</fsummary>
+      <desc><marker id="get_event_streams-2"/>
+        <p>Equivalent to
+          <seealso marker="#get_event_streams-3"><c>ct_netconfc:get_event_streams(Client,
+          [], Timeout)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_event_streams(Client, Streams, Timeout) -&gt; Result</name>
+      <fsummary>Sends a request to get the specified event streams.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Streams = [stream_name()]</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = {ok, streams()} | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="get_event_streams-3"/>
+        <p>Sends a request to get the specified event streams.</p>
+
+        <p><c>Streams</c> is a list of stream names. The following filter is
+          sent to the NETCONF server in a <c>get</c> request:</p>
+
+        <pre>
+ &lt;netconf xmlns="urn:ietf:params:xml:ns:netmod:notification"&gt;
+   &lt;streams&gt;
+     &lt;stream&gt;
+       &lt;name&gt;StreamName1&lt;/name&gt;
+     &lt;/stream&gt;
+     &lt;stream&gt;
+       &lt;name&gt;StreamName2&lt;/name&gt;
+     &lt;/stream&gt;
+     ...
+   &lt;/streams&gt;
+ &lt;/netconf&gt;</pre>
+
+        <p>If <c>Streams</c> is an empty list, <em>all</em> streams are
+          requested by sending the following filter:</p>
+
+        <pre>
+ &lt;netconf xmlns="urn:ietf:params:xml:ns:netmod:notification"&gt;
+   &lt;streams/&gt;
+ &lt;/netconf&gt;</pre>
+
+        <p>If more complex filtering is needed, use
+          <seealso marker="#get-2"><c>ct_netconfc:get/2</c></seealso> or
+          <seealso marker="#get-3"><c>ct_netconfc:get/3</c></seealso> and
+          specify the exact filter according to "XML Schema for Event
+          Notifications" in RFC 5277.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_session_id(Client) -&gt; Result</name>
+      <fsummary>Equivalent to get_session_id(Client, infinity).</fsummary>
+      <desc><marker id="get_session_id-1"/>
+        <p>Equivalent to
+          <seealso marker="#get_session_id-2"><c>ct_netconfc:get_session_id(Client,
+          infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_session_id(Client, Timeout) -&gt; Result</name>
+      <fsummary>Returns the session Id associated with the specified
+        client.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = pos_integer() | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="get_session_id-2"/>
+        <p>Returns the session Id associated with the specified client.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>hello(Client) -&gt; Result</name>
+      <fsummary>Equivalent to hello(Client, [], infinity).</fsummary>
+      <desc><marker id="hello-1"/>
+        <p>Equivalent to
+          <seealso marker="#hello-3"><c>ct_netconfc:hello(Client, [],
+          infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>hello(Client, Timeout) -&gt; Result</name>
+      <fsummary>Equivalent to hello(Client, [], Timeout).</fsummary>
+      <desc><marker id="hello-2"/>
+        <p>Equivalent to
+          <seealso marker="#hello-3"><c>ct_netconfc:hello(Client, [],
+          Timeout)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>hello(Client, Options, Timeout) -&gt; Result</name>
+      <fsummary>Exchanges hello messages with the server.</fsummary>
+      <type>
+        <v>Client = handle()</v>
+        <v>Options = [{capability, [string()]}]</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = ok | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="hello-3"/>
+        <p>Exchanges <c>hello</c> messages with the server.</p>
+
+        <p>Adds optional capabilities and sends a <c>hello</c> message to the
+          server and waits for the return.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>kill_session(Client, SessionId) -&gt; Result</name>
+      <fsummary>Equivalent to kill_session(Client, SessionId,
+        infinity).</fsummary>
+      <desc><marker id="kill_session-2"/>
+        <p>Equivalent to
+          <seealso marker="#kill_session-3"><c>ct_netconfc:kill_session(Client,
+SessionId, infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>kill_session(Client, SessionId, Timeout) -&gt; Result</name>
+      <fsummary>Forces termination of the session associated with the supplied
+        session Id.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>SessionId = pos_integer()</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = ok | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="kill_session-3"/>
+        <p>Forces termination of the session associated with the supplied
+          session Id.</p>
+
+        <p>The server side must abort any ongoing operations, release any
+          locks and resources associated with the session, and close any
+          associated connections.</p>
+
+        <p>Only if the server is in the confirmed commit phase, the
+          configuration is restored to its state before entering the confirmed
+          commit phase. Otherwise, no configuration rollback is performed.</p>
+
+         <p>If the specified <c>SessionId</c> is equal to the current session
+           Id, an error is returned.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>lock(Client, Target) -&gt; Result</name>
+      <fsummary>Equivalent to lock(Client, Target, infinity).</fsummary>
+      <desc><marker id="lock-2"/>
+        <p>Equivalent to
+          <seealso marker="#lock-3"><c>ct_netconfc:lock(Client, Target,
+            infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>lock(Client, Target, Timeout) -&gt; Result</name>
+      <fsummary>Unlocks the configuration target.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Target = netconf_db()</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = ok | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="lock-3"/>
+        <p>Unlocks the configuration target.</p>
+
+        <p>Which target parameters that can be used depends on if
+          <c>:candidate</c> and/or <c>:startup</c> are supported by the
+          server. If successfull, the configuration system of the device is
+          unavailable to other clients (NETCONF, CORBA, SNMP, and so on).
+          Locks are intended to be short-lived.</p>
+
+         <p>Operation
+           <seealso marker="#kill_session-2"><c>ct_netconfc:kill_session/2</c></seealso>
+           or
+           <seealso marker="#kill_session-3"><c>ct_netconfc:kill_session/3</c></seealso>
+           can be used to force the release of a lock owned by another NETCONF
+           session. How this is achieved by the server side is
+           implementation-specific.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>only_open(Options) -&gt; Result</name>
+      <fsummary>Opens a NETCONF session, but does not send hello.</fsummary>
+      <type>
+        <v>Options = options()</v>
+        <v>Result = {ok, handle()} | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="only_open-1"/>
+        <p>Opens a NETCONF session, but does not send <c>hello</c>.</p>
+
+        <p>As <seealso marker="#open-1"><c>ct_netconfc:open/1</c></seealso>,
+          but does not send a <c>hello</c> message.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>only_open(KeyOrName, ExtraOptions) -&gt; Result</name>
+      <fsummary>Opens a name NETCONF session, but does not send
+        hello.</fsummary>
+      <type>
+        <v>KeyOrName = key_or_name()</v>
+        <v>ExtraOptions = options()</v>
+        <v>Result = {ok, handle()} | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="only_open-2"/>
+        <p>Opens a name NETCONF session, but does not send <c>hello</c>.</p>
+
+        <p>As <seealso marker="#open-2"><c>ct_netconfc:open/2</c></seealso>,
+          but does not send a <c>hello</c> message.</p>
+      </desc>
+    </func>
+
+    <func>
+    <name>open(Options) -&gt; Result</name>
+    <fsummary>Opens a NETCONF session and exchanges hello messages.</fsummary>
+      <type>
+        <v>Options = options()</v>
+        <v>Result = {ok, handle()} | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="open-1"/>
+        <p>Opens a NETCONF session and exchanges <c>hello</c> messages.</p>
+
+        <p>If the server options are specified in a configuration file,
+          or if a named client is needed for logging purposes (see section
+          <seealso marker="#Logging">Logging</seealso> in this module), use
+          <seealso marker="#open-2"><c>ct_netconfc:open/2</c></seealso>
+          instead.</p>
+
+        <p>The opaque <c>handle()</c> reference returned from this
+          function is required as client identifier when calling any other
+          function in this module.</p>
+
+        <p>Option <c>timeout</c> (milliseconds) is used when setting up the
+          SSH connection and when waiting for the <c>hello</c> message from
+          the server. It is not used for any other purposes during the
+          lifetime of the connection.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>open(KeyOrName, ExtraOptions) -&gt; Result</name>
+      <fsummary>Opens a named NETCONF session and exchanges hello
+        messages.</fsummary>
+      <type>
+        <v>KeyOrName = key_or_name()</v>
+        <v>ExtraOptions = options()</v>
+        <v>Result = {ok, handle()} | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="open-2"/>
+        <p>Opens a named NETCONF session and exchanges <c>hello</c>
+          messages.</p>
+
+         <p>If <c>KeyOrName</c> is a configured <c>server_id()</c> or a
+           <c>target_name()</c> associated with such an Id, then the options
+           for this server are fetched from the configuration file.</p>
+
+         <p>Argument <c>ExtraOptions</c> is added to the options found in the
+           configuration file. If the same options are specified, the values
+           from the configuration file overwrite <c>ExtraOptions</c>.</p>
+
+         <p>If the server is not specified in a configuration file, use
+           <seealso marker="#open-1"><c>ct_netconfc:open/1</c></seealso>
+           instead.</p>
+
+         <p>The opaque <c>handle()</c> reference returned from this
+           function can be used as client identifier when calling any other
+           function in this module. However, if <c>KeyOrName</c> is a
+           <c>target_name()</c>, that is, if the server is named through a
+           call to <seealso marker="ct#require-2"><c>ct:require/2</c></seealso>
+           or a <c>require</c> statement in the test suite, then this name can
+           be used instead of <c>handle()</c>.</p>
+
+        <p>Option <c>timeout</c> (milliseconds) is used when setting up the
+          SSH connection and when waiting for the <c>hello</c> message from
+          the server. It is not used for any other purposes during the
+          lifetime of the connection.</p>
+
+         <p>See also
+           <seealso marker="ct#require-2"><c>ct:require/2</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send(Client, SimpleXml) -&gt; Result</name>
+      <fsummary>Equivalent to send(Client, SimpleXml, infinity).</fsummary>
+      <desc><marker id="send-2"/>
+        <p>Equivalent to
+          <seealso marker="#send-3"><c>ct_netconfc:send(Client, SimpleXml,
+            infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send(Client, SimpleXml, Timeout) -&gt; Result</name>
+      <fsummary>Sends an XML document to the server.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>SimpleXml = simple_xml()</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = simple_xml() | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="send-3"/>
+        <p>Sends an XML document to the server.</p>
+
+        <p>The specified XML document is sent "as is" to the server. This
+          function can be used for sending XML documents that cannot be
+          expressed by other interface functions in this module.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send_rpc(Client, SimpleXml) -&gt; Result</name>
+      <fsummary>Equivalent to send_rpc(Client, SimpleXml, infinity).</fsummary>
+      <desc><marker id="send_rpc-2"/>
+        <p>Equivalent to
+          <seealso marker="#send_rpc-3"><c>ct_netconfc:send_rpc(Client,
+          SimpleXml, infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send_rpc(Client, SimpleXml, Timeout) -&gt; Result</name>
+      <fsummary>Sends a NETCONF rpc request to the server.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>SimpleXml = simple_xml()</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = [simple_xml()] | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="send_rpc-3"/>
+        <p>Sends a NETCONF <c>rpc</c> request to the server.</p>
+
+        <p>The specified XML document is wrapped in a valid NETCONF <c>rpc</c>
+          request and sent to the server. The <c>message-id</c> and namespace
+          attributes are added to element <c>rpc</c>.</p>
+
+        <p>This function can be used for sending <c>rpc</c> requests that
+          cannot be expressed by other interface functions in this module.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>unlock(Client, Target) -&gt; Result</name>
+      <fsummary>Equivalent to unlock(Client, Target, infinity).</fsummary>
+      <desc><marker id="unlock-2"/>
+        <p>Equivalent to
+          <seealso marker="#unlock-3"><c>ct_netconfc:unlock(Client, Target,
+            infinity)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>unlock(Client, Target, Timeout) -&gt; Result</name>
+      <fsummary>Unlocks the configuration target.</fsummary>
+      <type>
+        <v>Client = client()</v>
+        <v>Target = netconf_db()</v>
+        <v>Timeout = timeout()</v>
+        <v>Result = ok | {error, error_reason()}</v>
+      </type>
+      <desc><marker id="unlock-3"/>
+        <p>Unlocks the configuration target.</p>
+
+        <p>If the client earlier has acquired a lock through
+          <seealso marker="#lock-2"><c>ct_netconfc:lock/2</c></seealso> or
+          <seealso marker="#lock-3"><c>ct_netconfc:lock/3</c></seealso>, this
+          operation releases the associated lock. To access another target
+          than <c>running</c>, the server must support <c>:candidate</c>
+          and/or <c>:startup</c>.</p>
+      </desc>
+    </func>
+  </funcs>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/ct_property_test.xml b/lib/common_test/doc/src/ct_property_test.xml
new file mode 100644
index 0000000000..2e9bd1969c
--- /dev/null
+++ b/lib/common_test/doc/src/ct_property_test.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2010</year><year>2012</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+
+    </legalnotice>
+
+    <title>ct_property_test</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>ct_property_test.xml</file>
+  </header>
+  <module>ct_property_test</module>
+  <modulesummary>EXPERIMENTAL support in Common Test for calling
+    property-based tests.</modulesummary>
+
+  <description>
+
+    <p>EXPERIMENTAL support in <c>Common Test</c> for calling property-based
+      tests.</p>
+
+    <p>This module is a first step to run property-based tests in the
+      <c>Common Test</c> framework. A property testing tool like QuickCheck
+      or PropEr is assumed to be installed.</p>
+
+    <p>The idea is to have a <c>Common Test</c> test suite calling a property
+      testing tool with special property test suites as defined by that tool.
+      The usual Erlang application directory structure is assumed. The tests
+      are collected in the <c>test</c> directory of the application. The
+      <c>test</c> directory has a subdirectory <c>property_test</c>, where
+      everything needed for the property tests is collected.</p>
+
+    <p>A typical <c>Common Test</c> test suite using <c>ct_property_test</c>
+      is organized as follows:</p>
+
+    <pre>
+ -include_lib("common_test/include/ct.hrl").
+
+ all() -&gt; [prop_ftp_case].
+
+ init_per_suite(Config) -&gt;
+     ct_property_test:init_per_suite(Config).
+
+ %%%---- test case
+ prop_ftp_case(Config) -&gt;
+     ct_property_test:quickcheck(
+       ftp_simple_client_server:prop_ftp(Config),
+       Config
+      ).</pre>
+
+    <warning>
+      <p>This is experimental code that can be changed or removed anytime
+        without any warning.</p>
+    </warning>
+
+  </description>
+
+  <funcs>
+    <func>
+    <name>init_per_suite(Config) -&gt; Config | {skip, Reason}</name>
+    <fsummary>Initializes Config for property testing.</fsummary>
+      <desc><marker id="init_per_suite-1"/>
+        <p>Initializes <c>Config</c> for property testing.</p>
+
+        <p>This function investigates if support is available for either
+          Quickcheck, PropEr, or Triq. The options
+          <c>{property_dir,AbsPath}</c> and <c>{property_test_tool,Tool}</c>
+          are set in the <c>Config</c> returned.</p>
+
+        <p>The function is intended to be called in function
+          <c>init_per_suite</c> in the test suite.</p>
+
+        <p>The property tests are assumed to be in subdirectory
+          <c>property_test</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+    <name>quickcheck(Property, Config) -&gt; true | {fail, Reason}</name>
+    <fsummary>Calls quickcheck and returns the result in a form suitable for
+      Common Test.</fsummary>
+      <desc><marker id="quickcheck-2"/>
+        <p>Calls quickcheck and returns the result in a form suitable for
+          <c>Common Test</c>.</p>
+
+        <p>This function is intended to be called in the test cases in the
+          test suite.</p>
+      </desc>
+    </func>
+  </funcs>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/ct_rpc.xml b/lib/common_test/doc/src/ct_rpc.xml
new file mode 100644
index 0000000000..0169727581
--- /dev/null
+++ b/lib/common_test/doc/src/ct_rpc.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2010</year><year>2012</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+
+    </legalnotice>
+
+    <title>ct_rpc</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>ct_rpc.xml</file>
+  </header>
+  <module>ct_rpc</module>
+  <modulesummary>Common Test specific layer on Erlang/OTP rpc.</modulesummary>
+
+  <description>
+
+    <p><c>Common Test</c> specific layer on Erlang/OTP <c>rpc</c>.</p>
+
+  </description>
+
+  <funcs>
+    <func>
+      <name>app_node(App, Candidates) -&gt; NodeName</name>
+      <fsummary>From a set of candidate nodes determines which of them is
+        running the application App.</fsummary>
+      <type>
+        <v>App = atom()</v>
+        <v>Candidates = [NodeName]</v>
+        <v>NodeName = atom()</v>
+      </type>
+      <desc><marker id="app_node-2"/>
+        <p>From a set of candidate nodes determines which of them is running
+          the application <c>App</c>. If none of the candidate nodes is
+          running <c>App</c>, the function makes the test case calling
+          this function to fail. This function is the same as calling
+          <c>app_node(App, Candidates, true)</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>app_node(App, Candidates, FailOnBadRPC) -&gt; NodeName</name>
+        <fsummary>Same as app_node/2, except that argument FailOnBadRPC
+          determines if the search for a candidate node is to stop if
+          badrpc is received at some point.</fsummary>
+      <type>
+        <v>App = atom()</v>
+        <v>Candidates = [NodeName]</v>
+        <v>NodeName = atom()</v>
+        <v>FailOnBadRPC = true | false</v>
+      </type>
+      <desc><marker id="app_node-3"/>
+        <p>Same as
+          <seealso marker="#app_node-2"><c>ct_rpc:app_node/2</c></seealso>,
+          except that argument <c>FailOnBadRPC</c> determines if the search
+          for a candidate node is to stop if <c>badrpc</c> is received at
+          some point.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>app_node(App, Candidates, FailOnBadRPC, Cookie) -&gt; NodeName</name>
+      <fsummary>Same as app_node/2, except that argument FailOnBadRPC
+        determines if the search for a candidate node is to stop if badrpc is
+        received at some point.</fsummary>
+      <type>
+        <v>App = atom()</v>
+        <v>Candidates = [NodeName]</v>
+        <v>NodeName = atom()</v>
+        <v>FailOnBadRPC = true | false</v>
+        <v>Cookie = atom()</v>
+      </type>
+      <desc><marker id="app_node-4"/>
+        <p>Same as
+          <seealso marker="#app_node-2"><c>ct_rpc:app_node/2</c></seealso>,
+          except that argument <c>FailOnBadRPC</c> determines if the search
+          for a candidate node is to stop if <c>badrpc</c> is received at
+          some point.</p>
+
+        <p>The cookie on the client node is set to <c>Cookie</c> for this
+          <c>rpc</c> operation (used to match the server node cookie).</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>call(Node, Module, Function, Args) -&gt; term() | {badrpc, Reason}</name>
+      <fsummary>Same as call(Node, Module, Function, Args, infinity).</fsummary>
+      <desc><marker id="call-4"/>
+        <p>Same as <c>call(Node, Module, Function, Args, infinity)</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>call(Node, Module, Function, Args, TimeOut) -&gt; term() | {badrpc, Reason}</name>
+      <fsummary>Evaluates apply(Module, Function, Args) on the node
+        Node.</fsummary>
+      <type>
+        <v>Node = NodeName | {Fun, FunArgs}</v>
+        <v>Fun = function()</v>
+        <v>FunArgs = term()</v>
+        <v>NodeName = atom()</v>
+        <v>Module = atom()</v>
+        <v>Function = atom()</v>
+        <v>Args = [term()]</v>
+        <v>Reason = timeout | term()</v>
+      </type>
+      <desc><marker id="call-5"/>
+        <p>Evaluates <c>apply(Module, Function, Args)</c> on the node
+          <c>Node</c>. Returns either whatever <c>Function</c> returns, or
+          <c>{badrpc, Reason}</c> if the remote procedure call fails. If
+          <c>Node</c> is <c>{Fun, FunArgs}</c>, applying <c>Fun</c> to
+          <c>FunArgs</c> is to return a node name.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>call(Node, Module, Function, Args, TimeOut, Cookie) -&gt; term() | {badrpc, Reason}</name>
+      <fsummary>Evaluates apply(Module, Function, Args) on the node
+        Node.</fsummary>
+      <type>
+        <v>Node = NodeName | {Fun, FunArgs}</v>
+        <v>Fun = function()</v>
+        <v>FunArgs = term()</v>
+        <v>NodeName = atom()</v>
+        <v>Module = atom()</v>
+        <v>Function = atom()</v>
+        <v>Args = [term()]</v>
+        <v>Reason = timeout | term()</v>
+        <v>Cookie = atom()</v>
+      </type>
+      <desc><marker id="call-6"/>
+        <p>Evaluates <c>apply(Module, Function, Args)</c> on the node
+          <c>Node</c>. Returns either whatever <c>Function</c> returns, or
+          <c>{badrpc, Reason}</c> if the remote procedure call fails. If
+          <c>Node</c> is <c>{Fun, FunArgs}</c>, applying <c>Fun</c> to
+          <c>FunArgs</c> is to return a node name.</p>
+
+        <p>The cookie on the client node is set to <c>Cookie</c> for this
+          <c>rpc</c> operation (used to match the server node cookie).</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>cast(Node, Module, Function, Args) -&gt; ok</name>
+      <fsummary>Evaluates apply(Module, Function, Args) on the node
+        Node.</fsummary>
+      <type>
+        <v>Node = NodeName | {Fun, FunArgs}</v>
+        <v>Fun = function()</v>
+        <v>FunArgs = term()</v>
+        <v>NodeName = atom()</v>
+        <v>Module = atom()</v>
+        <v>Function = atom()</v>
+        <v>Args = [term()]</v>
+        <v>Reason = timeout | term()</v>
+      </type>
+      <desc><marker id="cast-4"/>
+        <p>Evaluates <c>apply(Module, Function, Args)</c> on the node
+          <c>Node</c>. No response is delivered and the process that makes
+          the call is not suspended until the evaluation is completed as in
+          the case of <c>call/3,4</c>. If <c>Node</c> is
+          <c>{Fun, FunArgs}</c>, applying <c>Fun</c> to <c>FunArgs</c> is to
+          return a node name.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>cast(Node, Module, Function, Args, Cookie) -&gt; ok</name>
+      <fsummary>Evaluates apply(Module, Function, Args) on the node
+        Node.</fsummary>
+      <type>
+        <v>Node = NodeName | {Fun, FunArgs}</v>
+        <v>Fun = function()</v>
+        <v>FunArgs = term()</v>
+        <v>NodeName = atom()</v>
+        <v>Module = atom()</v>
+        <v>Function = atom()</v>
+        <v>Args = [term()]</v>
+        <v>Reason = timeout | term()</v>
+        <v>Cookie = atom()</v>
+      </type>
+      <desc><marker id="cast-5"/>
+        <p>Evaluates <c>apply(Module, Function, Args)</c> on the node
+          <c>Node</c>. No response is delivered and the process that makes
+          the call is not suspended until the evaluation is completed as in
+          the case of <c>call/3,4</c>. If <c>Node</c> is
+          <c>{Fun, FunArgs}</c>, applying <c>Fun</c> to <c>FunArgs</c> is to
+          return a node name.</p>
+
+        <p>The cookie on the client node is set to <c>Cookie</c> for this
+          <c>rpc</c> operation (used to match the server node cookie).</p>
+      </desc>
+    </func>
+  </funcs>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/ct_run.xml b/lib/common_test/doc/src/ct_run.xml
index 5518bb039b..d0ecc38564 100644
--- a/lib/common_test/doc/src/ct_run.xml
+++ b/lib/common_test/doc/src/ct_run.xml
@@ -34,178 +34,189 @@
   </header>
   <com>ct_run</com>
   <comsummary>Program used for starting Common Test from the
-    OS command line.
-  </comsummary>
+    OS command line.</comsummary>
 
   <description>
   <p>The <c>ct_run</c> program is automatically installed with Erlang/OTP
-    and Common Test (please see the Installation chapter in the Common
-    Test User's Guide for more information). The program accepts a number
-    of different start flags. Some flags trigger <c>ct_run</c>
-    to start the Common Test application and pass on data to it. Some
-    flags start an Erlang node prepared for running Common Test in a
-    particular mode.</p>
-
-  <p>There is an interface function that corresponds to this program,
-    called <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, for starting Common Test from the Erlang
-    shell (or an Erlang program). Please see the <c>ct</c> man page for
-    details.</p>
+    and the <c>Common Test</c> application (for more information, see
+    section <seealso marker="install_chapter">Installation</seealso>
+    in the User's Guide). The program accepts different start flags.
+    Some flags trigger <c>ct_run</c> to start <c>Common Test</c> and
+    pass on data to it. Some flags start an Erlang node prepared for
+    running <c>Common Test</c> in a particular mode.</p>
+
+  <p>The interface function
+    <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>,
+    corresponding to the <c>ct_run</c> program, is used for starting
+    <c>Common Test</c> from the Erlang shell (or an Erlang program).
+    For details, see the <seealso marker="ct"><c>ct</c></seealso>
+    manual page.</p>
 
   <p><c>ct_run</c> also accepts Erlang emulator flags. These are used
-    when <c>ct_run</c> calls <c>erl</c> to start the Erlang node
-    (making it possible to e.g. add directories to the code server path,
-    change the cookie on the node, start additional applications, etc).</p>
-
-  <p>With the optional flag:</p>
-  <pre>-erl_args</pre>
-  <p>it's possible to divide the options on the <c>ct_run</c> command line into
-    two groups, one that Common Test should process (those preceding <c>-erl_args</c>),
-    and one it should completely ignore and pass on directly to the emulator
-    (those following <c>-erl_args</c>). Options preceding <c>-erl_args</c> that Common Test
-    doesn't recognize, also get passed on to the emulator untouched.
-    By means of <c>-erl_args</c> the user may specify flags with the same name, but
+    when <c>ct_run</c> calls <c>erl</c> to start the Erlang node (this
+    makes it possible to add directories to the code server path,
+    change the cookie on the node, start more applications, and so on).</p>
+
+  <p>With the optional flag <c>-erl_args</c>, options on the <c>ct_run</c>
+    command line can be divided into two groups:</p>
+
+  <list type="bulleted">
+    <item>One group that <c>Common Test</c> is to process (those
+      preceding <c>-erl_args</c>).</item>
+    <item>One group that <c>Common Test</c> is to ignore and pass on
+      directly to the emulator (those following <c>-erl_args</c>).</item>
+  </list>
+
+  <p>Options preceding <c>-erl_args</c> that <c>Common Test</c>
+    does not recognize are also passed on to the emulator untouched.
+    By <c>-erl_args</c> the user can specify flags with the same name, but
     with different destinations, on the <c>ct_run</c> command line.</p>
-  <p>If <c>-pa</c> or <c>-pz</c> flags are specified in the Common Test group of options
-    (preceding <c>-erl_args</c>), relative directories will be converted to
-    absolute and re-inserted into the code path by Common Test (to avoid
-    problems loading user modules when Common Test changes working directory
-    during test runs). Common Test will however ignore <c>-pa</c> and <c>-pz</c> flags
-    following <c>-erl_args</c> on the command line. These directories are added
-    to the code path normally (i.e. on specified form)</p>
-
-  <p>Exit status is set before the program ends. Value <c>0</c> indicates a successful
-    test result, <c>1</c> indicates one or more failed or auto-skipped test cases, and
-    <c>2</c> indicates test execution failure.</p>
-
-  <p>If <c>ct_run</c> is called with option:</p>
-    <pre>-help</pre>
-    <p>it prints all valid start flags to stdout.</p>
-  </description>
 
+  <p>If flags <c>-pa</c> or <c>-pz</c> are specified in the
+    <c>Common Test</c> group of options (preceding <c>-erl_args</c>),
+    relative directories are converted to absolute and reinserted into
+    the code path by <c>Common Test</c>. This is to avoid problems
+    loading user modules when <c>Common Test</c> changes working directory
+    during test runs. However, <c>Common Test</c> ignores flags <c>-pa</c>
+    and <c>-pz</c> following <c>-erl_args</c> on the command line. These
+    directories are added to the code path normally (that is, on specified
+    form).</p>
+
+  <p>Exit status is set before the program ends. Value <c>0</c> indicates
+    a successful test result, <c>1</c> indicates one or more failed or
+    auto-skipped test cases, and <c>2</c> indicates test execution failure.</p>
+
+  <p>If <c>ct_run</c> is called with option <c>-help</c>, it prints all
+    valid start flags to <c>stdout</c>.</p>
+  </description>
 
   <section>
   <marker id="ct_run"></marker>
-    <title>Run tests from command line</title>
+    <title>Run Tests from Command Line</title>
     <pre>
-	ct_run -dir TestDir1 TestDir2 .. TestDirN |
-	  [-dir TestDir] -suite Suite1 Suite2 .. SuiteN
-	   [-group Groups1 Groups2 .. GroupsN] [-case Case1 Case2 .. CaseN]
-	 [-step [config | keep_inactive]]
-	 [-config ConfigFile1 ConfigFile2 .. ConfigFileN]
-	 [-userconfig CallbackModule1 ConfigString1 and CallbackModule2
-	  ConfigString2 and .. CallbackModuleN ConfigStringN]
-	 [-decrypt_key Key] | [-decrypt_file KeyFile]
-	 [-label Label]
-	 [-logdir LogDir]
-	 [-logopts LogOpts]
-	 [-verbosity GenVLevel | [Category1 VLevel1 and
-	  Category2 VLevel2 and .. CategoryN VLevelN]]
-	 [-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
-	 [-stylesheet CSSFile]
-	 [-cover CoverCfgFile]
-	 [-cover_stop Bool]
-	 [-event_handler EvHandler1 EvHandler2 .. EvHandlerN] |
-         [-event_handler_init EvHandler1 InitArg1 and
-	  EvHandler2 InitArg2 and .. EvHandlerN InitArgN]
-	 [-include InclDir1 InclDir2 .. InclDirN]
-	 [-no_auto_compile]
-	 [-abort_if_missing_suites]
-	 [-muliply_timetraps Multiplier]
-	 [-scale_timetraps]
-	 [-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]
-         [-repeat N] |
-         [-duration HHMMSS [-force_stop [skip_rest]]] |
-         [-until [YYMoMoDD]HHMMSS [-force_stop [skip_rest]]]
-	 [-basic_html]
-    	 [-ct_hooks CTHModule1 CTHOpts1 and CTHModule2 CTHOpts2 and ..
-	  CTHModuleN CTHOptsN]
-	 [-exit_status ignore_config]
-	 [-help]
-    </pre>
+ ct_run -dir TestDir1 TestDir2 .. TestDirN |
+  [-dir TestDir] -suite Suite1 Suite2 .. SuiteN
+  [-group Groups1 Groups2 .. GroupsN] [-case Case1 Case2 .. CaseN]
+  [-step [config | keep_inactive]]
+  [-config ConfigFile1 ConfigFile2 .. ConfigFileN]
+  [-userconfig CallbackModule1 ConfigString1 and CallbackModule2
+   ConfigString2 and .. CallbackModuleN ConfigStringN]
+  [-decrypt_key Key] | [-decrypt_file KeyFile]
+  [-label Label]
+  [-logdir LogDir]
+  [-logopts LogOpts]
+  [-verbosity GenVLevel | [Category1 VLevel1 and
+   Category2 VLevel2 and .. CategoryN VLevelN]]
+  [-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
+  [-stylesheet CSSFile]
+  [-cover CoverCfgFile]
+  [-cover_stop Bool]
+  [-event_handler EvHandler1 EvHandler2 .. EvHandlerN] |
+  [-event_handler_init EvHandler1 InitArg1 and
+   EvHandler2 InitArg2 and .. EvHandlerN InitArgN]
+  [-include InclDir1 InclDir2 .. InclDirN]
+  [-no_auto_compile]
+  [-abort_if_missing_suites]
+  [-muliply_timetraps Multiplier]
+  [-scale_timetraps]
+  [-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]
+  [-repeat N] |
+  [-duration HHMMSS [-force_stop [skip_rest]]] |
+  [-until [YYMoMoDD]HHMMSS [-force_stop [skip_rest]]]
+  [-basic_html]
+  [-ct_hooks CTHModule1 CTHOpts1 and CTHModule2 CTHOpts2 and ..
+   CTHModuleN CTHOptsN]
+  [-exit_status ignore_config]
+  [-help]</pre>
   </section>
+
   <section>
-    <title>Run tests using test specification</title>
+    <title>Run Tests using Test Specification</title>
     <pre>
-	ct_run -spec TestSpec1 TestSpec2 .. TestSpecN
-	 [-join_specs]
-	 [-config ConfigFile1 ConfigFile2 .. ConfigFileN]
-	 [-userconfig CallbackModule1 ConfigString1 and CallbackModule2
-          ConfigString2 and .. and CallbackModuleN ConfigStringN]
-	 [-decrypt_key Key] | [-decrypt_file KeyFile]
-	 [-label Label]
-	 [-logdir LogDir]
-	 [-logopts LogOpts]
-	 [-verbosity GenVLevel | [Category1 VLevel1 and
-	  Category2 VLevel2 and .. CategoryN VLevelN]]
-	 [-allow_user_terms]
-	 [-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
-	 [-stylesheet CSSFile]
-	 [-cover CoverCfgFile]
-	 [-cover_stop Bool]
-	 [-event_handler EvHandler1 EvHandler2 .. EvHandlerN] |
-         [-event_handler_init EvHandler1 InitArg1 and
-	  EvHandler2 InitArg2 and .. EvHandlerN InitArgN]
-	 [-include InclDir1 InclDir2 .. InclDirN]
-	 [-no_auto_compile]
-	 [-abort_if_missing_suites]
-	 [-muliply_timetraps Multiplier]
-	 [-scale_timetraps]
-	 [-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]
-         [-repeat N] |
-         [-duration HHMMSS [-force_stop [skip_rest]]] |
-         [-until [YYMoMoDD]HHMMSS [-force_stop [skip_rest]]]
-	 [-basic_html]
-    	 [-ct_hooks CTHModule1 CTHOpts1 and CTHModule2 CTHOpts2 and ..
-	  CTHModuleN CTHOptsN]
-	 [-exit_status ignore_config]
-    </pre>
+ ct_run -spec TestSpec1 TestSpec2 .. TestSpecN
+  [-join_specs]
+  [-config ConfigFile1 ConfigFile2 .. ConfigFileN]
+  [-userconfig CallbackModule1 ConfigString1 and CallbackModule2
+   ConfigString2 and .. and CallbackModuleN ConfigStringN]
+  [-decrypt_key Key] | [-decrypt_file KeyFile]
+  [-label Label]
+  [-logdir LogDir]
+  [-logopts LogOpts]
+  [-verbosity GenVLevel | [Category1 VLevel1 and
+   Category2 VLevel2 and .. CategoryN VLevelN]]
+  [-allow_user_terms]
+  [-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
+  [-stylesheet CSSFile]
+  [-cover CoverCfgFile]
+  [-cover_stop Bool]
+  [-event_handler EvHandler1 EvHandler2 .. EvHandlerN] |
+  [-event_handler_init EvHandler1 InitArg1 and
+   EvHandler2 InitArg2 and .. EvHandlerN InitArgN]
+  [-include InclDir1 InclDir2 .. InclDirN]
+  [-no_auto_compile]
+  [-abort_if_missing_suites]
+  [-muliply_timetraps Multiplier]
+  [-scale_timetraps]
+  [-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]
+  [-repeat N] |
+  [-duration HHMMSS [-force_stop [skip_rest]]] |
+  [-until [YYMoMoDD]HHMMSS [-force_stop [skip_rest]]]
+  [-basic_html]
+  [-ct_hooks CTHModule1 CTHOpts1 and CTHModule2 CTHOpts2 and ..
+   CTHModuleN CTHOptsN]
+  [-exit_status ignore_config]</pre>
   </section>
+
   <section>
-    <title>Run tests in web based GUI</title>
+    <title>Run Tests in Web-Based GUI</title>
     <pre>
-        ct_run -vts [-browser Browser]
-         [-dir TestDir1 TestDir2 .. TestDirN] |
-         [[dir TestDir] -suite Suite [[-group Group] [-case Case]]]
-	 [-config ConfigFile1 ConfigFile2 .. ConfigFileN]
-	 [-userconfig CallbackModule1 ConfigString1 and CallbackModule2
-          ConfigString2 and .. and CallbackModuleN ConfigStringN]
-	 [-logopts LogOpts]
-	 [-verbosity GenVLevel | [Category1 VLevel1 and
-	  Category2 VLevel2 and .. CategoryN VLevelN]]
-	 [-decrypt_key Key] | [-decrypt_file KeyFile]
-	 [-include InclDir1 InclDir2 .. InclDirN]
-	 [-no_auto_compile]
-	 [-abort_if_missing_suites]
-	 [-muliply_timetraps Multiplier]
-	 [-scale_timetraps]
-	 [-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]
-	 [-basic_html]</pre>
+ ct_run -vts [-browser Browser]
+  [-dir TestDir1 TestDir2 .. TestDirN] |
+  [[dir TestDir] -suite Suite [[-group Group] [-case Case]]]
+  [-config ConfigFile1 ConfigFile2 .. ConfigFileN]
+  [-userconfig CallbackModule1 ConfigString1 and CallbackModule2
+    ConfigString2 and .. and CallbackModuleN ConfigStringN]
+  [-logopts LogOpts]
+  [-verbosity GenVLevel | [Category1 VLevel1 and
+   Category2 VLevel2 and .. CategoryN VLevelN]]
+  [-decrypt_key Key] | [-decrypt_file KeyFile]
+  [-include InclDir1 InclDir2 .. InclDirN]
+  [-no_auto_compile]
+  [-abort_if_missing_suites]
+  [-muliply_timetraps Multiplier]
+  [-scale_timetraps]
+  [-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]
+  [-basic_html]</pre>
   </section>
+
   <section>
-    <title>Refresh the HTML index files</title>
+    <title>Refresh HTML Index Files</title>
     <pre>
-	ct_run -refresh_logs [-logdir LogDir] [-basic_html]</pre>
+ ct_run -refresh_logs [-logdir LogDir] [-basic_html]</pre>
   </section>
+
   <section>
-    <title>Run CT in interactive mode</title>
+    <title>Run Common Test in Interactive Mode</title>
     <pre>
-	ct_run -shell
-	 [-config ConfigFile1 ConfigFile2 ... ConfigFileN]
-	 [-userconfig CallbackModule1 ConfigString1 and CallbackModule2
-          ConfigString2 and .. and CallbackModuleN ConfigStringN]
-	 [-decrypt_key Key] | [-decrypt_file KeyFile]</pre>
+ ct_run -shell
+  [-config ConfigFile1 ConfigFile2 ... ConfigFileN]
+  [-userconfig CallbackModule1 ConfigString1 and CallbackModule2
+   ConfigString2 and .. and CallbackModuleN ConfigStringN]
+  [-decrypt_key Key] | [-decrypt_file KeyFile]</pre>
   </section>
+
   <section>
-    <title>Start a Common Test Master node</title>
+    <title>Start a Common Test Master Node</title>
     <pre>
-	ct_run -ctmaster</pre>
+ ct_run -ctmaster</pre>
   </section>
 
   <section>
-    <title>See also</title>
-    <p>Please read the <seealso marker="run_test_chapter">Running Test Suites</seealso>
-      chapter in the Common Test User's Guide for information about the meaning of the
-      different start flags.</p>
+    <title>See Also</title>
+    <p>For information about the start flags, see section
+      <seealso marker="run_test_chapter">Running Tests and Analyzing
+      Results</seealso> in the User's Guide.</p>
   </section>
 
 </comref>
+
diff --git a/lib/common_test/doc/src/ct_slave.xml b/lib/common_test/doc/src/ct_slave.xml
new file mode 100644
index 0000000000..44a7b7873f
--- /dev/null
+++ b/lib/common_test/doc/src/ct_slave.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2010</year><year>2012</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+
+    </legalnotice>
+
+    <title>ct_slave</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>ct_slave.xml</file>
+  </header>
+  <module>ct_slave</module>
+  <modulesummary>Common Test framework functions for starting and stopping
+    nodes for Large-Scale Testing.</modulesummary>
+
+  <description>
+
+    <p><c>Common Test</c> framework functions for starting and stopping nodes
+      for Large-Scale Testing.</p>
+
+    <p>This module exports functions used by the <c>Common Test</c>
+      Master to start and stop "slave" nodes. It is the default callback
+      module for the <c>{init, node_start}</c> term in the Test
+      Specification.</p>
+
+  </description>
+
+  <funcs>
+    <func>
+      <name>start(Node) -&gt; Result</name>
+      <fsummary>Starts an Erlang node with name Node on the local
+        host.</fsummary>
+      <type>
+        <v>Node = atom()</v>
+        <v>Result = {ok, NodeName} | {error, Reason, NodeName}</v>
+        <v>Reason = already_started | started_not_connected | boot_timeout | init_timeout | startup_timeout | not_alive</v>
+        <v>NodeName = atom()</v>
+      </type>
+      <desc><marker id="start-1"/>
+        <p>Starts an Erlang node with name <c>Node</c> on the local host.</p>
+
+        <p>See also
+          <seealso marker="#start-3"><c>ct_slave:start/3</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>start(HostOrNode, NodeOrOpts) -&gt; Result</name>
+      <fsummary>Starts an Erlang node with default options on a specified
+        host, or on the local host with specified options.</fsummary>
+      <type>
+        <v>HostOrNode = atom()</v>
+        <v>NodeOrOpts = atom() | list()</v>
+        <v>Result = {ok, NodeName} | {error, Reason, NodeName}</v>
+        <v>Reason = already_started | started_not_connected | boot_timeout | init_timeout | startup_timeout | not_alive</v>
+        <v>NodeName = atom()</v>
+      </type>
+      <desc><marker id="start-2"/>
+        <p>Starts an Erlang node with default options on a specified host, or
+          on the local host with specified options. That is, the call is
+          interpreted as <c>start(Host, Node)</c> when the second argument is
+          atom-valued and <c>start(Node, Opts)</c> when it is list-valued.</p>
+
+        <p>See also
+          <seealso marker="#start-3"><c>ct_slave:start/3</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>start(Host, Node, Opts) -&gt; Result</name>
+      <fsummary>Starts an Erlang node with name Node on host Host as
+        specified by the combination of options in Opts.</fsummary>
+      <type>
+        <v>Node = atom()</v>
+        <v>Host = atom()</v>
+        <v>Opts = [OptTuples]</v>
+        <v>OptTuples = {username, Username} | {password, Password} | {boot_timeout, BootTimeout} | {init_timeout, InitTimeout} | {startup_timeout, StartupTimeout} | {startup_functions, StartupFunctions} | {monitor_master, Monitor} | {kill_if_fail, KillIfFail} | {erl_flags, ErlangFlags} | {env, [{EnvVar, Value}]}</v>
+        <v>Username = string()</v>
+        <v>Password = string()</v>
+        <v>BootTimeout = integer()</v>
+        <v>InitTimeout = integer()</v>
+        <v>StartupTimeout = integer()</v>
+        <v>StartupFunctions = [StartupFunctionSpec]</v>
+        <v>StartupFunctionSpec = {Module, Function, Arguments}</v>
+        <v>Module = atom()</v>
+        <v>Function = atom()</v>
+        <v>Arguments = [term]</v>
+        <v>Monitor = bool()</v>
+        <v>KillIfFail = bool()</v>
+        <v>ErlangFlags = string()</v>
+        <v>EnvVar = string()</v>
+        <v>Value = string()</v>
+        <v>Result = {ok, NodeName} | {error, Reason, NodeName}</v>
+        <v>Reason = already_started | started_not_connected | boot_timeout | init_timeout | startup_timeout | not_alive</v>
+        <v>NodeName = atom()</v>
+      </type>
+      <desc><marker id="start-3"/>
+        <p>Starts an Erlang node with name <c>Node</c> on host <c>Host</c> as
+          specified by the combination of options in <c>Opts</c>.</p>
+
+        <p>Options <c>Username</c> and <c>Password</c> are used to log on to the
+          remote host <c>Host</c>. <c>Username</c>, if omitted, defaults to
+          the current username. <c>Password</c> is empty by default.</p>
+
+        <p>A list of functions specified in option <c>Startup</c> are
+          executed after startup of the node. Notice that all used modules
+          are to be present in the code path on <c>Host</c>.</p>
+
+        <p>The time-outs are applied as follows:</p>
+
+        <taglist>
+          <tag><c>BootTimeout</c></tag>
+            <item><p>The time to start the Erlang node, in seconds. Defaults to
+              3 seconds. If the node is not pingable within this time, the result
+              <c>{error, boot_timeout, NodeName}</c> is returned.</p></item>
+          <tag><c>InitTimeout</c></tag>
+            <item><p>The time to wait for the node until it calls the internal
+             callback function informing master about a successful startup.
+             Defaults to 1 second. In case of a timed out message, the result
+             <c>{error, init_timeout, NodeName}</c> is returned.</p></item>
+          <tag><c>StartupTimeout</c></tag>
+            <item><p>The time to wait until the node stops to run
+              <c>StartupFunctions</c>. Defaults to 1 second. If this time-out
+              occurs, the result <c>{error, startup_timeout, NodeName}</c> is
+              returned.</p></item>
+        </taglist>
+
+        <p><em>Options:</em></p>
+
+        <taglist>
+          <tag><c>monitor_master</c></tag>
+          <item><p>Specifies if the slave node is to be stopped if the
+            master node stops. Defaults to <c>false</c>.</p></item>
+          <tag><c>kill_if_fail</c></tag>
+          <item><p>Specifies if the slave node is to be killed if a time-out
+            occurs during initialization or startup. Defaults to <c>true</c>.
+            Notice that the node can also be still alive it the boot time-out
+            occurred, but it is not killed in this case.</p></item>
+          <tag><c>erlang_flags</c></tag>
+          <item><p>Specifies which flags are added to the parameters of the
+            executable <c>erl</c>.</p></item>
+          <tag><c>env</c></tag>
+          <item><p>Specifies a list of environment variables that will extend
+            the environment.</p></item>
+        </taglist>
+
+        <p><em>Special return values:</em></p>
+
+        <list type="bulleted">
+          <item><p><c>{error, already_started, NodeName}</c> if the node
+            with the specified name is already started on a specified
+            host.</p></item>
+          <item><p><c>{error, started_not_connected, NodeName}</c> if the
+            node is started, but not connected to the master node.</p></item>
+          <item><p><c>{error, not_alive, NodeName}</c> if the node on which
+            <seealso marker="#start-3"><c>ct_slave:start/3</c></seealso> is
+            called, is not alive. Notice that <c>NodeName</c> is the name of
+            the current node in this case.</p></item>
+        </list>
+      </desc>
+    </func>
+
+    <func>
+      <name>stop(Node) -&gt; Result</name>
+      <fsummary>Stops the running Erlang node with name Node on the local
+        host.</fsummary>
+      <type>
+        <v>Node = atom()</v>
+        <v>Result = {ok, NodeName} | {error, Reason, NodeName}</v>
+        <v>Reason = not_started | not_connected | stop_timeout</v>
+      </type>
+      <desc><marker id="stop-1"/>
+        <p>Stops the running Erlang node with name <c>Node</c> on the local
+          host.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>stop(Host, Node) -&gt; Result</name>
+      <fsummary>Stops the running Erlang node with name Node on host
+        Host.</fsummary>
+      <type>
+        <v>Host = atom()</v>
+        <v>Node = atom()</v>
+        <v>Result = {ok, NodeName} | {error, Reason, NodeName}</v>
+        <v>Reason = not_started | not_connected | stop_timeout</v>
+        <v>NodeName = atom()</v>
+      </type>
+      <desc><marker id="stop-2"/>
+        <p>Stops the running Erlang node with name <c>Node</c> on host
+          <c>Host</c>.</p>
+      </desc>
+    </func>
+  </funcs>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/ct_snmp.xml b/lib/common_test/doc/src/ct_snmp.xml
new file mode 100644
index 0000000000..d001fb24ec
--- /dev/null
+++ b/lib/common_test/doc/src/ct_snmp.xml
@@ -0,0 +1,523 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2010</year><year>2012</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+
+    </legalnotice>
+
+    <title>ct_snmp</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>ct_snmp.xml</file>
+  </header>
+  <module>ct_snmp</module>
+  <modulesummary>Common Test user interface module for the SNMP application.</modulesummary>
+
+  <description>
+
+    <p><c>Common Test</c> user interface module for the <c>SNMP</c>
+      application.</p>
+
+    <p>The purpose of this module is to simplify SNMP configuration for the
+      test case writer. Many test cases can use default values for common
+      operations and then no SNMP configuration files need to be supplied.
+      When it is necessary to change particular configuration parameters, a
+      subset of the relevant SNMP configuration files can be passed to
+      <c>ct_snmp</c> by <c>Common Test</c> configuration files. For more
+      specialized configuration parameters, a simple SNMP configuration file
+      can be placed in the test suite data directory. To simplify the test
+      suite, <c>Common Test</c> keeps track of some of the SNMP manager
+      information. This way the test suite does not have to handle as many
+      input parameters as if it had to interface wthe OTP SNMP manager
+      directly.</p>
+
+    <p><em>Configurable SNMP Manager and Agent Parameters:</em></p>
+
+    <p>Manager configuration:</p>
+
+    <taglist>
+      <tag><c>[{start_manager, boolean()}</c></tag>
+        <item><p>Optional. Default is <c>true</c>.</p></item>
+      <tag><c>{users, [{user_name(), [call_back_module(), user_data()]}]}</c></tag>
+        <item><p>Optional.</p></item>
+      <tag><c>{usm_users, [{usm_user_name(), [usm_config()]}]}</c></tag>
+        <item><p>Optional. SNMPv3 only.</p></item>
+      <tag><c>{managed_agents,[{agent_name(), [user_name(), agent_ip(), agent_port(), [agent_config()]]}]}</c></tag>
+        <item><p><c>managed_agents</c> is optional.</p></item>
+      <tag><c>{max_msg_size, integer()}</c></tag>
+        <item><p>Optional. Default is <c>484</c>.</p></item>
+      <tag><c>{mgr_port, integer()}</c></tag>
+        <item><p>Optional. Default is <c>5000</c>.</p></item>
+      <tag><c>{engine _id, string()}</c></tag>
+        <item><p>Optional. Default is <c>"mgrEngine"</c>.</p></item>
+    </taglist>
+
+    <p>Agent configuration:</p>
+
+    <taglist>
+      <tag><c>{start_agent, boolean()}</c></tag>
+        <item><p>Optional. Default is <c>false</c>.</p></item>
+      <tag><c>{agent_sysname, string()}</c></tag>
+        <item><p>Optional. Default is <c>"ct_test"</c>.</p></item>
+      <tag><c>{agent_manager_ip, manager_ip()}</c></tag>
+        <item><p>Optional. Default is <c>localhost</c>.</p></item>
+      <tag><c>{agent_vsns, list()}</c></tag>
+        <item><p>Optional. Default is <c>[v2]</c>.</p></item>
+      <tag><c>{agent_trap_udp, integer()}</c></tag>
+        <item><p>Optional. Default is <c>5000</c>.</p></item>
+      <tag><c>{agent_udp, integer()}</c></tag>
+        <item><p>Optional. Default is <c>4000</c>.</p></item>
+      <tag><c>{agent_notify_type, atom()}</c></tag>
+        <item><p>Optional. Default is <c>trap</c>.</p></item>
+      <tag><c>{agent_sec_type, sec_type()}</c></tag>
+        <item><p>Optional. Default is <c>none</c>.</p></item>
+      <tag><c>{agent_passwd, string()}</c></tag>
+        <item><p>Optional. Default is <c>""</c>.</p></item>
+      <tag><c>{agent_engine_id, string()}</c></tag>
+        <item><p>Optional. Default is <c>"agentEngine"</c>.</p></item>
+      <tag><c>{agent_max_msg_size, string()}</c></tag>
+        <item><p>Optional. Default is <c>484</c>.</p></item>
+    </taglist>
+
+    <p>The following parameters represents the SNMP configuration files
+      <c>context.conf</c>, <c>standard.conf</c>, <c>community.conf</c>,
+      <c>vacm.conf</c>, <c>usm.conf</c>, <c>notify.conf</c>,
+      <c>target_addr.conf</c>, and <c>target_params.conf</c>. Notice that
+      all values in <c>agent.conf</c> can be modified by the parameters
+      listed above. All these configuration files have default values set by
+      the <c>SNMP</c> application. These values can be overridden by suppling
+      a list of valid configuration values or a file located in the test
+      suites data directory, which can produce a list of valid configuration
+      values if you apply function <c>file:consult/1</c> to the file.</p>
+
+    <taglist>
+      <tag><c>{agent_contexts, [term()] | {data_dir_file, rel_path()}}</c></tag>
+        <item><p>Optional.</p></item>
+      <tag><c>{agent_community, [term()] | {data_dir_file, rel_path()}}</c></tag>
+        <item><p>Optional.</p></item>
+      <tag><c>{agent_sysinfo,  [term()] | {data_dir_file, rel_path()}}</c></tag>
+        <item><p>Optional.</p></item>
+      <tag><c>{agent_vacm, [term()] | {data_dir_file, rel_path()}}</c></tag>
+        <item><p>Optional.</p></item>
+      <tag><c>{agent_usm, [term()] | {data_dir_file, rel_path()}}</c></tag>
+        <item><p>Optional.</p></item>
+      <tag><c>{agent_notify_def, [term()] | {data_dir_file, rel_path()}}</c></tag>
+        <item><p>Optional.</p></item>
+      <tag><c>{agent_target_address_def, [term()] | {data_dir_file, rel_path()}}</c></tag>
+        <item><p>Optional.</p></item>
+      <tag><c>{agent_target_param_def, [term()] | {data_dir_file, rel_path()}}</c></tag>
+        <item><p>Optional.</p></item>
+      </taglist>
+
+    <p>Parameter <c>MgrAgentConfName</c> in the functions is to be a name
+      you allocate in your test suite using a <c>require</c> statement.
+      Example (where <c>MgrAgentConfName = snmp_mgr_agent</c>):</p>
+
+    <pre>
+ suite() -&gt; [{require, snmp_mgr_agent, snmp}].</pre>
+
+    <p>or</p>
+
+    <pre>
+ ct:require(snmp_mgr_agent, snmp).</pre>
+
+    <p>Notice that USM users are needed for SNMPv3 configuration and are
+      not to be confused with users.</p>
+
+    <p>SNMP traps, inform, and report messages are handled by the user
+      callback module. For details, see the
+      <seealso marker="snmp:index"><c>SNMP</c></seealso> application.</p>
+
+    <p>It is recommended to use the <c>.hrl</c> files created by the
+      Erlang/OTP MIB compiler to define the Object Identifiers (OIDs).
+      For example, to get the Erlang node name from <c>erlNodeTable</c>
+      in the OTP-MIB:</p>
+
+    <pre>
+ Oid = ?erlNodeEntry ++ [?erlNodeName, 1]</pre>
+
+    <p>Furthermore, values can be set for <c>SNMP</c> application configuration
+      parameters, <c>config</c>, <c>server</c>, <c>net_if</c>, and so on (for
+      a list of valid parameters and types, see the  <seealso marker="snmp:users_guide"><c>User's Guide for the SNMP application</c></seealso>). This is
+      done by defining a configuration data variable on the following form:</p>
+
+    <pre>
+ {snmp_app, [{manager, [snmp_app_manager_params()]},
+             {agent, [snmp_app_agent_params()]}]}.</pre>
+
+    <p>A name for the data must be allocated in the suite using
+      <c>require</c> (see the example above). Pass this name as argument
+      <c>SnmpAppConfName</c> to
+      <seealso marker="#start-3"><c>ct_snmp:start/3</c></seealso>.
+      <c>ct_snmp</c> specifies default values for some <c>SNMP</c> application
+      configuration parameters (such as <c>{verbosity,trace}</c> for parameter
+      <c>config</c>). This set of defaults is merged with the parameters
+      specified by the user. The user values override <c>ct_snmp</c>
+      defaults.</p>
+
+  </description>
+
+  <section>
+    <title>Data Types</title>
+    <marker id="types"/>
+    <taglist>
+      <tag><c>agent_config() = {Item, Value}</c></tag>
+      <item><marker id="type-agent_config"/> </item>
+      <tag><c>agent_ip() = ip()</c></tag>
+      <item><marker id="type-agent_ip"/> </item>
+      <tag><c>agent_name() = atom()</c></tag>
+      <item><marker id="type-agent_name"/> </item>
+      <tag><c>agent_port() = integer()</c></tag>
+      <item><marker id="type-agent_port"/> </item>
+      <tag><c>call_back_module() = atom()</c></tag>
+      <item><marker id="type-call_back_module"/> </item>
+      <tag><c>error_index() = integer()</c></tag>
+      <item><marker id="type-error_index"/> </item>
+      <tag><c>error_status() = noError | atom()</c></tag>
+      <item><marker id="type-error_status"/> </item>
+      <tag><c>ip() = string() | {integer(), integer(), integer(), integer()}</c></tag>
+      <item><marker id="type-ip"/> </item>
+      <tag><c>manager_ip() = ip()</c></tag>
+      <item><marker id="type-manager_ip"/> </item>
+      <tag><c>oid() = [byte()]</c></tag>
+      <item><marker id="type-oid"/> </item>
+      <tag><c>oids() = [oid()]</c></tag>
+      <item><marker id="type-oids"/> </item>
+      <tag><c>rel_path() = string()</c></tag>
+      <item><marker id="type-rel_path"/> </item>
+      <tag><c>sec_type() = none | minimum | semi</c></tag>
+      <item><marker id="type-sec_type"/> </item>
+      <tag><c>snmp_app_agent_params() = term()</c></tag>
+      <item><marker id="type-snmp_app_agent_params"/> </item>
+      <tag><c>snmp_app_manager_params() = term()</c></tag>
+      <item><marker id="type-snmp_app_manager_params"/> </item>
+      <tag><c>snmpreply() = {error_status(), error_index(), varbinds()}</c></tag>
+      <item><marker id="type-snmpreply"/> </item>
+      <tag><c>user_data() = term()</c></tag>
+      <item><marker id="type-user_data"/> </item>
+      <tag><c>user_name() = atom()</c></tag>
+      <item><marker id="type-user_name"/> </item>
+      <tag><c>usm_config() = {Item, Value}</c></tag>
+      <item><marker id="type-usm_config"/> </item>
+      <tag><c>usm_user_name() = string()</c></tag>
+      <item><marker id="type-usm_user_name"/> </item>
+      <tag><c>value_type() = o('OBJECT IDENTIFIER') | i('INTEGER') | u('Unsigned32') | g('Unsigned32') | s('OCTET STRING')</c></tag>
+      <item><marker id="type-value_type"/> </item>
+      <tag><c>var_and_val() = {oid(), value_type(), value()}</c></tag>
+      <item><marker id="type-var_and_val"/> </item>
+      <tag><c>varbind() = term()</c></tag>
+      <item><marker id="type-varbind"/> </item>
+      <tag><c>varbinds() = [varbind()]</c></tag>
+      <item><marker id="type-varbinds"/> </item>
+      <tag><c>varsandvals() = [var_and_val()]</c></tag>
+      <item><marker id="type-varsandvals"/> </item>
+    </taglist>
+    <p>These data types are described in the documentation for
+      the <seealso marker="snmp:index"><c>SNMP</c></seealso> application.</p>
+  </section>
+
+  <funcs>
+    <func>
+      <name>get_next_values(Agent, Oids, MgrAgentConfName) -&gt; SnmpReply</name>
+      <fsummary>Issues a synchronous SNMP get next request.</fsummary>
+      <type>
+        <v>Agent = agent_name()</v>
+        <v>Oids = oids()</v>
+        <v>MgrAgentConfName = atom()</v>
+        <v>SnmpReply = snmpreply()</v>
+      </type>
+      <desc><marker id="get_next_values-3"/>
+        <p>Issues a synchronous SNMP <c>get next</c> request.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_values(Agent, Oids, MgrAgentConfName) -&gt; SnmpReply</name>
+      <fsummary>Issues a synchronous SNMP get request.</fsummary>
+      <type>
+        <v>Agent = agent_name()</v>
+        <v>Oids = oids()</v>
+        <v>MgrAgentConfName = atom()</v>
+        <v>SnmpReply = snmpreply()</v>
+      </type>
+      <desc><marker id="get_values-3"/>
+        <p>Issues a synchronous SNMP <c>get</c> request.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>load_mibs(Mibs) -&gt; ok | {error, Reason}</name>
+      <fsummary>Loads the MIBs into agent snmp_master_agent.</fsummary>
+      <type>
+        <v>Mibs = [MibName]</v>
+        <v>MibName = string()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="load_mibs-1"/>
+        <p>Loads the MIBs into agent <c>snmp_master_agent</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>register_agents(MgrAgentConfName, ManagedAgents) -&gt; ok | {error, Reason}</name>
+      <fsummary>Explicitly instructs the manager to handle this
+        agent.</fsummary>
+      <type>
+        <v>MgrAgentConfName = atom()</v>
+        <v>ManagedAgents = [agent()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="register_agents-2"/>
+        <p>Explicitly instructs the manager to handle this agent. Corresponds
+          to making an entry in <c>agents.conf</c>.</p>
+
+        <p>This function tries to register the specified managed agents, without
+          checking if any of them exist. To change a registered managed agent,
+          the agent must first be unregistered.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>register_users(MgrAgentConfName, Users) -&gt; ok | {error, Reason}</name>
+      <fsummary>Registers the manager entity (=user) responsible for specific
+        agent(s).</fsummary>
+      <type>
+        <v>MgrAgentConfName = atom()</v>
+        <v>Users = [user()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="register_users-2"/>
+        <p>Registers the manager entity (=user) responsible for specific
+          agent(s). Corresponds to making an entry in <c>users.conf</c>.</p>
+
+        <p>This function tries to register the specified users, without checking
+          if any of them exist. To change a registered user, the user must
+          first be unregistered.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>register_usm_users(MgrAgentConfName, UsmUsers) -&gt; ok | {error, Reason}</name>
+      <fsummary>Explicitly instructs the manager to handle this USM user.</fsummary>
+      <type>
+        <v>MgrAgentConfName = atom()</v>
+        <v>UsmUsers = [usm_user()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="register_usm_users-2"/>
+        <p>Explicitly instructs the manager to handle this USM user.
+          Corresponds to making an entry in <c>usm.conf</c>.</p>
+
+        <p>This function tries to register the specified users, without checking
+          if any of them exist. To change a registered user, the user must
+          first be unregistered.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>set_info(Config) -&gt; [{Agent, OldVarsAndVals, NewVarsAndVals}]</name>
+      <fsummary>Returns a list of all successful set requests performed in the
+        test case in reverse order.</fsummary>
+      <type>
+        <v>Config = [{Key, Value}]</v>
+        <v>Agent = agent_name()</v>
+        <v>OldVarsAndVals = varsandvals()</v>
+        <v>NewVarsAndVals = varsandvals()</v>
+      </type>
+      <desc><marker id="set_info-1"/>
+        <p>Returns a list of all successful <c>set</c> requests performed in
+          the test case in reverse order. The list contains the involved user
+          and agent, the value before <c>set</c>, and the new value. This is
+          intended to simplify the cleanup in function <c>end_per_testcase</c>,
+          that is, the undoing of the <c>set</c> requests and their possible
+          side-effects.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>set_values(Agent, VarsAndVals, MgrAgentConfName, Config) -&gt; SnmpReply</name>
+      <fsummary>Issues a synchronous SNMP set request.</fsummary>
+      <type>
+        <v>Agent = agent_name()</v>
+        <v>Oids = oids()</v>
+        <v>MgrAgentConfName = atom()</v>
+        <v>Config = [{Key, Value}]</v>
+        <v>SnmpReply = snmpreply()</v>
+      </type>
+      <desc><marker id="set_values-4"/>
+        <p>Issues a synchronous SNMP <c>set</c> request.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>start(Config, MgrAgentConfName) -&gt; ok</name>
+      <fsummary>Equivalent to start(Config, MgrAgentConfName,
+        undefined).</fsummary>
+      <desc><marker id="start-2"/>
+        <p>Equivalent to
+          <seealso marker="#start-3"><c>ct_snmp:start(Config, MgrAgentConfName,
+          undefined)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>start(Config, MgrAgentConfName, SnmpAppConfName) -&gt; ok</name>
+      <fsummary>Starts an SNMP manager and/or agent.</fsummary>
+      <type>
+        <v>Config = [{Key, Value}]</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+        <v>MgrAgentConfName = atom()</v>
+        <v>SnmpConfName = atom()</v>
+      </type>
+      <desc><marker id="start-3"/>
+        <p>Starts an SNMP manager and/or agent. In the manager case,
+          registrations of users and agents, as specified by the configuration
+          <c>MgrAgentConfName</c>, are performed. When using SNMPv3, called
+          USM users are also registered. Users, <c>usm_users</c>, and
+          managed agents can also be registered later using
+          <seealso marker="#register_users-2"><c>ct_snmp:register_users/2</c></seealso>,
+          <seealso marker="#register_agents-2"><c>ct_snmp:register_agents/2</c></seealso>,
+          and
+          <seealso marker="#register_usm_users-2"><c>ct_snmp:register_usm_users/2</c></seealso>.</p>
+
+        <p>The agent started is called <c>snmp_master_agent</c>. Use
+          <seealso marker="#load_mibs-1"><c>ct_snmp:load_mibs/1</c></seealso>
+          to load MIBs into the agent.</p>
+
+        <p>With <c>SnmpAppConfName</c> SNMP applications can be configured
+          with parameters <c>config</c>, <c>mibs</c>, <c>net_if</c>, and so on.
+          The values are merged with (and possibly override) default values
+          set by <c>ct_snmp</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>stop(Config) -&gt; ok</name>
+      <fsummary>Stops the SNMP manager and/or agent, and removes all files
+        created.</fsummary>
+      <type>
+        <v>Config = [{Key, Value}]</v>
+        <v>Key = atom()</v>
+        <v>Value = term()</v>
+      </type>
+      <desc><marker id="stop-1"/>
+        <p>Stops the SNMP manager and/or agent, and removes all files
+          created.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>unload_mibs(Mibs) -&gt; ok | {error, Reason}</name>
+      <fsummary>Unloads the MIBs from agent snmp_master_agent.</fsummary>
+      <type>
+        <v>Mibs = [MibName]</v>
+        <v>MibName = string()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="unload_mibs-1"/>
+        <p>Unloads the MIBs from agent <c>snmp_master_agent</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>unregister_agents(MgrAgentConfName) -&gt; ok</name>
+      <fsummary>Unregisters all managed agents.</fsummary>
+      <type>
+        <v>MgrAgentConfName = atom()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="unregister_agents-1"/>
+        <p>Unregisters all managed agents.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>unregister_agents(MgrAgentConfName, ManagedAgents) -&gt; ok</name>
+      <fsummary>Unregisters the specified managed agents.</fsummary>
+      <type>
+        <v>MgrAgentConfName = atom()</v>
+        <v>ManagedAgents = [agent_name()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="unregister_agents-2"/>
+        <p>Unregisters the specified managed agents.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>unregister_users(MgrAgentConfName) -&gt; ok</name>
+      <fsummary>Unregisters all users.</fsummary>
+      <type>
+        <v>MgrAgentConfName = atom()</v>
+        <v>Reason = term()</v>
+     </type>
+     <desc><marker id="unregister_users-1"/>
+       <p>Unregisters all users.</p>
+     </desc>
+    </func>
+
+    <func>
+      <name>unregister_users(MgrAgentConfName, Users) -&gt; ok</name>
+      <fsummary>Unregisters the specified users.</fsummary>
+      <type>
+        <v>MgrAgentConfName = atom()</v>
+        <v>Users = [user_name()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="unregister_users-2"/>
+        <p>Unregisters the specified users.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>unregister_usm_users(MgrAgentConfName) -&gt; ok</name>
+      <fsummary>Unregisters all USM users.</fsummary>
+      <type>
+        <v>MgrAgentConfName = atom()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="unregister_usm_users-1"/>
+        <p>Unregisters all USM users.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>unregister_usm_users(MgrAgentConfName, UsmUsers) -&gt; ok</name>
+        <fsummary>Unregisters the specified USM users.</fsummary>
+      <type>
+        <v>MgrAgentConfName = atom()</v>
+        <v>UsmUsers = [usm_user_name()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="unregister_usm_users-2"/>
+        <p>Unregisters the specified USM users.</p>
+      </desc>
+    </func>
+  </funcs>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/ct_ssh.xml b/lib/common_test/doc/src/ct_ssh.xml
new file mode 100644
index 0000000000..92b1f60b8c
--- /dev/null
+++ b/lib/common_test/doc/src/ct_ssh.xml
@@ -0,0 +1,1150 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2010</year><year>2012</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+
+    </legalnotice>
+
+    <title>ct_ssh</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>ct_ssh.xml</file>
+  </header>
+  <module>ct_ssh</module>
+  <modulesummary>SSH/SFTP client module.</modulesummary>
+
+<description>
+
+    <p>SSH/SFTP client module.</p>
+
+    <p>This module uses application <c>SSH</c>, which provides detailed
+      information about, for example, functions, types, and options.</p>
+
+    <p>Argument <c>Server</c> in the SFTP functions is only to be used for
+      SFTP sessions that have been started on existing SSH connections
+      (that is, when the original connection type is <c>ssh</c>). Whenever
+      the connection type is <c>sftp</c>, use the SSH connection reference
+      only.</p>
+
+    <p>The following options are valid for specifying an SSH/SFTP
+      connection (that is, can be used as configuration elements):</p>
+
+    <pre>
+ [{ConnType, Addr},
+  {port, Port},
+  {user, UserName}
+  {password, Pwd}
+  {user_dir, String}
+  {public_key_alg, PubKeyAlg}
+  {connect_timeout, Timeout}
+  {key_cb, KeyCallbackMod}]</pre>
+
+    <p><c>ConnType = ssh | sftp</c>.</p>
+
+    <p>For other types, see
+      <seealso marker="ssh:ssh"><c>ssh:ssh(3)</c></seealso>.</p>
+
+    <p>All time-out parameters in <c>ct_ssh</c> functions are values in
+      milliseconds.</p>
+
+  </description>
+
+  <section>
+    <title>Data Types</title>
+    <marker id="types"/>
+    <taglist>
+      <tag><c>connection() = handle() | target_name()</c></tag>
+      <item><marker id="type-connection"/>
+        <p>For <c>target_name</c>, see module
+          <seealso marker="ct"><c>ct</c></seealso>.</p></item>
+
+      <tag><c>handle() = handle()</c></tag>
+      <item><marker id="type-handle"/>
+        <p>Handle for a specific SSH/SFTP connection, see module
+          <seealso marker="ct"><c>ct</c></seealso>.</p></item>
+
+      <tag><c>ssh_sftp_return() = term()</c></tag>
+      <item><marker id="type-ssh_sftp_return"/>
+        <p>Return value from an
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp</c></seealso>
+            function.</p></item>
+    </taglist>
+  </section>
+
+  <funcs>
+    <func>
+      <name>apread(SSH, Handle, Position, Length) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="apread-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>apread(SSH, Server, Handle, Position, Length) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="apread-5"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>apwrite(SSH, Handle, Position, Data) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="apwrite-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>apwrite(SSH, Server, Handle, Position, Data) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="apwrite-5"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>aread(SSH, Handle, Len) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="aread-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>aread(SSH, Server, Handle, Len) -&gt; Result</name>
+      <fsummary>For inforamtion and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="aread-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>awrite(SSH, Handle, Data) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="awrite-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>awrite(SSH, Server, Handle, Data) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="awrite-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>close(SSH, Handle) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="close-2"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>close(SSH, Server, Handle) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="close-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>connect(KeyOrName) -&gt; {ok, Handle} | {error, Reason}</name>
+      <fsummary>Equivalent to connect(KeyOrName, host, []).</fsummary>
+      <desc><marker id="connect-1"/>
+        <p>Equivalent to
+          <seealso marker="#connect-3"><c>ct_ssh:connect(KeyOrName, host,
+          [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>connect(KeyOrName, ConnType) -&gt; {ok, Handle} | {error, Reason}</name>
+      <fsummary>Equivalent to connect(KeyOrName, ConnType, []).</fsummary>
+      <desc><marker id="connect-2"/>
+        <p>Equivalent to
+          <seealso marker="#connect-3"><c>ct_ssh:connect(KeyOrName, ConnType,
+          [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>connect(KeyOrName, ConnType, ExtraOpts) -&gt; {ok, Handle} | {error, Reason}</name>
+      <fsummary>Opens an SSH or SFTP connection using the information
+        associated with KeyOrName.</fsummary>
+      <type>
+        <v>KeyOrName = Key | Name</v>
+        <v>Key = atom()</v>
+        <v>Name = target_name()</v>
+        <v>ConnType = ssh | sftp | host</v>
+        <v>ExtraOpts = ssh_connect_options()</v>
+        <v>Handle = handle()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="connect-3"/>
+        <p>Opens an SSH or SFTP connection using the information associated
+          with <c>KeyOrName</c>.</p>
+
+        <p>If <c>Name</c> (an alias name for <c>Key</c>) is used to identify
+          the connection, this name can be used as connection reference for
+          subsequent calls. Only one open connection at a time associated
+          with <c>Name</c> is possible. If <c>Key</c> is used, the returned
+          handle must be used for subsequent calls (multiple connections can
+          be opened using the configuration data specified by <c>Key</c>).</p>
+
+        <p>For information on how to create a new <c>Name</c>, see
+          <seealso marker="ct#require-2"><c>ct:require/2</c></seealso>.</p>
+
+        <p>For <c>target_name</c>, see module
+          <seealso marker="ct"><c>ct</c></seealso>.</p>
+
+        <p><c>ConnType</c> always overrides the type specified in the
+          address tuple in the configuration data (and in <c>ExtraOpts</c>).
+          So it is possible to, for example, open an SFTP connection
+          directly using data originally specifying an SSH connection. Value
+          <c>host</c> means that the connection type specified by the host
+          option (either in the configuration data or in <c>ExtraOpts</c>)
+          is used.</p>
+
+        <p><c>ExtraOpts</c> (optional) are extra SSH options to be added to
+          the configuration data for <c>KeyOrName</c>. The extra options
+          override any existing options with the same key in the
+          configuration data. For details on valid SSH options, see
+          application <seealso marker="ssh:index"><c>SSH</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>del_dir(SSH, Name) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="del_dir-2"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>del_dir(SSH, Server, Name) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="del_dir-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>delete(SSH, Name) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="delete-2"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>delete(SSH, Server, Name) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="delete-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>disconnect(SSH) -&gt; ok | {error, Reason}</name>
+      <fsummary>Closes an SSH/SFTP connection.</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="disconnect-1"/>
+        <p>Closes an SSH/SFTP connection.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>exec(SSH, Command) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Equivalent to exec(SSH, Command, DefaultTimeout).</fsummary>
+      <desc><marker id="exec-2"/>
+        <p>Equivalent to
+          <seealso marker="#exec-3"><c>ct_ssh:exec(SSH, Command,
+          DefaultTimeout)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>exec(SSH, Command, Timeout) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Requests server to perform Command.</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Command = string()</v>
+        <v>Timeout = integer()</v>
+        <v>Data = list()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="exec-3"/>
+        <p>Requests server to perform <c>Command</c>. A session channel is
+          opened automatically for the request. <c>Data</c> is received from
+          the server as a result of the command.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>exec(SSH, ChannelId, Command, Timeout) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Requests server to perform Command.</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>ChannelId = integer()</v>
+        <v>Command = string()</v>
+        <v>Timeout = integer()</v>
+        <v>Data = list()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="exec-4"/>
+        <p>Requests server to perform <c>Command</c>. A previously opened
+          session channel is used for the request. <c>Data</c> is received
+          from the server as a result of the command.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_file_info(SSH, Handle) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="get_file_info-2"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_file_info(SSH, Server, Handle) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="get_file_info-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>list_dir(SSH, Path) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="list_dir-2"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>list_dir(SSH, Server, Path) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="list_dir-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>make_dir(SSH, Name) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="make_dir-2"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>make_dir(SSH, Server, Name) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="make_dir-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>make_symlink(SSH, Name, Target) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="make_symlink-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>make_symlink(SSH, Server, Name, Target) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="make_symlink-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>open(SSH, File, Mode) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="open-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>open(SSH, Server, File, Mode) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="open-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>opendir(SSH, Path) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="opendir-2"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>opendir(SSH, Server, Path) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="opendir-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>position(SSH, Handle, Location) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="position-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>position(SSH, Server, Handle, Location) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="position-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>pread(SSH, Handle, Position, Length) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="pread-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>pread(SSH, Server, Handle, Position, Length) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="pread-5"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>pwrite(SSH, Handle, Position, Data) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="pwrite-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>pwrite(SSH, Server, Handle, Position, Data) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="pwrite-5"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>read(SSH, Handle, Len) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="read-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>read(SSH, Server, Handle, Len) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="read-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>read_file(SSH, File) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="read_file-2"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>read_file(SSH, Server, File) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="read_file-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>read_file_info(SSH, Name) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="read_file_info-2"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>read_file_info(SSH, Server, Name) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="read_file_info-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>read_link(SSH, Name) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="read_link-2"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>read_link(SSH, Server, Name) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="read_link-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>read_link_info(SSH, Name) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="read_link_info-2"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>read_link_info(SSH, Server, Name) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="read_link_info-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>receive_response(SSH, ChannelId) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Equivalent to receive_response(SSH, ChannelId,
+        close).</fsummary>
+      <desc><marker id="receive_response-2"/>
+        <p>Equivalent to
+          <seealso marker="#receive_response-3"><c>ct_ssh:receive_response(SSH,
+ChannelId, close)</c></seealso>.</p>
+      </desc>
+    </func>
+
+     <func>
+       <name>receive_response(SSH, ChannelId, End) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Equivalent to receive_response(SSH, ChannelId, End,
+        DefaultTimeout).</fsummary>
+      <desc><marker id="receive_response-3"/>
+        <p>Equivalent to
+          <seealso marker="#receive_response-4"><c>ct_ssh:receive_response(SSH,
+ChannelId, End, DefaultTimeout)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>receive_response(SSH, ChannelId, End, Timeout) -&gt; {ok, Data} | {timeout, Data} | {error, Reason}</name>
+      <fsummary>Receives expected data from server on the specified session
+        channel.</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>ChannelId = integer()</v>
+        <v>End = Fun | close | timeout</v>
+        <v>Timeout = integer()</v>
+        <v>Data = list()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="receive_response-4"/>
+        <p>Receives expected data from server on the specified session
+          channel.</p>
+
+        <p>If <c>End == close</c>, data is returned to the caller when the
+          channel is closed by the server. If a time-out occurs before this
+          happens, the function returns <c>{timeout,Data}</c> (where
+          <c>Data</c> is the data received so far).</p>
+        <p>If <c>End == timeout</c>, a time-out is expected and
+          <c>{ok,Data}</c> is returned both in the case of a time-out and
+          when the channel is closed.</p>
+
+        <p>If <c>End</c> is a fun, this fun is called with one argument, the
+          data value in a received <c>ssh_cm</c> message (see
+          <seealso marker="ssh:ssh_connection"><c>ssh:ssh_connection(3)</c></seealso>.
+          The fun is to return either <c>true</c> to end the receiving
+          operation (and have the so far collected data returned) or
+          <c>false</c> to wait for more data from the server. Even if a fun
+          is supplied, the function returns immediately if the server closes
+          the channel).</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>rename(SSH, OldName, NewName) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="rename-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>rename(SSH, Server, OldName, NewName) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="rename-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send(SSH, ChannelId, Data) -&gt; ok | {error, Reason}</name>
+      <fsummary>Equivalent to send(SSH, ChannelId, 0, Data,
+        DefaultTimeout).</fsummary>
+      <desc><marker id="send-3"/>
+        <p>Equivalent to <seealso marker="#send-5"><c>ct_ssh:send(SSH,
+          ChannelId, 0, Data, DefaultTimeout)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send(SSH, ChannelId, Data, Timeout) -&gt; ok | {error, Reason}</name>
+      <fsummary>Equivalent to send(SSH, ChannelId, 0, Data, Timeout).</fsummary>
+      <desc><marker id="send-4"/>
+        <p>Equivalent to <seealso marker="#send-5"><c>ct_ssh:send(SSH,
+          ChannelId, 0, Data, Timeout)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send(SSH, ChannelId, Type, Data, Timeout) -&gt; ok | {error, Reason}</name>
+      <fsummary>Sends data to server on specified session channel.</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>ChannelId = integer()</v>
+        <v>Type = integer()</v>
+        <v>Data = list()</v>
+        <v>Timeout = integer()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="send-5"/>
+        <p>Sends data to server on specified session channel.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send_and_receive(SSH, ChannelId, Data) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Equivalent to send_and_receive(SSH, ChannelId, Data,
+        close).</fsummary>
+      <desc><marker id="send_and_receive-3"/>
+        <p>Equivalent to
+          <seealso marker="#send_and_receive-4"><c>ct_ssh:send_and_receive(SSH,
+            ChannelId, Data, close)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send_and_receive(SSH, ChannelId, Data, End) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Equivalent to send_and_receive(SSH, ChannelId, 0, Data, End,
+        DefaultTimeout).</fsummary>
+      <desc><marker id="send_and_receive-4"/>
+        <p>Equivalent to
+          <seealso marker="#send_and_receive-6"><c>ct_ssh;send_and_receive(SSH,
+ChannelId, 0, Data, End, DefaultTimeout)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send_and_receive(SSH, ChannelId, Data, End, Timeout) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Equivalent to send_and_receive(SSH, ChannelId, 0, Data, End,
+        Timeout).</fsummary>
+      <desc><marker id="send_and_receive-5"/>
+        <p>Equivalent to
+          <seealso marker="#send_and_receive-6"><c>ct_ssh:send_and_receive(SSH,
+ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send_and_receive(SSH, ChannelId, Type, Data, End, Timeout) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Sends data to server on specified session channel and waits
+        to receive the server response.</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>ChannelId = integer()</v>
+        <v>Type = integer()</v>
+        <v>Data = list()</v>
+        <v>End = Fun | close | timeout</v>
+        <v>Timeout = integer()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="send_and_receive-6"/>
+        <p>Sends data to server on specified session channel and waits to
+          receive the server response.</p>
+
+        <p>For details on argument <c>End</c>, see
+          <seealso marker="#receive_response-4"><c>ct_ssh:receive_response/4</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>session_close(SSH, ChannelId) -&gt; ok | {error, Reason}</name>
+      <fsummary>Closes an SSH session channel.</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>ChannelId = integer()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="session_close-2"/>
+        <p>Closes an SSH session channel.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>session_open(SSH) -&gt; {ok, ChannelId} | {error, Reason}</name>
+      <fsummary>Equivalent to session_open(SSH, DefaultTimeout).</fsummary>
+      <desc><marker id="session_open-1"/>
+        <p>Equivalent to
+          <seealso marker="#session_open-2"><c>ct_ssh:session_open(SSH,
+          DefaultTimeout)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>session_open(SSH, Timeout) -&gt; {ok, ChannelId} | {error, Reason}</name>
+      <fsummary>Opens a channel for an SSH session.</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Timeout = integer()</v>
+        <v>ChannelId = integer()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="session_open-2"/>
+        <p>Opens a channel for an SSH session.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>sftp_connect(SSH) -&gt; {ok, Server} | {error, Reason}</name>
+      <fsummary>Starts an SFTP session on an already existing SSH
+        connection.</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Server = pid()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="sftp_connect-1"/>
+        <p>Starts an SFTP session on an already existing SSH connection.
+          <c>Server</c> identifies the new session and must be specified
+          whenever SFTP requests are to be sent.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>subsystem(SSH, ChannelId, Subsystem) -&gt; Status | {error, Reason}</name>
+      <fsummary>Equivalent to subsystem(SSH, ChannelId, Subsystem,
+        DefaultTimeout).</fsummary>
+      <desc><marker id="subsystem-3"/>
+        <p>Equivalent to
+          <seealso marker="#subsystem-4"><c>ct_ssh:subsystem(SSH, ChannelId,
+            Subsystem, DefaultTimeout)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>subsystem(SSH, ChannelId, Subsystem, Timeout) -&gt; Status | {error, Reason}</name>
+      <fsummary>Sends a request to execute a predefined subsystem.</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>ChannelId = integer()</v>
+        <v>Subsystem = string()</v>
+        <v>Timeout = integer()</v>
+        <v>Status = success | failure</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="subsystem-4"/>
+        <p>Sends a request to execute a predefined subsystem.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>write(SSH, Handle, Data) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="write-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>write(SSH, Server, Handle, Data) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="write-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>write_file(SSH, File, Iolist) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="write_file-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>write_file(SSH, Server, File, Iolist) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="write_file-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>write_file_info(SSH, Name, Info) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="write_file_info-3"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>write_file_info(SSH, Server, Name, Info) -&gt; Result</name>
+      <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>Result = ssh_sftp_return() | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="write_file_info-4"/>
+        <p>For information and other types, see
+          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+      </desc>
+    </func>
+  </funcs>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/ct_telnet.xml b/lib/common_test/doc/src/ct_telnet.xml
new file mode 100644
index 0000000000..b7ba352104
--- /dev/null
+++ b/lib/common_test/doc/src/ct_telnet.xml
@@ -0,0 +1,601 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2010</year><year>2012</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+
+    </legalnotice>
+
+    <title>ct_telnet</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>ct_telnet.xml</file>
+  </header>
+  <module>ct_telnet</module>
+  <modulesummary>Common Test specific layer on top of Telnet client ct_telnet_client.erl</modulesummary>
+
+  <description>
+
+    <p><c>Common Test</c> specific layer on top of Telnet client
+      <c>ct_telnet_client.erl</c>.</p>
+
+    <p>Use this module to set up Telnet connections, send commands, and
+      perform string matching on the result. For information about how to use
+      <c>ct_telnet</c> and configure connections, specifically for UNIX hosts,
+      see the
+      <seealso marker="unix_telnet"><c>unix_telnet</c></seealso> manual page.
+    </p>
+
+    <p>Default values defined in <c>ct_telnet</c>:</p>
+    <marker id="Default_values"/>
+
+    <list type="bulleted">
+      <item><p>Connection timeout (time to wait for connection) = 10
+        seconds</p></item>
+      <item><p>Command timeout (time to wait for a command to return) =
+        10 seconds</p></item>
+      <item><p>Max number of reconnection attempts = 3</p></item>
+      <item><p>Reconnection interval (time to wait in between
+        reconnection attempts) = 5 seconds</p></item>
+      <item><p>Keep alive (sends NOP to the server every 8 sec if
+        connection is idle) = <c>true</c></p></item>
+      <item><p>Polling limit (max number of times to poll to get a
+        remaining string terminated) = 0</p></item>
+      <item><p>Polling interval (sleep time between polls) = 1 second</p>
+      </item>
+    </list>
+
+    <p>These parameters can be modified by the user with the following
+      configuration term:</p>
+
+    <pre>
+ {telnet_settings, [{connect_timeout,Millisec},
+                    {command_timeout,Millisec},
+                    {reconnection_attempts,N},
+                    {reconnection_interval,Millisec},
+                    {keep_alive,Bool},
+                    {poll_limit,N},
+                    {poll_interval,Millisec}]}.</pre>
+
+    <p><c>Millisec = integer(), N = integer()</c></p>
+
+    <p>Enter the <c>telnet_settings</c> term in a configuration file included
+      in the test and <c>ct_telnet</c> retrieves the information
+      automatically.</p>
+
+    <p><c>keep_alive</c> can be specified per connection, if necessary. For
+      details, see
+      <seealso marker="unix_telnet"><c>unix_telnet</c></seealso>.</p>
+
+  </description>
+
+  <section>
+    <title>Logging</title>
+    <marker id="Logging"/>
+
+    <p>The default logging behavior of <c>ct_telnet</c> is to print information
+      about performed operations, commands, and their corresponding results to
+      the test case HTML log. The following is not printed to the HTML
+      log: text strings sent from the Telnet server that are not explicitly
+      received by a <c>ct_telnet</c> function, such as <c>expect/3</c>.
+      However, <c>ct_telnet</c> can be configured to use a special purpose
+      event handler, implemented in <c>ct_conn_log_h</c>, for logging
+      <em>all</em> Telnet traffic. To use this handler, install a <c>Common
+      Test</c> hook named <c>cth_conn_log</c>. Example (using the test suite
+      information function):</p>
+
+    <pre>
+ suite() -&gt;
+     [{ct_hooks, [{cth_conn_log, [{conn_mod(),hook_options()}]}]}].</pre>
+
+    <p><c>conn_mod()</c> is the name of the <c>Common Test</c> module
+      implementing the connection protocol, that is, <c>ct_telnet</c>.</p>
+
+    <p>The <c>cth_conn_log</c> hook performs unformatted logging of Telnet
+      data to a separate text file. All Telnet communication is captured and
+      printed, including any data sent from the server. The link to
+      this text file is located at the top of the test case HTML log.</p>
+
+    <p>By default, data for all Telnet connections is logged in one common
+      file (named <c>default</c>), which can get messy, for example, if
+      multiple Telnet sessions are running in parallel. Therefore a separate
+      log file can be created for each connection. To configure this, use hook
+      option <c>hosts</c> and list the names of the servers/connections
+      to be used in the suite. The connections must be named for this to
+      work (see
+      <seealso marker="#open-1"><c>ct_telnet:open/1,2,3,4</c></seealso>).</p>
+
+    <p>Hook option <c>log_type</c> can be used to change the
+      <c>cth_conn_log</c> behavior. The default value of this option is
+      <c>raw</c>, which results in the behavior described above. If the value
+      is set to <c>html</c>, all Telnet communication is printed to the test
+      case HTML log instead.</p>
+
+    <p>All <c>cth_conn_log</c> hook options described can also be
+      specified in a configuration file with configuration variable
+      <c>ct_conn_log</c>.</p>
+
+    <p><em>Example:</em></p>
+ 
+    <pre>
+ {ct_conn_log, [{ct_telnet,[{log_type,raw},
+                            {hosts,[key_or_name()]}]}]}</pre>
+
+    <note>
+      <p>Hook options specified in a configuration file overwrite any
+        hard-coded hook options in the test suite.</p>
+    </note>
+
+    <marker id="Logging_example"/>
+    <p><em>Logging Example:</em></p>
+ 
+    <p>The following <c>ct_hooks</c> statement causes printing of Telnet
+      traffic to separate logs for the connections <c>server1</c> and
+      <c>server2</c>. Traffic for any other connections is logged in the
+      default Telnet log.</p>
+
+    <pre>
+ suite() -&gt;
+     [{ct_hooks,
+       [{cth_conn_log, [{ct_telnet,[{hosts,[server1,server2]}]}]}]}].</pre>
+ 
+    <p>As previously explained, this specification can also be provided by an
+      entry like the following in a configuration file:</p>
+
+    <pre>
+ {ct_conn_log, [{ct_telnet,[{hosts,[server1,server2]}]}]}.</pre>
+
+    <p>In this case the <c>ct_hooks</c> statement in the test suite can look
+      as follows:</p>
+
+    <pre>
+ suite() -&gt;
+     [{ct_hooks, [{cth_conn_log, []}]}].</pre>
+  </section>
+
+  <section>
+    <title>Data Types</title>
+    <marker id="types"/>
+    <taglist>
+      <tag><c>connection() = handle() | {target_name(), connection_type()} | target_name()</c></tag>
+      <item><marker id="type-connection"/>
+        <p>For <c>target_name()</c>, see module
+          <seealso marker="ct"><c>ct</c></seealso>.</p></item>
+
+      <tag><c>connection_type() = telnet | ts1 | ts2</c></tag>
+      <item><marker id="type-connection_type"/> </item>
+
+      <tag><c>handle() = handle()</c></tag>
+      <item><marker id="type-handle"/>
+        <p>Handle for a specific Telnet connection, see module
+          <seealso marker="ct"><c>ct</c></seealso>.</p></item>
+
+      <tag><c>prompt_regexp() = string()</c></tag>
+      <item><marker id="type-prompt_regexp"/>
+        <p>Regular expression matching all possible prompts for a specific
+          target type. <c>regexp</c> must not have any groups, that is, when
+          matching, <c>re:run/3</c> (in <c>STDLIB</c>) must return a list with
+          one single element.</p></item>
+    </taglist>
+  </section>
+
+  <funcs>
+    <func>
+      <name>close(Connection) -&gt; ok | {error, Reason}</name>
+      <fsummary>Closes the Telnet connection and stops the process managing
+        it.</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="close-1"/>
+        <p>Closes the Telnet connection and stops the process managing it.</p>
+
+        <p>A connection can be associated with a target name and/or a handle.
+          If <c>Connection</c> has no associated target name, it can only
+          be closed with the handle value (see
+          <seealso marker="#open-4"><c>ct_telnet:open/4</c></seealso>).</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>cmd(Connection, Cmd) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Equivalent to cmd(Connection, Cmd, []).</fsummary>
+      <desc><marker id="cmd-2"/>
+        <p>Equivalent to
+          <seealso marker="#cmd-3"><c>ct_telnet:cmd(Connection, Cmd,
+          [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>cmd(Connection, Cmd, Opts) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Sends a command through Telnet and waits for prompt.</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+        <v>Cmd = string()</v>
+        <v>Opts = [Opt]</v>
+        <v>Opt = {timeout, timeout()} | {newline, boolean()}</v>
+        <v>Data = [string()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="cmd-3"/>
+        <p>Sends a command through Telnet and waits for prompt.</p>
+
+        <p>By default, this function adds a new line to the end of the
+          specified command. If this is not desired, use option
+          <c>{newline,false}</c>. This is necessary, for example, when
+          sending Telnet command sequences prefixed with character
+          Interprete As Command (IAC).</p>
+
+        <p>Option <c>timeout</c> specifies how long the client must wait
+          for prompt. If the time expires, the function returns
+          <c>{error,timeout}</c>. For information about the default value
+          for the command timeout, see the
+          <seealso marker="#Default_values">list of default values</seealso>
+          in the beginning of this module.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>cmdf(Connection, CmdFormat, Args) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Equivalent to cmdf(Connection, CmdFormat, Args, []).</fsummary>
+      <desc><marker id="cmdf-3"/>
+        <p>Equivalent to
+          <seealso marker="#cmdf-4"><c>ct_telnet:cmdf(Connection, CmdFormat,
+          Args, [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>cmdf(Connection, CmdFormat, Args, Opts) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Sends a Telnet command and waits for prompt (uses a format
+        string and a list of arguments to build the command).</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+        <v>CmdFormat = string()</v>
+        <v>Args = list()</v>
+        <v>Opts = [Opt]</v>
+        <v>Opt = {timeout, timeout()} | {newline, boolean()}</v>
+        <v>Data = [string()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="cmdf-4"/>
+        <p>Sends a Telnet command and waits for prompt (uses a format string
+          and a list of arguments to build the command).</p>
+
+        <p>For details, see
+          <seealso marker="#cmd-3"><c>ct_telnet:cmd/3</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>expect(Connection, Patterns) -&gt; term()</name>
+      <fsummary>Equivalent to expect(Connections, Patterns, []).</fsummary>
+      <desc><marker id="expect-2"/>
+        <p>Equivalent to
+          <seealso marker="#expect-3"><c>ct_telnet:expect(Connections,
+          Patterns, [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>expect(Connection, Patterns, Opts) -&gt; {ok, Match} | {ok, MatchList, HaltReason} | {error, Reason}</name>
+      <fsummary>Gets data from Telnet and waits for the expected
+        pattern.</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+        <v>Patterns = Pattern | [Pattern]</v>
+        <v>Pattern = string() | {Tag, string()} | prompt | {prompt, Prompt}</v>
+        <v>Prompt = string()</v>
+        <v>Tag = term()</v>
+        <v>Opts = [Opt]</v>
+        <v>Opt = {idle_timeout, IdleTimeout} | {total_timeout, TotalTimeout} | repeat | {repeat, N} | sequence | {halt, HaltPatterns} | ignore_prompt | no_prompt_check | wait_for_prompt | {wait_for_prompt, Prompt}</v>
+        <v>IdleTimeout = infinity | integer()</v>
+        <v>TotalTimeout = infinity | integer()</v>
+        <v>N = integer()</v>
+        <v>HaltPatterns = Patterns</v>
+        <v>MatchList = [Match]</v>
+        <v>Match = RxMatch | {Tag, RxMatch} | {prompt, Prompt}</v>
+        <v>RxMatch = [string()]</v>
+        <v>HaltReason = done | Match</v>
+        <v>Reason = timeout | {prompt, Prompt}</v>
+      </type>
+      <desc><marker id="expect-3"/>
+        <p>Gets data from Telnet and waits for the expected pattern.</p>
+
+        <p><c>Pattern</c> can be a POSIX regular expression. The function
+          returns when a pattern is successfully matched (at least one, in
+          the case of multiple patterns).</p>
+
+        <p><c>RxMatch</c> is a list of matched strings. It looks as
+          follows <c>[FullMatch, SubMatch1, SubMatch2, ...]</c>, where
+          <c>FullMatch</c> is the string matched by the whole regular
+          expression, and <c>SubMatchN</c> is the string that matched
+          subexpression number <c>N</c>. Subexpressions are denoted with
+          <c>(' ')</c> in the regular expression.</p>
+
+        <p>If a <c>Tag</c> is speciifed, the returned <c>Match</c> also
+          includes the matched <c>Tag</c>. Otherwise, only <c>RxMatch</c>
+          is returned.</p>
+
+        <p><em>Options:</em></p>
+
+        <taglist>
+          <tag><c>idle_timeout</c></tag>
+          <item><p>Indicates that the function must return if the Telnet
+            client is idle (that is, if no data is received) for more than
+            <c>IdleTimeout</c> milliseconds. Default time-out is 10
+            seconds.</p></item>
+          <tag><c>total_timeout</c></tag>
+          <item><p>Sets a time limit for the complete <c>expect</c> operation.
+            After <c>TotalTimeout</c> milliseconds, <c>{error,timeout}</c>
+            is returned. Default is <c>infinity</c> (that is, no time
+            limit).</p></item>
+          <tag><c>ignore_prompt | no_prompt_check</c></tag>
+          <item><p>>The function returns when a prompt is received, even if
+            no pattern has yet been matched, and 
+            <c>{error,{prompt,Prompt}}</c> is returned. However, this
+            behavior can be modified with option <c>ignore_prompt</c> or
+            option <c>no_prompt_check</c>, which tells <c>expect</c> to
+            return only when a match is found or after a time-out.</p></item>
+          <tag><c>ignore_prompt</c></tag>
+          <item><p><c>ct_telnet</c> ignores any prompt found. This option is
+            useful if data sent by the server can include a pattern
+            matching prompt <c>regexp</c> (as returned by
+            <c>TargedMod:get_prompt_regexp/0</c>), but is not to not cause
+            the function to return.</p></item>
+          <tag><c>no_prompt_check</c></tag>
+          <item><p><c>ct_telnet</c> does not search for a prompt at all. This
+            is useful if, for example, <c>Pattern</c> itself matches the
+            prompt.</p></item>
+          <tag><c>wait_for_prompt</c></tag>
+          <item><p>Forces <c>ct_telnet</c> to wait until the prompt string
+            is received before returning (even if a pattern has already been
+            matched). This is equal to calling
+            <c>expect(Conn, Patterns++[{prompt,Prompt}], [sequence|Opts])</c>.
+            Notice that option <c>idle_timeout</c> and <c>total_timeout</c>
+            can abort the operation of waiting for prompt.</p></item>
+          <tag><c>repeat | repeat, N</c></tag>
+          <item><p>The pattern(s) must be matched multiple times. If <c>N</c>
+            is speciified, the pattern(s) are matched <c>N</c> times, and
+            the function returns <c>HaltReason = done</c>. This option can be
+            interrupted by one or more <c>HaltPatterns</c>. <c>MatchList</c>
+            is always returned, that is, a list of <c>Match</c> instead of
+            only one <c>Match</c>. Also <c>HaltReason</c> is returned.</p>
+          </item>
+          <tag><c>sequence</c></tag>
+          <item><p>All patterns must be matched in a sequence. A match is not
+            concluded until all patterns are matched. This option can be
+            interrupted by one or more <c>HaltPatterns</c>. <c>MatchList</c>
+            is always returned, that is, a list of <c>Match</c> instead of
+            only one <c>Match</c>. Also <c>HaltReason</c> is returned.</p> 
+          </item>
+        </taglist>
+
+        <p><em>Example 1:</em></p>
+
+        <pre>
+ expect(Connection,[{abc,"ABC"},{xyz,"XYZ"}],[sequence,{halt,[{nnn,"NNN"}]}])</pre>
+
+        <p>First this tries to match <c>"ABC"</c>, and then <c>"XYZ"</c>, but
+          if <c>"NNN"</c> appears,  the function returns
+          <c>{error,{nnn,["NNN"]}}</c>. If both <c>"ABC"</c> and <c>"XYZ"</c>
+          are matched, the function returns <c>{ok,[AbcMatch,XyzMatch]}</c>.</p>
+
+        <p><em>Example 2:</em></p>
+
+        <pre>
+ expect(Connection,[{abc,"ABC"},{xyz,"XYZ"}],[{repeat,2},{halt,[{nnn,"NNN"}]}])</pre>
+
+        <p>This tries to match <c>"ABC"</c> or <c>"XYZ"</c> twice. If
+          <c>"NNN"</c> appears, the function returns
+          <c>HaltReason = {nnn,["NNN"]}</c>.</p>
+
+        <p>Options <c>repeat</c> and <c>sequence</c> can be combined to
+          match a sequence multiple times.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_data(Connection) -&gt; {ok, Data} | {error, Reason}</name>
+      <fsummary>Gets all data received by the Telnet client since the last
+        command was sent.</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+        <v>Data = [string()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="get_data-1"/>
+        <p>Gets all data received by the Telnet client since the last
+          command was sent. Only newline-terminated strings are returned.
+          If the last received string has not yet been terminated, the
+          connection can be polled automatically until the string is
+          complete.</p>
+
+        <p>The polling feature is controlled by the configuration values
+          <c>poll_limit</c> and <c>poll_interval</c> and is by default
+          disabled. This means that the function immediately returns all
+          complete strings received and saves a remaining non-terminated
+          string for a later <c>get_data</c> call.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>open(Name) -&gt; {ok, Handle} | {error, Reason}</name>
+      <fsummary>Equivalent to open(Name, telnet).</fsummary>
+      <desc><marker id="open-1"/>
+        <p>Equivalent to
+          <seealso marker="#open-2"><c>ct_telnet:open(Name,
+          telnet)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>open(Name, ConnType) -&gt; {ok, Handle} | {error, Reason}</name>
+      <fsummary>Opens a Telnet connection to the specified target
+        host.</fsummary>
+      <type>
+        <v>Name = target_name()</v>
+        <v>ConnType = connection_type()</v>
+        <v>Handle = handle()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="open-2"/>
+        <p>Opens a Telnet connection to the specified target host.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>open(KeyOrName, ConnType, TargetMod) -&gt; {ok, Handle} | {error, Reason}</name>
+      <fsummary>Equivalent to open(KeyOrName, ConnType, TargetMod, []).</fsummary>
+      <desc><marker id="open-3"/>
+        <p>Equivalent to
+          <seealso marker="#open-4"><c>ct_telnet:ct_telnet:open(KeyOrName,
+          ConnType, TargetMod, [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>open(KeyOrName, ConnType, TargetMod, Extra) -&gt; {ok, Handle} | {error, Reason}</name>
+      <fsummary>Opens a Telnet connection to the specified target
+        host.</fsummary>
+      <type>
+        <v>KeyOrName = Key | Name</v>
+        <v>Key = atom()</v>
+        <v>Name = target_name()</v>
+        <v>ConnType = connection_type()</v>
+        <v>TargetMod = atom()</v>
+        <v>Extra = term()</v>
+        <v>Handle = handle()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="open-4"/>
+        <p>Opens a Telnet connection to the specified target host.</p>
+
+        <p>The target data must exist in a configuration file. The connection
+          can be associated with <c>Name</c> and/or the returned <c>Handle</c>.
+          To allocate a name for the target, use one of the following
+          alternatives:</p>
+
+        <list type="bulleted">
+          <item><p><seealso marker="ct#require-2"><c>ct:require/2</c></seealso>
+             in a test case</p></item>
+          <item><p>A <c>require</c> statement in the suite information
+            function (<c>suite/0</c>)</p></item>
+          <item><p>A <c>require</c> statement in a test case information
+            function</p></item>
+        </list>
+
+        <p>If you want the connection to be associated with <c>Handle</c> only
+          (if you, for example, need to open multiple connections to a host),
+          use <c>Key</c>, the configuration variable name, to specify the
+          target. Notice that a connection without an associated target name
+          can only be closed with the <c>Handle</c> value.</p>
+
+        <p><c>TargetMod</c> is a module that exports the functions
+          <c>connect(Ip, Port, KeepAlive, Extra)</c> and
+          <c>get_prompt_regexp()</c> for the specified <c>TargetType</c>
+          (for example, <c>unix_telnet</c>).</p>
+
+        <p>For <c>target_name()</c>, see module
+          <seealso marker="ct"><c>ct</c></seealso>.</p>
+
+        <p>See also
+          <seealso marker="ct#require-2"><c>ct:require/2</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send(Connection, Cmd) -&gt; ok | {error, Reason}</name>
+      <fsummary>Equivalent to send(Connection, Cmd, []).</fsummary>
+      <desc><marker id="send-2"/>
+        <p>Equivalent to
+          <seealso marker="#send-3"><c>ct_telnet:send(Connection, Cmd,
+          [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>send(Connection, Cmd, Opts) -&gt; ok | {error, Reason}</name>
+      <fsummary>Sends a Telnet command and returns immediately.</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+        <v>Cmd = string()</v>
+        <v>Opts = [Opt]</v>
+        <v>Opt = {newline, boolean()}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="send-3"/>
+        <p>Sends a Telnet command and returns immediately.</p>
+
+        <p>By default, this function adds a newline to the end of the
+          specified command. If this is not desired, option
+          <c>{newline,false}</c> can be used. This is necessary, for example,
+          when sending Telnet command sequences prefixed with character   
+          Interprete As Command (IAC).</p>
+
+        <p>The resulting output from the command can be read with
+          <seealso marker="#get_data-1"><c>ct_telnet:get_data/2</c></seealso> or
+          <seealso marker="#expect-2"><c>ct_telnet:expect/2,3</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>sendf(Connection, CmdFormat, Args) -&gt; ok | {error, Reason}</name>
+      <fsummary>Equivalent to sendf(Connection, CmdFormat, Args, []).</fsummary>
+      <desc><marker id="sendf-3"/>
+        <p>Equivalent to
+          <seealso marker="#sendf-4"><c>ct_telnet:sendf(Connection, CmdFormat,
+          Args, [])</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+    <name>sendf(Connection, CmdFormat, Args, Opts) -&gt; ok | {error, Reason}</name>
+    <fsummary>Sends a Telnet command and returns immediately (uses a format
+      string and a list of arguments to build the command).</fsummary>
+      <type>
+        <v>Connection = connection()</v>
+        <v>CmdFormat = string()</v>
+        <v>Args = list()</v>
+        <v>Opts = [Opt]</v>
+        <v>Opt = {newline, boolean()}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="sendf-4"/>
+        <p>Sends a Telnet command and returns immediately (uses a format
+          string and a list of arguments to build the command).</p>
+      </desc>
+    </func>
+  </funcs>
+
+  <section>
+    <title>See Also</title>
+      <p><seealso marker="unix_telnet"><c>unix_telnet</c></seealso></p>
+  </section>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/dependencies_chapter.xml b/lib/common_test/doc/src/dependencies_chapter.xml
index fb758d90df..29c54e819a 100644
--- a/lib/common_test/doc/src/dependencies_chapter.xml
+++ b/lib/common_test/doc/src/dependencies_chapter.xml
@@ -33,217 +33,220 @@
   <section>
     <title>General</title>
     <p>When creating test suites, it is strongly recommended to not
-      create dependencies between test cases, i.e. letting test cases
+      create dependencies between test cases, that is, letting test cases
       depend on the result of previous test cases. There are various
-      reasons for this, for example:</p>
+      reasons for this, such as, the following:</p>
 
-    <list>
+    <list type="bulleted">
       <item>It makes it impossible to run test cases individually.</item>
-      <item>It makes it impossible to run test cases in different order.</item>
-      <item>It makes debugging very difficult (since a fault could be
+      <item>It makes it impossible to run test cases in a different order.</item>
+      <item>It makes debugging difficult (as a fault can be
 	the result of a problem in a different test case than the one failing).</item>
-      <item>There exists no good and explicit ways to declare dependencies, so 
-	it may be very difficult to see and understand these in test suite 
+      <item>There are no good and explicit ways to declare dependencies, so 
+	it can be difficult to see and understand these in test suite 
 	code and in test logs.</item>
-      <item>Extending, restructuring and maintaining test suites with 
+      <item>Extending, restructuring, and maintaining test suites with 
 	test case dependencies is difficult.</item>      
     </list>
     
     <p>There are often sufficient means to work around the need for test 
       case dependencies. Generally, the problem is related to the state of 
-      the system under test (SUT). The action of one test case may alter the state 
-      of the system and for some other test case to run properly, the new state 
+      the System Under Test (SUT). The action of one test case can change the 
+      system state. For some other test case to run properly, this new state 
       must be known.</p>
 
     <p>Instead of passing data between test cases, it is recommended
       that the test cases read the state from the SUT and perform assertions
-      (i.e. let the test case run if the state is as expected, otherwise reset or fail)
-      and/or use the state to set variables necessary for the test case to execute
-      properly. Common actions can often be implemented as library functions for
-      test cases to call to set the SUT in a required state. (Such common actions
-      may of course also be separately tested if necessary, to ensure they are 
-      working as expected). It is sometimes also possible, but not always desirable, 
-      to group tests together in one test case, i.e. let a test case perform a 
-      "scenario" test (a test that consists of subtests).</p>
-
-    <p>Consider for example a server application under test. The following 
+      (that is, let the test case run if the state is as expected, otherwise reset or fail).
+      It is also recommended to use the state to set variables necessary for the 
+      test case to execute properly. Common actions can often be implemented as 
+      library functions for test cases to call to set the SUT in a required state. 
+      (Such common actions can also be separately tested, if necessary,
+      to ensure that they work as expected). It is sometimes also possible, 
+      but not always desirable, to group tests together in one test case, that is,
+      let a test case perform a "scenario" test (a test consisting of subtests).</p>
+
+    <p>Consider, for example, a server application under test. The following 
       functionality is to be tested:</p>
     
-    <list>
-      <item>Starting the server.</item>
-      <item>Configuring the server.</item>
-      <item>Connecting a client to the server.</item>
-      <item>Disconnecting a client from the server.</item>
-      <item>Stopping the server.</item>
+    <list type="bulleted">
+      <item>Starting the server</item>
+      <item>Configuring the server</item>
+      <item>Connecting a client to the server</item>
+      <item>Disconnecting a client from the server</item>
+      <item>Stopping the server</item>
     </list>
 
-    <p>There are obvious dependencies between the listed functions. We can't configure 
-      the server if it hasn't first been started, we can't connect a client until 
-      the server has been properly configured, etc. If we want to have one test 
-      case for each of the functions, we might be tempted to try to always run the
+    <p>There are obvious dependencies between the listed functions. The server cannot 
+      be configured if it has not first been started, a client connot be connectd until 
+      the server is properly configured, and so on. If we want to have one test 
+      case for each function, we might be tempted to try to always run the
       test cases in the stated order and carry possible data (identities, handles,
-      etc) between the cases and therefore introduce dependencies between them. 
-      To avoid this we could consider starting and stopping the server for every test.
-      We would implement the start and stop action as common functions that may be 
-      called from init_per_testcase and end_per_testcase. (We would of course test 
-      the start and stop functionality separately). The configuration could perhaps also
-      be implemented as a common function, maybe grouped with the start function.
-      Finally the testing of connecting and disconnecting a client may be grouped into
-      one test case. The resulting suite would look something like this:</p>
-
+      and so on) between the cases and therefore introduce dependencies between them.</p>
+
+      <p>To avoid this, we can consider starting and stopping the server for every test.
+      We can thus implement the start and stop action as common functions to be 
+      called from 
+      <seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase</c></seealso> and 
+      <seealso marker="common_test#Module:end_per_testcase-2"><c>end_per_testcase</c></seealso>. 
+      (Remember to test the start and stop functionality separately.) 
+      The configuration can also be implemented as a common function, maybe grouped 
+      with the start function. Finally, the testing of connecting and disconnecting a 
+      client can be grouped into one test case. The resulting suite can look as
+      follows:</p>
 
     <pre>      
-      -module(my_server_SUITE).
-      -compile(export_all).
-      -include_lib("ct.hrl").
+ -module(my_server_SUITE).
+ -compile(export_all).
+ -include_lib("ct.hrl").
+
+ %%% init and end functions...
 
-      %%% init and end functions...
+ suite() -> [{require,my_server_cfg}].
 
-      suite() -> [{require,my_server_cfg}].
+ init_per_testcase(start_and_stop, Config) ->
+     Config;
 
-      init_per_testcase(start_and_stop, Config) ->
-          Config;
+ init_per_testcase(config, Config) ->
+     [{server_pid,start_server()} | Config];
 
-      init_per_testcase(config, Config) ->
-          [{server_pid,start_server()} | Config];
+ init_per_testcase(_, Config) ->
+     ServerPid = start_server(),
+     configure_server(),
+     [{server_pid,ServerPid} | Config].
 
-      init_per_testcase(_, Config) ->
-          ServerPid = start_server(),
-          configure_server(),
-          [{server_pid,ServerPid} | Config].
+ end_per_testcase(start_and_stop, _) ->
+     ok;
 
-      end_per_testcase(start_and_stop, _) ->
-          ok;
+ end_per_testcase(_, _) ->
+     ServerPid = ?config(server_pid),
+     stop_server(ServerPid).
 
-      end_per_testcase(_, _) ->
-          ServerPid = ?config(server_pid),
-          stop_server(ServerPid).
+ %%% test cases...
 
-      %%% test cases...
+ all() -> [start_and_stop, config, connect_and_disconnect].
 
-      all() -> [start_and_stop, config, connect_and_disconnect].
+ %% test that starting and stopping works
+ start_and_stop(_) ->
+     ServerPid = start_server(),
+     stop_server(ServerPid).
 
-      %% test that starting and stopping works
-      start_and_stop(_) ->
-          ServerPid = start_server(),
-          stop_server(ServerPid).
+ %% configuration test
+ config(Config) ->
+     ServerPid = ?config(server_pid, Config),
+     configure_server(ServerPid).
 
-      %% configuration test
-      config(Config) ->
-          ServerPid = ?config(server_pid, Config),
-          configure_server(ServerPid).
+ %% test connecting and disconnecting client
+ connect_and_disconnect(Config) ->
+     ServerPid = ?config(server_pid, Config),
+     {ok,SessionId} = my_server:connect(ServerPid),
+     ok = my_server:disconnect(ServerPid, SessionId).
 
-      %% test connecting and disconnecting client
-      connect_and_disconnect(Config) ->
-          ServerPid = ?config(server_pid, Config),
-          {ok,SessionId} = my_server:connect(ServerPid),
-          ok = my_server:disconnect(ServerPid, SessionId).
+ %%% common functions...
 
-      %%% common functions...
+ start_server() ->
+     {ok,ServerPid} = my_server:start(),
+     ServerPid.
 
-      start_server() ->
-          {ok,ServerPid} = my_server:start(),
-          ServerPid.
+ stop_server(ServerPid) ->
+     ok = my_server:stop(),
+     ok.
 
-      stop_server(ServerPid) ->
-          ok = my_server:stop(),
-          ok.
+ configure_server(ServerPid) ->
+     ServerCfgData = ct:get_config(my_server_cfg),
+     ok = my_server:configure(ServerPid, ServerCfgData),
+     ok.</pre>
 
-      configure_server(ServerPid) ->
-          ServerCfgData = ct:get_config(my_server_cfg),
-          ok = my_server:configure(ServerPid, ServerCfgData),
-          ok.
-      </pre>
     </section>
 
     <section>
     <marker id="save_config"></marker>
-      <title>Saving configuration data</title>
+      <title>Saving Configuration Data</title>
 
-      <p>There might be situations where it is impossible, or infeasible at least, to
-	implement independent test cases. Maybe it is simply not possible to read the 
-	SUT state. Maybe resetting the SUT is impossible and it takes much too long
+      <p>Sometimes it is impossible, or infeasible, to
+	implement independent test cases. Maybe it is not possible to read the 
+	SUT state. Maybe resetting the SUT is impossible and it takes too long time
 	to restart the system. In situations where test case dependency is necessary,
 	CT offers a structured way to carry data from one test case to the next. The
-	same mechanism may also be used to carry data from one test suite to the next.</p>
+	same mechanism can also be used to carry data from one test suite to the next.</p>
 
       <p>The mechanism for passing data is called <c>save_config</c>. The idea is that
-	one test case (or suite) may save the current value of Config - or any list of
-	key-value tuples - so that it can be read by the next executing test case 
-	(or test suite). The configuration data is not saved permanently but can only 
-	be passed from one case (or suite) to the next.</p>
+	one test case (or suite) can save the current value of <c>Config</c>, or any list of
+	key-value tuples, so that the next executing test case (or test suite) can read it. 
+	The configuration data is not saved permanently but can only be passed from one 
+        case (or suite) to the next.</p>
 
-      <p>To save <c>Config</c> data, return the	tuple:</p>
+      <p>To save <c>Config</c> data, return tuple <c>{save_config,ConfigList}</c>
+         from <c>end_per_testcase</c> or from the main test case function.</p>
 
-      <p><c>{save_config,ConfigList}</c></p>
-      
-      <p>from <c>end_per_testcase</c> or from the main test case function. To read data 
-	saved by a previous test case, use the <c>config</c> macro with	a 
-	<c>saved_config</c> key:</p>
+      <p>To read data saved by a previous test case, use macro <c>config</c> with a 
+	<c>saved_config</c> key as follows:</p>
       
       <p><c>{Saver,ConfigList} = ?config(saved_config, Config)</c></p>
 
       <p><c>Saver</c> (<c>atom()</c>) is the name of the previous test case (where the
-	data was saved). The <c>config</c> macro may be used to extract particular data
+	data was saved). The <c>config</c> macro can be used to extract particular data
 	also from the recalled <c>ConfigList</c>. It is strongly recommended that 
 	<c>Saver</c> is always matched to the expected name of the saving test case. 
-	This way problems due to restructuring of the test suite may be avoided. Also it 
-	makes the dependency more explicit and the test suite easier to read and maintain.</p>
+	This way, problems because of restructuring of the test suite can be avoided. 
+	Also, it makes the dependency more explicit and the test suite easier to read 
+        and maintain.</p>
 
       <p>To pass data from one test suite to another, the same mechanism is used. The data
-	should be saved by the <c>end_per_suite</c> function and read by <c>init_per_suite</c>
+	is to be saved by finction
+	<seealso marker="common_test#Module:end_per_suite-1"><c>end_per_suite</c></seealso> 
+	and read by function
+	<seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite</c></seealso>
 	in the suite that follows. When passing data between suites, <c>Saver</c> carries the 
 	name of the test suite.</p>
 
-      <p>Example:</p>
+      <p><em>Example:</em></p>
       
       <pre>
-	-module(server_b_SUITE).
-	-compile(export_all).
-	-include_lib("ct.hrl").
-
-	%%% init and end functions...
-
-	init_per_suite(Config) ->
-	    %% read config saved by previous test suite
-	    {server_a_SUITE,OldConfig} = ?config(saved_config, Config),
-	    %% extract server identity (comes from server_a_SUITE)
-	    ServerId = ?config(server_id, OldConfig),
-	    SessionId = connect_to_server(ServerId),
-	    [{ids,{ServerId,SessionId}} | Config].
-
-	end_per_suite(Config) ->
-	    %% save config for server_c_SUITE (session_id and server_id)
-	    {save_config,Config}
-
-	%%% test cases...
-
-	all() -> [allocate, deallocate].
-
-	allocate(Config) ->
-	    {ServerId,SessionId} = ?config(ids, Config),
-	    {ok,Handle} = allocate_resource(ServerId, SessionId),
-	    %% save handle for deallocation test
-	    NewConfig = [{handle,Handle}],
-	    {save_config,NewConfig}.
-
-	deallocate(Config) ->
-	    {ServerId,SessionId} = ?config(ids, Config),
-	    {allocate,OldConfig} = ?config(saved_config, Config),
-	    Handle = ?config(handle, OldConfig),
-	    ok = deallocate_resource(ServerId, SessionId, Handle). 
-	</pre>
-
-      <p>It is also possible to save <c>Config</c> data from a test case that is to be
-        skipped. To accomplish this, return the following tuple:</p>
-
-      <p><c>{skip_and_save,Reason,ConfigList}</c></p>
-
-      <p>The result will be that the test case is skipped with <c>Reason</c> printed to
-      the log file (as described in previous chapters), and <c>ConfigList</c> is saved 
-      for the next test case. <c>ConfigList</c> may be read by means of 
-      <c>?config(saved_config, Config)</c>, as described above. <c>skip_and_save</c>
-      may also be returned from <c>init_per_suite</c>, in which case the saved data can
+ -module(server_b_SUITE).
+ -compile(export_all).
+ -include_lib("ct.hrl").
+
+ %%% init and end functions...
+
+ init_per_suite(Config) ->
+     %% read config saved by previous test suite
+     {server_a_SUITE,OldConfig} = ?config(saved_config, Config),
+     %% extract server identity (comes from server_a_SUITE)
+     ServerId = ?config(server_id, OldConfig),
+     SessionId = connect_to_server(ServerId),
+     [{ids,{ServerId,SessionId}} | Config].
+
+ end_per_suite(Config) ->
+     %% save config for server_c_SUITE (session_id and server_id)
+     {save_config,Config}
+
+ %%% test cases...
+
+ all() -> [allocate, deallocate].
+
+ allocate(Config) ->
+     {ServerId,SessionId} = ?config(ids, Config),
+     {ok,Handle} = allocate_resource(ServerId, SessionId),
+     %% save handle for deallocation test
+     NewConfig = [{handle,Handle}],
+     {save_config,NewConfig}.
+
+ deallocate(Config) ->
+     {ServerId,SessionId} = ?config(ids, Config),
+     {allocate,OldConfig} = ?config(saved_config, Config),
+     Handle = ?config(handle, OldConfig),
+     ok = deallocate_resource(ServerId, SessionId, Handle).</pre>
+
+      <p>To save <c>Config</c> data from a test case that is to be
+        skipped, return tuple 
+      <c>{skip_and_save,Reason,ConfigList}</c>.</p>
+
+      <p>The result is that the test case is skipped with <c>Reason</c> printed to
+      the log file (as described earlier) and <c>ConfigList</c> is saved 
+      for the next test case. <c>ConfigList</c> can be read using 
+      <c>?config(saved_config, Config)</c>, as described earlier. <c>skip_and_save</c>
+      can also be returned from <c>init_per_suite</c>. In this case, the saved data can
       be read by <c>init_per_suite</c> in the suite that follows.</p>
     </section>
 
@@ -251,60 +254,63 @@
     <marker id="sequences"></marker>
       <title>Sequences</title>
 
-      <p>It is possible that test cases depend on each other so that
-	if one case fails, the following test(s) should not be executed.
+      <p>Sometimes test cases depend on each other so that
+	if one case fails, the following tests are not to be executed.
         Typically, if the <c>save_config</c> facility is used and a test 
 	case that is expected to save data crashes, the following 
-	case can not run. CT offers a way to declare such dependencies, 
+	case cannot run. <c>Common Test</c> offers a way to declare such dependencies, 
 	called sequences.</p>
 
       <p>A sequence of test cases is defined as a test case group
-        with a <c>sequence</c> property. Test case groups are defined by 
-	means of the <c>groups/0</c> function in the test suite (see the 
-	<seealso marker="write_test_chapter#test_case_groups">Test case groups</seealso>
-	chapter for details).</p>
-
-      <p>For example, if we would like to make sure that if <c>allocate</c>
-	in <c>server_b_SUITE</c> (above) crashes, <c>deallocate</c> is skipped,
-	we may define a sequence like this:</p>
+        with a <c>sequence</c> property. Test case groups are defined
+	through function <c>groups/0</c> in the test suite (for details, see section
+	<seealso marker="write_test_chapter#test_case_groups">Test Case Groups</seealso>.</p>
+
+      <p>For example, to ensure that if <c>allocate</c>
+	in <c>server_b_SUITE</c> crashes, <c>deallocate</c> is skipped,
+	the following sequence can be defined:</p>
       
       <pre>
-	groups() -> [{alloc_and_dealloc, [sequence], [alloc,dealloc]}].</pre>
+ groups() -> [{alloc_and_dealloc, [sequence], [alloc,dealloc]}].</pre>
 
-      <p>Let's also assume the suite contains the test case <c>get_resource_status</c>, 
-	which is independent of the other two cases, then the <c>all</c> function could 
-	look like this:</p>
+      <p>Assume that the suite contains the test case <c>get_resource_status</c> 
+	that is independent of the other two cases, then function <c>all</c> can 
+	look as follows:</p>
 
       <pre>
-	all() -> [{group,alloc_and_dealloc}, get_resource_status].</pre>
+ all() -> [{group,alloc_and_dealloc}, get_resource_status].</pre>
 
       <p>If <c>alloc</c> succeeds, <c>dealloc</c> is also executed. If <c>alloc</c> fails
-	however, <c>dealloc</c> is not executed but marked as SKIPPED in the html log. 
-	<c>get_resource_status</c> will run no matter what happens to the <c>alloc_and_dealloc</c>
+	however, <c>dealloc</c> is not executed but marked as <c>SKIPPED</c> in the HTML log. 
+	<c>get_resource_status</c> runs no matter what happens to the <c>alloc_and_dealloc</c>
 	cases.</p>
 
-      <p>Test cases in a sequence will be executed in order until they have all succeeded or 
-	until one case fails. If one fails, all following cases in the sequence are skipped.
-	The cases in the sequence that have succeeded up to that point are reported as successful
-	in the log. An arbitrary number of sequences may be specified. Example:</p>
+      <p>Test cases in a sequence are executed in order until all succeed or 
+	one fails. If one fails, all following cases in the sequence are skipped.
+	The cases in the sequence that have succeeded up to that point are reported as 
+	successful in the log. Any number of sequences can be specified.</p>
+	<p><em>Example:</em></p>
 
       <pre>
-	groups() -> [{scenarioA, [sequence], [testA1, testA2]}, 
-	             {scenarioB, [sequence], [testB1, testB2, testB3]}].
-
-	all() -> [test1, 
-	          test2, 
-	          {group,scenarioA}, 
-	          test3, 
-	          {group,scenarioB}, 
-	          test4].</pre>
-
-      <p>It is possible to have sub-groups in a sequence group. Such sub-groups can have 
-        any property, i.e. they are not required to also be sequences. If you want the status
-	of the sub-group to affect the sequence on the level above, return 
-	<c>{return_group_result,Status}</c> from <c>end_per_group/2</c>, as described in the
-	<seealso marker="write_test_chapter#repeated_groups">Repeated groups</seealso>
-	chapter. A failed sub-group (<c>Status == failed</c>) will cause the execution of a 
+ groups() -> [{scenarioA, [sequence], [testA1, testA2]}, 
+              {scenarioB, [sequence], [testB1, testB2, testB3]}].
+
+ all() -> [test1, 
+           test2, 
+           {group,scenarioA}, 
+	   test3, 
+           {group,scenarioB}, 
+           test4].</pre>
+
+      <p>A sequence group can have subgroups. Such subgroups can have 
+        any property, that is, they are not required to also be sequences. If you want the 
+	status of the subgroup to affect the sequence on the level above, return 
+	<c>{return_group_result,Status}</c> from 
+	<seealso marker="common_test#Module:end_per_group-2"><c>end_per_group/2</c></seealso>, 
+	as described in section
+	<seealso marker="write_test_chapter#repeated_groups">Repeated Groups</seealso>
+	in Writing Test Suites.
+	A failed subgroup (<c>Status == failed</c>) causes the execution of a 
 	sequence to fail in the	same way a test case does.</p>
     </section>
 </chapter>
diff --git a/lib/common_test/doc/src/event_handler_chapter.xml b/lib/common_test/doc/src/event_handler_chapter.xml
index 78e5bb5e70..31128a7114 100644
--- a/lib/common_test/doc/src/event_handler_chapter.xml
+++ b/lib/common_test/doc/src/event_handler_chapter.xml
@@ -33,144 +33,171 @@
   <section>
     <marker id="event_handling"></marker>
     <title>General</title>
-    <p>It is possible for the operator of a Common Test system to receive
-    event notifications continously during a test run. It is reported e.g. 
-    when a test case starts and stops, what the current count of successful, 
-    failed and skipped cases is, etc. This information can be used for 
-    different purposes such as logging progress and results on 
-    other format than HTML, saving statistics to a database for report
-    generation and test system supervision.</p>
-
-    <p>Common Test has a framework for event handling which is based on
-    the OTP event manager concept and gen_event behaviour. When the Common Test
-    server starts, it spawns an event manager. During test execution the
-    manager gets a notification from the server every time something
-    of potential interest happens. Any event handler plugged into the
-    event manager can match on events of interest, take action, or maybe
-    simply pass the information on. Event handlers are Erlang modules
-    implemented by the Common Test user according to the gen_event 
-    behaviour (see the OTP User's Guide and Reference Manual for more 
-    information).</p>
-
-    <p>As already described, a Common Test server always starts an event manager. 
-    The server also plugs in a default event handler which has as its only
-    purpose to relay notifications to a globally registered CT Master 
-    event manager (if a CT Master server is running in the system). 
-    The CT Master also spawns an event manager at startup.
-    Event handlers plugged into this manager will receive the events from 
-    all the test nodes as well as information from the CT Master server
-    itself.</p>
-
-    <p>User specific event handlers may be plugged into a Common Test event
-    manager, either by telling Common Test to install them before the test
-    run (see below), or by adding the handlers dynamically during the test
-    run by means of 
-    <c>gen_event:add_handler/3</c> or <c>gen_event:add_sup_handler/3</c>.
-    In the latter scenario, the reference of the Common Test event manager is
-    required. To get it, call <c>ct:get_event_mgr_ref/0</c> or (on the CT
-    Master node) <c>ct_master:get_event_mgr_ref/0</c>.</p>
+    <p>The operator of a <c>Common Test</c> system can receive
+    event notifications continuously during a test run. For example, 
+    <c>Common Test</c> reports when a test case starts and stops, 
+    the current count of successful, failed, and skipped cases, and so on. 
+    This information can be used for different purposes such as logging progress 
+    and results in another format than HTML, saving statistics to a database 
+    for report generation, and test system supervision.</p>
+
+    <p><c>Common Test</c> has a framework for event handling based on
+    the OTP event manager concept and <c>gen_event</c> behavior. 
+    When the <c>Common Test</c> server starts, it spawns an event manager. 
+    During test execution the manager gets a notification from the server 
+    when something of potential interest happens. Any event handler plugged into 
+    the event manager can match on events of interest, take action, or
+    pass the information on. The event handlers are Erlang modules
+    implemented by the <c>Common Test</c> user according to the <c>gen_event</c> 
+    behavior (for details, see module
+    <seealso marker="stdlib:gen_event"><c>stdlib:gen_event</c></seealso> and
+    section
+    <seealso marker="doc/design_principles:events"><c>gen_event Behaviour</c></seealso>
+    in OTP Design Principles in the System Documentation).
+    </p>
+
+    <p>A <c>Common Test</c> server always starts an event manager. 
+    The server also plugs in a default event handler, which only
+    purpose is to relay notifications to a globally registered <c>Common Test</c> 
+    Master event manager (if a <c>Common Test</c> Master server is running in the system). 
+    The <c>Common Test</c> Master also spawns an event manager at startup.
+    Event handlers plugged into this manager receives the events from 
+    all the test nodes, plus information from the <c>Common Test</c> Master server.
+    </p>
+
+    <p>User-specific event handlers can be plugged into a <c>Common Test</c> event
+    manager, either by telling <c>Common Test</c> to install them before the test
+    run (described later), or by adding the handlers dynamically during the test
+    run using
+    <seealso marker="stdlib:gen_event#add_handler-3"><c>stdlib:gen_event:add_handler/3</c></seealso> or 
+    <seealso marker="stdlib:gen_event#add_sup_handler-3"><c>stdlib:gen_event:add_sup_handler/3</c></seealso>.
+    In the latter scenario, the reference of the <c>Common Test</c> event manager is
+    required. To get it, call 
+    <seealso marker="ct#get_event_mgr_ref-0"><c>ct:get_event_mgr_ref/0</c></seealso> 
+    or (on the <c>Common Test</c> Master node) 
+    <seealso marker="ct_master#get_event_mgr_ref-0"><c>ct_master:get_event_mgr_ref/0</c></seealso>.</p>
   </section>
   <section>
     <marker id="usage"></marker>
-    <title>Usage</title>
-    <p>Event handlers may be installed by means of an <c>event_handler</c>
-    start flag (<c>ct_run</c>) or option (<seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>), where the
-    argument specifies the names of one or more event handler modules.
-    Example:</p>
+    <title>Use</title>
+    <p>Event handlers can be installed by an <c>event_handler</c> start flag 
+    (<seealso marker="ct_run"><c>ct_run</c></seealso>) or option 
+    <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, where the
+    argument specifies the names of one or more event handler modules.</p>
+
+    <p><em>Example:</em></p>
     <p><c>$ ct_run -suite test/my_SUITE -event_handler handlers/my_evh1 
     handlers/my_evh2 -pa $PWD/handlers</c></p>
-    <p>Use the <c><![CDATA[ct_run -event_handler_init]]></c> option instead of
-      <c><![CDATA[-event_handler]]></c> to pass start arguments to the event handler
-      init function.</p>
-    <p>All event handler modules must have gen_event behaviour. Note also that 
-    these modules must be precompiled, and that their locations must be
-    added explicitly to the Erlang code server search path (like in the
-    example).</p>
 
-    <p>An event_handler tuple in the argument <c>Opts</c> has the following
-      definition (see also <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> in the reference manual):</p>
+    <p>To pass start arguments to the event handler init function, use option 
+    <c><![CDATA[ct_run -event_handler_init]]></c>  instead of
+    <c><![CDATA[-event_handler]]></c>.</p>
+
+    <note><p>All event handler modules must have <c>gen_event</c> behavior.
+    These modules must be precompiled and their locations must be
+    added explicitly to the Erlang code server search path (as in the previous
+    example).</p></note>
+
+    <p>An event_handler tuple in argument <c>Opts</c> has the following definition 
+    (see <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>):</p>
 
     <pre>
-    {event_handler,EventHandlers}
+ {event_handler,EventHandlers}
 
-    EventHandlers = EH | [EH]
-    EH = atom() | {atom(),InitArgs} | {[atom()],InitArgs}
-    InitArgs = [term()]</pre>
+ EventHandlers = EH | [EH]
+ EH = atom() | {atom(),InitArgs} | {[atom()],InitArgs}
+ InitArgs = [term()]</pre>
 
-    <p>Example:</p>
+    <p>In the following example, two event handlers for the <c>my_SUITE</c> test are installed:</p>
     <pre>
-    1> ct:run_test([{suite,"test/my_SUITE"},{event_handler,[my_evh1,{my_evh2,[node()]}]}]).</pre>
-    <p>This will install two event handlers for the <c>my_SUITE</c> test. Event handler
-    <c>my_evh1</c> is started with <c>[]</c> as argument to the init function. Event handler
-    <c>my_evh2</c> is started with the name of the current node in the init argument list.</p>
+ 1> ct:run_test([{suite,"test/my_SUITE"},{event_handler,[my_evh1,{my_evh2,[node()]}]}]).</pre>
+    <p>Event handler <c>my_evh1</c> is started with <c>[]</c> as argument to the init function. 
+    Event handler <c>my_evh2</c> is started with the name of the current node in the init argument list.</p>
 
-    <p>Event handlers can also be plugged in by means of
+    <p>Event handlers can also be plugged in using one of the following
     <seealso marker="run_test_chapter#test_specifications">test specification</seealso> 
     terms:</p>
-
-    <p><c>{event_handler, EventHandlers}</c>, or</p>
-    <p><c>{event_handler, EventHandlers, InitArgs}</c>, or</p>
-    <p><c>{event_handler, NodeRefs, EventHandlers}</c>, or</p>
-    <p><c>{event_handler, NodeRefs, EventHandlers, InitArgs}</c></p>
+    <list type="bulleted">
+    <item><c>{event_handler, EventHandlers}</c></item>
+    <item><c>{event_handler, EventHandlers, InitArgs}</c></item>
+    <item><c>{event_handler, NodeRefs, EventHandlers}</c></item>
+    <item><c>{event_handler, NodeRefs, EventHandlers, InitArgs}</c></item>
+    </list>
   
     <p><c>EventHandlers</c> is a list of module names. Before a test 
     session starts, the init function of each plugged in event handler 
-    is called (with the InitArgs list as argument or [] if
-    no start arguments are given).</p>
+    is called (with the <c>InitArgs</c> list as argument or <c>[]</c> if
+    no start arguments are specified).</p>
 
-    <p>To plug a handler into the CT Master event manager, specify 
+    <p>To plug in a handler to the <c>Common Test</c> Master event manager, specify 
     <c>master</c> as the node in <c>NodeRefs</c>.</p>
 
-    <p>For an event handler to be able to match on events, the module must
+    <p>To be able to match on events, the event handler module must
     include the header file <c>ct_event.hrl</c>. An event is a record with the
     following definition:</p>
 
     <p><c>#event{name, node, data}</c></p>
 
-    <p><c>name</c> is the label (type) of the event. <c>node</c> is the name of the
-    node the event has originated from (only relevant for CT Master event handlers).
-    <c>data</c> is specific for the particular event.</p>
+    <taglist>
+      <tag><c>name</c></tag>
+         <item><p>Label (type) of the event.</p></item>
+      <tag><c>node</c></tag>
+         <item><p>Name of the node that the event originated from 
+	 (only relevant for <c>Common Test</c> Master event handlers).</p></item>
+       <tag><c>data</c></tag>
+         <item><p>Specific for the event.</p></item>
+    </taglist>
+
 
     <marker id="events"></marker>
-    <p><em>General events:</em></p>
+    <section>
+      <title>General Events</title>
 
-    <list>
-      <item><c>#event{name = start_logging, data = LogDir}</c>
-        <p><c>LogDir = string()</c>, top level log directory for the test run.</p>
-        <p>Indicates that the logging process of Common Test
-	has started successfully and is ready to receive IO
+      <p>The general events are as follows:</p>
+
+    <taglist>
+      <tag><c>#event{name = start_logging, data = LogDir}</c></tag>
+      <item>
+        <p><c>LogDir = string()</c>, top-level log directory for the test run.</p>
+        <p>This event indicates that the logging process of <c>Common Test</c>
+	has started successfully and is ready to receive I/O
 	messages.</p></item>
 
-      <item><c>#event{name = stop_logging, data = []}</c>
-        <p>Indicates that the logging process of Common Test
-	has been shut down at the end of the test run.
+      <tag><c>#event{name = stop_logging, data = []}</c></tag>
+      <item>
+        <p>This event indicates that the logging process of <c>Common Test</c>
+	was shut down at the end of the test run.
 	</p></item>
 
-      <item><c>#event{name = test_start, data = {StartTime,LogDir}}</c>
+      <tag><c>#event{name = test_start, data = {StartTime,LogDir}}</c></tag>
+      <item>
         <p><c>StartTime = {date(),time()}</c>, test run start date and time.</p>
-        <p><c>LogDir = string()</c>, top level log directory for the test run.</p>
-        <p>This event indicates that Common Test has finished initial preparations
-	and will begin executing test cases.
+        <p><c>LogDir = string()</c>, top-level log directory for the test run.</p>
+        <p>This event indicates that <c>Common Test</c> has finished initial preparations
+	and begins executing test cases.
 	</p></item>
 
-      <item><c>#event{name = test_done, data = EndTime}</c>
+      <tag><c>#event{name = test_done, data = EndTime}</c></tag>
+      <item>
         <p><c>EndTime = {date(),time()}</c>, date and time the test run finished.</p>
-        <p>This indicates that the last test case has been executed and 
-	Common Test is shutting down.	
+        <p>This event indicates that the last test case has been executed and 
+	<c>Common Test</c> is shutting down.	
 	</p></item>
 
-      <item><c>#event{name = start_info, data = {Tests,Suites,Cases}}</c>
-        <p><c>Tests = integer()</c>, the number of tests.</p>
-        <p><c>Suites = integer()</c>, the total number of suites.</p>
-        <p><c>Cases = integer() | unknown</c>, the total number of test cases.</p>
-        <p>Initial test run information that can be interpreted as: "This test
-	run will execute <c>Tests</c> separate tests, in total containing
+      <tag><c>#event{name = start_info, data = {Tests,Suites,Cases}}</c></tag>
+      <item>
+        <p><c>Tests = integer()</c>, number of tests.</p>
+        <p><c>Suites = integer()</c>, total number of suites.</p>
+        <p><c>Cases = integer() | unknown</c>, total number of test cases.</p>
+        <p>This event gives initial test run information that can be interpreted as: 
+	"This test run will execute <c>Tests</c> separate tests, in total containing
 	<c>Cases</c> number of test cases, in <c>Suites</c> number of suites".
-	Note that if a test case group with a repeat property exists in any test, 
-	the total number of test cases can not be calculated (unknown).
+	However, if a test case group with a repeat property exists in any test, 
+	the total number of test cases cannot be calculated (unknown).
 	</p></item>
 
-      <item><c>#event{name = tc_start, data = {Suite,FuncOrGroup}}</c>
+      <tag><c>#event{name = tc_start, data = {Suite,FuncOrGroup}}</c></tag>
+      <item>
         <p><c>Suite = atom()</c>, name of the test suite.</p>
         <p><c>FuncOrGroup = Func | {Conf,GroupName,GroupProperties}</c></p>
         <p><c>Func = atom()</c>, name of test case or configuration function.</p>
@@ -180,23 +207,24 @@
         <p>This event informs about the start of a test case, or a group configuration
 	function. The event is sent also for <c>init_per_suite</c> and <c>end_per_suite</c>,
 	but not for <c>init_per_testcase</c> and <c>end_per_testcase</c>. If a group
-	configuration function is starting, the group name and execution properties
-	are also given.
+	configuration function starts, the group name and execution properties
+	are also specified.
 	</p></item>
 
-      <item><c>#event{name = tc_logfile, data = {{Suite,Func},LogFileName}}</c>
+      <tag><c>#event{name = tc_logfile, data = {{Suite,Func},LogFileName}}</c></tag>
+      <item>
         <p><c>Suite = atom()</c>, name of the test suite.</p>
         <p><c>Func = atom()</c>, name of test case or configuration function.</p>
-        <p><c>LogFileName = string()</c>, full name of test case log file.</p>
+        <p><c>LogFileName = string()</c>, full name of the test case log file.</p>
         <p>This event is sent at the start of each test case (and configuration function
 	  except <c>init/end_per_testcase</c>) and carries information about the
-	  full name (i.e. the file name including the absolute directory path) of
+	  full name (that is, the file name including the absolute directory path) of
 	  the current test case log file.
 	</p></item>
 
+      <tag><c>#event{name = tc_done, data = {Suite,FuncOrGroup,Result}}</c></tag>
       <item>
-        <marker id="tc_done"/>
-        <c>#event{name = tc_done, data = {Suite,FuncOrGroup,Result}}</c>
+	<marker id="tc_done"/>
         <p><c>Suite = atom()</c>, name of the suite.</p>
         <p><c>FuncOrGroup = Func | {Conf,GroupName,GroupProperties}</c></p>
         <p><c>Func = atom()</c>, name of test case or configuration function.</p>
@@ -211,34 +239,37 @@
 	                   {require_failed_in_suite0,RequireInfo} | 
 	                   {failed,{Suite,init_per_testcase,FailInfo}} | 
                            UserTerm</c>, 
-	      the reason why the case has been skipped.</p>
+	      why the case was skipped.</p>
 	<marker id="failreason"/>
         <p><c>FailReason = {error,FailInfo} | 
 	                   {error,{RunTimeError,StackTrace}} | 
                            {timetrap_timeout,integer()} | 
 			   {failed,{Suite,end_per_testcase,FailInfo}}</c>, reason for failure.</p>	
-        <p><c>RequireInfo = {not_available,atom() | tuple()}</c>, why require has failed.</p>
+        <p><c>RequireInfo = {not_available,atom() | tuple()}</c>, why require failed.</p>
         <p><c>FailInfo = {timetrap_timeout,integer()} | 
 	                 {RunTimeError,StackTrace} | 
 			 UserTerm</c>, 
-	      detailed information about an error.</p>
-        <p><c>RunTimeError = term()</c>, a run-time error, e.g. badmatch, undef, etc.</p>
-        <p><c>StackTrace = list()</c>, list of function calls preceeding a run-time error.</p>
-        <p><c>UserTerm = term()</c>, arbitrary data specified by user, or <c>exit/1</c> info.</p>
-        <p>This event informs about the end of a test case or a configuration function (see the 
-	<c>tc_start</c> event for details on the FuncOrGroup element). With this event comes the 
-	final result of the function in question. It is possible to determine on the top level
-	of <c>Result</c> if the function was successful, skipped (by the user), or if it failed.
-	It is of course possible to dig deeper and also perform pattern matching on the various
-	reasons for skipped or failed. Note that <c>{'EXIT',Reason}</c> tuples have been translated into
-	<c>{error,Reason}</c>. Note also that if a <c>{failed,{Suite,end_per_testcase,FailInfo}</c>
-	result is received, it actually means the test case was successful, but that 
+	      error details.</p>
+        <p><c>RunTimeError = term()</c>, a runtime error, for example, 
+	<c>badmatch</c> or <c>undef</c>.</p>
+        <p><c>StackTrace = list()</c>, list of function calls preceding a runtime error.</p>
+        <p><c>UserTerm = term()</c>, any data specified by user, or <c>exit/1</c> information.</p>
+        <p>This event informs about the end of a test case or a configuration function (see event 
+	<c>tc_start</c> for details on element <c>FuncOrGroup</c>). With this event 
+	comes the final result of the function in question. It is possible to determine on the 
+	top level of <c>Result</c> if the function was successful, skipped (by the user), 
+	or if it failed.</p>
+	<p>It is also possible to dig deeper and, for example, perform pattern matching 
+	on the various reasons for skipped or failed. Notice that <c>{'EXIT',Reason}</c> tuples 
+	are translated into <c>{error,Reason}</c>. 
+	Notice also that if a <c>{failed,{Suite,end_per_testcase,FailInfo}</c>
+	result is received, the test case was successful, but 
 	<c>end_per_testcase</c> for the case failed.
 	</p></item>
 
+      <tag><c>#event{name = tc_auto_skip, data = {Suite,TestName,Reason}}</c></tag>
       <item>
 	<marker id="tc_auto_skip"></marker>
-        <c>#event{name = tc_auto_skip, data = {Suite,TestName,Reason}}</c>
         <p><c>Suite = atom()</c>, the name of the suite.</p>
         <p><c>TestName = init_per_suite | end_per_suite |
 	                 {init_per_group,GroupName} | {end_per_group,GroupName} |
@@ -247,101 +278,116 @@
         <p><c>GroupName = atom()</c>, the name of the test case group.</p>
         <p><c>Reason = {failed,FailReason} |
 	               {require_failed_in_suite0,RequireInfo}</c>, 
-	      reason for auto skipping <c>Func</c>.</p>
+	      reason for auto-skipping <c>Func</c>.</p>
         <p><c>FailReason = {Suite,ConfigFunc,FailInfo}} | 
 	                   {Suite,FailedCaseInSequence}</c>, reason for failure.</p>	
-        <p><c>RequireInfo = {not_available,atom() | tuple()}</c>, why require has failed.</p>
+        <p><c>RequireInfo = {not_available,atom() | tuple()}</c>, why require failed.</p>
         <p><c>ConfigFunc = init_per_suite | init_per_group</c></p>
         <p><c>FailInfo = {timetrap_timeout,integer()} | 
 	                 {RunTimeError,StackTrace} |
 			 bad_return | UserTerm</c>, 
-	      detailed information about an error.</p>
-	<p><c>FailedCaseInSequence = atom()</c>, name of a case that has failed in a sequence.</p>
-        <p><c>RunTimeError = term()</c>, a run-time error, e.g. badmatch, undef, etc.</p>
-        <p><c>StackTrace = list()</c>, list of function calls preceeding a run-time error.</p>
-        <p><c>UserTerm = term()</c>, arbitrary data specified by user, or <c>exit/1</c> info.</p>
-        <p>This event gets sent for every test case or configuration function that Common Test
+	      error details.</p>
+	<p><c>FailedCaseInSequence = atom()</c>, the name of a case that failed in a sequence.</p>
+        <p><c>RunTimeError = term()</c>, a runtime error, for example <c>badmatch</c> or
+	<c>undef</c>.</p>
+        <p><c>StackTrace = list()</c>, list of function calls preceeding a runtime error.</p>
+        <p><c>UserTerm = term()</c>, any data specified by user, or <c>exit/1</c> information.</p>
+        <p>This event is sent for every test case or configuration function that <c>Common Test</c>
 	has skipped automatically because of either a failed <c>init_per_suite</c> or 
 	<c>init_per_group</c>, a failed <c>require</c> in <c>suite/0</c>, or a failed test case
-	in a sequence. Note that this event is never received as a result of a test case getting
-	skipped because of <c>init_per_testcase</c> failing, since that information is carried with
-	the <c>tc_done</c> event. If a failed test case belongs	to a test case group, the second
-	data element is a tuple <c>{FuncName,GroupName}</c>, otherwise simply the function name.
+	in a sequence. Notice that this event is never received as a result of a test case getting
+	skipped because of <c>init_per_testcase</c> failing, as that information is carried with
+	event <c>tc_done</c>. If a failed test case belongs to a test case group, the second
+	data element is a tuple <c>{FuncName,GroupName}</c>, otherwise only the function name.
 	</p></item>
 
+      <tag><c>#event{name = tc_user_skip, data = {Suite,TestName,Comment}}</c></tag>
       <item>
-	<marker id="tc_user_skip"></marker>
-        <c>#event{name = tc_user_skip, data = {Suite,TestName,Comment}}</c>
+	<marker id="tc_user_skip"></marker>  
         <p><c>Suite = atom()</c>, the name of the suite.</p>
         <p><c>TestName = init_per_suite | end_per_suite |
 	                 {init_per_group,GroupName} | {end_per_group,GroupName} |
 	                 {FuncName,GroupName} | FuncName</c></p>
 	<p><c>FuncName = atom()</c>, the name of the test case or configuration function.</p>
         <p><c>GroupName = atom()</c>, the name of the test case group.</p>
-        <p><c>Comment = string()</c>, reason for skipping the test case.</p>
-        <p>This event specifies that a test case has been skipped by the user. 
-	It is only ever received if the skip was declared in a test specification. 
+        <p><c>Comment = string()</c>, why the test case was skipped.</p>
+        <p>This event specifies that a test case was skipped by the user. 
+	It is only received if the skip is declared in a test specification. 
 	Otherwise, user skip information is received as a <c>{skipped,SkipReason}</c> 
-	result in the <c>tc_done</c> event for the test case. If a skipped test case belongs
+	result in event <c>tc_done</c> for the test case. If a skipped test case belongs
 	to a test case group, the second data element is a tuple <c>{FuncName,GroupName}</c>,
-	otherwise simply the function name.
+	otherwise only the function name.
 	</p></item>
 
-      <item><c>#event{name = test_stats, data = {Ok,Failed,Skipped}}</c>
-        <p><c>Ok = integer()</c>, the current number of successful test cases.</p>
-        <p><c>Failed = integer()</c>, the current number of failed test cases.</p>
+      <tag><c>#event{name = test_stats, data = {Ok,Failed,Skipped}}</c></tag>
+      <item>
+        <p><c>Ok = integer()</c>, current number of successful test cases.</p>
+        <p><c>Failed = integer()</c>, current number of failed test cases.</p>
         <p><c>Skipped = {UserSkipped,AutoSkipped}</c></p>
-        <p><c>UserSkipped = integer()</c>, the current number of user skipped test cases.</p>
-        <p><c>AutoSkipped = integer()</c>, the current number of auto skipped test cases.</p>
-        <p>This is a statistics event with the current count of successful, skipped 
-	and failed test cases so far. This event gets sent after the end of each test case,
-	immediately following the <c>tc_done</c> event.
+        <p><c>UserSkipped = integer()</c>, current number of user-skipped test cases.</p>
+        <p><c>AutoSkipped = integer()</c>, current number of auto-skipped test cases.</p>
+        <p>This is a statistics event with current count of successful, skipped, 
+	and failed test cases so far. This event is sent after the end of each test case,
+	immediately following event <c>tc_done</c>.
 	</p></item>
-    </list>
+      </taglist>
+  </section>
+    
+     <section>
+       <title>Internal Events</title>
 
-     <p><em>Internal events:</em></p>
+     <p>The internal events are as follows:</p>
 
-     <list>
-      <item><c>#event{name = start_make, data = Dir}</c>
+     <taglist>
+      <tag><c>#event{name = start_make, data = Dir}</c></tag>
+      <item>
         <p><c>Dir = string()</c>, running make in this directory.</p>
-        <p>An internal event saying that Common Test will start compiling
+        <p>This internal event says that <c>Common Test</c> starts compiling
 	modules in directory <c>Dir</c>.
 	</p></item>
 
-     <item><c>#event{name = finished_make, data = Dir}</c>
+      <tag><c>#event{name = finished_make, data = Dir}</c></tag>	
+      <item>
         <p><c>Dir = string()</c>, finished running make in this directory.</p>
-        <p>An internal event saying that Common Test is finished compiling
+        <p>This internal event says that <c>Common Test</c> is finished compiling
 	modules in directory <c>Dir</c>.
 	</p></item>
 
-      <item><c>#event{name = start_write_file, data = FullNameFile}</c>
+      <tag><c>#event{name = start_write_file, data = FullNameFile}</c></tag>
+      <item>
         <p><c>FullNameFile = string(), full name of the file.</c></p>
-        <p>An internal event used by the Common Test Master process to 
+        <p>This internal event is used by the <c>Common Test</c> Master process to 
 	synchronize particular file operations.
 	</p></item>
 
-      <item><c>#event{name = finished_write_file, data = FullNameFile}</c>
+      <tag><c>#event{name = finished_write_file, data = FullNameFile}</c></tag>
+      <item>
         <p><c>FullNameFile = string(), full name of the file.</c></p>
-        <p>An internal event used by the Common Test Master process to 
+        <p>This internal event is used by the <c>Common Test</c> Master process to 
 	synchronize particular file operations.
 	</p></item>
 
-    </list>
-
+     </taglist>
+     </section>
+     <section>
+       <title>Notes</title>
+  
     <p>The events are also documented in <c>ct_event.erl</c>. This module
-    may serve as an example of what an event handler for the CT event 
+    can serve as an example of what an event handler for the <c>Common Test</c> event 
     manager can look like.</p>
 
-    <note><p>To ensure that printouts to standard out (or printouts made with
-    <seealso marker="ct#log-2"><c>ct:log/2/3</c></seealso> or <seealso marker="ct:pal-2"><c>ct:pal/2/3</c></seealso>) get written to the test case log
-    file, and not to the Common Test framework log, you can syncronize
-    with the Common Test server by matching on the <c>tc_start</c> and <c>tc_done</c>
-    events. In the period between these events, all IO gets directed to the
+    <note><p>To ensure that printouts to <c>stdout</c> (or printouts made with
+    <seealso marker="ct#log-2"><c>ct:log/2,3</c></seealso> or 
+    <seealso marker="ct:pal-2"><c>ct:pal,2,3</c></seealso>) get written to the test case log
+    file, and not to the <c>Common Test</c> framework log, you can synchronize
+    with the <c>Common Test</c> server by matching on evvents <c>tc_start</c> and <c>tc_done</c>.
+    In the period between these events, all I/O is directed to the
     test case log file. These events are sent synchronously to avoid potential
-    timing problems (e.g. that the test case log file gets closed just before
-    an IO message from an external process gets through). Knowing this, you
-    need to be careful that your <c>handle_event/2</c> callback function doesn't
-    stall the test execution, possibly causing unexpected behaviour as a result.</p></note>
+    timing problems (for example, that the test case log file is closed just before
+    an I/O message from an external process gets through). Knowing this, you
+    need to be careful that your <c>handle_event/2</c> callback function does not
+    stall the test execution, possibly causing unexpected behavior as a result.</p></note>
+     </section>
 </section>
 </chapter>
 
diff --git a/lib/common_test/doc/src/example_chapter.xml b/lib/common_test/doc/src/example_chapter.xml
index 8201107c04..8523c9f485 100644
--- a/lib/common_test/doc/src/example_chapter.xml
+++ b/lib/common_test/doc/src/example_chapter.xml
@@ -33,476 +33,472 @@
   <marker id="top"></marker>
 
   <section>
-    <title>Test suite example</title>
-    <p>This example test suite shows some tests of a database server.
+    <title>Test Suite Example</title>
+    <p>The following example test suite shows some tests of a database server:
     </p>
 
 <code>
--module(db_data_type_SUITE).
-
--include_lib("common_test/include/ct.hrl").
-
-%% Test server callbacks
--export([suite/0, all/0, 
-	 init_per_suite/1, end_per_suite/1,
-	 init_per_testcase/2, end_per_testcase/2]).
-
-%% Test cases
--export([string/1, integer/1]).
-
--define(CONNECT_STR, "DSN=sqlserver;UID=alladin;PWD=sesame").
-
-%%--------------------------------------------------------------------
-%% COMMON TEST CALLBACK FUNCTIONS
-%%--------------------------------------------------------------------
-
-%%--------------------------------------------------------------------
-%% Function: suite() -> Info
-%%
-%% Info = [tuple()]
-%%   List of key/value pairs.
-%%
-%% Description: Returns list of tuples to set default properties
-%%              for the suite.
-%%--------------------------------------------------------------------
-suite() -> 
-    [{timetrap,{minutes,1}}].  
-
-%%--------------------------------------------------------------------
-%% Function: init_per_suite(Config0) -> Config1
-%%
-%% Config0 = Config1 = [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Initialization before the suite.
-%%--------------------------------------------------------------------
-init_per_suite(Config) -> 
-    {ok, Ref} = db:connect(?CONNECT_STR, []),
-    TableName = db_lib:unique_table_name(),	
-    [{con_ref, Ref },{table_name, TableName}| Config]. 
-
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config) -> term()
-%%
-%% Config = [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Cleanup after the suite.
-%%--------------------------------------------------------------------
-end_per_suite(Config) ->    
-    Ref = ?config(con_ref, Config),
-    db:disconnect(Ref),
-    ok.
+ -module(db_data_type_SUITE).
+
+ -include_lib("common_test/include/ct.hrl").
+
+ %% Test server callbacks
+ -export([suite/0, all/0, 
+	  init_per_suite/1, end_per_suite/1,
+	  init_per_testcase/2, end_per_testcase/2]).
+
+ %% Test cases
+ -export([string/1, integer/1]).
+
+ -define(CONNECT_STR, "DSN=sqlserver;UID=alladin;PWD=sesame").
+
+ %%--------------------------------------------------------------------
+ %% COMMON TEST CALLBACK FUNCTIONS
+ %%--------------------------------------------------------------------
+
+ %%--------------------------------------------------------------------
+ %% Function: suite() -> Info
+ %%
+ %% Info = [tuple()]
+ %%   List of key/value pairs.
+ %%
+ %% Description: Returns list of tuples to set default properties
+ %%              for the suite.
+ %%--------------------------------------------------------------------
+ suite() -> 
+     [{timetrap,{minutes,1}}].  
+
+ %%--------------------------------------------------------------------
+ %% Function: init_per_suite(Config0) -> Config1
+ %%
+ %% Config0 = Config1 = [tuple()]
+ %%   A list of key/value pairs, holding the test case configuration.
+ %%
+ %% Description: Initialization before the suite.
+ %%--------------------------------------------------------------------
+ init_per_suite(Config) -> 
+     {ok, Ref} = db:connect(?CONNECT_STR, []),
+     TableName = db_lib:unique_table_name(),	
+     [{con_ref, Ref },{table_name, TableName}| Config]. 
+
+ %%--------------------------------------------------------------------
+ %% Function: end_per_suite(Config) -> term()
+ %%
+ %% Config = [tuple()]
+ %%   A list of key/value pairs, holding the test case configuration.
+ %%
+ %% Description: Cleanup after the suite.
+ %%--------------------------------------------------------------------
+ end_per_suite(Config) ->    
+     Ref = ?config(con_ref, Config),
+     db:disconnect(Ref),
+     ok.
  
-%%--------------------------------------------------------------------
-%% Function: init_per_testcase(TestCase, Config0) -> Config1
-%%
-%% TestCase = atom()
-%%   Name of the test case that is about to run.
-%% Config0 = Config1 = [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Initialization before each test case.
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    Ref = ?config(con_ref, Config),   
-    TableName = ?config(table_name, Config),
-    ok = db:create_table(Ref, TableName, table_type(Case)),
-    Config.
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config) -> term()
-%%
-%% TestCase = atom()
-%%   Name of the test case that is finished.
-%% Config = [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Cleanup after each test case.
-%%--------------------------------------------------------------------
-end_per_testcase(_Case, Config) -> 
-    Ref = ?config(con_ref, Config),   
-    TableName = ?config(table_name, Config),
-    ok = db:delete_table(Ref, TableName),   
-    ok. 
-
-%%--------------------------------------------------------------------
-%% Function: all() -> GroupsAndTestCases
-%%
-%% GroupsAndTestCases = [{group,GroupName} | TestCase]
-%% GroupName = atom()
-%%   Name of a test case group.
-%% TestCase = atom()
-%%   Name of a test case.
-%%
-%% Description: Returns the list of groups and test cases that
-%%              are to be executed.
-%%--------------------------------------------------------------------
-all() ->
-    [string, integer]. 
-
-
-%%--------------------------------------------------------------------
-%% TEST CASES
-%%--------------------------------------------------------------------
-
-string(Config) -> 
-    insert_and_lookup(dummy_key, "Dummy string", Config).
-
-integer(Config) -> 
-    insert_and_lookup(dummy_key, 42, Config).
-
-
-insert_and_lookup(Key, Value, Config) ->
-    Ref = ?config(con_ref, Config),   
-    TableName = ?config(table_name, Config),
-    ok = db:insert(Ref, TableName, Key, Value),
-    [Value] = db:lookup(Ref, TableName, Key),
-    ok = db:delete(Ref, TableName, Key),
-    [] = db:lookup(Ref, TableName, Key),
-    ok.
-  
-</code>
+ %%--------------------------------------------------------------------
+ %% Function: init_per_testcase(TestCase, Config0) -> Config1
+ %%
+ %% TestCase = atom()
+ %%   Name of the test case that is about to run.
+ %% Config0 = Config1 = [tuple()]
+ %%   A list of key/value pairs, holding the test case configuration.
+ %%
+ %% Description: Initialization before each test case.
+ %%--------------------------------------------------------------------
+ init_per_testcase(Case, Config) ->
+     Ref = ?config(con_ref, Config),   
+     TableName = ?config(table_name, Config),
+     ok = db:create_table(Ref, TableName, table_type(Case)),
+     Config.
+
+ %%--------------------------------------------------------------------
+ %% Function: end_per_testcase(TestCase, Config) -> term()
+ %%
+ %% TestCase = atom()
+ %%   Name of the test case that is finished.
+ %% Config = [tuple()]
+ %%   A list of key/value pairs, holding the test case configuration.
+ %%
+ %% Description: Cleanup after each test case.
+ %%--------------------------------------------------------------------
+ end_per_testcase(_Case, Config) -> 
+     Ref = ?config(con_ref, Config),   
+     TableName = ?config(table_name, Config),
+     ok = db:delete_table(Ref, TableName),   
+     ok. 
+
+ %%--------------------------------------------------------------------
+ %% Function: all() -> GroupsAndTestCases
+ %%
+ %% GroupsAndTestCases = [{group,GroupName} | TestCase]
+ %% GroupName = atom()
+ %%   Name of a test case group.
+ %% TestCase = atom()
+ %%   Name of a test case.
+ %%
+ %% Description: Returns the list of groups and test cases that
+ %%              are to be executed.
+ %%--------------------------------------------------------------------
+ all() ->
+     [string, integer]. 
+
+
+ %%--------------------------------------------------------------------
+ %% TEST CASES
+ %%--------------------------------------------------------------------
+
+ string(Config) -> 
+     insert_and_lookup(dummy_key, "Dummy string", Config).
+
+ integer(Config) -> 
+     insert_and_lookup(dummy_key, 42, Config).
+
+
+ insert_and_lookup(Key, Value, Config) ->
+     Ref = ?config(con_ref, Config),   
+     TableName = ?config(table_name, Config),
+     ok = db:insert(Ref, TableName, Key, Value),
+     [Value] = db:lookup(Ref, TableName, Key),
+     ok = db:delete(Ref, TableName, Key),
+     [] = db:lookup(Ref, TableName, Key),
+     ok.</code>
   </section>
 
   <section>
-    <title>Test suite templates</title>
-    <p>The Erlang mode for the Emacs editor includes two Common Test test suite
-    templates, one with extensive information in the function headers, and
+    <title>Test Suite Templates</title>
+    <p>The Erlang mode for the Emacs editor includes two <c>Common Test</c> test 
+    suite templates, one with extensive information in the function headers, and
     one with minimal information. A test suite template provides a quick start
-    for implementing a suite from scratch and gives you a good overview
-    of the available callback functions. Here are the templates in question:
+    for implementing a suite from scratch and gives a good overview
+    of the available callback functions. The two templates follows:
     </p>
 
-    <p><em>Large Common Test suite</em></p>
+    <p><em>Large Common Test Suite</em></p>
 <code>
-%%%-------------------------------------------------------------------
-%%% File    : example_SUITE.erl
-%%% Author  : 
-%%% Description : 
-%%%
-%%% Created : 
-%%%-------------------------------------------------------------------
--module(example_SUITE).
-
-%% Note: This directive should only be used in test suites.
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
-%%--------------------------------------------------------------------
-%% COMMON TEST CALLBACK FUNCTIONS
-%%--------------------------------------------------------------------
-
-%%--------------------------------------------------------------------
-%% Function: suite() -> Info
-%%
-%% Info = [tuple()]
-%%   List of key/value pairs.
-%%
-%% Description: Returns list of tuples to set default properties
-%%              for the suite.
-%%
-%% Note: The suite/0 function is only meant to be used to return
-%% default data values, not perform any other operations.
-%%--------------------------------------------------------------------
-suite() ->
-    [{timetrap,{minutes,10}}].
-
-%%--------------------------------------------------------------------
-%% Function: init_per_suite(Config0) ->
-%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
-%%
-%% Config0 = Config1 = [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Reason = term()
-%%   The reason for skipping the suite.
-%%
-%% Description: Initialization before the suite.
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    Config.
-
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config0) -> term() | {save_config,Config1}
-%%
-%% Config0 = Config1 = [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Cleanup after the suite.
-%%--------------------------------------------------------------------
-end_per_suite(_Config) ->
-    ok.
-
-%%--------------------------------------------------------------------
-%% Function: init_per_group(GroupName, Config0) ->
-%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
-%%
-%% GroupName = atom()
-%%   Name of the test case group that is about to run.
-%% Config0 = Config1 = [tuple()]
-%%   A list of key/value pairs, holding configuration data for the group.
-%% Reason = term()
-%%   The reason for skipping all test cases and subgroups in the group.
-%%
-%% Description: Initialization before each test case group.
-%%--------------------------------------------------------------------
-init_per_group(_GroupName, Config) ->
-    Config.
-
-%%--------------------------------------------------------------------
-%% Function: end_per_group(GroupName, Config0) ->
-%%               term() | {save_config,Config1}
-%%
-%% GroupName = atom()
-%%   Name of the test case group that is finished.
-%% Config0 = Config1 = [tuple()]
-%%   A list of key/value pairs, holding configuration data for the group.
-%%
-%% Description: Cleanup after each test case group.
-%%--------------------------------------------------------------------
-end_per_group(_GroupName, _Config) ->
-    ok.
-
-%%--------------------------------------------------------------------
-%% Function: init_per_testcase(TestCase, Config0) ->
-%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
-%%
-%% TestCase = atom()
-%%   Name of the test case that is about to run.
-%% Config0 = Config1 = [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Reason = term()
-%%   The reason for skipping the test case.
-%%
-%% Description: Initialization before each test case.
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
-init_per_testcase(_TestCase, Config) ->
-    Config.
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config0) ->
-%%               term() | {save_config,Config1} | {fail,Reason}
-%%
-%% TestCase = atom()
-%%   Name of the test case that is finished.
-%% Config0 = Config1 = [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Reason = term()
-%%   The reason for failing the test case.
-%%
-%% Description: Cleanup after each test case.
-%%--------------------------------------------------------------------
-end_per_testcase(_TestCase, _Config) ->
-    ok.
-
-%%--------------------------------------------------------------------
-%% Function: groups() -> [Group]
-%%
-%% Group = {GroupName,Properties,GroupsAndTestCases}
-%% GroupName = atom()
-%%   The name of the group.
-%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
-%%   Group properties that may be combined.
-%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
-%% TestCase = atom()
-%%   The name of a test case.
-%% Shuffle = shuffle | {shuffle,Seed}
-%%   To get cases executed in random order.
-%% Seed = {integer(),integer(),integer()}
-%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
-%%              repeat_until_any_ok | repeat_until_any_fail
-%%   To get execution of cases repeated.
-%% N = integer() | forever
-%%
-%% Description: Returns a list of test case group definitions.
-%%--------------------------------------------------------------------
-groups() ->
-    [].
-
-%%--------------------------------------------------------------------
-%% Function: all() -> GroupsAndTestCases | {skip,Reason}
-%%
-%% GroupsAndTestCases = [{group,GroupName} | TestCase]
-%% GroupName = atom()
-%%   Name of a test case group.
-%% TestCase = atom()
-%%   Name of a test case.
-%% Reason = term()
-%%   The reason for skipping all groups and test cases.
-%%
-%% Description: Returns the list of groups and test cases that
-%%              are to be executed.
-%%--------------------------------------------------------------------
-all() -> 
-    [my_test_case].
-
-
-%%--------------------------------------------------------------------
-%% TEST CASES
-%%--------------------------------------------------------------------
-
-%%--------------------------------------------------------------------
-%% Function: TestCase() -> Info
-%%
-%% Info = [tuple()]
-%%   List of key/value pairs.
-%%
-%% Description: Test case info function - returns list of tuples to set
-%%              properties for the test case.
-%%
-%% Note: This function is only meant to be used to return a list of
-%% values, not perform any other operations.
-%%--------------------------------------------------------------------
-my_test_case() -> 
-    [].
-
-%%--------------------------------------------------------------------
-%% Function: TestCase(Config0) ->
-%%               ok | exit() | {skip,Reason} | {comment,Comment} |
-%%               {save_config,Config1} | {skip_and_save,Reason,Config1}
-%%
-%% Config0 = Config1 = [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Reason = term()
-%%   The reason for skipping the test case.
-%% Comment = term()
-%%   A comment about the test case that will be printed in the html log.
-%%
-%% Description: Test case function. (The name of it must be specified in
-%%              the all/0 list or in a test case group for the test case
-%%              to be executed).
-%%--------------------------------------------------------------------
-my_test_case(_Config) -> 
-    ok.
-</code>
+ %%%-------------------------------------------------------------------
+ %%% File    : example_SUITE.erl
+ %%% Author  : 
+ %%% Description : 
+ %%%
+ %%% Created : 
+ %%%-------------------------------------------------------------------
+ -module(example_SUITE).
+
+ %% Note: This directive should only be used in test suites.
+ -compile(export_all).
+
+ -include_lib("common_test/include/ct.hrl").
+
+ %%--------------------------------------------------------------------
+ %% COMMON TEST CALLBACK FUNCTIONS
+ %%--------------------------------------------------------------------
+
+ %%--------------------------------------------------------------------
+ %% Function: suite() -> Info
+ %%
+ %% Info = [tuple()]
+ %%   List of key/value pairs.
+ %%
+ %% Description: Returns list of tuples to set default properties
+ %%              for the suite.
+ %%
+ %% Note: The suite/0 function is only meant to be used to return
+ %% default data values, not perform any other operations.
+ %%--------------------------------------------------------------------
+ suite() ->
+     [{timetrap,{minutes,10}}].
+
+ %%--------------------------------------------------------------------
+ %% Function: init_per_suite(Config0) ->
+ %%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+ %%
+ %% Config0 = Config1 = [tuple()]
+ %%   A list of key/value pairs, holding the test case configuration.
+ %% Reason = term()
+ %%   The reason for skipping the suite.
+ %%
+ %% Description: Initialization before the suite.
+ %%
+ %% Note: This function is free to add any key/value pairs to the Config
+ %% variable, but should NOT alter/remove any existing entries.
+ %%--------------------------------------------------------------------
+ init_per_suite(Config) ->
+     Config.
+
+ %%--------------------------------------------------------------------
+ %% Function: end_per_suite(Config0) -> term() | {save_config,Config1}
+ %%
+ %% Config0 = Config1 = [tuple()]
+ %%   A list of key/value pairs, holding the test case configuration.
+ %%
+ %% Description: Cleanup after the suite.
+ %%--------------------------------------------------------------------
+ end_per_suite(_Config) ->
+     ok.
+
+ %%--------------------------------------------------------------------
+ %% Function: init_per_group(GroupName, Config0) ->
+ %%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+ %%
+ %% GroupName = atom()
+ %%   Name of the test case group that is about to run.
+ %% Config0 = Config1 = [tuple()]
+ %%   A list of key/value pairs, holding configuration data for the group.
+ %% Reason = term()
+ %%   The reason for skipping all test cases and subgroups in the group.
+ %%
+ %% Description: Initialization before each test case group.
+ %%--------------------------------------------------------------------
+ init_per_group(_GroupName, Config) ->
+     Config.
+
+ %%--------------------------------------------------------------------
+ %% Function: end_per_group(GroupName, Config0) ->
+ %%               term() | {save_config,Config1}
+ %%
+ %% GroupName = atom()
+ %%   Name of the test case group that is finished.
+ %% Config0 = Config1 = [tuple()]
+ %%   A list of key/value pairs, holding configuration data for the group.
+ %%
+ %% Description: Cleanup after each test case group.
+ %%--------------------------------------------------------------------
+ end_per_group(_GroupName, _Config) ->
+     ok.
+
+ %%--------------------------------------------------------------------
+ %% Function: init_per_testcase(TestCase, Config0) ->
+ %%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+ %%
+ %% TestCase = atom()
+ %%   Name of the test case that is about to run.
+ %% Config0 = Config1 = [tuple()]
+ %%   A list of key/value pairs, holding the test case configuration.
+ %% Reason = term()
+ %%   The reason for skipping the test case.
+ %%
+ %% Description: Initialization before each test case.
+ %%
+ %% Note: This function is free to add any key/value pairs to the Config
+ %% variable, but should NOT alter/remove any existing entries.
+ %%--------------------------------------------------------------------
+ init_per_testcase(_TestCase, Config) ->
+     Config.
+
+ %%--------------------------------------------------------------------
+ %% Function: end_per_testcase(TestCase, Config0) ->
+ %%               term() | {save_config,Config1} | {fail,Reason}
+ %%
+ %% TestCase = atom()
+ %%   Name of the test case that is finished.
+ %% Config0 = Config1 = [tuple()]
+ %%   A list of key/value pairs, holding the test case configuration.
+ %% Reason = term()
+ %%   The reason for failing the test case.
+ %%
+ %% Description: Cleanup after each test case.
+ %%--------------------------------------------------------------------
+ end_per_testcase(_TestCase, _Config) ->
+     ok.
+
+ %%--------------------------------------------------------------------
+ %% Function: groups() -> [Group]
+ %%
+ %% Group = {GroupName,Properties,GroupsAndTestCases}
+ %% GroupName = atom()
+ %%   The name of the group.
+ %% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+ %%   Group properties that may be combined.
+ %% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+ %% TestCase = atom()
+ %%   The name of a test case.
+ %% Shuffle = shuffle | {shuffle,Seed}
+ %%   To get cases executed in random order.
+ %% Seed = {integer(),integer(),integer()}
+ %% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+ %%              repeat_until_any_ok | repeat_until_any_fail
+ %%   To get execution of cases repeated.
+ %% N = integer() | forever
+ %%
+ %% Description: Returns a list of test case group definitions.
+ %%--------------------------------------------------------------------
+ groups() ->
+     [].
+
+ %%--------------------------------------------------------------------
+ %% Function: all() -> GroupsAndTestCases | {skip,Reason}
+ %%
+ %% GroupsAndTestCases = [{group,GroupName} | TestCase]
+ %% GroupName = atom()
+ %%   Name of a test case group.
+ %% TestCase = atom()
+ %%   Name of a test case.
+ %% Reason = term()
+ %%   The reason for skipping all groups and test cases.
+ %%
+ %% Description: Returns the list of groups and test cases that
+ %%              are to be executed.
+ %%--------------------------------------------------------------------
+ all() -> 
+     [my_test_case].
+
+
+ %%--------------------------------------------------------------------
+ %% TEST CASES
+ %%--------------------------------------------------------------------
+
+ %%--------------------------------------------------------------------
+ %% Function: TestCase() -> Info
+ %%
+ %% Info = [tuple()]
+ %%   List of key/value pairs.
+ %%
+ %% Description: Test case info function - returns list of tuples to set
+ %%              properties for the test case.
+ %%
+ %% Note: This function is only meant to be used to return a list of
+ %% values, not perform any other operations.
+ %%--------------------------------------------------------------------
+ my_test_case() -> 
+     [].
+
+ %%--------------------------------------------------------------------
+ %% Function: TestCase(Config0) ->
+ %%               ok | exit() | {skip,Reason} | {comment,Comment} |
+ %%               {save_config,Config1} | {skip_and_save,Reason,Config1}
+ %%
+ %% Config0 = Config1 = [tuple()]
+ %%   A list of key/value pairs, holding the test case configuration.
+ %% Reason = term()
+ %%   The reason for skipping the test case.
+ %% Comment = term()
+ %%   A comment about the test case that will be printed in the html log.
+ %%
+ %% Description: Test case function. (The name of it must be specified in
+ %%              the all/0 list or in a test case group for the test case
+ %%              to be executed).
+ %%--------------------------------------------------------------------
+ my_test_case(_Config) -> 
+     ok.</code>
     <br></br>
-    <p><em>Small Common Test suite</em></p>
+    <p><em>Small Common Test Suite</em></p>
 <code>
-%%%-------------------------------------------------------------------
-%%% File    : example_SUITE.erl
-%%% Author  : 
-%%% Description : 
-%%%
-%%% Created : 
-%%%-------------------------------------------------------------------
--module(example_SUITE).
-
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
-%%--------------------------------------------------------------------
-%% Function: suite() -> Info
-%% Info = [tuple()]
-%%--------------------------------------------------------------------
-suite() ->
-    [{timetrap,{seconds,30}}].
-
-%%--------------------------------------------------------------------
-%% Function: init_per_suite(Config0) ->
-%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
-%% Config0 = Config1 = [tuple()]
-%% Reason = term()
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    Config.
-
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config0) -> term() | {save_config,Config1}
-%% Config0 = Config1 = [tuple()]
-%%--------------------------------------------------------------------
-end_per_suite(_Config) ->
-    ok.
-
-%%--------------------------------------------------------------------
-%% Function: init_per_group(GroupName, Config0) ->
-%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
-%% GroupName = atom()
-%% Config0 = Config1 = [tuple()]
-%% Reason = term()
-%%--------------------------------------------------------------------
-init_per_group(_GroupName, Config) ->
-    Config.
-
-%%--------------------------------------------------------------------
-%% Function: end_per_group(GroupName, Config0) ->
-%%               term() | {save_config,Config1}
-%% GroupName = atom()
-%% Config0 = Config1 = [tuple()]
-%%--------------------------------------------------------------------
-end_per_group(_GroupName, _Config) ->
-    ok.
-
-%%--------------------------------------------------------------------
-%% Function: init_per_testcase(TestCase, Config0) ->
-%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
-%% TestCase = atom()
-%% Config0 = Config1 = [tuple()]
-%% Reason = term()
-%%--------------------------------------------------------------------
-init_per_testcase(_TestCase, Config) ->
-    Config.
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, Config0) ->
-%%               term() | {save_config,Config1} | {fail,Reason}
-%% TestCase = atom()
-%% Config0 = Config1 = [tuple()]
-%% Reason = term()
-%%--------------------------------------------------------------------
-end_per_testcase(_TestCase, _Config) ->
-    ok.
-
-%%--------------------------------------------------------------------
-%% Function: groups() -> [Group]
-%% Group = {GroupName,Properties,GroupsAndTestCases}
-%% GroupName = atom()
-%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
-%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
-%% TestCase = atom()
-%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
-%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
-%%              repeat_until_any_ok | repeat_until_any_fail
-%% N = integer() | forever
-%%--------------------------------------------------------------------
-groups() ->
-    [].
-
-%%--------------------------------------------------------------------
-%% Function: all() -> GroupsAndTestCases | {skip,Reason}
-%% GroupsAndTestCases = [{group,GroupName} | TestCase]
-%% GroupName = atom()
-%% TestCase = atom()
-%% Reason = term()
-%%--------------------------------------------------------------------
-all() -> 
-    [my_test_case].
-
-%%--------------------------------------------------------------------
-%% Function: TestCase() -> Info
-%% Info = [tuple()]
-%%--------------------------------------------------------------------
-my_test_case() -> 
-    [].
-
-%%--------------------------------------------------------------------
-%% Function: TestCase(Config0) ->
-%%               ok | exit() | {skip,Reason} | {comment,Comment} |
-%%               {save_config,Config1} | {skip_and_save,Reason,Config1}
-%% Config0 = Config1 = [tuple()]
-%% Reason = term()
-%% Comment = term()
-%%--------------------------------------------------------------------
-my_test_case(_Config) -> 
-    ok.
-</code>
+ %%%-------------------------------------------------------------------
+ %%% File    : example_SUITE.erl
+ %%% Author  : 
+ %%% Description : 
+ %%%
+ %%% Created : 
+ %%%-------------------------------------------------------------------
+ -module(example_SUITE).
+
+ -compile(export_all).
+
+ -include_lib("common_test/include/ct.hrl").
+
+ %%--------------------------------------------------------------------
+ %% Function: suite() -> Info
+ %% Info = [tuple()]
+ %%--------------------------------------------------------------------
+ suite() ->
+     [{timetrap,{seconds,30}}].
+
+ %%--------------------------------------------------------------------
+ %% Function: init_per_suite(Config0) ->
+ %%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+ %% Config0 = Config1 = [tuple()]
+ %% Reason = term()
+ %%--------------------------------------------------------------------
+ init_per_suite(Config) ->
+     Config.
+
+ %%--------------------------------------------------------------------
+ %% Function: end_per_suite(Config0) -> term() | {save_config,Config1}
+ %% Config0 = Config1 = [tuple()]
+ %%--------------------------------------------------------------------
+ end_per_suite(_Config) ->
+     ok.
+
+ %%--------------------------------------------------------------------
+ %% Function: init_per_group(GroupName, Config0) ->
+ %%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+ %% GroupName = atom()
+ %% Config0 = Config1 = [tuple()]
+ %% Reason = term()
+ %%--------------------------------------------------------------------
+ init_per_group(_GroupName, Config) ->
+     Config.
+
+ %%--------------------------------------------------------------------
+ %% Function: end_per_group(GroupName, Config0) ->
+ %%               term() | {save_config,Config1}
+ %% GroupName = atom()
+ %% Config0 = Config1 = [tuple()]
+ %%--------------------------------------------------------------------
+ end_per_group(_GroupName, _Config) ->
+     ok.
+
+ %%--------------------------------------------------------------------
+ %% Function: init_per_testcase(TestCase, Config0) ->
+ %%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+ %% TestCase = atom()
+ %% Config0 = Config1 = [tuple()]
+ %% Reason = term()
+ %%--------------------------------------------------------------------
+ init_per_testcase(_TestCase, Config) ->
+     Config.
+
+ %%--------------------------------------------------------------------
+ %% Function: end_per_testcase(TestCase, Config0) ->
+ %%               term() | {save_config,Config1} | {fail,Reason}
+ %% TestCase = atom()
+ %% Config0 = Config1 = [tuple()]
+ %% Reason = term()
+ %%--------------------------------------------------------------------
+ end_per_testcase(_TestCase, _Config) ->
+     ok.
+
+ %%--------------------------------------------------------------------
+ %% Function: groups() -> [Group]
+ %% Group = {GroupName,Properties,GroupsAndTestCases}
+ %% GroupName = atom()
+ %% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+ %% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+ %% TestCase = atom()
+ %% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+ %% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+ %%              repeat_until_any_ok | repeat_until_any_fail
+ %% N = integer() | forever
+ %%--------------------------------------------------------------------
+ groups() ->
+     [].
+
+ %%--------------------------------------------------------------------
+ %% Function: all() -> GroupsAndTestCases | {skip,Reason}
+ %% GroupsAndTestCases = [{group,GroupName} | TestCase]
+ %% GroupName = atom()
+ %% TestCase = atom()
+ %% Reason = term()
+ %%--------------------------------------------------------------------
+ all() -> 
+     [my_test_case].
+
+ %%--------------------------------------------------------------------
+ %% Function: TestCase() -> Info
+ %% Info = [tuple()]
+ %%--------------------------------------------------------------------
+ my_test_case() -> 
+     [].
+
+ %%--------------------------------------------------------------------
+ %% Function: TestCase(Config0) ->
+ %%               ok | exit() | {skip,Reason} | {comment,Comment} |
+ %%               {save_config,Config1} | {skip_and_save,Reason,Config1}
+ %% Config0 = Config1 = [tuple()]
+ %% Reason = term()
+ %% Comment = term()
+ %%--------------------------------------------------------------------
+ my_test_case(_Config) -> 
+     ok.</code>
     </section>
 </chapter>
 
diff --git a/lib/common_test/doc/src/getting_started_chapter.xml b/lib/common_test/doc/src/getting_started_chapter.xml
index ef9c409bf1..802f9ba397 100644
--- a/lib/common_test/doc/src/getting_started_chapter.xml
+++ b/lib/common_test/doc/src/getting_started_chapter.xml
@@ -31,235 +31,247 @@
   </header>
 
   <section>
-    <title>Are you new around here?</title>
+    <title>Introduction for Newcomers</title>
     <p>
-      The purpose of this short chapter is to, with a "learning by example"
-      approach, give the newcomer a chance to get started quickly writing and
-      executing some first simple tests. The chapter will introduce some of the
-      basics, but leave most explanations and details for the later
-      chapters in this User's Guide. Hopefully though, after this chapter, you
-      will be inspired and unintimidated enough to go on and get into the
-      nitty-gritty that follows in this rather heavy User's Guide! If you're
-      not much into "learning by example" and prefer to get into more technical
-      detail right away, go ahead and skip to the next chapter. Again, the basics
-      presented here will be covered in detail in later chapters.
+      The purpose of this section is to let the newcomer get started in
+      quickly writing and executing some first simple tests with a 
+      "learning by example" approach. Most explanations are left for later sections. 
+      If you are not much into "learning by example" and prefer more technical
+      details, go ahead and skip to the next section.
     </p>
     <p>
-      This chapter also tries to demonstrate how dead simple it actually is
-      to write a very basic (yet for many module testing purposes, often sufficiently
-      complex) test suite, and execute its test cases. This is not necessarily
-      obvious when you read the rest of the chapters in the User's Guide.
-    </p>
-    <p>
-      A quick note before we start: In order to understand what's discussed and
-      examplified here, it is recommended that you first read through the
-      opening <seealso marker="basics_chapter#basics">Common Test Basics</seealso>
-      chapter.
+      This section demonstrates how simple it is to write a basic 
+      (yet for many module testing purposes, often sufficiently complex) 
+      test suite and execute its test cases. This is not necessarily
+      obvious when you read the remaining sections in this User's Guide.
     </p>
+    <note>
+      <p>
+      To understand what is discussed and examplified here, we recommended 
+      you to first read section
+      <seealso marker="basics_chapter#basics">Common Test Basics</seealso>.
+      </p>
+    </note>
     </section>
 
     <section>
-    <title>Test case execution</title>
-    <p>Execution of test cases is handled this way:</p>
+    <title>Test Case Execution</title>
+    <p>Execution of test cases is handled as follows:</p>
     
     <image file="tc_execution.gif">
       <icaption>
-	Successful vs unsuccessful test case execution.
+	Successful and Unsuccessful Test Case Execution
       </icaption>
     </image>
 
-    <p>For each test case that Common Test is told to execute, it spawns a
-      dedicated process on which the test case function in question starts
+    <p>For each test case that <c>Common Test</c> is ordered to execute, it spawns a
+      dedicated process on which the test case function starts
       running. (In parallel to the test case process, an idle waiting timer
-      process is started which is linked to the test case process. If the timer
+      process is started, which is linked to the test case process. If the timer
       process runs out of waiting time, it sends an exit signal to terminate
-      the test case process and this is what's called a <em>timetrap</em>).
+      the test case process. This is called a <em>timetrap</em>).
     </p>
-    <p>In scenario 1, the test case process terminates normally after case A has
-      finished executing its test code without detecting any errors. The test
-      case function simply returns a value and Common Test logs the test case as
-      successful.
+    <p>In scenario 1, the test case process terminates normally after 
+    <c>case A</c> has finished executing its test code without detecting 
+    any errors. The test case function returns a value and <c>Common Test</c> 
+    logs the test case as successful.
     </p>
-    <p>In scenario 2, an error is detected during test case execution
-      which causes the test case B function to generate an exception.
-      This causes the test case process to exit with reason
-      other than normal, and as a result, Common Test will log this as an
-      unsuccessful test case.
+    <p>In scenario 2, an error is detected during test <c>case B</c> execution.
+      This causes the test <c>case B</c> function to generate an exception
+      and, as a result, the test case process exits with reason other than normal. 
+      <c>Common Test</c> logs this as an unsuccessful (Failed) test case.
     </p>
-    <p>As you can understand from the illustration above, Common Test requires
-      that a test case generates a runtime error to indicate failure (e.g.
-      by causing a bad match error or by calling <c>exit/1</c>, preferrably
-      through the <seealso marker="ct#fail-1"><c>ct:fail/1,2</c></seealso> help function). A succesful execution is
-      indicated by means of a normal return from the test case function.
+    <p>As you can understand from the illustration, <c>Common Test</c> requires
+      a test case to generate a runtime error to indicate failure (for example,
+      by causing a bad match error or by calling <c>exit/1</c>, preferably
+      through the help function 
+      <seealso marker="ct#fail-1"><c>ct:fail/1,2</c></seealso>). A successful 
+      execution is indicated by a normal return from the test case function.
     </p>
     </section>
 
     <section>
-    <title>A simple test suite</title>
-    <p>As you've seen in the basics chapter, the test suite module implements
+    <title>A Simple Test Suite</title>
+    <p>As shown in section 
+    <seealso marker="basics_chapter#External_Interfaces">Common Test Basics</seealso>,
+    the test suite module implements
       <seealso marker="common_test">callback functions</seealso>
-      (mandatory or optional) for various purposes, e.g:
+      (mandatory or optional) for various purposes, for example:
     </p>
-      <list>
+      <list type="bulleted">
 	<item>Init/end configuration function for the test suite</item>
 	<item>Init/end configuration function for a test case</item>
 	<item>Init/end configuration function for a test case group</item>
 	<item>Test cases</item>
       </list>
     <p> 
-     The configuration functions are optional and if you don't need them for
-      your test, a test suite with one simple test case could look like this:
+     The configuration functions are optional. The following example is a test suite 
+     without configuration functions, including one simple test case, to 
+     check that module <c>mymod</c> exists (that is, can be successfully loaded by the 
+     code server):
     </p>
     <pre>
-      -module(my1st_SUITE).
-      -compile(export_all).
+ -module(my1st_SUITE).
+ -compile(export_all).
 
-      all() ->
-          [mod_exists].
+ all() ->
+     [mod_exists].
 
-      mod_exists(_) ->
-          {module,mymod} = code:load_file(mymod).</pre>
+ mod_exists(_) ->
+     {module,mymod} = code:load_file(mymod).</pre>
     <p>
-      In this example we check that the <c>mymod</c> module exists (i.e. can be
-      successfully loaded by the code server). If the operation fails, we will
-      get a bad match error which terminates the test case.
+      If the operation fails, a bad match error occurs that terminates the test case.
     </p>
     </section>
 
     <section>
-    <title>A test suite with configuration functions</title>
+    <title>A Test Suite with Configuration Functions</title>
     <p>
-      If we need to perform configuration operations in order to run our test, we
-      implement configuration functions in our suite. The result from a
-      configuration function is configuration data, or simply <em><c>Config</c></em>.
-      This is a list of key-value tuples which get passed from the configuration
+      If you need to perform configuration operations to run your test, you can
+      implement configuration functions in your suite. The result from a
+      configuration function is configuration data, or <c>Config</c>.
+      This is a list of key-value tuples that get passed from the configuration
       function to the test cases (possibly through configuration functions on
-      "lower level"). The data flow looks like this:
+      "lower level"). The data flow looks as follows:
     </p>
 
     <image file="config.gif">
       <icaption>
-	Config data flow in the suite.
+	Configuration Data Flow in a Suite
       </icaption>
     </image>
 
     <p>
-      Here's an example of a test suite which uses configuration functions
-      to open and close a log file for the test cases (an operation that would
-      be unnecessary and irrelevant to perform by each test case):
+      The following example shows a test suite that uses configuration functions
+      to open and close a log file for the test cases (an operation that is
+      unnecessary and irrelevant to perform by each test case):
     </p>
     <pre>
-      -module(check_log_SUITE).
-      -export([all/0, init_per_suite/1, end_per_suite/1]).
-      -export([check_restart_result/1, check_no_errors/1]).
-      
-      -define(value(Key,Config), proplists:get_value(Key,Config)).
+ -module(check_log_SUITE).
+ -export([all/0, init_per_suite/1, end_per_suite/1]).
+ -export([check_restart_result/1, check_no_errors/1]).
 
-      all() -> [check_restart_result, check_no_errors].
+ -define(value(Key,Config), proplists:get_value(Key,Config)).
 
-      init_per_suite(InitConfigData) ->
-          [{logref,open_log()} | InitConfigData].
+ all() -> [check_restart_result, check_no_errors].
 
-      end_per_suite(ConfigData) ->
-          close_log(?value(logref, ConfigData)).
+ init_per_suite(InitConfigData) ->
+     [{logref,open_log()} | InitConfigData].
 
-      check_restart_result(ConfigData) ->
-          TestData = read_log(restart, ?value(logref, ConfigData)),
-          {match,_Line} = search_for("restart successful", TestData).
-      
-      check_no_errors(ConfigData) ->
-          TestData = read_log(all, ?value(logref, ConfigData)),
-          case search_for("error", TestData) of
-              {match,Line} -> ct:fail({error_found_in_log,Line});
-              nomatch -> ok
-          end.</pre>
+ end_per_suite(ConfigData) ->
+     close_log(?value(logref, ConfigData)).
+
+ check_restart_result(ConfigData) ->
+     TestData = read_log(restart, ?value(logref, ConfigData)),
+     {match,_Line} = search_for("restart successful", TestData).
+
+ check_no_errors(ConfigData) ->
+     TestData = read_log(all, ?value(logref, ConfigData)),
+     case search_for("error", TestData) of
+	 {match,Line} -> ct:fail({error_found_in_log,Line});
+	 nomatch -> ok
+     end.</pre>
     <p>
-      In this example we have test cases that verify, by parsing a
-      log file, that our SUT has performed a successful restart and
-      that no unexpected errors have been printed.
+      The test cases verify, by parsing a log file, that our SUT has performed 
+      a successful restart and that no unexpected errors are printed.
     </p>
 
-    <p>To execute the test cases in the test suite above, we could type this on
-      the Unix/Linux command line (assuming for this example that the suite module
+    <p>To execute the test cases in the recent test suite, type the 
+    following on the UNIX/Linux command line (assuming that the suite module
       is in the current working directory):
     </p>
     <pre>
-      $ ct_run -dir .</pre>
-    <p>or</p>
+ $ ct_run -dir .</pre>
+    <p>or:</p>
     <pre>
-    $ ct_run -suite check_log_SUITE</pre>
+ $ ct_run -suite check_log_SUITE</pre>
 
-    <p>If we want to use the Erlang shell to run our test, we could evaluate this call:
+    <p>To use the Erlang shell to run our test, you can evaluate the following call:
     </p>
     <pre>
-      1> ct:run_test([{dir, "."}]).</pre>
-    <p>or</p>
+ 1> ct:run_test([{dir, "."}]).</pre>
+    <p>or:</p>
     <pre>
-      1> ct:run_test([{suite, "check_log_SUITE"}]).</pre>
+ 1> ct:run_test([{suite, "check_log_SUITE"}]).</pre>
     <p>
-      The result from running our test is printed in log files in HTML format
-      (stored in unique log directories on different level). This illustration
-      shows the log file structure:
+      The result from running the test is printed in log files in HTML format
+      (stored in unique log directories on a different level). The following 
+      illustration shows the log file structure:
     </p>
 
     <image file="html_logs.gif">
       <icaption>
-	HTML log file structure.
+	HTML Log File Structure
       </icaption>
     </image>
   </section>
 
   <section>
-    <title>What happens next?</title>
+    <title>Questions and Answers</title>
 
-    <p>Well, you might already be asking yourself questions such as:</p>
+    <p>Here follows some questions that you might have after reading this section 
+    with corresponding tips and links to the answers:
+    </p>
       
-      <list>
-	<item>"How and where can I specify variable data for my tests that mustn't
-	  be hard-coded in the test suites (such as host names, addresses,
-	  user login data, etc)?" The
-	  <seealso marker="config_file_chapter#top">External Configuration Data</seealso>
-	  chapter will give you that information.
+      <list type="bulleted">
+	<item><p><em>Question:</em> 
+	"How and where can I specify variable data for my tests that must not 
+	be hard-coded in the test suites (such as hostnames, addresses, and
+	  user login data)?"</p>
+	  <p><em>Answer:</em> 
+	  See section <seealso marker="config_file_chapter#top">External Configuration Data</seealso>.</p>
 	</item>
-	<item>"Is there a way to declare a number of different tests and run them
-	  in one session without having to write my own scripts? And can such
-	  declarations be used for regression testing?" The 
+
+	<item><p><em>Question:</em> "Is there a way to declare different tests and run them
+	  in one session without having to write my own scripts? Also, can such
+	  declarations be used for regression testing?"</p>
+	  <p><em>Answer:</em> See section
 	  <seealso marker="run_test_chapter#test_specifications">Test Specifications</seealso>
-	  chapter answers these questions.
+	  in section Running Tests and Analyzing Results.
+	  </p>
 	</item>
-	<item>"Can test cases and/or test runs be automatically repeated?" Learn more about
+
+	<item><p><em>Question:</em> "Can test cases and/or test runs be automatically repeated?"</p>
+	<p><em>Answer:</em> Learn more about
 	  <seealso marker="write_test_chapter#test_case_groups">Test Case Groups</seealso>
-	  and also read about start flags/options in the
-	  <seealso marker="run_test_chapter#ct_run">Running Tests</seealso> chapter and
-	  the Reference Manual.
+	  and read about start flags/options in section
+	  <seealso marker="run_test_chapter#ct_run">Running Tests</seealso> and in
+	  the Reference Manual.</p>
 	</item>
-	<item>"Will Common Test execute my test cases in sequence or in parallel?" The
+
+	<item><p><em>Question:</em> "Does <c>Common Test</c> execute my test cases in sequence or in parallel?"</p>
+	<p><em>Answer:</em> See
 	  <seealso marker="write_test_chapter#test_case_groups">Test Case Groups</seealso>
-	  section in the Running Tests chapter will give you the answer.
+	in section Writing Test Suites.</p>
 	</item>
-	<item>"What's the syntax for timetraps (mentioned above), and how do I set them?"
-	  This is explained in the
-	  <seealso marker="write_test_chapter#timetraps">Timetrap Timeouts</seealso>
-	  part of the Writing Test Suites chapter.
+
+	<item><p><em>Question:</em> "What is the syntax for timetraps (mentioned earlier), and how do I set them?"</p>
+	  <p><em>Answer:</em> This is explained in the
+	  <seealso marker="write_test_chapter#timetraps">Timetrap Time-Outs</seealso>
+	  part of section Writing Test Suites.</p>
 	</item>
-	<item>"What functions are available for logging and printing?" Check the
+
+	<item><p><em>Question:</em> "What functions are available for logging and printing?"</p>
+	<p><em>Answer:</em> See
 	  <seealso marker="write_test_chapter#logging">Logging</seealso>
-	  section in the Writing Test Suites chapter.
+	in section Writing Test Suites.</p>
 	</item>
-	<item>"I need data files for my tests. Where do I store them preferrably?"
-	  You should read about 
+
+	<item><p><em>Question:</em> "I need data files for my tests. Where do I store them preferably?"</p>
+	  <p><em>Answer:</em> See
 	  <seealso marker="write_test_chapter#data_priv_dir">Data and Private
-	  Directories</seealso> for information about this.
+	  Directories</seealso>.</p>
 	</item>
-	<item>"May I start with a test suite example, please?"
-	  <seealso marker="example_chapter#top">Sure!</seealso>
+
+	<item><p><em>Question:</em> "Can I start with a test suite example, please?"</p>
+	  <p><em>Answer:</em> <seealso marker="example_chapter#top">Welcome!</seealso></p>
 	</item>
       </list>
-      <p>You will probably want to get started on your own first test suites now, while
-      at the same time digging deeper into the Common Test User's Guide and Reference Manual.
-      You will find that there's lots more to learn about the things that have been introduced
-      in this chapter. You will of course also be presented many more useful features, such as the
-      ones listed above. Have fun!
+      <p>You probably want to get started on your own first test suites now, while
+      at the same time digging deeper into the <c>Common Test</c> User's Guide and Reference Manual.
+      There are much more to learn about the things that have been introduced
+      in this section. There are also many other useful features to learn, 
+      so please continue to the other sections and have fun.
       </p>
     </section>
 </chapter>
diff --git a/lib/common_test/doc/src/install_chapter.xml b/lib/common_test/doc/src/install_chapter.xml
index 107b0e2eac..9dce1e31a4 100644
--- a/lib/common_test/doc/src/install_chapter.xml
+++ b/lib/common_test/doc/src/install_chapter.xml
@@ -32,22 +32,23 @@
 
   <section>
     <marker id="general"></marker>
-    <title>General information</title>
-
-    <p>The two main interfaces for running tests with Common Test
-      are an executable program named <c>ct_run</c> and an
-      erlang module named <c>ct</c>. The ct_run program
-      is compiled for the underlying operating system (e.g. Unix/Linux
-      or Windows) during the build of the Erlang/OTP system, and is
-      installed automatically with other executable programs in
+    <title>General Information</title>
+
+    <p>The two main interfaces for running tests with <c>Common Test</c>
+      are an executable program named 
+      <seealso marker="ct_run"><c>ct_run</c></seealso> and the
+      Erlang module <seealso marker="ct"><c>ct</c></seealso>. 
+      <c>ct_run</c> is compiled for the underlying operating system (for example,
+      Unix/Linux or Windows) during the build of the Erlang/OTP system, 
+      and is installed automatically with other executable programs in
       the top level <c>bin</c> directory of Erlang/OTP.
       The <c>ct</c> interface functions can be called from the Erlang shell,
       or from any Erlang function, on any supported platform.</p>
 
-    <p>The Common Test application is installed with the Erlang/OTP
-      system and no additional installation step is required to start using
-      Common Test by means of the <c>ct_run</c> executable program, and/or
-      the interface functions in the <c>ct</c> module.</p>
+    <p>The <c>Common Test</c> application is installed with the Erlang/OTP
+      system. No extra installation step is required to start using
+      <c>Common Test</c> through the <c>ct_run</c> executable program, 
+      and/or the interface functions in the <c>ct</c> module.</p>
     </section>
 </chapter>
 
diff --git a/lib/common_test/doc/src/introduction.xml b/lib/common_test/doc/src/introduction.xml
new file mode 100644
index 0000000000..e2a42bfd33
--- /dev/null
+++ b/lib/common_test/doc/src/introduction.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2003</year><year>2013</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+    
+    </legalnotice>
+
+    <title>Introduction</title>
+    <prepared></prepared>
+    <docno></docno>
+    <date>2015-10-05</date>
+    <rev></rev>
+    <file>introduction.xml</file>
+  </header>
+   <section>
+    <title>Scope</title>
+      <p><c>Common Test</c> is a portable application for automated 
+      testing. It is suitable for:</p>
+      <list type="bulleted">
+         <item><p>Black-box testing of target systems of any type (that
+           is, not necessarily implemented in Erlang). This is performed
+           through standard O&amp;M interfaces (such as SNMP, HTTP, CORBA,
+           and Telnet) and, if necessary, through user-specific interfaces
+           (often called test ports).</p></item>
+         <item><p>White-box testing of Erlang/OTP programs. This is easily
+           done by calling the target API functions directly from the test
+           case functions.</p></item>
+      </list>
+      <p><c>Common Test</c> also integrates use of the OTP
+      <seealso marker="tools:cover">cover</seealso> tool in application 
+      <c>Tools</c> for code coverage analysis of Erlang/OTP programs.</p>
+      
+      <p><c>Common Test</c> executes test suite programs automatically,
+      without operator interaction. Test progress and results are
+      printed to logs in HTML format, easily browsed with a standard
+      web browser. <c>Common Test</c> also sends notifications about progress
+      and results through an OTP event manager to event handlers plugged
+      in to the system. This way, users can integrate their own
+      programs for, for example, logging, database storing, or supervision with
+      <c>Common Test</c>.</p>
+
+      <p><c>Common Test</c> provides libraries with useful support 
+      functions to fill various testing needs and requirements. 
+      There is, for example, support for flexible test declarations 
+      through test specifications. There is also support 
+      for central configuration and control of multiple 
+      independent test sessions (to different target systems)
+      running in parallel.</p>
+
+  </section>
+
+  <section>
+    <title>Prerequisites</title>
+    <p>It is assumed that the reader is familiar with the Erlang
+      programming language.</p >
+  </section>
+
+</chapter>
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 9906db2c90..ff51b101cc 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,6 +33,111 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.12</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    This update fixes the problem with generic printouts in
+	    the html log file not having special characters escaped.
+	    Printouts made with <c>io:format/2</c> and
+	    <c>ct:pal/2</c> will now get special characters escaped
+	    automatically. Common Test will not attempt to escape
+	    characters printed with <c>ct:log/2</c> since it is
+	    assumed that the user may want to print html tagged data
+	    using this function. A new function, <c>ct:log/5</c>, has
+	    been added, which offers optional escaping of characters.
+	    The latter function may also be used to print text to the
+	    log without headers and CSS class wrapping (analogue to
+	    <c>io:format/2</c>).</p>
+          <p>
+	    Own Id: OTP-13003 Aux Id: seq13005 </p>
+        </item>
+        <item>
+          <p>
+	    Commit 4cf832f1ad163f5b25dd8a6f2d314c169c23c82f
+	    erroneously removed logging of open and close of netconf
+	    connections. This is now corrected.</p>
+          <p>
+	    Own Id: OTP-13386</p>
+        </item>
+        <item>
+          <p>
+	    The directory to which nodes started with
+	    <c>test_server:start_node/3</c> writes their
+	    erl_crash.dump is changed. The crashdumps were earlier
+	    written to the directory of test_server.beam, but in
+	    later versions of Microsoft Windows this is no longer
+	    writable (even for administrators). The framework
+	    (common_test) log directory is now used instead.</p>
+          <p>
+	    Own Id: OTP-13388</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    This update makes it possible to specify multiple
+	    instances of the same group or test case in one test
+	    specification term in order to repeat execution. Example:
+	    <c>{groups, "./", my_SUITE, [my_group, my_group], {cases,
+	    all}}, or {cases, "./", my_SUITE, [my_tc, my_tc,
+	    my_tc]}.</c></p>
+          <p>
+	    Own Id: OTP-13241 Aux Id: seq12979 </p>
+        </item>
+        <item>
+          <p>
+	    Two new CT hook functions have been added:
+	    <c>post_init_per_testcase/4</c> and
+	    <c>pre_end_per_testcase/3</c>. With these hook functions,
+	    it is possible to perform arbitrary actions (including
+	    modifications of test execution, test state and results)
+	    immediately before and after the execution of the test
+	    case.</p>
+          <p>
+	    Own Id: OTP-13242 Aux Id: seq12991 </p>
+        </item>
+        <item>
+          <p>
+	    The <c>ct_netconfc</c> was earlier very restrictive as to
+	    which SSH options the user could set. This is now
+	    changed, and any SSH option is now allowed. The netconf
+	    client will simply pass on any option, which it does not
+	    recognize, to SSH.</p>
+          <p>
+	    Own Id: OTP-13338 Aux Id: seq13053,seq13069 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.11.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    If a ssh package contained more than one netconf end tag,
+	    then the second end tag was never detected in
+	    ct_netconfc:handle_data. Instead it was included in the
+	    XML data given to the xmerl parser, which then failed.
+	    The problem was introduced by OTP-13007, and has now been
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-13323</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.11.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/doc/src/part.xml b/lib/common_test/doc/src/part.xml
index 0f4c448787..41e74e57c6 100644
--- a/lib/common_test/doc/src/part.xml
+++ b/lib/common_test/doc/src/part.xml
@@ -31,40 +31,9 @@
   </header>
   
   <description>
-      <p><em>Common Test</em> is a portable application for automated 
-      testing. It is suitable for black-box testing of target
-      systems of any type (i.e. not necessarily implemented in Erlang),
-      as well as for white-box testing of Erlang/OTP programs.
-      Black-box testing is performed via standard O&amp;M 
-      interfaces (such as SNMP, HTTP, Corba, Telnet, etc) and,
-      if required, via user specific interfaces (often called test 
-      ports). White-box testing of Erlang/OTP programs is easily
-      accomplished by calling the target API functions directly
-      from the test case functions. Common Test also integrates 
-      usage of the OTP cover tool for code coverage analysis of 
-      Erlang/OTP programs.</p>
-      
-      <p>Common Test executes test suite programs automatically,
-      without operator interaction. Test progress and results is
-      printed to logs on HTML format, easily browsed with a standard
-      web browser. Common Test also sends notifications about progress
-      and results via an OTP event manager to event handlers plugged
-      in to the system. This way users can integrate their own
-      programs for e.g. logging, database storing or supervision with
-      Common Test.</p>
-
-      <p>Common Test provides libraries that contain useful support 
-      functions to fill various testing needs and requirements. 
-      There is for example support for flexible test declarations 
-      by means of so called test specifications. There is also support 
-      for central configuration and control of multiple 
-      independent test sessions (towards different target systems)
-      running in parallel.</p>
-
-      <p>Common Test is implemented as a framework based on the OTP Test 
-      Server application.</p>
   </description>
 
+  <xi:include href="introduction.xml"/>
   <xi:include href="basics_chapter.xml"/>
   <xi:include href="getting_started_chapter.xml"/>
   <xi:include href="install_chapter.xml"/>
diff --git a/lib/common_test/doc/src/ref_man.xml b/lib/common_test/doc/src/ref_man.xml
index f98e2475a9..19960bfea7 100644
--- a/lib/common_test/doc/src/ref_man.xml
+++ b/lib/common_test/doc/src/ref_man.xml
@@ -30,43 +30,10 @@
     <file>ref_man.xml</file>
   </header>
   <description>
-      <p><em>Common Test</em> is a portable application for automated 
-      testing. It is suitable for black-box testing of target
-      systems of any type (i.e. not necessarily implemented in Erlang),
-      as well as for white-box testing of Erlang/OTP programs.
-      Black-box testing is performed via standard O&amp;M 
-      interfaces (such as SNMP, HTTP, Corba, Telnet, etc) and,
-      if required, via user specific interfaces (often called test 
-      ports). White-box testing of Erlang/OTP programs is easily
-      accomplished by calling the target API functions directly
-      from the test case functions. Common Test also integrates 
-      usage of the OTP cover tool for code coverage analysis of 
-      Erlang/OTP programs.</p>
-      
-      <p>Common Test executes test suite programs automatically,
-      without operator interaction. Test progress and results is
-      printed to logs on HTML format, easily browsed with a standard
-      web browser. Common Test also sends notifications about progress
-      and results via an OTP event manager to event handlers plugged
-      in to the system. This way users can integrate their own
-      programs for e.g. logging, database storing or supervision with
-      Common Test.</p>
-
-      <p>Common Test provides libraries that contain useful support 
-      functions to fill various testing needs and requirements. 
-      There is for example support for flexible test declarations 
-      by means of so called test specifications. There is also support 
-      for central configuration and control of multiple 
-      independent test sessions (towards different target systems)
-      running in parallel.</p>
-
-      <p>Common Test is implemented as a framework based on the OTP Test 
-      Server application.</p>
   </description>
+
   <xi:include href="common_test_app.xml"/>
   <xi:include href="ct_run.xml"/>
-  <!-- If you make modifications in the module list below,
-       you also need to update CT_MODULES in Makefile. -->
   <xi:include href="ct.xml"/>
   <xi:include href="ct_master.xml"/>
   <xi:include href="ct_cover.xml"/>
@@ -83,6 +50,3 @@
 </application>
 
 
-
-
-
diff --git a/lib/common_test/doc/src/run_test_chapter.xml b/lib/common_test/doc/src/run_test_chapter.xml
index 082a587c8d..e04bb3e208 100644
--- a/lib/common_test/doc/src/run_test_chapter.xml
+++ b/lib/common_test/doc/src/run_test_chapter.xml
@@ -33,95 +33,96 @@
   <section>
     <title>Using the Common Test Framework</title>
 
-    <p>The Common Test Framework provides a high level
-    operator interface for testing. It adds the following features to
-    the Erlang/OTP Test Server:</p>
-
-    <list>
-	<item>Automatic compilation of test suites (and help modules).</item>
-	<item>Creation of additional HTML pages for better overview.</item>
-	<item>Single command interface for running all available tests.</item>
+    <p>The <c>Common Test</c> framework provides a high-level
+    operator interface for testing, providing the following features:</p>
+
+    <list type="bulleted">
+	<item>Automatic compilation of test suites (and help modules)</item>
+	<item>Creation of extra HTML pages for improved overview.</item>
+	<item>Single-command interface for running all available tests</item>
 	<item>Handling of configuration files specifying data related to
-	  the System Under Test (and any other variable data).</item>
+	  the System Under Test (SUT) (and any other variable data)</item>
 	<item>Mode for running multiple independent test sessions in parallel with
-	  central control and configuration.</item>	
+	  central control and configuration</item>	
       </list>
   </section>
 
   <section>
-    <title>Automatic compilation of test suites and help modules</title>
-    <p>When Common Test starts, it will automatically attempt to compile any
+    <title>Automatic Compilation of Test Suites and Help Modules</title>
+    <p>When <c>Common Test</c> starts, it automatically attempts to compile any
       suites included in the specified tests. If particular
-      suites have been specified, only those suites will be compiled. If a
-      particular test object directory has been specified (meaning all suites
-      in this directory should be part of the test), Common Test runs
-      make:all/1 in the directory to compile the suites.</p>
+      suites are specified, only those suites are compiled. If a
+      particular test object directory is specified (meaning all suites
+      in this directory are to be part of the test), <c>Common Test</c> runs
+      function <c>make:all/1</c> in the directory to compile the suites.</p>
 
-    <p>If compilation should fail for one or more suites, the compilation errors
-      are printed to tty and the operator is asked if the test run should proceed
+    <p>If compilation fails for one or more suites, the compilation errors
+      are printed to tty and the operator is asked if the test run is to proceed
       without the missing suites, or be aborted. If the operator chooses to proceed, 
-      it is noted in the HTML log which tests have missing suites. Also, for each failed
-      compilation, the failed tests counter in the return value of
-      <c><![CDATA[ct:run_test/1]]></c> is incremented. If Common Test is unable to prompt
-      the user after compilation failure (if Common Test doesn't control stdin), the test
-      run will proceed automatically without the missing suites. In order to always
-      abort the test run (without operator interaction) if one or more suites fail
-      to compile, the <c><![CDATA[ct_run]]></c> flag <c><![CDATA[-abort_if_missing_suites]]></c>, 
-      or the <c><![CDATA[ct:run_test/1]]></c> option
-      <c><![CDATA[{abort_if_missing_suites,true}]]></c> should be set.</p>
-
-    <p>Any help module (i.e. regular Erlang module with name not ending with
-      "_SUITE") that resides in the same test object directory as a suite 
-      which is part of the test, will also be automatically compiled. A help
-      module will not be mistaken for a test suite (unless it has a "_SUITE"
-      name of course). All help modules in a particular test object directory
-      are compiled no matter if all or only particular suites in the directory 
+      the tests having missing suites are noted in the HTML log. If <c>Common Test</c> is
+      unable to prompt the user after compilation failure (if <c>Common Test</c> does not
+      control <c>stdin</c>), the test run proceeds automatically without the missing
+      suites. This behavior can however be modified with the
+      <c><![CDATA[ct_run]]></c> flag <c><![CDATA[-abort_if_missing_suites]]></c>, 
+      or the <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> option
+      <c><![CDATA[{abort_if_missing_suites,TrueOrFalse}]]></c>. If 
+      <c><![CDATA[abort_if_missing_suites]]></c> is set to <c>true</c>, the test run
+      stops immediately if some suites fail to compile.</p>
+
+    <p>Any help module (that is, regular Erlang module with name not ending with
+      "_SUITE") that resides in the same test object directory as a suite, 
+      which is part of the test, is also automatically compiled. A help
+      module is not mistaken for a test suite (unless it has a "_SUITE" name).
+      All help modules in a particular test object directory
+      are compiled, no matter if all or only particular suites in the directory 
       are part of the test.</p>
 
     <p>If test suites or help modules include header files stored in other
-      locations than the test directory, you may specify these include directories
-      by means of the <c><![CDATA[-include]]></c> flag with <c><![CDATA[ct_run]]></c>, 
-      or the <c><![CDATA[include]]></c> option with <c><![CDATA[ct:run_test/1]]></c>.
-      In addition to this, an include path may be specified with an OS
-      environment variable; <c><![CDATA[CT_INCLUDE_PATH]]></c>. Example (bash):</p>
+      locations than the test directory, these include directories can be specified
+      by using flag <c><![CDATA[-include]]></c> with 
+      <seealso marker="ct_run"><c>ct_run</c></seealso>, 
+      or option <c><![CDATA[include]]></c> with <c><![CDATA[ct:run_test/1]]></c>.
+      Also, an include path can be specified with an OS
+      environment variable, <c><![CDATA[CT_INCLUDE_PATH]]></c>.</p>
+      <p><em>Example (bash):</em></p>
 
     <p><c>$ export CT_INCLUDE_PATH=~testuser/common_suite_files/include:~testuser/common_lib_files/include</c></p>
 
-    <p>Common Test will pass all include directories (specified either with the
-      <c><![CDATA[include]]></c> flag/option, or the <c><![CDATA[CT_INCLUDE_PATH]]></c>
-      variable, or both) to the compiler.</p>
+    <p><c>Common Test</c> passes all include directories (specified either with flag/option
+      <c><![CDATA[include]]></c>, or variable <c><![CDATA[CT_INCLUDE_PATH]]></c>
+      , or both, to the compiler.</p>
 
-    <p>It is also possible to specify include directories in test specifications 
-      (see below).</p>
+    <p>Include directories can also be specified in test specifications,
+      see <seealso marker="#test_specifications">Test Specifications</seealso>.</p>
 
-    <p>If the user wants to run all test suites for a test object (or OTP application)
-      by specifying only the top directory (e.g. with the <c>dir</c> start flag/option),
-      Common Test will primarily look for test suite modules in a subdirectory named 
-      <c>test</c>. If this subdirectory doesn't exist, the specified top directory
-      is assumed to be the actual test directory, and test suites will be read from
+    <p>If the user wants to run all test suites for a test object (or an OTP application)
+      by specifying only the top directory (for example, with start flag/option <c>dir</c>),
+      <c>Common Test</c> primarily looks for test suite modules in a subdirectory named 
+      <c>test</c>. If this subdirectory does not exist, the specified top directory
+      is assumed to be the test directory, and test suites are read from
       there instead.</p>
 
-    <p>It is possible to disable the automatic compilation feature by using the
-      <c><![CDATA[-no_auto_compile]]></c> flag with <c><![CDATA[ct_run]]></c>, or
-      the <c><![CDATA[{auto_compile,false}]]></c> option with 
+    <p>To disable the automatic compilation feature, use flag
+      <c><![CDATA[-no_auto_compile]]></c> with <c><![CDATA[ct_run]]></c>, or
+      option <c><![CDATA[{auto_compile,false}]]></c> with 
       <c><![CDATA[ct:run_test/1]]></c>. With automatic compilation
       disabled, the user is responsible for compiling the test suite modules 
-      (and any help modules) before the test run. If the modules can not be loaded
-      from the local file system during startup of Common Test, the user needs to
-      pre-load the modules before starting the test. Common Test will only verify
-      that the specified test suites exist (i.e. that they are, or can be, loaded).
-      This is useful e.g. if the test suites are transferred and loaded as binaries via
-      RPC from a remote node.</p>
+      (and any help modules) before the test run. If the modules cannot be loaded
+      from the local file system during startup of <c>Common Test</c>, the user must
+      preload the modules before starting the test. <c>Common Test</c> only verifies
+      that the specified test suites exist (that is, that they are, or can be, loaded).
+      This is useful, for example, if the test suites are transferred and loaded as 
+      binaries through RPC from a remote node.</p>
   </section>
 
   <section>
   <marker id="ct_run"></marker>
-    <title>Running tests from the OS command line</title>
+    <title>Running Tests from the OS Command Line</title>
     
-    <p>The <c>ct_run</c> program can be used for running tests from
-      the OS command line, e.g.
+    <p>The <seealso marker="ct_run"><c>ct_run</c></seealso> program can be used 
+       for running tests from the OS command line, for example, as follows:
     </p>
-    <list>
+    <list type="bulleted">
       <item><c><![CDATA[ct_run -config <configfilenames> -dir <dirs>]]></c></item>
       <item><c><![CDATA[ct_run -config <configfilenames> -suite <suiteswithfullpath>]]></c>
       </item>
@@ -130,824 +131,917 @@
       <item><c><![CDATA[ct_run -config <configfilenames> -suite <suitewithfullpath>
 	      -group <groups> -case <casenames>]]></c></item>
     </list>
-    <p>Examples:</p>
-    <p><c>$ ct_run -config $CFGS/sys1.cfg $CFGS/sys2.cfg -dir $SYS1_TEST $SYS2_TEST</c></p>
-    <p><c>$ ct_run -userconfig ct_config_xml $CFGS/sys1.xml $CFGS/sys2.xml -dir $SYS1_TEST $SYS2_TEST</c></p>
-    <p><c>$ ct_run -suite $SYS1_TEST/setup_SUITE $SYS2_TEST/config_SUITE</c></p>
-    <p><c>$ ct_run -suite $SYS1_TEST/setup_SUITE -case start stop</c></p>
-    <p><c>$ ct_run -suite $SYS1_TEST/setup_SUITE -group installation -case start stop</c></p>
+    <p><em>Examples:</em></p>
+    <pre>
+ $ ct_run -config $CFGS/sys1.cfg $CFGS/sys2.cfg -dir $SYS1_TEST $SYS2_TEST
+ $ ct_run -userconfig ct_config_xml $CFGS/sys1.xml $CFGS/sys2.xml -dir $SYS1_TEST $SYS2_TEST
+ $ ct_run -suite $SYS1_TEST/setup_SUITE $SYS2_TEST/config_SUITE
+ $ ct_run -suite $SYS1_TEST/setup_SUITE -case start stop
+ $ ct_run -suite $SYS1_TEST/setup_SUITE -group installation -case start stop</pre>
     
-    <p>It is also possible to combine the <c>dir</c>, <c>suite</c> and <c>group/case</c> flags. E.g, to run
-    <c>x_SUITE</c> and <c>y_SUITE</c> in directory <c>testdir</c>:</p>
-
-    <p><c>$ ct_run -dir ./testdir -suite x_SUITE y_SUITE</c></p>
-
-    <p>This has the same effect as calling:</p>
-
-    <p><c>$ ct_run -suite ./testdir/x_SUITE ./testdir/y_SUITE</c></p>
-
-    <p>For more details on <seealso marker="run_test_chapter#group_execution">test case group execution</seealso>, please see below.</p>
-
-    <p>Other flags that may be used with <c>ct_run</c>:</p>
-    <list>
-      <item><c><![CDATA[-help]]></c>, lists all available start flags.</item>
-      <item><c><![CDATA[-logdir <dir>]]></c>, specifies where the HTML log files are to be written.</item>
-      <item><c><![CDATA[-label <name_of_test_run>]]></c>, associates the test run with a name that gets printed
-	in the overview HTML log files.</item>
-      <item><c>-refresh_logs</c>, refreshes the top level HTML index files.</item>
-      <item><c>-vts</c>, start web based GUI (see below).</item>
-      <item><c>-shell</c>, start interactive shell mode (see below).</item>
-      <item><c>-step [step_opts]</c>, step through test cases using the Erlang Debugger (see below).</item>
-      <item><c><![CDATA[-spec <testspecs>]]></c>, use test specification as input (see below).</item>
-      <item><c>-allow_user_terms</c>, allows user specific terms in a test specification (see below).</item>
-      <item><c>-silent_connections [conn_types]</c>, tells Common Test to suppress printouts for
-        specified connections (see below).</item>
-      <item><c><![CDATA[-stylesheet <css_file>]]></c>, points out a user HTML style sheet (see below).</item>
-      <item><c><![CDATA[-cover <cover_cfg_file>]]></c>, to perform code coverage test (see 
-	<seealso marker="cover_chapter#cover">Code Coverage Analysis</seealso>).</item>
-      <item><c><![CDATA[-cover_stop <bool>]]></c>, to specify if the cover tool shall be stopped after the test is completed (see
-	<seealso marker="cover_chapter#cover_stop">Code Coverage Analysis</seealso>).</item>
-      <item><c><![CDATA[-event_handler <event_handlers>]]></c>, to install 
-        <seealso marker="event_handler_chapter#event_handling">event handlers</seealso>.</item>
-      <item><c><![CDATA[-event_handler_init <event_handlers>]]></c>, to install
-        <seealso marker="event_handler_chapter#event_handling">event handlers</seealso> including start arguments.</item>
-      <item><c><![CDATA[-ct_hooks <ct_hooks>]]></c>, to install
-        <seealso marker="ct_hooks_chapter#installing">Common Test Hooks</seealso> including start arguments.</item>
-      <item><c><![CDATA[-enable_builtin_hooks <bool>]]></c>, to enable/disable
-        <seealso marker="ct_hooks_chapter#builtin_cths">Built-in Common Test Hooks</seealso>. Default is <c>true</c>.</item>
-      <item><c><![CDATA[-include]]></c>, specifies include directories (see above).</item>
-      <item><c><![CDATA[-no_auto_compile]]></c>, disables the automatic test suite compilation feature (see above).</item>
-      <item><c><![CDATA[-abort_if_missing_suites]]></c>, aborts the test run if one or more suites fail to compile (see above).</item>
-      <item><c><![CDATA[-multiply_timetraps <n>]]></c>, extends <seealso marker="write_test_chapter#timetraps">timetrap
-	  timeout</seealso> values.</item>
-      <item><c><![CDATA[-scale_timetraps <bool>]]></c>, enables automatic <seealso marker="write_test_chapter#timetraps">timetrap
-	  timeout</seealso> scaling.</item>
-      <item><c><![CDATA[-repeat <n>]]></c>, tells Common Test to repeat the tests n times (see below).</item> 
-      <item><c><![CDATA[-duration <time>]]></c>, tells Common Test to repeat the tests for duration of time (see below).</item> 
-      <item><c><![CDATA[-until <stop_time>]]></c>, tells Common Test to repeat the tests until stop_time (see below).</item> 
-      <item><c>-force_stop [skip_rest]</c>, on timeout, the test run will be aborted when current test job is finished. If <c>skip_rest</c> is provided the rest of the test cases in the current test job will be skipped (see below).</item>
-      <item><c><![CDATA[-decrypt_key <key>]]></c>, provides a decryption key for 
-        <seealso marker="config_file_chapter#encrypted_config_files">encrypted configuration files</seealso>.</item>
-      <item><c><![CDATA[-decrypt_file <key_file>]]></c>, points out a file containing a decryption key for 
-        <seealso marker="config_file_chapter#encrypted_config_files">encrypted configuration files</seealso>.</item>
-      <item><c><![CDATA[-basic_html]]></c>, switches off html enhancements that might not be compatible with older browsers.</item>
-      <item><c><![CDATA[-logopts <opts>]]></c>, makes it possible to modify aspects of the logging behaviour, see
-        <seealso marker="run_test_chapter#logopts">Log options</seealso> below.</item>
-      <item><c><![CDATA[-verbosity <levels>]]></c>, sets <seealso marker="write_test_chapter#logging">verbosity levels
-      for printouts</seealso>.</item>
-    </list>
+    <p>The flags <c>dir</c>, <c>suite</c>, and <c>group/case</c> can be combined.
+    For example, to run <c>x_SUITE</c> and <c>y_SUITE</c> 
+    in directory <c>testdir</c>, as follows:</p>
+    <pre>
+ $ ct_run -dir ./testdir -suite x_SUITE y_SUITE</pre>
+
+    <p>This has the same effect as the following:</p>
+    <pre>
+ $ ct_run -suite ./testdir/x_SUITE ./testdir/y_SUITE</pre>
+
+    <p>For details, see 
+    <seealso marker="run_test_chapter#group_execution">Test Case Group Execution</seealso>.</p>
+
+    <p>The following flags can also be used with 
+    <seealso marker="ct_run"><c>ct_run</c></seealso>:</p>
+    <taglist>
+      <tag><c><![CDATA[-help]]></c></tag>
+      <item><p>Lists all available start flags.</p></item>
+
+      <tag><c><![CDATA[-logdir <dir>]]></c></tag>
+      <item><p>Specifies where the HTML log files are to be written.</p></item>
+
+      <tag><c><![CDATA[-label <name_of_test_run>]]></c></tag>
+      <item><p>Associates the test run with a name that gets printed
+	in the overview HTML log files.</p></item>
+
+      <tag><c>-refresh_logs</c></tag>
+      <item><p>Refreshes the top-level HTML index files.</p></item>
+
+      <tag><c>-vts</c></tag>
+      <item><p>Starts web-based GUI (described later).</p></item>
+
+      <tag><c>-shell</c></tag>
+      <item><p>Starts interactive shell mode (described later).</p></item>
+
+      <tag><c>-step [step_opts]</c></tag>
+      <item><p>Steps through test cases using the Erlang Debugger (described later).</p></item>
+
+      <tag><c><![CDATA[-spec <testspecs>]]></c></tag>
+      <item><p>Uses test specification as input (described later).</p></item>
+
+      <tag><c>-allow_user_terms</c></tag>
+      <item><p>Allows user-specific terms in a test specification (described later).</p></item>
+
+      <tag><c>-silent_connections [conn_types]</c></tag>
+      <item><p>, tells <c>Common Test</c> to suppress printouts for
+        specified connections (described later).</p></item>
+
+      <tag><c><![CDATA[-stylesheet <css_file>]]></c></tag>
+      <item><p>Points out a user HTML style sheet (described later).</p></item>
+
+      <tag><c><![CDATA[-cover <cover_cfg_file>]]></c></tag>
+      <item><p>To perform code coverage test (see 
+	<seealso marker="cover_chapter#cover">Code Coverage Analysis</seealso>).</p></item>
+
+      <tag><c><![CDATA[-cover_stop <bool>]]></c></tag>
+      <item><p>To specify if the <c>cover</c> tool is to be stopped 
+      after the test is completed (see
+	<seealso marker="cover_chapter#cover_stop">Code Coverage Analysis</seealso>).</p></item>
+
+      <tag><c><![CDATA[-event_handler <event_handlers>]]></c></tag>
+      <item><p>To install 
+        <seealso marker="event_handler_chapter#event_handling">event handlers</seealso>.</p></item>
+
+      <tag><c><![CDATA[-event_handler_init <event_handlers>]]></c></tag>
+      <item><p>To install
+        <seealso marker="event_handler_chapter#event_handling">event handlers</seealso> 
+      including start arguments.</p></item>
+
+      <tag><c><![CDATA[-ct_hooks <ct_hooks>]]></c></tag>
+      <item><p>To install
+        <seealso marker="ct_hooks_chapter#installing">Common Test Hooks</seealso> 
+      including start arguments.</p></item>
 
-    <note><p>Directories passed to Common Test may have either relative or absolute paths.</p></note>
+      <tag><c><![CDATA[-enable_builtin_hooks <bool>]]></c></tag>
+      <item><p>To enable or disable
+        <seealso marker="ct_hooks_chapter#builtin_cths">Built-in Common Test Hooks</seealso>. 
+      Default is <c>true</c>.</p></item>
 
-    <note><p>Arbitrary start flags to the Erlang Runtime System may also be passed as
+      <tag><c><![CDATA[-include]]></c></tag>
+      <item><p>Specifies include directories (described earlier).</p></item>
+
+      <tag><c><![CDATA[-no_auto_compile]]></c></tag>
+      <item><p>Disables the automatic test suite compilation feature (described earlier).</p></item>
+
+      <tag><c><![CDATA[-abort_if_missing_suites]]></c></tag>
+      <item><p>Aborts the test run if one or more suites fail to compile (described earlier).</p></item>
+
+      <tag><c><![CDATA[-multiply_timetraps <n>]]></c></tag>
+      <item><p>Extends <seealso marker="write_test_chapter#timetraps">timetrap
+	  time-out</seealso> values.</p></item>
+
+      <tag><c><![CDATA[-scale_timetraps <bool>]]></c></tag>	  
+      <item><p>Enables automatic <seealso marker="write_test_chapter#timetraps">timetrap
+	  time-out</seealso> scaling.</p></item>
+
+      <tag><c><![CDATA[-repeat <n>]]></c></tag>
+      <item><p>Tells <c>Common Test</c> to repeat the tests <c>n</c> times (described later).</p></item> 
+
+      <tag><c><![CDATA[-duration <time>]]></c></tag>
+      <item><p>Tells <c>Common Test</c> to repeat the tests for duration of time (described later).</p></item> 
+
+      <tag><c><![CDATA[-until <stop_time>]]></c></tag>
+      <item><p>Tells <c>Common Test</c> to repeat the tests until <c>stop_time</c> (described later).</p></item>
+
+      <tag><c>-force_stop [skip_rest]</c></tag>
+      <item><p>On time-out, the test run is aborted when the current test job is finished. If <c>skip_rest</c> 
+      is provided, the remaining test cases in the current test job are skipped (described later).</p></item>
+
+      <tag><c><![CDATA[-decrypt_key <key>]]></c></tag>
+      <item><p>Provides a decryption key for 
+      <seealso marker="config_file_chapter#encrypted_config_files">encrypted configuration files</seealso>.</p></item>
+
+      <tag><c><![CDATA[-decrypt_file <key_file>]]></c></tag>
+      <item><p>Points out a file containing a decryption key for 
+        <seealso marker="config_file_chapter#encrypted_config_files">encrypted configuration files</seealso>.</p></item>
+
+      <tag><c><![CDATA[-basic_html]]></c></tag>
+      <item><p>Switches off HTML enhancements that can be incompatible with older browsers.</p></item>
+
+      <tag><c><![CDATA[-logopts <opts>]]></c></tag>
+      <item><p>Enables modification of the logging behavior, see
+      <seealso marker="run_test_chapter#logopts">Log options</seealso>.</p></item>
+
+      <tag><c><![CDATA[-verbosity <levels>]]></c></tag>
+      <item><p>Sets <seealso marker="write_test_chapter#logging">verbosity levels
+      for printouts</seealso>.</p></item>
+    </taglist>
+
+    <note><p>Directories passed to <c>Common Test</c> can have either relative or absolute paths.</p></note>
+
+    <note><p>Any start flags to the Erlang runtime system (application <c>ERTS</c>) can also be passed as
              parameters to <c>ct_run</c>. It is, for example, useful to be able to
-	     pass directories that should be added to the Erlang code server search path
-	     with the <c>-pa</c> or <c>-pz</c> flag. If you have common help- or library 
+	     pass directories to be added to the Erlang code server search path
+	     with flag <c>-pa</c> or <c>-pz</c>. If you have common help- or library 
 	     modules for test suites (separately compiled), stored in other directories 
-	     than the test suite directories, these help/lib directories are preferrably
-	     added to the code path this way. Example:</p>
+	     than the test suite directories, these <c>help/lib</c> directories are preferably
+	     added to the code path this way.</p>
+	     <p><em>Example:</em></p>
 	  <p><c>$ ct_run -dir ./chat_server -logdir ./chat_server/testlogs -pa $PWD/chat_server/ebin</c></p>
-	  <p>Note how in this example, the absolute path of the <c>chat_server/ebin</c>
-	     directory is passed to the code server. This is essential since relative
-	     paths are stored by the code server as relative, and Common Test changes 
-	     the current working directory of the Erlang Runtime System during the test run!</p>
+	  <p>The absolute path of directory <c>chat_server/ebin</c>
+	     is here passed to the code server. This is essential because relative
+	     paths are stored by the code server as relative, and <c>Common Test</c> changes 
+	     the current working directory of <c>ERTS</c> during the test run.</p>
     </note>
     
     <p>The <c>ct_run</c> program sets the exit status before shutting down. The following values
       are defined:</p>
-    <list>
-      <item><c>0</c> indicates a successful testrun, i.e. one without failed or auto skipped test cases.</item>
-      <item><c>1</c> indicates that one or more test cases have failed, or have been auto skipped.</item>
-      <item><c>2</c> indicates that the test execution has failed because of e.g. compilation errors, an
-	illegal return value from an info function, etc.</item>
+    <list type="bulleted">
+      <item><c>0</c> indicates a successful testrun, that is, without failed or auto-skipped test cases.</item>
+      <item><c>1</c> indicates that one or more test cases have failed, or have been auto-skipped.</item>
+      <item><c>2</c> indicates that the test execution has failed because of, for example, compilation errors, or an
+	illegal return value from an information function.</item>
     </list>
-    <p>If auto skipped test cases should not affect the exit status, you may change the default
-      behaviour using start flag:</p>
-    <pre>-exit_status ignore_config</pre>
+    <p>If auto-skipped test cases do not affect the exit status. The default
+      behavior can be changed using start flag:</p>
+    <pre>
+ -exit_status ignore_config</pre>
     
-    <note><p>Executing <c>ct_run</c> without start flags, is equal to the command:
+    <note><p>Executing <c>ct_run</c> without start flags is equal to the command:
     <c>ct_run -dir ./</c></p></note>
 
-    <p>For more information about the <c>ct_run</c> program, see the
-      <seealso marker="ct_run">Reference Manual</seealso> and the
-      <seealso marker="install_chapter#general">Installation</seealso> chapter.
+    <p>For more information about the <c>ct_run</c> program, see module
+      <seealso marker="ct_run"><c>ct_run</c></seealso> and section
+      <seealso marker="install_chapter#general">Installation</seealso>.
     </p>
   </section>
     
   <section>
-    <title>Running tests from the Erlang shell or from an Erlang program</title>
+    <marker id="erlang_shell_or_program"></marker>
+    <title>Running Tests from the Erlang Shell or from an Erlang Program</title>
     
-    <p>Common Test provides an Erlang API for running tests. The main (and most
-      flexible) function for specifying and executing tests is called
+    <p><c>Common Test</c> provides an Erlang API for running tests. The main 
+      (and most flexible) function for specifying and executing tests is
       <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>.
-      This function takes the same start parameters as
-      the <seealso marker="run_test_chapter#ct_run"><c>ct_run</c></seealso>
-      program described above, only the flags are instead
-      given as options in a list of key-value tuples. E.g. a test specified 
-      with <c>ct_run</c> like:</p>
+      It takes the same start parameters as
+      <seealso marker="run_test_chapter#ct_run"><c>ct_run</c></seealso>,
+      but the flags are instead specified as options in a list of key-value tuples. 
+      For example, a test specified with <c>ct_run</c> as follows:</p>
 
       <p><c>$ ct_run -suite ./my_SUITE -logdir ./results</c></p> 
       <p>is with <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> specified as:</p>
       <p><c>1> ct:run_test([{suite,"./my_SUITE"},{logdir,"./results"}]).</c></p>
 
-      <p>The function returns the test result, represented by the tuple:
+      <p>The function returns the test result, represented by the tuple
 	<c>{Ok,Failed,{UserSkipped,AutoSkipped}}</c>, where each element is an
-	integer. If test execution fails, the function returns the tuple:
+	integer. If test execution fails, the function returns the tuple
 	<c>{error,Reason}</c>, where the term <c>Reason</c> explains the
 	failure.</p>
 
-      <p>The default start option <c>{dir,Cwd}</c> (run all suites in the current
+      <p>The default start option <c>{dir,Cwd}</c> (to run all suites in the current
       working directory) is used if the function is called with an empty
       list of options.</p>
 
 	<section>
-	  <title>Releasing the Erlang shell</title>
-	  <p>During execution of tests, started with
+	  <title>Releasing the Erlang Shell</title>
+	  <p>During execution of tests started with
 	  <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>,
-	  the Erlang shell process, controlling stdin, will remain the top
-	  level process of the Common Test system of processes. The result
-	  is that the Erlang shell is not available for interaction during
-	  the test run. If this is not desirable, maybe because the shell is needed
-	  for debugging purposes or for interaction with the SUT during test
-	  execution, you may set the <c>release_shell</c> start option to
+	  the Erlang shell process, controlling <c>stdin</c>, remains the top-level
+	  process of the <c>Common Test</c> system of processes. Consequently,
+	  the Erlang shell is not available for interaction during
+	  the test run. If this is not desirable, for example, because the shell 
+	  is needed for debugging purposes or for interaction with the SUT during test
+	  execution, set start option <c>release_shell</c> to
 	  <c>true</c> (in the call to <c>ct:run_test/1</c> or by
-	  using the corresponding test specification term, see below). This will
-	  make Common Test release the shell immediately after the test suite
+	  using the corresponding test specification term, described later). This
+	  makes <c>Common Test</c> release the shell immediately after the test suite
 	  compilation stage. To accomplish this, a test runner process
-	  is spawned to take control of the test execution, and the effect is that
+	  is spawned to take control of the test execution. The effect is that
 	  <c>ct:run_test/1</c> returns the pid of this process rather than the
-	  test result - which instead is printed to tty at the end of the test run.</p>
-	  <note><p>Note that in order to use the
-	  <seealso marker="ct#break-1"><c>ct:break/1/2</c></seealso> and
-	  <seealso marker="ct#continue-0"><c>ct:continue/0/1</c></seealso> functions,
+	  test result, which instead is printed to tty at the end of the test run.</p>
+	  <note><p>To use the functions
+	  <seealso marker="ct#break-1"><c>ct:break/1,2</c></seealso> and
+	  <seealso marker="ct#continue-0"><c>ct:continue/0,1</c></seealso>,
 	  <c>release_shell</c> <em>must</em> be set to <c>true</c>.</p></note>
 	</section>
         
-      <p>For detailed documentation about
-        <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>,
-        please see the
-        <seealso marker="ct#run_test-1"><c>ct</c></seealso> manual page.</p>    
+      <p>For details, see
+        <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> manual page.</p>    
   </section>
   
    <section>
     <marker id="group_execution"></marker>
-    <title>Test case group execution</title>
+    <title>Test Case Group Execution</title>
     
     <p>With the <c>ct_run</c> flag, or <c>ct:run_test/1</c> option <c>group</c>,
     one or more test case groups can be specified, optionally in combination
-    with specific test cases. The syntax for specifying groups is as follows
-    (on the command line):</p>
+    with specific test cases. The syntax for specifying groups on the command line
+    is as follows:</p>
 
     <pre>
-      <![CDATA[$ ct_run -group <group_names_or_paths> [-case <cases>]]]></pre>
-    <p>or (in the Erlang shell):</p>
+ <![CDATA[$ ct_run -group <group_names_or_paths> [-case <cases>]]]></pre>
+    <p>The syntax in the Erlang shell is as follows:</p>
     <pre>
-      <![CDATA[1> ct:run_test([{group,GroupsNamesOrPaths}, {case,Cases}]).]]></pre>
+ <![CDATA[1> ct:run_test([{group,GroupsNamesOrPaths}, {case,Cases}]).]]></pre>
     
-    <p>The <c>group_names_or_paths</c> parameter specifies either one
-    or more group names and/or one or more group paths. At start up,
-    Common Test will search for matching groups in the group definitions
-    tree (i.e. the list returned from <c>Suite:groups/0</c>, please see the
-    <seealso marker="write_test_chapter#test_case_groups">Test case groups</seealso>
-    chapter for details).
-    Given a group name, say <c>g</c>, Common Test will search for all paths
-    that lead to <c>g</c>. By path here we mean a sequence of nested groups,
-    all of which have to be followed in order to get from the top level
-    group to <c>g</c>. Actually, what Common Test needs to do in order to
-    execute the test cases in group <c>g</c>, is to call the
-    <c>init_per_group/2</c> function for each group in the path to
-    <c>g</c>, as well as all corresponding <c>end_per_group/2</c>
-    functions afterwards. The obvious reason for this is that the configuration
+    <p>Parameter <c>group_names_or_paths</c> specifies one
+    or more group names and/or one or more group paths. At startup,
+    <c>Common Test</c> searches for matching groups in the group definitions
+    tree (that is, the list returned from <c>Suite:groups/0</c>; for details, see section
+    <seealso marker="write_test_chapter#test_case_groups">Test Case Groups</seealso>.
+    </p>
+
+    <p>Given a group name, say <c>g</c>, <c>Common Test</c> searches for all paths
+    leading to <c>g</c>. By path is meant a sequence of nested groups,
+    which must be followed to get from the top-level
+    group to <c>g</c>. To execute the test cases in group <c>g</c>, 
+    <c>Common Test</c> must call the <c>init_per_group/2</c> function for 
+    each group in the path to <c>g</c>, and all corresponding <c>end_per_group/2</c>
+    functions afterwards. This is because the configuration
     of a test case in <c>g</c> (and its <c>Config</c> input data) depends on
     <c>init_per_testcase(TestCase, Config)</c> and its return value, which
     in turn depends on <c>init_per_group(g, Config)</c> and its return value,
     which in turn depends on <c>init_per_group/2</c> of the group above
-    <c>g</c>, etc, all the way up to the top level group.</p>
+    <c>g</c>, and so on, all the way up to the top-level group.</p>
 
-    <p>As you may have already realized, this means that if there is more than
-    one way to locate a group (and its test cases) in a path, the result of the
-    group search operation is a number of tests, all of which will be performed.
-    Common Test actually interprets a group specification that consists of a
-    single name this way:</p>
+    <p>This means that if there is more than one way to locate a group 
+    (and its test cases) in a path, the result of the group search operation 
+    is a number of tests, all of which are to be performed.
+    <c>Common Test</c> interprets a group specification that consists of a
+    single name as follows:</p>
 
     <p>"Search and find all paths in the group definitions tree that lead
-    to the specified group and, for each path, create a test which (1) executes
-    all configuration functions in the path to the specified group, then (2)
-    executes all - or all matching - test cases in this group, as well as (3)
-    all - or all matching - test cases in all sub groups of the group".
-    </p>
+    to the specified group and, for each path, create a test that does the following, 
+    in order:</p>
+    <list type="ordered">
+      <item>Executes all configuration functions in the path to the specified group.</item>
+      <item>Executes all, or all matching, test cases in this group.</item>
+      <item>Executes all, or all matching, test cases in all subgroups of the group."</item>
+    </list>
     
-    <p>It is also possible for the user to specify a specific group path with
-    the <c>group_names_or_paths</c> parameter. With this type of specification it's
-    possible to avoid execution of unwanted groups (in otherwise matching paths),
-    and/or the execution of sub groups. The syntax of the group path is a list of
-    group names in the path, e.g. on the command line:
+    <p>The user can specify a specific group path with
+    parameter <c>group_names_or_paths</c>. With this type of specification
+    execution of unwanted groups (in otherwise matching paths),
+    and/or the execution of subgroups can be avoided. The command line syntax of the 
+    group path is a list of group names in the path, for example:
     </p>
     <p><c>$ ct_run -suite "./x_SUITE" -group [g1,g3,g4] -case tc1 tc5</c></p>
-    <p>or similarly in the Erlang shell (requires a list within the groups list):</p>
+    <p>The syntax in the Erlang shell is as follows (requires a list within the groups list):</p>
     <p><c>1> ct:run_test([{suite,"./x_SUITE"}, {group,[[g1,g3,g4]]}, {testcase,[tc1,tc5]}]).</c></p>
     
-    <p>The last group in the specified path will be the terminating group in
-    the test, i.e. no sub groups following this group will be executed. In the
-    example above, <c>g4</c> is the terminating group, hence Common Test will
-    execute a test that calls all init configuration functions in the path to
-    <c>g4</c>, i.e. <c>g1..g3..g4</c>. It will then call test cases <c>tc1</c>
-    and <c>tc5</c> in <c>g4</c> and finally all end configuration functions in order
-    <c>g4..g3..g1</c>.</p>
+    <p>The last group in the specified path is the terminating group in
+    the test, that is, no subgroups following this group are executed. In the
+    previous example, <c>g4</c> is the terminating group. Hence, <c>Common Test</c>
+    executes a test that calls all <c>init</c> configuration functions in the path to
+    <c>g4</c>, that is, <c>g1..g3..g4</c>. It then calls test cases <c>tc1</c>
+    and <c>tc5</c> in <c>g4</c>, and finally all <c>end</c> configuration functions 
+    in order <c>g4..g3..g1</c>.</p>
     
-    <p>Note that the group path specification doesn't necessarily
+    <note><p>The group path specification does not necessarily
     have to include <em>all</em> groups in the path to the terminating group.
-    Common Test will search for all matching paths if given an incomplete group
-    path.</p>
+    <c>Common Test</c> searches for all matching paths if an incomplete 
+    group path is specified.</p></note>
     
-    <p>Note also that it's possible to combine group names and group paths with the
-    <c>group_names_or_paths</c> parameter. Each element is treated as
-    an individual specification in combination with the <c>cases</c> parameter.
-    See examples below.</p>    
+    <note><p>Group names and group paths can be combined with parameter
+    <c>group_names_or_paths</c>. Each element is treated as an individual specification 
+    in combination with parameter <c>cases</c>.
+    The following examples illustrates this.</p></note>   
+
+    <p><em>Examples:</em></p>
+    <pre>
+ -module(x_SUITE).
+ ...
+ %% The group definitions:      
+ groups() ->
+   [{top1,[],[tc11,tc12,
+	      {sub11,[],[tc12,tc13]},
+	      {sub12,[],[tc14,tc15,
+			 {sub121,[],[tc12,tc16]}]}]},
+
+    {top2,[],[{group,sub21},{group,sub22}]},
+    {sub21,[],[tc21,{group,sub2X2}]},
+    {sub22,[],[{group,sub221},tc21,tc22,{group,sub2X2}]},
+    {sub221,[],[tc21,tc23]},
+    {sub2X2,[],[tc21,tc24]}].</pre>
+
+    <p>The following executes two tests, one for all cases and all subgroups 
+    under <c>top1</c>, and one for all under <c>top2</c>:</p>
+    <pre>
+ $ ct_run -suite "x_SUITE" -group all
+ 1> ct:run_test([{suite,"x_SUITE"}, {group,all}]).</pre>
+    <p>Using <c>-group top1 top2</c>, or <c>{group,[top1,top2]}</c> gives the same result.</p>
 
-    <p>Examples:</p>
+    <p>The following executes one test for all cases and subgroups under <c>top1</c>:</p>
     <pre>
-      -module(x_SUITE).
-      ...
-      %% The group definitions:      
-      groups() ->
-        [{top1,[],[tc11,tc12,
-	           {sub11,[],[tc12,tc13]},
-	           {sub12,[],[tc14,tc15,
-			      {sub121,[],[tc12,tc16]}]}]},
-
-         {top2,[],[{group,sub21},{group,sub22}]},
-         {sub21,[],[tc21,{group,sub2X2}]},
-         {sub22,[],[{group,sub221},tc21,tc22,{group,sub2X2}]},
-         {sub221,[],[tc21,tc23]},
-         {sub2X2,[],[tc21,tc24]}].
-    </pre>
-    <br></br>
-    <p><c>$ ct_run -suite "x_SUITE" -group all</c></p>
-    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,all}]).</c></p>
-    <p>Two tests will be executed, one for all cases and all sub groups under <c>top1</c>,
-    and one for all under <c>top2</c>. (We would get the same result with
-    <c>-group top1 top2</c>, or <c>{group,[top1,top2]}</c>.</p>
-    <br></br>
-    <p><c>$ ct_run -suite "x_SUITE" -group top1</c></p>
-    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[top1]}]).</c></p>
-    <p>This will execute one test for all cases and sub groups under <c>top1</c>.</p>
-    <br></br>
-    <p><c>$ ct_run -suite "x_SUITE" -group top1 -case tc12</c></p>
-    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[top1]}, {testcase,[tc12]}]).</c></p>
-    <p>This will run a test that executes <c>tc12</c> in <c>top1</c> and any sub group
-    under <c>top1</c> where it can be found (<c>sub11</c> and <c>sub121</c>).</p>
-    <br></br>
-    <p><c>$ ct_run -suite "x_SUITE" -group [top1] -case tc12</c></p>
-    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[[top1]]}, {testcase,[tc12]}]).</c></p>
-    <p>This will execute <c>tc12</c> <em>only</em> in group <c>top1</c>.</p>
-    <br></br>
-    <p><c>$ ct_run -suite "x_SUITE" -group top1 -case tc16</c></p>
-    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[top1]}, {testcase,[tc16]}]).</c></p>
-    <p>This will search <c>top1</c> and all its sub groups for <c>tc16</c> and the result
-    will be that this test case executes in group <c>sub121</c>. (The specific path: 
-    <c>-group [sub121]</c> or <c>{group,[[sub121]]}</c>, would have given
-    us the same result in this example).</p>
-    <br></br>
-    <p><c>$ ct_run -suite "x_SUITE" -group sub12 [sub12]</c></p>
-    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[sub12,[sub12]]}]).</c></p>
-    <p>This will execute two tests, one that includes all cases and sub groups under
-    <c>sub12</c>, and one with <em>only</em> the test cases in <c>sub12</c>.</p>
-    <br></br>
-    <p><c>$ ct_run -suite "x_SUITE" -group sub2X2</c></p>
-    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[sub2X2]}]).</c></p>
-    <p>In this example, Common Test will find and execute two tests, one for the path from
-    <c>top2</c> to <c>sub2X2</c> via <c>sub21</c>, and one from <c>top2</c> to <c>sub2X2</c>
-    via <c>sub22</c>.</p>
-    <br></br>
-    <p><c>$ ct_run -suite "x_SUITE" -group [sub21,sub2X2]</c></p>
-    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[[sub21,sub2X2]]}]).</c></p>
-    <p>Here, by specifying the unique path: <c>top2 -> sub21 -> sub2X2</c>, only one test
-    is executed. The second possible path from <c>top2</c> to <c>sub2X2</c> (above)
-    will be discarded.</p>
-    <br></br>
-    <p><c>$ ct_run -suite "x_SUITE" -group [sub22] -case tc22 tc21</c></p>
-    <p><c>1> ct:run_test([{suite,"x_SUITE"}, {group,[[sub22]]}, {testcase,[tc22,tc21]}]).</c></p>
-    <p>In this example only the test cases for <c>sub22</c> will be executed, and in
-    reverse order compared to the group definition.</p>
-    <br></br>
-
-    <p>If a test case that belongs to a group (according to the group definition), is executed
-    without a group specification, i.e. simply by means of (command line):</p>
+ $ ct_run -suite "x_SUITE" -group top1
+ 1> ct:run_test([{suite,"x_SUITE"}, {group,[top1]}]).</pre>
+
+    <p>The following runs a test executing <c>tc12</c> in <c>top1</c> and any subgroup
+    under <c>top1</c> where it can be found (<c>sub11</c> and <c>sub121</c>):</p>
+    <pre>
+ $ ct_run -suite "x_SUITE" -group top1 -case tc12
+ 1> ct:run_test([{suite,"x_SUITE"}, {group,[top1]}, {testcase,[tc12]}]).</pre>
+
+    <p>The following executes <c>tc12</c> <em>only</em> in group <c>top1</c>:</p>
+    <pre>
+ $ ct_run -suite "x_SUITE" -group [top1] -case tc12
+ 1> ct:run_test([{suite,"x_SUITE"}, {group,[[top1]]}, {testcase,[tc12]}]).</pre>
+    
+    <p>The following searches <c>top1</c> and all its subgroups for <c>tc16</c> resulting
+    in that this test case executes in group <c>sub121</c>:</p>
+    <pre>
+ $ ct_run -suite "x_SUITE" -group top1 -case tc16
+ 1> ct:run_test([{suite,"x_SUITE"}, {group,[top1]}, {testcase,[tc16]}]).</pre>
+    <p>Using the specific path <c>-group [sub121]</c> or <c>{group,[[sub121]]}</c> gives
+    the same result in this example.</p>
+
+    <p>The following executes two tests, one including all cases and subgroups under
+    <c>sub12</c>, and one with <em>only</em> the test cases in <c>sub12</c>:</p>
+    <pre>
+ $ ct_run -suite "x_SUITE" -group sub12 [sub12]
+ 1> ct:run_test([{suite,"x_SUITE"}, {group,[sub12,[sub12]]}]).</pre>
+
+    <p>In the following example, <c>Common Test</c> finds and executes two tests, 
+    one for the path from <c>top2</c> to <c>sub2X2</c> through <c>sub21</c>, 
+    and one from <c>top2</c> to <c>sub2X2</c> through <c>sub22</c>:</p>
+    <pre>
+ $ ct_run -suite "x_SUITE" -group sub2X2
+ 1> ct:run_test([{suite,"x_SUITE"}, {group,[sub2X2]}]).</pre>
+
+    <p>In the following example, by specifying the unique path <c>top2 -> sub21 -> sub2X2</c>, 
+    only one test is executed. The second possible path, from <c>top2</c> to <c>sub2X2</c> 
+    (from the former example) is discarded:</p>
+    <pre>
+ $ ct_run -suite "x_SUITE" -group [sub21,sub2X2]
+ 1> ct:run_test([{suite,"x_SUITE"}, {group,[[sub21,sub2X2]]}]).</pre>
+
+    <p>The following executes only the test cases for <c>sub22</c> and in reverse order 
+    compared to the group definition:</p>
+    <pre>
+ $ ct_run -suite "x_SUITE" -group [sub22] -case tc22 tc21
+ 1> ct:run_test([{suite,"x_SUITE"}, {group,[[sub22]]}, {testcase,[tc22,tc21]}]).</pre>
+
+    <p>If a test case belonging to a group (according to the group definition) is executed
+    without a group specification, that is, simply by
+    (using the command line):</p>
     <p><c>$ ct_run -suite "my_SUITE" -case my_tc</c></p>
-    <p>or (Erlang shell):</p>
+    <p>or (using the Erlang shell):</p>
     <p><c>1> ct:run_test([{suite,"my_SUITE"}, {testcase,my_tc}]).</c></p>
-    <p>then Common Test ignores the group definition and executes the test case in the scope of the
-    test suite only (no group configuration functions are called).</p>
+    <p>then <c>Common Test</c> ignores the group definition and executes the test case 
+    in the scope of the test suite only (no group configuration functions are called).</p>
 
-    <p>The group specification feature, exactly as it has been presented in this section, can also
+    <p>The group specification feature, as presented in this section, can also
     be used in <seealso marker="run_test_chapter#test_specifications">Test
-    Specifications</seealso> (with some extra features added). Please see below.</p>
+    Specifications</seealso> (with some extra features added).</p>
    </section>
       
 
   <section>
-    <title>Running the interactive shell mode</title>
+    <title>Running the Interactive Shell Mode</title>
     
-    <p>You can start Common Test in an interactive shell mode where no
-      automatic testing is performed. Instead, in this mode, Common Test
+    <p>You can start <c>Common Test</c> in an interactive shell mode where no
+      automatic testing is performed. Instead, <c>Common Test</c>
       starts its utility processes, installs configuration data (if any),
       and waits for the user to call functions (typically test case support
       functions) from the Erlang shell.</p>
 
-    <p>The shell mode is useful e.g. for debugging test suites, for analysing
+    <p>The shell mode is useful, for example, for debugging test suites, analyzing
       and debugging the SUT during "simulated" test case execution, and 
-      for trying out various operations during test suite development.</p>
-
-    <p>To invoke the interactive shell mode, you can start an Erlang shell 
-      manually and call <seealso marker="ct#install-1"><c>ct:install/1</c></seealso> to install any configuration
-      data you might need (use <c>[]</c> as argument otherwise), then
-      call <seealso marker="ct#start_interactive-0"><c>ct:start_interactive/0</c></seealso> to start Common Test. If you use
-      the <c>ct_run</c> program, you may start the Erlang shell and Common Test
-      in the same go by using the <c>-shell</c> and, optionally, the <c>-config</c>
-      and/or <c>-userconfig</c> flag. Examples:
-    </p>
-    <list>
+      trying out various operations during test suite development.</p>
+
+    <p>To start the interactive shell mode, start an Erlang shell 
+      manually and call <seealso marker="ct#install-1"><c>ct:install/1</c></seealso> 
+      to install any configuration data you might need (use <c>[]</c> as argument otherwise). 
+      Then call <seealso marker="ct#start_interactive-0"><c>ct:start_interactive/0</c></seealso> 
+      to start <c>Common Test</c>.</p>
+      
+      <p>If you use the <c>ct_run</c> program, you can start 
+      the Erlang shell and <c>Common Test</c> in one go by using the flag <c>-shell</c> and, 
+      optionally, flag <c>-config</c> and/or <c>-userconfig</c>.</p>
+      <p><em>Examples:</em></p>
+    <list type="bulleted">
       <item><c>ct_run -shell</c></item>
       <item><c><![CDATA[ct_run -shell -config cfg/db.cfg]]></c></item>
       <item><c><![CDATA[ct_run -shell -userconfig db_login testuser x523qZ]]></c></item>
     </list>
     
-    <p>If no config file is given with the <c>ct_run</c> command,
-      a warning will be displayed. If Common Test has been run from the same
-      directory earlier, the same config file(s) will be used
-      again. If Common Test has not been run from this directory before, no
-      config files will be available.</p>
+    <p>If no configuration file is specified with command <c>ct_run</c>,
+      a warning is displayed. If <c>Common Test</c> has been run from the same
+      directory earlier, the same configuration file(s) are used again. If <c>Common Test</c> 
+      has not been run from this directory before, no configuration files are available.</p>
     
-    <p>If any functions using "required config data" (e.g. ct_telnet or
-      ct_ftp functions) are to be called from the erlang shell, config
-      data must first be required with <seealso marker="ct#require-1"><c>
-      ct:require/1/2</c></seealso>. This is
-      equivalent to a <c>require</c> statement in the <seealso
-	marker="write_test_chapter#suite">Test Suite Info 
-	Function</seealso> or in the <seealso
-	marker="write_test_chapter#info_function">Test Case Info
-	Function</seealso>.</p>
-    
-    <p>Example:</p>
+    <p>If any functions using "required configuration data" (for example, functions 
+      <c>ct_telnet</c> or <c>ct_ftp</c>) are to be called from the Erlang shell, first require 
+      configuration data with <seealso marker="ct#require-1"><c>
+      ct:require/1,2</c></seealso>. This is equivalent to a <c>require</c> statement 
+      in the <seealso marker="write_test_chapter#suite">Test Suite Information Function</seealso> 
+      or in the <seealso marker="write_test_chapter#info_function">Test Case Information Function</seealso>.</p>
+      
+    <p><em>Example:</em></p>
     <pre> 
-       1> ct:require(unix_telnet, unix).
-       ok
-       2> ct_telnet:open(unix_telnet).
-       {ok,&lt;0.105.0&gt;}
-       4> ct_telnet:cmd(unix_telnet, "ls .").
-       {ok,["ls .","file1  ...",...]}
-    </pre>
+ 1> ct:require(unix_telnet, unix).
+ ok
+ 2> ct_telnet:open(unix_telnet).
+ {ok,&lt;0.105.0&gt;}
+ 4> ct_telnet:cmd(unix_telnet, "ls .").
+ {ok,["ls .","file1  ...",...]}</pre>
     
-    <p>Everything that Common Test normally prints in the test case logs,
-      will in the interactive mode be written to a log named
-      <c>ctlog.html</c> in the <c><![CDATA[ct_run.<timestamp>]]></c>
-      directory. A link to this file will be available in the file
-      named <c>last_interactive.html</c> in the directory from which
-      you executed <c>ct_run</c>. Currently, specifying a different
-      root directory for the logs than the current working directory,
+    <p>Everything that <c>Common Test</c> normally prints in the test case logs,
+      are in the interactive mode written to a log named <c>ctlog.html</c> 
+      in directory  <c><![CDATA[ct_run.<timestamp>]]></c>. A link to this 
+      file is available in the file named <c>last_interactive.html</c> in the 
+      directory from which you execute <c>ct_run</c>. Specifying a different
+      root directory for the logs than the current working directory
       is not supported.</p>
     
-    <p>If you wish to exit the interactive mode (e.g. to start an
-      automated test run with <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>), call the function
-      <seealso marker="ct#stop_interactive-0"><c>ct:stop_interactive/0</c></seealso>. This shuts down the
-      running <c>ct</c> application. Associations between
+    <p>If you wish to exit the interactive mode (for example, to start an automated 
+      test run with <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>), 
+      call function
+      <seealso marker="ct#stop_interactive-0"><c>ct:stop_interactive/0</c></seealso>. 
+      This shuts down the running <c>ct</c> application. Associations between
       configuration names and data created with <c>require</c> are 
-      consequently deleted. <seealso marker="ct#start_interactive-0"><c>ct:start_interactive/0</c></seealso> will get you
-      back into interactive mode, but the previous state is not restored.</p>
+      consequently deleted. Function
+      <seealso marker="ct#start_interactive-0"><c>ct:start_interactive/0</c></seealso> 
+      takes you back into interactive mode, but the previous state is not restored.</p>
   </section>
 
   <section>
-    <title>Step by step execution of test cases with the Erlang Debugger</title>
+    <title>Step-by-Step Execution of Test Cases with the Erlang Debugger</title>
    
-    <p>By means of <c>ct_run -step [opts]</c>, or by passing the 
-       <c>{step,Opts}</c> option to <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, it is possible
-       to get the Erlang Debugger started automatically and use its
-       graphical interface to investigate the state of the current test 
-       case and to execute it step by step and/or set execution breakpoints.</p>
-    <p>If no extra options are given with the <c>step</c> flag/option,
-       breakpoints will be set automatically on the test cases that
-       are to be executed by Common Test, and those functions only. If
-       the step option <c>config</c> is specified, breakpoints will 
-       also be initially set on the configuration functions in the suite, i.e.
+    <p>Using <c>ct_run -step [opts]</c>, or by passing option <c>{step,Opts}</c> 
+       to <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, 
+       the following is possible:</p>
+       <list type="bulleted">
+       <item>Get the Erlang Debugger started automatically.</item>
+       <item>Use its graphical interface to investigate the state of the current test case.</item>
+       <item>Execute the test case step-by-step and/or set execution breakpoints.</item>
+     </list>
+    <p>If no extra options are specified with flag/option <c>step</c>,
+       breakpoints are set automatically on the test cases that
+       are to be executed by <c>Common Test</c>, and those functions only. If
+       step option <c>config</c> is specified, breakpoints are also initially 
+       set on the configuration functions in the suite, that is,
        <c>init_per_suite/1</c>, <c>end_per_suite/1</c>,
        <c>init_per_group/2</c>, <c>end_per_group/2</c>,
        <c>init_per_testcase/2</c> and <c>end_per_testcase/2</c>.</p>
-    <p>Common Test enables the Debugger auto attach feature, which means
+    <p><c>Common Test</c> enables the Debugger auto-attach feature, which means
        that for every new interpreted test case function that starts to execute, 
-       a new trace window will automatically pop up. (This is because each test 
+       a new trace window automatically pops up (as each test 
        case executes on a dedicated Erlang process). Whenever a new test case starts,
-       Common Test will attempt to close the inactive trace window of the previous 
-       test case. However, if you prefer that Common Test leaves inactive trace 
-       windows, use the <c>keep_inactive</c> option.</p>
-    <p>The step functionality can be used together with the <c>suite</c> and 
-       the <c>suite</c> + <c>case/testcase</c> flag/option, but not together 
-       with <c>dir</c>.</p>       
+       <c>Common Test</c> attempts to close the inactive trace window of the previous 
+       test case. However, if you prefer <c>Common Test</c> to leave inactive trace 
+       windows, use option <c>keep_inactive</c>.</p>
+    <p>The step functionality can be used together with flag/option <c>suite</c> and 
+       <c>suite</c> + <c>case/testcase</c>, but not together with <c>dir</c>.</p>       
   </section>
 
   <section>
   <marker id="test_specifications"></marker>
     <title>Test Specifications</title>
     <section>
-	<title>General description</title>
-	<p>The most flexible way to specify what to test, is to use a so
-	called test specification. A test specification is a sequence of
+	<title>General Description</title>
+	<p>The most flexible way to specify what to test, is to use a
+	test specification, which is a sequence of
 	Erlang terms. The terms are normally declared in one or more text files
 	(see <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>), but
-	may also be passed to Common Test on the form of a list (see
+	can also be passed to <c>Common Test</c> on the form of a list (see
 	<seealso marker="ct#run_testspec-1"><c>ct:run_testspec/1</c></seealso>).
 	There are two general types of terms: configuration terms and test
 	specification terms.</p>
-	<p>With configuration terms it is possible to e.g. label the test
-	run (similar to <c>ct_run -label</c>), evaluate arbitrary expressions
-	before starting the test, import configuration data (similar to
-	<c>ct_run -config/-userconfig</c>), specify the top level HTML log
-	directory (similar to <c>ct_run -logdir</c>), enable code coverage
-	analysis (similar to <c>ct_run -cover</c>), install Common Test Hooks
-	(similar to <c>ct_run -ch_hooks</c>), install event_handler plugins
-	(similar to <c>ct_run -event_handler</c>), specify include directories
-	that should be passed to the compiler for automatic compilation
-	(similar to <c>ct_run -include</c>), disable the auto compilation
-	feature (similar to <c>ct_run -no_auto_compile</c>), set verbosity
-	levels (similar to <c>ct_run -verbosity</c>), and more.</p>
-	<p>Configuration terms can be combined with <c>ct_run</c> start flags,
-	or <c>ct:run_test/1</c> options. The result will for some flags/options
-	and terms be that the values are merged (e.g. configuration files,
-	include directories, verbosity levels, silent connections), and for
+
+	<p>With configuration terms it is, for example, possible to do the following:</p>
+	<list type="bulleted">
+       <item>Label the test run (similar to <c>ct_run -label</c>).</item>
+       <item>Evaluate any expressions before starting the test.</item>
+       <item>Import configuration data (similar to <c>ct_run -config/-userconfig</c>).</item>
+       <item>Specify the top-level HTML log directory (similar to <c>ct_run -logdir</c>).</item>
+       <item>Enable code coverage analysis (similar to <c>ct_run -cover</c>).</item>
+       <item>Install <c>Common Test Hooks</c> (similar to <c>ct_run -ch_hooks</c>).</item>
+       <item>Install <c>event_handler</c> plugins (similar to <c>ct_run -event_handler</c>).</item>
+       <item>Specify include directories to be passed to the compiler for 
+       automatic compilation (similar to <c>ct_run -include</c>).</item>
+       <item>Disable the auto-compilation feature (similar to <c>ct_run -no_auto_compile</c>).</item>
+       <item>Set verbosity levels (similar to <c>ct_run -verbosity</c>).</item>
+     </list>
+
+	<p>Configuration terms can be combined with <c>ct_run</c> start flags
+	or <c>ct:run_test/1</c> options. The result is, for some flags/options
+	and terms, that the values are merged (for example, configuration files,
+	include directories, verbosity levels, and silent connections) and for
 	others that the start flags/options override the test specification
-	terms (e.g. log directory, label, style sheet, auto compilation).</p>
-	<p>With test specification terms it is possible to state exactly
-	which tests should run and in which order. A test term specifies
+	terms (for example, log directory, label, style sheet, and auto-compilation).</p>
+
+	<p>With test specification terms, it is possible to state exactly
+	which tests to run and in which order. A test term specifies
 	either one or more suites, one or more test case groups (possibly nested),
 	or one or more test cases in a group (or in multiple groups) or in a suite.</p>
-	<p>An arbitrary number of test terms may be declared in sequence.
-	Common Test will by default compile the terms into one or more tests 
-	to be performed in one resulting test run. Note that a term that
-	specifies a set of test cases will "swallow" one that only
-	specifies a subset of these cases. E.g. the result of merging
-	one term that specifies that all cases in suite S should be
+
+	<p>Any number of test terms can be declared in sequence.
+	<c>Common Test</c> compiles by default the terms into one or more tests 
+	to be performed in one resulting test run. A term that
+	specifies a set of test cases "swallows" one that only
+	specifies a subset of these cases. For example, the result of merging
+	one term specifying that all cases in suite S are to be
 	executed, with another term specifying only test case X and Y in
 	S, is a test of all cases in S. However, if a term specifying
 	test case X and Y in S is merged with a term specifying case Z
-	in S, the result is a test of X, Y and Z in S. To disable this
-	behaviour, i.e. to instead perform each test sequentially in a "script-like"
-	manner, the term <c>merge_tests</c> can be set to <c>false</c> in
-	the test specification.</p>
+	in S, the result is a test of X, Y, and Z in S. To disable this
+	behavior, that is, to instead perform each test sequentially in a 
+	"script-like" manner, set term <c>merge_tests</c> to <c>false</c> 
+	in the test specification.</p>
+
 	<p>A test term can also specify one or more test suites, groups,
-	or test cases to be skipped. Skipped suites, groups and cases
-	are not executed and show up in the HTML log files as
-	SKIPPED.</p>
+	or test cases to be skipped. Skipped suites, groups, and cases
+	are not executed and show up in the HTML log files as <c>SKIPPED</c>.</p>
     </section>
     <section>
-        <title>Using multiple test specification files</title>
+        <title>Using Multiple Test Specification Files</title>
 	
-	<p>When multiple test specification files are given at startup (either
+	<p>When multiple test specification files are specified at startup (either
 	with <c>ct_run -spec file1 file2 ...</c> or 
 	<c>ct:run_test([{spec, [File1,File2,...]}])</c>), 
-	Common Test will either execute one test run per specification file, or
-	join the files and perform all tests within one single test run. The first
-	behaviour is the default one. The latter requires that the start
-	flag/option <c>join_specs</c> is provided, e.g.
+	<c>Common Test</c> either executes one test run per specification file, 
+	or joins the files and performs all tests within one single test run. 
+	The first behavior is the default one. The latter requires that start
+	flag/option <c>join_specs</c> is provided, for example,
 	<c>run_test -spec ./my_tests1.ts ./my_tests2.ts -join_specs</c>.</p>
 	
 	<p>Joining a number of specifications, or running them separately, can
-	also be accomplished with (and may be combined with) test specification
-	file inclusion, described next.</p>
+	also be accomplished with (and can be combined with) test specification
+	file inclusion.</p>
     </section>
     <section>
-      <title>Test specification file inclusion</title>
-        <p>With the <c>specs</c> term (see syntax below), it's possible to have
-	a test specification include other specifications. An included
-	specification may either be joined with the source specification,
-	or used to produce a separate test run (like with the <c>join_specs</c>
-	start flag/option above). Example:</p>
+      <title>Test Specification File Inclusion</title>
+        <p>With the term <c>specs</c>, a test specification can include 
+	other specifications. An included specification can either be joined 
+	with the source specification or used to produce a separate test run 
+	(as with start flag/option <c>join_specs</c> above).</p>
+	<p><em>Example:</em></p>
+
 	<pre>
-	%% In specification file "a.spec"
-	{specs, join, ["b.spec", "c.spec"]}.
-	{specs, separate, ["d.spec", "e.spec"]}.
-	%% Config and test terms follow
-	...</pre>
+ %% In specification file "a.spec"
+ {specs, join, ["b.spec", "c.spec"]}.
+ {specs, separate, ["d.spec", "e.spec"]}.
+ %% Config and test terms follow
+ ...</pre>
+
 	<p>In this example, the test terms defined in files "b.spec" and "c.spec"
-	will be joined with the terms in the source specification "a.spec"
+	are joined with the terms in source specification "a.spec"
 	(if any). The inclusion of specifications "d.spec" and
-	"e.spec" will result in two separate, and independent, test runs (i.e.
-	one for each included specification).</p>
-	<p>Note that the <c>join</c> option does not imply that the test terms
-	will be merged (see <c>merge_tests</c> above), only that all tests are
-	executed in one single test run.</p>
+	"e.spec" results in two separate, and independent, test runs
+	(one for each included specification).</p>
+
+	<p>Option <c>join</c> does not imply that the test terms
+	are merged, only that all tests are executed in one single test run.</p>
+
 	<p>Joined specifications share common configuration settings, such as
 	the list of <c>config</c> files or <c>include</c> directories.
-	For configuration that can not be combined, such as settings for <c>logdir</c>
+	For configurations that cannot be combined, such as settings for <c>logdir</c>
 	or <c>verbosity</c>, it is up to the user to ensure there are no clashes
 	when the test specifications are joined. Specifications included with
-	the <c>separate</c> option, do not share configuration settings with the
-	source specification. This is useful e.g. if there are clashing
-	configuration settings in included specifications, making it impossible
-	to join them.</p>
+	option <c>separate</c> do not share configuration settings with the
+	source specification. This is useful, for example, if there are clashing
+	configuration settings in included specifications, making it them impossible
+	to join.</p>
+
 	<p>If <c>{merge_tests,true}</c> is set in the source specification
-	(which is the default setting), terms in joined specifications will be
+	(which is the default setting), terms in joined specifications are
 	merged with terms in the source specification (according to the
-	description of <c>merge_tests</c> above).</p>
-	<p>Note that it is always the <c>merge_tests</c> setting in the source
+	description of <c>merge_tests</c> earlier).</p>
+
+	<p>Notice that it is always the <c>merge_tests</c> setting in the source
 	specification that is used when joined with other specifications.
-	Say e.g. that a source specification A, with tests TA1 and TA2, has
-	<c>{merge_tests,false}</c> set, and it includes another specification,
+	Say, for example, that a source specification A, with tests TA1 and TA2, has
+	<c>{merge_tests,false}</c> set, and that it includes another specification,
 	B, with tests TB1 and TB2, that has <c>{merge_tests,true}</c> set.
-	The result will be that the test series: <c>TA1,TA2,merge(TB1,TB2)</c>,
-	is executed. The opposite <c>merge_tests</c> settings would result in the
-	following the test series: <c>merge(merge(TA1,TA2),TB1,TB2)</c>.</p>
-	<p>The <c>specs</c> term may of course be used to nest specifications,
-	i.e. have one specification include other specifications, which in turn
-	include others, etc.</p>
+	The result is that the test series <c>TA1,TA2,merge(TB1,TB2)</c>
+	is executed. The opposite <c>merge_tests</c> settings would result in
+	the test series <c>merge(merge(TA1,TA2),TB1,TB2)</c>.</p>
+
+	<p>The term <c>specs</c> can be used to nest specifications,
+	that is, have one specification include other specifications, which in turn
+	include others, and so no</p>
     </section>
       <section>
-	<title>Test case groups</title>
+	<title>Test Case Groups</title>
 
 	<p>When a test case group is specified, the resulting test
-	executes the <c>init_per_group</c> function, followed by all test
-	cases and sub groups (including their configuration functions), and
-	finally the <c>end_per_group</c> function. Also if particular
+	executes function <c>init_per_group</c>, followed by all test
+	cases and subgroups (including their configuration functions), and
+	finally function <c>end_per_group</c>. Also, if particular
 	test cases in a group are specified, <c>init_per_group</c>
-	and <c>end_per_group</c> for the group in question are
-	called. If a group which is defined (in <c>Suite:group/0</c>) to
-	be a sub group of another group, is specified (or if particular test
-	cases of a sub group are), Common Test will call the configuration
-	functions for the top level groups as well as for the sub group
+	and <c>end_per_group</c>, for the group in question, are
+	called. If a group defined (in <c>Suite:group/0</c>) as
+	a subgroup of another group, is specified (or if particular test
+	cases of a subgroup are), <c>Common Test</c> calls the configuration
+	functions for the top-level groups and for the subgroup
 	in question (making it possible to pass configuration data all
 	the way from <c>init_per_suite</c> down to the test cases in the
-	sub group).</p>
-	<p>The test specification utilizes the same mechanism for specifying
-	test case groups by means of names and paths, as explained in the
-	<seealso marker="run_test_chapter#group_execution">Group Execution</seealso>
-	section above, with the addition of the <c>GroupSpec</c> element
-	described next.</p>
-	<p>The <c>GroupSpec</c> element makes it possible to specify
-	group execution properties that will override those in the
-	group definition (i.e. in <c>groups/0</c>). Execution properties for
-	sub-groups may be overridden as well. This feature makes it possible to
+	subgroup).</p>
+
+	<p>The test specification uses the same mechanism for specifying
+	test case groups through names and paths, as explained in section
+	<seealso marker="run_test_chapter#group_execution">Test Case Group Execution</seealso>,
+	with the addition of element <c>GroupSpec</c>.</p>
+
+	<p>Element <c>GroupSpec</c> makes it possible to specify
+	group execution properties that overrides those in the
+	group definition (that is, in <c>groups/0</c>). Execution properties for
+	subgroups might be overridden as well. This feature makes it possible to
 	change properties of groups at the time of execution,
-	without even having to edit the test suite. The very same
-	feature is available for <c>group</c> elements in the <c>Suite:all/0</c>
-	list. Therefore, more detailed documentation, and examples, can be
-	found in the <seealso marker="write_test_chapter#test_case_groups">
-	Test case groups</seealso> chapter.</p>
+	without having to edit the test suite. The same feature is available for 
+	<c>group</c> elements in the <c>Suite:all/0</c> list. For details and examples,
+	see section <seealso marker="write_test_chapter#test_case_groups">
+	Test Case Groups</seealso>.</p>
       </section>
 
       <section>
-	<title>Test specification syntax</title>
-
-	<p>Below is the test specification syntax. Test specifications can
-	be used to run tests both in a single test host environment and
-	in a distributed Common Test environment (Large Scale
-	Testing). The node parameters in the <c>init</c> term are only
-	relevant in the latter (see the
-	<seealso marker="ct_master_chapter#test_specifications">Large
-	Scale Testing</seealso> chapter for information). For more information
-	about the various terms, please see the corresponding sections in the
-	User's Guide, such as e.g. the
-	<seealso marker="run_test_chapter#ct_run"><c>ct_run</c>
+	<title>Test Specification Syntax</title>
+
+	<p>Test specifications can be used to run tests both in a single 
+	test host environment and in a distributed <c>Common Test</c> environment 
+	(Large Scale Testing). The node parameters in term <c>init</c> are only
+	relevant in the latter (see section
+	<seealso marker="ct_master_chapter#test_specifications">Test Specifications</seealso> 
+	in Large Scale Testing). For details about the various terms, see the 
+	corresponding sections in the User's Guide, for example, the following:
+	</p>
+	<list type="bulleted">
+       <item>The <seealso marker="run_test_chapter#ct_run"><c>ct_run</c>
 	program</seealso> for an overview of available start flags
-	(since most flags have a corresponding configuration term), and
-	more detailed explanation of e.g.
-	<seealso marker="write_test_chapter#logging">Logging</seealso>
-	(for the <c>verbosity</c>, <c>stylesheet</c> and <c>basic_html</c> terms),
-	<seealso marker="config_file_chapter#top">External Configuration Data</seealso>
-	(for the <c>config</c> and <c>userconfig</c> terms),      
-	<seealso marker="event_handler_chapter#event_handling">Event
-	Handling</seealso> (for the <c>event_handler</c> term),
-	<seealso marker="ct_hooks_chapter#installing">Common Test Hooks</seealso>
-	(for the <c>ct_hooks</c> term), etc.</p>
-      </section>
-
-      <p>Config terms:</p>
+	(as most flags have a corresponding configuration term)</item>
+       <item><seealso marker="write_test_chapter#logging">Logging</seealso>
+	(for terms <c>verbosity</c>, <c>stylesheet</c> and <c>basic_html</c>)</item>
+       <item><seealso marker="config_file_chapter#top">External Configuration Data</seealso>
+	(for terms <c>config</c> and <c>userconfig</c>)</item>
+       <item><seealso marker="event_handler_chapter#event_handling">Event
+	Handling</seealso> (for the <c>event_handler</c> term)</item>
+       <item><seealso marker="ct_hooks_chapter#installing">Common Test Hooks</seealso>
+	(for term <c>ct_hooks</c>)</item>
+	</list>
+
+      <p><em>Configuration terms:</em></p>
       <pre>
-	{merge_tests, Bool}.
-	
-	{define, Constant, Value}.
-	
-	{specs, InclSpecsOption, TestSpecs}.
-	
-	{node, NodeAlias, Node}.
-	
-	{init, InitOptions}.
-	{init, [NodeAlias], InitOptions}.
-	
-	{label, Label}.
-	{label, NodeRefs, Label}.
-	
-	{verbosity, VerbosityLevels}.
-	{verbosity, NodeRefs, VerbosityLevels}.
-	
-	{stylesheet, CSSFile}.
-	{stylesheet, NodeRefs, CSSFile}.
-	
-	{silent_connections, ConnTypes}.
-	{silent_connections, NodeRefs, ConnTypes}.
-	
-	{multiply_timetraps, N}.
-	{multiply_timetraps, NodeRefs, N}.
-	
-	{scale_timetraps, Bool}.
-	{scale_timetraps, NodeRefs, Bool}.
-	
-	{cover, CoverSpecFile}.
-	{cover, NodeRefs, CoverSpecFile}.
-	
-	{cover_stop, Bool}.
-	{cover_stop, NodeRefs, Bool}.
-	
-	{include, IncludeDirs}.
-	{include, NodeRefs, IncludeDirs}.
-	
-	{auto_compile, Bool},
-	{auto_compile, NodeRefs, Bool},
-	
-	{abort_if_missing_suites, Bool},
-	{abort_if_missing_suites, NodeRefs, Bool},
+ {merge_tests, Bool}.
 
-	{config, ConfigFiles}.
-	{config, ConfigDir, ConfigBaseNames}.
-	{config, NodeRefs, ConfigFiles}.
-	{config, NodeRefs, ConfigDir, ConfigBaseNames}.
-	
-	{userconfig, {CallbackModule, ConfigStrings}}.
-	{userconfig, NodeRefs, {CallbackModule, ConfigStrings}}.
-	
-	{logdir, LogDir}.                                        
-	{logdir, NodeRefs, LogDir}.
-	
-	{logopts, LogOpts}.
-	{logopts, NodeRefs, LogOpts}.
-	
-	{create_priv_dir, PrivDirOption}.
-	{create_priv_dir, NodeRefs, PrivDirOption}.
-	
-	{event_handler, EventHandlers}.
-	{event_handler, NodeRefs, EventHandlers}.
-	{event_handler, EventHandlers, InitArgs}.
-	{event_handler, NodeRefs, EventHandlers, InitArgs}.
-	
-	{ct_hooks, CTHModules}.
-	{ct_hooks, NodeRefs, CTHModules}.
-	
-	{enable_builtin_hooks, Bool}.
-	
-	{basic_html, Bool}.
-	{basic_html, NodeRefs, Bool}.
-	
-        {release_shell, Bool}.</pre>
+ {define, Constant, Value}.
+
+ {specs, InclSpecsOption, TestSpecs}.
+
+ {node, NodeAlias, Node}.
+
+ {init, InitOptions}.
+ {init, [NodeAlias], InitOptions}.
+
+ {label, Label}.
+ {label, NodeRefs, Label}.
+
+ {verbosity, VerbosityLevels}.
+ {verbosity, NodeRefs, VerbosityLevels}.
+
+ {stylesheet, CSSFile}.
+ {stylesheet, NodeRefs, CSSFile}.
+
+ {silent_connections, ConnTypes}.
+ {silent_connections, NodeRefs, ConnTypes}.
+
+ {multiply_timetraps, N}.
+ {multiply_timetraps, NodeRefs, N}.
+
+ {scale_timetraps, Bool}.
+ {scale_timetraps, NodeRefs, Bool}.
+
+ {cover, CoverSpecFile}.
+ {cover, NodeRefs, CoverSpecFile}.
+
+ {cover_stop, Bool}.
+ {cover_stop, NodeRefs, Bool}.
+
+ {include, IncludeDirs}.
+ {include, NodeRefs, IncludeDirs}.
+
+ {auto_compile, Bool},
+ {auto_compile, NodeRefs, Bool},
+
+ {abort_if_missing_suites, Bool},
+ {abort_if_missing_suites, NodeRefs, Bool},
+
+ {config, ConfigFiles}.
+ {config, ConfigDir, ConfigBaseNames}.
+ {config, NodeRefs, ConfigFiles}.
+ {config, NodeRefs, ConfigDir, ConfigBaseNames}.
+
+ {userconfig, {CallbackModule, ConfigStrings}}.
+ {userconfig, NodeRefs, {CallbackModule, ConfigStrings}}.
+
+ {logdir, LogDir}.                                        
+ {logdir, NodeRefs, LogDir}.
+
+ {logopts, LogOpts}.
+ {logopts, NodeRefs, LogOpts}.
+
+ {create_priv_dir, PrivDirOption}.
+ {create_priv_dir, NodeRefs, PrivDirOption}.
+
+ {event_handler, EventHandlers}.
+ {event_handler, NodeRefs, EventHandlers}.
+ {event_handler, EventHandlers, InitArgs}.
+ {event_handler, NodeRefs, EventHandlers, InitArgs}.
+
+ {ct_hooks, CTHModules}.
+ {ct_hooks, NodeRefs, CTHModules}.
+
+ {enable_builtin_hooks, Bool}.
+
+ {basic_html, Bool}.
+ {basic_html, NodeRefs, Bool}.
+
+ {release_shell, Bool}.</pre>
 	
-      <p>Test terms:</p>
+      <p><em>Test terms:</em></p>
       <pre>
-	{suites, Dir, Suites}.                                
-	{suites, NodeRefs, Dir, Suites}.
-	
-	{groups, Dir, Suite, Groups}.
-	{groups, NodeRefs, Dir, Suite, Groups}.
-	
-	{groups, Dir, Suite, Groups, {cases,Cases}}.
-	{groups, NodeRefs, Dir, Suite, Groups, {cases,Cases}}.
-	
-	{cases, Dir, Suite, Cases}.                           
-	{cases, NodeRefs, Dir, Suite, Cases}.
-	
-	{skip_suites, Dir, Suites, Comment}.
-	{skip_suites, NodeRefs, Dir, Suites, Comment}.
-	
-	{skip_groups, Dir, Suite, GroupNames, Comment}.
-	{skip_groups, NodeRefs, Dir, Suite, GroupNames, Comment}.
-	
-	{skip_cases, Dir, Suite, Cases, Comment}.
-        {skip_cases, NodeRefs, Dir, Suite, Cases, Comment}.</pre>
-	
-      <p>Types:</p>
+ {suites, Dir, Suites}.                                
+ {suites, NodeRefs, Dir, Suites}.
+
+ {groups, Dir, Suite, Groups}.
+ {groups, NodeRefs, Dir, Suite, Groups}.
+
+ {groups, Dir, Suite, Groups, {cases,Cases}}.
+ {groups, NodeRefs, Dir, Suite, Groups, {cases,Cases}}.
+
+ {cases, Dir, Suite, Cases}.                           
+ {cases, NodeRefs, Dir, Suite, Cases}.
+
+ {skip_suites, Dir, Suites, Comment}.
+ {skip_suites, NodeRefs, Dir, Suites, Comment}.
+
+ {skip_groups, Dir, Suite, GroupNames, Comment}.
+ {skip_groups, NodeRefs, Dir, Suite, GroupNames, Comment}.
+
+ {skip_cases, Dir, Suite, Cases, Comment}.
+ {skip_cases, NodeRefs, Dir, Suite, Cases, Comment}.</pre>
+
+	<marker id="types"></marker>
+      <p><em>Types:</em></p>
       <pre>
-	Bool            = true | false
-	Constant        = atom()
-	Value           = term()
-	InclSpecsOption = join | separate
-	TestSpecs       = string() | [string()]
-	NodeAlias       = atom()
-	Node            = node()
-	NodeRef         = NodeAlias | Node | master
-	NodeRefs        = all_nodes | [NodeRef] | NodeRef
-	InitOptions     = term()
-	Label           = atom() | string()
-	VerbosityLevels = integer() | [{Category,integer()}]
-	Category        = atom()
-	CSSFile         = string()
-	ConnTypes       = all | [atom()]
-	N               = integer()
-	CoverSpecFile   = string()
-	IncludeDirs     = string() | [string()]
-	ConfigFiles     = string() | [string()]
-	ConfigDir       = string()
-	ConfigBaseNames = string() | [string()]
-	CallbackModule  = atom()
-	ConfigStrings   = string() | [string()]
-	LogDir          = string()
-	LogOpts         = [term()]
-	PrivDirOption   = auto_per_run | auto_per_tc | manual_per_tc
-	EventHandlers   = atom() | [atom()]
-	InitArgs        = [term()]
-	CTHModules      = [CTHModule |
-	                   {CTHModule, CTHInitArgs} |
-	                   {CTHModule, CTHInitArgs, CTHPriority}]
-	CTHModule       = atom()
-	CTHInitArgs     = term()
-	Dir             = string()
-	Suites          = atom() | [atom()] | all
-	Suite           = atom()
-	Groups          = GroupPath | [GroupPath] | GroupSpec | [GroupSpec] | all
-	GroupPath       = [GroupName]
-	GroupSpec       = GroupName | {GroupName,Properties} | {GroupName,Properties,GroupSpec}
-	GroupName       = atom()
-	GroupNames      = GroupName | [GroupName]
-	Cases           = atom() | [atom()] | all
-        Comment         = string() | ""</pre>
-
-       <section>	
-	<p>The difference between the <c>config</c> terms above, is that with
+ Bool            = true | false
+ Constant        = atom()
+ Value           = term()
+ InclSpecsOption = join | separate
+ TestSpecs       = string() | [string()]
+ NodeAlias       = atom()
+ Node            = node()
+ NodeRef         = NodeAlias | Node | master
+ NodeRefs        = all_nodes | [NodeRef] | NodeRef
+ InitOptions     = term()
+ Label           = atom() | string()
+ VerbosityLevels = integer() | [{Category,integer()}]
+ Category        = atom()
+ CSSFile         = string()
+ ConnTypes       = all | [atom()]
+ N               = integer()
+ CoverSpecFile   = string()
+ IncludeDirs     = string() | [string()]
+ ConfigFiles     = string() | [string()]
+ ConfigDir       = string()
+ ConfigBaseNames = string() | [string()]
+ CallbackModule  = atom()
+ ConfigStrings   = string() | [string()]
+ LogDir          = string()
+ LogOpts         = [term()]
+ PrivDirOption   = auto_per_run | auto_per_tc | manual_per_tc
+ EventHandlers   = atom() | [atom()]
+ InitArgs        = [term()]
+ CTHModules      = [CTHModule |
+		    {CTHModule, CTHInitArgs} |
+		    {CTHModule, CTHInitArgs, CTHPriority}]
+ CTHModule       = atom()
+ CTHInitArgs     = term()
+ Dir             = string()
+ Suites          = atom() | [atom()] | all
+ Suite           = atom()
+ Groups          = GroupPath | [GroupPath] | GroupSpec | [GroupSpec] | all
+ GroupPath       = [GroupName]
+ GroupSpec       = GroupName | {GroupName,Properties} | {GroupName,Properties,GroupSpec}
+ GroupName       = atom()
+ GroupNames      = GroupName | [GroupName]
+ Cases           = atom() | [atom()] | all
+ Comment         = string() | ""</pre>
+	
+	<p>The difference between the <c>config</c> terms above is that with
 	<c>ConfigDir</c>, <c>ConfigBaseNames</c> is a list of base names,
-	i.e. without directory paths. <c>ConfigFiles</c> must be full names,
-	including paths. E.g, these two terms have the same meaning:</p>
+	that is, without directory paths. <c>ConfigFiles</c> must be full names,
+	including paths. For example, the following two terms have the same meaning:</p>
 	<pre>
-	  {config, ["/home/testuser/tests/config/nodeA.cfg",
-	            "/home/testuser/tests/config/nodeB.cfg"]}.
-	  
-	  {config, "/home/testuser/tests/config", ["nodeA.cfg","nodeB.cfg"]}.</pre>
+ {config, ["/home/testuser/tests/config/nodeA.cfg",
+           "/home/testuser/tests/config/nodeB.cfg"]}.
+
+ {config, "/home/testuser/tests/config", ["nodeA.cfg","nodeB.cfg"]}.</pre>
 
-	  <note><p>Any relative paths specified in the test specification, will be
-	  relative to the directory which contains the test specification file, if
+	  <note><p>Any relative paths, specified in the test specification, are
+	  relative to the directory containing the test specification file if
 	  <c>ct_run -spec TestSpecFile ...</c> or
 	  <c>ct:run:test([{spec,TestSpecFile},...])</c>
-	  executes the test. The path will be relative to the top level log directory, if
+	  executes the test.</p>
+	  <p>The path is relative to the top-level log directory if
 	  <c>ct:run:testspec(TestSpec)</c> executes the test.</p></note>	  
 	</section>
 
 	<section>
 	  <title>Constants</title>
 
-	  <p>The <c>define</c> term introduces a constant, which is used to
-	  replace the name <c>Constant</c> with <c>Value</c>, wherever it's found in
-	  the test specification. This replacement happens during an initial iteration
-	  through the test specification. Constants may be used anywhere in the test
-	  specification, e.g. in arbitrary lists and tuples, and even in strings
-	  and inside the value part of other constant definitions! A constant can
+	  <p>The term <c>define</c> introduces a constant that is used to
+	  replace the name <c>Constant</c> with <c>Value</c>, wherever it is found in
+	  the test specification. This replacement occurs during an initial iteration
+	  through the test specification. Constants can be used anywhere in the test
+	  specification, for example, in any lists and tuples, and even in strings
+	  and inside the value part of other constant definitions. A constant can
 	  also be part of a node name, but that is the only place where a constant
 	  can be part of an atom.</p>
 	  
 	  <note><p>For the sake of readability, the name of the constant must always
-	  begin with an upper case letter, or a <c>$</c>, <c>?</c>, or <c>_</c>.
-	  This also means that it must always be single quoted (obviously, since
-	  the constant name is actually an atom, not text).</p></note>
+	  begin with an uppercase letter, or a <c>$</c>, <c>?</c>, or <c>_</c>.
+	  This means that it must always be single quoted (as the constant name is 
+	  an atom, not text).</p></note>
 	  
 	  <p>The main benefit of constants is that they can be used to reduce the size
-	  (and avoid repetition) of long strings, such as file paths. Compare these
-	  terms:</p>
+	  (and avoid repetition) of long strings, such as file paths.</p>
+	  <p><em>Examples:</em></p>
 	  
 	  <pre>
-	    %% 1a. no constant
-	    {config, "/home/testuser/tests/config", ["nodeA.cfg","nodeB.cfg"]}.
-	    {suites, "/home/testuser/tests/suites", all}.
-	    
-	    %% 1b. with constant
-	    {define, 'TESTDIR', "/home/testuser/tests"}.
-	    {config, "'TESTDIR'/config", ["nodeA.cfg","nodeB.cfg"]}.
-	    {suites, "'TESTDIR'/suites", all}.
-	    
-	    %% 2a. no constants
-	    {config, [testnode@host1, testnode@host2], "../config", ["nodeA.cfg","nodeB.cfg"]}.
-	    {suites, [testnode@host1, testnode@host2], "../suites", [x_SUITE, y_SUITE]}.
-	    
-	    %% 2b. with constants
-	    {define, 'NODE', testnode}.
-	    {define, 'NODES', ['NODE'@host1, 'NODE'@host2]}.
-	    {config, 'NODES', "../config", ["nodeA.cfg","nodeB.cfg"]}.
-	    {suites, 'NODES', "../suites", [x_SUITE, y_SUITE]}.</pre>
+ %% 1a. no constant
+ {config, "/home/testuser/tests/config", ["nodeA.cfg","nodeB.cfg"]}.
+ {suites, "/home/testuser/tests/suites", all}.
+
+ %% 1b. with constant
+ {define, 'TESTDIR', "/home/testuser/tests"}.
+ {config, "'TESTDIR'/config", ["nodeA.cfg","nodeB.cfg"]}.
+ {suites, "'TESTDIR'/suites", all}.
+
+ %% 2a. no constants
+ {config, [testnode@host1, testnode@host2], "../config", ["nodeA.cfg","nodeB.cfg"]}.
+ {suites, [testnode@host1, testnode@host2], "../suites", [x_SUITE, y_SUITE]}.
+
+ %% 2b. with constants
+ {define, 'NODE', testnode}.
+ {define, 'NODES', ['NODE'@host1, 'NODE'@host2]}.
+ {config, 'NODES', "../config", ["nodeA.cfg","nodeB.cfg"]}.
+ {suites, 'NODES', "../suites", [x_SUITE, y_SUITE]}.</pre>
 
 	    <p>Constants make the test specification term <c>alias</c>, in previous
-	    versions of Common Test, redundant. This term has been deprecated but will
-	    remain supported in upcoming Common Test releases. Replacing <c>alias</c>
-	    terms with <c>define</c> is strongly recommended though! Here's an example
-	    of such a replacement:</p>
+	    versions of <c>Common Test</c>, redundant. This term is deprecated but
+	    remains supported in upcoming <c>Common Test</c> releases. Replacing <c>alias</c>
+	    terms with <c>define</c> is strongly recommended though. An example
+	    of such replacement follows:</p>
 	    
 	    <pre>
-	      %% using the old alias term
-	      {config, "/home/testuser/tests/config/nodeA.cfg"}.
-	      {alias, suite_dir, "/home/testuser/tests/suites"}.
-	      {groups, suite_dir, x_SUITE, group1}.
-	      
-	      %% replacing with constants
-	      {define, 'TestDir', "/home/testuser/tests"}.
-	      {define, 'CfgDir', "'TestDir'/config"}.
-	      {define, 'SuiteDir', "'TestDir'/suites"}.
-	      {config, 'CfgDir', "nodeA.cfg"}.
-	      {groups, 'SuiteDir', x_SUITE, group1}.</pre>
+ %% using the old alias term
+ {config, "/home/testuser/tests/config/nodeA.cfg"}.
+ {alias, suite_dir, "/home/testuser/tests/suites"}.
+ {groups, suite_dir, x_SUITE, group1}.
+
+ %% replacing with constants
+ {define, 'TestDir', "/home/testuser/tests"}.
+ {define, 'CfgDir', "'TestDir'/config"}.
+ {define, 'SuiteDir', "'TestDir'/suites"}.
+ {config, 'CfgDir', "nodeA.cfg"}.
+ {groups, 'SuiteDir', x_SUITE, group1}.</pre>
 	      
-	      <p>Actually, constants could well replace the <c>node</c> term too, but
-	      this still has declarative value, mainly when used in combination
-	      with <c>NodeRefs == all_nodes</c> (see types above).</p>
+	      <p>Constants can well replace term <c>node</c> also, but
+	      this still has a declarative value, mainly when used in combination
+	      with <c>NodeRefs == all_nodes</c> 
+	      (see <seealso marker="#types">Types</seealso>).</p>
 	</section>
 
 	<section>
@@ -955,104 +1049,104 @@
 	  
 	  <p>Here follows a simple test specification example:</p>
 	  <pre>
-	    {define, 'Top', "/home/test"}.
-	    {define, 'T1', "'Top'/t1"}.
-	    {define, 'T2', "'Top'/t2"}.
-	    {define, 'T3', "'Top'/t3"}.
-	    {define, 'CfgFile', "config.cfg"}.
-	    
-	    {logdir, "'Top'/logs"}.
-	    
-	    {config, ["'T1'/'CfgFile'", "'T2'/'CfgFile'", "'T3'/'CfgFile'"]}.
-	    
-	    {suites, 'T1', all}.
-	    {skip_suites, 'T1', [t1B_SUITE,t1D_SUITE], "Not implemented"}.
-	    {skip_cases, 'T1', t1A_SUITE, [test3,test4], "Irrelevant"}.
-	    {skip_cases, 'T1', t1C_SUITE, [test1], "Ignore"}.
-	    
-	    {suites, 'T2', [t2B_SUITE,t2C_SUITE]}.
-	    {cases, 'T2', t2A_SUITE, [test4,test1,test7]}.
-	    
-	    {skip_suites, 'T3', all, "Not implemented"}.</pre>
+ {define, 'Top', "/home/test"}.
+ {define, 'T1', "'Top'/t1"}.
+ {define, 'T2', "'Top'/t2"}.
+ {define, 'T3', "'Top'/t3"}.
+ {define, 'CfgFile', "config.cfg"}.
+
+ {logdir, "'Top'/logs"}.
+
+ {config, ["'T1'/'CfgFile'", "'T2'/'CfgFile'", "'T3'/'CfgFile'"]}.
+
+ {suites, 'T1', all}.
+ {skip_suites, 'T1', [t1B_SUITE,t1D_SUITE], "Not implemented"}.
+ {skip_cases, 'T1', t1A_SUITE, [test3,test4], "Irrelevant"}.
+ {skip_cases, 'T1', t1C_SUITE, [test1], "Ignore"}.
+
+ {suites, 'T2', [t2B_SUITE,t2C_SUITE]}.
+ {cases, 'T2', t2A_SUITE, [test4,test1,test7]}.
+
+ {skip_suites, 'T3', all, "Not implemented"}.</pre>
 	  
 	  <p>The example specifies the following:</p>
-	  <list>
-	    <item>The specified logdir directory will be used for storing 
+	  <list type="bulleted">
+	    <item>The specified <c>logdir</c> directory is used for storing 
 	    the HTML log files (in subdirectories tagged with node name, 
-	    date and time).</item>
-	    <item>The variables in the specified test system config files will be 
+	    date, and time).</item>
+	    <item>The variables in the specified test system configuration files are
 	    imported for the test.</item>
-	    <item>The first test to run includes all suites for system t1. Excluded from
-	    the test are however the t1B and t1D suites. Also test cases test3 and
-	    test4 in t1A as well as the test1 case in t1C are excluded from
-	    the test.</item>
-	    <item>Secondly, the test for system t2 should run. The included suites are
-	    t2B and t2C. Included are also test cases test4, test1 and test7 in suite
-	    t2A. Note that the test cases will be executed in the specified order.</item>
-	    <item>Lastly, all suites for systems t3 are to be completely skipped and this
-	    should be explicitly noted in the log files.</item>
+	    <item>The first test to run includes all suites for system <c>t1</c>. 
+	    Suites <c>t1B</c> and <c>t1D</c> are excluded from the test. Test cases 
+	    <c>test3</c> and <c>test4</c> in <c>t1A</c> and <c>test1</c> case in <c>t1C</c> 
+	    are also excluded from the test.</item>
+	    <item>The second test to run is for system <c>t2</c>. The included suites are
+	    <c>t2B</c> and <c>t2C</c>. Test cases <c>test4</c>, <c>test1</c>, and <c>test7</c> in suite
+	    <c>t2A</c> are also included. The test cases are executed in the specified order.</item>
+	    <item>The last test to run is for system <c>t3</c>. Here, all suites are skipped and this
+	    is explicitly noted in the log files.</item>
 	  </list>
 	</section>
 
 	<section>
-	  <title>The init term</title>
-	  <p>With the <c>init</c> term it's possible to specify initialization options
-	  for nodes defined in the test specification. Currently, there are options
-	  to start the node and/or to evaluate any function on the node.
-	  See the <seealso marker="ct_master_chapter#ct_slave">Automatic startup of
-	  the test target nodes</seealso> chapter for details.</p>
+	  <title>The init Term</title>
+	  <p>With term <c>init</c> it is possible to specify initialization options
+	  for nodes defined in the test specification. There are options
+	  to start the node and to evaluate any function on the node.
+	  For details, see section <seealso marker="ct_master_chapter#ct_slave">Automatic Startup of
+	  Test Target Nodes</seealso> in section Using Common Test for Large Scale Testing.</p>
 	</section>
 	<section>
-	  <title>User specific terms</title>
-	  <p>It is possible for the user to provide a test specification that
-	  includes (for Common Test) unrecognizable terms. If this is desired,
-	  the <c>-allow_user_terms</c> flag should be used when starting tests with
-	  <c>ct_run</c>. This forces Common Test to ignore unrecognizable terms.
-	  Note that in this mode, Common Test is not able to check the specification 
-	  for errors as efficiently as if the scanner runs in default mode. 
+	  <title>User-Specific Terms</title>
+	  <p>The user can provide a test specification including (for <c>Common Test</c>) 
+	  unrecognizable terms. If this is desired, use flag <c>-allow_user_terms</c> 
+	  when starting tests with <c>ct_run</c>. This forces <c>Common Test</c> to ignore 
+	  unrecognizable terms. In this mode, <c>Common Test</c> is not able to check the 
+	  specification for errors as efficiently as if the scanner runs in default mode. 
 	  If <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> is used
-	  for starting the tests, the relaxed scanner
-	  mode is enabled by means of the tuple: <c>{allow_user_terms,true}</c></p>
+	  for starting the tests, the relaxed scanner mode is enabled by tuple
+	  <c>{allow_user_terms,true}</c>.</p>
 	</section>
 	<section>
-	  <title>Reading test specification terms</title>
-	  <p>It's possible to look up terms in the current test specification
-	  (i.e. the spec that's been used to configure and run the current test).
-	  The function <c>get_testspec_terms()</c> returns a list of all test spec
-	  terms (both config- and test terms) and <c>get_testspec_terms(Tags)</c>
-	  returns the term (or a list of terms) matching the tag (or tags) in
-	  <c>Tags</c>.</p>
+	  <title>Reading Test Specification Terms</title>
+	  <p>Terms in the current test specification
+	  (that is, the specification that has been used to configure and run the current test)
+	  can be looked up.
+	  The function <seealso marker="ct#get_testspec_terms-0"><c>get_testspec_terms()</c></seealso> 
+	  returns a list of all test specification terms (both configuration terms and test terms), 
+	  and <c>get_testspec_terms(Tags)</c> returns the term (or a list of terms) matching the 
+	  tag (or tags) in <c>Tags</c>.</p>
 	  <p>For example, in the test specification:</p>
 	  <pre>
-	    ...
-	    {label, my_server_smoke_test}.
-	    {config, "../../my_server_setup.cfg"}.
-	    {config, "../../my_server_interface.cfg"}.
-	    ...</pre>	    
-	  <p>And in e.g. a test suite or a CT hook function:</p>
+ ...
+ {label, my_server_smoke_test}.
+ {config, "../../my_server_setup.cfg"}.
+ {config, "../../my_server_interface.cfg"}.
+ ...</pre>	    
+	  <p>And in, for example, a test suite or a <c>Common Test Hook</c> function:</p>
 	  <pre>
-	    ...
-	    [{label,[{_Node,TestType}]}, {config,CfgFiles}] =
-                ct:get_testspec_terms([label,config]),
+ ...
+ [{label,[{_Node,TestType}]}, {config,CfgFiles}] =
+     ct:get_testspec_terms([label,config]),
 
-            [verify_my_server_cfg(TestType, CfgFile) || {Node,CfgFile} &lt;- CfgFiles,
-                                                        Node == node()];
-	    ...</pre>
+ [verify_my_server_cfg(TestType, CfgFile) || {Node,CfgFile} &lt;- CfgFiles,
+					     Node == node()];
+ ...</pre>
 	</section>
   </section>
 
   <section>
-    <title>Running tests from the Web based GUI</title>
+    <title>Running Tests from the Web-Based GUI</title>
     
-    <p>The web based GUI, VTS, is started with the
+    <p>The web-based GUI, Virtual Test Server (VTS), is started with the
       <seealso marker="run_test_chapter#ct_run"><c>ct_run</c></seealso>
-      program. From the GUI you can load config files, and select
-      directories, suites and cases to run. You can also state the
-      config files, directories, suites and cases on the command line
-      when starting the web based GUI.
+      program. From the GUI, you can load configuration files and select
+      directories, suites, and cases to run. You can also state the
+      configuration files, directories, suites, and cases on the command line
+      when starting the web-based GUI.
     </p>
-    
-    <list>
+    <p><em>Examples:</em></p>
+    <list type="bulleted">
       <item><c>ct_run -vts</c></item>
       <item><c><![CDATA[ct_run -vts -config <configfilename>]]></c></item>
       <item><c><![CDATA[ct_run -vts -config <configfilename> -suite <suitewithfullpath>
@@ -1062,454 +1156,464 @@
     <p>From the GUI you can run tests and view the result and the logs.
     </p>
     
-    <p>Note that <c>ct_run -vts</c> will try to open the Common Test start
-      page in an existing web browser window or start the browser if it is
-      not running. Which browser should be started may be specified with
+    <p><c>ct_run -vts</c> tries to open the <c>Common Test</c> start
+      page in an existing web browser window, or start the browser if it is
+      not running. Which browser to start can be specified with
       the browser start command option:</p>
       <p><c><![CDATA[ct_run -vts -browser <browser_start_cmd>]]></c></p>
-      <p>Example:</p>
+      <p><em>Example:</em></p>
       <p><c><![CDATA[$ ct_run -vts -browser 'firefox&']]></c></p>
-      <p>Note that the browser must run as a separate OS process or VTS will hang!</p>
-      <p>If no specific browser start command is specified, Firefox will
-        be the default browser on Unix platforms and Internet Explorer on Windows.
-	If Common Test fails to start a browser automatically, or <c>'none'</c> is
-	specified as the value for -browser (i.e. <c>-browser none</c>), start your
-	favourite browser manually and type in the URL that Common Test
+
+      <note><p>The browser must run as a separate OS process, otherwise VTS hangs.</p></note>
+
+      <p>If no specific browser start command is specified, Firefox is
+        the default browser on Unix platforms, and Internet Explorer on Windows.
+	If <c>Common Test</c> fails to start a browser automatically, or <c>none</c> is
+	specified as the value for <c>-browser</c> (that is, <c>-browser none</c>), start your
+	favourite browser manually and type the URL that <c>Common Test</c>
 	displays in the shell.</p>    
   </section>
   
   <section>
     <marker id="log_files"></marker>
-    <title>Log files</title>
+    <title>Log Files</title>
     
     <p>As the execution of the test suites proceed, events are logged in
-      four different ways:</p>
+      the following four different ways:</p>
       
-      <list>
-	<item>Text to the operator's console.</item>
-	<item>Suite related information is sent to the major log file.</item>
-	<item>Case related information is sent to the minor log file.</item>
-	<item>The HTML overview log file gets updated with test results.</item>
+      <list type="bulleted">
+	<item>Text to the operator console.</item>
+	<item>Suite-related information is sent to the major log file.</item>
+	<item>Case-related information is sent to the minor log file.</item>
+	<item>The HTML overview log file is updated with test results.</item>
 	<item>A link to all runs executed from a certain directory is written in
-	  the log named "all_runs.html" and direct links to all tests (the
-	  latest results) are written to the top level "index.html".</item>
+	  the log named <c>all_runs.html</c> and direct links to all tests (the
+	  latest results) are written to the top-level <c>index.html</c>.</item>
       </list>
       
-      <p>Typically the operator, who may run hundreds or thousands of
-	test cases, doesn't want to fill the console with details
-	about, or printouts from, the specific test cases. By default, the 
-	operator will only see:</p>
+      <p>Typically the operator, possibly running hundreds or thousands of
+	test cases, does not want to fill the console with details
+	about, or printouts from, specific test cases. By default, the 
+	operator only sees the following:</p>
       
-      <list>
+      <list type="bulleted">
 	<item>A confirmation that the test has started and information about how 
-	  many test cases will be executed totally.</item>
+	  many test cases are executed in total.</item>
 	<item>A small note about each failed test case.</item>
 	<item>A summary of all the run test cases.</item>
-	<item>A confirmation that the test run is complete.</item>
-	<item>Some special information like error reports and progress
-	  reports, printouts written with erlang:display/1, or io:format/3
+	<item>A confirmation when the test run is complete.</item>
+	<item>Some special information, such as error reports, progress
+	  reports, and printouts written with <c>erlang:display/1</c>, or <c>io:format/3</c>
 	  specifically addressed to a receiver other than <c>standard_io</c>
-	  (e.g. the default group leader process 'user').</item>
+	  (for example, the default group leader process <c>user</c>).</item>
       </list>
 
-      <p>If/when the operator wants to dig deeper into the general results, or
-        the result of a specific test case, he should do so by
-	following the links in the HTML presentation and take a look in the
-	major or minor log files. The "all_runs.html" page is a practical
-	starting point usually. It's located in <c>logdir</c> and contains
-	a link to each test run including a quick overview (date and time,
-	node name, number of tests, test names and test result totals).</p>
+      <p>To dig deeper into the general results, or
+        the result of a specific test case, the operator can do so by
+	following the links in the HTML presentation and read the
+	major or minor log files. The "all_runs.html" page is a good
+	starting point. It is located in <c>logdir</c> and contains
+	a link to each test run, including a quick overview (with date and time,
+	node name, number of tests, test names, and test result totals).</p>
 	
-      <p>An "index.html" page is written for each test run (i.e. stored in
-	the "ct_run" directory tagged with node name, date and time). This
-	file gives a short overview of all individual tests performed in the 
-	same test run. The test names follow this convention:</p>
-      <list>
-	<item><em>TopLevelDir.TestDir</em> (all suites in TestDir executed)</item>
-	<item><em>TopLevelDir.TestDir:suites</em> (specific suites were executed)</item>
-	<item><em>TopLevelDir.TestDir.Suite</em> (all cases in Suite executed)</item>
-	<item><em>TopLevelDir.TestDir.Suite:cases</em> (specific test cases were executed)</item>
-	<item><em>TopLevelDir.TestDir.Suite.Case</em> (only Case was executed)</item>
+      <p>An "index.html" page is written for each test run (that is, stored in
+	the <c>ct_run</c> directory tagged with node name, date, and time). This
+	file provides an overview of all individual tests performed in the 
+	same test run. The test names follow the following convention:</p>
+      <list type="bulleted">
+	<item><c>TopLevelDir.TestDir</c> (all suites in <c>TestDir</c> executed)</item>
+	<item><c>TopLevelDir.TestDir:suites</c> (specific suites executed)</item>
+	<item><c>TopLevelDir.TestDir.Suite</c> (all cases in <c>Suite</c> executed)</item>
+	<item><c>TopLevelDir.TestDir.Suite:cases</c> (specific test cases executed)</item>
+	<item><c>TopLevelDir.TestDir.Suite.Case</c> (only <c>Case</c> executed)</item>
       </list>
       
-      <p>On the test run index page there is a link to the Common Test
+      <p>The "test run index" page includes a link to the <c>Common Test</c>
         Framework Log file in which information about imported
         configuration data and general test progress is written. This
         log file is useful to get snapshot information about the test
-        run during execution. It can also be very helpful when
+        run during execution. It can also be helpful when
         analyzing test results or debugging test suites.</p>
 
-      <p>On the test run index page it is noted if a test has missing
-        suites (i.e. suites that Common Test has failed to
+      <p>The "test run index" page indicates if a test has missing
+        suites (that is, suites that <c>Common Test</c> failed to
         compile). Names of the missing suites can be found in the
-        Common Test Framework Log file.</p>
+        <c>Common Test</c> Framework Log file.</p>
 
       <p>The major log file shows a detailed report of the test run. It
         includes test suite and test case names, execution time, the 
-	exact reason for failures etc. The information is available in both
+	exact reason for failures, and so on. The information is available in both
 	a file with textual and with HTML representation. The HTML file shows a 
-	summary which gives a good overview of the test run. It also has links 
+	summary that gives a good overview of the test run. It also has links 
 	to each individual test case log file for quick viewing with an HTML 
 	browser.</p>
       
       <p>The minor log files contain full details of every single test
-	case, each one in a separate file. This way, it should be
+	case, each in a separate file. This way, it is
 	straightforward	to compare the latest results to that of previous
-	test runs, even if the set of test cases changes. If SASL is running,
-	its logs will also be printed to the current minor log file by the
+	test runs, even if the set of test cases changes. If application <c>SASL</c> 
+	is running, its logs are also printed to the current minor log file by the
 	<seealso marker="common_test:ct_hooks_chapter#builtin_cths">
 	  cth_log_redirect built-in hook</seealso>.
       </p>
 
-      <p>The full name of the minor log file (i.e. the name of the file
+      <p>The full name of the minor log file (that is, the name of the file
 	including the absolute directory path) can be read during execution
-	of the test case. It comes as value in the tuple
+	of the test case. It comes as value in tuple
 	<c>{tc_logfile,LogFileName}</c> in the <c>Config</c> list (which means it
-	can also be read by a pre- or post Common Test hook function). Also,
+	can also be read by a pre- or post <c>Common Test Hook</c> function). Also,
 	at the start of a test case, this data is sent with an event
-	to any installed event handler.	Please see the
-	<seealso marker="event_handler_chapter#event_handling">Event Handling</seealso>
-	chapter for details.
+	to any installed event handler.	For details, see section
+	<seealso marker="event_handler_chapter#event_handling">Event Handling</seealso>.
       </p>
-      
-      <p>Which information goes where is user configurable via the
-	test server controller. Three threshold values determine what
-	comes out on screen, and in the major or minor log files. See
-	the OTP Test Server manual for information. The	contents that 
-	goes to the HTML log file is fixed however and cannot be altered.</p>
-
-      <p>The log files are written continously during a test run and links are
-	always created initially when a test starts. This makes it possible
-	to follow test progress simply by refreshing pages in the HTML browser.
+
+      <p>The log files are written continuously during a test run and links are
+	always created initially when a test starts. Thevtest progress can therefore 
+	be followed simply by refreshing pages in the HTML browser.
 	Statistics totals are not presented until a test is complete however.</p>
 
 	<section>
 	  <marker id="logopts"></marker>
-	  <title>Log options</title>
-	  <p>With the <c>logopts</c> start flag, it's possible to specify
-	  options that modify some aspects of the logging behaviour.
-	  Currently, the following options are available:</p>
-	  <list>
-	    <item><c>no_src</c></item>
-	    <item><c>no_nl</c></item>
-	  </list>
-	  <p>With <c>no_src</c>, the html version of the test suite source
-	  code will not be generated during the test run (and consequently
-	  not be available in the log file system).</p>
-	  <p>With <c>no_nl</c>, Common Test will not add a newline character
-	  (\n) to the end of an output string that it receives from a call to e.g.
-	  <c>io:format/2</c>, and which it prints to the test case log.</p>
+	  <title>Log Options</title>
+	  <p>With start flag <c>logopts</c> options that modify some aspects 
+	  of the logging behavior can be specified.
+	  The following options are available:</p>
+	  <taglist>
+	    <tag><c>no_src</c></tag>
+	    <item><p>The HTML version of the test suite source code is not 
+	    generated during the test run (and is consequently not available 
+	    in the log file system).</p></item>
+	    <tag><c>no_nl</c></tag>
+	    <item><p><c>Common Test</c> does not add a newline character <c>(\n)</c> 
+	    to the end of an output string that it receives from a call to, for example, 
+	    <c>io:format/2</c>, and which it prints to the test case log.</p></item>
+	    </taglist>
+
 	  <p>For example, if a test is started with:</p>
 	  <p><c>$ ct_run -suite my_SUITE -logopts no_src</c></p>
 	  <p>then printouts during the test made by successive calls to <c>io:format("x")</c>,
-	  will appear in the test case log as:</p>
+	  appears in the test case log as:</p>
 	  <p><c>xxx</c></p>
-	  <p>instead of each <c>x</c> printed on a new line, which is the default behaviour.</p>
+	  <p>instead of each <c>x</c> printed on a new line, which is the default behavior.</p>
 	</section>
 
 	<section>
 	  <marker id="table_sorting"></marker>
-	  <title>Sorting HTML table columns</title>
-	  <p>By clicking the name in the column header of any table (e.g. "Ok", "Case", "Time", etc),
-	    the table rows are sorted in whatever order makes sense for the type of value (e.g.
-	    numerical for "Ok" or "Time", and alphabetical for "Case"). The sorting is performed
-	    by means of JavaScript code, automatically inserted into the HTML log files. Common Test
-	    uses the <url href="http://jquery.com">jQuery</url> library and the
-	    <url href="http://tablesorter.com">tablesorter</url> plugin, with customized sorting
-	    functions, for this implementation.</p>
+	  <title>Sorting HTML Table Columns</title>
+	  <p>By clicking the name in the column header of any table 
+	    (for example, "Ok", "Case", "Time", and so on), the table rows are sorted 
+	    in whatever order makes sense for the type of value (for example,
+	    numerical for "Ok" or "Time", and alphabetical for "Case"). The sorting is 
+	    performed through JavaScript code, automatically inserted into the HTML 
+	    log files. <c>Common Test</c> uses the <url href="http://jquery.com">jQuery</url> 
+	    library and the
+	    <url href="http://tablesorter.com">tablesorter</url> plugin, 
+	    with customized sorting functions, for this implementation.</p>
 	</section>
 
 	<section>
 	  <title>The Unexpected I/O Log</title>
-	  <p>On the test suites overview page you find a link to the Unexpected I/O Log.
-	  In this log, Common Test saves printouts made with
-	  <c>ct:log/2</c> and <c>ct:pal/2</c>, as well as captured system error- and
-	  progress reports, that cannot be associated with particular test cases and
-	  therefore cannot be written to individual test case log files. This happens e.g.
-	  if a log printout is made from an external process (not a test case process),
-	  or if an error- or progress report comes in, during a short interval while Common
-	  Test is not executing a test case or configuration function, <em>or</em> while
-	  Common Test is currently executing a parallell test case group.</p>
+	  <p>The test suites overview page includes a link to the Unexpected I/O Log.
+	  In this log, <c>Common Test</c> saves printouts made with
+	  <seealso marker="ct#log-2"><c>ct:log/2</c></seealso> and 
+	  <seealso marker="ct#pal-2"><c>ct:pal/2</c></seealso>, as well as captured system 
+	  error- and progress reports, which cannot be associated with particular test cases and
+	  therefore cannot be written to individual test case log files. This occurs,
+	  for example, if a log printout is made from an external process (not a test 
+	  case process), <em>or</em> if an error- or progress report comes in, during a short 
+	  interval while <c>Common Test</c> is not executing a test case or configuration 
+	  function, <em>or</em> while <c>Common Test</c> is currently executing a parallel 
+	  test case group.</p>
 	</section>
 
 	<section>
 	  <marker id="pre_post_test_io_log"></marker>
 	  <title>The Pre- and Post Test I/O Log</title>
-	  <p>On the Common Test Framework Log page you find links to the so called
-	  Pre- and Post Test I/O Log. In this log, Common Test saves printouts made with
-	  <c>ct:log/2</c> and <c>ct:pal/2</c>, as well as captured system error-
-	  and progress reports, that take place before - and after - the actual test run.
+	  <p>The <c>Common Test</c> Framework Log page includes links to the
+	  Pre- and Post Test I/O Log. In this log, <c>Common Test</c> saves printouts made 
+	  with <c>ct:log/2</c> and <c>ct:pal/2</c>, as well as captured system error-
+	  and progress reports, which take place before, and after, the test run.
 	  Examples of this are printouts from a CT hook init- or terminate function, or
 	  progress reports generated when an OTP application is started from a CT hook
-	  init function. Another example is an error report generated due to
+	  init function. Another example is an error report generated because of
 	  a failure when an external application is stopped from a CT hook terminate function.
 	  All information in these examples ends up in the Pre- and Post Test I/O Log.
 	  For more information on how to synchronize test runs with external user
-	  applications, please see the
+	  applications, see section
 	  <seealso marker="ct_hooks_chapter#synchronizing">Synchronizing</seealso>
-	  section in the Common Test Hooks chapter.</p>
-	  <p>Note that logging to file with <c>ct:log/2</c> or <c>ct:pal/2</c>
-	  only works when Common Test is running. Printouts with <c>ct:pal/2</c>
-	  are however always displayed on screen.</p>
+	  in section Common Test Hooks.</p>
+	  <note><p>Logging to file with <c>ct:log/2</c> or <c>ct:pal/2</c>
+	  only works when <c>Common Test</c> is running. Printouts with <c>ct:pal/2</c>
+	  are however always displayed on screen.</p></note>
 	</section>
       </section>
   
       <section>
 	<marker id="html_stylesheet"></marker>
 	<title>HTML Style Sheets</title>
-	<p>Common Test uses an HTML Style Sheet (CSS file) to control the look of
-	  the HTML log files generated during test runs. If, for some reason, the
-	  log files are not displayed correctly in the browser of your
-	  choice, or you prefer a more primitive ("pre Common Test v1.6") look
-	  of the logs, use the start flag/option:</p>
-	<pre>basic_html</pre>
-	<p>This disables the use of Style Sheets, as well as JavaScripts (see
-	  table sorting above).</p>
+	<p><c>Common Test</c> uses an HTML Style Sheet (CSS file) to control the look of
+	  the HTML log files generated during test runs. If the log files are not 
+	  displayed correctly in the browser of your choice, or you prefer a more 
+	  primitive ("pre <c>Common Test</c> v1.6") look of the logs, use the start 
+	  flag/option:</p>
+	  <pre>
+ basic_html</pre>
+	<p>This disables the use of style sheets and JavaScripts (see
+	  <seealso marker="#table_sorting">Sorting HTML Table Columns</seealso>).</p>
 	  
-	<p>Common Test includes an <em>optional</em> feature to allow
+	<p><c>Common Test</c> includes an <em>optional</em> feature to allow
 	  user HTML style sheets for customizing printouts. The
 	  functions in <c>ct</c> that print to a test case HTML log
 	  file (<c>log/3</c> and <c>pal/3</c>) accept <c>Category</c>
-	  as first argument. With this argument it's possible to
-	  specify a category that can be mapped to a selector in a CSS
-	  definition. This is useful especially for coloring text
+	  as first argument. With this argument a category can be specified 
+	  that can be mapped to a selector in a CSS
+	  definition. This is useful, especially for coloring text
 	  differently depending on the type of (or reason for) the
 	  printout. Say you want one color for test system
 	  configuration information, a different one for test system
-	  state information and finally one for errors detected by the
-	  test case functions. The corresponding style sheet may
-	  look like this:</p>
+	  state information, and finally one for errors detected by the
+	  test case functions. The corresponding style sheet can
+	  look as follows:</p>
 
 	<pre>
-	  div.sys_config  { background:blue; color:white }
-	  div.sys_state   { background:yellow; color:black }
-	  div.error       { background:red; color:white }</pre>
+ div.sys_config  { background:blue; color:white }
+ div.sys_state   { background:yellow; color:black }
+ div.error       { background:red; color:white }</pre>
 
-	<p>To install the CSS file (Common Test inlines the definition in the 
-	  HTML code), the name may be provided when executing <c>ct_run</c>.
-	  Example:</p>
+	<p>To install the CSS file (<c>Common Test</c> inlines the definition in the 
+	  HTML code), the name can be provided when executing <c>ct_run</c>.</p>
+	  <p><em>Example:</em></p>
 
 	<pre>
-	  $ ct_run -dir $TEST/prog -stylesheet $TEST/styles/test_categories.css</pre>
+ $ ct_run -dir $TEST/prog -stylesheet $TEST/styles/test_categories.css</pre>
 
-	  <p>Categories in a CSS file installed with the <c>-stylesheet</c> flag
+	  <p>Categories in a CSS file installed with flag <c>-stylesheet</c>
 	    are on a global test level in the sense that they can be used in any 
-	    suite which is part of the test run.</p>
+	    suite that is part of the test run.</p>
 
-	  <p>It is also possible to install style sheets on a per suite and
-	  per test case basis. Example:</p>
+	  <p>Style sheets can also be installed on a per suite and
+	  per test case basis.</p>
+	  <p><em>Example:</em></p>
 
 	<pre>
-	  -module(my_SUITE).
-	  ...
-	  suite() -> [..., {stylesheet,"suite_categories.css"}, ...].
-	  ...
-	  my_testcase(_) ->
-	      ...
-	      ct:log(sys_config, "Test node version: ~p", [VersionInfo]),
-	      ...
-	      ct:log(sys_state, "Connections: ~p", [ConnectionInfo]),
-	      ...
-	      ct:pal(error, "Error ~p detected! Info: ~p", [SomeFault,ErrorInfo]),
-	      ct:fail(SomeFault).</pre>
+ -module(my_SUITE).
+ ...
+ suite() -> [..., {stylesheet,"suite_categories.css"}, ...].
+ ...
+ my_testcase(_) ->
+     ...
+     ct:log(sys_config, "Test node version: ~p", [VersionInfo]),
+     ...
+     ct:log(sys_state, "Connections: ~p", [ConnectionInfo]),
+     ...
+     ct:pal(error, "Error ~p detected! Info: ~p", [SomeFault,ErrorInfo]),
+     ct:fail(SomeFault).</pre>
 
 	<p>If the style sheet is installed as in this example, the categories are 
 	  private to the suite in question. They can be used by all test cases in the 
-	  suite, but can not be used by other suites. A suite private style sheet, 
-	  if specified, will be used in favour of a global style sheet (one specified 
-	  with the <c>-stylesheet</c> flag). A stylesheet tuple (as returned by <c>suite/0</c> 
-	  above) can also be returned from a test case info function. In this case the 
+	  suite, but cannot be used by other suites. A suite private style sheet, 
+	  if specified, is used in favor of a global style sheet (one specified 
+	  with flag <c>-stylesheet</c>). A stylesheet tuple (as returned by <c>suite/0</c> 
+	  above) can also be returned from a test case information function. In this case the 
 	  categories specified in the style sheet can only be used in that particular 
-	  test case. A test case private style sheet is used in favour of a suite or 
+	  test case. A test case private style sheet is used in favor of a suite or 
 	  global level style sheet.
 	</p>
 
 	<p>In a tuple <c>{stylesheet,CSSFile}</c>, if <c>CSSFile</c> is specified
-	  with a path, e.g. <c>"$TEST/styles/categories.css"</c>, this full
-	  name will be used to locate the file. If only the file name is specified
-	  however, e.g. "categories.css", then the CSS file is assumed to be located
-	  in the data directory, <c>data_dir</c>, of the suite. The latter usage is
-	  recommended since it is portable compared to hard coding path names in the 
-	  suite!</p>
-
-	<p>The <c>Category</c> argument in the example above may have the
+	  with a path, for example, <c>"$TEST/styles/categories.css"</c>, this full
+	  name is used to locate the file. However, if only the file name is specified,
+	  for example, <c>categories.css</c>, the CSS file is assumed to be located
+	  in the data directory, <c>data_dir</c>, of the suite. The latter use is
+	  recommended, as it is portable compared to hard coding path names in the 
+	  suite.</p>
+
+	<p>Argument <c>Category</c> in the previous example can have the
 	  value (atom) <c>sys_config</c> (white on blue), <c>sys_state</c>
-	  (black on yellow) or <c>error</c> (white on red).</p>
+	  (black on yellow), or <c>error</c> (white on red).</p>
   </section>
 
   <section>
     <marker id="repeating_tests"></marker>
-    <title>Repeating tests</title>    
-    <p>You can order Common Test to repeat the tests you specify. You can choose
-       to repeat tests a certain number of times, repeat tests for a specific period of time, 
+    <title>Repeating Tests</title>    
+    <p>You can order <c>Common Test</c> to repeat the tests you specify. You can choose
+       to repeat tests a number of times, repeat tests for a specific period of time, 
        or repeat tests until a particular stop time is reached. If repetition is controlled by
-       means of time, it is also possible to specify what action Common Test should 
-       take upon timeout. Either Common Test performs all tests in the current run before stopping, 
-       or it stops as soon as the current test job is finished. Repetition can be activated by
-       means of <c>ct_run</c> start flags, or tuples in the <c>ct:run:test/1</c>
-       option list argument. The flags (options in parenthesis) are:</p>
-       <list>
-       <item><c>-repeat N ({repeat,N})</c>, where <c>N</c> is a positive integer.</item>
-       <item><c>-duration DurTime ({duration,DurTime})</c>, where <c>DurTime</c> is the duration, see below.</item>
-       <item><c>-until StopTime ({until,StopTime})</c>, where <c>StopTime</c> is finish time, see below.</item>
+       time, an action for <c>Common Test</c> to take upon time-out can be specified. 
+       Either <c>Common Test</c> performs all tests in the current run 
+       before stopping, or it stops when the current test job is finished. Repetition 
+       can be activated by <c>ct_run</c> start flags, or tuples in the <c>ct:run:test/1</c>
+       option list argument. The flags (options in parentheses) are the following:</p>
+       <list type="bulleted">
+       <item><c>-repeat N ({repeat,N})</c>, where <c>N</c> is a positive integer</item>
+       <item><c>-duration DurTime ({duration,DurTime})</c>, where <c>DurTime</c> is the duration</item>
+       <item><c>-until StopTime ({until,StopTime})</c>, where <c>StopTime</c> is finish time</item>
        <item><c>-force_stop ({force_stop,true})</c></item>
        <item><c>-force_stop skip_rest ({force_stop,skip_rest})</c></item>
        </list>
-       <p>The duration time, <c>DurTime</c>, is specified as <c>HHMMSS</c>. Example: 
-          <c>-duration 012030</c> or <c>{duration,"012030"}</c>, means the tests will 
-	  be executed and (if time allows) repeated, until timeout occurs after 1 h, 20 min 
-	  and 30 secs. 
-	  <c>StopTime</c> can be specified as <c>HHMMSS</c> and is then interpreted as a time today 
-	  (or possibly tomorrow). <c>StopTime</c> can also be specified as <c>YYMoMoDDHHMMSS</c>. 
-	  Example: <c>-until 071001120000</c> or <c>{until,"071001120000"}</c>, which means the tests
-	  will be executed and (if time allows) repeated, until 12 o'clock on the 1st of Oct 2007.</p>
-
-       <p>When timeout occurs, Common Test will never abort the ongoing test case, since
-          this might leave the system under test in an undefined, and possibly bad, state.
-	  Instead Common Test will by default finish the current test
-	  run before stopping. If the <c>force_stop</c> flag is
-	  given, Common Test will stop as soon as the current test job
-	  is finished, and if the <c>force_stop</c> flag is given with
-	  <c>skip_rest</c> Common Test will only complete the current
-	  test case and skip the rest of the tests in the test job.
-	  Note that since Common Test always finishes off at least the
-	  current test case,
-	  the time specified with <c>duration</c> or <c>until</c> is never definitive!</p>
-
-       <p>Log files from every single repeated test run is saved in normal Common Test fashion (see above). 
-          Common Test may later support an optional feature to only store the last (and possibly 
-	  the first) set of logs of repeated test runs, but for now the user must be careful not 
-	  to run out of disk space if tests are repeated during long periods of time.</p>
-
-       <p>Note that for each test run that is part of a repeated session, information about the
-          particular test run is printed in the Common Test Framework Log. There you can read
-	  the repetition number, remaining time, etc.</p>
-
-       <p>Example 1:</p>
+	  <taglist>
+	    <tag><c>DurTime</c></tag>
+	    <item><p>The duration time is specified as <c>HHMMSS</c>, for example, <c>-duration 012030</c> 
+	    or <c>{duration,"012030"}</c></p>, which means that the tests are executed and 
+	    (if time allows) repeated until time-out occurs after 1 hour, 20 minutes, and 30 seconds.
+	    </item>
+	    <tag><c>StopTime</c></tag>
+	    <item><p>The finish time can be specified as <c>HHMMSS</c> and is then interpreted as a 
+	    time today (or possibly tomorrow), but can also be specified as <c>YYMoMoDDHHMMSS</c>,
+	    for example, <c>-until 071001120000</c> or <c>{until,"071001120000"}</c>. This means
+	    that the tests are executed and (if time allows) repeated, until 12 o'clock on the 1st 
+	    of October 2007.</p>
+	    </item>
+	  </taglist>
+
+       <p>When time-out occurs, <c>Common Test</c> never aborts the ongoing test case,
+          as this can leave the SUT in an undefined, and possibly bad, state.
+	  Instead <c>Common Test</c>, by default, finishes the current test
+	  run before stopping. If flag <c>force_stop</c> is
+	  specified, <c>Common Test</c> stops when the current test job
+	  is finished. If flag <c>force_stop</c> is specified with
+	  <c>skip_rest</c>, <c>Common Test</c> only completes the current
+	  test case and skips the remaining tests in the test job.</p>
+	  <note><p>As <c>Common Test</c> always finishes at least the current test case,
+	  the time specified with <c>duration</c> or <c>until</c> is never definitive.</p></note>
+
+       <p>Log files from every repeated test run is saved in normal <c>Common Test</c> 
+       fashion (described earlier).</p>
+       <p><c>Common Test</c> might later support an optional feature to only store the last (and possibly 
+       the first) set of logs of repeated test runs, but for now the user must be careful not 
+       to run out of disk space if tests are repeated during long periods of time.</p>
+
+       <p>For each test run that is part of a repeated session, information about the
+          particular test run is printed in the <c>Common Test</c> Framework Log. The information
+	  includes the repetition number, remaining time, and so on.</p>
+
+       <p><em>Example 1:</em></p>
        <pre>
-          $ ct_run -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -duration 001000 -force_stop</pre>
-       <p>Here the suites in test directory to1, followed by the suites in to2, will be executed 
-          in one test run. A timeout event will occur after 10 minutes. As long as there is time 
-	  left, Common Test will repeat the test run (i.e. starting over with the to1 test). 
-	  When the timeout occurs, Common Test will stop as soon as the current job is finished
-	  (because of the <c>force_stop</c> flag). As a result, the specified test run might be 
-	  aborted after the to1 test and before the to2 test.</p>
-
-       <p>Example 2:</p>
+ $ ct_run -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -duration 001000 -force_stop</pre>
+
+       <p>Here, the suites in test directory <c>to1</c>, followed by the suites in <c>to2</c>, are 
+          executed in one test run. A time-out event occurs after 10 minutes. As long as there is 
+	  time left, <c>Common Test</c> repeats the test run (that is, starting over with test <c>to1</c>). 
+	  After time-out, <c>Common Test</c> stops when the current job is finished
+	  (because of flag <c>force_stop</c>). As a result, the specified test run can be 
+	  aborted after test <c>to1</c> and before test <c>to2</c>.</p>
+
+       <p><em>Example 2:</em></p>
        <pre>
-          $ ct_run -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -duration 001000 -forces_stop skip_rest</pre>
-       <p>Here the same test run as in Example 1, but with the
-       <c>force_stop</c> flag set to <c>skip_rest</c>. If the timeout
-       occurs while executing tests in directory to1, the rest of the
-       test cases in to1 will be skipped and then the test will be
-       aborted without running the tests in to2 another time. If the
-       timeout occurs while executing tests in directory to2, then the
-       rest of the test cases in to2 will be skipped and then the test
-       will be aborted.</p>
-
-       <p>Example 3:</p>
+ $ ct_run -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -duration 001000 -forces_stop skip_rest</pre>
+
+       <p>Here, the same tests as in Example 1 are run, but with flag <c>force_stop</c> set to 
+       <c>skip_rest</c>. If time-out occurs while executing tests in directory <c>to1</c>, 
+          the remaining test cases in <c>to1</c> are skipped and the test is aborted without 
+	  running the tests in <c>to2</c> another time. If time-out occurs while executing 
+	  tests in directory <c>to2</c>, the remaining test cases in <c>to2</c> are skipped and 
+	  the test is aborted.</p>
+
+       <p><em>Example 3:</em></p>
        <pre>
-          $ date
-	  Fri Sep 28 15:00:00 MEST 2007
-
-          $ ct_run -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -until 160000</pre>
-       <p>Here the same test run as in the example above will be executed (and possibly repeated). 
-          In this example, however, the timeout will occur after 1 hour and when that happens,
-	  Common Test will finish the entire test run before stopping (i.e. the to1 and to2 test
-	  will always both be executed in the same test run).</p>
+ $ date
+ Fri Sep 28 15:00:00 MEST 2007
+
+ $ ct_run -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -until 160000</pre>
+
+       <p>Here, the same test run as in the previous examples are executed (and possibly repeated). 
+          However, when the time-out occurs, after 1 hour, <c>Common Test</c> finishes the entire 
+	  test run before stopping (that is, both <c>to1</c> and <c>to2</c> are always executed in 
+          the same test run).</p>
        
-       <p>Example 4:</p>
+       <p><em>Example 4:</em></p>
        <pre>
-          $ ct_run -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -repeat 5</pre>
-       <p>Here the test run, including both the to1 and the to2 test, will be repeated 5 times.</p>
+ $ ct_run -dir $TEST_ROOT/to1 $TEST_ROOT/to2 -repeat 5</pre>
+
+       <p>Here, the test run, including both the <c>to1</c> and the <c>to2</c> test, is repeated 
+          five times.</p>
 
-       <note><p>This feature should not be confused with the <c>repeat</c> property of a test
+       <note><p>Do not confuse this feature with the <c>repeat</c> property of a test
           case group. The options described here are used to repeat execution of entire test runs,
 	  while the <c>repeat</c> property of a test case group makes it possible to repeat
 	  execution of sets of test cases within a suite. For more information about the latter,
-	  see the <seealso marker="write_test_chapter#test_case_groups">Writing Test Suites</seealso>
-	  chapter.</p></note>
+	  see section <seealso marker="write_test_chapter#test_case_groups">Test Case Groups </seealso>
+	  in section Writing Test Suites.</p></note>
   </section>
 
   <section>
     <marker id="silent_connections"></marker>
       <title>Silent Connections</title>
-      <p>The protocol handling processes in Common Test, implemented by ct_telnet,
-      ct_ssh, ct_ftp etc, do verbose printing to the test case logs. This can be switched off
-      by means of the <c>-silent_connections</c> flag:</p>
+      <p>The protocol handling processes in <c>Common Test</c>, implemented by <c>ct_telnet</c>,
+      <c>ct_ssh</c>, <c>ct_ftp</c>, and so on, do verbose printing to the test case logs. 
+      This can be switched off with flag <c>-silent_connections</c>:</p>
       
       <pre>
-	ct_run -silent_connections [conn_types]
-      </pre>
+ ct_run -silent_connections [conn_types]</pre>
       
-      <p>where <c>conn_types</c> specifies <c>ssh, telnet, ftp, rpc</c> and/or <c>snmp</c>.</p>
+      <p>Here, <c>conn_types</c> specifies SSH, Telnet, FTP, RPC, and/or SNMP.</p>
       
-      <p>Example:</p>
+      <p><em>Example 1:</em></p>
       
       <pre>
-	ct_run ... -silent_connections ssh telnet</pre>
-      <p>switches off logging for ssh and telnet connections.</p>
+ ct_run ... -silent_connections ssh telnet</pre>
+      <p>This switches off logging for SSH and Telnet connections.</p>
+      
+      <p><em>Example 2:</em></p>
       
       <pre>
-	ct_run ... -silent_connections</pre>
-      <p>switches off logging for all connection types.</p>
+ ct_run ... -silent_connections</pre>
+      <p>This switches off logging for all connection types.</p>
       
       
-      <p>Fatal communication error and reconnection attempts will always be printed even 
-      if logging has been suppressed for the connection type in question. However, operations
-      such as sending and receiving data will be performed silently.</p>
+      <p>Fatal communication error and reconnection attempts are always printed, even if 
+         logging has been suppressed for the connection type in question. However, operations
+         such as sending and receiving data are performed silently.</p>
       
-      <p>It is possible to also specify <c>silent_connections</c> in a test suite. This is
+      <p><c>silent_connections</c> can also be specified in a test suite. This is
 	accomplished by returning a tuple, <c>{silent_connections,ConnTypes}</c>, in the
-	<c>suite/0</c> or test case info list. If <c>ConnTypes</c> is a list of atoms 
-	(<c>ssh, telnet, ftp, rpc</c> and/or <c>snmp</c>), output for any corresponding connections 
-	will be suppressed. Full logging is per default enabled for any connection of type not 
+	<c>suite/0</c> or test case information list. If <c>ConnTypes</c> is a list of atoms 
+	(SSH, Telnet, FTP, RPC and/or SNMP), output for any corresponding connections 
+	are suppressed. Full logging is by default enabled for any connection of type not 
 	specified in <c>ConnTypes</c>. Hence, if <c>ConnTypes</c> is the empty list, logging 
 	is enabled for all connections.</p>
       
-	<p>Example:</p>
+	<p><em>Example 3:</em></p>
       
       <pre>
-	
-	-module(my_SUITE).
+ -module(my_SUITE).
 
-	suite() -> [..., {silent_connections,[telnet,ssh]}, ...].
+ suite() -> [..., {silent_connections,[telnet,ssh]}, ...].
 
-	...
+ ...
 
-	my_testcase1() ->
-	    [{silent_connections,[ssh]}].
+ my_testcase1() ->
+     [{silent_connections,[ssh]}].
 
-	my_testcase1(_) ->
-	    ...
+ my_testcase1(_) ->
+     ...
 
-	my_testcase2(_) ->
-	    ...
-      </pre>
+ my_testcase2(_) ->
+     ...</pre>
       
-      <p>In this example, <c>suite/0</c> tells Common Test to suppress
-	printouts from telnet and ssh connections. This is valid for
+      <p>In this example, <c>suite/0</c> tells <c>Common Test</c> to suppress
+	printouts from Telnet and SSH connections. This is valid for
 	all test cases. However, <c>my_testcase1/0</c> specifies that
-	for this test case, only ssh should be silent. The result is
-	that <c>my_testcase1</c> will get telnet info (if any) printed
-	in the log, but not ssh info. <c>my_testcase2</c> will get no
-	info from either connection printed.</p>
+	for this test case, only SSH is to be silent. The result is
+	that <c>my_testcase1</c> gets Telnet information (if any) printed
+	in the log, but not SSH information. <c>my_testcase2</c> gets no
+	information from either connection printed.</p>
       
-	<p><c>silent_connections</c> may also be specified with a term
+	<p><c>silent_connections</c> can also be specified with a term
 	in a test specification
-	(see <seealso marker="run_test_chapter#test_specifications">Test
-	Specifications</seealso>). Connections provided with the
-	<c>silent_connections</c> start	flag/option, will be merged with
-	any connections listed in the test specification.</p>
+	(see section <seealso marker="run_test_chapter#test_specifications">Test
+	Specifications</seealso> in section Running Tests and Analyzing Results).
+	Connections provided with start	flag/option <c>silent_connections</c>
+	are merged with any connections listed in the test specification.</p>
 
-	<p>The <c>silent_connections</c> start flag/option and test
-	specification term, overrides any settings made by the info functions
+	<p>Start flag/option <c>silent_connections</c> and the test
+	specification term override any settings made by the information functions
 	inside the test suite.</p>
       
-      <note><p>Note that in the current Common Test version, the
-	<c>silent_connections</c> feature only works for telnet
-	and ssh connections! Support for other connection types will be added
-	in future Common Test versions.</p></note>
+      <note><p>In the current <c>Common Test</c> version, the
+	<c>silent_connections</c> feature only works for Telnet
+	and SSH connections. Support for other connection types can be added
+	in future <c>Common Test</c> versions.</p></note>
       
   </section>
 </chapter>
diff --git a/lib/common_test/doc/src/test_structure_chapter.xml b/lib/common_test/doc/src/test_structure_chapter.xml
index d5b92b163f..8076244928 100644
--- a/lib/common_test/doc/src/test_structure_chapter.xml
+++ b/lib/common_test/doc/src/test_structure_chapter.xml
@@ -31,167 +31,167 @@
   </header>
 
   <section>
-    <title>Test structure</title>
+    <title>General</title>
 
     <p>A test is performed by running one or more test suites. A test suite
-    consists of test cases (as well as configuration functions and info 
-    functions). Test cases may be grouped in so called test case groups. 
+    consists of test cases, configuration functions, and information 
+    functions. Test cases can be grouped in so called test case groups. 
     A test suite is an Erlang module and test cases are implemented as 
     Erlang functions. Test suites are stored in test directories.</p>
 
   </section>
 
   <section>
-    <title>Skipping test cases</title>
+    <marker id="skipping_test_cases"></marker>
+    <title>Skipping Test Cases</title>
 
-    <p>It is possible to skip certain test cases, for example if you
-    know beforehand that a specific test case fails. This might be
-    functionality which isn't yet implemented, a bug that is known but
-    not yet fixed or some functionality which doesn't work or isn't
+    <p>Certain test cases can be skipped, for example, if you
+    know beforehand that a specific test case fails. The reason can be
+    functionality that is not yet implemented, a bug that is known but
+    not yet fixed, or some functionality that does not work or is not
     applicable on a specific platform.</p>
 
-    <p>There are several different ways to state that one or more 
-    test cases should be skipped:</p>
-    <list>
+    <p>Test cases can be skipped in the following ways:</p>
+    <list type="bulleted">
 
       <item>Using <c>skip_suites</c> and <c>skip_cases</c>
       terms in 
       <seealso marker="run_test_chapter#test_specifications">test specifications</seealso>.
       </item>
 
-      <item>Returning <c>{skip,Reason}</c> from the
-      <c>init_per_testcase/2</c> or <c>init_per_suite/1</c> functions.</item>
+      <item>Returning <c>{skip,Reason}</c> from function
+      <seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso> or 
+      <seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite/1</c></seealso>.</item>
 
       <item>Returning <c>{skip,Reason}</c> from the execution clause
-      of the test case.</item>
+      of the test case. The execution clause is called, so the author 
+      must ensure that the test case does not run.</item>
 
     </list>
 
-    <p>The latter of course means that the execution clause is
-    actually called, so the author must make sure that the test case
-    does not run.</p>
-
-    <p>When a test case is skipped, it will be noted as <c>SKIPPED</c>
+    <p>When a test case is skipped, it is noted as <c>SKIPPED</c>
     in the HTML log.</p>
 
   </section>
 
   <section>
-    <title>Definition of terms</title>
+    <title>Definition of Terms</title>
     
     <taglist>
 
-      <tag><em>Auto skipped test case</em></tag>
+      <tag><em>Auto-skipped test case</em></tag>
       <item>
-        When a configuration function fails (i.e. terminates unexpectedly), 
-	the test cases that depend on the configuration function will be
-	skipped automatically by Common Test. The status of the test cases 
-	is then "auto skipped".	Test cases are also auto skipped by
-	Common Test if required configuration data is not available at
-	runtime.
+        <p>When a configuration function fails (that is, terminates unexpectedly), 
+	the test cases depending on the configuration function are
+	skipped automatically by <c>Common Test</c>. The status of the test cases 
+	is then "auto-skipped".	Test cases are also "auto-skipped" by
+	<c>Common Test</c> if the required configuration data is unavailable at
+	runtime.</p>
       </item>
 
       <tag><em>Configuration function</em></tag>
       <item>
-        A function in a test suite that is meant to be used for
+        <p>A function in a test suite that is meant to be used for
 	setting up, cleaning up, and/or verifying the state and 
-	environment on the SUT (System Under Test) and/or the Common Test 
+	environment on the System Under Test (SUT) and/or the <c>Common Test</c> 
 	host node, so that a test case (or a set of test cases) can 
-	execute correctly.     
+	execute correctly.</p>     
       </item>
 
       <tag><em>Configuration file</em></tag>
       <item>
-        A file that contains data related to a test and/or an SUT 
-	(System Under Test), e.g. protocol server addresses, client
-	login details, hardware interface addresses, etc - any data
-	that should be handled as variable in the suite and not
-	be hardcoded.     
+        <p>A file containing data related to a test and/or an SUT,
+	for example, protocol server addresses, client
+	login details, and hardware interface addresses. That is, any data
+	that is to be handled as variable in the suite and not
+	be hard-coded.</p>   
       </item>
 
       <tag><em>Configuration variable</em></tag>
       <item>
-        A name (an Erlang atom) associated with a data value read from
-	a configuration file.
+        <p>A name (an Erlang atom) associated with a data value read from
+	a configuration file.</p>
       </item>
 
-      <tag><em>data_dir</em></tag>
+      <tag><c>data_dir</c></tag>
       <item>
-	Data directory for a test suite. This directory contains
-	any files used by the test suite, e.g. additional Erlang
-	modules, binaries or data files.
+	<p>Data directory for a test suite. This directory contains
+	any files used by the test suite, for example, extra Erlang
+	modules, binaries, or data files.</p>
       </item>
 
-      <tag><em>Info function</em></tag>
+      <tag><em>Information function</em></tag>
       <item>
-        A function in a test suite that returns a list of properties
-	(read by the Common Test server) that describes the conditions 
-	for executing the test cases in the suite. 
+        <p>A function in a test suite that returns a list of properties
+	(read by the <c>Common Test</c> server) that describes the conditions 
+	for executing the test cases in the suite.</p>
       </item>
       
       <tag><em>Major log file</em></tag>
       <item>
-	An overview and summary log file for one or more test suites.
+	<p>An overview and summary log file for one or more test suites.</p>
       </item>
 
       <tag><em>Minor log file</em></tag>
       <item>
-	A log file for one particular test case. Also called the 
-	test case log file.
+	<p>A log file for one particular test case. Also called the 
+	test case log file.</p>
       </item>
-      <tag><em>priv_dir</em></tag>
+
+      <tag><c>priv_dir</c></tag>
       <item>
-	Private directory for a test suite. This directory should
-	be used when the test suite needs to write to files.
+	<p>Private directory for a test suite. This directory is to
+	be used when the test suite needs to write to files.</p>
       </item>
 
-      <tag><em>ct_run</em></tag>
+      <tag><c>ct_run</c></tag>
       <item>
-        The name of an executable program that may be
+        <p>The name of an executable program that can be
 	used as an interface for specifying and running
-	tests with Common Test. 
+	tests with <c>Common Test</c>.</p>
       </item>
 
       <tag><em>Test case</em></tag>
       <item>
-	A single test included in a test suite. A test case is
-	implemented as a function in a test suite module.
+	<p>A single test included in a test suite. A test case is
+	implemented as a function in a test suite module.</p>
       </item>
 
       <tag><em>Test case group</em></tag>
       <item>
-        A set of test cases that share configuration functions and 
-	execution properties. The execution properties specify whether 
-	the test cases in the group should be executed in random order,
-	in parallel, in sequence, and if the execution of the group 
-        should be repeated. Test case groups may also be nested (i.e. a 
-	group may, besides test cases, contain sub-groups).
+        <p>A set of test cases sharing configuration functions and 
+	execution properties. The execution properties specify if 
+	the test cases in the group are to be executed in random order,
+	in parallel, or in sequence, and if the execution of the group 
+        is be repeated. Test case groups can also be nested. That is, 
+	a group can, besides test cases, contain subgroups.</p>
       </item>
       
       <tag><em>Test suite</em></tag>
       <item>
-	An erlang module containing a collection of test cases for
-	a specific functional area.
+	<p>An Erlang module containing a collection of test cases for
+	a specific functional area.</p>
       </item>
 
       <tag><em>Test directory</em></tag>
       <item>
-	A directory that contains one or more test suite modules, i.e.
-	a group of test suites.
+	<p>A directory containing one or more test suite modules,
+	that is, a group of test suites.</p>
       </item>
 
-      <tag><em>The Config argument</em></tag>
+      <tag><em>Argument</em> <c>Config</c></tag>
       <item>
-        A list of key-value tuples (i.e. a property list) containing
+        <p>A list of key-value tuples (that is, a property list) containing
 	runtime configuration data passed from the configuration
-	functions to the test cases.
+	functions to the test cases.</p>
       </item>
 
-      <tag><em>User skipped test case</em></tag>
+      <tag><em>User-skipped test case</em></tag>
       <item>
-        This is the status of a test case that has been explicitly
-	skipped in any of the ways described in the "Skipping test cases"
-	section above.
+        <p>The status of a test case explicitly skipped in any of 
+	the ways described in section
+	<seealso marker="#skipping_test_cases">Skipping Test Cases</seealso>.
+	</p>
       </item>
 
 
diff --git a/lib/common_test/doc/src/unix_telnet.xml b/lib/common_test/doc/src/unix_telnet.xml
new file mode 100644
index 0000000000..189379c39a
--- /dev/null
+++ b/lib/common_test/doc/src/unix_telnet.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2010</year><year>2012</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+
+    </legalnotice>
+
+    <title>unix_telnet</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>unix_telnet.xml</file>
+  </header>
+  <module>unix_telnet</module>
+  <modulesummary>Callback module for ct_telnet, for connecting to a Telnet
+    server on a UNIX host.</modulesummary>
+
+  <description>
+
+    <p>Callback module for
+      <seealso marker="ct_telnet"><c>ct_telnet</c></seealso>,
+      for connecting to a Telnet server on a UNIX host.</p>
+
+    <p>It requires the following entry in the configuration file:</p>
+
+    <pre>
+ {unix,[{telnet,HostNameOrIpAddress},
+        {port,PortNum},                 % optional
+        {username,UserName},
+        {password,Password},
+        {keep_alive,Bool}]}.            % optional</pre>
+
+    <p>To communicate through Telnet to the host specified by
+      <c>HostNameOrIpAddress</c>, use the interface functions in
+      <seealso marker="ct_telnet"><c>ct_telnet</c></seealso>, for example,
+      <c>open(Name)</c> and <c>cmd(Name,Cmd)</c>.</p>
+
+    <p><c>Name</c> is the name you allocated to the Unix host in your
+      <c>require</c> statement, for example:</p>
+
+    <pre>
+ suite() -&gt; [{require,Name,{unix,[telnet]}}].</pre>
+
+    <p>or</p>
+
+    <pre>
+ ct:require(Name,{unix,[telnet]}).</pre>
+
+    <p>The "keep alive" activity (that is, that <c>Common Test</c> sends NOP
+      to the server every 10 seconds if the connection is idle) can be
+      enabled or disabled for one particular connection as described here.
+      It can be disabled for all connections using <c>telnet_settings</c>
+      (see <seealso marker="ct_telnet"><c>ct_telnet</c></seealso>).</p>
+
+    <p>The <c>{port,PortNum}</c> tuple is optional and if omitted, default 
+      Telnet port 23 is used. Also the <c>keep_alive</c> tuple is optional,
+      and the value defauls to <c>true</c> (enabled).</p>
+  </description>
+
+  <funcs>
+    <func>
+      <name>connect(ConnName, Ip, Port, Timeout, KeepAlive, Extra) -&gt; {ok, Handle} | {error, Reason}</name>
+      <fsummary>Callback for ct_telnet.erl.</fsummary>
+        <type>
+          <v>ConnName = target_name()</v>
+          <v>Ip = string() | {integer(), integer(), integer(), integer()}</v>
+          <v>Port = integer()</v>
+          <v>Timeout = integer()</v>
+          <v>KeepAlive = bool()</v>
+          <v>Extra = target_name() | {Username, Password}</v>
+          <v>Username = string()</v>
+          <v>Password = string()</v>
+          <v>Handle = handle()</v>
+          <v>Reason = term()</v>
+        </type>
+      <desc><marker id="connect-6"/>
+        <p>Callback for <c>ct_telnet.erl</c>.</p>
+
+        <p>Setup Telnet connection to a Unix host.</p>
+
+        <p>For <c>target_name()</c>, see
+          <seealso marker="ct"><c>ct</c></seealso>. For <c>handle()</c>, see
+          <seealso marker="ct_telnet"><c>ct_telnet</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>get_prompt_regexp() -&gt; PromptRegexp</name>
+      <fsummary>Callback for ct_telnet.erl.</fsummary>
+        <type>
+          <v>PromptRegexp = prompt_regexp()</v>
+        </type>
+      <desc><marker id="get_prompt_regexp-0"/>
+        <p>Callback for <c>ct_telnet.erl</c>.</p>
+
+        <p>Returns a suitable <c>regexp</c> string matching common prompts
+          for users on Unix hosts.</p>
+
+        <p>For <c>prompt_regexp()</c>, see
+          <seealso marker="ct_telnet"><c>ct_telnet</c></seealso>.</p>
+      </desc>
+    </func>
+   </funcs>
+
+  <section>
+    <title>See Also</title>
+      <p><seealso marker="ct"><c>ct</c></seealso>,
+        <seealso marker="ct_telnet"><c>ct_telnet</c></seealso></p>
+  </section>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/why_test_chapter.xml b/lib/common_test/doc/src/why_test_chapter.xml
index 15eb1aaed4..ff6000628b 100644
--- a/lib/common_test/doc/src/why_test_chapter.xml
+++ b/lib/common_test/doc/src/why_test_chapter.xml
@@ -22,7 +22,7 @@
     
     </legalnotice>
 
-    <title>Some thoughts about testing</title>
+    <title>Some Thoughts about Testing</title>
     <prepared>Siri Hansen</prepared>
     <docno></docno>
     <date></date>
@@ -34,54 +34,53 @@
   <section>
     <title>Goals</title>
 
-    <p>It's not possible to prove that a program is correct by
+    <p>It is not possible to prove that a program is correct by
     testing. On the contrary, it has been formally proven that it is
     impossible to prove programs in general by testing. Theoretical
-    program proofs or plain examination of code may be viable options
-    for those that wish to certify that a program is correct. The test
+    program proofs or plain examination of code can be viable options
+    for those wishing to certify that a program is correct. The test
     server, as it is based on testing, cannot be used for
     certification. Its intended use is instead to (cost effectively)
     <em>find bugs</em>. A successful test suite is one that reveals a
-    bug. If a test suite results in Ok, then we know very little that
-    we didn't know before.</p>
+    bug. If a test suite results in OK, then we know very little that
+    we did not know before.</p>
 
   </section>
 
   <section>
-    <title>What to test?</title>
+    <title>What to Test</title>
 
     <p>
       There are many kinds of test suites. Some concentrate on
       calling every function or command (in the documented way) in 
       a certain interface.
-      Some other do the same, but uses all kinds of illegal
-      parameters, and verifies that the server stays alive and rejects
+      Some others do the same, but use all kinds of illegal
+      parameters, and verify that the server stays alive and rejects
       the requests with reasonable error codes. Some test suites
       simulate an application (typically consisting of a few modules of
-      an application), some try to do tricky requests in general, some
+      an application), some try to do tricky requests in general, and some
       test suites even test internal functions with help of special
-      load-modules on target.</p>
+      Load Modules on target.</p>
 
-    <p>Another interesting category of test suites are the ones that
-      check that fixed bugs don't reoccur. When a bugfix is introduced,
-      a test case that checks for that specific bug should be written
-      and submitted to the affected test suite(s).</p>
+    <p>Another interesting category of test suites is the one
+      checking that fixed bugs do not reoccur. When a bugfix is introduced,
+      a test case that checks for that specific bug is written
+      and submitted to the affected test suites.</p>
 
     <p>Aim for finding bugs. Write whatever test that has the highest
       probability of finding a bug, now or in the future. Concentrate
-      more on the critical parts. Bugs in critical subsystems are a lot
+      more on the critical parts. Bugs in critical subsystems are much
       more expensive than others.</p>
 
     <p>Aim for functionality testing rather than implementation
       details. Implementation details change quite often, and the test
-      suites should be long lived. Often implementation details differ
+      suites are to be long lived. Implementation details often differ
       on different platforms and versions. If implementation details
-      have to be tested, try to factor them out into separate test
-      cases. Later on these test cases may be rewritten, or just
-      skipped.</p>
+      must be tested, try to factor them out into separate test
+      cases. These test cases can later be rewritten or skipped.</p>
 
-    <p>Also, aim for testing everything once, no less, no more. It's
-      not effective having every test case fail just because one
+    <p>Also, aim for testing everything once, no less, no more. It is
+      not effective having every test case fail only because one
       function in the interface changed.</p>
 
   </section>
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index 1f5650651f..e3811ec4cf 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -32,84 +32,88 @@
          
   <section>
     <marker id="intro"></marker>
-    <title>Support for test suite authors</title>
+    <title>Support for Test Suite Authors</title>
 
-    <p>The <c>ct</c> module provides the main interface for writing
-    test cases. This includes e.g:</p>
+    <p>The <seealso marker="ct"><c>ct</c></seealso> module provides the main 
+    interface for writing test cases. This includes for example, the following:</p>
 
-    <list>
+    <list type="bulleted">
       <item>Functions for printing and logging</item>
       <item>Functions for reading configuration data</item>
       <item>Function for terminating a test case with error reason</item>
       <item>Function for adding comments to the HTML overview page</item>
     </list>
 
-    <p>Please see the reference manual for the <c>ct</c>
-      module for details about these functions.</p>
+    <p>For details about these functions, see module <seealso marker="ct"><c>ct</c></seealso>.</p>
     
-    <p>The CT application also includes other modules named 
-      <c><![CDATA[ct_<component>]]></c> that
+    <p>The <c>Common Test</c> application also includes other modules named 
+      <c><![CDATA[ct_<component>]]></c>, which
       provide various support, mainly simplified use of communication
-      protocols such as rpc, snmp, ftp, telnet, etc.</p>
+      protocols such as RPC, SNMP, FTP, Telnet, and others.</p>
 
   </section>
 
   <section>
-    <title>Test suites</title>
+    <title>Test Suites</title>
     
     <p>A test suite is an ordinary Erlang module that contains test
       cases. It is recommended that the module has a name on the form
       <c>*_SUITE.erl</c>. Otherwise, the directory and auto compilation 
-      function in CT will not be able to locate it (at least not per default).
+      function in <c>Common Test</c> cannot locate it (at least not by default).
     </p>
 
     <p>It is also recommended that the <c>ct.hrl</c> header file is included
       in all test suite modules.
     </p>
 
-    <p>Each test suite module must export the function <c>all/0</c>
+    <p>Each test suite module must export function 
+    <seealso marker="common_test#Module:all-0"><c>all/0</c></seealso>,
       which returns the list of all test case groups and test cases 
       to be executed in that module. 
     </p>
 
-    <p>The callback functions that the test suite should implement, and
-      which will be described in more detail below, are
-      all listed in the <seealso marker="common_test">common_test
-	reference manual page</seealso>.
+    <p>The callback functions to be implemented by the test suite are
+      all listed in module <seealso marker="common_test">common_test
+      </seealso>. They are also described in more detail later in this User's Guide.
     </p>
 
   </section>
 
   <section>
-    <title>Init and end per suite</title>
+    <title>Init and End per Suite</title>
 
-    <p>Each test suite module may contain the optional configuration functions
-    <c>init_per_suite/1</c> and <c>end_per_suite/1</c>. If the init function
-    is defined, so must the end function be.
+    <p>Each test suite module can contain the optional configuration functions
+    <seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite/1</c></seealso>
+    and <seealso marker="common_test#Module:end_per_suite-1"><c>end_per_suite/1</c></seealso>. 
+    If the init function is defined, so must the end function be.
     </p>    
 
-    <p>If it exists, <c>init_per_suite</c> is called initially before the
-    test cases are executed. It typically contains initializations that are
-    common for all test cases in the suite, and that are only to be
-    performed once. It is recommended to be used for setting up and
-    verifying state and environment on the SUT (System Under Test) and/or
-    the CT host node, so that the test cases in the suite will execute
-    correctly. Examples of initial configuration operations: Opening a connection
-    to the SUT, initializing a database, running an installation script, etc.
+    <p>If <c>init_per_suite</c> exists, it is called initially before the
+    test cases are executed. It typically contains initializations common
+    for all test cases in the suite, which are only to be performed once. 
+    <c>init_per_suite</c> is recommended for setting up and verifying state 
+    and environment on the System Under Test (SUT) or the <c>Common Test</c> 
+    host node, or both, so that the test cases in the suite executes correctly. 
+    The following are examples of initial configuration operations:
     </p>
+    <list type="bulleted">
+      <item>Opening a connection to the SUT</item>
+      <item>Initializing a database</item>
+      <item>Running an installation script</item>
+    </list>
 
     <p><c>end_per_suite</c> is called as the final stage of the test suite execution
     (after the last test case has finished). The function is meant to be used 
     for cleaning up after <c>init_per_suite</c>. 
     </p>
     
-    <p><c>init_per_suite</c> and <c>end_per_suite</c> will execute on dedicated
+    <p><c>init_per_suite</c> and <c>end_per_suite</c> execute on dedicated
     Erlang processes, just like the test cases do. The result of these functions
-    is however not included in the test run statistics of successful, failed and
+    is however not included in the test run statistics of successful, failed, and
     skipped cases.
     </p>
 
-    <p>The argument to <c>init_per_suite</c> is <c>Config</c>, the
+    <p>The argument to <c>init_per_suite</c> is <c>Config</c>, that is, the
     same key-value list of runtime configuration data that each test case takes
     as input argument. <c>init_per_suite</c> can modify this parameter with 
     information that the test cases need. The possibly modified <c>Config</c>
@@ -117,671 +121,683 @@
     </p>
 
     <p>If <c>init_per_suite</c> fails, all test cases in the test
-    suite will be skipped automatically (so called <em>auto skipped</em>), 
+    suite are skipped automatically (so called <em>auto skipped</em>), 
     including <c>end_per_suite</c>.
     </p>
     
-    <p>Note that if <c>init_per_suite</c> and <c>end_per_suite</c> do not exist
-      in the suite, Common Test calls dummy functions (with the same names)
-      instead, so that output generated by hook functions may be saved to the log
-      files for these dummies
-      (see the <seealso marker="ct_hooks_chapter#manipulating">Common Test Hooks</seealso>
-      chapter for more information).
+    <p>Notice that if <c>init_per_suite</c> and <c>end_per_suite</c> do not exist
+      in the suite, <c>Common Test</c> calls dummy functions (with the same names)
+      instead, so that output generated by hook functions can be saved to the log
+      files for these dummies. For details, see
+      <seealso marker="ct_hooks_chapter#manipulating">Common Test Hooks</seealso>.
     </p>
   </section>
 
   <section>
   <marker id="per_testcase"/>
-    <title>Init and end per test case</title>
+    <title>Init and End per Test Case</title>
 
     <p>Each test suite module can contain the optional configuration functions
-    <c>init_per_testcase/2</c> and <c>end_per_testcase/2</c>. If the init function
-    is defined, so must the end function be.</p>
+    <seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+    and <seealso marker="common_test#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso>. 
+    If the init function is defined, so must the end function be.</p>
 
-    <p>If it exists, <c>init_per_testcase</c> is called before each
-    test case in the suite. It typically contains initialization which
-    must be done for each test case (analogue to <c>init_per_suite</c> for the 
+    <p>If <c>init_per_testcase</c> exists, it is called before each
+    test case in the suite. It typically contains initialization that
+    must be done for each test case (analog to <c>init_per_suite</c> for the 
     suite).</p>
 
     <p><c>end_per_testcase/2</c> is called after each test case has
-    finished, giving the opportunity to perform clean-up after 
-    <c>init_per_testcase</c>.</p>
+    finished, enabling cleanup after <c>init_per_testcase</c>.</p>
 
     <p>The first argument to these functions is the name of the test
     case. This value can be used with pattern matching in function clauses
     or conditional expressions to choose different initialization and cleanup
-    routines for different test cases, or perform the same routine for a number of,
+    routines for different test cases, or perform the same routine for many,
     or all, test cases.</p>
 
     <p>The second argument is the <c>Config</c> key-value list of runtime
     configuration data, which has the same value as the list returned by
-    <c>init_per_suite</c>. <c>init_per_testcase/2</c> may modify this
-    parameter or return it as is. The return value of <c>init_per_testcase/2</c> 
-    is passed as the <c>Config</c> parameter to the test case itself.</p>
+    <c>init_per_suite</c>. <c>init_per_testcase/2</c> can modify this
+    parameter or return it "as is". The return value of <c>init_per_testcase/2</c> 
+    is passed as parameter <c>Config</c> to the test case itself.</p>
 	  
     <p>The return value of <c>end_per_testcase/2</c> is ignored by the
     test server, with exception of the 
-    <seealso marker="dependencies_chapter#save_config">save_config</seealso>
+    <seealso marker="dependencies_chapter#save_config"><c>save_config</c></seealso>
     and <c>fail</c> tuple.</p>
 
-    <p>It is possible in <c>end_per_testcase</c> to check if the
-      test case was successful or not (which consequently may determine 
-      how cleanup should be performed). This is done by reading the value
-      tagged with <c>tc_status</c> from <c>Config</c>. The value is either
-      <c>ok</c>, <c>{failed,Reason}</c> (where <c>Reason</c> is <c>timetrap_timeout</c>, 
-      info from <c>exit/1</c>, or details of a run-time error), or 
-      <c>{skipped,Reason}</c> (where Reason is a user specific term).
+    <p><c>end_per_testcase</c> can check if the test case was successful. 
+    (which in turn can determine how cleanup is to be performed). 
+    This is done by reading the value tagged with <c>tc_status</c> from 
+    <c>Config</c>. The value is one of the following:
     </p>
-
-    <p>The <c>end_per_testcase/2</c> function is called even after a
-      test case terminates due to a call to <seealso marker="ct#abort_current_testcase-1"><c>ct:abort_current_testcase/1</c></seealso>,
-      or after a timetrap timeout. However, <c>end_per_testcase</c>
-      will then execute on a different process than the test case
-      function, and in this situation, <c>end_per_testcase</c> will
-      not be able to change the reason for test case termination by
-      returning <c>{fail,Reason}</c>, nor will it be able to save data with
-      <c>{save_config,Data}</c>.</p>
-
-    <p>If <c>init_per_testcase</c> crashes, the test case itself gets skipped 
-    automatically (so called <em>auto skipped</em>). If <c>init_per_testcase</c>
-    returns a tuple <c>{skip,Reason}</c>, also then the test case gets skipped
-    (so called <em>user skipped</em>). It is also possible, by returning a tuple
-    <c>{fail,Reason}</c> from <c>init_per_testcase</c>, to mark the test case
-    as failed without actually executing it.
+    <list type="bulleted">
+       <item>
+       <p><c>ok</c></p>
+       </item>
+       <item>
+	 <p><c>{failed,Reason}</c></p>
+	 <p>where <c>Reason</c> is <c>timetrap_timeout</c>, information from <c>exit/1</c>, 
+       or details of a runtime error</p></item>
+       <item>
+       <p><c>{skipped,Reason}</c></p>
+       <p>where <c>Reason</c> is a user-specific term</p></item>
+     </list>
+
+    <p>Function <c>end_per_testcase/2</c> is even called if a
+      test case terminates because of a call to 
+      <seealso marker="ct#abort_current_testcase-1"><c>ct:abort_current_testcase/1</c></seealso>,
+      or after a timetrap time-out. However, <c>end_per_testcase</c>
+      then executes on a different process than the test case
+      function. In this situation, <c>end_per_testcase</c> cannot
+      change the reason for test case termination by returning <c>{fail,Reason}</c>
+      or save data with <c>{save_config,Data}</c>.</p>
+
+    <p>The test case is skipped in the following two cases:
     </p>
+    <list type="bulleted">
+       <item>If <c>init_per_testcase</c> crashes (called <em>auto skipped</em>).</item>
+       <item>If <c>init_per_testcase</c> returns a tuple <c>{skip,Reason}</c> 
+       (called <em>user skipped</em>).</item>
+     </list>
+    <p>The test case can also be marked as failed without executing it
+    by returning a tuple <c>{fail,Reason}</c> from <c>init_per_testcase</c>.</p>
+
     <note><p>If <c>init_per_testcase</c> crashes, or returns <c>{skip,Reason}</c>
-    or <c>{fail,Reason}</c>, the <c>end_per_testcase</c> function is not called.
+    or <c>{fail,Reason}</c>, function <c>end_per_testcase</c> is not called.
     </p></note>
 
     <p>If it is determined during execution of <c>end_per_testcase</c> that
-    the status of a successful test case should be changed to failed, 
-    <c>end_per_testcase</c> may return the tuple: <c>{fail,Reason}</c>
+    the status of a successful test case is to be changed to failed, 
+    <c>end_per_testcase</c> can return the tuple <c>{fail,Reason}</c>
     (where <c>Reason</c> describes why the test case fails).</p>
 
-    <p><c>init_per_testcase</c> and <c>end_per_testcase</c> execute on the
-    same Erlang process as the test case and printouts from these
-    configuration functions can be found in the test case log file.</p>
+    <p>As <c>init_per_testcase</c> and <c>end_per_testcase</c> execute on the
+    same Erlang process as the test case, printouts from these
+    configuration functions are included in the test case log file.</p>
   </section>
 
   <section>
     <marker id="test_cases"></marker>
-    <title>Test cases</title>
+    <title>Test Cases</title>
     
     <p>The smallest unit that the test server is concerned with is a
-      test case. Each test case can actually test many things, for
-      example make several calls to the same interface function with
+      test case. Each test case can test many things, for
+      example, make several calls to the same interface function with
       different parameters.
     </p>
       
-    <p>It is possible to choose to put many or few tests into each test
-      case. What exactly each test case does is of course up to the 
-      author, but here are some things to keep in mind:
+    <p>The author can choose to put many or few tests into each test
+      case. Some things to keep in mind follows:
     </p>      
-
-    <p>Having many small test cases tend to result in extra, and possibly
+ <list type="bulleted">
+       <item><p>Many small test cases tend to result in extra, and possibly
       duplicated code, as well as slow test execution because of
-      large overhead for initializations and cleanups. Duplicated 
-      code should be avoided, e.g. by means of common help functions, or
-      the resulting suite will be difficult to read and understand, and
+      large overhead for initializations and cleanups. Avoid duplicated 
+      code, for example, by using common help functions. Otherwise,
+      the resulting suite becomes difficult to read and understand, and
       expensive to maintain.
-    </p>
-
-    <p>Larger test cases make it harder to tell what went wrong if it
-      fails, and large portions of test code will potentially be skipped
-      when errors occur. Furthermore, readability and maintainability suffers 
-      when test cases become too large and extensive. Also, the resulting log
-      files may not reflect very well the number of tests that have
-      actually been performed.
-    </p>
+    </p></item>
+       <item><p>Larger test cases make it harder to tell what went wrong if it
+      fails. Also, large portions of test code risk being skipped
+      when errors occur.</p>
+       </item>
+      <item><p>Readability and maintainability suffer 
+      when test cases become too large and extensive. It is not certain 
+      that the resulting log files reflect very well the  number of tests 
+      performed.
+    </p></item>
+     </list>
 
     <p>The test case function takes one argument, <c>Config</c>, which
       contains configuration information such as <c>data_dir</c> and
-      <c>priv_dir</c>. (See <seealso marker="#data_priv_dir">Data and
-	Private Directories</seealso> for more information about these).
-	The value of <c>Config</c> at the time of the call, is the same 
-	as the return value from <c>init_per_testcase</c>, see above.
+      <c>priv_dir</c>. (For details about these, see section 
+      <seealso marker="#data_priv_dir">Data and Private Directories</seealso>.
+      The value of <c>Config</c> at the time of the call, is the same 
+      as the return value from <c>init_per_testcase</c>, mentioned earlier.
     </p>
 
-    <note><p>The test case function argument <c>Config</c> should not be 
-	confused with the information that can be retrieved from 
+    <note><p>The test case function argument <c>Config</c> is not to be 
+	confused with the information that can be retrieved from the
 	configuration files (using <seealso marker="ct#get_config-1"><c>
-	ct:get_config/1/2</c></seealso>). The Config argument
-	should be used for runtime configuration of the test suite and the 
-	test cases, while configuration files should typically contain data 
+	ct:get_config/1/2</c></seealso>). The test case argument <c>Config</c>
+	is to be used for runtime configuration of the test suite and the 
+	test cases, while configuration files are to contain data 
 	related to the SUT. These two types of configuration data are handled 
-	differently!</p></note>
+	differently.</p></note>
     
-    <p>Since the <c>Config</c> parameter is a list of key-value tuples, i.e.
-    a data type generally called a property list, it can be handled by means of the
-    <c>proplists</c> module in the OTP <c>stdlib</c>. A value can for example
-    be searched for and returned with the <c>proplists:get_value/2</c> function.
-    Also, or alternatively, you might want to look in the general <c>lists</c> module,
-    also in <c>stdlib</c>, for useful functions. Normally, the only operations you
-    ever perform on <c>Config</c> is insert (adding a tuple to the head of the list) 
-    and lookup. Common Test provides a simple macro named <c>?config</c>, which returns 
-    a value of an item in <c>Config</c> given the key (exactly like 
+    <p>As parameter <c>Config</c> is a list of key-value tuples, that is,
+    a data type called a property list, it can be handled by the
+    <seealso marker="stdlib:proplists"><c>stdlib:proplists</c></seealso> module. 
+    A value can, for example, be searched for and returned with function 
+    <seealso marker="stdlib:proplists#get_value-2"><c>proplists:get_value/2</c></seealso>.
+    Also, or alternatively, the general <seealso marker="stdlib:lists"><c>stdlib:lists</c></seealso> 
+    module contains useful functions. Normally, the only operations 
+    performed on <c>Config</c> is insert (adding a tuple to the head of the list) 
+    and lookup. <c>Common Test</c> provides a simple macro named <c>?config</c>, 
+    which returns a value of an item in <c>Config</c> given the key (exactly like 
     <c>proplists:get_value</c>). Example: <c>PrivDir = ?config(priv_dir, Config)</c>.
     </p>
 
     <p>If the test case function crashes or exits purposely, it is considered 
-    <em>failed</em>. If it returns a value (no matter what actual value) it is 
+    <em>failed</em>. If it returns a value (no matter what value), it is 
     considered successful. An exception to this rule is the return value 
     <c>{skip,Reason}</c>. If this tuple is returned, the test case is considered 
-    skipped and gets logged as such.</p> 
+    skipped and is logged as such.</p> 
 
     <p>If the test case returns the tuple <c>{comment,Comment}</c>, the case
-    is considered successful and <c>Comment</c> is printed out in the overview 
-    log file. This is by the way equal to calling <c>ct:comment(Comment)</c>.
+    is considered successful and <c>Comment</c> is printed in the overview 
+    log file. This is equal to calling 
+    <seealso marker="ct#comment-1"><c>ct:comment(Comment)</c></seealso>.
     </p>
 
   </section>
 
   <section>
     <marker id="info_function"></marker>
-      <title>Test case info function</title>
+      <title>Test Case Information Function</title>
       
-      <p>For each test case function there can be an additional function
-	with the same name but with no arguments. This is the test case
-	info function. The test case info function is expected to return a 
-	list of	tagged tuples that specifies various properties regarding the 
-	test case.
+      <p>For each test case function there can be an extra function
+	with the same name but without arguments. This is the test case
+	information function. It is expected to return a list of tagged 
+	tuples that specifies various properties regarding the test case.
       </p>
       
       <p>The following tags have special meaning:</p>
       <taglist>
-	<tag><em><c>timetrap</c></em></tag>
+	<tag><c>timetrap</c></tag>
 	<item>
 	  <p>
-	    Set the maximum time the test case is allowed to execute. If
-	    the timetrap time is exceeded, the test case fails with
-	    reason <c>timetrap_timeout</c>. Note that <c>init_per_testcase</c> 
+	    Sets the maximum time the test case is allowed to execute. If
+	    this time is exceeded, the test case fails with
+	    reason <c>timetrap_timeout</c>. Notice that <c>init_per_testcase</c> 
 	    and <c>end_per_testcase</c> are included in the timetrap time.
-	    Please see the <seealso marker="write_test_chapter#timetraps">Timetrap</seealso>
-	    section for more details.
+	    For details, see section 
+	    <seealso marker="write_test_chapter#timetraps">Timetrap Time-Outs</seealso>.
 	  </p>
 	</item>
-	<tag><em><c>userdata</c></em></tag>
+	<tag><c>userdata</c></tag>
 	<item>
 	  <p>
-	    Use this to specify arbitrary data related to the testcase. This
-	    data can be retrieved at any time using the <seealso marker="ct#userdata-3"><c>ct:userdata/3</c></seealso>
+	    Specifies any data related to the test case. This
+	    data can be retrieved at any time using the 
+	    <seealso marker="ct#userdata-3"><c>ct:userdata/3</c></seealso>
 	    utility function.
 	  </p>
 	</item>
-	<tag><em><c>silent_connections</c></em></tag>
+	<tag><c>silent_connections</c></tag>
 	<item>
 	  <p>
-	    Please see the 
-	    <seealso marker="run_test_chapter#silent_connections">Silent Connections</seealso>
-	    chapter for details.
+	    For details, see section 
+	    <seealso marker="run_test_chapter#silent_connections">Silent Connections</seealso>.
 	  </p>
 	</item>
-	<tag><em><c>require</c></em></tag>
+	<tag><c>require</c></tag>
 	<item>
 	  <p>
-	    Use this to specify configuration variables that are required by the
+	    Specifies configuration variables required by the
 	    test case. If the required configuration variables are not
 	    found in any of the test system configuration files, the test case is
 	    skipped.</p> 
 	  <p>
-	    It is also possible to give a required variable a default value that will 
+	    A required variable can also be given a default value to 
 	    be used if the variable is not found in any configuration file. To specify 
-	    a default value, add a tuple on the form: 
-	    <c>{default_config,ConfigVariableName,Value}</c> to the test case info list 
+	    a default value, add a tuple on the form 
+	    <c>{default_config,ConfigVariableName,Value}</c> to the test case information list 
 	    (the position in the list is irrelevant).
-	    Examples:</p>
+	    </p>
+	    <p><em>Examples:</em></p>
       
 	  <pre>
-	    testcase1() -> 
-	        [{require, ftp},
-	         {default_config, ftp, [{ftp, "my_ftp_host"},
-	                                {username, "aladdin"},
-	                                {password, "sesame"}]}}].</pre>
+ testcase1() -> 
+     [{require, ftp},
+      {default_config, ftp, [{ftp, "my_ftp_host"},
+                             {username, "aladdin"},
+                             {password, "sesame"}]}}].</pre>
 
 	  <pre>
-	    testcase2() -> 
-	        [{require, unix_telnet, unix},
-		 {require, {unix, [telnet, username, password]}},
-	         {default_config, unix, [{telnet, "my_telnet_host"},
-	                                 {username, "aladdin"},
-	                                 {password, "sesame"}]}}].</pre>
+ testcase2() -> 
+     [{require, unix_telnet, unix},
+      {require, {unix, [telnet, username, password]}},
+      {default_config, unix, [{telnet, "my_telnet_host"},
+                              {username, "aladdin"},
+                              {password, "sesame"}]}}].</pre>
 	</item>
       </taglist>
 
-	<p>See the <seealso marker="config_file_chapter#require_config_data">Config files</seealso>
-	  chapter and the <seealso marker="ct#require-1"><c>
-	  ct:require/1/2</c></seealso> function in the
-	   <seealso marker="ct">ct</seealso> reference manual for more information about
-	   <c>require</c>.</p>
+	<p>For more information about <c>require</c>, see section
+	<seealso marker="config_file_chapter#require_config_data">
+	Requiring and Reading Configuration Data</seealso>
+	in section External Configuration Data and function 
+	<seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.</p>
 
       <note><p>Specifying a default value for a required variable can result
-	  in a test case always getting executed. This might not be a desired behaviour!</p>
+	  in a test case always getting executed. This might not be a desired behavior.</p>
       </note>  
     
-      <p>If <c>timetrap</c> and/or <c>require</c> is not set specifically for
-	a particular test case, default values specified by the <c>suite/0</c> 
-	function are used.
+      <p>If <c>timetrap</c> or <c>require</c>, or both, is not set specifically for
+	a particular test case, default values specified by function
+	<seealso marker="common_test#Module:suite-0"><c>suite/0</c></seealso> 
+	are used.
       </p>
 
-      <p>Other tags than the ones mentioned above will simply be ignored by
-	the test server.
+      <p>Tags other than the earlier mentioned are ignored by the test server.
       </p>
 
       <p>
-	Example of a test case info function:
+	An example of a test case information function follows:
       </p>
       <pre>
-	reboot_node() ->
-	    [
-	     {timetrap,{seconds,60}},
-	     {require,interfaces},
-	     {userdata,
-	         [{description,"System Upgrade: RpuAddition Normal RebootNode"},
-	          {fts,"http://someserver.ericsson.se/test_doc4711.pdf"}]}                  
-            ].</pre>
+ reboot_node() ->
+     [
+      {timetrap,{seconds,60}},
+      {require,interfaces},
+      {userdata,
+          [{description,"System Upgrade: RpuAddition Normal RebootNode"},
+           {fts,"http://someserver.ericsson.se/test_doc4711.pdf"}]}                  
+     ].</pre>
 
   </section>
 
   <section>
     <marker id="suite"></marker>
-    <title>Test suite info function</title>
-
-      <p>The <c>suite/0</c> function can be used in a test suite
-	module to e.g. set a default <c>timetrap</c> value and to
-	<c>require</c> external configuration data. If a test case-, or
-	group info function also specifies any of the info tags, it
-	overrides the default values set by <c>suite/0</c>. See the test
-	case info function above, and group info function below, for more
-	details.
+    <title>Test Suite Information Function</title>
+
+      <p>Function <seealso marker="common_test#Module:suite-0"><c>suite/0</c></seealso> 
+        can, for example, be used in a test suite module to set a default 
+	<c>timetrap</c> value and to <c>require</c> external configuration data. 
+	If a test case, or a group information function also specifies any of the information tags, it
+	overrides the default values set by <c>suite/0</c>. For details, 
+	see 
+	<seealso marker="#info_function">Test Case Information Function</seealso> and
+	<seealso marker="#test_case_groups">Test Case Groups</seealso>.
       </p>
       
-      <p>Other options that may be specified with the suite info list are:</p>
-      <list>
+      <p>The following options can also be specified with the suite information list:</p>
+      <list type="bulleted">
 	<item><c>stylesheet</c>, 
-	  see <seealso marker="run_test_chapter#html_stylesheet">HTML Style Sheets</seealso>.</item>
+	  see <seealso marker="run_test_chapter#html_stylesheet">HTML Style Sheets</seealso></item>
 	<item><c>userdata</c>, 
-	  see <seealso marker="#info_function">Test case info function</seealso>.</item>
+	  see <seealso marker="#info_function">Test Case Information Function</seealso></item>
 	<item><c>silent_connections</c>, 
-	  see <seealso marker="run_test_chapter#silent_connections">Silent Connections</seealso>.</item>
+	  see <seealso marker="run_test_chapter#silent_connections">Silent Connections</seealso></item>
       </list>
 
        <p>
-	Example of the suite info function:
+	An example of the suite information function follows:
       </p>
       <pre>
-	suite() ->
-	    [
-	     {timetrap,{minutes,10}},
-	     {require,global_names},
-	     {userdata,[{info,"This suite tests database transactions."}]},
-	     {silent_connections,[telnet]},
-	     {stylesheet,"db_testing.css"}
-            ].</pre>    
+ suite() ->
+     [
+      {timetrap,{minutes,10}},
+      {require,global_names},
+      {userdata,[{info,"This suite tests database transactions."}]},
+      {silent_connections,[telnet]},
+      {stylesheet,"db_testing.css"}
+     ].</pre>    
     
   </section>
 
   <section>
     <marker id="test_case_groups"></marker>
-    <title>Test case groups</title>
-    <p>A test case group is a set of test cases that share configuration 
+    <title>Test Case Groups</title>
+    <p>A test case group is a set of test cases sharing configuration 
     functions and execution properties. Test case groups are defined by
-    means of the <c>groups/0</c> function according to the following syntax:</p>
+    function 
+    <seealso marker="common_test#Module:groups-0"><c>groups/0</c></seealso>
+    according to the following syntax:</p>
     <pre>
-      groups() -> GroupDefs
+ groups() -> GroupDefs
 
-      Types:
+ Types:
 
-      GroupDefs = [GroupDef]
-      GroupDef = {GroupName,Properties,GroupsAndTestCases}
-      GroupName = atom()
-      GroupsAndTestCases = [GroupDef | {group,GroupName} | TestCase]
-      TestCase = atom()</pre>
+ GroupDefs = [GroupDef]
+ GroupDef = {GroupName,Properties,GroupsAndTestCases}
+ GroupName = atom()
+ GroupsAndTestCases = [GroupDef | {group,GroupName} | TestCase]
+ TestCase = atom()</pre>
 
-    <p><c>GroupName</c> is the name of the group and should be unique within
-    the test suite module. Groups may be nested, and this is accomplished
-    simply by including a group definition within the <c>GroupsAndTestCases</c>
-    list of another group. <c>Properties</c> is the list of execution 
-    properties for the group. The possible values are:</p>
+    <p><c>GroupName</c> is the name of the group and must be unique within
+    the test suite module. Groups can be nested, by including a group definition 
+    within the <c>GroupsAndTestCases</c> list of another group. 
+    <c>Properties</c> is the list of execution 
+    properties for the group. The possible values are as follows:</p>
     <pre>
-      Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
-      Shuffle = shuffle | {shuffle,Seed}
-      Seed = {integer(),integer(),integer()}
-      RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
-                   repeat_until_any_ok | repeat_until_any_fail
-      N = integer() | forever</pre>
-
-    <p>If the <c>parallel</c> property is specified, Common Test will execute
-    all test cases in the group in parallel. If <c>sequence</c> is specified,
-    the cases will be executed in a sequence, as described in the chapter
-    <seealso marker="dependencies_chapter#sequences">Dependencies between 
-    test cases and suites</seealso>. If <c>shuffle</c> is specified, the cases
-    in the group will be executed in random order. The <c>repeat</c> property
-    orders Common Test to repeat execution of the cases in the group a given
-    number of times, or until any, or all, cases fail or succeed.</p>
-
-    <p>Example:</p>
+ Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+ Shuffle = shuffle | {shuffle,Seed}
+ Seed = {integer(),integer(),integer()}
+ RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+              repeat_until_any_ok | repeat_until_any_fail
+ N = integer() | forever</pre>
+
+    <p><em>Explanations:</em></p>
+    <taglist>
+       <tag><c>parallel</c></tag>
+       <item><p><c>Common Test</c> executes all test cases in the group in parallel.</p></item>
+       <tag><c>sequence</c></tag>
+       <item><p>The cases are executed in a sequence as described in section
+    <seealso marker="dependencies_chapter#sequences">Sequences</seealso> in section
+    Dependencies Between Test Cases and Suites.</p></item>
+       <tag><c>shuffle</c></tag>
+       <item><p>The cases in the group are executed in random order.</p></item>
+       <tag><c>repeat</c></tag>
+       <item><p>Orders <c>Common Test</c> to repeat execution of the cases in the 
+       group a given number of times, or until any, or all, cases fail or succeed.</p></item>
+     </taglist>
+      
+    <p><em>Example:</em></p>
     <pre>
-      groups() -> [{group1, [parallel], [test1a,test1b]},
-                   {group2, [shuffle,sequence], [test2a,test2b,test2c]}].</pre>
+ groups() -> [{group1, [parallel], [test1a,test1b]},
+              {group2, [shuffle,sequence], [test2a,test2b,test2c]}].</pre>
 
-    <p>To specify in which order groups should be executed (also with respect
-    to test cases that are not part of any group), tuples on the form 
-    <c>{group,GroupName}</c> should be added to the <c>all/0</c> list. Example:</p>
+    <p>To specify in which order groups are to be executed (also with respect
+    to test cases that are not part of any group), add tuples on the form 
+    <c>{group,GroupName}</c> to the <c>all/0</c> list.</p>
+    <p><em>Example:</em></p>
     <pre>
-      all() -> [testcase1, {group,group1}, testcase2, {group,group2}].</pre>
+ all() -> [testcase1, {group,group1}, testcase2, {group,group2}].</pre>
 
-    <p>It is also possible to specify execution properties with a group
-      tuple in <c>all/0</c>: <c>{group,GroupName,Properties}</c>. These
-      properties will override those specified in the group definition (see
-      <c>groups/0</c> above). This way, it's possible to run the same set of tests,
+    <p>Execution properties with a group tuple in 
+    <c>all/0</c>: <c>{group,GroupName,Properties}</c> can also be specified. 
+      These properties override those specified in the group definition (see
+      <c>groups/0</c> earlier). This way, the same set of tests can be run,
       but with different properties, without having to make copies of the group
       definition in question.</p>
 
-    <p>If a group contains sub-groups, the execution properties for these may
+    <p>If a group contains subgroups, the execution properties for these can
       also be specified in the group tuple:
-      <c>{group,GroupName,Properties,SubGroups}</c>, where <c>SubGroups</c>
-      is a list of tuples, <c>{GroupName,Properties}</c>, or
-      <c>{GroupName,Properties,SubGroups}</c>, representing the sub-groups.
-      Any sub-groups defined in <c>group/0</c> for a group, that are not specified
-      in the <c>SubGroups</c> list, will simply execute with their pre-defined
+      <c>{group,GroupName,Properties,SubGroups}</c>
+      Where, <c>SubGroups</c> is a list of tuples, <c>{GroupName,Properties}</c> or
+      <c>{GroupName,Properties,SubGroups}</c> representing the subgroups.
+      Any subgroups defined in <c>group/0</c> for a group, that are not specified
+      in the <c>SubGroups</c> list, executes with their predefined
       properties.</p>
 
-    <p>Example:</p>
+    <p><em>Example:</em></p>
     <pre>
-      groups() -> {tests1, [], [{tests2, [], [t2a,t2b]},
-                                {tests3, [], [t31,t3b]}]}.</pre>
-    <p>To execute group 'tests1' twice with different properties for 'tests2'
+ groups() -> {tests1, [], [{tests2, [], [t2a,t2b]},
+                           {tests3, [], [t31,t3b]}]}.</pre>
+    <p>To execute group <c>tests1</c> twice with different properties for <c>tests2</c>
       each time:</p>
     <pre>
-      all() ->
-         [{group, tests1, default, [{tests2, [parallel]}]},
-          {group, tests1, default, [{tests2, [shuffle,{repeat,10}]}]}].</pre>
-    <p>Note that this is equivalent to this specification:</p>
+ all() ->
+    [{group, tests1, default, [{tests2, [parallel]}]},
+     {group, tests1, default, [{tests2, [shuffle,{repeat,10}]}]}].</pre>
+    <p>This is equivalent to the following specification:</p>
     <pre>
-      all() ->
-         [{group, tests1, default, [{tests2, [parallel]},
-                                    {tests3, default}]},
-          {group, tests1, default, [{tests2, [shuffle,{repeat,10}]},
-                                    {tests3, default}]}].</pre>
-    <p>The value <c>default</c> states that the pre-defined properties
-      should be used.</p>
-    <p>Here's an example of how to override properties in a scenario
+ all() ->
+    [{group, tests1, default, [{tests2, [parallel]},
+                               {tests3, default}]},
+     {group, tests1, default, [{tests2, [shuffle,{repeat,10}]},
+                               {tests3, default}]}].</pre>
+    <p>Value <c>default</c> states that the predefined properties
+      are to be used.</p>
+    <p>The following example shows how to override properties in a scenario
       with deeply nested groups:</p>
     <pre>
-      groups() ->
-         [{tests1, [], [{group, tests2}]},
-          {tests2, [], [{group, tests3}]},
-          {tests3, [{repeat,2}], [t3a,t3b,t3c]}].
-
-      all() ->
-         [{group, tests1, default, 
-           [{tests2, default,
-             [{tests3, [parallel,{repeat,100}]}]}]}].</pre>
-
-    <p>The syntax described above may also be used in Test Specifications
-      in order to change properties of groups at the time of execution,
-      without even having to edit the test suite (please see the
-      <seealso marker="run_test_chapter#test_specifications">Test
-	Specifications</seealso> chapter for more info).</p>
-
-    <p>As illustrated above, properties may be combined. If e.g.
-      <c>shuffle</c>, <c>repeat_until_any_fail</c> and <c>sequence</c>
-      are all specified, the test cases in the group will be executed
+ groups() ->
+    [{tests1, [], [{group, tests2}]},
+     {tests2, [], [{group, tests3}]},
+     {tests3, [{repeat,2}], [t3a,t3b,t3c]}].
+
+ all() ->
+    [{group, tests1, default, 
+      [{tests2, default,
+        [{tests3, [parallel,{repeat,100}]}]}]}].</pre>
+
+    <p>The described syntax can also be used in test specifications
+      to change group properties at the time of execution,
+      without having to edit the test suite. For more information, see
+      section <seealso marker="run_test_chapter#test_specifications">Test
+      Specifications</seealso> in section Running Tests and Analyzing Results.</p>
+
+    <p>As illustrated, properties can be combined. If, for example,
+      <c>shuffle</c>, <c>repeat_until_any_fail</c>, and <c>sequence</c>
+      are all specified, the test cases in the group are executed
       repeatedly, and in random order, until a test case fails. Then
-      execution is immediately stopped and the rest of the cases skipped.</p>
+      execution is immediately stopped and the remaining cases are skipped.</p>
 
     <p>Before execution of a group begins, the configuration function
-    <c>init_per_group(GroupName, Config)</c> is called. The list of tuples 
-    returned from this function is passed to the test cases in the usual 
-    manner by means of the <c>Config</c> argument. <c>init_per_group/2</c>
-    is meant to be used for initializations common for the test cases in the
-    group. After execution of the group is finished, the 
-    <c>end_per_group(GroupName, Config</c> function is called. This function
-    is meant to be used for cleaning up after <c>init_per_group/2</c>.</p>
+    <seealso marker="common_test#Module:init_per_group-2"><c>init_per_group(GroupName, Config)</c></seealso> 
+    is called. The list of tuples returned from this function is passed to the 
+    test cases in the usual manner by argument <c>Config</c>. 
+    <c>init_per_group/2</c> is meant to be used for initializations common 
+    for the test cases in the group. After execution of the group is finished, function
+    <seealso marker="common_test#Module:end_per_group-2"><c>end_per_group(GroupName, Config)</c></seealso> 
+    is called. This function is meant to be used for cleaning up after 
+    <c>init_per_group/2</c>.</p>
 
     <p>Whenever a group is executed, if <c>init_per_group</c> and
-      <c>end_per_group</c> do not exist in the suite, Common Test calls
+      <c>end_per_group</c> do not exist in the suite, <c>Common Test</c> calls
       dummy functions (with the same names) instead. Output generated by
-      hook functions will be saved to the log files for these dummies
-      (see the <seealso marker="ct_hooks_chapter#manipulating">Common Test
-	Hooks</seealso> chapter for more information).
+      hook functions are saved to the log files for these dummies.
+      For more information, see section 
+      <seealso marker="ct_hooks_chapter#manipulating">Manipulating Tests</seealso>
+      in section Common Test Hooks.
     </p>
 
     <note><p><c>init_per_testcase/2</c> and <c>end_per_testcase/2</c>
     are always called for each individual test case, no matter if the case 
     belongs to a group or not.</p></note>
 
-    <p>The properties for a group is always printed on the top of the HTML log 
-    for <c>init_per_group/2</c>. Also, the total execution time for a group
-    can be found at the bottom of the log for <c>end_per_group/2</c>.</p>
+    <p>The properties for a group are always printed in the top of the HTML log 
+    for <c>init_per_group/2</c>. The total execution time for a group is
+    included at the bottom of the log for <c>end_per_group/2</c>.</p>
 
-    <p>Test case groups may be nested so that sets of groups can be 
+    <p>Test case groups can be nested so sets of groups can be 
     configured with the same <c>init_per_group/2</c> and <c>end_per_group/2</c>
-    functions. Nested groups may be defined by including a group definition,
-    or a group name reference, in the test case list of another group. Example:</p>
+    functions. Nested groups can be defined by including a group definition,
+    or a group name reference, in the test case list of another group.</p>
+    <p><em>Example:</em></p>
     <pre>
-      groups() -> [{group1, [shuffle], [test1a,
-                                        {group2, [], [test2a,test2b]},
-                                        test1b]},
-                   {group3, [], [{group,group4},
-                                 {group,group5}]},
-                   {group4, [parallel], [test4a,test4b]},
-                   {group5, [sequence], [test5a,test5b,test5c]}].</pre>
-
-    <p>In the example above, if <c>all/0</c> would return group name references
-    in this order: <c>[{group,group1},{group,group3}]</c>, the order of the 
-    configuration functions and test cases will be the following (note that
+ groups() -> [{group1, [shuffle], [test1a,
+                                   {group2, [], [test2a,test2b]},
+                                   test1b]},
+              {group3, [], [{group,group4},
+                            {group,group5}]},
+              {group4, [parallel], [test4a,test4b]},
+              {group5, [sequence], [test5a,test5b,test5c]}].</pre>
+
+    <p>In the previous example, if <c>all/0</c> returns group name references
+    in the order <c>[{group,group1},{group,group3}]</c>, the order of the 
+    configuration functions and test cases becomes the following (notice that
     <c>init_per_testcase/2</c> and <c>end_per_testcase/2:</c> are also
     always called, but not included in this example for simplification):</p>
     <pre>
--      init_per_group(group1, Config) -> Config1  (*)
-
---          test1a(Config1)
-
---	    init_per_group(group2, Config1) -> Config2
-
----              test2a(Config2), test2b(Config2)
-
---          end_per_group(group2, Config2)
-
---          test1b(Config1)
-
--      end_per_group(group1, Config1) 
-
--      init_per_group(group3, Config) -> Config3
-
---          init_per_group(group4, Config3) -> Config4
-
----              test4a(Config4), test4b(Config4)  (**)
-
---          end_per_group(group4, Config4)
-
---	    init_per_group(group5, Config3) -> Config5
-
----              test5a(Config5), test5b(Config5), test5c(Config5)
-
---          end_per_group(group5, Config5)
-
--      end_per_group(group3, Config3)
-
-
-    (*) The order of test case test1a, test1b and group2 is not actually
-        defined since group1 has a shuffle property.
-
-    (**) These cases are not executed in order, but in parallel.</pre>
-
-    <p>Properties are not inherited from top level groups to nested 
-    sub-groups. E.g, in the example above, the test cases in <c>group2</c> 
-    will not be executed in random order (which is the property of 
-    <c>group1</c>).</p>
+ init_per_group(group1, Config) -> Config1  (*)
+      test1a(Config1)
+      init_per_group(group2, Config1) -> Config2
+           test2a(Config2), test2b(Config2)
+      end_per_group(group2, Config2)
+      test1b(Config1)
+ end_per_group(group1, Config1) 
+ init_per_group(group3, Config) -> Config3
+      init_per_group(group4, Config3) -> Config4
+           test4a(Config4), test4b(Config4)  (**)
+      end_per_group(group4, Config4)
+      init_per_group(group5, Config3) -> Config5
+           test5a(Config5), test5b(Config5), test5c(Config5)
+      end_per_group(group5, Config5)
+ end_per_group(group3, Config3)</pre>
+
+    <p>(*) The order of test case <c>test1a</c>, <c>test1b</c>, and <c>group2</c> is
+        undefined, as <c>group1</c> has a shuffle property.</p>
+    <p>(**) These cases are not executed in order, but in parallel.</p>
+    <p>Properties are not inherited from top-level groups to nested 
+    subgroups. For instance, in the previous example, the test cases in <c>group2</c> 
+    are not executed in random order (which is the property of <c>group1</c>).</p>
   </section>
 
   <section>
-    <title>The parallel property and nested groups</title>
-    <p>If a group has a parallel property, its test cases will be spawned
-    simultaneously and get executed in parallel. A test case is not allowed
-    to execute in parallel with <c>end_per_group/2</c> however, which means
-    that the time it takes to execute a parallel group is equal to the
+    <title>Parallel Property and Nested Groups</title>
+    <p>If a group has a parallel property, its test cases are spawned
+    simultaneously and get executed in parallel. However, a test case is not 
+    allowed to execute in parallel with <c>end_per_group/2</c>, which means
+    that the time to execute a parallel group is equal to the
     execution time of the slowest test case in the group. A negative side
     effect of running test cases in parallel is that the HTML summary pages
-    are not updated with links to the individual test case logs until the 
-    <c>end_per_group/2</c> function for the group has finished.</p>
+    are not updated with links to the individual test case logs until function 
+    <c>end_per_group/2</c> for the group has finished.</p>
 
-    <p>A group nested under a parallel group will start executing in parallel 
+    <p>A group nested under a parallel group starts executing in parallel 
     with previous (parallel) test cases (no matter what properties the nested 
-    group has). Since, however, test cases are never executed in parallel with 
-    <c>init_per_group/2</c> or <c>end_per_group/2</c> of the same group, it's 
-    only after a nested group has finished that any remaining parallel cases 
-    in the previous group get spawned.</p>
+    group has). However, as test cases are never executed in parallel with 
+    <c>init_per_group/2</c> or <c>end_per_group/2</c> of the same group, it is 
+    only after a nested group has finished that remaining parallel cases 
+    in the previous group become spawned.</p>
   </section>
 
   <section>
-    <title>Parallel test cases and IO</title>
-    <p>A parallel test case has a private IO server as its group leader. 
-      (Please see the Erlang Run-Time System Application documentation for
-      a description of the group leader concept). The
-      central IO server process that handles the output from regular test
-      cases and configuration functions, does not respond to IO messages
+    <title>Parallel Test Cases and I/O</title>
+    <p>A parallel test case has a private I/O server as its group leader. 
+      (For a description of the group leader concept, see
+      <seealso marker="erts:index"><c>ERTS</c></seealso>). 
+      The central I/O server process, which handles the output from 
+      regular test cases and configuration functions, does not respond to I/O messages
       during execution of parallel groups. This is important to understand
-      in order to avoid certain traps, like this one:</p>
-    <p>If a process, <c>P</c>, is spawned during execution of e.g.
-      <c>init_per_suite/1</c>, it will inherit the group leader of the
-      <c>init_per_suite</c> process. This group leader is the central IO server
-      process mentioned above. If, at a later time, <em>during parallel test case
+      to avoid certain traps, like the following:</p>
+    <p>If a process, <c>P</c>, is spawned during execution of, for example,
+      <c>init_per_suite/1</c>, it inherits the group leader of the
+      <c>init_per_suite</c> process. This group leader is the central I/O server
+      process mentioned earlier. If, at a later time, <em>during parallel test case
       execution</em>, some event triggers process <c>P</c> to call
-      <c>io:format/1/2</c>, that call will never return (since the group leader
-      is in a non-responsive state) and cause <c>P</c> to hang.
+      <c>io:format/1/2</c>, that call never returns (as the group leader
+      is in a non-responsive state) and causes <c>P</c> to hang.
     </p>
   </section>
 
   <section>
-    <title>Repeated groups</title>
+    <title>Repeated Groups</title>
     <marker id="repeated_groups"></marker>
-    <p>A test case group may be repeated a certain number of times
+    <p>A test case group can be repeated a certain number of times
     (specified by an integer) or indefinitely (specified by <c>forever</c>).
-    The repetition may also be stopped prematurely if any or all cases
-    fail or succeed, i.e. if the property <c>repeat_until_any_fail</c>,
+    The repetition can also be stopped too early if any or all cases
+    fail or succeed, that is, if any of the properties <c>repeat_until_any_fail</c>,
     <c>repeat_until_any_ok</c>, <c>repeat_until_all_fail</c>, or 
     <c>repeat_until_all_ok</c> is used. If the basic <c>repeat</c>
     property is used, status of test cases is irrelevant for the repeat 
     operation.</p>
     
-    <p>It is possible to return the status of a sub-group (ok or
-    failed), to affect the execution of the group on the level above. 
+    <p>The status of a subgroup can be returned (<c>ok</c> or
+    <c>failed</c>), to affect the execution of the group on the level above. 
     This is accomplished by, in <c>end_per_group/2</c>, looking up the value
     of <c>tc_group_properties</c> in the <c>Config</c> list and checking the
-    result of the test cases in the group. If status <c>failed</c> should be
-    returned from the group as a result, <c>end_per_group/2</c> should return
-    the value <c>{return_group_result,failed}</c>. The status of a sub-group
-    is taken into account by Common Test when evaluating if execution of a
-    group should be repeated or not (unless the basic <c>repeat</c>
+    result of the test cases in the group. If status <c>failed</c> is to be
+    returned from the group as a result, <c>end_per_group/2</c> is to return
+    the value <c>{return_group_result,failed}</c>. The status of a subgroup
+    is taken into account by <c>Common Test</c> when evaluating if execution of a
+    group is to be repeated or not (unless the basic <c>repeat</c>
     property is used).</p>
 
-    <p>The <c>tc_group_properties</c> value is a list of status tuples, 
-    each with the key <c>ok</c>, <c>skipped</c> and <c>failed</c>. The
-    value of a status tuple is a list containing names of test cases 
+    <p>The value of <c>tc_group_properties</c> is a list of status tuples, 
+    each with the key <c>ok</c>, <c>skipped</c>, and <c>failed</c>. The
+    value of a status tuple is a list with names of test cases 
     that have been executed with the corresponding status as result.</p>
 
-    <p>Here's an example of how to return the status from a group:</p>
+    <p>The following is an example of how to return the status from a group:</p>
     <pre>
-      end_per_group(_Group, Config) ->
-          Status = ?config(tc_group_result, Config),
-          case proplists:get_value(failed, Status) of
-              [] ->                                   % no failed cases 
-	          {return_group_result,ok};
-	      _Failed ->                              % one or more failed
-	          {return_group_result,failed}
-          end.</pre>
-
-    <p>It is also possible in <c>end_per_group/2</c> to check the status of
-    a sub-group (maybe to determine what status the current group should also
-    return). This is as simple as illustrated in the example above, only the
-    name of the group is stored in a tuple <c>{group_result,GroupName}</c>,
-    which can be searched for in the status lists. Example:</p>
+ end_per_group(_Group, Config) ->
+     Status = ?config(tc_group_result, Config),
+     case proplists:get_value(failed, Status) of
+         [] ->                                   % no failed cases 
+             {return_group_result,ok};
+         _Failed ->                              % one or more failed
+             {return_group_result,failed}
+     end.</pre>
+
+    <p>It is also possible, in <c>end_per_group/2</c>, to check the status of
+    a subgroup (maybe to determine what status the current group is to
+    return). This is as simple as illustrated in the previous example, only the
+    group name is stored in a tuple <c>{group_result,GroupName}</c>,
+    which can be searched for in the status lists.</p>
+    <p><em>Example:</em></p>
     <pre>
-      end_per_group(group1, Config) ->
-          Status = ?config(tc_group_result, Config),
-          Failed = proplists:get_value(failed, Status),
-          case lists:member({group_result,group2}, Failed) of
-	        true ->
-		    {return_group_result,failed};
-                false ->                                                    
-	            {return_group_result,ok}
-          end; 
-      ...</pre>
+ end_per_group(group1, Config) ->
+     Status = ?config(tc_group_result, Config),
+     Failed = proplists:get_value(failed, Status),
+     case lists:member({group_result,group2}, Failed) of
+           true ->
+               {return_group_result,failed};
+           false ->                                                    
+               {return_group_result,ok}
+     end; 
+ ...</pre>
 
     <note><p>When a test case group is repeated, the configuration 
-    functions, <c>init_per_group/2</c> and <c>end_per_group/2</c>, are 
+    functions <c>init_per_group/2</c> and <c>end_per_group/2</c> are 
     also always called with each repetition.</p></note>
   </section>
 
   <section>
-    <title>Shuffled test case order</title>
-    <p>The order that test cases in a group are executed, is under normal
+    <title>Shuffled Test Case Order</title>
+    <p>The order in which test cases in a group are executed is under normal
     circumstances the same as the order specified in the test case list 
-    in the group definition. With the <c>shuffle</c> property set, however,
-    Common Test will instead execute the test cases in random order.</p>
+    in the group definition. With property <c>shuffle</c> set, however,
+    <c>Common Test</c> instead executes the test cases in random order.</p>
 
-    <p>The user may provide a seed value (a tuple of three integers) with
-    the shuffle property: <c>{shuffle,Seed}</c>. This way, the same shuffling
+    <p>You can provide a seed value (a tuple of three integers) with
+    the shuffle property <c>{shuffle,Seed}</c>. This way, the same shuffling
     order can be created every time the group is executed. If no seed value
-    is given, Common Test creates a "random" seed for the shuffling operation 
-    (using the return value of <c>erlang:now()</c>). The seed value is always
+    is specified, <c>Common Test</c> creates a "random" seed for the shuffling operation 
+    (using the return value of <c>erlang:timestamp/0</c>). The seed value is always
     printed to the <c>init_per_group/2</c> log file so that it can be used to
     recreate the same execution order in a subsequent test run.</p>
 
-    <note><p>If a shuffled test case group is repeated, the seed will not
-    be reset in between turns.</p></note>
+    <note><p>If a shuffled test case group is repeated, the seed is not
+    reset between turns.</p></note>
 
-    <p>If a sub-group is specified in a group with a <c>shuffle</c> property,
-    the execution order of this sub-group in relation to the test cases 
-    (and other sub-groups) in the group, is also random. The order of the
-    test cases in the sub-group is however not random (unless, of course, the 
-    sub-group also has a <c>shuffle</c> property).</p>
+    <p>If a subgroup is specified in a group with a <c>shuffle</c> property,
+    the execution order of this subgroup in relation to the test cases 
+    (and other subgroups) in the group, is random. The order of the
+    test cases in the subgroup is however not random (unless the 
+    subgroup has a <c>shuffle</c> property).</p>
   </section>
 
   <section>
     <marker id="group_info"></marker>
-    <title>Group info function</title>
+    <title>Group Information Function</title>
 
-      <p>The test case group info function, <c>group(GroupName)</c>,
-	serves the same purpose as the suite- and test case info
-	functions previously described in this chapter. The scope for
-	the group info, however, is all test cases and sub-groups in the
+      <p>The test case group information function, <c>group(GroupName)</c>,
+	serves the same purpose as the suite- and test case information
+	functions previously described. However, the scope for
+	the group information function, is all test cases and subgroups in the
 	group in question (<c>GroupName</c>).</p>
-      <p>Example:</p>
+      <p><em>Example:</em></p>
       <pre>
-	group(connection_tests) ->
-	   [{require,login_data},
-	    {timetrap,1000}].</pre>
+ group(connection_tests) ->
+    [{require,login_data},
+     {timetrap,1000}].</pre>
 	
-      <p>The group info properties override those set with the
-	suite info function, and may in turn be overridden by test
-	case info properties. Please see the test case info
-	function above for a list of valid info properties and more
-	general information.</p>
+      <p>The group information properties override those set with the
+	suite information function, and can in turn be overridden by test
+	case information properties. For a list of valid information properties 
+	and more general information, see the
+	<seealso marker="#info_function">Test Case Information Function</seealso>.
+      </p>
   </section>
 
   <section>
-    <title>Info functions for init- and end-configuration</title>
-      <p>It is possible to use info functions also for the <c>init_per_suite</c>,
-	<c>end_per_suite</c>, <c>init_per_group</c>, and <c>end_per_group</c>
-	functions, and it works the same way as with info functions
-	for test cases (see above). This is useful e.g. for setting
-	timetraps and requiring external configuration data relevant
-	only for the configuration function in question (without
-	affecting properties set for groups and test cases in the suite).</p>
-
-      <p>The info function <c>init/end_per_suite()</c> is called for
-	<c>init/end_per_suite(Config)</c>, and info function
+    <title>Information Functions for Init- and End-Configuration</title>
+      <p>Information functions can also be used for functions <c>init_per_suite</c>,
+	<c>end_per_suite</c>, <c>init_per_group</c>, and <c>end_per_group</c>,
+	and they work the same way as with the
+	<seealso marker="#info_function">Test Case Information Function</seealso>. 
+	This is useful, for example, for setting timetraps and requiring 
+	external configuration data relevant only for the configuration 
+	function in question (without affecting properties set for groups 
+      and test cases in the suite).</p>
+
+      <p>The information function <c>init/end_per_suite()</c> is called for
+	<c>init/end_per_suite(Config)</c>, and information function
 	<c>init/end_per_group(GroupName)</c> is called for
-	<c>init/end_per_group(GroupName,Config)</c>. Info functions
-	can not be used with <c>init/end_per_testcase(TestCase, Config)</c>,
-	however, since these configuration functions execute on the test case process
-	and will use the same properties as the test case (i.e. the properties
-	set by the test case info function, <c>TestCase()</c>). Please see the test case
-	info function above for a list of valid info properties and more
-	general information.
+	<c>init/end_per_group(GroupName,Config)</c>. However, information functions
+	cannot be used with <c>init/end_per_testcase(TestCase, Config)</c>,
+	as these configuration functions execute on the test case process
+	and use the same properties as the test case (that is, the properties
+	set by the test case information function, <c>TestCase()</c>). For a list 
+	of valid information properties and more general information, see the
+	<seealso marker="#info_function">Test Case Information Function</seealso>.
       </p>
   </section>
 
@@ -789,77 +805,67 @@
     <marker id="data_priv_dir"></marker>
     <title>Data and Private Directories</title>
 
-    <p>The data directory, <c>data_dir</c>, is the directory where the
-      test module has its own files needed for the testing. The name
-      of the <c>data_dir</c> is the the name of the test suite followed
-      by <c>"_data"</c>. For example,
-      <c>"some_path/foo_SUITE.beam"</c> has the data directory
+    <p>In the data directory, <c>data_dir</c>, the test module has 
+      its own files needed for the testing. The name of <c>data_dir</c> 
+      is the the name of the test suite followed by <c>"_data"</c>. 
+      For example, <c>"some_path/foo_SUITE.beam"</c> has the data directory
       <c>"some_path/foo_SUITE_data/"</c>. Use this directory for portability,
-      i.e. to avoid hardcoding directory names in your suite. Since the data
-      directory is stored in the same directory as your test suite, you should
-      be able to rely on its existence at runtime, even if the path to your
+      that is, to avoid hardcoding directory names in your suite. As the data
+      directory is stored in the same directory as your test suite, you can
+      rely on its existence at runtime, even if the path to your
       test suite directory has changed between test suite implementation and
       execution.
     </p>
-
-<!--
-    <p>
-      When using the Common Test framework <c>ct</c>, automatic
-      compilation of code in the data directory can be obtained by
-      placing a makefile source called Makefile.src in the data
-      directory. Makefile.src will be converted to a valid makefile by
-      <c>ct</c> when the test suite is run. See the reference manual for
-      the <c>ct</c> module for details about the syntax of Makefile.src.
-    </p>
--->
     <p>
       <c>priv_dir</c> is the private directory for the test cases.
-      This directory may be used whenever a test case (or configuration function)
+      This directory can be used whenever a test case (or configuration function)
       needs to write something to file. The name of the private directory is
-      generated by Common Test, which also creates the directory.
+      generated by <c>Common Test</c>, which also creates the directory.
     </p>
-    <p>By default, Common Test creates one central private directory
-      per test run that all test cases share. This may not always be suitable,
-      especially if the same test cases are executed multiple times during
-      a test run (e.g. if they belong to a test case group with repeat
-      property), and there's a risk that files in the private directory get
-      overwritten. Under these circumstances, it's possible to configure
-      Common Test to create one dedicated private directory per
-      test case and execution instead. This is accomplished by means of
-      the flag/option: <c>create_priv_dir</c> (to be used with the
-      <c>ct_run</c> program, the <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> function, or
+    <p>By default, <c>Common Test</c> creates one central private directory
+      per test run, shared by all test cases. This is not always suitable.
+      Especially if the same test cases are executed multiple times during
+      a test run (that is, if they belong to a test case group with property
+      <c>repeat</c>) and there is a risk that files in the private directory get
+      overwritten. Under these circumstances, <c>Common Test</c> can be 
+      configured to create one dedicated private directory per
+      test case and execution instead. This is accomplished with
+      the flag/option <c>create_priv_dir</c> (to be used with the
+      <seealso marker="ct_run"><c>ct_run</c></seealso> program, the 
+      <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> function, or
       as test specification term). There are three possible values
-      for this option:
+      for this option as follows:
      </p>
-      <list>
+      <list type="bulleted">
 	<item><c>auto_per_run</c></item>
 	<item><c>auto_per_tc</c></item>
 	<item><c>manual_per_tc</c></item>
       </list>
      <p>
-      The first value indicates the default priv_dir behaviour, i.e.
+      The first value indicates the default <c>priv_dir</c> behavior, that is,
       one private directory created per test run. The two latter
-      values tell Common Test to generate a unique test directory name
+      values tell <c>Common Test</c> to generate a unique test directory name
       per test case and execution. If the auto version is used, <em>all</em>
-      private directories will be created automatically. This can obviously
-      become very inefficient for test runs with many test cases and/or
-      repetitions. Therefore, in case the manual version is instead used, the
-      test case must tell Common Test to create priv_dir when it needs it.
-      It does this by calling the function <seealso marker="ct#make_priv_dir-0"><c>ct:make_priv_dir/0</c></seealso>.
+      private directories are created automatically. This can become very 
+      inefficient for test runs with many test cases or repetitions, or both. 
+      Therefore, if the manual version is used instead, the test case must tell 
+      <c>Common Test</c> to create <c>priv_dir</c> when it needs it.
+      It does this by calling the function 
+      <seealso marker="ct#make_priv_dir-0"><c>ct:make_priv_dir/0</c></seealso>.
       </p>
 
-      <note><p>You should not depend on current working directory for
-	  reading and writing data files since this is not portable. All 
+      <note><p>Do not depend on the current working directory for
+	  reading and writing data files, as this is not portable. All 
 	  scratch files are to be written in the <c>priv_dir</c> and all 
-	  data files should be located in <c>data_dir</c>. Note also that 
-	  the Common Test server sets current working directory to the test case
-	  log directory at the start of every case.
+	  data files are to be located in <c>data_dir</c>. Also, 
+	  the <c>Common Test</c> server sets the current working directory to 
+	  the test case log directory at the start of every case.
     </p></note>
 
   </section>
 
   <section>
-    <title>Execution environment</title>
+    <title>Execution Environment</title>
 
     <p>Each test case is executed by a dedicated Erlang process. The
       process is spawned when the test case starts, and terminated when
@@ -876,236 +882,263 @@
 
   <section>
     <marker id="timetraps"></marker>
-    <title>Timetrap timeouts</title>
+    <title>Timetrap Time-Outs</title>
     <p>The default time limit for a test case is 30 minutes, unless a
     <c>timetrap</c> is specified either by the suite-, group-,
-    or test case info function. The timetrap timeout value defined by
-    <c>suite/0</c> is the value that will be used for each test case
-    in the suite (as well as for the configuration functions
+    or test case information function. The timetrap time-out value defined by
+    <c>suite/0</c> is the value that is used for each test case
+    in the suite (and for the configuration functions
     <c>init_per_suite/1</c>, <c>end_per_suite/1</c>, <c>init_per_group/2</c>,
     and <c>end_per_group/2</c>). A timetrap value defined by
     <c>group(GroupName)</c> overrides one defined by <c>suite()</c>
-    and will be used for each test case in group <c>GroupName</c>, and any
-    of its sub-groups. If a timetrap value is defined by <c>group/1</c>
-    for a sub-group, it overrides that of its higher level groups. Timetrap
-    values set by individual test cases (by means of the test case info
+    and is used for each test case in group <c>GroupName</c>, and any
+    of its subgroups. If a timetrap value is defined by <c>group/1</c>
+    for a subgroup, it overrides that of its higher level groups. Timetrap
+    values set by individual test cases (by the test case information
     function) override both group- and suite- level timetraps.</p>
     
-    <p>It is also possible to dynamically set/reset a timetrap during the
-    excution of a test case, or configuration function. This is done by calling
-    <seealso marker="ct#timetrap-1"><c>ct:timetrap/1</c></seealso>. This function cancels the current timetrap
-    and starts a new one (that stays active until timeout, or end of the
-    current function).</p>
+    <p>A timetrap can also be set or reset dynamically during the
+    execution of a test case, or configuration function. 
+    This is done by calling
+    <seealso marker="ct#timetrap-1"><c>ct:timetrap/1</c></seealso>. 
+    This function cancels the current timetrap and starts a new one 
+    (that stays active until time-out, or end of the current function).</p>
     
     <p>Timetrap values can be extended with a multiplier value specified at
-    startup with the <c>multiply_timetraps</c> option. It is also possible
-    to let the test server decide to scale up timetrap timeout values
-    automatically, e.g. if tools such as cover or trace are running during
-    the test. This feature is disabled by default and can be enabled with
-    the <c>scale_timetraps</c> start option.</p>
+    startup with option <c>multiply_timetraps</c>. It is also possible
+    to let the test server decide to scale up timetrap time-out values
+    automatically. That is, if tools such as <c>cover</c> or <c>trace</c> 
+    are running during the test. This feature is disabled by default and 
+    can be enabled with start option <c>scale_timetraps</c>.</p>
     
     <p>If a test case needs to suspend itself for a time that also gets
     multipled by <c>multiply_timetraps</c> (and possibly also scaled up if
-    <c>scale_timetraps</c> is enabled), the function <seealso marker="ct#sleep-1"><c>ct:sleep/1</c></seealso>
-    may be used (instead of e.g. <c>timer:sleep/1</c>).</p>
+    <c>scale_timetraps</c> is enabled), the function 
+    <seealso marker="ct#sleep-1"><c>ct:sleep/1</c></seealso>
+    can be used (instead of, for example, <c>timer:sleep/1</c>).</p>
     
-    <p>A function (<c>fun/0</c> or <c>MFA</c>) may be specified as
-    timetrap value in the suite-, group- and test case info function, as
-    well as argument to the <seealso marker="ct#timetrap-1"><c>ct:timetrap/1</c></seealso> function. Examples:</p>
+    <p>A function (<c>fun/0</c> or <c>{Mod,Func,Args}</c> (MFA) tuple) can be 
+    specified as timetrap value in the suite-, group- and test case information 
+    function, and as argument to function 
+    <seealso marker="ct#timetrap-1"><c>ct:timetrap/1</c></seealso>.</p>
+    <p><em>Examples:</em></p>
 
     <p><c>{timetrap,{my_test_utils,timetrap,[?MODULE,system_start]}}</c></p>
     <p><c>ct:timetrap(fun() -> my_timetrap(TestCaseName, Config) end)</c></p>
 
-    <p>The user timetrap function may be used for two things:</p>
-    <list>
-      <item>To act as a timetrap - the timeout is triggered when the
+    <p>The user timetrap function can be used for two things as follows:</p>
+    <list type="bulleted">
+      <item>To act as a timetrap. The time-out is triggered when the
       function returns.</item>
       <item>To return a timetrap time value (other than a function).</item>
     </list>
     <p>Before execution of the timetrap function (which is performed
-    on a parallel, dedicated timetrap process), Common Test cancels
+    on a parallel, dedicated timetrap process), <c>Common Test</c> cancels
     any previously set timer for the test case or configuration function.    
-    When the timetrap function returns, the timeout is triggered, <em>unless</em>
+    When the timetrap function returns, the time-out is triggered, <em>unless</em>
     the return value is a valid timetrap time, such as an integer,
-    or a <c>{SecMinOrHourTag,Time}</c> tuple (see the
-    <seealso marker="common_test">common_test reference manual</seealso> for
-    details). If a time value is returned, a new timetrap is started
-    to generate a timeout after the specified time.</p>
+    or a <c>{SecMinOrHourTag,Time}</c> tuple (for details, see module
+    <seealso marker="common_test">common_test</seealso>). If a time value 
+    is returned, a new timetrap is started to generate a time-out after 
+    the specified time.</p>
 
-    <p>The user timetrap function may of course return a time value after a delay,
-    and if so, the effective timetrap time is the delay time <em>plus</em> the
+    <p>The user timetrap function can return a time value after a delay.
+    The effective timetrap time is then the delay time <em>plus</em> the
     returned time.</p>
   </section>
 
   <section>
     <marker id="logging"></marker>
-    <title>Logging - categories and verbosity levels</title>
-    <p>Common Test provides three main functions for printing strings:</p>
-    <list>
-      <item><c>ct:log(Category, Importance, Format, Args)</c></item>
-      <item><c>ct:print(Category, Importance, Format, Args)</c></item>
-      <item><c>ct:pal(Category, Importance, Format, Args)</c></item>
+    <title>Logging - Categories and Verbosity Levels</title>
+    <p><c>Common Test</c> provides the following three main functions for 
+    printing strings:</p>
+    <list type="bulleted">
+      <item><c>ct:log(Category, Importance, Format, FormatArgs, Opts)</c></item>
+      <item><c>ct:print(Category, Importance, Format, FormatArgs)</c></item>
+      <item><c>ct:pal(Category, Importance, Format, FormatArgs)</c></item>
     </list>
-    <p>The <c>log/1/2/3/4</c> function will print a string to the test case
-    log file. The <c>print/1/2/3/4</c> function will print the string to screen,
-    and the <c>pal/1/2/3/4</c> function will print the same string both to file and
-    screen. (The functions are documented in the <c>ct</c> reference manual).</p>
-
-    <p>The optional <c>Category</c> argument may be used to categorize the
-    log printout, and categories can be used for two things:</p>
-    <list>
+    <p>The <seealso marker="ct#log-1"><c>log/1,2,3,4,5</c></seealso> function 
+    prints a string to the test case log file. 
+    The <seealso marker="ct#print-1"><c>print/1,2,3,4</c></seealso> function 
+    prints the string to screen.
+    The <seealso marker="ct#pal-1"><c>pal/1,2,3,4</c></seealso> function 
+    prints the same string both to file and screen. The functions are described 
+    in module <seealso marker="ct">ct</seealso>.
+    </p>
+
+    <p>The optional <c>Category</c> argument can be used to categorize the
+    log printout. Categories can be used for two things as follows:</p>
+    <list type="bulleted">
       <item>To compare the importance of the printout to a specific
-      verbosity level, and</item>
-      <item>to format the printout according to a user specific HTML
+      verbosity level.</item>
+      <item>To format the printout according to a user-specific HTML
       Style Sheet (CSS).</item>
     </list>
 
-    <p>The <c>Importance</c> argument specifies a level of importance
-    which, compared to a verbosity level (general and/or set per category),
-    determines if the printout should be visible or not. <c>Importance</c>
-    is an arbitrary integer in the range 0..99. Pre-defined constants
+    <p>Argument <c>Importance</c> specifies a level of importance
+    that, compared to a verbosity level (general and/or set per category),
+    determines if the printout is to be visible. <c>Importance</c>
+    is any integer in the range 0..99. Predefined constants
     exist in the <c>ct.hrl</c> header file. The default importance level,
-    <c>?STD_IMPORTANCE</c> (used if the <c>Importance</c> argument is not
-    provided), is 50. This is also the importance used for standard IO, e.g.
-    from printouts made with <c>io:format/2</c>, <c>io:put_chars/1</c>, etc.</p>
+    <c>?STD_IMPORTANCE</c> (used if argument <c>Importance</c> is not
+    provided), is 50. This is also the importance used for standard I/O,
+    for example, from printouts made with <c>io:format/2</c>, 
+    <c>io:put_chars/1</c>, and so on.</p>
 
-    <p><c>Importance</c> is compared to a verbosity level set by means of the
+    <p><c>Importance</c> is compared to a verbosity level set by the
     <c>verbosity</c> start flag/option. The verbosity level can be set per
-    category and/or generally. The default verbosity level, <c>?STD_VERBOSITY</c>,
-    is 50, i.e. all standard IO gets printed. If a lower verbosity level is set,
-    standard IO printouts will be ignored. Common Test performs the following test:</p>
-    <pre>Importance >= (100-VerbosityLevel)</pre>
+    category or generally, or both. The default verbosity level, 
+    <c>?STD_VERBOSITY</c>, is 50, that is, all standard I/O gets printed. 
+    If a lower verbosity level is set, standard I/O printouts are ignored. 
+    <c>Common Test</c> performs the following test:</p>
+    <pre>
+ Importance >= (100-VerbosityLevel)</pre>
     <p>This also means that verbosity level 0 effectively turns all logging off
-    (with the exception of printouts made by Common Test itself).</p>
+    (except from printouts made by <c>Common Test</c> itself).</p>
 
     <p>The general verbosity level is not associated with any particular
-    category. This level sets the threshold for the standard IO printouts,
-    uncategorized <c>ct:log/print/pal</c> printouts, as well as
+    category. This level sets the threshold for the standard I/O printouts,
+    uncategorized <c>ct:log/print/pal</c> printouts, and
     printouts for categories with undefined verbosity level.</p>
 
-    <p>Example:</p>
-    <pre>
-   Some printouts during test case execution:
-
-     io:format("1. Standard IO, importance = ~w~n", [?STD_IMPORTANCE]),
-     ct:log("2. Uncategorized, importance = ~w", [?STD_IMPORTANCE]),
-     ct:log(info, "3. Categorized info, importance = ~w", [?STD_IMPORTANCE]]),
-     ct:log(info, ?LOW_IMPORTANCE, "4. Categorized info, importance = ~w", [?LOW_IMPORTANCE]),
-     ct:log(error, "5. Categorized error, importance = ~w", [?HI_IMPORTANCE]),
-     ct:log(error, ?HI_IMPORTANCE, "6. Categorized error, importance = ~w", [?MAX_IMPORTANCE]),
-
-   If starting the test without specifying any verbosity levels:
-
-     $ ct_run ...
-
-   the following gets printed:
-
-     1. Standard IO, importance = 50
-     2. Uncategorized, importance = 50
-     3. Categorized info, importance = 50
-     5. Categorized error, importance = 75
-     6. Categorized error, importance = 99
-
-   If starting the test with:
-
-     $ ct_run -verbosity 1 and info 75
-
-   the following gets printed:
-
-     3. Categorized info, importance = 50
-     4. Categorized info, importance = 25
-     6. Categorized error, importance = 99</pre>
-
-    <p>How categories can be mapped to CSS tags is documented in the 
-    <seealso marker="run_test_chapter#html_stylesheet">Running Tests</seealso>
-    chapter.</p>
-
-    <p>The <c>Format</c> and <c>Args</c> arguments in <c>ct:log/print/pal</c> are
-    always passed on to the <c>io:format/3</c> function in <c>stdlib</c>
-    (please see the <c>io</c> manual page for details).</p>
+    <p><em>Examples:</em></p>
+    <p>Some printouts during test case execution:</p>
+    <pre>  
+ io:format("1. Standard IO, importance = ~w~n", [?STD_IMPORTANCE]),
+ ct:log("2. Uncategorized, importance = ~w", [?STD_IMPORTANCE]),
+ ct:log(info, "3. Categorized info, importance = ~w", [?STD_IMPORTANCE]]),
+ ct:log(info, ?LOW_IMPORTANCE, "4. Categorized info, importance = ~w", [?LOW_IMPORTANCE]),
+ ct:log(error, "5. Categorized error, importance = ~w", [?HI_IMPORTANCE]),
+ ct:log(error, ?HI_IMPORTANCE, "6. Categorized error, importance = ~w", [?MAX_IMPORTANCE]),</pre>
+
+   <p>If starting the test without specifying any verbosity levels as follows:</p>
+   <pre>
+ $ ct_run ...</pre>
+   <p>the following is printed:</p>
+   <pre>
+ 1. Standard IO, importance = 50
+ 2. Uncategorized, importance = 50
+ 3. Categorized info, importance = 50
+ 5. Categorized error, importance = 75
+ 6. Categorized error, importance = 99</pre>
+
+   <p>If starting the test with:</p>
+   <pre>
+ $ ct_run -verbosity 1 and info 75</pre>
+   <p>the following is printed:</p>
+   <pre>
+ 3. Categorized info, importance = 50
+ 4. Categorized info, importance = 25
+ 6. Categorized error, importance = 99</pre>
+
+    <p>The arguments <c>Format</c> and <c>FormatArgs</c> in <c>ct:log/print/pal</c> are
+    always passed on to the <c>stdlib</c> function <c>io:format/3</c> (For details,
+    see the <seealso marker="stdlib:io"><c>stdlib:io</c></seealso> manual page).</p>
+
+    <p><c>ct:pal/4</c> and <c>ct:log/5</c> add headers to strings being printed to the
+    log file. The strings are also wrapped in div tags with a CSS class
+    attribute, so that stylesheet formatting can be applied. To disable this feature for
+    a printout (i.e. to get a result similar to using <c>io:format/2</c>),
+    call <c>ct:log/5</c> with the <c>no_css</c> option.</p>
+
+    <p>How categories can be mapped to CSS tags is documented in section
+    <seealso marker="run_test_chapter#html_stylesheet">HTML Style Sheets</seealso>
+    in section Running Tests and Analyzing Results.</p>
     
-    <p>For more information about log files, please see the
-    <seealso marker="run_test_chapter#log_files">Running Tests</seealso> chapter.</p>
+    <p>Common Test will escape special HTML characters (&lt;, &gt; and &amp;) in printouts
+    to the log file made with <c>ct:pal/4</c> and <c>io:format/2</c>. In order to print
+    strings with HTML tags to the log, use the <c>ct:log/5</c> function. The character escaping
+    feature is per default disabled for <c>ct:log/5</c>, but can be enabled with the
+    <c>esc_chars</c> option.</p>
+
+    <p>For more information about log files, see section
+    <seealso marker="run_test_chapter#log_files">Log Files</seealso> 
+    in section Running Tests and Analyzing Results.</p>
   </section>
   
   <section>
-    <title>Illegal dependencies</title>
+    <title>Illegal Dependencies</title>
 
     <p>Even though it is highly efficient to write test suites with
-      the Common Test framework, there will surely be mistakes made,
-      mainly due to illegal dependencies. Noted below are some of the 
+      the <c>Common Test</c> framework, mistakes can be made,
+      mainly because of illegal dependencies. Some of the 
       more frequent mistakes from our own experience with running the 
-      Erlang/OTP test suites.</p>
+      Erlang/OTP test suites follows:</p>
 
-    <list>
-	<item>Depending on current directory, and writing there:<br></br>
+    <list type="bulleted">
+	<item><p>Depending on current directory, and writing there:</p>
 	    
 	    <p>This is a common error in test suites. It is assumed that
-	      the current directory is the same as what the author used as
+	      the current directory is the same as the author used as
 	      current directory when the test case was developed. Many test
 	      cases even try to write scratch files to this directory. Instead
-	      <c>data_dir</c> and <c>priv_dir</c> should be used to locate 
+	      <c>data_dir</c> and <c>priv_dir</c> are to be used to locate 
 	      data and for writing scratch files.
 	    </p>
 	</item>
 
-	<item>Depending on execution order:<br></br>
+	<item><p>Depending on execution order:</p>
 	
-	    <p>During development of test suites, no assumption should preferrably
-	    be made about the execution order of the test cases or suites.
-	    E.g. a test case should not assume that a server it depends on,
-	    has already been started by a previous test case. There are
-	    several reasons for this:
-	    </p>
-	    <p>Firstly, the user/operator may specify the order at will, and maybe
-	      a different execution order is more relevant or efficient on 
-	      some particular occasion. Secondly, if the user specifies a whole 
-	      directory of test suites for his/her test, the order the suites are
-	      executed will depend on how the files are listed by the operating
-	      system, which varies between systems. Thirdly, if a user
-	      wishes to run only a subset of a test suite, there is no way
-	      one test case could successfully depend on another.
+	    <p>During development of test suites, make no assumptions on the 
+	    execution order of the test cases or suites. For example, a test 
+	    case must not assume that a server it depends on is already 
+	    started by a previous test case. Reasons for this follows:
 	    </p>
+	    <list type="bulleted">
+	      <item>The user/operator can specify the order at will, and maybe
+	      a different execution order is sometimes more relevant or 
+	      efficient.</item>
+	      <item>If the user specifies a whole directory of test suites 
+	      for the test, the execution order of the suites depends on 
+	      how the files are listed by the operating system, which varies 
+	      between systems.</item>
+	      <item>If a user wants to run only a subset of a test suite, 
+	      there is no way one test case could successfully depend on 
+	      another.</item>
+	    </list>
 	</item>
 
-	<item>Depending on Unix:<br></br>
+	<item><p>Depending on Unix:</p>
 	    
-	    <p>Running unix commands through <c>os:cmd</c> are likely 
-	    not to work on non-unix platforms.
+	    <p>Running Unix commands through <c>os:cmd</c> are likely 
+	    not to work on non-Unix platforms.
 	    </p>
 	</item>
 
-	<item>Nested test cases:<br></br>
+	<item><p>Nested test cases:</p>
 
-	    <p>Invoking a test case from another not only tests the same
-	      thing twice, but also makes it harder to follow what exactly
-	      is being tested. Also, if the called test case fails for some
-	      reason, so will the caller. This way one error gives cause to
-	      several error reports, which is less than ideal.
+	    <p>Starting a test case from another not only tests the same
+	      thing twice, but also makes it harder to follow what is being 
+	      tested. Also, if the called test case fails for some
+	      reason, so do the caller. This way, one error gives cause to
+	      several error reports, which is to be avoided.
 	    </p>
-	    <p>Functionality common for many test case functions may be implemented
-	      in common help functions. If these functions are useful for test cases
-	      across suites, put the help functions into common help modules.
+	    <p>Functionality common for many test case functions can be 
+	       implemented in common help functions. If these functions are 
+	       useful for test cases across suites, put the help functions 
+	       into common help modules.
 	    </p>
 	</item>
 	
-      <item>Failure to crash or exit when things go wrong:<br></br>
+      <item><p>Failure to crash or exit when things go wrong:</p>
 	    
 	    <p>Making requests without checking that the return value
-	      indicates success may be ok if the test case will fail at a
-	      later stage, but it is never acceptable just to print an error
-	      message (into the log file) and return successfully. Such test cases
-	      do harm since they create a false sense of security when overviewing
-	      the test results.
+	      indicates success can be OK if the test case fails
+	      later, but it is never acceptable just to print an error
+	      message (into the log file) and return successfully. Such test 
+	      cases do harm, as they create a false sense of security when 
+	      overviewing the test results.
 	    </p>
 	</item>
 
-      <item>Messing up for subsequent test cases:<br></br>
+      <item><p>Messing up for subsequent test cases:</p>
 	
-	    <p>Test cases should restore as much of the execution
-	      environment as possible, so that the subsequent test cases will
-	      not crash because of execution order of the test cases. 
-	      The function <c>end_per_testcase</c> is suitable for this.
+	    <p>Test cases are to restore as much of the execution
+	      environment as possible, so that subsequent test cases
+	      do not crash because of their execution order. 
+	      The function 
+	      <seealso marker="common_test#Module:end_per_testcase-2"><c>end_per_testcase</c></seealso> 
+	      is suitable for this.
 	    </p>
 	</item>
     </list>
diff --git a/lib/common_test/include/ct.hrl b/lib/common_test/include/ct.hrl
index 53bc43fc24..5806f75806 100644
--- a/lib/common_test/include/ct.hrl
+++ b/lib/common_test/include/ct.hrl
@@ -18,8 +18,6 @@
 %% %CopyrightEnd%
 %%
 
--include_lib("test_server/include/test_server.hrl").
-
 %% the log level is used as argument to any CT logging function
 -define(MIN_IMPORTANCE, 0 ).
 -define(LOW_IMPORTANCE, 25).
@@ -37,3 +35,9 @@
 %% name of process executing the CT Hook init and terminate function
 -define(CT_HOOK_INIT_PROCESS, ct_util_server).
 -define(CT_HOOK_TERMINATE_PROCESS, ct_util_server).
+
+%% Backward compatibility for test_server test suites.
+%% DO NOT USE IN NEW TEST SUITES.
+-define(line,).
+-define(t,test_server).
+-define(config,test_server:lookup_config).
diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
index 987345c679..91c1e8ede8 100644
--- a/lib/common_test/src/Makefile
+++ b/lib/common_test/src/Makefile
@@ -79,7 +79,15 @@ MODULES= \
 	cth_conn_log \
 	ct_groups \
 	ct_property_test \
-	ct_release_test
+	ct_release_test \
+	erl2html2 \
+	test_server_ctrl \
+	test_server_gl \
+	test_server_io \
+	test_server_node \
+	test_server \
+	test_server_sup
+
 
 TARGET_MODULES= $(MODULES:%=$(EBIN)/%)
 BEAM_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
@@ -101,8 +109,7 @@ DTD_FILES = \
 # FLAGS
 # ----------------------------------------------------
 ERL_COMPILE_FLAGS += -pa ../ebin -I../include -I $(ERL_TOP)/lib/snmp/include/ \
-	-I../../test_server/include -I../../xmerl/inc/ \
-	-I $(ERL_TOP)/lib/kernel/include -Werror
+	-I../../xmerl/inc/ -I $(ERL_TOP)/lib/kernel/include -Werror
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src
index d847907d75..26bcf00824 100644
--- a/lib/common_test/src/common_test.app.src
+++ b/lib/common_test/src/common_test.app.src
@@ -53,7 +53,13 @@
 	     ct_slave,
              cth_log_redirect,
 	     cth_conn_log,
-             cth_surefire
+             cth_surefire,
+	     erl2html2,
+	     test_server_ctrl,
+	     test_server,
+	     test_server_io,
+	     test_server_node,
+	     test_server_sup
 	    ]},
   {registered, [ct_logs,
 		ct_util_server,
@@ -61,13 +67,27 @@
 		ct_make_ref,
 		vts,
 		ct_master,
-		ct_master_logs]},
+		ct_master_logs,
+		test_server_ctrl,
+		test_server,
+		test_server_break_process]},
   {applications, [kernel,stdlib]},
   {env, []},
-  {runtime_dependencies,["xmerl-1.3.8","tools-2.8",
-			 "test_server-3.9","stdlib-2.5","ssh-4.0",
-			 "snmp-5.1.2","sasl-2.4.2","runtime_tools-1.8.16",
-			 "kernel-4.0","inets-6.0","erts-7.0",
-			 "debugger-4.1","crypto-3.6","compiler-6.0",
-			 "observer-2.1"]}]}.
+  {runtime_dependencies,
+   ["compiler-6.0",
+    "crypto-3.6",
+    "debugger-4.1",
+    "erts-7.0",
+    "inets-6.0",
+    "kernel-4.0",
+    "observer-2.1",
+    "runtime_tools-1.8.16",
+    "sasl-2.4.2",
+    "snmp-5.1.2",
+    "ssh-4.0",
+    "stdlib-2.5",
+    "syntax_tools-1.7",
+    "tools-2.8",
+    "xmerl-1.3.8"
+   ]}]}.
 
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 7958a349b4..538be514d6 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -64,7 +64,8 @@
 -export([require/1, require/2,
 	 get_config/1, get_config/2, get_config/3,
 	 reload_config/1,
-	 log/1, log/2, log/3, log/4,
+	 escape_chars/1, escape_chars/2,
+	 log/1, log/2, log/3, log/4, log/5,
 	 print/1, print/2, print/3, print/4,
 	 pal/1, pal/2, pal/3, pal/4,
 	 capture_start/0, capture_stop/0, capture_get/0, capture_get/1,
@@ -509,44 +510,88 @@ get_testspec_terms(Tags) ->
 
 
 %%%-----------------------------------------------------------------
+%%% @spec escape_chars(IoList1) -> IoList2 | {error,Reason}
+%%%      IoList1 = iolist()
+%%%      IoList2 = iolist()
+%%%
+%%% @doc Escape special characters to be printed in html log
+%%%
+escape_chars(IoList) ->
+    ct_logs:escape_chars(IoList).
+
+%%%-----------------------------------------------------------------
+%%% @spec escape_chars(Format, Args) -> IoList | {error,Reason}
+%%%      Format = string()
+%%%      Args = list()
+%%%
+%%% @doc Escape special characters to be printed in html log
+%%%
+escape_chars(Format, Args) ->
+    try io_lib:format(Format, Args) of
+	IoList ->
+	    ct_logs:escape_chars(IoList)
+    catch
+	_:Reason ->
+	    {error,Reason}
+    end.
+
+%%%-----------------------------------------------------------------
 %%% @spec log(Format) -> ok
-%%% @equiv log(default,50,Format,[])
+%%% @equiv log(default,50,Format,[],[])
 log(Format) ->
-    log(default,?STD_IMPORTANCE,Format,[]).
+    log(default,?STD_IMPORTANCE,Format,[],[]).
 
 %%%-----------------------------------------------------------------
 %%% @spec log(X1,X2) -> ok
 %%%      X1 = Category | Importance | Format
 %%%      X2 = Format | Args
-%%% @equiv log(Category,Importance,Format,Args)
+%%% @equiv log(Category,Importance,Format,Args,[])
 log(X1,X2) ->
     {Category,Importance,Format,Args} = 
 	if is_atom(X1)    -> {X1,?STD_IMPORTANCE,X2,[]};
 	   is_integer(X1) -> {default,X1,X2,[]};
 	   is_list(X1)    -> {default,?STD_IMPORTANCE,X1,X2}
 	end,
-    log(Category,Importance,Format,Args).
+    log(Category,Importance,Format,Args,[]).
 
 %%%-----------------------------------------------------------------
 %%% @spec log(X1,X2,X3) -> ok
+%%%      X1 = Category | Importance | Format
+%%%      X2 = Importance | Format | Args
+%%%      X3 = Format | Args | Opts
+%%% @equiv log(Category,Importance,Format,Args,Opts)
+log(X1,X2,X3) ->
+    {Category,Importance,Format,Args,Opts} = 
+	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,[],[]};
+	   is_atom(X1), is_list(X2)    -> {X1,?STD_IMPORTANCE,X2,X3,[]};
+	   is_integer(X1)              -> {default,X1,X2,X3,[]};
+	   is_list(X1), is_list(X2)    -> {default,?STD_IMPORTANCE,X1,X2,X3}
+	end,
+    log(Category,Importance,Format,Args,Opts).
+
+%%%-----------------------------------------------------------------
+%%% @spec log(X1,X2,X3,X4) -> ok
 %%%      X1 = Category | Importance
 %%%      X2 = Importance | Format
 %%%      X3 = Format | Args
-%%% @equiv log(Category,Importance,Format,Args)
-log(X1,X2,X3) ->
-    {Category,Importance,Format,Args} = 
-	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,[]};
-	   is_atom(X1), is_list(X2)    -> {X1,?STD_IMPORTANCE,X2,X3};
-	   is_integer(X1)              -> {default,X1,X2,X3}
+%%%      X4 = Args | Opts
+%%% @equiv log(Category,Importance,Format,Args,Opts)
+log(X1,X2,X3,X4) ->
+    {Category,Importance,Format,Args,Opts} = 
+	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,X4,[]};
+	   is_atom(X1), is_list(X2)    -> {X1,?STD_IMPORTANCE,X2,X3,X4};
+	   is_integer(X1)              -> {default,X1,X2,X3,X4}
 	end,
-    log(Category,Importance,Format,Args).
+    log(Category,Importance,Format,Args,Opts).
 
 %%%-----------------------------------------------------------------
-%%% @spec log(Category,Importance,Format,Args) -> ok
+%%% @spec log(Category,Importance,Format,Args,Opts) -> ok
 %%%      Category = atom()
 %%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
+%%%      Opts = [Opt]
+%%%      Opt = esc_chars | no_css
 %%%
 %%% @doc Printout from a test case to the log file. 
 %%%
@@ -558,8 +603,8 @@ log(X1,X2,X3) ->
 %%% and default value for <c>Args</c> is <c>[]</c>.</p>
 %%% <p>Please see the User's Guide for details on <c>Category</c>
 %%% and <c>Importance</c>.</p>
-log(Category,Importance,Format,Args) ->
-    ct_logs:tc_log(Category,Importance,Format,Args).
+log(Category,Importance,Format,Args,Opts) ->
+    ct_logs:tc_log(Category,Importance,Format,Args,Opts).
 
 
 %%%-----------------------------------------------------------------
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index 251204aa75..33efe7a14a 100644
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -694,11 +694,10 @@ make_crypto_key(String) ->
     {[K1,K2,K3],IVec}.
 
 random_bytes(N) ->
-    random:seed(os:timestamp()),
     random_bytes_1(N, []).
 
 random_bytes_1(0, Acc) -> Acc;
-random_bytes_1(N, Acc) -> random_bytes_1(N-1, [random:uniform(255)|Acc]).
+random_bytes_1(N, Acc) -> random_bytes_1(N-1, [rand:uniform(255)|Acc]).
 
 check_callback_load(Callback) ->
     case code:is_loaded(Callback) of
diff --git a/lib/common_test/src/ct_conn_log_h.erl b/lib/common_test/src/ct_conn_log_h.erl
index f7615fdc14..034906a3ba 100644
--- a/lib/common_test/src/ct_conn_log_h.erl
+++ b/lib/common_test/src/ct_conn_log_h.erl
@@ -105,52 +105,62 @@ terminate(_,#state{logs=Logs}) ->
 %%% Writing reports
 write_report(_Time,#conn_log{header=false,module=ConnMod}=Info,Data,GL,State) ->
     case get_log(Info,GL,State) of
-	{silent,_} ->
+	{silent,_,_} ->
 	    ok;
-	{LogType,Fd} ->
-	    io:format(Fd,"~n~ts",[format_data(ConnMod,LogType,Data)])
+	{LogType,Dest,Fd} ->
+	    Str = if LogType == html, Dest == gl -> ["$tc_html","~n~ts"];
+		     true                        -> "~n~ts"
+		  end,
+	    io:format(Fd,Str,[format_data(ConnMod,LogType,Data)])
     end;
 
 write_report(Time,#conn_log{module=ConnMod}=Info,Data,GL,State) ->
     case get_log(Info,GL,State) of
-	{silent,_} ->
+	{silent,_,_} ->
 	    ok;
-	{LogType,Fd} ->
+	{LogType,Dest,Fd} ->
 	    case format_data(ConnMod,LogType,Data) of
-		[] ->
+		[] when Info#conn_log.action==send; Info#conn_log.action==recv ->
 		    ok;
 		FormattedData ->
-		    io:format(Fd,"~n~ts~ts~ts",[format_head(ConnMod,LogType,Time),
-						format_title(LogType,Info),
-						FormattedData])
+		    Str = if LogType == html, Dest == gl ->
+				  ["$tc_html","~n~ts~ts~ts"];
+			     true ->
+				  "~n~ts~ts~ts"
+			  end,
+		    io:format(Fd,Str,[format_head(ConnMod,LogType,Time),
+				      format_title(LogType,Info),
+				      FormattedData])
 	    end
     end.
 
 write_error(Time,#conn_log{module=ConnMod}=Info,Report,GL,State) ->
     case get_log(Info,GL,State) of
-	{LogType,_} when LogType==html; LogType==silent ->
+	{LogType,_,_} when LogType==html; LogType==silent ->
 	    %% The error will anyway be written in the html log by the
 	    %% sasl error handler, so don't write it again.
 	    ok;
-	{LogType,Fd} ->
-	    io:format(Fd,"~n~ts~ts~ts",
-		      [format_head(ConnMod,LogType,Time," ERROR"),
-		       format_title(LogType,Info),
-		       format_error(LogType,Report)])
+	{LogType,Dest,Fd} ->
+	    Str = if LogType == html, Dest == gl -> ["$tc_html","~n~ts~ts~ts"];
+		     true                        -> "~n~ts~ts~ts"
+		  end,
+	    io:format(Fd,Str,[format_head(ConnMod,LogType,Time," ERROR"),
+			      format_title(LogType,Info),
+			      format_error(LogType,Report)])
     end.
 
 get_log(Info,GL,State) ->
     case proplists:get_value(GL,State#state.logs) of
 	undefined ->
-	    {html,State#state.default_gl};
+	    {html,gl,State#state.default_gl};
 	ConnLogs ->
 	    case proplists:get_value(Info#conn_log.module,ConnLogs) of
 		{html,_} ->
-		    {html,GL};
+		    {html,gl,GL};
 		{LogType,Fds} ->
-		    {LogType,get_fd(Info,Fds)};
+		    {LogType,file,get_fd(Info,Fds)};
 		undefined ->
-		    {html,GL}
+		    {html,gl,GL}
 	    end
     end.
 
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index f792269c41..19a3a51b88 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -28,7 +28,7 @@
 -export([init_tc/3, end_tc/3, end_tc/4, get_suite/2, get_all_cases/1]).
 -export([report/2, warn/1, error_notification/4]).
 
--export([get_logopts/0, format_comment/1, get_html_wrapper/4]).
+-export([get_log_dir/0, get_logopts/0, format_comment/1, get_html_wrapper/4]).
 
 -export([error_in_suite/1, init_per_suite/1, end_per_suite/1,
 	 init_per_group/2, end_per_group/2]).
@@ -52,9 +52,23 @@
 %%%
 %%% @doc Test server framework callback, called by the test_server
 %%% when a new test case is started.
-init_tc(Mod,Func,Config) ->
+init_tc(Mod,EPTC={end_per_testcase,_},[Config]) ->
     %% in case Mod == ct_framework, lookup the suite name
     Suite = get_suite_name(Mod, Config),
+    case ct_hooks:init_tc(Suite,EPTC,Config) of
+	NewConfig when is_list(NewConfig) ->
+	    {ok,[NewConfig]};
+	Other->
+	    Other
+    end;
+
+init_tc(Mod,Func0,Args) ->    
+    %% in case Mod == ct_framework, lookup the suite name
+    Suite = get_suite_name(Mod, Args),
+    {Func,HookFunc} = case Func0 of
+			  {init_per_testcase,F} -> {F,Func0};
+			  _                     -> {Func0,Func0}
+		      end,
 
     %% check if previous testcase was interpreted and has left
     %% a "dead" trace window behind - if so, kill it
@@ -86,7 +100,7 @@ init_tc(Mod,Func,Config) ->
 					    end, [create]),
 		    case ct_util:read_suite_data({seq,Suite,Func}) of
 			undefined ->
-			    init_tc1(Mod,Suite,Func,Config);
+			    init_tc1(Mod,Suite,Func,HookFunc,Args);
 			Seq when is_atom(Seq) ->
 			    case ct_util:read_suite_data({seq,Suite,Seq}) of
 				[Func|TCs] -> % this is the 1st case in Seq
@@ -102,27 +116,27 @@ init_tc(Mod,Func,Config) ->
 				_ ->
 				    ok
 			    end,
-			    init_tc1(Mod,Suite,Func,Config);
+			    init_tc1(Mod,Suite,Func,HookFunc,Args);
 			{failed,Seq,BadFunc} ->
 			    {auto_skip,{sequence_failed,Seq,BadFunc}}
 		    end
 	    end
-    end.	    
+    end.
 
-init_tc1(?MODULE,_,error_in_suite,[Config0]) when is_list(Config0) ->
+init_tc1(?MODULE,_,error_in_suite,_,[Config0]) when is_list(Config0) ->
     ct_logs:init_tc(false),
     ct_event:notify(#event{name=tc_start,
 			   node=node(),
 			   data={?MODULE,error_in_suite}}),
-    ct_suite_init(?MODULE, error_in_suite, [], Config0),
-    case ?val(error, Config0) of
+    ct_suite_init(?MODULE,error_in_suite,[],Config0),
+    case ?val(error,Config0) of
 	undefined ->
 	    {fail,"unknown_error_in_suite"};
 	Reason ->
 	    {fail,Reason}
     end;
 
-init_tc1(Mod,Suite,Func,[Config0]) when is_list(Config0) ->
+init_tc1(Mod,Suite,Func,HookFunc,[Config0]) when is_list(Config0) ->
     Config1 = 
 	case ct_util:read_suite_data(last_saved_config) of
 	    {{Suite,LastFunc},SavedConfig} ->	% last testcase
@@ -156,11 +170,13 @@ init_tc1(Mod,Suite,Func,[Config0]) when is_list(Config0) ->
     %% testcase info function (these should only survive the
     %% testcase, not the whole suite)
     FuncSpec = group_or_func(Func,Config0),
-    if is_tuple(FuncSpec) ->			% group
-	    ok;
-       true ->
-	    ct_config:delete_default_config(testcase)
-    end,
+    HookFunc1 =
+	if is_tuple(FuncSpec) ->		% group
+	    FuncSpec;
+	   true ->
+		ct_config:delete_default_config(testcase),
+		HookFunc
+	end,
     Initialize = fun() -> 
 			 ct_logs:init_tc(false),
 			 ct_event:notify(#event{name=tc_start,
@@ -184,14 +200,15 @@ init_tc1(Mod,Suite,Func,[Config0]) when is_list(Config0) ->
 		    Initialize(),
 		    {fail,Reason};
 		_ ->
-		    init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config)
+		    init_tc2(Mod,Suite,Func,HookFunc1,
+			     SuiteInfo,MergeResult,Config)
 	    end
     end;
 
-init_tc1(_Mod,_Suite,_Func,Args) ->
+init_tc1(_Mod,_Suite,_Func,_HookFunc,Args) ->
     {ok,Args}.
 
-init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config) ->
+init_tc2(Mod,Suite,Func,HookFunc,SuiteInfo,MergeResult,Config) ->
     %% timetrap must be handled before require
     MergedInfo = timetrap_first(MergeResult, [], []),
     %% tell logger to use specified style sheet
@@ -238,7 +255,7 @@ init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config) ->
 	{ok,PostInitHook,Config1} ->
 	    case get('$test_server_framework_test') of
 		undefined ->
-		    ct_suite_init(Suite, FuncSpec, PostInitHook, Config1);
+		    ct_suite_init(Suite,HookFunc,PostInitHook,Config1);
 		Fun ->
 		    PostInitHookResult = do_post_init_hook(PostInitHook,
 							   Config1),
@@ -251,16 +268,16 @@ init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config) ->
 	    end
     end.
 
-ct_suite_init(Suite, FuncSpec, PostInitHook, Config) when is_list(Config) ->
-    case ct_hooks:init_tc(Suite, FuncSpec, Config) of
+ct_suite_init(Suite,HookFunc,PostInitHook,Config) when is_list(Config) ->
+    case ct_hooks:init_tc(Suite,HookFunc,Config) of
 	NewConfig when is_list(NewConfig) ->
-	    PostInitHookResult = do_post_init_hook(PostInitHook, NewConfig),
+	    PostInitHookResult = do_post_init_hook(PostInitHook,NewConfig),
 	    {ok, [PostInitHookResult ++ NewConfig]};
 	Else ->
 	    Else
     end.
 
-do_post_init_hook(PostInitHook, Config) ->
+do_post_init_hook(PostInitHook,Config) ->
     lists:flatmap(fun({Tag,Fun}) ->
 			  case lists:keysearch(Tag,1,Config) of
 			      {value,_} ->
@@ -657,9 +674,23 @@ end_tc(Mod,Func,{TCPid,Result,[Args]}, Return) when is_pid(TCPid) ->
 end_tc(Mod,Func,{Result,[Args]}, Return) ->
     end_tc(Mod,Func,self(),Result,Args,Return).
 
-end_tc(Mod,Func,TCPid,Result,Args,Return) ->
+end_tc(Mod,IPTC={init_per_testcase,_Func},_TCPid,Result,Args,Return) ->
+    %% in case Mod == ct_framework, lookup the suite name
+    Suite = get_suite_name(Mod, Args),
+    case ct_hooks:end_tc(Suite,IPTC,Args,Result,Return) of
+	    '$ct_no_change' ->
+		ok;
+	    HookResult ->
+		HookResult
+    end;
+
+end_tc(Mod,Func0,TCPid,Result,Args,Return) ->
     %% in case Mod == ct_framework, lookup the suite name
     Suite = get_suite_name(Mod, Args),
+    {EPTC,Func} = case Func0 of
+		      {end_per_testcase,F} -> {true,F};
+		      _                    -> {false,Func0}
+		  end,
 
     test_server:timetrap_cancel(),
 
@@ -686,11 +717,15 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) ->
     end,
     ct_util:delete_suite_data(last_saved_config),
 
-    FuncSpec = group_or_func(Func,Args),
-
+    {FuncSpec,HookFunc} =
+	if not EPTC ->
+		FS = group_or_func(Func,Args),
+		{FS,FS};
+	   true ->
+		{Func,Func0}
+	end,
     {Result1,FinalNotify} =
-	case ct_hooks:end_tc(
-	       Suite, FuncSpec, Args, Result, Return) of
+	case ct_hooks:end_tc(Suite,HookFunc,Args,Result,Return) of
 	    '$ct_no_change' ->
 		{ok,Result};
 	    HookResult ->
@@ -831,13 +866,13 @@ tag(_Other) ->
 %%% <code>Func</code> in suite <code>Mod</code> crashing. 
 %%% <code>Error</code> specifies the reason for failing.
 error_notification(Mod,Func,_Args,{Error,Loc}) ->
-    ErrSpec = case Error of
+    ErrorSpec = case Error of
 		 {What={_E,_R},Trace} when is_list(Trace) ->
 		      What;
 		  What ->
 		      What
 	      end,
-    ErrStr = case ErrSpec of
+    ErrorStr = case ErrorSpec of
 		 {badmatch,Descr} ->
 		     Descr1 = lists:flatten(io_lib:format("~P",[Descr,10])),
 		     if length(Descr1) > 50 ->
@@ -859,7 +894,8 @@ error_notification(Mod,Func,_Args,{Error,Loc}) ->
 		 Other ->
 		     io_lib:format("~P", [Other,5])
 	     end,
-    ErrorHtml = "<font color=\"brown\">" ++ ErrStr ++ "</font>",
+    ErrorHtml =
+	"<font color=\"brown\">" ++ ct_logs:escape_chars(ErrorStr) ++ "</font>",
     case {Mod,Error} of
 	%% some notifications come from the main test_server process
 	%% and for these cases the existing comment may not be modified
@@ -887,41 +923,43 @@ error_notification(Mod,Func,_Args,{Error,Loc}) ->
 	    end
     end,
 
-    PrintErr = fun(ErrFormat, ErrArgs) ->
+    PrintError = fun(ErrorFormat, ErrorArgs) ->
 		       Div = "~n- - - - - - - - - - - - - - - - - - - "
 			     "- - - - - - - - - - - - - - - - - - - - -~n",
-		       io:format(user, lists:concat([Div,ErrFormat,Div,"~n"]),
-				 ErrArgs),
+		       ErrorStr2 = io_lib:format(ErrorFormat, ErrorArgs),
+		       io:format(user, lists:concat([Div,ErrorStr2,Div,"~n"]),
+				 []),
 		       Link =
 			   "\n\n<a href=\"#end\">"
 			   "Full error description and stacktrace"
 			   "</a>",
+		       ErrorHtml2 = ct_logs:escape_chars(ErrorStr2),
 		       ct_logs:tc_log(ct_error_notify,
 				      ?MAX_IMPORTANCE,
 				      "CT Error Notification",
-				      ErrFormat++Link, ErrArgs)
+				      ErrorHtml2++Link, [], [])
 	       end,
     case Loc of
 	[{?MODULE,error_in_suite}] ->
-	    PrintErr("Error in suite detected: ~ts", [ErrStr]);
+	    PrintError("Error in suite detected: ~ts", [ErrorStr]);
 
 	R when R == unknown; R == undefined ->
-	    PrintErr("Error detected: ~ts", [ErrStr]);
+	    PrintError("Error detected: ~ts", [ErrorStr]);
 
 	%% if a function specified by all/0 does not exist, we
 	%% pick up undef here
-	[{LastMod,LastFunc}|_] when ErrStr == "undef" ->
-	    PrintErr("~w:~w could not be executed~nReason: ~ts",
-		     [LastMod,LastFunc,ErrStr]);
+	[{LastMod,LastFunc}|_] when ErrorStr == "undef" ->
+	    PrintError("~w:~w could not be executed~nReason: ~ts",
+		     [LastMod,LastFunc,ErrorStr]);
 
 	[{LastMod,LastFunc}|_] ->
-	    PrintErr("~w:~w failed~nReason: ~ts", [LastMod,LastFunc,ErrStr]);
+	    PrintError("~w:~w failed~nReason: ~ts", [LastMod,LastFunc,ErrorStr]);
 	    
 	[{LastMod,LastFunc,LastLine}|_] ->
 	    %% print error to console, we are only
 	    %% interested in the last executed expression
-	    PrintErr("~w:~w failed on line ~w~nReason: ~ts",
-		     [LastMod,LastFunc,LastLine,ErrStr]),
+	    PrintError("~w:~w failed on line ~w~nReason: ~ts",
+		     [LastMod,LastFunc,LastLine,ErrorStr]),
 	    
 	    case ct_util:read_suite_data({seq,Mod,Func}) of
 		undefined ->
@@ -1480,3 +1518,8 @@ get_html_wrapper(TestName, PrintLabel, Cwd, TableCols) ->
 
 get_html_wrapper(TestName, PrintLabel, Cwd, TableCols, Encoding) ->
     ct_logs:get_ts_html_wrapper(TestName, PrintLabel, Cwd, TableCols, Encoding).
+
+%%%-----------------------------------------------------------------
+%%% @spec get_log_dir() -> {ok,LogDir}
+get_log_dir() ->
+    ct_logs:get_log_dir(true).
diff --git a/lib/common_test/src/ct_groups.erl b/lib/common_test/src/ct_groups.erl
index 7636f15f59..92640cf323 100644
--- a/lib/common_test/src/ct_groups.erl
+++ b/lib/common_test/src/ct_groups.erl
@@ -81,7 +81,7 @@ find(Mod, all, all, [{Name,Props,Tests} | Gs], Known, Defs, _)
 find(Mod, all, TCs, [{Name,Props,Tests} | Gs], Known, Defs, _) 
   when is_atom(Name), is_list(Props), is_list(Tests) ->
     cyclic_test(Mod, Name, Known),
-    Tests1 = rm_unwanted_tcs(Tests, TCs, []),
+    Tests1 = modify_tc_list(Tests, TCs, []),
     trim(make_conf(Mod, Name, Props,
 		   find(Mod, all, TCs, Tests1, [Name | Known],
 			Defs, true))) ++
@@ -91,7 +91,7 @@ find(Mod, all, TCs, [{Name,Props,Tests} | Gs], Known, Defs, _)
 find(Mod, [Name|GrNames]=SPath, TCs, [{Name,Props,Tests} | Gs], Known,
      Defs, FindAll) when is_atom(Name), is_list(Props), is_list(Tests) ->
     cyclic_test(Mod, Name, Known),
-    Tests1 = rm_unwanted_tcs(Tests, TCs, GrNames),
+    Tests1 = modify_tc_list(Tests, TCs, GrNames),
     trim(make_conf(Mod, Name, Props,
 		   find(Mod, GrNames, TCs, Tests1, [Name|Known],
 			Defs, FindAll))) ++
@@ -133,7 +133,7 @@ find(_Mod, [_|_], _TCs, [], _Known, _Defs, _) ->
 find(Mod, GrNames, TCs, [{Name,Props,Tests} | Gs], Known,
      Defs, FindAll) when is_atom(Name), is_list(Props), is_list(Tests) ->
     cyclic_test(Mod, Name, Known),
-    Tests1 = rm_unwanted_tcs(Tests, TCs, GrNames),
+    Tests1 = modify_tc_list(Tests, TCs, GrNames),
     trim(make_conf(Mod, Name, Props,
 		   find(Mod, GrNames, TCs, Tests1, [Name|Known],
 			Defs, FindAll))) ++
@@ -284,70 +284,57 @@ trim_test(Test) ->
 %% GrNames is [] if the terminating group has been found. From
 %% that point, all specified test should be included (as well as
 %% sub groups for deeper search).
-rm_unwanted_tcs(Tests, all, []) ->
-    Tests;
-
-rm_unwanted_tcs(Tests, TCs, []) ->
-    sort_tests(lists:flatmap(fun(Test) when is_tuple(Test),
-					    (size(Test) > 2) ->
-				     [Test];
-				(Test={group,_}) ->
-				     [Test];
-				(Test={_M,TC}) ->
-				     case lists:member(TC, TCs) of
-					 true  -> [Test];
-					 false -> []
-				     end;
-				(Test) when is_atom(Test) ->
-				     case lists:keysearch(Test, 2, TCs) of
-					 {value,_} ->
-					     [Test];
-					 _ ->
-					     case lists:member(Test, TCs) of
-						 true  -> [Test];
-						 false -> []
-					     end
-				     end;
-				(Test) -> [Test]
-			     end, Tests), TCs);
-					  
-rm_unwanted_tcs(Tests, _TCs, _) ->
-    [Test || Test <- Tests, not is_atom(Test)].
-
-%% make sure the order of tests is according to the order in TCs
-sort_tests(Tests, TCs) when is_list(TCs)->
-    lists:sort(fun(T1, T2) ->
-		       case {is_tc(T1),is_tc(T2)} of
-			   {true,true} ->
-			       (position(T1, TCs) =<
-				position(T2, TCs));
-			   {false,true} ->
-			       (position(T2, TCs) == (length(TCs)+1));
-			   _ -> true
-				   
-		       end
-	       end, Tests);
-sort_tests(Tests, _) ->
-    Tests.
-
-is_tc(T) when is_atom(T)      -> true;
-is_tc({group,_})              -> false;
-is_tc({_M,T}) when is_atom(T) -> true;
-is_tc(_)                      -> false.
-
-position(T, TCs) ->
-    position(T, TCs, 1).
-
-position(T, [T|_TCs], Pos) ->
-    Pos;
-position(T, [{_,T}|_TCs], Pos) ->
-    Pos;
-position({M,T}, [T|_TCs], Pos) when M /= group ->
-    Pos;
-position(T, [_|TCs], Pos) ->
-    position(T, TCs, Pos+1);
-position(_, [], Pos) ->
-    Pos.
+modify_tc_list(GrSpecTs, all, []) ->
+    GrSpecTs;
+
+modify_tc_list(GrSpecTs, TSCs, []) ->
+    modify_tc_list1(GrSpecTs, TSCs);
+    
+modify_tc_list(GrSpecTs, _TSCs, _) ->
+    [Test || Test <- GrSpecTs, not is_atom(Test)].
+
+modify_tc_list1(GrSpecTs, TSCs) ->
+    %% remove all cases in group tc list that should not be executed
+    GrSpecTs1 =
+	lists:flatmap(fun(Test) when is_tuple(Test),
+				     (size(Test) > 2) ->
+			      [Test];
+			 (Test={group,_}) ->
+			      [Test];
+			 (Test={_M,TC}) ->
+			      case lists:member(TC, TSCs) of
+				  true  -> [Test];
+				  false -> []
+			      end;
+			 (Test) when is_atom(Test) ->
+			      case lists:keysearch(Test, 2, TSCs) of
+				  {value,_} ->
+				      [Test];
+				  _ ->
+				      case lists:member(Test, TSCs) of
+					  true  -> [Test];
+					  false -> []
+				      end
+			      end;
+			 (Test) -> [Test]
+		      end, GrSpecTs),
+    {TSCs2,GrSpecTs3} =
+	lists:foldr(
+	  fun(TC, {TSCs1,GrSpecTs2}) ->
+		  case lists:member(TC,GrSpecTs1) of
+		      true ->
+			  {[TC|TSCs1],lists:delete(TC,GrSpecTs2)};
+		      false ->
+			  case lists:keymember(TC, 2, GrSpecTs) of
+			      {value,Test} ->
+				  {[Test|TSCs1],
+				   lists:keydelete(TC, 2, GrSpecTs2)};
+			      false ->
+				  {TSCs1,GrSpecTs2}
+			  end
+		  end
+	  end, {[],GrSpecTs1}, TSCs),
+    TSCs2 ++ GrSpecTs3.
 
 %%%-----------------------------------------------------------------
 
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl
index 86d18696dc..83ad33fdd8 100644
--- a/lib/common_test/src/ct_hooks.erl
+++ b/lib/common_test/src/ct_hooks.erl
@@ -93,7 +93,11 @@ init_tc(Mod, {init_per_group, GroupName, Properties}, Config) ->
     call(fun call_generic/3, Config, [pre_init_per_group, GroupName]);
 init_tc(_Mod, {end_per_group, GroupName, _}, Config) ->
     call(fun call_generic/3, Config, [pre_end_per_group, GroupName]);
-init_tc(_Mod, TC, Config) ->
+init_tc(_Mod, {init_per_testcase,TC}, Config) ->
+    call(fun call_generic/3, Config, [pre_init_per_testcase, TC]);
+init_tc(_Mod, {end_per_testcase,TC}, Config) ->
+    call(fun call_generic/3, Config, [pre_end_per_testcase, TC]);
+init_tc(_Mod, TC = error_in_suite, Config) ->
     call(fun call_generic/3, Config, [pre_init_per_testcase, TC]).
 
 %% @doc Called as each test case is completed. This includes all configuration
@@ -126,10 +130,17 @@ end_tc(Mod, {end_per_group, GroupName, Properties}, Config, Result, _Return) ->
 	       [post_end_per_group, GroupName, Config], '$ct_no_change'),
     maybe_stop_locker(Mod, GroupName, Properties),
     Res;
-end_tc(_Mod, TC, Config, Result, _Return) ->
+end_tc(_Mod, {init_per_testcase,TC}, Config, Result, _Return) ->
+    call(fun call_generic/3, Result, [post_init_per_testcase, TC, Config],
+	'$ct_no_change');
+end_tc(_Mod, {end_per_testcase,TC}, Config, Result, _Return) ->
+    call(fun call_generic/3, Result, [post_end_per_testcase, TC, Config],
+	 '$ct_no_change');
+end_tc(_Mod, TC = error_in_suite, Config, Result, _Return) ->
     call(fun call_generic/3, Result, [post_end_per_testcase, TC, Config],
 	'$ct_no_change').
 
+
 %% Case = TestCase | {TestCase,GroupName}
 on_tc_skip(How, {Suite, Case, Reason}) ->
     call(fun call_cleanup/3, {How, Reason}, [on_tc_skip, Suite, Case]).
@@ -244,6 +255,8 @@ remove(_, Else) ->
 
 %% Translate scopes, i.e. init_per_group,group1 -> end_per_group,group1 etc
 scope([pre_init_per_testcase, TC|_]) ->
+    [post_init_per_testcase, TC];
+scope([pre_end_per_testcase, TC|_]) ->
     [post_end_per_testcase, TC];
 scope([pre_init_per_group, GroupName|_]) ->
     [post_end_per_group, GroupName];
@@ -317,7 +330,8 @@ get_hooks() ->
 %% If we are doing a cleanup call i.e. {post,pre}_end_per_*, all priorities
 %% are reversed. Probably want to make this sorting algorithm pluginable
 %% as some point...
-resort(Calls,Hooks,[F|_R]) when F == post_end_per_testcase;
+resort(Calls,Hooks,[F|_R]) when F == pre_end_per_testcase;
+				F == post_end_per_testcase;
 				F == pre_end_per_group;
 				F == post_end_per_group;
 				F == pre_end_per_suite;
@@ -367,10 +381,10 @@ pos(Id,[_|Rest],Num) ->
 
 catch_apply(M,F,A, Default) ->
     try
-	apply(M,F,A)
+	erlang:apply(M,F,A)
     catch _:Reason ->
 	    case erlang:get_stacktrace() of
-            %% Return the default if it was the CTH module which did not have the function.
+		%% Return the default if it was the CTH module which did not have the function.
 		[{M,F,A,_}|_] when Reason == undef ->
 		    Default;
 		Trace ->
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 78081380e7..aead898614 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -37,15 +37,17 @@
 -export([add_external_logs/1, add_link/3]).
 -export([make_last_run_index/0]).
 -export([make_all_suites_index/1,make_all_runs_index/1]).
--export([get_ts_html_wrapper/5]).
+-export([get_ts_html_wrapper/5, escape_chars/1]).
 -export([xhtml/2, locate_priv_file/1, make_relative/1]).
 -export([insert_javascript/1]).
 -export([uri/1]).
 
 %% Logging stuff directly from testcase
--export([tc_log/3, tc_log/4, tc_log/5, tc_log_async/3, tc_log_async/5,
+-export([tc_log/3, tc_log/4, tc_log/5, tc_log/6,
+	 tc_log_async/3, tc_log_async/5,
 	 tc_print/3, tc_print/4,
-	 tc_pal/3, tc_pal/4, ct_log/3, basic_html/0]).
+	 tc_pal/3, tc_pal/4, ct_log/3,
+	 basic_html/0]).
 
 %% Simulate logger process for use without ct environment running
 -export([simulate/0]).
@@ -267,7 +269,7 @@ cast(Msg) ->
 %%% <p>This function is called by ct_framework:init_tc/3</p>
 init_tc(RefreshLog) ->
     call({init_tc,self(),group_leader(),RefreshLog}),
-    io:format(xhtml("", "<br />")),
+    io:format(["$tc_html",xhtml("", "<br />")]),
     ok.
 
 %%%-----------------------------------------------------------------
@@ -314,9 +316,10 @@ unregister_groupleader(Pid) ->
 %%% data to log (as in <code>io:format(Format,Args)</code>).</p>
 log(Heading,Format,Args) ->
     cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE,
-	  [{int_header(),[log_timestamp(?now),Heading]},
+	  [{hd,int_header(),[log_timestamp(?now),Heading]},
 	   {Format,Args},
-	   {int_footer(),[]}]}),
+	   {ft,int_footer(),[]}],
+	 true}),
     ok.
 
 %%%-----------------------------------------------------------------
@@ -336,7 +339,7 @@ log(Heading,Format,Args) ->
 %%% @see end_log/0
 start_log(Heading) ->
     cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE,
-	  [{int_header(),[log_timestamp(?now),Heading]}]}),
+	  [{hd,int_header(),[log_timestamp(?now),Heading]}],false}),
     ok.
 
 %%%-----------------------------------------------------------------
@@ -351,7 +354,7 @@ cont_log([],[]) ->
 cont_log(Format,Args) ->
     maybe_log_timestamp(),
     cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE,
-	  [{Format,Args}]}),
+	  [{Format,Args}],true}),
     ok.
 
 %%%-----------------------------------------------------------------
@@ -363,7 +366,7 @@ cont_log(Format,Args) ->
 %%% @see cont_log/2
 end_log() ->
     cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE,
-	  [{int_footer(), []}]}),
+	  [{ft,int_footer(), []}],false}),
     ok.
     
 
@@ -400,32 +403,46 @@ add_link(Heading,File,Type) ->
 %%% @spec tc_log(Category,Format,Args) -> ok
 %%% @equiv tc_log(Category,?STD_IMPORTANCE,Format,Args)
 tc_log(Category,Format,Args) ->
-    tc_log(Category,?STD_IMPORTANCE,Format,Args).
+    tc_log(Category,?STD_IMPORTANCE,"User",Format,Args,[]).
 
 %%%-----------------------------------------------------------------
 %%% @spec tc_log(Category,Importance,Format,Args) -> ok
 %%% @equiv tc_log(Category,Importance,"User",Format,Args)
 tc_log(Category,Importance,Format,Args) ->
-    tc_log(Category,Importance,"User",Format,Args).
+    tc_log(Category,Importance,"User",Format,Args,[]).
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_log(Category,Importance,Printer,Format,Args) -> ok
+%%% @spec tc_log(Category,Importance,Format,Args) -> ok
+%%% @equiv tc_log(Category,Importance,"User",Format,Args)
+tc_log(Category,Importance,Format,Args,Opts) ->
+    tc_log(Category,Importance,"User",Format,Args,Opts).
+
+%%%-----------------------------------------------------------------
+%%% @spec tc_log(Category,Importance,Printer,Format,Args,Opts) -> ok
 %%%      Category = atom()
 %%%      Importance = integer()
 %%%      Printer = string()
 %%%      Format = string()
 %%%      Args = list()
+%%%      Opts = list()
 %%%
 %%% @doc Printout from a testcase. 
 %%%
 %%% <p>This function is called by <code>ct</code> when logging
 %%% stuff directly from a testcase (i.e. not from within the CT
 %%% framework).</p>
-tc_log(Category,Importance,Printer,Format,Args) ->
-    cast({log,sync,self(),group_leader(),Category,Importance,
-	  [{div_header(Category,Printer),[]},
-	   {Format,Args},
-	   {div_footer(),[]}]}),
+tc_log(Category,Importance,Printer,Format,Args,Opts) ->
+    Data = 
+	case lists:member(no_css, Opts) of
+	    true ->
+		[{Format,Args}];
+	    false ->
+		[{hd,div_header(Category,Printer),[]},
+		 {Format,Args},
+		 {ft,div_footer(),[]}]
+	end,
+    cast({log,sync,self(),group_leader(),Category,Importance,Data,
+	  lists:member(esc_chars, Opts)}),
     ok.
 
 %%%-----------------------------------------------------------------
@@ -451,9 +468,10 @@ tc_log_async(Category,Format,Args) ->
 %%% asks ct_logs for an html wrapper.</p>
 tc_log_async(Category,Importance,Printer,Format,Args) ->
     cast({log,async,self(),group_leader(),Category,Importance,
-	  [{div_header(Category,Printer),[]},
+	  [{hd,div_header(Category,Printer),[]},
 	   {Format,Args},
-	   {div_footer(),[]}]}),
+	   {ft,div_footer(),[]}],
+	  true}),
     ok.
 %%%-----------------------------------------------------------------
 %%% @spec tc_print(Category,Format,Args)
@@ -522,43 +540,45 @@ tc_pal(Category,Format,Args) ->
 tc_pal(Category,Importance,Format,Args) ->
     tc_print(Category,Importance,Format,Args),
     cast({log,sync,self(),group_leader(),Category,Importance,
-	  [{div_header(Category),[]},
+	  [{hd,div_header(Category),[]},
 	   {Format,Args},
-	   {div_footer(),[]}]}),
+	   {ft,div_footer(),[]}],
+	  true}),
     ok.
 
 
 %%%-----------------------------------------------------------------
-%%% @spec ct_pal(Category,Format,Args) -> ok
+%%% @spec ct_log(Category,Format,Args) -> ok
 %%%      Category = atom()
 %%%      Format = string()
 %%%      Args = list()
 %%%
-%%% @doc Print and log to the ct framework log
+%%% @doc Print to the ct framework log
 %%%
 %%% <p>This function is called by internal ct functions to
 %%% force logging to the ct framework log</p>
 ct_log(Category,Format,Args) ->
-    cast({ct_log,[{div_header(Category),[]},
+    cast({ct_log,[{hd,div_header(Category),[]},
 		  {Format,Args},
-		  {div_footer(),[]}]}),
+		  {ft,div_footer(),[]}],
+	  true}),
     ok.
 
 
 %%%=================================================================
 %%% Internal functions
 int_header() ->
-    "<div class=\"ct_internal\"><b>*** CT ~s *** ~ts</b>".
+    "</pre>\n<div class=\"ct_internal\"><pre><b>*** CT ~s *** ~ts</b>".
 int_footer() ->
-    "</div>".
+    "</pre></div>\n<pre>".
 
 div_header(Class) ->
     div_header(Class,"User").
 div_header(Class,Printer) ->
-    "\n<div class=\"" ++ atom_to_list(Class) ++ "\"><b>*** " ++ Printer ++
-    " " ++ log_timestamp(?now) ++ " ***</b>".
+    "\n</pre>\n<div class=\"" ++ atom_to_list(Class) ++ "\"><pre><b>*** "
+	++ Printer ++ " " ++ log_timestamp(?now) ++ " ***</b>".
 div_footer() ->
-    "</div>".
+    "</pre></div>\n<pre>".
 
 
 maybe_log_timestamp() ->
@@ -568,7 +588,7 @@ maybe_log_timestamp() ->
 	    ok;
 	_ ->
 	    cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE,
-		  [{"<i>~s</i>",[log_timestamp({MS,S,US})]}]})
+		  [{hd,"<i>~s</i>",[log_timestamp({MS,S,US})]}],false})
     end.
 
 log_timestamp({MS,S,US}) ->
@@ -729,7 +749,7 @@ copy_priv_files([], []) ->
 
 logger_loop(State) ->
     receive
-	{log,SyncOrAsync,Pid,GL,Category,Importance,List} ->
+	{log,SyncOrAsync,Pid,GL,Category,Importance,Content,EscChars} ->
 	    VLvl = case Category of
 		       ct_internal ->
 			   ?MAX_VERBOSITY;
@@ -746,15 +766,15 @@ logger_loop(State) ->
 			    case erlang:is_process_alive(TCGL) of
 				true ->
 				    State1 = print_to_log(SyncOrAsync, Pid,
-							  Category,
-							  TCGL, List, State),
+							  Category, TCGL, Content,
+							  EscChars, State),
 				    logger_loop(State1#logger_state{
 						  tc_groupleaders = TCGLs});
 				false ->
 				    %% Group leader is dead, so write to the
 				    %% CtLog or unexpected_io log instead
-				    unexpected_io(Pid,Category,Importance,
-						  List,CtLogFd),
+				    unexpected_io(Pid, Category, Importance,
+						  Content, CtLogFd, EscChars),
 
 				    logger_loop(State)			    
 			    end;
@@ -762,7 +782,8 @@ logger_loop(State) ->
 			    %% If category is ct_internal then write
 			    %% to ct_log, else write to unexpected_io
 			    %% log
-			    unexpected_io(Pid,Category,Importance,List,CtLogFd),
+			    unexpected_io(Pid, Category, Importance, Content,
+					  CtLogFd, EscChars),
 			    logger_loop(State#logger_state{
 					  tc_groupleaders = TCGLs})
 		    end;
@@ -818,10 +839,17 @@ logger_loop(State) ->
 	    logger_loop(State);
 	{clear_stylesheet,_} ->
 	    logger_loop(State#logger_state{stylesheet = undefined});
-	{ct_log, List} ->
+	{ct_log,Content,EscChars} ->
+	    Str = lists:map(fun({_HdOrFt,Str,Args}) ->
+				    [io_lib:format(Str,Args),io_lib:nl()];
+			       ({Str,Args}) when EscChars ->
+				    Io = io_lib:format(Str,Args),
+				    [escape_chars(Io),io_lib:nl()];
+			       ({Str,Args}) ->
+				    [io_lib:format(Str,Args),io_lib:nl()]
+			    end, Content),
 	    Fd = State#logger_state.ct_log_fd,
-	    [begin io:format(Fd,Str,Args),io:nl(Fd) end ||
-				{Str,Args} <- List],
+	    io:format(Fd, "~ts", [Str]),
 	    logger_loop(State);
 	{'DOWN',Ref,_,_Pid,_} ->
 	    %% there might be print jobs executing in parallel with ct_logs
@@ -843,45 +871,74 @@ logger_loop(State) ->
 	    ok
     end.
 
-create_io_fun(FromPid, CtLogFd) ->
+create_io_fun(FromPid, CtLogFd, EscChars) ->
     %% we have to build one io-list of all strings
     %% before printing, or other io printouts (made in
     %% parallel) may get printed between this header 
     %% and footer
-    fun({Str,Args}, IoList) ->
-	    case catch io_lib:format(Str,Args) of
-		{'EXIT',_Reason} ->
+    fun(FormatData, IoList) ->
+	    {Escapable,Str,Args} =
+		case FormatData of
+		    {_HdOrFt,S,A} -> {false,S,A};
+		    {S,A}         -> {true,S,A}
+		end,
+	    try io_lib:format(Str,Args) of
+		IoStr when Escapable, EscChars, IoList == [] ->
+		    escape_chars(IoStr);
+		IoStr when Escapable, EscChars ->
+		    [IoList,"\n",escape_chars(IoStr)];
+		IoStr when IoList == [] ->
+		    IoStr;
+		IoStr ->
+		    [IoList,"\n",IoStr]
+	    catch
+		_:_Reason ->
 		    io:format(CtLogFd, "Logging fails! Str: ~p, Args: ~p~n",
 			      [Str,Args]),
 		    %% stop the testcase, we need to see the fault
 		    exit(FromPid, {log_printout_error,Str,Args}),
-		    [];
-		IoStr when IoList == [] ->
-		    [IoStr];
-		IoStr ->
-		    [IoList,"\n",IoStr]
+		    []
 	    end
     end.
 
-print_to_log(sync, FromPid, Category, TCGL, List, State) ->
+escape_chars([Bin | Io]) when is_binary(Bin) ->
+    [Bin | escape_chars(Io)];
+escape_chars([List | Io]) when is_list(List) ->
+    [escape_chars(List) | escape_chars(Io)];
+escape_chars([$< | Io]) ->
+    ["&lt;" | escape_chars(Io)];
+escape_chars([$> | Io]) ->
+    ["&gt;" | escape_chars(Io)];
+escape_chars([$& | Io]) ->
+    ["&amp;" | escape_chars(Io)];
+escape_chars([Char | Io]) when is_integer(Char) ->
+    [Char | escape_chars(Io)];
+escape_chars([]) ->
+    [];
+escape_chars(Bin) ->
+    Bin.
+
+print_to_log(sync, FromPid, Category, TCGL, Content, EscChars, State) ->
     %% in some situations (exceptions), the printout is made from the
     %% test server IO process and there's no valid group leader to send to
     CtLogFd = State#logger_state.ct_log_fd,
     if FromPid /= TCGL ->
-	    IoFun = create_io_fun(FromPid, CtLogFd),
-	    io:format(TCGL,"~ts", [lists:foldl(IoFun, [], List)]);
+	    IoFun = create_io_fun(FromPid, CtLogFd, EscChars),
+	    IoList = lists:foldl(IoFun, [], Content),
+	    io:format(TCGL,["$tc_html","~ts"], [IoList]);
        true ->
-	    unexpected_io(FromPid,Category,?MAX_IMPORTANCE,List,CtLogFd)
+	    unexpected_io(FromPid, Category, ?MAX_IMPORTANCE, Content,
+			  CtLogFd, EscChars)
     end,
     State;
 
-print_to_log(async, FromPid, Category, TCGL, List, State) ->
+print_to_log(async, FromPid, Category, TCGL, Content, EscChars, State) ->
     %% in some situations (exceptions), the printout is made from the
     %% test server IO process and there's no valid group leader to send to
     CtLogFd = State#logger_state.ct_log_fd,
     Printer =
 	if FromPid /= TCGL ->
-		IoFun = create_io_fun(FromPid, CtLogFd),
+		IoFun = create_io_fun(FromPid, CtLogFd, EscChars),
 		fun() ->
 			test_server:permit_io(TCGL, self()),
 
@@ -894,25 +951,25 @@ print_to_log(async, FromPid, Category, TCGL, List, State) ->
 
 			case erlang:is_process_alive(TCGL) of
 			    true ->
-				try io:format(TCGL, "~ts",
-					      [lists:foldl(IoFun,[],List)]) of
+				try io:format(TCGL, ["$tc_html","~ts"],
+					      [lists:foldl(IoFun,[],Content)]) of
 				    _ -> ok
 				catch
 				    _:terminated ->
 					unexpected_io(FromPid, Category,
 						      ?MAX_IMPORTANCE,
-						      List, CtLogFd)
+						      Content, CtLogFd, EscChars)
 				end;
 			    false ->
 				unexpected_io(FromPid, Category,
 					      ?MAX_IMPORTANCE,
-					      List, CtLogFd)
+					      Content, CtLogFd, EscChars)
 			end
 		end;
 	   true ->
 		fun() ->
 			unexpected_io(FromPid, Category, ?MAX_IMPORTANCE,
-				      List, CtLogFd)
+				      Content, CtLogFd, EscChars)
 		end
 	end,
     case State#logger_state.async_print_jobs of
@@ -1087,12 +1144,6 @@ print_style(Fd,StyleSheet) ->
 	    print_style_error(Fd,StyleSheet,Reason)  
     end.
 
-%% Simple link version, doesn't work with all browsers unfortunately. :-(
-%% print_style(Fd, StyleSheet) ->
-%%    io:format(Fd,
-%%	      "<link href=~p rel=\"stylesheet\" type=\"text/css\">",
-%%	      [StyleSheet]).
-
 print_style_error(Fd,StyleSheet,Reason) ->
     io:format(Fd,"\n<!-- Failed to load stylesheet ~ts: ~p -->\n",
 	      [StyleSheet,Reason]),
@@ -1364,11 +1415,11 @@ total_row(Success, Fail, UserSkip, AutoSkip, NotBuilt, All) ->
     [xhtml("<tr valign=top>\n", 
 	   ["</tbody>\n<tfoot>\n<tr class=\"",odd_or_even(),"\">\n"]),
      "<td><b>Total</b></td>\n", Label, TimestampCell,
-     "<td align=right><b>",integer_to_list(Success),"<b></td>\n",
-     "<td align=right><b>",integer_to_list(Fail),"<b></td>\n",
+     "<td align=right><b>",integer_to_list(Success),"</b></td>\n",
+     "<td align=right><b>",integer_to_list(Fail),"</b></td>\n",
      "<td align=right>",integer_to_list(AllSkip),
      " (",UserSkipStr,"/",AutoSkipStr,")</td>\n",  
-     "<td align=right><b>",integer_to_list(NotBuilt),"<b></td>\n",
+     "<td align=right><b>",integer_to_list(NotBuilt),"</b></td>\n",
      AllInfo, "</tr>\n",
      xhtml("","</tfoot>\n")].
 
@@ -1560,10 +1611,12 @@ header1(Title, SubTitle, TableCols) ->
      "<!-- autogenerated by '"++atom_to_list(?MODULE)++"' -->\n",
      "<head>\n",
      "<title>" ++ Title ++ " " ++ SubTitle ++ "</title>\n",
-     "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n",
-     "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">\n",
+     "<meta http-equiv=\"cache-control\" content=\"no-cache\"></meta>\n",
+     "<meta http-equiv=\"content-type\" content=\"text/html; "
+            "charset=utf-8\"></meta>\n",
      xhtml("",
-	   ["<link rel=\"stylesheet\" href=\"",uri(CSSFile),"\" type=\"text/css\">\n"]),
+	   ["<link rel=\"stylesheet\" href=\"",uri(CSSFile),
+	    "\" type=\"text/css\"></link>\n"]),
      xhtml("",
 	   ["<script type=\"text/javascript\" src=\"",JQueryFile,
 	    "\"></script>\n"]),
@@ -1610,7 +1663,7 @@ footer() ->
       "Copyright &copy; ", year(),
       " <a href=\"http://www.erlang.org\">Open Telecom Platform</a>",
       xhtml("<br>\n", "<br />\n"),
-      "Updated: <!date>", current_time(), "<!/date>",
+      "Updated: <!--date-->", current_time(), "<!--/date-->",
       xhtml("<br>\n", "<br />\n"),
       xhtml("</font></p>\n", "</div>\n"),
       "</center>\n"
@@ -1780,7 +1833,7 @@ make_all_runs_index(When) ->
     AbsName = ?abs(?all_runs_name),
     notify_and_lock_file(AbsName),
     if When == start -> ok;
-       true -> io:put_chars("Updating " ++ AbsName ++ "... ")
+       true -> io:put_chars("Updating " ++ AbsName ++ " ... ")
     end,
 
     %% check if log cache should be used, and if it exists
@@ -1985,9 +2038,9 @@ interactive_link() ->
 	 "<!-- autogenerated by '"++atom_to_list(?MODULE)++"' -->\n",
 	 "<head>\n",
 	 "<title>Last interactive run</title>\n",
-	 "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n",
+	 "<meta http-equiv=\"cache-control\" content=\"no-cache\"></meta>\n",
 	 "<meta http-equiv=\"content-type\" content=\"text/html; "
-	 "charset=utf-8\">\n",
+	        "charset=utf-8\"></meta>\n",
 	 "</head>\n",
 	 "<body>\n",
 	 "Log from last interactive run: <a href=\"",uri(CtLog),"\">",
@@ -2519,7 +2572,7 @@ update_tests_in_cache(TempData,LogCache=#log_cache{tests=Tests}) ->
 make_all_suites_index1(When, AbsIndexName, AllTestLogDirs) ->
     IndexName = ?index_name,
     if When == start -> ok;
-       true -> io:put_chars("Updating " ++ AbsIndexName ++ "... ")
+       true -> io:put_chars("Updating " ++ AbsIndexName ++ " ... ")
     end,
     case catch make_all_suites_index2(IndexName, AllTestLogDirs) of
 	{'EXIT', Reason} ->
@@ -2846,8 +2899,12 @@ simulate() ->
 
 simulate_logger_loop() ->
     receive 
-    	{log,_,_,_,_,_,List} ->
-	    S = [[io_lib:format(Str,Args),io_lib:nl()] || {Str,Args} <- List],
+    	{log,_,_,_,_,_,Content,_} ->
+	    S = lists:map(fun({_,Str,Args}) ->
+				  [io_lib:format(Str,Args),io_lib:nl()];
+			     ({Str,Args}) ->
+				  [io_lib:format(Str,Args),io_lib:nl()]
+			  end, Content),
 	    io:format("~ts",[S]),
 	    simulate_logger_loop();
 	stop ->
@@ -3053,15 +3110,15 @@ get_ts_html_wrapper(TestName, Logdir, PrintLabel, Cwd, TableCols, Encoding) ->
 		      "Copyright &copy; ", year(),
 		      " <a href=\"http://www.erlang.org\">",
 		      "Open Telecom Platform</a><br>\n",
-		      "Updated: <!date>", current_time(), "<!/date>",
+		      "Updated: <!--date-->", current_time(), "<!--/date-->",
 		      "<br>\n</font></p>\n"],
 	    {basic_html,
 	     ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n",
 	      "<html>\n",
 	      "<head><title>", TestName1, "</title>\n",
-	      "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n",
+	      "<meta http-equiv=\"cache-control\" content=\"no-cache\"></meta>\n",
 	      "<meta http-equiv=\"content-type\" content=\"text/html; charset=",
-	      html_encoding(Encoding),"\">\n",
+	      html_encoding(Encoding),"\"></meta>\n",
 	      "</head>\n",
 	      "<body", Bgr, " bgcolor=\"white\" text=\"black\" ",
 	      "link=\"blue\" vlink=\"purple\" alink=\"red\">\n",
@@ -3078,7 +3135,7 @@ get_ts_html_wrapper(TestName, Logdir, PrintLabel, Cwd, TableCols, Encoding) ->
 		 "Copyright &copy; ", year(),
 		 " <a href=\"http://www.erlang.org\">",
 		 "Open Telecom Platform</a><br />\n",
-		 "Updated: <!date>", current_time(), "<!/date>",
+		 "Updated: <!--date-->", current_time(), "<!--/date-->",
 		 "<br />\n</div>\n"],
 	    CSSFile =
 		xhtml(fun() -> "" end, 
@@ -3105,9 +3162,11 @@ get_ts_html_wrapper(TestName, Logdir, PrintLabel, Cwd, TableCols, Encoding) ->
 	      "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n",
 	      "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n",
 	      "<head>\n<title>", TestName1, "</title>\n",
-	      "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n",
-	      "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">\n",
-	      "<link rel=\"stylesheet\" href=\"", uri(CSSFile), "\" type=\"text/css\">\n",
+	      "<meta http-equiv=\"cache-control\" content=\"no-cache\"></meta>\n",
+	      "<meta http-equiv=\"content-type\" content=\"text/html; ",
+	      "charset=utf-8\"></meta>\n",
+	      "<link rel=\"stylesheet\" href=\"", uri(CSSFile),
+	      "\" type=\"text/css\"></link>\n",
 	      "<script type=\"text/javascript\" src=\"", JQueryFile, "\"></script>\n",
 	      "<script type=\"text/javascript\" src=\"", TableSorterFile, "\"></script>\n"] ++
 	      TableSorterScript ++ ["</head>\n","<body>\n", LabelStr, "\n"],
@@ -3233,11 +3292,11 @@ html_encoding(latin1) ->
 html_encoding(utf8) ->
     "utf-8".
 
-unexpected_io(Pid,ct_internal,_Importance,List,CtLogFd) ->
-    IoFun = create_io_fun(Pid,CtLogFd),
-    io:format(CtLogFd, "~ts", [lists:foldl(IoFun, [], List)]);
-unexpected_io(Pid,_Category,_Importance,List,CtLogFd) ->
-    IoFun = create_io_fun(Pid,CtLogFd),
-    Data = io_lib:format("~ts", [lists:foldl(IoFun, [], List)]),
+unexpected_io(Pid, ct_internal, _Importance, Content, CtLogFd, EscChars) ->
+    IoFun = create_io_fun(Pid, CtLogFd, EscChars),
+    io:format(CtLogFd, "~ts", [lists:foldl(IoFun, [], Content)]);
+unexpected_io(Pid, _Category, _Importance, Content, CtLogFd, EscChars) ->
+    IoFun = create_io_fun(Pid, CtLogFd, EscChars),
+    Data = io_lib:format("~ts", [lists:foldl(IoFun, [], Content)]),
     test_server_io:print_unexpected(Data),
     ok.
diff --git a/lib/common_test/src/ct_make.erl b/lib/common_test/src/ct_make.erl
index f4b81a0ef6..e7a9cfa843 100644
--- a/lib/common_test/src/ct_make.erl
+++ b/lib/common_test/src/ct_make.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -324,10 +324,11 @@ check_includes(File, IncludePath, ObjMTime) ->
     end.
     
 check_includes2(Epp, File, ObjMTime) ->
+    A1 = erl_anno:new(1),
     case epp:parse_erl_form(Epp) of
-	{ok, {attribute, 1, file, {File, 1}}} ->
+	{ok, {attribute, A1, file, {File, A1}}} ->
 	    check_includes2(Epp, File, ObjMTime);
-	{ok, {attribute, 1, file, {IncFile, 1}}} ->
+	{ok, {attribute, A1, file, {IncFile, A1}}} ->
 	    case file:read_file_info(IncFile) of
 		{ok, #file_info{mtime=MTime}} when MTime>ObjMTime ->
 		    epp:close(Epp),
diff --git a/lib/common_test/src/ct_master_logs.erl b/lib/common_test/src/ct_master_logs.erl
index 2adced42ae..54190a8254 100644
--- a/lib/common_test/src/ct_master_logs.erl
+++ b/lib/common_test/src/ct_master_logs.erl
@@ -238,9 +238,9 @@ config_table1([]) ->
     ["</tbody>\n</table>\n"].
 
 int_header() ->
-    "<div class=\"ct_internal\"><b>*** CT MASTER ~s *** ~ts</b>".
+    "</pre>\n<div class=\"ct_internal\"><pre><b>*** CT MASTER ~s *** ~ts</b>".
 int_footer() ->
-    "</div>".
+    "</pre></div>\n<pre>".
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% NodeDir Index functions %%%
@@ -387,11 +387,12 @@ header(Title, TableCols) ->
      "<!-- autogenerated by '"++atom_to_list(?MODULE)++"' -->\n",
      "<head>\n",
      "<title>" ++ Title ++ "</title>\n",
-     "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n",
-     "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">\n",
+     "<meta http-equiv=\"cache-control\" content=\"no-cache\"></meta>\n",
+     "<meta http-equiv=\"content-type\" content=\"text/html; ",
+     "charset=utf-8\"></meta>\n",
      xhtml("",
 	   ["<link rel=\"stylesheet\" href=\"",ct_logs:uri(CSSFile),
-	    "\" type=\"text/css\">"]),
+	    "\" type=\"text/css\"></link>\n"]),
      xhtml("",
 	   ["<script type=\"text/javascript\" src=\"",JQueryFile,
 	    "\"></script>\n"]),
@@ -419,7 +420,7 @@ footer() ->
      "Copyright &copy; ", year(),
      " <a href=\"http://www.erlang.org\">Open Telecom Platform</a>",
      xhtml("<br>\n", "<br />\n"),
-     "Updated: <!date>", current_time(), "<!/date>",
+     "Updated: <!--date-->", current_time(), "<--!/date-->",
      xhtml("<br>\n", "<br />\n"),
      xhtml("</font></p>\n", "</div>\n"),
      "</center>\n"
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
index 6e3d1ab1d8..8812514ad9 100644
--- a/lib/common_test/src/ct_netconfc.erl
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -234,7 +234,6 @@
 %% Internal defines
 %%----------------------------------------------------------------------
 -define(APPLICATION,?MODULE).
--define(VALID_SSH_OPTS,[user, password, user_dir]).
 -define(DEFAULT_STREAM,"NETCONF").
 
 -define(error(ConnName,Report),
@@ -264,6 +263,7 @@
 		session_id,
 		msg_id = 1,
 		hello_status,
+		no_end_tag_buff = <<>>,
 		buff = <<>>,
 		pending = [],    % [#pending]
 		event_receiver}).% pid
@@ -1170,7 +1170,7 @@ handle_msg({Ref,timeout},#state{pending=Pending} = State) ->
 	end,
     %% Halfhearted try to get in correct state, this matches
     %% the implementation before this patch
-    {R,State#state{pending=Pending1, buff= <<>>}}.
+    {R,State#state{pending=Pending1, no_end_tag_buff= <<>>, buff= <<>>}}.
 
 %% @private
 %% Called by ct_util_server to close registered connections before terminate.
@@ -1205,7 +1205,7 @@ call(Client, Msg, Timeout, WaitStop) ->
 		    {error,no_such_client};
 		{error,{process_down,Pid,normal}} when WaitStop ->
 		    %% This will happen when server closes connection
-		    %% before clien received rpc-reply on
+		    %% before client received rpc-reply on
 		    %% close-session.
 		    ok;
 		{error,{process_down,Pid,normal}} ->
@@ -1256,13 +1256,11 @@ check_options([{port,Port}|T], Host, _, #options{} = Options) ->
 check_options([{timeout, Timeout}|T], Host, Port, Options)
   when is_integer(Timeout); Timeout==infinity ->
     check_options(T, Host, Port, Options#options{timeout = Timeout});
-check_options([{X,_}=Opt|T], Host, Port, #options{ssh=SshOpts}=Options) ->
-    case lists:member(X,?VALID_SSH_OPTS) of
-	true ->
-	    check_options(T, Host, Port, Options#options{ssh=[Opt|SshOpts]});
-	false ->
-	    {error, {invalid_option, Opt}}
-    end.
+check_options([{timeout, _} = Opt|_T], _Host, _Port, _Options) ->
+    {error, {invalid_option, Opt}};
+check_options([Opt|T], Host, Port, #options{ssh=SshOpts}=Options) ->
+    %% Option verified by ssh
+    check_options(T, Host, Port, Options#options{ssh=[Opt|SshOpts]}).
 
 %%%-----------------------------------------------------------------
 set_request_timer(infinity) ->
@@ -1372,24 +1370,37 @@ to_xml_doc(Simple) ->
 
 %%%-----------------------------------------------------------------
 %%% Parse and handle received XML data
-handle_data(NewData,#state{connection=Connection,buff=Buff0} = State0) ->
+%%% Two buffers are used:
+%%%   * 'no_end_tag_buff' contains data that is checked and does not
+%%%     contain any (part of an) end tag.
+%%%   * 'buff' contains all other saved data - it may or may not
+%%%     include (a part of) an end tag.
+%%% The reason for this is to avoid running binary:split/3 multiple
+%%% times on the same data when it does not contain an end tag. This
+%%% can be a considerable optimation in the case when a lot of data is
+%%% received (e.g. when fetching all data from a node) and the data is
+%%% sent in multiple ssh packages.
+handle_data(NewData,#state{connection=Connection} = State0) ->
     log(Connection,recv,NewData),
-    {Start,AddSz} =
-	case byte_size(Buff0) of
-	    BSz when BSz<5 -> {0,BSz};
-	    BSz -> {BSz-5,5}
-	end,
-    Length = byte_size(NewData) + AddSz,
+    NoEndTag0 = State0#state.no_end_tag_buff,
+    Buff0 = State0#state.buff,
     Data = <<Buff0/binary, NewData/binary>>,
-    case binary:split(Data,?END_TAG,[{scope,{Start,Length}}]) of
+    case binary:split(Data,?END_TAG,[]) of
 	[_NoEndTagFound] ->
-	    {noreply, State0#state{buff=Data}};
+	    NoEndTagSize = case byte_size(Data) of
+			       Sz when Sz<5 -> 0;
+			       Sz -> Sz-5
+			   end,
+	    <<NoEndTag1:NoEndTagSize/binary,Buff/binary>> = Data,
+	    NoEndTag = <<NoEndTag0/binary,NoEndTag1/binary>>,
+	    {noreply, State0#state{no_end_tag_buff=NoEndTag, buff=Buff}};
 	[FirstMsg0,Buff1] ->
-	    FirstMsg = remove_initial_nl(FirstMsg0),
+	    FirstMsg = remove_initial_nl(<<NoEndTag0/binary,FirstMsg0/binary>>),
 	    SaxArgs = [{event_fun,fun sax_event/3}, {event_state,[]}],
 	    case xmerl_sax_parser:stream(FirstMsg, SaxArgs) of
 		{ok, Simple, _Thrash} ->
-		    case decode(Simple, State0#state{buff=Buff1}) of
+		    case decode(Simple, State0#state{no_end_tag_buff= <<>>,
+						     buff=Buff1}) of
 			{noreply, #state{buff=Buff} = State} when Buff =/= <<>> ->
 			    %% Recurse if we have more data in buffer
 			    handle_data(<<>>, State);
@@ -1401,10 +1412,12 @@ handle_data(NewData,#state{connection=Connection,buff=Buff0} = State0) ->
 			   [{parse_error,Reason},
 			    {buffer, Buff0},
 			    {new_data,NewData}]),
-		    handle_error(Reason, State0#state{buff= <<>>})
+		    handle_error(Reason, State0#state{no_end_tag_buff= <<>>,
+						      buff= <<>>})
 	    end
     end.
 
+
 %% xml does not accept a leading nl and some netconf server add a nl after
 %% each ?END_TAG, ignore them
 remove_initial_nl(<<"\n", Data/binary>>) ->
diff --git a/lib/common_test/src/ct_release_test.erl b/lib/common_test/src/ct_release_test.erl
index 6438ea01c1..6c38f51363 100644
--- a/lib/common_test/src/ct_release_test.erl
+++ b/lib/common_test/src/ct_release_test.erl
@@ -131,7 +131,7 @@
 -include_lib("kernel/include/file.hrl").
 
 %%-----------------------------------------------------------------
--define(testnode, otp_upgrade).
+-define(testnode, 'ct_release_test-upgrade').
 -define(exclude_apps, [hipe, typer, dialyzer]). % never include these apps
 
 %%-----------------------------------------------------------------
@@ -304,7 +304,13 @@ upgrade(Apps,Level,Callback,Config) ->
 	%% Note, we will not reach this if the test fails with a
 	%% timetrap timeout in the test suite! Thus we can have
 	%% hanging nodes...
-	Nodes = nodes(),
+	Nodes = lists:filter(fun(Node) ->
+				     case atom_to_list(Node) of
+					 "ct_release_test-" ++_ -> true;
+					 _ -> false
+				     end
+			     end,
+			     nodes()),
 	[rpc:call(Node,erlang,halt,[]) || Node <- Nodes]
     end.
 
@@ -328,7 +334,14 @@ upgrade(Apps,Level,Callback,Config) ->
 %%     ct_release_test:cleanup(Config).'''
 %%
 cleanup(Config) ->
-    Nodes = [node_name(?testnode)|nodes()],
+    AllNodes = [node_name(?testnode)|nodes()],
+    Nodes = lists:filter(fun(Node) ->
+				 case atom_to_list(Node) of
+				     "ct_release_test-" ++_ -> true;
+				     _ -> false
+				 end
+			 end,
+			 AllNodes),
     [rpc:call(Node,erlang,halt,[]) || Node <- Nodes],
     Config.
 
@@ -455,9 +468,9 @@ get_rels(minor) ->
     {CurrentMajor,Current}.
 
 init_upgrade_test(FromVsn,ToVsn,OldRel) ->
-    OtpRel = list_to_atom("otp-"++FromVsn),
+    Name = list_to_atom("ct_release_test-otp-"++FromVsn),
     ct:log("Starting node to fetch application versions to upgrade from"),
-    {ok,Node} = test_server:start_node(OtpRel,peer,[{erl,[OldRel]}]),
+    {ok,Node} = test_server:start_node(Name,peer,[{erl,[OldRel]}]),
     {Apps,Path} = fetch_all_apps(Node),
     test_server:stop_node(Node),
     {FromVsn,ToVsn,Apps,Path}.
@@ -723,7 +736,7 @@ do_callback(Node,Mod,Func,Args) ->
     ct:log("~p:~p/~w returned: ~p",[Mod,Func,length(Args),R]),
     case R of
 	{badrpc,Error} ->
-	    test_server:fail({test_upgrade_callback,Mod,Func,Args,Error});
+	    throw({fail,{test_upgrade_callback,Mod,Func,Args,Error}});
 	NewState ->
 	    NewState
     end.
@@ -753,7 +766,7 @@ create_relfile(AppsVsns,CreateDir,RelName0,RelVsn) ->
     %% Should test tools really be included? Some library functions
     %% here could be used by callback, but not everything since
     %% processes of these applications will not be running.
-    TestToolAppsVsns0 = get_vsns([test_server,common_test]),
+    TestToolAppsVsns0 = get_vsns([common_test]),
     TestToolAppsVsns =
 	[{A,V,none} || {A,V} <- TestToolAppsVsns0,
 		       false == lists:keymember(A,1,AllAppsVsns0)],
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 0b646ffd07..e156c9b773 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2004-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.
@@ -909,7 +909,7 @@ run_test(StartOpt) when is_tuple(StartOpt) ->
     run_test([StartOpt]);
 
 run_test(StartOpts) when is_list(StartOpts) ->
-    CTPid = spawn(fun() -> run_test1(StartOpts) end),
+    CTPid = spawn(run_test1_fun(StartOpts)),
     Ref = monitor(process, CTPid),
     receive
 	{'DOWN',Ref,process,CTPid,{user_error,Error}} ->
@@ -918,6 +918,11 @@ run_test(StartOpts) when is_list(StartOpts) ->
 		    Other
     end.
 
+-spec run_test1_fun(_) -> fun(() -> no_return()).
+
+run_test1_fun(StartOpts) ->
+    fun() -> run_test1(StartOpts) end.
+
 run_test1(StartOpts) when is_list(StartOpts) ->
     case proplists:get_value(refresh_logs, StartOpts) of
 	undefined ->
@@ -1369,7 +1374,7 @@ run_dir(Opts = #opts{logdir = LogDir,
 %%% @equiv ct:run_testspec/1
 %%%-----------------------------------------------------------------
 run_testspec(TestSpec) ->
-    CTPid = spawn(fun() -> run_testspec1(TestSpec) end),
+    CTPid = spawn(run_testspec1_fun(TestSpec)),
     Ref = monitor(process, CTPid),
     receive
 	{'DOWN',Ref,process,CTPid,{user_error,Error}} ->
@@ -1378,6 +1383,11 @@ run_testspec(TestSpec) ->
 		    Other
     end.
 
+-spec run_testspec1_fun(_) -> fun(() -> no_return()).
+
+run_testspec1_fun(TestSpec) ->
+    fun() -> run_testspec1(TestSpec) end.
+
 run_testspec1(TestSpec) ->
     {ok,Cwd} = file:get_cwd(),
     io:format("~nCommon Test starting (cwd is ~ts)~n~n", [Cwd]),
@@ -2045,6 +2055,13 @@ final_tests1([{TestDir,Suite,GrsOrCs}|Tests], Final, Skip, Bad) when
 		     ({skipped,Group,TCs}) ->
 			  [ct_groups:make_conf(TestDir, Suite,
 					       Group, [skipped], TCs)];
+		     ({skipped,TC}) ->
+			  case lists:member(TC, GrsOrCs) of
+			      true ->
+				  [];
+			      false ->
+				  [TC]
+			  end;
 		     ({GrSpec = {GroupName,_},TCs}) ->
 			  Props = [{override,GrSpec}],
 			  [ct_groups:make_conf(TestDir, Suite,
@@ -2617,11 +2634,9 @@ run_make(Targets, TestDir0, Mod, UserInclude) ->
 					data=TestDir}),
 	    {ok,Cwd} = file:get_cwd(),
 	    ok = file:set_cwd(TestDir),
-	    TestServerInclude = get_dir(test_server, "include"),
 	    CtInclude = get_dir(common_test, "include"),
 	    XmerlInclude = get_dir(xmerl, "include"),
-	    ErlFlags = UserInclude ++ [{i,TestServerInclude},
-				       {i,CtInclude},
+	    ErlFlags = UserInclude ++ [{i,CtInclude},
 				       {i,XmerlInclude},
 				       debug_info],
 	    Result =
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index 0cd83b9f04..3ad3937548 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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.
@@ -315,7 +315,7 @@ enodename(Host, Node) ->
 do_start(Host, Node, Options) ->
     ENode = enodename(Host, Node),
     Functions =
-	lists:concat([[{ct_slave, slave_started, [ENode, self()]}],
+	lists:append([[{ct_slave, slave_started, [ENode, self()]}],
 		      Options#options.startup_functions,
 		      [{ct_slave, slave_ready, [ENode, self()]}]]),
     Functions2 = if
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index 5d5448f352..5cd52bd042 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -70,13 +70,17 @@ prepare_tests(TestSpec) when is_record(TestSpec,testspec) ->
     Tests = TestSpec#testspec.tests,
     %% Sort Tests into "flat" Run and Skip lists (not sorted per node).
     {Run,Skip} = get_run_and_skip(Tests,[],[]),
+
     %% Create initial list of {Node,{Run,Skip}} tuples
     NodeList = lists:map(fun(N) -> {N,{[],[]}} end, list_nodes(TestSpec)),
+
     %% Get all Run tests sorted per node basis.
     NodeList1 = run_per_node(Run,NodeList, 
-			     TestSpec#testspec.merge_tests),    
+			     TestSpec#testspec.merge_tests),
+    
     %% Get all Skip entries sorted per node basis.
     NodeList2 = skip_per_node(Skip,NodeList1),
+
     %% Change representation.
     Result=
 	lists:map(fun({Node,{Run1,Skip1}}) ->
@@ -103,7 +107,7 @@ run_per_node([{{Node,Dir},Test}|Ts],Result,MergeTests) ->
 	       true ->
 		   merge_tests(Dir,Test,Run)
 	   end,
-    run_per_node(Ts,insert_in_order({Node,{Run1,Skip}},Result), 
+    run_per_node(Ts,insert_in_order({Node,{Run1,Skip}},Result,replace), 
 		 MergeTests);
 run_per_node([],Result,_) ->
     Result.
@@ -140,7 +144,7 @@ merge_suites(Dir,Test,[]) ->
 skip_per_node([{{Node,Dir},Test}|Ts],Result) ->
     {value,{Node,{Run,Skip}}} = lists:keysearch(Node,1,Result),
     Skip1 = [{Dir,Test}|Skip],
-    skip_per_node(Ts,insert_in_order({Node,{Run,Skip1}},Result));
+    skip_per_node(Ts,insert_in_order({Node,{Run,Skip1}},Result,replace));
 skip_per_node([],Result) -> 
     Result.
 
@@ -156,7 +160,7 @@ skip_per_node([],Result) ->
 %%
 %%   Skip entry: {Suites,Comment} or {Suite,Cases,Comment}
 %%
-get_run_and_skip([{{Node,Dir},Suites}|Tests],Run,Skip) ->    
+get_run_and_skip([{{Node,Dir},Suites}|Tests],Run,Skip) ->
     TestDir = ct_util:get_testdir(Dir,catch element(1,hd(Suites))),
     case lists:keysearch(all,1,Suites) of
 	{value,_} ->				% all Suites in Dir
@@ -183,18 +187,33 @@ prepare_suites(Node,Dir,[{Suite,Cases}|Suites],Run,Skip) ->
 			   [[{{Node,Dir},{Suite,all}}]|Run],
 			   [Skipped|Skip]);
 	false ->
-	    {RL,SL} = prepare_cases(Node,Dir,Suite,Cases),
-	    prepare_suites(Node,Dir,Suites,[RL|Run],[SL|Skip])
+	    {Run1,Skip1} = prepare_cases(Node,Dir,Suite,Cases,Run,Skip),
+	    prepare_suites(Node,Dir,Suites,Run1,Skip1)
     end;
 prepare_suites(_Node,_Dir,[],Run,Skip) ->
     {lists:flatten(lists:reverse(Run)),
      lists:flatten(lists:reverse(Skip))}.
 
-prepare_cases(Node,Dir,Suite,Cases) ->
+prepare_cases(Node,Dir,Suite,Cases,Run,Skip) ->
     case get_skipped_cases(Node,Dir,Suite,Cases) of
-	SkipAll=[{{Node,Dir},{Suite,_Cmt}}] ->	      % all cases to be skipped
-	    %% note: this adds an 'all' test even if only skip is specified
-	    {[{{Node,Dir},{Suite,all}}],SkipAll};
+	[SkipAll={{Node,Dir},{Suite,_Cmt}}] ->	      % all cases to be skipped
+	    case lists:any(fun({{N,D},{S,all}}) when N == Node,
+						     D == Dir,
+						     S == Suite ->
+				   true;
+			      ({{N,D},{S,Cs}}) when N == Node,
+						    D == Dir,
+						    S == Suite ->
+				   lists:member(all,Cs);
+			      (_) -> false
+			   end, lists:flatten(Run)) of
+		true ->
+		    {Run,[SkipAll|Skip]};
+		false ->
+		    %% note: this adds an 'all' test even if
+		    %% only skip is specified		    
+		    {[{{Node,Dir},{Suite,all}}|Run],[SkipAll|Skip]}
+	    end;
 	Skipped ->
 	    %% note: this adds a test even if only skip is specified
 	    PrepC = lists:foldr(fun({{G,Cs},{skip,_Cmt}}, Acc) when
@@ -210,11 +229,11 @@ prepare_cases(Node,Dir,Suite,Cases) ->
 					    true ->
 						Acc;
 					    false ->
-						[C|Acc]
+						[{skipped,C}|Acc]
 					end;
 				   (C,Acc) -> [C|Acc]
 				end, [], Cases),
-    {{{Node,Dir},{Suite,PrepC}},Skipped}
+	    {[{{Node,Dir},{Suite,PrepC}}|Run],[Skipped|Skip]}
     end.
 
 get_skipped_suites(Node,Dir,Suites) ->
@@ -431,6 +450,7 @@ collect_tests({Replace,Terms},TestSpec=#testspec{alias=As,nodes=Ns},Relaxed) ->
 						    merge_tests = MergeTestsDef}),
     TestSpec2 = get_all_nodes(Terms2,TestSpec1),
     {Terms3, TestSpec3} = filter_init_terms(Terms2, [], TestSpec2),
+
     add_tests(Terms3,TestSpec3).
 
 %% replace names (atoms) in the testspec matching those in 'define' terms by
@@ -1257,7 +1277,7 @@ insert_groups1(Suite,Groups,Suites0) ->
 	    Suites0;
 	{value,{Suite,GrAndCases0}} ->
 	    GrAndCases = insert_groups2(Groups,GrAndCases0),
-	    insert_in_order({Suite,GrAndCases},Suites0);
+	    insert_in_order({Suite,GrAndCases},Suites0,replace);
 	false ->
 	    insert_in_order({Suite,Groups},Suites0)
     end.
@@ -1282,7 +1302,7 @@ insert_cases(Node,Dir,Suite,Cases,Tests,false) when is_list(Cases) ->
 insert_cases(Node,Dir,Suite,Cases,Tests,true) when is_list(Cases) ->
     {Tests1,Done} =
 	lists:foldr(fun(All={{N,D},[{all,_}]},{Merged,_}) when N == Node,
-								 D == Dir ->
+							       D == Dir ->
 			    {[All|Merged],true};
 		       ({{N,D},Suites0},{Merged,_}) when N == Node,
 							   D == Dir ->
@@ -1312,7 +1332,7 @@ insert_cases1(Suite,Cases,Suites0) ->
 	    Suites0;
 	{value,{Suite,Cases0}} ->
 	    Cases1 = insert_in_order(Cases,Cases0),
-	    insert_in_order({Suite,Cases1},Suites0);
+	    insert_in_order({Suite,Cases1},Suites0,replace);
 	false ->
 	    insert_in_order({Suite,Cases},Suites0)
     end.
@@ -1369,9 +1389,9 @@ skip_groups1(Suite,Groups,Cmt,Suites0) ->
     case lists:keysearch(Suite,1,Suites0) of
 	{value,{Suite,GrAndCases0}} ->
 	    GrAndCases1 = GrAndCases0 ++ SkipGroups,
-	    insert_in_order({Suite,GrAndCases1},Suites0);
+	    insert_in_order({Suite,GrAndCases1},Suites0,replace);
 	false ->
-	    insert_in_order({Suite,SkipGroups},Suites0)
+	    insert_in_order({Suite,SkipGroups},Suites0,replace)
     end.
 
 skip_cases(Node,Dir,Suite,Cases,Cmt,Tests,false) when is_list(Cases) ->
@@ -1380,7 +1400,7 @@ skip_cases(Node,Dir,Suite,Cases,Cmt,Tests,false) when is_list(Cases) ->
 skip_cases(Node,Dir,Suite,Cases,Cmt,Tests,true) when is_list(Cases) ->
     {Tests1,Done} =
 	lists:foldr(fun({{N,D},Suites0},{Merged,_}) when N == Node,
-							   D == Dir ->
+							 D == Dir ->
 			    Suites1 = skip_cases1(Suite,Cases,Cmt,Suites0),
 			    {[{{N,D},Suites1}|Merged],true};
 		       (T,{Merged,Match}) ->
@@ -1401,32 +1421,55 @@ skip_cases1(Suite,Cases,Cmt,Suites0) ->
     case lists:keysearch(Suite,1,Suites0) of
 	{value,{Suite,Cases0}} ->
 	    Cases1 = Cases0 ++ SkipCases,
-	    insert_in_order({Suite,Cases1},Suites0);
+	    insert_in_order({Suite,Cases1},Suites0,replace);
 	false ->
-	    insert_in_order({Suite,SkipCases},Suites0)
+	    case Suites0 of
+		[{all,_}=All|Skips]->
+		    [All|Skips++[{Suite,SkipCases}]];
+		_ ->
+		    insert_in_order({Suite,SkipCases},Suites0,replace)
+	    end
     end.
 
 append(Elem, List) ->
     List ++ [Elem].
 
-insert_in_order([E|Es],List) ->
-    List1 = insert_elem(E,List,[]),
-    insert_in_order(Es,List1);
-insert_in_order([],List) ->
+insert_in_order(Elems,Dest) ->
+        insert_in_order1(Elems,Dest,false).
+
+insert_in_order(Elems,Dest,replace) ->
+    insert_in_order1(Elems,Dest,true).
+
+insert_in_order1([_E|Es],all,Replace) ->
+    insert_in_order1(Es,all,Replace);
+
+insert_in_order1([E|Es],List,Replace) ->
+    List1 = insert_elem(E,List,[],Replace),
+    insert_in_order1(Es,List1,Replace);
+insert_in_order1([],List,_Replace) ->
     List;
-insert_in_order(E,List) ->
-    insert_elem(E,List,[]).
+insert_in_order1(E,List,Replace) ->
+    insert_elem(E,List,[],Replace).
+
 
-%% replace an existing entry (same key) or add last in list
-insert_elem({Key,_}=E,[{Key,_}|Rest],SoFar) ->
+insert_elem({Key,_}=E,[{Key,_}|Rest],SoFar,true) ->
     lists:reverse([E|SoFar]) ++ Rest;
-insert_elem({E,_},[E|Rest],SoFar) ->
+insert_elem({E,_},[E|Rest],SoFar,true) ->
     lists:reverse([E|SoFar]) ++ Rest;
-insert_elem(E,[E|Rest],SoFar) ->
+insert_elem(E,[E|Rest],SoFar,true) ->
+    lists:reverse([E|SoFar]) ++ Rest;
+
+insert_elem({all,_}=E,_,SoFar,_Replace) ->
+    lists:reverse([E|SoFar]);
+insert_elem(_E,[all|_],SoFar,_Replace) ->
+    lists:reverse(SoFar);
+insert_elem(_E,[{all,_}],SoFar,_Replace) ->
+    lists:reverse(SoFar);
+insert_elem({Key,_}=E,[{Key,[]}|Rest],SoFar,_Replace) ->
     lists:reverse([E|SoFar]) ++ Rest;
-insert_elem(E,[E1|Rest],SoFar) ->
-    insert_elem(E,Rest,[E1|SoFar]);
-insert_elem(E,[],SoFar) ->
+insert_elem(E,[E1|Rest],SoFar,Replace) ->
+    insert_elem(E,Rest,[E1|SoFar],Replace);
+insert_elem(E,[],SoFar,_Replace) ->
     lists:reverse([E|SoFar]).
 
 ref2node(all_nodes,_Refs) ->
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index 445fce1db8..b7fa7947e2 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -485,6 +485,8 @@ loop(Mode,TestData,StartDir) ->
 	{'EXIT',Pid,Reason} ->
 	    case ets:lookup(?conn_table,Pid) of
 		[#conn{address=A,callback=CB}] ->
+		    ErrorStr = io_lib:format("~tp", [Reason]),
+		    ErrorHtml = ct_logs:escape_chars(ErrorStr),
 		    %% A connection crashed - remove the connection but don't die
 		    ct_logs:tc_log_async(ct_error_notify,
 					 ?MAX_IMPORTANCE,
@@ -492,8 +494,8 @@ loop(Mode,TestData,StartDir) ->
 					 "Connection process died: "
 					 "Pid: ~w, Address: ~p, "
 					 "Callback: ~w\n"
-					 "Reason: ~p\n\n",
-					 [Pid,A,CB,Reason]),
+					 "Reason: ~ts\n\n",
+					 [Pid,A,CB,ErrorHtml]),
 		    catch CB:close(Pid),
 		    %% in case CB:close failed to do this:
 		    unregister_connection(Pid),
diff --git a/lib/common_test/src/cth_conn_log.erl b/lib/common_test/src/cth_conn_log.erl
index 9b3dc0b5f1..954b4239af 100644
--- a/lib/common_test/src/cth_conn_log.erl
+++ b/lib/common_test/src/cth_conn_log.erl
@@ -132,7 +132,7 @@ pre_init_per_testcase(TestCase,Config,CthState) ->
 				 [S,ct_logs:uri(L),filename:basename(L)])
 			       || {S,L} <- Ls] ++
 			      "</table>",
-			  io:format(Str,[]),
+			  ct:log(Str,[],[no_css]),
 			  {ConnMod,{LogType,Ls}};
 		      _ ->
 			  {ConnMod,{LogType,[]}}
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl
index e6970a2bad..a8c4a455e1 100644
--- a/lib/common_test/src/cth_log_redirect.erl
+++ b/lib/common_test/src/cth_log_redirect.erl
@@ -30,7 +30,8 @@
 	 pre_init_per_suite/3, pre_end_per_suite/3, post_end_per_suite/4,
 	 pre_init_per_group/3, post_init_per_group/4,
 	 pre_end_per_group/3, post_end_per_group/4,
-	 pre_init_per_testcase/3, post_end_per_testcase/4]).
+	 pre_init_per_testcase/3, post_init_per_testcase/4,
+	 pre_end_per_testcase/3, post_end_per_testcase/4]).
 
 %% Event handler Callbacks
 -export([init/1,
@@ -89,6 +90,12 @@ pre_init_per_testcase(TC, Config, State) ->
     set_curr_func(TC, Config),
     {Config, State}.
 
+post_init_per_testcase(_TC, _Config, Return, State) ->
+    {Return, State}.
+
+pre_end_per_testcase(_TC, Config, State) ->
+    {Config, State}.
+
 post_end_per_testcase(_TC, _Config, Result, State) ->
     %% Make sure that the event queue is flushed
     %% before ending this test case.
diff --git a/lib/test_server/src/erl2html2.erl b/lib/common_test/src/erl2html2.erl
index 2c63103264..d440d0940d 100644
--- a/lib/test_server/src/erl2html2.erl
+++ b/lib/common_test/src/erl2html2.erl
@@ -44,7 +44,7 @@ convert(File, Dest, InclPath) ->
 	      "<html>\n"
               "<head>\n"
               "<meta http-equiv=\"Content-Type\" content=\"text/html;"
-                 "charset=",html_encoding(Encoding),"\"/>\n"
+                 "charset=",html_encoding(Encoding),"\"/></meta>\n"
               "<title>", to_raw_list(File,Encoding), "</title>\n"
               "</head>\n\n"
 	      "<body bgcolor=\"white\" text=\"black\""
@@ -170,23 +170,32 @@ get_line(Anno) ->
 %%%-----------------------------------------------------------------
 %%% Find the line number of the last expression in the function
 find_clause_lines([{clause,CL,_Params,_Op,Exprs}], CLs) -> % last clause
-    try tuple_to_list(lists:last(Exprs)) of
-	[_Type,ExprLine | _] when is_integer(ExprLine) ->
-	    {lists:reverse([{clause,get_line(CL)}|CLs]), get_line(ExprLine)};
-	[tree,_ | Exprs1] ->
+    case classify_exprs(Exprs) of
+        {anno, Anno} ->
+	    {lists:reverse([{clause,get_line(CL)}|CLs]), get_line(Anno)};
+        {tree, Exprs1} ->
 	    find_clause_lines([{clause,CL,undefined,undefined,Exprs1}], CLs);
-	[macro,{_var,ExprLine,_MACRO} | _] when is_integer(ExprLine) ->
-	    {lists:reverse([{clause,get_line(CL)}|CLs]), get_line(ExprLine)};
-	_ ->
-	    {lists:reverse([{clause,get_line(CL)}|CLs]), get_line(CL)}
-    catch
-	_:_ ->
+        unknown ->
 	    {lists:reverse([{clause,get_line(CL)}|CLs]), get_line(CL)}
     end;
-
 find_clause_lines([{clause,CL,_Params,_Op,_Exprs} | Cs], CLs) ->
     find_clause_lines(Cs, [{clause,get_line(CL)}|CLs]).
 
+classify_exprs(Exprs) ->
+    case tuple_to_list(lists:last(Exprs)) of
+        [macro,{_var,Anno,_MACRO} | _] ->
+            {anno, Anno};
+        [T,ExprAnno | Exprs1] ->
+            case erl_anno:is_anno(ExprAnno) of
+                true ->
+                    {anno, ExprAnno};
+                false when T =:= tree ->
+                    {tree, Exprs1};
+                false ->
+                    unknown
+            end
+    end.
+
 %%%-----------------------------------------------------------------
 %%% Add a link target for each line and one for each function definition.
 build_html(SFd,DFd,Encoding,FuncsAndCs) ->
diff --git a/lib/test_server/src/test_server.erl b/lib/common_test/src/test_server.erl
index da6bf491ac..34acad6fd1 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/common_test/src/test_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -63,13 +63,11 @@
 init_target_info() ->
     [$.|Emu] = code:objfile_extension(),
     {_, OTPRel} = init:script_id(),
-    TestServerDir = filename:absname(filename:dirname(code:which(?MODULE))),
     #target_info{os_family=test_server_sup:get_os_family(),
 		 os_type=os:type(),
 		 version=erlang:system_info(version),
 		 system_version=erlang:system_info(system_version),
 		 root_dir=code:root_dir(),
-		 test_server_dir=TestServerDir,
 		 emulator=Emu,
 		 otp_release=OTPRel,
 		 username=test_server_sup:get_username(),
@@ -411,11 +409,9 @@ run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
     Ref = make_ref(),
     Pid =
 	spawn_link(
-	  fun() ->
-		  run_test_case_eval(Mod, Func, Args, Name, Ref,
-				     RunInit, TimetrapData,
-				     LogOpts, TCCallback)
-	  end),
+          run_test_case_eval_fun(Mod, Func, Args, Name, Ref,
+                                 RunInit, TimetrapData,
+                                 LogOpts, TCCallback)),
     put(test_server_detected_fail, []),
     St = #st{ref=Ref,pid=Pid,mf={Mod,Func},last_known_loc=unknown,
 	     status=starting,ret_val=[],comment="",timeout=infinity,
@@ -718,10 +714,10 @@ call_end_conf(Mod,Func,TCPid,TCExitReason,Loc,Conf,TVal) ->
 			       Starter ! {self(),{call_end_conf,Data,ok}}
 		       end);
 	true ->
-	    do_call_end_conf(Starter,Mod,Func,Data,Conf,TVal)
+	    do_call_end_conf(Starter,Mod,Func,Data,TCExitReason,Conf,TVal)
     end.
 
-do_call_end_conf(Starter,Mod,Func,Data,Conf,TVal) ->
+do_call_end_conf(Starter,Mod,Func,Data,TCExitReason,Conf,TVal) ->
     EndConfProc =
 	fun() ->
 		process_flag(trap_exit,true), % to catch timetraps
@@ -729,16 +725,25 @@ do_call_end_conf(Starter,Mod,Func,Data,Conf,TVal) ->
 		EndConfApply =
 		    fun() ->
 			    timetrap(TVal),
-			    try apply(Mod,end_per_testcase,[Func,Conf]) of
+			    %% We can't handle fails or skips here
+			    %% (neither input nor output). The error can
+			    %% be read from Conf though (tc_status).
+			    EndConf =
+				case do_init_tc_call(Mod,{end_per_testcase,Func},
+						     [Conf],
+						     {TCExitReason,[Conf]}) of
+				    {_,[EPTCInit]} when is_list(EPTCInit) ->
+					EPTCInit;
+				    _ ->
+					Conf
+				end,
+			    try apply(Mod,end_per_testcase,[Func,EndConf]) of
 				_ -> ok
 			    catch
-				_:Why ->
+				_:Error ->
 				    timer:sleep(1),
-				    group_leader() ! {printout,12,
-						      "WARNING! "
-						      "~w:end_per_testcase(~w, ~p)"
-						      " crashed!\n\tReason: ~p\n",
-						      [Mod,Func,Conf,Why]}
+				    print_end_conf_result(Mod,Func,Conf,
+							  "crashed",Error)
 			    end,
 			    Supervisor ! {self(),end_conf}
 		    end,
@@ -747,10 +752,7 @@ do_call_end_conf(Starter,Mod,Func,Data,Conf,TVal) ->
 		    {Pid,end_conf} ->
 			Starter ! {self(),{call_end_conf,Data,ok}};
 		    {'EXIT',Pid,Reason} ->
-			group_leader() ! {printout,12,
-					  "WARNING! ~w:end_per_testcase(~w, ~p)"
-					  " failed!\n\tReason: ~p\n",
-					  [Mod,Func,Conf,Reason]},
+			print_end_conf_result(Mod,Func,Conf,"failed",Reason),
 			Starter ! {self(),{call_end_conf,Data,{error,Reason}}};
 		    {'EXIT',_OtherPid,Reason} ->
 			%% Probably the parent - not much to do about that
@@ -759,28 +761,55 @@ do_call_end_conf(Starter,Mod,Func,Data,Conf,TVal) ->
 	end,
     spawn_link(EndConfProc).
 
-spawn_fw_call(Mod,{init_per_testcase,Func},CurrConf,Pid,
-	      {timetrap_timeout,TVal}=Why,
-	      Loc,SendTo) ->
+print_end_conf_result(Mod,Func,Conf,Cause,Error) ->
+    Str2Print =
+	fun(NoHTML) when NoHTML == stdout; NoHTML == major ->
+		io_lib:format("WARNING! "
+			      "~w:end_per_testcase(~w, ~tp)"
+			      " ~s!\n\tReason: ~tp\n",
+			      [Mod,Func,Conf,Cause,Error]);		    
+	   (minor) ->
+		ErrorStr = test_server_ctrl:escape_chars(Error),
+		io_lib:format("WARNING! "
+			      "~w:end_per_testcase(~w, ~tp)"
+			      " ~s!\n\tReason: ~ts\n",
+			      [Mod,Func,Conf,Cause,ErrorStr])
+	end,
+    group_leader() ! {printout,12,Str2Print}.
+
+
+spawn_fw_call(Mod,IPTC={init_per_testcase,Func},CurrConf,Pid,
+	      Why,Loc,SendTo) ->
     FwCall =
 	fun() ->
 		Skip = {skip,{failed,{Mod,init_per_testcase,Why}}},
 		%% if init_per_testcase fails, the test case
 		%% should be skipped
-		try do_end_tc_call(Mod,Func, {Pid,Skip,[CurrConf]}, Why) of
+		try begin do_end_tc_call(Mod,IPTC, {Pid,Skip,[CurrConf]}, Why),
+			  do_init_tc_call(Mod,{end_per_testcase,Func},
+					  [CurrConf],{ok,[CurrConf]}),
+			  do_end_tc_call(Mod,{end_per_testcase,Func}, 
+					 {Pid,Skip,[CurrConf]}, Why) end of
 		    _ -> ok
 		catch
 		    _:FwEndTCErr ->
 			exit({fw_notify_done,end_tc,FwEndTCErr})
 		end,
+		Time = case Why of
+			   {timetrap_timeout,TVal} -> TVal/1000;
+			   _                       -> died
+		       end,
+		group_leader() ! {printout,12,
+				  "ERROR! ~w:init_per_testcase(~w, ~p)"
+				  " failed!\n\tReason: ~tp\n",
+				 [Mod,Func,CurrConf,Why]},
 		%% finished, report back
-		SendTo ! {self(),fw_notify_done,
-			  {TVal/1000,Skip,Loc,[],undefined}}
+		SendTo ! {self(),fw_notify_done,{Time,Skip,Loc,[],undefined}}
 	end,
     spawn_link(FwCall);
 
-spawn_fw_call(Mod,{end_per_testcase,Func},EndConf,Pid,
-	      {timetrap_timeout,TVal}=Why,_Loc,SendTo) ->
+spawn_fw_call(Mod,EPTC={end_per_testcase,Func},EndConf,Pid,
+	      Why,_Loc,SendTo) ->
     FwCall =
 	fun() ->
 		{RetVal,Report} =
@@ -794,24 +823,38 @@ spawn_fw_call(Mod,{end_per_testcase,Func},EndConf,Pid,
 			    E = {failed,{Mod,end_per_testcase,Why}},
 			    {Result,E}
 		    end,
-		group_leader() ! {printout,12,
-				  "WARNING! ~w:end_per_testcase(~w, ~p)"
-				  " failed!\n\tReason: timetrap timeout"
-				  " after ~w ms!\n", [Mod,Func,EndConf,TVal]},
-		FailLoc = proplists:get_value(tc_fail_loc, EndConf),
-		try do_end_tc_call(Mod,Func,
-					  {Pid,Report,[EndConf]}, Why) of
+		{Time,Warn} =
+		    case Why of
+			{timetrap_timeout,TVal} ->
+			    group_leader() !
+				{printout,12,
+				 "WARNING! ~w:end_per_testcase(~w, ~p)"
+				 " failed!\n\tReason: timetrap timeout"
+				 " after ~w ms!\n", [Mod,Func,EndConf,TVal]},
+			    W = "<font color=\"red\">"
+				"WARNING: end_per_testcase timed out!</font>",
+			    {TVal/1000,W};
+			_ ->
+			    group_leader() !
+				{printout,12,
+				 "WARNING! ~w:end_per_testcase(~w, ~p)"
+				 " failed!\n\tReason: ~tp\n",
+				 [Mod,Func,EndConf,Why]},
+			    W = "<font color=\"red\">"
+				"WARNING: end_per_testcase failed!</font>",
+			    {died,W}
+		    end,
+		try do_end_tc_call(Mod,EPTC,{Pid,Report,[EndConf]}, Why) of
 		    _ -> ok
 		catch
 		    _:FwEndTCErr ->
 			exit({fw_notify_done,end_tc,FwEndTCErr})
 		end,
-		Warn = "<font color=\"red\">"
-		       "WARNING: end_per_testcase timed out!</font>",
+		FailLoc = proplists:get_value(tc_fail_loc, EndConf),
 		%% finished, report back (if end_per_testcase fails, a warning
 		%% should be printed as part of the comment)
 		SendTo ! {self(),fw_notify_done,
-			  {TVal/1000,RetVal,FailLoc,[],Warn}}
+			  {Time,RetVal,FailLoc,[],Warn}}
 	end,
     spawn_link(FwCall);
 
@@ -834,10 +877,12 @@ spawn_fw_call(FwMod,FwFunc,_,_Pid,{framework_error,FwError},_,SendTo) ->
     spawn_link(FwCall);
 
 spawn_fw_call(Mod,Func,CurrConf,Pid,Error,Loc,SendTo) ->
-    Func1 = case Func of
-		{_InitOrEndPerTC,F} -> F;
-		F -> F
-	    end,
+    {Func1,EndTCFunc} = case Func of
+			    CF when CF == init_per_suite; CF == end_per_suite;
+				    CF == init_per_group; CF == end_per_group ->
+				{CF,CF};
+			    TC -> {TC,{end_per_testcase,TC}}
+			end,
     FwCall =
 	fun() ->
 		try fw_error_notify(Mod,Func1,[],
@@ -849,8 +894,7 @@ spawn_fw_call(Mod,Func,CurrConf,Pid,Error,Loc,SendTo) ->
 			      FwErrorNotifyErr})
 		end,
 		Conf = [{tc_status,{failed,Error}}|CurrConf],
-		try do_end_tc_call(Mod,Func1,
-				   {Pid,Error,[Conf]},Error) of
+		try do_end_tc_call(Mod,EndTCFunc,{Pid,Error,[Conf]},Error) of
 		    _ -> ok
 		catch
 		    _:FwEndTCErr ->
@@ -907,6 +951,16 @@ job_proxy_msgloop() ->
     end,
     job_proxy_msgloop().
 
+-spec run_test_case_eval_fun(_, _, _, _, _, _, _, _, _) ->
+                                    fun(() -> no_return()).
+run_test_case_eval_fun(Mod, Func, Args, Name, Ref, RunInit,
+                       TimetrapData, LogOpts, TCCallback) ->
+    fun () ->
+            run_test_case_eval(Mod, Func, Args, Name, Ref,
+                               RunInit, TimetrapData,
+                               LogOpts, TCCallback)
+    end.
+
 %% A test case is known to have failed if it returns {'EXIT', _} tuple,
 %% or sends a message {failed, File, Line} to it's group_leader
 
@@ -917,32 +971,38 @@ run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
     Where = [{Mod,Func}],
     put(test_server_loc, Where),
 
-    FWInitResult = test_server_sup:framework_call(init_tc,[Mod,Func,Args0],
-						  {ok,Args0}),
+    FWInitFunc = case RunInit of
+		     run_init -> {init_per_testcase,Func};
+		     _        -> Func
+		 end,
+
+    FWInitResult0 = do_init_tc_call(Mod,FWInitFunc,Args0,{ok,Args0}),
+
     set_tc_state(running),
     {{Time,Value},Loc,Opts} =
-	case FWInitResult of
+	case FWInitResult0 of
 	    {ok,Args} ->
 		run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback);
 	    Error = {error,_Reason} ->
-		NewResult = do_end_tc_call(Mod,Func, {Error,Args0},
+		NewResult = do_end_tc_call(Mod,FWInitFunc, {Error,Args0},
 					   {auto_skip,{failed,Error}}),
 		{{0,NewResult},Where,[]};
 	    {fail,Reason} ->
-		Conf = [{tc_status,{failed,Reason}} | hd(Args0)],
+		Conf = [{tc_status,{failed,Reason}} | hd(Args0)],		
 		fw_error_notify(Mod, Func, Conf, Reason),
-		NewResult = do_end_tc_call(Mod,Func, {{error,Reason},[Conf]},
+		NewResult = do_end_tc_call(Mod,FWInitFunc,
+					   {{error,Reason},[Conf]},
 					   {fail,Reason}),
 		{{0,NewResult},Where,[]};
 	    Skip = {SkipType,_Reason} when SkipType == skip;
 					   SkipType == skipped ->
-		NewResult = do_end_tc_call(Mod,Func,
+		NewResult = do_end_tc_call(Mod,FWInitFunc,
 					   {Skip,Args0}, Skip),
 		{{0,NewResult},Where,[]};
 	    AutoSkip = {auto_skip,_Reason} ->
 		%% special case where a conf case "pretends" to be skipped
 		NewResult =
-		    do_end_tc_call(Mod,Func, {AutoSkip,Args0}, AutoSkip),
+		    do_end_tc_call(Mod,FWInitFunc, {AutoSkip,Args0}, AutoSkip),
 		{{0,NewResult},Where,[]}
 	end,
     exit({Ref,Time,Value,Loc,Opts}).
@@ -957,31 +1017,41 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 					      SkipType == skipped ->
 		    Line = get_loc(),
 		    Conf = [{tc_status,{skipped,Reason}}|hd(Args)],
-		    NewRes = do_end_tc_call(Mod,Func,
+		    NewRes = do_end_tc_call(Mod,{init_per_testcase,Func},
 					    {Skip,[Conf]}, Skip),
 		    {{0,NewRes},Line,[]};
 		{skip_and_save,Reason,SaveCfg} ->
 		    Line = get_loc(),
 		    Conf = [{tc_status,{skipped,Reason}},
 			    {save_config,SaveCfg}|hd(Args)],
-		    NewRes = do_end_tc_call(Mod,Func, {{skip,Reason},[Conf]},
+		    NewRes = do_end_tc_call(Mod,{init_per_testcase,Func},
+					    {{skip,Reason},[Conf]},
 					    {skip,Reason}),
 		    {{0,NewRes},Line,[]};
 		FailTC = {fail,Reason} ->       % user fails the testcase
 		    EndConf = [{tc_status,{failed,Reason}} | hd(Args)],
 		    fw_error_notify(Mod, Func, EndConf, Reason),
-		    NewRes = do_end_tc_call(Mod,Func,
+		    NewRes = do_end_tc_call(Mod,{init_per_testcase,Func},
 					    {{error,Reason},[EndConf]},
 					    FailTC),
 		    {{0,NewRes},[{Mod,Func}],[]};
 		{ok,NewConf} ->
-		    %% call user callback function if defined
-		    NewConf1 =
-			user_callback(TCCallback, Mod, Func, init, NewConf),
-		    %% save current state in controller loop
-		    set_tc_state(tc, NewConf1),
-		    %% execute the test case
-		    {{T,Return},Loc} = {ts_tc(Mod,Func,[NewConf1]), get_loc()},
+		    IPTCEndRes = do_end_tc_call(Mod,{init_per_testcase,Func},
+						{ok,[NewConf]}, NewConf),
+		    {{T,Return},Loc,NewConf1} =
+			if not is_list(IPTCEndRes) ->
+				%% received skip or fail, not config
+				{{0,IPTCEndRes},undefined,NewConf};
+			   true ->
+				%% call user callback function if defined
+				NewConfUC =
+				    user_callback(TCCallback, Mod, Func,
+						  init, IPTCEndRes),
+				%% save current state in controller loop
+				set_tc_state(tc, NewConfUC),
+				%% execute the test case
+				{ts_tc(Mod,Func,[NewConfUC]),get_loc(),NewConfUC}
+			end,
 		    {EndConf,TSReturn,FWReturn} =
 			case Return of
 			    {E,TCError} when E=='EXIT' ; E==failed ->
@@ -1007,36 +1077,47 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 		    %% call user callback function if defined
 		    EndConf1 =
 			user_callback(TCCallback, Mod, Func, 'end', EndConf),
+
+		    %% We can't handle fails or skips here
+		    EndConf2 =
+			case do_init_tc_call(Mod,{end_per_testcase,Func},
+					     [EndConf1],{ok,[EndConf1]}) of
+			    {ok,[EPTCInitRes]} when is_list(EPTCInitRes) ->
+				EPTCInitRes;
+			    _ ->
+				EndConf1
+			end,
+
 		    %% update current state in controller loop
-		    {FWReturn1,TSReturn1,EndConf2} =
-			case end_per_testcase(Mod, Func, EndConf1) of
+		    {FWReturn1,TSReturn1,EndConf3} =
+			case end_per_testcase(Mod, Func, EndConf2) of
 			    SaveCfg1={save_config,_} ->
 				{FWReturn,TSReturn,
 				 [SaveCfg1|lists:keydelete(save_config,1,
-							   EndConf1)]};
+							   EndConf2)]};
 			    {fail,ReasonToFail} ->
 				%% user has failed the testcase
-				fw_error_notify(Mod, Func, EndConf1,
+				fw_error_notify(Mod, Func, EndConf2,
 						ReasonToFail),
 				{{error,ReasonToFail},
 				 {failed,ReasonToFail},
-				 EndConf1};
+				 EndConf2};
 			    {failed,{_,end_per_testcase,_}} = Failure when
 				  FWReturn == ok ->
 				%% unexpected termination in end_per_testcase
 				%% report this as the result to the framework
-				{Failure,TSReturn,EndConf1};
+				{Failure,TSReturn,EndConf2};
 			    _ ->
 				%% test case result should be reported to
 				%% framework no matter the status of
 				%% end_per_testcase
-				{FWReturn,TSReturn,EndConf1}
+				{FWReturn,TSReturn,EndConf2}
 			end,
 		    %% clear current state in controller loop
-		    case do_end_tc_call(Mod,Func,
-					{FWReturn1,[EndConf2]}, TSReturn1) of
+		    case do_end_tc_call(Mod,{end_per_testcase,Func},
+					{FWReturn1,[EndConf3]}, TSReturn1) of
 			{failed,Reason} = NewReturn ->
-			    fw_error_notify(Mod,Func,EndConf2, Reason),
+			    fw_error_notify(Mod,Func,EndConf3, Reason),
 			    {{T,NewReturn},[{Mod,Func}],[]};
 			NewReturn ->
 			    {{T,NewReturn},Loc,[]}
@@ -1062,7 +1143,38 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 	    {{T,Return2},Loc,Opts}
     end.
 
+do_init_tc_call(Mod, Func, Res, Return) ->
+    test_server_sup:framework_call(init_tc,[Mod,Func,Res],Return).
+
+do_end_tc_call(Mod, IPTC={init_per_testcase,Func}, Res, Return) ->
+     case Return of
+	 {NOk,_} when NOk == auto_skip; NOk == fail;
+		      NOk == skip ; NOk == skipped ->
+	     {_,Args} = Res,
+	     IPTCEndRes =
+		 case do_end_tc_call1(Mod, IPTC, Res, Return) of
+		     IPTCEndConfig when is_list(IPTCEndConfig) ->
+			 IPTCEndConfig;
+		     _ ->
+			 Args
+		 end,
+	     EPTCInitRes =
+		 case do_init_tc_call(Mod,{end_per_testcase,Func},
+				      IPTCEndRes,Return) of
+		     {ok,EPTCInitConfig} when is_list(EPTCInitConfig) ->
+			 {Return,EPTCInitConfig};
+		     _ ->
+			 Return
+		 end,
+	     do_end_tc_call1(Mod, {end_per_testcase,Func},
+			     EPTCInitRes, Return);
+	 _Ok ->
+	     do_end_tc_call1(Mod, IPTC, Res, Return)
+     end;
 do_end_tc_call(Mod, Func, Res, Return) ->
+    do_end_tc_call1(Mod, Func, Res, Return).
+
+do_end_tc_call1(Mod, Func, Res, Return) ->
     FwMod = os:getenv("TEST_SERVER_FRAMEWORK"),
     Ref = make_ref(),
     if FwMod == "ct_framework" ; FwMod == "undefined"; FwMod == false ->
@@ -1201,7 +1313,7 @@ do_init_per_testcase(Mod, Args) ->
 		Bad ->
 		    group_leader() ! {printout,12,
 				      "ERROR! init_per_testcase has returned "
-				      "bad elements in Config: ~p\n",[Bad]},
+				      "bad elements in Config: ~tp\n",[Bad]},
 		    {skip,{failed,{Mod,init_per_testcase,bad_return}}}
 	    end;
 	{fail,_Reason}=Res ->
@@ -1219,25 +1331,33 @@ do_init_per_testcase(Mod, Args) ->
 	throw:Other ->
 	    set_loc(erlang:get_stacktrace()),
 	    Line = get_loc(),
-	    FormattedLoc = test_server_sup:format_loc(Line),
-	    group_leader() ! {printout,12,
-			      "ERROR! init_per_testcase thrown!\n"
-			      "\tLocation: ~ts\n\tReason: ~p\n",
-			      [FormattedLoc, Other]},
+	    print_init_conf_result(Line,"thrown",Other),
 	    {skip,{failed,{Mod,init_per_testcase,Other}}};
 	_:Reason0 ->
 	    Stk = erlang:get_stacktrace(),
 	    Reason = {Reason0,Stk},
 	    set_loc(Stk),
 	    Line = get_loc(),
-	    FormattedLoc = test_server_sup:format_loc(Line),
-	    group_leader() ! {printout,12,
-			      "ERROR! init_per_testcase crashed!\n"
-			      "\tLocation: ~ts\n\tReason: ~p\n",
-			      [FormattedLoc,Reason]},
+	    print_init_conf_result(Line,"crashed",Reason),
 	    {skip,{failed,{Mod,init_per_testcase,Reason}}}
     end.
 
+print_init_conf_result(Line,Cause,Reason) ->
+    FormattedLoc = test_server_sup:format_loc(Line),
+    Str2Print =
+	fun(NoHTML) when NoHTML == stdout; NoHTML == major ->
+		io_lib:format("ERROR! init_per_testcase ~s!\n"
+				      "\tLocation: ~p\n\tReason: ~tp\n",
+				      [Cause,Line,Reason]);
+	   (minor) ->
+		ReasonStr = test_server_ctrl:escape_chars(Reason),
+		io_lib:format("ERROR! init_per_testcase ~s!\n"
+			      "\tLocation: ~ts\n\tReason: ~ts\n",
+			      [Cause,FormattedLoc,ReasonStr])
+	end,
+    group_leader() ! {printout,12,Str2Print}.
+
+
 end_per_testcase(Mod, Func, Conf) ->
     case erlang:function_exported(Mod,end_per_testcase,2) of
 	true ->
@@ -1272,12 +1392,7 @@ do_end_per_testcase(Mod,EndFunc,Func,Conf) ->
 	    comment(io_lib:format("~ts<font color=\"red\">"
 				  "WARNING: ~w thrown!"
 				  "</font>\n",[Comment0,EndFunc])),
-	    group_leader() ! {printout,12,
-			      "WARNING: ~w thrown!\n"
-			      "Reason: ~p\n"
-			      "Line: ~ts\n",
-			      [EndFunc, Other,
-			       test_server_sup:format_loc(get_loc())]},
+	    print_end_tc_warning(EndFunc,Other,"thrown",get_loc()),
 	    {failed,{Mod,end_per_testcase,Other}};
 	  Class:Reason ->
 	    Stk = erlang:get_stacktrace(),
@@ -1294,15 +1409,25 @@ do_end_per_testcase(Mod,EndFunc,Func,Conf) ->
 	    comment(io_lib:format("~ts<font color=\"red\">"
 				  "WARNING: ~w crashed!"
 				  "</font>\n",[Comment0,EndFunc])),
-	    group_leader() ! {printout,12,
-			      "WARNING: ~w crashed!\n"
-			      "Reason: ~p\n"
-			      "Line: ~ts\n",
-			      [EndFunc, Reason,
-			       test_server_sup:format_loc(get_loc())]},
+	    print_end_tc_warning(EndFunc,Reason,"crashed",get_loc()),
 	    {failed,{Mod,end_per_testcase,Why}}
     end.
 
+print_end_tc_warning(EndFunc,Reason,Cause,Loc) ->
+    FormattedLoc = test_server_sup:format_loc(Loc),
+    Str2Print =
+	fun(NoHTML) when NoHTML == stdout; NoHTML == major ->
+		io_lib:format("WARNING: ~w ~s!\n"
+			      "Reason: ~tp\nLine: ~p\n",
+			      [EndFunc,Cause,Reason,Loc]);
+	   (minor) ->
+		ReasonStr = test_server_ctrl:escape_chars(Reason),
+		io_lib:format("WARNING: ~w ~s!\n"
+			      "Reason: ~ts\nLine: ~ts\n",
+			      [EndFunc,Cause,ReasonStr,FormattedLoc])
+	end,
+    group_leader() ! {printout,12,Str2Print}.
+
 get_loc() ->
     get(test_server_loc).
 
@@ -2408,15 +2533,7 @@ run_on_shielded_node(Fun, CArgs) when is_function(Fun), is_list(CArgs) ->
 	   end,
     Master = self(),
     Ref = make_ref(),
-    Slave = spawn(Node,
-		  fun () ->
-			  start_job_proxy(),
-			  receive
-			      Ref ->
-				  Master ! {Ref, Fun()}
-			  end,
-			  receive after infinity -> infinity end
-		  end),
+    Slave = spawn(Node, start_job_proxy_fun(Master, Fun)),
     MRef = erlang:monitor(process, Slave),
     Slave ! Ref,
     receive
@@ -2431,6 +2548,17 @@ run_on_shielded_node(Fun, CArgs) when is_function(Fun), is_list(CArgs) ->
 	    end
     end.
 
+-spec start_job_proxy_fun(_, _) -> fun(() -> no_return()).
+start_job_proxy_fun(Master, Fun) ->
+    fun () ->
+            start_job_proxy(),
+            receive
+                Ref ->
+                    Master ! {Ref, Fun()}
+            end,
+            receive after infinity -> infinity end
+    end.
+
 %% Return true if Name or node() is a shielded node
 is_shielded(Name) ->
     case {cast_to_list(Name),atom_to_list(node())} of
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl
index 8a46996bc3..833d99907e 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/common_test/src/test_server_ctrl.erl
@@ -77,7 +77,7 @@
 -export([handle_call/3, handle_cast/2, handle_info/2]).
 -export([do_test_cases/4]).
 -export([do_spec/2, do_spec_list/2]).
--export([xhtml/2]).
+-export([xhtml/2, escape_chars/1]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1825,13 +1825,14 @@ start_minor_log_file1(Mod, Func, LogDir, AbsName, MFA) ->
 	    case {filelib:is_file(filename:join(LogDir, SrcListing)),
 		  lists:member(no_src, get(test_server_logopts))} of
 		{true,false} ->
-		    print(Lev, Info ++ "<a href=\"~ts#~ts\">~w:~w/~w</a> "
-			  "(click for source code)\n",
+		    print(Lev, ["$tc_html",
+				Info ++ "<a href=\"~ts#~ts\">~w:~w/~w</a> "
+				"(click for source code)\n"],
 			  [uri_encode(SrcListing),
 			   uri_encode(atom_to_list(Func)++"-1",utf8),
 			   Mod,Func,Arity]);
 		_ ->
-		    print(Lev, Info ++ "~w:~w/~w\n", [Mod,Func,Arity])
+		    print(Lev, ["$tc_html",Info ++ "~w:~w/~w\n"], [Mod,Func,Arity])
 	    end
     end,
 
@@ -3163,11 +3164,17 @@ delete_prop([], Props) ->
 %% Shuffles the order of Cases.
 
 shuffle_cases(Ref, Cases, undefined) ->
-    shuffle_cases(Ref, Cases, ?now);
+    shuffle_cases(Ref, Cases, rand:seed_s(exsplus));
 
-shuffle_cases(Ref, [{conf,Ref,_,_}=Start | Cases], Seed) ->
+shuffle_cases(Ref, [{conf,Ref,_,_}=Start | Cases], Seed0) ->
     {N,CasesToShuffle,Rest} = cases_to_shuffle(Ref, Cases),
-    ShuffledCases = random_order(N, random:uniform_s(N, Seed), CasesToShuffle, []),
+    Seed = case Seed0 of
+	       {X,Y,Z} when is_integer(X+Y+Z) ->
+		   rand:seed(exsplus, Seed0);
+	       _ ->
+		   Seed0
+	   end,
+    ShuffledCases = random_order(N, rand:uniform_s(N, Seed), CasesToShuffle, []),
     [Start|ShuffledCases] ++ Rest.
 
 cases_to_shuffle(Ref, Cases) ->
@@ -3201,7 +3208,7 @@ random_order(1, {_Pos,Seed}, [{_Ix,CaseOrGroup}], Shuffled) ->
     Shuffled++CaseOrGroup;
 random_order(N, {Pos,NewSeed}, IxCases, Shuffled) ->
     {First,[{_Ix,CaseOrGroup}|Rest]} = lists:split(Pos-1, IxCases),
-    random_order(N-1, random:uniform_s(N-1, NewSeed),
+    random_order(N-1, rand:uniform_s(N-1, NewSeed),
 		 First++Rest, Shuffled++CaseOrGroup).
 
 
@@ -3741,7 +3748,10 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
        true ->
 	    ok
     end,
-    print(minor, "Config value:\n\n    ~tp\n", [Args2Print]),
+
+    print(minor,
+	  escape_chars(io_lib:format("Config value:\n\n    ~tp\n", [Args2Print])),
+	  []),
     print(minor, "Current directory is ~tp\n", [Cwd]),
 
     GrNameStr =	case GrName of
@@ -3756,7 +3766,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
 	  "<td>" ++ Col0 ++ "~w" ++ Col1 ++ "</td>"
 	  "<td>" ++ Col0 ++ "~ts" ++ Col1 ++ "</td>"
 	  "<td><a href=\"~ts\">~w</a></td>"
-	  "<td><a href=\"~ts#top\"><</a> <a href=\"~ts#end\">></a></td>",
+	  "<td><a href=\"~ts#top\">&lt;</a> <a href=\"~ts#end\">&gt;</a></td>",
 	  [num2str(Num),fw_name(Mod),GrNameStr,EncMinorBase,Func,
 	   EncMinorBase,EncMinorBase]),
 
@@ -3933,7 +3943,7 @@ progress(skip, CaseNum, Mod, Func, GrName, Loc, Reason, Time,
 	  [get_info_str(Mod,Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report, [tc_done,{Mod,{Func,GrName},
 						     {ReportTag,Reason1}}]),
-    ReasonStr = reason_to_string(Reason1),
+    ReasonStr = escape_chars(reason_to_string(Reason1)),
     ReasonStr1 = lists:flatten([string:strip(S,left) ||
 				S <- string:tokens(ReasonStr,[$\n])]),
     ReasonStr2 =
@@ -4005,7 +4015,10 @@ progress(failed, CaseNum, Mod, Func, GrName, Loc, {testcase_aborted,Reason}, _T,
 	  [Comment]),
     FormatLoc = test_server_sup:format_loc(Loc),
     print(minor, "=== Location: ~ts", [FormatLoc]),
-    print(minor, "=== Reason: {testcase_aborted,~p}", [Reason]),
+    print(minor,
+	  escape_chars(io_lib:format("=== Reason: {testcase_aborted,~p}",
+				     [Reason])),
+	  []),
     failed;
 
 progress(failed, CaseNum, Mod, Func, GrName, unknown, Reason, Time,
@@ -4018,7 +4031,7 @@ progress(failed, CaseNum, Mod, Func, GrName, unknown, Reason, Time,
     TimeStr = io_lib:format(if is_float(Time) -> "~.3fs";
 			       true -> "~w"
 			    end, [Time]),
-    ErrorReason = lists:flatten(io_lib:format("~p", [Reason])),
+    ErrorReason = escape_chars(lists:flatten(io_lib:format("~p", [Reason]))),
     ErrorReason1 = lists:flatten([string:strip(S,left) ||
 				  S <- string:tokens(ErrorReason,[$\n])]),
     ErrorReason2 =
@@ -4041,7 +4054,9 @@ progress(failed, CaseNum, Mod, Func, GrName, unknown, Reason, Time,
 	  [TimeStr,Comment]),
     print(minor, "=== Location: ~w", [unknown]),
     {FStr,FormattedReason} = format_exception(Reason),
-    print(minor, "=== Reason: " ++ FStr, [FormattedReason]),
+    print(minor,
+	  escape_chars(io_lib:format("=== Reason: " ++ FStr, [FormattedReason])),
+	  []),
     failed;
 
 progress(failed, CaseNum, Mod, Func, GrName, Loc, Reason, Time,
@@ -4075,7 +4090,8 @@ progress(failed, CaseNum, Mod, Func, GrName, Loc, Reason, Time,
     FormatLoc = test_server_sup:format_loc(LocMin),
     print(minor, "=== Location: ~ts", [FormatLoc]),
     {FStr,FormattedReason} = format_exception(Reason),
-    print(minor, "=== Reason: " ++ FStr, [FormattedReason]),
+    print(minor, "=== Reason: " ++
+	      escape_chars(io_lib:format(FStr, [FormattedReason])), []),
     failed;
 
 progress(ok, _CaseNum, Mod, Func, GrName, _Loc, RetVal, Time,
@@ -4104,11 +4120,36 @@ progress(ok, _CaseNum, Mod, Func, GrName, _Loc, RetVal, Time,
 	  "<td><font color=\"green\">Ok</font></td>"
 	  "~ts</tr>\n",
 	  [Time,Comment]),
-    print(minor, "=== Returned value: ~p", [RetVal]),
+    print(minor,
+	  escape_chars(io_lib:format("=== Returned value: ~tp", [RetVal])),
+	  []),
     ok.
 
 %%--------------------------------------------------------------------
 %% various help functions
+escape_chars(Term) when not is_list(Term), not is_binary(Term) ->
+    esc_chars_in_list(io_lib:format("~tp", [Term]));
+escape_chars(List = [Term | _]) when not is_list(Term), not is_integer(Term) ->
+    esc_chars_in_list(io_lib:format("~tp", [List]));
+escape_chars(List) ->
+    esc_chars_in_list(List).
+
+esc_chars_in_list([Bin | Io]) when is_binary(Bin) ->
+    [Bin | esc_chars_in_list(Io)];
+esc_chars_in_list([List | Io]) when is_list(List) ->
+    [esc_chars_in_list(List) | esc_chars_in_list(Io)];
+esc_chars_in_list([$< | Io]) ->
+    ["&lt;" | esc_chars_in_list(Io)];
+esc_chars_in_list([$> | Io]) ->
+    ["&gt;" | esc_chars_in_list(Io)];
+esc_chars_in_list([$& | Io]) ->
+    ["&amp;" | esc_chars_in_list(Io)];
+esc_chars_in_list([Char | Io]) when is_integer(Char) ->
+    [Char | esc_chars_in_list(Io)];
+esc_chars_in_list([]) ->
+    [];
+esc_chars_in_list(Bin) ->
+    Bin.
 
 get_fw_mod(Mod) ->
     case get(test_server_framework) of
@@ -4322,6 +4363,10 @@ print(Detail, Format) ->
 print(Detail, Format, Args) ->
     print(Detail, Format, Args, internal).
 
+print(Detail, ["$tc_html",Format], Args, Printer) ->
+    Msg = io_lib:format(Format, Args),
+    print_or_buffer(Detail, ["$tc_html",Msg], Printer);
+
 print(Detail, Format, Args, Printer) ->
     Msg = io_lib:format(Format, Args),
     print_or_buffer(Detail, Msg, Printer).
@@ -5564,8 +5609,9 @@ html_header(Title) ->
      "<html>\n"
      "<head>\n"
      "<title>", Title, "</title>\n"
-     "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n"
-     "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">\n"
+     "<meta http-equiv=\"cache-control\" content=\"no-cache\"></meta>\n"
+     "<meta http-equiv=\"content-type\" content=\"text/html; "
+            "charset=utf-8\"></meta>\n"
      "</head>\n"
      "<body bgcolor=\"white\" text=\"black\" "
      "link=\"blue\" vlink=\"purple\" alink=\"red\">\n"].
diff --git a/lib/test_server/src/test_server_gl.erl b/lib/common_test/src/test_server_gl.erl
index c5ec3ccbe6..233e59172b 100644
--- a/lib/test_server/src/test_server_gl.erl
+++ b/lib/common_test/src/test_server_gl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2015. 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.
@@ -30,14 +30,15 @@
 -export([init/1,handle_call/3,handle_cast/2,handle_info/2,terminate/2]).
 
 -record(st, {tc_supervisor :: 'none'|pid(),    %Test case supervisor
-	     tc :: mfa(),		       %Current test case MFA
+	     tc :: mfa() | 'undefined',	       %Current test case MFA
 	     minor :: 'none'|pid(),	       %Minor fd
 	     minor_monitor,		       %Monitor ref for minor fd
 	     capture :: 'none'|pid(),	       %Capture output
 	     reject_io :: boolean(),	       %Reject I/O requests...
 	     permit_io,			       %... and exceptions
 	     auto_nl=true :: boolean(),	       %Automatically add NL
-	     levels			       %{Stdout,Major,Minor}
+	     levels,			       %{Stdout,Major,Minor}
+	     escape_chars=true		       %Switch escaping HTML on/off
 	    }).
 
 %% start_link()
@@ -137,7 +138,8 @@ init([]) ->
 	    reject_io=false,
 	    permit_io=gb_sets:empty(),
 	    auto_nl=true,
-	    levels={1,19,10}
+	    levels={1,19,10},
+	    escape_chars=true
 	   }}.
 
 req(GL, Req) ->
@@ -182,7 +184,7 @@ handle_info({io_request,From,ReplyAs,Req}=IoReq, St) ->
     try	io_req(Req, From, St) of
 	passthrough ->
 	    group_leader() ! IoReq;
-	Data ->
+	{EscapeHtml,Data} ->
 	    case is_io_permitted(From, St) of
 		false ->
 		    ok;
@@ -193,7 +195,13 @@ handle_info({io_request,From,ReplyAs,Req}=IoReq, St) ->
 			#st{capture=CapturePid} ->
 			    CapturePid ! {captured,Data}
 		    end,
-		    output(minor, Data, From, From, St)
+		    case EscapeHtml andalso St#st.escape_chars of
+			true ->
+			    output(minor, test_server_ctrl:escape_chars(Data),
+				   From, From, St);
+			false ->
+			    output(minor, Data, From, From, St)
+		    end
 	    end,
 	    From ! {io_reply,ReplyAs,ok}
     catch
@@ -204,9 +212,20 @@ handle_info({io_request,From,ReplyAs,Req}=IoReq, St) ->
 handle_info({structured_io,ClientPid,{Detail,Str}}, St) ->
     output(Detail, Str, ClientPid, ClientPid, St),
     {noreply,St};
+handle_info({printout,Detail,["$tc_html",Format],Args}, St) ->
+    Str = io_lib:format(Format, Args),
+    output(Detail, ["$tc_html",Str], internal, none, St),
+    {noreply,St};
+handle_info({printout,Detail,Fun}, St) when is_function(Fun)->
+    output(Detail, Fun, internal, none, St),
+    {noreply,St};
 handle_info({printout,Detail,Format,Args}, St) ->
     Str = io_lib:format(Format, Args),
-    output(Detail, Str, internal, none, St),
+    if not St#st.escape_chars ->
+	    output(Detail, ["$tc_html",Str], internal, none, St);
+       true ->
+	    output(Detail, Str, internal, none, St)
+    end,
     {noreply,St};
 handle_info(Msg, #st{tc_supervisor=Pid}=St) when is_pid(Pid) ->
     %% The process overseeing the testcase process also used to be
@@ -231,25 +250,55 @@ do_set_props([{reject_io_reqs,Bool}|Ps], St) ->
     do_set_props(Ps, St#st{reject_io=Bool});
 do_set_props([], St) -> St.
 
-io_req({put_chars,Enc,Bytes}, _, _) when Enc =:= latin1; Enc =:= unicode  ->
-    unicode:characters_to_list(Bytes, Enc);
+io_req({put_chars,Enc,Str}, _, _) when Enc =:= latin1; Enc =:= unicode  ->
+    case Str of
+	["$tc_html",Str0] ->
+	    {false,unicode:characters_to_list(Str0, Enc)};
+	_ ->
+	    {true,unicode:characters_to_list(Str, Enc)}
+    end;
 io_req({put_chars,Encoding,Mod,Func,[Format,Args]}, _, _) ->
-    Str = Mod:Func(Format, Args),
-    unicode:characters_to_list(Str, Encoding);
+    case Format of
+	["$tc_html",Format0] ->
+	    Str = Mod:Func(Format0, Args),
+	    {false,unicode:characters_to_list(Str, Encoding)};
+	_ ->
+	    Str = Mod:Func(Format, Args),
+	    {true,unicode:characters_to_list(Str, Encoding)}
+    end;
 io_req(_, _, _) -> passthrough.
 
-output(Level, Str, Sender, From, St) when is_integer(Level) ->
+output(Level, StrOrFun, Sender, From, St) when is_integer(Level) ->
     case selected_by_level(Level, stdout, St) of
-	true -> output(stdout, Str, Sender, From, St);
-	false -> ok
+	true when hd(StrOrFun) == "$tc_html" ->
+	    output(stdout, tl(StrOrFun), Sender, From, St);
+	true when is_function(StrOrFun) ->
+	    output(stdout, StrOrFun(stdout), Sender, From, St);
+	true ->
+	    output(stdout, StrOrFun, Sender, From, St);
+	false ->
+	    ok
     end,
     case selected_by_level(Level, major, St) of
-	true -> output(major, Str, Sender, From, St);
-	false -> ok
+	true when hd(StrOrFun) == "$tc_html" ->
+	    output(major, tl(StrOrFun), Sender, From, St);
+	true when is_function(StrOrFun) ->
+	    output(major, StrOrFun(major), Sender, From, St);
+	true ->
+	    output(major, StrOrFun, Sender, From, St);
+	false ->
+	    ok
     end,
     case selected_by_level(Level, minor, St) of
-	true -> output(minor, Str, Sender, From, St);
-	false -> ok
+	true when hd(StrOrFun) == "$tc_html" ->
+	    output(minor, tl(StrOrFun), Sender, From, St);
+	true when is_function(StrOrFun) ->
+	    output(minor, StrOrFun(minor), Sender, From, St);
+	true ->
+	    output(minor, test_server_ctrl:escape_chars(StrOrFun),
+		   Sender, From, St);
+	false ->
+	    ok
     end;
 output(stdout, Str, _Sender, From, St) ->
     output_to_file(stdout, Str, From, St);
diff --git a/lib/test_server/src/test_server_internal.hrl b/lib/common_test/src/test_server_internal.hrl
index 578f359010..1ec2d83417 100644
--- a/lib/test_server/src/test_server_internal.hrl
+++ b/lib/common_test/src/test_server_internal.hrl
@@ -30,7 +30,6 @@
 		      version,         % string()
 		      system_version,  % string()
 		      root_dir,        % string()
-		      test_server_dir, % string()
 		      emulator,        % string()
 		      otp_release,     % string()
 		      username,        % string()
diff --git a/lib/test_server/src/test_server_io.erl b/lib/common_test/src/test_server_io.erl
index 0d881d0ada..0d881d0ada 100644
--- a/lib/test_server/src/test_server_io.erl
+++ b/lib/common_test/src/test_server_io.erl
diff --git a/lib/test_server/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl
index 4e6839fc6b..c64399e485 100644
--- a/lib/test_server/src/test_server_node.erl
+++ b/lib/common_test/src/test_server_node.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2002-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.
@@ -121,7 +121,7 @@ start_tracer_node(TraceFile,TI) ->
 %%%
 trace_nodes(Sock,Nodes) ->
     Bin = term_to_binary({add_nodes,Nodes}),
-    ok = gen_tcp:send(Sock, [1|Bin]),
+    ok = gen_tcp:send(Sock, tag_trace_message(Bin)),
     receive_ack(Sock).
 
 
@@ -142,7 +142,7 @@ receive_ack(Sock) ->
 %%%
 stop_tracer_node(Sock) ->
     Bin = term_to_binary(id(stop)),
-    ok = gen_tcp:send(Sock, [1|Bin]),
+    ok = gen_tcp:send(Sock, tag_trace_message(Bin)),
     receive {tcp_closed,Sock} -> gen_tcp:close(Sock) end,
     ok.
     
@@ -171,7 +171,7 @@ trc([TraceFile, PortAtom, Type]) ->
 						   {packet,2}]) of
 	{ok,Sock} -> 
 	    BinResult = term_to_binary(Result),
-	    ok = gen_tcp:send(Sock,[1|BinResult]),
+	    ok = gen_tcp:send(Sock,tag_trace_message(BinResult)),
 	    trc_loop(Sock,Patterns,Type);
 	_else ->
 	    ok
@@ -187,7 +187,7 @@ trc_loop(Sock,Patterns,Type) ->
 		{ok,{add_nodes,Nodes}} -> 
 		    add_nodes(Nodes,Patterns,Type),
 		    Bin = term_to_binary(id(ok)),
-		    ok = gen_tcp:send(Sock, [1|Bin]),
+		    ok = gen_tcp:send(Sock, tag_trace_message(Bin)),
 		    trc_loop(Sock,Patterns,Type);
 		{ok,stop} -> 
 		    ttb:stop(),
@@ -307,11 +307,11 @@ start_node_peer(SlaveName, OptList, From, TI) ->
 				      HostStr, " ", WaitPort]),
 
     % Support for erl_crash_dump files..
-    CrashFile = filename:join([TI#target_info.test_server_dir,
+    CrashDir = test_server_sup:crash_dump_dir(),
+    CrashFile = filename:join([CrashDir,
 			       "erl_crash_dump."++cast_to_list(SlaveName)]),
     CrashArgs = lists:concat([" -env ERL_CRASH_DUMP \"",CrashFile,"\" "]),
     FailOnError = start_node_get_option_value(fail_on_error, OptList, true),
-    Pa = TI#target_info.test_server_dir,
     Prog0 = start_node_get_option_value(erl, OptList, default),
     Prog = quote_progname(pick_erl_program(Prog0)),
     Args = 
@@ -322,7 +322,6 @@ start_node_peer(SlaveName, OptList, From, TI) ->
     Cmd = lists:concat([Prog,
 			" -detached ",
 			TI#target_info.naming, " ", SlaveName,
-			" -pa \"", Pa,"\"",
 			NodeStarted,
 			CrashArgs,
 			" ", Args]),
@@ -354,28 +353,31 @@ start_node_peer(SlaveName, OptList, From, TI) ->
 	    I = "=== Not waiting for node",
 	    gen_server:reply(From,{{ok, Nodename}, HostStr, Cmd, I, []}),
 	    Self = self(),
-	    spawn_link(
-	      fun() -> 
-		      wait_for_node_started(LSock,Tmo,undefined,
-					    Cleanup,TI,Self),
-		      receive after infinity -> ok end
-	      end),
+	    spawn_link(wait_for_node_started_fun(LSock,Tmo,Cleanup,TI,Self)),
 	    ok
     end.
 
+-spec wait_for_node_started_fun(_, _, _, _, _) -> fun(() -> no_return()).
+wait_for_node_started_fun(LSock, Tmo, Cleanup, TI, Self) ->
+    fun() ->
+            wait_for_node_started(LSock,Tmo,undefined,
+                                  Cleanup,TI,Self),
+            receive after infinity -> ok end
+    end.
+
 %%
 %% Slave nodes are started on a remote host if
 %% - the option remote is given when calling test_server:start_node/3
 %%
-start_node_slave(SlaveName, OptList, From, TI) ->
+start_node_slave(SlaveName, OptList, From, _TI) ->
     SuppliedArgs = start_node_get_option_value(args, OptList, []),
     Cleanup = start_node_get_option_value(cleanup, OptList, true),
 
-    CrashFile = filename:join([TI#target_info.test_server_dir,
+    CrashDir = test_server_sup:crash_dump_dir(),
+    CrashFile = filename:join([CrashDir,
 			       "erl_crash_dump."++cast_to_list(SlaveName)]),
     CrashArgs = lists:concat([" -env ERL_CRASH_DUMP \"",CrashFile,"\" "]),
-    Pa = TI#target_info.test_server_dir,
-    Args = lists:concat([" -pa \"", Pa, "\" ", SuppliedArgs, CrashArgs]),
+    Args = lists:concat([" ", SuppliedArgs, CrashArgs]),
 
     Prog0 = start_node_get_option_value(erl, OptList, default),
     Prog = pick_erl_program(Prog0),
@@ -468,7 +470,11 @@ handle_start_node_return(Version,VsnStr,{started, Node, OVersion, OVsnStr}) ->
 node_started([Host,PortAtom]) ->
     %% Must spawn a new process because the boot process should not 
     %% hang forever!!
-    spawn(fun() -> node_started(Host,PortAtom) end).
+    spawn(node_started_fun(Host,PortAtom)).
+
+-spec node_started_fun(_, _) -> fun(() -> no_return()).
+node_started_fun(Host,PortAtom) ->
+    fun() -> node_started(Host,PortAtom) end.
 
 %% This process hangs forever, just waiting for the socket to be
 %% closed and terminating the node
@@ -482,7 +488,7 @@ node_started(Host,PortAtom) ->
 	
 	{ok,Sock} -> 
 	    Started = term_to_binary({started, node(), Version, VsnStr}),
-	    ok = gen_tcp:send(Sock, [1|Started]),
+	    ok = gen_tcp:send(Sock, tag_trace_message(Started)),
 	    receive _Anyting ->
 		    gen_tcp:close(Sock),
 		    erlang:halt()
@@ -492,8 +498,10 @@ node_started(Host,PortAtom) ->
     end.
 
 
-
-
+-compile({inline, [tag_trace_message/1]}).
+-dialyzer({no_improper_lists, tag_trace_message/1}).
+tag_trace_message(M) ->
+    [1|M].
 
 % start_which_node(Optlist) -> hostname
 start_which_node(Optlist) ->
@@ -619,8 +627,7 @@ do_quote_progname([Prog,Arg|Args]) ->
     end.
 
 random_element(L) ->
-    random:seed(os:timestamp()),
-    lists:nth(random:uniform(length(L)), L).
+    lists:nth(rand:uniform(length(L)), L).
 
 find_release(latest) ->
     "/usr/local/otp/releases/latest/bin/erl";
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/common_test/src/test_server_sup.erl
index fc2cfd57bd..c4530ba62f 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/common_test/src/test_server_sup.erl
@@ -594,7 +594,11 @@ cleanup_crash_dumps() ->
     delete_files(Dumps).
 
 crash_dump_dir() ->
-    filename:dirname(code:which(?MODULE)).
+    %% If no framework is known, then we use current working directory
+    %% - in most cases that will be the same as the default log
+    %% directory.
+    {ok,Dir} = test_server_sup:framework_call(get_log_dir,[],file:get_cwd()),
+    Dir.
 
 tar_crash_dumps() ->
     Dir = crash_dump_dir(),
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index ff4495b104..fd96d06aab 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -65,9 +65,14 @@ MODULES= \
 	ct_cover_nomerge_SUITE \
 	ct_groups_search_SUITE \
 	ct_surefire_SUITE \
-	ct_telnet_SUITE
+	ct_telnet_SUITE \
+	erl2html2_SUITE \
+	test_server_SUITE \
+	test_server_test_lib \
+	ct_release_test_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
+HRL_FILES= test_server_test_lib.hrl
 
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 INSTALL_PROGS= $(TARGET_FILES)
@@ -84,8 +89,8 @@ RELSYSDIR = $(RELEASE_PATH)/common_test_test
 # FLAGS
 # ----------------------------------------------------
 
-ERL_MAKE_FLAGS += -pa $(ERL_TOP)/lib/test_server/ebin
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_MAKE_FLAGS +=
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
@@ -118,7 +123,7 @@ release_spec: opt
 
 release_tests_spec:
 	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(ERL_FILES) $(COVERFILE) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(COVERFILE) "$(RELSYSDIR)"
 	$(INSTALL_DATA) common_test.spec common_test.cover "$(RELSYSDIR)"
 	chmod -R u+w "$(RELSYSDIR)"
 	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
diff --git a/lib/common_test/test/common_test.cover b/lib/common_test/test/common_test.cover
index 87d00c420f..e8e01a9312 100644
--- a/lib/common_test/test/common_test.cover
+++ b/lib/common_test/test/common_test.cover
@@ -1,9 +1,2 @@
 %% -*- erlang -*-
 {incl_app,common_test,details}.
-{cross,common_test,[{test_server,[erl2html2,
-				  test_server,
-				  test_server_ctrl,
-				  test_server_gl,
-				  test_server_io,
-				  test_server_node,
-				  test_server_sup]}]}.
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index 8326705575..53cfbd7118 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -728,23 +728,25 @@ test_events(lib_error) ->
       {lib_error_1_SUITE,no_lines_throw,{failed,{error,{thrown,catch_me_if_u_can}}}}},
      {?eh,test_stats,{0,8,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,init_tc_error}},
-     {?eh,tc_done,{lib_error_1_SUITE,init_tc_error,ok}},
-     {?eh,test_stats,{1,8,{0,0}}},
+     {?eh,tc_done,{ct_framework,init_tc,
+         {framework_error,{{badmatch,[1,2]},'_'}}}},
+     {?eh,test_stats,{0,9,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,init_tc_exit}},
-     {?eh,tc_done,{lib_error_1_SUITE,init_tc_exit,ok}},
-     {?eh,test_stats,{2,8,{0,0}}},
+     {?eh,tc_done,{ct_framework,init_tc,{framework_error,byebye}}},
+     {?eh,test_stats,{0,10,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,init_tc_throw}},
-     {?eh,tc_done,{lib_error_1_SUITE,init_tc_throw,ok}},
-     {?eh,test_stats,{3,8,{0,0}}},
+     {?eh,tc_done,{ct_framework,init_tc,{framework_error,catch_me_if_u_can}}},
+     {?eh,test_stats,{0,11,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,end_tc_error}},
-     {?eh,tc_done,{lib_error_1_SUITE,end_tc_error,ok}},
-     {?eh,test_stats,{3,9,{0,0}}},
+     {?eh,tc_done,{ct_framework,end_tc,
+		   {framework_error,{{badmatch,[1,2]},'_'}}}},
+     {?eh,test_stats,{0,12,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,end_tc_exit}},
-     {?eh,tc_done,{lib_error_1_SUITE,end_tc_exit,ok}},
-     {?eh,test_stats,{3,10,{0,0}}},
+     {?eh,tc_done,{ct_framework,end_tc,{framework_error,byebye}}},
+     {?eh,test_stats,{0,13,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,end_tc_throw}},
-     {?eh,tc_done,{lib_error_1_SUITE,end_tc_throw,ok}},
-     {?eh,test_stats,{3,11,{0,0}}},
+     {?eh,tc_done,{ct_framework,end_tc,{framework_error,catch_me_if_u_can}}},
+     {?eh,test_stats,{0,14,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,end_per_suite}},
      {?eh,tc_done,{lib_error_1_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/lib_error_1_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/lib_error_1_SUITE.erl
index 658c7e8232..6f1b391ae6 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/lib_error_1_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/lib_error_1_SUITE.erl
@@ -152,23 +152,32 @@ no_lines_throw(_) ->
     lib_no_lines:do_throw(),
     ok.
 
-init_tc_error(_) ->
+init_tc_error() ->
     put('$test_server_framework_test',
 	fun(init_tc, _Default) -> lib_no_lines:do_error(), ok;
 	   (_, Default) -> Default
-	end), ok.
+	end), [].
 
-init_tc_exit(_) ->
+init_tc_error(_) ->
+    ok.
+
+init_tc_exit() ->
     put('$test_server_framework_test',
 	fun(init_tc, _Default) -> lib_no_lines:do_exit(), ok;
 	   (_, Default) -> Default
-	end), ok.
+	end), [].
 
-init_tc_throw(_) ->
+init_tc_exit(_) ->
+    ok.
+
+init_tc_throw() ->
     put('$test_server_framework_test',
 	fun(init_tc, _Default) -> lib_no_lines:do_throw(), ok;
 	   (_, Default) -> Default
-	end), ok.
+	end), [].
+
+init_tc_throw(_) ->
+    ok.
 
 end_tc_error(_) ->
     put('$test_server_framework_test',
diff --git a/lib/common_test/test/ct_event_handler_SUITE_data/eh_A.erl b/lib/common_test/test/ct_event_handler_SUITE_data/eh_A.erl
index 28c85ee2db..29c25bf151 100644
--- a/lib/common_test/test/ct_event_handler_SUITE_data/eh_A.erl
+++ b/lib/common_test/test/ct_event_handler_SUITE_data/eh_A.erl
@@ -27,7 +27,7 @@
 
 -behaviour(gen_event).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
 %% gen_event callbacks
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
index f00b2bbb43..5ec88b438e 100644
--- a/lib/common_test/test/ct_hooks_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -30,7 +30,7 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
 -define(eh, ct_test_support_eh).
@@ -324,6 +324,8 @@ test_events(one_empty_cth) ->
 
      {?eh,tc_start,{ct_cth_empty_SUITE,test_case}},
      {?eh,cth,{empty_cth,pre_init_per_testcase,[test_case,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_init_per_testcase,[test_case,'$proplist','_',[]]}},
+     {?eh,cth,{empty_cth,pre_end_per_testcase,[test_case,'$proplist',[]]}},
      {?eh,cth,{empty_cth,post_end_per_testcase,[test_case,'$proplist','_',[]]}},
      {?eh,tc_done,{ct_cth_empty_SUITE,test_case,ok}},
      
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/crash_init_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/crash_init_cth.erl
index 3b2fd4b3c0..023f6440c2 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/crash_init_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/crash_init_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,22 +14,22 @@
 %% 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%

-%%

-

-

--module(crash_init_cth).

-

-

--include_lib("common_test/src/ct_util.hrl").

--include_lib("common_test/include/ct_event.hrl").

-

-

-%% CT Hooks

--export([init/2]).

-

-init(Id, Opts) ->

-    empty_cth:init(Id, Opts),

-    exit(diediedie).

-

+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(crash_init_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+
+%% CT Hooks
+-export([init/2]).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts),
+    exit(diediedie).
+
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_empty_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_empty_SUITE.erl
index be2ade0715..c443700dde 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_empty_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_empty_SUITE.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,35 +14,36 @@
 %% 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%

-%%

-

--module(ct_cth_empty_SUITE).

-

--suite_defaults([{timetrap, {minutes, 10}}]).

-

-%% Note: This directive should only be used in test suites.

--compile(export_all).

-

--include("ct.hrl").

-

-%% Test server callback functions

-init_per_suite(Config) ->

-    Config.

-

-end_per_suite(_Config) ->

-    ok.

-

-init_per_testcase(_TestCase, Config) ->

-    Config.

-

-end_per_testcase(_TestCase, _Config) ->

-    ok.

-

-all() ->

-    [test_case].

-

-%% Test cases starts here.

-test_case(Config) when is_list(Config) ->

-    ok.

+%%
+%% %CopyrightEnd%
+%%
+
+-module(ct_cth_empty_SUITE).
+
+-suite_defaults([{timetrap, {minutes, 10}}]).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include("ct.hrl").
+
+%% Test server callback functions
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+all() ->
+    [test_case].
+
+%% Test cases starts here.
+test_case(Config) when is_list(Config) ->
+    ok.
+
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
index f223f031d7..e5bb4f3ef6 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
@@ -50,6 +50,8 @@
 -export([post_end_per_group/4]).
 
 -export([pre_init_per_testcase/3]).
+-export([post_init_per_testcase/4]).
+-export([pre_end_per_testcase/3]).
 -export([post_end_per_testcase/4]).
 
 -export([on_tc_fail/3]).
@@ -208,7 +210,7 @@ post_end_per_group(Group,Config,Return,State) ->
     ct:log("~w:post_end_per_group(~w) called", [?MODULE,Group]),
     {Return, State}.
 
-%% @doc Called before each test case.
+%% @doc Called before init_per_testcase/2 for each test case.
 %% You can change the config in this function.
 -spec pre_init_per_testcase(TC :: atom(),
 		  Config :: config(),
@@ -222,8 +224,36 @@ pre_init_per_testcase(TC,Config,State) ->
     ct:log("~w:pre_init_per_testcase(~w) called", [?MODULE,TC]),
     {Config, State}.
 
-%% @doc Called after each test case. Note that the config cannot be
-%% changed here, only the status of the test case.
+%% @doc Called after init_per_testcase/2, and before the test case.
+-spec post_init_per_testcase(TC :: atom(),
+			     Config :: config(),
+			     Return :: config() | skip_or_fail(),
+			     State :: #state{}) ->
+				    {config() | skip_or_fail(), NewState :: #state{}}.
+post_init_per_testcase(TC,Config,Return,State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, post_init_per_testcase,
+				     [TC,Config,Return,State]}}),
+    ct:log("~w:post_init_per_testcase(~w) called", [?MODULE,TC]),
+    {Return, State}.
+
+%% @doc Called before end_per_testacse/2. No skip or fail allowed here,
+%% only config additions.
+-spec pre_end_per_testcase(TC :: atom(),
+		  Config :: config(),
+		  State :: #state{}) ->
+    {config(), NewState :: #state{}}.
+pre_end_per_testcase(TC,Config,State) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, pre_end_per_testcase,
+				     [TC,Config,State]}}),
+    ct:log("~w:pre_end_per_testcase(~w) called", [?MODULE,TC]),
+    {Config, State}.
+
+%% @doc Called after end_per_testcase/2 for each test case. Note that
+%% the config cannot be changed here, only the status of the test case.
 -spec post_end_per_testcase(TC :: atom(),
 			    Config :: config(),
 			    Return :: term(),
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/fail_pre_suite_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/fail_pre_suite_cth.erl
index 98e4548864..a79f4d4541 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/fail_pre_suite_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/fail_pre_suite_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,60 +14,66 @@
 %% 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%

-%%

-

-

--module(fail_pre_suite_cth).

-

-

--include_lib("common_test/src/ct_util.hrl").

--include_lib("common_test/include/ct_event.hrl").

-

-

-%% CT Hooks

--compile(export_all).

-

-init(Id, Opts) ->

-    empty_cth:init(Id, Opts).

-

-pre_init_per_suite(Suite, Config, State) ->

-    empty_cth:pre_init_per_suite(Suite,Config,State),

-    {{fail, "Test failure"}, State}.

-

-post_init_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_init_per_suite(Suite,Config,Return,State).

-

-pre_end_per_suite(Suite,Config,State) ->

-    empty_cth:pre_end_per_suite(Suite,Config,State).

-

-post_end_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_end_per_suite(Suite,Config,Return,State).

-

-pre_init_per_group(Group,Config,State) ->

-    empty_cth:pre_init_per_group(Group,Config,State).

-

-post_init_per_group(Group,Config,Return,State) ->

-    empty_cth:post_init_per_group(Group,Config,Return,State).

-

-pre_end_per_group(Group,Config,State) ->

-    empty_cth:pre_end_per_group(Group,Config,State).

-

-post_end_per_group(Group,Config,Return,State) ->

-    empty_cth:post_end_per_group(Group,Config,Return,State).

-

-pre_init_per_testcase(TC,Config,State) ->

-    empty_cth:pre_init_per_testcase(TC,Config,State).

-

-post_end_per_testcase(TC,Config,Return,State) ->

-    empty_cth:post_end_per_testcase(TC,Config,Return,State).

-

-on_tc_fail(TC, Reason, State) ->

-    empty_cth:on_tc_fail(TC,Reason,State).

-

-on_tc_skip(TC, Reason, State) ->

-    empty_cth:on_tc_skip(TC,Reason,State).

-

-terminate(State) ->

-    empty_cth:terminate(State).

+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(fail_pre_suite_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+
+%% CT Hooks
+-compile(export_all).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+
+pre_init_per_suite(Suite, Config, State) ->
+    empty_cth:pre_init_per_suite(Suite,Config,State),
+    {{fail, "Test failure"}, State}.
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State).
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State).
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Group,Config,State) ->
+    empty_cth:pre_init_per_group(Group,Config,State).
+
+post_init_per_group(Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Group,Config,Return,State).
+
+pre_end_per_group(Group,Config,State) ->
+    empty_cth:pre_end_per_group(Group,Config,State).
+
+post_end_per_group(Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Group,Config,Return,State).
+
+pre_init_per_testcase(TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(TC,Config,State).
+
+post_init_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(TC,Config,Return,State).
+
+pre_end_per_testcase(TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(TC,Config,State).
+
+post_end_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(TC,Config,Return,State).
+
+on_tc_fail(TC, Reason, State) ->
+    empty_cth:on_tc_fail(TC,Reason,State).
+
+on_tc_skip(TC, Reason, State) ->
+    empty_cth:on_tc_skip(TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_cth.erl
index 8898a54b8d..a084423cf3 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,21 +14,21 @@
 %% 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%

-%%

-

-

--module(minimal_cth).

-

-

--include_lib("common_test/src/ct_util.hrl").

--include_lib("common_test/include/ct_event.hrl").

-

-

-%% CT Hooks

--export([init/2]).

-

-init(Id, Opts) ->

-    empty_cth:init(Id, Opts).

-

+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(minimal_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+
+%% CT Hooks
+-export([init/2]).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_terminate_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_terminate_cth.erl
index 2414da0683..7895c43aeb 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_terminate_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/minimal_terminate_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,30 +14,30 @@
 %% 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%

-%%

-

-

--module(minimal_terminate_cth).

-

-

--include_lib("common_test/src/ct_util.hrl").

--include_lib("common_test/include/ct_event.hrl").

-

-

-%% CT Hooks

--export([init/2]).

--export([terminate/1]).

--export([on_tc_skip/3]).

-

-init(Id, Opts) ->

-    empty_cth:init(Id, Opts).

-

-on_tc_skip(TC, Reason, State) ->

-    empty_cth:on_tc_skip(TC,Reason,State).

-

-terminate(State) ->

-    empty_cth:terminate(State).

-    

-

+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(minimal_terminate_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+
+%% CT Hooks
+-export([init/2]).
+-export([terminate/1]).
+-export([on_tc_skip/3]).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+
+on_tc_skip(TC, Reason, State) ->
+    empty_cth:on_tc_skip(TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
+    
+
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/prio_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/prio_cth.erl
index 0f6ef7c596..72d6d186ed 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/prio_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/prio_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,62 +14,68 @@
 %% 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%

-%%

-

-

--module(prio_cth).

-

-

--include_lib("common_test/src/ct_util.hrl").

-

-

-%% CT Hooks

--compile(export_all).

-

-id(Opts) ->

-    empty_cth:id(Opts).

-

-init(Id, Opts) ->

-    {ok, [Prio|_] = State} = empty_cth:init(Id, Opts),

-    {ok, State, Prio}.

-

-pre_init_per_suite(Suite, Config, State) ->

-    empty_cth:pre_init_per_suite(Suite,Config,State).

-

-post_init_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_init_per_suite(Suite,Config,Return,State).

-

-pre_end_per_suite(Suite,Config,State) ->

-    empty_cth:pre_end_per_suite(Suite,Config,State).

-

-post_end_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_end_per_suite(Suite,Config,Return,State).

-

-pre_init_per_group(Group,Config,State) ->

-    empty_cth:pre_init_per_group(Group,Config,State).

-

-post_init_per_group(Group,Config,Return,State) ->

-    empty_cth:post_init_per_group(Group,Config,Return,State).

-

-pre_end_per_group(Group,Config,State) ->

-    empty_cth:pre_end_per_group(Group,Config,State).

-

-post_end_per_group(Group,Config,Return,State) ->

-    empty_cth:post_end_per_group(Group,Config,Return,State).

-

-pre_init_per_testcase(TC,Config,State) ->

-    empty_cth:pre_init_per_testcase(TC,Config,State).

-

-post_end_per_testcase(TC,Config,Return,State) ->

-    empty_cth:post_end_per_testcase(TC,Config,Return,State).

-

-on_tc_fail(TC, Reason, State) ->

-    empty_cth:on_tc_fail(TC,Reason,State).

-

-on_tc_skip(TC, Reason, State) ->

-    empty_cth:on_tc_skip(TC,Reason,State).

-

-terminate(State) ->

-    empty_cth:terminate(State).

+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(prio_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+
+
+%% CT Hooks
+-compile(export_all).
+
+id(Opts) ->
+    empty_cth:id(Opts).
+
+init(Id, Opts) ->
+    {ok, [Prio|_] = State} = empty_cth:init(Id, Opts),
+    {ok, State, Prio}.
+
+pre_init_per_suite(Suite, Config, State) ->
+    empty_cth:pre_init_per_suite(Suite,Config,State).
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State).
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State).
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Group,Config,State) ->
+    empty_cth:pre_init_per_group(Group,Config,State).
+
+post_init_per_group(Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Group,Config,Return,State).
+
+pre_end_per_group(Group,Config,State) ->
+    empty_cth:pre_end_per_group(Group,Config,State).
+
+post_end_per_group(Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Group,Config,Return,State).
+
+pre_init_per_testcase(TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(TC,Config,State).
+
+post_init_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(TC,Config,Return,State).
+
+pre_end_per_testcase(TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(TC,Config,State).
+
+post_end_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(TC,Config,Return,State).
+
+on_tc_fail(TC, Reason, State) ->
+    empty_cth:on_tc_fail(TC,Reason,State).
+
+on_tc_skip(TC, Reason, State) ->
+    empty_cth:on_tc_skip(TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/recover_post_suite_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/recover_post_suite_cth.erl
index dfb696bcb9..cf484d3cd7 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/recover_post_suite_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/recover_post_suite_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,62 +14,68 @@
 %% 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%

-%%

-

-

--module(recover_post_suite_cth).

-

-

--include_lib("common_test/src/ct_util.hrl").

--include_lib("common_test/include/ct_event.hrl").

-

-

-%% CT Hooks

--compile(export_all).

-

-init(Id, Opts) ->

-    empty_cth:init(Id, Opts).

-

-pre_init_per_suite(Suite, Config, State) ->

-    empty_cth:pre_init_per_suite(Suite,Config,State).

-

-post_init_per_suite(Suite,Config,{'EXIT',Reason} = Return,State) ->

-    empty_cth:post_init_per_suite(Suite,Config,Return,State),

-    {lists:keydelete(tc_status,1,Config),State};

-post_init_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_init_per_suite(Suite,Config,Return,State).

-

-pre_end_per_suite(Suite,Config,State) ->

-    empty_cth:pre_end_per_suite(Suite,Config,State).

-

-post_end_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_end_per_suite(Suite,Config,Return,State).

-

-pre_init_per_group(Group,Config,State) ->

-    empty_cth:pre_init_per_group(Group,Config,State).

-

-post_init_per_group(Group,Config,Return,State) ->

-    empty_cth:post_init_per_group(Group,Config,Return,State).

-

-pre_end_per_group(Group,Config,State) ->

-    empty_cth:pre_end_per_group(Group,Config,State).

-

-post_end_per_group(Group,Config,Return,State) ->

-    empty_cth:post_end_per_group(Group,Config,Return,State).

-

-pre_init_per_testcase(TC,Config,State) ->

-    empty_cth:pre_init_per_testcase(TC,Config,State).

-

-post_end_per_testcase(TC,Config,Return,State) ->

-    empty_cth:post_end_per_testcase(TC,Config,Return,State).

-

-on_tc_fail(TC, Reason, State) ->

-    empty_cth:on_tc_fail(TC,Reason,State).

-

-on_tc_skip(TC, Reason, State) ->

-    empty_cth:on_tc_skip(TC,Reason,State).

-

-terminate(State) ->

-    empty_cth:terminate(State).

+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(recover_post_suite_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+
+%% CT Hooks
+-compile(export_all).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+
+pre_init_per_suite(Suite, Config, State) ->
+    empty_cth:pre_init_per_suite(Suite,Config,State).
+
+post_init_per_suite(Suite,Config,{'EXIT',Reason} = Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State),
+    {lists:keydelete(tc_status,1,Config),State};
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State).
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State).
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Group,Config,State) ->
+    empty_cth:pre_init_per_group(Group,Config,State).
+
+post_init_per_group(Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Group,Config,Return,State).
+
+pre_end_per_group(Group,Config,State) ->
+    empty_cth:pre_end_per_group(Group,Config,State).
+
+post_end_per_group(Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Group,Config,Return,State).
+
+pre_init_per_testcase(TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(TC,Config,State).
+
+post_init_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(TC,Config,Return,State).
+
+pre_end_per_testcase(TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(TC,Config,State).
+
+post_end_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(TC,Config,Return,State).
+
+on_tc_fail(TC, Reason, State) ->
+    empty_cth:on_tc_fail(TC,Reason,State).
+
+on_tc_skip(TC, Reason, State) ->
+    empty_cth:on_tc_skip(TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/same_id_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/same_id_cth.erl
index 50b220d093..60615d97fc 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/same_id_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/same_id_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,63 +14,69 @@
 %% 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%

-%%

-

-

--module(same_id_cth).

-

-

--include_lib("common_test/src/ct_util.hrl").

--include_lib("common_test/include/ct_event.hrl").

-

-

-%% CT Hooks

--compile(export_all).

-

-id(Opts) ->

-    empty_cth:id(Opts),

-    ?MODULE.

-

-init(Id, Opts) ->

-    empty_cth:init(Id, Opts).

-

-pre_init_per_suite(Suite, Config, State) ->

-    empty_cth:pre_init_per_suite(Suite,Config,State).

-

-post_init_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_init_per_suite(Suite,Config,Return,State).

-

-pre_end_per_suite(Suite,Config,State) ->

-    empty_cth:pre_end_per_suite(Suite,Config,State).

-

-post_end_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_end_per_suite(Suite,Config,Return,State).

-

-pre_init_per_group(Group,Config,State) ->

-    empty_cth:pre_init_per_group(Group,Config,State).

-

-post_init_per_group(Group,Config,Return,State) ->

-    empty_cth:post_init_per_group(Group,Config,Return,State).

-

-pre_end_per_group(Group,Config,State) ->

-    empty_cth:pre_end_per_group(Group,Config,State).

-

-post_end_per_group(Group,Config,Return,State) ->

-    empty_cth:post_end_per_group(Group,Config,Return,State).

-

-pre_init_per_testcase(TC,Config,State) ->

-    empty_cth:pre_init_per_testcase(TC,Config,State).

-

-post_end_per_testcase(TC,Config,Return,State) ->

-    empty_cth:post_end_per_testcase(TC,Config,Return,State).

-

-on_tc_fail(TC, Reason, State) ->

-    empty_cth:on_tc_fail(TC,Reason,State).

-

-on_tc_skip(TC, Reason, State) ->

-    empty_cth:on_tc_skip(TC,Reason,State).

-

-terminate(State) ->

-    empty_cth:terminate(State).

+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(same_id_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+
+%% CT Hooks
+-compile(export_all).
+
+id(Opts) ->
+    empty_cth:id(Opts),
+    ?MODULE.
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+
+pre_init_per_suite(Suite, Config, State) ->
+    empty_cth:pre_init_per_suite(Suite,Config,State).
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State).
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State).
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Group,Config,State) ->
+    empty_cth:pre_init_per_group(Group,Config,State).
+
+post_init_per_group(Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Group,Config,Return,State).
+
+pre_end_per_group(Group,Config,State) ->
+    empty_cth:pre_end_per_group(Group,Config,State).
+
+post_end_per_group(Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Group,Config,Return,State).
+
+pre_init_per_testcase(TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(TC,Config,State).
+
+post_init_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(TC,Config,Return,State).
+
+pre_end_per_testcase(TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(TC,Config,State).
+
+post_end_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(TC,Config,Return,State).
+
+on_tc_fail(TC, Reason, State) ->
+    empty_cth:on_tc_fail(TC,Reason,State).
+
+on_tc_skip(TC, Reason, State) ->
+    empty_cth:on_tc_skip(TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_post_suite_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_post_suite_cth.erl
index d8332f77f6..56163e730c 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_post_suite_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_post_suite_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,60 +14,66 @@
 %% 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%

-%%

-

-

--module(skip_post_suite_cth).

-

-

--include_lib("common_test/src/ct_util.hrl").

--include_lib("common_test/include/ct_event.hrl").

-

-

-%% CT Hooks

--compile(export_all).

-

-init(Id, Opts) ->

-    empty_cth:init(Id, Opts).

-

-pre_init_per_suite(Suite, Config, State) ->

-    empty_cth:pre_init_per_suite(Suite,Config,State).

-

-post_init_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_init_per_suite(Suite,Config,Return,State),

-    {{skip, "Test skip"}, State}.

-

-pre_end_per_suite(Suite,Config,State) ->

-    empty_cth:pre_end_per_suite(Suite,Config,State).

-

-post_end_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_end_per_suite(Suite,Config,Return,State).

-

-pre_init_per_group(Group,Config,State) ->

-    empty_cth:pre_init_per_group(Group,Config,State).

-

-post_init_per_group(Group,Config,Return,State) ->

-    empty_cth:post_init_per_group(Group,Config,Return,State).

-

-pre_end_per_group(Group,Config,State) ->

-    empty_cth:pre_end_per_group(Group,Config,State).

-

-post_end_per_group(Group,Config,Return,State) ->

-    empty_cth:post_end_per_group(Group,Config,Return,State).

-

-pre_init_per_testcase(TC,Config,State) ->

-    empty_cth:pre_init_per_testcase(TC,Config,State).

-

-post_end_per_testcase(TC,Config,Return,State) ->

-    empty_cth:post_end_per_testcase(TC,Config,Return,State).

-

-on_tc_fail(TC, Reason, State) ->

-    empty_cth:on_tc_fail(TC,Reason,State).

-

-on_tc_skip(TC, Reason, State) ->

-    empty_cth:on_tc_skip(TC,Reason,State).

-

-terminate(State) ->

-    empty_cth:terminate(State).

+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(skip_post_suite_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+
+%% CT Hooks
+-compile(export_all).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+
+pre_init_per_suite(Suite, Config, State) ->
+    empty_cth:pre_init_per_suite(Suite,Config,State).
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State),
+    {{skip, "Test skip"}, State}.
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State).
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Group,Config,State) ->
+    empty_cth:pre_init_per_group(Group,Config,State).
+
+post_init_per_group(Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Group,Config,Return,State).
+
+pre_end_per_group(Group,Config,State) ->
+    empty_cth:pre_end_per_group(Group,Config,State).
+
+post_end_per_group(Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Group,Config,Return,State).
+
+pre_init_per_testcase(TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(TC,Config,State).
+
+post_init_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(TC,Config,Return,State).
+
+pre_end_per_testcase(TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(TC,Config,State).
+
+post_end_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(TC,Config,Return,State).
+
+on_tc_fail(TC, Reason, State) ->
+    empty_cth:on_tc_fail(TC,Reason,State).
+
+on_tc_skip(TC, Reason, State) ->
+    empty_cth:on_tc_skip(TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_end_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_end_cth.erl
index 3c490c9fea..deb622b316 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_end_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_end_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,62 +14,68 @@
 %% 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%

-%%

-

-

--module(skip_pre_end_cth).

-

-

--include_lib("common_test/src/ct_util.hrl").

--include_lib("common_test/include/ct_event.hrl").

-

-

-%% CT Hooks

--compile(export_all).

-

-init(Id, Opts) ->

-    empty_cth:init(Id, Opts).

-    

-

-pre_init_per_suite(Suite, Config, State) ->

-    empty_cth:pre_init_per_suite(Suite,Config,State).

-

-post_init_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_init_per_suite(Suite,Config,Return,State).

-

-pre_end_per_suite(Suite,Config,State) ->

-    empty_cth:pre_end_per_suite(Suite,Config,State),

-    {{skip, "Test skip"}, State}.

-

-post_end_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_end_per_suite(Suite,Config,Return,State).

-

-pre_init_per_group(Group,Config,State) ->

-    empty_cth:pre_init_per_group(Group,Config,State).

-

-post_init_per_group(Group,Config,Return,State) ->

-    empty_cth:post_init_per_group(Group,Config,Return,State).

-

-pre_end_per_group(Group,Config,State) ->

-    empty_cth:pre_end_per_group(Group,Config,State),

-    {{skip, "Test skip"}, State}.

-

-post_end_per_group(Group,Config,Return,State) ->

-    empty_cth:post_end_per_group(Group,Config,Return,State).

-

-pre_init_per_testcase(TC,Config,State) ->

-    empty_cth:pre_init_per_testcase(TC,Config,State).

-

-post_end_per_testcase(TC,Config,Return,State) ->

-    empty_cth:post_end_per_testcase(TC,Config,Return,State).

-

-on_tc_fail(TC, Reason, State) ->

-    empty_cth:on_tc_fail(TC,Reason,State).

-

-on_tc_skip(TC, Reason, State) ->

-    empty_cth:on_tc_skip(TC,Reason,State).

-

-terminate(State) ->

-    empty_cth:terminate(State).

+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(skip_pre_end_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+
+%% CT Hooks
+-compile(export_all).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+    
+
+pre_init_per_suite(Suite, Config, State) ->
+    empty_cth:pre_init_per_suite(Suite,Config,State).
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State).
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State),
+    {{skip, "Test skip"}, State}.
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Group,Config,State) ->
+    empty_cth:pre_init_per_group(Group,Config,State).
+
+post_init_per_group(Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Group,Config,Return,State).
+
+pre_end_per_group(Group,Config,State) ->
+    empty_cth:pre_end_per_group(Group,Config,State),
+    {{skip, "Test skip"}, State}.
+
+post_end_per_group(Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Group,Config,Return,State).
+
+pre_init_per_testcase(TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(TC,Config,State).
+
+post_init_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(TC,Config,Return,State).
+
+pre_end_per_testcase(TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(TC,Config,State).
+
+post_end_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(TC,Config,Return,State).
+
+on_tc_fail(TC, Reason, State) ->
+    empty_cth:on_tc_fail(TC,Reason,State).
+
+on_tc_skip(TC, Reason, State) ->
+    empty_cth:on_tc_skip(TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_suite_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_suite_cth.erl
index 3ef08ff4e1..ea1d485700 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_suite_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_suite_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,61 +14,67 @@
 %% 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%

-%%

-

-

--module(skip_pre_suite_cth).

-

-

--include_lib("common_test/src/ct_util.hrl").

--include_lib("common_test/include/ct_event.hrl").

-

-

-%% CT Hooks

--compile(export_all).

-

-init(Id, Opts) ->

-    empty_cth:init(Id, Opts).

-    

-

-pre_init_per_suite(Suite, Config, State) ->

-    empty_cth:pre_init_per_suite(Suite,Config,State),

-    {{skip, "Test skip"}, State}.

-

-post_init_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_init_per_suite(Suite,Config,Return,State).

-

-pre_end_per_suite(Suite,Config,State) ->

-    empty_cth:pre_end_per_suite(Suite,Config,State).

-

-post_end_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_end_per_suite(Suite,Config,Return,State).

-

-pre_init_per_group(Group,Config,State) ->

-    empty_cth:pre_init_per_group(Group,Config,State).

-

-post_init_per_group(Group,Config,Return,State) ->

-    empty_cth:post_init_per_group(Group,Config,Return,State).

-

-pre_end_per_group(Group,Config,State) ->

-    empty_cth:pre_end_per_group(Group,Config,State).

-

-post_end_per_group(Group,Config,Return,State) ->

-    empty_cth:post_end_per_group(Group,Config,Return,State).

-

-pre_init_per_testcase(TC,Config,State) ->

-    empty_cth:pre_init_per_testcase(TC,Config,State).

-

-post_end_per_testcase(TC,Config,Return,State) ->

-    empty_cth:post_end_per_testcase(TC,Config,Return,State).

-

-on_tc_fail(TC, Reason, State) ->

-    empty_cth:on_tc_fail(TC,Reason,State).

-

-on_tc_skip(TC, Reason, State) ->

-    empty_cth:on_tc_skip(TC,Reason,State).

-

-terminate(State) ->

-    empty_cth:terminate(State).

+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(skip_pre_suite_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+
+%% CT Hooks
+-compile(export_all).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+    
+
+pre_init_per_suite(Suite, Config, State) ->
+    empty_cth:pre_init_per_suite(Suite,Config,State),
+    {{skip, "Test skip"}, State}.
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State).
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State).
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Group,Config,State) ->
+    empty_cth:pre_init_per_group(Group,Config,State).
+
+post_init_per_group(Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Group,Config,Return,State).
+
+pre_end_per_group(Group,Config,State) ->
+    empty_cth:pre_end_per_group(Group,Config,State).
+
+post_end_per_group(Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Group,Config,Return,State).
+
+pre_init_per_testcase(TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(TC,Config,State).
+
+post_init_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(TC,Config,Return,State).
+
+pre_end_per_testcase(TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(TC,Config,State).
+
+post_end_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(TC,Config,Return,State).
+
+on_tc_fail(TC, Reason, State) ->
+    empty_cth:on_tc_fail(TC,Reason,State).
+
+on_tc_skip(TC, Reason, State) ->
+    empty_cth:on_tc_skip(TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl
index 338336a140..c2135bbbee 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,71 +14,79 @@
 %% 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%

-%%

-

-

--module(state_update_cth).

-

-

--include_lib("common_test/src/ct_util.hrl").

--include_lib("common_test/include/ct_event.hrl").

-

-%% CT Hooks

--compile(export_all).

-

-init(Id, Opts) ->

-    State = empty_cth:init(Id, Opts),

-    {ok, [init|State]}.

-

-pre_init_per_suite(Suite, Config, State) ->

-    empty_cth:pre_init_per_suite(Suite,Config,State),

-    {Config, [pre_init_per_suite|State]}.

-

-post_init_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_init_per_suite(Suite,Config,Return,State),

-    {Config, [post_init_per_suite|State]}.

-

-pre_end_per_suite(Suite,Config,State) ->

-    empty_cth:pre_end_per_suite(Suite,Config,State),

-    {Config, [pre_end_per_suite|State]}.

-

-post_end_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_end_per_suite(Suite,Config,Return,State),

-    {Return, [post_end_per_suite|State]}.

-

-pre_init_per_group(Group,Config,State) ->

-    empty_cth:pre_init_per_group(Group,Config,State),

-    {Config, [pre_init_per_group|State]}.

-

-post_init_per_group(Group,Config,Return,State) ->

-    empty_cth:post_init_per_group(Group,Config,Return,State),

-    {Return, [post_init_per_group|State]}.

-

-pre_end_per_group(Group,Config,State) ->

-    empty_cth:pre_end_per_group(Group,Config,State),

-    {Config, [pre_end_per_group|State]}.

-

-post_end_per_group(Group,Config,Return,State) ->

-    empty_cth:post_end_per_group(Group,Config,Return,State),

-    {Return, [post_end_per_group|State]}.

-

-pre_init_per_testcase(TC,Config,State) ->

-    empty_cth:pre_init_per_testcase(TC,Config,State),

-    {Config, [pre_init_per_testcase|State]}.

-

-post_end_per_testcase(TC,Config,Return,State) ->

-    empty_cth:post_end_per_testcase(TC,Config,Return,State),

-    {Return, [post_end_per_testcase|State]}.

-

-on_tc_fail(TC, Reason, State) ->

-    empty_cth:on_tc_fail(TC,Reason,State),

-    [on_tc_fail|State].

-

-on_tc_skip(TC, Reason, State) ->

-    empty_cth:on_tc_skip(TC,Reason,State),

-    [on_tc_skip|State].

-

-terminate(State) ->

-    empty_cth:terminate(State).

+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(state_update_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+%% CT Hooks
+-compile(export_all).
+
+init(Id, Opts) ->
+    State = empty_cth:init(Id, Opts),
+    {ok, [init|State]}.
+
+pre_init_per_suite(Suite, Config, State) ->
+    empty_cth:pre_init_per_suite(Suite,Config,State),
+    {Config, [pre_init_per_suite|State]}.
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State),
+    {Config, [post_init_per_suite|State]}.
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State),
+    {Config, [pre_end_per_suite|State]}.
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State),
+    {Return, [post_end_per_suite|State]}.
+
+pre_init_per_group(Group,Config,State) ->
+    empty_cth:pre_init_per_group(Group,Config,State),
+    {Config, [pre_init_per_group|State]}.
+
+post_init_per_group(Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Group,Config,Return,State),
+    {Return, [post_init_per_group|State]}.
+
+pre_end_per_group(Group,Config,State) ->
+    empty_cth:pre_end_per_group(Group,Config,State),
+    {Config, [pre_end_per_group|State]}.
+
+post_end_per_group(Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Group,Config,Return,State),
+    {Return, [post_end_per_group|State]}.
+
+pre_init_per_testcase(TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(TC,Config,State),
+    {Config, [pre_init_per_testcase|State]}.
+
+post_init_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(TC,Config,Return,State),
+    {Return, [post_init_per_testcase|State]}.
+
+pre_end_per_testcase(TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(TC,Config,State),
+    {Config, [pre_end_per_testcase|State]}.
+
+post_end_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(TC,Config,Return,State),
+    {Return, [post_end_per_testcase|State]}.
+
+on_tc_fail(TC, Reason, State) ->
+    empty_cth:on_tc_fail(TC,Reason,State),
+    [on_tc_fail|State].
+
+on_tc_skip(TC, Reason, State) ->
+    empty_cth:on_tc_skip(TC,Reason,State),
+    [on_tc_skip|State].
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/undef_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/undef_cth.erl
index da43d56c12..5ac4bdddf8 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/undef_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/undef_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,59 +14,65 @@
 %% 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%

-%%

-

-

--module(undef_cth).

-

-

--include_lib("common_test/src/ct_util.hrl").

--include_lib("common_test/include/ct_event.hrl").

-

-

-%% CT Hooks

--compile(export_all).

-

-init(Id, Opts) ->

-    empty_cth:init(Id, Opts).

-

-pre_init_per_suite(_Suite, _Config, _State) ->

-    lists:flaten([1,2,[3,4]]).

-

-post_init_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_init_per_suite(Suite,Config,Return,State).

-

-pre_end_per_suite(Suite,Config,State) ->

-    empty_cth:pre_end_per_suite(Suite,Config,State).

-

-post_end_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_end_per_suite(Suite,Config,Return,State).

-

-pre_init_per_group(Group,Config,State) ->

-    empty_cth:pre_init_per_group(Group,Config,State).

-

-post_init_per_group(Group,Config,Return,State) ->

-    empty_cth:post_init_per_group(Group,Config,Return,State).

-

-pre_end_per_group(Group,Config,State) ->

-    empty_cth:pre_end_per_group(Group,Config,State).

-

-post_end_per_group(Group,Config,Return,State) ->

-    empty_cth:post_end_per_group(Group,Config,Return,State).

-

-pre_init_per_testcase(TC,Config,State) ->

-    empty_cth:pre_init_per_testcase(TC,Config,State).

-

-post_end_per_testcase(TC,Config,Return,State) ->

-    empty_cth:post_end_per_testcase(TC,Config,Return,State).

-

-on_tc_fail(TC, Reason, State) ->

-    empty_cth:on_tc_fail(TC,Reason,State).

-

-on_tc_skip(TC, Reason, State) ->

-    empty_cth:on_tc_skip(TC,Reason,State).

-

-terminate(State) ->

-    empty_cth:terminate(State).

+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(undef_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+
+%% CT Hooks
+-compile(export_all).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+
+pre_init_per_suite(_Suite, _Config, _State) ->
+    lists:flaten([1,2,[3,4]]).
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State).
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State).
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Group,Config,State) ->
+    empty_cth:pre_init_per_group(Group,Config,State).
+
+post_init_per_group(Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Group,Config,Return,State).
+
+pre_end_per_group(Group,Config,State) ->
+    empty_cth:pre_end_per_group(Group,Config,State).
+
+post_end_per_group(Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Group,Config,Return,State).
+
+pre_init_per_testcase(TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(TC,Config,State).
+
+post_init_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(TC,Config,Return,State).
+
+pre_end_per_testcase(TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(TC,Config,State).
+
+post_end_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(TC,Config,Return,State).
+
+on_tc_fail(TC, Reason, State) ->
+    empty_cth:on_tc_fail(TC,Reason,State).
+
+on_tc_skip(TC, Reason, State) ->
+    empty_cth:on_tc_skip(TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl
index 0202201eed..5503bf85ae 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2011. 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
@@ -14,71 +14,79 @@
 %% 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%

-%%

-

-

--module(update_config_cth).

-

-

--include_lib("common_test/src/ct_util.hrl").

--include_lib("common_test/include/ct_event.hrl").

-

--define(now, os:timestamp()).

-

-%% CT Hooks

--compile(export_all).

-

-init(Id, Opts) ->

-    empty_cth:init(Id, Opts).

-

-pre_init_per_suite(Suite, Config, State) ->

-    empty_cth:pre_init_per_suite(Suite,Config,State),

-    {[{pre_init_per_suite,?now}|Config],State}.

-

-post_init_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_init_per_suite(Suite,Config,Return,State),

-    {[{post_init_per_suite,?now}|Return],State}.

-

-pre_end_per_suite(Suite,Config,State) ->

-    empty_cth:pre_end_per_suite(Suite,Config,State),

-    {[{pre_end_per_suite,?now}|Config],State}.

-

-post_end_per_suite(Suite,Config,Return,State) ->

-    empty_cth:post_end_per_suite(Suite,Config,Return,State),

-    NewConfig = [{post_end_per_suite,?now}|Config],

-    {NewConfig,NewConfig}.

-

-pre_init_per_group(Group,Config,State) ->

-    empty_cth:pre_init_per_group(Group,Config,State),

-    {[{pre_init_per_group,?now}|Config],State}.

-

-post_init_per_group(Group,Config,Return,State) ->

-    empty_cth:post_init_per_group(Group,Config,Return,State),

-    {[{post_init_per_group,?now}|Return],State}.

-

-pre_end_per_group(Group,Config,State) ->

-    empty_cth:pre_end_per_group(Group,Config,State),

-    {[{pre_end_per_group,?now}|Config],State}.

-

-post_end_per_group(Group,Config,Return,State) ->

-    empty_cth:post_end_per_group(Group,Config,Return,State),

-    {[{post_end_per_group,?now}|Config],State}.

-

-pre_init_per_testcase(TC,Config,State) ->

-    empty_cth:pre_init_per_testcase(TC,Config,State),

-    {[{pre_init_per_testcase,?now}|Config],State}.

-

-post_end_per_testcase(TC,Config,Return,State) ->

-    empty_cth:post_end_per_testcase(TC,Config,Return,State),

-    {[{post_end_per_testcase,?now}|Config],State}.

-

-on_tc_fail(TC, Reason, State) ->

-    empty_cth:on_tc_fail(TC,Reason,State).

-

-on_tc_skip(TC, Reason, State) ->

-    empty_cth:on_tc_skip(TC,Reason,State).

-

-terminate(State) ->

-    empty_cth:terminate(State).

+%%
+%% %CopyrightEnd%
+%%
+
+
+-module(update_config_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(now, os:timestamp()).
+
+%% CT Hooks
+-compile(export_all).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+
+pre_init_per_suite(Suite, Config, State) ->
+    empty_cth:pre_init_per_suite(Suite,Config,State),
+    {[{pre_init_per_suite,?now}|Config],State}.
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State),
+    {[{post_init_per_suite,?now}|Return],State}.
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State),
+    {[{pre_end_per_suite,?now}|Config],State}.
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State),
+    NewConfig = [{post_end_per_suite,?now}|Config],
+    {NewConfig,NewConfig}.
+
+pre_init_per_group(Group,Config,State) ->
+    empty_cth:pre_init_per_group(Group,Config,State),
+    {[{pre_init_per_group,?now}|Config],State}.
+
+post_init_per_group(Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Group,Config,Return,State),
+    {[{post_init_per_group,?now}|Return],State}.
+
+pre_end_per_group(Group,Config,State) ->
+    empty_cth:pre_end_per_group(Group,Config,State),
+    {[{pre_end_per_group,?now}|Config],State}.
+
+post_end_per_group(Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Group,Config,Return,State),
+    {[{post_end_per_group,?now}|Config],State}.
+
+pre_init_per_testcase(TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(TC,Config,State),
+    {[{pre_init_per_testcase,?now}|Config],State}.
+
+post_init_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(TC,Config,Return,State),
+    {[{post_init_per_testcase,?now}|Config],State}.
+
+pre_end_per_testcase(TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(TC,Config,State),
+    {[{pre_end_per_testcase,?now}|Config],State}.
+
+post_end_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(TC,Config,Return,State),
+    {[{post_end_per_testcase,?now}|Config],State}.
+
+on_tc_fail(TC, Reason, State) ->
+    empty_cth:on_tc_fail(TC,Reason,State).
+
+on_tc_skip(TC, Reason, State) ->
+    empty_cth:on_tc_skip(TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_config_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_config_cth.erl
index 754163abae..1df212f266 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_config_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_config_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2012. 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
@@ -14,118 +14,126 @@
 %% 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%

-%%

-

--module(verify_config_cth).

-

--include_lib("common_test/src/ct_util.hrl").

-

-%% CT Hooks

--compile(export_all).

-

--define(val(K, L), proplists:get_value(K, L)).

-

-id(Opts) ->

-    ?MODULE.

-

-init(Id, Opts) ->

-    {ok, State} = empty_cth:init(Id, Opts),

-    {ok, State}.

-

-pre_init_per_suite(Suite, Config, State) ->

-    ct_no_config_SUITE = ct:get_config(suite_cfg),

-    empty_cth:pre_init_per_suite(Suite,

-				 [{pre_init_per_suite,true} | Config],

-				 State).

-

-post_init_per_suite(Suite,Config,Return,State) ->

-    true = ?val(pre_init_per_suite, Return),

-    ct_no_config_SUITE = ct:get_config(suite_cfg),

-    empty_cth:post_init_per_suite(Suite,

-				  Config,

-				  [{post_init_per_suite,true} | Return],

-				  State).

-

-pre_end_per_suite(Suite,Config,State) ->

-    true = ?val(post_init_per_suite, Config),

-    ct_no_config_SUITE = ct:get_config(suite_cfg),

-    empty_cth:pre_end_per_suite(Suite,

-				[{pre_end_per_suite,true} | Config],

-				State).

-

-post_end_per_suite(Suite,Config,Return,State) ->

-    true = ?val(pre_end_per_suite, Config),

-    ct_no_config_SUITE = ct:get_config(suite_cfg),

-    empty_cth:post_end_per_suite(Suite,Config,Return,State).

-

-pre_init_per_group(Group,Config,State) ->

-    true = ?val(post_init_per_suite, Config),

-    ct_no_config_SUITE = ct:get_config(suite_cfg),

-    test_group = ct:get_config(group_cfg),

-    empty_cth:pre_init_per_group(Group,

-				 [{pre_init_per_group,true} | Config],

-				 State).

-

-post_init_per_group(Group,Config,Return,State) ->

-    true = ?val(pre_init_per_group, Return),

-    test_group = ct:get_config(group_cfg),

-    empty_cth:post_init_per_group(Group,

-				  Config,

-				  [{post_init_per_group,true} | Return],

-				  State).

-

-pre_end_per_group(Group,Config,State) ->

-    true = ?val(post_init_per_group, Config),

-    ct_no_config_SUITE = ct:get_config(suite_cfg),

-    test_group = ct:get_config(group_cfg),

-    empty_cth:pre_end_per_group(Group,

-				[{pre_end_per_group,true} | Config],

-				State).

-

-post_end_per_group(Group,Config,Return,State) ->

-    true = ?val(pre_end_per_group, Config),

-    ct_no_config_SUITE = ct:get_config(suite_cfg),

-    test_group = ct:get_config(group_cfg),

-    empty_cth:post_end_per_group(Group,Config,Return,State).

-

-pre_init_per_testcase(TC,Config,State) ->

-    true = ?val(post_init_per_suite, Config),

-    case ?val(name, ?val(tc_group_properties, Config)) of

-	undefined -> 

-	    ok;

-	_ ->

-	    true = ?val(post_init_per_group, Config),

-	    test_group = ct:get_config(group_cfg)

-    end,

-    ct_no_config_SUITE = ct:get_config(suite_cfg),

-    CfgKey = list_to_atom(atom_to_list(TC) ++ "_cfg"),

-    TC = ct:get_config(CfgKey),

-    empty_cth:pre_init_per_testcase(TC,

-				    [{pre_init_per_testcase,true} | Config],

-				    State).

-

-post_end_per_testcase(TC,Config,Return,State) ->

-    true = ?val(post_init_per_suite, Config),

-    true = ?val(pre_init_per_testcase, Config),

-    case ?val(name, ?val(tc_group_properties, Config)) of

-	undefined -> 

-	    ok;

-	_ ->

-	    true = ?val(post_init_per_group, Config),	    

-	    test_group = ct:get_config(group_cfg)

-    end,

-    ct_no_config_SUITE = ct:get_config(suite_cfg),

-    CfgKey = list_to_atom(atom_to_list(TC) ++ "_cfg"),

-    TC = ct:get_config(CfgKey),

-    empty_cth:post_end_per_testcase(TC,Config,Return,State).

-

-on_tc_fail(TC, Reason, State) ->

-    empty_cth:on_tc_fail(TC,Reason,State).

-

-on_tc_skip(TC, Reason, State) ->

-    empty_cth:on_tc_skip(TC,Reason,State).

-

-terminate(State) ->

-    empty_cth:terminate(State).

+%%
+%% %CopyrightEnd%
+%%
+
+-module(verify_config_cth).
+
+-include_lib("common_test/src/ct_util.hrl").
+
+%% CT Hooks
+-compile(export_all).
+
+-define(val(K, L), proplists:get_value(K, L)).
+
+id(Opts) ->
+    ?MODULE.
+
+init(Id, Opts) ->
+    {ok, State} = empty_cth:init(Id, Opts),
+    {ok, State}.
+
+pre_init_per_suite(Suite, Config, State) ->
+    ct_no_config_SUITE = ct:get_config(suite_cfg),
+    empty_cth:pre_init_per_suite(Suite,
+				 [{pre_init_per_suite,true} | Config],
+				 State).
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    true = ?val(pre_init_per_suite, Return),
+    ct_no_config_SUITE = ct:get_config(suite_cfg),
+    empty_cth:post_init_per_suite(Suite,
+				  Config,
+				  [{post_init_per_suite,true} | Return],
+				  State).
+
+pre_end_per_suite(Suite,Config,State) ->
+    true = ?val(post_init_per_suite, Config),
+    ct_no_config_SUITE = ct:get_config(suite_cfg),
+    empty_cth:pre_end_per_suite(Suite,
+				[{pre_end_per_suite,true} | Config],
+				State).
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    true = ?val(pre_end_per_suite, Config),
+    ct_no_config_SUITE = ct:get_config(suite_cfg),
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Group,Config,State) ->
+    true = ?val(post_init_per_suite, Config),
+    ct_no_config_SUITE = ct:get_config(suite_cfg),
+    test_group = ct:get_config(group_cfg),
+    empty_cth:pre_init_per_group(Group,
+				 [{pre_init_per_group,true} | Config],
+				 State).
+
+post_init_per_group(Group,Config,Return,State) ->
+    true = ?val(pre_init_per_group, Return),
+    test_group = ct:get_config(group_cfg),
+    empty_cth:post_init_per_group(Group,
+				  Config,
+				  [{post_init_per_group,true} | Return],
+				  State).
+
+pre_end_per_group(Group,Config,State) ->
+    true = ?val(post_init_per_group, Config),
+    ct_no_config_SUITE = ct:get_config(suite_cfg),
+    test_group = ct:get_config(group_cfg),
+    empty_cth:pre_end_per_group(Group,
+				[{pre_end_per_group,true} | Config],
+				State).
+
+post_end_per_group(Group,Config,Return,State) ->
+    true = ?val(pre_end_per_group, Config),
+    ct_no_config_SUITE = ct:get_config(suite_cfg),
+    test_group = ct:get_config(group_cfg),
+    empty_cth:post_end_per_group(Group,Config,Return,State).
+
+pre_init_per_testcase(TC,Config,State) ->
+    true = ?val(post_init_per_suite, Config),
+    case ?val(name, ?val(tc_group_properties, Config)) of
+	undefined -> 
+	    ok;
+	_ ->
+	    true = ?val(post_init_per_group, Config),
+	    test_group = ct:get_config(group_cfg)
+    end,
+    ct_no_config_SUITE = ct:get_config(suite_cfg),
+    CfgKey = list_to_atom(atom_to_list(TC) ++ "_cfg"),
+    TC = ct:get_config(CfgKey),
+    empty_cth:pre_init_per_testcase(TC,
+				    [{pre_init_per_testcase,true} | Config],
+				    State).
+
+%%! TODO: Verify Config also in post_init and pre_end!
+
+post_init_per_testcase(TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(TC,Config,Return,State).
+
+pre_end_per_testcase(TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(TC,Config,State).
+
+post_end_per_testcase(TC,Config,Return,State) ->
+    true = ?val(post_init_per_suite, Config),
+    true = ?val(pre_init_per_testcase, Config),
+    case ?val(name, ?val(tc_group_properties, Config)) of
+	undefined -> 
+	    ok;
+	_ ->
+	    true = ?val(post_init_per_group, Config),	    
+	    test_group = ct:get_config(group_cfg)
+    end,
+    ct_no_config_SUITE = ct:get_config(suite_cfg),
+    CfgKey = list_to_atom(atom_to_list(TC) ++ "_cfg"),
+    TC = ct:get_config(CfgKey),
+    empty_cth:post_end_per_testcase(TC,Config,Return,State).
+
+on_tc_fail(TC, Reason, State) ->
+    empty_cth:on_tc_fail(TC,Reason,State).
+
+on_tc_skip(TC, Reason, State) ->
+    empty_cth:on_tc_skip(TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_data_dir_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_data_dir_cth.erl
index 2c8f7a50aa..7abcea4393 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_data_dir_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_data_dir_cth.erl
@@ -1,8 +1,8 @@
-%%

-%% %CopyrightBegin%

-%%

-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.

-%%

+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2012. 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
@@ -14,83 +14,91 @@
 %% 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%

-%%

-

--module(verify_data_dir_cth).

-

--include_lib("common_test/src/ct_util.hrl").

-

-%% CT Hooks

--compile(export_all).

-

--define(val(K, L), proplists:get_value(K, L)).

-

-check_dirs(State,Config) ->

-    DataDirName = ?val(data_dir_name, State),

-    %% check priv_dir

-    PrivDir = proplists:get_value(priv_dir, Config),

-    "log_private" = filename:basename(PrivDir),

-    {ok,_} = file:list_dir(PrivDir),

-    

-    %% check data_dir

-    DataDir = proplists:get_value(data_dir, Config),

-    DataDirName = filename:basename(DataDir),

-    ok.

-

-id(_Opts) ->

-    ?MODULE.

-

-init(Id, _Opts) ->

-    {ok, _State} = empty_cth:init(Id, []),

-    {ok, [{data_dir_name,"ct_data_dir_SUITE_data"}]}.

-

-pre_init_per_suite(Suite,Config,State) ->

-    check_dirs(State,Config),

-    empty_cth:pre_init_per_suite(Suite,Config,State).

-

-post_init_per_suite(Suite,Config,Return,State) ->

-    check_dirs(State,Return),

-    empty_cth:post_init_per_suite(Suite,Config,Return,State).

-

-pre_end_per_suite(Suite,Config,State) ->

-    check_dirs(State,Config),

-    empty_cth:pre_end_per_suite(Suite,Config,State).

-

-post_end_per_suite(Suite,Config,Return,State) ->

-    check_dirs(State,Config),

-    empty_cth:post_end_per_suite(Suite,Config,Return,State).

-

-pre_init_per_group(Group,Config,State) ->

-    check_dirs(State,Config),

-    empty_cth:pre_init_per_group(Group,Config,State).

-

-post_init_per_group(Group,Config,Return,State) ->

-    check_dirs(State,Return),

-    empty_cth:post_init_per_group(Group,Config,Return,State).

-

-pre_end_per_group(Group,Config,State) ->

-    check_dirs(State,Config),

-    empty_cth:pre_end_per_group(Group,Config,State).

-

-post_end_per_group(Group,Config,Return,State) ->

-    check_dirs(State,Config),

-    empty_cth:post_end_per_group(Group,Config,Return,State).

-

-pre_init_per_testcase(TC,Config,State) ->

-    check_dirs(State,Config),

-    empty_cth:pre_init_per_testcase(TC,Config,State).

-

-post_end_per_testcase(TC,Config,Return,State) ->

-    check_dirs(State,Config),

-    empty_cth:post_end_per_testcase(TC,Config,Return,State).

-

-on_tc_fail(TC, Reason, State) ->

-    empty_cth:on_tc_fail(TC,Reason,State).

-

-on_tc_skip(TC, Reason, State) ->

-    empty_cth:on_tc_skip(TC,Reason,State).

-

-terminate(State) ->

-    empty_cth:terminate(State).

+%%
+%% %CopyrightEnd%
+%%
+
+-module(verify_data_dir_cth).
+
+-include_lib("common_test/src/ct_util.hrl").
+
+%% CT Hooks
+-compile(export_all).
+
+-define(val(K, L), proplists:get_value(K, L)).
+
+check_dirs(State,Config) ->
+    DataDirName = ?val(data_dir_name, State),
+    %% check priv_dir
+    PrivDir = proplists:get_value(priv_dir, Config),
+    "log_private" = filename:basename(PrivDir),
+    {ok,_} = file:list_dir(PrivDir),
+    
+    %% check data_dir
+    DataDir = proplists:get_value(data_dir, Config),
+    DataDirName = filename:basename(DataDir),
+    ok.
+
+id(_Opts) ->
+    ?MODULE.
+
+init(Id, _Opts) ->
+    {ok, _State} = empty_cth:init(Id, []),
+    {ok, [{data_dir_name,"ct_data_dir_SUITE_data"}]}.
+
+pre_init_per_suite(Suite,Config,State) ->
+    check_dirs(State,Config),
+    empty_cth:pre_init_per_suite(Suite,Config,State).
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    check_dirs(State,Return),
+    empty_cth:post_init_per_suite(Suite,Config,Return,State).
+
+pre_end_per_suite(Suite,Config,State) ->
+    check_dirs(State,Config),
+    empty_cth:pre_end_per_suite(Suite,Config,State).
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    check_dirs(State,Config),
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Group,Config,State) ->
+    check_dirs(State,Config),
+    empty_cth:pre_init_per_group(Group,Config,State).
+
+post_init_per_group(Group,Config,Return,State) ->
+    check_dirs(State,Return),
+    empty_cth:post_init_per_group(Group,Config,Return,State).
+
+pre_end_per_group(Group,Config,State) ->
+    check_dirs(State,Config),
+    empty_cth:pre_end_per_group(Group,Config,State).
+
+post_end_per_group(Group,Config,Return,State) ->
+    check_dirs(State,Config),
+    empty_cth:post_end_per_group(Group,Config,Return,State).
+
+pre_init_per_testcase(TC,Config,State) ->
+    check_dirs(State,Config),
+    empty_cth:pre_init_per_testcase(TC,Config,State).
+
+post_init_per_testcase(TC,Config,Return,State) ->
+    check_dirs(State,Config),
+    empty_cth:post_init_per_testcase(TC,Config,Return,State).
+
+pre_end_per_testcase(TC,Config,State) ->
+    check_dirs(State,Config),
+    empty_cth:pre_end_per_testcase(TC,Config,State).
+
+post_end_per_testcase(TC,Config,Return,State) ->
+    check_dirs(State,Config),
+    empty_cth:post_end_per_testcase(TC,Config,Return,State).
+
+on_tc_fail(TC, Reason, State) ->
+    empty_cth:on_tc_fail(TC,Reason,State).
+
+on_tc_skip(TC, Reason, State) ->
+    empty_cth:on_tc_skip(TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_master_SUITE.erl b/lib/common_test/test/ct_master_SUITE.erl
index 15b49c67c0..55837352e2 100644
--- a/lib/common_test/test/ct_master_SUITE.erl
+++ b/lib/common_test/test/ct_master_SUITE.erl
@@ -135,7 +135,7 @@ make_spec(DataDir, FileName, NodeNames, Suites, Config) ->
 
     C = lists:map(
 	  fun(NodeName) ->
-		  Rnd = random:uniform(2),
+		  Rnd = rand:uniform(2),
 		  if Rnd == 1->
 			  {config,NodeName,filename:join(DataDir,
 							 "master/config.txt")};
diff --git a/lib/common_test/test/ct_misc_1_SUITE.erl b/lib/common_test/test/ct_misc_1_SUITE.erl
index 1db8bcc794..a562719296 100644
--- a/lib/common_test/test/ct_misc_1_SUITE.erl
+++ b/lib/common_test/test/ct_misc_1_SUITE.erl
@@ -31,7 +31,6 @@
 -compile(export_all).
 
 -include_lib("common_test/include/ct.hrl").
--include_lib("test_server/include/test_server_line.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
 -define(eh, ct_test_support_eh).
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
index ea49e36608..9d4c798795 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -99,7 +99,10 @@ all() ->
 	     connection_crash,
 	     get_event_streams,
 	     create_subscription,
-	     receive_event
+	     receive_one_event,
+	     receive_multiple_events,
+	     receive_event_and_rpc,
+	     receive_event_and_rpc_in_chunks
 	    ]
     end.
 
@@ -329,7 +332,8 @@ invalid_opt(Config) ->
     Opts1 = ?DEFAULT_SSH_OPTS(DataDir) ++ [{timeout,invalidvalue}],
     {error,{invalid_option,{timeout,invalidvalue}}} = ct_netconfc:open(Opts1),
     Opts2 = ?DEFAULT_SSH_OPTS(DataDir) ++ [{some_other_opt,true}],
-    {error,{invalid_option,{some_other_opt,true}}} = ct_netconfc:open(Opts2),
+    {error,{ssh,could_not_connect_to_server,{options,_}}} =
+	ct_netconfc:open(Opts2),
     ok.
 
 timeout_close_session(Config) ->
@@ -354,7 +358,7 @@ get(Config) ->
 get_a_lot(Config) ->
     DataDir = ?config(data_dir,Config),
     {ok,Client} = open_success(DataDir),
-    Descr = lists:append(lists:duplicate(100,"Description of myserver! ")),
+    Descr = lists:append(lists:duplicate(1000,"Description of myserver! ")),
     Server = {server,[{xmlns,"myns"}],[{name,[],["myserver"]},
 				       {description,[],[Descr]}]},
     Data = lists:duplicate(100,Server),
@@ -964,16 +968,16 @@ create_subscription(Config) ->
 
     ok.
 
-receive_event(Config) ->
+receive_one_event(Config) ->
     DataDir = ?config(data_dir,Config),
     {ok,Client} = open_success(DataDir),
     ?NS:expect_reply({'create-subscription',[stream]},ok),
     ?ok = ct_netconfc:create_subscription(Client),
 
-    ?NS:hupp(send_event),
+    ?NS:hupp({send_events,1}),
 
     receive
-	%% Matching ?NS:make_msg(event)
+	%% Matching ?NS:make_msg({event,_})
 	{notification,?NETCONF_NOTIF_NAMESPACE_ATTR,
 	 [{eventTime,[],[_Time]},
 	  {event,[{xmlns,"http://my.namespaces.com/event"}],
@@ -991,6 +995,187 @@ receive_event(Config) ->
 
     ok.
 
+receive_multiple_events(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream]},ok),
+    ?ok = ct_netconfc:create_subscription(Client),
+
+    ?NS:hupp({send_events,3}),
+
+    receive
+	%% Matching ?NS:make_msg({event,_})
+	{notification,_,_} ->
+	    ok;
+	Other1 ->
+	    ct:fail({got_unexpected_while_waiting_for_event, Other1})
+    after 3000 ->
+	    ct:fail(timeout_waiting_for_event)
+    end,
+    receive
+	%% Matching ?NS:make_msg({event,_})
+	{notification,_,_} ->
+	    ok;
+	Other2 ->
+	    ct:fail({got_unexpected_while_waiting_for_event, Other2})
+    after 3000 ->
+	    ct:fail(timeout_waiting_for_event)
+    end,
+    receive
+	%% Matching ?NS:make_msg({event,_})
+	{notification,_,_} ->
+	    ok;
+	Other3 ->
+	    ct:fail({got_unexpected_while_waiting_for_event, Other3})
+    after 3000 ->
+	    ct:fail(timeout_waiting_for_event)
+    end,
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+
+    ok.
+
+receive_event_and_rpc(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+
+    ?NS:expect_reply({'create-subscription',[stream]},ok),
+    ?ok = ct_netconfc:create_subscription(Client),
+
+    %% Construct the data to return from netconf server - one
+    %% rpc-reply and one notification - to be sent in the same ssh
+    %% package.
+    Data = [{servers,[{xmlns,"myns"}],[{server,[],[{name,[],["myserver"]}]}]}],
+    Rpc = {'rpc-reply',?NETCONF_NAMESPACE_ATTR ++ [{'message-id',"2"}],
+	   [{data,Data}]},
+    RpcXml = list_to_binary(xmerl:export_simple_element(Rpc,xmerl_xml)),
+
+    Notification =
+	{notification,?NETCONF_NOTIF_NAMESPACE_ATTR,
+	 [{eventTime,["2012-06-14T14:50:54+02:00"]},
+	  {event,[{xmlns,"http://my.namespaces.com/event"}],
+	   [{severity,["major"]},
+	    {description,["Something terrible happened"]}]}]},
+    NotifXml =
+	list_to_binary(xmerl:export_simple_element(Notification,xmerl_xml)),
+
+    ?NS:expect_reply('get',[RpcXml,NotifXml]),
+    {ok,Data} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}),
+
+    receive
+	{notification,_,_} ->
+	    ok;
+	Other1 ->
+	    ct:fail({got_unexpected_while_waiting_for_event, Other1})
+    after 3000 ->
+	    ct:fail(timeout_waiting_for_event)
+    end,
+
+
+    %% Then do the same again, but now send notification first then
+    %% the rpc-reply.
+    Rpc2 = {'rpc-reply',?NETCONF_NAMESPACE_ATTR ++ [{'message-id',"3"}],
+	   [{data,Data}]},
+    RpcXml2 = list_to_binary(xmerl:export_simple_element(Rpc2,xmerl_xml)),
+    ?NS:expect_reply('get',[NotifXml,RpcXml2]),
+    {ok,Data} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}),
+
+    receive
+	{notification,_,_} ->
+	    ok;
+	Other2 ->
+	    ct:fail({got_unexpected_while_waiting_for_event, Other2})
+    after 3000 ->
+	    ct:fail(timeout_waiting_for_event)
+    end,
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+
+    ok.
+
+
+receive_event_and_rpc_in_chunks(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+
+    ?NS:expect_reply({'create-subscription',[stream]},ok),
+    ?ok = ct_netconfc:create_subscription(Client),
+
+    %% Construct the data to return from netconf server
+    Data = [{servers,[{xmlns,"myns"}],
+	     [{server,[],[{name,[],["server0"]}]},
+	      {server,[],[{name,[],["server1"]}]},
+	      {server,[],[{name,[],["server2"]}]},
+	      {server,[],[{name,[],["server3"]}]},
+	      {server,[],[{name,[],["server4"]}]},
+	      {server,[],[{name,[],["server5"]}]},
+	      {server,[],[{name,[],["server6"]}]},
+	      {server,[],[{name,[],["server7"]}]},
+	      {server,[],[{name,[],["server8"]}]},
+	      {server,[],[{name,[],["server9"]}]}]
+	    }],
+    Rpc = {'rpc-reply',?NETCONF_NAMESPACE_ATTR ++ [{'message-id',"2"}],
+	   [{data,Data}]},
+    RpcXml = list_to_binary(xmerl:export_simple_element(Rpc,xmerl_xml)),
+
+    Notification =
+	{notification,?NETCONF_NOTIF_NAMESPACE_ATTR,
+	 [{eventTime,["2012-06-14T14:50:54+02:00"]},
+	  {event,[{xmlns,"http://my.namespaces.com/event"}],
+	   [{severity,["major"]},
+	    {description,["Something terrible happened"]}]}]},
+    NotifXml =
+	list_to_binary(xmerl:export_simple_element(Notification,xmerl_xml)),
+
+
+    %% First part contains a notif, but only parts of the end tag
+    Part1 =
+	<<"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
+	  NotifXml/binary,"\n]]">>,
+
+    %% Second part contains rest of end tag, full rpc-reply and full
+    %% notif except end tag
+    Part2 =
+	<<">]]>\n",RpcXml/binary,"\n",?END_TAG/binary,NotifXml/binary>>,
+
+    %% Third part contains last end tag
+    Part3 = <<"\n",?END_TAG/binary,"\n">>,
+
+    %% Spawn a process which will wait a bit for the client to send
+    %% the request (below), then order the server to the chunks of the
+    %% rpc-reply one by one.
+    spawn(fun() -> ct:sleep(500),?NS:hupp(send,Part1),
+		   ct:sleep(100),?NS:hupp(send,Part2),
+		   ct:sleep(100),?NS:hupp(send,Part3)
+	  end),
+
+    %% Order server to expect a get - then the process above will make
+    %% sure the rpc-reply is sent.
+    ?NS:expect('get'),
+    {ok,Data} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}),
+
+    receive
+	{notification,_,_} ->
+	    ok;
+	Other1 ->
+	    ct:fail({got_unexpected_while_waiting_for_event, Other1})
+    after 3000 ->
+	    ct:fail(timeout_waiting_for_event)
+    end,
+    receive
+	{notification,_,_} ->
+	    ok;
+	Other2 ->
+	    ct:fail({got_unexpected_while_waiting_for_event, Other2})
+    after 3000 ->
+	    ct:fail(timeout_waiting_for_event)
+    end,
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
 %%%-----------------------------------------------------------------
 
 break(_Config) ->
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
index 07893faabc..67827a053f 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
@@ -144,8 +144,8 @@ expect_do_reply(SessionId,Expect,Do,Reply) ->
 %% Hupp the server - i.e. tell it to do something -
 %% e.g. hupp(send_event) will cause send_event(State) to be called on
 %% the session channel process.
-hupp(send_event) ->
-    hupp(send,[make_msg(event)]);
+hupp({send_events,N}) ->
+    hupp(send,[make_msg({event,N})]);
 hupp(kill) ->
     hupp(1,fun hupp_kill/1,[]).
 
@@ -446,9 +446,12 @@ reply(ConnRef,Reply) ->
 from_simple(Simple) ->
     unicode_c2b(xmerl:export_simple_element(Simple,xmerl_xml)).
 
-xml(Content) ->
-    <<"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
-      Content/binary,"\n",?END_TAG/binary>>.
+xml(Content) when is_binary(Content) ->
+    xml([Content]);
+xml(Content) when is_list(Content) ->
+    Msgs = [<<Msg/binary,"\n",?END_TAG/binary>> || Msg <- Content],
+    MsgsBin = list_to_binary(Msgs),
+    <<"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", MsgsBin/binary>>.
 
 rpc_reply(Content) when is_binary(Content) ->
     MsgId = case erase(msg_id) of
@@ -571,15 +574,17 @@ make_msg({ok,Data}) ->
 make_msg({data,Data}) ->
     xml(rpc_reply(from_simple({data,Data})));
 
-make_msg(event) ->
-    xml(<<"<notification xmlns=\"",?NETCONF_NOTIF_NAMESPACE,"\">"
+make_msg({event,N}) ->
+    Notification = <<"<notification xmlns=\"",?NETCONF_NOTIF_NAMESPACE,"\">"
 	  "<eventTime>2012-06-14T14:50:54+02:00</eventTime>"
 	  "<event xmlns=\"http://my.namespaces.com/event\">"
 	  "<severity>major</severity>"
 	  "<description>Something terrible happened</description>"
 	  "</event>"
-	  "</notification>">>);
-make_msg(Xml) when is_binary(Xml) ->
+	  "</notification>">>,
+    xml(lists:duplicate(N,Notification));
+make_msg(Xml) when is_binary(Xml) orelse
+		   (is_list(Xml) andalso is_binary(hd(Xml))) ->
     xml(Xml);
 make_msg(Simple) when is_tuple(Simple) ->
     xml(from_simple(Simple)).
diff --git a/lib/common_test/test/ct_release_test_SUITE.erl b/lib/common_test/test/ct_release_test_SUITE.erl
new file mode 100644
index 0000000000..66d07155ac
--- /dev/null
+++ b/lib/common_test/test/ct_release_test_SUITE.erl
@@ -0,0 +1,190 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2014. 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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_release_test_SUITE
+%%%
+%%% Description:
+%%% Test ct_release_test module
+%%%
+%%%-------------------------------------------------------------------
+-module(ct_release_test_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+-define(suite, release_test_SUITE).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    case os:type() of
+	{win32,_} ->
+	    {skipped, "Upgrade tests do currently not work on windows"};
+	_ ->
+	    ct_test_support:init_per_suite(Config)
+    end.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [
+     minor,
+     major,
+     major_fail_init,
+     major_fail_upgraded,
+     major_fail_downgraded,
+     major_fail_no_init
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+minor(Config) when is_list(Config) ->
+    {Suite,Cfg} = setup1(Config),
+    {Opts,ERPid} = setup([{suite,Suite},
+			  {testcase,minor},
+			  {label,minor}|Cfg], Config),
+    execute(minor, Opts, ERPid, Config).
+
+major(Config) when is_list(Config) ->
+    {Suite,Cfg} = setup1(Config),
+    {Opts,ERPid} = setup([{suite,Suite},
+			  {testcase,major},
+			  {label,major}|Cfg], Config),
+    execute(major, Opts, ERPid, Config).
+
+major_fail_init(Config) when is_list(Config) ->
+    {Suite,Cfg} = setup1(Config),
+    {Opts,ERPid} = setup([{suite,Suite},
+			  {testcase,major_fail_init},
+			  {label,major_fail_init}|Cfg], Config),
+    execute(major_fail_init, Opts, ERPid, Config).
+
+major_fail_upgraded(Config) when is_list(Config) ->
+    {Suite,Cfg} = setup1(Config),
+    {Opts,ERPid} = setup([{suite,Suite},
+			  {testcase,major_fail_upgraded},
+			  {label,major_fail_upgraded}|Cfg], Config),
+    execute(major_fail_upgraded, Opts, ERPid, Config).
+
+major_fail_downgraded(Config) when is_list(Config) ->
+    {Suite,Cfg} = setup1(Config),
+    {Opts,ERPid} = setup([{suite,Suite},
+			  {testcase,major_fail_downgraded},
+			  {label,major_fail_downgraded}|Cfg], Config),
+    execute(major_fail_downgraded, Opts, ERPid, Config).
+
+major_fail_no_init(Config) when is_list(Config) ->
+    {Suite,Cfg} = setup1(Config),
+    {Opts,ERPid} = setup([{suite,Suite},
+			  {testcase,major_fail_no_init},
+			  {label,major_fail_no_init}|Cfg], Config),
+    execute(major_fail_no_init, Opts, ERPid, Config).
+
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+setup1(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, atom_to_list(?suite)),
+    Cfg = case ct:get_config(otp_releases) of
+	      undefined ->
+		  [];
+	      Rels ->
+		  CfgFile = filename:join(DataDir, "release_test.cfg"),
+		  file:write_file(CfgFile,
+				  io_lib:format("{otp_releases,~p}.",[Rels])),
+		  [{config,CfgFile}]
+	  end,
+    {Suite,Cfg}.
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+execute(Name, Opts, ERPid, Config) ->
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(Name,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    verify_events(Name,Events,Config).
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+verify_events(TC,Events,Config) ->
+    Ok = expected_events(TC,ok),
+    case ct_test_support:verify_events(Ok, Events, Config) of
+	ok ->
+	    ok;
+	{event_not_found,{?eh,tc_done,{_Suite,TC,ok}}}=R1 ->
+	    ct:log("Did not find 'ok', checking if skipped...",[]),
+	    Skipped = expected_events(TC,{skipped,"Old release not available"}),
+	    case ct_test_support:verify_events(Skipped, Events, Config) of
+		ok ->
+		    {skipped,"Old release not available"};
+		R2 ->
+		    ct:log("Did not find skipped case either: ~n~p",[R2]),
+		    exit(R1)
+	    end
+    end.
+
+expected_events(TC,Result) ->
+    OneTest =
+	[{?eh,start_logging,{'DEF','RUNDIR'}},
+	 {?eh,tc_done,{?suite,TC,Result}},
+	 {?eh,stop_logging,[]}],
+    %% 2 tests (ct:run_test + script_start) is default
+    OneTest ++ OneTest.
diff --git a/lib/common_test/test/ct_release_test_SUITE_data/release_test_SUITE.erl b/lib/common_test/test/ct_release_test_SUITE_data/release_test_SUITE.erl
new file mode 100644
index 0000000000..04c92be0d1
--- /dev/null
+++ b/lib/common_test/test/ct_release_test_SUITE_data/release_test_SUITE.erl
@@ -0,0 +1,118 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-2015. 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: Test the support for application upgrade/code_change test
+%%%-----------------------------------------------------------------
+-module(release_test_SUITE).
+-include_lib("common_test/include/ct.hrl").
+
+-compile(export_all).
+
+-define(APP,runtime_tools). % "randomly" selected 'application under test'
+
+%%
+%% all/1
+%%
+all() ->
+    [minor,
+     major,
+     major_fail_init,
+     major_fail_upgraded,
+     major_fail_downgraded,
+     major_fail_no_init].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(major_fail_no_init, Config) ->
+    Config;
+init_per_testcase(_Case, Config) ->
+    ct_release_test:init(Config).
+end_per_testcase(_Case, Config) ->
+    ct_release_test:cleanup(Config).
+
+%%%-----------------------------------------------------------------
+%%% Test cases
+minor(Config) ->
+    ct_release_test:upgrade(?APP,minor,{?MODULE,[]},Config).
+
+major(Config) ->
+    ct_release_test:upgrade(?APP,major,{?MODULE,[]},Config).
+
+major_fail_init(Config) ->
+    try ct_release_test:upgrade(?APP,major,{?MODULE,fail_init},Config)
+    catch exit:{test_case_failed,
+		{test_upgrade_callback,_Mod,_Func,_Args,
+		 {'EXIT',{test_case_failed,upgrade_init_failed}}}} ->
+	    ok
+    end.
+
+major_fail_upgraded(Config) ->
+    try ct_release_test:upgrade(?APP,major,{?MODULE,fail_upgraded},Config)
+    catch exit:{test_case_failed,
+		{test_upgrade_callback,_Mod,_Func,_Args,
+		 {'EXIT',{test_case_failed,upgrade_upgraded_failed}}}} ->
+	    ok
+    end.
+
+major_fail_downgraded(Config) ->
+    try ct_release_test:upgrade(?APP,major,{?MODULE,fail_downgraded},Config)
+    catch exit:{test_case_failed,
+		{test_upgrade_callback,_Mod,_Func,_Args,
+		 {'EXIT',{test_case_failed,upgrade_downgraded_failed}}}} ->
+	    ok
+    end.
+
+major_fail_no_init(Config) ->
+    try ct_release_test:upgrade(?APP,major,[],Config)
+    catch exit:{test_case_failed,"ct_release_test:init/1 not run"} ->
+	    ok
+    end.
+
+%%%-----------------------------------------------------------------
+%%% ct_release_test callbacks
+
+%% Version numbers are checked by ct_release_test, so there is nothing
+%% more to check here...
+upgrade_init(CtData,fail_init) ->
+    ct:fail(upgrade_init_failed);
+upgrade_init(CtData,State) ->
+    {ok,{FromVsn,ToVsn}} = ct_release_test:get_app_vsns(CtData,?APP),
+    case ct_release_test:get_appup(CtData,?APP) of
+	{ok,{FromVsn,ToVsn,UpInstrs,DownInstrs}} ->
+	    io:format("Upgrade/downgrade ~p: ~p <--> ~p~n"
+		      "Upgrade instructions:   ~p~n"
+		      "Downgrade instructions: ~p",
+		      [?APP,FromVsn,ToVsn,UpInstrs,DownInstrs]);
+	{error,{vsn_not_found,_}} when FromVsn==ToVsn ->
+	    io:format("No upgrade test for ~p, same version",[?APP])
+    end,
+    State.
+upgrade_upgraded(CtData,fail_upgraded) ->
+    ct:fail(upgrade_upgraded_failed);
+upgrade_upgraded(_CtData,State) ->
+    State.
+upgrade_downgraded(CtData,fail_downgraded) ->
+    ct:fail(upgrade_downgraded_failed);
+upgrade_downgraded(_CtData,State) ->
+    State.
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 248ec6c4df..0ee83f45b8 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -414,14 +414,14 @@ ct_rpc({M,F,A}, Config) ->
 %%%-----------------------------------------------------------------
 %%% random_error/1
 random_error(Config) when is_list(Config) ->
-    random:seed(os:timestamp()),
+    rand:seed(exsplus),
     Gen = fun(0,_) -> ok; (N,Fun) -> Fun(N-1, Fun) end,
-    Gen(random:uniform(100), Gen),
+    Gen(rand:uniform(100), Gen),
 
     ErrorTypes = ['BADMATCH','BADARG','CASE_CLAUSE','FUNCTION_CLAUSE',
 		  'EXIT','THROW','UNDEF'],
-    Type = lists:nth(random:uniform(length(ErrorTypes)), ErrorTypes),
-    Where = case random:uniform(2) of
+    Type = lists:nth(rand:uniform(length(ErrorTypes)), ErrorTypes),
+    Where = case rand:uniform(2) of
 		1 ->
 		    io:format("ct_test_support *returning* error of type ~w",
 			      [Type]),
@@ -1228,8 +1228,8 @@ log_events(TC, Events, EvLogDir, Opts) ->
     file:close(Dev),
     FullLogFile = join_abs_dirs(proplists:get_value(net_dir, Opts),
 				LogFile),
-    io:format("Events written to logfile: <a href=\"file://~s\">~s</a>~n",
-	      [FullLogFile,FullLogFile]),
+    ct:log("Events written to logfile: <a href=\"file://~s\">~s</a>~n",
+	   [FullLogFile,FullLogFile],[no_css]),
     io:format(user, "Events written to logfile: ~p~n", [LogFile]).
 
 log_events1(Evs, Dev, "") ->
diff --git a/lib/common_test/test/ct_test_support_eh.erl b/lib/common_test/test/ct_test_support_eh.erl
index 7c3d137901..f3d933da04 100644
--- a/lib/common_test/test/ct_test_support_eh.erl
+++ b/lib/common_test/test/ct_test_support_eh.erl
@@ -27,7 +27,7 @@
 
 -behaviour(gen_event).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("common_test/include/ct_event.hrl").
 
 %% gen_event callbacks
diff --git a/lib/test_server/test/erl2html2_SUITE.erl b/lib/common_test/test/erl2html2_SUITE.erl
index 9e6389109b..8e9f6e773a 100644
--- a/lib/test_server/test/erl2html2_SUITE.erl
+++ b/lib/common_test/test/erl2html2_SUITE.erl
@@ -31,7 +31,7 @@
 	 "<html>\n",
 	 "<head><title>Module ", Src, "</title>\n",
 	 "<meta http-equiv=\"cache-control\" ",
-	 "content=\"no-cache\">\n",
+	 "content=\"no-cache\"></meta>\n",
 	 "</head>\n",
 	 "<body bgcolor=\"white\" text=\"black\" ",
 	 "link=\"blue\" vlink=\"purple\" alink=\"red\">\n"]).
diff --git a/lib/test_server/test/erl2html2_SUITE_data/Makefile.src b/lib/common_test/test/erl2html2_SUITE_data/Makefile.src
index 942ac0584b..942ac0584b 100644
--- a/lib/test_server/test/erl2html2_SUITE_data/Makefile.src
+++ b/lib/common_test/test/erl2html2_SUITE_data/Makefile.src
diff --git a/lib/test_server/test/erl2html2_SUITE_data/header1.hrl b/lib/common_test/test/erl2html2_SUITE_data/header1.hrl
index 53d1b79ac5..53d1b79ac5 100644
--- a/lib/test_server/test/erl2html2_SUITE_data/header1.hrl
+++ b/lib/common_test/test/erl2html2_SUITE_data/header1.hrl
diff --git a/lib/test_server/test/erl2html2_SUITE_data/include/header2.hrl b/lib/common_test/test/erl2html2_SUITE_data/include/header2.hrl
index e69de29bb2..e69de29bb2 100644
--- a/lib/test_server/test/erl2html2_SUITE_data/include/header2.hrl
+++ b/lib/common_test/test/erl2html2_SUITE_data/include/header2.hrl
diff --git a/lib/test_server/test/erl2html2_SUITE_data/include/header3.hrl b/lib/common_test/test/erl2html2_SUITE_data/include/header3.hrl
index 2a20850a3a..2a20850a3a 100644
--- a/lib/test_server/test/erl2html2_SUITE_data/include/header3.hrl
+++ b/lib/common_test/test/erl2html2_SUITE_data/include/header3.hrl
diff --git a/lib/test_server/test/erl2html2_SUITE_data/m1.erl b/lib/common_test/test/erl2html2_SUITE_data/m1.erl
index 1d405963a5..1d405963a5 100644
--- a/lib/test_server/test/erl2html2_SUITE_data/m1.erl
+++ b/lib/common_test/test/erl2html2_SUITE_data/m1.erl
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/common_test/test/test_server_SUITE.erl
index 6adf5b8a78..d1c789f34c 100644
--- a/lib/test_server/test/test_server_SUITE.erl
+++ b/lib/common_test/test/test_server_SUITE.erl
@@ -330,7 +330,7 @@ generate_and_run_unicode_test(Config0,Encoding) ->
 
     %% Compile the suite
     Node = proplists:get_value(node,Config),
-    {ok,Mod} = rpc:call(Node,compile,file,[Suite,[{outdir,DataDir}]]),
+    {ok,Mod} = rpc:call(Node,compile,file,[Suite,[report,{outdir,DataDir}]]),
     ModStr = atom_to_list(Mod),
 
     %% Clean logdir
@@ -383,7 +383,7 @@ create_unicode_test_suite(Dir,Encoding) ->
 	 "-export([init_per_testcase/2, end_per_testcase/2]).\n"
 	 "-export([tc_äöå/1]).\n"
 	 "\n"
-	 "-include_lib(\"test_server/include/test_server.hrl\").\n"
+	 "-include_lib(\"common_test/include/ct.hrl\").\n"
 	 "\n"
 	 "all(suite) ->\n"
 	 "    [tc_äöå].\n"
diff --git a/lib/test_server/test/test_server_SUITE_data/Makefile.src b/lib/common_test/test/test_server_SUITE_data/Makefile.src
index 5aeb035572..5aeb035572 100644
--- a/lib/test_server/test/test_server_SUITE_data/Makefile.src
+++ b/lib/common_test/test/test_server_SUITE_data/Makefile.src
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl b/lib/common_test/test/test_server_SUITE_data/test_server_SUITE.erl
index 79d8defb22..c3d4315cb8 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_SUITE.erl
+++ b/lib/common_test/test/test_server_SUITE_data/test_server_SUITE.erl
@@ -22,8 +22,7 @@
 %%% Test Server self test. 
 %%%------------------------------------------------------------------
 -module(test_server_SUITE).
--include_lib("test_server/include/test_server.hrl").
--include_lib("test_server/include/test_server_line.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 -export([all/1]).
 
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_SUITE_data/dummy_file b/lib/common_test/test/test_server_SUITE_data/test_server_SUITE_data/dummy_file
index 65c88fbd75..65c88fbd75 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_SUITE_data/dummy_file
+++ b/lib/common_test/test/test_server_SUITE_data/test_server_SUITE_data/dummy_file
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl b/lib/common_test/test/test_server_SUITE_data/test_server_break_SUITE.erl
index ae9f018bc8..171f83df0f 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
+++ b/lib/common_test/test/test_server_SUITE_data/test_server_break_SUITE.erl
@@ -28,7 +28,7 @@
 	 break_in_end_tc_after_abort/1,
 	 check_all_breaks/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 all(suite) ->
     [break_in_init_tc,
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_conf01_SUITE.erl b/lib/common_test/test/test_server_SUITE_data/test_server_conf01_SUITE.erl
index f634bc3a46..e4f40f6c03 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_conf01_SUITE.erl
+++ b/lib/common_test/test/test_server_SUITE_data/test_server_conf01_SUITE.erl
@@ -22,7 +22,7 @@
 %%% Test Server self test. 
 %%%------------------------------------------------------------------
 -module(test_server_conf01_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -compile(export_all).
 
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_conf02_SUITE.erl b/lib/common_test/test/test_server_SUITE_data/test_server_conf02_SUITE.erl
index f9cca8653b..1c6fe6dd0b 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_conf02_SUITE.erl
+++ b/lib/common_test/test/test_server_SUITE_data/test_server_conf02_SUITE.erl
@@ -22,7 +22,7 @@
 %%% Test Server self test. 
 %%%------------------------------------------------------------------
 -module(test_server_conf02_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -compile(export_all).
 
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE.erl b/lib/common_test/test/test_server_SUITE_data/test_server_cover_SUITE.erl
index ab5ccec7a2..3371418980 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE.erl
+++ b/lib/common_test/test/test_server_SUITE_data/test_server_cover_SUITE.erl
@@ -23,7 +23,7 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 -export([tc1/1, tc2/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 all(suite) ->
     [tc1,tc2].
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE_data/cover_helper.erl b/lib/common_test/test/test_server_SUITE_data/test_server_cover_SUITE_data/cover_helper.erl
index 6c74eb4e8a..6c74eb4e8a 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE_data/cover_helper.erl
+++ b/lib/common_test/test/test_server_SUITE_data/test_server_cover_SUITE_data/cover_helper.erl
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_parallel01_SUITE.erl b/lib/common_test/test/test_server_SUITE_data/test_server_parallel01_SUITE.erl
index 0385435710..ad639b585d 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_parallel01_SUITE.erl
+++ b/lib/common_test/test/test_server_SUITE_data/test_server_parallel01_SUITE.erl
@@ -22,7 +22,7 @@
 %%% Test Server self test. 
 %%%------------------------------------------------------------------
 -module(test_server_parallel01_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -compile(export_all).
 
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_shuffle01_SUITE.erl b/lib/common_test/test/test_server_SUITE_data/test_server_shuffle01_SUITE.erl
index 847c7b6bdd..0f7118a810 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_shuffle01_SUITE.erl
+++ b/lib/common_test/test/test_server_SUITE_data/test_server_shuffle01_SUITE.erl
@@ -22,7 +22,7 @@
 %%% Test Server self test. 
 %%%------------------------------------------------------------------
 -module(test_server_shuffle01_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -compile(export_all).
 
@@ -224,7 +224,7 @@ conf5_end(_Config) ->
     ok.
 
 conf6_init(Config) when is_list(Config) ->
-    [{shuffle,{_,_,_}}] = ?config(tc_group_properties,Config),
+    validate_shuffle(Config),
     test_server:comment("Shuffle (random)"),
     init = ?config(suite,Config),
     [{cc6,conf6}|Config].
@@ -242,23 +242,28 @@ conf5(suite) ->					% test specification
 
 conf7_init(Config) when is_list(Config) ->
     test_server:comment("Group 7, Shuffle (random seed)"),
-    case proplists:get_value(shuffle,?config(tc_group_properties,Config)) of
-	{_,_,_} -> ok
-    end,
+    validate_shuffle(Config),
     [{cc7,conf7}|Config].
 conf7_end(_Config) ->
     ok.
 
 conf8_init(Config) when is_list(Config) ->
     test_server:comment("Group 8, Shuffle (user start seed)"),
-    case proplists:get_value(shuffle,?config(tc_group_properties,Config)) of
-	{_,_,_} -> ok
-    end,
+    validate_shuffle(Config),
     init = ?config(suite,Config),
     [{cc8,conf8}|Config].
 conf8_end(_Config) ->
     ok.
 
+validate_shuffle(Config) ->
+    case proplists:get_value(shuffle, ?config(tc_group_properties,Config)) of
+	{_,_,_} ->
+	    ok;
+	Seed ->
+	    %% Must be a valid seed.
+	    _ = rand:seed_s(rand:export_seed_s(Seed))
+    end.
+
 
 %%---------- test cases ----------
 
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_skip_SUITE.erl b/lib/common_test/test/test_server_SUITE_data/test_server_skip_SUITE.erl
index 871bd21ee7..ae2321c6ad 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_skip_SUITE.erl
+++ b/lib/common_test/test/test_server_SUITE_data/test_server_skip_SUITE.erl
@@ -22,8 +22,7 @@
 -export([all/1, init_per_suite/1, end_per_suite/1]).
 -export([dummy/1]).
 
--include_lib("test_server/include/test_server.hrl").
--include_lib("test_server/include/test_server_line.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 all(suite) ->
     [dummy].
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_unicode_SUITE.erl b/lib/common_test/test/test_server_SUITE_data/test_server_unicode_SUITE.erl
index 3a3366218b..0cabce995f 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_unicode_SUITE.erl
+++ b/lib/common_test/test/test_server_SUITE_data/test_server_unicode_SUITE.erl
@@ -25,7 +25,7 @@
 	 print_and_log_unicode/1,
 	 print_and_log_latin1/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 all(suite) ->
     ['#=@: difficult_case_name_äöå',
diff --git a/lib/test_server/test/test_server_test_lib.erl b/lib/common_test/test/test_server_test_lib.erl
index e2680938e0..e2680938e0 100644
--- a/lib/test_server/test/test_server_test_lib.erl
+++ b/lib/common_test/test/test_server_test_lib.erl
diff --git a/lib/test_server/test/test_server_test_lib.hrl b/lib/common_test/test/test_server_test_lib.hrl
index 27b7be9618..27b7be9618 100644
--- a/lib/test_server/test/test_server_test_lib.hrl
+++ b/lib/common_test/test/test_server_test_lib.hrl
diff --git a/lib/webtool/src/Makefile b/lib/common_test/test_server/Makefile
index a5a8eaf5dc..0adf64b837 100644
--- a/lib/webtool/src/Makefile
+++ b/lib/common_test/test_server/Makefile
@@ -1,8 +1,8 @@
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2001-2012. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 1996-2013. 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
@@ -14,85 +14,83 @@
 # 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%
 #
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(WEBTOOL_VSN)
+include $(ERL_TOP)/make/target.mk
 
 # ----------------------------------------------------
-# Release directory specification
+# Configuration info.
 # ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/webtool-$(VSN)
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
 
-MODULES= webtool \
-	webtool_sup 
-
-
-
-ERL_FILES= $(MODULES:%=%.erl)
+EBIN=.
 
-TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+TS_MODULES= \
+	ts \
+	ts_run \
+	ts_lib \
+	ts_make \
+	ts_erl_config \
+	ts_autoconf_win32 \
+	ts_install \
+	ts_install_cth \
+	ts_benchmark
 
-APP_FILE= webtool.app
-APPUP_FILE= webtool.appup
+TARGET_MODULES= $(MODULES:%=$(EBIN)/%)
+TS_TARGET_MODULES= $(TS_MODULES:%=$(EBIN)/%)
 
-APP_SRC= $(APP_FILE).src
-APPUP_SRC= $(APPUP_FILE).src
+TS_ERL_FILES = $(TS_MODULES:=.erl)
+TS_HRL_FILES = ts.hrl
+AUTOCONF_FILES = configure.in conf_vars.in
+PROGRAMS = configure config.sub config.guess install-sh 
+CONFIG = ts.config ts.unix.config ts.win32.config
 
+TS_TARGET_FILES = $(TS_MODULES:%=$(EBIN)/%.$(EMULATOR))
 
-APP_TARGET= $(EBIN)/$(APP_FILE)
-APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
+TS_TARGETS = $(TS_MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS += +warn_obsolete_guard
-
+ERL_COMPILE_FLAGS += -I../include -Werror
 
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
+tests debug opt: $(TS_TARGETS)
 
 clean:
-	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
+	rm -f $(TS_TARGET_FILES)
 	rm -f core
 
 docs:
 
+configure: configure.in
+	autoconf configure.in > configure
+
 # ----------------------------------------------------
 # Special Build Targets
 # ----------------------------------------------------
 
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
-		"$(RELSYSDIR)/ebin"
+release_tests_spec: opt
+	$(INSTALL_DIR) "$(RELEASE_PATH)/test_server"
+	$(INSTALL_DATA) $(TS_ERL_FILES) $(TS_HRL_FILES) \
+		$(TS_TARGET_FILES) \
+		$(AUTOCONF_FILES) $(CONFIG) \
+		"$(RELEASE_PATH)/test_server"
+	$(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server"
 
 release_docs_spec:
 
diff --git a/lib/test_server/src/conf_vars.in b/lib/common_test/test_server/conf_vars.in
index 7c55d7b9ed..7c55d7b9ed 100644
--- a/lib/test_server/src/conf_vars.in
+++ b/lib/common_test/test_server/conf_vars.in
diff --git a/lib/test_server/src/configure.in b/lib/common_test/test_server/configure.in
index 001de72a1e..001de72a1e 100644
--- a/lib/test_server/src/configure.in
+++ b/lib/common_test/test_server/configure.in
diff --git a/lib/test_server/src/cross.cover b/lib/common_test/test_server/cross.cover
index 07bf0bed5c..07bf0bed5c 100644
--- a/lib/test_server/src/cross.cover
+++ b/lib/common_test/test_server/cross.cover
diff --git a/lib/test_server/src/ts.config b/lib/common_test/test_server/ts.config
index cf3d269616..cf3d269616 100644
--- a/lib/test_server/src/ts.config
+++ b/lib/common_test/test_server/ts.config
diff --git a/lib/test_server/src/ts.erl b/lib/common_test/test_server/ts.erl
index 8bbdc8f8cf..8bbdc8f8cf 100644
--- a/lib/test_server/src/ts.erl
+++ b/lib/common_test/test_server/ts.erl
diff --git a/lib/test_server/src/ts.hrl b/lib/common_test/test_server/ts.hrl
index 4c940fdc4f..4c940fdc4f 100644
--- a/lib/test_server/src/ts.hrl
+++ b/lib/common_test/test_server/ts.hrl
diff --git a/lib/test_server/src/ts.unix.config b/lib/common_test/test_server/ts.unix.config
index 1ba5d9033e..1ba5d9033e 100644
--- a/lib/test_server/src/ts.unix.config
+++ b/lib/common_test/test_server/ts.unix.config
diff --git a/lib/test_server/src/ts.win32.config b/lib/common_test/test_server/ts.win32.config
index cae587bea8..cae587bea8 100644
--- a/lib/test_server/src/ts.win32.config
+++ b/lib/common_test/test_server/ts.win32.config
diff --git a/lib/test_server/src/ts_autoconf_win32.erl b/lib/common_test/test_server/ts_autoconf_win32.erl
index 288305b406..26ab30f987 100644
--- a/lib/test_server/src/ts_autoconf_win32.erl
+++ b/lib/common_test/test_server/ts_autoconf_win32.erl
@@ -139,15 +139,15 @@ visual_cxx(Vars) ->
 			{"-MTd ",
 			 "-MDd ",
 			 "-LDd ",
-			 "-debug -pdb:none ",
+			 "-link -debug -pdb:none ",
 			 "-Z7 -DDEBUG",
 			 " "};
 		    false ->
 			{"-MT ",
 			 "-MD ",
 			 "-LD ",
-			 " ",
-			 " ",
+			 "-Zi -link ",
+			 "-Zi ",
 			 "-Ox "}
 		end,
 	    WIN32 = "-D__WIN32__ ",
@@ -158,7 +158,7 @@ visual_cxx(Vars) ->
 			  {'LD', CC},
 			  {'SHLIB_LD', CC},
 			  {'SHLIB_LDFLAGS', ERTS_THR_LIB ++ DLL},
-			  {'SHLIB_LDLIBS', "-link " ++ DBG_LINK ++ "kernel32.lib"},
+			  {'SHLIB_LDLIBS', DBG_LINK ++ "kernel32.lib"},
 			  {'SHLIB_EXTRACT_ALL', ""},
 			  {'CFLAGS', DEFAULT_THR_LIB ++ WIN32 ++ DBG_COMP},
 			  {'EI_CFLAGS', DEFAULT_THR_LIB ++ WIN32 ++ DBG_COMP},
@@ -168,7 +168,7 @@ visual_cxx(Vars) ->
 			  {'DEFS', common_c_defs()},
 			  {'SHLIB_SUFFIX', ".dll"},
 			  {'ERTS_LIBS', ERTS_THR_LIB ++ LIBS},
-			  {'LIBS', DEFAULT_THR_LIB ++ "-link " ++ DBG_LINK ++ LIBS},
+			  {'LIBS', DEFAULT_THR_LIB ++ DBG_LINK ++ LIBS},
 			  {obj,".obj"},
 			  {exe, ".exe"},
 			  {test_c_compiler, "{msc, undefined}"}
diff --git a/lib/test_server/src/ts_benchmark.erl b/lib/common_test/test_server/ts_benchmark.erl
index 3e55edefb0..3e55edefb0 100644
--- a/lib/test_server/src/ts_benchmark.erl
+++ b/lib/common_test/test_server/ts_benchmark.erl
diff --git a/lib/test_server/src/ts_erl_config.erl b/lib/common_test/test_server/ts_erl_config.erl
index ab7363c106..ab7363c106 100644
--- a/lib/test_server/src/ts_erl_config.erl
+++ b/lib/common_test/test_server/ts_erl_config.erl
diff --git a/lib/test_server/src/ts_install.erl b/lib/common_test/test_server/ts_install.erl
index 600a576820..600a576820 100644
--- a/lib/test_server/src/ts_install.erl
+++ b/lib/common_test/test_server/ts_install.erl
diff --git a/lib/test_server/src/ts_install_cth.erl b/lib/common_test/test_server/ts_install_cth.erl
index ec0d54ccde..0462e62611 100644
--- a/lib/test_server/src/ts_install_cth.erl
+++ b/lib/common_test/test_server/ts_install_cth.erl
@@ -41,6 +41,8 @@
 -export([post_end_per_group/4]).
 
 -export([pre_init_per_testcase/3]).
+-export([post_init_per_testcase/4]).
+-export([pre_end_per_testcase/3]).
 -export([post_end_per_testcase/4]).
 
 -export([on_tc_fail/3]).
@@ -181,7 +183,22 @@ post_end_per_group(_Group,_Config,Return,State) ->
 pre_init_per_testcase(_TC,Config,State) ->
     {add_node_name(Config, State), State}.
 
+-spec post_init_per_testcase(TC :: atom(),
+			    Config :: config(),
+			    Return :: term(),
+			    State :: #state{}) ->
+	{ok | skip_or_fail(), NewState :: #state{}}.
+post_init_per_testcase(_TC,_Config,Return,State) ->
+    {Return, State}.
+
 %% @doc Called after each test case. 
+-spec pre_end_per_testcase(TC :: atom(),
+			   Config :: config(),
+			   State :: #state{}) ->
+	{config() | skip_or_fail(), NewState :: #state{}}.
+pre_end_per_testcase(_TC,Config,State) ->
+    {Config, State}.
+
 -spec post_end_per_testcase(TC :: atom(),
 			    Config :: config(),
 			    Return :: term(),
diff --git a/lib/test_server/src/ts_lib.erl b/lib/common_test/test_server/ts_lib.erl
index 7c3f450194..7c3f450194 100644
--- a/lib/test_server/src/ts_lib.erl
+++ b/lib/common_test/test_server/ts_lib.erl
diff --git a/lib/test_server/src/ts_make.erl b/lib/common_test/test_server/ts_make.erl
index 0178f4d836..921edb264a 100644
--- a/lib/test_server/src/ts_make.erl
+++ b/lib/common_test/test_server/ts_make.erl
@@ -21,7 +21,7 @@
 
 -export([make/1,make/3,unmake/1]).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Functions to be called from make test cases.
 
diff --git a/lib/test_server/src/ts_run.erl b/lib/common_test/test_server/ts_run.erl
index 188094921d..188094921d 100644
--- a/lib/test_server/src/ts_run.erl
+++ b/lib/common_test/test_server/ts_run.erl
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index f33b705dcb..bcd31293fb 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.11.1
+COMMON_TEST_VSN = 1.12
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 3c06e4f98e..8ed71db54a 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,6 +32,55 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 6.0.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    An complicated guard expression in a function call could
+	    crash the compiler. (Thanks to Thomas Arts for reporting
+	    this bug.)</p>
+          <p>
+	    Own Id: OTP-13208</p>
+        </item>
+        <item>
+	    <p>Constructing a map in a guard in a catch could crash
+	    the compiler. (Thanks to Thomas Arts for reporting this
+	    bug.)</p>
+          <p>
+	    Own Id: OTP-13223</p>
+        </item>
+        <item>
+	    <p>Updating a fun as if it were a map would cause the
+	    compiler to crash. (Thanks to Thomas Arts for reporting
+	    this bug.)</p>
+          <p>
+	    Own Id: OTP-13231</p>
+        </item>
+        <item>
+          <p>
+	    Fix pretty printing of Core Maps</p>
+          <p>
+	    Literal maps could cause Dialyzer to crash when pretty
+	    printing the results.</p>
+          <p>
+	    Own Id: OTP-13238</p>
+        </item>
+        <item>
+          <p>
+	    A complex combination of bit syntax matching operations
+	    would cause an internal consistency check failure during
+	    compilation. (Thanks to Jose Valim for reporting this
+	    bug.)</p>
+          <p>
+	    Own Id: OTP-13309</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 6.0.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
index 299b2892fc..f75beaba20 100644
--- a/lib/compiler/src/Makefile
+++ b/lib/compiler/src/Makefile
@@ -50,6 +50,7 @@ MODULES =  \
 	beam_asm \
 	beam_block \
 	beam_bool \
+	beam_bs \
 	beam_bsm \
 	beam_clean \
 	beam_dead \
@@ -62,6 +63,7 @@ MODULES =  \
 	beam_opcodes \
 	beam_peep \
 	beam_receive \
+	beam_reorder \
 	beam_split \
 	beam_trim \
 	beam_type \
diff --git a/lib/compiler/src/beam_asm.erl b/lib/compiler/src/beam_asm.erl
index a3201b0f4a..28fd061bdc 100644
--- a/lib/compiler/src/beam_asm.erl
+++ b/lib/compiler/src/beam_asm.erl
@@ -30,11 +30,12 @@
 module(Code, Abst, SourceFile, Opts) ->
     {ok,assemble(Code, Abst, SourceFile, Opts)}.
 
-assemble({Mod,Exp,Attr0,Asm0,NumLabels}, Abst, SourceFile, Opts) ->
+assemble({Mod,Exp0,Attr0,Asm0,NumLabels}, Abst, SourceFile, Opts) ->
     {1,Dict0} = beam_dict:atom(Mod, beam_dict:new()),
     {0,Dict1} = beam_dict:fname(atom_to_list(Mod) ++ ".erl", Dict0),
     NumFuncs = length(Asm0),
     {Asm,Attr} = on_load(Asm0, Attr0),
+    Exp = cerl_sets:from_list(Exp0),
     {Code,Dict2} = assemble_1(Asm, Exp, Dict1, []),
     build_file(Code, Attr, Dict2, NumLabels, NumFuncs, Abst, SourceFile, Opts).
 
@@ -61,7 +62,7 @@ insert_on_load_instruction(Is0, Entry) ->
     Bef ++ [El,on_load|Is].
 
 assemble_1([{function,Name,Arity,Entry,Asm}|T], Exp, Dict0, Acc) ->
-    Dict1 = case member({Name,Arity}, Exp) of
+    Dict1 = case cerl_sets:is_element({Name,Arity}, Exp) of
 		true ->
 		    beam_dict:export(Name, Arity, Entry, Dict0);
 		false ->
@@ -224,10 +225,14 @@ flatten_imports(Imps) ->
     list_to_binary(map(fun({M,F,A}) -> <<M:32,F:32,A:32>> end, Imps)).
 
 build_attributes(Opts, SourceFile, Attr, MD5) ->
+    Misc0 = case SourceFile of
+		[] -> [];
+		[_|_] -> [{source,SourceFile}]
+	    end,
     Misc = case member(slim, Opts) of
 	       false ->
 		   {{Y,Mo,D},{H,Mi,S}} = erlang:universaltime(),
-		   [{time,{Y,Mo,D,H,Mi,S}},{source,SourceFile}];
+		   [{time,{Y,Mo,D,H,Mi,S}}|Misc0];
 	       true -> []
 	   end,
     Compile = [{options,Opts},{version,?COMPILER_VSN}|Misc],
diff --git a/lib/compiler/src/beam_block.erl b/lib/compiler/src/beam_block.erl
index 0321b1c07b..429b1aa010 100644
--- a/lib/compiler/src/beam_block.erl
+++ b/lib/compiler/src/beam_block.erl
@@ -23,14 +23,13 @@
 -module(beam_block).
 
 -export([module/2]).
--import(lists, [mapfoldl/3,reverse/1,reverse/2,foldl/3,member/2]).
--define(MAXREG, 1024).
+-import(lists, [reverse/1,reverse/2,foldl/3,member/2]).
 
-module({Mod,Exp,Attr,Fs0,Lc0}, _Opt) ->
-    {Fs,Lc} = mapfoldl(fun function/2, Lc0, Fs0),
+module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
+    Fs = [function(F) || F <- Fs0],
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
-function({function,Name,Arity,CLabel,Is0}, Lc0) ->
+function({function,Name,Arity,CLabel,Is0}) ->
     try
 	%% Collect basic blocks and optimize them.
 	Is1 = blockify(Is0),
@@ -40,11 +39,8 @@ function({function,Name,Arity,CLabel,Is0}, Lc0) ->
 	Is5 = opt_blocks(Is4),
 	Is6 = beam_utils:delete_live_annos(Is5),
 
-	%% Optimize bit syntax.
-	{Is,Lc} = bsm_opt(Is6, Lc0),
-
 	%% Done.
-	{{function,Name,Arity,CLabel,Is},Lc}
+	{function,Name,Arity,CLabel,Is6}
     catch
 	Class:Error ->
 	    Stack = erlang:get_stacktrace(),
@@ -62,56 +58,22 @@ blockify(Is) ->
 blockify([{loop_rec,{f,Fail},{x,0}},{loop_rec_end,_Lbl},{label,Fail}|Is], Acc) ->
     %% Useless instruction sequence.
     blockify(Is, Acc);
-blockify([{test,is_atom,{f,Fail},[Reg]}=I|
-	  [{select,select_val,Reg,{f,Fail},
-	    [{atom,false},{f,_}=BrFalse,
-	     {atom,true}=AtomTrue,{f,_}=BrTrue]}|Is]=Is0],
-	 [{block,Bl}|_]=Acc) ->
-    case is_last_bool(Bl, Reg) of
-	false ->
-	    blockify(Is0, [I|Acc]);
-	true ->
-	    %% The last instruction is a boolean operator/guard BIF that can't fail.
-	    %% We can convert the three-way branch to a two-way branch (eliminating
-	    %% the reference to the failure label).
-	    blockify(Is, [{jump,BrTrue},
-			  {test,is_eq_exact,BrFalse,[Reg,AtomTrue]}|Acc])
-    end;
-blockify([{test,is_atom,{f,Fail},[Reg]}=I|
-	  [{select,select_val,Reg,{f,Fail},
-	    [{atom,true}=AtomTrue,{f,_}=BrTrue,
-	     {atom,false},{f,_}=BrFalse]}|Is]=Is0],
-	 [{block,Bl}|_]=Acc) ->
-    case is_last_bool(Bl, Reg) of
-	false ->
-	    blockify(Is0, [I|Acc]);
-	true ->
-	    blockify(Is, [{jump,BrTrue},
-			  {test,is_eq_exact,BrFalse,[Reg,AtomTrue]}|Acc])
-    end;
+blockify([{get_map_elements,F,S,{list,Gets}}|Is0], Acc) ->
+    %% A get_map_elements instruction is only safe at the beginning of
+    %% a block because of the failure label.
+    {Ss,Ds} = beam_utils:split_even(Gets),
+    I = {set,Ds,[S|Ss],{get_map_elements,F}},
+    {Block,Is} = collect_block(Is0, [I]),
+    blockify(Is, [{block,Block}|Acc]);
 blockify([I|Is0]=IsAll, Acc) ->
-    case is_bs_put(I) of
-	true ->
-	    {BsPuts0,Is} = collect_bs_puts(IsAll),
-	    BsPuts = opt_bs_puts(BsPuts0),
-	    blockify(Is, reverse(BsPuts, Acc));
-	false ->
-	    case collect(I) of
-		error -> blockify(Is0, [I|Acc]);
-		Instr when is_tuple(Instr) ->
-		    {Block,Is} = collect_block(IsAll),
-		    blockify(Is, [{block,Block}|Acc])
-	    end
+    case collect(I) of
+	error -> blockify(Is0, [I|Acc]);
+	Instr when is_tuple(Instr) ->
+	    {Block,Is} = collect_block(IsAll),
+	    blockify(Is, [{block,Block}|Acc])
     end;
 blockify([], Acc) -> reverse(Acc).
 
-is_last_bool([{set,[Reg],As,{bif,N,_}}], Reg) ->
-    Ar = length(As),
-    erl_internal:new_type_test(N, Ar) orelse erl_internal:comp_op(N, Ar)
-	orelse erl_internal:bool_op(N, Ar);
-is_last_bool([_|Is], Reg) -> is_last_bool(Is, Reg);
-is_last_bool([], _) -> false.
-
 collect_block(Is) ->
     collect_block(Is, []).
 
@@ -126,7 +88,9 @@ collect_block([I|Is]=Is0, Acc) ->
     case collect(I) of
 	error -> {reverse(Acc),Is0};
 	Instr -> collect_block(Is, [Instr|Acc])
-    end.
+    end;
+collect_block([], Acc) ->
+    {reverse(Acc),[]}.
 
 collect({allocate,N,R})      -> {set,[],[],{alloc,R,{nozero,N,0,[]}}};
 collect({allocate_zero,N,R}) -> {set,[],[],{alloc,R,{zero,N,0,[]}}};
@@ -146,10 +110,10 @@ collect({get_list,S,D1,D2})  -> {set,[D1,D2],[S],get_list};
 collect(remove_message)      -> {set,[],[],remove_message};
 collect({put_map,F,Op,S,D,R,{list,Puts}}) ->
     {set,[D],[S|Puts],{alloc,R,{put_map,Op,F}}};
-collect({get_map_elements,F,S,{list,Gets}}) ->
-    {Ss,Ds} = beam_utils:split_even(Gets),
-    {set,Ds,[S|Ss],{get_map_elements,F}};
-collect({'catch',R,L})       -> {set,[R],[],{'catch',L}};
+collect({'catch'=Op,R,L}) ->
+    {set,[R],[],{try_catch,Op,L}};
+collect({'try'=Op,R,L}) ->
+    {set,[R],[],{try_catch,Op,L}};
 collect(fclearerror)         -> {set,[],[],fclearerror};
 collect({fcheckerror,{f,0}}) -> {set,[],[],fcheckerror};
 collect({fmove,S,D})         -> {set,[D],[S],fmove};
@@ -183,7 +147,9 @@ opt_blocks([I|Is]) ->
 opt_blocks([]) -> [].
 
 opt_block(Is0) ->
-    Is = find_fixpoint(fun opt/1, Is0),
+    Is = find_fixpoint(fun(Is) ->
+			       opt_tuple_element(opt(Is))
+		       end, Is0),
     opt_alloc(Is).
 
 find_fixpoint(OptFun, Is0) ->
@@ -279,76 +245,151 @@ opt_moves([X0,Y0], Is0) ->
 	not_possible -> {[X,Y0],Is2};
 	{X,_} -> {[X,Y0],Is2};
 	{Y,Is} -> {[X,Y],Is}
-    end;
-opt_moves(Ds, Is) ->
-    %% multiple destinations -> pass through
-    {Ds,Is}.
-
+    end.
 
 %% opt_move(Dest, [Instruction]) -> {UpdatedDest,[Instruction]} | not_possible
 %%  If there is a {move,Dest,FinalDest} instruction
 %%  in the instruction stream, remove the move instruction
 %%  and let FinalDest be the destination.
-%%
-%%  For this optimization to be safe, we must be sure that
-%%  Dest will not be referenced in any other by other instructions
-%%  in the rest of the instruction stream. Not even the indirect
-%%  reference by an instruction that may allocate (such as
-%%  test_heap/2 or a GC Bif) is allowed.
 
 opt_move(Dest, Is) ->
-    opt_move_1(Dest, Is, ?MAXREG, []).
-
-opt_move_1(R, [{set,_,_,{alloc,Live,_}}|_]=Is, SafeRegs, Acc) when Live < SafeRegs ->
-    %% Downgrade number of safe regs and rescan the instruction, as it most probably
-    %% is a gc_bif instruction.
-    opt_move_1(R, Is, Live, Acc);
-opt_move_1(R, [{set,[{x,X}=D],[R],move}|Is], SafeRegs, Acc) ->
-    case X < SafeRegs andalso beam_utils:is_killed_block(R, Is) of
-	true -> opt_move_2(D, Acc, Is);
-	false -> not_possible
+    opt_move_1(Dest, Is, []).
+
+opt_move_1(R, [{set,[D],[R],move}|Is0], Acc) ->
+    %% Provided that the source register is killed by instructions
+    %% that follow, the optimization is safe.
+    case eliminate_use_of_from_reg(Is0, R, D, []) of
+	{yes,Is} -> opt_move_rev(D, Acc, Is);
+	no -> not_possible
     end;
-opt_move_1(R, [{set,[D],[R],move}|Is], _SafeRegs, Acc) ->
-    case beam_utils:is_killed_block(R, Is) of
-	true -> opt_move_2(D, Acc, Is);
-	false -> not_possible
+opt_move_1({x,_}, [{set,_,_,{alloc,_,_}}|_], _) ->
+    %% The optimization is not possible. If the X register is not
+    %% killed by allocation, the optimization would not be safe.
+    %% If the X register is killed, it means that there cannot
+    %% follow a 'move' instruction with this X register as the
+    %% source.
+    not_possible;
+opt_move_1(R, [{set,_,_,_}=I|Is], Acc) ->
+    %% If the source register is either killed or used by this
+    %% instruction, the optimimization is not possible.
+    case is_killed_or_used(R, I) of
+	true -> not_possible;
+	false -> opt_move_1(R, Is, [I|Acc])
     end;
-opt_move_1(R, [I|Is], SafeRegs, Acc) ->
-    case is_transparent(R, I) of
-	false -> not_possible;
-	true -> opt_move_1(R, Is, SafeRegs, [I|Acc])
-    end.
+opt_move_1(_, _, _) ->
+    not_possible.
+
+%% opt_tuple_element([Instruction]) -> [Instruction]
+%%  If possible, move get_tuple_element instructions forward
+%%  in the instruction stream to a move instruction, eliminating
+%%  the move instruction. Example:
+%%
+%%    get_tuple_element Tuple Pos Dst1
+%%    ...
+%%    move Dst1 Dst2
+%%
+%%  This code may be possible to rewrite to:
+%%
+%%    %%(Moved get_tuple_element instruction)
+%%    ...
+%%    get_tuple_element Tuple Pos Dst2
+%%
+
+opt_tuple_element([{set,[D],[S],{get_tuple_element,_}}=I|Is0]) ->
+    case opt_tuple_element_1(Is0, I, {S,D}, []) of
+	no ->
+	    [I|opt_tuple_element(Is0)];
+	{yes,Is} ->
+	    opt_tuple_element(Is)
+    end;
+opt_tuple_element([I|Is]) ->
+    [I|opt_tuple_element(Is)];
+opt_tuple_element([]) -> [].
+
+opt_tuple_element_1([{set,_,_,{alloc,_,_}}|_], _, _, _) ->
+    no;
+opt_tuple_element_1([{set,_,_,{try_catch,_,_}}|_], _, _, _) ->
+    no;
+opt_tuple_element_1([{set,[D],[S],move}|Is0], I0, {_,S}, Acc) ->
+    case eliminate_use_of_from_reg(Is0, S, D, []) of
+	no ->
+	    no;
+	{yes,Is} ->
+	    {set,[S],Ss,Op} = I0,
+	    I = {set,[D],Ss,Op},
+	    {yes,reverse(Acc, [I|Is])}
+    end;
+opt_tuple_element_1([{set,Ds,Ss,_}=I|Is], MovedI, {S,D}=Regs, Acc) ->
+    case member(S, Ds) orelse member(D, Ss) of
+	true ->
+	    no;
+	false ->
+	    opt_tuple_element_1(Is, MovedI, Regs, [I|Acc])
+    end;
+opt_tuple_element_1(_, _, _, _) -> no.
 
-%% Reverse the instructions, while checking that there are no instructions that
-%% would interfere with using the new destination register chosen.
+%% Reverse the instructions, while checking that there are no
+%% instructions that would interfere with using the new destination
+%% register (D).
 
-opt_move_2(D, [I|Is], Acc) ->
-    case is_transparent(D, I) of
-	false -> not_possible;
-	true -> opt_move_2(D, Is, [I|Acc])
+opt_move_rev(D, [I|Is], Acc) ->
+    case is_killed_or_used(D, I) of
+	true -> not_possible;
+	false -> opt_move_rev(D, Is, [I|Acc])
+    end;
+opt_move_rev(D, [], Acc) -> {D,Acc}.
+
+%% is_killed_or_used(Register, {set,_,_,_}) -> bool()
+%%  Test whether the register is used by the instruction.
+
+is_killed_or_used(R, {set,Ss,Ds,_}) ->
+    member(R, Ds) orelse member(R, Ss).
+
+%% eliminate_use_of_from_reg([Instruction], FromRegister, ToRegister, Acc) ->
+%%       {yes,Is} | no
+%%  Eliminate any use of FromRegister in the instruction sequence
+%%  by replacing uses of FromRegister with ToRegister. If FromRegister
+%%  is referenced by an allocation instruction, return 'no' to indicate
+%%  that FromRegister is still used and that the optimization is not
+%%  possible.
+
+eliminate_use_of_from_reg([{set,_,_,{alloc,Live,_}}|_]=Is0, {x,X}, _, Acc) ->
+    if
+	X < Live ->
+	    no;
+	true ->
+	    {yes,reverse(Acc, Is0)}
     end;
-opt_move_2(D, [], Acc) -> {D,Acc}.
-
-%% is_transparent(Register, Instruction) -> true | false
-%%  Returns true if Instruction does not in any way references Register
-%%  (even indirectly by an allocation instruction).
-%%  Returns false if Instruction does reference Register, or we are
-%%  not sure.
-
-is_transparent({x,X}, {set,_,_,{alloc,Live,_}}) when X < Live ->
-    false;
-is_transparent(R, {set,Ds,Ss,_Op}) ->
-    case member(R, Ds) of
-	true -> false;
-	false -> not member(R, Ss)
+eliminate_use_of_from_reg([{set,Ds,Ss0,Op}=I0|Is], From, To, Acc) ->
+    I = case member(From, Ss0) of
+	    true ->
+		Ss = [case S of
+			  From -> To;
+			  _ -> S
+		      end || S <- Ss0],
+		{set,Ds,Ss,Op};
+	    false ->
+		I0
+	end,
+    case member(From, Ds) of
+	true ->
+	    {yes,reverse(Acc, [I|Is])};
+	false ->
+	    eliminate_use_of_from_reg(Is, From, To, [I|Acc])
     end;
-is_transparent(_, _) -> false.
+eliminate_use_of_from_reg([I]=Is, From, _To, Acc) ->
+    case beam_utils:is_killed_block(From, [I]) of
+	true ->
+	    {yes,reverse(Acc, Is)};
+	false ->
+	    no
+    end.
 
 %% opt_alloc(Instructions) -> Instructions'
 %%  Optimises all allocate instructions.
 
 opt_alloc([{set,[],[],{alloc,R,{_,Ns,Nh,[]}}}|Is]) ->
-    [{set,[],[],opt_alloc(Is, Ns, Nh, R)}|opt(Is)];
+    [{set,[],[],opt_alloc(Is, Ns, Nh, R)}|Is];
 opt_alloc([I|Is]) -> [I|opt_alloc(Is)];
 opt_alloc([]) -> [].
 	
@@ -414,234 +455,3 @@ x_dead([], Regs) -> Regs.
 x_live([{x,N}|Rs], Regs) -> x_live(Rs, Regs bor (1 bsl N));
 x_live([_|Rs], Regs) -> x_live(Rs, Regs);
 x_live([], Regs) -> Regs.
-
-%%%
-%%% Evaluation of constant bit fields.
-%%%
-
-is_bs_put({bs_put,_,{bs_put_integer,_,_},_}) -> true;
-is_bs_put({bs_put,_,{bs_put_float,_,_},_}) -> true;
-is_bs_put(_) -> false.
-
-collect_bs_puts(Is) ->
-    collect_bs_puts_1(Is, []).
-    
-collect_bs_puts_1([I|Is]=Is0, Acc) ->
-    case is_bs_put(I) of
-	false -> {reverse(Acc),Is0};
-	true -> collect_bs_puts_1(Is, [I|Acc])
-    end.
-    
-opt_bs_puts(Is) ->
-    opt_bs_1(Is, []).
-
-opt_bs_1([{bs_put,Fail,
-	   {bs_put_float,1,Flags0},[{integer,Sz},Src]}=I0|Is], Acc) ->
-    try eval_put_float(Src, Sz, Flags0) of
-	<<Int:Sz>> ->
-	    Flags = force_big(Flags0),
-	    I = {bs_put,Fail,{bs_put_integer,1,Flags},
-		 [{integer,Sz},{integer,Int}]},
-	    opt_bs_1([I|Is], Acc)
-    catch
-	error:_ ->
-	    opt_bs_1(Is, [I0|Acc])
-    end;
-opt_bs_1([{bs_put,_,{bs_put_integer,1,_},[{integer,8},{integer,_}]}|_]=IsAll,
-	 Acc0) ->
-    {Is,Acc} = bs_collect_string(IsAll, Acc0),
-    opt_bs_1(Is, Acc);
-opt_bs_1([{bs_put,Fail,{bs_put_integer,1,F},[{integer,Sz},{integer,N}]}=I|Is0],
-	 Acc) when Sz > 8 ->
-    case field_endian(F) of
-	big ->
-	    %% We can do this optimization for any field size without risk
-	    %% for code explosion.
-	    case bs_split_int(N, Sz, Fail, Is0) of
-		no_split -> opt_bs_1(Is0, [I|Acc]);
-		Is -> opt_bs_1(Is, Acc)
-	    end;
-	little when Sz < 128 ->
-	    %% We only try to optimize relatively small fields, to avoid
-	    %% an explosion in code size.
-	    <<Int:Sz>> = <<N:Sz/little>>,
-	    Flags = force_big(F),
-	    Is = [{bs_put,Fail,{bs_put_integer,1,Flags},
-		   [{integer,Sz},{integer,Int}]}|Is0],
-	    opt_bs_1(Is, Acc);
-	_ -> 					%native or too wide little field
-	    opt_bs_1(Is0, [I|Acc])
-    end;
-opt_bs_1([{bs_put,Fail,{Op,U,F},[{integer,Sz},Src]}|Is], Acc) when U > 1 ->
-    opt_bs_1([{bs_put,Fail,{Op,1,F},[{integer,U*Sz},Src]}|Is], Acc);
-opt_bs_1([I|Is], Acc) ->
-    opt_bs_1(Is, [I|Acc]);
-opt_bs_1([], Acc) -> reverse(Acc).
-
-eval_put_float(Src, Sz, Flags) when Sz =< 256 -> %Only evaluate if Sz is reasonable.
-    Val = value(Src),
-    case field_endian(Flags) of
-	little -> <<Val:Sz/little-float-unit:1>>;
-	big -> <<Val:Sz/big-float-unit:1>>
-        %% native intentionally not handled here - we can't optimize it.
-    end.
-
-value({integer,I}) -> I;
-value({float,F}) -> F.
-
-bs_collect_string(Is, [{bs_put,_,{bs_put_string,Len,{string,Str}},[]}|Acc]) ->
-    bs_coll_str_1(Is, Len, reverse(Str), Acc);
-bs_collect_string(Is, Acc) ->
-    bs_coll_str_1(Is, 0, [], Acc).
-    
-bs_coll_str_1([{bs_put,_,{bs_put_integer,U,_},[{integer,Sz},{integer,V}]}|Is],
-	      Len, StrAcc, IsAcc) when U*Sz =:= 8 ->
-    Byte = V band 16#FF,
-    bs_coll_str_1(Is, Len+1, [Byte|StrAcc], IsAcc);
-bs_coll_str_1(Is, Len, StrAcc, IsAcc) ->
-    {Is,[{bs_put,{f,0},{bs_put_string,Len,{string,reverse(StrAcc)}},[]}|IsAcc]}.
-
-field_endian({field_flags,F}) -> field_endian_1(F).
-
-field_endian_1([big=E|_]) -> E;
-field_endian_1([little=E|_]) -> E;
-field_endian_1([native=E|_]) -> E;
-field_endian_1([_|Fs]) -> field_endian_1(Fs).
-
-force_big({field_flags,F}) ->
-    {field_flags,force_big_1(F)}.
-
-force_big_1([big|_]=Fs) -> Fs;
-force_big_1([little|Fs]) -> [big|Fs];
-force_big_1([F|Fs]) -> [F|force_big_1(Fs)].
-
-bs_split_int(0, Sz, _, _) when Sz > 64 ->
-    %% We don't want to split in this case because the
-    %% string will consist of only zeroes.
-    no_split;
-bs_split_int(-1, Sz, _, _) when Sz > 64 ->
-    %% We don't want to split in this case because the
-    %% string will consist of only 255 bytes.
-    no_split;
-bs_split_int(N, Sz, Fail, Acc) ->
-    FirstByteSz = case Sz rem 8 of
-		      0 -> 8;
-		      Rem -> Rem
-		  end,
-    bs_split_int_1(N, FirstByteSz, Sz, Fail, Acc).
-
-bs_split_int_1(-1, _, Sz, Fail, Acc) when Sz > 64 ->
-    I = {bs_put,Fail,{bs_put_integer,1,{field_flags,[big]}},
-	 [{integer,Sz},{integer,-1}]},
-    [I|Acc];
-bs_split_int_1(0, _, Sz, Fail, Acc) when Sz > 64 ->
-    I = {bs_put,Fail,{bs_put_integer,1,{field_flags,[big]}},
-	 [{integer,Sz},{integer,0}]},
-    [I|Acc];
-bs_split_int_1(N, ByteSz, Sz, Fail, Acc) when Sz > 0 ->
-    Mask = (1 bsl ByteSz) - 1,
-    I = {bs_put,Fail,{bs_put_integer,1,{field_flags,[big]}},
-	 [{integer,ByteSz},{integer,N band Mask}]},
-    bs_split_int_1(N bsr ByteSz, 8, Sz-ByteSz, Fail, [I|Acc]);
-bs_split_int_1(_, _, _, _, Acc) -> Acc.
-
-
-%%%
-%%% Optimization of new bit syntax matching: get rid
-%%% of redundant bs_restore2/2 instructions across select_val
-%%% instructions, as well as a few other simple peep-hole optimizations.
-%%%
-
-bsm_opt(Is0, Lc0) ->
-    {Is1,D0,Lc} = bsm_scan(Is0, [], Lc0, []),
-    Is2 = case D0 of
-	      [] ->
-		  Is1;
-	     _ ->
-		  D = gb_trees:from_orddict(orddict:from_list(D0)),
-		  bsm_reroute(Is1, D, none, [])
-	 end,
-    Is = beam_clean:bs_clean_saves(Is2),
-    {bsm_opt_2(Is, []),Lc}.
-
-bsm_scan([{label,L}=Lbl,{bs_restore2,_,Save}=R|Is], D0, Lc, Acc0) ->
-    D = [{{L,Save},Lc}|D0],
-    Acc = [{label,Lc},R,Lbl|Acc0],
-    bsm_scan(Is, D, Lc+1, Acc);
-bsm_scan([I|Is], D, Lc, Acc) ->
-    bsm_scan(Is, D, Lc, [I|Acc]);
-bsm_scan([], D, Lc, Acc) ->
-    {reverse(Acc),D,Lc}.
-
-bsm_reroute([{bs_save2,Reg,Save}=I|Is], D, _, Acc) ->
-    bsm_reroute(Is, D, {Reg,Save}, [I|Acc]);
-bsm_reroute([{bs_restore2,Reg,Save}=I|Is], D, _, Acc) ->
-    bsm_reroute(Is, D, {Reg,Save}, [I|Acc]);
-bsm_reroute([{label,_}=I|Is], D, S, Acc) ->
-    bsm_reroute(Is, D, S, [I|Acc]);
-bsm_reroute([{select,select_val,Reg,F0,Lbls0}|Is], D, {_,Save}=S, Acc0) ->
-    [F|Lbls] = bsm_subst_labels([F0|Lbls0], Save, D),
-    Acc = [{select,select_val,Reg,F,Lbls}|Acc0],
-    bsm_reroute(Is, D, S, Acc);
-bsm_reroute([{test,TestOp,F0,TestArgs}=I|Is], D, {_,Save}=S, Acc0) ->
-    F = bsm_subst_label(F0, Save, D),
-    Acc = [{test,TestOp,F,TestArgs}|Acc0],
-    case bsm_not_bs_test(I) of
-	true ->
-	    %% The test instruction will not update the bit offset for the
-	    %% binary being matched. Therefore the save position can be kept.
-	    bsm_reroute(Is, D, S, Acc);
-	false ->
-	    %% The test instruction might update the bit offset. Kill our
-	    %% remembered Save position.
-	    bsm_reroute(Is, D, none, Acc)
-    end;
-bsm_reroute([{test,TestOp,F0,Live,TestArgs,Dst}|Is], D, {_,Save}, Acc0) ->
-    F = bsm_subst_label(F0, Save, D),
-    Acc = [{test,TestOp,F,Live,TestArgs,Dst}|Acc0],
-    %% The test instruction will update the bit offset. Kill our
-    %% remembered Save position.
-    bsm_reroute(Is, D, none, Acc);
-bsm_reroute([{block,[{set,[],[],{alloc,_,_}}]}=Bl,
-	     {bs_context_to_binary,_}=I|Is], D, S, Acc) ->
-    %% To help further bit syntax optimizations.
-    bsm_reroute([I,Bl|Is], D, S, Acc);
-bsm_reroute([I|Is], D, _, Acc) ->
-    bsm_reroute(Is, D, none, [I|Acc]);
-bsm_reroute([], _, _, Acc) -> reverse(Acc).
-
-bsm_opt_2([{test,bs_test_tail2,F,[Ctx,Bits]}|Is],
-	  [{test,bs_skip_bits2,F,[Ctx,{integer,I},Unit,_Flags]}|Acc]) ->
-    bsm_opt_2(Is, [{test,bs_test_tail2,F,[Ctx,Bits+I*Unit]}|Acc]);
-bsm_opt_2([{test,bs_skip_bits2,F,[Ctx,{integer,I1},Unit1,_]}|Is],
-	  [{test,bs_skip_bits2,F,[Ctx,{integer,I2},Unit2,Flags]}|Acc]) ->
-    bsm_opt_2(Is, [{test,bs_skip_bits2,F,
-		    [Ctx,{integer,I1*Unit1+I2*Unit2},1,Flags]}|Acc]);
-bsm_opt_2([I|Is], Acc) ->
-    bsm_opt_2(Is, [I|Acc]);
-bsm_opt_2([], Acc) -> reverse(Acc).
-
-%% bsm_not_bs_test({test,Name,_,Operands}) -> true|false.
-%%  Test whether is the test is a "safe", i.e. does not move the
-%%  bit offset for a binary.
-%%
-%%  'true' means that the test is safe, 'false' that we don't know or
-%%  that the test moves the offset (e.g. bs_get_integer2).
-
-bsm_not_bs_test({test,bs_test_tail2,_,[_,_]}) -> true;
-bsm_not_bs_test(Test) -> beam_utils:is_pure_test(Test).
-
-bsm_subst_labels(Fs, Save, D) ->
-    bsm_subst_labels_1(Fs, Save, D, []).
-
-bsm_subst_labels_1([F|Fs], Save, D, Acc) ->
-    bsm_subst_labels_1(Fs, Save, D, [bsm_subst_label(F, Save, D)|Acc]);
-bsm_subst_labels_1([], _, _, Acc) ->
-    reverse(Acc).
-
-bsm_subst_label({f,Lbl0}=F, Save, D) ->
-    case gb_trees:lookup({Lbl0,Save}, D) of
-	{value,Lbl} -> {f,Lbl};
-	none -> F
-    end;
-bsm_subst_label(Other, _, _) -> Other.
diff --git a/lib/compiler/src/beam_bool.erl b/lib/compiler/src/beam_bool.erl
index d14be83496..efd935f666 100644
--- a/lib/compiler/src/beam_bool.erl
+++ b/lib/compiler/src/beam_bool.erl
@@ -25,8 +25,6 @@
 
 -import(lists, [reverse/1,reverse/2,foldl/3,mapfoldl/3,map/2]).
 
--define(MAXREG, 1024).
-
 -record(st,
 	{next,					%Next label number.
 	 ll					%Live regs at labels.
diff --git a/lib/compiler/src/beam_bs.erl b/lib/compiler/src/beam_bs.erl
new file mode 100644
index 0000000000..55fa7ce10c
--- /dev/null
+++ b/lib/compiler/src/beam_bs.erl
@@ -0,0 +1,278 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2013. 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 : Partitions assembly instructions into basic blocks and
+%% optimizes them.
+
+-module(beam_bs).
+
+-export([module/2]).
+-import(lists, [mapfoldl/3,reverse/1]).
+
+module({Mod,Exp,Attr,Fs0,Lc0}, _Opt) ->
+    {Fs,Lc} = mapfoldl(fun function/2, Lc0, Fs0),
+    {ok,{Mod,Exp,Attr,Fs,Lc}}.
+
+function({function,Name,Arity,CLabel,Is0}, Lc0) ->
+    try
+	Is1 = bs_put_opt(Is0),
+	{Is,Lc} = bsm_opt(Is1, Lc0),
+	{{function,Name,Arity,CLabel,Is},Lc}
+    catch
+	Class:Error ->
+	    Stack = erlang:get_stacktrace(),
+	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+	    erlang:raise(Class, Error, Stack)
+    end.
+
+%%%
+%%% Evaluation of constant bit fields.
+%%%
+
+bs_put_opt([{bs_put,_,_,_}=I|Is0]) ->
+    {BsPuts0,Is} = collect_bs_puts(Is0, [I]),
+    BsPuts = opt_bs_puts(BsPuts0),
+    BsPuts ++ bs_put_opt(Is);
+bs_put_opt([I|Is]) ->
+    [I|bs_put_opt(Is)];
+bs_put_opt([]) -> [].
+
+collect_bs_puts([{bs_put,_,_,_}=I|Is], Acc) ->
+    collect_bs_puts(Is, [I|Acc]);
+collect_bs_puts([_|_]=Is, Acc) ->
+    {reverse(Acc),Is}.
+
+opt_bs_puts(Is) ->
+    opt_bs_1(Is, []).
+
+opt_bs_1([{bs_put,Fail,
+	   {bs_put_float,1,Flags0},[{integer,Sz},Src]}=I0|Is], Acc) ->
+    try eval_put_float(Src, Sz, Flags0) of
+	<<Int:Sz>> ->
+	    Flags = force_big(Flags0),
+	    I = {bs_put,Fail,{bs_put_integer,1,Flags},
+		 [{integer,Sz},{integer,Int}]},
+	    opt_bs_1([I|Is], Acc)
+    catch
+	error:_ ->
+	    opt_bs_1(Is, [I0|Acc])
+    end;
+opt_bs_1([{bs_put,_,{bs_put_integer,1,_},[{integer,8},{integer,_}]}|_]=IsAll,
+	 Acc0) ->
+    {Is,Acc} = bs_collect_string(IsAll, Acc0),
+    opt_bs_1(Is, Acc);
+opt_bs_1([{bs_put,Fail,{bs_put_integer,1,F},[{integer,Sz},{integer,N}]}=I|Is0],
+	 Acc) when Sz > 8 ->
+    case field_endian(F) of
+	big ->
+	    %% We can do this optimization for any field size without
+	    %% risk for code explosion.
+	    case bs_split_int(N, Sz, Fail, Is0) of
+		no_split -> opt_bs_1(Is0, [I|Acc]);
+		Is -> opt_bs_1(Is, Acc)
+	    end;
+	little when Sz < 128 ->
+	    %% We only try to optimize relatively small fields, to
+	    %% avoid an explosion in code size.
+	    <<Int:Sz>> = <<N:Sz/little>>,
+	    Flags = force_big(F),
+	    Is = [{bs_put,Fail,{bs_put_integer,1,Flags},
+		   [{integer,Sz},{integer,Int}]}|Is0],
+	    opt_bs_1(Is, Acc);
+	_ ->			      %native or too wide little field
+	    opt_bs_1(Is0, [I|Acc])
+    end;
+opt_bs_1([{bs_put,Fail,{Op,U,F},[{integer,Sz},Src]}|Is], Acc) when U > 1 ->
+    opt_bs_1([{bs_put,Fail,{Op,1,F},[{integer,U*Sz},Src]}|Is], Acc);
+opt_bs_1([I|Is], Acc) ->
+    opt_bs_1(Is, [I|Acc]);
+opt_bs_1([], Acc) -> reverse(Acc).
+
+eval_put_float(Src, Sz, Flags) when Sz =< 256 ->
+    %%Only evaluate if Sz is reasonable.
+    Val = value(Src),
+    case field_endian(Flags) of
+	little -> <<Val:Sz/little-float-unit:1>>;
+	big -> <<Val:Sz/big-float-unit:1>>
+        %% native intentionally not handled here - we can't optimize
+        %% it.
+    end.
+
+value({integer,I}) -> I;
+value({float,F}) -> F.
+
+bs_collect_string(Is, [{bs_put,_,{bs_put_string,Len,{string,Str}},[]}|Acc]) ->
+    bs_coll_str_1(Is, Len, reverse(Str), Acc);
+bs_collect_string(Is, Acc) ->
+    bs_coll_str_1(Is, 0, [], Acc).
+
+bs_coll_str_1([{bs_put,_,{bs_put_integer,U,_},[{integer,Sz},{integer,V}]}|Is],
+	      Len, StrAcc, IsAcc) when U*Sz =:= 8 ->
+    Byte = V band 16#FF,
+    bs_coll_str_1(Is, Len+1, [Byte|StrAcc], IsAcc);
+bs_coll_str_1(Is, Len, StrAcc, IsAcc) ->
+    {Is,[{bs_put,{f,0},{bs_put_string,Len,{string,reverse(StrAcc)}},[]}|IsAcc]}.
+
+field_endian({field_flags,F}) -> field_endian_1(F).
+
+field_endian_1([big=E|_]) -> E;
+field_endian_1([little=E|_]) -> E;
+field_endian_1([native=E|_]) -> E;
+field_endian_1([_|Fs]) -> field_endian_1(Fs).
+
+force_big({field_flags,F}) ->
+    {field_flags,force_big_1(F)}.
+
+force_big_1([big|_]=Fs) -> Fs;
+force_big_1([little|Fs]) -> [big|Fs];
+force_big_1([F|Fs]) -> [F|force_big_1(Fs)].
+
+bs_split_int(0, Sz, _, _) when Sz > 64 ->
+    %% We don't want to split in this case because the
+    %% string will consist of only zeroes.
+    no_split;
+bs_split_int(-1, Sz, _, _) when Sz > 64 ->
+    %% We don't want to split in this case because the
+    %% string will consist of only 255 bytes.
+    no_split;
+bs_split_int(N, Sz, Fail, Acc) ->
+    FirstByteSz = case Sz rem 8 of
+		      0 -> 8;
+		      Rem -> Rem
+		  end,
+    bs_split_int_1(N, FirstByteSz, Sz, Fail, Acc).
+
+bs_split_int_1(-1, _, Sz, Fail, Acc) when Sz > 64 ->
+    I = {bs_put,Fail,{bs_put_integer,1,{field_flags,[big]}},
+	 [{integer,Sz},{integer,-1}]},
+    [I|Acc];
+bs_split_int_1(0, _, Sz, Fail, Acc) when Sz > 64 ->
+    I = {bs_put,Fail,{bs_put_integer,1,{field_flags,[big]}},
+	 [{integer,Sz},{integer,0}]},
+    [I|Acc];
+bs_split_int_1(N, ByteSz, Sz, Fail, Acc) when Sz > 0 ->
+    Mask = (1 bsl ByteSz) - 1,
+    I = {bs_put,Fail,{bs_put_integer,1,{field_flags,[big]}},
+	 [{integer,ByteSz},{integer,N band Mask}]},
+    bs_split_int_1(N bsr ByteSz, 8, Sz-ByteSz, Fail, [I|Acc]);
+bs_split_int_1(_, _, _, _, Acc) -> Acc.
+
+%%%
+%%% Optimization of bit syntax matching: get rid
+%%% of redundant bs_restore2/2 instructions across select_val
+%%% instructions, as well as a few other simple peep-hole
+%%% optimizations.
+%%%
+
+bsm_opt(Is0, Lc0) ->
+    {Is1,D0,Lc} = bsm_scan(Is0, [], Lc0, []),
+    Is2 = case D0 of
+	      [] ->
+		  %% No bit syntax matching in this function.
+		  Is1;
+	      [_|_] ->
+		  %% Optimize the bit syntax matching.
+		  D = gb_trees:from_orddict(orddict:from_list(D0)),
+		  bsm_reroute(Is1, D, none, [])
+	 end,
+    Is = beam_clean:bs_clean_saves(Is2),
+    {bsm_opt_2(Is, []),Lc}.
+
+bsm_scan([{label,L}=Lbl,{bs_restore2,_,Save}=R|Is], D0, Lc, Acc0) ->
+    D = [{{L,Save},Lc}|D0],
+    Acc = [{label,Lc},R,Lbl|Acc0],
+    bsm_scan(Is, D, Lc+1, Acc);
+bsm_scan([I|Is], D, Lc, Acc) ->
+    bsm_scan(Is, D, Lc, [I|Acc]);
+bsm_scan([], D, Lc, Acc) ->
+    {reverse(Acc),D,Lc}.
+
+bsm_reroute([{bs_save2,Reg,Save}=I|Is], D, _, Acc) ->
+    bsm_reroute(Is, D, {Reg,Save}, [I|Acc]);
+bsm_reroute([{bs_restore2,Reg,Save}=I|Is], D, _, Acc) ->
+    bsm_reroute(Is, D, {Reg,Save}, [I|Acc]);
+bsm_reroute([{label,_}=I|Is], D, S, Acc) ->
+    bsm_reroute(Is, D, S, [I|Acc]);
+bsm_reroute([{select,select_val,Reg,F0,Lbls0}|Is], D, {_,Save}=S, Acc0) ->
+    [F|Lbls] = bsm_subst_labels([F0|Lbls0], Save, D),
+    Acc = [{select,select_val,Reg,F,Lbls}|Acc0],
+    bsm_reroute(Is, D, S, Acc);
+bsm_reroute([{test,TestOp,F0,TestArgs}=I|Is], D, {_,Save}=S, Acc0) ->
+    F = bsm_subst_label(F0, Save, D),
+    Acc = [{test,TestOp,F,TestArgs}|Acc0],
+    case bsm_not_bs_test(I) of
+	true ->
+	    %% The test instruction will not update the bit offset for
+	    %% the binary being matched. Therefore the save position
+	    %% can be kept.
+	    bsm_reroute(Is, D, S, Acc);
+	false ->
+	    %% The test instruction might update the bit offset. Kill
+	    %% our remembered Save position.
+	    bsm_reroute(Is, D, none, Acc)
+    end;
+bsm_reroute([{test,TestOp,F0,Live,TestArgs,Dst}|Is], D, {_,Save}, Acc0) ->
+    F = bsm_subst_label(F0, Save, D),
+    Acc = [{test,TestOp,F,Live,TestArgs,Dst}|Acc0],
+    %% The test instruction will update the bit offset. Kill our
+    %% remembered Save position.
+    bsm_reroute(Is, D, none, Acc);
+bsm_reroute([{block,[{set,[],[],{alloc,_,_}}]}=Bl,
+	     {bs_context_to_binary,_}=I|Is], D, S, Acc) ->
+    %% To help further bit syntax optimizations.
+    bsm_reroute([I,Bl|Is], D, S, Acc);
+bsm_reroute([I|Is], D, _, Acc) ->
+    bsm_reroute(Is, D, none, [I|Acc]);
+bsm_reroute([], _, _, Acc) -> reverse(Acc).
+
+bsm_opt_2([{test,bs_test_tail2,F,[Ctx,Bits]}|Is],
+	  [{test,bs_skip_bits2,F,[Ctx,{integer,I},Unit,_Flags]}|Acc]) ->
+    bsm_opt_2(Is, [{test,bs_test_tail2,F,[Ctx,Bits+I*Unit]}|Acc]);
+bsm_opt_2([{test,bs_skip_bits2,F,[Ctx,{integer,I1},Unit1,_]}|Is],
+	  [{test,bs_skip_bits2,F,[Ctx,{integer,I2},Unit2,Flags]}|Acc]) ->
+    bsm_opt_2(Is, [{test,bs_skip_bits2,F,
+		    [Ctx,{integer,I1*Unit1+I2*Unit2},1,Flags]}|Acc]);
+bsm_opt_2([I|Is], Acc) ->
+    bsm_opt_2(Is, [I|Acc]);
+bsm_opt_2([], Acc) -> reverse(Acc).
+
+%% bsm_not_bs_test({test,Name,_,Operands}) -> true|false.
+%%  Test whether is the test is a "safe", i.e. does not move the
+%%  bit offset for a binary.
+%%
+%%  'true' means that the test is safe, 'false' that we don't know or
+%%  that the test moves the offset (e.g. bs_get_integer2).
+
+bsm_not_bs_test({test,bs_test_tail2,_,[_,_]}) -> true;
+bsm_not_bs_test(Test) -> beam_utils:is_pure_test(Test).
+
+bsm_subst_labels(Fs, Save, D) ->
+    bsm_subst_labels_1(Fs, Save, D, []).
+
+bsm_subst_labels_1([F|Fs], Save, D, Acc) ->
+    bsm_subst_labels_1(Fs, Save, D, [bsm_subst_label(F, Save, D)|Acc]);
+bsm_subst_labels_1([], _, _, Acc) ->
+    reverse(Acc).
+
+bsm_subst_label({f,Lbl0}=F, Save, D) ->
+    case gb_trees:lookup({Lbl0,Save}, D) of
+	{value,Lbl} -> {f,Lbl};
+	none -> F
+    end;
+bsm_subst_label(Other, _, _) -> Other.
diff --git a/lib/compiler/src/beam_bsm.erl b/lib/compiler/src/beam_bsm.erl
index 4f76350269..62356928ae 100644
--- a/lib/compiler/src/beam_bsm.erl
+++ b/lib/compiler/src/beam_bsm.erl
@@ -421,7 +421,8 @@ btb_follow_branches([], _, D) -> D.
 
 btb_follow_branch(0, _Regs, D) -> D;
 btb_follow_branch(Lbl, Regs, #btb{ok_br=Br0,index=Li}=D) ->
-    case gb_sets:is_member(Lbl, Br0) of
+    Key = {Lbl,Regs},
+    case gb_sets:is_member(Key, Br0) of
 	true ->
 	    %% We have already followed this branch and it was OK.
 	    D;
@@ -432,7 +433,7 @@ btb_follow_branch(Lbl, Regs, #btb{ok_br=Br0,index=Li}=D) ->
 		btb_reaches_match_1(Is, Regs, D),
 
 	    %% Since we got back, this branch is OK.
-	    D#btb{ok_br=gb_sets:insert(Lbl, Br),must_not_save=MustNotSave,
+	    D#btb{ok_br=gb_sets:insert(Key, Br),must_not_save=MustNotSave,
 		  must_save=MustSave}
     end.
 
diff --git a/lib/compiler/src/beam_clean.erl b/lib/compiler/src/beam_clean.erl
index 919ee3ee7d..d9108c383d 100644
--- a/lib/compiler/src/beam_clean.erl
+++ b/lib/compiler/src/beam_clean.erl
@@ -141,7 +141,7 @@ renumber_labels([{bif,is_record,{f,_},
     renumber_labels(Is, Acc, St);
 renumber_labels([{test,is_record,{f,_}=Fail,
 		  [Term,{atom,Tag}=TagAtom,{integer,Arity}]}|Is0], Acc, St) ->
-    Tmp = {x,1023},
+    Tmp = {x,1022},
     Is = case is_record_tuple(Term, Tag, Arity) of
 	     yes ->
 		 Is0;
@@ -190,17 +190,11 @@ replace([{test,Test,{f,Lbl},Ops}|Is], Acc, D) ->
 replace([{test,Test,{f,Lbl},Live,Ops,Dst}|Is], Acc, D) ->
     replace(Is, [{test,Test,{f,label(Lbl, D)},Live,Ops,Dst}|Acc], D);
 replace([{select,I,R,{f,Fail0},Vls0}|Is], Acc, D) ->
-    Vls1 = map(fun ({f,L}) -> {f,label(L, D)};
-		   (Other) -> Other end, Vls0),
+    Vls = map(fun ({f,L}) -> {f,label(L, D)};
+		   (Other) -> Other
+	      end, Vls0),
     Fail = label(Fail0, D),
-    case redundant_values(Vls1, Fail, []) of
-	[] ->
-	    %% Oops, no choices left. The loader will not accept that.
-	    %% Convert to a plain jump.
-	    replace(Is, [{jump,{f,Fail}}|Acc], D);
-	Vls ->
-	    replace(Is, [{select,I,R,{f,Fail},Vls}|Acc], D)
-    end;
+    replace(Is, [{select,I,R,{f,Fail},Vls}|Acc], D);
 replace([{'try',R,{f,Lbl}}|Is], Acc, D) ->
     replace(Is, [{'try',R,{f,label(Lbl, D)}}|Acc], D);
 replace([{'catch',R,{f,Lbl}}|Is], Acc, D) ->
@@ -241,12 +235,6 @@ label(Old, D) ->
 	{value,Val} -> Val;
 	none -> throw({error,{undefined_label,Old}})
     end.
-	    
-redundant_values([_,{f,Fail}|Vls], Fail, Acc) ->
-    redundant_values(Vls, Fail, Acc);
-redundant_values([Val,Lbl|Vls], Fail, Acc) ->
-    redundant_values(Vls, Fail, [Lbl,Val|Acc]);
-redundant_values([], _, Acc) -> reverse(Acc).
 
 %%%
 %%% Final fixup of bs_start_match2/5,bs_save2/bs_restore2 instructions for
diff --git a/lib/compiler/src/beam_dead.erl b/lib/compiler/src/beam_dead.erl
index ead88b57e9..11129c39bc 100644
--- a/lib/compiler/src/beam_dead.erl
+++ b/lib/compiler/src/beam_dead.erl
@@ -239,11 +239,26 @@ backward([{test,is_eq_exact,Fail,[Dst,{integer,Arity}]}=I|
 backward([{label,Lbl}=L|Is], D, Acc) ->
     backward(Is, beam_utils:index_label(Lbl, Acc, D), [L|Acc]);
 backward([{select,select_val,Reg,{f,Fail0},List0}|Is], D, Acc) ->
-    List = shortcut_select_list(List0, Reg, D, []),
+    List1 = shortcut_select_list(List0, Reg, D, []),
     Fail1 = shortcut_label(Fail0, D),
     Fail = shortcut_bs_test(Fail1, Is, D),
-    Sel = {select,select_val,Reg,{f,Fail},List},
-    backward(Is, D, [Sel|Acc]);
+    List = prune_redundant(List1, Fail),
+    case List of
+	[] ->
+	    Jump = {jump,{f,Fail}},
+	    backward([Jump|Is], D, Acc);
+	[V,F] ->
+	    Test = {test,is_eq_exact,{f,Fail},[Reg,V]},
+	    Jump = {jump,F},
+	    backward([Jump,Test|Is], D, Acc);
+	[{atom,B1},F,{atom,B2},F] when B1 =:= not B2 ->
+	    Test = {test,is_boolean,{f,Fail},[Reg]},
+	    Jump = {jump,F},
+	    backward([Jump,Test|Is], D, Acc);
+	[_|_] ->
+	    Sel = {select,select_val,Reg,{f,Fail},List},
+	    backward(Is, D, [Sel|Acc])
+    end;
 backward([{jump,{f,To0}},{move,Src,Reg}=Move|Is], D, Acc) ->
     To = shortcut_select_label(To0, Reg, Src, D),
     Jump = {jump,{f,To}},
@@ -257,14 +272,17 @@ backward([{jump,{f,To}}=J|[{bif,Op,_,Ops,Reg}|Is]=Is0], D, Acc) ->
     catch
 	throw:not_possible -> backward(Is0, D, [J|Acc])
     end;
-backward([{test,bs_start_match2,F,_,[R,_],Ctxt}=I|Is], D,
+backward([{test,bs_start_match2,F,Live,[R,_]=Args,Ctxt}|Is], D,
 	 [{test,bs_match_string,F,[Ctxt,Bs]},
 	  {test,bs_test_tail2,F,[Ctxt,0]}|Acc0]=Acc) ->
+    {f,To0} = F,
+    To = shortcut_bs_start_match(To0, R, D),
     case beam_utils:is_killed(Ctxt, Acc0, D) of
 	true ->
-	    Eq = {test,is_eq_exact,F,[R,{literal,Bs}]},
+	    Eq = {test,is_eq_exact,{f,To},[R,{literal,Bs}]},
 	    backward(Is, D, [Eq|Acc0]);
 	false ->
+	    I = {test,bs_start_match2,{f,To},Live,Args,Ctxt},
 	    backward(Is, D, [I|Acc])
     end;
 backward([{test,bs_start_match2,{f,To0},Live,[Src|_]=Info,Dst}|Is], D, Acc) ->
@@ -295,7 +313,28 @@ backward([{test,Op,{f,To0},Ops0}|Is], D, Acc) ->
 	    is_eq_exact -> combine_eqs(To, Ops0, D, Acc);
 	    _ -> {test,Op,{f,To},Ops0}
 	end,
-    backward(Is, D, [I|Acc]);
+    case {I,Acc} of
+	{{test,is_atom,Fail,Ops0},[{test,is_boolean,Fail,Ops0}|_]} ->
+	    %% An is_atom test before an is_boolean test (with the
+	    %% same failure label) is redundant.
+	    backward(Is, D, Acc);
+	{{test,is_atom,Fail,[R]},
+	 [{test,is_eq_exact,Fail,[R,{atom,_}]}|_]} ->
+	    %% An is_atom test before a comparison with an atom (with
+	    %% the same failure label) is redundant.
+	    backward(Is, D, Acc);
+	{{test,is_integer,Fail,[R]},
+	 [{test,is_eq_exact,Fail,[R,{integer,_}]}|_]} ->
+	    %% An is_integer test before a comparison with an integer
+	    %% (with the same failure label) is redundant.
+	    backward(Is, D, Acc);
+	{{test,_,_,_},_} ->
+	    %% Still a test instruction. Done.
+	    backward(Is, D, [I|Acc]);
+	{_,_} ->
+	    %% Rewritten to a select_val. Rescan.
+	    backward([I|Is], D, Acc)
+    end;
 backward([{test,Op,{f,To0},Live,Ops0,Dst}|Is], D, Acc) ->
     To1 = shortcut_bs_test(To0, Is, D),
     To2 = shortcut_label(To1, D),
@@ -348,6 +387,12 @@ shortcut_label(To0, D) ->
 shortcut_select_label(To, Reg, Lit, D) ->
     shortcut_rel_op(To, is_ne_exact, [Reg,Lit], D).
 
+prune_redundant([_,{f,Fail}|T], Fail) ->
+    prune_redundant(T, Fail);
+prune_redundant([V,F|T], Fail) ->
+    [V,F|prune_redundant(T, Fail)];
+prune_redundant([], _) -> [].
+
 %% Replace a comparison operator with a test instruction and a jump.
 %% For example, if we have this code:
 %%
diff --git a/lib/compiler/src/beam_dict.erl b/lib/compiler/src/beam_dict.erl
index 2b5f8c1b7f..654fb47dbd 100644
--- a/lib/compiler/src/beam_dict.erl
+++ b/lib/compiler/src/beam_dict.erl
@@ -44,7 +44,7 @@
 	 locals = []		    :: [{label(), arity(), label()}],
 	 imports = gb_trees:empty() :: import_tab(),
 	 strings = <<>>		    :: binary(),	%String pool
-	 lambdas = [],				%[{...}]
+	 lambdas = {0,[]},				%[{...}]
 	 literals = dict:new()	    :: literal_tab(),
 	 fnames = #{}               :: fname_tab(),
 	 lines = #{}                :: line_tab(),
@@ -145,15 +145,14 @@ string(Str, Dict) when is_list(Str) ->
 -spec lambda(label(), non_neg_integer(), bdict()) ->
         {non_neg_integer(), bdict()}.
 
-lambda(Lbl, NumFree, #asm{lambdas=Lambdas0}=Dict) ->
-    OldIndex = length(Lambdas0),
+lambda(Lbl, NumFree, #asm{lambdas={OldIndex,Lambdas0}}=Dict) ->
     %% Set Index the same as OldIndex.
     Index = OldIndex,
     %% Initialize OldUniq to 0. It will be set to an unique value
     %% based on the MD5 checksum of the BEAM code for the module.
     OldUniq = 0,
     Lambdas = [{Lbl,{OldIndex,Lbl,Index,NumFree,OldUniq}}|Lambdas0],
-    {OldIndex,Dict#asm{lambdas=Lambdas}}.
+    {OldIndex,Dict#asm{lambdas={OldIndex+1,Lambdas}}}.
 
 %% Returns the index for a literal (adding it to the literal table if necessary).
 %%    literal(Literal, Dict) -> {Index,Dict'}
@@ -236,13 +235,13 @@ string_table(#asm{strings=Strings,string_offset=Size}) ->
 
 -spec lambda_table(bdict()) -> {non_neg_integer(), [<<_:192>>]}.
 
-lambda_table(#asm{locals=Loc0,lambdas=Lambdas0}) ->
+lambda_table(#asm{locals=Loc0,lambdas={NumLambdas,Lambdas0}}) ->
     Lambdas1 = sofs:relation(Lambdas0),
     Loc = sofs:relation([{Lbl,{F,A}} || {F,A,Lbl} <- Loc0]),
     Lambdas2 = sofs:relative_product1(Lambdas1, Loc),
     Lambdas = [<<F:32,A:32,Lbl:32,Index:32,NumFree:32,OldUniq:32>> ||
 		  {{_,Lbl,Index,NumFree,OldUniq},{F,A}} <- sofs:to_external(Lambdas2)],
-    {length(Lambdas),Lambdas}.
+    {NumLambdas,Lambdas}.
 
 %% Returns the literal table.
 %%    literal_table(Dict) -> {NumLiterals, [<<TermSize>>,TermInExternalFormat]}
diff --git a/lib/compiler/src/beam_jump.erl b/lib/compiler/src/beam_jump.erl
index 5e58e0f6ac..3b6eb19fe8 100644
--- a/lib/compiler/src/beam_jump.erl
+++ b/lib/compiler/src/beam_jump.erl
@@ -495,7 +495,7 @@ is_label_used_in_block({set,_,_,Info}, Lbl) ->
         {alloc,_,{gc_bif,_,{f,F}}} -> F =:= Lbl;
         {alloc,_,{put_map,_,{f,F}}} -> F =:= Lbl;
         {get_map_elements,{f,F}} -> F =:= Lbl;
-        {'catch',{f,F}} -> F =:= Lbl;
+        {try_catch,_,{f,F}} -> F =:= Lbl;
         {alloc,_,_} -> false;
         {put_tuple,_} -> false;
         {get_tuple_element,_} -> false;
diff --git a/lib/compiler/src/beam_peep.erl b/lib/compiler/src/beam_peep.erl
index 17fd2e502a..0c1abfe6a0 100644
--- a/lib/compiler/src/beam_peep.erl
+++ b/lib/compiler/src/beam_peep.erl
@@ -65,18 +65,6 @@ function({function,Name,Arity,CLabel,Is0}) ->
 %%      InEncoding =:= latin1, OutEncoding =:= unicode; 
 %%      InEncoding =:= latin1, OutEncoding =:= utf8 ->
 %%
-%% (2) A select_val/4 instruction that only verifies that
-%%     its argument is either 'true' or 'false' can be
-%%     be replaced with an is_boolean/2 instruction. That is:
-%%
-%%          select_val Reg Fail   [ true Next false Next ]
-%%        Next: ...
-%%         
-%%     can be rewritten to
-%%
-%%          is_boolean Fail Reg
-%%        Next: ...
-%%
 
 peep(Is) ->
     peep(Is, gb_sets:empty(), []).
@@ -95,12 +83,16 @@ peep([{gc_bif,_,_,_,_,Dst}=I|Is], SeenTests0, Acc) ->
     %% Kill all remembered tests that depend on the destination register.
     SeenTests = kill_seen(Dst, SeenTests0),
     peep(Is, SeenTests, [I|Acc]);
-peep([{test,is_boolean,{f,Fail},Ops}|_]=Is, SeenTests,
-     [{test,is_atom,{f,Fail},Ops}|Acc]) ->
-    %% The previous is_atom/2 test (with the same failure label) is redundant.
-    %% (If is_boolean(Src) is true, is_atom(Src) is also true, so it is
-    %% OK to still remember that we have seen is_atom/1.)
-    peep(Is, SeenTests, Acc);
+peep([{select,Op,R,F,Vls0}|Is], _, Acc) ->
+    case prune_redundant_values(Vls0, F) of
+	[] ->
+	    %% No values left. Must convert to plain jump.
+	    I = {jump,F},
+	    peep(Is, gb_sets:empty(), [I|Acc]);
+	[_|_]=Vls ->
+	    I = {select,Op,R,F,Vls},
+	    peep(Is, gb_sets:empty(), [I|Acc])
+    end;
 peep([{test,Op,_,Ops}=I|Is], SeenTests0, Acc) ->
     case beam_utils:is_pure_test(I) of
 	false ->
@@ -121,16 +113,6 @@ peep([{test,Op,_,Ops}=I|Is], SeenTests0, Acc) ->
 		    peep(Is, SeenTests, [I|Acc])
 	    end
     end;
-peep([{select,select_val,Src,Fail,
-       [{atom,false},{f,L},{atom,true},{f,L}]}|
-      [{label,L}|_]=Is], SeenTests, Acc) ->
-    I = {test,is_boolean,Fail,[Src]},
-    peep([I|Is], SeenTests, Acc);
-peep([{select,select_val,Src,Fail,
-       [{atom,true},{f,L},{atom,false},{f,L}]}|
-      [{label,L}|_]=Is], SeenTests, Acc) ->
-    I = {test,is_boolean,Fail,[Src]},
-    peep([I|Is], SeenTests, Acc);
 peep([I|Is], _, Acc) ->
     %% An unknown instruction. Throw away all information we
     %% have collected about test instructions.
@@ -155,3 +137,9 @@ kill_seen_1([{_,Ops}=Test|T], Dst) ->
 	false -> [Test|kill_seen_1(T, Dst)]
     end;
 kill_seen_1([], _) -> [].
+
+prune_redundant_values([_Val,F|Vls], F) ->
+    prune_redundant_values(Vls, F);
+prune_redundant_values([Val,Lbl|Vls], F) ->
+    [Val,Lbl|prune_redundant_values(Vls, F)];
+prune_redundant_values([], _) -> [].
diff --git a/lib/compiler/src/beam_reorder.erl b/lib/compiler/src/beam_reorder.erl
new file mode 100644
index 0000000000..41586a7bf2
--- /dev/null
+++ b/lib/compiler/src/beam_reorder.erl
@@ -0,0 +1,139 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2013. 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%
+%%
+
+-module(beam_reorder).
+
+-export([module/2]).
+-import(lists, [member/2,reverse/1]).
+
+module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
+    Fs = [function(F) || F <- Fs0],
+    {ok,{Mod,Exp,Attr,Fs,Lc}}.
+
+function({function,Name,Arity,CLabel,Is0}) ->
+    try
+	Is = reorder(Is0),
+	{function,Name,Arity,CLabel,Is}
+    catch
+	Class:Error ->
+	    Stack = erlang:get_stacktrace(),
+	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+	    erlang:raise(Class, Error, Stack)
+    end.
+
+%% reorder(Instructions0) -> Instructions
+%%  Reorder instructions before the beam_block pass, because reordering
+%%  will be more cumbersome when the blocks are in place.
+%%
+%%  Execution of get_tuple_element instructions can be delayed until
+%%  they are actually needed. Consider the sequence:
+%%
+%%      get_tuple_element Tuple Pos Dst
+%%      test Test Fail Operands
+%%
+%%  If Dst is killed at label Fail (and not referenced in Operands),
+%%  we can can swap the instructions:
+%%
+%%      test Test Fail Operands
+%%      get_tuple_element Tuple Pos Dst
+%%
+%%  That can be beneficial in two ways: Firstly, if the branch is taken
+%%  we have avoided execution of the get_tuple_element instruction.
+%%  Secondly, even if the branch is not taken, subsequent optimization
+%%  (opt_blocks/1) may be able to change Dst to the final destination
+%%  register and eliminate a 'move' instruction.
+
+reorder(Is) ->
+    D = beam_utils:index_labels(Is),
+    reorder_1(Is, D, []).
+
+reorder_1([{Op,_,_}=TryCatch|[I|Is]=Is0], D, Acc)
+  when Op =:= 'catch'; Op =:= 'try' ->
+    %% Don't allow 'try' or 'catch' instructions to split blocks if
+    %% it can be avoided.
+    case is_safe(I) of
+	false ->
+	    reorder_1(Is0, D, [TryCatch|Acc]);
+	true ->
+	    reorder_1([TryCatch|Is], D, [I|Acc])
+    end;
+reorder_1([{label,L}=I|_], D, Acc) ->
+    Is = beam_utils:code_at(L, D),
+    reorder_1(Is, D, [I|Acc]);
+reorder_1([{test,is_nonempty_list,_,_}=I|Is], D, Acc) ->
+    %% The run-time system may combine the is_nonempty_list test with
+    %% the following get_list instruction.
+    reorder_1(Is, D, [I|Acc]);
+reorder_1([{test,_,_,_}=I,
+	   {select,_,_,_,_}=S|Is], D, Acc) ->
+    %% There is nothing to gain by inserting a get_tuple_element
+    %% instruction between the test instruction and the select
+    %% instruction.
+    reorder_1(Is, D, [S,I|Acc]);
+reorder_1([{test,_,{f,L},Ss}=I|Is0], D0,
+	  [{get_tuple_element,_,_,El}=G|Acc0]=Acc) ->
+    case member(El, Ss) of
+	true ->
+	    reorder_1(Is0, D0, [I|Acc]);
+	false ->
+	    case beam_utils:is_killed_at(El, L, D0) of
+		true ->
+		    Is = [I,G|Is0],
+		    reorder_1(Is, D0, Acc0);
+		false ->
+		    case beam_utils:is_killed(El, Is0, D0) of
+			true ->
+			    Code0 = beam_utils:code_at(L, D0),
+			    Code = [G|Code0],
+			    D = beam_utils:index_label(L, Code, D0),
+			    Is = [I|Is0],
+			    reorder_1(Is, D, Acc0);
+			false ->
+			    reorder_1(Is0, D0, [I|Acc])
+		    end
+	    end
+    end;
+reorder_1([{allocate_zero,N,Live}=I0|Is], D,
+	  [{get_tuple_element,{x,Tup},_,{x,Dst}}=G|Acc]=Acc0) ->
+    case Tup < Dst andalso Dst+1 =:= Live of
+	true ->
+	    %% Move allocation instruction upwards past
+	    %% get_tuple_element instructions to create more
+	    %% opportunities for moving get_tuple_element
+	    %% instructions.
+	    I = {allocate_zero,N,Dst},
+	    reorder_1([I,G|Is], D, Acc);
+	false ->
+	    reorder_1(Is, D, [I0|Acc0])
+    end;
+reorder_1([I|Is], D, Acc) ->
+    reorder_1(Is, D, [I|Acc]);
+reorder_1([], _, Acc) -> reverse(Acc).
+
+%% is_safe(Instruction) -> true|false
+%%  Test whether an instruction is safe (cannot cause an exception).
+
+is_safe({kill,_}) -> true;
+is_safe({move,_,_}) -> true;
+is_safe({put,_}) -> true;
+is_safe({put_list,_,_,_}) -> true;
+is_safe({put_tuple,_,_}) -> true;
+is_safe({test_heap,_,_}) -> true;
+is_safe(_) -> false.
diff --git a/lib/compiler/src/beam_split.erl b/lib/compiler/src/beam_split.erl
index 3be9311080..7b7f0a0f80 100644
--- a/lib/compiler/src/beam_split.erl
+++ b/lib/compiler/src/beam_split.erl
@@ -47,6 +47,8 @@ split_block([{set,[R],[_,_,_]=As,{bif,is_record,{f,Lbl}}}|Is], Bl, Acc) ->
     split_block(Is, [], [{bif,is_record,{f,Lbl},As,R}|make_block(Bl, Acc)]);
 split_block([{set,[R],As,{bif,N,{f,Lbl}=Fail}}|Is], Bl, Acc) when Lbl =/= 0 ->
     split_block(Is, [], [{bif,N,Fail,As,R}|make_block(Bl, Acc)]);
+split_block([{set,[R],As,{bif,raise,{f,_}=Fail}}|Is], Bl, Acc) ->
+    split_block(Is, [], [{bif,raise,Fail,As,R}|make_block(Bl, Acc)]);
 split_block([{set,[R],As,{alloc,Live,{gc_bif,N,{f,Lbl}=Fail}}}|Is], Bl, Acc)
   when Lbl =/= 0 ->
     split_block(Is, [], [{gc_bif,N,Fail,Live,As,R}|make_block(Bl, Acc)]);
@@ -57,8 +59,8 @@ split_block([{set,[D],[S|Puts],{alloc,R,{put_map,Op,{f,Lbl}=Fail}}}|Is],
 split_block([{set,Ds,[S|Ss],{get_map_elements,Fail}}|Is], Bl, Acc) ->
     Gets = beam_utils:join_even(Ss,Ds),
     split_block(Is, [], [{get_map_elements,Fail,S,{list,Gets}}|make_block(Bl, Acc)]);
-split_block([{set,[R],[],{'catch',L}}|Is], Bl, Acc) ->
-    split_block(Is, [], [{'catch',R,L}|make_block(Bl, Acc)]);
+split_block([{set,[R],[],{try_catch,Op,L}}|Is], Bl, Acc) ->
+    split_block(Is, [], [{Op,R,L}|make_block(Bl, Acc)]);
 split_block([{set,[],[],{line,_}=Line}|Is], Bl, Acc) ->
     split_block(Is, [], [Line|make_block(Bl, Acc)]);
 split_block([I|Is], Bl, Acc) ->
diff --git a/lib/compiler/src/beam_type.erl b/lib/compiler/src/beam_type.erl
index 5298589f83..4b45c28623 100644
--- a/lib/compiler/src/beam_type.erl
+++ b/lib/compiler/src/beam_type.erl
@@ -23,7 +23,8 @@
 
 -export([module/2]).
 
--import(lists, [foldl/3,reverse/1,filter/2]).
+-import(lists, [filter/2,foldl/3,keyfind/3,member/2,
+		reverse/1,reverse/2,sort/1]).
 
 module({Mod,Exp,Attr,Fs0,Lc}, _Opts) ->
     Fs = [function(F) || F <- Fs0],
@@ -92,8 +93,19 @@ simplify_basic_1([{set,[D],[TupleReg],{get_tuple_element,0}}=I|Is0], Ts0, Acc) -
 	    Ts = update(I, Ts0),
 	    simplify_basic_1(Is0, Ts, [I|Acc])
     end;
-simplify_basic_1([{set,_,_,{'catch',_}}=I|Is], _Ts, Acc) ->
+simplify_basic_1([{set,_,_,{try_catch,_,_}}=I|Is], _Ts, Acc) ->
     simplify_basic_1(Is, tdb_new(), [I|Acc]);
+simplify_basic_1([{test,is_atom,_,[R]}=I|Is], Ts, Acc) ->
+    case tdb_find(R, Ts) of
+	boolean -> simplify_basic_1(Is, Ts, Acc);
+	_ -> simplify_basic_1(Is, Ts, [I|Acc])
+    end;
+simplify_basic_1([{test,is_integer,_,[R]}=I|Is], Ts, Acc) ->
+    case tdb_find(R, Ts) of
+	integer -> simplify_basic_1(Is, Ts, Acc);
+	{integer,_} -> simplify_basic_1(Is, Ts, Acc);
+	_ -> simplify_basic_1(Is, Ts, [I|Acc])
+    end;
 simplify_basic_1([{test,is_tuple,_,[R]}=I|Is], Ts, Acc) ->
     case tdb_find(R, Ts) of
 	{tuple,_,_} -> simplify_basic_1(Is, Ts, Acc);
@@ -137,6 +149,16 @@ simplify_basic_1([{test,is_record,_,[R,{atom,_}=Tag,{integer,Arity}]}=I|Is], Ts0
 	    Ts = update(I, Ts0),
 	    simplify_basic_1(Is, Ts, [I|Acc])
     end;
+simplify_basic_1([{select,select_val,Reg,_,_}=I0|Is], Ts, Acc) ->
+    I = case tdb_find(Reg, Ts) of
+	    {integer,Range} ->
+		simplify_select_val_int(I0, Range);
+	    boolean ->
+		simplify_select_val_bool(I0);
+	    _ ->
+		I0
+	end,
+    simplify_basic_1(Is, tdb_new(), [I|Acc]);
 simplify_basic_1([I|Is], Ts0, Acc) ->
     Ts = update(I, Ts0),
     simplify_basic_1(Is, Ts, [I|Acc]);
@@ -144,6 +166,32 @@ simplify_basic_1([], Ts, Acc) ->
     Is = reverse(Acc),
     {Is,Ts}.
 
+simplify_select_val_int({select,select_val,R,_,L0}=I, {Min,Max}) ->
+    Vs = sort([V || {integer,V} <- L0]),
+    case eq_ranges(Vs, Min, Max) of
+	false -> I;
+	true -> simplify_select_val_1(L0, {integer,Max}, R, [])
+    end.
+
+simplify_select_val_bool({select,select_val,R,_,L}=I) ->
+    Vs = sort([V || {atom,V} <- L]),
+    case Vs of
+	[false,true] ->
+	    simplify_select_val_1(L, {atom,false}, R, []);
+	_ ->
+	    I
+    end.
+
+simplify_select_val_1([Val,F|T], Val, R, Acc) ->
+    L = reverse(Acc, T),
+    {select,select_val,R,F,L};
+simplify_select_val_1([V,F|T], Val, R, Acc) ->
+    simplify_select_val_1(T, Val, R, [F,V|Acc]).
+
+eq_ranges([H], H, H) -> true;
+eq_ranges([H|T], H, Max) -> eq_ranges(T, H+1, Max);
+eq_ranges(_, _, _) -> false.
+
 %% simplify_float([Instruction], TypeDatabase) ->
 %%                 {[Instruction],TypeDatabase'} | not_possible
 %%  Simplify floating point operations in blocks.
@@ -199,7 +247,7 @@ simplify_float_1([{set,[D0],[A0,B0],{alloc,_,{gc_bif,Op0,{f,0}}}}=I|Is]=Is0,
 	    Ts = tdb_update([{D0,float}], Ts0),
 	    simplify_float_1(Is, Ts, Rs, Acc)
     end;
-simplify_float_1([{set,_,_,{'catch',_}}=I|Is]=Is0, _Ts, Rs0, Acc0) ->
+simplify_float_1([{set,_,_,{try_catch,_,_}}=I|Is]=Is0, _Ts, Rs0, Acc0) ->
     Acc = flush_all(Rs0, Is0, Acc0),
     simplify_float_1(Is, tdb_new(), Rs0, [I|Acc]);
 simplify_float_1([{set,_,_,{line,_}}=I|Is], Ts, Rs, Acc) ->
@@ -311,7 +359,7 @@ flt_need_heap_2({set,_,_,{get_tuple_element,_}}, H, Fl) ->
     {[],H,Fl};
 flt_need_heap_2({set,_,_,get_list}, H, Fl) ->
     {[],H,Fl};
-flt_need_heap_2({set,_,_,{'catch',_}}, H, Fl) ->
+flt_need_heap_2({set,_,_,{try_catch,_,_}}, H, Fl) ->
     {[],H,Fl};
 %% All other instructions should cause the insertion of an allocation
 %% instruction if needed.
@@ -382,6 +430,17 @@ update({set,[D],[{integer,I},Reg],{bif,element,_}}, Ts0) ->
     tdb_update([{Reg,{tuple,I,[]}},{D,kill}], Ts0);
 update({set,[D],[_Index,Reg],{bif,element,_}}, Ts0) ->
     tdb_update([{Reg,{tuple,0,[]}},{D,kill}], Ts0);
+update({set,[D],Args,{bif,N,_}}, Ts0) ->
+    Ar = length(Args),
+    BoolOp = erl_internal:new_type_test(N, Ar) orelse
+	erl_internal:comp_op(N, Ar) orelse
+	erl_internal:bool_op(N, Ar),
+    case BoolOp of
+	true ->
+	    tdb_update([{D,boolean}], Ts0);
+	false ->
+	    tdb_update([{D,kill}], Ts0)
+    end;
 update({set,[D],[S],{get_tuple_element,0}}, Ts) ->
     tdb_update([{D,{tuple_element,S,0}}], Ts);
 update({set,[D],[S],{alloc,_,{gc_bif,float,{f,0}}}}, Ts0) ->
@@ -390,6 +449,13 @@ update({set,[D],[S],{alloc,_,{gc_bif,float,{f,0}}}}, Ts0) ->
 	true ->  tdb_update([{D,float}], Ts0);
 	false -> Ts0
     end;
+update({set,[D],[S1,S2],{alloc,_,{gc_bif,'band',{f,0}}}}, Ts) ->
+    case keyfind(integer, 1, [S1,S2]) of
+	{integer,N} ->
+	    update_band(N, D, Ts);
+	false ->
+	    tdb_update([{D,integer}], Ts)
+    end;
 update({set,[D],[S1,S2],{alloc,_,{gc_bif,'/',{f,0}}}}, Ts0) ->
     %% Make sure we reject non-numeric literals.
     case possibly_numeric(S1) andalso possibly_numeric(S2) of
@@ -397,15 +463,17 @@ update({set,[D],[S1,S2],{alloc,_,{gc_bif,'/',{f,0}}}}, Ts0) ->
 	false -> Ts0
     end;
 update({set,[D],[S1,S2],{alloc,_,{gc_bif,Op,{f,0}}}}, Ts0) ->
-    case arith_op(Op) of
-	no ->
-	    tdb_update([{D,kill}], Ts0);
-	{yes,_} ->
+    case op_type(Op) of
+	integer ->
+	    tdb_update([{D,integer}], Ts0);
+	{float,_} ->
 	    case {tdb_find(S1, Ts0),tdb_find(S2, Ts0)} of
 		{float,_} -> tdb_update([{D,float}], Ts0);
 		{_,float} -> tdb_update([{D,float}], Ts0);
 		{_,_} -> tdb_update([{D,kill}], Ts0)
-	    end
+	    end;
+	unknown ->
+	    tdb_update([{D,kill}], Ts0)
     end;
 update({set,[],_Src,_Op}, Ts0) -> Ts0;
 update({set,[D],_Src,_Op}, Ts0) ->
@@ -437,6 +505,8 @@ update({test,is_record,_Fail,[Src,Tag,{integer,Arity}]}, Ts) ->
     tdb_update([{Src,{tuple,Arity,[Tag]}}], Ts);
 update({test,_Test,_Fail,_Other}, Ts) ->
     Ts;
+update({test,bs_get_integer2,_,_,Args,Dst}, Ts) ->
+    tdb_update([{Dst,get_bs_integer_type(Args)}], Ts);
 update({call_ext,Ar,{extfunc,math,Math,Ar}}, Ts) ->
     case is_math_bif(Math, Ar) of
 	true -> tdb_update([{{x,0},float}], Ts);
@@ -453,10 +523,43 @@ update({call,_Arity,_Func}, Ts) -> tdb_kill_xregs(Ts);
 update({call_ext,_Arity,_Func}, Ts) -> tdb_kill_xregs(Ts);
 update({make_fun2,_,_,_,_}, Ts) -> tdb_kill_xregs(Ts);
 update({line,_}, Ts) -> Ts;
+update({bs_save2,_,_}, Ts) -> Ts;
+update({bs_restore2,_,_}, Ts) -> Ts;
 
 %% The instruction is unknown.  Kill all information.
 update(_I, _Ts) -> tdb_new().
 
+update_band(N, Reg, Ts) ->
+    Type = update_band_1(N, 0),
+    tdb_update([{Reg,Type}], Ts).
+
+update_band_1(N, Bits) when Bits < 64 ->
+    case 1 bsl Bits of
+	P when P =:= N + 1 ->
+	    {integer,{0,N}};
+	P when P > N + 1 ->
+	    integer;
+	_ ->
+	    update_band_1(N, Bits+1)
+    end;
+update_band_1(_, _) ->
+    %% Negative or large positive number. Give up.
+    integer.
+
+get_bs_integer_type([_,{integer,N},U,{field_flags,Fl}])
+  when N*U < 64 ->
+    NumBits = N*U,
+    case member(unsigned, Fl) of
+	true ->
+	    {integer,{0,(1 bsl NumBits)-1}};
+	false ->
+	    %% Signed integer. Don't bother.
+	    integer
+    end;
+get_bs_integer_type(_) ->
+    %% Avoid creating ranges with a huge upper limit.
+    integer.
+
 is_math_bif(cos, 1) -> true;
 is_math_bif(cosh, 1) -> true;
 is_math_bif(sin, 1) -> true;
@@ -545,11 +648,22 @@ load_reg(V, Ts, Rs0, Is0) ->
 	    {Rs,Is}
     end.
 
-arith_op('+') -> {yes,fadd};
-arith_op('-') -> {yes,fsub};
-arith_op('*') -> {yes,fmul};
-arith_op('/') -> {yes,fdiv};
-arith_op(_) -> no.
+arith_op(Op) ->
+    case op_type(Op) of
+	{float,Instr} -> {yes,Instr};
+	_ -> no
+    end.
+
+op_type('+') -> {float,fadd};
+op_type('-') -> {float,fsub};
+op_type('*') -> {float,fmul};
+%% '/' and 'band' are specially handled.
+op_type('bor') -> integer;
+op_type('bxor') -> integer;
+op_type('bsl') -> integer;
+op_type('bsr') -> integer;
+op_type('div') -> integer;
+op_type(_) -> unknown.
 
 flush(Rs, [{set,[_],[],{put_tuple,_}}|_]=Is0, Acc0) ->
     Acc = flush_all(Rs, Is0, Acc0),
@@ -618,7 +732,6 @@ checkerror(Is) ->
     checkerror_1(Is, Is).
 
 checkerror_1([{set,[],[],fcheckerror}|_], OrigIs) -> OrigIs;
-checkerror_1([{set,[],[],fclearerror}|_], OrigIs) -> OrigIs;
 checkerror_1([{set,_,_,{bif,fadd,_}}|_], OrigIs) -> checkerror_2(OrigIs);
 checkerror_1([{set,_,_,{bif,fsub,_}}|_], OrigIs) -> checkerror_2(OrigIs);
 checkerror_1([{set,_,_,{bif,fmul,_}}|_], OrigIs) -> checkerror_2(OrigIs);
@@ -640,6 +753,9 @@ checkerror_2(OrigIs) -> [{set,[],[],fcheckerror}|OrigIs].
 %%% of the first element).
 %%%
 %%% 'float' means that the register contains a float.
+%%%
+%%% 'integer' or {integer,{Min,Max}} that the register contains an
+%%% integer.
 
 %% tdb_new() -> EmptyDataBase
 %%  Creates a new, empty type database.
@@ -729,10 +845,20 @@ merge_type_info({tuple,Sz1,[]}, {tuple,_Sz2,First}=Tuple2) ->
     merge_type_info({tuple,Sz1,First}, Tuple2);
 merge_type_info({tuple,_Sz1,First}=Tuple1, {tuple,Sz2,_}) ->
     merge_type_info(Tuple1, {tuple,Sz2,First});
+merge_type_info(integer, {integer,_}=Int) ->
+    Int;
+merge_type_info({integer,_}=Int, integer) ->
+    Int;
+merge_type_info({integer,{Min1,Max1}}, {integer,{Min2,Max2}}) ->
+    {integer,{max(Min1, Min2),min(Max1, Max2)}};
 merge_type_info(NewType, _) ->
     verify_type(NewType),
     NewType.
 
+verify_type(boolean) -> ok;
+verify_type(integer) -> ok;
+verify_type({integer,{Min,Max}})
+  when is_integer(Min), is_integer(Max) -> ok;
 verify_type(map) -> ok;
 verify_type(nonempty_list) -> ok;
 verify_type({tuple,Sz,[]}) when is_integer(Sz) -> ok;
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl
index fbcd5de1bb..68d6105cfa 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -484,6 +484,15 @@ check_liveness(R, [{get_map_elements,{f,Fail},S,{list,L}}|Is], St0) ->
 		    Other
 	    end
     end;
+check_liveness(R, [{test_heap,N,Live}|Is], St) ->
+    I = {block,[{set,[],[],{alloc,Live,{nozero,nostack,N,[]}}}]},
+    check_liveness(R, [I|Is], St);
+check_liveness(R, [{allocate_zero,N,Live}|Is], St) ->
+    I = {block,[{set,[],[],{alloc,Live,{zero,N,0,[]}}}]},
+    check_liveness(R, [I|Is], St);
+check_liveness(R, [{get_list,S,D1,D2}|Is], St) ->
+    I = {block,[{set,[D1,D2],[S],get_list}]},
+    check_liveness(R, [I|Is], St);
 check_liveness(_R, Is, St) when is_list(Is) ->
 %%     case Is of
 %% 	[I|_] ->
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index 6004f1974e..1c052789fd 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -31,15 +31,6 @@
 
 -import(lists, [reverse/1,foldl/3,foreach/2,dropwhile/2]).
 
--define(MAXREG, 1024).
-
-%%-define(DEBUG, 1).
--ifdef(DEBUG).
--define(DBG_FORMAT(F, D), (io:format((F), (D)))).
--else.
--define(DBG_FORMAT(F, D), ok).
--endif.
-
 %% To be called by the compiler.
 module({Mod,Exp,Attr,Fs,Lc}=Code, _Opts)
   when is_atom(Mod), is_list(Exp), is_list(Attr), is_integer(Lc) ->
@@ -170,29 +161,18 @@ validate_0(Module, [{function,Name,Ar,Entry,Code}|Fs], Ft) ->
 	 		% in the module (those that start with bs_start_match2).
 	}).
 
--ifdef(DEBUG).
-print_st(#st{x=Xs,y=Ys,numy=NumY,h=H,ct=Ct}) ->
-    io:format("  #st{x=~p~n"
-	      "      y=~p~n"
-	      "      numy=~p,h=~p,ct=~w~n",
-	      [gb_trees:to_list(Xs),gb_trees:to_list(Ys),NumY,H,Ct]).
--endif.
-
 validate_1(Is, Name, Arity, Entry, Ft) ->
     validate_2(labels(Is), Name, Arity, Entry, Ft).
 
 validate_2({Ls1,[{func_info,{atom,Mod},{atom,Name},Arity}=_F|Is]},
 	   Name, Arity, Entry, Ft) ->
-    lists:foreach(fun (_L) -> ?DBG_FORMAT("  ~p.~n", [{label,_L}]) end, Ls1),
-    ?DBG_FORMAT("  ~p.~n", [_F]),
     validate_3(labels(Is), Name, Arity, Entry, Mod, Ls1, Ft);
 validate_2({Ls1,Is}, Name, Arity, _Entry, _Ft) ->
     error({{'_',Name,Arity},{first(Is),length(Ls1),illegal_instruction}}).
 
 validate_3({Ls2,Is}, Name, Arity, Entry, Mod, Ls1, Ft) ->
-    lists:foreach(fun (_L) -> ?DBG_FORMAT("  ~p.~n", [{label,_L}]) end, Ls2),
     Offset = 1 + length(Ls1) + 1 + length(Ls2),
-    EntryOK = (Entry =:= undefined) orelse lists:member(Entry, Ls2),
+    EntryOK = lists:member(Entry, Ls2),
     if
 	EntryOK ->
 	    St = init_state(Arity),
@@ -260,7 +240,6 @@ valfun([], MFA, _Offset, #vst{branched=Targets0,labels=Labels0}=Vst) ->
 	    error({MFA,Error})
     end;
 valfun([I|Is], MFA, Offset, Vst0) ->
-    ?DBG_FORMAT("    ~p.\n", [I]),
     valfun(Is, MFA, Offset+1,
 	   try
 	       Vst = val_dsetel(I, Vst0),
@@ -278,7 +257,6 @@ valfun_1({label,Lbl}, #vst{current=St0,branched=B,labels=Lbls}=Vst) ->
 valfun_1(_I, #vst{current=none}=Vst) ->
     %% Ignore instructions after erlang:error/1,2, which
     %% the original R10B compiler thought would return.
-    ?DBG_FORMAT("Ignoring ~p\n", [_I]),
     Vst;
 valfun_1({badmatch,Src}, Vst) ->
     assert_term(Src, Vst),
@@ -531,6 +509,9 @@ valfun_4({bif,element,{f,Fail},[Pos,Tuple],Dst}, Vst0) ->
     TupleType = upgrade_tuple_type({tuple,[get_tuple_size(PosType)]}, TupleType0),
     Vst = set_type(TupleType, Tuple, Vst1),
     set_type_reg(term, Dst, Vst);
+valfun_4({bif,raise,{f,0},Src,_Dst}, Vst) ->
+    validate_src(Src, Vst),
+    kill_state(Vst);
 valfun_4({bif,Op,{f,Fail},Src,Dst}, Vst0) ->
     validate_src(Src, Vst0),
     Vst = branch_state(Fail, Vst0),
@@ -980,9 +961,9 @@ get_fls(#vst{current=#st{fls=Fls}}) when is_atom(Fls) -> Fls.
 
 init_fregs() -> 0.
 
-set_freg({fr,Fr}, #vst{current=#st{f=Fregs0}=St}=Vst)
+set_freg({fr,Fr}=Freg, #vst{current=#st{f=Fregs0}=St}=Vst)
   when is_integer(Fr), 0 =< Fr ->
-    limit_check(Fr),
+    check_limit(Freg),
     Bit = 1 bsl Fr,
     if
 	Fregs0 band Bit =:= 0 ->
@@ -995,9 +976,10 @@ set_freg(Fr, _) -> error({bad_target,Fr}).
 assert_freg_set({fr,Fr}=Freg, #vst{current=#st{f=Fregs}})
   when is_integer(Fr), 0 =< Fr ->
     if
-	Fregs band (1 bsl Fr) =/= 0 ->
-	    limit_check(Fr);
-	true -> error({uninitialized_reg,Freg})
+	(Fregs bsr Fr) band 1 =:= 0 ->
+	    error({uninitialized_reg,Freg});
+	true ->
+	    ok
     end;
 assert_freg_set(Fr, _) -> error({bad_source,Fr}).
 
@@ -1076,16 +1058,16 @@ set_type(Type, {x,_}=Reg, Vst) -> set_type_reg(Type, Reg, Vst);
 set_type(Type, {y,_}=Reg, Vst) -> set_type_y(Type, Reg, Vst);
 set_type(_, _, #vst{}=Vst) -> Vst.
 
-set_type_reg(Type, {x,X}, #vst{current=#st{x=Xs}=St}=Vst) 
+set_type_reg(Type, {x,X}=Reg, #vst{current=#st{x=Xs}=St}=Vst)
   when is_integer(X), 0 =< X ->
-    limit_check(X),
+    check_limit(Reg),
     Vst#vst{current=St#st{x=gb_trees:enter(X, Type, Xs)}};
 set_type_reg(Type, Reg, Vst) ->
     set_type_y(Type, Reg, Vst).
 
 set_type_y(Type, {y,Y}=Reg, #vst{current=#st{y=Ys0}=St}=Vst)
   when is_integer(Y), 0 =< Y ->
-    limit_check(Y),
+    check_limit(Reg),
     Ys = case gb_trees:lookup(Y, Ys0) of
 	     none ->
 		 error({invalid_store,Reg,Type});
@@ -1612,17 +1594,19 @@ return_type_math(pow, 2) -> {float,[]};
 return_type_math(pi, 0) -> {float,[]};
 return_type_math(F, A) when is_atom(F), is_integer(A), A >= 0 -> term.
 
-limit_check(Num) when is_integer(Num), Num >= ?MAXREG ->
-    error(limit);
-limit_check(_) -> ok.
+check_limit({x,X}) when is_integer(X), X < 1023 ->
+    %% Note: x(1023) is reserved for use by the BEAM loader.
+    ok;
+check_limit({y,Y}) when is_integer(Y), Y < 1024 ->
+    ok;
+check_limit({fr,Fr}) when is_integer(Fr), Fr < 1024 ->
+    ok;
+check_limit(_) ->
+    error(limit).
 
 min(A, B) when is_integer(A), is_integer(B), A < B -> A;
 min(A, B) when is_integer(A), is_integer(B) -> B.
 
 gb_trees_from_list(L) -> gb_trees:from_orddict(lists:sort(L)).
 
--ifdef(DEBUG).
-error(Error) -> exit(Error).
--else.
 error(Error) -> throw(Error).
--endif.
diff --git a/lib/compiler/src/beam_z.erl b/lib/compiler/src/beam_z.erl
index 8381578b68..e44423d257 100644
--- a/lib/compiler/src/beam_z.erl
+++ b/lib/compiler/src/beam_z.erl
@@ -24,6 +24,8 @@
 
 -export([module/2]).
 
+-import(lists, [dropwhile/2]).
+
 module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
     Fs = [function(F) || F <- Fs0],
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
@@ -51,6 +53,16 @@ undo_renames([{call,A,F},return|Is]) ->
     [{call_only,A,F}|undo_renames(Is)];
 undo_renames([{call_ext,A,F},return|Is]) ->
     [{call_ext_only,A,F}|undo_renames(Is)];
+undo_renames([{bif,raise,_,_,_}=I|Is0]) ->
+    %% A minor optimization. Done here because:
+    %%  (1) beam_jump may move or share 'raise' instructions, and that
+    %%      may confuse beam_validator.
+    %%  (2) beam_trim cannot do its optimization if the 'deallocate'
+    %%      instruction after 'raise' has been removed.
+    Is = dropwhile(fun({label,_}) -> false;
+		      (_) -> true
+		   end, Is0),
+    [I|undo_renames(Is)];
 undo_renames([I|Is]) ->
     [undo_rename(I)|undo_renames(Is)];
 undo_renames([]) -> [].
diff --git a/lib/compiler/src/cerl_trees.erl b/lib/compiler/src/cerl_trees.erl
index 58bb18e34a..b86be95cab 100644
--- a/lib/compiler/src/cerl_trees.erl
+++ b/lib/compiler/src/cerl_trees.erl
@@ -27,7 +27,7 @@
 -module(cerl_trees).
 
 -export([depth/1, fold/3, free_variables/1, get_label/1, label/1, label/2, 
-	 map/2, mapfold/3, size/1, variables/1]).
+	 map/2, mapfold/3, mapfold/4, size/1, variables/1]).
 
 -import(cerl, [alias_pat/1, alias_var/1, ann_c_alias/3, ann_c_apply/3,
 	       ann_c_binary/2, ann_c_bitstr/6, ann_c_call/4,
@@ -340,136 +340,162 @@ fold_pairs(_, S, []) ->
 %% starting with the given value <code>Initial</code>, while doing a
 %% post-order traversal of the tree, much like <code>fold/3</code>.
 %%
+%% This is the same as mapfold/4, with an identity function as the
+%% pre-operation.
+%%
 %% @see map/2
 %% @see fold/3
+%% @see mapfold/4
 
 -spec mapfold(fun((cerl:cerl(), term()) -> {cerl:cerl(), term()}),
 	      term(), cerl:cerl()) -> {cerl:cerl(), term()}.
 
 mapfold(F, S0, T) ->
+  mapfold(fun(T0, A) -> {T0, A} end, F, S0, T).
+
+
+%% @spec mapfold(Pre, Post, Initial::term(), Tree::cerl()) ->
+%%           {cerl(), term()}
+%%
+%%    Pre = Post = (cerl(), term()) -> {cerl(), term()}
+%%
+%% @doc Does a combined map/fold operation on the nodes of the
+%% tree. It begins by calling <code>Pre</code> on the tree, using the
+%% <code>Initial</code> value. It then deconstructs the top node of
+%% the returned tree and recurses on the children, using the returned
+%% value as the new initial and carrying the returned values from one
+%% call to the next. Finally it reassembles the top node from the
+%% children, calls <code>Post</code> on it and returns the result.
+
+-spec mapfold(fun((cerl:cerl(), term()) -> {cerl:cerl(), term()}),
+              fun((cerl:cerl(), term()) -> {cerl:cerl(), term()}),
+	      term(), cerl:cerl()) -> {cerl:cerl(), term()}.
+
+mapfold(Pre, Post, S00, T0) ->
+    {T, S0} = Pre(T0, S00),
     case type(T) of
  	literal ->
 	    case concrete(T) of
 		[_ | _] ->
-		    {T1, S1} = mapfold(F, S0, cons_hd(T)),
-		    {T2, S2} = mapfold(F, S1, cons_tl(T)),
-		    F(update_c_cons(T, T1, T2), S2);
+		    {T1, S1} = mapfold(Pre, Post, S0, cons_hd(T)),
+		    {T2, S2} = mapfold(Pre, Post, S1, cons_tl(T)),
+		    Post(update_c_cons(T, T1, T2), S2);
 		V when tuple_size(V) > 0 ->
-		    {Ts, S1} = mapfold_list(F, S0, tuple_es(T)),
-		    F(update_c_tuple(T, Ts), S1);
+		    {Ts, S1} = mapfold_list(Pre, Post, S0, tuple_es(T)),
+		    Post(update_c_tuple(T, Ts), S1);
 		_ ->
-		    F(T, S0)
+		    Post(T, S0)
 	    end;
  	var ->
- 	    F(T, S0);
+	    Post(T, S0);
 	values ->
-	    {Ts, S1} = mapfold_list(F, S0, values_es(T)),
- 	    F(update_c_values(T, Ts), S1);
+	    {Ts, S1} = mapfold_list(Pre, Post, S0, values_es(T)),
+	    Post(update_c_values(T, Ts), S1);
 	cons ->
-	    {T1, S1} = mapfold(F, S0, cons_hd(T)),
-	    {T2, S2} = mapfold(F, S1, cons_tl(T)),
-	    F(update_c_cons_skel(T, T1, T2), S2);
+	    {T1, S1} = mapfold(Pre, Post, S0, cons_hd(T)),
+	    {T2, S2} = mapfold(Pre, Post, S1, cons_tl(T)),
+	    Post(update_c_cons_skel(T, T1, T2), S2);
  	tuple ->
-	    {Ts, S1} = mapfold_list(F, S0, tuple_es(T)),
-	    F(update_c_tuple_skel(T, Ts), S1);
+	    {Ts, S1} = mapfold_list(Pre, Post, S0, tuple_es(T)),
+	    Post(update_c_tuple_skel(T, Ts), S1);
 	map ->
-	    {M , S1} = mapfold(F, S0, map_arg(T)),
-	    {Ts, S2} = mapfold_list(F, S1, map_es(T)),
-	    F(update_c_map(T, M, Ts), S2);
+	    {M , S1} = mapfold(Pre, Post, S0, map_arg(T)),
+	    {Ts, S2} = mapfold_list(Pre, Post, S1, map_es(T)),
+	    Post(update_c_map(T, M, Ts), S2);
 	map_pair ->
-	    {Op,  S1} = mapfold(F, S0, map_pair_op(T)),
-	    {Key, S2} = mapfold(F, S1, map_pair_key(T)),
-	    {Val, S3} = mapfold(F, S2, map_pair_val(T)),
-	    F(update_c_map_pair(T,Op,Key,Val), S3);
+	    {Op,  S1} = mapfold(Pre, Post, S0, map_pair_op(T)),
+	    {Key, S2} = mapfold(Pre, Post, S1, map_pair_key(T)),
+	    {Val, S3} = mapfold(Pre, Post, S2, map_pair_val(T)),
+	    Post(update_c_map_pair(T,Op,Key,Val), S3);
  	'let' ->
-	    {Vs, S1} = mapfold_list(F, S0, let_vars(T)),
-	    {A, S2} = mapfold(F, S1, let_arg(T)),
-	    {B, S3} = mapfold(F, S2, let_body(T)),
-	    F(update_c_let(T, Vs, A, B), S3);
+	    {Vs, S1} = mapfold_list(Pre, Post, S0, let_vars(T)),
+	    {A, S2} = mapfold(Pre, Post, S1, let_arg(T)),
+	    {B, S3} = mapfold(Pre, Post, S2, let_body(T)),
+	    Post(update_c_let(T, Vs, A, B), S3);
 	seq ->
-	    {A, S1} = mapfold(F, S0, seq_arg(T)),
-	    {B, S2} = mapfold(F, S1, seq_body(T)),
- 	    F(update_c_seq(T, A, B), S2);
+	    {A, S1} = mapfold(Pre, Post, S0, seq_arg(T)),
+	    {B, S2} = mapfold(Pre, Post, S1, seq_body(T)),
+	    Post(update_c_seq(T, A, B), S2);
  	apply ->
-	    {E, S1} = mapfold(F, S0, apply_op(T)),
-	    {As, S2} = mapfold_list(F, S1, apply_args(T)),
-	    F(update_c_apply(T, E, As), S2);
+	    {E, S1} = mapfold(Pre, Post, S0, apply_op(T)),
+	    {As, S2} = mapfold_list(Pre, Post, S1, apply_args(T)),
+	    Post(update_c_apply(T, E, As), S2);
  	call ->
-	    {M, S1} = mapfold(F, S0, call_module(T)),
-	    {N, S2} = mapfold(F, S1, call_name(T)),
-	    {As, S3} = mapfold_list(F, S2, call_args(T)),
- 	    F(update_c_call(T, M, N, As), S3);
+	    {M, S1} = mapfold(Pre, Post, S0, call_module(T)),
+	    {N, S2} = mapfold(Pre, Post, S1, call_name(T)),
+	    {As, S3} = mapfold_list(Pre, Post, S2, call_args(T)),
+	    Post(update_c_call(T, M, N, As), S3);
  	primop ->
-	    {N, S1} = mapfold(F, S0, primop_name(T)),
-	    {As, S2} = mapfold_list(F, S1, primop_args(T)),
-	    F(update_c_primop(T, N, As), S2);
+	    {N, S1} = mapfold(Pre, Post, S0, primop_name(T)),
+	    {As, S2} = mapfold_list(Pre, Post, S1, primop_args(T)),
+	    Post(update_c_primop(T, N, As), S2);
  	'case' ->
-	    {A, S1} = mapfold(F, S0, case_arg(T)),
-	    {Cs, S2} = mapfold_list(F, S1, case_clauses(T)),
- 	    F(update_c_case(T, A, Cs), S2);
+	    {A, S1} = mapfold(Pre, Post, S0, case_arg(T)),
+	    {Cs, S2} = mapfold_list(Pre, Post, S1, case_clauses(T)),
+	    Post(update_c_case(T, A, Cs), S2);
  	clause ->
-	    {Ps, S1} = mapfold_list(F, S0, clause_pats(T)),
-	    {G, S2} = mapfold(F, S1, clause_guard(T)),
-	    {B, S3} = mapfold(F, S2, clause_body(T)),
-	    F(update_c_clause(T, Ps, G, B), S3);
+	    {Ps, S1} = mapfold_list(Pre, Post, S0, clause_pats(T)),
+	    {G, S2} = mapfold(Pre, Post, S1, clause_guard(T)),
+	    {B, S3} = mapfold(Pre, Post, S2, clause_body(T)),
+	    Post(update_c_clause(T, Ps, G, B), S3);
  	alias ->
-	    {V, S1} = mapfold(F, S0, alias_var(T)),
-	    {P, S2} = mapfold(F, S1, alias_pat(T)),
-	    F(update_c_alias(T, V, P), S2);
+	    {V, S1} = mapfold(Pre, Post, S0, alias_var(T)),
+	    {P, S2} = mapfold(Pre, Post, S1, alias_pat(T)),
+	    Post(update_c_alias(T, V, P), S2);
  	'fun' ->
-	    {Vs, S1} = mapfold_list(F, S0, fun_vars(T)),
-	    {B, S2} = mapfold(F, S1, fun_body(T)),
-	    F(update_c_fun(T, Vs, B), S2);
+	    {Vs, S1} = mapfold_list(Pre, Post, S0, fun_vars(T)),
+	    {B, S2} = mapfold(Pre, Post, S1, fun_body(T)),
+	    Post(update_c_fun(T, Vs, B), S2);
  	'receive' ->
-	    {Cs, S1} = mapfold_list(F, S0, receive_clauses(T)),
-	    {E, S2} = mapfold(F, S1, receive_timeout(T)),
-	    {A, S3} = mapfold(F, S2, receive_action(T)),
-	    F(update_c_receive(T, Cs, E, A), S3);
+	    {Cs, S1} = mapfold_list(Pre, Post, S0, receive_clauses(T)),
+	    {E, S2} = mapfold(Pre, Post, S1, receive_timeout(T)),
+	    {A, S3} = mapfold(Pre, Post, S2, receive_action(T)),
+	    Post(update_c_receive(T, Cs, E, A), S3);
  	'try' ->
-	    {E, S1} = mapfold(F, S0, try_arg(T)),
-	    {Vs, S2} = mapfold_list(F, S1, try_vars(T)),
-	    {B, S3} = mapfold(F, S2, try_body(T)),
-	    {Evs, S4} = mapfold_list(F, S3, try_evars(T)),
-	    {H, S5} = mapfold(F, S4, try_handler(T)),
-	    F(update_c_try(T, E, Vs, B, Evs, H), S5);
+	    {E, S1} = mapfold(Pre, Post, S0, try_arg(T)),
+	    {Vs, S2} = mapfold_list(Pre, Post, S1, try_vars(T)),
+	    {B, S3} = mapfold(Pre, Post, S2, try_body(T)),
+	    {Evs, S4} = mapfold_list(Pre, Post, S3, try_evars(T)),
+	    {H, S5} = mapfold(Pre, Post, S4, try_handler(T)),
+	    Post(update_c_try(T, E, Vs, B, Evs, H), S5);
  	'catch' ->
-	    {B, S1} = mapfold(F, S0, catch_body(T)),
-	    F(update_c_catch(T, B), S1);
+	    {B, S1} = mapfold(Pre, Post, S0, catch_body(T)),
+	    Post(update_c_catch(T, B), S1);
 	binary ->
-	    {Ds, S1} = mapfold_list(F, S0, binary_segments(T)),
-	    F(update_c_binary(T, Ds), S1);
+	    {Ds, S1} = mapfold_list(Pre, Post, S0, binary_segments(T)),
+	    Post(update_c_binary(T, Ds), S1);
 	bitstr ->
-	    {Val, S1} = mapfold(F, S0, bitstr_val(T)),
-	    {Size, S2} = mapfold(F, S1, bitstr_size(T)),
-	    {Unit, S3} = mapfold(F, S2, bitstr_unit(T)),
-	    {Type, S4} = mapfold(F, S3, bitstr_type(T)),
-	    {Flags, S5} = mapfold(F, S4, bitstr_flags(T)),
-	    F(update_c_bitstr(T, Val, Size, Unit, Type, Flags), S5);
+	    {Val, S1} = mapfold(Pre, Post, S0, bitstr_val(T)),
+	    {Size, S2} = mapfold(Pre, Post, S1, bitstr_size(T)),
+	    {Unit, S3} = mapfold(Pre, Post, S2, bitstr_unit(T)),
+	    {Type, S4} = mapfold(Pre, Post, S3, bitstr_type(T)),
+	    {Flags, S5} = mapfold(Pre, Post, S4, bitstr_flags(T)),
+	    Post(update_c_bitstr(T, Val, Size, Unit, Type, Flags), S5);
 	letrec ->
-	    {Ds, S1} = mapfold_pairs(F, S0, letrec_defs(T)),
-	    {B, S2} = mapfold(F, S1, letrec_body(T)),
-	    F(update_c_letrec(T, Ds, B), S2);
+	    {Ds, S1} = mapfold_pairs(Pre, Post, S0, letrec_defs(T)),
+	    {B, S2} = mapfold(Pre, Post, S1, letrec_body(T)),
+	    Post(update_c_letrec(T, Ds, B), S2);
 	module ->
-	    {N, S1} = mapfold(F, S0, module_name(T)),
-	    {Es, S2} = mapfold_list(F, S1, module_exports(T)),
-	    {As, S3} = mapfold_pairs(F, S2, module_attrs(T)),
-	    {Ds, S4} = mapfold_pairs(F, S3, module_defs(T)),
-	    F(update_c_module(T, N, Es, As, Ds), S4)
+	    {N, S1} = mapfold(Pre, Post, S0, module_name(T)),
+	    {Es, S2} = mapfold_list(Pre, Post, S1, module_exports(T)),
+	    {As, S3} = mapfold_pairs(Pre, Post, S2, module_attrs(T)),
+	    {Ds, S4} = mapfold_pairs(Pre, Post, S3, module_defs(T)),
+	    Post(update_c_module(T, N, Es, As, Ds), S4)
     end.
 
-mapfold_list(F, S0, [T | Ts]) ->
-    {T1, S1} = mapfold(F, S0, T),
-    {Ts1, S2} = mapfold_list(F, S1, Ts),
+mapfold_list(Pre, Post, S0, [T | Ts]) ->
+    {T1, S1} = mapfold(Pre, Post, S0, T),
+    {Ts1, S2} = mapfold_list(Pre, Post, S1, Ts),
     {[T1 | Ts1], S2};
-mapfold_list(_, S, []) ->
+mapfold_list(_, _, S, []) ->
     {[], S}.
 
-mapfold_pairs(F, S0, [{T1, T2} | Ps]) ->
-    {T3, S1} = mapfold(F, S0, T1),
-    {T4, S2} = mapfold(F, S1, T2),
-    {Ps1, S3} = mapfold_pairs(F, S2, Ps),
+mapfold_pairs(Pre, Post, S0, [{T1, T2} | Ps]) ->
+    {T3, S1} = mapfold(Pre, Post, S0, T1),
+    {T4, S2} = mapfold(Pre, Post, S1, T2),
+    {Ps1, S3} = mapfold_pairs(Pre, Post, S2, Ps),
     {[{T3, T4} | Ps1], S3};
-mapfold_pairs(_, S, []) ->
+mapfold_pairs(_, _, S, []) ->
     {[], S}.
 
 
@@ -640,8 +666,8 @@ vars_in_list([], _, A) ->
 vars_in_defs(Ds, S) ->
     vars_in_defs(Ds, S, []).
 
-vars_in_defs([{_, F} | Ds], S, A) ->
-    vars_in_defs(Ds, S, ordsets:union(variables(F, S), A));
+vars_in_defs([{_, Post} | Ds], S, A) ->
+    vars_in_defs(Ds, S, ordsets:union(variables(Post, S), A));
 vars_in_defs([], _, A) ->
     A.
 
@@ -703,13 +729,14 @@ label(T, N, Env) ->
 	    %% Constant literals are not labeled.
 	    {T, N};
 	var ->
-	    case dict:find(var_name(T), Env) of
-		{ok, L} ->
-		    {As, _} = label_ann(T, L),
-		    N1 = N;
-		error ->
-		    {As, N1} = label_ann(T, N)
-	    end,
+            {As, N1} =
+                case dict:find(var_name(T), Env) of
+		    {ok, L} ->
+		        {A, _} = label_ann(T, L),
+		        {A, N};
+                    error ->
+		        label_ann(T, N)
+                end,
 	    {set_ann(T, As), N1};
 	values ->
 	    {Ts, N1} = label_list(values_es(T), N, Env),
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index e0a29fe9b1..65566df025 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -40,6 +40,8 @@
 
 %%----------------------------------------------------------------------
 
+-type abstract_code() :: [erl_parse:abstract_form()].
+
 -type option() :: atom() | {atom(), term()} | {'d', atom(), term()}.
 
 -type err_info() :: {erl_anno:line() | 'none',
@@ -48,6 +50,9 @@
 -type warnings() :: [{file:filename(), [err_info()]}].
 -type mod_ret()  :: {'ok', module()}
                   | {'ok', module(), cerl:c_module()} %% with option 'to_core'
+                  | {'ok',                            %% with option 'to_pp'
+                     module() | [],                   %% module() if 'to_exp'
+                     abstract_code()}
                   | {'ok', module(), warnings()}.
 -type bin_ret()  :: {'ok', module(), binary()}
                   | {'ok', module(), binary(), warnings()}.
@@ -78,7 +83,11 @@ file(File, Opts) when is_list(Opts) ->
 file(File, Opt) ->
     file(File, [Opt|?DEFAULT_OPTIONS]).
 
-forms(File) -> forms(File, ?DEFAULT_OPTIONS).
+-spec forms(abstract_code()) -> comp_ret().
+
+forms(Forms) -> forms(Forms, ?DEFAULT_OPTIONS).
+
+-spec forms(abstract_code(), [option()] | option()) -> comp_ret().
 
 forms(Forms, Opts) when is_list(Opts) ->
     do_compile({forms,Forms}, [binary|Opts++env_default_opts()]);
@@ -106,6 +115,8 @@ noenv_file(File, Opts) when is_list(Opts) ->
 noenv_file(File, Opt) ->
     noenv_file(File, [Opt|?DEFAULT_OPTIONS]).
 
+-spec noenv_forms(abstract_code(), [option()] | option()) -> comp_ret().
+
 noenv_forms(Forms, Opts) when is_list(Opts) ->
     do_compile({forms,Forms}, [binary|Opts]);
 noenv_forms(Forms, Opt) when is_atom(Opt) ->
@@ -671,11 +682,16 @@ asm_passes() ->
     %% Assembly level optimisations.
     [{delay,
       [{pass,beam_a},
+       {iff,da,{listing,"a"}},
        {unless,no_postopt,
-	[{pass,beam_block},
+	[{unless,no_reorder,{pass,beam_reorder}},
+	 {iff,dre,{listing,"reorder"}},
+	 {pass,beam_block},
 	 {iff,dblk,{listing,"block"}},
 	 {unless,no_except,{pass,beam_except}},
 	 {iff,dexcept,{listing,"except"}},
+	 {unless,no_bs_opt,{pass,beam_bs}},
+	 {iff,dbs,{listing,"bs"}},
 	 {unless,no_bopt,{pass,beam_bool}},
 	 {iff,dbool,{listing,"bool"}},
 	 {unless,no_topt,{pass,beam_type}},
@@ -703,6 +719,7 @@ asm_passes() ->
        {iff,no_postopt,[{pass,beam_clean}]},
 
        {pass,beam_z},
+       {iff,dz,{listing,"z"}},
        {iff,dopt,{listing,"optimize"}},
        {iff,'S',{listing,"S"}},
        {iff,'to_asm',{done,"S"}}]},
@@ -1300,27 +1317,18 @@ generate_key(String) when is_list(String) ->
 encrypt({des3_cbc=Type,Key,IVec,BlockSize}, Bin0) ->
     Bin1 = case byte_size(Bin0) rem BlockSize of
 	       0 -> Bin0;
-	       N -> list_to_binary([Bin0,random_bytes(BlockSize-N)])
+	       N -> list_to_binary([Bin0,crypto:rand_bytes(BlockSize-N)])
 	   end,
     Bin = crypto:block_encrypt(Type, Key, IVec, Bin1),
     TypeString = atom_to_list(Type),
     list_to_binary([0,length(TypeString),TypeString,Bin]).
 
-random_bytes(N) ->
-    _ = random:seed(erlang:time_offset(),
-		    erlang:monotonic_time(),
-		    erlang:unique_integer()),
-    random_bytes_1(N, []).
-
-random_bytes_1(0, Acc) -> Acc;
-random_bytes_1(N, Acc) -> random_bytes_1(N-1, [random:uniform(255)|Acc]).
-
 save_core_code(St) ->
     {ok,St#compile{core_code=cerl:from_records(St#compile.code)}}.
 
 beam_asm(#compile{ifile=File,code=Code0,
 		  abstract_code=Abst,mod_options=Opts0}=St) ->
-    Source = filename:absname(File),
+    Source = paranoid_absname(File),
     Opts1 = lists:map(fun({debug_info_key,_}) -> {debug_info_key,'********'};
 			 (Other) -> Other
 		      end, Opts0),
@@ -1329,6 +1337,16 @@ beam_asm(#compile{ifile=File,code=Code0,
 	{ok,Code} -> {ok,St#compile{code=Code,abstract_code=[]}}
     end.
 
+paranoid_absname(""=File) ->
+    File;
+paranoid_absname(File) ->
+    case file:get_cwd() of
+	{ok,Cwd} ->
+	    filename:absname(File, Cwd);
+	_ ->
+	    File
+    end.
+
 test_native(#compile{options=Opts}) ->
     %% This test is done late, in case some other option has turned off native.
     %% 'native' given on the command line can be overridden by
@@ -1612,11 +1630,8 @@ output_encoding(F, #compile{encoding = Encoding}) ->
     ok = io:setopts(F, [{encoding, Encoding}]),
     ok = io:fwrite(F, <<"%% ~s\n">>, [epp:encoding_to_string(Encoding)]).
 
-restore_expanded_types("P", Fs) ->
-    epp:restore_typed_record_fields(Fs);
 restore_expanded_types("E", {M,I,Fs0}) ->
-    Fs1 = restore_expand_module(Fs0),
-    Fs = epp:restore_typed_record_fields(Fs1),
+    Fs = restore_expand_module(Fs0),
     {M,I,Fs};
 restore_expanded_types(_Ext, Code) -> Code.
 
@@ -1628,6 +1643,8 @@ restore_expand_module([{attribute,Line,spec,[Arg]}|Fs]) ->
     [{attribute,Line,spec,Arg}|restore_expand_module(Fs)];
 restore_expand_module([{attribute,Line,callback,[Arg]}|Fs]) ->
     [{attribute,Line,callback,Arg}|restore_expand_module(Fs)];
+restore_expand_module([{attribute,Line,record,[R]}|Fs]) ->
+    [{attribute,Line,record,R}|restore_expand_module(Fs)];
 restore_expand_module([F|Fs]) ->
     [F|restore_expand_module(Fs)];
 restore_expand_module([]) -> [].
@@ -1674,6 +1691,7 @@ help(_) ->
 %%   Compile entry point for erl_compile.
 
 compile(File0, _OutFile, Options) ->
+    pre_load(),
     File = shorten_filename(File0),
     case file(File, make_erl_options(Options)) of
 	{ok,_Mod} -> ok;
@@ -1738,3 +1756,46 @@ make_erl_options(Opts) ->
 	end,
     Options ++ [report_errors, {cwd, Cwd}, {outdir, Outdir}|
 	        [{i, Dir} || Dir <- Includes]] ++ Specific.
+
+pre_load() ->
+    L = [beam_a,
+	 beam_asm,
+	 beam_block,
+	 beam_bool,
+	 beam_bs,
+	 beam_bsm,
+	 beam_clean,
+	 beam_dead,
+	 beam_dict,
+	 beam_except,
+	 beam_flatten,
+	 beam_jump,
+	 beam_opcodes,
+	 beam_peep,
+	 beam_receive,
+	 beam_reorder,
+	 beam_split,
+	 beam_trim,
+	 beam_type,
+	 beam_utils,
+	 beam_validator,
+	 beam_z,
+	 cerl,
+	 cerl_clauses,
+	 cerl_sets,
+	 cerl_trees,
+	 core_lib,
+	 epp,
+	 erl_bifs,
+	 erl_expand_records,
+	 erl_lint,
+	 erl_parse,
+	 erl_scan,
+	 sys_core_dsetel,
+	 sys_core_fold,
+	 sys_pre_expand,
+	 v3_codegen,
+	 v3_core,
+	 v3_kernel,
+	 v3_life],
+    code:ensure_modules_loaded(L).
diff --git a/lib/compiler/src/compiler.app.src b/lib/compiler/src/compiler.app.src
index afb85f4710..a2b2a1d277 100644
--- a/lib/compiler/src/compiler.app.src
+++ b/lib/compiler/src/compiler.app.src
@@ -25,6 +25,7 @@
 	     beam_asm,
 	     beam_block,
 	     beam_bool,
+	     beam_bs,
 	     beam_bsm,
 	     beam_clean,
 	     beam_dead,
@@ -37,6 +38,7 @@
 	     beam_opcodes,
 	     beam_peep,
 	     beam_receive,
+	     beam_reorder,
 	     beam_split,
 	     beam_trim,
 	     beam_type,
diff --git a/lib/compiler/src/core_lib.erl b/lib/compiler/src/core_lib.erl
index 3abb520485..839c736ff2 100644
--- a/lib/compiler/src/core_lib.erl
+++ b/lib/compiler/src/core_lib.erl
@@ -21,52 +21,16 @@
 
 -module(core_lib).
 
--deprecated({get_anno,1,next_major_release}).
--deprecated({set_anno,2,next_major_release}).
--deprecated({is_literal,1,next_major_release}).
--deprecated({is_literal_list,1,next_major_release}).
--deprecated({literal_value,1,next_major_release}).
-
--export([get_anno/1,set_anno/2]).
--export([is_literal/1,is_literal_list/1]).
--export([literal_value/1]).
 -export([make_values/1]).
 -export([is_var_used/2]).
 
 -include("core_parse.hrl").
 
-%%
-%% Generic get/set annotation that should be used only with cerl() structures.
-%%
--spec get_anno(cerl:cerl()) -> term().
-
-get_anno(C) -> cerl:get_ann(C).
-
--spec set_anno(cerl:cerl(), term()) -> cerl:cerl().
-
-set_anno(C, A) -> cerl:set_ann(C, A).
-
--spec is_literal(cerl:cerl()) -> boolean().
-
-is_literal(Cerl) ->
-    cerl:is_literal(cerl:fold_literal(Cerl)).
-
--spec is_literal_list([cerl:cerl()]) -> boolean().
-
-is_literal_list(Es) -> lists:all(fun is_literal/1, Es).
-
-%% Return the value of LitExpr.
--spec literal_value(cerl:c_literal() | cerl:c_binary() |
-		    cerl:c_map() | cerl:c_cons() | cerl:c_tuple()) -> term().
-
-literal_value(Cerl) ->
-    cerl:concrete(cerl:fold_literal(Cerl)).
-
 %% Make a suitable values structure, expr or values, depending on Expr.
 -spec make_values([cerl:cerl()] | cerl:cerl()) -> cerl:cerl().
 
 make_values([E]) -> E;
-make_values([H|_]=Es) -> #c_values{anno=get_anno(H),es=Es};
+make_values([H|_]=Es) -> #c_values{anno=cerl:get_ann(H),es=Es};
 make_values([]) -> #c_values{es=[]};
 make_values(E) -> E.
 
diff --git a/lib/compiler/src/core_lint.erl b/lib/compiler/src/core_lint.erl
index cc54f6e411..7d3513c0ba 100644
--- a/lib/compiler/src/core_lint.erl
+++ b/lib/compiler/src/core_lint.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2015. 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.
@@ -73,7 +73,7 @@
 %% Define the lint state record.
 
 -record(lint, {module       :: module(),		% Current module
-	       func         :: fa(),			% Current function
+	       func         :: fa() | 'undefined',	% Current function
 	       errors  = [] :: [error()],		% Errors
 	       warnings= [] :: [warning()]}).		% Warnings
 
diff --git a/lib/compiler/src/rec_env.erl b/lib/compiler/src/rec_env.erl
index 0e9e12d1ad..5a4a870769 100644
--- a/lib/compiler/src/rec_env.erl
+++ b/lib/compiler/src/rec_env.erl
@@ -598,7 +598,16 @@ start_range(Env) ->
 %% (pseudo-)randomly distributed over the range.
 
 generate(_N, Range) ->
-    random:uniform(Range).    % works well
+    %% We must use the same sequence of random variables to ensure
+    %% that two compilations of the same source code generates the
+    %% same BEAM code.
+    case rand:export_seed() of
+	undefined ->
+	    rand:seed(exsplus, {1,42,2053});
+	_ ->
+	    ok
+    end,
+    rand:uniform(Range).			% works well
 
 
 %% =====================================================================
diff --git a/lib/compiler/src/sys_core_dsetel.erl b/lib/compiler/src/sys_core_dsetel.erl
index ac32db10fe..c6cfdbae7e 100644
--- a/lib/compiler/src/sys_core_dsetel.erl
+++ b/lib/compiler/src/sys_core_dsetel.erl
@@ -72,7 +72,7 @@ module(M0, _Options) ->
     {ok,M}.
 
 visit_module(#c_module{defs=Ds0}=R) ->
-    Env = dict:new(),
+    Env = #{},
     Ds = visit_module_1(Ds0, Env, []),
     R#c_module{defs=Ds}.
 
@@ -95,9 +95,11 @@ visit(Env, #c_var{name={_,_}}=R) ->
     {R, Env};
 visit(Env0, #c_var{name=X}=R) ->
     %% There should not be any free variables. If there are,
-    %% the next line will cause an exception.
-    {ok, N} = dict:find(X, Env0),
-    {R, dict:store(X, N+1, Env0)};
+    %% the case will fail with an exception.
+    case Env0 of
+	#{X:=N} ->
+	    {R, Env0#{X:=N+1}}
+    end;
 visit(Env, #c_literal{}=R) ->
     {R, Env};
 visit(Env0, #c_tuple{es=Es0}=R) ->
@@ -203,7 +205,7 @@ bind_vars(Vs, Env) ->
     bind_vars(Vs, Env, []).
 
 bind_vars([#c_var{name=X}|Vs], Env0, Xs)->
-    bind_vars(Vs, dict:store(X, 0, Env0), [X|Xs]);
+    bind_vars(Vs, Env0#{X=>0}, [X|Xs]);
 bind_vars([], Env,Xs) ->
     {Xs, Env}.
 
@@ -217,7 +219,7 @@ visit_pats([], Env, Vs) ->
     {Vs, Env}.
 
 visit_pat(Env0, #c_var{name=V}, Vs) ->
-    {[V|Vs], dict:store(V, 0, Env0)};
+    {[V|Vs], Env0#{V=>0}};
 visit_pat(Env0, #c_tuple{es=Es}, Vs) ->
     visit_pats(Es, Env0, Vs);
 visit_pat(Env0, #c_map{es=Es}, Vs) ->
@@ -235,23 +237,25 @@ visit_pat(Env0, #c_bitstr{val=Val,size=Sz}, Vs0) ->
 	case Sz of
 	    #c_var{name=V} ->
 		%% We don't tolerate free variables.
-		{ok, N} = dict:find(V, Env0),
-		{Vs0, dict:store(V, N+1, Env0)};
+		case Env0 of
+		    #{V:=N} ->
+			{Vs0, Env0#{V:=N+1}}
+		end;
 	    _ ->
 		visit_pat(Env0, Sz, Vs0)
 	end,
     visit_pat(Env1, Val, Vs1);
 visit_pat(Env0, #c_alias{pat=P,var=#c_var{name=V}}, Vs) ->
-    visit_pat(dict:store(V, 0, Env0), P, [V|Vs]);
+    visit_pat(Env0#{V=>0}, P, [V|Vs]);
 visit_pat(Env, #c_literal{}, Vs) ->
     {Vs, Env}.
 
 restore_vars([V|Vs], Env0, Env1) ->
-    case dict:find(V, Env0) of
-	{ok, N} ->
-	    restore_vars(Vs, Env0, dict:store(V, N, Env1));
-	error ->
-	    restore_vars(Vs, Env0, dict:erase(V, Env1))
+    case Env0 of
+	#{V:=N} ->
+	    restore_vars(Vs, Env0, Env1#{V=>N});
+	_ ->
+	    restore_vars(Vs, Env0, maps:remove(V, Env1))
     end;
 restore_vars([], _, Env1) ->
     Env1.
@@ -349,8 +353,8 @@ is_safe(#c_literal{}) -> true;
 is_safe(_) -> false.
 
 is_single_use(V, Env) ->
-    case dict:find(V, Env) of
-	{ok, 1} ->
+    case Env of
+	#{V:=1} ->
 	    true;
 	_ ->
 	    false
diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index 65699ccda9..ab67c8164b 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -277,7 +277,7 @@ expr(#c_fun{}=Fun, effect, _) ->
     add_warning(Fun, useless_building),
     void();
 expr(#c_fun{vars=Vs0,body=B0}=Fun, Ctxt0, Sub0) ->
-    {Vs1,Sub1} = pattern_list(Vs0, Sub0),
+    {Vs1,Sub1} = var_list(Vs0, Sub0),
     Ctxt = case Ctxt0 of
 	       {letrec,Ctxt1} -> Ctxt1;
 	       value -> value
@@ -420,13 +420,13 @@ expr(#c_try{anno=A,arg=E0,vars=Vs0,body=B0,evars=Evs0,handler=H0}=Try, _, Sub0)
     %% Here is the general try/catch construct outside of guards.
     %% We can remove try if the value is simple and replace it with a let.
     E1 = body(E0, value, Sub0),
-    {Vs1,Sub1} = pattern_list(Vs0, Sub0),
+    {Vs1,Sub1} = var_list(Vs0, Sub0),
     B1 = body(B0, value, Sub1),
     case is_safe_simple(E1, Sub0) of
 	true ->
 	    expr(#c_let{anno=A,vars=Vs1,arg=E1,body=B1}, value, Sub0);
 	false ->
-	    {Evs1,Sub2} = pattern_list(Evs0, Sub0),
+	    {Evs1,Sub2} = var_list(Evs0, Sub0),
 	    H1 = body(H0, value, Sub2),
 	    Try#c_try{arg=E1,vars=Vs1,body=B1,evars=Evs1,handler=H1}
     end.
@@ -1078,15 +1078,28 @@ is_atom_or_var(_) -> false.
 
 %% clause(Clause, Cepxr, Context, Sub) -> Clause.
 
-clause(#c_clause{pats=Ps0,guard=G0,body=B0}=Cl, Cexpr, Ctxt, Sub0) ->
-    {Ps1,Sub1} = pattern_list(Ps0, Sub0),
+clause(#c_clause{pats=Ps0}=Cl, Cexpr, Ctxt, Sub0) ->
+    try pattern_list(Ps0, Sub0) of
+	{Ps1,Sub1} ->
+	    clause_1(Cl, Ps1, Cexpr, Ctxt, Sub1)
+    catch
+	nomatch ->
+	    Cl#c_clause{anno=[compiler_generated],
+			guard=#c_literal{val=false}}
+    end.
+
+clause_1(#c_clause{guard=G0,body=B0}=Cl, Ps1, Cexpr, Ctxt, Sub1) ->
     Sub2 = update_types(Cexpr, Ps1, Sub1),
-    GSub = case {Cexpr,Ps1} of
-	       {#c_var{name='_'},_} ->
+    GSub = case {Cexpr,Ps1,G0} of
+	       {_,_,#c_literal{}} ->
+		   %% No need for substitution tricks when the guard
+		   %% does not contain any variables.
+		   Sub2;
+	       {#c_var{name='_'},_,_} ->
 		   %% In a 'receive', Cexpr is the variable '_', which represents the
 		   %% message being matched. We must NOT do any extra substiutions.
 		   Sub2;
-	       {#c_var{},[#c_var{}=Var]} ->
+	       {#c_var{},[#c_var{}=Var],_} ->
 		   %% The idea here is to optimize expressions such as
 		   %%
 		   %%   case A of A -> ...
@@ -1120,7 +1133,7 @@ clause(#c_clause{pats=Ps0,guard=G0,body=B0}=Cl, Cexpr, Ctxt, Sub0) ->
 %%  the unsubstituted variables and values.
 
 let_substs(Vs0, As0, Sub0) ->
-    {Vs1,Sub1} = pattern_list(Vs0, Sub0),
+    {Vs1,Sub1} = var_list(Vs0, Sub0),
     {Vs2,As1,Ss} = let_substs_1(Vs1, As0, Sub1),
     Sub2 = sub_add_scope([V || #c_var{name=V} <- Vs2], Sub1),
     {Vs2,As1,
@@ -1206,20 +1219,132 @@ bin_pattern_list(Ps0, Isub, Osub0) ->
     {Ps,{_,Osub}} = mapfoldl(fun bin_pattern/2, {Isub,Osub0}, Ps0),
     {Ps,Osub}.
 
-bin_pattern(#c_bitstr{val=E0,size=Size0}=Pat, {Isub0,Osub0}) ->
+bin_pattern(#c_bitstr{val=E0,size=Size0}=Pat0, {Isub0,Osub0}) ->
     Size1 = expr(Size0, Isub0),
     {E1,Osub} = pattern(E0, Isub0, Osub0),
     Isub = case E0 of
 	       #c_var{} -> sub_set_var(E0, E1, Isub0);
 	       _ -> Isub0
 	   end,
-    {Pat#c_bitstr{val=E1,size=Size1},{Isub,Osub}}.
+    Pat = Pat0#c_bitstr{val=E1,size=Size1},
+    bin_pat_warn(Pat),
+    {Pat,{Isub,Osub}}.
 
 pattern_list(Ps, Sub) -> pattern_list(Ps, Sub, Sub).
 
 pattern_list(Ps0, Isub, Osub0) ->
     mapfoldl(fun (P, Osub) -> pattern(P, Isub, Osub) end, Osub0, Ps0).
 
+%% var_list([Var], InSub) -> {Pattern,OutSub}.
+%%  Works like pattern_list/2 but only accept variables and is
+%%  guaranteed not to throw an exception.
+
+var_list(Vs, Sub0) ->
+    mapfoldl(fun (#c_var{}=V, Sub) ->
+		     pattern(V, Sub, Sub)
+	     end, Sub0, Vs).
+
+
+%%%
+%%% Generate warnings for binary patterns that will not match.
+%%%
+
+bin_pat_warn(#c_bitstr{type=#c_literal{val=Type},
+		       val=Val0,
+		       size=#c_literal{val=Sz},
+		       unit=#c_literal{val=Unit},
+		       flags=Fl}=Pat) ->
+    case {Type,Sz} of
+	{_,_} when is_integer(Sz), Sz >= 0 -> ok;
+	{binary,all} -> ok;
+	{utf8,undefined} -> ok;
+	{utf16,undefined} -> ok;
+	{utf32,undefined} -> ok;
+	{_,_} ->
+	    add_warning(Pat, {nomatch_bit_syntax_size,Sz}),
+	    throw(nomatch)
+    end,
+    case {Type,Val0} of
+	{integer,#c_literal{val=Val}} when is_integer(Val) ->
+	    Signedness = signedness(Fl),
+	    TotalSz = Sz * Unit,
+	    bit_pat_warn_int(Val, TotalSz, Signedness, Pat);
+	{float,#c_literal{val=Val}} when is_float(Val) ->
+	    ok;
+	{utf8,#c_literal{val=Val}} when is_integer(Val) ->
+	    bit_pat_warn_unicode(Val, Pat);
+	{utf16,#c_literal{val=Val}} when is_integer(Val) ->
+	    bit_pat_warn_unicode(Val, Pat);
+	{utf32,#c_literal{val=Val}} when is_integer(Val) ->
+	    bit_pat_warn_unicode(Val, Pat);
+	{_,#c_literal{val=Val}} ->
+	    add_warning(Pat, {nomatch_bit_syntax_type,Val,Type}),
+	    throw(nomatch);
+	{_,_} ->
+	    ok
+    end;
+bin_pat_warn(#c_bitstr{type=#c_literal{val=Type},val=Val0,flags=Fl}=Pat) ->
+    %% Size is variable. Not much that we can check.
+    case {Type,Val0} of
+	{integer,#c_literal{val=Val}} when is_integer(Val) ->
+	    case signedness(Fl) of
+		unsigned when Val < 0 ->
+		    add_warning(Pat, {nomatch_bit_syntax_unsigned,Val}),
+		    throw(nomatch);
+		_ ->
+		    ok
+	    end;
+	{float,#c_literal{val=Val}} when is_float(Val) ->
+	    ok;
+	{_,#c_literal{val=Val}} ->
+	    add_warning(Pat, {nomatch_bit_syntax_type,Val,Type}),
+	    throw(nomatch);
+	{_,_} ->
+	    ok
+    end.
+
+bit_pat_warn_int(Val, 0, signed, Pat) ->
+    if
+	Val =:= 0 ->
+	    ok;
+	true ->
+	    add_warning(Pat, {nomatch_bit_syntax_truncated,signed,Val,0}),
+	    throw(nomatch)
+    end;
+bit_pat_warn_int(Val, Sz, signed, Pat) ->
+    if
+	Val < 0, Val bsr (Sz - 1) =/= -1 ->
+	    add_warning(Pat, {nomatch_bit_syntax_truncated,signed,Val,Sz}),
+	    throw(nomatch);
+	Val > 0, Val bsr (Sz - 1) =/= 0 ->
+	    add_warning(Pat, {nomatch_bit_syntax_truncated,signed,Val,Sz}),
+	    throw(nomatch);
+	true ->
+	    ok
+    end;
+bit_pat_warn_int(Val, _Sz, unsigned, Pat) when Val < 0 ->
+    add_warning(Pat, {nomatch_bit_syntax_unsigned,Val}),
+    throw(nomatch);
+bit_pat_warn_int(Val, Sz, unsigned, Pat) ->
+    if
+	Val bsr Sz =:= 0 ->
+	    ok;
+	true ->
+	    add_warning(Pat, {nomatch_bit_syntax_truncated,unsigned,Val,Sz}),
+	    throw(nomatch)
+    end.
+
+bit_pat_warn_unicode(U, _Pat) when 0 =< U, U =< 16#10FFFF ->
+    ok;
+bit_pat_warn_unicode(U, Pat) ->
+    add_warning(Pat, {nomatch_bit_syntax_unicode,U}),
+    throw(nomatch).
+
+signedness(#c_literal{val=Flags}) ->
+    [S] = [F || F <- Flags, F =:= signed orelse F =:= unsigned],
+    S.
+
+
 %% is_subst(Expr) -> true | false.
 %%  Test whether an expression is a suitable substitution.
 
@@ -2251,11 +2376,11 @@ move_let_into_expr(#c_let{vars=InnerVs0,body=InnerBody0}=Inner,
     %%
     Arg = body(Arg0, Sub0),
     ScopeSub0 = sub_subst_scope(Sub0#sub{t=#{}}),
-    {OuterVs,ScopeSub} = pattern_list(OuterVs0, ScopeSub0),
+    {OuterVs,ScopeSub} = var_list(OuterVs0, ScopeSub0),
 
     OuterBody = body(OuterBody0, ScopeSub),
 
-    {InnerVs,Sub} = pattern_list(InnerVs0, Sub0),
+    {InnerVs,Sub} = var_list(InnerVs0, Sub0),
     InnerBody = body(InnerBody0, Sub),
     Outer#c_let{vars=OuterVs,arg=Arg,
 		body=Inner#c_let{vars=InnerVs,arg=OuterBody,body=InnerBody}};
@@ -2271,39 +2396,49 @@ move_let_into_expr(#c_let{vars=Lvs0,body=Lbody0}=Let,
     case {TwoClauses,is_failing_clause(Ca0),is_failing_clause(Cb0)} of
 	{true,false,true} ->
 	    %% let <Lvars> = case <Case-expr> of
-	    %%                  <Cvars> -> <Clause-body>;
-	    %%                  <OtherCvars> -> erlang:error(...)
+	    %%                  <Cpats> -> <Clause-body>;
+	    %%                  <OtherCpats> -> erlang:error(...)
 	    %%               end
 	    %% in <Let-body>
 	    %%
 	    %%     ==>
 	    %%
 	    %% case <Case-expr> of
-	    %%   <Cvars> ->
+	    %%   <Cpats> ->
 	    %%       let <Lvars> = <Clause-body>
 	    %%       in <Let-body>;
-	    %%   <OtherCvars> -> erlang:error(...)
+	    %%   <OtherCpats> -> erlang:error(...)
 	    %% end
 
 	    Cexpr = body(Cexpr0, Sub0),
-	    CaVars0 = Ca0#c_clause.pats,
+	    CaPats0 = Ca0#c_clause.pats,
 	    G0 = Ca0#c_clause.guard,
 	    B0 = Ca0#c_clause.body,
 	    ScopeSub0 = sub_subst_scope(Sub0#sub{t=#{}}),
-	    {CaVars,ScopeSub} = pattern_list(CaVars0, ScopeSub0),
-	    G = guard(G0, ScopeSub),
-
-	    B1 = body(B0, ScopeSub),
-
-	    {Lvs,B2,Sub1} = let_substs(Lvs0, B1, Sub0),
-	    Sub2 = Sub1#sub{s=cerl_sets:union(ScopeSub#sub.s,
-                                              Sub1#sub.s)},
-	    Lbody = body(Lbody0, Sub2),
-	    B = Let#c_let{vars=Lvs,arg=core_lib:make_values(B2),body=Lbody},
-
-	    Ca = Ca0#c_clause{pats=CaVars,guard=G,body=B},
-	    Cb = clause(Cb0, Cexpr, value, Sub0),
-	    Case#c_case{arg=Cexpr,clauses=[Ca,Cb]};
+	    try pattern_list(CaPats0, ScopeSub0) of
+		{CaPats,ScopeSub} ->
+		    G = guard(G0, ScopeSub),
+
+		    B1 = body(B0, ScopeSub),
+
+		    {Lvs,B2,Sub1} = let_substs(Lvs0, B1, Sub0),
+		    Sub2 = Sub1#sub{s=cerl_sets:union(ScopeSub#sub.s,
+						      Sub1#sub.s)},
+		    Lbody = body(Lbody0, Sub2),
+		    B = Let#c_let{vars=Lvs,
+				  arg=core_lib:make_values(B2),
+				  body=Lbody},
+
+		    Ca = Ca0#c_clause{pats=CaPats,guard=G,body=B},
+		    Cb = clause(Cb0, Cexpr, value, Sub0),
+		    Case#c_case{arg=Cexpr,clauses=[Ca,Cb]}
+	    catch
+		nomatch ->
+		    %% This is not a defeat. The code will eventually
+		    %% be optimized to erlang:error(...) by the other
+		    %% optimizations done in this module.
+		    impossible
+	    end;
 	{_,_,_} -> impossible
     end;
 move_let_into_expr(#c_let{vars=Lvs0,body=Lbody0}=Let,
@@ -2595,7 +2730,7 @@ move_case_into_arg(#c_case{arg=#c_let{vars=OuterVars0,arg=OuterArg,
     %% in case <InnerArg> of <InnerClauses> end
     %%
     ScopeSub0 = sub_subst_scope(Sub#sub{t=#{}}),
-    {OuterVars,ScopeSub} = pattern_list(OuterVars0, ScopeSub0),
+    {OuterVars,ScopeSub} = var_list(OuterVars0, ScopeSub0),
     InnerArg = body(InnerArg0, ScopeSub),
     Outer#c_let{vars=OuterVars,arg=OuterArg,
                 body=Inner#c_case{arg=InnerArg,clauses=InnerClauses}};
@@ -2624,14 +2759,18 @@ move_case_into_arg(#c_case{arg=#c_case{arg=OuterArg,
             %% end
             %%
             ScopeSub0 = sub_subst_scope(Sub#sub{t=#{}}),
-            {OuterPats,ScopeSub} = pattern_list(OuterPats0, ScopeSub0),
-            OuterGuard = guard(OuterGuard0, ScopeSub),
-            InnerArg = body(InnerArg0, ScopeSub),
-            Inner = Inner0#c_case{arg=InnerArg,clauses=InnerClauses},
-            OuterCa = OuterCa0#c_clause{pats=OuterPats,guard=OuterGuard,
-                                        body=Inner},
-            Outer#c_case{arg=OuterArg,
-                         clauses=[OuterCa,OuterCb]};
+
+	    %% We KNOW that pattern_list/2 has already been called for OuterPats0;
+	    %% therefore, it cannot throw an exception.
+	    {OuterPats,ScopeSub} = pattern_list(OuterPats0, ScopeSub0),
+	    OuterGuard = guard(OuterGuard0, ScopeSub),
+	    InnerArg = body(InnerArg0, ScopeSub),
+	    Inner = Inner0#c_case{arg=InnerArg,clauses=InnerClauses},
+	    OuterCa = OuterCa0#c_clause{pats=OuterPats,
+					guard=OuterGuard,
+					body=Inner},
+	    Outer#c_case{arg=OuterArg,
+			 clauses=[OuterCa,OuterCb]};
         false ->
             impossible
     end;
@@ -2793,12 +2932,18 @@ extract_type_1(Expr, Sub) ->
 	true -> bool
     end.
 
+returns_integer('band', [_,_]) -> true;
+returns_integer('bnot', [_]) -> true;
+returns_integer('bor', [_,_]) -> true;
+returns_integer('bxor', [_,_]) -> true;
 returns_integer(bit_size, [_]) -> true;
 returns_integer('bsl', [_,_]) -> true;
 returns_integer('bsr', [_,_]) -> true;
 returns_integer(byte_size, [_]) -> true;
+returns_integer('div', [_,_]) -> true;
 returns_integer(length, [_]) -> true;
 returns_integer('rem', [_,_]) -> true;
+returns_integer('round', [_]) -> true;
 returns_integer(size, [_]) -> true;
 returns_integer(tuple_size, [_]) -> true;
 returns_integer(trunc, [_]) -> true;
@@ -3207,6 +3352,29 @@ format_error(nomatch_shadow) ->
     "this clause cannot match because a previous clause always matches";
 format_error(nomatch_guard) ->
     "the guard for this clause evaluates to 'false'";
+format_error({nomatch_bit_syntax_truncated,Signess,Val,Sz}) ->
+    S = case Signess of
+	    signed -> "a 'signed'";
+	    unsigned -> "an 'unsigned'"
+	end,
+    F = "this clause cannot match because the value ~P"
+	" will not fit in ~s binary segment of size ~p",
+    flatten(io_lib:format(F, [Val,10,S,Sz]));
+format_error({nomatch_bit_syntax_unsigned,Val}) ->
+    F = "this clause cannot match because the negative value ~P"
+	" will never match the value of an 'unsigned' binary segment",
+    flatten(io_lib:format(F, [Val,10]));
+format_error({nomatch_bit_syntax_size,Sz}) ->
+    F = "this clause cannot match because '~P' is not a valid size for a binary segment",
+    flatten(io_lib:format(F, [Sz,10]));
+format_error({nomatch_bit_syntax_type,Val,Type}) ->
+    F = "this clause cannot match because '~P' is not of the"
+	" expected type '~p'",
+    flatten(io_lib:format(F, [Val,10,Type]));
+format_error({nomatch_bit_syntax_unicode,Val}) ->
+    F = "this clause cannot match because the value ~p"
+	" is not a valid Unicode code point",
+    flatten(io_lib:format(F, [Val]));
 format_error(no_clause_match) ->
     "no clause will ever match";
 format_error(nomatch_clause_type) ->
diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl
index d9cc4b530c..7ab4e1845c 100644
--- a/lib/compiler/src/sys_pre_expand.erl
+++ b/lib/compiler/src/sys_pre_expand.erl
@@ -29,30 +29,26 @@
 %% Main entry point.
 -export([module/2]).
 
--import(ordsets, [from_list/1,union/2]).
 -import(lists,   [member/2,foldl/3,foldr/3]).
 
--include("../include/erl_bits.hrl").
-
 -type fa() :: {atom(), arity()}.
 
 -record(expand, {module=[],                     %Module name
                  exports=[],                    %Exports
-                 imports=[],                    %Imports
                  attributes=[],                 %Attributes
                  callbacks=[],                  %Callbacks
                  optional_callbacks=[] :: [fa()],  %Optional callbacks
-                 defined,			%Defined functions (gb_set)
                  vcount=0,                      %Variable counter
                  func=[],                       %Current function
                  arity=[],                      %Arity for current function
-                 fcount=0			%Local fun count
+                 fcount=0,			%Local fun count
+		 ctype				%Call type map
                 }).
 
 %% module(Forms, CompileOptions)
 %%      {ModuleName,Exports,TransformedForms,CompileOptions'}
-%%  Expand the forms in one module. N.B.: the lists of predefined
-%%  exports and imports are really ordsets!
+%%  Expand the forms in one module.
+%%
 %%  CompileOptions is augmented with options from -compile attributes.
 
 module(Fs0, Opts0) ->
@@ -65,19 +61,28 @@ module(Fs0, Opts0) ->
     %% Set pre-defined exported functions.
     PreExp = [{module_info,0},{module_info,1}],
 
+    %% Build the set of defined functions and the initial call
+    %% type map.
+    Defined = defined_functions(Fs, PreExp),
+    Ctype = maps:from_list([{K,local} || K <- Defined]),
+
     %% Build initial expand record.
     St0 = #expand{exports=PreExp,
-                  defined=PreExp
+		  ctype=Ctype
                  },
+
     %% Expand the functions.
-    {Tfs,St1} = forms(Fs, define_functions(Fs, St0)),
+    {Tfs,St1} = forms(Fs, St0),
+
     %% Get the correct list of exported functions.
     Exports = case member(export_all, Opts) of
-                  true -> gb_sets:to_list(St1#expand.defined);
+                  true -> Defined;
                   false -> St1#expand.exports
               end,
+    St2 = St1#expand{exports=Exports,ctype=undefined},
+
     %% Generate all functions from stored info.
-    {Ats,St3} = module_attrs(St1#expand{exports = Exports}),
+    {Ats,St3} = module_attrs(St2),
     {Mfs,St4} = module_predef_funcs(St3),
     {St4#expand.module, St4#expand.exports, Ats ++ Tfs ++ Mfs,
      Opts}.
@@ -85,14 +90,14 @@ module(Fs0, Opts0) ->
 compiler_options(Forms) ->
     lists:flatten([C || {attribute,_,compile,C} <- Forms]).
     
-%% define_function(Form, State) -> State.
+%% defined_function(Forms, Predef) -> Functions.
 %%  Add function to defined if form is a function.
 
-define_functions(Forms, #expand{defined=Predef}=St) ->
+defined_functions(Forms, Predef) ->
     Fs = foldl(fun({function,_,N,A,_Cs}, Acc) -> [{N,A}|Acc];
                   (_, Acc) -> Acc
                end, Predef, Forms),
-    St#expand{defined=gb_sets:from_list(Fs)}.
+    ordsets:from_list(Fs).
 
 module_attrs(#expand{attributes=Attributes}=St) ->
     Attrs = [{attribute,Line,Name,Val} || {Name,Line,Val} <- Attributes],
@@ -113,23 +118,21 @@ is_fa_list([{FuncName, Arity}|L])
 is_fa_list([]) -> true;
 is_fa_list(_) -> false.
 
-module_predef_funcs(St) ->
-    {Mpf1,St1}=module_predef_func_beh_info(St),
-    {Mpf2,St2}=module_predef_funcs_mod_info(St1),
+module_predef_funcs(St0) ->
+    {Mpf1,St1} = module_predef_func_beh_info(St0),
+    Mpf2 = module_predef_funcs_mod_info(St1),
     Mpf = [erl_parse:new_anno(F) || F <- Mpf1++Mpf2],
-    {Mpf,St2}.
+    {Mpf,St1}.
 
 module_predef_func_beh_info(#expand{callbacks=[]}=St) ->
     {[], St};
 module_predef_func_beh_info(#expand{callbacks=Callbacks,
                                     optional_callbacks=OptionalCallbacks,
-                                    defined=Defined,
 				    exports=Exports}=St) ->
-    PreDef=[{behaviour_info,1}],
-    PreExp=PreDef,
+    PreDef0 = [{behaviour_info,1}],
+    PreDef = ordsets:from_list(PreDef0),
     {[gen_beh_info(Callbacks, OptionalCallbacks)],
-     St#expand{defined=gb_sets:union(gb_sets:from_list(PreDef), Defined),
-	       exports=union(from_list(PreExp), Exports)}}.
+     St#expand{exports=ordsets:union(PreDef, Exports)}}.
 
 gen_beh_info(Callbacks, OptionalCallbacks) ->
     List = make_list(Callbacks),
@@ -156,20 +159,16 @@ make_optional_list([{Name,Arity}|Rest]) ->
        {integer,0,Arity}]},
      make_optional_list(Rest)}.
 
-module_predef_funcs_mod_info(St) ->
-    PreDef = [{module_info,0},{module_info,1}],
-    PreExp = PreDef,
-    {[{function,0,module_info,0,
-       [{clause,0,[],[],
+module_predef_funcs_mod_info(#expand{module=Mod}) ->
+    ModAtom = {atom,0,Mod},
+    [{function,0,module_info,0,
+      [{clause,0,[],[],
         [{call,0,{remote,0,{atom,0,erlang},{atom,0,get_module_info}},
-          [{atom,0,St#expand.module}]}]}]},
-      {function,0,module_info,1,
-       [{clause,0,[{var,0,'X'}],[],
+          [ModAtom]}]}]},
+     {function,0,module_info,1,
+      [{clause,0,[{var,0,'X'}],[],
         [{call,0,{remote,0,{atom,0,erlang},{atom,0,get_module_info}},
-          [{atom,0,St#expand.module},{var,0,'X'}]}]}]}],
-     St#expand{defined=gb_sets:union(gb_sets:from_list(PreDef),
-				     St#expand.defined),
-               exports=union(from_list(PreExp), St#expand.exports)}}.
+          [ModAtom,{var,0,'X'}]}]}]}].
 
 %% forms(Forms, State) ->
 %%      {TransformedForms,State'}
@@ -196,7 +195,8 @@ attribute(module, Module, _L, St) ->
     true = is_atom(Module),
     St#expand{module=Module};
 attribute(export, Es, _L, St) ->
-    St#expand{exports=union(from_list(Es), St#expand.exports)};
+    St#expand{exports=ordsets:union(ordsets:from_list(Es),
+				    St#expand.exports)};
 attribute(import, Is, _L, St) ->
     import(Is, St);
 attribute(compile, _C, _L, St) ->
@@ -231,8 +231,6 @@ head(As, St) -> pattern_list(As, St).
 %%      {TransformedPattern,State'}
 %%
 
-pattern({var,_,'_'}=Var, St) ->                 %Ignore anonymous variable.
-    {Var,St};
 pattern({var,_,_}=Var, St) ->
     {Var,St};
 pattern({char,_,_}=Char, St) ->
@@ -385,19 +383,19 @@ expr({block,Line,Es0}, St0) ->
     {Es,St1} = exprs(Es0, St0),
     {{block,Line,Es},St1};
 expr({'if',Line,Cs0}, St0) ->
-    {Cs,St1} = icr_clauses(Cs0, St0),
+    {Cs,St1} = clauses(Cs0, St0),
     {{'if',Line,Cs},St1};
 expr({'case',Line,E0,Cs0}, St0) ->
     {E,St1} = expr(E0, St0),
-    {Cs,St2} = icr_clauses(Cs0, St1),
+    {Cs,St2} = clauses(Cs0, St1),
     {{'case',Line,E,Cs},St2};
 expr({'receive',Line,Cs0}, St0) ->
-    {Cs,St1} = icr_clauses(Cs0, St0),
+    {Cs,St1} = clauses(Cs0, St0),
     {{'receive',Line,Cs},St1};
 expr({'receive',Line,Cs0,To0,ToEs0}, St0) ->
     {To,St1} = expr(To0, St0),
     {ToEs,St2} = exprs(ToEs0, St1),
-    {Cs,St3} = icr_clauses(Cs0, St2),
+    {Cs,St3} = clauses(Cs0, St2),
     {{'receive',Line,Cs,To,ToEs},St3};
 expr({'fun',Line,Body}, St) ->
     fun_tq(Line, Body, St);
@@ -406,21 +404,15 @@ expr({named_fun,Line,Name,Cs}, St) ->
 expr({call,Line,{atom,La,N}=Atom,As0}, St0) ->
     {As,St1} = expr_list(As0, St0),
     Ar = length(As),
-    case defined(N,Ar,St1) of
-	true ->
+    Key = {N,Ar},
+    case St1#expand.ctype of
+	#{Key:=local} ->
 	    {{call,Line,Atom,As},St1};
+	#{Key:={imported,Mod}} ->
+	    {{call,Line,{remote,La,{atom,La,Mod},Atom},As},St1};
 	_ ->
-	    case imported(N, Ar, St1) of
-		{yes,Mod} ->
-		    {{call,Line,{remote,La,{atom,La,Mod},Atom},As},St1};
-		no ->
-		    case erl_internal:bif(N, Ar) of
-			true ->
-			    {{call,Line,{remote,La,{atom,La,erlang},Atom},As},St1};
-			false -> %% This should have been handled by erl_lint
-			    {{call,Line,Atom,As},St1}
-		    end
-	    end
+	    true = erl_internal:bif(N, Ar),
+	    {{call,Line,{remote,La,{atom,La,erlang},Atom},As},St1}
     end;
 expr({call,Line,{remote,Lr,M0,F},As0}, St0) ->
     {[M1,F1|As1],St1} = expr_list([M0,F|As0], St0),
@@ -430,12 +422,11 @@ expr({call,Line,F,As0}, St0) ->
     {{call,Line,Fun1,As1},St1};
 expr({'try',Line,Es0,Scs0,Ccs0,As0}, St0) ->
     {Es1,St1} = exprs(Es0, St0),
-    {Scs1,St2} = icr_clauses(Scs0, St1),
-    {Ccs1,St3} = icr_clauses(Ccs0, St2),
+    {Scs1,St2} = clauses(Scs0, St1),
+    {Ccs1,St3} = clauses(Ccs0, St2),
     {As1,St4} = exprs(As0, St3),
     {{'try',Line,Es1,Scs1,Ccs1,As1},St4};
 expr({'catch',Line,E0}, St0) ->
-    %% Catch exports no new variables.
     {E,St1} = expr(E0, St0),
     {{'catch',Line,E},St1};
 expr({match,Line,P0,E0}, St0) ->
@@ -456,21 +447,6 @@ expr_list([E0|Es0], St0) ->
     {[E|Es],St2};
 expr_list([], St) -> {[],St}.
 
-%% icr_clauses([Clause], State) -> {[TransformedClause],State'}
-%%  Be very careful here to return the variables that are really used
-%%  and really new.
-
-icr_clauses([], St) -> {[],St};
-icr_clauses(Clauses, St) -> icr_clauses2(Clauses, St).
-
-icr_clauses2([{clause,Line,H0,G0,B0}|Cs0], St0) ->
-    {H,St1} = head(H0, St0),
-    {G,St2} = guard(G0, St1),
-    {B,St3} = exprs(B0, St2),
-    {Cs,St4} = icr_clauses2(Cs0, St3),
-    {[{clause,Line,H,G,B}|Cs],St4};
-icr_clauses2([], St) -> {[],St}.
-
 %% lc_tq(Line, Qualifiers, State) ->
 %%      {[TransQual],State'}
 
@@ -486,16 +462,9 @@ lc_tq(Line, [{b_generate,Lg,P0,G0}|Qs0], St0) ->
     {Qs1,St3} = lc_tq(Line, Qs0, St2),
     {[{b_generate,Lg,P1,G1}|Qs1],St3};
 lc_tq(Line, [F0 | Qs0], St0) ->
-    case erl_lint:is_guard_test(F0) of
-        true ->
-            {F1,St1} = guard_test(F0, St0),
-            {Qs1,St2} = lc_tq(Line, Qs0, St1),
-            {[F1|Qs1],St2};
-        false ->
-            {F1,St1} = expr(F0, St0),
-            {Qs1,St2} = lc_tq(Line, Qs0, St1),
-            {[F1 | Qs1],St2}
-    end;
+    {F1,St1} = expr(F0, St0),
+    {Qs1,St2} = lc_tq(Line, Qs0, St1),
+    {[F1|Qs1],St2};
 lc_tq(_Line, [], St0) ->
     {[],St0}.
 
@@ -527,7 +496,7 @@ fun_tq(L, {function,M,F,A}, St) when is_atom(M), is_atom(F), is_integer(A) ->
 fun_tq(Lf, {function,_,_,_}=ExtFun, St) ->
     {{'fun',Lf,ExtFun},St};
 fun_tq(Lf, {clauses,Cs0}, St0) ->
-    {Cs1,St1} = fun_clauses(Cs0, St0),
+    {Cs1,St1} = clauses(Cs0, St0),
     {Fname,St2} = new_fun_name(St1),
     %% Set dummy values for Index and Uniq -- the real values will
     %% be assigned by beam_asm.
@@ -535,18 +504,10 @@ fun_tq(Lf, {clauses,Cs0}, St0) ->
     {{'fun',Lf,{clauses,Cs1},{Index,Uniq,Fname}},St2}.
 
 fun_tq(Line, Cs0, St0, Name) ->
-    {Cs1,St1} = fun_clauses(Cs0, St0),
+    {Cs1,St1} = clauses(Cs0, St0),
     {Fname,St2} = new_fun_name(St1, Name),
     {{named_fun,Line,Name,Cs1,{0,0,Fname}},St2}.
 
-fun_clauses([{clause,L,H0,G0,B0}|Cs0], St0) ->
-    {H,St1} = head(H0, St0),
-    {G,St2} = guard(G0, St1),
-    {B,St3} = exprs(B0, St2),
-    {Cs,St4} = fun_clauses(Cs0, St3),
-    {[{clause,L,H,G,B}|Cs],St4};
-fun_clauses([], St) -> {[],St}.
-
 %% new_fun_name(State) -> {FunName,State}.
 
 new_fun_name(St) ->
@@ -571,7 +532,6 @@ pattern_element({bin_element,Line,Expr0,Size0,Type0}, {Es,St0}) ->
     {[{bin_element,Line,Expr,Size,Type}|Es],St2}.
 
 pat_bit_size(default, St) -> {default,St};
-pat_bit_size({atom,_La,all}=All, St) -> {All,St};
 pat_bit_size({var,_Lv,_V}=Var, St) -> {Var,St};
 pat_bit_size(Size, St) ->
     Line = element(2, Size),
@@ -592,8 +552,7 @@ coerce_to_float({integer,L,I}=E, [float|_]) ->
     try
         {float,L,float(I)}
     catch
-        error:badarg -> E;
-        error:badarith -> E
+        error:badarg -> E
     end;
 coerce_to_float(E, _) -> E.
     
@@ -647,25 +606,11 @@ string_to_conses(Line, Cs, Tail) ->
 
 %% import(Line, Imports, State) ->
 %%      State'
-%% imported(Name, Arity, State) ->
-%%      {yes,Module} | no
-%%  Handle import declarations and test for imported functions. No need to
-%%  check when building imports as code is correct.
+%%  Handle import declarations.
 
-import({Mod,Fs}, St) ->
+import({Mod,Fs}, #expand{ctype=Ctype0}=St) ->
     true = is_atom(Mod),
-    Mfs = from_list(Fs),
-    St#expand{imports=add_imports(Mod, Mfs, St#expand.imports)}.
-
-add_imports(Mod, [F|Fs], Is) ->
-    add_imports(Mod, Fs, orddict:store(F, Mod, Is));
-add_imports(_, [], Is) -> Is.
-
-imported(F, A, St) ->
-    case orddict:find({F,A}, St#expand.imports) of
-        {ok,Mod} -> {yes,Mod};
-        error -> no
-    end.
-
-defined(F, A, St) ->
-    gb_sets:is_element({F,A}, St#expand.defined).
+    Ctype = foldl(fun(F, A) ->
+			  A#{F=>{imported,Mod}}
+		  end, Ctype0, Fs),
+    St#expand{ctype=Ctype}.
diff --git a/lib/compiler/src/v3_codegen.erl b/lib/compiler/src/v3_codegen.erl
index 2a89305f4d..6f1912c616 100644
--- a/lib/compiler/src/v3_codegen.erl
+++ b/lib/compiler/src/v3_codegen.erl
@@ -827,21 +827,24 @@ select_extract_bin([{var,Hd},{var,Tl}], Size0, Unit, Type, Flags, Vf,
 		  {bs_save2,CtxReg,{Ctx,Tl}}],Int1}
 	end,
     {Es,clear_dead(Aft, I, Vdb),St};
-select_extract_bin([{var,Hd}], Size0, Unit, binary, Flags, Vf,
+select_extract_bin([{var,Hd}], Size, Unit, binary, Flags, Vf,
 		   I, Vdb, Bef, Ctx, Body, St) ->
-    SizeReg = get_bin_size_reg(Size0, Bef),
+    %% Match the last segment of a binary. We KNOW that the size
+    %% must be 'all'.
+    Size = {atom,all},				%Assertion.
     {Es,Aft} =
 	case vdb_find(Hd, Vdb) of
 	    {_,_,Lhd} when Lhd =< I ->
+		%% The result will not be used. Furthermore, since we
+		%% we are at the end of the binary, the position will
+		%% not be used again; thus, it is safe to do a cheaper
+		%% test of the unit.
 		CtxReg = fetch_var(Ctx, Bef),
-		{case SizeReg =:= {atom,all} andalso is_context_unused(Body) of
-		     true when Unit =:= 1 ->
+		{case Unit of
+		     1 ->
 			 [];
-		     true ->
-			 [{test,bs_test_unit,{f,Vf},[CtxReg,Unit]}];
-		     false ->
-			 [{test,bs_skip_bits2,{f,Vf},
-			   [CtxReg,SizeReg,Unit,{field_flags,Flags}]}]
+		     _ ->
+			 [{test,bs_test_unit,{f,Vf},[CtxReg,Unit]}]
 		 end,Bef};
 	    {_,_,_} ->
 		case is_context_unused(Body) of
@@ -853,7 +856,7 @@ select_extract_bin([{var,Hd}], Size0, Unit, binary, Flags, Vf,
 			Name = bs_get_binary2,
 			Live = max_reg(Bef#sr.reg),
 			{[{test,Name,{f,Vf},Live,
-			   [CtxReg,SizeReg,Unit,{field_flags,Flags}],Rhd}],
+			   [CtxReg,Size,Unit,{field_flags,Flags}],Rhd}],
 			 Int1};
 		    true ->
 			%% Since the matching context will not be used again,
@@ -868,7 +871,7 @@ select_extract_bin([{var,Hd}], Size0, Unit, binary, Flags, Vf,
 			Name = bs_get_binary2,
 			Live = max_reg(Int1#sr.reg),
 			{[{test,Name,{f,Vf},Live,
-			   [CtxReg,SizeReg,Unit,{field_flags,Flags}],CtxReg}],
+			   [CtxReg,Size,Unit,{field_flags,Flags}],CtxReg}],
 			 Int1}
 		end
 	end,
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl
index 7d93e2ae16..830dd9973a 100644
--- a/lib/compiler/src/v3_core.erl
+++ b/lib/compiler/src/v3_core.erl
@@ -469,7 +469,8 @@ unforce_tree([#iset{var=#c_var{name=V},arg=Arg0}|Es], D0) ->
     unforce_tree(Es, D);
 unforce_tree([#icall{}=Call], D) ->
     unforce_tree_subst(Call, D);
-unforce_tree([Top], _) -> Top.
+unforce_tree([#c_var{name=V}], D) ->
+    gb_trees:get(V, D).
 
 unforce_tree_subst(#icall{module=#c_literal{val=erlang},
 			  name=#c_literal{val='=:='},
@@ -1079,13 +1080,39 @@ bc_tq1(Line, E, [#igen{anno=GAnno,ceps=Ceps,
 bc_tq1(Line, E, [#ifilter{}=Filter|Qs], Mc, St) ->
     filter_tq(Line, E, Filter, Mc, St, Qs, fun bc_tq1/5);
 bc_tq1(_, {bin,Bl,Elements}, [], AccVar, St0) ->
-    {E,Pre,St} = expr({bin,Bl,[{bin_element,Bl,
-				{var,Bl,AccVar#c_var.name},
-				{atom,Bl,all},
-				[binary,{unit,1}]}|Elements]}, St0),
+    bc_tq_build(Bl, [], AccVar, Elements, St0);
+bc_tq1(Line, E0, [], AccVar, St0) ->
+    BsFlags = [binary,{unit,1}],
+    BsSize = {atom,Line,all},
+    {E1,Pre0,St1} = safe(E0, St0),
+    case E1 of
+	#c_var{name=VarName} ->
+	    Var = {var,Line,VarName},
+	    Els = [{bin_element,Line,Var,BsSize,BsFlags}],
+	    bc_tq_build(Line, Pre0, AccVar, Els, St1);
+	#c_literal{val=Val} when is_bitstring(Val) ->
+	    Bits = bit_size(Val),
+	    <<Int0:Bits>> = Val,
+	    Int = {integer,Line,Int0},
+	    Sz = {integer,Line,Bits},
+	    Els = [{bin_element,Line,Int,Sz,[integer,{unit,1},big]}],
+	    bc_tq_build(Line, Pre0, AccVar, Els, St1);
+	_ ->
+	    %% Any other safe (cons, tuple, literal) is not a
+	    %% bitstring. Force the evaluation to fail (and
+	    %% generate a warning).
+	    Els = [{bin_element,Line,{atom,Line,bad_value},BsSize,BsFlags}],
+	    bc_tq_build(Line, Pre0, AccVar, Els, St1)
+    end.
+
+bc_tq_build(Line, Pre0, #c_var{name=AccVar}, Elements0, St0) ->
+    Elements = [{bin_element,Line,{var,Line,AccVar},{atom,Line,all},
+		 [binary,{unit,1}]}|Elements0],
+    {E,Pre,St} = expr({bin,Line,Elements}, St0),
     #a{anno=A} = Anno0 = get_anno(E),
     Anno = Anno0#a{anno=[compiler_generated,single_use|A]},
-    {set_anno(E, Anno),Pre,St}.
+    {set_anno(E, Anno),Pre0++Pre,St}.
+
 
 %% filter_tq(Line, Expr, Filter, Mc, State, [Qualifier], TqFun) ->
 %%     {Case,[PreExpr],State}.
@@ -1306,7 +1333,9 @@ bc_elem_size({bin,_,El}, St0) ->
 	    Vs = [V || {_,#c_var{name=V}} <- Vars0],
 	    {E,Pre,St} = bc_mul_pairs(F, #c_literal{val=Bits}, [], St0),
 	    {E,Pre,Vs,St}
-    end.
+    end;
+bc_elem_size(_, _) ->
+    throw(impossible).
 
 bc_elem_size_1([{bin_element,_,_,{integer,_,N},Flags}|Es], Bits, Vars) ->
     {unit,U} = keyfind(unit, 1, Flags),
@@ -1652,10 +1681,12 @@ pat_alias_map_pairs_1([]) -> [].
 
 pat_bin(Ps, St) -> [pat_segment(P, St) || P <- Ps].
 
-pat_segment({bin_element,_,Val,Size,[Type,{unit,Unit}|Flags]}, St) ->
+pat_segment({bin_element,L,Val,Size,[Type,{unit,Unit}|Flags]}, St) ->
+    Anno = lineno_anno(L, St),
     {Pval,[],St1} = pattern(Val,St),
     {Psize,[],_St2} = pattern(Size,St1),
-    #c_bitstr{val=Pval,size=Psize,
+    #c_bitstr{anno=Anno,
+	      val=Pval,size=Psize,
 	      unit=#c_literal{val=Unit},
 	      type=#c_literal{val=Type},
 	      flags=#c_literal{val=Flags}}.
@@ -1852,27 +1883,22 @@ uguard(Pg, Gs0, Ks, St0) ->
 %% uexprs([Kexpr], [KnownVar], State) -> {[Kexpr],State}.
 
 uexprs([#imatch{anno=A,pat=P0,arg=Arg,fc=Fc}|Les], Ks, St0) ->
-    %% Optimise for simple set of unbound variable.
-    case upattern(P0, Ks, St0) of
-	{#c_var{},[],_Pvs,_Pus,_} ->
-	    %% Throw our work away and just set to iset.
+    case upat_is_new_var(P0, Ks) of
+	true ->
+	    %% Assignment to a new variable.
 	    uexprs([#iset{var=P0,arg=Arg}|Les], Ks, St0);
-	_Other ->
-	    %% Throw our work away and set to icase.
-	    if
-		Les =:= [] ->
-		    %% Need to explicitly return match "value", make
-		    %% safe for efficiency.
-		    {La0,Lps,St1} = force_safe(Arg, St0),
-		    La = mark_compiler_generated(La0),
-		    Mc = #iclause{anno=A,pats=[P0],guard=[],body=[La]},
-		    uexprs(Lps ++ [#icase{anno=A,
-					  args=[La0],clauses=[Mc],fc=Fc}], Ks, St1);
-		true ->
-		    Mc = #iclause{anno=A,pats=[P0],guard=[],body=Les},
-		    uexprs([#icase{anno=A,args=[Arg],
-				   clauses=[Mc],fc=Fc}], Ks, St0)
-	    end
+	false when Les =:= [] ->
+	    %% Need to explicitly return match "value", make
+	    %% safe for efficiency.
+	    {La0,Lps,St1} = force_safe(Arg, St0),
+	    La = mark_compiler_generated(La0),
+	    Mc = #iclause{anno=A,pats=[P0],guard=[],body=[La]},
+	    uexprs(Lps ++ [#icase{anno=A,
+				  args=[La0],clauses=[Mc],fc=Fc}], Ks, St1);
+	false ->
+	    Mc = #iclause{anno=A,pats=[P0],guard=[],body=Les},
+	    uexprs([#icase{anno=A,args=[Arg],
+			   clauses=[Mc],fc=Fc}], Ks, St0)
     end;
 uexprs([Le0|Les0], Ks, St0) ->
     {Le1,St1} = uexpr(Le0, Ks, St0),
@@ -1880,6 +1906,15 @@ uexprs([Le0|Les0], Ks, St0) ->
     {[Le1|Les1],St2};
 uexprs([], _, St) -> {[],St}.
 
+%% upat_is_new_var(Pattern, [KnownVar]) -> true|false.
+%%  Test whether the pattern is a single, previously unknown
+%%  variable.
+
+upat_is_new_var(#c_var{name=V}, Ks) ->
+    not is_element(V, Ks);
+upat_is_new_var(_, _) ->
+    false.
+
 %% Mark a "safe" as compiler-generated.
 mark_compiler_generated(#c_cons{anno=A,hd=H,tl=T}) ->
     ann_c_cons([compiler_generated|A], mark_compiler_generated(H),
diff --git a/lib/compiler/src/v3_kernel.erl b/lib/compiler/src/v3_kernel.erl
index 7ee564683b..4446d5ff1d 100644
--- a/lib/compiler/src/v3_kernel.erl
+++ b/lib/compiler/src/v3_kernel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2015. 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.
@@ -117,7 +117,7 @@ copy_anno(Kdst, Ksrc) ->
 	       fcount=0,			%Fun counter
                ds=cerl_sets:new() :: cerl_sets:set(), %Defined variables
 	       funs=[],				%Fun functions
-	       free=[],				%Free variables
+	       free=#{},			%Free variables
 	       ws=[]   :: [warning()],		%Warnings.
 	       guard_refc=0}).			%> 0 means in guard
 
@@ -143,8 +143,10 @@ attributes([]) -> [].
 
 include_attribute(type) -> false;
 include_attribute(spec) -> false;
+include_attribute(callback) -> false;
 include_attribute(opaque) -> false;
 include_attribute(export_type) -> false;
+include_attribute(record) -> false;
 include_attribute(_) -> true.
 
 function({#c_var{name={F,Arity}=FA},Body}, St0) ->
@@ -1837,14 +1839,17 @@ handle_reuse_anno_1(V, _St) -> V.
 %% get_free(Name, Arity, State) -> [Free].
 %% store_free(Name, Arity, [Free], State) -> State.
 
-get_free(F, A, St) ->
-    case orddict:find({F,A}, St#kern.free) of
-	{ok,Val} -> Val;
-	error -> []
+get_free(F, A, #kern{free=FreeMap}) ->
+    Key = {F,A},
+    case FreeMap of
+	#{Key:=Val} -> Val;
+	_ -> []
     end.
 
-store_free(F, A, Free, St) ->
-    St#kern{free=orddict:store({F,A}, Free, St#kern.free)}.
+store_free(F, A, Free, #kern{free=FreeMap0}=St) ->
+    Key = {F,A},
+    FreeMap = FreeMap0#{Key=>Free},
+    St#kern{free=FreeMap}.
 
 break_rets({break,Rs}) -> Rs;
 break_rets(return) -> [].
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index 6553d10077..85118502e3 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -8,9 +8,12 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 MODULES= \
 	andor_SUITE \
 	apply_SUITE \
+	beam_block_SUITE \
 	beam_validator_SUITE \
 	beam_disasm_SUITE \
 	beam_except_SUITE \
+	beam_reorder_SUITE \
+	beam_type_SUITE \
 	beam_utils_SUITE \
 	bs_bincomp_SUITE \
 	bs_bit_binaries_SUITE \
@@ -42,7 +45,10 @@ MODULES= \
 NO_OPT= \
 	andor \
 	apply \
+	beam_block \
 	beam_except \
+	beam_reorder \
+	beam_type \
 	beam_utils \
 	bs_construct \
         bs_match \
@@ -63,6 +69,7 @@ NO_OPT= \
 INLINE= \
 	andor \
 	apply \
+	beam_block \
 	beam_utils \
 	bs_bincomp \
 	bs_bit_binaries \
@@ -105,7 +112,7 @@ RELSYSDIR = $(RELEASE_PATH)/compiler_test
 # ----------------------------------------------------
 
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include +clint +clint0
+ERL_COMPILE_FLAGS += +clint +clint0
 
 EBIN = .
 
diff --git a/lib/compiler/test/andor_SUITE.erl b/lib/compiler/test/andor_SUITE.erl
index fae9597c8a..9736f75fe8 100644
--- a/lib/compiler/test/andor_SUITE.erl
+++ b/lib/compiler/test/andor_SUITE.erl
@@ -25,7 +25,7 @@
 	 combined/1,in_case/1,before_and_inside_if/1,
 	 slow_compilation/1]).
 	 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -54,28 +54,28 @@ end_per_group(_GroupName, Config) ->
 t_case(Config) when is_list(Config) ->
     %% We test boolean cases almost but not quite like cases
     %% generated by andalso/orelse.
-    ?line less = t_case_a(1, 2),
-    ?line not_less = t_case_a(2, 2),
-    ?line {'EXIT',{{case_clause,false},_}} = (catch t_case_b({x,y,z}, 2)),
-    ?line {'EXIT',{{case_clause,true},_}} = (catch t_case_b(a, a)),
-    ?line eq = t_case_c(a, a),
-    ?line ne = t_case_c(42, []),
-    ?line t = t_case_d(x, x, true),
-    ?line f = t_case_d(x, x, false),
-    ?line f = t_case_d(x, y, true),
-    ?line {'EXIT',{badarg,_}} = (catch t_case_d(x, y, blurf)),
-    ?line true = (catch t_case_e({a,b}, {a,b})),
-    ?line false = (catch t_case_e({a,b}, 42)),
-
-    ?line true = t_case_xy(42, 100, 700),
-    ?line true = t_case_xy(42, 100, whatever),
-    ?line false = t_case_xy(42, wrong, 700),
-    ?line false = t_case_xy(42, wrong, whatever),
-
-    ?line true = t_case_xy(0, whatever, 700),
-    ?line true = t_case_xy(0, 100, 700),
-    ?line false = t_case_xy(0, whatever, wrong),
-    ?line false = t_case_xy(0, 100, wrong),
+    less = t_case_a(1, 2),
+    not_less = t_case_a(2, 2),
+    {'EXIT',{{case_clause,false},_}} = (catch t_case_b({x,y,z}, 2)),
+    {'EXIT',{{case_clause,true},_}} = (catch t_case_b(a, a)),
+    eq = t_case_c(a, a),
+    ne = t_case_c(42, []),
+    t = t_case_d(x, x, true),
+    f = t_case_d(x, x, false),
+    f = t_case_d(x, y, true),
+    {'EXIT',{badarg,_}} = (catch t_case_d(x, y, blurf)),
+    true = (catch t_case_e({a,b}, {a,b})),
+    false = (catch t_case_e({a,b}, 42)),
+
+    true = t_case_xy(42, 100, 700),
+    true = t_case_xy(42, 100, whatever),
+    false = t_case_xy(42, wrong, 700),
+    false = t_case_xy(42, wrong, whatever),
+
+    true = t_case_xy(0, whatever, 700),
+    true = t_case_xy(0, 100, 700),
+    false = t_case_xy(0, whatever, wrong),
+    false = t_case_xy(0, 100, wrong),
 
     ok.
 
@@ -135,35 +135,35 @@ t_case_y(X, Y, Z) ->
           end).
 
 t_and_or(Config) when is_list(Config) ->
-    ?line true = true and true,
-    ?line false = true and false,
-    ?line false = false and true,
-    ?line false = false and false,
-
-    ?line true = id(true) and true,
-    ?line false = id(true) and false,
-    ?line false = id(false) and true,
-    ?line false = id(false) and false,
-
-    ?line true = true and id(true),
-    ?line false = true and id(false),
-    ?line false = false and id(true),
-    ?line false = false and id(false),
-
-    ?line true = true or true,
-    ?line true = true or false,
-    ?line true = false or true,
-    ?line false = false or false,
-
-    ?line true = id(true) or true,
-    ?line true = id(true) or false,
-    ?line true = id(false) or true,
-    ?line false = id(false) or false,
-
-    ?line true = true or id(true),
-    ?line true = true or id(false),
-    ?line true = false or id(true),
-    ?line false = false or id(false),
+    true = true and true,
+    false = true and false,
+    false = false and true,
+    false = false and false,
+
+    true = id(true) and true,
+    false = id(true) and false,
+    false = id(false) and true,
+    false = id(false) and false,
+
+    true = true and id(true),
+    false = true and id(false),
+    false = false and id(true),
+    false = false and id(false),
+
+    true = true or true,
+    true = true or false,
+    true = false or true,
+    false = false or false,
+
+    true = id(true) or true,
+    true = id(true) or false,
+    true = id(false) or true,
+    false = id(false) or false,
+
+    true = true or id(true),
+    true = true or id(false),
+    true = false or id(true),
+    false = false or id(false),
 
     True = id(true),
 
@@ -187,28 +187,28 @@ t_andalso(Config) when is_list(Config) ->
     Ps = [{X,Y} || X <- Bs, Y <- Bs],
     lists:foreach(fun (P) -> t_andalso_1(P) end, Ps),
 
-    ?line true = true andalso true,
-    ?line false = true andalso false,
-    ?line false = false andalso true,
-    ?line false = false andalso false,
+    true = true andalso true,
+    false = true andalso false,
+    false = false andalso true,
+    false = false andalso false,
 
-    ?line true = ?GUARD(true andalso true),
-    ?line false = ?GUARD(true andalso false),
-    ?line false = ?GUARD(false andalso true),
-    ?line false = ?GUARD(false andalso false),
+    true = ?GUARD(true andalso true),
+    false = ?GUARD(true andalso false),
+    false = ?GUARD(false andalso true),
+    false = ?GUARD(false andalso false),
 
-    ?line false = false andalso glurf,
-    ?line false = false andalso exit(exit_now),
+    false = false andalso glurf,
+    false = false andalso exit(exit_now),
 
-    ?line true = not id(false) andalso not id(false),
-    ?line false = not id(false) andalso not id(true),
-    ?line false = not id(true) andalso not id(false),
-    ?line false = not id(true) andalso not id(true),
+    true = not id(false) andalso not id(false),
+    false = not id(false) andalso not id(true),
+    false = not id(true) andalso not id(false),
+    false = not id(true) andalso not id(true),
 
-    ?line {'EXIT',{badarg,_}} = (catch not id(glurf) andalso id(true)),
-    ?line {'EXIT',{badarg,_}} = (catch not id(false) andalso not id(glurf)),
-    ?line false = id(false) andalso not id(glurf),
-    ?line false = false andalso not id(glurf),
+    {'EXIT',{badarg,_}} = (catch not id(glurf) andalso id(true)),
+    {'EXIT',{badarg,_}} = (catch not id(false) andalso not id(glurf)),
+    false = id(false) andalso not id(glurf),
+    false = false andalso not id(glurf),
 
     true = begin (X1 = true) andalso X1, X1 end,
     false = false = begin (X2 = false) andalso X2, X2 end,
@@ -220,28 +220,28 @@ t_orelse(Config) when is_list(Config) ->
     Ps = [{X,Y} || X <- Bs, Y <- Bs],
     lists:foreach(fun (P) -> t_orelse_1(P) end, Ps),
     
-    ?line true = true orelse true,
-    ?line true = true orelse false,
-    ?line true = false orelse true,
-    ?line false = false orelse false,
+    true = true orelse true,
+    true = true orelse false,
+    true = false orelse true,
+    false = false orelse false,
 
-    ?line true = ?GUARD(true orelse true),
-    ?line true = ?GUARD(true orelse false),
-    ?line true = ?GUARD(false orelse true),
-    ?line false = ?GUARD(false orelse false),
+    true = ?GUARD(true orelse true),
+    true = ?GUARD(true orelse false),
+    true = ?GUARD(false orelse true),
+    false = ?GUARD(false orelse false),
 
-    ?line true = true orelse glurf,
-    ?line true = true orelse exit(exit_now),
+    true = true orelse glurf,
+    true = true orelse exit(exit_now),
 
-    ?line true = not id(false) orelse not id(false),
-    ?line true = not id(false) orelse not id(true),
-    ?line true = not id(true) orelse not id(false),
-    ?line false = not id(true) orelse not id(true),
+    true = not id(false) orelse not id(false),
+    true = not id(false) orelse not id(true),
+    true = not id(true) orelse not id(false),
+    false = not id(true) orelse not id(true),
 
-    ?line {'EXIT',{badarg,_}} = (catch not id(glurf) orelse id(true)),
-    ?line {'EXIT',{badarg,_}} = (catch not id(true) orelse not id(glurf)),
-    ?line true = id(true) orelse not id(glurf),
-    ?line true = true orelse not id(glurf),
+    {'EXIT',{badarg,_}} = (catch not id(glurf) orelse id(true)),
+    {'EXIT',{badarg,_}} = (catch not id(true) orelse not id(glurf)),
+    true = id(true) orelse not id(glurf),
+    true = true orelse not id(glurf),
 
     true = begin (X1 = true) orelse X1, X1 end,
     false = begin (X2 = false) orelse X2, X2 end,
@@ -255,7 +255,7 @@ t_andalso_1({X,Y}) ->
 	     X andalso Y -> true;
 	     true -> false
 	 end,
-    check(V1, X and Y).
+    V1 = id(X and Y).
 
 t_orelse_1({X,Y}) ->
     io:fwrite("~w orelse ~w: ",[X,Y]),
@@ -264,19 +264,19 @@ t_orelse_1({X,Y}) ->
 	     X orelse Y -> true;
 	     true -> false
 	 end,
-    check(V1, X or Y).
+    V1 = id(X or Y).
 
 inside(Config) when is_list(Config) ->
-    ?line true = inside(-8, 1),
-    ?line false = inside(-53.5, -879798),
-    ?line false = inside(1.0, -879),
-    ?line false = inside(59, -879),
-    ?line false = inside(-11, 1.0),
-    ?line false = inside(100, 0.2),
-    ?line false = inside(100, 1.2),
-    ?line false = inside(-53.5, 4),
-    ?line false = inside(1.0, 5.3),
-    ?line false = inside(59, 879),
+    true = inside(-8, 1),
+    false = inside(-53.5, -879798),
+    false = inside(1.0, -879),
+    false = inside(59, -879),
+    false = inside(-11, 1.0),
+    false = inside(100, 0.2),
+    false = inside(100, 1.2),
+    false = inside(-53.5, 4),
+    false = inside(1.0, 5.3),
+    false = inside(59, 879),
     ok.
 
 inside(Xm, Ym) ->
@@ -311,15 +311,15 @@ inside_guard(Xm, Ym, X, Y, W, H) ->
     {false,Xm,Ym,X,Y,W,H}.
 
 overlap(Config) when is_list(Config) ->
-    ?line true = overlap(7.0, 2.0, 8.0, 0.5),
-    ?line true = overlap(7.0, 2.0, 8.0, 2.5),
-    ?line true = overlap(7.0, 2.0, 5.3, 2),
-    ?line true = overlap(7.0, 2.0, 0.0, 100.0),
-
-    ?line false = overlap(-1, 2, -35, 0.5),
-    ?line false = overlap(-1, 2, 777, 0.5),
-    ?line false = overlap(-1, 2, 2, 10),
-    ?line false = overlap(2, 10, 12, 55.3),
+    true = overlap(7.0, 2.0, 8.0, 0.5),
+    true = overlap(7.0, 2.0, 8.0, 2.5),
+    true = overlap(7.0, 2.0, 5.3, 2),
+    true = overlap(7.0, 2.0, 0.0, 100.0),
+
+    false = overlap(-1, 2, -35, 0.5),
+    false = overlap(-1, 2, 777, 0.5),
+    false = overlap(-1, 2, 2, 10),
+    false = overlap(2, 10, 12, 55.3),
     ok.
 
 overlap(Pos1, Len1, Pos2, Len2) ->
@@ -343,33 +343,33 @@ overlap(Pos1, Len1, Pos2, Len2) ->
 -define(COMB(A,B,C), (A andalso B orelse C)).
 
 combined(Config) when is_list(Config) ->
-    ?line false = comb(false, false, false),
-    ?line true = comb(false, false, true),
-    ?line false = comb(false, true, false),
-    ?line true = comb(false, true, true),
-
-    ?line false = comb(true, false, false),
-    ?line true = comb(true, true, false),
-    ?line true = comb(true, false, true),
-    ?line true = comb(true, true, true),
-
-    ?line false = comb(false, blurf, false),
-    ?line true = comb(false, blurf, true),
-    ?line true = comb(true, true, blurf),
-
-    ?line false = ?COMB(false, false, false),
-    ?line true = ?COMB(false, false, true),
-    ?line false = ?COMB(false, true, false),
-    ?line true = ?COMB(false, true, true),
-
-    ?line false = ?COMB(true, false, false),
-    ?line true = ?COMB(true, true, false),
-    ?line true = ?COMB(true, false, true),
-    ?line true = ?COMB(true, true, true),
-
-    ?line false = ?COMB(false, blurf, false),
-    ?line true = ?COMB(false, blurf, true),
-    ?line true = ?COMB(true, true, blurf),
+    false = comb(false, false, false),
+    true = comb(false, false, true),
+    false = comb(false, true, false),
+    true = comb(false, true, true),
+
+    false = comb(true, false, false),
+    true = comb(true, true, false),
+    true = comb(true, false, true),
+    true = comb(true, true, true),
+
+    false = comb(false, blurf, false),
+    true = comb(false, blurf, true),
+    true = comb(true, true, blurf),
+
+    false = ?COMB(false, false, false),
+    true = ?COMB(false, false, true),
+    false = ?COMB(false, true, false),
+    true = ?COMB(false, true, true),
+
+    false = ?COMB(true, false, false),
+    true = ?COMB(true, true, false),
+    true = ?COMB(true, false, true),
+    true = ?COMB(true, true, true),
+
+    false = ?COMB(false, blurf, false),
+    true = ?COMB(false, blurf, true),
+    true = ?COMB(true, true, blurf),
 
     false = simple_comb(false, false),
     false = simple_comb(false, true),
@@ -412,13 +412,13 @@ simple_comb(A, B) ->
 %% Test that a boolean expression in a case expression is properly
 %% optimized (in particular, that the error behaviour is correct).
 in_case(Config) when is_list(Config) ->
-    ?line edge_rings = in_case_1(1, 1, 1, 1, 1),
-    ?line not_loop = in_case_1(0.5, 1, 1, 1, 1),
-    ?line loop = in_case_1(0.5, 0.9, 1.1, 1, 4),
-    ?line {'EXIT',{badarith,_}} = (catch in_case_1(1, 1, 1, 1, 0)),
-    ?line {'EXIT',{badarith,_}} = (catch in_case_1(1, 1, 1, 1, nan)),
-    ?line {'EXIT',{badarg,_}} = (catch in_case_1(1, 1, 1, blurf, 1)),
-    ?line {'EXIT',{badarith,_}} = (catch in_case_1([nan], 1, 1, 1, 1)),
+    edge_rings = in_case_1(1, 1, 1, 1, 1),
+    not_loop = in_case_1(0.5, 1, 1, 1, 1),
+    loop = in_case_1(0.5, 0.9, 1.1, 1, 4),
+    {'EXIT',{badarith,_}} = (catch in_case_1(1, 1, 1, 1, 0)),
+    {'EXIT',{badarith,_}} = (catch in_case_1(1, 1, 1, 1, nan)),
+    {'EXIT',{badarg,_}} = (catch in_case_1(1, 1, 1, blurf, 1)),
+    {'EXIT',{badarith,_}} = (catch in_case_1([nan], 1, 1, 1, 1)),
     ok.
 
 in_case_1(LenUp, LenDw, LenN, Rotation, Count) ->
@@ -451,23 +451,23 @@ in_case_1_guard(LenUp, LenDw, LenN, Rotation, Count) ->
     end.
 
 before_and_inside_if(Config) when is_list(Config) ->
-    ?line no = before_and_inside_if([a], [b], delete),
-    ?line no = before_and_inside_if([a], [b], x),
-    ?line no = before_and_inside_if([a], [], delete),
-    ?line no = before_and_inside_if([a], [], x),
-    ?line no = before_and_inside_if([], [], delete),
-    ?line yes = before_and_inside_if([], [], x),
-    ?line yes = before_and_inside_if([], [b], delete),
-    ?line yes = before_and_inside_if([], [b], x),
-
-    ?line {ch1,ch2} = before_and_inside_if_2([a], [b], blah),
-    ?line {ch1,ch2} = before_and_inside_if_2([a], [b], xx),
-    ?line {ch1,ch2} = before_and_inside_if_2([a], [], blah),
-    ?line {ch1,ch2} = before_and_inside_if_2([a], [], xx),
-    ?line {no,no} = before_and_inside_if_2([], [b], blah),
-    ?line {no,no} = before_and_inside_if_2([], [b], xx),
-    ?line {ch1,no} = before_and_inside_if_2([], [], blah),
-    ?line {no,ch2} = before_and_inside_if_2([], [], xx),
+    no = before_and_inside_if([a], [b], delete),
+    no = before_and_inside_if([a], [b], x),
+    no = before_and_inside_if([a], [], delete),
+    no = before_and_inside_if([a], [], x),
+    no = before_and_inside_if([], [], delete),
+    yes = before_and_inside_if([], [], x),
+    yes = before_and_inside_if([], [b], delete),
+    yes = before_and_inside_if([], [b], x),
+
+    {ch1,ch2} = before_and_inside_if_2([a], [b], blah),
+    {ch1,ch2} = before_and_inside_if_2([a], [b], xx),
+    {ch1,ch2} = before_and_inside_if_2([a], [], blah),
+    {ch1,ch2} = before_and_inside_if_2([a], [], xx),
+    {no,no} = before_and_inside_if_2([], [b], blah),
+    {no,no} = before_and_inside_if_2([], [b], xx),
+    {ch1,no} = before_and_inside_if_2([], [], blah),
+    {no,ch2} = before_and_inside_if_2([], [], xx),
     ok.
 
 %% Thanks to Simon Cornish and Kostis Sagonas.
@@ -539,14 +539,6 @@ slow_compilation_1(T, _) when element(1, T) == a ->
 
 %% Utilities.
 
-check(V1, V0) ->
-    if V1 /= V0 ->
-	    io:fwrite("error: ~w.\n", [V1]),
-	    ?t:fail();
-       true ->
-	    io:fwrite("ok: ~w.\n", [V1])
-    end.
-
 echo(X) ->	    
     io:fwrite("eval(~w); ",[X]),
     X.
diff --git a/lib/compiler/test/apply_SUITE.erl b/lib/compiler/test/apply_SUITE.erl
index 3425553fed..8abcfe9dac 100644
--- a/lib/compiler/test/apply_SUITE.erl
+++ b/lib/compiler/test/apply_SUITE.erl
@@ -24,7 +24,7 @@
 
 -export([foo/0,bar/1,baz/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -53,44 +53,44 @@ end_per_group(_GroupName, Config) ->
 -define(APPLY2(M, F, A1, A2), (fun(Res) -> Res = M:F(A1, A2) end)(apply(M, F, [A1,A2]))).
 
 mfa(Config) when is_list(Config) ->
-    ?line ok = ?APPLY0(?MODULE, foo),
-    ?line {[a,b]} = ?APPLY1(?MODULE, bar, [a,b]),
-    ?line {39,{a}} = ?APPLY2(?MODULE, baz, 39, {a}),
-
-    ?line Mod = id(?MODULE),
-    ?line ok = ?APPLY0(Mod, foo),
-    ?line {[a,b]} = ?APPLY1(Mod, bar, [a,b]),
-    ?line {39,{a}} = ?APPLY2(Mod, baz, 39, {a}),
-
-    ?line ok = ?APPLY0(?MODULE, (id(foo))),
-    ?line {[a,b]} = ?APPLY1(?MODULE, (id(bar)), [a,b]),
-    ?line {39,{a}} = ?APPLY2(?MODULE, (id(baz)), 39, {a}),
-
-    ?line ok = ?APPLY0(Mod, (id(foo))),
-    ?line {[a,b]} = ?APPLY1(Mod, (id(bar)), [a,b]),
-    ?line {39,{a}} = ?APPLY2(Mod, (id(baz)), 39, {a}),
-
-    ?line {'EXIT',_} = (catch ?APPLY2(Mod, (id(bazzzzzz)), a, b)),
-    ?line {'EXIT',_} = (catch ?APPLY2({}, baz, a, b)),
-    ?line {'EXIT',_} = (catch ?APPLY2(?MODULE, [], a, b)),
-
-    ?line ok = apply(Mod, foo, id([])),
-    ?line {[a,b|c]} = apply(Mod, bar, id([[a,b|c]])),
-    ?line {[xx],{a}} = apply(?MODULE, baz, id([[xx],{a}])),
-
-    ?line Erlang = id(erlang),
-    ?line Self = self(),
-    ?line Self = ?APPLY0(Erlang, self),
-    ?line 42.0 = ?APPLY1(Erlang, abs, -42.0),
-    ?line b = ?APPLY2(Erlang, element, 2, {a,b,c}),
-    ?line true = ?APPLY1(Erlang, is_function, fun erlang:list_to_binary/1),
-    ?line true = ?APPLY1(Erlang, is_function, fun() -> ok end),
-    ?line false = ?APPLY1(Erlang, is_function, blurf),
-    ?line true = ?APPLY2(Erlang, is_function, fun erlang:list_to_binary/1, 1),
-    ?line true = ?APPLY2(Erlang, is_function, fun() -> ok end, 0),
-    ?line false = ?APPLY2(Erlang, is_function, blurf, 0),
-
-    ?line apply(Mod, foo, []).
+    ok = ?APPLY0(?MODULE, foo),
+    {[a,b]} = ?APPLY1(?MODULE, bar, [a,b]),
+    {39,{a}} = ?APPLY2(?MODULE, baz, 39, {a}),
+
+    Mod = id(?MODULE),
+    ok = ?APPLY0(Mod, foo),
+    {[a,b]} = ?APPLY1(Mod, bar, [a,b]),
+    {39,{a}} = ?APPLY2(Mod, baz, 39, {a}),
+
+    ok = ?APPLY0(?MODULE, (id(foo))),
+    {[a,b]} = ?APPLY1(?MODULE, (id(bar)), [a,b]),
+    {39,{a}} = ?APPLY2(?MODULE, (id(baz)), 39, {a}),
+
+    ok = ?APPLY0(Mod, (id(foo))),
+    {[a,b]} = ?APPLY1(Mod, (id(bar)), [a,b]),
+    {39,{a}} = ?APPLY2(Mod, (id(baz)), 39, {a}),
+
+    {'EXIT',_} = (catch ?APPLY2(Mod, (id(bazzzzzz)), a, b)),
+    {'EXIT',_} = (catch ?APPLY2({}, baz, a, b)),
+    {'EXIT',_} = (catch ?APPLY2(?MODULE, [], a, b)),
+
+    ok = apply(Mod, foo, id([])),
+    {[a,b|c]} = apply(Mod, bar, id([[a,b|c]])),
+    {[xx],{a}} = apply(?MODULE, baz, id([[xx],{a}])),
+
+    Erlang = id(erlang),
+    Self = self(),
+    Self = ?APPLY0(Erlang, self),
+    42.0 = ?APPLY1(Erlang, abs, -42.0),
+    b = ?APPLY2(Erlang, element, 2, {a,b,c}),
+    true = ?APPLY1(Erlang, is_function, fun erlang:list_to_binary/1),
+    true = ?APPLY1(Erlang, is_function, fun() -> ok end),
+    false = ?APPLY1(Erlang, is_function, blurf),
+    true = ?APPLY2(Erlang, is_function, fun erlang:list_to_binary/1, 1),
+    true = ?APPLY2(Erlang, is_function, fun() -> ok end, 0),
+    false = ?APPLY2(Erlang, is_function, blurf, 0),
+
+    apply(Mod, foo, []).
 
 foo() ->
     ok.
@@ -106,21 +106,21 @@ baz(A, B) ->
 -define(FUNAPPLY2(F, A1, A2), (fun(Res) -> Res = F(A1, A2) end)(apply(F, [A1,A2]))).
 
 fun_apply(Config) when is_list(Config) ->
-    ?line Self = self(),
+    Self = self(),
 
-    ?line Self = ?FUNAPPLY0(fun() -> self() end),
-    ?line Self = ?FUNAPPLY0((id(fun() -> self() end))),
-    ?line ok = ?FUNAPPLY0(fun ?MODULE:foo/0),
-    ?line ok = ?FUNAPPLY0((id(fun ?MODULE:foo/0))),
+    Self = ?FUNAPPLY0(fun() -> self() end),
+    Self = ?FUNAPPLY0((id(fun() -> self() end))),
+    ok = ?FUNAPPLY0(fun ?MODULE:foo/0),
+    ok = ?FUNAPPLY0((id(fun ?MODULE:foo/0))),
 
-    ?line -42 = ?FUNAPPLY1(fun(A) -> -A end, 42),
-    ?line [x,yy] = ?FUNAPPLY1((id(fun(T) -> [x|T] end)), [yy]),
-    ?line {[a|b]} = ?FUNAPPLY1(fun ?MODULE:bar/1, [a|b]),
-    ?line {[a|b]} = ?FUNAPPLY1((id(fun ?MODULE:bar/1)), [a|b]),
+    -42 = ?FUNAPPLY1(fun(A) -> -A end, 42),
+    [x,yy] = ?FUNAPPLY1((id(fun(T) -> [x|T] end)), [yy]),
+    {[a|b]} = ?FUNAPPLY1(fun ?MODULE:bar/1, [a|b]),
+    {[a|b]} = ?FUNAPPLY1((id(fun ?MODULE:bar/1)), [a|b]),
 
-    ?line {a,b} = ?FUNAPPLY2(fun(A, B) -> {A,B} end, a, b),
-    ?line {a,[b]} = ?FUNAPPLY2((id(fun(A, B) -> {A,B} end)), a, [b]),
-    ?line {42,{a}} = ?FUNAPPLY2((id(fun ?MODULE:baz/2)), 42, {a}),
+    {a,b} = ?FUNAPPLY2(fun(A, B) -> {A,B} end, a, b),
+    {a,[b]} = ?FUNAPPLY2((id(fun(A, B) -> {A,B} end)), a, [b]),
+    {42,{a}} = ?FUNAPPLY2((id(fun ?MODULE:baz/2)), 42, {a}),
 
     ok.
 
diff --git a/lib/compiler/test/beam_block_SUITE.erl b/lib/compiler/test/beam_block_SUITE.erl
new file mode 100644
index 0000000000..7b6f2066be
--- /dev/null
+++ b/lib/compiler/test/beam_block_SUITE.erl
@@ -0,0 +1,66 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2015. 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%
+%%
+-module(beam_block_SUITE).
+
+-export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
+	 init_per_group/2,end_per_group/2,
+	 get_map_elements/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    test_lib:recompile(?MODULE),
+    [{group,p}].
+
+groups() ->
+    [{p,[parallel],
+      [get_map_elements
+      ]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+get_map_elements(_Config) ->
+    [{pred,var}] = get_map_elements([{pred,var}], #{}, []),
+    [{pred,var}] = get_map_elements([{pred,var}], #{pred=>[]}, []),
+    acc = get_map_elements([], #{pred=>[]}, acc),
+    ok.
+
+get_map_elements([{Pred,Var}|Left], Map, Acc) ->
+    case Map of
+        #{Var := List} ->
+            case lists:keyfind(Pred, 1, List) of
+                false ->
+                    get_map_elements(Left, Map, [{Pred,Var}|Acc])
+            end;
+        #{} ->
+            get_map_elements(Left, Map, [{Pred,Var}|Acc])
+    end;
+get_map_elements([], _Map, Acc) ->
+    Acc.
diff --git a/lib/compiler/test/beam_disasm_SUITE.erl b/lib/compiler/test/beam_disasm_SUITE.erl
index 4dd92e7ed9..90598d9639 100644
--- a/lib/compiler/test/beam_disasm_SUITE.erl
+++ b/lib/compiler/test/beam_disasm_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(beam_disasm_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
 	 init_per_group/2,end_per_group/2]).
@@ -46,21 +46,20 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-stripped(doc) ->
-    ["Check that stripped beam files can be disassembled"];
+%% Check that stripped beam files can be disassembled.
 stripped(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line SrcName = filename:join(PrivDir, "tmp.erl"),
-    ?line BeamName = filename:join(PrivDir, "tmp.beam"),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    SrcName = filename:join(PrivDir, "tmp.erl"),
+    BeamName = filename:join(PrivDir, "tmp.beam"),
     Prog = <<"-module(tmp).\n-export([tmp/0]).\ntmp()->ok.\n">>,
-    ?line ok = file:write_file(SrcName, Prog),
-    ?line {ok, tmp} =
+    ok = file:write_file(SrcName, Prog),
+    {ok, tmp} =
 	compile:file(SrcName, [{outdir, PrivDir}]),
-    ?line {beam_file, tmp, _, Attr, CompileInfo, [_|_]} =
+    {beam_file, tmp, _, Attr, CompileInfo, [_|_]} =
 	beam_disasm:file(BeamName),
-    ?line true = is_list(Attr),
-    ?line true = is_list(CompileInfo),
-    ?line {ok, {tmp, _}} = beam_lib:strip(BeamName),
-    ?line {beam_file, tmp, _, [], [], [_|_]} =
+    true = is_list(Attr),
+    true = is_list(CompileInfo),
+    {ok, {tmp, _}} = beam_lib:strip(BeamName),
+    {beam_file, tmp, _, [], [], [_|_]} =
 	beam_disasm:file(BeamName),
     ok.
diff --git a/lib/compiler/test/beam_reorder_SUITE.erl b/lib/compiler/test/beam_reorder_SUITE.erl
new file mode 100644
index 0000000000..4b2262f65b
--- /dev/null
+++ b/lib/compiler/test/beam_reorder_SUITE.erl
@@ -0,0 +1,69 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2015. 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%
+%%
+-module(beam_reorder_SUITE).
+
+-export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
+	 init_per_group/2,end_per_group/2,
+	 alloc/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    test_lib:recompile(?MODULE),
+    [{group,p}].
+
+groups() ->
+    [{p,[parallel],
+      [alloc
+      ]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+-record(alloc, {version}).
+
+alloc(_Config) ->
+    {ok,42} = alloc_a(1, 2, #alloc{version=42}),
+    {a,b,c} = alloc_b(1, 2, #alloc{version={a,b,c}}),
+    ok.
+
+alloc_a(_U1, _U2, R) ->
+    V = R#alloc.version,
+    Res = id({ok,V}),
+    _ = id(0),
+    Res.
+
+alloc_b(_U1, _U2, R) ->
+    V = R#alloc.version,
+    Res = id(V),
+    _ = id(0),
+    Res.
+
+id(I) ->
+    I.
diff --git a/lib/compiler/test/beam_type_SUITE.erl b/lib/compiler/test/beam_type_SUITE.erl
new file mode 100644
index 0000000000..8d5c0190ed
--- /dev/null
+++ b/lib/compiler/test/beam_type_SUITE.erl
@@ -0,0 +1,98 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2015. 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%
+%%
+-module(beam_type_SUITE).
+
+-export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
+	 init_per_group/2,end_per_group/2,
+	 integers/1,coverage/1,booleans/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    test_lib:recompile(?MODULE),
+    [{group,p}].
+
+groups() ->
+    [{p,[parallel],
+      [integers,
+       coverage,
+       booleans
+      ]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+integers(_Config) ->
+    a = do_integers_1(2#11000),
+    b = do_integers_1(2#11001),
+
+    a = do_integers_2(<<0:1>>),
+    {'EXIT',{{case_clause,-1},_}} = (catch do_integers_2(<<1:1>>)),
+
+    ok.
+
+do_integers_1(B0) ->
+    B = B0 band 1,
+    case B band 15 of
+	0 -> a;
+	1 -> b
+    end.
+
+do_integers_2(Bin) ->
+    <<B:1/signed>> = Bin,
+    case B of
+	0 -> a;
+	1 -> b
+    end.
+
+coverage(_Config) ->
+    {'EXIT',{badarith,_}} = (catch id(1) bsl 0.5),
+    {'EXIT',{badarith,_}} = (catch id(2.0) bsl 2),
+    {'EXIT',{badarith,_}} = (catch a + 0.5),
+    {'EXIT',{badarith,_}} = (catch 2.0 * b),
+
+    {'EXIT',{badarith,_}} = (catch id(42.0) / (1 bsl 2000)),
+
+    id(id(42) band 387439739874298734983787934283479243879),
+    id(-1 band id(13)),
+
+    ok.
+
+booleans(_Config) ->
+    {'EXIT',{{case_clause,_},_}} = (catch do_booleans(42)),
+    ok.
+
+do_booleans(B) ->
+    case is_integer(B) of
+	yes -> yes;
+	no -> no
+    end.
+
+id(I) ->
+    I.
diff --git a/lib/compiler/test/beam_validator_SUITE.erl b/lib/compiler/test/beam_validator_SUITE.erl
index 69391b15eb..b3fb091f46 100644
--- a/lib/compiler/test/beam_validator_SUITE.erl
+++ b/lib/compiler/test/beam_validator_SUITE.erl
@@ -34,18 +34,17 @@
 	 undef_label/1,illegal_instruction/1,failing_gc_guard_bif/1,
 	 map_field_lists/1]).
 	 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog = test_server:timetrap(?t:minutes(10)),
-    [{watchdog,Dog}|Config].
+    Config.
 
 end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,10}}].
 
 all() -> 
     test_lib:recompile(?MODULE),
@@ -78,7 +77,7 @@ end_per_group(_GroupName, Config) ->
 compiler_bug(Config) when is_list(Config) ->
     %% Check that the compiler returns an error if we try to
     %% assemble one of the bad '.S' files.
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     File = filename:join(Data, "compiler_bug"),
     error = compile:file(File, [from_asm,report_errors,time]),
 
@@ -93,43 +92,41 @@ compiler_bug(Config) when is_list(Config) ->
 %% The following code is stupid but it should compile.
 stupid_but_valid(Config) when is_list(Config) ->
     AnAtom = nisse,
-    ?line try setelement(5, setelement(6, AnAtom, value), another_value) of
-	      Term -> ?line ?t:fail({what_happened,Term})
-	  catch
-	      error:badarg -> ok
-	  end,
+    try setelement(5, setelement(6, AnAtom, value), another_value) of
+	Term -> ct:fail({what_happened,Term})
+    catch
+	error:badarg -> ok
+    end,
     ok.
 
 xrange(Config) when is_list(Config) ->
     Errors = do_val(xrange, Config),
-    ?line
-	[{{t,sum_1,2},
-	  {{bif,'+',{f,0},[{x,-1},{x,1}],{x,0}},4,
-	   {uninitialized_reg,{x,-1}}}},
-	 {{t,sum_2,2},
-	  {{bif,'+',{f,0},[{x,0},{x,1024}],{x,0}},4,
-	   {uninitialized_reg,{x,1024}}}},
-	 {{t,sum_3,2},
-	  {{bif,'+',{f,0},[{x,0},{x,1}],{x,-1}},4,
-	   {invalid_store,{x,-1},number}}},
-	 {{t,sum_4,2},
-	  {{bif,'+',{f,0},[{x,0},{x,1}],{x,1024}},4,limit}}] = Errors,
+    [{{t,sum_1,2},
+      {{bif,'+',{f,0},[{x,-1},{x,1}],{x,0}},4,
+       {uninitialized_reg,{x,-1}}}},
+     {{t,sum_2,2},
+      {{bif,'+',{f,0},[{x,0},{x,1023}],{x,0}},4,
+       {uninitialized_reg,{x,1023}}}},
+     {{t,sum_3,2},
+      {{bif,'+',{f,0},[{x,0},{x,1}],{x,-1}},4,
+       {invalid_store,{x,-1},number}}},
+     {{t,sum_4,2},
+      {{bif,'+',{f,0},[{x,0},{x,1}],{x,1023}},4,limit}}] = Errors,
     ok.
 
 yrange(Config) when is_list(Config) ->
     Errors = do_val(yrange, Config),
-    ?line
-	[{{t,sum_1,2},
-	  {{move,{x,1},{y,-1}},5,
-	   {invalid_store,{y,-1},term}}},
-	 {{t,sum_2,2},
-	  {{bif,'+',{f,0},[{x,0},{y,1024}],{x,0}},7,
-	   {uninitialized_reg,{y,1024}}}},
-	 {{t,sum_3,2},
-	  {{move,{x,1},{y,1024}},5,limit}},
-	 {{t,sum_4,2},
-	  {{move,{x,1},{y,-1}},5,
-	   {invalid_store,{y,-1},term}}}] = Errors,
+    [{{t,sum_1,2},
+      {{move,{x,1},{y,-1}},5,
+       {invalid_store,{y,-1},term}}},
+     {{t,sum_2,2},
+      {{bif,'+',{f,0},[{x,0},{y,1024}],{x,0}},7,
+       {uninitialized_reg,{y,1024}}}},
+     {{t,sum_3,2},
+      {{move,{x,1},{y,1024}},5,limit}},
+     {{t,sum_4,2},
+      {{move,{x,1},{y,-1}},5,
+       {invalid_store,{y,-1},term}}}] = Errors,
     ok.
 
 stack(Config) when is_list(Config) ->
@@ -163,25 +160,23 @@ merge_undefined(Config) when is_list(Config) ->
 
 uninit(Config) when is_list(Config) ->
     Errors = do_val(uninit, Config),
-    ?line
-	[{{t,sum_1,2},
-	  {{move,{y,0},{x,0}},5,{uninitialized_reg,{y,0}}}},
-	 {{t,sum_2,2},
-	  {{call,1,{f,8}},5,{uninitialized_reg,{y,0}}}},
-	 {{t,sum_3,2},
-	  {{bif,'+',{f,0},[{x,0},{y,0}],{x,0}},
-	   6,
-	   {unassigned,{y,0}}}}] = Errors,
+    [{{t,sum_1,2},
+      {{move,{y,0},{x,0}},5,{uninitialized_reg,{y,0}}}},
+     {{t,sum_2,2},
+      {{call,1,{f,8}},5,{uninitialized_reg,{y,0}}}},
+     {{t,sum_3,2},
+      {{bif,'+',{f,0},[{x,0},{y,0}],{x,0}},
+       6,
+       {unassigned,{y,0}}}}] = Errors,
     ok.
 
 unsafe_catch(Config) when is_list(Config) ->
     Errors = do_val(unsafe_catch, Config),
-    ?line
-	[{{t,small,2},
-	  {{bs_put_integer,{f,0},{integer,16},1,
-	    {field_flags,[unsigned,big]},{y,0}},
-	   20,
-	   {unassigned,{y,0}}}}] = Errors,
+    [{{t,small,2},
+      {{bs_put_integer,{f,0},{integer,16},1,
+	{field_flags,[unsigned,big]},{y,0}},
+       20,
+       {unassigned,{y,0}}}}] = Errors,
     ok.
 
 dead_code(Config) when is_list(Config) ->
@@ -190,16 +185,14 @@ dead_code(Config) when is_list(Config) ->
 
 overwrite_catchtag(Config) when is_list(Config) ->
     Errors = do_val(overwrite_catchtag, Config),
-    ?line
-	[{{overwrite_catchtag,foo,1},
-	  {{move,{x,0},{y,0}},6,{catchtag,_}}}] = Errors,
+    [{{overwrite_catchtag,foo,1},
+      {{move,{x,0},{y,0}},6,{catchtag,_}}}] = Errors,
     ok.
 
 overwrite_trytag(Config) when is_list(Config) ->
     Errors = do_val(overwrite_trytag, Config),
-    ?line
-	[{{overwrite_trytag,foo,1},
-	  {{kill,{y,2}},8,{trytag,_}}}] = Errors,
+    [{{overwrite_trytag,foo,1},
+      {{kill,{y,2}},8,{trytag,_}}}] = Errors,
     ok.
 
 accessing_tags(Config) when is_list(Config) ->
@@ -231,82 +224,77 @@ bad_catch_try(Config) when is_list(Config) ->
 
 cons_guard(Config) when is_list(Config) ->
     Errors = do_val(cons, Config),
-    ?line
-	[{{cons,foo,1},
-	  {{get_list,{x,0},{x,1},{x,2}},
-	   5,
-	   {bad_type,{needed,cons},{actual,term}}}}] = Errors,
+    [{{cons,foo,1},
+      {{get_list,{x,0},{x,1},{x,2}},
+       5,
+       {bad_type,{needed,cons},{actual,term}}}}] = Errors,
     ok.
 
 freg_range(Config) when is_list(Config) ->
     Errors = do_val(freg_range, Config),
-    ?line 
-	[{{t,sum_1,2},
-	  {{bif,fadd,{f,0},[{fr,-1},{fr,1}],{fr,0}},
-	   5,
-	   {bad_source,{fr,-1}}}},
-	 {{t,sum_2,2},
-	  {{bif,fadd,{f,0},[{fr,0},{fr,1024}],{fr,0}},
-	   6,
-	   {uninitialized_reg,{fr,1024}}}},
-	 {{t,sum_3,2},
-	  {{bif,fadd,{f,0},[{fr,0},{fr,1}],{fr,-1}},
-	   7,
-	   {bad_target,{fr,-1}}}},
-	 {{t,sum_4,2},
-	  {{bif,fadd,{f,0},[{fr,0},{fr,1}],{fr,1024}},
-	   7,
-	   limit}}] = Errors,
+    [{{t,sum_1,2},
+      {{bif,fadd,{f,0},[{fr,-1},{fr,1}],{fr,0}},
+       5,
+       {bad_source,{fr,-1}}}},
+     {{t,sum_2,2},
+      {{bif,fadd,{f,0},[{fr,0},{fr,1024}],{fr,0}},
+       6,
+       {uninitialized_reg,{fr,1024}}}},
+     {{t,sum_3,2},
+      {{bif,fadd,{f,0},[{fr,0},{fr,1}],{fr,-1}},
+       7,
+       {bad_target,{fr,-1}}}},
+     {{t,sum_4,2},
+      {{bif,fadd,{f,0},[{fr,0},{fr,1}],{fr,1024}},
+       7,
+       limit}}] = Errors,
     ok.
 
 freg_uninit(Config) when is_list(Config) ->
     Errors = do_val(freg_uninit, Config),
-    ?line 
-	[{{t,sum_1,2},
-	  {{bif,fadd,{f,0},[{fr,0},{fr,1}],{fr,0}},
-	   6,
-	   {uninitialized_reg,{fr,1}}}},
-	 {{t,sum_2,2},
-	  {{bif,fadd,{f,0},[{fr,0},{fr,1}],{fr,0}},
-	   9,
-	   {uninitialized_reg,{fr,0}}}}] = Errors,
+    [{{t,sum_1,2},
+      {{bif,fadd,{f,0},[{fr,0},{fr,1}],{fr,0}},
+       6,
+       {uninitialized_reg,{fr,1}}}},
+     {{t,sum_2,2},
+      {{bif,fadd,{f,0},[{fr,0},{fr,1}],{fr,0}},
+       9,
+       {uninitialized_reg,{fr,0}}}}] = Errors,
     ok.
 
 freg_state(Config) when is_list(Config) ->
     Errors = do_val(freg_state, Config),
-    ?line
-	[{{t,sum_1,2},
-	  {{bif,fmul,{f,0},[{fr,0},{fr,1}],{fr,0}},
-	   6,
-	   {bad_floating_point_state,undefined}}},
-	 {{t,sum_2,2},
-	  {{fmove,{fr,0},{x,0}},
-	   8,
-	   {bad_floating_point_state,cleared}}},
-	 {{t,sum_3,2},
-	  {{bif,'-',{f,0},[{x,1},{x,0}],{x,1}},
-	   8,
-	   {unsafe_instruction,{float_error_state,cleared}}}},
-	 {{t,sum_4,2},
-	  {{fcheckerror,{f,0}},
-	   4,
-	   {bad_floating_point_state,undefined}}},
-	 {{t,sum_5,2},
-	  {fclearerror,5,{bad_floating_point_state,cleared}}}] = Errors,
+    [{{t,sum_1,2},
+      {{bif,fmul,{f,0},[{fr,0},{fr,1}],{fr,0}},
+       6,
+       {bad_floating_point_state,undefined}}},
+     {{t,sum_2,2},
+      {{fmove,{fr,0},{x,0}},
+       8,
+       {bad_floating_point_state,cleared}}},
+     {{t,sum_3,2},
+      {{bif,'-',{f,0},[{x,1},{x,0}],{x,1}},
+       8,
+       {unsafe_instruction,{float_error_state,cleared}}}},
+     {{t,sum_4,2},
+      {{fcheckerror,{f,0}},
+       4,
+       {bad_floating_point_state,undefined}}},
+     {{t,sum_5,2},
+      {fclearerror,5,{bad_floating_point_state,cleared}}}] = Errors,
     ok.
 
 bad_bin_match(Config) when is_list(Config) ->
-	[{{t,t,1},{return,5,{match_context,{x,0}}}}] =
-		do_val(bad_bin_match, Config),
-	ok.
+    [{{t,t,1},{return,5,{match_context,{x,0}}}}] =
+	do_val(bad_bin_match, Config),
+    ok.
 
 bad_dsetel(Config) when is_list(Config) ->
     Errors = do_val(bad_dsetel, Config),
-    ?line
-	[{{t,t,1},
-	  {{set_tuple_element,{x,1},{x,0},1},
-	   17,
-	   illegal_context_for_set_tuple_element}}] = Errors,
+    [{{t,t,1},
+      {{set_tuple_element,{x,1},{x,0},1},
+       17,
+       illegal_context_for_set_tuple_element}}] = Errors,
     ok.
 
 state_after_fault_in_catch(Config) when is_list(Config) ->
@@ -324,7 +312,7 @@ state_after_fault_in_catch(Config) when is_list(Config) ->
 no_exception_in_catch(Config) when is_list(Config) ->
     Errors = do_val(no_exception_in_catch, Config),
     [{{no_exception_in_catch,nested_of_1,4},
-      {{move,{x,3},{x,0}},88,{uninitialized_reg,{x,3}}}}] = Errors,
+      {{move,{x,3},{x,0}},87,{uninitialized_reg,{x,3}}}}] = Errors,
     ok.
 
 undef_label(Config) when is_list(Config) ->
@@ -382,9 +370,9 @@ illegal_instruction(Config) when is_list(Config) ->
 %% (Thanks to Kiran Khaladkar.)
 %%
 failing_gc_guard_bif(Config) when is_list(Config) ->
-    ?line ok = process_request(lists:seq(1, 36)),
-    ?line error = process_request([]),
-    ?line error = process_request(not_a_list),
+    ok = process_request(lists:seq(1, 36)),
+    error = process_request([]),
+    error = process_request(not_a_list),
     ok.
 
 process_request(ConfId) ->
@@ -421,7 +409,7 @@ map_field_lists(Config) ->
 %%%-------------------------------------------------------------------------
 
 do_val(Mod, Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     Base = atom_to_list(Mod),
     File = filename:join(Data, Base),
     case compile:file(File, [from_asm,no_postopt,return_errors]) of
diff --git a/lib/compiler/test/beam_validator_SUITE_data/xrange.S b/lib/compiler/test/beam_validator_SUITE_data/xrange.S
index c6f20288f7..a76408dde3 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/xrange.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/xrange.S
@@ -20,7 +20,7 @@
   {label,3}.
     {func_info,{atom,t},{atom,sum_2},2}.
   {label,4}.
-    {bif,'+',{f,0},[{x,0},{x,1024}],{x,0}}.
+    {bif,'+',{f,0},[{x,0},{x,1023}],{x,0}}.
     {'%live',1}.
     return.
 
@@ -38,7 +38,7 @@
   {label,7}.
     {func_info,{atom,t},{atom,sum_4},2}.
   {label,8}.
-    {bif,'+',{f,0},[{x,0},{x,1}],{x,1024}}.
+    {bif,'+',{f,0},[{x,0},{x,1}],{x,1023}}.
     {'%live',1}.
     return.
 
diff --git a/lib/compiler/test/bs_bincomp_SUITE.erl b/lib/compiler/test/bs_bincomp_SUITE.erl
index 1bf4e9d4a7..5e5f6e2169 100644
--- a/lib/compiler/test/bs_bincomp_SUITE.erl
+++ b/lib/compiler/test/bs_bincomp_SUITE.erl
@@ -26,9 +26,9 @@
 	 init_per_group/2,end_per_group/2,
 	 byte_aligned/1,bit_aligned/1,extended_byte_aligned/1,
 	 extended_bit_aligned/1,mixed/1,filters/1,trim_coverage/1,
-	 nomatch/1,sizes/1]).
+	 nomatch/1,sizes/1,general_expressions/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -36,7 +36,7 @@ all() ->
     test_lib:recompile(?MODULE),
     [byte_aligned, bit_aligned, extended_byte_aligned,
      extended_bit_aligned, mixed, filters, trim_coverage,
-     nomatch, sizes].
+     nomatch, sizes, general_expressions].
 
 groups() -> 
     [].
@@ -55,110 +55,114 @@ end_per_group(_GroupName, Config) ->
 
 byte_aligned(Config) when is_list(Config) ->
     cs_init(),
-    ?line <<"abcdefg">> = cs(<< <<(X+32)>> || <<X>> <= <<"ABCDEFG">> >>),
+    <<"abcdefg">> = cs(<< <<(X+32)>> || <<X>> <= <<"ABCDEFG">> >>),
     <<1:32/little,2:32/little,3:32/little,4:32/little>> =
 	cs(<< <<X:32/little>> || <<X:32>> <= <<1:32,2:32,3:32,4:32>> >>),
-    ?line cs(<<1:32/little,2:32/little,3:32/little,4:32/little>> =
-	     << <<X:32/little>> || <<X:16>> <= <<1:16,2:16,3:16,4:16>> >>),
+    cs(<<1:32/little,2:32/little,3:32/little,4:32/little>> =
+	   << <<X:32/little>> || <<X:16>> <= <<1:16,2:16,3:16,4:16>> >>),
     cs_end().
 
 bit_aligned(Config) when is_list(Config) ->
     cs_init(),
-    ?line <<$a:7,$b:7,$c:7,$d:7,$e:7,$f:7,$g:7>> = 
+    <<$a:7,$b:7,$c:7,$d:7,$e:7,$f:7,$g:7>> =
 	cs(<< <<(X+32):7>> || <<X>> <= <<"ABCDEFG">> >>),
-    ?line <<"ABCDEFG">> = 
+    <<"ABCDEFG">> =
 	cs(<< <<(X-32)>> || <<X:7>> <= <<$a:7,$b:7,$c:7,$d:7,$e:7,$f:7,$g:7>> >>),
-    ?line <<1:31/little,2:31/little,3:31/little,4:31/little>> =
+    <<1:31/little,2:31/little,3:31/little,4:31/little>> =
 	cs(<< <<X:31/little>> || <<X:31>> <= <<1:31,2:31,3:31,4:31>> >>),
-    ?line <<1:31/little,2:31/little,3:31/little,4:31/little>> =
+    <<1:31/little,2:31/little,3:31/little,4:31/little>> =
 	cs(<< <<X:31/little>> || <<X:15>> <= <<1:15,2:15,3:15,4:15>> >>),
     cs_end().
 
 extended_byte_aligned(Config) when is_list(Config) ->
     cs_init(),
-    ?line <<"abcdefg">> = cs(<< <<(X+32)>> || X <- "ABCDEFG" >>),
-    ?line "abcdefg" = [(X+32) || <<X>> <= <<"ABCDEFG">>],
-    ?line <<1:32/little,2:32/little,3:32/little,4:32/little>> =
+    <<"abcdefg">> = cs(<< <<(X+32)>> || X <- "ABCDEFG" >>),
+    "abcdefg" = [(X+32) || <<X>> <= <<"ABCDEFG">>],
+    <<1:32/little,2:32/little,3:32/little,4:32/little>> =
 	cs(<< <<X:32/little>> || X <- [1,2,3,4] >>),
-    ?line [256,512,768,1024] =
+    [256,512,768,1024] =
 	[X || <<X:16/little>> <= <<1:16,2:16,3:16,4:16>>],
     cs_end().
 
 extended_bit_aligned(Config) when is_list(Config) ->
     cs_init(),
-    ?line <<$a:7,$b:7,$c:7,$d:7,$e:7,$f:7,$g:7>> = 
+    <<$a:7,$b:7,$c:7,$d:7,$e:7,$f:7,$g:7>> =
 	cs(<< <<(X+32):7>> || X <- "ABCDEFG" >>),
-    ?line "ABCDEFG" = [(X-32) || <<X:7>> <= <<$a:7,$b:7,$c:7,$d:7,$e:7,$f:7,$g:7>>],
-    ?line <<1:31/little,2:31/little,3:31/little,4:31/little>> =
+    "ABCDEFG" = [(X-32) || <<X:7>> <= <<$a:7,$b:7,$c:7,$d:7,$e:7,$f:7,$g:7>>],
+    <<1:31/little,2:31/little,3:31/little,4:31/little>> =
 	cs(<< <<X:31/little>> || X <- [1,2,3,4] >>),
-    ?line [256,512,768,1024] =
+    [256,512,768,1024] =
 	[X || <<X:15/little>> <= <<1:15,2:15,3:15,4:15>>],
     cs_end().
 
 mixed(Config) when is_list(Config) ->
     cs_init(),
-    ?line <<2,3,3,4,4,5,5,6>> =  
+    <<2,3,3,4,4,5,5,6>> =
 	cs(<< <<(X+Y)>> || <<X>> <= <<1,2,3,4>>, <<Y>> <= <<1,2>> >>),
-    ?line <<2,3,3,4,4,5,5,6>> =  
+    <<2,3,3,4,4,5,5,6>> =
 	<< <<(X+Y)>> || <<X>> <= <<1,2,3,4>>, Y <- [1,2] >>,
-    ?line <<2,3,3,4,4,5,5,6>> =  
+    <<2,3,3,4,4,5,5,6>> =
 	cs(<< <<(X+Y)>> || X <- [1,2,3,4], Y <- [1,2] >>),
     One = id([1,2,3,4]),
     Two = id([1,2]),
-    ?line <<2,3,3,4,4,5,5,6>> =  
+    <<2,3,3,4,4,5,5,6>> =
 	cs(<< <<(X+Y)>> || X <- One, Y <- Two >>),
-    ?line [2,3,3,4,4,5,5,6] =  
+    [2,3,3,4,4,5,5,6] =
 	[(X+Y) || <<X>> <= <<1,2,3,4>>, <<Y>> <= <<1,2>>],
-    ?line [2,3,3,4,4,5,5,6] =  
+    [2,3,3,4,4,5,5,6] =
 	[(X+Y) || <<X>> <= <<1,2,3,4>>, Y <- [1,2]],
-    ?line <<2:3,3:3,3:3,4:3,4:3,5:3,5:3,6:3>> =  
+    <<2:3,3:3,3:3,4:3,4:3,5:3,5:3,6:3>> =
 	cs(<< <<(X+Y):3>> || <<X:3>> <= <<1:3,2:3,3:3,4:3>>,
 			     <<Y:3>> <= <<1:3,2:3>> >>),
-    ?line <<2:3,3:3,3:3,4:3,4:3,5:3,5:3,6:3>> =  
+    <<2:3,3:3,3:3,4:3,4:3,5:3,5:3,6:3>> =
 	cs(<< <<(X+Y):3>> || <<X:3>> <= <<1:3,2:3,3:3,4:3>>, Y <- [1,2] >>),
-    ?line <<2:3,3:3,3:3,4:3,4:3,5:3,5:3,6:3>> =  
+    <<2:3,3:3,3:3,4:3,4:3,5:3,5:3,6:3>> =
 	cs(<< <<(X+Y):3>> || X <- [1,2,3,4], Y <- [1,2] >>),
-    ?line <<2:3,3:3,3:3,4:3,4:3,5:3,5:3,6:3>> =  
+    <<2:3,3:3,3:3,4:3,4:3,5:3,5:3,6:3>> =
 	cs_default(<< <<(X+Y):3>> || {X,Y} <- [{1,1},{1,2},{2,1},{2,2},
 					       {3,1},{3,2},{4,1},{4,2}] >>),
-    ?line [2,3,3,4,4,5,5,6] =  
+    [2,3,3,4,4,5,5,6] =
 	[(X+Y) || <<X:3>> <= <<1:3,2:3,3:3,4:3>>, <<Y:3>> <= <<1:3,2:3>>],
-    ?line [2,3,3,4,4,5,5,6] =  
+    [2,3,3,4,4,5,5,6] =
 	[(X+Y) || <<X:3>> <= <<1:3,2:3,3:3,4:3>>, {_,Y} <- [{a,1},{b,2}]],
     cs_end().
 
 filters(Config) when is_list(Config) ->
     cs_init(),
-    ?line <<"BDF">> = 
-	cs_default(<< <<(X-32)>> || <<X:7>> <= <<$a:7,$b:7,$c:7,$d:7,$e:7,$f:7,$g:7>>,
-				    X rem 2 == 0>>),
-    ?line <<"abc">> = cs_default(<< <<(X+32)>> || X <- "ABCDEFG",
-						  is_less_than(X, $D)>>),
-    ?line <<"efg">> = cs_default(<< <<(X+32)>> || X <- "ABCDEFG",
-						  not is_less_than(X, $E)>>),
-    ?line <<"b">> = cs_default(<< <<(X+32)>> || X <- "ABCDEFG",
-						is_less_than(X, $D),
-						X rem 2 == 0>>),
-    ?line <<"eg">> = cs_default(<< <<(X+32)>> || X <- "ABCDEFG",
-						 not is_less_than(X, $E),
-						 X rem 2 == 1>>),
+    <<"BDF">> =
+	cs_default(<< <<(X-32)>> ||
+		       <<X:7>> <= <<$a:7,$b:7,$c:7,$d:7,$e:7,$f:7,$g:7>>,
+		       X rem 2 == 0>>),
+    <<"abc">> = cs_default(<< <<(X+32)>> ||
+			       X <- "ABCDEFG",
+			       is_less_than(X, $D)>>),
+    <<"efg">> = cs_default(<< <<(X+32)>> ||
+			       X <- "ABCDEFG",
+			       not is_less_than(X, $E)>>),
+    <<"b">> = cs_default(<< <<(X+32)>> ||
+			     X <- "ABCDEFG",
+			     is_less_than(X, $D),
+			     X rem 2 == 0>>),
+    <<"eg">> = cs_default(<< <<(X+32)>> ||
+			      X <- "ABCDEFG",
+			      not is_less_than(X, $E),
+			      X rem 2 == 1>>),
 
     %% Filtering by a non-matching pattern.
-    ?line <<"abd">> = cs_default(<< <<X:8>> ||
-				     <<0:1,X:7>> <= <<$a:8,$b:8,1:1,$c:7,$d:8,
-						     1:1,$e:7,0:4>> >>),
+    <<"abd">> = cs_default(<< <<X:8>> ||
+			       <<0:1,X:7>> <= <<$a:8,$b:8,1:1,$c:7,$d:8,
+						1:1,$e:7,0:4>> >>),
 
-    ?line <<42,42>> = cs_default(<< <<42:8>> ||
-				     42 <- [1,2,3,42,43,42] >>),
+    <<42,42>> = cs_default(<< <<42:8>> || 42 <- [1,2,3,42,43,42] >>),
     cs_end().
 
 is_less_than(X, C) when X < C -> true;
 is_less_than(_, _) -> false.
 
 trim_coverage(Config) when is_list(Config) ->
-    ?line <<0,0,0,2,0,0,5,48,0,11,219,174,0,0,0,0>> = coverage_materialiv(a, b, {1328,777134}),
-    ?line <<67,40,0,0,66,152,0,0,69,66,64,0>> = coverage_trimmer([42,19,777]),
-    ?line <<0,0,2,43,0,0,3,9,0,0,0,3,64,8,0,0,0,0,0,0,
+    <<0,0,0,2,0,0,5,48,0,11,219,174,0,0,0,0>> = coverage_materialiv(a, b, {1328,777134}),
+    <<67,40,0,0,66,152,0,0,69,66,64,0>> = coverage_trimmer([42,19,777]),
+    <<0,0,2,43,0,0,3,9,0,0,0,3,64,8,0,0,0,0,0,0,
 	   64,68,0,0,0,0,0,0,192,171,198,0,0,0,0,0>> = 
 	coverage_lightfv(555, 777, {3.0,40.0,-3555.0}),
     ok.
@@ -186,111 +190,153 @@ coverage_trimmer(Params) ->
 coverage_summer(A, B, C, D) -> A+B+C+D.
 
 nomatch(Config) when is_list(Config) ->
-    ?line <<>> = << <<X:8>> || X = {_,_} = [_|_] <- [1,2,3] >>,
+    <<>> = << <<X:8>> || X = {_,_} = [_|_] <- [1,2,3] >>,
     ok.
 
 sizes(Config) when is_list(Config) ->
-    ?line cs_init(),
+    cs_init(),
     Fun0 = fun(List) ->
 		   cs(<< <<E:8>> || E <- List >>)
 	   end,
-    ?line <<>> = Fun0([]),
-    ?line <<1>> = Fun0([1]),
-    ?line <<1,2>> = Fun0([1,2]),
-    ?line <<1,2,3>> = Fun0([1,2,3]),
+    <<>> = Fun0([]),
+    <<1>> = Fun0([1]),
+    <<1,2>> = Fun0([1,2]),
+    <<1,2,3>> = Fun0([1,2,3]),
 
     Fun1 = fun(List) ->
 		   cs(<< <<E:16>> || E <- List >>)
 	   end,
-    ?line <<>> = Fun1([]),
-    ?line <<1:16>> = Fun1([1]),
-    ?line <<1:16,2:16>> = Fun1([1,2]),
-    ?line <<1:16,2:16,3:16>> = Fun1([1,2,3]),
+    <<>> = Fun1([]),
+    <<1:16>> = Fun1([1]),
+    <<1:16,2:16>> = Fun1([1,2]),
+    <<1:16,2:16,3:16>> = Fun1([1,2,3]),
 
     Fun2 = fun(List) ->
 		   cs(<< <<E:4>> || E <- List >>)
 	   end,
-    ?line <<>> = Fun2([]),
-    ?line <<1:4>> = Fun2([1]),
-    ?line <<1:4,13:4>> = Fun2([1,13]),
-    ?line <<1:4,13:4,7:4>> = Fun2([1,13,7]),
-    ?line <<0:1000/unit:8>> = Fun2(lists:duplicate(2000, 0)),
+    <<>> = Fun2([]),
+    <<1:4>> = Fun2([1]),
+    <<1:4,13:4>> = Fun2([1,13]),
+    <<1:4,13:4,7:4>> = Fun2([1,13,7]),
+    <<0:1000/unit:8>> = Fun2(lists:duplicate(2000, 0)),
 
     Fun3 = fun(List) ->
 		   cs(<< <<E:3>> || E <- List >>)
 	   end,
-    ?line <<>> = Fun3([]),
-    ?line <<40,177,29:5>> = Fun3([1,2,1,3,0,7,5]),
-    ?line <<0:512/unit:3>> = Fun3(lists:duplicate(512, 0)),
+    <<>> = Fun3([]),
+    <<40,177,29:5>> = Fun3([1,2,1,3,0,7,5]),
+    <<0:512/unit:3>> = Fun3(lists:duplicate(512, 0)),
 
     Fun4 = fun(List, Size) ->
 		   cs(<< <<E:Size>> || E <- List >>)
 	   end,
-    ?line <<>> = Fun4([], 8),
-    ?line <<42:6>> = Fun4([42], 6),
-    ?line <<42:16>> = Fun4([42], 16),
+    <<>> = Fun4([], 8),
+    <<42:6>> = Fun4([42], 6),
+    <<42:16>> = Fun4([42], 16),
 
     Fun5 = fun(List, Sz1, Sz2, Sz3) ->
 		   cs(<< <<E:Sz1,(E+1):Sz2/unit:8,(E+2):Sz3/unit:8>> || E <- List >>)
 	   end,
-    ?line <<>> = Fun5([], 1, 1, 1),
-    ?line <<7:3,8:40,9:56>> = Fun5([7], 3, 5, 7),
+    <<>> = Fun5([], 1, 1, 1),
+    <<7:3,8:40,9:56>> = Fun5([7], 3, 5, 7),
 
     Fun6 = fun(List, Size) ->
 		   cs(<< <<E:8,(E+1):Size>> || E <- List >>)
 	   end,
-    ?line <<>> = Fun6([], 42),
-    ?line <<42,43:20>> = Fun6([42], 20),
+    <<>> = Fun6([], 42),
+    <<42,43:20>> = Fun6([42], 20),
 
     %% Binary generators.
 
     Fun10 = fun(Bin) ->
 		    cs(<< <<E:16>> || <<E:8>> <= Bin >>)
             end,
-    ?line <<>> = Fun10(<<>>),
-    ?line <<1:16>> = Fun10(<<1>>),
-    ?line <<1:16,2:16>> = Fun10(<<1,2>>),
+    <<>> = Fun10(<<>>),
+    <<1:16>> = Fun10(<<1>>),
+    <<1:16,2:16>> = Fun10(<<1,2>>),
 
     Fun11 = fun(Bin) ->
 		    cs(<< <<E:8>> || <<E:16>> <= Bin >>)
             end,
-    ?line <<>> = Fun11(<<>>),
-    ?line <<1>> = Fun11(<<1:16>>),
-    ?line <<1,2>> = Fun11(<<1:16,2:16>>),
-    ?line <<1,2>> = Fun11(<<1:16,2:16,0:1>>),
-    ?line <<1,2>> = Fun11(<<1:16,2:16,0:7>>),
-    ?line <<1,2>> = Fun11(<<1:16,2:16,42:8>>),
-    ?line <<1,2>> = Fun11(<<1:16,2:16,42:9>>),
-    ?line <<1,2>> = Fun11(<<1:16,2:16,255:15>>),
+    <<>> = Fun11(<<>>),
+    <<1>> = Fun11(<<1:16>>),
+    <<1,2>> = Fun11(<<1:16,2:16>>),
+    <<1,2>> = Fun11(<<1:16,2:16,0:1>>),
+    <<1,2>> = Fun11(<<1:16,2:16,0:7>>),
+    <<1,2>> = Fun11(<<1:16,2:16,42:8>>),
+    <<1,2>> = Fun11(<<1:16,2:16,42:9>>),
+    <<1,2>> = Fun11(<<1:16,2:16,255:15>>),
 
     Fun12 = fun(Bin, Sz1, Sz2) ->
 		    cs(<< <<E:Sz1>> || <<E:Sz2>> <= Bin >>)
 	    end,
-    ?line <<>> = Fun12(<<>>, 1, 1),
-    ?line Binary = list_to_binary(lists:seq(0, 255)),
-    ?line Binary = Fun12(Binary, 1, 1),
-    ?line Binary = Fun12(Binary, 4, 4),
-    ?line Binary = Fun12(Binary, 8, 8),
-    ?line <<17:9,19:9>> = Fun12(<<17:6,19:6>>, 9, 6),
+    <<>> = Fun12(<<>>, 1, 1),
+    Binary = list_to_binary(lists:seq(0, 255)),
+    Binary = Fun12(Binary, 1, 1),
+    Binary = Fun12(Binary, 4, 4),
+    Binary = Fun12(Binary, 8, 8),
+    <<17:9,19:9>> = Fun12(<<17:6,19:6>>, 9, 6),
 
     Fun13 = fun(Sz) ->
 		    cs_default(<< <<C:8>> || <<C:4>> <= <<1:4,2:4,3:4,0:Sz>> >>)
    	    end,
-    ?line <<1,2,3>> = Fun13(0),
-    ?line <<1,2,3,0>> = Fun13(4),
-    ?line <<1,2,3,0>> = Fun13(5),
-    ?line <<1,2,3,0>> = Fun13(6),
-    ?line <<1,2,3,0>> = Fun13(7),
-    ?line <<1,2,3,0,0>> = Fun13(8),
+    <<1,2,3>> = Fun13(0),
+    <<1,2,3,0>> = Fun13(4),
+    <<1,2,3,0>> = Fun13(5),
+    <<1,2,3,0>> = Fun13(6),
+    <<1,2,3,0>> = Fun13(7),
+    <<1,2,3,0,0>> = Fun13(8),
 
     <<0:3>> = cs_default(<< <<0:S>> || S <- [0,1,2] >>),
     <<0:3>> = cs_default(<< <<0:S>> || <<S>> <= <<0,1,2>> >>),
 
-    ?line {'EXIT',_} = (catch << <<C:4>> || <<C:8>> <= {1,2,3} >>),
+    {'EXIT',_} = (catch << <<C:4>> || <<C:8>> <= {1,2,3} >>),
+
+    cs_end(),
+    ok.
+
+-define(BAD(E),   {'EXIT',{badarg,_}} = (catch << (E) || _ <- [1,2,3] >>)).
+-define(BAD_V(E), {'EXIT',{badarg,_}} = (catch << (E) || I <- [1,2,3] >>)).
+
+general_expressions(_) ->
+    <<1,2,3>> = << begin <<1,2,3>> end || _ <- [1] >>,
+    <<"abc">> = << begin <<"abc">> end || _ <- [1] >>,
+    <<1,2,3>> = << begin
+		       I = <<(I0+1)>>,
+		       id(I)
+		   end || <<I0>> <= <<0,1,2>> >>,
+    <<1,2,3>> = << I || I <- [<<1,2>>,<<3>>] >>,
+    <<1,2,3>> = << (id(<<I>>)) || I <- [1,2,3] >>,
+    <<2,4>> = << case I rem 2 of
+		     0 -> <<I>>;
+		     1 -> <<>>
+		 end || I <- [1,2,3,4,5] >>,
+    <<2,3,4,5,6,7>> = << << (id(<<J>>)) || J <- [2*I,2*I+1] >> ||
+			  I <- [1,2,3] >>,
+    <<1,2,2,3,4,4>> = << if
+			     I rem 2 =:= 0 -> <<I,I>>;
+			     true -> <<I>>
+			 end || I <- [1,2,3,4] >>,
+    self() ! <<42>>,
+    <<42>> = << receive B -> B end || _ <- [1] >>,
+    <<10,5,3>> = << try
+			<<(10 div I)>>
+		    catch _:_ ->
+			    <<>>
+		    end || I <- [0,1,2,3] >>,
+
+    %% Failing expressions.
+    ?BAD(bad_atom),
+    ?BAD(42),
+    ?BAD(42.0),
+    ?BAD_V({ok,I}),
+    ?BAD_V([I]),
+    ?BAD_V(fun() -> I end),
 
-    ?line cs_end(),
     ok.
 
+-undef(BAD).
+
 cs_init() ->
     erts_debug:set_internal_state(available_internal_state, true),
     ok.
diff --git a/lib/compiler/test/bs_bit_binaries_SUITE.erl b/lib/compiler/test/bs_bit_binaries_SUITE.erl
index afee52c9b9..c1f8f12bf1 100644
--- a/lib/compiler/test/bs_bit_binaries_SUITE.erl
+++ b/lib/compiler/test/bs_bit_binaries_SUITE.erl
@@ -29,7 +29,7 @@
 	 big_binary_to_and_from_list/1,send_and_receive/1,
 	 send_and_receive_alot/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -59,9 +59,9 @@ end_per_group(_GroupName, Config) ->
 
 
 misc(Config) when is_list(Config) ->
-    ?line <<1:100>> = <<1:100>>,
-    ?line {ok,ok} = {match(7),match(9)},
-    ?line {ok,ok} = {match1(15),match1(31)},
+    <<1:100>> = <<1:100>>,
+    {ok,ok} = {match(7),match(9)},
+    {ok,ok} = {match1(15),match1(31)},
     ok.
 
 
@@ -74,75 +74,75 @@ match1(N) ->
   ok.
 
 test_bit_size(Config) when is_list(Config) ->
-    ?line 101 = erlang:bit_size(<<1:101>>),
-    ?line 1001 = erlang:bit_size(<<1:1001>>),
-    ?line 1001 = erlang:bit_size(<<-10:1001>>),
-    ?line 80 = erlang:bit_size(<<1:80>>),
-    ?line 800 = erlang:bit_size(<<1:800>>),
-    ?line Bin = <<0:16#1000000>>,
-    ?line BigBin = list_to_bitstring([Bin||_ <- lists:seq(1,16#10)]++[<<1:1>>]),
-    ?line 16#10000001 = erlang:bit_size(BigBin),
+    101 = erlang:bit_size(<<1:101>>),
+    1001 = erlang:bit_size(<<1:1001>>),
+    1001 = erlang:bit_size(<<-10:1001>>),
+    80 = erlang:bit_size(<<1:80>>),
+    800 = erlang:bit_size(<<1:800>>),
+    Bin = <<0:16#1000000>>,
+    BigBin = list_to_bitstring([Bin||_ <- lists:seq(1,16#10)]++[<<1:1>>]),
+    16#10000001 = erlang:bit_size(BigBin),
     %% Only run these on computers with lots of memory
     %% HugeBin = list_to_bitstring([BigBin||_ <- lists:seq(1,16#10)]++[<<1:1>>]),
     %% 16#100000011 = erlang:bit_size(HugeBin), 
-    ?line 0 = erlang:bit_size(<<>>),
+    0 = erlang:bit_size(<<>>),
     ok.
 
 horrid_match(Config) when is_list(Config) ->
-    ?line <<1:4,B:24/bitstring>> = <<1:4,42:24/little>>,
-    ?line <<42:24/little>> = B, 
+    <<1:4,B:24/bitstring>> = <<1:4,42:24/little>>,
+    <<42:24/little>> = B,
     ok.
 			 
 test_bitstr(Config) when is_list(Config) ->
-    ?line <<1:7,B/bitstring>> = <<1:7,<<1:1,6>>/bitstring>>,
-    ?line <<1:1,6>> = B,
-    ?line B = <<1:1,6>>,
+    <<1:7,B/bitstring>> = <<1:7,<<1:1,6>>/bitstring>>,
+    <<1:1,6>> = B,
+    B = <<1:1,6>>,
   ok.
 		      
 asymmetric_tests(Config) when is_list(Config) ->
-    ?line <<1:12>> = <<0,1:4>>,
-    ?line <<0,1:4>> = <<1:12>>,
-    ?line <<1:1,X/bitstring>> = <<128,255,0,0:2>>,
-    ?line <<1,254,0,0:1>> = X,
-    ?line X = <<1,254,0,0:1>>,
-    ?line <<1:1,X1:25/bitstring>> = <<128,255,0,0:2>>,
-    ?line <<1,254,0,0:1>> = X1,
-    ?line X1 = <<1,254,0,0:1>>,
+    <<1:12>> = <<0,1:4>>,
+    <<0,1:4>> = <<1:12>>,
+    <<1:1,X/bitstring>> = <<128,255,0,0:2>>,
+    <<1,254,0,0:1>> = X,
+    X = <<1,254,0,0:1>>,
+    <<1:1,X1:25/bitstring>> = <<128,255,0,0:2>>,
+    <<1,254,0,0:1>> = X1,
+    X1 = <<1,254,0,0:1>>,
     ok.
 
 big_asymmetric_tests(Config) when is_list(Config) ->
-    ?line <<1:875,1:12>> = <<1:875,0,1:4>>,
-    ?line <<1:875,0,1:4>> = <<1:875,1:12>>,
-    ?line <<1:1,X/bitstring>> = <<128,255,0,0:2,1:875>>,
-    ?line <<1,254,0,0:1,1:875>> = X,
-    ?line X = <<1,254,0,0:1,1:875>>,
-    ?line <<1:1,X1:900/bitstring>> = <<128,255,0,0:2,1:875>>,
-    ?line <<1,254,0,0:1,1:875>> = X1,
-    ?line X1 = <<1,254,0,0:1,1:875>>,
+    <<1:875,1:12>> = <<1:875,0,1:4>>,
+    <<1:875,0,1:4>> = <<1:875,1:12>>,
+    <<1:1,X/bitstring>> = <<128,255,0,0:2,1:875>>,
+    <<1,254,0,0:1,1:875>> = X,
+    X = <<1,254,0,0:1,1:875>>,
+    <<1:1,X1:900/bitstring>> = <<128,255,0,0:2,1:875>>,
+    <<1,254,0,0:1,1:875>> = X1,
+    X1 = <<1,254,0,0:1,1:875>>,
   ok.
 
 binary_to_and_from_list(Config) when is_list(Config) ->
-    ?line <<1,2,3,4,1:1>> = list_to_bitstring(bitstring_to_list(<<1,2,3,4,1:1>>)),
-    ?line [1,2,3,4,<<1:1>>] = bitstring_to_list(<<1,2,3,4,1:1>>),
-    ?line <<1:1,1,2,3,4>> = list_to_bitstring([<<1:1>>,1,2,3,4]),
-    ?line [128,129,1,130,<<0:1>>] = bitstring_to_list(<<1:1,1,2,3,4>>),
+    <<1,2,3,4,1:1>> = list_to_bitstring(bitstring_to_list(<<1,2,3,4,1:1>>)),
+    [1,2,3,4,<<1:1>>] = bitstring_to_list(<<1,2,3,4,1:1>>),
+    <<1:1,1,2,3,4>> = list_to_bitstring([<<1:1>>,1,2,3,4]),
+    [128,129,1,130,<<0:1>>] = bitstring_to_list(<<1:1,1,2,3,4>>),
     ok.
  
 big_binary_to_and_from_list(Config) when is_list(Config) ->
-    ?line <<1:800,2,3,4,1:1>> =
+    <<1:800,2,3,4,1:1>> =
 	list_to_bitstring(bitstring_to_list(<<1:800,2,3,4,1:1>>)),
-    ?line [1,2,3,4|_Rest1] = bitstring_to_list(<<1,2,3,4,1:800,1:1>>),
-    ?line <<1:801,1,2,3,4>> = list_to_bitstring([<<1:801>>,1,2,3,4]),
+    [1,2,3,4|_Rest1] = bitstring_to_list(<<1,2,3,4,1:800,1:1>>),
+    <<1:801,1,2,3,4>> = list_to_bitstring([<<1:801>>,1,2,3,4]),
     ok.  
 
 send_and_receive(Config) when is_list(Config) -> 
-    ?line Bin = <<1,2:7>>,
+    Bin = <<1,2:7>>,
     Pid = spawn_link(fun() -> receiver(Bin) end),
-    ?line Pid ! {self(),<<1:7,8:5,Bin/bitstring>>},
-    ?line receive
-	      ok ->
-		  ok
-	  end.
+    Pid ! {self(),<<1:7,8:5,Bin/bitstring>>},
+    receive
+	ok ->
+	    ok
+    end.
 
 receiver(Bin) ->	 
     receive
diff --git a/lib/compiler/test/bs_construct_SUITE.erl b/lib/compiler/test/bs_construct_SUITE.erl
index 87cfaaf73c..d94e870e21 100644
--- a/lib/compiler/test/bs_construct_SUITE.erl
+++ b/lib/compiler/test/bs_construct_SUITE.erl
@@ -31,9 +31,11 @@
 	 nasty_literals/1,coerce_to_float/1,side_effect/1,
 	 opt/1,otp_7556/1,float_arith/1,otp_8054/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     test_lib:recompile(?MODULE),
@@ -60,12 +62,9 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog = test_server:timetrap(?t:minutes(1)),
-    [{watchdog,Dog}|Config].
+    Config.
 
 end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
     ok.
 
 two(Config) when is_list(Config) ->
@@ -86,7 +85,7 @@ id(I) -> I.
 -define(T(B, L), {B, ??B, L}).
 -define(N(B), {B, ??B, unknown}).
 
--define(FAIL(Expr), ?line {'EXIT',{badarg,_}} = (catch Expr)).
+-define(FAIL(Expr), {'EXIT',{badarg,_}} = (catch Expr)).
 
 l(I_13, I_big1, I_16, Bin) ->
     [
@@ -200,7 +199,7 @@ one_test({C_bin, E_bin, Str, Bytes}) when is_list(Bytes) ->
 	true ->
 	    io:format("ERROR: Compiled: ~p. Expected ~p. Got ~p.~n",
 		      [Str, Bytes, bitstring_to_list(C_bin)]),
-	    test_server:fail(comp)
+	    ct:fail(comp)
     end,
     if
 	E_bin == Bin ->
@@ -208,7 +207,7 @@ one_test({C_bin, E_bin, Str, Bytes}) when is_list(Bytes) ->
 	true ->
 	    io:format("ERROR: Interpreted: ~p. Expected ~p. Got ~p.~n",
 		      [Str, Bytes, bitstring_to_list(E_bin)]),
-	    test_server:fail(comp)
+	    ct:fail(comp)
     end;
 one_test({C_bin, E_bin, Str, Result}) ->
     io:format("  ~s ~p~n", [Str, C_bin]),
@@ -229,7 +228,7 @@ one_test({C_bin, E_bin, Str, Result}) ->
 		    io:format("ERROR: Compiled not equal to interpreted:"
 			      "~n ~p, ~p.~n",
 			      [bitstring_to_list(C_bin), bitstring_to_list(E_bin)]),
-		    test_server:fail(comp);
+		    ct:fail(comp);
 		0 ->
 		    ok;
 		%% For situations where the final bits may not matter, like
@@ -261,15 +260,15 @@ equal_lists(A, B, R) ->
     end.
 
 test1(Config) when is_list(Config) ->
-    ?line I_13 = i(13),
-    ?line I_big1 = big(1),
-    ?line I_16 = i(16),
-    ?line Bin = i(<<16#A5,16#5A,16#C3>>),
-    ?line Vars = lists:sort([{'I_13',I_13},
-			     {'I_big1',I_big1},
-			     {'I_16',I_16},
-			     {'Bin',Bin}]),
-    ?line lists:foreach(fun one_test/1, eval_list(l(I_13, I_big1, I_16, Bin), Vars)).
+    I_13 = i(13),
+    I_big1 = big(1),
+    I_16 = i(16),
+    Bin = i(<<16#A5,16#5A,16#C3>>),
+    Vars = lists:sort([{'I_13',I_13},
+		       {'I_big1',I_big1},
+		       {'I_16',I_16},
+		       {'Bin',Bin}]),
+    lists:foreach(fun one_test/1, eval_list(l(I_13, I_big1, I_16, Bin), Vars)).
 
 fail(Config) when is_list(Config) ->
     I_minus_777 = i(-777),
@@ -278,68 +277,68 @@ fail(Config) when is_list(Config) ->
     %% One negative field size, but the sum of field sizes will be 1 byte.
     %% Make sure that we reject that properly.
 
-    ?line {'EXIT',{badarg,_}} = (catch <<I_minus_777:2048/unit:8,
-					57:I_minus_2047/unit:8>>),
+    {'EXIT',{badarg,_}} = (catch <<I_minus_777:2048/unit:8,
+				   57:I_minus_2047/unit:8>>),
 
     %% Same thing, but use literals.
-    ?line {'EXIT',{badarg,_}} = (catch <<I_minus_777:2048/unit:8,
-					57:(-2047)/unit:8>>),
+    {'EXIT',{badarg,_}} = (catch <<I_minus_777:2048/unit:8,
+				   57:(-2047)/unit:8>>),
 
     %% Not numbers.
-    ?line {'EXIT',{badarg,_}} = (catch <<45:(i(not_a_number))>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<13:8,45:(i(not_a_number))>>),
+    {'EXIT',{badarg,_}} = (catch <<45:(i(not_a_number))>>),
+    {'EXIT',{badarg,_}} = (catch <<13:8,45:(i(not_a_number))>>),
 
     %% Unaligned sizes.
     BadSz = i(7),
     Bitstr = i(<<42:17>>),
 
-    ?line {'EXIT',{badarg,_}} = (catch <<Bitstr:4/binary>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<Bitstr:BadSz/binary>>),
+    {'EXIT',{badarg,_}} = (catch <<Bitstr:4/binary>>),
+    {'EXIT',{badarg,_}} = (catch <<Bitstr:BadSz/binary>>),
 
-    ?line [] = [X || {X} <- [], X == <<Bitstr:BadSz/binary>>],
-    ?line [] = [X || {X} <- [], X == <<Bitstr:4/binary>>],
+    [] = [X || {X} <- [], X == <<Bitstr:BadSz/binary>>],
+    [] = [X || {X} <- [], X == <<Bitstr:4/binary>>],
 
     %% Literals with incorrect type.
-    ?line {'EXIT',{badarg,_}} = (catch <<42.0/integer>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<42/binary>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<an_atom/integer>>),
+    {'EXIT',{badarg,_}} = (catch <<42.0/integer>>),
+    {'EXIT',{badarg,_}} = (catch <<42/binary>>),
+    {'EXIT',{badarg,_}} = (catch <<an_atom/integer>>),
     
     ok.
 
 float_bin(Config) when is_list(Config) ->
     %% Some more coverage.
-    ?line {<<1,2,3>>,7.0} = float_bin_1(4),
+    {<<1,2,3>>,7.0} = float_bin_1(4),
     F = 42.0,
-    ?line <<42,0,0,0,0,0,0,69,64>> = <<(id(42)),F/little-float>>,
+    <<42,0,0,0,0,0,0,69,64>> = <<(id(42)),F/little-float>>,
     ok.
 
 float_bin_1(F) ->
     {<<1,2,3>>,F+3.0}.
 
 in_guard(Config) when is_list(Config) ->
-    ?line 1 = in_guard_1(<<16#74ad:16>>, 16#e95, 5),
-    ?line 2 = in_guard_1(<<16#3A,16#F7,"hello">>, 16#3AF7, <<"hello">>),
-    ?line 3 = in_guard_1(<<16#FBCD:14,3.1415/float,3:2>>, 16#FBCD, 3.1415),
-    ?line 3 = in_guard_1(<<16#FBCD:14,3/float,3:2>>, 16#FBCD, 3),
-    ?line 3 = in_guard_1(<<16#FBCD:14,(2 bsl 226)/float,3:2>>, 16#FBCD, 2 bsl 226),
-    ?line nope = in_guard_1(<<1>>, 42, b),
-    ?line nope = in_guard_1(<<1>>, a, b),
-    ?line nope = in_guard_1(<<1,2>>, 1, 1),
-    ?line nope = in_guard_1(<<4,5>>, 1, 2.71),
-    ?line nope = in_guard_1(<<4,5>>, 1, <<12,13>>),
-
-    ?line 1 = in_guard_2(<<0,56>>, 7, blurf),
-    ?line 2 = in_guard_2(<<1,255>>, 511, blurf),
-    ?line 3 = in_guard_2(<<0,3>>, 0, blurf),
-    ?line 4 = in_guard_2(<<>>, 1, {<<7:16>>}),
-    ?line nope = in_guard_2(<<4,5>>, 1, blurf),
-
-    ?line 42 = in_guard_3(<<1,2,3,42>>, <<1,2,3>>),
-    ?line 42 = in_guard_3(<<1,2,3,42>>, <<1,2,3>>),
-    ?line nope = in_guard_3(<<>>, <<>>),
-
-    ?line ok = in_guard_4(<<15:4>>, 255),
-    ?line nope = in_guard_4(<<15:8>>, 255),
+    1 = in_guard_1(<<16#74ad:16>>, 16#e95, 5),
+    2 = in_guard_1(<<16#3A,16#F7,"hello">>, 16#3AF7, <<"hello">>),
+    3 = in_guard_1(<<16#FBCD:14,3.1415/float,3:2>>, 16#FBCD, 3.1415),
+    3 = in_guard_1(<<16#FBCD:14,3/float,3:2>>, 16#FBCD, 3),
+    3 = in_guard_1(<<16#FBCD:14,(2 bsl 226)/float,3:2>>, 16#FBCD, 2 bsl 226),
+    nope = in_guard_1(<<1>>, 42, b),
+    nope = in_guard_1(<<1>>, a, b),
+    nope = in_guard_1(<<1,2>>, 1, 1),
+    nope = in_guard_1(<<4,5>>, 1, 2.71),
+    nope = in_guard_1(<<4,5>>, 1, <<12,13>>),
+
+    1 = in_guard_2(<<0,56>>, 7, blurf),
+    2 = in_guard_2(<<1,255>>, 511, blurf),
+    3 = in_guard_2(<<0,3>>, 0, blurf),
+    4 = in_guard_2(<<>>, 1, {<<7:16>>}),
+    nope = in_guard_2(<<4,5>>, 1, blurf),
+
+    42 = in_guard_3(<<1,2,3,42>>, <<1,2,3>>),
+    42 = in_guard_3(<<1,2,3,42>>, <<1,2,3>>),
+    nope = in_guard_3(<<>>, <<>>),
+
+    ok = in_guard_4(<<15:4>>, 255),
+    nope = in_guard_4(<<15:8>>, 255),
     ok.
 
 in_guard_1(Bin, A, B) when <<A:13,B:3>> == Bin -> 1;
@@ -361,10 +360,10 @@ in_guard_4(Bin, A) when <<A:4>> =:= Bin -> ok;
 in_guard_4(_, _) -> nope.
 
 in_catch(Config) when is_list(Config) ->
-    ?line <<42,0,5>> = small(42, 5),
-    ?line <<255>> = small(255, <<1,2,3,4,5,6,7,8,9>>),
-    ?line <<1,2>> = small(<<7,8,9,10>>, 258),
-    ?line <<>> = small(<<1,2,3,4,5>>, <<7,8,9,10>>),
+    <<42,0,5>> = small(42, 5),
+    <<255>> = small(255, <<1,2,3,4,5,6,7,8,9>>),
+    <<1,2>> = small(<<7,8,9,10>>, 258),
+    <<>> = small(<<1,2,3,4,5>>, <<7,8,9,10>>),
 
     <<15,240,0,42>> = small2(255, 42),
     <<7:20>> = small2(<<1,2,3>>, 7),
@@ -413,20 +412,20 @@ small2(A, B) ->
 nasty_literals(Config) when is_list(Config) ->
     case erlang:system_info(endian) of
 	big ->
-	    ?line [0,42] = binary_to_list(id(<<42:16/native>>));
+	    [0,42] = binary_to_list(id(<<42:16/native>>));
 	little ->
-	    ?line [42,0] = binary_to_list(id(<<42:16/native>>))
+	    [42,0] = binary_to_list(id(<<42:16/native>>))
     end,
 
-    ?line Bin0 = id(<<1,2,3,0:10000000,4,5,6>>),
-    ?line 1250006 = size(Bin0),
-    ?line <<1,2,3,0:10000000,4,5,6>> = Bin0,
+    Bin0 = id(<<1,2,3,0:10000000,4,5,6>>),
+    1250006 = size(Bin0),
+    <<1,2,3,0:10000000,4,5,6>> = Bin0,
 
-    ?line Bin1 = id(<<0:10000000,7,8,-1:10000000,9,10,0:10000000>>),
-    ?line 3750004 = size(Bin1),
-    ?line <<0:10000000,7,8,-1:10000000/signed,9,10,0:10000000>> = Bin1,
+    Bin1 = id(<<0:10000000,7,8,-1:10000000,9,10,0:10000000>>),
+    3750004 = size(Bin1),
+    <<0:10000000,7,8,-1:10000000/signed,9,10,0:10000000>> = Bin1,
 
-    ?line <<255,255,0,0,0>> = id(<<255,255,0,0,0>>),
+    <<255,255,0,0,0>> = id(<<255,255,0,0,0>>),
 
     %% Coverage.
     I = 16#7777FFFF7777FFFF7777FFFF7777FFFF7777FFFF7777FFFF,
@@ -435,18 +434,18 @@ nasty_literals(Config) when is_list(Config) ->
     ok.
 
 -define(COF(Int0),
-	?line (fun(Int) ->
-		       true = <<Int:32/float>> =:= <<(float(Int)):32/float>>,
-		       true = <<Int:64/float>> =:= <<(float(Int)):64/float>>
-			   end)(nonliteral(Int0)),
- 	?line true = <<Int0:32/float>> =:= <<(float(Int0)):32/float>>,
- 	?line true = <<Int0:64/float>> =:= <<(float(Int0)):64/float>>).
+	(fun(Int) ->
+		 true = <<Int:32/float>> =:= <<(float(Int)):32/float>>,
+		 true = <<Int:64/float>> =:= <<(float(Int)):64/float>>
+	 end)(nonliteral(Int0)),
+	true = <<Int0:32/float>> =:= <<(float(Int0)):32/float>>,
+	true = <<Int0:64/float>> =:= <<(float(Int0)):64/float>>).
 
 -define(COF64(Int0),
-	?line (fun(Int) ->
-		       true = <<Int:64/float>> =:= <<(float(Int)):64/float>>
-			   end)(nonliteral(Int0)),
- 	?line true = <<Int0:64/float>> =:= <<(float(Int0)):64/float>>).
+	(fun(Int) ->
+		 true = <<Int:64/float>> =:= <<(float(Int)):64/float>>
+	 end)(nonliteral(Int0)),
+	true = <<Int0:64/float>> =:= <<(float(Int0)):64/float>>).
 
 nonliteral(X) -> X.
     
@@ -467,7 +466,7 @@ coerce_to_float(Config) when is_list(Config) ->
 side_effect(Config) when is_list(Config) ->
     {'EXIT',{badarg,_}} = (catch side_effect_1(a)),
     {'EXIT',{badarg,_}} = (catch side_effect_1(<<>>)),
-    ?line ok = side_effect_1(42),
+    ok = side_effect_1(42),
     ok.
 
 side_effect_1(A) ->
@@ -477,32 +476,32 @@ side_effect_1(A) ->
 -record(otp_7029, {a,b}).
 
 opt(Config) when is_list(Config) ->
-    ?line 42 = otp_7029(#otp_7029{a = <<>>,b = 42}),
+    42 = otp_7029(#otp_7029{a = <<>>,b = 42}),
     N = 16,
-    ?line <<1,3,65>> = id(<<1,833:N>>),
-    ?line <<1,66,3>> = id(<<1,834:N/little>>),
-    ?line <<1,65,136,0,0>> = id(<<1,17.0:32/float>>),
-    ?line <<1,64,8,0,0,0,0,0,0>> = id(<<1,3.0:N/float-unit:4>>),
-    ?line <<1,0,0,0,0,0,0,8,64>> = id(<<1,3.0:N/little-float-unit:4>>),
-    ?line {'EXIT',{badarg,_}} = (catch id(<<3.1416:N/float>>)),
+    <<1,3,65>> = id(<<1,833:N>>),
+    <<1,66,3>> = id(<<1,834:N/little>>),
+    <<1,65,136,0,0>> = id(<<1,17.0:32/float>>),
+    <<1,64,8,0,0,0,0,0,0>> = id(<<1,3.0:N/float-unit:4>>),
+    <<1,0,0,0,0,0,0,8,64>> = id(<<1,3.0:N/little-float-unit:4>>),
+    {'EXIT',{badarg,_}} = (catch id(<<3.1416:N/float>>)),
 
     B = <<1,2,3,4,5>>,
-    ?line <<0,1,2,3,4,5>> = id(<<0,B/binary>>),
-    ?line <<1,2,3,4,5,19>> = id(<<B:5/binary,19>>),
-    ?line <<1,2,3,42>> = id(<<B:3/binary,42>>),
+    <<0,1,2,3,4,5>> = id(<<0,B/binary>>),
+    <<1,2,3,4,5,19>> = id(<<B:5/binary,19>>),
+    <<1,2,3,42>> = id(<<B:3/binary,42>>),
 
-    ?line {'EXIT',_} = (catch <<<<23,56,0,2>>:(2.5)/binary>>),
-    ?line {'EXIT',_} = (catch <<<<23,56,0,2>>:(-16)/binary>>),
-    ?line {'EXIT',_} = (catch <<<<23,56,0,2>>:(anka)>>),
-    ?line {'EXIT',_} = (catch <<<<23,56,0,2>>:64/float>>),
-    ?line {'EXIT',_} = (catch <<<<23,56,0,2:7>>/binary>>),
+    {'EXIT',_} = (catch <<<<23,56,0,2>>:(2.5)/binary>>),
+    {'EXIT',_} = (catch <<<<23,56,0,2>>:(-16)/binary>>),
+    {'EXIT',_} = (catch <<<<23,56,0,2>>:(anka)>>),
+    {'EXIT',_} = (catch <<<<23,56,0,2>>:64/float>>),
+    {'EXIT',_} = (catch <<<<23,56,0,2:7>>/binary>>),
 
     %% Test constant propagation - there should be a warning.
     BadSz = 2.5,
     {'EXIT',_} = (catch <<<<N,56,0,2>>:BadSz/binary>>),
 
     case id(false) of
-	true -> ?line opt_dont_call_me();
+	true -> opt_dont_call_me();
 	false -> ok
     end,
 
@@ -530,7 +529,7 @@ otp_7556(Bin, A, B, C) ->
 %% for a binary construction with a later allocation).
 
 float_arith(Config) when is_list(Config) ->
-    ?line {<<1,2,3,64,69,0,0,0,0,0,0>>,21.0} = do_float_arith(<<1,2,3>>, 42, 2),
+    {<<1,2,3,64,69,0,0,0,0,0,0>>,21.0} = do_float_arith(<<1,2,3>>, 42, 2),
     ok.
 
 do_float_arith(Bin0, X, Y)  ->
@@ -538,7 +537,7 @@ do_float_arith(Bin0, X, Y)  ->
     {Bin,X / Y}.
 
 otp_8054(Config) when is_list(Config) ->
-    ?line <<"abc">> = otp_8054_1([null,1,2,3], <<"abc">>),
+    <<"abc">> = otp_8054_1([null,1,2,3], <<"abc">>),
     ok.
 
 otp_8054_1([H|T], Bin) ->
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index b4601b0798..7fa26b6c26 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -36,14 +36,19 @@
 	 match_string/1,zero_width/1,bad_size/1,haystack/1,
 	 cover_beam_bool/1,matched_out_size/1,follow_fail_branch/1,
 	 no_partition/1,calling_a_binary/1,binary_in_map/1,
-	 match_string_opt/1,map_and_binary/1]).
+	 match_string_opt/1,select_on_integer/1,
+	 map_and_binary/1,unsafe_branch_caching/1,
+	 bad_literals/1,good_literals/1]).
 
 -export([coverage_id/1,coverage_external_ignore/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
+-include_lib("syntax_tools/include/merl.hrl").
 
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     test_lib:recompile(?MODULE),
@@ -62,7 +67,9 @@ groups() ->
        otp_7498,match_string,zero_width,bad_size,haystack,
        cover_beam_bool,matched_out_size,follow_fail_branch,
        no_partition,calling_a_binary,binary_in_map,
-       match_string_opt,map_and_binary]}].
+       match_string_opt,select_on_integer,
+       map_and_binary,unsafe_branch_caching,
+       bad_literals,good_literals]}].
 
 
 init_per_suite(Config) ->
@@ -79,20 +86,17 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog = test_server:timetrap(?t:minutes(1)),
-    [{watchdog,Dog}|Config].
+    Config.
 
 end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
     ok.
 
 fun_shadow(Config) when is_list(Config) ->
     %% OTP-5270
-    ?line 7 = fun_shadow_1(),
-    ?line 7 = fun_shadow_2(8),
-    ?line 7 = fun_shadow_3(),
-    ?line no = fun_shadow_4(8),
+    7 = fun_shadow_1(),
+    7 = fun_shadow_2(8),
+    7 = fun_shadow_3(),
+    no = fun_shadow_4(8),
     ok.
 
 fun_shadow_1() ->
@@ -116,71 +120,78 @@ fun_shadow_4(L) ->
 
 int_float(Config) when is_list(Config) ->
     %% OTP-5323
-    ?line <<103133.0:64/float>> = <<103133:64/float>>,
-    ?line <<103133:64/float>> = <<103133:64/float>>,
-    ok.
+    <<103133.0:64/float>> = <<103133:64/float>>,
+    <<103133:64/float>> = <<103133:64/float>>,
+
+    %% Coverage of error cases in sys_pre_expand:coerce_to_float/2.
+    case id(default) of
+	<<(1 bsl 1024):64/float>> ->
+	    ct:fail(should_not_match);
+	default ->
+	    ok
+    end.
 
 %% Stolen from erl_eval_SUITE and modified.
 %% OTP-5269. Bugs in the bit syntax.
 otp_5269(Config) when is_list(Config) ->
-    ?line check(fun() -> L = 8,
-                         F = fun(<<A:L,B:A>>) -> B end,
-                         F(<<16:8, 7:16>>)
+    check(fun() -> L = 8,
+		   F = fun(<<A:L,B:A>>) -> B end,
+		   F(<<16:8, 7:16>>)
                 end,
                 7),
-    ?line check(fun() -> L = 8, <<A:L,B:A>> = <<16:8, 7:16>>, B end,
-                7),
-    ?line check(fun() -> U = 8, (fun(<<U:U>>) -> U end)(<<32:8>>) end,
-                32),
-    ?line check(fun() -> U = 8, [U || <<U:U>> <- [<<32:8>>]] end,
-                [32]),
-    ?line check(fun() -> [X || <<A:8,
-				B:A>> <- [<<16:8,19:16>>],
-                               <<X:8>> <- [<<B:8>>]] end,
-                [19]),
-    ?line check(fun() -> A = 4, B = 28, bit_size(<<13:(A+(X=B))>>), X end,
-                28),
-    ?line check(fun() ->
-			<<Size,B:Size/binary,Rest/binary>> = <<2,"AB","CD">>,
-			{Size,B,Rest}
-		end,
-		{2,<<"AB">>,<<"CD">>}),
-    ?line check(fun() -> X = 32, 
-                         [X || <<X:X>> <- [<<1:32>>,<<2:32>>,<<3:8>>]] end,
-    %% "binsize variable"          ^
-                [1,2]),
-    ?line check(fun() ->
-		(fun (<<A:1/binary, B:8/integer, _C:B/binary>>) ->
-			    case A of
-				B -> wrong;
-				_ -> ok
-			    end
-		 end)(<<1,2,3,4>>) end,
-		ok),
+    check(fun() -> L = 8, <<A:L,B:A>> = <<16:8, 7:16>>, B end,
+	  7),
+    check(fun() -> U = 8, (fun(<<U:U>>) -> U end)(<<32:8>>) end,
+	  32),
+    check(fun() -> U = 8, [U || <<U:U>> <- [<<32:8>>]] end,
+	  [32]),
+    check(fun() -> [X || <<A:8,
+			   B:A>> <- [<<16:8,19:16>>],
+			 <<X:8>> <- [<<B:8>>]] end,
+	  [19]),
+    check(fun() -> A = 4, B = 28, bit_size(<<13:(A+(X=B))>>), X end,
+	  28),
+    check(fun() ->
+		  <<Size,B:Size/binary,Rest/binary>> = <<2,"AB","CD">>,
+		  {Size,B,Rest}
+	  end,
+	  {2,<<"AB">>,<<"CD">>}),
+    check(fun() -> X = 32,
+		   [X || <<X:X>> <- [<<1:32>>,<<2:32>>,<<3:8>>]] end,
+    %% "binsize variable"    ^
+	  [1,2]),
+    check(fun() ->
+		  (fun (<<A:1/binary, B:8/integer, _C:B/binary>>) ->
+			   case A of
+			       B -> wrong;
+			       _ -> ok
+			   end
+		   end)(<<1,2,3,4>>) end,
+	  ok),
     ok.
 
 null_fields(Config) when is_list(Config) ->
-    ?line check(fun() ->
-			W = id(0),
-			F = fun(<<_:W>>) -> tail;
-			       (<<>>) -> empty
-			    end,
-			F(<<>>)
-		end, tail),
-    ?line check(fun() ->
-			F = fun(<<_/binary>>) -> tail;
-			       (<<>>) -> empty
-			    end,
-			F(<<>>)
-		end, tail),
+    check(fun() ->
+		  W = id(0),
+		  F = fun(<<_:W>>) -> tail;
+			 (<<>>) -> empty
+		      end,
+		  F(<<>>)
+	  end, tail),
+    check(fun() ->
+		  F = fun(<<_/binary>>) -> tail;
+			 (<<>>) -> empty
+		      end,
+		  F(<<>>)
+	  end, tail),
     ok.
 
 wiger(Config) when is_list(Config) ->
-    ?line ok1 = wcheck(<<3>>),
-    ?line ok2 = wcheck(<<1,2,3>>),
-    ?line ok3 = wcheck(<<4>>),
-    ?line {error,<<1,2,3,4>>} = wcheck(<<1,2,3,4>>),
-    ?line {error,<<>>} = wcheck(<<>>),
+    ok1 = wcheck(<<3>>),
+    ok2 = wcheck(<<1,2,3>>),
+    ok3 = wcheck(<<4>>),
+    {error,<<1,2,3,4>>} = wcheck(<<1,2,3,4>>),
+    {error,<<>>} = wcheck(<<>>),
     ok.
 
 wcheck(<<A>>) when A==3->
@@ -194,24 +205,24 @@ wcheck(Other) ->
 
 bin_tail(Config) when is_list(Config) ->
     S = <<"abcde">>,
-    ?line $a = bin_tail_c(S, 0),
-    ?line $c = bin_tail_c(S, 2),
-    ?line $e = bin_tail_c(S, 4),
-    ?line {'EXIT',_} = (catch bin_tail_c(S, 5)),
-    ?line {'EXIT',_} = (catch bin_tail_c_var(S, 5)),
-
-    ?line $a = bin_tail_d(S, 0),
-    ?line $b = bin_tail_d(S, 8),
-    ?line $d = bin_tail_d(S, 3*8),
-    ?line {'EXIT',_} = (catch bin_tail_d_dead(S, 1)),
-    ?line {'EXIT',_} = (catch bin_tail_d_dead(S, 9)),
-    ?line {'EXIT',_} = (catch bin_tail_d_dead(S, 5*8)),
-    ?line {'EXIT',_} = (catch bin_tail_d_var(S, 1)),
-
-    ?line ok = bin_tail_e(<<2:2,0:1,1:5>>),
-    ?line ok = bin_tail_e(<<2:2,1:1,1:5,42:64>>),
-    ?line error = bin_tail_e(<<3:2,1:1,1:5,42:64>>),
-    ?line error = bin_tail_e(<<>>),
+    $a = bin_tail_c(S, 0),
+    $c = bin_tail_c(S, 2),
+    $e = bin_tail_c(S, 4),
+    {'EXIT',_} = (catch bin_tail_c(S, 5)),
+    {'EXIT',_} = (catch bin_tail_c_var(S, 5)),
+
+    $a = bin_tail_d(S, 0),
+    $b = bin_tail_d(S, 8),
+    $d = bin_tail_d(S, 3*8),
+    {'EXIT',_} = (catch bin_tail_d_dead(S, 1)),
+    {'EXIT',_} = (catch bin_tail_d_dead(S, 9)),
+    {'EXIT',_} = (catch bin_tail_d_dead(S, 5*8)),
+    {'EXIT',_} = (catch bin_tail_d_var(S, 1)),
+
+    ok = bin_tail_e(<<2:2,0:1,1:5>>),
+    ok = bin_tail_e(<<2:2,1:1,1:5,42:64>>),
+    error = bin_tail_e(<<3:2,1:1,1:5,42:64>>),
+    error = bin_tail_e(<<>>),
     ok.
 
 bin_tail_c(Bin, Offset) ->
@@ -270,34 +281,34 @@ bin_tail_e_var(Bin) ->
     end.
 	    
 save_restore(Config) when is_list(Config) ->
-    ?line 0 = save_restore_1(<<0:2,42:6>>),
-    ?line {1,3456} = save_restore_1(<<1:2,3456:14>>),
-    ?line {2,7981234} = save_restore_1(<<2:2,7981234:30>>),
-    ?line {3,763967493838} = save_restore_1(<<0:2,763967493838:62>>),
+    0 = save_restore_1(<<0:2,42:6>>),
+    {1,3456} = save_restore_1(<<1:2,3456:14>>),
+    {2,7981234} = save_restore_1(<<2:2,7981234:30>>),
+    {3,763967493838} = save_restore_1(<<0:2,763967493838:62>>),
 
     A = <<" x">>,
     B = <<".x">>,
     C = <<"-x">>,
 
-    ?line {" ",<<"x">>} = lll(A),
-    ?line {" ",<<"x">>} = mmm(A),
-    ?line {" ",<<"x">>} = nnn(A),
-    ?line {" ",<<"x">>} = ooo(A),
+    {" ",<<"x">>} = lll(A),
+    {" ",<<"x">>} = mmm(A),
+    {" ",<<"x">>} = nnn(A),
+    {" ",<<"x">>} = ooo(A),
 
-    ?line {".",<<"x">>} = lll(B),
-    ?line {".",<<"x">>} = mmm(B),
-    ?line {".",<<"x">>} = nnn(B),
-    ?line {".",<<"x">>} = ooo(B),
+    {".",<<"x">>} = lll(B),
+    {".",<<"x">>} = mmm(B),
+    {".",<<"x">>} = nnn(B),
+    {".",<<"x">>} = ooo(B),
 
-    ?line {"-",<<"x">>} = lll(C),
-    ?line {"-",<<"x">>} = mmm(C),
-    ?line {"-",<<"x">>} = nnn(C),
-    ?line {"-",<<"x">>} = ooo(C),
+    {"-",<<"x">>} = lll(C),
+    {"-",<<"x">>} = mmm(C),
+    {"-",<<"x">>} = nnn(C),
+    {"-",<<"x">>} = ooo(C),
 
     Bin = <<-1:64>>,
     case bad_float_unpack_match(Bin) of
 	-1 -> ok;
-	_Other -> ?line ?t:fail(bad_return_value_probably_NaN)
+	_Other -> ct:fail(bad_return_value_probably_NaN)
     end.
 
 save_restore_1(Bin) ->
@@ -326,18 +337,18 @@ bad_float_unpack_match(<<I:64/integer-signed>>) -> I.
 
 
 partitioned_bs_match(Config) when is_list(Config) ->
-    ?line <<1,2,3>> = partitioned_bs_match(blurf, <<42,1,2,3>>),
-    ?line error = partitioned_bs_match(10, <<7,8,15,13>>),
-    ?line error = partitioned_bs_match(100, {a,tuple,is,'not',a,binary}),
-    ?line ok = partitioned_bs_match(0, <<>>),
-    ?line fc(partitioned_bs_match, [-1,blurf],
+    <<1,2,3>> = partitioned_bs_match(blurf, <<42,1,2,3>>),
+    error = partitioned_bs_match(10, <<7,8,15,13>>),
+    error = partitioned_bs_match(100, {a,tuple,is,'not',a,binary}),
+    ok = partitioned_bs_match(0, <<>>),
+    fc(partitioned_bs_match, [-1,blurf],
 	     catch partitioned_bs_match(-1, blurf)),
-    ?line fc(partitioned_bs_match, [-1,<<1,2,3>>],
+    fc(partitioned_bs_match, [-1,<<1,2,3>>],
 	     catch partitioned_bs_match(-1, <<1,2,3>>)),
-    ?line {17,<<1,2,3>>} = partitioned_bs_match_2(1, <<17,1,2,3>>),
-    ?line {7,<<1,2,3>>} = partitioned_bs_match_2(7, <<17,1,2,3>>),
+    {17,<<1,2,3>>} = partitioned_bs_match_2(1, <<17,1,2,3>>),
+    {7,<<1,2,3>>} = partitioned_bs_match_2(7, <<17,1,2,3>>),
 
-    ?line fc(partitioned_bs_match_2, [4,<<0:17>>],
+    fc(partitioned_bs_match_2, [4,<<0:17>>],
 	     catch partitioned_bs_match_2(4, <<0:17>>)),
 
     anything = partitioned_bs_match_3(anything, <<42>>),
@@ -390,25 +401,25 @@ function_clause_2(<<_:4>>) ->
     ok.
 
 unit(Config) when is_list(Config) ->
-    ?line 42 = peek1(<<42>>),
-    ?line 43 = peek1(<<43,1,2>>),
-    ?line 43 = peek1(<<43,1,2,(-1):1>>),
-    ?line 43 = peek1(<<43,1,2,(-1):2>>),
-    ?line 43 = peek1(<<43,1,2,(-1):7>>),
-
-    ?line 99 = peek8(<<99>>),
-    ?line 100 = peek8(<<100,101>>),
-    ?line fc(peek8, [<<100,101,0:1>>], catch peek8(<<100,101,0:1>>)),
-
-    ?line 37484 = peek16(<<37484:16>>),
-    ?line 37489 = peek16(<<37489:16,5566:16>>),
-    ?line fc(peek16, [<<8>>], catch peek16(<<8>>)),
-    ?line fc(peek16, [<<42:15>>], catch peek16(<<42:15>>)),
-    ?line fc(peek16, [<<1,2,3,4,5>>], catch peek16(<<1,2,3,4,5>>)),
-
-    ?line 127 = peek7(<<127:7>>),
-    ?line 100 = peek7(<<100:7,19:7>>),
-    ?line fc(peek7, [<<1,2>>], catch peek7(<<1,2>>)),
+    42 = peek1(<<42>>),
+    43 = peek1(<<43,1,2>>),
+    43 = peek1(<<43,1,2,(-1):1>>),
+    43 = peek1(<<43,1,2,(-1):2>>),
+    43 = peek1(<<43,1,2,(-1):7>>),
+
+    99 = peek8(<<99>>),
+    100 = peek8(<<100,101>>),
+    fc(peek8, [<<100,101,0:1>>], catch peek8(<<100,101,0:1>>)),
+
+    37484 = peek16(<<37484:16>>),
+    37489 = peek16(<<37489:16,5566:16>>),
+    fc(peek16, [<<8>>], catch peek16(<<8>>)),
+    fc(peek16, [<<42:15>>], catch peek16(<<42:15>>)),
+    fc(peek16, [<<1,2,3,4,5>>], catch peek16(<<1,2,3,4,5>>)),
+
+    127 = peek7(<<127:7>>),
+    100 = peek7(<<100:7,19:7>>),
+    fc(peek7, [<<1,2>>], catch peek7(<<1,2>>)),
     ok.
 
 peek1(<<B:8,_/bitstring>>) -> B.
@@ -420,7 +431,7 @@ peek8(<<B:8,_/binary>>) -> B.
 peek16(<<B:16,_/binary-unit:16>>) -> B.
 
 shared_sub_bins(Config) when is_list(Config) ->
-    ?line {15,[<<>>,<<5>>,<<4,5>>,<<3,4,5>>,<<2,3,4,5>>]} = sum(<<1,2,3,4,5>>, [], 0),
+    {15,[<<>>,<<5>>,<<4,5>>,<<3,4,5>>,<<2,3,4,5>>]} = sum(<<1,2,3,4,5>>, [], 0),
     ok.
 
 sum(<<B,T/binary>>, Acc, Sum) ->
@@ -429,7 +440,7 @@ sum(<<>>, Last, Sum) -> {Sum,Last}.
 
 
 bin_and_float(Config) when is_list(Config) ->
-    ?line 14.0 = bin_and_float(<<1.0/float,2.0/float,3.0/float>>, 0.0),
+    14.0 = bin_and_float(<<1.0/float,2.0/float,3.0/float>>, 0.0),
     ok.
 
 bin_and_float(<<X/float,Y/float,Z/float,T/binary>>, Sum) when is_float(X),
@@ -439,10 +450,10 @@ bin_and_float(<<X/float,Y/float,Z/float,T/binary>>, Sum) when is_float(X),
 bin_and_float(<<>>, Sum) -> Sum.
 
 dec_subidentifiers(Config) when is_list(Config) ->
-    ?line {[],<<1,2,3>>} =
+    {[],<<1,2,3>>} =
 	do_dec_subidentifiers(<<1:1,42:7,1:1,99:7,1,2,3>>, 0, [], 2),
-    ?line {[5389],<<1,2,3>>} = do_dec_subidentifiers(<<1:1,42:7,0:1,13:7,1,2,3>>, 0, [], 2),
-    ?line {[3,2,1],not_a_binary} = dec_subidentifiers(not_a_binary, any, [1,2,3], 0),
+    {[5389],<<1,2,3>>} = do_dec_subidentifiers(<<1:1,42:7,0:1,13:7,1,2,3>>, 0, [], 2),
+    {[3,2,1],not_a_binary} = dec_subidentifiers(not_a_binary, any, [1,2,3], 0),
     ok.
 
 do_dec_subidentifiers(Buffer, Av, Al, Len) -> 
@@ -498,18 +509,18 @@ skip_optional_tag(_, _) -> missing.
 wfbm(Config) when is_list(Config) ->
     %% check_for_dot_or_space and get_tail is from wfbm4 by Steve Vinoski,
     %% with modifications.
-    ?line {nomatch,0} = check_for_dot_or_space(<<" ">>),
-    ?line {nomatch,0} = check_for_dot_or_space(<<" abc">>),
-    ?line {ok,<<"abcde">>} = check_for_dot_or_space(<<"abcde 34555">>),
-    ?line {nomatch,0} = check_for_dot_or_space(<<".gurka">>),
-    ?line {nomatch,1} = check_for_dot_or_space(<<"g.urka">>),
-
-    ?line nomatch = get_tail(<<>>),
-    ?line {ok,<<"2007/10/23/blurf">>} = get_tail(<<"200x/2007/10/23/blurf ">>),
-    ?line {skip,?DATELEN+5} = get_tail(<<"200x/2007/10/23/blurf.">>),
-    ?line nomatch = get_tail(<<"200y.2007.10.23.blurf ">>),
-    ?line {'EXIT',_} = (catch get_tail({no,binary,at,all})),
-    ?line {'EXIT',_} = (catch get_tail(no_binary)),
+    {nomatch,0} = check_for_dot_or_space(<<" ">>),
+    {nomatch,0} = check_for_dot_or_space(<<" abc">>),
+    {ok,<<"abcde">>} = check_for_dot_or_space(<<"abcde 34555">>),
+    {nomatch,0} = check_for_dot_or_space(<<".gurka">>),
+    {nomatch,1} = check_for_dot_or_space(<<"g.urka">>),
+
+    nomatch = get_tail(<<>>),
+    {ok,<<"2007/10/23/blurf">>} = get_tail(<<"200x/2007/10/23/blurf ">>),
+    {skip,?DATELEN+5} = get_tail(<<"200x/2007/10/23/blurf.">>),
+    nomatch = get_tail(<<"200y.2007.10.23.blurf ">>),
+    {'EXIT',_} = (catch get_tail({no,binary,at,all})),
+    {'EXIT',_} = (catch get_tail(no_binary)),
     ok.
 
 check_for_dot_or_space(Bin) ->
@@ -542,13 +553,13 @@ get_tail(Bin) ->
     end.
 
 degenerated_match(Config) when is_list(Config) ->
-    ?line error = degenerated_match_1(<<>>),
-    ?line 1 = degenerated_match_1(<<1:1>>),
-    ?line 2 = degenerated_match_1(<<42,43>>),
+    error = degenerated_match_1(<<>>),
+    1 = degenerated_match_1(<<1:1>>),
+    2 = degenerated_match_1(<<42,43>>),
 
-    ?line error = degenerated_match_2(<<>>),
-    ?line no_split = degenerated_match_2(<<1,2>>),
-    ?line {<<1,2,3,4>>,<<5>>} = degenerated_match_2(<<1,2,3,4,5>>),
+    error = degenerated_match_2(<<>>),
+    no_split = degenerated_match_2(<<1,2>>),
+    {<<1,2,3,4>>,<<5>>} = degenerated_match_2(<<1,2,3,4,5>>),
     
     ok.
 
@@ -565,25 +576,25 @@ degenerated_match_2(Bin) ->
     end.
 
 bs_sum(Config) when is_list(Config) ->
-    ?line 0 = bs_sum_1([]),
-    ?line 0 = bs_sum_1(<<>>),
-    ?line 42 = bs_sum_1([42]),
-    ?line 1 = bs_sum_1(<<1>>),
-    ?line 10 = bs_sum_1([1,2,3,4]),
-    ?line 15 = bs_sum_1(<<1,2,3,4,5>>),
-    ?line 21 = bs_sum_1([1,2,3|<<4,5,6>>]),
-    ?line 15 = bs_sum_1([1,2,3|{4,5}]),
-    ?line 6 = bs_sum_1([1,2,3|zero]),
-    ?line 6 = bs_sum_1([1,2,3|0]),
-    ?line 7 = bs_sum_1([1,2,3|one]),
-
-    ?line fc(catch bs_sum_1({too,big,tuple})),
-    ?line fc(catch bs_sum_1([1,2,3|{too,big,tuple}])),
-
-    ?line [] = sneaky_alias(<<>>),
-    ?line [559,387655] = sneaky_alias(id(<<559:32,387655:32>>)),
-    ?line fc(sneaky_alias, [<<1>>], catch sneaky_alias(id(<<1>>))),
-    ?line fc(sneaky_alias, [[1,2,3,4]], catch sneaky_alias(lists:seq(1, 4))),
+    0 = bs_sum_1([]),
+    0 = bs_sum_1(<<>>),
+    42 = bs_sum_1([42]),
+    1 = bs_sum_1(<<1>>),
+    10 = bs_sum_1([1,2,3,4]),
+    15 = bs_sum_1(<<1,2,3,4,5>>),
+    21 = bs_sum_1([1,2,3|<<4,5,6>>]),
+    15 = bs_sum_1([1,2,3|{4,5}]),
+    6 = bs_sum_1([1,2,3|zero]),
+    6 = bs_sum_1([1,2,3|0]),
+    7 = bs_sum_1([1,2,3|one]),
+
+    fc(catch bs_sum_1({too,big,tuple})),
+    fc(catch bs_sum_1([1,2,3|{too,big,tuple}])),
+
+    [] = sneaky_alias(<<>>),
+    [559,387655] = sneaky_alias(id(<<559:32,387655:32>>)),
+    fc(sneaky_alias, [<<1>>], catch sneaky_alias(id(<<1>>))),
+    fc(sneaky_alias, [[1,2,3,4]], catch sneaky_alias(lists:seq(1, 4))),
     ok.
 
 bs_sum_1(<<H,T/binary>>) -> H+bs_sum_1(T);
@@ -599,31 +610,31 @@ sneaky_alias(<<>>=L) -> binary_to_list(L);
 sneaky_alias(<<From:32,L/binary>>) -> [From|sneaky_alias(L)].
 
 coverage(Config) when is_list(Config) ->
-    ?line 0 = coverage_fold(fun(B, A) -> A+B end, 0, <<>>),
-    ?line 6 = coverage_fold(fun(B, A) -> A+B end, 0, <<1,2,3>>),
-    ?line fc(catch coverage_fold(fun(B, A) ->
+    0 = coverage_fold(fun(B, A) -> A+B end, 0, <<>>),
+    6 = coverage_fold(fun(B, A) -> A+B end, 0, <<1,2,3>>),
+    fc(catch coverage_fold(fun(B, A) ->
 					 A+B
 				 end, 0, [a,b,c])),
 
-    ?line {<<42.0:64/float>>,float} = coverage_build(<<>>, <<42>>, float),
-    ?line {<<>>,not_a_tuple} = coverage_build(<<>>, <<>>, not_a_tuple),
-    ?line {<<16#76,"abc",16#A9,"abc">>,{x,42,43}} =
+    {<<42.0:64/float>>,float} = coverage_build(<<>>, <<42>>, float),
+    {<<>>,not_a_tuple} = coverage_build(<<>>, <<>>, not_a_tuple),
+    {<<16#76,"abc",16#A9,"abc">>,{x,42,43}} =
 	coverage_build(<<>>, <<16#7,16#A>>, {x,y,z}),
 
-    ?line [<<2>>,<<1>>] = coverage_bc(<<1,2>>, []),
+    [<<2>>,<<1>>] = coverage_bc(<<1,2>>, []),
 
-    ?line {x,<<"abc">>,z} = coverage_setelement(<<2,"abc">>, {x,y,z}),
+    {x,<<"abc">>,z} = coverage_setelement(<<2,"abc">>, {x,y,z}),
 
-    ?line [42] = coverage_apply(<<42>>, [coverage_id]),
-    ?line 42 = coverage_external(<<42>>),
+    [42] = coverage_apply(<<42>>, [coverage_id]),
+    42 = coverage_external(<<42>>),
 
-    ?line do_coverage_bin_to_term_list([]),
-    ?line do_coverage_bin_to_term_list([lists:seq(0, 10),{a,b,c},<<23:42>>]),
-    ?line fc(coverage_bin_to_term_list, [<<0,0,0,7>>],
+    do_coverage_bin_to_term_list([]),
+    do_coverage_bin_to_term_list([lists:seq(0, 10),{a,b,c},<<23:42>>]),
+    fc(coverage_bin_to_term_list, [<<0,0,0,7>>],
 	     catch do_coverage_bin_to_term_list_1(<<7:32>>)),
 
-    ?line <<>> = coverage_per_key(<<4:32>>),
-    ?line <<$a,$b,$c>> = coverage_per_key(<<7:32,"abc">>),
+    <<>> = coverage_per_key(<<4:32>>),
+    <<$a,$b,$c>> = coverage_per_key(<<7:32,"abc">>),
 
     ok.
 
@@ -716,9 +727,9 @@ coverage_per_key(<<BinSize:32,Bin/binary>> = B) ->
     Bin.
 
 multiple_uses(Config) when is_list(Config) ->
-    ?line {344,62879,345,<<245,159,1,89>>} = multiple_uses_1(<<1,88,245,159,1,89>>),
-    ?line true = multiple_uses_2(<<0,0,197,18>>),
-    ?line <<42,43>> = multiple_uses_3(<<0,0,42,43>>, fun id/1),
+    {344,62879,345,<<245,159,1,89>>} = multiple_uses_1(<<1,88,245,159,1,89>>),
+    true = multiple_uses_2(<<0,0,197,18>>),
+    <<42,43>> = multiple_uses_3(<<0,0,42,43>>, fun id/1),
     ok.
 
 multiple_uses_1(<<X:16,Tail/binary>>) ->
@@ -741,8 +752,8 @@ multiple_uses_cmp(<<Y:16>>, <<Y:16>>) -> true;
 multiple_uses_cmp(<<_:16>>, <<_:16>>) -> false.
 
 zero_label(Config) when is_list(Config) ->
-    ?line <<"nosemouth">> = read_pols(<<"FACE","nose","mouth">>),
-    ?line <<"CE">> = read_pols(<<"noFACE">>),
+    <<"nosemouth">> = read_pols(<<"FACE","nose","mouth">>),
+    <<"CE">> = read_pols(<<"noFACE">>),
     ok.
 
 read_pols(Data) ->
@@ -770,14 +781,14 @@ matching_meets_construction(Config) when is_list(Config) ->
     Bin = id(<<"abc">>),
     Len = id(2),
     Tail0 = id(<<1,2,3,4,5>>),
-    ?line <<_:Len/binary,Tail/binary>> = Tail0,
-    ?line Res = <<Tail/binary,Bin/binary>>,
-    ?line <<3,4,5,"abc">> = Res,
-    ?line {'EXIT',{badarg,_}} = (catch matching_meets_construction_1(<<"Abc">>)),
-    ?line {'EXIT',{badarg,_}} = (catch matching_meets_construction_2(<<"Abc">>)),
-    ?line <<"Bbc">> = matching_meets_construction_3(<<"Abc">>),
-
-    ?line <<1,2>> = encode_octet_string(<<1,2,3>>, 2),
+    <<_:Len/binary,Tail/binary>> = Tail0,
+    Res = <<Tail/binary,Bin/binary>>,
+    <<3,4,5,"abc">> = Res,
+    {'EXIT',{badarg,_}} = (catch matching_meets_construction_1(<<"Abc">>)),
+    {'EXIT',{badarg,_}} = (catch matching_meets_construction_2(<<"Abc">>)),
+    <<"Bbc">> = matching_meets_construction_3(<<"Abc">>),
+
+    <<1,2>> = encode_octet_string(<<1,2,3>>, 2),
     ok.
 
 matching_meets_construction_1(<<"A",H/binary>>) -> <<"B",H>>.
@@ -790,14 +801,14 @@ encode_octet_string(<<OctetString/binary>>, Len) ->
     <<OctetString:Len/binary-unit:8>>.
 
 simon(Config) when is_list(Config) ->
-    ?line one = simon(blurf, <<>>),
-    ?line two = simon(0, <<42>>),
-    ?line fc(simon, [17,<<1>>], catch simon(17, <<1>>)),
-    ?line fc(simon, [0,<<1,2,3>>], catch simon(0, <<1,2,3>>)),
-
-    ?line one = simon2(blurf, <<9>>),
-    ?line two = simon2(0, <<9,1>>),
-    ?line fc(simon2, [0,<<9,10,11>>], catch simon2(0, <<9,10,11>>)),
+    one = simon(blurf, <<>>),
+    two = simon(0, <<42>>),
+    fc(simon, [17,<<1>>], catch simon(17, <<1>>)),
+    fc(simon, [0,<<1,2,3>>], catch simon(0, <<1,2,3>>)),
+
+    one = simon2(blurf, <<9>>),
+    two = simon2(0, <<9,1>>),
+    fc(simon2, [0,<<9,10,11>>], catch simon2(0, <<9,10,11>>)),
     ok.
 
 simon(_, <<>>) -> one;
@@ -809,10 +820,10 @@ simon2(0, <<_:16>>) -> two.
 
 %% OTP-7113: Crash in v3_codegen.
 matching_and_andalso(Config) when is_list(Config) ->
-    ?line ok = matching_and_andalso_1(<<1,2,3>>, 3),
-    ?line {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, -8)),
-    ?line {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, blurf)),
-    ?line {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, 19)),
+    ok = matching_and_andalso_1(<<1,2,3>>, 3),
+    {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, -8)),
+    {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, blurf)),
+    {'EXIT',{function_clause,_}} = (catch matching_and_andalso_1(<<1,2,3>>, 19)),
 
     {"abc",<<"xyz">>} = matching_and_andalso_2("abc", <<"-xyz">>),
     {"abc",<<"">>} = matching_and_andalso_2("abc", <<($a-1)>>),
@@ -845,7 +856,7 @@ otp_7188(Config) when is_list(Config) ->
 	   0,0,0,0,0,0,50,48,48,48,50,48,48,48,32,45,32,66,101,115,
 	   116,32,79,102,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
 	   32,32,12>>,
-    ?line {ok,{"ID3v1",
+    {ok,{"ID3v1",
 	       [{title,<<68,117,154,105,232,107,121>>},
 		{artist,<<"Daniel Landa">>},
 		{album,<<"Best Of">>}]}} = parse_v1_or_v11_tag(MP3).
@@ -889,11 +900,11 @@ skip_blanks_and_zero(L) ->
 -record(rec_otp_7233, {key, val}).
 
 otp_7233(Config) when is_list(Config) ->
-    ?line otp_7233_1(#rec_otp_7233{key = <<"XXabcde">>,val=[{"xxxxxxxx",42}]}),
-    ?line [<<"XXabcde">>,{"xxxxxxxx",42}] = get(io_format),
+    otp_7233_1(#rec_otp_7233{key = <<"XXabcde">>,val=[{"xxxxxxxx",42}]}),
+    [<<"XXabcde">>,{"xxxxxxxx",42}] = get(io_format),
     erase(io_format),
-    ?line otp_7233_1(#rec_otp_7233{key = <<"XXabcde">>,val=[]}),
-    ?line undefined = get(io_format),
+    otp_7233_1(#rec_otp_7233{key = <<"XXabcde">>,val=[]}),
+    undefined = get(io_format),
     ok.
 
 otp_7233_1(Rec) ->
@@ -901,32 +912,34 @@ otp_7233_1(Rec) ->
     case K of
 	<<"XX">> ->
 	    Value = Rec#rec_otp_7233.val,
-	    case lists:keysearch("xxxxxxxx", 1, Value) of
-		{value,T} -> put(io_format, [Rec#rec_otp_7233.key,T]);
-		false -> ok
+	    case lists:keyfind("xxxxxxxx", 1, Value) of
+		false ->
+		    ok;
+		T ->
+		    put(io_format, [Rec#rec_otp_7233.key,T])
 	    end;
 	_ -> ok
     end.
 
 
 otp_7240(Config) when is_list(Config) ->
-    ?line a = otp_7240_a(0, <<>>),
-    ?line b = otp_7240_a(1, 2),
+    a = otp_7240_a(0, <<>>),
+    b = otp_7240_a(1, 2),
 
-    ?line a = otp_7240_b(anything, <<>>),
-    ?line b = otp_7240_b(1, {x,y}),
+    a = otp_7240_b(anything, <<>>),
+    b = otp_7240_b(1, {x,y}),
 
-    ?line a = otp_7240_c(anything, <<>>),
-    ?line b = otp_7240_c(1, <<2>>),
+    a = otp_7240_c(anything, <<>>),
+    b = otp_7240_c(1, <<2>>),
 
-    ?line a = otp_7240_d(anything, <<>>),
-    ?line b = otp_7240_d(again, <<2>>),
+    a = otp_7240_d(anything, <<>>),
+    b = otp_7240_d(again, <<2>>),
 
-    ?line a = otp_7240_e(anything, <<>>),
-    ?line b = otp_7240_e(1, 41),
+    a = otp_7240_e(anything, <<>>),
+    b = otp_7240_e(1, 41),
 
-    ?line a = otp_7240_f(anything, <<>>),
-    ?line b = otp_7240_f(1, {}),
+    a = otp_7240_f(anything, <<>>),
+    b = otp_7240_f(1, {}),
     
     ok.
 
@@ -949,15 +962,15 @@ otp_7240_f(_, <<>>) -> a;
 otp_7240_f(1, B) when is_tuple(B) -> b.
 
 otp_7498(Config) when is_list(Config) ->
-    ?line <<1,2,3>> = otp_7498_foo(<<1,2,3>>, 0),
-    ?line <<2,3>> = otp_7498_foo(<<1,2,3>>, 1),
-    ?line <<1,2,3>> = otp_7498_foo(<<1,2,3>>, 2),
+    <<1,2,3>> = otp_7498_foo(<<1,2,3>>, 0),
+    <<2,3>> = otp_7498_foo(<<1,2,3>>, 1),
+    <<1,2,3>> = otp_7498_foo(<<1,2,3>>, 2),
 
-    ?line <<1,2,3>> = otp_7498_bar(<<1,2,3>>, 0),
-    ?line <<2,3>> = otp_7498_bar(<<1,2,3>>, 1),
-    ?line <<1,2,3>> = otp_7498_bar(<<1,2,3>>, 2),
-    ?line <<>> = otp_7498_bar(<<>>, 2),
-    ?line <<1,2,3>> = otp_7498_bar(<<1,2,3>>, 3),
+    <<1,2,3>> = otp_7498_bar(<<1,2,3>>, 0),
+    <<2,3>> = otp_7498_bar(<<1,2,3>>, 1),
+    <<1,2,3>> = otp_7498_bar(<<1,2,3>>, 2),
+    <<>> = otp_7498_bar(<<>>, 2),
+    <<1,2,3>> = otp_7498_bar(<<1,2,3>>, 3),
 
     ok.
 
@@ -986,19 +999,19 @@ match_string(Config) when is_list(Config) ->
     %% check the coverage for the v3_kernel module.
     case erlang:system_info(endian) of
 	little ->
-	    ?line do_match_string_native(<<$a,0,$b,0>>);
+	    do_match_string_native(<<$a,0,$b,0>>);
 	big ->
-	    ?line do_match_string_native(<<0,$a,0,$b>>)
+	    do_match_string_native(<<0,$a,0,$b>>)
     end,
 
-    ?line do_match_string_big(<<0,$a,0,$b>>),
-    ?line do_match_string_little(<<$a,0,$b,0>>),
+    do_match_string_big(<<0,$a,0,$b>>),
+    do_match_string_little(<<$a,0,$b,0>>),
 
-    ?line do_match_string_big_signed(<<255,255>>),
-    ?line do_match_string_little_signed(<<255,255>>),
+    do_match_string_big_signed(<<255,255>>),
+    do_match_string_little_signed(<<255,255>>),
 
-    ?line plain = no_match_string_opt(<<"abc">>),
-    ?line strange = no_match_string_opt(<<$a:9,$b:9,$c:9>>),
+    plain = no_match_string_opt(<<"abc">>),
+    strange = no_match_string_opt(<<$a:9,$b:9,$c:9>>),
 
     ok.
 
@@ -1019,13 +1032,13 @@ no_match_string_opt(<<$a:9,$b:9,$c:9>>) -> strange.
 %% OTP-7591: A zero-width segment in matching would crash the compiler.
 
 zero_width(Config) when is_list(Config) ->
-    ?line <<Len:16/little, Str:Len/binary, 0:0>> = <<2, 0, $h, $i, 0:0>>,
-    ?line 2 = Len,
-    ?line Str = <<"hi">>,
+    <<Len:16/little, Str:Len/binary, 0:0>> = <<2, 0, $h, $i, 0:0>>,
+    2 = Len,
+    Str = <<"hi">>,
 
     %% Match sure that values that cannot fit in a segment will not match.
     case id(<<0:8>>) of
-	<<256:8>> -> ?line ?t:fail();
+	<<256:8>> -> ct:fail(should_not_match);
 	_ -> ok
     end,
     ok.
@@ -1034,14 +1047,14 @@ zero_width(Config) when is_list(Config) ->
 %% OTP_7650: A invalid size for binary segments could crash the compiler.
 bad_size(Config) when is_list(Config) ->
     Tuple = {a,b,c},
-    ?line {'EXIT',{{badmatch,<<>>},_}} = (catch <<32:Tuple>> = id(<<>>)),
+    {'EXIT',{{badmatch,<<>>},_}} = (catch <<32:Tuple>> = id(<<>>)),
     Binary = <<1,2,3>>,
-    ?line {'EXIT',{{badmatch,<<>>},_}} = (catch <<32:Binary>> = id(<<>>)),
+    {'EXIT',{{badmatch,<<>>},_}} = (catch <<32:Binary>> = id(<<>>)),
     ok.
 
 haystack(Config) when is_list(Config) ->
-    ?line <<0:10/unit:8>> = haystack_1(<<0:10/unit:8>>),
-    ?line [<<0:10/unit:8>>,
+    <<0:10/unit:8>> = haystack_1(<<0:10/unit:8>>),
+    [<<0:10/unit:8>>,
 	   <<0:20/unit:8>>] = haystack_2(<<1:8192>>),
     ok.
 
@@ -1076,10 +1089,10 @@ fc(_, Args, {'EXIT',{{case_clause,ActualArgs},_}})
 %% Cover the clause handling bs_context to binary in
 %% beam_block:initialized_regs/2.
 cover_beam_bool(Config) when is_list(Config) ->
-    ?line ok = do_cover_beam_bool(<<>>, 3),
-    ?line <<19>> = do_cover_beam_bool(<<19>>, 2),
-    ?line <<42>> = do_cover_beam_bool(<<42>>, 1),
-    ?line <<17>> = do_cover_beam_bool(<<13,17>>, 0),
+    ok = do_cover_beam_bool(<<>>, 3),
+    <<19>> = do_cover_beam_bool(<<19>>, 2),
+    <<42>> = do_cover_beam_bool(<<42>>, 1),
+    <<17>> = do_cover_beam_bool(<<13,17>>, 0),
     ok.
 
 do_cover_beam_bool(Bin, X) when X > 0 ->
@@ -1225,6 +1238,21 @@ match_string_opt(Config) when is_list(Config) ->
 do_match_string_opt({<<1>>,{v,V}}=T) ->
     {x,V,T}.
 
+select_on_integer(Config) when is_list(Config) ->
+    42 = do_select_on_integer(<<42>>),
+    <<"abc">> = do_select_on_integer(<<128,"abc">>),
+
+    {'EXIT',_} = (catch do_select_on_integer(<<0:1>>)),
+    {'EXIT',_} = (catch do_select_on_integer(<<1:1>>)),
+    {'EXIT',_} = (catch do_select_on_integer(<<0:1,0:15>>)),
+    ok.
+
+%% The ASN.1 compiler frequently generates code like this.
+do_select_on_integer(<<0:1,I:7>>) ->
+    I;
+do_select_on_integer(<<1:1,_:7,Bin/binary>>) ->
+    Bin.
+
 %% If 'bin_opt_info' was given the warning would lack filename
 %% and line number.
 
@@ -1243,6 +1271,122 @@ do_map_and_binary(#{time := _} = T) ->
 do_map_and_binary(#{hour := Hour, min := Min} = T) ->
     {Hour, Min, T}.
 
+%% Unsafe caching of branch outcomes in beam_bsm would cause the
+%% delayed creation of sub-binaries optimization to be applied even
+%% when it was unsafe.
+
+unsafe_branch_caching(_Config) ->
+    <<>> = do_unsafe_branch_caching(<<42,1>>),
+    <<>> = do_unsafe_branch_caching(<<42,2>>),
+    <<>> = do_unsafe_branch_caching(<<42,3>>),
+    <<17,18>> = do_unsafe_branch_caching(<<42,3,17,18>>),
+    <<>> = do_unsafe_branch_caching(<<1,3,42,2>>),
+
+    ok.
+
+do_unsafe_branch_caching(<<Code/integer, Bin/binary>>) ->
+    <<C1/integer, B1/binary>> = Bin,
+    case C1 of
+	X when X =:= 1 orelse X =:= 2 ->
+	    Bin2 = <<>>;
+	_ ->
+	    Bin2 = B1
+    end,
+    case Code of
+	1 -> do_unsafe_branch_caching(Bin2);
+	_ -> Bin2
+    end.
+
+bad_literals(_Config) ->
+    Mod = list_to_atom(?MODULE_STRING ++ "_" ++
+			   atom_to_list(?FUNCTION_NAME)),
+    S = [signed_lit_match(V, Sz) || V <- lists:seq(-8, 8),
+				    Sz <- [0,1,2,3]] ++
+	[unsigned_lit_match(V, Sz) || V <- lists:seq(-2, 8),
+				      Sz <- [0,1,2]] ++
+	[unicode_match(V) ||
+	    V <- [-100,-1,0,1,2|lists:seq(16#10FFFC, 16#110004)]],
+    Code = ?Q(["-module('@Mod@').\n"
+	       "-export([f/0]).\n"
+	       "f() ->\n"
+	       "_@S,\n"
+	       "ok.\n"]),
+    merl:print(Code),
+    Opts = test_lib:opt_opts(?MODULE),
+    {ok,_} = merl:compile_and_load(Code, Opts),
+    Mod:f(),
+
+    {'EXIT',<<42>>} = (catch bad_literals_1()),
+
+    Sz = id(8),
+    {'EXIT',{{badmatch,_},_}} = (catch <<-1:Sz>> = <<-1>>),
+    ok.
+
+bad_literals_1() ->
+    BadSz = bad,
+    case case <<42>> of
+	     <<42:BadSz>> -> ok;
+	     Val -> exit(Val)
+	 end of
+	ok -> ok;
+	error -> error
+    end.
+
+signed_lit_match(V, Sz) ->
+    case <<V:Sz>> of
+	<<V:Sz/signed>> ->
+	    ?Q("<<_@V@:_@Sz@/signed>> = <<_@V@:_@Sz@>>");
+	_ ->
+	    ?Q(["case <<_@V@:_@Sz@>> of\n",
+		" <<_@V@:_@Sz@/signed>> ->\n",
+		"  ct:fail(should_not_match);\n",
+		" _ ->\n",
+		"  ok\n",
+		"end\n"])
+    end.
+
+unsigned_lit_match(V, Sz) ->
+    case <<V:Sz>> of
+	<<V:Sz/unsigned>> ->
+	    ?Q("<<_@V@:_@Sz@>> = <<_@V@:_@Sz@>>");
+	_ ->
+	    ?Q(["case <<_@V@:_@Sz@>> of\n",
+		" <<_@V@:_@Sz@/unsigned>> ->\n",
+		"  ct:fail(should_not_match);\n",
+		" _ ->\n",
+		"  ok\n",
+		"end\n"])
+    end.
+
+unicode_match(V) ->
+    try <<V/utf8>> of
+	<<V/utf8>> ->
+	    ?Q(["<<_@V@/utf8>> = <<_@V@/utf8>>,\n",
+		"<<_@V@/utf16>> = <<_@V@/utf16>>,\n",
+		"<<_@V@/utf32>> = <<_@V@/utf32>>\n"])
+    catch
+	error:badarg ->
+	    ?Q(["case <<_@V@:32>> of\n",
+		" <<_@V@/utf32>> ->\n",
+		"  ct:fail(should_not_match);\n",
+		" _ ->\n",
+		"  ok\n",
+		"end\n"])
+    end.
+
+%% Test a few legal but rare cases.
+
+good_literals(_Config) ->
+    Sz = id(64),
+
+    %% Variable size.
+    <<42:Sz>> = id(<<42:Sz>>),
+    <<42.0:Sz/float>> = id(<<42:Sz/float>>),
+
+    %% unit > 1
+    <<16#cafebeef:4/unit:8>> = id(<<16#cafebeef:32>>),
+    ok.
+
 
 check(F, R) ->
     R = F().
diff --git a/lib/compiler/test/bs_utf_SUITE.erl b/lib/compiler/test/bs_utf_SUITE.erl
index e6d292d9e6..518e89a9cb 100644
--- a/lib/compiler/test/bs_utf_SUITE.erl
+++ b/lib/compiler/test/bs_utf_SUITE.erl
@@ -26,7 +26,7 @@
 	 utf32_roundtrip/1,guard/1,extreme_tripping/1,
 	 literals/1,coverage/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -53,14 +53,14 @@ end_per_group(_GroupName, Config) ->
 
 
 utf8_roundtrip(Config) when is_list(Config) ->
-    ?line [utf8_roundtrip_1(P) || P <- utf_data()],
+    [utf8_roundtrip_1(P) || P <- utf_data()],
     ok.
 
 utf8_roundtrip_1({Str,Bin,Bin}) ->
-    ?line Str = utf8_to_list(Bin),
-    ?line Bin = list_to_utf8(Str),
-    ?line [ok = utf8_guard(C, <<42,C/utf8>>) || C <- Str],
-    ?line [error = utf8_guard(C, <<C/utf8>>) || C <- Str],
+    Str = utf8_to_list(Bin),
+    Bin = list_to_utf8(Str),
+    [ok = utf8_guard(C, <<42,C/utf8>>) || C <- Str],
+    [error = utf8_guard(C, <<C/utf8>>) || C <- Str],
     ok.
 
 utf8_guard(C, Bin) when <<42,C/utf8>> =:= Bin -> ok;
@@ -90,14 +90,14 @@ utf8_len(<<_/utf8,T/binary>>, N) ->
 utf8_len(<<>>, N) -> N.
 
 utf16_roundtrip(Config) when is_list(Config) ->
-    ?line {Str,Big,Big,Little,Little} = utf16_data(),
-    ?line 4 = utf16_big_len(Big),
-    ?line 4 = utf16_little_len(Little),
-    ?line Str = big_utf16_to_list(Big),
-    ?line Str = little_utf16_to_list(Little),
+    {Str,Big,Big,Little,Little} = utf16_data(),
+    4 = utf16_big_len(Big),
+    4 = utf16_little_len(Little),
+    Str = big_utf16_to_list(Big),
+    Str = little_utf16_to_list(Little),
 
-    ?line Big = list_to_big_utf16(Str),
-    ?line Little = list_to_little_utf16(Str),
+    Big = list_to_big_utf16(Str),
+    Little = list_to_little_utf16(Str),
 
     ok.
 
@@ -138,14 +138,14 @@ little_utf16_to_list(<<H/little-utf16,T/binary>>) ->
 little_utf16_to_list(<<>>) -> [].
 
 utf32_roundtrip(Config) when is_list(Config) ->
-    ?line {Str,Big,Big,Little,Little} = utf32_data(),
-    ?line 4 = utf32_big_len(Big),
-    ?line 4 = utf32_little_len(Little),
-    ?line Str = big_utf32_to_list(Big),
-    ?line Str = little_utf32_to_list(Little),
+    {Str,Big,Big,Little,Little} = utf32_data(),
+    4 = utf32_big_len(Big),
+    4 = utf32_little_len(Little),
+    Str = big_utf32_to_list(Big),
+    Str = little_utf32_to_list(Little),
 
-    ?line Big = list_to_big_utf32(Str),
-    ?line Little = list_to_little_utf32(Str),
+    Big = list_to_big_utf32(Str),
+    Little = list_to_little_utf32(Str),
 
     ok.
 
@@ -187,7 +187,7 @@ little_utf32_to_list(<<>>) -> [].
 
 
 guard(Config) when is_list(Config) ->    
-    ?line error = do_guard(16#D800),
+    error = do_guard(16#D800),
     ok.
 
 do_guard(C) when byte_size(<<C/utf8>>) =/= 42 -> ok;
@@ -199,13 +199,13 @@ do_guard(_) -> error.
 %% the delayed creation of sub-binaries works.
 
 extreme_tripping(Config) when is_list(Config) ->
-    ?line Unicode = lists:seq(0, 1024),
-    ?line Utf8 = unicode_to_utf8(Unicode, <<>>),
-    ?line Utf16 = utf8_to_utf16(Utf8, <<>>),
-    ?line Utf32 = utf8_to_utf32(Utf8, <<>>),
-    ?line Utf32 = utf16_to_utf32(Utf16, <<>>),
-    ?line Utf8 = utf32_to_utf8(Utf32, <<>>),
-    ?line Unicode = utf32_to_unicode(Utf32),
+    Unicode = lists:seq(0, 1024),
+    Utf8 = unicode_to_utf8(Unicode, <<>>),
+    Utf16 = utf8_to_utf16(Utf8, <<>>),
+    Utf32 = utf8_to_utf32(Utf8, <<>>),
+    Utf32 = utf16_to_utf32(Utf16, <<>>),
+    Utf8 = utf32_to_utf8(Utf32, <<>>),
+    Unicode = utf32_to_unicode(Utf32),
     ok.
 
 unicode_to_utf8([C|T], Bin) ->
@@ -233,58 +233,58 @@ utf32_to_unicode(<<C/utf32,T/binary>>) ->
 utf32_to_unicode(<<>>) -> [].
 
 literals(Config) when is_list(Config) ->
-    ?line abc_utf8 = match_literal(<<"abc"/utf8>>),
-    ?line abc_utf8 = match_literal(<<$a,$b,$c>>),
-
-    ?line abc_utf16be = match_literal(<<"abc"/utf16>>),
-    ?line abc_utf16be = match_literal(<<$a:16,$b:16,$c:16>>),
-    ?line abc_utf16le = match_literal(<<"abc"/little-utf16>>),
-    ?line abc_utf16le = match_literal(<<$a:16/little,$b:16/little,$c:16/little>>),
-
-    ?line abc_utf32be = match_literal(<<"abc"/utf32>>),
-    ?line abc_utf32be = match_literal(<<$a:32,$b:32,$c:32>>),
-    ?line abc_utf32le = match_literal(<<"abc"/little-utf32>>),
-    ?line abc_utf32le = match_literal(<<$a:32/little,$b:32/little,$c:32/little>>),
-
-    ?line bjorn_utf8 = match_literal(<<"bj\366rn"/utf8>>),
-    ?line bjorn_utf8 = match_literal(<<$b,$j,195,182,$r,$n>>),
-
-    ?line bjorn_utf16be = match_literal(<<"bj\366rn"/utf16>>),
-    ?line bjorn_utf16be = match_literal(<<$b:16,$j:16,246:16,$r:16,$n:16>>),
-    ?line bjorn_utf16le = match_literal(<<"bj\366rn"/little-utf16>>),
-    ?line bjorn_utf16le = match_literal(<<$b:16/little,$j:16/little,
+    abc_utf8 = match_literal(<<"abc"/utf8>>),
+    abc_utf8 = match_literal(<<$a,$b,$c>>),
+
+    abc_utf16be = match_literal(<<"abc"/utf16>>),
+    abc_utf16be = match_literal(<<$a:16,$b:16,$c:16>>),
+    abc_utf16le = match_literal(<<"abc"/little-utf16>>),
+    abc_utf16le = match_literal(<<$a:16/little,$b:16/little,$c:16/little>>),
+
+    abc_utf32be = match_literal(<<"abc"/utf32>>),
+    abc_utf32be = match_literal(<<$a:32,$b:32,$c:32>>),
+    abc_utf32le = match_literal(<<"abc"/little-utf32>>),
+    abc_utf32le = match_literal(<<$a:32/little,$b:32/little,$c:32/little>>),
+
+    bjorn_utf8 = match_literal(<<"bj\366rn"/utf8>>),
+    bjorn_utf8 = match_literal(<<$b,$j,195,182,$r,$n>>),
+
+    bjorn_utf16be = match_literal(<<"bj\366rn"/utf16>>),
+    bjorn_utf16be = match_literal(<<$b:16,$j:16,246:16,$r:16,$n:16>>),
+    bjorn_utf16le = match_literal(<<"bj\366rn"/little-utf16>>),
+    bjorn_utf16le = match_literal(<<$b:16/little,$j:16/little,
 					 246:16/little,$r:16/little,
 					 $n:16/little>>),
-    ?line <<244,143,191,191>> = <<16#10ffff/utf8>>,
+    <<244,143,191,191>> = <<16#10ffff/utf8>>,
 
     %% Invalid literals.
     I = 0,
-    ?line {'EXIT',{badarg,_}} = (catch <<(-1)/utf8,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<(-1)/utf16,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<(-1)/little-utf16,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<(-1)/utf32,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<(-1)/little-utf32,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<16#D800/utf8,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<16#D800/utf16,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<16#D800/little-utf16,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<16#D800/utf32,I/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<16#D800/little-utf32,I/utf8>>),
+    {'EXIT',{badarg,_}} = (catch <<(-1)/utf8,I/utf8>>),
+    {'EXIT',{badarg,_}} = (catch <<(-1)/utf16,I/utf8>>),
+    {'EXIT',{badarg,_}} = (catch <<(-1)/little-utf16,I/utf8>>),
+    {'EXIT',{badarg,_}} = (catch <<(-1)/utf32,I/utf8>>),
+    {'EXIT',{badarg,_}} = (catch <<(-1)/little-utf32,I/utf8>>),
+    {'EXIT',{badarg,_}} = (catch <<16#D800/utf8,I/utf8>>),
+    {'EXIT',{badarg,_}} = (catch <<16#D800/utf16,I/utf8>>),
+    {'EXIT',{badarg,_}} = (catch <<16#D800/little-utf16,I/utf8>>),
+    {'EXIT',{badarg,_}} = (catch <<16#D800/utf32,I/utf8>>),
+    {'EXIT',{badarg,_}} = (catch <<16#D800/little-utf32,I/utf8>>),
 
     B = 16#10FFFF+1,
-    ?line {'EXIT',{badarg,_}} = (catch <<B/utf8>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<B/utf16>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<B/little-utf16>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<B/utf32>>),
-    ?line {'EXIT',{badarg,_}} = (catch <<B/little-utf32>>),
+    {'EXIT',{badarg,_}} = (catch <<B/utf8>>),
+    {'EXIT',{badarg,_}} = (catch <<B/utf16>>),
+    {'EXIT',{badarg,_}} = (catch <<B/little-utf16>>),
+    {'EXIT',{badarg,_}} = (catch <<B/utf32>>),
+    {'EXIT',{badarg,_}} = (catch <<B/little-utf32>>),
 
     %% Matching of bad literals.
-    ?line error = bad_literal_match(<<237,160,128>>), %16#D800 in UTF-8
-    ?line error = bad_literal_match(<<244,144,128,128>>), %16#110000 in UTF-8
+    error = bad_literal_match(<<237,160,128>>), %16#D800 in UTF-8
+    error = bad_literal_match(<<244,144,128,128>>), %16#110000 in UTF-8
 
-    ?line error = bad_literal_match(<<16#D800:32>>),
-    ?line error = bad_literal_match(<<16#110000:32>>),
-    ?line error = bad_literal_match(<<16#D800:32/little>>),
-    ?line error = bad_literal_match(<<16#110000:32/little>>),
+    error = bad_literal_match(<<16#D800:32>>),
+    error = bad_literal_match(<<16#110000:32>>),
+    error = bad_literal_match(<<16#D800:32/little>>),
+    error = bad_literal_match(<<16#110000:32/little>>),
 
     ok.
 
@@ -307,13 +307,13 @@ bad_literal_match(_) -> error.
     
 coverage(Config) when is_list(Config) ->
     %% Cover bit syntax matching optimizations in v3_kernel.
-    ?line 0 = coverage_1(<<4096/utf8,65536/utf8,0>>),
-    ?line 1 = coverage_1(<<4096/utf8,65536/utf8,1>>),
+    0 = coverage_1(<<4096/utf8,65536/utf8,0>>),
+    1 = coverage_1(<<4096/utf8,65536/utf8,1>>),
 
-    ?line 0 = coverage_2(<<4096/utf8,65536/utf8,0>>),
-    ?line 1 = coverage_2(<<1024/utf8,1025/utf8,1>>),
+    0 = coverage_2(<<4096/utf8,65536/utf8,0>>),
+    1 = coverage_2(<<1024/utf8,1025/utf8,1>>),
 
-    ?line fc(catch coverage_3(1)),
+    fc(catch coverage_3(1)),
 
     %% Cover beam_flatten (combining the heap allocation in
     %% a subsequent test_heap instruction into the bs_init2
diff --git a/lib/compiler/test/compilation_SUITE.erl b/lib/compiler/test/compilation_SUITE.erl
index 2715a3aec5..76b7e852f1 100644
--- a/lib/compiler/test/compilation_SUITE.erl
+++ b/lib/compiler/test/compilation_SUITE.erl
@@ -20,11 +20,13 @@
 
 -module(compilation_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -compile(export_all).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,10}}].
 
 all() -> 
     test_lib:recompile(?MODULE),
@@ -164,11 +166,9 @@ split({int, N}, <<N:16,B:N/binary,T/binary>>) ->
 ?comp(on_load).
 ?comp(on_load_inline).
 
-beam_compiler_7(doc) ->
-    "Code snippet submitted from Ulf Wiger which fails in R3 Beam.";
-beam_compiler_7(suite) -> [];
+%% Code snippet submitted from Ulf Wiger which fails in R3 Beam.
 beam_compiler_7(Config) when is_list(Config) ->
-    ?line done = empty(2, false).
+    done = empty(2, false).
 
 empty(N, Toggle) when N > 0 ->
     %% R3 Beam copies the second argument to the first before call.
@@ -194,16 +194,17 @@ redundant_case_1(4) -> d;
 redundant_case_1(_) -> d.
 
 failure(Module, Conf) ->
-    ?line Src = filename:join(?config(data_dir, Conf), atom_to_list(Module)),
-    ?line Out = ?config(priv_dir,Conf),
-    ?line io:format("Compiling: ~ts\n", [Src]),
-    ?line CompRc = compile:file(Src, [{outdir,Out},return,time]),
-    ?line io:format("Result: ~p\n",[CompRc]),
-    ?line case CompRc of
-	      error -> ok;
-	      {error,Errors,_} -> check_errors(Errors);
-	      _ -> test_server:fail({no_error, CompRc})
-	  end,
+    Src = filename:join(proplists:get_value(data_dir, Conf),
+			atom_to_list(Module)),
+    Out = proplists:get_value(priv_dir, Conf),
+    io:format("Compiling: ~ts\n", [Src]),
+    CompRc = compile:file(Src, [{outdir,Out},return,time]),
+    io:format("Result: ~p\n",[CompRc]),
+    case CompRc of
+	error -> ok;
+	{error,Errors,_} -> check_errors(Errors);
+	_ -> ct:fail({no_error, CompRc})
+    end,
     ok.
 
 check_errors([{_,Eds}|T]) ->
@@ -224,7 +225,7 @@ check_error_1(Str0) ->
     io:format("~s\n", [Str]),
     case Str of
 	"internal"++_=Str ->
-	    ?t:fail(internal_compiler_error);
+	    ct:fail(internal_compiler_error);
 	_ ->
 	    ok
     end.
@@ -234,51 +235,51 @@ check_error_1(Str0) ->
 try_it(Module, Conf) ->
     %% Change 'false' to 'true' to start a new node for every module.
     try_it(false, Module, Conf).
-		       
+
 try_it(StartNode, Module, Conf) ->
-    ?line OtherOpts = [],			%Can be changed to [time] if needed
-    ?line Src = filename:join(?config(data_dir, Conf), atom_to_list(Module)),
-    ?line Out = ?config(priv_dir,Conf),
-    ?line io:format("Compiling: ~s\n", [Src]),
-    ?line CompRc0 = compile:file(Src, [clint,{outdir,Out},report,
+    try_it(StartNode, Module, {minutes,10}, Conf).
+
+try_it(StartNode, Module, Timetrap, Conf) ->
+    OtherOpts = [],			%Can be changed to [time] if needed
+    Src = filename:join(proplists:get_value(data_dir, Conf),
+			atom_to_list(Module)),
+    Out = proplists:get_value(priv_dir,Conf),
+    io:format("Compiling: ~s\n", [Src]),
+    CompRc0 = compile:file(Src, [clint,{outdir,Out},report,
 				       bin_opt_info|OtherOpts]),
-    ?line io:format("Result: ~p\n",[CompRc0]),
-    ?line {ok,_Mod} = CompRc0,
+    io:format("Result: ~p\n",[CompRc0]),
+    {ok,_Mod} = CompRc0,
 
-    ?line Dog = test_server:timetrap(test_server:minutes(10)),
     Node = case StartNode of
 	       false ->
 		   node();
 	       true ->
-		   ?line Pa = "-pa " ++ filename:dirname(code:which(?MODULE)),
-		   ?line {ok,Node0} = start_node(compiler, Pa),
+		   Pa = "-pa " ++ filename:dirname(code:which(?MODULE)),
+		   {ok,Node0} = start_node(compiler, Pa),
 		   Node0
 	   end,
 		   
-    ?line ok = rpc:call(Node, ?MODULE, load_and_call, [Out, Module]),
-    ?line load_and_call(Out, Module),
-    ?line test_server:timetrap_cancel(Dog),
+    ok = rpc:call(Node, ?MODULE, load_and_call, [Out, Module]),
+    load_and_call(Out, Module),
 
-    ?line NewDog = test_server:timetrap(test_server:minutes(10)),
-    ?line io:format("Compiling (without optimization): ~s\n", [Src]),
-    ?line CompRc1 = compile:file(Src,
+    ct:timetrap(Timetrap),
+    io:format("Compiling (without optimization): ~s\n", [Src]),
+    CompRc1 = compile:file(Src,
 				 [no_copt,no_postopt,{outdir,Out},report|OtherOpts]),
 
-    ?line io:format("Result: ~p\n",[CompRc1]),
-    ?line {ok,_Mod} = CompRc1,
-    ?line ok = rpc:call(Node, ?MODULE, load_and_call, [Out, Module]),
-    ?line test_server:timetrap_cancel(NewDog),
+    io:format("Result: ~p\n",[CompRc1]),
+    {ok,_Mod} = CompRc1,
+    ok = rpc:call(Node, ?MODULE, load_and_call, [Out, Module]),
 
-    ?line LastDog = test_server:timetrap(test_server:minutes(10)),
-    ?line io:format("Compiling (with old inliner): ~s\n", [Src]),
-    ?line CompRc2 = compile:file(Src, [{outdir,Out},report,bin_opt_info,
+    ct:timetrap(Timetrap),
+    io:format("Compiling (with old inliner): ~s\n", [Src]),
+    CompRc2 = compile:file(Src, [{outdir,Out},report,bin_opt_info,
 				       {inline,1000}|OtherOpts]),
-    ?line io:format("Result: ~p\n",[CompRc2]),
-    ?line {ok,_Mod} = CompRc2,
-    ?line ok = rpc:call(Node, ?MODULE, load_and_call, [Out, Module]),
-    ?line test_server:timetrap_cancel(LastDog),
+    io:format("Result: ~p\n",[CompRc2]),
+    {ok,_Mod} = CompRc2,
+    ok = rpc:call(Node, ?MODULE, load_and_call, [Out, Module]),
 
-    AsmDog = test_server:timetrap(test_server:minutes(10)),
+    ct:timetrap(Timetrap),
     io:format("Compiling (from assembly): ~s\n", [Src]),
     {ok,_} = compile:file(Src, [to_asm,{outdir,Out},report|OtherOpts]),
     Asm = filename:join(Out, lists:concat([Module, ".S"])),
@@ -286,28 +287,26 @@ try_it(StartNode, Module, Conf) ->
     io:format("Result: ~p\n",[CompRc3]),
     {ok,_} = CompRc3,
     ok = rpc:call(Node, ?MODULE, load_and_call, [Out, Module]),
-    test_server:timetrap_cancel(AsmDog),
 
     case StartNode of
 	false -> ok;
-	true -> ?line test_server:stop_node(Node)
+	true -> test_server:stop_node(Node)
     end,
-    ?line test_server:timetrap_cancel(LastDog),
     ok.
 
 load_and_call(Out, Module) ->
-    ?line io:format("Loading...\n",[]),
-    ?line {module,Module} = code:load_abs(filename:join(Out, Module)),
+    io:format("Loading...\n",[]),
+    {module,Module} = code:load_abs(filename:join(Out, Module)),
 
-    ?line io:format("Calling...\n",[]),
+    io:format("Calling...\n",[]),
     %% Call M:M, and expect ok back, that's our interface
-    ?line CallRc = Module:Module(),
-    ?line io:format("Got value: ~p\n",[CallRc]),
+    CallRc = Module:Module(),
+    io:format("Got value: ~p\n",[CallRc]),
 
-    ?line ok = CallRc,
+    ok = CallRc,
 
     %% Smoke-test of beam disassembler.
-    ?line test_lib:smoke_disasm(Module),
+    test_lib:smoke_disasm(Module),
 
     _ = code:delete(Module),
     _ = code:purge(Module),
@@ -330,7 +329,7 @@ start_node(Name, Args) ->
 	{ok, Node} ->
 	    {ok, Node};
 	Error  ->
-	    ?line test_server:fail(Error)
+	    ct:fail(Error)
     end.
 
 from(H, [H | T]) -> T;
@@ -338,84 +337,78 @@ from(H, [_ | T]) -> from(H, T);
 from(_, []) -> [].
 
 
-vsn_1(doc) ->
-    "Test generation of 'vsn' attribute";
-vsn_1(suite) -> [];
+%% Test generation of 'vsn' attribute.
 vsn_1(Conf) when is_list(Conf) ->
-    ?line M = vsn_1,
-
-    ?line compile_load(M, ?config(data_dir, Conf), Conf),
-    ?line Vsn1 = get_vsn(M),
-    ?line timer:sleep(1000),
-
-    ?line compile_load(M, ?config(data_dir, Conf), Conf),
-    ?line Vsn2 = get_vsn(M),
-
-    ?line compile_load(M, filename:join(?config(data_dir, Conf), "other"),
-		       Conf),
-    ?line Vsn3 = get_vsn(M),
-    ?line if
-	      Vsn1 == Vsn2, Vsn2 == Vsn3 ->
-		  ok;
-	      true ->
-		  test_server:fail({vsn, Vsn1, Vsn2, Vsn3})
-	  end,
+    M = vsn_1,
+
+    compile_load(M, proplists:get_value(data_dir, Conf), Conf),
+    Vsn1 = get_vsn(M),
+    timer:sleep(1000),
+
+    compile_load(M, proplists:get_value(data_dir, Conf), Conf),
+    Vsn2 = get_vsn(M),
+
+    compile_load(M, filename:join(proplists:get_value(data_dir, Conf),
+				  "other"),
+		 Conf),
+    Vsn3 = get_vsn(M),
+    if
+	Vsn1 == Vsn2, Vsn2 == Vsn3 ->
+	    ok;
+	true ->
+	    ct:fail({vsn, Vsn1, Vsn2, Vsn3})
+    end,
     ok.
 
-vsn_2(doc) ->
-    "Test overriding of generation of 'vsn' attribute";
-vsn_2(suite) -> [];
+%% Test overriding of generation of 'vsn' attribute.
 vsn_2(Conf) when is_list(Conf) ->
-    ?line M = vsn_2,
-
-    ?line compile_load(M, ?config(data_dir, Conf), Conf),
-    ?line Vsn = get_vsn(M),
-    ?line case Vsn of
-	      [34] ->
-		  ok;
-	      _ ->
-		  test_server:fail({vsn, Vsn})
-	  end,
+    M = vsn_2,
+
+    compile_load(M, proplists:get_value(data_dir, Conf), Conf),
+    Vsn = get_vsn(M),
+    case Vsn of
+	[34] ->
+	    ok;
+	_ ->
+	    ct:fail({vsn, Vsn})
+    end,
     ok.
 
-vsn_3(doc) ->
-    "Test that different code yields different generated 'vsn'";
-vsn_3(suite) -> [];
+%% Test that different code yields different generated 'vsn'.
 vsn_3(Conf) when is_list(Conf) ->
-    ?line M = vsn_3,
-
-    ?line compile_load(M, ?config(data_dir, Conf), Conf),
-    ?line Vsn1 = get_vsn(M),
-
-    ?line compile_load(M, filename:join(?config(data_dir, Conf), "other"),
-		       Conf),
-    ?line Vsn2 = get_vsn(M),
-    ?line if
-	      Vsn1 /= Vsn2 ->
-		  ok;
-	      true ->
-		  test_server:fail({vsn, Vsn1, Vsn2})
-	  end,
+    M = vsn_3,
+
+    compile_load(M, proplists:get_value(data_dir, Conf), Conf),
+    Vsn1 = get_vsn(M),
+
+    compile_load(M, filename:join(proplists:get_value(data_dir, Conf),
+				  "other"),
+		 Conf),
+    Vsn2 = get_vsn(M),
+    if
+	Vsn1 /= Vsn2 ->
+	    ok;
+	true ->
+	    ct:fail({vsn, Vsn1, Vsn2})
+    end,
     ok.
 
 get_vsn(M) ->
-    {value, {vsn, V}} = lists:keysearch(vsn, 1, M:module_info(attributes)),
+    {vsn,V} = lists:keyfind(vsn, 1, M:module_info(attributes)),
     V.
 
 long_string(Config) when is_list(Config) ->
     %% The test must complete in one minute - it should be plenty of time.
-    ?line Dog = test_server:timetrap(test_server:minutes(1)),
-    ?line try_it(long_string, Config),
-    ?line test_server:timetrap_cancel(Dog),
+    try_it(false, long_string, {minutes,1}, Config),
     ok.
 
 compile_load(Module, Dir, Conf) ->
-    ?line Src = filename:join(Dir, atom_to_list(Module)),
-    ?line Out = ?config(priv_dir,Conf),
-    ?line CompRc = compile:file(Src, [{outdir,Out}]),
-    ?line {ok, Module} = CompRc,
-    ?line code:purge(Module),
-    ?line {module, Module} =
+    Src = filename:join(Dir, atom_to_list(Module)),
+    Out = proplists:get_value(priv_dir,Conf),
+    CompRc = compile:file(Src, [{outdir,Out}]),
+    {ok, Module} = CompRc,
+    code:purge(Module),
+    {module, Module} =
 	code:load_abs(filename:join(Out, atom_to_list(Module))),
     ok.
 
@@ -428,9 +421,9 @@ self_compile_old_inliner(Config) when is_list(Config) ->
     self_compile_1(Config, "old", [verbose,{inline,500}]).
 
 self_compile_1(Config, Prefix, Opts) ->
-    Dog = test_server:timetrap(test_server:minutes(40)),
+    ct:timetrap({minutes,40}),
 
-    Priv = ?config(priv_dir,Config),
+    Priv = proplists:get_value(priv_dir,Config),
     Version = compiler_version(),
 
     %% Compile the compiler. (In this node to get better coverage.)
@@ -449,11 +442,10 @@ self_compile_1(Config, Prefix, Opts) ->
     %% be equal (except for beam_asm that contains the compiler version).
     compare_compilers(CompA, CompB),
 
-    test_server:timetrap_cancel(Dog),
     ok.
 
 self_compile_node(CompilerDir, OutDir, Version, Opts) ->
-    Dog = test_server:timetrap(test_server:minutes(15)),
+    ct:timetrap({minutes,15}),
     Pa = "-pa " ++ filename:dirname(code:which(?MODULE)) ++
 	" -pa " ++ CompilerDir,
     Files = compiler_src(),
@@ -462,11 +454,11 @@ self_compile_node(CompilerDir, OutDir, Version, Opts) ->
     %% because it will load the same cover-compiled code as on this
     %% node. Use a shielded node to prevent the cover server from
     %% being started.
-    ?t:run_on_shielded_node(
-       fun() ->
-	       compile_compiler(Files, OutDir, Version, Opts)
-       end, Pa),
-    test_server:timetrap_cancel(Dog),
+    test_server:run_on_shielded_node(
+      fun() ->
+	      compile_compiler(Files, OutDir, Version, Opts)
+      end, Pa),
+
     ok.
 
 compile_compiler(Files, OutDir, Version, InlineOpts) ->
@@ -619,11 +611,11 @@ otp_7345(ObjRef, _RdEnv, Args) ->
 %% Check the generation of the string table.
 
 string_table(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line File = filename:join(DataDir, "string_table.erl"),
-    ?line {ok,string_table,Beam,[]} = compile:file(File, [return, binary]),
-    ?line {ok,{string_table,[StringTableChunk]}} = beam_lib:chunks(Beam, ["StrT"]),
-    ?line {"StrT", <<"stringtable">>} = StringTableChunk,
+    DataDir = proplists:get_value(data_dir, Config),
+    File = filename:join(DataDir, "string_table.erl"),
+    {ok,string_table,Beam,[]} = compile:file(File, [return, binary]),
+    {ok,{string_table,[StringTableChunk]}} = beam_lib:chunks(Beam, ["StrT"]),
+    {"StrT", <<"stringtable">>} = StringTableChunk,
     ok.
 
 otp_8949_a(Config) when is_list(Config) ->
@@ -650,8 +642,8 @@ do_otp_8949_a() ->
     
 otp_8949_b(Config) when is_list(Config) ->
     self() ! something,
-    ?line value = otp_8949_b([], false),
-    ?line {'EXIT',_} = (catch otp_8949_b([], true)),
+    value = otp_8949_b([], false),
+    {'EXIT',_} = (catch otp_8949_b([], true)),
     ok.
 
 %% Would cause an endless loop in beam_utils.
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index cbdd9ce8cd..f1e75771bf 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -21,7 +21,8 @@
 
 %% Tests compile:file/1 and compile:file/2 with various options.
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
+-include_lib("stdlib/include/erl_compile.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
@@ -29,10 +30,10 @@
 	 file_1/1, forms_2/1, module_mismatch/1, big_file/1, outdir/1,
 	 binary/1, makedep/1, cond_and_ifdef/1, listings/1, listings_big/1,
 	 other_output/1, encrypted_abstr/1,
-	 bad_record_use1/1, bad_record_use2/1, strict_record/1,
+	 strict_record/1,
 	 missing_testheap/1, cover/1, env/1, core/1, asm/1,
 	 sys_pre_attributes/1, dialyzer/1,
-	 warnings/1
+	 warnings/1, pre_load_check/1
 	]).
 
 -export([init/3]).
@@ -48,13 +49,12 @@ all() ->
     [app_test, appup_test, file_1, forms_2, module_mismatch, big_file, outdir,
      binary, makedep, cond_and_ifdef, listings, listings_big,
      other_output, encrypted_abstr,
-     {group, bad_record_use}, strict_record,
+     strict_record,
      missing_testheap, cover, env, core, asm,
-     sys_pre_attributes, dialyzer, warnings].
+     sys_pre_attributes, dialyzer, warnings, pre_load_check].
 
 groups() -> 
-    [{bad_record_use, [],
-      [bad_record_use1, bad_record_use2]}].
+    [].
 
 init_per_suite(Config) ->
     Config.
@@ -72,71 +72,94 @@ end_per_group(_GroupName, Config) ->
 
 %% Test that the Application file has no `basic' errors.";
 app_test(Config) when is_list(Config) ->
-    ?line ?t:app_test(compiler).
+    test_server:app_test(compiler).
 
 %% Test that the Application upgrade file has no `basic' errors.";
 appup_test(Config) when is_list(Config) ->
-    ok = ?t:appup_test(compiler).
+    ok = test_server:appup_test(compiler).
 
 %% Tests that we can compile and run a simple Erlang program,
 %% using compile:file/1.
 
 file_1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(5)),
-
     process_flag(trap_exit, true),
 
-    ?line {Simple, Target} = files(Config, "file_1"),
-    ?line {ok, Cwd} = file:get_cwd(),
-    ?line ok = file:set_cwd(filename:dirname(Target)),
+    {Simple, Target} = get_files(Config, simple, "file_1"),
+    {ok, Cwd} = file:get_cwd(),
+    ok = file:set_cwd(filename:dirname(Target)),
 
     %% Native from BEAM without compilation info.
-    ?line {ok,simple} = compile:file(Simple, [slim]), %Smoke test only.
-    ?line {ok,simple} = compile:file(Target, [native,from_beam]), %Smoke test.
+    {ok,simple} = compile:file(Simple, [slim]), %Smoke test only.
+    {ok,simple} = compile:file(Target, [native,from_beam]), %Smoke test.
 
     %% Native from BEAM with compilation info.
-    ?line {ok,simple} = compile:file(Simple),	%Smoke test only.
-    ?line {ok,simple} = compile:file(Target, [native,from_beam]), %Smoke test.
+    {ok,simple} = compile:file(Simple),	%Smoke test only.
+    {ok,simple} = compile:file(Target, [native,from_beam]), %Smoke test.
 
-    ?line {ok,simple} = compile:file(Simple, [native,report]), %Smoke test.
+    {ok,simple} = compile:file(Simple, [native,report]), %Smoke test.
 
-    ?line compile_and_verify(Simple, Target, []),
-    ?line compile_and_verify(Simple, Target, [native]),
-    ?line compile_and_verify(Simple, Target, [debug_info]),
-    ?line {ok,simple} = compile:file(Simple, [no_line_info]), %Coverage
+    compile_and_verify(Simple, Target, []),
+    compile_and_verify(Simple, Target, [native]),
+    compile_and_verify(Simple, Target, [debug_info]),
+    {ok,simple} = compile:file(Simple, [no_line_info]), %Coverage
 
     {ok,simple} = compile:file(Simple, [{eprof,beam_z}]), %Coverage
 
-    ?line ok = file:set_cwd(Cwd),
-    ?line true = exists(Target),
-    ?line passed = run(Target, test, []),
+    ok = file:set_cwd(Cwd),
+    true = exists(Target),
+    passed = run(Target, test, []),
 
     %% Cleanup.
-    ?line ok = file:delete(Target),
-    ?line ok = file:del_dir(filename:dirname(Target)),
+    ok = file:delete(Target),
+    ok = file:del_dir(filename:dirname(Target)),
 
     %% There should not be any messages in the messages.
     receive
 	Any ->
-	    ?t:fail({unexpected,Any})
+	    ct:fail({unexpected,Any})
     after 10 ->
 	    ok
     end,
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 forms_2(Config) when is_list(Config) ->
     Src = "/foo/bar",
     AbsSrc = filename:absname(Src),
     Anno = erl_anno:new(1),
-    {ok,simple,Binary} = compile:forms([{attribute,Anno,module,simple}],
-				       [binary,{source,Src}]),
-    code:load_binary(simple, Src, Binary),
-    Info = simple:module_info(compile),
+    SimpleCode = [{attribute,Anno,module,simple}],
+    {ok,simple,Bin1} = compile:forms(SimpleCode, [binary,{source,Src}]),
+
+    %% Load and test that the proper source is returned.
+    AbsSrc = forms_load_code(simple, Src, Bin1),
+
+    %% Work in a deleted directory.
+    PrivDir = proplists:get_value(priv_dir, Config),
+    WorkDir = filename:join(PrivDir, ?FUNCTION_NAME),
+    ok = file:make_dir(WorkDir),
+    ok = file:set_cwd(WorkDir),
+    case os:type() of
+	{unix,_} -> os:cmd("rm -rf " ++ WorkDir);
+	_ -> ok
+    end,
+    {ok,simple,Bin2} = compile:forms(SimpleCode),
+    undefined = forms_load_code(simple, "ignore", Bin2),
+
+    {ok,simple,Bin3} = compile:forms(SimpleCode, [{source,Src},report]),
+    case forms_load_code(simple, "ignore", Bin3) of
+	Src ->					%Unix.
+	    ok;
+	AbsSrc ->				%Windows.
+	    ok
+    end,
+
+    ok.
+
 
-    %% Test that the proper source is returned.
-    AbsSrc = proplists:get_value(source, Info),
+forms_load_code(Mod, Src, Bin) ->
+    {module,Mod} = code:load_binary(Mod, Src, Bin),
+    Info = Mod:module_info(compile),
+    SourceOption = proplists:get_value(source, Info),
 
     %% Ensure that the options are not polluted with 'source'.
     [] = proplists:get_value(options, Info),
@@ -144,124 +167,115 @@ forms_2(Config) when is_list(Config) ->
     %% Cleanup.
     true = code:delete(simple),
     false = code:purge(simple),
-    ok.
+
+    SourceOption.
+
 
 module_mismatch(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line File = filename:join(DataDir, "wrong_module_name.erl"),
+    DataDir = proplists:get_value(data_dir, Config),
+    File = filename:join(DataDir, "wrong_module_name.erl"),
     {error,[{"wrong_module_name.beam",
 	     [{none,compile,{module_name,arne,"wrong_module_name"}}]}],
 	   []} = compile:file(File, [return]),
-    ?line error = compile:file(File, [report]),
+    error = compile:file(File, [report]),
 
-    ?line {ok,arne,[]} = compile:file(File,
+    {ok,arne,[]} = compile:file(File,
 				      [return,no_error_module_mismatch]),
 
     ok.
 
 big_file(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(5)),
-    ?line DataDir = ?config(data_dir, Config),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Big = filename:join(DataDir, "big.erl"),
-    ?line Target = filename:join(PrivDir, "big.beam"),
-    ?line ok = file:set_cwd(PrivDir),
-    ?line compile_and_verify(Big, Target, []),
-    ?line compile_and_verify(Big, Target, [debug_info]),
-    ?line compile_and_verify(Big, Target, [no_postopt]),
+    {Big,Target} = get_files(Config, big, "big_file"),
+    ok = file:set_cwd(filename:dirname(Target)),
+    compile_and_verify(Big, Target, []),
+    compile_and_verify(Big, Target, [debug_info]),
+    compile_and_verify(Big, Target, [no_postopt]),
 
     %% Cleanup.
-    ?line ok = file:delete(Target),
-    ?line test_server:timetrap_cancel(Dog),
+    ok = file:delete(Target),
     ok.
 
 %% Tests that the {outdir, Dir} option works.
 
 outdir(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
-    ?line {Simple, Target} = files(Config, "outdir"),
-    ?line {ok, simple} = compile:file(Simple, [{outdir, filename:dirname(Target)}]),
-    ?line true = exists(Target),
-    ?line passed = run(Target, test, []),
-    ?line ok = file:delete(Target),
-    ?line ok = file:del_dir(filename:dirname(Target)),
-    ?line test_server:timetrap_cancel(Dog),
+    {Simple, Target} = get_files(Config, simple, "outdir"),
+    {ok, simple} = compile:file(Simple, [{outdir, filename:dirname(Target)}]),
+    true = exists(Target),
+    passed = run(Target, test, []),
+    ok = file:delete(Target),
+    ok = file:del_dir(filename:dirname(Target)),
     ok.
 
 %% Tests that the binary option works.
 
 binary(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
-    ?line {Simple, Target} = files(Config, "binary"),
-    ?line {ok, simple, Binary} = compile:file(Simple, [binary]),
-    ?line code:load_binary(simple, Target, Binary),
-    ?line passed = simple:test(),
-    ?line true = code:delete(simple),
-    ?line false = code:purge(simple),
-    ?line ok = file:del_dir(filename:dirname(Target)),
-    ?line test_server:timetrap_cancel(Dog),
+    {Simple, Target} = get_files(Config, simple, "binary"),
+    {ok, simple, Binary} = compile:file(Simple, [binary]),
+    code:load_binary(simple, Target, Binary),
+    passed = simple:test(),
+    true = code:delete(simple),
+    false = code:purge(simple),
+    ok = file:del_dir(filename:dirname(Target)),
     ok.
 
 %% Tests that the dependencies-Makefile-related options work.
 
 makedep(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
-    ?line {Simple,Target} = files(Config, "makedep"),
-    ?line DataDir = ?config(data_dir, Config),
-    ?line SimpleRootname = filename:rootname(Simple),
-    ?line IncludeDir = filename:join(filename:dirname(Simple), "include"),
-    ?line IncludeOptions = [
-      {d,need_foo},
-      {d,foo_value,42},
-      {d,include_generated},
-      {i,IncludeDir}
-    ],
+    {Simple,Target} = get_files(Config, simple, "makedep"),
+    DataDir = proplists:get_value(data_dir, Config),
+    SimpleRootname = filename:rootname(Simple),
+    IncludeDir = filename:join(filename:dirname(Simple), "include"),
+    IncludeOptions = [
+		      {d,need_foo},
+		      {d,foo_value,42},
+		      {d,include_generated},
+		      {i,IncludeDir}
+		     ],
     %% Basic rule.
-    ?line BasicMf1Name = SimpleRootname ++ "-basic1.mk",
-    ?line {ok,BasicMf1} = file:read_file(BasicMf1Name),
-    ?line {ok,_,Mf1} = compile:file(Simple, [binary,makedep]),
-    ?line BasicMf1 = makedep_canonicalize_result(Mf1, DataDir),
+    BasicMf1Name = SimpleRootname ++ "-basic1.mk",
+    {ok,BasicMf1} = file:read_file(BasicMf1Name),
+    {ok,_,Mf1} = compile:file(Simple, [binary,makedep]),
+    BasicMf1 = makedep_canonicalize_result(Mf1, DataDir),
     %% Basic rule with one existing header.
-    ?line BasicMf2Name = SimpleRootname ++ "-basic2.mk",
-    ?line {ok,BasicMf2} = file:read_file(BasicMf2Name),
-    ?line {ok,_,Mf2} = compile:file(Simple, [binary,makedep|IncludeOptions]),
-    ?line BasicMf2 = makedep_canonicalize_result(Mf2, DataDir),
+    BasicMf2Name = SimpleRootname ++ "-basic2.mk",
+    {ok,BasicMf2} = file:read_file(BasicMf2Name),
+    {ok,_,Mf2} = compile:file(Simple, [binary,makedep|IncludeOptions]),
+    BasicMf2 = makedep_canonicalize_result(Mf2, DataDir),
     %% Rule with one existing header and one missing header.
-    ?line MissingMfName = SimpleRootname ++ "-missing.mk",
-    ?line {ok,MissingMf} = file:read_file(MissingMfName),
-    ?line {ok,_,Mf3} = compile:file(Simple,
+    MissingMfName = SimpleRootname ++ "-missing.mk",
+    {ok,MissingMf} = file:read_file(MissingMfName),
+    {ok,_,Mf3} = compile:file(Simple,
       [binary,makedep,makedep_add_missing|IncludeOptions]),
-    ?line MissingMf = makedep_canonicalize_result(Mf3, DataDir),
+    MissingMf = makedep_canonicalize_result(Mf3, DataDir),
     %% Rule with modified target.
-    ?line TargetMf1Name = SimpleRootname ++ "-target1.mk",
-    ?line {ok,TargetMf1} = file:read_file(TargetMf1Name),
-    ?line {ok,_,Mf4} = compile:file(Simple,
+    TargetMf1Name = SimpleRootname ++ "-target1.mk",
+    {ok,TargetMf1} = file:read_file(TargetMf1Name),
+    {ok,_,Mf4} = compile:file(Simple,
       [binary,makedep,{makedep_target,"$target"}|IncludeOptions]),
-    ?line TargetMf1 = makedep_modify_target(
+    TargetMf1 = makedep_modify_target(
       makedep_canonicalize_result(Mf4, DataDir), "$$target"),
     %% Rule with quoted modified target.
-    ?line TargetMf2Name = SimpleRootname ++ "-target2.mk",
-    ?line {ok,TargetMf2} = file:read_file(TargetMf2Name),
-    ?line {ok,_,Mf5} = compile:file(Simple,
+    TargetMf2Name = SimpleRootname ++ "-target2.mk",
+    {ok,TargetMf2} = file:read_file(TargetMf2Name),
+    {ok,_,Mf5} = compile:file(Simple,
       [binary,makedep,{makedep_target,"$target"},makedep_quote_target|
         IncludeOptions]),
-    ?line TargetMf2 = makedep_modify_target(
+    TargetMf2 = makedep_modify_target(
       makedep_canonicalize_result(Mf5, DataDir), "$$target"),
     %% Basic rule written to some file.
-    ?line {ok,_} = compile:file(Simple,
+    {ok,_} = compile:file(Simple,
       [makedep,{makedep_output,Target}|IncludeOptions]),
-    ?line {ok,Mf6} = file:read_file(Target),
-    ?line BasicMf2 = makedep_canonicalize_result(Mf6, DataDir),
+    {ok,Mf6} = file:read_file(Target),
+    BasicMf2 = makedep_canonicalize_result(Mf6, DataDir),
     %% Rule with creating phony target.
-    ?line PhonyMfName = SimpleRootname ++ "-phony.mk",
-    ?line {ok,PhonyMf} = file:read_file(PhonyMfName),
-    ?line {ok,_,Mf7} = compile:file(Simple,
+    PhonyMfName = SimpleRootname ++ "-phony.mk",
+    {ok,PhonyMf} = file:read_file(PhonyMfName),
+    {ok,_,Mf7} = compile:file(Simple,
       [binary,makedep,makedep_phony|IncludeOptions]),
-    ?line PhonyMf = makedep_canonicalize_result(Mf7, DataDir),
+    PhonyMf = makedep_canonicalize_result(Mf7, DataDir),
 
-    ?line ok = file:delete(Target),
-    ?line ok = file:del_dir(filename:dirname(Target)),
-    ?line test_server:timetrap_cancel(Dog),
+    ok = file:delete(Target),
+    ok = file:del_dir(filename:dirname(Target)),
     ok.
 
 makedep_canonicalize_result(Mf, DataDir) ->
@@ -281,30 +295,26 @@ makedep_modify_target(Mf, Target) ->
 %% Tests that conditional compilation, defining values, including files work.
 
 cond_and_ifdef(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
-    ?line {Simple, Target} = files(Config, "cond_and_ifdef"),
-    ?line IncludeDir = filename:join(filename:dirname(Simple), "include"),
-    ?line Options = [{outdir, filename:dirname(Target)},
+    {Simple, Target} = get_files(Config, simple, "cond_and_ifdef"),
+    IncludeDir = filename:join(filename:dirname(Simple), "include"),
+    Options = [{outdir, filename:dirname(Target)},
 		     {d, need_foo}, {d, foo_value, 42},
 		     {i, IncludeDir}, report],
-    ?line {ok, simple} = compile:file(Simple, Options),
-    ?line true = exists(Target),
-    ?line {hiker, 42} = run(Target, foo, []),
-    ?line ok = file:delete(Target),
-    ?line ok = file:del_dir(filename:dirname(Target)),
-    ?line test_server:timetrap_cancel(Dog),
+    {ok, simple} = compile:file(Simple, Options),
+    true = exists(Target),
+    {hiker, 42} = run(Target, foo, []),
+    ok = file:delete(Target),
+    ok = file:del_dir(filename:dirname(Target)),
     ok.
 
 listings(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:minutes(8)),
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     ok = do_file_listings(DataDir, PrivDir, [
 	    "simple",
 	    "small",
 	    "small_maps"
 	]),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 do_file_listings(_, _, []) -> ok;
@@ -330,6 +340,8 @@ do_file_listings(DataDir, PrivDir, [File|Files]) ->
     do_listing(Simple, TargetDir, dlife, ".life"),
     do_listing(Simple, TargetDir, dcg, ".codegen"),
     do_listing(Simple, TargetDir, dblk, ".block"),
+    do_listing(Simple, TargetDir, dexcept, ".except"),
+    do_listing(Simple, TargetDir, dbs, ".bs"),
     do_listing(Simple, TargetDir, dbool, ".bool"),
     do_listing(Simple, TargetDir, dtype, ".type"),
     do_listing(Simple, TargetDir, ddead, ".dead"),
@@ -359,159 +371,146 @@ do_file_listings(DataDir, PrivDir, [File|Files]) ->
     do_file_listings(DataDir,PrivDir,Files).
 
 listings_big(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(10)),
-    ?line DataDir = ?config(data_dir, Config),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Big = filename:join(DataDir, big),
-    ?line TargetDir = filename:join(PrivDir, listings_big),
-    ?line ok = file:make_dir(TargetDir),
-    ?line do_listing(Big, TargetDir, 'S'),
-    ?line do_listing(Big, TargetDir, 'E'),
-    ?line do_listing(Big, TargetDir, 'P'),
-    ?line do_listing(Big, TargetDir, dkern, ".kernel"),
-
-    ?line Target = filename:join(TargetDir, big),
-    {ok,big} = compile:file(Target, [from_asm,{outdir,TargetDir}]),
+    {Big,Target} = get_files(Config, big, listings_big),
+    TargetDir = filename:dirname(Target),
+    do_listing(Big, TargetDir, 'S'),
+    do_listing(Big, TargetDir, 'E'),
+    do_listing(Big, TargetDir, 'P'),
+    do_listing(Big, TargetDir, dkern, ".kernel"),
+
+    TargetNoext = filename:rootname(Target, code:objfile_extension()),
+    {ok,big} = compile:file(TargetNoext, [from_asm,{outdir,TargetDir}]),
 
     %% Cleanup.
-    ?line ok = file:delete(Target ++ ".beam"),
-    ?line lists:foreach(fun(F) -> ok = file:delete(F) end,
-			filelib:wildcard(filename:join(TargetDir, "*"))),
-    ?line ok = file:del_dir(TargetDir),
-    ?line test_server:timetrap_cancel(Dog),
+    ok = file:delete(Target),
+    lists:foreach(fun(F) -> ok = file:delete(F) end,
+		  filelib:wildcard(filename:join(TargetDir, "*"))),
+    ok = file:del_dir(TargetDir),
     ok.
 
 other_output(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(8)),
-    ?line DataDir = ?config(data_dir, Config),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Simple = filename:join(DataDir, simple),
-    ?line TargetDir = filename:join(PrivDir, other_output),
-    ?line ok = file:make_dir(TargetDir),
+    {Simple,_Target} = get_files(Config, simple, "other_output"),
 
     io:put_chars("to_pp"),
-    ?line {ok,[],PP} = compile:file(Simple, [to_pp,binary,time]),
-    ?line [] = [E || E <- PP,
-		     begin
-			 case element(1, E) of
-			     attribute -> false;
-			     function -> false;
-			     eof -> false
-			 end
-		     end],
+    {ok,[],PP} = compile:file(Simple, [to_pp,binary,time]),
+    [] = [E || E <- PP,
+	       begin
+		   case element(1, E) of
+		       attribute -> false;
+		       function -> false;
+		       eof -> false
+		   end
+	       end],
 
     io:put_chars("to_exp (file)"),
-    ?line {ok,simple,Expand} = compile:file(Simple, [to_exp,binary,time]),
-    ?line case Expand of
-	      {simple,Exports,Forms} when is_list(Exports), is_list(Forms) -> ok
-	  end,
+    {ok,simple,Expand} = compile:file(Simple, [to_exp,binary,time]),
+    case Expand of
+	{simple,Exports,Forms} when is_list(Exports), is_list(Forms) -> ok
+    end,
     io:put_chars("to_exp (forms)"),
-    ?line {ok,simple,Expand} = compile:forms(PP, [to_exp,binary,time]),
+    {ok,simple,Expand} = compile:forms(PP, [to_exp,binary,time]),
 
     io:put_chars("to_core (file)"),
-    ?line {ok,simple,Core} = compile:file(Simple, [to_core,binary,time]),
-    ?line c_module = element(1, Core),
-    ?line {ok,_} = core_lint:module(Core),
+    {ok,simple,Core} = compile:file(Simple, [to_core,binary,time]),
+    c_module = element(1, Core),
+    {ok,_} = core_lint:module(Core),
     io:put_chars("to_core (forms)"),
-    ?line {ok,simple,Core} = compile:forms(PP, [to_core,binary,time]),
+    {ok,simple,Core} = compile:forms(PP, [to_core,binary,time]),
 
     io:put_chars("to_kernel (file)"),
-    ?line {ok,simple,Kernel} = compile:file(Simple, [to_kernel,binary,time]),
-    ?line k_mdef = element(1, Kernel),
+    {ok,simple,Kernel} = compile:file(Simple, [to_kernel,binary,time]),
+    k_mdef = element(1, Kernel),
     io:put_chars("to_kernel (forms)"),
-    ?line {ok,simple,Kernel} = compile:forms(PP, [to_kernel,binary,time]),
+    {ok,simple,Kernel} = compile:forms(PP, [to_kernel,binary,time]),
 
     io:put_chars("to_asm (file)"),
-    ?line {ok,simple,Asm} = compile:file(Simple, [to_asm,binary,time]),
-    ?line {simple,_,_,_,_} = Asm,
+    {ok,simple,Asm} = compile:file(Simple, [to_asm,binary,time]),
+    {simple,_,_,_,_} = Asm,
     io:put_chars("to_asm (forms)"),
-    ?line {ok,simple,Asm} = compile:forms(PP, [to_asm,binary,time]),
+    {ok,simple,Asm} = compile:forms(PP, [to_asm,binary,time]),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 encrypted_abstr(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(10)),
-    ?line {Simple,Target} = files(Config, "encrypted_abstr"),
+    {Simple,Target} = get_files(Config, simple, "encrypted_abstr"),
 
     Res = case has_crypto() of
 	      false ->
 		  %% No crypto.
-		  ?line encrypted_abstr_no_crypto(Simple, Target),
+		  encrypted_abstr_no_crypto(Simple, Target),
 		  {comment,"The crypto application is missing or broken"};
 	      true ->
 		  %% Simulate not having crypto by removing
 		  %% the crypto application from the path.
-		  ?line OldPath = code:get_path(),
+		  OldPath = code:get_path(),
 		  try
-		      ?line NewPath = OldPath -- [filename:dirname(code:which(crypto))],
-		      ?line (catch crypto:stop()),
-		      ?line code:delete(crypto),
-		      ?line code:purge(crypto),
-		      ?line code:set_path(NewPath),
-		      ?line encrypted_abstr_no_crypto(Simple, Target)
+		      NewPath = OldPath -- [filename:dirname(code:which(crypto))],
+		      (catch crypto:stop()),
+		      code:delete(crypto),
+		      code:purge(crypto),
+		      code:set_path(NewPath),
+		      encrypted_abstr_no_crypto(Simple, Target)
 		      after
 			  code:set_path(OldPath)
 		      end,
 
 		  %% Now run the tests that require crypto.
-		  ?line encrypted_abstr_1(Simple, Target),
-		  ?line ok = file:delete(Target),
-		  ?line ok = file:del_dir(filename:dirname(Target))
+		  encrypted_abstr_1(Simple, Target),
+		  ok = file:delete(Target),
+		  ok = file:del_dir(filename:dirname(Target))
 	  end,
     
     %% Cleanup.
-    ?line test_server:timetrap_cancel(Dog),
     Res.
 
 encrypted_abstr_1(Simple, Target) ->
-    ?line TargetDir = filename:dirname(Target),
-    ?line Key = "ablurf123BX#$;3",
-    ?line install_crypto_key(Key),
-    ?line {ok,simple} = compile:file(Simple,
+    TargetDir = filename:dirname(Target),
+    Key = "ablurf123BX#$;3",
+    install_crypto_key(Key),
+    {ok,simple} = compile:file(Simple,
 				     [debug_info,{debug_info_key,Key},
 				      {outdir,TargetDir}]),
-    ?line verify_abstract(Target),
+    verify_abstract(Target),
 
-    ?line {ok,simple} = compile:file(Simple,
+    {ok,simple} = compile:file(Simple,
 				     [{debug_info_key,Key},
 				      {outdir,TargetDir}]),
-    ?line verify_abstract(Target),
+    verify_abstract(Target),
 
-    ?line {ok,simple} = compile:file(Simple,
+    {ok,simple} = compile:file(Simple,
 				     [debug_info,{debug_info_key,{des3_cbc,Key}},
 				      {outdir,TargetDir}]),
-    ?line verify_abstract(Target),
+    verify_abstract(Target),
 
-    ?line {ok,{simple,[{compile_info,CInfo}]}} = 
+    {ok,{simple,[{compile_info,CInfo}]}} =
 	beam_lib:chunks(Target, [compile_info]),
-    ?line {value,{_,Opts}} = lists:keysearch(options, 1, CInfo),
-    ?line {value,{_,'********'}} = lists:keysearch(debug_info_key, 1, Opts),
+    {_,Opts} = lists:keyfind(options, 1, CInfo),
+    {_,'********'} = lists:keyfind(debug_info_key, 1, Opts),
 
     %% Try some illegal forms of crypto keys.
-    ?line error = compile:file(Simple,
+    error = compile:file(Simple,
 			       [debug_info,{debug_info_key,{blurf,"ss"}},report]),
-    ?line error = compile:file(Simple,
+    error = compile:file(Simple,
 			       [debug_info,{debug_info_key,{blurf,1,"ss"}},report]),
-    ?line error = compile:file(Simple,
+    error = compile:file(Simple,
 			       [debug_info,{debug_info_key,42},report]),
 
     %% Place the crypto key in .erlang.crypt.
-    ?line beam_lib:clear_crypto_key_fun(),
-    ?line {ok,OldCwd} = file:get_cwd(),
-    ?line ok = file:set_cwd(TargetDir),
-
-    ?line error = compile:file(Simple, [encrypt_debug_info,report]),
-
-    ?line NewKey = "better use another key here",
-    ?line write_crypt_file(["[{debug_info,des3_cbc,simple,\"",NewKey,"\"}].\n"]),
-    ?line {ok,simple} = compile:file(Simple, [encrypt_debug_info,report]),
-    ?line verify_abstract("simple.beam"),
-    ?line ok = file:delete(".erlang.crypt"),
-    ?line beam_lib:clear_crypto_key_fun(),
-    ?line {error,beam_lib,{key_missing_or_invalid,"simple.beam",abstract_code}} =
+    beam_lib:clear_crypto_key_fun(),
+    {ok,OldCwd} = file:get_cwd(),
+    ok = file:set_cwd(TargetDir),
+
+    error = compile:file(Simple, [encrypt_debug_info,report]),
+
+    NewKey = "better use another key here",
+    write_crypt_file(["[{debug_info,des3_cbc,simple,\"",NewKey,"\"}].\n"]),
+    {ok,simple} = compile:file(Simple, [encrypt_debug_info,report]),
+    verify_abstract("simple.beam"),
+    ok = file:delete(".erlang.crypt"),
+    beam_lib:clear_crypto_key_fun(),
+    {error,beam_lib,{key_missing_or_invalid,"simple.beam",abstract_code}} =
 	beam_lib:chunks("simple.beam", [abstract_code]),
-    ?line ok = file:set_cwd(OldCwd),
+    ok = file:set_cwd(OldCwd),
 
     %% Test key compatibility by reading a BEAM file produced before
     %% the update to the new crypto functions.
@@ -532,9 +531,9 @@ write_crypt_file(Contents0) ->
 
 encrypted_abstr_no_crypto(Simple, Target) ->
     io:format("simpe: ~p~n", [Simple]),
-    ?line TargetDir = filename:dirname(Target),
-    ?line Key = "ablurf123BX#$;3",
-    ?line error = compile:file(Simple,
+    TargetDir = filename:dirname(Target),
+    Key = "ablurf123BX#$;3",
+    error = compile:file(Simple,
 			       [debug_info,{debug_info_key,Key},
 				{outdir,TargetDir},report]),
     ok.
@@ -562,7 +561,7 @@ install_crypto_key(Key) ->
 
 %% Miscellanous tests, mainly to get better coverage.
 cover(Config) when is_list(Config) ->
-    ?line io:format("~p\n", [compile:options()]),
+    io:format("~p\n", [compile:options()]),
     ok.
 
 do_listing(Source, TargetDir, Type) ->
@@ -573,31 +572,31 @@ do_listing(Source, TargetDir, Type, Ext) ->
 	      [Source, TargetDir, Type, Ext]),
     case compile:file(Source, [Type, time, {outdir, TargetDir}]) of
 	{ok, _} -> ok;
-	Other -> test_server:fail({unexpected_result, Other})
+	Other -> ct:fail({unexpected_result, Other})
     end,
     SourceBase = filename:rootname(filename:basename(Source)),
 
     Target = filename:join(TargetDir, SourceBase ++ Ext),
     true = exists(Target).
 
-files(Config, Name) ->
-    ?line code:delete(simple),
-    ?line code:purge(simple),
-    ?line DataDir = ?config(data_dir, Config),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Simple = filename:join(DataDir, "simple"),
-    ?line TargetDir = filename:join(PrivDir, Name),
-    ?line ok = file:make_dir(TargetDir),
-    ?line Target = filename:join(TargetDir, "simple"++code:objfile_extension()),
-    {Simple, Target}.
-
+get_files(Config, Module, OutputName) ->
+    code:delete(Module),
+    code:purge(Module),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Src = filename:join(DataDir, atom_to_list(Module)),
+    TargetDir = filename:join(PrivDir, OutputName),
+    ok = file:make_dir(TargetDir),
+    File = atom_to_list(Module) ++ code:objfile_extension(),
+    Target = filename:join(TargetDir, File),
+    {Src, Target}.
 
 run(Target, Func, Args) ->
-    ?line Module = list_to_atom(filename:rootname(filename:basename(Target))),
-    ?line {module, Module} = code:load_abs(filename:rootname(Target)),
-    ?line Result = (catch apply(Module, Func, Args)),
-    ?line true = code:delete(Module),
-    ?line false = code:purge(Module),
+    Module = list_to_atom(filename:rootname(filename:basename(Target))),
+    {module, Module} = code:load_abs(filename:rootname(Target)),
+    Result = (catch apply(Module, Func, Args)),
+    true = code:delete(Module),
+    false = code:purge(Module),
     Result.
 
 exists(Name) ->
@@ -607,49 +606,27 @@ exists(Name) ->
     end.
 
 
-%% Tests that the compiler does not accept
-%% bad use of records.
-bad_record_use1(Config) when is_list(Config) ->
-    ?line {ok, Cwd} = file:get_cwd(),
-    ?line file:set_cwd(?config(data_dir, Config)),
-    ?line true=exists("bad_record_use.erl"),
-    ?line Ret=c:c(bad_record_use),
-    ?line file:set_cwd(Cwd),
-    ?line error=Ret,
-    ok.
-
-%% Tests that the compiler does not accept
-%% bad use of records.
-bad_record_use2(Config) when is_list(Config) ->
-    ?line {ok, Cwd} = file:get_cwd(),
-    ?line file:set_cwd(?config(data_dir, Config)),
-    ?line true=exists("bad_record_use2.erl"),
-    ?line Ret=c:c(bad_record_use),
-    ?line file:set_cwd(Cwd),
-    ?line error=Ret,
-    ok.
-
 strict_record(Config) when is_list(Config) ->
-    ?line Priv = ?config(priv_dir, Config),
-    ?line file:set_cwd(?config(data_dir, Config)),
-    ?line Opts = [{outdir,Priv},report_errors],
+    Priv = proplists:get_value(priv_dir, Config),
+    ok = file:set_cwd(proplists:get_value(data_dir, Config)),
+    Opts = [{outdir,Priv},report_errors],
     M = record_access,
  
-    ?line {ok,M} = c:c(M, [strict_record_tests|Opts]),
-    ?line Turtle = test_strict(),
+    {ok,M} = c:c(M, [strict_record_tests|Opts]),
+    Turtle = test_strict(),
 
-    ?line {ok,M} = c:c(M, [no_strict_record_tests|Opts]),
-    ?line Turtle = test_sloppy(),
+    {ok,M} = c:c(M, [no_strict_record_tests|Opts]),
+    Turtle = test_sloppy(),
 
     %% The option first given wins.
-    ?line {ok,M} = c:c(M, [no_strict_record_tests,strict_record_tests|Opts]),
-    ?line Turtle = test_sloppy(),
-    ?line {ok,M} = c:c(M, [strict_record_tests,no_strict_record_tests|Opts]),
-    ?line Turtle = test_strict(),
+    {ok,M} = c:c(M, [no_strict_record_tests,strict_record_tests|Opts]),
+    Turtle = test_sloppy(),
+    {ok,M} = c:c(M, [strict_record_tests,no_strict_record_tests|Opts]),
+    Turtle = test_strict(),
 
     %% Default (possibly influenced by ERL_COMPILER_OPTIONS).
-    ?line {ok,M} = c:c(M, [{outdir,Priv},report_errors]),
-    ?line try
+    {ok,M} = c:c(M, [{outdir,Priv},report_errors]),
+    try
 	      {1,2} = record_access:test(Turtle),
 	      {comment,"Default: no_strict_record_tests"}
 	  catch
@@ -659,7 +636,7 @@ strict_record(Config) when is_list(Config) ->
 
 test_strict() ->
     Turtle = record_access:turtle(),
-    ?line try
+    try
 	      record_access:test(Turtle)
 	  catch
 	      error:{badrecord,tortoise} ->
@@ -673,19 +650,19 @@ test_sloppy() ->
     Turtle.
 
 missing_testheap(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Opts = [{outdir,PrivDir}],
     OldPath = code:get_path(),
     try
 	code:add_patha(PrivDir),
 	c:c(filename:join(DataDir, "missing_testheap1"), Opts),
 	c:c(filename:join(DataDir, "missing_testheap2"), Opts),
-	?line ok = test(fun() ->
-				missing_testheap1:f({a,self()},{state,true,b})
-			end, {a,b}),
-	?line ok = test(fun() ->
-				missing_testheap2:f({a,self()},16#80000000) end,
+	ok = test(fun() ->
+			  missing_testheap1:f({a,self()},{state,true,b})
+		  end, {a,b}),
+	ok = test(fun() ->
+			  missing_testheap2:f({a,self()},16#80000000) end,
 			bigger)
 	after
 	    code:set_path(OldPath),
@@ -706,47 +683,47 @@ test(Iter, Fun, Result, Filler) ->
 	    test(Iter-1, Fun, Result, [0|Filler]);
 	{result, Other} ->
 	    io:format("Expected ~p; got ~p~n", [Result, Other]),
-	    test_server:fail()
+	    ct:fail(failed)
     end.
 
 init(ReplyTo, Fun, _Filler) ->
     ReplyTo ! {result, Fun()}.
 
 env(Config) when is_list(Config) ->
-    ?line {Simple,Target} = files(Config, "file_1"),
-    ?line {ok,Cwd} = file:get_cwd(),
-    ?line ok = file:set_cwd(filename:dirname(Target)),
+    {Simple,Target} = get_files(Config, simple, env),
+    {ok,Cwd} = file:get_cwd(),
+    ok = file:set_cwd(filename:dirname(Target)),
 
     true = os:putenv("ERL_COMPILER_OPTIONS", "binary"),
     try
 	env_1(Simple, Target)
     after
 	true = os:putenv("ERL_COMPILER_OPTIONS", "ignore_me"),
-      file:set_cwd(Cwd),
-      file:delete(Target),
-      file:del_dir(filename:dirname(Target))
+	file:set_cwd(Cwd),
+	file:delete(Target),
+	file:del_dir(filename:dirname(Target))
     end,
     ok.
 
 env_1(Simple, Target) ->
     %% file
-    ?line {ok,simple,<<_/binary>>} = compile:file(Simple),
-    ?line {ok,simple} = compile:noenv_file(Simple, [debug_info]),
-    ?line true = exists(Target),
-    ?line {ok,{simple,[{abstract_code,Abstr0}]}} =
+    {ok,simple,<<_/binary>>} = compile:file(Simple),
+    {ok,simple} = compile:noenv_file(Simple, [debug_info]),
+    true = exists(Target),
+    {ok,{simple,[{abstract_code,Abstr0}]}} =
 	beam_lib:chunks(Target, [abstract_code]),
-    ?line {raw_abstract_v1,Forms} = Abstr0,
+    {raw_abstract_v1,Forms} = Abstr0,
 
     %% forms
-    ?line true = os:putenv("ERL_COMPILER_OPTIONS", "strong_validation"),
-    ?line {ok,simple} = compile:forms(Forms),
-    ?line {ok,simple,<<"FOR1",_/binary>>} = compile:noenv_forms(Forms, []),
+    true = os:putenv("ERL_COMPILER_OPTIONS", "strong_validation"),
+    {ok,simple} = compile:forms(Forms),
+    {ok,simple,<<"FOR1",_/binary>>} = compile:noenv_forms(Forms, []),
 
     %% output_generated
-    ?line false = compile:output_generated([]),
-    ?line true = compile:noenv_output_generated([]),
+    false = compile:output_generated([]),
+    true = compile:noenv_output_generated([]),
 
-    ?line ok = file:delete(Target),
+    ok = file:delete(Target),
 
     ok.
 
@@ -754,7 +731,7 @@ env_1(Simple, Target) ->
 %% compile the generated Core Erlang files.
 
 core(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Outdir = filename:join(PrivDir, "core"),
     ok = file:make_dir(Outdir),
 
@@ -817,15 +794,13 @@ compile_forms(Forms, Opts) ->
 %% run .S through the compiler again.
 
 asm(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(20)),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Outdir = filename:join(PrivDir, "asm"),
-    ?line ok = file:make_dir(Outdir),
-
-    ?line Wc = filename:join(filename:dirname(code:which(?MODULE)), "*.beam"),
-    ?line TestBeams = filelib:wildcard(Wc),
-    ?line Res = test_lib:p_run(fun(F) -> do_asm(F, Outdir) end, TestBeams),
-    ?line test_server:timetrap_cancel(Dog),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Outdir = filename:join(PrivDir, "asm"),
+    ok = file:make_dir(Outdir),
+
+    Wc = filename:join(filename:dirname(code:which(?MODULE)), "*.beam"),
+    TestBeams = filelib:wildcard(Wc),
+    Res = test_lib:p_run(fun(F) -> do_asm(F, Outdir) end, TestBeams),
     Res.
 
     
@@ -853,7 +828,7 @@ do_asm(Beam, Outdir) ->
     end.
 
 sys_pre_attributes(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     File = filename:join(DataDir, "attributes.erl"),
     Mod = attributes,
     CommonOpts = [binary,report,verbose,
@@ -885,8 +860,8 @@ sys_pre_attributes(Config) ->
 
 %% Test the dialyzer option to cover more code.
 dialyzer(Config) ->
-    Priv = ?config(priv_dir, Config),
-    file:set_cwd(?config(data_dir, Config)),
+    Priv = proplists:get_value(priv_dir, Config),
+    ok = file:set_cwd(proplists:get_value(data_dir, Config)),
     Opts = [{outdir,Priv},report_errors],
     M = dialyzer_test,
     {ok,M} = c:c(M, [dialyzer|Opts]),
@@ -935,6 +910,115 @@ do_warnings_2([], Next, F) ->
     do_warnings_1(Next, F).
 
 
+%% Test that the compile:pre_load/0 function (used by 'erlc')
+%% pre-loads the modules that are used by a typical compilation.
+
+pre_load_check(Config) ->
+    case test_server:is_cover() of
+	true ->
+	    {skip,"Cover is running"};
+	false ->
+	    try
+		do_pre_load_check(Config)
+	    after
+		dbg:stop_clear()
+	    end
+    end.
+
+do_pre_load_check(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Simple = filename:join(DataDir, "simple.erl"),
+    Big = filename:join(DataDir, "big.erl"),
+    {ok,_} = dbg:tracer(process, {fun pre_load_trace/2,[]}),
+    dbg:p(self(), call),
+    dbg:p(new, call),
+    {ok,_} = dbg:tpl({?MODULE,get_trace_data,0}, []),
+    {ok,_} = dbg:tp({code,ensure_modules_loaded,1}, []),
+
+    %% Compile a simple module using the erl_compile interface
+    %% to find out the modules that are pre-loaded by
+    %% compile:pre_load/0.
+    Opts = #options{specific=[binary]},
+    {ok,simple,_} = compile:compile(Simple, "", Opts),
+    [{code,ensure_modules_loaded,[PreLoaded0]}] = get_trace_data(),
+    PreLoaded1 = ordsets:from_list(PreLoaded0),
+
+    %% Since 'compile' is the function doing the pre-loaded,
+    %% it is useless to include it in the list.
+    case ordsets:is_element(compile, PreLoaded1) of
+	true ->
+	    io:put_chars("The 'compile' module should not be included "
+			 "in the list of modules to be pre-loaded."),
+	    ?t:fail(compile);
+	false ->
+	    []
+    end,
+    PreLoaded = ordsets:add_element(compile, PreLoaded1),
+
+    %% Now unload all pre-loaded modules and all modules in
+    %% compiler application. Then compile a module to find
+    %% which modules that get loaded.
+    CompilerMods = compiler_modules(),
+    Unload = ordsets:union(ordsets:from_list(CompilerMods), PreLoaded),
+    _ = [begin
+	     code:delete(M),
+	     code:purge(M)
+	 end || M <- Unload],
+
+    {ok,_} = dbg:ctp({code,ensure_modules_loaded,1}),
+    {ok,_} = dbg:tp({code,ensure_loaded,1}, []),
+    {ok,big,_} = compile:file(Big, [binary]),
+    WasLoaded0 = get_trace_data(),
+    WasLoaded1 = [M || {code,ensure_loaded,[M]} <- WasLoaded0],
+    WasLoaded = ordsets:from_list(WasLoaded1),
+
+    %% Check for modules that should have been pre-loaded.
+    case ordsets:subtract(WasLoaded, PreLoaded) of
+	[] ->
+	    ok;
+	[_|_]=NotPreLoaded ->
+	    io:format("The following modules were used "
+		      "but not pre-loaded:\n~p\n",
+		      [NotPreLoaded]),
+	    ?t:fail({not_preload,NotPreLoaded})
+    end,
+
+    %% Check for modules that should not be pre-loaded.
+    case ordsets:subtract(PreLoaded, WasLoaded) of
+	[] ->
+	    ok;
+	[_|_]=NotUsed ->
+	    io:format("The following modules were pre-loaded"
+		      " but not used:\n~p\n",
+		      [NotUsed]),
+	    ?t:fail({not_used,NotUsed})
+    end,
+
+    ok.
+
+get_trace_data() ->
+    %% Apparantely, doing a receive at the beginning of
+    %% a traced function can cause extra trace messages.
+    %% To avoid that, don't do the receive in this function.
+    do_get_trace_data().
+
+do_get_trace_data() ->
+    receive
+	{trace_data,Data} -> Data
+    end.
+
+pre_load_trace({trace,Pid,call,{?MODULE,get_trace_data,[]}}, Acc) ->
+    Pid ! {trace_data,Acc},
+    [];
+pre_load_trace({trace,_,call,MFA}, Acc) ->
+    [MFA|Acc].
+
+compiler_modules() ->
+    Wc = filename:join([code:lib_dir(compiler),"ebin","*.beam"]),
+    Ms = filelib:wildcard(Wc),
+    FN = filename,
+    [list_to_atom(FN:rootname(FN:basename(M), ".beam")) || M <- Ms].
+
 %%%
 %%% Utilities.
 %%%
diff --git a/lib/compiler/test/compile_SUITE_data/bad_record_use.erl b/lib/compiler/test/compile_SUITE_data/bad_record_use.erl
deleted file mode 100644
index 0fb6fc3045..0000000000
--- a/lib/compiler/test/compile_SUITE_data/bad_record_use.erl
+++ /dev/null
@@ -1,29 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2009. 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%
-%%
--module(bad_record_use).
--export([test/0]).
-
--record(bad_use, {a=undefined,
-		  b=undefined,
-		  c=undefined}).
-
-test() ->
-    NewRecord=#bad_use{a=1, b=2, a=2}.
-
diff --git a/lib/compiler/test/compile_SUITE_data/bad_record_use2.erl b/lib/compiler/test/compile_SUITE_data/bad_record_use2.erl
deleted file mode 100644
index 7c898af00f..0000000000
--- a/lib/compiler/test/compile_SUITE_data/bad_record_use2.erl
+++ /dev/null
@@ -1,30 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2009. 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%
-%%
--module(bad_record_use2).
--export([test/0]).
-
--record(bad_use, {a=undefined,
-		  b=undefined,
-		  c=undefined}).
-
-test() ->
-    R=#bad_use{a=1, b=2},
-    R2=R#bad_use{a=1, b=2, a=2},
-    ok.
diff --git a/lib/compiler/test/core_SUITE.erl b/lib/compiler/test/core_SUITE.erl
index 25f8564ce4..22f6443a77 100644
--- a/lib/compiler/test/core_SUITE.erl
+++ b/lib/compiler/test/core_SUITE.erl
@@ -29,21 +29,20 @@
 	 bs_shadowed_size_var/1
 	]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(comp(N),
 	N(Config) when is_list(Config) -> try_it(N, Config)).
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog = test_server:timetrap(?t:minutes(5)),
-    [{watchdog,Dog}|Config].
+    Config.
 
 end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,5}}].
 
 all() -> 
     test_lib:recompile(?MODULE),
@@ -86,7 +85,8 @@ end_per_group(_GroupName, Config) ->
 
 
 try_it(Mod, Conf) ->
-    Src = filename:join(?config(data_dir, Conf), atom_to_list(Mod)),
+    Src = filename:join(proplists:get_value(data_dir, Conf),
+			atom_to_list(Mod)),
     compile_and_load(Src, []),
     compile_and_load(Src, [no_copt]).
 
diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl
index 016ea9d0d9..ee2a2c523f 100644
--- a/lib/compiler/test/core_fold_SUITE.erl
+++ b/lib/compiler/test/core_fold_SUITE.erl
@@ -29,7 +29,7 @@
 
 -export([foo/0,foo/1,foo/2,foo/3]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -61,8 +61,8 @@ end_per_group(_GroupName, Config) ->
 
 t_element(Config) when is_list(Config) ->
     X = make_ref(),
-    ?line X = id(element(1, {X,y,z})),
-    ?line b = id(element(2, {a,b,c,d})),
+    X = id(element(1, {X,y,z})),
+    b = id(element(2, {a,b,c,d})),
     (fun() ->
 	    case {a,#{k=>X}} of
 		{a,#{k:=X}}=Tuple ->
@@ -73,21 +73,21 @@ t_element(Config) when is_list(Config) ->
     %% No optimization, but should work.
     Tuple = id({x,y,z}),
     Pos = id(3),
-    ?line x = id(element(1, Tuple)),
-    ?line c = id(element(Pos, {a,b,c,d})),
-    ?line X = id(element(Pos, {a,b,X,d})),
-    ?line z = id(element(Pos, Tuple)),
+    x = id(element(1, Tuple)),
+    c = id(element(Pos, {a,b,c,d})),
+    X = id(element(Pos, {a,b,X,d})),
+    z = id(element(Pos, Tuple)),
 
     %% Calls that will fail.
-    ?line {'EXIT',{badarg,_}} = (catch element(5, {a,b,c,d})),
-    ?line {'EXIT',{badarg,_}} = (catch element(5, {a,b,X,d})),
-    ?line {'EXIT',{badarg,_}} = (catch element(5.0, {a,b,X,d})),
+    {'EXIT',{badarg,_}} = (catch element(5, {a,b,c,d})),
+    {'EXIT',{badarg,_}} = (catch element(5, {a,b,X,d})),
+    {'EXIT',{badarg,_}} = (catch element(5.0, {a,b,X,d})),
     {'EXIT',{badarg,_}} = (catch element(2, not_a_tuple)),
     {'EXIT',{badarg,_}} = (catch element(2, [])),
     {'EXIT',{badarg,_}} = (catch element(2, Tuple == 3)),
     case id({a,b,c}) of
 	{_,_,_}=Tup ->
-	    ?line {'EXIT',{badarg,_}} = (catch element(4, Tup))
+	    {'EXIT',{badarg,_}} = (catch element(4, Tup))
     end,
     {'EXIT',{badarg,_}} = (catch element(1, tuple_size(Tuple))),
 
@@ -96,16 +96,16 @@ t_element(Config) when is_list(Config) ->
 setelement(Config) when is_list(Config) ->
     X = id(b),
     New = id([1,2,3]),
-    ?line {y,b,c} = id(setelement(1, {a,b,c}, y)),
-    ?line {y,b,c} = id(setelement(1, {a,X,c}, y)),
-    ?line {a,y,c} = id(setelement(2, {a,X,c}, y)),
-    ?line {a,[1,2,3],c} = id(setelement(2, {a,b,c}, New)),
-    ?line {a,[1,2,3],c} = id(setelement(2, {a,X,c}, New)),
-    ?line {a,b,[1,2,3]} = id(setelement(3, {a,b,c}, New)),
-    ?line {a,b,[1,2,3]} = id(setelement(3, {a,X,c}, New)),
+    {y,b,c} = id(setelement(1, {a,b,c}, y)),
+    {y,b,c} = id(setelement(1, {a,X,c}, y)),
+    {a,y,c} = id(setelement(2, {a,X,c}, y)),
+    {a,[1,2,3],c} = id(setelement(2, {a,b,c}, New)),
+    {a,[1,2,3],c} = id(setelement(2, {a,X,c}, New)),
+    {a,b,[1,2,3]} = id(setelement(3, {a,b,c}, New)),
+    {a,b,[1,2,3]} = id(setelement(3, {a,X,c}, New)),
 
-    ?line {'EXIT',{badarg,_}} = (catch setelement_crash({a,b,c,d,e,f})),
-    ?line error = setelement_crash_2({a,b,c,d,e,f}, <<42>>),
+    {'EXIT',{badarg,_}} = (catch setelement_crash({a,b,c,d,e,f})),
+    error = setelement_crash_2({a,b,c,d,e,f}, <<42>>),
 
     {'EXIT',{badarg,_}} = (catch setelement(1, not_a_tuple, New)),
     {'EXIT',{badarg,_}} = (catch setelement(3, {a,b}, New)),
@@ -132,19 +132,19 @@ setelement_crash_2(Tuple, Bin) ->
 t_length(Config) when is_list(Config) ->
     Blurf = id({blurf,a,b}),
     Tail = id([42,43,44,45]),
-    ?line 0 = id(length([])),
-    ?line 1 = id(length([x])),
-    ?line 2 = id(length([x,Blurf])),
-    ?line 4 = id(length([x,Blurf,a,b])),
+    0 = id(length([])),
+    1 = id(length([x])),
+    2 = id(length([x,Blurf])),
+    4 = id(length([x,Blurf,a,b])),
 
     %% No or partial optimization.
-    ?line 4 = length(Tail),
-    ?line 5 = id(length([x|Tail])),
+    4 = length(Tail),
+    5 = id(length([x|Tail])),
 
     %% Will fail.
-    ?line {'EXIT',{badarg,_}} = (catch id(length([a,b|c]))),
-    ?line {'EXIT',{badarg,_}} = (catch id(length([a,Blurf|c]))),
-    ?line {'EXIT',{badarg,_}} = (catch id(length(atom))),
+    {'EXIT',{badarg,_}} = (catch id(length([a,b|c]))),
+    {'EXIT',{badarg,_}} = (catch id(length([a,Blurf|c]))),
+    {'EXIT',{badarg,_}} = (catch id(length(atom))),
 
     ok.
 
@@ -156,34 +156,34 @@ t_length(Config) when is_list(Config) ->
 
 append(Config) when is_list(Config) ->
     A = id(0),
-    ?line [a,b,c,d,e,f,g,h,i,j,k] = id(?APPEND([a,b,c,d,e,f],[g,h,i,j,k])),
-    ?line [a,b,c,d,e] = id(?APPEND([a,b,c],id([d,e]))),
-    ?line [0,1,2,3,4,5,6] = id(?APPEND([A,1,2,3],[4,5,6])),
-    ?line {'EXIT',{badarg,_}} = (catch id(?APPEND([A|blurf],[4,5,6]))),
+    [a,b,c,d,e,f,g,h,i,j,k] = id(?APPEND([a,b,c,d,e,f],[g,h,i,j,k])),
+    [a,b,c,d,e] = id(?APPEND([a,b,c],id([d,e]))),
+    [0,1,2,3,4,5,6] = id(?APPEND([A,1,2,3],[4,5,6])),
+    {'EXIT',{badarg,_}} = (catch id(?APPEND([A|blurf],[4,5,6]))),
     ok.
 
 t_apply(Config) when is_list(Config) ->
-    ?line ok = apply(?MODULE, foo, []),
-    ?line 4 = apply(?MODULE, foo, [3]),
-    ?line 7 = apply(?MODULE, foo, [3,4]),
-    ?line 12 = apply(?MODULE, foo, [id(8),4]),
-    ?line 21 = apply(?MODULE, foo, [8,id(9),4]),
-    ?line 20 = apply(?MODULE, foo, [8,8,id(4)]),
-    ?line 24 = apply(?MODULE, foo, [id(10),10,4]),
+    ok = apply(?MODULE, foo, []),
+    4 = apply(?MODULE, foo, [3]),
+    7 = apply(?MODULE, foo, [3,4]),
+    12 = apply(?MODULE, foo, [id(8),4]),
+    21 = apply(?MODULE, foo, [8,id(9),4]),
+    20 = apply(?MODULE, foo, [8,8,id(4)]),
+    24 = apply(?MODULE, foo, [id(10),10,4]),
 
     M = id(?MODULE),
-    ?line ok = apply(M, foo, []),
-    ?line 4 = apply(M, foo, [3]),
-    ?line 16.0 = apply(M, foo, [12.0,4]),
+    ok = apply(M, foo, []),
+    4 = apply(M, foo, [3]),
+    16.0 = apply(M, foo, [12.0,4]),
 
     %% Will fail.
-    ?line {'EXIT',{badarg,_}} = (catch apply([a,b,c], foo, [])),
-    ?line {'EXIT',{badarg,_}} = (catch apply(42, foo, [])),
-    ?line {'EXIT',{badarg,_}} = (catch apply(?MODULE, 45, [xx])),
-    ?line {'EXIT',{badarg,_}} = (catch apply(?MODULE, foo, {a,b})),
-    ?line {'EXIT',{badarg,_}} = (catch apply(M, M, [1009|10010])),
-    ?line {'EXIT',{badarg,_}} = (catch apply(?MODULE, foo, [10000|9999])),
-    ?line {'EXIT',{badarg,_}} = (catch apply(?MODULE, foo, a)),
+    {'EXIT',{badarg,_}} = (catch apply([a,b,c], foo, [])),
+    {'EXIT',{badarg,_}} = (catch apply(42, foo, [])),
+    {'EXIT',{badarg,_}} = (catch apply(?MODULE, 45, [xx])),
+    {'EXIT',{badarg,_}} = (catch apply(?MODULE, foo, {a,b})),
+    {'EXIT',{badarg,_}} = (catch apply(M, M, [1009|10010])),
+    {'EXIT',{badarg,_}} = (catch apply(?MODULE, foo, [10000|9999])),
+    {'EXIT',{badarg,_}} = (catch apply(?MODULE, foo, a)),
 
     ok.
 
@@ -210,13 +210,13 @@ bifs(Config) when is_list(Config) ->
 -define(CMP_DIFF(A0, B), (fun(A) -> false = A == B, true = A /= B end)(id(A0))).
 	       
 eq(Config) when is_list(Config) ->
-    ?line ?CMP_SAME([a,b,c], [a,b,c]),
-    ?line ?CMP_SAME([42.0], [42.0]),
-    ?line ?CMP_SAME([42], [42]),
-    ?line ?CMP_SAME([42.0], [42]),
+    ?CMP_SAME([a,b,c], [a,b,c]),
+    ?CMP_SAME([42.0], [42.0]),
+    ?CMP_SAME([42], [42]),
+    ?CMP_SAME([42.0], [42]),
 
-    ?line ?CMP_DIFF(a, [a]),
-    ?line ?CMP_DIFF(a, {1,2,3}),
+    ?CMP_DIFF(a, [a]),
+    ?CMP_DIFF(a, {1,2,3}),
 
     ?CMP_SAME(#{a=>1.0,b=>2}, #{b=>2.0,a=>1}),
     ?CMP_SAME(#{a=>[1.0],b=>[2]}, #{b=>[2.0],a=>[1]}),
@@ -232,7 +232,7 @@ eq(Config) when is_list(Config) ->
 
 %% OTP-7117.
 nested_call_in_case(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Dir = test_lib:get_data_dir(Config),
     Core = filename:join(Dir, "nested_call_in_case"),
     Opts = [from_core,{outdir,PrivDir}|test_lib:opt_opts(?MODULE)],
@@ -265,12 +265,12 @@ do_guard_try_catch(K, V) ->
 -record(cover_opt_guard_try, {list=[]}).
 
 coverage(Config) when is_list(Config) ->
-    ?line {'EXIT',{{case_clause,{a,b,c}},_}} =
+    {'EXIT',{{case_clause,{a,b,c}},_}} =
 	(catch cover_will_match_list_type({a,b,c})),
-    ?line {'EXIT',{{case_clause,{a,b,c,d}},_}} =
+    {'EXIT',{{case_clause,{a,b,c,d}},_}} =
 	(catch cover_will_match_list_type({a,b,c,d})),
-    ?line a = cover_remove_non_vars_alias({a,b,c}),
-    ?line error = cover_will_match_lit_list(),
+    a = cover_remove_non_vars_alias({a,b,c}),
+    error = cover_will_match_lit_list(),
     {ok,[a]} = cover_is_safe_bool_expr(a),
 
     ok = cover_opt_guard_try(#cover_opt_guard_try{list=[a]}),
@@ -347,7 +347,7 @@ bsm_an_inlined(<<_:8>>, _) -> ok;
 bsm_an_inlined(_, _) -> error.
 
 unused_multiple_values_error(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Dir = test_lib:get_data_dir(Config),
     Core = filename:join(Dir, "unused_multiple_values_error"),
     Opts = [no_copt,clint,return,from_core,{outdir,PrivDir}
diff --git a/lib/compiler/test/error_SUITE.erl b/lib/compiler/test/error_SUITE.erl
index 2962e3ff77..dd2e766599 100644
--- a/lib/compiler/test/error_SUITE.erl
+++ b/lib/compiler/test/error_SUITE.erl
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 -module(error_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
@@ -65,7 +65,7 @@ bif_clashes(Config) when is_list(Config) ->
            [return_warnings],
 	   {error,
 	    [{4, erl_lint,{call_to_redefined_old_bif,{length,1}}}], []} }],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     Ts1 = [{bif_clashes2,
            <<"
               -export([t/0]).
@@ -76,7 +76,7 @@ bif_clashes(Config) when is_list(Config) ->
            [return_warnings],
 	    {error,
 	     [{3, erl_lint,{redefine_old_bif_import,{length,1}}}], []} }],
-    ?line [] = run(Config, Ts1),
+    [] = run(Config, Ts1),
     Ts00 = [{bif_clashes3,
            <<"
               -export([t/0]).
@@ -89,7 +89,7 @@ bif_clashes(Config) when is_list(Config) ->
              ">>,
            [return_warnings],
 	   []}],
-    ?line [] = run(Config, Ts00),
+    [] = run(Config, Ts00),
     Ts11 = [{bif_clashes4,
            <<"
               -export([t/0]).
@@ -100,7 +100,7 @@ bif_clashes(Config) when is_list(Config) ->
              ">>,
            [return_warnings],
 	    []}],
-    ?line [] = run(Config, Ts11),
+    [] = run(Config, Ts11),
     Ts000 = [{bif_clashes5,
            <<"
               -export([t/0]).
@@ -113,7 +113,7 @@ bif_clashes(Config) when is_list(Config) ->
            [return_warnings],
 	   {warning,
 	    [{4, erl_lint,{call_to_redefined_bif,{binary_part,3}}}]} }],
-    ?line [] = run(Config, Ts000),
+    [] = run(Config, Ts000),
     Ts111 = [{bif_clashes6,
            <<"
               -export([t/0]).
@@ -124,7 +124,7 @@ bif_clashes(Config) when is_list(Config) ->
            [return_warnings],
 	    {warning,
 	     [{3, erl_lint,{redefine_bif_import,{binary_part,3}}}]} }],
-    ?line [] = run(Config, Ts111),
+    [] = run(Config, Ts111),
     Ts2 = [{bif_clashes7,
            <<"
               -export([t/0]).
@@ -139,7 +139,7 @@ bif_clashes(Config) when is_list(Config) ->
           {error,
            [{7,erl_lint,{define_import,{length,1}}}],
            []} }],
-    ?line [] = run2(Config, Ts2),
+    [] = run2(Config, Ts2),
     Ts3 = [{bif_clashes8,
            <<"
               -export([t/1]).
@@ -153,7 +153,7 @@ bif_clashes(Config) when is_list(Config) ->
           {error,
            [{4,erl_lint,{illegal_guard_local_call,{length,1}}}],
            []} }],
-    ?line [] = run2(Config, Ts3),
+    [] = run2(Config, Ts3),
     Ts4 = [{bif_clashes9,
            <<"
               -export([t/1]).
@@ -166,7 +166,7 @@ bif_clashes(Config) when is_list(Config) ->
           {error,
            [{5,erl_lint,{illegal_guard_local_call,{length,1}}}],
            []} }],
-    ?line [] = run2(Config, Ts4),
+    [] = run2(Config, Ts4),
 
     ok.
 
@@ -175,23 +175,23 @@ bif_clashes(Config) when is_list(Config) ->
 
 %% Tests that a head mismatch is reported on the correct line (OTP-2125).
 head_mismatch_line(Config) when is_list(Config) ->
-    ?line [E|_] = get_compilation_errors(Config, "head_mismatch_line"),
-    ?line {26, Mod, Reason} = E,
-    ?line Mod:format_error(Reason),
+    [E|_] = get_compilation_errors(Config, "head_mismatch_line"),
+    {26, Mod, Reason} = E,
+    Mod:format_error(Reason),
     ok.
 
 %% Compiles a test file and returns the list of errors.
 
 get_compilation_errors(Config, Filename) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line File = filename:join(DataDir, Filename),
-    ?line {error, [{_Name, E}|_], []} = compile:file(File, [return_errors]),
+    DataDir = proplists:get_value(data_dir, Config),
+    File = filename:join(DataDir, Filename),
+    {error, [{_Name, E}|_], []} = compile:file(File, [return_errors]),
     E.
 
 warnings_as_errors(Config) when is_list(Config) ->
-    ?line TestFile = test_filename(Config),
-    ?line BeamFile = filename:rootname(TestFile, ".erl") ++ ".beam",
-    ?line OutDir = ?config(priv_dir, Config),
+    TestFile = test_filename(Config),
+    BeamFile = filename:rootname(TestFile, ".erl") ++ ".beam",
+    OutDir = proplists:get_value(priv_dir, Config),
 
     Ts1 = [{warnings_as_errors,
            <<"
@@ -203,8 +203,8 @@ warnings_as_errors(Config) when is_list(Config) ->
 	    {error,
 	     [],
 	     [{3,erl_lint,{unused_var,'A'}}]} }],
-    ?line [] = run(Ts1, TestFile, write_beam),
-    ?line false = filelib:is_regular(BeamFile),
+    [] = run(Ts1, TestFile, write_beam),
+    false = filelib:is_regular(BeamFile),
 
     Ts2 = [{warning_unused_var,
            <<"
@@ -216,9 +216,9 @@ warnings_as_errors(Config) when is_list(Config) ->
 	    {warning,
 	       [{3,erl_lint,{unused_var,'A'}}]} }],
 
-    ?line [] = run(Ts2, TestFile, write_beam),
-    ?line true = filelib:is_regular(BeamFile),
-    ?line ok = file:delete(BeamFile),
+    [] = run(Ts2, TestFile, write_beam),
+    true = filelib:is_regular(BeamFile),
+    ok = file:delete(BeamFile),
 
     ok.
 
@@ -295,7 +295,7 @@ bad_utf8(Config) ->
 
 
 run(Config, Tests) ->
-    ?line File = test_filename(Config),
+    File = test_filename(Config),
     run(Tests, File, dont_write_beam).
 
 run(Tests, File, WriteBeam) ->
@@ -304,7 +304,7 @@ run(Tests, File, WriteBeam) ->
                     E -> 
                         BadL;
                     Bad -> 
-                        ?t:format("~nTest ~p failed. Expected~n  ~p~n"
+                        io:format("~nTest ~p failed. Expected~n  ~p~n"
                                   "but got~n  ~p~n", [N, E, Bad]),
 			fail()
                 end
@@ -312,7 +312,7 @@ run(Tests, File, WriteBeam) ->
     lists:foldl(F, [], Tests).
 
 run2(Config, Tests) ->
-    ?line File = test_filename(Config),
+    File = test_filename(Config),
     run2(Tests, File, dont_write_beam).
 
 run2(Tests, File, WriteBeam) ->
@@ -321,7 +321,7 @@ run2(Tests, File, WriteBeam) ->
                     E ->
                         BadL;
                     Bad ->
-                        ?t:format("~nTest ~p failed. Expected~n  ~p~n"
+                        io:format("~nTest ~p failed. Expected~n  ~p~n"
                                   "but got~n  ~p~n", [N, E, Bad]),
 			fail()
                 end
@@ -338,56 +338,45 @@ filter(X) ->
 
 test_filename(Conf) ->
     Filename = ["errors_test_",test_lib:uniq(),".erl"],
-    DataDir = ?config(priv_dir, Conf),
+    DataDir = proplists:get_value(priv_dir, Conf),
     filename:join(DataDir, Filename).
 
 run_test(Test0, File, Warnings, WriteBeam) ->
     ModName = filename:rootname(filename:basename(File), ".erl"),
     Mod = list_to_atom(ModName),
     Test = ["-module(",ModName,"). ",Test0],
-    ?line Opts = case WriteBeam of
-		     dont_write_beam ->
-			 [binary,return_errors|Warnings];
-		     write_beam ->
-			 [return_errors|Warnings]
-		 end,
-    ?line ok = file:write_file(File, Test),
+    Opts = case WriteBeam of
+	       dont_write_beam ->
+		   [binary,return_errors|Warnings];
+	       write_beam ->
+		   [return_errors|Warnings]
+	   end,
+    ok = file:write_file(File, Test),
 
     %% Compile once just to print all errors and warnings.
-    ?line compile:file(File, [binary,report|Warnings]),
+    compile:file(File, [binary,report|Warnings]),
 
     %% Test result of compilation.
     io:format("~p\n", [Opts]),
-    ?line Res = case compile:file(File, Opts) of
-		    {ok,Mod,_,[{_File,Ws}]} ->
-			%io:format("compile:file(~s,~p) ->~n~p~n",
-			%	  [File,Opts,Ws]),
-			{warning,Ws};
-		    {ok,Mod,_,[]} ->
-			%io:format("compile:file(~s,~p) ->~n~p~n",
-			%	  [File,Opts,Ws]),
-			[];
-		    {ok,Mod,[{_File,Ws}]} ->
-			{warning,Ws};
-		    {ok,Mod,[]} ->
-			[];
-		    {error,[{XFile,Es}],Ws} = _ZZ when is_list(XFile) ->
-			%io:format("compile:file(~s,~p) ->~n~p~n",
-			%	  [File,Opts,_ZZ]),
-			{error,Es,Ws};
-		    {error,[{XFile,Es1},{XFile,Es2}],Ws} = _ZZ
-		      when is_list(XFile) ->
-			%io:format("compile:file(~s,~p) ->~n~p~n",
-			%	  [File,Opts,_ZZ]),
-			{error,Es1++Es2,Ws};
-		    {error,Es,[{_File,Ws}]} = _ZZ->
-			%io:format("compile:file(~s,~p) ->~n~p~n",
-			%	  [File,Opts,_ZZ]),
-			{error,Es,Ws}
-		end,
+    Res = case compile:file(File, Opts) of
+	      {ok,Mod,_,[{_File,Ws}]} ->
+		  {warning,Ws};
+	      {ok,Mod,_,[]} ->
+		  [];
+	      {ok,Mod,[{_File,Ws}]} ->
+		  {warning,Ws};
+	      {ok,Mod,[]} ->
+		  [];
+	      {error,[{XFile,Es}],Ws} = _ZZ when is_list(XFile) ->
+		  {error,Es,Ws};
+	      {error,[{XFile,Es1},{XFile,Es2}],Ws} = _ZZ
+		when is_list(XFile) ->
+		  {error,Es1++Es2,Ws};
+	      {error,Es,[{_File,Ws}]} = _ZZ->
+		  {error,Es,Ws}
+	  end,
     file:delete(File),
     Res.
 
 fail() ->
-    io:format("failed~n"),
-    ?t:fail().
+    ct:fail(failed).
diff --git a/lib/compiler/test/float_SUITE.erl b/lib/compiler/test/float_SUITE.erl
index 1b313ad021..771016812b 100644
--- a/lib/compiler/test/float_SUITE.erl
+++ b/lib/compiler/test/float_SUITE.erl
@@ -22,7 +22,7 @@
 	 init_per_group/2,end_per_group/2,
 	 pending/1,bif_calls/1,math_functions/1,mixed_float_and_int/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -51,11 +51,11 @@ end_per_group(_GroupName, Config) ->
 %% Shows the effect of pending exceptions on the x86.
 
 pending(Config) when is_list(Config) ->
-    ?line case catch float_mul(1, 1.1e300, 3.14e300) of
-	      {'EXIT',{badarith,_}} -> ok;
-	      Other -> ?t:fail({expected_exception,Other})
-	  end,
-    ?line 0.0 = float_sub(2.0).
+    case catch float_mul(1, 1.1e300, 3.14e300) of
+	{'EXIT',{badarith,_}} -> ok;
+	Other -> ct:fail({expected_exception,Other})
+    end,
+    0.0 = float_sub(2.0).
 
 float_sub(A)->
     catch A - 2.0.
@@ -69,11 +69,11 @@ float_mul(Iter, A, B) when is_float(A), is_float(B) ->
 %% Thanks to Mikael Pettersson and Tobias Lindahl (HiPE).
 
 bif_calls(Config) when is_list(Config) ->
-    ?line {'EXIT',{badarith,_}} = (catch bad_arith(2.0, 1.7)),
-    ?line {'EXIT',{badarith,_}} = (catch bad_arith_again(2.0, [])),
-    ?line {'EXIT',{badarith,_}} = (catch bad_arith_xor(2.0, [])),
-    ?line {'EXIT',{badarith,_}} = (catch bad_arith_hd(2.0, [])),
-    ?line {'EXIT',{badarith,_}} = (catch bad_negate(2.0, 1.7)),
+    {'EXIT',{badarith,_}} = (catch bad_arith(2.0, 1.7)),
+    {'EXIT',{badarith,_}} = (catch bad_arith_again(2.0, [])),
+    {'EXIT',{badarith,_}} = (catch bad_arith_xor(2.0, [])),
+    {'EXIT',{badarith,_}} = (catch bad_arith_hd(2.0, [])),
+    {'EXIT',{badarith,_}} = (catch bad_negate(2.0, 1.7)),
     ok.
 
 bad_arith(X, Y) when is_float(X) ->
@@ -114,51 +114,51 @@ bad_negate(X, Y) when is_float(X) ->
 
 math_functions(Config) when is_list(Config) ->
     %% Mostly silly coverage.
-    ?line 0.0 = math:tan(0),
-    ?line 0.0 = math:atan2(0, 1),
-    ?line 0.0 = math:sinh(0),
-    ?line 1.0 = math:cosh(0),
-    ?line 0.0 = math:tanh(0),
+    0.0 = math:tan(0),
+    0.0 = math:atan2(0, 1),
+    0.0 = math:sinh(0),
+    1.0 = math:cosh(0),
+    0.0 = math:tanh(0),
     1.0 = math:log2(2),
-    ?line 1.0 = math:log10(10),
-    ?line -1.0 = math:cos(math:pi()),
-    ?line 1.0 = math:exp(0),
-    ?line 1.0 = math:pow(math:pi(), 0),
-    ?line 0.0 = math:log(1),
-    ?line 0.0 = math:asin(0),
-    ?line 0.0 = math:acos(1),
-    ?line ?OPTIONAL(0.0, math:asinh(0)),
-    ?line ?OPTIONAL(0.0, math:acosh(1)),
-    ?line ?OPTIONAL(0.0, math:atanh(0)),
-    ?line ?OPTIONAL(0.0, math:erf(0)),
-    ?line ?OPTIONAL(1.0, math:erfc(0)),
-
-    ?line 0.0 = math:tan(id(0)),
-    ?line 0.0 = math:atan2(id(0), 1),
-    ?line 0.0 = math:sinh(id(0)),
-    ?line 1.0 = math:cosh(id(0)),
-    ?line 0.0 = math:tanh(id(0)),
+    1.0 = math:log10(10),
+    -1.0 = math:cos(math:pi()),
+    1.0 = math:exp(0),
+    1.0 = math:pow(math:pi(), 0),
+    0.0 = math:log(1),
+    0.0 = math:asin(0),
+    0.0 = math:acos(1),
+    ?OPTIONAL(0.0, math:asinh(0)),
+    ?OPTIONAL(0.0, math:acosh(1)),
+    ?OPTIONAL(0.0, math:atanh(0)),
+    ?OPTIONAL(0.0, math:erf(0)),
+    ?OPTIONAL(1.0, math:erfc(0)),
+
+    0.0 = math:tan(id(0)),
+    0.0 = math:atan2(id(0), 1),
+    0.0 = math:sinh(id(0)),
+    1.0 = math:cosh(id(0)),
+    0.0 = math:tanh(id(0)),
     1.0 = math:log2(id(2)),
-    ?line 1.0 = math:log10(id(10)),
-    ?line 1.0 = math:exp(id(0)),
-    ?line 0.0 = math:log(id(1)),
-    ?line 0.0 = math:asin(id(0)),
-    ?line 0.0 = math:acos(id(1)),
-    ?line ?OPTIONAL(0.0, math:asinh(id(0))),
-    ?line ?OPTIONAL(0.0, math:acosh(id(1))),
-    ?line ?OPTIONAL(0.0, math:atanh(id(0))),
-    ?line ?OPTIONAL(0.0, math:erf(id(0))),
-    ?line ?OPTIONAL(1.0, math:erfc(id(0))),
+    1.0 = math:log10(id(10)),
+    1.0 = math:exp(id(0)),
+    0.0 = math:log(id(1)),
+    0.0 = math:asin(id(0)),
+    0.0 = math:acos(id(1)),
+    ?OPTIONAL(0.0, math:asinh(id(0))),
+    ?OPTIONAL(0.0, math:acosh(id(1))),
+    ?OPTIONAL(0.0, math:atanh(id(0))),
+    ?OPTIONAL(0.0, math:erf(id(0))),
+    ?OPTIONAL(1.0, math:erfc(id(0))),
 
     %% Only for coverage (of beam_type.erl).
-    ?line {'EXIT',{undef,_}} = (catch math:fnurfla(0)),
-    ?line {'EXIT',{undef,_}} = (catch math:fnurfla(0, 0)),
-    ?line {'EXIT',{badarg,_}} = (catch float(kalle)),
-    ?line {'EXIT',{badarith,_}} = (catch name/1),
+    {'EXIT',{undef,_}} = (catch math:fnurfla(0)),
+    {'EXIT',{undef,_}} = (catch math:fnurfla(0, 0)),
+    {'EXIT',{badarg,_}} = (catch float(kalle)),
+    {'EXIT',{badarith,_}} = (catch name/1),
     ok.
 
 mixed_float_and_int(Config) when is_list(Config) ->
-    ?line 129.0 = pc(77, 23, 5),
+    129.0 = pc(77, 23, 5),
     ok.
 
 pc(Cov, NotCov, X) ->
diff --git a/lib/compiler/test/fun_SUITE.erl b/lib/compiler/test/fun_SUITE.erl
index 36a4d6fce2..77559ae2e6 100644
--- a/lib/compiler/test/fun_SUITE.erl
+++ b/lib/compiler/test/fun_SUITE.erl
@@ -27,7 +27,7 @@
 %% Internal exports.
 -export([call_me/1,dup1/0,dup2/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -60,9 +60,8 @@ l1() ->
      ?T((begin G = fun(1=0) -> ok end, {'EXIT',_} = (catch G(2)), ok end), ok)
     ].
 
-test1(suite) -> [];
 test1(Config) when is_list(Config) ->
-    ?line lists:foreach(fun one_test/1, eval_list(l1(), [])),
+    lists:foreach(fun one_test/1, eval_list(l1(), [])),
     ok.
 
 evaluate(Str, Vars) ->
@@ -93,7 +92,7 @@ one_test({C, E, Str, Correct}) ->
 	true ->
 	    io:format("ERROR: Compiled: ~p. Expected ~p. Got ~p.~n",
 		      [Str, Correct, C]),
-	    test_server:fail(comp)
+	    ct:fail(comp)
     end,
     if
 	E == Correct ->
@@ -101,7 +100,7 @@ one_test({C, E, Str, Correct}) ->
 	true ->
 	    io:format("ERROR: Interpreted: ~p. Expected ~p. Got ~p.~n",
 		      [Str, Correct, E]),
-	    test_server:fail(comp)
+	    ct:fail(comp)
     end.
 
 -record(b, {c}).
@@ -109,9 +108,9 @@ one_test({C, E, Str, Correct}) ->
 %% OTP-7102. (Thanks to Simon Cornish.)
 
 overwritten_fun(Config) when is_list(Config) ->
-    ?line {a2,a} = overwritten_fun_1(a),
-    ?line {a2,{b,c}} = overwritten_fun_1(#b{c=c}),
-    ?line one = overwritten_fun_1(#b{c=[]}),
+    {a2,a} = overwritten_fun_1(a),
+    {a2,{b,c}} = overwritten_fun_1(#b{c=c}),
+    one = overwritten_fun_1(#b{c=[]}),
     ok.
 
 overwritten_fun_1(A) ->
@@ -153,8 +152,8 @@ otp_7202_func() ->
     no_value.
     
 bif_fun(Config) when is_list(Config) ->
-    ?line F = fun abs/1,
-    ?line 5 = F(-5),
+    F = fun abs/1,
+    5 = F(-5),
     ok.
 
 -define(APPLY(M, F, A), (fun(Fun) -> {ok,{a,b}} = Fun({a,b}) end)(fun M:F/A)).
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index 47eb1ba78b..129db039e1 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(guard_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
@@ -69,23 +69,23 @@ end_per_group(_GroupName, Config) ->
 
 
 misc(Config) when is_list(Config) ->
-    ?line 42 = case id(42) of
-		   X when -X -> ok;
-		   X -> X
-	       end,
-    ?line {a,b,c} = misc_1([{{a,b,c}},{[4]},{[3]},{-2}]),
-    ?line none = misc_1([{{a,b,c}},{[4]},{[3]},{-3}]),
-    ?line none = misc_1([{{a,b,c}},{[4]},{[7]},{-2}]),
-    ?line none = misc_1([{{a,b,c}},{[4]},{[3]},{[1,2,3]}]),
-
-    ?line {ok,buf,<<>>} = get_data({o,true,raw}, 0, buf),
-    ?line {ok,buf,<<>>} = get_data({o,true,raw}, 42, buf),
-    ?line {ok,buf,<<>>} = get_data({o,false,raw}, 0, buf),
-    ?line error = get_data({o,false,raw}, 42, buf),
-    ?line {ok,buf,<<>>} = get_data({o,true,0}, 0, buf),
-    ?line {ok,buf,<<>>} = get_data({o,true,0}, 42, buf),
-    ?line {ok,buf,<<>>} = get_data({o,false,0}, 0, buf),
-    ?line error = get_data({o,false,0}, 42, buf),
+    42 = case id(42) of
+	     X when -X -> ok;
+	     X -> X
+	 end,
+    {a,b,c} = misc_1([{{a,b,c}},{[4]},{[3]},{-2}]),
+    none = misc_1([{{a,b,c}},{[4]},{[3]},{-3}]),
+    none = misc_1([{{a,b,c}},{[4]},{[7]},{-2}]),
+    none = misc_1([{{a,b,c}},{[4]},{[3]},{[1,2,3]}]),
+
+    {ok,buf,<<>>} = get_data({o,true,raw}, 0, buf),
+    {ok,buf,<<>>} = get_data({o,true,raw}, 42, buf),
+    {ok,buf,<<>>} = get_data({o,false,raw}, 0, buf),
+    error = get_data({o,false,raw}, 42, buf),
+    {ok,buf,<<>>} = get_data({o,true,0}, 0, buf),
+    {ok,buf,<<>>} = get_data({o,true,0}, 42, buf),
+    {ok,buf,<<>>} = get_data({o,false,0}, 0, buf),
+    error = get_data({o,false,0}, 42, buf),
     ok.
     
 
@@ -107,11 +107,11 @@ get_data({o,Active,Raw}, BytesToRead, Buffer)
     end.
 
 const_cond(Config) when is_list(Config) ->
-    ?line ok = const_cond({}, 0),
-    ?line ok = const_cond({a}, 1),
-    ?line error = const_cond({a,b}, 3),
-    ?line error = const_cond({a}, 0),
-    ?line error = const_cond({a,b}, 1),
+    ok = const_cond({}, 0),
+    ok = const_cond({a}, 1),
+    error = const_cond({a,b}, 3),
+    error = const_cond({a}, 0),
+    error = const_cond({a,b}, 1),
     ok.
 
 const_cond(T, Sz) ->
@@ -132,80 +132,80 @@ basic_not(Config) when is_list(Config) ->
     D = id(5),
     ATuple = {False,True,Glurf},
 
-    ?line check(fun() -> if not false -> ok; true -> error end end, ok),
-    ?line check(fun() -> if not true -> ok; true -> error end end, error),
-    ?line check(fun() -> if not False -> ok; true -> error end end, ok),
-    ?line check(fun() -> if not True -> ok; true -> error end end, error),
+    check(fun() -> if not false -> ok; true -> error end end, ok),
+    check(fun() -> if not true -> ok; true -> error end end, error),
+    check(fun() -> if not False -> ok; true -> error end end, ok),
+    check(fun() -> if not True -> ok; true -> error end end, error),
 
-    ?line check(fun() -> if A > B -> gt; A < B -> lt; A == B -> eq end end, lt),
-    ?line check(fun() -> if A > C -> gt; A < C -> lt; A == C -> eq end end, gt),
-    ?line check(fun() -> if A > D -> gt; A < D -> lt; A == D -> eq end end, eq),
+    check(fun() -> if A > B -> gt; A < B -> lt; A == B -> eq end end, lt),
+    check(fun() -> if A > C -> gt; A < C -> lt; A == C -> eq end end, gt),
+    check(fun() -> if A > D -> gt; A < D -> lt; A == D -> eq end end, eq),
 
-    ?line check(fun() -> if not (7 > 453) -> le; not (7 < 453) -> ge;
-			    not (7 == 453) -> ne; true -> eq end end, le),
-    ?line check(fun() -> if not (7 > -8) -> le; not (7 < -8) -> ge;
-			    not (7 == -8) -> ne; true -> eq end end, ge),
-    ?line check(fun() -> if not (7 > 7) -> le; not (7 < 7) -> ge;
-			    not (7 == 7) -> ne; true -> eq end end, le),
+    check(fun() -> if not (7 > 453) -> le; not (7 < 453) -> ge;
+		      not (7 == 453) -> ne; true -> eq end end, le),
+    check(fun() -> if not (7 > -8) -> le; not (7 < -8) -> ge;
+		      not (7 == -8) -> ne; true -> eq end end, ge),
+    check(fun() -> if not (7 > 7) -> le; not (7 < 7) -> ge;
+		      not (7 == 7) -> ne; true -> eq end end, le),
 
-    ?line check(fun() -> if not (A > B) -> le; not (A < B) -> ge;
-			    not (A == B) -> ne; true -> eq end end, le),
-    ?line check(fun() -> if not (A > C) -> le; not (A < C) -> ge;
-			    not (A == C) -> ne; true -> eq end end, ge),
-    ?line check(fun() -> if not (A > D) -> le; not (A < D) -> ge;
-			    not (A == D) -> ne; true -> eq end end, le),
+    check(fun() -> if not (A > B) -> le; not (A < B) -> ge;
+		      not (A == B) -> ne; true -> eq end end, le),
+    check(fun() -> if not (A > C) -> le; not (A < C) -> ge;
+		      not (A == C) -> ne; true -> eq end end, ge),
+    check(fun() -> if not (A > D) -> le; not (A < D) -> ge;
+		      not (A == D) -> ne; true -> eq end end, le),
 
-    ?line check(fun() -> if not element(1, ATuple) -> ok; true -> error end end, ok),
-    ?line check(fun() -> if not element(2, ATuple) -> ok; true -> error end end, error),
-    ?line check(fun() -> if not element(3, ATuple) -> ok; true -> error end end, error),
+    check(fun() -> if not element(1, ATuple) -> ok; true -> error end end, ok),
+    check(fun() -> if not element(2, ATuple) -> ok; true -> error end end, error),
+    check(fun() -> if not element(3, ATuple) -> ok; true -> error end end, error),
 
-    ?line check(fun() -> if not glurf -> ok; true -> error end end, error),
-    ?line check(fun() -> if not Glurf -> ok; true -> error end end, error),
+    check(fun() -> if not glurf -> ok; true -> error end end, error),
+    check(fun() -> if not Glurf -> ok; true -> error end end, error),
 
     ok.
 
 complex_not(Config) when is_list(Config) ->
     ATuple = id({false,true,gurka}),
-    ?line check(fun() -> if not(element(1, ATuple)) -> ok; true -> error end end, ok),
-    ?line check(fun() -> if not(element(2, ATuple)) -> ok; true -> error end end, error),
+    check(fun() -> if not(element(1, ATuple)) -> ok; true -> error end end, ok),
+    check(fun() -> if not(element(2, ATuple)) -> ok; true -> error end end, error),
 
-    ?line check(fun() -> if not(element(3, ATuple) == gurka) -> ok;
-			    true -> error end end, error),
-    ?line check(fun() -> if not(element(3, ATuple) =/= gurka) -> ok;
-			    true -> error end end, ok),
+    check(fun() -> if not(element(3, ATuple) == gurka) -> ok;
+		      true -> error end end, error),
+    check(fun() -> if not(element(3, ATuple) =/= gurka) -> ok;
+		      true -> error end end, ok),
 
-    ?line check(fun() -> if {a,not(element(2, ATuple))} == {a,false} -> ok;
-			    true -> error end end, ok),
-    ?line check(fun() -> if {a,not(element(1, ATuple))} == {a,false} -> ok;
-			    true -> error end end, error),
+    check(fun() -> if {a,not(element(2, ATuple))} == {a,false} -> ok;
+		      true -> error end end, ok),
+    check(fun() -> if {a,not(element(1, ATuple))} == {a,false} -> ok;
+		      true -> error end end, error),
 
-    ?line check(fun() -> if not(element(1, ATuple) or element(3, ATuple)) -> ok;
-			    true -> error end end, error),
+    check(fun() -> if not(element(1, ATuple) or element(3, ATuple)) -> ok;
+		      true -> error end end, error),
 
     %% orelse
-    ?line check(fun() -> if not(element(1, ATuple) orelse element(3, ATuple)) -> ok;
-			    true -> error end end, error),
+    check(fun() -> if not(element(1, ATuple) orelse element(3, ATuple)) -> ok;
+		      true -> error end end, error),
 
     ok.
 
 nested_nots(Config) when is_list(Config) ->
-    ?line true = nested_not_1(0, 0),
-    ?line true = nested_not_1(0, 1),
-    ?line true = nested_not_1(a, b),
-    ?line true = nested_not_1(10, 0),
-    ?line false = nested_not_1(z, a),
-    ?line false = nested_not_1(3.4, {anything,goes}),
-    ?line false = nested_not_1(3.4, atom),
-    ?line true = nested_not_1(3.0, [list]),
-
-    ?line true = nested_not_2(false, false, 42),
-    ?line true = nested_not_2(false, true, 42),
-    ?line true = nested_not_2(true, false, 42),
-    ?line true = nested_not_2(true, true, 42),
-    ?line true = nested_not_2(false, false, atom),
-    ?line false = nested_not_2(false, true, atom),
-    ?line false = nested_not_2(true, false, atom),
-    ?line false = nested_not_2(true, true, atom),
+    true = nested_not_1(0, 0),
+    true = nested_not_1(0, 1),
+    true = nested_not_1(a, b),
+    true = nested_not_1(10, 0),
+    false = nested_not_1(z, a),
+    false = nested_not_1(3.4, {anything,goes}),
+    false = nested_not_1(3.4, atom),
+    true = nested_not_1(3.0, [list]),
+
+    true = nested_not_2(false, false, 42),
+    true = nested_not_2(false, true, 42),
+    true = nested_not_2(true, false, 42),
+    true = nested_not_2(true, true, 42),
+    true = nested_not_2(false, false, atom),
+    false = nested_not_2(false, true, atom),
+    false = nested_not_2(true, false, atom),
+    false = nested_not_2(true, true, atom),
     ok.
 
 nested_not_1(X, Y) when not (((X>Y) or not(is_atom(X))) and
@@ -227,112 +227,112 @@ semicolon(Config) when is_list(Config) ->
 
     %% True/false combined using ';' (literal atoms).
 
-    ?line check(fun() -> if true; false -> ok end end, ok),
-    ?line check(fun() -> if false; true -> ok end end, ok),
-    ?line check(fun() -> if true; true -> ok end end, ok),
-    ?line check(fun() -> if false; false -> ok; true -> error end end, error),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} = (catch if false; false -> ok end),
-			exit
-		end, exit),
+    check(fun() -> if true; false -> ok end end, ok),
+    check(fun() -> if false; true -> ok end end, ok),
+    check(fun() -> if true; true -> ok end end, ok),
+    check(fun() -> if false; false -> ok; true -> error end end, error),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} = (catch if false; false -> ok end),
+		  exit
+	  end, exit),
 
     %% True/false combined used ';'.
 
     True = id(true),
     False = id(false),
 
-    ?line check(fun() -> if True; False -> ok end end, ok),
-    ?line check(fun() -> if False; True -> ok end end, ok),
-    ?line check(fun() -> if True; True -> ok end end, ok),
-    ?line check(fun() -> if False; False -> ok; true -> error end end, error),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} = (catch if False; False -> ok end),
-			exit
-		end, exit),
+    check(fun() -> if True; False -> ok end end, ok),
+    check(fun() -> if False; True -> ok end end, ok),
+    check(fun() -> if True; True -> ok end end, ok),
+    check(fun() -> if False; False -> ok; true -> error end end, error),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} = (catch if False; False -> ok end),
+		  exit
+	  end, exit),
 
     %% Combine true/false with a non-boolean value.
     Glurf = id(glurf),
 
 
-    ?line check(fun() -> if True; Glurf -> ok end end, ok),
-    ?line check(fun() -> if Glurf; True -> ok end end, ok),
-    ?line check(fun() -> if Glurf; Glurf -> ok; true -> error end end, error),
-    ?line check(fun() -> if False; Glurf -> ok; true -> error end end, error),
-    ?line check(fun() -> if Glurf; False -> ok; true -> error end end, error),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} = (catch if Glurf; Glurf -> ok end),
-			exit
-		end, exit),
+    check(fun() -> if True; Glurf -> ok end end, ok),
+    check(fun() -> if Glurf; True -> ok end end, ok),
+    check(fun() -> if Glurf; Glurf -> ok; true -> error end end, error),
+    check(fun() -> if False; Glurf -> ok; true -> error end end, error),
+    check(fun() -> if Glurf; False -> ok; true -> error end end, error),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} = (catch if Glurf; Glurf -> ok end),
+		  exit
+	  end, exit),
 
     %% Combine true/false with errors.
 
     ATuple = id({false,true,gurka}),
 
-    ?line check(fun() -> if True; element(42, ATuple) -> ok end end, ok),
-    ?line check(fun() -> if element(42, ATuple); True -> ok end end, ok),
-    ?line check(fun() -> if element(42, ATuple); element(42, ATuple) -> ok;
-			    true -> error end end, error),
-    ?line check(fun() -> if False; element(42, ATuple) -> ok;
-			    true -> error end end, error),
-    ?line check(fun() -> if element(42, ATuple);
-			    False -> ok; true -> error end end, error),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} =
-			    (catch if element(42, ATuple);
-				      element(42, ATuple) -> ok end),
-			exit
-		end, exit),
+    check(fun() -> if True; element(42, ATuple) -> ok end end, ok),
+    check(fun() -> if element(42, ATuple); True -> ok end end, ok),
+    check(fun() -> if element(42, ATuple); element(42, ATuple) -> ok;
+		      true -> error end end, error),
+    check(fun() -> if False; element(42, ATuple) -> ok;
+		      true -> error end end, error),
+    check(fun() -> if element(42, ATuple);
+		      False -> ok; true -> error end end, error),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} =
+		      (catch if element(42, ATuple);
+				element(42, ATuple) -> ok end),
+		  exit
+	  end, exit),
 
     ok.
 
 complex_semicolon(Config) when is_list(Config) ->
-    ?line ok = csemi1(int, {blurf}),
-    ?line ok = csemi1(string, {blurf}),
-    ?line ok = csemi1(float, [a]),
-    ?line error = csemi1(35, 42),
+    ok = csemi1(int, {blurf}),
+    ok = csemi1(string, {blurf}),
+    ok = csemi1(float, [a]),
+    error = csemi1(35, 42),
 
     %% 2
-    ?line ok = csemi2({}, {a,b,c}),
-    ?line ok = csemi2({1,3.5}, {a,b,c}),
-    ?line ok = csemi2(dum, {a,b,c}),
+    ok = csemi2({}, {a,b,c}),
+    ok = csemi2({1,3.5}, {a,b,c}),
+    ok = csemi2(dum, {a,b,c}),
 
-    ?line ok = csemi2({45,-19.3}, {}),
-    ?line ok = csemi2({45,-19.3}, {dum}),
-    ?line ok = csemi2({45,-19.3}, {dum,dum}),
+    ok = csemi2({45,-19.3}, {}),
+    ok = csemi2({45,-19.3}, {dum}),
+    ok = csemi2({45,-19.3}, {dum,dum}),
 
-    ?line error = csemi2({45}, {dum}),
-    ?line error = csemi2([], {dum}),
-    ?line error = csemi2({dum}, []),
-    ?line error = csemi2([], []),
+    error = csemi2({45}, {dum}),
+    error = csemi2([], {dum}),
+    error = csemi2({dum}, []),
+    error = csemi2([], []),
 
     %% 3
-    ?line csemi3(fun csemi3a/4),
-    ?line csemi3(fun csemi3b/4),
-    ?line csemi3(fun csemi3c/4),
+    csemi3(fun csemi3a/4),
+    csemi3(fun csemi3b/4),
+    csemi3(fun csemi3c/4),
 
     %% 4
-    ?line csemi4(fun csemi4a/4),
-    ?line csemi4(fun csemi4b/4),
-    ?line csemi4(fun csemi4c/4),
-    ?line csemi4(fun csemi4d/4),
+    csemi4(fun csemi4a/4),
+    csemi4(fun csemi4b/4),
+    csemi4(fun csemi4c/4),
+    csemi4(fun csemi4d/4),
 
     %% 4, 'orelse' instead of 'or'
-    ?line csemi4_orelse(fun csemi4_orelse_a/4),
-    ?line csemi4_orelse(fun csemi4_orelse_b/4),
-    ?line csemi4_orelse(fun csemi4_orelse_c/4),
-    ?line csemi4_orelse(fun csemi4_orelse_d/4),
+    csemi4_orelse(fun csemi4_orelse_a/4),
+    csemi4_orelse(fun csemi4_orelse_b/4),
+    csemi4_orelse(fun csemi4_orelse_c/4),
+    csemi4_orelse(fun csemi4_orelse_d/4),
 
     %% 5
-    ?line error = csemi5(0, 0),
-    ?line ok = csemi5(5, 0),
-    ?line ok = csemi5(4, -4),
-    ?line ok = csemi5(10, -4),
+    error = csemi5(0, 0),
+    ok = csemi5(5, 0),
+    ok = csemi5(4, -4),
+    ok = csemi5(10, -4),
 
     %% 6
-    ?line error = csemi6({a}, 0),
-    ?line ok = csemi6({a,b}, 0),
-    ?line ok = csemi6({}, 3),
-    ?line ok = csemi6({a,b,c}, 3),
+    error = csemi6({a}, 0),
+    ok = csemi6({a,b}, 0),
+    ok = csemi6({}, 3),
+    ok = csemi6({a,b,c}, 3),
 
     %% 7
     error = csemi7(#{a=>1}, 1, 0),
@@ -427,7 +427,7 @@ csemi4_orelse(Test) ->
     ok = Test({}, 2, blurf, 0),
     ok = Test({}, 2, {1}, 2),
 
-    ?line error = Test([], 1, {}, 0),
+    error = Test([], 1, {}, 0),
 
     ok.
 
@@ -460,72 +460,72 @@ comma(Config) when is_list(Config) ->
 
     %% ',' combinations of literal true/false.
 
-    ?line check(fun() -> if true, false -> ok; true -> error end end, error),
-    ?line check(fun() -> if false, true -> ok; true -> error end end, error),
-    ?line check(fun() -> if true, true -> ok end end, ok),
-    ?line check(fun() -> if false, false -> ok; true -> error end end, error),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} =
-			    (catch if true, false -> ok;
-				      false, true -> ok;
-				      false, false -> ok
-				   end),
-			exit
-		end, exit),
+    check(fun() -> if true, false -> ok; true -> error end end, error),
+    check(fun() -> if false, true -> ok; true -> error end end, error),
+    check(fun() -> if true, true -> ok end end, ok),
+    check(fun() -> if false, false -> ok; true -> error end end, error),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} =
+		      (catch if true, false -> ok;
+				false, true -> ok;
+				false, false -> ok
+			     end),
+		  exit
+	  end, exit),
 
     %% ',' combinations of true/false in variables.
 
     True = id(true),
     False = id(false),
 
-    ?line check(fun() -> if True, False -> ok; true -> error end end, error),
-    ?line check(fun() -> if False, True -> ok; true -> error end end, error),
-    ?line check(fun() -> if True, True -> ok end end, ok),
-    ?line check(fun() -> if False, False -> ok; true -> error end end, error),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} =
-			    (catch if True, False -> ok;
-				      False, True -> ok;
-				      False, False -> ok
-				   end),
-			exit
-		end, exit),
+    check(fun() -> if True, False -> ok; true -> error end end, error),
+    check(fun() -> if False, True -> ok; true -> error end end, error),
+    check(fun() -> if True, True -> ok end end, ok),
+    check(fun() -> if False, False -> ok; true -> error end end, error),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} =
+		      (catch if True, False -> ok;
+				False, True -> ok;
+				False, False -> ok
+			     end),
+		  exit
+	  end, exit),
 
     %% ',' combinations of true/false, and non-boolean in variables.
 
     Glurf = id(glurf),
 
-    ?line check(fun() -> if True, Glurf -> ok; true -> error end end, error),
-    ?line check(fun() -> if Glurf, True -> ok; true -> error end end, error),
-    ?line check(fun() -> if True, True -> ok end end, ok),
-    ?line check(fun() -> if Glurf, Glurf -> ok; true -> error end end, error),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} =
-			    (catch if True, Glurf -> ok;
-				      Glurf, True -> ok;
-				      Glurf, Glurf -> ok
-				   end),
-			exit
-		end, exit),
+    check(fun() -> if True, Glurf -> ok; true -> error end end, error),
+    check(fun() -> if Glurf, True -> ok; true -> error end end, error),
+    check(fun() -> if True, True -> ok end end, ok),
+    check(fun() -> if Glurf, Glurf -> ok; true -> error end end, error),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} =
+		      (catch if True, Glurf -> ok;
+				Glurf, True -> ok;
+				Glurf, Glurf -> ok
+			     end),
+		  exit
+	  end, exit),
 
     %% ',' combinations of true/false with errors.
     ATuple = id({a,b,c}),
 
-    ?line check(fun() -> if True, element(42, ATuple) -> ok;
-			    true -> error end end, error),
-    ?line check(fun() -> if element(42, ATuple), True -> ok;
-			    true -> error end end, error),
-    ?line check(fun() -> if True, True -> ok end end, ok),
-    ?line check(fun() -> if element(42, ATuple), element(42, ATuple) -> ok;
-			    true -> error end end, error),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} =
-			    (catch if True, element(42, ATuple) -> ok;
-				      element(42, ATuple), True -> ok;
-				      element(42, ATuple), element(42, ATuple) -> ok
-				   end),
-			exit
-		end, exit),
+    check(fun() -> if True, element(42, ATuple) -> ok;
+		      true -> error end end, error),
+    check(fun() -> if element(42, ATuple), True -> ok;
+		      true -> error end end, error),
+    check(fun() -> if True, True -> ok end end, ok),
+    check(fun() -> if element(42, ATuple), element(42, ATuple) -> ok;
+		      true -> error end end, error),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} =
+		      (catch if True, element(42, ATuple) -> ok;
+				element(42, ATuple), True -> ok;
+				element(42, ATuple), element(42, ATuple) -> ok
+			     end),
+		  exit
+	  end, exit),
     
     ok.
 
@@ -535,35 +535,35 @@ or_guard(Config) when is_list(Config) ->
     Glurf = id(glurf),
 
     %% 'or' combinations of literal true/false.
-    ?line check(fun() -> if true or false -> ok end end, ok),
-    ?line check(fun() -> if false or true -> ok end end, ok),
-    ?line check(fun() -> if true or true -> ok end end, ok),
-    ?line check(fun() -> if false or false -> ok; true -> error end end, error),
+    check(fun() -> if true or false -> ok end end, ok),
+    check(fun() -> if false or true -> ok end end, ok),
+    check(fun() -> if true or true -> ok end end, ok),
+    check(fun() -> if false or false -> ok; true -> error end end, error),
 
-    ?line check(fun() -> if glurf or true -> ok; true -> error end end, error),
-    ?line check(fun() -> if true or glurf -> ok; true -> error end end, error),
-    ?line check(fun() -> if glurf or glurf -> ok; true -> error end end, error),
+    check(fun() -> if glurf or true -> ok; true -> error end end, error),
+    check(fun() -> if true or glurf -> ok; true -> error end end, error),
+    check(fun() -> if glurf or glurf -> ok; true -> error end end, error),
 
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} = (catch if false or false -> ok end),
-			exit
-		end, exit),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} = (catch if false or false -> ok end),
+		  exit
+	  end, exit),
 
 
     %% 'or' combinations using variables containing true/false.
-    ?line check(fun() -> if True or False -> ok end end, ok),
-    ?line check(fun() -> if False or True -> ok end end, ok),
-    ?line check(fun() -> if True or True -> ok end end, ok),
-    ?line check(fun() -> if False or False -> ok; true -> error end end, error),
+    check(fun() -> if True or False -> ok end end, ok),
+    check(fun() -> if False or True -> ok end end, ok),
+    check(fun() -> if True or True -> ok end end, ok),
+    check(fun() -> if False or False -> ok; true -> error end end, error),
 
-    ?line check(fun() -> if True or Glurf -> ok; true -> error end end, error),
-    ?line check(fun() -> if Glurf or True -> ok; true -> error end end, error),
-    ?line check(fun() -> if Glurf or Glurf -> ok; true -> error end end, error),
+    check(fun() -> if True or Glurf -> ok; true -> error end end, error),
+    check(fun() -> if Glurf or True -> ok; true -> error end end, error),
+    check(fun() -> if Glurf or Glurf -> ok; true -> error end end, error),
 
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} = (catch if False or False -> ok end),
-			exit
-		end, exit),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} = (catch if False or False -> ok end),
+		  exit
+	  end, exit),
 
     ok.
 
@@ -572,142 +572,142 @@ more_or_guards(Config) when is_list(Config) ->
     False = id(false),
     ATuple = id({false,true,gurka}),
 
-    ?line check(fun() ->
-			if element(42, ATuple) or False -> ok;
-			   true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if False or element(42, ATuple) -> ok;
-			   true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if element(18, ATuple) or element(42, ATuple) -> ok;
-			   true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if True or element(42, ATuple) -> ok;
-			   true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if element(42, ATuple) or True -> ok;
-			   true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if element(1, ATuple) or element(42, ATuple) or True -> ok;
-			   true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if element(1, ATuple) or True or element(42, ATuple) -> ok;
-			   true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if
-			    (<<False:8>> == <<0>>) or element(2, ATuple) -> ok;
-			    true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if
-			    element(2, ATuple) or (<<True:8>> == <<1>>) -> ok;
-			    true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if element(2, ATuple) or element(42, ATuple) -> ok;
-			   true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if
-			    element(1, ATuple) or
-			    element(2, ATuple) or
-			    element(19, ATuple) -> ok;
-			    true -> error end
-		end, error),
+    check(fun() ->
+		  if element(42, ATuple) or False -> ok;
+		     true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if False or element(42, ATuple) -> ok;
+		     true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if element(18, ATuple) or element(42, ATuple) -> ok;
+		     true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if True or element(42, ATuple) -> ok;
+		     true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if element(42, ATuple) or True -> ok;
+		     true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if element(1, ATuple) or element(42, ATuple) or True -> ok;
+		     true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if element(1, ATuple) or True or element(42, ATuple) -> ok;
+		     true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if
+		      (<<False:8>> == <<0>>) or element(2, ATuple) -> ok;
+		      true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if
+		      element(2, ATuple) or (<<True:8>> == <<1>>) -> ok;
+		      true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if element(2, ATuple) or element(42, ATuple) -> ok;
+		     true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if
+		      element(1, ATuple) or
+		      element(2, ATuple) or
+		      element(19, ATuple) -> ok;
+		      true -> error end
+	  end, error),
     ok.
 
 complex_or_guards(Config) when is_list(Config) ->
     %% complex_or_1/2
-    ?line ok = complex_or_1({a,b,c,d}, {1,2,3}),
-    ?line ok = complex_or_1({a,b,c,d}, {1}),
-    ?line ok = complex_or_1({a}, {1,2,3}),
-    ?line error = complex_or_1({a}, {1}),
+    ok = complex_or_1({a,b,c,d}, {1,2,3}),
+    ok = complex_or_1({a,b,c,d}, {1}),
+    ok = complex_or_1({a}, {1,2,3}),
+    error = complex_or_1({a}, {1}),
 
-    ?line error = complex_or_1(1, 2),
-    ?line error = complex_or_1([], {a,b,c,d}),
-    ?line error = complex_or_1({a,b,c,d}, []),
+    error = complex_or_1(1, 2),
+    error = complex_or_1([], {a,b,c,d}),
+    error = complex_or_1({a,b,c,d}, []),
 
 
     %% complex_or_2/1
-    ?line ok = complex_or_2({true,{}}),
-    ?line ok = complex_or_2({false,{a}}),
-    ?line ok = complex_or_2({false,{a,b,c}}),
-    ?line ok = complex_or_2({true,{a,b,c,d}}),
+    ok = complex_or_2({true,{}}),
+    ok = complex_or_2({false,{a}}),
+    ok = complex_or_2({false,{a,b,c}}),
+    ok = complex_or_2({true,{a,b,c,d}}),
 
-    ?line error = complex_or_2({blurf,{a,b,c}}),
+    error = complex_or_2({blurf,{a,b,c}}),
     
-    ?line error = complex_or_2({true}),
-    ?line error = complex_or_2({true,no_tuple}),
-    ?line error = complex_or_2({true,[]}),
+    error = complex_or_2({true}),
+    error = complex_or_2({true,no_tuple}),
+    error = complex_or_2({true,[]}),
 
     %% complex_or_3/2
-    ?line ok = complex_or_3({true}, {}),
-    ?line ok = complex_or_3({false}, {a}),
-    ?line ok = complex_or_3({false}, {a,b,c}),
-    ?line ok = complex_or_3({true}, {a,b,c,d}),
-    ?line ok = complex_or_3({false}, <<1,2,3>>),
-    ?line ok = complex_or_3({true}, <<1,2,3,4>>),
+    ok = complex_or_3({true}, {}),
+    ok = complex_or_3({false}, {a}),
+    ok = complex_or_3({false}, {a,b,c}),
+    ok = complex_or_3({true}, {a,b,c,d}),
+    ok = complex_or_3({false}, <<1,2,3>>),
+    ok = complex_or_3({true}, <<1,2,3,4>>),
 
-    ?line error = complex_or_3(blurf, {a,b,c}),
+    error = complex_or_3(blurf, {a,b,c}),
 
-    ?line error = complex_or_3({false}, <<1,2,3,4>>),
-    ?line error = complex_or_3([], <<1,2>>),
-    ?line error = complex_or_3({true}, 45),
-    ?line error = complex_or_3(<<>>, <<>>),
+    error = complex_or_3({false}, <<1,2,3,4>>),
+    error = complex_or_3([], <<1,2>>),
+    error = complex_or_3({true}, 45),
+    error = complex_or_3(<<>>, <<>>),
 
     %% complex_or_4/2
-    ?line ok = complex_or_4(<<1,2,3>>, {true}),
-    ?line ok = complex_or_4(<<1,2,3>>, {false}),
-    ?line ok = complex_or_4(<<1,2,3>>, {true}),
-    ?line ok = complex_or_4({1,2,3}, {true}),
-    ?line error = complex_or_4({1,2,3,4}, {false}),
+    ok = complex_or_4(<<1,2,3>>, {true}),
+    ok = complex_or_4(<<1,2,3>>, {false}),
+    ok = complex_or_4(<<1,2,3>>, {true}),
+    ok = complex_or_4({1,2,3}, {true}),
+    error = complex_or_4({1,2,3,4}, {false}),
 
-    ?line error = complex_or_4(<<1,2,3,4>>, []),
-    ?line error = complex_or_4([], {true}),
+    error = complex_or_4(<<1,2,3,4>>, []),
+    error = complex_or_4([], {true}),
 
     %% complex_or_5/2
-    ?line ok = complex_or_5(<<1>>, {false}),
-    ?line ok = complex_or_5(<<1,2,3>>, {true}),
-    ?line ok = complex_or_5(<<1,2,3,4>>, {false}),
-    ?line ok = complex_or_5({1,2,3}, {false}),
-    ?line ok = complex_or_5({1,2,3,4}, {false}),
+    ok = complex_or_5(<<1>>, {false}),
+    ok = complex_or_5(<<1,2,3>>, {true}),
+    ok = complex_or_5(<<1,2,3,4>>, {false}),
+    ok = complex_or_5({1,2,3}, {false}),
+    ok = complex_or_5({1,2,3,4}, {false}),
 
-    ?line error = complex_or_5(blurf, {false}),
-    ?line error = complex_or_5(<<1>>, klarf),
-    ?line error = complex_or_5(blurf, klarf),
+    error = complex_or_5(blurf, {false}),
+    error = complex_or_5(<<1>>, klarf),
+    error = complex_or_5(blurf, klarf),
 
     %% complex_or_6/2
-    ?line ok = complex_or_6({true,true}, {1,2,3,4}),
-    ?line ok = complex_or_6({true,true}, <<1,2,3,4>>),
-    ?line ok = complex_or_6({false,false}, <<1,2,3,4>>),
-    ?line ok = complex_or_6({false,true}, <<1>>),
-    ?line ok = complex_or_6({true,false}, {1}),
-    ?line ok = complex_or_6({true,true}, {1}),
+    ok = complex_or_6({true,true}, {1,2,3,4}),
+    ok = complex_or_6({true,true}, <<1,2,3,4>>),
+    ok = complex_or_6({false,false}, <<1,2,3,4>>),
+    ok = complex_or_6({false,true}, <<1>>),
+    ok = complex_or_6({true,false}, {1}),
+    ok = complex_or_6({true,true}, {1}),
 
-    ?line error = complex_or_6({false,false}, {1}),
+    error = complex_or_6({false,false}, {1}),
 
-    ?line error = complex_or_6({true}, {1,2,3,4}),
-    ?line error = complex_or_6({}, {1,2,3,4}),
-    ?line error = complex_or_6([], {1,2,3,4}),
-    ?line error = complex_or_6([], {1,2,3,4}),
-    ?line error = complex_or_6({true,false}, klurf),
+    error = complex_or_6({true}, {1,2,3,4}),
+    error = complex_or_6({}, {1,2,3,4}),
+    error = complex_or_6([], {1,2,3,4}),
+    error = complex_or_6([], {1,2,3,4}),
+    error = complex_or_6({true,false}, klurf),
 
     ok.
 
@@ -753,79 +753,79 @@ and_guard(Config) when is_list(Config) ->
 
     %% 'and' combinations of literal true/false.
 
-    ?line check(fun() -> if true and false -> ok; true -> error end end, error),
-    ?line check(fun() -> if false and true -> ok; true -> error end end, error),
-    ?line check(fun() -> if true and true -> ok end end, ok),
-    ?line check(fun() -> if false and false -> ok; true -> error end end, error),
-
-    ?line check(fun() -> if glurf and true -> ok; true -> error end end, error),
-    ?line check(fun() -> if true and glurf -> ok; true -> error end end, error),
-    ?line check(fun() -> if glurf and glurf -> ok; true -> error end end, error),
-
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} =
-			    (catch if true and false -> ok;
-				      false and true -> ok;
-				      false and false -> ok
-				   end),
-			exit
-		end, exit),
+    check(fun() -> if true and false -> ok; true -> error end end, error),
+    check(fun() -> if false and true -> ok; true -> error end end, error),
+    check(fun() -> if true and true -> ok end end, ok),
+    check(fun() -> if false and false -> ok; true -> error end end, error),
+
+    check(fun() -> if glurf and true -> ok; true -> error end end, error),
+    check(fun() -> if true and glurf -> ok; true -> error end end, error),
+    check(fun() -> if glurf and glurf -> ok; true -> error end end, error),
+
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} =
+		      (catch if true and false -> ok;
+				false and true -> ok;
+				false and false -> ok
+			     end),
+		  exit
+	  end, exit),
 
     %% 'and' combinations of true/false in variables.
 
     True = id(true),
     False = id(false),
 
-    ?line check(fun() -> if True and False -> ok; true -> error end end, error),
-    ?line check(fun() -> if False and True -> ok; true -> error end end, error),
-    ?line check(fun() -> if True and True -> ok end end, ok),
-    ?line check(fun() -> if False and False -> ok; true -> error end end, error),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} =
-			    (catch if True and False -> ok;
-				      False and True -> ok;
-				      False and False -> ok
-				   end),
-			exit
-		end, exit),
+    check(fun() -> if True and False -> ok; true -> error end end, error),
+    check(fun() -> if False and True -> ok; true -> error end end, error),
+    check(fun() -> if True and True -> ok end end, ok),
+    check(fun() -> if False and False -> ok; true -> error end end, error),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} =
+		      (catch if True and False -> ok;
+				False and True -> ok;
+				False and False -> ok
+			     end),
+		  exit
+	  end, exit),
 
     %% 'and' combinations of true/false and a non-boolean in variables.
 
     Glurf = id(glurf),
 
-    ?line check(fun() -> if True and Glurf -> ok; true -> error end end, error),
-    ?line check(fun() -> if Glurf and True -> ok; true -> error end end, error),
-    ?line check(fun() -> if True and True -> ok end end, ok),
-    ?line check(fun() -> if Glurf and Glurf -> ok; true -> error end end, error),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} =
-			    (catch if True and Glurf -> ok;
-				      Glurf and True -> ok;
-				      Glurf and Glurf -> ok
-				   end),
-			exit
-		end, exit),
+    check(fun() -> if True and Glurf -> ok; true -> error end end, error),
+    check(fun() -> if Glurf and True -> ok; true -> error end end, error),
+    check(fun() -> if True and True -> ok end end, ok),
+    check(fun() -> if Glurf and Glurf -> ok; true -> error end end, error),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} =
+		      (catch if True and Glurf -> ok;
+				Glurf and True -> ok;
+				Glurf and Glurf -> ok
+			     end),
+		  exit
+	  end, exit),
 
     %% 'and' combinations of true/false with errors.
     ATuple = id({a,b,c}),
 
-    ?line check(fun() -> if True and element(42, ATuple) -> ok;
-			    true -> error end end, error),
-    ?line check(fun() -> if element(42, ATuple) and True -> ok;
-			    true -> error end end, error),
-    ?line check(fun() -> if True and True -> ok end end, ok),
-    ?line check(fun() -> if element(42, ATuple) and element(42, ATuple) -> ok;
-			    true -> error end end, error),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} =
-			    (catch if True and element(42, ATuple) -> ok;
-				      element(42, ATuple) and True -> ok;
-				      element(42, ATuple) and element(42, ATuple) -> ok
-				   end),
+    check(fun() -> if True and element(42, ATuple) -> ok;
+		      true -> error end end, error),
+    check(fun() -> if element(42, ATuple) and True -> ok;
+		      true -> error end end, error),
+    check(fun() -> if True and True -> ok end end, ok),
+    check(fun() -> if element(42, ATuple) and element(42, ATuple) -> ok;
+		      true -> error end end, error),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} =
+		      (catch if True and element(42, ATuple) -> ok;
+				element(42, ATuple) and True -> ok;
+				element(42, ATuple) and element(42, ATuple) -> ok
+			     end),
 			exit
 		end, exit),
 
-    ?line ok = relprod({'Set',a,b}, {'Set',a,b}),
+    ok = relprod({'Set',a,b}, {'Set',a,b}),
     
     ok = and_same_var(42),
     {'EXIT',{if_clause,_}} = (catch and_same_var(x)),
@@ -844,18 +844,18 @@ relprod(R1, R2) when (erlang:size(R1) =:= 3) and (erlang:element(1,R1) =:= 'Set'
 xor_guard(Config) when is_list(Config) ->
 
     %% 'xor' combinations of literal true/false.
-    ?line check(fun() -> if true xor false -> ok end end, ok),
-    ?line check(fun() -> if false xor true -> ok end end, ok),
-    ?line check(fun() -> if true xor true -> ok; true -> error end end, error),
-    ?line check(fun() -> if false xor false -> ok; true -> error end end, error),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} = (catch if false xor false -> ok end),
-			exit
-		end, exit),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} = (catch if true xor true -> ok end),
-			exit
-		end, exit),
+    check(fun() -> if true xor false -> ok end end, ok),
+    check(fun() -> if false xor true -> ok end end, ok),
+    check(fun() -> if true xor true -> ok; true -> error end end, error),
+    check(fun() -> if false xor false -> ok; true -> error end end, error),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} = (catch if false xor false -> ok end),
+		  exit
+	  end, exit),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} = (catch if true xor true -> ok end),
+		  exit
+	  end, exit),
 
 
     %% 'xor' combinations using variables containing true/false.
@@ -863,18 +863,18 @@ xor_guard(Config) when is_list(Config) ->
     True = id(true),
     False = id(false),
 
-    ?line check(fun() -> if True xor False -> ok end end, ok),
-    ?line check(fun() -> if False xor True -> ok end end, ok),
-    ?line check(fun() -> if True xor True -> ok; true -> error end end, error),
-    ?line check(fun() -> if False xor False -> ok; true -> error end end, error),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} = (catch if False xor False -> ok end),
-			exit
-		end, exit),
-    ?line check(fun() ->
-			{'EXIT',{if_clause,_}} = (catch if True xor True -> ok end),
-			exit
-		end, exit),
+    check(fun() -> if True xor False -> ok end end, ok),
+    check(fun() -> if False xor True -> ok end end, ok),
+    check(fun() -> if True xor True -> ok; true -> error end end, error),
+    check(fun() -> if False xor False -> ok; true -> error end end, error),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} = (catch if False xor False -> ok end),
+		  exit
+	  end, exit),
+    check(fun() ->
+		  {'EXIT',{if_clause,_}} = (catch if True xor True -> ok end),
+		  exit
+	  end, exit),
 
     ok.
 
@@ -883,53 +883,53 @@ more_xor_guards(Config) when is_list(Config) ->
     False = id(false),
     ATuple = id({false,true,gurka}),
 
-    ?line check(fun() ->
-			if element(42, ATuple) xor False -> ok;
-			   true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if False xor element(42, ATuple) xor False -> ok;
-			   true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if element(18, ATuple) xor element(42, ATuple) -> ok;
-			   true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if True xor element(42, ATuple) -> ok;
-			   true -> error end
-		end, error),
-
-    ?line check(fun() ->
-			if element(42, ATuple) xor True -> ok;
-			   true -> error end
-		end, error),
+    check(fun() ->
+		  if element(42, ATuple) xor False -> ok;
+		     true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if False xor element(42, ATuple) xor False -> ok;
+		     true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if element(18, ATuple) xor element(42, ATuple) -> ok;
+		     true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if True xor element(42, ATuple) -> ok;
+		     true -> error end
+	  end, error),
+
+    check(fun() ->
+		  if element(42, ATuple) xor True -> ok;
+		     true -> error end
+	  end, error),
     ok.
 
 build_in_guard(Config) when is_list(Config) ->
     SubBin = <<5.0/float>>,
-    ?line B = <<1,SubBin/binary,3.5/float>>,
-    ?line if
-	      B =:= <<1,SubBin/binary,3.5/float>> -> ok
-	  end.
+    B = <<1,SubBin/binary,3.5/float>>,
+    if
+	B =:= <<1,SubBin/binary,3.5/float>> -> ok
+    end.
 
 old_guard_tests(Config) when list(Config) ->
     %% Check that all the old guard tests are still recognized.
-    ?line list = og(Config),
-    ?line atom = og(an_atom),
-    ?line binary = og(<<1,2>>),
-    ?line float = og(3.14),
-    ?line integer = og(43),
-    ?line a_function = og(fun() -> ok end),
-    ?line pid = og(self()),
-    ?line reference = og(make_ref()),
-    ?line tuple = og({}),
-
-    ?line number = on(45.333),
-    ?line number = on(-19),
+    list = og(Config),
+    atom = og(an_atom),
+    binary = og(<<1,2>>),
+    float = og(3.14),
+    integer = og(43),
+    a_function = og(fun() -> ok end),
+    pid = og(self()),
+    reference = og(make_ref()),
+    tuple = og({}),
+
+    number = on(45.333),
+    number = on(-19),
     ok.
 
 og(V) when atom(V) -> atom;
@@ -948,8 +948,8 @@ on(V) when number(V) -> number;
 on(_) -> not_number.
 
 gbif(Config) when is_list(Config) ->
-    ?line error = gbif_1(1, {false,true}),
-    ?line ok = gbif_1(2, {false,true}),
+    error = gbif_1(1, {false,true}),
+    ok = gbif_1(2, {false,true}),
     ok.
 
 gbif_1(P, T) when element(P, T) -> ok;
@@ -957,57 +957,57 @@ gbif_1(_, _) -> error.
 
 
 t_is_boolean(Config) when is_list(Config) ->
-    ?line true = is_boolean(true),
-    ?line true = is_boolean(false),
-    ?line true = is_boolean(id(true)),
-    ?line true = is_boolean(id(false)),
-
-    ?line false = is_boolean(glurf),
-    ?line false = is_boolean(id(glurf)),
-
-    ?line false = is_boolean([]),
-    ?line false = is_boolean(id([])),
-    ?line false = is_boolean(42),
-    ?line false = is_boolean(id(-42)),
-
-    ?line false = is_boolean(math:pi()),
-    ?line false = is_boolean(384793478934378924978439789873478934897),
-
-    ?line false = is_boolean(id(self())),
-    ?line false = is_boolean(id({x,y,z})),
-    ?line false = is_boolean(id([a,b,c])),
-    ?line false = is_boolean(id(make_ref())),
-    ?line false = is_boolean(id(<<1,2,3>>)),
-    ?line false = is_boolean({id(x),y,z}),
-    ?line false = is_boolean([id(a),b,c]),
-
-    ?line ok = bool(true),
-    ?line ok = bool(false),
-    ?line ok = bool(id(true)),
-    ?line ok = bool(id(false)),
-
-    ?line error = bool(glurf),
-    ?line error = bool(id(glurf)),
-
-    ?line error = bool([]),
-    ?line error = bool(id([])),
-    ?line error = bool(42),
-    ?line error = bool(id(-42)),
-
-    ?line error = bool(math:pi()),
-    ?line error = bool(384793478934378924978439789873478934897),
-
-    ?line error = bool(id(self())),
-    ?line error = bool(id({x,y,z})),
-    ?line error = bool(id([a,b,c])),
-    ?line error = bool(id(make_ref())),
-    ?line error = bool(id(<<1,2,3>>)),
-
-    ?line true = my_is_bool(true),
-    ?line true = my_is_bool(false),
-    ?line false = my_is_bool([]),
-    ?line false = my_is_bool([1,2,3,4]),
-    ?line false = my_is_bool({a,b,c}),
+    true = is_boolean(true),
+    true = is_boolean(false),
+    true = is_boolean(id(true)),
+    true = is_boolean(id(false)),
+
+    false = is_boolean(glurf),
+    false = is_boolean(id(glurf)),
+
+    false = is_boolean([]),
+    false = is_boolean(id([])),
+    false = is_boolean(42),
+    false = is_boolean(id(-42)),
+
+    false = is_boolean(math:pi()),
+    false = is_boolean(384793478934378924978439789873478934897),
+
+    false = is_boolean(id(self())),
+    false = is_boolean(id({x,y,z})),
+    false = is_boolean(id([a,b,c])),
+    false = is_boolean(id(make_ref())),
+    false = is_boolean(id(<<1,2,3>>)),
+    false = is_boolean({id(x),y,z}),
+    false = is_boolean([id(a),b,c]),
+
+    ok = bool(true),
+    ok = bool(false),
+    ok = bool(id(true)),
+    ok = bool(id(false)),
+
+    error = bool(glurf),
+    error = bool(id(glurf)),
+
+    error = bool([]),
+    error = bool(id([])),
+    error = bool(42),
+    error = bool(id(-42)),
+
+    error = bool(math:pi()),
+    error = bool(384793478934378924978439789873478934897),
+
+    error = bool(id(self())),
+    error = bool(id({x,y,z})),
+    error = bool(id([a,b,c])),
+    error = bool(id(make_ref())),
+    error = bool(id(<<1,2,3>>)),
+
+    true = my_is_bool(true),
+    true = my_is_bool(false),
+    false = my_is_bool([]),
+    false = my_is_bool([1,2,3,4]),
+    false = my_is_bool({a,b,c}),
 
     ok.
 
@@ -1048,18 +1048,18 @@ is_function_2(Config) when is_list(Config) ->
     end.
 
 tricky(Config) when is_list(Config) ->
-    ?line not_ok = tricky_1(1, 2),
-    ?line not_ok = tricky_1(1, blurf),
-    ?line not_ok = tricky_1(foo, 2),
-    ?line not_ok = tricky_1(a, b),
-
-    ?line error = tricky_2(0.5),
-    ?line error = tricky_2(a),
-    ?line error = tricky_2({a,b,c}),
-
-    ?line false = rb(100000, [1], 42),
-    ?line true = rb(100000, [], 42),
-    ?line true = rb(555, [a,b,c], 19),
+    not_ok = tricky_1(1, 2),
+    not_ok = tricky_1(1, blurf),
+    not_ok = tricky_1(foo, 2),
+    not_ok = tricky_1(a, b),
+
+    error = tricky_2(0.5),
+    error = tricky_2(a),
+    error = tricky_2({a,b,c}),
+
+    false = rb(100000, [1], 42),
+    true = rb(100000, [], 42),
+    true = rb(555, [a,b,c], 19),
     ok.
 
 tricky_1(X, Y) when abs((X == 1) or (Y == 2)) -> ok;
@@ -1097,40 +1097,40 @@ rb(_, _, _) -> false.
 
 
 rel_ops(Config) when is_list(Config) ->
-    ?line ?T(=/=, 1, 1.0),
-    ?line ?F(=/=, 2, 2),
-    ?line ?F(=/=, {a}, {a}),
+    ?T(=/=, 1, 1.0),
+    ?F(=/=, 2, 2),
+    ?F(=/=, {a}, {a}),
 
-    ?line ?F(/=, a, a),
-    ?line ?F(/=, 0, 0.0),
-    ?line ?T(/=, 0, 1),
-    ?line ?F(/=, {a}, {a}),
+    ?F(/=, a, a),
+    ?F(/=, 0, 0.0),
+    ?T(/=, 0, 1),
+    ?F(/=, {a}, {a}),
 
-    ?line ?T(==, 1, 1.0),
-    ?line ?F(==, a, {}),
+    ?T(==, 1, 1.0),
+    ?F(==, a, {}),
 
-    ?line ?F(=:=, 1, 1.0),
-    ?line ?T(=:=, 42.0, 42.0),
+    ?F(=:=, 1, 1.0),
+    ?T(=:=, 42.0, 42.0),
 
-    ?line ?F(>, a, b),
-    ?line ?T(>, 42, 1.0),
-    ?line ?F(>, 42, 42.0),
+    ?F(>, a, b),
+    ?T(>, 42, 1.0),
+    ?F(>, 42, 42.0),
 
-    ?line ?T(<, a, b),
-    ?line ?F(<, 42, 1.0),
-    ?line ?F(<, 42, 42.0),
+    ?T(<, a, b),
+    ?F(<, 42, 1.0),
+    ?F(<, 42, 42.0),
 
-    ?line ?T(=<, 1.5, 5),
-    ?line ?F(=<, -9, -100.344),
-    ?line ?T(=<, 42, 42.0),
+    ?T(=<, 1.5, 5),
+    ?F(=<, -9, -100.344),
+    ?T(=<, 42, 42.0),
 
-    ?line ?T(>=, 42, 42.0),
-    ?line ?F(>=, a, b),
-    ?line ?T(>=, 1.0, 0),
+    ?T(>=, 42, 42.0),
+    ?F(>=, a, b),
+    ?T(>=, 1.0, 0),
 
     %% Coverage of beam_block:is_exact_eq_ok/1 and collect/1.
-    ?line true = any_atom /= id(42),
-    ?line true = [] /= id(42),
+    true = any_atom /= id(42),
+    true = [] /= id(42),
 
     ok.
 
@@ -1371,10 +1371,10 @@ literal_type_tests(Config) when is_list(Config) ->
 
 literal_type_tests_1(Config) ->
     %% Generate an Erlang module with all different type of type tests.
-    ?line Tests = make_test([{T,L} || T <- type_tests(), L <- literals()] ++
+    Tests = make_test([{T,L} || T <- type_tests(), L <- literals()] ++
 			    [{is_function,L1,L2} || 
 				L1 <- literals(), L2 <- literals()]),
-    ?line Mod = literal_test,
+    Mod = literal_test,
     Anno = erl_anno:new(0),
     Func = {function, Anno, test, 0, [{clause,Anno,[],[],Tests}]},
     Form = [{attribute,Anno,module,Mod},
@@ -1382,24 +1382,24 @@ literal_type_tests_1(Config) ->
             Func, {eof,Anno}],
 
     %% Print generated code for inspection.
-    ?line lists:foreach(fun (F) -> io:put_chars([erl_pp:form(F),"\n"]) end, Form),
+    lists:foreach(fun (F) -> io:put_chars([erl_pp:form(F),"\n"]) end, Form),
 
     %% Test compile:form/1.  This implies full optimization (default).
-    ?line {ok,Mod,Code1} = compile:forms(Form),
-    ?line smoke_disasm(Config, Mod, Code1),
-    ?line {module,Mod} = code:load_binary(Mod, Mod, Code1),
-    ?line Mod:test(),
-    ?line true = code:delete(Mod),
-    ?line code:purge(Mod),
+    {ok,Mod,Code1} = compile:forms(Form),
+    smoke_disasm(Config, Mod, Code1),
+    {module,Mod} = code:load_binary(Mod, Mod, Code1),
+    Mod:test(),
+    true = code:delete(Mod),
+    code:purge(Mod),
 			       
     %% Test compile:form/2.  Turn off all optimizations.
-    ?line {ok,Mod,Code2} = compile:forms(Form, [binary,report,time,
+    {ok,Mod,Code2} = compile:forms(Form, [binary,report,time,
 						no_copt,no_postopt]),
-    ?line smoke_disasm(Config, Mod, Code2),
-    ?line {module,Mod} = code:load_binary(Mod, Mod, Code2),
-    ?line Mod:test(),
-    ?line true = code:delete(Mod),
-    ?line code:purge(Mod),
+    smoke_disasm(Config, Mod, Code2),
+    {module,Mod} = code:load_binary(Mod, Mod, Code2),
+    Mod:test(),
+    true = code:delete(Mod),
+    code:purge(Mod),
     ok.
 
 make_test([{T,L1,L2}|Ts]) ->
@@ -1427,7 +1427,7 @@ test(T, L1, L2) ->
     {match,Anno,{atom,Anno,Val},hd(E)}.
 
 smoke_disasm(Config, Mod, Bin) ->
-    Priv = ?config(priv_dir, Config),
+    Priv = proplists:get_value(priv_dir, Config),
     File = filename:join(Priv, atom_to_list(Mod)++".beam"),
     ok = file:write_file(File, Bin),
     test_lib:smoke_disasm(File).
@@ -1459,30 +1459,30 @@ type_tests() ->
      is_function].
 
 basic_andalso_orelse(Config) when is_list(Config) ->
-    ?line T = id({type,integers,23,42}),
-    ?line 65 = if
-		   ((element(1, T) =:= type) andalso (tuple_size(T) =:= 4) andalso
-		    element(2, T)) == integers ->
-		       element(3, T) + element(4, T);
-		   true -> error
-	       end,
-    ?line 65 = case [] of
-		   [] when ((element(1, T) =:= type) andalso (tuple_size(T) =:= 4) andalso
-			    element(2, T)) == integers ->
-		       element(3, T) + element(4, T)
-	       end,
-
-    ?line 42 = basic_rt({type,integers,40,2}),
-    ?line 5.0 = basic_rt({vector,{3.0,4.0}}),
-    ?line 20 = basic_rt(['+',3,7]),
-    ?line {'Set',a,b} = basic_rt({{'Set',a,b},{'Set',a,b}}),
-    ?line 12 = basic_rt({klurf,4}),
-
-    ?line error = basic_rt({type,integers,40,2,3}),
-    ?line error = basic_rt({kalle,integers,40,2}),
-    ?line error = basic_rt({kalle,integers,40,2}),
-    ?line error = basic_rt({1,2}),
-    ?line error = basic_rt([]),
+    T = id({type,integers,23,42}),
+    65 = if
+	     ((element(1, T) =:= type) andalso (tuple_size(T) =:= 4) andalso
+	      element(2, T)) == integers ->
+		 element(3, T) + element(4, T);
+	     true -> error
+	 end,
+    65 = case [] of
+	     [] when ((element(1, T) =:= type) andalso (tuple_size(T) =:= 4) andalso
+		      element(2, T)) == integers ->
+		 element(3, T) + element(4, T)
+	 end,
+
+    42 = basic_rt({type,integers,40,2}),
+    5.0 = basic_rt({vector,{3.0,4.0}}),
+    20 = basic_rt(['+',3,7]),
+    {'Set',a,b} = basic_rt({{'Set',a,b},{'Set',a,b}}),
+    12 = basic_rt({klurf,4}),
+
+    error = basic_rt({type,integers,40,2,3}),
+    error = basic_rt({kalle,integers,40,2}),
+    error = basic_rt({kalle,integers,40,2}),
+    error = basic_rt({1,2}),
+    error = basic_rt([]),
 
     RelProdBody =
 	fun(R1, R2) ->
@@ -1493,7 +1493,7 @@ basic_andalso_orelse(Config) when is_list(Config) ->
 		end
 	end,
 
-    ?line ok = RelProdBody({'Set',a,b}, {'Set',a,b}),
+    ok = RelProdBody({'Set',a,b}, {'Set',a,b}),
 
     %% 'andalso'/'orelse' with calls known to fail already at compile time.
     %% Used to crash the code generator.
@@ -1564,14 +1564,14 @@ traverse_dcd({Cont,Recs},Log,Fun) ->
 
 check_qlc_hrl(Config) when is_list(Config) ->
     St = {r1,false,dum},
-    ?line foo = cqlc(qlc, q, [{lc,1,2,3}], St),
-    ?line foo = cqlc(qlc, q, [{lc,1,2,3},b], St),
-    ?line St = cqlc(qlc, q, [], St),
-    ?line St = cqlc(qlc, blurf, [{lc,1,2,3},b], St),
-    ?line St = cqlc(q, q, [{lc,1,2,3},b], St),
-    ?line St = cqlc(qlc, q, [{lc,1,2,3},b,c], St),
-    ?line St = cqlc(qlc, q, [a,b], St),
-    ?line {r1,true,kalle} = cqlc(qlc, q, [{lc,1,2,3},b], {r1,true,kalle}),
+    foo = cqlc(qlc, q, [{lc,1,2,3}], St),
+    foo = cqlc(qlc, q, [{lc,1,2,3},b], St),
+    St = cqlc(qlc, q, [], St),
+    St = cqlc(qlc, blurf, [{lc,1,2,3},b], St),
+    St = cqlc(q, q, [{lc,1,2,3},b], St),
+    St = cqlc(qlc, q, [{lc,1,2,3},b,c], St),
+    St = cqlc(qlc, q, [a,b], St),
+    {r1,true,kalle} = cqlc(qlc, q, [{lc,1,2,3},b], {r1,true,kalle}),
     ok.
 
 %% From erl_lint.erl; original name was check_qlc_hrl/4.
@@ -1588,13 +1588,13 @@ cqlc(M, F, As, St) ->
 
 %% OTP-7679: Thanks to Hunter Morris.
 andalso_semi(Config) when is_list(Config) ->
-    ?line ok = andalso_semi_foo(0),
-    ?line ok = andalso_semi_foo(1),
-    ?line fc(catch andalso_semi_foo(2)),
+    ok = andalso_semi_foo(0),
+    ok = andalso_semi_foo(1),
+    fc(catch andalso_semi_foo(2)),
 
-    ?line ok = andalso_semi_bar([a,b,c]),
-    ?line ok = andalso_semi_bar(1),
-    ?line fc(catch andalso_semi_bar([a,b])),
+    ok = andalso_semi_bar([a,b,c]),
+    ok = andalso_semi_bar(1),
+    fc(catch andalso_semi_bar([a,b])),
     ok.
 
 andalso_semi_foo(Bar) when is_integer(Bar) andalso Bar =:= 0; Bar =:= 1 ->
@@ -1605,20 +1605,20 @@ andalso_semi_bar(Bar) when is_list(Bar) andalso length(Bar) =:= 3; Bar =:= 1 ->
 
 
 t_tuple_size(Config) when is_list(Config) ->
-    ?line 10 = do_tuple_size({1,2,3,4}),
-    ?line fc(catch do_tuple_size({1,2,3})),
-    ?line fc(catch do_tuple_size(42)),
+    10 = do_tuple_size({1,2,3,4}),
+    fc(catch do_tuple_size({1,2,3})),
+    fc(catch do_tuple_size(42)),
 
-    ?line error = ludicrous_tuple_size({a,b,c}),
-    ?line error = ludicrous_tuple_size([a,b,c]),
+    error = ludicrous_tuple_size({a,b,c}),
+    error = ludicrous_tuple_size([a,b,c]),
 
     %% Test the "unsafe case" - the register assigned the tuple size is
     %% not killed.
-    ?line DataDir = test_lib:get_data_dir(Config),
-    ?line File = filename:join(DataDir, "guard_SUITE_tuple_size"),
-    ?line {ok,Mod,Code} = compile:file(File, [from_asm,binary]),
-    ?line code:load_binary(Mod, File, Code),
-    ?line 14 = Mod:t({1,2,3,4}),
+    DataDir = test_lib:get_data_dir(Config),
+    File = filename:join(DataDir, "guard_SUITE_tuple_size"),
+    {ok,Mod,Code} = compile:file(File, [from_asm,binary]),
+    code:load_binary(Mod, File, Code),
+    14 = Mod:t({1,2,3,4}),
     _ = code:delete(Mod),
     _ = code:purge(Mod),
     
@@ -1647,71 +1647,70 @@ mask_error({'EXIT',{Err,_}}) ->
 mask_error(Else) ->
     Else.
 
-binary_part(doc) ->
-    ["Tests the binary_part/2,3 guard (GC) bif's"];
+%% Test the binary_part/2,3 guard (GC) BIFs.
 binary_part(Config) when is_list(Config) ->
     %% This is more or less a copy of what the guard_SUITE in emulator
     %% does to cover the guard bif's
-    ?line 1 = bptest(<<1,2,3>>),
-    ?line 2 = bptest(<<2,1,3>>),
-    ?line error = bptest(<<1>>),
-    ?line error = bptest(<<>>),
-    ?line error = bptest(apa),
-    ?line 3 = bptest(<<2,3,3>>),
+    1 = bptest(<<1,2,3>>),
+    2 = bptest(<<2,1,3>>),
+    error = bptest(<<1>>),
+    error = bptest(<<>>),
+    error = bptest(apa),
+    3 = bptest(<<2,3,3>>),
     % With one variable (pos)
-    ?line 1 = bptest(<<1,2,3>>,1),
-    ?line 2 = bptest(<<2,1,3>>,1),
-    ?line error = bptest(<<1>>,1),
-    ?line error = bptest(<<>>,1),
-    ?line error = bptest(apa,1),
-    ?line 3 = bptest(<<2,3,3>>,1),
+    1 = bptest(<<1,2,3>>,1),
+    2 = bptest(<<2,1,3>>,1),
+    error = bptest(<<1>>,1),
+    error = bptest(<<>>,1),
+    error = bptest(apa,1),
+    3 = bptest(<<2,3,3>>,1),
     % With one variable (length)
-    ?line 1 = bptesty(<<1,2,3>>,1),
-    ?line 2 = bptesty(<<2,1,3>>,1),
-    ?line error = bptesty(<<1>>,1),
-    ?line error = bptesty(<<>>,1),
-    ?line error = bptesty(apa,1),
-    ?line 3 = bptesty(<<2,3,3>>,2),
+    1 = bptesty(<<1,2,3>>,1),
+    2 = bptesty(<<2,1,3>>,1),
+    error = bptesty(<<1>>,1),
+    error = bptesty(<<>>,1),
+    error = bptesty(apa,1),
+    3 = bptesty(<<2,3,3>>,2),
     % With one variable (whole tuple)
-    ?line 1 = bptestx(<<1,2,3>>,{1,1}),
-    ?line 2 = bptestx(<<2,1,3>>,{1,1}),
-    ?line error = bptestx(<<1>>,{1,1}),
-    ?line error = bptestx(<<>>,{1,1}),
-    ?line error = bptestx(apa,{1,1}),
-    ?line 3 = bptestx(<<2,3,3>>,{1,2}),
+    1 = bptestx(<<1,2,3>>,{1,1}),
+    2 = bptestx(<<2,1,3>>,{1,1}),
+    error = bptestx(<<1>>,{1,1}),
+    error = bptestx(<<>>,{1,1}),
+    error = bptestx(apa,{1,1}),
+    3 = bptestx(<<2,3,3>>,{1,2}),
     % With two variables
-    ?line 1 = bptest(<<1,2,3>>,1,1),
-    ?line 2 = bptest(<<2,1,3>>,1,1),
-    ?line error = bptest(<<1>>,1,1),
-    ?line error = bptest(<<>>,1,1),
-    ?line error = bptest(apa,1,1),
-    ?line 3 = bptest(<<2,3,3>>,1,2),
+    1 = bptest(<<1,2,3>>,1,1),
+    2 = bptest(<<2,1,3>>,1,1),
+    error = bptest(<<1>>,1,1),
+    error = bptest(<<>>,1,1),
+    error = bptest(apa,1,1),
+    3 = bptest(<<2,3,3>>,1,2),
     % Direct (autoimported) call, these will be evaluated by the compiler...
-    ?line <<2>> = binary_part(<<1,2,3>>,1,1),
-    ?line <<1>> = binary_part(<<2,1,3>>,1,1),
+    <<2>> = binary_part(<<1,2,3>>,1,1),
+    <<1>> = binary_part(<<2,1,3>>,1,1),
     % Compiler warnings due to constant evaluation expected (3)
-    ?line badarg = ?MASK_ERROR(binary_part(<<1>>,1,1)),
-    ?line badarg = ?MASK_ERROR(binary_part(<<>>,1,1)),
-    ?line badarg = ?MASK_ERROR(binary_part(apa,1,1)),
-    ?line <<3,3>> = binary_part(<<2,3,3>>,1,2),
+    badarg = ?MASK_ERROR(binary_part(<<1>>,1,1)),
+    badarg = ?MASK_ERROR(binary_part(<<>>,1,1)),
+    badarg = ?MASK_ERROR(binary_part(apa,1,1)),
+    <<3,3>> = binary_part(<<2,3,3>>,1,2),
     % Direct call through apply
-    ?line <<2>> = apply(erlang,binary_part,[<<1,2,3>>,1,1]),
-    ?line <<1>> = apply(erlang,binary_part,[<<2,1,3>>,1,1]),
+    <<2>> = apply(erlang,binary_part,[<<1,2,3>>,1,1]),
+    <<1>> = apply(erlang,binary_part,[<<2,1,3>>,1,1]),
     % Compiler warnings due to constant evaluation expected (3)
-    ?line badarg = ?MASK_ERROR(apply(erlang,binary_part,[<<1>>,1,1])),
-    ?line badarg = ?MASK_ERROR(apply(erlang,binary_part,[<<>>,1,1])),
-    ?line badarg = ?MASK_ERROR(apply(erlang,binary_part,[apa,1,1])),
-    ?line <<3,3>> = apply(erlang,binary_part,[<<2,3,3>>,1,2]),
+    badarg = ?MASK_ERROR(apply(erlang,binary_part,[<<1>>,1,1])),
+    badarg = ?MASK_ERROR(apply(erlang,binary_part,[<<>>,1,1])),
+    badarg = ?MASK_ERROR(apply(erlang,binary_part,[apa,1,1])),
+    <<3,3>> = apply(erlang,binary_part,[<<2,3,3>>,1,2]),
     % Constant propagation
-    ?line  Bin = <<1,2,3>>,
-    ?line  ok = if
+     Bin = <<1,2,3>>,
+     ok = if
 		    binary_part(Bin,1,1) =:= <<2>> ->
 			ok;
 		    %% Compiler warning, clause cannot match (expected)
 		    true ->
 			error
 		end,
-    ?line  ok = if
+     ok = if
 		    binary_part(Bin,{1,1}) =:= <<2>> ->
 			ok;
 		    %% Compiler warning, clause cannot match (expected)
@@ -1778,24 +1777,24 @@ bptest(_,_,_) ->
 
 -define(FAILING(C),
 	if
-	    C -> ?t:fail(should_fail);
+	    C -> ct:fail(should_fail);
 	    true -> ok
 	end,
 	if
-	    true, C -> ?t:fail(should_fail);
+	    true, C -> ct:fail(should_fail);
 	    true -> ok
 	end).
 
 bad_constants(Config) when is_list(Config) ->
-    ?line ?FAILING(false),
-    ?line ?FAILING([]),
-    ?line ?FAILING([a]),
-    ?line ?FAILING([Config]),
-    ?line ?FAILING({a,b}),
-    ?line ?FAILING({a,Config}),
-    ?line ?FAILING(<<1>>),
-    ?line ?FAILING(42),
-    ?line ?FAILING(3.14),
+    ?FAILING(false),
+    ?FAILING([]),
+    ?FAILING([a]),
+    ?FAILING([Config]),
+    ?FAILING({a,b}),
+    ?FAILING({a,Config}),
+    ?FAILING(<<1>>),
+    ?FAILING(42),
+    ?FAILING(3.14),
     ok.
 
 bad_guards(Config) when is_list(Config) ->
@@ -1915,7 +1914,7 @@ check(F, Result) ->
 	Other ->
 	    io:format("Expected: ~p\n", [Result]),
 	    io:format("     Got: ~p\n", [Other]),
-	    test_server:fail()
+	    ct:fail(check_failed)
     end.
 
 fc({'EXIT',{function_clause,_}}) -> ok;
diff --git a/lib/compiler/test/inline_SUITE.erl b/lib/compiler/test/inline_SUITE.erl
index 0b92a784de..4c53b96fe6 100644
--- a/lib/compiler/test/inline_SUITE.erl
+++ b/lib/compiler/test/inline_SUITE.erl
@@ -21,7 +21,7 @@
 
 -module(inline_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -compile(export_all).
 -compile({inline,[badarg/2]}).
@@ -47,8 +47,8 @@ init_per_suite(Config) ->
     [{testing_node,Node}|Config].
 
 end_per_suite(Config) ->
-    Node = ?config(testing_node, Config),
-    ?t:stop_node(Node),
+    Node = proplists:get_value(testing_node, Config),
+    test_server:stop_node(Node),
     ok.
 
 init_per_group(_GroupName, Config) ->
@@ -60,16 +60,16 @@ end_per_group(_GroupName, Config) ->
 
 attribute(Config) when is_list(Config) ->
     Name = "attribute",
-    ?line Src = filename:join(?config(data_dir, Config), Name),
-    ?line Out = ?config(priv_dir,Config),
+    Src = filename:join(proplists:get_value(data_dir, Config), Name),
+    Out = proplists:get_value(priv_dir,Config),
 
-    ?line {ok,attribute=Mod} = compile:file(Src, [{outdir,Out},report,time]),
-    ?line Outfile = filename:join(Out, Name++".beam"),
-    ?line {ok,{Mod,[{locals,Locals}]}} = beam_lib:chunks(Outfile, [locals]),
-    ?line io:format("locals: ~p\n", [Locals]),
+    {ok,attribute=Mod} = compile:file(Src, [{outdir,Out},report,time]),
+    Outfile = filename:join(Out, Name++".beam"),
+    {ok,{Mod,[{locals,Locals}]}} = beam_lib:chunks(Outfile, [locals]),
+    io:format("locals: ~p\n", [Locals]),
 
     %% The inliner should have removed all local functions.
-    ?line [] = Locals,
+    [] = Locals,
 
     ok.
 
@@ -89,48 +89,46 @@ attribute(Config) when is_list(Config) ->
 ?comp(maps_inline_test).
 
 try_inline(Mod, Config) ->
-    Node = ?config(testing_node, Config),
-    ?line Src = filename:join(?config(data_dir, Config), atom_to_list(Mod)),
-    ?line Out = ?config(priv_dir,Config),
+    Node = proplists:get_value(testing_node, Config),
+    Src = filename:join(proplists:get_value(data_dir, Config),
+			atom_to_list(Mod)),
+    Out = proplists:get_value(priv_dir,Config),
 
     %% Normal compilation.
-    ?line io:format("Compiling: ~s\n", [Src]),
-    ?line {ok,Mod} = compile:file(Src, [{outdir,Out},report,bin_opt_info,clint]),
+    io:format("Compiling: ~s\n", [Src]),
+    {ok,Mod} = compile:file(Src, [{outdir,Out},report,bin_opt_info,clint]),
 
-    ?line Dog = test_server:timetrap(test_server:minutes(10)),
-    ?line NormalResult = rpc:call(Node, ?MODULE, load_and_call, [Out,Mod]),
-    ?line test_server:timetrap_cancel(Dog),
+    ct:timetrap({minutes,10}),
+    NormalResult = rpc:call(Node, ?MODULE, load_and_call, [Out,Mod]),
 
     %% Inlining.
-    ?line io:format("Compiling with old inliner: ~s\n", [Src]),
-    ?line {ok,Mod} = compile:file(Src, [{outdir,Out},report,bin_opt_info,
+    io:format("Compiling with old inliner: ~s\n", [Src]),
+    {ok,Mod} = compile:file(Src, [{outdir,Out},report,bin_opt_info,
 					{inline,1000},clint]),
 
     %% Run inlined code.
-    ?line Dog3 = test_server:timetrap(test_server:minutes(10)),
-    ?line OldInlinedResult = rpc:call(Node, ?MODULE, load_and_call, [Out,Mod]),
-    ?line test_server:timetrap_cancel(Dog3),
+    ct:timetrap({minutes,10}),
+    OldInlinedResult = rpc:call(Node, ?MODULE, load_and_call, [Out,Mod]),
 
     %% Compare results.
-    ?line compare(NormalResult, OldInlinedResult),
-    ?line NormalResult = OldInlinedResult,
+    compare(NormalResult, OldInlinedResult),
+    NormalResult = OldInlinedResult,
 
     %% Inlining.
-    ?line io:format("Compiling with new inliner: ~s\n", [Src]),
-    ?line {ok,Mod} = compile:file(Src, [{outdir,Out},report,
+    io:format("Compiling with new inliner: ~s\n", [Src]),
+    {ok,Mod} = compile:file(Src, [{outdir,Out},report,
 					bin_opt_info,inline,clint]),
 
     %% Run inlined code.
-    ?line Dog4 = test_server:timetrap(test_server:minutes(10)),
-    ?line InlinedResult = rpc:call(Node, ?MODULE, load_and_call, [Out,Mod]),
-    ?line test_server:timetrap_cancel(Dog4),
+    ct:timetrap({minutes,10}),
+    InlinedResult = rpc:call(Node, ?MODULE, load_and_call, [Out,Mod]),
 
     %% Compare results.
-    ?line compare(NormalResult, InlinedResult),
-    ?line NormalResult = InlinedResult,
+    compare(NormalResult, InlinedResult),
+    NormalResult = InlinedResult,
 
     %% Delete Beam file.
-    ?line ok = file:delete(filename:join(Out, atom_to_list(Mod)++code:objfile_extension())),
+    ok = file:delete(filename:join(Out, atom_to_list(Mod)++code:objfile_extension())),
 
     ok.
 
@@ -142,24 +140,24 @@ compare([{X,Y,RGB1}|T1], [{X,Y,RGB2}|T2]) ->
     compare(T1, T2);
 compare([H1|_], [H2|_]) ->
     io:format("Normal = ~p, Inlined = ~p\n", [H1,H2]),
-    ?t:fail();
+    ct:fail(different);
 compare([], []) -> ok.
 
 start_node(Name, Args) ->
     case test_server:start_node(Name, slave, [{args,Args}]) of
 	{ok,Node} -> {ok, Node};
-	Error  -> ?line test_server:fail(Error)
+	Error  -> ct:fail(Error)
     end.
 
 load_and_call(Out, Module) ->
-    ?line io:format("Loading...\n",[]),
-    ?line code:purge(Module),
-    ?line LoadRc = code:load_abs(filename:join(Out, Module)),
-    ?line {module,Module} = LoadRc,
-
-    ?line io:format("Calling...\n",[]),
-    ?line {Time,CallResult} = timer:tc(Module, Module, []),
-    ?line io:format("Time: ~p\n", [Time]),
+    io:format("Loading...\n",[]),
+    code:purge(Module),
+    LoadRc = code:load_abs(filename:join(Out, Module)),
+    {module,Module} = LoadRc,
+
+    io:format("Calling...\n",[]),
+    {Time,CallResult} = timer:tc(Module, Module, []),
+    io:format("Time: ~p\n", [Time]),
     CallResult.
 
 %% Macros used by lists/1 below.
@@ -195,69 +193,78 @@ load_and_call(Out, Module) ->
 %% Note: This module must be compiled with the inline_lists_funcs option.
 
 lists(Config) when is_list(Config) ->
-    ?line List = lists:seq(1, 20),
+    List = lists:seq(1, 20),
 
     %% lists:map/2
-    ?line ?TestHighOrder_2(map, (fun(E) ->
-        R = E band 16#ff,
-	put(?MODULE, [E|get(?MODULE)]),
-        R
-	end), List),
+    ?TestHighOrder_2(map,
+		     (fun(E) ->
+			      R = E band 16#ff,
+			      put(?MODULE, [E|get(?MODULE)]),
+			      R
+		      end), List),
 
     %% lists:flatmap/2
-    ?line ?TestHighOrder_2(flatmap, (fun(E) ->
-        R = lists:duplicate(E, E),
-	put(?MODULE, [E|get(?MODULE)]),
-        R
-     end), List),
+    ?TestHighOrder_2(flatmap,
+		     (fun(E) ->
+			      R = lists:duplicate(E, E),
+			      put(?MODULE, [E|get(?MODULE)]),
+			      R
+		      end), List),
 
     %% lists:foreach/2
-    ?line ?TestHighOrder_2(foreach,
-			   (fun(E) ->
-				    put(?MODULE, [E bor 7|get(?MODULE)])
-			    end), List),
+    ?TestHighOrder_2(foreach,
+		     (fun(E) ->
+			      put(?MODULE, [E bor 7|get(?MODULE)])
+		      end), List),
 
     %% lists:filter/2
-    ?line ?TestHighOrder_2(filter, (fun(E) ->
-	put(?MODULE, [E|get(?MODULE)]),
-        (E bsr 1) band 1 =/= 0
-	end), List),
+    ?TestHighOrder_2(filter,
+		     (fun(E) ->
+			      put(?MODULE, [E|get(?MODULE)]),
+			      (E bsr 1) band 1 =/= 0
+		      end), List),
 
     %% lists:any/2
-    ?line ?TestHighOrder_2(any, (fun(E) ->
-	put(?MODULE, [E|get(?MODULE)]),
-        false					%Force it to go through all.
-	end), List),
+    ?TestHighOrder_2(any,
+		     (fun(E) ->
+			      put(?MODULE, [E|get(?MODULE)]),
+			      false	  %Force it to go through all.
+		      end), List),
 
     %% lists:all/2
-    ?line ?TestHighOrder_2(all, (fun(E) ->
-	put(?MODULE, [E|get(?MODULE)]),
-        true					%Force it to go through all.
-	end), List),
+    ?TestHighOrder_2(all,
+		     (fun(E) ->
+			      put(?MODULE, [E|get(?MODULE)]),
+			      true	  %Force it to go through all.
+		      end), List),
 
     %% lists:foldl/3
-    ?line ?TestHighOrder_3(foldl, (fun(E, A) ->
-	put(?MODULE, [E|get(?MODULE)]),
-        A bxor E
-	end), 0, List),
+    ?TestHighOrder_3(foldl,
+		     (fun(E, A) ->
+			      put(?MODULE, [E|get(?MODULE)]),
+			      A bxor E
+		      end), 0, List),
 
     %% lists:foldr/3
-    ?line ?TestHighOrder_3(foldr, (fun(E, A) ->
-	put(?MODULE, [E|get(?MODULE)]),
-        A bxor (bnot E)
-	end), 0, List),
+    ?TestHighOrder_3(foldr,
+		     (fun(E, A) ->
+			      put(?MODULE, [E|get(?MODULE)]),
+			      A bxor (bnot E)
+		      end), 0, List),
 
     %% lists:mapfoldl/3
-    ?line ?TestHighOrder_3(mapfoldl, (fun(E, A) ->
-	put(?MODULE, [E|get(?MODULE)]),
-        {bnot E,A bxor (bnot E)}
-	end), 0, List),
+    ?TestHighOrder_3(mapfoldl,
+		     (fun(E, A) ->
+			      put(?MODULE, [E|get(?MODULE)]),
+			      {bnot E,A bxor (bnot E)}
+		      end), 0, List),
 
     %% lists:mapfoldr/3
-    ?line ?TestHighOrder_3(mapfoldr, (fun(E, A) ->
-	put(?MODULE, [E|get(?MODULE)]),
-        {bnot E,A bxor (bnot E)}
-	end), 0, List),
+    ?TestHighOrder_3(mapfoldr,
+		     (fun(E, A) ->
+			      put(?MODULE, [E|get(?MODULE)]),
+			      {bnot E,A bxor (bnot E)}
+		      end), 0, List),
 
     %% Cleanup.
     erase(?MODULE),
@@ -330,7 +337,7 @@ badarg(Reply, _A) ->
     Reply.
 
 otp_7223(Config) when is_list(Config) ->
-    ?line {'EXIT', {{case_clause,{1}},_}} = (catch otp_7223_1(1)),
+    {'EXIT', {{case_clause,{1}},_}} = (catch otp_7223_1(1)),
     ok.
 
 -compile({inline,[{otp_7223_1,1}]}).
@@ -343,7 +350,7 @@ otp_7223_2({a}) ->
 
 coverage(Config) when is_list(Config) ->
     Mod = bsdecode,
-    Src = filename:join(?config(data_dir, Config), Mod),
+    Src = filename:join(proplists:get_value(data_dir, Config), Mod),
     {ok,Mod,_} = compile:file(Src, [binary,report,{inline,0},clint]),
     {ok,Mod,_} = compile:file(Src, [binary,report,{inline,20},
 				    verbose,clint]),
diff --git a/lib/compiler/test/lc_SUITE.erl b/lib/compiler/test/lc_SUITE.erl
index d10839ccf2..70c80d3353 100644
--- a/lib/compiler/test/lc_SUITE.erl
+++ b/lib/compiler/test/lc_SUITE.erl
@@ -26,9 +26,11 @@
 	 empty_generator/1,no_export/1,shadow/1,
 	 effect/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     test_lib:recompile(?MODULE),
@@ -59,12 +61,9 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog = test_server:timetrap(?t:minutes(1)),
-    [{watchdog,Dog}|Config].
+    Config.
 
 end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
     ok.
 
 basic(Config) when is_list(Config) ->
@@ -171,7 +170,7 @@ no_gen_verify(Res, A, B) ->
 	ShouldBe -> ok;
 	_ ->
 	    io:format("A = ~p; B = ~p; Expected = ~p, actual = ~p", [A,B,ShouldBe,Res]),
-	    ?t:fail()
+	    ct:fail(failed)
     end.
 
 no_gen_eval(Fun, Res) ->
diff --git a/lib/compiler/test/map_SUITE.erl b/lib/compiler/test/map_SUITE.erl
index cff3b5deb4..14d175b92c 100644
--- a/lib/compiler/test/map_SUITE.erl
+++ b/lib/compiler/test/map_SUITE.erl
@@ -1479,7 +1479,7 @@ t_guard_fun(Config) when is_list(Config) ->
 	{'EXIT', {function_clause,[{?MODULE,_,[#{s:=none,v:=none}],_}|_]}} -> ok;
 	{'EXIT', {{case_clause,_},_}} -> {comment,inlined};
 	Other ->
-	    test_server:fail({no_match, Other})
+	    ct:fail({no_match, Other})
     end.
 
 
@@ -1565,7 +1565,7 @@ t_build_and_match_empty_val(Config) when is_list(Config) ->
 	{'EXIT',{function_clause,_}} -> ok;
 	{'EXIT', {{case_clause,_},_}} -> {comment,inlined};
 	Other ->
-	    test_server:fail({no_match, Other})
+	    ct:fail({no_match, Other})
     end.
 
 t_build_and_match_val(Config) when is_list(Config) ->
@@ -1583,7 +1583,7 @@ t_build_and_match_val(Config) when is_list(Config) ->
 	{'EXIT',{function_clause,_}} -> ok;
 	{'EXIT', {{case_clause,_},_}} -> {comment,inlined};
 	Other ->
-	    test_server:fail({no_match, Other})
+	    ct:fail({no_match, Other})
     end.
 
 t_build_and_match_nil(Config) when is_list(Config) ->
@@ -1885,7 +1885,7 @@ register_corruption_dummy_call(A,B,C) -> {A,B,C}.
 
 
 t_frequency_table(Config) when is_list(Config) ->
-    random:seed({13,1337,54}),  % pseudo random
+    rand:seed(exsplus, {13,1337,54}),		% pseudo random
     N = 100000,
     Ts = rand_terms(N),
     #{ n:=N, tf := Tf } = frequency_table(Ts,#{ n=>0, tf => #{}}),
@@ -1928,7 +1928,7 @@ rand_terms(0) -> [];
 rand_terms(N) -> [rand_term()|rand_terms(N-1)].
 
 rand_term() ->
-    case random:uniform(6) of
+    case rand:uniform(6) of
 	1 -> rand_binary();
 	2 -> rand_number();
 	3 -> rand_atom();
@@ -1938,21 +1938,21 @@ rand_term() ->
     end.
 
 rand_binary() ->
-    case random:uniform(3) of
+    case rand:uniform(3) of
 	1 -> <<>>;
 	2 -> <<"hi">>;
 	3 -> <<"message text larger than 64 bytes. yep, message text larger than 64 bytes.">>
     end.
 
 rand_number() ->
-    case random:uniform(3) of
-	1 -> random:uniform(5);
-	2 -> float(random:uniform(5));
-	3 -> 1 bsl (63 + random:uniform(3))
+    case rand:uniform(3) of
+	1 -> rand:uniform(5);
+	2 -> float(rand:uniform(5));
+	3 -> 1 bsl (63 + rand:uniform(3))
     end.
 
 rand_atom() ->
-    case random:uniform(3) of
+    case rand:uniform(3) of
 	1 -> hi;
 	2 -> some_atom;
 	3 -> some_other_atom
@@ -1960,21 +1960,21 @@ rand_atom() ->
 
 
 rand_tuple() ->
-    case random:uniform(3) of
+    case rand:uniform(3) of
 	1 -> {ok, rand_term()}; % careful
 	2 -> {1, 2, 3};
 	3 -> {<<"yep">>, 1337}
     end.
 
 rand_list() ->
-    case random:uniform(3) of
+    case rand:uniform(3) of
 	1 -> "hi";
 	2 -> [1,rand_term()]; % careful
 	3 -> [improper|list]
     end.
 
 rand_map() ->
-    case random:uniform(3) of
+    case rand:uniform(3) of
 	1 -> #{ hi => 3 };
 	2 -> #{ wat => rand_term(), other => 3 };  % careful
 	3 -> #{ hi => 42, other => 42, yet_anoter => 1337 }
diff --git a/lib/compiler/test/match_SUITE.erl b/lib/compiler/test/match_SUITE.erl
index 67d668f650..41fa1603ef 100644
--- a/lib/compiler/test/match_SUITE.erl
+++ b/lib/compiler/test/match_SUITE.erl
@@ -26,7 +26,7 @@
 	 selectify/1,underscore/1,match_map/1,map_vars_used/1,
       coverage/1]).
 	 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -55,10 +55,10 @@ end_per_group(_GroupName, Config) ->
 
 
 pmatch(Config) when is_list(Config) ->
-    ?line ok = doit(1),
-    ?line ok = doit(2),
-    ?line {error,baz} = doit(3),
-    ?line {error,foobar} = doit(4),
+    ok = doit(1),
+    ok = doit(2),
+    {error,baz} = doit(3),
+    {error,foobar} = doit(4),
     ok.
 
 %% Thanks to Tobias Lindahl (HiPE).
@@ -78,13 +78,13 @@ doit(X) ->
     end.
 
 mixed(Config) when is_list(Config) ->
-    ?line glufs = mixit(1),
-    ?line klafs = mixit(2),
-    ?line fnurra = mixit(3),
-    ?line usch = mixit(4),
-    ?line {error,blurf} = mixit(5),
-    ?line {error,87987987} = mixit(6),
-    ?line {error,{a,b,c}} = mixit(7),
+    glufs = mixit(1),
+    klafs = mixit(2),
+    fnurra = mixit(3),
+    usch = mixit(4),
+    {error,blurf} = mixit(5),
+    {error,87987987} = mixit(6),
+    {error,{a,b,c}} = mixit(7),
     ok.
 
 mixit(X) ->
@@ -106,41 +106,41 @@ mixit(X) ->
 
 aliases(Config) when is_list(Config) ->
     %% Lists/strings.
-    ?line ok = str_alias("abc"),
-    ?line ok = str_alias("def"),
-    ?line ok = str_alias("ghi"),
-    ?line ok = str_alias("klm"),
-    ?line ok = str_alias("qrs"),
-    ?line ok = str_alias("xy"),
-    ?line ok = str_alias(""),
-    ?line ok = str_alias([]),
-    ?line error = str_alias("blurf"),
+    ok = str_alias("abc"),
+    ok = str_alias("def"),
+    ok = str_alias("ghi"),
+    ok = str_alias("klm"),
+    ok = str_alias("qrs"),
+    ok = str_alias("xy"),
+    ok = str_alias(""),
+    ok = str_alias([]),
+    error = str_alias("blurf"),
 
     %% Characters/integers.
-    ?line ok = char_alias($v),
-    ?line ok = char_alias(118),
-    ?line ok = char_alias($w),
-    ?line ok = char_alias(119),
-    ?line ok = char_alias(42),
-    ?line ok = char_alias(3.0),
-    ?line error = char_alias($_),
-    ?line error = char_alias(0),
-
-    ?line {42,42,42} = three(42),
-
-    ?line {1,42,99,1,42,99} = tuple_alias({1,42,99}),
-    ?line {-10,20,-10,20,-10,20} = tuple_alias({-10,20}),
-    ?line 6 = tup_lit_alias({1,2,3}),
-    ?line 6 = tup_lit_alias_rev({1,2,3}),
-
-    ?line {42,42,42,42} = multiple_aliases_1(42),
-    ?line {7,7,7} = multiple_aliases_2(7),
-    ?line {{a,b},{a,b},{a,b}} = multiple_aliases_3({a,b}),
+    ok = char_alias($v),
+    ok = char_alias(118),
+    ok = char_alias($w),
+    ok = char_alias(119),
+    ok = char_alias(42),
+    ok = char_alias(3.0),
+    error = char_alias($_),
+    error = char_alias(0),
+
+    {42,42,42} = three(42),
+
+    {1,42,99,1,42,99} = tuple_alias({1,42,99}),
+    {-10,20,-10,20,-10,20} = tuple_alias({-10,20}),
+    6 = tup_lit_alias({1,2,3}),
+    6 = tup_lit_alias_rev({1,2,3}),
+
+    {42,42,42,42} = multiple_aliases_1(42),
+    {7,7,7} = multiple_aliases_2(7),
+    {{a,b},{a,b},{a,b}} = multiple_aliases_3({a,b}),
 
     %% Lists/literals.
-    ?line {a,b} = list_alias1([a,b]),
-    ?line {a,b} = list_alias2([a,b]),
-    ?line {a,b} = list_alias3([a,b]),
+    {a,b} = list_alias1([a,b]),
+    {a,b} = list_alias2([a,b]),
+    {a,b} = list_alias3([a,b]),
 
     %% Non-matching aliases.
     none = mixed_aliases(<<42>>),
@@ -261,14 +261,14 @@ mixed_aliases(_) -> none.
 %% OTP-7018.
 
 match_in_call(Config) when is_list(Config) ->
-    ?line mac_a(0),
-    ?line mac_b(1),
-    ?line mac_c(42),
-    ?line mac_d(42),
-    ?line mac_e({gurka,42}),
+    mac_a(0),
+    mac_b(1),
+    mac_c(42),
+    mac_d(42),
+    mac_e({gurka,42}),
 
-    ?line [{2,2},{2,2}] = mac_lc([{2,any},{2,2}]),
-    ?line {'EXIT',_} = (catch mac_lc([{1,1}])),
+    [{2,2},{2,2}] = mac_lc([{2,any},{2,2}]),
+    {'EXIT',_} = (catch mac_lc([{1,1}])),
 
     ok.
 
@@ -313,8 +313,8 @@ gurka({gurka,X}, X) -> ok.
 
 untuplify(Config) when is_list(Config) ->
     %% We do this to cover sys_core_fold:unalias_pat/1.
-    ?line {1,2,3,4,alias,{[1,2],{3,4},alias}} = untuplify_1([1,2], {3,4}, alias),
-    ?line error = untuplify_1([1,2], {3,4}, 42),
+    {1,2,3,4,alias,{[1,2],{3,4},alias}} = untuplify_1([1,2], {3,4}, alias),
+    error = untuplify_1([1,2], {3,4}, 42),
     ok.
 
 untuplify_1(A, B, C) ->
@@ -329,11 +329,11 @@ untuplify_1(A, B, C) ->
 
 %% Coverage of beam_dead:shortcut_boolean_label/4.
 shortcut_boolean(Config) when is_list(Config) ->
-    ?line false = shortcut_boolean_1([0]),
-    ?line true = shortcut_boolean_1({42}),
-    ?line maybe = shortcut_boolean_1(self()),
-    ?line {'EXIT',_} = (catch shortcut_boolean_1([a,b])),
-    ?line {'EXIT',_} = (catch shortcut_boolean_1({a,b})),
+    false = shortcut_boolean_1([0]),
+    true = shortcut_boolean_1({42}),
+    maybe = shortcut_boolean_1(self()),
+    {'EXIT',_} = (catch shortcut_boolean_1([a,b])),
+    {'EXIT',_} = (catch shortcut_boolean_1({a,b})),
     ok.
 
 shortcut_boolean_1(X) ->
@@ -352,8 +352,8 @@ shortcut_boolean_1(X) ->
 
 %% Test sys_core_fold:letify_guard/3.
 letify_guard(Config) when is_list(Config) ->
-    ?line {-15,a} = letify_guard(-15, a),
-    ?line 5 = letify_guard(2, 3),
+    {-15,a} = letify_guard(-15, a),
+    5 = letify_guard(2, 3),
     ok.
 
 letify_guard(A, B) ->
@@ -369,18 +369,18 @@ letify_guard(A, B) ->
 %% instructions in beam_dead and beam_peep.
 
 selectify(Config) when is_list(Config) ->
-    ?line integer = sel_different_types({r,42}),
-    ?line atom = sel_different_types({r,forty_two}),
-    ?line none = sel_different_types({r,18}),
-    ?line {'EXIT',_} = (catch sel_different_types([a,b,c])),
-
-    ?line integer = sel_same_value({r,42}),
-    ?line error = sel_same_value({r,100}),
-    ?line error = sel_same_value(a),
-
-    ?line integer42 = sel_same_value2(42),
-    ?line integer43 = sel_same_value2(43),
-    ?line error = sel_same_value2(44),
+    integer = sel_different_types({r,42}),
+    atom = sel_different_types({r,forty_two}),
+    none = sel_different_types({r,18}),
+    {'EXIT',_} = (catch sel_different_types([a,b,c])),
+
+    integer = sel_same_value({r,42}),
+    error = sel_same_value({r,100}),
+    error = sel_same_value(a),
+
+    integer42 = sel_same_value2(42),
+    integer43 = sel_same_value2(43),
+    error = sel_same_value2(44),
     ok.
 
 sel_different_types({r,_}=T) when element(2, T) =:= forty_two ->
@@ -449,7 +449,10 @@ do_map_vars_used(X, Y, Map) ->
 coverage(Config) when is_list(Config) ->
     %% Cover beam_dead.
     ok = coverage_1(x, a),
-    ok = coverage_1(x, b).
+    ok = coverage_1(x, b),
+
+    %% Cover sys_pre_expand.
+    ok = coverage_3("abc").
 
 coverage_1(B, Tag) ->
     case Tag of
@@ -460,4 +463,6 @@ coverage_1(B, Tag) ->
 coverage_2(1, a, x) -> ok;
 coverage_2(2, b, x) -> ok.
 
+coverage_3([$a]++[]++"bc") -> ok.
+
 id(I) -> I.
diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index 8606935504..8a639f741f 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -25,7 +25,7 @@
 	 tobias/1,empty_string/1,md5/1,silly_coverage/1,
 	 confused_literals/1,integer_encoding/1,override_bif/1]).
 	 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% For the override_bif testcase.
 %% NB, no other testcases in this testsuite can use these without erlang:prefix!
@@ -38,22 +38,25 @@
 -compile({no_auto_import,[byte_size/1]}).
 -import(erlang,[byte_size/1]).
 
-
+%% Cover the code for callback handling.
+-callback must_define_this_one() -> 'ok'.
+-callback do_something_strange(atom()) -> 'ok'.
+-optional_callbacks([do_something_strange/1]).
+-optional_callbacks([ignore_me]).		%Invalid; ignored.
 
 %% Include an opaque declaration to cover the stripping of
 %% opaque types from attributes in v3_kernel.
 -opaque misc_SUITE_test_cases() :: [atom()].
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog = test_server:timetrap(?t:minutes(10)),
-    [{watchdog,Dog}|Config].
+    Config.
 
 end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,10}}].
 
 -spec all() -> misc_SUITE_test_cases().
 all() -> 
@@ -88,32 +91,27 @@ abs(_N) ->
 binary_part(_,_,_) ->
     dummy_bp.
 
-% Make sure that auto-imported BIF's are overridden correctly
-
-override_bif(suite) ->
-    [];
-override_bif(doc) ->
-    ["Test dat local functions and imports override auto-imported BIFs."];
+%% Test that local functions and imports override auto-imported BIFs.
 override_bif(Config) when is_list(Config) ->
-    ?line dummy_abs = abs(1),
-    ?line dummy_bp = binary_part(<<"hello">>,1,1),
-    ?line dummy = binary_part(<<"hello">>,{1,1}),
-    ?line 1 = erlang:abs(1),
-    ?line <<"e">> = erlang:binary_part(<<"hello">>,1,1),
-    ?line <<"e">> = erlang:binary_part(<<"hello">>,{1,1}),
+    dummy_abs = abs(1),
+    dummy_bp = binary_part(<<"hello">>,1,1),
+    dummy = binary_part(<<"hello">>,{1,1}),
+    1 = erlang:abs(1),
+    <<"e">> = erlang:binary_part(<<"hello">>,1,1),
+    <<"e">> = erlang:binary_part(<<"hello">>,{1,1}),
     F = fun(X) when byte_size(X) =:= 4 ->
 		four;
 	   (X) ->
 		byte_size(X)
 	end,
-    ?line four = F(<<1,2,3,4>>),
-    ?line 5 = F(<<1,2,3,4,5>>),
+    four = F(<<1,2,3,4>>),
+    5 = F(<<1,2,3,4,5>>),
     ok.
 
 %% A bug reported by Tobias Lindahl for a development version of R11B.
 
 tobias(Config) when is_list(Config) ->
-    ?line 1 = tobias_1([1,2,3]),
+    1 = tobias_1([1,2,3]),
     ok.
 
 tobias_1([H|_T]) ->
@@ -134,7 +132,7 @@ tobias_2(_, _) ->
 -record(r, {s = ""}).
 
 empty_string(Config) when is_list(Config) ->
-    ?line #r{s="x"} = empty_string_1(#r{}),
+    #r{s="x"} = empty_string_1(#r{}),
     ok.
 
 empty_string_1(T) ->
@@ -149,15 +147,15 @@ md5(Config) when is_list(Config) ->
     end.
 
 md5() ->
-    ?line Dir = filename:dirname(code:which(?MODULE)),
-    ?line Beams = filelib:wildcard(filename:join(Dir, "*.beam")),
-    ?line io:format("Found ~w beam files", [length(Beams)]),
-    ?line lists:foreach(fun md5_1/1, Beams).
+    Dir = filename:dirname(code:which(?MODULE)),
+    Beams = filelib:wildcard(filename:join(Dir, "*.beam")),
+    io:format("Found ~w beam files", [length(Beams)]),
+    lists:foreach(fun md5_1/1, Beams).
 
 md5_1(Beam) ->
-    ?line {ok,{Mod,[Vsn]}} = beam_lib:version(Beam),
-    ?line {ok,Code} = file:read_file(Beam),
-    ?line {Mod,<<Vsn:128>>} = {Mod,code:module_md5(Code)}.
+    {ok,{Mod,[Vsn]}} = beam_lib:version(Beam),
+    {ok,Code} = file:read_file(Beam),
+    {Mod,<<Vsn:128>>} = {Mod,code:module_md5(Code)}.
 
 %% Cover some code that handles internal errors.
 
@@ -166,9 +164,9 @@ silly_coverage(Config) when is_list(Config) ->
     BadCoreErlang = {c_module,[],
 		     name,[],[],
 		     [{{c_var,[],{foo,2}},seriously_bad_body}]},
-    ?line expect_error(fun() -> sys_core_fold:module(BadCoreErlang, []) end),
-    ?line expect_error(fun() -> sys_core_dsetel:module(BadCoreErlang, []) end),
-    ?line expect_error(fun() -> v3_kernel:module(BadCoreErlang, []) end),
+    expect_error(fun() -> sys_core_fold:module(BadCoreErlang, []) end),
+    expect_error(fun() -> sys_core_dsetel:module(BadCoreErlang, []) end),
+    expect_error(fun() -> v3_kernel:module(BadCoreErlang, []) end),
 
     %% v3_life
     BadKernel = {k_mdef,[],?MODULE,
@@ -178,11 +176,11 @@ silly_coverage(Config) when is_list(Config) ->
 		   {k,[],[],[]},
 		   f,0,[],
 		   seriously_bad_body}]},
-    ?line expect_error(fun() -> v3_life:module(BadKernel, []) end),
+    expect_error(fun() -> v3_life:module(BadKernel, []) end),
 
     %% v3_codegen
     CodegenInput = {?MODULE,[{foo,0}],[],[{function,foo,0,[a|b],a,b,[]}]},
-    ?line expect_error(fun() -> v3_codegen:module(CodegenInput, []) end),
+    expect_error(fun() -> v3_codegen:module(CodegenInput, []) end),
 
     %% beam_a
     BeamAInput = {?MODULE,[{foo,0}],[],
@@ -192,13 +190,25 @@ silly_coverage(Config) when is_list(Config) ->
 		     {label,2}|non_proper_list]}],99},
     expect_error(fun() -> beam_a:module(BeamAInput, []) end),
 
+    %% beam_reorder
+    BlockInput = {?MODULE,[{foo,0}],[],
+		  [{function,foo,0,2,
+		    [{label,1},
+		     {func_info,{atom,?MODULE},{atom,foo},0},
+		     {label,2}|non_proper_list]}],99},
+    expect_error(fun() -> beam_reorder:module(BlockInput, []) end),
+
     %% beam_block
     BlockInput = {?MODULE,[{foo,0}],[],
 		  [{function,foo,0,2,
 		    [{label,1},
 		     {func_info,{atom,?MODULE},{atom,foo},0},
 		     {label,2}|non_proper_list]}],99},
-    ?line expect_error(fun() -> beam_block:module(BlockInput, []) end),
+    expect_error(fun() -> beam_block:module(BlockInput, []) end),
+
+    %% beam_bs
+    BsInput = BlockInput,
+    expect_error(fun() -> beam_bs:module(BsInput, []) end),
 
     %% beam_type
     TypeInput = {?MODULE,[{foo,0}],[],
@@ -224,7 +234,7 @@ silly_coverage(Config) when is_list(Config) ->
 		    [{label,1},
 		     {func_info,{atom,?MODULE},{atom,foo},0},
 		     {label,2}|non_proper_list]}],99},
-    ?line expect_error(fun() -> beam_bool:module(BoolInput, []) end),
+    expect_error(fun() -> beam_bool:module(BoolInput, []) end),
 
     %% beam_dead. This is tricky. Our function must look OK to
     %% beam_utils:clean_labels/1, but must crash beam_dead.
@@ -243,7 +253,7 @@ silly_coverage(Config) when is_list(Config) ->
 		     {func_info,{atom,?MODULE},{atom,foo},0},
 		     {label,2},
 		     {jump,{f,42}}]}],99},
-    ?line expect_error(fun() -> beam_clean:module(CleanInput, []) end),
+    expect_error(fun() -> beam_clean:module(CleanInput, []) end),
 
     %% beam_peep
     PeepInput = {?MODULE,[{foo,0}],[],
@@ -251,7 +261,7 @@ silly_coverage(Config) when is_list(Config) ->
 		   [{label,1},
 		    {func_info,{atom,?MODULE},{atom,foo},0},
 		    {label,2}|non_proper_list]}],99},
-    ?line expect_error(fun() -> beam_peep:module(PeepInput, []) end),
+    expect_error(fun() -> beam_peep:module(PeepInput, []) end),
 
     %% beam_bsm. This is tricky. Our function must be sane enough to not crash
     %% btb_index/1, but must crash the main optimization pass.
@@ -262,7 +272,7 @@ silly_coverage(Config) when is_list(Config) ->
 		   {label,2},
 		   {test,bs_get_binary2,{f,99},0,[{x,0},{atom,all},1,[]],{x,0}},
 		   {block,[a|b]}]}],0},
-    ?line expect_error(fun() -> beam_bsm:module(BsmInput, []) end),
+    expect_error(fun() -> beam_bsm:module(BsmInput, []) end),
 
     %% beam_receive.
     ReceiveInput = {?MODULE,[{foo,0}],[],
@@ -272,7 +282,7 @@ silly_coverage(Config) when is_list(Config) ->
 		       {label,2},
 		       {call_ext,0,{extfunc,erlang,make_ref,0}},
 		       {block,[a|b]}]}],0},
-    ?line expect_error(fun() -> beam_receive:module(ReceiveInput, []) end),
+    expect_error(fun() -> beam_receive:module(ReceiveInput, []) end),
 
     BeamZInput = {?MODULE,[{foo,0}],[],
 		  [{function,foo,0,2,
@@ -295,27 +305,30 @@ expect_error(Fun) ->
     try	Fun() of
 	Any ->
 	    io:format("~p", [Any]),
-	    ?t:fail(call_was_supposed_to_fail)
+	    ct:fail(call_was_supposed_to_fail)
     catch
 	Class:Reason ->
 	    Stk = erlang:get_stacktrace(),
 	    io:format("~p:~p\n~p\n", [Class,Reason,Stk]),
 	    case {Class,Reason} of
 		{error,undef} ->
-		    ?t:fail(not_supposed_to_fail_with_undef);
+		    ct:fail(not_supposed_to_fail_with_undef);
 		{_,_} ->
 		    ok
 	    end
     end.
 
 confused_literals(Config) when is_list(Config) ->
-    ?line {0,infinity} = confused_literals_1(int),
-    ?line {0.0,infinity} = confused_literals_1(float),
+    {0,infinity} = confused_literals_1(int),
+    {0.0,infinity} = confused_literals_1(float),
     ok.
 
 confused_literals_1(int) -> {0,infinity};
 confused_literals_1(float) -> {0.0,infinity}.
 
+integer_encoding() ->
+    [{timetrap,{minutes,4}}].
+
 integer_encoding(Config) when is_list(Config) ->
     case ?MODULE of
 	misc_SUITE -> integer_encoding_1(Config);
@@ -323,22 +336,21 @@ integer_encoding(Config) when is_list(Config) ->
     end.
 
 integer_encoding_1(Config) ->
-    Dog = test_server:timetrap(?t:minutes(4)),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line SrcFile = filename:join(PrivDir, "misc_SUITE_integer_encoding.erl"),
-    ?line DataFile = filename:join(PrivDir, "integer_encoding.data"),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    SrcFile = filename:join(PrivDir, "misc_SUITE_integer_encoding.erl"),
+    DataFile = filename:join(PrivDir, "integer_encoding.data"),
     Mod = misc_SUITE_integer_encoding,
 
     %% Create files.
-    ?line {ok,Src} = file:open(SrcFile, [write]),
-    ?line {ok,Data} = file:open(DataFile, [write]),
+    {ok,Src} = file:open(SrcFile, [write]),
+    {ok,Data} = file:open(DataFile, [write]),
     io:format(Src, "-module(~s).\n", [Mod]),
     io:put_chars(Src, "-export([t/1]).\n"),
     io:put_chars(Src, "t(Last) ->[\n"),
     io:put_chars(Data, "[\n"),
 
-    ?line do_integer_encoding(-(id(1) bsl 10000), Src, Data),
-    ?line do_integer_encoding(id(1) bsl 10000, Src, Data),
+    do_integer_encoding(-(id(1) bsl 10000), Src, Data),
+    do_integer_encoding(id(1) bsl 10000, Src, Data),
     do_integer_encoding(1024, 0, Src, Data),
     _ = [begin
 	     B = 1 bsl I,
@@ -350,32 +362,31 @@ integer_encoding_1(Config) ->
 	     do_integer_encoding(B+1, Src, Data)
 	 end || I <- lists:seq(1, 128)],
     io:put_chars(Src, "Last].\n\n"),
-    ?line ok = file:close(Src),
+    ok = file:close(Src),
     io:put_chars(Data, "0].\n\n"),
-    ?line ok = file:close(Data),
+    ok = file:close(Data),
 
     %% Compile and load Erlang module.
-    ?line SrcRoot = filename:rootname(SrcFile),
-    ?line {ok,Mod,Binary} = compile:file(SrcRoot, [binary,report]),
-    ?line {module,Mod} = code:load_binary(Mod, SrcRoot, Binary),
+    SrcRoot = filename:rootname(SrcFile),
+    {ok,Mod,Binary} = compile:file(SrcRoot, [binary,report]),
+    {module,Mod} = code:load_binary(Mod, SrcRoot, Binary),
 
     %% Compare lists.
-    ?line List = Mod:t(0),
-    ?line {ok,[List]} = file:consult(DataFile),
+    List = Mod:t(0),
+    {ok,[List]} = file:consult(DataFile),
     OneBsl10000 = id(1) bsl 10000,
-    ?line [-(1 bsl 10000),OneBsl10000|_] = List,
+    [-(1 bsl 10000),OneBsl10000|_] = List,
 
     %% Cleanup.
-    ?line file:delete(SrcFile),
-    ?line file:delete(DataFile),
-    ?t:timetrap_cancel(Dog),
+    file:delete(SrcFile),
+    file:delete(DataFile),
     ok.
 
 do_integer_encoding(0, _, _, _) -> ok;
 do_integer_encoding(N, I0, Src, Data) ->
-    I1 = (I0 bsl 5) bor (random:uniform(32) - 1),
+    I1 = (I0 bsl 5) bor (rand:uniform(32) - 1),
     do_integer_encoding(I1, Src, Data),
-    I2 = -(I1 bxor (random:uniform(32) - 1)),
+    I2 = -(I1 bxor (rand:uniform(32) - 1)),
     do_integer_encoding(I2, Src, Data),
     do_integer_encoding(N-1, I1, Src, Data).
 
diff --git a/lib/compiler/test/num_bif_SUITE.erl b/lib/compiler/test/num_bif_SUITE.erl
index d54fa203f0..78f6fdc3c7 100644
--- a/lib/compiler/test/num_bif_SUITE.erl
+++ b/lib/compiler/test/num_bif_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(num_bif_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Tests optimization of the BIFs:
 %% 	abs/1
@@ -65,68 +65,68 @@ end_per_group(_GroupName, Config) ->
 
 t_abs(Config) when is_list(Config) ->
     %% Floats.
-    ?line 5.5 = abs(5.5),
-    ?line 0.0 = abs(0.0),
-    ?line 100.0 = abs(-100.0),
+    5.5 = abs(5.5),
+    0.0 = abs(0.0),
+    100.0 = abs(-100.0),
     
     %% Integers.
-    ?line 5 = abs(5),
-    ?line 0 = abs(0),
-    ?line 100 = abs(-100),
+    5 = abs(5),
+    0 = abs(0),
+    100 = abs(-100),
 
     %% The largest smallnum. OTP-3190.
-    ?line X = (1 bsl 27) - 1,
-    ?line X = abs(X),
-    ?line X = abs(X-1)+1,
-    ?line X = abs(X+1)-1,
-    ?line X = abs(-X),
-    ?line X = abs(-X-1)-1,
-    ?line X = abs(-X+1)+1,
+    X = (1 bsl 27) - 1,
+    X = abs(X),
+    X = abs(X-1)+1,
+    X = abs(X+1)-1,
+    X = abs(-X),
+    X = abs(-X-1)-1,
+    X = abs(-X+1)+1,
 
     %% Bignums.
     BigNum = 13984792374983749,
-    ?line BigNum = abs(BigNum),
-    ?line BigNum = abs(-BigNum),
+    BigNum = abs(BigNum),
+    BigNum = abs(-BigNum),
     ok.
     
 t_float(Config) when is_list(Config) ->
-    ?line 0.0 = float(0),
-    ?line 2.5 = float(2.5),
-    ?line 0.0 = float(0.0),
-    ?line -100.55 = float(-100.55),
-    ?line 42.0 = float(42),
-    ?line -100.0 = float(-100),
+    0.0 = float(0),
+    2.5 = float(2.5),
+    0.0 = float(0.0),
+    -100.55 = float(-100.55),
+    42.0 = float(42),
+    -100.0 = float(-100),
 
     %% Bignums.
-    ?line 4294967305.0 = float(4294967305),
-    ?line -4294967305.0 = float(-4294967305),
+    4294967305.0 = float(4294967305),
+    -4294967305.0 = float(-4294967305),
 
     %% Extremly big bignums.
-    ?line Big = list_to_integer(lists:duplicate(2000, $1)),
-    ?line {'EXIT', {badarg, _}} = (catch float(Big)),
+    Big = list_to_integer(lists:duplicate(2000, $1)),
+    {'EXIT', {badarg, _}} = (catch float(Big)),
 
     %% Invalid types and lists.
-    ?line {'EXIT', {badarg, _}} = (catch list_to_integer(atom)),
-    ?line {'EXIT', {badarg, _}} = (catch list_to_integer(123)),
-    ?line {'EXIT', {badarg, _}} = (catch list_to_integer([$1, [$2]])),
-    ?line {'EXIT', {badarg, _}} = (catch list_to_integer("1.2")),
-    ?line {'EXIT', {badarg, _}} = (catch list_to_integer("a")),
-    ?line {'EXIT', {badarg, _}} = (catch list_to_integer("")),
+    {'EXIT', {badarg, _}} = (catch list_to_integer(atom)),
+    {'EXIT', {badarg, _}} = (catch list_to_integer(123)),
+    {'EXIT', {badarg, _}} = (catch list_to_integer([$1, [$2]])),
+    {'EXIT', {badarg, _}} = (catch list_to_integer("1.2")),
+    {'EXIT', {badarg, _}} = (catch list_to_integer("a")),
+    {'EXIT', {badarg, _}} = (catch list_to_integer("")),
     ok.
 
 
 %% Tests float_to_list/1.
 
 t_float_to_list(Config) when is_list(Config) ->
-    ?line test_ftl("0.0e+0", 0.0),
-    ?line test_ftl("2.5e+1", 25.0),
-    ?line test_ftl("2.5e+0", 2.5),
-    ?line test_ftl("2.5e-1", 0.25),
-    ?line test_ftl("-3.5e+17", -350.0e15),
+    test_ftl("0.0e+0", 0.0),
+    test_ftl("2.5e+1", 25.0),
+    test_ftl("2.5e+0", 2.5),
+    test_ftl("2.5e-1", 0.25),
+    test_ftl("-3.5e+17", -350.0e15),
     ok.
     
 test_ftl(Expect, Float) ->
-    %% No ?line on the next line -- we want the line number from t_float_to_list.
+    %% No on the next line -- we want the line number from t_float_to_list.
     Expect = remove_zeros(lists:reverse(float_to_list(Float)), []).
 
 %% Removes any non-significant zeros in a floating point number.
@@ -148,36 +148,36 @@ remove_zeros([], Result) ->
 %% Tests integer_to_list/1.
 
 t_integer_to_list(Config) when is_list(Config) ->
-    ?line "0" = integer_to_list(0),
-    ?line "42" = integer_to_list(42),
-    ?line "-42" = integer_to_list(-42),
-    ?line "-42" = integer_to_list(-42),
-    ?line "32768" = integer_to_list(32768),
-    ?line "268435455" = integer_to_list(268435455),
-    ?line "-268435455" = integer_to_list(-268435455),
-    ?line "123456932798748738738" = integer_to_list(123456932798748738738),
-    ?line Big_List = lists:duplicate(2000, $1),
-    ?line Big = list_to_integer(Big_List),
-    ?line Big_List = integer_to_list(Big),
+    "0" = integer_to_list(0),
+    "42" = integer_to_list(42),
+    "-42" = integer_to_list(-42),
+    "-42" = integer_to_list(-42),
+    "32768" = integer_to_list(32768),
+    "268435455" = integer_to_list(268435455),
+    "-268435455" = integer_to_list(-268435455),
+    "123456932798748738738" = integer_to_list(123456932798748738738),
+    Big_List = lists:duplicate(2000, $1),
+    Big = list_to_integer(Big_List),
+    Big_List = integer_to_list(Big),
     ok.
 
 %% Tests list_to_float/1.
 
 
 t_list_to_float_safe(Config) when is_list(Config) ->
-    ?line 0.0 = list_to_float("0.0"),
-    ?line 0.0 = list_to_float("-0.0"),
-    ?line 0.5 = list_to_float("0.5"),
-    ?line -0.5 = list_to_float("-0.5"),
-    ?line 100.0 = list_to_float("1.0e2"),
-    ?line 127.5 = list_to_float("127.5"),
-    ?line -199.5 = list_to_float("-199.5"),
-
-    ?line {'EXIT', {badarg, _}} = (catch list_to_float("0")),
-    ?line {'EXIT', {badarg, _}} = (catch list_to_float("0..0")),
-    ?line {'EXIT', {badarg, _}} = (catch list_to_float("0e12")),
-    ?line {'EXIT', {badarg, _}} = (catch list_to_float("--0.0")),
-%%    ?line {'EXIT', {badarg, _}} = (catch list_to_float("0.0e+99999999")),
+    0.0 = list_to_float("0.0"),
+    0.0 = list_to_float("-0.0"),
+    0.5 = list_to_float("0.5"),
+    -0.5 = list_to_float("-0.5"),
+    100.0 = list_to_float("1.0e2"),
+    127.5 = list_to_float("127.5"),
+    -199.5 = list_to_float("-199.5"),
+
+    {'EXIT', {badarg, _}} = (catch list_to_float("0")),
+    {'EXIT', {badarg, _}} = (catch list_to_float("0..0")),
+    {'EXIT', {badarg, _}} = (catch list_to_float("0e12")),
+    {'EXIT', {badarg, _}} = (catch list_to_float("--0.0")),
+%%    {'EXIT', {badarg, _}} = (catch list_to_float("0.0e+99999999")),
 
     ok.
 
@@ -185,101 +185,101 @@ t_list_to_float_safe(Config) when is_list(Config) ->
 %% (Known to crash the Unix version of Erlang 4.4.1)
 
 t_list_to_float_risky(Config) when is_list(Config) ->
-    ?line Many_Ones = lists:duplicate(25000, $1),
-    ?line _ = list_to_float("2."++Many_Ones),
-    ?line {'EXIT', {badarg, _}} = (catch list_to_float("2"++Many_Ones)),
+    Many_Ones = lists:duplicate(25000, $1),
+    _ = list_to_float("2."++Many_Ones),
+    {'EXIT', {badarg, _}} = (catch list_to_float("2"++Many_Ones)),
     ok.
 
 %% Tests list_to_integer/1.
 
 t_list_to_integer(Config) when is_list(Config) ->
-    ?line 0 = list_to_integer("0"),
-    ?line 0 = list_to_integer("00"),
-    ?line 0 = list_to_integer("-0"),
-    ?line 1 = list_to_integer("1"),
-    ?line -1 = list_to_integer("-1"),
-    ?line 42 = list_to_integer("42"),
-    ?line -12 = list_to_integer("-12"),
-    ?line 32768 = list_to_integer("32768"),
-    ?line 268435455 = list_to_integer("268435455"),
-    ?line -268435455 = list_to_integer("-268435455"),
+    0 = list_to_integer("0"),
+    0 = list_to_integer("00"),
+    0 = list_to_integer("-0"),
+    1 = list_to_integer("1"),
+    -1 = list_to_integer("-1"),
+    42 = list_to_integer("42"),
+    -12 = list_to_integer("-12"),
+    32768 = list_to_integer("32768"),
+    268435455 = list_to_integer("268435455"),
+    -268435455 = list_to_integer("-268435455"),
 
     %% Bignums.
-    ?line 123456932798748738738 = list_to_integer("123456932798748738738"),
-    ?line _ = list_to_integer(lists:duplicate(2000, $1)),
+    123456932798748738738 = list_to_integer("123456932798748738738"),
+    _ = list_to_integer(lists:duplicate(2000, $1)),
     ok.
 
 %% Tests round/1.
 
 t_round(Config) when is_list(Config) ->
-    ?line 0 = round(0.0),
-    ?line 0 = round(0.4),
-    ?line 1 = round(0.5),
-    ?line 0 = round(-0.4),
-    ?line -1 = round(-0.5),
-    ?line 255 = round(255.3),
-    ?line 256 = round(255.6),
-    ?line -1033 = round(-1033.3),
-    ?line -1034 = round(-1033.6),
+    0 = round(0.0),
+    0 = round(0.4),
+    1 = round(0.5),
+    0 = round(-0.4),
+    -1 = round(-0.5),
+    255 = round(255.3),
+    256 = round(255.6),
+    -1033 = round(-1033.3),
+    -1034 = round(-1033.6),
     
     % OTP-3722:
-    ?line X = (1 bsl 27) - 1,
-    ?line MX = -X,
-    ?line MXm1 = -X-1,
-    ?line MXp1 = -X+1,
-    ?line F = X + 0.0,
-    ?line X = round(F),
-    ?line X = round(F+1)-1,
-    ?line X = round(F-1)+1,
-    ?line MX = round(-F),
-    ?line MXm1 = round(-F-1),
-    ?line MXp1 = round(-F+1),
-
-    ?line X = round(F+0.1),
-    ?line X = round(F+1+0.1)-1,
-    ?line X = round(F-1+0.1)+1,
-    ?line MX = round(-F+0.1),
-    ?line MXm1 = round(-F-1+0.1),
-    ?line MXp1 = round(-F+1+0.1),
-
-    ?line X = round(F-0.1),
-    ?line X = round(F+1-0.1)-1,
-    ?line X = round(F-1-0.1)+1,
-    ?line MX = round(-F-0.1),
-    ?line MXm1 = round(-F-1-0.1),
-    ?line MXp1 = round(-F+1-0.1),
-
-    ?line 0.5 = abs(round(F+0.5)-(F+0.5)),
-    ?line 0.5 = abs(round(F-0.5)-(F-0.5)),
-    ?line 0.5 = abs(round(-F-0.5)-(-F-0.5)),
-    ?line 0.5 = abs(round(-F+0.5)-(-F+0.5)),
+    X = (1 bsl 27) - 1,
+    MX = -X,
+    MXm1 = -X-1,
+    MXp1 = -X+1,
+    F = X + 0.0,
+    X = round(F),
+    X = round(F+1)-1,
+    X = round(F-1)+1,
+    MX = round(-F),
+    MXm1 = round(-F-1),
+    MXp1 = round(-F+1),
+
+    X = round(F+0.1),
+    X = round(F+1+0.1)-1,
+    X = round(F-1+0.1)+1,
+    MX = round(-F+0.1),
+    MXm1 = round(-F-1+0.1),
+    MXp1 = round(-F+1+0.1),
+
+    X = round(F-0.1),
+    X = round(F+1-0.1)-1,
+    X = round(F-1-0.1)+1,
+    MX = round(-F-0.1),
+    MXm1 = round(-F-1-0.1),
+    MXp1 = round(-F+1-0.1),
+
+    0.5 = abs(round(F+0.5)-(F+0.5)),
+    0.5 = abs(round(F-0.5)-(F-0.5)),
+    0.5 = abs(round(-F-0.5)-(-F-0.5)),
+    0.5 = abs(round(-F+0.5)-(-F+0.5)),
 
     %% Bignums.
-    ?line 4294967296 = round(4294967296.1),
-    ?line 4294967297 = round(4294967296.9),
-    ?line -4294967296 = -round(4294967296.1),
-    ?line -4294967297 = -round(4294967296.9),
+    4294967296 = round(4294967296.1),
+    4294967297 = round(4294967296.9),
+    -4294967296 = -round(4294967296.1),
+    -4294967297 = -round(4294967296.9),
     ok.
 
 t_trunc(Config) when is_list(Config) ->
-    ?line 0 = trunc(0.0),
-    ?line 5 = trunc(5.3333),
-    ?line -10 = trunc(-10.978987),
+    0 = trunc(0.0),
+    5 = trunc(5.3333),
+    -10 = trunc(-10.978987),
     % The largest smallnum, converted to float (OTP-3722):
-    ?line X = (1 bsl 27) - 1,
-    ?line F = X + 0.0,
+    X = (1 bsl 27) - 1,
+    F = X + 0.0,
     io:format("X = ~p/~w/~w, F = ~p/~w/~w, trunc(F) = ~p/~w/~w~n",
 	      [X, X, binary_to_list(term_to_binary(X)),
 	       F, F, binary_to_list(term_to_binary(F)),
 	       trunc(F), trunc(F), binary_to_list(term_to_binary(trunc(F)))]),
-    ?line X = trunc(F),
-    ?line X = trunc(F+1)-1,
-    ?line X = trunc(F-1)+1,
-    ?line X = -trunc(-F),
-    ?line X = -trunc(-F-1)-1,
-    ?line X = -trunc(-F+1)+1,
+    X = trunc(F),
+    X = trunc(F+1)-1,
+    X = trunc(F-1)+1,
+    X = -trunc(-F),
+    X = -trunc(-F-1)-1,
+    X = -trunc(-F+1)+1,
 
     %% Bignums.
-    ?line 4294967305 = trunc(4294967305.7),
-    ?line -4294967305 = trunc(-4294967305.7),
+    4294967305 = trunc(4294967305.7),
+    -4294967305 = trunc(-4294967305.7),
     ok.
diff --git a/lib/compiler/test/receive_SUITE.erl b/lib/compiler/test/receive_SUITE.erl
index 4016fac0b5..8d2c78aae2 100644
--- a/lib/compiler/test/receive_SUITE.erl
+++ b/lib/compiler/test/receive_SUITE.erl
@@ -27,18 +27,17 @@
 	 export/1,recv/1,coverage/1,otp_7980/1,ref_opt/1,
 	 wait/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(2)),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     test_lib:recompile(?MODULE),
@@ -64,21 +63,21 @@ end_per_group(_GroupName, Config) ->
 -record(state, {ena = true}).
 
 recv(Config) when is_list(Config) ->
-    ?line Pid = spawn_link(fun() -> loop(#state{}) end),
+    Pid = spawn_link(fun() -> loop(#state{}) end),
     Self = self(),
-    ?line Pid ! {Self,test},
+    Pid ! {Self,test},
     receive
 	{ok,test} -> ok;
 	{error,Other} ->
 	    io:format("Got unpexected ~p", [Other]),
-	    ?line ?t:fail()
+	    ct:fail(unexpected)
     after 10000 ->
-	    ?line ?t:fail(no_answer)
+	    ct:fail(no_answer)
     end,
     receive
 	X ->
 	    io:format("Unexpected extra message: ~p", [X]),
-	    ?line ?t:fail()
+	    ct:fail(unexpected)
     after 10 ->
 	    ok
     end,
@@ -116,9 +115,9 @@ coverage(Config) when is_list(Config) ->
 
     self() ! 17,
     self() ! 19,
-    ?line 59 = tuple_to_values(infinity, x),
-    ?line 61 = tuple_to_values(999999, x),
-    ?line 0 = tuple_to_values(1, x),
+    59 = tuple_to_values(infinity, x),
+    61 = tuple_to_values(999999, x),
+    0 = tuple_to_values(1, x),
     ok.
 
 receive_all() ->
@@ -188,8 +187,8 @@ ref_opt(Config) when is_list(Config) ->
     end.
 
 ref_opt_1(Config) ->
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Sources = filelib:wildcard(filename:join([DataDir,"ref_opt","*.{erl,S}"])),
     test_lib:p_run(fun(Src) ->
 			   do_ref_opt(Src, PrivDir)
@@ -257,9 +256,9 @@ cover_recv_instructions() ->
 
 export(Config) when is_list(Config) ->
     Ref = make_ref(),
-    ?line self() ! {result,Ref,42},
-    ?line 42 = export_1(Ref),
-    ?line {error,timeout} = export_1(Ref),
+    self() ! {result,Ref,42},
+    42 = export_1(Ref),
+    {error,timeout} = export_1(Ref),
     ok.
 
 export_1(Reference) ->
diff --git a/lib/compiler/test/record_SUITE.erl b/lib/compiler/test/record_SUITE.erl
index 2ef379e43f..680bd38317 100644
--- a/lib/compiler/test/record_SUITE.erl
+++ b/lib/compiler/test/record_SUITE.erl
@@ -21,7 +21,7 @@
 
 -module(record_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
@@ -31,15 +31,14 @@
 	 nested_access/1,coverage/1]).
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(2)),
-    [{watchdog,Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     test_lib:recompile(?MODULE),
@@ -71,18 +70,18 @@ end_per_group(_GroupName, Config) ->
 
 errors(Config) when is_list(Config) ->
     Foo = #foo{a=1,b=2,c=3,d=4},
-    ?line #foo{a=19,b=42,c=3,d=4} = update_foo(Foo, 19, 42),
-
-    ?line {'EXIT',{{badrecord,bar},_}} = (catch update_foo_bar(Foo, 19)),
-    ?line {'EXIT',{{badrecord,bar},_}} = (catch update_foo_bar(Foo, 19, 35)),
-    ?line {'EXIT',{{badrecord,bar},_}} = (catch update_foo_bar(Foo, 19, 35, 17)),
-    ?line {'EXIT',{{badrecord,bar},_}} = (catch update_foo_bar(Foo, 19, 35, 17, 42)),
-
-    ?line {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19)),
-    ?line {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19, 35)),
-    ?line {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19, 35, 17)),
-    ?line {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19, 35, 17, 42)),
-    ?line {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19,
+    #foo{a=19,b=42,c=3,d=4} = update_foo(Foo, 19, 42),
+
+    {'EXIT',{{badrecord,bar},_}} = (catch update_foo_bar(Foo, 19)),
+    {'EXIT',{{badrecord,bar},_}} = (catch update_foo_bar(Foo, 19, 35)),
+    {'EXIT',{{badrecord,bar},_}} = (catch update_foo_bar(Foo, 19, 35, 17)),
+    {'EXIT',{{badrecord,bar},_}} = (catch update_foo_bar(Foo, 19, 35, 17, 42)),
+
+    {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19)),
+    {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19, 35)),
+    {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19, 35, 17)),
+    {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19, 35, 17, 42)),
+    {'EXIT',{{badrecord,barf},_}} = (catch update_foo_barf(Foo, 19,
 								 35, 17, 42, -2)),
 
     ok.
@@ -118,72 +117,72 @@ update_foo_barf(#foo{}=R, A, _B, C, D, E) ->
     R#barf{a=A,b=A,c=C,d=D,e=E}.
 
 
--define(TrueGuard(Expr), if Expr -> ok; true -> ?t:fail() end).
--define(FalseGuard(Expr), if Expr -> ?t:fail(); true -> ok end).
+-define(TrueGuard(Expr), if Expr -> ok; true -> ct:fail(failed) end).
+-define(FalseGuard(Expr), if Expr -> ct:fail(failed); true -> ok end).
 				
 record_test_2(Config) when is_list(Config) ->
-    ?line true = is_record(#foo{}, foo),
-    ?line false = is_record(#foo{}, barf),
-    ?line false = is_record({foo}, foo),
+    true = is_record(#foo{}, foo),
+    false = is_record(#foo{}, barf),
+    false = is_record({foo}, foo),
 
-    ?line true = erlang:is_record(#foo{}, foo),
-    ?line false = erlang:is_record(#foo{}, barf),
-    ?line false = erlang:is_record({foo}, foo),
+    true = erlang:is_record(#foo{}, foo),
+    false = erlang:is_record(#foo{}, barf),
+    false = erlang:is_record({foo}, foo),
 
-    ?line false = is_record([], foo),
-    ?line false = is_record(Config, foo),
+    false = is_record([], foo),
+    false = is_record(Config, foo),
 
-    ?line ?TrueGuard(is_record(#foo{}, foo)),
-    ?line ?FalseGuard(is_record(#foo{}, barf)),
-    ?line ?FalseGuard(is_record({foo}, foo)),
+    ?TrueGuard(is_record(#foo{}, foo)),
+    ?FalseGuard(is_record(#foo{}, barf)),
+    ?FalseGuard(is_record({foo}, foo)),
 
-    ?line ?TrueGuard(erlang:is_record(#foo{}, foo)),
-    ?line ?FalseGuard(erlang:is_record(#foo{}, barf)),
-    ?line ?FalseGuard(erlang:is_record({foo}, foo)),
+    ?TrueGuard(erlang:is_record(#foo{}, foo)),
+    ?FalseGuard(erlang:is_record(#foo{}, barf)),
+    ?FalseGuard(erlang:is_record({foo}, foo)),
 
-    ?line ?FalseGuard(is_record([], foo)),
-    ?line ?FalseGuard(is_record(Config, foo)),
+    ?FalseGuard(is_record([], foo)),
+    ?FalseGuard(is_record(Config, foo)),
 
     %% 'not is_record/2' to test guard optimization.
 
-    ?line ?FalseGuard(not is_record(#foo{}, foo)),
-    ?line ?TrueGuard(not is_record(#foo{}, barf)),
-    ?line ?TrueGuard(not is_record({foo}, foo)),
+    ?FalseGuard(not is_record(#foo{}, foo)),
+    ?TrueGuard(not is_record(#foo{}, barf)),
+    ?TrueGuard(not is_record({foo}, foo)),
 
-    ?line ?FalseGuard(not erlang:is_record(#foo{}, foo)),
-    ?line ?TrueGuard(not erlang:is_record(#foo{}, barf)),
-    ?line ?TrueGuard(not erlang:is_record({foo}, foo)),
+    ?FalseGuard(not erlang:is_record(#foo{}, foo)),
+    ?TrueGuard(not erlang:is_record(#foo{}, barf)),
+    ?TrueGuard(not erlang:is_record({foo}, foo)),
 
     Foo = id(#foo{}),
-    ?line ?FalseGuard(not erlang:is_record(Foo, foo)),
-    ?line ?TrueGuard(not erlang:is_record(Foo, barf)),
+    ?FalseGuard(not erlang:is_record(Foo, foo)),
+    ?TrueGuard(not erlang:is_record(Foo, barf)),
 
-    ?line ?TrueGuard(not is_record(Config, foo)),
+    ?TrueGuard(not is_record(Config, foo)),
 
-    ?line ?TrueGuard(not is_record(a, foo)),
-    ?line ?TrueGuard(not is_record([], foo)),
+    ?TrueGuard(not is_record(a, foo)),
+    ?TrueGuard(not is_record([], foo)),
 
     %% Pass non-literal first argument.
 
-    ?line true = is_record(id(#foo{}), foo),
-    ?line false = is_record(id(#foo{}), barf),
-    ?line false = is_record(id({foo}), foo),
+    true = is_record(id(#foo{}), foo),
+    false = is_record(id(#foo{}), barf),
+    false = is_record(id({foo}), foo),
 
-    ?line true = erlang:is_record(id(#foo{}), foo),
-    ?line false = erlang:is_record(id(#foo{}), barf),
-    ?line false = erlang:is_record(id({foo}), foo),
+    true = erlang:is_record(id(#foo{}), foo),
+    false = erlang:is_record(id(#foo{}), barf),
+    false = erlang:is_record(id({foo}), foo),
 
     NoRec1 = id(blurf),
     NoRec2 = id([]),
 
-    ?line ?TrueGuard(not is_record(NoRec1, foo)),
-    ?line ?TrueGuard(not is_record(NoRec2, foo)),
+    ?TrueGuard(not is_record(NoRec1, foo)),
+    ?TrueGuard(not is_record(NoRec2, foo)),
 
     %% The optimizer attempts to move expressions to guards,
     %% but it must not move an is_record/2 call that is not
     %% allowed in a guard in the first place.
 
-    ?line ok = case is_record(id({a}), id(a)) of
+    ok = case is_record(id({a}), id(a)) of
 		   true -> ok;
 		   false -> error
 	       end,
@@ -191,61 +190,61 @@ record_test_2(Config) when is_list(Config) ->
     %% Force the use of guard bifs by using the 'xor' operation.
 
     False = id(false),
-    ?line ?TrueGuard(is_record(#foo{}, foo) xor False),
-    ?line ?FalseGuard(is_record(#foo{}, barf) xor False),
-    ?line ?FalseGuard(is_record({foo}, foo) xor False ),
+    ?TrueGuard(is_record(#foo{}, foo) xor False),
+    ?FalseGuard(is_record(#foo{}, barf) xor False),
+    ?FalseGuard(is_record({foo}, foo) xor False ),
 
-    ?line ?TrueGuard(is_record(Foo, foo) xor False),
-    ?line ?FalseGuard(is_record(Foo, barf) xor False),
+    ?TrueGuard(is_record(Foo, foo) xor False),
+    ?FalseGuard(is_record(Foo, barf) xor False),
 
 
     %% Implicit guards by using a list comprehension.
 
     List = id([1,#foo{a=2},3,#bar{d=4},5,#foo{a=6},7]),
 
-    ?line [#foo{a=2},#foo{a=6}] = [X || X <- List, is_record(X, foo)],
-    ?line [#bar{d=4}] = [X || X <- List, is_record(X, bar)],
-    ?line [1,#foo{a=2},3,5,#foo{a=6},7] =
+    [#foo{a=2},#foo{a=6}] = [X || X <- List, is_record(X, foo)],
+    [#bar{d=4}] = [X || X <- List, is_record(X, bar)],
+    [1,#foo{a=2},3,5,#foo{a=6},7] =
 	[X || X <- List, not is_record(X, bar)],
-    ?line [1,3,5,7] =
+    [1,3,5,7] =
 	[X || X <- List, ((not is_record(X, bar)) and (not is_record(X, foo)))],
-    ?line [#foo{a=2},#bar{d=4},#foo{a=6}] =
+    [#foo{a=2},#bar{d=4},#foo{a=6}] =
 	[X || X <- List, ((is_record(X, bar)) or (is_record(X, foo)))],
-    ?line [1,3,#bar{d=4}] =
+    [1,3,#bar{d=4}] =
 	[X || X <- List, ((is_record(X, bar)) or (X < 5))],
 
-    ?line MyList = [#foo{a=3},x,[],{a,b}],
-    ?line [#foo{a=3}] = [X || X <- MyList, is_record(X, foo)],
-    ?line [x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo)],
-    ?line [#foo{a=3}] = [X || X <- MyList, begin is_record(X, foo) end],
-    ?line [x,[],{a,b}] = [X || X <- MyList, begin not is_record(X, foo) end],
-    ?line [#foo{a=3},x,[],{a,b}] = [X || X <- MyList, is_record(X, foo) or
-					     not is_binary(X)],
-    ?line [#foo{a=3},x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo) or
-					     not is_binary(X)],
-    ?line [#foo{a=3}] = [X || X <- MyList, is_record(X, foo) or is_reference(X)],
-    ?line [x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo) or
-				   is_reference(X)],
-    ?line [#foo{a=3},x,[],{a,b}] = [X || X <- MyList,
-					 begin is_record(X, foo) or
-						   not is_binary(X) end],
-    ?line [#foo{a=3},x,[],{a,b}] = [X || X <- MyList,
-					 begin not is_record(X, foo) or
-						   not is_binary(X) end],
-    ?line [#foo{a=3}] = [X || X <- MyList,
-			      begin is_record(X, foo) or is_reference(X) end],
-    ?line [x,[],{a,b}] = [X || X <- MyList,
-			       begin not is_record(X, foo) or
-					 is_reference(X) end],
+    MyList = [#foo{a=3},x,[],{a,b}],
+    [#foo{a=3}] = [X || X <- MyList, is_record(X, foo)],
+    [x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo)],
+    [#foo{a=3}] = [X || X <- MyList, begin is_record(X, foo) end],
+    [x,[],{a,b}] = [X || X <- MyList, begin not is_record(X, foo) end],
+    [#foo{a=3},x,[],{a,b}] = [X || X <- MyList, is_record(X, foo) or
+				       not is_binary(X)],
+    [#foo{a=3},x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo) or
+				       not is_binary(X)],
+    [#foo{a=3}] = [X || X <- MyList, is_record(X, foo) or is_reference(X)],
+    [x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo) or
+			     is_reference(X)],
+    [#foo{a=3},x,[],{a,b}] = [X || X <- MyList,
+				   begin is_record(X, foo) or
+					     not is_binary(X) end],
+    [#foo{a=3},x,[],{a,b}] = [X || X <- MyList,
+				   begin not is_record(X, foo) or
+					     not is_binary(X) end],
+    [#foo{a=3}] = [X || X <- MyList,
+			begin is_record(X, foo) or is_reference(X) end],
+    [x,[],{a,b}] = [X || X <- MyList,
+			 begin not is_record(X, foo) or
+				   is_reference(X) end],
 
     %% Call is_record/2 with illegal arguments.
-    ?line [] = [X || X <- [], is_record(t, id(X))],
-    ?line {'EXIT',{badarg,_}} = (catch [X || X <- [1], is_record(t, id(X))]),
+    [] = [X || X <- [], is_record(t, id(X))],
+    {'EXIT',{badarg,_}} = (catch [X || X <- [1], is_record(t, id(X))]),
 
     %% Update several fields with a string literal.
-    ?line #barf{} = Barf0 = id(#barf{}),
-    ?line Barf = update_barf(Barf0),
-    ?line #barf{a="abc",b=1} = id(Barf),
+    #barf{} = Barf0 = id(#barf{}),
+    Barf = update_barf(Barf0),
+    #barf{a="abc",b=1} = id(Barf),
 
     %% Test optimization of is_record/3.
     false = case id({a,b}) of
@@ -258,125 +257,125 @@ record_test_2(Config) when is_list(Config) ->
     ok.
 
 record_test_3(Config) when is_list(Config) ->
-    ?line true = is_record(#foo{}, foo, 5),
-    ?line false = is_record(#foo{}, barf, 5),
-    ?line false = is_record(#foo{}, barf, 6),
-    ?line false = is_record({foo}, foo, 5),
+    true = is_record(#foo{}, foo, 5),
+    false = is_record(#foo{}, barf, 5),
+    false = is_record(#foo{}, barf, 6),
+    false = is_record({foo}, foo, 5),
 
-    ?line true = erlang:is_record(#foo{}, foo, 5),
-    ?line false = erlang:is_record(#foo{}, barf, 5),
-    ?line false = erlang:is_record({foo}, foo, 5),
+    true = erlang:is_record(#foo{}, foo, 5),
+    false = erlang:is_record(#foo{}, barf, 5),
+    false = erlang:is_record({foo}, foo, 5),
 
-    ?line false = is_record([], foo),
-    ?line false = is_record(Config, foo),
+    false = is_record([], foo),
+    false = is_record(Config, foo),
 
-    ?line ?TrueGuard(is_record(#foo{}, foo, 5)),
-    ?line ?FalseGuard(is_record(#foo{}, barf, 5)),
-    ?line ?FalseGuard(is_record(#foo{}, barf, 6)),
-    ?line ?FalseGuard(is_record({foo}, foo, 5)),
+    ?TrueGuard(is_record(#foo{}, foo, 5)),
+    ?FalseGuard(is_record(#foo{}, barf, 5)),
+    ?FalseGuard(is_record(#foo{}, barf, 6)),
+    ?FalseGuard(is_record({foo}, foo, 5)),
 
-    ?line ?TrueGuard(erlang:is_record(#foo{}, foo, 5)),
-    ?line ?FalseGuard(erlang:is_record(#foo{}, barf, 5)),
-    ?line ?FalseGuard(erlang:is_record(#foo{}, barf, 6)),
-    ?line ?FalseGuard(erlang:is_record({foo}, foo, 5)),
+    ?TrueGuard(erlang:is_record(#foo{}, foo, 5)),
+    ?FalseGuard(erlang:is_record(#foo{}, barf, 5)),
+    ?FalseGuard(erlang:is_record(#foo{}, barf, 6)),
+    ?FalseGuard(erlang:is_record({foo}, foo, 5)),
 
-    ?line ?FalseGuard(is_record([], foo, 5)),
-    ?line ?FalseGuard(is_record(Config, foo, 5)),
+    ?FalseGuard(is_record([], foo, 5)),
+    ?FalseGuard(is_record(Config, foo, 5)),
 
     %% 'not is_record/2' to test guard optimization.
 
-    ?line ?FalseGuard(not is_record(#foo{}, foo, 5)),
-    ?line ?TrueGuard(not is_record(#foo{}, barf, 6)),
-    ?line ?TrueGuard(not is_record({foo}, foo, 5)),
+    ?FalseGuard(not is_record(#foo{}, foo, 5)),
+    ?TrueGuard(not is_record(#foo{}, barf, 6)),
+    ?TrueGuard(not is_record({foo}, foo, 5)),
 
-    ?line ?FalseGuard(not erlang:is_record(#foo{}, foo, 5)),
-    ?line ?TrueGuard(not erlang:is_record(#foo{}, barf, 5)),
-    ?line ?TrueGuard(not erlang:is_record({foo}, foo, 5)),
+    ?FalseGuard(not erlang:is_record(#foo{}, foo, 5)),
+    ?TrueGuard(not erlang:is_record(#foo{}, barf, 5)),
+    ?TrueGuard(not erlang:is_record({foo}, foo, 5)),
 
     Foo = id(#foo{}),
-    ?line ?FalseGuard(not erlang:is_record(Foo, foo, 5)),
-    ?line ?TrueGuard(not erlang:is_record(Foo, barf, 6)),
+    ?FalseGuard(not erlang:is_record(Foo, foo, 5)),
+    ?TrueGuard(not erlang:is_record(Foo, barf, 6)),
 
-    ?line ?TrueGuard(not is_record(Config, foo, 5)),
+    ?TrueGuard(not is_record(Config, foo, 5)),
 
-    ?line ?TrueGuard(not is_record(a, foo, 5)),
-    ?line ?TrueGuard(not is_record([], foo, 5)),
+    ?TrueGuard(not is_record(a, foo, 5)),
+    ?TrueGuard(not is_record([], foo, 5)),
 
     %% Pass non-literal first argument.
 
-    ?line true = is_record(id(#foo{}), foo, 5),
-    ?line false = is_record(id(#foo{}), barf, 6),
-    ?line false = is_record(id({foo}), foo, 5),
+    true = is_record(id(#foo{}), foo, 5),
+    false = is_record(id(#foo{}), barf, 6),
+    false = is_record(id({foo}), foo, 5),
 
-    ?line true = erlang:is_record(id(#foo{}), foo, 5),
-    ?line false = erlang:is_record(id(#foo{}), barf, 6),
-    ?line false = erlang:is_record(id({foo}), foo, 5),
+    true = erlang:is_record(id(#foo{}), foo, 5),
+    false = erlang:is_record(id(#foo{}), barf, 6),
+    false = erlang:is_record(id({foo}), foo, 5),
 
     NoRec1 = id(blurf),
     NoRec2 = id([]),
 
-    ?line ?TrueGuard(not is_record(NoRec1, foo, 5)),
-    ?line ?TrueGuard(not is_record(NoRec2, foo, 5)),
+    ?TrueGuard(not is_record(NoRec1, foo, 5)),
+    ?TrueGuard(not is_record(NoRec2, foo, 5)),
 
     %% Force the use of guard bifs by using the 'xor' operation.
 
     False = id(false),
-    ?line ?TrueGuard(is_record(#foo{}, foo, 5) xor False),
-    ?line ?FalseGuard(is_record(#foo{}, barf, 6) xor False),
-    ?line ?FalseGuard(is_record({foo}, foo, 5) xor False ),
+    ?TrueGuard(is_record(#foo{}, foo, 5) xor False),
+    ?FalseGuard(is_record(#foo{}, barf, 6) xor False),
+    ?FalseGuard(is_record({foo}, foo, 5) xor False ),
 
-    ?line ?TrueGuard(is_record(Foo, foo, 5) xor False),
-    ?line ?FalseGuard(is_record(Foo, barf, 6) xor False),
+    ?TrueGuard(is_record(Foo, foo, 5) xor False),
+    ?FalseGuard(is_record(Foo, barf, 6) xor False),
 
 
     %% Implicit guards by using a list comprehension.
 
     List = id([1,#foo{a=2},3,#bar{d=4},5,#foo{a=6},7]),
 
-    ?line [#foo{a=2},#foo{a=6}] = [X || X <- List, is_record(X, foo, 5)],
-    ?line [#bar{d=4}] = [X || X <- List, is_record(X, bar, 5)],
-    ?line [1,#foo{a=2},3,5,#foo{a=6},7] =
+    [#foo{a=2},#foo{a=6}] = [X || X <- List, is_record(X, foo, 5)],
+    [#bar{d=4}] = [X || X <- List, is_record(X, bar, 5)],
+    [1,#foo{a=2},3,5,#foo{a=6},7] =
 	[X || X <- List, not is_record(X, bar, 5)],
-    ?line [1,3,5,7] =
+    [1,3,5,7] =
 	[X || X <- List, ((not is_record(X, bar, 5)) and (not is_record(X, foo, 5)))],
-    ?line [#foo{a=2},#bar{d=4},#foo{a=6}] =
+    [#foo{a=2},#bar{d=4},#foo{a=6}] =
 	[X || X <- List, ((is_record(X, bar, 5)) or (is_record(X, foo, 5)))],
-    ?line [1,3,#bar{d=4}] =
+    [1,3,#bar{d=4}] =
 	[X || X <- List, ((is_record(X, bar, 5)) or (X < 5))],
 
-    ?line MyList = [#foo{a=3},x,[],{a,b}],
-    ?line [#foo{a=3}] = [X || X <- MyList, is_record(X, foo, 5)],
-    ?line [x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo, 5)],
-    ?line [#foo{a=3}] = [X || X <- MyList, begin is_record(X, foo, 5) end],
-    ?line [x,[],{a,b}] = [X || X <- MyList, begin not is_record(X, foo, 5) end],
-    ?line [#foo{a=3},x,[],{a,b}] = [X || X <- MyList, is_record(X, foo, 5) or
-					     not is_binary(X)],
-    ?line [#foo{a=3},x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo, 5) or
-					     not is_binary(X)],
-    ?line [#foo{a=3}] = [X || X <- MyList, is_record(X, foo) or is_reference(X)],
-    ?line [x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo) or
-				   is_reference(X)],
-    ?line [#foo{a=3},x,[],{a,b}] = [X || X <- MyList,
-					 begin is_record(X, foo, 5) or
-						   not is_binary(X) end],
-    ?line [#foo{a=3},x,[],{a,b}] = [X || X <- MyList,
-					 begin not is_record(X, foo, 5) or
-						   not is_binary(X) end],
-    ?line [#foo{a=3}] = [X || X <- MyList,
-			      begin is_record(X, foo, 5) or is_reference(X) end],
-    ?line [x,[],{a,b}] = [X || X <- MyList,
-			       begin not is_record(X, foo, 5) or
-					 is_reference(X) end],
+    MyList = [#foo{a=3},x,[],{a,b}],
+    [#foo{a=3}] = [X || X <- MyList, is_record(X, foo, 5)],
+    [x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo, 5)],
+    [#foo{a=3}] = [X || X <- MyList, begin is_record(X, foo, 5) end],
+    [x,[],{a,b}] = [X || X <- MyList, begin not is_record(X, foo, 5) end],
+    [#foo{a=3},x,[],{a,b}] = [X || X <- MyList, is_record(X, foo, 5) or
+				       not is_binary(X)],
+    [#foo{a=3},x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo, 5) or
+				       not is_binary(X)],
+    [#foo{a=3}] = [X || X <- MyList, is_record(X, foo) or is_reference(X)],
+    [x,[],{a,b}] = [X || X <- MyList, not is_record(X, foo) or
+			     is_reference(X)],
+    [#foo{a=3},x,[],{a,b}] = [X || X <- MyList,
+				   begin is_record(X, foo, 5) or
+					     not is_binary(X) end],
+    [#foo{a=3},x,[],{a,b}] = [X || X <- MyList,
+				   begin not is_record(X, foo, 5) or
+					     not is_binary(X) end],
+    [#foo{a=3}] = [X || X <- MyList,
+			begin is_record(X, foo, 5) or is_reference(X) end],
+    [x,[],{a,b}] = [X || X <- MyList,
+			 begin not is_record(X, foo, 5) or
+				   is_reference(X) end],
 
     %% Update several fields with a string literal.
-    ?line #barf{} = Barf0 = id(#barf{}),
-    ?line Barf = update_barf(Barf0),
-    ?line #barf{a="abc",b=1} = id(Barf),
+    #barf{} = Barf0 = id(#barf{}),
+    Barf = update_barf(Barf0),
+    #barf{a="abc",b=1} = id(Barf),
 
     %% Non-literal arguments.
-    ?line true = is_record(id(#barf{}), id(barf), id(6)),
-    ?line false = is_record(id(#barf{}), id(barf), id(42)),
-    ?line false = is_record(id(#barf{}), id(foo), id(6)),
+    true = is_record(id(#barf{}), id(barf), id(6)),
+    false = is_record(id(#barf{}), id(barf), id(42)),
+    false = is_record(id(#barf{}), id(foo), id(6)),
 
     Rec = id(#barf{}),
     Good = id(barf),
@@ -389,15 +388,15 @@ record_test_3(Config) when is_list(Config) ->
     ok.
 
 record_access_in_guards(Config) when is_list(Config) ->
-    ?line Priv = ?config(priv_dir, Config),
-    ?line file:set_cwd(test_lib:get_data_dir(Config)),
-    ?line Opts0 = [{outdir,Priv},report_errors|test_lib:opt_opts(?MODULE)],
+    Priv = proplists:get_value(priv_dir, Config),
+    file:set_cwd(test_lib:get_data_dir(Config)),
+    Opts0 = [{outdir,Priv},report_errors|test_lib:opt_opts(?MODULE)],
     M = record_access_in_guards,
  
     Opts = [strict_record_tests|Opts0],
-    ?line io:format("Options: ~p\n", [Opts]),
-    ?line {ok,M} = c:c(M, Opts),
-    ?line ok = M:t(),
+    io:format("Options: ~p\n", [Opts]),
+    {ok,M} = c:c(M, Opts),
+    ok = M:t(),
     ok.
 
 
@@ -487,19 +486,19 @@ update_barf(R) ->
     R#barf{a="abc",b=1}.
 
 eval_once(Config) when is_list(Config) ->
-    ?line once(fun(GetRec) ->
+    once(fun(GetRec) ->
 		       true = erlang:is_record(GetRec(), foo)
 	       end, #foo{}),
-    ?line once(fun(GetRec) ->
+    once(fun(GetRec) ->
 		       (GetRec())#foo{a=1}
 	       end, #foo{}),
-    ?line once(fun(GetRec) ->
+    once(fun(GetRec) ->
 		       (GetRec())#foo{a=1,b=2}
 	       end, #foo{}),
-    ?line once(fun(GetRec) ->
+    once(fun(GetRec) ->
 		       (GetRec())#foo{a=1,b=2,c=3}
 	       end, #foo{}),
-    ?line once(fun(GetRec) ->
+    once(fun(GetRec) ->
 		       (GetRec())#foo{a=1,b=2,c=3,d=4}
 	       end, #foo{}),
     ok.
@@ -515,7 +514,7 @@ once(Test, Record) ->
 	1 -> ok;
 	N ->
 	    io:format("Evaluated ~w times\n", [N]),
-	    ?t:fail()
+	    ct:fail(more_than_once)
     end,
     Result.
 
@@ -571,21 +570,21 @@ nested_access(Config) when is_list(Config) ->
     N0 = #nrec0{},
     N1 = #nrec1{},
     N2 = #nrec2{},
-    ?line <<"nested0">> = N0#nrec0.name,
-    ?line <<"nested1">> = N1#nrec1.name,
-    ?line <<"nested2">> = N2#nrec2.name,
-    ?line <<"nested0">> = N1#nrec1.nrec0#nrec0.name,
-    ?line <<"nested0">> = N2#nrec2.nrec1#nrec1.nrec0#nrec0.name,
-    ?line <<"nested1">> = N2#nrec2.nrec1#nrec1.name,
-    ?line <<"nested0">> = ((N2#nrec2.nrec1)#nrec1.nrec0)#nrec0.name,
+    <<"nested0">> = N0#nrec0.name,
+    <<"nested1">> = N1#nrec1.name,
+    <<"nested2">> = N2#nrec2.name,
+    <<"nested0">> = N1#nrec1.nrec0#nrec0.name,
+    <<"nested0">> = N2#nrec2.nrec1#nrec1.nrec0#nrec0.name,
+    <<"nested1">> = N2#nrec2.nrec1#nrec1.name,
+    <<"nested0">> = ((N2#nrec2.nrec1)#nrec1.nrec0)#nrec0.name,
 
     N1a = N2#nrec2.nrec1#nrec1{name = <<"nested1a">>},
-    ?line <<"nested1a">> = N1a#nrec1.name,
+    <<"nested1a">> = N1a#nrec1.name,
 
     N2a = N2#nrec2.nrec1#nrec1.nrec0#nrec0{name = <<"nested0a">>},
     N2b = ((N2#nrec2.nrec1)#nrec1.nrec0)#nrec0{name = <<"nested0a">>},
-    ?line <<"nested0a">> = N2a#nrec0.name,
-    ?line N2a = N2b,
+    <<"nested0a">> = N2a#nrec0.name,
+    N2a = N2b,
     ok.
 
 -record(rr, {a,b,c}).
diff --git a/lib/compiler/test/regressions_SUITE.erl b/lib/compiler/test/regressions_SUITE.erl
index 716a9693ed..3fd4645529 100644
--- a/lib/compiler/test/regressions_SUITE.erl
+++ b/lib/compiler/test/regressions_SUITE.erl
@@ -19,28 +19,25 @@
 
 %% Test specific code snippets that has crashed the compiler in the past.
 -module(regressions_SUITE).
--include_lib("test_server/include/test_server.hrl").
-
--export([all/0, groups/0, init_per_testcase/2,end_per_testcase/2]).
+-include_lib("common_test/include/ct.hrl").
 
+-export([all/0,groups/0,init_per_testcase/2,end_per_testcase/2,suite/0]).
 -export([maps/1]).
 
 groups() -> 
     [{p,test_lib:parallel(),
       [maps]}].
 
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(2)).
-
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
+
 all() -> 
     test_lib:recompile(?MODULE),
     [{group,p}].
@@ -62,7 +59,8 @@ run(Config, Tests) ->
                 io:format("Compiling test for: ~w~n", [N]),
                 case catch run_test(Config, P) of
                     {'EXIT', Reason} -> 
-                        ?t:format("~nTest ~p failed.~nReason: ~p~n", [N, Reason]),
+                        io:format("~nTest ~p failed.~nReason: ~p~n",
+				  [N, Reason]),
                         fail();
                     _ -> ok
                 end
@@ -73,7 +71,7 @@ run(Config, Tests) ->
 run_test(Conf, Test0) ->
     Module = "regressions_"++test_lib:uniq(),
     Filename = Module ++ ".erl",
-    DataDir = ?config(priv_dir, Conf),
+    DataDir = proplists:get_value(priv_dir, Conf),
     Test = ["-module(", Module, "). ", Test0],
     File = filename:join(DataDir, Filename),
     Def = [binary,export_all,return],
@@ -94,5 +92,4 @@ run_test(Conf, Test0) ->
     ok.
 
 fail() ->
-    io:format("failed~n"),
-    ?t:fail().
+    ct:fail(failed).
diff --git a/lib/compiler/test/test_lib.erl b/lib/compiler/test/test_lib.erl
index 09ec8f3c81..3ca93fb021 100644
--- a/lib/compiler/test/test_lib.erl
+++ b/lib/compiler/test/test_lib.erl
@@ -19,7 +19,7 @@
 %%
 -module(test_lib).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -compile({no_auto_import,[binary_part/2]}).
 -export([id/1,recompile/1,parallel/0,uniq/0,opt_opts/1,get_data_dir/1,
 	 smoke_disasm/1,p_run/2,binary_part/2]).
@@ -52,7 +52,7 @@ smoke_disasm(File) when is_list(File) ->
 %% be slower than running them sequentially.
 
 parallel() ->
-    case ?t:is_cover() orelse erlang:system_info(schedulers) =:= 1 of
+    case test_server:is_cover() orelse erlang:system_info(schedulers) =:= 1 of
 	true -> [];
 	false -> [parallel]
     end.
@@ -66,7 +66,7 @@ uniq() ->
 
 opt_opts(Mod) ->
     Comp = Mod:module_info(compile),
-    {value,{options,Opts}} = lists:keysearch(options, 1, Comp),
+    {options,Opts} = lists:keyfind(options, 1, Comp),
     lists:filter(fun(no_copt) -> true;
 		    (no_postopt) -> true;
 		    (no_float_opt) -> true;
@@ -85,7 +85,7 @@ opt_opts(Mod) ->
 %% This function retrieves the path to the original data directory.
 
 get_data_dir(Config) ->
-    Data0 = ?config(data_dir, Config),
+    Data0 = proplists:get_value(data_dir, Config),
     Opts = [{return,list}],
     Data1 = re:replace(Data0, "_no_opt_SUITE", "_SUITE", Opts),
     Data = re:replace(Data1, "_post_opt_SUITE", "_SUITE", Opts),
@@ -96,7 +96,7 @@ get_data_dir(Config) ->
 
 p_run(Test, List) ->
     S = erlang:system_info(schedulers),
-    N = case ?t:is_cover() of
+    N = case test_server:is_cover() of
 	    false ->
 		S + 1;
 	    true ->
@@ -118,7 +118,8 @@ p_run_loop(_, [], _, [], Errors, Ws) ->
 		1 -> {comment,"1 warning"};
 		N -> {comment,integer_to_list(N)++" warnings"}
 	    end;
-	N -> ?t:fail({N,errors})
+	N ->
+	    ct:fail({N,errors})
     end;
 p_run_loop(Test, [H|T], N, Refs, Errors, Ws) when length(Refs) < N ->
     {_,Ref} = erlang:spawn_monitor(fun() -> exit(Test(H)) end),
diff --git a/lib/compiler/test/trycatch_SUITE.erl b/lib/compiler/test/trycatch_SUITE.erl
index adcab8ef67..82e3c86649 100644
--- a/lib/compiler/test/trycatch_SUITE.erl
+++ b/lib/compiler/test/trycatch_SUITE.erl
@@ -28,7 +28,7 @@
 	 plain_catch_coverage/1,andalso_orelse/1,get_in_try/1,
 	 hockey/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -60,32 +60,32 @@ end_per_group(_GroupName, Config) ->
 
 
 basic(Conf) when is_list(Conf) ->
-    ?line 2 = 
+    2 =
 	try my_div(4, 2)
 	catch 
             Class:Reason -> {Class,Reason}
 	end,
-    ?line error = 
+    error =
         try my_div(1, 0)
         catch 
             error:badarith -> error
         end,
-    ?line error = 
+    error =
         try 1.0 / zero()
         catch 
             error:badarith -> error
         end,
-    ?line ok = 
+    ok =
         try my_add(53, atom)
         catch
             error:badarith -> ok
         end,
-    ?line exit_nisse = 
+    exit_nisse =
         try exit(nisse)
 	catch 
             exit:nisse -> exit_nisse
         end,
-    ?line ok = 
+    ok =
         try throw(kalle)
         catch
             kalle -> ok
@@ -94,27 +94,27 @@ basic(Conf) when is_list(Conf) ->
     %% Try some stuff where the compiler will optimize away the try.
 
     V = id({a,variable}),
-    ?line V = try V catch nisse -> error end,
-    ?line 42 = try 42 catch nisse -> error end,
-    ?line [V] = try [V] catch nisse -> error end,
-    ?line {ok,V} = try {ok,V} catch nisse -> error end,
+    V = try V catch nisse -> error end,
+    42 = try 42 catch nisse -> error end,
+    [V] = try [V] catch nisse -> error end,
+    {ok,V} = try {ok,V} catch nisse -> error end,
 
     %% Same idea, but use an after too.
 
-    ?line V = try V catch nisse -> error after after_call() end,
-    ?line after_clean(),
-    ?line 42 = try 42 after after_call() end,
-    ?line after_clean(),
-    ?line [V] = try [V] catch nisse -> error after after_call() end,
-    ?line after_clean(),
-    ?line {ok,V} = try {ok,V} after after_call() end,
+    V = try V catch nisse -> error after after_call() end,
+    after_clean(),
+    42 = try 42 after after_call() end,
+    after_clean(),
+    [V] = try [V] catch nisse -> error after after_call() end,
+    after_clean(),
+    {ok,V} = try {ok,V} after after_call() end,
 
     %% Try/of
-    ?line ok = try V of
-              {a,variable} -> ok
-              catch nisse -> erro
-          end,
-              
+    ok = try V of
+	     {a,variable} -> ok
+	 catch nisse -> erro
+	 end,
+
     ok.
 
 after_call() ->
@@ -125,24 +125,24 @@ after_clean() ->
     
 
 lean_throw(Conf) when is_list(Conf) ->
-    ?line {throw,kalle} =
+    {throw,kalle} =
         try throw(kalle)
         catch
             Kalle -> {throw,Kalle}
         end,
-    ?line {exit,kalle} =
+    {exit,kalle} =
         try exit(kalle)
         catch
             Throw1 -> {throw,Throw1};
 	    exit:Reason1 -> {exit,Reason1}
         end,
-    ?line {exit,kalle} =
+    {exit,kalle} =
         try exit(kalle)
         catch
 	    exit:Reason2 -> {exit,Reason2};
             Throw2 -> {throw,Throw2}
         end,
-    ?line {exit,kalle} =
+    {exit,kalle} =
         try try exit(kalle)
             catch
                 Throw3 -> {throw,Throw3}
@@ -155,25 +155,25 @@ lean_throw(Conf) when is_list(Conf) ->
 
 
 try_of(Conf) when is_list(Conf) ->
-    ?line {ok,{some,content}} = 
+    {ok,{some,content}} =
 	try_of_1({value,{good,{some,content}}}),
-    ?line {error,[other,content]} = 
+    {error,[other,content]} =
 	try_of_1({value,{bad,[other,content]}}),
-    ?line {caught,{exit,{ex,it,[reason]}}} = 
+    {caught,{exit,{ex,it,[reason]}}} =
 	try_of_1({exit,{ex,it,[reason]}}),
-    ?line {caught,{throw,[term,{in,a,{tuple}}]}} = 
+    {caught,{throw,[term,{in,a,{tuple}}]}} =
 	try_of_1({throw,[term,{in,a,{tuple}}]}),
-    ?line {caught,{error,[bad,arg]}} = 
+    {caught,{error,[bad,arg]}} =
 	try_of_1({error,[bad,arg]}),
-    ?line {caught,{error,badarith}} = 
+    {caught,{error,badarith}} =
 	try_of_1({'div',{1,0}}),
-    ?line {caught,{error,badarith}} = 
+    {caught,{error,badarith}} =
 	try_of_1({'add',{a,0}}),
-    ?line {caught,{error,badarg}} = 
+    {caught,{error,badarg}} =
 	try_of_1({'abs',x}),
-    ?line {caught,{error,function_clause}} = 
+    {caught,{error,function_clause}} =
 	try_of_1(illegal),
-    ?line {error,{try_clause,{some,other_garbage}}} =
+    {error,{try_clause,{some,other_garbage}}} =
 	try try_of_1({value,{some,other_garbage}})
         catch error:Reason -> {error,Reason}
         end,
@@ -191,29 +191,29 @@ try_of_1(X) ->
 
 
 try_after(Conf) when is_list(Conf) ->
-    ?line {{ok,[some,value],undefined},finalized} = 
+    {{ok,[some,value],undefined},finalized} =
 	try_after_1({value,{ok,[some,value]}},finalized),
-    ?line {{error,badarith,undefined},finalized} = 
+    {{error,badarith,undefined},finalized} =
 	try_after_1({'div',{1,0}},finalized),
-    ?line {{error,badarith,undefined},finalized} = 
+    {{error,badarith,undefined},finalized} =
 	try_after_1({'add',{1,a}},finalized),
-    ?line {{error,badarg,undefined},finalized} = 
+    {{error,badarg,undefined},finalized} =
 	try_after_1({'abs',a},finalized),
-    ?line {{error,[the,{reason}],undefined},finalized} = 
+    {{error,[the,{reason}],undefined},finalized} =
 	try_after_1({error,[the,{reason}]},finalized),
-    ?line {{throw,{thrown,[reason]},undefined},finalized} = 
+    {{throw,{thrown,[reason]},undefined},finalized} =
 	try_after_1({throw,{thrown,[reason]}},finalized),
-    ?line {{exit,{exited,{reason}},undefined},finalized} = 
+    {{exit,{exited,{reason}},undefined},finalized} =
 	try_after_1({exit,{exited,{reason}}},finalized),
-    ?line {{error,function_clause,undefined},finalized} = 
+    {{error,function_clause,undefined},finalized} =
 	try_after_1(function_clause,finalized),
-    ?line ok =
+    ok =
 	try try_after_1({'add',{1,1}}, finalized)
         catch
             error:{try_clause,2} -> ok
 	end,
-    ?line finalized = erase(try_after),
-    ?line ok =
+    finalized = erase(try_after),
+    ok =
         try try foo({exit,[reaso,{n}]})
             after put(try_after, finalized)
             end
@@ -242,7 +242,7 @@ try_after_1(X, Y) ->
 
 after_bind(Conf) when is_list(Conf) ->
     V = [make_ref(),self()|value],
-    ?line {value,{value,V}} =
+    {value,{value,V}} =
 	after_bind_1({value,V}, V, {value,V}),
     ok.
 
@@ -269,12 +269,12 @@ after_bind_1(X, V, Y) ->
 
 catch_oops(Conf) when is_list(Conf) ->
     V = {v,[a,l|u],{e},self()},
-    ?line {value,V} = catch_oops_1({value,V}),
-    ?line {value,1} = catch_oops_1({'div',{1,1}}),
-    ?line {error,badarith} = catch_oops_1({'div',{1,0}}),
-    ?line {error,function_clause} = catch_oops_1(function_clause),
-    ?line {throw,V} = catch_oops_1({throw,V}),
-    ?line {exit,V} = catch_oops_1({exit,V}),
+    {value,V} = catch_oops_1({value,V}),
+    {value,1} = catch_oops_1({'div',{1,1}}),
+    {error,badarith} = catch_oops_1({'div',{1,0}}),
+    {error,function_clause} = catch_oops_1(function_clause),
+    {throw,V} = catch_oops_1({throw,V}),
+    {exit,V} = catch_oops_1({exit,V}),
     ok.
 
 catch_oops_1(X) ->
@@ -293,10 +293,10 @@ catch_oops_1(X) ->
 
 after_oops(Conf) when is_list(Conf) ->
     V = {self(),make_ref()},
-    ?line {{value,V},V} = after_oops_1({value,V}, {value,V}),
-    ?line {{exit,V},V} = after_oops_1({exit,V}, {value,V}),
-    ?line {{error,V},undefined} = after_oops_1({value,V}, {error,V}),
-    ?line {{error,function_clause},undefined} = 
+    {{value,V},V} = after_oops_1({value,V}, {value,V}),
+    {{exit,V},V} = after_oops_1({exit,V}, {value,V}),
+    {{error,V},undefined} = after_oops_1({value,V}, {error,V}),
+    {{error,function_clause},undefined} =
 	after_oops_1({exit,V}, function_clause),
     ok.
 
@@ -317,39 +317,39 @@ after_oops_1(X, Y) ->
 
 eclectic(Conf) when is_list(Conf) ->
     V = {make_ref(),3.1415926535,[[]|{}]},
-    ?line {{value,{value,V},V},V} = 
+    {{value,{value,V},V},V} =
 	eclectic_1({foo,{value,{value,V}}}, undefined, {value,V}),
-    ?line {{'EXIT',{V,[{?MODULE,foo,1,_}|_]}},V} =
+    {{'EXIT',{V,[{?MODULE,foo,1,_}|_]}},V} =
 	eclectic_1({catch_foo,{error,V}}, undefined, {value,V}),
-    ?line {{error,{exit,V},{'EXIT',V}},V} =
+    {{error,{exit,V},{'EXIT',V}},V} =
 	eclectic_1({foo,{error,{exit,V}}}, error, {value,V}),
-    ?line {{value,{value,V},V},
+    {{value,{value,V},V},
 	   {'EXIT',{badarith,[{?MODULE,my_add,2,_}|_]}}} =
 	eclectic_1({foo,{value,{value,V}}}, undefined, {'add',{0,a}}),
-    ?line {{'EXIT',V},V} =
+    {{'EXIT',V},V} =
 	eclectic_1({catch_foo,{exit,V}}, undefined, {throw,V}),
-    ?line {{error,{'div',{1,0}},{'EXIT',{badarith,[{?MODULE,my_div,2,_}|_]}}},
+    {{error,{'div',{1,0}},{'EXIT',{badarith,[{?MODULE,my_div,2,_}|_]}}},
 	   {'EXIT',V}} =
 	eclectic_1({foo,{error,{'div',{1,0}}}}, error, {exit,V}),
-    ?line {{{error,V},{'EXIT',{V,[{?MODULE,foo,1,_}|_]}}},
+    {{{error,V},{'EXIT',{V,[{?MODULE,foo,1,_}|_]}}},
 	   {'EXIT',V}} =
 	eclectic_1({catch_foo,{throw,{error,V}}}, undefined, {exit,V}),
     %%
-    ?line {{value,{value,{value,V},V}},V} =
+    {{value,{value,{value,V},V}},V} =
 	eclectic_2({value,{value,V}}, undefined, {value,V}),
-    ?line {{value,{throw,{value,V},V}},V} =
+    {{value,{throw,{value,V},V}},V} =
 	eclectic_2({throw,{value,V}}, throw, {value,V}),
-    ?line {{caught,{'EXIT',V}},undefined} =
+    {{caught,{'EXIT',V}},undefined} =
 	eclectic_2({value,{value,V}}, undefined, {exit,V}),
-    ?line {{caught,{'EXIT',{V,[{?MODULE,foo,1,_}|_]}}},undefined} =
+    {{caught,{'EXIT',{V,[{?MODULE,foo,1,_}|_]}}},undefined} =
 	eclectic_2({error,{value,V}}, throw, {error,V}),
-    ?line {{caught,{'EXIT',{badarg,[{erlang,abs,[V],_}|_]}}},V} =
+    {{caught,{'EXIT',{badarg,[{erlang,abs,[V],_}|_]}}},V} =
 	eclectic_2({value,{'abs',V}}, undefined, {value,V}),
-    ?line {{caught,{'EXIT',{badarith,[{?MODULE,my_add,2,_}|_]}}},V} =
+    {{caught,{'EXIT',{badarith,[{?MODULE,my_add,2,_}|_]}}},V} =
 	eclectic_2({exit,{'add',{0,a}}}, exit, {value,V}),
-    ?line {{caught,{'EXIT',V}},undefined} =
+    {{caught,{'EXIT',V}},undefined} =
 	eclectic_2({value,{error,V}}, undefined, {exit,V}),
-    ?line {{caught,{'EXIT',{V,[{?MODULE,foo,1,_}|_]}}},undefined} =
+    {{caught,{'EXIT',{V,[{?MODULE,foo,1,_}|_]}}},undefined} =
 	eclectic_2({throw,{'div',{1,0}}}, throw, {error,V}),
     ok.
 
@@ -377,44 +377,44 @@ eclectic_2(X, C, Y) ->
     Catch =
 	case 
             catch
-            {Done,
-             try foo(X) of
-                 V -> {value,V,foo(V)}
-             catch
-                 C:D -> {C,D,foo(D)}
-             after
-                 put(eclectic, foo(Y))
-             end} of
-            {Done,Z} -> {value,Z};
-            Z -> {caught,Z}
-        end,
+		{Done,
+		 try foo(X) of
+		     V -> {value,V,foo(V)}
+		 catch
+		     C:D -> {C,D,foo(D)}
+		 after
+		     put(eclectic, foo(Y))
+		 end} of
+		{Done,Z} -> {value,Z};
+		Z -> {caught,Z}
+	    end,
     {Catch,erase(eclectic)}.
 
 
 
 rethrow(Conf) when is_list(Conf) ->
     V = {a,[b,{c,self()},make_ref]},
-    ?line {value2,value1} = 
+    {value2,value1} =
 	rethrow_1({value,V}, V),
-    ?line {caught2,{error,V}} = 
+    {caught2,{error,V}} =
 	rethrow_2({error,V}, undefined),
-    ?line {caught2,{exit,V}} = 
+    {caught2,{exit,V}} =
 	rethrow_1({exit,V}, error),
-    ?line {caught2,{throw,V}} = 
+    {caught2,{throw,V}} =
 	rethrow_1({throw,V}, undefined),
-    ?line {caught2,{throw,V}} = 
+    {caught2,{throw,V}} =
 	rethrow_2({throw,V}, undefined),
-    ?line {caught2,{error,badarith}} = 
+    {caught2,{error,badarith}} =
 	rethrow_1({'add',{0,a}}, throw),
-    ?line {caught2,{error,function_clause}} = 
+    {caught2,{error,function_clause}} =
 	rethrow_2(function_clause, undefined),
-    ?line {caught2,{error,{try_clause,V}}} = 
+    {caught2,{error,{try_clause,V}}} =
 	rethrow_1({value,V}, exit),
-    ?line {value2,{caught1,V}} = 
+    {value2,{caught1,V}} =
 	rethrow_1({error,V}, error),
-    ?line {value2,{caught1,V}} = 
+    {value2,{caught1,V}} =
 	rethrow_1({exit,V}, exit),
-    ?line {value2,caught1} = 
+    {value2,caught1} =
 	rethrow_2({throw,V}, V),
     ok.
 
@@ -444,91 +444,91 @@ rethrow_2(X, C1) ->
 
 nested_of(Conf) when is_list(Conf) ->
     V = {[self()|make_ref()],1.4142136},
-    ?line {{value,{value1,{V,x2}}},
-	   {V,x3},
-	   {V,x4},
-	   finalized} =
+    {{value,{value1,{V,x2}}},
+     {V,x3},
+     {V,x4},
+     finalized} =
 	nested_of_1({{value,{V,x1}},void,{V,x1}},
 		    {value,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{throw,{V,x2}}},
-	   {V,x3},
-	   {V,x4},
-	   finalized} =
+    {{caught,{throw,{V,x2}}},
+     {V,x3},
+     {V,x4},
+     finalized} =
 	nested_of_1({{value,{V,x1}},void,{V,x1}},
 		    {throw,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{error,badarith}},
-	   undefined,
-	   {V,x4},
-	   finalized} =
+    {{caught,{error,badarith}},
+     undefined,
+     {V,x4},
+     finalized} =
 	nested_of_1({{value,{V,x1}},void,{V,x1}},
 		    {throw,{V,x2}}, {'div',{1,0}}, {value,{V,x4}}),
-    ?line {{caught,{error,badarith}},
-	   undefined,
-	   undefined,
-	   finalized} =
+    {{caught,{error,badarith}},
+     undefined,
+     undefined,
+     finalized} =
 	nested_of_1({{value,{V,x1}},void,{V,x1}},
 		    {throw,{V,x2}}, {'div',{1,0}}, {'add',{0,b}}),
     %%
-    ?line {{caught,{error,{try_clause,{V,x1}}}},
-	   {V,x3},
-	   {V,x4},
-	   finalized} =
+    {{caught,{error,{try_clause,{V,x1}}}},
+     {V,x3},
+     {V,x4},
+     finalized} =
 	nested_of_1({{value,{V,x1}},void,try_clause},
 		    void, {value,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{exit,{V,x3}}},
-	   undefined,
-	   {V,x4},
-	   finalized} =
+    {{caught,{exit,{V,x3}}},
+     undefined,
+     {V,x4},
+     finalized} =
 	nested_of_1({{value,{V,x1}},void,try_clause},
 		    void, {exit,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{throw,{V,x4}}},
-	   undefined,
-	   undefined,
-	   finalized} =
+    {{caught,{throw,{V,x4}}},
+     undefined,
+     undefined,
+     finalized} =
 	nested_of_1({{value,{V,x1}},void,try_clause},
 		    void, {exit,{V,x3}}, {throw,{V,x4}}),
     %%
-    ?line {{value,{caught1,{V,x2}}},
-	   {V,x3},
-	   {V,x4},
-	   finalized} =
+    {{value,{caught1,{V,x2}}},
+     {V,x3},
+     {V,x4},
+     finalized} =
 	nested_of_1({{error,{V,x1}},error,{V,x1}},
 		    {value,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{error,badarith}},
-	   {V,x3},
-	   {V,x4},
-	   finalized} =
+    {{caught,{error,badarith}},
+     {V,x3},
+     {V,x4},
+     finalized} =
 	nested_of_1({{error,{V,x1}},error,{V,x1}},
 		    {'add',{1,c}}, {value,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{error,badarith}},
-	   undefined,
-	   {V,x4},
-	   finalized} =
+    {{caught,{error,badarith}},
+     undefined,
+     {V,x4},
+     finalized} =
 	nested_of_1({{error,{V,x1}},error,{V,x1}},
 		    {'add',{1,c}}, {'div',{17,0}}, {value,{V,x4}}),
-    ?line {{caught,{error,badarg}},
-	   undefined,
-	   undefined,
-	   finalized} =
+    {{caught,{error,badarg}},
+     undefined,
+     undefined,
+     finalized} =
 	nested_of_1({{error,{V,x1}},error,{V,x1}},
 		    {'add',{1,c}}, {'div',{17,0}}, {'abs',V}),
     %%
-    ?line {{caught,{error,badarith}},
-	   {V,x3},
-	   {V,x4},
-	   finalized} =
+    {{caught,{error,badarith}},
+     {V,x3},
+     {V,x4},
+     finalized} =
 	nested_of_1({{'add',{2,c}},rethrow,void},
 		    void, {value,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{error,badarg}},
-	   undefined,
-	   {V,x4},
-	   finalized} =
+    {{caught,{error,badarg}},
+     undefined,
+     {V,x4},
+     finalized} =
 	nested_of_1({{'add',{2,c}},rethrow,void},
 		    void, {'abs',V}, {value,{V,x4}}),
-    ?line {{caught,{error,function_clause}},
-	   undefined,
-	   undefined,
-	   finalized} =
+    {{caught,{error,function_clause}},
+     undefined,
+     undefined,
+     finalized} =
 	nested_of_1({{'add',{2,c}},rethrow,void},
 		    void, {'abs',V}, function_clause),
     ok.
@@ -569,93 +569,93 @@ nested_of_1({X1,C1,V1},
 
 nested_catch(Conf) when is_list(Conf) ->
     V = {[make_ref(),1.4142136,self()]},
-    ?line {{value,{value1,{V,x2}}},
-	   {V,x3},
-	   {V,x4},
-	   finalized} =
+    {{value,{value1,{V,x2}}},
+     {V,x3},
+     {V,x4},
+     finalized} =
 	nested_catch_1({{value,{V,x1}},void,{V,x1}},
-		    {value,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{throw,{V,x2}}},
-	   {V,x3},
-	   {V,x4},
-	   finalized} =
+		       {value,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
+    {{caught,{throw,{V,x2}}},
+     {V,x3},
+     {V,x4},
+     finalized} =
 	nested_catch_1({{value,{V,x1}},void,{V,x1}},
-		    {throw,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{error,badarith}},
-	   undefined,
-	   {V,x4},
-	   finalized} =
+		       {throw,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
+    {{caught,{error,badarith}},
+     undefined,
+     {V,x4},
+     finalized} =
 	nested_catch_1({{value,{V,x1}},void,{V,x1}},
-		    {throw,{V,x2}}, {'div',{1,0}}, {value,{V,x4}}),
-    ?line {{caught,{error,badarith}},
-	   undefined,
-	   undefined,
-	   finalized} =
+		       {throw,{V,x2}}, {'div',{1,0}}, {value,{V,x4}}),
+    {{caught,{error,badarith}},
+     undefined,
+     undefined,
+     finalized} =
 	nested_catch_1({{value,{V,x1}},void,{V,x1}},
-		    {throw,{V,x2}}, {'div',{1,0}}, {'add',{0,b}}),
+		       {throw,{V,x2}}, {'div',{1,0}}, {'add',{0,b}}),
     %%
-    ?line {{caught,{error,{try_clause,{V,x1}}}},
-	   {V,x3},
-	   {V,x4},
-	   finalized} =
+    {{caught,{error,{try_clause,{V,x1}}}},
+     {V,x3},
+     {V,x4},
+     finalized} =
 	nested_catch_1({{value,{V,x1}},void,try_clause},
-		    void, {value,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{exit,{V,x3}}},
-	   undefined,
-	   {V,x4},
-	   finalized} =
+		       void, {value,{V,x3}}, {value,{V,x4}}),
+    {{caught,{exit,{V,x3}}},
+     undefined,
+     {V,x4},
+     finalized} =
 	nested_catch_1({{value,{V,x1}},void,try_clause},
-		    void, {exit,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{throw,{V,x4}}},
-	   undefined,
-	   undefined,
-	   finalized} =
+		       void, {exit,{V,x3}}, {value,{V,x4}}),
+    {{caught,{throw,{V,x4}}},
+     undefined,
+     undefined,
+     finalized} =
 	nested_catch_1({{value,{V,x1}},void,try_clause},
-		    void, {exit,{V,x3}}, {throw,{V,x4}}),
+		       void, {exit,{V,x3}}, {throw,{V,x4}}),
     %%
-    ?line {{value,{caught1,{V,x2}}},
-	   {V,x3},
-	   {V,x4},
-	   finalized} =
+    {{value,{caught1,{V,x2}}},
+     {V,x3},
+     {V,x4},
+     finalized} =
 	nested_catch_1({{error,{V,x1}},error,{V,x1}},
-		    {value,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{error,badarith}},
-	   {V,x3},
-	   {V,x4},
-	   finalized} =
+		       {value,{V,x2}}, {value,{V,x3}}, {value,{V,x4}}),
+    {{caught,{error,badarith}},
+     {V,x3},
+     {V,x4},
+     finalized} =
 	nested_catch_1({{error,{V,x1}},error,{V,x1}},
-		    {'add',{1,c}}, {value,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{error,badarith}},
-	   undefined,
-	   {V,x4},
-	   finalized} =
+		       {'add',{1,c}}, {value,{V,x3}}, {value,{V,x4}}),
+    {{caught,{error,badarith}},
+     undefined,
+     {V,x4},
+     finalized} =
 	nested_catch_1({{error,{V,x1}},error,{V,x1}},
-		    {'add',{1,c}}, {'div',{17,0}}, {value,{V,x4}}),
-    ?line {{caught,{error,badarg}},
-	   undefined,
-	   undefined,
-	   finalized} =
+		       {'add',{1,c}}, {'div',{17,0}}, {value,{V,x4}}),
+    {{caught,{error,badarg}},
+     undefined,
+     undefined,
+     finalized} =
 	nested_catch_1({{error,{V,x1}},error,{V,x1}},
-		    {'add',{1,c}}, {'div',{17,0}}, {'abs',V}),
+		       {'add',{1,c}}, {'div',{17,0}}, {'abs',V}),
     %%
-    ?line {{caught,{error,badarith}},
-	   {V,x3},
-	   {V,x4},
-	   finalized} =
+    {{caught,{error,badarith}},
+     {V,x3},
+     {V,x4},
+     finalized} =
 	nested_catch_1({{'add',{2,c}},rethrow,void},
-		    void, {value,{V,x3}}, {value,{V,x4}}),
-    ?line {{caught,{error,badarg}},
-	   undefined,
-	   {V,x4},
-	   finalized} =
+		       void, {value,{V,x3}}, {value,{V,x4}}),
+    {{caught,{error,badarg}},
+     undefined,
+     {V,x4},
+     finalized} =
 	nested_catch_1({{'add',{2,c}},rethrow,void},
-		    void, {'abs',V}, {value,{V,x4}}),
-    ?line {{caught,{error,function_clause}},
-	   undefined,
-	   undefined,
-	   finalized} =
+		       void, {'abs',V}, {value,{V,x4}}),
+    {{caught,{error,function_clause}},
+     undefined,
+     undefined,
+     finalized} =
 	nested_catch_1({{'add',{2,c}},rethrow,void},
-		    void, {'abs',V}, function_clause),
+		       void, {'abs',V}, function_clause),
     ok.
 
 nested_catch_1({X1,C1,V1},
@@ -694,64 +694,64 @@ nested_catch_1({X1,C1,V1},
 
 nested_after(Conf) when is_list(Conf) ->
     V = [{make_ref(),1.4142136,self()}],
-    ?line {value,
+    {value,
 	   {V,x3},
 	   {value1,{V,x2}},
 	   finalized} =
 	nested_after_1({{value,{V,x1}},void,{V,x1}},
 		       {value,{V,x2}}, {value,{V,x3}}),
-    ?line {{caught,{error,{V,x2}}},
+    {{caught,{error,{V,x2}}},
 	   {V,x3},
 	   undefined,
 	   finalized} =
 	nested_after_1({{value,{V,x1}},void,{V,x1}},
 		       {error,{V,x2}}, {value,{V,x3}}),
-    ?line {{caught,{exit,{V,x3}}},
+    {{caught,{exit,{V,x3}}},
 	   undefined,
 	   undefined,
 	   finalized} =
 	nested_after_1({{value,{V,x1}},void,{V,x1}},
 		       {error,{V,x2}}, {exit,{V,x3}}),
     %%
-    ?line {{caught,{error,{try_clause,{V,x1}}}},
+    {{caught,{error,{try_clause,{V,x1}}}},
 	   {V,x3},
 	   undefined,
 	   finalized} =
 	nested_after_1({{value,{V,x1}},void,try_clause},
 		       void, {value,{V,x3}}),
-    ?line {{caught,{error,badarith}},
+    {{caught,{error,badarith}},
 	   undefined,
 	   undefined,
 	   finalized} =
 	nested_after_1({{value,{V,x1}},void,try_clause},
 		       void, {'div',{17,0}}),
     %%
-    ?line {value,
+    {value,
 	   {V,x3},
 	   {caught1,{V,x2}},
 	   finalized} =
 	nested_after_1({{throw,{V,x1}},throw,{V,x1}},
 		       {value,{V,x2}}, {value,{V,x3}}),
-    ?line {{caught,{error,badarith}},
+    {{caught,{error,badarith}},
 	   {V,x3},
 	   undefined,
 	   finalized} =
 	nested_after_1({{throw,{V,x1}},throw,{V,x1}},
 		       {'add',{a,b}}, {value,{V,x3}}),
-    ?line {{caught,{error,badarg}},
+    {{caught,{error,badarg}},
 	   undefined,
 	   undefined,
 	   finalized} =
 	nested_after_1({{throw,{V,x1}},throw,{V,x1}},
 		       {'add',{a,b}}, {'abs',V}),
     %%
-    ?line {{caught,{throw,{V,x1}}},
+    {{caught,{throw,{V,x1}}},
 	   {V,x3},
 	   undefined,
 	   finalized} =
 	nested_after_1({{throw,{V,x1}},rethrow,void},
 		       void, {value,{V,x3}}),
-    ?line {{caught,{error,badarith}},
+    {{caught,{error,badarith}},
 	   undefined,
 	   undefined,
 	   finalized} =
@@ -843,12 +843,12 @@ my_abs(X) -> abs(X).
 
 
 last_call_optimization(Config) when is_list(Config) ->
-    ?line error = in_tail(dum),
-    ?line StkSize0 = in_tail(0),
-    ?line StkSize = in_tail(50000),
+    error = in_tail(dum),
+    StkSize0 = in_tail(0),
+    StkSize = in_tail(50000),
     io:format("StkSize0 = ~p", [StkSize0]),
     io:format("StkSize  = ~p", [StkSize]),
-    ?line StkSize = StkSize0,
+    StkSize = StkSize0,
     ok.
 
 in_tail(E) ->
@@ -891,20 +891,20 @@ do_bool(A0, B) ->
 
 plain_catch_coverage(Config) when is_list(Config) ->
     %% Cover some code in beam_block:alloc_may_pass/1.
-    ?line {a,[42]} = do_plain_catch_list(42).
+    {a,[42]} = do_plain_catch_list(42).
 
 do_plain_catch_list(X) ->
     B = [X],
     catch id({a,B}).
 
 andalso_orelse(Config) when is_list(Config) ->
-    ?line {2,{a,42}} = andalso_orelse_1(true, {a,42}),
-    ?line {b,{b}} = andalso_orelse_1(false, {b}),
-    ?line {catched,no_tuple} = andalso_orelse_1(false, no_tuple),
+    {2,{a,42}} = andalso_orelse_1(true, {a,42}),
+    {b,{b}} = andalso_orelse_1(false, {b}),
+    {catched,no_tuple} = andalso_orelse_1(false, no_tuple),
 
-    ?line ok = andalso_orelse_2({type,[a]}),
-    ?line also_ok = andalso_orelse_2({type,[]}),
-    ?line also_ok = andalso_orelse_2({type,{a}}),
+    ok = andalso_orelse_2({type,[a]}),
+    also_ok = andalso_orelse_2({type,[]}),
+    also_ok = andalso_orelse_2({type,{a}}),
     ok.
 
 andalso_orelse_1(A, B) ->
diff --git a/lib/compiler/test/warnings_SUITE.erl b/lib/compiler/test/warnings_SUITE.erl
index a964afe5a1..d66f2d5053 100644
--- a/lib/compiler/test/warnings_SUITE.erl
+++ b/lib/compiler/test/warnings_SUITE.erl
@@ -27,9 +27,9 @@
 -define(privdir, "warnings_SUITE_priv").
 -define(t, test_server).
 -else.
--include_lib("test_server/include/test_server.hrl").
--define(datadir, ?config(data_dir, Conf)).
--define(privdir, ?config(priv_dir, Conf)).
+-include_lib("common_test/include/ct.hrl").
+-define(datadir, proplists:get_value(data_dir, Conf)).
+-define(privdir, proplists:get_value(priv_dir, Conf)).
 -endif.
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -41,21 +41,18 @@
          files/1,effect/1,bin_opt_info/1,bin_construction/1,
 	 comprehensions/1,maps/1,maps_bin_opt_info/1,
          redundant_boolean_clauses/1,
-	 latin1_fallback/1,underscore/1,no_warnings/1]).
-
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(2)).
+	 latin1_fallback/1,underscore/1,no_warnings/1,
+	 bit_syntax/1]).
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     test_lib:recompile(?MODULE),
@@ -68,7 +65,7 @@ groups() ->
        bin_opt_info,bin_construction,comprehensions,maps,
        maps_bin_opt_info,
        redundant_boolean_clauses,latin1_fallback,
-       underscore,no_warnings]}].
+       underscore,no_warnings,bit_syntax]}].
 
 init_per_suite(Config) ->
     Config.
@@ -103,7 +100,7 @@ pattern(Config) when is_list(Config) ->
 	    [{2,v3_core,nomatch},
 	     {6,v3_core,nomatch},
 	     {11,v3_core,nomatch} ] }}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
 pattern2(Config) when is_list(Config) ->
@@ -127,7 +124,7 @@ pattern2(Config) when is_list(Config) ->
 		      {4,sys_core_fold,no_clause_match},
 		      {5,sys_core_fold,nomatch_clause_type},
 		      {6,sys_core_fold,nomatch_clause_type}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
 
     %% Disable Core Erlang optimizations. v3_kernel should produce
     %% a warning for the clause that didn't match.
@@ -136,7 +133,7 @@ pattern2(Config) when is_list(Config) ->
 	    [nowarn_unused_vars,no_copt],
 	    {warnings,
 	     [{2,v3_kernel,{nomatch_shadow,1}}]}}],
-    ?line [] = run(Config, Ts2),
+    [] = run(Config, Ts2),
     ok.
 
 pattern3(Config) when is_list(Config) ->
@@ -152,7 +149,7 @@ pattern3(Config) when is_list(Config) ->
 	   [nowarn_unused_vars],
 	   {warnings,
 	    [{4,v3_kernel,{nomatch_shadow,2}}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
 
     ok.
 
@@ -213,7 +210,7 @@ pattern4(Config) when is_list(Config) ->
 	     {23,sys_core_fold,no_clause_match},
 	     {33,sys_core_fold,no_clause_match}
 	    ]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
 
     ok.
 
@@ -256,7 +253,7 @@ guard(Config) when is_list(Config) ->
 	     {11,sys_core_fold,nomatch_guard},
 	     {11,sys_core_fold,{eval_failure,badarg}}
 	    ]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
 
     ok.
 
@@ -321,7 +318,7 @@ bool_cases(Config) when is_list(Config) ->
 	    [{6,sys_core_fold,nomatch_shadow},
 	     {13,sys_core_fold,nomatch_shadow},
 	     {18,sys_core_fold,nomatch_clause_type} ]} }],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
 bad_apply(Config) when is_list(Config) ->
@@ -340,11 +337,11 @@ bad_apply(Config) when is_list(Config) ->
 	     {4,v3_kernel,bad_call},
 	     {5,v3_kernel,bad_call},
 	     {6,v3_kernel,bad_call}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
 
     %% Also verify that the generated code generates the correct error.
-    ?line try erlang:42() of
-	      _ -> ?line ?t:fail()
+    try erlang:42() of
+	      _ -> ct:fail(should_fail)
 	  catch
 	      error:badarg -> ok
 	  end,
@@ -368,7 +365,7 @@ files(Config) when is_list(Config) ->
             [{"file1",[{17,sys_core_fold,{eval_failure,badarith}}]},
              {"file2",[{10,sys_core_fold,{eval_failure,badarith}}]}]}}],
 
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
 %% Test warnings for term construction and BIF calls in effect context.
@@ -514,7 +511,7 @@ effect(Config) when is_list(Config) ->
 		      {28,sys_core_fold,useless_building},
 		      {36,sys_core_fold,{no_effect,{erlang,'=:=',2}}},
 		      {38,sys_core_fold,{no_effect,{erlang,get_cookie,0}}}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
 bin_opt_info(Config) when is_list(Config) ->
@@ -537,14 +534,14 @@ bin_opt_info(Config) when is_list(Config) ->
 	      {5,beam_bsm,{no_bin_opt,{{t1,1},no_suitable_bs_start_match}}},
 	      {9,beam_bsm,{no_bin_opt,
 			   {binary_used_in,{extfunc,erlang,split_binary,2}}}} ]}}],
-    ?line [] = run(Config, Ts1),
+    [] = run(Config, Ts1),
 
     %% For coverage: don't give the bin_opt_info option.
     Ts2 = [{bsm2,
 	    Code,
 	    [],
 	    []}],
-    ?line [] = run(Config, Ts2),
+    [] = run(Config, Ts2),
     ok.
 
 bin_construction(Config) when is_list(Config) ->
@@ -561,7 +558,7 @@ bin_construction(Config) when is_list(Config) ->
 	   [],
 	   {warnings,[{4,sys_core_fold,embedded_binary_size},
 		      {8,sys_core_fold,{embedded_unit,8,28}}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     
     ok.
 
@@ -783,6 +780,50 @@ no_warnings(Config) when is_list(Config) ->
     run(Config, Ts),
     ok.
 
+bit_syntax(Config) ->
+    Ts = [{?FUNCTION_NAME,
+	   <<"a(<<-1>>) -> ok;
+              a(<<1023>>) -> ok;
+              a(<<777/signed>>) -> ok;
+              a(<<a/binary>>) -> ok;
+              a(<<a/integer>>) -> ok;
+              a(<<a/float>>) -> ok;
+              a(<<a/utf8>>) -> ok;
+              a(<<a/utf16>>) -> ok;
+              a(<<a/utf32>>) -> ok;
+              a(<<a/utf32>>) -> ok.
+              b(Bin) -> Sz = bad, <<42:Sz>> = Bin.
+              c(Sz, Bin) ->
+                case Bin of
+                  <<-42:Sz/unsigned>> -> ok;
+                  <<42:Sz/float>> -> ok;
+                  <<42:Sz/binary>> -> ok
+                end.
+             ">>,
+	   [],
+	   {warnings,[{1,sys_core_fold,no_clause_match},
+		      {1,sys_core_fold,{nomatch_bit_syntax_unsigned,-1}},
+		      {2,sys_core_fold,{nomatch_bit_syntax_truncated,
+					unsigned,1023,8}},
+		      {3,sys_core_fold,{nomatch_bit_syntax_truncated,
+					signed,777,8}},
+		      {4,sys_core_fold,{nomatch_bit_syntax_type,a,binary}},
+		      {5,sys_core_fold,{nomatch_bit_syntax_type,a,integer}},
+		      {6,sys_core_fold,{nomatch_bit_syntax_type,a,float}},
+		      {7,sys_core_fold,{nomatch_bit_syntax_type,a,utf8}},
+		      {8,sys_core_fold,{nomatch_bit_syntax_type,a,utf16}},
+		      {9,sys_core_fold,{nomatch_bit_syntax_type,a,utf32}},
+		      {10,sys_core_fold,{nomatch_bit_syntax_type,a,utf32}},
+		      {11,sys_core_fold,no_clause_match},
+		      {11,sys_core_fold,{nomatch_bit_syntax_size,bad}},
+		      {14,sys_core_fold,{nomatch_bit_syntax_unsigned,-42}},
+		      {16,sys_core_fold,{nomatch_bit_syntax_type,42,binary}}
+		     ]}
+	  }],
+    run(Config, Ts),
+    ok.
+
+
 %%%
 %%% End of test cases.
 %%%
@@ -793,7 +834,7 @@ run(Config, Tests) ->
                     E -> 
                         BadL;
                     Bad -> 
-                        ?t:format("~nTest ~p failed. Expected~n  ~p~n"
+                        io:format("~nTest ~p failed. Expected~n  ~p~n"
                                   "but got~n  ~p~n", [N, E, Bad]),
 			fail()
                 end
@@ -806,33 +847,32 @@ run(Config, Tests) ->
 run_test(Conf, Test0, Warnings) ->
     Module = "warnings_"++test_lib:uniq(),
     Filename = Module ++ ".erl",
-    ?line DataDir = ?privdir,
+    DataDir = ?privdir,
     Test = ["-module(", Module, "). ", Test0],
-    ?line File = filename:join(DataDir, Filename),
-    ?line Opts = [binary,export_all,return|Warnings],
-    ?line ok = file:write_file(File, Test),
+    File = filename:join(DataDir, Filename),
+    Opts = [binary,export_all,return|Warnings],
+    ok = file:write_file(File, Test),
 
     %% Compile once just to print all warnings.
-    ?line compile:file(File, [binary,export_all,report|Warnings]),
+    compile:file(File, [binary,export_all,report|Warnings]),
 
     %% Test result of compilation.
-    ?line Res = case compile:file(File, Opts) of
-		    {ok, _M, Bin, []} when is_binary(Bin) ->
-			[];
-		    {ok, _M, Bin, Ws0} when is_binary(Bin) ->
-			%% We are not interested in warnings from
-			%% erl_lint here.
-			WsL = [{F,[W || {_,Mod,_}=W <- Ws, 
-					Mod =/= erl_lint]} ||
-				  {F,Ws} <- Ws0],
-                        case WsL of 
-                            [{_File,Ws}] -> {warnings, Ws};
-                            _ -> list_to_tuple([warnings, WsL])
-                        end
-		end,
+    Res = case compile:file(File, Opts) of
+	      {ok, _M, Bin, []} when is_binary(Bin) ->
+		  [];
+	      {ok, _M, Bin, Ws0} when is_binary(Bin) ->
+		  %% We are not interested in warnings from
+		  %% erl_lint here.
+		  WsL = [{F,[W || {_,Mod,_}=W <- Ws,
+				  Mod =/= erl_lint]} ||
+			    {F,Ws} <- Ws0],
+		  case WsL of
+		      [{_File,Ws}] -> {warnings, Ws};
+		      _ -> list_to_tuple([warnings, WsL])
+		  end
+	  end,
     file:delete(File),
     Res.
 
 fail() ->
-    io:format("failed~n"),
-    ?t:fail().
+    ct:fail(failed).
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index c5089ff57e..c83455240d 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 6.0.2
+COMPILER_VSN = 6.0.3
diff --git a/lib/cosEvent/test/Makefile b/lib/cosEvent/test/Makefile
index 2d29afd20d..028b0221b6 100644
--- a/lib/cosEvent/test/Makefile
+++ b/lib/cosEvent/test/Makefile
@@ -96,12 +96,10 @@ TARGET_FILES = \
 ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin -pa $(ERL_TOP)/lib/ic/ebin
 
 ERL_COMPILE_FLAGS += $(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/test_server/ebin \
 	-pa $(ERL_TOP)/lib/cosEvent/ebin \
 	-pa $(ERL_TOP)/lib/cosEvent/test/idl_output \
 	-I$(ERL_TOP)/lib/cosEvent \
-	-I$(ERL_TOP)/lib/cosEvent/test/$(IDLOUTDIR) \
-	-I$(ERL_TOP)/lib/test_server/include
+	-I$(ERL_TOP)/lib/cosEvent/test/$(IDLOUTDIR)
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/cosEvent/test/event_channel_SUITE.erl b/lib/cosEvent/test/event_channel_SUITE.erl
index 0d67a94520..3a01a0eab6 100644
--- a/lib/cosEvent/test/event_channel_SUITE.erl
+++ b/lib/cosEvent/test/event_channel_SUITE.erl
@@ -23,7 +23,7 @@
 
 -module(event_channel_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
diff --git a/lib/cosEvent/test/generated_SUITE.erl b/lib/cosEvent/test/generated_SUITE.erl
index 40fe94386a..1533c0be9c 100644
--- a/lib/cosEvent/test/generated_SUITE.erl
+++ b/lib/cosEvent/test/generated_SUITE.erl
@@ -26,7 +26,7 @@
 
 -module(generated_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
diff --git a/lib/cosEventDomain/test/Makefile b/lib/cosEventDomain/test/Makefile
index 1bbd1f1693..d8f6a863d6 100644
--- a/lib/cosEventDomain/test/Makefile
+++ b/lib/cosEventDomain/test/Makefile
@@ -61,15 +61,13 @@ ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin -pa $(ERL_TOP)/lib/ic/ebin
 
 ERL_COMPILE_FLAGS += \
 	$(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/test_server/ebin \
 	-pa $(ERL_TOP)/lib/cosEventDomain/ebin \
 	-pa $(ERL_TOP)/lib/cosEventDomain/include \
 	-pa $(ERL_TOP)/lib/cosNotification/ebin \
 	-pa $(ERL_TOP)/lib/cosNotification/include \
 	-I$(ERL_TOP)/lib/cosEventDomain/include \
 	-I$(ERL_TOP)/lib/cosNotification/include \
-	-I$(ERL_TOP)/lib/cosNotification/ebin \
-	-I$(ERL_TOP)/lib/test_server/include
+	-I$(ERL_TOP)/lib/cosNotification/ebin
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/cosEventDomain/test/event_domain_SUITE.erl b/lib/cosEventDomain/test/event_domain_SUITE.erl
index 75835b03a0..37a04a34aa 100644
--- a/lib/cosEventDomain/test/event_domain_SUITE.erl
+++ b/lib/cosEventDomain/test/event_domain_SUITE.erl
@@ -23,7 +23,7 @@
 
 -module(event_domain_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("cosNotification/include/CosNotifyChannelAdmin.hrl").
 -include_lib("cosNotification/include/CosNotification.hrl").
diff --git a/lib/cosEventDomain/test/generated_SUITE.erl b/lib/cosEventDomain/test/generated_SUITE.erl
index 553516bed1..afaa70db0a 100644
--- a/lib/cosEventDomain/test/generated_SUITE.erl
+++ b/lib/cosEventDomain/test/generated_SUITE.erl
@@ -26,7 +26,7 @@
 
 -module(generated_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
diff --git a/lib/cosFileTransfer/test/Makefile b/lib/cosFileTransfer/test/Makefile
index 39512d83bd..332f90cb39 100644
--- a/lib/cosFileTransfer/test/Makefile
+++ b/lib/cosFileTransfer/test/Makefile
@@ -85,7 +85,6 @@ ERL_COMPILE_FLAGS +=  \
 	$(ERL_IDL_FLAGS) \
 	-pa $(ERL_TOP)/lib/orber/include \
 	-pa $(ERL_TOP)/lib/cosProperty/include \
-	-pa $(ERL_TOP)/internal_tools/test_server/ebin \
 	-pa $(ERL_TOP)/lib/cosFileTransfer/ebin \
 	-pa $(ERL_TOP)/lib/cosFileTransfer/include \
 	-pa $(ERL_TOP)/lib/cosFileTransfer/test/idl_output \
@@ -94,8 +93,7 @@ ERL_COMPILE_FLAGS +=  \
 	-I$(ERL_TOP)/lib/cosFileTransfer/src \
 	-I$(ERL_TOP)/lib/cosFileTransfer/include \
 	-I$(ERL_TOP)/lib/cosFileTransfer \
-	-I$(ERL_TOP)/lib/cosFileTransfer/test/$(IDLOUTDIR) \
-	-I$(ERL_TOP)/lib/test_server/include
+	-I$(ERL_TOP)/lib/cosFileTransfer/test/$(IDLOUTDIR)
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/cosFileTransfer/test/fileTransfer_SUITE.erl b/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
index 3fb08dbcdd..173cf71e61 100644
--- a/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
+++ b/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
@@ -29,7 +29,7 @@
 %%--------------- INCLUDES -----------------------------------
 -include_lib("cosFileTransfer/src/cosFileTransferApp.hrl").
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %%--------------- DEFINES ------------------------------------
 -define(default_timeout, ?t:minutes(20)).
diff --git a/lib/cosNotification/doc/src/notes.xml b/lib/cosNotification/doc/src/notes.xml
index d7e8101164..f896d219b5 100644
--- a/lib/cosNotification/doc/src/notes.xml
+++ b/lib/cosNotification/doc/src/notes.xml
@@ -32,7 +32,21 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosNotification 1.2</title>
+  <section><title>cosNotification 1.2.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Suppress Dialyzer warnings. </p>
+          <p>
+	    Own Id: OTP-12862</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>cosNotification 1.2</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosNotification/src/CosNotifyFilter_Filter_impl.erl b/lib/cosNotification/src/CosNotifyFilter_Filter_impl.erl
index 75510ebeca..0f997049e0 100644
--- a/lib/cosNotification/src/CosNotifyFilter_Filter_impl.erl
+++ b/lib/cosNotification/src/CosNotifyFilter_Filter_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-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.
@@ -336,6 +336,7 @@ match_structured(_,_,What) ->
 %% Returns  : boolean() | 
 %%            {'EXCEPTION', CosNotifyFilter::UnsupportedFilterableData}
 %%-----------------------------------------------------------
+-spec match_typed(_, _, _) -> no_return().
 match_typed(_OE_THIS, _State, _Data) ->
     corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO}).
 
diff --git a/lib/cosNotification/src/CosNotifyFilter_MappingFilter_impl.erl b/lib/cosNotification/src/CosNotifyFilter_MappingFilter_impl.erl
index 3718664674..03c0e03be6 100644
--- a/lib/cosNotification/src/CosNotifyFilter_MappingFilter_impl.erl
+++ b/lib/cosNotification/src/CosNotifyFilter_MappingFilter_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-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.
@@ -298,6 +298,7 @@ match_structured(_,_,_) ->
 %% Returns  : boolean() , #any{} (out-type) |
 %%            {'EXCEPTION', CosNotifyFilter::UnsupportedFilterableData}
 %%-----------------------------------------------------------
+-spec match_typed(_, _, _) -> no_return().
 match_typed(_OE_THIS, _State, _Data) ->
     corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO}).
 	 
diff --git a/lib/cosNotification/test/Makefile b/lib/cosNotification/test/Makefile
index 1db6d2bc14..5a4c5e18aa 100644
--- a/lib/cosNotification/test/Makefile
+++ b/lib/cosNotification/test/Makefile
@@ -128,7 +128,6 @@ ERL_IDL_FLAGS += \
 ERL_COMPILE_FLAGS +=  \
 	$(ERL_IDL_FLAGS) \
 	-pa $(ERL_TOP)/lib/orber/include \
-	-pa $(ERL_TOP)/internal_tools/test_server/ebin \
 	-pa $(ERL_TOP)/lib/cosEvent/ebin \
 	-pa $(ERL_TOP)/lib/cosNotification/ebin \
 	-pa $(ERL_TOP)/lib/cosNotification/test/idl_output \
@@ -142,8 +141,7 @@ ERL_COMPILE_FLAGS +=  \
 	-I$(ERL_TOP)/lib/cosNotification/src \
 	-I$(ERL_TOP)/lib/cosNotification/include \
 	-I$(ERL_TOP)/lib/cosNotification \
-	-I$(ERL_TOP)/lib/cosNotification/test/$(IDLOUTDIR) \
-	-I$(ERL_TOP)/lib/test_server/include
+	-I$(ERL_TOP)/lib/cosNotification/test/$(IDLOUTDIR)
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/cosNotification/test/eventDB_SUITE.erl b/lib/cosNotification/test/eventDB_SUITE.erl
index 0f0faed065..2d095adfae 100644
--- a/lib/cosNotification/test/eventDB_SUITE.erl
+++ b/lib/cosNotification/test/eventDB_SUITE.erl
@@ -42,7 +42,7 @@
 
 -include("idl_output/notify_test.hrl").
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %%--------------- DEFINES ------------------------------------
 -define(default_timeout, ?t:minutes(20)).
diff --git a/lib/cosNotification/test/generated_SUITE.erl b/lib/cosNotification/test/generated_SUITE.erl
index fe186f24e8..8e29989e30 100644
--- a/lib/cosNotification/test/generated_SUITE.erl
+++ b/lib/cosNotification/test/generated_SUITE.erl
@@ -26,7 +26,7 @@
 
 -module(generated_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
diff --git a/lib/cosNotification/test/grammar_SUITE.erl b/lib/cosNotification/test/grammar_SUITE.erl
index eb0741ce04..b17ddba1c4 100644
--- a/lib/cosNotification/test/grammar_SUITE.erl
+++ b/lib/cosNotification/test/grammar_SUITE.erl
@@ -43,7 +43,7 @@
 
 -include("idl_output/notify_test.hrl").
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %%--------------- DEFINES ------------------------------------
 -define(default_timeout, ?t:minutes(20)).
diff --git a/lib/cosNotification/test/notification_SUITE.erl b/lib/cosNotification/test/notification_SUITE.erl
index b3884e7968..6824a2805f 100644
--- a/lib/cosNotification/test/notification_SUITE.erl
+++ b/lib/cosNotification/test/notification_SUITE.erl
@@ -41,7 +41,7 @@
 
 -include("idl_output/notify_test.hrl").
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %%--------------- DEFINES ------------------------------------
 -define(default_timeout, ?t:minutes(20)).
diff --git a/lib/cosNotification/vsn.mk b/lib/cosNotification/vsn.mk
index c1affdf0de..07b9bf474b 100644
--- a/lib/cosNotification/vsn.mk
+++ b/lib/cosNotification/vsn.mk
@@ -1,2 +1,2 @@
-COSNOTIFICATION_VSN = 1.2
+COSNOTIFICATION_VSN = 1.2.1
 
diff --git a/lib/cosProperty/test/Makefile b/lib/cosProperty/test/Makefile
index ec928a9789..b5e063129d 100644
--- a/lib/cosProperty/test/Makefile
+++ b/lib/cosProperty/test/Makefile
@@ -82,14 +82,12 @@ ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosProperty/ebin \
 ERL_COMPILE_FLAGS +=  \
 	$(ERL_IDL_FLAGS) \
 	-pa $(ERL_TOP)/lib/orber/include \
-	-pa $(ERL_TOP)/internal_tools/test_server/ebin \
 	-pa $(ERL_TOP)/lib/cosProperty/ebin \
 	-pa $(ERL_TOP)/lib/cosProperty/test/idl_output \
 	-I$(ERL_TOP)/lib/orber/include \
 	-I$(ERL_TOP)/lib/cosProperty/src \
 	-I$(ERL_TOP)/lib/cosProperty \
-	-I$(ERL_TOP)/lib/cosProperty/test/$(IDLOUTDIR) \
-	-I$(ERL_TOP)/lib/test_server/include
+	-I$(ERL_TOP)/lib/cosProperty/test/$(IDLOUTDIR)
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/cosProperty/test/generated_SUITE.erl b/lib/cosProperty/test/generated_SUITE.erl
index 0422e0d018..1789650cbd 100644
--- a/lib/cosProperty/test/generated_SUITE.erl
+++ b/lib/cosProperty/test/generated_SUITE.erl
@@ -26,7 +26,7 @@
 
 -module(generated_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
diff --git a/lib/cosProperty/test/property_SUITE.erl b/lib/cosProperty/test/property_SUITE.erl
index 94765e7479..ae508fa7b6 100644
--- a/lib/cosProperty/test/property_SUITE.erl
+++ b/lib/cosProperty/test/property_SUITE.erl
@@ -33,7 +33,7 @@
 -include_lib("cosProperty/src/cosProperty.hrl").
 -include_lib("cosProperty/include/CosPropertyService.hrl").
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
  
 %%--------------- DEFINES ------------------------------------
 -define(default_timeout, ?t:minutes(20)).
diff --git a/lib/cosTime/doc/src/notes.xml b/lib/cosTime/doc/src/notes.xml
index cf842af81f..bf75f7f617 100644
--- a/lib/cosTime/doc/src/notes.xml
+++ b/lib/cosTime/doc/src/notes.xml
@@ -33,7 +33,21 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosTime 1.2</title>
+  <section><title>cosTime 1.2.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Suppress Dialyzer warnings. </p>
+          <p>
+	    Own Id: OTP-12862</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>cosTime 1.2</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosTime/src/CosTime_TimeService_impl.erl b/lib/cosTime/src/CosTime_TimeService_impl.erl
index f139998f42..72c65757ad 100644
--- a/lib/cosTime/src/CosTime_TimeService_impl.erl
+++ b/lib/cosTime/src/CosTime_TimeService_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-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.
@@ -107,6 +107,7 @@ universal_time(OE_THIS, State) ->
 %% Arguments: 
 %% Returns  : {'EXCEPTION", #'CosTime_TimeUnavailable'{}}
 %%-----------------------------------------------------------
+-spec secure_universal_time(_, _) -> no_return().
 secure_universal_time(_OE_THIS, _State) ->
     corba:raise(#'CosTime_TimeUnavailable'{}).
 
diff --git a/lib/cosTime/test/Makefile b/lib/cosTime/test/Makefile
index aabf855af5..003ea886a3 100644
--- a/lib/cosTime/test/Makefile
+++ b/lib/cosTime/test/Makefile
@@ -85,7 +85,6 @@ ERL_COMPILE_FLAGS +=  \
 	$(ERL_IDL_FLAGS) \
 	-pa $(ERL_TOP)/lib/orber/include \
 	-pa $(ERL_TOP)/lib/cosNotification/include \
-	-pa $(ERL_TOP)/internal_tools/test_server/ebin \
 	-pa $(ERL_TOP)/lib/cosTime/ebin \
 	-pa $(ERL_TOP)/lib/cosTime/include \
 	-pa $(ERL_TOP)/lib/cosTime/test/idl_output \
@@ -94,8 +93,7 @@ ERL_COMPILE_FLAGS +=  \
 	-I$(ERL_TOP)/lib/cosTime/src \
 	-I$(ERL_TOP)/lib/cosTime/include \
 	-I$(ERL_TOP)/lib/cosTime \
-	-I$(ERL_TOP)/lib/cosTime/test/$(IDLOUTDIR) \
-	-I$(ERL_TOP)/lib/test_server/include
+	-I$(ERL_TOP)/lib/cosTime/test/$(IDLOUTDIR)
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/cosTime/test/generated_SUITE.erl b/lib/cosTime/test/generated_SUITE.erl
index 2e63b6f50e..03dffedc05 100644
--- a/lib/cosTime/test/generated_SUITE.erl
+++ b/lib/cosTime/test/generated_SUITE.erl
@@ -26,7 +26,7 @@
 
 -module(generated_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
diff --git a/lib/cosTime/test/time_SUITE.erl b/lib/cosTime/test/time_SUITE.erl
index 0e805aed05..7213680b99 100644
--- a/lib/cosTime/test/time_SUITE.erl
+++ b/lib/cosTime/test/time_SUITE.erl
@@ -30,7 +30,7 @@
 %%--------------- INCLUDES -----------------------------------
 -include_lib("cosTime/src/cosTimeApp.hrl").
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %%--------------- DEFINES ------------------------------------
 -define(default_timeout, ?t:minutes(20)).
diff --git a/lib/cosTime/vsn.mk b/lib/cosTime/vsn.mk
index 32416f0087..39b457b53b 100644
--- a/lib/cosTime/vsn.mk
+++ b/lib/cosTime/vsn.mk
@@ -1,2 +1,2 @@
-COSTIME_VSN = 1.2
+COSTIME_VSN = 1.2.1
 
diff --git a/lib/cosTransactions/doc/src/notes.xml b/lib/cosTransactions/doc/src/notes.xml
index cb45f8ed5e..76d14962b7 100644
--- a/lib/cosTransactions/doc/src/notes.xml
+++ b/lib/cosTransactions/doc/src/notes.xml
@@ -33,7 +33,21 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosTransactions 1.3</title>
+  <section><title>cosTransactions 1.3.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Suppress Dialyzer warnings. </p>
+          <p>
+	    Own Id: OTP-12862</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>cosTransactions 1.3</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl b/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl
index e0d14299a3..e24bcb9a04 100644
--- a/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl
+++ b/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1999-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.
@@ -169,6 +169,7 @@ create(_Self, _State, _TimeOut) ->
 %% Effect   : 
 %%------------------------------------------------------------
 
+-spec recreate(_, _, _) -> no_return().
 recreate(_Self, _State, #'CosTransactions_PropagationContext'{current = _C}) ->
     corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_YES}).
 %recreate(Self, State, #'CosTransactions_PropagationContext'{current = C}) ->
diff --git a/lib/cosTransactions/src/ETraP_Server_impl.erl b/lib/cosTransactions/src/ETraP_Server_impl.erl
index 7b451e1762..5c7b5f6350 100644
--- a/lib/cosTransactions/src/ETraP_Server_impl.erl
+++ b/lib/cosTransactions/src/ETraP_Server_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1999-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.
@@ -675,6 +675,7 @@ is_same_transaction(Self, {Env, Local}, Coordinator) ->
 %% Effect   :
 %%------------------------------------------------------------
 
+-spec is_related_transaction(_, _, _) -> no_return().
 is_related_transaction(_Self, {_Env, _Local}, _Coordinator) ->
     corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_YES}).
 %    type_check(?tr_get_typeCheck(Env), ?tr_Coordinator,
@@ -689,6 +690,7 @@ is_related_transaction(_Self, {_Env, _Local}, _Coordinator) ->
 %% Effect   :
 %%------------------------------------------------------------
 
+-spec is_ancestor_transaction(_, _, _) -> no_return().
 is_ancestor_transaction(_Self, {_Env, _Local}, _Coordinator) ->
     corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_YES}).
 %    type_check(?tr_get_typeCheck(Env), ?tr_Coordinator,
@@ -826,6 +828,7 @@ register_subtran_aware(Self, {Env, Local}, SubTrAwareResource) ->
 %% Effect   : 
 %%------------------------------------------------------------
 
+-spec register_synchronization(_, _, _) -> no_return().
 register_synchronization(_Self, {_Env, _Local}, _Synchronization) ->
     corba:raise(#'CosTransactions_SynchronizationUnavailable'{}).
 
@@ -950,6 +953,7 @@ create_subtransaction(Self, {Env, Local}) ->
 %% Effect   : 
 %%------------------------------------------------------------
 
+-spec get_txcontext(_, _) -> no_return().
 get_txcontext(_Self, {_Env, _Local}) ->
     corba:raise(#'CosTransactions_Unavailable'{}).
 
diff --git a/lib/cosTransactions/test/Makefile b/lib/cosTransactions/test/Makefile
index 3cdb05e7ef..9bcd461f04 100644
--- a/lib/cosTransactions/test/Makefile
+++ b/lib/cosTransactions/test/Makefile
@@ -93,13 +93,11 @@ ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosTransactions/ebin\
 ERL_COMPILE_FLAGS +=  \
 	$(ERL_IDL_FLAGS) \
 	-pa $(ERL_TOP)/lib/orber/include \
-	-pa $(ERL_TOP)/lib/test_server/ebin \
 	-pa $(ERL_TOP)/lib/cosTransactions/ebin \
 	-pa $(ERL_TOP)/lib/cosTransactions/test/idl_output \
 	-I$(ERL_TOP)/lib/orber/include \
 	-I$(ERL_TOP)/lib/cosTransactions \
-	-I$(ERL_TOP)/lib/cosTransactions/test/$(IDLOUTDIR) \
-	-I$(ERL_TOP)/lib/test_server/include
+	-I$(ERL_TOP)/lib/cosTransactions/test/$(IDLOUTDIR)
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/cosTransactions/test/generated_SUITE.erl b/lib/cosTransactions/test/generated_SUITE.erl
index 9d5cfb154a..c4bd86a892 100644
--- a/lib/cosTransactions/test/generated_SUITE.erl
+++ b/lib/cosTransactions/test/generated_SUITE.erl
@@ -27,7 +27,7 @@
 
 -module(generated_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
diff --git a/lib/cosTransactions/test/transactions_SUITE.erl b/lib/cosTransactions/test/transactions_SUITE.erl
index 0f06c3d262..63ec04f74f 100644
--- a/lib/cosTransactions/test/transactions_SUITE.erl
+++ b/lib/cosTransactions/test/transactions_SUITE.erl
@@ -29,7 +29,7 @@
 -include_lib("cosTransactions/include/CosTransactions.hrl").
 -include("etrap_test_lib.hrl").
  
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(default_timeout, ?t:minutes(20)).
 
diff --git a/lib/cosTransactions/vsn.mk b/lib/cosTransactions/vsn.mk
index 929f8c73d1..3a18cae384 100644
--- a/lib/cosTransactions/vsn.mk
+++ b/lib/cosTransactions/vsn.mk
@@ -1 +1 @@
-COSTRANSACTIONS_VSN = 1.3
+COSTRANSACTIONS_VSN = 1.3.1
diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
index 24db75bf91..fbf108c410 100644
--- a/lib/crypto/Makefile
+++ b/lib/crypto/Makefile
@@ -24,11 +24,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 # Macros
 #
 
-ifneq ($(findstring ose,$(TARGET)),ose)
 SUB_DIRECTORIES = src c_src doc/src
-else
-SUB_DIRECTORIES =  src doc/src
-endif
 static_lib: SUB_DIRECTORIES = c_src
 
 include vsn.mk
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index e66c0ca916..e7f750b60a 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -127,12 +127,7 @@ ALL_STATIC_CFLAGS = $(DED_STATIC_CFLAGS) $(INCLUDES)
 
 _create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
-ifneq ($(findstring ose,$(TARGET)),ose)
 debug opt valgrind: $(NIF_LIB) $(CALLBACK_LIB)
-else
-# Do not build dynamic files on OSE
-debug opt valgrind:
-endif
 
 static_lib: $(NIF_ARCHIVE)
 
@@ -203,14 +198,12 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
 	$(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj"
-ifneq ($(findstring ose,$(TARGET)),ose)
 	$(INSTALL_PROGRAM) $(CRYPTO_OBJS) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib"
 ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
 	$(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib"
 endif
-endif
 
 release_docs_spec:
 
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 3c73c318ed..74cdecdec6 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -91,6 +91,7 @@
 #endif
 
 #if OPENSSL_VERSION_NUMBER >= 0x1000100fL
+# define HAVE_EVP_AES_CTR
 # define HAVE_GCM
 #endif
 
@@ -98,6 +99,10 @@
 # define HAVE_CHACHA20_POLY1305
 #endif
 
+#if OPENSSL_VERSION_NUMBER <= 0x009080cfL
+# define HAVE_ECB_IVEC_BUG
+#endif
+
 #if defined(HAVE_EC)
 #include <openssl/ec.h>
 #include <openssl/ecdh.h>
@@ -193,57 +198,20 @@ static void unload(ErlNifEnv* env, void* priv_data);
 /* The NIFs: */
 static ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM md5(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM md5_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM md5_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM md5_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM ripemd160(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM ripemd160_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM ripemd160_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM ripemd160_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha224_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha224_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha224_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha224_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha256_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha256_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha256_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha256_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha384_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha384_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha384_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha384_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha512_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha512_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha512_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha512_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM md4(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM md4_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM md4_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM md4_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM md5_mac_n(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha_mac_n(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha224_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha256_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha384_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM sha512_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hmac_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hmac_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hmac_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM des_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM des_cfb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM des_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM des_ede3_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM des_ede3_cfb_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM hash_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM hash_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM hash_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM hmac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM hmac_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM hmac_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM hmac_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM block_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_cfb_8_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM aes_cfb_128_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM aes_ige_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_ctr_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM aes_ctr_stream_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_ctr_stream_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM aes_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rand_bytes_1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM strong_rand_bytes_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rand_bytes_3(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -252,13 +220,10 @@ static ERL_NIF_TERM rand_uniform_nif(ErlNifEnv* env, int argc, const ERL_NIF_TER
 static ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM dss_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM aes_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM aes_ige_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rc4_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rc4_set_key(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rc4_encrypt_with_state(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM rc2_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM dss_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rsa_public_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -270,10 +235,6 @@ static ERL_NIF_TERM dh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_T
 static ERL_NIF_TERM srp_value_B_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM srp_user_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM srp_host_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM bf_cfb64_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM bf_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM bf_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM blowfish_ofb64_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 
 static ERL_NIF_TERM ec_key_generate(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM ecdsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -291,32 +252,7 @@ static ERL_NIF_TERM chacha20_poly1305_decrypt(ErlNifEnv* env, int argc, const ER
 /* helpers */
 static void init_algorithms_types(ErlNifEnv*);
 static void init_digest_types(ErlNifEnv* env);
-static void hmac_md5(unsigned char *key, int klen,
-		     unsigned char *dbuf, int dlen, 
-		     unsigned char *hmacbuf);
-static void hmac_sha1(unsigned char *key, int klen,
-		      unsigned char *dbuf, int dlen, 
-		      unsigned char *hmacbuf);
-#ifdef HAVE_SHA224
-static void hmac_sha224(unsigned char *key, int klen,
-			unsigned char *dbuf, int dlen,
-			unsigned char *hmacbuf);
-#endif
-#ifdef HAVE_SHA256
-static void hmac_sha256(unsigned char *key, int klen,
-			unsigned char *dbuf, int dlen,
-			unsigned char *hmacbuf);
-#endif
-#ifdef HAVE_SHA384
-static void hmac_sha384(unsigned char *key, int klen,
-			unsigned char *dbuf, int dlen,
-			unsigned char *hmacbuf);
-#endif
-#ifdef HAVE_SHA512
-static void hmac_sha512(unsigned char *key, int klen,
-			unsigned char *dbuf, int dlen,
-			unsigned char *hmacbuf);
-#endif
+static void init_cipher_types(ErlNifEnv* env);
 #ifdef HAVE_EC
 static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg);
 static int term2point(ErlNifEnv* env, ERL_NIF_TERM term,
@@ -328,60 +264,25 @@ static int library_refc = 0; /* number of users of this dynamic library */
 static ErlNifFunc nif_funcs[] = {
     {"info_lib", 0, info_lib},
     {"algorithms", 0, algorithms},
-    {"md5", 1, md5},
-    {"md5_init", 0, md5_init},
-    {"md5_update", 2, md5_update},
-    {"md5_final", 1, md5_final},
-    {"ripemd160", 1, ripemd160},
-    {"ripemd160_init", 0, ripemd160_init},
-    {"ripemd160_update", 2, ripemd160_update},
-    {"ripemd160_final", 1, ripemd160_final},
-    {"sha", 1, sha},
-    {"sha_init", 0, sha_init},
-    {"sha_update", 2, sha_update},
-    {"sha_final", 1, sha_final},
-    {"sha224_nif", 1, sha224_nif},
-    {"sha224_init_nif", 0, sha224_init_nif},
-    {"sha224_update_nif", 2, sha224_update_nif},
-    {"sha224_final_nif", 1, sha224_final_nif},
-    {"sha256_nif", 1, sha256_nif},
-    {"sha256_init_nif", 0, sha256_init_nif},
-    {"sha256_update_nif", 2, sha256_update_nif},
-    {"sha256_final_nif", 1, sha256_final_nif},
-    {"sha384_nif", 1, sha384_nif},
-    {"sha384_init_nif", 0, sha384_init_nif},
-    {"sha384_update_nif", 2, sha384_update_nif},
-    {"sha384_final_nif", 1, sha384_final_nif},
-    {"sha512_nif", 1, sha512_nif},
-    {"sha512_init_nif", 0, sha512_init_nif},
-    {"sha512_update_nif", 2, sha512_update_nif},
-    {"sha512_final_nif", 1, sha512_final_nif},
-    {"md4", 1, md4},
-    {"md4_init", 0, md4_init},
-    {"md4_update", 2, md4_update},
-    {"md4_final", 1, md4_final},
-    {"md5_mac_n", 3, md5_mac_n},
-    {"sha_mac_n", 3, sha_mac_n},
-    {"sha224_mac_nif", 3, sha224_mac_nif},
-    {"sha256_mac_nif", 3, sha256_mac_nif},
-    {"sha384_mac_nif", 3, sha384_mac_nif},
-    {"sha512_mac_nif", 3, sha512_mac_nif},
-    {"hmac_init", 2, hmac_init},
-    {"hmac_update", 2, hmac_update},
-    {"hmac_final", 1, hmac_final},
-    {"hmac_final_n", 2, hmac_final},
-    {"des_cbc_crypt", 4, des_cbc_crypt},
-    {"des_cfb_crypt", 4, des_cfb_crypt},
-    {"des_ecb_crypt", 3, des_ecb_crypt},
-    {"des_ede3_cbc_crypt", 6, des_ede3_cbc_crypt},
-    {"des_ede3_cfb_crypt_nif", 6, des_ede3_cfb_crypt_nif},
-    {"aes_cfb_8_crypt", 4, aes_cfb_8_crypt},
-    {"aes_cfb_128_crypt", 4, aes_cfb_128_crypt},
+    {"hash_nif", 2, hash_nif},
+    {"hash_init_nif", 1, hash_init_nif},
+    {"hash_update_nif", 2, hash_update_nif},
+    {"hash_final_nif", 1, hash_final_nif},
+    {"hmac_nif", 3, hmac_nif},
+    {"hmac_nif", 4, hmac_nif},
+    {"hmac_init_nif", 2, hmac_init_nif},
+    {"hmac_update_nif", 2, hmac_update_nif},
+    {"hmac_final_nif", 1, hmac_final_nif},
+    {"hmac_final_nif", 2, hmac_final_nif},
+    {"block_crypt_nif", 5, block_crypt_nif},
+    {"block_crypt_nif", 4, block_crypt_nif},
+    {"aes_ige_crypt_nif", 4, aes_ige_crypt_nif},
+
     {"aes_ctr_encrypt", 3, aes_ctr_encrypt},
     {"aes_ctr_decrypt", 3, aes_ctr_encrypt},
+    {"aes_ctr_stream_init", 2, aes_ctr_stream_init},
     {"aes_ctr_stream_encrypt", 2, aes_ctr_stream_encrypt},
     {"aes_ctr_stream_decrypt", 2, aes_ctr_stream_encrypt},
-    {"aes_ecb_crypt", 3, aes_ecb_crypt},
     {"rand_bytes", 1, rand_bytes_1},
     {"strong_rand_bytes_nif", 1, strong_rand_bytes_nif},
     {"rand_bytes", 3, rand_bytes_3},
@@ -390,13 +291,10 @@ static ErlNifFunc nif_funcs[] = {
     {"mod_exp_nif", 4, mod_exp_nif},
     {"dss_verify_nif", 4, dss_verify_nif},
     {"rsa_verify_nif", 4, rsa_verify_nif},
-    {"aes_cbc_crypt", 4, aes_cbc_crypt},
-    {"aes_ige_crypt_nif", 4, aes_ige_crypt_nif},
     {"do_exor", 2, do_exor},
     {"rc4_encrypt", 2, rc4_encrypt},
     {"rc4_set_key", 1, rc4_set_key},
     {"rc4_encrypt_with_state", 2, rc4_encrypt_with_state},
-    {"rc2_cbc_crypt", 4, rc2_cbc_crypt},
     {"rsa_sign_nif", 3, rsa_sign_nif},
     {"dss_sign_nif", 3, dss_sign_nif},
     {"rsa_public_crypt", 4, rsa_public_crypt},
@@ -408,10 +306,6 @@ static ErlNifFunc nif_funcs[] = {
     {"srp_value_B_nif", 5, srp_value_B_nif},
     {"srp_user_secret_nif", 7, srp_user_secret_nif},
     {"srp_host_secret_nif", 5, srp_host_secret_nif},
-    {"bf_cfb64_crypt", 4, bf_cfb64_crypt},
-    {"bf_cbc_crypt", 4, bf_cbc_crypt},
-    {"bf_ecb_crypt", 3, bf_ecb_crypt},
-    {"blowfish_ofb64_encrypt", 3, blowfish_ofb64_encrypt},
 
     {"ec_key_generate", 2, ec_key_generate},
     {"ecdsa_sign_nif", 4, ecdsa_sign_nif},
@@ -432,37 +326,14 @@ static ErlNifFunc nif_funcs[] = {
 ERL_NIF_INIT(crypto,nif_funcs,load,NULL,upgrade,unload)
 
 
-#define MD5_CTX_LEN     (sizeof(MD5_CTX))
-#define MD5_LEN         16
-#define MD5_LEN_96      12
-#define MD4_CTX_LEN     (sizeof(MD4_CTX))
-#define MD4_LEN         16
+#define MD5_CTX_LEN       (sizeof(MD5_CTX))
+#define MD4_CTX_LEN       (sizeof(MD4_CTX))
 #define RIPEMD160_CTX_LEN (sizeof(RIPEMD160_CTX))
-#define RIPEMD160_LEN   20
-#define SHA_CTX_LEN     (sizeof(SHA_CTX))
-#define SHA_LEN         20
-#define SHA_LEN_96      12
-#define SHA224_LEN	(224/8)
-#define SHA256_LEN	(256/8)
-#define SHA384_LEN	(384/8)
-#define SHA512_LEN	(512/8)
-#define HMAC_INT_LEN    64
-#define HMAC_INT2_LEN   128
-
-#define HMAC_IPAD       0x36
-#define HMAC_OPAD       0x5c
 
 
 static ERL_NIF_TERM atom_true;
 static ERL_NIF_TERM atom_false;
 static ERL_NIF_TERM atom_sha;
-static ERL_NIF_TERM atom_sha224;
-static ERL_NIF_TERM atom_sha256;
-static ERL_NIF_TERM atom_sha384;
-static ERL_NIF_TERM atom_sha512;
-static ERL_NIF_TERM atom_md5;
-static ERL_NIF_TERM atom_md4;
-static ERL_NIF_TERM atom_ripemd160;
 static ERL_NIF_TERM atom_error;
 static ERL_NIF_TERM atom_rsa_pkcs1_padding;
 static ERL_NIF_TERM atom_rsa_pkcs1_oaep_padding;
@@ -489,6 +360,14 @@ static ERL_NIF_TERM atom_ppbasis;
 static ERL_NIF_TERM atom_onbasis;
 #endif
 
+static ERL_NIF_TERM atom_aes_cfb8;
+static ERL_NIF_TERM atom_aes_cfb128;
+#ifdef HAVE_ECB_IVEC_BUG
+static ERL_NIF_TERM atom_aes_ecb;
+static ERL_NIF_TERM atom_des_ecb;
+static ERL_NIF_TERM atom_blowfish_ecb;
+#endif
+
 static ErlNifResourceType* hmac_context_rtype;
 struct hmac_context
 {
@@ -498,6 +377,101 @@ struct hmac_context
 };
 static void hmac_context_dtor(ErlNifEnv* env, struct hmac_context*);
 
+struct digest_type_t {
+    union {
+	const char*  str;        /* before init, NULL for end-of-table */
+	ERL_NIF_TERM atom;       /* after init, 'false' for end-of-table */
+    }type;
+    union {
+	const EVP_MD* (*funcp)(void);  /* before init, NULL if notsup */
+	const EVP_MD* p;               /* after init, NULL if notsup */
+    }md;
+};
+
+struct digest_type_t digest_types[] =
+{
+    {{"md4"}, {&EVP_md4}},
+    {{"md5"}, {&EVP_md5}},
+    {{"ripemd160"}, {&EVP_ripemd160}},
+    {{"sha"}, {&EVP_sha1}},
+    {{"sha224"},
+#ifdef HAVE_SHA224
+     {&EVP_sha224}
+#else
+     {NULL}
+#endif
+    },
+    {{"sha256"},
+#ifdef HAVE_SHA256
+     {&EVP_sha256}
+#else
+     {NULL}
+#endif
+    },
+    {{"sha384"},
+#ifdef HAVE_SHA384
+     {&EVP_sha384}
+#else
+     {NULL}
+#endif
+    },
+    {{"sha512"},
+#ifdef HAVE_SHA512
+     {&EVP_sha512}
+#else
+     {NULL}
+#endif
+    },
+    {{NULL}}
+};
+
+static struct digest_type_t* get_digest_type(ERL_NIF_TERM type);
+
+struct cipher_type_t {
+    union {
+	const char* str;    /* before init */
+	ERL_NIF_TERM atom;  /* after init */
+    }type;
+    union {
+	const EVP_CIPHER* (*funcp)(void); /* before init, NULL if notsup */
+	const EVP_CIPHER* p;              /* after init, NULL if notsup */
+    }cipher;
+    const size_t key_len;      /* != 0 to also match on key_len */
+};
+
+struct cipher_type_t cipher_types[] =
+{
+    {{"rc2_cbc"}, {&EVP_rc2_cbc}},
+    {{"des_cbc"}, {&EVP_des_cbc}},
+    {{"des_cfb"}, {&EVP_des_cfb8}},
+    {{"des_ecb"}, {&EVP_des_ecb}},
+    {{"des_ede3_cbc"}, {&EVP_des_ede3_cbc}},
+    {{"des_ede3_cbf"},
+#ifdef HAVE_DES_ede3_cfb_encrypt
+     {&EVP_des_ede3_cfb8}
+#else
+     {NULL}
+#endif
+    },
+    {{"blowfish_cbc"}, {&EVP_bf_cbc}},
+    {{"blowfish_cfb64"}, {&EVP_bf_cfb64}},
+    {{"blowfish_ofb64"}, {&EVP_bf_ofb}},
+    {{"blowfish_ecb"}, {&EVP_bf_ecb}},
+    {{"aes_cbc"}, {&EVP_aes_128_cbc}, 16},
+    {{"aes_cbc"}, {&EVP_aes_192_cbc}, 24},
+    {{"aes_cbc"}, {&EVP_aes_256_cbc}, 32},
+    {{"aes_cbc128"}, {&EVP_aes_128_cbc}},
+    {{"aes_cbc256"}, {&EVP_aes_256_cbc}},
+    {{"aes_cfb8"}, {&EVP_aes_128_cfb8}},
+    {{"aes_cfb128"}, {&EVP_aes_128_cfb128}},
+    {{"aes_ecb"}, {&EVP_aes_128_ecb}, 16},
+    {{"aes_ecb"}, {&EVP_aes_192_ecb}, 24},
+    {{"aes_ecb"}, {&EVP_aes_256_ecb}, 32},
+    {{NULL}}
+};
+
+static struct cipher_type_t* get_cipher_type(ERL_NIF_TERM type, size_t key_len);
+
 /*
 #define PRINTF_ERR0(FMT) enif_fprintf(stderr, FMT "\n")
 #define PRINTF_ERR1(FMT, A1) enif_fprintf(stderr, FMT "\n", A1)
@@ -507,47 +481,21 @@ static void hmac_context_dtor(ErlNifEnv* env, struct hmac_context*);
 #define PRINTF_ERR1(FMT,A1)
 #define PRINTF_ERR2(FMT,A1,A2)
 
-#ifdef __OSE__
-
-/* For crypto on OSE we have to initialize the crypto library on each
-   process that uses it. So since we do not know which scheduler is going
-   to execute the nif we have to check before each nif call that we have
-   initialized crypto in that process. */
-
-#include "ose.h"
-#include "openssl/osessl.h"
-
-static ErlNifTSDKey crypto_init_key;
-static int check_ose_crypto(void);
-static int init_ose_crypto(void);
-
-static int check_ose_crypto() {
-    int key = (int)enif_tsd_get(crypto_init_key);
-    if (!key) {
-	if (!CRYPTO_OSE5_init()) {
-	    PRINTF_ERR0("CRYPTO: Call to CRYPTO_OSE5_init failed");
-	    return 0;
-	}
-	enif_tsd_set(crypto_init_key,1);
-    }
-    return 1;
+#if OPENSSL_VERSION_NUMBER >= 0x1000000fL
+/* Define resource types for OpenSSL context structures. */
+static ErlNifResourceType* evp_md_ctx_rtype;
+static void evp_md_ctx_dtor(ErlNifEnv* env, EVP_MD_CTX* ctx) {
+    EVP_MD_CTX_cleanup(ctx);
 }
+#endif
 
-static int init_ose_crypto() {
-    /* Crypto nif upgrade does not work on OSE so no need to
-       destroy this key */
-    enif_tsd_key_create("crypto_init_key", &crypto_init_key);
-    return check_ose_crypto();
+#ifdef HAVE_EVP_AES_CTR
+static ErlNifResourceType* evp_cipher_ctx_rtype;
+static void evp_cipher_ctx_dtor(ErlNifEnv* env, EVP_CIPHER_CTX* ctx) {
+    EVP_CIPHER_CTX_cleanup(ctx);
 }
-
-#define INIT_OSE_CRYPTO() init_ose_crypto()
-#define CHECK_OSE_CRYPTO() check_ose_crypto()
-#else
-#define INIT_OSE_CRYPTO() 1
-#define CHECK_OSE_CRYPTO()
 #endif
 
-
 static int verify_lib_version(void)
 {
     const unsigned long libv = SSLeay();
@@ -563,7 +511,6 @@ static int verify_lib_version(void)
     return 1;
 }
 
-
 #ifdef HAVE_DYNAMIC_CRYPTO_LIB
 
 # if defined(DEBUG)
@@ -599,7 +546,9 @@ static void error_handler(void* null, const char* errstr)
 
 static int init(ErlNifEnv* env, ERL_NIF_TERM load_info)
 {
+#ifdef OPENSSL_THREADS
     ErlNifSysInfo sys_info;
+#endif
     get_crypto_callbacks_t* funcp;
     struct crypto_callbacks* ccb;
     int nlocks = 0;
@@ -609,9 +558,6 @@ static int init(ErlNifEnv* env, ERL_NIF_TERM load_info)
     ErlNifBinary lib_bin;
     char lib_buf[1000];
 
-    if (!INIT_OSE_CRYPTO())
-      return 0;
-
     if (!verify_lib_version())
 	return 0;
 
@@ -634,7 +580,26 @@ static int init(ErlNifEnv* env, ERL_NIF_TERM load_info)
 	PRINTF_ERR0("CRYPTO: Could not open resource type 'hmac_context'");
 	return 0;
     }
-
+#if OPENSSL_VERSION_NUMBER >= 0x1000000fL
+    evp_md_ctx_rtype = enif_open_resource_type(env, NULL, "EVP_MD_CTX",
+                                               (ErlNifResourceDtor*) evp_md_ctx_dtor,
+                                               ERL_NIF_RT_CREATE|ERL_NIF_RT_TAKEOVER,
+                                               NULL);
+    if (!evp_md_ctx_rtype) {
+        PRINTF_ERR0("CRYPTO: Could not open resource type 'EVP_MD_CTX'");
+        return 0;
+    }
+#endif
+#ifdef HAVE_EVP_AES_CTR
+    evp_cipher_ctx_rtype = enif_open_resource_type(env, NULL, "EVP_CIPHER_CTX",
+                                                   (ErlNifResourceDtor*) evp_cipher_ctx_dtor,
+                                                   ERL_NIF_RT_CREATE|ERL_NIF_RT_TAKEOVER,
+                                                   NULL);
+    if (!evp_cipher_ctx_rtype) {
+        PRINTF_ERR0("CRYPTO: Could not open resource type 'EVP_CIPHER_CTX'");
+        return 0;
+    }
+#endif
     if (library_refc > 0) {
 	/* Repeated loading of this library (module upgrade).
 	 * Atoms and callbacks are already set, we are done.
@@ -642,16 +607,9 @@ static int init(ErlNifEnv* env, ERL_NIF_TERM load_info)
 	return 1;
     }
 
-    atom_true = enif_make_atom(env,"true");
+    atom_true  = enif_make_atom(env,"true");
     atom_false = enif_make_atom(env,"false");
     atom_sha = enif_make_atom(env,"sha");
-    atom_sha224 = enif_make_atom(env,"sha224");
-    atom_sha256 = enif_make_atom(env,"sha256");
-    atom_sha384 = enif_make_atom(env,"sha384");
-    atom_sha512 = enif_make_atom(env,"sha512");
-    atom_md4 = enif_make_atom(env,"md4");
-    atom_md5 = enif_make_atom(env,"md5");
-    atom_ripemd160 = enif_make_atom(env,"ripemd160");
     atom_error = enif_make_atom(env,"error");
     atom_rsa_pkcs1_padding = enif_make_atom(env,"rsa_pkcs1_padding");
     atom_rsa_pkcs1_oaep_padding = enif_make_atom(env,"rsa_pkcs1_oaep_padding");
@@ -676,8 +634,16 @@ static int init(ErlNifEnv* env, ERL_NIF_TERM load_info)
     atom_ppbasis = enif_make_atom(env,"ppbasis");
     atom_onbasis = enif_make_atom(env,"onbasis");
 #endif
+    atom_aes_cfb8 = enif_make_atom(env, "aes_cfb8");
+    atom_aes_cfb128 = enif_make_atom(env, "aes_cfb128");
+#ifdef HAVE_ECB_IVEC_BUG
+    atom_aes_ecb = enif_make_atom(env, "aes_ecb");
+    atom_des_ecb = enif_make_atom(env, "des_ecb");
+    atom_blowfish_ecb = enif_make_atom(env, "blowfish_ecb");
+#endif
 
     init_digest_types(env);
+    init_cipher_types(env);
     init_algorithms_types(env);
 
 #ifdef HAVE_DYNAMIC_CRYPTO_LIB
@@ -762,46 +728,67 @@ static void unload(ErlNifEnv* env, void* priv_data)
 static int algo_hash_cnt;
 static ERL_NIF_TERM algo_hash[8];   /* increase when extending the list */
 static int algo_pubkey_cnt;
-static ERL_NIF_TERM algo_pubkey[3]; /* increase when extending the list */
+static ERL_NIF_TERM algo_pubkey[7]; /* increase when extending the list */
 static int algo_cipher_cnt;
-static ERL_NIF_TERM algo_cipher[4]; /* increase when extending the list */
+static ERL_NIF_TERM algo_cipher[20]; /* increase when extending the list */
 
 static void init_algorithms_types(ErlNifEnv* env)
 {
     algo_hash_cnt = 0;
-    algo_hash[algo_hash_cnt++] = atom_md4;
-    algo_hash[algo_hash_cnt++] = atom_md5;
     algo_hash[algo_hash_cnt++] = atom_sha;
-    algo_hash[algo_hash_cnt++] = atom_ripemd160;
 #ifdef HAVE_SHA224
-    algo_hash[algo_hash_cnt++] = atom_sha224;
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha224");
 #endif
 #ifdef HAVE_SHA256
-    algo_hash[algo_hash_cnt++] = atom_sha256;
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha256");
 #endif
 #ifdef HAVE_SHA384
-    algo_hash[algo_hash_cnt++] = atom_sha384;
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha384");
 #endif
 #ifdef HAVE_SHA512
-    algo_hash[algo_hash_cnt++] = atom_sha512;
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha512");
 #endif
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "md4");
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "md5");
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "ripemd160");
 
     algo_pubkey_cnt = 0;
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "rsa");
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "dss");
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "dh");
 #if defined(HAVE_EC)
 #if !defined(OPENSSL_NO_EC2M)
-    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env,"ec_gf2m");
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "ec_gf2m");
 #endif
-    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env,"ecdsa");
-    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env,"ecdh");
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "ecdsa");
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "ecdh");
 #endif
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "srp");
 
     algo_cipher_cnt = 0;
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "des3_cbc");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "des_ede3");
 #ifdef HAVE_DES_ede3_cfb_encrypt
     algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "des3_cbf");
 #endif
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cbc");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cbc128");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cfb8");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cfb128");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cbc256");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_ctr");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_ecb");
 #ifdef HAVE_AES_IGE
     algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"aes_ige256");
 #endif
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"des_cbc");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"des_cfb");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"blowfish_cbc");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"blowfish_cfb64");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"blowfish_ofb64");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"blowfish_ecb");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"rc2_cbc");
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"rc4");
 #if defined(HAVE_GCM)
     algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"aes_gcm");
 #endif
@@ -816,10 +803,13 @@ static void init_algorithms_types(ErlNifEnv* env)
 
 static ERL_NIF_TERM algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
+    int hash_cnt   = algo_hash_cnt;
+    int pubkey_cnt = algo_pubkey_cnt;
+    int cipher_cnt = algo_cipher_cnt;
     return enif_make_tuple3(env,
-			    enif_make_list_from_array(env, algo_hash, algo_hash_cnt),
-			    enif_make_list_from_array(env, algo_pubkey, algo_pubkey_cnt),
-			    enif_make_list_from_array(env, algo_cipher, algo_cipher_cnt));
+			    enif_make_list_from_array(env, algo_hash,   hash_cnt),
+			    enif_make_list_from_array(env, algo_pubkey, pubkey_cnt),
+			    enif_make_list_from_array(env, algo_cipher, cipher_cnt));
 }
 
 static ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
@@ -849,601 +839,392 @@ static ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]
 						 ver_term));
 }
 
-static ERL_NIF_TERM md5(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data) */
-    ErlNifBinary ibin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &ibin)) {
+static ERL_NIF_TERM make_badarg_maybe(ErlNifEnv* env)
+{
+    ERL_NIF_TERM reason;
+    if (enif_has_pending_exception(env, &reason))
+	return reason; /* dummy return value ignored */
+    else
 	return enif_make_badarg(env);
-    }
-    MD5((unsigned char *) ibin.data, ibin.size,
-	enif_make_new_binary(env,MD5_LEN, &ret));
-    CONSUME_REDS(env,ibin);
-    return ret;
 }
-static ERL_NIF_TERM md5_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* () */   
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    MD5_Init((MD5_CTX *) enif_make_new_binary(env, MD5_CTX_LEN, &ret));
-    return ret;
-}
-static ERL_NIF_TERM md5_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context, Data) */
-    MD5_CTX* new_ctx;
-    ErlNifBinary ctx_bin, data_bin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin)
-	|| ctx_bin.size != MD5_CTX_LEN
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
+
+static ERL_NIF_TERM hash_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type, Data) */
+    struct digest_type_t *digp = NULL;
+    const EVP_MD         *md;
+    ErlNifBinary         data;
+    ERL_NIF_TERM         ret;
+    unsigned             ret_size;
+
+    digp = get_digest_type(argv[0]);
+    if (!digp ||
+        !enif_inspect_iolist_as_binary(env, argv[1], &data)) {
 	return enif_make_badarg(env);
     }
-    new_ctx = (MD5_CTX*) enif_make_new_binary(env,MD5_CTX_LEN, &ret);
-    memcpy(new_ctx, ctx_bin.data, MD5_CTX_LEN);
-    MD5_Update(new_ctx, data_bin.data, data_bin.size);
-    CONSUME_REDS(env,data_bin);
-    return ret;
-}
-static ERL_NIF_TERM md5_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context) */
-    ErlNifBinary ctx_bin;
-    MD5_CTX ctx_clone; 
-    ERL_NIF_TERM ret;    
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != MD5_CTX_LEN) {
-	return enif_make_badarg(env);
+    md = digp->md.p;
+    if (!md) {
+	return atom_notsup;
     }
-    memcpy(&ctx_clone, ctx_bin.data, MD5_CTX_LEN); /* writable */
-    MD5_Final(enif_make_new_binary(env, MD5_LEN, &ret), &ctx_clone);
-    return ret;
-}
 
-static ERL_NIF_TERM ripemd160(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data) */
-    ErlNifBinary ibin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &ibin)) {
-	return enif_make_badarg(env);
+    ret_size = (unsigned)EVP_MD_size(md);
+    ASSERT(0 < ret_size && ret_size <= EVP_MAX_MD_SIZE);
+    if (!EVP_Digest(data.data, data.size,
+                    enif_make_new_binary(env, ret_size, &ret), &ret_size,
+                    md, NULL)) {
+        return atom_notsup;
     }
-    RIPEMD160((unsigned char *) ibin.data, ibin.size,
-	      enif_make_new_binary(env,RIPEMD160_LEN, &ret));
-    CONSUME_REDS(env,ibin);
-    return ret;
-}
-static ERL_NIF_TERM ripemd160_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* () */
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    RIPEMD160_Init((RIPEMD160_CTX *) enif_make_new_binary(env, RIPEMD160_CTX_LEN, &ret));
+    ASSERT(ret_size == (unsigned)EVP_MD_size(md));
+
+    CONSUME_REDS(env, data);
     return ret;
 }
-static ERL_NIF_TERM ripemd160_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context, Data) */
-    RIPEMD160_CTX* new_ctx;
-    ErlNifBinary ctx_bin, data_bin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin)
-	|| ctx_bin.size != RIPEMD160_CTX_LEN
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
+
+#if OPENSSL_VERSION_NUMBER >= 0x1000000fL
+
+static ERL_NIF_TERM hash_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type) */
+    struct digest_type_t *digp = NULL;
+    EVP_MD_CTX           *ctx;
+    ERL_NIF_TERM         ret;
+
+    digp = get_digest_type(argv[0]);
+    if (!digp) {
 	return enif_make_badarg(env);
     }
-    new_ctx = (RIPEMD160_CTX*) enif_make_new_binary(env,RIPEMD160_CTX_LEN, &ret);
-    memcpy(new_ctx, ctx_bin.data, RIPEMD160_CTX_LEN);
-    RIPEMD160_Update(new_ctx, data_bin.data, data_bin.size);
-    CONSUME_REDS(env, data_bin);
-    return ret;
-}
-static ERL_NIF_TERM ripemd160_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context) */
-    ErlNifBinary ctx_bin;
-    RIPEMD160_CTX ctx_clone;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != RIPEMD160_CTX_LEN) {
-	return enif_make_badarg(env);
+    if (!digp->md.p) {
+	return atom_notsup;
     }
-    memcpy(&ctx_clone, ctx_bin.data, RIPEMD160_CTX_LEN); /* writable */
-    RIPEMD160_Final(enif_make_new_binary(env, RIPEMD160_LEN, &ret), &ctx_clone);
-    return ret;
-}
 
-
-static ERL_NIF_TERM sha(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data) */    
-    ErlNifBinary ibin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &ibin)) {
-	return enif_make_badarg(env);
+    ctx = enif_alloc_resource(evp_md_ctx_rtype, sizeof(EVP_MD_CTX));
+    if (!EVP_DigestInit(ctx, digp->md.p)) {
+        enif_release_resource(ctx);
+        return atom_notsup;
     }
-    SHA1((unsigned char *) ibin.data, ibin.size,
-	 enif_make_new_binary(env,SHA_LEN, &ret));
-    CONSUME_REDS(env,ibin);
+    ret = enif_make_resource(env, ctx);
+    enif_release_resource(ctx);
     return ret;
 }
-static ERL_NIF_TERM sha_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* () */   
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    SHA1_Init((SHA_CTX *) enif_make_new_binary(env, SHA_CTX_LEN, &ret));
-    return ret;
-}
-static ERL_NIF_TERM sha_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+static ERL_NIF_TERM hash_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Context, Data) */
-    SHA_CTX* new_ctx;
-    ErlNifBinary ctx_bin, data_bin;
+    EVP_MD_CTX   *ctx, *new_ctx;
+    ErlNifBinary data;
     ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != SHA_CTX_LEN
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
-	return enif_make_badarg(env);
+
+    if (!enif_get_resource(env, argv[0], evp_md_ctx_rtype, (void**)&ctx) ||
+        !enif_inspect_iolist_as_binary(env, argv[1], &data)) {
+        return enif_make_badarg(env);
     }
-    new_ctx = (SHA_CTX*) enif_make_new_binary(env,SHA_CTX_LEN, &ret);
-    memcpy(new_ctx, ctx_bin.data, SHA_CTX_LEN);
-    SHA1_Update(new_ctx, data_bin.data, data_bin.size);
-    CONSUME_REDS(env,data_bin);
+
+    new_ctx = enif_alloc_resource(evp_md_ctx_rtype, sizeof(EVP_MD_CTX));
+    if (!EVP_MD_CTX_copy(new_ctx, ctx) ||
+        !EVP_DigestUpdate(new_ctx, data.data, data.size)) {
+        enif_release_resource(new_ctx);
+        return atom_notsup;
+    }
+
+    ret = enif_make_resource(env, new_ctx);
+    enif_release_resource(new_ctx);
+    CONSUME_REDS(env, data);
     return ret;
 }
-static ERL_NIF_TERM sha_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+static ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Context) */
-    ErlNifBinary ctx_bin;
-    SHA_CTX ctx_clone;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != SHA_CTX_LEN) {
-	return enif_make_badarg(env);
+    EVP_MD_CTX    *ctx, new_ctx;
+    ERL_NIF_TERM  ret;
+    unsigned      ret_size;
+
+    if (!enif_get_resource(env, argv[0], evp_md_ctx_rtype, (void**)&ctx)) {
+        return enif_make_badarg(env);
     }
-    memcpy(&ctx_clone, ctx_bin.data, SHA_CTX_LEN); /* writable */
-    SHA1_Final(enif_make_new_binary(env, SHA_LEN, &ret), &ctx_clone);    
-    return ret;
-}
 
-static ERL_NIF_TERM sha224_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data) */
-#ifdef HAVE_SHA224
-    ErlNifBinary ibin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &ibin)) {
-	return enif_make_badarg(env);
+    ret_size = (unsigned)EVP_MD_CTX_size(ctx);
+    ASSERT(0 < ret_size && ret_size <= EVP_MAX_MD_SIZE);
+
+    if (!EVP_MD_CTX_copy(&new_ctx, ctx) ||
+        !EVP_DigestFinal(&new_ctx,
+                         enif_make_new_binary(env, ret_size, &ret),
+                         &ret_size)) {
+        return atom_notsup;
     }
-    SHA224((unsigned char *) ibin.data, ibin.size,
-	 enif_make_new_binary(env,SHA224_LEN, &ret));
-    CONSUME_REDS(env,ibin);
-    return ret;
-#else
-    return atom_notsup;
-#endif
-}
-static ERL_NIF_TERM sha224_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* () */
-#ifdef HAVE_SHA224
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    SHA224_Init((SHA256_CTX *) enif_make_new_binary(env, sizeof(SHA256_CTX), &ret));
+    ASSERT(ret_size == (unsigned)EVP_MD_CTX_size(ctx));
+
     return ret;
-#else
-    return atom_notsup;
-#endif
 }
-static ERL_NIF_TERM sha224_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context, Data) */
-#ifdef HAVE_SHA224
-    SHA256_CTX* new_ctx;
-    ErlNifBinary ctx_bin, data_bin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != sizeof(SHA256_CTX)
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
+
+#else /* if OPENSSL_VERSION_NUMBER < 1.0 */
+
+static ERL_NIF_TERM hash_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type) */
+    typedef int (*init_fun)(unsigned char*);
+    struct digest_type_t *digp = NULL;
+    ERL_NIF_TERM         ctx;
+    size_t               ctx_size = 0;
+    init_fun             ctx_init = 0;
+
+    digp = get_digest_type(argv[0]);
+    if (!digp) {
 	return enif_make_badarg(env);
     }
-    new_ctx = (SHA256_CTX*) enif_make_new_binary(env,sizeof(SHA256_CTX), &ret);
-    memcpy(new_ctx, ctx_bin.data, sizeof(SHA256_CTX));
-    SHA224_Update(new_ctx, data_bin.data, data_bin.size);
-    CONSUME_REDS(env,data_bin);
-    return ret;
-#else
-    return atom_notsup;
-#endif
-}
-static ERL_NIF_TERM sha224_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context) */
-#ifdef HAVE_SHA224
-    ErlNifBinary ctx_bin;
-    SHA256_CTX ctx_clone;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != sizeof(SHA256_CTX)) {
-	return enif_make_badarg(env);
+    if (!digp->md.p) {
+	return atom_notsup;
     }
-    memcpy(&ctx_clone, ctx_bin.data, sizeof(SHA256_CTX)); /* writable */
-    SHA224_Final(enif_make_new_binary(env, SHA224_LEN, &ret), &ctx_clone);
-    return ret;
-#else
-    return atom_notsup;
-#endif
-}
 
-static ERL_NIF_TERM sha256_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data) */
-#ifdef HAVE_SHA256
-    ErlNifBinary ibin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &ibin)) {
-	return enif_make_badarg(env);
-    }
-    SHA256((unsigned char *) ibin.data, ibin.size,
-	 enif_make_new_binary(env,SHA256_LEN, &ret));
-    CONSUME_REDS(env,ibin);
-    return ret;
-#else
-    return atom_notsup;
+    switch (EVP_MD_type(digp->md.p))
+    {
+    case NID_md4:
+        ctx_size = MD4_CTX_LEN;
+        ctx_init = (init_fun)(&MD4_Init);
+        break;
+    case NID_md5:
+        ctx_size = MD5_CTX_LEN;
+        ctx_init = (init_fun)(&MD5_Init);
+        break;
+    case NID_ripemd160:
+        ctx_size = RIPEMD160_CTX_LEN;
+        ctx_init = (init_fun)(&RIPEMD160_Init);
+        break;
+    case NID_sha1:
+        ctx_size = sizeof(SHA_CTX);
+        ctx_init = (init_fun)(&SHA1_Init);
+        break;
+#ifdef HAVE_SHA224
+    case NID_sha224:
+        ctx_size = sizeof(SHA256_CTX);
+        ctx_init = (init_fun)(&SHA224_Init);
+        break;
 #endif
-}
-static ERL_NIF_TERM sha256_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* () */   
 #ifdef HAVE_SHA256
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    SHA256_Init((SHA256_CTX *) enif_make_new_binary(env, sizeof(SHA256_CTX), &ret));
-    return ret;
-#else
-    return atom_notsup;
+    case NID_sha256:
+        ctx_size = sizeof(SHA256_CTX);
+        ctx_init = (init_fun)(&SHA256_Init);
+        break;
 #endif
-}
-static ERL_NIF_TERM sha256_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context, Data) */
-#ifdef HAVE_SHA256
-    SHA256_CTX* new_ctx;
-    ErlNifBinary ctx_bin, data_bin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != sizeof(SHA256_CTX)
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
-	return enif_make_badarg(env);
+#ifdef HAVE_SHA384
+    case NID_sha384:
+        ctx_size = sizeof(SHA512_CTX);
+        ctx_init = (init_fun)(&SHA384_Init);
+        break;
+#endif
+#ifdef HAVE_SHA512
+    case NID_sha512:
+        ctx_size = sizeof(SHA512_CTX);
+        ctx_init = (init_fun)(&SHA512_Init);
+        break;
+#endif
+    default:
+        return atom_notsup;
+    }
+    ASSERT(ctx_size);
+    ASSERT(ctx_init);
+
+    ctx_init(enif_make_new_binary(env, ctx_size, &ctx));
+    return enif_make_tuple2(env, argv[0], ctx);
+}
+static ERL_NIF_TERM hash_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* ({Type, Context}, Data) */
+    typedef int (*update_fun)(unsigned char*, const unsigned char*, size_t);
+    ERL_NIF_TERM         new_ctx;
+    ErlNifBinary         ctx, data;
+    const ERL_NIF_TERM   *tuple;
+    int                  arity;
+    struct digest_type_t *digp = NULL;
+    unsigned char        *ctx_buff;
+    size_t               ctx_size   = 0;
+    update_fun           ctx_update = 0;
+
+    if (!enif_get_tuple(env, argv[0], &arity, &tuple) ||
+        arity != 2 ||
+        !(digp = get_digest_type(tuple[0])) ||
+        !enif_inspect_binary(env, tuple[1], &ctx) ||
+        !enif_inspect_iolist_as_binary(env, argv[1], &data)) {
+        return enif_make_badarg(env);
     }
-    new_ctx = (SHA256_CTX*) enif_make_new_binary(env,sizeof(SHA256_CTX), &ret);
-    memcpy(new_ctx, ctx_bin.data, sizeof(SHA256_CTX));
-    SHA256_Update(new_ctx, data_bin.data, data_bin.size);
-    CONSUME_REDS(env,data_bin);
-    return ret;
-#else
-    return atom_notsup;
+    if (!digp->md.p) {
+	return atom_notsup;
+    }
+
+    switch (EVP_MD_type(digp->md.p))
+    {
+    case NID_md4:
+        ctx_size   = MD4_CTX_LEN;
+        ctx_update = (update_fun)(&MD4_Update);
+        break;
+    case NID_md5:
+        ctx_size   = MD5_CTX_LEN;
+        ctx_update = (update_fun)(&MD5_Update);
+        break;
+    case NID_ripemd160:
+        ctx_size   = RIPEMD160_CTX_LEN;
+        ctx_update = (update_fun)(&RIPEMD160_Update);
+        break;
+    case NID_sha1:
+        ctx_size   = sizeof(SHA_CTX);
+        ctx_update = (update_fun)(&SHA1_Update);
+        break;
+#ifdef HAVE_SHA224
+    case NID_sha224:
+        ctx_size   = sizeof(SHA256_CTX);
+        ctx_update = (update_fun)(&SHA224_Update);
+        break;
 #endif
-}
-static ERL_NIF_TERM sha256_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context) */
 #ifdef HAVE_SHA256
-    ErlNifBinary ctx_bin;
-    SHA256_CTX ctx_clone;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != sizeof(SHA256_CTX)) {
-	return enif_make_badarg(env);
-    }
-    memcpy(&ctx_clone, ctx_bin.data, sizeof(SHA256_CTX)); /* writable */
-    SHA256_Final(enif_make_new_binary(env, SHA256_LEN, &ret), &ctx_clone);    
-    return ret;
-#else
-    return atom_notsup;
+    case NID_sha256:
+        ctx_size   = sizeof(SHA256_CTX);
+        ctx_update = (update_fun)(&SHA256_Update);
+        break;
 #endif
-}
-
-static ERL_NIF_TERM sha384_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data) */
 #ifdef HAVE_SHA384
-    ErlNifBinary ibin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &ibin)) {
-	return enif_make_badarg(env);
-    }
-    SHA384((unsigned char *) ibin.data, ibin.size,
-	 enif_make_new_binary(env,SHA384_LEN, &ret));
-    CONSUME_REDS(env,ibin);
-    return ret;
-#else
-    return atom_notsup;
+    case NID_sha384:
+        ctx_size   = sizeof(SHA512_CTX);
+        ctx_update = (update_fun)(&SHA384_Update);
+        break;
 #endif
-}
-static ERL_NIF_TERM sha384_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* () */
-#ifdef HAVE_SHA384
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    SHA384_Init((SHA512_CTX *) enif_make_new_binary(env, sizeof(SHA512_CTX), &ret));
-    return ret;
-#else
-    return atom_notsup;
+#ifdef HAVE_SHA512
+    case NID_sha512:
+        ctx_size   = sizeof(SHA512_CTX);
+        ctx_update = (update_fun)(&SHA512_Update);
+        break;
 #endif
-}
-static ERL_NIF_TERM sha384_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context, Data) */
-#ifdef HAVE_SHA384
-    SHA512_CTX* new_ctx;
-    ErlNifBinary ctx_bin, data_bin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != sizeof(SHA512_CTX)
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
-	return enif_make_badarg(env);
+    default:
+        return atom_notsup;
     }
-    new_ctx = (SHA512_CTX*) enif_make_new_binary(env,sizeof(SHA512_CTX), &ret);
-    memcpy(new_ctx, ctx_bin.data, sizeof(SHA512_CTX));
-    SHA384_Update(new_ctx, data_bin.data, data_bin.size);
-    CONSUME_REDS(env,data_bin);
-    return ret;
-#else
-    return atom_notsup;
-#endif
-}
-static ERL_NIF_TERM sha384_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context) */
-#ifdef HAVE_SHA384
-    ErlNifBinary ctx_bin;
-    SHA512_CTX ctx_clone;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != sizeof(SHA512_CTX)) {
-	return enif_make_badarg(env);
+    ASSERT(ctx_size);
+    ASSERT(ctx_update);
+
+    if (ctx.size != ctx_size) {
+        return enif_make_badarg(env);
     }
-    memcpy(&ctx_clone, ctx_bin.data, sizeof(SHA512_CTX)); /* writable */
-    SHA384_Final(enif_make_new_binary(env, SHA384_LEN, &ret), &ctx_clone);
-    return ret;
-#else
-    return atom_notsup;
-#endif
-}
 
-static ERL_NIF_TERM sha512_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data) */
-#ifdef HAVE_SHA512
-    ErlNifBinary ibin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &ibin)) {
-	return enif_make_badarg(env);
+    ctx_buff = enif_make_new_binary(env, ctx_size, &new_ctx);
+    memcpy(ctx_buff, ctx.data, ctx_size);
+    ctx_update(ctx_buff, data.data, data.size);
+
+    CONSUME_REDS(env, data);
+    return enif_make_tuple2(env, tuple[0], new_ctx);
+}
+static ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* ({Type, Context}) */
+    typedef int (*final_fun)(unsigned char*, void*);
+    ERL_NIF_TERM         ret;
+    ErlNifBinary         ctx;
+    const ERL_NIF_TERM   *tuple;
+    int                  arity;
+    struct digest_type_t *digp = NULL;
+    const EVP_MD         *md;
+    void                 *new_ctx;
+    size_t               ctx_size  = 0;
+    final_fun            ctx_final = 0;
+
+    if (!enif_get_tuple(env, argv[0], &arity, &tuple) ||
+        arity != 2 ||
+        !(digp = get_digest_type(tuple[0])) ||
+        !enif_inspect_binary(env, tuple[1], &ctx)) {
+        return enif_make_badarg(env);
     }
-    SHA512((unsigned char *) ibin.data, ibin.size,
-	 enif_make_new_binary(env,SHA512_LEN, &ret));
-    CONSUME_REDS(env,ibin);
-    return ret;
-#else
-    return atom_notsup;
+    md = digp->md.p;
+    if (!md) {
+	return atom_notsup;
+    }
+
+
+    switch (EVP_MD_type(md))
+    {
+    case NID_md4:
+        ctx_size  = MD4_CTX_LEN;
+        ctx_final = (final_fun)(&MD4_Final);
+        break;
+    case NID_md5:
+        ctx_size  = MD5_CTX_LEN;
+        ctx_final = (final_fun)(&MD5_Final);
+        break;
+    case NID_ripemd160:
+        ctx_size  = RIPEMD160_CTX_LEN;
+        ctx_final = (final_fun)(&RIPEMD160_Final);
+        break;
+    case NID_sha1:
+        ctx_size  = sizeof(SHA_CTX);
+        ctx_final = (final_fun)(&SHA1_Final);
+        break;
+#ifdef HAVE_SHA224
+    case NID_sha224:
+        ctx_size  = sizeof(SHA256_CTX);
+        ctx_final = (final_fun)(&SHA224_Final);
+        break;
 #endif
-}
-static ERL_NIF_TERM sha512_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* () */   
-#ifdef HAVE_SHA512
-    ERL_NIF_TERM ret;
-    SHA512_Init((SHA512_CTX *) enif_make_new_binary(env, sizeof(SHA512_CTX), &ret));
-    return ret;
-#else
-    return atom_notsup;
+#ifdef HAVE_SHA256
+    case NID_sha256:
+        ctx_size  = sizeof(SHA256_CTX);
+        ctx_final = (final_fun)(&SHA256_Final);
+        break;
 #endif
-}
-static ERL_NIF_TERM sha512_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context, Data) */
-#ifdef HAVE_SHA512
-    SHA512_CTX* new_ctx;
-    ErlNifBinary ctx_bin, data_bin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != sizeof(SHA512_CTX)
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
-	return enif_make_badarg(env);
-    }
-    new_ctx = (SHA512_CTX*) enif_make_new_binary(env,sizeof(SHA512_CTX), &ret);
-    memcpy(new_ctx, ctx_bin.data, sizeof(SHA512_CTX));
-    SHA512_Update(new_ctx, data_bin.data, data_bin.size);
-    CONSUME_REDS(env,data_bin);
-    return ret;
-#else
-    return atom_notsup;
+#ifdef HAVE_SHA384
+    case NID_sha384:
+        ctx_size  = sizeof(SHA512_CTX);
+        ctx_final = (final_fun)(&SHA384_Final);
+        break;
 #endif
-}
-static ERL_NIF_TERM sha512_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context) */
 #ifdef HAVE_SHA512
-    ErlNifBinary ctx_bin;
-    SHA512_CTX ctx_clone;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != sizeof(SHA512_CTX)) {
-	return enif_make_badarg(env);
-    }
-    memcpy(&ctx_clone, ctx_bin.data, sizeof(SHA512_CTX)); /* writable */
-    SHA512_Final(enif_make_new_binary(env, SHA512_LEN, &ret), &ctx_clone);    
-    return ret;
-#else
-    return atom_notsup;
+    case NID_sha512:
+        ctx_size  = sizeof(SHA512_CTX);
+        ctx_final = (final_fun)(&SHA512_Final);
+        break;
 #endif
-}
-
-
-static ERL_NIF_TERM md4(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data) */    
-    ErlNifBinary ibin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &ibin)) {
-	return enif_make_badarg(env);
+    default:
+        return atom_notsup;
     }
-    MD4((unsigned char *) ibin.data, ibin.size,
-	enif_make_new_binary(env,MD4_LEN, &ret));
-    CONSUME_REDS(env,ibin);
-    return ret;
-}
-static ERL_NIF_TERM md4_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* () */   
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    MD4_Init((MD4_CTX *) enif_make_new_binary(env, MD4_CTX_LEN, &ret));
-    return ret;
-}
-static ERL_NIF_TERM md4_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context, Data) */
-    MD4_CTX* new_ctx;
-    ErlNifBinary ctx_bin, data_bin;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != MD4_CTX_LEN
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
-	return enif_make_badarg(env);
-    }
-    new_ctx = (MD4_CTX*) enif_make_new_binary(env,MD4_CTX_LEN, &ret);
-    memcpy(new_ctx, ctx_bin.data, MD4_CTX_LEN);
-    MD4_Update(new_ctx, data_bin.data, data_bin.size);
-    CONSUME_REDS(env,data_bin);
-    return ret;
-}
-static ERL_NIF_TERM md4_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context) */
-    ErlNifBinary ctx_bin;
-    MD4_CTX ctx_clone;
-    ERL_NIF_TERM ret;    
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_binary(env, argv[0], &ctx_bin) || ctx_bin.size != MD4_CTX_LEN) {
-	return enif_make_badarg(env);
-    }
-    memcpy(&ctx_clone, ctx_bin.data, MD4_CTX_LEN); /* writable */
-    MD4_Final(enif_make_new_binary(env, MD4_LEN, &ret), &ctx_clone);    
-    return ret;
-}
+    ASSERT(ctx_size);
+    ASSERT(ctx_final);
 
-static ERL_NIF_TERM md5_mac_n(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, Data, MacSize) */
-    unsigned char hmacbuf[SHA_DIGEST_LENGTH];
-    ErlNifBinary key, data;
-    unsigned mac_sz;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)
-	|| !enif_get_uint(env,argv[2],&mac_sz) || mac_sz > MD5_LEN) {
-	return enif_make_badarg(env);
+    if (ctx.size != ctx_size) {
+        return enif_make_badarg(env);
     }
-    hmac_md5(key.data, key.size, data.data, data.size, hmacbuf);
-    memcpy(enif_make_new_binary(env, mac_sz, &ret), hmacbuf, mac_sz);
-    CONSUME_REDS(env,data);
-    return ret;
-}
 
-static ERL_NIF_TERM sha_mac_n(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, Data, MacSize) */
-    unsigned char hmacbuf[SHA_DIGEST_LENGTH];
-    ErlNifBinary key, data;
-    unsigned mac_sz;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)
-	|| !enif_get_uint(env,argv[2],&mac_sz) || mac_sz > SHA_LEN) {
-	return enif_make_badarg(env);
-    }
-    hmac_sha1(key.data, key.size, data.data, data.size, hmacbuf);
-    memcpy(enif_make_new_binary(env, mac_sz, &ret),
-	   hmacbuf, mac_sz);
-    CONSUME_REDS(env,data);
-    return ret;
-}
+    new_ctx = enif_alloc(ctx_size);
+    memcpy(new_ctx, ctx.data, ctx_size);
+    ctx_final(enif_make_new_binary(env, (size_t)EVP_MD_size(md), &ret),
+              new_ctx);
+    enif_free(new_ctx);
 
-static ERL_NIF_TERM sha224_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, Data, MacSize) */
-#ifdef HAVE_SHA224
-    unsigned char hmacbuf[SHA224_DIGEST_LENGTH];
-    ErlNifBinary key, data;
-    unsigned mac_sz;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)
-	|| !enif_get_uint(env,argv[2],&mac_sz) || mac_sz > SHA224_DIGEST_LENGTH) {
-	return enif_make_badarg(env);
-    }
-    hmac_sha224(key.data, key.size, data.data, data.size, hmacbuf);
-    memcpy(enif_make_new_binary(env, mac_sz, &ret),
-	   hmacbuf, mac_sz);
-    CONSUME_REDS(env,data);
     return ret;
-#else
-    return atom_notsup;
-#endif
 }
+#endif  /* OPENSSL_VERSION_NUMBER < 1.0 */
 
-static ERL_NIF_TERM sha256_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, Data, MacSize) */
-#ifdef HAVE_SHA256
-    unsigned char hmacbuf[SHA256_DIGEST_LENGTH];
-    ErlNifBinary key, data;
-    unsigned mac_sz;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)
-	|| !enif_get_uint(env,argv[2],&mac_sz) || mac_sz > SHA256_DIGEST_LENGTH) {
-	return enif_make_badarg(env);
-    }
-    hmac_sha256(key.data, key.size, data.data, data.size, hmacbuf);
-    memcpy(enif_make_new_binary(env, mac_sz, &ret),
-	   hmacbuf, mac_sz);
-    CONSUME_REDS(env,data);
-    return ret;
-#else
-    return atom_notsup;
-#endif
-}
+static ERL_NIF_TERM hmac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type, Key, Data) or (Type, Key, Data, MacSize) */
+    struct digest_type_t *digp = NULL;
+    ErlNifBinary         key, data;
+    unsigned char        buff[EVP_MAX_MD_SIZE];
+    unsigned             size = 0, req_size = 0;
+    ERL_NIF_TERM         ret;
 
-static ERL_NIF_TERM sha384_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, Data, MacSize) */
-#ifdef HAVE_SHA384
-    unsigned char hmacbuf[SHA384_DIGEST_LENGTH];
-    ErlNifBinary key, data;
-    unsigned mac_sz;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)
-	|| !enif_get_uint(env,argv[2],&mac_sz) || mac_sz > SHA384_DIGEST_LENGTH) {
-	return enif_make_badarg(env);
+    digp = get_digest_type(argv[0]);
+    if (!digp ||
+        !enif_inspect_iolist_as_binary(env, argv[1], &key) ||
+        !enif_inspect_iolist_as_binary(env, argv[2], &data) ||
+        (argc == 4 && !enif_get_uint(env, argv[3], &req_size))) {
+        return enif_make_badarg(env);
     }
-    hmac_sha384(key.data, key.size, data.data, data.size, hmacbuf);
-    memcpy(enif_make_new_binary(env, mac_sz, &ret),
-	   hmacbuf, mac_sz);
-    CONSUME_REDS(env,data);
-    return ret;
-#else
-    return atom_notsup;
-#endif
-}
 
+    if (!digp->md.p ||
+        !HMAC(digp->md.p,
+              key.data, key.size,
+              data.data, data.size,
+              buff, &size)) {
+        return atom_notsup;
+    }
+    ASSERT(0 < size && size <= EVP_MAX_MD_SIZE);
+    CONSUME_REDS(env, data);
 
-static ERL_NIF_TERM sha512_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, Data, MacSize) */
-#ifdef HAVE_SHA512
-    unsigned char hmacbuf[SHA512_DIGEST_LENGTH];
-    ErlNifBinary key, data;
-    unsigned mac_sz;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)
-	|| !enif_get_uint(env,argv[2],&mac_sz) || mac_sz > SHA512_DIGEST_LENGTH) {
-	return enif_make_badarg(env);
+    if (argc == 4) {
+        if (req_size <= size) {
+            size = req_size;
+        }
+        else {
+            return enif_make_badarg(env);
+        }
     }
-    hmac_sha512(key.data, key.size, data.data, data.size, hmacbuf);
-    memcpy(enif_make_new_binary(env, mac_sz, &ret),
-	   hmacbuf, mac_sz);
-    CONSUME_REDS(env,data);
+    memcpy(enif_make_new_binary(env, size, &ret), buff, size);
     return ret;
-#else
-    return atom_notsup;
-#endif
 }
 
 static void hmac_context_dtor(ErlNifEnv* env, struct hmac_context *obj)
@@ -1455,55 +1236,46 @@ static void hmac_context_dtor(ErlNifEnv* env, struct hmac_context *obj)
     enif_mutex_destroy(obj->mtx);
 }
 
-static ERL_NIF_TERM hmac_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+static ERL_NIF_TERM hmac_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Type, Key) */
-    ErlNifBinary key;
-    struct hmac_context* obj;
-    const EVP_MD *md;
-    ERL_NIF_TERM ret;
-    
-    CHECK_OSE_CRYPTO();
+    struct digest_type_t *digp = NULL;
+    ErlNifBinary         key;
+    ERL_NIF_TERM         ret;
+    struct hmac_context  *obj;
 
-    if (argv[0] == atom_sha) md = EVP_sha1();
-#ifdef HAVE_SHA224
-    else if (argv[0] == atom_sha224) md = EVP_sha224();
-#endif
-#ifdef HAVE_SHA256
-    else if (argv[0] == atom_sha256) md = EVP_sha256();
-#endif
-#ifdef HAVE_SHA384
-    else if (argv[0] == atom_sha384) md = EVP_sha384();
-#endif
-#ifdef HAVE_SHA512
-    else if (argv[0] == atom_sha512) md = EVP_sha512();
-#endif
-    else if (argv[0] == atom_md5) md = EVP_md5();
-    else if (argv[0] == atom_ripemd160) md = EVP_ripemd160();
-    else goto badarg;
-    
-    if (!enif_inspect_iolist_as_binary(env, argv[1], &key)) {
-    badarg:
-	return enif_make_badarg(env);
+    digp = get_digest_type(argv[0]);
+    if (!digp ||
+        !enif_inspect_iolist_as_binary(env, argv[1], &key)) {
+        return enif_make_badarg(env);
+    }
+    if (!digp->md.p) {
+        return atom_notsup;
     }
 
     obj = enif_alloc_resource(hmac_context_rtype, sizeof(struct hmac_context));
     obj->mtx = enif_mutex_create("crypto.hmac");
     obj->alive = 1;
-    HMAC_CTX_init(&obj->ctx);
-    HMAC_Init(&obj->ctx, key.data, key.size, md);
+#if OPENSSL_VERSION_NUMBER >= 0x1000000fL
+    // Check the return value of HMAC_Init: it may fail in FIPS mode
+    // for disabled algorithms
+    if (!HMAC_Init(&obj->ctx, key.data, key.size, digp->md.p)) {
+        enif_release_resource(obj);
+        return atom_notsup;
+    }
+#else
+    HMAC_Init(&obj->ctx, key.data, key.size, digp->md.p);
+#endif
 
     ret = enif_make_resource(env, obj);
     enif_release_resource(obj);
     return ret;
 }
 
-static ERL_NIF_TERM hmac_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+static ERL_NIF_TERM hmac_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Context, Data) */
     ErlNifBinary data;
     struct hmac_context* obj;
     
-    CHECK_OSE_CRYPTO();
-
     if (!enif_get_resource(env, argv[0], hmac_context_rtype, (void**)&obj)
 	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)) {
 	return enif_make_badarg(env);
@@ -1520,7 +1292,7 @@ static ERL_NIF_TERM hmac_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg
     return argv[0];
 }
 
-static ERL_NIF_TERM hmac_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+static ERL_NIF_TERM hmac_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Context) or (Context, HashLen) */
     ERL_NIF_TERM ret;
     struct hmac_context* obj;
@@ -1529,8 +1301,6 @@ static ERL_NIF_TERM hmac_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
     unsigned int req_len = 0;
     unsigned int mac_len;
 
-    CHECK_OSE_CRYPTO();
-    
     if (!enif_get_resource(env,argv[0],hmac_context_rtype, (void**)&obj)
 	|| (argc == 2 && !enif_get_uint(env, argv[1], &req_len))) {
 	return enif_make_badarg(env);
@@ -1557,206 +1327,197 @@ static ERL_NIF_TERM hmac_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
     return ret;
 }
 
-static ERL_NIF_TERM des_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, Ivec, Text, IsEncrypt) */    
-    ErlNifBinary key, ivec, text;
-    DES_key_schedule schedule;
-    DES_cblock ivec_clone; /* writable copy */
-    ERL_NIF_TERM ret;
+static ERL_NIF_TERM block_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type, Key, Ivec, Text, IsEncrypt) or (Type, Key, Text, IsEncrypt) */
+    struct cipher_type_t *cipherp = NULL;
+    const EVP_CIPHER     *cipher;
+    ErlNifBinary         key, ivec, text;
+    EVP_CIPHER_CTX       ctx;
+    ERL_NIF_TERM         ret;
+    unsigned char        *out;
+    int                  ivec_size, out_size = 0;
 
-    CHECK_OSE_CRYPTO();
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key) || key.size != 8
-	|| !enif_inspect_binary(env, argv[1], &ivec) || ivec.size != 8
-	|| !enif_inspect_iolist_as_binary(env, argv[2], &text)
-	|| text.size % 8 != 0) {
-	return enif_make_badarg(env);
+    if (!enif_inspect_iolist_as_binary(env, argv[1], &key)
+        || !(cipherp = get_cipher_type(argv[0], key.size))
+        || !enif_inspect_iolist_as_binary(env, argv[argc - 2], &text)) {
+        return enif_make_badarg(env);
     }
-    memcpy(&ivec_clone, ivec.data, 8);
-    DES_set_key((const_DES_cblock*)key.data, &schedule);
-    DES_ncbc_encrypt(text.data, enif_make_new_binary(env, text.size, &ret),
-		     text.size, &schedule, &ivec_clone, (argv[3] == atom_true));
-    CONSUME_REDS(env,text);
-    return ret;
-}
-
-static ERL_NIF_TERM des_cfb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, Ivec, Text, IsEncrypt) */
-    ErlNifBinary key, ivec, text;
-    DES_key_schedule schedule;
-    DES_cblock ivec_clone; /* writable copy */
-    ERL_NIF_TERM ret;
-
-    CHECK_OSE_CRYPTO();
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key) || key.size != 8
-	|| !enif_inspect_binary(env, argv[1], &ivec) || ivec.size != 8
-	|| !enif_inspect_iolist_as_binary(env, argv[2], &text)) {
-	return enif_make_badarg(env);
+    cipher = cipherp->cipher.p;
+    if (!cipher) {
+        return enif_raise_exception(env, atom_notsup);
     }
-    memcpy(&ivec_clone, ivec.data, 8);
-    DES_set_key((const_DES_cblock*)key.data, &schedule);
-    DES_cfb_encrypt(text.data, enif_make_new_binary(env, text.size, &ret),
-		     8, text.size, &schedule, &ivec_clone, (argv[3] == atom_true));
-    CONSUME_REDS(env,text);
-    return ret;
-}
 
-static ERL_NIF_TERM des_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, Text/Cipher, IsEncrypt) */
-    ErlNifBinary key, text;
-    DES_key_schedule schedule;
-    ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key) || key.size != 8 ||
-	!enif_inspect_iolist_as_binary(env, argv[1], &text) || text.size != 8) {
-	return enif_make_badarg(env);
+    if ((argv[0] == atom_aes_cfb8 || argv[0] == atom_aes_cfb128)
+        && (key.size == 24 || key.size == 32)) {
+        /* Why do EVP_CIPHER_CTX_set_key_length() fail on these key sizes?
+         * Fall back on low level API
+         */
+        return aes_cfb_8_crypt(env, argc-1, argv+1);
     }
-    DES_set_key((const_DES_cblock*)key.data, &schedule);
-    DES_ecb_encrypt((const_DES_cblock*)text.data,
-		    (DES_cblock*)enif_make_new_binary(env, 8, &ret),
-		    &schedule, (argv[2] == atom_true));
-    CONSUME_REDS(env,text);
-    return ret;
-}
 
-static ERL_NIF_TERM des_ede3_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key1, Key2, Key3, IVec, Text/Cipher, IsEncrypt) */    
-    ErlNifBinary key1, key2, key3, ivec, text;
-    DES_key_schedule schedule1, schedule2, schedule3;
-    DES_cblock ivec_clone; /* writable copy */
-    ERL_NIF_TERM ret;
+    ivec_size  = EVP_CIPHER_iv_length(cipher);
 
-    CHECK_OSE_CRYPTO();
+#ifdef HAVE_ECB_IVEC_BUG
+    if (argv[0] == atom_aes_ecb || argv[0] == atom_blowfish_ecb ||
+	argv[0] == atom_des_ecb)
+	ivec_size = 0; /* 0.9.8l returns faulty ivec_size */
+#endif
 
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key1) || key1.size != 8
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &key2) || key2.size != 8
-	|| !enif_inspect_iolist_as_binary(env, argv[2], &key3) || key3.size != 8
-	|| !enif_inspect_binary(env, argv[3], &ivec) || ivec.size != 8
-	|| !enif_inspect_iolist_as_binary(env, argv[4], &text)
-	|| text.size % 8 != 0) {
-	return enif_make_badarg(env);
+    if (text.size % EVP_CIPHER_block_size(cipher) != 0 ||
+        (ivec_size == 0 ? argc != 4
+                      : (argc != 5 ||
+                         !enif_inspect_iolist_as_binary(env, argv[2], &ivec) ||
+                         ivec.size != ivec_size))) {
+        return enif_make_badarg(env);
     }
 
-    memcpy(&ivec_clone, ivec.data, 8);
-    DES_set_key((const_DES_cblock*)key1.data, &schedule1);
-    DES_set_key((const_DES_cblock*)key2.data, &schedule2);
-    DES_set_key((const_DES_cblock*)key3.data, &schedule3);
-    DES_ede3_cbc_encrypt(text.data, enif_make_new_binary(env,text.size,&ret), 
-			 text.size, &schedule1, &schedule2, &schedule3,
-			 &ivec_clone, (argv[5] == atom_true));
-    CONSUME_REDS(env,text);
-    return ret;
-}
+    out = enif_make_new_binary(env, text.size, &ret);
 
-static ERL_NIF_TERM des_ede3_cfb_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key1, Key2, Key3, IVec, Text/Cipher, IsEncrypt) */
-#ifdef HAVE_DES_ede3_cfb_encrypt
-    ErlNifBinary key1, key2, key3, ivec, text;
-    DES_key_schedule schedule1, schedule2, schedule3;
-    DES_cblock ivec_clone; /* writable copy */
-    ERL_NIF_TERM ret;
+    EVP_CIPHER_CTX_init(&ctx);
+    if (!EVP_CipherInit_ex(&ctx, cipher, NULL, NULL, NULL,
+                           (argv[argc - 1] == atom_true)) ||
+        !EVP_CIPHER_CTX_set_key_length(&ctx, key.size) ||
+        !(EVP_CIPHER_type(cipher) != NID_rc2_cbc ||
+          EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_SET_RC2_KEY_BITS, key.size * 8, NULL)) ||
+        !EVP_CipherInit_ex(&ctx, NULL, NULL,
+                           key.data, ivec_size ? ivec.data : NULL, -1) ||
+        !EVP_CIPHER_CTX_set_padding(&ctx, 0)) {
 
-    CHECK_OSE_CRYPTO();
+        EVP_CIPHER_CTX_cleanup(&ctx);
+        return enif_raise_exception(env, atom_notsup);
+    }
 
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key1) || key1.size != 8
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &key2) || key2.size != 8
-	|| !enif_inspect_iolist_as_binary(env, argv[2], &key3) || key3.size != 8
-	|| !enif_inspect_binary(env, argv[3], &ivec) || ivec.size != 8
-	|| !enif_inspect_iolist_as_binary(env, argv[4], &text)) {
-	return enif_make_badarg(env);
+    if (text.size > 0 && /* OpenSSL 0.9.8h asserts text.size > 0 */
+        (!EVP_CipherUpdate(&ctx, out, &out_size, text.data, text.size)
+         || (ASSERT(out_size == text.size), 0)
+         || !EVP_CipherFinal_ex(&ctx, out + out_size, &out_size))) {
+
+        EVP_CIPHER_CTX_cleanup(&ctx);
+        return enif_raise_exception(env, atom_notsup);
     }
+    ASSERT(out_size == 0);
+    EVP_CIPHER_CTX_cleanup(&ctx);
+    CONSUME_REDS(env, text);
 
-    memcpy(&ivec_clone, ivec.data, 8);
-    DES_set_key((const_DES_cblock*)key1.data, &schedule1);
-    DES_set_key((const_DES_cblock*)key2.data, &schedule2);
-    DES_set_key((const_DES_cblock*)key3.data, &schedule3);
-    DES_ede3_cfb_encrypt(text.data, enif_make_new_binary(env,text.size,&ret),
-			 8, text.size, &schedule1, &schedule2, &schedule3,
-			 &ivec_clone, (argv[5] == atom_true));
-    CONSUME_REDS(env,text);
     return ret;
-#else
-    return atom_notsup;
-#endif
 }
 
 static ERL_NIF_TERM aes_cfb_8_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, IVec, Data, IsEncrypt) */    
-    ErlNifBinary key, ivec, text;
-    AES_KEY aes_key;
-    unsigned char ivec_clone[16]; /* writable copy */
-    int new_ivlen = 0;
-    ERL_NIF_TERM ret;
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
-	|| !(key.size == 16 || key.size == 24 || key.size == 32)
-	|| !enif_inspect_binary(env, argv[1], &ivec) || ivec.size != 16
-	|| !enif_inspect_iolist_as_binary(env, argv[2], &text)) {
-	return enif_make_badarg(env);
-    }
-
-    memcpy(ivec_clone, ivec.data, 16);
-    AES_set_encrypt_key(key.data, key.size * 8, &aes_key);
-    AES_cfb8_encrypt((unsigned char *) text.data,
-		       enif_make_new_binary(env, text.size, &ret), 
-		       text.size, &aes_key, ivec_clone, &new_ivlen,
-		       (argv[3] == atom_true));
-    CONSUME_REDS(env,text);
-    return ret;
+{/* (Key, IVec, Data, IsEncrypt) */
+     ErlNifBinary key, ivec, text;
+     AES_KEY aes_key;
+     unsigned char ivec_clone[16]; /* writable copy */
+     int new_ivlen = 0;
+     ERL_NIF_TERM ret;
+
+     if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
+         || !(key.size == 16 || key.size == 24 || key.size == 32)
+         || !enif_inspect_binary(env, argv[1], &ivec) || ivec.size != 16
+         || !enif_inspect_iolist_as_binary(env, argv[2], &text)) {
+         return enif_make_badarg(env);
+     }
+
+     memcpy(ivec_clone, ivec.data, 16);
+     AES_set_encrypt_key(key.data, key.size * 8, &aes_key);
+     AES_cfb8_encrypt((unsigned char *) text.data,
+                      enif_make_new_binary(env, text.size, &ret),
+                      text.size, &aes_key, ivec_clone, &new_ivlen,
+                      (argv[3] == atom_true));
+     CONSUME_REDS(env,text);
+     return ret;
 }
 
-static ERL_NIF_TERM aes_cfb_128_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, IVec, Data, IsEncrypt) */    
-    ErlNifBinary key, ivec, text;
+static ERL_NIF_TERM aes_ige_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, IVec, Data, IsEncrypt) */
+#ifdef HAVE_AES_IGE
+    ErlNifBinary key_bin, ivec_bin, data_bin;
     AES_KEY aes_key;
-    unsigned char ivec_clone[16]; /* writable copy */
-    int new_ivlen = 0;
+    unsigned char ivec[32];
+    int i;
+    unsigned char* ret_ptr;
     ERL_NIF_TERM ret;
 
-    CHECK_OSE_CRYPTO();
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
+       || (key_bin.size != 16 && key_bin.size != 32)
+       || !enif_inspect_binary(env, argv[1], &ivec_bin)
+       || ivec_bin.size != 32
+       || !enif_inspect_iolist_as_binary(env, argv[2], &data_bin)
+       || data_bin.size % 16 != 0) {
+
+       return enif_make_badarg(env);
+    }
 
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
-	|| !(key.size == 16 || key.size == 24 || key.size == 32)
-	|| !enif_inspect_binary(env, argv[1], &ivec) || ivec.size != 16
-	|| !enif_inspect_iolist_as_binary(env, argv[2], &text)) {
-	return enif_make_badarg(env);
+    if (argv[3] == atom_true) {
+       i = AES_ENCRYPT;
+       AES_set_encrypt_key(key_bin.data, key_bin.size*8, &aes_key);
+    }
+    else {
+       i = AES_DECRYPT;
+       AES_set_decrypt_key(key_bin.data, key_bin.size*8, &aes_key);
     }
 
-    memcpy(ivec_clone, ivec.data, 16);
-    AES_set_encrypt_key(key.data, key.size * 8, &aes_key);
-    AES_cfb128_encrypt((unsigned char *) text.data,
-		       enif_make_new_binary(env, text.size, &ret), 
-		       text.size, &aes_key, ivec_clone, &new_ivlen,
-		       (argv[3] == atom_true));
-    CONSUME_REDS(env,text);
+    ret_ptr = enif_make_new_binary(env, data_bin.size, &ret);
+    memcpy(ivec, ivec_bin.data, 32); /* writable copy */
+    AES_ige_encrypt(data_bin.data, ret_ptr, data_bin.size, &aes_key, ivec, i);
+    CONSUME_REDS(env,data_bin);
     return ret;
+#else
+    return atom_notsup;
+#endif
 }
 
 /* Common for both encrypt and decrypt
 */
 static ERL_NIF_TERM aes_ctr_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Key, IVec, Data) */    
-    ErlNifBinary key, ivec, text;
-    AES_KEY aes_key;
-    unsigned char ivec_clone[16]; /* writable copy */
-    unsigned char ecount_buf[AES_BLOCK_SIZE];
-    unsigned int num = 0;
-    ERL_NIF_TERM ret;
-
-    CHECK_OSE_CRYPTO();
+    ErlNifBinary     key, ivec, text;
+#ifdef HAVE_EVP_AES_CTR
+    const EVP_CIPHER *cipher;
+    EVP_CIPHER_CTX   ctx;
+    unsigned char    *out;
+    int              outl = 0;
+#else
+    AES_KEY          aes_key;
+    unsigned char    ivec_clone[16]; /* writable copy */
+    unsigned char    ecount_buf[AES_BLOCK_SIZE];
+    unsigned int     num = 0;
+#endif
+    ERL_NIF_TERM     ret;
 
     if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
+#ifndef HAVE_EVP_AES_CTR
 	|| AES_set_encrypt_key(key.data, key.size*8, &aes_key) != 0
+#endif
 	|| !enif_inspect_binary(env, argv[1], &ivec) || ivec.size != 16
 	|| !enif_inspect_iolist_as_binary(env, argv[2], &text)) {
 	return enif_make_badarg(env);
     }
+#ifdef HAVE_EVP_AES_CTR
+    switch (key.size)
+    {
+    case 16: cipher = EVP_aes_128_ctr(); break;
+    case 24: cipher = EVP_aes_192_ctr(); break;
+    case 32: cipher = EVP_aes_256_ctr(); break;
+    default: return enif_make_badarg(env);
+    }
+
+    out = enif_make_new_binary(env,text.size,&ret);
+    EVP_CIPHER_CTX_init(&ctx);
+    EVP_CipherInit_ex(&ctx, cipher, NULL,
+                      key.data, ivec.data, (argv[3] == atom_true));
+    EVP_CIPHER_CTX_set_padding(&ctx, 0);
+    EVP_CipherUpdate(&ctx, out, &outl, text.data, text.size);
+    ASSERT(outl == text.size);
+    EVP_CipherFinal_ex(&ctx, out + outl, &outl);
+    ASSERT(outl == 0);
+    EVP_CIPHER_CTX_cleanup(&ctx);
+#else
     memcpy(ivec_clone, ivec.data, 16);    
     memset(ecount_buf, 0, sizeof(ecount_buf));
     AES_ctr128_encrypt((unsigned char *) text.data,
 		       enif_make_new_binary(env, text.size, &ret), 
 		       text.size, &aes_key, ivec_clone, ecount_buf, &num);
+#endif
     CONSUME_REDS(env,text);
 
     /* To do an incremental {en|de}cryption, the state to to keep between calls
@@ -1766,6 +1527,81 @@ static ERL_NIF_TERM aes_ctr_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 
 /* Initializes state for ctr streaming (de)encryption
 */
+#ifdef HAVE_EVP_AES_CTR
+static ERL_NIF_TERM aes_ctr_stream_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, IVec) */
+    ErlNifBinary     key_bin, ivec_bin;
+    EVP_CIPHER_CTX   *ctx;
+    const EVP_CIPHER *cipher;
+    ERL_NIF_TERM     ret;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
+        || !enif_inspect_binary(env, argv[1], &ivec_bin)
+        || ivec_bin.size != 16) {
+        return enif_make_badarg(env);
+    }
+
+    switch (key_bin.size)
+    {
+    case 16: cipher = EVP_aes_128_ctr(); break;
+    case 24: cipher = EVP_aes_192_ctr(); break;
+    case 32: cipher = EVP_aes_256_ctr(); break;
+    default: return enif_make_badarg(env);
+    }
+
+    ctx = enif_alloc_resource(evp_cipher_ctx_rtype, sizeof(EVP_CIPHER_CTX));
+    EVP_CIPHER_CTX_init(ctx);
+    EVP_CipherInit_ex(ctx, cipher, NULL,
+                      key_bin.data, ivec_bin.data, 1);
+    EVP_CIPHER_CTX_set_padding(ctx, 0);
+    ret = enif_make_resource(env, ctx);
+    enif_release_resource(ctx);
+    return ret;
+}
+static ERL_NIF_TERM aes_ctr_stream_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context, Data) */
+    EVP_CIPHER_CTX *ctx, *new_ctx;
+    ErlNifBinary   data_bin;
+    ERL_NIF_TERM   ret, cipher_term;
+    unsigned char  *out;
+    int            outl = 0;
+
+    if (!enif_get_resource(env, argv[0], evp_cipher_ctx_rtype, (void**)&ctx)
+        || !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
+        return enif_make_badarg(env);
+    }
+    new_ctx = enif_alloc_resource(evp_cipher_ctx_rtype, sizeof(EVP_CIPHER_CTX));
+    EVP_CIPHER_CTX_init(new_ctx);
+    EVP_CIPHER_CTX_copy(new_ctx, ctx);
+    out = enif_make_new_binary(env, data_bin.size, &cipher_term);
+    EVP_CipherUpdate(new_ctx, out, &outl, data_bin.data, data_bin.size);
+    ASSERT(outl == data_bin.size);
+
+    ret = enif_make_tuple2(env, enif_make_resource(env, new_ctx), cipher_term);
+    enif_release_resource(new_ctx);
+    CONSUME_REDS(env,data_bin);
+    return ret;
+}
+
+#else /* if not HAVE_EVP_AES_CTR */
+
+static ERL_NIF_TERM aes_ctr_stream_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, IVec) */
+    ErlNifBinary key_bin, ivec_bin;
+    ERL_NIF_TERM ecount_bin;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
+        || !enif_inspect_binary(env, argv[1], &ivec_bin)
+        || !(key_bin.size == 16 || key_bin.size == 24 || key_bin.size ==32)
+        || ivec_bin.size != 16) {
+        return enif_make_badarg(env);
+    }
+
+    memset(enif_make_new_binary(env, AES_BLOCK_SIZE, &ecount_bin),
+           0, AES_BLOCK_SIZE);
+    return enif_make_tuple4(env, argv[0], argv[1], ecount_bin, enif_make_int(env, 0));
+}
+
 static ERL_NIF_TERM aes_ctr_stream_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* ({Key, IVec, ECount, Num}, Data) */    
     ErlNifBinary key_bin, ivec_bin, text_bin, ecount_bin;
@@ -1777,8 +1613,6 @@ static ERL_NIF_TERM aes_ctr_stream_encrypt(ErlNifEnv* env, int argc, const ERL_N
     unsigned char * ivec2_buf;
     unsigned char * ecount2_buf;
 
-    CHECK_OSE_CRYPTO();
-
     if (!enif_get_tuple(env, argv[0], &state_arity, &state_term)
         || state_arity != 4
         || !enif_inspect_iolist_as_binary(env, state_term[0], &key_bin)
@@ -1806,70 +1640,86 @@ static ERL_NIF_TERM aes_ctr_stream_encrypt(ErlNifEnv* env, int argc, const ERL_N
     CONSUME_REDS(env,text_bin);
     return ret;
 }
+#endif /* !HAVE_EVP_AES_CTR */
 
 static ERL_NIF_TERM aes_gcm_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Key,Iv,AAD,In) */
 #if defined(HAVE_GCM)
-    GCM128_CONTEXT *ctx = NULL;
+    EVP_CIPHER_CTX ctx;
+    const EVP_CIPHER *cipher = NULL;
     ErlNifBinary key, iv, aad, in;
-    AES_KEY aes_key;
-    unsigned char *outp;
+    unsigned char *outp, *tagp;
     ERL_NIF_TERM out, out_tag;
-
-    CHECK_OSE_CRYPTO();
+    int len;
 
     if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
-	|| AES_set_encrypt_key(key.data, key.size*8, &aes_key) != 0
+	|| (key.size != 16 && key.size != 24 && key.size != 32)
 	|| !enif_inspect_binary(env, argv[1], &iv) || iv.size == 0
 	|| !enif_inspect_iolist_as_binary(env, argv[2], &aad)
 	|| !enif_inspect_iolist_as_binary(env, argv[3], &in)) {
 	return enif_make_badarg(env);
     }
 
-    if (!(ctx = CRYPTO_gcm128_new(&aes_key, (block128_f)AES_encrypt)))
-	return atom_error;
+    if (key.size == 16)
+        cipher = EVP_aes_128_gcm();
+    else if (key.size == 24)
+        cipher = EVP_aes_192_gcm();
+    else if (key.size == 32)
+        cipher = EVP_aes_256_gcm();
 
-    CRYPTO_gcm128_setiv(ctx, iv.data, iv.size);
+    EVP_CIPHER_CTX_init(&ctx);
 
-    if (CRYPTO_gcm128_aad(ctx, aad.data, aad.size))
-	goto out_err;
+    if (EVP_EncryptInit_ex(&ctx, cipher, NULL, NULL, NULL) != 1)
+        goto out_err;
+
+    EVP_CIPHER_CTX_set_padding(&ctx, 0);
+
+    if (EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size, NULL) != 1)
+        goto out_err;
+    if (EVP_EncryptInit_ex(&ctx, NULL, NULL, key.data, iv.data) != 1)
+        goto out_err;
+    if (EVP_EncryptUpdate(&ctx, NULL, &len, aad.data, aad.size) != 1)
+        goto out_err;
 
     outp = enif_make_new_binary(env, in.size, &out);
 
-    /* encrypt */
-    if (CRYPTO_gcm128_encrypt(ctx, in.data, outp, in.size))
-	goto out_err;
+    if (EVP_EncryptUpdate(&ctx, outp, &len, in.data, in.size) != 1)
+        goto out_err;
+    if (EVP_EncryptFinal_ex(&ctx, outp+len, &len) != 1)
+        goto out_err;
 
-    /* calculate the tag */
-    CRYPTO_gcm128_tag(ctx, enif_make_new_binary(env, EVP_GCM_TLS_TAG_LEN, &out_tag), EVP_GCM_TLS_TAG_LEN);
-    CRYPTO_gcm128_release(ctx);
+    tagp = enif_make_new_binary(env, EVP_GCM_TLS_TAG_LEN, &out_tag);
+
+    if (EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_GET_TAG, EVP_GCM_TLS_TAG_LEN, tagp) != 1)
+        goto out_err;
+
+    EVP_CIPHER_CTX_cleanup(&ctx);
 
     CONSUME_REDS(env, in);
 
     return enif_make_tuple2(env, out, out_tag);
 
 out_err:
-    CRYPTO_gcm128_release(ctx);
+    EVP_CIPHER_CTX_cleanup(&ctx);
     return atom_error;
 
 #else
-    return atom_notsup;
+    return enif_raise_exception(env, atom_notsup);
 #endif
 }
 
 static ERL_NIF_TERM aes_gcm_decrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Key,Iv,AAD,In,Tag) */
 #if defined(HAVE_GCM)
-    GCM128_CONTEXT *ctx;
+    EVP_CIPHER_CTX ctx;
+    const EVP_CIPHER *cipher = NULL;
     ErlNifBinary key, iv, aad, in, tag;
-    AES_KEY aes_key;
     unsigned char *outp;
     ERL_NIF_TERM out;
-
-    CHECK_OSE_CRYPTO();
+    int len;
 
     if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
-        || AES_set_encrypt_key(key.data, key.size*8, &aes_key) != 0
+	|| (key.size != 16 && key.size != 24 && key.size != 32)
 	|| !enif_inspect_binary(env, argv[1], &iv) || iv.size == 0
 	|| !enif_inspect_iolist_as_binary(env, argv[2], &aad)
 	|| !enif_inspect_iolist_as_binary(env, argv[3], &in)
@@ -1877,34 +1727,45 @@ static ERL_NIF_TERM aes_gcm_decrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 	return enif_make_badarg(env);
     }
 
-    if (!(ctx = CRYPTO_gcm128_new(&aes_key, (block128_f)AES_encrypt)))
-	return atom_error;
+    if (key.size == 16)
+        cipher = EVP_aes_128_gcm();
+    else if (key.size == 24)
+        cipher = EVP_aes_192_gcm();
+    else if (key.size == 32)
+        cipher = EVP_aes_256_gcm();
 
-    CRYPTO_gcm128_setiv(ctx, iv.data, iv.size);
+    EVP_CIPHER_CTX_init(&ctx);
 
-    if (CRYPTO_gcm128_aad(ctx, aad.data, aad.size))
-	goto out_err;
+    if (EVP_DecryptInit_ex(&ctx, cipher, NULL, NULL, NULL) != 1)
+        goto out_err;
+    if (EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size, NULL) != 1)
+        goto out_err;
+    if (EVP_DecryptInit_ex(&ctx, NULL, NULL, key.data, iv.data) != 1)
+        goto out_err;
+    if (EVP_DecryptUpdate(&ctx, NULL, &len, aad.data, aad.size) != 1)
+        goto out_err;
 
     outp = enif_make_new_binary(env, in.size, &out);
 
-    /* decrypt */
-    if (CRYPTO_gcm128_decrypt(ctx, in.data, outp, in.size))
-	    goto out_err;
+    if (EVP_DecryptUpdate(&ctx, outp, &len, in.data, in.size) != 1)
+        goto out_err;
+    if (EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_SET_TAG, EVP_GCM_TLS_TAG_LEN, tag.data) != 1)
+        goto out_err;
+    if (EVP_DecryptFinal_ex(&ctx, outp+len, &len) != 1)
+        goto out_err;
 
-    /* calculate and check the tag */
-    if (CRYPTO_gcm128_finish(ctx, tag.data, EVP_GCM_TLS_TAG_LEN))
-	    goto out_err;
+    EVP_CIPHER_CTX_cleanup(&ctx);
 
-    CRYPTO_gcm128_release(ctx);
     CONSUME_REDS(env, in);
 
     return out;
 
 out_err:
-    CRYPTO_gcm128_release(ctx);
+    EVP_CIPHER_CTX_cleanup(&ctx);
     return atom_error;
+
 #else
-    return atom_notsup;
+    return enif_raise_exception(env, atom_notsup);
 #endif
 }
 
@@ -1937,8 +1798,6 @@ static ERL_NIF_TERM chacha20_poly1305_encrypt(ErlNifEnv* env, int argc, const ER
     unsigned char poly1305_key[32];
     poly1305_state poly1305;
 
-    CHECK_OSE_CRYPTO();
-
     if (!enif_inspect_iolist_as_binary(env, argv[0], &key) || key.size != 32
 	|| !enif_inspect_binary(env, argv[1], &iv) || iv.size != CHACHA20_NONCE_LEN
 	|| !enif_inspect_iolist_as_binary(env, argv[2], &aad)
@@ -1976,7 +1835,7 @@ static ERL_NIF_TERM chacha20_poly1305_encrypt(ErlNifEnv* env, int argc, const ER
     return enif_make_tuple2(env, out, out_tag);
 
 #else
-    return atom_notsup;
+    return enif_raise_exception(env, atom_notsup);
 #endif
 }
 
@@ -1991,8 +1850,6 @@ static ERL_NIF_TERM chacha20_poly1305_decrypt(ErlNifEnv* env, int argc, const ER
     unsigned char mac[POLY1305_TAG_LEN];
     poly1305_state poly1305;
 
-    CHECK_OSE_CRYPTO();
-
     if (!enif_inspect_iolist_as_binary(env, argv[0], &key) || key.size != 32
 	|| !enif_inspect_binary(env, argv[1], &iv) || iv.size != CHACHA20_NONCE_LEN
 	|| !enif_inspect_iolist_as_binary(env, argv[2], &aad)
@@ -2033,51 +1890,16 @@ static ERL_NIF_TERM chacha20_poly1305_decrypt(ErlNifEnv* env, int argc, const ER
 
     return out;
 #else
-    return atom_notsup;
+    return enif_raise_exception(env, atom_notsup);
 #endif
 }
 
-static ERL_NIF_TERM aes_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, Data, IsEncrypt) */    
-    ErlNifBinary key_bin, data_bin;
-    AES_KEY aes_key;
-    int i;
-    int j;
-    unsigned char* ret_ptr;
-    ERL_NIF_TERM ret;    
-
-    CHECK_OSE_CRYPTO();
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
-    || (key_bin.size != 16 && key_bin.size != 32)
-    || !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)
-    || data_bin.size % 16 != 0) {
-    return enif_make_badarg(env);
-    }
-
-    if (argv[2] == atom_true) {
-        i = AES_ENCRYPT;
-        AES_set_encrypt_key(key_bin.data, key_bin.size*8, &aes_key);
-    }
-    else {
-        i = AES_DECRYPT;
-        AES_set_decrypt_key(key_bin.data, key_bin.size*8, &aes_key);
-    }
-
-    ret_ptr = enif_make_new_binary(env, data_bin.size, &ret);
-    for (j = 0; j < data_bin.size; j += 16) {
-	AES_ecb_encrypt(data_bin.data+j, ret_ptr+j, &aes_key, i);
-    }
-    CONSUME_REDS(env,data_bin);
-    return ret;
-}
-
 static ERL_NIF_TERM rand_bytes_1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Bytes) */     
     unsigned bytes;
     unsigned char* data;
     ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
+
     if (!enif_get_uint(env, argv[0], &bytes)) {
 	return enif_make_badarg(env);
     }
@@ -2091,7 +1913,7 @@ static ERL_NIF_TERM strong_rand_bytes_nif(ErlNifEnv* env, int argc, const ERL_NI
     unsigned bytes;
     unsigned char* data;
     ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
+
     if (!enif_get_uint(env, argv[0], &bytes)) {
 	return enif_make_badarg(env);
     }
@@ -2109,7 +1931,7 @@ static ERL_NIF_TERM rand_bytes_3(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
     unsigned char* data;
     unsigned top_mask, bot_mask;
     ERL_NIF_TERM ret;
-    CHECK_OSE_CRYPTO();
+
     if (!enif_get_uint(env, argv[0], &bytes)
 	|| !enif_get_uint(env, argv[1], &top_mask)
 	|| !enif_get_uint(env, argv[2], &bot_mask)) {
@@ -2133,8 +1955,6 @@ static ERL_NIF_TERM strong_rand_mpint_nif(ErlNifEnv* env, int argc, const ERL_NI
     unsigned dlen;
     ERL_NIF_TERM ret;
 
-    CHECK_OSE_CRYPTO();
-
     if (!enif_get_uint(env, argv[0], &bits)
 	|| !enif_get_int(env, argv[1], &top)
 	|| !enif_get_int(env, argv[2], &bottom)) {
@@ -2203,8 +2023,6 @@ static ERL_NIF_TERM rand_uniform_nif(ErlNifEnv* env, int argc, const ERL_NIF_TER
     unsigned dlen;
     ERL_NIF_TERM ret;
 
-    CHECK_OSE_CRYPTO();
-
     if (!get_bn_from_mpint(env, argv[0], &bn_from)
 	|| !get_bn_from_mpint(env, argv[1], &bn_rand)) {
 	if (bn_from) BN_free(bn_from);
@@ -2236,8 +2054,6 @@ static ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg
     unsigned extra_byte;
     ERL_NIF_TERM ret;
 
-    CHECK_OSE_CRYPTO();
-
     if (!get_bn_from_bin(env, argv[0], &bn_base)
 	|| !get_bn_from_bin(env, argv[1], &bn_exponent)
 	|| !get_bn_from_bin(env, argv[2], &bn_modulo)
@@ -2269,46 +2085,17 @@ static ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg
 }
 
 static ERL_NIF_TERM dss_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (DigestType|none, Data|{digest,Digest}, Signature,Key=[P, Q, G, Y]) */
-    ErlNifBinary data_bin, sign_bin;
+{/* (sha, Digest, Signature,Key=[P, Q, G, Y]) */
+    ErlNifBinary digest_bin, sign_bin;
     BIGNUM *dsa_p = NULL, *dsa_q = NULL, *dsa_g = NULL, *dsa_y = NULL;
-    unsigned char hmacbuf[SHA_DIGEST_LENGTH];
-    unsigned char* digest;
     ERL_NIF_TERM head, tail;
-    const ERL_NIF_TERM* tpl_terms;
-    int tpl_arity;
     DSA *dsa;
     int i;
 
-    CHECK_OSE_CRYPTO();
-
-    if (argv[0] == atom_sha) {
-	if (enif_get_tuple(env, argv[1], &tpl_arity, &tpl_terms)) {
-	    if (tpl_arity != 2 || tpl_terms[0] != atom_digest
-		|| !enif_inspect_binary(env, tpl_terms[1], &data_bin)
-		|| data_bin.size != SHA_DIGEST_LENGTH) {
-
-		return enif_make_badarg(env);
-	    }
-	    digest = data_bin.data;
-	}
-	else {
-	    if (!enif_inspect_binary(env, argv[1], &data_bin)) {
-		return enif_make_badarg(env);
-	    }
-	    SHA1(data_bin.data, data_bin.size, hmacbuf);
-	    digest = hmacbuf;
-	}
-    }
-    else if (argv[0] == atom_none && enif_inspect_binary(env, argv[1], &data_bin)
-	     && data_bin.size == SHA_DIGEST_LENGTH) {
-	digest = data_bin.data;
-    }
-    else {
-	return enif_make_badarg(env);
-    }
-
-    if (!enif_inspect_binary(env, argv[2], &sign_bin)
+    if (!argv[0] == atom_sha
+        || !enif_inspect_binary(env, argv[1], &digest_bin)
+        || digest_bin.size != SHA_DIGEST_LENGTH
+        || !enif_inspect_binary(env, argv[2], &sign_bin)
 	|| !enif_get_list_cell(env, argv[3], &head, &tail)
 	|| !get_bn_from_bin(env, head, &dsa_p)
 	|| !enif_get_list_cell(env, tail, &head, &tail)
@@ -2332,136 +2119,86 @@ static ERL_NIF_TERM dss_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
     dsa->g = dsa_g;
     dsa->priv_key = NULL;
     dsa->pub_key = dsa_y;
-    i =  DSA_verify(0, digest, SHA_DIGEST_LENGTH,
+    i =  DSA_verify(0, digest_bin.data, SHA_DIGEST_LENGTH,
 		    sign_bin.data, sign_bin.size, dsa);
     DSA_free(dsa);
     return(i > 0) ? atom_true : atom_false;
 }
 
-
-static void md5_digest(unsigned char* in, unsigned int in_len, unsigned char* out)
-{
-    MD5(in, in_len, out);
-}
-static void sha1_digest(unsigned char* in, unsigned int in_len, unsigned char* out)
-{
-    SHA1(in, in_len, out);
-}
-#ifdef HAVE_SHA224
-static void sha224_digest(unsigned char* in, unsigned int in_len, unsigned char* out)
-{
-    SHA224(in, in_len, out);
-}
-#endif
-#ifdef HAVE_SHA256
-static void sha256_digest(unsigned char* in, unsigned int in_len, unsigned char* out)
-{
-    SHA256(in, in_len, out);
-}
-#endif
-#ifdef HAVE_SHA384
-static void sha384_digest(unsigned char* in, unsigned int in_len, unsigned char* out)
-{
-    SHA384(in, in_len, out);
-}
-#endif
-#ifdef HAVE_SHA512
-static void sha512_digest(unsigned char* in, unsigned int in_len, unsigned char* out)
-{
-    SHA512(in, in_len, out);
-}
-#endif
-
-struct digest_type_t {
-    const char* type_str;
-    unsigned len; /* 0 if notsup */
-    int NID_type;
-    void (*funcp)(unsigned char* in, unsigned int in_len, unsigned char* out);
-    ERL_NIF_TERM type_atom;
-};
-
-struct digest_type_t digest_types[] =
-{
-    {"md5", MD5_DIGEST_LENGTH, NID_md5, md5_digest},
-    {"sha", SHA_DIGEST_LENGTH, NID_sha1, sha1_digest},
-    {"sha224",
-#ifdef HAVE_SHA224
-     SHA224_LEN, NID_sha224, sha224_digest
-#else
-      0
-#endif
-    },
-    {"sha256",
-#ifdef HAVE_SHA256
-     SHA256_LEN, NID_sha256, sha256_digest
-#else
-      0
-#endif
-    },
-    {"sha384",
-#ifdef HAVE_SHA384
-     SHA384_LEN, NID_sha384, sha384_digest
-#else
-     0
-#endif
-    },
-    {"sha512",
-#ifdef HAVE_SHA512
-     SHA512_LEN, NID_sha512, sha512_digest
-#else
-     0
-#endif
-    },
-    {NULL}
-};
-
 static void init_digest_types(ErlNifEnv* env)
 {
     struct digest_type_t* p = digest_types;
 
-    for (p = digest_types; p->type_str; p++) {
-	p->type_atom = enif_make_atom(env, p->type_str);
+    for (p = digest_types; p->type.str; p++) {
+	p->type.atom = enif_make_atom(env, p->type.str);
+	if (p->md.funcp)
+	    p->md.p = p->md.funcp();
     }
+    p->type.atom = atom_false;  /* end marker */
+}
 
+static void init_cipher_types(ErlNifEnv* env)
+{
+    struct cipher_type_t* p = cipher_types;
+
+    for (p = cipher_types; p->type.str; p++) {
+	p->type.atom = enif_make_atom(env, p->type.str);
+	if (p->cipher.funcp)
+	    p->cipher.p = p->cipher.funcp();
+    }
+    p->type.atom = atom_false; /* end marker */
 }
 
 static struct digest_type_t* get_digest_type(ERL_NIF_TERM type)
 {
     struct digest_type_t* p = NULL;
-    for (p = digest_types; p->type_str; p++) {
-	if (type == p->type_atom) {
+    for (p = digest_types; p->type.atom != atom_false; p++) {
+	if (type == p->type.atom) {
 	    return p;
 	}
     }
     return NULL;
 }
 
-static ERL_NIF_TERM rsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Data|{digest,Digest}, Signature, Key=[E,N]) */
-    ErlNifBinary data_bin, sign_bin;
-    unsigned char hmacbuf[SHA512_LEN];
-    ERL_NIF_TERM head, tail, ret;
-    int i;
-    RSA* rsa;
-    const ERL_NIF_TERM type = argv[0];
-    const ERL_NIF_TERM* tpl_terms;
-    int tpl_arity;
-    struct digest_type_t* digp = NULL;
-    unsigned char* digest = NULL;
+static struct cipher_type_t* get_cipher_type(ERL_NIF_TERM type, size_t key_len)
+{
+    struct cipher_type_t* p = NULL;
+    for (p = cipher_types; p->type.atom != atom_false; p++) {
+	if (type == p->type.atom && (!p->key_len || key_len == p->key_len)) {
+	    return p;
+	}
+    }
+    return NULL;
+}
 
-    CHECK_OSE_CRYPTO();
+static ERL_NIF_TERM rsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type, Digest, Signature, Key=[E,N]) */
+    ErlNifBinary         digest_bin, sign_bin;
+    ERL_NIF_TERM         head, tail, ret;
+    int                  i;
+    RSA                  *rsa;
+#if OPENSSL_VERSION_NUMBER >= 0x1000000fL
+    EVP_PKEY             *pkey;
+    EVP_PKEY_CTX         *ctx;
+#endif
+    const EVP_MD         *md;
+    const ERL_NIF_TERM   type = argv[0];
+    struct digest_type_t *digp = NULL;
 
     digp = get_digest_type(type);
     if (!digp) {
 	return enif_make_badarg(env);
     }
-    if (!digp->len) {
+    md = digp->md.p;
+    if (!md) {
 	return atom_notsup;
     }
 
     rsa = RSA_new();
 
-    if (!enif_inspect_binary(env, argv[2], &sign_bin)
+    if (!enif_inspect_binary(env, argv[1], &digest_bin)
+        || digest_bin.size != EVP_MD_size(md)
+        || !enif_inspect_binary(env, argv[2], &sign_bin)
 	|| !enif_get_list_cell(env, argv[3], &head, &tail)
 	|| !get_bn_from_bin(env, head, &rsa->e)
 	|| !enif_get_list_cell(env, tail, &head, &tail)
@@ -2471,27 +2208,24 @@ static ERL_NIF_TERM rsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 	ret = enif_make_badarg(env);
 	goto done;
     }
-    if (enif_get_tuple(env, argv[1], &tpl_arity, &tpl_terms)) {
-	if (tpl_arity != 2 || tpl_terms[0] != atom_digest
-	    || !enif_inspect_binary(env, tpl_terms[1], &data_bin)
-	    || data_bin.size != digp->len) {
 
-	    ret = enif_make_badarg(env);
-	    goto done;
-	}
-	digest = data_bin.data;
-    }
-    else if (enif_inspect_binary(env, argv[1], &data_bin)) {
-	digest = hmacbuf;
-	digp->funcp(data_bin.data, data_bin.size, digest);
-    }
-    else {
-	ret = enif_make_badarg(env);
-	goto done;
-    }
-
-    i = RSA_verify(digp->NID_type, digest, digp->len,
+#if OPENSSL_VERSION_NUMBER >= 0x1000000fL
+    pkey = EVP_PKEY_new();
+    EVP_PKEY_set1_RSA(pkey, rsa);
+
+    ctx = EVP_PKEY_CTX_new(pkey, NULL);
+    EVP_PKEY_verify_init(ctx);
+    EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PADDING);
+    EVP_PKEY_CTX_set_signature_md(ctx, md);
+
+    i = EVP_PKEY_verify(ctx, sign_bin.data, sign_bin.size,
+                        digest_bin.data, digest_bin.size);
+    EVP_PKEY_CTX_free(ctx);
+    EVP_PKEY_free(pkey);
+#else
+    i = RSA_verify(md->type, digest_bin.data, EVP_MD_size(md),
 		   sign_bin.data, sign_bin.size, rsa);
+#endif
 
     ret = (i==1 ? atom_true : atom_false);
 
@@ -2500,109 +2234,6 @@ done:
     return ret;
 }
 
-
-static ERL_NIF_TERM aes_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, IVec, Data, IsEncrypt) */
-    ErlNifBinary key_bin, ivec_bin, data_bin;
-    unsigned char ivec[16];
-    int enc, i = 0, outlen = 0;
-    EVP_CIPHER_CTX ctx;
-    const EVP_CIPHER *cipher = NULL;
-    unsigned char* ret_ptr;
-    ERL_NIF_TERM ret;
-
-    CHECK_OSE_CRYPTO();
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
-	|| (key_bin.size != 16 && key_bin.size != 32)
-	|| !enif_inspect_binary(env, argv[1], &ivec_bin)
-	|| ivec_bin.size != 16
-	|| !enif_inspect_iolist_as_binary(env, argv[2], &data_bin)
-	|| data_bin.size % 16 != 0) {
-
-	return enif_make_badarg(env);
-    }
-
-    if (argv[3] == atom_true)
-	enc = 1;
-    else
-	enc = 0;
-
-    EVP_CIPHER_CTX_init(&ctx);
-
-    if (key_bin.size == 16)
-	cipher = EVP_aes_128_cbc();
-    else if (key_bin.size == 32)
-	cipher = EVP_aes_256_cbc();
-
-    memcpy(ivec, ivec_bin.data, 16); /* writeable copy */
-
-    /* openssl docs say we need to leave at least 3 blocks available
-       at the end of the buffer for EVP calls. let's be safe */
-    ret_ptr = enif_make_new_binary(env, data_bin.size + 16*3, &ret);
-
-    if (EVP_CipherInit_ex(&ctx, cipher, NULL, key_bin.data, ivec, enc) != 1)
-	return enif_make_badarg(env);
-
-    /* disable padding, we only handle whole blocks */
-    EVP_CIPHER_CTX_set_padding(&ctx, 0);
-
-    if (EVP_CipherUpdate(&ctx, ret_ptr, &i, data_bin.data, data_bin.size) != 1)
-	return enif_make_badarg(env);
-    outlen += i;
-    if (EVP_CipherFinal_ex(&ctx, ret_ptr + outlen, &i) != 1)
-	return enif_make_badarg(env);
-    outlen += i;
-
-    EVP_CIPHER_CTX_cleanup(&ctx);
-
-    CONSUME_REDS(env,data_bin);
-
-    /* the garbage collector is going to love this */
-    return enif_make_sub_binary(env, ret, 0, outlen);
-}
-
-static ERL_NIF_TERM aes_ige_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, IVec, Data, IsEncrypt) */
-#ifdef HAVE_AES_IGE
-    ErlNifBinary key_bin, ivec_bin, data_bin;
-    AES_KEY aes_key;
-    unsigned char ivec[32];
-    int i;
-    unsigned char* ret_ptr;
-    ERL_NIF_TERM ret;
-
-    CHECK_OSE_CRYPTO();
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
-       || (key_bin.size != 16 && key_bin.size != 32)
-       || !enif_inspect_binary(env, argv[1], &ivec_bin)
-       || ivec_bin.size != 32
-       || !enif_inspect_iolist_as_binary(env, argv[2], &data_bin)
-       || data_bin.size % 16 != 0) {
-
-       return enif_make_badarg(env);
-    }
-
-    if (argv[3] == atom_true) {
-       i = AES_ENCRYPT;
-       AES_set_encrypt_key(key_bin.data, key_bin.size*8, &aes_key);
-    }
-    else {
-       i = AES_DECRYPT;
-       AES_set_decrypt_key(key_bin.data, key_bin.size*8, &aes_key);
-    }
-
-    ret_ptr = enif_make_new_binary(env, data_bin.size, &ret);
-    memcpy(ivec, ivec_bin.data, 32); /* writable copy */
-    AES_ige_encrypt(data_bin.data, ret_ptr, data_bin.size, &aes_key, ivec, i);
-    CONSUME_REDS(env,data_bin);
-    return ret;
-#else
-    return atom_notsup;
-#endif
-}
-
 static ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Data1, Data2) */
     ErlNifBinary d1, d2;
@@ -2610,8 +2241,6 @@ static ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
     int i;
     ERL_NIF_TERM ret;
 
-    CHECK_OSE_CRYPTO();
-
     if (!enif_inspect_iolist_as_binary(env,argv[0], &d1)
 	|| !enif_inspect_iolist_as_binary(env,argv[1], &d2)
 	|| d1.size != d2.size) {
@@ -2632,8 +2261,6 @@ static ERL_NIF_TERM rc4_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg
     RC4_KEY rc4_key;
     ERL_NIF_TERM ret;
 
-    CHECK_OSE_CRYPTO();
-
     if (!enif_inspect_iolist_as_binary(env,argv[0], &key)
 	|| !enif_inspect_iolist_as_binary(env,argv[1], &data)) {
 	return enif_make_badarg(env);
@@ -2650,8 +2277,6 @@ static ERL_NIF_TERM rc4_set_key(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg
     ErlNifBinary key;
     ERL_NIF_TERM ret;
 
-    CHECK_OSE_CRYPTO();
-
     if (!enif_inspect_iolist_as_binary(env,argv[0], &key)) {
 	return enif_make_badarg(env);
     }
@@ -2667,8 +2292,6 @@ static ERL_NIF_TERM rc4_encrypt_with_state(ErlNifEnv* env, int argc, const ERL_N
     RC4_KEY* rc4_key;
     ERL_NIF_TERM new_state, new_data;
 
-    CHECK_OSE_CRYPTO();
-
     if (!enif_inspect_iolist_as_binary(env,argv[0], &state)
 	|| state.size != sizeof(RC4_KEY)
 	|| !enif_inspect_iolist_as_binary(env,argv[1], &data)) {
@@ -2682,35 +2305,6 @@ static ERL_NIF_TERM rc4_encrypt_with_state(ErlNifEnv* env, int argc, const ERL_N
     return enif_make_tuple2(env,new_state,new_data);
 }   
 
-static ERL_NIF_TERM rc2_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key,IVec,Data,IsEncrypt) */
-    ErlNifBinary key_bin, ivec_bin, data_bin;
-    RC2_KEY rc2_key;
-    ERL_NIF_TERM ret;
-    unsigned char iv_copy[8];
-
-    CHECK_OSE_CRYPTO();
-    
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
-	|| (key_bin.size != 5 && key_bin.size != 8 && key_bin.size != 16)
-	|| !enif_inspect_binary(env, argv[1], &ivec_bin)
-	|| ivec_bin.size != 8
-	|| !enif_inspect_iolist_as_binary(env, argv[2], &data_bin)
-	|| data_bin.size % 8 != 0) {
-	return enif_make_badarg(env);
-    }
-    
-    RC2_set_key(&rc2_key, key_bin.size, key_bin.data, key_bin.size*8);
-    memcpy(iv_copy, ivec_bin.data, 8);
-    RC2_cbc_encrypt(data_bin.data,
-		    enif_make_new_binary(env, data_bin.size, &ret),
-		    data_bin.size, &rc2_key,
-		    iv_copy,
-		    (argv[3] == atom_true));
-    CONSUME_REDS(env,data_bin);
-    return ret;
-}
-
 static int get_rsa_private_key(ErlNifEnv* env, ERL_NIF_TERM key, RSA *rsa)
 {
     /* key=[E,N,D]|[E,N,D,P1,P2,E1,E2,C] */
@@ -2740,42 +2334,32 @@ static int get_rsa_private_key(ErlNifEnv* env, ERL_NIF_TERM key, RSA *rsa)
 }
 
 static ERL_NIF_TERM rsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Data|{digest,Digest}, Key=[E,N,D]|[E,N,D,P1,P2,E1,E2,C]) */
-    ErlNifBinary data_bin, ret_bin;
-    unsigned char hmacbuf[SHA512_LEN];
-    unsigned rsa_s_len;
-    RSA* rsa;
-    int i;
-    const ERL_NIF_TERM* tpl_terms;
-    int tpl_arity;
+{/* (Type, Digest, Key=[E,N,D]|[E,N,D,P1,P2,E1,E2,C]) */
+    ErlNifBinary         digest_bin, ret_bin;
+#if OPENSSL_VERSION_NUMBER >= 0x1000000fL
+    EVP_PKEY             *pkey;
+    EVP_PKEY_CTX         *ctx;
+    size_t               rsa_s_len;
+#else
+    unsigned             rsa_s_len, len;
+#endif
+    RSA                  *rsa;
+    int                  i;
     struct digest_type_t *digp;
-    unsigned char* digest;
-
-    CHECK_OSE_CRYPTO();
+    const EVP_MD         *md;
 
     digp = get_digest_type(argv[0]);
     if (!digp) {
 	return enif_make_badarg(env);
     }
-    if (!digp->len) {
+    md = digp->md.p;
+    if (!md) {
 	return atom_notsup;
     }
 
-    if (enif_get_tuple(env, argv[1], &tpl_arity, &tpl_terms)) {
-	if (tpl_arity != 2 || tpl_terms[0] != atom_digest
-	    || !enif_inspect_binary(env, tpl_terms[1], &data_bin)
-	    || data_bin.size != digp->len) {
-
-	    return enif_make_badarg(env);
-	}
-	digest = data_bin.data;
-    }
-    else {
-	if (!enif_inspect_binary(env,argv[1],&data_bin)) {
-	    return enif_make_badarg(env);
-	}
-	digest = hmacbuf;
-	digp->funcp(data_bin.data, data_bin.size, digest);
+    if (!enif_inspect_binary(env,argv[1],&digest_bin)
+        || digest_bin.size != EVP_MD_size(md)) {
+        return enif_make_badarg(env);
     }
 
     rsa = RSA_new();
@@ -2785,14 +2369,33 @@ static ERL_NIF_TERM rsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
     }
 
 
+#if OPENSSL_VERSION_NUMBER >= 0x1000000fL
+    pkey = EVP_PKEY_new();
+    EVP_PKEY_set1_RSA(pkey, rsa);
+    rsa_s_len=(size_t)EVP_PKEY_size(pkey);
+    enif_alloc_binary(rsa_s_len, &ret_bin);
+
+    ctx = EVP_PKEY_CTX_new(pkey, NULL);
+    EVP_PKEY_sign_init(ctx);
+    EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PADDING);
+    EVP_PKEY_CTX_set_signature_md(ctx, md);
+
+    i = EVP_PKEY_sign(ctx, ret_bin.data, &rsa_s_len,
+                      digest_bin.data, digest_bin.size);
+    ASSERT(i<=0 || rsa_s_len <= ret_bin.size);
+    EVP_PKEY_CTX_free(ctx);
+    EVP_PKEY_free(pkey);
+#else
     enif_alloc_binary(RSA_size(rsa), &ret_bin);
+    len = EVP_MD_size(md);
 
-    ERL_VALGRIND_ASSERT_MEM_DEFINED(digest, digp->len);
-    i =  RSA_sign(digp->NID_type, digest, digp->len,
+    ERL_VALGRIND_ASSERT_MEM_DEFINED(digest_bin.data, len);
+    i =  RSA_sign(md->type, digest_bin.data, len,
 		  ret_bin.data, &rsa_s_len, rsa);
+#endif
 
     RSA_free(rsa);
-    if (i) {
+    if (i > 0) {
 	ERL_VALGRIND_MAKE_MEM_DEFINED(ret_bin.data, rsa_s_len);
 	if (rsa_s_len != ret_bin.size) {
 	    enif_realloc_binary(&ret_bin, rsa_s_len);
@@ -2808,44 +2411,16 @@ static ERL_NIF_TERM rsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
 
 
 static ERL_NIF_TERM dss_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (DigesType|none, Data|{digest,Digest}, Key=[P,Q,G,PrivKey]) */
-    ErlNifBinary data_bin, ret_bin;
+{/* (sha, Digest, Key=[P,Q,G,PrivKey]) */
+    ErlNifBinary digest_bin, ret_bin;
     ERL_NIF_TERM head, tail;
-    unsigned char hmacbuf[SHA_DIGEST_LENGTH];
     unsigned int dsa_s_len;
-    const ERL_NIF_TERM* tpl_terms;
-    int tpl_arity;
-    unsigned char* digest = NULL;
     DSA* dsa;
     int i;
 
-    CHECK_OSE_CRYPTO();
-
-    if (argv[0] == atom_sha) {
-	if (enif_get_tuple(env, argv[1], &tpl_arity, &tpl_terms)) {
-	    if (tpl_arity != 2 || tpl_terms[0] != atom_digest
-		|| !enif_inspect_binary(env, tpl_terms[1], &data_bin)
-		|| data_bin.size != SHA_DIGEST_LENGTH) {
-
-		return enif_make_badarg(env);
-	    }
-	    digest = data_bin.data;
-	}
-	else {
-	    if (!enif_inspect_binary(env,argv[1],&data_bin)) {
-		return enif_make_badarg(env);
-	    }
-	    SHA1(data_bin.data, data_bin.size, hmacbuf);
-	    digest = hmacbuf;
-	}
-    }
-    else if (argv[0] == atom_none
-	     && enif_inspect_binary(env,argv[1],&data_bin)
-	     && data_bin.size == SHA_DIGEST_LENGTH) {
-
-	digest = data_bin.data;
-    }
-    else {
+    if (!argv[0] == atom_sha
+        || !enif_inspect_binary(env, argv[1], &digest_bin)
+        || digest_bin.size != SHA_DIGEST_LENGTH) {
 	return enif_make_badarg(env);
     }
 
@@ -2866,7 +2441,7 @@ static ERL_NIF_TERM dss_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
     }
 
     enif_alloc_binary(DSA_size(dsa), &ret_bin);
-    i =  DSA_sign(NID_sha1, digest, SHA_DIGEST_LENGTH,
+    i =  DSA_sign(NID_sha1, digest_bin.data, SHA_DIGEST_LENGTH,
 		  ret_bin.data, &dsa_s_len, dsa);
     DSA_free(dsa);
     if (i) {
@@ -2906,8 +2481,6 @@ static ERL_NIF_TERM rsa_public_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TER
     int padding, i;
     RSA* rsa;
 
-    CHECK_OSE_CRYPTO();
-
     rsa = RSA_new();
 
     if (!enif_inspect_binary(env, argv[0], &data_bin)
@@ -2956,8 +2529,6 @@ static ERL_NIF_TERM rsa_private_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TE
     int padding, i;
     RSA* rsa;
 
-    CHECK_OSE_CRYPTO();
-
     rsa = RSA_new();
 
     if (!enif_inspect_binary(env, argv[0], &data_bin)
@@ -3004,8 +2575,6 @@ static ERL_NIF_TERM dh_generate_parameters_nif(ErlNifEnv* env, int argc, const E
     unsigned char *p_ptr, *g_ptr;
     ERL_NIF_TERM ret_p, ret_g;
 
-    CHECK_OSE_CRYPTO();
-
     if (!enif_get_int(env, argv[0], &prime_len)
 	|| !enif_get_int(env, argv[1], &generator)) {
 
@@ -3033,8 +2602,6 @@ static ERL_NIF_TERM dh_check(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]
     int i;
     ERL_NIF_TERM ret, head, tail;
 
-    CHECK_OSE_CRYPTO();
-
     dh_params = DH_new();
 
     if (!enif_get_list_cell(env, argv[0], &head, &tail)   
@@ -3069,8 +2636,6 @@ static ERL_NIF_TERM dh_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_
     ERL_NIF_TERM ret, ret_pub, ret_prv, head, tail;
     int mpint; /* 0 or 4 */
 
-    CHECK_OSE_CRYPTO();
-
     dh_params = DH_new();
 
     if (!(get_bn_from_bin(env, argv[0], &dh_params->priv_key)
@@ -3115,8 +2680,6 @@ static ERL_NIF_TERM dh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_T
     ErlNifBinary ret_bin;
     ERL_NIF_TERM ret, head, tail;
 
-    CHECK_OSE_CRYPTO();
-
     dh_params = DH_new();
 
     if (!get_bn_from_bin(env, argv[0], &pubkey)
@@ -3139,7 +2702,7 @@ static ERL_NIF_TERM dh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_T
 	    ret = enif_make_binary(env, &ret_bin);
 	}
 	else {
-	    enif_release_binary(&ret_bin);
+            enif_release_binary(&ret_bin);
 	    ret = atom_error;
 	}
     }
@@ -3157,8 +2720,6 @@ static ERL_NIF_TERM srp_value_B_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
     unsigned dlen;
     ERL_NIF_TERM ret;
 
-    CHECK_OSE_CRYPTO();
-
     if (!get_bn_from_bin(env, argv[0], &bn_multiplier)
 	|| !get_bn_from_bin(env, argv[1], &bn_verifier)
 	|| !get_bn_from_bin(env, argv[2], &bn_generator)
@@ -3219,8 +2780,6 @@ static ERL_NIF_TERM srp_user_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_
     unsigned dlen;
     ERL_NIF_TERM ret;
 
-    CHECK_OSE_CRYPTO();
-
     if (!get_bn_from_bin(env, argv[0], &bn_a)
 	|| !get_bn_from_bin(env, argv[1], &bn_u)
 	|| !get_bn_from_bin(env, argv[2], &bn_B)
@@ -3300,8 +2859,6 @@ static ERL_NIF_TERM srp_host_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_
     unsigned dlen;
     ERL_NIF_TERM ret;
 
-    CHECK_OSE_CRYPTO();
-
     if (!get_bn_from_bin(env, argv[0], &bn_verifier)
 	|| !get_bn_from_bin(env, argv[1], &bn_b)
 	|| !get_bn_from_bin(env, argv[2], &bn_u)
@@ -3354,103 +2911,6 @@ static ERL_NIF_TERM srp_host_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_
     return ret;
 }
 
-static ERL_NIF_TERM bf_cfb64_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])    
-{/* (Key, Ivec, Data, IsEncrypt) */
-    ErlNifBinary key_bin, ivec_bin, data_bin;
-    BF_KEY bf_key; /* blowfish key 8 */
-    unsigned char bf_tkey[8]; /* blowfish ivec */    
-    int bf_n = 0; /* blowfish ivec pos */
-    ERL_NIF_TERM ret;
-
-    CHECK_OSE_CRYPTO();
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
-	|| !enif_inspect_binary(env, argv[1], &ivec_bin)
-	|| ivec_bin.size != 8 
-	|| !enif_inspect_iolist_as_binary(env, argv[2], &data_bin)) {
-	return enif_make_badarg(env);
-    }
-
-    BF_set_key(&bf_key, key_bin.size, key_bin.data);
-    memcpy(bf_tkey, ivec_bin.data, 8);
-    BF_cfb64_encrypt(data_bin.data, enif_make_new_binary(env,data_bin.size,&ret),
-		     data_bin.size, &bf_key, bf_tkey, &bf_n,
-		     (argv[3] == atom_true ? BF_ENCRYPT : BF_DECRYPT));
-    CONSUME_REDS(env,data_bin);
-    return ret;
-}
-
-static ERL_NIF_TERM bf_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, Ivec, Data, IsEncrypt) */
-    ErlNifBinary key_bin, ivec_bin, data_bin;
-    BF_KEY bf_key; /* blowfish key 8 */
-    unsigned char bf_tkey[8]; /* blowfish ivec */    
-    ERL_NIF_TERM ret;
-
-    CHECK_OSE_CRYPTO();
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
-	|| !enif_inspect_binary(env, argv[1], &ivec_bin)
-	|| ivec_bin.size != 8 
-	|| !enif_inspect_iolist_as_binary(env, argv[2], &data_bin)
-	|| data_bin.size % 8 != 0) {
-	return enif_make_badarg(env);
-    }
-
-    BF_set_key(&bf_key, key_bin.size, key_bin.data);
-    memcpy(bf_tkey, ivec_bin.data, 8);
-    BF_cbc_encrypt(data_bin.data, enif_make_new_binary(env,data_bin.size,&ret),
-		   data_bin.size, &bf_key, bf_tkey,
-		   (argv[3] == atom_true ? BF_ENCRYPT : BF_DECRYPT));
-    CONSUME_REDS(env,data_bin);
-    return ret;
-}
-
-static ERL_NIF_TERM bf_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])    
-{/* (Key, Data, IsEncrypt) */
-    ErlNifBinary key_bin, data_bin;
-    BF_KEY bf_key; /* blowfish key 8 */
-    ERL_NIF_TERM ret;
-
-    CHECK_OSE_CRYPTO();
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
-	|| !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)
-	|| data_bin.size < 8) {
-	return enif_make_badarg(env);
-    }
-    BF_set_key(&bf_key, key_bin.size, key_bin.data);
-    BF_ecb_encrypt(data_bin.data, enif_make_new_binary(env,data_bin.size,&ret),
-		   &bf_key, (argv[2] == atom_true ? BF_ENCRYPT : BF_DECRYPT));
-    CONSUME_REDS(env,data_bin);
-    return ret;
-}
-
-static ERL_NIF_TERM blowfish_ofb64_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])    
-{/* (Key, IVec, Data) */
-    ErlNifBinary key_bin, ivec_bin, data_bin;
-    BF_KEY bf_key; /* blowfish key 8 */
-    unsigned char bf_tkey[8]; /* blowfish ivec */    
-    int bf_n = 0; /* blowfish ivec pos */
-    ERL_NIF_TERM ret;
-
-    CHECK_OSE_CRYPTO();
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
-	|| !enif_inspect_binary(env, argv[1], &ivec_bin)
-	|| ivec_bin.size != 8 
-	|| !enif_inspect_iolist_as_binary(env, argv[2], &data_bin)) {
-	return enif_make_badarg(env);
-    }
-
-    BF_set_key(&bf_key, key_bin.size, key_bin.data);
-    memcpy(bf_tkey, ivec_bin.data, 8);
-    BF_ofb64_encrypt(data_bin.data, enif_make_new_binary(env,data_bin.size,&ret),
-		     data_bin.size, &bf_key, bf_tkey, &bf_n);
-    CONSUME_REDS(env,data_bin);
-    return ret;
-}
-
 #if defined(HAVE_EC)
 static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg)
 {
@@ -3467,8 +2927,7 @@ static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg)
     EC_POINT *point = NULL;
 
     /* {Field, Prime, Point, Order, CoFactor} = Curve */
-    if (enif_is_tuple(env, curve_arg)
-	&& enif_get_tuple(env,curve_arg,&c_arity,&curve)
+    if (enif_get_tuple(env,curve_arg,&c_arity,&curve)
 	&& c_arity == 5
 	&& get_bn_from_bin(env, curve[3], &bn_order)
 	&& (curve[4] != atom_none && get_bn_from_bin(env, curve[4], &cofactor))) {
@@ -3505,9 +2964,11 @@ static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg)
 	    /* create the EC_GROUP structure */
 	    group = EC_GROUP_new_curve_GFp(p, a, b, NULL);
 
-#if !defined(OPENSSL_NO_EC2M)
-
 	} else if (f_arity == 3 && field[0] == atom_characteristic_two_field) {
+#if defined(OPENSSL_NO_EC2M)
+	    enif_raise_exception(env, atom_notsup);
+	    goto out_err;
+#else
 	    /* {characteristic_two_field, M, Basis} */
 
 	    int b_arity = -1;
@@ -3569,6 +3030,9 @@ static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg)
 	} else
 	    goto out_err;
 
+        if (!group)
+            goto out_err;
+
 	if (enif_inspect_binary(env, prime[2], &seed)) {
 	    EC_GROUP_set_seed(group, seed.data, seed.size);
 	}
@@ -3759,8 +3223,6 @@ static ERL_NIF_TERM ec_key_generate(ErlNifEnv* env, int argc, const ERL_NIF_TERM
     ERL_NIF_TERM priv_key;
     ERL_NIF_TERM pub_key = atom_undefined;
 
-    CHECK_OSE_CRYPTO();
-
     if (!get_ec_key(env, argv[0], argv[1], atom_undefined, &key))
 	goto badarg;
 
@@ -3783,58 +3245,40 @@ static ERL_NIF_TERM ec_key_generate(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 badarg:
     if (key)
 	EC_KEY_free(key);
-    return enif_make_badarg(env);
+    return make_badarg_maybe(env);
 #else
     return atom_notsup;
 #endif
 }
 
 static ERL_NIF_TERM ecdsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Data|{digest,Digest}, Curve, Key) */
+{/* (Type, Digest, Curve, Key) */
 #if defined(HAVE_EC)
-    ErlNifBinary data_bin, ret_bin;
-    unsigned char hmacbuf[SHA_DIGEST_LENGTH];
+    ErlNifBinary digest_bin, ret_bin;
     unsigned int dsa_s_len;
     EC_KEY* key = NULL;
-    int i;
-    const ERL_NIF_TERM* tpl_terms;
-    int tpl_arity;
+    int i, len;
     struct digest_type_t *digp;
-    unsigned char* digest;
-
-    CHECK_OSE_CRYPTO();
+    const EVP_MD         *md;
 
     digp = get_digest_type(argv[0]);
     if (!digp) {
 	return enif_make_badarg(env);
     }
-    if (!digp->len) {
+    md = digp->md.p;
+    if (!md) {
 	return atom_notsup;
     }
+    len = EVP_MD_size(md);
 
-    if (!get_ec_key(env, argv[2], argv[3], atom_undefined, &key))
+    if (!enif_inspect_binary(env,argv[1],&digest_bin)
+        || digest_bin.size != len
+        || !get_ec_key(env, argv[2], argv[3], atom_undefined, &key))
       goto badarg;
 
-    if (enif_get_tuple(env, argv[1], &tpl_arity, &tpl_terms)) {
-	if (tpl_arity != 2 || tpl_terms[0] != atom_digest
-	    || !enif_inspect_binary(env, tpl_terms[1], &data_bin)
-	    || data_bin.size != digp->len) {
-
-	    goto badarg;
-	}
-	digest = data_bin.data;
-    }
-    else {
-	if (!enif_inspect_binary(env,argv[1],&data_bin)) {
-	    goto badarg;
-	}
-	digest = hmacbuf;
-	digp->funcp(data_bin.data, data_bin.size, digest);
-    }
-
     enif_alloc_binary(ECDSA_size(key), &ret_bin);
 
-    i = ECDSA_sign(digp->NID_type, digest, digp->len,
+    i = ECDSA_sign(md->type, digest_bin.data, len,
 		   ret_bin.data, &dsa_s_len, key);
 
     EC_KEY_free(key);
@@ -3852,57 +3296,39 @@ static ERL_NIF_TERM ecdsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 badarg:
     if (key)
 	EC_KEY_free(key);
-    return enif_make_badarg(env);
+    return make_badarg_maybe(env);
 #else
     return atom_notsup;
 #endif
 }
 
 static ERL_NIF_TERM ecdsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Data|{digest,Digest}, Signature, Curve, Key) */
+{/* (Type, Digest, Signature, Curve, Key) */
 #if defined(HAVE_EC)
-    ErlNifBinary data_bin, sign_bin;
-    unsigned char hmacbuf[SHA512_LEN];
-    int i;
+    ErlNifBinary digest_bin, sign_bin;
+    int i, len;
     EC_KEY* key = NULL;
     const ERL_NIF_TERM type = argv[0];
-    const ERL_NIF_TERM* tpl_terms;
-    int tpl_arity;
-    struct digest_type_t* digp = NULL;
-    unsigned char* digest = NULL;
-
-    CHECK_OSE_CRYPTO();
+    struct digest_type_t *digp = NULL;
+    const EVP_MD         *md;
 
     digp = get_digest_type(type);
     if (!digp) {
 	return enif_make_badarg(env);
     }
-    if (!digp->len) {
+    md = digp->md.p;
+    if (!md) {
 	return atom_notsup;
     }
+    len = EVP_MD_size(md);
 
-    if (!enif_inspect_binary(env, argv[2], &sign_bin)
+    if (!enif_inspect_binary(env, argv[1], &digest_bin)
+        || digest_bin.size != len
+        || !enif_inspect_binary(env, argv[2], &sign_bin)
 	|| !get_ec_key(env, argv[3], atom_undefined, argv[4], &key))
 	goto badarg;
 
-    if (enif_get_tuple(env, argv[1], &tpl_arity, &tpl_terms)) {
-	if (tpl_arity != 2 || tpl_terms[0] != atom_digest
-	    || !enif_inspect_binary(env, tpl_terms[1], &data_bin)
-	    || data_bin.size != digp->len) {
-
-	    goto badarg;
-	}
-	digest = data_bin.data;
-    }
-    else if (enif_inspect_binary(env, argv[1], &data_bin)) {
-	digest = hmacbuf;
-	digp->funcp(data_bin.data, data_bin.size, digest);
-    }
-    else {
-	goto badarg;
-    }
-
-    i = ECDSA_verify(digp->NID_type, digest, digp->len,
+    i = ECDSA_verify(md->type, digest_bin.data, len,
 		     sign_bin.data, sign_bin.size, key);
 
     EC_KEY_free(key);
@@ -3912,7 +3338,7 @@ static ERL_NIF_TERM ecdsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TER
 badarg:
     if (key)
 	EC_KEY_free(key);
-    return enif_make_badarg(env);
+    return make_badarg_maybe(env);
 #else
     return atom_notsup;
 #endif
@@ -3936,10 +3362,8 @@ static ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF
     EC_POINT *my_ecpoint;
     EC_KEY *other_ecdh = NULL;
 
-    CHECK_OSE_CRYPTO();
-
     if (!get_ec_key(env, argv[1], argv[2], atom_undefined, &key))
-	return enif_make_badarg(env);
+	return make_badarg_maybe(env);
 
     group    = EC_GROUP_dup(EC_KEY_get0_group(key));
     priv_key = EC_KEY_get0_private_key(key);
@@ -3981,253 +3405,9 @@ out_err:
 static ERL_NIF_TERM rand_seed_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     ErlNifBinary seed_bin;
-    CHECK_OSE_CRYPTO();
+
     if (!enif_inspect_binary(env, argv[0], &seed_bin))
         return enif_make_badarg(env);
     RAND_seed(seed_bin.data,seed_bin.size);
     return atom_ok;
 }
-
-
-/* HMAC */
-
-static void hmac_md5(unsigned char *key, int klen, unsigned char *dbuf, int dlen,
-		     unsigned char *hmacbuf)
-{
-    MD5_CTX ctx;
-    char ipad[HMAC_INT_LEN];
-    char opad[HMAC_INT_LEN];
-    unsigned char nkey[MD5_LEN];
-    int i;
-
-    /* Change key if longer than 64 bytes */
-    if (klen > HMAC_INT_LEN) {
-	MD5(key, klen, nkey);
-	key = nkey;
-	klen = MD5_LEN;
-    }
-
-    memset(ipad, '\0', sizeof(ipad));
-    memset(opad, '\0', sizeof(opad));
-    memcpy(ipad, key, klen);
-    memcpy(opad, key, klen);
-
-    for (i = 0; i < HMAC_INT_LEN; i++) {
-	ipad[i] ^= HMAC_IPAD;
-	opad[i] ^= HMAC_OPAD;
-    }
-
-    /* inner MD5 */
-    MD5_Init(&ctx);
-    MD5_Update(&ctx, ipad, HMAC_INT_LEN);
-    MD5_Update(&ctx, dbuf, dlen);
-    MD5_Final((unsigned char *) hmacbuf, &ctx);
-    /* outer MD5 */
-    MD5_Init(&ctx);
-    MD5_Update(&ctx, opad, HMAC_INT_LEN);
-    MD5_Update(&ctx, hmacbuf, MD5_LEN);
-    MD5_Final((unsigned char *) hmacbuf, &ctx);
-}
-
-static void hmac_sha1(unsigned char *key, int klen,
-		      unsigned char *dbuf, int dlen, 
-		      unsigned char *hmacbuf)
-{
-    SHA_CTX ctx;
-    char ipad[HMAC_INT_LEN];
-    char opad[HMAC_INT_LEN];
-    unsigned char nkey[SHA_LEN];
-    int i;
-
-    /* Change key if longer than 64 bytes */
-    if (klen > HMAC_INT_LEN) {
-	SHA1(key, klen, nkey);
-	key = nkey;
-	klen = SHA_LEN;
-    }
-
-    memset(ipad, '\0', sizeof(ipad));
-    memset(opad, '\0', sizeof(opad));
-    memcpy(ipad, key, klen);
-    memcpy(opad, key, klen);
-
-    for (i = 0; i < HMAC_INT_LEN; i++) {
-	ipad[i] ^= HMAC_IPAD;
-	opad[i] ^= HMAC_OPAD;
-    }
-
-    /* inner SHA */
-    SHA1_Init(&ctx);
-    SHA1_Update(&ctx, ipad, HMAC_INT_LEN);
-    SHA1_Update(&ctx, dbuf, dlen);
-    SHA1_Final((unsigned char *) hmacbuf, &ctx);
-    /* outer SHA */
-    SHA1_Init(&ctx);
-    SHA1_Update(&ctx, opad, HMAC_INT_LEN);
-    SHA1_Update(&ctx, hmacbuf, SHA_LEN);
-    SHA1_Final((unsigned char *) hmacbuf, &ctx);
-}
-
-#ifdef HAVE_SHA224
-static void hmac_sha224(unsigned char *key, int klen,
-			unsigned char *dbuf, int dlen,
-			unsigned char *hmacbuf)
-{
-    SHA256_CTX ctx;
-    char ipad[HMAC_INT_LEN];
-    char opad[HMAC_INT_LEN];
-    unsigned char nkey[SHA224_DIGEST_LENGTH];
-    int i;
-
-    /* Change key if longer than 64 bytes */
-    if (klen > HMAC_INT_LEN) {
-	SHA224(key, klen, nkey);
-	key = nkey;
-	klen = SHA224_DIGEST_LENGTH;
-    }
-
-    memset(ipad, '\0', sizeof(ipad));
-    memset(opad, '\0', sizeof(opad));
-    memcpy(ipad, key, klen);
-    memcpy(opad, key, klen);
-
-    for (i = 0; i < HMAC_INT_LEN; i++) {
-	ipad[i] ^= HMAC_IPAD;
-	opad[i] ^= HMAC_OPAD;
-    }
-
-    /* inner SHA */
-    SHA224_Init(&ctx);
-    SHA224_Update(&ctx, ipad, HMAC_INT_LEN);
-    SHA224_Update(&ctx, dbuf, dlen);
-    SHA224_Final((unsigned char *) hmacbuf, &ctx);
-    /* outer SHA */
-    SHA224_Init(&ctx);
-    SHA224_Update(&ctx, opad, HMAC_INT_LEN);
-    SHA224_Update(&ctx, hmacbuf, SHA224_DIGEST_LENGTH);
-    SHA224_Final((unsigned char *) hmacbuf, &ctx);
-}
-#endif
-
-#ifdef HAVE_SHA256
-static void hmac_sha256(unsigned char *key, int klen,
-			unsigned char *dbuf, int dlen,
-			unsigned char *hmacbuf)
-{
-    SHA256_CTX ctx;
-    char ipad[HMAC_INT_LEN];
-    char opad[HMAC_INT_LEN];
-    unsigned char nkey[SHA256_DIGEST_LENGTH];
-    int i;
-
-    /* Change key if longer than 64 bytes */
-    if (klen > HMAC_INT_LEN) {
-	SHA256(key, klen, nkey);
-	key = nkey;
-	klen = SHA256_DIGEST_LENGTH;
-    }
-
-    memset(ipad, '\0', sizeof(ipad));
-    memset(opad, '\0', sizeof(opad));
-    memcpy(ipad, key, klen);
-    memcpy(opad, key, klen);
-
-    for (i = 0; i < HMAC_INT_LEN; i++) {
-	ipad[i] ^= HMAC_IPAD;
-	opad[i] ^= HMAC_OPAD;
-    }
-
-    /* inner SHA */
-    SHA256_Init(&ctx);
-    SHA256_Update(&ctx, ipad, HMAC_INT_LEN);
-    SHA256_Update(&ctx, dbuf, dlen);
-    SHA256_Final((unsigned char *) hmacbuf, &ctx);
-    /* outer SHA */
-    SHA256_Init(&ctx);
-    SHA256_Update(&ctx, opad, HMAC_INT_LEN);
-    SHA256_Update(&ctx, hmacbuf, SHA256_DIGEST_LENGTH);
-    SHA256_Final((unsigned char *) hmacbuf, &ctx);
-}
-#endif
-
-#ifdef HAVE_SHA384
-static void hmac_sha384(unsigned char *key, int klen,
-			unsigned char *dbuf, int dlen,
-			unsigned char *hmacbuf)
-{
-    SHA512_CTX ctx;
-    char ipad[HMAC_INT2_LEN];
-    char opad[HMAC_INT2_LEN];
-    unsigned char nkey[SHA384_DIGEST_LENGTH];
-    int i;
-
-    /* Change key if longer than 64 bytes */
-    if (klen > HMAC_INT2_LEN) {
-	SHA384(key, klen, nkey);
-	key = nkey;
-	klen = SHA384_DIGEST_LENGTH;
-    }
-
-    memset(ipad, '\0', sizeof(ipad));
-    memset(opad, '\0', sizeof(opad));
-    memcpy(ipad, key, klen);
-    memcpy(opad, key, klen);
-
-    for (i = 0; i < HMAC_INT2_LEN; i++) {
-	ipad[i] ^= HMAC_IPAD;
-	opad[i] ^= HMAC_OPAD;
-    }
-
-    /* inner SHA */
-    SHA384_Init(&ctx);
-    SHA384_Update(&ctx, ipad, HMAC_INT2_LEN);
-    SHA384_Update(&ctx, dbuf, dlen);
-    SHA384_Final((unsigned char *) hmacbuf, &ctx);
-    /* outer SHA */
-    SHA384_Init(&ctx);
-    SHA384_Update(&ctx, opad, HMAC_INT2_LEN);
-    SHA384_Update(&ctx, hmacbuf, SHA384_DIGEST_LENGTH);
-    SHA384_Final((unsigned char *) hmacbuf, &ctx);
-}
-#endif
-
-#ifdef HAVE_SHA512
-static void hmac_sha512(unsigned char *key, int klen,
-			unsigned char *dbuf, int dlen,
-			unsigned char *hmacbuf)
-{
-    SHA512_CTX ctx;
-    char ipad[HMAC_INT2_LEN];
-    char opad[HMAC_INT2_LEN];
-    unsigned char nkey[SHA512_DIGEST_LENGTH];
-    int i;
-
-    /* Change key if longer than 64 bytes */
-    if (klen > HMAC_INT2_LEN) {
-	SHA512(key, klen, nkey);
-	key = nkey;
-	klen = SHA512_DIGEST_LENGTH;
-    }
-
-    memset(ipad, '\0', sizeof(ipad));
-    memset(opad, '\0', sizeof(opad));
-    memcpy(ipad, key, klen);
-    memcpy(opad, key, klen);
-
-    for (i = 0; i < HMAC_INT2_LEN; i++) {
-	ipad[i] ^= HMAC_IPAD;
-	opad[i] ^= HMAC_OPAD;
-    }
-
-    /* inner SHA */
-    SHA512_Init(&ctx);
-    SHA512_Update(&ctx, ipad, HMAC_INT2_LEN);
-    SHA512_Update(&ctx, dbuf, dlen);
-    SHA512_Final((unsigned char *) hmacbuf, &ctx);
-    /* outer SHA */
-    SHA512_Init(&ctx);
-    SHA512_Update(&ctx, opad, HMAC_INT2_LEN);
-    SHA512_Update(&ctx, hmacbuf, SHA512_DIGEST_LENGTH);
-    SHA512_Final((unsigned char *) hmacbuf, &ctx);
-}
-#endif
diff --git a/lib/crypto/c_src/crypto_callback.c b/lib/crypto/c_src/crypto_callback.c
index e0de16074c..af9545bd63 100644
--- a/lib/crypto/c_src/crypto_callback.c
+++ b/lib/crypto/c_src/crypto_callback.c
@@ -43,6 +43,10 @@
 
 #ifdef __WIN32__
 #  define DLLEXPORT __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#  define DLLEXPORT __attribute__ ((visibility("default")))
+#elif defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+#  define DLLEXPORT __global
 #else
 #  define DLLEXPORT
 #endif
@@ -51,8 +55,6 @@
 DLLEXPORT struct crypto_callbacks* get_crypto_callbacks(int nlocks);
 
 
-static ErlNifRWLock** lock_vec = NULL; /* Static locks used by openssl */
-
 static void nomem(size_t size, const char* op)
 {
     fprintf(stderr, "Out of memory abort. Crypto failed to %s %zu bytes.\r\n",
@@ -84,6 +86,8 @@ static void crypto_free(void* ptr)
 
 #ifdef OPENSSL_THREADS /* vvvvvvvvvvvvvvv OPENSSL_THREADS vvvvvvvvvvvvvvvv */
 
+static ErlNifRWLock** lock_vec = NULL; /* Static locks used by openssl */
+
 #include <openssl/crypto.h>
 
 static INLINE void locking(int mode, ErlNifRWLock* lock)
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 563a090e98..d3e827b3e6 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -135,9 +135,8 @@
 
      <code>stream_cipher() = rc4 | aes_ctr </code>
 
-     <code>block_cipher() =  aes_cbc128 | aes_cfb8 | aes_cfb128 | aes_ige256 | blowfish_cbc |
-     blowfish_cfb64 | des_cbc | des_cfb | des3_cbc | des3_cbf
-     | des_ede3 | rc2_cbc </code>
+     <code>block_cipher() =  aes_cbc | aes_cfb8 | aes_cfb128 | aes_ige256 | blowfish_cbc |
+     blowfish_cfb64 | des_cbc | des_cfb | des3_cbc | des3_cbf | des_ede3 | rc2_cbc </code>
 
      <code>aead_cipher() =  aes_gcm | chacha20_poly1305 </code>
 
@@ -160,8 +159,9 @@
      <code> hash_algorithms() =  md5 | ripemd160 | sha | sha224 | sha256 | sha384 | sha512 </code> <p>md4 is also supported for hash_init/1 and hash/2.
      Note that both md4 and md5 are recommended only for compatibility with existing applications.
      </p>
-     <code> cipher_algorithms() = des_cbc | des_cfb |  des3_cbc | des3_cbf | des_ede3 |
-     blowfish_cbc | blowfish_cfb64 | aes_cbc128 | aes_cfb8 | aes_cfb128| aes_cbc256 | aes_ige256 | aes_gcm | chacha20_poly1305 | rc2_cbc | aes_ctr| rc4  </code>
+     <code> cipher_algorithms() = aes_cbc | aes_cfb8 | aes_cfb128 | aes_ctr | aes_gcm |
+     aes_ige256 | blowfish_cbc | blowfish_cfb64 | chacha20_poly1305 | des_cbc | des_cfb |
+     des3_cbc | des3_cbf | des_ede3 | rc2_cbc | rc4 </code>
      <code> public_key_algorithms() =   rsa |dss | ecdsa | dh | ecdh | ec_gf2m</code>
      <p>Note that ec_gf2m is not strictly a public key algorithm, but a restriction on what curves are supported
      with ecdsa and ecdh.
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index f684b6f6eb..0138eb6ad2 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,29 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 3.6.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix bug for <c>aes_ecb</c> block crypto when data is
+	    larger than 16 bytes.</p>
+          <p>
+	    Own Id: OTP-13249</p>
+        </item>
+        <item>
+          <p>
+	    Improve portability of ECC tests in Crypto and SSL for
+	    "exotic" OpenSSL versions.</p>
+          <p>
+	    Own Id: OTP-13311</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 3.6.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 38e71591f3..3e24ff2b0a 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -210,10 +210,8 @@ supports()->
     {Hashs, PubKeys, Ciphers} = algorithms(),
 
     [{hashs, Hashs},
-     {ciphers, [des_cbc, des_cfb, des3_cbc, des_ede3, blowfish_cbc,
-		blowfish_cfb64, blowfish_ofb64, blowfish_ecb, aes_cbc128, aes_cfb8, aes_cfb128,
-		aes_cbc256, rc2_cbc, aes_ctr, rc4, aes_ecb] ++ Ciphers},
-     {public_keys, [rsa, dss, dh, srp] ++ PubKeys}
+     {ciphers, Ciphers},
+     {public_keys, PubKeys}
     ].
 
 info_lib() -> ?nif_stub.
@@ -222,20 +220,14 @@ info_lib() -> ?nif_stub.
 
 hash(Hash, Data0) ->
     Data = iolist_to_binary(Data0),
-    MaxByts = max_bytes(),
-    hash(Hash, Data, erlang:byte_size(Data), MaxByts, initial).
+    MaxBytes = max_bytes(),
+    hash(Hash, Data, erlang:byte_size(Data), MaxBytes).
 
 -spec hash_init('md5'|'md4'|'ripemd160'|
                 'sha'|'sha224'|'sha256'|'sha384'|'sha512') -> any().
 
-hash_init(md5)       -> {md5, md5_init()};
-hash_init(md4)       -> {md4, md4_init()};
-hash_init(sha)       -> {sha, sha_init()};
-hash_init(ripemd160) -> {ripemd160, ripemd160_init()};
-hash_init(sha224)    -> {sha224, sha224_init()};
-hash_init(sha256)    -> {sha256, sha256_init()};
-hash_init(sha384)    -> {sha384, sha384_init()};
-hash_init(sha512)    -> {sha512, sha512_init()}.
+hash_init(Hash) ->
+    notsup_to_error(hash_init_nif(Hash)).
 
 -spec hash_update(_, iodata()) -> any().
 
@@ -246,14 +238,8 @@ hash_update(State, Data0) ->
 
 -spec hash_final(_) -> binary().
 
-hash_final({md5,Context})       -> md5_final(Context);
-hash_final({md4,Context})       -> md4_final(Context);
-hash_final({sha,Context})       -> sha_final(Context);
-hash_final({ripemd160,Context}) -> ripemd160_final(Context);
-hash_final({sha224,Context})    -> sha224_final(Context);
-hash_final({sha256,Context})    -> sha256_final(Context);
-hash_final({sha384,Context})    -> sha384_final(Context);
-hash_final({sha512,Context})    -> sha512_final(Context).
+hash_final(State) ->
+    notsup_to_error(hash_final_nif(State)).
 
 
 -spec hmac(_, iodata(), iodata()) -> binary().
@@ -265,151 +251,132 @@ hash_final({sha512,Context})    -> sha512_final(Context).
 
 hmac(Type, Key, Data0) ->
     Data = iolist_to_binary(Data0),
-    hmac(Type, Key, Data, undefined, erlang:byte_size(Data), max_bytes(), initial).
+    hmac(Type, Key, Data, undefined, erlang:byte_size(Data), max_bytes()).
 hmac(Type, Key, Data0, MacSize) ->
     Data = iolist_to_binary(Data0),
-    hmac(Type, Key, Data, MacSize, erlang:byte_size(Data), max_bytes(), initial).
-
+    hmac(Type, Key, Data, MacSize, erlang:byte_size(Data), max_bytes()).
 
-hmac_init(_Type, _Key) -> ?nif_stub.
+hmac_init(Type, Key) ->
+    notsup_to_error(hmac_init_nif(Type, Key)).
 
 hmac_update(State, Data0) ->
     Data = iolist_to_binary(Data0),
     hmac_update(State, Data, erlang:byte_size(Data), max_bytes()).
-hmac_final(_Context) -> ? nif_stub.
-hmac_final_n(_Context, _HashLen) -> ? nif_stub.
+
+hmac_final(Context) ->
+    notsup_to_error(hmac_final_nif(Context)).
+hmac_final_n(Context, HashLen) ->
+    notsup_to_error(hmac_final_nif(Context, HashLen)).
 
 %% Ecrypt/decrypt %%%
 
--spec block_encrypt(des_cbc | des_cfb | des3_cbc | des3_cbf | des_ede3 | blowfish_cbc |
-		    blowfish_cfb64 | aes_cbc128 | aes_cfb8 | aes_cfb128 | aes_cbc256 | rc2_cbc,
+-spec block_encrypt(des_cbc | des_cfb |
+                    des3_cbc | des3_cbf | des_ede3 |
+                    blowfish_cbc | blowfish_cfb64 | blowfish_ofb64 |
+                    aes_cbc128 | aes_cfb8 | aes_cfb128 | aes_cbc256 | aes_ige256 |
+		    aes_cbc |
+                    rc2_cbc,
 		    Key::iodata(), Ivec::binary(), Data::iodata()) -> binary();
 		   (aes_gcm | chacha20_poly1305, Key::iodata(), Ivec::binary(), {AAD::binary(), Data::iodata()}) -> {binary(), binary()}.
 
-block_encrypt(des_cbc, Key, Ivec, Data) ->
-    des_cbc_encrypt(Key, Ivec, Data);
-block_encrypt(des_cfb, Key, Ivec, Data) ->
-    des_cfb_encrypt(Key, Ivec, Data);
-block_encrypt(des3_cbc, [Key1, Key2, Key3], Ivec, Data) ->
-    des3_cbc_encrypt(Key1, Key2, Key3, Ivec, Data);
-block_encrypt(des3_cbf, [Key1, Key2, Key3], Ivec, Data) ->
-    des3_cfb_encrypt(Key1, Key2, Key3, Ivec, Data);
-block_encrypt(des_ede3, [Key1, Key2, Key3], Ivec, Data) ->
-    des_ede3_cbc_encrypt(Key1, Key2, Key3, Ivec, Data);
-block_encrypt(blowfish_cbc, Key, Ivec, Data) ->
-    blowfish_cbc_encrypt(Key, Ivec, Data);
-block_encrypt(blowfish_cfb64, Key, Ivec, Data) ->
-    blowfish_cfb64_encrypt(Key, Ivec, Data);
-block_encrypt(blowfish_ofb64, Key, Ivec, Data) ->
-    blowfish_ofb64_encrypt(Key, Ivec, Data);
-block_encrypt(aes_cbc128, Key, Ivec, Data) ->
-    aes_cbc_128_encrypt(Key, Ivec, Data);
-block_encrypt(aes_cbc256, Key, Ivec, Data) ->
-    aes_cbc_256_encrypt(Key, Ivec, Data);
+block_encrypt(Type, Key, Ivec, Data) when Type =:= des_cbc;
+                                          Type =:= des_cfb;
+                                          Type =:= blowfish_cbc;
+                                          Type =:= blowfish_cfb64;
+                                          Type =:= blowfish_ofb64;
+                                          Type =:= aes_cbc128;
+                                          Type =:= aes_cfb8;
+                                          Type =:= aes_cfb128;
+                                          Type =:= aes_cbc256;
+					  Type =:= aes_cbc;
+                                          Type =:= rc2_cbc ->
+    block_crypt_nif(Type, Key, Ivec, Data, true);
+block_encrypt(Type, Key0, Ivec, Data) when Type =:= des3_cbc;
+                                           Type =:= des_ede3 ->
+    Key = check_des3_key(Key0),
+    block_crypt_nif(des_ede3_cbc, Key, Ivec, Data, true);
+block_encrypt(des3_cbf, Key0, Ivec, Data) ->
+    Key = check_des3_key(Key0),
+    block_crypt_nif(des_ede3_cbf, Key, Ivec, Data, true);
 block_encrypt(aes_ige256, Key, Ivec, Data) ->
-    aes_ige_256_encrypt(Key, Ivec, Data);
-block_encrypt(aes_cfb8, Key, Ivec, Data) ->
-    aes_cfb_8_encrypt(Key, Ivec, Data);
-block_encrypt(aes_cfb128, Key, Ivec, Data) ->
-    aes_cfb_128_encrypt(Key, Ivec, Data);
+    aes_ige_crypt_nif(Key, Ivec, Data, true);
 block_encrypt(aes_gcm, Key, Ivec, {AAD, Data}) ->
-    case aes_gcm_encrypt(Key, Ivec, AAD, Data) of
-	notsup -> erlang:error(notsup);
-	Return -> Return
-    end;
+    aes_gcm_encrypt(Key, Ivec, AAD, Data);
 block_encrypt(chacha20_poly1305, Key, Ivec, {AAD, Data}) ->
-    case chacha20_poly1305_encrypt(Key, Ivec, AAD, Data) of
-	notsup -> erlang:error(notsup);
-	Return -> Return
-    end;
-block_encrypt(rc2_cbc, Key, Ivec, Data) ->
-    rc2_cbc_encrypt(Key, Ivec, Data).
-
--spec block_decrypt(des_cbc | des_cfb | des3_cbc | des3_cbf | des_ede3 | blowfish_cbc |
-		    blowfish_cfb64 | blowfish_ofb64  | aes_cbc128 | aes_cbc256 | aes_ige256 |
-		    aes_cfb8 | aes_cfb128 | rc2_cbc,
+    chacha20_poly1305_encrypt(Key, Ivec, AAD, Data).
+
+-spec block_decrypt(des_cbc | des_cfb |
+                    des3_cbc | des3_cbf | des_ede3 |
+                    blowfish_cbc | blowfish_cfb64 | blowfish_ofb64 |
+                    aes_cbc128 | aes_cfb8 | aes_cfb128 | aes_cbc256 | aes_ige256 |
+		    aes_cbc |
+                    rc2_cbc,
 		    Key::iodata(), Ivec::binary(), Data::iodata()) -> binary();
 		   (aes_gcm | chacha20_poly1305, Key::iodata(), Ivec::binary(),
 		    {AAD::binary(), Data::iodata(), Tag::binary()}) -> binary() | error.
-block_decrypt(des_cbc, Key, Ivec, Data) ->
-    des_cbc_decrypt(Key, Ivec, Data);
-block_decrypt(des_cfb, Key, Ivec, Data) ->
-    des_cfb_decrypt(Key, Ivec, Data);
-block_decrypt(des3_cbc, [Key1, Key2, Key3], Ivec, Data) ->
-    des3_cbc_decrypt(Key1, Key2, Key3, Ivec, Data);
-block_decrypt(des3_cbf, [Key1, Key2, Key3], Ivec, Data) ->
-    des3_cfb_decrypt(Key1, Key2, Key3, Ivec, Data);
-block_decrypt(des_ede3, [Key1, Key2, Key3], Ivec, Data) ->
-    des_ede3_cbc_decrypt(Key1, Key2, Key3, Ivec, Data);
-block_decrypt(blowfish_cbc, Key, Ivec, Data) ->
-    blowfish_cbc_decrypt(Key, Ivec, Data);
-block_decrypt(blowfish_cfb64, Key, Ivec, Data) ->
-    blowfish_cfb64_decrypt(Key, Ivec, Data);
-block_decrypt(blowfish_ofb64, Key, Ivec, Data) ->
-    blowfish_ofb64_decrypt(Key, Ivec, Data);
-block_decrypt(aes_cbc128, Key, Ivec, Data) ->
-    aes_cbc_128_decrypt(Key, Ivec, Data);
-block_decrypt(aes_cbc256, Key, Ivec, Data) ->
-    aes_cbc_256_decrypt(Key, Ivec, Data);
+block_decrypt(Type, Key, Ivec, Data) when Type =:= des_cbc;
+                                          Type =:= des_cfb;
+                                          Type =:= blowfish_cbc;
+                                          Type =:= blowfish_cfb64;
+                                          Type =:= blowfish_ofb64;
+					  Type =:= aes_cbc;
+                                          Type =:= aes_cbc128;
+                                          Type =:= aes_cfb8;
+                                          Type =:= aes_cfb128;
+                                          Type =:= aes_cbc256;
+                                          Type =:= rc2_cbc ->
+    block_crypt_nif(Type, Key, Ivec, Data, false);
+block_decrypt(Type, Key0, Ivec, Data) when Type =:= des3_cbc;
+                                           Type =:= des_ede3 ->
+    Key = check_des3_key(Key0),
+    block_crypt_nif(des_ede3_cbc, Key, Ivec, Data, false);
+block_decrypt(des3_cbf, Key0, Ivec, Data) ->
+    Key = check_des3_key(Key0),
+    block_crypt_nif(des_ede3_cbf, Key, Ivec, Data, false);
 block_decrypt(aes_ige256, Key, Ivec, Data) ->
-    aes_ige_256_decrypt(Key, Ivec, Data);
-block_decrypt(aes_cfb8, Key, Ivec, Data) ->
-    aes_cfb_8_decrypt(Key, Ivec, Data);
-block_decrypt(aes_cfb128, Key, Ivec, Data) ->
-    aes_cfb_128_decrypt(Key, Ivec, Data);
+    notsup_to_error(aes_ige_crypt_nif(Key, Ivec, Data, false));
 block_decrypt(aes_gcm, Key, Ivec, {AAD, Data, Tag}) ->
-    case aes_gcm_decrypt(Key, Ivec, AAD, Data, Tag) of
-	notsup -> erlang:error(notsup);
-	Return -> Return
-    end;
+    aes_gcm_decrypt(Key, Ivec, AAD, Data, Tag);
 block_decrypt(chacha20_poly1305, Key, Ivec, {AAD, Data, Tag}) ->
-    case chacha20_poly1305_decrypt(Key, Ivec, AAD, Data, Tag) of
-	notsup -> erlang:error(notsup);
-	Return -> Return
-    end;
-block_decrypt(rc2_cbc, Key, Ivec, Data) ->
-    rc2_cbc_decrypt(Key, Ivec, Data).
+    chacha20_poly1305_decrypt(Key, Ivec, AAD, Data, Tag).
 
 -spec block_encrypt(des_ecb | blowfish_ecb | aes_ecb, Key::iodata(), Data::iodata()) -> binary().
 
-block_encrypt(des_ecb, Key, Data) ->
-    des_ecb_encrypt(Key, Data);
-block_encrypt(blowfish_ecb, Key, Data) ->
-    blowfish_ecb_encrypt(Key, Data);
-block_encrypt(aes_ecb, Key, Data) ->
-    aes_ecb_encrypt(Key, Data).       
+block_encrypt(Type, Key, Data) ->
+    block_crypt_nif(Type, Key, Data, true).
 
 -spec block_decrypt(des_ecb | blowfish_ecb | aes_ecb, Key::iodata(), Data::iodata()) -> binary().
 
-block_decrypt(des_ecb, Key, Data) ->
-    des_ecb_decrypt(Key, Data);
-block_decrypt(blowfish_ecb, Key, Data) ->
-    blowfish_ecb_decrypt(Key, Data);
-block_decrypt(aes_ecb, Key, Data) ->
-    aes_ecb_decrypt(Key, Data).       
+block_decrypt(Type, Key, Data) ->
+    block_crypt_nif(Type, Key, Data, false).
 
 -spec next_iv(des_cbc | des3_cbc | aes_cbc | aes_ige, Data::iodata()) -> binary().
 
-next_iv(des_cbc, Data) ->
-    des_cbc_ivec(Data);
-next_iv(des3_cbc, Data) ->
-    des_cbc_ivec(Data);
-next_iv(aes_cbc, Data) ->
-    aes_cbc_ivec(Data);
-next_iv(aes_ige, Data) ->
-    aes_ige_ivec(Data).
+next_iv(Type, Data) when is_binary(Data) ->
+    IVecSize = case Type of
+                   des_cbc  -> 8;
+                   des3_cbc -> 8;
+                   aes_cbc  -> 16;
+                   aes_ige  -> 32
+               end,
+    {_, IVec} = split_binary(Data, size(Data) - IVecSize),
+    IVec;
+next_iv(Type, Data) when is_list(Data) ->
+    next_iv(Type, list_to_binary(Data)).
 
 -spec next_iv(des_cfb, Data::iodata(), Ivec::binary()) -> binary().
 
-next_iv(des_cfb, Data, Ivec) ->
-    des_cfb_ivec(Ivec, Data);
+next_iv(des_cfb, Data, IVec) ->
+    IVecAndData = list_to_binary([IVec, Data]),
+    {_, NewIVec} = split_binary(IVecAndData, byte_size(IVecAndData) - 8),
+    NewIVec;
 next_iv(Type, Data, _Ivec) ->
     next_iv(Type, Data).
 
 stream_init(aes_ctr, Key, Ivec) ->
     {aes_ctr, aes_ctr_stream_init(Key, Ivec)}.
 stream_init(rc4, Key) ->
-    {rc4, rc4_set_key(Key)}.
+    {rc4, notsup_to_error(rc4_set_key(Key))}.
 
 stream_encrypt(State, Data0) ->
     Data = iolist_to_binary(Data0),
@@ -485,35 +452,31 @@ verify(dss, none, Data, Signature, Key) when is_binary(Data) ->
     verify(dss, sha, {digest, Data}, Signature, Key);
 verify(Alg, Type, Data, Signature, Key) when is_binary(Data) ->
     verify(Alg, Type,  {digest, hash(Type, Data)}, Signature, Key);
-verify(dss, Type, Data, Signature, Key) ->
-    dss_verify_nif(Type, Data, Signature, map_ensure_int_as_bin(Key));
-verify(rsa, Type, DataOrDigest, Signature, Key) ->
-    case rsa_verify_nif(Type, DataOrDigest, Signature, map_ensure_int_as_bin(Key)) of
-	notsup -> erlang:error(notsup);
-	Bool -> Bool
-    end;
-verify(ecdsa, Type, DataOrDigest, Signature, [Key, Curve]) ->
-    case ecdsa_verify_nif(Type, DataOrDigest, Signature, nif_curve_params(Curve), ensure_int_as_bin(Key)) of
-	notsup -> erlang:error(notsup);
-	Bool -> Bool
-    end.
+verify(dss, Type, {digest, Digest}, Signature, Key) ->
+    dss_verify_nif(Type, Digest, Signature, map_ensure_int_as_bin(Key));
+verify(rsa, Type, {digest, Digest}, Signature, Key) ->
+    notsup_to_error(
+      rsa_verify_nif(Type, Digest, Signature, map_ensure_int_as_bin(Key)));
+verify(ecdsa, Type, {digest, Digest}, Signature, [Key, Curve]) ->
+    notsup_to_error(
+      ecdsa_verify_nif(Type, Digest, Signature, nif_curve_params(Curve), ensure_int_as_bin(Key))).
 sign(dss, none, Data, Key) when is_binary(Data) ->
     sign(dss, sha, {digest, Data}, Key);
 sign(Alg, Type, Data, Key) when is_binary(Data) ->
     sign(Alg, Type, {digest, hash(Type, Data)}, Key);
-sign(rsa, Type, DataOrDigest, Key) ->
-    case rsa_sign_nif(Type, DataOrDigest, map_ensure_int_as_bin(Key)) of
-	error -> erlang:error(badkey, [Type,DataOrDigest,Key]);
+sign(rsa, Type, {digest, Digest}, Key) ->
+    case rsa_sign_nif(Type, Digest, map_ensure_int_as_bin(Key)) of
+	error -> erlang:error(badkey, [Type,Digest,Key]);
 	Sign -> Sign
     end;
-sign(dss, Type, DataOrDigest, Key) ->
-    case dss_sign_nif(Type, DataOrDigest, map_ensure_int_as_bin(Key)) of
-	error -> erlang:error(badkey, [DataOrDigest, Key]);
+sign(dss, Type, {digest, Digest}, Key) ->
+    case dss_sign_nif(Type, Digest, map_ensure_int_as_bin(Key)) of
+	error -> erlang:error(badkey, [Digest, Key]);
 	Sign -> Sign
     end;
-sign(ecdsa, Type, DataOrDigest, [Key, Curve]) ->
-    case ecdsa_sign_nif(Type, DataOrDigest, nif_curve_params(Curve), ensure_int_as_bin(Key)) of
-	error -> erlang:error(badkey, [Type,DataOrDigest,Key]);
+sign(ecdsa, Type, {digest, Digest}, [Key, Curve]) ->
+    case ecdsa_sign_nif(Type, Digest, nif_curve_params(Curve), ensure_int_as_bin(Key)) of
+	error -> erlang:error(badkey, [Type,Digest,Key]);
 	Sign -> Sign
     end.
 
@@ -618,8 +581,9 @@ compute_key(srp, HostPublic, {UserPublic, UserPrivate},
 					HostPubBin, Prime);
 		    [S] -> S
 		end,
+    notsup_to_error(
     srp_user_secret_nif(ensure_int_as_bin(UserPrivate), Scrambler, HostPubBin,
-			Multiplier, Generator, DerivedKey, Prime);
+                          Multiplier, Generator, DerivedKey, Prime));
 
 compute_key(srp, UserPublic, {HostPublic, HostPrivate},
 	    {host,[Verifier, Prime, Version | ScramblerArg]}) when
@@ -631,8 +595,9 @@ compute_key(srp, UserPublic, {HostPublic, HostPrivate},
 		    [] -> srp_scrambler(Version, UserPubBin, ensure_int_as_bin(HostPublic), Prime);
 		    [S] -> S
 		end,
+    notsup_to_error(
     srp_host_secret_nif(Verifier, ensure_int_as_bin(HostPrivate), Scrambler,
-			UserPubBin, Prime);
+                          UserPubBin, Prime));
 
 compute_key(ecdh, Others, My, Curve) ->
     ecdh_compute_key_nif(ensure_int_as_bin(Others),
@@ -677,7 +642,8 @@ on_load() ->
 		      end
 	      end,
     Lib = filename:join([PrivDir, "lib", LibName]),
-    Status = case erlang:load_nif(Lib, {?CRYPTO_NIF_VSN,path2bin(Lib)}) of
+    LibBin   = path2bin(Lib),
+    Status = case erlang:load_nif(Lib, {?CRYPTO_NIF_VSN,LibBin}) of
 		 ok -> ok;
 		 {error, {load_failed, _}}=Error1 ->
 		     ArchLibDir =
@@ -689,7 +655,8 @@ on_load() ->
 			 [] -> Error1;
 			 _ ->
 			     ArchLib = filename:join([ArchLibDir, LibName]),
-			     erlang:load_nif(ArchLib, {?CRYPTO_NIF_VSN,path2bin(ArchLib)})
+                             ArchBin = path2bin(ArchLib),
+			     erlang:load_nif(ArchLib, {?CRYPTO_NIF_VSN,ArchBin})
 		     end;
 		 Error1 -> Error1
 	     end,
@@ -714,46 +681,30 @@ path2bin(Path) when is_list(Path) ->
 max_bytes() ->
     ?MAX_BYTES_TO_NIF.
 
+notsup_to_error(notsup) ->
+    erlang:error(notsup);
+notsup_to_error(Other) ->
+    Other.
+
 %% HASH --------------------------------------------------------------------
-hash(Hash, Data, Size, Max, initial) when Size =< Max ->
-    do_hash(Hash, Data);
-hash(State0, Data, Size, Max, continue) when Size =< Max ->
-    State = do_hash_update(State0, Data),
-    hash_final(State);
-hash(Hash, Data, _Size, Max, initial) ->
-    <<Increment:Max/binary, Rest/binary>> = Data,
+hash(Hash, Data, Size, Max) when Size =< Max ->
+    notsup_to_error(hash_nif(Hash, Data));
+hash(Hash, Data, Size, Max) ->
     State0 = hash_init(Hash),
-    State = do_hash_update(State0, Increment),
-    hash(State, Rest, erlang:byte_size(Rest), max_bytes(), continue);
-hash(State0, Data, _Size, MaxByts, continue) ->
-    <<Increment:MaxByts/binary, Rest/binary>> = Data,
-    State = do_hash_update(State0, Increment),
-    hash(State, Rest, erlang:byte_size(Rest), max_bytes(), continue).
-
-do_hash(md5, Data)          -> md5(Data);
-do_hash(md4, Data)          -> md4(Data);
-do_hash(sha, Data)          -> sha(Data);
-do_hash(ripemd160, Data)    -> ripemd160(Data);
-do_hash(sha224, Data)       -> sha224(Data);
-do_hash(sha256, Data)       -> sha256(Data);
-do_hash(sha384, Data)       -> sha384(Data);
-do_hash(sha512, Data)       -> sha512(Data).
+    State1 = hash_update(State0, Data, Size, Max),
+    hash_final(State1).
 
 hash_update(State, Data, Size, MaxBytes)  when Size =< MaxBytes ->
-    do_hash_update(State, Data);
+    notsup_to_error(hash_update_nif(State, Data));
 hash_update(State0, Data, _, MaxBytes) ->
     <<Increment:MaxBytes/binary, Rest/binary>> = Data,
-    State = do_hash_update(State0, Increment),
+    State = notsup_to_error(hash_update_nif(State0, Increment)),
     hash_update(State, Rest, erlang:byte_size(Rest), MaxBytes).
 
-do_hash_update({md5,Context}, Data)       -> {md5, md5_update(Context,Data)};
-do_hash_update({md4,Context}, Data)       -> {md4, md4_update(Context,Data)};
-do_hash_update({sha,Context}, Data)       -> {sha, sha_update(Context,Data)};
-do_hash_update({ripemd160,Context}, Data) -> {ripemd160, ripemd160_update(Context,Data)};
-do_hash_update({sha224,Context}, Data)    -> {sha224, sha224_update(Context,Data)};
-do_hash_update({sha256,Context}, Data)    -> {sha256, sha256_update(Context,Data)};
-do_hash_update({sha384,Context}, Data)    -> {sha384, sha384_update(Context,Data)};
-do_hash_update({sha512,Context}, Data)    -> {sha512, sha512_update(Context,Data)}.
+hash_nif(_Hash, _Data) -> ?nif_stub.
+hash_init_nif(_Hash) -> ?nif_stub.
+hash_update_nif(_State, _Data) -> ?nif_stub.
+hash_final_nif(_State) -> ?nif_stub.
 
 
 %%
@@ -765,10 +716,14 @@ do_hash_update({sha512,Context}, Data)    -> {sha512, sha512_update(Context,Data
 -spec md5_update(binary(), iodata()) -> binary().
 -spec md5_final(binary()) -> binary().
 
-md5(_Data) -> ?nif_stub.
-md5_init() -> ?nif_stub.
-md5_update(_Context, _Data) -> ?nif_stub.
-md5_final(_Context) -> ?nif_stub.
+md5(Data) ->
+    hash(md5, Data).
+md5_init() ->
+    hash_init(md5).
+md5_update(Context, Data) ->
+    hash_update(Context, Data).
+md5_final(Context) ->
+    hash_final(Context).
 
 %%
 %%  MD4
@@ -778,24 +733,14 @@ md5_final(_Context) -> ?nif_stub.
 -spec md4_update(binary(), iodata()) -> binary().
 -spec md4_final(binary()) -> binary().
 
-md4(_Data) -> ?nif_stub.
-md4_init() -> ?nif_stub.
-md4_update(_Context, _Data) -> ?nif_stub.
-md4_final(_Context) -> ?nif_stub.
-
-%%
-%%  RIPEMD160
-%%
-
--spec ripemd160(iodata()) -> binary().
--spec ripemd160_init() -> binary().
--spec ripemd160_update(binary(), iodata()) -> binary().
--spec ripemd160_final(binary()) -> binary().
-
-ripemd160(_Data) -> ?nif_stub.
-ripemd160_init() -> ?nif_stub.
-ripemd160_update(_Context, _Data) -> ?nif_stub.
-ripemd160_final(_Context) -> ?nif_stub.
+md4(Data) ->
+    hash(md4, Data).
+md4_init() ->
+    hash_init(md4).
+md4_update(Context, Data) ->
+    hash_update(Context, Data).
+md4_final(Context) ->
+    hash_final(Context).
 
 %%
 %% SHA
@@ -805,196 +750,44 @@ ripemd160_final(_Context) -> ?nif_stub.
 -spec sha_update(binary(), iodata()) -> binary().
 -spec sha_final(binary()) -> binary().
 
-sha(_Data) -> ?nif_stub.
-sha_init() -> ?nif_stub.
-sha_update(_Context, _Data) -> ?nif_stub.
-sha_final(_Context) -> ?nif_stub.
-
-%
-%% SHA224
-%%
--spec sha224(iodata()) -> binary().
--spec sha224_init() -> binary().
--spec sha224_update(binary(), iodata()) -> binary().
--spec sha224_final(binary()) -> binary().
-
-sha224(Data) ->
-    case sha224_nif(Data) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-sha224_init() ->
-    case sha224_init_nif() of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-sha224_update(Context, Data) ->
-    case sha224_update_nif(Context, Data) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-sha224_final(Context) ->
-    case sha224_final_nif(Context) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-
-sha224_nif(_Data) -> ?nif_stub.
-sha224_init_nif() -> ?nif_stub.
-sha224_update_nif(_Context, _Data) -> ?nif_stub.
-sha224_final_nif(_Context) -> ?nif_stub.
-
-%
-%% SHA256
-%%
--spec sha256(iodata()) -> binary().
--spec sha256_init() -> binary().
--spec sha256_update(binary(), iodata()) -> binary().
--spec sha256_final(binary()) -> binary().
-
-sha256(Data) ->
-    case sha256_nif(Data) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-sha256_init() ->
-    case sha256_init_nif() of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-sha256_update(Context, Data) ->
-    case sha256_update_nif(Context, Data) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-sha256_final(Context) ->
-    case sha256_final_nif(Context) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-
-sha256_nif(_Data) -> ?nif_stub.
-sha256_init_nif() -> ?nif_stub.
-sha256_update_nif(_Context, _Data) -> ?nif_stub.
-sha256_final_nif(_Context) -> ?nif_stub.
-
-%
-%% SHA384
-%%
--spec sha384(iodata()) -> binary().
--spec sha384_init() -> binary().
--spec sha384_update(binary(), iodata()) -> binary().
--spec sha384_final(binary()) -> binary().
-
-sha384(Data) ->
-    case sha384_nif(Data) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-sha384_init() ->
-    case sha384_init_nif() of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-sha384_update(Context, Data) ->
-    case sha384_update_nif(Context, Data) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-sha384_final(Context) ->
-    case sha384_final_nif(Context) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-
-sha384_nif(_Data) -> ?nif_stub.
-sha384_init_nif() -> ?nif_stub.
-sha384_update_nif(_Context, _Data) -> ?nif_stub.
-sha384_final_nif(_Context) -> ?nif_stub.
-
-%
-%% SHA512
-%%
--spec sha512(iodata()) -> binary().
--spec sha512_init() -> binary().
--spec sha512_update(binary(), iodata()) -> binary().
--spec sha512_final(binary()) -> binary().
-
-sha512(Data) ->
-    case sha512_nif(Data) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-sha512_init() ->
-    case sha512_init_nif() of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-sha512_update(Context, Data) ->
-    case sha512_update_nif(Context, Data) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-sha512_final(Context) ->
-    case sha512_final_nif(Context) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-
-sha512_nif(_Data) -> ?nif_stub.
-sha512_init_nif() -> ?nif_stub.
-sha512_update_nif(_Context, _Data) -> ?nif_stub.
-sha512_final_nif(_Context) -> ?nif_stub.
+sha(Data) ->
+    hash(sha, Data).
+sha_init() ->
+    hash_init(sha).
+sha_update(Context, Data) ->
+    hash_update(Context, Data).
+sha_final(Context) ->
+    hash_final(Context).
 
 %% HMAC --------------------------------------------------------------------
 
-hmac(Type, Key, Data, MacSize, Size, MaxBytes, initial) when Size =< MaxBytes ->
+hmac(Type, Key, Data, MacSize, Size, MaxBytes) when Size =< MaxBytes ->
+    notsup_to_error(
     case MacSize of
-	undefined ->
-	    do_hmac(Type, Key, Data);
-	_ ->
-	    do_hmac(Type, Key, Data, MacSize)
-    end;
-hmac(Type, Key, Data, MacSize, _, MaxBytes, initial) ->
-    <<Increment:MaxBytes/binary, Rest/binary>> = Data,
+          undefined -> hmac_nif(Type, Key, Data);
+          _         -> hmac_nif(Type, Key, Data, MacSize)
+      end);
+hmac(Type, Key, Data, MacSize, Size, MaxBytes) ->
     State0 = hmac_init(Type, Key),
-    State = hmac_update(State0, Increment),
-    hmac(State, Rest, MacSize, erlang:byte_size(Rest), max_bytes(), continue).
-hmac(State0, Data, MacSize, Size, MaxBytes, continue) when Size =< MaxBytes ->
-    State = hmac_update(State0, Data),
+    State1 = hmac_update(State0, Data, Size, MaxBytes),
     case MacSize of
-	undefined ->
-	    hmac_final(State);
-	 _ ->
-	    hmac_final_n(State, MacSize)
-	end;
-hmac(State0, Data, MacSize, _Size, MaxBytes, continue) ->
-    <<Increment:MaxBytes/binary, Rest/binary>> = Data,
-    State = hmac_update(State0, Increment),
-    hmac(State, Rest, MacSize, erlang:byte_size(Rest), max_bytes(), continue).
+        undefined -> hmac_final(State1);
+        _         -> hmac_final_n(State1, MacSize)
+    end.
 
 hmac_update(State, Data, Size, MaxBytes)  when Size =< MaxBytes ->
-    do_hmac_update(State, Data);
+    notsup_to_error(hmac_update_nif(State, Data));
 hmac_update(State0, Data, _, MaxBytes) ->
     <<Increment:MaxBytes/binary, Rest/binary>> = Data,
-    State = do_hmac_update(State0, Increment),
+    State = notsup_to_error(hmac_update_nif(State0, Increment)),
     hmac_update(State, Rest, erlang:byte_size(Rest), MaxBytes).
 
-do_hmac(md5, Key, Data)    -> md5_mac(Key, Data);
-do_hmac(sha, Key, Data)    -> sha_mac(Key, Data);
-do_hmac(sha224, Key, Data) -> sha224_mac(Key, Data);
-do_hmac(sha256, Key, Data) -> sha256_mac(Key, Data);
-do_hmac(sha384, Key, Data) -> sha384_mac(Key, Data);
-do_hmac(sha512, Key, Data) -> sha512_mac(Key, Data).
-
-do_hmac(md5, Key, Data, Size)    -> md5_mac_n(Key, Data, Size);
-do_hmac(sha, Key, Data, Size)    -> sha_mac_n(Key, Data, Size);
-do_hmac(sha224, Key, Data, Size) -> sha224_mac(Key, Data, Size);
-do_hmac(sha256, Key, Data, Size) -> sha256_mac(Key, Data, Size);
-do_hmac(sha384, Key, Data, Size) -> sha384_mac(Key, Data, Size);
-do_hmac(sha512, Key, Data, Size) -> sha512_mac(Key, Data, Size).
-
-do_hmac_update(_Context, _Data) -> ? nif_stub.
+hmac_nif(_Type, _Key, _Data) -> ?nif_stub.
+hmac_nif(_Type, _Key, _Data, _MacSize) -> ?nif_stub.
+hmac_init_nif(_Type, _Key) -> ?nif_stub.
+hmac_update_nif(_Context, _Data) -> ?nif_stub.
+hmac_final_nif(_Context) -> ?nif_stub.
+hmac_final_nif(_Context, _MacSize) -> ?nif_stub.
 
 %%
 %%  MD5_MAC
@@ -1002,97 +795,37 @@ do_hmac_update(_Context, _Data) -> ? nif_stub.
 -spec md5_mac(iodata(), iodata()) -> binary().
 -spec md5_mac_96(iodata(), iodata()) -> binary().
 
-md5_mac(Key, Data) ->
-    md5_mac_n(Key,Data,16).
+md5_mac(Key, Data) -> hmac(md5, Key, Data).
 
-md5_mac_96(Key, Data) ->
-    md5_mac_n(Key,Data,12).
+md5_mac_96(Key, Data) -> hmac(md5, Key, Data, 12).
 
-md5_mac_n(_Key,_Data,_MacSz) -> ?nif_stub.
-    
 %%
 %%  SHA_MAC
 %%
 -spec sha_mac(iodata(), iodata()) -> binary().
 -spec sha_mac_96(iodata(), iodata()) -> binary().
 
-sha_mac(Key, Data) ->
-    sha_mac_n(Key,Data,20).
-
-sha_mac(Key, Data, Size) ->
-    sha_mac_n(Key, Data, Size).
+sha_mac(Key, Data) -> hmac(sha, Key, Data).
 
-sha_mac_96(Key, Data) ->
-    sha_mac_n(Key,Data,12).
-
-sha_mac_n(_Key,_Data,_MacSz) -> ?nif_stub.
-
-%%
-%%  SHA224_MAC
-%%
--spec sha224_mac(iodata(), iodata()) -> binary().
+sha_mac(Key, Data, Size) -> hmac(sha, Key, Data, Size).
 
-sha224_mac(Key, Data) ->
-    sha224_mac(Key, Data, 224 div 8).
+sha_mac_96(Key, Data) -> hmac(sha, Key, Data, 12).
 
-sha224_mac(Key, Data, Size) ->
-   case sha224_mac_nif(Key, Data, Size) of
-       notsup -> erlang:error(notsup);
-       Bin -> Bin
-   end.
-
-sha224_mac_nif(_Key,_Data,_MacSz) -> ?nif_stub.
-
-%%
-%%  SHA256_MAC
-%%
--spec sha256_mac(iodata(), iodata()) -> binary().
-
-sha256_mac(Key, Data) ->
-    sha256_mac(Key, Data, 256 div 8).
-
-sha256_mac(Key, Data, Size) ->
-   case sha256_mac_nif(Key, Data, Size) of
-       notsup -> erlang:error(notsup);
-       Bin -> Bin
-   end.
-
-sha256_mac_nif(_Key,_Data,_MacSz) -> ?nif_stub.
-
-%%
-%%  SHA384_MAC
-%%
--spec sha384_mac(iodata(), iodata()) -> binary().
-
-sha384_mac(Key, Data) ->
-    sha384_mac(Key, Data, 384 div 8).
-
-sha384_mac(Key, Data, Size) ->
-   case sha384_mac_nif(Key, Data, Size) of
-       notsup -> erlang:error(notsup);
-       Bin -> Bin
-   end.
-
-sha384_mac_nif(_Key,_Data,_MacSz) -> ?nif_stub.
-
-%%
-%%  SHA512_MAC
-%%
--spec sha512_mac(iodata(), iodata()) -> binary().
-
-sha512_mac(Key, Data) ->
-    sha512_mac(Key, Data, 512 div 8).
+%% CIPHERS --------------------------------------------------------------------
 
-sha512_mac(Key, Data, MacSz) ->
-   case sha512_mac_nif(Key, Data, MacSz) of
-       notsup -> erlang:error(notsup);
-       Bin -> Bin
+block_crypt_nif(_Type, _Key, _Ivec, _Text, _IsEncrypt) -> ?nif_stub.
+block_crypt_nif(_Type, _Key, _Text, _IsEncrypt) -> ?nif_stub.
+
+check_des3_key(Key) ->
+    case lists:map(fun erlang:iolist_to_binary/1, Key) of
+        ValidKey = [B1, B2, B3] when byte_size(B1) =:= 8,
+                                     byte_size(B2) =:= 8,
+                                     byte_size(B3) =:= 8 ->
+            ValidKey;
+        _ ->
+            error(badarg)
    end.
 
-sha512_mac_nif(_Key,_Data,_MacSz) -> ?nif_stub.
-
-%% CIPHERS --------------------------------------------------------------------
-
 %%
 %% DES - in electronic codebook mode (ECB)
 %%
@@ -1100,10 +833,9 @@ sha512_mac_nif(_Key,_Data,_MacSz) -> ?nif_stub.
 -spec des_ecb_decrypt(iodata(), iodata()) -> binary().
 
 des_ecb_encrypt(Key, Data) ->
-    des_ecb_crypt(Key, Data, true).
+    block_encrypt(des_ecb, Key, Data).
 des_ecb_decrypt(Key, Data) ->
-    des_ecb_crypt(Key, Data, false).
-des_ecb_crypt(_Key, _Data, _IsEncrypt) -> ?nif_stub.
+    block_decrypt(des_ecb, Key, Data).
 
 %%
 %% DES3 - in cipher block chaining mode (CBC)
@@ -1114,16 +846,14 @@ des_ecb_crypt(_Key, _Data, _IsEncrypt) -> ?nif_stub.
 			     binary().
 
 des3_cbc_encrypt(Key1, Key2, Key3, IVec, Data) ->
-    des_ede3_cbc_crypt(Key1, Key2, Key3, IVec, Data, true).
+    block_encrypt(des3_cbc, [Key1, Key2, Key3], IVec, Data).
 des_ede3_cbc_encrypt(Key1, Key2, Key3, IVec, Data) ->
-    des_ede3_cbc_crypt(Key1, Key2, Key3, IVec, Data, true).
+    block_encrypt(des_ede3, [Key1, Key2, Key3], IVec, Data).
 
 des3_cbc_decrypt(Key1, Key2, Key3, IVec, Data) ->
-    des_ede3_cbc_crypt(Key1, Key2, Key3, IVec, Data, false).
+    block_decrypt(des3_cbc, [Key1, Key2, Key3], IVec, Data).
 des_ede3_cbc_decrypt(Key1, Key2, Key3, IVec, Data) ->
-    des_ede3_cbc_crypt(Key1, Key2, Key3, IVec, Data, false).
-
-des_ede3_cbc_crypt(_Key1, _Key2, _Key3, _IVec, _Data, _IsEncrypt) -> ?nif_stub.    
+    block_decrypt(des_ede3, [Key1, Key2, Key3], IVec, Data).
 
 %%
 %% DES3 - in 8-bits cipher feedback mode (CFB)
@@ -1134,18 +864,10 @@ des_ede3_cbc_crypt(_Key1, _Key2, _Key3, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
 			     binary().
 
 des3_cfb_encrypt(Key1, Key2, Key3, IVec, Data) ->
-    des_ede3_cfb_crypt(Key1, Key2, Key3, IVec, Data, true).
+    block_encrypt(des3_cbf, [Key1, Key2, Key3], IVec, Data).
 
 des3_cfb_decrypt(Key1, Key2, Key3, IVec, Data) ->
-    des_ede3_cfb_crypt(Key1, Key2, Key3, IVec, Data, false).
-
-des_ede3_cfb_crypt(Key1, Key2, Key3, IVec, Data, IsEncrypt) ->
-    case des_ede3_cfb_crypt_nif(Key1,Key2,Key3,IVec,Data,IsEncrypt) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-
-des_ede3_cfb_crypt_nif(_Key1, _Key2, _Key3, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
+    block_decrypt(des3_cbf, [Key1, Key2, Key3], IVec, Data).
 
 %%
 %% Blowfish
@@ -1159,62 +881,38 @@ des_ede3_cfb_crypt_nif(_Key1, _Key2, _Key3, _IVec, _Data, _IsEncrypt) -> ?nif_st
 -spec blowfish_ofb64_encrypt(iodata(), binary(), iodata()) -> binary().
 
 blowfish_ecb_encrypt(Key, Data) ->
-    bf_ecb_crypt(Key,Data, true).
+    block_encrypt(blowfish_ecb, Key, Data).
 
 blowfish_ecb_decrypt(Key, Data) ->
-    bf_ecb_crypt(Key,Data, false).
-
-bf_ecb_crypt(_Key,_Data,_IsEncrypt) -> ?nif_stub.
+    block_decrypt(blowfish_ecb, Key, Data).
 
 blowfish_cbc_encrypt(Key, IVec, Data) ->
-    bf_cbc_crypt(Key,IVec,Data,true).
+    block_encrypt(blowfish_cbc, Key, IVec, Data).
 
 blowfish_cbc_decrypt(Key, IVec, Data) ->
-    bf_cbc_crypt(Key,IVec,Data,false).
-
-bf_cbc_crypt(_Key,_IVec,_Data,_IsEncrypt) -> ?nif_stub.    
+    block_decrypt(blowfish_cbc, Key, IVec, Data).
 
 blowfish_cfb64_encrypt(Key, IVec, Data) ->
-    bf_cfb64_crypt(Key, IVec, Data, true).
+    block_encrypt(blowfish_cfb64, Key, IVec, Data).
 
 blowfish_cfb64_decrypt(Key, IVec, Data) ->
-    bf_cfb64_crypt(Key, IVec, Data, false).
-
-bf_cfb64_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
-
-blowfish_ofb64_decrypt(Key, Ivec, Data) ->
-    blowfish_ofb64_encrypt(Key, Ivec, Data).
+    block_decrypt(blowfish_cfb64, Key, IVec, Data).
 
-blowfish_ofb64_encrypt(_Key, _IVec, _Data) -> ?nif_stub.
+blowfish_ofb64_encrypt(Key, IVec, Data) ->
+    block_encrypt(blowfish_ofb64, Key, IVec, Data).
 
 
 %%
-%% AES in cipher feedback mode (CFB) - 8 bit shift
-%%
--spec aes_cfb_8_encrypt(iodata(), binary(), iodata()) -> binary().
--spec aes_cfb_8_decrypt(iodata(), binary(), iodata()) -> binary().
-
-aes_cfb_8_encrypt(Key, IVec, Data) ->
-    aes_cfb_8_crypt(Key, IVec, Data, true).
-
-aes_cfb_8_decrypt(Key, IVec, Data) ->
-    aes_cfb_8_crypt(Key, IVec, Data, false).
-
-aes_cfb_8_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.     
-
-%%
 %% AES in cipher feedback mode (CFB) - 128 bit shift
 %%
 -spec aes_cfb_128_encrypt(iodata(), binary(), iodata()) -> binary().
 -spec aes_cfb_128_decrypt(iodata(), binary(), iodata()) -> binary().
 
 aes_cfb_128_encrypt(Key, IVec, Data) ->
-    aes_cfb_128_crypt(Key, IVec, Data, true).
+    block_encrypt(aes_cfb128, Key, IVec, Data).
 
 aes_cfb_128_decrypt(Key, IVec, Data) ->
-    aes_cfb_128_crypt(Key, IVec, Data, false).
-
-aes_cfb_128_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.     
+    block_decrypt(aes_cfb128, Key, IVec, Data).
 
 %%
 %% AES - in Galois/Counter Mode (GCM)
@@ -1235,12 +933,10 @@ chacha20_poly1305_decrypt(_Key, _Ivec, _AAD, _In, _Tag) -> ?nif_stub.
 -spec des_cbc_decrypt(iodata(), binary(), iodata()) -> binary().
 
 des_cbc_encrypt(Key, IVec, Data) ->
-    des_cbc_crypt(Key, IVec, Data, true).
+    block_encrypt(des_cbc, Key, IVec, Data).
 
 des_cbc_decrypt(Key, IVec, Data) ->
-    des_cbc_crypt(Key, IVec, Data, false).
-
-des_cbc_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
+    block_decrypt(des_cbc, Key, IVec, Data).
 
 %%
 %% dec_cbc_ivec(Data) -> binary()
@@ -1250,11 +946,8 @@ des_cbc_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
 %%
 -spec des_cbc_ivec(iodata()) -> binary().
 
-des_cbc_ivec(Data) when is_binary(Data) ->
-    {_, IVec} = split_binary(Data, size(Data) - 8),
-    IVec;
-des_cbc_ivec(Data) when is_list(Data) ->
-    des_cbc_ivec(list_to_binary(Data)).
+des_cbc_ivec(Data) ->
+    next_iv(des_cbc, Data).
 
 %%
 %% DES - in 8-bits cipher feedback mode (CFB)
@@ -1263,12 +956,10 @@ des_cbc_ivec(Data) when is_list(Data) ->
 -spec des_cfb_decrypt(iodata(), binary(), iodata()) -> binary().
 
 des_cfb_encrypt(Key, IVec, Data) ->
-    des_cfb_crypt(Key, IVec, Data, true).
+    block_encrypt(des_cfb, Key, IVec, Data).
 
 des_cfb_decrypt(Key, IVec, Data) ->
-    des_cfb_crypt(Key, IVec, Data, false).
-
-des_cfb_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
+    block_decrypt(des_cfb, Key, IVec, Data).
 
 %%
 %% dec_cfb_ivec(IVec, Data) -> binary()
@@ -1280,9 +971,7 @@ des_cfb_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
 -spec des_cfb_ivec(iodata(), iodata()) -> binary().
 
 des_cfb_ivec(IVec, Data) ->
-    IVecAndData = list_to_binary([IVec, Data]),
-    {_, NewIVec} = split_binary(IVecAndData, byte_size(IVecAndData) - 8),
-    NewIVec.
+    next_iv(des_cfb, Data, IVec).
 
 
 %%
@@ -1298,18 +987,16 @@ des_cfb_ivec(IVec, Data) ->
 				 binary().
 
 aes_cbc_128_encrypt(Key, IVec, Data) ->
-    aes_cbc_crypt(Key, IVec, Data, true).
+    block_encrypt(aes_cbc128, Key, IVec, Data).
 
 aes_cbc_128_decrypt(Key, IVec, Data) ->
-    aes_cbc_crypt(Key, IVec, Data, false).
+    block_decrypt(aes_cbc128, Key, IVec, Data).
 
 aes_cbc_256_encrypt(Key, IVec, Data) ->
-    aes_cbc_crypt(Key, IVec, Data, true).
+    block_encrypt(aes_cbc256, Key, IVec, Data).
 
 aes_cbc_256_decrypt(Key, IVec, Data) ->
-    aes_cbc_crypt(Key, IVec, Data, false).
-
-aes_cbc_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
+    block_decrypt(aes_cbc256, Key, IVec, Data).
 
 %%
 %% aes_cbc_ivec(Data) -> binary()
@@ -1318,47 +1005,15 @@ aes_cbc_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
 %% aes_cbc_*_[encrypt|decrypt].
 %% IVec size: 16 bytes
 %%
-aes_cbc_ivec(Data) when is_binary(Data) ->
-    {_, IVec} = split_binary(Data, size(Data) - 16),
-    IVec;
-aes_cbc_ivec(Data) when is_list(Data) ->
-    aes_cbc_ivec(list_to_binary(Data)).
-
+aes_cbc_ivec(Data) ->
+    next_iv(aes_cbc, Data).
 
 %%
 %% AES - with 256 bit key in infinite garble extension mode (IGE)
 %%
 
--spec aes_ige_256_decrypt(iodata(), binary(), iodata()) ->
-                 binary().
-
-aes_ige_256_encrypt(Key, IVec, Data) ->
-    aes_ige_crypt(Key, IVec, Data, true).
-
-aes_ige_256_decrypt(Key, IVec, Data) ->
-    aes_ige_crypt(Key, IVec, Data, false).
-
-aes_ige_crypt(Key, IVec, Data, IsEncrypt) ->
-    case aes_ige_crypt_nif(Key,IVec,Data,IsEncrypt) of
-	notsup -> erlang:error(notsup);
-	Bin -> Bin
-    end.
-
 aes_ige_crypt_nif(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
 
-%%
-%% aes_ige_ivec(Data) -> binary()
-%%
-%% Returns the IVec to be used in the next iteration of
-%% aes_ige_*_[encrypt|decrypt].
-%% IVec size: 32 bytes
-%%
-aes_ige_ivec(Data) when is_binary(Data) ->
-    {_, IVec} = split_binary(Data, size(Data) - 32),
-    IVec;
-aes_ige_ivec(Data) when is_list(Data) ->
-    aes_ige_ivec(list_to_binary(Data)).
-
 
 %% Stream ciphers --------------------------------------------------------------------
 
@@ -1397,22 +1052,11 @@ do_stream_decrypt({rc4, State0}, Data) ->
 aes_ctr_encrypt(_Key, _IVec, _Data) -> ?nif_stub.
 aes_ctr_decrypt(_Key, _IVec, _Cipher) -> ?nif_stub.
 
-%%
-%% AES - in electronic codebook mode (ECB)
-%%
-aes_ecb_encrypt(Key, Data) ->
-    aes_ecb_crypt(Key, Data, true).
-
-aes_ecb_decrypt(Key, Data) ->
-    aes_ecb_crypt(Key, Data, false).
-
-aes_ecb_crypt(_Key, __Data, _IsEncrypt) -> ?nif_stub.
-
 
 %%
 %% AES - in counter mode (CTR) with state maintained for multi-call streaming 
 %%
--type ctr_state() :: { iodata(), binary(), binary(), integer() }.
+-type ctr_state() :: { iodata(), binary(), binary(), integer() } | binary().
 
 -spec aes_ctr_stream_init(iodata(), binary()) -> ctr_state().
 -spec aes_ctr_stream_encrypt(ctr_state(), binary()) ->
@@ -1420,10 +1064,9 @@ aes_ecb_crypt(_Key, __Data, _IsEncrypt) -> ?nif_stub.
 -spec aes_ctr_stream_decrypt(ctr_state(), binary()) ->
 				 { ctr_state(), binary() }.
  
-aes_ctr_stream_init(Key, IVec) -> 
-    {Key, IVec, << 0:128 >>, 0}.
-aes_ctr_stream_encrypt({_Key, _IVec, _ECount, _Num}=_State, _Data) -> ?nif_stub.
-aes_ctr_stream_decrypt({_Key, _IVec, _ECount, _Num}=_State, _Cipher) -> ?nif_stub.
+aes_ctr_stream_init(_Key, _IVec) -> ?nif_stub.
+aes_ctr_stream_encrypt(_State, _Data) -> ?nif_stub.
+aes_ctr_stream_decrypt(_State, _Cipher) -> ?nif_stub.
      
 %%
 %% RC4 - symmetric stream cipher
@@ -1438,21 +1081,19 @@ rc4_encrypt_with_state(_State, _Data) -> ?nif_stub.
 %% RC2 block cipher
 
 rc2_cbc_encrypt(Key, IVec, Data) ->
-    rc2_cbc_crypt(Key,IVec,Data,true).
+    block_encrypt(rc2_cbc, Key, IVec, Data).
 
 rc2_cbc_decrypt(Key, IVec, Data) ->
-    rc2_cbc_crypt(Key,IVec,Data,false).
-
-rc2_cbc_crypt(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
+    block_decrypt(rc2_cbc, Key, IVec, Data).
 
 %%
 %% RC2 - 40 bits block cipher - Backwards compatibility not documented.
 %%
 rc2_40_cbc_encrypt(Key, IVec, Data) when erlang:byte_size(Key) == 5 ->
-    rc2_cbc_crypt(Key,IVec,Data,true).
+    block_encrypt(rc2_cbc, Key, IVec, Data).
 
 rc2_40_cbc_decrypt(Key, IVec, Data)  when erlang:byte_size(Key) == 5 ->
-    rc2_cbc_crypt(Key,IVec,Data,false).
+    block_decrypt(rc2_cbc, Key, IVec, Data).
 
 
 %% Secure remote password  -------------------------------------------------------------------
@@ -1470,16 +1111,18 @@ host_srp_gen_key(Private, Verifier, Generator, Prime, Version) ->
    case srp_value_B_nif(Multiplier, Verifier, Generator, Private, Prime) of
    error ->
        error;
+   notsup ->
+       erlang:error(notsup);
    Public ->
        {Public, Private}
    end.
 
 srp_multiplier('6a', Generator, Prime) ->
     %% k = SHA1(N | PAD(g)) from http://srp.stanford.edu/design.html
-    C0 = sha_init(),
-    C1 = sha_update(C0, Prime),
-    C2 = sha_update(C1, srp_pad_to(erlang:byte_size(Prime), Generator)),
-    sha_final(C2);
+    C0 = hash_init(sha),
+    C1 = hash_update(C0, Prime),
+    C2 = hash_update(C1, srp_pad_to(erlang:byte_size(Prime), Generator)),
+    hash_final(C2);
 srp_multiplier('6', _, _) ->
     <<3/integer>>;
 srp_multiplier('3', _, _) ->
@@ -1488,10 +1131,10 @@ srp_multiplier('3', _, _) ->
 srp_scrambler(Version, UserPublic, HostPublic, Prime) when Version == '6'; Version == '6a'->
     %% SHA1(PAD(A) | PAD(B)) from http://srp.stanford.edu/design.html
     PadLength = erlang:byte_size(Prime),
-    C0 = sha_init(),
-    C1 = sha_update(C0, srp_pad_to(PadLength, UserPublic)),
-    C2 = sha_update(C1, srp_pad_to(PadLength, HostPublic)),
-    sha_final(C2);
+    C0 = hash_init(sha),
+    C1 = hash_update(C0, srp_pad_to(PadLength, UserPublic)),
+    C2 = hash_update(C1, srp_pad_to(PadLength, HostPublic)),
+    hash_final(C2);
 srp_scrambler('3', _, HostPublic, _Prime) ->
     %% The parameter u is a 32-bit unsigned integer which takes its value
     %% from the first 32 bits of the SHA1 hash of B, MSB first.
@@ -1515,13 +1158,13 @@ srp_value_B_nif(_Multiplier, _Verifier, _Generator, _Exponent, _Prime) -> ?nif_s
 
 
 %% Digital signatures  --------------------------------------------------------------------
-rsa_sign_nif(_Type,_Data,_Key) -> ?nif_stub.
-dss_sign_nif(_Type,_Data,_Key) -> ?nif_stub.
-ecdsa_sign_nif(_Type, _DataOrDigest, _Curve, _Key) -> ?nif_stub.
+rsa_sign_nif(_Type,_Digest,_Key) -> ?nif_stub.
+dss_sign_nif(_Type,_Digest,_Key) -> ?nif_stub.
+ecdsa_sign_nif(_Type, _Digest, _Curve, _Key) -> ?nif_stub.
 
-dss_verify_nif(_Type, _Data, _Signature, _Key) -> ?nif_stub.
-rsa_verify_nif(_Type, _Data, _Signature, _Key) -> ?nif_stub.
-ecdsa_verify_nif(_Type, _DataOrDigest, _Signature, _Curve, _Key) -> ?nif_stub.
+dss_verify_nif(_Type, _Digest, _Signature, _Key) -> ?nif_stub.
+rsa_verify_nif(_Type, _Digest, _Signature, _Key) -> ?nif_stub.
+ecdsa_verify_nif(_Type, _Digest, _Signature, _Curve, _Key) -> ?nif_stub.
 
 %% Public Keys  --------------------------------------------------------------------
 %% DH Diffie-Hellman functions
diff --git a/lib/crypto/test/Makefile b/lib/crypto/test/Makefile
index 07e5c1b754..928a1b1d73 100644
--- a/lib/crypto/test/Makefile
+++ b/lib/crypto/test/Makefile
@@ -28,7 +28,7 @@ RELSYSDIR = $(RELEASE_PATH)/crypto_test
 # FLAGS
 # ----------------------------------------------------
 ERL_MAKE_FLAGS += 
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 MAKE_EMAKE = $(wildcard $(ERL_TOP)/make/make_emakefile)
diff --git a/lib/crypto/test/blowfish_SUITE.erl b/lib/crypto/test/blowfish_SUITE.erl
index b0d6954820..19f60450e9 100644
--- a/lib/crypto/test/blowfish_SUITE.erl
+++ b/lib/crypto/test/blowfish_SUITE.erl
@@ -24,8 +24,7 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(TIMEOUT, 120000). % 2 min
 
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 802c8a4df4..f34d27649a 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -66,6 +66,7 @@ all() ->
      {group, aes_ctr},
      {group, aes_gcm},
      {group, chacha20_poly1305},
+     {group, aes_cbc},
      mod_pow,
      exor,
      rand_uniform
@@ -107,7 +108,8 @@ groups() ->
      {rc4, [], [stream]}, 
      {aes_ctr, [], [stream]},
      {aes_gcm, [], [aead]},
-     {chacha20_poly1305, [], [aead]}
+     {chacha20_poly1305, [], [aead]},
+     {aes_cbc, [], [block]}
     ].
 
 %%-------------------------------------------------------------------
@@ -118,10 +120,10 @@ init_per_suite(Config) ->
 		_ ->
 		    Config
 	    catch error:low_entropy ->
-		    %% Make sure we are on OSE, otherwise we want to crash
-		    {ose,_} = os:type(),
+                    %% We are testing on an OS with low entropy in its random
+                    %% seed. So we have to seed it with a binary to get started.
 
-		    %% This is NOT how you want to seed this, it is just here
+		    %% This is NOT how you want to do seeding, it is just here
 		    %% to make the tests pass. Check your OS manual for how you
 		    %% really want to seed.
 		    {H,M,L} = erlang:now(),
@@ -363,6 +365,21 @@ block_cipher({Type, Key,  IV, PlainText}) ->
 	    ok;
 	Other ->
 	    ct:fail({{crypto, block_decrypt, [Type, Key, IV, CipherText]}, {expected, Plain}, {got, Other}})
+    end;
+
+block_cipher({Type, Key, IV, PlainText, CipherText}) ->
+    Plain = iolist_to_binary(PlainText),
+    case crypto:block_encrypt(Type, Key, IV, Plain) of
+	CipherText ->
+	    ok;
+	Other0 ->
+	    ct:fail({{crypto, block_encrypt, [Type, Key, IV, Plain]}, {expected, CipherText}, {got, Other0}})
+    end,
+    case crypto:block_decrypt(Type, Key, IV, CipherText) of
+	Plain ->
+	    ok;
+	Other1 ->
+	    ct:fail({{crypto, block_decrypt, [Type, Key, IV, CipherText]}, {expected, Plain}, {got, Other1}})
     end.
 
 block_cipher_increment({Type, Key, IV, PlainTexts}) when Type == des_cbc;
@@ -370,7 +387,11 @@ block_cipher_increment({Type, Key, IV, PlainTexts}) when Type == des_cbc;
 							 Type == aes_cbc; 
 							 Type == des_cbf
 							 ->
-     block_cipher_increment(Type, Key, IV, IV, PlainTexts, iolist_to_binary(PlainTexts), []);
+    block_cipher_increment(Type, Key, IV, IV, PlainTexts, iolist_to_binary(PlainTexts), []);
+block_cipher_increment({Type, Key, IV, PlainTexts, _CipherText}) when Type == aes_cbc ->
+    Plain = iolist_to_binary(PlainTexts),
+    Blocks = [iolistify(Block) || << Block:128/bitstring >> <= Plain],
+    block_cipher_increment(Type, Key, IV, IV, Blocks, Plain, []);
 block_cipher_increment({_Type, _, _, _}) ->
     ok;
 block_cipher_increment({_,_,_}) ->
@@ -552,7 +573,9 @@ do_block_iolistify({des_ede3 = Type, Key, IV, PlainText}) ->
 do_block_iolistify({Type, Key, PlainText}) ->
     {Type, iolistify(Key), iolistify(PlainText)};
 do_block_iolistify({Type, Key, IV, PlainText}) ->
-    {Type, iolistify(Key), IV, iolistify(PlainText)}.
+    {Type, iolistify(Key), IV, iolistify(PlainText)};
+do_block_iolistify({Type, Key, IV, PlainText, CipherText}) ->
+    {Type, iolistify(Key), IV, iolistify(PlainText), CipherText}.
 
 iolistify(<<"Test With Truncation">>)->
     %% Do not iolistify as it spoils this special case
@@ -803,6 +826,9 @@ group_config(aes_gcm, Config) ->
 group_config(chacha20_poly1305, Config) ->
     AEAD = chacha20_poly1305(),
     [{aead, AEAD} | Config];
+group_config(aes_cbc, Config) ->
+    Block = aes_cbc(),
+    [{block, Block} | Config];
 group_config(_, Config) ->
     Config.
 
@@ -1166,6 +1192,50 @@ rc2_cbc() ->
       <<72,91,135,182,25,42,35,210>>,
      <<36,245,206,158,168,230,58,69,148,137,32,192,250,41,237,181,181,251, 192,2,175,135,177,171,57,30,111,117,159,149,15,28,88,158,28,81,28,115, 85,219,241,82,117,222,91,85,73,117,164,25,182,52,191,64,123,57,26,19, 211,27,253,31,194,219,231,104,247,240,172,130,119,21,225,154,101,247, 32,216,42,216,133,169,78,22,97,27,227,26,196,224,172,168,17,9,148,55, 203,91,252,40,61,226,236,221,215,160,78,63,13,181,68,57,196,241,185, 207, 116,129,152,237,60,139,247,153,27,146,161,246,222,98,185,222,152, 187,135, 236,86,34,7,110,91,230,173,34,160,242,202,222,121,127,181,140, 101,203,195, 190,88,250,86,147,127,87,72,126,171,16,71,47,110,248,88, 14,29,143,161,152, 129,236,148,22,152,186,208,119,70,8,174,193,203,100, 193,203,200,117,102,242, 134,142,96,125,135,200,217,190,76,117,50,70, 209,186,101,241,200,91,40,193,54, 90,195,38,47,59,197,38,234,86,223,16, 51,253,204,129,20,171,66,21,241,26,135,216, 196,114,110,91,15,53,40, 164,201,136,113,95,247,51,181,208,241,68,168,98,151,36, 155,72,24,57, 42,191,14,125,204,10,167,214,233,138,115,125,234,121,134,227,26,247, 77,200,117,110,117,111,168,156,206,67,159,149,189,173,150,193,91,199, 216,153,22, 189,137,185,89,160,13,131,132,58,109,28,110,246,252,251,14, 232,91,38,52,29,101,188,69,123,50,0,130,178,93,73,239,118,7,77,35,59, 253,10,159,45,86,142,37,78,232,48>>
      }].
+
+%% AES CBC test vectors from http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
+aes_cbc() ->
+    [
+     %% F.2.1 CBC-AES128.Encrypt, F.2.2 CBC-AES128.Decrypt
+     {aes_cbc,
+      hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"),                    %% Key
+      hexstr2bin("000102030405060708090a0b0c0d0e0f"),                    %% IV
+      hexstr2bin("6bc1bee22e409f96e93d7e117393172a"                      %% PlainText
+		 "ae2d8a571e03ac9c9eb76fac45af8e51"
+		 "30c81c46a35ce411e5fbc1191a0a52ef"
+		 "f69f2445df4f9b17ad2b417be66c3710"),
+      hexstr2bin("7649abac8119b246cee98e9b12e9197d"                      %% CipherText
+		 "5086cb9b507219ee95db113a917678b2"
+		 "73bed6b8e3c1743b7116e69e22229516"
+		 "3ff1caa1681fac09120eca307586e1a7")},
+     %% F.2.3 CBC-AES192.Encrypt, F.2.4 CBC-AES192.Decrypt
+     {aes_cbc,
+      hexstr2bin("8e73b0f7da0e6452c810f32b809079e5"                      %% Key
+		 "62f8ead2522c6b7b"),
+      hexstr2bin("000102030405060708090a0b0c0d0e0f"),                    %% IV
+      hexstr2bin("6bc1bee22e409f96e93d7e117393172a"                      %% PlainText
+		 "ae2d8a571e03ac9c9eb76fac45af8e51"
+		 "30c81c46a35ce411e5fbc1191a0a52ef"
+		 "f69f2445df4f9b17ad2b417be66c3710"),
+      hexstr2bin("4f021db243bc633d7178183a9fa071e8"                      %% CipherText
+		 "b4d9ada9ad7dedf4e5e738763f69145a"
+		 "571b242012fb7ae07fa9baac3df102e0"
+		 "08b0e27988598881d920a9e64f5615cd")},
+     %% F.2.5 CBC-AES256.Encrypt, F.2.6 CBC-AES256.Decrypt
+     {aes_cbc,
+      hexstr2bin("603deb1015ca71be2b73aef0857d7781"                      %% Key
+		 "1f352c073b6108d72d9810a30914dff4"),
+      hexstr2bin("000102030405060708090a0b0c0d0e0f"),                    %% IV
+      hexstr2bin("6bc1bee22e409f96e93d7e117393172a"                      %% PlainText
+		 "ae2d8a571e03ac9c9eb76fac45af8e51"
+		 "30c81c46a35ce411e5fbc1191a0a52ef"
+		 "f69f2445df4f9b17ad2b417be66c3710"),
+      hexstr2bin("f58c4c04d6e5f1ba779eabfb5f7bfbd6"                      %% CipherText
+		 "9cfc4e967edb808d679f777bc6702c7d"
+		 "39f23369a9d9bacfa530e26304231461"
+		 "b2eb05e2c39be9fcda6c19078c6a9d1b")}
+    ].
+
 aes_cbc128() ->
     [{aes_cbc128,
       hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
@@ -1310,6 +1380,14 @@ aes_ecb() ->
 		 "ae2d8a571e03ac9c9eb76fac45af8e51"
 		 "30c81c46a35ce411e5fbc1191a0a52ef"
 		 "f69f2445df4f9b17ad2b417be66c3710")},
+     %% F.1.3 ECB-AES192.Encrypt, F.1.4 ECB-AES192.Decrypt
+     {aes_ecb,
+      hexstr2bin("8e73b0f7da0e6452c810f32b809079e5"
+		 "62f8ead2522c6b7b"),
+      hexstr2bin("6bc1bee22e409f96e93d7e117393172a"
+		 "ae2d8a571e03ac9c9eb76fac45af8e51"
+		 "30c81c46a35ce411e5fbc1191a0a52ef"
+		 "f69f2445df4f9b17ad2b417be66c3710")},
      %% F.1.5 ECB-AES256.Encrypt, F.1.6 ECB-AES256.Decrypt
      {aes_ecb,
       hexstr2bin("603deb1015ca71be2b73aef0857d7781"
@@ -1901,7 +1979,7 @@ dss_params() ->
      18320614775012672475365915366944922415598782131828709277168615511695849821411624805195787607930033958243224786899641459701930253094446221381818858674389863050420226114787005820357372837321561754462061849169568607689530279303056075793886577588606958623645901271866346406773590024901668622321064384483571751669].
 
 ec_key_named() ->
-    Curve = secp112r2,
+    Curve = hd(crypto:ec_curves()),
     {D2_pub, D2_priv} = crypto:generate_key(ecdh, Curve),
     {[D2_priv, Curve], [D2_pub, Curve]}.
 
@@ -2070,88 +2148,94 @@ srp(ClientPrivate, Generator, Prime, Version, Verifier, ServerPublic, ServerPriv
      SessionKey}.
 ecdh() ->
     %% http://csrc.nist.gov/groups/STM/cavp/
-    [{ecdh, hexstr2point("42ea6dd9969dd2a61fea1aac7f8e98edcc896c6e55857cc0", "dfbe5d7c61fac88b11811bde328e8a0d12bf01a9d204b523"),
-            hexstr2bin("f17d3fea367b74d340851ca4270dcb24c271f445bed9d527"),
-            secp192r1,
-            hexstr2bin("803d8ab2e5b6e6fca715737c3a82f7ce3c783124f6d51cd0")},
-     {ecdh, hexstr2point("deb5712fa027ac8d2f22c455ccb73a91e17b6512b5e030e7", "7e2690a02cc9b28708431a29fb54b87b1f0c14e011ac2125"),
-            hexstr2bin("56e853349d96fe4c442448dacb7cf92bb7a95dcf574a9bd5"),
-            secp192r1,
-            hexstr2bin("c208847568b98835d7312cef1f97f7aa298283152313c29d")},
-     {ecdh, hexstr2point("af33cd0629bc7e996320a3f40368f74de8704fa37b8fab69abaae280", "882092ccbba7930f419a8a4f9bb16978bbc3838729992559a6f2e2d7"),
-            hexstr2bin("8346a60fc6f293ca5a0d2af68ba71d1dd389e5e40837942df3e43cbd"),
-            secp224r1,
-            hexstr2bin("7d96f9a3bd3c05cf5cc37feb8b9d5209d5c2597464dec3e9983743e8")},
-     {ecdh, hexstr2point("13bfcd4f8e9442393cab8fb46b9f0566c226b22b37076976f0617a46", "eeb2427529b288c63c2f8963c1e473df2fca6caa90d52e2f8db56dd4"),
-            hexstr2bin("043cb216f4b72cdf7629d63720a54aee0c99eb32d74477dac0c2f73d"),
-            secp224r1,
-            hexstr2bin("ee93ce06b89ff72009e858c68eb708e7bc79ee0300f73bed69bbca09")},
-     {ecdh, hexstr2point("700c48f77f56584c5cc632ca65640db91b6bacce3a4df6b42ce7cc838833d287", "db71e509e3fd9b060ddb20ba5c51dcc5948d46fbf640dfe0441782cab85fa4ac"),
-            hexstr2bin("7d7dc5f71eb29ddaf80d6214632eeae03d9058af1fb6d22ed80badb62bc1a534"),
-            secp256r1,
-            hexstr2bin("46fc62106420ff012e54a434fbdd2d25ccc5852060561e68040dd7778997bd7b")},
-     {ecdh, hexstr2point("809f04289c64348c01515eb03d5ce7ac1a8cb9498f5caa50197e58d43a86a7ae", "b29d84e811197f25eba8f5194092cb6ff440e26d4421011372461f579271cda3"),
-            hexstr2bin("38f65d6dce47676044d58ce5139582d568f64bb16098d179dbab07741dd5caf5"),
-            secp256r1,
-            hexstr2bin("057d636096cb80b67a8c038c890e887d1adfa4195e9b3ce241c8a778c59cda67")},
-     {ecdh, hexstr2point("a7c76b970c3b5fe8b05d2838ae04ab47697b9eaf52e764592efda27fe7513272734466b400091adbf2d68c58e0c50066", "ac68f19f2e1cb879aed43a9969b91a0839c4c38a49749b661efedf243451915ed0905a32b060992b468c64766fc8437a"),
-            hexstr2bin("3cc3122a68f0d95027ad38c067916ba0eb8c38894d22e1b15618b6818a661774ad463b205da88cf699ab4d43c9cf98a1"),
-            secp384r1,
-            hexstr2bin("5f9d29dc5e31a163060356213669c8ce132e22f57c9a04f40ba7fcead493b457e5621e766c40a2e3d4d6a04b25e533f1")},
-     {ecdh, hexstr2point("30f43fcf2b6b00de53f624f1543090681839717d53c7c955d1d69efaf0349b7363acb447240101cbb3af6641ce4b88e0", "25e46c0c54f0162a77efcc27b6ea792002ae2ba82714299c860857a68153ab62e525ec0530d81b5aa15897981e858757"),
-            hexstr2bin("92860c21bde06165f8e900c687f8ef0a05d14f290b3f07d8b3a8cc6404366e5d5119cd6d03fb12dc58e89f13df9cd783"),
-            secp384r1,
-            hexstr2bin("a23742a2c267d7425fda94b93f93bbcc24791ac51cd8fd501a238d40812f4cbfc59aac9520d758cf789c76300c69d2ff")},
-     {ecdh, hexstr2point("00685a48e86c79f0f0875f7bc18d25eb5fc8c0b07e5da4f4370f3a9490340854334b1e1b87fa395464c60626124a4e70d0f785601d37c09870ebf176666877a2046d", "01ba52c56fc8776d9e8f5db4f0cc27636d0b741bbe05400697942e80b739884a83bde99e0f6716939e632bc8986fa18dccd443a348b6c3e522497955a4f3c302f676"),
-            hexstr2bin("017eecc07ab4b329068fba65e56a1f8890aa935e57134ae0ffcce802735151f4eac6564f6ee9974c5e6887a1fefee5743ae2241bfeb95d5ce31ddcb6f9edb4d6fc47"),
-            secp521r1,
-            hexstr2bin("005fc70477c3e63bc3954bd0df3ea0d1f41ee21746ed95fc5e1fdf90930d5e136672d72cc770742d1711c3c3a4c334a0ad9759436a4d3c5bf6e74b9578fac148c831")},
-     {ecdh, hexstr2point("01df277c152108349bc34d539ee0cf06b24f5d3500677b4445453ccc21409453aafb8a72a0be9ebe54d12270aa51b3ab7f316aa5e74a951c5e53f74cd95fc29aee7a", "013d52f33a9f3c14384d1587fa8abe7aed74bc33749ad9c570b471776422c7d4505d9b0a96b3bfac041e4c6a6990ae7f700e5b4a6640229112deafa0cd8bb0d089b0"),
-            hexstr2bin("00816f19c1fb10ef94d4a1d81c156ec3d1de08b66761f03f06ee4bb9dcebbbfe1eaa1ed49a6a990838d8ed318c14d74cc872f95d05d07ad50f621ceb620cd905cfb8"),
-            secp521r1,
-            hexstr2bin("000b3920ac830ade812c8f96805da2236e002acbbf13596a9ab254d44d0e91b6255ebf1229f366fb5a05c5884ef46032c26d42189273ca4efa4c3db6bd12a6853759")},
-
-     %% RFC-6954, Appendix A
-     {ecdh, hexstr2point("A9C21A569759DA95E0387041184261440327AFE33141CA04B82DC92E",
-			 "98A0F75FBBF61D8E58AE5511B2BCDBE8E549B31E37069A2825F590C1"),
-            hexstr2bin("6060552303899E2140715816C45B57D9B42204FB6A5BF5BEAC10DB00"),
-            brainpoolP224r1,
-            hexstr2bin("1A4BFE705445120C8E3E026699054104510D119757B74D5FE2462C66")},
-     {ecdh, hexstr2point("034A56C550FF88056144E6DD56070F54B0135976B5BF77827313F36B",
-			 "75165AD99347DC86CAAB1CBB579E198EAF88DC35F927B358AA683681"),
-            hexstr2bin("39F155483CEE191FBECFE9C81D8AB1A03CDA6790E7184ACE44BCA161"),
-            brainpoolP224r1,
-            hexstr2bin("1A4BFE705445120C8E3E026699054104510D119757B74D5FE2462C66")},
-     {ecdh, hexstr2point("44106E913F92BC02A1705D9953A8414DB95E1AAA49E81D9E85F929A8E3100BE5",
-			 "8AB4846F11CACCB73CE49CBDD120F5A900A69FD32C272223F789EF10EB089BDC"),
-            hexstr2bin("55E40BC41E37E3E2AD25C3C6654511FFA8474A91A0032087593852D3E7D76BD3"),
-            brainpoolP256r1,
-            hexstr2bin("89AFC39D41D3B327814B80940B042590F96556EC91E6AE7939BCE31F3A18BF2B")},
-     {ecdh, hexstr2point("8D2D688C6CF93E1160AD04CC4429117DC2C41825E1E9FCA0ADDD34E6F1B39F7B",
-			 "990C57520812BE512641E47034832106BC7D3E8DD0E4C7F1136D7006547CEC6A"),
-            hexstr2bin("81DB1EE100150FF2EA338D708271BE38300CB54241D79950F77B063039804F1D"),
-            brainpoolP256r1,
-            hexstr2bin("89AFC39D41D3B327814B80940B042590F96556EC91E6AE7939BCE31F3A18BF2B")},
-     {ecdh, hexstr2point("68B665DD91C195800650CDD363C625F4E742E8134667B767B1B476793588F885AB698C852D4A6E77A252D6380FCAF068",
-			 "55BC91A39C9EC01DEE36017B7D673A931236D2F1F5C83942D049E3FA20607493E0D038FF2FD30C2AB67D15C85F7FAA59"),
-            hexstr2bin("032640BC6003C59260F7250C3DB58CE647F98E1260ACCE4ACDA3DD869F74E01F8BA5E0324309DB6A9831497ABAC96670"),
-            brainpoolP384r1,
-            hexstr2bin("0BD9D3A7EA0B3D519D09D8E48D0785FB744A6B355E6304BC51C229FBBCE239BBADF6403715C35D4FB2A5444F575D4F42")},
-     {ecdh, hexstr2point("4D44326F269A597A5B58BBA565DA5556ED7FD9A8A9EB76C25F46DB69D19DC8CE6AD18E404B15738B2086DF37E71D1EB4",
-			 "62D692136DE56CBE93BF5FA3188EF58BC8A3A0EC6C1E151A21038A42E9185329B5B275903D192F8D4E1F32FE9CC78C48"),
-            hexstr2bin("1E20F5E048A5886F1F157C74E91BDE2B98C8B52D58E5003D57053FC4B0BD65D6F15EB5D1EE1610DF870795143627D042"),
-            brainpoolP384r1,
-            hexstr2bin("0BD9D3A7EA0B3D519D09D8E48D0785FB744A6B355E6304BC51C229FBBCE239BBADF6403715C35D4FB2A5444F575D4F42")},
-     {ecdh, hexstr2point("0A420517E406AAC0ACDCE90FCD71487718D3B953EFD7FBEC5F7F27E28C6149999397E91E029E06457DB2D3E640668B392C2A7E737A7F0BF04436D11640FD09FD",
-			 "72E6882E8DB28AAD36237CD25D580DB23783961C8DC52DFA2EC138AD472A0FCEF3887CF62B623B2A87DE5C588301EA3E5FC269B373B60724F5E82A6AD147FDE7"),
-            hexstr2bin("230E18E1BCC88A362FA54E4EA3902009292F7F8033624FD471B5D8ACE49D12CFABBC19963DAB8E2F1EBA00BFFB29E4D72D13F2224562F405CB80503666B25429"),
-            brainpoolP512r1,
-            hexstr2bin("A7927098655F1F9976FA50A9D566865DC530331846381C87256BAF3226244B76D36403C024D7BBF0AA0803EAFF405D3D24F11A9B5C0BEF679FE1454B21C4CD1F")},
-     {ecdh, hexstr2point("9D45F66DE5D67E2E6DB6E93A59CE0BB48106097FF78A081DE781CDB31FCE8CCBAAEA8DD4320C4119F1E9CD437A2EAB3731FA9668AB268D871DEDA55A5473199F",
-			 "2FDC313095BCDD5FB3A91636F07A959C8E86B5636A1E930E8396049CB481961D365CC11453A06C719835475B12CB52FC3C383BCE35E27EF194512B71876285FA"),
-            hexstr2bin("16302FF0DBBB5A8D733DAB7141C1B45ACBC8715939677F6A56850A38BD87BD59B09E80279609FF333EB9D4C061231FB26F92EEB04982A5F1D1764CAD57665422"),
-            brainpoolP512r1,
-            hexstr2bin("A7927098655F1F9976FA50A9D566865DC530331846381C87256BAF3226244B76D36403C024D7BBF0AA0803EAFF405D3D24F11A9B5C0BEF679FE1454B21C4CD1F")}].
+    Curves = crypto:ec_curves(),
+    TestCases =
+        [{ecdh, hexstr2point("42ea6dd9969dd2a61fea1aac7f8e98edcc896c6e55857cc0", "dfbe5d7c61fac88b11811bde328e8a0d12bf01a9d204b523"),
+          hexstr2bin("f17d3fea367b74d340851ca4270dcb24c271f445bed9d527"),
+          secp192r1,
+          hexstr2bin("803d8ab2e5b6e6fca715737c3a82f7ce3c783124f6d51cd0")},
+         {ecdh, hexstr2point("deb5712fa027ac8d2f22c455ccb73a91e17b6512b5e030e7", "7e2690a02cc9b28708431a29fb54b87b1f0c14e011ac2125"),
+          hexstr2bin("56e853349d96fe4c442448dacb7cf92bb7a95dcf574a9bd5"),
+          secp192r1,
+          hexstr2bin("c208847568b98835d7312cef1f97f7aa298283152313c29d")},
+         {ecdh, hexstr2point("af33cd0629bc7e996320a3f40368f74de8704fa37b8fab69abaae280", "882092ccbba7930f419a8a4f9bb16978bbc3838729992559a6f2e2d7"),
+          hexstr2bin("8346a60fc6f293ca5a0d2af68ba71d1dd389e5e40837942df3e43cbd"),
+          secp224r1,
+          hexstr2bin("7d96f9a3bd3c05cf5cc37feb8b9d5209d5c2597464dec3e9983743e8")},
+         {ecdh, hexstr2point("13bfcd4f8e9442393cab8fb46b9f0566c226b22b37076976f0617a46", "eeb2427529b288c63c2f8963c1e473df2fca6caa90d52e2f8db56dd4"),
+          hexstr2bin("043cb216f4b72cdf7629d63720a54aee0c99eb32d74477dac0c2f73d"),
+          secp224r1,
+          hexstr2bin("ee93ce06b89ff72009e858c68eb708e7bc79ee0300f73bed69bbca09")},
+         {ecdh, hexstr2point("700c48f77f56584c5cc632ca65640db91b6bacce3a4df6b42ce7cc838833d287", "db71e509e3fd9b060ddb20ba5c51dcc5948d46fbf640dfe0441782cab85fa4ac"),
+          hexstr2bin("7d7dc5f71eb29ddaf80d6214632eeae03d9058af1fb6d22ed80badb62bc1a534"),
+          secp256r1,
+          hexstr2bin("46fc62106420ff012e54a434fbdd2d25ccc5852060561e68040dd7778997bd7b")},
+         {ecdh, hexstr2point("809f04289c64348c01515eb03d5ce7ac1a8cb9498f5caa50197e58d43a86a7ae", "b29d84e811197f25eba8f5194092cb6ff440e26d4421011372461f579271cda3"),
+          hexstr2bin("38f65d6dce47676044d58ce5139582d568f64bb16098d179dbab07741dd5caf5"),
+          secp256r1,
+          hexstr2bin("057d636096cb80b67a8c038c890e887d1adfa4195e9b3ce241c8a778c59cda67")},
+         {ecdh, hexstr2point("a7c76b970c3b5fe8b05d2838ae04ab47697b9eaf52e764592efda27fe7513272734466b400091adbf2d68c58e0c50066", "ac68f19f2e1cb879aed43a9969b91a0839c4c38a49749b661efedf243451915ed0905a32b060992b468c64766fc8437a"),
+          hexstr2bin("3cc3122a68f0d95027ad38c067916ba0eb8c38894d22e1b15618b6818a661774ad463b205da88cf699ab4d43c9cf98a1"),
+          secp384r1,
+          hexstr2bin("5f9d29dc5e31a163060356213669c8ce132e22f57c9a04f40ba7fcead493b457e5621e766c40a2e3d4d6a04b25e533f1")},
+         {ecdh, hexstr2point("30f43fcf2b6b00de53f624f1543090681839717d53c7c955d1d69efaf0349b7363acb447240101cbb3af6641ce4b88e0", "25e46c0c54f0162a77efcc27b6ea792002ae2ba82714299c860857a68153ab62e525ec0530d81b5aa15897981e858757"),
+          hexstr2bin("92860c21bde06165f8e900c687f8ef0a05d14f290b3f07d8b3a8cc6404366e5d5119cd6d03fb12dc58e89f13df9cd783"),
+          secp384r1,
+          hexstr2bin("a23742a2c267d7425fda94b93f93bbcc24791ac51cd8fd501a238d40812f4cbfc59aac9520d758cf789c76300c69d2ff")},
+         {ecdh, hexstr2point("00685a48e86c79f0f0875f7bc18d25eb5fc8c0b07e5da4f4370f3a9490340854334b1e1b87fa395464c60626124a4e70d0f785601d37c09870ebf176666877a2046d", "01ba52c56fc8776d9e8f5db4f0cc27636d0b741bbe05400697942e80b739884a83bde99e0f6716939e632bc8986fa18dccd443a348b6c3e522497955a4f3c302f676"),
+          hexstr2bin("017eecc07ab4b329068fba65e56a1f8890aa935e57134ae0ffcce802735151f4eac6564f6ee9974c5e6887a1fefee5743ae2241bfeb95d5ce31ddcb6f9edb4d6fc47"),
+          secp521r1,
+          hexstr2bin("005fc70477c3e63bc3954bd0df3ea0d1f41ee21746ed95fc5e1fdf90930d5e136672d72cc770742d1711c3c3a4c334a0ad9759436a4d3c5bf6e74b9578fac148c831")},
+         {ecdh, hexstr2point("01df277c152108349bc34d539ee0cf06b24f5d3500677b4445453ccc21409453aafb8a72a0be9ebe54d12270aa51b3ab7f316aa5e74a951c5e53f74cd95fc29aee7a", "013d52f33a9f3c14384d1587fa8abe7aed74bc33749ad9c570b471776422c7d4505d9b0a96b3bfac041e4c6a6990ae7f700e5b4a6640229112deafa0cd8bb0d089b0"),
+          hexstr2bin("00816f19c1fb10ef94d4a1d81c156ec3d1de08b66761f03f06ee4bb9dcebbbfe1eaa1ed49a6a990838d8ed318c14d74cc872f95d05d07ad50f621ceb620cd905cfb8"),
+          secp521r1,
+          hexstr2bin("000b3920ac830ade812c8f96805da2236e002acbbf13596a9ab254d44d0e91b6255ebf1229f366fb5a05c5884ef46032c26d42189273ca4efa4c3db6bd12a6853759")},
+
+         %% RFC-6954, Appendix A
+         {ecdh, hexstr2point("A9C21A569759DA95E0387041184261440327AFE33141CA04B82DC92E",
+                             "98A0F75FBBF61D8E58AE5511B2BCDBE8E549B31E37069A2825F590C1"),
+          hexstr2bin("6060552303899E2140715816C45B57D9B42204FB6A5BF5BEAC10DB00"),
+          brainpoolP224r1,
+          hexstr2bin("1A4BFE705445120C8E3E026699054104510D119757B74D5FE2462C66")},
+         {ecdh, hexstr2point("034A56C550FF88056144E6DD56070F54B0135976B5BF77827313F36B",
+                             "75165AD99347DC86CAAB1CBB579E198EAF88DC35F927B358AA683681"),
+          hexstr2bin("39F155483CEE191FBECFE9C81D8AB1A03CDA6790E7184ACE44BCA161"),
+          brainpoolP224r1,
+          hexstr2bin("1A4BFE705445120C8E3E026699054104510D119757B74D5FE2462C66")},
+         {ecdh, hexstr2point("44106E913F92BC02A1705D9953A8414DB95E1AAA49E81D9E85F929A8E3100BE5",
+                             "8AB4846F11CACCB73CE49CBDD120F5A900A69FD32C272223F789EF10EB089BDC"),
+          hexstr2bin("55E40BC41E37E3E2AD25C3C6654511FFA8474A91A0032087593852D3E7D76BD3"),
+          brainpoolP256r1,
+          hexstr2bin("89AFC39D41D3B327814B80940B042590F96556EC91E6AE7939BCE31F3A18BF2B")},
+         {ecdh, hexstr2point("8D2D688C6CF93E1160AD04CC4429117DC2C41825E1E9FCA0ADDD34E6F1B39F7B",
+                             "990C57520812BE512641E47034832106BC7D3E8DD0E4C7F1136D7006547CEC6A"),
+          hexstr2bin("81DB1EE100150FF2EA338D708271BE38300CB54241D79950F77B063039804F1D"),
+          brainpoolP256r1,
+          hexstr2bin("89AFC39D41D3B327814B80940B042590F96556EC91E6AE7939BCE31F3A18BF2B")},
+         {ecdh, hexstr2point("68B665DD91C195800650CDD363C625F4E742E8134667B767B1B476793588F885AB698C852D4A6E77A252D6380FCAF068",
+                             "55BC91A39C9EC01DEE36017B7D673A931236D2F1F5C83942D049E3FA20607493E0D038FF2FD30C2AB67D15C85F7FAA59"),
+          hexstr2bin("032640BC6003C59260F7250C3DB58CE647F98E1260ACCE4ACDA3DD869F74E01F8BA5E0324309DB6A9831497ABAC96670"),
+          brainpoolP384r1,
+          hexstr2bin("0BD9D3A7EA0B3D519D09D8E48D0785FB744A6B355E6304BC51C229FBBCE239BBADF6403715C35D4FB2A5444F575D4F42")},
+         {ecdh, hexstr2point("4D44326F269A597A5B58BBA565DA5556ED7FD9A8A9EB76C25F46DB69D19DC8CE6AD18E404B15738B2086DF37E71D1EB4",
+                             "62D692136DE56CBE93BF5FA3188EF58BC8A3A0EC6C1E151A21038A42E9185329B5B275903D192F8D4E1F32FE9CC78C48"),
+          hexstr2bin("1E20F5E048A5886F1F157C74E91BDE2B98C8B52D58E5003D57053FC4B0BD65D6F15EB5D1EE1610DF870795143627D042"),
+          brainpoolP384r1,
+          hexstr2bin("0BD9D3A7EA0B3D519D09D8E48D0785FB744A6B355E6304BC51C229FBBCE239BBADF6403715C35D4FB2A5444F575D4F42")},
+         {ecdh, hexstr2point("0A420517E406AAC0ACDCE90FCD71487718D3B953EFD7FBEC5F7F27E28C6149999397E91E029E06457DB2D3E640668B392C2A7E737A7F0BF04436D11640FD09FD",
+                             "72E6882E8DB28AAD36237CD25D580DB23783961C8DC52DFA2EC138AD472A0FCEF3887CF62B623B2A87DE5C588301EA3E5FC269B373B60724F5E82A6AD147FDE7"),
+          hexstr2bin("230E18E1BCC88A362FA54E4EA3902009292F7F8033624FD471B5D8ACE49D12CFABBC19963DAB8E2F1EBA00BFFB29E4D72D13F2224562F405CB80503666B25429"),
+          brainpoolP512r1,
+          hexstr2bin("A7927098655F1F9976FA50A9D566865DC530331846381C87256BAF3226244B76D36403C024D7BBF0AA0803EAFF405D3D24F11A9B5C0BEF679FE1454B21C4CD1F")},
+         {ecdh, hexstr2point("9D45F66DE5D67E2E6DB6E93A59CE0BB48106097FF78A081DE781CDB31FCE8CCBAAEA8DD4320C4119F1E9CD437A2EAB3731FA9668AB268D871DEDA55A5473199F",
+                             "2FDC313095BCDD5FB3A91636F07A959C8E86B5636A1E930E8396049CB481961D365CC11453A06C719835475B12CB52FC3C383BCE35E27EF194512B71876285FA"),
+          hexstr2bin("16302FF0DBBB5A8D733DAB7141C1B45ACBC8715939677F6A56850A38BD87BD59B09E80279609FF333EB9D4C061231FB26F92EEB04982A5F1D1764CAD57665422"),
+          brainpoolP512r1,
+          hexstr2bin("A7927098655F1F9976FA50A9D566865DC530331846381C87256BAF3226244B76D36403C024D7BBF0AA0803EAFF405D3D24F11A9B5C0BEF679FE1454B21C4CD1F")}],
+    lists:filter(fun ({_Type, _Pub, _Priv, Curve, _SharedSecret}) ->
+                         lists:member(Curve, Curves)
+                 end,
+                 TestCases).
 
 dh() ->
     {dh, 0087761979513264537414556992123116644042638206717762626089877284926656954974893442000747478454809111207351620687968672207938731607963470779396984752680274820156266685080223616226905101126463253150237669547023934604953898814222890239130021414026118792251620881355456432549881723310342870016961804255746630219, 2}.
@@ -2178,18 +2262,24 @@ ecc() ->
 %% information about the curves see
 %%       http://csrc.nist.gov/encryption/dss/ecdsa/NISTReCur.pdf
 %%
-    [{ecdh,secp192r1,1,
-      hexstr2point("188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
-		   "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811")},
-     {ecdh,secp192r1,2,
-      hexstr2point("DAFEBF5828783F2AD35534631588A3F629A70FB16982A888",
-		   "DD6BDA0D993DA0FA46B27BBC141B868F59331AFA5C7E93AB")},
-     {ecdh,secp192r1,3,
-      hexstr2point("76E32A2557599E6EDCD283201FB2B9AADFD0D359CBB263DA",
-		   "782C37E372BA4520AA62E0FED121D49EF3B543660CFD05FD")},
-     {ecdh,secp192r1,4,
-      hexstr2point("35433907297CC378B0015703374729D7A4FE46647084E4BA",
-		   "A2649984F2135C301EA3ACB0776CD4F125389B311DB3BE32")}].
+    Curves = crypto:ec_curves(),
+    TestCases =
+        [{ecdh,secp192r1,1,
+          hexstr2point("188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
+                       "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811")},
+         {ecdh,secp192r1,2,
+          hexstr2point("DAFEBF5828783F2AD35534631588A3F629A70FB16982A888",
+                       "DD6BDA0D993DA0FA46B27BBC141B868F59331AFA5C7E93AB")},
+         {ecdh,secp192r1,3,
+          hexstr2point("76E32A2557599E6EDCD283201FB2B9AADFD0D359CBB263DA",
+                       "782C37E372BA4520AA62E0FED121D49EF3B543660CFD05FD")},
+         {ecdh,secp192r1,4,
+          hexstr2point("35433907297CC378B0015703374729D7A4FE46647084E4BA",
+                       "A2649984F2135C301EA3ACB0776CD4F125389B311DB3BE32")}],
+    lists:filter(fun ({_Type, Curve, _Priv, _Pub}) ->
+                         lists:member(Curve, Curves)
+                 end,
+                 TestCases).
 
 no_padding() ->
     Public = [_, Mod] = rsa_public(),
diff --git a/lib/crypto/test/old_crypto_SUITE.erl b/lib/crypto/test/old_crypto_SUITE.erl
index b5894b070d..37cce2ebd2 100644
--- a/lib/crypto/test/old_crypto_SUITE.erl
+++ b/lib/crypto/test/old_crypto_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(old_crypto_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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,
@@ -1888,48 +1888,12 @@ ec(Config) when is_list(Config) ->
 
 ec_do() ->
     %% test for a name curve
-    {D2_pub, D2_priv} = crypto:generate_key(ecdh, secp112r2),
-    PrivECDH = [D2_priv, secp112r2],
-    PubECDH = [D2_pub, secp112r2],
+    NamedCurve = hd(crypto:ec_curves()),
+    {D2_pub, D2_priv} = crypto:generate_key(ecdh, NamedCurve),
+    PrivECDH = [D2_priv, NamedCurve],
+    PubECDH = [D2_pub, NamedCurve],
     %%TODO: find a published test case for a EC key
 
-    %% test for a full specified curve and public key,
-    %% taken from csca-germany_013_self_signed_cer.pem
-    PubKey = <<16#04, 16#4a, 16#94, 16#49, 16#81, 16#77, 16#9d, 16#df,
-	       16#1d, 16#a5, 16#e7, 16#c5, 16#27, 16#e2, 16#7d, 16#24,
-	       16#71, 16#a9, 16#28, 16#eb, 16#4d, 16#7b, 16#67, 16#75,
-	       16#ae, 16#09, 16#0a, 16#51, 16#45, 16#19, 16#9b, 16#d4,
-	       16#7e, 16#a0, 16#81, 16#e5, 16#5e, 16#d4, 16#a4, 16#3f,
-	       16#60, 16#7c, 16#6a, 16#50, 16#ee, 16#36, 16#41, 16#8a,
-	       16#87, 16#ff, 16#cd, 16#a6, 16#10, 16#39, 16#ca, 16#95,
-	       16#76, 16#7d, 16#ae, 16#ca, 16#c3, 16#44, 16#3f, 16#e3, 16#2c>>,
-    <<P:264/integer>> = <<16#00, 16#a9, 16#fb, 16#57, 16#db, 16#a1, 16#ee, 16#a9,
-                          16#bc, 16#3e, 16#66, 16#0a, 16#90, 16#9d, 16#83, 16#8d,
-			  16#72, 16#6e, 16#3b, 16#f6, 16#23, 16#d5, 16#26, 16#20,
-			  16#28, 16#20, 16#13, 16#48, 16#1d, 16#1f, 16#6e, 16#53, 16#77>>,
-    <<A:256/integer>> = <<16#7d, 16#5a, 16#09, 16#75, 16#fc, 16#2c, 16#30, 16#57,
-			  16#ee, 16#f6, 16#75, 16#30, 16#41, 16#7a, 16#ff, 16#e7,
-			  16#fb, 16#80, 16#55, 16#c1, 16#26, 16#dc, 16#5c, 16#6c,
-			  16#e9, 16#4a, 16#4b, 16#44, 16#f3, 16#30, 16#b5, 16#d9>>,
-    <<B:256/integer>> = <<16#26, 16#dc, 16#5c, 16#6c, 16#e9, 16#4a, 16#4b, 16#44,
-			  16#f3, 16#30, 16#b5, 16#d9, 16#bb, 16#d7, 16#7c, 16#bf,
-			  16#95, 16#84, 16#16, 16#29, 16#5c, 16#f7, 16#e1, 16#ce,
-			  16#6b, 16#cc, 16#dc, 16#18, 16#ff, 16#8c, 16#07, 16#b6>>,
-    BasePoint = <<16#04, 16#8b, 16#d2, 16#ae, 16#b9, 16#cb, 16#7e, 16#57,
-		  16#cb, 16#2c, 16#4b, 16#48, 16#2f, 16#fc, 16#81, 16#b7,
-		  16#af, 16#b9, 16#de, 16#27, 16#e1, 16#e3, 16#bd, 16#23,
-		  16#c2, 16#3a, 16#44, 16#53, 16#bd, 16#9a, 16#ce, 16#32,
-		  16#62, 16#54, 16#7e, 16#f8, 16#35, 16#c3, 16#da, 16#c4,
-		  16#fd, 16#97, 16#f8, 16#46, 16#1a, 16#14, 16#61, 16#1d,
-		  16#c9, 16#c2, 16#77, 16#45, 16#13, 16#2d, 16#ed, 16#8e,
-		  16#54, 16#5c, 16#1d, 16#54, 16#c7, 16#2f, 16#04, 16#69, 16#97>>,
-    <<Order:264/integer>> = <<16#00, 16#a9, 16#fb, 16#57, 16#db, 16#a1, 16#ee, 16#a9,
-			      16#bc, 16#3e, 16#66, 16#0a, 16#90, 16#9d, 16#83, 16#8d,
-			      16#71, 16#8c, 16#39, 16#7a, 16#a3, 16#b5, 16#61, 16#a6,
-			      16#f7, 16#90, 16#1e, 16#0e, 16#82, 16#97, 16#48, 16#56, 16#a7>>,
-    CoFactor = 1,
-    Curve = {{prime_field,P},{A,B,none},BasePoint, Order,CoFactor},
-
     Msg = <<99,234,6,64,190,237,201,99,80,248,58,40,70,45,149,218,5,246,242,63>>,
     Sign = crypto:sign(ecdsa, sha, Msg, PrivECDH),
     ?line true = crypto:verify(ecdsa, sha, Msg, Sign, PubECDH),
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index de4329e612..6dcb28ec8a 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 3.6.2
+CRYPTO_VSN = 3.6.3
diff --git a/lib/debugger/doc/src/book.xml b/lib/debugger/doc/src/book.xml
index 071a04eb61..5424ef2c04 100644
--- a/lib/debugger/doc/src/book.xml
+++ b/lib/debugger/doc/src/book.xml
@@ -47,4 +47,3 @@
   <index/>
 </book>
 
-
diff --git a/lib/debugger/doc/src/debugger.xml b/lib/debugger/doc/src/debugger.xml
index 15d498d5ae..1ecdbcd064 100644
--- a/lib/debugger/doc/src/debugger.xml
+++ b/lib/debugger/doc/src/debugger.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2013</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -29,7 +29,7 @@
     <rev></rev>
   </header>
   <module>debugger</module>
-  <modulesummary>Erlang Debugger</modulesummary>
+  <modulesummary>Erlang Debugger.</modulesummary>
   <description>
     <p>Erlang Debugger for debugging and testing of Erlang programs.</p>
   </description>
@@ -48,14 +48,14 @@
       <desc>
 	<p>Starts Debugger.</p>
 	
-	<p>If given a file name as argument, Debugger will try to load
-	  its settings from this file. Refer to Debugger User's Guide
-	  for more information about settings.</p>
+	<p>If a filename is specified as argument, Debugger tries to load
+	  its settings from this file. For details about settings, see
+	  the User's Guide.</p>
 
-	<p>If given <c>local</c> as argument, Debugger will interpret
-	  code only at the current node. If given <c>global</c> as
-	  argument, Debugger will interpret code at all known nodes,
-	  this is the default.</p>
+	<p>If <c>local</c> is specified as argument, Debugger interprets
+	  code only at the current node. If <c>global</c> is specified as
+	  argument, Debugger interprets code at all known nodes, this
+	  is the default.</p>
       </desc>
     </func>
 
@@ -67,11 +67,9 @@
 	<v>Args = [term()]</v>
       </type>
       <desc>
-	<p>This function can be used to debug a single process.
-	  The module <c>Module</c> is interpreted and
-	  <c>apply(Module,Name,Args)</c> is called. This will open an
-	  Attach Process window, refer to Debugger User's Guide for
-	  more information.</p>
+	<p>Debugs a single process. The module <c>Module</c> is interpreted
+	  and <c>apply(Module,Name,Args)</c> is called. This opens an
+	  Attach Process window. For details, see the User's Guide.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/debugger/doc/src/debugger_chapter.xml b/lib/debugger/doc/src/debugger_chapter.xml
index 98fe4ae377..45dfdb3776 100644
--- a/lib/debugger/doc/src/debugger_chapter.xml
+++ b/lib/debugger/doc/src/debugger_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
 <header>
     <copyright>
-      <year>1997</year><year>2013</year>
+      <year>1997</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,97 +31,92 @@
   </header>
 
   <section>
-    <title>Introduction</title>
+    <title>Getting Started</title>
 
-    <p><em>Debugger</em> is a graphical user interface for the Erlang
-      interpreter, which can be used for debugging and testing of
-      Erlang programs. For example, breakpoints can be set, code can be
-      single stepped and variable values can be displayed and changed.
-    </p>
+    <p>To use Debugger, the basic steps are as follows:</p>
 
-    <p>The Erlang interpreter can also be accessed via the interface
-      module <c>int</c>, see <seealso marker="int">int(3)</seealso>.
-    </p>
+    <p><em>Step 1.</em> Start Debugger by calling
+      <c>debugger:start()</c>.</p>
 
-    <p><em>Warning:</em> Note that the Debugger at some point might
-      start tracing on the processes which execute the interpreted
-      code. This means that a conflict will occur if tracing by other
-      means is started on any of these processes.</p>
-  </section>  
+    <p>The <seealso marker="#monitor">Monitor window</seealso> is
+      displayed with information about all debugged processes,
+      interpreted modules, and selected options. Initially there are
+      normally no debugged processes. First, it must be specified which
+      modules that are to be <em>debugged</em> (also called
+      <em>interpreted</em>). Proceed as follows:</p>
 
-  <section>
-    <title>Getting Started with Debugger</title>
+    <p><em>Step 2.</em> Select <em>Module > Interpret...</em> in the
+      Monitor window.</p>
 
-    <p>Start Debugger by calling <c>debugger:start()</c>. It will start
-      the <seealso marker="#monitor">Monitor window</seealso> showing
-      information about all debugged processes, interpreted modules and
-      selected options.</p>
+    <p>The <seealso marker="#interpret">Interpret Modules window</seealso>
+      is displayed.</p>
 
-    <p>Initially there are normally no debugged processes. First, it
-      must be specified which modules should be <em>debugged</em>, or
-      <em>interpreted</em> as it is also called. This is done by
-      choosing <em>Module->Interpret...</em> in the Monitor window and
-      then selecting the appropriate modules from the
-      <seealso marker="#interpret">Interpret Dialog window</seealso>.
-    </p>
+    <p><em>Step 3.</em> Select the appropriate modules from the Interpret
+      Dialog window.</p>
 
     <note>
-      <p>Only modules compiled with the option <c>debug_info</c> set
-	can be interpreted. Non-interpretable modules are shown within
-	parenthesis in the Interpret Dialog window.</p>
+      <p>Only modules compiled with option <c>debug_info</c> set can be
+        interpreted. Non-interpretable modules are displayed within
+        parenthesis in the Interpret Modules window.</p>
     </note>
 
-    <p>When a module is interpreted, it can be viewed in a
-      <seealso marker="#view">View Module window</seealso>. This is done
-      by selecting the module from the <em>Module->module->View</em>
-      menu. The contents of the source file is shown and it is possible
-      to set <seealso marker="#breakpoints">breakpoints</seealso>.</p>
-
-    <p>Now the program that should be debugged can be started. This is
-      done the normal way from the Erlang shell. All processes executing
-      code in interpreted modules will be displayed in the Monitor
-      window. It is possible to <em>attach</em> to one of these
-      processes, by double-clicking it, or by selecting the process and
-      then choosing <em>Process->Attach</em>.</p>
-
-    <p>Attaching to a process will result in a
-      <seealso marker="#attach">Attach Process window</seealso> being
-      opened for this process. From the Attach Process window, it is
-      possible to control the process execution, inspect variable
-      values, set breakpoints etc.</p>
+    <p><em>Step 4.</em> In the Monitor window, select
+      <em>Module > the module to be interpreted > View</em>.</p>
+
+    <p>The contents of the source file is displayed in the
+      <seealso marker="#view">View Module window</seealso>.</p>
+
+    <p><em>Step 5.</em> Set the
+      <seealso marker="#breakpoints">breakpoints</seealso>, if any.</p>
+
+    <p><em>Step 6.</em> Start the program to be debugged. This is done
+      the normal way from the Erlang shell.</p>
+
+    <p>All processes executing code in interpreted modules are displayed
+      in the Monitor window.</p>
+
+    <p><em>Step 7.</em> To <em>attach</em> to one of these processes,
+      double-click it, or select the process and then choose
+      <em>Process > Attach</em>. Attaching to a process opens an
+      <seealso marker="#attach">Attach Process window</seealso> for this
+      process.</p>
+
+    <p><em>Step 8.</em> From the Attach Process window, you can control
+      the process execution, inspect variable values, set breakpoints,
+      and so on.</p>
   </section>
 
   <section>
     <marker id="breakpoints"/>
-    <title>Breakpoints and Break Dialogue Windows</title>
+    <title>Breakpoints and Break Dialog Windows</title>
     
     <p>Once the appropriate modules are interpreted, breakpoints can
       be set at relevant locations in the source code. Breakpoints are
       specified on a line basis. When a process reaches a breakpoint,
-      it stops and waits for commands (step, skip, continue,...) from
-      the user.</p>
+      it stops and waits for commands (<em>Step</em>, <em>Skip</em>,
+      <em>Continue</em> ...) from the user.</p>
 
     <note>
       <p>When a process reaches a breakpoint, only that process is
-	stopped. Other processes are not affected.</p>
+        stopped. Other processes are not affected.</p>
     </note>
 
-    <p>Breakpoints are created and deleted using the Break menu of
-      the Monitor window, View Module window and Attach Process window.
-    </p>
+    <p>Breakpoints are created and deleted using the <em>Break</em> menu of
+      either the Monitor window, View Module window, or Attach Process
+      window.</p>
 
     <section>
       <title>Executable Lines</title>
 
-      <p>To have effect, a breakpoint must be set at an
-	<em>executable line</em>, which is a line of code containing an
-	executable expression such as a matching or a function call.
-	A blank line or a line containing a comment, function head or
-	pattern in a <c>case</c>- or <c>receive</c> statement is not
-	executable.</p>
+      <p>To have an effect, a breakpoint must be set at an
+        <em>executable line</em>, which is a line of code containing an
+        executable expression such as a matching or a function call.
+        A blank line or a line containing a comment, function head, or
+        pattern in a <c>case</c> statement or <c>receive</c> statement is not
+        executable.</p>
 
-      <p>In the example below, lines number 2, 4, 6, 8 and 11 are
-	executable lines:</p>
+      <p>In the following example, lines 2, 4, 6, 8, and 11 are
+        executable lines:</p>
       <pre>
 1: is_loaded(Module,Compiled) ->
 2:   case get_file(Module,Compiled) of
@@ -141,17 +136,15 @@
       <title>Status and Trigger Action</title>
 
       <p>A breakpoint can be either <em>active</em> or
-	<em>inactive</em>. Inactive breakpoints are ignored.</p>
-
-      <p>Each breakpoint has a <em>trigger action</em> which specifies
-	what should happen when a process has reached it (and stopped):
-      </p>
-      <list>
-	<item><em>enable</em> Breakpoint should remain active (default).
-	</item>
-	<item><em>disable</em> Breakpoint should be made inactive.
-	</item>
-	<item><em>delete</em> Breakpoint should be deleted.</item>
+        <em>inactive</em>. Inactive breakpoints are ignored.</p>
+
+      <p>Each breakpoint has a <em>trigger action</em> that specifies
+        what is to happen when a process has reached it (and stopped):</p>
+      <list type="bulleted">
+        <item><em>Enable</em> - Breakpoint is to remain active (default).
+        </item>
+        <item><em>Disable</em> - Breakpoint is to be made inactive.</item>
+        <item><em>Delete</em> - Breakpoint is to be deleted.</item>
       </list>
     </section>
 
@@ -161,54 +154,56 @@
       <p>A line breakpoint is created at a certain line in a module.</p>
 
       <image file="images/line_break_dialog.jpg">
-	<icaption>The Line Break Dialog Window.</icaption>
+        <icaption>Line Break Dialog Window</icaption>
       </image>
 
-      <p>Right-clicking the Module entry will open a popup menu from
-	which the appropriate module can be selected.</p>
+     <p>Right-click the <em>Module</em> entry to open a popup menu from
+       which the appropriate module can be selected.</p>
 
-      <p>A line breakpoint can also be created (and deleted) by
-	double-clicking the line when the module is displayed in
-	the View Module or Attach Process window.</p>
+     <p>A line breakpoint can also be created (and deleted) by
+       double-clicking the line when the module is displayed in
+       the View Module window or Attach Process window.</p>
     </section>
 
     <section>
       <title>Conditional Breakpoints</title>
 
       <p>A conditional breakpoint is created at a certain line in
-	the module, but a process reaching the breakpoint will stop
-	only if a given condition is true.</p>
+        the module, but a process reaching the breakpoint stops
+        only if a specified condition is true.</p>
 
       <p>The condition is specified by the user as a module name
-	<c>CModule</c> and a function name <c>CFunction</c>. When a
-	process reaches the breakpoint,
-	<c>CModule:CFunction(Bindings)</c> will be evaluated. If and
-	only if this function call returns <c>true</c>, the process
-	will stop. If the function call returns <c>false</c>,
-	the breakpoint will be silently ignored.</p>
-
-      <p><c>Bindings</c> is a list of variable bindings. Use
-	the function <c>int:get_binding(Variable,Bindings)</c> to
-	retrieve the value of <c>Variable</c> (given as an atom).
-	The function returns <c>unbound</c> or <c>{value,Value}</c>.</p>
+        <c>CModule</c> and a function name <c>CFunction</c>. When a
+        process reaches the breakpoint,
+        <c>CModule:CFunction(Bindings)</c> is evaluated. If and
+        only if this function call returns <c>true</c>, the process
+        stops. If the function call returns <c>false</c>,
+        the breakpoint is silently ignored.</p>
+
+      <p><c>Bindings</c> is a list of variable bindings. To retrieve the
+        value of <c>Variable</c> (given as an atom), use function
+        <seealso marker="int#get_binding/2"><c>int:get_binding(Variable,Bindings)</c></seealso>.
+        The function returns <c>unbound</c> or <c>{value,Value}</c>.</p>
 	
       <image file="images/cond_break_dialog.jpg">
-	<icaption>The Conditional Break Dialog Window.</icaption>
+        <icaption>Conditional Break Dialog Window</icaption>
       </image>
 
-      <p>Right-clicking the Module entry will open a popup menu from
-	which the appropriate module can be selected.</p>
+      <p>Right-click the <em>Module</em> entry to open a popup menu from
+        which the appropriate module can be selected.</p>
 
-      <p>Example: A conditional breakpoint calling
-	<c>c_test:c_break/1</c> is added at line 6 in the module
+      <p><em>Example:</em></p>
+
+      <p>A conditional breakpoint calling
+        <c>c_test:c_break/1</c> is added at line 6 in module
 	<c>fact</c>. Each time the breakpoint is reached, the function is
-	called, and when <c>N</c> is equal to 3 it returns <c>true</c>,
-	and the process stops.</p>
-	
+	called. When <c>N</c> is equal to 3, the function returns
+        <c>true</c> and the process stops.</p>
+
       <p>Extract from <c>fact.erl</c>:</p>
       <pre>
-5.   fac(0) -> 1;
-6.   fac(N) when N > 0, is_integer(N) -> N * fac(N-1).</pre>
+5. fac(0) -> 1;
+6. fac(N) when N > 0, is_integer(N) -> N * fac(N-1).</pre>
 
       <p>Definition of <c>c_test:c_break/1</c>:</p>
       <pre>
@@ -228,18 +223,18 @@ c_break(Bindings) ->
       <title>Function Breakpoints</title>
 
       <p>A function breakpoint is a set of line breakpoints, one at
-	the first line of each clause in the given function.</p>
+        the first line of each clause in the specified function.</p>
 
       <image file="images/function_break_dialog.jpg">
-	<icaption>The Function Break Dialog Window.</icaption>
+        <icaption>Function Break Dialog Window</icaption>
       </image>
 
-      <p>Right-clicking the Module entry will open a popup menu from
-	which the appropriate module can be selected.</p>
+      <p>To open a popup menu from which the appropriate module can be
+        selected, right-click the <em>Module</em> entry.</p>
 
-      <p>Clicking the Ok button (or 'Return' or 'Tab') when a module
-	name has been given, will bring up all functions of the module
-	in the listbox.</p>
+      <p>To bring up all functions of the module in the listbox,
+        click the <em>OK</em> button (or press the <em>Return</em>
+        or <em>Tab</em> key) when a module name has been specified,.</p>
     </section>
   </section>
 
@@ -249,7 +244,7 @@ c_break(Bindings) ->
 
     <p>The Erlang emulator keeps track of a <em>stack trace</em>,
       information about recent function calls. This information is
-      used, for example, if an error occurs:</p>
+      used if an error occurs, for example:</p>
     <pre>
 1> <input>catch a+1.</input>
 {'EXIT',{badarith,[{erlang,'+',[a,1],[]},
@@ -259,602 +254,597 @@ c_break(Bindings) ->
                    {shell,eval_exprs,7,[{file,"shell.erl"},{line,629}]},
                    {shell,eval_loop,3,[{file,"shell.erl"},{line,614}]}]}}</pre>
 
-    <p>See the Erlang Reference Manual,
-      <seealso marker="doc/reference_manual:errors">
-      Errors and Error Handling</seealso>,
-      for more information about the stack trace.</p>
+    <p>For details about the stack trace, see section
+      <seealso marker="doc/reference_manual:errors">Errors and Error Handling</seealso>
+      in the Erlang Reference Manual.</p>
 
-    <p>The Debugger emulates the stack trace by keeping track of recently
+    <p>Debugger emulates the stack trace by keeping track of recently
       called interpreted functions. (The real stack trace cannot be
-      used, as it shows which functions of the Debugger have been
-      called, rather than which interpreted functions).</p>
+      used, as it shows which functions of Debugger have been
+      called, rather than which interpreted functions.)</p>
 
     <p>This information can be used to traverse the chain of function
-      calls, using the 'Up' and 'Down' buttons of
-      <seealso marker="#attach">the Attach Process window</seealso>.
-    </p>
+      calls, using the <em>Up</em> and <em>Down</em> buttons in the
+      <seealso marker="#attach">Attach Process window</seealso>.</p>
 
-    <p>By default, the Debugger only saves information about recursive
+    <p>By default, Debugger only saves information about recursive
       function calls, that is, function calls that have not yet returned
-      a value (option 'Stack On, No Tail').</p>
+      a value (option <em>Stack On, No Tail</em>).</p>
 
     <p>Sometimes, however, it can be useful to save all calls, even
-      tail-recursive calls. That can be done with the 'Stack On, Tail'
-      option. Note that this option will consume more memory and slow
-      down execution of interpreted functions when there are many
-      tail-recursive calls.
-    </p>
-
-    <p>It is also possible to turn off the Debugger stack trace
-      facility ('Stack Off'). <em>Note:</em> If an error occurs, in this
-      case the stack trace will be empty.</p>
-
-    <p>See the section about <seealso marker="#monitor">the Monitor
-      Window</seealso> for information about how to change the stack
-      trace option.</p>
+      tail-recursive calls. This is done with option
+      <em>Stack On, Tail</em>. Notice that this option consumes more
+      memory and slows down execution of interpreted functions when there
+      are many tail-recursive calls.</p>
+
+    <p>To turn off the Debugger stack trace facility, select option
+      <em>Stack Off</em>.</p>
+
+    <note>
+      <p>If an error occurs, the stack trace becomes empty in this
+        case.</p>
+    </note>
+
+    <p>For information about how to change the stack trace option, see
+      section <seealso marker="#monitor">Monitor Window</seealso>.</p>
   </section>
 
   <section>
     <marker id="monitor"/>
-    <title>The Monitor Window</title>
+    <title>Monitor Window</title>
+
+    <p>The Monitor window is the main window of Debugger and displays the
+      following:</p>
 
-    <p>The Monitor window is the main window of Debugger and shows a
-      listbox containing the names of all interpreted modules
-      (double-clicking a module brings up the View Module window),
-      which options are selected, and information about all debugged
-      processes, that is all processes which have been/are executing
-      code in interpreted modules.</p>
+    <list type="bulleted">
+      <item><p>A listbox containing the names of all interpreted
+        modules</p>
+        <p>Double-clicking a module brings up the View Module window.</p>
+      </item>
+      <item><p>Which options are selected</p></item>
+      <item><p>Information about all debugged processes, that is, all
+        processes that have been or are executing code in interpreted
+        modules</p></item>
+      </list>
 
     <image file="images/monitor.jpg">
-      <icaption>The Monitor Window.</icaption>
+      <icaption>Monitor Window</icaption>
     </image>
 
-    <p>The Auto Attach buttons, Stack Trace label, Back Trace Size
-      label, and Strings button show some options set, see
-      <seealso marker="#options">Options Menu</seealso> for further
-      information about these options.</p>
+    <p>The <em>Auto Attach</em> boxes, <em>Stack Trace</em> label,
+      <em>Back Trace Size</em> label, and <em>Strings</em> box display
+      some options set. For details about these options, see section
+      <seealso marker="#options">Options Menu</seealso>.</p>
 
     <section>
       <title>Process Grid</title>
-
       <taglist>
 	<tag><em>Pid</em></tag>
 	<item><p>The process identifier.</p></item>
-	
+
 	<tag><em>Initial Call</em></tag>
 	<item><p>The first call to an interpreted function by this
-	    process. (<c>Module:Function/Arity</c>)</p></item>
+          process. (<c>Module:Function/Arity</c>)</p></item>
 
 	<tag><em>Name</em></tag>
-	<item><p>The registered name, if any. If a registered name does
-	    not show up, it may be that the Debugger received
-	    information about the process before the name had been
-	    registered. Try selecting <em>Edit->Refresh</em>.</p></item>
+	<item><p>The registered name, if any. If a registered name is not
+          displayed, it can be that Debugger received information about
+          the process before the name was registered. Try selecting
+          <em>Edit > Refresh</em>.</p></item>
 
 	<tag><em>Status</em></tag>
 	<item><p>The current status, one of the following:</p>
 	  <taglist>
 	    <tag><em>idle</em></tag>
-	    <item><p>The interpreted function call has returned a value,
-		and the process is no longer executing interpreted code.
-	      </p></item>
+	    <item><p>The interpreted function call has returned a value, and
+	      the process is no longer executing interpreted code.</p></item>
 
 	    <tag><em>running</em></tag>
 	    <item><p>The process is running.</p></item>
-	    
+
 	    <tag><em>waiting</em></tag>
 	    <item><p>The process is waiting in a <c>receive</c>
-		statement.</p></item>
-	    
+	      statement.</p></item>
+
 	    <tag><em>break</em></tag>
 	    <item><p>The process is stopped at a breakpoint.</p></item>
-	    
+
 	    <tag><em>exit</em></tag>
 	    <item><p>The process has terminated.</p></item>
-	    
+
 	    <tag><em>no_conn</em></tag>
 	    <item><p>There is no connection to the node where
-		the process is located.</p></item>
+	      the process is located.</p></item>
 	  </taglist>
 	</item>
 
 	<tag><em>Information</em></tag>
-	<item><p>Additional information, if any. If the process is
-	    stopped at a breakpoint, the field contains information
-	    about the location <c>{Module,Line}</c>. If the process has
-	    terminated, the field contains the exit reason.</p></item>
+	<item><p>More information, if any. If the process is
+	  stopped at a breakpoint, the field contains information
+	  about the location <c>{Module,Line}</c>. If the process has
+	  terminated, the field contains the exit reason.</p></item>
       </taglist>
     </section>
 
     <section>
-      <title>The File Menu</title>
-      
+      <title>File Menu</title>
+
       <taglist>
 	<tag><em>Load Settings...</em></tag>
-	<item>
-	  <p>Try to load and restore Debugger settings from a file
-	    previously saved using <em>Save Settings...</em>, see below.
-	    Any errors are silently ignored.
-            <em>Note:</em> Settings saved by Erlang R16B01 or later
-            cannot be read by Erlang R16B or earlier.</p>
+	<item><p>Tries to load and restore Debugger settings from a file
+	  previously saved using <em>Save Settings...</em> (see below).
+	  Any errors are silently ignored.</p>
+	<p>Notice that settings saved by Erlang/OTP R16B01 or later
+	  cannot be read by Erlang/OTP R16B or earlier.</p>
 	</item>
-	
+
 	<tag><em>Save Settings...</em></tag>
-	<item><p>Save Debugger settings to a file. The settings include
-	    the set of interpreted files, breakpoints, and the selected
-	    options. The settings can be restored in a later Debugger
-	    session using <em>Load Settings...</em>, see above.
-	    Any errors are silently ignored.</p>
+	<item><p>Saves Debugger settings to a file. The settings include
+	  the set of interpreted files, breakpoints, and the selected
+	  options. The settings can be restored in a later Debugger
+	  session using <em>Load Settings...</em> (see above).
+	  Any errors are silently ignored.</p>
 	</item>
-	
+
 	<tag><em>Exit</em></tag>
-	<item><p>Stop Debugger.</p></item>
+	<item><p>Stops Debugger.</p></item>
       </taglist>
     </section>
 
     <section>
-      <title>The Edit Menu</title>
+      <title>Edit Menu</title>
       <taglist>
 	<tag><em>Refresh</em></tag>
-	<item><p>Update information about debugged processes. Removes
-	    information about all terminated processes from the window,
-	    and also closes all Attach Process windows for terminated
-	    processes.</p></item>
+	<item><p>Updates information about debugged processes. Information
+	  about all terminated processes are removed from the window. All
+	  Attach Process windows for terminated processes are closed.</p></item>
 
 	<tag><em>Kill All</em></tag>
-	<item><p>Terminate all processes listed in the window using
-	    <c>exit(Pid,kill)</c>.</p></item>
+	<item><p>Terminates all processes listed in the window using
+	  <c>exit(Pid,kill)</c>.</p></item>
       </taglist>
     </section>
 
     <section>
-      <title>The Module Menu</title>
+      <title>Module Menu</title>
       <taglist>
 	<tag><em>Interpret...</em></tag>
-	<item><p>Open the <seealso marker="#interpret">Interpret Dialog
-	      window</seealso> where new modules to be interpreted can
-	    be specified.</p></item>
-	
+	<item><p>Opens the
+	  <seealso marker="#interpret">Interpret Modules window</seealso>,
+	  where new modules to be interpreted can be specified.</p></item>
+
 	<tag><em>Delete All</em></tag>
-	<item><p>Stop interpreting all modules. Processes executing in
-	    interpreted modules will terminate.</p></item>
+	<item><p>Stops interpreting all modules. Processes executing in
+	  interpreted modules terminate.</p></item>
       </taglist>
 
       <p>For each interpreted module, a corresponding entry is added to
-	the Module menu, with the following submenu:</p>
+        the <em>Module</em> menu, with the following submenu:</p>
       <taglist>
 	<tag><em>Delete</em></tag>
-	<item><p>Stop interpreting the selected module. Processes
-	    executing in this module will terminate.</p></item>
-	
+	<item><p>Stops interpreting the selected module. Processes
+	  executing in this module terminate.</p></item>
+
 	<tag><em>View</em></tag>
-	<item><p>Open a <seealso marker="#view">View Module
-	      window</seealso> showing the contents of the selected
-	    module.</p></item>
+	<item><p>Opens a
+	  <seealso marker="#view">View Module window</seealso>, displaying the
+	  contents of the selected module.</p></item>
       </taglist>
     </section>
 
     <section>
-      <title>The Process Menu</title>
+      <title>Process Menu</title>
       <p>The following menu items apply to the currently selected
-	process, provided it is stopped at a breakpoint. See the chapter
-	about the <seealso marker="#attach">Attach Process
-	  window</seealso> for more information.</p>
+        process, provided it is stopped at a breakpoint (for details, see
+	section 
+	<seealso marker="#attach">Attach Process window</seealso>):</p>
       <taglist>
 	<tag><em>Step</em></tag><item></item>
 	<tag><em>Next</em></tag><item></item>
 	<tag><em>Continue</em></tag><item></item>
 	<tag><em>Finish</em></tag><item></item>
       </taglist>
+
       <p>The following menu items apply to the currently selected
-	process.</p>
+        process:</p>
       <taglist>
 	<tag><em>Attach</em></tag>
-	<item><p>Attach to the process and open a
-	    <seealso marker="#attach">Attach Process window</seealso>.
-	  </p></item>
-	
+	<item><p>Attaches to the process and open an
+	  <seealso marker="#attach">Attach Process window</seealso>.</p></item>
+
 	<tag><em>Kill</em></tag>
-	<item><p>Terminate the process using <c>exit(Pid,kill)</c>.</p>
-	</item>
+	<item><p>Terminates the process using <c>exit(Pid,kill)</c>.</p></item>
       </taglist>
     </section>
 
-  <section>
-    <title>The Break Menu</title>
-      <p>The items in this menu are used to create and delete
-	breakpoints.
-	See the <seealso marker="#breakpoints">Breakpoints</seealso>
-	chapter for more information.</p>
+    <section>
+      <title>Break Menu</title>
+      <p>The items in this menu are used to create and delete breakpoints.
+        For details, see section
+	<seealso marker="#breakpoints">Breakpoints</seealso>.</p>
+
       <taglist>
 	<tag><em>Line Break...</em></tag>
-	<item><p>Set a line breakpoint.</p></item>
+	<item><p>Sets a line breakpoint.</p></item>
 
 	<tag><em>Conditional Break...</em></tag>
-	<item><p>Set a conditional breakpoint.</p></item>
+	<item><p>Sets a conditional breakpoint.</p></item>
 
 	<tag><em>Function Break...</em></tag>
-	<item><p>Set a function breakpoint.</p></item>
+	<item><p>Sets a function breakpoint.</p></item>
 
 	<tag><em>Enable All</em></tag>
-	<item><p>Enable all breakpoints.</p></item>
+	<item><p>Enables all breakpoints.</p></item>
 
 	<tag><em>Disable All</em></tag>
-	<item><p>Disable all breakpoints.</p></item>
+	<item><p>Disables all breakpoints.</p></item>
 
-      <tag><em>Delete All</em></tag>
-	<item><p>Remove all breakpoints.</p></item>
+	<tag><em>Delete All</em></tag>
+	<item><p>Removes all breakpoints.</p></item>
       </taglist>
 
-      <p>For each breakpoint, a corresponding entry is added to
-      the Break
-	menu, from which it is possible to disable/enable or delete
-	the breakpoint,	and to change its trigger action.</p>
+      <p>For each breakpoint, a corresponding entry is added to the
+        <em>Break</em> menu, from which it is possible to disable, enable,
+	or delete the breakpoint, and to change its trigger action.</p>
     </section>
 
     <section>
       <marker id="options"/>
-      <title>The Options Menu</title>
+      <title>Options Menu</title>
 
       <taglist>
 	<tag><em>Trace Window</em></tag>
-	<item><p>Set which areas should be visible in
-	    an <seealso marker="#attach">Attach Process
-	      window</seealso>. Does not affect already existing
-	    Attach Process windows.</p>
+	<item><p>Sets the areas to be visible in an
+	  <seealso marker="#attach">Attach Process window</seealso>.
+	  Does not affect existing Attach Process windows.</p>
 	</item>
 
 	<tag><em>Auto Attach</em></tag>
-	<item><p>Set at which events a debugged process should be
-	    automatically attached to. Affects existing debugged
-	    processes.</p>
-	  <list>
-	    <item><em>First Call</em> - the first time a process calls a
-	      function in an interpreted module.</item>
-	    <item><em>On Exit</em> - at process termination.</item>
-	    <item><em>On Break</em> - when a process reaches a
-	      breakpoint.</item>
+	<item><p>Sets the events a debugged process is to be attached
+	  to automatically. Affects existing debugged processes.</p>
+	  <list type="bulleted">
+	    <item><p><em>First Call</em> - The first time a process calls
+	      a function in an interpreted module.</p></item>
+	    <item><p><em>On Exit</em> - At process termination.</p></item>
+	    <item><p><em>On Break</em> - When a process reaches a
+	      breakpoint.</p></item>
 	  </list>
 	</item>
 
 	<tag><em>Stack Trace</em></tag>
-	<item><p>Set stack trace option, see section
+	<item><p>Sets the stack trace option, see section
 	  <seealso marker="#stack_trace">Stack Trace</seealso>. Does not
-	    affect already existing debugged processes.</p>
-	  <list>
-	    <item><em>Stack On, Tail</em> - save information about all
-	      current calls.</item>
-	    <item><em>Stack On, No Tail</em> - save information about
+	    affect existing debugged processes.</p>
+	  <list type="bulleted">
+	    <item><p><em>Stack On, Tail</em> - Saves information about all
+	      current calls.</p></item>
+	    <item><p><em>Stack On, No Tail</em> - Saves information about
 	      current calls, discarding previous information when a tail
-	      recursive call is made.</item>
-	    <item><em>Stack Off</em> - do not save any information about
-	      current calls.</item>
+	      recursive call is made.</p></item>
+	    <item><p><em>Stack Off</em> - Does not save any information about
+	      current calls.</p></item>
 	  </list>
 	</item>
 
 	<tag><em>Strings</em></tag>
-	<item><p>Set which integer lists should be printed as strings.
-            Does not affect already existing debugged processes.</p>
-	  <list>
-
-	    <item><em>Use range of +pc flag</em> - use the printable
-              character range set by the
-              <seealso marker="erts:erl#printable_character_range">
-              <c>erl(1)</c></seealso> flag <c>+pc</c>.
-          </item>
+	<item><p>Sets the integer lists to be printed as strings.
+	  Does not affect existing debugged processes.</p>
+	  <list type="bulleted">
+	    <item><p><em>Use range of +pc flag</em> - Uses the printable
+	      character range set by the <c>erl(1)</c> flag
+	      <seealso marker="erts:erl#printable_character_range"><c>+pc</c></seealso>.</p>
+	    </item>
 	  </list>
 	</item>
 
 	<tag><em>Back Trace Size...</em></tag>
-	<item><p>Set how many call frames should be fetched when
-	    inspecting the call stack from the Attach Process window.
-	    Does not affect already existing Attach Process windows.</p>
+	<item><p>Sets how many call frames to be fetched when
+	  inspecting the call stack from the Attach Process window.
+	  Does not affect existing Attach Process windows.</p>
 	</item>
       </taglist>
     </section>
 
     <section>
-      <title>The Windows Menu</title>
+      <title>Windows Menu</title>
       <p>Contains a menu item for each open Debugger window. Selecting
-	one of the items will raise the corresponding window.</p>
+        one of the items raises the corresponding window.</p>
     </section>
 
     <section>
-      <title>The Help Menu</title>
+      <title>Help Menu</title>
       <taglist>
 	<tag><em>Help</em></tag>
-	<item><p>View the Debugger documentation. Currently this
-	    function requires a web browser to be up and running.</p></item>
+	<item><p>Shows the Debugger documentation. This function requires a
+	  web browser.</p></item>
       </taglist>
     </section>
   </section>
-    
+
   <section>
     <marker id="interpret"/>
-    <title>The Interpret Dialog Window</title>
+    <title>Interpret Modules Window</title>
 
-    <p>The interpret dialog module is used for selecting which modules
-      to interpret. Initially, the window shows the modules (<c>erl</c>
-      files) and subdirectories of the current working directory.</p>
+    <p>The Interpret Modules window is used for selecting which modules
+      to interpret. Initially, the window displays the modules (<c>erl</c>
+     files) and subdirectories of the current working directory.</p>
 
-    <p>Interpretable modules are modules for which a BEAM file, compiled
-      with the option <c>debug_info</c> set, can be found in the same
+    <p>Interpretable modules are modules for which a <c>.beam</c> file,
+      compiled with option <c>debug_info</c> set, is located in the same
       directory as the source code, or in an <c>ebin</c> directory next
       to it.</p>
 
-    <p>Modules, for which the above requirements are not fulfilled, are
-      not interpretable and are therefore displayed within parentheses.
-    </p>
+    <p>Modules for which these requirements are not fulfilled are
+      not interpretable and are therefore displayed within parentheses.</p>
 
-    <p>The <c>debug_info</c> option causes <em>debug information</em> or
-      <em>abstract code</em> to be added to the BEAM file. This will
-      increase the size of the file, and also makes it possible to
+    <p>Option <c>debug_info</c> causes <em>debug information</em> or
+      <em>abstract code</em> to be added to the <c>.beam</c> file.
+      This increases the file size and makes it possible to
       reconstruct the source code. It is therefore recommended not to
       include debug information in code aimed for target systems.</p>
 
     <p>An example of how to compile code with debug information using
-      <c>erlc</c>:<br/>
-      <c>% erlc +debug_info module.erl</c></p>
-      
+      <c>erlc</c>:</p>
+    <pre>
+% erlc +debug_info module.erl</pre>
+
     <p>An example of how to compile code with debug information from
-      the Erlang shell:<br/>
-      <c>4> c(module, debug_info).</c></p>
-      
+      the Erlang shell:</p>
+    <pre>
+4> c(module, debug_info).</pre>
+
     <image file="images/interpret.jpg">
-      <icaption>The Interpret Dialog Window.</icaption>
+      <icaption>Interpret Modules Window</icaption>
     </image>
 
-    <p>Browse the file hierarchy and interpret the appropriate modules
-      by selecting a module name and pressing <em>Choose</em> (or
-      carriage return), or by double clicking the module name.
-      Interpreted modules have the type <c>erl src</c>.
-    </p>
+    <p>To browse the file hierarchy and interpret the appropriate modules,
+      either select a module name and click <em>Choose</em> (or
+      press carriage return), or double-click the module name.
+      Interpreted modules have the type <c>erl src</c>.</p>
 
-    <p>Pressing <em>All</em> will interpret all displayed modules in
-      the chosen directory.</p>
+    <p>To interpret all displayed modules in the chosen directory, click
+      <em>All</em>.</p>
 
-    <p>Pressing <em>Done</em> will close the window.</p>
+    <p>To close the window, click <em>Done</em>.</p>
 
     <note>
-      <p>When the Debugger is started in global mode (which is
-	the default, see
-	<seealso marker="debugger:debugger#start/0">debugger:start/0</seealso>),
-	modules added (or deleted) for interpretation will be added (or
-	deleted) on all known Erlang nodes.</p>
+      <p>When Debugger is started in global mode (which is the default, see
+        <seealso marker="debugger#start/0">debugger:start/0</seealso>),
+        modules added (or deleted) for interpretation are added (or
+        deleted) on all known Erlang nodes.</p>
     </note>
   </section>
 
   <section>
     <marker id="attach"/>
-    <title>The Attach Process Window</title>
+    <title>Attach Process Window</title>
 
-    <p>From an Attach Process window the user can interact with a
+    <p>From an Attach Process window, you can interact with a
       debugged process. One window is opened for each process that has
-      been attached to. Note that when attaching to a process, its
-      execution is automatically stopped.
-    </p>
+      been attached to. Notice that when attaching to a process, its
+      execution is automatically stopped.</p>
 
     <image file="images/attach.jpg">
-      <icaption>The Attach Process Window.</icaption>
+      <icaption>Attach Process Window</icaption>
     </image>
 
-    <p>The window is divided into five parts:</p>
-    <list>
-      <item><p>The Code area, showing the code being executed. The code
-	  is indented and each line is prefixed with its line number.
-	  If the process execution is stopped, the current line is
-	  marked with <em>--></em>. An existing break point at a line
-	  is marked with a stop symbol. In the example above,
-	  the execution has been stopped at line 6, before
-	  the execution of <c>fac/1</c>.</p>
-	<p>Active breakpoints are shown in red, while inactive
-	  breakpoints are shown in blue.</p>
+    <p>The window is divided into the following five parts:</p>
+    <list type="bulleted">
+      <item><p>The Code area, displaying the code being executed. The code
+        is indented and each line is prefixed with its line number.
+        If the process execution is stopped, the current line is
+        marked with <c>--></c>. An existing break point at a line
+        is marked with a stop symbol. In the example shown in the
+        illustration, the execution stopped at line 6, before
+        the execution of <c>fac/1</c>.</p>
+
+        <p>Active breakpoints are displayed in red and inactive
+          breakpoints in blue.</p>
       </item>
-      <item>The Button area, with buttons for quick access to frequently
-	used functions in the Process menu.</item>
-      <item>The Evaluator area, where the user can evaluate functions
-	within the context of the debugged process, provided that
-	process execution has been stopped.</item>
-      <item>The Bindings area, showing all variables bindings.
-	Clicking on a variable name will result in the value being
-	displayed in the Evaluator area.
-	Double-clicking on a variable name will open a window where
-	the variable value may be edited. Note however that pid,
-	reference, binary or port values can not be edited.
+
+      <item><p>The Button area, with buttons for quick access to frequently
+        used functions in the <em>Process</em> menu.</p></item>
+
+      <item><p>The Evaluator area, where you can evaluate functions
+        within the context of the debugged process, if that
+        process execution is stopped.</p></item>
+
+      <item><p>The Bindings area, displaying all variables bindings. If you
+        click a variable name, the value is displayed in the Evaluator area.
+	Double-click a variable name to open a window where
+        the variable value can be edited. Notice however that pid,
+        reference, binary, or port values cannot be edited.</p>
       </item>
-      <item><p>The Trace area, showing a trace output for the process.
-	</p>
+
+      <item><p>The Trace area, which displays a trace output for the
+        process.</p>
 	<taglist>
-	  <tag><c>++ (N) &lt;L&gt;</c></tag>
-	  <item>Function call, where <c>N</c> is the call level and
-	    <c>L</c> the line number.</item>
+          <tag><c>++ (N) &lt;L&gt;</c></tag>
+          <item><p>Function call, where <c>N</c> is the call level and
+            <c>L</c> the line number.</p></item>
 
-	  <tag><c>-- (N)</c></tag>
-	  <item>Function return value.</item>
+          <tag><c>-- (N)</c></tag>
+          <item><p>Function return value</p>.</item>
 
-	  <tag><c>==> Pid : Msg</c></tag>
-	  <item>The message <c>Msg</c> is sent to process <c>Pid</c>.
-	  </item>
+          <tag><c>==> Pid : Msg</c></tag>
+          <item><p>The message <c>Msg</c> is sent to process
+            <c>Pid</c>.</p></item>
 
-	  <tag><c><![CDATA[<== Msg]]></c></tag>
-	  <item>The message <c>Msg</c> is received.</item>
+          <tag><c><![CDATA[<== Msg]]></c></tag>
+          <item><p>The message <c>Msg</c> is received.</p></item>
 
-	  <tag><c>++ (N) receive</c></tag>
-	  <item>Waiting in a <c>receive</c>.</item>
+          <tag><c>++ (N) receive</c></tag>
+          <item><p>Waiting in a <c>receive</c>.</p></item>
 
-	  <tag><c>++ (N) receive with timeout</c></tag>
-	  <item>Waiting in a <c>receive...after</c>.</item>
-	</taglist>
+          <tag><c>++ (N) receive with timeout</c></tag>
+          <item><p>Waiting in a <c>receive...after</c>.</p></item>
+        </taglist>
 
-	<p>Also the back trace, a summary of the current function calls
-	  on the stack, is displayed in the Trace area.</p>
+        <p>The Trace area also displays Back Trace, a summary of the
+          current function calls on the stack.</p>
       </item>
     </list>
 
-    <p>It is configurable using the Options menu which areas should
-      be shown or hidden. By default, all areas except the Trace area
-      are shown.</p>
+    <p>Using the <em>Options</em> menu, you can set which areas to be
+      displayed. By default, all areas except the Trace area are displayed.</p>
 
     <section>
-      <title>The File Menu</title>
+      <title>File Menu</title>
 
       <taglist>
 	<tag><em>Close</em></tag>
-	<item><p>Close this window and detach from the process.</p>
+	<item><p>Closes this window and detach from the process.</p>
 	</item>
       </taglist>
     </section>
 
     <section>
-      <title>The Edit Menu</title>
+      <title>Edit Menu</title>
 
       <taglist>
 	<tag><em>Go to line...</em></tag>
-	<item><p>Go to a specified line number.</p></item>
+	<item><p>Goes to a specified line number.</p></item>
 
 	<tag><em>Search...</em></tag>
-	<item><p>Search for a specified string.</p></item>
+	<item><p>Searches for a specified string.</p></item>
       </taglist>
     </section>
 
     <section>
-      <title>The Process Menu</title>
+      <title>Process Menu</title>
 
       <taglist>
 	<tag><em>Step</em></tag> 
-	<item><p>Execute the current line of code, stepping into any
+	<item><p>Executes the current code line, stepping into any
 	    (interpreted) function calls.</p></item>
 
 	<tag><em>Next</em></tag>
-	<item><p>Execute the current line of code and stop at the next
+	<item><p>Executes the current code line and stop at the next
 	    line.</p></item>
 
 	<tag><em>Continue</em></tag>
-	<item><p>Continue the execution.</p></item>
+	<item><p>Continues the execution.</p></item>
 
 	<tag><em>Finish</em></tag>
-	<item><p>Continue the execution until the current function
+	<item><p>Continues the execution until the current function
 	    returns.</p></item>
 
 	<tag><em>Skip</em></tag>
-	<item><p>Skip the current line of code and stop at the next
+	<item><p>Skips the current code line and stop at the next
 	    line. If used on the last line in a function body,
-	    the function will return <c>skipped</c>.</p></item>
+	    the function returns <c>skipped</c>.</p></item>
 
 	<tag><em>Time Out</em></tag>
-	<item><p>Simulate a timeout when executing a
+	<item><p>Simulates a time-out when executing a
 	    <c>receive...after</c> statement.</p></item>
 
 	<tag><em>Stop</em></tag>
-	<item><p>Stop the execution of a running process, that is, make
-	    the process stop as at a breakpoint. The command will take
+	<item><p>Stops the execution of a running process, that is, make
+	    the process stop at a breakpoint. The command takes
 	    effect (visibly) the next time the process receives a
 	    message.</p></item>
 
 	<tag><em>Where</em></tag>
-	<item><p>Make sure the current location of the execution is
+	<item><p>Verifies that the current location of the execution is
 	    visible in the code area.</p></item>
 
 	<tag><em>Kill</em></tag>
-	<item><p>Terminate the process using <c>exit(Pid,kill)</c>.</p>
+	<item><p>Terminates the process using <c>exit(Pid,kill)</c>.</p>
 	</item>
 
 	<tag><em>Messages</em></tag>
-	<item><p>Inspect the message queue of the process. The queue is
-	    printed in the evaluator area.</p></item>
+	<item><p>Inspects the message queue of the process. The queue is
+	    displayed in the Evaluator area.</p></item>
 
 	<tag><em>Back Trace</em></tag>
-	<item><p>Display the back trace of the process, a summary of
-	    the current function calls on the stack, in the trace area.
-	    Requires that the Trace area is visible and that the stack
-	    trace option is 'Stack On, Tail' or 'Stack On, No Tail'.</p>
+	<item><p>Displays the back trace of the process, a summary of
+	    the current function calls on the stack, in the Trace area.
+	    Requires that the Trace area is visible and that the Stack
+	    Trace option is <em>Stack On, Tail</em> or
+	    <em>Stack On, No Tail</em>.</p>
 	</item>
 
 	<tag><em>Up</em></tag>
-	<item><p>Inspect the previous function call on the stack,
+	<item><p>Inspects the previous function call on the stack,
 	    showing the location and variable bindings.</p></item>
 
 	<tag><em>Down</em></tag>
-	<item><p>Inspect the next function call on the stack, showing
+	<item><p>Inspects the next function call on the stack, showing
 	    the location and variable bindings.</p></item>
       </taglist>
     </section>
 
     <section>
-      <title>The Options Menu</title>
+      <title>Options Menu</title>
 
       <taglist>
 	<tag><em>Trace Window</em></tag>
-	<item><p>Set which areas should be visible. Does not affect
-	    other Attach Process windows.</p>
-	</item>
+	<item><p>Sets which areas are to be visible. Does not affect
+	    other Attach Process windows.</p></item>
 
 	<tag><em>Stack Trace</em></tag>
-	<item><p>Same as in <seealso marker="#monitor">the Monitor
-	      window</seealso>, but only affects the debugged
-	    process the window is attached to.</p>
-	</item>
+	<item><p>Same as in the <seealso marker="#monitor">Monitor
+	    window</seealso>, but only affects the debugged
+	    process the window is attached to.</p></item>
 
 	<tag><em>Strings</em></tag>
-	<item><p>Same as in <seealso marker="#monitor">the Monitor
-	      window</seealso>, but only affects the debugged
-	    process the window is attached to.</p>
-	</item>
+	<item><p>Same as in the <seealso marker="#monitor">Monitor
+	    window</seealso>, but only affects the debugged
+	    process the window is attached to.</p></item>
 
 	<tag><em>Back Trace Size...</em></tag>
-	<item><p>Set how many call frames should be fetched when
+	<item><p>Sets how many call frames are to be fetched when
 	    inspecting the call stack. Does not affect other Attach
-	    Process windows.</p>
-	</item>
+	    Process windows.</p></item>
       </taglist>
     </section>
 
     <section>
-      <title>Break, Windows and Help Menus</title>
+      <title>Break, Windows, and Help Menus</title>
 
-      <p>The Break, Windows and Help menus look the same as in
-	the Monitor window, see the chapter
-	<seealso marker="#monitor">The Monitor Window</seealso>, except
-	that the Breaks menu apply to the local breakpoints only.</p>
+      <p>The <em>Break</em>, <em>Windows</em>, and <em>Help</em> menus
+        are the same as in the
+        <seealso marker="#monitor">Monitor Window</seealso>, except
+        that the <em>Breaks</em> menu applies only to local
+        breakpoints.</p>
     </section>
   </section>
 
   <section>
     <marker id="view"/>
-    <title>The View Module Window</title>
+    <title>View Module Window</title>
 
-    <p>The View Module window shows the contents of an interpreted
+    <p>The View Module window displays the contents of an interpreted
       module and makes it possible to set breakpoints.</p>
 
     <image file="images/view.jpg">
-      <icaption>The View Module Window.</icaption>
+      <icaption>View Module Window</icaption>
     </image>
 
     <p>The source code is indented and each line is prefixed with its
       line number.</p>
 
-    <p>Clicking a line will highlight it and select it to be the target
-      of the breakpoint functions available from the Break menu.
-      Doubleclicking a line will set a line breakpoint on that line.
-      Doubleclicking a line with an existing breakpoint will remove
-      the breakpoint.</p>
+    <p>Clicking a line highlights it and selects it to be the target
+      of the breakpoint functions available from the <em>Break</em> menu.
+      To set a line breakpoint on a line, double-click it.
+      To remove the breakpoint, double-click the line with an existing
+       breakpoint.</p>
 
     <p>Breakpoints are marked with a stop symbol.</p>
 
     <section>
       <title>File and Edit Menus</title>
-      <p>The File and Edit menus look the same as in the Attach Process
-	window, see the chapter <seealso marker="#attach">The Attach
-	  Process Window</seealso>.</p>
+      <p>The <em>File</em> and <em>Edit</em> menus are the same as in the
+      <seealso marker="#attach">Attach Process Window</seealso>.</p>
     </section>
 
     <section>
-      <title>Break, Windows and Help Menus</title>
+      <title>Break, Windows, and Help Menus</title>
 
-      <p>The Break, Windows and Help menus look the same as in
-	the Monitor window, see the chapter
-	<seealso marker="#monitor">The Monitor Window</seealso>, except
-	that the Breaks menu apply to the local breakpoints only.</p>
+      <p>The <em>Break</em>, <em>Windows</em>, and <em>Help</em> menus
+        are the same as in the
+        <seealso marker="#monitor">Monitor Window</seealso>, except
+	that the <em>Break</em> menu applies only to local breakpoints.</p>
     </section>
   </section>
 
@@ -862,14 +852,14 @@ c_break(Bindings) ->
     <title>Performance</title>
 
     <p>Execution of interpreted code is naturally slower than for
-      regularly compiled modules. Using the Debugger also increases
+      regularly compiled modules. Using Debugger also increases
       the number of processes in the system, as for each debugged
       process another process (the meta process) is created.</p>
 
-    <p>It is also worth to keep in mind that programs with timers may
+    <p>It is also worth to keep in mind that programs with timers can
       behave differently when debugged. This is especially true when
-      stopping the execution of a process, for example at a
-      breakpoint. Timeouts can then occur in other processes that
+      stopping the execution of a process (for example, at a
+      breakpoint). Time-outs can then occur in other processes that
       continue execution as normal.</p>
   </section>
 
@@ -878,8 +868,8 @@ c_break(Bindings) ->
 
     <p>Code loading works almost as usual, except that interpreted
       modules are also stored in a database and debugged processes
-      uses only this stored code. Re-interpreting an interpreted
-      module will result in the new version being stored as well, but
+      use only this stored code. Reinterpreting an interpreted
+      module results in the new version being stored as well, but
       does not affect existing processes executing an older version
       of the code. This means that the code replacement mechanism of
       Erlang does not work for debugged processes.</p>
@@ -888,22 +878,24 @@ c_break(Bindings) ->
   <section>
     <title>Debugging Remote Nodes</title>
 
-    <p>By using <c>debugger:start/1</c>, it can be specified if Debugger
-      should be started in local or global mode.</p>
+    <p>By using
+      <seealso marker="debugger#start/1">debugger:start/1</seealso>,
+      you can specify if Debugger is to be started in local or global
+      mode:</p>
     <pre>
 debugger:start(local | global)</pre>
-    <p>If no argument is provided, Debugger is started in global mode.
-    </p>
+
+    <p>If no argument is provided, Debugger starts in global mode.</p>
 
     <p>In local mode, code is interpreted only at the current node.
       In global mode, code is interpreted at all known nodes. Processes
-      at other nodes executing interpreted code will automatically be
-      shown in the Monitor window and can be attached to like any other
+      at other nodes executing interpreted code are automatically
+      displayed in the Monitor window and can be attached to like any other
       debugged process.</p>
 
-    <p>It is possible, but definitely not recommended to start Debugger
-      in global mode on more than one node in a network, as they will
-      interfere with each other leading to inconsistent behaviour.</p>
+    <p>It is possible, but definitely not recommended, to start Debugger
+      in global mode on more than one node in a network, as the nodes
+      interfere with each other, leading to inconsistent behavior.</p>
   </section>
 </chapter>
 
diff --git a/lib/debugger/doc/src/i.xml b/lib/debugger/doc/src/i.xml
index 9ceba94b44..db89f23494 100644
--- a/lib/debugger/doc/src/i.xml
+++ b/lib/debugger/doc/src/i.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2013</year>
+      <year>1998</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -29,35 +29,36 @@
     <rev></rev>
   </header>
   <module>i</module>
-  <modulesummary>Debugger/Interpreter Interface</modulesummary>
+  <modulesummary>Debugger/Interpreter Interface.</modulesummary>
   <description>
-    <p>The module <c>i</c> provides short forms for some of
+    <p>The <c>i</c> module provides short forms for some of
       the functions used by the graphical Debugger and some of
-      the functions in the <c>int</c> module, the Erlang interpreter.
-    </p>
+      the functions in module
+      <seealso marker="int"><c>int</c></seealso>, the Erlang interpreter.</p>
 
     <p>This module also provides facilities for displaying status
       information about interpreted processes and break points.</p>
 
     <p>It is possible to attach to interpreted processes by giving
       the corresponding process identity only. By default, an attachment
-      window pops up. Processes at other Erlang nodes can be
+      window is displayed. Processes at other Erlang nodes can be
       attached manually or automatically.</p>
 
-    <p>By preference, these functions can be included in the module
-      <c>shell_default</c>. By default, they are.</p>
+    <p>By preference, these functions can be included in module
+      <seealso marker="stdlib:shell_default"><c>stdlib:shell_default</c></seealso>.
+      By default, they are included in that module.</p>
   </description>
 
   <funcs>
     <func>
       <name>im() -> pid()</name>
-      <fsummary>Start a graphical monitor</fsummary>
+      <fsummary>Start a graphical monitor.</fsummary>
       <desc>
 	<p>Starts a new graphical monitor. This is the Monitor window,
-	  the main window of the Debugger. All of the Debugger and
+	  the main window of Debugger. All the Debugger and
 	  interpreter functionality is accessed from the Monitor window.
-	  The Monitor window displays the status of all processes that 
-	  have been/are executing interpreted modules.</p>
+	  This window displays the status of all processes that 
+	  have been or are executing interpreted modules.</p>
       </desc>
     </func>
 
@@ -66,7 +67,7 @@
       <name>ii(AbsModule) -> {module, Module} | error</name>
       <name>ini(AbsModules) -> ok</name>
       <name>ini(AbsModule) -> {module, Module} | error</name>
-      <fsummary>Interpret a module</fsummary>
+      <fsummary>Interpret a module.</fsummary>
       <type>
 	<v>AbsModules = [AbsModule]</v>
 	<v>AbsModule = Module | File</v>
@@ -85,7 +86,7 @@
     <func>
       <name>iq(AbsModule) -> ok</name>
       <name>inq(AbsModule) -> ok</name>
-      <fsummary>Stop interpreting a module</fsummary>
+      <fsummary>Stop interpreting a module.</fsummary>
       <type>
 	<v>AbsModule = Module | File</v>
 	<v>&nbsp;Module = atom()</v>
@@ -110,28 +111,27 @@
 
     <func>
       <name>ip() -> ok</name>
-      <fsummary>Make a printout of the current status of all interpreted
-	processes</fsummary>
+      <fsummary>Print the current status of all interpreted
+	processes.</fsummary>
       <desc>
-	<p>Makes a printout of the current status of all interpreted 
-	  processes.</p>
+	<p>Prints the current status of all interpreted processes.</p>
       </desc>
     </func>
 
     <func>
       <name>ic() -> ok</name>
       <fsummary>Clear information about processes executing interpreted
-	code</fsummary>
+	code.</fsummary>
       <desc>
 	<p>Clears information about processes executing interpreted code
-	  byt removing all information about terminated processes.</p>
+	  by removing all information about terminated processes.</p>
       </desc>
     </func>
 
     <func>
       <name>iaa(Flags) -> true</name>
       <name>iaa(Flags, Function) -> true</name>
-      <fsummary>Set when and how to attach to a process</fsummary>
+      <fsummary>Set when and how to attach to a process.</fsummary>
       <type>
 	<v>Flags = [init | break | exit]</v>
 	<v>Function = {Module,Name,Args}</v>
@@ -139,42 +139,41 @@
 	<v>&nbsp;Args = [term()]</v>
       </type>
       <desc>
-	<p>Sets when and how to automatically attach to a debugged
-	  process, see
+	<p>Sets when and how to attach to a debugged process
+          automatically, see
 	  <seealso marker="int#auto_attach/0">int:auto_attach/2</seealso>.
 	  <c>Function</c> defaults to the standard function used by
-	  the Debugger.</p>
+	  Debugger.</p>
       </desc>
     </func>
 
     <func>
       <name>ist(Flag) -> true</name>
-      <fsummary>Set how to save call frames</fsummary>
+      <fsummary>Set how to save call frames.</fsummary>
       <type>
 	<v>Flag = all | no_tail | false</v>
       </type>
       <desc>
 	<p>Sets how to save call frames in the stack, see
-	  <seealso marker="int#stack_trace/0">int:stack_trace/1</seealso>.
-	</p>
+	  <seealso marker="int#stack_trace/0">int:stack_trace/1</seealso>.</p>
       </desc>
     </func>
 
     <func>
       <name>ia(Pid) -> ok | no_proc</name>
-      <fsummary>Attach to a process</fsummary>
+      <fsummary>Attache to a process.</fsummary>
       <type>
 	<v>Pid = pid()</v>
       </type>
       <desc>
-	<p>Attaches to the debugged process <c>Pid</c>. A Debugger
+	<p>Attaches to the debugged process <c>Pid</c>. An
 	  Attach Process window is opened for the process.</p>
       </desc>
     </func>
 
     <func>
       <name>ia(X,Y,Z) -> ok | no_proc</name>
-      <fsummary>Attach to a process</fsummary>
+      <fsummary>Attache to a process.</fsummary>
       <type>
 	<v>X = Y = Z = int()</v>
       </type>
@@ -186,7 +185,7 @@
 
     <func>
       <name>ia(Pid, Function) -> ok | no_proc</name>
-      <fsummary>Attach to a process</fsummary>
+      <fsummary>Attache to a process.</fsummary>
       <type>
 	<v>Pid = pid()</v>
 	<v>Function = {Module,Name}</v>
@@ -194,14 +193,14 @@
       </type>
       <desc>
 	<p>Attaches to the debugged process <c>Pid</c>. The interpreter
-	  will call <c>spawn(Module, Name, [Pid])</c> (and ignore
+	  calls <c>spawn(Module, Name, [Pid])</c> (and ignores
 	  the result).</p>
       </desc>
     </func>
 
     <func>
       <name>ia(X,Y,Z, Function) -> ok | no_proc</name>
-      <fsummary>Attach to a process</fsummary>
+      <fsummary>Attache to a process.</fsummary>
       <type>
 	<v>X = Y = Z = int()</v>
 	<v>Function = {Module,Name}</v>
@@ -211,15 +210,15 @@
 	<p>Same as <c>ia(Pid, Function)</c>, where <c>Pid</c> is
 	  the result of calling the shell function <c>pid(X,Y,Z)</c>.
 	  An attached process is expected to call the unofficial
-	  <c>int:attached(Pid)</c> function and to be able to handle
-	  messages from the interpreter, see <c>dbg_wx_trace.erl</c> for
-	  an example.</p>
+	  function <c>int:attached(Pid)</c> and to be able to handle
+	  messages from the interpreter. For an example, see
+	  <c>dbg_wx_trace.erl</c>.</p>
       </desc>
     </func>
 
     <func>
       <name>ib(Module, Line) -> ok | {error, break_exists}</name>
-      <fsummary>Create a breakpoint</fsummary>
+      <fsummary>Create a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
 	<v>Line = int()</v>
@@ -232,20 +231,20 @@
     <func>
       <name>ib(Module, Name, Arity) -> ok | {error, function_not_found}
       </name>
-      <fsummary>Create breakpoints in the specified function</fsummary>
+      <fsummary>Create breakpoints in the specified function.</fsummary>
       <type>
 	<v>Module = Name = atom()</v>
 	<v>Arity = int()</v>
       </type>
       <desc>
 	<p>Creates breakpoints at the first line of every clause of 
-	  the <c>Module:Name/Arity</c> function.</p>
+	  function <c>Module:Name/Arity</c>.</p>
       </desc>
     </func>
 
     <func>
       <name>ir() -> ok</name>
-      <fsummary>Delete all breakpoints</fsummary>
+      <fsummary>Delete all breakpoints.</fsummary>
       <desc>
 	<p>Deletes all breakpoints.</p>
       </desc>
@@ -253,7 +252,7 @@
 
     <func>
       <name>ir(Module) -> ok</name>
-      <fsummary>Delete all breakpoints in a module</fsummary>
+      <fsummary>Delete all breakpoints in a module.</fsummary>
       <type>
 	<v>Module = atom()</v>
       </type>
@@ -264,61 +263,57 @@
 
     <func>
       <name>ir(Module, Line) -> ok</name>
-      <fsummary>Delete a breakpoint</fsummary>
+      <fsummary>Delete a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
 	<v>Line = int()</v>
       </type>
       <desc>
-	<p>Deletes the breakpoint located at <c>Line</c> in
-	  <c>Module</c>.</p>
+	<p>Deletes the breakpoint at <c>Line</c> in <c>Module</c>.</p>
       </desc>
     </func>
 
     <func>
       <name>ir(Module, Name, Arity) -> ok | {error, function_not_found}
       </name>
-      <fsummary>Delete breakpoints from the specified function
-      </fsummary>
+      <fsummary>Delete breakpoints from the specified function.</fsummary>
       <type>
 	<v>Module = Name = atom()</v>
 	<v>Arity = int()</v>
       </type>
       <desc>
 	<p>Deletes the breakpoints at the first line of every clause of 
-	  the <c>Module:Name/Arity</c> function.</p>
+	  function <c>Module:Name/Arity</c>.</p>
       </desc>
     </func>
 
     <func>
       <name>ibd(Module, Line) -> ok</name>
-      <fsummary>Make a breakpoint inactive</fsummary>
+      <fsummary>Make a breakpoint inactive.</fsummary>
       <type>
 	<v>Module = atom()</v>
 	<v>Line = int()</v>
       </type>
       <desc>
-	<p>Makes the breakpoint at <c>Line</c> in <c>Module</c>
-	  inactive.</p>
+	<p>Makes the breakpoint at <c>Line</c> in <c>Module</c> inactive.</p>
       </desc>
     </func>
 
     <func>
       <name>ibe(Module, Line) -> ok</name>
-      <fsummary>Make a breakpoint active</fsummary>
+      <fsummary>Make a breakpoint active.</fsummary>
       <type>
 	<v>Module = atom()</v>
 	<v>Line = int()</v>
       </type>
       <desc>
-	<p>Makes the breakpoint at <c>Line</c> in <c>Module</c> active.
-	</p>
+	<p>Makes the breakpoint at <c>Line</c> in <c>Module</c> active.</p>
       </desc>
     </func>
 
     <func>
       <name>iba(Module, Line, Action) -> ok</name>
-      <fsummary>Set the trigger action of a breakpoint</fsummary>
+      <fsummary>Set the trigger action of a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
 	<v>Line = int()</v>
@@ -332,7 +327,7 @@
 
     <func>
       <name>ibc(Module, Line, Function) -> ok</name>
-      <fsummary>Set the conditional test of a breakpoint</fsummary>
+      <fsummary>Set the conditional test of a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
 	<v>Line = int()</v>
@@ -346,46 +341,44 @@
 	<p>The conditional test is performed by calling
 	  <c>Module:Name(Bindings)</c>, where <c>Bindings</c> is
 	  the current variable bindings. The function must return
-	  <c>true</c> (break) or <c>false</c> (do not break). Use
-	  <c>int:get_binding(Var, Bindings)</c> to retrieve the value
-	  of a variable <c>Var</c>.</p>
+	  <c>true</c> (break) or <c>false</c> (do not break).
+	  To retrieve the value of a variable <c>Var</c>, use
+	  <seealso marker="int#get_binding/2">int:get_binding(Var, Bindings)</seealso>.</p>
       </desc>
     </func>
 
     <func>
       <name>ipb() -> ok</name>
-      <fsummary>Make a printout of all existing breakpoints</fsummary>
+      <fsummary>Print all existing breakpoints.</fsummary>
       <desc>
-	<p>Makes a printout of all existing breakpoints.</p>
+	<p>Prints all existing breakpoints.</p>
       </desc>
     </func>
 
     <func>
       <name>ipb(Module) -> ok</name>
-      <fsummary>Make a printout of all breakpoints in a module
-      </fsummary>
+      <fsummary>Print all existing breakpoints in a module.</fsummary>
       <type>
 	<v>Module = atom()</v>
       </type>
       <desc>
-	<p>Makes a printout of all existing breakpoints in
-	  <c>Module</c>.</p>
+	<p>Prints all existing breakpoints in <c>Module</c>.</p>
       </desc>
     </func>
 
     <func>
       <name>iv() -> atom()</name>
-      <fsummary>Current version number of the interpreter</fsummary>
+      <fsummary>Return the current version number of the interpreter.
+      </fsummary>
       <desc>
 	<p>Returns the current version number of the interpreter.
-	  The same as the version number of the Debugger application.
-	</p>
+	  Same as the version number of the <c>Debugger</c> application.</p>
       </desc>
     </func>
 
     <func>
       <name>help() -> ok</name>
-      <fsummary>Print help text</fsummary>
+      <fsummary>Print help text.</fsummary>
       <desc>
 	<p>Prints help text.</p>
       </desc>
@@ -393,15 +386,8 @@
   </funcs>
 
   <section>
-    <title>Usage</title>
-
-    <p>Refer to the Debugger User's Guide for information about
-      the Debugger.</p>
-  </section>
-
-  <section>
   <title>See Also</title>
-    <p><c>int(3)</c></p>
+    <p><seealso marker="int"><c>int(3)</c></seealso></p>
   </section>
 </erlref>
 
diff --git a/lib/debugger/doc/src/int.xml b/lib/debugger/doc/src/int.xml
index ea21d04a07..31e9dfe923 100644
--- a/lib/debugger/doc/src/int.xml
+++ b/lib/debugger/doc/src/int.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2013</year>
+      <year>1998</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -29,16 +29,16 @@
     <rev></rev>
   </header>
   <module>int</module>
-  <modulesummary>Interpreter Interface</modulesummary>
+  <modulesummary>Interpreter Interface.</modulesummary>
   <description>
     <p>The Erlang interpreter provides mechanisms for breakpoints and
-      stepwise execution of code. It is mainly intended to be used by
-      the <em>Debugger</em>, see Debugger User's Guide and
-      <c>debugger(3)</c>.</p>
+      stepwise execution of code. It is primarily intended to be used by
+      Debugger, see the User's Guide and
+      <seealso marker="debugger"><c>debugger(3)</c></seealso>.</p>
     
-    <p>From the shell, it is possible to:</p>
-    <list>
-      <item>Specify which modules should be interpreted.</item>
+    <p>The following can be done from the shell:</p>
+    <list type="bulleted">
+      <item>Specify the modules to be interpreted.</item>
       <item>Specify breakpoints.</item>
       <item>Monitor the current status of all processes executing code
 	in interpreted modules, also processes at other Erlang nodes.
@@ -48,45 +48,48 @@
     <p>By <em>attaching to</em> a process executing interpreted code, it
       is possible to examine variable bindings and order stepwise
       execution. This is done by sending and receiving information
-      to/from the process via a third process, called the meta process.
-      It is possible to implement your own attached process. See
+      to/from the process through a third process, called the meta
+      process. You can implement your own attached process. See
       <c>int.erl</c> for available functions and <c>dbg_wx_trace.erl</c>
       for possible messages.</p>
 
-    <p>The interpreter depends on the Kernel, STDLIB and GS
-      applications, which means modules belonging to any of these
-      applications are not allowed to be interpreted as it could lead
+    <p>The interpreter depends on the Kernel, STDLIB, and
+      GS applications. This means that modules belonging to any of
+      these applications are not allowed to be interpreted, as it could lead
       to a deadlock or emulator crash. This also applies to modules
-      belonging to the Debugger application itself.</p>
+      belonging to the Debugger application.</p>
   </description>
 
   <section>
+    <marker id="int_breakpoints"/>
     <title>Breakpoints</title>
 
     <p>Breakpoints are specified on a line basis. When a process
       executing code in an interpreted module reaches a breakpoint, it
-      will stop. This means that that a breakpoint must be set at an
-      executable line, that is, a line of code containing an executable
+      stops. This means that a breakpoint must be set at an
+      executable line, that is, a code line containing an executable
       expression.</p>
 
-    <p>A breakpoint have a status, a trigger action and may have a
-      condition associated with it. The status is either <em>active</em>
-      or <em>inactive</em>. An inactive breakpoint is ignored. When a
-      breakpoint is reached, the trigger action specifies if
-      the breakpoint should continue to be active (<em>enable</em>), if
-      it should become inactive (<em>disable</em>), or if it should be
-      removed (<em>delete</em>). A condition is a tuple
-      <c>{Module,Name}</c>. When the breakpoint is reached,
-      <c>Module:Name(Bindings)</c> is called. If this evaluates to
-      <c>true</c>, execution will stop. If this evaluates to
-      <c>false</c>, the breakpoint is ignored. <c>Bindings</c> contains
-      the current variable bindings, use <c>get_binding</c> to retrieve
-      the value for a given variable.</p>
+    <p>A breakpoint has the following:</p>
+    <list type="bulleted">
+      <item>A status, which is <em>active</em> or <em>inactive</em>. An
+        inactive breakpoint is ignored.</item>
+      <item>A trigger action. When a breakpoint is reached, the trigger
+        action specifies if the breakpoint is to continue as active
+        (<em>enable</em>), or to become inactive (<em>disable</em>), or
+        to be removed (<em>delete</em>).</item>
+      <item>Optionally an associated condition. A condition is a tuple
+        <c>{Module,Name}</c>. When the breakpoint is reached,
+        <c>Module:Name(Bindings)</c> is called. If it evaluates to
+        <c>true</c>, execution stops. If it evaluates to <c>false</c>,
+        the breakpoint is ignored. <c>Bindings</c> contains the current
+        variable bindings. To retrieve the value for a specified variable,
+        use <c>get_binding</c>.</item>
+    </list>
 
     <p>By default, a breakpoint is active, has trigger action
-      <c>enable</c> and has no condition associated with it. For more
-      detailed information about breakpoints, refer to Debugger User's
-      Guide.</p>
+      <c>enable</c>, and has no associated condition. For details
+      about breakpoints, see the User's Guide.</p>
   </section>
 
   <funcs>
@@ -95,7 +98,7 @@
       <name>i(AbsModules) -> ok</name>
       <name>ni(AbsModule) -> {module,Module} | error</name>
       <name>ni(AbsModules) -> ok</name>
-      <fsummary>Interpret a module</fsummary>
+      <fsummary>Interpret a module.</fsummary>
       <type>
 	<v>AbsModules = [AbsModule]</v>
 	<v>AbsModule = Module | File | [Module | File]</v>
@@ -107,41 +110,43 @@
 	  the module only at the current node. <c>ni/1</c> interprets
 	  the module at all known nodes.</p>
 
-	<p>A module may be given by its module name (atom) or by its
-	  file name. If given by its module name, the object code
+	<p>A module can be specified by its module name (atom) or
+	  filename.</p>
+
+	<p>If specified by its module name, the object code
 	  <c>Module.beam</c> is searched for in the current path.
 	  The source code <c>Module.erl</c> is searched for first in
-	  the same directory as the object code, then in a <c>src</c>
+	  the same directory as the object code, then in an <c>src</c>
 	  directory next to it.</p>
 
-	<p>If given by its file name, the file name may include a path
-	  and the <c>.erl</c> extension may be omitted. The object code
+	<p>If specified by its filename, the filename can include a path
+	  and the <c>.erl</c> extension can  be omitted. The object code
 	  <c>Module.beam</c> is searched for first in the same directory
 	  as the source code, then in an <c>ebin</c> directory next to
 	  it, and then in the current path.</p>
 
 	<note>
-	  <p>The interpreter needs both the source code and the object
-	    code, and the object code <em>must</em> include debug
-	    information. That is, only modules compiled with the option
+	  <p>The interpreter requires both the source code and the object
+	    code. The object code <em>must</em> include debug
+	    information, that is, only modules compiled with option
 	    <c>debug_info</c> set can be interpreted.</p>
 	</note>
 
 	<p>The functions returns <c>{module,Module}</c> if the module
-	  was interpreted, or <c>error</c> if it was not.</p>
+	  was interpreted, otherwise <c>error</c> is returned.</p>
 
-	<p>The argument may also be a list of modules/file names, in
+	<p>The argument can also be a list of modules or filenames, in
 	  which case the function tries to interpret each module as
-	  specified above. The function then always returns <c>ok</c>,
-	  but prints some information to stdout if a module could not be
-	  interpreted.</p>
+	  specified earlier. The function then always returns <c>ok</c>,
+	  but prints some information to <c>stdout</c> if a module
+	  cannot be interpreted.</p>
       </desc>
     </func>
 	
     <func>
       <name>n(AbsModule) -> ok</name>
       <name>nn(AbsModule) -> ok</name>
-      <fsummary>Stop interpreting a module</fsummary>
+      <fsummary>Stop interpreting a module.</fsummary>
       <type>
 	<v>AbsModule = Module | File | [Module | File]</v>
 	<v>&nbsp;Module = atom()</v>
@@ -152,14 +157,14 @@
 	  interpreting the module only at the current node. <c>nn/1</c>
 	  stops interpreting the module at all known nodes.</p>
 
-	<p>As for <c>i/1</c> and <c>ni/1</c>, a module may be given by
-	  either its module name or its file name.</p>
+	<p>As for <c>i/1</c> and <c>ni/1</c>, a module can be specified by
+	  its module name or filename.</p>
       </desc>
     </func>
 
     <func>
       <name>interpreted() -> [Module]</name>
-      <fsummary>Get all interpreted modules</fsummary>
+      <fsummary>Get all interpreted modules.</fsummary>
       <type>
 	<v>Module = atom()</v>
       </type>
@@ -170,20 +175,20 @@
 
     <func>
       <name>file(Module) -> File | {error,not_loaded}</name>
-      <fsummary>Get the file name for an interpreted module</fsummary>
+      <fsummary>Get the filename for an interpreted module.</fsummary>
       <type>
 	<v>Module = atom()</v>
 	<v>File = string()</v>
       </type>
       <desc>
-	<p>Returns the source code file name <c>File</c> for an
+	<p>Returns the source code filename <c>File</c> for an
 	  interpreted module <c>Module</c>.</p>
       </desc>
     </func>
 
     <func>
       <name>interpretable(AbsModule) -> true | {error,Reason}</name>
-      <fsummary>Check if a module is possible to interpret</fsummary>
+      <fsummary>Check if a module can be interpreted.</fsummary>
       <type>
 	<v>AbsModule = Module | File</v>
 	<v>&nbsp;Module = atom()</v>
@@ -193,45 +198,59 @@
 	<v>&nbsp;App = atom()</v>
       </type>
       <desc>
-	<p>Checks if a module is possible to interpret. The module can
-	  be given by its module name <c>Module</c> or its source file
-	  name <c>File</c>. If given by a module name, the module is
-	  searched for in the code path.</p>
-
-	<p>The function returns <c>true</c> if both source code and
-	  object code for the module is found, the module has been
-	  compiled with the option <c>debug_info</c> set and does not
-	  belong to any of the applications Kernel, STDLIB, GS or
-	  Debugger itself.</p>
-
-	<p>The function returns <c>{error,Reason}</c> if the module for
-	  some reason is not possible to interpret.</p>
-	
-	<p><c>Reason</c> is <c>no_src</c> if no source code is found or
-	  <c>no_beam</c> if no object code is found. It is assumed that
-	  the source- and object code are located either in the same
-	  directory, or in <c>src</c> and <c>ebin</c> directories next
-	  to each other.</p>
-
-	<p><c>Reason</c> is <c>no_debug_info</c> if the module has not
-	  been compiled with the option <c>debug_info</c> set.</p>
-
-	<p><c>Reason</c> is <c>badarg</c> if <c>AbsModule</c> is not
-	  found. This could be because the specified file does not
-	  exist, or because <c>code:which/1</c> does not return a
-	  beam file name, which is the case not only for non-existing
-	  modules but also for modules which are preloaded or cover
-	  compiled.</p>
-
-	<p><c>Reason</c> is <c>{app,App}</c> where <c>App</c> is
-	  <c>kernel</c>, <c>stdlib</c>, <c>gs</c> or <c>debugger</c> if
-	  <c>AbsModule</c> belongs to one of these applications.</p>
-
-	<p>Note that the function can return <c>true</c> for a module
-	  which in fact is not interpretable in the case where
+	<p>Checks if a module can be interpreted. The module can be
+	  specified by its module name <c>Module</c> or its source
+	  filename <c>File</c>. If specified by a module name, the module
+	  is searched for in the code path.</p>
+
+	<p>The function returns <c>true</c> if all of the following
+          apply:</p>
+	<list type="bulleted">
+          <item>Both source code and object code for the module is
+            found.</item>
+          <item>The module has been compiled with option <c>debug_info</c>
+            set.</item>
+          <item>The module does not belong to any of the applications
+            Kernel, STDLIB, GS, or Debugger.</item>
+	</list>
+
+	<p>The function returns <c>{error,Reason}</c> if the module cannot
+	  be interpreted. <c>Reason</c> can have the following values:</p>
+	<taglist>
+	  <tag><c>no_src</c></tag>
+	  <item><p>No source code is found.
+	    It is assumed that the source code and object code are located
+	    either in the same directory, or in <c>src</c> and <c>ebin</c>
+	    directories next to each other.</p></item>
+
+	  <tag><c>no_beam</c></tag>
+	  <item><p>No object code is found.
+	    It is assumed that the source code and object code are located
+	    either in the same directory, or in <c>src</c> and <c>ebin</c>
+	    directories next to each other.</p></item>
+
+	  <tag><c>no_debug_info</c></tag>
+	  <item><p>The module has not been compiled with option
+	    <c>debug_info</c> set.</p></item>
+
+	  <tag><c>badarg</c></tag>
+	  <item><p><c>AbsModule</c> is not found. This could be because
+	    the specified file does not exist, or because
+	    <c>code:which/1</c> does not return a BEAM filename,
+	    which is the case not only for non-existing modules but also
+	    for modules that are preloaded or cover-compiled.</p></item>
+
+	  <tag><c>{app,App}</c></tag>
+	  <item><p><c>App</c> is <c>kernel</c>, <c>stdlib</c>, <c>gs</c>,
+	  or <c>debugger</c> if <c>AbsModule</c> belongs to one of these
+	  applications.</p></item>
+	</taglist>
+
+	<p>Notice that the function can return <c>true</c> for a module
+	  that in fact is not interpretable in the case where
 	  the module is marked as sticky or resides in a directory
-	  marked as sticky, as this is not discovered until
-	  the interpreter actually tries to load the module.</p>
+	  marked as sticky. The reason is that this is not discovered
+	  until the interpreter tries to load the module.</p>
       </desc>
     </func>
 
@@ -239,7 +258,7 @@
       <name>auto_attach() -> false | {Flags,Function}</name>
       <name>auto_attach(false)</name>
       <name>auto_attach(Flags, Function)</name>
-      <fsummary>Get/set when and how to attach to a process</fsummary>
+      <fsummary>Get and set when and how to attach to a process.</fsummary>
       <type>
 	<v>Flags = [init | break | exit]</v>
 	<v>Function = {Module,Name,Args}</v>
@@ -247,24 +266,24 @@
 	<v>&nbsp;Args = [term()]</v>
       </type>
       <desc>
-	<p>Gets and sets when and how to automatically attach to a
+	<p>Gets and sets when and how to attach automatically to a
 	  process executing code in interpreted modules. <c>false</c>
-	  means never automatically attach, this is the default.
+	  means never attach automatically, this is the default.
 	  Otherwise automatic attach is defined by a list of flags and
-	  a function. The following flags may be specified:</p>
-	<list>
-	  <item><c>init</c> - attach when a process for the very first
+	  a function. The following flags can be specified:</p>
+	<list type="bulleted">
+	  <item><c>init</c> - Attach when a process for the first
 	    time calls an interpreted function.</item>
-	  <item><c>break</c> - attach whenever a process reaches a
+	  <item><c>break</c> - Attach whenever a process reaches a
 	    breakpoint.</item>
-	  <item><c>exit</c> - attach when a process terminates.</item>
+	  <item><c>exit</c> - Attach when a process terminates.</item>
 	</list>
 
 	<p>When the specified event occurs, the function <c>Function</c>
-	  will be called as:</p>
+	  is called as:</p>
 	<pre>
-spawn(Module, Name, [Pid | Args])
-	</pre>
+spawn(Module, Name, [Pid | Args])</pre>
+
 	<p><c>Pid</c> is the pid of the process executing interpreted
 	  code.</p>
       </desc>
@@ -273,7 +292,7 @@ spawn(Module, Name, [Pid | Args])
     <func>
       <name>stack_trace() -> Flag</name>
       <name>stack_trace(Flag)</name>
-      <fsummary>Get/set if and how to save call frames</fsummary>
+      <fsummary>Get and set if and how to save call frames.</fsummary>
       <type>
 	<v>Flag = all | no_tail | false</v>
       </type>
@@ -281,25 +300,30 @@ spawn(Module, Name, [Pid | Args])
 	<p>Gets and sets how to save call frames in the stack. Saving
 	  call frames makes it possible to inspect the call chain of a
 	  process, and is also used to emulate the stack trace if an
-	  error (an exception of class error) occurs.</p>
-	<list>
-	  <item><c>all</c> - save information about all current calls,
-	    that is, function calls that have not yet returned a value.
-	    </item>
-	  <item><c>no_tail</c> - save information about current calls,
+	  error (an exception of class error) occurs. The following
+	  flags can be specified:</p>
+	<taglist>
+	  <tag><c>all</c></tag>
+	  <item><p>Save information about all current calls,
+	    that is, function calls that have not yet returned a value.</p>
+	  </item>
+
+	  <tag><c>no_tail</c></tag>
+	  <item><p>Save information about current calls,
 	    but discard previous information when a tail recursive call
-	    is made. This option consumes less memory and may be
+	    is made. This option consumes less memory and can be
 	    necessary to use for processes with long lifetimes and many
-	    tail recursive calls. This is the default.</item>
-	  <item><c>false</c> - do not save any information about current
-	    calls.</item>
-	</list>
+	    tail recursive calls. This is the default.</p></item>
+
+	  <tag><c>false</c></tag>
+	  <item><p>Save no information about currentcalls.</p></item>
+	</taglist>
       </desc>
     </func>
 
     <func>
       <name>break(Module, Line) -> ok | {error,break_exists}</name>
-      <fsummary>Create a breakpoint</fsummary>
+      <fsummary>Create a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
 	<v>Line = int()</v>
@@ -311,86 +335,80 @@ spawn(Module, Name, [Pid | Args])
 
     <func>
       <name>delete_break(Module, Line) -> ok</name>
-      <fsummary>Delete a breakpoint</fsummary>
+      <fsummary>Delete a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
 	<v>Line = int()</v>
       </type>
       <desc>
-	<p>Deletes the breakpoint located at <c>Line</c> in
-	  <c>Module</c>.</p>
+	<p>Deletes the breakpoint at <c>Line</c> in <c>Module</c>.</p>
       </desc>
     </func>
 
     <func>
       <name>break_in(Module, Name, Arity) -> ok
 	| {error,function_not_found}</name>
-      <fsummary>Create breakpoints in the specified function</fsummary>
+      <fsummary>Create breakpoints in the specified function.</fsummary>
       <type>
 	<v>Module = Name = atom()</v>
 	<v>Arity = int()</v>
       </type>
       <desc>
 	<p>Creates a breakpoint at the first line of every clause of 
-	  the <c>Module:Name/Arity</c> function.</p>
+	  function <c>Module:Name/Arity</c>.</p>
       </desc>
     </func>
 
     <func>
       <name>del_break_in(Module, Name, Arity) -> ok
 	| {error,function_not_found}</name>
-      <fsummary>Delete breakpoints from the specified function
-      </fsummary>
+      <fsummary>Delete breakpoints from the specified function.</fsummary>
       <type>
 	<v>Module = Name = atom()</v>
 	<v>Arity = int()</v>
       </type>
       <desc>
 	<p>Deletes the breakpoints at the first line of every clause of 
-	  the <c>Module:Name/Arity</c> function.
-	</p>
+	  function <c>Module:Name/Arity</c>.</p>
       </desc>
     </func>
 
     <func>
       <name>no_break() -> ok</name>
       <name>no_break(Module) -> ok</name>
-      <fsummary>Delete all breakpoints</fsummary>
+      <fsummary>Delete all breakpoints.</fsummary>
       <desc>
-	<p>Deletes all breakpoints, or all breakpoints in <c>Module</c>.
-	</p>
+	<p>Deletes all breakpoints, or all breakpoints in <c>Module</c>.</p>
       </desc>
     </func>
 
     <func>
       <name>disable_break(Module, Line) -> ok</name>
-      <fsummary>Make a breakpoint inactive</fsummary>
+      <fsummary>Make a breakpoint inactive.</fsummary>
       <type>
 	<v>Module = atom()</v>
 	<v>Line = int()</v>
       </type>
       <desc>
-	<p>Makes the breakpoint at <c>Line</c> in <c>Module</c>
-	  inactive.</p>
+	<p>Makes the breakpoint at <c>Line</c> in <c>Module</c> inactive.</p>
       </desc>
     </func>
 
     <func>
       <name>enable_break(Module, Line) -> ok</name>
-      <fsummary>Make a breakpoint active</fsummary>
+      <fsummary>Make a breakpoint active.</fsummary>
       <type>
 	<v>Module = atom()</v>
 	<v>Line = int()</v>
       </type>
       <desc>
-	<p>Makes the breakpoint at <c>Line</c> in <c>Module</c> active.
-	</p>
+	<p>Makes the breakpoint at <c>Line</c> in <c>Module</c> active.</p>
       </desc>
     </func>
 
     <func>
       <name>action_at_break(Module, Line, Action) -> ok</name>
-      <fsummary>Set the trigger action of a breakpoint</fsummary>
+      <fsummary>Set the trigger action of a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
 	<v>Line = int()</v>
@@ -404,7 +422,7 @@ spawn(Module, Name, [Pid | Args])
 
     <func>
       <name>test_at_break(Module, Line, Function) -> ok</name>
-      <fsummary>Set the conditional test of a breakpoint</fsummary>
+      <fsummary>Set the conditional test of a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
 	<v>Line = int()</v>
@@ -414,14 +432,14 @@ spawn(Module, Name, [Pid | Args])
       <desc>
 	<p>Sets the conditional test of the breakpoint at <c>Line</c> in
 	  <c>Module</c> to <c>Function</c>. The function must
-	  fulfill the requirements specified in the section
-	  <em>Breakpoints</em> above.</p>
+	  fulfill the requirements specified in section
+          <seealso marker="#int_breakpoints">Breakpoints</seealso>.</p>
       </desc>
     </func>
 
     <func>
       <name>get_binding(Var, Bindings) -> {value,Value} | unbound</name>
-      <fsummary>Retrieve a variable binding</fsummary>
+      <fsummary>Retrieve a variable binding.</fsummary>
       <type>
 	<v>Var = atom()</v>
 	<v>Bindings = term()</v>
@@ -437,7 +455,7 @@ spawn(Module, Name, [Pid | Args])
     <func>
       <name>all_breaks() -> [Break]</name>
       <name>all_breaks(Module) -> [Break]</name>
-      <fsummary>Get all breakpoints</fsummary>
+      <fsummary>Get all breakpoints.</fsummary>
       <type>
 	<v>Break = {Point,Options}</v>
 	<v>&nbsp;Point = {Module,Line}</v>
@@ -451,15 +469,14 @@ spawn(Module, Name, [Pid | Args])
 	<v>&nbsp;&nbsp;&nbsp;&nbsp;Name = atom()</v>
       </type>
       <desc>
-	<p>Gets all breakpoints, or all breakpoints in <c>Module</c>.
-	</p>
+	<p>Gets all breakpoints, or all breakpoints in <c>Module</c>.</p>
       </desc>
     </func>
 
     <func>
       <name>snapshot() -> [Snapshot]</name>
       <fsummary>Get information about all processes executing interpreted
-	code</fsummary>
+	code.</fsummary>
       <type>
 	<v>Snapshot = {Pid, Function, Status, Info}</v>
 	<v>&nbsp;Pid = pid()</v>
@@ -475,26 +492,27 @@ spawn(Module, Name, [Pid | Args])
       <desc>
 	<p>Gets information about all processes executing interpreted code.
 	</p>
-	<list>
-	  <item><c>Pid</c> - process identifier.</item>
-	  <item><c>Function</c> - first interpreted function called by
+	<list type="bulleted">
+	  <item><c>Pid</c> - Process identifier.</item>
+	  <item><c>Function</c> - First interpreted function called by
 	    the process.</item>
-	  <item><c>Status</c> - current status of the process.</item>
-	  <item><c>Info</c> - additional information.</item>
+	  <item><c>Status</c> - Current status of the process.</item>
+	  <item><c>Info</c> - More information.</item>
 	</list>
-	<p><c>Status</c> is one of:</p>
-	<list>
-	  <item><c>idle</c> - the process is no longer executing
+
+	<p><c>Status</c> is one of the following:</p>
+	<list type="bulleted">
+	  <item><c>idle</c> - The process is no longer executing
 	    interpreted code. <c>Info={}</c>.</item>
-	  <item><c>running</c> - the process is running. <c>Info={}</c>.
+	  <item><c>running</c> - The process is running. <c>Info={}</c>.
 	  </item>
-	  <item><c>waiting</c> - the process is waiting at a
+	  <item><c>waiting</c> - The process is waiting at a
 	    <c>receive</c>. <c>Info={}</c>.</item>
-	  <item><c>break</c> - process execution has been stopped,
+	  <item><c>break</c> - Process execution is stopped,
 	    normally at a breakpoint. <c>Info={Module,Line}</c>.</item>
-	  <item><c>exit</c> - the process has terminated.
+	  <item><c>exit</c> - The process is terminated.
 	    <c>Info=ExitReason</c>.</item>
-	  <item><c>no_conn</c> - the connection is down to the node
+	  <item><c>no_conn</c> - The connection is down to the node
 	    where the process is running. <c>Info={}</c>.</item>
 	</list>
       </desc>
@@ -503,7 +521,7 @@ spawn(Module, Name, [Pid | Args])
     <func>
       <name>clear() -> ok</name>
       <fsummary>Clear information about processes executing interpreted
-	code</fsummary>
+	code.</fsummary>
       <desc>
 	<p>Clears information about processes executing interpreted code
 	  by removing all information about terminated processes.</p>
@@ -513,13 +531,13 @@ spawn(Module, Name, [Pid | Args])
     <func>
       <name>continue(Pid) -> ok | {error,not_interpreted}</name>
       <name>continue(X,Y,Z) -> ok | {error,not_interpreted}</name>
-      <fsummary>Resume process execution</fsummary>
+      <fsummary>Resume process execution.</fsummary>
       <type>
 	<v>Pid = pid()</v>
 	<v>X = Y = Z = int()</v>
       </type>
       <desc>
-	<p>Resume process execution for <c>Pid</c>, or for
+	<p>Resumes process execution for <c>Pid</c> or
 	  <c>c:pid(X,Y,Z)</c>.</p>
       </desc>
     </func>
diff --git a/lib/debugger/doc/src/introduction.xml b/lib/debugger/doc/src/introduction.xml
new file mode 100644
index 0000000000..9f5f279bb0
--- /dev/null
+++ b/lib/debugger/doc/src/introduction.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+<header>
+    <copyright>
+      <year>1997</year><year>2013</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+    
+    </legalnotice>
+
+    <title>Introduction</title>
+    <prepared></prepared>
+    <docno></docno>
+    <date></date>
+    <rev></rev>
+    <file>introduction.xml</file>
+  </header>
+
+  <section>
+    <title>Scope</title>
+    <p>Debugger is a graphical user interface for the Erlang
+      interpreter, which can be used for debugging and testing of
+      Erlang programs. For example, breakpoints can be set, code can be
+      single-stepped and variable values can be displayed and changed.
+    </p>
+
+    <p>The Erlang interpreter can also be accessed through the interface
+      module <seealso marker="int"><c>int(3)</c></seealso>.
+    </p>
+
+    <warning>
+      <p>Debugger might at some point
+      start tracing on the processes that execute the interpreted
+      code. This means that a conflict occurs if tracing by other
+      means is started on any of these processes.</p>
+    </warning>
+  </section>
+
+  <section>
+    <title>Prerequisites</title>
+    <p>It is assumed that the reader is familiar with the Erlang
+      programming language.</p>
+    <p>Modules to be debugged must include debug information,
+      for example, <c>erlc +debug_info MODULE.erl</c>.</p>
+  </section>
+
+</chapter>
+
+
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index 3eaecf86b2..6e8cf54ae4 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -33,6 +33,21 @@
   <p>This document describes the changes made to the Debugger
     application.</p>
 
+<section><title>Debugger 4.1.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Documentation corrections.</p>
+          <p>
+	    Own Id: OTP-12994</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Debugger 4.1.1</title>
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/debugger/doc/src/part.xml b/lib/debugger/doc/src/part.xml
index 7515c0ad5b..ce1edbd978 100644
--- a/lib/debugger/doc/src/part.xml
+++ b/lib/debugger/doc/src/part.xml
@@ -4,7 +4,7 @@
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2013</year>
+      <year>1997</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -27,14 +27,10 @@
     <docno></docno>
     <date>1998-05-12</date>
     <rev>B</rev>
-    <file>part.sgml</file>
+    <file>part.xml</file>
   </header>
-  <description>
-    <p><em>Debugger</em> is a graphical tool which can be used for
-      debugging and testing of Erlang programs. For example, breakpoints
-      can be set, code can be single stepped and variable values can be
-      displayed and changed.</p>
-  </description>
+  <description></description>
+  <xi:include href="introduction.xml"/>
   <xi:include href="debugger_chapter.xml"/>
 </part>
 
diff --git a/lib/debugger/doc/src/ref_man.xml b/lib/debugger/doc/src/ref_man.xml
index 6df9e90c2c..c44f07f912 100644
--- a/lib/debugger/doc/src/ref_man.xml
+++ b/lib/debugger/doc/src/ref_man.xml
@@ -28,12 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <description>
-    <p><em>Debugger</em> is a graphical tool which can be used for
-      debugging and testing of Erlang programs. For example, breakpoints
-      can be set, code can be single stepped and variable values can be
-      displayed and changed.</p>
-  </description>
+  <description></description>
   <xi:include href="debugger.xml"/>
   <xi:include href="i.xml"/>
   <xi:include href="int.xml"/>
diff --git a/lib/debugger/src/dbg_icmd.erl b/lib/debugger/src/dbg_icmd.erl
index 4c34f253c6..1b274e20ae 100644
--- a/lib/debugger/src/dbg_icmd.erl
+++ b/lib/debugger/src/dbg_icmd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1998-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.
@@ -267,7 +267,7 @@ handle_int_msg({old_code,Mod}, Status, Bs,
 	       #ieval{level=Le,module=M}=Ieval) ->
     if
 	Status =:= idle, Le =:= 1 ->
-	    erase([Mod|db]),
+	    erase(?DB_REF_KEY(Mod)),
 	    put(cache, []);
 	true ->
 	    case dbg_istk:in_use_p(Mod, M) of
@@ -277,7 +277,7 @@ handle_int_msg({old_code,Mod}, Status, Bs,
 		    exit(get(self), kill),
 		    dbg_ieval:exception(exit, old_code, Bs, Ieval);
 		false ->
-		    erase([Mod|db]),
+		    erase(?DB_REF_KEY(Mod)),
 		    put(cache, [])
 	    end
     end;
diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl
index 7ed371a653..f5e079ef7e 100644
--- a/lib/debugger/src/dbg_ieval.erl
+++ b/lib/debugger/src/dbg_ieval.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1998-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.
@@ -560,7 +560,7 @@ get_function(Mod, Name, Args, extern) ->
     end.
 
 db_ref(Mod) ->
-    case get([Mod|db]) of
+    case get(?DB_REF_KEY(Mod)) of
 	undefined ->
 	    case dbg_iserver:call(get(int),
 				  {get_module_db, Mod, get(self)}) of
@@ -572,7 +572,7 @@ db_ref(Mod) ->
 				Node =/= node() -> {Node,ModDb};
 				true -> ModDb
 			    end,
-		    put([Mod|db], DbRef),
+		    put(?DB_REF_KEY(Mod), DbRef),
 		    DbRef
 	    end;
 	DbRef ->
diff --git a/lib/debugger/src/dbg_ieval.hrl b/lib/debugger/src/dbg_ieval.hrl
index 95d0842b19..ad422a9e4a 100644
--- a/lib/debugger/src/dbg_ieval.hrl
+++ b/lib/debugger/src/dbg_ieval.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
+%% 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.
@@ -27,3 +27,5 @@
 		%% (i.e. the next call will leave interpreted code).
 		top = false
 	       }).
+
+-define(DB_REF_KEY(Mod), {Mod,db}).
diff --git a/lib/debugger/src/dbg_iload.erl b/lib/debugger/src/dbg_iload.erl
index 2a8bcd32d8..369b456524 100644
--- a/lib/debugger/src/dbg_iload.erl
+++ b/lib/debugger/src/dbg_iload.erl
@@ -39,7 +39,7 @@
 %% dbg_iserver. We are suspended until the module has been loaded.
 %%--------------------------------------------------------------------
 -spec load_mod(Mod, file:filename(), binary(), ets:tid()) ->
-        {'ok', Mod} when is_subtype(Mod, atom()).
+        {'ok', Mod} when Mod :: atom().
 
 load_mod(Mod, File, Binary, Db) ->
     Flag = process_flag(trap_exit, true),
@@ -541,7 +541,7 @@ fun_clauses([]) -> [].
 new_map(Fs0, Anno, F) ->
     Line = ln(Anno),
     Fs1 = map_fields(Fs0, F),
-    Fs2 = [{ln(A),K,V} || {map_field_assoc,A,K,V} <- Fs1],
+    Fs2 = [{L,K,V} || {map_field_assoc,L,K,V} <- Fs1],
     try
 	{value,Line,map_literal(Fs2, #{})}
     catch
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl
index 5fd1519ba0..f9c60f9b72 100644
--- a/lib/debugger/src/dbg_wx_trace.erl
+++ b/lib/debugger/src/dbg_wx_trace.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -811,7 +811,7 @@ gui_show_module(Win, Mod, Line, Mod, _Pid, How) ->
     dbg_wx_trace_win:mark_line(Win, Line, How);
 gui_show_module(Win, Mod, Line, _Cm, Pid, How) ->
     Win2 = case dbg_wx_trace_win:is_shown(Win, Mod) of
-	       {true, Win3} -> Win3;
+	       %% {true, Win3} -> Win3;
 	       false -> gui_load_module(Win, Mod, Pid)
 	   end,
     dbg_wx_trace_win:mark_line(Win2, Line, How).
diff --git a/lib/debugger/src/dbg_wx_win.erl b/lib/debugger/src/dbg_wx_win.erl
index 63f74392b5..1ff8818bbe 100644
--- a/lib/debugger/src/dbg_wx_win.erl
+++ b/lib/debugger/src/dbg_wx_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2015. 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.
@@ -95,10 +95,9 @@ create_menu_item(Menu, [{Name, _N, cascade, Items}|Is], Win, Id0,Connect) ->
 			    false -> Acc
 			end		
 		end,
-    Filter = fun(_,_) ->	     
+    Filter = fun(Ev,_) ->
 		     Enabled = lists:foldl(IsChecked, [], Butts),
-		     Self ! #wx{userData={Name, Enabled},
-				event=#wxCommand{type=command_menu_selected}}
+		     Self ! Ev#wx{userData={Name, Enabled}}
 	     end,
     wxMenu:connect(Win, command_menu_selected, 
 		   [{id,Id0},{lastId, Id-1},{callback,Filter}]),
diff --git a/lib/debugger/src/int.erl b/lib/debugger/src/int.erl
index 4f54beb45b..1e43d1858a 100644
--- a/lib/debugger/src/int.erl
+++ b/lib/debugger/src/int.erl
@@ -547,7 +547,7 @@ load({Mod, Src, Beam, BeamBin, Exp, Abst}, Dist) ->
 check_module(Mod) ->
     case code:which(Mod) of
 	Beam when is_list(Beam) ->
-	    case find_src(Beam) of
+	    case find_src(Mod, Beam) of
 		Src when is_list(Src) ->
 		    check_application(Src),
 		    case check_beam(Beam) of
@@ -608,7 +608,7 @@ check_application2("gs-"++_) -> throw({error,{app,gs}});
 check_application2("debugger-"++_) -> throw({error,{app,debugger}});
 check_application2(_) -> ok.
 
-find_src(Beam) ->
+find_src(Mod, Beam) ->
     Src0 = filename:rootname(Beam) ++ ".erl",
     case is_file(Src0) of
 	true -> Src0;
@@ -618,10 +618,22 @@ find_src(Beam) ->
 				 filename:basename(Src0)]),
 	    case is_file(Src) of
 		true -> Src;
-		false -> error
+		false -> find_src_from_module(Mod)
 	    end
     end.
 
+find_src_from_module(Mod) ->
+    Compile = Mod:module_info(compile),
+    case lists:keyfind(source, 1, Compile) of
+	{source, Src} ->
+	    case is_file(Src) of
+		true -> Src;
+		false -> error
+	    end;
+	false ->
+	    error
+    end.
+
 find_beam(Mod, Src) ->
     SrcDir = filename:dirname(Src),
     BeamFile = atom_to_list(Mod) ++ code:objfile_extension(),
diff --git a/lib/debugger/test/Makefile b/lib/debugger/test/Makefile
index 82f49c155f..1594c891b4 100644
--- a/lib/debugger/test/Makefile
+++ b/lib/debugger/test/Makefile
@@ -68,7 +68,7 @@ RELSYSDIR = $(RELEASE_PATH)/debugger_test
 # ----------------------------------------------------
 
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
diff --git a/lib/debugger/test/andor_SUITE.erl b/lib/debugger/test/andor_SUITE.erl
index 384b6c7c77..9750fa018d 100644
--- a/lib/debugger/test/andor_SUITE.erl
+++ b/lib/debugger/test/andor_SUITE.erl
@@ -27,7 +27,7 @@
 	 t_andalso/1,t_orelse/1,inside/1,overlap/1,
 	 combined/1,in_case/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
diff --git a/lib/debugger/test/bs_bincomp_SUITE.erl b/lib/debugger/test/bs_bincomp_SUITE.erl
index 0750c6793d..18b4198354 100644
--- a/lib/debugger/test/bs_bincomp_SUITE.erl
+++ b/lib/debugger/test/bs_bincomp_SUITE.erl
@@ -30,7 +30,7 @@
 	 byte_aligned/1,bit_aligned/1,extended_byte_aligned/1,
 	 extended_bit_aligned/1,mixed/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
diff --git a/lib/debugger/test/bs_construct_SUITE.erl b/lib/debugger/test/bs_construct_SUITE.erl
index f62512568f..966c096c3a 100644
--- a/lib/debugger/test/bs_construct_SUITE.erl
+++ b/lib/debugger/test/bs_construct_SUITE.erl
@@ -36,7 +36,7 @@
 	 copy_writable_binary/1, dynamic/1,
 	 otp_7422/1, zero_width/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
diff --git a/lib/debugger/test/bs_match_bin_SUITE.erl b/lib/debugger/test/bs_match_bin_SUITE.erl
index a61b56501c..98c1013210 100644
--- a/lib/debugger/test/bs_match_bin_SUITE.erl
+++ b/lib/debugger/test/bs_match_bin_SUITE.erl
@@ -27,7 +27,7 @@
 	 init_per_suite/1,end_per_suite/1,
 	 byte_split_binary/1,bit_split_binary/1,match_huge_bin/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
diff --git a/lib/debugger/test/bs_match_int_SUITE.erl b/lib/debugger/test/bs_match_int_SUITE.erl
index fd77530dd5..11b5e30efd 100644
--- a/lib/debugger/test/bs_match_int_SUITE.erl
+++ b/lib/debugger/test/bs_match_int_SUITE.erl
@@ -26,7 +26,7 @@
 	 integer/1,signed_integer/1,dynamic/1,more_dynamic/1,mml/1,
 	 match_huge_int/1,bignum/1,unaligned_32_bit/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -import(lists, [seq/2]).
 
diff --git a/lib/debugger/test/bs_match_misc_SUITE.erl b/lib/debugger/test/bs_match_misc_SUITE.erl
index 2221cfe08b..7196026dc7 100644
--- a/lib/debugger/test/bs_match_misc_SUITE.erl
+++ b/lib/debugger/test/bs_match_misc_SUITE.erl
@@ -29,7 +29,7 @@
 	 writable_binary_matched/1,otp_7198/1,
 	 unordered_bindings/1,float_middle_endian/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
diff --git a/lib/debugger/test/bs_match_tail_SUITE.erl b/lib/debugger/test/bs_match_tail_SUITE.erl
index 9ec93978ed..f4201ee7db 100644
--- a/lib/debugger/test/bs_match_tail_SUITE.erl
+++ b/lib/debugger/test/bs_match_tail_SUITE.erl
@@ -26,7 +26,7 @@
 	 init_per_suite/1,end_per_suite/1,
 	 aligned/1,unaligned/1,zero_tail/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
diff --git a/lib/debugger/test/bs_utf_SUITE.erl b/lib/debugger/test/bs_utf_SUITE.erl
index 90c4d6c7b9..5bf776226a 100644
--- a/lib/debugger/test/bs_utf_SUITE.erl
+++ b/lib/debugger/test/bs_utf_SUITE.erl
@@ -28,7 +28,7 @@
 	 utf8_roundtrip/1,unused_utf_char/1,utf16_roundtrip/1,
 	 utf32_roundtrip/1,guard/1,extreme_tripping/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -compile([no_jopt,time]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
diff --git a/lib/debugger/test/bug_SUITE.erl b/lib/debugger/test/bug_SUITE.erl
index 542db3f41e..516d9f4b8d 100644
--- a/lib/debugger/test/bug_SUITE.erl
+++ b/lib/debugger/test/bug_SUITE.erl
@@ -21,7 +21,7 @@
 %%
 -module(bug_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
diff --git a/lib/debugger/test/cleanup.erl b/lib/debugger/test/cleanup.erl
index b40ae5f82c..58f3c9380f 100644
--- a/lib/debugger/test/cleanup.erl
+++ b/lib/debugger/test/cleanup.erl
@@ -23,7 +23,7 @@
 
 -export([all/0,groups/0,init_per_group/2,end_per_group/2, cleanup/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 all() -> 
 [cleanup].
diff --git a/lib/debugger/test/dbg_ui_SUITE.erl b/lib/debugger/test/dbg_ui_SUITE.erl
index f0f4e09aa8..39ecb51b57 100644
--- a/lib/debugger/test/dbg_ui_SUITE.erl
+++ b/lib/debugger/test/dbg_ui_SUITE.erl
@@ -22,7 +22,7 @@
 -module(dbg_ui_SUITE).
 
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 
 % Test server specific exports
diff --git a/lib/debugger/test/debugger_SUITE.erl b/lib/debugger/test/debugger_SUITE.erl
index 9207df38e4..678ca0e5c3 100644
--- a/lib/debugger/test/debugger_SUITE.erl
+++ b/lib/debugger/test/debugger_SUITE.erl
@@ -23,7 +23,7 @@
 
 %% Test break points.
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
diff --git a/lib/debugger/test/erl_eval_SUITE.erl b/lib/debugger/test/erl_eval_SUITE.erl
index af9b0a6e6e..c75e4012f3 100644
--- a/lib/debugger/test/erl_eval_SUITE.erl
+++ b/lib/debugger/test/erl_eval_SUITE.erl
@@ -60,7 +60,7 @@
 config(priv_dir,_) ->
     ".".
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -export([init_per_testcase/2, end_per_testcase/2]).
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
diff --git a/lib/debugger/test/exception_SUITE.erl b/lib/debugger/test/exception_SUITE.erl
index f42dbc7776..e35326a798 100644
--- a/lib/debugger/test/exception_SUITE.erl
+++ b/lib/debugger/test/exception_SUITE.erl
@@ -28,7 +28,7 @@
 
 -export([bad_guy/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
diff --git a/lib/debugger/test/fun_SUITE.erl b/lib/debugger/test/fun_SUITE.erl
index fabee16cee..b8092ab16c 100644
--- a/lib/debugger/test/fun_SUITE.erl
+++ b/lib/debugger/test/fun_SUITE.erl
@@ -30,7 +30,7 @@
 %% Internal exports.
 -export([nothing/0,call_me/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
diff --git a/lib/debugger/test/guard_SUITE.erl b/lib/debugger/test/guard_SUITE.erl
index 880c89532b..2b87ef23ba 100644
--- a/lib/debugger/test/guard_SUITE.erl
+++ b/lib/debugger/test/guard_SUITE.erl
@@ -39,7 +39,7 @@
 	 check_qlc_hrl/1,andalso_semi/1,t_tuple_size/1,binary_part/1,
 	 bad_constants/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([init/4]).
 -import(lists, [member/2]).
diff --git a/lib/debugger/test/int_SUITE.erl b/lib/debugger/test/int_SUITE.erl
index 5f2e4dd84d..ec4de88331 100644
--- a/lib/debugger/test/int_SUITE.erl
+++ b/lib/debugger/test/int_SUITE.erl
@@ -20,7 +20,7 @@
 
 %%
 -module(int_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -245,14 +245,13 @@ interpretable(Config) when is_list(Config) ->
     ?line true = int:interpretable(filename:join([DataDir,lists1])),
     ?line true = code:del_path(DataDir),
 
-    %% {error, no_src}
-    ?line PrivDir = filename:join(?config(priv_dir, Config), ""),
-    ?line {ok, _} = file:copy(filename:join([DataDir,"lists1.beam"]),
+    %% true (from source)
+    PrivDir = filename:join(?config(priv_dir, Config), ""),
+    {ok, _} = file:copy(filename:join([DataDir,"lists1.beam"]),
 			      filename:join([PrivDir,"lists1.beam"])),
-    ?line true = code:add_patha(PrivDir),
-
-    ?line {error, no_src} = int:interpretable(lists1),
-    ?line ok = file:delete(filename:join([PrivDir,"lists1.beam"])),
+    true = code:add_patha(PrivDir),
+    true = int:interpretable(lists1),
+    ok = file:delete(filename:join([PrivDir,"lists1.beam"])),
 
     %% {error, no_beam}
     Src = filename:join([PrivDir,"lists1.erl"]),
@@ -267,6 +266,11 @@ interpretable(Config) when is_list(Config) ->
     ?line ok = file:delete(Src),
     ?line true = code:del_path(PrivDir),
 
+    %% {error, no_src}
+    {ok, lists2, Binary} = compile:forms([{attribute,1,module,lists2}], []),
+    code:load_binary(lists2, "unknown", Binary),
+    {error, no_src} = int:interpretable(lists2),
+
     %% {error, badarg}
     ?line {error, badarg} = int:interpretable(pride),
     ?line {error, badarg} = int:interpretable("prejudice.erl"),
diff --git a/lib/debugger/test/int_break_SUITE.erl b/lib/debugger/test/int_break_SUITE.erl
index 21b53a8d30..75bdd69a7d 100644
--- a/lib/debugger/test/int_break_SUITE.erl
+++ b/lib/debugger/test/int_break_SUITE.erl
@@ -22,7 +22,7 @@
 
 %% Test break points.
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
diff --git a/lib/debugger/test/int_eval_SUITE.erl b/lib/debugger/test/int_eval_SUITE.erl
index f30d386de9..3f3c03492e 100644
--- a/lib/debugger/test/int_eval_SUITE.erl
+++ b/lib/debugger/test/int_eval_SUITE.erl
@@ -36,7 +36,7 @@
 
 -define(IM, my_int_eval_module).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]},
 	    {timetrap,{minutes,1}}].
diff --git a/lib/debugger/test/lc_SUITE.erl b/lib/debugger/test/lc_SUITE.erl
index aca4c4de7c..851d0fbc20 100644
--- a/lib/debugger/test/lc_SUITE.erl
+++ b/lib/debugger/test/lc_SUITE.erl
@@ -28,7 +28,7 @@
 	 basic/1,deeply_nested/1,no_generator/1,
 	 empty_generator/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
diff --git a/lib/debugger/test/line_number_SUITE.erl b/lib/debugger/test/line_number_SUITE.erl
index 6ec5ef5d5a..592f0a1f32 100644
--- a/lib/debugger/test/line_number_SUITE.erl
+++ b/lib/debugger/test/line_number_SUITE.erl
@@ -26,7 +26,7 @@
 	 line_numbers/1]).
 -export([crash/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
diff --git a/lib/debugger/test/map_SUITE.erl b/lib/debugger/test/map_SUITE.erl
index 0ef634f7aa..eabcdcbf42 100644
--- a/lib/debugger/test/map_SUITE.erl
+++ b/lib/debugger/test/map_SUITE.erl
@@ -2219,7 +2219,7 @@ map_guard_sequence_mixed(K1,K2,M) ->
 
 
 t_frequency_table(Config) when is_list(Config) ->
-    random:seed({13,1337,54}),  % pseudo random
+    rand:seed(exsplus, {13,1337,54}),		% pseudo random
     N = 1000,
     Ts = rand_terms(N),
     #{ n:=N, tf := Tf } = frequency_table(Ts,#{ n=>0, tf => #{}}),
@@ -2262,7 +2262,7 @@ rand_terms(0) -> [];
 rand_terms(N) -> [rand_term()|rand_terms(N-1)].
 
 rand_term() ->
-    case random:uniform(6) of
+    case rand:uniform(6) of
 	1 -> rand_binary();
 	2 -> rand_number();
 	3 -> rand_atom();
@@ -2272,21 +2272,21 @@ rand_term() ->
     end.
 
 rand_binary() ->
-    case random:uniform(3) of
+    case rand:uniform(3) of
 	1 -> <<>>;
 	2 -> <<"hi">>;
 	3 -> <<"message text larger than 64 bytes. yep, message text larger than 64 bytes.">>
     end.
 
 rand_number() ->
-    case random:uniform(3) of
-	1 -> random:uniform(5);
-	2 -> float(random:uniform(5));
-	3 -> 1 bsl (63 + random:uniform(3))
+    case rand:uniform(3) of
+	1 -> rand:uniform(5);
+	2 -> float(rand:uniform(5));
+	3 -> 1 bsl (63 + rand:uniform(3))
     end.
 
 rand_atom() ->
-    case random:uniform(3) of
+    case rand:uniform(3) of
 	1 -> hi;
 	2 -> some_atom;
 	3 -> some_other_atom
@@ -2294,21 +2294,21 @@ rand_atom() ->
 
 
 rand_tuple() ->
-    case random:uniform(3) of
+    case rand:uniform(3) of
 	1 -> {ok, rand_term()}; % careful
 	2 -> {1, 2, 3};
 	3 -> {<<"yep">>, 1337}
     end.
 
 rand_list() ->
-    case random:uniform(3) of
+    case rand:uniform(3) of
 	1 -> "hi";
 	2 -> [1,rand_term()]; % careful
 	3 -> [improper|list]
     end.
 
 rand_map() ->
-    case random:uniform(3) of
+    case rand:uniform(3) of
 	1 -> #{ hi => 3 };
 	2 -> #{ wat => rand_term(), other => 3 };  % careful
 	3 -> #{ hi => 42, other => 42, yet_anoter => 1337 }
diff --git a/lib/debugger/test/record_SUITE.erl b/lib/debugger/test/record_SUITE.erl
index 2f663e2dfc..115e65c685 100644
--- a/lib/debugger/test/record_SUITE.erl
+++ b/lib/debugger/test/record_SUITE.erl
@@ -23,7 +23,7 @@
 
 -module(record_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
diff --git a/lib/debugger/test/trycatch_SUITE.erl b/lib/debugger/test/trycatch_SUITE.erl
index 7fdd98fc71..0303d1bd82 100644
--- a/lib/debugger/test/trycatch_SUITE.erl
+++ b/lib/debugger/test/trycatch_SUITE.erl
@@ -28,7 +28,7 @@
 	 catch_oops/1,after_oops/1,eclectic/1,rethrow/1,
 	 nested_of/1,nested_catch/1,nested_after/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
diff --git a/lib/debugger/vsn.mk b/lib/debugger/vsn.mk
index e47ed98128..cf8ffd3272 100644
--- a/lib/debugger/vsn.mk
+++ b/lib/debugger/vsn.mk
@@ -1 +1 @@
-DEBUGGER_VSN = 4.1.1
+DEBUGGER_VSN = 4.1.2
diff --git a/lib/dialyzer/doc/src/dialyzer.xml b/lib/dialyzer/doc/src/dialyzer.xml
index 3fd34241b2..619db125b1 100644
--- a/lib/dialyzer/doc/src/dialyzer.xml
+++ b/lib/dialyzer/doc/src/dialyzer.xml
@@ -254,7 +254,7 @@
       analysis that finds data races performs intra-procedural data flow analysis
       and can sometimes explode in time. Enable it at your own risk.
       </item>
-i      <tag><c><![CDATA[-Wunderspecs]]></c>***</tag>
+      <tag><c><![CDATA[-Wunderspecs]]></c>***</tag>
       <item>Warn about underspecified functions
       (the -spec is strictly more allowing than the success typing).</item>
       <tag><c><![CDATA[-Wunknown]]></c>***</tag>
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 27364ae06a..4202730eed 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -32,6 +32,65 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
+<section><title>Dialyzer 2.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Dialyzer no longer asserts that files and directories
+	    to be removed from a PLT exist. </p>
+          <p>
+	    Own Id: OTP-13103 Aux Id: ERL-40 </p>
+        </item>
+        <item>
+	    <p> Fix a bug concerning parameterized opaque types. </p>
+          <p>
+	    Own Id: OTP-13237</p>
+        </item>
+        <item>
+          <p>
+	    Fix pretty printing of Core Maps</p>
+          <p>
+	    Literal maps could cause Dialyzer to crash when pretty
+	    printing the results.</p>
+          <p>
+	    Own Id: OTP-13238</p>
+        </item>
+        <item>
+          <p>
+	    If a behavior module contains an non-exported function
+	    with the same name as one of the behavior's callbacks,
+	    the callback info was inadvertently deleted from the PLT
+	    as the <c>dialyzer_plt:delete_list/2</c> function was
+	    cleaning up the callback table.</p>
+          <p>
+	    Own Id: OTP-13287</p>
+        </item>
+        <item>
+	    <p> Correct the contract for <c>erlang:byte_size/1</c>
+	    </p> <p> Correct the handling of comparison operators for
+	    map and bit string operands. </p>
+          <p>
+	    Own Id: OTP-13312</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Dialyzer recognizes calls to <c>M:F/A</c> where <c>M</c>,
+	    <c>F</c>, and <c>A</c> are all literals.</p>
+          <p>
+	    Own Id: OTP-13217</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Dialyzer 2.8.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile
index 770af2140f..fd75cd5cd8 100644
--- a/lib/dialyzer/src/Makefile
+++ b/lib/dialyzer/src/Makefile
@@ -61,6 +61,7 @@ MODULES =  \
 	dialyzer_gui_wx \
 	dialyzer_options \
 	dialyzer_plt \
+	dialyzer_race_data_server \
 	dialyzer_races \
 	dialyzer_succ_typings \
 	dialyzer_timing \
@@ -140,6 +141,7 @@ $(EBIN)/dialyzer_explanation.beam: dialyzer.hrl
 $(EBIN)/dialyzer_gui_wx.beam: dialyzer.hrl dialyzer_gui_wx.hrl
 $(EBIN)/dialyzer_options.beam: dialyzer.hrl
 $(EBIN)/dialyzer_plt.beam: dialyzer.hrl
+$(EBIN)/dialyzer_race_data_server.beam: dialyzer.hrl
 $(EBIN)/dialyzer_races.beam: dialyzer.hrl
 $(EBIN)/dialyzer_succ_typings.beam: dialyzer.hrl
 $(EBIN)/dialyzer_typesig.beam: dialyzer.hrl
diff --git a/lib/dialyzer/src/dialyzer.app.src b/lib/dialyzer/src/dialyzer.app.src
index 8ac6dc1367..003d7f2ba4 100644
--- a/lib/dialyzer/src/dialyzer.app.src
+++ b/lib/dialyzer/src/dialyzer.app.src
@@ -37,6 +37,7 @@
 	     dialyzer_gui_wx,
 	     dialyzer_options,
 	     dialyzer_plt,
+	     dialyzer_race_data_server,
 	     dialyzer_races,
 	     dialyzer_succ_typings,
 	     dialyzer_typesig,
@@ -44,7 +45,7 @@
              dialyzer_timing,
              dialyzer_worker]},
   {registered, []},
-  {applications, [compiler, gs, hipe, kernel, stdlib, wx]},
+  {applications, [compiler, hipe, kernel, stdlib, wx]},
   {env, []},
   {runtime_dependencies, ["wx-1.2","syntax_tools-1.6.14","stdlib-2.5",
 			  "kernel-3.0","hipe-3.13","erts-7.0",
diff --git a/lib/dialyzer/src/dialyzer.hrl b/lib/dialyzer/src/dialyzer.hrl
index de236f91ab..601e2e954b 100644
--- a/lib/dialyzer/src/dialyzer.hrl
+++ b/lib/dialyzer/src/dialyzer.hrl
@@ -2,7 +2,7 @@
 %%%
 %%% %CopyrightBegin%
 %%%
-%%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
+%%% Copyright Ericsson AB 2006-2015. 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.
@@ -123,10 +123,12 @@
 %% Record declarations used by various files
 %%--------------------------------------------------------------------
 
--record(analysis, {analysis_pid			   :: pid(),
+-type doc_plt() :: 'undefined' | dialyzer_plt:plt().
+
+-record(analysis, {analysis_pid			   :: pid() | 'undefined',
 		   type		  = succ_typings   :: anal_type(),
 		   defines	  = []		   :: [dial_define()],
-		   doc_plt                         :: dialyzer_plt:plt(),
+		   doc_plt                         :: doc_plt(),
 		   files          = []		   :: [file:filename()],
 		   include_dirs	  = []		   :: [file:filename()],
 		   start_from     = byte_code	   :: start_from(),
@@ -135,7 +137,7 @@
 		   race_detection = false	   :: boolean(),
 		   behaviours_chk = false          :: boolean(),
 		   timing         = false          :: boolean() | 'debug',
-		   timing_server             :: dialyzer_timing:timing_server(),
+		   timing_server  = none           :: dialyzer_timing:timing_server(),
 		   callgraph_file = ""             :: file:filename(),
                    solvers                         :: [solver()]}).
 
diff --git a/lib/dialyzer/src/dialyzer_analysis_callgraph.erl b/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
index 826ac51775..50fc1d8471 100644
--- a/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
+++ b/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
@@ -2,7 +2,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2006-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.
@@ -31,14 +31,17 @@
 
 -export([start/3]).
 
+%%% Export for dialyzer_coordinator...
 -export([compile_init_result/0,
-	 add_to_result/4,
-	 start_compilation/2,
+	 add_to_result/4]).
+%%% ... and export for dialyzer_worker.
+-export([start_compilation/2,
 	 continue_compilation/2]).
 
 -export_type([compile_init_data/0,
-	      one_file_result/0,
-	      compile_result/0]).
+              one_file_mid_error/0,
+              one_file_result_ok/0,
+              compile_result/0]).
 
 -include("dialyzer.hrl").
 
@@ -93,31 +96,19 @@ loop(#server_state{parent = Parent} = State,
       send_log(Parent, LogMsg),
       loop(State, Analysis, ExtCalls);
     {AnalPid, warnings, Warnings} ->
-      case Warnings of
-	[] -> ok;
-	SendWarnings ->
-	  send_warnings(Parent, SendWarnings)
-      end,
+      send_warnings(Parent, Warnings),
       loop(State, Analysis, ExtCalls);
     {AnalPid, cserver, CServer, Plt} ->
       send_codeserver_plt(Parent, CServer, Plt),
       loop(State, Analysis, ExtCalls);
     {AnalPid, done, Plt, DocPlt} ->
-      case ExtCalls =:= none of
-	true ->
-	  send_analysis_done(Parent, Plt, DocPlt);
-	false ->
-	  send_ext_calls(Parent, ExtCalls),
-	  send_analysis_done(Parent, Plt, DocPlt)
-      end;
+      send_ext_calls(Parent, ExtCalls),
+      send_analysis_done(Parent, Plt, DocPlt);
     {AnalPid, ext_calls, NewExtCalls} ->
       loop(State, Analysis, NewExtCalls);
     {AnalPid, ext_types, ExtTypes} ->
       send_ext_types(Parent, ExtTypes),
       loop(State, Analysis, ExtCalls);
-    {AnalPid, unknown_behaviours, UnknownBehaviour} ->
-      send_unknown_behaviours(Parent, UnknownBehaviour),
-      loop(State, Analysis, ExtCalls);
     {AnalPid, mod_deps, ModDeps} ->
       send_mod_deps(Parent, ModDeps),
       loop(State, Analysis, ExtCalls);
@@ -165,8 +156,7 @@ analysis_start(Parent, Analysis, LegalWarnings) ->
       MergedExpTypes = sets:union(NewExpTypes, OldExpTypes1),
       TmpCServer1 = dialyzer_codeserver:set_temp_records(MergedRecords, TmpCServer0),
       TmpCServer2 =
-        dialyzer_codeserver:insert_temp_exported_types(MergedExpTypes,
-                                                       TmpCServer1),
+        dialyzer_codeserver:finalize_exported_types(MergedExpTypes, TmpCServer1),
       ?timing(State#analysis_state.timing_server, "remote",
               begin
                 TmpCServer3 =
@@ -259,6 +249,10 @@ compile_and_store(Files, #analysis_state{codeserver = CServer,
   {T1, _} = statistics(wall_clock),
   Callgraph = dialyzer_callgraph:new(),
   CompileInit = make_compile_init(State, Callgraph),
+  %% Spawn a worker per file - where each worker calls
+  %% start_compilation on its file, asks next label to coordinator and
+  %% calls continue_compilation - and let coordinator aggregate
+  %% results using (compile_init_result and) add_to_result.
   {{Failed, Modules}, NextLabel} =
     ?timing(Timing, "compile", _C1,
 	    dialyzer_coordinator:parallel_job(compile, Files,
@@ -290,16 +284,18 @@ compile_and_store(Files, #analysis_state{codeserver = CServer,
   send_log(Parent, Msg2),
   {Callgraph, CServer2}.
 
--type compile_init_data() :: #compile_init{}.
--type error_reason()      :: string().
--type compile_result()    :: {[{file:filename(), error_reason()}],
-			      [module()]}. %%opaque
--type one_file_result()   :: {error, error_reason()} |
-			     {ok, [dialyzer_callgraph:callgraph_edge()],
-			      [mfa_or_funlbl()], module()}. %%opaque
--type compile_mid_data()  :: {module(), cerl:cerl(),
-			      dialyzer_callgraph:callgraph(),
-			      dialyzer_codeserver:codeserver()}.
+-opaque compile_init_data()  :: #compile_init{}.
+-type error_reason()         :: string().
+-opaque compile_result()     :: {[{file:filename(), error_reason()}],
+                                 [module()]}.
+-type one_file_mid_error()   :: {error, error_reason()}.
+-opaque one_file_result_ok() :: {ok, [dialyzer_callgraph:callgraph_edge()],
+                                 [mfa_or_funlbl()], module()}.
+-type one_file_result()      :: one_file_mid_error() |
+                                one_file_result_ok().
+-type compile_mid_data()     :: {module(), cerl:cerl(),
+                                 dialyzer_callgraph:callgraph(),
+                                 dialyzer_codeserver:codeserver()}.
 
 -spec compile_init_result() -> compile_result().
 
@@ -440,7 +436,8 @@ store_core(Mod, Core, Callgraph, CServer) ->
   CoreSize = cerl_trees:size(CoreTree),
   {ok, CoreSize, {Mod, CoreTree, Callgraph, CServer}}.
 
--spec continue_compilation(integer(), compile_mid_data()) -> one_file_result().
+-spec continue_compilation(integer(), compile_mid_data()) ->
+                              one_file_result_ok().
 
 continue_compilation(NextLabel, {Mod, CoreTree, Callgraph, CServer}) ->
   {LabeledTree, _NewNextLabel} = cerl_trees:label(CoreTree, NextLabel),
@@ -572,6 +569,8 @@ send_analysis_done(Parent, Plt, DocPlt) ->
   Parent ! {self(), done, Plt, DocPlt},
   ok.
 
+send_ext_calls(_Parent, none) ->
+  ok;
 send_ext_calls(Parent, ExtCalls) ->
   Parent ! {self(), ext_calls, ExtCalls},
   ok.
@@ -580,10 +579,6 @@ send_ext_types(Parent, ExtTypes) ->
   Parent ! {self(), ext_types, ExtTypes},
   ok.
 
-send_unknown_behaviours(Parent, UnknownBehaviours) ->
-  Parent ! {self(), unknown_behaviours, UnknownBehaviours},
-  ok.
-
 send_codeserver_plt(Parent, CServer, Plt ) ->
   Parent ! {self(), cserver, CServer, Plt},
   ok.
diff --git a/lib/dialyzer/src/dialyzer_callgraph.erl b/lib/dialyzer/src/dialyzer_callgraph.erl
index 9e53e171c0..50abb22009 100644
--- a/lib/dialyzer/src/dialyzer_callgraph.erl
+++ b/lib/dialyzer/src/dialyzer_callgraph.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2015. 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.
@@ -96,26 +96,28 @@
 %%		   whenever applicable.
 %%-----------------------------------------------------------------------------
 
+%% Types with comment 'race' are due to dialyzer_races.erl.
 -record(callgraph, {digraph        = digraph:new() :: digraph:graph(),
-		    active_digraph                 :: active_digraph(),
-                    esc	                           :: ets:tid(),
-                    letrec_map                     :: ets:tid(),
+		    active_digraph                 :: active_digraph()
+                                                    | 'undefined', % race
+                    esc	                           :: ets:tid()
+                                                    | 'undefined', % race
+                    letrec_map                     :: ets:tid()
+                                                    | 'undefined', % race
                     name_map	                   :: ets:tid(),
                     rev_name_map                   :: ets:tid(),
-                    rec_var_map                    :: ets:tid(),
-                    self_rec	                   :: ets:tid(),
-                    calls                          :: ets:tid(),
+                    rec_var_map                    :: ets:tid()
+                                                    | 'undefined', % race
+                    self_rec	                   :: ets:tid()
+                                                    | 'undefined', % race
+                    calls                          :: ets:tid()
+                                                    | 'undefined', % race
                     race_detection = false         :: boolean(),
-		    race_data_server = new_race_data_server() :: pid()}).
-
--record(race_data_state, {race_code     = dict:new() :: dict:dict(),
-			  public_tables = []         :: [label()],
-			  named_tables  = []         :: [string()],
-			  beh_api_calls = []         :: [{mfa(), mfa()}]}).
+		    race_data_server = dialyzer_race_data_server:new() :: pid()}).
 
 %% Exported Types
 
--type callgraph() :: #callgraph{}.
+-opaque callgraph() :: #callgraph{}.
 
 -type active_digraph() :: {'d', digraph:graph()} | {'e', ets:tid(), ets:tid()}.
 
@@ -609,45 +611,30 @@ digraph_reaching_subgraph(Funs, DG) ->
 
 renew_race_info(#callgraph{race_data_server = RaceDataServer} = CG,
 		RaceCode, PublicTables, NamedTables) ->
-  ok = race_data_server_cast(
+  ok = dialyzer_race_data_server:cast(
 	 {renew_race_info, {RaceCode, PublicTables, NamedTables}},
 	 RaceDataServer),
   CG.
 
-renew_race_info({RaceCode, PublicTables, NamedTables},
-		#race_data_state{} = State) ->
-  State#race_data_state{race_code = RaceCode,
-			public_tables = PublicTables,
-			named_tables = NamedTables}.
-
 -spec renew_race_code(dialyzer_races:races(), callgraph()) -> callgraph().
 
 renew_race_code(Races, #callgraph{race_data_server = RaceDataServer} = CG) ->
   Fun = dialyzer_races:get_curr_fun(Races),
   FunArgs = dialyzer_races:get_curr_fun_args(Races),
   Code = lists:reverse(dialyzer_races:get_race_list(Races)),
-  ok = race_data_server_cast(
+  ok = dialyzer_race_data_server:cast(
 	 {renew_race_code, {Fun, FunArgs, Code}},
 	 RaceDataServer),
   CG.
 
-renew_race_code_handler({Fun, FunArgs, Code},
-		      #race_data_state{race_code = RaceCode} = State) ->
-  State#race_data_state{race_code = dict:store(Fun, [FunArgs, Code], RaceCode)}.
-
 -spec renew_race_public_tables(label(), callgraph()) -> callgraph().
 
 renew_race_public_tables(VarLabel,
 			 #callgraph{race_data_server = RaceDataServer} = CG) ->
   ok =
-    race_data_server_cast({renew_race_public_tables, VarLabel}, RaceDataServer),
+    dialyzer_race_data_server:cast({renew_race_public_tables, VarLabel}, RaceDataServer),
   CG.
 
-renew_race_public_tables_handler(VarLabel,
-				 #race_data_state{public_tables = PT}
-				 = State) ->
-  State#race_data_state{public_tables = ordsets:add_element(VarLabel, PT)}.
-
 -spec cleanup(callgraph()) -> callgraph().
 
 cleanup(#callgraph{digraph = Digraph,
@@ -657,18 +644,18 @@ cleanup(#callgraph{digraph = Digraph,
   #callgraph{digraph = Digraph,
 	     name_map = NameMap,
              rev_name_map = RevNameMap,
-	     race_data_server = race_data_server_call(dup, RaceDataServer)}.
+	     race_data_server = dialyzer_race_data_server:duplicate(RaceDataServer)}.
 
 -spec duplicate(callgraph()) -> callgraph().
 
 duplicate(#callgraph{race_data_server = RaceDataServer} = Callgraph) ->
   Callgraph#callgraph{
-    race_data_server = race_data_server_call(dup, RaceDataServer)}.
+    race_data_server = dialyzer_race_data_server:duplicate(RaceDataServer)}.
 
 -spec dispose_race_server(callgraph()) -> ok.
 
 dispose_race_server(#callgraph{race_data_server = RaceDataServer}) ->
-  race_data_server_cast(stop, RaceDataServer).
+  dialyzer_race_data_server:stop(RaceDataServer).
 
 -spec get_digraph(callgraph()) -> digraph:graph().
 
@@ -678,17 +665,17 @@ get_digraph(#callgraph{digraph = Digraph}) ->
 -spec get_named_tables(callgraph()) -> [string()].
 
 get_named_tables(#callgraph{race_data_server = RaceDataServer}) ->
-  race_data_server_call(get_named_tables, RaceDataServer).
+  dialyzer_race_data_server:call(get_named_tables, RaceDataServer).
 
 -spec get_public_tables(callgraph()) -> [label()].
 
 get_public_tables(#callgraph{race_data_server = RaceDataServer}) ->
-  race_data_server_call(get_public_tables, RaceDataServer).
+  dialyzer_race_data_server:call(get_public_tables, RaceDataServer).
 
 -spec get_race_code(callgraph()) -> dict:dict().
 
 get_race_code(#callgraph{race_data_server = RaceDataServer}) ->
-  race_data_server_call(get_race_code, RaceDataServer).
+  dialyzer_race_data_server:call(get_race_code, RaceDataServer).
 
 -spec get_race_detection(callgraph()) -> boolean().
 
@@ -698,12 +685,12 @@ get_race_detection(#callgraph{race_detection = RD}) ->
 -spec get_behaviour_api_calls(callgraph()) -> [{mfa(), mfa()}].
 
 get_behaviour_api_calls(#callgraph{race_data_server = RaceDataServer}) ->
-  race_data_server_call(get_behaviour_api_calls, RaceDataServer).
+  dialyzer_race_data_server:call(get_behaviour_api_calls, RaceDataServer).
 
 -spec race_code_new(callgraph()) -> callgraph().
 
 race_code_new(#callgraph{race_data_server = RaceDataServer} = CG) ->
-  ok = race_data_server_cast(race_code_new, RaceDataServer),
+  ok = dialyzer_race_data_server:cast(race_code_new, RaceDataServer),
   CG.
 
 -spec put_digraph(digraph:graph(), callgraph()) -> callgraph().
@@ -714,7 +701,7 @@ put_digraph(Digraph, Callgraph) ->
 -spec put_race_code(dict:dict(), callgraph()) -> callgraph().
 
 put_race_code(RaceCode, #callgraph{race_data_server = RaceDataServer} = CG) ->
-  ok = race_data_server_cast({put_race_code, RaceCode}, RaceDataServer),
+  ok = dialyzer_race_data_server:cast({put_race_code, RaceCode}, RaceDataServer),
   CG.
 
 -spec put_race_detection(boolean(), callgraph()) -> callgraph().
@@ -726,78 +713,23 @@ put_race_detection(RaceDetection, Callgraph) ->
 
 put_named_tables(NamedTables,
 		 #callgraph{race_data_server = RaceDataServer} = CG) ->
-  ok = race_data_server_cast({put_named_tables, NamedTables}, RaceDataServer),
+  ok = dialyzer_race_data_server:cast({put_named_tables, NamedTables}, RaceDataServer),
   CG.
 
 -spec put_public_tables([label()], callgraph()) -> callgraph().
 
 put_public_tables(PublicTables,
 		 #callgraph{race_data_server = RaceDataServer} = CG) ->
-  ok = race_data_server_cast({put_public_tables, PublicTables}, RaceDataServer),
+  ok = dialyzer_race_data_server:cast({put_public_tables, PublicTables}, RaceDataServer),
   CG.
 
 -spec put_behaviour_api_calls([{mfa(), mfa()}], callgraph()) -> callgraph().
 
 put_behaviour_api_calls(Calls,
 		 #callgraph{race_data_server = RaceDataServer} = CG) ->
-  ok = race_data_server_cast({put_behaviour_api_calls, Calls}, RaceDataServer),
+  ok = dialyzer_race_data_server:cast({put_behaviour_api_calls, Calls}, RaceDataServer),
   CG.
 
-
-new_race_data_server() ->
-  spawn_link(fun() -> race_data_server_loop(#race_data_state{}) end).
-
-race_data_server_loop(State) ->
-  receive
-    {call, From, Ref, Query} ->
-      Reply = race_data_server_handle_call(Query, State),
-      From ! {Ref, Reply},
-      race_data_server_loop(State);
-    {cast, stop} ->
-      ok;
-    {cast, Message} ->
-      NewState = race_data_server_handle_cast(Message, State),
-      race_data_server_loop(NewState)
-  end.
-
-race_data_server_call(Query, Server) ->
-  Ref = make_ref(),
-  Server ! {call, self(), Ref, Query},
-  receive
-    {Ref, Reply} -> Reply
-  end.
-
-race_data_server_cast(Message, Server) ->
-  Server ! {cast, Message},
-  ok.
-
-race_data_server_handle_cast(race_code_new, State) ->
-  State#race_data_state{race_code = dict:new()};
-race_data_server_handle_cast({Tag, Data}, State) ->
-  case Tag of
-    renew_race_info -> renew_race_info(Data, State);
-    renew_race_code -> renew_race_code_handler(Data, State);
-    renew_race_public_tables -> renew_race_public_tables_handler(Data, State);
-    put_race_code -> State#race_data_state{race_code = Data};
-    put_public_tables -> State#race_data_state{public_tables = Data};
-    put_named_tables -> State#race_data_state{named_tables = Data};
-    put_behaviour_api_calls -> State#race_data_state{beh_api_calls = Data}
-  end.
-
-race_data_server_handle_call(Query,
-			     #race_data_state{race_code = RaceCode,
-					      public_tables = PublicTables,
-					      named_tables = NamedTables,
-					      beh_api_calls = BehApiCalls}
-			     = State) ->
-  case Query of
-    dup -> spawn_link(fun() -> race_data_server_loop(State) end);
-    get_race_code -> RaceCode;
-    get_public_tables -> PublicTables;
-    get_named_tables -> NamedTables;
-    get_behaviour_api_calls -> BehApiCalls
-  end.
-
 %%=============================================================================
 %% Utilities for 'dot'
 %%=============================================================================
diff --git a/lib/dialyzer/src/dialyzer_cl.erl b/lib/dialyzer/src/dialyzer_cl.erl
index 4116866916..50ff5304d6 100644
--- a/lib/dialyzer/src/dialyzer_cl.erl
+++ b/lib/dialyzer/src/dialyzer_cl.erl
@@ -36,7 +36,7 @@
 -include_lib("kernel/include/file.hrl").  % needed for #file_info{}
 
 -record(cl_state,
-	{backend_pid                      :: pid(),
+	{backend_pid                      :: pid() | 'undefined',
 	 erlang_mode     = false          :: boolean(),
 	 external_calls  = []             :: [mfa()],
          external_types  = []             :: [mfa()],
@@ -49,8 +49,7 @@
 	 plt_info        = none           :: 'none' | dialyzer_plt:plt_info(),
 	 report_mode     = normal         :: rep_mode(),
 	 return_status= ?RET_NOTHING_SUSPICIOUS	:: dial_ret(),
-	 stored_warnings = []             :: [raw_warning()],
-	 unknown_behaviours = []          :: [dialyzer_behaviours:behaviour()]
+	 stored_warnings = []             :: [raw_warning()]
 	}).
 
 %%--------------------------------------------------------------------
@@ -638,9 +637,6 @@ cl_loop(State, LogCache) ->
     {BackendPid, warnings, Warnings} ->
       NewState = store_warnings(State, Warnings),
       cl_loop(NewState, LogCache);
-    {BackendPid, unknown_behaviours, Behaviours} ->
-      NewState = store_unknown_behaviours(State, Behaviours),
-      cl_loop(NewState, LogCache);
     {BackendPid, done, NewPlt, _NewDocPlt} ->
       return_value(State, NewPlt);
     {BackendPid, ext_calls, ExtCalls} ->
@@ -683,11 +679,6 @@ format_log_cache(LogCache) ->
 store_warnings(#cl_state{stored_warnings = StoredWarnings} = St, Warnings) ->
   St#cl_state{stored_warnings = StoredWarnings ++ Warnings}.
 
--spec store_unknown_behaviours(#cl_state{}, [dialyzer_behaviours:behaviour()]) -> #cl_state{}.
-
-store_unknown_behaviours(#cl_state{unknown_behaviours = Behs} = St, Beh) ->
-  St#cl_state{unknown_behaviours = Beh ++ Behs}.
-
 -spec cl_error(string()) -> no_return().
 
 cl_error(Msg) ->
@@ -724,7 +715,6 @@ return_value(State = #cl_state{erlang_mode = ErlangMode,
       print_warnings(State),
       print_ext_calls(State),
       print_ext_types(State),
-      print_unknown_behaviours(State),
       maybe_close_output_file(State),
       {RetValue, []};
     true -> 
@@ -737,8 +727,7 @@ unknown_warnings(State = #cl_state{legal_warnings = LegalWarnings}) ->
   Unknown = case ordsets:is_element(?WARN_UNKNOWN, LegalWarnings) of
               true ->
                 unknown_functions(State) ++
-                  unknown_types(State) ++
-                  unknown_behaviours(State);
+                  unknown_types(State);
               false -> []
             end,
   WarningInfo = {_Filename = "", _Line = 0, _MorMFA = ''},
@@ -814,48 +803,6 @@ do_print_ext_types(Output, [{M,F,A}|T], Before) ->
 do_print_ext_types(_, [], _) ->
   ok.
 
-unknown_behaviours(#cl_state{unknown_behaviours = DupBehaviours,
-                             legal_warnings = LegalWarnings}) ->
-  case ordsets:is_element(?WARN_BEHAVIOUR, LegalWarnings) of
-    false -> [];
-    true ->
-      Behaviours = lists:usort(DupBehaviours),
-      [{unknown_behaviour, B} || B <- Behaviours]
-  end.
-
-%%print_unknown_behaviours(#cl_state{report_mode = quiet}) ->
-%%  ok;
-print_unknown_behaviours(#cl_state{output = Output,
-				   external_calls = Calls,
-				   external_types = Types,
-				   stored_warnings = Warnings,
-				   unknown_behaviours = DupBehaviours,
-				   legal_warnings = LegalWarnings,
-				   output_format = Format}) ->
-  case ordsets:is_element(?WARN_BEHAVIOUR, LegalWarnings)
-    andalso DupBehaviours =/= [] of
-    false -> ok;
-    true ->
-      Behaviours = lists:usort(DupBehaviours),
-      case Warnings =:= [] andalso Calls =:= [] andalso Types =:= [] of
-	true -> io:nl(Output); %% Need to do a newline first
-	false -> ok
-      end,
-      {Prompt, Prefix} =
-	case Format of
-	  formatted -> {"Unknown behaviours:\n","  "};
-	  raw -> {"%% Unknown behaviours:\n","%%  "}
-	end,
-      io:put_chars(Output, Prompt),
-      do_print_unknown_behaviours(Output, Behaviours, Prefix)
-  end.
-
-do_print_unknown_behaviours(Output, [B|T], Before) ->
-  io:format(Output, "~s~p\n", [Before,B]),
-  do_print_unknown_behaviours(Output, T, Before);
-do_print_unknown_behaviours(_, [], _) ->
-  ok.
-
 print_warnings(#cl_state{stored_warnings = []}) ->
   ok;
 print_warnings(#cl_state{output = Output,
diff --git a/lib/dialyzer/src/dialyzer_codeserver.erl b/lib/dialyzer/src/dialyzer_codeserver.erl
index 978ecd3843..03cd9671af 100644
--- a/lib/dialyzer/src/dialyzer_codeserver.erl
+++ b/lib/dialyzer/src/dialyzer_codeserver.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2015. 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.
@@ -81,10 +81,10 @@
 
 -record(codeserver, {next_core_label = 0 :: label(),
 		     code		 :: dict_ets(),
-                     exported_types      :: set_ets(), % set(mfa())
-		     records             :: dict_ets(),
-		     contracts           :: dict_ets(),
-		     callbacks           :: dict_ets(),
+                     exported_types      :: set_ets() | 'undefined', % set(mfa())
+		     records             :: dict_ets() | 'undefined',
+		     contracts           :: dict_ets() | 'undefined',
+		     callbacks           :: dict_ets() | 'undefined',
                      fun_meta_info       :: dict_ets(), % {mfa(), meta_info()}
 		     exports             :: 'clean' | set_ets(), % set(mfa())
                      temp_exported_types :: 'clean' | set_ets(), % set(mfa())
diff --git a/lib/dialyzer/src/dialyzer_contracts.erl b/lib/dialyzer/src/dialyzer_contracts.erl
index 7251de8b10..e03e4d5bb4 100644
--- a/lib/dialyzer/src/dialyzer_contracts.erl
+++ b/lib/dialyzer/src/dialyzer_contracts.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2007-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.
@@ -126,13 +126,19 @@ butlast([H|T]) -> [H|butlast(T)].
 
 constraints_to_string([]) ->
   "";
-constraints_to_string([{type, _, constraint, [{atom, _, What}, Types]}]) ->
-  atom_to_list(What) ++ "(" ++
-    sequence([erl_types:t_form_to_string(T) || T <- Types], ",") ++ ")";
 constraints_to_string([{type, _, constraint, [{atom, _, What}, Types]}|Rest]) ->
-  atom_to_list(What) ++ "(" ++
-    sequence([erl_types:t_form_to_string(T) || T <- Types], ",")
-    ++ "), " ++ constraints_to_string(Rest).
+  S = constraint_to_string(What, Types),
+  case Rest of
+    [] -> S;
+    _ -> S ++ ", " ++ constraints_to_string(Rest)
+  end.
+
+constraint_to_string(is_subtype, [{var, _, Var}, T]) ->
+  atom_to_list(Var) ++ " :: " ++ erl_types:t_form_to_string(T);
+constraint_to_string(What, Types) ->
+  atom_to_list(What) ++ "("
+    ++ sequence([erl_types:t_form_to_string(T) || T <- Types], ",")
+    ++ ")".
 
 sequence([], _Delimiter) -> "";
 sequence([H], _Delimiter) -> H;
@@ -161,8 +167,7 @@ process_contract_remote_types(CodeServer) ->
   dialyzer_codeserver:finalize_contracts(NewContractDict, NewCallbackDict,
 					 CodeServer).
 
--type opaques() :: [erl_types:erl_type()] | 'universe'.
--type opaques_fun() :: fun((module()) -> opaques()).
+-type opaques_fun() :: fun((module()) -> [erl_types:erl_type()]).
 
 -type fun_types() :: dict:dict(label(), erl_types:type_table()).
 
diff --git a/lib/dialyzer/src/dialyzer_coordinator.erl b/lib/dialyzer/src/dialyzer_coordinator.erl
index 612f379d32..87cbd25b30 100644
--- a/lib/dialyzer/src/dialyzer_coordinator.erl
+++ b/lib/dialyzer/src/dialyzer_coordinator.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2006-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.
@@ -29,8 +29,8 @@
 %%% Export for dialyzer main process
 -export([parallel_job/4]).
 
-%%% Exports for all possible workers
--export([wait_activation/0, job_done/3]).
+%%% Export for all possible workers
+-export([job_done/3]).
 
 %%% Exports for the typesig and dataflow analysis workers
 -export([sccs_to_pids/2, request_activation/1]).
@@ -38,7 +38,7 @@
 %%% Exports for the compilation workers
 -export([get_next_label/2]).
 
--export_type([coordinator/0, mode/0, init_data/0, result/0]).
+-export_type([coordinator/0, mode/0, init_data/0, result/0, job/0]).
 
 %%--------------------------------------------------------------------
 
@@ -46,16 +46,18 @@
 -type regulator()  :: pid().
 -type scc_to_pid() :: ets:tid() | 'unused'.
 
--type coordinator() :: {collector(), regulator(), scc_to_pid()}. %%opaque
+-opaque coordinator() :: {collector(), regulator(), scc_to_pid()}.
 -type timing() :: dialyzer_timing:timing_server().
 
 -type scc()     :: [mfa_or_funlbl()].
 -type mode()    :: 'typesig' | 'dataflow' | 'compile' | 'warnings'.
 
--type compile_jobs()  :: [file:filename()].
--type typesig_jobs()  :: [scc()].
--type dataflow_jobs() :: [module()].
--type warnings_jobs() :: [module()].
+-type compile_job()  :: file:filename().
+-type typesig_job()  :: scc().
+-type dataflow_job() :: module().
+-type warnings_job() :: module().
+
+-type job() :: compile_job() | typesig_job() | dataflow_job() | warnings_job().
 
 -type compile_init_data()  :: dialyzer_analysis_callgraph:compile_init_data().
 -type typesig_init_data()  :: dialyzer_succ_typings:typesig_init_data().
@@ -73,9 +75,9 @@
 -type result() :: compile_result() | typesig_result() |
 		  dataflow_result() | warnings_result().
 
--type job() :: scc() | module() | file:filename().
--type job_result() :: dialyzer_analysis_callgraph:one_file_result() |
-		      typesig_result() | dataflow_result() | warnings_result().
+-type job_result() :: dialyzer_analysis_callgraph:one_file_mid_error() |
+                      dialyzer_analysis_callgraph:one_file_result_ok() |
+                      typesig_result() | dataflow_result() | warnings_result().
 
 -record(state, {mode           :: mode(),
 		active     = 0 :: integer(),
@@ -90,13 +92,13 @@
 
 %%--------------------------------------------------------------------
 
--spec parallel_job('compile', compile_jobs(), compile_init_data(), timing()) ->
+-spec parallel_job('compile', [compile_job()], compile_init_data(), timing()) ->
 		      {compile_result(), integer()};
-		  ('typesig', typesig_jobs(), typesig_init_data(), timing()) ->
+		  ('typesig', [typesig_job()], typesig_init_data(), timing()) ->
 		      typesig_result();
-		  ('dataflow', dataflow_jobs(), dataflow_init_data(),
+		  ('dataflow', [dataflow_job()], dataflow_init_data(),
 		   timing()) -> dataflow_result();
-		  ('warnings', warnings_jobs(), warnings_init_data(),
+		  ('warnings', [warnings_job()], warnings_init_data(),
 		   timing()) -> warnings_result().
 
 parallel_job(Mode, Jobs, InitData, Timing) ->
@@ -118,7 +120,7 @@ spawn_jobs(Mode, Jobs, InitData, Timing) ->
 	Pid = dialyzer_worker:launch(Mode, Job, InitData, Coordinator),
 	case TypesigOrDataflow of
 	  true  -> true = ets:insert(SCCtoPID, {Job, Pid}), ok;
-	  false -> request_activation(Regulator, Pid)
+	  false -> ok
 	end,
 	Count + 1
     end,
@@ -217,10 +219,6 @@ request_activation({_Collector, Regulator, _SCCtoPID}) ->
   Regulator ! {req, self()},
   wait_activation().
 
-request_activation(Regulator, Pid) ->
-  Regulator ! {req, Pid},
-  ok.
-
 spawn_regulator() ->
   InitTickets = dialyzer_utils:parallelism(),
   spawn_link(fun() -> regulator_loop(InitTickets, queue:new()) end).
diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl
index cabc5e9e0d..6e49043551 100644
--- a/lib/dialyzer/src/dialyzer_dataflow.erl
+++ b/lib/dialyzer/src/dialyzer_dataflow.erl
@@ -99,19 +99,29 @@
 
 -define(BITS, 128).
 
--record(state, {callgraph            :: dialyzer_callgraph:callgraph(),
-                codeserver           :: dialyzer_codeserver:codeserver(),
-		envs                 :: env_tab(),
-		fun_tab		     :: fun_tab(),
-                fun_homes            :: dict:dict(label(), mfa()),
-		plt		     :: dialyzer_plt:plt(),
-		opaques              :: [type()],
+%% Types with comment 'race' are due to dialyzer_races.erl.
+-record(state, {callgraph            :: dialyzer_callgraph:callgraph()
+                                      | 'undefined', % race
+                codeserver           :: dialyzer_codeserver:codeserver()
+                                      | 'undefined', % race
+		envs                 :: env_tab()
+                                      | 'undefined', % race
+		fun_tab		     :: fun_tab()
+                                      | 'undefined', % race
+                fun_homes            :: dict:dict(label(), mfa())
+                                      | 'undefined', % race
+		plt		     :: dialyzer_plt:plt()
+                                      | 'undefined', % race
+		opaques              :: [type()]
+                                      | 'undefined', % race
 		races = dialyzer_races:new() :: dialyzer_races:races(),
 		records = dict:new() :: types(),
-		tree_map	     :: dict:dict(label(), cerl:cerl()),
+		tree_map	     :: dict:dict(label(), cerl:cerl())
+                                      | 'undefined', % race
 		warning_mode = false :: boolean(),
 		warnings = []        :: [raw_warning()],
-		work                 :: {[_], [_], sets:set()},
+		work                 :: {[_], [_], sets:set()}
+                                      | 'undefined', % race
 		module               :: module(),
                 curr_fun             :: curr_fun()
                }).
diff --git a/lib/dialyzer/src/dialyzer_gui_wx.erl b/lib/dialyzer/src/dialyzer_gui_wx.erl
index ff54a91ce1..9f344d87ff 100644
--- a/lib/dialyzer/src/dialyzer_gui_wx.erl
+++ b/lib/dialyzer/src/dialyzer_gui_wx.erl
@@ -2,7 +2,7 @@
 %%------------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2015. 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.
@@ -52,7 +52,6 @@
 		    add_dir           :: wx:wx_object(),
 		    add_rec           :: wx:wx_object(),
 		    chosen_box        :: wx:wx_object(),
-		    analysis_pid      :: pid(),
 		    del_file          :: wx:wx_object(),
 		    doc_plt           :: dialyzer_plt:plt(),
 		    clear_chosen      :: wx:wx_object(),
@@ -72,11 +71,11 @@
 		    stop              :: wx:wx_object(),
 		    frame             :: wx:wx_object(),
 		    warnings_box      :: wx:wx_object(),
-		    explanation_box   :: wx:wx_object(),
+		    explanation_box   :: wx:wx_object() | 'undefined',
 		    wantedWarnings    :: list(),
 		    rawWarnings       :: list(),
-		    backend_pid       :: pid(),
-		    expl_pid          :: pid()}).
+		    backend_pid       :: pid() | 'undefined',
+		    expl_pid          :: pid() | 'undefined'}).
 	       
 %%------------------------------------------------------------------------
 
diff --git a/lib/dialyzer/src/dialyzer_options.erl b/lib/dialyzer/src/dialyzer_options.erl
index ce84c17f43..dd81dd01ed 100644
--- a/lib/dialyzer/src/dialyzer_options.erl
+++ b/lib/dialyzer/src/dialyzer_options.erl
@@ -72,9 +72,15 @@ preprocess_opts([Opt|Opts]) ->
   [Opt|preprocess_opts(Opts)].
 
 postprocess_opts(Opts = #options{}) ->
+  check_file_existence(Opts),
   Opts1 = check_output_plt(Opts),
   adapt_get_warnings(Opts1).
 
+check_file_existence(#options{analysis_type = plt_remove}) -> ok;
+check_file_existence(#options{files = Files, files_rec = FilesRec}) ->
+  assert_filenames_exist(Files),
+  assert_filenames_exist(FilesRec).
+
 check_output_plt(Opts = #options{analysis_type = Mode, from = From,
 				 output_plt = OutPLT}) ->
   case is_plt_mode(Mode) of
@@ -126,14 +132,14 @@ build_options([{OptionName, Value} = Term|Rest], Options) ->
     apps ->
       OldValues = Options#options.files_rec,
       AppDirs = get_app_dirs(Value),
-      assert_filenames(Term, AppDirs),
+      assert_filenames_form(Term, AppDirs),
       build_options(Rest, Options#options{files_rec = AppDirs ++ OldValues});
     files ->
-      assert_filenames(Term, Value),
+      assert_filenames_form(Term, Value),
       build_options(Rest, Options#options{files = Value});
     files_rec ->
       OldValues = Options#options.files_rec,
-      assert_filenames(Term, Value),
+      assert_filenames_form(Term, Value),
       build_options(Rest, Options#options{files_rec = Value ++ OldValues});
     analysis_type ->
       NewOptions =
@@ -210,16 +216,26 @@ get_app_dirs(Apps) when is_list(Apps) ->
 get_app_dirs(Apps) ->
   bad_option("Use a list of otp applications", Apps).
 
-assert_filenames(Term, [FileName|Left]) when length(FileName) >= 0 ->
+assert_filenames(Term, Files) ->
+  assert_filenames_form(Term, Files),
+  assert_filenames_exist(Files).
+
+assert_filenames_form(Term, [FileName|Left]) when length(FileName) >= 0 ->
+  assert_filenames_form(Term, Left);
+assert_filenames_form(_Term, []) ->
+  ok;
+assert_filenames_form(Term, [_|_]) ->
+  bad_option("Malformed or non-existing filename", Term).
+
+assert_filenames_exist([FileName|Left]) ->
   case filelib:is_file(FileName) orelse filelib:is_dir(FileName) of
     true -> ok;
-    false -> bad_option("No such file, directory or application", FileName)
+    false ->
+      bad_option("No such file, directory or application", FileName)
   end,
-  assert_filenames(Term, Left);
-assert_filenames(_Term, []) ->
-  ok;
-assert_filenames(Term, [_|_]) ->
-  bad_option("Malformed or non-existing filename", Term).
+  assert_filenames_exist(Left);
+assert_filenames_exist([]) ->
+  ok.
 
 assert_filename(FileName) when length(FileName) >= 0 ->
   ok;
diff --git a/lib/dialyzer/src/dialyzer_plt.erl b/lib/dialyzer/src/dialyzer_plt.erl
index 634871b2eb..769f26a3df 100644
--- a/lib/dialyzer/src/dialyzer_plt.erl
+++ b/lib/dialyzer/src/dialyzer_plt.erl
@@ -137,7 +137,7 @@ delete_list(#plt{info = Info, types = Types,
   #plt{info = table_delete_list(Info, List),
        types = Types,
        contracts = table_delete_list(Contracts, List),
-       callbacks = table_delete_list(Callbacks, List),
+       callbacks = Callbacks,
        exported_types = ExpTypes}.
 
 -spec insert_contract_list(plt(), dialyzer_contracts:plt_contracts()) -> plt().
diff --git a/lib/dialyzer/src/dialyzer_race_data_server.erl b/lib/dialyzer/src/dialyzer_race_data_server.erl
new file mode 100644
index 0000000000..3600491809
--- /dev/null
+++ b/lib/dialyzer/src/dialyzer_race_data_server.erl
@@ -0,0 +1,134 @@
+%% -*- erlang-indent-level: 2 -*-
+%%-----------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-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%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File    : dialyzer_race_data_server.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description : 
+%%%
+%%% Created : 18 Sep 2015 by Luca Favatella <[email protected]>
+%%%-------------------------------------------------------------------
+-module(dialyzer_race_data_server).
+
+-export([new/0,
+         duplicate/1,
+         stop/1,
+         call/2,
+         cast/2]).
+
+-include("dialyzer.hrl").
+
+%%----------------------------------------------------------------------
+
+-record(state, {race_code     = dict:new() :: dict:dict(),
+                public_tables = []         :: [label()],
+                named_tables  = []         :: [string()],
+                beh_api_calls = []         :: [{mfa(), mfa()}]}).
+
+%%----------------------------------------------------------------------
+
+-spec new() -> pid().
+
+new() ->
+  spawn_link(fun() -> loop(#state{}) end).
+
+-spec duplicate(pid()) -> pid().
+
+duplicate(Server) ->
+  call(dup, Server).
+
+-spec stop(pid()) -> ok.
+
+stop(Server) ->
+  cast(stop, Server).
+
+-spec call(atom(), pid()) -> term().
+
+call(Query, Server) ->
+  Ref = make_ref(),
+  Server ! {call, self(), Ref, Query},
+  receive
+    {Ref, Reply} -> Reply
+  end.
+
+-spec cast(atom() | {atom(), term()}, pid()) -> ok.
+
+cast(Message, Server) ->
+  Server ! {cast, Message},
+  ok.
+
+%%----------------------------------------------------------------------
+
+loop(State) ->
+  receive
+    {call, From, Ref, Query} ->
+      Reply = handle_call(Query, State),
+      From ! {Ref, Reply},
+      loop(State);
+    {cast, stop} ->
+      ok;
+    {cast, Message} ->
+      NewState = handle_cast(Message, State),
+      loop(NewState)
+  end.
+
+handle_cast(race_code_new, State) ->
+  State#state{race_code = dict:new()};
+handle_cast({Tag, Data}, State) ->
+  case Tag of
+    renew_race_info -> renew_race_info_handler(Data, State);
+    renew_race_code -> renew_race_code_handler(Data, State);
+    renew_race_public_tables -> renew_race_public_tables_handler(Data, State);
+    put_race_code -> State#state{race_code = Data};
+    put_public_tables -> State#state{public_tables = Data};
+    put_named_tables -> State#state{named_tables = Data};
+    put_behaviour_api_calls -> State#state{beh_api_calls = Data}
+  end.
+
+handle_call(Query,
+            #state{race_code = RaceCode,
+                   public_tables = PublicTables,
+                   named_tables = NamedTables,
+                   beh_api_calls = BehApiCalls}
+            = State) ->
+  case Query of
+    dup -> spawn_link(fun() -> loop(State) end);
+    get_race_code -> RaceCode;
+    get_public_tables -> PublicTables;
+    get_named_tables -> NamedTables;
+    get_behaviour_api_calls -> BehApiCalls
+  end.
+
+%%----------------------------------------------------------------------
+
+renew_race_info_handler({RaceCode, PublicTables, NamedTables},
+                        #state{} = State) ->
+  State#state{race_code = RaceCode,
+              public_tables = PublicTables,
+              named_tables = NamedTables}.
+
+renew_race_code_handler({Fun, FunArgs, Code},
+                        #state{race_code = RaceCode} = State) ->
+  State#state{race_code = dict:store(Fun, [FunArgs, Code], RaceCode)}.
+
+renew_race_public_tables_handler(VarLabel,
+                                 #state{public_tables = PT} = State) ->
+  State#state{public_tables = ordsets:add_element(VarLabel, PT)}.
diff --git a/lib/dialyzer/src/dialyzer_races.erl b/lib/dialyzer/src/dialyzer_races.erl
index 39de071bde..bb43d1dcb8 100644
--- a/lib/dialyzer/src/dialyzer_races.erl
+++ b/lib/dialyzer/src/dialyzer_races.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2015. 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.
@@ -92,27 +92,28 @@
 -type race_warn_tag() :: ?WARN_WHEREIS_REGISTER | ?WARN_WHEREIS_UNREGISTER
                       | ?WARN_ETS_LOOKUP_INSERT | ?WARN_MNESIA_DIRTY_READ_WRITE.
 
--record(beg_clause, {arg        :: var_to_map1(),
-                     pats       :: var_to_map1(),
-                     guard      :: cerl:cerl()}).
--record(end_clause, {arg        :: var_to_map1(),
-                     pats       :: var_to_map1(),
-                     guard      :: cerl:cerl()}).
+-record(beg_clause, {arg        :: var_to_map1() | 'undefined',
+                     pats       :: var_to_map1() | 'undefined',
+                     guard      :: cerl:cerl() | 'undefined'}).
+-record(end_clause, {arg        :: var_to_map1() | 'undefined',
+                     pats       :: var_to_map1() | 'undefined',
+                     guard      :: cerl:cerl() | 'undefined'}).
 -record(end_case,   {clauses    :: [#end_clause{}]}).
--record(curr_fun,   {status     :: 'in' | 'out',
-                     mfa        :: dialyzer_callgraph:mfa_or_funlbl(),
-                     label      :: label(),
-                     def_vars   :: [core_vars()],
-                     arg_types  :: [erl_types:erl_type()],
-                     call_vars  :: [core_vars()],
-                     var_map    :: dict:dict()}).
+-record(curr_fun,   {status     :: 'in' | 'out' | 'undefined',
+                     mfa        :: dialyzer_callgraph:mfa_or_funlbl()
+                                 | 'undefined',
+                     label      :: label() | 'undefined',
+                     def_vars   :: [core_vars()] | 'undefined',
+                     arg_types  :: [erl_types:erl_type()] | 'undefined',
+                     call_vars  :: [core_vars()] | 'undefined',
+                     var_map    :: dict:dict() | 'undefined'}).
 -record(dep_call,   {call_name  :: dep_calls(),
-                     args       :: args(),
+                     args       :: args() | 'undefined',
                      arg_types  :: [erl_types:erl_type()],
                      vars       :: [core_vars()],
                      state      :: dialyzer_dataflow:state(),
                      file_line  :: file_line(),
-                     var_map    :: dict:dict()}).
+                     var_map    :: dict:dict() | 'undefined'}).
 -record(fun_call,   {caller     :: dialyzer_callgraph:mfa_or_funlbl(),
                      callee     :: dialyzer_callgraph:mfa_or_funlbl(),
                      arg_types  :: [erl_types:erl_type()],
@@ -121,7 +122,7 @@
                      arg        :: var_to_map1()}).
 -record(warn_call,  {call_name  :: warn_calls(),
                      args       :: args(),
-                     var_map    :: dict:dict()}).
+                     var_map    :: dict:dict() | 'undefined'}).
 
 -type case_tags()  :: 'beg_case' | #beg_clause{} | #end_clause{} | #end_case{}.
 -type code()       :: [#dep_call{} | #fun_call{} | #warn_call{} |
@@ -139,8 +140,9 @@
                      fun_mfa    :: dialyzer_callgraph:mfa_or_funlbl(),
                      fun_label  :: label()}).
 
--record(races, {curr_fun                :: dialyzer_callgraph:mfa_or_funlbl(),
-                curr_fun_label          :: label(),
+-record(races, {curr_fun                :: dialyzer_callgraph:mfa_or_funlbl()
+                                         | 'undefined',
+                curr_fun_label          :: label() | 'undefined',
                 curr_fun_args = 'empty' :: core_args(),
                 new_table = 'no_t'      :: table(),
                 race_list = []          :: code(),
diff --git a/lib/dialyzer/src/dialyzer_succ_typings.erl b/lib/dialyzer/src/dialyzer_succ_typings.erl
index 18f02e6742..987da3aecf 100644
--- a/lib/dialyzer/src/dialyzer_succ_typings.erl
+++ b/lib/dialyzer/src/dialyzer_succ_typings.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2015. 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.
@@ -134,7 +134,6 @@ get_refined_success_typings(SCCs, #st{callgraph = Callgraph,
       end
   end.
 
--type doc_plt() :: 'undefined' | dialyzer_plt:plt().
 -spec get_warnings(dialyzer_callgraph:callgraph(), dialyzer_plt:plt(),
 		   doc_plt(), dialyzer_codeserver:codeserver(),
 		   dialyzer_timing:timing_server(), [solver()], pid()) ->
diff --git a/lib/dialyzer/src/dialyzer_typesig.erl b/lib/dialyzer/src/dialyzer_typesig.erl
index 0b8b244cc9..5f0881bbcd 100644
--- a/lib/dialyzer/src/dialyzer_typesig.erl
+++ b/lib/dialyzer/src/dialyzer_typesig.erl
@@ -68,7 +68,7 @@
 -type type_var() :: erl_types:erl_type(). %% actually: {'c','var',_,_}
 
 -record(fun_var, {'fun' :: fun((_) -> erl_types:erl_type()), deps :: [dep()],
-		  origin :: integer()}).
+		  origin :: integer() | 'undefined'}).
 
 -type constr_op()    :: 'eq' | 'sub'.
 -type fvar_or_type() :: #fun_var{} | erl_types:erl_type().
@@ -83,9 +83,9 @@
 -record(constraint_list, {type :: 'conj' | 'disj',
 			  list :: [constr()],
 			  deps :: [dep()],
-                          masks :: [{dep(),[non_neg_integer()]}] |
-                                   {'d',dict:dict(dep(), [non_neg_integer()])},
-			  id   :: {'list', dep()}}).
+                          masks = [] :: [{dep(),[non_neg_integer()]}] |
+                                  {'d',dict:dict(dep(), [non_neg_integer()])},
+			  id   :: {'list', dep()} | 'undefined'}).
 
 -type constraint_list() :: #constraint_list{}.
 
@@ -104,7 +104,8 @@
 
 -type dict_or_ets() :: {'d', prop_types()} | {'e', ets:tid()}.
 
--record(state, {callgraph                    :: dialyzer_callgraph:callgraph(),
+-record(state, {callgraph                    :: dialyzer_callgraph:callgraph()
+                                              | 'undefined',
 		cs          = []                :: [constr()],
 		cmap        = {'d', dict:new()} :: dict_or_ets(),
 		fun_map     = []                :: typesig_funmap(),
@@ -116,7 +117,8 @@
                                                              cerl:c_fun()),
 		next_label  = 0                 :: label(),
 		self_rec                        :: 'false' | erl_types:erl_type(),
-		plt                             :: dialyzer_plt:plt(),
+		plt                             :: dialyzer_plt:plt()
+                                                 | 'undefined',
 		prop_types  = {'d', dict:new()} :: dict_or_ets(),
 		records     = dict:new()        :: types(),
 		scc         = []                :: [type_var()],
@@ -1746,7 +1748,10 @@ minimize_state(#state{
      fun_arities = FunArities,
      self_rec    = SelfRec,
      prop_types  = {e, ETSPropTypes},
-     solvers     = Solvers
+     solvers     = Solvers,
+     callgraph   = undefined,
+     plt         = undefined,
+     mfas        = []
     }.
 
 dispose_state(#state{cmap = {e, ETSCMap},
@@ -2884,8 +2889,7 @@ mk_constraint(Lhs, Op, Rhs) ->
   case t_is_any(Lhs) orelse constraint_opnd_is_any(Rhs) of
     false ->
       Deps = find_constraint_deps([Lhs, Rhs]),
-      C0 = mk_constraint_1(Lhs, Op, Rhs),
-      C = C0#constraint{deps = Deps},
+      C = mk_constraint_1(Lhs, Op, Rhs, Deps),
       case Deps =:= [] of
 	true ->
 	  %% This constraint is constant. Solve it immediately.
@@ -2903,8 +2907,7 @@ mk_constraint(Lhs, Op, Rhs) ->
   end.
 
 mk_constraint_any(Op) ->
-  C = mk_constraint_1(t_any(), Op, t_any()),
-  C#constraint{deps = []}.
+  mk_constraint_1(t_any(), Op, t_any(), []).
 
 %% the following function is used so that we do not call
 %% erl_types:t_is_any/1 with a term other than an erl_type()
@@ -2952,12 +2955,12 @@ find_constraint_deps([Type|Tail], Acc) ->
 find_constraint_deps([], Acc) ->
   lists:flatten(Acc).
 
-mk_constraint_1(Lhs, eq, Rhs) when Lhs < Rhs ->
-  #constraint{lhs = Lhs, op = eq, rhs = Rhs};
-mk_constraint_1(Lhs, eq, Rhs) ->
-  #constraint{lhs = Rhs, op = eq, rhs = Lhs};
-mk_constraint_1(Lhs, Op, Rhs) ->
-  #constraint{lhs = Lhs, op = Op, rhs = Rhs}.
+mk_constraint_1(Lhs, eq, Rhs, Deps) when Lhs < Rhs ->
+  #constraint{lhs = Lhs, op = eq, rhs = Rhs, deps = Deps};
+mk_constraint_1(Lhs, eq, Rhs, Deps) ->
+  #constraint{lhs = Rhs, op = eq, rhs = Lhs, deps = Deps};
+mk_constraint_1(Lhs, Op, Rhs, Deps) ->
+  #constraint{lhs = Lhs, op = Op, rhs = Rhs, deps = Deps}.
 
 mk_constraints([Lhs|LhsTail], Op, [Rhs|RhsTail]) ->
   [mk_constraint(Lhs, Op, Rhs) |
diff --git a/lib/dialyzer/src/dialyzer_utils.erl b/lib/dialyzer/src/dialyzer_utils.erl
index 7fe982a992..5fc1c0e691 100644
--- a/lib/dialyzer/src/dialyzer_utils.erl
+++ b/lib/dialyzer/src/dialyzer_utils.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2006-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.
@@ -83,7 +83,7 @@ print_types1([{record, _Name} = Key|T], RecDict) ->
 
 %% ----------------------------------------------------------------------------
 
--type abstract_code() :: [tuple()]. %% XXX: import from somewhere
+-type abstract_code() :: [erl_parse:abstract_form()].
 -type comp_options()  :: [compile:option()].
 -type mod_or_fname()  :: module() | file:filename().
 -type fa()            :: {atom(), arity()}.
@@ -297,8 +297,8 @@ get_record_fields([], _RecDict, Acc) ->
 %% The field types are cached. Used during analysis when handling records.
 process_record_remote_types(CServer) ->
   TempRecords = dialyzer_codeserver:get_temp_records(CServer),
-  TempExpTypes = dialyzer_codeserver:get_temp_exported_types(CServer),
-  TempRecords1 = process_opaque_types0(TempRecords, TempExpTypes),
+  ExpTypes = dialyzer_codeserver:get_exported_types(CServer),
+  TempRecords1 = process_opaque_types0(TempRecords, ExpTypes),
   ModuleFun =
     fun(Module, Record) ->
         RecordFun =
@@ -310,7 +310,7 @@ process_record_remote_types(CServer) ->
                         Site = {record, {Module, Name, Arity}},
                         [{FieldName, Field,
                           erl_types:t_from_form(Field,
-                                                TempExpTypes,
+                                                ExpTypes,
                                                 Site,
                                                 TempRecords1)}
                          || {FieldName, Field, _} <- Fields]
@@ -323,9 +323,8 @@ process_record_remote_types(CServer) ->
 	dict:map(RecordFun, Record)
     end,
   NewRecords = dict:map(ModuleFun, TempRecords1),
-  ok = check_record_fields(NewRecords, TempExpTypes),
-  CServer1 = dialyzer_codeserver:finalize_records(NewRecords, CServer),
-  dialyzer_codeserver:finalize_exported_types(TempExpTypes, CServer1).
+  ok = check_record_fields(NewRecords, ExpTypes),
+  dialyzer_codeserver:finalize_records(NewRecords, CServer).
 
 %% erl_types:t_from_form() substitutes the declaration of opaque types
 %% for the expanded type in some cases. To make sure the initial type,
diff --git a/lib/dialyzer/src/dialyzer_worker.erl b/lib/dialyzer/src/dialyzer_worker.erl
index 4be93c75bf..b9ab27c11d 100644
--- a/lib/dialyzer/src/dialyzer_worker.erl
+++ b/lib/dialyzer/src/dialyzer_worker.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2006-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.
@@ -21,20 +21,20 @@
 
 -module(dialyzer_worker).
 
--export([launch/4, sequential/4]).
+-export([launch/4]).
 
 -export_type([worker/0]).
 
--type worker() :: pid(). %%opaque
+-opaque worker() :: pid().
 
 -type mode()        :: dialyzer_coordinator:mode().
 -type coordinator() :: dialyzer_coordinator:coordinator().
 -type init_data()   :: dialyzer_coordinator:init_data().
--type result()      :: dialyzer_coordinator:result().
+-type job()         :: dialyzer_coordinator:job().
 
 -record(state, {
 	  mode             :: mode(),
-	  job              :: mfa_or_funlbl() | file:filename(),
+	  job              :: job(),
 	  coordinator      :: coordinator(),
 	  init_data        :: init_data(),
 	  depends_on  = [] :: list()
@@ -52,23 +52,28 @@
 
 %%--------------------------------------------------------------------
 
--spec launch(mode(), [mfa_or_funlbl()], init_data(), coordinator()) -> worker().
+-spec launch(mode(), job(), init_data(), coordinator()) -> worker().
 
 launch(Mode, Job, InitData, Coordinator) ->
   State = #state{mode        = Mode,
 		 job         = Job,
 		 init_data   = InitData,
 		 coordinator = Coordinator},
-  InitState =
-    case Mode of
-      X when X =:= 'typesig'; X =:= 'dataflow' -> initializing;
-      X when X =:= 'compile'; X =:= 'warnings' -> running
-    end,
-  spawn_link(fun() -> loop(InitState, State) end).
+  spawn_link(fun() -> init(State) end).
 
 %%--------------------------------------------------------------------
 
-loop(updating, State) ->
+init(#state{job = SCC, mode = Mode, init_data = InitData} = State) when
+    Mode =:= 'typesig'; Mode =:= 'dataflow' ->
+  DependsOn = dialyzer_succ_typings:find_depends_on(SCC, InitData),
+  ?debug("Deps ~p: ~p\n",[SCC, DependsOn]),
+  loop(updating, State#state{depends_on = DependsOn});
+init(#state{mode = Mode} = State) when
+    Mode =:= 'compile'; Mode =:= 'warnings' ->
+  loop(running, State).
+
+loop(updating, #state{mode = Mode} = State) when
+    Mode =:= 'typesig'; Mode =:= 'dataflow' ->
   ?debug("Update: ~p\n",[State#state.job]),
   NextStatus =
     case waits_more_success_typings(State) of
@@ -76,16 +81,13 @@ loop(updating, State) ->
       false -> running
     end,
   loop(NextStatus, State);
-loop(initializing, #state{job = SCC, init_data = InitData} = State) ->
-  DependsOn = dialyzer_succ_typings:find_depends_on(SCC, InitData),
-  ?debug("Deps ~p: ~p\n",[State#state.job, DependsOn]),
-  loop(updating, State#state{depends_on = DependsOn});
-loop(waiting, State) ->
+loop(waiting, #state{mode = Mode} = State) when
+    Mode =:= 'typesig'; Mode =:= 'dataflow' ->
   ?debug("Wait: ~p\n",[State#state.job]),
   NewState = wait_for_success_typings(State),
   loop(updating, NewState);
 loop(running, #state{mode = 'compile'} = State) ->
-  dialyzer_coordinator:wait_activation(),
+  dialyzer_coordinator:request_activation(State#state.coordinator),
   ?debug("Compile: ~s\n",[State#state.job]),
   Result =
     case start_compilation(State) of
@@ -97,7 +99,7 @@ loop(running, #state{mode = 'compile'} = State) ->
     end,
   report_to_coordinator(Result, State);
 loop(running, #state{mode = 'warnings'} = State) ->
-  dialyzer_coordinator:wait_activation(),
+  dialyzer_coordinator:request_activation(State#state.coordinator),
   ?debug("Warning: ~s\n",[State#state.job]),
   Result = collect_warnings(State),
   report_to_coordinator(Result, State);
@@ -169,22 +171,3 @@ continue_compilation(Label, Data) ->
 
 collect_warnings(#state{job = Job, init_data = InitData}) ->
   dialyzer_succ_typings:collect_warnings(Job, InitData).
-
-%%------------------------------------------------------------------------------
-
--type extra() :: label() | 'unused'.
-
--spec sequential(mode(), [mfa_or_funlbl()], init_data(), extra()) -> result().
-
-sequential('compile', Job, InitData, Extra) ->
-  case dialyzer_analysis_callgraph:start_compilation(Job, InitData) of
-    {ok, EstimatedSize, Data} ->
-      {EstimatedSize, continue_compilation(Extra, Data)};
-    {error, _Reason} = Error -> {0, Error}
-  end;
-sequential('typesig', Job, InitData, _Extra) ->
-  dialyzer_succ_typings:find_succ_types_for_scc(Job, InitData);
-sequential('dataflow', Job, InitData, _Extra) ->
-  dialyzer_succ_typings:refine_one_module(Job, InitData);
-sequential('warnings', Job, InitData, _Extra) ->
-  dialyzer_succ_typings:collect_warnings(Job, InitData).
diff --git a/lib/dialyzer/test/behaviour_SUITE_data/results/callbacks_and_specs b/lib/dialyzer/test/behaviour_SUITE_data/results/callbacks_and_specs
index 33d135048e..38999e8919 100644
--- a/lib/dialyzer/test/behaviour_SUITE_data/results/callbacks_and_specs
+++ b/lib/dialyzer/test/behaviour_SUITE_data/results/callbacks_and_specs
@@ -1,5 +1,5 @@
 
-my_callbacks_wrong.erl:26: The return type #state{parent::'undefined' | pid(),status::'closed' | 'init' | 'open',subscribe::[{pid(),integer()}],counter::integer()} in the specification of callback_init/1 is not a subtype of {'ok',_}, which is the expected return type for the callback of my_behaviour behaviour
-my_callbacks_wrong.erl:28: The inferred return type of callback_init/1 (#state{parent::'undefined' | pid(),status::'init',subscribe::[],counter::1}) has nothing in common with {'ok',_}, which is the expected return type for the callback of my_behaviour behaviour
-my_callbacks_wrong.erl:30: The return type {'reply',#state{parent::'undefined' | pid(),status::'closed' | 'init' | 'open',subscribe::[{pid(),integer()}],counter::integer()}} in the specification of callback_cast/3 is not a subtype of {'noreply',_}, which is the expected return type for the callback of my_behaviour behaviour
+my_callbacks_wrong.erl:26: The return type #state{parent::pid(),status::'closed' | 'init' | 'open',subscribe::[{pid(),integer()}],counter::integer()} in the specification of callback_init/1 is not a subtype of {'ok',_}, which is the expected return type for the callback of my_behaviour behaviour
+my_callbacks_wrong.erl:28: The inferred return type of callback_init/1 (#state{parent::pid(),status::'init',subscribe::[],counter::1}) has nothing in common with {'ok',_}, which is the expected return type for the callback of my_behaviour behaviour
+my_callbacks_wrong.erl:30: The return type {'reply',#state{parent::pid(),status::'closed' | 'init' | 'open',subscribe::[{pid(),integer()}],counter::integer()}} in the specification of callback_cast/3 is not a subtype of {'noreply',_}, which is the expected return type for the callback of my_behaviour behaviour
 my_callbacks_wrong.erl:39: The specified type for the 2nd argument of callback_call/3 (atom()) is not a supertype of pid(), which is expected type for this argument in the callback of the my_behaviour behaviour
diff --git a/lib/dialyzer/test/behaviour_SUITE_data/results/supervisor_incorrect_return b/lib/dialyzer/test/behaviour_SUITE_data/results/supervisor_incorrect_return
index 4103a2d8b4..89eb295604 100644
--- a/lib/dialyzer/test/behaviour_SUITE_data/results/supervisor_incorrect_return
+++ b/lib/dialyzer/test/behaviour_SUITE_data/results/supervisor_incorrect_return
@@ -1,2 +1,2 @@
 
-supervisor_incorrect_return.erl:14: The inferred return type of init/1 ({'ok',{{'one_against_one',0,1},[{_,_,_,_,_,_},...]}}) has nothing in common with 'ignore' | {'ok',{{'one_for_all',non_neg_integer(),pos_integer()} | {'one_for_one',non_neg_integer(),pos_integer()} | {'rest_for_one',non_neg_integer(),pos_integer()} | {'simple_one_for_one',non_neg_integer(),pos_integer()} | #{},[{_,{atom() | tuple(),atom(),'undefined' | [any()]},'permanent' | 'temporary' | 'transient','brutal_kill' | 'infinity' | non_neg_integer(),'supervisor' | 'worker','dynamic' | [atom() | tuple()]} | #{}]}}, which is the expected return type for the callback of supervisor behaviour
+supervisor_incorrect_return.erl:14: The inferred return type of init/1 ({'ok',{{'one_against_one',0,1},[{_,_,_,_,_,_},...]}}) has nothing in common with 'ignore' | {'ok',{{'one_for_all',non_neg_integer(),pos_integer()} | {'one_for_one',non_neg_integer(),pos_integer()} | {'rest_for_one',non_neg_integer(),pos_integer()} | {'simple_one_for_one',non_neg_integer(),pos_integer()} | #{},[{_,{atom(),atom(),'undefined' | [any()]},'permanent' | 'temporary' | 'transient','brutal_kill' | 'infinity' | non_neg_integer(),'supervisor' | 'worker','dynamic' | [atom()]} | #{}]}}, which is the expected return type for the callback of supervisor behaviour
diff --git a/lib/dialyzer/test/dialyzer_SUITE.erl b/lib/dialyzer/test/dialyzer_SUITE.erl
index 80f4508ec6..8a2324a7c2 100644
--- a/lib/dialyzer/test/dialyzer_SUITE.erl
+++ b/lib/dialyzer/test/dialyzer_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(dialyzer_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/crash b/lib/dialyzer/test/opaque_SUITE_data/results/crash
index 69bdc00257..d63389f79c 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/crash
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/crash
@@ -1,6 +1,6 @@
 
-crash_1.erl:45: Record construction #targetlist{list::[]} violates the declared type of field list::'undefined' | crash_1:target()
-crash_1.erl:48: The call crash_1:get_using_branch2(Branch::maybe_improper_list(),L::'undefined' | crash_1:target()) will never return since it differs in the 2nd argument from the success typing arguments: (any(),maybe_improper_list())
-crash_1.erl:50: The pattern <_Branch, []> can never match the type <maybe_improper_list(),'undefined' | crash_1:target()>
-crash_1.erl:52: The pattern <Branch, [H = {'target', _, _} | _T]> can never match the type <maybe_improper_list(),'undefined' | crash_1:target()>
-crash_1.erl:54: The pattern <Branch, [{'target', _, _} | T]> can never match the type <maybe_improper_list(),'undefined' | crash_1:target()>
+crash_1.erl:45: Record construction #targetlist{list::[]} violates the declared type of field list::crash_1:target()
+crash_1.erl:48: The call crash_1:get_using_branch2(Branch::maybe_improper_list(),L::crash_1:target()) will never return since it differs in the 2nd argument from the success typing arguments: (any(),maybe_improper_list())
+crash_1.erl:50: The pattern <_Branch, []> can never match the type <maybe_improper_list(),crash_1:target()>
+crash_1.erl:52: The pattern <Branch, [H = {'target', _, _} | _T]> can never match the type <maybe_improper_list(),crash_1:target()>
+crash_1.erl:54: The pattern <Branch, [{'target', _, _} | T]> can never match the type <maybe_improper_list(),crash_1:target()>
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/simple b/lib/dialyzer/test/opaque_SUITE_data/results/simple
index 1a7a139d6e..391c37664e 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/simple
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/simple
@@ -18,7 +18,7 @@ rec_api.erl:104: Matching of pattern {'r2', 10} tagged with a record name violat
 rec_api.erl:113: The attempt to match a term of type #r3{f1::queue:queue(_)} against the pattern {'r3', 'a'} breaks the opaqueness of queue:queue(_)
 rec_api.erl:118: Record construction #r3{f1::10} violates the declared type of field f1::queue:queue(_)
 rec_api.erl:123: The attempt to match a term of type #r3{f1::10} against the pattern {'r3', 10} breaks the opaqueness of queue:queue(_)
-rec_api.erl:24: Record construction #r1{f1::10} violates the declared type of field f1::'undefined' | rec_api:a()
+rec_api.erl:24: Record construction #r1{f1::10} violates the declared type of field f1::rec_api:a()
 rec_api.erl:29: Matching of pattern {'r1', 10} tagged with a record name violates the declared type of #r1{f1::10}
 rec_api.erl:33: The attempt to match a term of type rec_adt:r1() against the pattern {'r1', 'a'} breaks the opaqueness of the term
 rec_api.erl:35: Invalid type specification for function rec_api:adt_t1/1. The success typing is (#r1{f1::'a'}) -> #r1{f1::'a'}
@@ -70,8 +70,8 @@ simple1_api.erl:478: The call 'foo':A(A::simple1_adt:a()) breaks the opaqueness
 simple1_api.erl:486: The call A:'foo'(A::simple1_adt:a()) breaks the opaqueness of the term A :: simple1_adt:a()
 simple1_api.erl:499: The call 'foo':A(A::simple1_api:i()) requires that A is of type atom() not simple1_api:i()
 simple1_api.erl:503: The call 'foo':A(A::simple1_adt:i()) requires that A is of type atom() not simple1_adt:i()
-simple1_api.erl:507: The call A:'foo'(A::simple1_api:i()) requires that A is of type atom() | tuple() not simple1_api:i()
-simple1_api.erl:511: The call A:'foo'(A::simple1_adt:i()) requires that A is of type atom() | tuple() not simple1_adt:i()
+simple1_api.erl:507: The call A:'foo'(A::simple1_api:i()) requires that A is of type atom() not simple1_api:i()
+simple1_api.erl:511: The call A:'foo'(A::simple1_adt:i()) requires that A is of type atom() not simple1_adt:i()
 simple1_api.erl:519: Guard test A::simple1_adt:d2() == B::simple1_adt:d1() contains opaque terms as 1st and 2nd arguments
 simple1_api.erl:534: Guard test A::simple1_adt:d1() >= 3 contains an opaque term as 1st argument
 simple1_api.erl:536: Guard test A::simple1_adt:d1() == 3 contains an opaque term as 1st argument
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/proper/proper_typeserver.erl b/lib/dialyzer/test/opaque_SUITE_data/src/proper/proper_typeserver.erl
index b6cab5e24b..1677b4efb8 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/proper/proper_typeserver.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/proper/proper_typeserver.erl
@@ -781,7 +781,8 @@ add_mod_info({attribute,_Line,record,{RecName,Fields}},
 	true ->
 	    ModInfo;
 	false ->
-	    TypedRecord = {attribute,0,type,{{record,RecName},Fields,[]}},
+            A = erl_anno:new(0),
+	    TypedRecord = {attribute,A,type,{{record,RecName},Fields,[]}},
 	    add_mod_info(TypedRecord, ModInfo)
     end;
 add_mod_info({attribute,_Line,Kind,{Name,TypeForm,VarForms}},
diff --git a/lib/dialyzer/test/plt_SUITE.erl b/lib/dialyzer/test/plt_SUITE.erl
index ecbac14e5d..6ebe23b54b 100644
--- a/lib/dialyzer/test/plt_SUITE.erl
+++ b/lib/dialyzer/test/plt_SUITE.erl
@@ -7,12 +7,14 @@
 -include("dialyzer_test_constants.hrl").
 
 -export([suite/0, all/0, build_plt/1, beam_tests/1, update_plt/1,
-         run_plt_check/1, run_succ_typings/1]).
+         local_fun_same_as_callback/1,
+         remove_plt/1, run_plt_check/1, run_succ_typings/1]).
 
 suite() ->
   [{timetrap, ?plt_timeout}].
 
-all() -> [build_plt, beam_tests, update_plt, run_plt_check, run_succ_typings].
+all() -> [build_plt, beam_tests, update_plt, run_plt_check,
+          remove_plt, run_succ_typings, local_fun_same_as_callback].
 
 build_plt(Config) ->
   OutDir = ?config(priv_dir, Config),
@@ -158,6 +160,95 @@ update_plt(Config) ->
                       {init_plt, Plt}] ++ Opts),
     ok.
 
+%%% If a behaviour module contains an non-exported function with the same name
+%%% as one of the behaviour's callbacks, the callback info was inadvertently
+%%% deleted from the PLT as the dialyzer_plt:delete_list/2 function was cleaning
+%%% up the callback table. This bug was reported by Brujo Benavides.
+
+local_fun_same_as_callback(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    Prog1 =
+      <<"-module(bad_behaviour).
+         -callback bad() -> bad.
+         -export([publicly_bad/0]).
+
+         %% @doc This function is here just to avoid the 'unused' warning for bad/0
+         publicly_bad() -> bad().
+
+         %% @doc This function overlaps with the callback with the same name, and
+         %%      that was an issue for dialyzer since it's a private function.
+         bad() -> bad.">>,
+    {ok, Beam} = compile(Config, Prog1, bad_behaviour, []),
+
+    ErlangBeam = case code:where_is_file("erlang.beam") of
+                     non_existing ->
+                         filename:join([code:root_dir(),
+                                        "erts", "preloaded", "ebin",
+                                        "erlang.beam"]);
+                     EBeam ->
+                         EBeam
+                 end,
+    Plt = filename:join(PrivDir, "plt_bad_behaviour.plt"),
+    Opts = [{check_plt, true}, {from, byte_code}],
+    [] = dialyzer:run([{analysis_type, plt_build},
+                       {files, [Beam, ErlangBeam]},
+                       {output_plt, Plt}] ++ Opts),
+
+    Prog2 =
+        <<"-module(bad_child).
+           -behaviour(bad_behaviour).
+
+           -export([bad/0]).
+
+           %% @doc This function incorreclty implements bad_behaviour.
+           bad() -> not_bad.">>,
+    {ok, TestBeam} = compile(Config, Prog2, bad_child, []),
+
+    [{warn_behaviour, _,
+      {callback_type_mismatch,
+       [bad_behaviour,bad,0,"'not_bad'","'bad'"]}}] =
+        dialyzer:run([{analysis_type, succ_typings},
+                      {files, [TestBeam]},
+                      {init_plt, Plt}] ++ Opts),
+    ok.
+  
+%%% [James Fish:]
+%%% Dialyzer always asserts that files and directories passed in its
+%%% options exist. Therefore it is not possible to remove a beam/module
+%%% from a PLT when the beam file no longer exists. Dialyzer should not to
+%%% check files exist on disk when removing from the PLT.
+remove_plt(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    Prog1 = <<"-module(m1).
+               -export([t/0]).
+               t() ->
+                  m2:a(a).">>,
+    {ok, Beam1} = compile(Config, Prog1, m1, []),
+
+    Prog2 = <<"-module(m2).
+               -export([a/1]).
+               a(A) when is_integer(A) -> A.">>,
+    {ok, Beam2} = compile(Config, Prog2, m2, []),
+
+    Plt = filename:join(PrivDir, "remove.plt"),
+    Opts = [{check_plt, true}, {from, byte_code}],
+
+    [{warn_return_no_exit, _, {no_return,[only_normal,t,0]}},
+     {warn_failing_call, _, {call, [m2,a,"('a')",_,_,_,_,_]}}] =
+        dialyzer:run([{analysis_type, plt_build},
+                      {files, [Beam1, Beam2]},
+                      {get_warnings, true},
+                      {output_plt, Plt}] ++ Opts),
+
+    [] = dialyzer:run([{init_plt, Plt},
+                       {files, [Beam2]},
+                       {analysis_type, plt_remove}]),
+
+    [] =  dialyzer:run([{analysis_type, succ_typings},
+                        {files, [Beam1]},
+                        {init_plt, Plt}] ++ Opts),
+    ok.
+
 compile(Config, Prog, Module, CompileOpts) ->
     Source = lists:concat([Module, ".erl"]),
     PrivDir = ?config(priv_dir,Config),
diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/mnesia b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
index b73943422a..bf67447ee7 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/mnesia
@@ -6,7 +6,7 @@ mnesia_bup.erl:111: The created fun has no local return
 mnesia_bup.erl:574: Function fallback_receiver/2 has no local return
 mnesia_bup.erl:967: Function uninstall_fallback_master/2 has no local return
 mnesia_checkpoint.erl:1014: The variable Error can never match since previous clauses completely covered the type {'ok',#checkpoint_args{nodes::[any()],retainers::[any(),...]}}
-mnesia_checkpoint.erl:894: The call sys:handle_system_msg(Msg::any(),From::any(),'no_parent','mnesia_checkpoint',[],Cp::#checkpoint_args{}) breaks the contract (Msg,From,Parent,Module,Debug,Misc) -> no_return() when is_subtype(Msg,term()), is_subtype(From,{pid(),Tag::_}), is_subtype(Parent,pid()), is_subtype(Module,module()), is_subtype(Debug,[dbg_opt()]), is_subtype(Misc,term())
+mnesia_checkpoint.erl:894: The call sys:handle_system_msg(Msg::any(),From::any(),'no_parent','mnesia_checkpoint',[],Cp::#checkpoint_args{}) breaks the contract (Msg,From,Parent,Module,Debug,Misc) -> no_return() when Msg :: term(), From :: {pid(),Tag::_}, Parent :: pid(), Module :: module(), Debug :: [dbg_opt()], Misc :: term()
 mnesia_controller.erl:1666: The variable Tab can never match since previous clauses completely covered the type [any()]
 mnesia_controller.erl:1679: The pattern {'stop', Reason, Reply, State2} can never match the type {'noreply',_} | {'reply',_,_} | {'stop','shutdown',#state{}}
 mnesia_controller.erl:1685: The pattern {'noreply', State2, _Timeout} can never match the type {'reply',_,_}
@@ -35,6 +35,6 @@ mnesia_schema.erl:1258: Guard test FromS::'disc_copies' | 'disc_only_copies' | '
 mnesia_schema.erl:1639: The pattern {'false', 'mandatory'} can never match the type {'false','optional'}
 mnesia_schema.erl:2434: The variable Reason can never match since previous clauses completely covered the type {'error',_} | {'ok',_}
 mnesia_schema.erl:451: Guard test UseDirAnyway::'false' == 'true' can never succeed
-mnesia_text.erl:180: The variable T can never match since previous clauses completely covered the type {'error',{integer(),atom() | tuple(),_}} | {'ok',_}
+mnesia_text.erl:180: The variable T can never match since previous clauses completely covered the type {'error',{non_neg_integer(),atom(),_}} | {'ok',_}
 mnesia_tm.erl:1522: Function commit_participant/5 has no local return
 mnesia_tm.erl:2169: Function system_terminate/4 has no local return
diff --git a/lib/dialyzer/test/small_SUITE_data/results/app_call b/lib/dialyzer/test/small_SUITE_data/results/app_call
index cc1a63f944..1af649815a 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/app_call
+++ b/lib/dialyzer/test/small_SUITE_data/results/app_call
@@ -1,3 +1,3 @@
 
-app_call.erl:6: The call M:'foo'() requires that M is of type atom() | tuple() not 42
+app_call.erl:6: The call M:'foo'() requires that M is of type atom() not 42
 app_call.erl:9: The call 'mod':F() requires that F is of type atom() not {'gazonk',[]}
diff --git a/lib/dialyzer/test/small_SUITE_data/results/bif1 b/lib/dialyzer/test/small_SUITE_data/results/bif1
new file mode 100644
index 0000000000..289b6f821f
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/bif1
@@ -0,0 +1,3 @@
+
+bif1.erl:13: Function string_chars/0 has no local return
+bif1.erl:16: The call string:chars(S::65,10,L2::bif1_adt:s()) contains an opaque term as 3rd argument when terms of different types are expected in these positions
diff --git a/lib/dialyzer/test/small_SUITE_data/results/comparisons b/lib/dialyzer/test/small_SUITE_data/results/comparisons
index 642585d25e..5083d2695a 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/comparisons
+++ b/lib/dialyzer/test/small_SUITE_data/results/comparisons
@@ -1,50 +1,43 @@
 
 comparisons.erl:100: The pattern 'true' can never match the type 'false'
-comparisons.erl:101: The pattern 'true' can never match the type 'false'
+comparisons.erl:101: The pattern 'false' can never match the type 'true'
 comparisons.erl:102: The pattern 'false' can never match the type 'true'
-comparisons.erl:103: The pattern 'false' can never match the type 'true'
+comparisons.erl:103: The pattern 'true' can never match the type 'false'
 comparisons.erl:104: The pattern 'true' can never match the type 'false'
-comparisons.erl:105: The pattern 'true' can never match the type 'false'
-comparisons.erl:107: The pattern 'true' can never match the type 'false'
-comparisons.erl:108: The pattern 'true' can never match the type 'false'
-comparisons.erl:109: The pattern 'false' can never match the type 'true'
-comparisons.erl:110: The pattern 'false' can never match the type 'true'
-comparisons.erl:111: The pattern 'true' can never match the type 'false'
-comparisons.erl:112: The pattern 'true' can never match the type 'false'
-comparisons.erl:113: The pattern 'false' can never match the type 'true'
-comparisons.erl:114: The pattern 'false' can never match the type 'true'
-comparisons.erl:115: The pattern 'true' can never match the type 'false'
-comparisons.erl:116: The pattern 'true' can never match the type 'false'
-comparisons.erl:117: The pattern 'false' can never match the type 'true'
 comparisons.erl:118: The pattern 'false' can never match the type 'true'
+comparisons.erl:119: The pattern 'false' can never match the type 'true'
+comparisons.erl:120: The pattern 'true' can never match the type 'false'
+comparisons.erl:121: The pattern 'true' can never match the type 'false'
+comparisons.erl:122: The pattern 'false' can never match the type 'true'
 comparisons.erl:123: The pattern 'false' can never match the type 'true'
-comparisons.erl:124: The pattern 'false' can never match the type 'true'
+comparisons.erl:124: The pattern 'true' can never match the type 'false'
 comparisons.erl:125: The pattern 'true' can never match the type 'false'
-comparisons.erl:126: The pattern 'true' can never match the type 'false'
+comparisons.erl:126: The pattern 'false' can never match the type 'true'
 comparisons.erl:127: The pattern 'false' can never match the type 'true'
-comparisons.erl:128: The pattern 'false' can never match the type 'true'
+comparisons.erl:128: The pattern 'true' can never match the type 'false'
 comparisons.erl:129: The pattern 'true' can never match the type 'false'
-comparisons.erl:130: The pattern 'true' can never match the type 'false'
+comparisons.erl:130: The pattern 'false' can never match the type 'true'
+comparisons.erl:131: The pattern 'false' can never match the type 'true'
 comparisons.erl:132: The pattern 'true' can never match the type 'false'
 comparisons.erl:133: The pattern 'true' can never match the type 'false'
 comparisons.erl:134: The pattern 'false' can never match the type 'true'
 comparisons.erl:135: The pattern 'false' can never match the type 'true'
 comparisons.erl:136: The pattern 'true' can never match the type 'false'
 comparisons.erl:137: The pattern 'true' can never match the type 'false'
-comparisons.erl:138: The pattern 'false' can never match the type 'true'
-comparisons.erl:139: The pattern 'false' can never match the type 'true'
+comparisons.erl:139: The pattern 'true' can never match the type 'false'
 comparisons.erl:140: The pattern 'true' can never match the type 'false'
-comparisons.erl:141: The pattern 'true' can never match the type 'false'
+comparisons.erl:141: The pattern 'false' can never match the type 'true'
 comparisons.erl:142: The pattern 'false' can never match the type 'true'
-comparisons.erl:143: The pattern 'false' can never match the type 'true'
+comparisons.erl:143: The pattern 'true' can never match the type 'false'
 comparisons.erl:144: The pattern 'true' can never match the type 'false'
-comparisons.erl:145: The pattern 'true' can never match the type 'false'
+comparisons.erl:145: The pattern 'false' can never match the type 'true'
 comparisons.erl:146: The pattern 'false' can never match the type 'true'
-comparisons.erl:147: The pattern 'false' can never match the type 'true'
-comparisons.erl:152: The pattern 'false' can never match the type 'true'
-comparisons.erl:153: The pattern 'false' can never match the type 'true'
-comparisons.erl:154: The pattern 'true' can never match the type 'false'
-comparisons.erl:155: The pattern 'true' can never match the type 'false'
+comparisons.erl:147: The pattern 'true' can never match the type 'false'
+comparisons.erl:148: The pattern 'true' can never match the type 'false'
+comparisons.erl:149: The pattern 'false' can never match the type 'true'
+comparisons.erl:150: The pattern 'false' can never match the type 'true'
+comparisons.erl:155: The pattern 'false' can never match the type 'true'
+comparisons.erl:156: The pattern 'false' can never match the type 'true'
 comparisons.erl:157: The pattern 'true' can never match the type 'false'
 comparisons.erl:158: The pattern 'true' can never match the type 'false'
 comparisons.erl:159: The pattern 'false' can never match the type 'true'
@@ -59,36 +52,62 @@ comparisons.erl:167: The pattern 'false' can never match the type 'true'
 comparisons.erl:168: The pattern 'false' can never match the type 'true'
 comparisons.erl:169: The pattern 'true' can never match the type 'false'
 comparisons.erl:170: The pattern 'true' can never match the type 'false'
-comparisons.erl:171: The pattern 'false' can never match the type 'true'
-comparisons.erl:172: The pattern 'false' can never match the type 'true'
+comparisons.erl:172: The pattern 'true' can never match the type 'false'
 comparisons.erl:173: The pattern 'true' can never match the type 'false'
-comparisons.erl:174: The pattern 'true' can never match the type 'false'
+comparisons.erl:174: The pattern 'false' can never match the type 'true'
 comparisons.erl:175: The pattern 'false' can never match the type 'true'
-comparisons.erl:176: The pattern 'false' can never match the type 'true'
+comparisons.erl:176: The pattern 'true' can never match the type 'false'
+comparisons.erl:177: The pattern 'true' can never match the type 'false'
+comparisons.erl:178: The pattern 'false' can never match the type 'true'
+comparisons.erl:179: The pattern 'false' can never match the type 'true'
+comparisons.erl:180: The pattern 'true' can never match the type 'false'
+comparisons.erl:181: The pattern 'true' can never match the type 'false'
+comparisons.erl:182: The pattern 'false' can never match the type 'true'
+comparisons.erl:183: The pattern 'false' can never match the type 'true'
+comparisons.erl:184: The pattern 'true' can never match the type 'false'
+comparisons.erl:185: The pattern 'true' can never match the type 'false'
 comparisons.erl:186: The pattern 'false' can never match the type 'true'
 comparisons.erl:187: The pattern 'false' can never match the type 'true'
-comparisons.erl:188: The pattern 'true' can never match the type 'false'
-comparisons.erl:189: The pattern 'true' can never match the type 'false'
-comparisons.erl:190: The pattern 'false' can never match the type 'true'
-comparisons.erl:191: The pattern 'false' can never match the type 'true'
-comparisons.erl:192: The pattern 'true' can never match the type 'false'
-comparisons.erl:193: The pattern 'true' can never match the type 'false'
-comparisons.erl:203: The pattern 'false' can never match the type 'true'
-comparisons.erl:204: The pattern 'false' can never match the type 'true'
+comparisons.erl:192: The pattern 'false' can never match the type 'true'
+comparisons.erl:193: The pattern 'false' can never match the type 'true'
+comparisons.erl:194: The pattern 'true' can never match the type 'false'
+comparisons.erl:195: The pattern 'true' can never match the type 'false'
+comparisons.erl:196: The pattern 'false' can never match the type 'true'
+comparisons.erl:197: The pattern 'false' can never match the type 'true'
+comparisons.erl:198: The pattern 'true' can never match the type 'false'
+comparisons.erl:199: The pattern 'true' can never match the type 'false'
+comparisons.erl:200: The pattern 'false' can never match the type 'true'
+comparisons.erl:201: The pattern 'false' can never match the type 'true'
+comparisons.erl:202: The pattern 'true' can never match the type 'false'
+comparisons.erl:203: The pattern 'true' can never match the type 'false'
 comparisons.erl:205: The pattern 'true' can never match the type 'false'
 comparisons.erl:206: The pattern 'true' can never match the type 'false'
-comparisons.erl:208: The pattern 'true' can never match the type 'false'
+comparisons.erl:207: The pattern 'false' can never match the type 'true'
+comparisons.erl:208: The pattern 'false' can never match the type 'true'
 comparisons.erl:209: The pattern 'true' can never match the type 'false'
-comparisons.erl:210: The pattern 'false' can never match the type 'true'
+comparisons.erl:210: The pattern 'true' can never match the type 'false'
 comparisons.erl:211: The pattern 'false' can never match the type 'true'
+comparisons.erl:212: The pattern 'false' can never match the type 'true'
+comparisons.erl:213: The pattern 'true' can never match the type 'false'
+comparisons.erl:214: The pattern 'true' can never match the type 'false'
+comparisons.erl:215: The pattern 'false' can never match the type 'true'
+comparisons.erl:216: The pattern 'false' can never match the type 'true'
+comparisons.erl:217: The pattern 'true' can never match the type 'false'
+comparisons.erl:218: The pattern 'true' can never match the type 'false'
+comparisons.erl:219: The pattern 'false' can never match the type 'true'
+comparisons.erl:220: The pattern 'false' can never match the type 'true'
 comparisons.erl:221: The pattern 'true' can never match the type 'false'
 comparisons.erl:222: The pattern 'true' can never match the type 'false'
 comparisons.erl:223: The pattern 'false' can never match the type 'true'
 comparisons.erl:224: The pattern 'false' can never match the type 'true'
-comparisons.erl:225: The pattern 'true' can never match the type 'false'
-comparisons.erl:226: The pattern 'true' can never match the type 'false'
-comparisons.erl:227: The pattern 'false' can never match the type 'true'
-comparisons.erl:228: The pattern 'false' can never match the type 'true'
+comparisons.erl:229: The pattern 'true' can never match the type 'false'
+comparisons.erl:230: The pattern 'true' can never match the type 'false'
+comparisons.erl:231: The pattern 'false' can never match the type 'true'
+comparisons.erl:232: The pattern 'false' can never match the type 'true'
+comparisons.erl:233: The pattern 'false' can never match the type 'true'
+comparisons.erl:234: The pattern 'false' can never match the type 'true'
+comparisons.erl:235: The pattern 'true' can never match the type 'false'
+comparisons.erl:236: The pattern 'true' can never match the type 'false'
 comparisons.erl:242: The pattern 'false' can never match the type 'true'
 comparisons.erl:243: The pattern 'false' can never match the type 'true'
 comparisons.erl:244: The pattern 'true' can never match the type 'false'
@@ -97,57 +116,86 @@ comparisons.erl:246: The pattern 'false' can never match the type 'true'
 comparisons.erl:247: The pattern 'false' can never match the type 'true'
 comparisons.erl:248: The pattern 'true' can never match the type 'false'
 comparisons.erl:249: The pattern 'true' can never match the type 'false'
-comparisons.erl:251: The pattern 'true' can never match the type 'false'
-comparisons.erl:252: The pattern 'true' can never match the type 'false'
-comparisons.erl:253: The pattern 'false' can never match the type 'true'
-comparisons.erl:254: The pattern 'false' can never match the type 'true'
-comparisons.erl:263: The pattern 'false' can never match the type 'true'
-comparisons.erl:264: The pattern 'false' can never match the type 'true'
+comparisons.erl:259: The pattern 'false' can never match the type 'true'
+comparisons.erl:260: The pattern 'false' can never match the type 'true'
+comparisons.erl:261: The pattern 'true' can never match the type 'false'
+comparisons.erl:262: The pattern 'true' can never match the type 'false'
+comparisons.erl:264: The pattern 'true' can never match the type 'false'
 comparisons.erl:265: The pattern 'true' can never match the type 'false'
-comparisons.erl:266: The pattern 'true' can never match the type 'false'
-comparisons.erl:268: The pattern 'true' can never match the type 'false'
-comparisons.erl:269: The pattern 'true' can never match the type 'false'
-comparisons.erl:270: The pattern 'false' can never match the type 'true'
-comparisons.erl:271: The pattern 'false' can never match the type 'true'
-comparisons.erl:272: The pattern 'true' can never match the type 'false'
-comparisons.erl:273: The pattern 'true' can never match the type 'false'
-comparisons.erl:274: The pattern 'false' can never match the type 'true'
-comparisons.erl:275: The pattern 'false' can never match the type 'true'
-comparisons.erl:293: The pattern 'false' can never match the type 'true'
-comparisons.erl:294: The pattern 'false' can never match the type 'true'
-comparisons.erl:295: The pattern 'true' can never match the type 'false'
-comparisons.erl:296: The pattern 'true' can never match the type 'false'
-comparisons.erl:311: The pattern 'true' can never match the type 'false'
-comparisons.erl:312: The pattern 'true' can never match the type 'false'
-comparisons.erl:313: The pattern 'false' can never match the type 'true'
-comparisons.erl:314: The pattern 'false' can never match the type 'true'
-comparisons.erl:44: The pattern 'false' can never match the type 'true'
-comparisons.erl:45: The pattern 'false' can never match the type 'true'
-comparisons.erl:46: The pattern 'true' can never match the type 'false'
-comparisons.erl:47: The pattern 'true' can never match the type 'false'
-comparisons.erl:48: The pattern 'false' can never match the type 'true'
-comparisons.erl:49: The pattern 'false' can never match the type 'true'
-comparisons.erl:50: The pattern 'true' can never match the type 'false'
-comparisons.erl:51: The pattern 'true' can never match the type 'false'
+comparisons.erl:266: The pattern 'false' can never match the type 'true'
+comparisons.erl:267: The pattern 'false' can never match the type 'true'
+comparisons.erl:277: The pattern 'true' can never match the type 'false'
+comparisons.erl:278: The pattern 'true' can never match the type 'false'
+comparisons.erl:279: The pattern 'false' can never match the type 'true'
+comparisons.erl:280: The pattern 'false' can never match the type 'true'
+comparisons.erl:281: The pattern 'true' can never match the type 'false'
+comparisons.erl:282: The pattern 'true' can never match the type 'false'
+comparisons.erl:283: The pattern 'false' can never match the type 'true'
+comparisons.erl:284: The pattern 'false' can never match the type 'true'
+comparisons.erl:298: The pattern 'false' can never match the type 'true'
+comparisons.erl:299: The pattern 'false' can never match the type 'true'
+comparisons.erl:300: The pattern 'true' can never match the type 'false'
+comparisons.erl:301: The pattern 'true' can never match the type 'false'
+comparisons.erl:302: The pattern 'false' can never match the type 'true'
+comparisons.erl:303: The pattern 'false' can never match the type 'true'
+comparisons.erl:304: The pattern 'true' can never match the type 'false'
+comparisons.erl:305: The pattern 'true' can never match the type 'false'
+comparisons.erl:307: The pattern 'true' can never match the type 'false'
+comparisons.erl:308: The pattern 'true' can never match the type 'false'
+comparisons.erl:309: The pattern 'false' can never match the type 'true'
+comparisons.erl:310: The pattern 'false' can never match the type 'true'
+comparisons.erl:319: The pattern 'false' can never match the type 'true'
+comparisons.erl:320: The pattern 'false' can never match the type 'true'
+comparisons.erl:321: The pattern 'true' can never match the type 'false'
+comparisons.erl:322: The pattern 'true' can never match the type 'false'
+comparisons.erl:324: The pattern 'true' can never match the type 'false'
+comparisons.erl:325: The pattern 'true' can never match the type 'false'
+comparisons.erl:326: The pattern 'false' can never match the type 'true'
+comparisons.erl:327: The pattern 'false' can never match the type 'true'
+comparisons.erl:328: The pattern 'true' can never match the type 'false'
+comparisons.erl:329: The pattern 'true' can never match the type 'false'
+comparisons.erl:330: The pattern 'false' can never match the type 'true'
+comparisons.erl:331: The pattern 'false' can never match the type 'true'
+comparisons.erl:349: The pattern 'false' can never match the type 'true'
+comparisons.erl:350: The pattern 'false' can never match the type 'true'
+comparisons.erl:351: The pattern 'true' can never match the type 'false'
+comparisons.erl:352: The pattern 'true' can never match the type 'false'
+comparisons.erl:367: The pattern 'true' can never match the type 'false'
+comparisons.erl:368: The pattern 'true' can never match the type 'false'
+comparisons.erl:369: The pattern 'false' can never match the type 'true'
+comparisons.erl:370: The pattern 'false' can never match the type 'true'
 comparisons.erl:52: The pattern 'false' can never match the type 'true'
 comparisons.erl:53: The pattern 'false' can never match the type 'true'
 comparisons.erl:54: The pattern 'true' can never match the type 'false'
 comparisons.erl:55: The pattern 'true' can never match the type 'false'
+comparisons.erl:56: The pattern 'false' can never match the type 'true'
+comparisons.erl:57: The pattern 'false' can never match the type 'true'
+comparisons.erl:58: The pattern 'true' can never match the type 'false'
+comparisons.erl:59: The pattern 'true' can never match the type 'false'
+comparisons.erl:60: The pattern 'false' can never match the type 'true'
+comparisons.erl:61: The pattern 'false' can never match the type 'true'
+comparisons.erl:62: The pattern 'true' can never match the type 'false'
+comparisons.erl:63: The pattern 'true' can never match the type 'false'
+comparisons.erl:64: The pattern 'false' can never match the type 'true'
+comparisons.erl:65: The pattern 'false' can never match the type 'true'
+comparisons.erl:66: The pattern 'true' can never match the type 'false'
+comparisons.erl:67: The pattern 'true' can never match the type 'false'
+comparisons.erl:68: The pattern 'false' can never match the type 'true'
 comparisons.erl:69: The pattern 'false' can never match the type 'true'
-comparisons.erl:70: The pattern 'false' can never match the type 'true'
+comparisons.erl:70: The pattern 'true' can never match the type 'false'
 comparisons.erl:71: The pattern 'true' can never match the type 'false'
-comparisons.erl:72: The pattern 'true' can never match the type 'false'
-comparisons.erl:73: The pattern 'false' can never match the type 'true'
-comparisons.erl:74: The pattern 'false' can never match the type 'true'
-comparisons.erl:75: The pattern 'true' can never match the type 'false'
-comparisons.erl:76: The pattern 'true' can never match the type 'false'
-comparisons.erl:77: The pattern 'false' can never match the type 'true'
-comparisons.erl:78: The pattern 'false' can never match the type 'true'
-comparisons.erl:79: The pattern 'true' can never match the type 'false'
-comparisons.erl:80: The pattern 'true' can never match the type 'false'
+comparisons.erl:85: The pattern 'false' can never match the type 'true'
+comparisons.erl:86: The pattern 'false' can never match the type 'true'
+comparisons.erl:87: The pattern 'true' can never match the type 'false'
+comparisons.erl:88: The pattern 'true' can never match the type 'false'
+comparisons.erl:89: The pattern 'false' can never match the type 'true'
+comparisons.erl:90: The pattern 'false' can never match the type 'true'
+comparisons.erl:91: The pattern 'true' can never match the type 'false'
+comparisons.erl:92: The pattern 'true' can never match the type 'false'
+comparisons.erl:93: The pattern 'false' can never match the type 'true'
 comparisons.erl:94: The pattern 'false' can never match the type 'true'
-comparisons.erl:95: The pattern 'false' can never match the type 'true'
+comparisons.erl:95: The pattern 'true' can never match the type 'false'
 comparisons.erl:96: The pattern 'true' can never match the type 'false'
-comparisons.erl:97: The pattern 'true' can never match the type 'false'
+comparisons.erl:97: The pattern 'false' can never match the type 'true'
 comparisons.erl:98: The pattern 'false' can never match the type 'true'
-comparisons.erl:99: The pattern 'false' can never match the type 'true'
+comparisons.erl:99: The pattern 'true' can never match the type 'false'
diff --git a/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes b/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes
index a9fbfb6068..d2a3ebb766 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes
+++ b/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes
@@ -1,15 +1,15 @@
 
-contracts_with_subtypes.erl:106: The call contracts_with_subtypes:rec_arg({'a','b'}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,{'a',A} | {'b',B}), is_subtype(A,'a' | {'b',B}), is_subtype(B,'b' | {'a',A})
-contracts_with_subtypes.erl:107: The call contracts_with_subtypes:rec_arg({'b','a'}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,{'a',A} | {'b',B}), is_subtype(A,'a' | {'b',B}), is_subtype(B,'b' | {'a',A})
-contracts_with_subtypes.erl:109: The call contracts_with_subtypes:rec_arg({'b',{'a','b'}}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,{'a',A} | {'b',B}), is_subtype(A,'a' | {'b',B}), is_subtype(B,'b' | {'a',A})
-contracts_with_subtypes.erl:135: The call contracts_with_subtypes:rec2({'a','b'}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,ab())
-contracts_with_subtypes.erl:136: The call contracts_with_subtypes:rec2({'b','a'}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,ab())
-contracts_with_subtypes.erl:137: The call contracts_with_subtypes:rec2({'a',{'b','a'}}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,ab())
-contracts_with_subtypes.erl:138: The call contracts_with_subtypes:rec2({'b',{'a','b'}}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,ab())
-contracts_with_subtypes.erl:139: The call contracts_with_subtypes:rec2({'a',{'b',{'a','b'}}}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,ab())
-contracts_with_subtypes.erl:140: The call contracts_with_subtypes:rec2({'b',{'a',{'b','a'}}}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,ab())
-contracts_with_subtypes.erl:141: The call contracts_with_subtypes:rec2({'a',{'b',{'a',{'b','a'}}}}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,ab())
-contracts_with_subtypes.erl:142: The call contracts_with_subtypes:rec2({'b',{'a',{'b',{'a','b'}}}}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,ab())
+contracts_with_subtypes.erl:106: The call contracts_with_subtypes:rec_arg({'a','b'}) breaks the contract (Arg) -> 'ok' when Arg :: {'a',A} | {'b',B}, A :: 'a' | {'b',B}, B :: 'b' | {'a',A}
+contracts_with_subtypes.erl:107: The call contracts_with_subtypes:rec_arg({'b','a'}) breaks the contract (Arg) -> 'ok' when Arg :: {'a',A} | {'b',B}, A :: 'a' | {'b',B}, B :: 'b' | {'a',A}
+contracts_with_subtypes.erl:109: The call contracts_with_subtypes:rec_arg({'b',{'a','b'}}) breaks the contract (Arg) -> 'ok' when Arg :: {'a',A} | {'b',B}, A :: 'a' | {'b',B}, B :: 'b' | {'a',A}
+contracts_with_subtypes.erl:135: The call contracts_with_subtypes:rec2({'a','b'}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:136: The call contracts_with_subtypes:rec2({'b','a'}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:137: The call contracts_with_subtypes:rec2({'a',{'b','a'}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:138: The call contracts_with_subtypes:rec2({'b',{'a','b'}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:139: The call contracts_with_subtypes:rec2({'a',{'b',{'a','b'}}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:140: The call contracts_with_subtypes:rec2({'b',{'a',{'b','a'}}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:141: The call contracts_with_subtypes:rec2({'a',{'b',{'a',{'b','a'}}}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:142: The call contracts_with_subtypes:rec2({'b',{'a',{'b',{'a','b'}}}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
 contracts_with_subtypes.erl:175: The pattern 1 can never match the type string()
 contracts_with_subtypes.erl:178: The pattern 'alpha' can never match the type {'ok',_} | {'ok',_,string()}
 contracts_with_subtypes.erl:180: The pattern 42 can never match the type {'ok',_} | {'ok',_,string()}
@@ -24,13 +24,13 @@ contracts_with_subtypes.erl:23: Invalid type specification for function contract
 contracts_with_subtypes.erl:240: The pattern {'ok', 42} can never match the type {'ok',_,string()}
 contracts_with_subtypes.erl:241: The pattern 42 can never match the type {'ok',_,string()}
 contracts_with_subtypes.erl:267: Function flat_ets_new_t/0 has no local return
-contracts_with_subtypes.erl:268: The call contracts_with_subtypes:flat_ets_new(12,[]) breaks the contract (Name,Options) -> atom() when is_subtype(Name,atom()), is_subtype(Options,[Option]), is_subtype(Option,'set' | 'ordered_set' | 'bag' | 'duplicate_bag' | 'public' | 'protected' | 'private' | 'named_table' | {'keypos',integer()} | {'heir',pid(),term()} | {'heir','none'} | {'write_concurrency',boolean()} | {'read_concurrency',boolean()} | 'compressed')
+contracts_with_subtypes.erl:268: The call contracts_with_subtypes:flat_ets_new(12,[]) breaks the contract (Name,Options) -> atom() when Name :: atom(), Options :: [Option], Option :: 'set' | 'ordered_set' | 'bag' | 'duplicate_bag' | 'public' | 'protected' | 'private' | 'named_table' | {'keypos',integer()} | {'heir',pid(),term()} | {'heir','none'} | {'write_concurrency',boolean()} | {'read_concurrency',boolean()} | 'compressed'
 contracts_with_subtypes.erl:294: Function factored_ets_new_t/0 has no local return
-contracts_with_subtypes.erl:295: The call contracts_with_subtypes:factored_ets_new(12,[]) breaks the contract (Name,Options) -> atom() when is_subtype(Name,atom()), is_subtype(Options,[Option]), is_subtype(Option,Type | Access | 'named_table' | {'keypos',Pos} | {'heir',Pid::pid(),HeirData} | {'heir','none'} | Tweaks), is_subtype(Type,type()), is_subtype(Access,access()), is_subtype(Tweaks,{'write_concurrency',boolean()} | {'read_concurrency',boolean()} | 'compressed'), is_subtype(Pos,pos_integer()), is_subtype(HeirData,term())
-contracts_with_subtypes.erl:77: The call contracts_with_subtypes:foo1(5) breaks the contract (Arg1) -> Res when is_subtype(Arg1,atom()), is_subtype(Res,atom())
-contracts_with_subtypes.erl:78: The call contracts_with_subtypes:foo2(5) breaks the contract (Arg1) -> Res when is_subtype(Arg1,Arg2), is_subtype(Arg2,atom()), is_subtype(Res,atom())
-contracts_with_subtypes.erl:79: The call contracts_with_subtypes:foo3(5) breaks the contract (Arg1) -> Res when is_subtype(Arg2,atom()), is_subtype(Arg1,Arg2), is_subtype(Res,atom())
+contracts_with_subtypes.erl:295: The call contracts_with_subtypes:factored_ets_new(12,[]) breaks the contract (Name,Options) -> atom() when Name :: atom(), Options :: [Option], Option :: Type | Access | 'named_table' | {'keypos',Pos} | {'heir',Pid::pid(),HeirData} | {'heir','none'} | Tweaks, Type :: type(), Access :: access(), Tweaks :: {'write_concurrency',boolean()} | {'read_concurrency',boolean()} | 'compressed', Pos :: pos_integer(), HeirData :: term()
+contracts_with_subtypes.erl:77: The call contracts_with_subtypes:foo1(5) breaks the contract (Arg1) -> Res when Arg1 :: atom(), Res :: atom()
+contracts_with_subtypes.erl:78: The call contracts_with_subtypes:foo2(5) breaks the contract (Arg1) -> Res when Arg1 :: Arg2, Arg2 :: atom(), Res :: atom()
+contracts_with_subtypes.erl:79: The call contracts_with_subtypes:foo3(5) breaks the contract (Arg1) -> Res when Arg2 :: atom(), Arg1 :: Arg2, Res :: atom()
 contracts_with_subtypes.erl:7: Invalid type specification for function contracts_with_subtypes:extract/0. The success typing is () -> 'something'
-contracts_with_subtypes.erl:80: The call contracts_with_subtypes:foo4(5) breaks the contract (Type) -> Type when is_subtype(Type,atom())
+contracts_with_subtypes.erl:80: The call contracts_with_subtypes:foo4(5) breaks the contract (Type) -> Type when Type :: atom()
 contracts_with_subtypes.erl:81: The call contracts_with_subtypes:foo5(5) breaks the contract (Type::atom()) -> Type::atom()
-contracts_with_subtypes.erl:82: The call contracts_with_subtypes:foo6(5) breaks the contract (Type) -> Type when is_subtype(Type,atom())
+contracts_with_subtypes.erl:82: The call contracts_with_subtypes:foo6(5) breaks the contract (Type) -> Type when Type :: atom()
diff --git a/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes2 b/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes2
index 9f5433a13d..1a8aeb13d0 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes2
+++ b/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes2
@@ -1,3 +1,3 @@
 
 contracts_with_subtypes2.erl:18: Function t/0 has no local return
-contracts_with_subtypes2.erl:19: The call contracts_with_subtypes2:t({'a',{'b',{'c',{'d',{'e',{'g',3}}}}}}) breaks the contract (Arg) -> 'ok' when is_subtype(Arg,{'a',A}), is_subtype(A,{'b',B}), is_subtype(B,{'c',C}), is_subtype(C,{'d',D}), is_subtype(D,{'e',E}), is_subtype(E,{'f',_})
+contracts_with_subtypes2.erl:19: The call contracts_with_subtypes2:t({'a',{'b',{'c',{'d',{'e',{'g',3}}}}}}) breaks the contract (Arg) -> 'ok' when Arg :: {'a',A}, A :: {'b',B}, B :: {'c',C}, C :: {'d',D}, D :: {'e',E}, E :: {'f',_}
diff --git a/lib/dialyzer/test/small_SUITE_data/results/literals b/lib/dialyzer/test/small_SUITE_data/results/literals
index 03e161ca71..222d2c0cdb 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/literals
+++ b/lib/dialyzer/test/small_SUITE_data/results/literals
@@ -1,14 +1,14 @@
 
 literals.erl:11: Function t1/0 has no local return
-literals.erl:12: Record construction #r{id::'a'} violates the declared type of field id::'integer' | 'undefined'
+literals.erl:12: Record construction #r{id::'a'} violates the declared type of field id::'integer'
 literals.erl:14: Function t2/0 has no local return
-literals.erl:15: Record construction #r{id::'a'} violates the declared type of field id::'integer' | 'undefined'
+literals.erl:15: Record construction #r{id::'a'} violates the declared type of field id::'integer'
 literals.erl:17: Function t3/0 has no local return
-literals.erl:18: Record construction #r{id::'a'} violates the declared type of field id::'integer' | 'undefined'
-literals.erl:21: Record construction #r{id::'a'} violates the declared type of field id::'integer' | 'undefined'
+literals.erl:18: Record construction #r{id::'a'} violates the declared type of field id::'integer'
+literals.erl:21: Record construction #r{id::'a'} violates the declared type of field id::'integer'
 literals.erl:23: Function m1/1 has no local return
-literals.erl:23: Matching of pattern {'r', 'a'} tagged with a record name violates the declared type of #r{id::'integer' | 'undefined'}
+literals.erl:23: Matching of pattern {'r', 'a'} tagged with a record name violates the declared type of #r{id::'integer'}
 literals.erl:26: Function m2/1 has no local return
-literals.erl:26: Matching of pattern {'r', 'a'} tagged with a record name violates the declared type of #r{id::'integer' | 'undefined'}
+literals.erl:26: Matching of pattern {'r', 'a'} tagged with a record name violates the declared type of #r{id::'integer'}
 literals.erl:29: Function m3/1 has no local return
 literals.erl:29: The pattern {{'r', 'a'}} can never match the type any()
diff --git a/lib/dialyzer/test/small_SUITE_data/results/maps1 b/lib/dialyzer/test/small_SUITE_data/results/maps1
index 5a78d66a92..e88c91f21f 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/maps1
+++ b/lib/dialyzer/test/small_SUITE_data/results/maps1
@@ -1,4 +1,4 @@
 
 maps1.erl:43: Function t3/0 has no local return
 maps1.erl:44: The call maps1:foo(~{'greger'=>3, ~{'arne'=>'anka'}~=>45}~,1) will never return since it differs in the 2nd argument from the success typing arguments: (#{},'b')
-maps1.erl:52: The call Mod:'function'(~{'literal'=>'map'}~,'another_arg') requires that Mod is of type atom() | tuple() not #{}
+maps1.erl:52: The call Mod:'function'(~{'literal'=>'map'}~,'another_arg') requires that Mod is of type atom() not #{}
diff --git a/lib/dialyzer/test/small_SUITE_data/results/pretty_bitstring b/lib/dialyzer/test/small_SUITE_data/results/pretty_bitstring
index 0ad6eee766..e148e5cf22 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/pretty_bitstring
+++ b/lib/dialyzer/test/small_SUITE_data/results/pretty_bitstring
@@ -1,3 +1,3 @@
 
 pretty_bitstring.erl:7: Function t/0 has no local return
-pretty_bitstring.erl:8: The call binary:copy(#{#<1>(8, 1, 'integer', ['unsigned', 'big']), #<2>(8, 1, 'integer', ['unsigned', 'big']), #<3>(3, 1, 'integer', ['unsigned', 'big'])}#,2) breaks the contract (Subject,N) -> binary() when is_subtype(Subject,binary()), is_subtype(N,non_neg_integer())
+pretty_bitstring.erl:8: The call binary:copy(#{#<1>(8, 1, 'integer', ['unsigned', 'big']), #<2>(8, 1, 'integer', ['unsigned', 'big']), #<3>(3, 1, 'integer', ['unsigned', 'big'])}#,2) breaks the contract (Subject,N) -> binary() when Subject :: binary(), N :: non_neg_integer()
diff --git a/lib/dialyzer/test/small_SUITE_data/results/record_creation_diffs b/lib/dialyzer/test/small_SUITE_data/results/record_creation_diffs
index f00c4b10ff..c971935bbf 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/record_creation_diffs
+++ b/lib/dialyzer/test/small_SUITE_data/results/record_creation_diffs
@@ -1,3 +1,3 @@
 
 record_creation_diffs.erl:10: Function foo/1 has no local return
-record_creation_diffs.erl:11: Record construction #bar{some_list::{'this','is','a','tuple'}} violates the declared type of field some_list::'undefined' | [any()]
+record_creation_diffs.erl:11: Record construction #bar{some_list::{'this','is','a','tuple'}} violates the declared type of field some_list::[any()]
diff --git a/lib/dialyzer/test/small_SUITE_data/results/record_pat b/lib/dialyzer/test/small_SUITE_data/results/record_pat
index a46be6c451..8317ea041a 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/record_pat
+++ b/lib/dialyzer/test/small_SUITE_data/results/record_pat
@@ -1,2 +1,2 @@
 
-record_pat.erl:14: Matching of pattern {'foo', 'baz'} tagged with a record name violates the declared type of #foo{bar::'undefined' | integer()}
+record_pat.erl:14: Matching of pattern {'foo', 'baz'} tagged with a record name violates the declared type of #foo{bar::integer()}
diff --git a/lib/dialyzer/test/small_SUITE_data/results/relevant_record_warning b/lib/dialyzer/test/small_SUITE_data/results/relevant_record_warning
index 2e417e1b2a..ea3ac92d96 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/relevant_record_warning
+++ b/lib/dialyzer/test/small_SUITE_data/results/relevant_record_warning
@@ -1,3 +1,3 @@
 
 relevant_record_warning.erl:22: Function test/1 has no local return
-relevant_record_warning.erl:23: Record construction #r{field::<<_:8>>} violates the declared type of field field::'binary' | 'undefined'
+relevant_record_warning.erl:23: Record construction #r{field::<<_:8>>} violates the declared type of field field::'binary'
diff --git a/lib/dialyzer/test/small_SUITE_data/results/undefined b/lib/dialyzer/test/small_SUITE_data/results/undefined
new file mode 100644
index 0000000000..9daa8640d3
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/undefined
@@ -0,0 +1,2 @@
+
+r.erl:16: Record construction #r{a::{'fi'},b::{'a','b'},c::[],d::'undefined',e::[],f::'undefined'} violates the declared type of field b::[any()] and d::[any()] and f::[any()]
diff --git a/lib/dialyzer/test/small_SUITE_data/src/bif1/bif1.erl b/lib/dialyzer/test/small_SUITE_data/src/bif1/bif1.erl
new file mode 100644
index 0000000000..bc746538d3
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/bif1/bif1.erl
@@ -0,0 +1,16 @@
+-module(bif1).
+
+%% Other set of warnings due to removed of functions from
+%% erl_bif_types.
+
+-export([ets_rename/0, string_chars/0]).
+
+ets_rename() ->
+    A = ets:new(fipp, []),
+    true = not is_atom(A),
+    ets:rename(A, fopp). % No warning
+
+string_chars() ->
+    L2 = bif1_adt:opaque_string(),
+    S = $A,
+    string:chars(S, 10, L2). % Warning
diff --git a/lib/dialyzer/test/small_SUITE_data/src/bif1/bif1_adt.erl b/lib/dialyzer/test/small_SUITE_data/src/bif1/bif1_adt.erl
new file mode 100644
index 0000000000..01b0bccc68
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/bif1/bif1_adt.erl
@@ -0,0 +1,12 @@
+-module(bif1_adt).
+
+-export([opaque_string/0]).
+
+-export_type([s/0]).
+
+-opaque s() :: string().
+
+-spec opaque_string() -> s().
+
+opaque_string() ->
+    "string".
diff --git a/lib/dialyzer/test/small_SUITE_data/src/big_external_type.erl b/lib/dialyzer/test/small_SUITE_data/src/big_external_type.erl
index ab84e94106..9ad4810a5e 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/big_external_type.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/big_external_type.erl
@@ -36,7 +36,7 @@
 
 %% Start of Abstract Format
 
--type line() :: erl_scan:line().
+-type line() :: erl_anno:line().
 
 -export_type([af_record_index/0, af_record_field/1, af_record_name/0,
               af_field_name/0, af_function_decl/0]).
@@ -332,8 +332,8 @@
 %% End of Abstract Format
 
 -type error_description() :: term().
--type error_info() :: {erl_scan:line(), module(), error_description()}.
--type token() :: {Tag :: atom(), Line :: erl_scan:line()}.
+-type error_info() :: {erl_anno:line(), module(), error_description()}.
+-type token() :: {Tag :: atom(), Line :: erl_scan:anno()}.
 
 %% mkop(Op, Arg) -> {op,Line,Op,Arg}.
 %% mkop(Left, Op, Right) -> {op,Line,Op,Left,Right}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/big_local_type.erl b/lib/dialyzer/test/small_SUITE_data/src/big_local_type.erl
index fc7c5241a8..fe567ff10d 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/big_local_type.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/big_local_type.erl
@@ -36,7 +36,7 @@
 
 %% Start of Abstract Format
 
--type line() :: erl_scan:line().
+-type line() :: erl_anno:line().
 
 -export_type([af_module/0, af_export/0, af_import/0, af_fa_list/0,
               af_compile/0, af_file/0, af_record_decl/0,
@@ -329,8 +329,8 @@
 %% End of Abstract Format
 
 -type error_description() :: term().
--type error_info() :: {erl_scan:line(), module(), error_description()}.
--type token() :: {Tag :: atom(), Line :: erl_scan:line()}.
+-type error_info() :: {erl_anno:line(), module(), error_description()}.
+-type token() :: {Tag :: atom(), Line :: erl_anno:line()}.
 
 %% mkop(Op, Arg) -> {op,Line,Op,Arg}.
 %% mkop(Left, Op, Right) -> {op,Line,Op,Left,Right}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl b/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl
index 70e3cb6af4..64927c6c91 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/comparisons.erl
@@ -19,12 +19,20 @@ tuple(X) when is_tuple(X) -> X.
 list() -> list(?r).
 list(X) when is_list(X) -> X.
 
+map() -> map(?r).
+map(X) when is_map(X) -> #{}.
+
+bitstring() -> bitstring(?r).
+bitstring(X) when is_bitstring(X) -> <<0:63>>.
+
 i() -> integer().
 f() -> mfloat().
 n() -> case ?r of 1 -> i(); 2 -> f() end.
 a() -> atom().
 t() -> tuple().
 l() -> list().
+m() -> map().
+b() -> bitstring().
 na() -> case ?r of 1 -> n(); 2 -> a() end.
 at() -> case ?r of 1 -> t(); 2 -> a() end.
 tl() -> case ?r of 1 -> t(); 2 -> l() end.
@@ -53,6 +61,14 @@ test_i_ll_l() -> case i()  < l() of true -> always; false -> never end.
 test_i_le_l() -> case i() =< l() of true -> always; false -> never end.
 test_i_gg_l() -> case i()  > l() of true -> never; false -> always end.
 test_i_ge_l() -> case i() >= l() of true -> never; false -> always end.
+test_i_ll_m() -> case i()  < m() of true -> always; false -> never end.
+test_i_le_m() -> case i() =< m() of true -> always; false -> never end.
+test_i_gg_m() -> case i()  > m() of true -> never; false -> always end.
+test_i_ge_m() -> case i() >= m() of true -> never; false -> always end.
+test_i_ll_b() -> case i()  < b() of true -> always; false -> never end.
+test_i_le_b() -> case i() =< b() of true -> always; false -> never end.
+test_i_gg_b() -> case i()  > b() of true -> never; false -> always end.
+test_i_ge_b() -> case i() >= b() of true -> never; false -> always end.
 
 test_f_ll_i() -> case f()  < i() of true -> maybe; false -> maybe_too end.
 test_f_le_i() -> case f() =< i() of true -> maybe; false -> maybe_too end.
@@ -78,6 +94,14 @@ test_f_ll_l() -> case f()  < l() of true -> always; false -> never end.
 test_f_le_l() -> case f() =< l() of true -> always; false -> never end.
 test_f_gg_l() -> case f()  > l() of true -> never; false -> always end.
 test_f_ge_l() -> case f() >= l() of true -> never; false -> always end.
+test_f_ll_m() -> case f()  < m() of true -> always; false -> never end.
+test_f_le_m() -> case f() =< m() of true -> always; false -> never end.
+test_f_gg_m() -> case f()  > m() of true -> never; false -> always end.
+test_f_ge_m() -> case f() >= m() of true -> never; false -> always end.
+test_f_ll_b() -> case f()  < b() of true -> always; false -> never end.
+test_f_le_b() -> case f() =< b() of true -> always; false -> never end.
+test_f_gg_b() -> case f()  > b() of true -> never; false -> always end.
+test_f_ge_b() -> case f() >= b() of true -> never; false -> always end.
 
 test_n_ll_i() -> case n()  < i() of true -> maybe; false -> maybe_too end.
 test_n_le_i() -> case n() =< i() of true -> maybe; false -> maybe_too end.
@@ -103,6 +127,14 @@ test_n_ll_l() -> case n()  < l() of true -> always; false -> never end.
 test_n_le_l() -> case n() =< l() of true -> always; false -> never end.
 test_n_gg_l() -> case n()  > l() of true -> never; false -> always end.
 test_n_ge_l() -> case n() >= l() of true -> never; false -> always end.
+test_n_ll_m() -> case n()  < m() of true -> always; false -> never end.
+test_n_le_m() -> case n() =< m() of true -> always; false -> never end.
+test_n_gg_m() -> case n()  > m() of true -> never; false -> always end.
+test_n_ge_m() -> case n() >= m() of true -> never; false -> always end.
+test_n_ll_b() -> case n()  < b() of true -> always; false -> never end.
+test_n_le_b() -> case n() =< b() of true -> always; false -> never end.
+test_n_gg_b() -> case n()  > b() of true -> never; false -> always end.
+test_n_ge_b() -> case n() >= b() of true -> never; false -> always end.
 
 test_a_ll_i() -> case a()  < i() of true -> never; false -> always end.
 test_a_le_i() -> case a() =< i() of true -> never; false -> always end.
@@ -128,6 +160,14 @@ test_a_ll_l() -> case a()  < l() of true -> always; false -> never end.
 test_a_le_l() -> case a() =< l() of true -> always; false -> never end.
 test_a_gg_l() -> case a()  > l() of true -> never; false -> always end.
 test_a_ge_l() -> case a() >= l() of true -> never; false -> always end.
+test_a_ll_m() -> case a()  < m() of true -> always; false -> never end.
+test_a_le_m() -> case a() =< m() of true -> always; false -> never end.
+test_a_gg_m() -> case a()  > m() of true -> never; false -> always end.
+test_a_ge_m() -> case a() >= m() of true -> never; false -> always end.
+test_a_ll_b() -> case a()  < b() of true -> always; false -> never end.
+test_a_le_b() -> case a() =< b() of true -> always; false -> never end.
+test_a_gg_b() -> case a()  > b() of true -> never; false -> always end.
+test_a_ge_b() -> case a() >= b() of true -> never; false -> always end.
 
 test_t_ll_i() -> case t()  < i() of true -> never; false -> always end.
 test_t_le_i() -> case t() =< i() of true -> never; false -> always end.
@@ -153,6 +193,14 @@ test_t_ll_l() -> case t()  < l() of true -> always; false -> never end.
 test_t_le_l() -> case t() =< l() of true -> always; false -> never end.
 test_t_gg_l() -> case t()  > l() of true -> never; false -> always end.
 test_t_ge_l() -> case t() >= l() of true -> never; false -> always end.
+test_t_ll_m() -> case t()  < m() of true -> always; false -> never end.
+test_t_le_m() -> case t() =< m() of true -> always; false -> never end.
+test_t_gg_m() -> case t()  > m() of true -> never; false -> always end.
+test_t_ge_m() -> case t() >= m() of true -> never; false -> always end.
+test_t_ll_b() -> case t()  < b() of true -> always; false -> never end.
+test_t_le_b() -> case t() =< b() of true -> always; false -> never end.
+test_t_gg_b() -> case t()  > b() of true -> never; false -> always end.
+test_t_ge_b() -> case t() >= b() of true -> never; false -> always end.
 
 test_l_ll_i() -> case l()  < i() of true -> never; false -> always end.
 test_l_le_i() -> case l() =< i() of true -> never; false -> always end.
@@ -178,6 +226,14 @@ test_l_ll_l() -> case l()  < l() of true -> maybe; false -> maybe_too end.
 test_l_le_l() -> case l() =< l() of true -> maybe; false -> maybe_too end.
 test_l_gg_l() -> case l()  > l() of true -> maybe; false -> maybe_too end.
 test_l_ge_l() -> case l() >= l() of true -> maybe; false -> maybe_too end.
+test_l_ll_m() -> case l()  < m() of true -> never; false -> always end.
+test_l_le_m() -> case l() =< m() of true -> never; false -> always end.
+test_l_gg_m() -> case l()  > m() of true -> always; false -> never end.
+test_l_ge_m() -> case l() >= m() of true -> always; false -> never end.
+test_l_ll_b() -> case l()  < b() of true -> always; false -> never end.
+test_l_le_b() -> case l() =< b() of true -> always; false -> never end.
+test_l_gg_b() -> case l()  > b() of true -> never; false -> always end.
+test_l_ge_b() -> case l() >= b() of true -> never; false -> always end.
 
 test_n_ll_na() -> case n()  < na() of true -> maybe; false -> maybe_too end.
 test_n_le_na() -> case n() =< na() of true -> maybe; false -> maybe_too end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/trec.erl b/lib/dialyzer/test/small_SUITE_data/src/trec.erl
index 06706162c1..516358f7c6 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/trec.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/trec.erl
@@ -8,7 +8,7 @@
 -module(trec).
 -export([test/0, mk_foo_exp/2]).
 
--record(foo, {a :: integer(), b :: [atom()]}).
+-record(foo, {a :: integer() | 'undefined', b :: [atom()]}).
 
 %%
 %% For these functions we currently get the following warnings:
diff --git a/lib/dialyzer/test/small_SUITE_data/undefined.erl b/lib/dialyzer/test/small_SUITE_data/undefined.erl
new file mode 100644
index 0000000000..8549f2e161
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/undefined.erl
@@ -0,0 +1,29 @@
+-module(undefined).
+
+-export([t/0]).
+
+%% As of OTP 19.0 'undefined' is no longer added to fields with a type
+%% declaration but without an initializer. The pretty printing of
+%% records (erl_types:t_to_string()) is updated to reflect this: if a
+%% field is of type 'undefined', it is output if 'undefined' is not in
+%% the declared type of the field. (It used to be the case that the
+%% singleton type 'undefined' was never output.)
+%%
+%% One consequence is shown by the example below: the warning about
+%% the record construction violating the the declared type shows
+%% #r{..., d::'undefined', ...} which is meant to be of help to the
+%% user, who could otherwise get confused the first time (s)he gets
+%% confronted by the warning.
+
+-record(r,
+        {
+          a = {fi},
+          b = {a,b} :: list(),                  % violation
+          c = {a,b} :: list(),
+          d :: list(),                          % violation
+          e = [] :: list(),
+          f = undefined :: list()               % violation
+        }).
+
+t() ->
+    #r{c = []}.
diff --git a/lib/dialyzer/test/user_SUITE_data/results/wsp_pdu b/lib/dialyzer/test/user_SUITE_data/results/wsp_pdu
index d1f8f4caf2..626e677524 100644
--- a/lib/dialyzer/test/user_SUITE_data/results/wsp_pdu
+++ b/lib/dialyzer/test/user_SUITE_data/results/wsp_pdu
@@ -6,7 +6,7 @@ wsp_pdu.erl:2403: The call wsp_pdu:d_date(Data1::binary()) will never return sin
 wsp_pdu.erl:2406: Guard test is_integer(Sec::{[byte()] | byte() | {'long',binary()} | {'short',binary()},binary()}) can never succeed
 wsp_pdu.erl:2408: The pattern {'short', Data2} can never match the type {[byte()] | byte() | {'long',binary()} | {'short',binary()},binary()}
 wsp_pdu.erl:2755: Function parse_push_flag/1 has no local return
-wsp_pdu.erl:2756: The call erlang:integer_to_list(Value::[any()]) breaks the contract (Integer) -> string() when is_subtype(Integer,integer())
+wsp_pdu.erl:2756: The call erlang:integer_to_list(Value::[any()]) breaks the contract (Integer) -> string() when Integer :: integer()
 wsp_pdu.erl:2875: The call wsp_pdu:d_text_string(Data::byte()) will never return since it differs in the 1st argument from the success typing arguments: (binary())
 wsp_pdu.erl:2976: The call wsp_pdu:d_q_value(QData::byte()) will never return since it differs in the 1st argument from the success typing arguments: (<<_:8,_:_*8>>)
 wsp_pdu.erl:3336: The call wsp_pdu:encode_typed_field(Ver::any(),'Q-value',ParamValue::any()) will never return since it differs in the 2nd argument from the success typing arguments: (any(),'Constrained-encoding' | 'Date-value' | 'No-value' | 'Short-integer' | 'Text-string' | 'Text-value' | 'Well-known-charset',any())
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index 9480f17f51..44982ab46d 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 2.8.2
+DIALYZER_VSN = 2.9
diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index 61b7fd1337..5cb29c80e3 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -467,7 +467,7 @@ Matches only those peers whose Origin-Host has the
 specified value, or all peers if the atom <c>any</c>.</p>
 </item>
 
-<tag><c>{realm, any|&dict_DiameterIdentity;</c></tag>
+<tag><c>{realm, any|&dict_DiameterIdentity;}</c></tag>
 <item>
 <p>
 Matches only those peers whose Origin-Realm has the
@@ -500,18 +500,22 @@ Matches only those peers matched by each filter in the specified list.</p>
 <item>
 <p>
 Matches only those peers matched by at least one filter in the
-specified list.</p>
+specified list.
+The resulting list will be in match order, peers matching the
+first filter of the list sorting before those matched by the second,
+and so on.</p>
+</item>
 
+<tag><c>{first, [&peer_filter;]}</c></tag>
+<item>
 <p>
-The resulting peer list will be in match order, peers matching the
-first filter of the list sorting before those matched by the second,
-and so on.
-For example, the following filter causes peers matching both the host
-and realm filters to be presented before those matching only the realm
-filter.</p>
+Like <c>any</c>, but stops at the first filter for which there are
+matches, which can be much more efficient when there are many peers.
+For example, the following filter causes only peers best matching
+both the host and realm filters to be presented.</p>
 
 <pre>
-{any, [{all, [host, realm]}, realm]}
+{first, [{all, [host, realm]}, realm]}
 </pre>
 </item>
 
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index 828ade4a71..5052515d6a 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -43,6 +43,38 @@ first.</p>
 
 <!-- ===================================================================== -->
 
+<section><title>diameter 1.11.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Make peer handling more efficient.</p>
+          <p>
+	    Inefficient lookup and manipulation of peer lists could
+	    result in poor performance when many outgoing requests
+	    were sent simultaneously, or when many peers connected
+	    simultaneously. Filtering peer lists on realm/host is now
+	    also more efficient in many cases.</p>
+          <p>
+	    Own Id: OTP-13164</p>
+        </item>
+        <item>
+          <p>
+	    Fix handling of shared peer connections in watchdog state
+	    SUSPECT.</p>
+          <p>
+	    A peer connection shared from a remote node was regarded
+	    as being up for the lifetime of the connection, ignoring
+	    watchdog transitions into state SUSPECT.</p>
+          <p>
+	    Own Id: OTP-13342</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>diameter 1.11.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index 2b23183d18..fb874013a3 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -117,7 +117,7 @@
          parent       :: pid(),     %% watchdog process
          transport    :: pid(),     %% transport process
          dictionary   :: module(),  %% common dictionary
-         service      :: #diameter_service{},
+         service      :: #diameter_service{} | undefined,
          dpr = false  :: false
                        | true  %% DPR received, DPA sent
                        | {boolean(), uint32(), uint32()},
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index d49176ec3e..efa4cc9108 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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.
@@ -83,16 +83,8 @@
 -define(DEFAULT_TC,     30000).  %% RFC 3588 ch 2.1
 -define(RESTART_TC,      1000).  %% if restart was this recent
 
-%% Used to be able to swap this with anything else dict-like but now
-%% rely on the fact that a service's #state{} record does not change
-%% in storing in it ?STATE table and not always going through the
-%% service process. In particular, rely on the fact that operations on
-%% a ?Dict don't change the handle to it.
--define(Dict, diameter_dict).
-
-%% Maintains state in a table. In contrast to previously, a service's
-%% stat is not constant and is accessed outside of the service
-%% process.
+%% Maintain state in a table since a service's state is accessed
+%% outside of the service process.
 -define(STATE_TABLE, ?MODULE).
 
 %% The default sequence mask.
@@ -117,12 +109,11 @@
          service :: #diameter_service{},
          watchdogT = ets_new(watchdogs) %% #watchdog{} at start
                   :: ets:tid(),
-         peerT = ets_new(peers)         %% #peer{pid = TPid} at okay/reopen
-              :: ets:tid(),
-         shared_peers = ?Dict:new()          %% Alias -> [{TPid, Caps}, ...]
-                     :: ets:tid(),
-         local_peers  = ?Dict:new()          %% Alias -> [{TPid, Caps}, ...]
-                     :: ets:tid(),
+         peerT,         %% undefined in new code, but remain for upgrade
+         shared_peers,  %% reasons. Replaced by local/remote.
+         local_peers,   %%
+         local  :: {ets:tid(), ets:tid(), ets:tid()},
+         remote :: {ets:tid(), ets:tid(), ets:tid()},
          monitor = false :: false | pid(),   %% process to die with
          options
          :: [{sequence, diameter:sequence()}  %% sequence mask
@@ -137,7 +128,7 @@
 %% Record representing an RFC 3539 watchdog process implemented by
 %% diameter_watchdog.
 -record(watchdog,
-        {pid  :: match(pid()),
+        {pid  :: match(pid()) | undefined,
          type :: match(connect | accept),
          ref  :: match(reference()),  %% key into diameter_config
          options :: match([diameter:transport_opt()]),%% from start_transport
@@ -146,14 +137,16 @@
          peer = false :: match(boolean() | pid())}).
                       %% true at accepted, pid() at okay/reopen
 
-%% Record representing an Peer State Machine processes implemented by
+%% Record representing a Peer State Machine processes implemented by
 %% diameter_peer_fsm.
 -record(peer,
-        {pid   :: pid(),
-         apps  :: [{0..16#FFFFFFFF, diameter:app_alias()}], %% {Id, Alias}
-         caps  :: #diameter_caps{},
-         started = diameter_lib:now(),  %% at process start
-         watchdog :: pid()}). %% key into watchdogT
+        {pid  :: pid(),
+         apps :: match([{0..16#FFFFFFFF, diameter:app_alias()}] %% {Id, Alias}
+                       | [diameter:app_alias()]),               %% remote
+         caps :: match(#diameter_caps{}),
+         started = diameter_lib:now(),     %% at process start or sharing
+         watchdog :: match(pid()           %% key into watchdogT
+                           | undefined)}). %% undefined if remote
 
 %% ---------------------------------------------------------------------------
 %% # start/1
@@ -181,7 +174,7 @@ stop(SvcName) ->
     end.
 
 stop(ok, Pid) ->
-    MRef = erlang:monitor(process, Pid),
+    MRef = monitor(process, Pid),
     receive {'DOWN', MRef, process, _, _} -> ok end;
 stop(No, _) ->
     No.
@@ -495,6 +488,9 @@ transition({service, Pid}, S) ->
 transition({peer, TPid, Aliases, Caps}, S) ->
     remote_peer_up(TPid, Aliases, Caps, S),
     ok;
+transition({peer, TPid}, S) ->
+    remote_peer_down(TPid, S),
+    ok;
 
 %% Remote peer process has died.
 transition({'DOWN', _, process, TPid, _}, S) ->
@@ -514,7 +510,7 @@ transition(Req, S) ->
 %% # terminate/2
 %% ---------------------------------------------------------------------------
 
-terminate(Reason, #state{service_name = Name, peerT = PeerT} = S) ->
+terminate(Reason, #state{service_name = Name, local = {PeerT, _, _}} = S) ->
     send_event(Name, stop),
     ets:delete(?STATE_TABLE, Name),
 
@@ -536,23 +532,80 @@ terminate(Reason, #state{service_name = Name, peerT = PeerT} = S) ->
 %% # code_change/3
 %% ---------------------------------------------------------------------------
 
-code_change(FromVsn,
-            #state{service_name = SvcName,
-                   service = #diameter_service{applications = Apps}}
-            = S,
-            Extra) ->
-    lists:foreach(fun(A) ->
-                          code_change(FromVsn, SvcName, Extra, A)
-                  end,
-                  Apps),
+code_change(_FromVsn, #state{} = S, _Extra) ->
+    {ok, S};
+
+%% Don't support downgrade since we won't in appup.
+code_change({down = T, _}, _, _Extra) ->
+    {error, T};
+
+%% Upgrade local/shared peers dicts populated in old code. Don't
+code_change(_FromVsn, S0, _Extra) ->
+    {state, Id, SvcName, Svc, WT, PeerT, SDict, LDict, Monitor, Opts}
+        = S0,
+
+    init_peers(LT = setelement(1, {PT, _, _} = init_peers(), PeerT),
+               fun({_,A}) -> A end),
+    init_peers(init_peers(RT = init_peers(), SDict),
+               fun(A) -> A end),
+
+    S = #state{id = Id,
+               service_name = SvcName,
+               service = Svc,
+               watchdogT = WT,
+               peerT = PT,  %% empty
+               shared_peers = SDict,
+               local_peers = LDict,
+               local = LT,
+               remote = RT,
+               monitor = Monitor,
+               options = Opts},
+
+    %% Replacing the table entry and deleting the old shared tables
+    %% can make outgoing requests return {error, no_connection} until
+    %% everyone is running new code. Don't delete the tables to avoid
+    %% crashing request processes.
+    ets:delete_all_objects(SDict),
+    ets:delete_all_objects(LDict),
+    ets:insert(?STATE_TABLE, S),
     {ok, S}.
 
-code_change(FromVsn, SvcName, Extra, #diameter_app{alias = Alias} = A) ->
-    {ok, S} = cb(A, code_change, [FromVsn,
-                                  mod_state(Alias),
-                                  Extra,
-                                  SvcName]),
-    mod_state(Alias, S).
+%% init_peers/2
+
+%% Populate app and identity bags from a new-style #peer{} sets.
+init_peers({PeerT, _, _} = T, F)
+  when is_function(F) ->
+    ets:foldl(fun(#peer{pid = P, apps = As, caps = C}, N) ->
+                      insert_peer(P, lists:map(F, As), C, T),
+                      N+1
+              end,
+              0,
+              PeerT);
+
+%% Populate #peer{} table given a shared peers dict.
+init_peers({PeerT, _, _}, SDict) ->
+    dict:fold(fun(P, As, N) ->
+                      ets:update_element(PeerT, P, {#peer.apps, As}),
+                      N+1
+              end,
+              0,
+              diameter_dict:fold(fun(A, Ps, D) ->
+                                         init_peers(A, Ps, PeerT, D)
+                                 end,
+                                 dict:new(),
+                                 SDict)).
+
+%% init_peers/4
+
+init_peers(App, TCs, PeerT, Dict) ->
+    lists:foldl(fun({P,C}, D) ->
+                        ets:insert(PeerT, #peer{pid = P,
+                                                apps = [],
+                                                caps = C}),
+                        dict:append(P, App, D)
+                end,
+                Dict,
+                TCs).
 
 %% ===========================================================================
 %% ===========================================================================
@@ -560,9 +613,6 @@ code_change(FromVsn, SvcName, Extra, #diameter_app{alias = Alias} = A) ->
 unexpected(F, A, #state{service_name = Name}) ->
     ?UNEXPECTED(F, A ++ [Name]).
 
-cb(#diameter_app{module = [_|_] = M}, F, A) ->
-    eval(M, F, A).
-
 eval([M|X], F, A) ->
     apply(M, F, A ++ X).
 
@@ -582,10 +632,6 @@ choose(false, _, X) -> X.
 ets_new(Tbl) ->
     ets:new(Tbl, [{keypos, 2}]).
 
-insert(Tbl, Rec) ->
-    ets:insert(Tbl, Rec),
-    Rec.
-
 %% Using the process dictionary for the callback state was initially
 %% just a way to make what was horrendous trace (big state record and
 %% much else everywhere) somewhat more readable. There's not as much
@@ -686,6 +732,8 @@ cfg_acc({SvcName, #diameter_service{applications = Apps} = Rec, Opts},
     lists:foreach(fun init_mod/1, Apps),
     S = #state{service_name = SvcName,
                service = Rec#diameter_service{pid = self()},
+               local   = init_peers(),
+               remote  = init_peers(),
                monitor = mref(get_value(monitor, Opts)),
                options = service_options(Opts)},
     {S, Acc};
@@ -695,6 +743,13 @@ cfg_acc({_Ref, Type, _Opts} = T, {S, Acc})
        Type == listen ->
     {S, [T | Acc]}.
 
+init_peers() ->
+    {ets_new(caps),            %% #peer{}
+     ets:new(apps, [bag]),     %% {Alias, TPid}
+     ets:new(idents, [bag])}.  %% {{host, OH} | {realm, OR} | {OR, OH},
+                               %%  Alias,
+                               %%  TPid}
+
 service_options(Opts) ->
     [{sequence, proplists:get_value(sequence, Opts, ?NOMASK)},
      {share_peers, get_value(share_peers, Opts)},
@@ -711,7 +766,7 @@ service_options(Opts) ->
 mref(false = No) ->
     No;
 mref(P) ->
-    erlang:monitor(process, P).
+    monitor(process, P).
 
 init_shared(#state{options = [_, _, {_,T} | _],
                    service_name = Svc}) ->
@@ -810,7 +865,7 @@ start(Ref, Type, Opts, State) ->
 %% start/5
 
 start(Ref, Type, Opts, N, #state{watchdogT = WatchdogT,
-                                 peerT = PeerT,
+                                 local = {PeerT, _, _},
                                  options = SvcOpts,
                                  service_name = SvcName,
                                  service = Svc0})
@@ -841,7 +896,7 @@ binary_caps(#diameter_service{capabilities = Caps} = Svc, false) ->
 
 wd(Type, Ref, T, WatchdogT, Rec) ->
     Pid = start_watchdog(Type, Ref, T),
-    insert(WatchdogT, Rec#watchdog{pid = Pid}),
+    ets:insert(WatchdogT, Rec#watchdog{pid = Pid}),
     Pid.
 
 %% Note that the service record passed into the watchdog is the merged
@@ -898,8 +953,8 @@ accepted(Pid, _TPid, #state{watchdogT = WatchdogT} = S) ->
     #watchdog{ref = Ref, type = accept = T, peer = false, options = Opts}
         = Wd
         = fetch(WatchdogT, Pid),
-    insert(WatchdogT, Wd#watchdog{peer = true}),%% mark replacement as started
-    start(Ref, T, Opts, S).                     %% start new watchdog
+    ets:insert(WatchdogT, Wd#watchdog{peer = true}),%% mark replacement started
+    start(Ref, T, Opts, S).                         %% start new watchdog
 
 fetch(Tid, Key) ->
     [T] = ets:lookup(Tid, Key),
@@ -925,13 +980,14 @@ watchdog(TPid, [], ?WD_SUSPECT, ?WD_OKAY, Wd, State) ->
     #watchdog{peer = TPid} = Wd,  %% assert
     connection_up(Wd, State);
 
-%% Watchdog has an unresponsive connection.
+%% Watchdog has an unresponsive connection. Note that the peer table
+%% entry isn't removed until DOWN.
 watchdog(TPid, [], ?WD_OKAY, ?WD_SUSPECT = To, Wd, State) ->
     #watchdog{peer = TPid} = Wd,  %% assert
     watchdog_down(Wd, To, State);
 
 %% Watchdog has lost its connection.
-watchdog(TPid, [], _, ?WD_DOWN = To, Wd, #state{peerT = PeerT} = S) ->
+watchdog(TPid, [], _, ?WD_DOWN = To, Wd, #state{local = {PeerT, _, _}} = S) ->
     close(Wd),
     watchdog_down(Wd, To, S),
     ets:delete(PeerT, TPid);
@@ -940,7 +996,7 @@ watchdog(_, [], _, _, _, _) ->
     ok.
 
 watchdog_down(Wd, To, #state{watchdogT = WatchdogT} = S) ->
-    insert(WatchdogT, Wd#watchdog{state = To}),
+    ets:insert(WatchdogT, Wd#watchdog{state = To}),
     connection_down(Wd, To, S).
 
 %% ---------------------------------------------------------------------------
@@ -952,14 +1008,14 @@ watchdog_down(Wd, To, #state{watchdogT = WatchdogT} = S) ->
 connection_up({TPid, {Caps, SupportedApps, Pkt}},
               #watchdog{pid = Pid}
               = Wd,
-              #state{peerT = PeerT}
+              #state{local = {PeerT, _, _}}
               = S) ->
-    Pr = #peer{pid = TPid,
-               apps = SupportedApps,
-               caps = Caps,
-               watchdog = Pid},
-    insert(PeerT, Pr),
-    connection_up([Pkt], Wd#watchdog{peer = TPid}, Pr, S).
+    Rec = #peer{pid = TPid,
+                apps = SupportedApps,
+                caps = Caps,
+                watchdog = Pid},
+    ets:insert(PeerT, Rec),
+    connection_up([Pkt], Wd#watchdog{peer = TPid}, Rec, S).
 
 %% ---------------------------------------------------------------------------
 %% # reopen/3
@@ -969,22 +1025,23 @@ reopen({TPid, {Caps, SupportedApps, _Pkt}},
        #watchdog{pid = Pid}
        = Wd,
        #state{watchdogT = WatchdogT,
-              peerT = PeerT}) ->
-    insert(PeerT, #peer{pid = TPid,
-                        apps = SupportedApps,
-                        caps = Caps,
-                        watchdog = Pid}),
-    insert(WatchdogT, Wd#watchdog{state = ?WD_REOPEN,
-                                  peer = TPid}).
+              local = {PeerT, _, _}}) ->
+    ets:insert(PeerT, #peer{pid = TPid,
+                            apps = SupportedApps,
+                            caps = Caps,
+                            watchdog = Pid}),
+    ets:insert(WatchdogT, Wd#watchdog{state = ?WD_REOPEN,
+                                      peer = TPid}).
 
 %% ---------------------------------------------------------------------------
 %% # connection_up/2
 %% ---------------------------------------------------------------------------
 
-%% Watchdog has recovered as suspect connection. Note that there has
+%% Watchdog has recovered a suspect connection. Note that there has
 %% been no new capabilties exchange in this case.
 
-connection_up(#watchdog{peer = TPid} = Wd, #state{peerT = PeerT} = S) ->
+connection_up(#watchdog{peer = TPid} = Wd, #state{local = {PeerT, _, _}}
+                                           = S) ->
     connection_up([], Wd, fetch(PeerT, TPid), S).
 
 %% connection_up/4
@@ -995,23 +1052,23 @@ connection_up(Extra,
               #peer{apps = SApps, caps = Caps}
               = Pr,
               #state{watchdogT = WatchdogT,
-                     local_peers = LDict,
+                     local = LT,
                      service_name = SvcName,
                      service = #diameter_service{applications = Apps}}
               = S) ->
-    insert(WatchdogT, Wd#watchdog{state = ?WD_OKAY}),
+    ets:insert(WatchdogT, Wd#watchdog{state = ?WD_OKAY}),
     diameter_traffic:peer_up(TPid),
-    insert_local_peer(SApps, {{TPid, Caps}, {SvcName, Apps}}, LDict),
+    local_peer_up(SApps, {TPid, Caps}, {SvcName, Apps}, LT),
     report_status(up, Wd, Pr, S, Extra).
 
-insert_local_peer(SApps, T, LDict) ->
-    lists:foldl(fun(A,D) -> ilp(A, T, D) end, LDict, SApps).
+local_peer_up(SApps, {TPid, Caps} = TC, SA, LT) ->
+    insert_peer(TPid, [A || {_,A} <- SApps], Caps, LT),
+    lists:foreach(fun(A) -> peer_up(A, TC, SA) end, SApps).
 
-ilp({Id, Alias}, {TC, SA}, LDict) ->
-    init_conn(Id, Alias, TC, SA),
-    ?Dict:append(Alias, TC, LDict).
+peer_up({Id, Alias}, TC, SA) ->
+    peer_up(Id, Alias, TC, SA).
 
-init_conn(Id, Alias, {TPid, _} = TC, {SvcName, Apps}) ->
+peer_up(Id, Alias, {TPid, _} = TC, {SvcName, Apps}) ->
     #diameter_app{id = Id}  %% assert
         = App
         = find_app(Alias, Apps),
@@ -1109,17 +1166,17 @@ connection_down(#watchdog{state = ?WD_OKAY,
                 = Pr,
                 #state{service_name = SvcName,
                        service = #diameter_service{applications = Apps},
-                       local_peers = LDict}
+                       local = LT}
                 = S) ->
     report_status(down, Wd, Pr, S, []),
-    remove_local_peer(SApps, {{TPid, Caps}, {SvcName, Apps}}, LDict),
+    local_peer_down(SApps, {TPid, Caps}, {SvcName, Apps}, LT),
     diameter_traffic:peer_down(TPid);
 
 connection_down(#watchdog{state = ?WD_OKAY,
                           peer = TPid}
                 = Wd,
                 To,
-                #state{peerT = PeerT}
+                #state{local = {PeerT, _, _}}
                 = S)
   when is_atom(To) ->
     connection_down(Wd, #peer{} = fetch(PeerT, TPid), S);
@@ -1127,15 +1184,14 @@ connection_down(#watchdog{state = ?WD_OKAY,
 connection_down(#watchdog{}, _, _) ->
     ok.
 
-remove_local_peer(SApps, T, LDict) ->
-    lists:foldl(fun(A,D) -> rlp(A, T, D) end, LDict, SApps).
+local_peer_down(SApps, {TPid, _Caps} = TC, SA, LT) ->
+    delete_peer(TPid, LT),
+    lists:foreach(fun(A) -> peer_down(A, TC, SA) end, SApps).
 
-rlp({Id, Alias}, {TC, SA}, LDict) ->
-    L = ?Dict:fetch(Alias, LDict),
-    down_conn(Id, Alias, TC, SA),
-    ?Dict:store(Alias, lists:delete(TC, L), LDict).
+peer_down({Id, Alias}, TC, SA) ->
+    peer_down(Id, Alias, TC, SA).
 
-down_conn(Id, Alias, TC, {SvcName, Apps}) ->
+peer_down(Id, Alias, TC, {SvcName, Apps}) ->
     #diameter_app{id = Id}  %% assert
         = App
         = find_app(Alias, Apps),
@@ -1160,7 +1216,7 @@ wd_down(#watchdog{peer = B}, _)
     ok;
 
 %% ... or maybe it has.
-wd_down(#watchdog{peer = TPid} = Wd, #state{peerT = PeerT} = S) ->
+wd_down(#watchdog{peer = TPid} = Wd, #state{local = {PeerT, _, _}} = S) ->
     connection_down(Wd, ?WD_DOWN, S),
     ets:delete(PeerT, TPid).
 
@@ -1368,19 +1424,37 @@ share_peer(up, Caps, Apps, TPid, #state{options = [_, {_,T} | _],
                                         service_name = Svc}) ->
     notify(T, Svc, {peer, TPid, [A || {_,A} <- Apps], Caps});
 
-share_peer(_, _, _, _, _) ->
-    ok.
+share_peer(down, _Caps, _Apps, TPid, #state{options = [_, {_,T} | _],
+                                            service_name = Svc}) ->
+    notify(T, Svc, {peer, TPid}).
 
 %% ---------------------------------------------------------------------------
 %% # share_peers/2
 %% ---------------------------------------------------------------------------
 
-share_peers(Pid, #state{options = [_, {_,T} | _], local_peers = PDict}) ->
-    is_remote(Pid, T)
-        andalso ?Dict:fold(fun(A,Ps,ok) -> sp(Pid, A, Ps), ok end, ok, PDict).
-
-sp(Pid, Alias, Peers) ->
-    lists:foreach(fun({P,C}) -> Pid ! {peer, P, [Alias], C} end, Peers).
+share_peers(Pid, #state{options = [_, {_,SP} | _],
+                        local = {PeerT, AppT, _}}) ->
+    is_remote(Pid, SP)
+        andalso ets:foldl(fun(T, N) -> N + sp(Pid, AppT, T) end,
+                          0,
+                          PeerT).
+
+%% An entry in the peer table doesn't mean the watchdog state is OKAY,
+%% an entry in the app table does.
+
+sp(Pid, AppT, #peer{pid = TPid,
+                    apps = [{_, Alias} | _] = Apps,
+                    caps = Caps}) ->
+    Spec = [{{'$1', TPid},
+             [{'==', '$1', {const, Alias}}],
+             ['$_']}],
+    case ets:select(AppT, Spec, 1) of
+        '$end_of_table' ->
+            0;
+        _ ->
+            Pid ! {peer, TPid, [A || {_,A} <- Apps], Caps},
+            1
+    end.
 
 is_remote(Pid, T) ->
     Node = node(Pid),
@@ -1390,32 +1464,49 @@ is_remote(Pid, T) ->
 %% # remote_peer_up/4
 %% ---------------------------------------------------------------------------
 
-remote_peer_up(Pid, Aliases, Caps, #state{options = [_, _, {_,T} | _]} = S) ->
-    is_remote(Pid, T)
-        andalso rpu(Pid, Aliases, Caps, S).
+remote_peer_up(TPid, Aliases, Caps, #state{options = [_, _, {_,T} | _]} = S) ->
+    is_remote(TPid, T) andalso rpu(TPid, Aliases, Caps, S).
 
-rpu(Pid, Aliases, Caps, #state{service = Svc, shared_peers = PDict}) ->
+rpu(TPid, Aliases, Caps, #state{service = Svc, remote = RT}) ->
     #diameter_service{applications = Apps} = Svc,
     Key = #diameter_app.alias,
     F = fun(A) -> lists:keymember(A, Key, Apps) end,
-    rpu(Pid, lists:filter(F, Aliases), Caps, PDict);
+    rpu(TPid, lists:filter(F, Aliases), Caps, RT);
 
 rpu(_, [] = No, _, _) ->
     No;
-rpu(Pid, Aliases, Caps, PDict) ->
-    erlang:monitor(process, Pid),
-    T = {Pid, Caps},
-    lists:foreach(fun(A) -> ?Dict:append(A, T, PDict) end, Aliases).
+rpu(TPid, Aliases, Caps, {PeerT, _, _} = RT) ->
+    monitor(process, TPid),
+    ets:insert(PeerT, #peer{pid = TPid,
+                            apps = Aliases,
+                            caps = Caps}),
+    insert_peer(TPid, Aliases, Caps, RT).
+
+%% insert_peer/4
+
+insert_peer(TPid, Aliases, Caps, {_PeerT, AppT, IdentT}) ->
+    #diameter_caps{origin_host = {_, OH},
+                   origin_realm = {_, OR}}
+        = Caps,
+    ets:insert(AppT, [{A, TPid} || A <- Aliases]),
+    H = iolist_to_binary(OH),
+    R = iolist_to_binary(OR),
+    ets:insert(IdentT, [{T, A, TPid} || T <- [{host, H}, {realm, R}, {R, H}],
+                                        A <- Aliases]).
 
 %% ---------------------------------------------------------------------------
 %% # remote_peer_down/2
 %% ---------------------------------------------------------------------------
 
-remote_peer_down(Pid, #state{shared_peers = PDict}) ->
-    lists:foreach(fun(A) -> rpd(Pid, A, PDict) end, ?Dict:fetch_keys(PDict)).
+remote_peer_down(TPid, #state{remote = {PeerT, _, _} = RT}) ->
+    ets:delete(PeerT, TPid),
+    delete_peer(TPid, RT).
+
+%% delete_peer/2
 
-rpd(Pid, Alias, PDict) ->
-    ?Dict:update(Alias, fun(Ps) -> lists:keydelete(Pid, 1, Ps) end, PDict).
+delete_peer(TPid, {_PeerT, AppT, IdentT}) ->
+    ets:select_delete(AppT, [{{'_', TPid}, [], [true]}]),
+    ets:select_delete(IdentT, [{{'_', '_', TPid}, [], [true]}]).
 
 %% ---------------------------------------------------------------------------
 %% pick_peer/4
@@ -1425,12 +1516,12 @@ pick_peer(#diameter_app{alias = Alias}
           = App,
           RealmAndHost,
           Filter,
-          #state{local_peers = L,
-                 shared_peers = S,
+          #state{local = LT,
+                 remote = RT,
                  service_name = SvcName,
                  service = #diameter_service{pid = Pid}}) ->
-    pick_peer(peers(Alias, RealmAndHost, Filter, L),
-              peers(Alias, RealmAndHost, Filter, S),
+    pick_peer(peers(Alias, RealmAndHost, Filter, LT),
+              peers(Alias, RealmAndHost, Filter, RT),
               Pid,
               SvcName,
               App).
@@ -1495,54 +1586,196 @@ pick_peer(Local,
 
 %% peers/4
 
-peers(Alias, RH, Filter, Peers) ->
-    case ?Dict:find(Alias, Peers) of
-        {ok, L} ->
-            filter(L, RH, Filter);
-        error ->
+peers(Alias, RH, Filter, T) ->
+    filter(Alias, RH, Filter, T, true).
+
+%% filter/5
+%%
+%% Try to limit the peers list by starting with a host/realm lookup.
+
+filter(Alias, RH, {neg, F}, T, B) ->
+    filter(Alias, RH, F, T, not B);
+
+filter(_, _, none, _, false) ->
+    [];
+
+filter(Alias, _, none, T, true) ->
+    all_peers(Alias, T);
+
+filter(Alias, [DR,DH] = RH, K, T, B)
+  when K == realm, DR == undefined;
+       K == host, DH == undefined ->
+    filter(Alias, RH, none, T, B);
+
+filter(Alias, [DR,_] = RH, realm = K, T, B) ->
+    filter(Alias, RH, {K, DR}, T, B);
+
+filter(Alias, [_,DH] = RH, host = K, T, B) ->
+    filter(Alias, RH, {K, DH}, T, B);
+
+filter(Alias, _, {K, D}, {PeerT, _AppT, IdentT}, true)
+  when K == host;
+       K == realm ->
+    try iolist_to_binary(D) of
+        B ->
+            caps(PeerT, ets:select(IdentT, [{{{K, B}, '$1', '$2'},
+                                             [{'==', '$1', {const, Alias}}],
+                                             ['$2']}]))
+    catch
+        error:_ ->
             []
-    end.
+    end;
 
-%% filter/3
+filter(Alias, RH, {all, Filters}, T, B)
+  when is_list(Filters) ->
+    fltr_all(Alias, RH, Filters, T, B);
+
+filter(Alias, RH, {first, Filters}, T, B)
+  when is_list(Filters) ->
+    fltr_first(Alias, RH, Filters, T, B);
+
+filter(Alias, RH, Filter, T, B) ->
+    {Ts, Fs} = filter(all_peers(Alias, T), RH, Filter),
+    choose(B, Ts, Fs).
+
+%% fltr_all/5
+
+fltr_all(Alias, RH, [{K, any} | Filters], T, B)
+  when K == host;
+       K == realm ->
+    fltr_all(Alias, RH, Filters, T, B);
+
+fltr_all(Alias, RH, [{host, _} = H, {realm, _} = R | Filters], T, B) ->
+    fltr_all(Alias, RH, [R, H | Filters], T, B);
+
+fltr_all(Alias, RH, [{realm, _} = R, {host, any} | Filters], T, B) ->
+    fltr_all(Alias, RH, [R | Filters], T, B);
+
+fltr_all(Alias, RH, [{realm, OR}, {host, OH} | Filters], T, true) ->
+    {PeerT, _AppT, IdentT} = T,
+    try {iolist_to_binary(OR), iolist_to_binary(OH)} of
+        BT ->
+            Peers = caps(PeerT,
+                         ets:select(IdentT, [{{BT, '$1', '$2'},
+                                              [{'==', '$1', {const, Alias}}],
+                                              ['$2']}])),
+            {Ts, _} = filter(Peers, RH, {all, Filters}),
+            Ts
+    catch
+        error:_ ->
+            []
+    end;
+
+fltr_all(Alias, [undefined,_] = RH, [realm | Filters], T, B) ->
+    fltr_all(Alias, RH, Filters, T, B);
+
+fltr_all(Alias, [DR,_] = RH, [realm | Filters], T, B) ->
+    fltr_all(Alias, RH, [{realm, DR} | Filters], T, B);
+
+fltr_all(Alias, [_,undefined] = RH, [host | Filters], T, B) ->
+    fltr_all(Alias, RH, Filters, T, B);
+
+fltr_all(Alias, [_,DH] = RH, [host | Filters], T, B) ->
+    fltr_all(Alias, RH, [{host, DH} | Filters], T, B);
+
+fltr_all(Alias, RH, [{K, _} = KT, KA | Filters], T, B)
+  when K == host, KA == realm;
+       K == realm, KA == host ->
+    fltr_all(Alias, RH, [KA, KT | Filters], T, B);
+
+fltr_all(Alias, RH, [F | Filters], T, B) ->
+    {Ts, Fs} = filter(filter(Alias, RH, F, T, B), RH, {all, Filters}),
+    choose(B, Ts, Fs);
+
+fltr_all(Alias, RH, [], T, B) ->
+    filter(Alias, RH, none, T, B).
+
+%% fltr_first/5
 %%
-%% Return peers in match order.
+%% Like any, but stop at the first filter with any matches.
+
+fltr_first(Alias, RH, [F | Filters], T, B) ->
+    case filter(Alias, RH, F, T, B) of
+        [] ->
+            fltr_first(Alias, RH, Filters, T, B);
+        [_|_] = Ts ->
+            Ts
+    end;
 
-filter(Peers, RH, Filter) ->
-    {Ts, _} = fltr(Peers, RH, Filter),
-    Ts.
+fltr_first(Alias, RH, [], T, B) ->
+    filter(Alias, RH, none, T, not B).
 
-%% fltr/4
+%% all_peers/2
+
+all_peers(Alias, {PeerT, AppT, _}) ->
+    ets:select(PeerT, [{#peer{pid = P, caps = '$1', _ = '_'},
+                        [],
+                        [{{P, '$1'}}]}
+                       || {_,P} <- ets:lookup(AppT, Alias)]).
 
-fltr(Peers, _, none) ->
+%% caps/2
+
+caps(PeerT, Pids) ->
+    ets:select(PeerT, [{#peer{pid = P, caps = '$1', _ = '_'},
+                        [],
+                        [{{P, '$1'}}]}
+                       || P <- Pids]).
+
+%% filter/3
+%%
+%% Return peers in match order.
+
+filter(Peers, _, none) ->
     {Peers, []};
 
-fltr(Peers, RH, {neg, F}) ->
-    {Ts, Fs} = fltr(Peers, RH, F),
+filter(Peers, RH, {neg, F}) ->
+    {Ts, Fs} = filter(Peers, RH, F),
     {Fs, Ts};
 
-fltr(Peers, RH, {all, L})
+filter(Peers, RH, {all, L})
   when is_list(L) ->
     lists:foldl(fun(F,A) -> fltr_all(F, A, RH) end,
                 {Peers, []},
                 L);
 
-fltr(Peers, RH, {any, L})
+filter(Peers, RH, {any, L})
   when is_list(L) ->
     lists:foldl(fun(F,A) -> fltr_any(F, A, RH) end,
                 {[], Peers},
                 L);
 
-fltr(Peers, RH, F) ->
+filter(Peers, RH, {first, L})
+  when is_list(L) ->
+    fltr_first(Peers, RH, L);
+
+filter(Peers, RH, F) ->
     lists:partition(fun({_,C}) -> caps_filter(C, RH, F) end, Peers).
 
+%% fltr_all/3
+
 fltr_all(F, {Ts0, Fs0}, RH) ->
-    {Ts1, Fs1} = fltr(Ts0, RH, F),
+    {Ts1, Fs1} = filter(Ts0, RH, F),
     {Ts1, Fs0 ++ Fs1}.
 
+%% fltr_any/3
+
 fltr_any(F, {Ts0, Fs0}, RH) ->
-    {Ts1, Fs1} = fltr(Fs0, RH, F),
+    {Ts1, Fs1} = filter(Fs0, RH, F),
     {Ts0 ++ Ts1, Fs1}.
 
+%% fltr_first/3
+
+fltr_first(Peers, _, []) ->
+    {[], Peers};
+
+fltr_first(Peers, RH, [F | Filters]) ->
+    case filter(Peers, RH, F) of
+        {[], _} ->
+            fltr_first(Peers, RH, Filters);
+        {_, _} = T ->
+            T
+    end.
+
 %% caps_filter/3
 
 caps_filter(#diameter_caps{origin_host = {_,OH}}, [_,DH], host) ->
@@ -1586,8 +1819,8 @@ eq(Any, Id, PeerId) ->
 
 transports(#state{watchdogT = WatchdogT}) ->
     ets:select(WatchdogT, [{#watchdog{peer = '$1', _ = '_'},
-                        [{'is_pid', '$1'}],
-                        ['$1']}]).
+                            [{'is_pid', '$1'}],
+                            ['$1']}]).
 
 %% ---------------------------------------------------------------------------
 %% # service_info/2
@@ -1640,7 +1873,7 @@ tagged_info(Item, S)
             undefined
     end;
 
-tagged_info(TPid, #state{watchdogT = WatchdogT, peerT = PeerT})
+tagged_info(TPid, #state{watchdogT = WatchdogT, local = {PeerT, _, _}})
   when is_pid(TPid) ->
     try
         [#peer{watchdog = Pid}] = ets:lookup(PeerT, TPid),
@@ -1790,7 +2023,7 @@ keys(connect = T, Opts) ->
 keys(_, _) ->
     [{listen, accept}].
 
-peer_dict(#state{watchdogT = WatchdogT, peerT = PeerT}, Dict0) ->
+peer_dict(#state{watchdogT = WatchdogT, local = {PeerT, _, _}}, Dict0) ->
     try ets:tab2list(WatchdogT) of
         L -> lists:foldl(fun(T,A) -> peer_acc(PeerT, A, T) end, Dict0, L)
     catch
diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl
index 07f39c562f..c169d3fc2c 100644
--- a/lib/diameter/src/base/diameter_traffic.erl
+++ b/lib/diameter/src/base/diameter_traffic.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2013-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.
@@ -41,7 +41,6 @@
 -export([make_recvdata/1,
          peer_up/1,
          peer_down/1,
-         failover/1,
          pending/1]).
 
 %% towards ?MODULE
@@ -1566,6 +1565,8 @@ answer(Pkt,
        Req) ->
     a(Pkt, SvcName, ModX, AE, Req).
 
+-spec a(_, _, _) -> no_return().  %% silence dialyzer
+
 a(#diameter_packet{errors = Es}
   = Pkt,
   SvcName,
@@ -1814,7 +1815,7 @@ store_request(T, TPid) ->
     ets:member(?REQUEST_TABLE, TPid)
         orelse begin
                    {_Seqs, _Req, TRef} = T,
-                   (self() ! {failover, TRef})  %% failover/1 may have missed
+                   self() ! {failover, TRef}  %% failover/1 may have missed
                end.
 
 %% lookup_request/2
@@ -1864,7 +1865,7 @@ failover(TPid)
 %% notifications are sent here: store_request/2 sends the notification
 %% in that case.
 
-%% Failover as a consequence of request_peer_down/1: inform the
+%% Failover as a consequence of peer_down/1: inform the
 %% request process.
 failover({_, Req, TRef}) ->
     #request{handler = Pid,
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index de0f324f47..a3e21db012 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -45,24 +45,12 @@
   {"1.9.2",   [{restart_application, diameter}]},  %% 17.5.5
   {"1.9.2.1", [{restart_application, diameter}]},  %% 17.5.6.3
   {"1.9.2.2", [{restart_application, diameter}]},  %% 17.5.6.7
-  {"1.10",    [{load_module, diameter_codec},      %% 18.0
-               {load_module, diameter_peer_fsm},
-               {load_module, diameter_watchdog},
-               {load_module, diameter_stats},
-               {load_module, diameter_config},
-               {load_module, diameter_lib},
-               {load_module, diameter_peer},
-               {load_module, diameter_reg},
-               {load_module, diameter_traffic},
-               {load_module, diameter_service},
-               {load_module, diameter_sync},
-               {load_module, diameter},
-               {load_module, diameter_gen_base_rfc6733},
-               {load_module, diameter_gen_acct_rfc6733},
-               {load_module, diameter_gen_base_rfc3588},
-               {load_module, diameter_gen_base_accounting},
-               {load_module, diameter_gen_relay}]},
-  {"1.11",    [{load_module, diameter_traffic}]}   %% 18.1
+  {"1.9.2.3", [{restart_application, diameter}]},  %% 17.5.6.8
+  {"1.10",    [{restart_application, diameter}]},  %% 18.0
+  {"1.11",    [{load_module, diameter_traffic},    %% 18.1
+               {update, diameter_service, {advanced, []}}]},
+  {"1.11.1",  [{load_module, diameter_traffic},    %% 18.2
+               {update, diameter_service, {advanced, []}}]}
  ],
  [
   {"0.9",     [{restart_application, diameter}]},
@@ -89,23 +77,9 @@
   {"1.9.2",   [{restart_application, diameter}]},
   {"1.9.2.1", [{restart_application, diameter}]},
   {"1.9.2.2", [{restart_application, diameter}]},
-  {"1.10",    [{load_module, diameter_gen_relay},
-               {load_module, diameter_gen_base_accounting},
-               {load_module, diameter_gen_base_rfc3588},
-               {load_module, diameter_gen_acct_rfc6733},
-               {load_module, diameter_gen_base_rfc6733},
-               {load_module, diameter},
-               {load_module, diameter_sync},
-               {load_module, diameter_service},
-               {load_module, diameter_traffic},
-               {load_module, diameter_reg},
-               {load_module, diameter_peer},
-               {load_module, diameter_lib},
-               {load_module, diameter_config},
-               {load_module, diameter_stats},
-               {load_module, diameter_watchdog},
-               {load_module, diameter_peer_fsm},
-               {load_module, diameter_codec}]},
-  {"1.11",    [{load_module, diameter_traffic}]}
+  {"1.9.2.3", [{restart_application, diameter}]},
+  {"1.10",    [{restart_application, diameter}]},
+  {"1.11",    [{restart_application, diameter}]},
+  {"1.11.1",  [{restart_application, diameter}]}
  ]
 }.
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl
index 678dc9b5d6..8a80ce630a 100644
--- a/lib/diameter/src/transport/diameter_sctp.erl
+++ b/lib/diameter/src/transport/diameter_sctp.erl
@@ -84,16 +84,18 @@
 
 %% Accepting/connecting transport process state.
 -record(transport,
-        {parent  :: pid(),
+        {parent  :: pid() | undefined,
          mode :: {accept, pid()}
                | accept
                | {connect, {[inet:ip_address()], uint(), list()}}
                         %% {RAs, RP, Errors}
                | connect,
-         socket   :: gen_sctp:sctp_socket(),
+         socket   :: gen_sctp:sctp_socket() | undefined,
          assoc_id :: gen_sctp:assoc_id(),  %% association identifier
-         peer     :: {[inet:ip_address()], uint()}, %% {RAs, RP}
-         streams  :: {uint(), uint()},     %% {InStream, OutStream} counts
+         peer     :: {[inet:ip_address()], uint()} %% {RAs, RP}
+                   | undefined,
+         streams  :: {uint(), uint()}      %% {InStream, OutStream} counts
+                   | undefined,
          os = 0   :: uint()}).             %% next output stream
 
 %% Listener process state.
@@ -102,7 +104,7 @@
          socket    :: gen_sctp:sctp_socket(),
          count = 0 :: uint(),  %% attached transport processes
          pending = {0, queue:new()},
-         tref      :: reference(),
+         tref      :: reference() | undefined,
          accept    :: [match()]}).
 %% Field pending implements two queues: the first of transport-to-be
 %% processes to which an association has been assigned but for which
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl
index 005b2442c0..c79d85820b 100644
--- a/lib/diameter/src/transport/diameter_tcp.erl
+++ b/lib/diameter/src/transport/diameter_tcp.erl
@@ -73,7 +73,7 @@
 %% Listener process state.
 -record(listener, {socket    :: inet:socket(),
                    count = 1 :: non_neg_integer(),
-                   tref      :: reference()}).
+                   tref      :: reference() | undefined}).
 
 %% Monitor process state.
 -record(monitor,
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index 7e316c03f1..967a0bf591 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -725,7 +725,8 @@ send_any_2(Config) ->
     Req = ['STR', {'Termination-Cause', ?LOGOUT},
                   {'Destination-Host', [?HOST(SN, "unknown.org")]}],
     ?answer_message(?UNABLE_TO_DELIVER)
-        = call(Config, Req, [{filter, {any, [host, realm]}}]).
+        = call(Config, Req, [{filter, {first, [{all, [host, realm]},
+                                               realm]}}]).
 
 %% Send with a conjunctive filter.
 send_all_1(Config) ->
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 7ac4a7adfb..836def8447 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -17,5 +17,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 1.11.1
+DIAMETER_VSN = 1.11.2
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
diff --git a/lib/edoc/doc/overview.edoc b/lib/edoc/doc/overview.edoc
index 3639bb43a5..d2bba9d744 100644
--- a/lib/edoc/doc/overview.edoc
+++ b/lib/edoc/doc/overview.edoc
@@ -755,7 +755,7 @@ following escape sequences may be used: <dl>
 
  === Function specifications ===
 
-<note>Although the syntax described in the following can still be used
+Note that although the syntax described in the following can still be used
 for specifying functions we recommend that Erlang specifications as
 described in <seealso marker="doc/reference_manual:typespec"> Types
 and Function Specification</seealso> should be added to the source
@@ -764,7 +764,6 @@ marker="dialyzer:dialyzer">Dialyzer</seealso>'s can be utilized in the
 process of keeping the documentation consistent and up-to-date.
 Erlang specifications will be used unless there is also a function
 specification (a `@spec' tag followed by a type) with the same name.
-</note>
 
 The following grammar describes the form of the specifications following
 a `@spec' tag. A '`?'' suffix implies that the element is optional.
@@ -973,12 +972,12 @@ contain any annotations at all.
 
  === Type definitions ===
 
-<note>Although the syntax described in the following can still be used
+Note that although the syntax described in the following can still be used
 for specifying types we recommend that Erlang types as described in
 <seealso marker="doc/reference_manual:typespec"> Types and Function
 Specification</seealso> should be added to the source code instead.
 Erlang types will be used unless there is a type alias with the same
-name.</note>
+name.
 
 The following grammar (see above for auxiliary definitions) describes
 the form of the definitions that may follow a `@type' tag:
diff --git a/lib/edoc/doc/src/notes.xml b/lib/edoc/doc/src/notes.xml
index 5260a1d465..3f9d26796a 100644
--- a/lib/edoc/doc/src/notes.xml
+++ b/lib/edoc/doc/src/notes.xml
@@ -32,6 +32,33 @@
   <p>This document describes the changes made to the EDoc
     application.</p>
 
+<section><title>Edoc 0.7.18</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Assign correct names to list arguments. </p>
+          <p>
+	    Own Id: OTP-13234 Aux Id: ERL-63 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Unless the <c>sort_functions</c> option is <c>true</c>,
+	    <c>edoc_layout</c> does not sort functions.</p>
+          <p>
+	    Own Id: OTP-13302</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Edoc 0.7.17</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl
index 90f1fc3071..d2494b69fe 100644
--- a/lib/edoc/src/edoc.erl
+++ b/lib/edoc/src/edoc.erl
@@ -555,7 +555,6 @@ read_source(Name) ->
 %%  <dd>Specifies a list of pre-defined Erlang preprocessor (`epp')
 %%      macro definitions, used if the `preprocess' option is turned on.
 %%      The default value is the empty list.</dd>
-%% </dl>
 %%  <dt>{@type {report_missing_types, boolean()@}}
 %%  </dt>
 %%  <dd>If the value is `true', warnings are issued for missing types.
@@ -563,6 +562,7 @@ read_source(Name) ->
 %%      `no_report_missing_types' is an alias for
 %%      `{report_missing_types, false}'.
 %%  </dd>
+%% </dl>
 %%
 %% @see get_doc/2
 %% @see //syntax_tools/erl_syntax
diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl
index b67ec31ae3..f723cd8373 100644
--- a/lib/edoc/src/edoc_layout.erl
+++ b/lib/edoc/src/edoc_layout.erl
@@ -180,7 +180,9 @@ layout_module(#xmlElement{name = module, content = Es}=E, Opts) ->
     FullDesc = get_content(fullDescription, Desc),
     Functions = [{function_name(E), E} || E <- get_content(functions, Es)],
     Types = [{type_name(E), E} || E <- get_content(typedecls, Es)],
-    SortedFs = lists:sort(Functions),
+    SortedFs = if Opts#opts.sort_functions -> lists:sort(Functions);
+                  true -> Functions
+               end,
     Body = (navigation("top")
             ++ [?NL, hr, ?NL, ?NL, {h1, Title}, ?NL]
 	    ++ doc_index(FullDesc, Functions, Types)
@@ -204,9 +206,7 @@ layout_module(#xmlElement{name = module, content = Es}=E, Opts) ->
 	       end
 	    ++ types(lists:sort(Types), Opts)
 	    ++ function_index(SortedFs, Opts#opts.index_columns)
-	    ++ if Opts#opts.sort_functions -> functions(SortedFs, Opts);
-		  true -> functions(Functions, Opts)
-	       end
+	    ++ functions(SortedFs, Opts)
 	    ++ [hr, ?NL]
 	    ++ navigation("bottom")
 	    ++ timestamp()),
diff --git a/lib/edoc/test/Makefile b/lib/edoc/test/Makefile
index 2033e003b3..7a03ddeba9 100644
--- a/lib/edoc/test/Makefile
+++ b/lib/edoc/test/Makefile
@@ -25,7 +25,7 @@ RELSYSDIR = $(RELEASE_PATH)/edoc_test
 # ----------------------------------------------------
 
 ERL_MAKE_FLAGS += 
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
diff --git a/lib/edoc/test/edoc_SUITE.erl b/lib/edoc/test/edoc_SUITE.erl
index 2e2d5584f0..00d7550bed 100644
--- a/lib/edoc/test/edoc_SUITE.erl
+++ b/lib/edoc/test/edoc_SUITE.erl
@@ -16,7 +16,7 @@
 %% 
 -module(edoc_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
diff --git a/lib/edoc/vsn.mk b/lib/edoc/vsn.mk
index 49a73331c6..83514ac94f 100644
--- a/lib/edoc/vsn.mk
+++ b/lib/edoc/vsn.mk
@@ -1 +1 @@
-EDOC_VSN = 0.7.17
+EDOC_VSN = 0.7.18
diff --git a/lib/eldap/doc/src/eldap.xml b/lib/eldap/doc/src/eldap.xml
index 8f4479a730..43873e44e2 100644
--- a/lib/eldap/doc/src/eldap.xml
+++ b/lib/eldap/doc/src/eldap.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2012</year><year>2013</year>
+      <year>2012</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -29,7 +29,7 @@
     <rev>B</rev>
   </header>
   <module>eldap</module>
-  <modulesummary>Eldap Functions</modulesummary>
+  <modulesummary>LDAP Client</modulesummary>
   <description>
     <p>This module provides a client api to the Lightweight Directory Access Protocol (LDAP).
     </p>
@@ -40,20 +40,67 @@
     </list>
     <p>The above publications can be found at <url href="http://www.ietf.org">IETF</url>.
     </p>
-    <p><em>Types</em></p>
-    <pre>
-handle()    Connection handle
-attribute() {Type = string(), Values=[string()]}
-modify_op() See mod_add/2, mod_delete/2, mod_replace/2
-scope()     See baseObject/0, singleLevel/0, wholeSubtree/0
-dereference() See neverDerefAliases/0, derefInSearching/0, derefFindingBaseObj/0, derefAlways/0
-filter()    See present/1, substrings/2,
-                equalityMatch/2, greaterOrEqual/2, lessOrEqual/2,
-                approxMatch/2, extensibleMatch/2,
-                'and'/1, 'or'/1, 'not'/1.
-    </pre>
-    <p></p>
   </description>
+
+  <section>
+    <title>DATA TYPES</title>
+    <p>Type definitions that are used more than once in this module:
+    </p>
+    <taglist>
+      <tag><c>handle()</c></tag>
+      <item><p>Connection handle</p></item>
+
+      <tag><c>attribute() =</c></tag>
+      <item><p><c>{Type = string(), Values=[string()]}</c></p></item>
+
+      <tag><c>modify_op()</c></tag>
+      <item><p>See 
+        <seealso marker="#mod_add/2">mod_add/2</seealso>, 
+        <seealso marker="#mod_delete/2">mod_delete/2</seealso>,
+        <seealso marker="#mod_replace/2">mod_replace/2</seealso>
+      </p></item>
+
+      <tag><c>scope()</c></tag>
+      <item><p>See 
+        <seealso marker="#baseObject/0">baseObject/0</seealso>, 
+        <seealso marker="#singleLevel/0">singleLevel/0</seealso>, 
+        <seealso marker="#wholeSubtree/0">wholeSubtree/0</seealso>
+      </p></item>
+
+      <tag><c>dereference()</c></tag>
+      <item><p>See 
+        <seealso marker="#neverDerefAliases/0">neverDerefAliases/0</seealso>, 
+        <seealso marker="#derefInSearching/0">derefInSearching/0</seealso>, 
+        <seealso marker="#derefFindingBaseObj/0">derefFindingBaseObj/0</seealso>, 
+        <seealso marker="#derefAlways/0">derefAlways/0</seealso>
+      </p></item>
+
+      <tag><c>filter()</c></tag>
+      <item><p>See 
+        <seealso marker="#present/1">present/1</seealso>, 
+        <seealso marker="#substrings/2">substrings/2</seealso>, 
+        <seealso marker="#equalityMatch/2">equalityMatch/2</seealso>, 
+        <seealso marker="#greaterOrEqual/2">greaterOrEqual/2</seealso>, 
+        <seealso marker="#lessOrEqual/2">lessOrEqual/2</seealso>, 
+        <seealso marker="#approxMatch/2">approxMatch/2</seealso>, 
+        <seealso marker="#extensibleMatch/2">extensibleMatch/2</seealso>, 
+        <seealso marker="#'and'/1">'and'/1</seealso>, 
+        <seealso marker="#'or'/1">'or'/1</seealso>, 
+        <seealso marker="#'not'/1">'not'/1</seealso>
+      </p></item>
+
+      <tag><c>return_value() = </c></tag>
+      <item><p><c>ok | {ok, {referral,referrals()}} | {error,Error}</c>
+      </p></item>
+
+      <tag><c>referrals() =</c></tag>
+      <item><p><c>[Address = string()]</c> The contents of <c>Address</c> is server dependent.
+      </p></item>
+
+    </taglist>
+  </section>
+
+
   <funcs>
     <func>
       <name>open([Host]) -> {ok, Handle} | {error, Reason}</name>
@@ -88,18 +135,19 @@ filter()    See present/1, substrings/2,
 	<v>Handle = handle()</v>
       </type>
       <desc>
-        <p>Shutdown the connection.</p>
+        <p>Shutdown the connection after sending an unbindRequest to the server. If the connection is tls the connection
+	will be closed with <c>ssl:close/1</c>, otherwise with <c>gen_tcp:close/1</c>.</p>
       </desc>
     </func>
     <func>
-      <name>start_tls(Handle, Options) -> ok | {error,Error}</name>
+      <name>start_tls(Handle, Options) -> return_value()</name>
       <fsummary>Upgrade a connection to TLS.</fsummary>
       <desc>
         <p>Same as start_tls(Handle, Options, infinity)</p>
       </desc>
     </func>
     <func>
-      <name>start_tls(Handle, Options, Timeout) -> ok | {error,Error}</name>
+      <name>start_tls(Handle, Options, Timeout) -> return_value()</name>
       <fsummary>Upgrade a connection to TLS.</fsummary>
       <type>
 	<v>Handle = handle()</v>
@@ -128,7 +176,7 @@ filter()    See present/1, substrings/2,
       </desc>
     </func>
     <func>
-      <name>simple_bind(Handle, Dn, Password) -> ok | {error, Reason}</name>
+      <name>simple_bind(Handle, Dn, Password) -> return_value()</name>
       <fsummary>Authenticate the connection.</fsummary>
       <type>
 	<v>Handle = handle()</v>
@@ -140,7 +188,7 @@ filter()    See present/1, substrings/2,
       </desc>
     </func>
     <func>
-      <name>add(Handle, Dn, [Attribute]) -> ok | {error, Reason}</name>
+      <name>add(Handle, Dn, [Attribute]) -> return_value()</name>
       <fsummary>Add an entry.</fsummary>
       <type>
 	<v>Handle = handle()</v>
@@ -161,7 +209,7 @@ filter()    See present/1, substrings/2,
       </desc>
     </func>
     <func>
-      <name>delete(Handle, Dn) -> ok | {error, Reason}</name>
+      <name>delete(Handle, Dn) -> return_value()</name>
       <fsummary>Delete an entry.</fsummary>
       <type>
         <v>Dn = string()</v>
@@ -203,7 +251,7 @@ filter()    See present/1, substrings/2,
     </func>
 
     <func>
-      <name>modify(Handle, Dn, [ModifyOp]) -> ok | {error, Reason}</name>
+      <name>modify(Handle, Dn, [ModifyOp]) -> return_value()</name>
       <fsummary>Modify an entry.</fsummary>
       <type>
         <v>Dn = string()</v>
@@ -219,7 +267,7 @@ filter()    See present/1, substrings/2,
       </desc>
     </func>
     <func>
-      <name>modify_password(Handle, Dn, NewPasswd) -> ok | {ok, GenPasswd} | {error, Reason}</name>
+      <name>modify_password(Handle, Dn, NewPasswd) -> return_value() | {ok, GenPasswd}</name>
       <fsummary>Modify the password of a user.</fsummary>
       <type>
         <v>Dn = string()</v>
@@ -230,7 +278,7 @@ filter()    See present/1, substrings/2,
       </desc>
     </func>
     <func>
-      <name>modify_password(Handle, Dn, NewPasswd, OldPasswd) -> ok | {ok, GenPasswd} | {error, Reason}</name>
+      <name>modify_password(Handle, Dn, NewPasswd, OldPasswd) -> return_value() | {ok, GenPasswd}</name>
       <fsummary>Modify the password of a user.</fsummary>
       <type>
         <v>Dn = string()</v>
@@ -259,7 +307,7 @@ filter()    See present/1, substrings/2,
       </desc>
     </func>
     <func>
-      <name>modify_dn(Handle, Dn, NewRDN, DeleteOldRDN, NewSupDN) -> ok | {error, Reason}</name>
+      <name>modify_dn(Handle, Dn, NewRDN, DeleteOldRDN, NewSupDN) -> return_value()</name>
       <fsummary>Modify the DN of an entry.</fsummary>
       <type>
         <v>Dn = string()</v>
@@ -279,7 +327,7 @@ filter()    See present/1, substrings/2,
       </desc>
     </func>
     <func>
-      <name>search(Handle, SearchOptions) -> {ok, #eldap_search_result{}} | {error, Reason}</name>
+      <name>search(Handle, SearchOptions) -> {ok, #eldap_search_result{}} | {ok, {referral,referrals()}} | {error, Reason}</name>
       <fsummary>Search the Directory</fsummary>
       <type>
         <v>SearchOptions = #eldap_search{} | [SearchOption]</v>
diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index b40977cfd9..04b75f9e31 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -31,6 +31,37 @@
   </header>
   <p>This document describes the changes made to the Eldap application.</p>
 
+<section><title>Eldap 1.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    ELDAP did not send an <c>'unBind'</c> request before
+	    closing the connection.</p>
+          <p>
+	    Own Id: OTP-13327</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Handles the <c>referral</c> result code from LDAP
+	    servers. Adds the return value <c>{ok,
+	    {referral,UrlList}}</c> to some functions. See the Eldap
+	    reference manual for details.</p>
+          <p>
+	    Own Id: OTP-12272</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eldap 1.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile
index cd3c102f55..d63b2fe8f5 100644
--- a/lib/eldap/src/Makefile
+++ b/lib/eldap/src/Makefile
@@ -98,7 +98,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(ASN1_HRL) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/asn1"
diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl
index ae47c815c9..dc236f8a44 100644
--- a/lib/eldap/src/eldap.erl
+++ b/lib/eldap/src/eldap.erl
@@ -10,16 +10,23 @@
 %%% See MIT-LICENSE at the top dir for licensing information.
 %%% --------------------------------------------------------------------
 -vc('$Id$ ').
--export([open/1,open/2,simple_bind/3,controlling_process/2,
-	 start_tls/2, start_tls/3,
-         modify_password/3, modify_password/4,
+-export([open/1, open/2,
+	 simple_bind/3, simple_bind/4,
+	 controlling_process/2,
+	 start_tls/2, start_tls/3, start_tls/4,
+         modify_password/3, modify_password/4, modify_password/5,
 	 getopts/2,
 	 baseObject/0,singleLevel/0,wholeSubtree/0,close/1,
 	 equalityMatch/2,greaterOrEqual/2,lessOrEqual/2,
 	 extensibleMatch/2,
-	 approxMatch/2,search/2,substrings/2,present/1,
-	 'and'/1,'or'/1,'not'/1,modify/3, mod_add/2, mod_delete/2,
-	 mod_replace/2, add/3, delete/2, modify_dn/5,parse_dn/1,
+	 search/2, search/3,
+	 approxMatch/2,substrings/2,present/1,
+	 'and'/1,'or'/1,'not'/1,mod_add/2, mod_delete/2,
+	 mod_replace/2,
+	 modify/3, modify/4,
+	 add/3, add/4,
+	 delete/2, delete/3,
+	 modify_dn/5,parse_dn/1,
 	 parse_ldap_url/1]).
 
 -export([neverDerefAliases/0, derefInSearching/0,
@@ -91,7 +98,10 @@ start_tls(Handle, TlsOptions) ->
     start_tls(Handle, TlsOptions, infinity).
 
 start_tls(Handle, TlsOptions, Timeout) ->
-    send(Handle, {start_tls,TlsOptions,Timeout}),
+    start_tls(Handle, TlsOptions, Timeout, asn1_NOVALUE).
+
+start_tls(Handle, TlsOptions, Timeout, Controls) ->
+    send(Handle, {start_tls,TlsOptions,Timeout,Controls}),
     recv(Handle).
 
 %%% --------------------------------------------------------------------
@@ -108,7 +118,11 @@ modify_password(Handle, Dn, NewPasswd) ->
 
 modify_password(Handle, Dn, NewPasswd, OldPasswd)
   when is_pid(Handle), is_list(Dn), is_list(NewPasswd), is_list(OldPasswd) ->
-    send(Handle, {passwd_modify,optional(Dn),optional(NewPasswd),optional(OldPasswd)}),
+    modify_password(Handle, Dn, NewPasswd, OldPasswd, asn1_NOVALUE).
+
+modify_password(Handle, Dn, NewPasswd, OldPasswd, Controls)
+  when is_pid(Handle), is_list(Dn), is_list(NewPasswd), is_list(OldPasswd) ->
+    send(Handle, {passwd_modify,optional(Dn),optional(NewPasswd),optional(OldPasswd),Controls}),
     recv(Handle).
 
 %%% --------------------------------------------------------------------
@@ -147,7 +161,10 @@ controlling_process(Handle, Pid) when is_pid(Handle), is_pid(Pid)  ->
 %%%  Returns: ok | {error, Error}
 %%% --------------------------------------------------------------------
 simple_bind(Handle, Dn, Passwd) when is_pid(Handle)  ->
-    send(Handle, {simple_bind, Dn, Passwd}),
+    simple_bind(Handle, Dn, Passwd, asn1_NOVALUE).
+
+simple_bind(Handle, Dn, Passwd, Controls) when is_pid(Handle)  ->
+    send(Handle, {simple_bind, Dn, Passwd, Controls}),
     recv(Handle).
 
 %%% --------------------------------------------------------------------
@@ -164,7 +181,10 @@ simple_bind(Handle, Dn, Passwd) when is_pid(Handle)  ->
 %%%     )
 %%% --------------------------------------------------------------------
 add(Handle, Entry, Attributes) when is_pid(Handle),is_list(Entry),is_list(Attributes) ->
-    send(Handle, {add, Entry, add_attrs(Attributes)}),
+    add(Handle, Entry, Attributes, asn1_NOVALUE).
+
+add(Handle, Entry, Attributes, Controls) when is_pid(Handle),is_list(Entry),is_list(Attributes) ->
+    send(Handle, {add, Entry, add_attrs(Attributes), Controls}),
     recv(Handle).
 
 %%% Do sanity check !
@@ -188,7 +208,10 @@ add_attrs(Attrs) ->
 %%%        )
 %%% --------------------------------------------------------------------
 delete(Handle, Entry) when is_pid(Handle), is_list(Entry) ->
-    send(Handle, {delete, Entry}),
+    delete(Handle, Entry, asn1_NOVALUE).
+
+delete(Handle, Entry, Controls)  when is_pid(Handle), is_list(Entry) ->
+    send(Handle, {delete, Entry, Controls}),
     recv(Handle).
 
 %%% --------------------------------------------------------------------
@@ -203,7 +226,10 @@ delete(Handle, Entry) when is_pid(Handle), is_list(Entry) ->
 %%%        )
 %%% --------------------------------------------------------------------
 modify(Handle, Object, Mods) when is_pid(Handle), is_list(Object), is_list(Mods) ->
-    send(Handle, {modify, Object, Mods}),
+    modify(Handle, Object, Mods, asn1_NOVALUE).
+
+modify(Handle, Object, Mods, Controls) when is_pid(Handle), is_list(Object), is_list(Mods) ->
+    send(Handle, {modify, Object, Mods, Controls}),
     recv(Handle).
 
 %%%
@@ -236,13 +262,17 @@ m(Operation, Type, Values) ->
 %%% --------------------------------------------------------------------
 modify_dn(Handle, Entry, NewRDN, DelOldRDN, NewSup)
   when is_pid(Handle),is_list(Entry),is_list(NewRDN),is_atom(DelOldRDN),is_list(NewSup) ->
+    modify_dn(Handle, Entry, NewRDN, DelOldRDN, NewSup, asn1_NOVALUE).
+
+modify_dn(Handle, Entry, NewRDN, DelOldRDN, NewSup, Controls)
+  when is_pid(Handle),is_list(Entry),is_list(NewRDN),is_atom(DelOldRDN),is_list(NewSup) ->
     send(Handle, {modify_dn, Entry, NewRDN,
-		  bool_p(DelOldRDN), optional(NewSup)}),
+		  bool_p(DelOldRDN), optional(NewSup), Controls}),
     recv(Handle).
 
 %%% Sanity checks !
 
-bool_p(Bool) when Bool==true;Bool==false -> Bool.
+bool_p(Bool) when is_boolean(Bool) -> Bool.
 
 optional([])    -> asn1_NOVALUE;
 optional(Value) -> Value.
@@ -272,16 +302,19 @@ optional(Value) -> Value.
 %%%        []}}
 %%%
 %%% --------------------------------------------------------------------
-search(Handle, A) when is_pid(Handle), is_record(A, eldap_search) ->
-    call_search(Handle, A);
-search(Handle, L) when is_pid(Handle), is_list(L) ->
+search(Handle, X) when is_pid(Handle), is_record(X,eldap_search) ; is_list(X) ->
+    search(Handle, X, asn1_NOVALUE).
+    
+search(Handle, A, Controls) when is_pid(Handle), is_record(A, eldap_search) ->
+    call_search(Handle, A, Controls);
+search(Handle, L, Controls) when is_pid(Handle), is_list(L) ->
     case catch parse_search_args(L) of
 	{error, Emsg}                  -> {error, Emsg};
-	A when is_record(A, eldap_search) -> call_search(Handle, A)
+	A when is_record(A, eldap_search) -> call_search(Handle, A, Controls)
     end.
 
-call_search(Handle, A) ->
-    send(Handle, {search, A}),
+call_search(Handle, A, Controls) ->
+    send(Handle, {search, A, Controls}),
     recv(Handle).
 
 parse_search_args(Args) ->
@@ -484,33 +517,33 @@ do_connect(Host, Data, Opts) when Data#eldap.ldaps == true ->
 loop(Cpid, Data) ->
     receive
 
-	{From, {search, A}} ->
-	    {Res,NewData} = do_search(Data, A),
+	{From, {search, A, Controls}} ->
+	    {Res,NewData} = do_search(Data, A, Controls),
 	    send(From,Res),
 	    ?MODULE:loop(Cpid, NewData);
 
-	{From, {modify, Obj, Mod}} ->
-	    {Res,NewData} = do_modify(Data, Obj, Mod),
+	{From, {modify, Obj, Mod, Controls}} ->
+	    {Res,NewData} = do_modify(Data, Obj, Mod, Controls),
 	    send(From,Res),
 	    ?MODULE:loop(Cpid, NewData);
 
-	{From, {modify_dn, Obj, NewRDN, DelOldRDN, NewSup}} ->
-	    {Res,NewData} = do_modify_dn(Data, Obj, NewRDN, DelOldRDN, NewSup),
+	{From, {modify_dn, Obj, NewRDN, DelOldRDN, NewSup, Controls}} ->
+	    {Res,NewData} = do_modify_dn(Data, Obj, NewRDN, DelOldRDN, NewSup, Controls),
 	    send(From,Res),
 	    ?MODULE:loop(Cpid, NewData);
 
-	{From, {add, Entry, Attrs}} ->
-	    {Res,NewData} = do_add(Data, Entry, Attrs),
+	{From, {add, Entry, Attrs, Controls}} ->
+	    {Res,NewData} = do_add(Data, Entry, Attrs, Controls),
 	    send(From,Res),
 	    ?MODULE:loop(Cpid, NewData);
 
-	{From, {delete, Entry}} ->
-	    {Res,NewData} = do_delete(Data, Entry),
+	{From, {delete, Entry, Controls}} ->
+	    {Res,NewData} = do_delete(Data, Entry, Controls),
 	    send(From,Res),
 	    ?MODULE:loop(Cpid, NewData);
 
-	{From, {simple_bind, Dn, Passwd}} ->
-	    {Res,NewData} = do_simple_bind(Data, Dn, Passwd),
+	{From, {simple_bind, Dn, Passwd, Controls}} ->
+	    {Res,NewData} = do_simple_bind(Data, Dn, Passwd, Controls),
 	    send(From,Res),
 	    ?MODULE:loop(Cpid, NewData);
 
@@ -520,17 +553,18 @@ loop(Cpid, Data) ->
 	    ?PRINT("New Cpid is: ~p~n",[NewCpid]),
 	    ?MODULE:loop(NewCpid, Data);
 
-	{From, {start_tls,TlsOptions,Timeout}} ->
-	    {Res,NewData} = do_start_tls(Data, TlsOptions, Timeout),
+	{From, {start_tls,TlsOptions,Timeout,Controls}} ->
+	    {Res,NewData} = do_start_tls(Data, TlsOptions, Timeout, Controls),
 	    send(From,Res),
 	    ?MODULE:loop(Cpid, NewData);
 
-        {From, {passwd_modify,Dn,NewPasswd,OldPasswd}} ->
-            {Res,NewData} = do_passwd_modify(Data, Dn, NewPasswd, OldPasswd),
+        {From, {passwd_modify,Dn,NewPasswd,OldPasswd,Controls}} ->
+            {Res,NewData} = do_passwd_modify(Data, Dn, NewPasswd, OldPasswd, Controls),
             send(From, Res),
             ?MODULE:loop(Cpid, NewData);
 
 	{_From, close} ->
+	    {no_reply,_NewData} = do_unbind(Data),
 	    unlink(Cpid),
 	    exit(closed);
 
@@ -578,11 +612,10 @@ loop(Cpid, Data) ->
 %%% --------------------------------------------------------------------
 %%% startTLS Request
 %%% --------------------------------------------------------------------
-
-do_start_tls(Data=#eldap{using_tls=true}, _, _) ->
+do_start_tls(Data=#eldap{using_tls=true}, _, _, _) ->
     {{error,tls_already_started}, Data};
-do_start_tls(Data=#eldap{fd=FD} , TlsOptions, Timeout) ->
-    case catch exec_start_tls(Data) of
+do_start_tls(Data=#eldap{fd=FD} , TlsOptions, Timeout, Controls) ->
+    case catch exec_start_tls(Data, Controls) of
 	{ok,NewData} ->
 	    case ssl:connect(FD,TlsOptions,Timeout) of
 		{ok, SslSocket} ->
@@ -593,15 +626,16 @@ do_start_tls(Data=#eldap{fd=FD} , TlsOptions, Timeout) ->
 		{error,Error} ->
 		    {{error,Error}, Data}
 	    end;
-	{error,Error} -> {{error,Error},Data};
-	Else         -> {{error,Else},Data}
+	{{ok,Val},NewData} -> {{ok,Val},NewData};
+	{error,Error}      -> {{error,Error},Data};
+	Else               -> {{error,Else},Data}
     end.
 
 -define(START_TLS_OID, "1.3.6.1.4.1.1466.20037").
 
-exec_start_tls(Data) ->
+exec_start_tls(Data, Controls) ->
     Req = #'ExtendedRequest'{requestName = ?START_TLS_OID},
-    Reply = request(Data#eldap.fd, Data, Data#eldap.id, {extendedReq, Req}),
+    Reply = request(Data#eldap.fd, Data, Data#eldap.id, {extendedReq, Req, Controls}),
     exec_extended_req_reply(Data, Reply).
 
 exec_extended_req_reply(Data, {ok,Msg}) when
@@ -611,6 +645,8 @@ exec_extended_req_reply(Data, {ok,Msg}) when
 	    case Result#'ExtendedResponse'.resultCode of
 		success ->
 		    {ok,Data};
+		referral ->
+		    {{ok, {referral,Result#'ExtendedResponse'.referral}}, Data};
 		Error ->
 		    {error, {response,Error}}
 	    end;
@@ -626,30 +662,32 @@ exec_extended_req_reply(_, Error) ->
 %%% Authenticate ourselves to the directory using
 %%% simple authentication.
 
-do_simple_bind(Data, anon, anon) ->   %% For testing
-    do_the_simple_bind(Data, "", "");
-do_simple_bind(Data, Dn, _Passwd) when Dn=="",Data#eldap.anon_auth==false ->
+do_simple_bind(Data, anon, anon, Controls) ->   %% For testing
+    do_the_simple_bind(Data, "", "", Controls);
+do_simple_bind(Data, Dn, _Passwd,_) when Dn=="",Data#eldap.anon_auth==false ->
     {{error,anonymous_auth},Data};
-do_simple_bind(Data, _Dn, Passwd) when Passwd=="",Data#eldap.anon_auth==false ->
+do_simple_bind(Data, _Dn, Passwd,_) when Passwd=="",Data#eldap.anon_auth==false ->
     {{error,anonymous_auth},Data};
-do_simple_bind(Data, Dn, Passwd) ->
-    do_the_simple_bind(Data, Dn, Passwd).
+do_simple_bind(Data, Dn, Passwd, Controls) ->
+    do_the_simple_bind(Data, Dn, Passwd, Controls).
 
-do_the_simple_bind(Data, Dn, Passwd) ->
+do_the_simple_bind(Data, Dn, Passwd, Controls) ->
     case catch exec_simple_bind(Data#eldap{binddn = Dn,
 					   passwd = Passwd,
-					   id     = bump_id(Data)}) of
-	{ok,NewData} -> {ok,NewData};
-	{error,Emsg} -> {{error,Emsg},Data};
-	Else         -> {{error,Else},Data}
+					   id     = bump_id(Data)},
+			       Controls) of
+	{ok,NewData}       -> {ok,NewData};
+	{{ok,Val},NewData} -> {{ok,Val},NewData};
+	{error,Emsg}       -> {{error,Emsg},Data};
+	Else               -> {{error,Else},Data}
     end.
 
-exec_simple_bind(Data) ->
+exec_simple_bind(Data, Controls) ->
     Req = #'BindRequest'{version        = Data#eldap.version,
 			 name           = Data#eldap.binddn,
 			 authentication = {simple, Data#eldap.passwd}},
     log2(Data, "bind request = ~p~n", [Req]),
-    Reply = request(Data#eldap.fd, Data, Data#eldap.id, {bindRequest, Req}),
+    Reply = request(Data#eldap.fd, Data, Data#eldap.id, {bindRequest, Req, Controls}),
     log2(Data, "bind reply = ~p~n", [Reply]),
     exec_simple_bind_reply(Data, Reply).
 
@@ -659,6 +697,7 @@ exec_simple_bind_reply(Data, {ok,Msg}) when
 	{bindResponse, Result} ->
 	    case Result#'BindResponse'.resultCode of
 		success -> {ok,Data};
+		referral -> {{ok, {referral,Result#'BindResponse'.referral}}, Data};
 		Error   -> {error, Error}
 	    end;
 	Other -> {error, Other}
@@ -671,10 +710,11 @@ exec_simple_bind_reply(_, Error) ->
 %%% searchRequest
 %%% --------------------------------------------------------------------
 
-do_search(Data, A) ->
-    case catch do_search_0(Data, A) of
+do_search(Data, A, Controls) ->
+    case catch do_search_0(Data, A, Controls) of
 	{error,Emsg}         -> {ldap_closed_p(Data, Emsg),Data};
 	{'EXIT',Error}       -> {ldap_closed_p(Data, Error),Data};
+	{{ok,Val},NewData}   -> {{ok,Val},NewData};
 	{ok,Res,Ref,NewData} -> {{ok,polish(Res, Ref)},NewData};
 	{{error,Reason},NewData} -> {{error,Reason},NewData};
 	Else                 -> {ldap_closed_p(Data, Else),Data}
@@ -700,7 +740,7 @@ polish_result([H|T]) when is_record(H, 'SearchResultEntry') ->
 polish_result([]) ->
     [].
 
-do_search_0(Data, A) ->
+do_search_0(Data, A, Controls) ->
     Req = #'SearchRequest'{baseObject = A#eldap_search.base,
 			   scope = v_scope(A#eldap_search.scope),
 			   derefAliases = v_deref(A#eldap_search.deref),
@@ -711,15 +751,15 @@ do_search_0(Data, A) ->
 			   attributes = v_attributes(A#eldap_search.attributes)
 			  },
     Id = bump_id(Data),
-    collect_search_responses(Data#eldap{id=Id}, Req, Id).
+    collect_search_responses(Data#eldap{id=Id}, Req, Id, Controls).
 
 %%% The returned answers cames in one packet per entry
 %%% mixed with possible referals
 
-collect_search_responses(Data, Req, ID) ->
+collect_search_responses(Data, Req, ID, Controls) ->
     S = Data#eldap.fd,
     log2(Data, "search request = ~p~n", [Req]),
-    send_request(S, Data, ID, {searchRequest, Req}),
+    send_request(S, Data, ID, {searchRequest, Req, Controls}),
     Resp = recv_response(S, Data),
     log2(Data, "search reply = ~p~n", [Resp]),
     collect_search_responses(Data, S, ID, Resp, [], []).
@@ -732,6 +772,8 @@ collect_search_responses(Data, S, ID, {ok,Msg}, Acc, Ref)
                 success ->
                     log2(Data, "search reply = searchResDone ~n", []),
                     {ok,Acc,Ref,Data};
+		referral -> 
+		    {{ok, {referral,R#'LDAPResult'.referral}}, Data};
                 Reason ->
                     {{error,Reason},Data}
             end;
@@ -756,21 +798,22 @@ collect_search_responses(_, _, _, Else, _, _) ->
 %%% addRequest
 %%% --------------------------------------------------------------------
 
-do_add(Data, Entry, Attrs) ->
-    case catch do_add_0(Data, Entry, Attrs) of
+do_add(Data, Entry, Attrs, Controls) ->
+    case catch do_add_0(Data, Entry, Attrs, Controls) of
 	{error,Emsg}   -> {ldap_closed_p(Data, Emsg),Data};
 	{'EXIT',Error} -> {ldap_closed_p(Data, Error),Data};
 	{ok,NewData}   -> {ok,NewData};
+	{{ok,Val},NewData} -> {{ok,Val},NewData};
 	Else           -> {ldap_closed_p(Data, Else),Data}
     end.
 
-do_add_0(Data, Entry, Attrs) ->
+do_add_0(Data, Entry, Attrs, Controls) ->
     Req = #'AddRequest'{entry = Entry,
 			attributes = Attrs},
     S = Data#eldap.fd,
     Id = bump_id(Data),
     log2(Data, "add request = ~p~n", [Req]),
-    Resp = request(S, Data, Id, {addRequest, Req}),
+    Resp = request(S, Data, Id, {addRequest, Req, Controls}),
     log2(Data, "add reply = ~p~n", [Resp]),
     check_reply(Data#eldap{id = Id}, Resp, addResponse).
 
@@ -779,19 +822,20 @@ do_add_0(Data, Entry, Attrs) ->
 %%% deleteRequest
 %%% --------------------------------------------------------------------
 
-do_delete(Data, Entry) ->
-    case catch do_delete_0(Data, Entry) of
+do_delete(Data, Entry, Controls) ->
+    case catch do_delete_0(Data, Entry, Controls) of
 	{error,Emsg}   -> {ldap_closed_p(Data, Emsg),Data};
 	{'EXIT',Error} -> {ldap_closed_p(Data, Error),Data};
 	{ok,NewData}   -> {ok,NewData};
+	{{ok,Val},NewData} -> {{ok,Val},NewData};
 	Else           -> {ldap_closed_p(Data, Else),Data}
     end.
 
-do_delete_0(Data, Entry) ->
+do_delete_0(Data, Entry, Controls) ->
     S = Data#eldap.fd,
     Id = bump_id(Data),
     log2(Data, "del request = ~p~n", [Entry]),
-    Resp = request(S, Data, Id, {delRequest, Entry}),
+    Resp = request(S, Data, Id, {delRequest, Entry, Controls}),
     log2(Data, "del reply = ~p~n", [Resp]),
     check_reply(Data#eldap{id = Id}, Resp, delResponse).
 
@@ -800,22 +844,23 @@ do_delete_0(Data, Entry) ->
 %%% modifyRequest
 %%% --------------------------------------------------------------------
 
-do_modify(Data, Obj, Mod) ->
-    case catch do_modify_0(Data, Obj, Mod) of
+do_modify(Data, Obj, Mod, Controls) ->
+    case catch do_modify_0(Data, Obj, Mod, Controls) of
 	{error,Emsg}   -> {ldap_closed_p(Data, Emsg),Data};
 	{'EXIT',Error} -> {ldap_closed_p(Data, Error),Data};
 	{ok,NewData}   -> {ok,NewData};
+	{{ok,Val},NewData} -> {{ok,Val},NewData};
 	Else           -> {ldap_closed_p(Data, Else),Data}
     end.
 
-do_modify_0(Data, Obj, Mod) ->
+do_modify_0(Data, Obj, Mod, Controls) ->
     v_modifications(Mod),
     Req = #'ModifyRequest'{object = Obj,
 			   changes = Mod},
     S = Data#eldap.fd,
     Id = bump_id(Data),
     log2(Data, "modify request = ~p~n", [Req]),
-    Resp = request(S, Data, Id, {modifyRequest, Req}),
+    Resp = request(S, Data, Id, {modifyRequest, Req, Controls}),
     log2(Data, "modify reply = ~p~n", [Resp]),
     check_reply(Data#eldap{id = Id}, Resp, modifyResponse).
 
@@ -825,16 +870,17 @@ do_modify_0(Data, Obj, Mod) ->
 
 -define(PASSWD_MODIFY_OID, "1.3.6.1.4.1.4203.1.11.1").
 
-do_passwd_modify(Data, Dn, NewPasswd, OldPasswd) ->
-    case catch do_passwd_modify_0(Data, Dn, NewPasswd, OldPasswd) of
+do_passwd_modify(Data, Dn, NewPasswd, OldPasswd, Controls) ->
+    case catch do_passwd_modify_0(Data, Dn, NewPasswd, OldPasswd, Controls) of
 	{error,Emsg}        -> {ldap_closed_p(Data, Emsg),Data};
 	{'EXIT',Error}      -> {ldap_closed_p(Data, Error),Data};
 	{ok,NewData}        -> {ok,NewData};
+	{{ok,Val},NewData}  -> {{ok,Val},NewData};
         {ok,Passwd,NewData} -> {{ok, Passwd},NewData};
 	Else                -> {ldap_closed_p(Data, Else),Data}
     end.
 
-do_passwd_modify_0(Data, Dn, NewPasswd, OldPasswd) ->
+do_passwd_modify_0(Data, Dn, NewPasswd, OldPasswd, Controls) ->
     Req = #'PasswdModifyRequestValue'{userIdentity = Dn,
                                       oldPasswd = OldPasswd,
                                       newPasswd = NewPasswd},
@@ -844,7 +890,7 @@ do_passwd_modify_0(Data, Dn, NewPasswd, OldPasswd) ->
                              requestValue = Bytes},
     Id = bump_id(Data),
     log2(Data, "extended request = ~p~n", [ExtReq]),
-    Reply = request(Data#eldap.fd, Data, Id, {extendedReq, ExtReq}),
+    Reply = request(Data#eldap.fd, Data, Id, {extendedReq, ExtReq, Controls}),
     log2(Data, "modify password reply = ~p~n", [Reply]),
     exec_passwd_modify_reply(Data#eldap{id = Id}, Reply).
 
@@ -865,6 +911,8 @@ exec_passwd_modify_reply(Data, {ok,Msg}) when
                                     throw(Error)
                             end
                     end;
+		referral ->
+		    {{ok, {referral,Result#'ExtendedResponse'.referral}}, Data};
 		Error ->
 		    {error, {response,Error}}
 	    end;
@@ -877,15 +925,16 @@ exec_passwd_modify_reply(_, Error) ->
 %%% modifyDNRequest
 %%% --------------------------------------------------------------------
 
-do_modify_dn(Data, Entry, NewRDN, DelOldRDN, NewSup) ->
-    case catch do_modify_dn_0(Data, Entry, NewRDN, DelOldRDN, NewSup) of
+do_modify_dn(Data, Entry, NewRDN, DelOldRDN, NewSup, Controls) ->
+    case catch do_modify_dn_0(Data, Entry, NewRDN, DelOldRDN, NewSup, Controls) of
 	{error,Emsg}   -> {ldap_closed_p(Data, Emsg),Data};
 	{'EXIT',Error} -> {ldap_closed_p(Data, Error),Data};
 	{ok,NewData}   -> {ok,NewData};
+	{{ok,Val},NewData} -> {{ok,Val},NewData};
 	Else           -> {ldap_closed_p(Data, Else),Data}
     end.
 
-do_modify_dn_0(Data, Entry, NewRDN, DelOldRDN, NewSup) ->
+do_modify_dn_0(Data, Entry, NewRDN, DelOldRDN, NewSup, Controls) ->
     Req = #'ModifyDNRequest'{entry = Entry,
 			     newrdn = NewRDN,
 			     deleteoldrdn = DelOldRDN,
@@ -893,22 +942,51 @@ do_modify_dn_0(Data, Entry, NewRDN, DelOldRDN, NewSup) ->
     S = Data#eldap.fd,
     Id = bump_id(Data),
     log2(Data, "modify DN request = ~p~n", [Req]),
-    Resp = request(S, Data, Id, {modDNRequest, Req}),
+    Resp = request(S, Data, Id, {modDNRequest, Req, Controls}),
     log2(Data, "modify DN reply = ~p~n", [Resp]),
     check_reply(Data#eldap{id = Id}, Resp, modDNResponse).
 
+%%%--------------------------------------------------------------------
+%%% unbindRequest
+%%%--------------------------------------------------------------------
+do_unbind(Data) ->
+    Req = "",
+    log2(Data, "unbind request = ~p (has no reply)~n", [Req]),
+    send_request(Data#eldap.fd, Data, Data#eldap.id, {unbindRequest, Req}),
+    case Data#eldap.using_tls of
+	true -> ssl:close(Data#eldap.fd);
+	false -> gen_tcp:close(Data#eldap.fd)
+    end,
+    {no_reply, Data#eldap{binddn = (#eldap{})#eldap.binddn,
+			  passwd = (#eldap{})#eldap.passwd,
+			  fd     = (#eldap{})#eldap.fd,
+			  using_tls = false
+			 }}.
+
+
 %%% --------------------------------------------------------------------
 %%% Send an LDAP request and receive the answer
 %%% --------------------------------------------------------------------
-
 request(S, Data, ID, Request) ->
     send_request(S, Data, ID, Request),
     recv_response(S, Data).
 
-send_request(S, Data, ID, Request) ->
-    Message = #'LDAPMessage'{messageID  = ID,
-			     protocolOp = Request},
-    {ok,Bytes} = 'ELDAPv3':encode('LDAPMessage', Message),
+send_request(S, Data, Id, {T,P}) ->
+    send_the_LDAPMessage(S, Data, #'LDAPMessage'{messageID = Id,
+						 protocolOp = {T,P}});
+send_request(S, Data, Id, {T,P,asn1_NOVALUE}) ->
+    send_the_LDAPMessage(S, Data, #'LDAPMessage'{messageID = Id,
+						 protocolOp = {T,P}});
+send_request(S, Data, Id, {T,P,Controls0}) ->
+    Controls = [#'Control'{controlType=F1,
+			   criticality=F2,
+			   controlValue=F3} || {control,F1,F2,F3} <- Controls0],
+    send_the_LDAPMessage(S, Data, #'LDAPMessage'{messageID = Id,
+						 protocolOp = {T,P},
+						 controls = Controls}).
+
+send_the_LDAPMessage(S, Data, LDAPMessage) ->
+    {ok,Bytes} = 'ELDAPv3':encode('LDAPMessage', LDAPMessage),
     case do_send(S, Data, Bytes) of
 	{error,Reason} -> throw({gen_tcp_error,Reason});
 	Else           -> Else
@@ -942,6 +1020,7 @@ check_reply(Data, {ok,Msg}, Op) when
 	{Op, Result} ->
 	    case Result#'LDAPResult'.resultCode of
 		success -> {ok,Data};
+		referral -> {{ok, {referral,Result#'LDAPResult'.referral}}, Data};
 		Error   -> {error, Error}
 	    end;
 	Other -> {error, Other}
@@ -1022,10 +1101,13 @@ log(_, _, _, _) ->
 %%% Misc. routines
 %%% --------------------------------------------------------------------
 
-send(To,Msg) -> To ! {self(),Msg}.
+send(To,Msg) ->
+    To ! {self(), Msg},
+    ok.
+
 recv(From)   ->
     receive
-	{From,Msg} -> Msg;
+	{From, Msg} -> Msg;
 	{'EXIT', From, Reason} ->
 	    {error, {internal_error, Reason}}
     end.
diff --git a/lib/eldap/test/eldap_basic_SUITE.erl b/lib/eldap/test/eldap_basic_SUITE.erl
index 638a609346..4c1c2f8144 100644
--- a/lib/eldap/test/eldap_basic_SUITE.erl
+++ b/lib/eldap/test/eldap_basic_SUITE.erl
@@ -23,13 +23,18 @@
 -compile(export_all).
 
 %%-include_lib("common_test/include/ct.hrl").
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("eldap/include/eldap.hrl").
 -include_lib("eldap/ebin/ELDAPv3.hrl").
 
 
 -define(TIMEOUT, 120000). % 2 min
 
+
+%% Control to delete a referral object:
+-define(manageDsaIT, {control,"2.16.840.1.113730.3.4.2",false,asn1_NOVALUE}).
+
+
 all() ->
     [app,
      appup,
@@ -59,6 +64,7 @@ groups() ->
      {api_bound, [], [add_when_bound,
 		      add_already_exists,
 		      more_add,
+		      add_referral,
 		      search_filter_equalityMatch,
 		      search_filter_substring_any,
 		      search_filter_initial,
@@ -67,8 +73,11 @@ groups() ->
 		      search_filter_or,
 		      search_filter_and_not,
 		      search_two_hits,
+		      search_referral,
 		      modify,
+		      modify_referral,
 		      delete,
+		      delete_referral,
 		      modify_dn_delete_old,
 		      modify_dn_keep_old]},
      {v4_connections, [], connection_tests()},
@@ -92,11 +101,16 @@ connection_tests() ->
 
 init_per_suite(Config) ->
     SSL_available = init_ssl_certs_et_al(Config),
-    LDAP_server =  find_first_server(false, [{config,eldap_server}, {config,ldap_server}, {"localhost",9876}]),
+    LDAP_server =  find_first_server(false, [{config,eldap_server},
+					     {config,ldap_server}, 
+					     {"localhost",9876},
+					     {"aramis.otp.ericsson.se",9876}]),
     LDAPS_server =
 	case SSL_available of
 	    true ->
-		find_first_server(true,  [{config,ldaps_server}, {"localhost",9877}]);
+		find_first_server(true,  [{config,ldaps_server},
+					  {"localhost",9877},
+					  {"aramis.otp.ericsson.se",9877}]);
 	    false ->
 		undefined
 	end,
@@ -454,6 +468,16 @@ more_add(Config) ->
 		   [{"objectclass", ["organizationalUnit"]},
 		    {"ou", ["Team"]}]).
 
+%%%----------------------------------------------------------------
+add_referral(Config) ->
+    H = ?config(handle, Config),
+    BasePath = ?config(eldap_path, Config),
+    {ok,{referral,["ldap://nowhere.example.com"++_]}} =
+	eldap:add(H, "cn=Foo Bar,dc=notHere," ++ BasePath,
+		  [{"objectclass", ["person"]},
+		   {"cn", ["Foo Bar"]},
+		   {"sn", ["Bar"]},
+		   {"telephoneNumber", ["555-1232", "555-5432"]}]).
 
 %%%----------------------------------------------------------------
 search_filter_equalityMatch(Config) ->
@@ -569,6 +593,16 @@ search_two_hits(Config) ->
     [ok=eldap:delete(H,DN) || DN <- ExpectedDNs].
 
 %%%----------------------------------------------------------------
+search_referral(Config) ->
+    H = ?config(handle, Config),
+    BasePath = ?config(eldap_path, Config),
+    DN = "cn=Santa Claus,dc=notHere," ++ BasePath,
+    {ok,{referral,["ldap://nowhere.example.com"++_]}} =
+	eldap:search(H, #eldap_search{base = DN,
+				      filter = eldap:present("description"),
+				      scope=eldap:singleLevel()}).
+
+%%%----------------------------------------------------------------
 modify(Config) ->
     H = ?config(handle, Config),
     BasePath = ?config(eldap_path, Config),
@@ -602,6 +636,19 @@ modify(Config) ->
     restore_original_object(H, DN, OriginalAttrs).
 
 %%%----------------------------------------------------------------
+modify_referral(Config) ->
+    H = ?config(handle, Config),
+    BasePath = ?config(eldap_path, Config),
+    %% The object to modify
+    DN = "cn=Foo Bar,dc=notHere," ++ BasePath,
+
+    %% Do a change
+    Mod = [eldap:mod_replace("telephoneNumber", ["555-12345"]),
+	   eldap:mod_add("description", ["Nice guy"])],
+    {ok,{referral,["ldap://nowhere.example.com"++_]}} =
+	eldap:modify(H, DN, Mod).
+
+%%%----------------------------------------------------------------
 delete(Config) ->
     H = ?config(handle, Config),
     BasePath = ?config(eldap_path, Config),
@@ -620,6 +667,14 @@ delete(Config) ->
     restore_original_object(H, DN, OriginalAttrs).
 
 %%%----------------------------------------------------------------
+delete_referral(Config) ->
+    H = ?config(handle, Config),
+    BasePath = ?config(eldap_path, Config),
+    %% The element to play with:
+    DN = "cn=Jonas Jonsson,dc=notHere," ++ BasePath,
+    {ok,{referral,["ldap://nowhere.example.com"++_]}} = eldap:delete(H, DN).
+
+%%%----------------------------------------------------------------
 modify_dn_delete_old(Config) ->
     H = ?config(handle, Config),
     BasePath = ?config(eldap_path, Config),
@@ -817,25 +872,44 @@ delete_old_contents(H, Path) ->
 			  {filter, eldap:present("objectclass")},
 			  {scope,  eldap:wholeSubtree()}])
     of
-	{ok, #eldap_search_result{entries=Entries}} ->
+	{ok, _R=#eldap_search_result{entries=Entries}} ->
+	    case eldap:delete(H, "dc=notHere,"++Path, [?manageDsaIT]) of
+		ok -> ok;
+		{error,noSuchObject} -> ok;
+		Other -> ct:fail("eldap:delete notHere ret ~p",[Other])
+	    end,
 	    [ok = eldap:delete(H,DN) || #eldap_entry{object_name=DN} <- Entries];
 	_Res ->
 	    ignore
     end.
 
+
+-define(ok(X), ok(?MODULE,?LINE,X)).
+
 add_new_contents(H, Path, MyHost) ->
-    ok(eldap:add(H,"dc=ericsson,dc=se",
+    ?ok(eldap:add(H,"dc=ericsson,dc=se",
 		 [{"objectclass", ["dcObject", "organization"]},
 		  {"dc", ["ericsson"]},
 		  {"o", ["Testing"]}])),
-    ok(eldap:add(H,Path,
+    ?ok(eldap:add(H,Path,
 		 [{"objectclass", ["dcObject", "organization"]},
 		  {"dc", [MyHost]},
-		  {"o", ["Test machine"]}])).
-
-
-ok({error,entryAlreadyExists}) -> ok;
-ok(X) -> ok=X.
+		  {"o", ["Test machine"]}])),
+    ?ok(eldap:add(H,  "dc=notHere,"++Path,
+		  [{"objectclass", ["referral", 
+				    "dcObject"
+				   ]},
+		   {"ref", ["ldap://nowhere.example.com/notHere,"++Path]},
+		   {"dc", ["notHere"]}
+		  ])).
+
+
+
+ok(_, _, {error,entryAlreadyExists}) -> ok;
+ok(_, _, ok) -> ok;
+ok(MODULE, LINE, X) -> 
+    ct:pal("~p:~p add_new_contents: ret from eldap:add = ~p",[MODULE,LINE,X]),
+    X.
 
 
 
diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk
index 105a2bcdbb..99c474d588 100644
--- a/lib/eldap/vsn.mk
+++ b/lib/eldap/vsn.mk
@@ -1 +1 @@
-ELDAP_VSN = 1.2
+ELDAP_VSN = 1.2.1
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index aa8bf14919..f70b3c8404 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -31,7 +31,22 @@
   </header>
   <p>This document describes the changes made to the <em>erl_docgen</em> application.</p>
 
-  <section><title>Erl_Docgen 0.4.1</title>
+  <section><title>Erl_Docgen 0.4.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Correctly generate anno tags for maps keys</p>
+          <p>
+	    Own Id: OTP-12955</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 0.4.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css
index 0b531db701..347782eb1e 100644
--- a/lib/erl_docgen/priv/css/otp_doc.css
+++ b/lib/erl_docgen/priv/css/otp_doc.css
@@ -37,7 +37,7 @@ a:visited      { color: blue; text-decoration: none }
   top: 0;
   bottom: 0;
   left: 0;
-  width: 200px;
+  width: 300px;
   overflow:auto;
   margin: 0;
   padding: 1px;
@@ -45,7 +45,7 @@ a:visited      { color: blue; text-decoration: none }
 }
 
 #content {
-  margin-left: 240px; /* set left value to WidthOfFrameDiv */
+  margin-left: 340px; /* set left value to WidthOfFrameDiv */
 }
 
 .frontpage 
diff --git a/lib/erl_docgen/src/docgen_otp_specs.erl b/lib/erl_docgen/src/docgen_otp_specs.erl
index 37baa7c2f9..e154323f07 100644
--- a/lib/erl_docgen/src/docgen_otp_specs.erl
+++ b/lib/erl_docgen/src/docgen_otp_specs.erl
@@ -729,5 +729,9 @@ annos_type([E=#xmlElement{name = typevar}]) ->
     annos_elem(E);
 annos_type([#xmlElement{name = paren, content = Es}]) ->
     annos(get_elem(type, Es));
+annos_type([#xmlElement{name = map, content = Es}]) ->
+    lists:flatmap(fun(E) -> annos_type([E]) end, Es);
+annos_type([#xmlElement{name = map_field, content = Es}]) ->
+    lists:flatmap(fun annos_elem/1, get_elem(type,Es));
 annos_type(_) ->
     [].
diff --git a/lib/erl_docgen/test/Makefile b/lib/erl_docgen/test/Makefile
index 9f4cc04105..9e58157023 100644
--- a/lib/erl_docgen/test/Makefile
+++ b/lib/erl_docgen/test/Makefile
@@ -25,7 +25,7 @@ RELSYSDIR = $(RELEASE_PATH)/erl_docgen_test
 # ----------------------------------------------------
 
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 43f5a570d7..3188b926ff 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 0.4.1
+ERL_DOCGEN_VSN = 0.4.2
diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in
index 3ac9212085..7a3b5ce378 100644
--- a/lib/erl_interface/configure.in
+++ b/lib/erl_interface/configure.in
@@ -251,7 +251,7 @@ case "$threads_disabled" in
 	        ;;
 	    win32_threads)
 		EI_THREADS="true"	
-		THR_DEFS="$THR_DEFS -D_WIN32_WINNT=0x0500 -DWINVER=0x0500"
+		THR_DEFS="$THR_DEFS -D_WIN32_WINNT=0x0600 -DWINVER=0x0600"
 		;;
 	    pthread)	
 		EI_THREADS="true"
diff --git a/lib/erl_interface/doc/src/ei.xml b/lib/erl_interface/doc/src/ei.xml
index 6044ac8ef7..8ef433d10f 100644
--- a/lib/erl_interface/doc/src/ei.xml
+++ b/lib/erl_interface/doc/src/ei.xml
@@ -264,9 +264,9 @@ typedef enum {
       <fsummary>Encode an atom</fsummary>
       <desc>
         <p>Encodes an atom in the binary format with character encoding
-	<c><seealso marker="#erlang_char_encoding">to_enc</seealso></c> (latin1 or utf8).
+	<seealso marker="#erlang_char_encoding"><c>to_enc</c></seealso> (latin1 or utf8).
 	The <c>p</c> parameter is the name of the atom with character encoding
-	<c><seealso marker="#erlang_char_encoding">from_enc</seealso></c>  (ascii, latin1 or utf8).
+	<seealso marker="#erlang_char_encoding"><c>from_enc</c></seealso>  (ascii, latin1 or utf8).
 	The name must either be zero-terminated or a function variant with a <c>len</c>
 	parameter must be used. If <c>to_enc</c> is set to the bitwise-or'd combination
 	<c>(ERLANG_LATIN1|ERLANG_UTF8)</c>, utf8 encoding is only used if the atom string
@@ -569,8 +569,8 @@ ei_x_encode_string(&amp;x, "Banana");
         <p>This function decodes an atom from the binary format. The
 	null terminated name of the atom is placed in buffer at <c>p</c> of length
 	<c>plen</c> bytes.</p>
-	<p>The wanted string encoding is specified by <c><seealso marker="#erlang_char_encoding">
-	want</seealso></c>. The original encoding used in the
+	<p>The wanted string encoding is specified by <seealso marker="#erlang_char_encoding">
+	<c>want</c></seealso>. The original encoding used in the
 	binary format (latin1 or utf8) can be obtained from <c>*was</c>. The actual encoding of the resulting string
 	(7-bit ascii, latin1 or utf8) can be obtained from <c>*result</c>. Both <c>was</c> and <c>result</c> can be <c>NULL</c>.
 	
diff --git a/lib/erl_interface/doc/src/erl_call.xml b/lib/erl_interface/doc/src/erl_call.xml
index aed1ba0ac9..e982bf89e1 100644
--- a/lib/erl_interface/doc/src/erl_call.xml
+++ b/lib/erl_interface/doc/src/erl_call.xml
@@ -178,7 +178,7 @@ erl_call -s -a 'erlang halt' -n madonna
     <code type="none"><![CDATA[
 erl_call -s -a 'lists map [{math,sqrt},[1,4,9,16,25]]' -n madonna
     ]]></code>
-    <p>Evaluates a couple of expressions. <b>The input ends with EOF (Control-D)</b>.</p>
+    <p>Evaluates a couple of expressions. <em>The input ends with EOF (Control-D)</em>.</p>
     <code type="none"><![CDATA[
 erl_call -s -e -n madonna
 statistics(runtime),
@@ -189,7 +189,7 @@ Y=2,
 ^D
 {ok,{3,0}}
     ]]></code>
-    <p>Compiles a module and runs it. <b>Again, the input ends with EOF (Control-D)</b>. (In the example shown, the output has been formatted afterwards).</p>
+    <p>Compiles a module and runs it. <em>Again, the input ends with EOF (Control-D)</em>. (In the example shown, the output has been formatted afterwards).</p>
     <code type="none"><![CDATA[
 erl_call -s -m -a lolita -n madonna
 -module(lolita).
diff --git a/lib/erl_interface/doc/src/erl_eterm.xml b/lib/erl_interface/doc/src/erl_eterm.xml
index 9a53a137c2..713a90a390 100644
--- a/lib/erl_interface/doc/src/erl_eterm.xml
+++ b/lib/erl_interface/doc/src/erl_eterm.xml
@@ -78,10 +78,12 @@
       </p>
     <taglist>
       <tag><c><![CDATA[char *ERL_ATOM_PTR(t)]]></c></tag>
+      <item/>
       <tag><c><![CDATA[char *ERL_ATOM_PTR_UTF8(t)]]></c></tag>
       <item>A string representing atom <c><![CDATA[t]]></c>.
       </item>
       <tag><c><![CDATA[int ERL_ATOM_SIZE(t)]]></c></tag>
+      <item/>
       <tag><c><![CDATA[int ERL_ATOM_SIZE_UTF8(t)]]></c></tag>
       <item>The length (in bytes) of atom t.</item>
       <tag><c><![CDATA[void *ERL_BIN_PTR(t)]]></c></tag>
@@ -95,6 +97,7 @@
       <tag><c><![CDATA[double ERL_FLOAT_VALUE(t)]]></c></tag>
       <item>The floating point value of <c><![CDATA[t]]></c>.</item>
       <tag><c><![CDATA[ETERM *ERL_PID_NODE(t)]]></c></tag>
+      <item/>
       <tag><c><![CDATA[ETERM *ERL_PID_NODE_UTF8(t)]]></c></tag>
       <item>The Node in pid <c><![CDATA[t]]></c>.</item>
       <tag><c><![CDATA[int ERL_PID_NUMBER(t)]]></c></tag>
@@ -108,6 +111,7 @@
       <tag><c><![CDATA[int ERL_PORT_CREATION(t)]]></c></tag>
       <item>The creation number in port <c><![CDATA[t]]></c>.</item>
       <tag><c><![CDATA[ETERM *ERL_PORT_NODE(t)]]></c></tag>
+      <item/>
       <tag><c><![CDATA[ETERM *ERL_PORT_NODE_UTF8(t)]]></c></tag>
       <item>The node in port <c><![CDATA[t]]></c>.</item>
       <tag><c><![CDATA[int ERL_REF_NUMBER(t)]]></c></tag>
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 6d951e895f..37266d9354 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,6 +31,36 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.8.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix Erl_Interface build error on Debian/Hurd and
+	    Debian/kFreeBSD. (Thanks to Sergei Golovan)</p>
+          <p>
+	    Own Id: OTP-13328</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    EPMD supports both IPv4 and IPv6</p>
+          <p>
+	    Also affects oldest supported windows version.</p>
+          <p>
+	    Own Id: OTP-13364</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.8.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
index 777d709b1e..d6176ec053 100644
--- a/lib/erl_interface/src/Makefile.in
+++ b/lib/erl_interface/src/Makefile.in
@@ -126,11 +126,7 @@ else
 WARNFLAGS = @WFLAGS@
 endif
 
-ifneq ($(findstring ose,$(TARGET)),ose)
 CFLAGS = @LIB_CFLAGS@ $(WARNFLAGS) $(INCFLAGS) $(TYPE_FLAGS)
-else
-CFLAGS = @CFLAGS@ $(INCFLAGS)
-endif
 PROG_CFLAGS = @CFLAGS@ $(WARNFLAGS) $(INCFLAGS) $(TYPE_FLAGS) -Ilegacy
 
 ifeq ($(findstring vxworks,$(TARGET)),vxworks)
@@ -210,12 +206,8 @@ MDD_ERLLIB = $(OBJDIR)/$(LIBPRE)erl_interface_mdd$(LIBEXT)
 #  Specify targets to build
 ###########################################################################
 
-ifneq ($(findstring ose,$(TARGET)),ose)
 EXE_TARGETS = \
 	$(ERL_CALL)
-else
-EXE_TARGETS = 
-endif
 
 ifeq ($(USING_VC),yes)
 
@@ -480,44 +472,6 @@ ERLSOURCES = \
 
 SOURCES = $(EISOURCES) $(ERLSOURCES)
 
-OSE_EISOURCES =  \
-	$(DECODESRC) \
-	$(ENCODESRC) \
-	misc/ei_decode_term.c \
-	misc/ei_format.c \
-	misc/ei_locking.c \
-	misc/ei_malloc.c \
-	misc/ei_printterm.c \
-	misc/ei_pthreads.c \
-	misc/ei_trace.c \
-	misc/ei_x_encode.c \
-	misc/eimd5.c \
-	misc/get_type.c \
-	misc/show_msg.c \
-	misc/ei_compat.c \
-	registry/hash_dohash.c \
-	registry/hash_foreach.c \
-	registry/hash_freetab.c \
-	registry/hash_insert.c \
-	registry/hash_isprime.c \
-	registry/hash_lookup.c \
-	registry/hash_newtab.c \
-	registry/hash_remove.c \
-	registry/hash_resize.c \
-	registry/hash_rlookup.c
-
-OSE_ERLSOURCES = \
-	legacy/decode_term.c \
-	legacy/encode_term.c \
-	legacy/erl_error.c \
-	legacy/erl_eterm.c \
-	legacy/erl_fix_alloc.c \
-	legacy/erl_format.c \
-	legacy/erl_malloc.c \
-	legacy/erl_marshal.c
-
-OSE_SOURCES = $(OSE_EISOURCES) $(OSE_ERLSOURCES)
-
 NEVERUSED = \
 	whereis.c \
 	ei_send.c \
@@ -532,13 +486,8 @@ ERLCALL = \
 # Note that encode/decode_term.c defines ei functions that is
 # located in the erl_interface library, not ei library.
 
-ifneq ($(findstring ose,$(TARGET)),ose)
 ST_EIOBJECTS  = $(addprefix $(ST_OBJDIR)/,$(notdir $(EISOURCES:.c=.o)))
 ST_ERLOBJECTS = $(addprefix $(ST_OBJDIR)/,$(notdir $(ERLSOURCES:.c=.o)))
-else
-ST_EIOBJECTS  = $(addprefix $(ST_OBJDIR)/,$(notdir $(OSE_EISOURCES:.c=.o)))
-ST_ERLOBJECTS = $(addprefix $(ST_OBJDIR)/,$(notdir $(OSE_ERLSOURCES:.c=.o)))
-endif
 MT_EIOBJECTS  = $(addprefix $(MT_OBJDIR)/,$(notdir $(EISOURCES:.c=.o)))
 MT_ERLOBJECTS = $(addprefix $(MT_OBJDIR)/,$(notdir $(ERLSOURCES:.c=.o)))
 MD_EIOBJECTS  = $(addprefix $(MD_OBJDIR)/,$(notdir $(EISOURCES:.c=.o)))
@@ -587,14 +536,6 @@ $(TARGET)/config.h:
 	$(V_at)echo "#define HAVE_SOCKLEN_T 1" >> $@
 endif
 
-ifeq ($(findstring ose,$(TARGET)),ose)
-$(TARGET)/config.h:
-	$(gen_verbose)
-	$(V_at)echo "/* Generated by Makefile */" > $@
-	$(V_at)echo "#define HAVE_STRERROR 1" >> $@
-	$(V_at)echo "#define HAVE_SOCKLEN_T 1" >> $@
-endif
-
 ###########################################################################
 #  Default rules, normal and threaded
 ###########################################################################
@@ -719,9 +660,6 @@ $(ST_OBJDIR)/erl_start.o: prog/erl_start.c
 	$(V_CC) $(CFLAGS) -c $< -o $@
 
 else
-ifeq ($(findstring ose,$(TARGET)),ose)
-$(ERL_CALL):
-else
 ifdef THR_DEFS
 $(ERL_CALL): $(ERLCALL) ../include/ei.h $(MT_EILIB)
 	$(ld_verbose)$(PURIFY) $(CC) $(PROG_CFLAGS) $(THR_DEFS) $(LDFLAGS) -o $@ $(ERLCALL) \
@@ -733,7 +671,6 @@ $(ERL_CALL): $(ERLCALL) ../include/ei.h $(ST_EILIB)
 endif
 endif
 endif
-endif
 
 ###########################################################################
 #  Fake application targets used to test header files and linking
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c
index 6381b02393..414cb8be3e 100644
--- a/lib/erl_interface/src/connect/ei_resolve.c
+++ b/lib/erl_interface/src/connect/ei_resolve.c
@@ -601,16 +601,6 @@ struct hostent *ei_gethostbyaddr(const char *addr, int len, int type)
     return gethostbyaddr(addr, len, type);
 }
 
-/*
- * Imprecise way to select the actually available gethostbyname_r and
- * gethostbyaddr_r.
- *
- * TODO: check this properly in configure.in
- */
-#if (defined(__linux__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__))
-    #define HAVE_GETHOSTBYADDR_R_8   1
-#endif
-
 struct hostent *ei_gethostbyaddr_r(const char *addr,
 				int length, 
 				int type, 
@@ -626,7 +616,7 @@ struct hostent *ei_gethostbyaddr_r(const char *addr,
 #ifndef HAVE_GETHOSTBYNAME_R
   return my_gethostbyaddr_r(addr,length,type,hostp,buffer,buflen,h_errnop);
 #else
-#ifdef HAVE_GETHOSTBYADDR_R_8
+#if (defined(__GLIBC__) || defined(__linux__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__))
   struct hostent *result;
 
   gethostbyaddr_r(addr, length, type, hostp, buffer, buflen, &result,
@@ -653,7 +643,7 @@ struct hostent *ei_gethostbyname_r(const char *name,
 #ifndef HAVE_GETHOSTBYNAME_R
   return my_gethostbyname_r(name,hostp,buffer,buflen,h_errnop);
 #else
-#ifdef HAVE_GETHOSTBYADDR_R_8
+#if (defined(__GLIBC__) || defined(__linux__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__))
   struct hostent *result;
 
   gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop);
diff --git a/lib/erl_interface/test/all_SUITE_data/ei_runner.c b/lib/erl_interface/test/all_SUITE_data/ei_runner.c
index 3a0de22df4..2b0d6c856a 100644
--- a/lib/erl_interface/test/all_SUITE_data/ei_runner.c
+++ b/lib/erl_interface/test/all_SUITE_data/ei_runner.c
@@ -198,8 +198,8 @@ void free_packet(char* packet)
  * -----		----------------------------
  * [$b|Bytes]		{bytes, Bytes}
  * [$e]			eot
- * [$f]			test_server:fail()
- * [$f|Reason]		test_server:fail(Reason)
+ * [$f]			ct:fail()
+ * [$f|Reason]		ct:fail(Reason)
  * [$t|EncodedTerm]	{term, Term}
  * [$N]			'NULL'
  * [$m|Message]		io:format("~s", [Message])   (otherwise ignored)
@@ -211,7 +211,7 @@ void free_packet(char* packet)
  * you implement a test case entirely in C code.
  *
  * If the ok argument is zero, a [$f] reply will be sent to the
- * Erlang side (causing test_server:fail() to be called); otherwise,
+ * Erlang side (causing ct:fail() to be called); otherwise,
  * the atom 'eot' will be sent to Erlang.
  *
  * If you need to provide more details on a failure, use the fail() function.
@@ -251,7 +251,7 @@ do_report(file, line, ok)
 
 
 /*
- * This function causes a call to test_server:fail(Reason) on the
+ * This function causes a call to ct:fail(Reason) on the
  * Erlang side.
  */
 
diff --git a/lib/erl_interface/test/all_SUITE_data/runner.c b/lib/erl_interface/test/all_SUITE_data/runner.c
index 47d918308d..2332db2220 100644
--- a/lib/erl_interface/test/all_SUITE_data/runner.c
+++ b/lib/erl_interface/test/all_SUITE_data/runner.c
@@ -200,8 +200,8 @@ char *read_packet(int *len)
  * -----		----------------------------
  * [$b|Bytes]		{bytes, Bytes}
  * [$e]			eot
- * [$f]			test_server:fail()
- * [$f|Reason]		test_server:fail(Reason)
+ * [$f]			ct:fail()
+ * [$f|Reason]		ct:fail(Reason)
  * [$t|EncodedTerm]	{term, Term}
  * [$N]			'NULL'
  * [$m|Message]		io:format("~s", [Message])   (otherwise ignored)
@@ -213,7 +213,7 @@ char *read_packet(int *len)
  * you implement a test case entirely in C code.
  *
  * If the ok argument is zero, a [$f] reply will be sent to the
- * Erlang side (causing test_server:fail() to be called); otherwise,
+ * Erlang side (causing ct:fail() to be called); otherwise,
  * the atom 'eot' will be sent to Erlang.
  *
  * If you need to provide more details on a failure, use the fail() function.
@@ -253,7 +253,7 @@ do_report(file, line, ok)
 
 
 /*
- * This function causes a call to test_server:fail(Reason) on the
+ * This function causes a call to ct:fail(Reason) on the
  * Erlang side.
  */
 
diff --git a/lib/erl_interface/test/ei_accept_SUITE.erl b/lib/erl_interface/test/ei_accept_SUITE.erl
index 144ec99e0a..654f2a4235 100644
--- a/lib/erl_interface/test/ei_accept_SUITE.erl
+++ b/lib/erl_interface/test/ei_accept_SUITE.erl
@@ -21,97 +21,70 @@
 %%
 -module(ei_accept_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_accept_SUITE_data/ei_accept_test_cases.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,
-	 ei_accept/1, ei_threaded_accept/1]).
+-export([all/0, suite/0,
+         ei_accept/1, ei_threaded_accept/1]).
 
 -import(runner, [get_term/1,send_term/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 30}}].
 
 all() -> 
     [ei_accept, ei_threaded_accept].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:seconds(30)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
 ei_accept(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-
-    ?line Myname= hd(tl(string:tokens(atom_to_list(node()), "@"))),
-    ?line io:format("Myname ~p ~n",  [Myname]),
-    ?line EINode= list_to_atom("c42@"++Myname),
-    ?line io:format("EINode ~p ~n",  [EINode]),
-    ?line Self= self(),
-    ?line TermToSend= {call, Self, "Test"},
-    ?line F= fun() ->
-		     case waitfornode("c42",20) of
-			 true ->
-			     {any, EINode} ! TermToSend,
-			     Self ! sent_ok;
-			 false ->
-			     Self ! never_published
-		     end,
-		     ok
-	     end,
-
-    ?line spawn(F),
-    ?line Port  = 6543,
-    ?line {ok, Fd, _Node} = ei_accept(P, Port),
-    ?line TermReceived= ei_receive(P, Fd),
-    ?line io:format("Sent ~p received ~p ~n", [TermToSend, TermReceived]),
-    ?line TermToSend= TermReceived,
-    ?line receive
-	      sent_ok ->
-		  ok;
-	      Unknown ->
-		  io:format("~p ~n", [Unknown])
-	  after 1000 ->
-		  io:format("timeout ~n")
-	  end,
-    ?line runner:finish(P),
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+
+    Myname = hd(tl(string:tokens(atom_to_list(node()), "@"))),
+    io:format("Myname ~p ~n",  [Myname]),
+    EINode = list_to_atom("c42@"++Myname),
+    io:format("EINode ~p ~n",  [EINode]),
+    Self = self(),
+    TermToSend= {call, Self, "Test"},
+    F= fun() ->
+               case waitfornode("c42",20) of
+                   true ->
+                       {any, EINode} ! TermToSend,
+                       Self ! sent_ok;
+                   false ->
+                       Self ! never_published
+               end,
+               ok
+       end,
+
+    spawn(F),
+    Port = 6543,
+    {ok, Fd, _Node} = ei_accept(P, Port),
+    TermReceived= ei_receive(P, Fd),
+    io:format("Sent ~p received ~p ~n", [TermToSend, TermReceived]),
+    TermToSend= TermReceived,
+    receive
+        sent_ok ->
+            ok;
+        Unknown ->
+            io:format("~p ~n", [Unknown])
+    after 1000 ->
+              io:format("timeout ~n")
+    end,
+    runner:finish(P),
     ok.
 
 ei_threaded_accept(Config) when is_list(Config) ->
-    ?line Einode = filename:join(?config(data_dir, Config), "eiaccnode"),
-    ?line N = 1, % 3,
-    ?line Host = atom_to_list(node()),
-    ?line Port = 6767,
-    ?line start_einode(Einode, N, Host, Port),
-    ?line io:format("started eiaccnode"),
-    %%?line spawn_link(fun() -> start_einode(Einode, N, Host, Port) end),
-    ?line TestServerPid = self(),
-    ?line [ spawn_link(fun() -> send_rec_einode(I, TestServerPid) end)
-	    || I <- lists:seq(0, N-1) ],
-    ?line [ receive I -> ok end
-	    || I <- lists:seq(0, N-1) ],
+    Einode = filename:join(proplists:get_value(data_dir, Config), "eiaccnode"),
+    N = 1, % 3,
+    Host = atom_to_list(node()),
+    Port = 6767,
+    start_einode(Einode, N, Host, Port),
+    io:format("started eiaccnode"),
+    %%spawn_link(fun() -> start_einode(Einode, N, Host, Port) end),
+    TestServerPid = self(),
+    [spawn_link(fun() -> send_rec_einode(I, TestServerPid) end) || I <- lists:seq(0, N-1)],
+    [receive I -> ok end || I <- lists:seq(0, N-1) ],
     ok.
 
 waitfornode(String,0) ->
@@ -120,66 +93,61 @@ waitfornode(String,0) ->
 waitfornode(String,N) ->
     Registered = [X || {X,_} <- element(2,erl_epmd:names())],
     case lists:member(String,Registered) of
-	true ->
-	    true;
-	false ->
-	    timer:sleep(1000),
-	    waitfornode(String,N-1)
+        true ->
+            true;
+        false ->
+            timer:sleep(1000),
+            waitfornode(String,N-1)
     end.
 
 send_rec_einode(N, TestServerPid) ->
-    ?line Myname= hd(tl(string:tokens(atom_to_list(node()), "@"))),
-    ?line FirstPart = "eiacc" ++ integer_to_list(N),
-    ?line EINode= list_to_atom(FirstPart ++ "@" ++ Myname),
-    ?line io:format("EINode ~p ~n",  [EINode]),
-    ?line Self= self(),
-    ?line case waitfornode(FirstPart,20) of
-	      true -> ok;
-	      false -> test_server:fail({never_published,EINode})
-	  end,
-    ?line {any, EINode} ! Self,
-    ?line receive
-	      {N,_}=X ->
-		  ?line io:format("Received by ~s ~p~n", [EINode, X]),
-		  ?line TestServerPid ! N,
-		  ?line X
-	  after 10000 ->
-		  ?line test_server:fail(EINode)
-	  end.
+    Myname= hd(tl(string:tokens(atom_to_list(node()), "@"))),
+    FirstPart = "eiacc" ++ integer_to_list(N),
+    EINode= list_to_atom(FirstPart ++ "@" ++ Myname),
+    io:format("EINode ~p ~n",  [EINode]),
+    Self= self(),
+    case waitfornode(FirstPart,20) of
+        true -> ok;
+        false -> ct:fail({never_published,EINode})
+    end,
+    {any, EINode} ! Self,
+    receive
+        {N,_}=X ->
+            io:format("Received by ~s ~p~n", [EINode, X]),
+            TestServerPid ! N,
+            X
+    after 10000 ->
+              ct:fail(EINode)
+    end.
 
 start_einode(Einode, N, Host, Port) ->
     Einodecmd = Einode ++ " " ++ atom_to_list(erlang:get_cookie())
-	++ " " ++ integer_to_list(N) ++ " " ++ Host ++ " "
-	++ integer_to_list(Port) ++ " nothreads",
+    ++ " " ++ integer_to_list(N) ++ " " ++ Host ++ " "
+    ++ integer_to_list(Port) ++ " nothreads",
     io:format("Einodecmd  ~p ~n", [Einodecmd]),      
-    ?line open_port({spawn, Einodecmd}, []),
+    open_port({spawn, Einodecmd}, []),
     ok.
 
 
-
 %%% Interface functions for ei (erl_interface) functions.
 
 ei_connect_init(P, Num, Cookie, Creation) ->
     send_command(P, ei_connect_init, [Num,Cookie,Creation]),
     case get_term(P) of
-	{term,Int} when is_integer(Int) -> Int
+        {term,Int} when is_integer(Int) -> Int
     end.
 
 ei_accept(P, PortNo) ->
     send_command(P, ei_accept, [PortNo]),
     case get_term(P) of
-	{term,{Fd, _, Node}} when Fd >= 0 -> {ok, Fd, Node};
-	{term,{_Fd, Errno, _Node}} -> {error,Errno}
+        {term,{Fd, _, Node}} when Fd >= 0 -> {ok, Fd, Node};
+        {term,{_Fd, Errno, _Node}} -> {error,Errno}
     end.
 
 ei_receive(P, Fd) ->
     send_command(P, ei_receive, [Fd]),
-    {term, T}= get_term(P),
+    {term, T} = get_term(P),
     T.
 
 send_command(P, Name, Args) ->
     runner:send_term(P, {Name,list_to_tuple(Args)}).
-
-    
-
-
diff --git a/lib/erl_interface/test/ei_connect_SUITE.erl b/lib/erl_interface/test/ei_connect_SUITE.erl
index 3385d1eb6c..1ef2525251 100644
--- a/lib/erl_interface/test/ei_connect_SUITE.erl
+++ b/lib/erl_interface/test/ei_connect_SUITE.erl
@@ -21,176 +21,148 @@
 %%
 -module(ei_connect_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_connect_SUITE_data/ei_connect_test_cases.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,
-	 
-	 ei_send/1, 
-	 ei_reg_send/1, 
-	 ei_format_pid/1,
-	 ei_rpc/1, 
-	 rpc_test/1, 
-	 ei_send_funs/1,
-	 ei_threaded_send/1,
-	 ei_set_get_tracelevel/1
-	]).
+-export([all/0, suite/0,
+         ei_send/1,
+         ei_reg_send/1,
+         ei_format_pid/1,
+         ei_rpc/1,
+         rpc_test/1,
+         ei_send_funs/1,
+         ei_threaded_send/1,
+         ei_set_get_tracelevel/1]).
 
 -import(runner, [get_term/1,send_term/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 30}}].
 
 all() -> 
     [ei_send, ei_reg_send, ei_rpc, ei_format_pid, ei_send_funs,
      ei_threaded_send, ei_set_get_tracelevel].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(0.25)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
 ei_send(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = ei_connect(P, node()),
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = ei_connect(P, node()),
 
-    ?line ok = ei_send(P, Fd, self(), AMsg={a,message}),
-    ?line receive AMsg -> ok end,
+    ok = ei_send(P, Fd, self(), AMsg={a,message}),
+    receive AMsg -> ok end,
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 ei_format_pid(Config) when is_list(Config) ->
-    ?line S = self(),
-    ?line P = runner:start(?interpret),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = ei_connect(P, node()),
+    S = self(),
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = ei_connect(P, node()),
 
-    ?line ok = ei_format_pid(P, Fd, S),
-    ?line receive S -> ok end,
+    ok = ei_format_pid(P, Fd, S),
+    receive S -> ok end,
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 ei_send_funs(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = ei_connect(P, node()),
-    
-    ?line Fun1 = fun ei_send/1,
-    ?line Fun2 = fun(X) -> P, X, Fd, Fun1 end,
-
-    ?line AMsg={Fun1,Fun2},
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = ei_connect(P, node()),
+
+    Fun1 = fun ei_send/1,
+    Fun2 = fun(X) -> P, X, Fd, Fun1 end,
+
+    AMsg={Fun1,Fun2},
     %%AMsg={wait_with_funs, new_dist_format},
-    ?line ok = ei_send_funs(P, Fd, self(), AMsg),
-    ?line EIMsg = receive M -> M end,
-    ?line EIMsg = AMsg,
+    ok = ei_send_funs(P, Fd, self(), AMsg),
+    EIMsg = receive M -> M end,
+    EIMsg = AMsg,
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 ei_reg_send(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = ei_connect(P, node()),
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = ei_connect(P, node()),
 
     ARegName = a_strange_registred_name,
-    ?line register(ARegName, self()),
-    ?line ok = ei_reg_send(P, Fd, ARegName, AMsg={another,[strange],message}),
-    ?line receive AMsg -> ok end,
+    register(ARegName, self()),
+    ok = ei_reg_send(P, Fd, ARegName, AMsg={another,[strange],message}),
+    receive AMsg -> ok end,
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 ei_threaded_send(Config) when is_list(Config) ->
-    ?line Einode = filename:join(?config(data_dir, Config), "einode"),
-    ?line N = 15,
-    ?line Host = atom_to_list(node()),
-    ?line TestServerPid = self(),
-    ?line [ spawn_link(fun() -> rec_einode(I, TestServerPid) end)
-	    || I <- lists:seq(0, N-1) ],
-    ?line [ receive {I,registered} -> ok end
-	    || I <- lists:seq(0, N-1) ],
-    ?line spawn_link(fun() -> start_einode(Einode, N, Host) end),
-    ?line [ receive I -> ok end
-	    || I <- lists:seq(0, N-1) ],
+    Einode = filename:join(proplists:get_value(data_dir, Config), "einode"),
+    N = 15,
+    Host = atom_to_list(node()),
+    TestServerPid = self(),
+    [ spawn_link(fun() -> rec_einode(I, TestServerPid) end)
+      || I <- lists:seq(0, N-1) ],
+    [ receive {I,registered} -> ok end
+      || I <- lists:seq(0, N-1) ],
+    spawn_link(fun() -> start_einode(Einode, N, Host) end),
+    [ receive I -> ok end
+      || I <- lists:seq(0, N-1) ],
     ok.
 
 rec_einode(N, TestServerPid) ->
-    ?line Regname = list_to_atom("mth"++integer_to_list(N)),
-    ?line register(Regname, self()),
-    ?line TestServerPid ! {N, registered},
-    ?line io:format("~p waiting~n", [Regname]),
-    ?line receive
-	      X ->
-		  ?line io:format("Received by ~s ~p~n", [Regname, X]),
-		  ?line TestServerPid ! N,
-		  ?line X
-	  after 10000 ->
-		  ?line test_server:fail(Regname)
-	  end.
+    Regname = list_to_atom("mth"++integer_to_list(N)),
+    register(Regname, self()),
+    TestServerPid ! {N, registered},
+    io:format("~p waiting~n", [Regname]),
+    receive
+        X ->
+            io:format("Received by ~s ~p~n", [Regname, X]),
+            TestServerPid ! N,
+            X
+    after 10000 ->
+              ct:fail(Regname)
+    end.
 
 start_einode(Einode, N, Host) ->
     Einodecmd = Einode ++ " " ++ atom_to_list(erlang:get_cookie())
-	++ " " ++ integer_to_list(N) ++ " " ++ Host,
+    ++ " " ++ integer_to_list(N) ++ " " ++ Host,
     io:format("Einodecmd  ~p ~n", [Einodecmd]),      
-    ?line open_port({spawn, Einodecmd}, []),
+    open_port({spawn, Einodecmd}, []),
     ok.
 
 ei_rpc(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = ei_connect(P, node()),
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = ei_connect(P, node()),
 
-    ?line S= "Hej du glade!", SRev = lists:reverse(S),
-    ?line X = ei_rpc(P, Fd, self(), {?MODULE, rpc_test}, [SRev]),
-    ?line {term, S}= X,
+    S= "Hej du glade!", SRev = lists:reverse(S),
+    X = ei_rpc(P, Fd, self(), {?MODULE, rpc_test}, [SRev]),
+    {term, S}= X,
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 ei_set_get_tracelevel(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 5 = ei_set_get_tracelevel(P, 5),
-    ?line 0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = ei_connect(P, node()),
+    P = runner:start(?interpret),
+    5 = ei_set_get_tracelevel(P, 5),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = ei_connect(P, node()),
 
-    ?line S= "Hej du glade!", SRev = lists:reverse(S),
-    ?line X = ei_rpc(P, Fd, self(), {?MODULE, rpc_test}, [SRev]),
-    ?line {term, S}= X,
+    S= "Hej du glade!", SRev = lists:reverse(S),
+    X = ei_rpc(P, Fd, self(), {?MODULE, rpc_test}, [SRev]),
+    {term, S}= X,
 
-    ?line 0 = ei_set_get_tracelevel(P, 0),
+    0 = ei_set_get_tracelevel(P, 0),
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -199,20 +171,20 @@ ei_set_get_tracelevel(Config) when is_list(Config) ->
 ei_connect_init(P, Num, Cookie, Creation) ->
     send_command(P, ei_connect_init, [Num,Cookie,Creation]),
     case get_term(P) of
-	{term,Int} when is_integer(Int) -> Int
+        {term,Int} when is_integer(Int) -> Int
     end.
 
 ei_connect(P, Node) ->
     send_command(P, ei_connect, [Node]),
     case get_term(P) of
-	{term,{Fd,_}} when Fd >= 0 -> {ok,Fd};
-	{term,{-1,Errno}} -> {error,Errno}
+        {term,{Fd,_}} when Fd >= 0 -> {ok,Fd};
+        {term,{-1,Errno}} -> {error,Errno}
     end.
 
 ei_set_get_tracelevel(P, Tracelevel) ->
     send_command(P, ei_set_get_tracelevel, [Tracelevel]),
     case get_term(P) of
-	{term,{tracelevel, Level}} when is_integer(Level) -> Level
+        {term,{tracelevel, Level}} when is_integer(Level) -> Level
     end.
 
 ei_send(P, Fd, To, Msg) ->
@@ -238,12 +210,12 @@ ei_rpc(P, Fd, To, Func, Msg) ->
 
 get_send_result(P) ->
     case get_term(P) of
-	{term,{0,_}} -> ok;
-	{term,{1,_}} -> ok;
-	{term,{-1,Errno}} -> {error,Errno};
-	{term,{Res,Errno}}->
-	    io:format("Return value: ~p\nerl_errno: ~p", [Res,Errno]),
-	    ?t:fail(bad_return_value)
+        {term,{0,_}} -> ok;
+        {term,{1,_}} -> ok;
+        {term,{-1,Errno}} -> {error,Errno};
+        {term,{Res,Errno}}->
+            io:format("Return value: ~p\nerl_errno: ~p", [Res,Errno]),
+            ct:fail(bad_return_value)
     end.
 
 send_command(P, Name, Args) ->
diff --git a/lib/erl_interface/test/ei_decode_SUITE.erl b/lib/erl_interface/test/ei_decode_SUITE.erl
index 0abcf50fb5..b6cbda0817 100644
--- a/lib/erl_interface/test/ei_decode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_SUITE.erl
@@ -21,23 +21,18 @@
 %%
 -module(ei_decode_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_decode_SUITE_data/ei_decode_test_cases.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,
-    test_ei_decode_long/1,
-    test_ei_decode_ulong/1,
-    test_ei_decode_longlong/1,
-    test_ei_decode_ulonglong/1,
-    test_ei_decode_char/1,
-    test_ei_decode_nonoptimal/1,
-    test_ei_decode_misc/1,
-    test_ei_decode_utf8_atom/1
-   ]).
+-export([all/0, suite/0,
+         test_ei_decode_long/1,
+         test_ei_decode_ulong/1,
+         test_ei_decode_longlong/1,
+         test_ei_decode_ulonglong/1,
+         test_ei_decode_char/1,
+         test_ei_decode_nonoptimal/1,
+         test_ei_decode_misc/1,
+         test_ei_decode_utf8_atom/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -47,27 +42,6 @@ all() ->
      test_ei_decode_char, test_ei_decode_nonoptimal,
      test_ei_decode_misc, test_ei_decode_utf8_atom].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-init_per_testcase(_TC, Config) ->
-    Config.
-
-end_per_testcase(_RC, Config) ->
-    Config.
-
 %% ---------------------------------------------------------------------------
 
 % NOTE: for historical reasons we don't pach as tight as we can,
@@ -76,55 +50,51 @@ end_per_testcase(_RC, Config) ->
 
 %% ######################################################################## %%
 
-test_ei_decode_long(suite) -> [];
 test_ei_decode_long(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_decode_long),
+    P = runner:start(?test_ei_decode_long),
     send_integers(P),
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_decode_ulong(suite) -> [];
 test_ei_decode_ulong(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_decode_ulong),
+    P = runner:start(?test_ei_decode_ulong),
     send_integers(P),
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 % (*) In practical terms, other values may fit into the ext format
 % i32 is signed 32 bit on C side
 % u32 is unsigned 32 bit on C side
- 
+
 %% ######################################################################## %%
 
-test_ei_decode_longlong(suite) -> [];
 test_ei_decode_longlong(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skip,"Skipped on VxWorks"};
-	_ ->
-	    ?line P = runner:start(?test_ei_decode_longlong),
-	    send_integers2(P),
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skip,"Skipped on VxWorks"};
+        _ ->
+            P = runner:start(?test_ei_decode_longlong),
+            send_integers2(P),
+            runner:recv_eot(P),
+            ok
     end.
 
 
 %% ######################################################################## %%
 
-test_ei_decode_ulonglong(suite) -> [];
 test_ei_decode_ulonglong(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skip,"Skipped on VxWorks"};
-	_ ->
-	    ?line P = runner:start(?test_ei_decode_ulonglong),
-	    send_integers2(P),
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skip,"Skipped on VxWorks"};
+        _ ->
+            P = runner:start(?test_ei_decode_ulonglong),
+            send_integers2(P),
+            runner:recv_eot(P),
+            ok
     end.
 
 
@@ -133,38 +103,36 @@ test_ei_decode_ulonglong(Config) when is_list(Config) ->
 %% it is unsigned.
 %% FIXME maybe the API should change to use "unsigned char" to be clear?!
 
-test_ei_decode_char(suite) -> [];
 test_ei_decode_char(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_decode_char),
+    P = runner:start(?test_ei_decode_char),
 
-    ?line send_term_as_binary(P,0),
-    ?line send_term_as_binary(P,16#7f),
-    ?line send_term_as_binary(P,16#ff),
+    send_term_as_binary(P,0),
+    send_term_as_binary(P,16#7f),
+    send_term_as_binary(P,16#ff),
 
-    ?line send_term_as_binary(P, []), % illegal type
+    send_term_as_binary(P, []), % illegal type
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_decode_nonoptimal(suite) -> [];
 test_ei_decode_nonoptimal(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_decode_nonoptimal),
+    P = runner:start(?test_ei_decode_nonoptimal),
 
     send_non_optimal_pos(P),			% decode_char
     send_non_optimal(P),			% decode_long
     send_non_optimal_pos(P),			% decode_ulong
     case os:type() of
-	vxworks ->
-	    ok;
-	_ ->
-	    send_non_optimal(P),			% decode_longlong
-	    send_non_optimal_pos(P)			% decode_ulonglong
+        vxworks ->
+            ok;
+        _ ->
+            send_non_optimal(P),			% decode_longlong
+            send_non_optimal_pos(P)			% decode_ulonglong
     end,
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -173,82 +141,81 @@ send_non_optimal(P) ->
     send_non_optimal_neg(P).
 
 send_non_optimal_pos(P) ->
-    ?line send_raw(P, <<131,97,42>>),
-    ?line send_raw(P, <<131,98,42:32>>),
-    ?line send_raw(P, <<131,110,1,0,42>>),
-    ?line send_raw(P, <<131,110,2,0,42,0>>),
-    ?line send_raw(P, <<131,110,4,0,42,0,0,0>>),
-    ?line send_raw(P, <<131,111,0,0,0,1,0,42>>),
-    ?line send_raw(P, <<131,111,0,0,0,2,0,42,0>>),
-    ?line send_raw(P, <<131,111,0,0,0,3,0,42,0,0>>),
-    ?line send_raw(P, <<131,111,0,0,0,6,0,42,0,0,0,0,0>>),
+    send_raw(P, <<131,97,42>>),
+    send_raw(P, <<131,98,42:32>>),
+    send_raw(P, <<131,110,1,0,42>>),
+    send_raw(P, <<131,110,2,0,42,0>>),
+    send_raw(P, <<131,110,4,0,42,0,0,0>>),
+    send_raw(P, <<131,111,0,0,0,1,0,42>>),
+    send_raw(P, <<131,111,0,0,0,2,0,42,0>>),
+    send_raw(P, <<131,111,0,0,0,3,0,42,0,0>>),
+    send_raw(P, <<131,111,0,0,0,6,0,42,0,0,0,0,0>>),
     ok.
 
 send_non_optimal_neg(P) ->
-%   ?line send_raw(P, <<131,97,-42>>),
-    ?line send_raw(P, <<131,98,-42:32>>),
-    ?line send_raw(P, <<131,110,1,1,42>>),
-    ?line send_raw(P, <<131,110,2,1,42,0>>),
-    ?line send_raw(P, <<131,110,4,1,42,0,0,0>>),
-    ?line send_raw(P, <<131,111,0,0,0,1,1,42>>),
-    ?line send_raw(P, <<131,111,0,0,0,2,1,42,0>>),
-    ?line send_raw(P, <<131,111,0,0,0,3,1,42,0,0>>),
-    ?line send_raw(P, <<131,111,0,0,0,6,1,42,0,0,0,0,0>>),
+    %   send_raw(P, <<131,97,-42>>),
+    send_raw(P, <<131,98,-42:32>>),
+    send_raw(P, <<131,110,1,1,42>>),
+    send_raw(P, <<131,110,2,1,42,0>>),
+    send_raw(P, <<131,110,4,1,42,0,0,0>>),
+    send_raw(P, <<131,111,0,0,0,1,1,42>>),
+    send_raw(P, <<131,111,0,0,0,2,1,42,0>>),
+    send_raw(P, <<131,111,0,0,0,3,1,42,0,0>>),
+    send_raw(P, <<131,111,0,0,0,6,1,42,0,0,0,0,0>>),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_decode_misc(suite) -> [];
 test_ei_decode_misc(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_decode_misc),
+    P = runner:start(?test_ei_decode_misc),
 
-    ?line send_term_as_binary(P,0.0),
-    ?line send_term_as_binary(P,-1.0),
-    ?line send_term_as_binary(P,1.0),
+    send_term_as_binary(P,0.0),
+    send_term_as_binary(P,-1.0),
+    send_term_as_binary(P,1.0),
 
-    ?line send_term_as_binary(P,false),
-    ?line send_term_as_binary(P,true),
+    send_term_as_binary(P,false),
+    send_term_as_binary(P,true),
 
-    ?line send_term_as_binary(P,foo),
-    ?line send_term_as_binary(P,''),
-    ?line send_term_as_binary(P,'ÅÄÖåäö'),
+    send_term_as_binary(P,foo),
+    send_term_as_binary(P,''),
+    send_term_as_binary(P,'ÅÄÖåäö'),
 
-    ?line send_term_as_binary(P,"foo"),
-    ?line send_term_as_binary(P,""),
-    ?line send_term_as_binary(P,"ÅÄÖåäö"),
+    send_term_as_binary(P,"foo"),
+    send_term_as_binary(P,""),
+    send_term_as_binary(P,"ÅÄÖåäö"),
 
-    ?line send_term_as_binary(P,<<"foo">>),
-    ?line send_term_as_binary(P,<<>>),
-    ?line send_term_as_binary(P,<<"ÅÄÖåäö">>),
+    send_term_as_binary(P,<<"foo">>),
+    send_term_as_binary(P,<<>>),
+    send_term_as_binary(P,<<"ÅÄÖåäö">>),
 
-%    ?line send_term_as_binary(P,{}),
-%    ?line send_term_as_binary(P,[]),
+    %    send_term_as_binary(P,{}),
+    %    send_term_as_binary(P,[]),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 %% ######################################################################## %%
 
 test_ei_decode_utf8_atom(Config) ->
-    ?line P = runner:start(?test_ei_decode_utf8_atom),
+    P = runner:start(?test_ei_decode_utf8_atom),
 
     send_utf8_atom_as_binary(P,"å"),
     send_utf8_atom_as_binary(P,"ä"),
     send_term_as_binary(P,'ö'),
     send_term_as_binary(P,'õ'),
-    
-    ?line send_utf8_atom_as_binary(P,[1758]),
-    ?line send_utf8_atom_as_binary(P,[1758,1758]),
-    ?line send_utf8_atom_as_binary(P,[1758,1758,1758]),
-    ?line send_utf8_atom_as_binary(P,[1758,1758,1758,1758]),
+
+    send_utf8_atom_as_binary(P,[1758]),
+    send_utf8_atom_as_binary(P,[1758,1758]),
+    send_utf8_atom_as_binary(P,[1758,1758,1758]),
+    send_utf8_atom_as_binary(P,[1758,1758,1758,1758]),
 
     send_utf8_atom_as_binary(P,"a"),
     send_utf8_atom_as_binary(P,"b"),
     send_term_as_binary(P,'c'),
     send_term_as_binary(P,'d'),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -264,77 +231,77 @@ send_utf8_atom_as_binary(Port, String) ->
     Port ! {self(), {command, term_to_binary(uc_atup(String))}}.
 
 send_integers(P) ->
-    ?line send_term_as_binary(P,0),		% SMALL_INTEGER_EXT smallest
-    ?line send_term_as_binary(P,255),		% SMALL_INTEGER_EXT largest
-    ?line send_term_as_binary(P,256),		% INTEGER_EXT smallest pos (*)
-    ?line send_term_as_binary(P,-1),		% INTEGER_EXT largest  neg 
-
-    ?line send_term_as_binary(P, 16#07ffffff),	% INTEGER_EXT old largest (28 bits)
-    ?line send_term_as_binary(P,-16#08000000),	% INTEGER_EXT old smallest
-    ?line send_term_as_binary(P, 16#08000000),  % SMALL_BIG_EXT old smallest pos(*)
-    ?line send_term_as_binary(P,-16#08000001),	% SMALL_BIG_EXT old largest neg (*)
-
-    ?line send_term_as_binary(P, 16#7fffffff),	% INTEGER_EXT new largest (32 bits)
-    ?line send_term_as_binary(P,-16#80000000),	% INTEGER_EXT new smallest (32 bis)
-    ?line send_term_as_binary(P, 16#80000000),  % SMALL_BIG_EXT new smallest pos(*)
-    ?line send_term_as_binary(P,-16#80000001),	% SMALL_BIG_EXT new largest neg (*)
- 
+    send_term_as_binary(P,0),		% SMALL_INTEGER_EXT smallest
+    send_term_as_binary(P,255),		% SMALL_INTEGER_EXT largest
+    send_term_as_binary(P,256),		% INTEGER_EXT smallest pos (*)
+    send_term_as_binary(P,-1),		% INTEGER_EXT largest  neg
+
+    send_term_as_binary(P, 16#07ffffff),	% INTEGER_EXT old largest (28 bits)
+    send_term_as_binary(P,-16#08000000),	% INTEGER_EXT old smallest
+    send_term_as_binary(P, 16#08000000),  % SMALL_BIG_EXT old smallest pos(*)
+    send_term_as_binary(P,-16#08000001),	% SMALL_BIG_EXT old largest neg (*)
+
+    send_term_as_binary(P, 16#7fffffff),	% INTEGER_EXT new largest (32 bits)
+    send_term_as_binary(P,-16#80000000),	% INTEGER_EXT new smallest (32 bis)
+    send_term_as_binary(P, 16#80000000),  % SMALL_BIG_EXT new smallest pos(*)
+    send_term_as_binary(P,-16#80000001),	% SMALL_BIG_EXT new largest neg (*)
+
     case erlang:system_info({wordsize,external}) of
-	4 ->	 
-          ?line send_term_as_binary(P, 16#80000000),% SMALL_BIG_EXT u32
-          ?line send_term_as_binary(P, 16#ffffffff),% SMALL_BIG_EXT largest u32
-
-          ?line send_term_as_binary(P, 16#7fffffffffff), % largest  i48
-          ?line send_term_as_binary(P,-16#800000000000), % smallest i48
-          ?line send_term_as_binary(P, 16#ffffffffffff), % largest  u48
-          ?line send_term_as_binary(P, 16#7fffffffffffffff), % largest  i64
-          ?line send_term_as_binary(P,-16#8000000000000000), % smallest i64
-          ?line send_term_as_binary(P, 16#ffffffffffffffff); % largest  u64
-	8 ->
-          ?line send_term_as_binary(P, 16#8000000000000000),% SMALL_BIG_EXT u64
-	  % SMALL_BIG_EXT largest u64
-          ?line send_term_as_binary(P, 16#ffffffffffffffff),
-	  % largest  i96
-          ?line send_term_as_binary(P, 16#7fffffffffffffffffffffff), 
-	  % smallest i96
-          ?line send_term_as_binary(P,-16#800000000000000000000000), 
-	  % largest  u96
-          ?line send_term_as_binary(P, 16#ffffffffffffffffffffffff), 
-	  % largest  i128
-          ?line send_term_as_binary(P, 16#7fffffffffffffffffffffffffffffff), 
-	  % smallest i128
-          ?line send_term_as_binary(P,-16#80000000000000000000000000000000),
-	  % largest  u128 
-          ?line send_term_as_binary(P, 16#ffffffffffffffffffffffffffffffff) 
+        4 ->
+            send_term_as_binary(P, 16#80000000),% SMALL_BIG_EXT u32
+            send_term_as_binary(P, 16#ffffffff),% SMALL_BIG_EXT largest u32
+
+            send_term_as_binary(P, 16#7fffffffffff), % largest  i48
+            send_term_as_binary(P,-16#800000000000), % smallest i48
+            send_term_as_binary(P, 16#ffffffffffff), % largest  u48
+            send_term_as_binary(P, 16#7fffffffffffffff), % largest  i64
+            send_term_as_binary(P,-16#8000000000000000), % smallest i64
+            send_term_as_binary(P, 16#ffffffffffffffff); % largest  u64
+        8 ->
+            send_term_as_binary(P, 16#8000000000000000),% SMALL_BIG_EXT u64
+            % SMALL_BIG_EXT largest u64
+            send_term_as_binary(P, 16#ffffffffffffffff),
+            % largest  i96
+            send_term_as_binary(P, 16#7fffffffffffffffffffffff),
+            % smallest i96
+            send_term_as_binary(P,-16#800000000000000000000000),
+            % largest  u96
+            send_term_as_binary(P, 16#ffffffffffffffffffffffff),
+            % largest  i128
+            send_term_as_binary(P, 16#7fffffffffffffffffffffffffffffff),
+            % smallest i128
+            send_term_as_binary(P,-16#80000000000000000000000000000000),
+            % largest  u128
+            send_term_as_binary(P, 16#ffffffffffffffffffffffffffffffff)
     end,
-    ?line send_term_as_binary(P, []), % illegal type
+    send_term_as_binary(P, []), % illegal type
     ok.
 
 send_integers2(P) ->
-    ?line send_term_as_binary(P,0),		% SMALL_INTEGER_EXT smallest
-    ?line send_term_as_binary(P,255),		% SMALL_INTEGER_EXT largest
-    ?line send_term_as_binary(P,256),		% INTEGER_EXT smallest pos (*)
-    ?line send_term_as_binary(P,-1),		% INTEGER_EXT largest  neg 
-    
-    ?line send_term_as_binary(P, 16#07ffffff),	% INTEGER_EXT old largest (28 bits)
-    ?line send_term_as_binary(P,-16#08000000),	% INTEGER_EXT old smallest 
-    ?line send_term_as_binary(P, 16#08000000),  % SMALL_BIG_EXT old smallest pos(*)
-    ?line send_term_as_binary(P,-16#08000001),	% SMALL_BIG_EXT old largest neg (*)
-
-    ?line send_term_as_binary(P, 16#7fffffff),	% INTEGER_EXT new largest (32 bits)
-    ?line send_term_as_binary(P,-16#80000000),	% INTEGER_EXT new smallest
-    ?line send_term_as_binary(P, 16#80000000),  % SMALL_BIG_EXT new smallest pos(*)
-    ?line send_term_as_binary(P,-16#80000001),	% SMALL_BIG_EXT new largest neg (*)
-
-    ?line send_term_as_binary(P, 16#ffffffff),% SMALL_BIG_EXT largest u32
-
-    ?line send_term_as_binary(P, 16#7fffffffffff), % largest  i48
-    ?line send_term_as_binary(P,-16#800000000000), % smallest i48
-    ?line send_term_as_binary(P, 16#ffffffffffff), % largest  u48
-    ?line send_term_as_binary(P, 16#7fffffffffffffff), % largest  i64
-    ?line send_term_as_binary(P,-16#8000000000000000), % smallest i64
-    ?line send_term_as_binary(P, 16#ffffffffffffffff), % largest  u64
-    ?line send_term_as_binary(P, []), % illegal type
+    send_term_as_binary(P,0),           % SMALL_INTEGER_EXT smallest
+    send_term_as_binary(P,255),	        % SMALL_INTEGER_EXT largest
+    send_term_as_binary(P,256),	        % INTEGER_EXT smallest pos (*)
+    send_term_as_binary(P,-1),          % INTEGER_EXT largest  neg
+
+    send_term_as_binary(P, 16#07ffffff),     % INTEGER_EXT old largest (28 bits)
+    send_term_as_binary(P,-16#08000000),     % INTEGER_EXT old smallest
+    send_term_as_binary(P, 16#08000000),     % SMALL_BIG_EXT old smallest pos(*)
+    send_term_as_binary(P,-16#08000001),     % SMALL_BIG_EXT old largest neg (*)
+
+    send_term_as_binary(P, 16#7fffffff),     % INTEGER_EXT new largest (32 bits)
+    send_term_as_binary(P,-16#80000000),     % INTEGER_EXT new smallest
+    send_term_as_binary(P, 16#80000000),     % SMALL_BIG_EXT new smallest pos(*)
+    send_term_as_binary(P,-16#80000001),     % SMALL_BIG_EXT new largest neg (*)
+
+    send_term_as_binary(P, 16#ffffffff),     % SMALL_BIG_EXT largest u32
+
+    send_term_as_binary(P, 16#7fffffffffff),     % largest  i48
+    send_term_as_binary(P,-16#800000000000),     % smallest i48
+    send_term_as_binary(P, 16#ffffffffffff),     % largest  u48
+    send_term_as_binary(P, 16#7fffffffffffffff), % largest  i64
+    send_term_as_binary(P,-16#8000000000000000), % smallest i64
+    send_term_as_binary(P, 16#ffffffffffffffff), % largest  u64
+    send_term_as_binary(P, []), % illegal type
     ok.
 
 uc_atup(ATxt) ->
@@ -344,35 +311,32 @@ string_to_atom(String) ->
     Utf8List = string_to_utf8_list(String),
     Len = length(Utf8List),
     TagLen = case Len < 256 of
-		 true -> [119, Len];
-		 false -> [118, Len bsr 8, Len band 16#ff]
-	     end,
+                 true -> [119, Len];
+                 false -> [118, Len bsr 8, Len band 16#ff]
+             end,
     binary_to_term(list_to_binary([131, TagLen, Utf8List])).
 
 string_to_utf8_list([]) ->
     [];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   0 =< CP,
-				   CP =< 16#7F ->
+                                   0 =< CP,
+                                   CP =< 16#7F ->
     [CP | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#80 =< CP,
-				   CP =< 16#7FF ->
+                                   16#80 =< CP,
+                                   CP =< 16#7FF ->
     [16#C0 bor (CP bsr 6),
-     16#80 bor (16#3F band CP)
-     | string_to_utf8_list(CPs)];
+     16#80 bor (16#3F band CP) | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#800 =< CP,
-				   CP =< 16#FFFF ->
+                                   16#800 =< CP,
+                                   CP =< 16#FFFF ->
     [16#E0 bor (CP bsr 12),
      16#80 bor (16#3F band (CP bsr 6)),
-     16#80 bor (16#3F band CP)
-     | string_to_utf8_list(CPs)];
+     16#80 bor (16#3F band CP) | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#10000 =< CP,
-				   CP =< 16#10FFFF ->
+                                   16#10000 =< CP,
+                                   CP =< 16#10FFFF ->
     [16#F0 bor (CP bsr 18),
      16#80 bor (16#3F band (CP bsr 12)),
      16#80 bor (16#3F band (CP bsr 6)),
-     16#80 bor (16#3F band CP)
-     | string_to_utf8_list(CPs)].
+     16#80 bor (16#3F band CP) | string_to_utf8_list(CPs)].
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE.erl b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
index 3c7e4bf70d..a3d0ca0576 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
@@ -21,37 +21,18 @@
 %%
 -module(ei_decode_encode_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_decode_encode_SUITE_data/ei_decode_encode_test_cases.hrl").
 
--export(
-   [
-    all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-    init_per_group/2,end_per_group/2,
-    test_ei_decode_encode/1
-   ]).
+-export([all/0, suite/0,
+         test_ei_decode_encode/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [test_ei_decode_encode].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 %% ---------------------------------------------------------------------------
 
 % NOTE: these types have no meaning on the C side so we pass them
@@ -60,20 +41,19 @@ end_per_group(_GroupName, Config) ->
 
 %% ######################################################################## %%
 
-test_ei_decode_encode(suite) -> [];
 test_ei_decode_encode(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_decode_encode),
+    P = runner:start(?test_ei_decode_encode),
 
     Fun   = fun (X) -> {X,true} end,
     Pid   = self(),
     Port  = case os:type() of
-		{win32,_} ->
-		    open_port({spawn,"sort"},[]);
-		{unix, darwin} ->
-		    open_port({spawn,"/usr/bin/true"},[]);
-		_ ->
-		    open_port({spawn,"/bin/true"},[])
-	    end,
+                {win32,_} ->
+                    open_port({spawn,"sort"},[]);
+                {unix, darwin} ->
+                    open_port({spawn,"/usr/bin/true"},[]);
+                _ ->
+                    open_port({spawn,"/bin/true"},[])
+            end,
     Ref   = make_ref(),
     Trace = {1,2,3,self(),4},			% FIXME how to construct?!
 
@@ -86,47 +66,47 @@ test_ei_decode_encode(Config) when is_list(Config) ->
     BigLargeB = 1 bsl 11112 + BigSmallB,
     BigLargeC = BigSmallA * BigSmallB * BigSmallC * BigSmallA,
 
-    ?line send_rec(P, Fun),
-    ?line send_rec(P, Pid),
-    ?line send_rec(P, Port),
-    ?line send_rec(P, Ref),
-    ?line send_rec(P, Trace),
+    send_rec(P, Fun),
+    send_rec(P, Pid),
+    send_rec(P, Port),
+    send_rec(P, Ref),
+    send_rec(P, Trace),
 
     % bigs
 
-    ?line send_rec(P, BigSmallA),
-    ?line send_rec(P, BigSmallB),
-    ?line send_rec(P, BigSmallC),
-    
-    ?line send_rec(P, BigLargeA),
-    ?line send_rec(P, BigLargeB),
-    ?line send_rec(P, BigLargeC),
+    send_rec(P, BigSmallA),
+    send_rec(P, BigSmallB),
+    send_rec(P, BigSmallC),
+
+    send_rec(P, BigLargeA),
+    send_rec(P, BigLargeB),
+    send_rec(P, BigLargeC),
 
     %% Test large node containers...
 
-    ?line ThisNode = {node(), erlang:system_info(creation)},
-    ?line TXPid = mk_pid(ThisNode, 32767, 8191),
-    ?line TXPort = mk_port(ThisNode, 268435455),
-    ?line TXRef = mk_ref(ThisNode, [262143, 4294967295, 4294967295]),
+    ThisNode = {node(), erlang:system_info(creation)},
+    TXPid = mk_pid(ThisNode, 32767, 8191),
+    TXPort = mk_port(ThisNode, 268435455),
+    TXRef = mk_ref(ThisNode, [262143, 4294967295, 4294967295]),
 
-    ?line OtherNode = {gurka@sallad, 2},
-    ?line OXPid = mk_pid(OtherNode, 32767, 8191),
-    ?line OXPort = mk_port(OtherNode, 268435455),
-    ?line OXRef = mk_ref(OtherNode, [262143, 4294967295, 4294967295]),
+    OtherNode = {gurka@sallad, 2},
+    OXPid = mk_pid(OtherNode, 32767, 8191),
+    OXPort = mk_port(OtherNode, 268435455),
+    OXRef = mk_ref(OtherNode, [262143, 4294967295, 4294967295]),
 
-    ?line send_rec(P, TXPid),
-    ?line send_rec(P, TXPort),
-    ?line send_rec(P, TXRef),
-    ?line send_rec(P, OXPid),
-    ?line send_rec(P, OXPort),
-    ?line send_rec(P, OXRef),
+    send_rec(P, TXPid),
+    send_rec(P, TXPort),
+    send_rec(P, TXRef),
+    send_rec(P, OXPid),
+    send_rec(P, OXPort),
+    send_rec(P, OXRef),
 
     %% Unicode atoms
     [begin send_rec(P, Atom),
-	   send_rec(P, mk_pid({Atom,1}, 23434, 3434)),
-	   send_rec(P, mk_port({Atom,1}, 2343434)),
-	   send_rec(P, mk_ref({Atom,1}, [262143, 8723648, 24097245])),
-	   void
+           send_rec(P, mk_pid({Atom,1}, 23434, 3434)),
+           send_rec(P, mk_port({Atom,1}, 2343434)),
+           send_rec(P, mk_ref({Atom,1}, [262143, 8723648, 24097245])),
+           void
      end || Atom <- unicode_atom_data()],
 
     send_rec(P, {}),
@@ -137,7 +117,7 @@ test_ei_decode_encode(Config) when is_list(Config) ->
     send_rec(P, #{key => value}),
     send_rec(P, maps:put(Port, Ref, #{key => value, key2 => Pid})),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -146,29 +126,27 @@ test_ei_decode_encode(Config) when is_list(Config) ->
 % We read two packets for each test, the ei_decode_encode and ei_x_decode_encode  version....
 
 send_rec(P, Term) when is_port(P) ->
-    %%?t:format("Testing: ~p~n", [Term]),
     P ! {self(), {command, term_to_binary(Term)}},
     {_B,Term} = get_buf_and_term(P).
-    
 
 
 get_buf_and_term(P) ->
     B = get_binaries(P),
     case B of
-	<<131>> ->
-	    io:format("(got single magic, no content)\n",[]),
-	    {B,'$$magic$$'};
-	<<131,_>> ->
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got magic)\n",[B,T]),
-	    {B,T};
-	_ ->
-	    B1 = list_to_binary([131,B]),	% No magic, add
-	    T = binary_to_term(B1),
-	    %io:format("~w\n~w\n(got no magic)\n",[B,T]),
-	    {B,T}
+        <<131>> ->
+            io:format("(got single magic, no content)\n",[]),
+            {B,'$$magic$$'};
+        <<131,_>> ->
+            T = binary_to_term(B),
+            io:format("~w\n~w\n(got magic)\n",[B,T]),
+            {B,T};
+        _ ->
+            B1 = list_to_binary([131,B]),	% No magic, add
+            T = binary_to_term(B1),
+            %io:format("~w\n~w\n(got no magic)\n",[B,T]),
+            {B,T}
     end.
-    
+
 
 get_binaries(P) ->
     B1 = get_binary(P),
@@ -177,40 +155,17 @@ get_binaries(P) ->
 
 get_binary(P) ->
     case runner:get_term(P) of
-	{bytes,L} ->
-	    B = list_to_binary(L),
-	    %%io:format("~w\n",[L]),
-% For strange reasons <<131>> show up as <>....
-%	    io:format("~w\n",[B]),
-	    B;
-	Other ->
-	    Other
+        {bytes,L} ->
+            B = list_to_binary(L),
+            %%io:format("~w\n",[L]),
+            % For strange reasons <<131>> show up as <>....
+            %	    io:format("~w\n",[B]),
+            B;
+        Other ->
+            Other
     end.
 
 %%
-
-% We use our own get_term()
-
-get_term(P) ->
-    case runner:get_term(P) of
-	{bytes,[131]} ->
-	    io:format("(got single magic, no content)\n",[]),
-	    '$$magic$$';
-	{bytes,[131,L]} ->
-	    B = list_to_binary(L),
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got magic)\n",[L,T]),
-	    T;
-	{bytes,L} ->
-	    B = list_to_binary([131,L]),
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got no magic)\n",[L,T]),
-	    T;
-	Other ->
-	    Other
-    end.
-    
-%%
 %% Node container constructor functions
 %%
 
@@ -249,17 +204,17 @@ mk_pid({NodeName, Creation}, Number, Serial) when is_atom(NodeName) ->
     mk_pid({NodeNameExt, Creation}, Number, Serial);
 mk_pid({NodeNameExt, Creation}, Number, Serial) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					?PID_EXT,
-					NodeNameExt,
-					uint32_be(Number),
-					uint32_be(Serial),
-					uint8(Creation)])) of
-	Pid when is_pid(Pid) ->
-	    Pid;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_pid, [{NodeNameExt, Creation}, Number, Serial]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?PID_EXT,
+                                              NodeNameExt,
+                                              uint32_be(Number),
+                                              uint32_be(Serial),
+                                              uint8(Creation)])) of
+        Pid when is_pid(Pid) ->
+            Pid;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_pid, [{NodeNameExt, Creation}, Number, Serial]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end.
 
 mk_port({NodeName, Creation}, Number) when is_atom(NodeName) ->
@@ -267,56 +222,56 @@ mk_port({NodeName, Creation}, Number) when is_atom(NodeName) ->
     mk_port({NodeNameExt, Creation}, Number);
 mk_port({NodeNameExt, Creation}, Number) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?PORT_EXT,
-					      NodeNameExt,
-					      uint32_be(Number),
-					      uint8(Creation)])) of
-	Port when is_port(Port) ->
-	    Port;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_port, [{NodeNameExt, Creation}, Number]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?PORT_EXT,
+                                              NodeNameExt,
+                                              uint32_be(Number),
+                                              uint8(Creation)])) of
+        Port when is_port(Port) ->
+            Port;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_port, [{NodeNameExt, Creation}, Number]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end.
 
 mk_ref({NodeName, Creation}, Numbers) when is_atom(NodeName),
-					   is_integer(Creation),
-					   is_list(Numbers) ->
+                                           is_integer(Creation),
+                                           is_list(Numbers) ->
     <<?VERSION_MAGIC, NodeNameExt/binary>> = term_to_binary(NodeName),
     mk_ref({NodeNameExt, Creation}, Numbers);
 mk_ref({NodeNameExt, Creation}, [Number]) when is_binary(NodeNameExt),
-					       is_integer(Creation),
-					       is_integer(Number) ->
+                                               is_integer(Creation),
+                                               is_integer(Number) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?REFERENCE_EXT,
-					      NodeNameExt,
-					      uint32_be(Number),
-					      uint8(Creation)])) of
-	Ref when is_reference(Ref) ->
-	    Ref;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_ref, [{NodeNameExt, Creation}, [Number]]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?REFERENCE_EXT,
+                                              NodeNameExt,
+                                              uint32_be(Number),
+                                              uint8(Creation)])) of
+        Ref when is_reference(Ref) ->
+            Ref;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_ref, [{NodeNameExt, Creation}, [Number]]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end;
 mk_ref({NodeNameExt, Creation}, Numbers) when is_binary(NodeNameExt),
-					      is_integer(Creation),
-					      is_list(Numbers) ->
+                                              is_integer(Creation),
+                                              is_list(Numbers) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ?NEW_REFERENCE_EXT,
-					      uint16_be(length(Numbers)),
-					      NodeNameExt,
-					      uint8(Creation),
-					      lists:map(fun (N) ->
-								uint32_be(N)
-							end,
-							Numbers)])) of
-	Ref when is_reference(Ref) ->
-	    Ref;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_ref, [{NodeNameExt, Creation}, Numbers]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
+                                              ?NEW_REFERENCE_EXT,
+                                              uint16_be(length(Numbers)),
+                                              NodeNameExt,
+                                              uint8(Creation),
+                                              lists:map(fun (N) ->
+                                                                uint32_be(N)
+                                                        end,
+                                                        Numbers)])) of
+        Ref when is_reference(Ref) ->
+            Ref;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_ref, [{NodeNameExt, Creation}, Numbers]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
     end.
 
 
@@ -333,10 +288,10 @@ unicode_atom_data() ->
      uc_atup(lists:seq(65500, 65754)),
      uc_atup(lists:seq(65500, 65563))
      | lists:map(fun (N) ->
-			 Pow2 = (1 bsl N),
-			 uc_atup(lists:seq(Pow2 - 127, Pow2 + 127))
-		 end,
-		 lists:seq(7, 20))
+                         Pow2 = (1 bsl N),
+                         uc_atup(lists:seq(Pow2 - 127, Pow2 + 127))
+                 end,
+                 lists:seq(7, 20))
     ].
 
 uc_atup(ATxt) ->
@@ -346,33 +301,33 @@ string_to_atom(String) ->
     Utf8List = string_to_utf8_list(String),
     Len = length(Utf8List),
     TagLen = case Len < 256 of
-		 true -> [119, Len];
-		 false -> [118, Len bsr 8, Len band 16#ff]
-	     end,
+                 true -> [119, Len];
+                 false -> [118, Len bsr 8, Len band 16#ff]
+             end,
     binary_to_term(list_to_binary([131, TagLen, Utf8List])).
 
 string_to_utf8_list([]) ->
     [];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   0 =< CP,
-				   CP =< 16#7F ->
+                                   0 =< CP,
+                                   CP =< 16#7F ->
     [CP | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#80 =< CP,
-				   CP =< 16#7FF ->
+                                   16#80 =< CP,
+                                   CP =< 16#7FF ->
     [16#C0 bor (CP bsr 6),
      16#80 bor (16#3F band CP)
      | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#800 =< CP,
-				   CP =< 16#FFFF ->
+                                   16#800 =< CP,
+                                   CP =< 16#FFFF ->
     [16#E0 bor (CP bsr 12),
      16#80 bor (16#3F band (CP bsr 6)),
      16#80 bor (16#3F band CP)
      | string_to_utf8_list(CPs)];
 string_to_utf8_list([CP|CPs]) when is_integer(CP),
-				   16#10000 =< CP,
-				   CP =< 16#10FFFF ->
+                                   16#10000 =< CP,
+                                   CP =< 16#10FFFF ->
     [16#F0 bor (CP bsr 18),
      16#80 bor (16#3F band (CP bsr 12)),
      16#80 bor (16#3F band (CP bsr 6)),
diff --git a/lib/erl_interface/test/ei_encode_SUITE.erl b/lib/erl_interface/test/ei_encode_SUITE.erl
index 6213916314..fab8367eed 100644
--- a/lib/erl_interface/test/ei_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_encode_SUITE.erl
@@ -21,25 +21,22 @@
 %%
 -module(ei_encode_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_encode_SUITE_data/ei_encode_test_cases.hrl").
 
--export(
-   [
-    all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-    init_per_group/2,end_per_group/2,
-    test_ei_encode_long/1,
-    test_ei_encode_ulong/1,
-    test_ei_encode_longlong/1,
-    test_ei_encode_ulonglong/1,
-    test_ei_encode_char/1,
-    test_ei_encode_misc/1,
-    test_ei_encode_fails/1,
-    test_ei_encode_utf8_atom/1,
-    test_ei_encode_utf8_atom_len/1
-   ]).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+-export([all/0, suite/0,
+         test_ei_encode_long/1,
+         test_ei_encode_ulong/1,
+         test_ei_encode_longlong/1,
+         test_ei_encode_ulonglong/1,
+         test_ei_encode_char/1,
+         test_ei_encode_misc/1,
+         test_ei_encode_fails/1,
+         test_ei_encode_utf8_atom/1,
+         test_ei_encode_utf8_atom_len/1]).
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [test_ei_encode_long, test_ei_encode_ulong,
@@ -48,21 +45,6 @@ all() ->
      test_ei_encode_fails, test_ei_encode_utf8_atom,
      test_ei_encode_utf8_atom_len].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 %% ---------------------------------------------------------------------------
 
@@ -72,105 +54,101 @@ end_per_group(_GroupName, Config) ->
 
 %% ######################################################################## %%
 
-test_ei_encode_long(suite) -> [];
 test_ei_encode_long(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_long),
+    P = runner:start(?test_ei_encode_long),
 
-    ?line {<<97,0>>                        ,0}   = get_buf_and_term(P),
-    ?line {<<97,255>>                      ,255} = get_buf_and_term(P),
-    ?line {<<98,256:32/big-signed-integer>>,256} = get_buf_and_term(P),
-    ?line {<<98,-1:32/big-signed-integer>> ,-1}  = get_buf_and_term(P),
+    {<<97,0>>                        ,0}   = get_buf_and_term(P),
+    {<<97,255>>                      ,255} = get_buf_and_term(P),
+    {<<98,256:32/big-signed-integer>>,256} = get_buf_and_term(P),
+    {<<98,-1:32/big-signed-integer>> ,-1}  = get_buf_and_term(P),
 
-    ?line {<<98, 16#07ffffff:32/big-signed-integer>>, 16#07ffffff} = get_buf_and_term(P),
-    ?line {<<98,-16#08000000:32/big-signed-integer>>,-16#08000000} = get_buf_and_term(P),
-    ?line {<<110,4,0, 0,0,0,8>>                     , 16#08000000} = get_buf_and_term(P),
-    ?line {<<110,4,1, 1,0,0,8>>                     ,-16#08000001} = get_buf_and_term(P),
+    {<<98, 16#07ffffff:32/big-signed-integer>>, 16#07ffffff} = get_buf_and_term(P),
+    {<<98,-16#08000000:32/big-signed-integer>>,-16#08000000} = get_buf_and_term(P),
+    {<<110,4,0, 0,0,0,8>>                     , 16#08000000} = get_buf_and_term(P),
+    {<<110,4,1, 1,0,0,8>>                     ,-16#08000001} = get_buf_and_term(P),
 
-    ?line {<<110,4,0, 255,255,255,127>>             , 16#7fffffff} = get_buf_and_term(P),
-    ?line {<<110,4,1, 0,0,0,128>>                   ,-16#80000000} = get_buf_and_term(P),
+    {<<110,4,0, 255,255,255,127>>             , 16#7fffffff} = get_buf_and_term(P),
+    {<<110,4,1, 0,0,0,128>>                   ,-16#80000000} = get_buf_and_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_encode_ulong(suite) -> [];
 test_ei_encode_ulong(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_ulong),
+    P = runner:start(?test_ei_encode_ulong),
 
-    ?line {<<97,0>>                          ,0}   = get_buf_and_term(P),
-    ?line {<<97,255>>                        ,255} = get_buf_and_term(P),
-    ?line {<<98,256:32/big-unsigned-integer>>,256} = get_buf_and_term(P),
+    {<<97,0>>                          ,0}   = get_buf_and_term(P),
+    {<<97,255>>                        ,255} = get_buf_and_term(P),
+    {<<98,256:32/big-unsigned-integer>>,256} = get_buf_and_term(P),
 
-    ?line {<<98, 16#07ffffff:32/big-signed-integer>>,16#07ffffff} = get_buf_and_term(P),
-    ?line {<<110,4,0, 0,0,0,8>>                     ,16#08000000} = get_buf_and_term(P),
+    {<<98, 16#07ffffff:32/big-signed-integer>>,16#07ffffff} = get_buf_and_term(P),
+    {<<110,4,0, 0,0,0,8>>                     ,16#08000000} = get_buf_and_term(P),
 
-    ?line {<<110,4,0, 255,255,255,127>>             ,16#7fffffff} = get_buf_and_term(P),
-    ?line {<<110,4,0, 0,0,0,128>>                   ,16#80000000} = get_buf_and_term(P),
-    ?line {<<110,4,0, 255,255,255,255>>             ,16#ffffffff} = get_buf_and_term(P),
+    {<<110,4,0, 255,255,255,127>>             ,16#7fffffff} = get_buf_and_term(P),
+    {<<110,4,0, 0,0,0,128>>                   ,16#80000000} = get_buf_and_term(P),
+    {<<110,4,0, 255,255,255,255>>             ,16#ffffffff} = get_buf_and_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_encode_longlong(suite) -> [];
 test_ei_encode_longlong(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skip,"Skipped on VxWorks"};
-	_ ->
-	    ?line P = runner:start(?test_ei_encode_longlong),
-
-	    ?line {<<97,0>>                        ,0}   = get_buf_and_term(P),
-	    ?line {<<97,255>>                      ,255} = get_buf_and_term(P),
-	    ?line {<<98,256:32/big-signed-integer>>,256} = get_buf_and_term(P),
-	    ?line {<<98,-1:32/big-signed-integer>> ,-1}  = get_buf_and_term(P),
-	    
-	    ?line {<<98, 16#07ffffff:32/big-signed-integer>>, 16#07ffffff} = get_buf_and_term(P),
-	    ?line {<<98,-16#08000000:32/big-signed-integer>>,-16#08000000} = get_buf_and_term(P),
-	    ?line {<<110,4,0, 0,0,0,8>>                     , 16#08000000} = get_buf_and_term(P),
-	    ?line {<<110,4,1, 1,0,0,8>>                     ,-16#08000001} = get_buf_and_term(P),
-
-	    ?line {<<110,4,0, 255,255,255,127>>             , 16#7fffffff} = get_buf_and_term(P),
-	    ?line {<<110,4,1, 0,0,0,128>>                   ,-16#80000000} = get_buf_and_term(P),
-	    ?line {<<110,6,0, 255,255,255,255,255,127>>     , 16#7fffffffffff} = get_buf_and_term(P),
-	    ?line {<<110,6,1, 0,0,0,0,0,128>>               ,-16#800000000000} = get_buf_and_term(P),
-	    ?line {<<110,8,0, 255,255,255,255,255,255,255,127>>,16#7fffffffffffffff} = get_buf_and_term(P),
-	    ?line {<<110,8,1, 0,0,0,0,0,0,0,128>>           ,-16#8000000000000000} = get_buf_and_term(P),
-
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skip,"Skipped on VxWorks"};
+        _ ->
+            P = runner:start(?test_ei_encode_longlong),
+
+            {<<97,0>>                        ,0}   = get_buf_and_term(P),
+            {<<97,255>>                      ,255} = get_buf_and_term(P),
+            {<<98,256:32/big-signed-integer>>,256} = get_buf_and_term(P),
+            {<<98,-1:32/big-signed-integer>> ,-1}  = get_buf_and_term(P),
+
+            {<<98, 16#07ffffff:32/big-signed-integer>>, 16#07ffffff} = get_buf_and_term(P),
+            {<<98,-16#08000000:32/big-signed-integer>>,-16#08000000} = get_buf_and_term(P),
+            {<<110,4,0, 0,0,0,8>>                     , 16#08000000} = get_buf_and_term(P),
+            {<<110,4,1, 1,0,0,8>>                     ,-16#08000001} = get_buf_and_term(P),
+
+            {<<110,4,0, 255,255,255,127>>             , 16#7fffffff} = get_buf_and_term(P),
+            {<<110,4,1, 0,0,0,128>>                   ,-16#80000000} = get_buf_and_term(P),
+            {<<110,6,0, 255,255,255,255,255,127>>     , 16#7fffffffffff} = get_buf_and_term(P),
+            {<<110,6,1, 0,0,0,0,0,128>>               ,-16#800000000000} = get_buf_and_term(P),
+            {<<110,8,0, 255,255,255,255,255,255,255,127>>,16#7fffffffffffffff} = get_buf_and_term(P),
+            {<<110,8,1, 0,0,0,0,0,0,0,128>>           ,-16#8000000000000000} = get_buf_and_term(P),
+
+            runner:recv_eot(P),
+            ok
     end.
 
 
 %% ######################################################################## %%
 
-test_ei_encode_ulonglong(suite) -> [];
 test_ei_encode_ulonglong(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skip,"Skipped on VxWorks"};
-	_ ->
-	    ?line P = runner:start(?test_ei_encode_ulonglong),
-
-	    ?line {<<97,0>>                          ,0} = get_buf_and_term(P),
-	    ?line {<<97,255>>                        ,255} = get_buf_and_term(P),
-	    ?line {<<98,256:32/big-unsigned-integer>>,256} = get_buf_and_term(P),
-
-	    ?line {<<98, 16#07ffffff:32/big-signed-integer>>,16#07ffffff} = get_buf_and_term(P),
-	    ?line {<<110,4,0, 0,0,0,8>>              ,16#08000000} = get_buf_and_term(P),
-
-	    ?line {<<110,4,0, 255,255,255,127>>      ,16#7fffffff} = get_buf_and_term(P),
-	    ?line {<<110,4,0, 0,0,0,128>>            ,16#80000000} = get_buf_and_term(P),
-	    ?line {<<110,4,0, 255,255,255,255>>      ,16#ffffffff} = get_buf_and_term(P),
-	    ?line {<<110,6,0, 255,255,255,255,255,255>>,16#ffffffffffff} = get_buf_and_term(P),
-	    ?line {<<110,8,0, 255,255,255,255,255,255,255,255>>,16#ffffffffffffffff} = get_buf_and_term(P),
-
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skip,"Skipped on VxWorks"};
+        _ ->
+            P = runner:start(?test_ei_encode_ulonglong),
+
+            {<<97,0>>                          ,0} = get_buf_and_term(P),
+            {<<97,255>>                        ,255} = get_buf_and_term(P),
+            {<<98,256:32/big-unsigned-integer>>,256} = get_buf_and_term(P),
+
+            {<<98, 16#07ffffff:32/big-signed-integer>>,16#07ffffff} = get_buf_and_term(P),
+            {<<110,4,0, 0,0,0,8>>              ,16#08000000} = get_buf_and_term(P),
+
+            {<<110,4,0, 255,255,255,127>>      ,16#7fffffff} = get_buf_and_term(P),
+            {<<110,4,0, 0,0,0,128>>            ,16#80000000} = get_buf_and_term(P),
+            {<<110,4,0, 255,255,255,255>>      ,16#ffffffff} = get_buf_and_term(P),
+            {<<110,6,0, 255,255,255,255,255,255>>,16#ffffffffffff} = get_buf_and_term(P),
+            {<<110,8,0, 255,255,255,255,255,255,255,255>>,16#ffffffffffffffff} = get_buf_and_term(P),
+
+            runner:recv_eot(P),
+            ok
     end.
 
 
@@ -179,115 +157,112 @@ test_ei_encode_ulonglong(Config) when is_list(Config) ->
 %% it is unsigned.
 %% FIXME maybe the API should change to use "unsigned char" to be clear?!
 
-test_ei_encode_char(suite) -> [];
 test_ei_encode_char(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_char),
+    P = runner:start(?test_ei_encode_char),
 
-    ?line {<<97,  0>>,0} = get_buf_and_term(P),
-    ?line {<<97,127>>,16#7f} = get_buf_and_term(P),
-    ?line {<<97,255>>,16#ff} = get_buf_and_term(P),
+    {<<97,  0>>,0} = get_buf_and_term(P),
+    {<<97,127>>,16#7f} = get_buf_and_term(P),
+    {<<97,255>>,16#ff} = get_buf_and_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_encode_misc(suite) -> [];
 test_ei_encode_misc(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_misc),
+    P = runner:start(?test_ei_encode_misc),
 
-    ?line <<131>>  = get_binaries(P),
+    <<131>>  = get_binaries(P),
 
-    ?line {<<70,_:8/binary>>,F0} = get_buf_and_term(P),
-    ?line true = match_float(F0, 0.0),
+    {<<70,_:8/binary>>,F0} = get_buf_and_term(P),
+    true = match_float(F0, 0.0),
 
-    ?line {<<70,_:8/binary>>,Fn1} = get_buf_and_term(P),
-    ?line true = match_float(Fn1, -1.0),
+    {<<70,_:8/binary>>,Fn1} = get_buf_and_term(P),
+    true = match_float(Fn1, -1.0),
 
-    ?line {<<70,_:8/binary>>,Fp1} = get_buf_and_term(P),
-    ?line true = match_float(Fp1, 1.0),
+    {<<70,_:8/binary>>,Fp1} = get_buf_and_term(P),
+    true = match_float(Fp1, 1.0),
 
-    ?line {<<100,0,5,"false">>,false}  = get_buf_and_term(P),
-    ?line {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
-    ?line {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
-    ?line {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
+    {<<100,0,5,"false">>,false}  = get_buf_and_term(P),
+    {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
+    {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
+    {<<100,0,4,"true">> ,true}   = get_buf_and_term(P),
 
-    ?line {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
-    ?line {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
-    ?line {<<100,0,0,"">>,''}             = get_buf_and_term(P),
-    ?line {<<100,0,0,"">>,''}             = get_buf_and_term(P),
-    ?line {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
-    ?line {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
+    {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
+    {<<100,0,3,"foo">>,foo}         = get_buf_and_term(P),
+    {<<100,0,0,"">>,''}             = get_buf_and_term(P),
+    {<<100,0,0,"">>,''}             = get_buf_and_term(P),
+    {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
+    {<<100,0,6,"ÅÄÖåäö">>,'ÅÄÖåäö'} = get_buf_and_term(P),
 
-    ?line {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
-    ?line {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
-    ?line {<<106>>,""}                    = get_buf_and_term(P),
-    ?line {<<106>>,""}                    = get_buf_and_term(P),
-    ?line {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
-    ?line {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
+    {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
+    {<<107,0,3,"foo">>,"foo"}       = get_buf_and_term(P),
+    {<<106>>,""}                    = get_buf_and_term(P),
+    {<<106>>,""}                    = get_buf_and_term(P),
+    {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
+    {<<107,0,6,"ÅÄÖåäö">>,"ÅÄÖåäö"} = get_buf_and_term(P),
 
-    ?line {<<109,0,0,0,3,"foo">>,<<"foo">>}       = get_buf_and_term(P),
-    ?line {<<109,0,0,0,0,"">>,<<>>}               = get_buf_and_term(P),
-    ?line {<<109,0,0,0,6,"ÅÄÖåäö">>,<<"ÅÄÖåäö">>} = get_buf_and_term(P),
+    {<<109,0,0,0,3,"foo">>,<<"foo">>}       = get_buf_and_term(P),
+    {<<109,0,0,0,0,"">>,<<>>}               = get_buf_and_term(P),
+    {<<109,0,0,0,6,"ÅÄÖåäö">>,<<"ÅÄÖåäö">>} = get_buf_and_term(P),
 
-    ?line {<<104,0>>,{}}       = get_buf_and_term(P),	% Tuple header for {}
-    ?line {<<106>>,[]}         = get_buf_and_term(P),	% Empty list []
+    {<<104,0>>,{}}       = get_buf_and_term(P),	% Tuple header for {}
+    {<<106>>,[]}         = get_buf_and_term(P),	% Empty list []
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
-test_ei_encode_fails(suite) -> [];
 test_ei_encode_fails(Config) when is_list(Config) ->
-    ?line P = runner:start(?test_ei_encode_fails),
+    P = runner:start(?test_ei_encode_fails),
 
-    ?line XAtom = list_to_atom(lists:duplicate(255, $x)),
-    ?line YAtom = list_to_atom(lists:duplicate(255, $y)),
+    XAtom = list_to_atom(lists:duplicate(255, $x)),
+    YAtom = list_to_atom(lists:duplicate(255, $y)),
 
-    ?line XAtom = get_term(P),
-    ?line XAtom = get_term(P),
-    ?line YAtom = get_term(P),
-    ?line YAtom = get_term(P),
+    XAtom = get_term(P),
+    XAtom = get_term(P),
+    YAtom = get_term(P),
+    YAtom = get_term(P),
 
-    ?line {{{{}}}} = get_term(P),
+    {{{{}}}} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% ######################################################################## %%
 
 test_ei_encode_utf8_atom(Config) ->
-    ?line P = runner:start(?test_ei_encode_utf8_atom),
-    
-    ?line {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
-    ?line {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
-    ?line {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
-    ?line {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
+    P = runner:start(?test_ei_encode_utf8_atom),
 
-    ?line {<<119,1,$A>>,'A'} = get_buf_and_term(P),
-    ?line {<<100,0,1,$A>>,'A'} = get_buf_and_term(P),
+    {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
+    {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
+    {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
+    {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
 
-    ?line runner:recv_eot(P),
+    {<<119,1,$A>>,'A'} = get_buf_and_term(P),
+    {<<100,0,1,$A>>,'A'} = get_buf_and_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 %% ######################################################################## %%
 test_ei_encode_utf8_atom_len(Config) ->
-    ?line P = runner:start(?test_ei_encode_utf8_atom_len),
-    
-    ?line {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
-    ?line {<<100,0,2,197,196>>,'ÅÄ'} = get_buf_and_term(P),
-    ?line {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
-    ?line {<<119,4,195,133,195,132>>,'ÅÄ'} = get_buf_and_term(P),
-
-    ?line {<<119,1,$A>>,'A'} = get_buf_and_term(P),
-    ?line {<<100,0,2,$A,$B>>,'AB'} = get_buf_and_term(P),
-    ?line {<<100,0,255,_:(255*8)>>,_} = get_buf_and_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?test_ei_encode_utf8_atom_len),
+
+    {<<119,2,195,133>>,'Å'} = get_buf_and_term(P),
+    {<<100,0,2,197,196>>,'ÅÄ'} = get_buf_and_term(P),
+    {<<100,0,1,197>>,'Å'} = get_buf_and_term(P),
+    {<<119,4,195,133,195,132>>,'ÅÄ'} = get_buf_and_term(P),
+
+    {<<119,1,$A>>,'A'} = get_buf_and_term(P),
+    {<<100,0,2,$A,$B>>,'AB'} = get_buf_and_term(P),
+    {<<100,0,255,_:(255*8)>>,_} = get_buf_and_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 %% ######################################################################## %%
@@ -297,20 +272,20 @@ test_ei_encode_utf8_atom_len(Config) ->
 get_buf_and_term(P) ->
     B = get_binaries(P),
     case B of
-	<<131>> ->
-	    io:format("(got single magic, no content)\n",[]),
-	    {B,'$$magic$$'};
-	<<131,_>> ->
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got magic)\n",[B,T]),
-	    {B,T};
-	_ ->
-	    B1 = list_to_binary([131,B]),	% No magic, add
-	    T = binary_to_term(B1),
-	    io:format("~w\n~w\n(got no magic)\n",[B,T]),
-	    {B,T}
+        <<131>> ->
+            io:format("(got single magic, no content)\n",[]),
+            {B,'$$magic$$'};
+        <<131,_>> ->
+            T = binary_to_term(B),
+            io:format("~w\n~w\n(got magic)\n",[B,T]),
+            {B,T};
+        _ ->
+            B1 = list_to_binary([131,B]),	% No magic, add
+            T = binary_to_term(B1),
+            io:format("~w\n~w\n(got no magic)\n",[B,T]),
+            {B,T}
     end.
-    
+
 
 get_binaries(P) ->
     B1 = get_binary(P),
@@ -319,14 +294,14 @@ get_binaries(P) ->
 
 get_binary(P) ->
     case runner:get_term(P) of
-	{bytes,L} ->
-	    B = list_to_binary(L),
-	    io:format("~w\n",[L]),
-% For strange reasons <<131>> show up as <>....
-%	    io:format("~w\n",[B]),
-	    B;
-	Other ->
-	    Other
+        {bytes,L} ->
+            B = list_to_binary(L),
+            io:format("~w\n",[L]),
+            % For strange reasons <<131>> show up as <>....
+            %	    io:format("~w\n",[B]),
+            B;
+        Other ->
+            Other
     end.
 
 %%
@@ -335,27 +310,26 @@ get_binary(P) ->
 
 get_term(P) ->
     case runner:get_term(P) of
-	{bytes,[131]} ->
-	    io:format("(got single magic, no content)\n",[]),
-	    '$$magic$$';
-	{bytes,[131,L]} ->
-	    B = list_to_binary(L),
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got magic)\n",[L,T]),
-	    T;
-	{bytes,L} ->
-	    B = list_to_binary([131,L]),
-	    T = binary_to_term(B),
-	    io:format("~w\n~w\n(got no magic)\n",[L,T]),
-	    T;
-	Other ->
-	    Other
+        {bytes,[131]} ->
+            io:format("(got single magic, no content)\n",[]),
+            '$$magic$$';
+        {bytes,[131,L]} ->
+            B = list_to_binary(L),
+            T = binary_to_term(B),
+            io:format("~w\n~w\n(got magic)\n",[L,T]),
+            T;
+        {bytes,L} ->
+            B = list_to_binary([131,L]),
+            T = binary_to_term(B),
+            io:format("~w\n~w\n(got no magic)\n",[L,T]),
+            T;
+        Other ->
+            Other
     end.
- 
+
 %%
 
 match_float(F, Match) when is_float(F), is_float(Match), F == Match ->
     true;
 match_float(F, Match) when is_float(F), F > Match*0.99, F < Match*1.01 ->
     true.
-    
diff --git a/lib/erl_interface/test/ei_format_SUITE.erl b/lib/erl_interface/test/ei_format_SUITE.erl
index 11cbae31db..0054e5a14b 100644
--- a/lib/erl_interface/test/ei_format_SUITE.erl
+++ b/lib/erl_interface/test/ei_format_SUITE.erl
@@ -21,158 +21,134 @@
 %%
 -module(ei_format_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_format_SUITE_data/ei_format_test_cases.hrl").
 
--export([
-	 format_wo_ver/1,
-	 all/0, suite/0,groups/0,
-	 init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 atoms/1, 
-	 tuples/1, 
-	 lists/1
-	]).
+-export([format_wo_ver/1,
+         all/0, suite/0,
+         atoms/1,
+         tuples/1,
+         lists/1]).
 
 -import(runner, [get_term/1]).
 
 %% This test suite test the erl_format() function.
 %% It uses the port program "ei_format_test".
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [format_wo_ver, atoms, tuples, lists].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 %% Tests formatting various atoms.
 
-atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
-    ?line P = runner:start(?atoms),
-
-    ?line {term, ''} = get_term(P),
-    ?line {term, 'a'} = get_term(P),
-    ?line {term, 'A'} = get_term(P),
-    ?line {term, 'abc'} = get_term(P),
-    ?line {term, 'Abc'} = get_term(P),
-    ?line {term, 'ab@c'} = get_term(P),
-    ?line {term, 'The rain in Spain stays mainly in the plains'} =
-	get_term(P),
-
-    ?line {term, a} = get_term(P),
-    ?line {term, ab} = get_term(P),
-    ?line {term, abc} = get_term(P),
-    ?line {term, ab@c} = get_term(P),
-    ?line {term, abcdefghijklmnopq} = get_term(P),
-
-    ?line {term, ''} = get_term(P),
-    ?line {term, 'a'} = get_term(P),
-    ?line {term, 'A'} = get_term(P),
-    ?line {term, 'abc'} = get_term(P),
-    ?line {term, 'Abc'} = get_term(P),
-    ?line {term, 'ab@c'} = get_term(P),
-    ?line {term, 'The rain in Spain stays mainly in the plains'} =
-	get_term(P),
-
-    ?line {term, a} = get_term(P),
-    ?line {term, ab} = get_term(P),
-    ?line {term, abc} = get_term(P),
-    ?line {term, ab@c} = get_term(P),
-    ?line {term, '   abcdefghijklmnopq   '} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?atoms),
+
+    {term, ''} = get_term(P),
+    {term, 'a'} = get_term(P),
+    {term, 'A'} = get_term(P),
+    {term, 'abc'} = get_term(P),
+    {term, 'Abc'} = get_term(P),
+    {term, 'ab@c'} = get_term(P),
+    {term, 'The rain in Spain stays mainly in the plains'} =
+    get_term(P),
+
+    {term, a} = get_term(P),
+    {term, ab} = get_term(P),
+    {term, abc} = get_term(P),
+    {term, ab@c} = get_term(P),
+    {term, abcdefghijklmnopq} = get_term(P),
+
+    {term, ''} = get_term(P),
+    {term, 'a'} = get_term(P),
+    {term, 'A'} = get_term(P),
+    {term, 'abc'} = get_term(P),
+    {term, 'Abc'} = get_term(P),
+    {term, 'ab@c'} = get_term(P),
+    {term, 'The rain in Spain stays mainly in the plains'} =
+    get_term(P),
+
+    {term, a} = get_term(P),
+    {term, ab} = get_term(P),
+    {term, abc} = get_term(P),
+    {term, ab@c} = get_term(P),
+    {term, '   abcdefghijklmnopq   '} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 
 %% Tests formatting various tuples
 
-tuples(suite) -> [];
 tuples(Config) when is_list(Config) ->
-    ?line P = runner:start(?tuples),
-
-    ?line {term, {}} = get_term(P),
-    ?line {term, {a}} = get_term(P),
-    ?line {term, {a, b}} = get_term(P),
-    ?line {term, {a, b, c}} = get_term(P),
-    ?line {term, {1}} = get_term(P),
-    ?line {term, {[]}} = get_term(P),
-    ?line {term, {[], []}} = get_term(P),
-    ?line {term, {[], a, b, c}} = get_term(P),
-    ?line {term, {[], a, [], b, c}} = get_term(P),
-    ?line {term, {[], a, '', b, c}} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?tuples),
+
+    {term, {}} = get_term(P),
+    {term, {a}} = get_term(P),
+    {term, {a, b}} = get_term(P),
+    {term, {a, b, c}} = get_term(P),
+    {term, {1}} = get_term(P),
+    {term, {[]}} = get_term(P),
+    {term, {[], []}} = get_term(P),
+    {term, {[], a, b, c}} = get_term(P),
+    {term, {[], a, [], b, c}} = get_term(P),
+    {term, {[], a, '', b, c}} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 
 %% Tests formatting various lists
 
-lists(suite) -> [];
 lists(Config) when is_list(Config) ->
-    ?line P = runner:start(?lists),
-
-    ?line {term, []} = get_term(P),
-    ?line {term, [a]} = get_term(P),
-    ?line {term, [a, b]} = get_term(P),
-    ?line {term, [a, b, c]} = get_term(P),
-    ?line {term, [1]} = get_term(P),
-    ?line {term, [[]]} = get_term(P),
-    ?line {term, [[], []]} = get_term(P),
-    ?line {term, [[], a, b, c]} = get_term(P),
-    ?line {term, [[], a, [], b, c]} = get_term(P),
-    ?line {term, [[], a, '', b, c]} = get_term(P),
-    ?line {term, [[x, 2], [y, 3], [z, 4]]}= get_term(P),
-    ?line {term, [{a,b},{c,d}]}= get_term(P),
-%%    ?line {term, [{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]} = 
-%%	get_term(P),
-    
-    ?line {term, [{pi, F1}, {'cos(70)', F2}]} = get_term(P),
+    P = runner:start(?lists),
+
+    {term, []} = get_term(P),
+    {term, [a]} = get_term(P),
+    {term, [a, b]} = get_term(P),
+    {term, [a, b, c]} = get_term(P),
+    {term, [1]} = get_term(P),
+    {term, [[]]} = get_term(P),
+    {term, [[], []]} = get_term(P),
+    {term, [[], a, b, c]} = get_term(P),
+    {term, [[], a, [], b, c]} = get_term(P),
+    {term, [[], a, '', b, c]} = get_term(P),
+    {term, [[x, 2], [y, 3], [z, 4]]}= get_term(P),
+    {term, [{a,b},{c,d}]} = get_term(P),
+    %% {term, [{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]} = get_term(P),
+
+    {term, [{pi, F1}, {'cos(70)', F2}]} = get_term(P),
     %% don't match floats directly
     true= abs(3.1415-F1) < 0.01,
     true= abs(0.34202-F2) < 0.01,
 
-    ?line {term, [[pi, F3], ['cos(70)', F4]]} = get_term(P),
+    {term, [[pi, F3], ['cos(70)', F4]]} = get_term(P),
     true= abs(3.1415-F3) < 0.01,
     true= abs(0.34202-F4) < 0.01,
 
 
-%%    ?line {term, [[pi, 3.1415], [], ["cos(70)", 0.34202]]} = get_term(P),
-    ?line {term, [-1]} = get_term(P),
-    ?line {term, "hejsan"} = get_term(P),
+    %%    {term, [[pi, 3.1415], [], ["cos(70)", 0.34202]]} = get_term(P),
+    {term, [-1]} = get_term(P),
+    {term, "hejsan"} = get_term(P),
 
 
-    ?line Str1 = lists:duplicate(65535,$A),
-    ?line Str2 = lists:duplicate(65536,$A),
-    ?line {term,Str1} = get_term(P),
-    ?line {term,Str2} = get_term(P),
+    Str1 = lists:duplicate(65535,$A),
+    Str2 = lists:duplicate(65536,$A),
+    {term,Str1} = get_term(P),
+    {term,Str2} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
-format_wo_ver(suite) -> [];
 format_wo_ver(Config) when is_list(Config) ->
-    ?line P = runner:start(?format_wo_ver),
+    P = runner:start(?format_wo_ver),
 
-    ?line {term, [-1, 2, $c, {a, "b"}, {c, 10}]} = get_term(P),
+    {term, [-1, 2, $c, {a, "b"}, {c, 10}]} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
diff --git a/lib/erl_interface/test/ei_print_SUITE.erl b/lib/erl_interface/test/ei_print_SUITE.erl
index 4309b883bb..5b5589713e 100644
--- a/lib/erl_interface/test/ei_print_SUITE.erl
+++ b/lib/erl_interface/test/ei_print_SUITE.erl
@@ -21,144 +21,120 @@
 %%
 -module(ei_print_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("ei_print_SUITE_data/ei_print_test_cases.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 atoms/1, tuples/1, lists/1, strings/1]).
+-export([all/0, suite/0,
+         atoms/1, tuples/1, lists/1, strings/1]).
 
 -import(runner, [get_term/1]).
 
 %% This test suite test the ei_print() function.
 %% It uses the port program "ei_format_test".
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [atoms, tuples, lists, strings].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 %% Tests formatting various atoms.
 
-atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
-    ?line P = runner:start(?atoms),
-
-    ?line {term, "''"} = get_term(P),
-    ?line {term, "a"} = get_term(P),
-    ?line {term, "'A'"} = get_term(P),
-    ?line {term, "abc"} = get_term(P),
-    ?line {term, "'Abc'"} = get_term(P),
-    ?line {term, "ab@c"} = get_term(P),
-    ?line {term, "'The rain in Spain stays mainly in the plains'"} =
-	get_term(P),
-
-    ?line {term, "a"} = get_term(P),
-    ?line {term, "ab"} = get_term(P),
-    ?line {term, "abc"} = get_term(P),
-    ?line {term, "ab@c"} = get_term(P),
-    ?line {term, "abcdefghijklmnopq"} = get_term(P),
-
-    ?line {term, "''"} = get_term(P),
-    ?line {term, "a"} = get_term(P),
-    ?line {term, "'A'"} = get_term(P),
-    ?line {term, "abc"} = get_term(P),
-    ?line {term, "'Abc'"} = get_term(P),
-    ?line {term, "ab@c"} = get_term(P),
-    ?line {term, "'The rain in Spain stays mainly in the plains'"} =
-	get_term(P),
-
-    ?line {term, "a"} = get_term(P),
-    ?line {term, "ab"} = get_term(P),
-    ?line {term, "abc"} = get_term(P),
-    ?line {term, "ab@c"} = get_term(P),
-    ?line {term, "'   abcdefghijklmnopq   '"} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?atoms),
+
+    {term, "''"} = get_term(P),
+    {term, "a"} = get_term(P),
+    {term, "'A'"} = get_term(P),
+    {term, "abc"} = get_term(P),
+    {term, "'Abc'"} = get_term(P),
+    {term, "ab@c"} = get_term(P),
+    {term, "'The rain in Spain stays mainly in the plains'"} = get_term(P),
+
+    {term, "a"} = get_term(P),
+    {term, "ab"} = get_term(P),
+    {term, "abc"} = get_term(P),
+    {term, "ab@c"} = get_term(P),
+    {term, "abcdefghijklmnopq"} = get_term(P),
+
+    {term, "''"} = get_term(P),
+    {term, "a"} = get_term(P),
+    {term, "'A'"} = get_term(P),
+    {term, "abc"} = get_term(P),
+    {term, "'Abc'"} = get_term(P),
+    {term, "ab@c"} = get_term(P),
+    {term, "'The rain in Spain stays mainly in the plains'"} = get_term(P),
+
+    {term, "a"} = get_term(P),
+    {term, "ab"} = get_term(P),
+    {term, "abc"} = get_term(P),
+    {term, "ab@c"} = get_term(P),
+    {term, "'   abcdefghijklmnopq   '"} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 
 %% Tests formatting various tuples
 
-tuples(suite) -> [];
 tuples(Config) when is_list(Config) ->
-    ?line P = runner:start(?tuples),
-
-    ?line {term, "{}"} = get_term(P),
-    ?line {term, "{a}"} = get_term(P),
-    ?line {term, "{a, b}"} = get_term(P),
-    ?line {term, "{a, b, c}"} = get_term(P),
-    ?line {term, "{1}"} = get_term(P),
-    ?line {term, "{[]}"} = get_term(P),
-    ?line {term, "{[], []}"} = get_term(P),
-    ?line {term, "{[], a, b, c}"} = get_term(P),
-    ?line {term, "{[], a, [], b, c}"} = get_term(P),
-    ?line {term, "{[], a, '', b, c}"} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?tuples),
+
+    {term, "{}"} = get_term(P),
+    {term, "{a}"} = get_term(P),
+    {term, "{a, b}"} = get_term(P),
+    {term, "{a, b, c}"} = get_term(P),
+    {term, "{1}"} = get_term(P),
+    {term, "{[]}"} = get_term(P),
+    {term, "{[], []}"} = get_term(P),
+    {term, "{[], a, b, c}"} = get_term(P),
+    {term, "{[], a, [], b, c}"} = get_term(P),
+    {term, "{[], a, '', b, c}"} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 
 %% Tests formatting various lists
 
-lists(suite) -> [];
 lists(Config) when is_list(Config) ->
-    ?line P = runner:start(?lists),
-
-    ?line {term, "[]"} = get_term(P),
-    ?line {term, "[a]"} = get_term(P),
-    ?line {term, "[a, b]"} = get_term(P),
-    ?line {term, "[a, b, c]"} = get_term(P),
-    ?line {term, "[1]"} = get_term(P),
-    ?line {term, "[[]]"} = get_term(P),
-    ?line {term, "[[], []]"} = get_term(P),
-    ?line {term, "[[], a, b, c]"} = get_term(P),
-    ?line {term, "[[], a, [], b, c]"} = get_term(P),
-    ?line {term, "[[], a, '', b, c]"} = get_term(P),
-    ?line {term, "[[x, 2], [y, 3], [z, 4]]"}= get_term(P),
-
-%%    ?line {term, "[{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]"} = 
-%%	get_term(P),
+    P = runner:start(?lists),
+
+    {term, "[]"} = get_term(P),
+    {term, "[a]"} = get_term(P),
+    {term, "[a, b]"} = get_term(P),
+    {term, "[a, b, c]"} = get_term(P),
+    {term, "[1]"} = get_term(P),
+    {term, "[[]]"} = get_term(P),
+    {term, "[[], []]"} = get_term(P),
+    {term, "[[], a, b, c]"} = get_term(P),
+    {term, "[[], a, [], b, c]"} = get_term(P),
+    {term, "[[], a, '', b, c]"} = get_term(P),
+    {term, "[[x, 2], [y, 3], [z, 4]]"}= get_term(P),
+
+    %% {term, "[{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]"} = get_term(P),
     %% maybe regexp instead?
-    ?line {term, "[{pi, 3.141500}, {'cos(70)', 0.342020}]"} = get_term(P),
-    ?line {term, "[[pi, 3.141500], ['cos(70)', 0.342020]]"} = get_term(P),
+    {term, "[{pi, 3.141500}, {'cos(70)', 0.342020}]"} = get_term(P),
+    {term, "[[pi, 3.141500], ['cos(70)', 0.342020]]"} = get_term(P),
 
-    ?line {term, "[-1]"} = get_term(P),
+    {term, "[-1]"} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
-strings(suite) -> [];
 strings(Config) when is_list(Config) ->
-    ?line P = runner:start(?strings),
-
-    ?line {term, "\"\\n\""} = get_term(P),
-    ?line {term, "\"\\r\\n\""} = get_term(P),
-    ?line {term, "\"a\""} = get_term(P),
-    ?line {term, "\"A\""} = get_term(P),
-    ?line {term, "\"0\""} = get_term(P),
-    ?line {term, "\"9\""} = get_term(P),
-    ?line {term, "\"The rain in Spain stays mainly in the plains\""} = get_term(P),
-    ?line {term, "\"   abcdefghijklmnopq   \""} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?strings),
+
+    {term, "\"\\n\""} = get_term(P),
+    {term, "\"\\r\\n\""} = get_term(P),
+    {term, "\"a\""} = get_term(P),
+    {term, "\"A\""} = get_term(P),
+    {term, "\"0\""} = get_term(P),
+    {term, "\"9\""} = get_term(P),
+    {term, "\"The rain in Spain stays mainly in the plains\""} = get_term(P),
+    {term, "\"   abcdefghijklmnopq   \""} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
-    
diff --git a/lib/erl_interface/test/ei_tmo_SUITE.erl b/lib/erl_interface/test/ei_tmo_SUITE.erl
index 689499f42f..4cd4202116 100644
--- a/lib/erl_interface/test/ei_tmo_SUITE.erl
+++ b/lib/erl_interface/test/ei_tmo_SUITE.erl
@@ -21,182 +21,154 @@
 %%
 -module(ei_tmo_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/inet.hrl").
 -include("ei_tmo_SUITE_data/ei_tmo_test_cases.hrl").
 
 -define(dummy_host,test01).
 
--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,
-	 framework_check/1, ei_accept_tmo/1, ei_connect_tmo/1, ei_send_tmo/1,
-	 ei_recv_tmo/1]).
+-export([all/0, suite/0,
+         init_per_testcase/2, end_per_testcase/2,
+         framework_check/1, ei_accept_tmo/1, ei_connect_tmo/1, ei_send_tmo/1,
+         ei_recv_tmo/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() -> 
     [framework_check, ei_accept_tmo, ei_connect_tmo,
      ei_send_tmo, ei_recv_tmo].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(1)),
     % test if platform is vxworks_simso
-    ?line {_,Host} = split(node()),
+    {_,Host} = split(node()),
     Bool = case atom_to_list(Host) of
-		[$v,$x,$s,$i,$m | _] -> true;
-		_ -> false
-	    end,
-    [{vxsim,Bool},{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+               [$v,$x,$s,$i,$m | _] -> true;
+               _ -> false
+           end,
+    [{vxsim,Bool}|Config].
+
+end_per_testcase(_Case, _Config) ->
     ok.
 
-framework_check(doc) ->
-    ["Check the framework."];
-framework_check(suite) ->
-    [];
+%% Check the framework.
 framework_check(Config) when is_list(Config) ->
     %%dbg:tracer(),
     %%dbg:p(self()),
-    ?line P = runner:start(?framework_check),
-    ?line runner:send_term(P,{hello,world}),
-    ?line {term, {hello,world}} = runner:get_term(P),
-    ?line runner:recv_eot(P),
+    P = runner:start(?framework_check),
+    runner:send_term(P,{hello,world}),
+    {term, {hello,world}} = runner:get_term(P),
+    runner:recv_eot(P),
     ok.
 
 
-ei_recv_tmo(doc) ->
-    ["Check recv with timeouts."];
-ei_recv_tmo(suite) ->
-    [];
+%% Check recv with timeouts.
 ei_recv_tmo(Config) when is_list(Config) ->
-    ?line do_one_recv(Config,c_node_recv_tmo_1),
-    ?line do_one_recv_failure(Config,c_node_recv_tmo_2),
+    do_one_recv(Config,c_node_recv_tmo_1),
+    do_one_recv_failure(Config,c_node_recv_tmo_2),
     ok.
 
 
 do_one_recv(Config,CNode) ->
-    ?line {_,Host} = split(node()),
-    ?line P1 = runner:start(?recv_tmo),
-    ?line runner:send_term(P1,{CNode,
-			       erlang:get_cookie(),
-			       node()}),
-    ?line {term, X} = runner:get_term(P1, 10000),
-    ?line true = is_integer(X),
-    ?line CNode1 = join(CNode,Host),
-    ?line Term1 = {hej,[hopp,{i,[lingon,"skogen"]}]},
-    ?line {test,CNode1} ! Term1,
-    ?line {term, Term1} = runner:get_term(P1, 10000),
-    ?line runner:recv_eot(P1).
-    
+    {_,Host} = split(node()),
+    P1 = runner:start(?recv_tmo),
+    runner:send_term(P1,{CNode,
+                         erlang:get_cookie(),
+                         node()}),
+    {term, X} = runner:get_term(P1, 10000),
+    true = is_integer(X),
+    CNode1 = join(CNode,Host),
+    Term1 = {hej,[hopp,{i,[lingon,"skogen"]}]},
+    {test,CNode1} ! Term1,
+    {term, Term1} = runner:get_term(P1, 10000),
+    runner:recv_eot(P1).
+
 do_one_recv_failure(Config,CNode) ->
-    ?line P1 = runner:start(?recv_tmo),
-    ?line runner:send_term(P1,{CNode,
-			       erlang:get_cookie(),
-			       node()}),
-    ?line {term, X} = runner:get_term(P1, 10000),
-    ?line true = is_integer(X),
-    ?line {term, {Ret,ETimedout,ETimedout}} = runner:get_term(P1, 10000),
-    ?line true = (Ret < 0),
-    ?line runner:recv_eot(P1).
-    
-
-ei_send_tmo(doc) ->
-    ["Check send with timeouts."];
-ei_send_tmo(suite) ->
-    [];
+    P1 = runner:start(?recv_tmo),
+    runner:send_term(P1,{CNode,
+                         erlang:get_cookie(),
+                         node()}),
+    {term, X} = runner:get_term(P1, 10000),
+    true = is_integer(X),
+    {term, {Ret,ETimedout,ETimedout}} = runner:get_term(P1, 10000),
+    true = (Ret < 0),
+    runner:recv_eot(P1).
+
+
+%% Check send with timeouts.
 ei_send_tmo(Config) when is_list(Config) ->
     %dbg:tracer(),
     %dbg:p(self()),
-    VxSim = ?config(vxsim, Config),
-    ?line register(ei_send_tmo_1,self()),
-    ?line do_one_send(Config,self(),c_node_send_tmo_1),
-    ?line do_one_send(Config,ei_send_tmo_1,c_node_send_tmo_2),
-    ?line do_one_send_failure(Config,self(),cccc1,c_nod_send_tmo_3,VxSim),
-    ?line do_one_send_failure(Config,ei_send_tmo_1,cccc2,c_nod_send_tmo_4,VxSim),
+    VxSim = proplists:get_value(vxsim, Config),
+    register(ei_send_tmo_1,self()),
+    do_one_send(Config,self(),c_node_send_tmo_1),
+    do_one_send(Config,ei_send_tmo_1,c_node_send_tmo_2),
+    do_one_send_failure(Config,self(),cccc1,c_nod_send_tmo_3,VxSim),
+    do_one_send_failure(Config,ei_send_tmo_1,cccc2,c_nod_send_tmo_4,VxSim),
     ok.
-    
+
 
 do_one_send(Config,From,CNode) ->
-    ?line {_,Host} = split(node()),
-    ?line P1 = runner:start(?send_tmo),
-    ?line runner:send_term(P1,{CNode,
-			      erlang:get_cookie(),
-			      node()}),
-    ?line {term, X} = runner:get_term(P1, 10000),
-    ?line true = is_integer(X),
-    ?line CNode1 = join(CNode,Host),
-    ?line Term1 = {hej,[hopp,{i,[lingon,"skogen"]}]},
-    ?line {test,CNode1} ! {From,1,Term1},
-    ?line ok = receive
-		   Term1 ->
-		       ok
-	       after 2000 ->
-		       error
-	       end,
-    ?line {term, 0} = runner:get_term(P1, 10000),
-    ?line runner:recv_eot(P1).
+    {_,Host} = split(node()),
+    P1 = runner:start(?send_tmo),
+    runner:send_term(P1,{CNode,
+                         erlang:get_cookie(),
+                         node()}),
+    {term, X} = runner:get_term(P1, 10000),
+    true = is_integer(X),
+    CNode1 = join(CNode,Host),
+    Term1 = {hej,[hopp,{i,[lingon,"skogen"]}]},
+    {test,CNode1} ! {From,1,Term1},
+    ok = receive
+             Term1 ->
+                 ok
+         after 2000 ->
+                   error
+         end,
+    {term, 0} = runner:get_term(P1, 10000),
+    runner:recv_eot(P1).
 
 do_one_send_failure(Config,From,FakeName,CName,VxSim) ->
-    ?line {_,Host} = split(node()),
-    ?line OurName = join(FakeName,Host),
-    ?line Node = join(CName,Host),
-    ?line LSocket = case gen_tcp:listen(0, [{active, false}, {packet,2}]) of
-			{ok, Socket} ->
-			    ?line Socket;
-			Else ->
-			    ?line exit(Else)
-		    end,
-    ?line EpmdSocket = register(OurName, LSocket, 1, 5),
-    ?line P3 = runner:start(?send_tmo),
-    ?line Cookie = kaksmula_som_ingen_bryr_sig_om,
-    ?line runner:send_term(P3,{CName,
-			      Cookie,
-			      OurName}),
-    ?line SocketB = case gen_tcp:accept(LSocket) of
-		  {ok, Socket1} ->
-		      ?line Socket1;
-		  Else2 ->
-		      ?line exit(Else2)
-	      end,
-    ?line {hidden,Node,5} = recv_name(SocketB),  % See 1)
-    ?line send_status(SocketB, ok),
-    ?line MyChallengeB = gen_challenge(),
-    ?line send_challenge(SocketB, OurName, MyChallengeB, 5),
-    ?line HisChallengeB = recv_challenge_reply(
-			    SocketB, 
-			    MyChallengeB, 
-			    Cookie),
-    ?line DigestB = gen_digest(HisChallengeB,Cookie),
-    ?line send_challenge_ack(SocketB, DigestB),
-    ?line inet:setopts(SocketB, [{active, false},
-			  {packet, 4}]),   
-    ?line {term, X} = runner:get_term(P3, 10000),
-    ?line true = is_integer(X),
-    ?line Message = [112,term_to_binary({6,self(),'',test}),
-		     term_to_binary({From,10000,
-				     {app,["lapp",{sa,["att",du,{slapp,
-								 sitta}]}]}})],
-    ?line gen_tcp:send(SocketB,Message),
+    {_,Host} = split(node()),
+    OurName = join(FakeName,Host),
+    Node = join(CName,Host),
+    LSocket = case gen_tcp:listen(0, [{active, false}, {packet,2}]) of
+                  {ok, Socket} ->
+                      Socket;
+                  Else ->
+                      exit(Else)
+              end,
+    EpmdSocket = register(OurName, LSocket, 1, 5),
+    P3 = runner:start(?send_tmo),
+    Cookie = kaksmula_som_ingen_bryr_sig_om,
+    runner:send_term(P3,{CName,
+                         Cookie,
+                         OurName}),
+    SocketB = case gen_tcp:accept(LSocket) of
+                  {ok, Socket1} ->
+                      Socket1;
+                  Else2 ->
+                      exit(Else2)
+              end,
+    {hidden,Node,5} = recv_name(SocketB),  % See 1)
+    send_status(SocketB, ok),
+    MyChallengeB = gen_challenge(),
+    send_challenge(SocketB, OurName, MyChallengeB, 5),
+    HisChallengeB = recv_challenge_reply(SocketB,
+                                         MyChallengeB,
+                                         Cookie),
+    DigestB = gen_digest(HisChallengeB,Cookie),
+    send_challenge_ack(SocketB, DigestB),
+    inet:setopts(SocketB, [{active, false},
+                           {packet, 4}]),
+    {term, X} = runner:get_term(P3, 10000),
+    true = is_integer(X),
+    Message = [112,term_to_binary({6,self(),'',test}),
+               term_to_binary({From,10000,
+                               {app,["lapp",{sa,["att",du,{slapp,
+                                                           sitta}]}]}})],
+    gen_tcp:send(SocketB,Message),
 
     %% At this point the test program starts sending messages (max 10000). Since 
     %% we're not receiving, eventually the send buffer fills up. Then no more 
@@ -204,152 +176,145 @@ do_one_send_failure(Config,From,FakeName,CName,VxSim) ->
     %% before this happens is returned in Iters. The timeout value for get_term/2
     %% must be large enough so there's time for the select() to time out and
     %% the test program to return the error tuple (below).
-    Res0 =
-	if VxSim == false ->
-		?line {term,{Res,ETO,Iters,ETO}} = runner:get_term(P3, 20000),
-		Res;	   
-	   true ->				% relax the test for vxsim
-		?line case runner:get_term(P3, 20000) of
-			  {term,{Res,ETO,Iters,ETO}} -> 
-			      Res;
-			  {term,{Res,_,Iters,ETO}} -> % EIO?
-			      Res
-		      end
-	end,
-    ?line runner:recv_eot(P3),
-    ?line true = ((Res0 < 0) and (Iters > 0)),
-    ?line gen_tcp:close(SocketB),
-    ?line gen_tcp:close(EpmdSocket),
+
+    Res0 = if VxSim == false ->
+                  {term,{Res,ETO,Iters,ETO}} = runner:get_term(P3, 20000),
+                  Res;
+              true ->   % relax the test for vxsim
+                  case runner:get_term(P3, 20000) of
+                      {term,{Res,ETO,Iters,ETO}} ->
+                          Res;
+                      {term,{Res,_,Iters,_ETO}} -> % EIO?
+                          Res
+                  end
+           end,
+    runner:recv_eot(P3),
+    true = ((Res0 < 0) and (Iters > 0)),
+    gen_tcp:close(SocketB),
+    gen_tcp:close(EpmdSocket),
     ok.
-    
 
-ei_connect_tmo(doc) ->
-    ["Check accept with timeouts."];
-ei_connect_tmo(suite) ->
-    [];
+
+%% Check accept with timeouts.
 ei_connect_tmo(Config) when is_list(Config) ->
     %dbg:tracer(),
     %dbg:p(self()),
-    VxSim = ?config(vxsim, Config),
+    VxSim = proplists:get_value(vxsim, Config),
     DummyNode = make_and_check_dummy(),
-    ?line P = runner:start(?connect_tmo),
-    ?line runner:send_term(P,{c_nod_connect_tmo_1,
-			      kaksmula_som_ingen_bryr_sig_om,
-			      DummyNode}),
+    P = runner:start(?connect_tmo),
+    runner:send_term(P,{c_nod_connect_tmo_1,
+                        kaksmula_som_ingen_bryr_sig_om,
+                        DummyNode}),
     ETimedout =
-	if VxSim == false ->
-		?line {term,{-3,ETO,ETO}} = runner:get_term(P, 10000),
-		?line ETO;
-	   true ->				% relax the test for vxsim
-		?line case runner:get_term(P, 10000) of
-			  {term,{-3,ETO,ETO}} -> 
-			      ?line ETO;
-			  {term,{-1,_,ETO}} ->	% EHOSTUNREACH = ok
-			      ?line ETO
-		      end
-	end,
-    ?line runner:recv_eot(P),
-    ?line P2 = runner:start(?connect_tmo),
-    ?line runner:send_term(P2,{c_nod_connect_tmo_2,
-			       erlang:get_cookie(),
-			       node()}),
-    ?line {term, X} = runner:get_term(P2, 10000),
-    ?line runner:recv_eot(P2),
-    ?line true = is_integer(X),
+    if VxSim == false ->
+           {term,{-3,ETO,ETO}} = runner:get_term(P, 10000),
+           ETO;
+       true ->				% relax the test for vxsim
+           case runner:get_term(P, 10000) of
+               {term,{-3,ETO,ETO}} ->
+                   ETO;
+               {term,{-1,_,ETO}} ->	% EHOSTUNREACH = ok
+                   ETO
+           end
+    end,
+    runner:recv_eot(P),
+    P2 = runner:start(?connect_tmo),
+    runner:send_term(P2,{c_nod_connect_tmo_2,
+                         erlang:get_cookie(),
+                         node()}),
+    {term, X} = runner:get_term(P2, 10000),
+    runner:recv_eot(P2),
+    true = is_integer(X),
     %% Aborted handshake test...
-    ?line {_,Host} = split(node()),
-    ?line OurName = join(cccc,Host),
-    ?line Node = join(c_nod_connect_tmo_3,Host),
-    ?line LSocket = case gen_tcp:listen(0, [{active, false}, {packet,2}]) of
-			{ok, Socket} ->
-			    ?line Socket;
-			Else ->
-			    ?line exit(Else)
-		    end,
-    ?line EpmdSocket = register(OurName, LSocket, 1, 5),
-    ?line P3 = runner:start(?connect_tmo),
-    ?line Cookie = kaksmula_som_ingen_bryr_sig_om,
-    ?line runner:send_term(P3,{c_nod_connect_tmo_3,
-			      Cookie,
-			      OurName}),
-    ?line SocketB = case gen_tcp:accept(LSocket) of
-		  {ok, Socket1} ->
-		      ?line Socket1;
-		  Else2 ->
-		      ?line exit(Else2)
-	      end,
-    ?line {hidden,Node,5} = recv_name(SocketB),  % See 1)
-    ?line send_status(SocketB, ok),
-    ?line MyChallengeB = gen_challenge(),
-    ?line send_challenge(SocketB, OurName, MyChallengeB, 5),
-    ?line HisChallengeB = recv_challenge_reply(
-			    SocketB, 
-			    MyChallengeB, 
-			    Cookie),
-    ?line {term,{-1,ETimedout,ETimedout}} = runner:get_term(P3, 10000),
-    ?line runner:recv_eot(P3),
-    ?line gen_tcp:close(SocketB),
-    ?line gen_tcp:close(EpmdSocket),
+    {_,Host} = split(node()),
+    OurName = join(cccc,Host),
+    Node = join(c_nod_connect_tmo_3,Host),
+    LSocket = case gen_tcp:listen(0, [{active, false}, {packet,2}]) of
+                  {ok, Socket} ->
+                      Socket;
+                  Else ->
+                      exit(Else)
+              end,
+    EpmdSocket = register(OurName, LSocket, 1, 5),
+    P3 = runner:start(?connect_tmo),
+    Cookie = kaksmula_som_ingen_bryr_sig_om,
+    runner:send_term(P3,{c_nod_connect_tmo_3,
+                         Cookie,
+                         OurName}),
+    SocketB = case gen_tcp:accept(LSocket) of
+                  {ok, Socket1} ->
+                      Socket1;
+                  Else2 ->
+                      exit(Else2)
+              end,
+    {hidden,Node,5} = recv_name(SocketB),  % See 1)
+    send_status(SocketB, ok),
+    MyChallengeB = gen_challenge(),
+    send_challenge(SocketB, OurName, MyChallengeB, 5),
+    _HisChallengeB = recv_challenge_reply(SocketB,
+                                          MyChallengeB,
+                                          Cookie),
+    {term,{-1,ETimedout,ETimedout}} = runner:get_term(P3, 10000),
+    runner:recv_eot(P3),
+    gen_tcp:close(SocketB),
+    gen_tcp:close(EpmdSocket),
     ok.
-    
 
-ei_accept_tmo(doc) ->
-    ["Check accept with timeouts."];
-ei_accept_tmo(suite) ->
-    [];
+
+%% Check accept with timeouts.
 ei_accept_tmo(Config) when is_list(Config) ->
     %%dbg:tracer(),
     %%dbg:p(self()),
-    ?line P = runner:start(?accept_tmo),
-    ?line runner:send_term(P,{c_nod_som_ingen_kontaktar_1,
-			      kaksmula_som_ingen_bryr_sig_om}),
-    ?line {term,{-1,ETimedout,ETimedout}} = runner:get_term(P, 10000),
-    ?line runner:recv_eot(P),
-    ?line P2 = runner:start(?accept_tmo),
-    ?line runner:send_term(P2,{c_nod_som_vi_kontaktar_1,
-			      erlang:get_cookie()}),
-    ?line receive after 1000 -> ok end,
-    ?line CNode1 = make_node(c_nod_som_vi_kontaktar_1),
-    ?line {ignored,CNode1} ! tjenare,
-    ?line {term, X} = runner:get_term(P2, 10000),
-    ?line runner:recv_eot(P2),
-    ?line true = is_integer(X),
-    ?line P3 = runner:start(?accept_tmo),
-    ?line runner:send_term(P3,{c_nod_som_vi_kontaktar_2,
-			      erlang:get_cookie()}),
-    ?line receive after 1000 -> ok end,
-    ?line CNode2 = make_node(c_nod_som_vi_kontaktar_2),
-    ?line {NA,NB} = split(CNode2),
-    ?line {_,Host} = split(node()),
-    ?line OurName = join(ccc,Host),
-    ?line {port,PortNo,_} = erl_epmd:port_please(NA,NB),
-    ?line {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
-					  [{active,false},
-					   {packet,2}]),
-    ?line send_name(SocketA,OurName,5),
-    ?line ok = recv_status(SocketA),
-    ?line {hidden,Node,5,HisChallengeA} = recv_challenge(SocketA), % See 1)
-    ?line OurChallengeA = gen_challenge(),
-    ?line OurDigestA = gen_digest(HisChallengeA, erlang:get_cookie()),
+    P = runner:start(?accept_tmo),
+    runner:send_term(P,{c_nod_som_ingen_kontaktar_1,
+                        kaksmula_som_ingen_bryr_sig_om}),
+    {term,{-1,ETimedout,ETimedout}} = runner:get_term(P, 10000),
+    runner:recv_eot(P),
+    P2 = runner:start(?accept_tmo),
+    runner:send_term(P2,{c_nod_som_vi_kontaktar_1,
+                         erlang:get_cookie()}),
+    receive after 1000 -> ok end,
+    CNode1 = make_node(c_nod_som_vi_kontaktar_1),
+    {ignored,CNode1} ! tjenare,
+    {term, X} = runner:get_term(P2, 10000),
+    runner:recv_eot(P2),
+    true = is_integer(X),
+    P3 = runner:start(?accept_tmo),
+    runner:send_term(P3,{c_nod_som_vi_kontaktar_2,
+                         erlang:get_cookie()}),
+    receive after 1000 -> ok end,
+    CNode2 = make_node(c_nod_som_vi_kontaktar_2),
+    {NA,NB} = split(CNode2),
+    {_,Host} = split(node()),
+    OurName = join(ccc,Host),
+    {port,PortNo,_} = erl_epmd:port_please(NA,NB),
+    {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
+                                    [{active,false},
+                                     {packet,2}]),
+    send_name(SocketA,OurName,5),
+    ok = recv_status(SocketA),
+    {hidden,_Node,5,HisChallengeA} = recv_challenge(SocketA), % See 1)
+    _OurChallengeA = gen_challenge(),
+    _OurDigestA = gen_digest(HisChallengeA, erlang:get_cookie()),
     %% Dont do the last two steps of the connection setup...
     %% send_challenge_reply(SocketA, OurChallengeA, OurDigestA),
     %% ok = recv_challenge_ack(SocketA, OurChallengeA, erlang:get_cookie()),
-    ?line {term, {-1,ETimedout,ETimedout}} = runner:get_term(P3, 10000),
-    ?line runner:recv_eot(P3),
-    ?line gen_tcp:close(SocketA),
+    {term, {-1,ETimedout,ETimedout}} = runner:get_term(P3, 10000),
+    runner:recv_eot(P3),
+    gen_tcp:close(SocketA),
     ok.
 
 make_node(X) ->
     list_to_atom(atom_to_list(X) ++ "@" ++ 
-		 hd(tl(string:tokens(atom_to_list(node()),"@")))).
+                 hd(tl(string:tokens(atom_to_list(node()),"@")))).
 
 
 make_and_check_dummy() ->
     % First check that the host has an ip and is *not* reachable
-    ?line case gen_tcp:connect(?dummy_host,23,[{active,false}],5000) of
-	      {error,timeout} -> ok;
-	      {error,ehostunreach} -> ok
-	  end,
+    case gen_tcp:connect(?dummy_host,23,[{active,false}],5000) of
+        {error,timeout} -> ok;
+        {error,ehostunreach} -> ok
+    end,
 
     list_to_atom("dummy@"++atom_to_list(?dummy_host)).
 
@@ -359,12 +324,12 @@ make_and_check_dummy() ->
 %%
 
 -define(to_port(Socket, Data),
-	case inet_tcp:send(Socket, Data) of
-	    {error, closed} ->
-		self() ! {tcp_closed, Socket},
-	        {error, closed};
-	    R ->
-	        R
+        case inet_tcp:send(Socket, Data) of
+            {error, closed} ->
+                self() ! {tcp_closed, Socket},
+                {error, closed};
+            R ->
+                R
         end).
 
 -define(DFLAG_PUBLISHED,1).
@@ -382,8 +347,8 @@ make_and_check_dummy() ->
 -define(int16(X), [((X) bsr 8) band 16#ff, (X) band 16#ff]).
 
 -define(int32(X), 
-	[((X) bsr 24) band 16#ff, ((X) bsr 16) band 16#ff,
-	 ((X) bsr 8) band 16#ff, (X) band 16#ff]).
+        [((X) bsr 24) band 16#ff, ((X) bsr 16) band 16#ff,
+         ((X) bsr 8) band 16#ff, (X) band 16#ff]).
 
 -define(i16(X1,X0),
         (?u16(X1,X0) - 
@@ -406,9 +371,9 @@ make_and_check_dummy() ->
 %% This is no proper random number, but that is not really important in 
 %% this test
 gen_challenge() ->
-    {_,_,N} = erlang:now(), 
+    {_,_,N} = os:timestamp(),
     N.
-    
+
 %% Generate a message digest from Challenge number and Cookie	
 gen_digest(Challenge, Cookie) when is_integer(Challenge), is_atom(Cookie) ->
     C0 = erlang:md5_init(),
@@ -423,95 +388,93 @@ gen_digest(Challenge, Cookie) when is_integer(Challenge), is_atom(Cookie) ->
 
 send_status(Socket, Stat) ->
     case gen_tcp:send(Socket, [$s | atom_to_list(Stat)]) of
-	{error, _} ->
-	    ?shutdown(could_not_send_status);
-	_ -> 
-	    true
+        {error, _} -> ?shutdown(could_not_send_status);
+        _ -> true
     end.
 
 
 recv_status(Socket) ->
     case gen_tcp:recv(Socket, 0) of
-	{ok, [$s|StrStat]} ->
-	    list_to_atom(StrStat);
-	Bad ->
-	    exit(Bad)
+        {ok, [$s|StrStat]} ->
+            list_to_atom(StrStat);
+        Bad ->
+            exit(Bad)
     end.
 
 send_challenge(Socket, Node, Challenge, Version) ->
     send_challenge(Socket, Node, Challenge, Version, ?COMPULSORY_DFLAGS).
 send_challenge(Socket, Node, Challenge, Version, Flags) ->
-    {ok, {{Ip1,Ip2,Ip3,Ip4}, _}} = inet:sockname(Socket),
+    {ok, {{_Ip1,_Ip2,_Ip3,_Ip4}, _}} = inet:sockname(Socket),
     ?to_port(Socket, [$n,?int16(Version),?int32(Flags),
-		      ?int32(Challenge), atom_to_list(Node)]).
+                      ?int32(Challenge), atom_to_list(Node)]).
 
 recv_challenge(Socket) ->
     case gen_tcp:recv(Socket, 0) of
-	{ok,[$n,V1,V0,Fl1,Fl2,Fl3,Fl4,CA3,CA2,CA1,CA0 | Ns]} ->
-	    Flags = ?u32(Fl1,Fl2,Fl3,Fl4),
-	    Type = case Flags band ?DFLAG_PUBLISHED of
-		       0 ->
-			   hidden;
-		       _ ->
-			   normal
-		   end,
-	    Node =list_to_atom(Ns),
-	    Version = ?u16(V1,V0),
-	    Challenge = ?u32(CA3,CA2,CA1,CA0),
-	    {Type,Node,Version,Challenge};
-	_ ->
-	    ?shutdown(no_node)	    
+        {ok,[$n,V1,V0,Fl1,Fl2,Fl3,Fl4,CA3,CA2,CA1,CA0 | Ns]} ->
+            Flags = ?u32(Fl1,Fl2,Fl3,Fl4),
+            Type = case Flags band ?DFLAG_PUBLISHED of
+                       0 ->
+                           hidden;
+                       _ ->
+                           normal
+                   end,
+            Node =list_to_atom(Ns),
+            Version = ?u16(V1,V0),
+            Challenge = ?u32(CA3,CA2,CA1,CA0),
+            {Type,Node,Version,Challenge};
+        _ ->
+            ?shutdown(no_node)
     end.
 
-send_challenge_reply(Socket, Challenge, Digest) ->
-    ?to_port(Socket, [$r,?int32(Challenge),Digest]).
+%send_challenge_reply(Socket, Challenge, Digest) ->
+%    ?to_port(Socket, [$r,?int32(Challenge),Digest]).
 
 recv_challenge_reply(Socket, ChallengeA, Cookie) ->
     case gen_tcp:recv(Socket, 0) of
-	{ok,[$r,CB3,CB2,CB1,CB0 | SumB]} when length(SumB) == 16 ->
-	    SumA = gen_digest(ChallengeA, Cookie),
-	    ChallengeB = ?u32(CB3,CB2,CB1,CB0),
-	    if SumB == SumA ->
-		    ChallengeB;
-	       true ->
-		    ?shutdown(bad_challenge_reply)
-	    end;
-	_ ->
-	    ?shutdown(no_node)
+        {ok,[$r,CB3,CB2,CB1,CB0 | SumB]} when length(SumB) == 16 ->
+            SumA = gen_digest(ChallengeA, Cookie),
+            ChallengeB = ?u32(CB3,CB2,CB1,CB0),
+            if SumB == SumA ->
+                   ChallengeB;
+               true ->
+                   ?shutdown(bad_challenge_reply)
+            end;
+        _ ->
+            ?shutdown(no_node)
     end.
 
 send_challenge_ack(Socket, Digest) ->
     ?to_port(Socket, [$a,Digest]).
 
-recv_challenge_ack(Socket, ChallengeB, CookieA) ->
-    case gen_tcp:recv(Socket, 0) of
-	{ok,[$a | SumB]} when length(SumB) == 16 ->
-	    SumA = gen_digest(ChallengeB, CookieA),
-	    if SumB == SumA ->
-		    ok;
-	       true ->
-		    ?shutdown(bad_challenge_ack)
-	    end;
-	_ ->
-	    ?shutdown(bad_challenge_ack)
-    end.
+%recv_challenge_ack(Socket, ChallengeB, CookieA) ->
+%    case gen_tcp:recv(Socket, 0) of
+%        {ok,[$a | SumB]} when length(SumB) == 16 ->
+%            SumA = gen_digest(ChallengeB, CookieA),
+%            if SumB == SumA ->
+%                   ok;
+%               true ->
+%                   ?shutdown(bad_challenge_ack)
+%            end;
+%        _ ->
+%            ?shutdown(bad_challenge_ack)
+%    end.
 
 send_name(Socket, MyNode0, Version) ->
     send_name(Socket, MyNode0, Version, ?COMPULSORY_DFLAGS).
 send_name(Socket, MyNode0, Version, Flags) ->
     MyNode = atom_to_list(MyNode0),
     ?to_port(Socket, [$n,?int16(Version),?int32(Flags)] ++ 
-	     MyNode).
+             MyNode).
 
 %%
 %% recv_name is common for both old and new handshake.
 %%
 recv_name(Socket) ->
     case gen_tcp:recv(Socket, 0) of
-	{ok,Data} ->
-	    get_name(Data);
-	Res ->
-	    ?shutdown({no_node,Res})
+        {ok,Data} ->
+            get_name(Data);
+        Res ->
+            ?shutdown({no_node,Res})
     end.
 
 get_name([$m,VersionA,VersionB,_Ip1,_Ip2,_Ip3,_Ip4|OtherNode]) ->
@@ -520,11 +483,9 @@ get_name([$h,VersionA,VersionB,_Ip1,_Ip2,_Ip3,_Ip4|OtherNode]) ->
     {hidden, list_to_atom(OtherNode), ?u16(VersionA,VersionB)};
 get_name([$n,VersionA, VersionB, Flag1, Flag2, Flag3, Flag4 | OtherNode]) ->
     Type = case ?u32(Flag1, Flag2, Flag3, Flag4) band ?DFLAG_PUBLISHED of
-	       0 ->
-		   hidden;
-	       _ -> 
-		   normal
-	   end,
+               0 -> hidden;
+               _ -> normal
+           end,
     {Type, list_to_atom(OtherNode), 
      ?u16(VersionA,VersionB)};
 get_name(Data) ->
@@ -533,74 +494,73 @@ get_name(Data) ->
 %%
 %% tell_name is for old handshake
 %%
-tell_name(Socket, MyNode0, Version) ->
-    MyNode = atom_to_list(MyNode0),
-    {ok, {{Ip1,Ip2,Ip3,Ip4}, _}} = inet:sockname(Socket),
-    ?to_port(Socket, [$h,?int16(Version),Ip1,Ip2,Ip3,Ip4] ++ 
-             MyNode).
+%tell_name(Socket, MyNode0, Version) ->
+%    MyNode = atom_to_list(MyNode0),
+%    {ok, {{Ip1,Ip2,Ip3,Ip4}, _}} = inet:sockname(Socket),
+%    ?to_port(Socket, [$h,?int16(Version),Ip1,Ip2,Ip3,Ip4] ++ MyNode).
 
 %%
 %% The communication with EPMD follows
 %%
 do_register_node(NodeName, TcpPort, VLow, VHigh) ->
     case gen_tcp:connect({127,0,0,1}, get_epmd_port(), []) of
-	{ok, Socket} ->
-	    {N0,_} = split(NodeName),
-	    Name = atom_to_list(N0),
-	    Extra = "",
-	    Elen = length(Extra),
-	    Len = 1+2+1+1+2+2+2+length(Name)+2+Elen,
-	    gen_tcp:send(Socket, [?int16(Len), $x,
-				   ?int16(TcpPort),
-				   $M,
-				   0,
-				   ?int16(VHigh),
-				   ?int16(VLow),
-				   ?int16(length(Name)),
-				   Name,
-				   ?int16(Elen),
-				   Extra]),
-	    case wait_for_reg_reply(Socket, []) of
-		{error, epmd_close} ->
-		    exit(epmd_broken);
-		Other ->
-		    Other
-	    end;
-	Error ->
-	    Error
+        {ok, Socket} ->
+            {N0,_} = split(NodeName),
+            Name = atom_to_list(N0),
+            Extra = "",
+            Elen = length(Extra),
+            Len = 1+2+1+1+2+2+2+length(Name)+2+Elen,
+            gen_tcp:send(Socket, [?int16(Len), $x,
+                                  ?int16(TcpPort),
+                                  $M,
+                                  0,
+                                  ?int16(VHigh),
+                                  ?int16(VLow),
+                                  ?int16(length(Name)),
+                                  Name,
+                                  ?int16(Elen),
+                                  Extra]),
+            case wait_for_reg_reply(Socket, []) of
+                {error, epmd_close} ->
+                    exit(epmd_broken);
+                Other ->
+                    Other
+            end;
+        Error ->
+            Error
     end.
 
 wait_for_reg_reply(Socket, SoFar) ->
     receive
-	{tcp, Socket, Data0} ->
-	    case SoFar ++ Data0 of
-		[$y, Result, A, B] ->
-		    case Result of
-			0 ->
-			    {alive, Socket, ?u16(A, B)};
-			_ ->
-			    {error, duplicate_name}
-		    end;
-		Data when length(Data) < 4 ->
-		    wait_for_reg_reply(Socket, Data);
-		Garbage ->
-		    {error, {garbage_from_epmd, Garbage}}
-	    end;
-	{tcp_closed, Socket} ->
-	    {error, epmd_close}
+        {tcp, Socket, Data0} ->
+            case SoFar ++ Data0 of
+                [$y, Result, A, B] ->
+                    case Result of
+                        0 ->
+                            {alive, Socket, ?u16(A, B)};
+                        _ ->
+                            {error, duplicate_name}
+                    end;
+                Data when length(Data) < 4 ->
+                    wait_for_reg_reply(Socket, Data);
+                Garbage ->
+                    {error, {garbage_from_epmd, Garbage}}
+            end;
+        {tcp_closed, Socket} ->
+            {error, epmd_close}
     after 10000 ->
-	    gen_tcp:close(Socket),
-	    {error, no_reg_reply_from_epmd}
+              gen_tcp:close(Socket),
+              {error, no_reg_reply_from_epmd}
     end.
 
 
 register(NodeName, ListenSocket, VLow, VHigh) ->
     {ok,{_,TcpPort}} = inet:sockname(ListenSocket),
     case do_register_node(NodeName, TcpPort, VLow, VHigh) of
-	{alive, Socket, Creation} ->
-	    Socket;
-	Other ->
-	    exit(Other)
+        {alive, Socket, _Creation} ->
+            Socket;
+        Other ->
+            exit(Other)
     end.
 
 
@@ -618,69 +578,10 @@ split(Atom) ->
     {A,B} = split(atom_to_list(Atom),[]),
     {list_to_atom(A),list_to_atom(B)}.
 
-%% Build a simple distribution message
-build_message(Cookie) ->
-    [$?,term_to_binary({6,self(),Cookie,rex}),term_to_binary(plupp)].
-
-%% Build a distribution message that will make rex answer
-build_rex_message(Cookie,OurName) ->
-    [$?,term_to_binary({6,self(),Cookie,rex}),
-     term_to_binary({'$gen_cast',
-		    {cast,
-		     rpc,
-		     cast,
-		     [OurName, hello, world, []],
-		     self()} })].
-
-%% Receive a distribution message    
-recv_message(Socket) ->
-    case gen_tcp:recv(Socket, 0) of
-	{ok,Data} ->
-	    B0 = list_to_binary(Data),
-	    {_,B1} = erlang:split_binary(B0,1),
-	    Header = erlang:binary_to_term(B1),
-	    Siz = size(term_to_binary(Header)),
-	    {_,B2} = erlang:split_binary(B1,Siz),
-	    Message = case (catch erlang:binary_to_term(B2)) of
-			  {'EXIT', _} ->
-			      could_not_digest_message;
-			  Other ->
-			      Other
-		      end,
-	    {Header, Message};
-	Res ->
-	    exit({no_message,Res})
-    end. 
-
 %% Build a nodename
 join(Name,Host) ->
     list_to_atom(atom_to_list(Name) ++ "@" ++ atom_to_list(Host)).
 
-%% start/stop slave.
-start_node(Name, Param) ->
-    ?t:start_node(Name, slave, [{args, Param}]).
-
-stop_node(Node) ->
-    ?t:stop_node(Node).
-
-
-get_nodenames(N, T) ->
-    get_nodenames(N, T, []).
-
-get_nodenames(0, _, Acc) ->
-    Acc;
-get_nodenames(N, T, Acc) ->
-    {A, B, C} = now(),
-    get_nodenames(N-1, T, [list_to_atom(atom_to_list(?MODULE)
-					++ "-"
-					++ atom_to_list(T)
-					++ "-"
-					++ integer_to_list(A)
-					++ "-"
-					++ integer_to_list(B)
-					++ "-"
-					++ integer_to_list(C)) | Acc]).
-
 get_epmd_port() ->
     case init:get_argument(epmd_port) of
         {ok, [[PortStr|_]|_]} when is_list(PortStr) ->
diff --git a/lib/erl_interface/test/erl_connect_SUITE.erl b/lib/erl_interface/test/erl_connect_SUITE.erl
index f621310a1c..f035f1af56 100644
--- a/lib/erl_interface/test/erl_connect_SUITE.erl
+++ b/lib/erl_interface/test/erl_connect_SUITE.erl
@@ -21,90 +21,67 @@
 %%
 -module(erl_connect_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("erl_connect_SUITE_data/erl_connect_test_cases.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,
-	 erl_send/1,erl_reg_send/1, erl_send_cookie_file/1]).
+-export([all/0, suite/0,
+         erl_send/1, erl_reg_send/1,
+         erl_send_cookie_file/1]).
 
 -import(runner, [get_term/1,send_term/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 30}}].
 
 all() -> 
     [erl_send, erl_reg_send, erl_send_cookie_file].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(0.25)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
 
 erl_send(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 1 = erl_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = erl_connect(P, node()),
+    P = runner:start(?interpret),
+    1 = erl_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = erl_connect(P, node()),
 
-    ?line ok = erl_send(P, Fd, self(), AMsg={a,message}),
-    ?line receive AMsg -> ok end,
+    ok = erl_send(P, Fd, self(), AMsg={a,message}),
+    receive AMsg -> ok end,
 
-    ?line 0 = erl_close_connection(P,Fd),
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    0 = erl_close_connection(P,Fd),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 erl_send_cookie_file(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skip,"Skipped on VxWorks"};
-	_ ->
-	    ?line P = runner:start(?interpret),
-	    ?line 1 = erl_connect_init(P, 42, '', 0),
-	    ?line {ok,Fd} = erl_connect(P, node()),
-	    
-	    ?line ok = erl_send(P, Fd, self(), AMsg={a,message}),
-	    ?line receive AMsg -> ok end,
-	    
-	    ?line 0 = erl_close_connection(P,Fd),
-	    ?line runner:send_eot(P),
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skip,"Skipped on VxWorks"};
+        _ ->
+            P = runner:start(?interpret),
+            1 = erl_connect_init(P, 42, '', 0),
+            {ok,Fd} = erl_connect(P, node()),
+
+            ok = erl_send(P, Fd, self(), AMsg={a,message}),
+            receive AMsg -> ok end,
+
+            0 = erl_close_connection(P,Fd),
+            runner:send_eot(P),
+            runner:recv_eot(P),
+            ok
     end.
 
 erl_reg_send(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line 1 = erl_connect_init(P, 42, erlang:get_cookie(), 0),
-    ?line {ok,Fd} = erl_connect(P, node()),
+    P = runner:start(?interpret),
+    1 = erl_connect_init(P, 42, erlang:get_cookie(), 0),
+    {ok,Fd} = erl_connect(P, node()),
 
     ARegName = a_strange_registred_name,
-    ?line register(ARegName, self()),
-    ?line ok = erl_reg_send(P, Fd, ARegName, AMsg={another,[strange],message}),
-    ?line receive AMsg -> ok end,
+    register(ARegName, self()),
+    ok = erl_reg_send(P, Fd, ARegName, AMsg={another,[strange],message}),
+    receive AMsg -> ok end,
 
-    ?line 0 = erl_close_connection(P,Fd),
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    0 = erl_close_connection(P,Fd),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -113,20 +90,20 @@ erl_reg_send(Config) when is_list(Config) ->
 erl_connect_init(P, Num, Cookie, Creation) ->
     send_command(P, erl_connect_init, [Num,Cookie,Creation]),
     case get_term(P) of
-	{term,Int} when is_integer(Int) -> Int
+        {term,Int} when is_integer(Int) -> Int
     end.
 
 erl_connect(P, Node) ->
     send_command(P, erl_connect, [Node]),
     case get_term(P) of
-	{term,{Fd,_}} when Fd >= 0 -> {ok,Fd};
-	{term,{-1,Errno}} -> {error,Errno}
+        {term,{Fd,_}} when Fd >= 0 -> {ok,Fd};
+        {term,{-1,Errno}} -> {error,Errno}
     end.
 
 erl_close_connection(P, FD) ->
     send_command(P, erl_close_connection, [FD]),
     case get_term(P) of
-	{term,Int} when is_integer(Int) -> Int
+        {term,Int} when is_integer(Int) -> Int
     end.
 
 erl_send(P, Fd, To, Msg) ->
@@ -139,17 +116,12 @@ erl_reg_send(P, Fd, To, Msg) ->
 
 get_send_result(P) ->
     case get_term(P) of
-	{term,{1,_}} -> ok;
-	{term,{-1,Errno}} -> {error,Errno};
-	{term,{Res,Errno}}->
-	    io:format("Return value: ~p\nerl_errno: ~p", [Res,Errno]),
-	    ?t:fail(bad_return_value)
+        {term,{1,_}} -> ok;
+        {term,{-1,Errno}} -> {error,Errno};
+        {term,{Res,Errno}}->
+            io:format("Return value: ~p\nerl_errno: ~p", [Res,Errno]),
+            ct:fail(bad_return_value)
     end.
 
 send_command(P, Name, Args) ->
     runner:send_term(P, {Name,list_to_tuple(Args)}).
-
-    
-    
-
-
diff --git a/lib/erl_interface/test/erl_eterm_SUITE.erl b/lib/erl_interface/test/erl_eterm_SUITE.erl
index 8fbef35309..2e580f379e 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE.erl
+++ b/lib/erl_interface/test/erl_eterm_SUITE.erl
@@ -21,7 +21,7 @@
 %%
 -module(erl_eterm_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("erl_eterm_SUITE_data/eterm_test_cases.hrl").
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -34,40 +34,39 @@
 %%% 5. Miscellanous functions.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 build_terms/1, round_trip_conversion/1,
-	 decode_terms/1, decode_float/1,
-	 t_erl_mk_int/1, t_erl_mk_list/1,
-	 basic_copy/1,
-	 t_erl_cons/1,
-	 t_erl_mk_atom/1,
-	 t_erl_mk_binary/1,
-	 t_erl_mk_empty_list/1,
-	 t_erl_mk_float/1,
-	 t_erl_mk_pid/1,
-	 t_erl_mk_xpid/1,
-	 t_erl_mk_port/1,
-	 t_erl_mk_xport/1,
-	 t_erl_mk_ref/1,
-	 t_erl_mk_long_ref/1,
-	 t_erl_mk_string/1,
-	 t_erl_mk_estring/1,
-	 t_erl_mk_tuple/1,
-	 t_erl_mk_uint/1,
-	 t_erl_mk_var/1,
-	 t_erl_size/1,
-	 t_erl_var_content/1,
-	 t_erl_element/1,
-	 t_erl_length/1, t_erl_hd/1, t_erl_tl/1,
-	 type_checks/1, extractor_macros/1,
-	 t_erl_iolist_length/1, t_erl_iolist_to_binary/1,
-	 t_erl_iolist_to_string/1,
-	 erl_print_term/1, print_string/1,
-	 t_erl_free_compound/1,
-	 high_chaparal/1,
-	 broken_data/1,
-	 cnode_1/1]).
+-export([all/0, suite/0,
+         build_terms/1, round_trip_conversion/1,
+         decode_terms/1, decode_float/1,
+         t_erl_mk_int/1, t_erl_mk_list/1,
+         basic_copy/1,
+         t_erl_cons/1,
+         t_erl_mk_atom/1,
+         t_erl_mk_binary/1,
+         t_erl_mk_empty_list/1,
+         t_erl_mk_float/1,
+         t_erl_mk_pid/1,
+         t_erl_mk_xpid/1,
+         t_erl_mk_port/1,
+         t_erl_mk_xport/1,
+         t_erl_mk_ref/1,
+         t_erl_mk_long_ref/1,
+         t_erl_mk_string/1,
+         t_erl_mk_estring/1,
+         t_erl_mk_tuple/1,
+         t_erl_mk_uint/1,
+         t_erl_mk_var/1,
+         t_erl_size/1,
+         t_erl_var_content/1,
+         t_erl_element/1,
+         t_erl_length/1, t_erl_hd/1, t_erl_tl/1,
+         type_checks/1, extractor_macros/1,
+         t_erl_iolist_length/1, t_erl_iolist_to_binary/1,
+         t_erl_iolist_to_string/1,
+         erl_print_term/1, print_string/1,
+         t_erl_free_compound/1,
+         high_chaparal/1,
+         broken_data/1,
+         cnode_1/1]).
 
 -export([start_cnode/1]).
 
@@ -76,7 +75,8 @@
 %% This test suite controls the running of the C language functions
 %% in eterm_test.c and print_term.c.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [build_terms, round_trip_conversion, decode_terms,
@@ -93,22 +93,6 @@ all() ->
      erl_print_term, print_string, t_erl_free_compound,
      high_chaparal, broken_data, cnode_1].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%
@@ -119,82 +103,77 @@ end_per_group(_GroupName, Config) ->
 %% This test asks the C function to construct all data types in
 %% a list and verifies that the result is as expected.
 
-build_terms(suite) -> [];
 build_terms(Config) when is_list(Config) ->
-    ?line P = runner:start(?build_terms),
-    ?line {term, Term} = get_term(P),
-    ?line io:format("Received: ~p", [Term]),
-    ?line [ARefLN, ARef, APortLN, APort, APidLN, APid,
-	   {element1, 42, 767}, "A string",
-	   1, -1, 0, 3.0, ABin, 'I am an atom'] = Term,
-    ?line "A binary" = binary_to_list(ABin),
-    ?line case ARef of
-	      R when is_reference(R), node(R) == kalle@localhost -> ok
-	  end,
-    ?line case ARefLN of
-	      R1 when is_reference(R1), node(R1) == abcdefghijabcdefghij@localhost -> ok
-	  end,
-    ?line case APort of
-	      Port when is_port(Port), node(Port) == kalle@localhost -> ok
-	  end,
-    ?line case APortLN of
-	      Port1 when is_port(Port1), node(Port1) == abcdefghijabcdefghij@localhost -> ok
-	  end,
-    ?line case APid of
-	      Pid when is_pid(Pid), node(Pid) == kalle@localhost -> ok
-	  end,
-    ?line case APidLN of
-	      Pid1 when is_pid(Pid1), node(Pid1) == abcdefghijabcdefghij@localhost -> ok
-	  end,
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?build_terms),
+    {term, Term} = get_term(P),
+    io:format("Received: ~p", [Term]),
+    [ARefLN, ARef, APortLN, APort, APidLN, APid,
+     {element1, 42, 767}, "A string",
+     1, -1, 0, 3.0, ABin, 'I am an atom'] = Term,
+    "A binary" = binary_to_list(ABin),
+    case ARef of
+        R when is_reference(R), node(R) == kalle@localhost -> ok
+    end,
+    case ARefLN of
+        R1 when is_reference(R1), node(R1) == abcdefghijabcdefghij@localhost -> ok
+    end,
+    case APort of
+        Port when is_port(Port), node(Port) == kalle@localhost -> ok
+    end,
+    case APortLN of
+        Port1 when is_port(Port1), node(Port1) == abcdefghijabcdefghij@localhost -> ok
+    end,
+    case APid of
+        Pid when is_pid(Pid), node(Pid) == kalle@localhost -> ok
+    end,
+    case APidLN of
+        Pid1 when is_pid(Pid1), node(Pid1) == abcdefghijabcdefghij@localhost -> ok
+    end,
+
+    runner:recv_eot(P),
     ok.
 
 %% This test is run entirely in C code.
 
-round_trip_conversion(suite) -> [];
 round_trip_conversion(Config) when is_list(Config) ->
-    ?line runner:test(?round_trip_conversion),
+    runner:test(?round_trip_conversion),
     ok.
 
 %% This test sends a list of all data types to the C code function,
 %% which decodes it and verifies it.
 
-decode_terms(suite) -> [];
 decode_terms(Config) when is_list(Config) ->
-    ?line Dummy1 = list_to_atom(filename:join(?config(priv_dir, Config),
-					      dummy_file1)),
-    ?line Dummy2 = list_to_atom(filename:join(?config(priv_dir, Config),
-					      dummy_file2)),
-    ?line Port1 = open_port(Dummy1, [out]),
-    ?line Port2 = open_port(Dummy2, [out]),
-    ?line ABinary = list_to_binary("A binary"),
-    ?line Terms = [make_ref(), make_ref(),
-		   Port1, Port2,
-		   self(), self(),
-		   {element1, 42, 767}, "A string",
-		   1, -1, 0, 3.0, ABinary, 'I am an atom'],
-
-    ?line P = runner:start(?decode_terms),
-    ?line runner:send_term(P, Terms),
-    ?line runner:recv_eot(P),
+    Dummy1 = list_to_atom(filename:join(proplists:get_value(priv_dir, Config),
+                                        dummy_file1)),
+    Dummy2 = list_to_atom(filename:join(proplists:get_value(priv_dir, Config),
+                                        dummy_file2)),
+    Port1 = open_port(Dummy1, [out]),
+    Port2 = open_port(Dummy2, [out]),
+    ABinary = list_to_binary("A binary"),
+    Terms = [make_ref(), make_ref(),
+             Port1, Port2,
+             self(), self(),
+             {element1, 42, 767}, "A string",
+             1, -1, 0, 3.0, ABinary, 'I am an atom'],
+
+    P = runner:start(?decode_terms),
+    runner:send_term(P, Terms),
+    runner:recv_eot(P),
 
     ok.
 
 %% Decodes the floating point number 3.1415.
 
-decode_float(suite) -> [];
 decode_float(Config) when is_list(Config) ->
-    ?line P = runner:start(?decode_float),
-    ?line runner:send_term(P, 3.1415),
-    ?line runner:recv_eot(P),
+    P = runner:start(?decode_float),
+    runner:send_term(P, 3.1415),
+    runner:recv_eot(P),
     ok.
 
 %% Tests the erl_free_compound() function.
 
-t_erl_free_compound(suite) -> [];
 t_erl_free_compound(Config) when is_list(Config) ->
-    ?line runner:test(?t_erl_free_compound),
+    runner:test(?t_erl_free_compound),
     ok.
 
 
@@ -206,317 +185,296 @@ t_erl_free_compound(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_list() function.
 
-t_erl_mk_list(suite) -> [];
 t_erl_mk_list(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_list),
+    P = runner:start(?t_erl_mk_list),
 
-    ?line {term, []} = get_term(P),
-    ?line {term, [abc]} = get_term(P),
-    ?line {term, [abcdef, 42]} = get_term(P),
-    ?line {term, [0.0, 23, [], 3.1415]} = get_term(P),
+    {term, []} = get_term(P),
+    {term, [abc]} = get_term(P),
+    {term, [abcdef, 42]} = get_term(P),
+    {term, [0.0, 23, [], 3.1415]} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_int() function.
 
-t_erl_mk_int(suite) -> [];
 t_erl_mk_int(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_int),
-    
-    ?line {term, 0} = get_term(P),
-    ?line {term, 127} = get_term(P),
-    ?line {term, 128} = get_term(P),
-    ?line {term, 255} = get_term(P),
-    ?line {term, 256} = get_term(P),
-
-    ?line {term, 16#FFFF} = get_term(P),
-    ?line {term, 16#10000} = get_term(P),
-
-    ?line {term, 16#07FFFFFF} = get_term(P),
-    ?line {term, 16#0FFFFFFF} = get_term(P),
-    ?line {term, 16#1FFFFFFF} = get_term(P),
-    ?line {term, 16#3FFFFFFF} = get_term(P),
-    ?line {term, 16#7FFFFFFF} = get_term(P),
-
-    ?line {term, 16#08000000} = get_term(P),
-    ?line {term, 16#10000000} = get_term(P),
-    ?line {term, 16#20000000} = get_term(P),
-    ?line {term, 16#40000000} = get_term(P),
-
-
-    ?line {term, -16#07FFFFFF} = get_term(P),
-    ?line {term, -16#0FFFFFFF} = get_term(P),
-    ?line {term, -16#1FFFFFFF} = get_term(P),
-    ?line {term, -16#3FFFFFFF} = get_term(P),
-    ?line {term, -16#7FFFFFFF} = get_term(P),
-
-    ?line {term, -16#08000000} = get_term(P),
-    ?line {term, -16#10000000} = get_term(P),
-    ?line {term, -16#20000000} = get_term(P),
-    ?line {term, -16#40000000} = get_term(P),
-
-    ?line {term, -16#08000001} = get_term(P),
-    ?line {term, -16#10000001} = get_term(P),
-    ?line {term, -16#20000001} = get_term(P),
-    ?line {term, -16#40000001} = get_term(P),
-
-    ?line {term, -16#08000002} = get_term(P),
-    ?line {term, -16#10000002} = get_term(P),
-    ?line {term, -16#20000002} = get_term(P),
-    ?line {term, -16#40000002} = get_term(P),
-
-    ?line {term, -1999999999} = get_term(P),
-    ?line {term, -2000000000} = get_term(P),
-    ?line {term, -2000000001} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?t_erl_mk_int),
+
+    {term, 0} = get_term(P),
+    {term, 127} = get_term(P),
+    {term, 128} = get_term(P),
+    {term, 255} = get_term(P),
+    {term, 256} = get_term(P),
+
+    {term, 16#FFFF} = get_term(P),
+    {term, 16#10000} = get_term(P),
+
+    {term, 16#07FFFFFF} = get_term(P),
+    {term, 16#0FFFFFFF} = get_term(P),
+    {term, 16#1FFFFFFF} = get_term(P),
+    {term, 16#3FFFFFFF} = get_term(P),
+    {term, 16#7FFFFFFF} = get_term(P),
+
+    {term, 16#08000000} = get_term(P),
+    {term, 16#10000000} = get_term(P),
+    {term, 16#20000000} = get_term(P),
+    {term, 16#40000000} = get_term(P),
+
+
+    {term, -16#07FFFFFF} = get_term(P),
+    {term, -16#0FFFFFFF} = get_term(P),
+    {term, -16#1FFFFFFF} = get_term(P),
+    {term, -16#3FFFFFFF} = get_term(P),
+    {term, -16#7FFFFFFF} = get_term(P),
+
+    {term, -16#08000000} = get_term(P),
+    {term, -16#10000000} = get_term(P),
+    {term, -16#20000000} = get_term(P),
+    {term, -16#40000000} = get_term(P),
+
+    {term, -16#08000001} = get_term(P),
+    {term, -16#10000001} = get_term(P),
+    {term, -16#20000001} = get_term(P),
+    {term, -16#40000001} = get_term(P),
+
+    {term, -16#08000002} = get_term(P),
+    {term, -16#10000002} = get_term(P),
+    {term, -16#20000002} = get_term(P),
+    {term, -16#40000002} = get_term(P),
+
+    {term, -1999999999} = get_term(P),
+    {term, -2000000000} = get_term(P),
+    {term, -2000000001} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 %% Basic test of erl_copy_term().
 
-basic_copy(suite) -> [];
 basic_copy(Config) when is_list(Config) ->
-    ?line runner:test(?basic_copy),
+    runner:test(?basic_copy),
     ok.
 
 
 %% This tests the erl_mk_tuple() function.
 
-t_erl_mk_tuple(suite) -> [];
 t_erl_mk_tuple(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_tuple),
+    P = runner:start(?t_erl_mk_tuple),
 
-    ?line {term, {madonna, 21, 'mad donna', 12}} = get_term(P),
-    ?line {term, {'Madonna',21,{children,{"Isabella",2}},
-		  {'home page',"http://www.madonna.com/"}}} = get_term(P),
+    {term, {madonna, 21, 'mad donna', 12}} = get_term(P),
+    {term, {'Madonna',21,{children,{"Isabella",2}},
+            {'home page',"http://www.madonna.com/"}}} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_atom() function.
 
-t_erl_mk_atom(suite) -> [];
 t_erl_mk_atom(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_atom),
-
-    ?line {term, madonna} = (get_term(P)),
-    ?line {term, 'Madonna'} = (get_term(P)),
-    ?line {term, 'mad donna'} = (get_term(P)),
-    ?line {term, '_madonna_'} = (get_term(P)),
-    ?line {term, '/home/madonna/tour_plan'} = (get_term(P)),
-    ?line {term, 'http://www.madonna.com/tour_plan'} = (get_term(P)),
-    ?line {term, '\'madonna\''} = (get_term(P)),
-    ?line {term, '\"madonna\"'} = (get_term(P)),
-    ?line {term, '\\madonna\\'} = (get_term(P)),
-    ?line {term, '{madonna,21,\'mad donna\',12}'} = (get_term(P)),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?t_erl_mk_atom),
+
+    {term, madonna} = (get_term(P)),
+    {term, 'Madonna'} = (get_term(P)),
+    {term, 'mad donna'} = (get_term(P)),
+    {term, '_madonna_'} = (get_term(P)),
+    {term, '/home/madonna/tour_plan'} = (get_term(P)),
+    {term, 'http://www.madonna.com/tour_plan'} = (get_term(P)),
+    {term, '\'madonna\''} = (get_term(P)),
+    {term, '\"madonna\"'} = (get_term(P)),
+    {term, '\\madonna\\'} = (get_term(P)),
+    {term, '{madonna,21,\'mad donna\',12}'} = (get_term(P)),
+
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_binary() function.
 
-t_erl_mk_binary(suite) -> [];
 t_erl_mk_binary(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_binary),
+    P = runner:start(?t_erl_mk_binary),
 
-    ?line {term, Bin} = (get_term(P)),
-    ?line "{madonna,21,'mad donna',1234.567.890, !#$%&/()=?+-@, \" \\}" = 
-	binary_to_list(Bin),
+    {term, Bin} = (get_term(P)),
+    "{madonna,21,'mad donna',1234.567.890, !#$%&/()=?+-@, \" \\}" = binary_to_list(Bin),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_empty_list() function.
 
-t_erl_mk_empty_list(suite) -> [];
 t_erl_mk_empty_list(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_empty_list),
+    P = runner:start(?t_erl_mk_empty_list),
 
-    ?line {term, []} = get_term(P),
+    {term, []} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_float() function.
 
-t_erl_mk_float(suite) -> [];
 t_erl_mk_float(Config) when is_list(Config) ->
     case os:type() of 
-	vxworks ->
-	    {skipped, "Floating point numbers never compare equal on PPC"};
-	_ ->
-	    ?line P = runner:start(?t_erl_mk_float),
-	    ?line {term, {3.1415, 1.999999, 2.000000, 2.000001, 
-			  2.000002, 12345.67890}} = 
-		get_term(P),
-	    ?line runner:recv_eot(P),
-	    ok
+        vxworks ->
+            {skipped, "Floating point numbers never compare equal on PPC"};
+        _ ->
+            P = runner:start(?t_erl_mk_float),
+            {term, {3.1415, 1.999999, 2.000000, 2.000001,
+                    2.000002, 12345.67890}} = get_term(P),
+            runner:recv_eot(P),
+            ok
     end.
 
 
 %% This tests the erl_mk_pid() function.
 
-t_erl_mk_pid(suite) -> [];
 t_erl_mk_pid(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_pid),
+    P = runner:start(?t_erl_mk_pid),
 
-    ?line {term, A_pid} = (get_term(P)),
-    ?line {pid, kalle@localhost, 3, 2} = nc2vinfo(A_pid),
+    {term, A_pid} = (get_term(P)),
+    {pid, kalle@localhost, 3, 2} = nc2vinfo(A_pid),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
-t_erl_mk_xpid(suite) -> [];
 t_erl_mk_xpid(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_xpid),
+    P = runner:start(?t_erl_mk_xpid),
 
-    ?line {term, A_pid} = (get_term(P)),
-    ?line {pid, kalle@localhost, 32767, 8191} = nc2vinfo(A_pid),
+    {term, A_pid} = (get_term(P)),
+    {pid, kalle@localhost, 32767, 8191} = nc2vinfo(A_pid),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_port() function.
 
-t_erl_mk_port(suite) -> [];
 t_erl_mk_port(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_port),
+    P = runner:start(?t_erl_mk_port),
 
-    ?line {term, A_port} = (get_term(P)),
-    ?line {port, kalle@localhost, 4} = nc2vinfo(A_port),
+    {term, A_port} = (get_term(P)),
+    {port, kalle@localhost, 4} = nc2vinfo(A_port),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
-t_erl_mk_xport(suite) -> [];
 t_erl_mk_xport(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_xport),
+    P = runner:start(?t_erl_mk_xport),
 
-    ?line {term, A_port} = (get_term(P)),
-    ?line {port, kalle@localhost, 268435455} = nc2vinfo(A_port),
+    {term, A_port} = (get_term(P)),
+    {port, kalle@localhost, 268435455} = nc2vinfo(A_port),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_ref() function.
 
-t_erl_mk_ref(suite) -> [];
 t_erl_mk_ref(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_ref),
+    P = runner:start(?t_erl_mk_ref),
 
-    ?line {term, A_ref} = (get_term(P)),
-    ?line {ref, kalle@localhost, _Length, [6]} = nc2vinfo(A_ref),
+    {term, A_ref} = (get_term(P)),
+    {ref, kalle@localhost, _Length, [6]} = nc2vinfo(A_ref),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
-t_erl_mk_long_ref(suite) -> [];
 t_erl_mk_long_ref(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_long_ref),
+    P = runner:start(?t_erl_mk_long_ref),
 
-    ?line {term, A_ref} = (get_term(P)),
-    ?line {ref, kalle@localhost, _Length, [4294967295,4294967295,262143]}
-	= nc2vinfo(A_ref),
+    {term, A_ref} = (get_term(P)),
+    {ref, kalle@localhost, _Length, [4294967295,4294967295,262143]}
+    = nc2vinfo(A_ref),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_string() function.
 
-t_erl_mk_string(suite) -> [];
 t_erl_mk_string(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_string),
-
-    ?line {term, "madonna"} = (get_term(P)),
-    ?line {term, "Madonna"} = (get_term(P)),
-    ?line {term, "mad donna"} = (get_term(P)),
-    ?line {term, "_madonna_"} = (get_term(P)),
-    ?line {term, "/home/madonna/tour_plan"} = (get_term(P)),
-    ?line {term, "http://www.madonna.com/tour_plan"} = (get_term(P)),
-    ?line {term, "\'madonna\'"} = (get_term(P)),
-    ?line {term, "\"madonna\""} = (get_term(P)),
-    ?line {term, "\\madonna\\"} = (get_term(P)),
-    ?line {term, "{madonna,21,'mad donna',12}"} = (get_term(P)),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?t_erl_mk_string),
+
+    {term, "madonna"} = (get_term(P)),
+    {term, "Madonna"} = (get_term(P)),
+    {term, "mad donna"} = (get_term(P)),
+    {term, "_madonna_"} = (get_term(P)),
+    {term, "/home/madonna/tour_plan"} = (get_term(P)),
+    {term, "http://www.madonna.com/tour_plan"} = (get_term(P)),
+    {term, "\'madonna\'"} = (get_term(P)),
+    {term, "\"madonna\""} = (get_term(P)),
+    {term, "\\madonna\\"} = (get_term(P)),
+    {term, "{madonna,21,'mad donna',12}"} = (get_term(P)),
+
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_estring() function.
 
-t_erl_mk_estring(suite) -> [];
 t_erl_mk_estring(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_estring),
-
-    ?line {term, "madonna"} = (get_term(P)),
-    ?line {term, "Madonna"} = (get_term(P)),
-    ?line {term, "mad donna"} = (get_term(P)),
-    ?line {term, "_madonna_"} = (get_term(P)),
-    ?line {term, "/home/madonna/tour_plan"} = (get_term(P)),
-    ?line {term, "http://www.madonna.com/tour_plan"} = (get_term(P)),
-    ?line {term, "\'madonna\'"} = (get_term(P)),
-    ?line {term, "\"madonna\""} = (get_term(P)),
-    ?line {term, "\\madonna\\"} = (get_term(P)),
-    ?line {term, "{madonna,21,'mad donna',12}"} = (get_term(P)),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?t_erl_mk_estring),
+
+    {term, "madonna"} = (get_term(P)),
+    {term, "Madonna"} = (get_term(P)),
+    {term, "mad donna"} = (get_term(P)),
+    {term, "_madonna_"} = (get_term(P)),
+    {term, "/home/madonna/tour_plan"} = (get_term(P)),
+    {term, "http://www.madonna.com/tour_plan"} = (get_term(P)),
+    {term, "\'madonna\'"} = (get_term(P)),
+    {term, "\"madonna\""} = (get_term(P)),
+    {term, "\\madonna\\"} = (get_term(P)),
+    {term, "{madonna,21,'mad donna',12}"} = (get_term(P)),
+
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_uint() function.
 
-t_erl_mk_uint(suite) -> [];
 t_erl_mk_uint(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_uint),
+    P = runner:start(?t_erl_mk_uint),
 
-    ?line {term, 54321} = (get_term(P)),
-    ?line {term, 2147483647} = (get_term(P)),
-    ?line {term, 2147483648} = (get_term(P)),
-    ?line {term, 2147483649} = (get_term(P)),
-    ?line {term, 2147483650} = (get_term(P)),
-    ?line {term, 4294967295} = (get_term(P)),
+    {term, 54321} = (get_term(P)),
+    {term, 2147483647} = (get_term(P)),
+    {term, 2147483648} = (get_term(P)),
+    {term, 2147483649} = (get_term(P)),
+    {term, 2147483650} = (get_term(P)),
+    {term, 4294967295} = (get_term(P)),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_mk_var() function.
 
-t_erl_mk_var(suite) -> [];
 t_erl_mk_var(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_mk_var),
+    P = runner:start(?t_erl_mk_var),
 
-    ?line {term, 1} = (get_term(P)),
-    ?line {term, 0} = (get_term(P)),
-    ?line {term, 1} = (get_term(P)),
-    ?line {term, 0} = (get_term(P)),
-    ?line {term, 1} = (get_term(P)),
-    ?line {term, 0} = (get_term(P)),
-    ?line {term, 1} = (get_term(P)),
+    {term, 1} = (get_term(P)),
+    {term, 0} = (get_term(P)),
+    {term, 1} = (get_term(P)),
+    {term, 0} = (get_term(P)),
+    {term, 1} = (get_term(P)),
+    {term, 0} = (get_term(P)),
+    {term, 1} = (get_term(P)),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_cons() function.
 
-t_erl_cons(suite) -> [];
 t_erl_cons(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_cons),
+    P = runner:start(?t_erl_cons),
 
-    ?line {term, [madonna, 21]} = get_term(P),
+    {term, [madonna, 21]} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -531,21 +489,20 @@ t_erl_cons(Config) when is_list(Config) ->
 
 %% Tests the erl_length() function.
 
-t_erl_length(suite) -> [];
 t_erl_length(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_length),
+    P = runner:start(?t_erl_length),
 
-    ?line 0 = erl_length(P, []),
-    ?line 1 = erl_length(P, [a]),
-    ?line 2 = erl_length(P, [a, b]),
-    ?line 3 = erl_length(P, [a, b, c]),
+    0 = erl_length(P, []),
+    1 = erl_length(P, [a]),
+    2 = erl_length(P, [a, b]),
+    3 = erl_length(P, [a, b, c]),
 
-    ?line 4 = erl_length(P, [a, [x, y], c, []]),
+    4 = erl_length(P, [a, [x, y], c, []]),
 
-    ?line -1 = erl_length(P, [a|b]),
-    ?line -1 = erl_length(P, a),
+    -1 = erl_length(P, [a|b]),
+    -1 = erl_length(P, a),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
 %% Invokes the erl_length() function.
@@ -555,22 +512,21 @@ erl_length(Port, List) ->
 
 %% Tests the erl_hd() function.
 
-t_erl_hd(suite) -> [];
 t_erl_hd(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_hd),
-    
-    ?line 'NULL' = erl_hd(P, 42),
-    ?line 'NULL' = erl_hd(P, abc),
-    ?line 'NULL' = erl_hd(P, []),
-
-    ?line [] = erl_hd(P, [[], a]),
-    ?line a = erl_hd(P, [a]),
-    ?line a = erl_hd(P, [a, b]),
-    ?line a = erl_hd(P, [a, b, c]),
-    ?line a = erl_hd(P, [a|b]),
-
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    P = runner:start(?t_erl_hd),
+
+    'NULL' = erl_hd(P, 42),
+    'NULL' = erl_hd(P, abc),
+    'NULL' = erl_hd(P, []),
+
+    [] = erl_hd(P, [[], a]),
+    a = erl_hd(P, [a]),
+    a = erl_hd(P, [a, b]),
+    a = erl_hd(P, [a, b, c]),
+    a = erl_hd(P, [a|b]),
+
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 %% Invokes the erl_hd() function.
@@ -580,22 +536,21 @@ erl_hd(Port, List) ->
 
 %% Tests the erl_tail() function.
 
-t_erl_tl(suite) -> [];
 t_erl_tl(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_tl),
+    P = runner:start(?t_erl_tl),
 
-    ?line 'NULL' = erl_tl(P, 42),
-    ?line 'NULL' = erl_tl(P, abc),
-    ?line 'NULL' = erl_tl(P, []),
+    'NULL' = erl_tl(P, 42),
+    'NULL' = erl_tl(P, abc),
+    'NULL' = erl_tl(P, []),
 
-    ?line [] = erl_tl(P, [a]),
-    ?line [b] = erl_tl(P, [a, b]),
-    ?line [b, c] = erl_tl(P, [a, b, c]),
+    [] = erl_tl(P, [a]),
+    [b] = erl_tl(P, [a, b]),
+    [b, c] = erl_tl(P, [a, b, c]),
 
-    ?line b = erl_tl(P, [a|b]),
+    b = erl_tl(P, [a|b]),
 
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 %% Invokes the erl_tail() function in erl_interface.
@@ -605,68 +560,63 @@ erl_tl(Port, List) ->
 
 %% Tests the type checking macros (done in the C program).
 
-type_checks(suite) -> [];
 type_checks(Config) when is_list(Config) ->
-    ?line runner:test(?type_checks),
+    runner:test(?type_checks),
     ok.
 
 %% Tests the extractor macros (done in the C program).
 
-extractor_macros(suite) -> [];
 extractor_macros(Config) when is_list(Config) ->
-    ?line runner:test(?extractor_macros),
+    runner:test(?extractor_macros),
     ok.
 
 
 %% This tests the erl_size() function.
 
-t_erl_size(suite) -> [];
 t_erl_size(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_size),
+    P = runner:start(?t_erl_size),
 
-    ?line {term, 0} = (get_term(P)),
-    ?line {term, 4} = (get_term(P)),
+    {term, 0} = (get_term(P)),
+    {term, 4} = (get_term(P)),
 
-    ?line {term, 0} = (get_term(P)),
-    ?line {term, 27} = (get_term(P)),
+    {term, 0} = (get_term(P)),
+    {term, 27} = (get_term(P)),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_var_content() function.
 
-t_erl_var_content(suite) -> [];
 t_erl_var_content(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_var_content),
+    P = runner:start(?t_erl_var_content),
 
-    ?line {term, 17} = (get_term(P)),
-    ?line {term, "http://www.madonna.com"} = (get_term(P)),
-    ?line {term, 2} = (get_term(P)),
-    ?line {term, "http://www.madonna.com"} = (get_term(P)),
-    ?line {term, 2} = (get_term(P)),
+    {term, 17} = (get_term(P)),
+    {term, "http://www.madonna.com"} = (get_term(P)),
+    {term, 2} = (get_term(P)),
+    {term, "http://www.madonna.com"} = (get_term(P)),
+    {term, 2} = (get_term(P)),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
 %% This tests the erl_element() function.
 
-t_erl_element(suite) -> [];
 t_erl_element(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_element),
+    P = runner:start(?t_erl_element),
 
-    ?line {term, madonna} = get_term(P),
-    ?line {term, 21} = get_term(P),
-    ?line {term, 'mad donna'} = get_term(P),
-    ?line {term, 12} = get_term(P),
+    {term, madonna} = get_term(P),
+    {term, 21} = get_term(P),
+    {term, 'mad donna'} = get_term(P),
+    {term, 12} = get_term(P),
 
-    ?line {term, 'Madonna'} = get_term(P),
-    ?line {term, 21} = get_term(P),
-    ?line {term, {children,{"Isabella",2}}} = get_term(P),
-    ?line {term, {'home page',"http://www.madonna.com/"}} = get_term(P),
+    {term, 'Madonna'} = get_term(P),
+    {term, 21} = get_term(P),
+    {term, {children,{"Isabella",2}}} = get_term(P),
+    {term, {'home page',"http://www.madonna.com/"}} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
 
 
@@ -679,65 +629,64 @@ t_erl_element(Config) when is_list(Config) ->
 
 %% Tests the erl_iolist_length() function.
 
-t_erl_iolist_length(suite) -> [];
 t_erl_iolist_length(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_iolist_length),
+    P = runner:start(?t_erl_iolist_length),
 
     %% Flat lists.
 
-    ?line 0 = erl_iolist_length(P, []),
-    ?line 1 = erl_iolist_length(P, [10]),
-    ?line 2 = erl_iolist_length(P, [10, 20]),
-    ?line 3 = erl_iolist_length(P, [10, 20, 30]),
-    ?line 256 = erl_iolist_length(P, lists:seq(0, 255)),
+    0 = erl_iolist_length(P, []),
+    1 = erl_iolist_length(P, [10]),
+    2 = erl_iolist_length(P, [10, 20]),
+    3 = erl_iolist_length(P, [10, 20, 30]),
+    256 = erl_iolist_length(P, lists:seq(0, 255)),
 
     %% Deep lists.
 
-    ?line 0 = erl_iolist_length(P, [[]]),
-    ?line 1 = erl_iolist_length(P, [[], 42]),
-    ?line 1 = erl_iolist_length(P, [42, []]),
-    ?line 2 = erl_iolist_length(P, [42, [], 45]),
+    0 = erl_iolist_length(P, [[]]),
+    1 = erl_iolist_length(P, [[], 42]),
+    1 = erl_iolist_length(P, [42, []]),
+    2 = erl_iolist_length(P, [42, [], 45]),
 
-    ?line 3 = erl_iolist_length(P, [42, [90], 45]),
-    ?line 3 = erl_iolist_length(P, [[42, [90]], 45]),
-    ?line 3 = erl_iolist_length(P, [[42, [90]], 45]),
+    3 = erl_iolist_length(P, [42, [90], 45]),
+    3 = erl_iolist_length(P, [[42, [90]], 45]),
+    3 = erl_iolist_length(P, [[42, [90]], 45]),
 
     %% List with binaries.
 
-    ?line 0 = erl_iolist_length(P, [list_to_binary([])]),
-    ?line 0 = erl_iolist_length(P, [[], list_to_binary([])]),
-    ?line 1 = erl_iolist_length(P, [[1], list_to_binary([])]),
-    ?line 1 = erl_iolist_length(P, [[], list_to_binary([2])]),
-    ?line 2 = erl_iolist_length(P, [[42], list_to_binary([2])]),
-    ?line 4 = erl_iolist_length(P, [[42], list_to_binary([2, 3, 4])]),
+    0 = erl_iolist_length(P, [list_to_binary([])]),
+    0 = erl_iolist_length(P, [[], list_to_binary([])]),
+    1 = erl_iolist_length(P, [[1], list_to_binary([])]),
+    1 = erl_iolist_length(P, [[], list_to_binary([2])]),
+    2 = erl_iolist_length(P, [[42], list_to_binary([2])]),
+    4 = erl_iolist_length(P, [[42], list_to_binary([2, 3, 4])]),
 
     %% Binaries as tail.
 
-    ?line 0 = erl_iolist_length(P, [[]| list_to_binary([])]),
-    ?line 1 = erl_iolist_length(P, [[1]| list_to_binary([])]),
-    ?line 1 = erl_iolist_length(P, [[]| list_to_binary([2])]),
-    ?line 2 = erl_iolist_length(P, [[42]| list_to_binary([2])]),
+    0 = erl_iolist_length(P, [[]| list_to_binary([])]),
+    1 = erl_iolist_length(P, [[1]| list_to_binary([])]),
+    1 = erl_iolist_length(P, [[]| list_to_binary([2])]),
+    2 = erl_iolist_length(P, [[42]| list_to_binary([2])]),
 
     %% Binaries only.
 
-    ?line 0 = erl_iolist_length(P, list_to_binary("")),
-    ?line 1 = erl_iolist_length(P, list_to_binary([1])),
-    ?line 2 = erl_iolist_length(P, list_to_binary([1, 2])),
+    0 = erl_iolist_length(P, list_to_binary("")),
+    1 = erl_iolist_length(P, list_to_binary([1])),
+    2 = erl_iolist_length(P, list_to_binary([1, 2])),
 
     %% Illegal cases.
 
-    ?line -1 = erl_iolist_length(P, [42|43]),
-    ?line -1 = erl_iolist_length(P, a),
+    -1 = erl_iolist_length(P, [42|43]),
+    -1 = erl_iolist_length(P, a),
 
-    ?line -1 = erl_iolist_length(P, [a]),
-    ?line -1 = erl_iolist_length(P, [256]),
-    ?line -1 = erl_iolist_length(P, [257]),
-    ?line -1 = erl_iolist_length(P, [-1]),
-    ?line -1 = erl_iolist_length(P, [-2]),
-    ?line -1 = erl_iolist_length(P, [-127]),
-    ?line -1 = erl_iolist_length(P, [-128]),
+    -1 = erl_iolist_length(P, [a]),
+    -1 = erl_iolist_length(P, [256]),
+    -1 = erl_iolist_length(P, [257]),
+    -1 = erl_iolist_length(P, [-1]),
+    -1 = erl_iolist_length(P, [-2]),
+    -1 = erl_iolist_length(P, [-127]),
+    -1 = erl_iolist_length(P, [-128]),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
 %% Invokes the erl_iolist_length() function.
@@ -747,143 +696,141 @@ erl_iolist_length(Port, List) ->
 
 %% Tests the erl_iolist_to_binary() function.
 
-t_erl_iolist_to_binary(suite) -> [];
 t_erl_iolist_to_binary(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_iolist_to_binary),
+    P = runner:start(?t_erl_iolist_to_binary),
 
     %% Flat lists.
 
-    ?line [] = iolist_to_list(P, []),
-    ?line [10] = iolist_to_list(P, [10]),
-    ?line [10, 20] = iolist_to_list(P, [10, 20]),
-    ?line [10, 20, 30] = iolist_to_list(P, [10, 20, 30]),
-    ?line AllBytes = lists:seq(0, 255),
-    ?line AllBytes = iolist_to_list(P, AllBytes),
+    [] = iolist_to_list(P, []),
+    [10] = iolist_to_list(P, [10]),
+    [10, 20] = iolist_to_list(P, [10, 20]),
+    [10, 20, 30] = iolist_to_list(P, [10, 20, 30]),
+    AllBytes = lists:seq(0, 255),
+    AllBytes = iolist_to_list(P, AllBytes),
 
     %% Deep lists.
 
-    ?line [] = iolist_to_list(P, [[]]),
-    ?line [42] = iolist_to_list(P, [[], 42]),
-    ?line [42] = iolist_to_list(P, [42, []]),
-    ?line [42, 45] = iolist_to_list(P, [42, [], 45]),
+    [] = iolist_to_list(P, [[]]),
+    [42] = iolist_to_list(P, [[], 42]),
+    [42] = iolist_to_list(P, [42, []]),
+    [42, 45] = iolist_to_list(P, [42, [], 45]),
 
-    ?line [42, 90, 45] = iolist_to_list(P, [42, [90], 45]),
-    ?line [42, 90, 45] = iolist_to_list(P, [[42, [90]], 45]),
-    ?line [42, 90, 45] = iolist_to_list(P, [[42, [90]], 45]),
+    [42, 90, 45] = iolist_to_list(P, [42, [90], 45]),
+    [42, 90, 45] = iolist_to_list(P, [[42, [90]], 45]),
+    [42, 90, 45] = iolist_to_list(P, [[42, [90]], 45]),
 
     %% List with binaries.
 
-    ?line [] = iolist_to_list(P, [list_to_binary([])]),
-    ?line [] = iolist_to_list(P, [[], list_to_binary([])]),
-    ?line [1] = iolist_to_list(P, [[1], list_to_binary([])]),
-    ?line [2] = iolist_to_list(P, [[], list_to_binary([2])]),
-    ?line [42, 2] = iolist_to_list(P, [[42], list_to_binary([2])]),
-    ?line [42, 2, 3, 4] = iolist_to_list(P, [[42], list_to_binary([2, 3, 4])]),
+    [] = iolist_to_list(P, [list_to_binary([])]),
+    [] = iolist_to_list(P, [[], list_to_binary([])]),
+    [1] = iolist_to_list(P, [[1], list_to_binary([])]),
+    [2] = iolist_to_list(P, [[], list_to_binary([2])]),
+    [42, 2] = iolist_to_list(P, [[42], list_to_binary([2])]),
+    [42, 2, 3, 4] = iolist_to_list(P, [[42], list_to_binary([2, 3, 4])]),
 
     %% Binaries as tail.
 
-    ?line [] = iolist_to_list(P, [[]| list_to_binary([])]),
-    ?line [1] = iolist_to_list(P, [[1]| list_to_binary([])]),
-    ?line [2] = iolist_to_list(P, [[]| list_to_binary([2])]),
-    ?line [42, 2] = iolist_to_list(P, [[42]| list_to_binary([2])]),
+    [] = iolist_to_list(P, [[]| list_to_binary([])]),
+    [1] = iolist_to_list(P, [[1]| list_to_binary([])]),
+    [2] = iolist_to_list(P, [[]| list_to_binary([2])]),
+    [42, 2] = iolist_to_list(P, [[42]| list_to_binary([2])]),
 
     %% Binaries only.
 
-    ?line [] = iolist_to_list(P, list_to_binary("")),
-    ?line [1] = iolist_to_list(P, list_to_binary([1])),
-    ?line [1, 2] = iolist_to_list(P, list_to_binary([1, 2])),
+    [] = iolist_to_list(P, list_to_binary("")),
+    [1] = iolist_to_list(P, list_to_binary([1])),
+    [1, 2] = iolist_to_list(P, list_to_binary([1, 2])),
 
     %% Illegal cases.
 
-    ?line 'NULL' = iolist_to_list(P, [42|43]),
-    ?line 'NULL' = iolist_to_list(P, a),
+    'NULL' = iolist_to_list(P, [42|43]),
+    'NULL' = iolist_to_list(P, a),
 
-    ?line 'NULL' = iolist_to_list(P, [a]),
-    ?line 'NULL' = iolist_to_list(P, [256]),
-    ?line 'NULL' = iolist_to_list(P, [257]),
-    ?line 'NULL' = iolist_to_list(P, [-1]),
-    ?line 'NULL' = iolist_to_list(P, [-2]),
-    ?line 'NULL' = iolist_to_list(P, [-127]),
-    ?line 'NULL' = iolist_to_list(P, [-128]),
+    'NULL' = iolist_to_list(P, [a]),
+    'NULL' = iolist_to_list(P, [256]),
+    'NULL' = iolist_to_list(P, [257]),
+    'NULL' = iolist_to_list(P, [-1]),
+    'NULL' = iolist_to_list(P, [-2]),
+    'NULL' = iolist_to_list(P, [-127]),
+    'NULL' = iolist_to_list(P, [-128]),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
 iolist_to_list(Port, Term) ->
     case call_erl_function(Port, Term) of
-	'NULL' ->
-	    'NULL';
-	Bin when is_binary(Bin) ->
-	    binary_to_list(Bin)
+        'NULL' ->
+            'NULL';
+        Bin when is_binary(Bin) ->
+            binary_to_list(Bin)
     end.
 
 %% Tests the erl_iolist_to_string() function.
 
-t_erl_iolist_to_string(suite) -> [];
 t_erl_iolist_to_string(Config) when is_list(Config) ->
-    ?line P = runner:start(?t_erl_iolist_to_string),
+    P = runner:start(?t_erl_iolist_to_string),
 
     %% Flat lists.
 
-    ?line [0] = iolist_to_string(P, []),
-    ?line [10, 0] = iolist_to_string(P, [10]),
-    ?line [10, 20, 0] = iolist_to_string(P, [10, 20]),
-    ?line [10, 20, 30, 0] = iolist_to_string(P, [10, 20, 30]),
-    ?line AllBytes = lists:seq(1, 255)++[0],
-    ?line AllBytes = iolist_to_string(P, lists:seq(1, 255)),
+    [0] = iolist_to_string(P, []),
+    [10, 0] = iolist_to_string(P, [10]),
+    [10, 20, 0] = iolist_to_string(P, [10, 20]),
+    [10, 20, 30, 0] = iolist_to_string(P, [10, 20, 30]),
+    AllBytes = lists:seq(1, 255)++[0],
+    AllBytes = iolist_to_string(P, lists:seq(1, 255)),
 
     %% Deep lists.
 
-    ?line [0] = iolist_to_string(P, [[]]),
-    ?line [42, 0] = iolist_to_string(P, [[], 42]),
-    ?line [42, 0] = iolist_to_string(P, [42, []]),
-    ?line [42, 45, 0] = iolist_to_string(P, [42, [], 45]),
+    [0] = iolist_to_string(P, [[]]),
+    [42, 0] = iolist_to_string(P, [[], 42]),
+    [42, 0] = iolist_to_string(P, [42, []]),
+    [42, 45, 0] = iolist_to_string(P, [42, [], 45]),
 
-    ?line [42, 90, 45, 0] = iolist_to_string(P, [42, [90], 45]),
-    ?line [42, 90, 45, 0] = iolist_to_string(P, [[42, [90]], 45]),
-    ?line [42, 90, 45, 0] = iolist_to_string(P, [[42, [90]], 45]),
+    [42, 90, 45, 0] = iolist_to_string(P, [42, [90], 45]),
+    [42, 90, 45, 0] = iolist_to_string(P, [[42, [90]], 45]),
+    [42, 90, 45, 0] = iolist_to_string(P, [[42, [90]], 45]),
 
     %% List with binaries.
 
-    ?line [0] = iolist_to_string(P, [list_to_binary([])]),
-    ?line [0] = iolist_to_string(P, [[], list_to_binary([])]),
-    ?line [1, 0] = iolist_to_string(P, [[1], list_to_binary([])]),
-    ?line [2, 0] = iolist_to_string(P, [[], list_to_binary([2])]),
-    ?line [42, 2, 0] = iolist_to_string(P, [[42], list_to_binary([2])]),
-    ?line [42, 2, 3, 4, 0] = iolist_to_string(P, [[42],
-						  list_to_binary([2, 3, 4])]),
+    [0] = iolist_to_string(P, [list_to_binary([])]),
+    [0] = iolist_to_string(P, [[], list_to_binary([])]),
+    [1, 0] = iolist_to_string(P, [[1], list_to_binary([])]),
+    [2, 0] = iolist_to_string(P, [[], list_to_binary([2])]),
+    [42, 2, 0] = iolist_to_string(P, [[42], list_to_binary([2])]),
+    [42, 2, 3, 4, 0] = iolist_to_string(P, [[42],
+                                            list_to_binary([2, 3, 4])]),
 
     %% Binaries as tail.
 
-    ?line [0] = iolist_to_string(P, [[]| list_to_binary([])]),
-    ?line [1, 0] = iolist_to_string(P, [[1]| list_to_binary([])]),
-    ?line [2, 0] = iolist_to_string(P, [[]| list_to_binary([2])]),
-    ?line [42, 2, 0] = iolist_to_string(P, [[42]| list_to_binary([2])]),
+    [0] = iolist_to_string(P, [[]| list_to_binary([])]),
+    [1, 0] = iolist_to_string(P, [[1]| list_to_binary([])]),
+    [2, 0] = iolist_to_string(P, [[]| list_to_binary([2])]),
+    [42, 2, 0] = iolist_to_string(P, [[42]| list_to_binary([2])]),
 
     %% Binaries only.
 
-    ?line [0] = iolist_to_string(P, list_to_binary("")),
-    ?line [1, 0] = iolist_to_string(P, list_to_binary([1])),
-    ?line [1, 2, 0] = iolist_to_string(P, list_to_binary([1, 2])),
+    [0] = iolist_to_string(P, list_to_binary("")),
+    [1, 0] = iolist_to_string(P, list_to_binary([1])),
+    [1, 2, 0] = iolist_to_string(P, list_to_binary([1, 2])),
 
     %% Illegal cases.
 
-    ?line 'NULL' = iolist_to_string(P, [0]),
-    ?line 'NULL' = iolist_to_string(P, [65, 0, 66]),
-    ?line 'NULL' = iolist_to_string(P, [65, 66, 67, 0]),
+    'NULL' = iolist_to_string(P, [0]),
+    'NULL' = iolist_to_string(P, [65, 0, 66]),
+    'NULL' = iolist_to_string(P, [65, 66, 67, 0]),
 
-    ?line 'NULL' = iolist_to_string(P, [42|43]),
-    ?line 'NULL' = iolist_to_string(P, a),
+    'NULL' = iolist_to_string(P, [42|43]),
+    'NULL' = iolist_to_string(P, a),
 
-    ?line 'NULL' = iolist_to_string(P, [a]),
-    ?line 'NULL' = iolist_to_string(P, [256]),
-    ?line 'NULL' = iolist_to_string(P, [257]),
-    ?line 'NULL' = iolist_to_string(P, [-1]),
-    ?line 'NULL' = iolist_to_string(P, [-2]),
-    ?line 'NULL' = iolist_to_string(P, [-127]),
-    ?line 'NULL' = iolist_to_string(P, [-128]),
+    'NULL' = iolist_to_string(P, [a]),
+    'NULL' = iolist_to_string(P, [256]),
+    'NULL' = iolist_to_string(P, [257]),
+    'NULL' = iolist_to_string(P, [-1]),
+    'NULL' = iolist_to_string(P, [-2]),
+    'NULL' = iolist_to_string(P, [-127]),
+    'NULL' = iolist_to_string(P, [-128]),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
 %% Invokes the erl_iolist_to_string() function.
@@ -891,8 +838,8 @@ t_erl_iolist_to_string(Config) when is_list(Config) ->
 iolist_to_string(Port, Term) ->
     runner:send_term(Port, Term),
     case get_term(Port) of
-	{bytes, Result} -> Result;
-	'NULL'       -> 'NULL'
+        {bytes, Result} -> Result;
+        'NULL'       -> 'NULL'
     end.
 
 
@@ -902,38 +849,37 @@ iolist_to_string(Port, Term) ->
 %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-erl_print_term(suite) -> [];
-erl_print_term(doc) -> "Tests the erl_print_term() function";
+%% Tests the erl_print_term() function
 erl_print_term(Config) when is_list(Config) ->
-    ?line PrintTerm = print_term(Config),
-    ?line P = open_port({spawn, PrintTerm}, [stream]),
+    PrintTerm = print_term(Config),
+    P = open_port({spawn, PrintTerm}, [stream]),
 
     %% Lists.
 
-    ?line print(P, "[]", []),
-    ?line print(P, "[a]", [a]),
-    ?line print(P, "[[a]]", [[a]]),
-    ?line print(P, "[[]]", [[]]),
-    ?line print(P, "[a,b,c]", [a,b,c]),
-    ?line print(P, "[a,b|c]", [a,b|c]),
-    ?line print(P, "[a,[],c]", [a,[],c]),
-    ?line print(P, "[a,[1000,1],c]", [a,[1000,1],c]),
+    print(P, "[]", []),
+    print(P, "[a]", [a]),
+    print(P, "[[a]]", [[a]]),
+    print(P, "[[]]", [[]]),
+    print(P, "[a,b,c]", [a,b,c]),
+    print(P, "[a,b|c]", [a,b|c]),
+    print(P, "[a,[],c]", [a,[],c]),
+    print(P, "[a,[1000,1],c]", [a,[1000,1],c]),
 
     %% Tuples.
 
-    ?line print(P, "{}", {}),
-    ?line print(P, "{ok}", {ok}),
-    ?line print(P, "{1,2,3}", {1, 2, 3}),
+    print(P, "{}", {}),
+    print(P, "{ok}", {ok}),
+    print(P, "{1,2,3}", {1, 2, 3}),
 
     %% Pids.
 
-    ?line {_X, Y, Z} = split_pid(self()),
-    ?line PidString = lists:flatten(io_lib:format("<~s.~w.~w>",
-						  [node(), Y, Z])),
-    ?line print(P, PidString, self()),
+    {_X, Y, Z} = split_pid(self()),
+    PidString = lists:flatten(io_lib:format("<~s.~w.~w>",
+                                            [node(), Y, Z])),
+    print(P, PidString, self()),
 
-    ?line unlink(P),
-    ?line exit(P, die),
+    unlink(P),
+    exit(P, die),
     ok.
 
 split_pid(Pid) when is_pid(Pid) ->
@@ -948,23 +894,22 @@ split_pid([$.|Rest], Cur, Result) ->
 split_pid([$>], Cur, Result) ->
     list_to_tuple(Result++[Cur]).
 
-print_string(suite) -> [];
-print_string(doc) -> "Test printing a string with erl_print_term()";
+%% Test printing a string with erl_print_term()
 print_string(Config) when is_list(Config) ->
-    ?line PrintTerm = print_term(Config),
-    ?line P = open_port({spawn, PrintTerm}, [stream]),
+    PrintTerm = print_term(Config),
+    P = open_port({spawn, PrintTerm}, [stream]),
 
     %% Strings.
 
-    ?line print(P, "\"ABC\"", "ABC"),
-    ?line {11, "\"\\tABC\\r\\n\""} = print(P, "\tABC\r\n"),
+    print(P, "\"ABC\"", "ABC"),
+    {11, "\"\\tABC\\r\\n\""} = print(P, "\tABC\r\n"),
 
     %% Not strings.
 
-    ?line print(P, "[65,66,67,0]", "ABC\000"),
+    print(P, "[65,66,67,0]", "ABC\000"),
 
-    ?line unlink(P),
-    ?line exit(P, die),
+    unlink(P),
+    exit(P, die),
     ok.
 
 print(Port, TermString, Term) ->
@@ -983,15 +928,15 @@ print(Port, Term) ->
 
 collect_line(Port, Result) ->
     receive
-	{Port, {data, Data}} ->
-	    case lists:reverse(Data) of
-		[$\n|Rest] ->
-		    collect_line1(Rest++Result, []);
-		Chars ->
-		    collect_line(Port, Chars++Result)
-	    end
-    after test_server:seconds(5) ->
-	    test_server:fail("No response from C program")
+        {Port, {data, Data}} ->
+            case lists:reverse(Data) of
+                [$\n|Rest] ->
+                    collect_line1(Rest++Result, []);
+                Chars ->
+                    collect_line(Port, Chars++Result)
+            end
+    after 5000 ->
+              ct:fail("No response from C program")
     end.
 
 collect_line1([$\r|Rest], Result) ->
@@ -1001,18 +946,16 @@ collect_line1([C|Rest], Result) ->
 
 %% Test case submitted by Per Lundgren, ERV.
 
-high_chaparal(suite) -> [];
 high_chaparal(Config) when is_list(Config) ->
-    ?line P = runner:start(?high_chaparal),
-    ?line {term, [hello, world]} = get_term(P),
-    ?line runner:recv_eot(P),
+    P = runner:start(?high_chaparal),
+    {term, [hello, world]} = get_term(P),
+    runner:recv_eot(P),
     ok.
 
 %% OTP-7448
-broken_data(suite) -> [];
 broken_data(Config) when is_list(Config) ->
-    ?line P = runner:start(?broken_data),
-    ?line runner:recv_eot(P),
+    P = runner:start(?broken_data),
+    runner:recv_eot(P),
     ok.
 
 %% This calls a C function with one parameter and returns the result.
@@ -1020,12 +963,12 @@ broken_data(Config) when is_list(Config) ->
 call_erl_function(Port, Term) ->
     runner:send_term(Port, Term),
     case get_term(Port) of
-	{term, Result} -> Result;
-	'NULL'       -> 'NULL'
+        {term, Result} -> Result;
+        'NULL'       -> 'NULL'
     end.
 
 print_term(Config) when is_list(Config) ->
-    filename:join(?config(data_dir, Config), "print_term").
+    filename:join(proplists:get_value(data_dir, Config), "print_term").
 
 
 
@@ -1034,57 +977,57 @@ print_term(Config) when is_list(Config) ->
 %%% back, without having been mutated into short form. We must take
 %%% care then to check the actual returned ref, and not the original
 %%% one, which is equal to it.
-cnode_1(suite) -> [];
-cnode_1(doc) -> "Tests involving cnode: sends a long ref from a cnode to us";
+
+%% Tests involving cnode: sends a long ref from a cnode to us
 cnode_1(Config) when is_list(Config) ->
-    ?line Cnode = filename:join(?config(data_dir, Config), "cnode"),
-    ?line register(mip, self()),
-    ?line spawn_link(?MODULE, start_cnode, [Cnode]),
-    ?line Ref1 = get_ref(),
+    Cnode = filename:join(proplists:get_value(data_dir, Config), "cnode"),
+    register(mip, self()),
+    spawn_link(?MODULE, start_cnode, [Cnode]),
+    Ref1 = get_ref(),
     io:format("Ref1 ~p~n", [Ref1]),
-    ?line check_ref(Ref1),
-    ?line Ref2 = make_ref(),
-    ?line receive
-	      Pid -> Pid
-	  end,
-    ?line Fun1 = fun(X) -> {Pid, X} end,	% sneak in a fun test here
-    %?line Fun1 = {wait_with_funs, new_dist_format},
-    ?line Term = {Ref2, Fun1, {1,2,3,4,5,6,7,8,9,10}},
+    check_ref(Ref1),
+    Ref2 = make_ref(),
+    Pid = receive
+              Msg -> Msg %% pid
+          end,
+    Fun1 = fun(X) -> {Pid, X} end,	% sneak in a fun test here
+    %Fun1 = {wait_with_funs, new_dist_format},
+    Term = {Ref2, Fun1, {1,2,3,4,5,6,7,8,9,10}},
     %% A term which will overflow the original buffer used in 'cnode'.
-    ?line Pid ! Term,
-    ?line receive
-	      Term2 ->
-		  io:format("received ~p~n", [Term2]),
-		  case Term2 of
-		      Term ->
-			  {Ref22,_,_} = Term2,
-			  ?line check_ref(Ref22);
-		      X ->
-		      test_server:fail({receive1,X})
-		  end
-	  after 5000 ->
-		  test_server:fail(receive1)
-	  end,
-    ?line receive
-	      Pid ->
-		  ok;
-	      Y ->
-		  test_server:fail({receive1,Y})
-	  after 5000 ->
-		  test_server:fail(receive2)
-	  end,
-    ?line io:format("ref = ~p~n", [Ref1]),
-    ?line check_ref(Ref1),
+    Pid ! Term,
+    receive
+        Term2 ->
+            io:format("received ~p~n", [Term2]),
+            case Term2 of
+                Term ->
+                    {Ref22,_,_} = Term2,
+                    check_ref(Ref22);
+                X ->
+                    ct:fail({receive1,X})
+            end
+    after 5000 ->
+              ct:fail(receive1)
+    end,
+    receive
+        Pid ->
+            ok;
+        Y ->
+            ct:fail({receive1,Y})
+    after 5000 ->
+              ct:fail(receive2)
+    end,
+    io:format("ref = ~p~n", [Ref1]),
+    check_ref(Ref1),
     ok.
 
 check_ref(Ref) ->
     case bin_ext_type(Ref) of
-	101 ->
-	    test_server:fail(oldref);
-	114 ->
-	    ok;
-	Type ->
-	    test_server:fail({type, Type})
+        101 ->
+            ct:fail(oldref);
+        114 ->
+            ok;
+        Type ->
+            ct:fail({type, Type})
     end.
 
 bin_ext_type(T) ->
@@ -1093,10 +1036,10 @@ bin_ext_type(T) ->
 
 get_ref() ->
     receive
-	X when is_reference(X) ->
-	    X
+        X when is_reference(X) ->
+            X
     after 5000 ->
-	    test_server:fail({cnode, timeout})
+              ct:fail({cnode, timeout})
     end.
 
 start_cnode(Cnode) ->
@@ -1105,35 +1048,33 @@ start_cnode(Cnode) ->
 
 rec_cnode() ->
     receive
-	X ->
-	    io:format("from cnode: ~p~n", [X]),
-	    rec_cnode()
+        X ->
+            io:format("from cnode: ~p~n", [X]),
+            rec_cnode()
     end.
 
 nc2vinfo(Pid) when is_pid(Pid) ->
-    ?line [_NodeStr, NumberStr, SerialStr]
-	= string:tokens(pid_to_list(Pid), "<.>"),
-    ?line Number = list_to_integer(NumberStr),
-    ?line Serial = list_to_integer(SerialStr),
-    ?line {pid, node(Pid), Number, Serial};
+    [_NodeStr, NumberStr, SerialStr]
+    = string:tokens(pid_to_list(Pid), "<.>"),
+    Number = list_to_integer(NumberStr),
+    Serial = list_to_integer(SerialStr),
+    {pid, node(Pid), Number, Serial};
 nc2vinfo(Port) when is_port(Port) ->
-    ?line ["#Port", _NodeStr, NumberStr]
-	= string:tokens(erlang:port_to_list(Port), "<.>"),
-    ?line Number = list_to_integer(NumberStr),
-    ?line {port, node(Port), Number};    
+    ["#Port", _NodeStr, NumberStr]
+    = string:tokens(erlang:port_to_list(Port), "<.>"),
+    Number = list_to_integer(NumberStr),
+    {port, node(Port), Number};
 nc2vinfo(Ref) when is_reference(Ref) ->
-    ?line ["#Ref", _NodeStr | NumStrList]
-	= string:tokens(erlang:ref_to_list(Ref), "<.>"),
-    ?line {Len, RevNumList} = lists:foldl(fun ("0", {N, []}) ->
-						  {N+1, []};
-					      (IStr, {N, Is}) ->
-						  {N+1,
-						   [list_to_integer(IStr)|Is]}
-					  end,
-					  {0, []},
-					  NumStrList),
-    ?line {ref, node(Ref), Len, lists:reverse(RevNumList)};
+    ["#Ref", _NodeStr | NumStrList]
+    = string:tokens(erlang:ref_to_list(Ref), "<.>"),
+    {Len, RevNumList} = lists:foldl(fun ("0", {N, []}) ->
+                                            {N+1, []};
+                                        (IStr, {N, Is}) ->
+                                            {N+1,
+                                             [list_to_integer(IStr)|Is]}
+                                    end,
+                                    {0, []},
+                                    NumStrList),
+    {ref, node(Ref), Len, lists:reverse(RevNumList)};
 nc2vinfo(Other) ->
-    ?line {badarg, Other}.
-
-
+    {badarg, Other}.
diff --git a/lib/erl_interface/test/erl_ext_SUITE.erl b/lib/erl_interface/test/erl_ext_SUITE.erl
index f73c15e15f..9b2f3d3017 100644
--- a/lib/erl_interface/test/erl_ext_SUITE.erl
+++ b/lib/erl_interface/test/erl_ext_SUITE.erl
@@ -21,77 +21,47 @@
 %%
 -module(erl_ext_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("erl_ext_SUITE_data/ext_test_cases.hrl").
 
--export([
-	 all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 compare_tuple/1,
-	 compare_list/1,
-	 compare_string/1,
-	 compare_list_string/1,
-	 compare_nc_ext/1
-	]).
+-export([all/0, suite/0,
+         compare_tuple/1,
+         compare_list/1,
+         compare_string/1,
+         compare_list_string/1,
+         compare_nc_ext/1]).
 
 -import(runner, [get_term/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [compare_tuple, compare_list, compare_string,
      compare_list_string, compare_nc_ext].
 
-groups() -> 
-    [].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-compare_tuple(suite) -> [];
-compare_tuple(doc) -> [];
 compare_tuple(Config) when is_list(Config) ->
-    ?line P = runner:start(?compare_tuple),
-    ?line runner:recv_eot(P),
+    P = runner:start(?compare_tuple),
+    runner:recv_eot(P),
     ok.
 
-compare_list(suite) -> [];
-compare_list(doc) -> [];
 compare_list(Config) when is_list(Config) ->
-    ?line P = runner:start(?compare_list),
-    ?line runner:recv_eot(P),
+    P = runner:start(?compare_list),
+    runner:recv_eot(P),
     ok.
 
-compare_string(suite) -> [];
-compare_string(doc) -> [];
 compare_string(Config) when is_list(Config) ->
-    ?line P = runner:start(?compare_string),
-    ?line runner:recv_eot(P),
+    P = runner:start(?compare_string),
+    runner:recv_eot(P),
     ok.
 
-compare_list_string(suite) -> [];
-compare_list_string(doc) -> [];
 compare_list_string(Config) when is_list(Config) ->
-    ?line P = runner:start(?compare_list_string),
-    ?line runner:recv_eot(P),
+    P = runner:start(?compare_list_string),
+    runner:recv_eot(P),
     ok.
 
-compare_nc_ext(suite) -> [];
-compare_nc_ext(doc) -> [];
 compare_nc_ext(Config) when is_list(Config) ->
-    ?line P = runner:start(?compare_nc_ext),
-    ?line runner:recv_eot(P),
+    P = runner:start(?compare_nc_ext),
+    runner:recv_eot(P),
     ok.
-
-
-
diff --git a/lib/erl_interface/test/erl_format_SUITE.erl b/lib/erl_interface/test/erl_format_SUITE.erl
index 8c01a9914f..32b0571f5e 100644
--- a/lib/erl_interface/test/erl_format_SUITE.erl
+++ b/lib/erl_interface/test/erl_format_SUITE.erl
@@ -21,137 +21,111 @@
 %%
 -module(erl_format_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("erl_format_SUITE_data/format_test_cases.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, atoms/1, tuples/1, lists/1]).
+-export([all/0, suite/0,
+         atoms/1, tuples/1, lists/1]).
 
 -import(runner, [get_term/1]).
 
 %% This test suite test the erl_format() function.
 %% It uses the port program "format_test".
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [atoms, tuples, lists].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 %% Tests formatting various atoms.
 
-atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
-    ?line P = runner:start(?atoms),
-
-    ?line {term, ''} = get_term(P),
-    ?line {term, 'a'} = get_term(P),
-    ?line {term, 'A'} = get_term(P),
-    ?line {term, 'abc'} = get_term(P),
-    ?line {term, 'Abc'} = get_term(P),
-    ?line {term, 'ab@c'} = get_term(P),
-    ?line {term, 'The rain in Spain stays mainly in the plains'} =
-	get_term(P),
-
-    ?line {term, a} = get_term(P),
-    ?line {term, ab} = get_term(P),
-    ?line {term, abc} = get_term(P),
-    ?line {term, ab@c} = get_term(P),
-    ?line {term, abcdefghijklmnopq} = get_term(P),
-
-    ?line {term, ''} = get_term(P),
-    ?line {term, 'a'} = get_term(P),
-    ?line {term, 'A'} = get_term(P),
-    ?line {term, 'abc'} = get_term(P),
-    ?line {term, 'Abc'} = get_term(P),
-    ?line {term, 'ab@c'} = get_term(P),
-    ?line {term, 'The rain in Spain stays mainly in the plains'} =
-	get_term(P),
-
-    ?line {term, a} = get_term(P),
-    ?line {term, ab} = get_term(P),
-    ?line {term, abc} = get_term(P),
-    ?line {term, ab@c} = get_term(P),
-    ?line {term, '   abcdefghijklmnopq   '} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?atoms),
+
+    {term, ''} = get_term(P),
+    {term, 'a'} = get_term(P),
+    {term, 'A'} = get_term(P),
+    {term, 'abc'} = get_term(P),
+    {term, 'Abc'} = get_term(P),
+    {term, 'ab@c'} = get_term(P),
+    {term, 'The rain in Spain stays mainly in the plains'} = get_term(P),
+
+    {term, a} = get_term(P),
+    {term, ab} = get_term(P),
+    {term, abc} = get_term(P),
+    {term, ab@c} = get_term(P),
+    {term, abcdefghijklmnopq} = get_term(P),
+
+    {term, ''} = get_term(P),
+    {term, 'a'} = get_term(P),
+    {term, 'A'} = get_term(P),
+    {term, 'abc'} = get_term(P),
+    {term, 'Abc'} = get_term(P),
+    {term, 'ab@c'} = get_term(P),
+    {term, 'The rain in Spain stays mainly in the plains'} = get_term(P),
+
+    {term, a} = get_term(P),
+    {term, ab} = get_term(P),
+    {term, abc} = get_term(P),
+    {term, ab@c} = get_term(P),
+    {term, '   abcdefghijklmnopq   '} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 
 %% Tests formatting various tuples
 
-tuples(suite) -> [];
 tuples(Config) when is_list(Config) ->
-    ?line P = runner:start(?tuples),
-
-    ?line {term, {}} = get_term(P),
-    ?line {term, {a}} = get_term(P),
-    ?line {term, {a, b}} = get_term(P),
-    ?line {term, {a, b, c}} = get_term(P),
-    ?line {term, {1}} = get_term(P),
-    ?line {term, {[]}} = get_term(P),
-    ?line {term, {[], []}} = get_term(P),
-    ?line {term, {[], a, b, c}} = get_term(P),
-    ?line {term, {[], a, [], b, c}} = get_term(P),
-    ?line {term, {[], a, '', b, c}} = get_term(P),
-
-    ?line runner:recv_eot(P),
+    P = runner:start(?tuples),
+
+    {term, {}} = get_term(P),
+    {term, {a}} = get_term(P),
+    {term, {a, b}} = get_term(P),
+    {term, {a, b, c}} = get_term(P),
+    {term, {1}} = get_term(P),
+    {term, {[]}} = get_term(P),
+    {term, {[], []}} = get_term(P),
+    {term, {[], a, b, c}} = get_term(P),
+    {term, {[], a, [], b, c}} = get_term(P),
+    {term, {[], a, '', b, c}} = get_term(P),
+
+    runner:recv_eot(P),
     ok.
 
 
 
 %% Tests formatting various lists
 
-lists(suite) -> [];
 lists(Config) when is_list(Config) ->
-    ?line P = runner:start(?lists),
-
-    ?line {term, []} = get_term(P),
-    ?line {term, [a]} = get_term(P),
-    ?line {term, [a, b]} = get_term(P),
-    ?line {term, [a, b, c]} = get_term(P),
-    ?line {term, [1]} = get_term(P),
-    ?line {term, [[]]} = get_term(P),
-    ?line {term, [[], []]} = get_term(P),
-    ?line {term, [[], a, b, c]} = get_term(P),
-    ?line {term, [[], a, [], b, c]} = get_term(P),
-    ?line {term, [[], a, '', b, c]} = get_term(P),
-
-    ?line {term, [{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]} = 
-	get_term(P),
+    P = runner:start(?lists),
+
+    {term, []} = get_term(P),
+    {term, [a]} = get_term(P),
+    {term, [a, b]} = get_term(P),
+    {term, [a, b, c]} = get_term(P),
+    {term, [1]} = get_term(P),
+    {term, [[]]} = get_term(P),
+    {term, [[], []]} = get_term(P),
+    {term, [[], a, b, c]} = get_term(P),
+    {term, [[], a, [], b, c]} = get_term(P),
+    {term, [[], a, '', b, c]} = get_term(P),
+
+    {term, [{name, 'Madonna'}, {age, 21}, {data, [{addr, "E-street", 42}]}]} = get_term(P),
     case os:type() of
-	vxworks ->
-	    ?line {term, [{pi, _}, {'cos(70)', _}]} = get_term(P),
-	    ?line {term, [[pi, _], ['cos(70)', _]]} = get_term(P),
-	    ?line {term, [[pi, _], [], ["cos(70)", _]]} = 
-		get_term(P);
-	_ ->
-	    ?line {term, [{pi, 3.1415}, {'cos(70)', 0.34202}]} = get_term(P),
-	    ?line {term, [[pi, 3.1415], ['cos(70)', 0.34202]]} = get_term(P),
-	    ?line {term, [[pi, 3.1415], [], ["cos(70)", 0.34202]]} = 
-		get_term(P)
+        vxworks ->
+            {term, [{pi, _}, {'cos(70)', _}]} = get_term(P),
+            {term, [[pi, _], ['cos(70)', _]]} = get_term(P),
+            {term, [[pi, _], [], ["cos(70)", _]]} = get_term(P);
+        _ ->
+            {term, [{pi, 3.1415}, {'cos(70)', 0.34202}]} = get_term(P),
+            {term, [[pi, 3.1415], ['cos(70)', 0.34202]]} = get_term(P),
+            {term, [[pi, 3.1415], [], ["cos(70)", 0.34202]]} = get_term(P)
     end,
 
-    ?line {term, [-1]} = get_term(P),
+    {term, [-1]} = get_term(P),
 
-    ?line runner:recv_eot(P),
+    runner:recv_eot(P),
     ok.
-
-
-
diff --git a/lib/erl_interface/test/erl_global_SUITE.erl b/lib/erl_interface/test/erl_global_SUITE.erl
index b719ad5c6a..cf0ec80f66 100644
--- a/lib/erl_interface/test/erl_global_SUITE.erl
+++ b/lib/erl_interface/test/erl_global_SUITE.erl
@@ -21,12 +21,12 @@
 %%
 -module(erl_global_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("erl_global_SUITE_data/erl_global_test_cases.hrl").
 
--export([all/0,suite/0,init_per_suite/1,end_per_suite/1,
-	 init_per_testcase/2,end_per_testcase/2,
-	 erl_global_registration/1, erl_global_whereis/1, erl_global_names/1]).
+-export([all/0,suite/0,
+         erl_global_registration/1,
+         erl_global_whereis/1, erl_global_names/1]).
 
 -import(runner, [get_term/1,send_term/2]).
 
@@ -35,62 +35,50 @@
 all() ->
     [erl_global_registration, erl_global_whereis, erl_global_names].
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 30}}].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(0.25)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
 
 erl_global_registration(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
+    P = runner:start(?interpret),
+    {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
 
-    ?line ok = erl_global_register(P, Fd, ?GLOBAL_NAME),
-    ?line ok = erl_global_unregister(P, Fd, ?GLOBAL_NAME),
+    ok = erl_global_register(P, Fd, ?GLOBAL_NAME),
+    ok = erl_global_unregister(P, Fd, ?GLOBAL_NAME),
 
-    ?line 0 = erl_close_connection(P,Fd),
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    0 = erl_close_connection(P,Fd),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 erl_global_whereis(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
-
-    ?line Self = self(),
-    ?line yes = global:register_name(?GLOBAL_NAME, Self),
-    ?line Self = erl_global_whereis(P, Fd, ?GLOBAL_NAME),
-    ?line global:unregister_name(?GLOBAL_NAME),
-    ?line 0 = erl_close_connection(P, Fd),
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    P = runner:start(?interpret),
+    {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
+
+    Self = self(),
+    yes = global:register_name(?GLOBAL_NAME, Self),
+    Self = erl_global_whereis(P, Fd, ?GLOBAL_NAME),
+    global:unregister_name(?GLOBAL_NAME),
+    0 = erl_close_connection(P, Fd),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 erl_global_names(Config) when is_list(Config) ->
-    ?line P = runner:start(?interpret),
-    ?line {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
-
-    ?line Self = self(),
-    ?line global:register_name(?GLOBAL_NAME, Self),
-    ?line {Names1, _N1} = erl_global_names(P, Fd),
-    ?line true = lists:member(atom_to_list(?GLOBAL_NAME), Names1),
-    ?line global:unregister_name(?GLOBAL_NAME),
-    ?line {Names2, _N2} = erl_global_names(P, Fd),
-    ?line false = lists:member(atom_to_list(?GLOBAL_NAME), Names2),
-    ?line 0 = erl_close_connection(P, Fd),
-    ?line runner:send_eot(P),
-    ?line runner:recv_eot(P),
+    P = runner:start(?interpret),
+    {ok, Fd} = erl_connect(P, node(), 42, erlang:get_cookie(), 0),
+
+    Self = self(),
+    global:register_name(?GLOBAL_NAME, Self),
+    {Names1, _N1} = erl_global_names(P, Fd),
+    true = lists:member(atom_to_list(?GLOBAL_NAME), Names1),
+    global:unregister_name(?GLOBAL_NAME),
+    {Names2, _N2} = erl_global_names(P, Fd),
+    false = lists:member(atom_to_list(?GLOBAL_NAME), Names2),
+    0 = erl_close_connection(P, Fd),
+    runner:send_eot(P),
+    runner:recv_eot(P),
     ok.
 
 %%% Interface functions for erl_interface functions.
@@ -98,14 +86,14 @@ erl_global_names(Config) when is_list(Config) ->
 erl_connect(P, Node, Num, Cookie, Creation) ->
     send_command(P, erl_connect, [Num, Node, Cookie, Creation]),
     case get_term(P) of
-	{term,{Fd,_}} when Fd >= 0 -> {ok,Fd};
-	{term,{-1,Errno}} -> {error,Errno}
+        {term,{Fd,_}} when Fd >= 0 -> {ok,Fd};
+        {term,{-1,Errno}} -> {error,Errno}
     end.
 
 erl_close_connection(P, FD) ->
     send_command(P, erl_close_connection, [FD]),
     case get_term(P) of
-	{term,Int} when is_integer(Int) -> Int
+        {term,Int} when is_integer(Int) -> Int
     end.
 
 erl_global_register(P, Fd, Name) ->
@@ -115,15 +103,15 @@ erl_global_register(P, Fd, Name) ->
 erl_global_whereis(P, Fd, Name) ->
     send_command(P, erl_global_whereis, [Fd,Name]),
     case get_term(P) of
-	{term, What} ->
-	    What
+        {term, What} ->
+            What
     end.
 
 erl_global_names(P, Fd) ->
     send_command(P, erl_global_names, [Fd]),
     case get_term(P) of
-	{term, What} ->
-	    What
+        {term, What} ->
+            What
     end.
 
 erl_global_unregister(P, Fd, Name) ->
@@ -132,11 +120,11 @@ erl_global_unregister(P, Fd, Name) ->
 
 get_send_result(P) ->
     case get_term(P) of
-	{term,{1,_}} -> ok;
-	{term,{0, 0}} -> ok;
-	{term,{-1, Errno}} -> {error,Errno};
-	{term,{_,_}}->
-	    ?t:fail(bad_return_value)
+        {term,{1,_}} -> ok;
+        {term,{0, 0}} -> ok;
+        {term,{-1, Errno}} -> {error,Errno};
+        {term,{_,_}}->
+            ct:fail(bad_return_value)
     end.
 
 send_command(P, Name, Args) ->
diff --git a/lib/erl_interface/test/erl_match_SUITE.erl b/lib/erl_interface/test/erl_match_SUITE.erl
index d8f7bd89b4..5a40c19e3b 100644
--- a/lib/erl_interface/test/erl_match_SUITE.erl
+++ b/lib/erl_interface/test/erl_match_SUITE.erl
@@ -21,249 +21,221 @@
 %%
 -module(erl_match_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("erl_match_SUITE_data/match_test_cases.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 atoms/1, lists/1, tuples/1, references/1, pids/1, ports/1,
-	 bind/1, integers/1, floats/1, binaries/1, strings/1]).
+-export([all/0, suite/0,
+         atoms/1, lists/1, tuples/1, references/1, pids/1, ports/1,
+         bind/1, integers/1, floats/1, binaries/1, strings/1]).
 
 %% For interactive running of matcher.
 -export([start_matcher/1, erl_match/3]).
 
 %% This test suite tests the erl_match() function.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [atoms, lists, tuples, references, pids, ports, bind,
      integers, floats, binaries, strings].
 
-groups() -> 
-    [].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
+    P = start_matcher(Config),
 
-    ?line eq(P, '', ''),
-    ?line eq(P, a, a),
-    ?line ne(P, a, b),
-    ?line ne(P, a, aa),
-    ?line eq(P, kalle, kalle),
-    ?line ne(P, kalle, arne),
+    eq(P, '', ''),
+    eq(P, a, a),
+    ne(P, a, b),
+    ne(P, a, aa),
+    eq(P, kalle, kalle),
+    ne(P, kalle, arne),
 
-    ?line ne(P, kalle, 42),
-    ?line ne(P, 42, kalle),
+    ne(P, kalle, 42),
+    ne(P, 42, kalle),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
-lists(suite) -> [];
 lists(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
-    ?line eq(P, [], []),
+    P = start_matcher(Config),
+    eq(P, [], []),
 
-    ?line ne(P, [], [a]),
-    ?line ne(P, [a], []),
+    ne(P, [], [a]),
+    ne(P, [a], []),
 
-    ?line eq(P, [a], [a]),
-    ?line ne(P, [a], [b]),
+    eq(P, [a], [a]),
+    ne(P, [a], [b]),
 
-    ?line eq(P, [a|b], [a|b]),
-    ?line ne(P, [a|b], [a|x]),
+    eq(P, [a|b], [a|b]),
+    ne(P, [a|b], [a|x]),
 
-    ?line eq(P, [a, b], [a, b]),
-    ?line ne(P, [a, b], [a, x]),
+    eq(P, [a, b], [a, b]),
+    ne(P, [a, b], [a, x]),
 
-    ?line eq(P, [a, b, c], [a, b, c]),
-    ?line ne(P, [a, b|c], [a, b|x]),
-    ?line ne(P, [a, b, c], [a, b, x]),
-    ?line ne(P, [a, b|c], [a, b|x]),
-    ?line ne(P, [a, x|c], [a, b|c]),
-    ?line ne(P, [a, b, c], [a, x, c]),
+    eq(P, [a, b, c], [a, b, c]),
+    ne(P, [a, b|c], [a, b|x]),
+    ne(P, [a, b, c], [a, b, x]),
+    ne(P, [a, b|c], [a, b|x]),
+    ne(P, [a, x|c], [a, b|c]),
+    ne(P, [a, b, c], [a, x, c]),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
-tuples(suite) -> [];
 tuples(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
+    P = start_matcher(Config),
 
-    ?line ne(P, {}, {a, b}),
-    ?line ne(P, {a, b}, {}),
-    ?line ne(P, {a}, {a, b}),
-    ?line ne(P, {a, b}, {a}),
+    ne(P, {}, {a, b}),
+    ne(P, {a, b}, {}),
+    ne(P, {a}, {a, b}),
+    ne(P, {a, b}, {a}),
 
-    ?line eq(P, {}, {}),
+    eq(P, {}, {}),
 
-    ?line eq(P, {a}, {a}),
-    ?line ne(P, {a}, {b}),
+    eq(P, {a}, {a}),
+    ne(P, {a}, {b}),
 
-    ?line eq(P, {1}, {1}),
-    ?line ne(P, {1}, {2}),
+    eq(P, {1}, {1}),
+    ne(P, {1}, {2}),
 
-    ?line eq(P, {a, b}, {a, b}),
-    ?line ne(P, {x, b}, {a, b}),
+    eq(P, {a, b}, {a, b}),
+    ne(P, {x, b}, {a, b}),
 
-    ?line ne(P, {error, x}, {error, y}),
-    ?line ne(P, {error, {undefined, {subscriber, last}}},
-	     {error, {undefined, {subscriber, name}}}),
+    ne(P, {error, x}, {error, y}),
+    ne(P, {error, {undefined, {subscriber, last}}},
+       {error, {undefined, {subscriber, name}}}),
 
-    ?line runner:finish(P),
+    runner:finish(P),
     ok.
 
 
-references(suite) -> [];
 references(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
-    ?line Ref1 = make_ref(),
-    ?line Ref2 = make_ref(),
-    
-    ?line eq(P, Ref1, Ref1),
-    ?line eq(P, Ref2, Ref2),
-    ?line ne(P, Ref1, Ref2),
-    ?line ne(P, Ref2, Ref1),
-
-    ?line runner:finish(P),
+    P = start_matcher(Config),
+    Ref1 = make_ref(),
+    Ref2 = make_ref(),
+
+    eq(P, Ref1, Ref1),
+    eq(P, Ref2, Ref2),
+    ne(P, Ref1, Ref2),
+    ne(P, Ref2, Ref1),
+
+    runner:finish(P),
     ok.
 
 
-pids(suite) -> [];
 pids(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
-    ?line Pid1 = c:pid(0,1,2),
-    ?line Pid2 = c:pid(0,1,3),
-    
-    ?line eq(P, self(), self()),
-    ?line eq(P, Pid1, Pid1),
-    ?line ne(P, Pid1, self()),
-    ?line ne(P, Pid2, Pid1),
-
-    ?line runner:finish(P),
+    P = start_matcher(Config),
+    Pid1 = c:pid(0,1,2),
+    Pid2 = c:pid(0,1,3),
+
+    eq(P, self(), self()),
+    eq(P, Pid1, Pid1),
+    ne(P, Pid1, self()),
+    ne(P, Pid2, Pid1),
+
+    runner:finish(P),
     ok.
 
 
-ports(suite) -> [];
 ports(Config) when is_list(Config) ->
     case os:type() of
-	vxworks ->
-	    {skipped,"not on vxworks, pucko"};
-	_ ->
-	    ?line P = start_matcher(Config),
-	    ?line P2 = start_matcher(Config),
-    
-	    ?line eq(P, P, P),
-	    ?line ne(P, P, P2),
-
-	    ?line runner:finish(P),
-	    ?line runner:finish(P2),
-	    ok
+        vxworks ->
+            {skipped,"not on vxworks, pucko"};
+        _ ->
+            P = start_matcher(Config),
+            P2 = start_matcher(Config),
+
+            eq(P, P, P),
+            ne(P, P, P2),
+
+            runner:finish(P),
+            runner:finish(P2),
+            ok
     end.
 
-integers(suite) -> [];
 integers(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
-    ?line I1 = 123,
-    ?line I2 = 12345,
-    ?line I3 = -123,
-    ?line I4 = 2234,
-    
-    ?line eq(P, I1, I1),
-    ?line eq(P, I2, I2),
-    ?line ne(P, I1, I2),
-    ?line ne(P, I1, I3),
-    ?line eq(P, I4, I4),
-
-    ?line runner:finish(P),
+    P = start_matcher(Config),
+    I1 = 123,
+    I2 = 12345,
+    I3 = -123,
+    I4 = 2234,
+
+    eq(P, I1, I1),
+    eq(P, I2, I2),
+    ne(P, I1, I2),
+    ne(P, I1, I3),
+    eq(P, I4, I4),
+
+    runner:finish(P),
     ok.
 
 
 
-floats(suite) -> [];
 floats(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
-    ?line F1 = 3.1414,
-    ?line F2 = 3.1415,
-    ?line F3 = 3.1416,
-
-    ?line S1 = "string",
-    ?line S2 = "string2",
-    
-    ?line eq(P, F1, F1),
-    ?line eq(P, F2, F2),
-    ?line ne(P, F1, F2),
-    ?line ne(P, F3, F2),
-
-    ?line eq(P, S2, S2),
-    ?line ne(P, S1, S2),
-
-    ?line runner:finish(P),
+    P = start_matcher(Config),
+    F1 = 3.1414,
+    F2 = 3.1415,
+    F3 = 3.1416,
+
+    S1 = "string",
+    S2 = "string2",
+
+    eq(P, F1, F1),
+    eq(P, F2, F2),
+    ne(P, F1, F2),
+    ne(P, F3, F2),
+
+    eq(P, S2, S2),
+    ne(P, S1, S2),
+
+    runner:finish(P),
     ok.
 
 
 
-binaries(suite) -> [];
 binaries(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
-    ?line Bin1 = term_to_binary({kalle, 146015, {kungsgatan, 23}}),
-    ?line Bin2 = term_to_binary(sune),
-    ?line Bin3 = list_to_binary("sune"),
-    
-    ?line eq(P, Bin1, Bin1),
-    ?line eq(P, Bin2, Bin2),
-    ?line eq(P, Bin3, Bin3),
-    ?line ne(P, Bin1, Bin2),
-    ?line ne(P, Bin1, Bin3),
-    ?line ne(P, Bin2, Bin3),
-
-    ?line runner:finish(P),
+    P = start_matcher(Config),
+    Bin1 = term_to_binary({kalle, 146015, {kungsgatan, 23}}),
+    Bin2 = term_to_binary(sune),
+    Bin3 = list_to_binary("sune"),
+
+    eq(P, Bin1, Bin1),
+    eq(P, Bin2, Bin2),
+    eq(P, Bin3, Bin3),
+    ne(P, Bin1, Bin2),
+    ne(P, Bin1, Bin3),
+    ne(P, Bin2, Bin3),
+
+    runner:finish(P),
     ok.
 
 
-
-strings(suite) -> [];
 strings(Config) when is_list(Config) ->
-    ?line P = start_matcher(Config),
+    P = start_matcher(Config),
 
-    ?line S1 = "string",
-    ?line S2 = "streng",
-    ?line S3 = "String",
-    
-    ?line eq(P, S1, S1),
-    ?line ne(P, S1, S2),
-    ?line ne(P, S1, S3),
+    S1 = "string",
+    S2 = "streng",
+    S3 = "String",
 
-    ?line runner:finish(P),
-    ok.
+    eq(P, S1, S1),
+    ne(P, S1, S2),
+    ne(P, S1, S3),
 
+    runner:finish(P),
+    ok.
 
 
-bind(suite) -> [];
 bind(Config) when is_list(Config) ->
-    ?line P = start_bind(Config),
-    ?line S = "[X,Y,Z]",
-    ?line L1 = [301,302,302],
-    ?line L2 = [65,66,67],
-        
-    ?line bind_ok(P, S, L1),
-    ?line bind_ok(P, S, L2),
-
-    ?line runner:finish(P),
+    P = start_bind(Config),
+    S = "[X,Y,Z]",
+    L1 = [301,302,302],
+    L2 = [65,66,67],
+
+    bind_ok(P, S, L1),
+    bind_ok(P, S, L2),
+
+    runner:finish(P),
     ok.
 
 start_bind(Config) ->
@@ -279,15 +251,12 @@ erl_bind(Port, Pattern, Term) ->
     Port ! {self(), {command, [$b, Pattern, 0]}},
     runner:send_term(Port, Term),
     case runner:get_term(Port) of
-	{term, 0} -> false;
-	{term, 1} -> true
+        {term, 0} -> false;
+        {term, 1} -> true
     end.
 
 
 
-
-
-
 start_matcher(Config) ->
     runner:start(?erl_match_server).
 
@@ -303,8 +272,6 @@ erl_match(Port, Pattern, Term) ->
     runner:send_term(Port, Pattern),
     runner:send_term(Port, Term),
     case runner:get_term(Port) of
-	{term, 0} -> false;
-	{term, 1} -> true
+        {term, 0} -> false;
+        {term, 1} -> true
     end.
-
-
diff --git a/lib/erl_interface/test/port_call_SUITE.erl b/lib/erl_interface/test/port_call_SUITE.erl
index b0f5ed4fe9..26e1e0eeb4 100644
--- a/lib/erl_interface/test/port_call_SUITE.erl
+++ b/lib/erl_interface/test/port_call_SUITE.erl
@@ -32,96 +32,78 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, basic/1]).
-% Private exports
--include_lib("test_server/include/test_server.hrl").
+-export([all/0, suite/0, basic/1]).
 
+% Private exports
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {seconds, 10}}].
 
 all() -> 
-[basic].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
+    [basic].
 
 
-basic(suite) -> [];
 basic(Config) when is_list(Config) ->
     case os:type() of
-	{unix, linux} ->
-	    do_basic(Config);
-	{unix, sunos} ->
-	    do_basic(Config);
-	{win32,_} ->
-	    do_basic(Config);
-	_ ->
-	    {skipped, "Dynamic linking and erl_interface not fully examined"
-	     " on this platform..."}	    
+        {unix, linux} ->
+            do_basic(Config);
+        {unix, sunos} ->
+            do_basic(Config);
+        {win32,_} ->
+            do_basic(Config);
+        _ ->
+            {skipped, "Dynamic linking and erl_interface not fully examined"
+                      " on this platform..."}
     end.
 
 do_basic(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
 
-    ?line erl_ddll:start(),
+    erl_ddll:start(),
 
     %% Load the echo driver and verify that it was loaded.
     {ok,L1,L2}=load_port_call_driver(Path),
 
     %% Verify that the driver works.
 
-    ?line Port = open_port({spawn, port_call_drv}, [eof]),
-    ?line {hej, "hopp",4711,123445567436543653} = 
-	erlang:port_call(Port,{hej, "hopp",4711,123445567436543653}),
-    ?line {hej, "hopp",4711,123445567436543653} = 
-	erlang:port_call(Port,0,{hej, "hopp",4711,123445567436543653}),
-    ?line {[], a, [], b, c} = 
-	erlang:port_call(Port,1,{hej, "hopp",4711,123445567436543653}),
-    ?line {return, {[], a, [], b, c}} = 
-	erlang:port_call(Port,2,{[], a, [], b, c}),
-    ?line List = lists:duplicate(200,5),
-    ?line {return, List} = erlang:port_call(Port,2,List),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:port_call(Port,4711,[])),
-    ?line {'EXIT',{badarg,_}} = (catch erlang:port_call(sune,2,[])),
-    ?line register(gunnar,Port),
-    ?line {return, List} = erlang:port_call(gunnar,2,List),
-    ?line {return, a} = erlang:port_call(gunnar,2,a),
-    ?line erlang:port_close(Port),
+    Port = open_port({spawn, port_call_drv}, [eof]),
+    {hej, "hopp",4711,123445567436543653} =
+        erlang:port_call(Port,{hej, "hopp",4711,123445567436543653}),
+    {hej, "hopp",4711,123445567436543653} =
+        erlang:port_call(Port,0,{hej, "hopp",4711,123445567436543653}),
+    {[], a, [], b, c} =
+        erlang:port_call(Port,1,{hej, "hopp",4711,123445567436543653}),
+    {return, {[], a, [], b, c}} =
+        erlang:port_call(Port,2,{[], a, [], b, c}),
+    List = lists:duplicate(200,5),
+    {return, List} = erlang:port_call(Port,2,List),
+    {'EXIT',{badarg,_}} = (catch erlang:port_call(Port,4711,[])),
+    {'EXIT',{badarg,_}} = (catch erlang:port_call(sune,2,[])),
+    register(gunnar,Port),
+    {return, List} = erlang:port_call(gunnar,2,List),
+    {return, a} = erlang:port_call(gunnar,2,a),
+    erlang:port_close(Port),
     %% Unload the driver and verify that it was unloaded.
     ok=unload_port_call_driver(L1,L2),
 
-    ?line {error, {already_started, _}} = erl_ddll:start(),
-    ?line ok = erl_ddll:stop(),
-
-    ?line test_server:timetrap_cancel(Dog),
+    {error, {already_started, _}} = erl_ddll:start(),
+    ok = erl_ddll:stop(),
     ok.
 
 load_port_call_driver(Path) ->
-    ?line {ok, L1} = erl_ddll:loaded_drivers(),
-    ?line ok = erl_ddll:load_driver(Path, port_call_drv),
-    ?line {ok, L2} = erl_ddll:loaded_drivers(),
-    ?line ["port_call_drv"] = ordsets:to_list(ordsets:subtract(ordsets:from_list(L2), 
-							       ordsets:from_list(L1))),
+    {ok, L1} = erl_ddll:loaded_drivers(),
+    ok = erl_ddll:load_driver(Path, port_call_drv),
+    {ok, L2} = erl_ddll:loaded_drivers(),
+    ["port_call_drv"] = ordsets:to_list(ordsets:subtract(ordsets:from_list(L2),
+                                                         ordsets:from_list(L1))),
     {ok,L1,L2}.
 
 unload_port_call_driver(L1,L2) ->
-    ?line {ok, L2} = erl_ddll:loaded_drivers(),
-    ?line ok = erl_ddll:unload_driver(port_call_drv),
-    ?line {ok, L3} = erl_ddll:loaded_drivers(),
-    ?line [] = ordsets:to_list(ordsets:subtract(ordsets:from_list(L3),
-						ordsets:from_list(L1))),
+    {ok, L2} = erl_ddll:loaded_drivers(),
+    ok = erl_ddll:unload_driver(port_call_drv),
+    {ok, L3} = erl_ddll:loaded_drivers(),
+    [] = ordsets:to_list(ordsets:subtract(ordsets:from_list(L3),
+                                          ordsets:from_list(L1))),
     ok.
-
diff --git a/lib/erl_interface/test/runner.erl b/lib/erl_interface/test/runner.erl
index ae2598abf8..3854981ad1 100644
--- a/lib/erl_interface/test/runner.erl
+++ b/lib/erl_interface/test/runner.erl
@@ -25,7 +25,7 @@
 	 start/1, send_term/2, finish/1, send_eot/1, recv_eot/1,
 	 get_term/1, get_term/2]).
 
--define(default_timeout, test_server:seconds(5)).
+-define(default_timeout, 5000).
 
 %% Executes a test case in a C program.
 %%
@@ -45,7 +45,7 @@ test(Tc, Timeout) ->
 	    io:format("In this test case, a success/failure result was"),
 	    io:format("expected from the C program.\n"),
 	    io:format("Received: ~p", [Other]),
-	    test_server:fail()
+	    ct:fail(badresult)
     end.
 
 %% Executes a test case in a C program.  Returns the port.
@@ -80,7 +80,7 @@ send_eot(Port) when is_port(Port) ->
     Port ! {self(), {command, [$e]}}.
 
 %% Waits for an 'eot' indication from the C program.
-%% Either returns 'ok' or invokes test_server:fail().
+%% Either returns 'ok' or invokes ct:fail(badresult).
 
 recv_eot(Port) when is_port(Port) ->    
     case get_term(Port) of
@@ -90,12 +90,12 @@ recv_eot(Port) when is_port(Port) ->
 	    io:format("Error finishing test case.  Expected eof from"),
 	    io:format("C program, but got:"),
 	    io:format("~p", [Other]),
-	    test_server:fail()
+	    ct:fail(badresult)
     end.
 
 %% Reads a term from the C program.
 %%
-%% Returns: {term, Term}|eot|'NULL' or calls test_server:fail/1,2.
+%% Returns: {term, Term}|eot|'NULL' or calls ct:fail/1,2.
 
 get_term(Port) ->
     get_term(Port, ?default_timeout).
@@ -105,9 +105,9 @@ get_term(Port, Timeout) ->
 	[$b|Bytes] ->
 	    {bytes, Bytes};
 	[$f] ->
-	    test_server:fail();
+	    ct:fail(failure);
 	[$f|Reason] ->
-	    test_server:fail(Reason);
+	    ct:fail(Reason);
 	[$t|Term] ->
 	    {term, binary_to_term(list_to_binary(Term))};
 	[$N] ->
@@ -119,7 +119,7 @@ get_term(Port, Timeout) ->
 	    get_term(Port, Timeout);
 	Other ->
 	    io:format("Garbage received from C program: ~p", [Other]),
-	    test_server:fail("Illegal response from C program")
+	    ct:fail("Illegal response from C program")
     end.
 
 get_reply(Port, Timeout) when is_port(Port) ->
@@ -127,5 +127,5 @@ get_reply(Port, Timeout) when is_port(Port) ->
 	{Port, {data, Reply}} ->
 	    Reply
     after Timeout ->
-	    test_server:fail("No response from C program")
+	    ct:fail("No response from C program")
     end.
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 18ba9df41e..56dbdbac9f 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 3.8.1
+EI_VSN = 3.8.2
 ERL_INTERFACE_VSN = $(EI_VSN)
diff --git a/lib/eunit/doc/src/notes.xml b/lib/eunit/doc/src/notes.xml
index cf0523d230..398729217b 100644
--- a/lib/eunit/doc/src/notes.xml
+++ b/lib/eunit/doc/src/notes.xml
@@ -33,6 +33,20 @@
   </header>
   <p>This document describes the changes made to the EUnit application.</p>
 
+<section><title>Eunit 2.2.13</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Suppress Dialyzer warnings. </p>
+          <p>
+	    Own Id: OTP-12862</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eunit 2.2.12</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/eunit/src/eunit_data.erl b/lib/eunit/src/eunit_data.erl
index 8b53a3681d..cc002cb449 100644
--- a/lib/eunit/src/eunit_data.erl
+++ b/lib/eunit/src/eunit_data.erl
@@ -761,6 +761,7 @@ lazy_test_() ->
 	     lazy_gen(7),
 	     ?_assertMatch(7, get(count))]}.
 
+-dialyzer({no_improper_lists, lazy_gen/1}).
 lazy_gen(N) ->
     {generator,
      fun () ->
diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl
index d8f98cffa5..4dbe023257 100644
--- a/lib/eunit/src/eunit_lib.erl
+++ b/lib/eunit/src/eunit_lib.erl
@@ -192,6 +192,7 @@ error_msg(Title, Fmt, Args) ->
     io_lib:fwrite("*** ~ts ***\n~ts\n\n", [Title, Msg]).
 
 -ifdef(TEST).
+-dialyzer({no_match, format_exception_test_/0}).
 format_exception_test_() ->
     [?_assertMatch(
         "\nymmud:rorre"++_,
@@ -273,6 +274,7 @@ dlist_next([], Xs) ->
 
 
 -ifdef(TEST).
+-dialyzer({no_match, dlist_test_/0}).
 dlist_test_() ->
     {"deep list traversal",
      [{"non-list term -> singleton list",
@@ -338,6 +340,7 @@ is_nonempty_string([]) -> false;
 is_nonempty_string(Cs) -> is_string(Cs).
 
 -ifdef(TEST).
+-dialyzer({no_match, is_string_test_/0}).
 is_string_test_() ->
     {"is_string",
      [{"no non-lists", ?_assert(not is_string($A))},
@@ -399,6 +402,7 @@ uniq([X | Xs]) -> [X | uniq(Xs)];
 uniq([]) -> [].
 
 -ifdef(TEST).
+-dialyzer({[no_match, no_fail_call, no_improper_lists], uniq_test_/0}).
 uniq_test_() ->
     {"uniq",
      [?_assertError(function_clause, uniq(ok)),
@@ -459,6 +463,7 @@ normalize([]) ->
 
 -ifdef(TEST).
 
+-dialyzer({no_match, cmd_test_/0}).
 cmd_test_() ->
     ([?_test({0, "hello\n"} = ?_cmd_("echo hello"))]
      ++ case os:type() of
@@ -576,6 +581,7 @@ trie_match([], _T) ->
 
 -ifdef(TEST).
 
+-dialyzer({no_match, trie_test_/0}).
 trie_test_() ->
     [{"basic representation",
       [?_assert(trie_new() =:= gb_trees:empty()),
diff --git a/lib/eunit/src/eunit_listener.erl b/lib/eunit/src/eunit_listener.erl
index ecaac424a2..c34eacb1d6 100644
--- a/lib/eunit/src/eunit_listener.erl
+++ b/lib/eunit/src/eunit_listener.erl
@@ -27,14 +27,11 @@
 
 -export([start/1, start/2]).
 
--export([behaviour_info/1]).
-
-
-behaviour_info(callbacks) ->
-    [{init,1},{handle_begin,3},{handle_end,3},{handle_cancel,3},
-     {terminate,2}];
-behaviour_info(_Other) ->
-    undefined.
+-callback init(_) -> _.
+-callback handle_begin(_, _, _) -> _.
+-callback handle_end(_, _, _) -> _.
+-callback handle_cancel(_, _, _) -> _.
+-callback terminate(_, _) -> _.
 
 
 -record(state, {callback,    % callback module
@@ -50,18 +47,22 @@ start(Callback) ->
 
 start(Callback, Options) ->
     St = #state{callback = Callback},
-    spawn_opt(fun () -> init(St, Options) end,
+    spawn_opt(init_fun(St, Options),
 	      proplists:get_all_values(spawn, Options)).
 
-init(St0, Options) ->
-    St1 = call(init, [Options], St0),
-    St2 = expect([], undefined, St1),
-    Data = [{pass, St2#state.pass},
-	    {fail, St2#state.fail},
-	    {skip, St2#state.skip},
-	    {cancel, St2#state.cancel}],
-    call(terminate, [{ok, Data}, St2#state.state], St2),
-    exit(normal).
+-spec init_fun(_, _) -> fun(() -> no_return()).
+
+init_fun(St0, Options) ->
+    fun () ->
+            St1 = call(init, [Options], St0),
+            St2 = expect([], undefined, St1),
+            Data = [{pass, St2#state.pass},
+                    {fail, St2#state.fail},
+                    {skip, St2#state.skip},
+                    {cancel, St2#state.cancel}],
+            call(terminate, [{ok, Data}, St2#state.state], St2),
+            exit(normal)
+    end.
 
 expect(Id, ParentId, St) ->
     case wait_for(Id, 'begin', ParentId) of
diff --git a/lib/eunit/src/eunit_proc.erl b/lib/eunit/src/eunit_proc.erl
index 98ae31d54b..8bdf94c877 100644
--- a/lib/eunit/src/eunit_proc.erl
+++ b/lib/eunit/src/eunit_proc.erl
@@ -268,6 +268,8 @@ insulator_wait(Child, Parent, Buf, St) ->
 	    kill_task(Child, St)
     end.
 
+-spec kill_task(_, _) -> no_return().
+
 kill_task(Child, St) ->
     exit(Child, kill),
     terminate_insulator(St).
diff --git a/lib/eunit/src/eunit_serial.erl b/lib/eunit/src/eunit_serial.erl
index 1a0179a5df..da76064a53 100644
--- a/lib/eunit/src/eunit_serial.erl
+++ b/lib/eunit/src/eunit_serial.erl
@@ -61,14 +61,16 @@
 		messages  = dict:new()		 :: dict:dict()}).
 
 start(Pids) ->
-    spawn(fun () -> serializer(Pids) end).
-
-serializer(Pids) ->
-    St = #state{listeners = sets:from_list(Pids),
-		cancelled = eunit_lib:trie_new(),
-		messages = dict:new()},
-    expect([], undefined, 0, St),
-    exit(normal).
+    spawn(serializer_fun(Pids)).
+
+serializer_fun(Pids) ->
+    fun () ->
+            St = #state{listeners = sets:from_list(Pids),
+                        cancelled = eunit_lib:trie_new(),
+                        messages = dict:new()},
+            expect([], undefined, 0, St),
+            exit(normal)
+    end.
 
 %% collect beginning and end of an expected item; return {Done, NewSt}
 %% where Done is true if there are no more items of this group
diff --git a/lib/eunit/src/eunit_surefire.erl b/lib/eunit/src/eunit_surefire.erl
index f3e58a3d1c..1b468551d8 100644
--- a/lib/eunit/src/eunit_surefire.erl
+++ b/lib/eunit/src/eunit_surefire.erl
@@ -56,7 +56,11 @@
 	{
 	  name :: chars(),
 	  description :: chars(),
-	  result :: ok | {failed, tuple()} | {aborted, tuple()} | {skipped, term()},
+	  result :: ok
+                  | {failed, tuple()}
+                  | {aborted, tuple()}
+                  | {skipped, term()}
+                  | undefined,
 	  time :: integer(),
 	  output :: binary()
 	 }).
diff --git a/lib/eunit/src/eunit_test.erl b/lib/eunit/src/eunit_test.erl
index 9cf40a738d..62d30b1930 100644
--- a/lib/eunit/src/eunit_test.erl
+++ b/lib/eunit/src/eunit_test.erl
@@ -40,6 +40,7 @@ get_stacktrace() ->
 get_stacktrace(Ts) ->
     eunit_lib:uniq(prune_trace(erlang:get_stacktrace(), Ts)).
 
+-dialyzer({no_match, prune_trace/2}).
 prune_trace([{eunit_data, _, _} | Rest], Tail) ->
     prune_trace(Rest, Tail);
 prune_trace([{eunit_data, _, _, _} | Rest], Tail) ->
@@ -75,6 +76,7 @@ run_testfun(F) ->
 
 
 -ifdef(TEST).
+-dialyzer({[no_match, no_fail_call, no_return], macro_test_/0}).
 macro_test_() ->
     {"macro definitions",
      [{?LINE, fun () ->
@@ -301,6 +303,7 @@ wrapper_test_() ->
      ]}.
 
 %% this must be exported (done automatically by the autoexport transform)
+-dialyzer({no_missing_calls, wrapper_test_exported_/0}).
 wrapper_test_exported_() ->
     {ok, ?MODULE:nonexisting_function()}.
 -endif.
diff --git a/lib/eunit/src/eunit_tests.erl b/lib/eunit/src/eunit_tests.erl
index 47ea0aaf46..5dee1cb49e 100644
--- a/lib/eunit/src/eunit_tests.erl
+++ b/lib/eunit/src/eunit_tests.erl
@@ -23,6 +23,8 @@
 
 -include("eunit.hrl").
 
+-dialyzer(no_match).
+
 -ifdef(TEST).
 id(X) -> X.  % for suppressing compiler warnings
 -endif.
diff --git a/lib/eunit/test/Makefile b/lib/eunit/test/Makefile
index 8721bacf89..6f166f99aa 100644
--- a/lib/eunit/test/Makefile
+++ b/lib/eunit/test/Makefile
@@ -41,8 +41,8 @@ RELSYSDIR = $(RELEASE_PATH)/eunit_test
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_MAKE_FLAGS += -pa $(ERL_TOP)/lib/test_server/ebin
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_MAKE_FLAGS +=
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
diff --git a/lib/eunit/vsn.mk b/lib/eunit/vsn.mk
index 00cbab5829..dcb7fad699 100644
--- a/lib/eunit/vsn.mk
+++ b/lib/eunit/vsn.mk
@@ -1 +1 @@
-EUNIT_VSN = 2.2.12
+EUNIT_VSN = 2.2.13
diff --git a/lib/gs/Makefile b/lib/gs/Makefile
index 02c8fc3467..b95d435461 100644
--- a/lib/gs/Makefile
+++ b/lib/gs/Makefile
@@ -26,7 +26,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 # Macros
 #
 
-SUB_DIRECTORIES =  src tcl contribs examples doc/src
+SUB_DIRECTORIES =  src tcl examples doc/src
 
 include vsn.mk
 VSN = $(GS_VSN)
diff --git a/lib/gs/contribs/Makefile b/lib/gs/contribs/Makefile
deleted file mode 100644
index 061fae86c1..0000000000
--- a/lib/gs/contribs/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1996-2009. 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%
-#
-
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-SUB_DIRECTORIES = bonk cols mandel othello
-SPECIAL_TARGETS = 
-
-#
-# Default Subdir Targets
-#
-include $(ERL_TOP)/make/otp_subdir.mk
-
diff --git a/lib/gs/contribs/bonk/Makefile b/lib/gs/contribs/bonk/Makefile
deleted file mode 100644
index b7508a97c9..0000000000
--- a/lib/gs/contribs/bonk/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1996-2012. 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%
-#
-
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(GS_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/gs-$(VSN)/contribs
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES= \
-       bonk \
-       bonk_sound \
-       bonk_square \
-       sounder
-
-HRL_FILES= 
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=../ebin/%.$(EMULATOR)) $(TARGET_TOOLBOX_FILES)
-
-BITMAPS= bitmaps/bonkbomb bitmaps/bonkface bitmaps/bonklogo bitmaps/bonkmiss \
-	bitmaps/bonktom bitmaps/bonkx bitmaps/erl-e bitmaps/erl-text
-SOUNDS= sounds/bonk.au sounds/damn.au sounds/explosion.au sounds/gameover.au \
-	sounds/hehee.au sounds/level.au sounds/missedme.au sounds/music.au \
-	sounds/ouch!!!.au sounds/praisejesus.au sounds/trumpet.au sounds/yes.au 
-
-TOOLNAME = bonk
-
-EXTRA_FILES= $(TOOLNAME).txt
-TOOLBOX_FILES= $(TOOLNAME).tool $(TOOLNAME).gif
-TARGET_TOOLBOX_FILES= $(TOOLBOX_FILES:%=$(EBIN)/%)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES)
-
-docs:
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f core
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-$(EBIN)/$(TOOLNAME).gif: $(TOOLNAME).gif
-	$(gen_verbose)rm -f $@
-	$(V_at)cp $(TOOLNAME).gif $@
-
-$(EBIN)/$(TOOLNAME).tool: $(TOOLNAME).tool
-	$(gen_verbose)rm -f $@
-	$(V_at)cp $(TOOLNAME).tool $@
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/bonk/bitmaps"
-	$(INSTALL_DATA) $(BITMAPS) $(TOOLBOX_FILES) "$(RELSYSDIR)/bonk/bitmaps"
-	$(INSTALL_DIR) "$(RELSYSDIR)/bonk/sounds"
-	$(INSTALL_DATA) $(SOUNDS) "$(RELSYSDIR)/bonk/sounds"
-	$(INSTALL_DIR) "$(RELSYSDIR)/bonk"
-	$(INSTALL_DATA) $(ERL_FILES) $(EXTRA_FILES) "$(RELSYSDIR)/bonk"
-
-
-release_docs_spec:
-
diff --git a/lib/gs/contribs/bonk/bitmaps/bonkbomb b/lib/gs/contribs/bonk/bitmaps/bonkbomb
deleted file mode 100644
index 8b121db9e8..0000000000
--- a/lib/gs/contribs/bonk/bitmaps/bonkbomb
+++ /dev/null
@@ -1,66 +0,0 @@
-#define bonkbomb_width 75
-#define bonkbomb_height 75
-static char bonkbomb_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x04, 0x10, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
-   0x10, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x21,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x11, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x90, 0x08, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x80, 0x90, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x04, 0x51, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
-   0x12, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x94, 0x18,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41, 0x06, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xfc, 0xbb, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-   0x99, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x18, 0x19,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x62, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x30, 0x84, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x80, 0x30, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xc0, 0x31, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0,
-   0x3b, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x1f, 0x40,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xb8, 0x0e, 0x80, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xfc, 0x7f, 0x5c, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xff, 0xff, 0xaf, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff,
-   0xff, 0x57, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xaf,
-   0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0x5f, 0x1d, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xbf, 0x0e, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xfc, 0xff, 0xff, 0x7f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xfe, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff,
-   0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfe, 0xff, 0xff,
-   0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfe, 0xff, 0xff, 0x01, 0x00,
-   0x00, 0x00, 0x00, 0x80, 0x7f, 0xfc, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00,
-   0x00, 0x80, 0x3f, 0xf8, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x80,
-   0x0f, 0xf0, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0xc0,
-   0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0x7f, 0xf0, 0xff, 0xff,
-   0x03, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xf8, 0xff, 0xff, 0x07, 0x00,
-   0x00, 0x00, 0x00, 0xc0, 0xff, 0xfd, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00,
-   0x00, 0xc0, 0xff, 0xfd, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x80,
-   0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff,
-   0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff,
-   0x03, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00,
-   0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff,
-   0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x7f, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xf0, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xe0, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff,
-   0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/gs/contribs/bonk/bitmaps/bonkface b/lib/gs/contribs/bonk/bitmaps/bonkface
deleted file mode 100644
index 964fb93098..0000000000
--- a/lib/gs/contribs/bonk/bitmaps/bonkface
+++ /dev/null
@@ -1,66 +0,0 @@
-#define bonkface_width 75
-#define bonkface_height 75
-static char bonkface_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x03,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x3c, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x80, 0x01, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00,
-   0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-   0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x40, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-   0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08,
-   0x00, 0x80, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x30, 0x00, 0x60,
-   0x00, 0x04, 0x00, 0x00, 0x00, 0x80, 0x00, 0xc0, 0x00, 0x18, 0x00, 0x08,
-   0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x03, 0x06, 0x00, 0x0f, 0x00, 0x00,
-   0x00, 0x40, 0xff, 0x00, 0x00, 0x00, 0xf8, 0x17, 0x00, 0x00, 0x00, 0x40,
-   0xfe, 0x1f, 0x00, 0xc0, 0xff, 0x13, 0x00, 0x00, 0x00, 0x20, 0xf8, 0xff,
-   0x03, 0xfe, 0xff, 0x20, 0x00, 0x00, 0x00, 0x20, 0xf0, 0xff, 0xff, 0xff,
-   0x7f, 0x20, 0x00, 0x00, 0x00, 0x20, 0xc0, 0xff, 0xdf, 0xff, 0x1f, 0x20,
-   0x00, 0x00, 0x00, 0x20, 0x00, 0xff, 0xdf, 0xff, 0x07, 0x20, 0x00, 0x00,
-   0x00, 0x10, 0x00, 0xfe, 0x8f, 0xff, 0x03, 0x40, 0x00, 0x00, 0x00, 0x10,
-   0x00, 0xf8, 0x8f, 0xff, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0xf0,
-   0x07, 0x7f, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0xc0, 0x07, 0x1f,
-   0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x03, 0x06, 0x00, 0x40,
-   0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00,
-   0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0xe0,
-   0x00, 0x38, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x10, 0xf0, 0x01, 0x7c,
-   0x40, 0x40, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x06, 0x03, 0x40, 0x40,
-   0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0xf8, 0x00, 0x40, 0x40, 0x00, 0x00,
-   0x00, 0x10, 0x30, 0x00, 0x00, 0x00, 0x60, 0x40, 0x00, 0x00, 0x00, 0x10,
-   0x70, 0x00, 0x00, 0x00, 0x70, 0x40, 0x00, 0x00, 0x00, 0x10, 0xf0, 0x01,
-   0x00, 0x00, 0x7c, 0x40, 0x00, 0x00, 0x00, 0x20, 0xf0, 0x0f, 0x00, 0x80,
-   0x7f, 0x20, 0x00, 0x00, 0x00, 0x20, 0xf0, 0xff, 0x03, 0xfe, 0x7f, 0x20,
-   0x00, 0x00, 0x00, 0x20, 0xf0, 0x7f, 0xfe, 0xff, 0x7f, 0x20, 0x00, 0x00,
-   0x00, 0x20, 0xe0, 0x7f, 0xfe, 0xff, 0x3f, 0x20, 0x00, 0x00, 0x00, 0x40,
-   0xe0, 0x7f, 0xfe, 0xff, 0x3f, 0x10, 0x00, 0x00, 0x00, 0x40, 0xc0, 0xff,
-   0xff, 0xff, 0x1f, 0x10, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xff, 0xff, 0xff,
-   0x1f, 0x08, 0x00, 0x00, 0x00, 0x80, 0x80, 0xff, 0xff, 0xff, 0x0f, 0x08,
-   0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0x07, 0x04, 0x00, 0x00,
-   0x00, 0x00, 0x01, 0xfe, 0xff, 0xff, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00,
-   0x02, 0xfc, 0xff, 0xfc, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0xf0,
-   0xff, 0x7c, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0xc0, 0xff, 0x1c,
-   0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0xff, 0x07, 0x40, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x80, 0x01, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
-   0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0xc0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x3c, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/gs/contribs/bonk/bitmaps/bonklogo b/lib/gs/contribs/bonk/bitmaps/bonklogo
deleted file mode 100644
index 3adc59984a..0000000000
--- a/lib/gs/contribs/bonk/bitmaps/bonklogo
+++ /dev/null
@@ -1,320 +0,0 @@
-#define bonklogo_width 300
-#define bonklogo_height 100
-static char bonklogo_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x3f, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00,
-   0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
-   0x83, 0xff, 0x9f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x3c, 0xf8, 0xff, 0x7f, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x87, 0xff, 0xff, 0xff, 0x08, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x80, 0xf9, 0xff, 0xff, 0xff, 0x13, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x27,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff,
-   0xff, 0x4f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff,
-   0xff, 0xff, 0xff, 0x9f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x80, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x01, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x02, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff,
-   0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0x0f,
-   0xfe, 0xff, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff,
-   0xff, 0x2f, 0xf8, 0xff, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x80, 0xdf, 0xff, 0x2f, 0xf0, 0xff, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0xc3, 0xff, 0x2f, 0xf0, 0xff, 0x09, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xff, 0x2f, 0xe0, 0xff, 0x0b, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x01, 0x00, 0x80, 0xff, 0x09,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x2f, 0xc0, 0xff,
-   0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xc0,
-   0xff, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x27,
-   0xc0, 0xff, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7f, 0x01,
-   0x00, 0xc0, 0xff, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
-   0xff, 0x17, 0xc0, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
-   0x7f, 0x01, 0x00, 0xe0, 0xff, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xe0, 0xff, 0x17, 0xc0, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xfc, 0x7f, 0x01, 0x00, 0xe0, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xe0, 0xff, 0x17, 0x80, 0xff, 0x17, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xfc, 0x7f, 0xff, 0x3f, 0xe0, 0x7f, 0x02, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0x17, 0x80, 0xff, 0x17, 0xc0,
-   0xff, 0x7f, 0xe0, 0xff, 0x3f, 0xfc, 0x7f, 0x00, 0x20, 0xe0, 0x7f, 0x01,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0x17, 0x80, 0xff,
-   0x17, 0x00, 0x00, 0x80, 0x00, 0x00, 0x20, 0xfc, 0x7f, 0xfe, 0x2f, 0xf0,
-   0x3f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0x17,
-   0x80, 0xff, 0x17, 0xe0, 0xff, 0x1f, 0xe1, 0xff, 0x2f, 0xfc, 0x7f, 0xfe,
-   0x2f, 0xf0, 0x3f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0,
-   0xff, 0x17, 0x80, 0xff, 0x17, 0xf0, 0xff, 0x7f, 0xe6, 0xff, 0x4f, 0xfc,
-   0x7f, 0xfe, 0x2f, 0xf0, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xe0, 0xff, 0x17, 0x80, 0xff, 0x17, 0xf8, 0xff, 0xff, 0xe8, 0xff,
-   0x4f, 0xfc, 0x7f, 0xfe, 0x2f, 0xf8, 0x9f, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xe0, 0xff, 0x17, 0x80, 0xff, 0x17, 0xfe, 0xff, 0xff,
-   0xeb, 0xff, 0x5f, 0xfc, 0x7f, 0xfe, 0x2f, 0xf8, 0x9f, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0x17, 0x80, 0xff, 0x17, 0xfe,
-   0xff, 0xff, 0xe3, 0xff, 0x5f, 0xfc, 0x7f, 0xfe, 0x2f, 0xf8, 0x5f, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0x17, 0xc0, 0xff,
-   0x17, 0xff, 0xff, 0xff, 0xe7, 0xff, 0x5f, 0xfc, 0x7f, 0xfe, 0x2f, 0xfc,
-   0x4f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0x17,
-   0xc0, 0xff, 0x93, 0xff, 0xff, 0xff, 0xe7, 0xff, 0x5f, 0xfc, 0x7f, 0xfe,
-   0x2f, 0xfc, 0x4f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0,
-   0xff, 0x17, 0xc0, 0xff, 0x8b, 0xff, 0xff, 0xff, 0xe7, 0xff, 0x9f, 0xfc,
-   0x7f, 0xfe, 0x2f, 0xfc, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xe0, 0xff, 0x13, 0xe0, 0xff, 0x8b, 0xff, 0xff, 0xff, 0xcf, 0xff,
-   0xbf, 0xfc, 0x7f, 0xfe, 0x2f, 0xfc, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0xff, 0x0b, 0xf2, 0xff, 0xcd, 0xff, 0xff, 0xff,
-   0xcf, 0xff, 0xbf, 0xfc, 0x7f, 0xfe, 0x2f, 0xfe, 0x17, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x0b, 0xf9, 0xff, 0xd9, 0xff,
-   0xff, 0xff, 0x1f, 0xff, 0xbf, 0xfc, 0x7f, 0xfe, 0x2f, 0xfe, 0x13, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xcb, 0xfc, 0xff,
-   0xc0, 0xff, 0x8f, 0xff, 0x1f, 0xff, 0xbf, 0xfc, 0x7f, 0xfe, 0x2f, 0xfe,
-   0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x2b,
-   0xfe, 0xff, 0x87, 0xff, 0x03, 0xff, 0x3f, 0xff, 0xbf, 0xfc, 0x7f, 0xfe,
-   0x2f, 0xff, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0xff, 0x9b, 0xff, 0xff, 0x3f, 0xff, 0x01, 0xfe, 0x3f, 0xff, 0x3f, 0xfd,
-   0x7f, 0xfe, 0x2f, 0xff, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0xff, 0xc3, 0xff, 0xff, 0x7f, 0xfe, 0x05, 0xfc, 0x3f, 0xff,
-   0x7f, 0xfd, 0x7f, 0xfe, 0x2f, 0xff, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xfc, 0x04, 0xfc,
-   0x3f, 0xff, 0x7f, 0xfd, 0x7f, 0xfe, 0x2f, 0xff, 0x04, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
-   0x02, 0xf8, 0x3f, 0xff, 0x7f, 0xfd, 0x7f, 0xfe, 0xaf, 0xff, 0x04, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0xfd, 0x02, 0xf8, 0x3f, 0xff, 0x7f, 0xfc, 0x7f, 0xfe, 0xaf, 0xff,
-   0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0xf9, 0x02, 0xf8, 0x3f, 0xff, 0x7f, 0xfc, 0x7f, 0xfe,
-   0x8f, 0x7f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0x02, 0xf8, 0x3f, 0xff, 0xff, 0xfc,
-   0x7f, 0xfe, 0xcf, 0x7f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0x02, 0xf8, 0x3f, 0xff,
-   0xff, 0xfc, 0x7f, 0xfe, 0xcf, 0x7f, 0x01, 0x00, 0x00, 0x38, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0x02, 0xf8,
-   0x3f, 0xff, 0xff, 0xfc, 0x7f, 0xfe, 0xcf, 0x3f, 0x01, 0x00, 0x00, 0x38,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0x3f, 0xfe, 0xff, 0xff, 0xf7,
-   0x02, 0xf8, 0x3f, 0xff, 0xff, 0xfc, 0x7f, 0xfe, 0xef, 0x3f, 0x01, 0x00,
-   0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0x03, 0x80, 0xff,
-   0xff, 0xe7, 0x02, 0xf8, 0x3f, 0xff, 0xff, 0xfc, 0x7f, 0xfe, 0xef, 0x9f,
-   0x00, 0x00, 0x00, 0x00, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0x01,
-   0x00, 0xff, 0xff, 0xe7, 0x02, 0xf8, 0x3f, 0xff, 0xff, 0xfd, 0x7f, 0xfe,
-   0xef, 0xdf, 0x00, 0x00, 0x00, 0x30, 0xd8, 0x07, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,
-   0xff, 0x05, 0x00, 0xff, 0xff, 0xe7, 0x02, 0xf8, 0x3f, 0xff, 0xff, 0xfd,
-   0x7f, 0xfe, 0xef, 0x9f, 0x00, 0x00, 0x00, 0x38, 0xfc, 0x07, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf8, 0xff, 0x05, 0x00, 0xff, 0xff, 0xef, 0x02, 0xf8, 0x3f, 0xff,
-   0xff, 0xfd, 0x7f, 0xfe, 0xff, 0xbf, 0x00, 0x00, 0x00, 0x38, 0x7c, 0x0e,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf8, 0xff, 0x05, 0x00, 0xfe, 0xff, 0xef, 0x02, 0xf8,
-   0x3f, 0xff, 0xff, 0xfd, 0x7f, 0xfe, 0xff, 0x3f, 0x01, 0x00, 0x00, 0x38,
-   0x3e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0x05, 0x00, 0xfe, 0xff, 0xef,
-   0x02, 0xf8, 0x3f, 0xff, 0xff, 0xfd, 0x7f, 0xfe, 0xff, 0x7f, 0x02, 0x00,
-   0x00, 0x38, 0x3e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0x05, 0x00, 0xfc,
-   0xff, 0xcf, 0x02, 0xf8, 0x3f, 0xff, 0xff, 0xfd, 0x7f, 0xfe, 0xff, 0xff,
-   0x02, 0x00, 0x00, 0x38, 0x3b, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0x04,
-   0x00, 0xfc, 0xff, 0xcf, 0x02, 0xf8, 0x3f, 0xff, 0xff, 0xff, 0x7f, 0xfe,
-   0xff, 0xff, 0x04, 0x00, 0x00, 0xb8, 0x39, 0x2e, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,
-   0xff, 0x02, 0x00, 0xfc, 0xff, 0xcf, 0x02, 0xf8, 0x3f, 0xff, 0xff, 0xff,
-   0x7f, 0xfe, 0xff, 0xff, 0x05, 0x00, 0x00, 0xf0, 0x39, 0x3c, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf8, 0xff, 0x02, 0x00, 0xfc, 0xff, 0xcf, 0x04, 0xf8, 0x3f, 0xff,
-   0xfd, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x09, 0x00, 0x00, 0xf0, 0x38, 0x1c,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf8, 0xff, 0x02, 0x00, 0xfc, 0xff, 0xcf, 0x05, 0xf8,
-   0x3f, 0xff, 0xfd, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x13, 0x00, 0x00, 0x60,
-   0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x02, 0x00, 0xfc, 0xff, 0xcf,
-   0x0d, 0xf8, 0x3f, 0xff, 0xfd, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x17, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x02, 0x00, 0xfe,
-   0xff, 0xcf, 0x09, 0xfd, 0x3f, 0xff, 0xfd, 0xff, 0x7f, 0xfe, 0xff, 0xff,
-   0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x02,
-   0x00, 0xfe, 0xff, 0xcf, 0xcb, 0xfc, 0x3f, 0xff, 0xfd, 0xff, 0x7f, 0xfe,
-   0xff, 0xff, 0x4f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
-   0xff, 0x02, 0x00, 0xfe, 0xff, 0xcf, 0x33, 0xfe, 0x3f, 0xff, 0xf9, 0xff,
-   0x7f, 0xfe, 0xff, 0xff, 0x5f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xfc, 0xff, 0x02, 0x00, 0xfe, 0xff, 0xcf, 0x07, 0xff, 0x3f, 0xff,
-   0xf9, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x9f, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xfc, 0xff, 0x02, 0x00, 0xfe, 0xff, 0xcf, 0xcf, 0xff,
-   0x3f, 0xff, 0xf9, 0xff, 0x7f, 0xfe, 0x7f, 0xff, 0x3f, 0x01, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x02, 0x40, 0xfe, 0xff, 0xcf,
-   0xff, 0xff, 0x3f, 0xff, 0xf9, 0xff, 0x7f, 0xfe, 0x7f, 0xfe, 0x3f, 0x01,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x02, 0x3c, 0xff,
-   0xff, 0xc7, 0xff, 0xff, 0x3f, 0xff, 0xf9, 0xff, 0x7f, 0xfe, 0x7f, 0xfe,
-   0x7f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x82,
-   0x87, 0xff, 0xff, 0xe7, 0xff, 0xff, 0x3f, 0xff, 0xf1, 0xff, 0x7f, 0xfe,
-   0x3f, 0xfc, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
-   0xff, 0x72, 0xf0, 0xff, 0xff, 0xe7, 0xff, 0xff, 0x3f, 0xff, 0xf1, 0xff,
-   0x7f, 0xfe, 0xbf, 0xf8, 0xff, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xfc, 0xff, 0x0e, 0xff, 0xff, 0xff, 0xe7, 0xff, 0xff, 0x9f, 0xff,
-   0xf5, 0xff, 0x7f, 0xfe, 0xbf, 0xf8, 0xff, 0x09, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xfc, 0xff, 0xe0, 0xff, 0xff, 0xff, 0xe7, 0xff, 0xff,
-   0x9f, 0xff, 0xf5, 0xff, 0x7f, 0xfe, 0x9f, 0xf0, 0xff, 0x0b, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7,
-   0xff, 0xff, 0x9f, 0xff, 0xf5, 0xff, 0x7f, 0xfe, 0x5f, 0xf0, 0xff, 0x13,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfe, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0xf3, 0xff, 0xff, 0xdf, 0xff, 0xf5, 0xff, 0x7f, 0xfe, 0x4f, 0xe0,
-   0xff, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xfe, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0xf3, 0xff, 0xff, 0xcf, 0xff, 0xe5, 0xff, 0x7f, 0xfe,
-   0x2f, 0xe0, 0xff, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xff, 0xff, 0xcf, 0xff, 0xe5, 0xff,
-   0x7f, 0xfe, 0x2f, 0xc0, 0xff, 0x4f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xff, 0xff, 0xe7, 0xff,
-   0xe5, 0xff, 0x7f, 0xfe, 0x2f, 0xc0, 0xff, 0x9f, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xf8, 0xff, 0xff,
-   0xe7, 0xff, 0xe5, 0xff, 0x7f, 0xfe, 0x2f, 0x80, 0xff, 0x9f, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xfc,
-   0xff, 0xff, 0xf7, 0xff, 0xe5, 0xff, 0x7f, 0xfe, 0x2f, 0x00, 0xff, 0x3f,
-   0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
-   0x1f, 0xfe, 0xff, 0xff, 0xf3, 0xff, 0xc5, 0xff, 0x7f, 0xfe, 0x2f, 0x00,
-   0xff, 0x7f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0xf3, 0xff, 0xc5, 0xff, 0x7f, 0xfe,
-   0x2f, 0x00, 0xfe, 0x7f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff,
-   0xff, 0xff, 0xff, 0xff, 0x23, 0xff, 0xff, 0xff, 0xf1, 0xff, 0xc5, 0xff,
-   0x7f, 0xfe, 0x2f, 0x00, 0xfe, 0xff, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x11, 0xfe, 0xff, 0xff, 0xf5, 0xff,
-   0xc5, 0xff, 0x7f, 0xfe, 0x2f, 0x00, 0xfc, 0xff, 0x04, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0c, 0xfc, 0xff, 0xff,
-   0xf4, 0xff, 0xc5, 0xff, 0x7f, 0xfe, 0x2f, 0x00, 0xfc, 0xff, 0x09, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x02, 0xfc,
-   0xff, 0x7f, 0xf2, 0xff, 0xc5, 0xff, 0x7f, 0xfe, 0x2f, 0x00, 0xf8, 0xff,
-   0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x01,
-   0x00, 0xe0, 0xff, 0x3f, 0xf1, 0xff, 0x85, 0xff, 0x7f, 0xfe, 0x2f, 0x00,
-   0xf8, 0xff, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff,
-   0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x85, 0xff, 0x7f, 0xfe,
-   0x2f, 0x00, 0xf0, 0xff, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff,
-   0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x85, 0xff,
-   0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xf0, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xf0, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x7f, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/gs/contribs/bonk/bitmaps/bonkmiss b/lib/gs/contribs/bonk/bitmaps/bonkmiss
deleted file mode 100644
index 862e4839fc..0000000000
--- a/lib/gs/contribs/bonk/bitmaps/bonkmiss
+++ /dev/null
@@ -1,66 +0,0 @@
-#define bonkmiss_width 75
-#define bonkmiss_height 75
-static char bonkmiss_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x60, 0x80, 0x19, 0x3c, 0xc0, 0x83, 0xff, 0xf9, 0x01, 0x00, 0x60, 0x80,
-   0x19, 0x7e, 0xe0, 0x87, 0xff, 0xf9, 0x03, 0x00, 0xe0, 0xc0, 0x19, 0xe7,
-   0x70, 0x8e, 0x01, 0x18, 0x07, 0x00, 0xe0, 0xc0, 0x99, 0xc3, 0x39, 0x9c,
-   0x01, 0x18, 0x0e, 0x00, 0xe0, 0xe1, 0x99, 0x81, 0x19, 0x98, 0x01, 0x18,
-   0x0c, 0x00, 0xe0, 0xe1, 0x99, 0x81, 0x19, 0x98, 0x01, 0x18, 0x1c, 0x00,
-   0xe0, 0xf3, 0x99, 0x01, 0x18, 0x80, 0x01, 0x18, 0x18, 0x00, 0x60, 0xb3,
-   0x99, 0x01, 0x18, 0x80, 0x01, 0x18, 0x18, 0x00, 0x60, 0xb3, 0x99, 0x03,
-   0x38, 0x80, 0x01, 0x18, 0x18, 0x00, 0x60, 0x9e, 0x19, 0x07, 0x70, 0x80,
-   0x01, 0x18, 0x18, 0x00, 0x60, 0x9e, 0x19, 0x3e, 0xe0, 0x83, 0x1f, 0x18,
-   0x18, 0x00, 0x60, 0x8c, 0x19, 0x7c, 0xc0, 0x87, 0x1f, 0x18, 0x18, 0x00,
-   0x60, 0x80, 0x19, 0xe0, 0x00, 0x8e, 0x01, 0x18, 0x18, 0x00, 0x60, 0x80,
-   0x19, 0xc0, 0x01, 0x9c, 0x01, 0x18, 0x18, 0x00, 0x60, 0x80, 0x19, 0x80,
-   0x01, 0x98, 0x01, 0x18, 0x18, 0x00, 0x60, 0x80, 0x19, 0x80, 0x01, 0x98,
-   0x01, 0x18, 0x18, 0x00, 0x60, 0x80, 0x19, 0x80, 0x01, 0x98, 0x01, 0x18,
-   0x18, 0x00, 0x60, 0x80, 0x99, 0x81, 0x19, 0x98, 0x01, 0x18, 0x18, 0x00,
-   0x60, 0x80, 0x99, 0x81, 0x19, 0x98, 0x01, 0x18, 0x18, 0x00, 0x60, 0x80,
-   0x99, 0x81, 0x19, 0x98, 0x01, 0x18, 0x18, 0x00, 0x60, 0x80, 0x99, 0x81,
-   0x19, 0x98, 0x01, 0x18, 0x18, 0x00, 0x60, 0x80, 0x99, 0x81, 0x19, 0x98,
-   0x01, 0x18, 0x18, 0x00, 0x60, 0x80, 0x99, 0x81, 0x19, 0x98, 0x01, 0x18,
-   0x18, 0x00, 0x60, 0x80, 0x99, 0x81, 0x19, 0x98, 0x01, 0x18, 0x1c, 0x00,
-   0x60, 0x80, 0x99, 0x81, 0x19, 0x98, 0x01, 0x18, 0x0c, 0x00, 0x60, 0x80,
-   0x99, 0xc3, 0x39, 0x9c, 0x01, 0x18, 0x0e, 0x00, 0x60, 0x80, 0x19, 0xe7,
-   0x70, 0x8e, 0x01, 0x18, 0x07, 0x00, 0x60, 0x80, 0x19, 0x7e, 0xe0, 0x87,
-   0xff, 0xf9, 0x03, 0x00, 0x60, 0x80, 0x19, 0x3c, 0xc0, 0x83, 0xff, 0xf9,
-   0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0xff, 0x03, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0xff, 0x03, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x1c, 0x38, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x1c, 0x38, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c,
-   0x3c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3c, 0x03,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x3e, 0x03, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x36, 0x03, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x6c, 0x36, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xcc, 0x33, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc,
-   0x33, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8c, 0x31, 0x3f,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x03, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x03, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x0c, 0x30, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x0c, 0x30, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c,
-   0x30, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x03,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x03, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x03, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x0c, 0x30, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x0c, 0x30, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c,
-   0x30, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x03,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x03, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x03, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x0c, 0x30, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x0c, 0x30, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c,
-   0x30, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/gs/contribs/bonk/bitmaps/bonktom b/lib/gs/contribs/bonk/bitmaps/bonktom
deleted file mode 100644
index defbc32cc9..0000000000
--- a/lib/gs/contribs/bonk/bitmaps/bonktom
+++ /dev/null
@@ -1,66 +0,0 @@
-#define bonktom_width 75
-#define bonktom_height 75
-static char bonktom_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/gs/contribs/bonk/bitmaps/bonkx b/lib/gs/contribs/bonk/bitmaps/bonkx
deleted file mode 100644
index 70cd89bdb7..0000000000
--- a/lib/gs/contribs/bonk/bitmaps/bonkx
+++ /dev/null
@@ -1,66 +0,0 @@
-#define bonkx_width 75
-#define bonkx_height 75
-static char bonkx_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0x3e, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xf0, 0x03, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xf8, 0x03, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x01,
-   0xf8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0xf0, 0x07,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, 0xe0, 0x0f, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0xc0, 0x1f, 0x00, 0x00, 0xfe, 0x03,
-   0x00, 0xc0, 0x1f, 0x00, 0x80, 0x3f, 0x00, 0xe0, 0x01, 0x3c, 0x00, 0xe0,
-   0x0f, 0x00, 0x00, 0x7f, 0x00, 0x18, 0x00, 0xc0, 0x00, 0xf0, 0x07, 0x00,
-   0x00, 0xfe, 0x00, 0x06, 0x00, 0x00, 0x03, 0xf8, 0x03, 0x00, 0x00, 0xfc,
-   0x81, 0x01, 0x00, 0x00, 0x0c, 0xfc, 0x01, 0x00, 0x00, 0xf8, 0x43, 0x00,
-   0x00, 0x00, 0x10, 0xfe, 0x00, 0x00, 0x00, 0xf0, 0x27, 0x00, 0x00, 0x00,
-   0x20, 0x7f, 0x00, 0x00, 0x00, 0xe0, 0x1f, 0x00, 0x00, 0x00, 0xc0, 0x3f,
-   0x00, 0x00, 0x00, 0xc0, 0x1f, 0x00, 0x00, 0x00, 0xc0, 0x1f, 0x00, 0x00,
-   0x00, 0x80, 0x3f, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0x00,
-   0x7f, 0x00, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00, 0xff, 0x08,
-   0x00, 0x80, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00, 0xfd, 0x31, 0x00, 0x60,
-   0xfc, 0x05, 0x00, 0x00, 0x00, 0x80, 0xf8, 0xc3, 0x00, 0x18, 0xfe, 0x08,
-   0x00, 0x00, 0x00, 0x80, 0xf7, 0x07, 0x03, 0x06, 0x7f, 0x0f, 0x00, 0x00,
-   0x00, 0x40, 0xff, 0x0f, 0x00, 0x80, 0xff, 0x17, 0x00, 0x00, 0x00, 0x40,
-   0xfe, 0x1f, 0x00, 0xc0, 0xff, 0x13, 0x00, 0x00, 0x00, 0x20, 0xf8, 0xff,
-   0x03, 0xfe, 0xff, 0x20, 0x00, 0x00, 0x00, 0x20, 0xf0, 0xff, 0xff, 0xff,
-   0x7f, 0x20, 0x00, 0x00, 0x00, 0x20, 0xc0, 0xff, 0xdf, 0xff, 0x1f, 0x20,
-   0x00, 0x00, 0x00, 0x20, 0x00, 0xff, 0xdf, 0xff, 0x07, 0x20, 0x00, 0x00,
-   0x00, 0x10, 0x00, 0xfe, 0x8f, 0xff, 0x03, 0x40, 0x00, 0x00, 0x00, 0x10,
-   0x00, 0xf8, 0x8f, 0xff, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0xf0,
-   0x8f, 0x7f, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0xc0, 0xdf, 0x1f,
-   0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0xff, 0x0f, 0x00, 0x40,
-   0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0xff, 0x07, 0x00, 0x40, 0x00, 0x00,
-   0x00, 0x10, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10,
-   0x00, 0x00, 0xfc, 0x01, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0xe0,
-   0xfe, 0x3b, 0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x10, 0xf0, 0xff, 0x7f,
-   0x40, 0x40, 0x00, 0x00, 0x00, 0x10, 0x10, 0x80, 0xff, 0x0f, 0x40, 0x40,
-   0x00, 0x00, 0x00, 0x10, 0x10, 0xc0, 0xff, 0x1f, 0x40, 0x40, 0x00, 0x00,
-   0x00, 0x10, 0x30, 0xe0, 0x8f, 0x3f, 0x60, 0x40, 0x00, 0x00, 0x00, 0x10,
-   0x70, 0xf0, 0x07, 0x7f, 0x70, 0x40, 0x00, 0x00, 0x00, 0x10, 0xf0, 0xf9,
-   0x03, 0xfe, 0x7c, 0x40, 0x00, 0x00, 0x00, 0x20, 0xf0, 0xff, 0x01, 0xfc,
-   0x7f, 0x20, 0x00, 0x00, 0x00, 0x20, 0xf0, 0xff, 0x03, 0xfe, 0x7f, 0x20,
-   0x00, 0x00, 0x00, 0x20, 0xf0, 0x7f, 0xfe, 0xff, 0x7f, 0x20, 0x00, 0x00,
-   0x00, 0x20, 0xe0, 0x7f, 0xfe, 0xff, 0x3f, 0x20, 0x00, 0x00, 0x00, 0x40,
-   0xe0, 0x7f, 0xfe, 0xff, 0x3f, 0x10, 0x00, 0x00, 0x00, 0x40, 0xe0, 0xff,
-   0xff, 0xff, 0x3f, 0x10, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xff, 0xff, 0xff,
-   0x7f, 0x08, 0x00, 0x00, 0x00, 0x80, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x08,
-   0x00, 0x00, 0x00, 0x00, 0xfd, 0xff, 0xff, 0xff, 0xff, 0x05, 0x00, 0x00,
-   0x00, 0x00, 0xff, 0xfe, 0xff, 0xff, 0xfb, 0x07, 0x00, 0x00, 0x00, 0x00,
-   0x7f, 0xfc, 0xff, 0xfc, 0xf1, 0x07, 0x00, 0x00, 0x00, 0x80, 0x3f, 0xf0,
-   0xff, 0x7c, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0xc0, 0x1f, 0xc0, 0xff, 0x1c,
-   0xc0, 0x1f, 0x00, 0x00, 0x00, 0xe0, 0x1f, 0x00, 0xff, 0x07, 0xc0, 0x3f,
-   0x00, 0x00, 0x00, 0xf0, 0x27, 0x00, 0x00, 0x00, 0x20, 0x7f, 0x00, 0x00,
-   0x00, 0xf8, 0x43, 0x00, 0x00, 0x00, 0x10, 0xfe, 0x00, 0x00, 0x00, 0xfc,
-   0x81, 0x01, 0x00, 0x00, 0x0c, 0xfc, 0x01, 0x00, 0x00, 0xfe, 0x00, 0x06,
-   0x00, 0x00, 0x03, 0xf8, 0x03, 0x00, 0x00, 0x7f, 0x00, 0x18, 0x00, 0xc0,
-   0x00, 0xf0, 0x07, 0x00, 0x80, 0x3f, 0x00, 0xe0, 0x01, 0x3c, 0x00, 0xe0,
-   0x0f, 0x00, 0xc0, 0x1f, 0x00, 0x00, 0xfe, 0x03, 0x00, 0xc0, 0x1f, 0x00,
-   0xe0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x00, 0xf0, 0x07,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, 0xf8, 0x03, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xfc, 0x01, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xf8, 0x03, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03,
-   0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x1e, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/gs/contribs/bonk/bitmaps/erl-e b/lib/gs/contribs/bonk/bitmaps/erl-e
deleted file mode 100644
index 41ad14f404..0000000000
--- a/lib/gs/contribs/bonk/bitmaps/erl-e
+++ /dev/null
@@ -1,106 +0,0 @@
-#define erl-e_width 108
-#define erl-e_height 88
-static char erl-e_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0xfc, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xe0, 0xff, 0xf7, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xf7, 0xfc, 0x7f, 0x00, 0x00,
-   0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x80, 0xff, 0xf7, 0xfc, 0x3f,
-   0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf7,
-   0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00,
-   0xff, 0xf7, 0xfc, 0x1f, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0x00, 0x00,
-   0x00, 0x00, 0xfe, 0xf7, 0xfc, 0x1f, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff,
-   0x01, 0x00, 0x00, 0x00, 0xfe, 0xf7, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0xe0,
-   0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0xfc, 0xf7, 0xfc, 0x0f, 0x00, 0x00,
-   0x00, 0xf0, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0xfc, 0xf7, 0xfc, 0x07,
-   0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0xf8, 0xf7,
-   0xfc, 0x07, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00,
-   0xf8, 0xf7, 0xfc, 0x03, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0x0f, 0x00,
-   0x00, 0x00, 0xf8, 0xf7, 0xfc, 0x03, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff,
-   0x0f, 0x00, 0x00, 0x00, 0xf0, 0xf7, 0xfc, 0x01, 0x00, 0x00, 0x00, 0xfc,
-   0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0xf0, 0xf7, 0xfc, 0x01, 0x00, 0x00,
-   0x00, 0xfc, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0xf0, 0xf7, 0xfc, 0x00,
-   0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0xf0, 0xf7,
-   0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xf0, 0xf7, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xe0, 0xf7, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0xe0, 0xf7, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf7, 0x7c, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf7, 0x7c, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf7,
-   0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xe0, 0xf7, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xe0, 0xf7, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0xe0, 0xf7, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf7, 0x3c, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf7, 0x3c, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf7,
-   0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xe0, 0xf7, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xc0, 0xf7, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0xc0, 0xf7, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf7, 0x3c, 0x00, 0x00, 0x00,
-   0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x3c, 0x00,
-   0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7,
-   0x3c, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0xf7, 0x3c, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0xf7, 0x3c, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x3c, 0x00, 0x00, 0x00, 0x00, 0xfe,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x3c, 0x00, 0x00, 0x00,
-   0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x3c, 0x00,
-   0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7,
-   0x3c, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0xf7, 0x3c, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0xf7, 0x3c, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x3c, 0x00, 0x00, 0x00, 0x00, 0xfe,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x7c, 0x00, 0x00, 0x00,
-   0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x7c, 0x00,
-   0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7,
-   0x7c, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0xf7, 0x7c, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff,
-   0x7f, 0xfe, 0xff, 0xf7, 0xfc, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff,
-   0xff, 0xff, 0x3f, 0xf8, 0xff, 0xf7, 0xfc, 0x00, 0x00, 0x00, 0x00, 0xf8,
-   0xff, 0xff, 0xff, 0xff, 0x3f, 0xe0, 0xff, 0xf7, 0xfc, 0x00, 0x00, 0x00,
-   0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xc0, 0xff, 0xf7, 0xfc, 0x01,
-   0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0xfe, 0xf7,
-   0xfc, 0x01, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00,
-   0xf8, 0xf7, 0xfc, 0x01, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff,
-   0x03, 0x00, 0xe0, 0xf7, 0xfc, 0x03, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff,
-   0xff, 0xff, 0x03, 0x00, 0xc0, 0xf7, 0xfc, 0x03, 0x00, 0x00, 0x00, 0xc0,
-   0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x80, 0xf7, 0xfc, 0x07, 0x00, 0x00,
-   0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x80, 0xf7, 0xfc, 0x07,
-   0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x80, 0xf7,
-   0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0x1f, 0x00, 0x00,
-   0xc0, 0xf7, 0xfc, 0x0f, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x0f,
-   0x00, 0x00, 0xe0, 0xf7, 0xfc, 0x1f, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff,
-   0xff, 0x07, 0x00, 0x00, 0xe0, 0xf7, 0xfc, 0x1f, 0x00, 0x00, 0x00, 0x00,
-   0xf0, 0xff, 0xff, 0x03, 0x00, 0x00, 0xf0, 0xf7, 0xfc, 0x3f, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0xff, 0x7f, 0x00, 0x00, 0x00, 0xf8, 0xf7, 0xfc, 0x7f,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x1f, 0x00, 0x00, 0x00, 0xfc, 0xf7,
-   0xfc, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xfc, 0xf7, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xfe, 0xf7, 0xfc, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0xff, 0xf7, 0xfc, 0xff, 0x03, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xf7, 0xfc, 0xff, 0x07, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xf7, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0};
diff --git a/lib/gs/contribs/bonk/bitmaps/erl-text b/lib/gs/contribs/bonk/bitmaps/erl-text
deleted file mode 100644
index e20a9e5a28..0000000000
--- a/lib/gs/contribs/bonk/bitmaps/erl-text
+++ /dev/null
@@ -1,106 +0,0 @@
-#define erl-text_width 108
-#define erl-text_height 88
-static char erl-text_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0,
-   0xfc, 0x03, 0xf8, 0x00, 0x70, 0x00, 0x80, 0x03, 0x80, 0x03, 0x07, 0x00,
-   0x3e, 0xf0, 0xfc, 0x03, 0xf8, 0x03, 0x70, 0x00, 0x80, 0x03, 0x80, 0x07,
-   0x07, 0x80, 0xff, 0xf0, 0xfc, 0x03, 0xf8, 0x07, 0x70, 0x00, 0xc0, 0x07,
-   0x80, 0x07, 0x07, 0xe0, 0xff, 0xf1, 0x1c, 0x00, 0x38, 0x07, 0x70, 0x00,
-   0xc0, 0x07, 0x80, 0x0f, 0x07, 0xe0, 0xc1, 0xf3, 0x1c, 0x00, 0x38, 0x0e,
-   0x70, 0x00, 0xe0, 0x0f, 0x80, 0x1f, 0x07, 0xf0, 0x80, 0xf3, 0x1c, 0x00,
-   0x38, 0x0f, 0x70, 0x00, 0xe0, 0x0e, 0x80, 0x1f, 0x07, 0x78, 0x00, 0xf0,
-   0xfc, 0x03, 0xf8, 0x07, 0x70, 0x00, 0xe0, 0x0e, 0x80, 0x3f, 0x07, 0x78,
-   0x00, 0xf0, 0xfc, 0x03, 0xf8, 0x03, 0x70, 0x00, 0x70, 0x1c, 0x80, 0x7b,
-   0x07, 0x38, 0x00, 0xf0, 0xfc, 0x03, 0xf8, 0x01, 0x70, 0x00, 0x70, 0x1c,
-   0x80, 0xf3, 0x07, 0x38, 0xf8, 0xf7, 0x1c, 0x00, 0xf8, 0x01, 0x70, 0x00,
-   0x70, 0x1c, 0x80, 0xe3, 0x07, 0x78, 0xf8, 0xf7, 0x1c, 0x00, 0xf8, 0x03,
-   0x70, 0x00, 0xf8, 0x3f, 0x80, 0xe3, 0x07, 0x70, 0x80, 0xf7, 0x1c, 0x00,
-   0xb8, 0x03, 0x70, 0x00, 0xf8, 0x3f, 0x80, 0xc3, 0x07, 0xf0, 0x80, 0xf3,
-   0xfc, 0x03, 0x38, 0x07, 0xf0, 0x07, 0x38, 0x38, 0x80, 0x83, 0x07, 0xe0,
-   0xe3, 0xf3, 0xfc, 0x03, 0x38, 0x07, 0xf0, 0x07, 0x1c, 0x70, 0x80, 0x83,
-   0x07, 0xc0, 0xff, 0xf1, 0xfc, 0x03, 0x38, 0x0e, 0xf0, 0x07, 0x1c, 0x70,
-   0x80, 0x03, 0x07, 0x00, 0x7f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0};
diff --git a/lib/gs/contribs/bonk/bonk.erl b/lib/gs/contribs/bonk/bonk.erl
deleted file mode 100644
index bbbc656b34..0000000000
--- a/lib/gs/contribs/bonk/bonk.erl
+++ /dev/null
@@ -1,584 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1996-2012. 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%
-%%
-
-%%
--module(bonk).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,create,4}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,start,0}}]).
-
--export([run/0, run/1,bonk_dir/0,start/0]).
-
--record(colors, {miss, x, bomb, face}).
--record(scores, {points, level, bombs, hits, showed, bonus}).
-
-start() ->
-    spawn(bonk, run, []).
-
-run() ->
-    run(color).
-
-run([ColorMode]) ->   % This is for the start script...
-    run(ColorMode);
-
-run(ColorMode) when is_atom(ColorMode) ->
-    GS = gs:start(),
-    SoundPid = spawn_link(bonk_sound,start,[]),
-    {H,M,S} = time(),
-    random:seed(H*13,M*7,S*3),
-    {SqrPids, Bmps, Colors} = create_board(GS, ColorMode),
-    {ScoreL,_File} = get_highscore(),
-    display_highscore(ScoreL),
-    put(colormode, ColorMode),
-    SoundPid ! music,
-    sleep(6500),
-    gs:config(aboutButton, [{enable,true}]),
-    gs:config(newButton, [{enable,true}]),
-    gs:config(quitButton, [{enable,true}]),
-    idle(SoundPid, SqrPids, Bmps, Colors).
-
-%% This is not an application so we don't have their way of knowing
-%% a private data directory where the GIF files are located (this directory).
-%% We can find GS and makes it relative from there /kgb
-%%
-%% Note the silly slash that is added. The rest of the code uses
-%% append to contruct file names and assumes that the directory ends
-%% in slash. If filename:join was used and the problem is gone.
-
--define(EbinFromGsPriv,"../contribs/bonk").
-
-bonk_dir() ->
-    GsPrivDir = code:priv_dir(gs),
-    filename:join(GsPrivDir,?EbinFromGsPriv) ++ "/".
-
-
-idle(SoundPid, SqrPids, Bmps, Colors) ->
-    receive
-	{gs, newButton, click, _Data, _Args} ->
-	    init(SoundPid, SqrPids, Bmps, Colors);
-	{gs, aboutButton, click, _Data, _Args} ->
-	    display_about(),
-	    idle(SoundPid, SqrPids, Bmps, Colors);
-	{gs, quitButton, click, _Data, _Args} ->
-	    SoundPid ! quit,
-	    send_to_all(SqrPids, quit);
-	_Other ->
-	    %%io:format("Got ~w in idle~n", [_Other]),
-	    idle(SoundPid, SqrPids, Bmps, Colors)
-    end.
-
-
-
-init(SoundPid, SqrPids, Bmps, Colors) ->
-    clear_board(Bmps),
-    SoundPid ! start,
-    gs:config(newButton, [{enable,false}]),
-    gs:config(endButton, [{enable,true}]),
-    gs:config(aboutButton, [{enable,false}]),
-    Scores = #scores{points=0, level=1, bombs=0, hits=0, showed=0, bonus=10},
-    clear_scores(Scores),
-    flush(),
-    send_to_all(SqrPids, start),
-    game(SoundPid, SqrPids, Bmps, Colors, Scores).
-
-
-game(SoundPid, SqrPids, Bmps, Colors, Scores) ->
-    receive
-	{gs, _Square, buttonpress, SqrPid, [1 | _Rest]} when is_pid(SqrPid) ->
-	    SqrPid ! bonk,
-	    game(SoundPid, SqrPids, Bmps, Colors, Scores);
-	{gs, _Id, buttonpress, _Data, [Butt | _Rest]} when Butt =/= 1 ->
-	    NewScores = bomb(SoundPid, SqrPids, Scores),
-	    game(SoundPid, SqrPids, Bmps, Colors, NewScores);
-	{show, Square, Rect} ->
-	    NewScores = show_face(Square, Rect, Colors, Scores),
-	    game(SoundPid, SqrPids, Bmps, Colors, NewScores);
-	{hide, Square, Rect} ->
-	    NewScores = hide_face(Square, Rect, Colors, Scores),
-	    game(SoundPid, SqrPids, Bmps, Colors, NewScores);
-	{missed, Square, Rect} ->
-	    case miss_face(SoundPid, Square, Rect, Colors, Scores) of
-		{continue, NewScores} ->
-		    game(SoundPid, SqrPids, Bmps, Colors, NewScores);
-		{game_over, NewScores} ->
-		    game_over(SoundPid, SqrPids, Bmps, Colors, NewScores)
-	    end;
-	{bonked, Square, Rect} ->
-	    NewScores = bonked(SoundPid, SqrPids, Square, Rect, Scores, Colors),
-	    game(SoundPid, SqrPids, Bmps, Colors, NewScores);
-	{bombed, Square, Rect} ->
-	    NewScores = bombed(SoundPid, SqrPids, Square, Rect, Scores, Colors),
-	    game(SoundPid, SqrPids, Bmps, Colors, NewScores);
-	{gs, endButton, click, _Data, _Args} ->
-	    game_over(SoundPid, SqrPids, Bmps, Colors, Scores);
-	{gs, quitButton, click, _Data, _Args} ->
-	    quit(SoundPid, SqrPids, Bmps, Colors, Scores);
-	_Other ->
-	    game(SoundPid, SqrPids, Bmps, Colors, Scores)
-    end.
-	    
-
-
-game_over(SoundPid, SqrPids, Bmps, Colors, Scores) ->
-    SoundPid ! game_over,
-    send_to_all(SqrPids, stop),
-    flush(),
-    sleep(2000),
-    update_scorelist(SoundPid, Scores),
-    gs:config(newButton, [{enable,true}]),
-    gs:config(endButton, [{enable,false}]),
-    gs:config(aboutButton, [{enable,true}]),
-    idle(SoundPid, SqrPids, Bmps, Colors).
-
-
-quit(SoundPid, SqrPids, _Bmps, _Colors, _Scores) ->
-    SoundPid ! quit,
-    send_to_all(SqrPids, quit),
-    true.
-
-
-
-bomb(SoundPid, SqrPids, Scores) ->
-    case Scores#scores.bombs of
-	Bombs when Bombs > 0 ->
-	    send_to_all(SqrPids, bomb),
-	    SoundPid ! bomb,
-	    gs:config(bombOut,[{text,integer_to_list(Bombs-1)}]),
-	    Scores#scores{bombs=Bombs-1};
-	_Other ->
-	    Scores
-    end.
-
-show_face(Square, Rect, Colors, Scores) ->
-    Showed = Scores#scores.showed,
-    if
-	Showed == Scores#scores.level+1 ->
-	    Square ! sleep,
-	    Scores;
-	true ->
-	    FaceColors = Colors#colors.face,
-	    FaceColor = lists:nth(random:uniform(length(FaceColors)), FaceColors),
-	    gs:config(Rect, [{bitmap,lists:append(bonk_dir(),"bitmaps/bonkface")},{fg, FaceColor}]),
-	    Scores#scores{showed=Showed+1}
-    end.
-    
-hide_face(_Square, Rect, _Colors, Scores) ->
-    Showed = Scores#scores.showed,
-    gs:config(Rect, [{bitmap,lists:append(bonk_dir(),"bitmaps/bonktom")}]),
-    Scores#scores{showed=Showed-1}.
-
-
-miss_face(SoundPid, _Square, Rect, Colors, Scores) ->
-    SoundPid ! missed,
-    gs:config(Rect, [{bitmap,lists:append(bonk_dir(),"bitmaps/bonkmiss")}, {fg, Colors#colors.miss}]),
-    Bonus = Scores#scores.bonus,
-    if
-	Bonus > 1 ->
-	    gs:config(bonusOut, [{text,integer_to_list(Bonus-1)}]),
-	    {continue, Scores#scores{bonus=Bonus-1}};
-	true ->
-	    gs:config(bonusOut, [{text,"0"}]),
-	    {game_over, Scores}
-    end.
-
-bonked(SoundPid, SqrPids, _Square, Rect, Scores, Colors) ->
-    gs:config(Rect, [{bitmap,lists:append(bonk_dir(),"bitmaps/bonkx")}, {fg, Colors#colors.x}]),
-    SoundPid ! bonk,
-    update_score(SoundPid, SqrPids, Scores).
-
-bombed(SoundPid, SqrPids, _Square, Rect, Scores, Colors) ->
-    gs:config(Rect, [{bitmap,lists:append(bonk_dir(),"bitmaps/bonkbomb")}, {fg, Colors#colors.bomb}]),
-    update_score(SoundPid, SqrPids, Scores).
-
-
-update_score(SoundPid, SqrPids, Scores) ->
-    Points = Scores#scores.points,
-    Level = Scores#scores.level,
-    NewPoints = Points+Level,
-    gs:config(scoreOut,[{text,integer_to_list(NewPoints)}]),
-    case Scores#scores.hits of
-	24 ->
-	    SoundPid ! new_level,
-	    NewLevel = Level+1,
-	    NewBombs = Scores#scores.bombs+1,
-	    send_to_all(SqrPids, {new_level, NewLevel}),
-	    gs:config(levelOut,[{text,integer_to_list(NewLevel)}]),
-	    gs:config(bombOut,[{text,integer_to_list(NewBombs)}]),
-	    Scores#scores{points=NewPoints, level=NewLevel, hits=0, bombs=NewBombs};
-	Hits ->
-	    Scores#scores{points=NewPoints, hits=Hits+1}
-    end.
-	    
-
-send_to_all([], _Msg) ->
-    true;
-send_to_all([Pid|Rest],Msg) when is_pid(Pid) ->
-    Pid ! Msg,
-    send_to_all(Rest,Msg);
-send_to_all([_Else|Rest],Msg) ->
-    send_to_all(Rest,Msg).
-
-
-create_board(GS, ColorMode) ->
-    Colors =
-	case ColorMode of
-	    bw     -> #colors{miss=white, x=white, bomb=white, face=[white]};
-	    _Color -> #colors{miss=red, x=green, bomb=white,
-			      face=[lightblue, orange, magenta, peachpuff, pink]}
-	end,
-    BGCol     = if ColorMode==bw -> black; true -> black  end,	% background color
-    TextCol   = if ColorMode==bw -> white; true -> pink   end,	% status texts
-    NrCol     = if ColorMode==bw -> white; true -> purple end,	% status figures
-    LogoCol   = if ColorMode==bw -> white; true -> green  end,	% bonk logo
-    BLineCol  = if ColorMode==bw -> white; true -> grey   end,	% button line
-    SLineCol  = if ColorMode==bw -> white; true -> red    end,	% status line
-    BTextCol  = if ColorMode==bw -> white; true -> orange end,	% button text
-    HiHeadCol = if ColorMode==bw -> white; true -> red    end,	% high score label
-    HiCol     = if ColorMode==bw -> white; true -> cyan   end,	% high scores
-    SquareCol = if ColorMode==bw -> white; true -> yellow end,	% game squares
-    ErlFgCol  = if ColorMode==bw -> white; true -> red    end,	%
-    ErlBGCol  = if ColorMode==bw -> black; true -> white  end,	%
-    ErlTxtCol = if ColorMode==bw -> white; true -> black  end,	%
-
-    Width = 550,      	       % width of bonk window
-    Height = 550,     	       % Height of bonk window
-    
-    BX = 0,           	       % x-pos for first button
-    DBX = 100,        	       % space between buttons
-    BY = 0,           	       % y-pos for buttons
-    BLineY = 30,      	       % y-pos of button line
-    LogoX = (Width-320) div 2, % x-pos of bonk logo (logo is 320 pix wide)
-    LogoY = BLineY+2, 	       % y-pos of bonk logo
-    ErlLogoX = LogoX + 200,    % x-pos of Erlang e
-    ErlLogoY = LogoY + 10,     % y-pos of Erlang e
-    SLineY = Height-22,        % status line position
-    TextWidth = 50,   	       % text width of status items
-    SX = 2,          	       % x-pos for first status item
-    DSX = TextWidth+94,	       % pixels between status items
-    SY = SLineY+2,   	       % y-pos status items
-    HiWidth = 100,             % width of high score field
-    _HiHeight = 180,            % height of the same
-    HiX = Width-HiWidth,       % high score text position
-    HiY = BLineY+10,
-    DHY = 20,                  % space between title & scores
-    SquareSize = 76,           % size of each game square
-    SquareSpace = 1,           % space between game squares
-    SquareX = 40,
-    SquareY = 65,
-    
-    gs:create(window, bonkWin, GS, [{width, Width}, {height, Height}, 
-				    {bg, BGCol},
-				    {title, "Bonk the game"},
-				    {iconname, "Bonk!"},
-				    {map, false}]),
-    gs:create(canvas, bonkCanvas, bonkWin, [{width, Width},
-					    {height, Height},
-					    {bg, BGCol}]),
-    gs:create(image, bonkCanvas, [{bitmap,lists:append(bonk_dir(), "bitmaps/bonklogo")},
-				  {coords, [{LogoX, LogoY}]},
-				  {fg, LogoCol},
-				  {bg, BGCol}]),
-    gs:create(image, bonkCanvas, [{bitmap,lists:append(bonk_dir(), "bitmaps/erl-e")},
-				  {coords, [{ErlLogoX, ErlLogoY}]},
-				  {fg, ErlFgCol},
-				  {bg, ErlBGCol}]),
-    gs:create(image, bonkCanvas, [{bitmap,lists:append(bonk_dir(), "bitmaps/erl-text")},
-				  {coords, [{ErlLogoX, ErlLogoY}]},
-				  {fg, ErlTxtCol}]),
-    gs:create(line, bLine, bonkCanvas, [{coords, [{0,BLineY}, {Width,BLineY}]},
-					{fg, BLineCol},
-					{width, 2}]),
-    gs:create(line, bLine, bonkCanvas, [{coords, [{0,SLineY}, {Width, SLineY}]},
-					{fg, SLineCol},
-					{width, 2}]),
-    gs:create(text, scoreText, bonkCanvas, [{coords, [{SX, SY}]},
-					    {fg, TextCol},
-					    {text, "Score:"}]),
-    gs:create(text, scoreOut, bonkCanvas, [{coords, [{SX+TextWidth, SY}]},
-					   {fg, NrCol},
-					   {width, DSX-TextWidth},
-					   {text, ""}]),
-    gs:create(text, bombText, bonkCanvas, [{coords, [{SX+DSX, SY}]},
-					   {fg, TextCol},
-					   {text, "Bombs:"}]),
-    gs:create(text, bombOut, bonkCanvas, [{coords, [{SX+DSX+TextWidth, SY}]},
-					  {fg, NrCol},
-					  {width, DSX-TextWidth},
-					  {text, ""}]),
-    gs:create(text, bonusText, bonkCanvas, [{coords, [{SX+2*DSX, SY}]},
-					    {fg, TextCol},
-					    {text, "Bonus:"}]),
-    gs:create(text, bonusOut, bonkCanvas, [{coords, [{SX+2*DSX+TextWidth, SY}]},
-					   {fg, NrCol},
-					   {width, DSX-TextWidth},
-					   {text, ""}]),
-    gs:create(text, levelText,bonkCanvas, [{coords, [{SX+3*DSX, SY}]},
-					   {fg, TextCol},
-					   {text, "Level:"}]),
-    gs:create(text, levelOut, bonkCanvas, [{coords, [{SX+3*DSX+TextWidth, SY}]},
-					   {fg, NrCol},
-					   {width, DSX-TextWidth},
-					   {text, ""}]),
-    gs:create(text, hiScoreText, bonkCanvas, [{coords, [{HiX, HiY}]},
-					      {fg, HiHeadCol},
-					      {text, "High Scores"}]),
-    gs:create(text, hiScoreOut, bonkCanvas, [{coords, [{HiX, HiY+DHY}]},
-					     {fg, HiCol},
-					     {justify, left},
-					     {width, HiWidth}]),
-    gs:create(button, newButton,bonkWin, [{x, BX},{y, BY},
-					  {enable,false},
-					  {label, {text, "New Game"}},
-					  {click, true},
-					  {fg, BTextCol},
-					  {bg, BGCol},
-					  {relief, flat},
-					  {activefg, BTextCol},
-					  {activebg, BGCol},
-					  {align, center}]),
-    gs:create(button, endButton,bonkWin, [{x, BX+DBX},{y, BY},
-					  {enable,false},
-					  {label, {text, "End Game"}},
-					  {click, true},
-					  {fg, BTextCol},
-					  {bg, BGCol},
-					  {relief, flat},
-					  {activefg, BTextCol},
-					  {activebg, BGCol},
-					  {align, center}]),
-    gs:create(button, aboutButton,bonkWin, [{x, BX+2*DBX},{y, BY},
-					    {enable,false},
-					    {label, {text, "About"}},
-					    {click, true},
-					    {fg, BTextCol},
-					    {bg, BGCol},
-					    {relief, flat},
-					    {activefg, BTextCol},
-					    {activebg, BGCol},
-					    {align, center}]),
-    gs:create(button, quitButton, bonkWin, [{x, BX+3*DBX},{y, BY},
-					    {enable,false},
-					    {label, {text, "Quit"}},
-					    {click, true},
-					    {fg, BTextCol},
-					    {bg, BGCol},
-					    {relief, flat},
-					    {activefg, BTextCol},
-					    {activebg, BGCol},
-					    {align, center}]),
-
-    {SqrPids, Bmps} =
-	create_squares(SquareX, SquareY, SquareSize, SquareCol, SquareSpace),
-    gs:config(bonkWin, [{map, true}]),
-    {SqrPids, Bmps, Colors}.
-
-
-
-create_squares(X, Y, Size, Color, Spc) ->
-    create_squares(X, Y, Size, Color, Spc, 1, 1, [], []).
-
-
-create_squares(_X, _Y, _Size, _Color, _Spc, 4, 5, Pids, Bmps) ->
-    {Pids, Bmps};
-
-create_squares(X, Y, Size, Color, Spc, Row, 5, Pids, Bmps) ->
-    create_squares(X, Y, Size, Color, Spc, Row+1, 1, Pids, Bmps);
-
-create_squares(X, Y, Size, Color, Spc, Row, Col, Pids, Bmps) ->
-    Xpos = X+Col*Size+(Col-1)*Spc,
-    Ypos = Y+Row*Size+(Row-1)*Spc,
-    gs:create(rectangle, bonkCanvas,
-	      [{coords, [{Xpos,Ypos},{Xpos+Size, Ypos+Size}]},
-	       {bw, 2},{fg, Color},{buttonpress,true}]),
-    Bmp = gs:create(image, bonkCanvas,
-		    [{coords, [{Xpos+1, Ypos+1}]},
-		     {bitmap,lists:append(bonk_dir(), "bitmaps/bonktom")},
-		     {buttonpress, true},{fg, Color}]),
-    Pid = bonk_square:start(Bmp),
-    gs:config(Bmp, [{data, Pid}]),
-    create_squares(X, Y, Size, Color, Spc, Row, Col+1, [Pid|Pids], [Bmp|Bmps]).
-
-
-
-clear_board([]) ->
-    true;
-clear_board([Square | Rest]) ->
-    gs:config(Square, [{bitmap,lists:append(bonk_dir(), "bitmaps/bonktom")}]),
-    clear_board(Rest).
-
-
-%% Prints the list on the screen.
-%% The list is on the form [[Score,Name],[Score,Name]..].
-
-display_highscore(ScoreList) ->
-    display_highscore("",ScoreList,0).
-
-display_highscore(Scores,[],_N) ->
-    gs:config(hiScoreOut,[{text,Scores}]);
-
-display_highscore(Scores,_ScoreList,10) ->   % This is max number of items.
-    display_highscore(Scores,[], 10);
-
-display_highscore(Scores,[[Score,Name]|Rest],N) ->
-    NewScores = lists:append(Scores,lists:append(lists:append(Score, [32 | Name]), [10])),
-    display_highscore(NewScores,Rest,N+1).
-
-
-%% Reads the highscorelist from the file "bonk.score".
-%% The list should be an sorted erlang-list.
-
-get_highscore() ->
-    case file:consult("bonk.score") of
-	{ok,[Score_list]} ->
-	    {Score_list,"./bonk.score"};
-	{error,_} ->
-	    {[],"./bonk.score"}
-    end.
-
-
-%% Prints out the highscorelist and places the new score in the
-%% list if it is high enough.
-
-update_scorelist(SoundPid, Scores) ->
-    case Scores#scores.points of
-	0 -> true;
-	Score ->
-	    {ScoreL,FileName} = get_highscore(),
-	    New_scorelist=update_scorelist_2(ScoreL, Score, 0, SoundPid),
-	    display_highscore(New_scorelist),
-	    case file:open(FileName, [write]) of
-		{error,_} ->
-		    true;
-		{ok,FD} ->
-		    io:format(FD,"~w~s~n",[New_scorelist,"."]),
-		    file:close(FD)
-	    end
-    end.
-
-
-update_scorelist_2([], Score, N, _SoundPid) when N < 10 ->
-    [[integer_to_list(Score),getuser()]];
-
-update_scorelist_2(_, _, N, _SoundPid) when N >= 10 ->
-    [];
-
-update_scorelist_2([[Sc, Name] | Rest], Score, N, SoundPid) ->
-    case list_to_integer(Sc) of
-	Sc_int when Sc_int < Score ->
-	    if
-		N == 0 -> SoundPid ! best_score;
-		true   -> SoundPid ! high_score
-	    end,
-	    lists:append([[integer_to_list(Score),getuser()]],
-			 update_scorelist_3([[Sc,Name]|Rest],N+1));
-	_Other ->
-	    lists:append([[Sc,Name]],update_scorelist_2(Rest, Score, N+1, SoundPid))
-    end.
-
-
-update_scorelist_3([],_) ->
-    [];
-
-update_scorelist_3(_,N) when N >= 10 ->
-    [];
-
-update_scorelist_3([Item|Rest],N) ->
-    lists:append([Item],update_scorelist_3(Rest,N+1)).
-
-getuser() ->
-    case os:type() of
-	{unix,_} ->
-	    lists:delete(10,os:cmd("whoami"));
-	_ ->
-	    "Unknown"
-    end.
-
-%% Prints out the initial values of scores, bonus, level and bombs.
-
-clear_scores(Scores) ->
-    Score = integer_to_list(Scores#scores.points),
-    Bombs = integer_to_list(Scores#scores.bombs),
-    Bonus = integer_to_list(Scores#scores.bonus),
-    Level = integer_to_list(Scores#scores.level),
-    gs:config(scoreOut,{text,Score}),
-    gs:config(bombOut,{text,Bombs}),
-    gs:config(bonusOut,{text,Bonus}),
-    gs:config(levelOut,{text,Level}).
-
-
-%% Removes everything that is present in the message-que.
-
-flush() ->
-    receive
-	_X ->
-	    flush()
-	after
-	    0 ->
-		true
-	end.
-
-sleep(X) ->
-    receive after X -> true end.
-
-%% Opens a window and shows the contents of the file: "bonk.txt".
-%% The window will be removed before the function ends.
-
-display_about() ->
-    {BGColor,TextColor,Bfg} =
-	case get(colormode) of
-	    bw     -> {black, white, white};
-	    _Color -> {black, peachpuff1, orange}
-	end,
-    Wid = 500, Hei = 635, 
-    GS = gs:start(),
-    gs:create(window, aboutWin, GS, [{width, Wid}, {height,Hei},
-				     {map, false},
-				     {bg, BGColor},
-				     {title, "About Bonk!"}]),
-    gs:create(canvas, aboutCan, aboutWin, [{width, Wid},{height, Hei},
-					   {bg, black}]),
-    gs:create(button, okButton, aboutWin, [{x, Wid div 2 - 50},{y, Hei - 40},
-					   {label,{text, "Ok"}}, {click, true},
-					   {fg, Bfg}, {bg, BGColor},
-					   {relief, flat},
-					   {activefg, Bfg},
-					   {activebg, BGColor}]),
-    gs:create(text, aboutText, aboutCan, [{width, Wid-30}, {coords, [{15, 0}]},
-					  {fg, TextColor}, {justify, center}]),
-    case file:open(lists:append(bonk_dir(),"bonk.txt"), [read]) of
-	{ok, Fd} ->
-	    write_text(Fd, "", io:get_line(Fd, "")),
-	    file:close(Fd);
-	{error, _Reason} ->
-	    gs:config(aboutText, {text, "Error: could not read the about file"})
-    end,
-
-    gs:config(aboutWin, [{map,true}]),
-    receive
-	{gs, okButton, click, _, _} ->
-	    gs:destroy(aboutWin)
-    end.
-
-write_text(_Fd, Text, eof) ->
-    gs:config(aboutText, {text, Text});
-write_text(Fd, Text, More) ->
-    write_text(Fd, lists:append(Text, More), io:get_line(Fd, "")).
diff --git a/lib/gs/contribs/bonk/bonk.gif b/lib/gs/contribs/bonk/bonk.gif
deleted file mode 100644
index 3c2299686b..0000000000
--- a/lib/gs/contribs/bonk/bonk.gif
+++ /dev/null
diff --git a/lib/gs/contribs/bonk/bonk.tool b/lib/gs/contribs/bonk/bonk.tool
deleted file mode 100644
index 79ad8f6701..0000000000
--- a/lib/gs/contribs/bonk/bonk.tool
+++ /dev/null
@@ -1,6 +0,0 @@
-{version,"0.1"}.
-{{tool,"Bonk"},
- {start,{bonk,start,[]}},
- {icon,"bonk.gif"},
- {message,"Bonk - The Game"},
- {html,"../bonk/bonk.txt"}}.
diff --git a/lib/gs/contribs/bonk/bonk.txt b/lib/gs/contribs/bonk/bonk.txt
deleted file mode 100644
index 69c912dbee..0000000000
--- a/lib/gs/contribs/bonk/bonk.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-BONK! In Erlang for You
-by
-LENNART OHMAN & MARCUS ARENDT
-
-After an idea of Mike Darweesh.
-Special thanks to Peter Jansson for creating the bitmaps.
-Ported to GS 1.1 by Markus Torpvret and Anders Dahlin.
-
-
-INSTRUCTIONS
-- Hit as many creatures as possible using the left mouse-button.                                
-- After every 25 hits You will advance one level. For each level You get one bomb. 
-- Pushing the middle or right mouse-button, in any square, drops a bomb which     
-wipes out everything.                                                                                                            
-- The game ends when 10 creatures has escaped from beeing bonked.                      
-
-
-ABOUT ERLANG
-Erlang is a programming language for building robust concurrent systems. It is a single assignment, symbolic language with built in concurrency. It provides unique facilities for error handling and for reloading updated modules in running systems. Erlang was designed and implemented by Joe Armstrong, Robert Virding, and Mike Williams at Ellemtel (now Ericsson Utvecklings AB).
-
-Please make enquiries about Erlang to:
-
-Ericsson Software Technology AB
-Erlang Systems                                  
-Torshamnsgatan 39B                       
-Box 1214                                              
-164 28 Kista                                         
-Sweden                                                 
-
-http://www.ericsson.se/erlang
\ No newline at end of file
diff --git a/lib/gs/contribs/bonk/bonk_sound.erl b/lib/gs/contribs/bonk/bonk_sound.erl
deleted file mode 100644
index 9a0db80e5d..0000000000
--- a/lib/gs/contribs/bonk/bonk_sound.erl
+++ /dev/null
@@ -1,82 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. 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%
-%%
-
-%%
--module(bonk_sound).
--export([start/0]).
-
-start() ->
-    random:seed(),
-    sounder:start(),
-    {ok,Bonk}=sounder:new(lists:append(bonk:bonk_dir(),"sounds/bonk.au")),
-    {ok,Ouch}=sounder:new(lists:append(bonk:bonk_dir(),"sounds/ouch!!!.au")),
-    {ok,Damn}=sounder:new(lists:append(bonk:bonk_dir(),"sounds/damn.au")),
-    {ok,Bomb}=sounder:new(lists:append(bonk:bonk_dir(),"sounds/explosion.au")),
-    {ok,Missed}=sounder:new(lists:append(bonk:bonk_dir(),"sounds/missedme.au")),
-    {ok,Game_over}=sounder:new(lists:append(bonk:bonk_dir(),"sounds/gameover.au")),
-    {ok,New_level}=sounder:new(lists:append(bonk:bonk_dir(),"sounds/level.au")),
-    {ok,Music}=sounder:new(lists:append(bonk:bonk_dir(),"sounds/trumpet.au")),
-    {ok,Start}=sounder:new(lists:append(bonk:bonk_dir(),"sounds/hehee.au")),
-    {ok,BestS}=sounder:new(lists:append(bonk:bonk_dir(),"sounds/praisejesus.au")),
-    {ok,HighS}=sounder:new(lists:append(bonk:bonk_dir(),"sounds/yes.au")),
-    loop(Bonk, Ouch, Damn, Bomb, Missed, Game_over, New_level,
-	 Music, Start, BestS, HighS).
-
-
-loop(Bonk, Ouch, Damn, Bomb, Missed, Game_over, New_level, Music, Start, BestS, HighS) ->
-    R=random:uniform(1000),
-    receive
-	bonk ->
-	    if
-		R < 75 -> play_sound(Damn);
-		R < 275 -> play_sound(Ouch);
-		true    -> play_sound(Bonk)
-	    end;
-	bomb       -> play_sound(Bomb);
-	missed     -> play_sound(Missed);
-	game_over  -> play_sound(Game_over);
-	new_level  -> play_sound(New_level);
-	music      -> play_sound(Music);
-	start      -> play_sound(Start);
-	best_score -> play_sound(BestS);
-	high_score -> play_sound(HighS);
-	quit ->
-	    sounder:stop(),
-	    exit(normal)
-    end,
-    loop(Bonk, Ouch, Damn, Bomb, Missed, Game_over, New_level, Music, Start, BestS, HighS).
-
-play_sound(Snd) ->
-    case catch sounder:play(Snd) of
-	{'EXIT', _Reason} ->
-	    io:format("Cannot use audio device!\n"),
-	    sounder:stop(),
-	    silent_loop();
-	_Other ->
-	    true
-    end.
-
-silent_loop() ->
-    receive
-	quit ->
-	    exit(normal);
-	_Other ->
-	    silent_loop()
-    end.
diff --git a/lib/gs/contribs/bonk/bonk_square.erl b/lib/gs/contribs/bonk/bonk_square.erl
deleted file mode 100644
index 98af91944b..0000000000
--- a/lib/gs/contribs/bonk/bonk_square.erl
+++ /dev/null
@@ -1,146 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. 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%
-%%
-
-%%
--module(bonk_square).
--export([start/1,init/5,alarm/3]).
-
-
-
-start(Bmp) ->
-    spawn_link(bonk_square, init, [Bmp, self(),
-				   random:uniform(10000),
-				   random:uniform(10000),
-				   random:uniform(10000)]).
-
-init(Bmp, BoardPid, Seed1, Seed2, Seed3) ->
-    random:seed(Seed1,Seed2,Seed3),
-    idle(Bmp, BoardPid).
-
-
-idle(Bmp, BoardPid) ->
-    receive
-	start ->
-	    Level = 1,
-	    sleep(Level, Bmp, BoardPid, alarm(sleep_time(Level), wake_up));
-	quit ->
-	    exit(normal);
-	_Other ->
-	    idle(Bmp, BoardPid)
-    end.
-
-
-sleep(Level, Bmp, BoardPid, Alarm) ->
-    receive
-	stop -> 
-	    Alarm ! quit,
-	    idle(Bmp, BoardPid);
-	quit -> 
-	    Alarm ! quit,
-	    exit(normal);
-	{new_level, NewLevel} ->
-	    sleep(NewLevel, Bmp, BoardPid, Alarm);
-	{Alarm, wake_up} ->
-	    show_me(BoardPid, Bmp),
-	    show(Level, Bmp, BoardPid, alarm(2500, missed));
-	_Other ->
-	    sleep(Level, Bmp, BoardPid, Alarm)
-    end.
-
-
-show(Level, Bmp, BoardPid, Alarm) ->
-    receive
-	stop ->
-	    Alarm ! quit,
-	    idle(Bmp, BoardPid);		
-	quit -> 
-	    Alarm ! quit,
-	    exit(normal);			
-	{new_level, NewLevel} ->
-	    show(NewLevel, Bmp, BoardPid, Alarm);
-	sleep ->				% The board was too crowded.
-	    Alarm ! quit,
-	    sleep(Level, Bmp, BoardPid, alarm(sleep_time(Level), wake_up));	
-	bonk ->
-	    bonk_me(BoardPid, Bmp),
-	    Alarm ! quit,
-	    bbmed(Level, Bmp, BoardPid, alarm(1500, hide));
-	bomb ->
-	    bomb_me(BoardPid, Bmp),
-	    Alarm ! quit,
-	    bbmed(Level, Bmp, BoardPid, alarm(1000, hide));
-	{Alarm, missed} ->
-	    missed_me(BoardPid, Bmp),
-	    bbmed(Level, Bmp, BoardPid, alarm(1500, hide));
-	_Other ->
-	    show(Level, Bmp, BoardPid, Alarm)
-    end.
-
-%% bonked, bombed or missed
-bbmed(Level, Bmp, BoardPid, Alarm) ->
-    receive
-	stop -> 
-	    Alarm ! quit,
-	    idle(Bmp, BoardPid);
-	quit -> 
-	    Alarm ! quit,
-	    exit(normal);
-	{new_level, NewLevel} ->
-	    bbmed(NewLevel, Bmp, BoardPid, Alarm);
-	{Alarm, hide} ->
-	    hide_me(BoardPid, Bmp),
-	    sleep(Level, Bmp, BoardPid, alarm(sleep_time(Level), wake_up));
-	_Other ->
-	    bbmed(Level, Bmp, BoardPid, Alarm)
-    end.
-
-
-show_me(BoardPid, Bmp) ->
-    BoardPid ! {show, self(), Bmp}.
-
-hide_me(BoardPid, Bmp) ->
-    BoardPid ! {hide, self(), Bmp}.
-
-bonk_me(BoardPid, Bmp) ->
-    BoardPid ! {bonked, self(), Bmp}.
-
-bomb_me(BoardPid, Bmp) ->
-    BoardPid ! {bombed, self(), Bmp}.
-
-missed_me(BoardPid, Bmp) ->
-    BoardPid ! {missed, self(), Bmp}.
-
-
-%% Count sleep time
-
-sleep_time(Level) ->
-    random:uniform((19000 div (Level+1))*2+1500).
-
-%% Set an alarm
-
-alarm(Time, Msg) ->
-    spawn(bonk_square, alarm, [Time, Msg, self()]).
-
-alarm(Time, Msg, Pid) ->
-    receive
-	quit  -> exit(normal)
-    after
-	Time -> Pid ! {self(), Msg}
-    end.
diff --git a/lib/gs/contribs/bonk/sounder.erl b/lib/gs/contribs/bonk/sounder.erl
deleted file mode 100644
index aabcaa1950..0000000000
--- a/lib/gs/contribs/bonk/sounder.erl
+++ /dev/null
@@ -1,160 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2011. 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%
-%%
-
-%%
--module(sounder).
--export([start/0,play/1,new/1,go/0,stop/0,nosound/0,silent/0]).
--include_lib("kernel/include/file.hrl").
-%%----------------------------------------------------------------------
-%% sounder.erl  -  An interface to /dev/audio 
-%%
-%% Created  by:  {lennarto,mike}@erix.ericsson.se
-%% Modified by:  EV,[email protected]
-%%
-%% Mod: 6 Jun 1996 by [email protected]
-%%   The executable sounder will no be looked for in the
-%%   same directory as from where sounder.jam is loaded.
-%%
-%%
-%% start()      -  Returns either: ok ,or: silent ,where silent means
-%%                 that no audio capabilities exists but the sounder
-%%                 will work "silently" in order to not break any code.
-%%
-%% stop()       - Returns: ok
-%%
-%% new(File)    - Tries to load the File. At success, a number refering
-%%                to the File is returned that shall be used with send/1.
-%%                Otherwise {error,Reason} is returned.
-%%
-%% play(No)     - Tries to execute the sound registered with the number No
-%%                Returns: ok , or: {error,Reason}
-%%
-%% silent()     - Returns: true ,if no audio capabilities exists, else: false
-%%
-%% Note: It is also possible to receive: {error,sounder_not_started}
-%%
-%%----------------------------------------------------------------------
-
-start() ->
-    case whereis(sounder) of
-	undefined ->
-	    %% first we check if the workstation has audio capabilities
-	    case file:read_file_info('/dev/audio') of
-		{ok, FI} when FI#file_info.access==read_write ->
-		    register(sounder, spawn(sounder,go,[])),
-		    ok;
-		_Other ->
-		    register(sounder, spawn(sounder,nosound,[])),
-		    silent
-	    end;
-	_Pid ->
-	    ok
-    end.
-
-stop() -> 
-    catch begin check(),
-    sounder ! {stop},
-    ok end.
-
-new(File) when is_list(File) -> new(list_to_atom(File));
-new(File) when is_atom(File) ->
-    catch begin check(),
-    sounder ! {new,File,self()},
-    wait_for_ack(sounder) end.
-
-play(No) when is_integer(No) ->
-    catch begin check(),
-    sounder ! {play, No, self()},
-    wait_for_ack(sounder) end.
-
-silent() ->
-    catch begin check(),
-    sounder ! {play,silent,self()},
-    receive {sounder,Answer} -> Answer end end.
-
-go()  ->
-    Port = open_port({spawn,lists:append(bonk:bonk_dir(), "sounder")},[{packet, 2}]),
-    loop(Port).
-
-loop(Port) ->
-    receive
-	{new, File, From} when is_atom(File) ->
-	    Port ! {self(),{command,lists:append([0],atom_to_list(File))}},
-	    From ! {sounder,wait_for_ack(Port)},
-	    loop(Port);
-	{play,silent,From} ->
-	    From ! {sounder,false},
-	    loop(Port);
-	{play,No,From} when is_integer(No) ->
-	    Port ! {self(),{command,[No]}},
-	    From ! {sounder,wait_for_ack(Port)},
-	    loop(Port);
-	{stop} ->
-	    Port ! {self(),close},
-	    exit(normal);
-	_ ->
-	    loop(Port)
-    end.
-
-%% The application using sounds can check on silence itself
-%% and refrain from playing sounds.
-%% Or it can try to play sounds that will be "consumed in silence"
-
-nosound() ->
-    receive
-	{new,File,From} when is_atom(File) ->
-	    From ! {sounder,{ok,silent}},
-	    nosound();
-	{play,silent,From} ->
-	    From ! {sounder,true},
-	    nosound();
-	{play,No,From} when is_integer(No) ->
-	    From ! {sounder,{error,no_audio_cap}},
-	    nosound();
-	{stop} ->
-	    exit(normal);
-	_ ->
-	    nosound()
-    end.
-
-wait_for_ack(sounder) ->
-    receive {sounder,Res} -> Res end;
-wait_for_ack(Port) when is_port(Port) ->
-    receive
-	{Port,{data,"ok"}} ->
-	    ok;
-	{Port,{data,[No]}} ->
-	    {ok,No};
-	{Port,{data,Msg}} ->
-	    {error,list_to_atom(Msg)};
-	{'EXIT',Port,_} ->
-	    exit(port_exited)
-    end.
-
-check() ->
-    case whereis(sounder) of
-	Pid when is_pid(Pid) -> 
-	    ok;
-	undefined ->
-	    throw({error,sounder_not_started})
-    end.
-
-    
-	    
diff --git a/lib/gs/contribs/bonk/sounds/bonk.au b/lib/gs/contribs/bonk/sounds/bonk.au
deleted file mode 100644
index 5e6518898b..0000000000
--- a/lib/gs/contribs/bonk/sounds/bonk.au
+++ /dev/null
diff --git a/lib/gs/contribs/bonk/sounds/damn.au b/lib/gs/contribs/bonk/sounds/damn.au
deleted file mode 100644
index 6117506fb4..0000000000
--- a/lib/gs/contribs/bonk/sounds/damn.au
+++ /dev/null
diff --git a/lib/gs/contribs/bonk/sounds/explosion.au b/lib/gs/contribs/bonk/sounds/explosion.au
deleted file mode 100644
index 78a6964f1a..0000000000
--- a/lib/gs/contribs/bonk/sounds/explosion.au
+++ /dev/null
diff --git a/lib/gs/contribs/bonk/sounds/gameover.au b/lib/gs/contribs/bonk/sounds/gameover.au
deleted file mode 100644
index ca7628f3c6..0000000000
--- a/lib/gs/contribs/bonk/sounds/gameover.au
+++ /dev/null
diff --git a/lib/gs/contribs/bonk/sounds/hehee.au b/lib/gs/contribs/bonk/sounds/hehee.au
deleted file mode 100644
index 10cd16b596..0000000000
--- a/lib/gs/contribs/bonk/sounds/hehee.au
+++ /dev/null
diff --git a/lib/gs/contribs/bonk/sounds/level.au b/lib/gs/contribs/bonk/sounds/level.au
deleted file mode 100644
index 0508c2a6ae..0000000000
--- a/lib/gs/contribs/bonk/sounds/level.au
+++ /dev/null
diff --git a/lib/gs/contribs/bonk/sounds/missedme.au b/lib/gs/contribs/bonk/sounds/missedme.au
deleted file mode 100644
index 4c07c9d428..0000000000
--- a/lib/gs/contribs/bonk/sounds/missedme.au
+++ /dev/null
diff --git a/lib/gs/contribs/bonk/sounds/music.au b/lib/gs/contribs/bonk/sounds/music.au
deleted file mode 100644
index ead6ec79b2..0000000000
--- a/lib/gs/contribs/bonk/sounds/music.au
+++ /dev/null
diff --git a/lib/gs/contribs/bonk/sounds/ouch!!!.au b/lib/gs/contribs/bonk/sounds/ouch!!!.au
deleted file mode 100644
index 78bcf48074..0000000000
--- a/lib/gs/contribs/bonk/sounds/ouch!!!.au
+++ /dev/null
diff --git a/lib/gs/contribs/bonk/sounds/praisejesus.au b/lib/gs/contribs/bonk/sounds/praisejesus.au
deleted file mode 100644
index e299bf66d6..0000000000
--- a/lib/gs/contribs/bonk/sounds/praisejesus.au
+++ /dev/null
diff --git a/lib/gs/contribs/bonk/sounds/trumpet.au b/lib/gs/contribs/bonk/sounds/trumpet.au
deleted file mode 100644
index 2f551b436a..0000000000
--- a/lib/gs/contribs/bonk/sounds/trumpet.au
+++ /dev/null
diff --git a/lib/gs/contribs/bonk/sounds/yes.au b/lib/gs/contribs/bonk/sounds/yes.au
deleted file mode 100644
index c1ce7dfb69..0000000000
--- a/lib/gs/contribs/bonk/sounds/yes.au
+++ /dev/null
diff --git a/lib/gs/contribs/cols/Makefile b/lib/gs/contribs/cols/Makefile
deleted file mode 100644
index 34a900e5ab..0000000000
--- a/lib/gs/contribs/cols/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1996-2012. 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%
-#
-
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(GS_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/gs-$(VSN)/contribs
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES= \
-       cols \
-       highscore
-
-HRL_FILES= 
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=../ebin/%.$(EMULATOR)) $(TARGET_TOOLBOX_FILES)
-
-TOOLNAME = cols
-
-EXTRA_FILES=
-TOOLBOX_FILES= $(TOOLNAME).tool $(TOOLNAME).gif help.gif
-TARGET_TOOLBOX_FILES= $(TOOLBOX_FILES:%=$(EBIN)/%)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES)
-
-docs:
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f core
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-$(EBIN)/$(TOOLNAME).gif: $(TOOLNAME).gif
-	$(gen_verbose)rm -f $@
-	$(V_at)cp $(TOOLNAME).gif $@
-
-$(EBIN)/$(TOOLNAME).tool: $(TOOLNAME).tool
-	$(gen_verbose)rm -f $@
-	$(V_at)cp $(TOOLNAME).tool $@
-
-$(EBIN)/help.gif: help.gif
-	$(gen_verbose)rm -f $@
-	$(V_at)cp help.gif $@
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/cols/bitmaps"
-	$(INSTALL_DATA) $(BITMAPS) $(TOOLBOX_FILES) "$(RELSYSDIR)/cols/bitmaps"
-	$(INSTALL_DIR) "$(RELSYSDIR)/cols"
-	$(INSTALL_DATA) $(ERL_FILES) $(EXTRA_FILES) "$(RELSYSDIR)/cols"
-
-release_docs_spec:
-
diff --git a/lib/gs/contribs/cols/cols.erl b/lib/gs/contribs/cols/cols.erl
deleted file mode 100644
index 265f2b6ee8..0000000000
--- a/lib/gs/contribs/cols/cols.erl
+++ /dev/null
@@ -1,625 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2012. 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%
-%%
-
-%%
--module(cols).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,create,4}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,0}}]).
-
--export([start/0, init/0]).
-
-%% internal export.
--export([make_board_elem/3]).
-
-%%======================================================================
-%% Contents
-%%=====================
-%% 1. The actual program
-%% 2. Graphics
-%% 3. Data structures and stuff
-%% 4. Lambdas
-%%======================================================================
-
-
--define(COLORS, {red,green,blue,grey,yellow,{66,153,130}}).
--define(HIGHFILE, "./cols.high").
--define(HEIGHT, 17).
--define(LEFT, 50).
--define(SIZE, 15).
--define(VERSION, "v0.9").
--define(WIDTH, 8).
-
--record(state, {bit,board,nextbit,ticks, score=0}).
-%%----------------------------------------------------------------------
-%% Consists of three boxes.
-%%----------------------------------------------------------------------
--record(bit, {x,y,topColor, middleColor, bottomColor,
-	      top_gsobj,mid_gsobj,bot_gsobj}).
-
-%%======================================================================
-%% 1. The actual program
-%%======================================================================
-
-start() ->
-    spawn_link(cols,init,[]).
-
-init() ->
-    make_graphics(),
-    {A,B,C} = erlang:now(),
-    random:seed(A,B,C),
-    NextBit = make_bit(),
-    Board = make_screen_board(),
-    S = #state{bit=make_bit(), board=Board, ticks=update_timer(1),
-	       score=make_score(), nextbit=new_bit_xy(NextBit, -2,5)},
-    gs:config(win, [{map, true}]),
-    loop(S).
-
-make_graphics() ->
-    G = gs:start(),
-    H = ?HEIGHT*?SIZE,
-    W = ?WIDTH*?SIZE,
-    BotMargin = 100,
-    gs:create(window, win, G, [{destroy,true},{map, true},{title, "cols"},
-			       {height, H+BotMargin}, {width, W+?LEFT+10},
-			       {bg, grey},{keypress,true}]),
-    gs:create(canvas, can, win, [{bg, black},
-				 {height, H+BotMargin},
-				 {width, W+?LEFT+20}]),
-    gs:create(text, can, [{text, "Next"}, {coords, [{5, 45}]}, {fg, red}]),
-    gs:create(image, help, can, [{coords,[{5,7}]},
-				 {load_gif, dir() ++ "/help.gif"},
-				 {buttonpress,true}]),
-    draw_borders().
-
-loop(State) ->
-    receive
-	Event -> loop(update(Event, State))
-    end.
-
-%%----------------------------------------------------------------------
-%% How fast speed should be doubled
-%%----------------------------------------------------------------------
--define(DBL_TICKS, 300).
-
-update_timer(Ticks) ->
-    K = 0.001/?DBL_TICKS,
-    M = 1.001-K,
-    Q = K*Ticks+M,
-    Timeout = round(1/math:log(Q)),
-    timer:send_after(Timeout, self(), fall_timeout),
-    Ticks+1.
-
-add_score({ScoreObj, NScore}, DScore) ->
-    NScore2 = NScore + DScore,
-    gs:config(ScoreObj, [{text, io_lib:format("Score: ~w", [NScore2])}]),
-    {ScoreObj, NScore2}.
-    
-
-update({gs,_Obj,keypress,_Data, ['Left'|_]}, State) ->
-    #state{bit=Bit, board = Board} = State,
-    #bit{x=X,y=Y} = Bit,
-    if X > 0 -> 
-	    case is_board_empty(Board, X-1,Y) of
-		true ->
-		    State#state{bit=new_bit_xy(Bit, X-1, Y)};
-		false ->
-		    State
-	    end;
-	true -> State
-    end;
-
-update({gs,_Obj,keypress,_Data, ['Right'|_]}, State) ->
-    #state{bit=Bit, board = Board} = State,
-    #bit{x=X,y=Y} = Bit,
-    if X < ?WIDTH - 1 ->
-	    case is_board_empty(Board, X+1, Y) of
-		true ->
-		    State#state{bit=new_bit_xy(Bit, X+1, Y)};
-		false ->
-		    State
-	    end;
-	true -> State
-    end;
-
-update({gs,_Obj,keypress,_Data, ['Up'|_]}, State) ->
-    State#state{bit=shift_bits(State#state.bit)};    
-
-update({gs,_Obj,keypress,_Data, [Key|_]}, State) ->
-    case drop_key(Key) of
-	true ->
-	    #state{bit=Bit, board=Board, score=Score} = State,
-	    #bit{x=X,y=Y} = Bit,
-	    {NewX, NewY, NewScore} = drop(X,Y,Score,Board),
-	    fasten_bit(State#state{bit=new_bit_xy(Bit,NewX, NewY),
-				   score=NewScore});
-	false -> State
-    end;
-	
-update(fall_timeout, State) ->
-    #state{bit=Bit, board=Board, ticks = Ticks, score=Score} = State,
-    NewY = Bit#bit.y+1,
-    X = Bit#bit.x,
-    case is_fall_ok(Board, X, NewY) of
-	true ->
-	    State#state{bit=new_bit_xy(Bit, X, NewY),
-			ticks=update_timer(Ticks), score=add_score(Score, 1)};
-	false ->
-	    S1 = fasten_bit(State),
-	    S1#state{ticks=update_timer(Ticks)}
-    end;
-
-update({gs,_,destroy,_,_}, _State) ->
-    exit(normal);
-
-update({gs,help,buttonpress,_,_}, State) ->
-    show_help(),
-    State;
-
-update(OtherEvent, State) ->
-    ok=io:format("got other! ~w~n", [OtherEvent]), State.
- 
-drop_key('Down') -> true;
-drop_key(space) -> true;
-drop_key(_) -> false.
-
-is_board_empty(Board, X, Y) ->
-    case {color_at(Board, X, Y),
-	  color_at(Board, X, Y + 1),
-	  color_at(Board, X, Y + 2)} of
-	{black, black, black} -> true;
-	_ -> false
-    end.
-
-%%----------------------------------------------------------------------
-%% Returns: NewState
-%%----------------------------------------------------------------------
-fasten_bit(State) ->
-    #state{board=Board, bit=Bit, nextbit=NextBit, score=Score} = State,
-    #bit{x=X,y=Y,topColor=C1,middleColor=C2,bottomColor=C3} = Bit,
-    B1 = update_screen_element(Board, X, Y, C1),
-    B2 = update_screen_element(B1, X, Y+1, C2),
-    B3 = update_screen_element(B2, X, Y+2, C3),
-    destroy_bit(Bit),
-    #bit{topColor=NC1,middleColor=NC2,bottomColor=NC3} = NextBit,
-    {B4, ExtraScore} = erase_bits(B3, [{X,Y},{X,Y+1},{X,Y+2}], 0),
-    NewBit = make_bit(NC1,NC2,NC3),
-    case is_board_empty(B4, NewBit#bit.x, NewBit#bit.y) of
-	true ->
-	    State#state{score=add_score(Score, ExtraScore),
-			bit=NewBit, nextbit=new_colors(NextBit),board=B4};
-	false ->
-	    {_GsObj,Score2}=State#state.score,
-	    highscore:run(Score2,?HIGHFILE),
-	    exit(normal)
-    end.
-
-%%----------------------------------------------------------------------
-%% Args: Check: list of {X,Y} to check.
-%% Returns: {NewBoard, ExtraScore}
-%%----------------------------------------------------------------------
-erase_bits(Board, Checks, ExtraScore) ->
-    ElemsToDelete = elems2del(Checks,Board,[]),
-    NDel = length(ElemsToDelete),
-    if
-	NDel > 0 ->
-	    Board2 = delete_elems(Board, ElemsToDelete),
-	    {NewBoard, NewCheck} = fall_down(Board2, ElemsToDelete),
-	    if NDel > 3 -> 
-		    {B,ES}=erase_bits(NewBoard,NewCheck,ExtraScore+2*NDel),
-		    {NewBoard2, NewCheck2} = bonus(B, NewCheck),
-		    erase_bits(NewBoard2, NewCheck2, ES);
-		true -> 
-		    erase_bits(NewBoard, NewCheck, 2*NDel)
-	    end;
-	true -> {Board, ExtraScore}
-    end.
-
-bonus(Board, Check) ->
-    Cols = collect_bottom_bits(0,Board),
-    NewBoard = randomize_columns(5, Board, Cols),
-    NewCheck = update_check(Check, Cols),
-    {NewBoard, NewCheck}.
-
-randomize_columns(0, Board, _) -> Board;
-randomize_columns(N, Board, Cols) ->
-    NewBoard = randomize_columns(Cols,Board),
-    randomize_columns(N-1, NewBoard, Cols).
-			
-randomize_columns([],Board) -> Board; 
-randomize_columns([X|Xs],Board) ->
-    flush(),
-    timer:sleep(50),
-    randomize_columns(Xs,update_screen_element(Board,X,?HEIGHT-1,rndColor())).
-
-%%----------------------------------------------------------------------
-%% Returns: NewBoard
-%%----------------------------------------------------------------------
-delete_elems(Board, Elems2Del) ->
-    OrgObjs = org_objs(Elems2Del,Board),
-    visual_effect(?SIZE, OrgObjs),
-    NewBoard = update_board(Elems2Del, Board),
-    put_back(OrgObjs),
-    NewBoard.
-
-visual_effect(0,_OrgObjs) -> done;
-visual_effect(Size,OrgObjs) ->
-    set_size(OrgObjs,Size),
-    flush(),
-    timer:sleep(20),
-    visual_effect(Size-1,OrgObjs).
-
-set_size([],_Size) -> done;
-set_size([{GsObj,[{X1,Y1},{_X2,_Y2}]}|T],Size) ->
-    gs:config(GsObj, [{coords, [{X1,Y1},{X1+Size,Y1+Size}]}]),
-    set_size(T,Size).
-
-%%----------------------------------------------------------------------
-%% Note: Loop over columns where something is removed only. (efficiency)
-%% Returns: {ReversedNewColumns (perhaps shorter), Checks}
-%% cols:fall_column([a,b,black,black,c,f,black,d,black], 3, 15, [], []).
-%% should return: {[a,b,c,f,d],[{3,11},{3,12},{3,13}]}
-%%----------------------------------------------------------------------
-fall_column([], _X, _Y, ColumnAcc, ChecksAcc) ->
-    {ColumnAcc, ChecksAcc};
-fall_column([black|Colors], X, Y, ColumnAcc, ChecksAcc) ->
-    case find_box(Colors) of
-	false -> {ColumnAcc, ChecksAcc};
-	NewColors when is_list(NewColors) ->
-		fall_one_step(NewColors, X, Y, ColumnAcc, ChecksAcc)
-    end;
-fall_column([Color|Colors], X, Y, ColumnAcc, ChecksAcc) ->
-    fall_column(Colors, X, Y-1, [Color | ColumnAcc], ChecksAcc).
-
-find_box([]) -> false;
-find_box([black|Colors]) ->
-    find_box(Colors);
-find_box([Color|Colors]) -> [Color|Colors].
-    
-%%----------------------------------------------------------------------
-%% Enters: ([a,b, , ,c,d], 3, 8, Q) 
-%% Leaves: ([b,a|Q], [ , , ,c,d], 10, [{3,8},{4,9}])
-%%----------------------------------------------------------------------
-fall_one_step([], X, Y, ColumnAcc, Checks) ->
-    fall_column([], X, Y, ColumnAcc, Checks);
-fall_one_step([black|Colors], X, Y, ColumnAcc, Checks) ->
-    fall_column([black|Colors], X, Y, ColumnAcc, Checks);
-fall_one_step([Color|Colors], X, Y, ColumnAcc, Checks) ->
-    fall_one_step(Colors, X, Y-1, [Color|ColumnAcc],[{X,Y}|Checks]).
-
-%%----------------------------------------------------------------------
-%% Returns: {NewBoard, NewChecks}
-%%----------------------------------------------------------------------
-fall_down(Board1, Elems2Del) ->
-    UpDatedCols = updated_cols(Elems2Del, []),
-    fall_column(UpDatedCols, Board1, []).
-
-fall_column([], NewBoard, NewChecks) -> {NewBoard, NewChecks};
-fall_column([X|Xs], BoardAcc, ChecksAcc) ->
-    OrgColumn = boardcolumn_to_tuple(BoardAcc, X),
-    Column = columntuple_to_list(OrgColumn),
-    {NewColumn, NewChecksAcc} = fall_column(Column, X,?HEIGHT-1,[],ChecksAcc),
-    NewBoardAcc =
-	set_board_column(BoardAcc,X,new_column_list(NewColumn,OrgColumn)),
-    fall_column(Xs,NewBoardAcc,NewChecksAcc).
-
-new_column_list(NewColumn, ColumnTuple) ->
-    Nempty = ?HEIGHT - length(NewColumn),
-    L = make_list(black, Nempty) ++ NewColumn,
-    new_column_list(L, 1, ColumnTuple).
-
-new_column_list([H|T], N, Tuple) ->
-    {GsObj, Color} = element(N, Tuple),
-    [update_screen_element({GsObj, Color},H) | new_column_list(T, N+1, Tuple)];
-new_column_list([], _, _) -> [].
-    
-
-%%----------------------------------------------------------------------
-%% Returns: a reversed list of colors.
-%%----------------------------------------------------------------------
-columntuple_to_list(ColumnTuple) when is_tuple(ColumnTuple) ->
-    columntuple_to_list(tuple_to_list(ColumnTuple),[]).
-
-columntuple_to_list([],Acc) -> Acc;
-columntuple_to_list([{_GsObj, Color}|T],Acc) ->
-    columntuple_to_list(T,[Color|Acc]).
-
-%%======================================================================
-%% 2. Graphics
-%%======================================================================
-
-make_bit() ->
-    make_bit(rndColor(),rndColor(),rndColor()).
-
-make_bit(Tc,Mc,Bc) ->
-    X = ?WIDTH div 2,
-    Y = 0,
-    #bit{x=X,y=Y,topColor= Tc, middleColor=Mc, bottomColor=Bc,
-	top_gsobj = make_box(X,Y,Tc), mid_gsobj=make_box(X,Y+1,Mc),
-	bot_gsobj=make_box(X,Y+2,Bc)}.
- 
-new_colors(Bit) ->
-    #bit{top_gsobj=T,mid_gsobj=M,bot_gsobj=B} = Bit,
-    Tc = rndColor(),
-    Mc = rndColor(),
-    Bc = rndColor(),
-    gs:config(T, [{fill, Tc}]),
-    gs:config(M, [{fill, Mc}]),
-    gs:config(B, [{fill, Bc}]),
-    Bit#bit{topColor= Tc, middleColor=Mc, bottomColor=Bc}.
-
-new_bit_xy(Bit, NewX, NewY) ->
-    #bit{x=X,y=Y,top_gsobj=T,mid_gsobj=M,bot_gsobj=B} = Bit,
-    Dx = (NewX - X) * ?SIZE,
-    Dy = (NewY - Y) * ?SIZE,
-    gs:config(T, [{move, {Dx, Dy}}]),
-    gs:config(M, [{move, {Dx, Dy}}]),
-    gs:config(B, [{move, {Dx, Dy}}]),
-    Bit#bit{x=NewX, y=NewY}.
-
-destroy_bit(#bit{top_gsobj=T,mid_gsobj=M,bot_gsobj=B}) ->
-    gs:destroy(T),
-    gs:destroy(M),
-    gs:destroy(B).
-
-shift_bits(Bit) ->
-    #bit{topColor=C1,middleColor=C2,bottomColor=C3,
-	 top_gsobj=T,mid_gsobj=M,bot_gsobj=B} = Bit,
-    gs:config(T, {fill,C2}),
-    gs:config(M, {fill,C3}),
-    gs:config(B, {fill,C1}),
-    Bit#bit{topColor=C2, middleColor=C3, bottomColor=C1}.
-
-rndColor() ->
-    Siz = size(?COLORS),
-    element(random:uniform(Siz), ?COLORS).
-
-make_score() ->
-    {gs:create(text, can, [{text, "Score: 0"}, {fg, red},
-			   {coords, [{5,?HEIGHT*?SIZE+10}]}]), 0}.
-
-make_screen_board() ->
-    xy_loop({cols,make_board_elem}, make_board(), ?WIDTH, ?HEIGHT).
-
-make_board_elem(X,Y,Board) ->
-    set_board_element(Board,X,Y,{make_box(X,Y,black),black}).
-
-flush() -> gs:read(can, bg).
-
-draw_borders() ->
-    BotY = ?HEIGHT*?SIZE,
-    RightX = ?LEFT + ?SIZE*?WIDTH,
-    LeftX = ?LEFT - 1,
-    gs:create(line,can,[{coords,[{LeftX,0},{LeftX,BotY}]},{fg,white}]),
-    gs:create(line,can,[{coords,[{LeftX,BotY},{RightX,BotY}]},{fg,white}]),
-    gs:create(line,can,[{coords,[{RightX,0},{RightX, BotY}]}, {fg,white}]).
-
-update_screen_element(ScrBoard, X, Y, Color) ->
-    case board_element(ScrBoard,X,Y) of
-	{_GsObj, Color} ->
-	    ScrBoard; % don't have to update screen
-	{GsObj, _ScreenColor} ->
-	    gs:config(GsObj, color_args(Color)),
-	    set_board_element(ScrBoard, X, Y, {GsObj, Color})
-    end.
-
-update_screen_element(ScrElem, Color) ->
-    case ScrElem of
-	{_GsObj, Color} ->
-	    ScrElem; % don't have to update screen
-	{GsObj, _ScreenColor} ->
-	    gs:config(GsObj, color_args(Color)),
-	    {GsObj, Color}
-    end.
-    
-
-color_args(black) -> [{fg,black},{fill,black}];
-color_args(Color) -> [{fg,white},{fill,Color}].
-
-%%======================================================================
-%% 3. Data structures and stuff
-%%======================================================================
-
-xy_loop(Fun, Acc,  XMax, YMax) ->
-    xy_loop(Fun, Acc, 0, 0, XMax, YMax).
-
-xy_loop(_Fun, Acc, _X, YMax, _XMax, YMax) -> Acc;
-xy_loop(Fun, Acc, XMax, Y, XMax, YMax) ->
-    xy_loop(Fun, Acc, 0, Y+1, XMax, YMax);
-xy_loop(Fun, Acc, X, Y, XMax, YMax) ->
-    xy_loop(Fun, apply(Fun, [X, Y,Acc]), X+1,Y,XMax, YMax).
-
-%%----------------------------------------------------------------------
-%% Returns: a sorted list of {X,Y} to delete.
-%% Pre: PrevDelElems is sorted.
-%%----------------------------------------------------------------------
-erase_bits_at(Board, PrevDelElems, X,Y) ->
-    C = color_at(Board, X, Y),
-    erase_bits_at([vert, horiz, slash, backslash],X,Y,C,Board,PrevDelElems).
-    
-erase_bits_at([], _X,_Y,_C,_Board, Elems2Del) -> Elems2Del;
-erase_bits_at([Dir|Ds],X,Y,C,Board, Elems2DelAcc) ->
-    Dx = dx(Dir),
-    Dy = dy(Dir),
-    DelElems = lists:append(check_dir(Board, X-Dx,Y-Dy,-Dx,-Dy,C),
-			    check_dir(Board, X,Y,Dx,Dy,C)),
-    N_in_a_row = length(DelElems),
-    if N_in_a_row >= 3 ->
-	    erase_bits_at(Ds,X,Y,C,Board,
-			  ordsets:union(lists:sort(DelElems),Elems2DelAcc));
-       true -> erase_bits_at(Ds,X,Y,C,Board,Elems2DelAcc)
-    end.
-
-dx(vert) -> 0;
-dx(horiz) -> 1;
-dx(slash) -> 1;
-dx(backslash) -> -1.
-
-dy(vert) -> -1;
-dy(horiz) -> 0;
-dy(slash) -> -1;
-dy(backslash) -> -1.
-
-
-%%----------------------------------------------------------------------
-%% Returns: list of {X,Y} to delete.
-%%----------------------------------------------------------------------
-check_dir(Board, X, Y, Dx, Dy, Color) 
-  when X >= 0, X < ?WIDTH, Y >= 0, Y < ?HEIGHT ->
-    case color_at(Board, X, Y) of
-	Color ->
-	    [{X,Y} | check_dir(Board, X+Dx, Y+Dy, Dx, Dy, Color)];
-	_OtherColor ->
-            []
-    end;
-check_dir(_Board, _X, _Y, _Dx, _Dy, _Color) -> [].
-  
-make_box(X, Y, Color) ->
-    make_box(X, Y, 1, 1, Color).
-
-%%----------------------------------------------------------------------
-%% Returns: GsObj
-%%----------------------------------------------------------------------
-make_box(X, Y, Height, Width, Color) ->
-    Opts = if Color == black -> [{fg, black}, {fill, black}];
-	       true -> [{fill, Color}, {fg, white}] end,
-    gs:create(rectangle, can, [{coords, [{?LEFT + X * ?SIZE, Y * ?SIZE},
-					 {?LEFT + X * ?SIZE + (?SIZE*Width)-1,
-					 Y * ?SIZE + (?SIZE*Height)-1}]}|Opts]).
-
-is_fall_ok(_Board, _NewX, NewY) when NewY+2 >= ?HEIGHT -> false;
-is_fall_ok(Board, NewX, NewY) ->
-    case color_at(Board, NewX, NewY+2) of
-	black ->
-	    true;
-	_ -> false
-    end.
-
-color_at(Board, X, Y) ->
-    {_GsObj, Color} = board_element(Board, X, Y),
-    Color.
-
-
-%%----------------------------------------------------------------------
-%% X:0..?WIDTH-1, Y:0..?HEIGHT
-%%----------------------------------------------------------------------
-make_board() ->
-    list_to_tuple(make_list(make_column(), ?WIDTH)).
-
-board_element(Board, X, Y) ->
-    element(Y+1, element(X+1, Board)).
-
-set_board_element(Board, X, Y, NewValue) ->
-    Col = element(X+1, Board),
-    NewCol=setelement(Y+1,Col, NewValue),
-    setelement(X+1, Board, NewCol).
-
-make_column() ->
-    list_to_tuple(make_list(black, ?HEIGHT)).
-
-make_list(_Elem, 0) -> [];
-make_list(Elem, N) -> [Elem|make_list(Elem,N-1)].
-
-boardcolumn_to_tuple(Board, X) ->
-    element(X+1, Board).
-
-set_board_column(Board, X, NewCol) when length(NewCol) == ?HEIGHT ->
-    setelement(X+1, Board, list_to_tuple(NewCol)).
-
-show_help() ->
-    W = gs:create(window, win, [{title, "cols Help"}, {width, 300},
-				{height,300}, {map, true}]),
-    gs:create(label, W, [{x,0},{y,0},{height, 200},{width,300},{justify,center},
-			 {label, {text, 
-    "cols $Revision: 1.23 $" 
-    "\nby\n"
-    "Klas Eriksson, [email protected]\n\n"
-    "Help: Use arrows and space keys.\n"
-    "      Try to get 3 in-a-row.\n"
-    "      More than 3 gives bonus."}}]),
-    B=gs:create(button, W, [{x,100},{y,250}, {label, {text, "Dismiss"}}]),
-    receive
-	{gs, B, click, _, _} -> ok
-    end,
-    gs:destroy(W).
-
-%%======================================================================
-%% 4. Lambdas
-%%======================================================================
-
-drop(X,Y,Score,Board) ->
-    case is_fall_ok(Board, X, Y+1) of
-	true -> drop(X,Y+1,add_score(Score, 1),Board);
-	false -> {X,Y, Score}
-    end.
-
-elems2del([], _Board,Elems2DelAcc) -> Elems2DelAcc;
-elems2del([{X,Y}|Checks],Board,Elems2DelAcc) ->
-    NewElems2DelAcc = ordsets:union(erase_bits_at(Board,Elems2DelAcc,X,Y),
-				    Elems2DelAcc),
-    elems2del(Checks,Board,NewElems2DelAcc).
-
-collect_bottom_bits(?WIDTH,_Board) -> [];
-collect_bottom_bits(X,Board) ->
-    case color_at(Board, X, ?HEIGHT-1) of
-	black -> collect_bottom_bits(X+1,Board);
-	_AcolorHere -> [X|collect_bottom_bits(X+1,Board)]
-    end.
-
-update_check(_Check,[]) -> [];
-update_check(Check,[X|Xs]) ->
-    case lists:member({X, ?HEIGHT-1}, Check) of
-	true -> update_check(Check,Xs);
-	false -> [{X, ?HEIGHT-1}|update_check(Check,Xs)]
-    end.
-
-org_objs([],_Board) -> [];
-org_objs([{X,Y}|XYs],Board) ->
-    {GsObj, _Color} = board_element(Board, X, Y),
-    [{GsObj, lists:sort(gs:read(GsObj, coords))}|org_objs(XYs,Board)].
-
-update_board([],Board) -> Board;
-update_board([{X,Y}|XYs], Board) ->
-    update_board(XYs,update_screen_element(Board, X, Y, black)).
-
-put_back([]) -> done;
-put_back([{GsObj, Coords}|Objs]) ->
-    gs:config(GsObj, [{coords, Coords}]),
-    put_back(Objs).
-
-updated_cols([], UpdColsAcc) -> UpdColsAcc;
-updated_cols([{X,_Y}|XYs], UpdColsAcc) ->
-    case lists:member(X,UpdColsAcc) of
-	true -> updated_cols(XYs,UpdColsAcc);
-	false -> updated_cols(XYs,[X|UpdColsAcc])
-    end.
-
-%% This is not an application so we don't have their way of knowing
-%% a private data directory where the GIF files are located (this directory).
-%% We can find GS and makes it relative from there /kgb
-
--define(EbinFromGsPriv,"../contribs/ebin").
-
-dir()->
-    GsPrivDir = code:priv_dir(gs),
-    filename:join(GsPrivDir,?EbinFromGsPriv).
diff --git a/lib/gs/contribs/cols/cols.gif b/lib/gs/contribs/cols/cols.gif
deleted file mode 100644
index 96e7c1ed4a..0000000000
--- a/lib/gs/contribs/cols/cols.gif
+++ /dev/null
diff --git a/lib/gs/contribs/cols/cols.tool b/lib/gs/contribs/cols/cols.tool
deleted file mode 100644
index 673c3d8efa..0000000000
--- a/lib/gs/contribs/cols/cols.tool
+++ /dev/null
@@ -1,5 +0,0 @@
-{version,"0.1"}.
-{{tool,"Cols"},
- {start,{cols,start,[]}},
- {icon,"cols.gif"},
- {message,"Cols - The Game"}}.
diff --git a/lib/gs/contribs/cols/help.gif b/lib/gs/contribs/cols/help.gif
deleted file mode 100644
index 59baef1fec..0000000000
--- a/lib/gs/contribs/cols/help.gif
+++ /dev/null
diff --git a/lib/gs/contribs/cols/highscore.erl b/lib/gs/contribs/cols/highscore.erl
deleted file mode 100644
index 94f68a043a..0000000000
--- a/lib/gs/contribs/cols/highscore.erl
+++ /dev/null
@@ -1,103 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2012. 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%
-%%
-
-%%
--module(highscore).
--compile([{nowarn_deprecated_function,{gs,button,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,grid,2}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,2}}]).
-
--export([run/2]).
-
-run(NScore, File) ->
-    Scores = read_scores(File),
-    case find_pos(NScore, 1, Scores) of
-	false ->
-	    display(Scores);
-	Pos ->
-	    NewScores = new_highscore(Scores, Pos, NScore),
-	    write_scores(NewScores,File),
-	    display(NewScores)
-    end.
-
-
-new_highscore(Scores, Pos, NScore) ->
-    Txt = io_lib:format("You entered position ~w", [Pos]),
-    W = gs:create(window, gs:start(), [{width, 200},{height, 110},{map,true},
-				      {title, "New Highscore!!!"}]),
-    gs:create(label, W, [{label, {text, Txt}}, {x, 0}, {y,0}, {align, center},
-			 {width, 190},{height, 30}]),
-    Entry = gs:create(entry, W, [{x, 0}, {y, 40}, {height, 30}, {width, 200}]),
-    Ok = gs:create(button, W, [{label, {text, "Ok"}}, {x, 40}, {y, 75}]),
-    receive
-	{gs, Ok, click, _,_} -> 
-	    T = gs:read(Entry, text),
-	    gs:destroy(W),
-	    lists:sublist(lists:reverse(
-                 lists:keysort(1, [{NScore, T} | Scores])), 1, 10)
-    end.
-
-
-
-read_scores(File) ->
-    case file:read_file(File) of
-	{ok, Bin} -> binary_to_term(Bin);
-	{error, _Reason} ->
-	    mk_empty_high(10)
-    end.
-
-mk_empty_high(0) -> [];
-mk_empty_high(N) -> [{N,"Erlang"}|mk_empty_high(N-1)].
-
-find_pos(_NScore, _N, []) -> false;
-find_pos(NScore, N, [{Score, _Name} | Scores]) when Score > NScore ->
-    find_pos(NScore, N+1, Scores);
-find_pos(_NScore, N, _) -> N.
-
-write_scores(Scores,File) ->
-    file:write_file(File, term_to_binary(Scores)).
-
-display(Scores) ->
-    Win = gs:window(gs:start(), [{width, 300},{height, 250},{map,true},
-				 {title, "Highscores"}]),
-    {W,H} = gs:read(Win,{font_wh,{{screen,12},"aaaaaaa"}}),
-    G = gs:grid(Win,[{rows,{1,11}},{columnwidths,[W,4*W]},{hscroll,false},
-		     {width, 300},{height, 220},{vscroll,false},
-		     {cellheight,H+2},{font,{screen,12}}]),
-    insert_scores(G,2,Scores),
-    Ok = gs:button(Win, [{label, {text, "OK"}}, {x, 100}, {y, 220}]),
-    receive
-	{gs, Ok, click, _,_} -> gs:destroy(Win),
-				ok
-    end.
-
-insert_scores(Grid,_N,[]) ->
-    gs:create(gridline,Grid,[{row,1},{font,{screen,bold,12}},
-			     {text,{1,"SCORE"}},{text,{2,"NAME"}}]);
-
-insert_scores(Grid,Row,[{Score,Name}|Ss]) ->
-    gs:create(gridline,Grid,[{row,Row},{text,{1,io_lib:format("~w",[Score])}},
-			    {text,{2,Name}}]),
-    insert_scores(Grid,Row+1,Ss).
-
diff --git a/lib/gs/contribs/mandel/Makefile b/lib/gs/contribs/mandel/Makefile
deleted file mode 100644
index b806cc7801..0000000000
--- a/lib/gs/contribs/mandel/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1996-2012. 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%
-#
-
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(GS_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/gs-$(VSN)/contribs
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES= \
-       mandel
-
-HRL_FILES= 
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=../ebin/%.$(EMULATOR)) $(TARGET_TOOLBOX_FILES)
-
-TOOLNAME = mandel
-
-EXTRA_FILES= $(TOOLNAME).html
-TOOLBOX_FILES= $(TOOLNAME).tool $(TOOLNAME).gif
-TARGET_TOOLBOX_FILES= $(TOOLBOX_FILES:%=$(EBIN)/%)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES)
-
-docs:
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f core
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-$(EBIN)/$(TOOLNAME).gif: $(TOOLNAME).gif
-	$(gen_verbose)rm -f $@
-	$(V_at)cp $(TOOLNAME).gif $@
-
-$(EBIN)/$(TOOLNAME).tool: $(TOOLNAME).tool
-	$(gen_verbose)rm -f $@
-	$(V_at)cp $(TOOLNAME).tool $@
-
-$(EBIN)/help.gif: help.gif
-	$(gen_verbose)rm -f $@
-	$(V_at)cp help.gif $@
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/mandel/bitmaps"
-	$(INSTALL_DATA) $(BITMAPS) $(TOOLBOX_FILES) "$(RELSYSDIR)/mandel/bitmaps"
-	$(INSTALL_DIR) "$(RELSYSDIR)/mandel"
-	$(INSTALL_DATA) $(ERL_FILES) $(EXTRA_FILES) "$(RELSYSDIR)/mandel"
-
-release_docs_spec:
diff --git a/lib/gs/contribs/mandel/mandel.erl b/lib/gs/contribs/mandel/mandel.erl
deleted file mode 100644
index e6061ba77d..0000000000
--- a/lib/gs/contribs/mandel/mandel.erl
+++ /dev/null
@@ -1,351 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2013. 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%
-%%
-
--module(mandel).
--compile([{nowarn_deprecated_function,{gs,assq,2}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,4}},
-          {nowarn_deprecated_function,{gs,image,2}},
-          {nowarn_deprecated_function,{gs,start,0}}]).
--author('(mbj,eklas)@erlang.ericsson.se').
-
-%% User's interface
--export([start/0,start/1]).
-
-%% Internal exports:
--export([start_client/2,refresher/1,start_server/1,respond/2]).
-
-%%%-----------------------------------------------------------------
-%%% Distributed Mandelbrot program.
-%%% Originally written i C++/rpc/lwp/interviews by Klas Eriksson.(1200 lines)
-%%% Rewritten in Erlang by Klas Eriksson and Martin Björklund.
-%%%-----------------------------------------------------------------
-
-%% unix>erl -sname foo            (all nodes will get the same name)
-%% (foo@data)1>mandel:start([{hosts,["computer1","computer2"]},{window,400}]).
-
-%% unix>erl
-%% 1> mandel:start().
-
--record(state,{image,width,height,xmax,ymax,range,
-	       maxiter,colortable,zoomstep}).
--record(job,{left,right,ymin,ymax,height,width,maxiter,data=[]}).
--define(JOBWIDTH,10).
-
-%%-----------------------------------------------------------------
-%% This is the client start function.
-%%-----------------------------------------------------------------
-start() ->
-    start([]).
-
-%%----------------------------------------------------------------------
-%% Option is list of Option. Option is:
-%% {xmax,float()}|{ymax,float()}|{range,float()}|
-%% {maxiter,integer()}|{window,integer()}|{zoomstep,float()}|
-%% {hosts,(list of string())|all_found_nodes}
-%%----------------------------------------------------------------------
-start(Opts) ->
-    Nodes1 = nodes(),
-    Nodes = case get_option(hosts,Opts,all_found_nodes) of
-		all_found_nodes when Nodes1 == [] ->
-		    N = [node()],
-		    spawn(mandel,start_server,[N]),
-		    N;
-		all_found_nodes ->
-		    start_nodes(dir(),Nodes1),
-		    Nodes1;
-		Hosts ->
-		    start_slaves(Hosts),
-		    start_nodes(dir(),Nodes1),
-		    Nodes1
-	    end,
-    spawn(mandel,start_client,[Opts,Nodes]).
-    
-%% This is not an application so we don't have their way of knowing
-%% a private data directory where the GIF files are located (this directory).
-%% We can find GS and makes it relative from there /kgb
-
--define(EbinFromGsPriv,"../contribs/ebin").
-
-dir()->
-    GsPrivDir = code:priv_dir(gs),
-    filename:join(GsPrivDir,?EbinFromGsPriv).
-
-
-start_slaves([]) -> ok;
-start_slaves([Host|Hs]) ->
-    {ok,Name}=slave:start(Host),
-    io:format("host ~p is up~n", [Name]),
-    start_slaves(Hs).
-
-start_nodes(_Dir,[]) -> ok;
-start_nodes(Dir,[Node|Nodes]) ->
-    rpc:call(Node,code,add_path,[Dir]), % hack? should be done in .erlang
-    spawn_link(Node,mandel,start_server,[[node()]]),
-    io:format("started mandelserver at node: ~p~n", [Node]),
-    start_nodes(Dir,Nodes).
-
-start_client(Opts,Nodes) ->
-    Wt = get_option(window,Opts,100) div ?JOBWIDTH * ?JOBWIDTH,
-    Ht = get_option(window,Opts,100) div ?JOBWIDTH * ?JOBWIDTH,
-    S=gs:start(),
-    Win=gs:create(window,win1,S,[{title,"Mandel"},{width,Wt-1},{height,Ht-1},
-				{configure,true}]),
-    Canvas=gs:create(canvas,can1,Win,[{width,Wt},{height,Ht}]),
-    Image=gs:image(Canvas,[{buttonpress,true}]),
-    MaxIters = get_option(maxiter,Opts,100),
-    timer:apply_after(8000,mandel,refresher,[Image]),
-    CT = make_color_table(MaxIters),
-    State2=#state{image=Image,width=Wt,height=Ht,
-		  xmax=try_random(get_option(xmax,Opts,2),-2,2),
-		  ymax=try_random(get_option(ymax,Opts,2),-2,2),
-		  range=try_random(get_option(range,Opts,4),0,4),
-		  maxiter=MaxIters,colortable=CT,
-		  zoomstep=get_option(zoomstep,Opts,1.7)},
-    ToDo = make_jobs(State2),
-    gs:config(Win,[{map,true}]),
-    main(State2, [], Nodes, ToDo).
-
-try_random(random,Low,High) ->
-    random:uniform()*(High-Low)+Low;
-try_random(Float,_Low,_High) when is_number(Float) -> Float.
-    
-
-%%-----------------------------------------------------------------
-%% Distribute work to the nodes. When a node returns, that
-%% node is the first to be used if there's any job left.
-%%-----------------------------------------------------------------
-main(State, [], PassiveNodes, []) ->
-    wait_event(State,[],PassiveNodes,[]);
-main(State, ActiveNodes, PassiveNodes, []) ->
-    % No jobs left, but some nodes are still active.
-    % Wait_Event for their results
-    wait_event(State,ActiveNodes,PassiveNodes,[]);
-main(State, ActiveNodes, [Node|PassiveNodes], [Job|ToDo]) ->
-    % We have work to do, and at least one passive node.
-    % Let him do it.
-    distribute_job(Node, Job),
-    main(State, [Node|ActiveNodes], PassiveNodes, ToDo);
-main(State, ActiveNodes, [], ToDo) ->
-    % We have work to do, but all nodes are active.
-    _Node = wait_event(State,ActiveNodes,[],ToDo).
-    
-wait_event(State,ActiveNodes,PassiveNodes,ToDo) ->
-    receive
-	{calculation_done, {Node, Job}} ->
-	    if   % a small hack. we want to discard data for old pictures
-		Job#job.ymax==State#state.ymax ->
-		    draw(State, Node, Job);
-		true -> true
-	    end,
-	    main(State,lists:delete(Node,ActiveNodes),[Node|PassiveNodes],ToDo);
-	{gs,_Img,buttonpress,_Data,[_Butt,X,Y|_]} ->
-	    #state{width=W,height=H,ymax=Ymax,xmax=Xmax,range=R,zoomstep=ZS} =
-		State,
-	    RX = Xmax-R+(X/W)*R,
-	    RY = Ymax-R+(1-(Y/H))*R,
-	    R2 = R/ZS,
-	    Xmax2 = RX + R2/2,
-	    Ymax2 = RY + R2/2,
-	    State2 = State#state{xmax=Xmax2,ymax=Ymax2,range=R2},
-	    io:format("{xmax,~w},{ymax,~w},{range,~w}~n", [Xmax2,Ymax2,R2]),
-	    ToDo2=make_jobs(State2),
-	    main(State2,ActiveNodes,PassiveNodes,ToDo2);
-	{gs,_Win,destroy,_,_} ->
-	    kill_nodes(lists:append(ActiveNodes,PassiveNodes));
-	{gs,_Win,configure,_Data,[W,H|_]}
-	when State#state.width==W+1, State#state.height==H+1->
-	    main(State,ActiveNodes,PassiveNodes,ToDo);
-	{gs,_Win,configure,_Data,[W|_]} ->
-	    gs:config(can1,[{width,W},{height,W}]),
-	    gs:config(win1,{configure,false}),
-	    gs:config(win1,[{width,W-1},{height,W-1}]),
-	    gs:config(win1,{configure,true}),
-	    State2 = State#state{width=W,height=W},
-	    ToDo2=make_jobs(State2),
-	    main(State2,ActiveNodes,PassiveNodes,ToDo2)
-    end.
-
-kill_nodes([]) ->
-    done;
-kill_nodes([Node|Nodes]) ->
-    exit(rpc:call(Node,erlang,whereis,[mandel_server]),kill),
-    kill_nodes(Nodes).
-    
-
-distribute_job(Node, Job) ->
-    {mandel_server, Node} ! {mandel_job, {self(), Job}}.
-
-draw(#state{image=Image, width=Wt, height=Ht, xmax=Xmax,
-		maxiter=MI,colortable=ColorTable,range=R}, Node, Job) ->
-    #job{left=Left,data=Data}=Job,
-    io:format("Got data from node ~30w~n", [Node]),
-%% PixelX = K * RealX + M
-%% 0      = K * Xmin  + M
-%% Width-1= K * Xmax  + M
-    K=(1-Wt)/-R,
-    M=Wt-1-K*Xmax,
-    Xbegin = round(Left*K+M),
-    draw_cols(Image, Xbegin, Ht, lists:reverse(Data),MI,ColorTable).
-
-draw_cols(Image, X, Ht, [H|T],MaxIter,ColorTable) ->
-    draw_col(Image, X, 0, H,MaxIter,ColorTable),
-    draw_cols(Image, X+1, Ht, T,MaxIter,ColorTable);
-draw_cols(_Image, _X, _, [],_MaxIter,_ColorTable) ->
-    done.
-
-draw_col(_Image, _X,_Y,[{no_first_color,0}],_MaxIter,_ColorTable) ->
-    done;
-draw_col(Image, X,Y,[{Color,1}|T],MaxIter,ColorTable) ->
-    gs:config(Image,[{pix_val,{{X,Y},
-			       element(Color+1,ColorTable)}}]),
-    draw_col(Image, X,Y+1,T,MaxIter,ColorTable);
-draw_col(Image, X,Y,[{Color,Height}|T],MaxIter,ColorTable) ->
-    gs:config(Image,[{pix_val,{{{X,Y},{X+1,Y+Height}},
-			       element(Color+1,ColorTable)}}]),
-    draw_col(Image, X,Y+Height,T,MaxIter,ColorTable).
-
-make_jobs(#state{width=W,height=H,range=R,
-		 xmax=Xmax,ymax=Ymax,maxiter=MI}) ->
-    make_jobs(Xmax-R,Xmax,Ymax-R,Ymax,H,W,MI).
-
-make_jobs(Xmin,Xmax,Ymin,Ymax,Ht,Wt,MaxIter) ->
-    NoJobs = Wt/?JOBWIDTH,  % Each job is ?JOBWIDTH pixel-col
-    DX = (Xmax - Xmin)/NoJobs,
-    make_jobs(DX,Xmin,Xmax,#job{ymin=Ymin,ymax=Ymax,height=Ht,width=Wt/NoJobs,
-				  maxiter=MaxIter},[]).
-
-make_jobs(DX,Left,Xmax,JobSkel,Res) when Left =< Xmax ->
-    Right = Left + DX,
-    Job = JobSkel#job{left=Left,right=Right},
-    make_jobs(DX,Right,Xmax,JobSkel,[Job | Res]);
-make_jobs(_DX,_Left,_Xmax,_JobSkel,Res)  -> Res.
-    
-%%----------------------------------------------------------------------
-%% A small process that refreshes the screen now and then.
-%%----------------------------------------------------------------------
-refresher(Image) ->
-    gs:config(Image,flush),
-    timer:apply_after(8000,mandel,refresher,[Image]).
-
-%%-----------------------------------------------------------------
-%% This is the server start function.
-%%-----------------------------------------------------------------
-start_server([ClientNode]) ->
-    register(mandel_server, self()),
-    erlang:monitor_node(ClientNode, true),
-    server_loop().
-
-server_loop() ->
-    receive
-	{mandel_job, {Pid, Job}} ->
-	    spawn_link(mandel, respond, [Pid, Job]),
-	    server_loop()
-    end.
-    
-respond(Pid, Job) ->
-    Data = do_job(Job),
-    Pid ! {calculation_done, {node(), Data}}.
-
-do_job(Job) ->
-    calculate_area(Job).
-
-calculate_area(Job) ->
-    #job{ymin=Ymin,ymax=Ymax,height=Ht,width=Wt,left=Xmin,right=Xmax}=Job,
-    Job#job{data=x_loop(0,[],Wt,(Xmax-Xmin)/Wt,(Ymax-Ymin)/Ht,Xmin,Job)}.
-
-x_loop(IX,Res,Wt,Dx,Dy,X,Job) when IX < Wt ->
-    #job{ymin=Ymin,height=Ht,maxiter=MaxIter}=Job,
-    Cols = y_loop(0,Ht,[],MaxIter,Dy,X,Ymin,no_first_color,0),
-    x_loop(IX+1,[Cols|Res],Wt,Dx,Dy,X+Dx,Job);
-x_loop(_,Res,_,_,_,_,_) ->
-    Res.
-
-y_loop(IY,Ht,Res,MaxIter,Dy,X,Y,PrevColor,NprevColor) when IY < Ht -> 
-    Color = color_loop(1,MaxIter,0,0,0,0,X,Y),
-    if
-	Color == PrevColor ->
-	    y_loop(IY+1,Ht,Res,MaxIter,Dy,X,Y+Dy,PrevColor,NprevColor+1);
-	true ->
-	    y_loop(IY+1,Ht,[{PrevColor,NprevColor}|Res],MaxIter,
-		   Dy,X,Y+Dy,Color,1)
-    end;
-
-y_loop(_,_,Res,_,_,_,_,PC,N) -> 
-    [{PC,N}|Res].
-
-color_loop(Color,MaxIter,Za,Zb,Za2,Zb2,X,Y) 
-            when Za2 + Zb2 < 4, Color < MaxIter->
-    Ztmp = Za2 - Zb2 + X,
-    ZbN = 2 * Za * Zb + Y,
-    color_loop(Color+1,MaxIter,Ztmp,ZbN,Ztmp * Ztmp,ZbN * ZbN,X,Y);
-color_loop(MaxIter,MaxIter,_Za,_Zb,_Za2,_Zb2,_X,_Y) ->
-    0; % black
-color_loop(Color,_,_,_,_,_,_,_) ->
-    Color.
-
-%%----------------------------------------------------------------------
-%% The "colormodel".
-%%----------------------------------------------------------------------
-make_color_table(MaxColors) ->
-    list_to_tuple([{0,0,0}|colors(MaxColors)]).
-
-colors(Ncolors) ->
-    {A,B,C}=erlang:now(),
-    random:seed(A,B,C),
-    Colors = random_colors(Ncolors),
-    Colors2 = best_insert([hd(Colors)],tl(Colors)),
-    Colors2.
-
-random_colors(0) -> [];
-random_colors(N) ->
-    R = random:uniform(256)-1,
-    G = random:uniform(256)-1,
-    B = random:uniform(256)-1,
-   [{R,G,B}|random_colors(N-1)].
-
-best_insert(Sorted,[RGB|Unsorted]) ->
-    best_insert(insert_at(best_pos(RGB,Sorted),RGB,Sorted),Unsorted);
-best_insert(Sorted,[]) -> Sorted.
-
-insert_at(1,Elem,L) -> [Elem|L];
-insert_at(N,Elem,[H|T]) -> [H|insert_at(N-1,Elem,T)].
-
-best_pos(RGB, Sorted) ->
-    D = distances(RGB,Sorted),
-    pos_for_smallest_distance(D,1,1000,-1).
-
-pos_for_smallest_distance([],_CurPos,_SmallestDist,Pos) -> Pos;
-pos_for_smallest_distance([Dist|T],CurPos,SmallDist,_Pos)
- when Dist < SmallDist ->
-    pos_for_smallest_distance(T,CurPos+1,Dist,CurPos);
-pos_for_smallest_distance([_|T],CurPos,Smallest,Pos) ->
-    pos_for_smallest_distance(T,CurPos+1,Smallest,Pos).
-
-distances(_RGB,[]) ->
-    [];
-distances({R,G,B},[{R2,G2,B2}|T]) ->
-    [lists:max([abs(R-R2),abs(G-G2),abs(B-B2)])|distances({R,G,B},T)].
-
-get_option(Option, Options, Default) ->
-    case gs:assq(Option, Options) of
-	{value, Val} -> Val;
-	false -> Default
-    end.
diff --git a/lib/gs/contribs/mandel/mandel.gif b/lib/gs/contribs/mandel/mandel.gif
deleted file mode 100644
index 49ed1985cb..0000000000
--- a/lib/gs/contribs/mandel/mandel.gif
+++ /dev/null
diff --git a/lib/gs/contribs/mandel/mandel.html b/lib/gs/contribs/mandel/mandel.html
deleted file mode 100644
index f69cfa3c6a..0000000000
--- a/lib/gs/contribs/mandel/mandel.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<!-- 
- ``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.
- 
- The Initial Developer of the Original Code is Ericsson Utvecklings AB.
- Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
- AB. All Rights Reserved.''
- 
-     $Id$
--->
-<HTML>
-<HEAD>
-   <TITLE></TITLE>
-   <META NAME="GENERATOR" CONTENT="Mozilla/3.01Gold (X11; I; SunOS 5.5.1 sun4m) [Netscape]">
-</HEAD>
-<BODY>
-
-<H1>Distributed Mandelbrot program</H1>
-
-<P>Originally written i C++/rpc/lwp/interviews by Klas Eriksson.(1200 lines)
-<BR>
-Rewritten in Erlang by Klas Eriksson and Martin Bj&ouml;rklund. </P>
-
-<P><A HREF="http://www.bush.edu/~nick/nick.html">What is the Mandelbrot
-function?</A> </P>
-
-<H2>A small manual</H2>
-
-<UL>
-<LI>Try starting erlang in distributed mode. The mandel program will use<BR>
-all connected nodes for mandel calculations!</LI>
-
-<LI>Resizing the window will restart the calculation.</LI>
-
-<LI>Press left mouse button to zoom.</LI>
-</UL>
-
-<P><TT>mandel:start(list of Option)</TT> can be used to give the program
-different options.</P>
-
-<P><BR>
-Available options are:</P>
-
-<UL>
-<LI>{xmax,float()}</LI>
-
-<LI>{ymax,float()}</LI>
-
-<LI>{range,float()}|</LI>
-
-<LI>{maxiter,integer()}</LI>
-
-<LI>{window,integer()}</LI>
-
-<LI>{zoomstep,float()}</LI>
-
-<LI>{hosts,(list of string())|all_found_nodes}</LI>
-</UL>
-
-<P><BR>
-</P>
-
-</BODY>
-</HTML>
diff --git a/lib/gs/contribs/mandel/mandel.tool b/lib/gs/contribs/mandel/mandel.tool
deleted file mode 100644
index b59941268e..0000000000
--- a/lib/gs/contribs/mandel/mandel.tool
+++ /dev/null
@@ -1,6 +0,0 @@
-{version,"0.1"}.
-{{tool,"Mandel"},
- {start,{mandel,start,[]}},
- {icon,"mandel.gif"},
- {message,"Mandelbrot"},
- {html,"../mandel/mandel.html"}}.
diff --git a/lib/gs/contribs/othello/Makefile b/lib/gs/contribs/othello/Makefile
deleted file mode 100644
index 8a66e17ec5..0000000000
--- a/lib/gs/contribs/othello/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1996-2012. 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%
-#
-
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(GS_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/gs-$(VSN)/contribs
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES= \
-       othello \
-       othello_adt \
-       othello_board
-
-HRL_FILES= 
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=../ebin/%.$(EMULATOR)) $(TARGET_TOOLBOX_FILES)
-
-TOOLNAME = othello
-
-EXTRA_FILES=
-TOOLBOX_FILES= $(TOOLNAME).tool $(TOOLNAME).gif
-TARGET_TOOLBOX_FILES= $(TOOLBOX_FILES:%=$(EBIN)/%)
-BITMAPS= priv/marker.bm priv/square.bm
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES)
-
-docs:
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f core
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-$(EBIN)/$(TOOLNAME).gif: $(TOOLNAME).gif
-	$(gen_verbose)rm -f $@
-	$(V_at)cp $(TOOLNAME).gif $@
-
-$(EBIN)/$(TOOLNAME).tool: $(TOOLNAME).tool
-	$(gen_verbose)rm -f $@
-	$(V_at)cp $(TOOLNAME).tool $@
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/othello"
-	$(INSTALL_DATA) $(ERL_FILES) $(EXTRA_FILES) "$(RELSYSDIR)/othello"
-	$(INSTALL_DIR) "$(RELSYSDIR)/othello/priv"
-	$(INSTALL_DATA) $(BITMAPS) $(TOOLBOX_FILES) "$(RELSYSDIR)/othello/priv"
-
-release_docs_spec:
-
diff --git a/lib/gs/contribs/othello/othello.erl b/lib/gs/contribs/othello/othello.erl
deleted file mode 100644
index c6ad0a76ec..0000000000
--- a/lib/gs/contribs/othello/othello.erl
+++ /dev/null
@@ -1,237 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. 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%
-%%
-
-%%
--module(othello).
--export([start/0,new_game/4,start1/5]).
-
-
-
-%%----------------------------------------------------------------------
-%% The Othello program now uses the gs graphical package instead of the 
-%% pxw package. See module othello_board for details
-%%
-%%----------------------------------------------------------------------
-
-
-start() -> othello_board:start().
-
-new_game(Computer,Player,Depth,Init) ->
-    spawn_link(othello,start1,[self(),Computer,Player,Depth,Init]).
-
-start1(Win,Computer,Player,Depth,Init) ->
-    Board = othello_adt:new(t),
-    random:seed(),
-    init_display(Board,Win,Init),
-    play(Computer,Player,Board,Depth,Win,1).
-
-play(Computer,Player,Board,Depth,Win,NoDs) ->
-    tell_win(Win,Computer,Player),
-    case catch continue(Player,Board) of
-	{game_over,Result} ->
-	    game_over(Board,Player,Result,Win);
-	{omit_draw,Player} ->
-	    omit(Player,Win),
-	    play(Computer,swap(Player),Board,Depth,Win,NoDs);
-	ok ->
-	    Draw = choose_draw(Computer,Player,Board,Depth,Win,NoDs),
-	    Win ! {self(),draw,Draw},
-	    Board1 = othello_adt:set(Draw,Player,Board),
-	    display(Board1,Board,Win),
-	    play(Computer,swap(Player),Board1,Depth,Win,NoDs+1)
-    end.
-
-continue(Player,Board) ->
-    Draws = game_over(Player,Board),
-    not_allowed(Draws,Player),
-    ok.
-
-choose_draw(Computer,Computer,Board,Depth,_Win,NoDs) ->    % Depth > 0 !!
-    {Draw,_Value} = alpha_beta(Depth,Board,-11000,11000,Computer,NoDs),
-%    io:format('Choosen draw is {~w,~w} : (~w)~n',
-%	      [othello_adt:col(Draw),othello_adt:row(Draw),Value]),
-%    io:format('=====================~n',[]),
-    Draw;
-choose_draw(Computer,Player,Board,Depth,Win,NoDs) ->
-    receive
-	{Win,position,Draw} ->
-	    flush(Win),
-	    case othello_adt:is_draw(Draw,Player,Board) of
-		false ->
-		    Win ! {self(),illegal_draw,Draw},
-		    choose_draw(Computer,Player,Board,Depth,Win,NoDs);
-		true ->
-		    Draw
-	    end
-    end.
-
-flush(Win) ->
-    receive
-	{Win,position,_} ->
-	    flush(Win)
-    after 1 ->
-	    true
-    end.
-
-tell_win(Win,Computer,Player) ->
-    Win ! {self(),player,Computer,Player},
-    receive
-	{Win,go_on_play} -> true
-    end.
-
-alpha_beta(0,Board,_,_,Player,_) ->
-    {-1,othello_adt:evaluate_board(Player,Board)};
-alpha_beta(Depth,Board,Alpha,Beta,Player,NoDs) ->
-    case compute(Player,Board,NoDs) of
-	[] ->
-	    Player1 = swap(Player),
-	    case compute(Player1,Board,NoDs) of
-		[] ->
-		    dead_lock(Board,Player);
-		PosDraws1 ->
-		    choose(PosDraws1,Board,Depth-1,-Beta,-Alpha,-1,
-			   Player1,NoDs)
-	    end;
-	PosDraws ->
-	    choose(PosDraws,Board,Depth-1,-Beta,-Alpha,-1,Player,NoDs)
-%	    A = choose(PosDraws,Board,Depth-1,-Beta,-Alpha,-1,Player,NoDs),
-%	    io:format('Alpha-Beta (~w) ==> ~w~n',[Depth,A]),
-%	    A
-    end.
-
-choose([Draw|Draws],Board,Depth,Alpha,Beta,Record,Player,NoDs) ->
-    Player1 = swap(Player),
-    Board1 = othello_adt:set(Draw,Player,Board),
-%    io:format('Alpha <~w> Beta <~w> ~n',[Alpha,Beta]),
-    {_,Value} = alpha_beta(Depth,Board1,Alpha,Beta,Player1,NoDs+1),
-    Value1 = -Value,
-    cutoff(Draw,Value1,Depth,Alpha,Beta,Draws,Board,Record,Player,NoDs);
-choose([],_,_,Alpha,_,Draw,_,_) ->
-    {Draw,Alpha}.
-    
-cutoff(Draw,Value,_,_,Beta,_,_,_,_,_) when Value >= Beta ->
-    {Draw,Value};
-cutoff(Draw,Value,Depth,Alpha,Beta,Draws,Board,_,Player,NoDs)
-  when Alpha < Value, Value < Beta ->
-    choose(Draws,Board,Depth,Value,Beta,Draw,Player,NoDs);
-cutoff(Draw,Value,Depth,Alpha,Beta,Draws,Board,Record,Player,NoDs)
-  when Value == Alpha, NoDs < 13 ->
-    choose(Draws,Board,Depth,Alpha,Beta,random_choice(Draw,Record),
-	   Player,NoDs);
-cutoff(_Draw,Value,Depth,Alpha,Beta,Draws,Board,Record,Player,NoDs)
-  when Value =< Alpha ->
-    choose(Draws,Board,Depth,Alpha,Beta,Record,Player,NoDs).
-
-compute(Player,Board,NoOfDraws) when NoOfDraws < 13 ->
-    case othello_adt:possible_draws(Player,Board,begin_play) of
-	[] ->
-	    othello_adt:possible_draws(Player,Board,playing);
-	Draws ->
-	    Draws
-    end;
-compute(Player,Board,_) ->
-    othello_adt:possible_draws(Player,Board,playing).
-
-%%----------------------------------------------------------
-%% Randomly choose between two draws with the same value.
-%%----------------------------------------------------------
-    
-random_choice(Draw,Draw1) ->
-    case random:uniform(2) of
-	1 ->
-	    Draw;
-	2 ->
-	    Draw1
-    end.
-
-dead_lock(Board,Player) ->
-    case win_or_loose(Board,Player) of
-	0                    -> {-1,0};
-	Value when Value > 0 -> {-1,10000};
-	_                    -> {-1,-10000}
-    end.
-
-win_or_loose(Board,Player) ->
-    Player1 = swap(Player),
-    othello_adt:pieces(Player,Board) - othello_adt:pieces(Player1,Board).
-
-game_over(Player,Board) ->
-    case othello_adt:possible_draws(Player,Board,playing) of
-	[] ->
-	    Player1 = swap(Player),
-	    case othello_adt:possible_draws(Player1,Board,playing) of
-		[] ->
-		    throw({game_over,{{Player,othello_adt:pieces(Player,Board)},
-				      {Player1,othello_adt:pieces(Player1,Board)}}});
-		_ ->
-		    []  % Player`s Draws !!
-	    end;
-	Draws ->
-	    Draws
-    end.
-
-game_over(_Board,_Player,Result,Win) ->
-    Win ! {self(),game_over,white_res(Result),black_res(Result)}.
-
-white_res({{white,Res},_}) -> Res;
-white_res({_,{white,Res}}) -> Res.
-	
-black_res({{black,Res},_}) -> Res;
-black_res({_,{black,Res}}) -> Res.
-
-not_allowed([],Player) ->
-    throw({omit_draw, Player});
-not_allowed(_,_Player) ->
-    ok.
-
-omit(Player,Win) ->
-    Win ! {self(),omit_draw,Player},
-    receive
-	{Win,continue} ->
-	    ok
-    end.
-
-init_display(_Board,_Win,first_time) ->
-    true;
-init_display(Board,Win,_) ->
-    display(Board,Win).
-
-display(Board,Win) ->
-    All = othello_adt:all_pos(Board),
-    display1(All,Win),
-    Win ! {self(),score,othello_adt:pieces(white,Board),
-	   othello_adt:pieces(black,Board)}.
-
-display(Board,OldB,Win) ->
-    Diff = othello_adt:diff(Board,OldB),
-    display1(Diff,Win),
-    Win ! {self(),score,othello_adt:pieces(white,Board),
-	   othello_adt:pieces(black,Board)}.
-    
-display1([{Pos,Colour}|Diff],Win) ->
-    Win ! {self(),new_mark,Pos,Colour},
-    display1(Diff,Win);
-display1(_,_) ->
-    true.
-
-swap(white) -> black;
-swap(black) -> white.
-
-
diff --git a/lib/gs/contribs/othello/othello.gif b/lib/gs/contribs/othello/othello.gif
deleted file mode 100644
index 5970c50209..0000000000
--- a/lib/gs/contribs/othello/othello.gif
+++ /dev/null
diff --git a/lib/gs/contribs/othello/othello.tool b/lib/gs/contribs/othello/othello.tool
deleted file mode 100644
index 47550a581d..0000000000
--- a/lib/gs/contribs/othello/othello.tool
+++ /dev/null
@@ -1,6 +0,0 @@
-{version,"0.1"}.
-{{tool,"Othello"},
- {start,{othello,start,[]}},
- {icon,"othello.gif"},
- {message,"Othello - The Game"},
- {html,"http://www.armory.com/~iioa/othguide.html"}}.
diff --git a/lib/gs/contribs/othello/othello_adt.erl b/lib/gs/contribs/othello/othello_adt.erl
deleted file mode 100644
index e69c1c4d72..0000000000
--- a/lib/gs/contribs/othello/othello_adt.erl
+++ /dev/null
@@ -1,540 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1996-2010. 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%
-%%
-
-%%
--module(othello_adt).
--compile(export_all).
-%%-------------------------------------------------------
-%% Use three main states for the strategy:
-%%
-%%  BeginPlay:  Stay in the inner square as long as possible.
-%%              Use the possible_draws/3.
-%%
-%%  MiddlePlay: Try to choose stable markers (?)
-%%              Use stable/3
-%%
-%%  EndPlay:    Try to flip as many markers as possible
-%%
-%%  The transition from Begin to Middle is obvious. From Middle
-%%  to End however, is can be discussed.
-%%-------------------------------------------------------
-
-test(N,B) ->
-    X=new(B),
-    statistics(wall_clock),
-    test0(N,X),
-    {_,T} = statistics(wall_clock),
-    {time_was,T/N}.
-
-
-test0(0,_) -> true;
-test0(N,X) -> 
-    possible_draws(black,X,begin_play),
-    test0(N-1,X).
-
-%%-------------------------------------------------------
-%% new/1 - returns a new board
-%% 
-%% Uses a tuple for storing the board
-%%-------------------------------------------------------
-
-new(B) ->
-    Board = mk_board(B),
-    {ordsets:from_list([18,19,20,21,26,29,34,37,42,43,44,45]),Board}.
-
-mk_board(t) ->
-    Tup = list_to_tuple(gen_list(64,grey)),
-    Tup1 = setelement(28+1, Tup,  white),
-    Tup2 = setelement(35+1, Tup1, white),
-    Tup3 = setelement(27+1, Tup2, black),
-    gen_score_board(),
-    setelement(36+1, Tup3, black).
-
-gen_list(0,_) -> [];
-gen_list(I,Def) -> [Def|gen_list(I-1,Def)].
-
-gen_score_board() -> put(score,list_to_tuple(gen_list(64,0))).
-
-%%-------------------------------------------------------
-%% pos(Col,Row) - returns a position describing column
-%%                and row.
-%%                Col and Row have the range 1 - 8.
-%%-------------------------------------------------------
-
-pos(Col,Row) -> ((Row - 1) bsl 3) + (Col - 1).
-
-%%-------------------------------------------------------
-%% col(Pos) - returns the column of the Pos position
-%%-------------------------------------------------------
-
-col(Pos) -> (Pos band 7) + 1.
-
-%%-------------------------------------------------------
-%% row(Pos) - returns the row of the Pos position
-%%-------------------------------------------------------
-
-row(Pos) -> (Pos bsr 3) + 1.
-
-%%-------------------------------------------------------
-%% is_draw(Pos,Colour,Board) - returns true if Pos is a
-%%                             correct draw.
-%%-------------------------------------------------------
-
-is_draw(Pos,Colour,{Bset,Board}) ->
-    case ordsets:is_element(Pos,Bset) of
-	true ->
-	    case catch is_good(Colour,Pos,Board) of
-		true ->
-		    true;
-		_ ->
-		    false
-	    end;
-	_ ->
-	    false
-    end.
-
-%%-------------------------------------------------------
-%% set(Pos,Colour,Board) - returns an updated board
-%%-------------------------------------------------------
-
-set(Pos,Colour,{Bset,Board}) ->
-    case ordsets:is_element(Pos,Bset) of
-	true ->
-	    NewBoard = setelement(Pos+1,Board,Colour),
-	    Empty = empty_neighbour(Pos,NewBoard),
-	    NewBset = ordsets:union(Empty,ordsets:del_element(Pos,Bset)),
-	    turn(Colour,Pos,{NewBset,NewBoard});
-	_ ->
-	    {error,invalid_position}
-    end.
-    
-empty_neighbour(Pos,Board) ->
-    ordsets:from_list(empty_neighbour(Pos,Board,deltas())).
-
-empty_neighbour(_,_,[]) -> [];
-empty_neighbour(Pos,Board,[H|T]) ->
-    case is_empty(Pos+H,dir(Pos,H),Board) of
-	true -> [Pos+H|empty_neighbour(Pos,Board,T)];
-	_    -> empty_neighbour(Pos,Board,T)
-    end.
-
-is_empty(_,false,_) -> false;
-is_empty(X,_,_Board) when X<0  -> false;
-is_empty(X,_,_Board) when X>63 -> false;
-is_empty(X,_,Board) ->
-    case element(X+1,Board) of
-	grey -> true;   % Empty 
-	_ -> false
-    end.
-
-%%-------------------------------------------------------
-%% get(Pos,Board) - returns the contents in Pos
-%%-------------------------------------------------------
-
-get(Pos,{_Bset,Board}) -> element(Pos+1,Board).
-
-%%-------------------------------------------------------
-%% pieces(Colour,Board) - returns the number of Colour
-%%                        pieces.
-%%-------------------------------------------------------
-
-pieces(Colour,{_Bset,Board}) ->
-    pieces(Colour,Board,0,0).
-
-pieces(Colour,Board,Pos,Count) when Pos < 64 ->
-    case element(Pos+1,Board) of
-	Colour ->
-	    pieces(Colour,Board,Pos+1,Count+1);
-	_ ->
-	    pieces(Colour,Board,Pos+1,Count)
-    end;
-pieces(_,_,_,Count) ->
-    Count.
-
-%%-------------------------------------------------------
-%% possible_draws(Colour, Board, State) 
-%% 
-%% Returns a list of possible draws regarding the current
-%% strategy state.
-%%-------------------------------------------------------
-
-possible_draws(Colour,{Bset,Board},begin_play) -> 
-    Dset = ordsets:intersection(Bset,inner_square()),
-    possible_draws_0(Colour,Dset,Board);
-possible_draws(Colour,{Bset,Board},_) -> 
-    possible_draws_0(Colour,Bset,Board).
-
-possible_draws(Colour,{Bset,Board}) -> 
-    possible_draws_0(Colour,Bset,Board).
-
-possible_draws_0(_,[],_) -> [];
-possible_draws_0(Colour,[H|T],Board) ->
-    case catch is_good(Colour,H,Board) of
-	true  -> [H|possible_draws_0(Colour,T,Board)];
-	false -> possible_draws_0(Colour,T,Board)
-    end.
-
-
-%%-------------------------------------------------------
-%% evaluate_board(Colour,Board) - returns the value of
-%%                                the board from Colours
-%%                                point of view.
-%%-------------------------------------------------------
-
-evaluate_board(Colour,{_Bset,Board}) ->
-    Score = get(score),   % Initialized (zeroed) score board !!
-    Colour1 = swap(Colour),
-    Score1 = eval_board(Colour,Colour1,Score,Board,0),
-    Score2 = cnt_corner(0,Score1,Board,Colour,Colour1),
-    Score3 = cnt_corner(7,Score2,Board,Colour,Colour1),
-    Score4 = cnt_corner(56,Score3,Board,Colour,Colour1),
-    Score5 = cnt_corner(63,Score4,Board,Colour,Colour1),
-    count(Score5,0).
-%    A = count(Score5,0),
-%    io:format('Score = ~w~n',[A]),
-%    A.
-
-eval_board(MyCol,OtCol,Score,Board,Pos) when Pos < 64 ->
-    case element(Pos+1,Board) of
-	MyCol ->
-	    Score1 = setelement(Pos+1,Score,score(Pos)),
-	    eval_board(MyCol,OtCol,Score1,Board,Pos+1);
-	OtCol ->
-	    Score1 = setelement(Pos+1,Score,-score(Pos)),
-	    eval_board(MyCol,OtCol,Score1,Board,Pos+1);
-	_ ->
-	    eval_board(MyCol,OtCol,Score,Board,Pos+1)
-    end;
-eval_board(_,_,Score,_,_) ->
-    Score.
-
-cnt_corner(Corner,Score,Board,MyCol,OtCol) ->
-    case element(Corner+1,Board) of
-	MyCol ->
-	    cnt_corn(Corner,setelement(Corner+1,Score,50),
-		     Board,50,MyCol);
-	OtCol ->
-	    cnt_corn(Corner,setelement(Corner+1,Score,-50),
-		     Board,-50,OtCol);
-	_ ->
-	    Score
-    end.
-
-cnt_corn(0,Score,Board,Value,Colour) ->
-    Score1 = cnt_corn(0,1,8,Score,Board,Value,Colour),
-    cnt_corn(0,8,1,Score1,Board,Value,Colour);
-cnt_corn(7,Score,Board,Value,Colour) ->
-    Score1 = cnt_corn(7,-1,8,Score,Board,Value,Colour),
-    cnt_corn(7,8,-1,Score1,Board,Value,Colour);
-cnt_corn(56,Score,Board,Value,Colour) ->
-    Score1 = cnt_corn(56,1,-8,Score,Board,Value,Colour),
-    cnt_corn(56,-8,1,Score1,Board,Value,Colour);
-cnt_corn(63,Score,Board,Value,Colour) ->
-    Score1 = cnt_corn(63,-1,-8,Score,Board,Value,Colour),
-    cnt_corn(63,-8,-1,Score1,Board,Value,Colour).
-
-cnt_corn(Pos,Dir,LineDir,Score,Board,Value,Colour) ->
-    case dir(Pos,Dir) of
-	Dir ->
-	    NextEdge = Pos+Dir,
-	    case element(NextEdge+1,Board) of
-		Colour ->
-		    Score1 = setelement(NextEdge+1,Score,Value),
-		    Score2 = cnt_line(NextEdge,LineDir,Score1,Board,
-				      Colour,Value),
-		    cnt_corn(NextEdge,Dir,LineDir,Score2,Board,Value,Colour);
-		_ ->
-		    Score
-	    end;
-	_ ->
-	    Score
-    end.
-
-cnt_line(Pos,Dir,Score,Board,Colour,Value) ->
-    case dir(Pos,Dir) of
-	Dir ->
-	    OnLinePos = Pos+Dir,
-	    case element(OnLinePos+1,Board) of
-		Colour ->
-		    Score1 = setelement(OnLinePos+1,Score,Value),
-		    cnt_line(OnLinePos,Dir,Score1,Board,Colour,Value);
-		_ ->
-		    Score
-	    end;
-	_ ->
-	    Score
-    end.
-
-count(Score,Pos) when Pos < 64 ->
-    element(Pos+1,Score) + count(Score,Pos+1);
-count(_,_) ->
-    0.
-
-swap(white) -> black;
-swap(black) -> white.
-
-%%-------------------------------------------------------
-%% stable(Colour,Pos,Board) - returns a value 0-8 
-%% 
-%% A high value is regarded as more stable than a lower one.
-%% The stability means how many "friendly" neighbours there
-%% are, i.e markers of the same colour. Neighbours positions
-%% outside the board are regarded as friendly.
-%%-------------------------------------------------------
-
-stable(Colour,Pos,{_,Board}) ->
-    stable(deltas(),Colour,Pos,Board).
-
-stable([],_,_,_) -> 0;
-stable([H|T],Colour,Pos,Board) ->
-    stable_val(Colour,Pos,H,Board) + stable(T,Colour,Pos,Board).
-
-stable_val(_,H,D,_) when H+D<0 -> 1;
-stable_val(_,H,D,_) when H+D>63 -> 1;
-stable_val(black,H,D,Board) ->
-    case element((H+D)+1,Board) of
-	black -> 1;
-	_     -> 0
-    end;
-stable_val(white,H,D,Board) ->
-    case element((H+D)+1,Board) of
-	white -> 1;
-	_     -> 0
-    end.
-
-%%-------------------------------------------------------
-%% diff(Board,OldBoard) - return a list of the positions
-%%                        with changed pieces.
-%%                        [{Pos1,Colour1},...]
-%%-------------------------------------------------------
-
-diff(Board,OldBoard) -> diff(0,Board,OldBoard).
-
-diff(Pos,Board,OldBoard) when Pos < 64 ->
-    OldP = get(Pos,OldBoard),
-    case get(Pos,Board) of
-	OldP ->
-	    diff(Pos+1,Board,OldBoard);
-	NewP ->
-	    [{Pos,NewP}|diff(Pos+1,Board,OldBoard)]
-    end;
-diff(_,_,_) ->
-    [].
-
-%%-------------------------------------------------------
-%% all_pos(Board) - return a list of the positions colour.
-%%                        [{Pos1,Colour1},...]
-%%-------------------------------------------------------
-
-all_pos(Board) -> all_pos(0,Board).
-
-all_pos(Pos,Board) when Pos < 64 ->
-    [{Pos,get(Pos,Board)}|all_pos(Pos+1,Board)];
-all_pos(_,_) ->
-    [].
-
-%%-------------------------------------------------------
-%% Internal stuff
-%%-------------------------------------------------------
-
-deltas() -> [9,8,7,1,-1,-7,-8,-9].
-
-inner_square() ->
-    [18,19,20,21,26,27,28,29,34,35,36,37,42,43,44,45].  % Is already an ordset
-                                                        % Save list traversing.
-%    ordsets:list_to_set([18,19,20,21,26,27,28,29,34,35,36,37,42,43,44,45]).
-
-inv(black) -> white;
-inv(white) -> black.
-
-is_good(Colour,H,Board) ->
-    is_good_0(Colour,H,dir(H,-9),Board),
-    is_good_0(Colour,H,dir(H,-8),Board),
-    is_good_0(Colour,H,dir(H,-7),Board),
-    is_good_0(Colour,H,dir(H,-1),Board),
-    is_good_0(Colour,H,dir(H,1),Board),
-    is_good_0(Colour,H,dir(H,7),Board),
-    is_good_0(Colour,H,dir(H,8),Board),
-    is_good_0(Colour,H,dir(H,9),Board),
-    false.
-
-is_good_0(_,_,false,_) -> false;
-is_good_0(_,H,D,_) when is_integer(H), is_integer(D), H+D<0 -> false;
-is_good_0(_,H,D,_) when is_integer(H), is_integer(D), H+D>63 -> false;
-is_good_0(black,H,D,Board) when is_integer(H), is_integer(D) ->
-    case element((H+D)+1,Board) of
-	white -> is_good_1(black,H+D,dir(H+D,D),Board);
-	_     -> false
-    end;
-is_good_0(white,H,D,Board) when is_integer(H), is_integer(D) ->
-    case element((H+D)+1,Board) of
-	black -> is_good_1(white,H+D,dir(H+D,D),Board);
-	_     -> false
-    end.
-
-is_good_1(_,_,false,_) -> false;
-is_good_1(_,H,D,_) when is_integer(H), is_integer(D), H+D<0 -> false;
-is_good_1(_,H,D,_) when is_integer(H), is_integer(D), H+D>63 -> false;
-is_good_1(black,H,D,Board) when is_integer(H), is_integer(D) ->
-    case element((H+D)+1,Board) of
-	white -> is_good_1(black,H+D,dir(H+D,D),Board);
-	black -> throw(true);
-	_     -> false
-    end;
-is_good_1(white,H,D,Board) when is_integer(H), is_integer(D) ->
-    case element((H+D)+1,Board) of
-	black -> is_good_1(white,H+D,dir(H+D,D),Board);
-	white -> throw(true);
-	_     -> false
-    end.
-
-%%-------------------------------------------------------
-%% turn(Colour,Draw,Board) - returns an updated board
-%%                           turn all possible pieces
-%%                           on the board
-%%                           Neighbours are not changed !!
-%%-------------------------------------------------------
-
-turn(Colour,Draw,{Bset,Board}) ->
-    {Bset,turn(Colour,Draw,-9,
-	       turn(Colour,Draw,-8,
-		    turn(Colour,Draw,-7,
-			 turn(Colour,Draw,-1,
-			      turn(Colour,Draw,1,
-				   turn(Colour,Draw,7,
-					turn(Colour,Draw,8,
-					     turn(Colour,Draw,9,Board))))))))}.
-
-turn(Colour,H,D,Board) ->
-    case catch is_good_0(Colour,H,dir(H,D),Board) of
-	true ->
-	    turn_0(Colour,H,D,Board);
-	false ->
-	    Board
-    end.
-
-turn_0(_,H,D,B) when is_integer(H), is_integer(D), H+D<0 -> B;
-turn_0(_,H,D,B) when is_integer(H), is_integer(D), H+D>63 -> B;
-turn_0(black,H,D,Board) when is_integer(H), is_integer(D) ->
-    E = H+D,
-    case element(E+1,Board) of
-	white -> turn_0(black,H+D,D,swap(black,E,Board));
-	_     -> Board
-    end;
-turn_0(white,H,D,Board) when is_integer(H), is_integer(D) ->
-    E = H+D,
-    case element(E+1,Board) of
-	black -> turn_0(white,H+D,D,swap(white,E,Board));
-	_     -> Board
-    end.
-
-%%-------------------------------------------------------
-%% swap(Colour,Pos,Board) - returns an updated board
-%%                          turn a piece on the board
-%%                          Neighbours are not changed !!
-%%-------------------------------------------------------
-
-swap(Colour,Pos,Board) when is_integer(Pos) ->
-    setelement(Pos+1,Board,Colour).
-
-score(Pos) -> score1({col(Pos),row(Pos)}).
-    
-score1({Column,1}) when Column >= 3, Column =< 6 -> 20;              
-score1({Column,8}) when Column >= 3, Column =< 6 -> 20;              
-score1({1,Line}) when Line >= 3, Line =< 6 -> 20;              
-score1({8,Line}) when Line >= 3, Line =< 6 -> 20;              
-score1({Column,2}) when Column >= 3, Column =< 6 -> -7;
-score1({Column,7}) when Column >= 3, Column =< 6 -> -7;
-score1({2,Line}) when Line >= 3, Line =< 6 -> -7;
-score1({7,Line}) when Line >= 3, Line =< 6 -> -7;
-score1({Column,Line}) when Column >= 3, Column =< 6,
-                           Line >= 3, Line =< 6 -> 1;
-score1({1,1}) -> 100;
-score1({1,8}) -> 100;
-score1({8,1}) -> 100;
-score1({8,8}) -> 100;
-score1({2,1}) -> -30;
-score1({7,1}) -> -30;
-score1({1,2}) -> -30;
-score1({8,2}) -> -30;
-score1({1,7}) -> -30;
-score1({8,7}) -> -30;
-score1({2,8}) -> -30;
-score1({7,8}) -> -30;
-score1({2,2}) -> -50;
-score1({7,2}) -> -50;
-score1({2,7}) -> -50;
-score1({7,7}) -> -50.
-
-%%-------------------------------------------------------
-%% dir(Pos,Dir) - return Dir if allowed direction at Pos.
-%%                else return false.
-%%-------------------------------------------------------
-
-dir(0,1) -> 1;         % {1,1}
-dir(0,8) -> 8;
-dir(0,9) -> 9;
-dir(0,_) -> false;
-
-dir(7,-1) -> -1;       % {8,1}
-dir(7,7) -> 7;
-dir(7,8) -> 8;
-dir(7,_) -> false;
-
-dir(56,-8) -> -8;      % {1,8}
-dir(56,-7) -> -7;
-dir(56,1) -> 1;
-dir(56,_) -> false;
-
-dir(63,-9) -> -9;      % {8,8}
-dir(63,-8) -> -8;
-dir(63,-1) -> -1;
-dir(63,_) -> false;
-
-dir(Pos,-1) when (Pos bsr 3) == 0 -> -1;   % {_,1}
-dir(Pos,1) when (Pos bsr 3) == 0 -> 1;  
-dir(Pos,7) when (Pos bsr 3) == 0 -> 7;  
-dir(Pos,8) when (Pos bsr 3) == 0 -> 8;  
-dir(Pos,9) when (Pos bsr 3) == 0 -> 9;  
-dir(Pos,_) when (Pos bsr 3) == 0 -> false;
-
-dir(Pos,-9) when (Pos bsr 3) == 7 -> -9;   % {_,8}
-dir(Pos,-8) when (Pos bsr 3) == 7 -> -8;  
-dir(Pos,-7) when (Pos bsr 3) == 7 -> -7;  
-dir(Pos,-1) when (Pos bsr 3) == 7 -> -1;  
-dir(Pos,1) when (Pos bsr 3) == 7 -> 1;  
-dir(Pos,_) when (Pos bsr 3) == 7 -> false;
-
-dir(Pos,-8) when (Pos band 7) == 0 -> -8;    % {1,_}
-dir(Pos,-7) when (Pos band 7) == 0 -> -7;       
-dir(Pos,1) when (Pos band 7) == 0 -> 1;       
-dir(Pos,8) when (Pos band 7) == 0 -> 8;       
-dir(Pos,9) when (Pos band 7) == 0 -> 9;       
-dir(Pos,_) when (Pos band 7) == 0 -> false;       
-
-dir(Pos,-9) when (Pos band 7) == 7 -> -9;    % {8,_}
-dir(Pos,-8) when (Pos band 7) == 7 -> -8;       
-dir(Pos,-1) when (Pos band 7) == 7 -> -1;       
-dir(Pos,7) when (Pos band 7) == 7 -> 7;       
-dir(Pos,8) when (Pos band 7) == 7 -> 8;       
-dir(Pos,_) when (Pos band 7) == 7 -> false;       
-
-dir(_Pos,Dir) -> Dir.
-
diff --git a/lib/gs/contribs/othello/othello_board.erl b/lib/gs/contribs/othello/othello_board.erl
deleted file mode 100644
index cc055b1fa1..0000000000
--- a/lib/gs/contribs/othello/othello_board.erl
+++ /dev/null
@@ -1,649 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2012. 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%
-%%
-
-%%
--module(othello_board).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,create,4}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,start,0}}]).
-
--export([start/0,stop/0,init/0]).
-
-
-%%----------------------------------------------------------------------
-%% The Othello program now uses the gs graphical package instead of the 
-%% pxw package.
-%%
-%% Differences are, explanation why and source of change in parenthesis:
-%%
-%%	-  Buttons looks different (gs feature)
-%%	-  The black box around "Black to draw" have been removed. (me)
-%%	-  The Colour and Level menues have been moved directly down to the 
-%%	     'Status' box. (usability update, my addition)
-%%	-  The mouse pointer does not change into a watch when the computer 
-%%	     is thinking (not supported in gs)
-%%	-  Buttons does not flash when being beeped. (not supported in gs)
-%%
-%%
-%% /Peter
-%%
-%%----------------------------------------------------------------------
-
-
--define(BGCOL,forestgreen).
-
-start() ->
-    spawn(othello_board,init,[]).
-
-stop() ->
-    ok.
-
-%% This is not an application so we don't have their way of knowing
-%% a private data directory where the GIF files are located (this directory).
-%% We can find GS and makes it relative from there /kgb
-
--define(BitmapPath,"../contribs/othello/priv").
-
-setup_path() ->
-    GsPrivDir = code:priv_dir(gs),
-    Path = filename:join(GsPrivDir,?BitmapPath),
-    put(path,Path).
-    
-path() -> get(path).
-
-
-
-%%
-%% The button area are the Quit, Rules buttons at the top of the window.
-%% The Status area is the black and white scores level and colour etc 
-%% inbetween the buttons and the othello board.
-%% The board is the 8x8 board where othello battles are fought.
-%%
-init() ->
-    process_flag(trap_exit,true),
-    setup_path(),
-    S = gs:start(),
-    put(windowroot,S),				% Ugly global store
-
-    %% Shell coordinates
-    W = 496,
-    H = 636,
-    
-    %% Fix top window
-    Shell = gs:create(window, S, [{title,"Othello"}, 
-				  {width, W},{height, H}]),
-
-
-    %% Setup window contents
-
-    setup_buttons(Shell,0,0,W,40),		% Fix Menubar
-    setup_status_box(Shell,0,40,W,100),		% Fix Status area
-    setup_board(Shell,0,140,496,496),		% Combat board
-
-    GamePid = othello:new_game(white,black,1,first_time),
-
-    %% Default settings
-    Options = {white,black,1},
-    %%Wids = {Status,B,W,Dr,Le,Co},
-    Wids = {change,this,at,later,stage,ponto},
-    write_options(Options,Wids),
-
-    gs:config(Shell, {map, true}),		%Make win visible
-
-    loop(computer,GamePid,Shell,Wids,Options).
-
-
-
-
-
-
-loop(User,GamePid,Shell,Wids,Options) ->
-    receive
-	{gs,ButtId, click,_ButtId1,[Button]} ->
-	    GamePid1 = but_pressed(Button,ButtId,User,GamePid,Shell,
-				   Wids,Options),
-	    loop(User,GamePid1,Shell,Wids,Options);
-
-	{gs,_, click,_,[MenuItem,_MenuIndex]} ->
-	    Ops = menu_selected(MenuItem,User,GamePid,Wids,Options),
-	    loop(User,GamePid,Shell,Wids,Ops);
-
-	{'EXIT',GamePid,_} ->
-	    loop(User,null,Shell,Wids,Options);
-
-	{'EXIT',_,_} ->
-	    loop(User,GamePid,Shell,Wids,Options);
-
-	GameMsg ->
-	    game_msg(GameMsg,User,GamePid,Shell,Wids,Options)
-    end.
-
-but_pressed("Quit",_ButtId,_User,_GamePid,_Shell,_Wids,_Op) ->
-    stop(),
-    exit(quit);
-but_pressed("Rules",_ButtId,_User,GamePid,_Shell,_Wids,_Op) ->
-    io:format("No rules, do as you wish~n",[]),
-    GamePid;
-but_pressed("Help",_ButtId,_User,GamePid,_Shell,_Wids,_Op) ->
-    io:format("Othello game~n",[]),
-    io:format("------------~n",[]),
-    io:format("  Put markers by clicking in squares~n",[]),
-    io:format("  Change level by clicking on it~n",[]),
-    io:format("  Change colour by clicking on it~n",[]),
-    io:format("~n",[]),
-    GamePid;
-but_pressed("Newgame",_ButtId,_User,GamePid,_Shell,Wids,Options) ->
-    new_game(GamePid,Wids,Options);
-but_pressed([],ButtId,User,GamePid,_Shell,_Wids,_Op) 
-					when is_pid(GamePid),User == player ->
-    [C,R] = atom_to_list(ButtId),
-    GamePid ! {self(),position,othello_adt:pos(C-96,translate(R-48))},
-    GamePid;
-but_pressed([],ButtId,_User,GamePid,_Shell,_Wids,_Op) ->
-    [C,R] = atom_to_list(ButtId),
-    beep(othello_adt:pos(C-96,translate(R-48))),
-    GamePid;
-but_pressed(Button,ButtId,_User,GamePid,_Shell,_Wids,_Op) ->
-    io:format('Not implemented button pressed ~p, ~p!!!~n',[ButtId,Button]),
-    GamePid.
-
-menu_selected("Black",_User,_GamePid,Wids,Options) ->
-    Op0 = setelement(1,Options,white),
-    Op1 = setelement(2,Op0,white),
-    write_options(Op1,Wids),
-    Op1;
-menu_selected("White",_User,_GamePid,Wids,Options) ->
-    Op0 = setelement(1,Options,black),
-    Op1 = setelement(2,Op0,black),
-    write_options(Op1,Wids),
-    Op1;
-menu_selected("Black (begin)",_User,_GamePid,Wids,Options) ->
-    Op0 = setelement(1,Options,white),
-    Op1 = setelement(2,Op0,black),
-    write_options(Op1,Wids),
-    Op1;
-menu_selected("White (begin)",_User,_GamePid,Wids,Options) ->
-    Op0 = setelement(1,Options,black),
-    Op1 = setelement(2,Op0,white),
-    write_options(Op1,Wids),
-    Op1;
-menu_selected("Beginner",_User,_GamePid,Wids,Options) ->
-    Op1 = setelement(3,Options,1),
-    write_options(Op1,Wids),
-    Op1;
-menu_selected("Intermediate",_User,_GamePid,Wids,Options) ->
-    Op1 = setelement(3,Options,2),
-    write_options(Op1,Wids),
-    Op1;
-menu_selected("Advanced",_User,_GamePid,Wids,Options) ->
-    Op1 = setelement(3,Options,3),
-    write_options(Op1,Wids),
-    Op1;
-menu_selected("Expert",_User,_GamePid,Wids,Options) ->
-    Op1 = setelement(3,Options,4),
-    write_options(Op1,Wids),
-    Op1;
-menu_selected(What,_User,_GamePid,_Wids,Options) ->
-    io:format('Menu item not implemented <~s>~n',[What]),
-    Options.
-
-game_msg(Msg,User,GamePid,Shell,Wids,Options) ->
-    case Msg of
-	{GamePid,new_mark,Pos,Colour} ->
-	    new_mark(Pos,Colour),
-	    loop(User,GamePid,Shell,Wids,Options);
-
-	{GamePid,illegal_draw,Draw} ->
-	    beep(Draw),
-	    loop(User,GamePid,Shell,Wids,Options);
-
-	{GamePid,player,Computer,Computer} ->
-	    show_player(element(1,Wids),Computer),
-	    cursor("watch"),
-	    GamePid ! {self(),go_on_play},
-	    loop(computer,GamePid,Shell,Wids,Options);
-
-	{GamePid,player,_Computer,Player} ->
-	    show_player(element(1,Wids),Player),
-	    cursor("top_left_arrow"),
-	    GamePid ! {self(),go_on_play},
-	    loop(player,GamePid,Shell,Wids,Options);
-
-	{GamePid,omit_draw,Player} ->
-	    omit_draw(GamePid,Player),
-	    loop(User,GamePid,Shell,Wids,Options);
-
-	{GamePid,score,WhiteRes,BlackRes} ->
-	    write_score(Wids,WhiteRes,BlackRes),
-	    loop(User,GamePid,Shell,Wids,Options);
-
-	{GamePid,draw,Draw} ->
-	    write_draw(Wids,Draw),
-	    loop(User,GamePid,Shell,Wids,Options);
-
-	{GamePid,game_over,WhiteRes,BlackRes} ->
-	    game_over(WhiteRes,BlackRes),
-	    loop(User,GamePid,Shell,Wids,Options);
-
-	What ->
-            io:format('game_msg received: ~w~n',[What]),    
-	    loop(User,GamePid,Shell,Wids,Options)
-    end.
-    
-
-new_game(GamePid,Wids,Options) when is_pid(GamePid) ->
-    exit(GamePid,kill),
-    new_game(Wids,Options);
-new_game(_,Wids,Options) ->
-    new_game(Wids,Options).
-
-new_game(_Wids,Options) ->
-    label("",lastdraw),
-    Computer = element(1,Options),
-    Start = element(2,Options),
-    Depth = element(3,Options),
-    othello:new_game(Computer,Start,Depth,restart).
-
-new_mark(Pos,Colour) ->
-    Col = othello_adt:col(Pos),
-    Row = othello_adt:row(Pos),
-    Name = [Col+96,translate(Row)+48],
-    Button = get(Name),
-    butbit(Button,Colour).
-
-beep(Draw) ->
-    Col = othello_adt:col(Draw),
-    Row = othello_adt:row(Draw),
-    Name = [Col+96,translate(Row)+48],
-    Button = get(Name),
-    bell(Button).
-
-show_player(_Status,white) ->
-    label("White to draw",todraw);
-show_player(_Status,black) ->
-    label("Black to draw",todraw).
-
-write_score(_Wids,WhiteRes,BlackRes) ->
-    label(integer_to_list(BlackRes),bscore),
-    label(integer_to_list(WhiteRes),wscore).
-
-write_draw(_Wids,Draw) ->
-    Col = othello_adt:col(Draw),
-    Row = othello_adt:row(Draw),
-    label(lists:flatten(io_lib:format('{~w,~w}',[Col,Row])), lastdraw).
-
-write_options(Options,Wids) ->
-    write_colour(Options,Wids),
-    write_level(Options,Wids).
-
-write_colour(Options,Wids) ->
-    write_colour(element(1,Options),element(2,Options),Wids).
-
-write_colour(black,white,_Wids) -> label("White (begin)",colour);
-write_colour(black,black,_Wids) -> label("White",colour);
-write_colour(white,black,_Wids) -> label("Black (begin)",colour);
-write_colour(white,white,_Wids) -> label("Black",colour).
-    
-write_level(Options,_Wids) ->
-    case element(3,Options) of
-	1 -> label("Beginner",level);
-	2 -> label("Intermediate",level);
-	3 -> label("Advanced",level);
-	4 -> label("Expert",level)
-    end.
-
-cursor(_What) ->
-    done.
-%cursor(What) -> cursor(get(),What).
-
-%cursor([{[C,R],Button}|Buts],What) ->
-%    set_widget(Button,"cursor",What),
-%    cursor(Buts,What);
-%cursor([_|Buts],What) ->
-%    cursor(Buts,What);
-%cursor([],_) ->
-%    true.
-
-translate(1) -> 8;
-translate(2) -> 7;
-translate(3) -> 6;
-translate(4) -> 5;
-translate(5) -> 4;
-translate(6) -> 3;
-translate(7) -> 2;
-translate(8) -> 1.
-
-bitmap(grey)  -> bitmap_path("square.bm");
-bitmap(black) -> bitmap_path("marker.bm");
-bitmap(white) -> bitmap_path("marker.bm").
-
-bitmap_path(Bitmap) ->
-    filename:join(path(),Bitmap).
-
-xy_position([[Letter,Digit],_,_]) ->
-    LettPos = Letter - 97,
-    X = LettPos*60 ,
-    Y = (8 - list_to_integer([Digit])) * 60,
-    {X+6,Y+6};
-xy_position(X) ->
-    io:format("xy_position: ~w~n",[{error,X}]).
-
-
-board() ->
-    [["a1",grey,nil],
-     ["b1",grey,nil],
-     ["c1",grey,nil],
-     ["d1",grey,nil],
-     ["e1",grey,nil],
-     ["f1",grey,nil],
-     ["g1",grey,nil],
-     ["h1",grey,nil],
-
-     ["a2",grey,nil],
-     ["b2",grey,nil],
-     ["c2",grey,nil],
-     ["d2",grey,nil],
-     ["e2",grey,nil],
-     ["f2",grey,nil],
-     ["g2",grey,nil],
-     ["h2",grey,nil],
-
-     ["a3",grey,nil],
-     ["b3",grey,nil],
-     ["c3",grey,nil],
-     ["d3",grey,nil],
-     ["e3",grey,nil],
-     ["f3",grey,nil],
-     ["g3",grey,nil],
-     ["h3",grey,nil],
-
-     ["a4",grey,nil],
-     ["b4",grey,nil],
-     ["c4",grey,nil],
-     ["d4",white,nil],
-     ["e4",black,nil],
-     ["f4",grey,nil],
-     ["g4",grey,nil],
-     ["h4",grey,nil],
-
-     ["a5",grey,nil],
-     ["b5",grey,nil],
-     ["c5",grey,nil],
-     ["d5",black,nil],
-     ["e5",white,nil],
-     ["f5",grey,nil],
-     ["g5",grey,nil],
-     ["h5",grey,nil],
-
-     ["a6",grey,nil],
-     ["b6",grey,nil],
-     ["c6",grey,nil],
-     ["d6",grey,nil],
-     ["e6",grey,nil],
-     ["f6",grey,nil],
-     ["g6",grey,nil],
-     ["h6",grey,nil],
-
-     ["a7",grey,nil],
-     ["b7",grey,nil],
-     ["c7",grey,nil],
-     ["d7",grey,nil],
-     ["e7",grey,nil],
-     ["f7",grey,nil],
-     ["g7",grey,nil],
-     ["h7",grey,nil],
-
-     ["a8",grey,nil],
-     ["b8",grey,nil],
-     ["c8",grey,nil],
-     ["d8",grey,nil],
-     ["e8",grey,nil],
-     ["f8",grey,nil],
-     ["g8",grey,nil],
-     ["h8",grey,nil]].
-
-
-omit_draw(GamePid,Player) ->
-%    %% Find mouse coords first
-%    %% This was not possible in gs
-
-    W = 200, H = 100, Root = get(windowroot),
-    Box = gs:create(window, Root, [{title,"OMIT"}, {width, W},{height, H}]),
-    
-    mk_label_c(lists:flatten(io_lib:format('~w has to omit draw !',[Player])),
-	     Box, W, 10),
-
-    mk_button_c("Ok", Box, W, H-40, 80, 30),
-
-    gs:config(Box, {map, true}),		%Make win visible
-
-    receive
-	{gs,_, click,_,["Ok"]} ->
-	    gs:destroy(Box),
-	    GamePid ! {self(),continue}
-    end.
-
-game_over(WhiteRes,BlackRes) ->
-%    %% Find mouse coords first
-%    %% This was not possible in gs
-
-    W = 200, H = 160, 
-    Root = get(windowroot),
-    Box = gs:create(window, Root, [{title,"GAME OVER"}, 
-				   {width, W},{height, H}]),
-    
-    mk_label_c("GAME OVER", Box, W, 10),
-
-    mk_label_c(lists:flatten(io_lib:format('White score: ~w',[WhiteRes])),
-	       Box,W,40),
-    mk_label_c(lists:flatten(io_lib:format('Black score: ~w',[BlackRes])),
-	       Box,W,70),
-
-    mk_button_c("Ok", Box, W, H-40, 80, 30),
-
-    gs:config(Box, {map, true}),		%Make win visible
-
-    receive
-	{gs,_, click,_,["Ok"]} ->
-	    gs:destroy(Box)
-    end.
-
-
-
-%% ----------------------------------------------------------------
-%% Library functions.
-%% ----------------------------------------------------------------
-
-bell(Widget) ->
-    %% gs does not support bells,
-    Widget.
-
-label(Text,Label) ->
-    gs:config(Label,[{label,{text,Text}}]).
-
-%% mk_label in centered version
-mk_label_c(Label,Parent,Width,Y) ->
-    W = 8*length(Label),
-    X = trunc((Width-W)/2),
-    gs:create(label,Parent,[{width,W}, {height, 20}, {x,X}, {y,Y}, 
-			     {label, {text, Label}}]).
-
-
-
-
-setup_buttons(Shell,X,Y,W,H) ->
-    ButBox = gs:create(frame, Shell,[{x,X}, {y,Y},{bg,white},
-				     {width,W}, {height,H}]),
-    C = gs:create(canvas,ButBox,[{x,X}, {y,Y}, {width, W}, {height, H},
-				 {bg,white}]),
-    gs:create(line, C, [{coords, [{0,H-1},{W,H-1}]}]),
-
-
-    mk_button("Quit",ButBox, 10, 10, 70, 20),
-    mk_button("Rules",ButBox, 80, 10, 70, 20),
-    mk_button("Newgame",ButBox, 150, 10, 70, 20),
-    mk_button("Help",ButBox, 220, 10, 70, 20),
-%%    mk_button("Level",ButBox, 290, 10, 70, 20),
-    
-    done.
-
-    
-
-
-
-%%----------------------------------------
-%% Sets up the middle window w. all the status info in.
-%% The labels are given names:
-%% bscore, wscore, lastdraw, todraw, level and colour to simplify
-%% their frequent setting
-%%
-setup_status_box(Shell,X,Y,W,H) ->
-    F = gs:create(frame, Shell,[{x,X}, {y,Y},
-				  {width,W}, {height,H},{bg,white}]),
-    C = gs:create(canvas,F,[{x,0}, {y,0}, {width, W}, {height, H},{bg,white}]),
-    gs:create(line, C, [{coords, [{0,H-1},{W,H-1}]}]),
-
-    %% Left side
-    gs:create(label,F,[{align,w},{x,10}, {y,5}, {width, 100},
-		       {label,{text, "Black score:"}},{bg,white}]),
-    gs:create(label,bscore,F,[{align,w},{x,110}, {y,5}, {width, 40},
-			      {label,{text, "2"}},{bg,white}]),
-    gs:create(label,F,[{align,w},{x,10}, {y,35}, {width, 100},
-		       {label,{text, "White score:"}},{bg,white}]),
-    gs:create(label,wscore,F,[{align,w},{x,110}, {y,35}, {width, 40},
-			      {label,{text, "2"}},{bg,white}]),
-    gs:create(label,F,[{align,w},{x,10}, {y,65}, {width, 100},
-			      {label,{text, "Last draw:"}},{bg,white}]),
-    gs:create(label,lastdraw,F,[{align,w},{x,110}, {y,65}, {width, 40},
-				{label,{text, ""}},{bg,white}]),
-    
-
-    %% Right side
-    X2 = trunc(W/2)+10,
-    gs:create(label,todraw,F,[{align,w},{x,X2}, {y,5}, {width, 100},
-			      {label,{text, "Black to draw:"}},{bg,white}]),
-
-    gs:create(label,F,[{align,w},{x,X2}, {y,35}, {width, 80},
-			      {label,{text, "Level:"}},{bg,white}]),
-    setup_level_menu(F,X2+80,35),
-
-%%    gs:create(label,level,F,[{align,w},{x,X2+80}, {y,35}, {width, 130},
-%%			      {label,{text, "Intermediate"}},{bg,white}]),
-    gs:create(label,F,[{align,w},{x,X2}, {y,65}, {width, 80},
-			      {label,{text, "Colour:"}},{bg,white}]),
-    setup_col_menu(F,X2+80,65),
-
-%%    gs:create(label,colour,F,[{align,w},{x,X2+80}, {y,65}, {width, 120},
-%%			      {label,{text, "black (begin)"}},{bg,white}]),
-    
-    done.
-
-
-setup_col_menu(P,X,Y) ->
-    MB = gs:create(menubutton,colour,P,
-		   [{x,X}, {y,Y}, {bw,3},
-		    %%{width,W}, {height,H}, 
-		    {align,w}, {bg,white},
-		    {relief, raised},
-		    {activefg,white}, {activebg,black},
-		    {label, {text,"Colours"}}]),
-
-    M = gs:create(menu,MB,[]),
-    gs:create(menuitem,M,[{label,{text,"Black (begin)"}}]),
-    gs:create(menuitem,M,[{label,{text,"Black"}}]),
-    gs:create(menuitem,M,[{label,{text,"White (begin)"}}]),
-    gs:create(menuitem,M,[{label,{text,"White"}}]),
-    done.
-
-setup_level_menu(P,X,Y) ->
-    MB = gs:create(menubutton,level,P,
-		   [{x,X}, {y,Y},
-		    %%{width,W}, {height,H}, 
-		    {relief, raised},
-		    {activefg,white}, {activebg,black},
-		    {align,w}, {bg,white},
-		    {label, {text,"Colours"}}]),
-
-    M = gs:create(menu,MB,[]),
-    gs:create(menuitem,M,[{label,{text,"Beginner"}}]),
-    gs:create(menuitem,M,[{label,{text,"Intermediate"}}]),
-    gs:create(menuitem,M,[{label,{text,"Advanced"}}]),
-    gs:create(menuitem,M,[{label,{text,"Expert"}}]),
-    done.
-
-
-setup_board(Shell,X,Y,W,H) ->
-    F = gs:create(frame, Shell,[{x,X}, {y,Y},
-				  {width,W}, {height,H},{bg,white}]),
-    display_board(F).
-
-
-mk_button(Label, Parent, X, Y, W, H) ->
-    gs:create(button,Parent,[{width,W}, {height, H}, {x,X}, {y,Y}, 
-			     {label, {text, Label}}, {bg,white},
-			     {activefg,white}, {activebg,black}]).
-
-%% Centers a button around Width
-mk_button_c(Label, Parent, Width, Y, W, H) ->
-    X = trunc((Width-W)/2),
-    gs:create(button,Parent,[{width,W}, {height, H}, {x,X}, {y,Y}, 
-			     {label, {text, Label}}, {bg,white}]).
-
-
-butbit(Button,Col) ->
-    gs:config(Button,[
-		      {label,{image,bitmap(Col)}},
-		      {fg, Col},
-		      {activefg,Col},
-		      {label, {image, bitmap(Col)}}]),
-    Button.
-
-mk_board_butt(Top,Name,X,Y,Col) ->
-    B = gs:create(button,list_to_atom(Name), Top,
-		  [{x,X}, {y,Y}, {width,60}, {height,60},
-		   {padx,5},{pady,5},
-		   {relief,flat},
-		   {bg,?BGCOL}, {activebg,?BGCOL}]),
-    butbit(B,Col),
-    B.
-	     
-
-
-display_board(Top) ->
-    Board = board(),
-    display_board(Top,Board,1).
-
-display_board(_,_,65) -> true;
-display_board(Top,[H|T],Place) ->
-    [Name,Colour,_] = H,
-    {X,Y} = xy_position(H),
-    Button = mk_board_butt(Top,Name,X,Y,Colour),
-    %%Button = mk_button("",Name,Top,X,Y,60,60),
-    put(Name,Button),
-    %%Bitmap = bitmap(Colour),
-    %%butbit(Button,Bitmap),
-    %%set_widget(Button,"internalWidth","1"),
-    %%set_widget(Button,"internalHeight","1"),
-    %%borderWidth(2,Button),
-    display_board(Top,T,Place+1).
-    
-
diff --git a/lib/gs/contribs/othello/priv/marker.bm b/lib/gs/contribs/othello/priv/marker.bm
deleted file mode 100644
index fe7f3df820..0000000000
--- a/lib/gs/contribs/othello/priv/marker.bm
+++ /dev/null
@@ -1,43 +0,0 @@
-#define marker2_width 60
-#define marker2_height 60
-static unsigned char marker2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x0f, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xc0, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff,
-   0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0x0f, 0x00, 0x00,
-   0x00, 0x00, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff,
-   0xff, 0x3f, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
-   0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0xf8, 0xff, 0xff,
-   0xff, 0xff, 0x03, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00,
-   0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0xfe, 0xff, 0xff,
-   0xff, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x00,
-   0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x80, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0x3f, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
-   0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xc0, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0x7f, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00,
-   0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0xe0, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-   0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xe0, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-   0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xe0, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-   0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xe0, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-   0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x00, 0xc0, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0x7f, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x00,
-   0x80, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x00, 0x80, 0xff, 0xff, 0xff,
-   0xff, 0x3f, 0x3f, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x3f, 0x00,
-   0x00, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x1f, 0x00, 0x00, 0xff, 0xff, 0xff,
-   0xff, 0xcf, 0x1f, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xc7, 0x0f, 0x00,
-   0x00, 0xfc, 0xff, 0xff, 0xff, 0xe7, 0x07, 0x00, 0x00, 0xf8, 0xff, 0xff,
-   0x7f, 0xf1, 0x03, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xbf, 0xfc, 0x03, 0x00,
-   0x00, 0xf0, 0xff, 0xff, 0x59, 0xff, 0x01, 0x00, 0x00, 0xe0, 0xff, 0xff,
-   0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00,
-   0x00, 0x00, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff,
-   0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0x03, 0x00, 0x00,
-   0x00, 0x00, 0xc0, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe,
-   0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/gs/contribs/othello/priv/square.bm b/lib/gs/contribs/othello/priv/square.bm
deleted file mode 100644
index 4e6880b330..0000000000
--- a/lib/gs/contribs/othello/priv/square.bm
+++ /dev/null
@@ -1,43 +0,0 @@
-#define square_width 60
-#define square_height 60
-static unsigned char square_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/gs/test/Makefile b/lib/gs/test/Makefile
index 493770745f..067e1adbb6 100644
--- a/lib/gs/test/Makefile
+++ b/lib/gs/test/Makefile
@@ -25,7 +25,7 @@ RELSYSDIR = $(RELEASE_PATH)/gs_test
 # ----------------------------------------------------
 
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
diff --git a/lib/hipe/cerl/cerl_cconv.erl b/lib/hipe/cerl/cerl_cconv.erl
index 0fc28be5f3..ac9d01ab0e 100644
--- a/lib/hipe/cerl/cerl_cconv.erl
+++ b/lib/hipe/cerl/cerl_cconv.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2015. 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.
@@ -710,7 +710,7 @@ ren__new() ->
 ren__add(Key, Value, Ren) ->
     dict:store(Key, Value, Ren).
 
-ren__map(Key, Ren) ->  
+ren__map(Key, Ren) ->
     case dict:find(Key, Ren) of
 	{ok, Value} ->
 	    Value;
@@ -722,11 +722,14 @@ ren__map(Key, Ren) ->
 %% ---------------------------------------------------------------------
 %% State
 
--record(state, {module :: module(), function :: {atom(), arity()},
-		names, refs, defs = []}).
+-record(state, {module             :: module(),
+		function           :: {atom(), arity()} | 'undefined',
+		names = sets:new() :: sets:set(),  %% XXX: refine
+		refs  = dict:new() :: dict:dict(), %% XXX: refine
+		defs  = []}).
 
 s__new(Module) ->
-    #state{module = Module, names = sets:new(), refs = dict:new()}.
+    #state{module = Module}.
 
 s__add_function_name(Name, S) ->
     S#state{names = sets:add_element(Name, S#state.names)}.
diff --git a/lib/hipe/cerl/cerl_hipeify.erl b/lib/hipe/cerl/cerl_hipeify.erl
index 8691e80cac..6611abd204 100644
--- a/lib/hipe/cerl/cerl_hipeify.erl
+++ b/lib/hipe/cerl/cerl_hipeify.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2015. 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.
@@ -623,12 +623,12 @@ ren__map(Key, Ren) ->
 %% ---------------------------------------------------------------------
 %% State
 
-%% pmatch = 'true' | 'false' | 'no_duplicates' | 'duplicate_all'
+-type pmatch() :: 'true' | 'false' | 'no_duplicates' | 'duplicate_all'.
 
--record(state, {module::atom(),
-		function::{atom(), 0..256},
-		pmatch=true,
-		revisit = false}).
+-record(state, {module          :: module(),
+		function        :: {atom(), arity()} | 'undefined',
+		pmatch = true   :: pmatch(),
+		revisit = false :: boolean()}).
 
 s__new(Module) ->
     #state{module = Module}.
diff --git a/lib/hipe/cerl/cerl_to_icode.erl b/lib/hipe/cerl/cerl_to_icode.erl
index 97b95f2e7c..ab131c2d01 100644
--- a/lib/hipe/cerl/cerl_to_icode.erl
+++ b/lib/hipe/cerl/cerl_to_icode.erl
@@ -794,9 +794,9 @@ bitstr_gen_op([V], #ctxt{fail=FL, class=guard}, SizeInfo, ConstInfo,
 	      Type, Flags, Base, Offset) ->
     SL = new_label(),
     case SizeInfo of
-	{all,_NewUnit, NewAlign, S1} ->
+	{all, NewUnit, NewAlign, S1} ->
 	    Type = binary,
-	    Name = {bs_put_binary_all, Flags},
+	    Name = {bs_put_binary_all, NewUnit, Flags},
 	    Primop = {hipe_bs_primop, Name},
 	    {add_code([icode_guardop([Offset], Primop,
 				     [V, Base, Offset], SL, FL),
@@ -819,9 +819,9 @@ bitstr_gen_op([V], #ctxt{fail=FL, class=guard}, SizeInfo, ConstInfo,
 bitstr_gen_op([V], _Ctxt, SizeInfo, ConstInfo, Type, Flags, Base,
 	      Offset) ->
     case SizeInfo of
-	{all, _NewUnit, NewAlign, S} ->
+	{all, NewUnit, NewAlign, S} ->
 	    Type = binary,
-	    Name = {bs_put_binary_all, Flags},
+	    Name = {bs_put_binary_all, NewUnit, Flags},
 	    Primop = {hipe_bs_primop, Name},
 	    {add_code([icode_call_primop([Offset], Primop, 
 					 [V, Base, Offset])], S), 
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index c2fb79c089..7684dc4a81 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2003-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.
@@ -46,7 +46,6 @@
 		    t_bitstr/0,
 		    t_boolean/0,
 		    t_byte/0,
-		    t_char/0,
 		    t_cons/0,
 		    t_cons/2,
 		    t_cons_hd/1,
@@ -87,7 +86,6 @@
 		    t_is_port/2,
 		    t_is_maybe_improper_list/2,
 		    t_is_reference/2,
-		    t_is_string/1,
 		    t_is_subtype/2,
 		    t_is_tuple/2,
 		    t_list/0,
@@ -139,7 +137,7 @@ type(M, F, A) ->
 type(M, F, A, Xs) ->
   type(M, F, A, Xs, 'universe').
 
--type opaques() :: 'universe' | [erl_types:erl_type()].
+-type opaques() :: erl_types:opaques().
 
 -type arg_types() :: [erl_types:erl_type()].
 
@@ -552,9 +550,6 @@ type(erlang, bit_size, 1, Xs, Opaques) ->
 type(erlang, byte_size, 1, Xs, Opaques) ->
   strict(erlang, byte_size, 1, Xs,
 	 fun (_) -> t_non_neg_integer() end, Opaques);
-type(erlang, disconnect_node, 1, Xs, Opaques) ->
-  strict(erlang, disconnect_node, 1, Xs,
-         fun (_) -> t_sup([t_boolean(), t_atom('ignored')]) end, Opaques);
 %% Guard bif, needs to be here.
 %% Also much more expressive than anything you could write in a spec...
 type(erlang, element, 2, Xs, Opaques) ->
@@ -583,16 +578,9 @@ type(erlang, element, 2, Xs, Opaques) ->
 %% Guard bif, needs to be here.
 type(erlang, float, 1, Xs, Opaques) ->
   strict(erlang, float, 1, Xs, fun (_) -> t_float() end, Opaques);
-type(erlang, fun_info, 1, Xs, Opaques) ->
-  strict(erlang, fun_info, 1, Xs,
-	 fun (_) -> t_list(t_tuple([t_atom(), t_any()])) end, Opaques);
-type(erlang, get_cookie, 0, _, _Opaques) -> t_atom();  % | t_atom('nocookie')
 %% Guard bif, needs to be here.
 type(erlang, hd, 1, Xs, Opaques) ->
   strict(erlang, hd, 1, Xs, fun ([X]) -> t_cons_hd(X) end, Opaques);
-type(erlang, integer_to_list, 2, Xs, Opaques) ->
-  strict(erlang, integer_to_list, 2, Xs,
-	 fun (_) -> t_string() end, Opaques);
 type(erlang, info, 1, Xs, _) -> type(erlang, system_info, 1, Xs); % alias
 %% All type tests are guard BIF's and may be implemented in ways that
 %% cannot be expressed in a type spec, why they are kept in erl_bif_types.
@@ -796,8 +784,6 @@ type(erlang, make_tuple, 3, Xs, Opaques) ->
 	       _Other -> t_tuple()
 	     end
 	 end, Opaques);
-type(erlang, memory, 0, _, _Opaques) ->
-  t_list(t_tuple([t_atom(), t_non_neg_fixnum()]));
 type(erlang, nif_error, 1, Xs, Opaques) ->
   %% this BIF and the next one are stubs for NIFs and never return
   strict(erlang, nif_error, 1, Xs, fun (_) -> t_any() end, Opaques);
@@ -813,8 +799,6 @@ type(erlang, round, 1, Xs, Opaques) ->
   strict(erlang, round, 1, Xs, fun (_) -> t_integer() end, Opaques);
 %% Guard bif, needs to be here.
 type(erlang, self, 0, _, _Opaques) -> t_pid();
-type(erlang, set_cookie, 2, Xs, Opaques) ->
-  strict(erlang, set_cookie, 2, Xs, fun (_) -> t_atom('true') end, Opaques);
 type(erlang, setelement, 3, Xs, Opaques) ->
   strict(erlang, setelement, 3, Xs,
 	 fun ([X1, X2, X3]) ->
@@ -849,19 +833,7 @@ type(erlang, setelement, 3, Xs, Opaques) ->
 %% Guard bif, needs to be here.
 type(erlang, size, 1, Xs, Opaques) ->
   strict(erlang, size, 1, Xs, fun (_) -> t_non_neg_integer() end, Opaques);
-type(erlang, spawn, 1, Xs, Opaques) ->
-  strict(erlang, spawn, 1, Xs, fun (_) -> t_pid() end, Opaques);
-type(erlang, spawn, 2, Xs, Opaques) ->
-  strict(erlang, spawn, 2, Xs, fun (_) -> t_pid() end, Opaques);
-type(erlang, spawn, 4, Xs, Opaques) ->
-  strict(erlang, spawn, 4, Xs, fun (_) -> t_pid() end, Opaques);
-type(erlang, spawn_link, 1, Xs, _) -> type(erlang, spawn, 1, Xs);  % same
-type(erlang, spawn_link, 2, Xs, _) -> type(erlang, spawn, 2, Xs);  % same
-type(erlang, spawn_link, 4, Xs, _) -> type(erlang, spawn, 4, Xs);  % same
 type(erlang, subtract, 2, Xs, _Opaques) -> type(erlang, '--', 2, Xs); % alias
-type(erlang, suspend_process, 1, Xs, Opaques) ->
-  strict(erlang, suspend_process, 1, Xs,
-	 fun (_) -> t_atom('true') end, Opaques);
 type(erlang, system_info, 1, Xs, Opaques) ->
   strict(erlang, system_info, 1, Xs,
 	 fun ([Type]) ->
@@ -926,8 +898,7 @@ type(erlang, system_info, 1, Xs, Opaques) ->
 		     t_list(t_pid());
 		   ['os_type'] ->
 		     t_tuple([t_sup([t_atom('unix'),
-				     t_atom('win32'),
-				     t_atom('ose')]),
+				     t_atom('win32')]),
 			      t_atom()]);
 		   ['os_version'] ->
 		     t_sup(t_tuple([t_non_neg_fixnum(),
@@ -1015,10 +986,6 @@ type(erlang, tuple_to_list, 1, Xs, Opaques) ->
 		 end
 	     end
 	 end, Opaques);
-type(erlang, yield, 0, _, _Opaques) -> t_atom('true');
-%%-- ets ----------------------------------------------------------------------
-type(ets, rename, 2, Xs, Opaques) ->
-  strict(ets, rename, 2, Xs, fun ([_, Name]) -> Name end, Opaques);
 %%-- hipe_bifs ----------------------------------------------------------------
 type(hipe_bifs, add_ref, 2, Xs, Opaques) ->
   strict(hipe_bifs, add_ref, 2, Xs, fun (_) -> t_nil() end, Opaques);
@@ -1678,25 +1645,6 @@ type(lists, zipwith3, 4, Xs, Opaques) ->
 	 fun ([F,_As,_Bs,_Cs]) -> t_sup(t_list(t_fun_range(F, Opaques)),
                                         t_nil()) end, Opaques);
 
-%%-- string -------------------------------------------------------------------
-type(string, chars, 2, Xs, Opaques) ->  % NOTE: added to avoid loss of info
-  strict(string, chars, 2, Xs, fun (_) -> t_string() end, Opaques);
-type(string, chars, 3, Xs, Opaques) -> % NOTE: added to avoid loss of info
-  strict(string, chars, 3, Xs,
-	 fun ([Char, N, Tail]) ->
-	     case t_is_nil(Tail) of
-	       true ->
-		 type(string, chars, 2, [Char, N]);
-	       false ->
-		 case t_is_string(Tail) of
-		   true ->
-		     t_string();
-		   false ->
-		     t_sup(t_sup(t_string(), Tail), t_cons(Char, Tail))
-		 end
-	     end
-	 end, Opaques);
-
 %%-----------------------------------------------------------------------------
 type(M, F, A, Xs, _O) when is_atom(M), is_atom(F),
 		       is_integer(A), 0 =< A, A =< 255 ->
@@ -2200,7 +2148,7 @@ type_ranks(Type, I, Min, Max, [TypeClass|Rest], Opaques) ->
 
 type_order() ->
   [t_number(), t_atom(), t_reference(), t_fun(), t_port(), t_pid(), t_tuple(),
-   t_list(), t_binary()].
+   t_map(), t_list(), t_bitstr()].
 
 key_comparisons_fail(X0, KeyPos, TupleList, Opaques) ->
   X = case t_is_number(t_inf(X0, t_number(), Opaques), Opaques) of
@@ -2300,9 +2248,7 @@ arg_types(erlang, bit_size, 1) ->
   [t_bitstr()];
 %% Guard bif, needs to be here.
 arg_types(erlang, byte_size, 1) ->
-  [t_binary()];
-arg_types(erlang, disconnect_node, 1) ->
-  [t_node()];
+  [t_bitstr()];
 arg_types(erlang, halt, 0) ->
   [];
 arg_types(erlang, halt, 1) ->
@@ -2322,17 +2268,11 @@ arg_types(erlang, element, 2) ->
 %% Guard bif, needs to be here.
 arg_types(erlang, float, 1) ->
   [t_number()];
-arg_types(erlang, fun_info, 1) ->
-  [t_fun()];
-arg_types(erlang, get_cookie, 0) ->
-  [];
 %% Guard bif, needs to be here.
 arg_types(erlang, hd, 1) ->
   [t_cons()];
 arg_types(erlang, info, 1) ->
   arg_types(erlang, system_info, 1); % alias
-arg_types(erlang, integer_to_list, 2) ->
-  [t_integer(), t_from_range(2, 36)];
 arg_types(erlang, is_atom, 1) ->
   [t_any()];
 arg_types(erlang, is_binary, 1) ->
@@ -2379,8 +2319,6 @@ arg_types(erlang, make_tuple, 2) ->
   [t_non_neg_fixnum(), t_any()];  % the value 0 is OK as first argument
 arg_types(erlang, make_tuple, 3) ->
   [t_non_neg_fixnum(), t_any(), t_list(t_tuple([t_pos_integer(), t_any()]))];
-arg_types(erlang, memory, 0) ->
-  [];
 arg_types(erlang, nif_error, 1) ->
   [t_any()];
 arg_types(erlang, nif_error, 2) ->
@@ -2397,29 +2335,13 @@ arg_types(erlang, round, 1) ->
 %% Guard bif, needs to be here.
 arg_types(erlang, self, 0) ->
   [];
-arg_types(erlang, set_cookie, 2) ->
-  [t_node(), t_atom()];
 arg_types(erlang, setelement, 3) ->
   [t_pos_integer(), t_tuple(), t_any()];
 %% Guard bif, needs to be here.
 arg_types(erlang, size, 1) ->
   [t_sup(t_tuple(), t_binary())];
-arg_types(erlang, spawn, 1) -> %% TODO: Tuple?
-  [t_fun()];
-arg_types(erlang, spawn, 2) -> %% TODO: Tuple?
-  [t_node(), t_fun()];
-arg_types(erlang, spawn, 4) -> %% TODO: Tuple?
-  [t_node(), t_atom(), t_atom(), t_list()];
-arg_types(erlang, spawn_link, 1) ->
-  arg_types(erlang, spawn, 1);  % same
-arg_types(erlang, spawn_link, 2) ->
-  arg_types(erlang, spawn, 2);  % same
-arg_types(erlang, spawn_link, 4) ->
-  arg_types(erlang, spawn, 4);  % same
 arg_types(erlang, subtract, 2) ->
   arg_types(erlang, '--', 2);
-arg_types(erlang, suspend_process, 1) ->
-  [t_pid()];
 arg_types(erlang, system_info, 1) ->
   [t_sup([t_atom(),                     % documented
 	  t_tuple([t_atom(), t_any()]), % documented
@@ -2438,11 +2360,6 @@ arg_types(erlang, tuple_size, 1) ->
   [t_tuple()];
 arg_types(erlang, tuple_to_list, 1) ->
   [t_tuple()];
-arg_types(erlang, yield, 0) ->
-  [];
-%%------- ets -----------------------------------------------------------------
-arg_types(ets, rename, 2) ->
-  [t_atom(), t_atom()];
 %%------- hipe_bifs -----------------------------------------------------------
 arg_types(hipe_bifs, add_ref, 2) ->
   [t_mfa(), t_tuple([t_mfa(),
@@ -2639,13 +2556,6 @@ arg_types(lists, zipwith, 3) ->
   [t_fun([t_any(), t_any()], t_any()), t_list(), t_list()];
 arg_types(lists, zipwith3, 4) ->
   [t_fun([t_any(), t_any(), t_any()], t_any()), t_list(), t_list(), t_list()];
-
-%%------- string --------------------------------------------------------------
-arg_types(string, chars, 2) ->
-  [t_char(), t_non_neg_integer()];
-arg_types(string, chars, 3) ->
-  [t_char(), t_non_neg_integer(), t_any()];
-%%-----------------------------------------------------------------------------
 arg_types(M, F, A) when is_atom(M), is_atom(F),
 			is_integer(A), 0 =< A, A =< 255 ->
   unknown.                     % safe approximation for all functions.
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index 7a2abc226f..fae12d7421 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -140,7 +140,6 @@
 	 t_is_port/1, t_is_port/2,
 	 t_is_maybe_improper_list/1, t_is_maybe_improper_list/2,
 	 t_is_reference/1, t_is_reference/2,
-	 t_is_remote/1,
 	 t_is_string/1,
 	 t_is_subtype/2,
 	 t_is_tuple/1, t_is_tuple/2,
@@ -173,14 +172,12 @@
 	 t_number_vals/1, t_number_vals/2,
 	 t_opaque_from_records/1,
 	 t_opaque_structure/1,
-	 %% t_parameterized_module/0,
 	 t_pid/0,
 	 t_port/0,
 	 t_maybe_improper_list/0,
 	 %% t_maybe_improper_list/2,
 	 t_product/1,
 	 t_reference/0,
-	 t_remote/3,
 	 t_string/0,
 	 t_struct_from_opaque/2,
 	 t_subst/2,
@@ -208,7 +205,6 @@
 	 type_is_defined/4,
 	 record_field_diffs_to_string/2,
 	 subst_all_vars_to_any/1,
-         subst_all_remote/2,
          lift_list_to_pos_empty/1, lift_list_to_pos_empty/2,
          is_opaque_type/2,
 	 is_erl_type/1,
@@ -228,7 +224,7 @@
 -export([t_is_identifier/1]).
 -endif.
 
--export_type([erl_type/0, type_table/0, var_table/0]).
+-export_type([erl_type/0, opaques/0, type_table/0, var_table/0]).
 
 %%-define(DEBUG, true).
 
@@ -280,7 +276,6 @@
 -define(number_tag,     number).
 -define(opaque_tag,     opaque).
 -define(product_tag,    product).
--define(remote_tag,     remote).
 -define(tuple_set_tag,  tuple_set).
 -define(tuple_tag,      tuple).
 -define(union_tag,      union).
@@ -288,7 +283,7 @@
 
 -type tag()  :: ?atom_tag | ?binary_tag | ?function_tag | ?identifier_tag
               | ?list_tag | ?map_tag | ?matchstate_tag | ?nil_tag | ?number_tag
-              | ?opaque_tag | ?product_tag | ?remote_tag
+              | ?opaque_tag | ?product_tag
               | ?tuple_tag | ?tuple_set_tag | ?union_tag | ?var_tag.
 
 -define(float_qual,     float).
@@ -320,7 +315,7 @@
 %% Auxiliary types and convenient macros
 %%
 
--type parse_form() :: {atom(), _, _} | {atom(), _, _, _} | {'op', _, _, _, _}. %% XXX: Temporarily
+-type parse_form() :: erl_parse:abstract_expr().
 -type rng_elem()   :: 'pos_inf' | 'neg_inf' | integer().
 
 -record(int_set, {set :: [integer()]}).
@@ -330,7 +325,6 @@
 %% was updated to 2.7 due to this change.
 -record(opaque,  {mod :: module(), name :: atom(),
 		  args = [] :: [erl_type()], struct :: erl_type()}).
--record(remote,  {mod:: module(), name :: atom(), args = [] :: [erl_type()]}).
 
 -define(atom(Set),                 #c{tag=?atom_tag, elements=Set}).
 -define(bitstr(Unit, Base),        #c{tag=?binary_tag, elements=[Unit,Base]}).
@@ -350,7 +344,6 @@
 -define(map(Pairs),                #c{tag=?map_tag, elements=Pairs}).
 -define(opaque(Optypes),           #c{tag=?opaque_tag, elements=Optypes}).
 -define(product(Types),            #c{tag=?product_tag, elements=Types}).
--define(remote(RemTypes),          #c{tag=?remote_tag, elements=RemTypes}).
 -define(tuple(Types, Arity, Qual), #c{tag=?tuple_tag, elements=Types, 
 				      qualifier={Arity, Qual}}).
 -define(tuple_set(Tuples),         #c{tag=?tuple_set_tag, elements=Tuples}).
@@ -371,8 +364,8 @@
 -type type_key()     :: {'type' | 'opaque', atom(), arity()}.
 -type record_value() :: [{atom(), erl_parse:abstract_expr(), erl_type()}].
 -type type_value()   :: {module(), erl_type(), atom()}.
--type type_table() :: dict:dict(record_key(), record_value())
-                    | dict:dict(type_key(), type_value()).
+-type type_table() :: dict:dict(record_key() | type_key(),
+                                record_value() | type_value()).
 
 -type var_table() :: dict:dict(atom(), erl_type()).
 
@@ -380,19 +373,18 @@
 %% Unions
 %%
 
--define(union(List), #c{tag=?union_tag, elements=[_,_,_,_,_,_,_,_,_,_,_]=List}).
-
--define(atom_union(T),       ?union([T,?none,?none,?none,?none,?none,?none,?none,?none,?none,?none])).
--define(bitstr_union(T),     ?union([?none,T,?none,?none,?none,?none,?none,?none,?none,?none,?none])).
--define(function_union(T),   ?union([?none,?none,T,?none,?none,?none,?none,?none,?none,?none,?none])).
--define(identifier_union(T), ?union([?none,?none,?none,T,?none,?none,?none,?none,?none,?none,?none])).
--define(list_union(T),       ?union([?none,?none,?none,?none,T,?none,?none,?none,?none,?none,?none])).
--define(number_union(T),     ?union([?none,?none,?none,?none,?none,T,?none,?none,?none,?none,?none])).
--define(tuple_union(T),      ?union([?none,?none,?none,?none,?none,?none,T,?none,?none,?none,?none])).
--define(matchstate_union(T), ?union([?none,?none,?none,?none,?none,?none,?none,T,?none,?none,?none])).
--define(opaque_union(T),     ?union([?none,?none,?none,?none,?none,?none,?none,?none,T,?none,?none])).
--define(remote_union(T),     ?union([?none,?none,?none,?none,?none,?none,?none,?none,?none,T,?none])).
--define(map_union(T),        ?union([?none,?none,?none,?none,?none,?none,?none,?none,?none,?none,T])).
+-define(union(List), #c{tag=?union_tag, elements=[_,_,_,_,_,_,_,_,_,_]=List}).
+
+-define(atom_union(T),       ?union([T,?none,?none,?none,?none,?none,?none,?none,?none,?none])).
+-define(bitstr_union(T),     ?union([?none,T,?none,?none,?none,?none,?none,?none,?none,?none])).
+-define(function_union(T),   ?union([?none,?none,T,?none,?none,?none,?none,?none,?none,?none])).
+-define(identifier_union(T), ?union([?none,?none,?none,T,?none,?none,?none,?none,?none,?none])).
+-define(list_union(T),       ?union([?none,?none,?none,?none,T,?none,?none,?none,?none,?none])).
+-define(number_union(T),     ?union([?none,?none,?none,?none,?none,T,?none,?none,?none,?none])).
+-define(tuple_union(T),      ?union([?none,?none,?none,?none,?none,?none,T,?none,?none,?none])).
+-define(matchstate_union(T), ?union([?none,?none,?none,?none,?none,?none,?none,T,?none,?none])).
+-define(opaque_union(T),     ?union([?none,?none,?none,?none,?none,?none,?none,?none,T,?none])).
+-define(map_union(T),        ?union([?none,?none,?none,?none,?none,?none,?none,?none,?none,T])).
 -define(integer_union(T),    ?number_union(T)).
 -define(float_union(T),      ?number_union(T)).
 -define(nil_union(T),        ?list_union(T)).
@@ -679,8 +671,8 @@ list_decorate(List, L, Opaques) ->
 
 union_decorate(U1, U2, Opaques) ->
   Union = union_decorate(U1, U2, Opaques, 0, []),
-  [A,B,F,I,L,N,T,M,_,_R,Map] = U1,
-  [_,_,_,_,_,_,_,_,Opaque,_,_] = U2,
+  [A,B,F,I,L,N,T,M,_,Map] = U1,
+  [_,_,_,_,_,_,_,_,Opaque,_] = U2,
   List = [A,B,F,I,L,N,T,M,Map],
   DecList = [Dec ||
               E <- List,
@@ -792,21 +784,6 @@ list_struct_from_opaque(Types, Opaques) ->
   [t_struct_from_opaque(Type, Opaques) || Type <- Types].
 
 %%-----------------------------------------------------------------------------
-%% Remote types: these types are used for preprocessing;
-%% they should never reach the analysis stage.
-
--spec t_remote(atom(), atom(), [erl_type()]) -> erl_type().
-
-t_remote(Mod, Name, Args) ->
-  ?remote(set_singleton(#remote{mod = Mod, name = Name, args = Args})).
-
--spec t_is_remote(erl_type()) -> boolean().
-
-t_is_remote(Type) ->
-  do_opaque(Type, 'universe', fun is_remote/1).
-
-is_remote(?remote(_)) -> true;
-is_remote(_) -> false.
 
 -type mod_records() :: dict:dict(module(), type_table()).
 
@@ -1807,7 +1784,7 @@ t_mfa() ->
 -spec t_module() -> erl_type().
 
 t_module() ->
-  t_sup(t_atom(), t_parameterized_module()).
+  t_atom().
 
 -spec t_node() -> erl_type().
 
@@ -1833,11 +1810,6 @@ t_iolist(N, T) when N > 0 ->
 t_iolist(0, T) ->
   t_maybe_improper_list(t_any(), t_sup(T, t_nil())).
 
--spec t_parameterized_module() -> erl_type().
-
-t_parameterized_module() ->
-  t_tuple().
-
 -spec t_timeout() -> erl_type().
 
 t_timeout() ->
@@ -2178,8 +2150,6 @@ t_sup(?opaque(Set1), ?opaque(Set2)) ->
 %%  io:format("Debug: t_sup executed with args ~w and ~w~n",[T1, T2]), ?none;
 %%t_sup(T1, T2=?opaque(_,_,_)) ->
 %%  io:format("Debug: t_sup executed with args ~w and ~w~n",[T1, T2]), ?none;
-t_sup(?remote(Set1), ?remote(Set2)) ->
-  ?remote(set_union_no_limit(Set1, Set2));
 t_sup(?matchstate(Pres1, Slots1), ?matchstate(Pres2, Slots2)) ->
   ?matchstate(t_sup(Pres1, Pres2), t_sup(Slots1, Slots2));
 t_sup(?nil, ?nil) -> ?nil;
@@ -2373,7 +2343,6 @@ force_union(T = ?list(_, _, _)) ->    ?list_union(T);
 force_union(T = ?nil) ->              ?list_union(T);
 force_union(T = ?number(_, _)) ->     ?number_union(T);
 force_union(T = ?opaque(_)) ->        ?opaque_union(T);
-force_union(T = ?remote(_)) ->        ?remote_union(T);
 force_union(T = ?map(_)) ->           ?map_union(T);
 force_union(T = ?tuple(_, _, _)) ->   ?tuple_union(T);
 force_union(T = ?tuple_set(_)) ->     ?tuple_union(T);
@@ -2450,8 +2419,7 @@ t_inf(T1, T2) ->
   t_inf(T1, T2, 'universe').
 
 %% 'match' should be used from t_find_unknown_opaque() only
--type t_inf_opaques() :: 'universe'
-                       | [erl_type()] | {'match', [erl_type() | 'universe']}.
+-type t_inf_opaques() :: opaques() | {'match', [erl_type() | 'universe']}.
 
 -spec t_inf(erl_type(), erl_type(), t_inf_opaques()) -> erl_type().
 
@@ -2886,8 +2854,8 @@ inf_tuples_in_sets2(_, [], Acc, _Opaques) -> lists:reverse(Acc).
 inf_union(U1, U2, Opaques) ->
   OpaqueFun =
     fun(Union1, Union2, InfFun) ->
-	[_,_,_,_,_,_,_,_,Opaque,_,_] = Union1,
-        [A,B,F,I,L,N,T,M,_,_R,Map] = Union2,
+	[_,_,_,_,_,_,_,_,Opaque,_] = Union1,
+        [A,B,F,I,L,N,T,M,_,Map] = Union2,
         List = [A,B,F,I,L,N,T,M,Map],
         inf_union_collect(List, Opaque, InfFun, [], [])
     end,
@@ -3066,18 +3034,6 @@ t_subst_aux(?union(List), VarMap) ->
   ?union([t_subst_aux(E, VarMap) || E <- List]);
 t_subst_aux(T, _VarMap) ->
   T.
-	      
--spec subst_all_remote(erl_type(), erl_type()) -> erl_type().
-
-subst_all_remote(Type0, Substitute) ->
-  Map =
-    fun(Type) ->
-        case t_is_remote(Type) of
-          true -> Substitute;
-          false -> Type
-        end
-    end,
-  t_map(Map, Type0).
 
 %%-----------------------------------------------------------------------------
 %% Unification
@@ -3181,11 +3137,11 @@ unify_union1(?union(List), T1, T2) ->
   end.
 
 unify_union(List) ->
-  [A,B,F,I,L,N,T,M,O,R,Map] = List,
+  [A,B,F,I,L,N,T,M,O,Map] = List,
   if O =:= ?none -> no;
     true ->
       S = t_opaque_structure(O),
-      {yes, t_sup([A,B,F,I,L,N,T,M,S,R,Map])}
+      {yes, t_sup([A,B,F,I,L,N,T,M,S,Map])}
   end.
 
 -spec is_opaque_type(erl_type(), [erl_type()]) -> boolean().
@@ -3543,10 +3499,10 @@ t_subtract_lists([], [], Acc) ->
 -spec subtract_union([erl_type(),...], [erl_type(),...]) -> erl_type().
 
 subtract_union(U1, U2) ->
-  [A1,B1,F1,I1,L1,N1,T1,M1,O1,R1,Map1] = U1,
-  [A2,B2,F2,I2,L2,N2,T2,M2,O2,R2,Map2] = U2,
-  List1 = [A1,B1,F1,I1,L1,N1,T1,M1,?none,R1,Map1],
-  List2 = [A2,B2,F2,I2,L2,N2,T2,M2,?none,R2,Map2],
+  [A1,B1,F1,I1,L1,N1,T1,M1,O1,Map1] = U1,
+  [A2,B2,F2,I2,L2,N2,T2,M2,O2,Map2] = U2,
+  List1 = [A1,B1,F1,I1,L1,N1,T1,M1,?none,Map1],
+  List2 = [A2,B2,F2,I2,L2,N2,T2,M2,?none,Map2],
   Sub1 = subtract_union(List1, List2, 0, []),
   O = if O1 =:= ?none -> O1;
          true -> t_subtract(O1, ?union(U2))
@@ -3641,7 +3597,7 @@ t_is_instance(ConcreteType, Type) ->
 t_unopaque(T) ->
   t_unopaque(T, 'universe').
 
--spec t_unopaque(erl_type(), 'universe' | [erl_type()]) -> erl_type().
+-spec t_unopaque(erl_type(), opaques()) -> erl_type().
 
 t_unopaque(?opaque(_) = T, Opaques) ->
   case Opaques =:= 'universe' orelse is_opaque_type(T, Opaques) of
@@ -3662,7 +3618,7 @@ t_unopaque(?product(Types), Opaques) ->
   ?product([t_unopaque(T, Opaques) || T <- Types]);
 t_unopaque(?function(Domain, Range), Opaques) ->
   ?function(t_unopaque(Domain, Opaques), t_unopaque(Range, Opaques));
-t_unopaque(?union([A,B,F,I,L,N,T,M,O,R,Map]), Opaques) ->
+t_unopaque(?union([A,B,F,I,L,N,T,M,O,Map]), Opaques) ->
   UL = t_unopaque(L, Opaques),
   UT = t_unopaque(T, Opaques),
   UF = t_unopaque(F, Opaques),
@@ -3671,7 +3627,7 @@ t_unopaque(?union([A,B,F,I,L,N,T,M,O,R,Map]), Opaques) ->
               ?opaque(_) = O1 -> {O1, []};
               Type -> {?none, [Type]}
             end,
-  t_sup([?union([A,B,UF,I,UL,N,UT,M,OF,R,UMap])|UO]);
+  t_sup([?union([A,B,UF,I,UL,N,UT,M,OF,UMap])|UO]);
 t_unopaque(T, _) ->
   T.
 
@@ -3938,16 +3894,6 @@ t_to_string(?float, _RecDict) -> "float()";
 t_to_string(?number(?any, ?unknown_qual), _RecDict) -> "number()";
 t_to_string(?product(List), RecDict) -> 
   "<" ++ comma_sequence(List, RecDict) ++ ">";
-t_to_string(?remote(Set), RecDict) ->
-  string:join([case Args =:= [] of
-		 true  -> flat_format("~w:~w()", [Mod, Name]);
-		 false ->
-		   ArgString = comma_sequence(Args, RecDict),
-		   flat_format("~w:~w(~s)", [Mod, Name, ArgString])
-	       end
-	       || #remote{mod = Mod, name = Name, args = Args} <-
-		    set_to_list(Set)],
-	      " | ");
 t_to_string(?map(Pairs), RecDict) ->
     "#{" ++ map_pairs_to_string(Pairs,RecDict) ++ "}";
 t_to_string(?tuple(?any, ?any, ?any), _RecDict) -> "tuple()";
@@ -3980,18 +3926,17 @@ record_to_string(Tag, [_|Fields], FieldNames, RecDict) ->
   FieldStrings = record_fields_to_string(Fields, FieldNames, RecDict, []),
   "#" ++ atom_to_string(Tag) ++ "{" ++ string:join(FieldStrings, ",") ++ "}".
 
-record_fields_to_string([F|Fs], [{FName, _Abstr, _DefType}|FDefs],
+record_fields_to_string([F|Fs], [{FName, _Abstr, DefType}|FDefs],
                         RecDict, Acc) ->
   NewAcc =
-    case t_is_equal(F, t_any()) orelse t_is_any_atom('undefined', F) of
+    case
+      t_is_equal(F, t_any()) orelse
+      (t_is_any_atom('undefined', F) andalso
+       not t_is_none(t_inf(F, DefType)))
+    of
       true -> Acc;
       false ->
 	StrFV = atom_to_string(FName) ++ "::" ++ t_to_string(F, RecDict),
-	%% ActualDefType = t_subtract(DefType, t_atom('undefined')),
-	%% Str = case t_is_any(ActualDefType) of
-	%% 	  true -> StrFV;
-	%% 	  false -> StrFV ++ "::" ++ t_to_string(ActualDefType, RecDict)
-	%%	end,
 	[StrFV|Acc]
     end,
   record_fields_to_string(Fs, FDefs, RecDict, NewAcc);
@@ -4831,13 +4776,13 @@ do_opaque(?opaque(_) = Type, Opaques, Pred) ->
     false -> Pred(Type)
   end;
 do_opaque(?union(List) = Type, Opaques, Pred) ->
-  [A,B,F,I,L,N,T,M,O,R,Map] = List,
+  [A,B,F,I,L,N,T,M,O,Map] = List,
   if O =:= ?none -> Pred(Type);
     true ->
       case Opaques =:= 'universe' orelse is_opaque_type(O, Opaques) of
         true ->
           S = t_opaque_structure(O),
-          do_opaque(t_sup([A,B,F,I,L,N,T,M,S,R,Map]), Opaques, Pred);
+          do_opaque(t_sup([A,B,F,I,L,N,T,M,S,Map]), Opaques, Pred);
         false -> Pred(Type)
       end
   end;
@@ -4871,10 +4816,6 @@ set_union(S1, S2)  ->
     _ -> ?any
   end.
 
-set_union_no_limit(?any, _) -> ?any;
-set_union_no_limit(_, ?any) -> ?any;
-set_union_no_limit(S1, S2)  -> ordsets:union(S1, S2).
-
 %% The intersection and subtraction can return ?none. 
 %% This should always be handled right away since ?none is not a valid set.
 %% However, ?any is considered a valid set.
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index b5b13948e9..761b4d9f90 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -31,6 +31,70 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
+<section><title>Hipe 3.15</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix pretty printing of Core Maps</p>
+          <p>
+	    Literal maps could cause Dialyzer to crash when pretty
+	    printing the results.</p>
+          <p>
+	    Own Id: OTP-13238</p>
+        </item>
+        <item>
+          <p>
+	    Dialyzer warnings removed.</p>
+          <p>
+	    Own Id: OTP-13379</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fix HiPE ErLLVM code generation for pattern matching with
+	    UTF binaries.</p>
+          <p>
+	    Own Id: OTP-13269</p>
+        </item>
+        <item>
+          <p>
+	    Fix various binary construction inconsistencies for hipe
+	    compiled code. <list> <item>Passing bad field sizes to
+	    binary constructions would throw <c>badarith</c> rather
+	    than <c>badarg</c>. Worse, in guards, when the unit size
+	    of the field was 1, the exception would leak rather than
+	    failing the function clause match.</item> <item>Passing
+	    bignums as field sizes to binary constructions would
+	    always fail (and always with <c>badarg</c>).</item>
+	    <item>A bug in bs_init_bits that cased binary
+	    constructions to fail with system_limit if they were at
+	    least 1/8th of the actual limit.</item> <item>Compiler
+	    crashes when matches against an integer literal whose
+	    size fits an unsigned word, but not a signed word or
+	    matches against an integer literal that whose size is
+	    larger than the largest allowed bignum.</item> <item>Very
+	    large binary constructions that should fail with
+	    system_limit could instead fail with <c>badarg</c> or
+	    even succeed with a faulty result.</item> <item>Add
+	    missing check for unit size match when inserting a
+	    binary. For example, a faulty expression like
+	    <c>&lt;&lt;&lt;&lt;1:7&gt;&gt;/binary&gt;&gt;</c> would
+	    succeed.</item> </list></p>
+          <p>
+	    Own Id: OTP-13272</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Hipe 3.14</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/hipe/flow/cfg.hrl b/lib/hipe/flow/cfg.hrl
index f79fff4efe..641ec102db 100644
--- a/lib/hipe/flow/cfg.hrl
+++ b/lib/hipe/flow/cfg.hrl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2015. 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.
@@ -34,11 +34,13 @@
 %%
 -record(cfg_info, {'fun'         :: mfa(),
                    start_label   :: cfg_lbl(),
+                   %% TODO: merge is_closure and closure_arity into one field
                    is_closure    :: boolean(),
-                   closure_arity :: arity(),
+                   closure_arity = none :: 'none' | arity(),
                    is_leaf       :: boolean(),
                    params,     % :: list()
                    info = []}).  %% this field seems not needed; take out??
+-type cfg_info() :: #cfg_info{}.
 
 %%
 %% Data is a triple with a dict of constants, a list of labels and an integer
@@ -49,6 +51,6 @@
 %% The following is to be used by other modules
 %%
 -record(cfg, {table = gb_trees:empty() :: gb_trees:tree(),
-              info                     :: #cfg_info{},
+              info                     :: cfg_info(),
               data                     :: cfg_data()}).
 -type cfg() :: #cfg{}.
diff --git a/lib/hipe/icode/hipe_beam_to_icode.erl b/lib/hipe/icode/hipe_beam_to_icode.erl
index 0c7bdb788a..37c6ba9c60 100644
--- a/lib/hipe/icode/hipe_beam_to_icode.erl
+++ b/lib/hipe/icode/hipe_beam_to_icode.erl
@@ -881,6 +881,15 @@ trans_fun([{bs_init_bits,{f,Lbl},Size,_Words,_LiveRegs,{field_flags,Flags0},X}|
 trans_fun([{bs_add, {f,Lbl}, [Old,New,Unit], Res}|Instructions], Env) ->
   Dst = mk_var(Res),
   Temp = mk_var(new),
+  {FailLblName, FailCode} =
+    if Lbl =:= 0 ->
+	FailLbl = mk_label(new),
+	{hipe_icode:label_name(FailLbl),
+	 [FailLbl,
+	  hipe_icode:mk_fail([hipe_icode:mk_const(badarg)], error)]};
+       true ->
+	{map_label(Lbl), []}
+    end,
   MultIs =
     case {New,Unit} of
       {{integer, NewInt}, _} ->
@@ -890,40 +899,26 @@ trans_fun([{bs_add, {f,Lbl}, [Old,New,Unit], Res}|Instructions], Env) ->
 	[hipe_icode:mk_move(Temp, NewVar)];
       _ ->
 	NewVar = mk_var(New),
-	if Lbl =:= 0 ->
-	    [hipe_icode:mk_primop([Temp], '*', 
-				  [NewVar, hipe_icode:mk_const(Unit)])];
-	   true ->
-	    Succ = mk_label(new),
-	    [hipe_icode:mk_primop([Temp], '*', 
-				  [NewVar, hipe_icode:mk_const(Unit)],
-				  hipe_icode:label_name(Succ), map_label(Lbl)),
-	     Succ]
-	end
+	Succ = mk_label(new),
+	[hipe_icode:mk_primop([Temp], '*',
+			      [NewVar, hipe_icode:mk_const(Unit)],
+			      hipe_icode:label_name(Succ), FailLblName),
+	 Succ]
     end,
   Succ2 = mk_label(new),
-  {FailLblName, FailCode} = 
-    if Lbl =:= 0 ->
-	FailLbl = mk_label(new),
-	{hipe_icode:label_name(FailLbl),
-	 [FailLbl,
-	  hipe_icode:mk_fail([hipe_icode:mk_const(badarg)], error)]};
-       true ->
-	{map_label(Lbl), []}
-    end,
   IsPos = 
     [hipe_icode:mk_if('>=', [Temp, hipe_icode:mk_const(0)], 
 		      hipe_icode:label_name(Succ2), FailLblName)] ++
-    FailCode ++ [Succ2], 
-  AddI =
+    FailCode ++ [Succ2],
+  AddRhs =
     case Old of
-      {integer,OldInt} ->
-	hipe_icode:mk_primop([Dst], '+', [Temp, hipe_icode:mk_const(OldInt)]);
-      _ ->
-	OldVar = mk_var(Old),
-	hipe_icode:mk_primop([Dst], '+', [Temp, OldVar])
+      {integer,OldInt} -> hipe_icode:mk_const(OldInt);
+      _ -> mk_var(Old)
     end,
-  MultIs ++ IsPos ++ [AddI|trans_fun(Instructions, Env)];
+  Succ3 = mk_label(new),
+  AddI = hipe_icode:mk_primop([Dst], '+', [Temp, AddRhs],
+			      hipe_icode:label_name(Succ3), FailLblName),
+  MultIs ++ IsPos ++ [AddI,Succ3|trans_fun(Instructions, Env)];
 %%--------------------------------------------------------------------
 %% Bit syntax instructions added in R12B-5 (Fall 2008)
 %%--------------------------------------------------------------------
@@ -1306,7 +1301,7 @@ trans_bin([{bs_put_binary,{f,Lbl},Size,Unit,{field_flags,Flags},Source}|
   {Name, Args, Env2} =
     case Size of
       {atom,all} -> %% put all bits
-	{{bs_put_binary_all, Flags}, [Src,Base,Offset], Env};
+	{{bs_put_binary_all, Unit, Flags}, [Src,Base,Offset], Env};
       {integer,NoBits} when is_integer(NoBits), NoBits >= 0 ->
 	%% Create a N*Unit bits subbinary
 	{{bs_put_binary, NoBits*Unit, Flags}, [Src,Base,Offset], Env};
diff --git a/lib/hipe/icode/hipe_icode.erl b/lib/hipe/icode/hipe_icode.erl
index 5c7003b0ed..07d230491d 100644
--- a/lib/hipe/icode/hipe_icode.erl
+++ b/lib/hipe/icode/hipe_icode.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2015. 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.
@@ -631,59 +631,59 @@ mk_icode(Fun, Params, IsClosure, IsLeaf, Code, VarRange, LabelRange) ->
 
 -spec mk_icode(mfa(), [icode_var()], boolean(), boolean(), [icode_instr()],
 	       hipe_consttab(), {non_neg_integer(),non_neg_integer()}, 
-	       {icode_lbl(),icode_lbl()}) -> #icode{}.
+	       {icode_lbl(),icode_lbl()}) -> icode().
 mk_icode(Fun, Params, IsClosure, IsLeaf, Code, Data, VarRange, LabelRange) ->
   #icode{'fun'=Fun, params=Params, code=Code,
 	 data=Data, is_closure=IsClosure, is_leaf=IsLeaf,
 	 var_range=VarRange, label_range=LabelRange}.
 
--spec icode_fun(#icode{}) -> mfa().
+-spec icode_fun(icode()) -> mfa().
 icode_fun(#icode{'fun' = MFA}) -> MFA.
 
--spec icode_params(#icode{}) -> [icode_var()].
+-spec icode_params(icode()) -> [icode_var()].
 icode_params(#icode{params = Params}) -> Params.
 
--spec icode_params_update(#icode{}, [icode_var()]) -> #icode{}.
+-spec icode_params_update(icode(), [icode_var()]) -> icode().
 icode_params_update(Icode, Params) -> 
   Icode#icode{params = Params}.
 
--spec icode_is_closure(#icode{}) -> boolean().
+-spec icode_is_closure(icode()) -> boolean().
 icode_is_closure(#icode{is_closure = Closure}) -> Closure.
 
--spec icode_is_leaf(#icode{}) -> boolean().
+-spec icode_is_leaf(icode()) -> boolean().
 icode_is_leaf(#icode{is_leaf = Leaf}) -> Leaf.
 
--spec icode_code(#icode{}) -> icode_instrs().
+-spec icode_code(icode()) -> icode_instrs().
 icode_code(#icode{code = Code}) -> Code.
 
--spec icode_code_update(#icode{}, icode_instrs()) -> #icode{}.
+-spec icode_code_update(icode(), icode_instrs()) -> icode().
 icode_code_update(Icode, NewCode) -> 
   Vmax = highest_var(NewCode),
   Lmax = highest_label(NewCode),
   Icode#icode{code = NewCode, var_range = {0,Vmax}, label_range = {0,Lmax}}.
 
--spec icode_data(#icode{}) -> hipe_consttab().
+-spec icode_data(icode()) -> hipe_consttab().
 icode_data(#icode{data=Data}) -> Data.
 
-%% %% -spec icode_data_update(#icode{}, hipe_consttab()) -> #icode{}.
+%% %% -spec icode_data_update(icode(), hipe_consttab()) -> icode().
 %% icode_data_update(Icode, NewData) -> Icode#icode{data=NewData}.
 
--spec icode_var_range(#icode{}) -> {non_neg_integer(), non_neg_integer()}.
+-spec icode_var_range(icode()) -> {non_neg_integer(), non_neg_integer()}.
 icode_var_range(#icode{var_range = VarRange}) -> VarRange.
 
--spec icode_label_range(#icode{}) -> {non_neg_integer(), non_neg_integer()}.
+-spec icode_label_range(icode()) -> {non_neg_integer(), non_neg_integer()}.
 icode_label_range(#icode{label_range = LabelRange}) -> LabelRange.
 
--spec icode_info(#icode{}) -> icode_info().
+-spec icode_info(icode()) -> icode_info().
 icode_info(#icode{info = Info}) -> Info.
 
--spec icode_info_update(#icode{}, icode_info()) -> #icode{}.
+-spec icode_info_update(icode(), icode_info()) -> icode().
 icode_info_update(Icode, Info) -> Icode#icode{info = Info}.
 
--spec icode_closure_arity(#icode{}) -> arity().
+-spec icode_closure_arity(icode()) -> arity().
 icode_closure_arity(#icode{closure_arity = Arity}) -> Arity.
 
--spec icode_closure_arity_update(#icode{}, arity()) -> #icode{}.
+-spec icode_closure_arity_update(icode(), arity()) -> icode().
 icode_closure_arity_update(Icode, Arity) -> Icode#icode{closure_arity = Arity}.
   
 
@@ -1376,12 +1376,12 @@ remove_constants(L) ->
 %% Substitution: replace occurrences of X by Y if {X,Y} is in the
 %%   Subst_list.
 
--spec subst([{_,_}], I) -> I when is_subtype(I, icode_instr()).
+-spec subst([{_,_}], I) -> I when I :: icode_instr().
 
 subst(Subst, I) ->
   subst_defines(Subst, subst_uses(Subst, I)).
 
--spec subst_uses([{_,_}], I) -> I when is_subtype(I, icode_instr()).
+-spec subst_uses([{_,_}], I) -> I when I :: icode_instr().
 
 subst_uses(Subst, I) ->
   case I of
@@ -1405,7 +1405,7 @@ subst_uses(Subst, I) ->
     #icode_label{} -> I
   end.
 
--spec subst_defines([{_,_}], I) -> I when is_subtype(I, icode_instr()).
+-spec subst_defines([{_,_}], I) -> I when I :: icode_instr().
 
 subst_defines(Subst, I) ->
   case I of
@@ -1709,7 +1709,7 @@ mk_new_label() ->
 %% @doc Removes comments from Icode.
 %%
 
--spec strip_comments(#icode{}) -> #icode{}.
+-spec strip_comments(icode()) -> icode().
 strip_comments(ICode) ->
   icode_code_update(ICode, no_comments(icode_code(ICode))).
 
diff --git a/lib/hipe/icode/hipe_icode.hrl b/lib/hipe/icode/hipe_icode.hrl
index 9b24c4914e..3bb7bae019 100644
--- a/lib/hipe/icode/hipe_icode.hrl
+++ b/lib/hipe/icode/hipe_icode.hrl
@@ -170,8 +170,9 @@
 
 -record(icode, {'fun'		:: mfa(),
 		params		:: [icode_var()],
+		%% TODO: merge is_closure and closure_arity into one field
 		is_closure	:: boolean(),
-		closure_arity	:: arity(),
+		closure_arity = none	:: 'none' | arity(),
 		is_leaf 	:: boolean(),
 		code = []	:: icode_instrs(),
 		data		:: hipe_consttab(),
diff --git a/lib/hipe/icode/hipe_icode_exceptions.erl b/lib/hipe/icode/hipe_icode_exceptions.erl
index 41556ab80f..f03ce2faaa 100644
--- a/lib/hipe/icode/hipe_icode_exceptions.erl
+++ b/lib/hipe/icode/hipe_icode_exceptions.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2015. 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.
@@ -85,7 +85,7 @@
 
 %%----------------------------------------------------------------------------
 
--spec fix_catches(#cfg{}) -> #cfg{}.
+-spec fix_catches(cfg()) -> cfg().
 
 fix_catches(CFG) ->
   {Map, State} = build_mapping(find_catches(init_state(CFG))),
@@ -393,10 +393,10 @@ get_renaming(C, Map) ->
 %%---------------------------------------------------------------------
 %% State abstraction
 
--record(state, {cfg					:: #cfg{},
+-record(state, {cfg					:: cfg(),
 		changed = false				:: boolean(),
-		succ					:: #cfg{},
-		pred					:: #cfg{},
+		succ					:: cfg(),
+		pred					:: cfg(),
 		start_labels				:: [icode_lbl(),...],
 		visited = hipe_icode_cfg:none_visited()	:: gb_sets:set(),
 		out     = gb_trees:empty()		:: gb_trees:tree(),
@@ -404,13 +404,8 @@ get_renaming(C, Map) ->
 	       }).
 
 init_state(CFG) ->
-  State = #state{cfg = CFG},
-  refresh_state_cache(State).
-
-refresh_state_cache(State) ->
-  CFG = State#state.cfg,
   SLs = [hipe_icode_cfg:start_label(CFG)],
-  State#state{succ = CFG, pred = CFG, start_labels = SLs}.
+  #state{cfg = CFG, succ = CFG, pred = CFG, start_labels = SLs}.
 
 get_cfg(State) ->
   State#state.cfg.
@@ -466,7 +461,8 @@ get_bb_code(L, State) ->
 set_bb_code(L, Code, State) ->
   CFG = State#state.cfg,
   CFG1 = hipe_icode_cfg:bb_add(CFG, L, hipe_bb:mk_bb(Code)),
-  refresh_state_cache(State#state{cfg = CFG1}).
+  SLs = [hipe_icode_cfg:start_label(CFG1)],
+  State#state{cfg = CFG1, succ = CFG1, pred = CFG1, start_labels = SLs}.
 
 get_new_catches_in(L, State) ->
   Ps = get_pred(L, State),
diff --git a/lib/hipe/icode/hipe_icode_fp.erl b/lib/hipe/icode/hipe_icode_fp.erl
index 5ae0395b72..ae12f20cc2 100644
--- a/lib/hipe/icode/hipe_icode_fp.erl
+++ b/lib/hipe/icode/hipe_icode_fp.erl
@@ -34,13 +34,37 @@
 -include("hipe_icode.hrl").
 -include("../flow/cfg.hrl").
 
--record(state, {edge_map   = gb_trees:empty() :: gb_trees:tree(),
-		fp_ebb_map = gb_trees:empty() :: gb_trees:tree(),
-		cfg	                      :: #cfg{}}).
+-type mapped_fvar()     :: icode_fvar() | {assigned, icode_fvar()} .
+-type incoming_fvars()  :: [{icode_lbl(), mapped_fvar()}].
+-type initial_var_map() :: #{icode_var() => incoming_fvars()}.
+-type bb_phi_list()     :: [{icode_fvar(), [{icode_lbl(), icode_fvar()}]}].
+-type var_map_phi()     :: #{phi => bb_phi_list(),
+			     icode_var() => mapped_fvar()}.
+-type var_map()         :: #{icode_var() => mapped_fvar()}.
+
+-type edge()            :: {icode_lbl(), icode_lbl()}.
+-type edge_map()        :: #{edge() => var_map()}.
+
+-type worklist(Item)    :: {[Item], [Item], gb_sets:set(Item)}.
+-type worklist()        :: worklist(icode_lbl()).
+
+-type fail_lbl()        :: [] | icode_lbl().
+-type in_block()        :: {true, fail_lbl()} | false.
+-type fp_ebb_map()      :: #{{inblock_in | inblock_out, icode_lbl()} | edge()
+			     => in_block()}.
+
+-record(state, {edge_map   = #{} :: edge_map(),
+		fp_ebb_map = #{} :: fp_ebb_map(),
+		cfg              :: cfg()}).
+-type state() :: #state{}.
+
+-type icode_phi()      :: #icode_phi{}.
+-type icode_variable() :: #icode_variable{}.
+-type icode_const()    :: #icode_const{}.
 
 %%--------------------------------------------------------------------
 
--spec cfg(#cfg{}) -> #cfg{}.
+-spec cfg(cfg()) -> cfg().
 
 cfg(Cfg) ->
   %%hipe_icode_cfg:pp(Cfg),
@@ -59,10 +83,14 @@ cfg(Cfg) ->
 %% corresponding fcheckerror.
 %%--------------------------------------------------------------------
 
+-spec annotate_fclearerror(cfg()) -> cfg().
+
 annotate_fclearerror(Cfg) ->
   Labels = hipe_icode_cfg:reverse_postorder(Cfg),
   annotate_fclearerror(Labels, Cfg).
 
+-spec annotate_fclearerror([icode_lbl()], cfg()) -> cfg().
+
 annotate_fclearerror([Label|Left], Cfg) ->
   BB = hipe_icode_cfg:bb(Cfg, Label),
   Code = hipe_bb:code(BB),
@@ -73,6 +101,9 @@ annotate_fclearerror([Label|Left], Cfg) ->
 annotate_fclearerror([], Cfg) ->
   Cfg.
 
+-spec annotate_fclearerror1(icode_instrs(), icode_lbl(), cfg(), icode_instrs())
+			   -> icode_instrs().
+
 annotate_fclearerror1([I|Left], Label, Cfg, Acc) ->
   case I of
     #icode_call{} ->
@@ -90,6 +121,9 @@ annotate_fclearerror1([I|Left], Label, Cfg, Acc) ->
 annotate_fclearerror1([], _Label, _Cfg, Acc) ->
   lists:reverse(Acc).
 
+-spec lookahead_for_fcheckerror(icode_instrs(), icode_lbl(), cfg()) ->
+				   fail_lbl().
+
 lookahead_for_fcheckerror([I|Left], Label, Cfg) ->
   case I of
     #icode_call{} ->
@@ -111,10 +145,14 @@ lookahead_for_fcheckerror([], Label, Cfg) ->
       lookahead_for_fcheckerror(Code, Succ, Cfg)
   end.
 
+-spec unannotate_fclearerror(cfg()) -> cfg().
+
 unannotate_fclearerror(Cfg) ->
   Labels = hipe_icode_cfg:reverse_postorder(Cfg),
   unannotate_fclearerror(Labels, Cfg).
 
+-spec unannotate_fclearerror([icode_lbl()], cfg()) -> cfg().
+
 unannotate_fclearerror([Label|Left], Cfg) ->
   BB = hipe_icode_cfg:bb(Cfg, Label),
   Code = hipe_bb:code(BB),
@@ -125,6 +163,9 @@ unannotate_fclearerror([Label|Left], Cfg) ->
 unannotate_fclearerror([], Cfg) ->
   Cfg.
 
+-spec unannotate_fclearerror1(icode_instrs(), icode_instrs()) ->
+				 icode_instrs().
+
 unannotate_fclearerror1([I|Left], Acc) ->
   case I of
     #icode_call{} ->
@@ -145,10 +186,14 @@ unannotate_fclearerror1([], Acc) ->
 %% Make float EBBs
 %%--------------------------------------------------------------------
 
+-spec place_fp_blocks(state()) -> state().
+
 place_fp_blocks(State) ->
   WorkList = new_worklist(State),
   transform_block(WorkList, State).
 
+-spec transform_block(worklist(), state()) -> state().
+
 transform_block(WorkList, State) ->
   case get_work(WorkList) of
     none ->
@@ -182,6 +227,10 @@ transform_block(WorkList, State) ->
       end
   end.
 
+-spec update_maps(state(), icode_lbl(), ordsets:ordset(icode_lbl()),
+		  var_map(), ordsets:ordset(icode_lbl()), var_map())
+		 -> fixpoint | {state(), [icode_lbl()]}.
+
 update_maps(State, Label, SuccSet, SuccMap, FailSet, FailMap) ->
   {NewState, Add1} = update_maps(State, Label, SuccSet, SuccMap, []),
   case update_maps(NewState, Label, FailSet, FailMap, Add1) of
@@ -189,6 +238,10 @@ update_maps(State, Label, SuccSet, SuccMap, FailSet, FailMap) ->
     {_NewState1, _Add} = Ret -> Ret
   end.
 
+-spec update_maps(state(), icode_lbl(), ordsets:ordset(icode_lbl()),
+		  var_map(), [icode_lbl()])
+		 -> {state(), [icode_lbl()]}.
+
 update_maps(State, From, [To|Left], Map, Acc) ->
   case state__map_update(State, From, To, Map) of
     fixpoint ->
@@ -199,10 +252,13 @@ update_maps(State, From, [To|Left], Map, Acc) ->
 update_maps(State, _From, [], _Map, Acc) ->
   {State, Acc}.
 
+-spec transform_instrs(icode_instrs(), edge_map(), var_map(), icode_instrs())
+		      -> {var_map(), icode_instrs()}.
+
 transform_instrs([I|Left], PhiMap, Map, Acc) ->
   Defines = hipe_icode:defines(I),
-  NewMap = delete_all(Defines, Map),
-  NewPhiMap = delete_all(Defines, PhiMap),
+  NewMap = maps:without(Defines, Map),
+  NewPhiMap = maps:without(Defines, PhiMap),
   case I of
     #icode_phi{} ->
       Uses = hipe_icode:uses(I),
@@ -214,7 +270,7 @@ transform_instrs([I|Left], PhiMap, Map, Acc) ->
 	  %% All arguments are untagged. Let's untag the destination.
 	  Dst = hipe_icode:phi_dst(I),
 	  NewDst = hipe_icode:mk_new_fvar(),
-	  NewMap1 = gb_trees:enter(Dst, NewDst, NewMap),
+	  NewMap1 = NewMap#{Dst => NewDst},
 	  NewI = subst_phi_uncond(I, NewDst, PhiMap),
 	  transform_instrs(Left, NewPhiMap, NewMap1, [NewI|Acc]);
 	_ ->
@@ -233,7 +289,7 @@ transform_instrs([I|Left], PhiMap, Map, Acc) ->
 	    [Src] ->
 	      case lookup(Src, Map) of
 		none ->
-		  NewMap1 = gb_trees:enter(Src, {assigned, Dst}, NewMap),
+		  NewMap1 = NewMap#{Src => {assigned, Dst}},
 		  transform_instrs(Left, NewPhiMap, NewMap1, [I|Acc]);
 		Dst ->
 		  %% This is the instruction that untagged the variable.
@@ -256,7 +312,7 @@ transform_instrs([I|Left], PhiMap, Map, Acc) ->
 	unsafe_tag_float ->
 	  [Dst] = hipe_icode:defines(I),
 	  [Src] = hipe_icode:uses(I),
-	  NewMap1 = gb_trees:enter(Dst, {assigned, Src}, NewMap),
+	  NewMap1 = NewMap#{Dst => {assigned, Src}},
 	  transform_instrs(Left, NewPhiMap, NewMap1,[I|Acc]);
 	_ ->
 	  {NewMap1, NewAcc} = check_for_fop_candidates(I, NewMap, Acc),
@@ -269,6 +325,9 @@ transform_instrs([I|Left], PhiMap, Map, Acc) ->
 transform_instrs([], _PhiMap, Map, Acc) ->
   {Map, lists:reverse(Acc)}.
 
+-spec check_for_fop_candidates(icode_instr(), var_map(), icode_instrs())
+			      -> {var_map(), icode_instrs()}.
+
 check_for_fop_candidates(I, Map, Acc) ->
   case is_fop_cand(I) of
     false ->
@@ -311,6 +370,8 @@ check_for_fop_candidates(I, Map, Acc) ->
   end.
 
 
+-spec handle_untagged_arguments(icode_instr(), var_map()) -> icode_instrs().
+
 %% If this is an instruction that needs to operate on tagged values,
 %% which currently are untagged, we must tag the values and perhaps
 %% end the fp ebb.
@@ -322,23 +383,24 @@ handle_untagged_arguments(I, Map) ->
     Tag ->
       TagIntrs = 
 	[hipe_icode:mk_primop([Dst], unsafe_tag_float, 
-			      [gb_trees:get(Dst, Map)]) || Dst <- Tag],
+			      [maps:get(Dst, Map)]) || Dst <- Tag],
       [I|TagIntrs]
   end.
 
+-spec do_prelude(var_map_phi()) -> {[icode_phi()], var_map()}.
+
 %% Add phi nodes for untagged fp values.
 
-do_prelude(Map) ->
-  case gb_trees:lookup(phi, Map) of
-    none ->
-      {[], Map};
-    {value, List} ->
-      %%io:format("Adding phi: ~w\n", [List]),
-      Fun = fun ({FVar, Bindings}, Acc) -> 
-		[hipe_icode:mk_phi(FVar, Bindings)|Acc]
-	    end,
-      {lists:foldl(Fun, [], List), gb_trees:delete(phi, Map)}
-  end.
+do_prelude(Map = #{phi := List}) ->
+  %%io:format("Adding phi: ~w\n", [List]),
+  Fun = fun ({FVar, Bindings}, Acc) ->
+	    [hipe_icode:mk_phi(FVar, Bindings)|Acc]
+	end,
+  {lists:foldl(Fun, [], List), maps:remove(phi, Map)};
+do_prelude(Map) -> {[], Map}.
+
+-spec split_code([I]) -> {[I], I} when
+    I :: icode_instr().
 
 split_code(Code) ->
   split_code(Code, []).
@@ -349,6 +411,8 @@ split_code([I|Left], Acc) ->
   split_code(Left, [I|Acc]).
 
 
+-spec finalize(state()) -> state().
+
 %% When all code is mapped to fp instructions we must make sure that
 %% the fp ebb information going into each block is the same as the
 %% information coming out of each predecessor. Otherwise, we must add
@@ -360,17 +424,25 @@ finalize(State) ->
   Edges = needs_fcheckerror(NewState),
   finalize(Edges, NewState).
 
+-spec finalize([edge()], state()) -> state().
+
 finalize([{From, To}|Left], State) ->
   NewState = add_fp_ebb_fixup(From, To, State),
   finalize(Left, NewState);
 finalize([], State) ->
   State.
 
+-spec needs_fcheckerror(state()) -> [{none | icode_lbl(), icode_lbl()}].
+
 needs_fcheckerror(State) ->
   Cfg = state__cfg(State),
   Labels = hipe_icode_cfg:labels(Cfg),
   needs_fcheckerror(Labels, State, []).
 
+-spec needs_fcheckerror([icode_lbl()], state(),
+			[{none | icode_lbl(), icode_lbl()}])
+		       -> [{none | icode_lbl(), icode_lbl()}].
+
 needs_fcheckerror([Label|Left], State, Acc) ->
   case state__get_in_block_in(State, Label) of
     {true, _} ->
@@ -395,6 +467,8 @@ needs_fcheckerror([Label|Left], State, Acc) ->
 needs_fcheckerror([], _State, Acc) ->
   Acc.
 
+-spec add_fp_ebb_fixup(none | icode_lbl(), icode_lbl(), state()) -> state().
+
 add_fp_ebb_fixup('none', To, State) ->
   %% Add the fcheckerror to the start of the block.
   BB = state__bb(State, To),
@@ -416,9 +490,15 @@ add_fp_ebb_fixup(From, To, State) ->
   NewToBB = hipe_bb:code_update(ToBB, NewToCode),
   state__bb_add(NewState1, To, NewToBB).
 
+-spec redirect_phis(icode_instrs(), icode_lbl(), icode_lbl())
+		   -> icode_instrs().
+
 redirect_phis(Code, OldFrom, NewFrom) ->
   redirect_phis(Code, OldFrom, NewFrom, []).
 
+-spec redirect_phis(icode_instrs(), icode_lbl(), icode_lbl(), icode_instrs())
+		   -> icode_instrs().
+
 redirect_phis([I|Is] = Code, OldFrom, NewFrom, Acc) ->
   case I of
     #icode_phi{} ->
@@ -430,13 +510,20 @@ redirect_phis([I|Is] = Code, OldFrom, NewFrom, Acc) ->
 redirect_phis([], _OldFrom, _NewFrom, Acc) ->
   lists:reverse(Acc).
 
+-spec subst_phi(icode_phi(), icode_variable(), edge_map())
+	       -> icode_phi().
+
 subst_phi(I, Dst, Map) ->
   ArgList = subst_phi_uses0(hipe_icode:phi_arglist(I), Map, []),
   hipe_icode:mk_phi(Dst, ArgList).
 
+-spec subst_phi_uses0([{icode_lbl(), icode_variable()}], edge_map(),
+		      [{icode_lbl(), icode_variable()}])
+		     -> [{icode_lbl(), icode_variable()}].
+
 subst_phi_uses0([{Pred, Var}|Left], Map, Acc) ->
-  case gb_trees:lookup(Var, Map) of
-    {value, List} -> 
+  case Map of
+    #{Var := List} ->
       case lists:keyfind(Pred, 1, List) of
 	{Pred, {assigned, _NewVar}} -> 
 	  %% The variable is untagged, but it has been assigned. Keep it!
@@ -448,20 +535,27 @@ subst_phi_uses0([{Pred, Var}|Left], Map, Acc) ->
 	  %% The variable is not untagged.
 	  subst_phi_uses0(Left, Map, [{Pred, Var} | Acc])
       end;
-    none ->
+    #{} ->
       %% The variable is not untagged.
       subst_phi_uses0(Left, Map, [{Pred, Var} | Acc])
   end;
 subst_phi_uses0([], _Map, Acc) ->
   Acc.
 
+-spec subst_phi_uncond(icode_phi(), icode_variable(), edge_map())
+		      -> icode_phi().
+
 subst_phi_uncond(I, Dst, Map) ->
   ArgList = subst_phi_uses_uncond0(hipe_icode:phi_arglist(I), Map, []),
   hipe_icode:mk_phi(Dst, ArgList).
 
+-spec subst_phi_uses_uncond0([{icode_lbl(), icode_variable()}], edge_map(),
+			     [{icode_lbl(), icode_variable()}])
+			    -> [{icode_lbl(), icode_variable()}].
+
 subst_phi_uses_uncond0([{Pred, Var}|Left], Map, Acc) ->
-  case gb_trees:lookup(Var, Map) of
-    {value, List} -> 
+  case Map of
+    #{Var := List} ->
       case lists:keyfind(Pred, 1, List) of
 	{Pred, {assigned, NewVar}} ->
 	  %% The variable is untagged!
@@ -473,13 +567,15 @@ subst_phi_uses_uncond0([{Pred, Var}|Left], Map, Acc) ->
 	  %% The variable is not untagged.
 	  subst_phi_uses_uncond0(Left, Map, [{Pred, Var} | Acc])
       end;
-    none ->
+    #{} ->
       %% The variable is not untagged.
       subst_phi_uses_uncond0(Left, Map, [{Pred, Var} | Acc])
   end;
 subst_phi_uses_uncond0([], _Map, Acc) ->
   Acc.
 
+-spec place_error_handling(worklist(), state()) -> state().
+
 place_error_handling(WorkList, State) ->
   case get_work(WorkList) of
     none ->
@@ -502,6 +598,9 @@ place_error_handling(WorkList, State) ->
       end
   end.
 
+-spec place_error(icode_instrs(), in_block(), icode_instrs())
+		 -> {icode_instrs(), in_block()}.
+
 place_error([I|Left], InBlock, Acc) ->
   case I of
     #icode_call{} ->
@@ -638,12 +737,10 @@ instr_allowed_in_fp_ebb(Instr) ->
 %%=============================================================
 
 %% ------------------------------------------------------------ 
-%% Handling the gb_tree
+%% Handling the variable map
 
-delete_all([Key|Left], Tree) ->
-  delete_all(Left, gb_trees:delete_any(Key, Tree));
-delete_all([], Tree) ->
-  Tree.
+-spec lookup_list([icode_var() | icode_const()], var_map())
+		 -> [none | icode_fvar()].
 
 lookup_list(List, Info) ->
   lookup_list(List, fun lookup/2, Info, []).
@@ -653,33 +750,43 @@ lookup_list([H|T], Fun, Info, Acc) ->
 lookup_list([], _,  _, Acc) ->
   lists:reverse(Acc).
 
+-spec lookup(icode_var() | icode_const(), var_map()) -> none | icode_fvar().
+
 lookup(Key, Tree) ->
   case hipe_icode:is_const(Key) of
     %% This can be true if the same constant has been
     %% untagged more than once
     true -> none;
     false ->
-      case gb_trees:lookup(Key, Tree) of
-	none -> none;
-	{value, {assigned, Val}} -> Val;
-	{value, Val} -> Val
+      case Tree of
+	#{Key := {assigned, Val}} -> Val;
+	#{Key := Val} -> Val;
+	#{} -> none
       end
   end.
 
+-spec lookup_list_keep_consts([icode_var() | icode_const()], var_map())
+			     -> [none | icode_fvar() | icode_const()].
+
 lookup_list_keep_consts(List, Info) ->
   lookup_list(List, fun lookup_keep_consts/2, Info, []).
 
+-spec lookup_keep_consts(icode_var() | icode_const(), var_map())
+			-> none | icode_fvar() | icode_const().
+
 lookup_keep_consts(Key, Tree) ->
   case hipe_icode:is_const(Key) of
     true -> Key;
     false ->
-      case gb_trees:lookup(Key, Tree) of
-	none -> none;
-	{value, {assigned, Val}} -> Val;
-	{value, Val} -> Val
+      case Tree of
+	#{Key := {assigned, Val}} -> Val;
+	#{Key := Val} -> Val;
+	#{} -> none
       end
   end.
 
+-spec get_type(icode_argument()) -> erl_types:erl_type().
+
 get_type(Var) ->
   case hipe_icode:is_const(Var) of
     true -> erl_types:t_from_term(hipe_icode:const_value(Var));
@@ -695,98 +802,108 @@ get_type(Var) ->
 %% ------------------------------------------------------------ 
 %% Handling the map from variables to fp-variables
 
+-spec join_maps([edge()], edge_map()) -> initial_var_map().
+
 join_maps(Edges, EdgeMap) ->
-  join_maps(Edges, EdgeMap, gb_trees:empty()).
+  join_maps(Edges, EdgeMap, #{}).
 
 join_maps([Edge = {Pred, _}|Left], EdgeMap, Map) ->
-  case gb_trees:lookup(Edge, EdgeMap) of
-    none ->
+  case EdgeMap of
+    #{Edge := OldMap} ->
+      NewMap = join_maps0(maps:to_list(OldMap), Pred, Map),
+      join_maps(Left, EdgeMap, NewMap);
+    #{} ->
       %% All predecessors have not been handled. Use empty map.
-      gb_trees:empty();
-    {value, OldMap} ->
-      NewMap = join_maps0(gb_trees:to_list(OldMap), Pred, Map),
-      join_maps(Left, EdgeMap, NewMap)
+      #{}
   end;
 join_maps([], _, Map) ->
   Map.
 
-join_maps0([{phi, _}|Tail], Pred,  Map) ->
-  join_maps0(Tail, Pred, Map);
-join_maps0([{Var, FVar}|Tail], Pred,  Map) ->
-  case gb_trees:lookup(Var, Map) of
-    none ->
-      join_maps0(Tail, Pred, gb_trees:enter(Var, [{Pred, FVar}], Map));
-    {value, List} ->
+-spec join_maps0(list(), icode_lbl(), initial_var_map()) -> initial_var_map().
+
+join_maps0([{Var=#icode_variable{kind=var}, FVar}|Tail], Pred, Map) ->
+  case Map of
+    #{Var := List} ->
       case lists:keyfind(Pred, 1, List) of
 	false ->
-	  join_maps0(Tail, Pred, gb_trees:update(Var, [{Pred, FVar}|List], Map));
+	  join_maps0(Tail, Pred, Map#{Var := [{Pred, FVar}|List]});
 	{Pred, FVar} ->
 	  %% No problem.
 	  join_maps0(Tail, Pred, Map);
 	_ ->
 	  exit('New binding to same variable')
-      end
+      end;
+    #{} ->
+      join_maps0(Tail, Pred, Map#{Var => [{Pred, FVar}]})
   end;
 join_maps0([], _, Map) ->
   Map.
 
+-spec filter_map(initial_var_map(), pos_integer()) -> var_map_phi().
+
 filter_map(Map, NofPreds) ->
-  filter_map(gb_trees:to_list(Map), NofPreds, Map).
+  filter_map(maps:to_list(Map), NofPreds, Map).
+
+-spec filter_map([{icode_var(), incoming_fvars()}], pos_integer(),
+		 var_map_phi()) -> var_map_phi().
 
 filter_map([{Var, Bindings}|Left], NofPreds, Map) ->
   case length(Bindings) =:= NofPreds of
     true ->
+      BindingsAllAssigned = lists:all(fun({_, {assigned, _}}) -> true;
+					 ({_, _}) -> false
+				      end, Bindings),
       case all_args_equal(Bindings) of
 	true ->
-	  {_, FVar} = hd(Bindings),
-	  filter_map(Left, NofPreds, gb_trees:update(Var, FVar, Map));
+	  NewBinding =
+	    case hd(Bindings) of
+	      {Pred, {assigned, FVar0}} when is_integer(Pred) ->
+		case BindingsAllAssigned of
+		  true -> {assigned, FVar0};
+		  false -> FVar0
+		end;
+	      {Pred, FVar0} when is_integer(Pred) -> FVar0
+	    end,
+	  filter_map(Left, NofPreds, Map#{Var := NewBinding});
 	false ->
 	  PhiDst = hipe_icode:mk_new_fvar(),
 	  PhiArgs = strip_of_assigned(Bindings),
 	  NewMap =
-	    case gb_trees:lookup(phi, Map) of
-	      none ->
-		gb_trees:insert(phi, [{PhiDst, PhiArgs}], Map);
-	      {value, Val} ->
-		gb_trees:update(phi, [{PhiDst, PhiArgs}|Val], Map)
+	    case Map of
+	      #{phi := Val} ->
+		Map#{phi := [{PhiDst, PhiArgs}|Val]};
+	      #{} ->
+		Map#{phi => [{PhiDst, PhiArgs}]}
 	    end,
 	  NewBinding =
-	    case bindings_are_assigned(Bindings) of
+	    case BindingsAllAssigned of
 	      true -> {assigned, PhiDst};
 	      false -> PhiDst
 	    end,
-	  filter_map(Left, NofPreds, gb_trees:update(Var, NewBinding, NewMap))
+	  filter_map(Left, NofPreds, NewMap#{Var := NewBinding})
       end;
     false ->
-      filter_map(Left, NofPreds, gb_trees:delete(Var, Map))
+      filter_map(Left, NofPreds, maps:remove(Var, Map))
   end;
 filter_map([], _NofPreds, Map) ->
   Map.
 
-bindings_are_assigned([{_, {assigned, _}}|Left]) ->
-  assert_assigned(Left),
-  true;
-bindings_are_assigned(Bindings) ->
-  assert_not_assigned(Bindings),
-  false.
-
-assert_assigned([{_, {assigned, _}}|Left]) ->
-  assert_assigned(Left);
-assert_assigned([]) ->
-  ok.
-
-assert_not_assigned([{_, FVar}|Left]) ->
-  true = hipe_icode:is_fvar(FVar),
-  assert_not_assigned(Left);
-assert_not_assigned([]) ->
-  ok.
+-spec all_args_equal(incoming_fvars()) -> boolean().
 
 %% all_args_equal returns true if the mapping for a variable is the
 %% same from all predecessors, i.e., we do not need a phi-node.
 
+%% During the fixpoint loop, a mapping might become assigned, without that
+%% information having propagated into all predecessors. We take care to answer
+%% true even if FVar is only assigned in some predecessors.
+
+all_args_equal([{_, {assigned, FVar}}|Left]) ->
+  all_args_equal(Left, FVar);
 all_args_equal([{_, FVar}|Left]) ->
   all_args_equal(Left, FVar).
 
+all_args_equal([{_, {assigned, FVar1}}|Left], FVar1) ->
+  all_args_equal(Left, FVar1);
 all_args_equal([{_, FVar1}|Left], FVar1) ->
   all_args_equal(Left, FVar1);
 all_args_equal([], _) ->
@@ -795,20 +912,24 @@ all_args_equal(_, _) ->
   false.
 
 
+-spec add_new_bindings_unassigned([icode_var()], var_map()) -> var_map().
+
 %% We differentiate between values that have been assigned as
 %% tagged variables and those that got a 'virtual' binding.
 
 add_new_bindings_unassigned([Var|Left], Map) ->
   FVar = hipe_icode:mk_new_fvar(),
-  add_new_bindings_unassigned(Left, gb_trees:insert(Var, FVar, Map));
+  add_new_bindings_unassigned(Left, Map#{Var => FVar});
 add_new_bindings_unassigned([], Map) ->
   Map.
 
+-spec add_new_bindings_assigned([icode_var()], var_map()) -> var_map().
+
 add_new_bindings_assigned([Var|Left], Map) ->
   case lookup(Var, Map) of
     none ->
       FVar = hipe_icode:mk_new_fvar(),
-      NewMap = gb_trees:insert(Var, {assigned, FVar}, Map),
+      NewMap = Map#{Var => {assigned, FVar}},
       add_new_bindings_assigned(Left, NewMap);
     _ ->
       add_new_bindings_assigned(Left, Map)
@@ -816,6 +937,8 @@ add_new_bindings_assigned([Var|Left], Map) ->
 add_new_bindings_assigned([], Map) ->
   Map.
 
+-spec strip_of_assigned(incoming_fvars()) -> [{icode_lbl(), icode_fvar()}].
+
 strip_of_assigned(List) ->
   strip_of_assigned(List, []).
 
@@ -830,6 +953,8 @@ strip_of_assigned([], Acc) ->
 %% Help functions for the transformation from ordinary instruction to
 %% fp-instruction
 
+-spec is_fop_cand(icode_instr()) -> boolean().
+
 is_fop_cand(I) ->
   case hipe_icode:call_fun(I) of
     '/' -> true;
@@ -840,6 +965,8 @@ is_fop_cand(I) ->
       end
   end.
 
+-spec any_is_float([icode_argument()]) -> boolean().
+
 any_is_float(Vars) ->
   lists:any(fun (V) -> erl_types:t_is_float(get_type(V)) end, Vars).
 
@@ -866,25 +993,32 @@ fun_to_fop(Fun) ->
   end.
 
 
+-spec must_be_tagged(icode_var(), var_map()) -> boolean().
+
 %% If there is a tagged version of this variable available we don't
 %% have to tag the untagged version.
 
 must_be_tagged(Var, Map) ->
-  case gb_trees:lookup(Var, Map) of
-    none -> false;
-    {value, {assigned, _}} -> false; 
-    {value, Val} -> hipe_icode:is_fvar(Val)
+  case Map of
+    #{Var := {assigned, _}} -> false;
+    #{Var := Val} -> hipe_icode:is_fvar(Val);
+    #{} -> false
   end.
 
 
+-spec get_conv_instrs([icode_argument()], var_map()) -> icode_instrs().
+
 %% Converting to floating point variables
 
 get_conv_instrs(Vars, Map) ->
   get_conv_instrs(Vars, Map, []).
 
+-spec get_conv_instrs([icode_argument()], var_map(), icode_instrs())
+		     -> icode_instrs().
+
 get_conv_instrs([Var|Left], Map, Acc) ->
-  {_, Dst} = gb_trees:get(Var, Map),
-  NewI = 
+  #{Var := {_, Dst}} = Map,
+  NewI =
     case erl_types:t_is_float(get_type(Var)) of
       true ->
 	[hipe_icode:mk_primop([Dst], unsafe_untag_float, [Var])];
@@ -896,6 +1030,8 @@ get_conv_instrs([], _, Acc) ->
   Acc.
 
 
+-spec conv_consts([icode_const()], icode_instr()) -> icode_instr().
+
 conv_consts(ConstArgs, I) ->
   conv_consts(ConstArgs, I, []).
 
@@ -934,63 +1070,79 @@ state__bb_add(S = #state{cfg = Cfg}, Label, BB) ->
   NewCfg = hipe_icode_cfg:bb_add(Cfg, Label, BB),
   S#state{cfg = NewCfg}.
 
+-spec state__map(state(), icode_lbl()) -> initial_var_map().
+
 state__map(S = #state{edge_map = EM}, To) ->
   join_maps([{From, To} || From <- state__pred(S, To)], EM).
 
+-spec state__map_update(state(), icode_lbl(), icode_lbl(), var_map()) ->
+			   fixpoint | state().
+
 state__map_update(S = #state{edge_map = EM}, From, To, Map) ->
   FromTo = {From, To},
   MapChanged = 
-    case gb_trees:lookup(FromTo, EM) of
-      {value, Map1} -> not match(Map1, Map);
-      none -> true
+    case EM of
+      #{FromTo := Map1} -> not match(Map1, Map);
+      #{} -> true
     end,
   case MapChanged of
     true ->
-      NewEM = gb_trees:enter(FromTo, Map, EM),
+      NewEM = EM#{FromTo => Map},
       S#state{edge_map = NewEM};
     false ->
       fixpoint
   end.
 
+-spec state__join_in_block(state(), icode_lbl())
+			  -> fixpoint | {state(), in_block()}.
+
 state__join_in_block(S = #state{fp_ebb_map = Map}, Label) ->
   Pred = state__pred(S, Label),
   Edges = [{X, Label} || X <- Pred],
-  NewInBlock = join_in_block([gb_trees:lookup(X, Map) || X <- Edges]),
+  NewInBlock = join_in_block([maps:find(X, Map) || X <- Edges]),
   InBlockLabel = {inblock_in, Label},
-  case gb_trees:lookup(InBlockLabel, Map) of
-    none ->
-      NewMap = gb_trees:insert(InBlockLabel, NewInBlock, Map),
-      {S#state{fp_ebb_map = NewMap}, NewInBlock};
-    {value, NewInBlock} ->
+  case Map of
+    #{InBlockLabel := NewInBlock} ->
       fixpoint;
-    _Other ->
-      NewMap = gb_trees:update(InBlockLabel, NewInBlock, Map),
+    _ ->
+      NewMap = Map#{InBlockLabel => NewInBlock},
       {S#state{fp_ebb_map = NewMap}, NewInBlock}
   end.
 
+-spec state__in_block_out_update(state(), icode_lbl(), in_block())
+				-> state().
+
 state__in_block_out_update(S = #state{fp_ebb_map = Map}, Label, NewInBlock) ->
   Succ = state__succ(S, Label),
   Edges = [{Label, X} || X <- Succ],
   NewMap = update_edges(Edges, NewInBlock, Map),
-  NewMap1 = gb_trees:enter({inblock_out, Label}, NewInBlock, NewMap),
+  NewMap1 = NewMap#{{inblock_out, Label} => NewInBlock},
   S#state{fp_ebb_map = NewMap1}.
 
+-spec update_edges([edge()], in_block(), fp_ebb_map()) -> fp_ebb_map().
+
 update_edges([Edge|Left], NewInBlock, Map) ->
-  NewMap = gb_trees:enter(Edge, NewInBlock, Map),
+  NewMap = Map#{Edge => NewInBlock},
   update_edges(Left, NewInBlock, NewMap);
 update_edges([], _NewInBlock, NewMap) ->
   NewMap.
 
+-spec join_in_block([error | {ok, in_block()}]) -> in_block().
+
 join_in_block([]) ->
   false;
-join_in_block([none|_]) ->
+join_in_block([error|_]) ->
   false;
-join_in_block([{value, InBlock}|Left]) ->
+join_in_block([{ok, InBlock}|Left]) ->
   join_in_block(Left, InBlock).
 
-join_in_block([none|_], _Current) ->
+-spec join_in_block([error | {ok, in_block()}], Current)
+		   -> false | Current when
+    Current :: in_block().
+
+join_in_block([error|_], _Current) ->
   false;
-join_in_block([{value, InBlock}|Left], Current) ->
+join_in_block([{ok, InBlock}|Left], Current) ->
   if Current =:= InBlock -> join_in_block(Left, Current);
      Current =:= false -> false;
      InBlock =:= false -> false;
@@ -998,19 +1150,25 @@ join_in_block([{value, InBlock}|Left], Current) ->
   end;
 join_in_block([], Current) ->
   Current.
-	
+
+
+-spec state__get_in_block_in(state(), icode_lbl()) -> in_block().
 
 state__get_in_block_in(#state{fp_ebb_map = Map}, Label) ->
-  gb_trees:get({inblock_in, Label}, Map).
+  maps:get({inblock_in, Label}, Map).
 
 state__get_in_block_out(#state{fp_ebb_map = Map}, Label) ->
-  gb_trees:get({inblock_out, Label}, Map).
+  maps:get({inblock_out, Label}, Map).
+
 
+-spec new_worklist(state()) -> worklist().
 
 new_worklist(#state{cfg = Cfg}) ->
   Start = hipe_icode_cfg:start_label(Cfg),
   {[Start], [], gb_sets:insert(Start, gb_sets:empty())}.
 
+-spec get_work(worklist()) -> none | {icode_lbl(), worklist()}.
+
 get_work({[Label|Left], List, Set}) ->
   {Label, {Left, List, gb_sets:delete(Label, Set)}};
 get_work({[], [], _Set}) ->
@@ -1018,6 +1176,8 @@ get_work({[], [], _Set}) ->
 get_work({[], List, Set}) ->
   get_work({lists:reverse(List), [], Set}).
 
+-spec add_work(worklist(), [icode_lbl()]) -> worklist().
+
 add_work({List1, List2, Set} = Work, [Label|Left]) ->
   case gb_sets:is_member(Label, Set) of
     true -> 
@@ -1030,15 +1190,7 @@ add_work({List1, List2, Set} = Work, [Label|Left]) ->
 add_work(WorkList, []) ->
   WorkList.
 
-match(Tree1, Tree2) ->
-  match_1(gb_trees:to_list(Tree1), Tree2) andalso 
-    match_1(gb_trees:to_list(Tree2), Tree1).
+-spec match(var_map(), var_map()) -> boolean().
 
-match_1([{Key, Val}|Left], Tree2) ->
-  case gb_trees:lookup(Key, Tree2) of
-    {value, Val} ->
-      match_1(Left, Tree2);
-    _ -> false
-  end;
-match_1([], _) ->
-  true.
+match(Tree1, Tree2) when is_map(Tree1), is_map(Tree2) ->
+  Tree1 =:= Tree2.
diff --git a/lib/hipe/icode/hipe_icode_primops.erl b/lib/hipe/icode/hipe_icode_primops.erl
index ffb51b2ea4..a0deb31c42 100644
--- a/lib/hipe/icode/hipe_icode_primops.erl
+++ b/lib/hipe/icode/hipe_icode_primops.erl
@@ -116,7 +116,7 @@ is_safe({hipe_bs_primop, {bs_init, _, _}}) -> false;
 is_safe({hipe_bs_primop, {bs_init_bits, _}}) -> false;
 is_safe({hipe_bs_primop, {bs_init_bits, _, _}}) -> false;
 is_safe({hipe_bs_primop, {bs_put_binary, _, _}}) -> false;
-is_safe({hipe_bs_primop, {bs_put_binary_all, _}}) -> false;  
+is_safe({hipe_bs_primop, {bs_put_binary_all, _, _}}) -> false;
 is_safe({hipe_bs_primop, {bs_put_float, _, _, _}}) -> false;
 is_safe({hipe_bs_primop, {bs_put_integer, _, _, _}}) -> false;
 is_safe({hipe_bs_primop, {bs_put_string, _, _}}) -> false;  
@@ -219,7 +219,7 @@ fails({hipe_bs_primop, {bs_init, _, _}}) -> true;
 fails({hipe_bs_primop, {bs_init_bits, _}}) -> true;
 fails({hipe_bs_primop, {bs_init_bits, _, _}}) -> true;
 fails({hipe_bs_primop, {bs_put_binary, _, _}}) -> true;
-fails({hipe_bs_primop, {bs_put_binary_all, _}}) -> true;  
+fails({hipe_bs_primop, {bs_put_binary_all, _, _}}) -> true;
 fails({hipe_bs_primop, {bs_put_float, _, _, _}}) -> true;
 fails({hipe_bs_primop, {bs_put_integer, _, _, _}}) -> true;
 fails({hipe_bs_primop, {bs_put_string, _, _}}) -> true;  
@@ -265,8 +265,8 @@ pp(Dev, Op) ->
       io:format(Dev, "gc_test<~w>", [N]);
     {hipe_bs_primop, BsOp}  ->
       case BsOp of
-	{bs_put_binary_all, Flags} -> 
-	  io:format(Dev, "bs_put_binary_all<~w>", [Flags]);
+	{bs_put_binary_all, Unit, Flags} ->
+	  io:format(Dev, "bs_put_binary_all<~w, ~w>", [Unit,Flags]);
 	{bs_put_binary, Size} ->
 	  io:format(Dev, "bs_put_binary<~w>", [Size]);
 	{bs_put_binary, Flags, Size} ->
@@ -504,14 +504,16 @@ type(Primop, Args) ->
 	  NewBinType = match_bin(erl_types:t_bitstr(0, Size), BinType),
 	  NewMatchState = 
 	    erl_types:t_matchstate_update_present(NewBinType, MatchState),
-	  if Signed =:= 0 ->
-	      erl_types:t_product([erl_types:t_from_range(0, 1 bsl Size - 1), 
-				   NewMatchState]);
-	     Signed =:= 4 ->
-	      erl_types:t_product([erl_types:t_from_range(- (1 bsl (Size-1)), 
-							  (1 bsl (Size-1)) - 1),
-				   NewMatchState])
-	  end;
+	  Range =
+	    case Signed of
+	      0 ->
+		UpperBound = inf_add(safe_bsl_1(Size), -1),
+		erl_types:t_from_range(0, UpperBound);
+	      4 ->
+		Bound = safe_bsl_1(Size - 1),
+		erl_types:t_from_range(inf_inv(Bound), inf_add(Bound, -1))
+	    end,
+	  erl_types:t_product([Range, NewMatchState]);
 	[_Arg] ->
 	  NewBinType = match_bin(erl_types:t_bitstr(Size, 0), BinType),
 	  NewMatchState = 
@@ -628,8 +630,9 @@ type(Primop, Args) ->
 	[_SrcType, _BitsType, _Base, Type] ->
 	  erl_types:t_bitstr_concat(Type, erl_types:t_bitstr(Size, 0))
       end;
-    {hipe_bs_primop, {bs_put_binary_all, _Flags}} ->
-      [SrcType, _Base, Type] = Args,
+    {hipe_bs_primop, {bs_put_binary_all, Unit, _Flags}} ->
+      [SrcType0, _Base, Type] = Args,
+      SrcType = erl_types:t_inf(erl_types:t_bitstr(Unit, 0), SrcType0),
       erl_types:t_bitstr_concat(SrcType,Type);
     {hipe_bs_primop, {bs_put_string, _, Size}} ->
       [_Base, Type] = Args,
@@ -965,3 +968,20 @@ check_fun_args(_, _) ->
 
 match_bin(Pattern, Match) ->
   erl_types:t_bitstr_match(Pattern, Match).
+
+-spec safe_bsl_1(non_neg_integer()) -> non_neg_integer() | 'pos_inf'.
+
+safe_bsl_1(Shift) when Shift =< 128 -> 1 bsl Shift;
+safe_bsl_1(_Shift) -> pos_inf.
+
+%%
+%% The following two functions are stripped-down versions of more
+%% general functions that exist in hipe_icode_range.erl
+%%
+
+inf_inv(pos_inf) -> neg_inf;
+inf_inv(Number) when is_integer(Number) -> -Number.
+
+inf_add(pos_inf, _Number) -> pos_inf;
+inf_add(Number1, Number2) when is_integer(Number1), is_integer(Number2) ->
+  Number1 + Number2.
diff --git a/lib/hipe/icode/hipe_icode_range.erl b/lib/hipe/icode/hipe_icode_range.erl
index ba5fa1bfd7..9a20527a83 100644
--- a/lib/hipe/icode/hipe_icode_range.erl
+++ b/lib/hipe/icode/hipe_icode_range.erl
@@ -1202,11 +1202,11 @@ basic_type(#unsafe_update_element{}) -> not_analysed.
 analyse_bs_get_integer(Size, Flags, true) ->
   Signed = Flags band 4,
   if Signed =:= 0 ->
-      Max = 1 bsl Size - 1,
+      Max = inf_add(inf_bsl(1, Size), -1),
       Min = 0;
      true ->
-      Max = 1 bsl (Size-1) - 1,
-      Min = -(1 bsl (Size-1))
+      Max = inf_add(inf_bsl(1, Size-1), -1),
+      Min = inf_inv(inf_bsl(1, Size-1))
   end,
   {Min, Max};
 analyse_bs_get_integer(Size, Flags, false) when is_integer(Size),
diff --git a/lib/hipe/icode/hipe_icode_ssa_struct_reuse.erl b/lib/hipe/icode/hipe_icode_ssa_struct_reuse.erl
index e350a6ff18..7613024787 100644
--- a/lib/hipe/icode/hipe_icode_ssa_struct_reuse.erl
+++ b/lib/hipe/icode/hipe_icode_ssa_struct_reuse.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2015. 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.
@@ -314,7 +314,7 @@ node_create(Label, Pred, Succ) ->
 %% tree - the tree of nodes, with labels as keys and node records as values
 
 -record(nodes, {
-  domtree	                   :: hipe_dominators:domTree(),
+  domtree       = none             :: 'none' | hipe_dominators:domTree(),
   labels 	= none             :: 'none' | [icode_lbl()],
   postorder 	= none             :: 'none' | [icode_lbl()],            
   start_label	= none             :: 'none' | icode_lbl(),
@@ -390,7 +390,7 @@ update_del_red_test_set(Update) ->
 %%-----------------------------------------------------------------------------
 %% Main function called from the hipe_main module
 
--spec struct_reuse(#cfg{}) -> #cfg{}.
+-spec struct_reuse(cfg()) -> cfg().
 
 struct_reuse(CFG) ->
   %% debug_init_case_count(?SR_INSTR_TYPE),
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index 1a4bbf179f..0e32da1d36 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2015. 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.
@@ -764,7 +764,8 @@ finalize(OrigList, Mod, Exports, WholeModule, Opts) ->
 finalize_fun(MfaIcodeList, Exports, Opts) ->
   case proplists:get_value(concurrent_comp, Opts) of
     FalseVal when (FalseVal =:= undefined) orelse (FalseVal =:= false) ->
-      [finalize_fun_sequential(MFAIcode, Opts, #comp_servers{})
+      NoServers = #comp_servers{pp_server = none, range = none, type = none},
+      [finalize_fun_sequential(MFAIcode, Opts, NoServers)
        || {_MFA, _Icode} = MFAIcode <- MfaIcodeList];
     TrueVal when (TrueVal =:= true) orelse (TrueVal =:= debug) ->
       finalize_fun_concurrent(MfaIcodeList, Exports, Opts)
diff --git a/lib/hipe/main/hipe.hrl.src b/lib/hipe/main/hipe.hrl.src
index ba27878a84..3be824ac34 100644
--- a/lib/hipe/main/hipe.hrl.src
+++ b/lib/hipe/main/hipe.hrl.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2015. 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.
@@ -299,7 +299,8 @@
 %% Records defined in the hipe module used in other parts of the compiler
 %%----------------------------------------------------------------------------
 
--record(comp_servers, {pp_server :: pid(), range :: pid(), type :: pid()}).
+-type mpid() :: 'none' | pid().
+-record(comp_servers, {pp_server :: mpid(), range :: mpid(), type :: mpid()}).
 
 %%----------------------------------------------------------------------------
 %% Basic types of the 'hipe' application used in other parts of the system
diff --git a/lib/hipe/main/hipe_main.erl b/lib/hipe/main/hipe_main.erl
index 5753169961..be5050e155 100644
--- a/lib/hipe/main/hipe_main.erl
+++ b/lib/hipe/main/hipe_main.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2015. 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.
@@ -55,7 +55,7 @@
 %%=====================================================================
 
 %% @spec compile_icode(MFA::mfa(),
-%%                     LinearIcode::#icode{},
+%%                     LinearIcode::icode(),
 %%                     CompilerOptions::comp_options(),
 %%		       CompServers::#comp_servers()) ->
 %%          {native,Platform,{unprofiled,NativeCode}} | {rtl,RTLCode}
@@ -69,7 +69,7 @@
 %% generated). The compiler options must have already been expanded
 %% (cf. `<a href="hipe.html">hipe:expand_options</a>'). </p>
 
--spec compile_icode(mfa(), #icode{}, comp_options(), #comp_servers{}) ->
+-spec compile_icode(mfa(), icode(), comp_options(), #comp_servers{}) ->
 	 comp_icode_ret().
 
 compile_icode(MFA, LinearIcode, Options, Servers) ->
@@ -230,10 +230,12 @@ get_pp_module(icode_liveness) -> hipe_icode_liveness;
 get_pp_module(rtl_liveness) -> hipe_rtl_liveness.
   
 perform_io(no_fun, _) -> ok;
-perform_io(Fun,PPServer) when is_pid(PPServer) ->
-  PPServer ! {print,Fun};
-perform_io(Fun, undefined) ->
-  Fun().
+perform_io(Fun, PPServer) when is_pid(PPServer) ->
+  PPServer ! {print, Fun},
+  ok;
+perform_io(Fun, none) ->
+  Fun(),
+  ok.
 
 
 %%--------------------------------------------------------------------
diff --git a/lib/hipe/rtl/hipe_rtl_arith.inc b/lib/hipe/rtl/hipe_rtl_arith.inc
index 1f455f47ed..1dff56b074 100644
--- a/lib/hipe/rtl/hipe_rtl_arith.inc
+++ b/lib/hipe/rtl/hipe_rtl_arith.inc
@@ -30,13 +30,13 @@
 %% Returns a tuple
 %%  {Res, Sign, Zero, Overflow, Carry}
 %%  Res will be a number in the range 
-%%   MAX_SIGNED_INT >= Res >= MIN_SIGNED_INT
+%%   MAX_UNSIGNED_INT >= Res >= 0
 %% The other four values are flags that are either true or false
 %% 
 eval_alu(Op, Arg1, Arg2) 
-  when Arg1 =< ?MAX_SIGNED_INT, 
+  when Arg1 =< ?MAX_UNSIGNED_INT,
        Arg1 >= ?MIN_SIGNED_INT,
-       Arg2 =< ?MAX_SIGNED_INT, 
+       Arg2 =< ?MAX_UNSIGNED_INT,
        Arg2 >= ?MIN_SIGNED_INT ->
 
   Sign1 = sign_bit(Arg1),
@@ -111,7 +111,7 @@ eval_alu(Op, Arg1, Arg2)
       Res = N = Z = V = C = 0,
       ?EXIT({"unknown alu op", Op})
   end,
-  {two_comp_to_erl(Res), N, Z, V, C};
+  {Res, N, Z, V, C};
 eval_alu(Op, Arg1, Arg2) ->
   ?EXIT({argument_overflow,Op,Arg1,Arg2}).
 
@@ -162,16 +162,9 @@ eval_cond(Cond, Arg1, Arg2) ->
 sign_bit(Val) ->
   ((Val bsr ?SIGN_BIT) band 1) =:= 1.
 
-two_comp_to_erl(V) ->
-  if V > ?MAX_SIGNED_INT ->
-      - ((?MAX_UNSIGNED_INT + 1) - V);
-     true -> V
-  end.
-
 shiftmask(Arg) ->
   Setbits = ?BITS - Arg,
   (1 bsl Setbits) - 1.
 
 zero(Val) ->
   Val =:= 0.
-
diff --git a/lib/hipe/rtl/hipe_rtl_arith_32.erl b/lib/hipe/rtl/hipe_rtl_arith_32.erl
index 572556be1c..d790a8b981 100644
--- a/lib/hipe/rtl/hipe_rtl_arith_32.erl
+++ b/lib/hipe/rtl/hipe_rtl_arith_32.erl
@@ -24,7 +24,8 @@
 %%  Filename : 	hipe_rtl_arith_32.erl
 %%  Module   :	hipe_rtl_arith_32
 %%  Purpose  :  To implement 32-bit RTL-arithmetic 
-%%  Notes    :  The arithmetic works on 32-bit signed integers. 
+%%  Notes    :  The arithmetic works on 32-bit signed and unsigned
+%%              integers.
 %%              The implementation is taken from the implementation
 %%              of arithmetic on SPARC.
 %%              XXX: This code is seldom used, and hence also
diff --git a/lib/hipe/rtl/hipe_rtl_binary.erl b/lib/hipe/rtl/hipe_rtl_binary.erl
index b549073050..9cbab08ee2 100644
--- a/lib/hipe/rtl/hipe_rtl_binary.erl
+++ b/lib/hipe/rtl/hipe_rtl_binary.erl
@@ -1,3 +1,4 @@
+%% -*- erlang-indent-level: 2 -*-
 %%%
 %%% %CopyrightBegin%
 %%% 
@@ -28,11 +29,20 @@
 
 -export([gen_rtl/7]).
 
+-export([floorlog2/1, get_word_integer/4, make_size/3, make_size/4]).
+
+%%--------------------------------------------------------------------
+
+-define(BYTE_SHIFT, 3). %% Turn bits into bytes or vice versa
+-define(BYTE_SIZE, 8).
+
+%%--------------------------------------------------------------------
+
 gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SysLimName, ConstTab) ->
   case type_of_operation(BsOP) of
     match ->
       {hipe_rtl_binary_match:gen_rtl(
-	BsOP, Dst, Args, TrueLblName, FalseLblName),ConstTab};
+	 BsOP, Dst, Args, TrueLblName, FalseLblName),ConstTab};
     construct ->
       hipe_rtl_binary_construct:gen_rtl(
 	BsOP, Dst, Args, TrueLblName, FalseLblName, SysLimName, ConstTab)
@@ -62,7 +72,7 @@ type_of_operation({bs_init,_,_}) -> construct;
 type_of_operation({bs_init_bits,_}) -> construct;
 type_of_operation({bs_init_bits,_,_}) -> construct;
 type_of_operation({bs_put_binary,_,_}) -> construct;
-type_of_operation({bs_put_binary_all,_}) -> construct;  
+type_of_operation({bs_put_binary_all,_,_}) -> construct;
 type_of_operation({bs_put_float,_,_,_}) -> construct;
 type_of_operation({bs_put_integer,_,_,_}) -> construct;
 type_of_operation({bs_put_string,_,_}) -> construct;  
@@ -79,3 +89,133 @@ type_of_operation(bs_final) -> construct;
 type_of_operation({bs_append,_,_,_,_}) -> construct;
 type_of_operation({bs_private_append,_,_}) -> construct;
 type_of_operation(bs_init_writable) -> construct.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Small utility functions:
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+create_lbls(X) when X > 0 ->
+  [hipe_rtl:mk_new_label()|create_lbls(X-1)];
+create_lbls(0) ->
+  [].
+
+%%------------------------------------------------------------------------------
+%% Utilities used by both hipe_rtl_binary_construct and hipe_rtl_binary_match
+%%------------------------------------------------------------------------------
+
+get_word_integer(Var, Register, SystemLimitLblName, FalseLblName) ->
+  [EndLbl] = create_lbls(1),
+  EndName = hipe_rtl:label_name(EndLbl),
+  get_word_integer(Var, Register,SystemLimitLblName,  FalseLblName, EndName, EndName,
+		   [EndLbl]).
+
+get_word_integer(Var, Register, SystemLimitLblName, FalseLblName, TrueLblName,
+		 BigLblName, Tail) ->
+  [FixnumLbl, NotFixnumLbl, BignumLbl, SuccessLbl] = create_lbls(4),
+  [hipe_tagscheme:test_fixnum(Var, hipe_rtl:label_name(FixnumLbl),
+			      hipe_rtl:label_name(NotFixnumLbl), 0.99),
+   FixnumLbl,
+   hipe_tagscheme:fixnum_ge(Var, hipe_rtl:mk_imm(hipe_tagscheme:mk_fixnum(0)),
+			    hipe_rtl:label_name(SuccessLbl), FalseLblName,
+			    0.99),
+   SuccessLbl,
+   hipe_tagscheme:untag_fixnum(Register, Var),
+   hipe_rtl:mk_goto(TrueLblName),
+   NotFixnumLbl,
+   hipe_tagscheme:test_pos_bignum_arity(Var, 1, hipe_rtl:label_name(BignumLbl),
+					FalseLblName, SystemLimitLblName, 0.99),
+   BignumLbl,
+   hipe_tagscheme:unsafe_get_one_word_pos_bignum(Register, Var),
+   hipe_rtl:mk_goto(BigLblName) | Tail].
+
+make_size(UnitImm, BitsVar, FailLblName) ->
+  make_size(UnitImm, BitsVar, FailLblName, FailLblName).
+
+make_size(1, BitsVar, OverflowLblName, FalseLblName) ->
+  DstReg = hipe_rtl:mk_new_reg_gcsafe(),
+  {get_word_integer(BitsVar, DstReg, OverflowLblName, FalseLblName), DstReg};
+make_size(?BYTE_SIZE, BitsVar, OverflowLblName, FalseLblName) ->
+  DstReg = hipe_rtl:mk_new_reg_gcsafe(),
+  [FixnumLbl, BignumLbl] = create_lbls(2),
+  WordBits = hipe_rtl_arch:word_size() * ?BYTE_SIZE,
+  FixnumLblName = hipe_rtl:label_name(FixnumLbl),
+  Tail = [BignumLbl,
+	  hipe_rtl:mk_branch(DstReg, 'ltu',
+			     hipe_rtl:mk_imm(1 bsl (WordBits - ?BYTE_SHIFT)),
+			     FixnumLblName, OverflowLblName, 0.99),
+	  FixnumLbl,
+	  hipe_rtl:mk_alu(DstReg, DstReg, sll, hipe_rtl:mk_imm(?BYTE_SHIFT))],
+  Code = get_word_integer(BitsVar, DstReg, OverflowLblName, FalseLblName,
+			  FixnumLblName, hipe_rtl:label_name(BignumLbl), Tail),
+  {Code, DstReg};
+make_size(UnitImm, BitsVar, OverflowLblName, FalseLblName) ->
+  DstReg = hipe_rtl:mk_new_reg_gcsafe(),
+  UnitList = number2list(UnitImm),
+  Code = multiply_code(UnitList, BitsVar, DstReg, OverflowLblName, FalseLblName),
+  {Code, DstReg}.
+
+multiply_code(List=[Head|_Tail], Variable, Result, OverflowLblName,
+	      FalseLblName) ->
+  Test = set_high(Head),
+  Tmp1 = hipe_rtl:mk_new_reg(),
+  SuccessLbl = hipe_rtl:mk_new_label(),
+  Register = hipe_rtl:mk_new_reg(),
+  Code = [hipe_rtl:mk_move(Result, hipe_rtl:mk_imm(0))|
+	  get_word_integer(Variable, Register, OverflowLblName, FalseLblName)]
+    ++
+    [hipe_rtl:mk_alub(Tmp1, Register, 'and', hipe_rtl:mk_imm(Test),
+		      eq, hipe_rtl:label_name(SuccessLbl),
+		      OverflowLblName, 0.99),
+     SuccessLbl],
+  multiply_code(List, Register, Result, OverflowLblName, Tmp1, Code).
+
+multiply_code([ShiftSize|Rest], Register, Result, OverflowLblName, Tmp1,
+	      OldCode) ->
+  SuccessLbl = hipe_rtl:mk_new_label(),
+  Code =
+    OldCode ++
+    [hipe_rtl:mk_alu(Tmp1, Register, sll, hipe_rtl:mk_imm(ShiftSize)),
+     hipe_rtl:mk_alub(Result, Tmp1, 'add', Result, not_overflow,
+		      hipe_rtl:label_name(SuccessLbl), OverflowLblName, 0.99),
+     SuccessLbl],
+  multiply_code(Rest, Register, Result, OverflowLblName, Tmp1, Code);
+multiply_code([], _Register, _Result, _OverflowLblName, _Tmp1, Code) ->
+  Code.
+
+set_high(X) ->
+  WordBits = hipe_rtl_arch:word_size() * ?BYTE_SIZE,
+  set_high(min(X, WordBits), WordBits, 0).
+
+set_high(0, _, Y) ->
+  Y;
+set_high(X, WordBits, Y) ->
+  set_high(X-1, WordBits, Y+(1 bsl (WordBits-X))).
+
+
+number2list(X) when is_integer(X), X >= 0 ->
+  number2list(X, []).
+
+number2list(1, Acc) ->
+  lists:reverse([0|Acc]);
+number2list(0, Acc) ->
+  lists:reverse(Acc);
+number2list(X, Acc) ->
+  F = floorlog2(X),
+  number2list(X-(1 bsl F), [F|Acc]).
+
+floorlog2(X) ->
+  %% Double-precision floats do not have enough precision to make floorlog2
+  %% exact for integers larger than 2^47.
+  Approx = round(math:log(X)/math:log(2)-0.5),
+  floorlog2_refine(X, Approx).
+
+floorlog2_refine(X, Approx) ->
+  if (1 bsl Approx) > X ->
+      floorlog2_refine(X, Approx - 1);
+     (1 bsl (Approx+1)) > X ->
+      Approx;
+     true ->
+      floorlog2_refine(X, Approx + 1)
+  end.
diff --git a/lib/hipe/rtl/hipe_rtl_binary_construct.erl b/lib/hipe/rtl/hipe_rtl_binary_construct.erl
index 692bad7d96..4403aa552f 100644
--- a/lib/hipe/rtl/hipe_rtl_binary_construct.erl
+++ b/lib/hipe/rtl/hipe_rtl_binary_construct.erl
@@ -34,6 +34,10 @@
 			 get_field_from_term/3,
 			 set_field_from_pointer/3,
 			 get_field_from_pointer/3]).
+
+-import(hipe_rtl_binary, [floorlog2/1,
+			  get_word_integer/4,
+			  make_size/4]).
 %%-------------------------------------------------------------------------
 
 -include("../main/hipe.hrl").
@@ -94,10 +98,11 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 	    var_init_bits(Size, Dst0, Base, Offset, TrueLblName, 
 			  SystemLimitLblName, FalseLblName);
 	  
-	  {bs_put_binary_all, _Flags} ->
+	  {bs_put_binary_all, Unit, _Flags} ->
 	    [Src, Base, Offset] = Args,
 	    [NewOffset] = get_real(Dst),
-	    put_binary_all(NewOffset, Src, Base, Offset, TrueLblName, FalseLblName);
+	    put_binary_all(NewOffset, Src, Base, Offset, Unit,
+			   TrueLblName, FalseLblName);
 	   
 	  {bs_put_binary, Size, _Flags} ->
 	    case is_illegal_const(Size) of
@@ -110,7 +115,9 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 		    put_static_binary(NewOffset, Src, Size, Base, Offset, 
 				      TrueLblName, FalseLblName);
 		  [Src, Bits, Base, Offset]  ->
-		    {SizeCode, SizeReg} = make_size(Size, Bits, FalseLblName),
+		    {SizeCode, SizeReg} = make_size(Size, Bits,
+						    SystemLimitLblName,
+						    FalseLblName),
 		    InCode = put_dynamic_binary(NewOffset, Src, SizeReg, Base, 
 						Offset, TrueLblName, FalseLblName),
 		    SizeCode ++ InCode
@@ -132,7 +139,9 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 		   put_float(NewOffset, Src, Base, Offset, Size, CCode, Aligned, 
 			     LittleEndian, ConstInfo, TrueLblName);
 		 [Src, Bits, Base, Offset] ->
-		   {SizeCode, SizeReg} = make_size(Size, Bits, FalseLblName),
+		   {SizeCode, SizeReg} = make_size(Size, Bits,
+						   SystemLimitLblName,
+						   FalseLblName),
 		   InCode = float_c_code(NewOffset, Src, Base, Offset, SizeReg, 
 					 Flags, TrueLblName, FalseLblName),
 		   SizeCode ++ InCode
@@ -161,6 +170,7 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 				       CCode, Aligned, LittleEndian, TrueLblName); 
 		      [Src, Bits, Base, Offset] -> 
 		    {SizeCode, SizeReg} = make_size(Size, Bits,
+						    SystemLimitLblName,
 						    FalseLblName), 
 			CCode = int_c_code(NewOffset, Src, Base,
 					   Offset, SizeReg, Flags, 
@@ -209,6 +219,7 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 					       TrueLblName); 
 		       [Src, Bits, Base, Offset] -> 
 			 {SizeCode, SizeReg} = make_size(Size, Bits,
+							 SystemLimitLblName,
 							 FalseLblName), 
 			 CCode = int_c_code(NewOffset, Src, Base,
 					    Offset, SizeReg, Flags, 
@@ -293,7 +304,7 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 	    [SizeReg] = create_regs(1),
 	    [Base] = create_unsafe_regs(1),
 	    [hipe_rtl:mk_gctest(?PROC_BIN_WORDSIZE + ?SUB_BIN_WORDSIZE),
-	     check_and_untag_fixnum(Size, SizeReg, FalseLblName),
+	     get_word_integer(Size, SizeReg, SystemLimitLblName, FalseLblName),
 	     allocate_writable(DstVar, Base, SizeReg, Zero, Zero),
 	     hipe_rtl:mk_goto(TrueLblName)]; 
 	  
@@ -305,7 +316,7 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 	    SubBinSize = {sub_binary, binsize},
 	    [get_field_from_term({sub_binary, orig}, Bin, ProcBin),
 	     get_field_from_term(SubBinSize, Bin, SubSize),
-	     check_and_untag_fixnum(Size, SizeReg, FalseLblName),
+	     get_word_integer(Size, SizeReg, SystemLimitLblName, FalseLblName),
 	     realloc_binary(SizeReg, ProcBin, Base),
 	     calculate_sizes(Bin, SizeReg, Offset, EndSubSize, EndSubBitSize),
 	     set_field_from_term(SubBinSize, Bin, EndSubSize),
@@ -313,20 +324,21 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 	     hipe_rtl:mk_move(DstVar, Bin),
 	     hipe_rtl:mk_goto(TrueLblName)]; 
 
-	  {bs_append, _U, _F, _B, _Bla} -> 
+	  {bs_append, _U, _F, Unit, _Bla} ->
 	    [Size, Bin] = Args, 
 	    [DstVar, Base, Offset] = Dst, 
 	    [ProcBin] = create_vars(1),
 	    [Flags, SizeReg, IsWritable, EndSubSize, EndSubBitSize] = 
 	      create_regs(5),
-	    [ContLbl,ContLbl2,ContLbl3,WritableLbl,NotWritableLbl] = Lbls =
-	      create_lbls(5),
-	    [ContLblName, ContLbl2Name, ContLbl3Name, Writable, NotWritable] =
+	    [ContLbl,ContLbl2,ContLbl3,ContLbl4,WritableLbl,NotWritableLbl] =
+	      Lbls = create_lbls(6),
+	    [ContLblName, ContLbl2Name, ContLbl3Name, ContLbl4Name,
+	     Writable, NotWritable] =
 	      [hipe_rtl:label_name(Lbl) || Lbl <- Lbls],
 	    Zero = hipe_rtl:mk_imm(0),
 	    SubIsWritable = {sub_binary, is_writable},
 	    [hipe_rtl:mk_gctest(?SUB_BIN_WORDSIZE + ?PROC_BIN_WORDSIZE),
-	     check_and_untag_fixnum(Size, SizeReg, FalseLblName),
+	     get_word_integer(Size, SizeReg, SystemLimitLblName, FalseLblName),
 	     hipe_tagscheme:test_bitstr(Bin, ContLblName, FalseLblName, 0.99), 
 	     ContLbl, 
 	     hipe_tagscheme:test_subbinary(Bin,ContLbl2Name, NotWritable), 
@@ -339,17 +351,19 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 	     get_field_from_term({proc_bin, flags}, ProcBin, Flags),
 	     hipe_rtl:mk_alub(Flags, Flags, 'and',
 			      hipe_rtl:mk_imm(?PB_IS_WRITABLE), 
-			      eq, NotWritable, Writable, 0.01),
+			      eq, NotWritable, ContLbl4Name, 0.01),
+	     ContLbl4,
+	     calculate_sizes(Bin, SizeReg, Offset, EndSubSize, EndSubBitSize),
+	     is_divisible(Offset, Unit, Writable, FalseLblName),
 	     WritableLbl,
 	     set_field_from_term(SubIsWritable, Bin, Zero),
 	     realloc_binary(SizeReg, ProcBin, Base),
-	     calculate_sizes(Bin, SizeReg, Offset, EndSubSize, EndSubBitSize),
 	     hipe_tagscheme:mk_sub_binary(DstVar, EndSubSize, Zero,
 					  EndSubBitSize, Zero,
 					  hipe_rtl:mk_imm(1), ProcBin),
 	     hipe_rtl:mk_goto(TrueLblName),
 	     NotWritableLbl,
-	     not_writable_code(Bin, SizeReg, DstVar, Base, Offset, 
+	     not_writable_code(Bin, SizeReg, DstVar, Base, Offset, Unit,
 			       TrueLblName, FalseLblName)]
 	end,
       {Code, ConstTab}
@@ -361,7 +375,7 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-not_writable_code(Bin, SizeReg, Dst, Base, Offset, 
+not_writable_code(Bin, SizeReg, Dst, Base, Offset, Unit,
 		  TrueLblName, FalseLblName) ->
   [SrcBase] = create_unsafe_regs(1),
   [SrcOffset, SrcSize, TotSize, TotBytes, UsedBytes] = create_regs(5),
@@ -372,13 +386,13 @@ not_writable_code(Bin, SizeReg, Dst, Base, Offset,
    hipe_rtl:mk_alu(TotBytes, TotSize, add, ?LOW_BITS),
    hipe_rtl:mk_alu(TotBytes, TotBytes, srl, ?BYTE_SHIFT),
    hipe_rtl:mk_alu(UsedBytes, TotBytes, sll, hipe_rtl:mk_imm(1)),
-   hipe_rtl:mk_branch(UsedBytes, ge, hipe_rtl:mk_imm(256), 
+   hipe_rtl:mk_branch(UsedBytes, geu, hipe_rtl:mk_imm(256),
 		      AllLblName, IncLblName),
    IncLbl,
    hipe_rtl:mk_move(UsedBytes, hipe_rtl:mk_imm(256)),
    AllLbl,
    allocate_writable(Dst, Base, UsedBytes, TotBytes, TotSize),
-   put_binary_all(Offset, Bin, Base, hipe_rtl:mk_imm(0), 
+   put_binary_all(Offset, Bin, Base, hipe_rtl:mk_imm(0), Unit,
 		  TrueLblName, FalseLblName)].
   
 allocate_writable(Dst, Base, UsedBytes, TotBytes, TotSize) ->
@@ -397,16 +411,6 @@ allocate_writable(Dst, Base, UsedBytes, TotBytes, TotSize) ->
    hipe_tagscheme:mk_sub_binary(Dst, EndSubSize, Zero, EndSubBitSize,
 				Zero, hipe_rtl:mk_imm(1), ProcBin)].
 
-check_and_untag_fixnum(Size, SizeReg, FalseLblName) ->
-  [ContLbl,NextLbl] = Lbls = create_lbls(2),
-  [ContLblName,NextLblName] = get_label_names(Lbls),
-  [hipe_tagscheme:test_fixnum(Size, ContLblName, FalseLblName, 0.99),
-   ContLbl,
-   hipe_tagscheme:untag_fixnum(SizeReg,Size),
-   hipe_rtl:mk_branch(SizeReg, ge, hipe_rtl:mk_imm(0), NextLblName, 
-		      FalseLblName),
-   NextLbl].
-
 realloc_binary(SizeReg, ProcBin, Base) -> 
   [NoReallocLbl, ReallocLbl, NextLbl, ContLbl] = Lbls = create_lbls(4),
   [NoReallocLblName, ReallocLblName, NextLblName, ContLblName] =
@@ -428,7 +432,7 @@ realloc_binary(SizeReg, ProcBin, Base) ->
    set_field_from_term(ProcBinFlagsTag, ProcBin, Flags),
    get_field_from_term(ProcBinValTag, ProcBin, BinPointer),
    get_field_from_pointer(BinOrigSizeTag, BinPointer, OrigSize),
-   hipe_rtl:mk_branch(OrigSize, 'lt', ResultingSize, 
+   hipe_rtl:mk_branch(OrigSize, 'ltu', ResultingSize,
 		      ReallocLblName, NoReallocLblName),
    NoReallocLbl,
    get_field_from_term(ProcBinBytesTag, ProcBin, Base),
@@ -669,14 +673,14 @@ var_init2(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName
   WordSize = hipe_rtl_arch:word_size(),
   [ContLbl,HeapLbl,REFCLbl,NextLbl] = create_lbls(4),
   [USize,Tmp] = create_unsafe_regs(2),
-  [get_32_bit_value(Size, USize, SystemLimitLblName, FalseLblName),
-   hipe_rtl:mk_branch(USize, le, hipe_rtl:mk_imm(?MAX_BINSIZE), 
-		      hipe_rtl:label_name(ContLbl), 
-		      SystemLimitLblName),
+  [get_word_integer(Size, USize, SystemLimitLblName, FalseLblName),
+   hipe_rtl:mk_branch(USize, leu, hipe_rtl:mk_imm(?MAX_BINSIZE),
+                     hipe_rtl:label_name(ContLbl),
+                     SystemLimitLblName),
    ContLbl,
    hipe_rtl:mk_move(Offset, hipe_rtl:mk_imm(0)),
-   hipe_rtl:mk_branch(USize, le, hipe_rtl:mk_imm(?MAX_HEAP_BIN_SIZE), 
-		      hipe_rtl:label_name(HeapLbl), 
+   hipe_rtl:mk_branch(USize, leu, hipe_rtl:mk_imm(?MAX_HEAP_BIN_SIZE),
+		      hipe_rtl:label_name(HeapLbl),
 		      hipe_rtl:label_name(REFCLbl)),
    HeapLbl,
    hipe_rtl:mk_alu(Tmp, USize, add, hipe_rtl:mk_imm(3*WordSize-1)),
@@ -694,8 +698,8 @@ var_init2(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName
    hipe_rtl:mk_goto(TrueLblName)].
 
 var_init_bits(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName) ->
-  [HeapLbl,REFCLbl,NextLbl,NoSubLbl,SubLbl,ContLbl,
-   NoCreateSubBin, CreateSubBin, JoinLbl, JoinLbl2] = create_lbls(10),
+  [HeapLbl,REFCLbl,NextLbl,NoSubLbl,SubLbl,
+   NoCreateSubBin, CreateSubBin, JoinLbl, JoinLbl2] = create_lbls(9),
   [USize,ByteSize,TotByteSize,OffsetBits] = create_regs(4),
   [TmpDst] = create_unsafe_regs(1),
   Log2WordSize = hipe_rtl_arch:log2_word_size(),
@@ -705,7 +709,7 @@ var_init_bits(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLbl
 	       ?PROC_BIN_WORDSIZE) + ?SUB_BIN_WORDSIZE,
   Zero = hipe_rtl:mk_imm(0),
   [hipe_rtl:mk_gctest(MaximumWords),
-   get_32_bit_value(Size, USize, SystemLimitLblName, FalseLblName),
+   get_word_integer(Size, USize, SystemLimitLblName, FalseLblName),
    hipe_rtl:mk_alu(ByteSize, USize, srl, ?BYTE_SHIFT),
    hipe_rtl:mk_alub(OffsetBits, USize, 'and', ?LOW_BITS, eq, 
 		    hipe_rtl:label_name(NoSubLbl),
@@ -716,11 +720,7 @@ var_init_bits(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLbl
    SubLbl,
    hipe_rtl:mk_alu(TotByteSize, ByteSize, 'add', hipe_rtl:mk_imm(1)),
    JoinLbl,
-   hipe_rtl:mk_branch(USize, le, hipe_rtl:mk_imm(?MAX_BINSIZE), 
-		      hipe_rtl:label_name(ContLbl), 
-		      SystemLimitLblName),
-   ContLbl,
-   hipe_rtl:mk_branch(TotByteSize, 'le', hipe_rtl:mk_imm(?MAX_HEAP_BIN_SIZE),
+   hipe_rtl:mk_branch(TotByteSize, 'leu', hipe_rtl:mk_imm(?MAX_HEAP_BIN_SIZE),
 		      hipe_rtl:label_name(HeapLbl), 
 		      hipe_rtl:label_name(REFCLbl)),
    HeapLbl,
@@ -743,13 +743,16 @@ var_init_bits(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLbl
    hipe_rtl:mk_move(Dst, TmpDst),
    hipe_rtl:mk_goto(TrueLblName)].
 
-put_binary_all(NewOffset, Src, Base, Offset, TLName, FLName) -> 
+put_binary_all(NewOffset, Src, Base, Offset, Unit, TLName, FLName) ->
   [SrcBase,SrcOffset,NumBits] = create_regs(3),
+  [ContLbl] = create_lbls(1),
   CCode = binary_c_code(NewOffset, Src, Base, Offset, NumBits, TLName),
   AlignedCode = copy_aligned_bytes(SrcBase, SrcOffset, NumBits, Base, Offset, 
 				   NewOffset, TLName),
-  get_base_offset_size(Src, SrcBase, SrcOffset, NumBits,FLName) ++
-    test_alignment(SrcOffset, NumBits, Offset, AlignedCode, CCode).
+  [get_base_offset_size(Src, SrcBase, SrcOffset, NumBits,FLName),
+   is_divisible(NumBits, Unit, hipe_rtl:label_name(ContLbl), FLName),
+   ContLbl
+   |test_alignment(SrcOffset, NumBits, Offset, AlignedCode, CCode)].
 
 test_alignment(SrcOffset, NumBits, Offset, AlignedCode, CCode) ->
   [Tmp] = create_regs(1),  
@@ -976,7 +979,7 @@ copy_string(StringBase, StringSize, BinBase, BinOffset, NewOffset, TrueLblName)
 
 small_check(SizeVar, CopySize, FalseLblName) ->
   SuccessLbl = hipe_rtl:mk_new_label(),
-  [hipe_rtl:mk_branch(SizeVar, le, CopySize,
+  [hipe_rtl:mk_branch(SizeVar, leu, CopySize,
 		      hipe_rtl:label_name(SuccessLbl), FalseLblName),
    SuccessLbl].
 
@@ -1279,89 +1282,18 @@ copy_float_big(Base, Offset, NewOffset, Src, FalseLblName, TrueLblName, var) ->
   hipe_tagscheme:test_flonum(Src, hipe_rtl:label_name(SuccessLbl), FalseLblName, 0.99) ++
     [SuccessLbl|copy_float_big(Base, Offset, NewOffset, Src, FalseLblName, TrueLblName, pass)].
 
-make_size(1, BitsVar, FalseLblName) ->
-  [DstReg] = create_regs(1),
-  {first_part(BitsVar, DstReg, FalseLblName), DstReg};
-make_size(?BYTE_SIZE, BitsVar, FalseLblName) ->
-  [DstReg] = create_regs(1),
-  Code = 
-    first_part(BitsVar, DstReg, FalseLblName) ++
-    [hipe_rtl:mk_alu(DstReg, DstReg, 'sll', ?BYTE_SHIFT)],
-  {Code, DstReg};
-make_size(UnitImm, BitsVar, FalseLblName) ->
-  [DstReg] = create_regs(1),
-  UnitList = number2list(UnitImm),
-  Code = multiply_code(UnitList, BitsVar, DstReg, FalseLblName),
-  {Code, DstReg}.
-
-multiply_code(List=[Head|_Tail], Variable, Result, FalseLblName) ->
-  Test = set_high(Head),
-  Tmp1 = hipe_rtl:mk_new_reg(),
-  SuccessLbl = hipe_rtl:mk_new_label(),
-  Register = hipe_rtl:mk_new_reg(),
-  Code = [hipe_rtl:mk_move(Result, hipe_rtl:mk_imm(0))|
-	  first_part(Variable, Register, FalseLblName)]
-    ++
-    [hipe_rtl:mk_alub(Tmp1, Register, 'and', hipe_rtl:mk_imm(Test), 
-		      'eq', hipe_rtl:label_name(SuccessLbl), 
-		      FalseLblName, 0.99),
-     SuccessLbl],
-  multiply_code(List, Register, Result, FalseLblName, Tmp1, Code).
-
-multiply_code([ShiftSize|Rest], Register, Result, FalseLblName, Tmp1, OldCode) ->
-  SuccessLbl = hipe_rtl:mk_new_label(),
-  Code = OldCode ++ [hipe_rtl:mk_alu(Tmp1, Register, 'sll',
-				     hipe_rtl:mk_imm(ShiftSize)),
-		     hipe_rtl:mk_alub(Result, Tmp1, 'add', Result, not_overflow, hipe_rtl:label_name(SuccessLbl), FalseLblName, 0.99),
-		     SuccessLbl],
-  multiply_code(Rest, Register, Result, FalseLblName, Tmp1, Code);
-multiply_code([], _Register, _Result, _FalseLblName, _Tmp1, Code) ->
-  Code.
-
-number2list(X) when is_integer(X), X >= 0 ->
-  number2list(X, []).
-
-number2list(1, Acc) ->
-  lists:reverse([0|Acc]);
-number2list(0, Acc) ->
-  lists:reverse(Acc);
-number2list(X, Acc) ->
-  F = floorlog2(X),
-  number2list(X-(1 bsl F), [F|Acc]).
-
-floorlog2(X) ->
-  round(math:log(X)/math:log(2)-0.5). 
-
-set_high(X) ->
-  set_high(X, 0).
-
-set_high(0, Y) ->
-  Y;
-set_high(X, Y) ->
-  set_high(X-1, Y+(1 bsl (27-X))).
-
-get_32_bit_value(Size, USize, SystemLimitLblName, NegLblName) ->
-  Lbls = [FixLbl, BigLbl, OkLbl, PosBigLbl] = create_lbls(4),
-  [FixLblName, BigLblName, OkLblName, PosBigLblName] = [hipe_rtl:label_name(Lbl) || Lbl <- Lbls],
-  [hipe_tagscheme:test_fixnum(Size, FixLblName, BigLblName, 0.99),
-   FixLbl,
-   hipe_tagscheme:untag_fixnum(USize, Size),
-   hipe_rtl:mk_branch(USize, ge, hipe_rtl:mk_imm(0), OkLblName, NegLblName), 
-   BigLbl,
-   hipe_tagscheme:test_pos_bignum(Size, PosBigLblName, NegLblName, 0.99),
-   PosBigLbl,
-   hipe_tagscheme:get_one_word_pos_bignum(USize, Size, SystemLimitLblName),
-   OkLbl].  
-   
-
-first_part(Var, Register, FalseLblName) ->
-  [SuccessLbl1, SuccessLbl2] = create_lbls(2),
-  [hipe_tagscheme:test_fixnum(Var, hipe_rtl:label_name(SuccessLbl1),
-			      FalseLblName, 0.99),
-  SuccessLbl1,
-  hipe_tagscheme:fixnum_ge(Var, hipe_rtl:mk_imm(hipe_tagscheme:mk_fixnum(0)), 
-			   hipe_rtl:label_name(SuccessLbl2), FalseLblName, 0.99),
-  SuccessLbl2,
-  hipe_tagscheme:untag_fixnum(Register, Var)].
-
-
+is_divisible(_Dividend, 1, SuccLbl, _FailLbl) ->
+  [hipe_rtl:mk_goto(SuccLbl)];
+is_divisible(Dividend, Divisor, SuccLbl, FailLbl) ->
+  Log2 = floorlog2(Divisor),
+  case Divisor =:= 1 bsl Log2 of
+    true -> %% Divisor is a power of 2
+      %% Test that the Log2-1 lowest bits are clear
+      Mask = hipe_rtl:mk_imm(Divisor - 1),
+      [Tmp] = create_regs(1),
+      [hipe_rtl:mk_alub(Tmp, Dividend, 'and', Mask, eq, SuccLbl, FailLbl, 0.99)];
+    false ->
+      %% We need division, fall back to a primop
+      [hipe_rtl:mk_call([], is_divisible, [Dividend, hipe_rtl:mk_imm(Divisor)],
+			SuccLbl, FailLbl, not_remote)]
+  end.
diff --git a/lib/hipe/rtl/hipe_rtl_binary_match.erl b/lib/hipe/rtl/hipe_rtl_binary_match.erl
index 51213b71d1..be4c35dae0 100644
--- a/lib/hipe/rtl/hipe_rtl_binary_match.erl
+++ b/lib/hipe/rtl/hipe_rtl_binary_match.erl
@@ -31,11 +31,12 @@
 
 -import(hipe_tagscheme, [set_field_from_term/3, get_field_from_term/3]).
 
+-import(hipe_rtl_binary, [make_size/3]).
+
 -include("hipe_literals.hrl").
 
 %%--------------------------------------------------------------------
 
--define(MAX_BINSIZE, trunc(?MAX_HEAP_BIN_SIZE / hipe_rtl_arch:word_size()) + 2).
 -define(BYTE_SHIFT, 3). %% Turn bits into bytes or vice versa
 -define(LOW_BITS, 7). %% Three lowest bits set 
 -define(BYTE_SIZE, 8).
@@ -333,32 +334,50 @@ float_get_c_code(Dst1, Ms, Size, Flags, TrueLblName, FalseLblName) ->
 get_c_code(Func, Dst1, Ms, Size, Flags, TrueLblName, FalseLblName) ->  
   SizeReg = hipe_rtl:mk_new_reg_gcsafe(),
   FlagsReg = hipe_rtl:mk_new_reg_gcsafe(),
+  RetReg = hipe_rtl:mk_new_reg_gcsafe(),
   MatchBuf = hipe_rtl:mk_new_reg(),
   RetLabel = hipe_rtl:mk_new_label(),
+  OkLabel = hipe_rtl:mk_new_label(),
   NonVal = hipe_rtl:mk_imm(hipe_tagscheme:mk_non_value()),
   [hipe_rtl:mk_move(SizeReg, Size),
    hipe_rtl:mk_move(FlagsReg, hipe_rtl:mk_imm(Flags)),
    hipe_tagscheme:extract_matchbuffer(MatchBuf, Ms),
-   hipe_rtl_arch:call_bif([Dst1], Func, [SizeReg, FlagsReg, MatchBuf], 
+   hipe_rtl_arch:call_bif([RetReg], Func, [SizeReg, FlagsReg, MatchBuf],
 			  hipe_rtl:label_name(RetLabel), FalseLblName), 
    RetLabel,
-   hipe_rtl:mk_branch(Dst1, eq, NonVal, FalseLblName, TrueLblName, 0.01)].
+   hipe_rtl:mk_branch(RetReg, eq, NonVal, FalseLblName,
+		      hipe_rtl:label_name(OkLabel), 0.01),
+   OkLabel,
+   hipe_rtl:mk_move(Dst1, RetReg),
+   hipe_rtl:mk_goto(TrueLblName)].
 
 utf8_get_c_code(Dst, Ms, TrueLblName, FalseLblName) ->
+  RetReg = hipe_rtl:mk_new_reg_gcsafe(),
+  OkLabel = hipe_rtl:mk_new_label(),
   MatchBuf = hipe_rtl:mk_new_reg(),
   NonVal = hipe_rtl:mk_imm(hipe_tagscheme:mk_non_value()),
   [hipe_tagscheme:extract_matchbuffer(MatchBuf, Ms),
-   hipe_rtl_arch:call_bif([Dst], bs_get_utf8, [MatchBuf], [], []),
-   hipe_rtl:mk_branch(Dst, eq, NonVal, FalseLblName, TrueLblName, 0.01)].
+   hipe_rtl_arch:call_bif([RetReg], bs_get_utf8, [MatchBuf], [], []),
+   hipe_rtl:mk_branch(RetReg, eq, NonVal, FalseLblName,
+		      hipe_rtl:label_name(OkLabel), 0.01),
+   OkLabel,
+   hipe_rtl:mk_move(Dst, RetReg),
+   hipe_rtl:mk_goto(TrueLblName)].
 
 utf16_get_c_code(Flags, Dst, Ms, TrueLblName, FalseLblName) ->
+  RetReg = hipe_rtl:mk_new_reg_gcsafe(),
+  OkLabel = hipe_rtl:mk_new_label(),
   MatchBuf = hipe_rtl:mk_new_reg(),
   NonVal = hipe_rtl:mk_imm(hipe_tagscheme:mk_non_value()),
   FlagsReg = hipe_rtl:mk_new_reg_gcsafe(),
   [hipe_tagscheme:extract_matchbuffer(MatchBuf, Ms),
    hipe_rtl:mk_move(FlagsReg, hipe_rtl:mk_imm(Flags)),
-   hipe_rtl_arch:call_bif([Dst], bs_get_utf16, [MatchBuf, FlagsReg], [], []),
-   hipe_rtl:mk_branch(Dst, eq, NonVal, FalseLblName, TrueLblName, 0.01)].
+   hipe_rtl_arch:call_bif([RetReg], bs_get_utf16, [MatchBuf, FlagsReg], [], []),
+   hipe_rtl:mk_branch(RetReg, eq, NonVal, FalseLblName,
+		      hipe_rtl:label_name(OkLabel), 0.01),
+   OkLabel,
+   hipe_rtl:mk_move(Dst, RetReg),
+   hipe_rtl:mk_goto(TrueLblName)].
 
 validate_unicode_retract_c_code(Src, Ms, TrueLblName, FalseLblName) ->
   MatchBuf = hipe_rtl:mk_new_reg(),
@@ -817,10 +836,10 @@ create_lbls(0) ->
 create_lbls(X) when X > 0 ->
   [hipe_rtl:mk_new_label()|create_lbls(X-1)].
 
-make_dyn_prep(SizeReg, CCode) ->   
+make_dyn_prep(SizeReg, CCode) ->
   [CLbl, SuccessLbl] = create_lbls(2),
-  Init = [hipe_rtl:mk_branch(SizeReg, le, hipe_rtl:mk_imm(?MAX_SMALL_BITS),  
-			     hipe_rtl:label_name(SuccessLbl), 
+  Init = [hipe_rtl:mk_branch(SizeReg, leu, hipe_rtl:mk_imm(?MAX_SMALL_BITS),
+			     hipe_rtl:label_name(SuccessLbl),
 			     hipe_rtl:label_name(CLbl)),
 	  SuccessLbl],
   End = [CLbl|CCode],
@@ -865,8 +884,8 @@ get_unaligned_int_to_reg(Reg, Size, Base, Offset, LowBits, Shiftr, Type) ->
 			 hipe_rtl:mk_imm((WordSize-MinLoad)*?BYTE_SIZE))];
       {_, WordSize} ->
 	UnsignedBig = {unsigned, big},
-	[hipe_rtl:mk_branch(TotBits, le, hipe_rtl:mk_imm(MinLoad*?BYTE_SIZE), 
-			    hipe_rtl:label_name(LessLbl), 
+	[hipe_rtl:mk_branch(TotBits, leu, hipe_rtl:mk_imm(MinLoad*?BYTE_SIZE),
+			    hipe_rtl:label_name(LessLbl),
 			    hipe_rtl:label_name(MoreLbl)),
 	 LessLbl,
 	 load_bytes(LoadDst, Base, ByteOffset, Type, MinLoad),
@@ -926,7 +945,7 @@ get_big_unknown_int(Dst1, Base, Offset, NewOffset,
    hipe_rtl:mk_alu(ByteOffset, Offset, srl, hipe_rtl:mk_imm(?BYTE_SHIFT)),
    load_bytes(LoadDst, Base, ByteOffset, Type, 1),
    BackLbl,
-   hipe_rtl:mk_branch(ByteOffset, le, Limit, hipe_rtl:label_name(LoopLbl), 
+   hipe_rtl:mk_branch(ByteOffset, leu, Limit, hipe_rtl:label_name(LoopLbl),
 		      hipe_rtl:label_name(EndLbl)),
    LoopLbl,
    load_bytes(Tmp, Base, ByteOffset, {unsigned, big}, 1),
@@ -955,8 +974,8 @@ get_little_unknown_int(Dst1, Base, Offset, NewOffset,
    hipe_rtl:mk_alu(Limit, Tmp, srl, hipe_rtl:mk_imm(?BYTE_SHIFT)),
    hipe_rtl:mk_move(ShiftReg, hipe_rtl:mk_imm(0)),
    BackLbl,
-   hipe_rtl:mk_branch(ByteOffset, lt, Limit, 
-		      hipe_rtl:label_name(LoopLbl), 
+   hipe_rtl:mk_branch(ByteOffset, ltu, Limit,
+		      hipe_rtl:label_name(LoopLbl),
 		      hipe_rtl:label_name(DoneLbl)),
    LoopLbl,
    load_bytes(Tmp, Base, ByteOffset, {unsigned, big}, 1),
@@ -1072,7 +1091,7 @@ load_bytes(Dst, Base, Offset, {Signedness, Endianness}, X) when X > 1 ->
        hipe_rtl:mk_alu(Offset, Offset, add, hipe_rtl:mk_imm(1)),
        hipe_rtl:mk_alu(Dst, Dst, sll, hipe_rtl:mk_imm(8)),
        hipe_rtl:mk_alu(Dst, Dst, 'or', Tmp1),
-       hipe_rtl:mk_branch(Offset, lt, Limit, hipe_rtl:label_name(LoopLbl),
+       hipe_rtl:mk_branch(Offset, ltu, Limit, hipe_rtl:label_name(LoopLbl),
 			  hipe_rtl:label_name(EndLbl)),
        EndLbl];
     little ->
@@ -1084,7 +1103,7 @@ load_bytes(Dst, Base, Offset, {Signedness, Endianness}, X) when X > 1 ->
        hipe_rtl:mk_load(Tmp1, Base, TmpOffset, byte, Signedness),
        hipe_rtl:mk_alu(Dst, Dst, sll, hipe_rtl:mk_imm(8)),
        hipe_rtl:mk_alu(Dst, Dst, 'or', Tmp1),
-       hipe_rtl:mk_branch(Offset, lt, TmpOffset, hipe_rtl:label_name(LoopLbl),
+       hipe_rtl:mk_branch(Offset, ltu, TmpOffset, hipe_rtl:label_name(LoopLbl),
 			  hipe_rtl:label_name(EndLbl)),
        EndLbl,
        hipe_rtl:mk_move(Offset, Limit)]
@@ -1100,103 +1119,5 @@ create_gcsafe_regs(X) when X > 0 ->
 create_gcsafe_regs(0) ->
   [].
 
-first_part(Var, Register, FalseLblName) ->
-  [EndLbl] = create_lbls(1),
-  EndName = hipe_rtl:label_name(EndLbl),
-  first_part(Var, Register, FalseLblName, EndName, EndName, [EndLbl]).
-
-first_part(Var, Register, FalseLblName, TrueLblName, BigLblName, Tail) ->
-  [FixnumLbl, NotFixnumLbl, BignumLbl, SuccessLbl] = create_lbls(4),
-  [hipe_tagscheme:test_fixnum(Var, hipe_rtl:label_name(FixnumLbl),
-			      hipe_rtl:label_name(NotFixnumLbl), 0.99),
-   FixnumLbl,
-   hipe_tagscheme:fixnum_ge(Var, hipe_rtl:mk_imm(hipe_tagscheme:mk_fixnum(0)),
-			    hipe_rtl:label_name(SuccessLbl), FalseLblName,
-			    0.99),
-   SuccessLbl,
-   hipe_tagscheme:untag_fixnum(Register, Var),
-   hipe_rtl:mk_goto(TrueLblName),
-   NotFixnumLbl,
-   %% Since binaries are not allowed to be larger than 2^wordsize bits
-   %% and since bignum digits are words, we know that a bignum with an
-   %% arity larger than one can't match.
-   hipe_tagscheme:test_pos_bignum_arity(Var, 1, hipe_rtl:label_name(BignumLbl),
-					FalseLblName, 0.99),
-   BignumLbl,
-   hipe_tagscheme:unsafe_get_one_word_pos_bignum(Register, Var),
-   hipe_rtl:mk_goto(BigLblName) | Tail].
-
-make_size(1, BitsVar, FalseLblName) ->
-  [DstReg] = create_regs(1),
-  {first_part(BitsVar, DstReg, FalseLblName), DstReg};
-make_size(?BYTE_SIZE, BitsVar, FalseLblName) ->
-  [DstReg] = create_regs(1),
-  [FixnumLbl, BignumLbl] = create_lbls(2),
-  WordBits = hipe_rtl_arch:word_size() * ?BYTE_SIZE,
-  FixnumLblName = hipe_rtl:label_name(FixnumLbl),
-  Tail = [BignumLbl,
-	  hipe_rtl:mk_branch(DstReg, 'ltu',
-			     hipe_rtl:mk_imm(1 bsl (WordBits - ?BYTE_SHIFT)),
-			     FixnumLblName, FalseLblName, 0.99),
-	  FixnumLbl,
-	  hipe_rtl:mk_alu(DstReg, DstReg, sll, hipe_rtl:mk_imm(?BYTE_SHIFT))],
-  Code = first_part(BitsVar, DstReg, FalseLblName, FixnumLblName,
-		    hipe_rtl:label_name(BignumLbl), Tail),
-  {Code, DstReg};
-make_size(UnitImm, BitsVar, FalseLblName) ->
-  [DstReg] = create_regs(1),
-  UnitList = number2list(UnitImm),
-  Code = multiply_code(UnitList, BitsVar, DstReg, FalseLblName),
-  {Code, DstReg}.
-
-multiply_code(List=[Head|_Tail], Variable, Result, FalseLblName) ->
-  Test = set_high(Head),
-  Tmp1 = hipe_rtl:mk_new_reg(),
-  SuccessLbl = hipe_rtl:mk_new_label(),
-  Register = hipe_rtl:mk_new_reg(),
-  Code = [hipe_rtl:mk_move(Result, hipe_rtl:mk_imm(0))|
-	  first_part(Variable, Register, FalseLblName)]
-	++
-	 [hipe_rtl:mk_alub(Tmp1, Register, 'and', hipe_rtl:mk_imm(Test), 
-			   eq, hipe_rtl:label_name(SuccessLbl), 
-			   FalseLblName, 0.99),
-	  SuccessLbl],
-  multiply_code(List, Register, Result, FalseLblName, Tmp1, Code).
-
-multiply_code([ShiftSize|Rest], Register, Result, FalseLblName, Tmp1, OldCode) ->
-  SuccessLbl = hipe_rtl:mk_new_label(),
-  Code =
-    OldCode ++
-    [hipe_rtl:mk_alu(Tmp1, Register, sll, hipe_rtl:mk_imm(ShiftSize)),
-     hipe_rtl:mk_alub(Result, Tmp1, 'add', Result, not_overflow,
-		      hipe_rtl:label_name(SuccessLbl), FalseLblName, 0.99),
-     SuccessLbl],
-  multiply_code(Rest, Register, Result, FalseLblName, Tmp1, Code);
-multiply_code([], _Register, _Result, _FalseLblName, _Tmp1, Code) ->
-  Code.
-
-number2list(X) when is_integer(X), X >= 0 ->
-  number2list(X, []).
-
-number2list(1, Acc) ->
-  lists:reverse([0|Acc]);
-number2list(0, Acc) ->
-  lists:reverse(Acc);
-number2list(X, Acc) ->
-  F = floorlog2(X),
-  number2list(X-(1 bsl F), [F|Acc]).
-
-floorlog2(X) ->
-  round(math:log(X)/math:log(2)-0.5). 
-
-set_high(X) ->
-  WordBits = hipe_rtl_arch:word_size() * ?BYTE_SIZE,
-  set_high(min(X, WordBits), WordBits, 0).
-
-set_high(0, _, Y) ->
-  Y;
-set_high(X, WordBits, Y) ->
-  set_high(X-1, WordBits, Y+(1 bsl (WordBits-X))).
-
 is_illegal_const(Const) ->
   Const >=  1 bsl (hipe_rtl_arch:word_size() * ?BYTE_SIZE) orelse Const < 0.
diff --git a/lib/hipe/rtl/hipe_tagscheme.erl b/lib/hipe/rtl/hipe_tagscheme.erl
index d77078acb6..8825a3ade3 100644
--- a/lib/hipe/rtl/hipe_tagscheme.erl
+++ b/lib/hipe/rtl/hipe_tagscheme.erl
@@ -42,7 +42,7 @@
 	 test_ref/4, test_fun/4, test_fun2/5, test_matchstate/4,
 	 test_binary/4, test_bitstr/4, test_list/4, test_map/4,
 	 test_integer/4, test_number/4, test_tuple_N/5,
-	 test_pos_bignum_arity/5]).
+	 test_pos_bignum_arity/6]).
 -export([realtag_fixnum/2, tag_fixnum/2, realuntag_fixnum/2, untag_fixnum/2]).
 -export([test_two_fixnums/3, test_fixnums/4, unsafe_fixnum_add/3,
 	 unsafe_fixnum_sub/3,
@@ -351,14 +351,23 @@ test_pos_bignum(X, TrueLab, FalseLab, Pred) ->
    mask_and_compare(Tmp, BigMask, ?TAG_HEADER_POS_BIG,
 		    TrueLab, FalseLab, Pred)].
 
-test_pos_bignum_arity(X, Arity, TrueLab, FalseLab, Pred) ->
+test_pos_bignum_arity(X, Arity, TrueLab, NotPosBignumLab, FalseLab, Pred) ->
   Tmp = hipe_rtl:mk_new_reg_gcsafe(),
-  HalfTrueLab = hipe_rtl:mk_new_label(),
+  BoxedLab = hipe_rtl:mk_new_label(),
   HeaderImm = hipe_rtl:mk_imm(mk_header(Arity, ?TAG_HEADER_POS_BIG)),
-  [test_is_boxed(X, hipe_rtl:label_name(HalfTrueLab), FalseLab, Pred),
-   HalfTrueLab,
-   get_header(Tmp, X),
-   hipe_rtl:mk_branch(Tmp, 'eq', HeaderImm, TrueLab, FalseLab, Pred)].
+  [test_is_boxed(X, hipe_rtl:label_name(BoxedLab), NotPosBignumLab, Pred),
+   BoxedLab,
+   get_header(Tmp, X)] ++
+    case NotPosBignumLab =:= FalseLab of
+      true -> [];
+      false ->
+	BignumLab = hipe_rtl:mk_new_label(),
+	BigMask = ?TAG_HEADER_MASK,
+	[mask_and_compare(Tmp, BigMask, ?TAG_HEADER_POS_BIG,
+			  hipe_rtl:label_name(BignumLab), NotPosBignumLab, Pred),
+	 BignumLab]
+    end ++
+    [hipe_rtl:mk_branch(Tmp, 'eq', HeaderImm, TrueLab, FalseLab, Pred)].
 
 test_matchstate(X, TrueLab, FalseLab, Pred) ->
   Tmp = hipe_rtl:mk_new_reg_gcsafe(),
diff --git a/lib/hipe/test/Makefile b/lib/hipe/test/Makefile
index 009f503abb..09f4fd2129 100644
--- a/lib/hipe/test/Makefile
+++ b/lib/hipe/test/Makefile
@@ -10,8 +10,10 @@ MODULES= \
 
 # .erl files for these modules are automatically generated
 GEN_MODULES= \
+	basic_SUITE \
 	bs_SUITE \
-	maps_SUITE
+	maps_SUITE \
+	sanity_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -34,7 +36,7 @@ RELSYSDIR = $(RELEASE_PATH)/hipe_test
 # ----------------------------------------------------
 
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
diff --git a/lib/hipe/test/basic_SUITE_data/basic_arith.erl b/lib/hipe/test/basic_SUITE_data/basic_arith.erl
new file mode 100644
index 0000000000..28e99be053
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_arith.erl
@@ -0,0 +1,72 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%---------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains tests cases for compilation of arithmetic.
+%%%---------------------------------------------------------------------
+-module(basic_arith).
+
+-export([test/0]).
+
+test() ->
+  ok = test_rem(),
+  ok = test_bit_ops(),
+  ok = test_uplus(),
+  ok = test_bsl_errors(),
+  ok.
+
+%%----------------------------------------------------------------------
+%% Tests the remainder operator.
+
+test_rem() ->
+   2 = ret_rem(42, 20),
+  -2 = ret_rem(-42, 20),
+  -2 = ret_rem(-42, -20),
+  {'EXIT', {badarith, _}} = ret_rem(3.14, 2),
+  {'EXIT', {badarith, _}} = ret_rem(42, 3.14),
+  ok.
+
+ret_rem(X, Y) ->
+  catch X rem Y.
+
+%%----------------------------------------------------------------------
+%%
+
+test_bit_ops() ->
+  2 = bbb(11, 2, 16#3ff),
+  ok.
+
+bbb(X, Y, Z) ->
+  ((1 bsl X) bor Y) band Z.
+
+%%----------------------------------------------------------------------
+%% Tests unary plus: it used to be the identity function but not anymore
+
+test_uplus() ->
+  badarith = try uplus(gazonk) catch error:Err -> Err end,
+  42 = uplus(42),
+  ok.
+
+uplus(X) -> +(X).
+
+%%----------------------------------------------------------------------
+%% The first part of this test triggered a bug in the emulator as one
+%% of the arguments to bsl is not an integer.
+%%
+%% The second part triggered a compilation crash since an arithmetic
+%% expression resulting in a 'system_limit' exception was statically
+%% evaluated and an arithmetic result was expected.
+
+test_bsl_errors() ->
+  {'EXIT', {'badarith', _}} = (catch (t1(0, pad, 0))),
+  badarith = try t2(0, pad, 0) catch error:Err1 -> Err1 end,
+  system_limit = try (id(1) bsl 100000000) catch error:Err2 -> Err2 end,
+  ok.
+
+t1(_, X, _) ->
+  (1 bsl X) + 1.
+
+t2(_, X, _) ->
+  (X bsl 1) + 1.
+
+id(I) -> I.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_beam_instrs.erl b/lib/hipe/test/basic_SUITE_data/basic_beam_instrs.erl
new file mode 100644
index 0000000000..6fafea3b09
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_beam_instrs.erl
@@ -0,0 +1,102 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Tests for correct translation of various BEAM instructions.
+%%%-------------------------------------------------------------------
+-module(basic_beam_instrs).
+
+-export([test/0]).
+
+test() ->
+  ok = test_make_fun(),
+  ok = test_switch_val(),
+  ok = test_put_literal(),
+  ok = test_set_tuple_element(),
+  ok = test_unguarded_unsafe_element(),
+  ok.
+
+%%--------------------------------------------------------------------
+%% Tests whether the translation of make_fun works.
+
+test_make_fun() ->
+  {F, G} = double_the_fun(),
+  ok = F(),
+  {ok, 42} = G(42),
+  FV1 = {ok, free_var1},
+  FV2 = {also, {free, var2}},
+  {FV1, {ok, [bv]}, FV2} = contains_fun(FV1, ignored, FV2),
+  ok.
+
+double_the_fun() ->
+  {fun () -> ok end, fun (V) -> {ok, V} end}.
+
+contains_fun(X, _IGNORED_ARG, Y) ->
+  calls_fun(fun(Term) -> {X, Term, Y} end).
+
+calls_fun(F) ->
+  F({ok, [bv]}).
+
+%%--------------------------------------------------------------------
+%% Tests whether the translation of switch_val works.
+
+test_switch_val() ->
+  'A' = sv(a),
+  'B' = sv(b),
+  'C' = sv(c),
+  foo = sv(d),
+  ok.
+
+sv(a) -> 'A';
+sv(b) -> 'B';
+sv(c) -> 'C';
+sv(_) -> foo.
+
+%%--------------------------------------------------------------------
+%% Tests correct handling of literals (statically constant terms)
+
+-define(QUADRUPLE, {a,b,c,42}).
+-define(DEEP_LIST, [42,[42,[42]]]).
+
+test_put_literal() ->
+  ?QUADRUPLE = mk_literal_quadruple(),
+  ?DEEP_LIST = mk_literal_deep_list(),
+  ok.
+
+mk_literal_quadruple() ->
+  ?QUADRUPLE.
+
+mk_literal_deep_list() ->
+  ?DEEP_LIST.
+
+%%--------------------------------------------------------------------
+%% Tests whether the translation of set_tuple_element works.
+
+-record(rec, {f1, f2, f3, f4, f5}).
+
+test_set_tuple_element() ->
+  F2 = [a,b,c], F4 = {a,b},
+  State0 = init_rec(F2, F4),
+  State1 = simple_set(State0, 42),
+  #rec{f1 = foo, f2 = F2, f3 = 42, f4 = F4, f5 = 42.0} = odd_set(State1, 21),
+  ok.
+
+init_rec(F2, F4) ->
+  #rec{f1 = bar, f2 = F2, f3 = 10, f4 = F4, f5 = 3.14}.
+
+simple_set(State, Val) ->            %% f3 = Val is the one used in set_element;
+  State#rec{f3 = Val, f5 = Val*2}.   %% this checks the case of variable
+
+odd_set(State, Val) ->               %% f3 = foo is the one used in set_element;
+  State#rec{f1 = foo, f5 = Val*2.0}. %% this checks the case of constant
+
+%%--------------------------------------------------------------------
+%% Tests the handling of unguarded unsafe_element operations that BEAM
+%% can sometimes construct on records (when it has enough context).
+
+test_unguarded_unsafe_element() ->
+  {badrecord, rec} = try unguarded_unsafe_element(42) catch error:E -> E end,
+  ok.
+
+unguarded_unsafe_element(X) ->
+  X#rec{f1 = X#rec.f3}.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_bifs.erl b/lib/hipe/test/basic_SUITE_data/basic_bifs.erl
new file mode 100644
index 0000000000..e7ee2f3678
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_bifs.erl
@@ -0,0 +1,257 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains tests for handling of BIFs in guards and body calls.
+%%%-------------------------------------------------------------------
+-module(basic_bifs).
+
+-export([test/0]).
+
+-define(BIG, 1398479237498374913984792374983749).
+
+test() ->
+  ok = test_abs(),
+  ok = test_binary_part(),
+  ok = test_element(),
+  ok = test_float(),
+  ok = test_float_to_list(),
+  ok = test_integer_to_list(),
+  ok = test_list_to_float(),
+  ok = test_list_to_integer(),
+  ok = test_round(),
+  ok = test_trunc(),
+  ok.
+
+%%--------------------------------------------------------------------
+
+test_abs() ->
+  t_abs(5.5, 0.0, -100.0, 5, 0, -100, ?BIG).
+
+t_abs(F1, F2, F3, I1, I2, I3, BigNum) ->
+  %% Floats.
+  5.5 = abs(F1),
+  0.0 = abs(F2),
+  100.0 = abs(F3),
+  %% Integers.
+  5 = abs(I1),
+  0 = abs(I2),
+  100 = abs(I3),
+  %% Bignums.
+  BigNum = abs(BigNum),
+  BigNum = abs(-BigNum),
+  ok.
+
+%%--------------------------------------------------------------------
+%% Checks that 2-ary and 3-ary BIFs can be compiled to native code.
+
+test_binary_part() ->
+  Bin = <<1,2,3,4,5,6,7,8,9,10>>,
+  BinPart = bp3(Bin),
+  <<7,8>> = bp2(BinPart),
+  ok.
+
+bp2(Bin) ->
+  binary_part(Bin, {1, 2}).
+
+bp3(Bin) ->
+  binary_part(Bin, byte_size(Bin), -5).
+
+%%--------------------------------------------------------------------
+
+test_element() ->
+  true  = elem({a, b}),
+  false = elem({a, c}),
+  other = elem(gazonk),
+  ok.
+
+elem(T) when element(1, T) == a -> element(2, T) == b;
+elem(_) -> other.
+
+%%--------------------------------------------------------------------
+
+test_float() ->
+  t_float(0, 42, -100, 2.5, 0.0, -100.42, ?BIG, -?BIG).
+
+t_float(I1, I2, I3, F1, F2, F3, B1, B2) ->
+  0.0 = float(I1),
+  2.5 = float(F1),
+  0.0 = float(F2),
+  -100.42 = float(F3),
+  42.0 = float(I2),
+  -100.0 = float(I3),
+  %% Bignums.
+   1398479237498374913984792374983749.0 = float(B1),
+  -1398479237498374913984792374983749.0 = float(B2),
+  %% Extremly big bignums.
+  Big = list_to_integer(duplicate(2000, $1)),
+  {'EXIT', _} = (catch float(Big)),
+  %% Invalid types and lists.
+  {'EXIT', _} = (catch my_list_to_integer(atom)),
+  {'EXIT', _} = (catch my_list_to_integer(123)),
+  {'EXIT', _} = (catch my_list_to_integer([$1, [$2]])),
+  {'EXIT', _} = (catch my_list_to_integer("1.2")),
+  {'EXIT', _} = (catch my_list_to_integer("a")),
+  {'EXIT', _} = (catch my_list_to_integer("")),
+  ok.
+
+my_list_to_integer(X) ->
+  list_to_integer(X).
+
+%%--------------------------------------------------------------------
+
+test_float_to_list() ->
+  test_ftl("0.0e+0", 0.0),
+  test_ftl("2.5e+1", 25.0),
+  test_ftl("2.5e+0", 2.5),
+  test_ftl("2.5e-1", 0.25),
+  test_ftl("-3.5e+17", -350.0e15),
+  ok.
+
+test_ftl(Expect, Float) ->
+  %% No \n on the next line -- we want the line number from t_float_to_list.
+  Expect = remove_zeros(lists:reverse(float_to_list(Float)), []).
+
+%% Removes any non-significant zeros in a floating point number.
+%% Example: 2.500000e+01 -> 2.5e+1
+
+remove_zeros([$+, $e|Rest], [$0, X|Result]) ->
+  remove_zeros([$+, $e|Rest], [X|Result]);
+remove_zeros([$-, $e|Rest], [$0, X|Result]) ->
+  remove_zeros([$-, $e|Rest], [X|Result]);
+remove_zeros([$0, $.|Rest], [$e|Result]) ->
+  remove_zeros(Rest, [$., $0, $e|Result]);
+remove_zeros([$0|Rest], [$e|Result]) ->
+  remove_zeros(Rest, [$e|Result]);
+remove_zeros([Char|Rest], Result) ->
+  remove_zeros(Rest, [Char|Result]);
+remove_zeros([], Result) ->
+  Result.
+
+%%--------------------------------------------------------------------
+
+test_integer_to_list() ->
+  t_integer_to_list(0, 42, 32768, 268435455, 123456932798748738738).
+
+t_integer_to_list(I1, I2, I3, I4, BIG) ->
+  "0" = integer_to_list(I1),
+  "42" = integer_to_list(I2),
+  "-42" = integer_to_list(-I2),
+  "-42" = integer_to_list(-I2),
+  "32768" = integer_to_list(I3),
+  "268435455" = integer_to_list(I4),
+  "-268435455" = integer_to_list(-I4),
+  "123456932798748738738" = integer_to_list(BIG),
+  BigList = duplicate(2000, $1),
+  Big = list_to_integer(BigList),
+  BigList = integer_to_list(Big),
+  ok.
+
+%%--------------------------------------------------------------------
+
+test_list_to_float() ->
+  ok = t_list_to_float_safe(),
+  ok = t_list_to_float_risky().
+
+t_list_to_float_safe() ->
+  0.0 = my_list_to_float("0.0"),
+  0.0 = my_list_to_float("-0.0"),
+  0.5 = my_list_to_float("0.5"),
+  -0.5 = my_list_to_float("-0.5"),
+  100.0 = my_list_to_float("1.0e2"),
+  127.5 = my_list_to_float("127.5"),
+  -199.5 = my_list_to_float("-199.5"),    
+  {'EXIT', _} = (catch my_list_to_float("0")),
+  {'EXIT', _} = (catch my_list_to_float("0..0")),
+  {'EXIT', _} = (catch my_list_to_float("0e12")),
+  {'EXIT', _} = (catch my_list_to_float("--0.0")),
+  ok.
+
+my_list_to_float(X) ->
+  list_to_float(X).
+
+%% This might crash the emulator. (Used to crash Erlang 4.4.1 on Unix.)
+
+t_list_to_float_risky() ->
+  Many_Ones = duplicate(25000, $1),
+  ok = case list_to_float("2." ++ Many_Ones) of
+	 F when is_float(F), 0.0 < F, F =< 3.14 -> ok
+       end,
+  {'EXIT', _} = (catch list_to_float("2" ++ Many_Ones)),
+  ok.
+
+%%--------------------------------------------------------------------
+
+test_list_to_integer() ->
+  ok = t_list_to_integer_small("0", "00", "-0", "1", "-1", "42", "-12", 
+			       "32768", "268435455", "-268435455"),
+  ok = t_list_to_integer_bignum("123456932798748738738666"),
+  ok.
+
+t_list_to_integer_small(S1, S2, S3, S4, S5, S6, S7, S8, S9, S10) ->
+  0 = list_to_integer(S1),
+  0 = list_to_integer(S2),
+  0 = list_to_integer(S3),
+  1 = list_to_integer(S4),
+  -1 = list_to_integer(S5),
+  42 = list_to_integer(S6),
+  -12 = list_to_integer(S7),
+  32768 = list_to_integer(S8),
+  268435455 = list_to_integer(S9),
+  -268435455 = list_to_integer(S10),
+  ok.
+
+t_list_to_integer_bignum(S) ->
+  123456932798748738738666 = list_to_integer(S),
+  case list_to_integer(duplicate(2000, $1)) of
+    I when is_integer(I), I > 123456932798748738738666 -> ok
+  end.
+
+%%--------------------------------------------------------------------
+
+test_round() ->
+  ok = t_round_small(0.0, 0.4, 0.5, -0.4, -0.5, 255.3, 255.6, -1033.3, -1033.6),
+  ok = t_round_big(4294967296.1, 4294967296.9),
+  ok.
+
+t_round_small(F1, F2, F3, F4, F5, F6, F7, F8, F9) ->
+  0 = round(F1),
+  0 = round(F2),
+  1 = round(F3),
+  0 = round(F4),
+  -1 = round(F5),
+  255 = round(F6),
+  256 = round(F7),
+  -1033 = round(F8),
+  -1034 = round(F9),
+  ok.
+
+t_round_big(B1, B2) ->
+  4294967296 = round(B1),
+  4294967297 = round(B2),
+  -4294967296 = round(-B1),
+  -4294967297 = round(-B2),
+  ok.
+
+%%--------------------------------------------------------------------
+
+test_trunc() ->
+  t_trunc(0.0, 5.3333, -10.978987, 4294967305.7).
+
+t_trunc(F1, F2, F3, B) ->
+  0 = trunc(F1),
+  5 = trunc(F2),
+  -10 = trunc(F3),
+  %% Bignums.
+  4294967305 = trunc(B),
+  -4294967305 = trunc(-B),
+  ok.
+
+%%--------------------------------------------------------------------
+%% Auxiliary functions below
+
+duplicate(N, X) when is_integer(N), N >= 0 ->
+  duplicate(N, X, []).
+
+duplicate(0, _, L) -> L;
+duplicate(N, X, L) -> duplicate(N-1, X, [X|L]).
diff --git a/lib/hipe/test/basic_SUITE_data/basic_bignums.erl b/lib/hipe/test/basic_SUITE_data/basic_bignums.erl
new file mode 100644
index 0000000000..e3b523b3f5
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_bignums.erl
@@ -0,0 +1,143 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains code examples that test bignum arithmetic and matching.
+%%%-------------------------------------------------------------------
+-module(basic_bignums).
+
+-export([test/0, test_bsl/0]).
+
+test() ->
+  ok = test_ops(),
+  ok = test_big_fac(),
+  ok = test_int_overfl_32(),
+  ok = test_int_overfl_64(),
+  ok = test_int_overfl_32_guard(),
+  ok = test_int_overfl_64_guard(),
+  ok.
+
+%%--------------------------------------------------------------------
+%% Define some constants for the tests of arithmetic operators
+
+-define(X, 68719476736).
+-define(Y, 98765432101234).
+-define(Z, 4722366482869645213696).
+-define(W, 339254531512339254531512).
+
+-define(B1,  4398046511104).
+-define(B5,  1645504557321206042154969182557350504982735865633579863348609024).
+-define(B17, 86182066610968551542636378241108028056376767329454880514019834315878107616003372189510312530372009184902888961739623919010110377987011442493486117202360415845666384627768436296772219009176743399772868636439042064384).
+
+%%--------------------------------------------------------------------
+
+test_ops() ->
+  ok = test_mult(),
+  ok = test_div(),
+  ok = test_round(),
+  ok = test_trunc(),
+  ok = test_bsl(),
+  ok.
+
+test_mult() ->
+  ?Z = mult(?X, ?X),
+  ok.
+
+mult(X, Y) -> X * Y.
+
+test_div() ->
+   4 = div_f(339254531512, ?X),
+   0 = div_f(?Y, ?Y+1),
+  64 = div_f(?B1, ?X),
+  ?X = div_f(?Z, ?X),
+  1073741824 = div_f(?Z, ?B1),
+  ok.
+
+div_f(X, Y) -> X div Y.
+
+test_round() ->
+  0 = round_f(?Z, ?W),
+  1 = round_f(?Y, ?Y),
+  71 = round_f(?W, ?Z),
+  1437 = round_f(?Y, ?X),
+  47813960 = round_f(?Z, ?Y),
+  4936803183406 = round_f(?W, ?X),
+  ok.
+
+trunc_f(X, Y) -> round(X/Y).
+
+test_trunc() ->
+  0 = trunc_f(?Z, ?W),
+  1 = trunc_f(?Y, ?Y),
+  72 = trunc_f(?W, ?Z),
+  1437 = trunc_f(?Y, ?X),
+  47813961 = trunc_f(?Z, ?Y),
+  4936803183407 = trunc_f(?W, ?X),
+  ok.
+
+round_f(X, Y) -> trunc(X/Y).
+
+test_bsl() ->
+  ?B1  = bsl_f(1, 42),
+  ?B5  = n(5, fun erlang:'bsl'/2, 1, 42), % use the operator
+  ?B17 = n(17, fun bsl_f/2, 1, 42),       % use the local function
+  ok.
+
+bsl_f(X, Y) -> X bsl Y.
+
+%% applies a binary function N times
+n(1, F, X, Y) -> F(X, Y);
+n(N, F, X, Y) when N > 1 -> n(N-1, F, F(X, Y), Y).
+
+%%--------------------------------------------------------------------
+
+-define(FAC42, 1405006117752879898543142606244511569936384000000000).
+
+test_big_fac() ->
+  ?FAC42 = fac(42),
+  ok.
+
+fac(0) -> 1;
+fac(N) -> N * fac(N-1).
+
+%%--------------------------------------------------------------------
+%% Tests for correct handling of integer overflow
+
+test_int_overfl_32() ->
+  16#7FFFFFF = add(16#7FFFFFF, 0),
+  16#8000000 = add(16#8000000, 0),
+  16#8000001 = add(16#8000000, 1),
+  case add(16#7FFFFFF, 1) of
+    16#8000000 -> ok;
+    -16#7FFFFFF -> error
+  end.
+
+test_int_overfl_64() ->
+  16#7FFFFFFFFFFFFFF = add(16#7FFFFFFFFFFFFFF, 0),
+  16#800000000000000 = add(16#800000000000000, 0),
+  16#800000000000001 = add(16#800000000000000, 1),
+  case add(16#7FFFFFFFFFFFFFF, 1) of
+    16#800000000000000 -> ok;
+    -16#7FFFFFFFFFFFFFF -> error
+  end.
+
+add(X, Y) -> X + Y.
+
+%%--------------------------------------------------------------------
+%% Tests for correct handling of integer overflow in guards
+
+test_int_overfl_32_guard() ->
+  ok = overfl_in_guard(16#7ffffff, 0),
+  ok = overfl_in_guard(16#7ffffff, 16#7ffffff),
+  ok.
+
+test_int_overfl_64_guard() ->
+  ok = overfl_in_guard(16#7ffffffffffffff, 0),
+  ok = overfl_in_guard(16#7ffffffffffffff, 16#7ffffffffffffff),
+  ok.
+
+overfl_in_guard(X, Y) ->
+  case ok of
+    V when X+Y > 12 -> V;
+    _ -> bad
+  end.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_boolean.erl b/lib/hipe/test/basic_SUITE_data/basic_boolean.erl
new file mode 100644
index 0000000000..e4a91ef5af
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_boolean.erl
@@ -0,0 +1,47 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Tests for correct translation of booleans and their primitives.
+%%%-------------------------------------------------------------------
+-module(basic_boolean).
+
+-export([test/0]).
+
+test() ->
+  ok = test_boolean_ops(false, true),
+  ok = test_orelse_redundant(),
+  ok.
+
+%%--------------------------------------------------------------------
+
+test_boolean_ops(F, T) ->
+  true  = T and T,
+  false = T and F,
+  false = F and T,
+  false = F and F,
+  true  = T or T,
+  true  = T or F,
+  true  = F or T,
+  false = F or F,
+  true  = T andalso T,
+  false = T andalso F,
+  false = F andalso T,
+  false = F andalso F,
+  true  = T orelse T,
+  true  = T orelse F,
+  true  = F orelse T,
+  false = F orelse F,
+  ok.
+
+%%--------------------------------------------------------------------
+%% Redundant test in BEAM code will generate type warning.
+
+test_orelse_redundant() ->
+  true = test_orelse(true, true, true),
+  ok.
+
+test_orelse(A, B, C) ->
+  A andalso B orelse C.
+
+%%--------------------------------------------------------------------
diff --git a/lib/hipe/test/basic_SUITE_data/basic_bugs_beam.erl b/lib/hipe/test/basic_SUITE_data/basic_bugs_beam.erl
new file mode 100644
index 0000000000..964b0f423a
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_bugs_beam.erl
@@ -0,0 +1,138 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains code examples that exhibited bugs in the BEAM compiler.
+%%%-------------------------------------------------------------------
+-module(basic_bugs_beam).
+
+-export([test/0]).
+
+%% the following is needed for the test_weird_message
+-export([loop/1]).
+%% the following are needed for the test_catch_bug
+-behaviour(gen_server).
+-export([start_link/1]).
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2, code_change/3]).
+
+test() ->
+  ok = test_fp_basic_blocks(),
+  ok = test_weird_message(),
+  ok = test_catch_bug(),
+  ok.
+
+%%--------------------------------------------------------------------
+%% Test which shows that BEAM's splitting of basic blocks should take
+%% into account that arithmetic operations implemented as BIFs can
+%% also cause exceptions and thus calls to BIFs should end basic blocks.
+%%
+%% Investigated and fixed in the beginning of April 2004.
+%%--------------------------------------------------------------------
+
+test_fp_basic_blocks() ->
+  ok = t1(),
+  ok = t2().
+
+t1() ->
+  X = (catch bad_arith1(2.0, 1.7)),
+  case X of
+    {'EXIT', {badarith, _}} ->
+      ok;
+    _ ->
+      error
+  end.
+
+bad_arith1(X, Y) when is_float(X) ->
+  X1 = X * 1.7e+308,
+  X2 = X1 + 1.0,
+  Y1 = Y * 2,
+  {X2, Y1}.
+
+%% Similarly, it is not kosher to have anything that can fail inside
+%% the fp block since it will throw the exception before the fp
+%% exception and we will get the same problems.
+
+t2() ->
+  case catch bad_arith2(2.0, []) of
+    {'EXIT', {badarith, _}} ->
+      ok;
+    _ ->
+      error
+  end.
+
+bad_arith2(X, Y) when is_float(X) ->
+  X1 = X * 1.7e+308,
+  Y1 = element(1, Y),
+  {X1 + 1.0, Y1}.
+
+%%--------------------------------------------------------------------
+%% Sending 'test' to this process should return 'ok'.  But:
+%%
+%% 1> MOD:test().
+%% Weird: received true
+%% timeout
+%%
+%% Surprisingly, the message has been bound to the value of 'ena'
+%% in the record! The problem was visible in the .S file.
+%%--------------------------------------------------------------------
+
+-record(state, {ena = true}).
+
+test_weird_message() ->
+  P = spawn_link(?MODULE, loop, [#state{}]),
+  P ! {msg, self()},
+  receive
+    What -> What
+  after 42 -> timeout
+  end.
+
+loop(S) ->
+  receive
+    _ when S#state.ena == false ->
+        io:format("Weird: ena is false\n");
+        % loop(S);
+    {msg, Pid} ->
+        Pid ! ok;
+        % loop(S);
+    Other ->
+        io:format("Weird: received ~p\n", [Other])
+        % loop(S)
+  end.
+
+%%--------------------------------------------------------------------
+%% This was posted on the Erlang mailing list as a question:
+%%
+%%   Given the module below and the function call
+%%     "catch_bug:start_link(foo)."
+%%   from the Erlang shell, why does Erlang crash with "Catch not found"?
+%%
+%% The BEAM compiler was generating wrong code for this case;
+%% this was fixed in R9C-0.  Native code generation was OK.
+%%--------------------------------------------------------------------
+
+test_catch_bug() ->
+  ignore = start_link(foo),
+  ok.
+
+start_link(Param) ->
+  gen_server:start_link(?MODULE, Param, []).
+
+init(Param) ->
+  process_flag(trap_exit, true),
+  (catch begin
+           dummy(Param),
+           (catch exit(bar))
+         end
+  ),
+  ignore.
+
+dummy(_) -> ok.
+
+%% gen_server callbacks below
+handle_call(_Call, _From, State) -> {noreply, State}.
+handle_cast(_Msg, State) -> {noreply, State}.
+handle_info(_Msg, State) -> {noreply, State}.
+terminate(_Reason, _State) -> ok.
+code_change(_OldVsn, State, _Extra) -> {ok, State}.
+
diff --git a/lib/hipe/test/basic_SUITE_data/basic_bugs_hipe.erl b/lib/hipe/test/basic_SUITE_data/basic_bugs_hipe.erl
new file mode 100644
index 0000000000..caa0e71d0b
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_bugs_hipe.erl
@@ -0,0 +1,463 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%----------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains code examples that exhibited bugs in the HiPE compiler.
+%%%----------------------------------------------------------------------
+-module(basic_bugs_hipe).
+
+-export([test/0]).
+
+test() ->
+  ok = test_ets_bifs(),
+  ok = test_szar_bug(),
+  ok = test_bit_shift(),
+  ok = test_match_big_list(),
+  ok = test_unsafe_bsl(),
+  ok = test_unsafe_bsr(),
+  ok = test_R12B5_seg_fault(),
+  ok = test_switch_neg_int(),
+  ok = test_icode_range_anal(),
+  ok.
+
+%%-----------------------------------------------------------------------
+%% From: Bjorn Gustavsson
+%%
+%% This code, if HiPE compiled, crashed like this (on SPARC)
+%%
+%% (gdb) where
+%% #0 fullsweep_heap (p=0x2c60dc, new_sz=610, objv=0xffbee8b4, nobj=3)
+%%    at beam/ggc.c:1060
+%% #1 0x7ff24 in erts_garbage_collect (p=0x2c60dc, need=2, objv=0x1128fc, ...)
+%%    at beam/ggc.c:1648
+%% #2 0xab6fc in hipe_mode_switch (p=0x2c60dc, cmd=704512, reg=0x1128fc)
+%%    at hipe/hipe_mode_switch.c:180
+%% #3 0x8e27c in process_main () at beam/beam_emu.c:3314
+%% #4 0x31338 in erl_start (argc=9, argv=0xffbeed5c) at beam/erl_init.c:936
+%% #5 0x2d9f4 in main (argc=9, argv=0xffbeed5c) at sys/unix/erl_main.c:28
+%%
+%% A guess at what could be the problem: From R8, many ets BIFs trap
+%% to other ets BIFs with a *different* arity (i.e. they have more or
+%% less arguments).  I have probably forgotten to mention that subtle
+%% change.
+%%-----------------------------------------------------------------------
+
+test_ets_bifs() ->
+  Seed = {1032, 15890, 22716},
+  put(random_seed, Seed),
+  do_random_test().
+
+do_random_test() ->
+  OrdSet = ets:new(xxx, [ordered_set]),
+  Set = ets:new(xxx, []),
+  do_n_times(fun() ->
+		 Key = create_random_string(25),
+		 Value = create_random_tuple(25),
+		 ets:insert(OrdSet, {Key, Value}),
+		 ets:insert(Set, {Key, Value})
+	     end, 5000),
+  %% io:format("~nData inserted~n"),
+  do_n_times(fun() ->
+		 I = random:uniform(25),
+		 Key = create_random_string(I) ++ '_',
+		 L1 = ets_match_object(OrdSet, {Key, '_'}),
+		 L2 = lists:sort(ets_match_object(Set, {Key, '_'})),
+		 case L1 == L2 of
+		   false ->
+		     %% io:format("~p != ~p~n", [L1, L2]),
+		     exit({not_eq, L1, L2});
+		   true ->
+		     ok
+		 end
+	     end, 2000),
+  %% io:format("~nData matched~n"),
+  ets:match_delete(OrdSet, '_'),
+  ets:match_delete(Set, '_'),
+  ok.
+
+create_random_string(0) ->
+  [];
+create_random_string(OfLength) ->
+  C = case random:uniform(2) of
+        1 -> (random:uniform($Z - $A + 1) - 1) + $A;
+        _ -> (random:uniform($z - $a + 1) - 1) + $a
+      end,
+  [C | create_random_string(OfLength - 1)].
+
+create_random_tuple(OfLength) ->
+  list_to_tuple([list_to_atom([X]) || X <- create_random_string(OfLength)]).
+
+ets_match_object(Tab,Expr) ->
+  case random:uniform(2) of
+    1 -> ets:match_object(Tab,Expr);
+    _ -> match_object_chunked(Tab,Expr)
+  end.
+
+match_object_chunked(Tab,Expr) ->
+  match_object_chunked_collect(ets:match_object(Tab, Expr,
+                                                random:uniform(1999) + 1)).
+
+match_object_chunked_collect('$end_of_table') ->
+  [];
+match_object_chunked_collect({Results, Continuation}) ->
+  Results ++ match_object_chunked_collect(ets:match_object(Continuation)).
+
+do_n_times(_, 0) ->
+  ok;
+do_n_times(Fun, N) ->
+  Fun(),
+  case N rem 1000 of
+    0 -> ok; %% WAS: io:format(".");
+    _ -> ok
+  end,
+  do_n_times(Fun, N - 1).
+
+%%-----------------------------------------------------------------------
+%% From: Jozsef Berces (PR/ECZ)
+%% Date: Feb 19, 2004
+%%
+%% Program which was added to the testsuite as a result of another bug
+%% report involving tuples as funs.  Thanks God, these are no longer
+%% supported, but the following is a good test for testing calling
+%% native code funs from BEAM code (lists:map, lists:filter, ...).
+%%-----------------------------------------------------------------------
+
+test_szar_bug() ->
+  ["A","B","C"] = smartconcat([], "H'A, H'B, H'C"),
+  ok.
+
+smartconcat(B, L) ->
+  LL = tokenize(L, $,),
+  NewlineDel = fun (X) -> killcontrol(X) end,
+  StripFun = fun (X) -> string:strip(X) end,
+  LL2 = lists:map(NewlineDel, lists:map(StripFun, LL)),
+  EmptyDel = fun(X) ->
+		 case string:len(X) of
+		   0 -> false;
+		   _ -> true
+		 end
+	     end,
+  LL3 = lists:filter(EmptyDel, LL2),
+  HexFormat = fun(X, Acc) ->
+		  case string:str(X, "H'") of
+		    1 ->
+		      case checkhex(string:substr(X, 3)) of
+			{ok, Y} ->
+			  {Y, Acc};
+			_ ->
+			  {X, Acc + 1}
+		      end;
+                    _ ->
+		      {X, Acc + 1}
+		  end
+	      end,
+  {LL4,_Ret} = lists:mapfoldl(HexFormat, 0, LL3),
+  lists:append(B, lists:sublist(LL4, lists:max([0, 25 - length(B)]))).
+
+checkhex(L) ->
+  checkhex(L, "").
+
+checkhex([H | T], N) when H >= $0, H =< $9 ->
+  checkhex(T, [H | N]);
+checkhex([H | T], N) when H >= $A, H =< $F ->
+  checkhex(T, [H | N]);
+checkhex([H | T], N) when H =< 32 ->
+  checkhex(T, N);
+checkhex([_ | _], _) ->
+  {error, ""};
+checkhex([], N) ->
+  {ok, lists:reverse(N)}.
+
+killcontrol([C | S]) when C < 32 ->
+  killcontrol(S);
+killcontrol([C | S]) ->
+  [C | killcontrol(S)];
+killcontrol([]) ->
+  [].
+
+tokenize(L, C) ->
+  tokenize(L, C, [], []).
+
+tokenize([C | T], C, A, B) ->
+  case A of
+   [] ->
+      tokenize(T, C, [], B);
+    _ ->
+      tokenize(T, C, [], [lists:reverse(A) | B])
+  end;
+tokenize([H | T], C, A, B) ->
+  tokenize(T, C, [H | A], B);
+tokenize(_, _, [], B) ->
+  lists:reverse(B);
+tokenize(_, _, A, B) ->
+  lists:reverse([lists:reverse(A) | B]).
+
+%%-----------------------------------------------------------------------
+%% From: Niclas Pehrsson
+%% Date: Apr 20, 2006
+%%
+%% We found something weird with the bit shifting in HiPE. It seems
+%% that bsr in some cases shifts the bits in the wrong way...
+%%
+%% Fixed about 10 mins afterwards; was a bug in constant propagation.
+%%-----------------------------------------------------------------------
+
+test_bit_shift() ->
+  1 = plain_shift(),                 %  1
+  6 = length_list_plus(),            %  6
+  0 = shift_length_list(),           %  0
+  1 = shift_length_list_plus(),      %  1
+  1 = shift_length_list_plus2(),     %  1
+  24 = shift_length_list_plus_bsl(), % 24
+  1 = shift_fun(),                   %  1
+  %% {1, 6, 0, 1, 1, 24, 1} = {A, B, C, D, E, F, G},
+  ok.
+
+plain_shift() ->
+  6 bsr 2.
+
+length_list() ->
+  length([0,0]).
+
+length_list_plus() ->
+  length([0,0]) + 4.
+
+shift_length_list() ->
+  length([0,0]) bsr 2.
+
+shift_length_list_plus() ->
+  (length([0,0]) + 4) bsr 2.
+
+shift_length_list_plus_bsl() ->
+  (length([0,0]) + 4) bsl 2.
+
+shift_length_list_plus2() ->
+  N = length([0,0]) + 4,
+  N bsr 2.
+
+shift_fun() ->
+  (length_list() + 4) bsr 2.
+
+%%-----------------------------------------------------------------------
+%% From: Igor Goryachev
+%% Date: June 15, 2006
+%%
+%% I have experienced a different behaviour and possibly a weird result
+%% while playing with matching a big list on x86 and x86_64 machines.
+%%-----------------------------------------------------------------------
+
+-define(BIG_LIST,
+	["uid", "nickname", "n_family", "n_given", "email_pref",
+          "tel_home_number", "tel_cellular_number", "adr_home_country",
+          "adr_home_locality", "adr_home_region", "url", "gender", "bday",
+          "constitution", "height", "weight", "hair", "routine", "smoke",
+          "maritalstatus", "children", "independence", "school_number",
+          "school_locality", "school_title", "school_period", "org_orgname",
+          "title", "adr_work_locality", "photo_type", "photo_binval"]).
+
+test_match_big_list() ->
+  case create_tuple_with_big_const_list() of
+    {selected, ?BIG_LIST, _} -> ok;
+    _ -> weird
+  end.
+
+create_tuple_with_big_const_list() ->
+  {selected, ?BIG_LIST, [{"test"}]}.
+
+%%-----------------------------------------------------------------------
+%% In October 2006 the HiPE compiler acquired more type-driven
+%% optimisations of arithmetic operations. One of these, the
+%% transformation of bsl to a pure fixnum bsl fixnum -> fixnum version
+%% (unsafe_bsl), was incorrectly performed even when the result
+%% wouldn't be a fixnum. The error occurred for all backends, but the
+%% only place known to break was hipe_arm:imm_to_am1/2. Some
+%% immediates got broken on ARM, causing segmentation faults in
+%% compiler_tests when HiPE recompiled itself.
+%%-----------------------------------------------------------------------
+
+test_unsafe_bsl() ->
+  ok = bsl_check(bsl_test_cases()).
+
+bsl_test_cases() ->
+  [{16#FF, {16#FF, 0}},
+   {16#F000000F, {16#FF, 2}}].
+
+bsl_check([]) -> ok;
+bsl_check([{X, Y}|Rest]) ->
+  case imm_to_am1(X) of
+    Y -> bsl_check(Rest);
+    _ -> 'hipe_broke_bsl'
+  end.
+
+imm_to_am1(Imm) ->
+  imm_to_am1(Imm band 16#FFFFFFFF, 16).
+imm_to_am1(Imm, RotCnt) ->
+  if Imm >= 0, Imm =< 255 -> {Imm, RotCnt band 15};
+     true ->
+      NewRotCnt = RotCnt - 1,
+      if NewRotCnt =:= 0 -> []; % full circle, no joy
+         true ->
+          NewImm = (Imm bsr 2) bor ((Imm band 3) bsl 30),
+          imm_to_am1(NewImm, NewRotCnt)
+      end
+  end.
+
+%%-----------------------------------------------------------------------
+%% Another transformation, namely that of bsr to a pure fixnum bsr
+%% fixnum -> fixnum version (unsafe_bsr), failed to check for shifts
+%% larger than the number of bits in fixnums. Such shifts should
+%% return zero, but instead they became plain machine-level shift
+%% instructions.  Machines often only consider the low-order bits of
+%% the shift count, so machine-level shifts larger than the word size
+%% do not match the Erlang semantics.
+%%-----------------------------------------------------------------------
+
+test_unsafe_bsr() ->
+  ok = bsr_check(bsr_test_cases()).
+
+bsr_test_cases() ->
+  [{16#FF, 4, 16#0F},
+   {16#FF, 64, 0}].
+
+bsr_check([]) -> ok;
+bsr_check([{X, Y, Z}|Rest]) ->
+  case do_bsr(X, Y) of
+    Z -> bsr_check(Rest);
+    _ -> 'hipe_broke_bsr'
+  end.
+
+do_bsr(X, Y) ->
+  (X band 16#FFFF) bsr (Y band 16#FFFF).
+
+%%-----------------------------------------------------------------------
+%% From: Sergey S, mid January 2009.
+%%
+%%   While I was playing with +native option, I run into a bug in HiPE
+%%   which leads to segmentation fault using +native and Erlang R12B-5.
+%%
+%%   Eshell V5.6.5
+%%   1> crash:test().
+%%   # Some message to be printed here each loop iteration
+%%   Segmentation fault
+%%
+%% Diagnosed and fixed by Mikael Pettersson (22 Jan 2009):
+%%
+%%   I've analysed the recently posted HiPE bug report on erlang-bugs
+%%   <http://www.erlang.org/pipermail/erlang-bugs/2009-January/001162.html>.
+%%   The segfault is caused by memory corruption, which in turn is caused
+%%   by RTL removing an update of the HP (heap pointer) register due to
+%%   what looks like broken liveness information.
+%%-----------------------------------------------------------------------
+
+test_R12B5_seg_fault() ->
+  _ = spawn(fun() -> init() end),
+  ok.
+
+init() ->
+  repeat(5, fun() -> void end),
+  receive after infinity -> ok end.
+
+repeat(0, _) ->
+  ok;
+repeat(N, Fun) ->
+  %% io:format("# Some message to be printed here each loop iteration\n"),
+  Fun(),
+  repeat(N - 1, Fun).
+
+%%-----------------------------------------------------------------------
+%% From: Jon Meredith
+%% Date: July 9, 2009
+%%
+%% Binary search key tables are sorted by the loader based on the
+%% runtime representations of the keys as unsigned words.  However,
+%% the code generated for the binary search used signed comparisons.
+%% That worked for atoms and non-negative fixnums, but not for
+%% negative fixnums.  Fixed by Mikael Pettersson July 10, 2009.
+%%-----------------------------------------------------------------------
+
+test_switch_neg_int() ->
+  ok = f(-80, 8).
+
+f(10, -1) -> ok;
+f(X, Y) ->
+  Y = g(X),
+  f(X + 10, Y - 1).
+
+g(X) -> % g(0) should be 0 but became -1
+  case X of
+      0 -> 0;
+    -10 -> 1;
+    -20 -> 2;
+    -30 -> 3;
+    -40 -> 4;
+    -50 -> 5;
+    -60 -> 6;
+    -70 -> 7;
+    -80 -> 8;
+      _ -> -1
+  end.
+
+%%-----------------------------------------------------------------------
+%% From: Paul Guyot
+%% Date: Jan 31, 2011
+%%
+%%   There is a bug in HiPE compilation with the comparison of floats
+%%   with integers. This bug happens in functions f/1 and g/2 below.
+%%   BEAM will evaluate f_eq(42) and f_eq(42.0) to true, while HiPE
+%%   will evaluate them to false.
+%%
+%% The culprit was the Icode range analysis which was buggy. (On the
+%% other hand, HiPE properly evaluated these calls to true if passed
+%% the option 'no_icode_range'.)  Fixed by Kostis Sagonas.
+%% --------------------------------------------------------------------
+
+test_icode_range_anal() ->
+  true = f_eq(42),
+  true = f_eq(42.0),
+  false = f_ne(42),
+  false = f_ne(42.0),
+  false = f_eq_ex(42),
+  false = f_eq_ex(42.0),
+  true = f_ne_ex(42),
+  true = f_ne_ex(42.0),
+  false = f_gt(42),
+  false = f_gt(42.0),
+  true = f_le(42),
+  true = f_le(42.0),
+  zero_test = g(0, test),
+  zero_test = g(0.0, test),
+  non_zero_test = g(42, test),
+  other = g(42, other),
+  ok.
+
+f_eq(X) ->
+  Y = X / 2,
+  Y == 21.
+
+f_ne(X) ->
+  Y = X / 2,
+  Y /= 21.
+
+f_eq_ex(X) ->
+  Y = X / 2,
+  Y =:= 21.
+
+f_ne_ex(X) ->
+  Y = X / 2,
+  Y =/= 21.
+
+f_gt(X) ->
+  Y = X / 2,
+  Y > 21.
+
+f_le(X) ->
+  Y = X / 2,
+  Y =< 21.
+
+g(X, Z) ->
+  Y = X / 2,
+  case Z of
+    test when Y == 0 -> zero_test;
+    test -> non_zero_test;
+    other -> other
+  end.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_comparisons.erl b/lib/hipe/test/basic_SUITE_data/basic_comparisons.erl
new file mode 100644
index 0000000000..8dab2cab1f
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_comparisons.erl
@@ -0,0 +1,157 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains tests for correct execution of comparison operators.
+%%%-------------------------------------------------------------------
+-module(basic_comparisons).
+
+-export([test/0]).
+
+test() ->
+  Ns = [0, 0.0, 42, 42.0, gazonk],
+  T1F4 = [true, false, false, false, false],
+  T2F3 = [true, true, false, false, false],
+  F1T4 = [false, true, true, true, true],
+  F2T3 = [false, false, true, true, true],
+  %% tests for calls
+  T1F4 = [eq_exact_call(0, N) || N <- Ns],
+  F1T4 = [ne_exact_call(0, N) || N <- Ns],
+  T2F3 = [eq_call(0, N) || N <- Ns],
+  F2T3 = [ne_call(0, N) || N <- Ns],
+  %% tests for guards
+  T1F4 = [eq_exact_guard(0, N) || N <- Ns],
+  F1T4 = [ne_exact_guard(0, N) || N <- Ns],
+  T2F3 = [eq_guard(0, N) || N <- Ns],
+  F2T3 = [ne_guard(0, N) || N <- Ns],
+  %% some more tests
+  ok = test_against_zero(),
+  ok = test_against_other_terms(),
+  ok = test_sofs_func(),
+  ok.
+
+test_against_zero() ->
+  Xs = [0, 1, 0.0],
+  [true, false, false] = [is_zero_int(X) || X <- Xs],
+  [true, false,  true] = [is_zero_num(X) || X <- Xs],
+  [false, true,  true] = [is_nonzero_int(X) || X <- Xs],
+  [false, true, false] = [is_nonzero_num(X) || X <- Xs],
+  ok.
+
+test_against_other_terms() ->
+  TTT = {true, true, true},
+  FFF = {false, false, false},
+  TTT = {is_foo_exact(foo), is_foo_term1(foo), is_foo_term2(foo)},
+  FFF = {is_foo_exact(bar), is_foo_term1(bar), is_foo_term2(bar)},
+  FFF = {is_nonfoo_exact(foo), is_nonfoo_term1(foo), is_nonfoo_term2(foo)},
+  TTT = {is_nonfoo_exact(bar), is_nonfoo_term1(bar), is_nonfoo_term2(bar)},
+  Tup = {a, {42}, [c]},
+  TTT = {is_tuple_skel(Tup), is_tuple_exact(Tup), is_tuple_term(Tup)},
+  BNi = <<42>>,
+  TTT = {is_bin_exact(BNi), is_bin_term1(BNi), is_bin_term2(BNi)},
+  BNf = <<42/float>>,
+  FFF = {is_bin_exact(BNf), is_bin_term1(BNf), is_bin_term2(BNf)},
+  ok.
+
+test_sofs_func() ->
+  L = [0, 0.0],
+  ok = sofs_func(L, L, L).
+
+%%--------------------------------------------------------------------
+%% Test for comparison operators used in body calls
+
+eq_exact_call(X, Y) -> X =:= Y.
+
+ne_exact_call(X, Y) -> X =/= Y.
+
+eq_call(X, Y) -> X == Y.
+
+ne_call(X, Y) -> X /= Y.
+
+%%--------------------------------------------------------------------
+%% Tests for comparison operators used as guards
+
+eq_exact_guard(X, Y) when X =:= Y -> true;
+eq_exact_guard(_, _) -> false.
+
+ne_exact_guard(X, Y) when X =/= Y -> true;
+ne_exact_guard(_, _) -> false.
+
+eq_guard(X, Y) when X == Y -> true;
+eq_guard(_, _) -> false.
+
+ne_guard(X, Y) when X /= Y -> true;
+ne_guard(_, _) -> false.
+
+%%--------------------------------------------------------------------
+
+is_zero_int(N) when N =:= 0 -> true;
+is_zero_int(_) -> false.
+
+is_nonzero_int(N) when N =/= 0 -> true;
+is_nonzero_int(_) -> false.
+
+is_zero_num(N) when N == 0 -> true;
+is_zero_num(_) -> false.
+
+is_nonzero_num(N) when N /= 0 -> true;
+is_nonzero_num(_) -> false.
+
+%%--------------------------------------------------------------------
+%% There should not really be any difference in the generated code
+%% for the following three functions.
+
+is_foo_exact(A) when A =:= foo -> true;
+is_foo_exact(_) -> false.
+
+is_foo_term1(A) when A == foo -> true;
+is_foo_term1(_) -> false.
+
+is_foo_term2(A) when foo == A -> true;
+is_foo_term2(_) -> false.
+
+%%--------------------------------------------------------------------
+%% Same for these cases
+
+is_nonfoo_exact(A) when A =/= foo -> true;
+is_nonfoo_exact(_) -> false.
+
+is_nonfoo_term1(A) when A /= foo -> true;
+is_nonfoo_term1(_) -> false.
+
+is_nonfoo_term2(A) when foo /= A -> true;
+is_nonfoo_term2(_) -> false.
+
+%%--------------------------------------------------------------------
+
+is_tuple_skel({A,{B},[C]}) when is_atom(A), is_integer(B), is_atom(C) -> true;
+is_tuple_skel(T) when is_tuple(T) -> false.
+
+is_tuple_exact(T) when T =:= {a,{42},[c]} -> true;
+is_tuple_exact(T) when is_tuple(T) -> false.
+
+is_tuple_term(T) when T == {a,{42.0},[c]} -> true;
+is_tuple_term(T) when is_tuple(T) -> false.
+
+%%--------------------------------------------------------------------
+%% But for binaries the treatment has to be different, due to the need
+%% for construction of the binary in the guard.
+
+is_bin_exact(B) when B =:= <<42>> -> true;
+is_bin_exact(_) -> false.
+
+is_bin_term1(B) when B == <<42>> -> true;
+is_bin_term1(_) -> false.
+
+is_bin_term2(B) when <<42>> == B -> true;
+is_bin_term2(_) -> false.
+
+%%--------------------------------------------------------------------
+%% a test from sofs.erl which failed at some point
+
+sofs_func([X | Ts], X0, L) when X /= X0 ->
+  sofs_func(Ts, X, L);
+sofs_func([X | _Ts], X0, _L) when X == X0 ->
+  ok;
+sofs_func([], _X0, L) ->
+  L.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_exceptions.erl b/lib/hipe/test/basic_SUITE_data/basic_exceptions.erl
new file mode 100644
index 0000000000..229a0516dc
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_exceptions.erl
@@ -0,0 +1,465 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains tests that raise exceptions and catch them.
+%%%-------------------------------------------------------------------
+-module(basic_exceptions).
+
+-export([test/0, test_catches/0]).
+
+%% functions used as arguments to spawn/3
+-export([bad_guy/2]).
+
+test() ->
+  ok = test_catch_exit(42),
+  ok = test_catch_throw(42),
+  ok = test_catch_element(),
+  ok = test_catch_crash(),
+  ok = test_catch_empty(),
+  ok = test_catch_merge(),
+  ok = test_catches_merged(),
+  ok = test_pending_errors(),
+  ok = test_bad_fun_call(),
+  ok = test_guard_bif(),
+  ok.
+
+%%--------------------------------------------------------------------
+%% Written in 2001 by Erik Johansson.
+
+test_catches() ->
+  ExitBar = {'EXIT', bar},
+  L1 = [ExitBar, ok, ExitBar, {ok, ExitBar}],
+  L1 = [t1(), t2(), t3(), t4()],
+  badarith = (catch element(1, element(2, t5(a, b)))),
+  L2 = [42, ExitBar, ExitBar, {no_exception, ok}],
+  L2 = [t5(21, 21), t6(), t7(), t8()],
+  ok.
+
+t1() ->
+  catch foo().
+
+t2() ->
+  V = (catch ok()),
+  s(),
+  V.
+
+t3() ->
+  V = (catch foo()),
+  V.
+
+t4() ->
+  V1 = ok(),
+  V2 = (catch foo()),
+  {V1, V2}.
+
+t5(A, B) ->
+  catch A + B.
+
+t6() ->
+  catch {no_exception, ok(), foo()}.
+
+t7() ->
+  catch {no_exception, foo(), ok()}.
+
+t8() ->
+  catch {no_exception, ok()}.
+
+foo() ->
+  s(),
+  exit(bar).
+
+ok() -> s(), ok.
+
+s() -> nada.
+
+%%--------------------------------------------------------------------
+
+test_catch_exit(N) ->
+  {'EXIT', N}  = (catch exit(N)),
+  {'EXIT', 42} = (catch exit(42)),
+  42 = try exit(N) catch exit:R1 -> R1 end,
+  42 = try exit(42) catch exit:R2 -> R2 end,
+  ok.
+
+%%--------------------------------------------------------------------
+
+test_catch_throw(N) ->
+  N  = (catch throw(N)),
+  42 = (catch throw(42)),
+  42 = try throw(N) catch throw:R1 -> R1 end,
+  42 = try throw(42) catch throw:R2 -> R2 end,
+  ok.
+
+%%--------------------------------------------------------------------
+
+test_catch_element() ->
+  'EXIT' = test_catch_element([]),
+  'EXIT' = test_catch_element(42),
+  ok.
+
+test_catch_element(N) ->
+  element(1, catch element(N, {1,2,3,4,5,6,7,8,9,10,11})).
+
+%%--------------------------------------------------------------------
+
+-define(try_match(E),
+        catch ?MODULE:non_existing(),
+	{'EXIT', {{badmatch, nomatch}, _}} = (catch E = no_match())).
+
+test_catch_crash() ->
+  ?try_match(a),
+  ?try_match(42),
+  ?try_match({a, b, c}),
+  ?try_match([]),
+  ?try_match(1.0),
+  ok.
+
+no_match() -> nomatch.
+
+%% small_test() ->
+%%   catch ?MODULE:non_existing(),
+%%   io:format("Before\n",[]),
+%%   hipe_bifs:show_nstack(self()),
+%%   io:format("After\n",[]),
+%%   garbage_collect().
+
+%%--------------------------------------------------------------------
+%% Tests whether the HiPE compiler optimizes catches in a way that
+%% does not result in an infinite loop.
+%%--------------------------------------------------------------------
+
+test_catch_empty() ->
+  badmatch().
+
+badmatch() ->
+  Big = ret_big(),
+  Float = ret_float(),
+  catch a = Big,
+  catch b = Float,
+  ok = case Big of Big -> ok end,
+  ok = case Float of Float -> ok end,
+  ok.
+
+ret_big() ->
+  329847987298478924982978248748729829487298292982972978239874.
+
+ret_float() ->
+  3.1415927.
+
+%%--------------------------------------------------------------------
+%% Test that shows how BEAM can merge catch-end blocks that belong to
+%% different catch-start instructions. Written by Richard Carlsson.
+%%--------------------------------------------------------------------
+
+test_catch_merge() ->
+  merge(get(whatever)).
+
+merge(foo=X) ->
+  catch f(X),
+  catch g(X);
+merge(X) ->
+  catch f(X),
+  catch g(X).
+
+f(_) -> ok.
+
+g(_) -> ok.
+
+%%--------------------------------------------------------------------
+%% Written by Tobias Lindahl.
+
+test_catches_merged() ->
+  {'EXIT', _} = merged_catches(foo),
+  {'EXIT', {badarith, _}} = merged_catches(bar),
+  {'EXIT', _} = merged_catches(baz),
+  ok.
+
+merged_catches(X) ->
+  case X of
+    foo -> catch fail1(0);
+    bar -> catch {catch(1 = X), fail2(0)};
+    baz -> catch fail3(0)
+  end.
+
+fail1(X) -> 1/X.
+
+fail2(X) -> 1/X.
+
+fail3(X) -> 1/X.
+
+%%--------------------------------------------------------------------
+%% Taken from exception_SUITE.erl
+%%--------------------------------------------------------------------
+
+test_pending_errors() ->
+  error_logger:tty(false),    % disable printouts of error reports
+  pending_errors().
+
+%% Test various exceptions, in the presence of a previous error
+%% suppressed in a guard.
+pending_errors() ->
+  pending(e_badmatch, {badmatch, b}),
+  pending(x, function_clause),
+  pending(e_case, {case_clause, xxx}),
+  pending(e_if, if_clause),
+  %% pending(e_badarith, badarith),
+  %% pending(e_undef, undef),
+  pending(e_timeoutval, timeout_value),
+  %% pending(e_badarg, badarg),
+  %% pending(e_badarg_spawn, badarg),
+  ok.
+
+bad_guy(pe_badarith, Other) when Other+1 =:= 0 -> % badarith (suppressed)
+  ok;
+bad_guy(pe_badarg, Other) when length(Other) > 0 -> % badarg (suppressed)
+  ok;
+bad_guy(_, e_case) ->
+  case xxx() of
+    ok -> ok
+  end;                                        % case_clause
+bad_guy(_, e_if) ->
+  B = b(),
+  if
+    a == B -> ok
+  end;                                        % if_clause
+%% bad_guy(_, e_badarith) ->
+%%   1+b;                                        % badarith
+bad_guy(_, e_undef) ->
+  non_existing_module:foo();                  % undef
+bad_guy(_, e_timeoutval) ->
+  receive
+  after gazonk -> ok                          % timeout_value
+  end;
+bad_guy(_, e_badarg) ->
+  node(xxx);                                  % badarg
+bad_guy(_, e_badarg_spawn) ->
+  spawn({}, {}, {});                          % badarg
+bad_guy(_, e_badmatch) ->
+  a = b().                                    % badmatch
+
+xxx() -> xxx.
+
+b() -> b.
+
+pending(Arg, Expected) ->
+  pending(pe_badarith, Arg, Expected),
+  pending(pe_badarg, Arg, Expected).
+
+pending(First, Second, Expected) ->
+  pending_catched(First, Second, Expected),
+  pending_exit_message([First, Second], Expected).
+
+pending_catched(First, Second, Expected) ->
+  %% ok = io:format("Catching bad_guy(~p, ~p)\n", [First, Second]),
+  case catch bad_guy(First, Second) of
+    {'EXIT', Reason} ->
+      pending(Reason, bad_guy, [First, Second], Expected);
+    Other ->
+      exit({not_exit, Other})
+  end.
+
+pending_exit_message(Args, Expected) ->
+  %% ok = io:format("Trapping exits from spawn_link(~p, ~p, ~p)\n",
+  %%                [?MODULE, bad_guy, Args]),
+  process_flag(trap_exit, true),
+  Pid = spawn_link(?MODULE, bad_guy, Args),
+  receive
+    {'EXIT', Pid, Reason} ->
+      pending(Reason, bad_guy, Args, Expected);
+    Other ->
+      exit({unexpected_message, Other})
+  after 10000 ->
+      exit(timeout)
+  end,
+  process_flag(trap_exit, false).
+
+%% pending({badarg, [{erlang,Bif,BifArgs},{?MODULE,Func,Arity}|_]},
+%%      Func, Args, _Code)
+%%   when atom(Bif), list(BifArgs), length(Args) =:= Arity ->
+%%     ok;
+pending({badarg,Trace}, _, _, _) when is_list(Trace) ->
+  ok;
+%% pending({undef,[{non_existing_module,foo,[]}|_]}, _, _, _) ->
+%%   ok;
+pending({undef,Trace}, _, _, _)  when is_list(Trace) ->
+  ok;
+%% pending({function_clause,[{?MODULE,Func,Args}|_]}, Func, Args, _Code) ->
+%%   ok;
+pending({function_clause,Trace}, _, _, _) when is_list(Trace) ->
+  ok;
+%% pending({Code,[{?MODULE,Func,Arity}|_]}, Func, Args, Code)
+%%   when length(Args) =:= Arity ->
+%%     ok;
+pending({Code,Trace}, _, _, Code) when is_list(Trace) ->
+  ok;
+pending(Reason, _Function, _Args, _Code) ->
+  exit({bad_exit_reason, Reason}).
+
+%%--------------------------------------------------------------------
+%% Taken from fun_SUITE.erl
+%%
+%% Checks correct exception throwing when calling a bad fun.
+%%--------------------------------------------------------------------
+
+test_bad_fun_call() ->
+  ok = bad_call_fc(42),
+  ok = bad_call_fc(xx),
+  ok = bad_call_fc({}),
+  ok = bad_call_fc({1}),
+  ok = bad_call_fc({1,2,3}),
+  ok = bad_call_fc({1,2,3}),
+  ok = bad_call_fc({1,2,3,4}),
+  ok = bad_call_fc({1,2,3,4,5,6}),
+  ok = bad_call_fc({1,2,3,4,5}),
+  ok = bad_call_fc({1,2}),
+  ok.
+
+bad_call_fc(Fun) ->
+  Args = [some, stupid, args],
+  Res = (catch Fun(Fun(Args))),
+  case Res of
+    {'EXIT', {{badfun, Fun} ,_Where}} ->
+      ok; %% = io:format("~p(~p) -> ~p\n", [Fun, Args, Res]);
+    Other ->
+      io:format("~p(~p) -> ~p\n", [Fun, Args, Res]),
+      exit({bad_result, Other})
+  end.
+
+%%--------------------------------------------------------------------
+%% Taken from guard_SUITE.erl
+%%
+%% Tests correct handling of exceptions by calling guard BIFs with
+%% nasty (but legal arguments).
+%%--------------------------------------------------------------------
+
+test_guard_bif() ->
+  Big = -237849247829874297658726487367328971246284736473821617265433,
+  Float = 387924.874,
+
+  %% Succeding use of guard bifs.
+
+  try_gbif('abs/1', Big, -Big),
+  try_gbif('float/1', Big, float(Big)),
+  try_gbif('trunc/1', Float, 387924.0),
+  try_gbif('round/1', Float, 387925.0),
+  try_gbif('length/1', [], 0),
+
+  try_gbif('length/1', [a], 1),
+  try_gbif('length/1', [a, b], 2),
+  try_gbif('length/1', lists:seq(0, 31), 32),
+
+  try_gbif('hd/1', [a], a),
+  try_gbif('hd/1', [a, b], a),
+
+  try_gbif('tl/1', [a], []),
+  try_gbif('tl/1', [a, b], [b]),
+  try_gbif('tl/1', [a, b, c], [b, c]),
+
+  try_gbif('size/1', {}, 0),
+  try_gbif('size/1', {a}, 1),
+  try_gbif('size/1', {a, b}, 2),
+  try_gbif('size/1', {a, b, c}, 3),
+  try_gbif('size/1', list_to_binary([]), 0),
+  try_gbif('size/1', list_to_binary([1]), 1),
+  try_gbif('size/1', list_to_binary([1, 2]), 2),
+  try_gbif('size/1', list_to_binary([1, 2, 3]), 3),
+
+  try_gbif('element/2', {x}, {1, x}),
+  try_gbif('element/2', {x, y}, {1, x}),
+  try_gbif('element/2', {x, y}, {2, y}),
+
+  try_gbif('self/0', 0, self()),
+  try_gbif('node/0', 0, node()),
+  try_gbif('node/1', self(), node()),
+
+  %% Failing use of guard bifs.
+
+  try_fail_gbif('abs/1', Big, 1),
+  try_fail_gbif('abs/1', [], 1),
+
+  try_fail_gbif('float/1', Big, 42),
+  try_fail_gbif('float/1', [], 42),
+
+  try_fail_gbif('trunc/1', Float, 0.0),
+  try_fail_gbif('trunc/1', [], 0.0),
+
+  try_fail_gbif('round/1', Float, 1.0),
+  try_fail_gbif('round/1', [], a),
+
+  try_fail_gbif('length/1', [], 1),
+  try_fail_gbif('length/1', [a], 0),
+  try_fail_gbif('length/1', a, 0),
+  try_fail_gbif('length/1', {a}, 0),
+
+  try_fail_gbif('hd/1', [], 0),
+  try_fail_gbif('hd/1', [a], x),
+  try_fail_gbif('hd/1', x, x),
+
+  try_fail_gbif('tl/1', [], 0),
+  try_fail_gbif('tl/1', [a], x),
+  try_fail_gbif('tl/1', x, x),
+
+  try_fail_gbif('size/1', {}, 1),
+  try_fail_gbif('size/1', [], 0),
+  try_fail_gbif('size/1', [a], 1),
+  try_fail_gbif('size/1', fun() -> 1 end, 0),
+  try_fail_gbif('size/1', fun() -> 1 end, 1),
+
+  try_fail_gbif('element/2', {}, {1, x}),
+  try_fail_gbif('element/2', {x}, {1, y}),
+  try_fail_gbif('element/2', [], {1, z}),
+
+  try_fail_gbif('self/0', 0, list_to_pid("<0.0.0>")),
+  try_fail_gbif('node/0', 0, xxxx),
+  try_fail_gbif('node/1', self(), xxx),
+  try_fail_gbif('node/1', yyy, xxx),
+  ok.
+
+try_gbif(Id, X, Y) ->
+  case guard_bif(Id, X, Y) of
+    {Id, X, Y} ->
+      %% io:format("guard_bif(~p, ~p, ~p) -- ok\n", [Id, X, Y]);
+      ok;
+    Other ->
+      ok = io:format("guard_bif(~p, ~p, ~p) -- bad result: ~p\n",
+		     [Id, X, Y, Other]),
+      exit({bad_result,try_gbif})
+  end.
+
+try_fail_gbif(Id, X, Y) ->
+  case catch guard_bif(Id, X, Y) of
+    %% {'EXIT', {function_clause,[{?MODULE,guard_bif,[Id,X,Y]}|_]}} ->
+    {'EXIT', {function_clause,_}} ->  % in HiPE, a trace is not generated
+      %% io:format("guard_bif(~p, ~p, ~p) -- ok\n", [Id,X,Y]);
+      ok;
+    Other ->
+      ok = io:format("guard_bif(~p, ~p, ~p) -- bad result: ~p\n",
+			   [Id, X, Y, Other]),
+      exit({bad_result,try_fail_gbif})
+  end.
+
+guard_bif('abs/1', X, Y) when abs(X) == Y ->
+  {'abs/1', X, Y};
+guard_bif('float/1', X, Y) when float(X) == Y ->
+  {'float/1', X, Y};
+guard_bif('trunc/1', X, Y) when trunc(X) == Y ->
+  {'trunc/1', X, Y};
+guard_bif('round/1', X, Y) when round(X) == Y ->
+  {'round/1', X, Y};
+guard_bif('length/1', X, Y) when length(X) == Y ->
+  {'length/1', X, Y};
+guard_bif('hd/1', X, Y) when hd(X) == Y ->
+  {'hd/1', X, Y};
+guard_bif('tl/1', X, Y) when tl(X) == Y ->
+  {'tl/1', X, Y};
+guard_bif('size/1', X, Y) when size(X) == Y ->
+  {'size/1', X, Y};
+guard_bif('element/2', X, {Pos, Expected}) when element(Pos, X) == Expected ->
+  {'element/2', X, {Pos, Expected}};
+guard_bif('self/0', X, Y) when self() == Y ->
+  {'self/0', X, Y};
+guard_bif('node/0', X, Y) when node() == Y ->
+  {'node/0', X, Y};
+guard_bif('node/1', X, Y) when node(X) == Y ->
+  {'node/1', X, Y}.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_floats.erl b/lib/hipe/test/basic_SUITE_data/basic_floats.erl
new file mode 100644
index 0000000000..ce28f6e156
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_floats.erl
@@ -0,0 +1,250 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains tests that manipulate floating point numbers.
+%%%-------------------------------------------------------------------
+-module(basic_floats).
+
+-export([test/0]).
+-export([test_fmt_double_fpe_leak/0]).   % suppress the unused warning
+
+test() ->
+  ok = test_arith_ops(),
+  ok = test_fp_ebb(),
+  ok = test_fp_phi(),
+  ok = test_big_bad_float(),
+  ok = test_catch_bad_fp_arith(),
+  ok = test_catch_fp_conv(),
+  ok = test_fp_with_fp_exceptions(),
+  %% ok = test_fmt_double_fpe_leak(),    % this requires printing
+  ok = test_icode_type_crash(),
+  ok = test_icode_type_crash_2(),
+  ok.
+
+%%--------------------------------------------------------------------
+
+test_arith_ops() ->
+  E = 2.5617,
+  5.703200000000001  = add(E),
+  0.5798000000000001 = sub(E),
+  8.047580550000001 = mult(E),
+  -6.023e23 = negate(6.023e23),
+  ok.
+
+add(X) ->
+  3.1415 + X.
+
+sub(X) ->
+  3.1415 - X.
+
+mult(X) ->
+  3.1415 * X.
+
+%% tests the translation of the fnegate BEAM instruction.
+negate(X) ->
+  - (X + 0.0).
+
+%%--------------------------------------------------------------------
+%% Test the construction of overlapping extended basic blocks where
+%% BEAM has constructed one and hipe_icode_fp constructs the other.
+%%--------------------------------------------------------------------
+
+test_fp_ebb() ->
+  1.0 = foo(2 * math:pi()),
+  1.0 = bar(2 * math:pi()),
+  ok.
+
+foo(X) ->
+  X / (2 * math:pi()).
+
+bar(X) ->
+  F = float_two(),
+  case F < 3.0 of
+    true -> (X * F) / ((2 * F) * math:pi());
+    false -> weird
+  end.
+
+float_two() ->
+  2.0.
+
+%%--------------------------------------------------------------------
+
+test_fp_phi() ->
+  10 = fp_phi(10, 100),
+  undefined = fp_phi(1.1e302, 0.000000001),
+  ok.
+
+fp_phi(A, B) ->
+  case catch A / B of
+    {'EXIT', _Reason} -> undefined;
+    _ -> round(100 * (A / B))
+  end.
+
+%%--------------------------------------------------------------------
+
+-define(BS, "93904329458954829589425849258998492384932849328493284932849328493284932389248329432932483294832949245827588578423578435783475834758375837580745807304258924584295924588459834958349589348589345934859384958349583945893458934859438593485995348594385943859438593458934589345938594385934859483958348934589435894859485943859438594594385938459438595034950439504395043950495043593485943758.0").
+
+test_big_bad_float() ->
+  ok = try f2l(?BS) catch error:badarg -> ok end,
+  ok = case catch f2l(?BS) of {'EXIT', {badarg, _}} -> ok end,
+  ok.
+
+f2l(F) ->
+  float_to_list(list_to_float(F)).
+
+%%--------------------------------------------------------------------
+%% Tests catching of floating point bad arithmetic.
+
+test_catch_bad_fp_arith() ->
+ 5.7 = f(2.56),
+ {'EXIT', {badarith, _}} = bad_arith(9.9),
+ ok.
+
+f(F) when is_float(F) -> F + 3.14.
+
+bad_arith(F) when is_float(F) ->
+  catch F * 1.70000e+308.
+
+%%--------------------------------------------------------------------
+%% Tests proper catching of exceptions due to illegal convertion of
+%% bignums to floating point numbers.
+
+test_catch_fp_conv() ->
+  F = 1.7e308, %% F is a number very close to a maximum float.
+  ok = big_arith(F),
+  ok = big_const_float(F),
+  ok.
+
+big_arith(F) ->
+  I = trunc(F),
+  {'EXIT', {badarith, _}} = big_int_arith(I),
+  ok.
+
+big_int_arith(I) when is_integer(I) ->
+  catch(3.0 + 2*I).
+
+big_const_float(F) ->
+  I = trunc(F),
+  badarith = try (1/(2*I)) catch error:Err -> Err end,
+  _ = 2/I,
+  {'EXIT', _} = (catch 4/(2*I)),
+  ok.
+
+%%--------------------------------------------------------------------
+%% Forces floating point exceptions and tests that subsequent, legal,
+%% operations are calculated correctly.
+
+test_fp_with_fp_exceptions() ->
+  0.0 = math:log(1.0),
+  badarith = try math:log(float_minus_one()) catch error:E1 -> E1 end,
+  0.0 = math:log(1.0),
+  badarith = try math:log(float_zero()) catch error:E2 -> E2 end,
+  0.0 = math:log(1.0),
+  %% An old-fashioned exception here just so as to test this case also
+  {'EXIT', _} = (catch fp_mult(3.23e133, 3.57e257)),
+  0.0 = math:log(1.0),
+  badarith = try fp_div(5.0, 0.0) catch error:E3 -> E3 end,
+  0.0 = math:log(1.0),
+  ok.
+
+fp_mult(X, Y) -> X * Y.
+
+fp_div(X, Y) -> X / Y.
+
+%% The following two function definitions appear here just to shut
+%% off 'expression will fail with a badarg' warnings from the compiler
+
+float_zero() -> 0.0.
+
+float_minus_one() -> -1.0.
+
+%%--------------------------------------------------------------------
+%% Test that erl_printf_format.c:fmt_double() does not leak pending FP
+%% exceptions to subsequent code.  This used to break x87 FP code on
+%% 32-bit x86.  Based on a problem report from Richard Carlsson.
+
+test_fmt_double_fpe_leak() ->
+  test_fmt_double_fpe_leak(float_zero(), int_two()),
+  ok.
+
+%% We need the specific sequence of erlang:display/1 on a float that
+%% triggers faulting ops in fmt_double() followed by a simple FP BIF.
+%% We also need to repeat this at least three times.
+test_fmt_double_fpe_leak(X, Y) ->
+  erlang:display(X), _ = math:log10(Y),
+  erlang:display(X), _ = math:log10(Y),
+  erlang:display(X), _ = math:log10(Y),
+  erlang:display(X), _ = math:log10(Y),
+  erlang:display(X),
+  math:log10(Y).
+
+int_two() -> 2.
+
+%%--------------------------------------------------------------------
+%% Contains code which confuses the icode_type analysis and results
+%% in a compiler crash.  Stipped down from code sent by Paul Guyot.
+%% Compiles alright with the option 'no_icode_type' but that defeats
+%% the purpose of the test.
+
+test_icode_type_crash() ->
+  Fun = f(1, 2, 3),
+  42.0 = Fun(),
+  ok.
+
+f(A, B, C) ->
+  fun () ->
+      X = case A of
+	    0 -> 1 / B;
+	    _ -> A / C
+	  end,
+      Y = case B of
+	    a -> 1.0;
+	    b -> 2.0;
+	    _ -> 6.0
+	  end,
+      Z = case C of
+	    c -> 0.1 * X;
+	    _ -> 7.0
+	  end,
+      Y * Z
+  end.
+
+%%--------------------------------------------------------------------
+%% Contains another case that crashed hipe_icode_fp. This sample was
+%% sent by Mattias Jansson (25 Nov 2015). It compiled alright with the
+%% option 'no_icode_type' but that defeats the purpose of the test.
+%% Unfortunately, the execution of this code goes into an infinite
+%% loop, even if the map in the second argument of eat_what/2 gets the
+%% appropriate key-value pairs. Still, it is retained as a test
+%% because it exposed a different crash than test_icode_type_crash/0.
+
+test_icode_type_crash_2() ->
+  {'EXIT', {function_clause, _}} = (catch eat()),
+  ok.
+
+eat() ->
+  eat_what(1.0, #{}).
+
+eat_what(Factor, #{rat_type := LT} = Rat) ->
+  #{cheese := Cheese} = Rat,
+  UnitCheese = Cheese / 2,
+  RetA = case eat() of
+	   {full, RetA1} ->
+	     CheeseB2 = min(RetA1, UnitCheese) * Factor,
+	     case eat() of
+	       full -> {win, RetA1};
+	       hungry -> {partial, RetA1 - CheeseB2}
+	     end;
+	   AOther -> AOther
+	 end,
+  RetB = case eat() of
+	   {full, RetB1} ->
+	     CheeseA2 = min(RetB1, UnitCheese) * Factor,
+	     rat:init(single, LT, CheeseA2),
+	     case eat() of
+	       full -> {full, RetB1};
+	       hungry -> {hungry, RetB1 - CheeseA2}
+	     end
+	 end,
+  {RetA, RetB}.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_fun.erl b/lib/hipe/test/basic_SUITE_data/basic_fun.erl
new file mode 100644
index 0000000000..18ba7fdb3f
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_fun.erl
@@ -0,0 +1,124 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Tests for correct handling of funs.
+%%%-------------------------------------------------------------------
+-module(basic_fun).
+
+-export([test/0]).
+
+-export([dummy_foo/4, add1/1, test_fun03/0]).
+
+test() ->
+  ok = test_calls(),
+  ok = test_is_function(),
+  ok = test_is_function2(),
+  ok.
+
+%%--------------------------------------------------------------------
+%% Tests function and fun calls.
+
+test_calls() ->
+  ok = test_apply_call(?MODULE, dummy_foo),
+  ok = test_fun_call(fun dummy_foo/4),
+  ok = test_fun_call(fun ?MODULE:dummy_foo/4),
+  ok.
+
+test_apply_call(M, F) ->
+  M:F(bar, 42, foo, 17).
+
+test_fun_call(Fun) ->
+  Fun(bar, 42, foo, 17).
+
+dummy_foo(_, _, foo, _) -> ok.
+
+%%--------------------------------------------------------------------
+%% Tests handling of funs out of exported functions and 2-tuple funs.
+
+test_fun03() ->
+  MFPair = add1_as_2tuple(),
+  4712 = do_call(add1_as_export(), 4711),
+  {badfun, MFPair} = try do_call(MFPair, 88) catch error:Err -> Err end,
+  true = do_guard(add1_as_export()),
+  false = do_guard(MFPair), % 2-tuples do not satisfy is_function/1
+  ok.
+
+do_call(F, X) -> F(X).
+
+do_guard(F) when is_function(F) -> true;
+do_guard(_) -> false.
+
+add1_as_export() -> fun ?MODULE:add1/1.
+
+add1_as_2tuple() -> {?MODULE, add1}.
+
+add1(X) -> X+1.
+
+%%--------------------------------------------------------------------
+%% Tests the is_function guard and BIF.
+
+test_is_function() ->
+  Fun = fun (X, foo) -> dummy_foo(X, mnesia_lib, foo, [X]) end,
+  ok = test_when_guard(Fun),
+  ok = test_if_guard(Fun),
+  ok.
+
+test_when_guard(X) when is_function(X) -> ok.
+
+test_if_guard(X) ->
+  if is_function(X) -> ok;
+     true -> weird
+  end.
+
+%%--------------------------------------------------------------------
+%% Tests the is_function2 guard and BIF.
+
+test_is_function2() ->
+  ok = test_guard(),
+  ok = test_guard2(),
+  ok = test_call(),
+  ok.
+
+test_guard() ->
+  zero_fun = test_f2(fun () -> ok end),
+  unary_fun = test_f2(fun(X) -> X end),
+  binary_fun = test_f2(fun (X, Y) -> {X, Y} end),
+  no_fun = test_f2(gazonk),
+  ok.
+
+test_f2(Fun) when is_function(Fun, 0) ->
+  zero_fun;
+test_f2(Fun) when is_function(Fun, 1) ->
+  unary_fun;
+test_f2(Fun) when is_function(Fun, 2) ->
+  binary_fun;
+test_f2(_) ->
+  no_fun.
+
+test_guard2() ->
+  zero_fun = test_f2_n(fun () -> ok end, 0),
+  unary_fun = test_f2_n(fun (X) -> X end, 1),
+  binary_fun = test_f2_n(fun (X, Y) -> {X, Y} end, 2),
+  no_fun = test_f2_n(gazonk, 0),
+  ok.
+
+test_f2_n(F, N) when is_function(F, N) ->
+  case N of
+    0 -> zero_fun;
+    1 -> unary_fun;
+    2 -> binary_fun
+  end;
+test_f2_n(_, _) ->
+  no_fun.
+
+test_call() ->
+  true  = test_fn2(fun (X, Y) -> {X,Y} end, 2),
+  false = test_fn2(fun (X, Y) -> {X,Y} end, 3),
+  false = test_fn2(gazonk, 2),
+  {'EXIT', {badarg, _TR1}} = (catch test_fn2(gazonk, gazonk)),
+  {'EXIT', {badarg, _TR2}} = (catch test_fn2(fun (X, Y) -> {X, Y} end, gazonk)),
+  ok.
+
+test_fn2(F, N) ->
+  is_function(F, N).
diff --git a/lib/hipe/test/basic_SUITE_data/basic_guards.erl b/lib/hipe/test/basic_SUITE_data/basic_guards.erl
new file mode 100644
index 0000000000..81eeed7c3b
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_guards.erl
@@ -0,0 +1,164 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains tests for correct handling of guards and guard BIFs.
+%%%-------------------------------------------------------------------
+-module(basic_guards).
+
+-export([test/0]).
+%% Prevent the inlining of the following functions
+-export([bad_arith/0, bad_tuple/0, is_strange_guard/0]).
+
+test() ->
+  ok = guard0(4.2),
+  ok = guard1([foo]),
+  ok = test_guard2(),
+  ok = test_guard3(),
+  ok = test_guard4(),
+  ok = test_is_boolean(),
+  ok = test_bad_guards(),
+  ok.
+
+%%--------------------------------------------------------------------
+
+guard0(X) when X /= 0, is_float(X) ->
+  ok.
+
+guard1(X) when is_atom(X) orelse is_float(X) ->
+  error1;
+guard1(X) when is_reference(hd(X)) ->
+  error2;
+guard1(X) when is_integer(hd(X)) ->
+  error3;
+guard1(X) when hd(X) == foo ->
+  ok.
+
+%%--------------------------------------------------------------------
+
+test_guard2() ->
+  ok1 = guard2(true),
+  not_boolean = guard2(42),
+  ok2 = guard2(false),
+  ok.
+
+guard2(X) when X ->  % gets transformed to:  is_boolean(X), X =:= true
+  ok1;
+guard2(X) when X =:= false ->
+  ok2;
+guard2(_) ->
+  not_boolean.
+
+%%--------------------------------------------------------------------
+
+-define(is_foo(X), (is_atom(X) or (is_tuple(X) and (element(1, X) =:= 'foo')))).
+
+test_guard3() ->
+  no  = f('foo'),
+  yes = f({'foo', 42}),
+  no  = f(42),
+  ok.
+
+f(X) when ?is_foo(X) -> yes;
+f(_) -> no.
+
+%%--------------------------------------------------------------------
+
+-define(EXT_REF, <<131,114,0,3,100,0,19,114,101,102,95,116,101,115,116,95,98,117,103,64,103,111,114,98,97,103,2,0,0,0,125,0,0,0,0,0,0,0,0>>).
+
+test_guard4() ->
+  yes = is_ref(make_ref()),
+  no  = is_ref(gazonk),
+  yes = is_ref(an_external_ref(?EXT_REF)),
+  ok.
+
+is_ref(Ref) when is_reference(Ref) -> yes;
+is_ref(_Ref) -> no.
+
+an_external_ref(Bin) ->
+  binary_to_term(Bin).
+
+%%--------------------------------------------------------------------
+
+test_is_boolean() ->
+  ok = is_boolean_in_if(),
+  ok = is_boolean_in_guard().
+
+is_boolean_in_if() ->
+  ok1 = tif(true),
+  ok2 = tif(false),
+  not_bool = tif(other),
+  ok.
+
+is_boolean_in_guard() ->
+  ok = tg(true),
+  ok = tg(false),
+  not_bool = tg(other),
+  ok.
+
+tif(V) ->
+  Yes = yes(),        %% just to prevent the optimizer removing this
+  if
+    %% the following line generates an is_boolean instruction
+    V, Yes == yes ->
+      %% while the following one does not (?!)
+      %% Yes == yes, V ->
+      ok1;
+    not(not(not(V))) ->
+      ok2;
+    V ->
+      ok3;
+    true ->
+      not_bool
+  end.
+
+tg(V) when is_boolean(V) ->
+  ok;
+tg(_) ->
+  not_bool.
+
+yes() -> yes.
+
+%%--------------------------------------------------------------------
+%% original test by Bjorn G
+
+test_bad_guards() ->
+  ok = bad_arith(),
+  ok = bad_tuple(),
+  ok = is_strange_guard(),
+  ok.
+
+bad_arith() ->
+  13 = bad_arith1(1, 12),
+  42 = bad_arith1(1, infinity),
+  42 = bad_arith1(infinity, 1),
+  42 = bad_arith2(infinity, 1),
+  42 = bad_arith3(inf),
+  42 = bad_arith4(infinity, 1),
+  ok.
+
+bad_arith1(T1, T2) when (T1 + T2) < 17 -> T1 + T2;
+bad_arith1(_, _) -> 42.
+
+bad_arith2(T1, T2) when (T1 * T2) < 17 -> T1 * T2;
+bad_arith2(_, _) -> 42.
+
+bad_arith3(T) when (bnot T) < 17 -> T;
+bad_arith3(_) -> 42.
+
+bad_arith4(T1, T2) when (T1 bsr T2) < 10 -> T1 bsr T2;
+bad_arith4(_, _) -> 42.
+
+bad_tuple() ->
+  error = bad_tuple1(a),
+  error = bad_tuple1({a, b}),
+  x = bad_tuple1({x, b}),
+  y = bad_tuple1({a, b, y}),
+  ok.
+
+bad_tuple1(T) when element(1, T) =:= x -> x;
+bad_tuple1(T) when element(3, T) =:= y -> y;
+bad_tuple1(_) -> error.
+
+is_strange_guard() when is_tuple({1, bar, length([1, 2, 3, 4]), self()}) -> ok;
+is_strange_guard() -> error.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_inline_function.erl b/lib/hipe/test/basic_SUITE_data/basic_inline_function.erl
new file mode 100644
index 0000000000..4c08064670
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_inline_function.erl
@@ -0,0 +1,73 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains tests that depend on the compiler inliner being turned on.
+%%%-------------------------------------------------------------------
+-module(basic_inline_function).
+
+-export([test/0]).
+
+-compile({inline, [{to_objects, 3}]}).
+
+test() ->
+  ok = test_inline_match(),
+  ok.
+
+%%--------------------------------------------------------------------
+
+test_inline_match() ->
+  bad_object = test1(a, {binary, foo, set}, c),
+  bad_object = test2(a, {binary, foo, set}, c),
+  bad_object = test3(a, {binary, foo, set}, c),
+  ok.
+
+%% Inlined
+test1(KeysObjs, C, Ts) ->
+  case catch to_objects(KeysObjs, C, Ts) of
+    {'EXIT', _} ->
+      bad_object;
+    ok ->
+      ok
+  end.
+
+%% "Inlined" by hand
+test2(KeysObjs, C, _Ts) ->
+  case catch (case C of
+		{binary, _, set} ->
+		  <<_ObjSz0:32, _T/binary>> = KeysObjs;
+		_ -> ok
+	      end) of
+    {'EXIT', _} ->
+      bad_object;
+    ok ->
+      ok
+  end.
+
+%% Not inlined
+test3(KeysObjs, C, Ts) ->
+  case catch fto_objects(KeysObjs, C, Ts) of
+    {'EXIT', _} ->
+      bad_object;
+    ok ->
+      ok
+  end.
+
+%% Inlined.
+to_objects(Bin, {binary, _, set}, _Ts) ->
+  <<_ObjSz0:32, _T/binary>> = Bin,
+  ok;
+to_objects(<<_ObjSz0:32, _T/binary>> ,_, _) ->
+  ok;
+to_objects(_Bin, _, _Ts) ->
+  ok.
+
+%% Not Inlined.
+fto_objects(Bin, {binary, _, set}, _Ts) ->
+  <<_ObjSz0:32, _T/binary>> = Bin,
+  ok;
+fto_objects(<<_ObjSz0:32, _T/binary>> ,_,_) ->
+  ok;
+fto_objects(_Bin, _, _Ts) ->
+  ok.
+
diff --git a/lib/hipe/test/basic_SUITE_data/basic_inline_module.erl b/lib/hipe/test/basic_SUITE_data/basic_inline_module.erl
new file mode 100644
index 0000000000..306c6a39ce
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_inline_module.erl
@@ -0,0 +1,31 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains tests that depend on the compiler inliner being turned on.
+%%%-------------------------------------------------------------------
+-module(basic_inline_module).
+
+-export([test/0]).
+
+-compile([inline]).     %% necessary for these tests
+
+test() ->
+  ok = test_case_end_atom(),
+  ok.
+
+%%--------------------------------------------------------------------
+%% Tests whether the translation of a case_end instruction works even
+%% when an exception (no matching case pattern) is to be raised.
+
+test_case_end_atom() ->
+  {'EXIT',{{case_clause,some_atom},_Trace}} = (catch test_case_stm_inlining()),
+  ok.
+
+test_case_stm_inlining() ->
+  case some_atom() of
+    another_atom -> strange_result
+  end.
+
+some_atom() ->
+  some_atom.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_issues_beam.erl b/lib/hipe/test/basic_SUITE_data/basic_issues_beam.erl
new file mode 100644
index 0000000000..73367c5c45
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_issues_beam.erl
@@ -0,0 +1,326 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains code examples, mostly taken from the mailing list, that
+%%% crashed the BEAM compiler or gave an internal error at some point.
+%%%-------------------------------------------------------------------
+-module(basic_issues_beam).
+
+-export([test/0]).
+
+test() ->
+  ok = test_crash_R10_hinde(),
+  ok = test_error_R10_mander(),
+  ok = test_error_R11_bjorklund(),
+  ok = test_error_R11_rath(),
+  ok = test_error_R12_empty_bin_rec(),
+  ok = test_bug_R12_cornish(),
+  ok = test_crash_R12_morris(),
+  ok = test_error_R13_almeida(),
+  ok = test_error_R13B01_fisher(),
+  ok = test_error_R13B01_sawatari(),
+  ok = test_error_R13B01_whongo(),
+  ok = test_error_R16B03_norell(),
+  ok = test_error_try_wings(),
+  ok.
+
+%%--------------------------------------------------------------------
+%% Fisher R10 compiler crash
+%%--------------------------------------------------------------------
+
+-record(r, {a, b, c}).
+
+test_crash_R10_hinde() ->
+  rec_R10_hinde(#r{}).
+
+rec_R10_hinde(As) ->
+  case As of
+    A when A#r.b == ""; A#r.b == undefined -> ok;
+    _ -> error
+  end.
+
+%%--------------------------------------------------------------------
+%% From: Peter-Henry Mander
+%% Date: 27 Jan, 2005
+%%
+%% I managed to isolate a non-critical BEAM compilation error
+%% (internal error in v3_codegen) when compiling the following code:
+%%--------------------------------------------------------------------
+
+test_error_R10_mander() ->
+  try just_compile_me_R10() catch _:_ -> ok end.
+
+just_compile_me_R10() ->
+  URI_Before =
+    {absoluteURI,
+     {scheme, fun() -> nil end},
+     {hier_part,
+      {net_path,
+       {srvr,
+	{userinfo, nil},
+	fun() -> nil end},
+       nil},
+      {port, nil}}},
+  {absoluteURI,
+   {scheme, _},
+   {hier_part,
+    {net_path,
+     {srvr,
+      {userinfo, nil},
+      _HostportBefore},
+     nil},
+    {port, nil}}} = URI_Before,
+  %% ... some funky code ommitted, not relevant ...
+  {absoluteURI,
+   {scheme, _},
+   {hier_part,
+    {net_path,
+     {srvr,
+      {userinfo, nil},
+      HostportAfter},
+     nil},
+    {port, nil}}} = URI_Before,
+  %% NOTE: I intended to write URI_After instead of URI_Before
+  %% but the accident revealed that when you add the line below,
+  %% it causes internal error in v3_codegen on compilation
+  {hostport, {hostname, "HostName"}, {port, nil}} = HostportAfter,
+  ok.
+
+%%--------------------------------------------------------------------
+%% From: Martin Bjorklund
+%% Date: Aug 16, 2006
+%%
+%% I found this compiler bug in R10B-10 and R11B-0.
+%%
+%% Function -just_compile_me/0-fun-2-/1 refers to undefined label 18
+%% ./bjorklund_R11compiler_bug.erl:none: internal error in beam_clean;
+%% crash reason: {{case_clause,{'EXIT',{undefined_label,18}}},
+%%                [{compile,'-select_passes/2-anonymous-2-',2},
+%%                 {compile,'-internal_comp/4-anonymous-1-',2},
+%%                 {compile,fold_comp,3},
+%%                 {compile,internal_comp,4},
+%%                 {compile,internal,3}]}
+%%--------------------------------------------------------------------
+
+test_error_R11_bjorklund() ->
+  just_compile_me_R11_bjorklund().
+
+just_compile_me_R11_bjorklund() ->
+  G = fun() -> ok end,
+  try
+    G() %% fun() -> ok end
+  after
+    fun({A, B}) -> A + B end
+  end.
+
+%%--------------------------------------------------------------------
+%% From: Tim Rath
+%% Date: Sep 13, 2006
+%% Subject: Compiler bug not quite fixed
+%%
+%%
+%% I saw a compiler bug posted to the list by Martin Bjorklund that
+%% appeared to be exactly the problem I'm seeing, and then noticed
+%% that this was fixed in R11B-1. Unfortunately, though R11B-1 appears
+%% to fix the code submitted by Martin, it does not fix my case.
+%%
+%% Function -just_compile_me/0-fun-2-/1 refers to undefined label 13
+%% ./rath_R11compiler_bug.erl:none: internal error in beam_clean;
+%% crash reason: {{case_clause,{'EXIT',{undefined_label,13}}},
+%%                [{compile,'-select_passes/2-anonymous-2-',2},
+%%                 {compile,'-internal_comp/4-anonymous-1-',2},
+%%                 {compile,fold_comp,3},
+%%                 {compile,internal_comp,4},
+%%                 {compile,internal,3}]}
+%%--------------------------------------------------------------------
+
+test_error_R11_rath() ->
+  just_compile_me_R11_rath().
+
+just_compile_me_R11_rath() ->
+  A = {6},
+  try
+    io:fwrite("")
+  after
+    fun () ->
+      fun () -> {_} = A end
+    end
+  end.
+
+%%----------------------------------------------------------------------
+%% Program that crashed the R12B-0 compiler: internal error in v3_codegen
+%%----------------------------------------------------------------------
+
+-record(rec, {a = <<>> :: binary(), b = 42 :: integer()}).
+
+test_error_R12_empty_bin_rec() ->
+  42 = test_empty_bin_rec(#rec{}),
+  ok.
+
+test_empty_bin_rec(R) ->
+  #rec{a = <<>>} = R,
+  R#rec.b.
+
+%%----------------------------------------------------------------------
+%% From: Simon Cornish
+%% Date: Jan 13, 2008
+%%
+%% The attached Erlang code demonstrates an R12B-0 bug with funs.
+%% Compile and evaluate the two die/1 calls for two different failure modes.
+%% It seems to me that the live register check for call_fun is off by one.
+%%----------------------------------------------------------------------
+
+-record(b, {c}).
+
+test_bug_R12_cornish() ->
+  {a2, a} = die(a),
+  {a2, {b, c}} = die({b, c}),
+  ok.
+
+die(A) ->
+  F = fun() -> {ok, A} end,
+  if A#b.c =:= [] -> one;
+     true ->
+      case F() of
+        {ok, A2} -> {a2, A2};
+        _ -> three
+      end
+  end.
+
+%%----------------------------------------------------------------------
+%% From: Hunter Morris
+%% Date: Nov 20, 2008
+%%
+%% The following code (tested with R12B-4 or R12B-5, vanilla compiler
+%% options) produces a compiler crash.  It's nonsensical, and I realise
+%% that andalso can be quite evil, but it's a crash nonetheless.
+%%----------------------------------------------------------------------
+
+test_crash_R12_morris() ->
+  foo(42).
+
+foo(Bar) when (is_integer(Bar) andalso Bar =:= 0) ; Bar =:= 42 ->
+  ok.
+    
+%%--------------------------------------------------------------------
+%% From: Paulo Sergio Almeida
+%% Date: May 20, 2009
+%%
+%% The following code when compiled under R13B gives a compiler error.
+%%   Function loop/1 refers to undefined label 6
+%%   ./almeida_R13compiler_bug.erl:none: internal error in beam_peep;
+%%   crash reason: {{case_clause,{'EXIT',{undefined_label,6}}},
+%%                  [{compile,'-select_passes/2-anonymous-2-',2},
+%%                   {compile,'-internal_comp/4-anonymous-1-',2},
+%%--------------------------------------------------------------------
+
+test_error_R13_almeida() ->
+  self() ! {backup, 42, false},
+  loop([]).
+
+loop(Tids) ->
+  receive
+    {backup, Tid, Dumping} ->
+      case Dumping of
+        false -> ok;
+        _ -> receive {logged, Tab, Tid} -> put({log, Tab}, Tid) end
+      end,
+      collect(Tid, Tids, [])
+  end.
+
+collect(_, _, _) -> ok.
+
+%%--------------------------------------------------------------------
+%% Fisher R13B01 compiler error
+%%--------------------------------------------------------------------
+
+test_error_R13B01_fisher() ->
+  perform_select({foo, "42"}).
+
+perform_select({Type, Keyval}) ->
+  try
+    if is_atom(Type) andalso length(Keyval) > 0 -> ok;
+       true -> ok
+    end
+  catch
+    _:_ -> fail
+  end.
+
+%%--------------------------------------------------------------------
+%% From: Mikage Sawatari
+%% Date: Jun 12, 2009
+%%
+%% I have the following compilation problem on Erlang R13B01.
+%% Compiler reports "Internal consistency check failed".
+%%--------------------------------------------------------------------
+
+test_error_R13B01_sawatari() ->
+  test_sawatari([1, null, 3], <<1, 2, 3>>).
+
+test_sawatari([], _Bin) -> ok;
+test_sawatari([H|T], Bin) ->
+  _ = case H of
+        null -> <<Bin/binary>>;
+        _ -> ok
+      end,
+  test_sawatari(T, Bin).
+
+%%--------------------------------------------------------------------
+
+test_error_R13B01_whongo() ->
+  S = "gazonk",
+  S = orgno_alphanum(S),
+  ok.
+
+orgno_alphanum(Cs) ->
+  [C || C <- Cs, ((C >= $0) andalso (C =< $9))
+          orelse ((C >= $a) andalso (C =< $z))
+          orelse ((C >= $A) andalso (C =< $Z))].
+
+%%--------------------------------------------------------------------
+%% I'm getting an Internal Consistency Check error when attempting to
+%% build Wings3D on Mac OS X 10.4.2 (Erlang OTP R10B-6):
+%%
+%% erlc -pa /ebin +warn_unused_vars -I/include -I ../e3d -W +debug_info
+%% '-Dwings_version="0.98.31"' -pa ../ebin -o../ebin wings_color.erl
+%% wings_color: function internal_rgb_to_hsv/3+97:
+%%    Internal consistency check failed - please report this bug.
+%%    Instruction: {test,is_eq_exact,{f,80},[{x,0},{atom,error}]}
+%%    Error:       {unsafe_instruction,{float_error_state,cleared}}:
+%%
+%% The problem is the interaction of the 'try' construct with the
+%% handling of FP exceptions.
+%%--------------------------------------------------------------------
+
+test_error_try_wings() ->
+  %% a call with a possible FP exception
+  {199.99999999999997, 0.045454545454545456, 44} = rgb_to_hsv(42, 43, 44),
+  ok.
+
+rgb_to_hsv(R, G, B) ->
+  Max = lists:max([R, G, B]),
+  Min = lists:min([R, G, B]),
+  V = Max,
+  {Hue, Sat} = try
+		 {if Min == B -> (G-Min)/(R+G-2.0*Min);
+		     Min == R -> (1.0+(B-Min)/(B+G-2.0*Min));
+		     Min == G -> (2.0+(R-Min)/(B+R-2.0*Min))
+		  end * 120, (Max-Min)/Max}
+	       catch
+		 error:badarith -> {undefined, 0.0}
+	       end,
+  {Hue, Sat, V}.
+
+%%--------------------------------------------------------------------
+%% From: Ulf Norell
+%% Date: Feb 28, 2014
+%%
+%% This caused an internal error in v3_codegen
+%%--------------------------------------------------------------------
+
+test_error_R16B03_norell() ->
+  test_error_R16B03_norell(#r{}, gazonk).
+
+test_error_R16B03_norell(Rec, Tag) ->
+  is_record(Rec, Tag, 3) orelse ok.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_issues_hipe.erl b/lib/hipe/test/basic_SUITE_data/basic_issues_hipe.erl
new file mode 100644
index 0000000000..e71045bfe2
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_issues_hipe.erl
@@ -0,0 +1,153 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains code examples that exhibited crashes in the HiPE compiler.
+%%%-------------------------------------------------------------------
+-module(basic_issues_hipe).
+
+-export([test/0]).
+
+%% functions that need to be exported so that they are retained.
+-export([auth/4]).
+
+test() ->
+  ok = test_dominance_trees(),
+  ok = test_merged_const(),
+  ok = test_var_pair(),
+  ok = test_bif_fails(),
+  ok = test_find_catches(),
+  ok = test_heap_allocate_trim(),
+  ok.
+
+%%--------------------------------------------------------------------
+%% This is taken from a file sent to us by Martin Bjorklund @ Nortel
+%% on 14th November 2004. The problem was in the SSA unconvert pass.
+%%
+%% No tests here; we simply check that the HiPE compiler does not go
+%% into an infinite loop when compiling strange functions like this.
+%%--------------------------------------------------------------------
+
+auth(_, A, B, C) ->
+  auth(A, B, C, []).
+
+%%--------------------------------------------------------------------
+%% Exposed a crash in the generation of dominance trees used in SSA.
+%%--------------------------------------------------------------------
+
+-record(state, {f}).
+
+test_dominance_trees() ->
+  {ok, true} = doit(true, #state{f = true}),
+  ok.
+
+doit(Foo, S) ->
+  Fee = case Foo of
+	  Bar when Bar == S#state.f; Bar == [] -> true;
+	  _ -> false
+	end,
+  {ok, Fee}.
+
+%%--------------------------------------------------------------------
+%% Checks that the merging of constants in the constant table uses the
+%% appropriate comparison function for this.
+%%--------------------------------------------------------------------
+
+test_merged_const() ->
+  Const1 = {'', 1.0000},
+  Const2 = {'', 1},
+  match(Const1, Const2).
+
+match(A, A) ->
+  error;
+match(_A, _B) ->
+  ok.
+
+%%--------------------------------------------------------------------
+%% Checks that the HiPE compiler does not get confused by constant
+%% data structures similar to the internal compiler data structures.
+%%--------------------------------------------------------------------
+
+test_var_pair() ->
+  ok = var_pair([gazonk]).
+
+var_pair([_|_]) ->
+  var_pair({var, some_atom});
+var_pair(_) ->
+  ok.
+
+%%--------------------------------------------------------------------
+%% This module was causing the HiPE compiler to crash in January 2007.
+%% The culprit was an "optimization" of the BEAM compiler: postponing
+%% the save of x variables when BIFs cannot fail.  This was fixed on
+%% February 1st, by making the HiPE compiler use the same functions
+%% as the BEAM compiler for deciding whether a BIF fails.
+%%--------------------------------------------------------------------
+
+test_bif_fails() ->
+  [42] = bif_fails_in_catch([42]),
+  true = bif_fails_in_try([42]),
+  ok.
+
+bif_fails_in_catch(X) ->
+  case catch get(gazonk) of
+    _ -> X
+  end.
+
+bif_fails_in_try(X) ->
+  try
+    true = X =/= []
+  catch
+    _ -> nil(X)
+  end.
+
+nil(_) -> [].
+
+%%--------------------------------------------------------------------
+%% Test that resulted in a native code compiler crash in the code of
+%% hipe_icode_exceptions:find_catches/1 when compiling find_catches/2.
+%%--------------------------------------------------------------------
+
+test_find_catches() ->
+  42 = find_catches(a, false),
+  ok.
+
+find_catches(X, Y) ->
+  case X of
+    a when Y =:= true ->
+      catch id(X),
+      X;
+    b when Y =:= true ->
+      catch id(X),
+      X;
+    a ->
+      catch id(X),
+      42;
+    b ->
+      catch id(X),
+      42
+  end.
+
+id(X) -> X.
+
+%%--------------------------------------------------------------------
+%% Date: Dec 28, 2007
+%%
+%% This is a test adapted from the file sent to the Erlang mailing
+%% list by Eranga Udesh. The file did not compile because of problems
+%% with the heap_allocate instruction and stack trimming.
+%%--------------------------------------------------------------------
+
+test_heap_allocate_trim() ->
+  {abandon, 42} = get_next_retry(a, 42),
+  ok.
+
+get_next_retry(Error, Count) ->
+  case catch pair(retry_scheme, {Error, Count}) of
+    _ ->
+      case pair(Error, Count) of
+        _ -> {abandon, Count}
+      end
+  end.
+
+pair(A, B) -> {A, B}.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_lists.erl b/lib/hipe/test/basic_SUITE_data/basic_lists.erl
new file mode 100644
index 0000000000..264a7f86f6
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_lists.erl
@@ -0,0 +1,61 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains tests that manipulate and pattern match against lists
+%%% (perhaps by calling functions from the 'lists' module).
+%%%-------------------------------------------------------------------
+-module(basic_lists).
+
+-export([test/0]).
+
+test() ->
+  ok = test_length(),
+  ok = test_lists_key(),
+  ok = test_lists_and_strings(),
+  ok.
+
+%%--------------------------------------------------------------------
+
+test_length() ->
+  Len = 42,
+  Lst = mklist(Len, []),
+  Len = iterate(100, Lst),
+  ok.
+
+mklist(0, L) -> L;
+mklist(X, L) -> mklist(X-1, [X|L]).
+
+iterate(0, L) -> len(L, 0);
+iterate(X, L) -> len(L, 0), iterate(X-1, L).
+
+len([_|X], L) -> len(X, L+1);
+len([], L) -> L.
+
+%%--------------------------------------------------------------------
+
+test_lists_key() ->
+  First = {x, 42.0},
+  Second = {y, -77},
+  Third = {z, [a, b, c], {5.0}},
+  List = [First, Second, Third],
+  {value, First} = key_search_find(42, 2, List),
+  ok.
+
+key_search_find(Key, Pos, List) ->
+  case lists:keyfind(Key, Pos, List) of
+    false ->
+      false = lists:keysearch(Key, Pos, List);
+    Tuple when is_tuple(Tuple) ->
+      {value, Tuple} = lists:keysearch(Key, Pos, List)
+  end.
+
+%%--------------------------------------------------------------------
+
+test_lists_and_strings() ->
+  LL = ["H'A", " H'B", " H'C"],
+  LL2 = lists:map(fun string:strip/1, LL),
+  HexFormat = fun(X, Acc) -> {string:substr(X, 3), Acc} end,
+  {LL3,_Ret} = lists:mapfoldl(HexFormat, 0, LL2),
+  ["A", "B", "C"] = lists:sublist(LL3, 42),
+  ok.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_module_info.erl b/lib/hipe/test/basic_SUITE_data/basic_module_info.erl
new file mode 100644
index 0000000000..cab48b10ba
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_module_info.erl
@@ -0,0 +1,32 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%% Date: Oct 25, 2003
+%%%
+%%% Tests whether calling module_info from the same module works.
+%%% This seems trivial, but the problem is that the module_info/[0,1]
+%%% functions that the BEAM file contains used to be dummy functions
+%%% containing crap. So, these functions could not be used for
+%%% compilation to native code and the functions that the BEAM loader
+%%% generates should have been used instead. This was a HiPE bug
+%%% reported by Dan Wallin.
+%%%-------------------------------------------------------------------
+-module(basic_module_info).
+
+-export([test/0]).
+
+test() ->
+  L = test_local_mi0_call(),
+  E = test_remote_mi1_call(),
+  {3, 3} = {L, E},
+  ok.
+
+test_local_mi0_call() ->
+  ModInfo = module_info(),
+  %% io:format("ok, ModInfo=~w\n", [ModInfo]),
+  {exports, FunList} = lists:keyfind(exports, 1, ModInfo),
+  length(FunList).
+
+test_remote_mi1_call() ->
+  FunList = ?MODULE:module_info(exports),
+  length(FunList).
diff --git a/lib/hipe/test/basic_SUITE_data/basic_pattern_match.erl b/lib/hipe/test/basic_SUITE_data/basic_pattern_match.erl
new file mode 100644
index 0000000000..93240354a7
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_pattern_match.erl
@@ -0,0 +1,46 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains code examples that test pattern matching against terms of
+%%% various types.
+%%%-------------------------------------------------------------------
+-module(basic_pattern_match).
+
+-export([test/0]).
+
+test() ->
+  ok = test_hello_world(),
+  ok = test_list_plus_plus_match(),
+  ok.
+
+%%--------------------------------------------------------------------
+%% Trivial test to test pattern matching compilation with atoms, the
+%% correct handling of all sorts of alphanumeric types in Erlang, and
+%% conversions between them.
+
+test_hello_world() ->
+  String = gimme(string),
+  String = atom_to_list(gimme(atom)),
+  String = binary_to_list(gimme(binary)),
+  true = (list_to_atom(String) =:= gimme(atom)),
+  true = (list_to_binary(String) =:= gimme(binary)),
+  ok.
+
+gimme(string) ->
+  "hello world";
+gimme(atom) ->
+  'hello world';
+gimme(binary) ->
+  <<"hello world">>.
+
+%%--------------------------------------------------------------------
+%% Makes sure that pattern matching expressions involving ++ work OK.
+%% The third expression caused a problem in the Erlang shell of R11B-5.
+%% It worked OK in both interpreted and compiled code.
+
+test_list_plus_plus_match() ->
+  ok = (fun("X" ++ _) -> ok end)("X"),
+  ok = (fun([$X | _]) -> ok end)("X"),
+  ok = (fun([$X] ++ _) -> ok end)("X"),
+  ok.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_random.erl b/lib/hipe/test/basic_SUITE_data/basic_random.erl
new file mode 100644
index 0000000000..783947bd31
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_random.erl
@@ -0,0 +1,238 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% A test for list handling created using the 'random' module.
+%%%-------------------------------------------------------------------
+-module(basic_random).
+
+-export([test/0]).
+
+%% It can be used as a benchmark by playing with the following defines
+-define(N, 1000).
+-define(Iter, 500).
+
+test() ->
+  ok = random(?N).
+
+random(N) ->
+  random(N, ?Iter).
+
+random(N, Iter) ->
+  random:seed(1, 2, 3),
+  t(ranlist(N, [], N*100), Iter).
+
+ranlist(0, L, _N) -> L;
+ranlist(N, L, N0) -> ranlist(N-1, [random:uniform(N0)+300 | L], N0).
+
+t(_, 0) -> ok;
+t(L, Iter) ->
+  %% io:format("Sort starting~n"),
+  sort(L),
+  t(L, Iter-1).
+
+sort([X, Y | L]) when X =< Y ->
+  split_1(X, Y, L, [], []);
+sort([X, Y | L]) ->
+  split_2(X, Y, L, [], []);
+sort(L) ->
+  L.
+
+%% Ascending.
+split_1(X, Y, [Z | L], R, Rs) when Z >= Y ->
+  split_1(Y, Z, L, [X | R], Rs);
+split_1(X, Y, [Z | L], R, Rs) when Z >= X ->
+  split_1(Z, Y, L, [X | R], Rs);
+split_1(X, Y, [Z | L], [], Rs) ->
+  split_1(X, Y, L, [Z], Rs);
+split_1(X, Y, [Z | L], R, Rs) ->
+  split_1_1(X, Y, L, R, Rs, Z);
+split_1(X, Y, [], R, Rs) ->
+  rmergel([[Y, X | R] | Rs], []).
+
+%% One out-of-order element, S.
+split_1_1(X, Y, [Z | L], R, Rs, S) when Z >= Y ->
+  split_1_1(Y, Z, L, [X | R], Rs, S);
+split_1_1(X, Y, [Z | L], R, Rs, S) when Z >= X ->
+  split_1_1(Z, Y, L, [X | R], Rs, S);
+split_1_1(X, Y, [Z | L], R, Rs, S) when S =< Z ->
+  split_1(S, Z, L, [], [[Y, X | R] | Rs]);
+split_1_1(X, Y, [Z | L], R, Rs, S) ->
+  split_1(Z, S, L, [], [[Y, X | R] | Rs]);
+split_1_1(X, Y, [], R, Rs, S) ->
+  rmergel([[S], [Y, X | R] | Rs], []).
+
+%% Descending.
+split_2(X, Y, [Z | L], R, Rs) when Z =< Y ->
+  split_2(Y, Z, L, [X | R], Rs);
+split_2(X, Y, [Z | L], R, Rs) when Z =< X ->
+  split_2(Z, Y, L, [X | R], Rs);
+split_2(X, Y, [Z | L], [], Rs) ->
+  split_2(X, Y, L, [Z], Rs);
+split_2(X, Y, [Z | L], R, Rs) ->
+  split_2_1(X, Y, L, R, Rs, Z);
+split_2(X, Y, [], R, Rs) ->
+  mergel([[Y, X | R] | Rs], []).
+
+split_2_1(X, Y, [Z | L], R, Rs, S) when Z =< Y ->
+  split_2_1(Y, Z, L, [X | R], Rs, S);
+split_2_1(X, Y, [Z | L], R, Rs, S) when Z =< X ->
+  split_2_1(Z, Y, L, [X | R], Rs, S);
+split_2_1(X, Y, [Z | L], R, Rs, S) when S > Z ->
+  split_2(S, Z, L, [], [[Y, X | R] | Rs]);
+split_2_1(X, Y, [Z | L], R, Rs, S) ->
+  split_2(Z, S, L, [], [[Y, X | R] | Rs]);
+split_2_1(X, Y, [], R, Rs, S) ->
+  mergel([[S], [Y, X | R] | Rs], []).
+
+mergel([[] | L], Acc) ->
+  mergel(L, Acc);
+mergel([A, [H2 | T2], [H3 | T3] | L], Acc) ->
+  mergel(L, [merge3_1(A, [], H2, T2, H3,  T3) | Acc]);
+mergel([A, [H | T]], Acc) ->
+  rmergel([merge2_1(A, H, T, []) | Acc], []);
+mergel([L], []) ->
+  L;
+mergel([L], Acc) ->
+  rmergel([lists:reverse(L, []) | Acc], []);
+mergel([], []) ->
+  [];
+mergel([], Acc) ->
+  rmergel(Acc, []);
+mergel([A, [] | L], Acc) ->
+  mergel([A | L], Acc);
+mergel([A, B, [] | L], Acc) ->
+  mergel([A, B | L], Acc).
+
+rmergel([A, [H2 | T2], [H3 | T3] | L], Acc) ->
+  rmergel(L, [rmerge3_1(A, [], H2, T2, H3, T3) | Acc]);
+rmergel([A, [H | T]], Acc) ->
+  mergel([rmerge2_1(A, H, T, []) | Acc], []);
+rmergel([L], Acc) ->
+  mergel([lists:reverse(L, []) | Acc], []);
+rmergel([], Acc) ->
+  mergel(Acc, []).
+
+%% Take L1 apart.
+merge3_1([H1 | T1], M, H2, T2, H3, T3) when H1 =< H2 ->
+  merge3_12(T1, H1, H2, T2, H3, T3, M);
+merge3_1([H1 | T1], M, H2, T2, H3, T3) ->
+  merge3_21(T1, H1, H2, T2, H3, T3, M);
+merge3_1(_nil, M, H2, T2, H3, T3) when H2 =< H3 ->
+  merge2_1(T2, H3, T3, [H2 | M]);
+merge3_1(_nil, M, H2, T2, H3, T3) ->
+  merge2_1(T3, H2, T2, [H3 | M]).
+
+%% Take L2 apart.
+merge3_2(T1, H1, M, [H2 | T2], H3, T3) when H1 =< H2 ->
+  merge3_12(T1, H1, H2, T2, H3, T3, M);
+merge3_2(T1, H1, M, [H2 | T2], H3, T3) ->
+  merge3_21(T1, H1, H2, T2, H3, T3, M);
+merge3_2(T1, H1, M, _nil, H3, T3) when H1 =< H3 ->
+  merge2_1(T1, H3, T3, [H1 | M]);
+merge3_2(T1, H1, M, _nil, H3, T3) ->
+  merge2_1(T3, H1, T1, [H3 | M]).
+
+%% H1 <= H2. Inlined.
+merge3_12(T1, H1, H2, T2, H3, T3, M) when H3 < H1 ->
+  merge3_12_3(T1, H1, H2, T2, [H3 | M], T3);
+merge3_12(T1, H1, H2, T2, H3, T3, M) ->
+  merge3_1(T1, [H1 | M], H2, T2, H3, T3).
+
+%% H1 <= H2, take L3 apart.
+merge3_12_3(T1, H1, H2, T2, M, [H3 | T3]) when H3 < H1 ->
+  merge3_12_3(T1, H1, H2, T2, [H3 | M], T3);
+merge3_12_3(T1, H1, H2, T2, M, [H3 | T3]) ->
+  merge3_1(T1, [H1 | M], H2, T2, H3, T3);
+merge3_12_3(T1, H1, H2, T2, M, _nil) ->
+  merge2_1(T1, H2, T2, [H1 | M]).
+
+%% H1 > H2. Inlined.
+merge3_21(T1, H1, H2, T2, H3, T3, M) when H3 < H2 ->
+  merge3_21_3(T1, H1, H2, T2, [H3 | M], T3);
+merge3_21(T1, H1, H2, T2, H3, T3, M) ->
+  merge3_2(T1, H1, [H2 | M], T2, H3, T3).
+
+%% H1 > H2, take L3 apart.
+merge3_21_3(T1, H1, H2, T2, M, [H3 | T3]) when H3 < H2 ->
+  merge3_21_3(T1, H1, H2, T2, [H3 | M], T3);
+merge3_21_3(T1, H1, H2, T2, M, [H3 | T3]) ->
+  merge3_2(T1, H1, [H2 | M], T2, H3, T3);
+merge3_21_3(T1, H1, H2, T2, M, _nil) ->
+  merge2_1(T2, H1, T1, [H2 | M]).
+
+%% Take L1 apart.
+rmerge3_1([H1 | T1], M, H2, T2, H3, T3) when H1 > H2 ->
+  rmerge3_12(T1, H1, H2, T2, H3, T3, M);
+rmerge3_1([H1 | T1], M, H2, T2, H3, T3) ->
+  rmerge3_21(T1, H1, H2, T2, H3, T3, M);
+rmerge3_1(_nil, M, H2, T2, H3, T3) when H2 > H3 ->
+  rmerge2_1(T2, H3, T3, [H2 | M]);
+rmerge3_1(_nil, M, H2, T2, H3, T3) ->
+  rmerge2_1(T3, H2, T2, [H3 | M]).
+
+%% Take L2 apart.
+rmerge3_2(T1, H1, M, [H2 | T2], H3, T3) when H1 > H2 ->
+  rmerge3_12(T1, H1, H2, T2, H3, T3, M);
+rmerge3_2(T1, H1, M, [H2 | T2], H3, T3) ->
+  rmerge3_21(T1, H1, H2, T2, H3, T3, M);
+rmerge3_2(T1, H1, M, _nil, H3, T3) when H1 > H3 ->
+  rmerge2_1(T1, H3, T3, [H1 | M]);
+rmerge3_2(T1, H1, M, _nil, H3, T3) ->
+  rmerge2_1(T3, H1, T1, [H3 | M]).
+
+%% H1 > H2. Inlined.
+rmerge3_12(T1, H1, H2, T2, H3, T3, M) when H3 >= H1 ->
+  rmerge3_12_3(T1, H1, H2, T2, [H3 | M], T3);
+rmerge3_12(T1, H1, H2, T2, H3, T3, M) ->
+  rmerge3_1(T1, [H1 | M], H2, T2, H3, T3).
+
+%% H1 > H2, take L3 apart.
+rmerge3_12_3(T1, H1, H2, T2, M, [H3 | T3]) when H3 >= H1 ->
+  rmerge3_12_3(T1, H1, H2, T2, [H3 | M], T3);
+rmerge3_12_3(T1, H1, H2, T2, M, [H3 | T3]) ->
+  rmerge3_1(T1, [H1 | M], H2, T2, H3, T3);
+rmerge3_12_3(T1, H1, H2, T2, M, _nil) ->
+  rmerge2_1(T1, H2, T2, [H1 | M]).
+
+%% H1 =< H2. Inlined.
+rmerge3_21(T1, H1, H2, T2, H3, T3, M) when H3 >= H2 ->
+  rmerge3_21_3(T1, H1, H2, T2, [H3 | M], T3);
+rmerge3_21(T1, H1, H2, T2, H3, T3, M) ->
+  rmerge3_2(T1, H1, [H2 | M], T2, H3, T3).
+
+%% H1 =< H2, take L3 apart.
+rmerge3_21_3(T1, H1, H2, T2, M, [H3 | T3]) when H3 >= H2 ->
+  rmerge3_21_3(T1, H1, H2, T2, [H3 | M], T3);
+rmerge3_21_3(T1, H1, H2, T2, M, [H3 | T3]) ->
+  rmerge3_2(T1, H1, [H2 | M], T2, H3, T3);
+rmerge3_21_3(T1, H1, H2, T2, M, _nil) ->
+  rmerge2_1(T2, H1, T1, [H2 | M]).
+
+merge2_1([H1 | T1], H2, T2, M) when H2 < H1 ->
+  merge2_2(T1, H1, T2, [H2 | M]);
+merge2_1([H1 | T1], H2, T2, M) ->
+  merge2_1(T1, H2, T2, [H1 | M]);
+merge2_1(_nil, H2, T2, M) ->
+  lists:reverse(T2, [H2 | M]).
+
+merge2_2(T1, H1, [H2 | T2], M) when H1 < H2 ->
+  merge2_1(T1, H2, T2, [H1 | M]);
+merge2_2(T1, H1, [H2 | T2], M) ->
+  merge2_2(T1, H1, T2, [H2 | M]);
+merge2_2(T1, H1, _nil, M) ->
+  lists:reverse(T1, [H1 | M]).
+
+rmerge2_1([H1 | T1], H2, T2, M) when H2 >= H1 ->
+  rmerge2_2(T1, H1, T2, [H2 | M]);
+rmerge2_1([H1 | T1], H2, T2, M) ->
+  rmerge2_1(T1, H2, T2, [H1 | M]);
+rmerge2_1(_nil, H2, T2, M) ->
+  lists:reverse(T2, [H2 | M]).
+
+rmerge2_2(T1, H1, [H2 | T2], M) when H1 >= H2 ->
+  rmerge2_1(T1, H2, T2, [H1 | M]);
+rmerge2_2(T1, H1, [H2 | T2], M) ->
+  rmerge2_2(T1, H1, T2, [H2 | M]);
+rmerge2_2(T1, H1, _nil, M) ->
+  lists:reverse(T1, [H1 | M]).
diff --git a/lib/hipe/test/basic_SUITE_data/basic_receive.erl b/lib/hipe/test/basic_SUITE_data/basic_receive.erl
new file mode 100644
index 0000000000..5f865d7b7a
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_receive.erl
@@ -0,0 +1,56 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains code examples that test correct handling of receives.
+%%%-------------------------------------------------------------------
+-module(basic_receive).
+
+-export([test/0]).
+
+test() ->
+  ok = test_wait_timeout(),
+  ok = test_double_timeout(),
+  ok = test_reschedule(),
+  ok.
+
+%%--------------------------------------------------------------------
+
+test_wait_timeout() ->
+  receive after 42 -> ok end.
+
+%%--------------------------------------------------------------------
+
+test_double_timeout() ->
+  self() ! foo,
+  self() ! another_foo,
+  receive
+    non_existent -> weird
+  after 0 -> timeout
+  end,
+  receive
+    foo -> ok
+  after 1000 -> timeout
+  end.
+
+%%--------------------------------------------------------------------
+%% Check that RESCHEDULE returns from BIFs work.
+
+test_reschedule() ->
+  erts_debug:set_internal_state(available_internal_state, true),
+  First = self(),
+  Second = spawn(fun() -> doit(First) end),
+  receive
+    Second -> ok
+  end,
+  receive
+  after 42 -> ok
+  end,
+  erts_debug:set_internal_state(hipe_test_reschedule_resume, Second),
+  ok.
+
+doit(First) ->
+  First ! self(),
+  erts_debug:set_internal_state(hipe_test_reschedule_suspend, 1).
+
+%%--------------------------------------------------------------------
diff --git a/lib/hipe/test/basic_SUITE_data/basic_records.erl b/lib/hipe/test/basic_SUITE_data/basic_records.erl
new file mode 100644
index 0000000000..cbb451196c
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_records.erl
@@ -0,0 +1,28 @@
+%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains tests that manipulate and pattern match against records.
+%%%-------------------------------------------------------------------
+-module(basic_records).
+
+-export([test/0]).
+
+test() ->
+  ok = test_rec1(),
+  ok.
+
+%%--------------------------------------------------------------------
+
+-record(r, {ra}).
+-record(s, {sa, sb, sc, sd}).
+
+test_rec1() ->
+  R = #r{},
+  S = #s{},
+  S1 = S#s{sc=R, sd=1},
+  R1 = S1#s.sc,
+  undefined = R1#r.ra,
+  ok.
+
+%%--------------------------------------------------------------------
diff --git a/lib/hipe/test/basic_SUITE_data/basic_strength_reduce.erl b/lib/hipe/test/basic_SUITE_data/basic_strength_reduce.erl
new file mode 100644
index 0000000000..0f94320a33
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_strength_reduce.erl
@@ -0,0 +1,65 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Tests the strength reduction component of the HiPE compiler.
+%%%-------------------------------------------------------------------
+-module(basic_strength_reduce).
+
+-export([test/0]).
+%% These functions are exported so as to not remove them by inlining
+-export([crash_0/1, crash_1/1, crash_2/1, crash_3/1, bug_div_2N/1]).
+
+test() ->
+  ok = test_strength_reduce1(),
+  ok.
+
+%%--------------------------------------------------------------------
+
+test_strength_reduce1() ->
+  ok = crash_0(0),
+  ok = crash_1(42),
+  ok = crash_2(42),
+  ok = crash_3(42),
+   5 =  42 bsr 3 = bug_div_2N(42),
+  -6 = -42 bsr 3 = bug_div_2N(-42) - 1,
+  ok.
+
+%% This is a crash report by Peter Wang (10 July 2007) triggering an
+%% R11B-5 crash: strength reduction could not handle calls with no
+%% destination
+crash_0(A) ->
+  case A of
+    0 ->
+      A div 8,
+      ok
+  end.
+
+%% The above was simplified to the following which showed another
+%% crash, this time on RTL
+crash_1(A) when is_integer(A), A >= 0 ->
+  A div 8,
+  ok.
+
+%% A similar crash like the first one, but in a different place in the
+%% code, was triggered by the following code
+crash_2(A) when is_integer(A), A >= 0 ->
+  A div 1,
+  ok.
+
+%% A crash similar to the first one happened in the following code
+crash_3(A) ->
+  case A of
+    42 ->
+      A * 0,
+      ok
+  end.
+
+%% Strength reduction for div/2 and rem/2 with a power of 2
+%% should be performed only for non-negative integers
+bug_div_2N(X) when is_integer(X), X >= 0 ->
+  X div 8;
+bug_div_2N(X) when is_integer(X), X < 0 ->
+  X div 8.
+
+%%--------------------------------------------------------------------
diff --git a/lib/hipe/test/basic_SUITE_data/basic_switches.erl b/lib/hipe/test/basic_SUITE_data/basic_switches.erl
new file mode 100644
index 0000000000..0a7ae5b8b7
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_switches.erl
@@ -0,0 +1,52 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains tests for pattern matching switches.
+%%%-------------------------------------------------------------------
+-module(basic_switches).
+
+-export([test/0]).
+
+test() ->
+  ok = test_switch_mix(),
+  ok.
+
+%%---------------------------------------------------------------------
+
+-define(BIG1, 21323233222132323322).
+-define(BIG2, 4242424242424242424242424242424242).
+
+test_switch_mix() ->
+  small1 = t(42),
+  small2 = t(17),
+  big1 = t(?BIG1),
+  big2 = t(?BIG2),
+  atom = t(foo),
+  pid = t(self()),
+  float = t(4.2),
+  ok.
+
+t(V) ->
+  S = self(),
+  case V of
+    42 -> small1;
+    17 -> small2;
+    ?BIG1 -> big1;
+    ?BIG2 -> big2;
+    1 -> no;
+    2 -> no;
+    3 -> no;
+    4 -> no;
+    5 -> no;
+    6 -> no;
+    7 -> no;
+    8 -> no;
+    foo -> atom;
+    9 -> no;
+    4.2 -> float;
+    S -> pid;
+    _ -> no
+  end.
+
+%%---------------------------------------------------------------------
diff --git a/lib/hipe/test/basic_SUITE_data/basic_tail_rec.erl b/lib/hipe/test/basic_SUITE_data/basic_tail_rec.erl
new file mode 100644
index 0000000000..0124f13df6
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_tail_rec.erl
@@ -0,0 +1,39 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains tests that check that tail recursion optimization occurs.
+%%%-------------------------------------------------------------------
+-module(basic_tail_rec).
+
+-export([test/0]).
+-export([app0/2]).  %% used in an apply/3 call
+
+test() ->
+  ok = test_app_tail(),
+  ok.
+
+%%--------------------------------------------------------------------
+%% Written by Mikael Pettersson: check that apply is tail recursive.
+
+%% Increased the following quantity from 20 to 30 so that the test
+%% remains valid even with the naive register allocator.  - Kostis
+-define(SIZE_INCREASE, 30).
+
+test_app_tail() ->
+  Inc = start(400),
+  %% io:format("Inc ~w\n", [Inc]),
+  case Inc > ?SIZE_INCREASE of
+    true ->
+      {error, "apply/3 is not tail recursive in native code"};
+    false ->
+      ok
+  end.
+
+start(N) ->
+  app0(N, hipe_bifs:nstack_used_size()).
+
+app0(0, Size0) ->
+  hipe_bifs:nstack_used_size() - Size0;
+app0(N, Size) ->
+  apply(?MODULE, app0, [N-1, Size]).
diff --git a/lib/hipe/test/basic_SUITE_data/basic_tuples.erl b/lib/hipe/test/basic_SUITE_data/basic_tuples.erl
new file mode 100644
index 0000000000..94c187e364
--- /dev/null
+++ b/lib/hipe/test/basic_SUITE_data/basic_tuples.erl
@@ -0,0 +1,177 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%-------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Contains tests that manipulate and pattern match against tuples.
+%%%-------------------------------------------------------------------
+-module(basic_tuples).
+
+-export([test/0]).
+
+test() ->
+  Num = 4711,
+  ok = test_match({}, {1}, {1,2}, {1,2,3}, {1,2,3,4}, {1,2,3,4,5},
+		  {1,2,3,4,5,6}, {1,2,3,4,5,6,7}, {1,2,3,4,5,6,7,8}),
+  ok = test_size({}, {a}, {{a},{b}}, {a,{b},c}),
+  ok = test_element({}, {a}, {a,b}, Num),
+  ok = test_setelement({}, {1}, {1,2}, 3, [1,2]),
+  ok = test_tuple_to_list({}, {a}, {a,b}, {a,b,c}, {a,b,c,d}, Num),
+  ok = test_list_to_tuple([], [a], [a,b], [a,b,c], [a,b,c,d], Num),
+  ok = test_tuple_with_case(),
+  ok = test_tuple_in_guard({a, b}, {a, b, c}),
+  ok.
+
+%%--------------------------------------------------------------------
+%% Tests matching of tuples
+
+test_match(T0, T1, T2, T3, T4, T5, T6, T7, T8) ->
+  {} = T0,
+  {1} = T1,
+  {1, 2} = T2,
+  {1, 2, 3} = T3,
+  {1, 2, 3, 4} = T4,
+  {1, 2, 3, 4, 5} = T5,
+  {1, 2, 3, 4, 5, 6} = T6,
+  T6 = {1, 2, 3, 4, 5, 6},
+  T7 = {1, 2, 3, 4, 5, 6, 7},
+  {1, 2, 3, 4, 5, 6, 7, 8} = T8,
+  ok.
+
+%%--------------------------------------------------------------------
+%% Tests the size/1 and tuple_size/1 BIFs.
+
+test_size(T0, T1, T2, T3) ->
+  [0, 1, 2, 3] = [size(T) || T <- [T0, T1, T2, T3]],
+  [0, 1, 2, 3] = [tuple_size(T) || T <- [T0, T1, T2, T3]],
+  ok.
+
+%%--------------------------------------------------------------------
+%% Tests element/2.
+
+test_element(T0, T1, T2, N) ->
+  a = element(1, T1),
+  a = element(1, T2),
+  %% indirect calls to element/2
+  List = lists:seq(1, N),
+  Tuple = list_to_tuple(List),
+  ok = get_elements(List, Tuple, 1),
+  %% some cases that throw exceptions
+  {'EXIT', _} = (catch my_element(0, T2)),
+  {'EXIT', _} = (catch my_element(3, T2)),
+  {'EXIT', _} = (catch my_element(1, T0)),
+  {'EXIT', _} = (catch my_element(1, List)),
+  {'EXIT', _} = (catch my_element(1, N)),
+  {'EXIT', _} = (catch my_element(1.5, T2)),
+  ok.
+
+my_element(Pos, Term) ->
+  element(Pos, Term).
+
+get_elements([Element|Rest], Tuple, Pos) ->
+  Element = element(Pos, Tuple),
+  get_elements(Rest, Tuple, Pos + 1);
+get_elements([], _Tuple, _Pos) ->
+  ok.
+
+%%--------------------------------------------------------------------
+%% Tests set_element/3.
+
+test_setelement(T0, T1, Pair, Three, L) ->
+  {x} = setelement(1, T1, x),
+  {x, 2} = setelement(1, Pair, x),
+  {1, x} = setelement(2, Pair, x),
+  %% indirect calls to setelement/3
+  Tuple = list_to_tuple(lists:duplicate(2048, x)),
+  NewTuple = set_all_elements(Tuple, 1),
+  NewTuple = list_to_tuple(lists:seq(1+7, 2048+7)),
+  %% the following cases were rewritten to use the Three
+  %% variable in this weird way so as to silence the compiler
+  {'EXIT', _} = (catch setelement(Three - Three, Pair, x)),
+  {'EXIT', _} = (catch setelement(Three, Pair, x)),
+  {'EXIT', _} = (catch setelement(Three div Three, T0, x)),
+  {'EXIT', _} = (catch setelement(Three div Three, L, x)),
+  {'EXIT', _} = (catch setelement(Three / 2, Pair, x)),
+  ok.
+
+set_all_elements(Tuple, Pos) when Pos =< tuple_size(Tuple) ->
+  set_all_elements(setelement(Pos, Tuple, Pos+7), Pos+1);
+set_all_elements(Tuple, Pos) when Pos > tuple_size(Tuple) ->
+  Tuple.
+
+%%--------------------------------------------------------------------
+%% Tests tuple_to_list/1.
+
+test_tuple_to_list(T0, T1, T2, T3, T4, Size) ->
+  [] = tuple_to_list(T0),
+  [a] = tuple_to_list(T1),
+  [a, b] = tuple_to_list(T2),
+  [a, b, c] = tuple_to_list(T3),
+  [a, b, c, d] = tuple_to_list(T4),
+  [a, b, c, d] = tuple_to_list(T4),
+  %% test a big tuple
+  List = lists:seq(1, Size),
+  Tuple = list_to_tuple(List),
+  Size = tuple_size(Tuple),
+  List = tuple_to_list(Tuple),
+  %% some cases that should result in errors
+  {'EXIT', _} = (catch my_tuple_to_list(element(2, T3))),
+  {'EXIT', _} = (catch my_tuple_to_list(Size)),
+  ok.
+
+my_tuple_to_list(X) ->
+  tuple_to_list(X).
+
+%%--------------------------------------------------------------------
+%% Tests list_to_tuple/1.
+
+test_list_to_tuple(L0, L1, L2, L3, L4, Size) ->
+  {} = list_to_tuple(L0),
+  {a} = list_to_tuple(L1),
+  {a, b} = list_to_tuple(L2),
+  {a, b, c} = list_to_tuple(L3),
+  {a, b, c, d} = list_to_tuple(L4),
+  {a, b, c, d, e} = list_to_tuple(L4++[e]),
+  %% test list_to_tuple with a big list
+  Tuple = list_to_tuple(lists:seq(1, Size)),
+  Size = tuple_size(Tuple),
+  %% some cases that should result in errors
+  {'EXIT', _} = (catch my_list_to_tuple({a,b})),
+  {'EXIT', _} = (catch my_list_to_tuple([hd(L1)|hd(L2)])),
+  ok.
+
+my_list_to_tuple(X) ->
+  list_to_tuple(X).
+
+%%--------------------------------------------------------------------
+%% Tests that a case nested inside a tuple is ok.
+%% (This was known to crash earlier versions of BEAM.)
+
+test_tuple_with_case() ->
+  {reply, true} = tuple_with_case(),
+  ok.
+
+tuple_with_case() ->
+  %% The following comments apply to the BEAM compiler.
+  void(),                       % Reset var count.
+  {reply,                       % Compiler will choose {x,1} for tuple.
+   case void() of               % Call will reset var count.
+     {'EXIT', Reason} ->        % Case will return in {x,1} (first free),
+       {error, Reason};         %  but the tuple will be build in {x,1},
+     _ ->                       %  so case value is lost and a circular
+       true                     %  data element is built.
+   end}.
+
+void() -> ok.
+
+%%--------------------------------------------------------------------
+%% Test to build a tuple in a guard.
+
+test_tuple_in_guard(T2, T3) ->
+  %% T2 = {a, b}; T3 = {a, b, c}
+  ok = if T2 == {element(1, T3), element(2, T3)} -> ok;
+	  true -> other
+       end,
+  ok = if T3 == {element(1, T3), element(2, T3), element(3, T3)} -> ok;
+	  true -> other
+       end,
+  ok.
diff --git a/lib/hipe/test/bs_SUITE_data/bs_add.erl b/lib/hipe/test/bs_SUITE_data/bs_add.erl
index af5a3b2f23..4b92e6b413 100644
--- a/lib/hipe/test/bs_SUITE_data/bs_add.erl
+++ b/lib/hipe/test/bs_SUITE_data/bs_add.erl
@@ -2,7 +2,7 @@
 %%-------------------------------------------------------------------------
 %% The guard in f/3 revealed a problem in the translation of the 'bs_add'
 %% BEAM instruction to Icode. The fail label was not properly translated.
-%% Fixed 3/2/2011.
+%% Fixed 3/2/2011. Then in 2015 we found another issue: g/2.  Also fixed.
 %%-------------------------------------------------------------------------
 -module(bs_add).
 
@@ -10,9 +10,17 @@
 
 test() ->
   42 = f(<<12345:16>>, 4711, <<42>>),
+  true = g(<<1:13>>, 3),  %% was handled OK, but
+  false = g(<<>>, gurka), %% this one leaked badarith
   ok.
 
 f(Bin, A, B) when <<A:9, B:7/binary>> == Bin ->
   gazonk;
 f(Bin, _, _) when is_binary(Bin) ->
   42.
+
+%% Complex way of testing (bit_size(Bin) + Len) rem 8 =:= 0
+g(Bin, Len) when is_binary(<<Bin/binary-unit:1, 123:Len>>) ->
+    true;
+g(_, _) ->
+    false.
diff --git a/lib/hipe/test/bs_SUITE_data/bs_construct.erl b/lib/hipe/test/bs_SUITE_data/bs_construct.erl
index 37a54c1981..b9e7d93570 100644
--- a/lib/hipe/test/bs_SUITE_data/bs_construct.erl
+++ b/lib/hipe/test/bs_SUITE_data/bs_construct.erl
@@ -14,6 +14,11 @@ test() ->
   16#10000008 = bit_size(large_bin(1, 2, 3, 4)),
   ok = bad_ones(),
   ok = zero_width(),
+  ok = not_used(),
+  ok = bad_append(),
+  ok = system_limit(),
+  ok = bad_floats(),
+  ok = huge_binaries(),
   ok.
 
 %%--------------------------------------------------------------------
@@ -142,3 +147,159 @@ zero_width() ->
   ok.
 
 id(X) -> X.
+
+%%--------------------------------------------------------------------
+%% Taken from bs_construct_SUITE. The test checks that constructed
+%% binaries that are not used would still give a `badarg' exception.
+%% Problem was that in native code one of them gave `badarith'.
+
+not_used() ->
+    ok = not_used1(3, <<"dum">>),
+    {'EXIT',{badarg,_}} = (catch not_used1(42, "dum_string")),
+    {'EXIT',{badarg,_}} = (catch not_used2(666, -2)),
+    {'EXIT',{badarg,_}} = (catch not_used2(666, "bad_size")), % this one
+    {'EXIT',{badarg,_}} = (catch not_used3(666)),
+    ok.
+
+not_used1(I, BinString) ->
+    <<I:32,BinString/binary>>,
+    ok.
+
+not_used2(I, Sz) ->
+    <<I:Sz>>,
+    ok.
+
+not_used3(I) ->
+    <<I:(-8)>>,
+    ok.
+
+%%--------------------------------------------------------------------
+%% Taken from bs_construct_SUITE.
+
+bad_append() ->
+    do_bad_append(<<127:1>>, fun append_unit_3/1),
+    do_bad_append(<<127:2>>, fun append_unit_3/1),
+    do_bad_append(<<127:17>>, fun append_unit_3/1),
+
+    do_bad_append(<<127:3>>, fun append_unit_4/1),
+    do_bad_append(<<127:5>>, fun append_unit_4/1),
+    do_bad_append(<<127:7>>, fun append_unit_4/1),
+    do_bad_append(<<127:199>>, fun append_unit_4/1),
+
+    do_bad_append(<<127:7>>, fun append_unit_8/1),
+    do_bad_append(<<127:9>>, fun append_unit_8/1),
+
+    do_bad_append(<<0:8>>, fun append_unit_16/1),
+    do_bad_append(<<0:15>>, fun append_unit_16/1),
+    do_bad_append(<<0:17>>, fun append_unit_16/1),
+    ok.
+
+do_bad_append(Bin0, Appender) ->
+    {'EXIT',{badarg,_}} = (catch Appender(Bin0)),
+
+    Bin1 = id(<<0:3,Bin0/bitstring>>),
+    <<_:3,Bin2/bitstring>> = Bin1,
+    {'EXIT',{badarg,_}} = (catch Appender(Bin2)),
+
+    %% Create a writable binary.
+    Empty = id(<<>>),
+    Bin3 = <<Empty/bitstring,Bin0/bitstring>>,
+    {'EXIT',{badarg,_}} = (catch Appender(Bin3)),
+    ok.
+
+append_unit_3(Bin) ->
+    <<Bin/binary-unit:3,0:1>>.
+
+append_unit_4(Bin) ->
+    <<Bin/binary-unit:4,0:1>>.
+
+append_unit_8(Bin) ->
+    <<Bin/binary,0:1>>.
+
+append_unit_16(Bin) ->
+    <<Bin/binary-unit:16,0:1>>.
+
+%%--------------------------------------------------------------------
+%% Taken from bs_construct_SUITE.
+
+system_limit() ->
+    WordSize = erlang:system_info(wordsize),
+    BitsPerWord = WordSize * 8,
+    {'EXIT',{system_limit,_}} =
+	(catch <<0:(id(0)),42:(id(1 bsl BitsPerWord))>>),
+    {'EXIT',{system_limit,_}} =
+	(catch <<42:(id(1 bsl BitsPerWord)),0:(id(0))>>),
+    {'EXIT',{system_limit,_}} =
+	(catch <<(id(<<>>))/binary,0:(id(1 bsl 100))>>),
+
+    %% Would fail to load.
+    {'EXIT',{system_limit,_}} = (catch <<0:(1 bsl 67)>>),
+    {'EXIT',{system_limit,_}} = (catch <<0:((1 bsl 64)+1)>>),
+    case WordSize of
+	4 ->
+	    system_limit_32();
+	8 ->
+	    ok
+    end.
+
+system_limit_32() ->
+    {'EXIT',{badarg,_}} = (catch <<42:(-1)>>),
+    {'EXIT',{badarg,_}} = (catch <<42:(id(-1))>>),
+    {'EXIT',{badarg,_}} = (catch <<42:(id(-389739873536870912))/unit:8>>),
+    {'EXIT',{system_limit,_}} = (catch <<42:536870912/unit:8>>),
+    {'EXIT',{system_limit,_}} = (catch <<42:(id(536870912))/unit:8>>),
+    {'EXIT',{system_limit,_}} = (catch <<0:(id(8)),42:536870912/unit:8>>),
+    {'EXIT',{system_limit,_}} =	(catch <<0:(id(8)),42:(id(536870912))/unit:8>>),
+
+    %% The size would be silently truncated, resulting in a crash.
+    {'EXIT',{system_limit,_}} = (catch <<0:(1 bsl 35)>>),
+    {'EXIT',{system_limit,_}} = (catch <<0:((1 bsl 32)+1)>>),
+
+    %% Would fail to load.
+    {'EXIT',{system_limit,_}} = (catch <<0:(1 bsl 43)>>),
+    {'EXIT',{system_limit,_}} = (catch <<0:((1 bsl 40)+1)>>),
+    ok.
+
+%%--------------------------------------------------------------------
+
+bad_floats() ->
+  WordSize = erlang:system_info(wordsize),
+  BitsPerWord = WordSize * 8,
+  {'EXIT',{badarg,_}} = (catch <<3.14:(id(33))/float>>),
+  {'EXIT',{badarg,_}} = (catch <<3.14:(id(64 bor 32))/float>>),
+  {'EXIT',{badarg,_}} = (catch <<3.14:(id((1 bsl 28) bor 32))/float>>),
+  {'EXIT',{system_limit,_}} = (catch <<3.14:(id(1 bsl BitsPerWord))/float>>),
+  ok.
+
+%%--------------------------------------------------------------------
+%% A bug in the implementation of binaries compared sizes in bits with sizes in
+%% bytes, causing <<0:(id((1 bsl 31)-1))>> to fail to construct with
+%% 'system_limit'.
+%% <<0:(id((1 bsl 32)-1))>> was succeeding because the comparison was
+%% (incorrectly) signed.
+
+huge_binaries() ->
+  AlmostIllegal = id(<<0:(id((1 bsl 32)-8))>>),
+  case erlang:system_info(wordsize) of
+    4 -> huge_binaries_32(AlmostIllegal);
+    8 -> ok
+  end,
+  garbage_collect(),
+  id(<<0:(id((1 bsl 31)-1))>>),
+  id(<<0:(id((1 bsl 30)-1))>>),
+  garbage_collect(),
+  ok.
+
+huge_binaries_32(AlmostIllegal) ->
+  %% Attempt construction of too large binary using bs_init/1 (which takes the
+  %% number of bytes as an argument, which should be compared to the maximum
+  %% size in bytes).
+  {'EXIT',{system_limit,_}} = (catch <<0:32,AlmostIllegal/binary>>),
+  %% Attempt construction of too large binary using bs_init/1 with a size in
+  %% bytes that has the msb set (and would be negative if it was signed).
+  {'EXIT',{system_limit,_}} =
+    (catch <<0:8, AlmostIllegal/binary, AlmostIllegal/binary,
+	     AlmostIllegal/binary, AlmostIllegal/binary,
+	     AlmostIllegal/binary, AlmostIllegal/binary,
+	     AlmostIllegal/binary, AlmostIllegal/binary>>),
+  ok.
diff --git a/lib/hipe/test/bs_SUITE_data/bs_split.erl b/lib/hipe/test/bs_SUITE_data/bs_split.erl
index 2e52308a77..617543f789 100644
--- a/lib/hipe/test/bs_SUITE_data/bs_split.erl
+++ b/lib/hipe/test/bs_SUITE_data/bs_split.erl
@@ -26,13 +26,13 @@ bs1(L, B, Pos, Sz1, Sz2) ->
   <<B1:Sz1/binary, B2:Sz2/binary>> = B,
   bs2(L, B, Pos, B1, B2).
 
-bs2(L, B, Pos, B1, B2)->
+bs2(L, B, Pos, B1, B2) ->
   B1 = list_to_binary(lists:sublist(L, 1, Pos)),
   bs3(L, B, Pos, B2).
 
 bs3(L, B, Pos, B2) ->
   B2 = list_to_binary(lists:nthtail(Pos, L)),
-  byte_split(L, B, Pos-1).
+  byte_split(L, B, Pos - 1).
 
 %%--------------------------------------------------------------------
 
@@ -56,14 +56,14 @@ bit_split_binary2(_Action, _Bin, [], _Bef) -> ok.
 
 bit_split_binary3(Action, Bin, List, Bef, Aft) when Bef =< Aft ->
   Action(Bin, List, Bef, (Aft-Bef) div 8 * 8),
-  bit_split_binary3(Action, Bin, List, Bef, Aft-8);
+  bit_split_binary3(Action, Bin, List, Bef, Aft - 8);
 bit_split_binary3(_, _, _, _, _) -> ok.
 
 make_bin_from_list(_List, 0) ->
   mkbin([]);
 make_bin_from_list(List, N) ->
   list_to_binary([make_int(List, 8, 0),
-		  make_bin_from_list(lists:nthtail(8, List), N-8)]).
+		  make_bin_from_list(lists:nthtail(8, List), N - 8)]).
 
 make_int(_List, 0, Acc) -> Acc;
 make_int([H|T], N, Acc) -> make_int(T, N-1, Acc bsl 1 bor H).
@@ -101,5 +101,5 @@ z_split(B, N) ->
     <<_:N/binary>> ->
       [B];
     _ ->
-      z_split(B, N+1)
+      z_split(B, N + 1)
   end.
diff --git a/lib/hipe/test/bs_SUITE_data/bs_utf.erl b/lib/hipe/test/bs_SUITE_data/bs_utf.erl
index f50ae08964..368ad0cd20 100644
--- a/lib/hipe/test/bs_SUITE_data/bs_utf.erl
+++ b/lib/hipe/test/bs_SUITE_data/bs_utf.erl
@@ -1,18 +1,356 @@
 %% -*- erlang-indent-level: 2 -*-
 %%-------------------------------------------------------------------
-%% Purpose: test support for UTF datatypes in binaries - INCOMPLETE
+%% Purpose: test support for UTF datatypes in binaries
+%%
+%% Most of it taken from emulator/test/bs_utf_SUITE.erl
 %%-------------------------------------------------------------------
 
 -module(bs_utf).
 
 -export([test/0]).
 
+-include_lib("common_test/include/ct.hrl").
+
 test() ->
+  ok = utf8_cm65(),
+  ok = utf8_roundtrip(),
+  ok = utf16_roundtrip(),
+  ok = utf32_roundtrip(),
+  %% The following were problematic for the LLVM backend
+  ok = utf8_illegal_sequences(),
+  ok = utf16_illegal_sequences(),
+  ok = utf32_illegal_sequences(),
+  ok.
+
+%%-------------------------------------------------------------------
+%% A test with construction and matching
+
+utf8_cm65() ->
   <<65>> = b65utf8(),
   ok = m(<<65>>).
 
+b65utf8() ->
+  <<65/utf8>>.
+
 m(<<65/utf8>>) ->
   ok.
 
-b65utf8() ->
-  <<65/utf8>>.
+%%-------------------------------------------------------------------
+
+utf8_roundtrip() ->
+  ok = utf8_roundtrip(0, 16#D7FF),
+  ok = utf8_roundtrip(16#E000, 16#10FFFF),
+  ok.
+
+utf8_roundtrip(First, Last) when First =< Last ->
+  Bin = int_to_utf8(First),
+  Bin = id(<<First/utf8>>),
+  Bin = id(<<(id(<<>>))/binary,First/utf8>>),
+  Unaligned = id(<<3:2,First/utf8>>),
+  <<_:2,Bin/binary>> = Unaligned,
+  <<First/utf8>> = Bin,
+  <<First/utf8>> = make_unaligned(Bin),
+  utf8_roundtrip(First+1, Last);
+utf8_roundtrip(_, _) ->
+  ok.
+
+%%-------------------------------------------------------------------
+
+utf16_roundtrip() ->
+  Big = fun utf16_big_roundtrip/1,
+  Little = fun utf16_little_roundtrip/1,
+  PidRefs = [spawn_monitor(fun() -> do_utf16_roundtrip(Fun) end) ||
+	      Fun <- [Big,Little]],
+  [receive {'DOWN', Ref, process, Pid, Reason} -> normal=Reason end ||
+    {Pid, Ref} <- PidRefs],
+  ok.
+
+do_utf16_roundtrip(Fun) ->
+  do_utf16_roundtrip(0, 16#D7FF, Fun),
+  do_utf16_roundtrip(16#E000, 16#10FFFF, Fun).
+
+do_utf16_roundtrip(First, Last, Fun) when First =< Last ->
+  Fun(First),
+  do_utf16_roundtrip(First+1, Last, Fun);
+do_utf16_roundtrip(_, _, _) -> ok.
+
+utf16_big_roundtrip(Char) ->
+  Bin = id(<<Char/utf16>>),
+  Bin = id(<<(id(<<>>))/binary,Char/utf16>>),
+  Unaligned = id(<<3:2,Char/utf16>>),
+  <<_:2,Bin/binary>> = Unaligned,
+  <<Char/utf16>> = Bin,
+  <<Char/utf16>> = make_unaligned(Bin),
+  ok.
+
+utf16_little_roundtrip(Char) ->
+  Bin = id(<<Char/little-utf16>>),
+  Bin = id(<<(id(<<>>))/binary,Char/little-utf16>>),
+  Unaligned = id(<<3:2,Char/little-utf16>>),
+  <<_:2,Bin/binary>> = Unaligned,
+  <<Char/little-utf16>> = Bin,
+  <<Char/little-utf16>> = make_unaligned(Bin),
+  ok.
+
+%%-------------------------------------------------------------------
+
+utf32_roundtrip() ->
+  Big = fun utf32_big_roundtrip/1,
+  Little = fun utf32_little_roundtrip/1,
+  PidRefs = [spawn_monitor(fun() -> do_utf32_roundtrip(Fun) end) ||
+	      Fun <- [Big,Little]],
+  [receive {'DOWN', Ref, process, Pid, Reason} -> normal=Reason end ||
+    {Pid, Ref} <- PidRefs],
+  ok.
+
+do_utf32_roundtrip(Fun) ->
+  do_utf32_roundtrip(0, 16#D7FF, Fun),
+  do_utf32_roundtrip(16#E000, 16#10FFFF, Fun).
+
+do_utf32_roundtrip(First, Last, Fun) when First =< Last ->
+  Fun(First),
+  do_utf32_roundtrip(First+1, Last, Fun);
+do_utf32_roundtrip(_, _, _) -> ok.
+
+utf32_big_roundtrip(Char) ->
+  Bin = id(<<Char/utf32>>),
+  Bin = id(<<(id(<<>>))/binary,Char/utf32>>),
+  Unaligned = id(<<3:2,Char/utf32>>),
+  <<_:2,Bin/binary>> = Unaligned,
+  <<Char/utf32>> = Bin,
+  <<Char/utf32>> = make_unaligned(Bin),
+  ok.
+
+utf32_little_roundtrip(Char) ->
+  Bin = id(<<Char/little-utf32>>),
+  Bin = id(<<(id(<<>>))/binary,Char/little-utf32>>),
+  Unaligned = id(<<3:2,Char/little-utf32>>),
+  <<_:2,Bin/binary>> = Unaligned,
+  <<Char/little-utf32>> = Bin,
+  <<Char/little-utf32>> = make_unaligned(Bin),
+  ok.
+
+%%-------------------------------------------------------------------
+
+utf8_illegal_sequences() ->
+  fail_range(16#10FFFF+1, 16#10FFFF+512), % Too large.
+  fail_range(16#D800, 16#DFFF),	    % Reserved for UTF-16.
+
+  %% Illegal first character.
+  [fail(<<I,16#8F,16#8F,16#8F>>) || I <- lists:seq(16#80, 16#BF)],
+
+  %% Short sequences.
+  short_sequences(16#80, 16#10FFFF),
+
+  %% Overlong sequences. (Using more bytes than necessary
+  %% is not allowed.)
+  overlong(0, 127, 2),
+  overlong(128, 16#7FF, 3),
+  overlong(16#800, 16#FFFF, 4),
+  ok.
+
+fail_range(Char, End) when Char =< End ->
+  {'EXIT', _} = (catch <<Char/utf8>>),
+  Bin = int_to_utf8(Char),
+  fail(Bin),
+  fail_range(Char+1, End);
+fail_range(_, _) -> ok.
+
+short_sequences(Char, End) ->
+  Step = (End - Char) div erlang:system_info(schedulers) + 1,
+  PidRefs = short_sequences_1(Char, Step, End),
+  [receive {'DOWN', Ref, process, Pid, Reason} -> normal=Reason end ||
+    {Pid, Ref} <- PidRefs],
+  ok.
+
+short_sequences_1(Char, Step, End) when Char =< End ->
+  CharEnd = lists:min([Char+Step-1,End]),
+  [spawn_monitor(fun() ->
+		     %% io:format("~p - ~p\n", [Char, CharEnd]),
+		     do_short_sequences(Char, CharEnd)
+		 end)|short_sequences_1(Char+Step, Step, End)];
+short_sequences_1(_, _, _) -> [].
+
+do_short_sequences(Char, End) when Char =< End ->
+  short_sequence(Char),
+  do_short_sequences(Char+1, End);
+do_short_sequences(_, _) -> ok.
+
+short_sequence(I) ->
+  case int_to_utf8(I) of
+    <<S0:3/binary,_:8>> ->
+      <<S1:2/binary,R1:8>> = S0,
+      <<S2:1/binary,_:8>> = S1,
+      fail(S0),
+      fail(S1),
+      fail(S2),
+      fail(<<S2/binary,16#7F,R1,R1>>),
+      fail(<<S1/binary,16#7F,R1>>),
+      fail(<<S0/binary,16#7F>>);
+    <<S0:2/binary,_:8>> ->
+      <<S1:1/binary,R1:8>> = S0,
+      fail(S0),
+      fail(S1),
+      fail(<<S0/binary,16#7F>>),
+      fail(<<S1/binary,16#7F>>),
+      fail(<<S1/binary,16#7F,R1>>);
+    <<S:1/binary,_:8>> ->
+      fail(S),
+      fail(<<S/binary,16#7F>>)
+  end.
+
+overlong(Char, Last, NumBytes) when Char =< Last ->
+  overlong(Char, NumBytes),
+  overlong(Char+1, Last, NumBytes);
+overlong(_, _, _) -> ok.
+
+overlong(Char, NumBytes) when NumBytes < 5 ->
+  case int_to_utf8(Char, NumBytes) of
+    <<Char/utf8>>=Bin ->
+      ?t:fail({illegal_encoding_accepted,Bin,Char});
+    <<OtherChar/utf8>>=Bin ->
+      ?t:fail({illegal_encoding_accepted,Bin,Char,OtherChar});
+    _ -> ok
+  end,
+  overlong(Char, NumBytes+1);
+overlong(_, _) -> ok.
+
+fail(Bin) ->
+  fail_1(Bin),
+  fail_1(make_unaligned(Bin)).
+
+fail_1(<<Char/utf8>> = Bin) ->
+  ?t:fail({illegal_encoding_accepted, Bin, Char});
+fail_1(_) -> ok.
+
+%%-------------------------------------------------------------------
+
+utf16_illegal_sequences() ->
+  utf16_fail_range(16#10FFFF+1, 16#10FFFF+512), % Too large.
+  utf16_fail_range(16#D800, 16#DFFF),		% Reserved for UTF-16.
+  lonely_hi_surrogate(16#D800, 16#DFFF),
+  leading_lo_surrogate(16#DC00, 16#DFFF),
+  ok.
+
+utf16_fail_range(Char, End) when Char =< End ->
+  {'EXIT', _} = (catch <<Char/big-utf16>>),
+  {'EXIT', _} = (catch <<Char/little-utf16>>),
+  utf16_fail_range(Char+1, End);
+utf16_fail_range(_, _) -> ok.
+
+lonely_hi_surrogate(Char, End) when Char =< End ->
+  BinBig = <<Char:16/big>>,
+  BinLittle = <<Char:16/little>>,
+  case {BinBig,BinLittle} of
+    {<<Bad/big-utf16>>,_} ->
+      ?t:fail({lonely_hi_surrogate_accepted,Bad});
+    {_,<<Bad/little-utf16>>} ->
+      ?t:fail({lonely_hi_surrogate_accepted,Bad});
+    {_,_} ->
+      ok
+  end,
+  lonely_hi_surrogate(Char+1, End);
+lonely_hi_surrogate(_, _) -> ok.
+
+leading_lo_surrogate(Char, End) when Char =< End ->
+  leading_lo_surrogate(Char, 16#D800, 16#DFFF),
+  leading_lo_surrogate(Char+1, End);
+leading_lo_surrogate(_, _) -> ok.
+
+leading_lo_surrogate(HiSurr, LoSurr, End) when LoSurr =< End ->
+  BinBig = <<HiSurr:16/big,LoSurr:16/big>>,
+  BinLittle = <<HiSurr:16/little,LoSurr:16/little>>,
+  case {BinBig,BinLittle} of
+    {<<Bad/big-utf16,_/bits>>,_} ->
+      ?t:fail({leading_lo_surrogate_accepted,Bad});
+    {_,<<Bad/little-utf16,_/bits>>} ->
+      ?t:fail({leading_lo_surrogate_accepted,Bad});
+    {_,_} ->
+      ok
+  end,
+  leading_lo_surrogate(HiSurr, LoSurr+1, End);
+leading_lo_surrogate(_, _, _) -> ok.
+
+%%-------------------------------------------------------------------
+
+utf32_illegal_sequences() ->
+  utf32_fail_range(16#10FFFF+1, 16#10FFFF+512), % Too large.
+  utf32_fail_range(16#D800, 16#DFFF),		% Reserved for UTF-16.
+  utf32_fail_range(-100, -1),
+  ok.
+
+utf32_fail_range(Char, End) when Char =< End ->
+  {'EXIT', _} = (catch <<Char/big-utf32>>),
+  {'EXIT', _} = (catch <<Char/little-utf32>>),
+  case {<<Char:32>>,<<Char:32/little>>} of
+    {<<Unexpected/utf32>>,_} ->
+      ?t:fail(Unexpected);
+    {_,<<Unexpected/little-utf32>>} ->
+      ?t:fail(Unexpected);
+    {_,_} -> ok
+  end,
+  utf32_fail_range(Char+1, End);
+utf32_fail_range(_, _) -> ok.
+
+%%-------------------------------------------------------------------
+%% This function intentionally allows construction of UTF-8 sequence
+%% in illegal ranges.
+
+int_to_utf8(I) when I =< 16#7F ->
+  <<I>>;
+int_to_utf8(I) when I =< 16#7FF ->
+  B2 = I,
+  B1 = (I bsr 6),
+  <<1:1,1:1,0:1,B1:5,1:1,0:1,B2:6>>;
+int_to_utf8(I) when I =< 16#FFFF ->
+  B3 = I,
+  B2 = (I bsr 6),
+  B1 = (I bsr 12),
+  <<1:1,1:1,1:1,0:1,B1:4,1:1,0:1,B2:6,1:1,0:1,B3:6>>;
+int_to_utf8(I) when I =< 16#3FFFFF ->
+  B4 = I,
+  B3 = (I bsr 6),
+  B2 = (I bsr 12),
+  B1 = (I bsr 18),
+  <<1:1,1:1,1:1,1:1,0:1,B1:3,1:1,0:1,B2:6,1:1,0:1,B3:6,1:1,0:1,B4:6>>;
+int_to_utf8(I) when I =< 16#3FFFFFF ->
+  B5 = I,
+  B4 = (I bsr 6),
+  B3 = (I bsr 12),
+  B2 = (I bsr 18),
+  B1 = (I bsr 24),
+  <<1:1,1:1,1:1,1:1,1:1,0:1,B1:2,1:1,0:1,B2:6,1:1,0:1,B3:6,1:1,0:1,B4:6,
+    1:1,0:1,B5:6>>.
+
+%% int_to_utf8(I, NumberOfBytes) -> Binary.
+%%  This function can be used to construct overlong sequences.
+int_to_utf8(I, 1) ->
+  <<I>>;
+int_to_utf8(I, 2) ->
+  B2 = I,
+  B1 = (I bsr 6),
+  <<1:1,1:1,0:1,B1:5,1:1,0:1,B2:6>>;
+int_to_utf8(I, 3) ->
+  B3 = I,
+  B2 = (I bsr 6),
+  B1 = (I bsr 12),
+  <<1:1,1:1,1:1,0:1,B1:4,1:1,0:1,B2:6,1:1,0:1,B3:6>>;
+int_to_utf8(I, 4) ->
+  B4 = I,
+  B3 = (I bsr 6),
+  B2 = (I bsr 12),
+  B1 = (I bsr 18),
+  <<1:1,1:1,1:1,1:1,0:1,B1:3,1:1,0:1,B2:6,1:1,0:1,B3:6,1:1,0:1,B4:6>>.
+
+%%-------------------------------------------------------------------
+
+make_unaligned(Bin0) when is_binary(Bin0) ->
+  Bin1 = <<0:3,Bin0/binary,31:5>>,
+  Sz = byte_size(Bin0),
+  <<0:3,Bin:Sz/binary,31:5>> = id(Bin1),
+  Bin.
+
+%%-------------------------------------------------------------------
+%% Just to prevent compiler optimizations
+
+id(X) -> X.
diff --git a/lib/hipe/test/hipe_testsuite_driver.erl b/lib/hipe/test/hipe_testsuite_driver.erl
index 5f05a716bc..9f5d7421b4 100644
--- a/lib/hipe/test/hipe_testsuite_driver.erl
+++ b/lib/hipe/test/hipe_testsuite_driver.erl
@@ -176,7 +176,8 @@ run(TestCase, Dir, _OutDir) ->
     HiPEOpts = try TestCase:hipe_options() catch error:undef -> [] end,
     {ok, TestCase} = hipe:c(TestCase, HiPEOpts),
     ok = TestCase:test(),
-    case is_llvm_opt_available() of
+    ToLLVM = try TestCase:to_llvm() catch error:undef -> true end,
+    case ToLLVM andalso hipe:llvm_support_available() of
 	true ->
 	    {ok, TestCase} = hipe:c(TestCase, [to_llvm|HiPEOpts]),
 	    ok = TestCase:test();
@@ -186,16 +187,3 @@ run(TestCase, Dir, _OutDir) ->
     %% 	lists:foreach(fun (DF) -> ok end, % = file:delete(DF) end,
     %% 		      [filename:join(OutDir, D) || D <- DataFiles])
     %% end.
-
-
-%% This function, which is supposed to check whether the right LLVM
-%% infrastructure is available, should be probably written in a better
-%% and more portable way and moved to the hipe application.
-
-is_llvm_opt_available() ->
-    OptStr = os:cmd("opt -version"),
-    SubStr = "LLVM version ", N = length(SubStr),
-    case string:str(OptStr, SubStr) of
-	0 -> false;
-	S -> P = S + N, string:sub_string(OptStr, P, P + 2) >= "3.4"
-    end.
diff --git a/lib/hipe/test/sanity_SUITE_data/sanity_comp_timeout.erl b/lib/hipe/test/sanity_SUITE_data/sanity_comp_timeout.erl
new file mode 100644
index 0000000000..9f0830574f
--- /dev/null
+++ b/lib/hipe/test/sanity_SUITE_data/sanity_comp_timeout.erl
@@ -0,0 +1,28 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%----------------------------------------------------------------------
+%%% Author: Kostis Sagonas
+%%%
+%%% Tests that when the native code compilation times out or gets killed
+%%% for some other reason, the parent process does not also get killed.
+%%%
+%%% Problem discovered by Bjorn G. on 1/12/2003 and fixed by Kostis.
+%%%----------------------------------------------------------------------
+
+-module(sanity_comp_timeout).
+
+-export([test/0, to_llvm/0]).
+
+test() ->
+  ok = write_dummy_mod(),
+  error_logger:tty(false), % disable printouts of error reports
+  Self = self(),           % get the parent process
+  c:c(dummy_mod, [native, {hipe, [{timeout, 1}]}]), % This will kill the process
+  Self = self(),           % make sure the parent process stays the same
+  ok.
+
+to_llvm() -> false.
+
+write_dummy_mod() ->
+  Prog = <<"-module(dummy_mod).\n-export([test/0]).\ntest() -> ok.\n">>,
+  ok = file:write_file("dummy_mod.erl", Prog).
+
diff --git a/lib/hipe/test/sanity_SUITE_data/sanity_no_zombies.erl b/lib/hipe/test/sanity_SUITE_data/sanity_no_zombies.erl
new file mode 100644
index 0000000000..87e746042e
--- /dev/null
+++ b/lib/hipe/test/sanity_SUITE_data/sanity_no_zombies.erl
@@ -0,0 +1,21 @@
+%%% -*- erlang-indent-level: 2 -*-
+%%%----------------------------------------------------------------------
+%%% Author: Per Gustafsson
+%%%
+%%% Checks that HiPE's concurrent compilation does not leave any zombie
+%%% processes around after compilation has finished.
+%%%
+%%% This was a bug reported on erlang-bugs (Oct 25, 2007).
+%%%----------------------------------------------------------------------
+
+-module(sanity_no_zombies).
+
+-export([test/0, to_llvm/0]).
+
+test() ->
+  L = length(processes()),
+  hipe:c(?MODULE, [concurrent_comp]),   % force concurrent compilation
+  L = length(processes()),
+  ok.
+
+to_llvm() -> false.
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index 123792e708..2edfd790ed 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.14
+HIPE_VSN = 3.15
diff --git a/lib/ic/test/Makefile b/lib/ic/test/Makefile
index 576ffc4eff..93cbaf4dfe 100644
--- a/lib/ic/test/Makefile
+++ b/lib/ic/test/Makefile
@@ -209,10 +209,8 @@ ERL_LOCAL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin -pa $(ERL_TOP)/lib/ic/ebin
 
 ERL_COMPILE_FLAGS += \
 	$(ERL_LOCAL_FLAGS) \
-	-pa $(ERL_TOP)/lib/test_server/ebin \
 	-pa $(ERL_TOP)/lib/orber/ebin \
-	-I$(ERL_TOP)/lib/orber \
-	-I$(ERL_TOP)/lib/test_server/include
+	-I$(ERL_TOP)/lib/orber
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/ic/test/ic_SUITE.erl b/lib/ic/test/ic_SUITE.erl
index bca75b8349..c9fbf49a55 100644
--- a/lib/ic/test/ic_SUITE.erl
+++ b/lib/ic/test/ic_SUITE.erl
@@ -23,7 +23,7 @@
 %%%----------------------------------------------------------------------
 
 -module(ic_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
diff --git a/lib/ic/test/ic_be_SUITE.erl b/lib/ic/test/ic_be_SUITE.erl
index 42c30fc86e..49dd9953cb 100644
--- a/lib/ic/test/ic_be_SUITE.erl
+++ b/lib/ic/test/ic_be_SUITE.erl
@@ -23,7 +23,7 @@
 %%%----------------------------------------------------------------------
 
 -module(ic_be_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
diff --git a/lib/ic/test/ic_pp_SUITE.erl b/lib/ic/test/ic_pp_SUITE.erl
index ab22d532a1..e85ce788e3 100644
--- a/lib/ic/test/ic_pp_SUITE.erl
+++ b/lib/ic/test/ic_pp_SUITE.erl
@@ -23,7 +23,7 @@
 %%----------------------------------------------------------------------
 
 -module(ic_pp_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 
 
diff --git a/lib/ic/test/ic_pragma_SUITE.erl b/lib/ic/test/ic_pragma_SUITE.erl
index e0ab43e178..c6e23a1f8c 100644
--- a/lib/ic/test/ic_pragma_SUITE.erl
+++ b/lib/ic/test/ic_pragma_SUITE.erl
@@ -28,7 +28,7 @@
 %%-----------------------------------------------------------------
 -module(ic_pragma_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 %%-----------------------------------------------------------------
 %% External exports
diff --git a/lib/ic/test/ic_register_SUITE.erl b/lib/ic/test/ic_register_SUITE.erl
index e402692940..86d89e72d5 100644
--- a/lib/ic/test/ic_register_SUITE.erl
+++ b/lib/ic/test/ic_register_SUITE.erl
@@ -27,7 +27,7 @@
 %%-----------------------------------------------------------------
 -module(ic_register_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 %%-----------------------------------------------------------------
 %% External exports
diff --git a/lib/ic/test/java_client_erl_server_SUITE.erl b/lib/ic/test/java_client_erl_server_SUITE.erl
index e95b3d5026..a670c5546e 100644
--- a/lib/ic/test/java_client_erl_server_SUITE.erl
+++ b/lib/ic/test/java_client_erl_server_SUITE.erl
@@ -23,7 +23,7 @@
 %%%----------------------------------------------------------------------
 
 -module(java_client_erl_server_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index c98ec1a9dc..2ff8554afd 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,75 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 6.1</title>
+  <section><title>Inets 6.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Mend ipv6_host_with_brackets option in httpc</p>
+          <p>
+	    Own Id: OTP-13417</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 6.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The TFTP client/server has been fixed to allow file sizes
+	    larger than 32MB block by allowing the 16 bit block
+	    counter to wrap. Since this is a commonly accepted
+	    behavior we regard it as a bug fix.</p>
+          <p>
+	    Own Id: OTP-13403</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Handle HTTP PATCH method in client.</p>
+          <p>
+	    Own Id: OTP-13286</p>
+        </item>
+        <item>
+          <p>
+	    Expected termination should not be logged as an
+	    application error.</p>
+          <p>
+	    Own Id: OTP-13389</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 6.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    mod_alias now traverses all aliases picking the longest
+	    match and not the first match.</p>
+          <p>
+	    Own Id: OTP-13248</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 6.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/inets/examples/server_root/conf/8080.conf b/lib/inets/examples/server_root/conf/8080.conf
index 48e66f0114..7b1b4a15b2 100644
--- a/lib/inets/examples/server_root/conf/8080.conf
+++ b/lib/inets/examples/server_root/conf/8080.conf
@@ -1,7 +1,7 @@
 Port 8080
 #ServerName your.server.net
 SocketType ip_comm
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_include mod_dir mod_get mod_head mod_log mod_disk_log
+Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
 ServerAdmin [email protected]
 ServerRoot /var/tmp/server_root
 ErrorLog logs/error_log_8080
diff --git a/lib/inets/examples/server_root/conf/8888.conf b/lib/inets/examples/server_root/conf/8888.conf
index 79bb7fcca4..042779fcd0 100644
--- a/lib/inets/examples/server_root/conf/8888.conf
+++ b/lib/inets/examples/server_root/conf/8888.conf
@@ -1,7 +1,7 @@
 Port 8888
 #ServerName your.server.net
 SocketType ip_comm
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_include mod_dir mod_get mod_head mod_log mod_disk_log
+Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
 ServerAdmin [email protected]
 ServerRoot /var/tmp/server_root
 ErrorLog logs/error_log_8888
diff --git a/lib/inets/examples/server_root/conf/httpd.conf b/lib/inets/examples/server_root/conf/httpd.conf
index f99563d14b..98920ebaa5 100644
--- a/lib/inets/examples/server_root/conf/httpd.conf
+++ b/lib/inets/examples/server_root/conf/httpd.conf
@@ -64,7 +64,7 @@ SocketType ip_comm
 # WARNING! Do not tamper with this directive unless you are familiar with
 # EWSAPI.
 
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_responsecontrol mod_trace mod_range mod_head mod_include mod_dir mod_get mod_log mod_disk_log
+Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_responsecontrol mod_trace mod_range mod_head mod_dir mod_get mod_log mod_disk_log
 
 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.
diff --git a/lib/inets/examples/server_root/conf/ssl.conf b/lib/inets/examples/server_root/conf/ssl.conf
index 8b8c57a98b..de49ceafd0 100644
--- a/lib/inets/examples/server_root/conf/ssl.conf
+++ b/lib/inets/examples/server_root/conf/ssl.conf
@@ -1,7 +1,7 @@
 Port 8088
 #ServerName your.server.net
 SocketType ssl
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_include mod_dir mod_get mod_head mod_log mod_disk_log
+Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
 ServerAdmin [email protected]
 ServerRoot /var/tmp/server_root
 ErrorLog logs/error_log_8088
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index e4a6f8f748..4554881d79 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -101,7 +101,8 @@ request(Url, Profile) ->
 %%           {ok, {StatusLine, Headers, Body}} | {ok, {Status, Body}} |
 %%           {ok, RequestId} | {error,Reason} | {ok, {saved_as, FilePath}
 %%
-%%	Method - atom() = head | get | put | post | trace | options| delete 
+%%	Method - atom() = head | get | put | patch | post | trace |
+%%	                  options | delete 
 %%	Request - {Url, Headers} | {Url, Headers, ContentType, Body} 
 %%	Url - string() 
 %%	HTTPOptions - [HttpOption]
@@ -176,8 +177,8 @@ request(Method,
 request(Method, 
 	{Url, Headers, ContentType, Body}, 
 	HTTPOptions, Options, Profile) 
-  when ((Method =:= post) orelse (Method =:= put) orelse (Method =:= delete)) andalso 
-       (is_atom(Profile) orelse is_pid(Profile)) ->
+  when ((Method =:= post) orelse (Method =:= patch) orelse (Method =:= put) orelse
+	(Method =:= delete)) andalso (is_atom(Profile) orelse is_pid(Profile)) ->
     ?hcrt("request", [{method,       Method}, 
 		      {url,          Url},
 		      {headers,      Headers}, 
@@ -555,7 +556,7 @@ handle_request(Method, Url,
 
 	    Request = #request{from          = Receiver,
 			       scheme        = Scheme, 
-			       address       = {Host, Port},
+			       address       = {host_address(Host, BracketedHost), Port},
 			       path          = MaybeEscPath,
 			       pquery        = MaybeEscQuery,
 			       method        = Method,
@@ -1267,3 +1268,7 @@ child_name(Pid, [_ | Children]) ->
 %% d(_, _, _) ->
 %%     ok.
 
+host_address(Host, false) ->
+    Host;
+host_address(Host, true) ->
+    string:strip(string:strip(Host, right, $]), left, $[).
diff --git a/lib/inets/src/http_client/httpc_request.erl b/lib/inets/src/http_client/httpc_request.erl
index e4451401f4..8fcfbc30c0 100644
--- a/lib/inets/src/http_client/httpc_request.erl
+++ b/lib/inets/src/http_client/httpc_request.erl
@@ -186,15 +186,19 @@ is_client_closing(Headers) ->
 %%%========================================================================
 %%% Internal functions
 %%%========================================================================
-post_data(Method, Headers, {ContentType, Body}, HeadersAsIs) 
-  when (Method =:= post) orelse (Method =:= put) ->
+post_data(Method, Headers, {ContentType, Body}, HeadersAsIs)
+    when (Method =:= post)
+    orelse (Method =:= put)
+    orelse (Method =:= patch)
+    orelse (Method =:= delete) ->
+
     NewBody = case Headers#http_request_h.expect of
-		  "100-continue" ->
-		      "";
-		  _ ->
-		      Body
-	      end,
-    
+          "100-continue" ->
+              "";
+          _ ->
+              Body
+          end,
+
     NewHeaders = case HeadersAsIs of
         [] ->
             Headers#http_request_h{
@@ -212,7 +216,7 @@ post_data(Method, Headers, {ContentType, Body}, HeadersAsIs)
         _ ->
             HeadersAsIs
     end,
-    
+
     {NewHeaders, NewBody};
 
 post_data(_, Headers, _, []) ->
diff --git a/lib/inets/src/http_lib/http_uri.erl b/lib/inets/src/http_lib/http_uri.erl
index 6fe8c1776d..9940136f5a 100644
--- a/lib/inets/src/http_lib/http_uri.erl
+++ b/lib/inets/src/http_lib/http_uri.erl
@@ -196,10 +196,10 @@ parse_host_port(_Scheme, DefaultPort, HostPort, _Opts) ->
     {Host, int_port(Port)}.
 
 split_uri(UriPart, SplitChar, NoMatchResult, SkipLeft, SkipRight) ->
-    case inets_regexp:first_match(UriPart, SplitChar) of
-	{match, Match, _} ->
-	    {string:substr(UriPart, 1, Match - SkipLeft),
-	     string:substr(UriPart, Match + SkipRight, length(UriPart))};
+    case re:run(UriPart, SplitChar, [{capture, first}]) of
+	{match, [{Match, _}]} ->
+	    {string:substr(UriPart, 1, Match + 1 - SkipLeft),
+	     string:substr(UriPart, Match + 1 + SkipRight, length(UriPart))};
 	nomatch ->
 	    NoMatchResult
     end.
diff --git a/lib/inets/src/http_server/httpd.erl b/lib/inets/src/http_server/httpd.erl
index cf02c0e072..e6377b4882 100644
--- a/lib/inets/src/http_server/httpd.erl
+++ b/lib/inets/src/http_server/httpd.erl
@@ -43,7 +43,7 @@
 %%%========================================================================
 
 parse_query(String) ->
-  {ok, SplitString} = inets_regexp:split(String,"[&;]"),
+  SplitString = re:split(String,"[&;]", [{return, list}]),
   foreach(SplitString).
 
 reload_config(Config = [Value| _], Mode) when is_tuple(Value) ->
@@ -239,14 +239,14 @@ unblock(Addr, Port, Profile) when is_integer(Port) ->
 foreach([]) ->
   [];
 foreach([KeyValue|Rest]) ->
-  {ok, Plus2Space, _} = inets_regexp:gsub(KeyValue,"[\+]"," "),
-  case inets_regexp:split(Plus2Space,"=") of
-    {ok,[Key|Value]} ->
-      [{http_uri:decode(Key),
-	http_uri:decode(lists:flatten(Value))}|foreach(Rest)];
-    {ok,_} ->
-      foreach(Rest)
-  end.
+    Plus2Space = re:replace(KeyValue,"[\+]"," ", [{return,list}, global]),
+    case re:split(Plus2Space,"=", [{return, list}]) of
+	[Key|Value] ->
+	    [{http_uri:decode(Key),
+	      http_uri:decode(lists:flatten(Value))}|foreach(Rest)];
+	_ ->
+	    foreach(Rest)
+    end.
 
 
 make_name(Addr, Port, Profile) ->
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index 62e8a95b19..a7783bc1e9 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -232,7 +232,7 @@ load("KeepAliveTimeout " ++ Timeout, []) ->
     end;
 
 load("Modules " ++ Modules, []) ->
-    {ok, ModuleList} = inets_regexp:split(Modules," "),
+    ModuleList = re:split(Modules," ", [{return, list}]),
     {ok, [], {modules,[list_to_atom(X) || X <- ModuleList]}};
 
 load("ServerAdmin " ++ ServerAdmin, []) ->
@@ -879,7 +879,7 @@ bootstrap([]) ->
 bootstrap([Line|Config]) ->
     case Line of
 	"Modules " ++ Modules ->
-	    {ok, ModuleList} = inets_regexp:split(Modules," "),
+	    ModuleList = re:split(Modules," ", [{return, list}]),
 	    TheMods = [list_to_atom(X) || X <- ModuleList],
 	    case verify_modules(TheMods) of
 		ok ->
@@ -1004,7 +1004,7 @@ read_config_file(Stream, SoFar) ->
 	    %% Ignore commented lines for efficiency later ..
 	    read_config_file(Stream, SoFar);
 	Line ->
-	    {ok, NewLine, _}=inets_regexp:sub(clean(Line),"[\t\r\f ]"," "),
+	    NewLine = re:replace(clean(Line),"[\t\r\f ]"," ", [{return,list}]),
 	    case NewLine of
 		[] ->
 		    %% Also ignore empty lines ..
@@ -1031,12 +1031,12 @@ parse_mime_types(Stream, MimeTypesList, "") ->
 parse_mime_types(Stream, MimeTypesList, [$#|_]) ->
     parse_mime_types(Stream, MimeTypesList);
 parse_mime_types(Stream, MimeTypesList, Line) ->
-    case inets_regexp:split(Line, " ") of
-	{ok, [NewMimeType|Suffixes]} ->
+    case re:split(Line, " ", [{return, list}]) of
+	[NewMimeType|Suffixes] ->
 	    parse_mime_types(Stream,
 			     lists:append(suffixes(NewMimeType,Suffixes),
 					  MimeTypesList));
-	{ok, _} ->
+	_ ->
 	    {error, ?NICE(Line)}
     end.
 
@@ -1207,9 +1207,8 @@ error_report(Where,M,F,Error) ->
     error_logger:error_report([{?MODULE, Where}, 
 			       {apply, {M, F, []}}, Error]).
 white_space_clean(String) ->
-    {ok,CleanedString,_} = 
-	inets_regexp:gsub(String, "^[ \t\n\r\f]*|[ \t\n\r\f]*\$",""),
-    CleanedString.
+    re:replace(String, "^[ \t\n\r\f]*|[ \t\n\r\f]*\$","", 
+	       [{return,list}, global]).
 
 
 %%%=========================================================================
@@ -1246,22 +1245,23 @@ is_file(_Type,_Access,FileInfo,_File) ->
     {error,FileInfo}.
 
 make_integer(String) ->
-    case inets_regexp:match(string:strip(String),"[0-9]+") of
-	{match, _, _} ->
+    case re:run(string:strip(String),"[0-9]+", [{capture, none}]) of
+	match ->
 	    {ok, list_to_integer(string:strip(String))};
 	nomatch ->
 	    {error, nomatch}
     end.
 
 clean(String) ->
-    {ok,CleanedString,_} = 
-	inets_regexp:gsub(String, "^[ \t\n\r\f]*|[ \t\n\r\f]*\$",""),
-    CleanedString.
+    re:replace(String, "^[ \t\n\r\f]*|[ \t\n\r\f]*\$","",
+	       [{return,list}, global]).
 
 custom_clean(String,MoreBefore,MoreAfter) ->
-    {ok,CleanedString,_} = inets_regexp:gsub(String,"^[ \t\n\r\f"++MoreBefore++
-				       "]*|[ \t\n\r\f"++MoreAfter++"]*\$",""),
-    CleanedString.
+    re:replace(String,
+	       "^[ \t\n\r\f"++MoreBefore++
+		   "]*|[ \t\n\r\f"++MoreAfter++"]*\$","",
+	       [{return,list}, global]).
+
 
 check_enum(_Enum,[]) ->
     {error, not_valid};
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl
index abcc0ce898..749f58c197 100644
--- a/lib/inets/src/http_server/httpd_request.erl
+++ b/lib/inets/src/http_server/httpd_request.erl
@@ -86,7 +86,8 @@ body_data(Headers, Body) ->
 %%-------------------------------------------------------------------------
 %% validate(Method, Uri, Version) -> ok | {error, {bad_request, Reason} |
 %%			     {error, {not_supported, {Method, Uri, Version}}
-%%      Method = "HEAD" | "GET" | "POST" | "TRACE" | "PUT" | "DELETE"
+%%      Method = "HEAD" | "GET" | "POST" | "PATCH" | "TRACE" | "PUT"
+%%               | "DELETE"
 %%      Uri = uri()
 %%      Version = "HTTP/N.M"      
 %% Description: Checks that HTTP-request-line is valid.
@@ -105,6 +106,8 @@ validate("DELETE", Uri, "HTTP/1." ++ _N) ->
     validate_uri(Uri);
 validate("POST", Uri, "HTTP/1." ++ _N) ->
     validate_uri(Uri);
+validate("PATCH", Uri, "HTTP/1." ++ _N) ->
+    validate_uri(Uri);
 validate("TRACE", Uri, "HTTP/1." ++ N) when hd(N) >= $1 ->
     validate_uri(Uri);
 validate(Method, Uri, Version) ->
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl
index 134576059d..8fae9ac46e 100644
--- a/lib/inets/src/http_server/httpd_request_handler.erl
+++ b/lib/inets/src/http_server/httpd_request_handler.erl
@@ -102,8 +102,8 @@ init([Manager, ConfigDB, AcceptTimeout]) ->
     KeepAliveTimeOut = 1000 * httpd_util:lookup(ConfigDB, keep_alive_timeout, 150),
     
     case http_transport:negotiate(SocketType, Socket, ?HANDSHAKE_TIMEOUT) of
-	{error, _Error} ->
-	    exit(shutdown); %% Can be 'normal'.
+	{error, Error} ->
+	    exit({shutdown, Error}); %% Can be 'normal'.
 	ok ->
 	    continue_init(Manager, ConfigDB, SocketType, Socket, KeepAliveTimeOut)
     end.
@@ -294,7 +294,10 @@ handle_info(Info, #state{mod = ModData} = State) ->
 %% cleaning up. When it returns, the gen_server terminates with Reason.
 %% The return value is ignored.
 %%--------------------------------------------------------------------
-terminate(normal, State) ->
+terminate(Reason, State) when Reason == normal;
+			      Reason == shutdown ->
+    do_terminate(State);
+terminate({shutdown,_}, State) ->
     do_terminate(State);
 terminate(Reason, #state{response_sent = false, mod = ModData} = State) ->
     httpd_response:send_status(ModData, 500, none),
diff --git a/lib/inets/src/http_server/httpd_script_env.erl b/lib/inets/src/http_server/httpd_script_env.erl
index 21b22f4420..232bf96bd4 100644
--- a/lib/inets/src/http_server/httpd_script_env.erl
+++ b/lib/inets/src/http_server/httpd_script_env.erl
@@ -104,7 +104,7 @@ create_http_header_elements(ScriptType, [{Name, [Value | _] = Values } |
 
 create_http_header_elements(ScriptType, [{Name, Value} | Headers], Acc) 
   when is_list(Value) ->
-    {ok, NewName, _} = inets_regexp:gsub(Name,"-","_"),
+    NewName = re:replace(Name,"-","_", [{return,list}, global]),
     Element = http_env_element(ScriptType, NewName, Value),
     create_http_header_elements(ScriptType, Headers, [Element | Acc]).
 
diff --git a/lib/inets/src/http_server/httpd_util.erl b/lib/inets/src/http_server/httpd_util.erl
index ab43f0b378..6dd6db6a0c 100644
--- a/lib/inets/src/http_server/httpd_util.erl
+++ b/lib/inets/src/http_server/httpd_util.erl
@@ -420,11 +420,11 @@ flatlength([],L) ->
 %% split_path
 
 split_path(Path) ->
-    case inets_regexp:match(Path,"[\?].*\$") of
+    case re:run(Path,"[\?].*\$", [{capture, first}]) of
 	%% A QUERY_STRING exists!
-	{match,Start,Length} ->
-	    {http_uri:decode(string:substr(Path,1,Start-1)),
-	     string:substr(Path,Start,Length)};
+	{match,[{Start,Length}]} ->
+	    {http_uri:decode(string:substr(Path,1,Start)),
+	     string:substr(Path,Start+1,Length)};
 	%% A possible PATH_INFO exists!
 	nomatch ->
 	    split_path(Path,[])
@@ -522,25 +522,8 @@ remove_ws(Rest) ->
 
 %% split
 
-split(String,RegExp,Limit) ->
-    case inets_regexp:parse(RegExp) of
-	{error,Reason} ->
-	    {error,Reason};
-	{ok,_} ->
-	    {ok,do_split(String,RegExp,Limit)}
-    end.
-
-do_split(String, _RegExp, 1) ->
-    [String];
-
-do_split(String,RegExp,Limit) ->
-    case inets_regexp:first_match(String,RegExp) of 
-	{match,Start,Length} ->
-	    [string:substr(String,1,Start-1)|
-	     do_split(lists:nthtail(Start+Length-1,String),RegExp,Limit-1)];
-	nomatch ->
-	    [String]
-    end.
+split(String,RegExp,N) ->
+    {ok, re:split(String, RegExp, [{parts, N}, {return, list}])}.
 
 %% make_name/2, make_name/3
 %% Prefix  -> string()
diff --git a/lib/inets/src/http_server/mod_actions.erl b/lib/inets/src/http_server/mod_actions.erl
index d879328876..154fde294e 100644
--- a/lib/inets/src/http_server/mod_actions.erl
+++ b/lib/inets/src/http_server/mod_actions.erl
@@ -81,18 +81,18 @@ script(RequestURI, Method, [_ | Rest]) ->
 %% load
 
 load("Action "++  Action, []) ->
-  case inets_regexp:split(Action, " ") of
-    {ok,[MimeType, CGIScript]} ->
-      {ok,[],{action, {MimeType, CGIScript}}};
-    {ok,_} ->
-      {error,?NICE(string:strip(Action)++" is an invalid Action")}
+  case re:split(Action, " ", [{return, list}]) of
+      [MimeType, CGIScript] ->
+	  {ok,[],{action, {MimeType, CGIScript}}};
+      _ ->
+	  {error,?NICE(string:strip(Action)++" is an invalid Action")}
   end;
 load("Script " ++ Script,[]) ->
-  case inets_regexp:split(Script, " ") of
-    {ok,[Method, CGIScript]} ->
-      {ok,[],{script, {Method, CGIScript}}};
-    {ok,_} ->
-      {error,?NICE(string:strip(Script)++" is an invalid Script")}
+  case re:split(Script, " ", [{return, list}]) of
+      [Method, CGIScript] ->
+	  {ok,[],{script, {Method, CGIScript}}};
+      _ ->
+	  {error,?NICE(string:strip(Script)++" is an invalid Script")}
   end.
 
 store({action, {MimeType, CGIScript}} = Conf, _) when is_list(MimeType),
diff --git a/lib/inets/src/http_server/mod_alias.erl b/lib/inets/src/http_server/mod_alias.erl
index 8dd4871821..727f6e0ce3 100644
--- a/lib/inets/src/http_server/mod_alias.erl
+++ b/lib/inets/src/http_server/mod_alias.erl
@@ -113,32 +113,52 @@ real_name(ConfigDB, RequestURI, []) ->
 	httpd_util:split_path(default_index(ConfigDB, RealName)),
     {ShortPath, Path, AfterPath};
 
-real_name(ConfigDB, RequestURI, [{MP,Replacement}|Rest])
+real_name(ConfigDB, RequestURI, [{MP,Replacement}| _] = Aliases)
   when element(1, MP) =:= re_pattern ->
-    case re:run(RequestURI, MP, [{capture,[]}]) of
-	match ->
+    case longest_match(Aliases, RequestURI) of
+	{match, {MP, Replacement}} ->
 	    NewURI = re:replace(RequestURI, MP, Replacement, [{return,list}]),
 	    {ShortPath,_} = httpd_util:split_path(NewURI),
 	    {Path,AfterPath} =
 		httpd_util:split_path(default_index(ConfigDB, NewURI)),
 	    {ShortPath, Path, AfterPath};
 	nomatch ->
-	    real_name(ConfigDB, RequestURI, Rest)
+	    real_name(ConfigDB, RequestURI, [])
     end;
 
-real_name(ConfigDB, RequestURI, [{FakeName,RealName}|Rest]) ->
-     case inets_regexp:match(RequestURI, "^" ++ FakeName) of
-	{match, _, _} ->
-	    {ok, ActualName, _} = inets_regexp:sub(RequestURI,
-					     "^" ++ FakeName, RealName),
+real_name(ConfigDB, RequestURI,  [{_,_}|_] = Aliases) ->
+    case longest_match(Aliases, RequestURI) of
+	{match, {FakeName, RealName}} ->
+	    ActualName = re:replace(RequestURI,
+				    "^" ++ FakeName, RealName, [{return,list}]),
  	    {ShortPath, _AfterPath} = httpd_util:split_path(ActualName),
 	    {Path, AfterPath} =
-	       httpd_util:split_path(default_index(ConfigDB, ActualName)),
+		httpd_util:split_path(default_index(ConfigDB, ActualName)),
 	    {ShortPath, Path, AfterPath};
-	 nomatch ->
-	     real_name(ConfigDB, RequestURI, Rest)
+	nomatch ->
+	    real_name(ConfigDB, RequestURI, [])
     end.
 
+longest_match(Aliases, RequestURI) ->
+    longest_match(Aliases, RequestURI, _LongestNo = 0, _LongestAlias = undefined).
+
+longest_match([{FakeName, RealName} | Rest], RequestURI, LongestNo, LongestAlias) ->
+    case re:run(RequestURI, "^" ++ FakeName, [{capture, first}]) of
+	{match, [{_, Length}]} ->
+	    if
+		Length > LongestNo ->
+		    longest_match(Rest, RequestURI, Length, {FakeName, RealName});
+		true ->
+		    longest_match(Rest, RequestURI, LongestNo, LongestAlias)
+	    end;
+	nomatch ->
+	    longest_match(Rest, RequestURI, LongestNo, LongestAlias)
+    end;
+longest_match([], _RequestURI, 0, _LongestAlias) ->
+    nomatch;
+longest_match([], _RequestURI, _LongestNo, LongestAlias) ->
+    {match, LongestAlias}.
+
 %% real_script_name
 
 real_script_name(_ConfigDB, _RequestURI, []) ->
@@ -146,7 +166,7 @@ real_script_name(_ConfigDB, _RequestURI, []) ->
 
 real_script_name(ConfigDB, RequestURI, [{MP,Replacement} | Rest])
   when element(1, MP) =:= re_pattern ->
-    case re:run(RequestURI, MP, [{capture,[]}]) of
+    case re:run(RequestURI, MP, [{capture, none}]) of
 	match ->
 	    ActualName =
 		re:replace(RequestURI, MP, Replacement, [{return,list}]),
@@ -156,10 +176,10 @@ real_script_name(ConfigDB, RequestURI, [{MP,Replacement} | Rest])
     end;
 
 real_script_name(ConfigDB, RequestURI, [{FakeName,RealName} | Rest]) ->
-    case inets_regexp:match(RequestURI, "^" ++ FakeName) of
-	{match,_,_} ->
-	    {ok, ActualName, _} = 
-		inets_regexp:sub(RequestURI, "^" ++ FakeName, RealName),
+    case re:run(RequestURI, "^" ++ FakeName, [{capture, none}]) of
+	match ->
+	    ActualName = 
+		re:replace(RequestURI, "^" ++ FakeName, RealName,  [{return,list}]),
 	    httpd_util:split_script_path(default_index(ConfigDB, ActualName));
 	nomatch ->
 	    real_script_name(ConfigDB, RequestURI, Rest)
@@ -206,26 +226,26 @@ path(Data, ConfigDB, RequestURI) ->
 %% load
 
 load("DirectoryIndex " ++ DirectoryIndex, []) ->
-    {ok, DirectoryIndexes} = inets_regexp:split(DirectoryIndex," "),
+    DirectoryIndexes = re:split(DirectoryIndex," ", [{return, list}]),
     {ok,[], {directory_index, DirectoryIndexes}};
 load("Alias " ++ Alias, []) ->
-    case inets_regexp:split(Alias," ") of
-	{ok, [FakeName, RealName]} ->
+    case re:split(Alias," ", [{return, list}]) of
+	[FakeName, RealName] ->
 	    {ok,[],{alias,{FakeName,RealName}}};
-	{ok, _} ->
+	_ ->
 	    {error,?NICE(string:strip(Alias)++" is an invalid Alias")}
     end;
 load("ReWrite " ++ Rule, Acc) ->
     load_re_write(Rule, Acc, "ReWrite", re_write);
 load("ScriptAlias " ++ ScriptAlias, []) ->
-    case inets_regexp:split(ScriptAlias, " ") of
-	{ok, [FakeName, RealName]} ->
+    case re:split(ScriptAlias, " ", [{return, list}]) of
+	[FakeName, RealName] ->
 	    %% Make sure the path always has a trailing slash..
 	    RealName1 = filename:join(filename:split(RealName)),
 	    {ok, [], {script_alias, {FakeName, RealName1++"/"}}};
-	{ok, _} ->
+	_ ->
 	    {error, ?NICE(string:strip(ScriptAlias)++
-			  " is an invalid ScriptAlias")}
+			      " is an invalid ScriptAlias")}
     end;
 load("ScriptReWrite " ++ Rule, Acc) ->
     load_re_write(Rule, Acc, "ScriptReWrite", script_re_write).
diff --git a/lib/inets/src/http_server/mod_auth.erl b/lib/inets/src/http_server/mod_auth.erl
index 6195e1c69f..b03629cabe 100644
--- a/lib/inets/src/http_server/mod_auth.erl
+++ b/lib/inets/src/http_server/mod_auth.erl
@@ -168,38 +168,38 @@ load("AuthDBType " ++ Type,
     end;
 
 load("require " ++ Require,[{directory, {Directory, DirData}}|Rest]) ->
-    case inets_regexp:split(Require," ") of
-	{ok,["user"|Users]} ->
+    case re:split(Require," ", [{return, list}]) of
+	["user" | Users] ->
 	    {ok,[{directory, {Directory,
-		  [{require_user,Users}|DirData]}} | Rest]};
-	{ok,["group"|Groups]} ->
+			      [{require_user,Users}|DirData]}} | Rest]};
+	["group"|Groups] ->
 	    {ok,[{directory, {Directory,
-		  [{require_group,Groups}|DirData]}} | Rest]};
-	{ok,_} ->
+			      [{require_group,Groups}|DirData]}} | Rest]};
+	_ ->
 	    {error,?NICE(string:strip(Require) ++" is an invalid require")}
     end;
 
 load("allow " ++ Allow,[{directory, {Directory, DirData}}|Rest]) ->
-    case inets_regexp:split(Allow," ") of
-	{ok,["from","all"]} ->
+    case re:split(Allow," ", [{return, list}]) of
+	["from","all"] ->
 	    {ok,[{directory, {Directory,
 		  [{allow_from,all}|DirData]}} | Rest]};
-	{ok,["from"|Hosts]} ->
+	["from"|Hosts] ->
 	    {ok,[{directory, {Directory,
 		  [{allow_from,Hosts}|DirData]}} | Rest]};
-	{ok,_} ->
+	_ ->
 	    {error,?NICE(string:strip(Allow) ++" is an invalid allow")}
     end;
 
 load("deny " ++ Deny,[{directory, {Directory, DirData}}|Rest]) ->
-    case inets_regexp:split(Deny," ") of
-	{ok, ["from", "all"]} ->
+    case re:split(Deny," ", [{return, list}]) of
+	["from", "all"] ->
 	    {ok,[{{directory, Directory,
 		  [{deny_from, all}|DirData]}} | Rest]};
-	{ok, ["from"|Hosts]} ->
+	["from"|Hosts] ->
 	    {ok,[{{directory, Directory,
 		   [{deny_from, Hosts}|DirData]}} | Rest]};
-	{ok, _} ->
+	_ ->
 	    {error,?NICE(string:strip(Deny) ++" is an invalid deny")}
     end;
 
@@ -561,12 +561,12 @@ secret_path(_Path, [], to_be_found) ->
 secret_path(_Path, [], Directory) ->
     {yes, Directory};
 secret_path(Path, [[NewDirectory] | Rest], Directory) ->
-    case inets_regexp:match(Path, NewDirectory) of
-	{match, _, _} when Directory =:= to_be_found ->
+    case re:run(Path, NewDirectory, [{capture, first}]) of
+	{match, _} when Directory =:= to_be_found ->
 	    secret_path(Path, Rest, NewDirectory);
-	{match, _, Length} when Length > length(Directory)->
+	{match, [{_, Length}]} when Length > length(Directory)->
 	    secret_path(Path, Rest,NewDirectory);
-	{match, _, _Length} ->
+	{match, _} ->
 	    secret_path(Path, Rest, Directory);
 	nomatch ->
 	    secret_path(Path, Rest, Directory)
@@ -588,8 +588,8 @@ validate_addr(_RemoteAddr, none) ->           % When called from 'deny'
 validate_addr(_RemoteAddr, []) ->
     false;
 validate_addr(RemoteAddr, [HostRegExp | Rest]) ->
-    case inets_regexp:match(RemoteAddr, HostRegExp) of
-	{match,_,_} ->
+    case re:run(RemoteAddr, HostRegExp, [{capture, none}]) of
+	match ->
 	    true;
 	nomatch ->
 	    validate_addr(RemoteAddr,Rest)
diff --git a/lib/inets/src/http_server/mod_auth_plain.erl b/lib/inets/src/http_server/mod_auth_plain.erl
index e85d3b8776..1a3120e03c 100644
--- a/lib/inets/src/http_server/mod_auth_plain.erl
+++ b/lib/inets/src/http_server/mod_auth_plain.erl
@@ -244,11 +244,11 @@ parse_group(Stream, GroupList, "") ->
 parse_group(Stream, GroupList, [$#|_]) ->
     parse_group(Stream, GroupList);
 parse_group(Stream, GroupList, Line) ->      
-    case inets_regexp:split(Line, ":") of
-	{ok, [Group,Users]} ->
-	    {ok, UserList} = inets_regexp:split(Users," "),
+    case re:split(Line, ":", [{return, list}]) of
+	[Group,Users] ->
+	    UserList = re:split(Users," ", [{return, list}]),
 	    parse_group(Stream, [{Group,UserList}|GroupList]);
-	{ok, _} ->
+	_ ->
 	    {error, ?NICE(Line)}
     end.
 
@@ -278,10 +278,10 @@ parse_passwd(Stream, PasswdList, "") ->
 parse_passwd(Stream, PasswdList, [$#|_]) ->
     parse_passwd(Stream, PasswdList);
 parse_passwd(Stream, PasswdList, Line) ->      
-    case inets_regexp:split(Line,":") of
-	{ok, [User,Password]} ->
+    case re:split(Line,":", [{return, list}]) of
+	[User,Password] ->
 	    parse_passwd(Stream, [{User,Password, []}|PasswdList]);
-	{ok,_} ->
+	_ ->
 	    {error, ?NICE(Line)}
     end.
 
diff --git a/lib/inets/src/http_server/mod_browser.erl b/lib/inets/src/http_server/mod_browser.erl
index ca643ab728..e3c41793ae 100644
--- a/lib/inets/src/http_server/mod_browser.erl
+++ b/lib/inets/src/http_server/mod_browser.erl
@@ -98,9 +98,9 @@ getBrowser1(Info) ->
 
 getBrowser(AgentString) ->
     LAgentString = http_util:to_lower(AgentString),
-    case inets_regexp:first_match(LAgentString,"^[^ ]*") of
-	{match,Start,Length} ->
-	    Browser = lists:sublist(LAgentString,Start,Length),
+    case re:run(LAgentString,"^[^ ]*", [{capture, first}]) of
+	{match,[{Start,Length}]} ->
+	    Browser = lists:sublist(LAgentString,Start+1,Length),
 	    case browserType(Browser) of
 		{mozilla,Vsn} ->
 		    {getMozilla(LAgentString,
@@ -164,8 +164,8 @@ operativeSystem(OpString,[{RetVal,RegExps}|Rest]) ->
 controlOperativeSystem(_OpString,[]) ->
     false;
 controlOperativeSystem(OpString,[Regexp|Regexps]) ->
-    case inets_regexp:match(OpString,Regexp) of
-	{match,_,_} ->
+    case re:run(OpString,Regexp, [{capture, none}]) of
+	match ->
 	    true;
 	nomatch ->
 	    controlOperativeSystem(OpString,Regexps)
@@ -182,18 +182,19 @@ controlOperativeSystem(OpString,[Regexp|Regexps]) ->
 getMozilla(_AgentString,[],Default) ->
     Default;
 getMozilla(AgentString,[{Agent,AgentRegExp}|Rest],Default) ->
-    case inets_regexp:match(AgentString,AgentRegExp) of
-	{match,_,_} ->
+    case re:run(AgentString,AgentRegExp, [{capture, none}]) of
+	match ->
 	    {Agent,getMozVersion(AgentString,AgentRegExp)};
 	nomatch ->
 	    getMozilla(AgentString,Rest,Default)
     end.
 
 getMozVersion(AgentString, AgentRegExp) ->
-    case inets_regexp:match(AgentString,AgentRegExp++"[0-9\.\ \/]*") of
-	{match,Start,Length} when length(AgentRegExp) < Length ->
+    case re:run(AgentString,AgentRegExp++"[0-9\.\ \/]*", 
+		[{capture, first}]) of
+	{match, [{Start,Length}]} when length(AgentRegExp) < Length ->
 	    %% Ok we got the number split it out
-	    RealStart  = Start+length(AgentRegExp),
+	    RealStart  = Start+1+length(AgentRegExp),
 	    RealLength = Length-length(AgentRegExp),
 	    VsnString  = string:substr(AgentString,RealStart,RealLength),
 	    %% case string:strip(VsnString,both,$\ ) of
diff --git a/lib/inets/src/http_server/mod_cgi.erl b/lib/inets/src/http_server/mod_cgi.erl
index 25d9f05028..ec8b9be32e 100644
--- a/lib/inets/src/http_server/mod_cgi.erl
+++ b/lib/inets/src/http_server/mod_cgi.erl
@@ -337,6 +337,8 @@ script_elements(#mod{method = "GET"}, {PathInfo, QueryString}) ->
     [{query_string, QueryString}, {path_info, PathInfo}];
 script_elements(#mod{method = "POST", entity_body = Body}, _) ->
     [{entity_body, Body}];
+script_elements(#mod{method = "PATCH", entity_body = Body}, _) ->
+    [{entity_body, Body}];
 script_elements(#mod{method = "PUT", entity_body = Body}, _) ->
     [{entity_body, Body}];
 script_elements(_, _) ->
diff --git a/lib/inets/src/http_server/mod_dir.erl b/lib/inets/src/http_server/mod_dir.erl
index 9d848ac013..2d8f27af3c 100644
--- a/lib/inets/src/http_server/mod_dir.erl
+++ b/lib/inets/src/http_server/mod_dir.erl
@@ -125,12 +125,13 @@ header(Path,RequestURI) ->
 	RequestURI ++ "</H1>\n<PRE><IMG SRC=\"" ++ icon(blank) ++
 	"\" ALT="     "> Name                   Last modified         "
 	"Size  Description <HR>\n",
-    case inets_regexp:sub(RequestURI,"[^/]*\$","") of
-	{ok,"/",_} ->
+    case re:replace(RequestURI,"[^/]*\$","", [{return,list}]) of
+	"/" ->
 	    Header;
-	{ok,ParentRequestURI,_} ->
-	    {ok,ParentPath,_} =
-		inets_regexp:sub(string:strip(Path,right,$/),"[^/]*\$",""),
+	ParentRequestURI ->
+	    ParentPath =
+		re:replace(string:strip(Path,right,$/),"[^/]*\$","",
+			   [{return,list}]),
 	    Header++format(ParentPath,ParentRequestURI)
     end.
 
diff --git a/lib/inets/src/http_server/mod_disk_log.erl b/lib/inets/src/http_server/mod_disk_log.erl
index a0ff929a34..5e395a2118 100644
--- a/lib/inets/src/http_server/mod_disk_log.erl
+++ b/lib/inets/src/http_server/mod_disk_log.erl
@@ -138,8 +138,8 @@ do(Info) ->
 %% Description: See httpd(3) ESWAPI CALLBACK FUNCTIONS
 %%-------------------------------------------------------------------------
 load("TransferDiskLogSize " ++ TransferDiskLogSize, []) ->
-    case inets_regexp:split(TransferDiskLogSize," ") of
-	{ok,[MaxBytes,MaxFiles]} ->
+    try re:split(TransferDiskLogSize, " ",  [{return, list}]) of
+	[MaxBytes, MaxFiles] ->
 	    case make_integer(MaxBytes) of
 		{ok,MaxBytesInteger} ->
 		    case make_integer(MaxFiles) of
@@ -151,17 +151,20 @@ load("TransferDiskLogSize " ++ TransferDiskLogSize, []) ->
 			     ?NICE(string:strip(TransferDiskLogSize)++
 				   " is an invalid TransferDiskLogSize")}
 		    end;
-		{error,_} ->
+		_ ->
 		    {error,?NICE(string:strip(TransferDiskLogSize)++
-				 " is an invalid TransferDiskLogSize")}
+				     " is an invalid TransferDiskLogSize")}
 	    end
+    catch _:_ ->
+	    {error,?NICE(string:strip(TransferDiskLogSize) ++
+			     " is an invalid TransferDiskLogSize")}   
     end;
 load("TransferDiskLog " ++ TransferDiskLog,[]) ->
     {ok,[],{transfer_disk_log,string:strip(TransferDiskLog)}};
  
 load("ErrorDiskLogSize " ++  ErrorDiskLogSize, []) ->
-    case inets_regexp:split(ErrorDiskLogSize," ") of
-	{ok,[MaxBytes,MaxFiles]} ->
+    try re:split(ErrorDiskLogSize," ", [{return, list}]) of
+	[MaxBytes,MaxFiles] ->
 	    case make_integer(MaxBytes) of
 		{ok,MaxBytesInteger} ->
 		    case make_integer(MaxFiles) of
@@ -176,13 +179,16 @@ load("ErrorDiskLogSize " ++  ErrorDiskLogSize, []) ->
 		    {error,?NICE(string:strip(ErrorDiskLogSize)++
 				 " is an invalid ErrorDiskLogSize")}
 	    end
+    catch _:_ ->
+	    {error,?NICE(string:strip(ErrorDiskLogSize) ++
+			     " is an invalid TransferDiskLogSize")}   
     end;
 load("ErrorDiskLog " ++ ErrorDiskLog, []) ->
     {ok, [], {error_disk_log, string:strip(ErrorDiskLog)}};
 
 load("SecurityDiskLogSize " ++ SecurityDiskLogSize, []) ->
-    case inets_regexp:split(SecurityDiskLogSize, " ") of
-	{ok, [MaxBytes, MaxFiles]} ->
+    try re:split(SecurityDiskLogSize, " ", [{return, list}]) of
+	[MaxBytes, MaxFiles] ->
 	    case make_integer(MaxBytes) of
 		{ok, MaxBytesInteger} ->
 		    case make_integer(MaxFiles) of
@@ -198,6 +204,9 @@ load("SecurityDiskLogSize " ++ SecurityDiskLogSize, []) ->
 		    {error, ?NICE(string:strip(SecurityDiskLogSize) ++
 				  " is an invalid SecurityDiskLogSize")}
 	    end
+    catch _:_ ->
+	    {error,?NICE(string:strip(SecurityDiskLogSize) ++
+			     " is an invalid SecurityDiskLogSize")}   	
     end;
 load("SecurityDiskLog " ++ SecurityDiskLog, []) ->
     {ok, [], {security_disk_log, string:strip(SecurityDiskLog)}};
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl
index 1923411449..2978ac9095 100644
--- a/lib/inets/src/http_server/mod_esi.erl
+++ b/lib/inets/src/http_server/mod_esi.erl
@@ -96,26 +96,27 @@ do(ModData) ->
 %% Description: See httpd(3) ESWAPI CALLBACK FUNCTIONS
 %%-------------------------------------------------------------------------
 load("ErlScriptAlias " ++ ErlScriptAlias, []) ->
-    case inets_regexp:split(ErlScriptAlias," ") of
-	{ok, [ErlName | StrModules]} ->
+    try re:split(ErlScriptAlias," ", [{return, list}]) of
+	[ErlName | StrModules] ->
 	    Modules = lists:map(fun(Str) -> 
 					list_to_atom(string:strip(Str)) 
 				end, StrModules),
-	    {ok, [], {erl_script_alias, {ErlName, Modules}}};
-	{ok, _} ->
+	    {ok, [], {erl_script_alias, {ErlName, Modules}}}
+    catch _:_ ->
 	    {error, ?NICE(string:strip(ErlScriptAlias) ++
-			 " is an invalid ErlScriptAlias")}
+			      " is an invalid ErlScriptAlias")}
     end;
 load("EvalScriptAlias " ++ EvalScriptAlias, []) ->
-    case inets_regexp:split(EvalScriptAlias, " ") of
-	{ok, [EvalName | StrModules]} ->
+    try re:split(EvalScriptAlias, " ",  [{return, list}]) of
+	[EvalName | StrModules] ->
 	    Modules = lists:map(fun(Str) -> 
 					list_to_atom(string:strip(Str)) 
 				end, StrModules),
-	    {ok, [], {eval_script_alias, {EvalName, Modules}}};
-	{ok, _} ->
+	    {ok, [], {eval_script_alias, {EvalName, Modules}}}
+    catch 
+	_:_ ->
 	    {error, ?NICE(string:strip(EvalScriptAlias) ++
-			  " is an invalid EvalScriptAlias")}
+			      " is an invalid EvalScriptAlias")}
     end;
 load("ErlScriptTimeout " ++ Timeout, [])->
     case catch list_to_integer(string:strip(Timeout)) of
@@ -224,8 +225,8 @@ match_esi_script(_, [], _) ->
     no_match;
 match_esi_script(RequestURI, [{Alias,Modules} | Rest], AliasType) ->
     AliasMatchStr = alias_match_str(Alias, AliasType),
-    case inets_regexp:first_match(RequestURI, AliasMatchStr) of
-	{match, 1, Length} ->
+    case re:run(RequestURI, AliasMatchStr, [{capture, first}]) of
+	{match, [{0, Length}]} ->
 	    {string:substr(RequestURI, Length + 1), Modules};
 	nomatch ->
 	    match_esi_script(RequestURI, Rest, AliasType)
@@ -281,6 +282,15 @@ erl(#mod{request_uri  = ReqUri,
 		       ?NICE("Erl mechanism doesn't support method DELETE")}}|
 	      Data]};
 
+erl(#mod{request_uri  = ReqUri, 
+	 method       = "PATCH",
+         http_version = Version, 
+	 data         = Data}, _ESIBody, _Modules) ->
+    ?hdrt("erl", [{method, patch}]),
+    {proceed, [{status,{501,{"PATCH", ReqUri, Version},
+			?NICE("Erl mechanism doesn't support method PATCH")}}|
+	       Data]};
+
 erl(#mod{method      = "POST", 
 	 entity_body = Body} = ModData, ESIBody, Modules) ->
     ?hdrt("erl", [{method, post}]),
@@ -584,9 +594,9 @@ generate_webpage(ESIBody) ->
 is_authorized(_ESIBody, [all]) ->
     true;
 is_authorized(ESIBody, Modules) ->
-    case inets_regexp:match(ESIBody, "^[^\:(%3A)]*") of
-	{match, Start, Length} ->
-	    lists:member(list_to_atom(string:substr(ESIBody, Start, Length)),
+    case re:run(ESIBody, "^[^\:(%3A)]*", [{capture, first}]) of
+	{match, [{Start, Length}]} ->
+	    lists:member(list_to_atom(string:substr(ESIBody, Start+1, Length)),
 			 Modules);
 	nomatch ->
 	    false
diff --git a/lib/inets/src/http_server/mod_htaccess.erl b/lib/inets/src/http_server/mod_htaccess.erl
index c6ae20ced7..f229c96f2d 100644
--- a/lib/inets/src/http_server/mod_htaccess.erl
+++ b/lib/inets/src/http_server/mod_htaccess.erl
@@ -327,9 +327,9 @@ memberNetwork(Networks,UserNetwork,IfTrue,IfFalse)->
 %ipadresses or subnet addresses.
 memberNetwork(Networks,UserNetwork)->
     case lists:filter(fun(Net)->
-			      case inets_regexp:match(UserNetwork,
-						formatRegexp(Net)) of
-				  {match,1,_}->
+			      case re:run(UserNetwork,
+					  formatRegexp(Net), [{capture, first}]) of
+				  {match,[{0,_}]}->
 				      true;
 				  _NotSubNet ->
 				      false
@@ -638,13 +638,8 @@ getHtAccessFileNames(Info)->
 %HtAccessFileNames=["accessfileName1",..."AccessFileName2"]
 %----------------------------------------------------------------------
 getData(Path,Info,HtAccessFileNames)->	    
-    case inets_regexp:split(Path,"/") of
-	{error,Error}->
-	    {error,Error};
-	{ok,SplittedPath}->
-	    getData2(HtAccessFileNames,SplittedPath,Info)
-	end.
-
+    SplittedPath = re:split(Path, "/", [{return, list}]),
+    getData2(HtAccessFileNames,SplittedPath,Info).
 
 %----------------------------------------------------------------------
 %Add to together the data in the Splittedpath up to the path 
@@ -942,20 +937,16 @@ getAuthorizationType(AuthType)->
 %Returns a list of the specified methods to limit or the atom all
 %----------------------------------------------------------------------
 getLimits(Limits)->
-    case inets_regexp:split(Limits,">")of
-	{ok,[_NoEndOnLimit]}->
+    case re:split(Limits,">", [{return, list}])of
+	[_NoEndOnLimit]->
 	    error;
-	{ok, [Methods | _Crap]}->
-	    case inets_regexp:split(Methods," ") of
-		{ok,[]}->
+	[Methods | _Crap]->
+	    case re:split(Methods," ",  [{return, list}]) of
+		[[]]->
 		    all;
-		{ok,SplittedMethods}->
-		    SplittedMethods;
-		{error, _Error}->
-		    error
-	    end;
-	{error,_Error}->
-	    error
+		SplittedMethods ->
+		    SplittedMethods
+	    end
     end.
 
 
diff --git a/lib/inets/src/http_server/mod_security.erl b/lib/inets/src/http_server/mod_security.erl
index 20f87619c1..1f936d598a 100644
--- a/lib/inets/src/http_server/mod_security.erl
+++ b/lib/inets/src/http_server/mod_security.erl
@@ -273,12 +273,12 @@ secret_path(_Path, [], to_be_found) ->
 secret_path(_Path, [], Dir) ->
     {yes, Dir};
 secret_path(Path, [[NewDir]|Rest], Dir) ->
-    case inets_regexp:match(Path, NewDir) of
-	{match, _, _} when Dir =:= to_be_found ->
+    case re:run(Path, NewDir, [{capture, first}]) of
+	{match, _} when Dir =:= to_be_found ->
 	    secret_path(Path, Rest, NewDir);
-	{match, _, Length} when Length > length(Dir) ->
+	{match, [{_, Length}]} when Length > length(Dir) ->
 	    secret_path(Path, Rest, NewDir);
-	{match, _, _} ->
+	{match, _} ->
 	    secret_path(Path, Rest, Dir);
 	nomatch ->
 	    secret_path(Path, Rest, Dir)
diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
index 82cda6aaf0..0a4b625b6a 100644
--- a/lib/inets/src/inets_app/Makefile
+++ b/lib/inets/src/inets_app/Makefile
@@ -47,7 +47,6 @@ MODULES = \
 	inets_service \
 	inets_app \
 	inets_sup \
-	inets_regexp \
 	inets_trace \
 	inets_lib \
 	inets_time_compat
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src
index 883ba84e8e..2f213794a3 100644
--- a/lib/inets/src/inets_app/inets.app.src
+++ b/lib/inets/src/inets_app/inets.app.src
@@ -26,7 +26,6 @@
             inets_sup,
             inets_app,
 	    inets_service,	                  
-	    inets_regexp,	                  
 	    inets_trace,
             inets_lib,
             inets_time_compat,
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index a9fbb1c3f7..6baecfe7a4 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,10 +18,12 @@
 %% %CopyrightEnd%
 {"%VSN%",
  [
+  {<<"6.2">>, [{load_module, httpc, soft_purge, soft_purge, []}]},
   {<<"6\\..*">>,[{restart_application, inets}]},
   {<<"5\\..*">>,[{restart_application, inets}]}
  ],
  [
+  {<<"6.2">>, [{load_module, httpc, soft_purge, soft_purge, []}]},
   {<<"6\\..*">>,[{restart_application, inets}]},
   {<<"5\\..*">>,[{restart_application, inets}]}
  ]
diff --git a/lib/inets/src/inets_app/inets_regexp.erl b/lib/inets/src/inets_app/inets_regexp.erl
deleted file mode 100644
index fc1608bc5a..0000000000
--- a/lib/inets/src/inets_app/inets_regexp.erl
+++ /dev/null
@@ -1,414 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2009. 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%
-%%
-
--module(inets_regexp).
-
--export([parse/1, match/2, first_match/2, split/2, sub/3, gsub/3]).
-
-
-%%%=========================================================================
-%%%  API
-%%%=========================================================================
-
-%% parse(RegExp) -> {ok, RE} | {error, E}.
-%% Parse the regexp described in the string RegExp.
-
-parse(S) ->
-    case (catch reg(S)) of
-	{R, []} -> 
-	    {ok, R};
-	{_R, [C|_]} -> 
-	    {error, {illegal, [C]}};
-	{error, E} -> 
-	    {error, E}
-    end.
-
-
-%% Find the longest match of RegExp in String.
-
-match(S, RegExp) when is_list(RegExp) ->
-    case parse(RegExp) of
-	{ok,RE} -> match(S, RE);
-	{error,E} -> {error,E}
-    end;
-match(S, RE) ->
-    case match(RE, S, 1, 0, -1) of
-	{Start,Len} when Len >= 0 ->
-	    {match, Start, Len};
-	{_Start,_Len} -> 
-	    nomatch
-    end.
-
-%% Find the first match of RegExp in String.
-
-first_match(S, RegExp) when is_list(RegExp) ->
-    case parse(RegExp) of
-	{ok, RE} -> 
-	    first_match(S, RE);
-	{error, E} -> 
-	    {error, E}
-    end;
-first_match(S, RE) ->
-    case first_match(RE, S, 1) of
-	{Start,Len} when Len >= 0 ->
-	    {match, Start,Len};
-	nomatch -> 
-	    nomatch
-    end.
-
-first_match(RE, S, St) when S =/= [] ->
-    case re_apply(S, St, RE) of
-	{match, P, _Rest} -> 
-	    {St, P-St};
-	nomatch -> 
-	    first_match(RE, tl(S), St+1)
-    end;
-first_match(_RE, [], _St) -> 
-    nomatch.
-
-
-match(RE, S, St, Pos, L) ->
-    case first_match(RE, S, St) of
-	{St1, L1} ->
-	    Nst = St1 + 1,
-	    if L1 > L -> 
-		    match(RE, lists:nthtail(Nst-St, S), Nst, St1, L1);
-	       true -> 
-		    match(RE, lists:nthtail(Nst-St, S), Nst, Pos, L)
-	    end;
-	nomatch -> 
-	    {Pos, L}
-    end.
-
-
-%% Split a string into substrings where the RegExp describes the
-%% field seperator. The RegExp " " is specially treated.
-
-split(String, " ") ->				%This is really special
-    {ok, RE} = parse("[ \t]+"),
-    case split_apply(String, RE, true) of
-	[[]|Ss] -> 
-	    {ok,Ss};
-	Ss -> 
-	    {ok,Ss}
-    end;
-split(String, RegExp) when is_list(RegExp) ->
-    case parse(RegExp) of
-	{ok, RE} -> 
-	    {ok, split_apply(String, RE, false)};
-	{error, E} -> 
-	    {error,E}
-    end;
-split(String, RE) -> 
-    {ok, split_apply(String, RE, false)}.
-
-
-%% Substitute the first match of the regular expression RegExp 
-%% with the string Replace in String. Accept pre-parsed regular
-%% expressions.
-
-sub(String, RegExp, Rep) when is_list(RegExp) ->
-    case parse(RegExp) of
-	{ok, RE} -> 
-	    sub(String, RE, Rep);
-	{error, E} -> 
-	    {error, E}
-    end;
-sub(String, RE, Rep) ->
-    Ss = sub_match(String, RE, 1),
-    {ok, sub_repl(Ss, Rep, String, 1), length(Ss)}.
-
-
-%% Substitute every match of the regular expression RegExp with 
-%% the string New in String. Accept pre-parsed regular expressions.
-
-gsub(String, RegExp, Rep) when is_list(RegExp) ->
-    case parse(RegExp) of
-	{ok, RE} -> 
-	    gsub(String, RE, Rep);
-	{error, E} -> 
-	    {error, E}
-    end;
-gsub(String, RE, Rep) ->
-    Ss = matches(String, RE, 1),
-    {ok, sub_repl(Ss, Rep, String, 1), length(Ss)}.
-
-
-%%%========================================================================
-%%% Internal functions
-%%%========================================================================
-
-%% This is the regular expression grammar used. It is equivalent to the
-%% one used in AWK, except that we allow ^ $ to be used anywhere and fail
-%% in the matching.
-%%
-%% reg -> reg1 : '$1'.
-%% reg1 -> reg1 "|" reg2 : {'or','$1','$2'}.
-%% reg1 -> reg2 : '$1'.
-%% reg2 -> reg2 reg3 : {concat,'$1','$2'}.
-%% reg2 -> reg3 : '$1'.
-%% reg3 -> reg3 "*" : {kclosure,'$1'}.
-%% reg3 -> reg3 "+" : {pclosure,'$1'}.
-%% reg3 -> reg3 "?" : {optional,'$1'}.
-%% reg3 -> reg4 : '$1'.
-%% reg4 -> "(" reg ")" : '$2'.
-%% reg4 -> "\\" char : '$2'.
-%% reg4 -> "^" : bos.
-%% reg4 -> "$" : eos.
-%% reg4 -> "." : char.
-%% reg4 -> "[" class "]" : {char_class,char_class('$2')}
-%% reg4 -> "[" "^" class "]" : {comp_class,char_class('$3')}
-%% reg4 -> "\"" chars "\"" : char_string('$2')
-%% reg4 -> char : '$1'.
-%% reg4 -> empty : epsilon.
-%%  The grammar of the current regular expressions. The actual parser
-%%  is a recursive descent implementation of the grammar.
-
-reg(S) -> reg1(S).
-
-%% reg1 -> reg2 reg1'
-%% reg1' -> "|" reg2
-%% reg1' -> empty
-
-reg1(S0) ->
-    {L,S1} = reg2(S0),
-    reg1p(S1, L).
-
-reg1p([$||S0], L) ->
-    {R,S1} = reg2(S0),
-    reg1p(S1, {'or',L,R});
-reg1p(S, L) -> {L,S}.
-
-%% reg2 -> reg3 reg2'
-%% reg2' -> reg3
-%% reg2' -> empty
-
-reg2(S0) ->
-    {L,S1} = reg3(S0),
-    reg2p(S1, L).
-
-reg2p([C|S0], L) when (C =/= $|) andalso (C =/= $)) ->
-    {R,S1} = reg3([C|S0]),
-    reg2p(S1, {concat,L,R});
-reg2p(S, L) -> {L,S}.
-
-%% reg3 -> reg4 reg3'
-%% reg3' -> "*" reg3'
-%% reg3' -> "+" reg3'
-%% reg3' -> "?" reg3'
-%% reg3' -> empty
-
-reg3(S0) ->
-    {L,S1} = reg4(S0),
-    reg3p(S1, L).
-
-reg3p([$*|S], L) -> reg3p(S, {kclosure,L});
-reg3p([$+|S], L) -> reg3p(S, {pclosure,L});
-reg3p([$?|S], L) -> reg3p(S, {optional,L});
-reg3p(S, L) -> {L,S}.
-
-reg4([$(|S0]) ->
-    case reg(S0) of
-	{R,[$)|S1]} -> {R,S1};
-	{_R,_S} -> throw({error,{unterminated,"("}})
-    end;
-reg4([$\\,O1,O2,O3|S]) 
-  when ((O1 >= $0) andalso 
-	(O1 =< $7) andalso 
-	(O2 >= $0) andalso 
-	(O2 =< $7) andalso 
-	(O3 >= $0) andalso 
-	(O3 =< $7)) ->
-    {(O1*8 + O2)*8 + O3 - 73*$0,S};
-reg4([$\\,C|S]) -> 
-    {escape_char(C),S};
-reg4([$\\]) -> 
-    throw({error, {unterminated,"\\"}});
-reg4([$^|S]) -> 
-    {bos,S};
-reg4([$$|S]) -> 
-    {eos,S};
-reg4([$.|S]) -> 
-    {{comp_class,"\n"},S};
-reg4("[^" ++ S0) ->
-    case char_class(S0) of
-	{Cc,[$]|S1]} -> {{comp_class,Cc},S1};
-	{_Cc,_S} -> throw({error,{unterminated,"["}})
-    end;
-reg4([$[|S0]) ->
-    case char_class(S0) of
-	{Cc,[$]|S1]} -> {{char_class,Cc},S1};
-	{_Cc,_S1} -> throw({error,{unterminated,"["}})
-    end;
-reg4([C|S]) 
-  when (C =/= $*) andalso (C =/= $+) andalso (C =/= $?) andalso (C =/= $]) -> 
-    {C, S};
-reg4([C|_S]) -> 
-    throw({error,{illegal,[C]}});
-reg4([]) -> 
-    {epsilon,[]}.
-
-escape_char($n) -> $\n;				%\n = LF
-escape_char($r) -> $\r;				%\r = CR
-escape_char($t) -> $\t;				%\t = TAB
-escape_char($v) -> $\v;				%\v = VT
-escape_char($b) -> $\b;				%\b = BS
-escape_char($f) -> $\f;				%\f = FF
-escape_char($e) -> $\e;				%\e = ESC
-escape_char($s) -> $\s;				%\s = SPACE
-escape_char($d) -> $\d;				%\d = DEL
-escape_char(C) -> C.
-
-char_class([$]|S]) -> char_class(S, [$]]);
-char_class(S) -> char_class(S, []).
-
-char($\\, [O1,O2,O3|S]) when
-  O1 >= $0, O1 =< $7, O2 >= $0, O2 =< $7, O3 >= $0, O3 =< $7 ->
-    {(O1*8 + O2)*8 + O3 - 73*$0,S};
-char($\\, [C|S]) -> {escape_char(C),S};
-char(C, S) -> {C,S}.
-
-char_class([C1|S0], Cc) when C1 =/= $] ->
-    case char(C1, S0) of
-	{Cf,[$-,C2|S1]} when C2 =/= $] ->
-	    case char(C2, S1) of
-		{Cl,S2} when Cf < Cl -> char_class(S2, [{Cf,Cl}|Cc]); 
-		{Cl,_S2} -> throw({error,{char_class,[Cf,$-,Cl]}})
-	    end;
-	{C,S1} -> char_class(S1, [C|Cc])
-    end;
-char_class(S, Cc) -> {Cc,S}.
-
-
-%% re_apply(String, StartPos, RegExp) -> re_app_res().
-%%
-%%  Apply the (parse of the) regular expression RegExp to String.  If
-%%  there is a match return the position of the remaining string and
-%%  the string if else return 'nomatch'. BestMatch specifies if we want
-%%  the longest match, or just a match.
-%%
-%%  StartPos should be the real start position as it is used to decide
-%%  if we ae at the beginning of the string.
-%%
-%%  Pass two functions to re_apply_or so it can decide, on the basis
-%%  of BestMatch, whether to just any take any match or try both to
-%%  find the longest. This is slower but saves duplicatng code.
-
-re_apply(S, St, RE) -> re_apply(RE, [], S, St).
-
-re_apply(epsilon, More, S, P) ->		%This always matches
-    re_apply_more(More, S, P);
-re_apply({'or',RE1,RE2}, More, S, P) ->
-    re_apply_or(re_apply(RE1, More, S, P),
-		re_apply(RE2, More, S, P));
-re_apply({concat,RE1,RE2}, More, S0, P) ->
-    re_apply(RE1, [RE2|More], S0, P);
-re_apply({kclosure,CE}, More, S, P) ->
-    %% Be careful with the recursion, explicitly do one call before
-    %% looping.
-    re_apply_or(re_apply_more(More, S, P),
-		re_apply(CE, [{kclosure,CE}|More], S, P));
-re_apply({pclosure,CE}, More, S, P) ->
-    re_apply(CE, [{kclosure,CE}|More], S, P);
-re_apply({optional,CE}, More, S, P) ->
-    re_apply_or(re_apply_more(More, S, P),
-		re_apply(CE, More, S, P));
-re_apply(bos, More, S, 1) -> re_apply_more(More, S, 1);
-re_apply(eos, More, [$\n|S], P) -> re_apply_more(More, S, P);
-re_apply(eos, More, [], P) -> re_apply_more(More, [], P);
-re_apply({char_class,Cc}, More, [C|S], P) ->
-    case in_char_class(C, Cc) of
-	true -> re_apply_more(More, S, P+1);
-	false -> nomatch
-    end;
-re_apply({comp_class,Cc}, More, [C|S], P) ->
-    case in_char_class(C, Cc) of
-	true -> nomatch;
-	false -> re_apply_more(More, S, P+1)
-    end;
-re_apply(C, More, [C|S], P) when is_integer(C) ->
-    re_apply_more(More, S, P+1);
-re_apply(_RE, _More, _S, _P) -> nomatch.
-
-%% re_apply_more([RegExp], String, Length) -> re_app_res().
-
-re_apply_more([RE|More], S, P) -> re_apply(RE, More, S, P);
-re_apply_more([], S, P) -> {match,P,S}.
-
-%% in_char_class(Char, Class) -> bool().
-
-in_char_class(C, [{C1,C2}|_Cc]) when C >= C1, C =< C2 -> true;
-in_char_class(C, [C|_Cc]) -> true;
-in_char_class(C, [_|Cc]) -> in_char_class(C, Cc);
-in_char_class(_C, []) -> false.
-
-%% re_apply_or(Match1, Match2) -> re_app_res().
-%%  If we want the best match then choose the longest match, else just
-%%  choose one by trying sequentially.
-
-re_apply_or({match,P1,S1},   {match,P2,_S2}) when P1 >= P2 -> {match,P1,S1};
-re_apply_or({match,_P1,_S1}, {match,P2,S2}) -> {match,P2,S2};
-re_apply_or(nomatch, R2) -> R2;
-re_apply_or(R1, nomatch) -> R1.
-
-
-matches(S, RE, St) ->
-    case first_match(RE, S, St) of
-	{St1,0} -> 
-	    [{St1,0}|matches(string:substr(S, St1+2-St), RE, St1+1)];
-	{St1,L1} -> 
-	    [{St1,L1}|matches(string:substr(S, St1+L1+1-St), RE, St1+L1)];
-	nomatch -> 
-	    []
-    end.
-
-sub_match(S, RE, St) ->
-    case first_match(RE, S, St) of
-	{St1,L1} -> [{St1,L1}];
-	nomatch -> []
-    end.
-
-sub_repl([{St,L}|Ss], Rep, S, Pos) ->
-    Rs = sub_repl(Ss, Rep, S, St+L),
-    string:substr(S, Pos, St-Pos) ++ 
-	sub_repl(Rep, string:substr(S, St, L), Rs);
-sub_repl([], _Rep, S, Pos) -> 
-    string:substr(S, Pos).
-
-sub_repl([$&|Rep], M, Rest) -> M ++ sub_repl(Rep, M, Rest);
-sub_repl("\\&" ++ Rep, M, Rest) -> [$&|sub_repl(Rep, M, Rest)];
-sub_repl([C|Rep], M, Rest) -> [C|sub_repl(Rep, M, Rest)];
-sub_repl([], _M, Rest) -> Rest.
-
-split_apply(S, RE, Trim) -> split_apply(S, 1, RE, Trim, []).
-
-split_apply([], _P, _RE, true, []) -> 
-    [];
-split_apply([], _P, _RE, _T, Sub) -> 
-    [lists:reverse(Sub)];
-split_apply(S, P, RE, T, Sub) ->
-    case re_apply(S, P, RE) of
-	{match,P,_Rest} ->
-	    split_apply(tl(S), P+1, RE, T, [hd(S)|Sub]);
-	{match,P1,Rest} ->
-	    [lists:reverse(Sub)|split_apply(Rest, P1, RE, T, [])];
-	nomatch ->
-	    split_apply(tl(S), P+1, RE, T, [hd(S)|Sub])
-    end.
diff --git a/lib/inets/src/tftp/tftp_engine.erl b/lib/inets/src/tftp/tftp_engine.erl
index d0510e795b..22dd2f3336 100644
--- a/lib/inets/src/tftp/tftp_engine.erl
+++ b/lib/inets/src/tftp/tftp_engine.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2015. 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.
@@ -63,7 +63,8 @@
 -record(file_info, {peer_req, pid}).
 -record(sys_misc, {module, function, arguments}).
 -record(error, {where, code, text, filename}).
--record(prepared, {status :: prep_status(), result, block_no, next_data, prev_data}).
+-record(prepared, {status :: prep_status() | 'undefined',
+                   result, block_no, next_data, prev_data}).
 -record(transfer_res, {status, decoded_msg, prepared}).
 -define(ERROR(Where, Code, Text, Filename),
         #error{where = Where, code = Code, text = Text, filename = Filename}).
@@ -656,22 +657,11 @@ common_read(Config, Callback, Req, _LocalAccess, ExpectedBlockNo, ActualBlockNo,
 
 do_common_read(Config, Callback, Req, LocalAccess, BlockNo, Data, Prepared)
   when is_binary(Data), is_record(Prepared, prepared) ->
-    NextBlockNo = BlockNo + 1,
-    case NextBlockNo =< 65535 of
-        true ->
-            Reply = #tftp_msg_data{block_no = NextBlockNo, data = Data},
-            {Config2, Callback2, TransferRes} =
-                transfer(Config, Callback, Req, Reply, LocalAccess, NextBlockNo, Prepared),
-            ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, NextBlockNo);
-        false ->
-            Code = badblk,
-            Text = "Too big transfer ID = " ++ 
-                integer_to_list(NextBlockNo) ++ " > 65535", 
-            {undefined, Error} =
-                callback({abort, {Code, Text}}, Config, Callback, Req),
-            send_msg(Config, Req, Error),
-            terminate(Config, Req, ?ERROR(read, Code, Text, Req#tftp_msg_req.filename))
-    end.
+    NextBlockNo = (BlockNo + 1) rem 65536,
+    Reply = #tftp_msg_data{block_no = NextBlockNo, data = Data},
+    {Config2, Callback2, TransferRes} =
+        transfer(Config, Callback, Req, Reply, LocalAccess, NextBlockNo, Prepared),
+    ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, NextBlockNo).
 
 -spec common_write(#config{}, #callback{}, _, 'write', integer(), integer(), _, #prepared{}) -> no_return().
 
@@ -715,21 +705,10 @@ common_write(Config, Callback, Req, _, ExpectedBlockNo, ActualBlockNo, Data, Pre
 common_ack(Config, Callback, Req, LocalAccess, BlockNo, Prepared) 
   when is_record(Prepared, prepared) ->
     Reply = #tftp_msg_ack{block_no = BlockNo},
-    NextBlockNo = BlockNo + 1,
+    NextBlockNo = (BlockNo + 1) rem 65536,
     {Config2, Callback2, TransferRes} = 
         transfer(Config, Callback, Req, Reply, LocalAccess, NextBlockNo, Prepared),
-    case NextBlockNo =< 65535 of
-        true ->   
-            ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, NextBlockNo);
-        false ->
-            Code = badblk,
-            Text = "Too big transfer ID = " ++ 
-                integer_to_list(NextBlockNo) ++ " > 65535", 
-            {undefined, Error} =
-                callback({abort, {Code, Text}}, Config, Callback2, Req),
-            send_msg(Config, Req, Error),
-            terminate(Config, Req, ?ERROR(read, Code, Text, Req#tftp_msg_req.filename))
-    end.
+    ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, NextBlockNo).
 
 pre_terminate(Config, Req, Result) ->
     if
@@ -1153,8 +1132,8 @@ match_callback(Filename, Callbacks) ->
     end.
 
 do_match_callback(Filename, [C | Tail]) when is_record(C, callback) ->
-    case catch inets_regexp:match(Filename, C#callback.internal) of
-        {match, _, _} ->
+    case catch re:run(Filename, C#callback.internal, [{capture, none}]) of
+        match ->
             {ok, C};
         nomatch ->
             do_match_callback(Filename, Tail);
diff --git a/lib/inets/src/tftp/tftp_lib.erl b/lib/inets/src/tftp/tftp_lib.erl
index 71327f8023..01dea97d07 100644
--- a/lib/inets/src/tftp/tftp_lib.erl
+++ b/lib/inets/src/tftp/tftp_lib.erl
@@ -184,7 +184,7 @@ do_parse_config([{Key, Val} | Tail], Config) when is_record(Config, config) ->
         callback ->
             case Val of
                 {RegExp, Mod, State} when is_list(RegExp), is_atom(Mod) ->
-                    case inets_regexp:parse(RegExp) of
+                    case re:compile(RegExp) of
                         {ok, Internal} ->
                             Callback = #callback{regexp   = RegExp,
                                                  internal = Internal,
@@ -253,7 +253,7 @@ do_parse_config(Options, Config) when is_record(Config, config) ->
 
 add_default_callbacks(Callbacks) ->
     RegExp = "",
-    {ok, Internal} = inets_regexp:parse(RegExp),
+    {ok, Internal} = re:compile(RegExp),
     File = #callback{regexp   = RegExp,
 		     internal = Internal,
 		     module   = tftp_file,
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile
index 607ec7c182..67c979bd59 100644
--- a/lib/inets/test/Makefile
+++ b/lib/inets/test/Makefile
@@ -42,7 +42,6 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 INCLUDES = -I. \
-	-I$(ERL_TOP)/lib/test_server/include/ \
 	-I$(ERL_TOP)/lib/inets/src/inets_app \
 	-I$(ERL_TOP)/lib/inets/src/http_lib \
 	-I$(ERL_TOP)/lib/inets/src/http_client \
@@ -238,7 +237,6 @@ RELTESTSYSBINDIR     = $(RELTESTSYSALLDATADIR)/bin
 # running the target "targets".
 # ----------------------------------------------------
 ERL_COMPILE_FLAGS += \
-	-pa ../../../internal_tools/test_server/ebin \
 	$(INCLUDES) \
 	$(FTP_FLAGS) \
 	$(INETS_FLAGS)
diff --git a/lib/inets/test/ftp_format_SUITE.erl b/lib/inets/test/ftp_format_SUITE.erl
index 7ed94b9c61..9b71d2944b 100644
--- a/lib/inets/test/ftp_format_SUITE.erl
+++ b/lib/inets/test/ftp_format_SUITE.erl
@@ -22,7 +22,6 @@
 -author('[email protected]').
 
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
 -include("ftp_internal.hrl").
 
 %% Test server specific exports
diff --git a/lib/inets/test/ftp_suite_lib.erl b/lib/inets/test/ftp_suite_lib.erl
index 6d30f3aa62..f15fa2fa8d 100644
--- a/lib/inets/test/ftp_suite_lib.erl
+++ b/lib/inets/test/ftp_suite_lib.erl
@@ -22,8 +22,7 @@
 -module(ftp_suite_lib).
 
 
--include_lib("test_server/include/test_server.hrl").
--include_lib("test_server/include/test_server_line.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("inets_test_lib.hrl").
 
 %% Test server specific exports
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index c6c59ab1af..f9b3aa5b59 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -67,7 +67,9 @@ real_requests()->
      head,
      get,
      post,
+     delete,
      post_stream,
+     patch,
      async,
      pipeline,
      persistent_connection,
@@ -255,6 +257,51 @@ post(Config) when is_list(Config) ->
     {ok, {{_,504,_}, [_ | _], []}} =
 	httpc:request(post, {URL, [{"expect","100-continue"}],
 			     "text/plain", "foobar"}, [], []).
+%%--------------------------------------------------------------------
+delete() ->
+    [{"Test http delete request against local server. We do in this case "
+     "only care about the client side of the the delete. The server "
+     "script will not actually use the delete data."}].
+delete(Config) when is_list(Config) ->
+    CGI = case test_server:os_type() of
+          {win32, _} ->
+          "/cgi-bin/cgi_echo.exe";
+          _ ->
+          "/cgi-bin/cgi_echo"
+      end,
+
+    URL  = url(group_name(Config), CGI, Config),
+    Body = lists:duplicate(100, "1"),
+
+    {ok, {{_,200,_}, [_ | _], [_ | _]}} =
+    httpc:request(delete, {URL, [{"expect","100-continue"}],
+                 "text/plain", Body}, [], []),
+
+    {ok, {{_,504,_}, [_ | _], []}} =
+    httpc:request(delete, {URL, [{"expect","100-continue"}],
+                 "text/plain", "foobar"}, [], []).
+
+%%--------------------------------------------------------------------
+patch() ->
+    [{"Test http patch request against local server. We do in this case "
+     "only care about the client side of the the patch. The server "
+     "script will not actually use the patch data."}].
+patch(Config) when is_list(Config) ->
+    CGI = case test_server:os_type() of
+	      {win32, _} ->
+		  "/cgi-bin/cgi_echo.exe";
+	      _ ->
+		  "/cgi-bin/cgi_echo"
+	  end,
+
+     URL = url(group_name(Config), CGI, Config),
+
+    %% Cgi-script expects the body length to be 100
+    Body = lists:duplicate(100, "1"),
+
+    {ok, {{_,200,_}, [_ | _], [_ | _]}} =
+	httpc:request(patch, {URL, [{"expect","100-continue"}],
+			     "text/plain", Body}, [], []).
 
 %%--------------------------------------------------------------------
 post_stream() ->
diff --git a/lib/inets/test/httpc_cookie_SUITE.erl b/lib/inets/test/httpc_cookie_SUITE.erl
index 9a62bdb43f..2efca9a5c8 100644
--- a/lib/inets/test/httpc_cookie_SUITE.erl
+++ b/lib/inets/test/httpc_cookie_SUITE.erl
@@ -20,7 +20,7 @@
 %%
 -module(httpc_cookie_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 
 %% Test server specific exports
diff --git a/lib/inets/test/httpd_1_1.erl b/lib/inets/test/httpd_1_1.erl
index db6def9d17..88d91b552c 100644
--- a/lib/inets/test/httpd_1_1.erl
+++ b/lib/inets/test/httpd_1_1.erl
@@ -233,14 +233,6 @@ trace(Type, Port, Host, Node)->
 					  "Max-Forwards:2\r\n\r\n",
 					  [{statuscode, 200}]).
 head(Type, Port, Host, Node)->
-    %% mod_include 
-    ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
-				       "HEAD /fsize.shtml HTTP/1.0\r\n\r\n", 
-				       [{statuscode, 200},
-				       {version, "HTTP/1.0"}]),
-    ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
-			"HEAD /fsize.shtml HTTP/1.1\r\nhost:" ++ 
-			Host  ++ "\r\n\r\n", [{statuscode, 200}]),
     %% mod_esi
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
 			"HEAD /cgi-bin/erl/httpd_example/newformat"
@@ -370,18 +362,18 @@ validateRangeRequest2(Socket, Head, Body, ValidBody, BodySize)
 
 
 validateMultiPartRangeRequest(Body, ValidBody, Boundary)->
-    case inets_regexp:split(Body,"--"++Boundary++"--") of
+    case re:split(Body,"--"++Boundary++"--", [{return, list}]) of
 	%%Last is the epilogue and must be ignored 
-	{ok,[First | _Last]}->
+	[First | _Last]->
 	    %%First is now the actuall http request body.
-	    case inets_regexp:split(First, "--" ++ Boundary) of
+	    case re:split(First, "--" ++ Boundary, [{return, list}]) of
 		%%Parts is now a list of ranges and the heads for each range
 		%%Gues we try to split out the body
-		{ok,Parts}->
+		Parts->
 		    case lists:flatten(lists:map(fun splitRange/1,Parts)) of
 			ValidBody->
 			    ok;
-		       ParsedBody->
+			ParsedBody->
 			    error = ParsedBody
 		    end
 	    end;
@@ -391,8 +383,8 @@ validateMultiPartRangeRequest(Body, ValidBody, Boundary)->
 
 
 splitRange(Part)->	    
-    case inets_regexp:split(Part, "\r\n\r\n") of
-	{ok,[_, Body]} ->
+    case re:split(Part, "\r\n\r\n", [{return, list}]) of
+	[_, Body] ->
 	    string:substr(Body, 1, length(Body) - 2);
 	_ ->
 	    []
@@ -412,13 +404,13 @@ getRangeSize(Head)->
 	{multiPart, BoundaryString}->
 	    {multiPart, BoundaryString};
 	_X1 ->
-	    case inets_regexp:match(Head, ?CONTENT_RANGE "bytes=.*\r\n") of
-		{match, Start, Lenght} ->
+	    case re:run(Head, ?CONTENT_RANGE "bytes=.*\r\n", [{capture, first}]) of
+		{match, [{Start, Lenght}]} ->
 		    %% Get the range data remove the fieldname and the
 		    %% end of line.
-		    RangeInfo = string:substr(Head, Start + 20, 
-					      Lenght - (20 - 2)),
-		    rangeSize(RangeInfo);
+		    RangeInfo = string:substr(Head, Start + 1 + 20, 
+					      Lenght - (20 +2)),
+		    rangeSize(string:strip(RangeInfo));
 		_X2 ->
 		    error
 	    end
@@ -454,10 +446,10 @@ num(_CharVal, false) ->
     true.
 
 controlMimeType(Head)->
-    case inets_regexp:match(Head,?CONTENT_TYPE "multipart/byteranges.*\r\n") of
-	{match,Start,Length}->
+    case re:run(Head,?CONTENT_TYPE "multipart/byteranges.*\r\n", [{capture, first}]) of
+	{match, [{Start,Length}]}->
 	    FieldNameLen = length(?CONTENT_TYPE "multipart/byteranges"),
-	    case clearBoundary(string:substr(Head, Start + FieldNameLen,
+	    case clearBoundary(string:substr(Head, Start + 1 + FieldNameLen,
 					     Length - (FieldNameLen+2))) of
 		error ->
 		    error;
@@ -471,10 +463,10 @@ controlMimeType(Head)->
     end.
 
 clearBoundary(Boundary)->
-    case inets_regexp:match(Boundary, "boundary=.*\$") of
-	{match, Start1, Length1}->
+    case re:run(Boundary, "boundary=.*\$", [{capture, first}]) of
+	{match, [{Start1, Length1}]}->
 	    BoundLen = length("boundary="),
-	    string:substr(Boundary, Start1 + BoundLen, Length1 - BoundLen);
+	    string:substr(Boundary, Start1 + 1 + BoundLen, Length1 - BoundLen);
 	_ ->
 	    error
     end.
@@ -489,12 +481,12 @@ end_of_header(HeaderPart) ->
     end.
 
 get_body_size(Head) ->
-    case inets_regexp:match(Head,?CONTENT_LENGTH ".*\r\n") of
- 	{match, Start, Length} ->
+    case re:run(Head,?CONTENT_LENGTH ".*\r\n", [{capture, first}]) of
+ 	{match, [{Start, Length}]} ->
  	    %% 15 is length of Content-Length, 
  	    %% 17 Is length of Content-Length and \r\
  	    S = list_to_integer(
- 		  string:strip(string:substr(Head, Start + 15, Length-17))),
+ 		  string:strip(string:substr(Head, Start +1 + 15, Length-17))),
  	    S;
  	_->
  	    0
diff --git a/lib/inets/test/httpd_load.erl b/lib/inets/test/httpd_load.erl
index 39c2280f23..fef693d818 100644
--- a/lib/inets/test/httpd_load.erl
+++ b/lib/inets/test/httpd_load.erl
@@ -21,8 +21,7 @@
 
 -module(httpd_load).
 
--include("test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% General testcases bodies called from httpd_SUITE
 -export([load_test/5]).
diff --git a/lib/inets/test/httpd_mod.erl b/lib/inets/test/httpd_mod.erl
index 847586a903..016989a22e 100644
--- a/lib/inets/test/httpd_mod.erl
+++ b/lib/inets/test/httpd_mod.erl
@@ -21,8 +21,7 @@
 
 -module(httpd_mod).
 
--include("test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% General testcases bodies called from httpd_SUITE
 -export([alias/4, actions/4, security/5, auth/4, auth_api/6,
diff --git a/lib/inets/test/httpd_poll.erl b/lib/inets/test/httpd_poll.erl
index aca7b70376..4a570fb512 100644
--- a/lib/inets/test/httpd_poll.erl
+++ b/lib/inets/test/httpd_poll.erl
@@ -259,11 +259,11 @@ validate(ExpStatusCode,Socket,Response) ->
     vtrace("validate -> Entry with ~p bytes response",[Sz]),
     Size = trash_the_rest(Socket,Sz),
     close(Socket),
-    case inets_regexp:split(Response," ") of
-	{ok,["HTTP/1.0",ExpStatusCode|_]} ->
+    case re:split(Response," ", [{return, list}]) of
+	["HTTP/1.0",ExpStatusCode|_] ->
 	    vlog("response (~p bytes) was ok",[Size]),
 	    ok;
-	{ok,["HTTP/1.0",StatusCode|_]} -> 
+	["HTTP/1.0",StatusCode|_] -> 
 	    verror("unexpected response status received: ~s => ~s",
 		   [StatusCode,status_to_message(StatusCode)]),
 	    log("unexpected result to GET of '~s': ~s => ~s",
diff --git a/lib/inets/test/httpd_test_data/server_root/conf/8080.conf b/lib/inets/test/httpd_test_data/server_root/conf/8080.conf
index 48e66f0114..7b1b4a15b2 100644
--- a/lib/inets/test/httpd_test_data/server_root/conf/8080.conf
+++ b/lib/inets/test/httpd_test_data/server_root/conf/8080.conf
@@ -1,7 +1,7 @@
 Port 8080
 #ServerName your.server.net
 SocketType ip_comm
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_include mod_dir mod_get mod_head mod_log mod_disk_log
+Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
 ServerAdmin [email protected]
 ServerRoot /var/tmp/server_root
 ErrorLog logs/error_log_8080
diff --git a/lib/inets/test/httpd_test_data/server_root/conf/8888.conf b/lib/inets/test/httpd_test_data/server_root/conf/8888.conf
index 79bb7fcca4..042779fcd0 100644
--- a/lib/inets/test/httpd_test_data/server_root/conf/8888.conf
+++ b/lib/inets/test/httpd_test_data/server_root/conf/8888.conf
@@ -1,7 +1,7 @@
 Port 8888
 #ServerName your.server.net
 SocketType ip_comm
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_include mod_dir mod_get mod_head mod_log mod_disk_log
+Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
 ServerAdmin [email protected]
 ServerRoot /var/tmp/server_root
 ErrorLog logs/error_log_8888
diff --git a/lib/inets/test/httpd_test_data/server_root/conf/httpd.conf b/lib/inets/test/httpd_test_data/server_root/conf/httpd.conf
index 87c2973e5a..d94b245c25 100644
--- a/lib/inets/test/httpd_test_data/server_root/conf/httpd.conf
+++ b/lib/inets/test/httpd_test_data/server_root/conf/httpd.conf
@@ -64,7 +64,7 @@ SocketType ip_comm
 # WARNING! Do not tamper with this directive unless you are familiar with
 # EWSAPI.
 
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_responsecontrol mod_trace mod_range mod_head mod_include mod_dir mod_get mod_log mod_disk_log
+Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_responsecontrol mod_trace mod_range mod_head mod_dir mod_get mod_log mod_disk_log
 
 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.
diff --git a/lib/inets/test/httpd_test_data/server_root/conf/ssl.conf b/lib/inets/test/httpd_test_data/server_root/conf/ssl.conf
index 8b8c57a98b..de49ceafd0 100644
--- a/lib/inets/test/httpd_test_data/server_root/conf/ssl.conf
+++ b/lib/inets/test/httpd_test_data/server_root/conf/ssl.conf
@@ -1,7 +1,7 @@
 Port 8088
 #ServerName your.server.net
 SocketType ssl
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_include mod_dir mod_get mod_head mod_log mod_disk_log
+Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
 ServerAdmin [email protected]
 ServerRoot /var/tmp/server_root
 ErrorLog logs/error_log_8088
diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl
index c58966ce10..71e201f826 100644
--- a/lib/inets/test/httpd_test_lib.erl
+++ b/lib/inets/test/httpd_test_lib.erl
@@ -96,10 +96,10 @@ verify_request(SocketType, Host, Port, TranspOpts, Node, RequestStr, Options, Ti
     try inets_test_lib:connect_bin(SocketType, Host, Port, TranspOpts) of
 	{ok, Socket} ->
 	    ok = inets_test_lib:send(SocketType, Socket, RequestStr),
-	    State = case inets_regexp:match(RequestStr, "printenv") of
+	    State = case re:run(RequestStr, "printenv", [{capture, none}]) of
 			nomatch ->
 			    #state{};
-			_ ->
+			match ->
 			    #state{print = true}
 		    end,
 	    
@@ -317,10 +317,10 @@ do_validate(Header, [_Unknown | Rest], N, P) ->
     do_validate(Header, Rest, N, P).
 
 is_expect(RequestStr) ->
-    case inets_regexp:match(RequestStr, "xpect:100-continue") of
-	{match, _, _}->
+    case re:run(RequestStr, "xpect:100-continue", [{capture, none}]) of
+	match->
 	    true;
-	_ ->
+	nomatch ->
 	    false
     end.
 
diff --git a/lib/inets/test/httpd_time_test.erl b/lib/inets/test/httpd_time_test.erl
index 7c0acb5a99..1b4d74b28e 100644
--- a/lib/inets/test/httpd_time_test.erl
+++ b/lib/inets/test/httpd_time_test.erl
@@ -386,31 +386,31 @@ validate(ExpStatusCode, _SocketType, _Socket, Response) ->
     %% Sz = sz(Response),
     %% trash_the_rest(Socket, Sz),
     %% inets_test_lib:close(SocketType, Socket),
-    case inets_regexp:split(Response," ") of
-        {ok, ["HTTP/1.0", ExpStatusCode|_]} ->
+    case re:split(Response," ", [{return, list}]) of
+        ["HTTP/1.0", ExpStatusCode|_] ->
             ok;
-        {ok, ["HTTP/1.0", StatusCode|_]} -> 
+        ["HTTP/1.0", StatusCode|_] -> 
 	    error_msg("Unexpected status code: ~p (~s). "
 		      "Expected status code: ~p (~s)", 
 		      [StatusCode,    status_to_message(StatusCode),
 		       ExpStatusCode, status_to_message(ExpStatusCode)]),
             exit({unexpected_response_code, StatusCode, ExpStatusCode});
-	{ok, ["HTTP/1.1", ExpStatusCode|_]} ->
+	["HTTP/1.1", ExpStatusCode|_] ->
             ok;
-        {ok, ["HTTP/1.1", StatusCode|_]} -> 
+	["HTTP/1.1", StatusCode|_] -> 
 	    error_msg("Unexpected status code: ~p (~s). "
 		      "Expected status code: ~p (~s)", 
 		      [StatusCode,    status_to_message(StatusCode),
 		       ExpStatusCode, status_to_message(ExpStatusCode)]),
             exit({unexpected_response_code, StatusCode, ExpStatusCode});
-        {ok, Unexpected} -> 
-	    error_msg("Unexpected response split: ~p (~s)", 
-		      [Unexpected, Response]),
-            exit({unexpected_response, Unexpected, Response});
-        {error, Reason} -> 
+	{error, Reason} -> 
 	    error_msg("Failed processing response: ~p (~s)", 
 		      [Reason, Response]),
-            exit({failed_response_processing, Reason, Response})
+            exit({failed_response_processing, Reason, Response});
+	Unexpected ->
+	    error_msg("Unexpected response split: ~p (~s)", 
+		      [Unexpected, Response]),
+            exit({unexpected_response, Unexpected, Response})
     end.
 
 
diff --git a/lib/inets/test/old_httpd_SUITE.erl b/lib/inets/test/old_httpd_SUITE.erl
index aaaf69fbec..f972f0f435 100644
--- a/lib/inets/test/old_httpd_SUITE.erl
+++ b/lib/inets/test/old_httpd_SUITE.erl
@@ -21,8 +21,7 @@
 
 -module(old_httpd_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("inets_test_lib.hrl").
 
 -include_lib("kernel/include/file.hrl").
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8080.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8080.conf
index 48e66f0114..7b1b4a15b2 100644
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8080.conf
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8080.conf
@@ -1,7 +1,7 @@
 Port 8080
 #ServerName your.server.net
 SocketType ip_comm
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_include mod_dir mod_get mod_head mod_log mod_disk_log
+Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
 ServerAdmin [email protected]
 ServerRoot /var/tmp/server_root
 ErrorLog logs/error_log_8080
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8888.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8888.conf
index 79bb7fcca4..042779fcd0 100644
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8888.conf
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8888.conf
@@ -1,7 +1,7 @@
 Port 8888
 #ServerName your.server.net
 SocketType ip_comm
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_include mod_dir mod_get mod_head mod_log mod_disk_log
+Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
 ServerAdmin [email protected]
 ServerRoot /var/tmp/server_root
 ErrorLog logs/error_log_8888
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf
index 87c2973e5a..d94b245c25 100644
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf
@@ -64,7 +64,7 @@ SocketType ip_comm
 # WARNING! Do not tamper with this directive unless you are familiar with
 # EWSAPI.
 
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_responsecontrol mod_trace mod_range mod_head mod_include mod_dir mod_get mod_log mod_disk_log
+Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_responsecontrol mod_trace mod_range mod_head mod_dir mod_get mod_log mod_disk_log
 
 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/ssl.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/ssl.conf
index 8b8c57a98b..de49ceafd0 100644
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/ssl.conf
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/ssl.conf
@@ -1,7 +1,7 @@
 Port 8088
 #ServerName your.server.net
 SocketType ssl
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_include mod_dir mod_get mod_head mod_log mod_disk_log
+Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
 ServerAdmin [email protected]
 ServerRoot /var/tmp/server_root
 ErrorLog logs/error_log_8088
diff --git a/lib/inets/test/tftp_SUITE.erl b/lib/inets/test/tftp_SUITE.erl
index d29d210d7d..497a50e654 100644
--- a/lib/inets/test/tftp_SUITE.erl
+++ b/lib/inets/test/tftp_SUITE.erl
@@ -76,7 +76,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [simple, extra, reuse_connection, resend_client,
-     resend_server].
+     resend_server, large_file].
 
 groups() -> 
     [].
@@ -902,6 +902,41 @@ reuse_connection(Config) when is_list(Config) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Large file: transfer > 65535 blocks
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+large_file(doc) ->
+    ["Start the daemon and test transfer of files greater than 32M."];
+large_file(suite) ->
+    [];
+large_file(Config) when is_list(Config) ->
+    ?VERIFY(ok, application:start(inets)),
+
+    {Port, DaemonPid} = ?IGNORE(?START_DAEMON(0, [{debug, brief}])),
+
+    %% Read fail
+    RemoteFilename = "tftp_temporary_large_file_remote_test_file.txt",
+    LocalFilename = "tftp_temporary_large_file_local_test_file.txt",
+
+    {ok, FH} = file:open(LocalFilename, [write,exclusive]),
+    {ok, Size} = file:position(FH, {eof, 2*512*65535}),
+    ok = file:truncate(FH),
+    ?IGNORE(file:close(FH)),
+
+    %% Write and read
+    ?VERIFY({ok, Size}, tftp:write_file(RemoteFilename, LocalFilename, [{port, Port}])),
+    ?IGNORE(file:delete(LocalFilename)),
+    ?VERIFY({ok, Size}, tftp:read_file(RemoteFilename, LocalFilename, [{port, Port}])),
+
+    %% Cleanup
+    unlink(DaemonPid),
+    exit(DaemonPid, kill),
+    ?VERIFY(ok, file:delete(LocalFilename)),
+    ?VERIFY(ok, file:delete(RemoteFilename)),
+    ?VERIFY(ok, application:stop(inets)),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Goodies
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 2717f5b110..df2359e012 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 6.1
+INETS_VSN   = 6.2.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/jinterface/test/jinterface_SUITE.erl b/lib/jinterface/test/jinterface_SUITE.erl
index 6d34a21209..5c4618dcde 100644
--- a/lib/jinterface/test/jinterface_SUITE.erl
+++ b/lib/jinterface/test/jinterface_SUITE.erl
@@ -46,7 +46,6 @@
      ]).
 
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
 
 -define(debug,true).
 -ifdef(debug).
diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl
index c5f3198c21..9910334749 100644
--- a/lib/jinterface/test/nc_SUITE.erl
+++ b/lib/jinterface/test/nc_SUITE.erl
@@ -21,7 +21,6 @@
 
 
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
 
 -define(VERSION_MAGIC,       131).
 
diff --git a/lib/kernel/doc/src/app.xml b/lib/kernel/doc/src/app.xml
index d6d6167923..3740f1cff9 100644
--- a/lib/kernel/doc/src/app.xml
+++ b/lib/kernel/doc/src/app.xml
@@ -42,12 +42,12 @@
   </description>
 
   <section>
-    <title>FILE SYNTAX</title>
-    <p>The application resource file should be called
-      <c>Application.app</c> where <c>Application</c> is the name of
-      the application. The file should be located in the <c>ebin</c>
-      directory for the application.</p>
-    <p>It must contain one single Erlang term, which is called an
+    <title>File Syntax</title>
+    <p>The application resource file is to be called
+      <c>Application.app</c>, where <c>Application</c> is the
+      application name. The file is to be located in directory <c>ebin</c>
+      for the application.</p>
+    <p>The file must contain a single Erlang term, which is called an
       <em>application specification</em>:</p>
     <code type="none">
 {application, Application,
@@ -80,19 +80,26 @@ Env          [{Par,Val}]          []
 Start        {Module,StartArgs}   []
 Phases       [{Phase,PhaseArgs}]  undefined
 RTDeps       [ApplicationVersion] []
-  Module = Name = App = Par = Phase = atom()
-  Val = StartArgs = PhaseArgs = term()
-  ApplicationVersion = string()</code>
-    <p><c>Application</c> is the name of the application.</p>
+
+Module = Name = App = Par = Phase = atom()
+Val = StartArgs = PhaseArgs = term()
+ApplicationVersion = string()</code>
+    <taglist>
+      <tag><c>Application</c></tag>
+      <item>Application name.</item>
+    </taglist>
     <p>For the application controller, all keys are optional.
       The respective default values are used for any omitted keys.</p>
     <p>The functions in <c>systools</c> require more information. If
-      they are used, the following keys are mandatory:
-      <c>description</c>, <c>vsn</c>, <c>modules</c>, <c>registered</c>
-      and <c>applications</c>. The other keys are ignored by
-      <c>systools</c>.</p>
-      <warning><p>The <c>RTDeps</c> type was introduced in OTP 17.0 and
-      might be subject to changes during the OTP 17 release.</p></warning>
+      they are used, the following keys are mandatory:</p>
+    <list type="bulleted">
+      <item><c>description</c></item>
+      <item><c>vsn</c></item>
+      <item><c>modules</c></item>
+      <item><c>registered</c></item>
+      <item><c>applications</c></item>
+    </list>
+    <p>The other keys are ignored by <c>systools</c>.</p>
     <taglist>
       <tag><c>description</c></tag>
       <item>
@@ -104,7 +111,7 @@ RTDeps       [ApplicationVersion] []
       </item>
       <tag><c>vsn</c></tag>
       <item>
-        <p>The version of the application.</p>
+        <p>Version of the application.</p>
       </item>
       <tag><c>modules</c></tag>
       <item>
@@ -114,15 +121,14 @@ RTDeps       [ApplicationVersion] []
       </item>
       <tag><c>maxP</c></tag>
       <item>
-        <p><em>Deprecated - will be ignored</em>          <br></br>
-
-          The maximum number of processes allowed in the application.</p>
+        <p><em>Deprecated - is ignored</em></p>
+        <p>Maximum number of processes allowed in the application.</p>
       </item>
       <tag><c>maxT</c></tag>
       <item>
-        <p>The maximum time in milliseconds that the application is
-          allowed to run. After the specified time the application will
-          automatically terminate.</p>
+        <p>Maximum time, in milliseconds, that the application is
+          allowed to run. After the specified time, the application
+          terminates automatically.</p>
       </item>
       <tag><c>registered</c></tag>
       <item>
@@ -132,20 +138,20 @@ RTDeps       [ApplicationVersion] []
       </item>
       <tag><c>included_applications</c></tag>
       <item>
-        <p>All applications which are included by this application.
-          When this application is started, all included application
-          will automatically be loaded, but not started, by
-          the application controller. It is assumed that the topmost
+        <p>All applications included by this application.
+          When this application is started, all included applications
+          are loaded automatically, but not started, by
+          the application controller. It is assumed that the top-most
           supervisor of the included application is started by a
           supervisor of this application.</p>
       </item>
       <tag><c>applications</c></tag>
       <item>
-        <p>All applications which must be started before this
+        <p>All applications that must be started before this
           application is allowed to be started. <c>systools</c> uses
           this list to generate correct start scripts. Defaults to
-          the empty list, but note that all applications have
-          dependencies to (at least) <c>kernel</c> and <c>stdlib</c>.</p>
+          the empty list, but notice that all applications have
+          dependencies to (at least) <c>Kernel</c> and <c>STDLIB</c>.</p>
       </item>
       <tag><c>env</c></tag>
       <item>
@@ -153,78 +159,84 @@ RTDeps       [ApplicationVersion] []
           of a configuration parameter is retrieved by calling
           <c>application:get_env/1,2</c>. The values in the application
           resource file can be overridden by values in a configuration
-          file (see <c>config(4)</c>) or by command line flags (see
-          <c>erl(1)</c>).</p>
+          file (see <seealso marker="config"><c>config(4)</c></seealso>)
+          or by command-line flags (see
+          <seealso marker="erts:erl"><c>erts:erl(1)</c></seealso>).</p>
       </item>
       <tag><c>mod</c></tag>
       <item>
-        <p>Specifies the application callback module and a start
-          argument, see <c>application(3)</c>.</p>
-        <p>The <c>mod</c> key is necessary for an application
-          implemented as a supervision tree, or the application
-          controller will not know how to start it. The <c>mod</c> key
+        <p>Specifies the application callback module and a start argument, see
+          <seealso marker="application"><c>application(3)</c></seealso>.</p>
+        <p>Key <c>mod</c> is necessary for an application
+          implemented as a supervision tree, otherwise the application
+          controller does not know how to start it. <c>mod</c>
           can be omitted for applications without processes, typically
-          code libraries such as the application STDLIB.</p>
+          code libraries, for example, <c>STDLIB</c>.</p>
       </item>
       <tag><c>start_phases</c></tag>
       <item>
         <p>A list of start phases and corresponding start arguments for
           the application. If this key is present, the application
-          master will - in addition to the usual call to
-          <c>Module:start/2</c> - also call
+          master, in addition to the usual call to
+          <c>Module:start/2</c>, also calls
           <c>Module:start_phase(Phase,Type,PhaseArgs)</c> for each
-          start phase defined by the <c>start_phases</c> key, and only
-          after this extended start procedure will
-          <c>application:start(Application)</c> return.</p>
-        <p>Start phases may be used to synchronize startup of an
+          start phase defined by key <c>start_phases</c>. Only
+          after this extended start procedure,
+          <c>application:start(Application)</c> returns.</p>
+        <p>Start phases can be used to synchronize startup of an
           application and its included applications. In this case,
-          the <c>mod</c> key must be specified as:</p>
+          key <c>mod</c> must be specified as follows:</p>
         <code type="none">
 {mod, {application_starter,[Module,StartArgs]}}</code>
-        <p>The application master will then call <c>Module:start/2</c>
+        <p>The application master then calls <c>Module:start/2</c>
           for the primary application, followed by calls to
           <c>Module:start_phase/3</c> for each start phase (as defined
-          for the primary application) both for the primary application
-          and for each of its included application, for which the start
+          for the primary application), both for the primary application
+          and for each of its included applications, for which the start
           phase is defined.</p>
         <p>This implies that for an included application, the set of
           start phases must be a subset of the set of phases defined
-          for the primary application. Refer to <em>OTP Design Principles</em> for more information.</p>
+          for the primary application. For more information, see
+          <seealso marker="doc/design_principles:applications">OTP Design Principles</seealso>.
+        </p>
       </item>
-      <tag><marker id="runtime_dependencies"></marker><c>runtime_dependencies</c></tag>
-      <item><p>A list of application versions that the application
-      depends on. An example of such an application version is
-      <c>"kernel-3.0"</c>. Application versions specified as runtime
-      dependencies are minimum requirements. That is, a larger
-      application version than the one specified in the
-      dependency satisfies the requirement. For information on
-      how to compare application versions see
-      <seealso marker="doc/system_principles:versions">the
-      documentation of versions in the system principles
-      guide</seealso>. Note that that the application version
-      specifies a source code version. An additional indirect
-      requirement is that installed binary application of
-      the specified version has been built so that it is
-      compatible with the rest of the system.</p>
-      <p>Some dependencies might only be required in specific runtime
-      scenarios. In the case such optional dependencies exist, these are
-      specified and documented in the corresponding "App" documentation
-      of the specific application.</p>
-      <warning><p>The <c>runtime_dependencies</c> key was introduced in
-      OTP 17.0. The type of its value might be subject to changes during
-      the OTP 17 release.</p></warning>
-      <warning><p>All runtime dependencies specified in OTP applications
-      during the OTP 17 release may not be completely correct. This
-      is actively being worked on. Declared runtime dependencies in OTP
-      applications are expected to be correct in OTP 18.</p></warning>
+      <tag>
+        <marker id="runtime_dependencies"></marker>
+        <c>runtime_dependencies</c></tag>
+      <item>
+        <p>A list of application versions that the application
+          depends on. An example of such an application version is
+          <c>"kernel-3.0"</c>. Application versions specified as runtime
+          dependencies are minimum requirements. That is, a larger
+          application version than the one specified in the
+          dependency satisfies the requirement. For information about
+          how to compare application versions, see section
+          <seealso marker="doc/system_principles:versions">Versions</seealso>
+          in the System Principles User's Guide.</p>
+        <p>Notice that the application version
+          specifies a source code version. One more, indirect,
+          requirement is that the installed binary application of
+          the specified version is built so that it is
+          compatible with the rest of the system.</p>
+        <p>Some dependencies can only be required in specific runtime
+          scenarios. When such optional dependencies exist, these are
+          specified and documented in the corresponding "App" documentation
+          of the specific application.</p>
+	  <warning><p>The <c>runtime_dependencies</c> key was introduced in
+	  OTP 17.0. The type of its value might be subject to changes during
+	  the OTP 17 release.</p></warning>
+	  <warning><p>All runtime dependencies specified in OTP applications
+	  during the OTP 17 release may not be completely correct. This
+	  is actively being worked on. Declared runtime dependencies in OTP
+	  applications are expected to be correct in OTP 18.</p></warning>
       </item>
     </taglist>
   </section>
 
   <section>
-    <title>SEE ALSO</title>
-    <p><seealso marker="application">application(3)</seealso>,
-      systools(3)</p>
+    <title>See Also</title>
+    <p><seealso marker="application"><c>application(3)</c></seealso>,
+      <seealso marker="sasl:systools"><c>sasl:systools(3)</c></seealso></p>
   </section>
 </fileref>
 
diff --git a/lib/kernel/doc/src/application.xml b/lib/kernel/doc/src/application.xml
index 4d8e6ce94b..16de17c901 100644
--- a/lib/kernel/doc/src/application.xml
+++ b/lib/kernel/doc/src/application.xml
@@ -33,23 +33,25 @@
   <description>
     <p>In OTP, <em>application</em> denotes a component implementing
       some specific functionality, that can be started and stopped as a
-      unit, and which can be re-used in other systems as well. This
-      module interfaces the <em>application controller</em>, a process
-      started at every Erlang runtime system, and contains functions
-      for controlling applications (for example starting and stopping
+      unit, and that can be reused in other systems. This
+      module interacts with <em>application controller</em>, a process
+      started at every Erlang runtime system. This module contains functions
+      for controlling applications (for example, starting and stopping
       applications), and functions to access information about
-      applications (for example configuration parameters).</p>
-    <p>An application is defined by an <em>application specification</em>. The specification is normally located in an
-      <em>application resource file</em> called <c>Application.app</c>,
-      where <c>Application</c> is the name of the application. Refer to
-      <seealso marker="app">app(4)</seealso> for more information about
-      the application specification.</p>
+      applications (for example, configuration parameters).</p>
+    <p>An application is defined by an <em>application specification</em>.
+      The specification is normally located in an
+      <em>application resource file</em> named <c>Application.app</c>,
+      where <c>Application</c> is the application name. For details
+      about the application specification, see
+    <seealso marker="app"><c>app(4)</c></seealso>.</p>
     <p>This module can also be viewed as a behaviour for an application
       implemented according to the OTP design principles as a
       supervision tree. The definition of how to start and stop
-      the tree should be located in an <em>application callback module</em> exporting a pre-defined set of functions.</p>
-    <p>Refer to <seealso marker="doc/design_principles:des_princ">OTP Design Principles</seealso> for more information about
-      applications and behaviours.</p>
+      the tree is to be located in an <em>application callback module</em>,
+      exporting a predefined set of functions.</p>
+    <p>For details about applications and behaviours, see
+    <seealso marker="doc/design_principles:des_princ">OTP Design Principles</seealso>.</p>
   </description>
   <datatypes>
     <datatype>
@@ -59,7 +61,6 @@
       <name name="restart_type"/>
     </datatype>
     <datatype>
-      <!-- Parameterized opaque types are NYI: -->
       <name>tuple_of(T)</name>
       <desc><p><marker id="type-tuple_of"/>
         A tuple where the elements are of type <c>T</c>.</p></desc>
@@ -67,9 +68,37 @@
   </datatypes>
   <funcs>
     <func>
+        <name name="ensure_all_started" arity="1"/>
+        <name name="ensure_all_started" arity="2"/>
+        <fsummary>Load and start an application and its dependencies, recursively.</fsummary>
+        <desc>
+          <p>Equivalent to calling
+	  <seealso marker="#start/1"><c>start/1,2</c></seealso>
+          repeatedly on all dependencies that are not yet started for an application.</p>
+          <p>Returns <c>{ok, AppNames}</c> for a successful start or for an already started
+          application (which is, however, omitted from the <c>AppNames</c> list).</p>
+	  <p>The function reports <c>{error, {AppName,Reason}}</c> for errors, where
+	  <c>Reason</c> is any possible reason returned by
+	  <seealso marker="#start/1"><c>start/1,2</c></seealso>
+	  when starting a specific dependency.</p>
+	  <p>If an error occurs, the applications started by the function are stopped
+	  to bring the set of running applications back to its initial state.</p>
+        </desc>
+    </func>
+    <func>
+      <name name="ensure_started" arity="1"/>
+      <name name="ensure_started" arity="2"/>
+      <fsummary>Load and start an application.</fsummary>
+      <desc>
+	<p>Equivalent to
+	<seealso marker="#start/1"><c>start/1,2</c></seealso>
+	except it returns <c>ok</c> for already started applications.</p>
+      </desc>
+    </func>
+    <func>
       <name name="get_all_env" arity="0"/>
       <name name="get_all_env" arity="1"/>
-      <fsummary>Get the configuration parameters for an application</fsummary>
+      <fsummary>Get the configuration parameters for an application.</fsummary>
       <desc>
         <p>Returns the configuration parameters and their values for
           <c><anno>Application</anno></c>. If the argument is omitted, it defaults to
@@ -82,7 +111,7 @@
     <func>
       <name name="get_all_key" arity="0"/>
       <name name="get_all_key" arity="1"/>
-      <fsummary>Get the application specification keys</fsummary>
+      <fsummary>Get the application specification keys.</fsummary>
       <desc>
         <p>Returns the application specification keys and their values
           for <c><anno>Application</anno></c>. If the argument is omitted, it
@@ -96,7 +125,7 @@
     <func>
       <name name="get_application" arity="0"/>
       <name name="get_application" arity="1"/>
-      <fsummary>Get the name of an application containing a certain process or module</fsummary>
+      <fsummary>Get the name of an application containing a certain process or module.</fsummary>
       <desc>
         <p>Returns the name of the application to which the process
           <c><anno>Pid</anno></c> or the module <c><anno>Module</anno></c> belongs. Providing no
@@ -110,222 +139,212 @@
     <func>
       <name name="get_env" arity="1"/>
       <name name="get_env" arity="2"/>
-      <fsummary>Get the value of a configuration parameter</fsummary>
+      <fsummary>Get the value of a configuration parameter.</fsummary>
       <desc>
-        <p>Returns the value of the configuration parameter <c><anno>Par</anno></c>
+        <p>Returns the value of configuration parameter <c><anno>Par</anno></c>
           for <c><anno>Application</anno></c>. If the application argument is
           omitted, it defaults to the application of the calling
           process.</p>
-        <p>If the specified application is not loaded, or
-          the configuration parameter does not exist, or if the process
-          executing the call does not belong to any application,
-          the function returns <c>undefined</c>.</p>
+	  <p>Returns <c>undefined</c> if any of the following applies:</p>
+	  <list type="bulleted">
+	    <item>The specified application is not loaded.</item>
+	    <item>The configuration parameter does not exist.</item>
+	    <item>The process executing the call does not belong to any application.</item>
+	  </list>
       </desc>
     </func>
     <func>
       <name name="get_env" arity="3"/>
-      <fsummary>Get the value of a configuration parameter using a default</fsummary>
+      <fsummary>Get the value of a configuration parameter using a default.</fsummary>
       <desc>
-        <p>Works like <seealso marker="#get_env/2">get_env/2</seealso> but returns
-          <c><anno>Def</anno></c> value when configuration parameter
+        <p>Works like <seealso marker="#get_env/2"><c>get_env/2</c></seealso> but returns
+          value <c><anno>Def</anno></c> when configuration parameter
           <c><anno>Par</anno></c> does not exist.</p>
       </desc>
     </func>
     <func>
       <name name="get_key" arity="1"/>
       <name name="get_key" arity="2"/>
-      <fsummary>Get the value of an application specification key</fsummary>
+      <fsummary>Get the value of an application specification key.</fsummary>
       <desc>
         <p>Returns the value of the application specification key
           <c><anno>Key</anno></c> for <c><anno>Application</anno></c>. If the application
           argument is omitted, it defaults to the application of
           the calling process.</p>
-        <p>If the specified application is not loaded, or
-          the specification key does not exist, or if the process
-          executing the call does not belong to any application,
-          the function returns <c>undefined</c>.</p>
+	  <p>Returns <c>undefined</c> if any of the following applies:</p>
+	  <list type="bulleted">
+	    <item>The specified application is not loaded.</item>
+	    <item>The specification key does not exist.</item>
+	    <item>The process executing the call does not belong to any application.</item>
+	  </list>
+
       </desc>
     </func>
     <func>
       <name name="load" arity="1"/>
       <name name="load" arity="2"/>
-      <fsummary>Load an application</fsummary>
+      <fsummary>Load an application.</fsummary>
       <type name="application_spec"/>
       <type name="application_opt"/>
       <desc>
         <p>Loads the application specification for an application into
-          the application controller. It will also load the application
-          specifications for any included applications. Note that
-          the function does not load the actual Erlang object code.</p>
-        <p>The application can be given by its name <c><anno>Application</anno></c>.
-          In this case the application controller will search the code
+          the application controller. It also loads the application
+          specifications for any included applications. Notice that
+          the function does not load the Erlang object code.</p>
+        <p>The application can be specified by its name <c><anno>Application</anno></c>.
+          In this case, the application controller searches the code
           path for the application resource file <c><anno>Application</anno>.app</c>
-          and load the specification it contains.</p>
-        <p>The application specification can also be given directly as a
-          tuple <c><anno>AppSpec</anno></c>. This tuple should have the format and
-          contents as described in <c>app(4)</c>.</p>
+          and loads the specification it contains.</p>
+        <p>The application specification can also be specified directly as a
+          tuple <c><anno>AppSpec</anno></c>, having the format and
+          contents as described in
+	<seealso marker="app"><c>app(4)</c></seealso>.</p>
         <p>If <c><anno>Distributed</anno> == {<anno>Application</anno>,[<anno>Time</anno>,]<anno>Nodes</anno>}</c>,
-          the application will be distributed. The argument overrides
-          the value for the application in the Kernel configuration
+          the application becomes distributed. The argument overrides
+          the value for the application in the <c>Kernel</c> configuration
           parameter <c>distributed</c>. <c><anno>Application</anno></c> must be
-          the name of the application (same as in the first argument).
-          If a node crashes and <c><anno>Time</anno></c> has been specified, then
-          the application controller will wait for <c><anno>Time</anno></c>
+          the application name (same as in the first argument).
+          If a node crashes and <c><anno>Time</anno></c> is specified,
+          the application controller waits for <c><anno>Time</anno></c>
           milliseconds before attempting to restart the application on
-          another node. If <c><anno>Time</anno></c> is not specified, it will
-          default to 0 and the application will be restarted
+          another node. If <c><anno>Time</anno></c> is not specified, it
+          defaults to <c>0</c> and the application is restarted
           immediately.</p>
         <p><c><anno>Nodes</anno></c> is a list of node names where the application
-          may run, in priority from left to right. Node names can be
+          can run, in priority from left to right. Node names can be
           grouped using tuples to indicate that they have the same
-          priority. Example:</p>
+          priority.</p>
+	  <p><em>Example:</em></p>
         <code type="none">
 Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
-        <p>This means that the application should preferably be started
+        <p>This means that the application is preferably to be started
           at <c>cp1@cave</c>. If <c>cp1@cave</c> is down,
-          the application should be started at either <c>cp2@cave</c>
+          the application is to be started at <c>cp2@cave</c>
           or <c>cp3@cave</c>.</p>
         <p>If <c>Distributed == default</c>, the value for
-          the application in the Kernel configuration parameter
-          <c>distributed</c> will be used.</p>
+          the application in the <c>Kernel</c> configuration parameter
+          <c>distributed</c> is used.</p>
       </desc>
     </func>
     <func>
       <name name="loaded_applications" arity="0"/>
-      <fsummary>Get the currently loaded applications</fsummary>
+      <fsummary>Get the currently loaded applications.</fsummary>
       <desc>
-        <p>Returns a list with information about the applications which
-          have been loaded using <c>load/1,2</c>, also included
-          applications. <c><anno>Application</anno></c> is the application name.
-          <c><anno>Description</anno></c> and <c><anno>Vsn</anno></c> are the values of its
-          <c>description</c> and <c>vsn</c> application specification
+        <p>Returns a list with information about the applications, and included
+	  applications, which are loaded using <c>load/1,2</c>.
+          <c><anno>Application</anno></c> is the application name.
+          <c><anno>Description</anno></c> and <c><anno>Vsn</anno></c> are the values
+	  of their <c>description</c> and <c>vsn</c> application specification
           keys, respectively.</p>
       </desc>
     </func>
     <func>
       <name name="permit" arity="2"/>
-      <fsummary>Change an application's permission to run on a node.</fsummary>
+      <fsummary>Change the permission for an application to run at a node.</fsummary>
       <desc>
         <p>Changes the permission for <c><anno>Application</anno></c> to run at
-          the current node. The application must have been loaded using
+          the current node. The application must be loaded using
           <c>load/1,2</c> for the function to have effect.</p>
         <p>If the permission of a loaded, but not started, application
-          is set to <c>false</c>, <c>start</c> will return <c>ok</c> but
-          the application will not be started until the permission is
+          is set to <c>false</c>, <c>start</c> returns <c>ok</c> but
+          the application is not started until the permission is
           set to <c>true</c>.</p>
         <p>If the permission of a running application is set to
-          <c>false</c>, the application will be stopped. If
-          the permission later is set to <c>true</c>, it will be
+          <c>false</c>, the application is stopped. If
+          the permission later is set to <c>true</c>, it is
           restarted.</p>
         <p>If the application is distributed, setting the permission to
           <c>false</c> means that the application will be started at, or
           moved to, another node according to how its distribution is
-          configured (see <c>load/2</c> above).</p>
+          configured
+	(see <seealso marker="#load/2"><c>load/2</c></seealso>).</p>
         <p>The function does not return until the application is
-          started, stopped or successfully moved to another node.
-          However, in some cases where permission is set to <c>true</c>
-          the function may return <c>ok</c> even though the application
-          itself has not started. This is true when an application
-          cannot start because it has dependencies to other
-          applications which have not yet been started. When they have
-          been started, <c>Application</c> will be started as well.</p>
+          started, stopped, or successfully moved to another node.
+          However, in some cases where permission is set to <c>true</c>,
+          the function returns <c>ok</c> even though the application
+          is not started. This is true when an application
+          cannot start because of dependencies to other
+          applications that are not yet started. When they are
+          started, <c>Application</c> is started as well.</p>
         <p>By default, all applications are loaded with permission
-          <c>true</c> on all nodes. The permission is configurable by
-          using the Kernel configuration parameter <c>permissions</c>.</p>
+          <c>true</c> on all nodes. The permission can be configured
+          using the <c>Kernel</c> configuration parameter <c>permissions</c>.</p>
       </desc>
     </func>
     <func>
       <name name="set_env" arity="3"/>
       <name name="set_env" arity="4"/>
-      <fsummary>Set the value of a configuration parameter</fsummary>
+      <fsummary>Set the value of a configuration parameter.</fsummary>
       <desc>
-        <p>Sets the value of the configuration parameter <c><anno>Par</anno></c> for
+        <p>Sets the value of configuration parameter <c><anno>Par</anno></c> for
           <c><anno>Application</anno></c>.</p>
-        <p><c>set_env/4</c> uses the standard <c>gen_server</c> timeout
-          value (5000 ms). The <c>timeout</c> option can be provided
-          if another timeout value is useful, for example, in situations
+        <p><c>set_env/4</c> uses the standard <c>gen_server</c> time-out
+          value (5000 ms). Option <c>timeout</c> can be specified
+          if another time-out value is useful, for example, in situations
           where the application controller is heavily loaded.</p>
         <p>If <c>set_env/4</c> is called before the application is loaded,
-          the application environment values specified in the <c>Application.app</c>
-          file will override the ones previously set. This is also true for application
+          the application environment values specified in file <c>Application.app</c>
+          override the ones previously set. This is also true for application
           reloads.</p>
-        <p>The <c>persistent</c> option can be set to <c>true</c>
-          when there is a need to guarantee parameters set with <c>set_env/4</c>
-          will not be overridden by the ones defined in the application resource
-          file on load. This means persistent values will stick after the application
+        <p>Option <c>persistent</c> can be set to <c>true</c>
+          to guarantee that parameters set with <c>set_env/4</c>
+          are not overridden by those defined in the application resource
+          file on load. This means that persistent values will stick after the application
           is loaded and also on application reload.</p>
         <warning>
-          <p>Use this function only if you know what you are doing, 
-            that is, on your own applications. It is very application
-            and configuration parameter dependent when and how often
-            the value is read by the application, and careless use 
-            of this function may put the application in a 
-            weird, inconsistent, and malfunctioning state. </p>
+          <p>Use this function only if you know what you are doing,
+            that is, on your own applications. It is very
+	    application-dependent and
+	    configuration parameter-dependent when and how often
+            the value is read by the application. Careless use
+            of this function can put the application in a
+            weird, inconsistent, and malfunctioning state.</p>
         </warning>
       </desc>
     </func>
     <func>
-      <name name="ensure_started" arity="1"/>
-      <name name="ensure_started" arity="2"/>
-      <fsummary>Load and start an application</fsummary>
-      <desc>
-	<p>Equivalent to <seealso marker="#start/2"><c>application:start/1,2</c></seealso> except
-	it returns <c>ok</c> for already started applications.</p>
-      </desc>
-    </func>
-    <func>
-        <name name="ensure_all_started" arity="1"/>
-        <name name="ensure_all_started" arity="2"/>
-        <fsummary>Load and start an application and its dependencies, recursively</fsummary>
-        <desc>
-            <p>Equivalent to calling <seealso marker="#start/2"><c>application:start/1,2</c></seealso>
-               repeatedly on all dependencies that have not yet been started for an application.
-               The function returns <c>{ok, AppNames}</c> for a successful start or for an already started
-               application (which are however omitted from the <c>AppNames</c> list), and reports
-               <c>{error, {AppName,Reason}}</c> for errors, where <c>Reason</c> is any possible reason
-               returned by <seealso marker="#start/2"><c>application:start/1,2</c></seealso> when starting a
-               specific dependency. In case of an error, the applications that were started by the
-               function are stopped to bring the set of running applications back to its initial state.</p>
-        </desc>
-    </func>
-    <func>
       <name name="start" arity="1"/>
       <name name="start" arity="2"/>
-      <fsummary>Load and start an application</fsummary>
-      <desc>
+      <fsummary>Load and start an application.</fsummary>
+       <desc>
         <p>Starts <c><anno>Application</anno></c>. If it is not loaded,
-          the application controller will first load it using
-          <c>load/1</c>. It will make sure any included applications
-          are loaded, but will not start them. That is assumed to be
+          the application controller first loads it using
+          <c>load/1</c>. It ensures that any included applications
+          are loaded, but does not start them. That is assumed to be
           taken care of in the code for <c><anno>Application</anno></c>.</p>
         <p>The application controller checks the value of
           the application specification key <c>applications</c>, to
-          ensure that all applications that should be started before
-          this application are running. If not,
+          ensure that all applications needed to be started before
+          this application are running. Otherwise,
           <c>{error,{not_started,App}}</c> is returned, where <c>App</c>
           is the name of the missing application.</p>
-        <p>The application controller then creates an <em>application master</em> for the application. The application master is
+        <p>The application controller then creates an <em>application master</em>
+	  for the application. The application master is
           the group leader of all the processes in the application.
           The application master starts the application by calling
           the application callback function <c>Module:start/2</c> as
           defined by the application specification key <c>mod</c>.</p>
-        <p>The <c><anno>Type</anno></c> argument specifies the type of
+        <p>Argument <c><anno>Type</anno></c> specifies the type of
           the application. If omitted, it defaults to <c>temporary</c>.</p>
         <list type="bulleted">
           <item>If a permanent application terminates, all other
            applications and the entire Erlang node are also terminated.</item>
-          <item>If a transient application terminates with <c>Reason == normal</c>, this is reported but no other applications are
-           terminated. If a transient application terminates
-           abnormally, all other applications and the entire Erlang
-           node are also terminated.</item>
+          <item>
+	    <list type="bulleted">
+	      <item>If a transient application terminates with <c>Reason == normal</c>,
+	      this is reported but no other applications are terminated.</item>
+	      <item>If a transient application terminates abnormally, all other
+	      applications and the entire Erlang node are also terminated.</item>
+	    </list>
+	   </item>
           <item>If a temporary application terminates, this is reported
            but no other applications are terminated.</item>
         </list>
-        <p>Note that it is always possible to stop an application
+        <p>Notice that an application can always be stopped
           explicitly by calling <c>stop/1</c>. Regardless of the type of
-          the application, no other applications will be affected.</p>
-        <p>Note also that the transient type is of little practical use,
-          since when a supervision tree terminates, the reason is set to
+          the application, no other applications are affected.</p>
+        <p>Notice also that the transient type is of little practical use,
+          because when a supervision tree terminates, the reason is set to
           <c>shutdown</c>, not <c>normal</c>.</p>
       </desc>
     </func>
@@ -334,13 +353,13 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       <fsummary>Get the start type of an ongoing application startup.</fsummary>
       <desc>
         <p>This function is intended to be called by a process belonging
-          to an application, when the application is being started, to
-          determine the start type which is either <c><anno>StartType</anno></c> or
+          to an application, when the application is started, to
+          determine the start type, which is <c><anno>StartType</anno></c> or
           <c>local</c>.</p>
-        <p>See <seealso marker="#start_type"><c>Module:start/2</c></seealso> for a description of
-          <c><anno>StartType</anno></c>.</p>
-        <p><c>local</c> is returned if only parts of the application is
-          being restarted (by a supervisor), or if the function is
+        <p>For a description of <c><anno>StartType</anno></c>, see
+	  <seealso marker="#start_type"><c>Module:start/2</c></seealso>.</p>
+        <p><c>local</c> is returned if only parts of the application are
+          restarted (by a supervisor), or if the function is
           called outside a startup.</p>
         <p>If the process executing the call does not belong to any
           application, the function returns <c>undefined</c>.</p>
@@ -348,103 +367,106 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
     </func>
     <func>
       <name name="stop" arity="1"/>
-      <fsummary>Stop an application</fsummary>
+      <fsummary>Stop an application.</fsummary>
       <desc>
         <p>Stops <c><anno>Application</anno></c>. The application master calls
           <c>Module:prep_stop/1</c>, if such a function is defined, and
-          then tells the top supervisor of the application to shutdown
-          (see <c>supervisor(3)</c>). This means that the entire
+          then tells the top supervisor of the application to shut down
+          (see <seealso marker="stdlib:supervisor"><c>supervisor(3)</c></seealso>).
+	  This means that the entire
           supervision tree, including included applications, is
           terminated in reversed start order. After the shutdown,
           the application master calls <c>Module:stop/1</c>.
           <c>Module</c> is the callback module as defined by
           the application specification key <c>mod</c>.</p>
-        <p>Last, the application master itself terminates. Note that all
-          processes with the application master as group leader, i.e.
+        <p>Last, the application master terminates. Notice that all
+          processes with the application master as group leader, that is,
           processes spawned from a process belonging to the application,
-          thus are terminated as well.</p>
+          are also terminated.</p>
         <p>When stopped, the application is still loaded.</p>
-        <p>In order to stop a distributed application, <c>stop/1</c>
-          has to be called on all nodes where it can execute (that is,
+        <p>To stop a distributed application, <c>stop/1</c>
+          must be called on all nodes where it can execute (that is,
           on all nodes where it has been started). The call to
           <c>stop/1</c> on the node where the application currently
-          executes will stop its execution. The application will not be
-          moved between nodes due to <c>stop/1</c> being called on
+          executes stops its execution. The application is not
+          moved between nodes, as <c>stop/1</c> is called on
           the node where the application currently executes before
           <c>stop/1</c> is called on the other nodes.</p>
       </desc>
     </func>
     <func>
       <name name="takeover" arity="2"/>
-      <fsummary>Take over a distributed application</fsummary>
+      <fsummary>Take over a distributed application.</fsummary>
       <desc>
-        <p>Performs a takeover of the distributed application
+        <p>Takes over the distributed application
           <c><anno>Application</anno></c>, which executes at another node
           <c>Node</c>. At the current node, the application is
           restarted by calling
           <c>Module:start({takeover,Node},StartArgs)</c>. <c>Module</c>
           and <c>StartArgs</c> are retrieved from the loaded application
           specification. The application at the other node is not
-          stopped until the startup is completed, i.e. when
+          stopped until the startup is completed, that is, when
           <c>Module:start/2</c> and any calls to
           <c>Module:start_phase/3</c> have returned.</p>
-        <p>Thus two instances of the application will run simultaneously
-          during the takeover, which makes it possible to transfer data
-          from the old to the new instance. If this is not acceptable
-          behavior, parts of the old instance may be shut down when
-          the new instance is started. Note that the application may
-          not be stopped entirely however, at least the top supervisor
+        <p>Thus, two instances of the application run simultaneously
+          during the takeover, so that data can be transferred
+          from the old to the new instance. If this is not an acceptable
+          behavior, parts of the old instance can be shut down when
+          the new instance is started. However, the application cannot
+          be stopped entirely, at least the top supervisor
           must remain alive.</p>
-        <p>See <c>start/1,2</c> for a description of <c>Type</c>.</p>
+        <p>For a description of <c>Type</c>, see
+	<seealso marker="#start/1"><c>start/1,2</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="unload" arity="1"/>
-      <fsummary>Unload an application</fsummary>
+      <fsummary>Unload an application.</fsummary>
       <desc>
         <p>Unloads the application specification for <c><anno>Application</anno></c>
-          from the application controller. It will also unload
+          from the application controller. It also unloads
           the application specifications for any included applications.
-          Note that the function does not purge the actual Erlang
+          Notice that the function does not purge the Erlang
           object code.</p>
       </desc>
     </func>
     <func>
       <name name="unset_env" arity="2"/>
       <name name="unset_env" arity="3"/>
-      <fsummary>Unset the value of a configuration parameter</fsummary>
+      <fsummary>Unset the value of a configuration parameter.</fsummary>
       <desc>
         <p>Removes the configuration parameter <c><anno>Par</anno></c> and its value
           for <c><anno>Application</anno></c>.</p>
         <p><c>unset_env/2</c> uses the standard <c>gen_server</c>
-          timeout value (5000 ms). The <c>timeout</c> option can be
-          provided if another timeout value is useful, for example, in
+          time-out value (5000 ms). Option <c>timeout</c> can be
+          specified if another time-out value is useful, for example, in
           situations where the application controller is heavily loaded.</p>
         <p><c>unset_env/3</c> also allows the persistent option to be passed
-          (see <c>set_env/4</c> above).</p>
-        <warning>
-          <p>Use this function only if you know what you are doing, 
-            that is, on your own applications. It is very application
-            and configuration parameter dependent when and how often
-            the value is read by the application, and careless use 
-            of this function may put the application in a 
-            weird, inconsistent, and malfunctioning state. </p>
+          (see <seealso marker="#set_env/4"><c>set_env/4</c></seealso>).</p>
+	<warning>
+          <p>Use this function only if you know what you are doing,
+            that is, on your own applications. It is very
+	    application-dependent and configuration
+	    parameter-dependent when and how often
+            the value is read by the application. Careless use
+            of this function can put the application in a
+            weird, inconsistent, and malfunctioning state.</p>
         </warning>
       </desc>
     </func>
     <func>
       <name name="which_applications" arity="0"/>
       <name name="which_applications" arity="1"/>
-      <fsummary>Get the currently running applications</fsummary>
+      <fsummary>Get the currently running applications.</fsummary>
       <desc>
-        <p>Returns a list with information about the applications which
+        <p>Returns a list with information about the applications that
           are currently running. <c><anno>Application</anno></c> is the application
-          name. <c><anno>Description</anno></c> and <c><anno>Vsn</anno></c> are the values of its
-          <c>description</c> and <c>vsn</c> application specification
+          name. <c><anno>Description</anno></c> and <c><anno>Vsn</anno></c> are the
+	  values of their <c>description</c> and <c>vsn</c> application specification
           keys, respectively.</p>
         <p><c>which_applications/0</c> uses the standard
-          <c>gen_server</c> timeout value (5000 ms). A <c><anno>Timeout</anno></c>
-          argument can be provided if another timeout value is useful,
+          <c>gen_server</c> time-out value (5000 ms). A <c><anno>Timeout</anno></c>
+          argument can be specified if another time-out value is useful,
           for example, in situations where the application controller
           is heavily loaded.</p>
       </desc>
@@ -452,81 +474,81 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
   </funcs>
 
   <section>
-    <title>CALLBACK MODULE</title>
-    <p>The following functions should be exported from an
+    <title>Callback Module</title>
+    <p>The following functions are to be exported from an
       <c>application</c> callback module.</p>
   </section>
   <funcs>
     <func>
       <name>Module:start(StartType, StartArgs) -> {ok, Pid} | {ok, Pid, State} | {error, Reason}</name>
-      <fsummary>Start an application</fsummary>
+      <fsummary>Start an application.</fsummary>
       <type>
-        <v>StartType = <seealso marker="#type-start_type">start_type()</seealso></v>
+        <v>StartType = <seealso marker="#type-start_type"><c>start_type()</c></seealso></v>
         <v>StartArgs = term()</v>
         <v>Pid = pid()</v>
         <v>State = term()</v>
       </type>
       <desc>
         <p>This function is called whenever an application is started
-          using <c>application:start/1,2</c>, and should start
+          using <c>start/1,2</c>, and is to start
           the processes of the application. If the application is
           structured according to the OTP design principles as a
           supervision tree, this means starting the top supervisor of
           the tree.</p>
         <p><marker id="start_type"/><c>StartType</c> defines the type of start:</p>
         <list type="bulleted">
-          <item><c>normal</c> if it's a normal startup.</item>
+          <item><c>normal</c> if it is a normal startup.</item>
           <item><c>normal</c> also if the application is distributed and
-           started at the current node due to a failover from another
+           started at the current node because of a failover from another
            node, and the application specification key <c>start_phases == undefined</c>.</item>
           <item><c>{takeover,Node}</c> if the application is
-           distributed and started at the current node due to a
+           distributed and started at the current node because of a
            takeover from <c>Node</c>, either because
-          <c>application:takeover/2</c> has been called or because
+          <c>takeover/2</c> has been called or because
            the current node has higher priority than <c>Node</c>.</item>
           <item><c>{failover,Node}</c> if the application is
-           distributed and started at the current node due to a
+           distributed and started at the current node because of a
            failover from <c>Node</c>, and the application
            specification key <c>start_phases /= undefined</c>.</item>
         </list>
         <p><c>StartArgs</c> is the <c>StartArgs</c> argument defined by
           the application specification key <c>mod</c>.</p>
-        <p>The function should return <c>{ok,Pid}</c> or
-          <c>{ok,Pid,State}</c> where <c>Pid</c> is the pid of the top
+        <p>The function is to return <c>{ok,Pid}</c> or
+          <c>{ok,Pid,State}</c>, where <c>Pid</c> is the pid of the top
           supervisor and <c>State</c> is any term. If omitted,
-          <c>State</c> defaults to <c>[]</c>. If later the application
-          is stopped, <c>State</c> is passed to
+          <c>State</c> defaults to <c>[]</c>. If the application
+          is stopped later, <c>State</c> is passed to
           <c>Module:prep_stop/1</c>.</p>
       </desc>
     </func>
     <func>
       <name>Module:start_phase(Phase, StartType, PhaseArgs) -> ok | {error, Reason}</name>
-      <fsummary>Extended start of an application</fsummary>
+      <fsummary>Extended start of an application.</fsummary>
       <type>
         <v>Phase = atom()</v>
-        <v>StartType = <seealso marker="#type-start_type">start_type()</seealso></v>
+        <v>StartType = <seealso marker="#type-start_type"><c>start_type()</c></seealso></v>
         <v>PhaseArgs = term()</v>
         <v>Pid = pid()</v>
         <v>State = state()</v>
       </type>
       <desc>
-        <p>This function is used to start an application with included
-          applications, when there is a need for synchronization between
+        <p>Starts an application with included
+          applications, when synchronization is needed between
           processes in the different applications during startup.</p>
-        <p>The start phases is defined by the application specification
+        <p>The start phases are defined by the application specification
           key <c>start_phases == [{Phase,PhaseArgs}]</c>. For included
           applications, the set of phases must be a subset of the set of
           phases defined for the including application.</p>
         <p>The function is called for each start phase (as defined for
           the primary application) for the primary application and all
           included applications, for which the start phase is defined.</p>
-        <p>See <c>Module:start/2</c> for a description of
-          <c>StartType</c>.</p>
+        <p>For a description of <c>StartType</c>, see
+	<seealso marker="Module:start/2"><c>Module:start/2</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name>Module:prep_stop(State) -> NewState</name>
-      <fsummary>Prepare an application for termination</fsummary>
+      <fsummary>Prepare an application for termination.</fsummary>
       <type>
         <v>State = NewState = term()</v>
       </type>
@@ -536,28 +558,26 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
           the application.</p>
         <p><c>State</c> is the state returned from
           <c>Module:start/2</c>, or <c>[]</c> if no state was returned.
-          <c>NewState</c> is any term and will be passed to
+          <c>NewState</c> is any term and is passed to
           <c>Module:stop/1</c>.</p>
         <p>The function is optional. If it is not defined, the processes
-          will be terminated and then <c>Module:stop(State)</c> is
-          called.</p>
+          are terminated and then <c>Module:stop(State)</c> is called.</p>
       </desc>
     </func>
     <func>
       <name>Module:stop(State)</name>
-      <fsummary>Clean up after termination of an application</fsummary>
+      <fsummary>Clean up after termination of an application.</fsummary>
       <type>
         <v>State = term()</v>
       </type>
       <desc>
         <p>This function is called whenever an application has stopped.
           It is intended to be the opposite of <c>Module:start/2</c>
-          and should do any necessary cleaning up. The return value is
+          and is to do any necessary cleaning up. The return value is
           ignored.</p>
-        <p><c>State</c> is the return value of
-          <c>Module:prep_stop/1</c>, if such a function exists.
-          Otherwise <c>State</c> is taken from the return value of
-          <c>Module:start/2</c>.</p>
+        <p><c>State</c> is the return value of <c>Module:prep_stop/1</c>,
+	  if such a function exists. Otherwise <c>State</c> is taken from
+	  the return value of <c>Module:start/2</c>.</p>
       </desc>
     </func>
     <func>
@@ -572,19 +592,18 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </type>
       <desc>
         <p>This function is called by an application after a code
-          replacement, if there are any changes to the configuration
-          parameters.</p>
-        <p><c>Changed</c> is a list of parameter-value tuples with all
-          configuration parameters with changed values, <c>New</c> is
-          a list of parameter-value tuples with all configuration
-          parameters that have been added, and <c>Removed</c> is a list
-          of all parameters that have been removed.</p>
+          replacement, if the configuration parameters have changed.</p>
+        <p><c>Changed</c> is a list of parameter-value tuples including all
+          configuration parameters with changed values.</p>
+	<p><c>New</c> is a list of parameter-value tuples including all
+	  added configuration parameters.</p>
+	<p><c>Removed</c> is a list of all removed parameters.</p>
       </desc>
     </func>
   </funcs>
 
   <section>
-    <title>SEE ALSO</title>
+    <title>See Also</title>
     <p><seealso marker="doc/design_principles:des_princ">OTP Design Principles</seealso>,
       <seealso marker="kernel_app">kernel(6)</seealso>,
       <seealso marker="app">app(4)</seealso></p>
diff --git a/lib/kernel/doc/src/auth.xml b/lib/kernel/doc/src/auth.xml
index 71b1863e96..dcd784dcfd 100644
--- a/lib/kernel/doc/src/auth.xml
+++ b/lib/kernel/doc/src/auth.xml
@@ -29,7 +29,7 @@
     <rev></rev>
   </header>
   <module>auth</module>
-  <modulesummary>Erlang Network Authentication Server</modulesummary>
+  <modulesummary>Erlang network authentication server.</modulesummary>
   <description>
     <p>This module is deprecated. For a description of the Magic
       Cookie system, refer to
@@ -42,60 +42,60 @@
   </datatypes>
   <funcs>
     <func>
-      <name name="is_auth" arity="1"/>
-      <fsummary>Status of communication authorization (deprecated)</fsummary>
-      <desc>
-        <p>Returns <c>yes</c> if communication with <c><anno>Node</anno></c> is
-          authorized. Note that a connection to <c><anno>Node</anno></c> will
-          be established in this case. Returns <c>no</c> if <c><anno>Node</anno></c>
-          does not exist or communication is not authorized (it has
-          another cookie than <c>auth</c> thinks it has).</p>
-        <p>Use <seealso marker="net_adm#ping/1">net_adm:ping(<c><anno>Node</anno></c>)</seealso>
-          instead.</p>
-      </desc>
-    </func>
-    <func>
       <name name="cookie" arity="0"/>
-      <fsummary>Magic cookie for local node (deprecated)</fsummary>
+      <fsummary>Magic cookie for local node (deprecated).</fsummary>
       <desc>
         <p>Use
-          <seealso marker="erts:erlang#erlang:get_cookie/0">erlang:get_cookie()</seealso>
-          instead.</p>
+          <seealso marker="erts:erlang#erlang:get_cookie/0"><c>erlang:get_cookie()</c></seealso>
+          in <c>ERTS</c> instead.</p>
       </desc>
     </func>
     <func>
       <name name="cookie" arity="1"/>
-      <fsummary>Set the magic for the local node (deprecated)</fsummary>
+      <fsummary>Set the magic for the local node (deprecated).</fsummary>
       <type_desc variable="TheCookie">
-        The cookie may also be given as a list with a single atom element.
+        The cookie can also be specified as a list with a single atom element.
       </type_desc>
       <desc>
         <p>Use
-          <seealso marker="erts:erlang#erlang:set_cookie/2">erlang:set_cookie(node(), <c><anno>Cookie</anno></c>)</seealso>
+          <seealso marker="erts:erlang#erlang:set_cookie/2"><c>erlang:set_cookie(node(), <anno>Cookie</anno>)</c>
+	  in <c>ERTS</c></seealso> instead.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="is_auth" arity="1"/>
+      <fsummary>Status of communication authorization (deprecated).</fsummary>
+      <desc>
+        <p>Returns <c>yes</c> if communication with <c><anno>Node</anno></c> is
+          authorized. Notice that a connection to <c><anno>Node</anno></c>
+          is established in this case. Returns <c>no</c> if <c><anno>Node</anno></c>
+          does not exist or communication is not authorized (it has
+          another cookie than <c>auth</c> thinks it has).</p>
+        <p>Use <seealso marker="net_adm#ping/1"><c>net_adm:ping(<anno>Node</anno>)</c></seealso>
           instead.</p>
       </desc>
     </func>
     <func>
       <name>node_cookie([Node, Cookie]) -> yes | no</name>
-      <fsummary>Set the magic cookie for a node and verify authorization (deprecated)</fsummary>
+      <fsummary>Set the magic cookie for a node and verify authorization (deprecated).</fsummary>
       <type>
         <v>Node = node()</v>
-        <v>Cookie = <seealso marker="#type-cookie">cookie()</seealso></v>
+        <v>Cookie = <seealso marker="#type-cookie"><c>cookie()</c></seealso></v>
       </type>
       <desc>
         <p>Equivalent to
-          <seealso marker="#node_cookie/2">node_cookie(Node, Cookie)</seealso>.</p>
+          <seealso marker="#node_cookie/2"><c>node_cookie(Node, Cookie)</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="node_cookie" arity="2"/>
-      <fsummary>Set the magic cookie for a node and verify authorization (deprecated)</fsummary>
+      <fsummary>Set the magic cookie for a node and verify authorization (deprecated).</fsummary>
       <desc>
-        <p>Sets the magic cookie of <c><anno>Node</anno></c> to <c><anno>Cookie</anno></c>, and
-          verifies the status of the authorization.
+        <p>Sets the magic cookie of <c><anno>Node</anno></c> to
+	<c><anno>Cookie</anno></c> and verifies the status of the authorization.
           Equivalent to calling
-          <seealso marker="erts:erlang#erlang:set_cookie/2">erlang:set_cookie(<c><anno>Node</anno></c>, <c><anno>Cookie</anno>)</c></seealso>, followed by
-          <seealso marker="#is_auth/1">auth:is_auth(<c><anno>Node</anno></c>)</seealso>.</p>
+          <seealso marker="erts:erlang#erlang:set_cookie/2"><c>erlang:set_cookie(<anno>Node</anno>, <anno>Cookie</anno>)</c></seealso>, followed by
+          <seealso marker="#is_auth/1"><c>auth:is_auth(<anno>Node</anno>)</c></seealso>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index eb0f4b7a06..7598b22d79 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -29,264 +29,282 @@
     <rev></rev>
   </header>
   <module>code</module>
-  <modulesummary>Erlang Code Server</modulesummary>
+  <modulesummary>Erlang code server.</modulesummary>
   <description>
     <p>This module contains the interface to the Erlang
       <em>code server</em>, which deals with the loading of compiled
       code into a running Erlang runtime system.</p>
-    <p>The runtime system can be started in either <em>embedded</em> or
-      <em>interactive</em> mode. Which one is decided by the command
-      line flag <c>-mode</c>.</p>
+    <p>The runtime system can be started in <em>embedded</em> or
+      <em>interactive</em> mode. Which one is decided by command-line
+      flag <c>-mode</c>:</p>
     <pre>
 % <input>erl -mode interactive</input></pre>
-    <p>Default mode is <c>interactive</c>.</p>
+    <p>The modes are as follows:</p>
     <list type="bulleted">
       <item>
-        <p>In embedded mode, all code is loaded during system start-up
+        <p>In embedded mode, all code is loaded during system startup
           according to the boot script. (Code can also be loaded later
           by explicitly ordering the code server to do so).</p>
       </item>
       <item>
-        <p>In interactive mode, only some code is loaded during system
-          startup-up, basically the modules needed by the runtime
-          system itself. Other code is dynamically loaded when first
+        <p>In interactive mode, which is default, only some code is loaded
+	  during system startup, basically the modules needed by the runtime
+          system. Other code is dynamically loaded when first
           referenced. When a call to a function in a certain module is
           made, and the module is not loaded, the code server searches
           for and tries to load the module.</p>
       </item>
     </list>
-    <p>To prevent accidentally reloading modules affecting the Erlang
-      runtime system itself, the <c>kernel</c>, <c>stdlib</c> and
-      <c>compiler</c> directories are considered <em>sticky</em>. This
+    <p>To prevent accidentally reloading of modules affecting the Erlang
+      runtime system, directories <c>kernel</c>, <c>stdlib</c>,
+      and <c>compiler</c> are considered <em>sticky</em>. This
       means that the system issues a warning and rejects the request if
       a user tries to reload a module residing in any of them.
-      The feature can be disabled by using the command line flag
+      The feature can be disabled by using command-line flag
       <c>-nostick</c>.</p>
   </description>
 
   <section>
     <title>Code Path</title>
-    <p>In interactive mode, the code server maintains a search path --
-      usually called the <em>code path</em> -- consisting of a list of
+    <p>In interactive mode, the code server maintains a search path,
+      usually called the <em>code path</em>, consisting of a list of
       directories, which it searches sequentially when trying to load a
       module.</p>
     <p>Initially, the code path consists of the current working
-      directory and all Erlang object code directories under the library
+      directory and all Erlang object code directories under library
       directory <c>$OTPROOT/lib</c>, where <c>$OTPROOT</c> is
       the installation directory of Erlang/OTP, <c>code:root_dir()</c>.
       Directories can be named <c>Name[-Vsn]</c> and the code server,
       by default, chooses the directory with the highest version number
-      among those which have the same <c>Name</c>. The <c>-Vsn</c>
-      suffix is optional. If an <c>ebin</c> directory exists under
-      <c>Name[-Vsn]</c>, it is this directory which is added to
-      the code path.</p>
-    <p>The environment variable <c>ERL_LIBS</c> (defined in the operating
-      system) can be used to define additional library directories that
-      will be handled in the same way as the standard OTP library
-      directory described above, except that directories that do not
-      have an <c>ebin</c> directory will be ignored.</p>
+      among those having the same <c>Name</c>. Suffix <c>-Vsn</c>
+      is optional. If an <c>ebin</c> directory exists under
+      <c>Name[-Vsn]</c>, this directory is added to the code path.</p>
+    <p>Environment variable <c>ERL_LIBS</c> (defined in the operating
+      system) can be used to define more library directories to
+      be handled in the same way as the standard OTP library
+      directory described above, except that directories without
+      an <c>ebin</c> directory are ignored.</p>
     <p>All application directories found in the additional directories
-      will appear before the standard OTP applications, except for the
-      Kernel and STDLIB applications, which will be placed before any
-      additional applications. In other words, modules found in any
-      of the additional library directories will override modules with
-      the same name in OTP, except for modules in Kernel and
-      STDLIB.</p>
-    <p>The environment variable <c>ERL_LIBS</c> (if defined) should contain
+      appears before the standard OTP applications, except for the
+      <c>Kernel</c> and <c>STDLIB</c> applications, which are placed before
+      any additional applications. In other words, modules found in any
+      of the additional library directories override modules with
+      the same name in OTP, except for modules in <c>Kernel</c> and
+      <c>STDLIB</c>.</p>
+    <p>Environment variable <c>ERL_LIBS</c> (if defined) is to contain
       a colon-separated (for Unix-like systems) or semicolon-separated
       (for Windows) list of additional libraries.</p>
-    <p>Example: On an Unix-like system, <c>ERL_LIBS</c> could be set to
-      <c>/usr/local/jungerl:/home/some_user/my_erlang_lib</c>. (On Windows,
-      use semi-colon as separator.)</p>
-  </section>
-
-  <section>
-    <title>Code Path Cache</title>
-    <p>The code server incorporates a code path cache. The cache
-      functionality is disabled by default. To activate it, start
-      the emulator with the command line flag <c>-code_path_cache</c>
-      or call <c>code:rehash()</c>. When the cache is created (or
-      updated), the code server searches for modules in the code path
-      directories. This may take some time if the the code path is long.
-      After the cache creation, the time for loading modules in a large
-      system (one with a large directory structure) is significantly
-      reduced compared to having the cache disabled. The code server
-      is able to look up the location of a module from the cache in
-      constant time instead of having to search through the code path
-      directories.</p>
-    <p>Application resource files (<c>.app</c> files) are also stored
-      in the code path cache. This feature is used by the application
-      controller (see
-      <seealso marker="application">application(3)</seealso>) to load
-      applications efficiently in large systems.</p>
-    <p>Note that when the code path cache is created (or updated), any
-      relative directory names in the code path are converted to
-      absolute.</p>
+      <p><em>Example:</em></p>
+    <p>On a Unix-like system, <c>ERL_LIBS</c> can be set to the following</p>
+      <code>
+/usr/local/jungerl:/home/some_user/my_erlang_lib</code>
+    <p>On Windows, use semi-colon as separator.</p>
   </section>
 
   <section>
     <title>Loading of Code From Archive Files</title>
 
-    <warning><p>The support for loading of code from archive files is
-     experimental. The sole purpose of releasing it before it is ready
+    <warning><p>The support for loading code from archive files is
+     experimental. The purpose of releasing it before it is ready
      is to obtain early feedback. The file format, semantics,
-     interfaces etc. may be changed in a future release. The function
-     <c>lib_dir/2</c> and the flag <c>-code_path_choice</c> are also
+     interfaces, and so on, can be changed in a future release. The function
+     <seealso marker="#lib_dir/2"><c>lib_dir/2</c></seealso>
+     and  flag <c>-code_path_choice</c> are also
      experimental.</p></warning>
 
-    <p>In the current implementation, Erlang archives are <c>ZIP</c>
-     files with <c>.ez</c> extension. Erlang archives may also be
+    <p>The Erlang archives are <c>ZIP</c>
+     files with extension <c>.ez</c>. Erlang archives can also be
      enclosed in <c>escript</c> files whose file extension is arbitrary.</p>
 
-    <p>Erlang archive files may contain entire Erlang applications or
+    <p>Erlang archive files can contain entire Erlang applications or
      parts of applications. The structure in an archive file is the
-     same as the directory structure for an application. If you for
-     example would create an archive of <c>mnesia-4.4.7</c>, the
+     same as the directory structure for an application. If you, for
+     example, create an archive of <c>mnesia-4.4.7</c>, the
      archive file must be named <c>mnesia-4.4.7.ez</c> and it must
-     contain a top directory with the name <c>mnesia-4.4.7</c>. If the
+     contain a top directory named <c>mnesia-4.4.7</c>. If the
      version part of the name is omitted, it must also be omitted in
      the archive. That is, a <c>mnesia.ez</c> archive must contain a
      <c>mnesia</c> top directory.</p>
 
-    <p>An archive file for an application may for example be
+    <p>An archive file for an application can, for example, be
      created like this:</p>
 
 <pre>
-   zip:create("mnesia-4.4.7.ez", 
-              ["mnesia-4.4.7"], 
-              [{cwd, code:lib_dir()},
-               {compress, all},
-               {uncompress,[".beam",".app"]}]).</pre>
-
-    <p>Any file in the archive may be compressed, but in order to
-     speed up the access of frequently read files, it may be a good
+zip:create("mnesia-4.4.7.ez",
+	["mnesia-4.4.7"],
+	[{cwd, code:lib_dir()},
+	 {compress, all},
+	 {uncompress,[".beam",".app"]}]).</pre>
+
+    <p>Any file in the archive can be compressed, but to
+     speed up the access of frequently read files, it can be a good
      idea to store <c>beam</c> and <c>app</c> files uncompressed in
      the archive.</p>
 
-    <p>Normally the top directory of an application is located either
-     in the library directory <c>$OTPROOT/lib</c> or in a directory
-     referred to by the environment variable <c>ERL_LIBS</c>. At
-     startup when the initial code path is computed, the code server
-     will also look for archive files in these directories and
-     possibly add <c>ebin</c> directories in archives to the code path. The
-     code path will then contain paths to directories that looks like
+    <p>Normally the top directory of an application is located
+     in library directory <c>$OTPROOT/lib</c> or in a directory
+     referred to by environment variable <c>ERL_LIBS</c>. At
+     startup, when the initial code path is computed, the code server
+     also looks for archive files in these directories and
+     possibly adds <c>ebin</c> directories in archives to the code path. The
+     code path then contains paths to directories that look like
      <c>$OTPROOT/lib/mnesia.ez/mnesia/ebin</c> or
      <c>$OTPROOT/lib/mnesia-4.4.7.ez/mnesia-4.4.7/ebin</c>.</p>
 
-    <p>The code server uses the module <c>erl_prim_loader</c>
-     (possibly via the <c>erl_boot_server</c>) to read code files from
-     archives. But the functions in <c>erl_prim_loader</c> may also be
+    <p>The code server uses module <c>erl_prim_loader</c> in <c>ERTS</c>
+     (possibly through <c>erl_boot_server</c>) to read code files from
+     archives. However, the functions in <c>erl_prim_loader</c> can also be
      used by other applications to read files from archives. For
      example, the call
      <c>erl_prim_loader:list_dir( "/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/examples/bench)"</c>
      would list the contents of a directory inside an archive.
-     See <seealso marker="erts:erl_prim_loader">erl_prim_loader(3)</seealso>.</p>
+     See <seealso marker="erts:erl_prim_loader"><c>erl_prim_loader(3)</c></seealso>.</p>
 
     <p>An application archive file and a regular application directory
-     may coexist. This may be useful when there is a need of having
+     can coexist. This can be useful when it is needed to have
      parts of the application as regular files. A typical case is the
-     <c>priv</c> directory which must reside as a regular directory in
-     order to be able to dynamically link in drivers and start port
-     programs. For other applications that do not have this need, the
-     <c>priv</c> directory may reside in the archive and the files
-     under the <c>priv</c> directory may be read via the
+     <c>priv</c> directory, which must reside as a regular directory
+     to link in drivers dynamically and start port programs.
+     For other applications that do not need this, directory
+     <c>priv</c> can reside in the archive and the files
+     under the directory <c>priv</c> can be read through
      <c>erl_prim_loader</c>.</p>
 
-    <p>At the time point when a directory is added to the code path as
-     well as when the entire code path is (re)set, the code server
-     will decide which subdirectories in an application that shall be
-     read from the archive and which that shall be read as regular
+    <p>When a directory is added to the code path and
+     when the entire code path is (re)set, the code server
+     decides which subdirectories in an application that are to be
+     read from the archive and which that are to be read as regular
      files. If directories are added or removed afterwards, the file
-     access may fail if the code path is not updated (possibly to the
-     same path as before in order to trigger the directory resolution
-     update). For each directory on the second level (ebin, priv, src
-     etc.) in the application archive, the code server will firstly
-     choose the regular directory if it exists and secondly from the
-     archive. The function
-     <c>code:lib_dir/2</c> returns the path to the subdirectory. For
-     example <c>code:lib_dir(megaco,ebin)</c> may return
+     access can fail if the code path is not updated (possibly to the
+     same path as before, to trigger the directory resolution
+     update).</p>
+
+     <p>For each directory on the second level in the application archive
+     (<c>ebin</c>, <c>priv</c>, <c>src</c>, and so on), the code server first
+     chooses the regular directory if it exists and second from the
+     archive. Function <c>code:lib_dir/2</c> returns the path to the
+     subdirectory. For example, <c>code:lib_dir(megaco,ebin)</c> can return
      <c>/otp/root/lib/megaco-3.9.1.1.ez/megaco-3.9.1.1/ebin</c> while
-     <c>code:lib_dir(megaco,priv)</c> may return
+     <c>code:lib_dir(megaco,priv)</c> can return
      <c>/otp/root/lib/megaco-3.9.1.1/priv</c>.</p>
 
     <p>When an <c>escript</c> file contains an archive, there are
-     neither restrictions on the name of the <c>escript</c> nor on how
-     many applications that may be stored in the embedded
-     archive. Single <c>beam</c> files may also reside on the top
-     level in the archive. At startup, both the top directory in the
-     embedded archive as well as all (second level) <c>ebin</c>
+     no restrictions on the name of the <c>escript</c> and no restrictions
+     on how many applications that can be stored in the embedded
+     archive. Single Beam files can also reside on the top
+     level in the archive. At startup, the top directory in the
+     embedded archive and all (second level) <c>ebin</c>
      directories in the embedded archive are added to the code path.
-     See <seealso marker="erts:escript">escript(1)</seealso></p>
+     See <seealso marker="erts:escript"><c>erts:escript(1)</c></seealso>.</p>
 
     <p>When the choice of directories in the code path is
-     <c>strict</c>, the directory that ends up in the code path will
-     be exactly the stated one. This means that if for example the
+     <c>strict</c>, the directory that ends up in the code path is
+     exactly the stated one. This means that if, for example, the
      directory <c>$OTPROOT/lib/mnesia-4.4.7/ebin</c> is explicitly
-     added to the code path, the code server will not load files from
-     <c>$OTPROOT/lib/mnesia-4.4.7.ez/mnesia-4.4.7/ebin</c> and vice
-     versa. </p>
+     added to the code path, the code server does not load files from
+     <c>$OTPROOT/lib/mnesia-4.4.7.ez/mnesia-4.4.7/ebin</c>.</p>
 
-    <p>This behavior can be controlled via the command line flag
+    <p>This behavior can be controlled through command-line flag
      <c>-code_path_choice Choice</c>. If the flag is set to <c>relaxed</c>,
-     the code server will instead choose a suitable directory
-     depending on the actual file structure. If there exists a regular
-     application ebin directory, it will be chosen. But if it does
-     not exist, the ebin directory in the archive is chosen if it
-     exists. If neither of them exists the original directory will be
+     the code server instead chooses a suitable directory
+     depending on the actual file structure. If a regular
+     application <c>ebin</c> directory exists, it is chosen. Otherwise,
+     the directory <c>ebin</c> in the archive is chosen if it
+     exists. If neither of them exists, the original directory is
      chosen.</p>
 
-    <p>The command line flag <c>-code_path_choice Choice</c> does also
-     affect how <c>init</c> interprets the <c>boot script</c>. The
-     interpretation of the explicit code paths in the <c>boot
-     script</c> may be <c>strict</c> or <c>relaxed</c>. It is
-     particular useful to set the flag to <c>relaxed</c> when you want
-     to elaborate with code loading from archives without editing the
+    <p>Command-line flag <c>-code_path_choice Choice</c> also
+     affects how module <c>init</c> interprets the <c>boot script</c>.
+     The interpretation of the explicit code paths in the <c>boot
+     script</c> can be <c>strict</c> or <c>relaxed</c>. It is
+     particularly useful to set the flag to <c>relaxed</c> when
+     elaborating with code loading from archives without editing the
      <c>boot script</c>. The default is <c>relaxed</c>. See <seealso
-     marker="erts:init">init(3)</seealso></p></section>
+     marker="erts:init"><c>erts:init(3)</c></seealso>.</p></section>
 
   <section>
 
     <title>Current and Old Code</title>
-    <p>The code of a module can exists in two variants in a system:
+    <p>The code for a module can exist in two variants in a system:
       <em>current code</em> and <em>old code</em>. When a module is
-      loaded into the system for the first time, the code of the module
+      loaded into the system for the first time, the module code
       becomes 'current' and the global <em>export table</em> is updated
       with references to all functions exported from the module.</p>
-    <p>If then a new instance of the module is loaded (perhaps because
-      of the correction of an error), then the code of the previous
+    <p>If then a new instance of the module is loaded (for example, because of
+      error correction), the code of the previous
       instance becomes 'old', and all export entries referring to
-      the previous instance are removed. After that the new instance is
-      loaded as if it was loaded for the first time, as described above,
-      and becomes 'current'.</p>
-    <p>Both old and current code for a module are valid, and may even be
+      the previous instance are removed. After that, the new instance is
+      loaded as for the first time, and becomes 'current'.</p>
+    <p>Both old and current code for a module are valid, and can even be
       evaluated concurrently. The difference is that exported functions
-      in old code are unavailable. Hence there is no way to make a
-      global call to an exported function in old code, but old code may
+      in old code are unavailable. Hence, a global call cannot be made
+      to an exported function in old code, but old code can
       still be evaluated because of processes lingering in it.</p>
-    <p>If a third instance of the module is loaded, the code server will
-      remove (purge) the old code and any processes lingering in it will
-      be terminated. Then the third instance becomes 'current' and
+    <p>If a third instance of the module is loaded, the code server
+      removes (purges) the old code and any processes lingering in it
+      are terminated. Then the third instance becomes 'current' and
       the previously current code becomes 'old'.</p>
     <p>For more information about old and current code, and how to
-      make a process switch from old to current code, refer to
+      make a process switch from old to current code, see section
+      Compilation and Code Loading in the
       <seealso marker="doc/reference_manual:code_loading">Erlang Reference Manual</seealso>.</p>
   </section>
 
   <section>
     <title>Argument Types and Invalid Arguments</title>
 
-    <p>Generally, module and application names are atoms, while file and directory
+    <p>Module and application names are atoms, while file and directory
     names are strings. For backward compatibility reasons, some functions accept
     both strings and atoms, but a future release will probably only allow
     the arguments that are documented.</p>
 
-    <p>From the R12B release, functions in this module will generally fail with an
-    exception if they are passed an incorrect type (for instance, an integer or a tuple
-    where an atom was expected). An error tuple will be returned if the type of the argument
-    was correct, but there was some other error (for instance, a non-existing directory
-    was given to <c>set_path/1</c>).</p>
+    <p>As from Erlang/OTP R12B, functions in this module generally fail with an
+    exception if they are passed an incorrect type (for example, an integer or a tuple
+    where an atom is expected). An error tuple is returned if the argument type
+    is correct, but there are some other errors (for example, a non-existing directory
+    is specified to <c>set_path/1</c>).</p>
   </section>
 
+  <section>
+    <marker id="error_reasons"></marker>
+    <title>Error Reasons for Code-Loading Functions</title>
+
+    <p>Functions that load code (such as <c>load_file/1</c>) will
+    return <c>{error,Reason}</c> if the load operation fails.
+    Here follows a description of the common reasons.</p>
+
+    <taglist>
+      <tag><c>badfile</c></tag>
+      <item>
+	<p>The object code has an incorrect format or the module
+	name in the object code is not the expected module name.</p>
+      </item>
+
+      <tag><c>nofile</c></tag>
+      <item>
+	<p>No file with object code was found.</p>
+      </item>
+
+      <tag><c>not_purged</c></tag>
+      <item>
+	<p>The object code could not be loaded because an old version
+	of the code already existed.</p>
+      </item>
+
+      <tag><c>on_load_failure</c></tag>
+      <item>
+	<p>The module has an
+	<seealso marker="doc/reference_manual:code_loading#on_load">-on_load function</seealso>
+	that failed when it was called.</p>
+      </item>
+
+      <tag><c>sticky_directory</c></tag>
+      <item>
+	<p>The object code resides in a sticky directory.</p>
+      </item>
+
+    </taglist>
+    </section>
   <datatypes>
     <datatype>
       <name name="load_ret"/>
@@ -294,31 +312,38 @@
     <datatype>
       <name name="load_error_rsn"/>
     </datatype>
+    <datatype>
+      <name name="prepared_code"/>
+      <desc><p>An opaque term holding prepared code.</p></desc>
+    </datatype>
   </datatypes>
 
   <funcs>
     <func>
       <name name="set_path" arity="1"/>
-      <fsummary>Set the code server search path</fsummary>
+      <fsummary>Set the code server search path.</fsummary>
       <desc>
         <p>Sets the code path to the list of directories <c><anno>Path</anno></c>.</p>
-        <p>Returns <c>true</c> if successful, or
-          <c>{error, bad_directory}</c> if any <c><anno>Dir</anno></c> is not
-          the name of a directory, or <c>{error, bad_path}</c> if
-          the argument is invalid.</p>
+        <p>Returns:</p>
+	<taglist>
+	<tag><c>true</c></tag>
+	<item><p>If successful</p></item>
+        <tag><c>{error, bad_directory}</c></tag>
+	<item><p>If any <c><anno>Dir</anno></c> is not a directory name</p></item>
+	</taglist>
       </desc>
     </func>
     <func>
       <name name="get_path" arity="0"/>
-      <fsummary>Return the code server search path</fsummary>
+      <fsummary>Return the code server search path.</fsummary>
       <desc>
-        <p>Returns the code path</p>
+        <p>Returns the code path.</p>
       </desc>
     </func>
     <func>
       <name name="add_path" arity="1"/>
       <name name="add_pathz" arity="1"/>
-      <fsummary>Add a directory to the end of the code path</fsummary>
+      <fsummary>Add a directory to the end of the code path.</fsummary>
       <type name="add_path_ret"/>
       <desc>
         <p>Adds <c><anno>Dir</anno></c> to the code path. The directory is added as
@@ -331,11 +356,11 @@
     </func>
     <func>
       <name name="add_patha" arity="1"/>
-      <fsummary>Add a directory to the beginning of the code path</fsummary>
+      <fsummary>Add a directory to the beginning of the code path.</fsummary>
       <type name="add_path_ret"/>
       <desc>
         <p>Adds <c><anno>Dir</anno></c> to the beginning of the code path. If
-          <c><anno>Dir</anno></c> already exists, it is removed from the old
+          <c><anno>Dir</anno></c> exists, it is removed from the old
           position in the code path.</p>
         <p>Returns <c>true</c> if successful, or
           <c>{error, bad_directory}</c> if <c><anno>Dir</anno></c> is not the name
@@ -345,218 +370,357 @@
     <func>
       <name name="add_paths" arity="1"/>
       <name name="add_pathsz" arity="1"/>
-      <fsummary>Add directories to the end of the code path</fsummary>
+      <fsummary>Add directories to the end of the code path.</fsummary>
       <desc>
         <p>Adds the directories in <c><anno>Dirs</anno></c> to the end of the code
-          path. If a <c><anno>Dir</anno></c> already exists, it is not added. This
-          function always returns <c>ok</c>, regardless of the validity
+          path. If a <c><anno>Dir</anno></c> exists, it is not added.</p>
+	<p>Always returns <c>ok</c>, regardless of the validity
           of each individual <c><anno>Dir</anno></c>.</p>
       </desc>
     </func>
     <func>
       <name name="add_pathsa" arity="1"/>
-      <fsummary>Add directories to the beginning of the code path</fsummary>
+      <fsummary>Add directories to the beginning of the code path.</fsummary>
       <desc>
         <p>Adds the directories in <c><anno>Dirs</anno></c> to the beginning of
-          the code path. If a <c><anno>Dir</anno></c> already exists, it is removed
-          from the old position in the code path. This function always
-          returns <c>ok</c>, regardless of the validity of each
+          the code path. If a <c><anno>Dir</anno></c> exists, it is removed
+          from the old position in the code path.</p>
+	<p>Always returns <c>ok</c>, regardless of the validity of each
           individual <c><anno>Dir</anno></c>.</p>
       </desc>
     </func>
     <func>
       <name name="del_path" arity="1"/>
-      <fsummary>Delete a directory from the code path</fsummary>
+      <fsummary>Delete a directory from the code path.</fsummary>
       <desc>
         <p>Deletes a directory from the code path. The argument can be
           an atom <c><anno>Name</anno></c>, in which case the directory with
           the name <c>.../<anno>Name</anno>[-Vsn][/ebin]</c> is deleted from the code
-          path. It is also possible to give the complete directory name
-          <c><anno>Dir</anno></c> as argument.</p>
-        <p>Returns <c>true</c> if successful, or <c>false</c> if
-          the directory is not found, or <c>{error, bad_name}</c> if
-          the argument is invalid.</p>
+          path. Also, the complete directory name <c><anno>Dir</anno></c> can be
+	  specified as argument.</p>
+        <p>Returns:</p>
+	<taglist>
+	<tag><c>true</c></tag>
+	<item><p>If successful</p></item>
+	<tag><c>false</c></tag>
+	<item><p>If the directory is not found</p></item>
+	<tag><c>{error, bad_name}</c></tag>
+	<item><p>If the argument is invalid</p></item>
+	</taglist>
       </desc>
     </func>
     <func>
       <name name="replace_path" arity="2"/>
-      <fsummary>Replace a directory with another in the code path</fsummary>
-      <desc>
-        <p>This function replaces an old occurrence of a directory
-          named <c>.../<anno>Name</anno>[-Vsn][/ebin]</c>, in the code path, with
-          <c><anno>Dir</anno></c>. If <c><anno>Name</anno></c> does not exist, it adds the new
-          directory <c><anno>Dir</anno></c> last in the code path. The new directory
-          must also be named <c>.../<anno>Name</anno>[-Vsn][/ebin]</c>. This function
-          should be used if a new version of the directory (library) is
+      <fsummary>Replace a directory with another in the code path.</fsummary>
+      <desc>
+        <p>Replaces an old occurrence of a directory
+          named <c>.../<anno>Name</anno>[-Vsn][/ebin]</c> in the code path, with
+          <c><anno>Dir</anno></c>. If <c><anno>Name</anno></c> does not exist, it adds
+	  the new directory <c><anno>Dir</anno></c> last in the code path. The new
+	  directory must also be named <c>.../<anno>Name</anno>[-Vsn][/ebin]</c>.
+	  This function is to be used if a new version of the directory (library) is
           added to a running system.</p>
-        <p>Returns <c>true</c> if successful, or
-          <c>{error, bad_name}</c> if <c><anno>Name</anno></c> is not found, or
-          <c>{error, bad_directory}</c> if <c><anno>Dir</anno></c> does not exist, or
-          <c>{error, {badarg, [<anno>Name</anno>, <anno>Dir</anno>]}}</c> if <c><anno>Name</anno></c> or
-          <c><anno>Dir</anno></c> is invalid.</p>
+        <p>Returns:</p>
+	<taglist>
+	  <tag><c>true</c></tag>
+	  <item><p>If successful</p></item>
+          <tag><c>{error, bad_name}</c></tag>
+	  <item><p>If <c><anno>Name</anno></c> is not found</p></item>
+          <tag><c>{error, bad_directory}</c></tag>
+	  <item><p>If <c><anno>Dir</anno></c> does not exist</p></item>
+          <tag><c>{error, {badarg, [<anno>Name</anno>, <anno>Dir</anno>]}}</c></tag>
+	  <item><p>If <c><anno>Name</anno></c> or <c><anno>Dir</anno></c> is invalid</p></item>
+	</taglist>
       </desc>
     </func>
     <func>
       <name name="load_file" arity="1"/>
-      <fsummary>Load a module</fsummary>
+      <fsummary>Load a module.</fsummary>
       <type name="load_ret"/>
       <desc>
         <p>Tries to load the Erlang module <c><anno>Module</anno></c>, using
           the code path. It looks for the object code file with an
-          extension that corresponds to the Erlang machine used, for
-          example <c><anno>Module</anno>.beam</c>. The loading fails if the module
+          extension corresponding to the Erlang machine used, for
+          example, <c><anno>Module</anno>.beam</c>. The loading fails if the module
           name found in the object code differs from the name
           <c><anno>Module</anno></c>.
-          <seealso marker="#load_binary/3">load_binary/3</seealso> must
+          <seealso marker="#load_binary/3"><c>load_binary/3</c></seealso> must
           be used to load object code with a module name that is
           different from the file name.</p>
         <p>Returns <c>{module, <anno>Module</anno>}</c> if successful, or
-          <c>{error, nofile}</c> if no object code is found, or
-          <c>{error, sticky_directory}</c> if the object code resides in
-          a sticky directory. Also if the loading fails, an error tuple is
-          returned. See
-          <seealso marker="erts:erlang#load_module/2">erlang:load_module/2</seealso>
-          for possible values of <c><anno>What</anno></c>.</p>
+	<c>{error, Reason}</c> if loading fails.
+	See <seealso marker="#error_reasons">Error Reasons for Code-Loading Functions</seealso> for a description of the possible error reasons.</p>
       </desc>
     </func>
     <func>
       <name name="load_abs" arity="1"/>
-      <fsummary>Load a module, residing in a given file</fsummary>
+      <fsummary>Load a module, residing in a specified file.</fsummary>
       <type name="load_ret"/>
       <type name="loaded_filename"/>
       <type name="loaded_ret_atoms"/>
       <desc>
-        <p>Does the same as <c>load_file(<anno>Module</anno>)</c>, but
-          <c><anno>Filename</anno></c> is either an absolute file name, or a
-          relative file name. The code path is not searched. It returns
+        <p>Same as <c>load_file(<anno>Module</anno>)</c>, but
+          <c><anno>Filename</anno></c> is an absolute or
+          relative filename. The code path is not searched. It returns
           a value in the same way as
-          <seealso marker="#load_file/1">load_file/1</seealso>. Note
-          that <c><anno>Filename</anno></c> should not contain the extension (for
-          example <c>".beam"</c>); <c>load_abs/1</c> adds the correct
-          extension itself.</p>
+          <seealso marker="#load_file/1"><c>load_file/1</c></seealso>. Notice
+          that <c><anno>Filename</anno></c> must not contain the extension (for
+          example, <c>.beam</c>) because <c>load_abs/1</c> adds the correct
+          extension.</p>
       </desc>
     </func>
     <func>
       <name name="ensure_loaded" arity="1"/>
-      <fsummary>Ensure that a module is loaded</fsummary>
+      <fsummary>Ensure that a module is loaded.</fsummary>
       <desc>
-        <p>Tries to to load a module in the same way as
-          <seealso marker="#load_file/1">load_file/1</seealso>,
+        <p>Tries to load a module in the same way as
+          <seealso marker="#load_file/1"><c>load_file/1</c></seealso>,
 	  unless the module is already loaded.
-          In embedded mode, however, it does not load a module which is not
-          already loaded, but returns <c>{error, embedded}</c> instead.</p>
+          However, in embedded mode it does not load a module that is not
+          already loaded, but returns <c>{error, embedded}</c> instead.
+	  See <seealso marker="#error_reasons">Error Reasons for Code-Loading Functions</seealso> for a description of other possible error reasons.</p>
       </desc>
     </func>
     <func>
       <name name="load_binary" arity="3"/>
-      <fsummary>Load object code for a module</fsummary>
+      <fsummary>Load object code for a module.</fsummary>
       <type name="loaded_filename"/>
       <type name="loaded_ret_atoms"/>
       <desc>
         <p>This function can be used to load object code on remote
-          Erlang nodes. The argument <c><anno>Binary</anno></c> must contain
+          Erlang nodes. Argument <c><anno>Binary</anno></c> must contain
 	  object code for <c><anno>Module</anno></c>.
           <c><anno>Filename</anno></c> is only used by the code server to keep a
           record of from which file the object code for <c><anno>Module</anno></c>
-          comes. Accordingly, <c><anno>Filename</anno></c> is not opened and read by
+          comes. Thus, <c><anno>Filename</anno></c> is not opened and read by
           the code server.</p>
         <p>Returns <c>{module, <anno>Module</anno>}</c> if successful, or
-          <c>{error, sticky_directory}</c> if the object code resides in
-          a sticky directory, or <c>{error, badarg}</c> if any argument
-          is invalid. Also if the loading fails, an error tuple is
-          returned. See
-          <seealso marker="erts:erlang#load_module/2">erlang:load_module/2</seealso>
-          for possible values of <c><anno>What</anno></c>.</p>
+	<c>{error, Reason}</c> if loading fails.
+	See <seealso marker="#error_reasons">Error Reasons for Code-Loading Functions</seealso> for a description of the possible error reasons.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="atomic_load" arity="1"/>
+      <fsummary>Load a list of modules atomically</fsummary>
+      <desc>
+        <p>Tries to load all of the modules in the list
+        <c><anno>Modules</anno></c> atomically.  That means that
+        either all modules are loaded at the same time, or
+        none of the modules are loaded if there is a problem with any
+	of the modules.</p>
+	<p>Loading can fail for one the following reasons:</p>
+	<taglist>
+	  <tag><c>badfile</c></tag>
+	  <item>
+	    <p>The object code has an incorrect format or the module
+	    name in the object code is not the expected module name.</p>
+	  </item>
+	  <tag><c>nofile</c></tag>
+	  <item>
+	    <p>No file with object code exists.</p>
+	  </item>
+	  <tag><c>on_load_not_allowed</c></tag>
+	  <item>
+	    <p>A module contains an
+	    <seealso marker="doc/reference_manual:code_loading#on_load">-on_load function</seealso>.</p>
+	  </item>
+	  <tag><c>duplicated</c></tag>
+	  <item>
+	    <p>A module is included more than once in
+	    <c><anno>Modules</anno></c>.</p>
+	  </item>
+	  <tag><c>not_purged</c></tag>
+	  <item>
+	    <p>The object code can not be loaded because an old version
+	    of the code already exists.</p>
+	  </item>
+	  <tag><c>sticky_directory</c></tag>
+	  <item>
+	    <p>The object code resides in a sticky directory.</p>
+	  </item>
+	  <tag><c>pending_on_load</c></tag>
+	  <item>
+	    <p>A previously loaded module contains an
+	    <c>-on_load</c> function that never finished.</p>
+	  </item>
+	</taglist>
+	<p>If it is important to minimize the time that an application
+	is inactive while changing code, use
+	<seealso marker="#prepare_loading/1">prepare_loading/1</seealso>
+	and
+	<seealso marker="#finish_loading/1">finish_loading/1</seealso>
+	instead of <c>atomic_load/1</c>. Here is an example:</p>
+<pre>
+{ok,Prepared} = code:prepare_loading(Modules),
+%% Put the application into an inactive state or do any
+%% other preparation needed before changing the code.
+ok = code:finish_loading(Prepared),
+%% Resume the application.</pre>
+      </desc>
+    </func>
+    <func>
+      <name name="prepare_loading" arity="1"/>
+      <fsummary>Prepare a list of modules atomically</fsummary>
+      <desc>
+        <p>Prepares to load the modules in the list
+        <c><anno>Modules</anno></c>.
+	Finish the loading by calling
+	<seealso marker="#finish_loading/1">finish_loading(Prepared)</seealso>.</p>
+	<p>This function can fail with one of the following error reasons:</p>
+	<taglist>
+	  <tag><c>badfile</c></tag>
+	  <item>
+	    <p>The object code has an incorrect format or the module
+	    name in the object code is not the expected module name.</p>
+	  </item>
+	  <tag><c>nofile</c></tag>
+	  <item>
+	    <p>No file with object code exists.</p>
+	  </item>
+	  <tag><c>on_load_not_allowed</c></tag>
+	  <item>
+	    <p>A module contains an
+	    <seealso marker="doc/reference_manual:code_loading#on_load">-on_load function</seealso>.</p>
+	  </item>
+	  <tag><c>duplicated</c></tag>
+	  <item>
+	    <p>A module is included more than once in
+	    <c><anno>Modules</anno></c>.</p>
+	  </item>
+	</taglist>
+      </desc>
+    </func>
+    <func>
+      <name name="finish_loading" arity="1"/>
+      <fsummary>Finish loading a list of prepared modules atomically</fsummary>
+      <desc>
+        <p>Tries to load code for all modules that have been previously
+	prepared by
+	<seealso marker="#prepare_loading/1">prepare_loading/1</seealso>.
+	The loading occurs atomically, meaning that
+        either all modules are loaded at the same time, or
+        none of the modules are loaded.</p>
+	<p>This function can fail with one of the following error reasons:</p>
+	<taglist>
+	  <tag><c>not_purged</c></tag>
+	  <item>
+	    <p>The object code can not be loaded because an old version
+	    of the code already exists.</p>
+	  </item>
+	  <tag><c>sticky_directory</c></tag>
+	  <item>
+	    <p>The object code resides in a sticky directory.</p>
+	  </item>
+	  <tag><c>pending_on_load</c></tag>
+	  <item>
+	    <p>A previously loaded module contains an
+	    <c>-on_load</c> function that never finished.</p>
+	  </item>
+	</taglist>
+      </desc>
+    </func>
+    <func>
+      <name name="ensure_modules_loaded" arity="1"/>
+      <fsummary>Ensure that a list of modules is loaded</fsummary>
+      <desc>
+        <p>Tries to load any modules not already loaded in the list
+	<c><anno>Modules</anno></c> in the same way as
+          <seealso marker="#load_file/1">load_file/1</seealso>.</p>
+	  <p>Returns <c>ok</c> if successful, or
+	  <c>{error,[{Module,Reason}]}</c> if loading of some modules fails.
+	  See <seealso marker="#error_reasons">Error Reasons for Code-Loading Functions</seealso> for a description of other possible error reasons.</p>
       </desc>
     </func>
     <func>
       <name name="delete" arity="1"/>
-      <fsummary>Removes current code for a module</fsummary>
+      <fsummary>Remove current code for a module.</fsummary>
       <desc>
         <p>Removes the current code for <c><anno>Module</anno></c>, that is,
           the current code for <c><anno>Module</anno></c> is made old. This means
           that processes can continue to execute the code in the module,
-          but that no external function calls can be made to it.</p>
+          but no external function calls can be made to it.</p>
         <p>Returns <c>true</c> if successful, or <c>false</c> if there
-          is old code for <c><anno>Module</anno></c> which must be purged first, or
+          is old code for <c><anno>Module</anno></c> that must be purged first, or
           if <c><anno>Module</anno></c> is not a (loaded) module.</p>
       </desc>
     </func>
     <func>
       <name name="purge" arity="1"/>
-      <fsummary>Removes old code for a module</fsummary>
+      <fsummary>Remove old code for a module.</fsummary>
       <desc>
         <p>Purges the code for <c><anno>Module</anno></c>, that is, removes code
           marked as old. If some processes still linger in the old code,
           these processes are killed before the code is removed.</p>
-        <p>Returns <c>true</c> if successful and any process needed to
+        <p>Returns <c>true</c> if successful and any process is needed to
           be killed, otherwise <c>false</c>.</p>
       </desc>
     </func>
     <func>
       <name name="soft_purge" arity="1"/>
-      <fsummary>Removes old code for a module, unless no process uses it</fsummary>
+      <fsummary>Remove old code for a module, unless no process uses it.</fsummary>
       <desc>
         <p>Purges the code for <c><anno>Module</anno></c>, that is, removes code
           marked as old, but only if no processes linger in it.</p>
-        <p>Returns <c>false</c> if the module could not be purged due
-          to processes lingering in old code, otherwise <c>true</c>.</p>
+        <p>Returns <c>false</c> if the module cannot be purged because
+          of processes lingering in old code, otherwise <c>true</c>.</p>
       </desc>
     </func>
     <func>
       <name name="is_loaded" arity="1"/>
-      <fsummary>Check if a module is loaded</fsummary>
+      <fsummary>Check if a module is loaded.</fsummary>
       <type name="loaded_filename"/>
       <type name="loaded_ret_atoms"/>
-      <type_desc name="loaded_filename"><c><anno>Filename</anno></c> is an absolute filename</type_desc>
+      <type_desc name="loaded_filename"><c><anno>Filename</anno></c> is an absolute
+      filename.</type_desc>
       <desc>
         <p>Checks if <c><anno>Module</anno></c> is loaded. If it is,
           <c>{file, <anno>Loaded</anno>}</c> is returned, otherwise <c>false</c>.</p>
-        <p>Normally, <c><anno>Loaded</anno></c> is the absolute file name
-          <c>Filename</c> from which the code was obtained. If the module
+        <p>Normally, <c><anno>Loaded</anno></c> is the absolute filename
+          <c>Filename</c> from which the code is obtained. If the module
           is preloaded (see
-          <seealso marker="sasl:script">script(4)</seealso>),
-          <c>Loaded==preloaded</c>. If the module is Cover compiled (see
-          <seealso marker="tools:cover">cover(3)</seealso>),
+          <seealso marker="sasl:script"><c>sasl:script(4)</c></seealso>),
+          <c>Loaded==preloaded</c>. If the module is Cover-compiled (see
+          <seealso marker="tools:cover"><c>tools:cover(3)</c></seealso>),
           <c>Loaded==cover_compiled</c>.</p>
       </desc>
     </func>
     <func>
       <name name="all_loaded" arity="0"/>
-      <fsummary>Get all loaded modules</fsummary>
+      <fsummary>Get all loaded modules.</fsummary>
       <type name="loaded_filename"/>
       <type name="loaded_ret_atoms"/>
-      <type_desc name="loaded_filename"><c><anno>Filename</anno></c> is an absolute filename</type_desc>
+      <type_desc name="loaded_filename"><c><anno>Filename</anno></c> is an absolute
+      filename.</type_desc>
       <desc>
         <p>Returns a list of tuples <c>{<anno>Module</anno>, <anno>Loaded</anno>}</c> for all
-          loaded modules. <c><anno>Loaded</anno></c> is normally the absolute file
-          name, as described for
-          <seealso marker="#is_loaded/1">is_loaded/1</seealso>.</p>
+          loaded modules. <c><anno>Loaded</anno></c> is normally the absolute filename,
+          as described for
+          <seealso marker="#is_loaded/1"><c>is_loaded/1</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="which" arity="1"/>
-      <fsummary>The object code file of a module</fsummary>
+      <fsummary>The object code file of a module.</fsummary>
       <type name="loaded_ret_atoms"/>
       <desc>
         <p>If the module is not loaded, this function searches the code
-          path for the first file which contains object code for
-          <c><anno>Module</anno></c> and returns the absolute file name. If
-          the module is loaded, it returns the name of the file which
-          contained the loaded object code. If the module is pre-loaded,
-          <c>preloaded</c> is returned. If the module is Cover compiled,
-          <c>cover_compiled</c> is returned. <c>non_existing</c> is
-          returned if the module cannot be found.</p>
+          path for the first file containing object code for
+          <c><anno>Module</anno></c> and returns the absolute filename.</p>
+	  <p>If the module is loaded, it returns the name of the file
+          containing the loaded object code.</p>
+	  <p>If the module is preloaded, <c>preloaded</c> is returned.</p>
+	  <p>If the module is Cover-compiled, <c>cover_compiled</c> is returned.</p>
+	  <p>If the module cannot be found, <c>non_existing</c> is returned.</p>
       </desc>
     </func>
     <func>
       <name name="get_object_code" arity="1"/>
-      <fsummary>Get the object code for a module</fsummary>
+      <fsummary>Gets the object code for a module.</fsummary>
       <desc>
-        <p>Searches the code path for the object code of the module
-          <c><anno>Module</anno></c>. It returns <c>{<anno>Module</anno>, <anno>Binary</anno>, <anno>Filename</anno>}</c>
-          if successful, and <c>error</c> if not. <c><anno>Binary</anno></c> is a
-          binary data object which contains the object code for
+        <p>Searches the code path for the object code of module
+          <c><anno>Module</anno></c>. Returns <c>{<anno>Module</anno>, <anno>Binary</anno>, <anno>Filename</anno>}</c>
+          if successful, otherwise <c>error</c>. <c><anno>Binary</anno></c> is a
+          binary data object, which contains the object code for
           the module. This can be useful if code is to be loaded on a
           remote node in a distributed system. For example, loading
           module <c><anno>Module</anno></c> on a node <c>Node</c> is done as
@@ -570,10 +734,11 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
     </func>
     <func>
       <name name="root_dir" arity="0"/>
-      <fsummary>Root directory of Erlang/OTP</fsummary>
+      <fsummary>Root directory of Erlang/OTP.</fsummary>
       <desc>
         <p>Returns the root directory of Erlang/OTP, which is
           the directory where it is installed.</p>
+	<p><em>Example:</em></p>
         <pre>
 > <input>code:root_dir().</input>
 "/usr/local/otp"</pre>
@@ -581,10 +746,11 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
     </func>
     <func>
       <name name="lib_dir" arity="0"/>
-      <fsummary>Library directory of Erlang/OTP</fsummary>
+      <fsummary>Library directory of Erlang/OTP.</fsummary>
       <desc>
         <p>Returns the library directory, <c>$OTPROOT/lib</c>, where
           <c>$OTPROOT</c> is the root directory of Erlang/OTP.</p>
+	<p><em>Example:</em></p>
         <pre>
 > <input>code:lib_dir().</input>
 "/usr/local/otp/lib"</pre>
@@ -592,50 +758,49 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
     </func>
     <func>
       <name name="lib_dir" arity="1"/>
-      <fsummary>Library directory for an application</fsummary>
+      <fsummary>Library directory for an application.</fsummary>
       <desc>
-        <p>This function is mainly intended for finding out the path
+        <p>Returns the path
           for the "library directory", the top directory, for an
           application <c><anno>Name</anno></c> located under <c>$OTPROOT/lib</c> or
-          on a directory referred to via the <c>ERL_LIBS</c>
-          environment variable.</p>
-        <p>If there is a regular directory called <c><anno>Name</anno></c> or
-          <c><anno>Name</anno>-Vsn</c> in the code path with an <c>ebin</c>
+          on a directory referred to with environment variable <c>ERL_LIBS</c>.</p>
+        <p>If a regular directory called <c><anno>Name</anno></c> or
+          <c><anno>Name</anno>-Vsn</c> exists in the code path with an <c>ebin</c>
           subdirectory, the path to this directory is returned (not
-          the <c>ebin</c> directory). If the directory refers to a
-          directory in an archive, the archive name is stripped away
-          before the path is returned.  For example, if the directory
+          the <c>ebin</c> directory).</p>
+	<p>If the directory refers to a directory in an archive, the
+	  archive name is stripped away before the path is returned.
+	  For example, if directory
           <c>/usr/local/otp/lib/mnesia-4.2.2.ez/mnesia-4.2.2/ebin</c>
           is in the path, <c>/usr/local/otp/lib/mnesia-4.2.2/ebin</c>
-          will be returned. This means that the library directory for
-          an application is the same, regardless of whether the
+          is returned. This means that the library directory for
+          an application is the same, regardless if the
           application resides in an archive or not.</p>
-
+	<p><em>Example:</em></p>
         <pre>
 > <input>code:lib_dir(mnesia).</input>
 "/usr/local/otp/lib/mnesia-4.2.2"</pre>
         <p>Returns <c>{error, bad_name}</c> if <c><anno>Name</anno></c>
 	 is not the name of an application under <c>$OTPROOT/lib</c> or
-	 on a directory referred to via the <c>ERL_LIBS</c>
-         environment variable. Fails with an exception if <c>Name</c>
-         has the wrong type.</p>
+	 on a directory referred to through environment variable <c>ERL_LIBS</c>.
+	 Fails with an exception if <c>Name</c> has the wrong type.</p>
 
-	<warning><p>For backward compatibility, <c><anno>Name</anno></c> is also allowed to
-	be a string. That will probably change in a future release.</p></warning>
+	<warning><p>For backward compatibility, <c><anno>Name</anno></c> is also
+	allowed to be a string. That will probably change in a future release.</p></warning>
       </desc>
     </func>
     <func>
       <name name="lib_dir" arity="2"/>
-      <fsummary>subdirectory for an application</fsummary>
+      <fsummary>Subdirectory for an application.</fsummary>
       <desc>
         <p>Returns the path to a subdirectory directly under the top
          directory of an application. Normally the subdirectories
-         resides under the top directory for the application, but when
-         applications at least partly resides in an archive the
-         situation is different. Some of the subdirectories may reside
-         as regular directories while other resides in an archive
-         file. It is not checked if this directory really exists.</p>
-
+         reside under the top directory for the application, but when
+         applications at least partly resides in an archive, the
+         situation is different. Some of the subdirectories can reside
+         as regular directories while other reside in an archive
+         file. It is not checked whether this directory exists.</p>
+	 <p><em>Example:</em></p>
         <pre>
 > <input>code:lib_dir(megaco, priv).</input>
 "/usr/local/otp/lib/megaco-3.9.1.1/priv"</pre>
@@ -646,7 +811,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
     </func>
     <func>
       <name name="compiler_dir" arity="0"/>
-      <fsummary>Library directory for the compiler</fsummary>
+      <fsummary>Library directory for the compiler.</fsummary>
       <desc>
         <p>Returns the compiler library directory. Equivalent to
           <c>code:lib_dir(compiler)</c>.</p>
@@ -654,10 +819,10 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
     </func>
     <func>
       <name name="priv_dir" arity="1"/>
-      <fsummary>Priv directory for an application</fsummary>
+      <fsummary>Priv directory for an application.</fsummary>
       <desc>
         <p>Returns the path to the <c>priv</c> directory in an
-         application. Equivalent to <c>code:lib_dir(<anno>Name</anno>, priv).</c>.</p>
+         application. Equivalent to <c>code:lib_dir(<anno>Name</anno>, priv)</c>.</p>
 
 	<warning><p>For backward compatibility, <c><anno>Name</anno></c> is also allowed to
 	be a string. That will probably change in a future release.</p></warning>
@@ -665,91 +830,88 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
     </func>
     <func>
       <name name="objfile_extension" arity="0"/>
-      <fsummary>Object code file extension</fsummary>
+      <fsummary>Object code file extension.</fsummary>
       <desc>
-        <p>Returns the object code file extension that corresponds to
-          the Erlang machine used, namely <c>".beam"</c>.</p>
+        <p>Returns the object code file extension corresponding to
+          the Erlang machine used, namely <c>.beam</c>.</p>
       </desc>
     </func>
     <func>
       <name name="stick_dir" arity="1"/>
-      <fsummary>Mark a directory as sticky</fsummary>
+      <fsummary>Mark a directory as sticky.</fsummary>
       <desc>
-        <p>This function marks <c><anno>Dir</anno></c> as sticky.</p>
-        <p>Returns <c>ok</c> if successful or <c>error</c> if not.</p>
+        <p>Marks <c><anno>Dir</anno></c> as sticky.</p>
+        <p>Returns <c>ok</c> if successful, otherwise <c>error</c>.</p>
       </desc>
     </func>
     <func>
       <name name="unstick_dir" arity="1"/>
-      <fsummary>Remove a sticky directory mark</fsummary>
+      <fsummary>Remove a sticky directory mark.</fsummary>
       <desc>
-        <p>This function unsticks a directory which has been marked as
+        <p>Unsticks a directory that is marked as
           sticky.</p>
-        <p>Returns <c>ok</c> if successful or <c>error</c> if not.</p>
+        <p>Returns <c>ok</c> if successful, otherwise <c>error</c>.</p>
       </desc>
     </func>
     <func>
       <name name="is_sticky" arity="1"/>
-      <fsummary>Test whether a module is sticky</fsummary>
+      <fsummary>Test if a module is sticky.</fsummary>
       <desc>
-        <p>This function returns <c>true</c> if <c><anno>Module</anno></c> is the
+        <p>Returns <c>true</c> if <c><anno>Module</anno></c> is the
 	name of a module that has been loaded from a sticky directory
-	(or in other words: an attempt to reload the module will fail),
+	(in other words: an attempt to reload the module will fail),
 	or <c>false</c> if <c><anno>Module</anno></c> is not a loaded module or is
 	not sticky.</p>
       </desc>
     </func>
     <func>
-      <name name="rehash" arity="0"/>
-      <fsummary>Rehash or create code path cache</fsummary>
-      <desc>
-        <p>This function creates or rehashes the code path cache.</p>
-      </desc>
-    </func>
-    <func>
       <name name="where_is_file" arity="1"/>
-      <fsummary>Full name of a file located in the code path</fsummary>
+      <fsummary>Full name of a file located in the code path.</fsummary>
       <desc>
         <p>Searches the code path for <c><anno>Filename</anno></c>, a file of
           arbitrary type. If found, the full name is returned.
           <c>non_existing</c> is returned if the file cannot be found.
           The function can be useful, for example, to locate
-          application resource files. If the code path cache is used,
-          the code server will efficiently read the full name from
-          the cache, provided that <c><anno>Filename</anno></c> is an object code
-          file or an <c>.app</c> file.</p>
+          application resource files.</p>
       </desc>
     </func>
     <func>
       <name name="clash" arity="0"/>
       <fsummary>Search for modules with identical names.</fsummary>
       <desc>
-        <p>Searches the entire code space for module names with
+        <p>Searches all directories in the code path for module names with
           identical names and writes a report to <c>stdout</c>.</p>
       </desc>
     </func>
     <func>
       <name name="is_module_native" arity="1"/>
-      <fsummary>Test whether a module has native code</fsummary>
+      <fsummary>Test if a module has native code.</fsummary>
       <desc>
-        <p>This function returns <c>true</c> if <c><anno>Module</anno></c> is
-	name of a loaded module that has native code loaded, and 
-	<c>false</c> if <c><anno>Module</anno></c> is loaded but does not have
-	native. If <c><anno>Module</anno></c> is not loaded, this function returns
-	<c>undefined</c>.</p>
+	<p>Returns:</p>
+	<taglist>
+	<tag><c>true</c></tag>
+	<item><p>If <c><anno>Module</anno></c> is the
+	name of a loaded module that has native code loaded</p></item>
+        <tag><c>false</c></tag>
+	<item><p>If <c><anno>Module</anno></c> is loaded but does not have
+	native code</p></item>
+	<tag><c>undefined</c></tag>
+	<item><p>If <c><anno>Module</anno></c> is not loaded</p></item>
+	</taglist>
       </desc>
     </func>
 
     <func>
       <name name="get_mode" arity="0"/>
-      <fsummary>The code_server's mode.</fsummary>
+      <fsummary>The mode of the code server.</fsummary>
       <desc>
-        <p>This function returns an atom describing the code_server's mode:
-        <c>interactive</c> or <c>embedded</c>. </p>
+        <p>Returns an atom describing the mode of the code server:
+        <c>interactive</c> or <c>embedded</c>.</p>
         <p>This information is useful when an external entity (for example,
-        an IDE) provides additional code for a running node. If in interactive
-        mode, it only needs to add to the code path. If in embedded mode,
-        the code has to be loaded with <c>load_binary/3</c></p>
+        an IDE) provides additional code for a running node. If the code server is
+	in interactive mode, it only has to add the path to the code. If the code server
+	is in embedded mode, the code must be loaded with
+	<seealso marker="#load_binary/3"><c>load_binary/3</c></seealso>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/kernel/doc/src/config.xml b/lib/kernel/doc/src/config.xml
index 0e34549482..ba94fefd25 100644
--- a/lib/kernel/doc/src/config.xml
+++ b/lib/kernel/doc/src/config.xml
@@ -11,7 +11,7 @@
       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
@@ -19,7 +19,7 @@
       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.
-    
+
     </legalnotice>
 
     <title>config</title>
@@ -33,94 +33,93 @@
   <description>
     <p>A <em>configuration file</em> contains values for configuration
       parameters for the applications in the system. The <c>erl</c>
-      command line argument <c>-config Name</c> tells the system to use
+      command-line argument <c>-config Name</c> tells the system to use
       data in the system configuration file <c>Name.config</c>.</p>
-    <p>Configuration parameter values in the configuration file will
+    <p>Configuration parameter values in the configuration file
       override the values in the application resource files (see
-      <c>app(4)</c>). The values in the configuration file can be
-      overridden by command line flags (see <c>erl(1)</c>).</p>
+      <seealso marker="app"><c>app(4)</c></seealso>.
+      The values in the configuration file can be
+      overridden by command-line flags (see
+      <seealso marker="erts:erl"><c>erts:erl(1)</c></seealso>.</p>
     <p>The value of a configuration parameter is retrieved by calling
       <c>application:get_env/1,2</c>.</p>
   </description>
 
   <section>
-    <title>FILE SYNTAX</title>
-    <p>The configuration file should be called <c>Name.config</c> where
-      <c>Name</c> is an arbitrary name.</p>
-    <p>The <c>.config</c> file contains one single Erlang term.
-      The file has the following syntax:</p>
+    <title>File Syntax</title>
+    <p>The configuration file is to be called <c>Name.config</c>, where
+      <c>Name</c> is any name.</p>
+    <p>File <c>.config</c> contains a single Erlang term and
+      has the following syntax:</p>
     <code type="none">
-[{Application1, [{Par11, Val11}, ..]},
- ..
- {ApplicationN, [{ParN1, ValN1}, ..]}].</code>
-    <list type="bulleted">
-      <item>
-        <p><c>Application = atom()</c> is the name of the application.</p>
-      </item>
-      <item>
-        <p><c>Par = atom()</c> is the name of a configuration parameter.</p>
-      </item>
-      <item>
-        <p><c>Val = term()</c> is the value of a configuration
-          parameter.</p>
-      </item>
-    </list>
+[{Application1, [{Par11, Val11}, ...]},
+ ...
+ {ApplicationN, [{ParN1, ValN1}, ...]}].</code>
+    <taglist>
+      <tag><c>Application = atom()</c></tag>
+      <item><p>Application name.</p></item>
+      <tag><c>Par = atom()</c></tag>
+      <item><p>Name of a configuration parameter.</p></item>
+      <tag><c>Val = term()</c></tag>
+      <item><p>Value of a configuration parameter.</p></item>
+    </taglist>
   </section>
 
   <section>
     <title>sys.config</title>
     <p>When starting Erlang in embedded mode, it is assumed that
       exactly one system configuration file is used, named
-      <c>sys.config</c>. This file should be located in
+      <c>sys.config</c>. This file is to be located in
       <c>$ROOT/releases/Vsn</c>, where <c>$ROOT</c> is the Erlang/OTP
       root installation directory and <c>Vsn</c> is the release version.</p>
     <p>Release handling relies on this assumption. When installing a
       new release version, the new <c>sys.config</c> is read and used
       to update the application configurations.</p>
-    <p>This means that specifying another, or additional, <c>.config</c>
-      files would lead to inconsistent update of application
+    <p>This means that specifying another <c>.config</c> file, or more
+      <c>.config</c> files, leads to inconsistent update of application
       configurations. Therefore, in Erlang 5.4/OTP R10B, the syntax of
       <c>sys.config</c> was extended to allow pointing out other
       <c>.config</c> files:</p>
     <code type="none">
 [{Application, [{Par, Val}]} | File].</code>
-    <list type="bulleted">
-      <item>
-        <p><c>File = string()</c> is the name of another <c>.config</c>
-          file. The extension <c>.config</c> may be omitted. It is
-          recommended to use absolute paths. A relative path is
-          relative the current working directory of the emulator.</p>
-      </item>
-    </list>
+    <taglist>
+      <tag><c>File = string()</c></tag>
+      <item>Name of another <c>.config</c> file.
+        Extension <c>.config</c> can be omitted. It is
+        recommended to use absolute paths. A relative path is
+        relative the current working directory of the emulator.</item>
+    </taglist>
     <p>When traversing the contents of <c>sys.config</c> and a filename
       is encountered, its contents are read and merged with the result
       so far. When an application configuration tuple
       <c>{Application, Env}</c> is found, it is merged with the result
       so far. Merging means that new parameters are added and existing
-      parameter values overwritten. Example:</p>
+      parameter values overwritten.</p>
+    <p><em>Example:</em></p>
     <code type="none">
 sys.config:
 
 [{myapp,[{par1,val1},{par2,val2}]},
  "/home/user/myconfig"].
 
-
 myconfig.config:
 
 [{myapp,[{par2,val3},{par3,val4}]}].</code>
-    <p>This will yield the following environment for <c>myapp</c>:</p>
+    <p>This yields the following environment for <c>myapp</c>:</p>
     <code type="none">
 [{par1,val1},{par2,val3},{par3,val4}]</code>
-    <p>The behaviour if a file specified in <c>sys.config</c> does not
-      exist or is erroneous in some other way, is backwards compatible.
+    <p>The behavior if a file specified in <c>sys.config</c> does not
+      exist, or is erroneous, is backwards compatible.
       Starting the runtime system will fail. Installing a new release
-      version will not fail, but an error message is given and
+      version will not fail, but an error message is returned and
       the erroneous file is ignored.</p>
   </section>
 
   <section>
-    <title>SEE ALSO</title>
-    <p><c>app(4)</c>, <c>erl(1)</c>, <em>OTP Design Principles</em></p>
+    <title>See Also</title>
+    <p><seealso marker="app"><c>app(4)</c></seealso>,
+      <seealso marker="erts:erl"><c>erts:erl(1)</c></seealso>,
+      <seealso marker="doc/design_principles:des_princ">OTP Design Principles</seealso></p>
   </section>
 </fileref>
 
diff --git a/lib/kernel/doc/src/disk_log.xml b/lib/kernel/doc/src/disk_log.xml
index 7d4a9687ea..0b6ee1e6a5 100644
--- a/lib/kernel/doc/src/disk_log.xml
+++ b/lib/kernel/doc/src/disk_log.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1997</year>
-      <year>2013</year>
+      <year>2016</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -35,149 +35,174 @@
     <file>disk_log.sgml</file>
   </header>
   <module>disk_log</module>
-  <modulesummary>A disk based term logging facility</modulesummary>
+  <modulesummary>A disk-based term logging facility.</modulesummary>
   <description>
-    <p><c>disk_log</c> is a disk based term logger which makes
-      it possible to efficiently log items on files. 
-      Two types of logs are supported,
-      <em>halt logs</em> and <em>wrap logs</em>. A halt log
-      appends items to a single file, the size of which may or may
-      not be limited by the disk log module, whereas a wrap log utilizes
-      a sequence of wrap log files of limited size. As a wrap log file
-      has been filled up, further items are logged onto to the next 
-      file in the sequence, starting all over with the first file when 
-      the last file has been filled up. For the sake of efficiency, 
-      items are always written to files as binaries.
-      </p>
-    <p>Two formats of the log files are supported, the <em>internal format</em> and the <em>external format</em>. The internal
-      format supports automatic repair of log files that have not been
-      properly closed, and makes it possible to efficiently read
-      logged items in <em>chunks</em> using a set of functions defined
-      in this module. In fact, this is the only way to read internally
-      formatted logs. The external format leaves it up to the user to
-      read the logged deep byte lists. The disk log module cannot
-      repair externally formatted logs. An item logged to an
-      internally formatted log must not occupy more than 4 GB of disk
-      space (the size must fit in 4 bytes).
-      </p>
-    <p>For each open disk log there is one process that handles requests 
-      made to the disk log; the disk log process is created when <c>open/1</c>
+    <p><c>disk_log</c> is a disk-based term logger that enables
+      efficient logging of items on files.</p>
+    <p>Two types of logs are supported:</p>
+      <taglist>
+	<tag>halt logs</tag>
+	<item><p>Appends items to a single file, which size can
+	be limited by the disk log module.</p></item>
+	<tag>wrap logs</tag>
+	<item><p>Uses a sequence of wrap log files of limited size. As a
+	wrap log file is filled up, further items are logged on to the next
+	file in the sequence, starting all over with the first file when
+	the last file is filled up.</p></item>
+      </taglist>
+     <p>For efficiency reasons, items are always written to files as binaries.</p>
+
+    <p>Two formats of the log files are supported:</p>
+      <taglist>
+	<tag>internal format</tag>
+	<item><p>Supports automatic repair of log files that are not
+	properly closed and enables efficient reading of logged items in
+	<em>chunks</em> using a set of functions defined in this module.
+	This is the only way to read internally formatted logs.
+	An item logged to an internally formatted log must not occupy more
+	than 4 GB of disk space (the size must fit in 4 bytes).</p></item>
+	<tag>external format</tag>
+	<item><p>Leaves it up to the user to read the logged deep byte lists.
+	The disk log module cannot repair externally formatted logs.</p></item>
+      </taglist>
+
+    <p>For each open disk log, one process handles requests
+      made to the disk log. This process is created when
+      <seealso marker="#open/1"><c>open/1</c></seealso>
       is called, provided there exists no process handling the disk log.
-      A process that opens a disk log can either be an <em>owner</em> 
+      A process that opens a disk log can be an <em>owner</em>
       or an anonymous <em>user</em> of the disk log. Each owner is 
-      linked to the disk log 
-      process, and the disk log is closed by the owner should the 
-      owner terminate. Owners can subscribe to <em>notifications</em>, 
-      messages of the form <c>{disk_log, Node, Log, Info}</c> that are sent
+      linked to the disk log process, and an owner can close the disk log
+      either explicitly (by calling <c>close/1</c> or <c>lclose/1,2</c>)
+      or by terminating.</p>
+      <p>Owners can subscribe to <em>notifications</em>,
+      messages of the form <c>{disk_log, Node, Log, Info}</c>, which are sent
       from the disk log process when certain events occur, see 
-      the commands below and in particular the <c>open/1</c> option 
-      <seealso marker="#notify">notify</seealso>. 
-      There can be several owners of a log, but a process cannot own a 
-      log more than once. One and the same process may, however,
-      open the log 
-      as a user more than once. For a disk log process to properly close 
-      its file and terminate, it must be closed by its owners and once by 
-      some non-owner process for each time the log was used anonymously;
-      the users are counted, and there must not be any users left when the
-      disk log process terminates.
+      the functions and in particular the <c>open/1</c> option
+      <seealso marker="#notify"><c>notify</c></seealso>.
+      A log can have many owners, but a process cannot own a
+      log more than once. However, the same process can open the log
+      as a user more than once.</p>
+      <p>For a disk log process to close its file properly and terminate,
+      it must be closed by its owners and once by some non-owner process
+      for each time the log was used anonymously. The users are counted
+      and there must not be any users left when the disk log process terminates.
       </p>
-    <p>Items can be logged <em>synchronously</em> by using the functions
-      <c>log/2</c>, <c>blog/2</c>, <c>log_terms/2</c> and 
-      <c>blog_terms/2</c>. For each of these functions, the caller is put
-      on hold until the items have been logged (but not necessarily 
+    <p>Items can be logged <em>synchronously</em> by using functions
+      <seealso marker="#log/2"><c>log/2</c></seealso>,
+      <seealso marker="#blog/2"><c>blog/2</c></seealso>,
+      <seealso marker="#log_terms/2"><c>log_terms/2</c></seealso>, and
+      <seealso marker="#blog_terms/2"><c>blog_terms/2</c></seealso>.
+      For each of these functions, the caller is put
+      on hold until the items are logged (but not necessarily
       written, use <c>sync/1</c> to ensure that). By adding an <c>a</c>
-      to each of the mentioned function names we get functions that log
+      to each of the mentioned function names, we get functions that log
       items <em>asynchronously</em>. Asynchronous functions do not wait for
-      the disk log process to actually write the items to the file, but
+      the disk log process to write the items to the file, but
       return the control to the caller more or less immediately.
       </p>
-    <p>When using the internal format for logs, the functions
-      <c>log/2</c>, <c>log_terms/2</c>, <c>alog/2</c>, and
-      <c>alog_terms/2</c> should be used. These functions log one or
-      more Erlang terms. By prefixing each of the functions with
-      a <c>b</c> (for "binary") we get the corresponding <c>blog</c> 
-      functions for the external format. These functions log one or 
-      more deep lists of bytes or, alternatively, binaries of deep lists 
-      of bytes. 
-      For example, to log the string <c>"hello"</c> in ASCII format, we
+    <p>When using the internal format for logs, use functions
+      <seealso marker="#log/2"><c>log/2</c></seealso>,
+      <seealso marker="#log_terms/2"><c>log_terms/2</c></seealso>,
+      <seealso marker="#alog/2"><c>alog/2</c></seealso>, and
+      <seealso marker="#alog_terms/2"><c>alog_terms/2</c></seealso>.
+      These functions log one or more Erlang terms.
+      By prefixing each of the functions with a <c>b</c> (for "binary"),
+      we get the corresponding <c>blog()</c> functions for the external format.
+      These functions log one or more deep lists of bytes or, alternatively,
+      binaries of deep lists of bytes.
+      For example, to log the string <c>"hello"</c> in ASCII format, you
       can use <c>disk_log:blog(Log, "hello")</c>, or
       <c>disk_log:blog(Log, list_to_binary("hello"))</c>. The two
-      alternatives are equally efficient. The <c>blog</c> functions
-      can be used for internally formatted logs as well, but in
-      this case they must be called with binaries constructed with
-      calls to <c>term_to_binary/1</c>. There is no check to ensure
+      alternatives are equally efficient.</p>
+      <p>The <c>blog()</c> functions can also be used for internally formatted
+      logs, but in this case they must be called with binaries constructed
+      with calls to
+      <seealso marker="erts:erlang#term_to_binary/1"><c>term_to_binary/1</c></seealso>.
+      There is no check to ensure
       this, it is entirely the responsibility of the caller. If these
       functions are called with binaries that do not correspond to
-      Erlang terms, the <c>chunk/2,3</c> and automatic repair
-      functions will fail. The corresponding terms (not the binaries)
-      will be returned when <c>chunk/2,3</c> is called.
+      Erlang terms, the
+      <seealso marker="#chunk/2"><c>chunk/2,3</c></seealso>
+      and automatic repair
+      functions fail. The corresponding terms (not the binaries)
+      are returned when <c>chunk/2,3</c> is called.
       </p>
     <p>A collection of open disk logs with the same name running on
-      different nodes is said to be a <em>a distributed disk log</em>
-      if requests made to any one of the logs are automatically made to
-      the other logs as well. The members of such a collection will be
+      different nodes is said to be a <em>distributed disk log</em>
+      if requests made to any of the logs are automatically made to
+      the other logs as well. The members of such a collection are
       called individual distributed disk logs, or just distributed
       disk logs if there is no risk of confusion. There is no order
-      between the members of such a collection. For instance, logged
-      terms are not necessarily written onto the node where the
-      request was made before written onto the other nodes. One could
-      note here that there are a few functions that do not make
-      requests to all members of distributed disk logs, namely
-      <c>info</c>, <c>chunk</c>, <c>bchunk</c>, <c>chunk_step</c> and
-      <c>lclose</c>. An open disk log that is not a distributed disk
+      between the members of such a collection. For example, logged
+      terms are not necessarily written to the node where the
+      request was made before written to the other nodes. However,
+      a few functions do not make requests to all
+      members of distributed disk logs, namely
+      <seealso marker="#info/1"><c>info/1</c></seealso>,
+      <seealso marker="#chunk/2"><c>chunk/2,3</c></seealso>,
+      <seealso marker="#bchunk/2"><c>bchunk/2,3</c></seealso>,
+      <seealso marker="#chunk_step/3"><c>chunk_step/3</c></seealso>, and
+      <seealso marker="#lclose/1"><c>lclose/1,2</c></seealso>.</p>
+     <p>An open disk log that is not a distributed disk
       log is said to be a <em>local disk log</em>. A local disk log is
-      accessible only from the node where the disk log process runs,
+      only accessible from the node where the disk log process runs,
       whereas a distributed disk log is accessible from all nodes in
-      the Erlang system, with exception for those nodes where a local
+      the Erlang system, except for those nodes where a local
       disk log with the same name as the distributed disk log exists.
       All processes on nodes that have access to a local or
-      distributed disk log can log items or otherwise change, inspect
+      distributed disk log can log items or otherwise change, inspect,
       or close the log.
       </p>
     <p>It is not guaranteed that all log files of a distributed disk log 
-      contain the same log items; there is no attempt made to synchronize
+      contain the same log items. No attempt is made to synchronize
       the contents of the files. However, as long as at least one of 
-      the involved nodes is alive at each time, all items will be logged. 
+      the involved nodes is alive at each time, all items are logged.
       When logging items to a distributed log, or otherwise trying to
       change the log, the replies from individual logs are
       ignored. If all nodes are down, the disk log functions
       reply with a <c>nonode</c> error.
       </p>
     <note>
-      <p>In some applications it may not be acceptable that
+      <p>In some applications, it can be unacceptable that
         replies from individual logs are ignored. An alternative in such
-        situations is to use several local disk logs instead of one
+        situations is to use many local disk logs instead of one
         distributed disk log, and implement the distribution without use
-        of the disk log module.</p>
+        of the <c>disk_log</c> module.</p>
     </note>
     <p>Errors are reported differently for asynchronous log attempts
-      and other uses of the disk log module. When used synchronously
-      the disk log module replies with an error message, but when called
-      asynchronously, the disk log module does not know where to send 
-      the error message. Instead owners subscribing to notifications will 
+      and other uses of the <c>disk_log</c> module. When used synchronously,
+      this module replies with an error message, but when called
+      asynchronously, this module does not know where to send
+      the error message. Instead, owners subscribing to notifications
       receive an <c>error_status</c> message. 
       </p>
-    <p>The disk log module itself does not report errors to the
-      <c>error_logger</c> module; it is up to the caller to decide
-      whether the error logger should be employed or not. The function
-      <c>format_error/1</c> can be used to produce readable messages
-      from error replies. Information events are however sent to the
-      error logger in two situations, namely when a log is repaired,
-      or when a file is missing while reading chunks.
+    <p>The <c>disk_log</c> module does not report errors to the
+      <seealso marker="error_logger"><c>error_logger</c></seealso>
+      module. It is up to the caller to decide
+      whether to employ the error logger. Function
+      <seealso marker="#format_error/1"><c>format_error/1</c></seealso>
+      can be used to produce readable messages from error replies.
+      However, information events are sent to the error logger in two
+      situations, namely when a log is repaired, or when a file is missing
+      while reading chunks.
       </p>
-    <p>The error message <c>no_such_log</c> means that the given
-      disk log is not currently open. Nothing is said about 
-      whether the disk log files exist or not.
+    <p>Error message <c>no_such_log</c> means that the specified
+      disk log is not open. Nothing is said about whether the disk log
+      files exist or not.
       </p>
     <note>
       <p>If an attempt to reopen or truncate a log fails (see
-        <c>reopen</c> and <c>truncate</c>) the disk log process
-        immediately terminates. Before the process terminates links to
-        to owners and blocking processes (see <c>block</c>) are removed.
-        The effect is that the links work in one direction only; any
-        process using a disk log has to check for the error message
-        <c>no_such_log</c> if some other process might truncate or
-        reopen the log simultaneously.</p>
+        <seealso marker="#reopen/2"><c>reopen/2,3</c></seealso>
+	and
+	<seealso marker ="#truncate/1"><c>truncate/1,2</c></seealso>)
+	the disk log process terminates immediately. Before the process
+	terminates, links to owners and blocking processes (see
+	<seealso marker="#block/1"><c>block/1,2</c></seealso>) are removed.
+        The effect is that the links work in one direction only. Any
+        process using a disk log must check for error message
+        <c>no_such_log</c> if some other process truncates or
+        reopens the log simultaneously.</p>
     </note>
   </description>
   <datatypes>
@@ -221,11 +246,10 @@
   <funcs>
     <func>
       <name name="accessible_logs" arity="0"/>
-      <fsummary>Return the accessible disk logs on the  current node.</fsummary>
+      <fsummary>Return the accessible disk logs on the current node.</fsummary>
       <desc>
-        <p>The <c>accessible_logs/0</c> function returns
-          the names of the disk logs accessible on the current node.
-          The first list contains local disk logs, and the
+        <p>Returns the names of the disk logs accessible on the current node.
+          The first list contains local disk logs and the
           second list contains distributed disk logs.
           </p>
       </desc>
@@ -233,55 +257,55 @@
     <func>
       <name name="alog" arity="2"/>
       <name name="balog" arity="2"/>
-      <fsummary>Asynchronously log an item onto a disk log.</fsummary>
+      <fsummary>Asynchronously log an item on to a disk log.</fsummary>
       <type variable="Log"/>
       <type variable="Term" name_i="1"/>
       <type variable="Bytes"/>
       <type name="notify_ret"/>
       <desc>
-        <p>The <c>alog/2</c> and <c>balog/2</c> functions asynchronously
-          append an item to a disk log. The function <c>alog/2</c> is 
-          used for internally formatted logs, and the function <c>balog/2</c>
-          for externally formatted logs. <c>balog/2</c> can be used
-          for internally formatted logs as well provided the binary was
-          constructed with a call to <c>term_to_binary/1</c>.
+        <p>Asynchronously append an item to a disk log. <c>alog/2</c> is
+          used for internally formatted logs and <c>balog/2</c>
+          for externally formatted logs. <c>balog/2</c> can also be used
+          for internally formatted logs if the binary is
+          constructed with a call to
+	  <seealso marker="erts:erlang#term_to_binary/1"><c>term_to_binary/1</c></seealso>.
           </p>
-        <p>The owners that subscribe to notifications will receive the 
-          message <c>read_only</c>, <c>blocked_log</c> 
-          or <c>format_external</c> in case the item cannot be written
+        <p>Owners subscribing to notifications receive
+          message <c>read_only</c>, <c>blocked_log</c>,
+          or <c>format_external</c> if the item cannot be written
           on the log, and possibly one of the messages <c>wrap</c>,
-          <c>full</c> and <c>error_status</c> if an item was written 
-          on the log. The message <c>error_status</c> is sent if there
-          is something wrong with the header function or a file error
-          occurred.
+          <c>full</c>, or <c>error_status</c> if an item is written
+          on the log. Message <c>error_status</c> is sent if
+          something is wrong with the header function or if a file error
+          occurs.
           </p>
       </desc>
     </func>
     <func>
       <name name="alog_terms" arity="2"/>
       <name name="balog_terms" arity="2"/>
-      <fsummary>Asynchronously log several items onto a disk log.</fsummary>
+      <fsummary>Asynchronously log many items on to a disk log.</fsummary>
       <type variable="Log"/>
       <type variable="TermList" name_i="1"/>
       <type variable="ByteList"/>
       <type name="notify_ret"/>
       <desc>
-        <p>The <c>alog_terms/2</c> and <c>balog_terms/2</c> functions 
-          asynchronously append a list of items to a disk log. 
-          The function <c>alog_terms/2</c> is used for internally 
-          formatted logs, and the function <c>balog_terms/2</c>
-          for externally formatted logs. <c>balog_terms/2</c> can be used
-          for internally formatted logs as well provided the binaries were
-          constructed with calls to <c>term_to_binary/1</c>.
+        <p>Asynchronously append a list of items to a disk log.
+          <c>alog_terms/2</c> is used for internally
+          formatted logs and <c>balog_terms/2</c>
+          for externally formatted logs. <c>balog_terms/2</c> can also be used
+          for internally formatted logs if the binaries are
+          constructed with calls to
+	  <seealso marker="erts:erlang#term_to_binary/1"><c>term_to_binary/1</c></seealso>.
           </p>
-        <p>The owners that subscribe to notifications will receive the 
-          message <c>read_only</c>, <c>blocked_log</c> 
-          or <c>format_external</c> in case the items cannot be written
+        <p>Owners subscribing to notifications receive
+          message <c>read_only</c>, <c>blocked_log</c>,
+          or <c>format_external</c> if the items cannot be written
           on the log, and possibly one or more of the messages <c>wrap</c>,
-          <c>full</c> and <c>error_status</c> if items were written 
-          on the log. The message <c>error_status</c> is sent if there
-          is something wrong with the header function or a file error 
-          occurred.
+          <c>full</c>, and <c>error_status</c> if items are written
+          on the log. Message <c>error_status</c> is sent if
+          something is wrong with the header function or if a file error
+          occurs.
           </p>
       </desc>
     </func>
@@ -294,76 +318,75 @@
         <p>With a call to <c>block/1,2</c> a process can block a log.
           If the blocking process is not an owner of the log, a temporary
           link is created between the disk log process and the blocking
-          process. The link is used to ensure that the disk log is 
-          unblocked should the blocking process terminate without 
+          process. The link ensures that the disk log is
+          unblocked if the blocking process terminates without
           first closing or unblocking the log.
           </p>
         <p>Any process can probe a blocked log with <c>info/1</c> or
           close it with <c>close/1</c>. The blocking process can also
-          use the functions <c>chunk/2,3</c>, <c>bchunk/2,3</c>,
+          use functions <c>chunk/2,3</c>, <c>bchunk/2,3</c>,
           <c>chunk_step/3</c>, and <c>unblock/1</c> without being
-          affected by the block. Any other attempt than those hitherto
-          mentioned to update or read a blocked log suspends the
-          calling process until the log is unblocked or returns an
+          affected by the block. Any other attempt than those
+          mentioned so far to update or read a blocked log suspends the
+          calling process until the log is unblocked or returns
           error message <c>{blocked_log, <anno>Log</anno>}</c>, depending on
           whether the value of <c><anno>QueueLogRecords</anno></c> is <c>true</c>
-          or <c>false</c>. The default value of <c><anno>QueueLogRecords</anno></c>
-          is <c>true</c>, which is used by <c>block/1</c>.
+          or <c>false</c>. <c><anno>QueueLogRecords</anno></c> defaults to
+          <c>true</c>, which is used by <c>block/1</c>.
           </p>
       </desc>
     </func>
     <func>
       <name name="change_header" arity="2"/>
-      <fsummary>Change the head or head_func option for an owner of  a disk log.</fsummary>
+      <fsummary>Change option head or head_func for an owner of a disk log.</fsummary>
       <desc>
-        <p>The <c>change_header/2</c> function changes the value of 
-          the <c>head</c> or <c>head_func</c> option of a disk log.</p>
+        <p>Changes the value of option <c>head</c> or <c>head_func</c> for an owner of a disk log.</p>
       </desc>
     </func>
     <func>
       <name name="change_notify" arity="3"/>
-      <fsummary>Change the notify option for an owner of a  disk log.</fsummary>
+      <fsummary>Change option notify for an owner of a disk log.</fsummary>
       <desc>
-        <p>The <c>change_notify/3</c> function changes the value of the
-          <c>notify</c> option for an owner of a disk log. </p>
+        <p>Changes the value of option <c>notify</c> for an owner of a disk log. </p>
       </desc>
     </func>
     <func>
       <name name="change_size" arity="2"/>
       <fsummary>Change the size of an open disk log.</fsummary>
       <desc>
-        <p>The <c>change_size/2</c> function changes the size of an open log. 
-          For a halt log it is always possible to increase the size, 
-          but it is not possible to decrease the size to something less than 
-          the current size of the file.
+        <p>Changes the size of an open log.
+          For a halt log, the size can always be increased,
+          but it cannot be decreased to something less than
+          the current file size.
           </p>
-        <p>For a wrap log it is always possible to increase both the
-          size and number of files, as long as the number of files does not 
+        <p>For a wrap log, both the size and the number of files can always
+	  be increased, as long as the number of files does not
           exceed 65000. If the maximum number of files is decreased, the
-          change will not be valid until the current file is full and the 
+          change is not valid until the current file is full and the
           log wraps to the next file.
-          The redundant files will be removed next time the log wraps around, 
-          i.e. starts to log to file number 1.
+          The redundant files are removed the next time the log wraps around,
+          that is, starts to log to file number 1.
           </p>
         <p>As an example, assume that the old maximum number of files 
           is 10 and that the new maximum number of files is 6. If 
           the current file number is not greater than the new maximum number 
-          of files, the files 7 to 10 will be removed when file number 6 
+          of files, files 7-10 are removed when file 6
           is full and the log starts to write to file number 1 again. 
-          Otherwise the files greater than the current 
-          file will be removed when the current file is full (e.g. if  
-          the current file is 8, the files 9 and 10); the files between 
-          new maximum number of files and the current 
-          file (i.e. files 7 and 8) will be removed next time file number 6
+          Otherwise, the files greater than the current
+          file are removed when the current file is full (for example, if
+          the current file is 8, files 9 and 10 are removed). The files between
+          the new maximum number of files and the current
+          file (that is, files 7 and 8) are removed the next time file 6
           is full.
           </p>
-        <p>If the size of the files is decreased the change will immediately
-          affect the current log. It will not of course change the 
-          size of log files already full until next time they are used.
+        <p>If the size of the files is decreased, the change immediately
+          affects the current log. It does not change the
+          size of log files already full until the next time they are used.
           </p>
-        <p>If the log size is decreased for instance to save space, 
-          the function <c>inc_wrap_file/1</c> can be used to force the log 
-          to wrap.
+        <p>If the log size is decreased, for example, to save space,
+          function
+	  <seealso marker="#inc_wrap_file/1"><c>inc_wrap_file/1</c></seealso>
+	  can be used to force the log to wrap.
           </p>
       </desc>
     </func>
@@ -380,93 +403,85 @@
       <type name="bchunk_ret"/>
       <type name="chunk_error_rsn"/>
       <desc>
-        <p>The <c>chunk/2,3</c> and <c>bchunk/2,3</c> functions make
-          it possible to efficiently read the terms which have been
-          appended to an internally formatted log. It minimizes disk
-          I/O by reading 64 kilobyte chunks from the file. The
-          <c>bchunk/2,3</c> functions return the binaries read from
-          the file; they do not call <c>binary_to_term</c>. Otherwise
-          the work just like <c>chunk/2,3</c>.
+        <p>Efficiently reads the terms that are appended
+	  to an internally formatted log. It minimizes disk
+          I/O by reading 64 kilobyte chunks from the file. Functions
+          <c>bchunk/2,3</c> return the binaries read from
+          the file, they do not call <c>binary_to_term()</c>. Apart from that,
+          they work just like <c>chunk/2,3</c>.
           </p>
-        <p>The first time <c>chunk</c> (or <c>bchunk</c>) is called,
+        <p>The first time <c>chunk()</c> (or <c>bchunk()</c>) is called,
           an initial continuation, the atom <c>start</c>, must be
-          provided. If there is a disk log process running on the
-          current node, terms are read from that log, otherwise an
+          provided. If a disk log process is running on the
+          current node, terms are read from that log. Otherwise, an
           individual distributed log on some other node is chosen, if
           such a log exists.
           </p>
         <p>When <c>chunk/3</c> is called, <c><anno>N</anno></c> controls the
           maximum number of terms that are read from the log in each
-          chunk. Default is <c>infinity</c>, which means that all the
+          chunk. Defaults to <c>infinity</c>, which means that all the
           terms contained in the 64 kilobyte chunk are read. If less than
           <c><anno>N</anno></c> terms are returned, this does not necessarily mean
-          that the end of the file has been reached.
+          that the end of the file is reached.
           </p>
-        <p>The <c>chunk</c> function returns a tuple
-          <c>{<anno>Continuation2</anno>, <anno>Terms</anno>}</c>, where <c><anno>Terms</anno></c> is a list
+        <p><c>chunk()</c> returns a tuple
+          <c>{<anno>Continuation2</anno>, <anno>Terms</anno>}</c>, where
+	  <c><anno>Terms</anno></c> is a list
           of terms found in the log. <c><anno>Continuation2</anno></c> is yet
-          another continuation which must be passed on to any
-          subsequent calls to <c>chunk</c>. With a series of calls to
-          <c>chunk</c> it is possible to extract all terms from a log.
+          another continuation, which must be passed on to any
+          subsequent calls to <c>chunk()</c>. With a series of calls to
+          <c>chunk()</c>, all terms from a log can be extracted.
           </p>
-        <p>The <c>chunk</c> function returns a tuple
-          <c>{<anno>Continuation2</anno>, <anno>Terms</anno>, <anno>Badbytes</anno>}</c> if the log is opened
-          in read-only mode and the read chunk is corrupt. <c><anno>Badbytes</anno></c>
-          is the number of bytes in the file which were found not to be
-          Erlang terms in the chunk. Note also that the log is not repaired.
+        <p><c>chunk()</c> returns a tuple
+          <c>{<anno>Continuation2</anno>, <anno>Terms</anno>, <anno>Badbytes</anno>}</c>
+	  if the log is opened in read-only mode and the read chunk is corrupt.
+	  <c><anno>Badbytes</anno></c> is the number of bytes in the file found not to be
+          Erlang terms in the chunk. Notice that the log is not repaired.
           When trying to read chunks from a log opened in read-write mode,
-          the tuple <c>{corrupt_log_file, <anno>FileName</anno>}</c> is returned if the
+          tuple <c>{corrupt_log_file, <anno>FileName</anno>}</c> is returned if the
           read chunk is corrupt.
           </p>
-        <p><c>chunk</c> returns <c>eof</c> when the end of the log is
-          reached, or <c>{error, <anno>Reason</anno>}</c> if an error occurs. Should
-          a wrap log file be missing, a message is output on the error log.
+        <p><c>chunk()</c> returns <c>eof</c> when the end of the log is
+          reached, or <c>{error, <anno>Reason</anno>}</c> if an error occurs. If
+          a wrap log file is missing, a message is output on the error log.
           </p>
         <p>When <c>chunk/2,3</c> is used with wrap logs, the returned
-          continuation may or may not be valid in the next call to
-          <c>chunk</c>. This is because the log may wrap and delete
-          the file into which the continuation points. To make sure
-          this does not happen, the log can be blocked during the
-          search.
+          continuation might not be valid in the next call to
+          <c>chunk()</c>. This is because the log can wrap and delete
+          the file into which the continuation points. To prevent this,
+          the log can be blocked during the search.
           </p>
       </desc>
     </func>
     <func>
       <name name="chunk_info" arity="1"/>
-      <fsummary>Return information about a chunk continuation of  a disk log.</fsummary>
+      <fsummary>Return information about a chunk continuation of a disk log.</fsummary>
       <desc>
-        <p>The <c>chunk_info/1</c> function returns the following pair
+        <p>Returns the pair <c>{node, <anno>Node</anno>}</c>,
           describing the chunk continuation returned by
-          <c>chunk/2,3</c>, <c>bchunk/2,3</c>, or <c>chunk_step/3</c>:
-          </p>
-        <list type="bulleted">
-          <item>
-            <p><c>{node, <anno>Node</anno>}</c>. Terms are read from
-              the disk log running on <c><anno>Node</anno></c>.</p>
-          </item>
-        </list>
+          <c>chunk/2,3</c>, <c>bchunk/2,3</c>, or <c>chunk_step/3</c>.</p>
+	  <p>Terms are read from the disk log running on <c><anno>Node</anno></c>.</p>
       </desc>
     </func>
     <func>
       <name name="chunk_step" arity="3"/>
-      <fsummary>Step forward or backward among the wrap log files  of a disk log.</fsummary>
+      <fsummary>Step forward or backward among the wrap log files of a disk log.</fsummary>
       <desc>
-        <p>The function <c>chunk_step</c> can be used in conjunction
-          with <c>chunk/2,3</c> and <c>bchunk/2,3</c> to search
-          through an internally formatted wrap log. It takes as
+        <p>Can be used with <c>chunk/2,3</c> and <c>bchunk/2,3</c>
+	  to search through an internally formatted wrap log. It takes as
           argument a continuation as returned by <c>chunk/2,3</c>,
           <c>bchunk/2,3</c>, or <c>chunk_step/3</c>, and steps forward
           (or backward) <c><anno>Step</anno></c> files in the wrap log. The
-          continuation returned points to the first log item in the
+          continuation returned, points to the first log item in the
           new current file.
           </p>
-        <p>If the atom <c>start</c> is given as continuation, a disk log
+        <p>If atom <c>start</c> is specified as continuation, a disk log
           to read terms from is chosen. A local or distributed disk log
           on the current node is preferred to an
           individual distributed log on some other node.
           </p>
-        <p>If the wrap log is not full because all files have not been
-          used yet, <c>{error, end_of_log}</c> is returned if trying to
+        <p>If the wrap log is not full because all files are not yet
+          used, <c>{error, end_of_log}</c> is returned if trying to
           step outside the log.
           </p>
       </desc>
@@ -476,21 +491,20 @@
       <fsummary>Close a disk log.</fsummary>
       <type name="close_error_rsn"/>
       <desc>
-        <p><marker id="close_1"></marker>The function <c>close/1</c> closes a
+        <p><marker id="close_1"></marker>Closes a
           local or distributed disk log properly. An internally
           formatted log must be closed before the Erlang system is
-          stopped, otherwise the log is regarded as unclosed and the
-          automatic repair procedure will be activated next time the
+          stopped. Otherwise, the log is regarded as unclosed and the
+          automatic repair procedure is activated next time the
           log is opened.
           </p>
-        <p>The disk log process in not terminated as long as there are
-          owners or users of the log. It should be stressed that each
-          and every owner must close the log, possibly by terminating,
-          and that any other process - not only the processes that have 
-          opened the log anonymously - can decrement the <c>users</c>
+        <p>The disk log process is not terminated as long as there are
+          owners or users of the log. All owners must close the log,
+	  possibly by terminating. Also, any other process, not only the processes
+	  that have opened the log anonymously, can decrement the <c>users</c>
           counter by closing the log. 
           Attempts to close a log by a process that is 
-          not an owner are simply ignored if there are no users.
+          not an owner are ignored if there are no users.
           </p>
         <p>If the log is blocked by the closing process, the log is also
           unblocked.
@@ -499,12 +513,14 @@
     </func>
     <func>
       <name name="format_error" arity="1"/>
-      <fsummary>Return an English description of a disk log  error reply.</fsummary>
+      <fsummary>Return an English description of a disk log error reply.</fsummary>
       <desc>
         <p>Given the error returned by any function in this module, 
-          the function <c>format_error</c> returns a descriptive string
-          of the error in English. For file errors, the function 
-          <c>format_error/1</c> in the <c>file</c> module is called.</p>
+          this function returns a descriptive string
+          of the error in English. For file errors, function
+          <c>format_error/1</c> in module
+	  <seealso marker="file#format_error/1"><c>file</c></seealso>
+	  is called.</p>
       </desc>
     </func>
     <func>
@@ -513,16 +529,15 @@
       <type name="inc_wrap_error_rsn"/>
       <type name="invalid_header"/>
       <desc>
-        <p>The <c>inc_wrap_file/1</c> function forces the internally formatted 
-          disk log to start logging to the 
-          next log file. It can be used, for instance, in conjunction with
+        <p>Forces the internally formatted disk log to start logging to the
+          next log file. It can be used, for example, with
           <c>change_size/2</c> to reduce the amount of disk space allocated
           by the disk log.
           </p>
-        <p>The owners that subscribe to notifications will normally 
-          receive a <c>wrap</c> message, but in case of 
-          an error with a reason tag of <c>invalid_header</c> or 
-          <c>file_error</c> an <c>error_status</c> message will be sent.</p>
+        <p>Owners subscribing to notifications normally
+          receive a <c>wrap</c> message, but if
+          an error occurs with a reason tag of <c>invalid_header</c> or
+          <c>file_error</c>, an <c>error_status</c> message is sent.</p>
       </desc>
     </func>
     <func>
@@ -530,132 +545,148 @@
       <fsummary>Return information about a disk log.</fsummary>
       <type name="dlog_info"/>
       <desc>
-        <p>The <c>info/1</c> function returns a list of <c>{Tag, Value}</c> 
-          pairs describing the log. If there is a disk log process running
-          on the current node, that log is used as source of information,
-          otherwise an individual distributed log on
-          some other node is chosen, if such a log exists.
+        <p>Returns a list of <c>{Tag, Value}</c> pairs describing the log.
+	  If a disk log process is running on the current node,
+	  that log is used as source of information, otherwise an individual
+	  distributed log on some other node is chosen, if such a log exists.
           </p>
         <p>The following pairs are returned for all logs:
           </p>
-        <list type="bulleted">
+        <taglist>
+	  <tag><c>{name, <anno>Log</anno>}</c></tag>
           <item>
-            <p><c>{name, <anno>Log</anno>}</c>, where <c><anno>Log</anno></c> is the name of
-              the log as given by the <c>open/1</c> option <c>name</c>.</p>
+            <p><c><anno>Log</anno></c> is the log name
+              as specified by the <c>open/1</c> option <c>name</c>.</p>
           </item>
+	  <tag><c>{file, <anno>File</anno>}</c></tag>
           <item>
-            <p><c>{file, <anno>File</anno>}</c>. For halt logs <c><anno>File</anno></c> is the
+            <p>For halt logs <c><anno>File</anno></c> is the
               filename, and for wrap logs <c><anno>File</anno></c> is the base name.</p>
           </item>
+	  <tag><c>{type, <anno>Type</anno>}</c></tag>
           <item>
-            <p><c>{type, <anno>Type</anno>}</c>, where <c><anno>Type</anno></c> is the type of
-              the log as given by the <c>open/1</c> option <c>type</c>.</p>
+            <p><c><anno>Type</anno></c> is the log type
+              as specified by the <c>open/1</c> option <c>type</c>.</p>
           </item>
+	  <tag><c>{format, <anno>Format</anno>}</c></tag>
           <item>
-            <p><c>{format, <anno>Format</anno>}</c>, where <c><anno>Format</anno></c> is the format
-              of the log as given by the <c>open/1</c> option <c>format</c>.</p>
+            <p><c><anno>Format</anno></c> is the log format
+              as specified by the <c>open/1</c> option <c>format</c>.</p>
           </item>
+	  <tag><c>{size, <anno>Size</anno>}</c></tag>
           <item>
-            <p><c>{size, <anno>Size</anno>}</c>, where <c><anno>Size</anno></c> is the size
-              of the log as given by the <c>open/1</c> option <c>size</c>,
+            <p><c><anno>Size</anno></c> is the log size
+              as specified by the <c>open/1</c> option <c>size</c>,
               or the size set by <c>change_size/2</c>. The value set by 
               <c>change_size/2</c> is reflected immediately.</p>
           </item>
+	  <tag><c>{mode, <anno>Mode</anno>}</c></tag>
           <item>
-            <p><c>{mode, <anno>Mode</anno>}</c>, where <c><anno>Mode</anno></c> is the mode
-              of the log as given by the <c>open/1</c> option <c>mode</c>.</p>
+            <p><c><anno>Mode</anno></c> is the log mode
+              as specified by the <c>open/1</c> option <c>mode</c>.</p>
           </item>
+	  <tag><c>{owners, [{pid(), <anno>Notify</anno>}]}</c></tag>
           <item>
-            <p><c>{owners, [{pid(), <anno>Notify</anno>}]}</c> where <c><anno>Notify</anno></c>
+            <p><c><anno>Notify</anno></c>
               is the value set by the <c>open/1</c> option <c>notify</c>
-              or the function <c>change_notify/3</c> for the owners of 
+              or function <c>change_notify/3</c> for the owners of
               the log.</p>
           </item>
+	  <tag><c>{users, <anno>Users</anno>}</c></tag>
           <item>
-            <p><c>{users, <anno>Users</anno>}</c> where <c><anno>Users</anno></c> is the number
+            <p><c><anno>Users</anno></c> is the number
               of anonymous users of the log, see the <c>open/1</c> option
-              <seealso marker="#linkto">linkto</seealso>.</p>
+              <seealso marker="#linkto"><c>linkto</c></seealso>.</p>
           </item>
+	  <tag><c>{status, <anno>Status</anno>}</c></tag>
           <item>
-            <p><c>{status, <anno>Status</anno>}</c>, where <c><anno>Status</anno></c> is <c>ok</c>
-              or <c>{blocked, <anno>QueueLogRecords</anno>}</c> as set by the functions
+            <p><c><anno>Status</anno></c> is <c>ok</c>
+              or <c>{blocked, <anno>QueueLogRecords</anno>}</c> as set by functions
               <c>block/1,2</c> and <c>unblock/1</c>.</p>
           </item>
+	  <tag><c>{node, <anno>Node</anno>}</c></tag>
           <item>
-            <p><c>{node, <anno>Node</anno>}</c>. The information returned by the
-              current invocation of the <c>info/1</c> function has been
+            <p>The information returned by the
+              current invocation of function <c>info/1</c> is
               gathered from the disk log process running on <c><anno>Node</anno></c>.</p>
           </item>
+	  <tag><c>{distributed, <anno>Dist</anno>}</c></tag>
           <item>
-            <p><c>{distributed, <anno>Dist</anno>}</c>. If the log is local on
-              the current node, then <c><anno>Dist</anno></c> has the value <c>local</c>,
+            <p>If the log is local on
+              the current node, <c><anno>Dist</anno></c> has the value <c>local</c>,
               otherwise all nodes where the log is distributed
               are returned as a list.</p>
           </item>
-        </list>
+        </taglist>
         <p>The following pairs are returned for all logs opened in 
           <c>read_write</c> mode:
           </p>
-        <list type="bulleted">
+        <taglist>
+	  <tag><c>{head, <anno>Head</anno>}</c></tag>
           <item>
-            <p><c>{head, <anno>Head</anno>}</c>. Depending of the value of
-              the <c>open/1</c> options <c>head</c> and <c>head_func</c>
-              or set by the function <c>change_header/2</c>, the value
+            <p>Depending on the value of
+              the <c>open/1</c> options <c>head</c> and <c>head_func</c>,
+              or set by function <c>change_header/2</c>, the value
               of <c><anno>Head</anno></c> is <c>none</c> (default),
-              <c>{head, H}</c> (<c>head</c> option) or <c>{M,F,A}</c> 
+              <c>{head, H}</c> (<c>head</c> option), or <c>{M,F,A}</c>
               (<c>head_func</c> option).</p>
           </item>
+	  <tag><c>{no_written_items, <anno>NoWrittenItems</anno>}</c></tag>
           <item>
-            <p><c>{no_written_items, <anno>NoWrittenItems</anno>}</c>, where
-              <c><anno>NoWrittenItems</anno></c> is the number of items
+            <p><c><anno>NoWrittenItems</anno></c> is the number of items
               written to the log since the disk log process was created.</p>
           </item>
-        </list>
+        </taglist>
         <p>The following pair is returned for halt logs opened in 
           <c>read_write</c> mode:
           </p>
-        <list type="bulleted">
+        <taglist>
+	  <tag><c>{full, <anno>Full</anno>}</c></tag>
           <item>
-            <p><c>{full, <anno>Full</anno>}</c>, where <c><anno>Full</anno></c> is <c>true</c> or
+            <p><c><anno>Full</anno></c> is <c>true</c> or
               <c>false</c> depending on whether the halt log is full or not.</p>
           </item>
-        </list>
+        </taglist>
         <p>The following pairs are returned for wrap logs opened in 
           <c>read_write</c> mode:
           </p>
-        <list type="bulleted">
+        <taglist>
+	  <tag><c>{no_current_bytes, integer() >= 0}</c></tag>
           <item>
-            <p><c>{no_current_bytes, integer() >= 0}</c> is the number
+            <p>The number
               of bytes written to the current wrap log file.</p>
           </item>
+	  <tag><c>{no_current_items, integer() >= 0}</c></tag>
           <item>
-            <p><c>{no_current_items, integer() >= 0}</c> is the number
+            <p>The number
               of items written to the current wrap log file, header
               inclusive.</p>
           </item>
+	  <tag><c>{no_items, integer() >= 0}</c></tag>
           <item>
-            <p><c>{no_items, integer() >= 0}</c> is the total number
+            <p>The total number
               of items in all wrap log files.</p>
           </item>
+	  <tag><c>{current_file, integer()}</c></tag>
           <item>
-            <p><c>{current_file, integer()}</c> is the ordinal for
+            <p>The ordinal for
               the current wrap log file in the range <c>1..MaxNoFiles</c>,
-              where <c>MaxNoFiles</c> is given by the <c>open/1</c> option
+              where <c>MaxNoFiles</c> is specified by the <c>open/1</c> option
               <c>size</c> or set by <c>change_size/2</c>.</p>
           </item>
+	  <tag><c>{no_overflows, {<anno>SinceLogWasOpened</anno>, <anno>SinceLastInfo</anno>}}</c></tag>
           <item>
-            <p><c>{no_overflows, {<anno>SinceLogWasOpened</anno>, <anno>SinceLastInfo</anno>}}</c>,
-              where <c><anno>SinceLogWasOpened</anno></c> (<c><anno>SinceLastInfo</anno></c>) is
-              the number of times a wrap log file has been filled up and a 
-              new one opened or <c>inc_wrap_file/1</c> has been called since 
+            <p><c><anno>SinceLogWasOpened</anno></c> (<c><anno>SinceLastInfo</anno></c>)
+	      is the number of times a wrap log file has been filled up and a
+              new one is opened or <c>inc_wrap_file/1</c> has been called since
               the disk log was last opened (<c>info/1</c> 
               was last called). The first time <c>info/2</c> is called 
               after a log was (re)opened or truncated, the two values 
               are equal.</p>
           </item>
-        </list>
-        <p>Note that the <c>chunk/2,3</c>, <c>bchunk/2,3</c>, and
-          <c>chunk_step/3</c> functions do not affect any value
+        </taglist>
+        <p>Notice that functions <c>chunk/2,3</c>, <c>bchunk/2,3</c>, and
+          <c>chunk_step/3</c> do not affect any value
           returned by <c>info/1</c>.
           </p>
       </desc>
@@ -666,17 +697,16 @@
       <fsummary>Close a disk log on one node.</fsummary>
       <type name="lclose_error_rsn"/>
       <desc>
-        <p>The function <c>lclose/1</c> closes a local log or an
-          individual distributed log on the current node.
-          The function <c>lclose/2</c> closes an individual
-          distributed log on the specified node if the node
-          is not the current one.
-          <c>lclose(<anno>Log</anno>)</c> is equivalent to
+        <p><c>lclose/1</c> closes a local log or an individual distributed
+	log on the current node.</p>
+        <p><c>lclose/2</c> closes an individual distributed log on the
+	specified node if the node is not the current one.</p>
+        <p><c>lclose(<anno>Log</anno>)</c> is equivalent to
           <c>lclose(<anno>Log</anno>,&nbsp;node())</c>.
-          See also <seealso marker="#close_1">close/1</seealso>.
+          See also <seealso marker="#close_1"><c>close/1</c></seealso>.
           </p>
-        <p>If there is no log with the given name
-          on the specified node, <c>no_such_log</c> is returned. 
+        <p>If no log with the specified name exist on the specified node,
+	<c>no_such_log</c> is returned.
           </p>
       </desc>
     </func>
@@ -689,25 +719,27 @@
       <type variable="Bytes"/>
       <type name="log_error_rsn"/>
       <desc>
-        <p>The <c>log/2</c> and <c>blog/2</c> functions synchronously
-          append a term to a disk log. They return <c>ok</c> or
-          <c>{error, <anno>Reason</anno>}</c> when the term has been written to
-          disk. If the log is distributed, <c>ok</c> is always
-          returned, unless all nodes are down. Terms are written by
-          means of the ordinary <c>write()</c> function of the
-          operating system. Hence, there is no guarantee that the term
-          has actually been written to the disk, it might linger in
-          the operating system kernel for a while. To make sure the
-          item is actually written to disk, the <c>sync/1</c> function
+        <p>Synchronously
+          appends a term to a disk log. Returns <c>ok</c> or
+          <c>{error, <anno>Reason</anno>}</c> when the term is written to
+          disk. If the log is distributed, <c>ok</c> is returned,
+	  unless all nodes are down. Terms are written by
+          the ordinary <c>write()</c> function of the
+          operating system. Hence, it is not guaranteed that the term
+          is written to disk, it can linger in
+          the operating system kernel for a while. To ensure that the
+          item is written to disk, function
+	  <seealso marker="#sync/1"><c>sync/1</c></seealso>
           must be called.
           </p>
-        <p>The <c>log/2</c> function is used for internally formatted logs,
+        <p><c>log/2</c> is used for internally formatted logs,
           and <c>blog/2</c> for externally formatted logs. 
-          <c>blog/2</c> can be used
-          for internally formatted logs as well provided the binary was
-          constructed with a call to <c>term_to_binary/1</c>.
-          </p>
-        <p>The owners that subscribe to notifications will be notified 
+          <c>blog/2</c> can also be used
+          for internally formatted logs if the binary is
+          constructed with a call to
+	  <seealso marker="erts:erlang#term_to_binary/1">
+	  <c>term_to_binary/1</c></seealso>.</p>
+        <p>Owners subscribing to notifications are notified
           of an error with an <c>error_status</c> message if the error 
           reason tag is <c>invalid_header</c> or <c>file_error</c>.
           </p>
@@ -716,27 +748,27 @@
     <func>
       <name name="log_terms" arity="2"/>
       <name name="blog_terms" arity="2"/>
-      <fsummary>Log several items onto a disk log.</fsummary>
+      <fsummary>Log many items onto a disk log.</fsummary>
       <type variable="Log"/>
       <type variable="TermList" name_i="1"/>
       <type variable="BytesList"/>
       <type name="log_error_rsn"/>
       <desc>
-        <p>The <c>log_terms/2</c> and <c>blog_terms/2</c> functions
-          synchronously append a list of items to the log. The benefit
-          of using these functions rather than the <c>log/2</c> and
-          <c>blog/2</c> functions is that of efficiency: the given
-          list is split into as large sublists as possible (limited by
-          the size of wrap log files), and each sublist is logged as
-          one single item, which reduces the overhead.
+        <p>Synchronously appends a list of items to the log. It is more
+          efficient to use these functions instead of functions <c>log/2</c>
+	  and <c>blog/2</c>. The specified list is split into as large
+	  sublists as possible (limited by the size of wrap log files),
+	  and each sublist is logged as one single item, which reduces
+	  the overhead.
           </p>
-        <p>The <c>log_terms/2</c> function is used for internally formatted
+        <p><c>log_terms/2</c> is used for internally formatted
           logs, and <c>blog_terms/2</c> for externally formatted logs.
-          <c>blog_terms/2</c> can be used
-          for internally formatted logs as well provided the binaries were
-          constructed with calls to <c>term_to_binary/1</c>.
-          </p>
-        <p>The owners that subscribe to notifications will be notified 
+          <c>blog_terms/2</c> can also be used
+          for internally formatted logs if the binaries are
+          constructed with calls to
+	  <seealso marker="erts:erlang#term_to_binary/1">
+	  <c>term_to_binary/1</c></seealso>.</p>
+        <p>Owners subscribing to notifications are notified
           of an error with an <c>error_status</c> message if the error 
           reason tag is <c>invalid_header</c> or <c>file_error</c>.
           </p>
@@ -755,110 +787,119 @@
       <type name="dlog_optattr"/>
       <type name="dlog_size"/>
       <desc>
-        <p>The <c><anno>ArgL</anno></c> parameter is a list of options which have
-          the following meanings:</p>
-        <list type="bulleted">
+        <p>Parameter <c><anno>ArgL</anno></c> is a list of the following
+	  options:</p>
+        <taglist>
+	  <tag><c>{name, <anno>Log</anno>}</c></tag>
           <item>
-            <p><c>{name, <anno>Log</anno>}</c> specifies the name of the log.
-              This is the name which must be passed on as a parameter in
+            <p>Specifies the log name.
+              This name must be passed on as a parameter in
               all subsequent logging operations. A name must always
               be supplied.
               </p>
           </item>
+	  <tag><c>{file, <anno>FileName</anno>}</c></tag>
           <item>
-            <p><c>{file, <anno>FileName</anno>}</c> specifies the name of the
-              file which will be used for logged terms. If this value is
-              omitted and the name of the log is either an atom or a string, 
-              the file name will default to <c>lists:concat([<anno>Log</anno>, ".LOG"])</c> for halt logs. For wrap logs, this will be
-              the base name of the files. Each file in a wrap log
-              will be called <c><![CDATA[<base_name>.N]]></c>, where <c>N</c> is an
-              integer. Each wrap log will also have two files called
+            <p>Specifies the name of the
+              file to be used for logged terms. If this value is
+              omitted and the log name is an atom or a string,
+              the filename defaults to <c>lists:concat([<anno>Log</anno>, ".LOG"])</c>
+	      for halt logs.</p>
+	    <p>For wrap logs, this is the base name of the files. Each file in
+	      a wrap log is called <c><![CDATA[<base_name>.N]]></c>, where <c>N</c>
+	      is an integer. Each wrap log also has two files called
               <c><![CDATA[<base_name>.idx]]></c> and <c><![CDATA[<base_name>.siz]]></c>.
               </p>
           </item>
+	  <tag><c>{linkto, <anno>LinkTo</anno>}</c><marker id="linkto"></marker></tag>
           <item>
-            <p><c>{linkto, <anno>LinkTo</anno>}</c>.               <marker id="linkto"></marker>
-If
-              <c><anno>LinkTo</anno></c> is a pid, that pid becomes an owner of the
-              log. If <c><anno>LinkTo</anno></c> is <c>none</c> the log records
+            <p>If <c><anno>LinkTo</anno></c> is a pid, it becomes an owner of the
+              log. If <c><anno>LinkTo</anno></c> is <c>none</c>, the log records
               that it is used anonymously by some process by
               incrementing the <c>users</c> counter. By default, the
-              process which calls <c>open/1</c> owns the log.
+              process that calls <c>open/1</c> owns the log.
               </p>
           </item>
+	  <tag><c>{repair, <anno>Repair</anno>}</c></tag>
           <item>
-            <p><c>{repair, <anno>Repair</anno>}</c>. If <c><anno>Repair</anno></c> is <c>true</c>,
-              the current log file will be repaired, if needed. As the
+            <p>If <c><anno>Repair</anno></c> is <c>true</c>,
+              the current log file is repaired, if needed. As the
               restoration is initiated, a message is output on the error log.
-              If <c>false</c> is given,
-              no automatic repair will be attempted. Instead, the
+              If <c>false</c> is specified,
+              no automatic repair is attempted. Instead, the
               tuple <c>{error, {need_repair, <anno>Log</anno>}}</c> is returned if an
               attempt is made to open a corrupt log file. 
-              If <c>truncate</c> is given, the log file will
-              be truncated, creating an empty log. Default is 
+              If <c>truncate</c> is specified, the log file becomes
+              truncated, creating an empty log. Defaults to
               <c>true</c>, which has no effect on logs opened in 
               read-only mode.
               </p>
           </item>
+	  <tag><c>{type, <anno>Type</anno>}</c></tag>
           <item>
-            <p><c>{type, <anno>Type</anno>}</c> is the type of the log. Default
-              is <c>halt</c>.
+            <p>The log type. Defaults to <c>halt</c>.
               </p>
           </item>
+	  <tag><c>{format, <anno>Format</anno>}</c></tag>
           <item>
-            <p><c>{format, <anno>Format</anno>}</c> specifies the format of the
-              disk log. Default is <c>internal</c>. 
+            <p>Disk log format. Defaults to <c>internal</c>.
               </p>
           </item>
+	  <tag><c>{size, <anno>Size</anno>}</c></tag>
           <item>
-            <p><c>{size, <anno>Size</anno>}</c> specifies the size of the log.
-              When a halt log has reached its maximum size, all attempts to 
-              log more items are rejected. The default size is 
+            <p>Log size.</p>
+              <p>When a halt log has reached its maximum size, all attempts to
+              log more items are rejected. Defaults to
               <c>infinity</c>, which for halt implies that there is no
-              maximum size. For wrap logs, the <c><anno>Size</anno></c> parameter
-              may be either a pair
-              <c>{<anno>MaxNoBytes</anno>, <anno>MaxNoFiles</anno>}</c> or <c>infinity</c>. In the
-              latter case, if the files of an already existing wrap log
+              maximum size.</p>
+	    <p>For wrap logs, parameter <c><anno>Size</anno></c>
+              can be a pair
+              <c>{<anno>MaxNoBytes</anno>, <anno>MaxNoFiles</anno>}</c> or
+	      <c>infinity</c>.
+	      In the latter case, if the files of an existing wrap log
               with the same name can be found, the size is read
-              from the existing wrap log, otherwise an error is returned. 
-              Wrap logs write at most <c><anno>MaxNoBytes</anno></c> bytes on each file
-              and use <c><anno>MaxNoFiles</anno></c> files before starting all over with
-              the first wrap log file. Regardless of <c><anno>MaxNoBytes</anno></c>,
+              from the existing wrap log, otherwise an error is returned.</p>
+            <p>Wrap logs write at most <c><anno>MaxNoBytes</anno></c>
+              bytes on each file and use <c><anno>MaxNoFiles</anno></c>
+              files before starting all over with the first wrap log
+              file. Regardless of <c><anno>MaxNoBytes</anno></c>,
               at least the header (if there is one) and one
-              item is written on each wrap log file before
-              wrapping to the next file.
-              When opening an existing wrap log, it is not
-              necessary to supply a value for the option <c>Size</c>, but any
-              supplied value must equal the current size of the log, otherwise
-              the tuple <c>{error, {size_mismatch, <anno>CurrentSize</anno>, <anno>NewSize</anno>}}</c>
-              is returned.
-              </p>
+              item are written on each wrap log file before
+              wrapping to the next file.</p>
+            <p>When opening an existing wrap log, it is not
+              necessary to supply a value for option <c>Size</c>, but any
+              supplied value must equal the current log size, otherwise
+              the tuple <c>{error, {size_mismatch, <anno>CurrentSize</anno>,
+	      <anno>NewSize</anno>}}</c> is returned.</p>
           </item>
+	  <tag><c>{distributed, <anno>Nodes</anno>}</c></tag>
           <item>
-            <p><c>{distributed, <anno>Nodes</anno>}</c>. This option can be used for
-              adding members to a distributed disk log. The
-              default value is <c>[]</c>, which means that
+            <p>This option can be used for
+              adding members to a distributed disk log.
+              Defaults to <c>[]</c>, which means that
               the log is local on the current node.
               </p>
           </item>
+	  <tag><c>{notify, boolean()}</c><marker id="notify"></marker></tag>
           <item>
-            <marker id="notify"></marker>
-            <p><c>{notify, bool()}</c>. If <c>true</c>, the owners of the
-              log are notified when certain events occur in the log.
-              Default is <c>false</c>. The owners are sent one of the
+            <p>If <c>true</c>, the log owners
+              are notified when certain log events occur.
+              Defaults to <c>false</c>. The owners are sent one of the
               following messages when an event occurs:
               </p>
-            <list type="bulleted">
+            <taglist>
+	      <tag><c>{disk_log, Node, Log, {wrap, NoLostItems}}</c></tag>
               <item>
-                <p><c>{disk_log, Node, Log, {wrap, NoLostItems}}</c> is sent when a wrap log has
+                <p>Sent when a wrap log has
                   filled up one of its files and a new file is
                   opened. <c>NoLostItems</c> is the number of
-                  previously logged items that have been lost when
+                  previously logged items that were lost when
                   truncating existing files.
                   </p>
               </item>
+	      <tag><c>{disk_log, Node, Log, {truncated, NoLostItems}}</c></tag>
               <item>
-                <p><c>{disk_log, Node, Log, {truncated, NoLostItems}}</c> is sent when a log has been
+                <p>Sent when a log is
                   truncated or reopened. For halt logs <c>NoLostItems</c>
                   is the number of items written on the log since the 
                   disk log process was created. For wrap logs 
@@ -866,127 +907,132 @@ If
                   wrap log files.
                   </p>
               </item>
+	      <tag><c>{disk_log, Node, Log, {read_only, Items}}</c></tag>
               <item>
-                <p><c>{disk_log, Node, Log, {read_only, Items}}</c> 
-                  is sent when an asynchronous log attempt is made to 
+                <p>Sent when an asynchronous log attempt is made to
                   a log file opened in read-only mode. 
                   <c>Items</c> is the items from the log attempt.
                   </p>
               </item>
+	      <tag><c>{disk_log, Node, Log, {blocked_log, Items}}</c></tag>
               <item>
-                <p><c>{disk_log, Node, Log, {blocked_log, Items}}</c> 
-                  is sent when an asynchronous log attempt is made to
+                <p>Sent when an asynchronous log attempt is made to
                   a blocked log that does not queue log attempts.
                   <c>Items</c> is the items from the log attempt.
                   </p>
               </item>
+	      <tag><c>{disk_log, Node, Log, {format_external, Items}}</c></tag>
               <item>
-                <p><c>{disk_log, Node, Log, {format_external, Items}}</c> 
-                  is sent when <c>alog/2</c> or <c>alog_terms/2</c> is 
+                <p>Sent when function <c>alog/2</c> or <c>alog_terms/2</c> is
                   used for internally formatted logs. <c>Items</c> is the 
                   items from the log attempt.
                   </p>
               </item>
+	      <tag><c>{disk_log, Node, Log, full}</c></tag>
               <item>
-                <p><c>{disk_log, Node, Log, full}</c> is sent when
+                <p>Sent when
                   an attempt to log items to a wrap log would write more
-                  bytes than the limit set by the <c>size</c> option.
+                  bytes than the limit set by option <c>size</c>.
                   </p>
               </item>
+	      <tag><c>{disk_log, Node, Log, {error_status, Status}}</c></tag>
               <item>
-                <p><c>{disk_log, Node, Log, {error_status, Status}}</c> 
-                  is sent when the error status changes. The error status
+                <p>Sent when the error status changes. The error status
                   is defined by the outcome of the last attempt to log
-                  items to a the log or to truncate the log or the last
-                  use of <c>sync/1</c>, <c>inc_wrap_file/1</c> or
-                  <c>change_size/2</c>. <c>Status</c> is one of <c>ok</c> and
-                  <c>{error, Error}</c>, the former being the initial value.
+                  items to the log, or to truncate the log, or the last
+                  use of function <c>sync/1</c>, <c>inc_wrap_file/1</c>, or
+                  <c>change_size/2</c>. <c>Status</c> is either <c>ok</c> or
+                  <c>{error, Error}</c>, the former is the initial value.
                   </p>
               </item>
-            </list>
+            </taglist>
           </item>
+	  <tag><c>{head, <anno>Head</anno>}</c></tag>
           <item>
-            <p><c>{head, <anno>Head</anno>}</c> specifies a header to be
+            <p>Specifies a header to be
               written first on the log file. If the log is a wrap
               log, the item <c><anno>Head</anno></c> is written first in each new file.
-              <c><anno>Head</anno></c> should be a term if the format is
-              <c>internal</c>, and a deep list of bytes (or a binary)
-              otherwise. Default is <c>none</c>, which means that
+              <c><anno>Head</anno></c> is to be a term if the format is
+              <c>internal</c>, otherwise a deep list of bytes (or a binary).
+              Defaults to <c>none</c>, which means that
               no header is written first on the file.
               </p>
           </item>
+	  <tag><c>{head_func, {M,F,A}}</c></tag>
           <item>
-            <p><c>{head_func, {M,F,A}}</c> specifies a function
+            <p>Specifies a function
               to be called each time a new log file is opened.
               The call <c>M:F(A)</c> is assumed to return <c>{ok, Head}</c>.
               The item <c>Head</c> is written first in each file.
-              <c>Head</c> should be a term if the format is
-              <c>internal</c>, and a deep list of bytes (or a binary)
-              otherwise.
+              <c>Head</c> is to be a term if the format is
+              <c>internal</c>, otherwise a deep list of bytes (or a binary).
               </p>
           </item>
+	  <tag><c>{mode, <anno>Mode</anno>}</c></tag>
           <item>
-            <p><c>{mode, <anno>Mode</anno>}</c> specifies if the log is to be
-              opened in read-only or read-write mode. It defaults to
+            <p>Specifies if the log is to be
+              opened in read-only or read-write mode. Defaults to
               <c>read_write</c>.
               </p>
           </item>
-        </list>
-        <p>The <c>open/1</c> function returns <c>{ok, <anno>Log</anno>}</c> if the
-          log file was successfully opened. If the file was
-          successfully repaired, the tuple <c>{repaired, <anno>Log</anno>, {recovered, <anno>Rec</anno>}, {badbytes, <anno>Bad</anno>}}</c> is returned, where
-          <c><anno>Rec</anno></c> is the number of whole Erlang terms found in the
-          file and <c><anno>Bad</anno></c> is the number of bytes in the file which
-          were non-Erlang terms. If the <c>distributed</c> parameter
-          was given, <c>open/1</c> returns a list of
+        </taglist>
+        <p><c>open/1</c> returns <c>{ok, <anno>Log</anno>}</c> if the
+          log file is successfully opened. If the file is
+          successfully repaired, the tuple <c>{repaired, <anno>Log</anno>,
+	  {recovered, <anno>Rec</anno>}, {badbytes, <anno>Bad</anno>}}</c>
+	  is returned, where <c><anno>Rec</anno></c> is the number of
+	  whole Erlang terms found in the file and <c><anno>Bad</anno></c>
+	  is the number of bytes in the file that
+          are non-Erlang terms. If the parameter <c>distributed</c>
+          is specified, <c>open/1</c> returns a list of
           successful replies and a list of erroneous replies. Each
           reply is tagged with the node name.
           </p>
         <p>When a disk log is opened in read-write mode, any existing
-          log file is checked for. If there is none a new empty
+          log file is checked for. If there is none, a new empty
           log is created, otherwise the existing file is opened at the
           position after the last logged item, and the logging of items
-          will commence from there. If the format is <c>internal</c>
+          starts from there. If the format is <c>internal</c>
           and the existing file is not recognized as an internally
-          formatted log, a tuple <c>{error, {not_a_log_file, <anno>FileName</anno>}}</c>
+          formatted log, a tuple
+	  <c>{error, {not_a_log_file, <anno>FileName</anno>}}</c>
           is returned.
           </p>
-        <p>The <c>open/1</c> function cannot be used for changing the
-          values of options of an already open log; when there are prior
+        <p><c>open/1</c> cannot be used for changing the
+          values of options of an open log. When there are prior
           owners or users of a log, all option values except <c>name</c>, 
-          <c>linkto</c> and <c>notify</c> are just checked against 
-          the values that have been supplied before as option values
-          to <c>open/1</c>, <c>change_header/2</c>, <c>change_notify/3</c>
-          or <c>change_size/2</c>. As a consequence,
+          <c>linkto</c>, and <c>notify</c> are only checked against
+          the values supplied before as option values
+          to function <c>open/1</c>, <c>change_header/2</c>, <c>change_notify/3</c>,
+          or <c>change_size/2</c>. Thus,
           none of the options except <c>name</c> is mandatory. If some
-          given value differs from the current value, a tuple
+          specified value differs from the current value, a tuple
           <c>{error, {arg_mismatch, <anno>OptionName</anno>, <anno>CurrentValue</anno>, <anno>Value</anno>}}</c>
-          is returned. Caution: an owner's attempt to open a log 
-          as owner once again is acknowledged with the return value 
+          is returned.</p>
+	<note><p>If an owner attempts to open a log
+          as owner once again, it is acknowledged with the return value
           <c>{ok, <anno>Log</anno>}</c>, but the state of the disk log is not
-          affected in any way.
-          </p>
-        <p>If a log with a given name is local on some node,
+          affected.</p></note>
+        <p>If a log with a specified name is local on some node,
           and one tries to open the log distributed on the same node,
-          then the tuple <c>{error, {node_already_open, <anno>Log</anno>}}</c> is
+          the tuple <c>{error, {node_already_open, <anno>Log</anno>}}</c> is
           returned. The same tuple is returned if the log is distributed on
           some node, and one tries to open the log locally on the same node.
           Opening individual distributed disk logs for the first time
           adds those logs to a (possibly empty) distributed disk log.
-          The option values supplied are used 
-          on all nodes mentioned by the <c>distributed</c> option. 
+          The supplied option values are used
+          on all nodes mentioned by option <c>distributed</c>.
           Individual distributed logs know nothing
           about each other's option values, so each node can be
           given unique option values by creating a distributed
-          log with several calls to <c>open/1</c>.
+          log with many calls to <c>open/1</c>.
           </p>
-        <p>It is possible to open a log file more than once by giving
-          different values to the option <c>name</c> or by using the
+        <p>A log file can be opened more than once by giving
+          different values to option <c>name</c> or by using the
           same file when distributing a log on different nodes.
-          It is up to the user of the <c>disk_log</c>
-          module to ensure that no more than one
-          disk log process has write access to any file, or the 
-          the file may be corrupted.
+          It is up to the user of module <c>disk_log</c>
+          to ensure that not more than one disk log process has write
+	  access to any file, otherwise the file can be corrupted.
           </p>
         <p>If an attempt to open a log file for the first time fails, 
           the disk log process terminates with the EXIT message 
@@ -999,9 +1045,9 @@ If
       <name name="pid2name" arity="1"/>
       <fsummary>Return the name of the disk log handled by a pid.</fsummary>
       <desc>
-        <p>The <c>pid2name/1</c> function returns the name of the log
+        <p>Returns the log name
           given the pid of a disk log process on the current node, or
-          <c>undefined</c> if the given pid is not a disk log process.
+          <c>undefined</c> if the specified pid is not a disk log process.
           </p>
         <p>This function is meant to be used for debugging only.
           </p>
@@ -1018,25 +1064,25 @@ If
       <type variable="BHead"/>
       <type name="reopen_error_rsn"/>
       <desc>
-        <p>The <c>reopen</c> functions first rename the log file 
-          to <c><anno>File</anno></c> and then re-create a new log file.
-          In case of a wrap log, <c><anno>File</anno></c> is used as the base name
+        <p>Renames the log file
+          to <c><anno>File</anno></c> and then recreates a new log file.
+          If a wrap log exists, <c><anno>File</anno></c> is used as the base name
           of the renamed files.
           By default the header given to <c>open/1</c> is written first in
-          the newly opened log file, but if the <c><anno>Head</anno></c> or the
-          <c><anno>BHead</anno></c> argument is given, this item is used instead.
-          The header argument is used once only; next time a wrap log file
+          the newly opened log file, but if argument <c><anno>Head</anno></c> or
+          <c><anno>BHead</anno></c> is specified, this item is used instead.
+          The header argument is used only once. Next time a wrap log file
           is opened, the header given to <c>open/1</c> is used.
           </p>
-        <p>The <c>reopen/2,3</c> functions are used for internally formatted 
+        <p><c>reopen/2,3</c> are used for internally formatted
           logs, and <c>breopen/3</c> for externally formatted logs.
           </p>
-        <p>The owners that subscribe to notifications will receive 
+        <p>Owners subscribing to notifications receive
           a <c>truncate</c> message.
           </p>
         <p>Upon failure to reopen the log, the disk log process terminates
-          with the EXIT message <c>{{failed,Error},[{disk_log,Fun,Arity}]}</c>,
-          and other processes that have requests queued receive the message 
+          with the EXIT message <c>{{failed,Error},[{disk_log,Fun,Arity}]}</c>.
+          Other processes having requests queued receive the message
           <c>{disk_log, Node, {error, disk_log_stopped}}</c>.
           </p>
       </desc>
@@ -1046,8 +1092,7 @@ If
       <fsummary>Flush the contents of a disk log to the disk.</fsummary>
       <type name="sync_error_rsn"/>
       <desc>
-        <p>The <c>sync/1</c> function ensures that the contents of the 
-          log are actually written to the disk. 
+        <p>Ensures that the contents of the log are written to the disk.
           This is usually a rather expensive operation.
           </p>
       </desc>
@@ -1062,24 +1107,24 @@ If
       <type variable="BHead"/>
       <type name="trunc_error_rsn"/>
       <desc>
-        <p>The <c>truncate</c> functions remove all items from a disk log.
-          If the <c><anno>Head</anno></c> or the <c><anno>BHead</anno></c> argument is
-          given, this item is written first in the newly truncated
+        <p>Removes all items from a disk log.
+          If argument <c><anno>Head</anno></c> or <c><anno>BHead</anno></c> is
+          specified, this item is written first in the newly truncated
           log, otherwise the header given to <c>open/1</c> is used.
-          The header argument is only used once; next time a wrap log file 
+          The header argument is used only once. Next time a wrap log file
           is opened, the header given to <c>open/1</c> is used.
           </p>
-        <p>The <c>truncate/1,2</c> functions are used for internally 
+        <p><c>truncate/1,2</c> are used for internally
           formatted logs, and <c>btruncate/2</c> for externally formatted
           logs.
           </p>
-        <p>The owners that subscribe to notifications will receive 
+        <p>Owners subscribing to notifications receive
           a <c>truncate</c> message.
           </p>
         <p>If the attempt to truncate the log fails, the disk log process
           terminates with the EXIT message 
-          <c>{{failed,Reason},[{disk_log,Fun,Arity}]}</c>, and 
-          other processes that have requests queued receive the message 
+          <c>{{failed,Reason},[{disk_log,Fun,Arity}]}</c>.
+          Other processes having requests queued receive the message
           <c>{disk_log, Node, {error, disk_log_stopped}}</c>.
           </p>
       </desc>
@@ -1089,7 +1134,7 @@ If
       <fsummary>Unblock a disk log.</fsummary>
       <type name="unblock_error_rsn"/>
       <desc>
-        <p>The <c>unblock/1</c> function unblocks a log. 
+        <p>Unblocks a log.
           A log can only be unblocked by the blocking process.
           </p>
       </desc>
@@ -1098,8 +1143,8 @@ If
 
   <section>
     <title>See Also</title>
-    <p><seealso marker="file">file(3)</seealso>, 
-      <seealso marker="pg2">pg2(3)</seealso>, 
-      <seealso marker="wrap_log_reader">wrap_log_reader(3)</seealso></p>
+    <p><seealso marker="file"><c>file(3)</c></seealso>,
+      <seealso marker="pg2"><c>pg2(3)</c></seealso>,
+      <seealso marker="wrap_log_reader"><c>wrap_log_reader(3)</c></seealso></p>
   </section>
 </erlref>
diff --git a/lib/kernel/doc/src/erl_boot_server.xml b/lib/kernel/doc/src/erl_boot_server.xml
index a8015fa453..ac4c97b43a 100644
--- a/lib/kernel/doc/src/erl_boot_server.xml
+++ b/lib/kernel/doc/src/erl_boot_server.xml
@@ -29,72 +29,73 @@
     <rev></rev>
   </header>
   <module>erl_boot_server</module>
-  <modulesummary>Boot Server for Other Erlang Machines</modulesummary>
+  <modulesummary>Boot server for other Erlang machines.</modulesummary>
   <description>
-    <p>This server is used to assist diskless Erlang nodes which fetch
+    <p>This server is used to assist diskless Erlang nodes that fetch
       all Erlang code from another machine.</p>
     <p>This server is used to fetch all code, including the start
       script, if an Erlang runtime system is started with
-      the <c>-loader inet</c> command line flag. All hosts specified
-      with the <c>-hosts Host</c> command line flag must have one
+      command-line flag <c>-loader inet</c>. All hosts specified
+      with command-line flag <c>-hosts Host</c> must have one
       instance of this server running.</p>
-    <p>This server can be started with the <c>kernel</c> configuration
+    <p>This server can be started with the <c>Kernel</c> configuration
       parameter <c>start_boot_server</c>.</p>
-    <p>The <c>erl_boot_server</c> can both read regular files as well as
-      files in archives. See <seealso marker="code">code(3)</seealso>
-      and <seealso marker="erts:erl_prim_loader">erl_prim_loader(3)</seealso>.</p>
-    <warning><p>The support for loading of code from archive files is
-     experimental. The sole purpose of releasing it before it is ready
-     is to obtain early feedback. The file format, semantics,
-     interfaces etc. may be changed in a future release.</p></warning>
+    <p>The <c>erl_boot_server</c> can read regular files and
+      files in archives. See <seealso marker="code"><c>code(3)</c></seealso>
+      and
+    <seealso marker="erts:erl_prim_loader"><c>erl_prim_loader(3)</c></seealso>
+    in <c>ERTS</c>.</p>
+    <warning><p>The support for loading code from archive files is
+     experimental. It is released before it is ready
+     to obtain early feedback. The file format, semantics,
+     interfaces, and so on, can be changed in a future release.</p></warning>
   </description>
   <funcs>
     <func>
-      <name name="start" arity="1"/>
-      <fsummary>Start the boot server</fsummary>
+      <name name="add_slave" arity="1"/>
+      <fsummary>Add a slave to the list of allowed slaves.</fsummary>
       <desc>
-        <p>Starts the boot server. <c><anno>Slaves</anno></c> is a list of IP
-          addresses for hosts which are allowed to use this server as a
-          boot server.</p>
+        <p>Adds a <c><anno>Slave</anno></c> node to the list of allowed slave hosts.</p>
       </desc>
     </func>
     <func>
-      <name name="start_link" arity="1"/>
-      <fsummary>Start the boot server and links the caller</fsummary>
+      <name name="delete_slave" arity="1"/>
+      <fsummary>Delete a slave from the list of allowed slaves.</fsummary>
       <desc>
-        <p>Starts the boot server and links to the caller. This function
-          is used to start the server if it is included in a supervision
-          tree.</p>
+        <p>Deletes a <c><anno>Slave</anno></c> node from the list of allowed slave
+          hosts.</p>
       </desc>
     </func>
     <func>
-      <name name="add_slave" arity="1"/>
-      <fsummary>Add a slave to the list of allowed slaves</fsummary>
+      <name name="start" arity="1"/>
+      <fsummary>Start the boot server.</fsummary>
       <desc>
-        <p>Adds a <c><anno>Slave</anno></c> node to the list of allowed slave hosts.</p>
+        <p>Starts the boot server. <c><anno>Slaves</anno></c> is a list of
+          IP addresses for hosts, which are allowed to use this server as a
+          boot server.</p>
       </desc>
     </func>
     <func>
-      <name name="delete_slave" arity="1"/>
-      <fsummary>Delete a slave from the list of allowed slaves</fsummary>
+      <name name="start_link" arity="1"/>
+      <fsummary>Start the boot server and link to the the caller.</fsummary>
       <desc>
-        <p>Deletes a <c><anno>Slave</anno></c> node from the list of allowed slave
-          hosts.</p>
+        <p>Starts the boot server and links to the caller. This function
+          is used to start the server if it is included in a supervision
+          tree.</p>
       </desc>
     </func>
     <func>
       <name name="which_slaves" arity="0"/>
-      <fsummary>Return the current list of allowed slave hosts</fsummary>
+      <fsummary>Return the current list of allowed slave hosts.</fsummary>
       <desc>
         <p>Returns the current list of allowed slave hosts.</p>
       </desc>
     </func>
   </funcs>
-
   <section>
     <title>SEE ALSO</title>
-    <p><seealso marker="erts:init">init(3)</seealso>,  
-      <seealso marker="erts:erl_prim_loader">erl_prim_loader(3)</seealso></p>
+    <p><seealso marker="erts:init"><c>erts:init(3)</c></seealso>,
+      <seealso marker="erts:erl_prim_loader"><c>erts:erl_prim_loader(3)</c></seealso></p>
   </section>
 </erlref>
 
diff --git a/lib/kernel/doc/src/erl_ddll.xml b/lib/kernel/doc/src/erl_ddll.xml
index 8d71883cf4..1f8a3ba20e 100644
--- a/lib/kernel/doc/src/erl_ddll.xml
+++ b/lib/kernel/doc/src/erl_ddll.xml
@@ -29,84 +29,91 @@
     <rev></rev>
   </header>
   <module>erl_ddll</module>
-  <modulesummary>Dynamic Driver Loader and Linker</modulesummary>
+  <modulesummary>Dynamic driver loader and linker.</modulesummary>
   <description>
-    <p>The <c>erl_ddll</c> module provides an interface for loading
-      and unloading <em>erlang linked in drivers</em> in runtime.</p>
+    <p>This module provides an interface for loading
+      and unloading <em>Erlang linked-in drivers</em> in runtime.</p>
     <note>
-      <p>This is a large reference document. For casual use of the
-        module, as well as for most real world applications, the
-        descriptions of the functions <seealso marker="#load/2">load/2</seealso> and <seealso marker="#unload/1">unload/1</seealso> are enough to get
-        going. </p>
+      <p>This is a large reference document. For casual use of this
+        module, and for most real world applications, the
+        descriptions of functions
+	<seealso marker="#load/2"><c>load/2</c></seealso> and
+	<seealso marker="#unload/1"><c>unload/1</c></seealso>
+	are enough to getting started.</p>
     </note>
-    <p>The driver should be provided as a dynamically linked library
-      in a object code format specific for the platform in use,
-      i. e. <c>.so</c> files on most Unix systems and <c>.ddl</c>
-      files on windows. An erlang linked in driver has to provide
+    <p>The driver is to be provided as a dynamically linked library
+      in an object code format specific for the platform in use,
+      that is, <c>.so</c> files on most Unix systems and <c>.ddl</c>
+      files on Windows. An Erlang linked-in driver must provide
       specific interfaces to the emulator, so this module is not
-      designed for loading arbitrary dynamic libraries. For further
-      information about erlang drivers, refer to the ERTS reference
-      manual section <seealso marker="erts:erl_driver">erl_driver</seealso>.</p>
+      designed for loading arbitrary dynamic libraries. For more
+      information about Erlang drivers, see
+      <seealso marker="erts:erl_driver"><c>erts:erl_driver</c></seealso>
+      .</p>
     <marker id="users"></marker>
-    <p>When describing a set of functions, (i.e. a module, a part of a
-      module or an application) executing in a process and wanting to
-      use a ddll-driver, we use the term <em>user</em>. There can be
-      several users in one process (different modules needing the same
-      driver) and several processes running the same code, making up
-      several <em>users</em> of a driver. In the basic scenario, each
-      user loads the driver before starting to use it and unloads the
-      driver when done. The reference counting keeps track of
-      processes as well as the number of loads by each process, so that
-      the driver will only be unloaded when no one wants it
-      (it has no user). The driver also keeps track of ports that are
-      opened towards it, so that one can delay unloading until all
-      ports are closed or kill all ports using the driver when it is
-      unloaded.  </p>
+    <p>When describing a set of functions (that is, a module, a part of a
+      module, or an application), executing in a process and wanting to
+      use a ddll-driver, we use the term <em>user</em>. A process can
+      have many users (different modules needing the same
+      driver) and many processes running the same code, making up
+      many <em>users</em> of a driver.</p>
+      <p>In the basic scenario, each user loads the driver before
+      starting to use it and unloads the driver when done.
+      The reference counting keeps track of
+      processes and the number of loads by each process. This way
+      the driver is only unloaded when no one wants it (it has no user).
+      The driver also keeps track of ports that are
+      opened to it. This enables delay of unloading until all
+      ports are closed, or killing of all ports that use the driver when
+      it is unloaded.</p>
     <marker id="scenarios"></marker>
     <p>The interface supports two basic scenarios of loading and
       unloading. Each scenario can also have the option of either
       killing ports when the driver is unloading, or waiting for the
-      ports to close themselves. The scenarios are:</p>
+      ports to close themselves. The scenarios are as follows:</p>
     <taglist>
-      <tag><em>Load and unload on a "when needed basis"</em></tag>
+      <tag><em>Load and Unload on a "When Needed Basis"</em></tag>
       <item>
         <p>This (most common) scenario simply supports that each
           <seealso marker="#users">user</seealso> of the driver loads
-          it when it is needed and unloads it when the <seealso marker="#users">user</seealso> no longer have any use for
-          it. The driver is always reference counted and as long as a
+          it when needed and unloads it when no longer needed.
+          The driver is always reference counted and as long as a
           process keeping the driver loaded is still alive, the driver
           is present in the system.</p>
         <p>Each <seealso marker="#users">user</seealso> of the driver
           use <em>literally</em> the same pathname for the driver when
-          demanding load, but the <seealso marker="#users">users</seealso> are not really concerned
-          with if the driver is already loaded from the filesystem or
-          if the object code has to be loaded from filesystem.</p>
-        <p>Two pairs of functions support this scenario:</p>
+          demanding load, but the
+	  <seealso marker="#users">users</seealso> are not concerned
+          with if the driver is already loaded from the file system or
+          if the object code must be loaded from file system.</p>
+        <p>The following two pairs of functions support this scenario:</p>
         <taglist>
           <tag><em>load/2 and unload/1</em></tag>
           <item>
             <p>When using the <c>load/unload</c> interfaces, the
-              driver will not <em>actually</em> get unloaded until the
-              <em>last port</em> using the driver is closed. The function
-              <c>unload/1</c> can return immediately, as the <seealso marker="#users">users</seealso> are not really concerned
-              with when the actual unloading occurs. The
-              driver will actually get unloaded when no one needs it any longer.</p>
-            <p>If a process having the driver loaded dies, it will have
-              the same effect as if unloading was done. </p>
-            <p>When loading, the function <c>load/2</c> returns
-              <c>ok</c> as soon as there is any instance of the driver
-              present, so that if a driver is waiting to get unloaded
-              (due to open ports), it will simply change state to no
+              driver is not unloaded until the
+              <em>last port</em> using the driver is closed. Function
+              <c>unload/1</c> can return immediately, as the
+	      <seealso marker="#users">users</seealso>
+	      have no interrest in when the unloading occurs. The
+              driver is unloaded when no one needs it any longer.</p>
+            <p>If a process having the driver loaded dies, it has
+              the same effect as if unloading is done.</p>
+            <p>When loading, function <c>load/2</c> returns
+              <c>ok</c> when any instance of the driver is
+              present. Thus, if a driver is waiting to get unloaded
+              (because of open ports), it simply changes state to no
               longer need unloading.</p>
           </item>
           <tag><em>load_driver/2 and unload_driver/1</em></tag>
           <item>
-            <p>These interfaces is intended to be used when it is considered an
-              error that ports are open towards a driver that no <seealso marker="#users">user</seealso>
-              has loaded. The ports still open when the
+            <p>These interfaces are intended to be used when it is considered an
+              error that ports are open to a driver that no
+	      <seealso marker="#users">user</seealso>
+              has loaded. The ports that are still open when the
               last <seealso marker="#users">user</seealso> calls
               <c>unload_driver/1</c> or when the last process having the
-              driver loaded dies, will get killed with reason
+              driver loaded dies, are killed with reason
               <c>driver_unloaded</c>.</p>
             <p>The function names <c>load_driver</c> and
               <c>unload_driver</c> are kept for backward
@@ -114,60 +121,66 @@
           </item>
         </taglist>
       </item>
-      <tag><em>Loading and reloading for code replacement</em></tag>
+      <tag><em>Loading and Reloading for Code Replacement</em></tag>
       <item>
-        <p>This scenario occurs when the driver code might need
+        <p>This scenario can occur if the driver code needs
           replacement during operation of the Erlang
-          emulator. Implementing driver code replacement is somewhat
-          more tedious than beam code replacement, as one driver
-          cannot be loaded as both "old" and "new" code. All <seealso marker="#users">users</seealso> of a driver must have it
+          emulator. Implementing driver code replacement is a little
+          more tedious than Beam code replacement, as one driver
+          cannot be loaded as both "old" and "new" code. All
+	  <seealso marker="#users">users</seealso> of a driver must have it
           closed (no open ports) before the old code can be unloaded
           and the new code can be loaded.</p>
-        <p>The actual unloading/loading is done as one atomic
+        <p>The unloading/loading is done as one atomic
           operation, blocking all processes in the system from using
-          the driver concerned while in progress.</p>
+          the driver in question while in progress.</p>
         <p>The preferred way to do driver code replacement is to let
           <em>one single process</em> keep track of the driver. When
-          the process start, the driver is loaded. When replacement
+          the process starts, the driver is loaded. When replacement
           is required, the driver is reloaded. Unload is probably never
-          done, or done when the process exits. If more than one <seealso marker="#users">user</seealso> has a driver loaded when code
-          replacement is demanded, the replacement cannot occur until
-          the last "other" <seealso marker="#users">user</seealso> has
+          done, or done when the process exits. If more than one
+	  <seealso marker="#users">user</seealso> has a driver
+	  loaded when code replacement is demanded, the replacement cannot
+	  occur until the last "other"
+	  <seealso marker="#users">user</seealso> has
           unloaded the driver.</p>
         <p>Demanding reload when a reload is already in progress is
-          always an error. Using the high level functions, it is also
-          an error to demand reloading when more than one <seealso marker="#users">user</seealso> has the driver loaded. To
-          simplify driver replacement, avoid designing your system so
-          that more than than one <seealso marker="#users">user</seealso> has the driver loaded.</p>
-        <p>The two functions for reloading drivers should be used
-          together with corresponding load functions, to support the two
+          always an error. Using the high-level functions, it is also
+          an error to demand reloading when more than one
+	  <seealso marker="#users">user</seealso> has the driver loaded.</p>
+	 <p>To simplify driver replacement, avoid designing your system so
+          that more than one
+	  <seealso marker="#users">user</seealso> has the driver loaded.</p>
+        <p>The two functions for reloading drivers are to be used
+          together with corresponding load functions to support the two
           different behaviors concerning open ports:</p>
         <taglist>
           <tag><em>load/2 and reload/2</em></tag>
           <item>
-            <p>This pair of functions is used when reloading should be
-              done after the last open port towards the driver is
+            <p>This pair of functions is used when reloading is to be
+              done after the last open port to the driver is
               closed.</p>
-            <p>As <c>reload/2</c> actually waits for the reloading to
-              occur, a misbehaving process keeping open ports towards
-              the driver (or keeping the driver loaded) might cause
-              infinite waiting for reload. Timeouts has to be provided
+            <p>As <c>reload/2</c> waits for the reloading to
+              occur, a misbehaving process keeping open ports to
+              the driver (or keeping the driver loaded) can cause
+              infinite waiting for reload. Time-outs must be provided
               outside of the process demanding the reload or by using
-              the low-level interface <seealso marker="#try_load/3">try_load/3</seealso> in combination
-              with driver monitors (see below).</p>
+              the low-level interface
+	      <seealso marker="#try_load/3"><c>try_load/3</c></seealso>
+	      in combination with driver monitors.</p>
           </item>
           <tag><em>load_driver/2 and reload_driver/2</em></tag>
           <item>
-            <p>This pair of functions are used when open ports towards
-              the driver should be killed with reason
+            <p>This pair of functions are used when open ports to
+              the driver are to be killed with reason
               <c>driver_unloaded</c> to allow for new driver code to
               get loaded.</p>
-            <p>If, however, another process has the driver loaded,
-              calling <c>reload_driver</c> returns the error code
+            <p>However, if another process has the driver loaded,
+              calling <c>reload_driver</c> returns error code
               <c>pending_process</c>. As stated earlier,
-              the recommended design is to not allow other <seealso marker="#users">users</seealso> than the "driver
-              reloader" to actually demand loading of the concerned
-              driver.</p>
+              the recommended design is to not allow other
+	      <seealso marker="#users">users</seealso> than the "driver
+              reloader" to demand loading of the driver in question.</p>
           </item>
         </taglist>
       </item>
@@ -184,903 +197,982 @@
   <funcs>
     <func>
       <name name="demonitor" arity="1"/>
-      <fsummary>Remove a monitor for a driver</fsummary>
+      <fsummary>Remove a monitor for a driver.</fsummary>
       <desc>
         <p>Removes a driver monitor in much the same way as 
-          <seealso marker="erts:erlang#erlang:demonitor/1">erlang:demonitor/1</seealso> does with process
-          monitors. See <seealso marker="#monitor/2">monitor/2</seealso>, <seealso marker="#try_load/3">try_load/3</seealso> and <seealso marker="#try_unload/2">try_unload/2</seealso> for details
-          about how to create driver monitors.</p>
+          <seealso marker="erts:erlang#erlang:demonitor/1"><c>erlang:demonitor/1</c></seealso>
+	  in <c>ERTS</c>
+	  does with process monitors. For details about how to create
+	  driver monitors, see
+	  <seealso marker="#monitor/2"><c>monitor/2</c></seealso>,
+	  <seealso marker="#try_load/3"><c>try_load/3</c></seealso>, and
+	  <seealso marker="#try_unload/2"><c>try_unload/2</c></seealso>.</p>
         <p>The function throws a <c>badarg</c> exception if the
-          parameter is not a reference().  </p>
+          parameter is not a <c>reference()</c>.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="format_error" arity="1"/>
+      <fsummary>Format an error descriptor.</fsummary>
+      <desc>
+        <p>Takes an <c><anno>ErrorDesc</anno></c> returned by load, unload, or
+          reload functions and returns a string that
+          describes the error or warning.</p>
+        <note>
+          <p>Because of peculiarities in the dynamic loading interfaces on
+            different platforms, the returned string is only guaranteed
+            to describe the correct error <em>if format_error/1 is called
+	    in the same instance of the Erlang virtual machine as the error
+	    appeared in</em> (meaning the same operating
+            system process).</p>
+        </note>
       </desc>
     </func>
     <func>
       <name name="info" arity="0"/>
-      <fsummary>Retrieve information about all drivers</fsummary>
+      <fsummary>Retrieve information about all drivers.</fsummary>
       <desc>
-        <p>Returns a list of tuples <c>{<anno>DriverName</anno>, <anno>InfoList</anno>}</c>, where
-          <c><anno>InfoList</anno></c> is the result of calling <seealso marker="#info/1">info/1</seealso> for that
-          <c><anno>DriverName</anno></c>. Only dynamically linked in drivers are
+        <p>Returns a list of tuples <c>{<anno>DriverName</anno>, <anno>InfoList</anno>}</c>,
+	   where <c><anno>InfoList</anno></c> is the result of calling
+	   <seealso marker="#info/1"><c>info/1</c></seealso> for that
+          <c><anno>DriverName</anno></c>. Only dynamically linked-in drivers are
           included in the list.</p>
       </desc>
     </func>
     <func>
       <name name="info" arity="1"/>
-      <fsummary>Retrieve information about one driver</fsummary>
+      <fsummary>Retrieve information about one driver.</fsummary>
       <desc>
-        <p>Returns a list of tuples <c>{<anno>Tag</anno>, <anno>Value</anno>}</c>, where
-          <c><anno>Tag</anno></c> is the information item and <c><anno>Value</anno></c> is the result
-          of calling <seealso marker="#info/2">info/2</seealso> with this driver name and
-          this tag. The result being a tuple list containing all
-          information available about a driver. </p>
-        <p>The different tags that will appear in the list are:</p>
+        <p>Returns a list of tuples <c>{<anno>Tag</anno>, <anno>Value</anno>}</c>,
+	  where <c><anno>Tag</anno></c> is the information item and
+	  <c><anno>Value</anno></c> is the result of calling
+	  <seealso marker="#info/2"><c>info/2</c></seealso> with this driver
+	  name and this tag. The result is a tuple list containing all information
+	  available about a driver.</p>
+        <p>The following tags appears in the list:</p>
         <list type="bulleted">
-          <item>processes</item>
-          <item>driver_options</item>
-          <item>port_count</item>
-          <item>linked_in_driver</item>
-          <item>permanent</item>
-          <item>awaiting_load</item>
-          <item>awaiting_unload</item>
+          <item><c>processes</c></item>
+          <item><c>driver_options</c></item>
+          <item><c>port_count</c></item>
+          <item><c>linked_in_driver</c></item>
+          <item><c>permanent</c></item>
+          <item><c>awaiting_load</c></item>
+          <item><c>awaiting_unload</c></item>
         </list>
-        <p>For a detailed description of each value, please read the
-          description of <seealso marker="#info/2">info/2</seealso> below.</p>
+        <p>For a detailed description of each value, see
+          <seealso marker="#info/2"><c>info/2</c></seealso>.</p>
         <p>The function throws a <c>badarg</c> exception if the driver
           is not present in the system.</p>
       </desc>
     </func>
     <func>
       <name name="info" arity="2"/>
-      <fsummary>Retrieve specific information about one driver</fsummary>
+      <fsummary>Retrieve specific information about one driver.</fsummary>
       <desc>
-        <p>This function returns specific information about one aspect
-          of a driver. The <c><anno>Tag</anno></c> parameter specifies which aspect
-          to get information about. The <c><anno>Value</anno></c> return differs
+        <p>Returns specific information about one aspect of a driver.
+	  Parameter <c><anno>Tag</anno></c> specifies which aspect
+          to get information about. The return <c><anno>Value</anno></c> differs
           between different tags:</p>
         <taglist>
-          <tag><em>processes</em></tag>
+          <tag><c>processes</c></tag>
           <item>
-            <p>Return all processes containing <seealso marker="#users">users</seealso> of the specific drivers
-              as a list of tuples <c>{pid(),integer() >= 0}</c>, where the
-              <c>integer()</c> denotes the number of users in the process
+            <p>Returns all processes containing
+	    <seealso marker="#users">users</seealso> of the specific drivers
+              as a list of tuples <c>{pid(),integer() >= 0}</c>, where
+              <c>integer()</c> denotes the number of users in process
               <c>pid()</c>.</p>
           </item>
-          <tag><em>driver_options</em></tag>
+          <tag><c>driver_options</c></tag>
           <item>
-            <p>Return a list of the driver options provided when
-              loading, as well as any options set by the driver itself
-              during initialization. The currently only valid option
-              being <c>kill_ports</c>.</p>
+            <p>Returns a list of the driver options provided when
+              loading, and any options set by the driver
+              during initialization. The only valid option
+              is <c>kill_ports</c>.</p>
           </item>
-          <tag><em>port_count</em></tag>
+          <tag><c>port_count</c></tag>
           <item>
-            <p>Return the number of ports (an <c>integer >= 0()</c>) using the driver.</p>
+            <p>Returns the number of ports (an <c>integer() >= 0</c>)
+	    using the driver.</p>
           </item>
-          <tag><em>linked_in_driver</em></tag>
+          <tag><c>linked_in_driver</c></tag>
           <item>
-            <p>Return a <c>boolean()</c>, being <c>true</c> if the driver is a
-              statically linked in one and <c>false</c> otherwise.</p>
+            <p>Returns a <c>boolean()</c>, which is <c>true</c> if the driver is a
+              statically linked-in one, otherwise <c>false</c>.</p>
           </item>
-          <tag><em>permanent</em></tag>
+          <tag><c>permanent</c></tag>
           <item>
-            <p>Return a <c>boolean()</c>, being <c>true</c> if the driver has made
-              itself permanent (and is <em>not</em> a statically
-              linked in driver). <c>false</c> otherwise.</p>
+            <p>Returns a <c>boolean()</c>, which is <c>true</c> if the driver has
+	      made itself permanent (and is <em>not</em> a statically
+              linked-in driver), otherwise <c>false</c>.</p>
           </item>
-          <tag><em>awaiting_load</em></tag>
+          <tag><c>awaiting_load</c></tag>
           <item>
-            <p>Return a list of all processes having monitors for
-              <c>loading</c> active, each process returned as
-              <c>{pid(),integer() >= 0}</c>, where the <c>integer()</c> is the
-              number of monitors held by the process <c>pid()</c>.</p>
+            <p>Returns a list of all processes having monitors for
+              <c>loading</c> active. Each process is returned as
+              <c>{pid(),integer() >= 0}</c>, where <c>integer()</c> is the
+              number of monitors held by process <c>pid()</c>.</p>
           </item>
-          <tag><em>awaiting_unload</em></tag>
+          <tag><c>awaiting_unload</c></tag>
           <item>
-            <p>Return a list of all processes having monitors for
-              <c>unloading</c> active, each process returned as
-              <c>{pid(),integer() >= 0}</c>, where the <c>integer()</c> is the
-              number of monitors held by the process <c>pid()</c>.</p>
+            <p>Returns a list of all processes having monitors for
+              <c>unloading</c> active. Each process is returned as
+              <c>{pid(),integer() >= 0}</c>, where <c>integer()</c> is the
+              number of monitors held by process <c>pid()</c>.</p>
           </item>
         </taglist>
-        <p>If the options <c>linked_in_driver</c> or <c>permanent</c>
-          return true, all other options will return the value
-          <c>linked_in_driver</c> or <c>permanent</c> respectively.</p>
+        <p>If option <c>linked_in_driver</c> or <c>permanent</c>
+          returns <c>true</c>, all other options return
+          <c>linked_in_driver</c> or <c>permanent</c>, respectively.</p>
         <p>The function throws a <c>badarg</c> exception if the driver
-          is not present in the system or the tag is not supported.</p>
+          is not present in the system or if the tag is not supported.</p>
       </desc>
     </func>
     <func>
       <name name="load" arity="2"/>
-      <fsummary>Load a driver</fsummary>
+      <fsummary>Load a driver.</fsummary>
       <desc>
-        <p>Loads and links the dynamic driver <c><anno>Name</anno></c>. <c><anno>Path</anno></c>
+        <p>Loads and links the dynamic driver <c><anno>Name</anno></c>.
+	  <c><anno>Path</anno></c>
           is a file path to the directory containing the driver.
           <c><anno>Name</anno></c> must be a sharable object/dynamic library. Two
           drivers with different <c><anno>Path</anno></c> parameters cannot be
-          loaded under the same name. The <c><anno>Name</anno></c> is a string or
+          loaded under the same name. <c><anno>Name</anno></c> is a string or
           atom containing at least one character.</p>
-        <p>The <c><anno>Name</anno></c> given should correspond to the filename
-          of the actual dynamically loadable object file residing in
-          the directory given as <c><anno>Path</anno></c>, but <em>without</em> the
-          extension (i.e. <c>.so</c>). The driver name provided in
+        <p>The <c><anno>Name</anno></c> specified is to correspond to the filename
+          of the dynamically loadable object file residing in
+          the directory specified as <c><anno>Path</anno></c>, but <em>without</em> the
+          extension (that is, <c>.so</c>). The driver name provided in
           the driver initialization routine must correspond with the
-          filename, in much the same way as erlang module names
+          filename, in much the same way as Erlang module names
           correspond to the names of the <c>.beam</c> files.</p>
-        <p>If the driver has been previously unloaded, but is still
-          present due to open ports against it, a call to
-          <c>load/2</c> will stop the unloading and keep the driver
-          (as long as the <c><anno>Path</anno></c> is the same) and <c>ok</c> is
-          returned. If one actually wants the object code to be
-          reloaded, one uses <seealso marker="#reload/2">reload/2</seealso> or the low-level
-          interface <seealso marker="#try_load/3">try_load/3</seealso>
-          instead. Please refer to the description of <seealso marker="#scenarios">different scenarios</seealso> for
+        <p>If the driver was previously unloaded, but is still
+          present because of open ports to it, a call to
+          <c>load/2</c> stops the unloading and keeps the driver
+          (as long as <c><anno>Path</anno></c> is the same), and <c>ok</c> is
+          returned. If you really want the object code to be
+          reloaded, use <seealso marker="#reload/2"><c>reload/2</c></seealso>
+	  or the low-level interface
+	  <seealso marker="#try_load/3"><c>try_load/3</c></seealso> instead.
+	  See also the description of
+	  <seealso marker="#scenarios"><c>different scenarios</c></seealso> for
           loading/unloading in the introduction.</p>
         <p>If more than one process tries to load an already loaded
-          driver withe the same <c><anno>Path</anno></c>, or if the same process
-          tries to load it several times, the function will return
-          <c>ok</c>.  The emulator will keep track of the
+          driver with the same <c><anno>Path</anno></c>, or if the same process
+          tries to load it many times, the function returns
+          <c>ok</c>. The emulator keeps track of the
           <c>load/2</c> calls, so that a corresponding number of
-          <c>unload/2</c> calls will have to be done from the same
-          process before the driver will actually get unloaded. It is
+          <c>unload/2</c> calls must be done from the same
+          process before the driver gets unloaded. It is
           therefore safe for an application to load a driver that is
           shared between processes or applications when needed. It can
           safely be unloaded without causing trouble for other
-          parts of the system. </p>
-        <p>It is not allowed to load
-          several drivers with the same name but with different
-          <c>Path</c> parameters.</p>
+          parts of the system.</p>
+        <p>It is not allowed to load multiple drivers with
+	the same name but with different <c>Path</c> parameters.</p>
         <note>
-          <p>Note especially that the <c><anno>Path</anno></c> is interpreted
-            literally, so that all loaders of the same driver needs to
-            give the same <em>literal</em><c><anno>Path</anno></c> string, even
-            though different paths might point out the same directory
-            in the filesystem (due to use of relative paths and
+          <p><c><anno>Path</anno></c> is interpreted
+            literally, so that all loaders of the same driver must
+            specify the same <em>literal</em> <c><anno>Path</anno></c> string,
+	    although different paths can point out the same directory
+            in the file system (because of use of relative paths and
             links).</p>
         </note>
         <p>On success, the function returns <c>ok</c>. On
           failure, the return value is <c>{error,<anno>ErrorDesc</anno>}</c>,
           where <c><anno>ErrorDesc</anno></c> is an opaque term to be
-          translated into human readable form by the <seealso marker="#format_error/1">format_error/1</seealso>
-          function.</p>
-        <p>For more control over the error handling, again use the
-          <seealso marker="#try_load/3">try_load/3</seealso>
+          translated into human readable form by function
+	  <seealso marker="#format_error/1"><c>format_error/1</c></seealso>.</p>
+        <p>For more control over the error handling, use the
+          <seealso marker="#try_load/3"><c>try_load/3</c></seealso>
           interface instead.</p>
         <p>The function throws a <c>badarg</c> exception if the
-          parameters are not given as described above.  </p>
+          parameters are not specified as described here.</p>
       </desc>
     </func>
     <func>
       <name name="load_driver" arity="2"/>
-      <fsummary>Load a driver</fsummary>
+      <fsummary>Load a driver.</fsummary>
       <desc>
-        <p>Works essentially as <c>load/2</c>, but will load the driver
-          with other options.  All ports that are using the
-          driver will get killed with the reason
-          <c>driver_unloaded</c> when the driver is to be unloaded.</p>
-        <p>The number of loads and unloads by different <seealso marker="#users">users</seealso> influence the actual loading
-          and unloading of a driver file. The port killing will
-          therefore only happen when the <em>last</em> <seealso marker="#users">user</seealso> unloads the driver, or the
-          last process having loaded the driver exits.</p>
+        <p>Works essentially as <c>load/2</c>, but loads the driver
+          with other options. All ports using the
+          driver are killed with reason <c>driver_unloaded</c>
+	  when the driver is to be unloaded.</p>
+        <p>The number of loads and unloads by different
+	  <seealso marker="#users">users</seealso> influences the loading
+          and unloading of a driver file. The port killing
+          therefore only occurs when the <em>last</em>
+	  <seealso marker="#users">user</seealso> unloads the driver,
+	  or when the last process having loaded the driver exits.</p>
         <p>This interface (or at least the name of the functions) is
-          kept for backward compatibility.  Using <seealso marker="#try_load/3">try_load/3</seealso> with
-          <c>{driver_options,[kill_ports]} </c> in the option list will
-          give the same effect regarding the port killing.</p>
+          kept for backward compatibility.
+	  Using <seealso marker="#try_load/3"><c>try_load/3</c></seealso> with
+          <c>{driver_options,[kill_ports]}</c> in the option list
+          gives the same effect regarding the port killing.</p>
         <p>The function throws a <c>badarg</c> exception if the
-          parameters are not given as described above.  </p>
+          parameters are not specified as described here.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="loaded_drivers" arity="0"/>
+      <fsummary>List loaded drivers.</fsummary>
+      <desc>
+        <p>Returns a list of all the available drivers, both
+          (statically) linked-in and dynamically loaded ones.</p>
+        <p>The driver names are returned as a list of strings rather
+          than a list of atoms for historical reasons.</p>
+        <p>For more information about drivers, see
+          <seealso marker="#info/0"><c>info</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="monitor" arity="2"/>
-      <fsummary>Create a monitor for a driver</fsummary>
+      <fsummary>Create a monitor for a driver.</fsummary>
       <desc>
-        <p>This function creates a driver monitor and works in many
-          ways as the function <seealso marker="erts:erlang#erlang:monitor/2">erlang:monitor/2</seealso>,
+        <p>Creates a driver monitor and works in many
+          ways as
+	  <seealso marker="erts:erlang#erlang:monitor/2"><c>erlang:monitor/2</c></seealso>
+	  in <c>ERTS</c>,
           does for processes. When a driver changes state, the monitor
-          results in a monitor-message being sent to the calling
-          process. The <c><anno>MonitorRef</anno></c> returned by this function is
+          results in a monitor message that is sent to the calling
+          process. <c><anno>MonitorRef</anno></c> returned by this function is
           included in the message sent.</p>
-        <p>As with process monitors, each driver monitor set will only
-          generate <em>one single message</em>. The monitor is
-          "destroyed" after the message is sent and there is then no
-          need to call <seealso marker="#demonitor/1">demonitor/1</seealso>.</p>
-        <p>The <c><anno>MonitorRef</anno></c> can also be used in subsequent calls
-          to <seealso marker="#demonitor/1">demonitor/1</seealso> to
+        <p>As with process monitors, each driver monitor set only
+          generates <em>one single message</em>. The monitor is
+          "destroyed" after the message is sent, so it is then not
+          needed to call
+	<seealso marker="#demonitor/1"><c>demonitor/1</c></seealso>.</p>
+        <p><c><anno>MonitorRef</anno></c> can also be used in subsequent calls
+          to <seealso marker="#demonitor/1"><c>demonitor/1</c></seealso> to
           remove a monitor.</p>
         <p>The function accepts the following parameters:</p>
         <taglist>
-          <tag><em><c><anno>Tag</anno></c></em></tag>
+          <tag><c><anno>Tag</anno></c></tag>
           <item>
-            <p>The monitor tag is always <c>driver</c> as this function
+            <p>The monitor tag is always <c>driver</c>, as this function
               can only be used to create driver monitors. In the future,
               driver monitors will be integrated with process monitors,
-              why this parameter has to be given for consistence.</p>
+              why this parameter has to be specified for consistence.</p>
           </item>
-          <tag><em><c><anno>Item</anno></c></em></tag>
+          <tag><c><anno>Item</anno></c></tag>
           <item>
-            <p>The <c><anno>Item</anno></c> parameter specifies which driver one
-              wants to monitor (the name of the driver) as well as
-              which state change one wants to monitor. The parameter
+            <p>Parameter <c><anno>Item</anno></c> specifies
+	    which driver to monitor (the driver name) and
+              which state change to monitor. The parameter
               is a tuple of arity two whose first element is the
-              driver name and second element is either of:</p>
+              driver name and second element is one of the following:</p>
             <taglist>
-              <tag><em>loaded</em></tag>
+              <tag><c>loaded</c></tag>
               <item>
-                <p>Notify me when the driver is reloaded (or loaded if
+                <p>Notifies when the driver is reloaded (or loaded if
                   loading is underway). It only makes sense to monitor
                   drivers that are in the process of being loaded or
-                  reloaded. One cannot monitor a future-to-be driver
-                  name for loading, that will only result in a
-                  <c>'DOWN'</c> message being immediately sent.
+                  reloaded. A future driver name for loading cannot be
+		  monitored. That only results in a
+                  <c>DOWN</c> message sent immediately.
                   Monitoring for loading is therefore most useful when
-                  triggered by the <seealso marker="#try_load/3">try_load/3</seealso> function,
+                  triggered by function
+		  <seealso marker="#try_load/3"><c>try_load/3</c></seealso>,
                   where the monitor is created <em>because</em> the
                   driver is in such a pending state.</p>
-                <p>Setting a driver monitor for <c>loading</c> will
-                  eventually lead to one of the following messages
+                <p>Setting a driver monitor for <c>loading</c>
+                  eventually leads to one of the following messages
                   being sent:</p>
                 <taglist>
-                  <tag><em>{'UP', reference(), driver, Name, loaded}</em></tag>
+                  <tag><c>{'UP', reference(), driver, Name, loaded}</c></tag>
                   <item>
-                    <p>This message is sent, either immediately if the
+                    <p>This message is sent either immediately if the
                       driver is already loaded and no reloading is
                       pending, or when reloading is executed if
                       reloading is pending. </p>
                     <p>The <seealso marker="#users">user</seealso> is
-                      expected to know if reloading is demanded prior
-                      to creating a monitor for loading.</p>
+                      expected to know if reloading is demanded before
+                      creating a monitor for loading.</p>
                   </item>
-                  <tag><em>{'UP', reference(), driver, Name, permanent}</em></tag>
+                  <tag><c>{'UP', reference(), driver, Name, permanent}</c></tag>
                   <item>
-                    <p>This message will be sent if reloading was
+                    <p>This message is sent if reloading was
                       expected, but the (old) driver made itself
-                      permanent prior to reloading. It will also be
+                      permanent before reloading. It is also
                       sent if the driver was permanent or statically
-                      linked in when trying to create the monitor.</p>
+                      linked-in when trying to create the monitor.</p>
                   </item>
-                  <tag><em>{'DOWN', reference(), driver, Name, load_cancelled}</em></tag>
+                  <tag><c>{'DOWN', reference(), driver, Name, load_cancelled}</c></tag>
                   <item>
-                    <p>This message will arrive if reloading was
-                      underway, but the <seealso marker="#users">user</seealso> having requested
-                      reload cancelled it by either dying or calling
-                      <seealso marker="#try_unload/2">try_unload/2</seealso>
+                    <p>This message arrives if reloading was
+                      underway, but the requesting
+		      <seealso marker="#users">user</seealso>
+                      cancelled it by dying or calling
+                      <seealso marker="#try_unload/2"><c>try_unload/2</c></seealso>
                       (or <c>unload/1</c>/<c>unload_driver/1</c>)
                       again before it was reloaded.</p>
                   </item>
-                  <tag><em>{'DOWN', reference(), driver, Name, {load_failure, Failure}}</em></tag>
+                  <tag><c>{'DOWN', reference(), driver, Name, {load_failure, Failure}}</c></tag>
                   <item>
-                    <p>This message will arrive if reloading was
+                    <p>This message arrives if reloading was
                       underway but the loading for some reason
                       failed. The <c>Failure</c> term is one of the
-                      errors that can be returned from <seealso marker="#try_load/3">try_load/3</seealso>. The
-                      error term can be passed to <seealso marker="#format_error/1">format_error/1</seealso>
-                      for translation into human readable form. Note
-                      that the translation has to be done in the same
-                      running erlang virtual machine as the error
+                      errors that can be returned from
+		      <seealso marker="#try_load/3"><c>try_load/3</c></seealso>.
+		      The error term can be passed to
+		      <seealso marker="#format_error/1"><c>format_error/1</c></seealso>
+                      for translation into human readable form. Notice
+                      that the translation must be done in the same
+                      running Erlang virtual machine as the error
                       was detected in.</p>
                   </item>
                 </taglist>
               </item>
-              <tag><em>unloaded</em></tag>
+              <tag><c>unloaded</c></tag>
               <item>
-                <p>Monitor when a driver gets unloaded. If one
+                <p>Monitors when a driver gets unloaded. If one
                   monitors a driver that is not present in the system,
-                  one will immediately get notified that the driver got
+                  one immediately gets notified that the driver got
                   unloaded. There is no guarantee that the driver was
-                  actually ever loaded.</p>
-                <p>A driver monitor for unload will eventually result
+                  ever loaded.</p>
+                <p>A driver monitor for unload eventually results
                   in one of the following messages being sent:</p>
                 <taglist>
-                  <tag><em>{'DOWN', reference(), driver, Name, unloaded}</em></tag>
+                  <tag><c>{'DOWN', reference(), driver, Name, unloaded}</c></tag>
                   <item>
-                    <p>The driver instance monitored is now
-                      unloaded. As the unload might have been due to a
-                      <c>reload/2</c> request, the driver might once
+                    <p>The monitored driver instance is now
+                      unloaded. As the unload can be a result of a
+                      <c>reload/2</c> request, the driver can once
                       again have been loaded when this message
                       arrives.</p>
                   </item>
-                  <tag><em>{'UP', reference(), driver, Name, unload_cancelled}</em></tag>
+                  <tag><c>{'UP', reference(), driver, Name, unload_cancelled}</c></tag>
                   <item>
-                    <p>This message will be sent if unloading was
+                    <p>This message is sent if unloading was
                       expected, but while the driver was waiting for
-                      all ports to get closed, a new <seealso marker="#users">user</seealso> of the driver
-                      appeared and the unloading was cancelled.</p>
-                    <p>This message appears when an <c>{ok, pending_driver}</c>) was returned from <seealso marker="#try_unload/2">try_unload/2</seealso>)
-                      for the last <seealso marker="#users">user</seealso> of the driver and
-                      then a <c>{ok, already_loaded}</c> is returned
-                      from a call to <seealso marker="#try_load/3">try_load/3</seealso>.</p>
-                    <p>If one wants to <em>really</em> monitor when the
-                      driver gets unloaded, this message will distort
-                      the picture, no unloading was really done. 
-                      The <c>unloaded_only</c> option creates a monitor
-                      similar to an <c>unloaded</c> monitor, but does
-                      never result in this message.</p>
+                      all ports to get closed, a new
+		      <seealso marker="#users">user</seealso> of the driver
+                      appeared, and the unloading was cancelled.</p>
+                    <p>This message appears if <c>{ok, pending_driver}</c>
+		      was returned from
+		      <seealso marker="#try_unload/2"><c>try_unload/2</c></seealso>
+                      for the last <seealso marker="#users">user</seealso>
+		      of the driver, and then <c>{ok, already_loaded}</c> is returned
+                      from a call to
+		    <seealso marker="#try_load/3"><c>try_load/3</c></seealso>.</p>
+                    <p>If one <em>really</em> wants to monitor when the
+                      driver gets unloaded, this message distorts
+                      the picture, because no unloading was done.
+                      Option <c>unloaded_only</c> creates a monitor
+                      similar to an <c>unloaded</c> monitor, but
+                      never results in this message.</p>
                   </item>
-                  <tag><em>{'UP', reference(), driver, Name, permanent}</em></tag>
+                  <tag><c>{'UP', reference(), driver, Name, permanent}</c></tag>
                   <item>
-                    <p>This message will be sent if unloading was
+                    <p>This message is sent if unloading was
                       expected, but the driver made itself
-                      permanent prior to unloading. It will also be
+                      permanent before unloading. It is also
                       sent if trying to monitor a permanent or
-                      statically linked in driver.</p>
+                      statically linked-in driver.</p>
                   </item>
                 </taglist>
               </item>
-              <tag><em>unloaded_only</em></tag>
+              <tag><c>unloaded_only</c></tag>
               <item>
                 <p>A monitor created as <c>unloaded_only</c> behaves
-                  exactly as one created as <c>unloaded</c> with the
-                  exception that the <c>{'UP', reference(), driver, Name, unload_cancelled}</c> message will never be
-                  sent, but the monitor instead persists until the
-                  driver <em>really</em> gets unloaded.</p>
+                  exactly as one created as <c>unloaded</c>
+                  except that the
+		  <c>{'UP', reference(), driver, Name, unload_cancelled}</c>
+		  message is never sent, but the monitor instead persists until
+		  the driver <em>really</em> gets unloaded.</p>
               </item>
             </taglist>
           </item>
         </taglist>
         <p>The function throws a <c>badarg</c> exception if the
-          parameters are not given as described above.  </p>
+          parameters are not specified as described here.</p>
       </desc>
     </func>
     <func>
       <name name="reload" arity="2"/>
-      <fsummary>Replace a driver</fsummary>
+      <fsummary>Replace a driver.</fsummary>
       <desc>
         <p>Reloads the driver named <c><anno>Name</anno></c> from a possibly
-          different <c><anno>Path</anno></c> than was previously used. This
-          function is used in the code change <seealso marker="#scenarios">scenario</seealso> described in the
+          different <c><anno>Path</anno></c> than previously used. This
+          function is used in the code change
+	  <seealso marker="#scenarios"><c>scenario</c></seealso> described in the
           introduction.</p>
         <p>If there are other <seealso marker="#users">users</seealso>
-          of this driver, the function will return <c>{error, pending_process}</c>, but if there are no more users, the
-          function call will hang until all open ports are closed.</p>
+          of this driver, the function returns <c>{error, pending_process}</c>,
+	  but if there are no other users, the function call hangs until all
+	  open ports are closed.</p>
         <note>
-          <p>Avoid mixing
-            several <seealso marker="#users">users</seealso> 
-            with driver reload requests.</p>
-        </note>
-        <p>If one wants to avoid hanging on open ports, one should use
-          the <seealso marker="#try_load/3">try_load/3</seealso>
-          function instead.</p>
-        <p>The <c><anno>Name</anno></c> and <c><anno>Path</anno></c> parameters have exactly the
-          same meaning as when calling the plain <seealso marker="#load/2">load/2</seealso> function.</p>
-        <note>
-          <p>Avoid mixing
-            several <seealso marker="#users">users</seealso> 
-            with driver reload requests.</p>
+          <p>Avoid mixing multiple
+	  <seealso marker="#users">users</seealso>
+          with driver reload requests.</p>
         </note>
+        <p>To avoid hanging on open ports, use function
+          <seealso marker="#try_load/3"><c>try_load/3</c></seealso>
+          instead.</p>
+        <p>The <c><anno>Name</anno></c> and <c><anno>Path</anno></c> parameters
+	  have exactly the same meaning as when calling the plain function
+	<seealso marker="#load/2"><c>load/2</c></seealso>.</p>
+
         <p>On success, the function returns <c>ok</c>. On
-          failure, the function returns an opaque error, with the
-          exception of the <c>pending_process</c> error described
-          above. The opaque errors are to be translated into human
-          readable form by the <seealso marker="#format_error/1">format_error/1</seealso> function.</p>
-        <p>For more control over the error handling, again use the
-          <seealso marker="#try_load/3">try_load/3</seealso>
+          failure, the function returns an opaque error,
+          except the <c>pending_process</c> error described
+          earlier. The opaque errors are to be translated into human
+          readable form by function
+	<seealso marker="#format_error/1"><c>format_error/1</c></seealso>.</p>
+        <p>For more control over the error handling,  use the
+          <seealso marker="#try_load/3"><c>try_load/3</c></seealso>
           interface instead.</p>
         <p>The function throws a <c>badarg</c> exception if the
-          parameters are not given as described above.  </p>
+          parameters are not specified as described here.</p>
       </desc>
     </func>
     <func>
       <name name="reload_driver" arity="2"/>
-      <fsummary>Replace a driver</fsummary>
+      <fsummary>Replace a driver.</fsummary>
       <desc>
-        <p>Works exactly as <seealso marker="#reload/2">reload/2</seealso>, but for drivers
-          loaded with the <seealso marker="#load_driver/2">load_driver/2</seealso> interface. </p>
-        <p>As this interface implies that ports are being killed when
-          the last user disappears, the function wont hang waiting for
+        <p>Works exactly as <seealso marker="#reload/2"><c>reload/2</c></seealso>,
+	  but for drivers loaded with the
+	<seealso marker="#load_driver/2"><c>load_driver/2</c></seealso> interface.</p>
+        <p>As this interface implies that ports are killed when
+          the last user disappears, the function does not hang waiting for
           ports to get closed.</p>
-        <p>For further details, see the <seealso marker="#scenarios">scenarios</seealso> in the module
-          description and refer to the <seealso marker="#reload/2">reload/2</seealso> function description.</p>
+        <p>For more details, see
+	  <seealso marker="#scenarios"><c>scenarios</c></seealso> in this module
+          description and the function description for
+	  <seealso marker="#reload/2"><c>reload/2</c></seealso>.</p>
         <p>The function throws a <c>badarg</c> exception if the
-          parameters are not given as described above.  </p>
+          parameters are not specified as described here.</p>
       </desc>
     </func>
     <func>
       <name name="try_load" arity="3"/>
-      <fsummary>Load a driver</fsummary>
+      <fsummary>Load a driver.</fsummary>
       <desc>
-        <p>This function provides more control than the
+        <p>Provides more control than the
           <c>load/2</c>/<c>reload/2</c> and
           <c>load_driver/2</c>/<c>reload_driver/2</c> interfaces. It
-          will never wait for completion of other operations related
-          to the driver, but immediately return the status of the
-          driver as either:</p>
+          never waits for completion of other operations related
+          to the driver, but immediately returns the status of the
+          driver as one of the following:</p>
         <taglist>
-          <tag><em>{ok, loaded}</em></tag>
+          <tag><c>{ok, loaded}</c></tag>
           <item>
-            <p>The driver was actually loaded and is immediately
-              usable.</p>
+            <p>The driver was loaded and is immediately usable.</p>
           </item>
-          <tag><em>{ok, already_loaded}</em></tag>
+          <tag><c>{ok, already_loaded}</c></tag>
           <item>
             <p>The driver was already loaded by another process
-              and/or is in use by a living port. The load by you is
+              or is in use by a living port, or both. The load by you is
               registered and a corresponding <c>try_unload</c> is
               expected sometime in the future.</p>
           </item>
-          <tag><em>{ok, pending_driver}</em>or <em>{ok, pending_driver, reference()}</em></tag>
+          <tag><c>{ok, pending_driver}</c>or <c>{ok, pending_driver, reference()}</c></tag>
           <item>
             <p>The load request is registered, but the loading is
-              delayed due to the fact that an earlier instance of the
-              driver is still waiting to get unloaded (there are open
-              ports using it). Still, unload is expected when you are
-              done with the driver. This return value will
-              <em>mostly</em> happen when the
+              delayed because an earlier instance of the
+              driver is still waiting to get unloaded (open
+              ports use it). Still, unload is expected when you are
+              done with the driver. This return value
+              <em>mostly</em> occurs when options
               <c>{reload,pending_driver}</c> or
-              <c>{reload,pending}</c> options are used, but
-              <em>can</em> happen when another <seealso marker="#users">user</seealso> is unloading a driver in
-              parallel and the <c>kill_ports</c> driver option is
-              set. In other words, this return value will always need
-              to be handled!</p>
+              <c>{reload,pending}</c> are used, but
+              <em>can</em> occur when another
+	      <seealso marker="#users">user</seealso> is unloading a
+	      driver in parallel and driver option <c>kill_ports</c> is set.
+	      In other words, this return value always needs
+              to be handled.</p>
           </item>
-          <tag><em>{ok, pending_process}</em>or <em>{ok, pending_process, reference()}</em></tag>
+          <tag><c>{ok, pending_process}</c>or <c>{ok, pending_process, reference()}</c></tag>
           <item>
             <p>The load request is registered, but the loading is
-              delayed due to the fact that an earlier instance of the
+              delayed because an earlier instance of the
               driver is still waiting to get unloaded by another
               <seealso marker="#users">user</seealso> (not only by a
               port, in which case <c>{ok,pending_driver}</c> would
               have been returned). Still, unload is expected when you
-              are done with the driver. This return value will
-              <em>only</em> happen when the <c>{reload,pending}</c>
-              option is used.</p>
+              are done with the driver. This return value
+              <em>only</em> occurs when option <c>{reload,pending}</c>
+              is used.</p>
           </item>
         </taglist>
         <p>When the function returns <c>{ok, pending_driver}</c> or
-          <c>{ok, pending_process}</c>, one might want to get information
-          about when the driver is <em>actually</em> loaded. This can
-          be achieved by using the <c>{monitor, <anno>MonitorOption</anno>}</c> option.</p>
-        <p>When monitoring is requested, and a corresponding <c>{ok, pending_driver}</c> or <c>{ok, pending_process}</c> would be
-          returned, the function will instead return a tuple <c>{ok, <anno>PendingStatus</anno>, reference()}</c> and the process will, at a later
-          time when the driver actually gets loaded, get a monitor
-          message. The monitor message one can expect is described in
-          the <seealso marker="#monitor/2">monitor/2</seealso>
-          function description. </p>
+          <c>{ok, pending_process}</c>, one can get information
+          about when the driver is <em>actually</em> loaded  by using
+	  option <c>{monitor, <anno>MonitorOption</anno>}</c>.</p>
+        <p>When monitoring is requested, and a corresponding
+	<c>{ok, pending_driver}</c> or <c>{ok, pending_process}</c> would
+	  be returned, the function instead returns a tuple
+	  <c>{ok, <anno>PendingStatus</anno>, reference()}</c>
+	  and the process then gets a monitor message later, when the
+	  driver gets loaded. The monitor message to expect is described in
+          the function description of
+	  <seealso marker="#monitor/2"><c>monitor/2</c></seealso>.</p>
         <note>
-          <p>Note that in case of loading, monitoring can
-            <em>not</em> only get triggered by using the <c>{reload, <anno>ReloadOption</anno>}</c> option, but also in special cases where
-            the load-error is transient, why <c>{monitor, pending_driver}</c> should be used under basically
-            <em>all</em> real world circumstances!</p>
+          <p>In case of loading, monitoring can <em>not</em> only get
+	    triggered by using option <c>{reload, <anno>ReloadOption</anno>}</c>,
+	    but also in special cases where the load error is transient. Thus,
+	    <c>{monitor, pending_driver}</c> is to be used under basically
+            <em>all</em> real world circumstances.</p>
         </note>
         <p>The function accepts the following parameters:</p>
         <taglist>
-          <tag><em><c><anno>Path</anno></c></em></tag>
+          <tag><c><anno>Path</anno></c></tag>
           <item>
-            <p>The filesystem path to the directory where the driver
-              object file is situated. The filename of the object file
+            <p>The file system path to the directory where the driver
+              object file is located. The filename of the object file
               (minus extension) must correspond to the driver name
-              (used in the name parameter) and the driver must
-              identify itself with the very same name. The
-              <c><anno>Path</anno></c> might be provided as an <em>iolist()</em>,
+              (used in parameter <c><anno>Name</anno></c>) and the driver must
+              identify itself with the same name.
+              <c><anno>Path</anno></c> can be provided as an <em>iolist()</em>,
               meaning it can be a list of other <c>iolist()</c>s, characters
-              (eight bit integers) or binaries, all to be flattened
+              (8-bit integers), or binaries, all to be flattened
               into a sequence of characters.</p>
             <p>The (possibly flattened) <c><anno>Path</anno></c> parameter must be
-              consistent throughout the system, a driver should, by
+              consistent throughout the system. A driver is to, by
               all <seealso marker="#users">users</seealso>, be loaded
-              using the same <em>literal</em><c><anno>Path</anno></c>. The
-              exception is when <em>reloading</em> is requested, in
-              which case the <c><anno>Path</anno></c> may be specified
-              differently. Note that all <seealso marker="#users">users</seealso> trying to load the
-              driver at a later time will need to use the <em>new</em><c><anno>Path</anno></c> if the <c><anno>Path</anno></c> is changed using a
-              <c>reload</c> option. This is yet another reason
+              using the same <em>literal</em> <c><anno>Path</anno></c>.
+	      The exception is when <em>reloading</em> is requested,
+	      in which case <c><anno>Path</anno></c> can be specified
+              differently. Notice that all
+	      <seealso marker="#users">users</seealso> trying to load the
+              driver later need to use the
+	      <em>new</em> <c><anno>Path</anno></c> if <c><anno>Path</anno></c>
+	      is changed using a <c>reload</c> option. This is yet another reason
               to have <em>only one loader</em> of a driver one wants to
-              upgrade in a running system!  </p>
+              upgrade in a running system.</p>
           </item>
-          <tag><em><c><anno>Name</anno></c></em></tag>
+          <tag><c><anno>Name</anno></c></tag>
           <item>
-            <p>The name parameter is the name of the driver to be used
-              in subsequent calls to <seealso marker="erts:erlang#open_port/2">open_port</seealso>. The
-              name can be specified either as an <c>iolist()</c> or
-              as an <c>atom()</c>. The name given when loading is used
-              to find the actual object file (with the
-              help of the <c><anno>Path</anno></c> and the system implied
-              extension suffix, i.e. <c>.so</c>). The name by which
-              the driver identifies itself must also be consistent
-              with this <c><anno>Name</anno></c> parameter, much as a beam-file's
-              module name much correspond to its filename.</p>
+            <p>This parameter is the name of the driver
+	      to be used in subsequent calls to function
+	      <seealso marker="erts:erlang#open_port/2"><c>erlang:open_port</c></seealso>
+	      in <c>ERTS</c>.
+	      The name can be specified as an <c>iolist()</c> or
+              an <c>atom()</c>. The name specified when loading is used
+              to find the object file (with the help of <c><anno>Path</anno></c>
+	      and the system-implied extension suffix, that is, <c>.so</c>).
+	      The name by which the driver identifies itself must also be consistent
+              with this <c><anno>Name</anno></c> parameter, much as
+	      the module name of a Beam file much corresponds to its filename.</p>
           </item>
-          <tag><em><c><anno>OptionList</anno></c></em></tag>
+          <tag><c><anno>OptionList</anno></c></tag>
           <item>
-            <p>A number of options can be specified to control the
-              loading operation. The options are given as a list of
-              two-tuples, the tuples having the following values and
+            <p>Some options can be specified to control the
+              loading operation. The options are specified as a list of
+              two-tuples. The tuples have the following values and
               meanings:</p>
             <taglist>
-              <tag><em>{driver_options, <c><anno>DriverOptionList</anno></c>}</em></tag>
+              <tag><c>{driver_options, <anno>DriverOptionList</anno>}</c></tag>
               <item>
-                <p>This option is to provide options that will change
-                  its general behavior and will "stick" to the driver
+                <p>This is to provide options that changes
+                  its general behavior and "sticks" to the driver
                   throughout its lifespan.</p>
-                <p>The driver options for a given driver name need
-                  always to be consistent, <em>even when the driver is reloaded</em>, meaning that they are as much a part
-                  of the driver as the actual name.</p>
-                <p>Currently the only allowed driver option is
+                <p>The driver options for a specified driver name need
+                  always to be consistent, <em>even when the driver is reloaded</em>,
+		  meaning that they are as much a part of the driver as the name.</p>
+                <p>The only allowed driver option is
                   <c>kill_ports</c>, which means that all ports opened
-                  towards the driver are killed with the exit-reason
+                  to the driver are killed with exit reason
                   <c>driver_unloaded</c> when no process any longer
                   has the driver loaded. This situation arises either
-                  when the last <seealso marker="#users">user</seealso> calls <seealso marker="#try_unload/2">try_unload/2</seealso>, or
-                  the last process having loaded the driver exits.</p>
+                  when the last <seealso marker="#users">user</seealso> calls
+		  <seealso marker="#try_unload/2"><c>try_unload/2</c></seealso>, or
+                  when the last process having loaded the driver exits.</p>
               </item>
-              <tag><em>{monitor, <c><anno>MonitorOption</anno></c>}</em></tag>
+              <tag><c>{monitor, <anno>MonitorOption</anno>}</c></tag>
               <item>
                 <p>A <c><anno>MonitorOption</anno></c> tells <c>try_load/3</c> to
                   trigger a driver monitor under certain
                   conditions. When the monitor is triggered, the
-                  function will return a three-tuple <c>{ok, <anno>PendingStatus</anno>, reference()}</c>, where the <c>reference()</c> is
-                  the monitor ref for the driver monitor.</p>
-                <p>Only one <c><anno>MonitorOption</anno></c> can be specified and
-                  it is either the atom <c>pending</c>, which means
-                  that a monitor should be created whenever a load
-                  operation is delayed, and the atom
-                  <c>pending_driver</c>, in which a monitor is
-                  created whenever the operation is delayed due to
-                  open ports towards an otherwise unused driver. The
-                  <c>pending_driver</c> option is of little use, but
-                  is present for completeness, it is very well defined
-                  which reload-options might give rise to which
-                  delays. It might, however, be a good idea to use the
-                  same <c><anno>MonitorOption</anno></c> as the <c><anno>ReloadOption</anno></c>
-                  if present.</p>
-                <p>If reloading is not requested, it might still be
-                  useful to specify the <c>monitor</c> option, as
-                  forced unloads (<c>kill_ports</c> driver option or
-                  the <c>kill_ports</c> option to <seealso marker="#try_unload/2">try_unload/2</seealso>) will
-                  trigger a transient state where driver loading
+                  function returns a three-tuple
+		  <c>{ok, <anno>PendingStatus</anno>, reference()}</c>, where
+		  <c>reference()</c> is the monitor reference for the driver monitor.</p>
+                <p>Only one <c><anno>MonitorOption</anno></c> can be specified.
+                  It is one of the following:</p>
+		  <list type="bulleted">
+		    <item>
+		      <p>The atom <c>pending</c>, which means
+                      that a monitor is to be created whenever a load
+                      operation is delayed,</p>
+		    </item>
+		    <item>
+		      <p>The atom <c>pending_driver</c>, in which a monitor
+		      is created whenever the operation is delayed because
+		      of open ports to an otherwise unused driver.</p>
+		      </item>
+		  </list>
+		<p>Option <c>pending_driver</c> is of little use, but
+		  is present for completeness, as it is well defined which
+		  reload options that can give rise to which delays.
+		  However, it can be a good idea to use the same
+		  <c><anno>MonitorOption</anno></c> as the
+		  <c><anno>ReloadOption</anno></c>, if present.</p>
+                <p>If reloading is not requested, it can still be
+                  useful to specify option <c>monitor</c>, as
+                  forced unloads (driver option <c>kill_ports</c> or
+                  option <c>kill_ports</c> to
+		  <seealso marker="#try_unload/2"><c>try_unload/2</c></seealso>)
+		  trigger a transient state where driver loading
                   cannot be performed until all closing ports are
-                  actually closed. So, as <c>try_unload</c> can, in
-                  almost all situations, return <c>{ok, pending_driver}</c>, one should always specify at least
-                  <c>{monitor, pending_driver}</c> in production
-                  code (see the monitor discussion above). </p>
+                  closed. Thus, as <c>try_unload</c> can, in
+                  almost all situations, return <c>{ok, pending_driver}</c>,
+		  always specify at least <c>{monitor, pending_driver}</c>
+		  in production code (see the monitor discussion earlier).</p>
               </item>
-              <tag><em>{reload, <c><anno>ReloadOption</anno></c>}</em></tag>
+              <tag><c>{reload, <anno>ReloadOption</anno>}</c></tag>
               <item>
-                <p>This option is used when one wants to
+                <p>This option is used to
                   <em>reload</em> a driver from disk, most often in a
                   code upgrade scenario. Having a <c>reload</c> option
-                  also implies that the <c><anno>Path</anno></c> parameter need
-                  <em>not</em> be consistent with earlier loads of
+                  also implies that parameter <c><anno>Path</anno></c> does
+                  <em>not</em> need to be consistent with earlier loads of
                   the driver.</p>
-                <p>To reload a driver, the process needs to have previously
-                  loaded the driver, i.e there has to be an active <seealso marker="#users">user</seealso> of the driver in the process. </p>
-                <p>The <c>reload</c> option can be either the atom
-                  <c>pending</c>, in which reloading is requested for
-                  any driver and will be effectuated when <em>all</em>
-                  ports opened against the driver are closed.  The
-                  replacement of the driver will in this case take
-                  place regardless of if there are still
-                  pending <seealso marker="#users">users</seealso>
-                  having the driver loaded!
-                  The option also triggers port-killing (if the
-                  <c>kill_ports</c> driver option is used) even though
-                  there are pending users, making it usable for forced
-                  driver replacement, but laying a lot of
-                  responsibility on the driver <seealso marker="#users">users</seealso>. The pending option is
-                  seldom used as one does not want other <seealso marker="#users">users</seealso> to have loaded the
-                  driver when code change is underway. </p>
-                <p>The more useful option is <c>pending_driver</c>,
-                  which means that reloading will be queued if the
-                  driver is <em>not</em> loaded by any other <seealso marker="#users">users</seealso>, but the driver has
-                  opened ports, in which case <c>{ok, pending_driver}</c> will be returned (a
-                  <c>monitor</c> option is of course recommended).</p>
-                <p>If the driver is unloaded (not present in the
-                  system), the error code
-                  <c>not_loaded</c> will be returned. The
-                  <c>reload</c> option is intended for when the user
+                <p>To reload a driver, the process must have loaded the driver
+		  before, that is, there must be an active
+		  <seealso marker="#users">user</seealso> of the driver
+		  in the process.</p>
+                <p>The <c>reload</c> option can be either of the following:</p>
+		 <taglist>
+		   <tag><c>pending</c></tag>
+		   <item>
+		     <p>With the atom <c>pending</c>, reloading is requested
+		       for any driver and is effectuated when <em>all</em>
+                       ports opened to the driver are closed. The driver
+                       replacement in this case takes
+                       place regardless if there are still
+                       pending <seealso marker="#users">users</seealso>
+                       having the driver loaded.</p>
+                     <p>The option also triggers port-killing (if driver
+                       option <c>kill_ports</c> is used) although
+                       there are pending users, making it usable for forced
+                       driver replacement, but laying much
+                       responsibility on the driver
+		       <seealso marker="#users">users</seealso>.
+		       The pending option is seldom used as one does not want other
+		       <seealso marker="#users">users</seealso> to have loaded
+		       the driver when code change is underway.</p></item>
+		   <tag><c>pending_driver</c></tag>
+		   <item>
+		     <p>This option is more useful. Here, reloading is queued
+		        if the driver is <em>not</em> loaded by any other
+		        <seealso marker="#users">users</seealso>, but the
+			driver has opened ports, in which case
+			<c>{ok, pending_driver}</c> is returned
+			(a <c>monitor</c> option is recommended).</p></item>
+		 </taglist>
+                <p>If the driver is unloaded (not present in the system),
+		  error code <c>not_loaded</c> is returned. Option
+                  <c>reload</c> is intended for when the user
                   has already loaded the driver in advance.</p>
               </item>
             </taglist>
           </item>
         </taglist>
-        <p>The function might return numerous errors, of which some
-          only can be returned given a certain combination of options.</p>
-        <p>A number of errors are opaque and can only be interpreted by
-          passing them to the <seealso marker="#format_error/1">format_error/1</seealso> function,
+        <p>The function can return numerous errors, some
+          can only be returned given a certain combination of options.</p>
+        <p>Some errors are opaque and can only be interpreted by
+          passing them to function
+	  <seealso marker="#format_error/1"><c>format_error/1</c></seealso>,
           but some can be interpreted directly:</p>
         <taglist>
-          <tag><em>{error,linked_in_driver}</em></tag>
+          <tag><c>{error,linked_in_driver}</c></tag>
           <item>
-            <p>The driver with the specified name is an erlang
-              statically linked in driver, which cannot be manipulated
+            <p>The driver with the specified name is an Erlang
+              statically linked-in driver, which cannot be manipulated
               with this API.</p>
           </item>
-          <tag><em>{error,inconsistent}</em></tag>
+          <tag><c>{error,inconsistent}</c></tag>
           <item>
-            <p>The driver has already been loaded with either other
-              <c><anno>DriverOptionList</anno></c> or a different <em>literal</em><c>Path</c> argument.</p>
-            <p>This can happen even if a <c>reload</c> option is given,
-              if the <c>DriverOptionList</c> differ from the current.</p>
+            <p>The driver is already loaded with other
+              <c><anno>DriverOptionList</anno></c> or a different
+	    <em>literal</em> <c>Path</c> argument.</p>
+            <p>This can occur even if a <c>reload</c> option is specified,
+              if <c>DriverOptionList</c> differs from the current.</p>
           </item>
-          <tag><em>{error, permanent}</em></tag>
+          <tag><c>{error, permanent}</c></tag>
           <item>
             <p>The driver has requested itself to be permanent, making
-              it behave like an erlang linked in driver and it can no
+              it behave like an Erlang linked-in driver and can no
               longer be manipulated with this API.</p>
           </item>
-          <tag><em>{error, pending_process}</em></tag>
+          <tag><c>{error, pending_process}</c></tag>
           <item>
-            <p>The driver is loaded by other <seealso marker="#users">users</seealso> when the <c>{reload, pending_driver}</c> option was given.</p>
+            <p>The driver is loaded by other
+	    <seealso marker="#users">users</seealso> when
+	    option <c>{reload, pending_driver}</c> was specified.</p>
           </item>
-          <tag><em>{error, pending_reload}</em></tag>
+          <tag><c>{error, pending_reload}</c></tag>
           <item>
-            <p>Driver reload is already requested by another <seealso marker="#users">user</seealso> when the <c>{reload, <anno>ReloadOption</anno>}</c> option was given.</p>
+            <p>Driver reload is already requested by another
+	    <seealso marker="#users">user</seealso> when option
+	    <c>{reload, <anno>ReloadOption</anno>}</c> was specified.</p>
           </item>
-          <tag><em>{error, not_loaded_by_this_process}</em></tag>
+          <tag><c>{error, not_loaded_by_this_process}</c></tag>
           <item>
-            <p>Appears when the <c>reload</c> option is given. The
-              driver <c><anno>Name</anno></c> is present in the system, but there is no
-              <seealso marker="#users">user</seealso> of it in this
+            <p>Appears when option <c>reload</c> is specified. The
+              driver <c><anno>Name</anno></c> is present in the system, but there
+	      is no <seealso marker="#users">user</seealso> of it in this
               process.</p>
           </item>
-          <tag><em>{error, not_loaded}</em></tag>
+          <tag><c>{error, not_loaded}</c></tag>
           <item>
-            <p>Appears when the <c>reload</c> option is given. The
+            <p>Appears when option <c>reload</c> is specified. The
               driver <c><anno>Name</anno></c> is not in the system. Only drivers
               loaded by this process can be reloaded.</p>
           </item>
         </taglist>
-        <p>All other error codes are to be translated by the <seealso marker="#format_error/1">format_error/1</seealso>
-          function. Note that calls to <c>format_error</c> should be
-          performed from the same running instance of the erlang
-          virtual machine as the error was detected in, due to system
-          dependent behavior concerning error values.</p>
-        <p>If the arguments or options are malformed, the function will
-          throw a <c>badarg</c> exception.</p>
+        <p>All other error codes are to be translated by function
+	<seealso marker="#format_error/1"><c>format_error/1</c></seealso>.
+	  Notice that calls to <c>format_error</c> are to be
+          performed from the same running instance of the Erlang
+          virtual machine as the error is detected in, because of
+	  system-dependent behavior concerning error values.</p>
+        <p>If the arguments or options are malformed, the function
+          throws a <c>badarg</c> exception.</p>
       </desc>
     </func>
     <func>
       <name name="try_unload" arity="2"/>
-      <fsummary>Unload a driver</fsummary>
+      <fsummary>Unload a driver.</fsummary>
       <desc>
-        <p>This is the low level function to unload (or decrement
+        <p>This is the low-level function to unload (or decrement
           reference counts of) a driver. It can be used to force port
           killing, in much the same way as the driver option
-          <c>kill_ports</c> implicitly does, and it can trigger a
-          monitor either due to other <seealso marker="#users">users</seealso> still having the driver
-          loaded or that there are open ports using the driver.</p>
+          <c>kill_ports</c> implicitly does. Also, it can trigger a
+          monitor either because other
+	  <seealso marker="#users">users</seealso> still have the driver
+          loaded or because open ports use the driver.</p>
         <p>Unloading can be described as the process of telling the
           emulator that this particular part of the code in this
-          particular process (i.e. this <seealso marker="#users">user</seealso>) no longer needs the
-          driver. That can, if there are no other users, trigger
-          actual unloading of the driver, in which case the driver
-          name disappears from the system and (if possible) the memory
-          occupied by the driver executable code is reclaimed. If the
-          driver has the <c>kill_ports</c> option set, or if
-          <c>kill_ports</c> was specified as an option to this
-          function, all pending ports using this driver will get
-          killed when unloading is done by the last <seealso marker="#users">user</seealso>. If no port-killing is
-          involved and there are open ports, the actual unloading
-          is delayed until there are no more open ports using the
-          driver. If, in this case, another <seealso marker="#users">user</seealso> (or even this user) loads the
-          driver again before the driver is actually unloaded, the
-          unloading will never take place.</p>
-        <p>To allow the <seealso marker="#users">user</seealso> that
-          <em>requests unloading</em> to wait for <em>actual unloading</em> to
-          take place, <c>monitor</c> triggers can be specified in much
-          the same way as when loading. As <seealso marker="#users">users</seealso> of this function however
-          seldom are interested in more than decrementing the
-          reference counts, monitoring is more seldom needed. If the
-          <c>kill_ports</c> option is used however, monitor trigging is
-          crucial, as the ports are not guaranteed to have been killed
-          until the driver is unloaded, why a monitor should be
-          triggered for at least the <c>pending_driver</c> case.</p>
-        <p>The possible monitor messages that can be expected are the
-          same as when using the <c>unloaded</c> option to the
-          <seealso marker="#monitor/2">monitor/2</seealso> function.</p>
-        <p>The function will return one of the following statuses upon
+          particular process (that is, this
+	  <seealso marker="#users">user</seealso>) no longer needs
+	  the driver. That can, if there are no other users, trigger
+          unloading of the driver, in which case the driver name
+          disappears from the system and (if possible) the memory
+          occupied by the driver executable code is reclaimed.</p>
+	  <p>If the driver has option <c>kill_ports</c> set, or if
+          <c>kill_ports</c> is specified as an option to this
+          function, all pending ports using this driver are
+          killed when unloading is done by the last
+	  <seealso marker="#users">user</seealso>. If no port-killing
+	  is involved and there are open ports, the unloading
+          is delayed until no more open ports use the
+          driver. If, in this case, another
+	  <seealso marker="#users">user</seealso> (or even this user)
+	  loads the driver again before the driver is unloaded, the
+          unloading never takes place.</p>
+        <p>To allow the <seealso marker="#users">user</seealso> to
+          <em>request unloading</em> to wait for <em>actual unloading</em>,
+          <c>monitor</c> triggers can be specified in much the same way as
+	  when loading. However, as <seealso marker="#users">users</seealso>
+	  of this function seldom are interested in more than decrementing the
+          reference counts, monitoring is seldom needed.</p>
+	<note><p> If option <c>kill_ports</c> is used, monitor trigging is crucial,
+	  as the ports are not guaranteed to be killed until the driver is unloaded.
+	  Thus, a monitor must be triggered for at least the <c>pending_driver</c>
+	  case.</p></note>
+        <p>The possible monitor messages to expect are the
+          same as when using option <c>unloaded</c> to function
+          <seealso marker="#monitor/2"><c>monitor/2</c></seealso>.</p>
+        <p>The function returns one of the following statuses upon
           success:</p>
         <taglist>
-          <tag><em>{ok, unloaded}</em></tag>
+          <tag><c>{ok, unloaded}</c></tag>
           <item>
             <p>The driver was immediately unloaded, meaning that the
               driver name is now free to use by other drivers and, if
               the underlying OS permits it, the memory occupied by the
               driver object code is now reclaimed.</p>
             <p>The driver can only be unloaded when there are no open
-              ports using it and there are no more <seealso marker="#users">users</seealso> requiring it to be
+              ports using it and no more
+	      <seealso marker="#users">users</seealso> require it to be
               loaded.</p>
           </item>
-          <tag><em>{ok, pending_driver}</em>or <em>{ok, pending_driver, reference()}</em></tag>
+          <tag><c>{ok, pending_driver}</c>or
+	       <c>{ok, pending_driver, reference()}</c></tag>
           <item>
-            <p>This return value indicates that this call removed the
-              last <seealso marker="#users">user</seealso> from the
+            <p>Indicates that this call removed the last
+	      <seealso marker="#users">user</seealso> from the
               driver, but there are still open ports using it.
-              When all ports are closed and no new <seealso marker="#users">users</seealso> have arrived, the driver
-              will actually be reloaded and the name and memory
+              When all ports are closed and no new
+	      <seealso marker="#users">users</seealso> have arrived,
+	      the driver is reloaded and the name and memory
               reclaimed.</p>
-            <p>This return value is valid even when the option
-              <c>kill_ports</c> was used, as killing ports may not be
-              a process that completes immediately. The condition is,
-              in that case, however transient. Monitors are as always
-              useful to detect when the driver is really unloaded.</p>
+            <p>This return value is valid even if option <c>kill_ports</c>
+	      was used, as killing ports can be a process that does not
+	      complete immediately. However, the condition is in that case
+	      transient. Monitors are always useful to detect when the driver
+	      is really unloaded.</p>
           </item>
-          <tag><em>{ok, pending_process}</em>or <em>{ok, pending_process, reference()}</em></tag>
+          <tag><c>{ok, pending_process}</c>or
+	       <c>{ok, pending_process, reference()}</c></tag>
           <item>
-            <p>The unload request is registered, but there are still
-              other <seealso marker="#users">users</seealso> holding
-              the driver. Note that the term <c>pending_process</c>
-              might refer to the running process, there might be more
+            <p>The unload request is registered, but
+              other <seealso marker="#users">users</seealso> still hold
+              the driver. Notice that the term <c>pending_process</c>
+              can refer to the running process; there can be more
               than one <seealso marker="#users">user</seealso> in the
               same process.</p>
-            <p>This is a normal, healthy return value if the call was
+            <p>This is a normal, healthy, return value if the call was
               just placed to inform the emulator that you have no
-              further use of the driver. It is actually the most
-              common return value in the most common <seealso marker="#scenarios">scenario</seealso>
+              further use of the driver. It is the most
+              common return value in the most common
+	      <seealso marker="#scenarios"><c>scenario</c></seealso>
               described in the introduction.</p>
           </item>
         </taglist>
         <p>The function accepts the following parameters:</p>
         <taglist>
-          <tag><em><c><anno>Name</anno></c></em></tag>
+          <tag><c><anno>Name</anno></c></tag>
           <item>
-            <p>The name parameter is the name of the driver to be
-              unloaded. The name can be specified either as an
-              <c>iolist()</c> or as an <c>atom()</c>. </p>
+            <p><c><anno>Name</anno></c> is the name of the
+	      driver to be unloaded. The name can be specified as an
+              <c>iolist()</c> or as an <c>atom()</c>.</p>
           </item>
-          <tag><em><c><anno>OptionList</anno></c></em></tag>
+          <tag><c><anno>OptionList</anno></c></tag>
           <item>
-            <p>The <c><anno>OptionList</anno></c> argument can be used to specify
-              certain behavior regarding ports as well as triggering
+            <p>Argument <c><anno>OptionList</anno></c> can be used to specify
+              certain behavior regarding ports and triggering
               monitors under certain conditions:</p>
             <taglist>
-              <tag><em>kill_ports</em></tag>
+              <tag><c>kill_ports</c></tag>
               <item>
-                <p>Force killing of all ports opened using this driver,
-                  with the exit reason <c>driver_unloaded</c>, if you are
-                  the <em>last</em><seealso marker="#users">user</seealso> of the driver.</p>
-                <p>If there are other <seealso marker="#users">users</seealso> having the driver
-                  loaded, this option will have no effect.</p>
-                <p>If one wants the consistent behavior of killing ports
+                <p>Forces killing of all ports opened using this driver,
+                  with exit reason <c>driver_unloaded</c>, if you are
+                  the <em>last</em> <seealso marker="#users">user</seealso>
+		  of the driver.</p>
+                <p>If other <seealso marker="#users">users</seealso>
+		  have the driver loaded, this option has no effect.</p>
+                <p>To get the consistent behavior of killing ports
                   when the last <seealso marker="#users">user</seealso>
-                  unloads, one should use the driver option
+                  unloads, use driver option
                   <c>kill_ports</c> when loading the driver instead.</p>
               </item>
-              <tag><em>{monitor, <c><anno>MonitorOption</anno></c>}</em></tag>
+              <tag><c>{monitor, <anno>MonitorOption</anno>}</c></tag>
               <item>
-                <p>This option creates a driver monitor if the condition
-                  given in <c><anno>MonitorOption</anno></c> is true. The valid
+                <p>Creates a driver monitor if the condition
+                  specified in <c><anno>MonitorOption</anno></c> is true. The valid
                   options are:</p>
                 <taglist>
-                  <tag><em>pending_driver</em></tag>
+                  <tag><c>pending_driver</c></tag>
                   <item>
-                    <p>Create a driver monitor if the return value is to
+                    <p>Creates a driver monitor if the return value is to
                       be <c>{ok, pending_driver}</c>.</p>
                   </item>
-                  <tag><em>pending</em></tag>
+                  <tag><c>pending</c></tag>
                   <item>
-                    <p>Create a monitor if the return value will be either 
+                    <p>Creates a monitor if the return value is
                       <c>{ok, pending_driver}</c> or <c>{ok, pending_process}</c>.</p>
                   </item>
                 </taglist>
-                <p>The <c>pending_driver</c> <c><anno>MonitorOption</anno></c> is by far
-                  the most useful and it has to be used to ensure that the
-                  driver has really been unloaded and the ports closed
-                  whenever the <c>kill_ports</c> option is used or the
-                  driver may have been loaded with the <c>kill_ports</c>
-                  driver option.</p>
-                <p>By using the monitor-triggers in the call to
-                  <c>try_unload</c> one can be sure that the monitor is
-                  actually added before the unloading is executed, meaning
-                  that the monitor will always get properly triggered,
-                  which would not be the case if one called
-                  <c>erl_ddll:monitor/2</c> separately.</p>
+                <p>The <c>pending_driver</c> <c><anno>MonitorOption</anno></c> is
+		  by far the most useful. It must be used to ensure that the
+                  driver really is unloaded and the ports closed
+                  whenever option <c>kill_ports</c> is used, or the
+                  driver can have been loaded with driver option
+		  <c>kill_ports</c>.</p>
+                <p>Using the monitor triggers in the call to
+                  <c>try_unload</c> ensures that the monitor is
+                  added before the unloading is executed, meaning
+                  that the monitor is always properly triggered,
+                  which is not the case if <c>monitor/2</c> is called
+		  separately.</p>
               </item>
             </taglist>
           </item>
         </taglist>
-        <p>The function may return several error conditions, of which
-          all are well specified (no opaque values):</p>
+        <p>The function can return the following error conditions,
+          all well specified (no opaque values):</p>
         <taglist>
-          <tag><em>{error, linked_in_driver}</em></tag>
+          <tag><c>{error, linked_in_driver}</c></tag>
           <item>
-            <p>You were trying to unload an erlang statically linked in
+            <p>You were trying to unload an Erlang statically linked-in
               driver, which cannot be manipulated with this interface
               (and cannot be unloaded at all).</p>
           </item>
-          <tag><em>{error, not_loaded}</em></tag>
+          <tag><c>{error, not_loaded}</c></tag>
           <item>
             <p>The driver <c><anno>Name</anno></c> is not present in the system.</p>
           </item>
-          <tag><em>{error, not_loaded_by_this_process}</em></tag>
+          <tag><c>{error, not_loaded_by_this_process}</c></tag>
           <item>
             <p>The driver <c><anno>Name</anno></c> is present in the system, but
               there is no <seealso marker="#users">user</seealso> of
               it in this process. </p>
             <p>As a special case, drivers can be unloaded from
-              processes that has done no corresponding call to
-              <c>try_load/3</c> if, and only if, there are <em>no users of the driver at all</em>, which may happen if the
+              processes that have done no corresponding call to
+              <c>try_load/3</c> if, and only if, there are
+	      <em>no users of the driver at all</em>, which can occur if the
               process containing the last user dies.</p>
           </item>
-          <tag><em>{error, permanent}</em></tag>
+          <tag><c>{error, permanent}</c></tag>
           <item>
             <p>The driver has made itself permanent, in which case it
               can no longer be manipulated by this interface (much
-              like a statically linked in driver).</p>
+              like a statically linked-in driver).</p>
           </item>
         </taglist>
         <p>The function throws a <c>badarg</c> exception if the
-          parameters are not given as described above.  </p>
+          parameters are not specified as described here.</p>
       </desc>
     </func>
     <func>
       <name name="unload" arity="1"/>
-      <fsummary>Unload a driver</fsummary>
+      <fsummary>Unload a driver.</fsummary>
       <desc>
         <p>Unloads, or at least dereferences the driver named
-          <c><anno>Name</anno></c>. If the caller is the last <seealso marker="#users">user</seealso> of the driver, and there
-          are no more open ports using the driver, the driver will
-          actually get unloaded. In all other cases, actual unloading
-          will be delayed until all ports are closed and there are no
-          remaining <seealso marker="#users">users</seealso>.</p>
-        <p>If there are other <seealso marker="#users">users</seealso> of the driver, the reference
-          counts of the driver is merely decreased, so that the caller
-          is no longer considered a user of the driver. For usage
-          scenarios, see the <seealso marker="#scenarios">description</seealso> in the beginning
-          of this document. </p>
+          <c><anno>Name</anno></c>. If the caller is the last
+	  <seealso marker="#users">user</seealso> of the driver,
+	  and no more open ports use the driver, the driver
+          gets unloaded. Otherwise, unloading
+          is delayed until all ports are closed and no
+          <seealso marker="#users">users</seealso> remain.</p>
+        <p>If there are other <seealso marker="#users">users</seealso>
+	  of the driver, the reference counts of the driver is merely decreased,
+	  so that the caller is no longer considered a
+	  <seealso marker="#users">user</seealso> of the driver. For use
+          scenarios, see the <seealso marker="#scenarios"><c>description</c></seealso>
+	  in the beginning of this module.</p>
         <p>The <c><anno>ErrorDesc</anno></c> returned is an opaque value to be
-          passed further on to the <seealso marker="#format_error/1">format_error/1</seealso>
-          function. For more control over the operation, use the
-          <seealso marker="#try_unload/2">try_unload/2</seealso>
+          passed further on to function
+	  <seealso marker="#format_error/1"><c>format_error/1</c></seealso>.
+          For more control over the operation, use the
+          <seealso marker="#try_unload/2"><c>try_unload/2</c></seealso>
           interface.</p>
         <p>The function throws a <c>badarg</c> exception if the
-          parameters are not given as described above.  </p>
+          parameters are not specified as described here.</p>
       </desc>
     </func>
     <func>
       <name name="unload_driver" arity="1"/>
-      <fsummary>Unload a driver</fsummary>
+      <fsummary>Unload a driver.</fsummary>
       <desc>
         <p>Unloads, or at least dereferences the driver named
-          <c><anno>Name</anno></c>. If the caller is the last <seealso marker="#users">user</seealso> of the driver, all
-          remaining open ports using the driver will get killed with
-          the reason <c>driver_unloaded</c> and the driver will
-          eventually get unloaded.</p>
+          <c><anno>Name</anno></c>. If the caller is the last
+	  <seealso marker="#users">user</seealso> of the driver, all
+          remaining open ports using the driver are killed with
+          reason <c>driver_unloaded</c> and the driver
+          eventually gets unloaded.</p>
         <p>If there are other <seealso marker="#users">users</seealso>
           of the driver, the reference counts of the driver is merely
           decreased, so that the caller is no longer considered a
           <seealso marker="#users">user</seealso>. For
-          usage scenarios, see the <seealso marker="#scenarios">description</seealso> in the beginning
-          of this document.</p>
+          use scenarios, see the
+	  <seealso marker="#scenarios"><c>description</c></seealso> in the
+	  beginning of this module.</p>
         <p>The <c><anno>ErrorDesc</anno></c> returned is an opaque value to be
-          passed further on to the <seealso marker="#format_error/1">format_error/1</seealso>
-          function. For more control over the operation, use the
-          <seealso marker="#try_unload/2">try_unload/2</seealso>
+          passed further on to function
+	  <seealso marker="#format_error/1"><c>format_error/1</c></seealso>.
+          For more control over the operation, use the
+          <seealso marker="#try_unload/2"><c>try_unload/2</c></seealso>
           interface.</p>
         <p>The function throws a <c>badarg</c> exception if the
-          parameters are not given as described above.  </p>
-      </desc>
-    </func>
-    <func>
-      <name name="loaded_drivers" arity="0"/>
-      <fsummary>List loaded drivers</fsummary>
-      <desc>
-        <p>Returns a list of all the available drivers, both
-          (statically) linked-in and dynamically loaded ones.</p>
-        <p>The driver names are returned as a list of strings rather
-          than a list of atoms for historical reasons.</p>
-        <p>More information about drivers can be obtained using one of
-          the <seealso marker="#info/0">info</seealso> functions.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="format_error" arity="1"/>
-      <fsummary>Format an error descriptor</fsummary>
-      <desc>
-        <p>Takes an <c><anno>ErrorDesc</anno></c> returned by load, unload or
-          reload functions and returns a string which
-          describes the error or warning.</p>
-        <note>
-          <p>Due to peculiarities in the dynamic loading interfaces on
-            different platform, the returned string is only guaranteed
-            to describe the correct error <em>if format_error/1 is called in the same instance of the erlang virtual machine as the error appeared in</em> (meaning the same operating
-            system process)!</p>
-        </note>
+          parameters are not specified as described here.</p>
       </desc>
     </func>
   </funcs>
-
   <section>
-    <title>SEE ALSO</title>
-    <p>erl_driver(4), driver_entry(4)</p>
+    <title>See Also</title>
+    <p><seealso marker="erts:erl_driver"><c>erts:erl_driver(4)</c></seealso>,
+       <seealso marker="erts:driver_entry"><c>erts:driver_entry(4)</c></seealso></p>
   </section>
 </erlref>
-
diff --git a/lib/kernel/doc/src/erl_prim_loader_stub.xml b/lib/kernel/doc/src/erl_prim_loader_stub.xml
index 8d5f58dc3a..731ede2dad 100644
--- a/lib/kernel/doc/src/erl_prim_loader_stub.xml
+++ b/lib/kernel/doc/src/erl_prim_loader_stub.xml
@@ -37,7 +37,7 @@
   The module erl_prim_loader is moved to the runtime system
   application.  Please see <seealso
   marker="erts:erl_prim_loader">erl_prim_loader(3)</seealso> in the
-  erts reference manual instead.
+  ERTS reference manual instead.
 
   </p></description>
 </erlref>
diff --git a/lib/kernel/doc/src/erlang_stub.xml b/lib/kernel/doc/src/erlang_stub.xml
index b9867806bd..6b95568224 100644
--- a/lib/kernel/doc/src/erlang_stub.xml
+++ b/lib/kernel/doc/src/erlang_stub.xml
@@ -37,7 +37,7 @@
   The module erlang is moved to the runtime system
   application.  Please see <seealso
   marker="erts:erlang">erlang(3)</seealso> in the
-  erts reference manual instead.
+  ERTS reference manual instead.
 
   </p></description>
 </erlref>
diff --git a/lib/kernel/doc/src/error_handler.xml b/lib/kernel/doc/src/error_handler.xml
index 6aec5c77d5..14e7537d1f 100644
--- a/lib/kernel/doc/src/error_handler.xml
+++ b/lib/kernel/doc/src/error_handler.xml
@@ -31,35 +31,48 @@
     <rev></rev>
   </header>
   <module>error_handler</module>
-  <modulesummary>Default System Error Handler</modulesummary>
+  <modulesummary>Default system error handler.</modulesummary>
   <description>
-    <p>The error handler module defines what happens when certain types
+    <p>This module defines what happens when certain types
       of errors occur.</p>
   </description>
   <funcs>
     <func>
+      <name name="raise_undef_exception" arity="3"/>
+      <fsummary>Raise an undef exception.</fsummary>
+      <type_desc variable="Args">
+        A (possibly empty) list of arguments <c>Arg1,..,ArgN</c>
+      </type_desc>
+      <desc>
+	<p>Raises an <c>undef</c> exception with a stacktrace, indicating
+	that <c><anno>Module</anno>:<anno>Function</anno>/N</c> is
+	undefined.
+	</p>
+      </desc>
+    </func>
+    <func>
       <name name="undefined_function" arity="3"/>
-      <fsummary>Called when an undefined function is encountered</fsummary>
+      <fsummary>Called when an undefined function is encountered.</fsummary>
       <type_desc variable="Args">
         A (possibly empty) list of arguments <c>Arg1,..,ArgN</c>
       </type_desc>
       <desc>
-        <p>This function is called by the run-time system if a call is made to
+        <p>This function is called by the runtime system if a call is made to
           <c><anno>Module</anno>:<anno>Function</anno>(Arg1,.., ArgN)</c> and
-          <c><anno>Module</anno>:<anno>Function</anno>/N</c> is undefined. Note that
-          <c>undefined_function/3</c> is evaluated inside the process
+          <c><anno>Module</anno>:<anno>Function</anno>/N</c> is undefined.
+	  Notice that this function is evaluated inside the process
           making the original call.</p>
 
-	<p>This function will first attempt to autoload
+	<p>This function first attempts to autoload
 	  <c><anno>Module</anno></c>. If that is not possible,
-	  an <c>undef</c> exception will be raised.</p>
+	  an <c>undef</c> exception is raised.</p>
 
-	<p>If it was possible to load <c><anno>Module</anno></c>
-	  and the function <c><anno>Function</anno>/N</c> is exported,
-	  it will be called.</p>
+	<p>If it is possible to load <c><anno>Module</anno></c>
+	  and function <c><anno>Function</anno>/N</c> is exported,
+	  it is called.</p>
 
-	<p>Otherwise, if the function <c>'$handle_undefined_function'/2</c>
-	  is exported, it will be called as
+	<p>Otherwise, if function <c>'$handle_undefined_function'/2</c>
+	  is exported, it is called as
           <c>'$handle_undefined_function'(</c><anno>Function</anno>,
 	  <anno>Args</anno>).
 	</p>
@@ -67,61 +80,48 @@
 	  <p>Defining <c>'$handle_undefined_function'/2</c> in
 	  ordinary application code is highly discouraged. It is very
 	  easy to make subtle errors that can take a long time to
-	  debug.  Furthermore, none of the tools for static code
+	  debug. Furthermore, none of the tools for static code
 	  analysis (such as Dialyzer and Xref) supports the use of
 	  <c>'$handle_undefined_function'/2</c> and no such support
 	  will be added. Only use this function after having carefully
-	  considered other, less dangerous, solutions.  One example of
+	  considered other, less dangerous, solutions. One example of
 	  potential legitimate use is creating stubs for other
 	  sub-systems during testing and debugging.
 	  </p>
 	</warning>
-	<p>Otherwise an <c>undef</c> exception will be raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="raise_undef_exception" arity="3"/>
-      <fsummary>Raise an undef exception</fsummary>
-      <type_desc variable="Args">
-        A (possibly empty) list of arguments <c>Arg1,..,ArgN</c>
-      </type_desc>
-      <desc>
-	<p>Raise an <c>undef</c> exception with a stacktrace indicating
-	that <c><anno>Module</anno>:<anno>Function</anno>/N</c> is
-	undefined.
-	</p>
+	<p>Otherwise an <c>undef</c> exception is raised.</p>
       </desc>
     </func>
     <func>
       <name name="undefined_lambda" arity="3"/>
-      <fsummary>Called when an undefined lambda (fun) is encountered</fsummary>
+      <fsummary>Called when an undefined lambda (fun) is encountered.</fsummary>
       <type_desc variable="Args">
         A (possibly empty) list of arguments <c>Arg1,..,ArgN</c>
       </type_desc>
       <desc>
         <p>This function is evaluated if a call is made to
-          <c><anno>Fun</anno>(Arg1,.., ArgN)</c> when the module defining the fun is
-          not loaded. The function is evaluated inside the process
+          <c><anno>Fun</anno>(Arg1,.., ArgN)</c> when the module defining
+	  the fun is not loaded. The function is evaluated inside the process
           making the original call.</p>
         <p>If <c><anno>Module</anno></c> is interpreted, the interpreter is invoked
           and the return value of the interpreted
           <c><anno>Fun</anno>(Arg1,.., ArgN)</c> call is returned.</p>
         <p>Otherwise, it returns, if possible, the value of
-          <c>apply(<anno>Fun</anno>, <anno>Args</anno>)</c> after an attempt has been made to
-          autoload <c><anno>Module</anno></c>. If this is not possible, the call
-          fails with exit reason <c>undef</c>.</p>
+          <c>apply(<anno>Fun</anno>, <anno>Args</anno>)</c> after an attempt
+	  is made to autoload <c><anno>Module</anno></c>. If this is not possible,
+	  the call fails with exit reason <c>undef</c>.</p>
       </desc>
     </func>
   </funcs>
 
   <section>
     <title>Notes</title>
-    <p>The code in <c>error_handler</c> is complex and should not be
-      changed without fully understanding the interaction between
+    <p>The code in <c>error_handler</c> is complex. Do not
+      change it without fully understanding the interaction between
       the error handler, the <c>init</c> process of the code server,
       and the I/O mechanism of the code.</p>
-    <p>Changes in the code which may seem small can cause a deadlock
-      as unforeseen consequences may occur. The use of <c>input</c> is
+    <p>Code changes that seem small can cause a deadlock,
+      as unforeseen consequences can occur. The use of <c>input</c> is
       dangerous in this type of code.</p>
   </section>
 </erlref>
diff --git a/lib/kernel/doc/src/error_logger.xml b/lib/kernel/doc/src/error_logger.xml
index 92e14c2bef..3bd192fd41 100644
--- a/lib/kernel/doc/src/error_logger.xml
+++ b/lib/kernel/doc/src/error_logger.xml
@@ -29,41 +29,44 @@
     <rev></rev>
   </header>
   <module>error_logger</module>
-  <modulesummary>Erlang Error Logger</modulesummary>
+  <modulesummary>Erlang error logger.</modulesummary>
   <description>
     <p>The Erlang <em>error logger</em> is an event manager (see
       <seealso marker="doc/design_principles:des_princ">OTP Design Principles</seealso> and
-      <seealso marker="stdlib:gen_event">gen_event(3)</seealso>),
-      registered as <c>error_logger</c>. Error, warning and info events
+      <seealso marker="stdlib:gen_event"><c>stdlib:gen_event(3)</c></seealso>),
+      registered as <c>error_logger</c>. Errors, warnings, and info events
       are sent to the error logger from the Erlang runtime system and
       the different Erlang/OTP applications. The events are, by default,
-      logged to tty. Note that an event from a process <c>P</c> is
+      logged to the terminal. Notice that an event from a process <c>P</c> is
       logged at the node of the group leader of <c>P</c>. This means
       that log output is directed to the node from which a process was
       created, which not necessarily is the same node as where it is
       executing.</p>
-    <p>Initially, <c>error_logger</c> only has a primitive event
+    <p>Initially, <c>error_logger</c> has only a primitive event
       handler, which buffers and prints the raw event messages. During
-      system startup, the application Kernel replaces this with a
-      <em>standard event handler</em>, by default one which writes
-      nicely formatted output to tty. Kernel can also be configured so
-      that events are logged to file instead, or not logged at all, see
-      <seealso marker="kernel_app">kernel(6)</seealso>.</p>
-    <p>Also the SASL application, if started, adds its own event
-      handler, which by default writes supervisor, crash and progress
-      reports to tty. See
-      <seealso marker="sasl:sasl_app">sasl(6)</seealso>.</p>
-    <p>It is recommended that user defined applications should report
-      errors through the error logger, in order to get uniform reports.
-      User defined event handlers can be added to handle application
-      specific events. (<c>add_report_handler/1,2</c>). Also, there is
-      a useful event handler in STDLIB for multi-file logging of events,
-      see <c>log_mf_h(3)</c>.</p>
+      system startup, the <c>Kernel</c> application replaces this with a
+      <em>standard event handler</em>, by default one that writes
+      nicely formatted output to the terminal. <c>Kernel</c> can also be
+      configured so that events are logged to a file instead, or not logged at all,
+      see <seealso marker="kernel_app"><c>kernel(6)</c></seealso>.</p>
+    <p>Also the <c>SASL</c> application, if started, adds its own event
+      handler, which by default writes supervisor, crash, and progress
+      reports to the terminal. See
+      <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso>.</p>
+    <p>It is recommended that user-defined applications report
+      errors through the error logger to get uniform reports.
+      User-defined event handlers can be added to handle application-specific
+      events, see
+      <seealso marker="#add_report_handler/1"><c>add_report_handler/1,2</c></seealso>.
+      Also, a useful event handler is provided in <c>STDLIB</c> for multi-file
+      logging of events, see
+      <seealso marker="stdlib:log_mf_h"><c>stdlib:log_mf_h(3)</c></seealso>.</p>
     <p>Warning events were introduced in Erlang/OTP R9C and are enabled
-      by default as of 18.0. To retain backwards compatibility with existing
-      user defined event handlers, these may be tagged as errors or info
-      using the command line flag <c><![CDATA[+W <e | i | w>]]></c>, thus
-      showing up as error or info reports in the logs.</p>
+      by default as from Erlang/OTP 18.0. To retain backwards compatibility
+      with existing user-defined event handlers, the warning events can be
+      tagged as <c>errors</c> or <c>info</c> using command-line flag
+      <c><![CDATA[+W <e | i | w>]]></c>, thus showing up as
+      <c>ERROR REPORT</c> or <c>INFO REPORT</c> in the logs.</p>
   </description>
   <datatypes>
     <datatype>
@@ -72,15 +75,44 @@
   </datatypes>
   <funcs>
     <func>
+      <name name="add_report_handler" arity="1"/>
+      <name name="add_report_handler" arity="2"/>
+      <fsummary>Add an event handler to the error logger.</fsummary>
+      <desc>
+        <p>Adds a new event handler to the error logger. The event
+          handler must be implemented as a <c>gen_event</c> callback
+          module, see
+          <seealso marker="stdlib:gen_event"><c>stdlib:gen_event(3)</c></seealso>.</p>
+        <p><c><anno>Handler</anno></c> is typically the name of the callback module
+          and <c><anno>Args</anno></c> is an optional term (defaults to []) passed
+          to the initialization callback function <c><anno>Handler</anno>:init/1</c>.
+          The function returns <c>ok</c> if successful.</p>
+        <p>The event handler must be able to handle the events in this module, see
+          section <seealso marker="#events">Events</seealso>.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="delete_report_handler" arity="1"/>
+      <fsummary>Delete an event handler from the error logger.</fsummary>
+      <desc>
+        <p>Deletes an event handler from the error logger by calling
+          <c>gen_event:delete_handler(error_logger, <anno>Handler</anno>, [])</c>,
+          see <seealso marker="stdlib:gen_event"><c>stdlib:gen_event(3)</c></seealso>.</p>
+      </desc>
+    </func>
+    <func>
       <name name="error_msg" arity="1"/>
       <name name="error_msg" arity="2"/>
       <name name="format" arity="2"/>
-      <fsummary>Send an standard error event to the error logger</fsummary>
+      <fsummary>Send a standard error event to the error logger.</fsummary>
       <desc>
         <p>Sends a standard error event to the error logger.
-          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments are the same as
-          the arguments of <c>io:format/2</c>. The event is handled by
-          the standard event handler.</p>
+          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments
+	  are the same as the arguments of
+	  <seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
+	  in <c>STDLIB</c>.
+	  The event is handled by the standard event handler.</p>
+	<p><em>Example:</em></p>
         <pre>
 1> <input>error_logger:error_msg("An error occurred in ~p~n", [a_module]).</input>
 
@@ -90,16 +122,19 @@ ok</pre>
         <warning>
           <p>If called with bad arguments, this function can crash
             the standard event handler, meaning no further events are
-            logged. When in doubt, use <c>error_report/1</c> instead.</p>
+            logged. When in doubt, use
+	  <seealso marker="#error_report/1"><c>error_report/1</c></seealso>
+	  instead.</p>
         </warning>
       </desc>
     </func>
     <func>
       <name name="error_report" arity="1"/>
-      <fsummary>Send a standard error report event to the error logger</fsummary>
+      <fsummary>Send a standard error report event to the error logger.</fsummary>
       <desc>
         <p>Sends a standard error report event to the error logger.
           The event is handled by the standard event handler.</p>
+	<p><em>Example:</em></p>
         <pre>
 2> <input>error_logger:error_report([{tag1,data1},a_term,{tag2,data}]).</input>
 
@@ -117,100 +152,27 @@ ok</pre>
     </func>
     <func>
       <name name="error_report" arity="2"/>
-      <fsummary>Send a user defined error report event to the error logger</fsummary>
+      <fsummary>Send a user-defined error report event to the error logger.</fsummary>
       <desc>
-        <p>Sends a user defined error report event to the error logger.
+        <p>Sends a user-defined error report event to the error logger.
           An event handler to handle the event is supposed to have been
           added. The event is ignored by the standard event handler.</p>
         <p>It is recommended that <c><anno>Report</anno></c> follows the same
-          structure as for <c>error_report/1</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="warning_map" arity="0"/>
-      <fsummary>Return the current mapping for warning events</fsummary>
-      <desc>
-        <p>Returns the current mapping for warning events. Events sent
-          using <c>warning_msg/1,2</c> or <c>warning_report/1,2</c>
-          are tagged as errors, warnings (default) or info, depending
-          on the value of the command line flag <c>+W</c>.</p>
-        <pre>
-os$ <input>erl</input>
-Erlang (BEAM) emulator version 5.4.8 [hipe] [threads:0] [kernel-poll]
-
-Eshell V5.4.8  (abort with ^G)
-1> <input>error_logger:warning_map().</input>
-warning
-2> <input>error_logger:warning_msg("Warnings tagged as: ~p~n", [warning]).</input>
-
-=WARNING REPORT==== 11-Aug-2005::15:31:55 ===
-Warnings tagged as: warning
-ok
-3> 
-User switch command
- --> q
-os$ <input>erl +W e</input>
-Erlang (BEAM) emulator version 5.4.8 [hipe] [threads:0] [kernel-poll]
-
-Eshell V5.4.8  (abort with ^G)
-1> <input>error_logger:warning_map().</input>
-error
-2> <input>error_logger:warning_msg("Warnings tagged as: ~p~n", [error]).</input>
-
-=ERROR REPORT==== 11-Aug-2005::15:31:23 ===
-Warnings tagged as: error
-ok</pre>
-      </desc>
-    </func>
-    <func>
-      <name name="warning_msg" arity="1"/>
-      <name name="warning_msg" arity="2"/>
-      <fsummary>Send a standard warning event to the error logger</fsummary>
-      <desc>
-        <p>Sends a standard warning event to the error logger.
-          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments are the same as
-          the arguments of <c>io:format/2</c>. The event is handled by
-          the standard event handler. It is tagged either as an error,
-          warning or info, see
-          <seealso marker="#warning_map/0">warning_map/0</seealso>.</p>
-        <warning>
-          <p>If called with bad arguments, this function can crash
-            the standard event handler, meaning no further events are
-            logged. When in doubt, use <c>warning_report/1</c> instead.</p>
-        </warning>
-      </desc>
-    </func>
-    <func>
-      <name name="warning_report" arity="1"/>
-      <fsummary>Send a standard warning report event to the error logger</fsummary>
-      <desc>
-        <p>Sends a standard warning report event to the error logger.
-          The event is handled by the standard event handler. It is
-          tagged either as an error, warning or info, see
-          <seealso marker="#warning_map/0">warning_map/0</seealso>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="warning_report" arity="2"/>
-      <fsummary>Send a user defined warning report event to the error logger</fsummary>
-      <desc>
-        <p>Sends a user defined warning report event to the error
-          logger. An event handler to handle the event is supposed to
-          have been added. The event is ignored by the standard event
-          handler. It is tagged either as an error, warning or info,
-          depending on the value of
-          <seealso marker="#warning_map/0">warning_map/0</seealso>.</p>
+          structure as for
+	<seealso marker="#error_report/1"><c>error_report/1</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="info_msg" arity="1"/>
       <name name="info_msg" arity="2"/>
-      <fsummary>Send a standard information event to the error logger</fsummary>
+      <fsummary>Send a standard information event to the error logger.</fsummary>
       <desc>
         <p>Sends a standard information event to the error logger.
-          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments are the same as
-          the arguments of <c>io:format/2</c>. The event is handled by
-          the standard event handler.</p>
+          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments
+	  are the same as the arguments of
+	  <seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
+	  in <c>STDLIB</c>. The event is handled by the standard event handler.</p>
+	<p><em>Example:</em></p>
         <pre>
 1> <input>error_logger:info_msg("Something happened in ~p~n", [a_module]).</input>
 
@@ -226,10 +188,11 @@ ok</pre>
     </func>
     <func>
       <name name="info_report" arity="1"/>
-      <fsummary>Send a standard information report event to the error logger</fsummary>
+      <fsummary>Send a standard information report event to the error logger.</fsummary>
       <desc>
         <p>Sends a standard information report event to the error
           logger. The event is handled by the standard event handler.</p>
+	<p><em>Example:</em></p>
         <pre>
 2> <input>error_logger:info_report([{tag1,data1},a_term,{tag2,data}]).</input>
 
@@ -247,59 +210,22 @@ ok</pre>
     </func>
     <func>
       <name name="info_report" arity="2"/>
-      <fsummary>Send a user defined information report event to the error logger</fsummary>
+      <fsummary>Send a user-defined information report event to the error logger.</fsummary>
       <desc>
-        <p>Sends a user defined information report event to the error
+        <p>Sends a user-defined information report event to the error
           logger. An event handler to handle the event is supposed to
           have been added. The event is ignored by the standard event
           handler.</p>
         <p>It is recommended that <c><anno>Report</anno></c> follows the same
-          structure as for <c>info_report/1</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="add_report_handler" arity="1"/>
-      <name name="add_report_handler" arity="2"/>
-      <fsummary>Add an event handler to the error logger</fsummary>
-      <desc>
-        <p>Adds a new event handler to the error logger. The event
-          handler must be implemented as a <c>gen_event</c> callback
-          module, see
-          <seealso marker="stdlib:gen_event">gen_event(3)</seealso>.</p>
-        <p><c><anno>Handler</anno></c> is typically the name of the callback module
-          and <c><anno>Args</anno></c> is an optional term (defaults to []) passed
-          to the initialization callback function <c><anno>Handler</anno>:init/1</c>.
-          The function returns <c>ok</c> if successful.</p>
-        <p>The event handler must be able to handle the
-          <seealso marker="#events">events</seealso> described below.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="delete_report_handler" arity="1"/>
-      <fsummary>Delete an event handler from the error logger</fsummary>
-      <desc>
-        <p>Deletes an event handler from the error logger by calling
-          <c>gen_event:delete_handler(error_logger, <anno>Handler</anno>, [])</c>,
-          see <seealso marker="stdlib:gen_event">gen_event(3)</seealso>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="tty" arity="1"/>
-      <fsummary>Enable or disable printouts to the tty</fsummary>
-      <desc>
-        <p>Enables (<c><anno>Flag</anno> == true</c>) or disables
-          (<c><anno>Flag</anno> == false</c>) printout of standard events to the tty.</p>
-        <p>This is done by adding or deleting the standard event handler
-          for output to tty, thus calling this function overrides
-          the value of the Kernel <c>error_logger</c> configuration
-          parameter.</p>
+          structure as for
+	<seealso marker="#info_report/1"><c>info_report/1</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="logfile" arity="1" clause_i="1"/>
       <name name="logfile" arity="1" clause_i="2"/>
       <name name="logfile" arity="1" clause_i="3"/>
-      <fsummary>Enable or disable error printouts to a file</fsummary>
+      <fsummary>Enable or disable error printouts to a file.</fsummary>
       <type variable="Filename"/>
       <type variable="OpenReason" name_i="1"/>
       <type variable="CloseReason" name_i="2"/>
@@ -308,22 +234,22 @@ ok</pre>
       <desc>
         <p>Enables or disables printout of standard events to a file.</p>
         <p>This is done by adding or deleting the standard event handler
-          for output to file, thus calling this function overrides
-          the value of the Kernel <c>error_logger</c> configuration
+          for output to file. Thus, calling this function overrides
+          the value of the <c>Kernel</c> <c>error_logger</c> configuration
           parameter.</p>
-        <p>Enabling file logging can be used in combination with calling
-          <c>tty(false)</c>, in order to have a silent system, where
+        <p>Enabling file logging can be used together with calling
+          <c>tty(false)</c>, to have a silent system where
           all standard events are logged to a file only.
-          There can only be one active log file at a time.</p>
-        <p><c>Request</c> is one of:</p>
+          Only one log file can be active at a time.</p>
+        <p><c>Request</c> is one of the following:</p>
         <taglist>
           <tag><c>{open, <anno>Filename</anno>}</c></tag>
           <item>
-            <p>Opens the log file <c><anno>Filename</anno></c>. Returns <c>ok</c> if
+            <p>Opens log file <c><anno>Filename</anno></c>. Returns <c>ok</c> if
               successful, or <c>{error, allready_have_logfile}</c> if
               logging to file is already enabled, or an error tuple if
-              another error occurred. For example, if <c><anno>Filename</anno></c>
-              could not be opened.</p>
+              another error occurred (for example, if <c><anno>Filename</anno></c>
+              cannot be opened).</p>
           </item>
           <tag><c>close</c></tag>
           <item>
@@ -339,6 +265,97 @@ ok</pre>
         </taglist>
       </desc>
     </func>
+    <func>
+      <name name="tty" arity="1"/>
+      <fsummary>Enable or disable printouts to the terminal.</fsummary>
+      <desc>
+        <p>Enables (<c><anno>Flag</anno> == true</c>) or disables
+          (<c><anno>Flag</anno> == false</c>) printout of standard events
+	  to the terminal.</p>
+        <p>This is done by adding or deleting the standard event handler
+          for output to the terminal. Thus, calling this function overrides
+          the value of the <c>Kernel</c> <c>error_logger</c> configuration parameter.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="warning_map" arity="0"/>
+      <fsummary>Return the current mapping for warning events.</fsummary>
+      <desc>
+        <p>Returns the current mapping for warning events. Events sent
+          using <c>warning_msg/1,2</c> or <c>warning_report/1,2</c>
+          are tagged as errors, warnings (default), or info, depending
+          on the value of command-line flag <c>+W</c>.</p>
+	<p><em>Example:</em></p>
+        <pre>
+os$ <input>erl</input>
+Erlang (BEAM) emulator version 5.4.8 [hipe] [threads:0] [kernel-poll]
+
+Eshell V5.4.8  (abort with ^G)
+1> <input>error_logger:warning_map().</input>
+warning
+2> <input>error_logger:warning_msg("Warnings tagged as: ~p~n", [warning]).</input>
+
+=WARNING REPORT==== 11-Aug-2005::15:31:55 ===
+Warnings tagged as: warning
+ok
+3>
+User switch command
+ --> q
+os$ <input>erl +W e</input>
+Erlang (BEAM) emulator version 5.4.8 [hipe] [threads:0] [kernel-poll]
+
+Eshell V5.4.8  (abort with ^G)
+1> <input>error_logger:warning_map().</input>
+error
+2> <input>error_logger:warning_msg("Warnings tagged as: ~p~n", [error]).</input>
+
+=ERROR REPORT==== 11-Aug-2005::15:31:23 ===
+Warnings tagged as: error
+ok</pre>
+      </desc>
+    </func>
+    <func>
+      <name name="warning_msg" arity="1"/>
+      <name name="warning_msg" arity="2"/>
+      <fsummary>Send a standard warning event to the error logger.</fsummary>
+      <desc>
+        <p>Sends a standard warning event to the error logger.
+          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments
+	  are the same as the arguments of
+	  <seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
+	  in <c>STDLIB</c>.
+	  The event is handled by the standard event handler. It is tagged
+	  as an error, warning, or info, see
+          <seealso marker="#warning_map/0"><c>warning_map/0</c></seealso>.</p>
+        <warning>
+          <p>If called with bad arguments, this function can crash
+            the standard event handler, meaning no further events are
+            logged. When in doubt, use <c>warning_report/1</c> instead.</p>
+        </warning>
+      </desc>
+    </func>
+    <func>
+      <name name="warning_report" arity="1"/>
+      <fsummary>Send a standard warning report event to the error logger.</fsummary>
+      <desc>
+        <p>Sends a standard warning report event to the error logger.
+          The event is handled by the standard event handler. It is
+          tagged as an error, warning, or info, see
+          <seealso marker="#warning_map/0"><c>warning_map/0</c></seealso>.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="warning_report" arity="2"/>
+      <fsummary>Send a user-defined warning report event to the error logger.</fsummary>
+      <desc>
+        <p>Sends a user-defined warning report event to the error
+          logger. An event handler to handle the event is supposed to
+          have been added. The event is ignored by the standard event
+          handler. It is tagged as an error, warning, or info,
+          depending on the value of
+          <seealso marker="#warning_map/0"><c>warning_map/0</c></seealso>.</p>
+      </desc>
+    </func>
   </funcs>
 
   <section>
@@ -346,8 +363,8 @@ ok</pre>
     <title>Events</title>
     <p>All event handlers added to the error logger must handle
       the following events. <c>Gleader</c> is the group leader pid of
-      the process which sent the event, and <c>Pid</c> is the process
-      which sent the event.</p>
+      the process that sent the event, and <c>Pid</c> is the process
+      that sent the event.</p>
     <taglist>
       <tag><c>{error, Gleader, {Pid, Format, Data}}</c></tag>
       <item>
@@ -364,18 +381,18 @@ ok</pre>
       </item>
       <tag><c>{warning_msg, Gleader, {Pid, Format, Data}}</c></tag>
       <item>
-        <p>Generated when <c>warning_msg/1,2</c> is called, provided
-          that warnings are set to be tagged as warnings.</p>
+        <p>Generated when <c>warning_msg/1,2</c> is called
+          if warnings are set to be tagged as warnings.</p>
       </item>
       <tag><c>{warning_report, Gleader, {Pid, std_warning, Report}}</c></tag>
       <item>
-        <p>Generated when <c>warning_report/1</c> is called, provided
-          that warnings are set to be tagged as warnings.</p>
+        <p>Generated when <c>warning_report/1</c> is called
+          if warnings are set to be tagged as warnings.</p>
       </item>
       <tag><c>{warning_report, Gleader, {Pid, Type, Report}}</c></tag>
       <item>
-        <p>Generated when <c>warning_report/2</c> is called, provided
-          that warnings are set to be tagged as warnings.</p>
+        <p>Generated when <c>warning_report/2</c> is called
+          if warnings are set to be tagged as warnings.</p>
       </item>
       <tag><c>{info_msg, Gleader, {Pid, Format, Data}}</c></tag>
       <item>
@@ -390,17 +407,19 @@ ok</pre>
         <p>Generated when <c>info_report/2</c> is called.</p>
       </item>
     </taglist>
-    <p>Note that also a number of system internal events may be
-      received, a catch-all clause last in the definition of
+    <p>Notice that some system-internal events can also be
+      received. Therefore a catch-all clause last in the definition of
       the event handler callback function <c>Module:handle_event/2</c>
-      is necessary. This also holds true for
-      <c>Module:handle_info/2</c>, as there are a number of system
-      internal messages the event handler must take care of as well.</p>
+      is necessary. This also applies for
+      <c>Module:handle_info/2</c>, as the event handler must also take care of
+      some system-internal messages.</p>
   </section>
-
   <section>
-    <title>SEE ALSO</title>
-    <p>gen_event(3), log_mf_h(3), kernel(6), sasl(6)</p>
+    <title>See Also</title>
+    <p><seealso marker="stdlib:gen_event"><c>stdlib:gen_event(3)</c></seealso>,
+       <seealso marker="stdlib:log_mf_h"><c>stdlib:log_mf_h(3)</c></seealso>
+       <seealso marker="kernel_app"><c>kernel(6)</c></seealso>
+       <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso></p>
   </section>
 </erlref>
 
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index 831ef1c22a..2c4e2a16f9 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -29,56 +29,57 @@
     <rev></rev>
   </header>
   <module>file</module>
-  <modulesummary>File Interface Module</modulesummary>
+  <modulesummary>File interface module.</modulesummary>
   <description>
-    <p>The module <c>file</c> provides an interface to the file system.</p>
-    <p>On operating systems with thread support, it is possible to let
-      file operations be performed in threads of their own, allowing
+    <p>This module provides an interface to the file system.</p>
+
+    <p>On operating systems with thread support,
+      file operations can be performed in threads of their own, allowing
       other Erlang processes to continue executing in parallel with
-      the file operations. See the command line flag
-      <c>+A</c> in <seealso marker="erts:erl">erl(1)</seealso>.</p>
+      the file operations. See command-line flag
+      <c>+A</c> in <seealso marker="erts:erl"><c>erl(1)</c></seealso>.</p>
 
-    <p>With regard to file name encoding, the Erlang VM can operate in
-    two modes. The current mode can be queried using the <seealso
-    marker="#native_name_encoding">native_name_encoding/0</seealso>
-    function.  It returns either <c>latin1</c> or <c>utf8</c>.</p>
+    <p>Regarding filename encoding, the Erlang VM can operate in
+    two modes. The current mode can be queried using function
+    <seealso marker="#native_name_encoding"><c>native_name_encoding/0</c></seealso>.
+    It returns <c>latin1</c> or <c>utf8</c>.</p>
 
-    <p>In the <c>latin1</c> mode, the Erlang VM does not change the
-    encoding of file names. In the <c>utf8</c> mode, file names can
-    contain Unicode characters greater than 255 and the VM will
-    convert file names back and forth to the native file name encoding
+    <p>In <c>latin1</c> mode, the Erlang VM does not change the
+    encoding of filenames. In <c>utf8</c> mode, filenames can
+    contain Unicode characters greater than 255 and the VM
+    converts filenames back and forth to the native filename encoding
     (usually UTF-8, but UTF-16 on Windows).</p>
 
     <p>The default mode depends on the operating system. Windows and
-    MacOS X enforce consistent file name encoding and therefore the
-    VM uses the <c>utf8</c> mode.</p>
+    MacOS X enforce consistent filename encoding and therefore the
+    VM uses <c>utf8</c> mode.</p>
 
-    <p>On operating systems with transparent naming (i.e. all Unix
-    systems except MacOS X), the default will be <c>utf8</c> if the
-    terminal supports UTF-8, otherwise <c>latin1</c>. The default may
-    be overridden using the <c>+fnl</c> (to force <c>latin1</c> mode)
-    or <c>+fnu</c> (to force <c>utf8</c> mode) when starting <seealso
-    marker="erts:erl">erl</seealso>.</p>
+    <p>On operating systems with transparent naming (for example, all Unix
+    systems except MacOS X), default is <c>utf8</c> if the
+    terminal supports UTF-8, otherwise <c>latin1</c>. The default can
+    be overridden using <c>+fnl</c> (to force <c>latin1</c> mode)
+    or <c>+fnu</c> (to force <c>utf8</c> mode) when starting
+    <seealso marker="erts:erl"><c>erts:erl</c></seealso>.</p>
 
-    <p>On operating systems with transparent naming, files could be
-    inconsistently named, i.e. some files are encoded in UTF-8 while
-    others are encoded in (for example) iso-latin1. To be able to
-    handle file systems with inconsistent naming when running in the
-    <c>utf8</c> mode, the concept of "raw file names" has been
-    introduced.</p>
+    <p>On operating systems with transparent naming, files can be
+    inconsistently named, for example, some files are encoded in UTF-8 while
+    others are encoded in ISO Latin-1. The concept of <em>raw filenames</em> is
+    introduced to handle file systems with inconsistent naming when running in
+    <c>utf8</c> mode.</p>
 
-    <p>A raw file name is a file name given as a binary. The Erlang VM
-    will perform no translation of a file name given as a binary on
+    <p>A <em>raw filename</em> is a filename specified as a binary. The Erlang VM
+    does not translate a filename specified as a binary on
     systems with transparent naming.</p>
 
-    <p>When running in the <c>utf8</c> mode, the
-    <c>file:list_dir/1</c> and <c>file:read_link/1</c> functions will
-    never return raw file names. Use the <seealso
-    marker="#list_dir_all">list_dir_all/1</seealso> and <seealso
-    marker="#read_link_all">read_link_all/1</seealso> functions to
-    return all file names including raw file names.</p>
+    <p>When running in <c>utf8</c> mode, functions
+    <seealso marker="#list_dir/1"><c>list_dir/1</c></seealso> and
+    <seealso marker="#read_link/1"><c>read_link/1</c></seealso>
+    never return raw filenames. To return all filenames including raw filenames,
+    use functions
+    <seealso marker="#list_dir_all"><c>list_dir_all/1</c></seealso> and
+    <seealso marker="#read_link_all"><c>read_link_all/1</c></seealso>.</p>
 
-    <p>Also see <seealso marker="stdlib:unicode_usage#notes-about-raw-filenames">Notes about raw file names</seealso>.</p>
+    <p>See also section <seealso marker="stdlib:unicode_usage#notes-about-raw-filenames">Notes About Raw Filenames</seealso> in the <c>STDLIB</c> User´s Giude.</p>
 
   </description>
 
@@ -90,8 +91,8 @@
       <name>fd()</name>
       <desc>
         <p><marker id="type-fd"/>
-          A file descriptor representing a file opened in <seealso
-          marker="#raw">raw</seealso> mode.</p>
+          A file descriptor representing a file opened in
+	  <seealso marker="#raw"><c>raw</c></seealso> mode.</p>
       </desc>
     </datatype>
     <datatype>
@@ -104,7 +105,7 @@
       <name name="io_device"/>
       <desc>
         <p>As returned by
-          <seealso marker="#open/2">file:open/2</seealso>;
+          <seealso marker="#open/2"><c>open/2</c></seealso>;
           <c>pid()</c> is a process handling I/O-protocols.</p>
       </desc>
     </datatype>
@@ -112,7 +113,7 @@
       <name name="name"/>
       <desc>
         <p>If VM is in Unicode filename mode, <c>string()</c> and <c>char()</c>
-          are allowed to be > 255.
+          are allowed to be &gt; 255.
         </p>
       </desc>
     </datatype>
@@ -120,12 +121,12 @@
       <name name="name_all"/>
       <desc>
         <p>If VM is in Unicode filename mode, <c>string()</c> and <c>char()</c>
-          are allowed to be > 255.
+          are allowed to be &gt; 255.
           <c><anno>RawFilename</anno></c> is a filename not subject to
           Unicode translation,
           meaning that it can contain characters not conforming to
-          the Unicode encoding expected from the filesystem
-          (i.e. non-UTF-8 characters although the VM is started
+          the Unicode encoding expected from the file system
+          (that is, non-UTF-8 characters although the VM is started
           in Unicode filename mode).
         </p>
       </desc>
@@ -133,7 +134,7 @@
     <datatype>
       <name name="posix"/>
       <desc>
-        <p>An atom which is named from the POSIX error codes used in
+        <p>An atom that is named from the POSIX error codes used in
           Unix, and in the runtime libraries of most C compilers.</p>
       </desc>
     </datatype>
@@ -160,7 +161,7 @@
   <funcs>
     <func>
       <name name="advise" arity="4"/>
-      <fsummary>Predeclare an access pattern for file data</fsummary>
+      <fsummary>Predeclare an access pattern for file data.</fsummary>
       <type name="posix_file_advise"/>
       <desc>
         <p><c>advise/4</c> can be used to announce an intention to access file
@@ -171,80 +172,80 @@
     </func>
     <func>
       <name name="allocate" arity="3"/>
-      <fsummary>Allocate file space</fsummary>
+      <fsummary>Allocate file space.</fsummary>
       <desc>
         <p><c>allocate/3</c> can be used to preallocate space for a file.</p>
-        <p>This function only succeeds in platforms that implement this
+        <p>This function only succeeds in platforms that provide this
           feature. When it succeeds, space is preallocated for the file but
           the file size might not be updated. This behaviour depends on the
-          preallocation implementation. To guarantee the file size is updated
-          one must truncate the file to the new size.</p>
+          preallocation implementation. To guarantee that the file size is updated,
+          truncate the file to the new size.</p>
       </desc>
     </func>
     <func>
       <name name="change_group" arity="2"/>
-      <fsummary>Change group of a file</fsummary>
+      <fsummary>Change group of a file.</fsummary>
       <desc>
         <p>Changes group of a file. See
-          <seealso marker="#write_file_info/2">write_file_info/2</seealso>.</p>
+          <seealso marker="#write_file_info/2"><c>write_file_info/2</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="change_mode" arity="2"/>
-      <fsummary>Change permissions of a file</fsummary>
+      <fsummary>Change permissions of a file.</fsummary>
       <desc>
         <p>Changes permissions of a file. See
-          <seealso marker="#write_file_info/2">write_file_info/2</seealso>.</p>
+          <seealso marker="#write_file_info/2"><c>write_file_info/2</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="change_owner" arity="2"/>
-      <fsummary>Change owner of a file</fsummary>
+      <fsummary>Change owner of a file.</fsummary>
       <desc>
         <p>Changes owner of a file. See
-          <seealso marker="#write_file_info/2">write_file_info/2</seealso>.</p>
+          <seealso marker="#write_file_info/2"><c>write_file_info/2</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="change_owner" arity="3"/>
-      <fsummary>Change owner and group of a file</fsummary>
+      <fsummary>Change owner and group of a file.</fsummary>
       <desc>
         <p>Changes owner and group of a file. See
-          <seealso marker="#write_file_info/2">write_file_info/2</seealso>.</p>
+          <seealso marker="#write_file_info/2"><c>write_file_info/2</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="change_time" arity="2"/>
-      <fsummary>Change the modification time of a file</fsummary>
+      <fsummary>Change the modification time of a file.</fsummary>
       <desc>
         <p>Changes the modification and access times of a file. See
-          <seealso marker="#write_file_info/2">write_file_info/2</seealso>.</p>
+          <seealso marker="#write_file_info/2"><c>write_file_info/2</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="change_time" arity="3"/>
-      <fsummary>Change the modification and last access time of a file</fsummary>
+      <fsummary>Change the modification and last access time of a file.</fsummary>
       <desc>
         <p>Changes the modification and last access times of a file. See
-          <seealso marker="#write_file_info/2">write_file_info/2</seealso>.</p>
+          <seealso marker="#write_file_info/2"><c>write_file_info/2</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="close" arity="1"/>
-      <fsummary>Close a file</fsummary>
+      <fsummary>Close a file.</fsummary>
       <desc>
         <p>Closes the file referenced by <c><anno>IoDevice</anno></c>. It mostly
-          returns <c>ok</c>, expect for some severe errors such as out
+          returns <c>ok</c>, except for some severe errors such as out
           of memory.</p>
-        <p>Note that if the option <c>delayed_write</c> was
-          used when opening the file, <c>close/1</c> might return an
+        <p>Notice that if option <c>delayed_write</c> was
+          used when opening the file, <c>close/1</c> can return an
           old write error and not even try to close the file. See
-          <seealso marker="#open/2">open/2</seealso>.</p>
+          <seealso marker="#open/2"><c>open/2</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="consult" arity="1"/>
-      <fsummary>Read Erlang terms from a file</fsummary>
+      <fsummary>Read Erlang terms from a file.</fsummary>
       <desc>
         <p>Reads Erlang terms, separated by '.', from
            <c><anno>Filename</anno></c>. Returns one of the following:</p>
@@ -256,42 +257,44 @@
           <tag><c>{error, atom()}</c></tag>
           <item>
             <p>An error occurred when opening the file or reading it.
-              See <seealso marker="#open/2">open/2</seealso> for a list
-              of typical error codes.</p>
+              For a list of typical error codes, see
+	      <seealso marker="#open/2"><c>open/2</c></seealso>.</p>
           </item>
           <tag><c>{error, {<anno>Line</anno>, <anno>Mod</anno>,
                            <anno>Term</anno>}}</c></tag>
           <item>
             <p>An error occurred when interpreting the Erlang terms in
-              the file. Use <c>format_error/1</c> to convert
-              the three-element tuple to an English description of
-              the error.</p>
+              the file. To convert the three-element tuple to an English
+	      description of the error, use
+	    <seealso marker="#format_error/1"><c>format_error/1</c></seealso>.</p>
           </item>
         </taglist>
-        <p>Example:</p>
-<code type="none">f.txt:  {person, "kalle", 25}.
+        <p><em>Example:</em></p>
+<code type="none">
+f.txt:  {person, "kalle", 25}.
         {person, "pelle", 30}.</code>
-<pre>1> <input>file:consult("f.txt").</input>
+<pre>
+1> <input>file:consult("f.txt").</input>
 {ok,[{person,"kalle",25},{person,"pelle",30}]}</pre>
-        <p>The encoding of of <c><anno>Filename</anno></c> can be set
-          by a comment as described in <seealso
-          marker="stdlib:epp#encoding">epp(3)</seealso>.</p>
+        <p>The encoding of <c><anno>Filename</anno></c> can be set
+          by a comment, as described in
+	  <seealso marker="stdlib:epp#encoding"><c>stdlib:epp(3)</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="copy" arity="2"/>
       <name name="copy" arity="3"/>
-      <fsummary>Copy file contents</fsummary>
+      <fsummary>Copy file contents.</fsummary>
       <desc>
         <p>Copies <c><anno>ByteCount</anno></c> bytes from
           <c><anno>Source</anno></c> to <c><anno>Destination</anno></c>.
           <c><anno>Source</anno></c> and <c><anno>Destination</anno></c> refer
-          to either filenames or IO devices from e.g. <c>open/2</c>.
+          to either filenames or IO devices from, for example, <c>open/2</c>.
           <c><anno>ByteCount</anno></c> defaults to <c>infinity</c>, denoting an
           infinite number of bytes.</p>
-        <p>The argument <c><anno>Modes</anno></c> is a list of possible modes,
-          see <seealso marker="#open/2">open/2</seealso>, and defaults to
-          [].</p>
+        <p>Argument <c><anno>Modes</anno></c> is a list of possible modes,
+          see <seealso marker="#open/2"><c>open/2</c></seealso>, and defaults to
+          <c>[]</c>.</p>
         <p>If both <c><anno>Source</anno></c> and
           <c><anno>Destination</anno></c> refer to
           filenames, the files are opened with <c>[read, binary]</c>
@@ -303,25 +306,51 @@
         <p>If <c><anno>Destination</anno></c> refers to a filename, it is opened
           with <c>write</c> mode prepended to the mode list before
           the copy, and closed when done.</p>
-        <p>Returns <c>{ok, <anno>BytesCopied</anno>}</c> where
+        <p>Returns <c>{ok, <anno>BytesCopied</anno>}</c>, where
           <c><anno>BytesCopied</anno></c> is
-          the number of bytes that actually was copied, which may be
+          the number of bytes that was copied, which can be
           less than <c><anno>ByteCount</anno></c> if end of file was
           encountered on the source. If the operation fails,
           <c>{error, <anno>Reason</anno>}</c> is returned.</p>
-        <p>Typical error reasons: As for <c>open/2</c> if a file had to
-          be opened, and as for <c>read/2</c> and <c>write/2</c>.</p>
+        <p>Typical error reasons: as for
+	<seealso marker="#open/2"><c>open/2</c></seealso> if a file
+	had to be opened, and as for
+	<seealso marker="#read/2"><c>read/2</c></seealso> and
+	<seealso marker="#write/2"><c>write/2</c></seealso>.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="datasync" arity="1"/>
+      <fsummary>Synchronize the in-memory data of a file, ignoring most of its metadata, with that on the physical medium.</fsummary>
+      <desc>
+        <p>Ensures that any buffers kept by the operating system
+          (not by the Erlang runtime system) are written to disk. In
+          many ways it resembles <c>fsync</c> but it does not update
+          some of the metadata of the file, such as the access time. On
+          some platforms this function has no effect.</p>
+        <p>Applications that access databases or log files often write
+          a tiny data fragment (for example, one line in a log file) and then
+          call <c>fsync()</c> immediately to ensure that the written
+          data is physically stored on the hard disk. Unfortunately, <c>fsync()</c>
+          always initiates two write operations: one for the newly
+          written data and another one to update the modification
+          time stored in the <c>inode</c>. If the modification time is not a part
+          of the transaction concept, <c>fdatasync()</c> can be used to avoid
+          unnecessary <c>inode</c> disk write operations.</p>
+        <p>Available only in some POSIX systems, this call results in a
+          call to <c>fsync()</c>, or has no effect in systems not providing
+          the <c>fdatasync()</c> syscall.</p>
       </desc>
     </func>
     <func>
       <name name="del_dir" arity="1"/>
-      <fsummary>Delete a directory</fsummary>
+      <fsummary>Delete a directory.</fsummary>
       <desc>
-        <p>Tries to delete the directory <c><anno>Dir</anno></c>.
+        <p>Tries to delete directory <c><anno>Dir</anno></c>.
           The directory must
           be empty before it can be deleted. Returns <c>ok</c> if
           successful.</p>
-        <p>Typical error reasons are:</p>
+        <p>Typical error reasons:</p>
         <taglist>
           <tag><c>eacces</c></tag>
           <item>
@@ -351,11 +380,11 @@
     </func>
     <func>
       <name name="delete" arity="1"/>
-      <fsummary>Delete a file</fsummary>
+      <fsummary>Delete a file.</fsummary>
       <desc>
-        <p>Tries to delete the file <c><anno>Filename</anno></c>.
+        <p>Tries to delete file <c><anno>Filename</anno></c>.
           Returns <c>ok</c> if successful.</p>
-        <p>Typical error reasons are:</p>
+        <p>Typical error reasons:</p>
         <taglist>
           <tag><c>enoent</c></tag>
           <item>
@@ -367,32 +396,32 @@
           </item>
           <tag><c>eperm</c></tag>
           <item>
-            <p>The file is a directory and the user is not super-user.</p>
+            <p>The file is a directory and the user is not superuser.</p>
           </item>
           <tag><c>enotdir</c></tag>
           <item>
-            <p>A component of the file name is not a directory. On some
+            <p>A component of the filename is not a directory. On some
               platforms, <c>enoent</c> is returned instead.</p>
           </item>
           <tag><c>einval</c></tag>
           <item>
-            <p><c><anno>Filename</anno></c> had an improper type, such as tuple.</p>
+            <p><c><anno>Filename</anno></c> has an improper type, such as tuple.</p>
           </item>
         </taglist>
         <warning>
-          <p>In a future release, a bad type for the
-            <c><anno>Filename</anno></c> argument will probably generate
+          <p>In a future release, a bad type for argument
+            <c><anno>Filename</anno></c> will probably generate
             an exception.</p>
         </warning>
       </desc>
     </func>
     <func>
       <name name="eval" arity="1"/>
-      <fsummary>Evaluate Erlang expressions in a file</fsummary>
+      <fsummary>Evaluate Erlang expressions in a file.</fsummary>
       <desc>
         <p>Reads and evaluates Erlang expressions, separated by '.' (or
-          ',', a sequence of expressions is also an expression), from
-          <c><anno>Filename</anno></c>. The actual result of the evaluation
+          ',', a sequence of expressions is also an expression) from
+          <c><anno>Filename</anno></c>. The result of the evaluation
           is not returned; any expression sequence in the file must be there
           for its side effect. Returns one of the following:</p>
         <taglist>
@@ -403,35 +432,36 @@
           <tag><c>{error, atom()}</c></tag>
           <item>
             <p>An error occurred when opening the file or reading it.
-              See <c>open/2</c> for a list of typical error codes.</p>
+            For a list of typical error codes, see
+	    <seealso marker="#open/2"><c>open/2</c></seealso>.</p>
           </item>
           <tag><c>{error, {<anno>Line</anno>, <anno>Mod</anno>,
                            <anno>Term</anno>}}</c></tag>
           <item>
             <p>An error occurred when interpreting the Erlang
-              expressions in the file. Use <c>format_error/1</c> to
-              convert the three-element tuple to an English description
-              of the error.</p>
+              expressions in the file. To convert the three-element tuple
+	      to an English description of the error, use
+	      <seealso marker="#format_error/1"><c>format_error/1</c></seealso>.</p>
           </item>
         </taglist>
-        <p>The encoding of of <c><anno>Filename</anno></c> can be set
-          by a comment as described in <seealso
-          marker="stdlib:epp#encoding">epp(3)</seealso>.</p>
+        <p>The encoding of <c><anno>Filename</anno></c> can be set
+          by a comment, as described in
+	  <seealso marker="stdlib:epp#encoding"><c>stdlib:epp(3)</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="eval" arity="2"/>
-      <fsummary>Evaluate Erlang expressions in a file</fsummary>
+      <fsummary>Evaluate Erlang expressions in a file.</fsummary>
       <desc>
-        <p>The same as <c>eval/1</c> but the variable bindings
-          <c><anno>Bindings</anno></c> are used in the evaluation. See
-          <seealso marker="stdlib:erl_eval">erl_eval(3)</seealso> about
-          variable bindings.</p>
+        <p>The same as <c>eval/1</c>, but the variable bindings
+          <c><anno>Bindings</anno></c> are used in the evaluation. For information
+	  about the variable bindings, see
+          <seealso marker="stdlib:erl_eval"><c>stdlib:erl_eval(3)</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="format_error" arity="1"/>
-      <fsummary>Return a descriptive string for an error reason</fsummary>
+      <fsummary>Return a descriptive string for an error reason.</fsummary>
       <desc>
         <p>Given the error reason returned by any function in this
           module, returns a descriptive string of the error in English.</p>
@@ -439,17 +469,17 @@
     </func>
     <func>
       <name name="get_cwd" arity="0"/>
-      <fsummary>Get the current working directory</fsummary>
+      <fsummary>Get the current working directory.</fsummary>
       <desc>
         <p>Returns <c>{ok, <anno>Dir</anno>}</c>, where <c><anno>Dir</anno></c>
           is the current
           working directory of the file server.</p>
         <note>
           <p>In rare circumstances, this function can fail on Unix.
-            It may happen if read permission does not exist for
+            It can occur if read permission does not exist for
             the parent directories of the current directory.</p>
         </note>
-        <p>Typical error reasons are:</p>
+        <p>A typical error reason:</p>
         <taglist>
           <tag><c>eacces</c></tag>
           <item>
@@ -461,17 +491,19 @@
     </func>
     <func>
       <name name="get_cwd" arity="1"/>
-      <fsummary>Get the current working directory for the drive specified</fsummary>
+      <fsummary>Get the current working directory for the specified drive.</fsummary>
       <desc>
-        <p><c><anno>Drive</anno></c> should be of the form
-          "<c>Letter</c><c>:</c>",
-          for example "c:". Returns <c>{ok, <anno>Dir</anno>}</c> or
+	<p>Returns <c>{ok, <anno>Dir</anno>}</c> or
           <c>{error, <anno>Reason</anno>}</c>, where <c><anno>Dir</anno></c>
-          is the current
-          working directory of the drive specified.</p>
-        <p>This function returns <c>{error, enotsup}</c> on platforms
-          which have no concept of current drive (Unix, for example).</p>
-        <p>Typical error reasons are:</p>
+          is the current working directory of the specified drive.</p>
+
+	<p><c><anno>Drive</anno></c> is to be of the form
+          "<c>Letter</c><c>:</c>", for example, "c:".</p>
+
+	<p>Returns <c>{error, enotsup}</c> on platforms
+          that have no concept of current drive (Unix, for example).</p>
+
+        <p>Typical error reasons:</p>
         <taglist>
           <tag><c>enotsup</c></tag>
           <item>
@@ -490,16 +522,16 @@
     </func>
     <func>
       <name name="list_dir" arity="1"/>
-      <fsummary>List files in a directory</fsummary>
+      <fsummary>List files in a directory.</fsummary>
       <desc>
         <p>Lists all files in a directory, <em>except</em> files
-	with "raw" names. Returns
-          <c>{ok, <anno>Filenames</anno>}</c> if successful.
-          Otherwise, it returns <c>{error, <anno>Reason</anno>}</c>.
+	with raw filenames. Returns
+          <c>{ok, <anno>Filenames</anno>}</c> if successful,
+          otherwise <c>{error, <anno>Reason</anno>}</c>.
           <c><anno>Filenames</anno></c> is a list of
           the names of all the files in the directory. The names are
           not sorted.</p>
-        <p>Typical error reasons are:</p>
+        <p>Typical error reasons:</p>
         <taglist>
           <tag><c>eacces</c></tag>
           <item>
@@ -513,24 +545,24 @@
           <tag><c>{no_translation, <anno>Filename</anno>}</c></tag>
           <item>
             <p><c><anno>Filename</anno></c> is a <c>binary()</c> with
-              characters coded in ISO-latin-1 and the VM was started
-              with the parameter <c>+fnue</c>.</p>
+              characters coded in ISO Latin-1 and the VM was started
+              with parameter <c>+fnue</c>.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
       <name name="list_dir_all" arity="1"/>
-      <fsummary>List all files in a directory</fsummary>
+      <fsummary>List all files in a directory.</fsummary>
       <desc>
         <p><marker id="list_dir_all"/>Lists all the files in a directory,
-	including files with "raw" names.
-	Returns <c>{ok, <anno>Filenames</anno>}</c> if successful.
-          Otherwise, it returns <c>{error, <anno>Reason</anno>}</c>.
+	including files with raw filenames.
+	Returns <c>{ok, <anno>Filenames</anno>}</c> if successful,
+          otherwise <c>{error, <anno>Reason</anno>}</c>.
           <c><anno>Filenames</anno></c> is a list of
           the names of all the files in the directory. The names are
           not sorted.</p>
-        <p>Typical error reasons are:</p>
+        <p>Typical error reasons:</p>
         <taglist>
           <tag><c>eacces</c></tag>
           <item>
@@ -546,12 +578,12 @@
     </func>
     <func>
       <name name="make_dir" arity="1"/>
-      <fsummary>Make a directory</fsummary>
+      <fsummary>Make a directory.</fsummary>
       <desc>
-        <p>Tries to create the directory <c><anno>Dir</anno></c>. Missing parent
+        <p>Tries to create directory <c><anno>Dir</anno></c>. Missing parent
           directories are <em>not</em> created. Returns <c>ok</c> if
           successful.</p>
-        <p>Typical error reasons are:</p>
+        <p>Typical error reasons:</p>
         <taglist>
           <tag><c>eacces</c></tag>
           <item>
@@ -560,7 +592,7 @@
           </item>
           <tag><c>eexist</c></tag>
           <item>
-            <p>There is already a file or directory named <c><anno>Dir</anno></c>.</p>
+            <p>A file or directory named <c><anno>Dir</anno></c> exists already.</p>
           </item>
           <tag><c>enoent</c></tag>
           <item>
@@ -568,7 +600,7 @@
           </item>
           <tag><c>enospc</c></tag>
           <item>
-            <p>There is a no space left on the device.</p>
+            <p>No space is left on the device.</p>
           </item>
           <tag><c>enotdir</c></tag>
           <item>
@@ -580,13 +612,13 @@
     </func>
     <func>
       <name name="make_link" arity="2"/>
-      <fsummary>Make a hard link to a file</fsummary>
+      <fsummary>Make a hard link to a file.</fsummary>
       <desc>
         <p>Makes a hard link from <c><anno>Existing</anno></c> to
-          <c><anno>New</anno></c>, on
-          platforms that support links (Unix and Windows). This function returns
-          <c>ok</c> if the link was successfully created, or
-          <c>{error, <anno>Reason</anno>}</c>. On platforms that do not support
+          <c><anno>New</anno></c> on
+          platforms supporting links (Unix and Windows). This function returns
+          <c>ok</c> if the link was successfully created, otherwise
+          <c>{error, <anno>Reason</anno>}</c>. On platforms not supporting
           links, <c>{error,enotsup}</c> is returned.</p>
         <p>Typical error reasons:</p>
         <taglist>
@@ -609,17 +641,16 @@
     </func>
     <func>
       <name name="make_symlink" arity="2"/>
-      <fsummary>Make a symbolic link to a file or directory</fsummary>
+      <fsummary>Make a symbolic link to a file or directory.</fsummary>
       <desc>
-        <p>This function creates a symbolic link <c><anno>New</anno></c> to
-          the file or directory <c><anno>Existing</anno></c>, on platforms that
-          support symbolic links (most Unix systems and Windows beginning with
+        <p>Creates a symbolic link <c><anno>New</anno></c> to
+          the file or directory <c><anno>Existing</anno></c> on platforms
+          supporting symbolic links (most Unix systems and Windows, beginning with
 	  Vista).
-	  <c><anno>Existing</anno></c> need not exist.
-          This function returns <c>ok</c> if the link was
-          successfully created, or <c>{error, <anno>Reason</anno>}</c>.
-          On platforms
-          that do not support symbolic links, <c>{error, enotsup}</c>
+	  <c><anno>Existing</anno></c> does not need to exist.
+          Returns <c>ok</c> if the link is
+          successfully created, otherwise <c>{error, <anno>Reason</anno>}</c>.
+          On platforms not supporting symbolic links, <c>{error, enotsup}</c>
           is returned.</p>
         <p>Typical error reasons:</p>
         <taglist>
@@ -646,23 +677,23 @@
     </func>
     <func>
       <name name="native_name_encoding" arity="0"/>
-      <fsummary>Return the VM's configured filename encoding</fsummary>
+      <fsummary>Return the configured filename encoding of the VM.</fsummary>
       <desc>
-	<p><marker id="native_name_encoding"/>This function returns
-	the file name encoding mode.  If it is <c>latin1</c>, the
-	system does no translation of file names.  If it is
-	<c>utf8</c>, file names will be converted back and forth to
-	the native file name encoding (usually UTF-8, but UTF-16 on
+	<p><marker id="native_name_encoding"/>Returns
+	the filename encoding mode. If it is <c>latin1</c>, the
+	system translates no filenames. If it is
+	<c>utf8</c>, filenames are converted back and forth to
+	the native filename encoding (usually UTF-8, but UTF-16 on
 	Windows).</p>
       </desc>
     </func>
     <func>
       <name name="open" arity="2"/>
-      <fsummary>Open a file</fsummary>
+      <fsummary>Open a file.</fsummary>
       <desc>
-        <p>Opens the file <c><anno>File</anno></c> in the mode determined
-          by <c><anno>Modes</anno></c>, which may contain one or more of the
-          following items:</p>
+        <p>Opens file <c><anno>File</anno></c> in the mode determined
+          by <c><anno>Modes</anno></c>, which can contain one or more of the
+          following options:</p>
         <taglist>
           <tag><c>read</c></tag>
           <item>
@@ -671,98 +702,100 @@
           <tag><c>write</c></tag>
           <item>
             <p>The file is opened for writing. It is created if it does
-              not exist. If the file exists, and if <c>write</c> is not
-              combined with <c>read</c>, the file will be truncated.</p>
+              not exist. If the file exists and <c>write</c> is not
+              combined with <c>read</c>, the file is truncated.</p>
           </item>
           <tag><c>append</c></tag>
           <item>
-            <p>The file will be opened for writing, and it will be
-              created if it does not exist. Every write operation to a
-              file opened with <c>append</c> will take place at
-              the end of the file.</p>
+            <p>The file is opened for writing. It is created if it does
+	      not exist. Every write operation to a file opened with
+	      <c>append</c> takes place at the end of the file.</p>
           </item>
           <tag><c>exclusive</c></tag>
           <item>
-            <p>The file, when opened for writing, is created if it
-              does not exist. If the file exists, open will return
-              <c>{error, eexist}</c>.</p>
+            <p>The file is opened for writing. It is created if it does
+	      not exist. If the file exists, <c>{error, eexist}</c>
+	      is returned.</p>
 	    <warning><p>This option does not guarantee exclusiveness on
-	    file systems that do not support O_EXCL properly,
+	    file systems not supporting <c>O_EXCL</c> properly,
 	    such as NFS. Do not depend on this option unless you
 	    know that the file system supports it (in general, local
-	    file systems should be safe).</p></warning>
+	    file systems are safe).</p></warning>
           </item>
           <tag><c>raw</c></tag>
           <item>
             <p><marker id="raw"/>
-              The <c>raw</c> option allows faster access to a file,
-              because no Erlang process is needed to handle the file.
+              Allows faster access to a file,
+              as no Erlang process is needed to handle the file.
               However, a file opened in this way has the following
               limitations:</p>
             <list type="bulleted">
-              <item>The functions in the <c>io</c> module cannot be used,
-               because they can only talk to an Erlang process.
-               Instead, use the <c>read/2</c>, <c>read_line/1</c> and 
-	       <c>write/2</c>
-               functions.</item>
-	      <item>Especially if <c>read_line/1</c> is to be used on a <c>raw</c> file, it is recommended to combine this option with the <c>{read_ahead, Size}</c> option as line oriented I/O is inefficient without buffering.</item>
-              <item>Only the Erlang process which opened the file can use
-               it.</item>
-              <item>A remote Erlang file server cannot be used;
-               the computer on which the Erlang node is running must
+              <item><p>The functions in the <c>io</c> module cannot be used,
+               as they can only talk to an Erlang process.
+               Instead, use functions
+	       <seealso marker="#read/2"><c>read/2</c></seealso>,
+	       <seealso marker="#read_line/1"><c>read_line/1</c></seealso>, and
+	       <seealso marker="#write/2"><c>write/2</c></seealso>.</p></item>
+	      <item><p>Especially if <c>read_line/1</c> is to be used on a <c>raw</c>
+	      file, it is recommended to combine this option with option
+	      <c>{read_ahead, Size}</c> as line-oriented I/O is inefficient
+	      without buffering.</p></item>
+              <item><p>Only the Erlang process that opened the file can use
+               it.</p></item>
+              <item><p>A remote Erlang file server cannot be used.
+               The computer on which the Erlang node is running must
                have access to the file system (directly or through
-               NFS).</item>
+               NFS).</p></item>
             </list>
           </item>
           <tag><c>binary</c></tag>
           <item>
-            <p>When this option has been given, read operations on the file
-	       will return binaries rather than lists.</p>
+            <p>Read operations on the file return binaries rather than lists.</p>
           </item>
           <tag><c>{delayed_write, Size, Delay}</c></tag>
           <item>
-            <p>If this option is used, the data in subsequent
-              <c>write/2</c> calls is buffered until there are at least
-              <c>Size</c> bytes buffered, or until the oldest buffered
+            <p>Data in subsequent
+              <c>write/2</c> calls is buffered until at least
+              <c>Size</c> bytes are buffered, or until the oldest buffered
               data is <c>Delay</c> milliseconds old. Then all buffered
               data is written in one operating system call.
               The buffered data is also flushed before some other file
               operation than <c>write/2</c> is executed.</p>
             <p>The purpose of this option is to increase performance
-              by reducing the number of operating system calls, so the
-              <c>write/2</c> calls should be for sizes significantly
-              less than <c>Size</c>, and not interspersed by to many
-              other file operations, for this to happen.</p>
+              by reducing the number of operating system calls. Thus, the
+              <c>write/2</c> calls must be for sizes significantly
+              less than <c>Size</c>, and not interspersed by too many
+              other file operations.</p>
             <p>When this option is used, the result of <c>write/2</c>
-              calls may prematurely be reported as successful, and if
-              a write error should actually occur the error is
-              reported as the result of the next file operation, which
-              is not executed.</p>
+              calls can prematurely be reported as successful, and if
+	      a write error occurs, the error is reported as the result
+	      of the next file operation, which is not executed.</p>
             <p>For example, when <c>delayed_write</c> is used, after a
-              number of <c>write/2</c> calls, <c>close/1</c> might
-              return <c>{error, enospc}</c> because there was not enough
-              space on the disc for previously written data, and
-              <c>close/1</c> should probably be called again since the
+              number of <c>write/2</c> calls, <c>close/1</c> can
+              return <c>{error, enospc}</c>, as there is not enough
+              space on the disc for previously written data.
+              <c>close/1</c> must probably be called again, as the
               file is still open.</p>
           </item>
           <tag><c>delayed_write</c></tag>
           <item>
             <p>The same as <c>{delayed_write, Size, Delay}</c> with
               reasonable default values for <c>Size</c> and
-              <c>Delay</c>. (Roughly some 64 KBytes, 2 seconds)</p>
+              <c>Delay</c> (roughly some 64 KB, 2 seconds).</p>
           </item>
           <tag><c>{read_ahead, Size}</c></tag>
           <item>
-            <p>This option activates read data buffering. If
+            <p>Activates read data buffering. If
               <c>read/2</c> calls are for significantly less than
-              <c>Size</c> bytes, read operations towards the operating
+              <c>Size</c> bytes, read operations to the operating
               system are still performed for blocks of <c>Size</c>
               bytes. The extra data is buffered and returned in
               subsequent <c>read/2</c> calls, giving a performance gain
-              since the number of operating system calls is reduced.</p>
-	    <p>The <c>read_ahead</c> buffer is also highly utilized
-	      by the <c>read_line/1</c> function in <c>raw</c> mode,
-	      why this option is recommended (for performance reasons)
+              as the number of operating system calls is reduced.</p>
+	    <p>The <c>read_ahead</c> buffer is also highly used
+	      by function <c>read_line/1</c> in <c>raw</c> mode,
+	      therefore this option is recommended
+	      (for performance reasons)
 	      when accessing raw files using that function.</p>
             <p>If <c>read/2</c> calls are for sizes not significantly
               less than, or even greater than <c>Size</c> bytes, no
@@ -771,93 +804,141 @@
           <tag><c>read_ahead</c></tag>
           <item>
             <p>The same as <c>{read_ahead, Size}</c> with a reasonable
-              default value for <c>Size</c>. (Roughly some 64 KBytes)</p>
+              default value for <c>Size</c> (roughly some 64 KB).</p>
           </item>
           <tag><c>compressed</c></tag>
           <item>
             <p>Makes it possible to read or write gzip compressed
-              files. The <c>compressed</c> option must be combined
-	      with either <c>read</c> or <c>write</c>, but not both.
-	      Note that the file size obtained with
-              <c>read_file_info/1</c> will most probably not match the
-              number of bytes that can be read from a compressed file.</p>
+              files. Option <c>compressed</c> must be combined
+	      with <c>read</c> or <c>write</c>, but not both.
+	      Notice that the file size obtained with
+              <seealso marker="#read_file_info/1"><c>read_file_info/1</c></seealso>
+	      does probably not match the number of bytes that can be
+	      read from a compressed file.</p>
           </item>
           <tag><c>{encoding, Encoding}</c></tag>
           <item>
-            <p>Makes the file perform automatic translation of characters to and from a specific (Unicode) encoding. Note that the data supplied to file:write or returned by file:read still is byte oriented, this option only denotes how data is actually stored in the disk file.</p>
-	    <p>Depending on the encoding, different methods of reading and writing data is preferred. The default encoding of <c>latin1</c> implies using this (the file) module for reading and writing data, as the interfaces provided here work with byte-oriented data, while using other (Unicode) encodings makes the  <seealso marker="stdlib:io">io(3)</seealso> module's <c>get_chars</c>, <c>get_line</c> and <c>put_chars</c> functions more suitable, as they can work with the full Unicode range.</p>
-	    <p>If data is sent to an <c>io_device()</c> in a format that cannot be converted to the specified encoding, or if data is read by a function that returns data in a format that cannot cope with the character range of the data, an error occurs and the file will be closed.</p> 
-	    <p>The allowed values for <c>Encoding</c> are:</p>
+            <p>Makes the file perform automatic translation of characters to
+	    and from a specific (Unicode) encoding. Notice that the data supplied
+	    to
+	    <seealso marker="#write/2"><c>write/2</c></seealso>
+	    or returned by
+	    <seealso marker="#read/2"><c>read/2</c></seealso>
+	    still is byte-oriented; this option
+	    denotes only how data is stored in the disk file.</p>
+	    <p>Depending on the encoding, different methods of reading and writing
+	    data is preferred. The default encoding of <c>latin1</c> implies using
+	    this module (<c>file</c>) for reading and writing data as the interfaces
+	    provided here work with byte-oriented data. Using other (Unicode)
+	    encodings makes the
+	    <seealso marker="stdlib:io"><c>stdlib:io(3)</c></seealso> functions
+	    <c>get_chars</c>, <c>get_line</c>, and <c>put_chars</c> more suitable,
+	    as they can work with the full Unicode range.</p>
+	    <p>If data is sent to an <c>io_device()</c> in a format that cannot be
+	    converted to the specified encoding, or if data is read by a function
+	    that returns data in a format that cannot cope with the character range
+	    of the data, an error occurs and the file is closed.</p>
+	    <p>Allowed values for <c>Encoding</c>:</p>
 	    <taglist>
 	    <tag><c>latin1</c></tag>
 	    <item>
-	    <p>The default encoding. Bytes supplied to i.e. file:write are written as is on the file, likewise bytes read from the file are returned to i.e. file:read as is. If the <seealso marker="stdlib:io">io(3)</seealso> module is used for writing, the file can only cope with Unicode characters up to codepoint 255 (the ISO-latin-1 range).</p>
+	    <p>The default encoding. Bytes supplied to the file, that is,
+	    <seealso marker="#write/2"><c>write/2</c></seealso>
+	    are written "as is" on the file. Likewise, bytes read from the file,
+	    that is,
+	    <seealso marker="#read/2"><c>read/2</c></seealso> are
+	    returned "as is". If module
+	    <seealso marker="stdlib:io"><c>stdlib:io(3)</c></seealso> is used for
+	    writing, the file can only cope with Unicode characters up to code point
+	    255 (the ISO Latin-1 range).</p>
 	    </item>
-	    <tag><c>unicode</c> or <c>utf8</c></tag>
+	    <tag><c>unicode or utf8</c></tag>
 	    <item>
-	    <p>Characters are translated to and from the UTF-8 encoding before being written to or read from the file. A file opened in this way might be readable using the file:read function, as long as no data stored on the file lies beyond the ISO-latin-1 range (0..255), but failure will occur if the data contains Unicode codepoints beyond that range. The file is best read with the functions in the Unicode aware   <seealso marker="stdlib:io">io(3)</seealso> module.</p>
-	    <p>Bytes written to the file by any means are translated to UTF-8 encoding before actually being stored on the disk file.</p>
+	    <p>Characters are translated to and from UTF-8 encoding before they are
+	    written to or read from the file. A file opened in this way can be
+	    readable using function
+	    <seealso marker="#read/2"><c>read/2</c></seealso>,
+	    as long as no data stored on
+	    the file lies beyond the ISO Latin-1 range (0..255), but failure occurs
+	    if the data contains Unicode code points beyond that range. The file is
+	    best read with the functions in the Unicode aware module
+	    <seealso marker="stdlib:io"><c>stdlib:io(3)</c></seealso>.</p>
+	    <p>Bytes written to the file by any means are translated to UTF-8 encoding
+	    before being stored on the disk file.</p>
 	    </item>
-	    <tag><c>utf16</c> or <c>{utf16,big}</c></tag>
+	    <tag><c>utf16 or {utf16,big}</c></tag>
 	    <item>
-	    <p>Works like <c>unicode</c>, but translation is done to and from big endian UTF-16 instead of UTF-8.</p>
+	    <p>Works like <c>unicode</c>, but translation is done to and from big
+	    endian UTF-16 instead of UTF-8.</p>
 	    </item>
 	    <tag><c>{utf16,little}</c></tag>
 	    <item>
-	    <p>Works like <c>unicode</c>, but translation is done to and from little endian UTF-16 instead of UTF-8.</p>
+	    <p>Works like <c>unicode</c>, but translation is done to and from little
+	    endian UTF-16 instead of UTF-8.</p>
 	    </item>
-	    <tag><c>utf32</c> or <c>{utf32,big}</c></tag>
+	    <tag><c>utf32 or {utf32,big}</c></tag>
 	    <item>
-	    <p>Works like <c>unicode</c>, but translation is done to and from big endian UTF-32 instead of UTF-8.</p>
+	    <p>Works like <c>unicode</c>, but translation is done to and from big
+	    endian UTF-32 instead of UTF-8.</p>
 	    </item>
 	    <tag><c>{utf32,little}</c></tag>
 	    <item>
-	    <p>Works like <c>unicode</c>, but translation is done to and from little endian UTF-32 instead of UTF-8.</p>
+	    <p>Works like <c>unicode</c>, but translation is done to and from little
+	    endian UTF-32 instead of UTF-8.</p>
 	    </item>
 	    </taglist>
-	    <p>The Encoding can be changed for a file "on the fly" by using the <seealso marker="stdlib:io#setopts/2">io:setopts/2</seealso> function, why a file can be analyzed in latin1 encoding for i.e. a BOM, positioned beyond the BOM and then be set for the right encoding before further reading.See the <seealso marker="stdlib:unicode">unicode(3)</seealso> module for functions identifying BOM's.</p>
+	    <p>The Encoding can be changed for a file "on the fly" by using function
+	    <seealso marker="stdlib:io#setopts/2"><c>io:setopts/2</c></seealso>.
+	    So a file can be analyzed in latin1 encoding for, for example, a BOM,
+	    positioned beyond the BOM and then be set for the right encoding before
+	    further reading. For functions identifying BOMs, see module
+	    <seealso marker="stdlib:unicode"><c>stdlib:unicode(3)</c></seealso>. </p>
 	    <p>This option is not allowed on <c>raw</c> files.</p>
           </item>
           <tag><c>ram</c></tag>
           <item>
-            <p><c>File</c> must be <c>iodata()</c>. Returns an <c>fd()</c> which lets the <c>file</c> module operate on the data in-memory as if it is a file.</p>
+            <p><c>File</c> must be <c>iodata()</c>. Returns an <c>fd()</c>, which lets
+	    module <c>file</c> operate on the data in-memory as if it is a file.</p>
           </item>
           <tag><c>sync</c></tag>
           <item>
-            <p>On platforms that support it, enables the POSIX <c>O_SYNC</c> synchronous I/O flag or its platform-dependent
-            equivalent (e.g., <c>FILE_FLAG_WRITE_THROUGH</c> on Windows) so that writes to the file block until the data has
-            been physically written to disk. Be aware, though, that the exact semantics of this flag differ from platform to
-            platform; for example, neither Linux nor Windows guarantees that all file metadata are also written before the call
-            returns. For precise semantics, check the details of your platform's documentation. On platforms with no
-            support for POSIX <c>O_SYNC</c> or equivalent, use of the <c>sync</c> flag causes <c>open</c> to return
-            <c>{error, enotsup}</c>.</p>
+            <p>On platforms supporting it, enables the POSIX <c>O_SYNC</c> synchronous
+	    I/O flag or its platform-dependent equivalent (for example,
+	    <c>FILE_FLAG_WRITE_THROUGH</c> on Windows) so that writes to the file
+	    block until the data is physically written to disk. However, be aware
+	    that the exact semantics of this flag differ from platform to
+            platform. For example, none of Linux or Windows guarantees that all file
+	    metadata are also written before the call returns. For precise semantics,
+	    check the details of your platform documentation. On platforms with no
+            support for POSIX <c>O_SYNC</c> or equivalent, use of the <c>sync</c>
+	    flag causes <c>open</c> to return <c>{error, enotsup}</c>.</p>
           </item>
         </taglist>
         <p>Returns:</p>
         <taglist>
           <tag><c>{ok, <anno>IoDevice</anno>}</c></tag>
           <item>
-            <p>The file has been opened in the requested mode.
+            <p>The file is opened in the requested mode.
               <c><anno>IoDevice</anno></c> is a reference to the file.</p>
           </item>
           <tag><c>{error, <anno>Reason</anno>}</c></tag>
           <item>
-            <p>The file could not be opened.</p>
+            <p>The file cannot be opened.</p>
           </item>
         </taglist>
-        <p><c><anno>IoDevice</anno></c> is really the pid of the process which
+        <p><c><anno>IoDevice</anno></c> is really the pid of the process that
           handles the file. This process is linked to the process
-          which originally opened the file. If any process to which
-          the <c><anno>IoDevice</anno></c> is linked terminates, the file will
-          be closed and the process itself will be terminated.
+          that originally opened the file. If any process to which
+          the <c><anno>IoDevice</anno></c> is linked terminates, the file is
+          closed and the process itself is terminated.
           An <c><anno>IoDevice</anno></c> returned from this call can be used
-          as an argument to the IO functions (see
-          <seealso marker="stdlib:io">io(3)</seealso>).</p>
+          as an argument to the I/O functions (see
+          <seealso marker="stdlib:io"><c>stdlib:io(3)</c></seealso>).</p>
         <note>
-          <p>In previous versions of <c>file</c>, modes were given
+          <p>In previous versions of <c>file</c>, modes were specified
             as one of the atoms <c>read</c>, <c>write</c>, or
             <c>read_write</c> instead of a list. This is still allowed
-            for reasons of backwards compatibility, but should not be
+            for reasons of backwards compatibility, but is not to be
             used for new code. Also note that <c>read_write</c> is not
             allowed in a mode list.</p>
         </note>
@@ -874,17 +955,17 @@
           </item>
           <tag><c>eisdir</c></tag>
           <item>
-            <p>The named file is not a regular file. It may be a
-              directory, a fifo, or a device.</p>
+            <p>The named file is not a regular file. It can be a
+              directory, a FIFO, or a device.</p>
           </item>
           <tag><c>enotdir</c></tag>
           <item>
-            <p>A component of the file name is not a directory. On some
+            <p>A component of the filename is not a directory. On some
               platforms, <c>enoent</c> is returned instead.</p>
           </item>
           <tag><c>enospc</c></tag>
           <item>
-            <p>There is a no space left on the device (if <c>write</c>
+            <p>There is no space left on the device (if <c>write</c>
               access was specified).</p>
           </item>
         </taglist>
@@ -892,182 +973,186 @@
     </func>
     <func>
       <name name="path_consult" arity="2"/>
-      <fsummary>Read Erlang terms from a file</fsummary>
+      <fsummary>Read Erlang terms from a file.</fsummary>
       <desc>
         <p>Searches the path <c><anno>Path</anno></c> (a list of directory
           names) until the file <c><anno>Filename</anno></c> is found.
           If <c><anno>Filename</anno></c>
           is an absolute filename, <c><anno>Path</anno></c> is ignored.
-          Then reads Erlang terms, separated by '.', from the file.
-          Returns one of the following:</p>
+          Then reads Erlang terms, separated by '.', from the file.</p>
+          <p>Returns one of the following:</p>
         <taglist>
           <tag><c>{ok, <anno>Terms</anno>, <anno>FullName</anno>}</c></tag>
           <item>
-            <p>The file was successfully read. <c><anno>FullName</anno></c> is
+            <p>The file is successfully read. <c><anno>FullName</anno></c> is
               the full name of the file.</p>
           </item>
           <tag><c>{error, enoent}</c></tag>
           <item>
-            <p>The file could not be found in any of the directories in
+            <p>The file cannot be found in any of the directories in
               <c><anno>Path</anno></c>.</p>
           </item>
           <tag><c>{error, atom()}</c></tag>
           <item>
             <p>An error occurred when opening the file or reading it.
-              See <seealso marker="#open/2">open/2</seealso> for a list
-              of typical error codes.</p>
+              For a list of typical error codes, see
+	    <seealso marker="#open/2"><c>open/2</c></seealso>.</p>
           </item>
           <tag><c>{error, {<anno>Line</anno>, <anno>Mod</anno>,
                            <anno>Term</anno>}}</c></tag>
           <item>
             <p>An error occurred when interpreting the Erlang terms in
-              the file. Use <c>format_error/1</c> to convert
-              the three-element tuple to an English description of
+              the file. Use
+	      <seealso marker="#format_error/1"><c>format_error/1</c></seealso>
+	      to convert the three-element tuple to an English description of
               the error.</p>
           </item>
         </taglist>
-        <p>The encoding of of <c><anno>Filename</anno></c> can be set
-          by a comment as described in <seealso
-          marker="stdlib:epp#encoding">epp(3)</seealso>.</p>
+        <p>The encoding of <c><anno>Filename</anno></c> can be set
+          by a comment as described in
+	  <seealso marker="stdlib:epp#encoding"><c>epp(3)</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="path_eval" arity="2"/>
-      <fsummary>Evaluate Erlang expressions in a file</fsummary>
+      <fsummary>Evaluate Erlang expressions in a file.</fsummary>
       <desc>
         <p>Searches the path <c><anno>Path</anno></c> (a list of directory
           names) until the file <c><anno>Filename</anno></c> is found.
-          If <c><anno>Filename</anno></c> is an absolute file name,
+          If <c><anno>Filename</anno></c> is an absolute filename,
           <c><anno>Path</anno></c> is ignored. Then reads
           and evaluates Erlang expressions, separated by '.' (or ',', a
           sequence of expressions is also an expression), from the file.
-          The actual result of evaluation is not returned; any
+          The result of evaluation is not returned; any
           expression sequence in the file must be there for its side
-          effect. Returns one of the following:</p>
+          effect.</p>
+	  <p>Returns one of the following:</p>
         <taglist>
           <tag><c>{ok, <anno>FullName</anno>}</c></tag>
           <item>
-            <p>The file was read and evaluated. <c><anno>FullName</anno></c> is
+            <p>The file is read and evaluated. <c><anno>FullName</anno></c> is
               the full name of the file.</p>
           </item>
           <tag><c>{error, enoent}</c></tag>
           <item>
-            <p>The file could not be found in any of the directories in
+            <p>The file cannot be found in any of the directories in
               <c><anno>Path</anno></c>.</p>
           </item>
           <tag><c>{error, atom()}</c></tag>
           <item>
             <p>An error occurred when opening the file or reading it.
-              See <seealso marker="#open/2">open/2</seealso> for a list
-              of typical error codes.</p>
+              For a list of typical error codes, see
+	    <seealso marker="#open/2"><c>open/2</c></seealso>.</p>
           </item>
           <tag><c>{error, {<anno>Line</anno>, <anno>Mod</anno>,
                            <anno>Term</anno>}}</c></tag>
           <item>
             <p>An error occurred when interpreting the Erlang
-              expressions in the file. Use <c>format_error/1</c> to
-              convert the three-element tuple to an English description
+              expressions in the file. Use
+	      <seealso marker="#format_error/1"><c>format_error/1</c></seealso>
+	      to convert the three-element tuple to an English description
               of the error.</p>
           </item>
         </taglist>
-        <p>The encoding of of <c><anno>Filename</anno></c> can be set
-          by a comment as described in <seealso
-          marker="stdlib:epp#encoding">epp(3)</seealso>.</p>
+        <p>The encoding of <c><anno>Filename</anno></c> can be set
+          by a comment as described in
+	  <seealso marker="stdlib:epp#encoding"><c>stdlib:epp(3)</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="path_open" arity="3"/>
-      <fsummary>Open a file</fsummary>
+      <fsummary>Open a file.</fsummary>
       <desc>
         <p>Searches the path <c><anno>Path</anno></c> (a list of directory
           names) until the file <c><anno>Filename</anno></c> is found.
           If <c><anno>Filename</anno></c>
-          is an absolute file name, <c><anno>Path</anno></c> is ignored.
-          Then opens the file in the mode determined by <c><anno>Modes</anno></c>.
-          Returns one of the following:</p>
+          is an absolute filename, <c><anno>Path</anno></c> is ignored.
+          Then opens the file in the mode determined by <c><anno>Modes</anno></c>.</p>
+        <p>Returns one of the following:</p>
         <taglist>
           <tag><c>{ok, <anno>IoDevice</anno>, <anno>FullName</anno>}</c></tag>
           <item>
-            <p>The file has been opened in the requested mode.
+            <p>The file is opened in the requested mode.
               <c><anno>IoDevice</anno></c> is a reference to the file and
               <c><anno>FullName</anno></c> is the full name of the file.</p>
           </item>
           <tag><c>{error, enoent}</c></tag>
           <item>
-            <p>The file could not be found in any of the directories in
+            <p>The file cannot be found in any of the directories in
               <c><anno>Path</anno></c>.</p>
           </item>
           <tag><c>{error, atom()}</c></tag>
           <item>
-            <p>The file could not be opened.</p>
+            <p>The file cannot be opened.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
       <name name="path_script" arity="2"/>
-      <fsummary>Evaluate and return the value of Erlang expressions in a file</fsummary>
+      <fsummary>Evaluate and return the value of Erlang expressions in a file.</fsummary>
       <desc>
         <p>Searches the path <c><anno>Path</anno></c> (a list of directory
           names) until the file <c><anno>Filename</anno></c> is found.
-          If <c><anno>Filename</anno></c> is an absolute file name,
+          If <c><anno>Filename</anno></c> is an absolute filename,
           <c><anno>Path</anno></c> is ignored. Then reads
           and evaluates Erlang expressions, separated by '.' (or ',', a
-          sequence of expressions is also an expression), from the file.
-          Returns one of the following:</p>
+          sequence of expressions is also an expression), from the file.</p>
+          <p>Returns one of the following:</p>
         <taglist>
           <tag><c>{ok, <anno>Value</anno>, <anno>FullName</anno>}</c></tag>
           <item>
-            <p>The file was read and evaluated. <c><anno>FullName</anno></c> is
+            <p>The file is read and evaluated. <c><anno>FullName</anno></c> is
               the full name of the file and <c><anno>Value</anno></c> the value of
               the last expression.</p>
           </item>
           <tag><c>{error, enoent}</c></tag>
           <item>
-            <p>The file could not be found in any of the directories in
+            <p>The file cannot be found in any of the directories in
               <c><anno>Path</anno></c>.</p>
           </item>
           <tag><c>{error, atom()}</c></tag>
           <item>
             <p>An error occurred when opening the file or reading it.
-              See <seealso marker="#open/2">open/2</seealso> for a list
-              of typical error codes.</p>
+              For a list of typical error codes, see
+	      <seealso marker="#open/2"><c>open/2</c></seealso>.</p>
           </item>
           <tag><c>{error, {<anno>Line</anno>, <anno>Mod</anno>,
                            <anno>Term</anno>}}</c></tag>
           <item>
             <p>An error occurred when interpreting the Erlang
-              expressions in the file. Use <c>format_error/1</c> to
-              convert the three-element tuple to an English description
+              expressions in the file. Use
+	      <seealso marker="#format_error/1"><c>format_error/1</c></seealso>
+	      to convert the three-element tuple to an English description
               of the error.</p>
           </item>
         </taglist>
-        <p>The encoding of of <c><anno>Filename</anno></c> can be set
-          by a comment as described in <seealso
-          marker="stdlib:epp#encoding">epp(3)</seealso>.</p>
+        <p>The encoding of <c><anno>Filename</anno></c> can be set
+          by a comment as described in
+	  <seealso marker="stdlib:epp#encoding"><c>stdlib:epp(3)</c></seealso>.</p>
    </desc>
     </func>
     <func>
       <name name="path_script" arity="3"/>
-      <fsummary>Evaluate and return the value of Erlang expressions in a file</fsummary>
+      <fsummary>Evaluate and return the value of Erlang expressions in a file.</fsummary>
       <desc>
         <p>The same as <c>path_script/2</c> but the variable bindings
           <c><anno>Bindings</anno></c> are used in the evaluation. See
-          <seealso marker="stdlib:erl_eval">erl_eval(3)</seealso> about
+          <seealso marker="stdlib:erl_eval"><c>erl_eval(3)</c></seealso> about
           variable bindings.</p>
       </desc>
     </func>
     <func>
       <name name="pid2name" arity="1"/>
-      <fsummary>Return the name of the file handled by a pid</fsummary>
+      <fsummary>Return the name of the file handled by a pid.</fsummary>
       <desc>
-        <p>If <c><anno>Pid</anno></c> is an IO device, that is, a pid returned from
+        <p>If <c><anno>Pid</anno></c> is an I/O device, that is, a pid returned from
           <c>open/2</c>, this function returns the filename, or rather:</p>
         <taglist>
           <tag><c>{ok, <anno>Filename</anno>}</c></tag>
           <item>
-            <p>If this node's file server is not a slave, the file was
-              opened by this node's file server, (this implies that
+            <p>If the file server of this node is not a slave, the file was
+              opened by the file server of this node (this implies that
               <c><anno>Pid</anno></c> must be a local pid) and the file is not
               closed. <c><anno>Filename</anno></c> is the filename in flat string
               format.</p>
@@ -1084,13 +1169,12 @@
     </func>
     <func>
       <name name="position" arity="2"/>
-      <fsummary>Set position in a file</fsummary>
+      <fsummary>Set position in a file.</fsummary>
       <desc>
         <p>Sets the position of the file referenced by <c><anno>IoDevice</anno></c>
-          to <c><anno>Location</anno></c>. Returns
-          <c>{ok, <anno>NewPosition</anno>}</c> (as
-          absolute offset) if successful, otherwise
-          <c>{error, <anno>Reason</anno>}</c>. <c><anno>Location</anno></c> is
+          to <c><anno>Location</anno></c>. Returns <c>{ok, <anno>NewPosition</anno>}</c>
+	  (as absolute offset) if successful, otherwise
+	  <c>{error, <anno>Reason</anno>}</c>. <c><anno>Location</anno></c> is
           one of the following:</p>
         <taglist>
           <tag><c>Offset</c></tag>
@@ -1114,14 +1198,21 @@
             <p>The same as above with <c>Offset</c> 0.</p>
           </item>
         </taglist>
-	<p>Note that offsets are counted in bytes, not in characters. If the file is opened using some other <c>encoding</c> than <c>latin1</c>, one byte does not correspond to one character. Positioning in such a file can only be done to known character boundaries, i.e. to a position earlier retrieved by getting a current position, to the beginning/end of the file or to some other position <em>known</em> to be on a correct character boundary by some other means (typically beyond a byte order mark in the file, which has a known byte-size).</p>
-        <p>Typical error reasons are:</p>
+	<p>Notice that offsets are counted in bytes, not in characters. If the file
+	is opened using some other <c>encoding</c> than <c>latin1</c>, one byte
+	does not correspond to one character. Positioning in such a file can only
+	be done to known character boundaries. That is, to a position earlier retrieved
+	by getting a current position, to the beginning/end of the file or to some
+	other position <em>known</em> to be on a correct character boundary by some
+	other means (typically beyond a byte order mark in the file, which has a
+	known byte-size).</p>
+        <p>A typical error reason is:</p>
         <taglist>
           <tag><c>einval</c></tag>
           <item>
-            <p>Either <c><anno>Location</anno></c> was illegal, or it
+            <p>Either <c><anno>Location</anno></c> is illegal, or it is
               evaluated to a
-              negative offset in the file. Note that if the resulting
+              negative offset in the file. Notice that if the resulting
               position is a negative value, the result is an error, and
               after the call the file position is undefined.</p>
           </item>
@@ -1130,7 +1221,7 @@
     </func>
     <func>
       <name name="pread" arity="2"/>
-      <fsummary>Read from a file at certain positions</fsummary>
+      <fsummary>Read from a file at certain positions.</fsummary>
       <desc>
         <p>Performs a sequence of <c>pread/3</c> in one operation, 
           which is more efficient than calling them one at a time.
@@ -1139,70 +1230,94 @@
           where each <c><anno>Data</anno></c>, the result of the corresponding
           <c>pread</c>, is either a list or a binary depending on
           the mode of the file, or <c>eof</c> if the requested position
-          was beyond end of file.</p>
-	  <p>As the position is given as a byte-offset, special caution has to be taken when working with files where <c>encoding</c> is set to something else than <c>latin1</c>, as not every byte position will be a valid character boundary on such a file.</p>
+          is beyond end of file.</p>
+	  <p>As the position is specified as a byte-offset, take special caution
+	  when working with files where <c>encoding</c> is set to something else
+	  than <c>latin1</c>, as not every byte position is a valid character
+	  boundary on such a file.</p>
       </desc>
     </func>
     <func>
       <name name="pread" arity="3"/>
-      <fsummary>Read from a file at a certain position</fsummary>
+      <fsummary>Read from a file at a certain position.</fsummary>
       <desc>
         <p>Combines <c>position/2</c> and <c>read/2</c> in one
           operation, which is more efficient than calling them one at a
-          time. If <c><anno>IoDevice</anno></c> has been opened in raw mode,
-          some restrictions apply: <c><anno>Location</anno></c> is only allowed
-          to be an
-          integer; and the current position of the file is undefined
-          after the operation.</p>
-	  <p>As the position is given as a byte-offset, special caution has to be taken when working with files where <c>encoding</c> is set to something else than <c>latin1</c>, as not every byte position will be a valid character boundary on such a file.</p>
+          time. If <c><anno>IoDevice</anno></c> is opened in <c>raw</c> mode,
+          some restrictions apply:</p>
+	  <list type="bulleted">
+	    <item><c><anno>Location</anno></c> is only allowed to be an
+            integer.</item>
+	    <item>The current position of the file is undefined after the
+	    operation.</item>
+	  </list>
+	  <p>As the position is specified as a byte-offset, take special caution
+	  when working with files where <c>encoding</c> is set to something else
+	  than <c>latin1</c>, as not every byte position is a valid character
+	  boundary on such a file.</p>
         </desc>
     </func>
     <func>
       <name name="pwrite" arity="2"/>
-      <fsummary>Write to a file at certain positions</fsummary>
+      <fsummary>Write to a file at certain positions.</fsummary>
       <desc>
         <p>Performs a sequence of <c>pwrite/3</c> in one operation, 
           which is more efficient than calling them one at a time.
           Returns <c>ok</c> or <c>{error, {<anno>N</anno>,
           <anno>Reason</anno>}}</c>, where
-          <c><anno>N</anno></c> is the number of successful writes that was done
+          <c><anno>N</anno></c> is the number of successful writes done
           before the failure.</p>
-	<p>When positioning in a file with other <c>encoding</c> than <c>latin1</c>, caution must be taken to set the position on a correct character boundary, see <seealso marker="#position/2">position/2</seealso> for details.</p>
+	<p>When positioning in a file with other <c>encoding</c> than <c>latin1</c>,
+	caution must be taken to set the position on a correct character boundary.
+	For details, see <seealso marker="#position/2"><c>position/2</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="pwrite" arity="3"/>
-      <fsummary>Write to a file at a certain position</fsummary>
+      <fsummary>Write to a file at a certain position.</fsummary>
       <desc>
         <p>Combines <c>position/2</c> and <c>write/2</c> in one
           operation, which is more efficient than calling them one at a
-          time. If <c><anno>IoDevice</anno></c> has been opened in raw mode,
-          some restrictions apply: <c><anno>Location</anno></c> is only allowed
-          to be an
-          integer; and the current position of the file is undefined
-          after the operation.</p>
-	<p>When positioning in a file with other <c>encoding</c> than <c>latin1</c>, caution must be taken to set the position on a correct character boundary, see <seealso marker="#position/2">position/2</seealso> for details.</p>
+          time. If <c><anno>IoDevice</anno></c> has been opened in <c>raw</c> mode,
+          some restrictions apply:</p>
+	  <list type="bulleted">
+	    <item><c><anno>Location</anno></c> is only allowed to be an
+            integer.</item>
+	    <item>The current position of the file is undefined after the
+	    operation.</item>
+	  </list>
+	<p>When positioning in a file with other <c>encoding</c> than <c>latin1</c>,
+	caution must be taken to set the position on a correct character boundary.
+	For details, see <seealso marker="#position/2"><c>position/2</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="read" arity="2"/>
-      <fsummary>Read from a file</fsummary>
+      <fsummary>Read from a file.</fsummary>
       <desc>
         <p>Reads <c><anno>Number</anno></c> bytes/characters from the file
           referenced by <c><anno>IoDevice</anno></c>. The functions
-          <c>read/2</c>, <c>pread/3</c>
-          and <c>read_line/1</c> are the only ways to read from a file
-          opened in raw mode (although they work for normally opened
-          files, too).</p>
-	  <p>For files where <c>encoding</c> is set to something else than <c>latin1</c>, one character might be represented by more than one byte on the file. The parameter <c>Number</c> always denotes the number of <em>characters</em> read from the file, while the position in the file might be moved much more than this number when reading a Unicode file.</p>
-	  <p>Also, if <c>encoding</c> is set to something else than <c>latin1</c>, the <c>read/3</c> call will fail if the data contains characters larger than 255, which is why the <seealso marker="stdlib:io">io(3)</seealso> module is to be preferred when reading such a file.</p> 
+          <seealso marker="#read/2"><c>read/2</c></seealso>,
+	  <seealso marker="#pread/3"><c>pread/3</c></seealso>, and
+	  <seealso marker="#read_line/1"><c>read_line/1</c></seealso>
+	  are the only ways to read from a file opened in <c>raw</c> mode
+	  (although they work for normally opened files, too).</p>
+	  <p>For files where <c>encoding</c> is set to something else than <c>latin1</c>,
+	  one character can be represented by more than one byte on the file.
+	  The parameter <c>Number</c> always denotes the number of <em>characters</em>
+	  read from the file, while the position in the file can be moved much more than
+	  this number when reading a Unicode file.</p>
+	  <p>Also, if <c>encoding</c> is set to something else than <c>latin1</c>,
+	  the <c>read/3</c> call fails if the data contains characters larger than 255,
+	  which is why module <seealso marker="stdlib:io"><c>io(3)</c></seealso>
+	  is to be preferred when reading such a file.</p>
 	  <p>The function returns:</p>
         <taglist>
           <tag><c>{ok, <anno>Data</anno>}</c></tag>
           <item>
             <p>If the file was opened in binary mode, the read bytes are
               returned in a binary, otherwise in a list. The list or
-              binary will be shorter than the number of bytes requested
+              binary is shorter than the number of bytes requested
               if end of file was reached.</p>
           </item>
           <tag><c>eof</c></tag>
@@ -1223,14 +1338,16 @@
           </item>
           <tag><c>{no_translation, unicode, latin1}</c></tag>
           <item>
-            <p>The file was opened with another <c>encoding</c> than <c>latin1</c> and the data in the file can not be translated to the byte-oriented data that this function returns.</p>
+            <p>The file is opened with another <c>encoding</c> than <c>latin1</c> and
+	    the data in the file cannot be translated to the byte-oriented data that
+	    this function returns.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
       <name name="read_file" arity="1"/>
-      <fsummary>Read a file</fsummary>
+      <fsummary>Read a file.</fsummary>
       <desc>
         <p>Returns <c>{ok, <anno>Binary</anno>}</c>, where
           <c><anno>Binary</anno></c> is a binary
@@ -1254,7 +1371,7 @@
           </item>
           <tag><c>enotdir</c></tag>
           <item>
-            <p>A component of the file name is not a directory. On some
+            <p>A component of the filename is not a directory. On some
               platforms, <c>enoent</c> is returned instead.</p>
           </item>
           <tag><c>enomem</c></tag>
@@ -1267,34 +1384,38 @@
     <func>
       <name name="read_file_info" arity="1"/>
       <name name="read_file_info" arity="2"/>
-      <fsummary>Get information about a file</fsummary>
+      <fsummary>Retrieve information about a file.</fsummary>
       <desc>
         <p>Retrieves information about a file. Returns
           <c>{ok, <anno>FileInfo</anno>}</c> if successful, otherwise
           <c>{error, <anno>Reason</anno>}</c>. <c><anno>FileInfo</anno></c>
           is a record
-          <c>file_info</c>, defined in the Kernel include file
+          <c>file_info</c>, defined in the <c>Kernel</c> include file
           <c>file.hrl</c>. Include the following directive in the module
           from which the function is called:</p>
         <code type="none">
--include_lib("kernel/include/file.hrl").</code>
-		<p>The time type returned in <c>atime</c>, <c>mtime</c> and <c>ctime</c>
-			is dependent on the time type set in <c>Opts :: {time, Type}</c>.
-			Type <c>local</c> will return local time, <c>universal</c> will
-			return universal time and <c>posix</c> will return seconds since
-			or before unix time epoch which is 1970-01-01 00:00 UTC. 
-			Default is <c>{time, local}</c>.
-		</p> 
-        <p>If the <c>raw</c> option is set, the file server will not be called
-          and only informations about local files will be returned.</p>
-		<note>
-          <p>
-			  Since file times is stored in posix time on most OS it is
-			  faster to query file information with the <c>posix</c> option.
-		  </p> 
-        </note>
+ -include_lib("kernel/include/file.hrl").</code>
+	<p>The time type returned in <c>atime</c>, <c>mtime</c>, and <c>ctime</c>
+	  is dependent on the time type set in <c>Opts :: {time, Type}</c> as
+	  follows:</p>
+	  <taglist>
+	    <tag><c>local</c></tag>
+	    <item><p>Returns local time.</p></item>
+	    <tag><c>universal</c></tag>
+	    <item><p>Returns universal time.</p></item>
+	    <tag><c>posix</c></tag>
+	    <item><p>Returns seconds since or before Unix time epoch,
+	    which is 1970-01-01 00:00 UTC.</p></item>
+	  </taglist>
+	<p>Default is <c>{time, local}</c>.</p>
+        <p>If the option <c>raw</c> is set, the file server is not called
+          and only information about local files is returned.</p>
+	  <note>
+          <p>As file times are stored in POSIX time on most OS, it is faster to
+	  query file information with option <c>posix</c>.</p>
+          </note>
         
-        <p>The record <c>file_info</c> contains the following fields.</p>
+        <p>The record <c>file_info</c> contains the following fields:</p>
         <taglist>
           <tag><c>size = integer() >= 0</c></tag>
           <item>
@@ -1308,19 +1429,25 @@
           <item>
             <p>The current system access to the file.</p>
           </item>
-          <tag><c>atime = </c><seealso marker="#type-date_time">date_time()</seealso><c> | integer() >= 0</c></tag>
+          <tag><c>atime = </c>
+	  <seealso marker="#type-date_time"><c>date_time()</c></seealso><c> |
+	  integer() >= 0</c></tag>
           <item>
             <p>The last time the file was read.</p>
           </item>
-          <tag><c>mtime = </c><seealso marker="#type-date_time">date_time()</seealso><c> | integer() >= 0</c></tag>
+          <tag><c>mtime = </c>
+	  <seealso marker="#type-date_time"><c>date_time()</c></seealso><c> |
+	  integer() >= 0</c></tag>
           <item>
             <p>The last time the file was written.</p>
           </item>
-          <tag><c>ctime = </c><seealso marker="#type-date_time">date_time()</seealso><c> | integer() >=0</c></tag>
+          <tag><c>ctime = </c>
+	  <seealso marker="#type-date_time"><c>date_time()</c></seealso><c> |
+	  integer() >=0</c></tag>
           <item>
             <p>The interpretation of this time field depends on
               the operating system. On Unix, it is the last time
-              the file or the inode was changed. In Windows, it is
+              the file or the <c>inode</c> was changed. In Windows, it is
               the create time.</p>
           </item>
           <tag><c>mode = integer() >= 0</c></tag>
@@ -1328,36 +1455,36 @@
             <p>The file permissions as the sum of the following bit
               values:</p>
             <taglist>
-              <tag>8#00400</tag>
-              <item>read permission: owner</item>
-              <tag>8#00200</tag>
-              <item>write permission: owner</item>
-              <tag>8#00100</tag>
-              <item>execute permission: owner</item>
-              <tag>8#00040</tag>
-              <item>read permission: group</item>
-              <tag>8#00020</tag>
-              <item>write permission: group</item>
-              <tag>8#00010</tag>
-              <item>execute permission: group</item>
-              <tag>8#00004</tag>
-              <item>read permission: other</item>
-              <tag>8#00002</tag>
-              <item>write permission: other</item>
-              <tag>8#00001</tag>
-              <item>execute permission: other</item>
-              <tag>16#800</tag>
-              <item>set user id on execution</item>
-              <tag>16#400</tag>
-              <item>set group id on execution</item>
+              <tag><c>8#00400</c></tag>
+              <item><p>read permission: owner</p></item>
+              <tag><c>8#00200</c></tag>
+              <item><p>write permission: owner</p></item>
+              <tag><c>8#00100</c></tag>
+              <item><p>execute permission: owner</p></item>
+              <tag><c>8#00040</c></tag>
+              <item><p>read permission: group</p></item>
+              <tag><c>8#00020</c></tag>
+              <item><p>write permission: group</p></item>
+              <tag><c>8#00010</c></tag>
+              <item><p>execute permission: group</p></item>
+              <tag><c>8#00004</c></tag>
+              <item><p>read permission: other</p></item>
+              <tag><c>8#00002</c></tag>
+              <item><p>write permission: other</p></item>
+              <tag><c>8#00001</c></tag>
+              <item><p>execute permission: other</p></item>
+              <tag><c>16#800</c></tag>
+              <item><p>set user id on execution</p></item>
+              <tag><c>16#400</c></tag>
+              <item><p>set group id on execution</p></item>
             </taglist>
-            <p>On Unix platforms, other bits than those listed above
-              may be set.</p>
+            <p>On Unix platforms, the following bits
+              can also be set:</p>
           </item>
           <tag><c>links = integer() >= 0</c></tag>
           <item>
-            <p>Number of links to the file (this will always be 1 for
-              file systems which have no concept of links).</p>
+            <p>Number of links to the file (this is always 1 for
+              file systems that have no concept of links).</p>
           </item>
           <tag><c>major_device = integer() >= 0</c></tag>
           <item>
@@ -1373,17 +1500,17 @@
           <tag><c>inode = integer() >= 0</c></tag>
           <item>
             <p>Gives the <c>inode</c> number. On non-Unix file systems,
-              this field will be zero.</p>
+              this field is zero.</p>
           </item>
           <tag><c>uid = integer() >= 0</c></tag>
           <item>
-            <p>Indicates the owner of the file. Will be zero for
-              non-Unix file systems.</p>
+            <p>Indicates the owner of the file. On non-Unix file systems,
+              this field is zero.</p>
           </item>
           <tag><c>gid = integer() >= 0</c></tag>
           <item>
             <p>Gives the group that the owner of the file belongs to.
-              Will be zero for non-Unix file systems.</p>
+              On non-Unix file systems, this field is zero.</p>
           </item>
         </taglist>
         <p>Typical error reasons:</p>
@@ -1399,7 +1526,7 @@
           </item>
           <tag><c>enotdir</c></tag>
           <item>
-            <p>A component of the file name is not a directory. On some
+            <p>A component of the filename is not a directory. On some
               platforms, <c>enoent</c> is returned instead.</p>
           </item>
         </taglist>
@@ -1407,18 +1534,34 @@
     </func>
     <func>
       <name name="read_line" arity="1"/>
-      <fsummary>Read a line from a file</fsummary>
+      <fsummary>Read a line from a file.</fsummary>
       <desc>
         <p>Reads a line of bytes/characters from the file referenced by
-          <c><anno>IoDevice</anno></c>. Lines are defined to be delimited by the linefeed (LF, <c>\n</c>) character, but any carriage return (CR, <c>\r</c>) followed by a newline is also treated as a single LF character (the carriage return is silently ignored). The line is returned <em>including</em> the LF, but excluding any CR immediately followed by a LF. This behaviour is consistent with the behaviour of <seealso marker="stdlib:io#get_line/2">io:get_line/2</seealso>. If end of file is reached without any LF ending the last line, a line with no trailing LF is returned.</p>
-	  <p>The function can be used on files opened in <c>raw</c> mode. It is however inefficient to use it on <c>raw</c> files if the file is not opened with the option <c>{read_ahead, Size}</c> specified, why combining <c>raw</c> and <c>{read_ahead, Size}</c> is highly recommended when opening a text file for raw line oriented reading.</p> 
-	  <p>If <c>encoding</c> is set to something else than <c>latin1</c>, the <c>read_line/1</c> call will fail if the data contains characters larger than 255, why the <seealso marker="stdlib:io">io(3)</seealso> module is to be preferred when reading such a file.</p> 
+          <c><anno>IoDevice</anno></c>. Lines are defined to be delimited by the
+	  linefeed (LF, <c>\n</c>) character, but any carriage return (CR, <c>\r</c>)
+	  followed by a newline is also treated as a single LF character (the carriage
+	  return is silently ignored). The line is returned <em>including</em> the LF,
+	  but excluding any CR immediately followed by an LF. This behaviour is
+	  consistent with the behaviour of
+	  <seealso marker="stdlib:io#get_line/2"><c>io:get_line/2</c></seealso>.
+	  If end of file is reached without any LF ending the last line, a line with no
+	  trailing LF is returned.</p>
+	  <p>The function can be used on files opened in <c>raw</c> mode. However, it is
+	  inefficient to use it on <c>raw</c> files if the file is not opened with
+	  option <c>{read_ahead, Size}</c> specified. Thus, combining <c>raw</c> and
+	  <c>{read_ahead, Size}</c> is highly recommended when opening a text file for
+	  raw line-oriented reading.</p>
+	  <p>If <c>encoding</c> is set to something else than <c>latin1</c>, the
+	  <c>read_line/1</c> call fails if the data contains characters larger than 255,
+	  why module <seealso marker="stdlib:io"><c>stdlib:io(3)</c></seealso> is to be
+	  preferred when reading such a file.</p>
 	  <p>The function returns:</p>
         <taglist>
           <tag><c>{ok, <anno>Data</anno>}</c></tag>
           <item>
-	    <p>One line from the file is returned, including the trailing LF, but with CRLF sequences replaced by a single LF (see above).</p>
-            <p>If the file was opened in binary mode, the read bytes are
+	    <p>One line from the file is returned, including the trailing LF,
+	    but with CRLF sequences replaced by a single LF (see above).</p>
+            <p>If the file is opened in binary mode, the read bytes are
               returned in a binary, otherwise in a list.</p>
           </item>
           <tag><c>eof</c></tag>
@@ -1439,22 +1582,24 @@
           </item>
           <tag><c>{no_translation, unicode, latin1}</c></tag>
           <item>
-            <p>The file is was opened with another <c>encoding</c> than <c>latin1</c> and the data on the file can not be translated to the byte-oriented data that this function returns.</p>
+            <p>The file is opened with another <c>encoding</c> than <c>latin1</c> and
+	    the data on the file cannot be translated to the byte-oriented data that
+	    this function returns.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
       <name name="read_link" arity="1"/>
-      <fsummary>See what a link is pointing to</fsummary>
+      <fsummary>See what a link is pointing to.</fsummary>
       <desc>
-        <p><marker id="read_link_all"/>This function returns
+        <p><marker id="read_link_all"/>Returns
 	<c>{ok, <anno>Filename</anno>}</c> if
           <c><anno>Name</anno></c> refers to a symbolic link that is
-	  not a "raw" file name, or <c>{error, <anno>Reason</anno>}</c>
+	  not a raw filename, or <c>{error, <anno>Reason</anno>}</c>
 	  otherwise.
           On platforms that do not support symbolic links, the return
-          value will be <c>{error,enotsup}</c>.</p>
+          value is <c>{error,enotsup}</c>.</p>
         <p>Typical error reasons:</p>
         <taglist>
           <tag><c>einval</c></tag>
@@ -1476,14 +1621,14 @@
     </func>
     <func>
       <name name="read_link_all" arity="1"/>
-      <fsummary>See what a link is pointing to</fsummary>
+      <fsummary>See what a link is pointing to.</fsummary>
       <desc>
-        <p>This function returns <c>{ok, <anno>Filename</anno>}</c> if
+        <p>Returns <c>{ok, <anno>Filename</anno>}</c> if
           <c><anno>Name</anno></c> refers to a symbolic link or
           <c>{error, <anno>Reason</anno>}</c> otherwise.
           On platforms that do not support symbolic links, the return
-          value will be <c>{error,enotsup}</c>.</p>
-	  <p>Note that <c><anno>Filename</anno></c> can be either a list
+          value is <c>{error,enotsup}</c>.</p>
+	  <p>Notice that <c><anno>Filename</anno></c> can be either a list
 	  or a binary.</p>
         <p>Typical error reasons:</p>
         <taglist>
@@ -1505,31 +1650,30 @@
     <func>
       <name name="read_link_info" arity="1"/>
       <name name="read_link_info" arity="2"/>
-      <fsummary>Get information about a link or file</fsummary>
+      <fsummary>Retrieve information about a link or file.</fsummary>
       <desc>
-		  <p>This function works like 
-			 <seealso marker="#read_file_info/2">read_file_info/1,2</seealso> except that
-          if <c><anno>Name</anno></c> is a symbolic link, information about
-          the link will be returned in the <c>file_info</c> record and
-          the <c>type</c> field of the record will be set to
-          <c>symlink</c>.</p>
-      <p>If the <c>raw</c> option is set, the file server will not be called
-        and only informations about local files will be returned.</p>
+	<p>Works like
+	<seealso marker="#read_file_info/2"><c>read_file_info/1,2</c></seealso>
+	except that if <c><anno>Name</anno></c> is a symbolic link, information
+	about the link is returned in the <c>file_info</c> record and
+          the <c>type</c> field of the record is set to <c>symlink</c>.</p>
+      <p>If the option <c>raw</c> is set, the file server is not called
+        and only information about local files is returned.</p>
         <p>If <c><anno>Name</anno></c> is not a symbolic link, this function returns
-          exactly the same result as <c>read_file_info/1</c>.
+          the same result as <c>read_file_info/1</c>.
           On platforms that do not support symbolic links, this function
           is always equivalent to <c>read_file_info/1</c>.</p>
       </desc>
     </func>
     <func>
       <name name="rename" arity="2"/>
-      <fsummary>Rename a file</fsummary>
+      <fsummary>Rename a file.</fsummary>
       <desc>
         <p>Tries to rename the file <c><anno>Source</anno></c> to
           <c><anno>Destination</anno></c>.
           It can be used to move files (and directories) between
           directories, but it is not sufficient to specify
-          the destination only. The destination file name must also be
+          the destination only. The destination filename must also be
           specified. For example, if <c>bar</c> is a normal file and
           <c>foo</c> and <c>baz</c> are directories,
           <c>rename("foo/bar", "baz")</c> returns an error, but
@@ -1560,7 +1704,7 @@
           <item>
             <p><c><anno>Source</anno></c> is a root directory, or
               <c><anno>Destination</anno></c>
-              is a sub-directory of <c><anno>Source</anno></c>.</p>
+              is a subdirectory of <c><anno>Source</anno></c>.</p>
           </item>
           <tag><c>eisdir</c></tag>
           <item>
@@ -1586,58 +1730,105 @@
     </func>
     <func>
       <name name="script" arity="1"/>
-      <fsummary>Evaluate and return the value of Erlang expressions in a file</fsummary>
+      <fsummary>Evaluate and return the value of Erlang expressions in a file.</fsummary>
       <desc>
         <p>Reads and evaluates Erlang expressions, separated by '.' (or
           ',', a sequence of expressions is also an expression), from
-          the file. Returns one of the following:</p>
+          the file.</p>
+	<p>Returns one of the following:</p>
         <taglist>
           <tag><c>{ok, <anno>Value</anno>}</c></tag>
           <item>
-            <p>The file was read and evaluated. <c><anno>Value</anno></c> is
+            <p>The file is read and evaluated. <c><anno>Value</anno></c> is
               the value of the last expression.</p>
           </item>
           <tag><c>{error, atom()}</c></tag>
           <item>
             <p>An error occurred when opening the file or reading it.
-              See <seealso marker="#open/2">open/2</seealso> for a list
-              of typical error codes.</p>
+              For a list of typical error codes, see
+	    <seealso marker="#open/2"><c>open/2</c></seealso>.</p>
           </item>
           <tag><c>{error, {<anno>Line</anno>, <anno>Mod</anno>,
                            <anno>Term</anno>}}</c></tag>
           <item>
             <p>An error occurred when interpreting the Erlang
-              expressions in the file. Use <c>format_error/1</c> to
-              convert the three-element tuple to an English description
+              expressions in the file. Use
+	      <seealso marker="#format_error/1"><c>format_error/1</c></seealso>
+	      to convert the three-element tuple to an English description
               of the error.</p>
           </item>
         </taglist>
-        <p>The encoding of of <c><anno>Filename</anno></c> can be set
-          by a comment as described in <seealso
-          marker="stdlib:epp#encoding">epp(3)</seealso>.</p>
+        <p>The encoding of <c><anno>Filename</anno></c> can be set
+          by a comment as described in
+	  <seealso marker="stdlib:epp#encoding"><c>epp(3)</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name name="script" arity="2"/>
-      <fsummary>Evaluate and return the value of Erlang expressions in a file</fsummary>
+      <fsummary>Evaluate and return the value of Erlang expressions in a file.</fsummary>
       <desc>
         <p>The same as <c>script/1</c> but the variable bindings
           <c><anno>Bindings</anno></c> are used in the evaluation. See
-          <seealso marker="stdlib:erl_eval">erl_eval(3)</seealso> about
+          <seealso marker="stdlib:erl_eval"><c>erl_eval(3)</c></seealso> about
           variable bindings.</p>
       </desc>
     </func>
     <func>
+      <name name="sendfile" arity="2"/>
+      <fsummary>Send a file to a socket.</fsummary>
+      <desc>
+        <p>Sends the file <c>Filename</c> to <c>Socket</c>.
+        Returns <c>{ok, BytesSent}</c> if successful,
+        otherwise <c>{error, Reason}</c>.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="sendfile" arity="5"/>
+      <fsummary>Send a file to a socket.</fsummary>
+      <type name="sendfile_option"/>
+      <desc>
+        <p>Sends <c>Bytes</c> from the file
+        referenced by <c>RawFile</c> beginning at <c>Offset</c> to
+        <c>Socket</c>.
+        Returns <c>{ok, BytesSent}</c> if successful,
+        otherwise <c>{error, Reason}</c>. If <c>Bytes</c> is set to
+	<c>0</c> all data after the specified <c>Offset</c> is sent.</p>
+	<p>The file used must be opened using the <c>raw</c> flag, and the process
+	calling <c>sendfile</c> must be the controlling process of the socket.
+	See <seealso marker="gen_tcp#controlling_process-2"><c>gen_tcp:controlling_process/2</c></seealso>.</p>
+	<p>If the OS used does not support <c>sendfile</c>, an Erlang fallback
+	using
+	<seealso marker="#read/2"><c>read/2</c></seealso> and
+	<seealso marker="gen_tcp#send/2"><c>gen_tcp:send/2</c></seealso> is used.</p>
+	<p>The option list can contain the following options:</p>
+	<taglist>
+          <tag><c>chunk_size</c></tag>
+          <item><p>The chunk size used by the Erlang fallback to send
+	  data. If using the fallback, set this to a value
+	  that comfortably fits in the systems memory. Default is 20 MB.</p></item>
+	  <tag><c>use_threads</c></tag>
+          <item><p>Instructs the emulator to use the <c>async</c> thread pool for the
+	  <c>sendfile</c> system call. This can be useful if the OS you are running
+	  on does not properly support non-blocking <c>sendfile</c> calls. Notice that
+	  using <c>async</c> threads potentially makes your system vulnerable to slow
+	  client attacks. If set to <c>true</c> and no <c>async</c> threads are available,
+	  the <c>sendfile</c> call returns <c>{error,einval}</c>.
+	  Introduced in Erlang/OTP 17.0. Default is <c>false</c>.</p></item>
+	</taglist>
+      </desc>
+    </func>
+    <func>
       <name name="set_cwd" arity="1"/>
-      <fsummary>Set the current working directory</fsummary>
+      <fsummary>Set the current working directory.</fsummary>
       <desc>
         <p>Sets the current working directory of the file server to
           <c><anno>Dir</anno></c>. Returns <c>ok</c> if successful.</p>
-        <p>The functions in the <c>file</c> module usually treat binaries
-          as raw filenames, i.e. they are passed as is even when the encoding
-          of the binary does not agree with <c>file:native_name_encoding()</c>.
-          This function however expects binaries to be encoded according to the
-          value returned by <c>file:native_name_encoding()</c>.</p>
+        <p>The functions in the module <c>file</c> usually treat binaries
+          as raw filenames, that is, they are passed "as is" even when the
+	  encoding of the binary does not agree with
+	  <seealso marker="#native_name_encoding"><c>native_name_encoding()</c></seealso>.
+          However, this function expects binaries to be encoded according to the
+          value returned by <c>native_name_encoding()</c>.</p>
         <p>Typical error reasons are:</p>
         <taglist>
           <tag><c>enoent</c></tag>
@@ -1656,31 +1847,31 @@
           </item>
           <tag><c>badarg</c></tag>
           <item>
-            <p><c><anno>Dir</anno></c> had an improper type,
+            <p><c><anno>Dir</anno></c> has an improper type,
               such as tuple.</p>
           </item>
           <tag><c>no_translation</c></tag>
           <item>
             <p><c><anno>Dir</anno></c> is a <c>binary()</c> with
               characters coded in ISO-latin-1 and the VM is operating
-              with unicode file name encoding.</p>
+              with unicode filename encoding.</p>
           </item>
         </taglist>
         <warning>
-          <p>In a future release, a bad type for the
+          <p>In a future release, a bad type for argument
             <c><anno>Dir</anno></c>
-            argument will probably generate an exception.</p>
+            will probably generate an exception.</p>
         </warning>
       </desc>
     </func>
     <func>
       <name name="sync" arity="1"/>
-      <fsummary>Synchronizes the in-memory state of a file with that on the physical medium</fsummary>
+      <fsummary>Synchronize the in-memory state of a file with that on the physical medium.</fsummary>
       <desc>
-        <p>Makes sure that any buffers kept by the operating system
+        <p>Ensures that any buffers kept by the operating system
           (not by the Erlang runtime system) are written to disk. On
           some platforms, this function might have no effect.</p>
-        <p>Typical error reasons are:</p>
+        <p>A typical error reason is:</p>
         <taglist>
           <tag><c>enospc</c></tag>
           <item>
@@ -1690,90 +1881,28 @@
       </desc>
     </func>
     <func>
-      <name name="datasync" arity="1"/>
-      <fsummary>Synchronizes the in-memory data of a file, ignoring most of its metadata, with that on the physical medium</fsummary>
-      <desc>
-        <p>Makes sure that any buffers kept by the operating system
-          (not by the Erlang runtime system) are written to disk. In
-          many ways it resembles fsync but it does not update
-          some of the file's metadata such as the access time. On
-          some platforms this function has no effect.</p>
-        <p>Applications that access databases or log files often write
-          a tiny data fragment (e.g., one line in a log file) and then
-          call fsync() immediately in order to ensure that the written
-          data is physically stored on the harddisk. Unfortunately, fsync()
-          will always initiate two write operations: one for the newly
-          written data and another one in order to update the modification
-          time stored in the inode. If the modification time is not a part
-          of the transaction concept, fdatasync() can be used to avoid
-          unnecessary inode disk write operations.</p>
-        <p>Available only in some POSIX systems, this call results in a
-          call to fsync(), or has no effect in systems not implementing
-          the fdatasync() syscall.</p>
-      </desc>
-    </func>
-    <func>
       <name name="truncate" arity="1"/>
-      <fsummary>Truncate a file</fsummary>
+      <fsummary>Truncate a file.</fsummary>
       <desc>
         <p>Truncates the file referenced by <c><anno>IoDevice</anno></c> at
-          the current position.  Returns <c>ok</c> if successful,
+          the current position. Returns <c>ok</c> if successful,
           otherwise <c>{error, <anno>Reason</anno>}</c>.</p>
       </desc>
     </func>
     <func>
-      <name name="sendfile" arity="2"/>
-      <fsummary>send a file to a socket</fsummary>
-      <desc>
-        <p>Sends the file <c>Filename</c> to <c>Socket</c>.
-        Returns <c>{ok, BytesSent}</c> if successful,
-        otherwise <c>{error, Reason}</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="sendfile" arity="5"/>
-      <fsummary>send a file to a socket</fsummary>
-      <type name="sendfile_option"/>
-      <desc>
-        <p>Sends <c>Bytes</c> from the file
-        referenced by <c>RawFile</c> beginning at <c>Offset</c> to
-        <c>Socket</c>.
-        Returns <c>{ok, BytesSent}</c> if successful,
-        otherwise <c>{error, Reason}</c>. If <c>Bytes</c> is set to
-	0 all data after the given <c>Offset</c> is sent.</p>
-	<p>The file used must be opened using the raw flag, and the process
-	calling sendfile must be the controlling process of the socket.
-	See <seealso marker="gen_tcp#controlling_process-2">gen_tcp:controlling_process/2</seealso></p>
-	<p>If the OS used does not support sendfile, an Erlang fallback
-	using file:read and gen_tcp:send is used.</p>
-	<p>The option list can contain the following options:</p>
-	<taglist>
-          <tag><c>chunk_size</c></tag>
-          <item>The chunk size used by the erlang fallback to send
-	  data. If using the fallback, this should be set to a value
-	  which comfortably fits in the systems memory. Default is 20 MB.</item>
-	  <tag><c>use_threads</c></tag>
-          <item>Instruct the emulator to use the async thread pool for the
-	  sendfile system call. This could be usefull if the OS you are running
-	  on does not properly support non-blocking sendfile calls. Do note that
-	  using async threads potentially makes your system volnerable to slow
-	  client attacks. If set to true and no async threads are available,
-	  the sendfile call will return <c>{error,einval}</c>.
-	  Introduced in Erlang/OTP 17.0. Default is false.</item>
-	</taglist>
-      </desc>
-    </func>
-    <func>
       <name name="write" arity="2"/>
-      <fsummary>Write to a file</fsummary>
+      <fsummary>Write to a file.</fsummary>
       <desc>
         <p>Writes <c><anno>Bytes</anno></c> to the file referenced by
           <c><anno>IoDevice</anno></c>. This function is the only way to write to a
-          file opened in raw mode (although it works for normally
-          opened files, too). Returns <c>ok</c> if successful, and
+          file opened in <c>raw</c> mode (although it works for normally opened
+	  files too). Returns <c>ok</c> if successful, and
           <c>{error, <anno>Reason</anno>}</c> otherwise.</p>
-	  <p>If the file is opened with <c>encoding</c> set to something else than <c>latin1</c>, each byte written might result in several bytes actually being written to the file, as the byte range 0..255 might represent anything between one and four bytes depending on value and UTF encoding type.</p>
-        <p>Typical error reasons are:</p>
+	  <p>If the file is opened with <c>encoding</c> set to something else than
+	  <c>latin1</c>, each byte written can result in many bytes being written to
+	  the file, as the byte range 0..255 can represent anything between one and
+	  four bytes depending on value and UTF encoding type.</p>
+        <p>Typical error reasons:</p>
         <taglist>
           <tag><c>ebadf</c></tag>
           <item>
@@ -1781,34 +1910,35 @@
           </item>
           <tag><c>enospc</c></tag>
           <item>
-            <p>There is a no space left on the device.</p>
+            <p>No space is left on the device.</p>
           </item>
         </taglist>
       </desc>
     </func>
     <func>
       <name name="write_file" arity="2"/>
-      <fsummary>Write a file</fsummary>
+      <fsummary>Write a file.</fsummary>
       <desc>
-        <p>Writes the contents of the iodata term <c><anno>Bytes</anno></c>
-          to the file <c><anno>Filename</anno></c>.
-          The file is created if it does not
-          exist. If it exists, the previous contents are
-          overwritten. Returns <c>ok</c>, or <c>{error, <anno>Reason</anno>}</c>.</p>
-        <p>Typical error reasons are:</p>
+        <p>Writes the contents of the <c>iodata</c> term <c><anno>Bytes</anno></c>
+          to file <c><anno>Filename</anno></c>.
+          The file is created if it does not exist.
+	  If it exists, the previous contents are overwritten.
+	  Returns <c>ok</c> if successful, otherwise
+	<c>{error, <anno>Reason</anno>}</c>.</p>
+        <p>Typical error reasons:</p>
         <taglist>
           <tag><c>enoent</c></tag>
           <item>
-            <p>A component of the file name does not exist.</p>
+            <p>A component of the filename does not exist.</p>
           </item>
           <tag><c>enotdir</c></tag>
           <item>
-            <p>A component of the file name is not a directory. On some
+            <p>A component of the filename is not a directory. On some
               platforms, <c>enoent</c> is returned instead.</p>
           </item>
           <tag><c>enospc</c></tag>
           <item>
-            <p>There is a no space left on the device.</p>
+            <p>No space is left on the device.</p>
           </item>
           <tag><c>eacces</c></tag>
           <item>
@@ -1824,51 +1954,64 @@
     </func>
     <func>
       <name name="write_file" arity="3"/>
-      <fsummary>Write a file</fsummary>
+      <fsummary>Write a file.</fsummary>
       <desc>
         <p>Same as <c>write_file/2</c>, but takes a third argument
           <c><anno>Modes</anno></c>, a list of possible modes, see
-          <seealso marker="#open/2">open/2</seealso>. The mode flags
-          <c>binary</c> and <c>write</c> are implicit, so they should
-          not be used.</p>
+          <seealso marker="#open/2"><c>open/2</c></seealso>. The mode flags
+          <c>binary</c> and <c>write</c> are implicit, so they are
+          not to be used.</p>
       </desc>
     </func>
     <func>
       <name name="write_file_info" arity="2"/>
       <name name="write_file_info" arity="3"/>
-      <fsummary>Change information about a file</fsummary>
+      <fsummary>Change file information.</fsummary>
       <desc>
-        <p>Change file information. Returns <c>ok</c> if successful,
+        <p>Changes file information. Returns <c>ok</c> if successful,
           otherwise <c>{error, <anno>Reason</anno>}</c>.
           <c><anno>FileInfo</anno></c> is a record
-          <c>file_info</c>, defined in the Kernel include file
+          <c>file_info</c>, defined in the <c>Kernel</c> include file
           <c>file.hrl</c>. Include the following directive in the module
           from which the function is called:</p>
         <code type="none">
--include_lib("kernel/include/file.hrl").</code>
-		<p>The time type set in <c>atime</c>, <c>mtime</c> and <c>ctime</c>
-			is dependent on the time type set in <c>Opts :: {time, Type}</c>.
-			Type <c>local</c> will interpret the time set as local, <c>universal</c> will
-			interpret it as universal time and <c>posix</c> must be seconds since
-			or before unix time epoch which is 1970-01-01 00:00 UTC.
-			Default is <c>{time, local}</c>.</p>
-        <p>If the <c>raw</c> option is set, the file server will not be called
-          and only informations about local files will be returned.</p>
+ -include_lib("kernel/include/file.hrl").</code>
+        <p>The time type set in <c>atime</c>, <c>mtime</c>, and <c>ctime</c>
+	  depends on the time type set in <c>Opts :: {time, Type}</c> as
+	  follows:</p>
+	  <taglist>
+	    <tag><c>local</c></tag>
+	    <item><p>Interprets the time set as local.</p></item>
+	    <tag><c>universal</c></tag>
+	    <item><p>Interprets it as universal time.</p></item>
+	    <tag><c>posix</c></tag>
+	    <item><p>Must be seconds since or before Unix time epoch,
+	    which is 1970-01-01 00:00 UTC.</p></item>
+	  </taglist>
+	<p>Default is <c>{time, local}</c>.</p>
+        <p>If the option <c>raw</c> is set, the file server is not called
+          and only information about local files is returned.</p>
         <p>The following fields are used from the record, if they are
-          given.</p>
+          specified:</p>
         <taglist>
-          <tag><c>atime = </c><seealso marker="#type-date_time">date_time()</seealso><c> | integer() >= 0</c></tag>
+          <tag><c>atime = </c>
+	  <seealso marker="#type-date_time"><c>date_time()</c></seealso><c> |
+	  integer() >= 0</c></tag>
           <item>
             <p>The last time the file was read.</p>
           </item>
-          <tag><c>mtime = </c><seealso marker="#type-date_time">date_time()</seealso><c> | integer() >= 0</c></tag>
+          <tag><c>mtime = </c>
+	  <seealso marker="#type-date_time"><c>date_time()</c></seealso><c> |
+	  integer() >= 0</c></tag>
           <item>
             <p>The last time the file was written.</p>
           </item>
-          <tag><c>ctime = </c><seealso marker="#type-date_time">date_time()</seealso><c> | integer() >= 0</c></tag>
+          <tag><c>ctime = </c>
+	  <seealso marker="#type-date_time"><c>date_time()</c></seealso><c> |
+	  integer() >= 0</c></tag>
           <item>
-            <p>On Unix, any value give for this field will be ignored
-              (the "ctime" for the file will be set to the current
+            <p>On Unix, any value specified for this field is ignored
+              (the "ctime" for the file is set to the current
               time). On Windows, this field is the new creation time to
               set for the file.</p>
           </item>
@@ -1877,40 +2020,40 @@
             <p>The file permissions as the sum of the following bit
               values:</p>
             <taglist>
-              <tag>8#00400</tag>
-              <item>read permission: owner</item>
-              <tag>8#00200</tag>
-              <item>write permission: owner</item>
-              <tag>8#00100</tag>
-              <item>execute permission: owner</item>
-              <tag>8#00040</tag>
-              <item>read permission: group</item>
-              <tag>8#00020</tag>
-              <item>write permission: group</item>
-              <tag>8#00010</tag>
-              <item>execute permission: group</item>
-              <tag>8#00004</tag>
-              <item>read permission: other</item>
-              <tag>8#00002</tag>
-              <item>write permission: other</item>
-              <tag>8#00001</tag>
-              <item>execute permission: other</item>
-              <tag>16#800</tag>
-              <item>set user id on execution</item>
-              <tag>16#400</tag>
-              <item>set group id on execution</item>
+              <tag><c>8#00400</c></tag>
+              <item><p>Read permission: owner</p></item>
+              <tag><c>8#00200</c></tag>
+              <item><p>Write permission: owner</p></item>
+              <tag><c>8#00100</c></tag>
+              <item><p>Execute permission: owner</p></item>
+              <tag><c>8#00040</c></tag>
+              <item><p>Read permission: group</p></item>
+              <tag><c>8#00020</c></tag>
+              <item><p>Write permission: group</p></item>
+              <tag><c>8#00010</c></tag>
+              <item><p>Execute permission: group</p></item>
+              <tag><c>8#00004</c></tag>
+              <item><p>Read permission: other</p></item>
+              <tag><c>8#00002</c></tag>
+              <item><p>Write permission: other</p></item>
+              <tag><c>8#00001</c></tag>
+              <item><p>Execute permission: other</p></item>
+              <tag><c>16#800</c></tag>
+              <item><p>Set user id on execution</p></item>
+              <tag><c>16#400</c></tag>
+              <item><p>Set group id on execution</p></item>
             </taglist>
-            <p>On Unix platforms, other bits than those listed above
-              may be set.</p>
+            <p>On Unix platforms, the following bits
+              can also be set.</p>
           </item>
           <tag><c>uid = integer() >= 0</c></tag>
           <item>
-            <p>Indicates the owner of the file. Ignored for non-Unix
+            <p>Indicates the file owner. Ignored for non-Unix
               file systems.</p>
           </item>
           <tag><c>gid = integer() >= 0</c></tag>
           <item>
-            <p>Gives the group that the owner of the file belongs to.
+            <p>Gives the group that the file owner belongs to.
               Ignored for non-Unix file systems.</p>
           </item>
         </taglist>
@@ -1927,7 +2070,7 @@
           </item>
           <tag><c>enotdir</c></tag>
           <item>
-            <p>A component of the file name is not a directory. On some
+            <p>A component of the filename is not a directory. On some
               platforms, <c>enoent</c> is returned instead.</p>
           </item>
         </taglist>
@@ -1938,77 +2081,82 @@
   <section>
     <title>POSIX Error Codes</title>
     <list type="bulleted">
-      <item><c>eacces</c> - permission denied</item>
-      <item><c>eagain</c> - resource temporarily unavailable</item>
-      <item><c>ebadf</c> - bad file number</item>
-      <item><c>ebusy</c> - file busy</item>
-      <item><c>edquot</c> - disk quota exceeded</item>
-      <item><c>eexist</c> - file already exists</item>
-      <item><c>efault</c> - bad address in system call argument</item>
-      <item><c>efbig</c> - file too large</item>
-      <item><c>eintr</c> - interrupted system call</item>
-      <item><c>einval</c> - invalid argument</item>
-      <item><c>eio</c> - IO error</item>
-      <item><c>eisdir</c> - illegal operation on a directory</item>
-      <item><c>eloop</c> - too many levels of symbolic links</item>
-      <item><c>emfile</c> - too many open files</item>
-      <item><c>emlink</c> - too many links</item>
-      <item><c>enametoolong</c> - file name too long</item>
-      <item><c>enfile</c> - file table overflow</item>
-      <item><c>enodev</c> - no such device</item>
-      <item><c>enoent</c> - no such file or directory</item>
-      <item><c>enomem</c> - not enough memory</item>
-      <item><c>enospc</c> - no space left on device</item>
-      <item><c>enotblk</c> - block device required</item>
-      <item><c>enotdir</c> - not a directory</item>
-      <item><c>enotsup</c> - operation not supported</item>
-      <item><c>enxio</c> - no such device or address</item>
-      <item><c>eperm</c> - not owner</item>
-      <item><c>epipe</c> - broken pipe</item>
-      <item><c>erofs</c> - read-only file system</item>
-      <item><c>espipe</c> - invalid seek</item>
-      <item><c>esrch</c> - no such process</item>
-      <item><c>estale</c> - stale remote file handle</item>
-      <item><c>exdev</c> - cross-domain link</item>
+      <item><c>eacces</c> - Permission denied</item>
+      <item><c>eagain</c> - Resource temporarily unavailable</item>
+      <item><c>ebadf</c> - Bad file number</item>
+      <item><c>ebusy</c> - File busy</item>
+      <item><c>edquot</c> - Disk quota exceeded</item>
+      <item><c>eexist</c> - File already exists</item>
+      <item><c>efault</c> - Bad address in system call argument</item>
+      <item><c>efbig</c> - File too large</item>
+      <item><c>eintr</c> - Interrupted system call</item>
+      <item><c>einval</c> - Invalid argument</item>
+      <item><c>eio</c> - I/O error</item>
+      <item><c>eisdir</c> - Illegal operation on a directory</item>
+      <item><c>eloop</c> - Too many levels of symbolic links</item>
+      <item><c>emfile</c> - Too many open files</item>
+      <item><c>emlink</c> - Too many links</item>
+      <item><c>enametoolong</c> - Filename too long</item>
+      <item><c>enfile</c> - File table overflow</item>
+      <item><c>enodev</c> - No such device</item>
+      <item><c>enoent</c> - No such file or directory</item>
+      <item><c>enomem</c> - Not enough memory</item>
+      <item><c>enospc</c> - No space left on device</item>
+      <item><c>enotblk</c> - Block device required</item>
+      <item><c>enotdir</c> - Not a directory</item>
+      <item><c>enotsup</c> - Operation not supported</item>
+      <item><c>enxio</c> - No such device or address</item>
+      <item><c>eperm</c> - Not owner</item>
+      <item><c>epipe</c> - Broken pipe</item>
+      <item><c>erofs</c> - Read-only file system</item>
+      <item><c>espipe</c> - Invalid seek</item>
+      <item><c>esrch</c> - No such process</item>
+      <item><c>estale</c> - Stale remote file handle</item>
+      <item><c>exdev</c> - Cross-domain link</item>
     </list>
   </section>
 
   <section>
     <title>Performance</title>
-    <p>Some operating system file operations, for example a
-      <c>sync/1</c> or <c>close/1</c> on a huge file, may block their 
-      calling thread for seconds. If this befalls the emulator main
+    <p>Some operating system file operations, for example, a
+      <c>sync/1</c> or <c>close/1</c> on a huge file, can block their
+      calling thread for seconds. If this affects the emulator main
       thread, the response time is no longer in the order of
       milliseconds, depending on the definition of "soft" in soft
       real-time system.</p>
     <p>If the device driver thread pool is active, file operations are
       done through those threads instead, so the emulator can go on
       executing Erlang processes. Unfortunately, the time for serving a
-      file operation increases due to the extra scheduling required
+      file operation increases because of the extra scheduling required
       from the operating system.</p>
     <p>If the device driver thread pool is disabled or of size 0, large
-      file reads and writes are segmented into several smaller, which
-      enables the emulator so server other processes during the file
-      operation. This gives the same effect as when using the thread
+      file reads and writes are segmented into many smaller, which
+      enable the emulator to serve other processes during the file
+      operation. This has the same effect as when using the thread
       pool, but with larger overhead. Other file operations, for
-      example <c>sync/1</c> or <c>close/1</c> on a huge file, still are
+      example, <c>sync/1</c> or <c>close/1</c> on a huge file, still are
       a problem.</p>
     <p>For increased performance, raw files are recommended. Raw files
-      uses the file system of the node's host machine. For normal files
-      (non-raw), the file server is used to find the files, and if
-      the node is running its file server as slave to another node's,
-      and the other node runs on some other host machine, they may have
-      different file systems. This is seldom a problem, but you have
-      now been warned.</p>
-    <p>A normal file is really a process so it can be used as an IO
-      device (see <c>io</c>). Therefore when data is written to a
+      use the file system of the host machine of the node.</p>
+    <note>
+      <p>
+	For normal files (non-raw), the file server is used to find the files,
+	and if the node is running its file server as slave to the file server
+	of another node, and the other node runs on some other host machine,
+	they can have different file systems.
+        However, this is seldom a problem.</p>
+    </note>
+    <p>A normal file is really a process so it can be used as an I/O
+      device (see
+      <seealso marker="stdlib:io"><c>io</c></seealso>).
+      Therefore, when data is written to a
       normal file, the sending of the data to the file process, copies 
       all data that are not binaries. Opening the file in binary mode
       and writing binaries is therefore recommended. If the file is
       opened on another node, or if the file server runs as slave to
-      another node's, also binaries are copied.</p>
+      the file server of another node, also binaries are copied.</p>
     <p>Caching data to reduce the number of file operations, or rather
-      the number of calls to the file driver, will generally increase
+      the number of calls to the file driver, generally increases
       performance. The following function writes 4 MBytes in 23
       seconds when tested:</p>
     <code type="none"><![CDATA[
@@ -2023,10 +2171,12 @@ create_file_slow(FD, M, M) ->
 create_file_slow(FD, M, N) ->
     ok = file:write(FD, <<M:32/unsigned>>),
     create_file_slow(FD, M+1, N).]]></code>
+
     <p>The following, functionally equivalent, function collects 1024
       entries into a list of 128 32-byte binaries before each call to
-      <c>file:write/2</c> and so does the same work in 0.52 seconds,
-      which is 44 times faster.</p>
+      <seealso marker="#write/2"><c>write/2</c></seealso> and so
+      does the same work in 0.52 seconds,
+      which is 44 times faster:</p>
     <code type="none"><![CDATA[
 create_file(Name, N) when integer(N), N >= 0 ->
     {ok, FD} = file:open(Name, [raw, write, delayed_write, binary]),
@@ -2055,61 +2205,62 @@ create_file(FD, M, N0, R) when M + 8 =&lt; N0 ->
 create_file(FD, M, N0, R) ->
     N1 = N0-1,
     create_file(FD, M, N1, [<<N1:32/unsigned>> | R]).]]></code>
+
     <note>
       <p>Trust only your own benchmarks. If the list length in 
-        <c>create_file/2</c> above is increased, it will run slightly
-        faster, but consume more memory and cause more memory
+        <c>create_file/2</c> above is increased, it runs slightly
+        faster, but consumes more memory and causes more memory
         fragmentation. How much this affects your application is
-        something that this simple benchmark can not predict.</p>
-      <p>If the size of each binary is increased to 64 bytes, it will
-        also run slightly faster, but the code will be twice as clumsy.
-        In the current implementation are binaries larger than 64 bytes
+        something that this simple benchmark cannot predict.</p>
+      <p>If the size of each binary is increased to 64 bytes, it
+        also runs slightly faster, but the code is then twice as clumsy.
+        In the current implementation, binaries larger than 64 bytes are
         stored in memory common to all processes and not copied when
         sent between processes, while these smaller binaries are stored
         on the process heap and copied when sent like any other term.</p>
-      <p>So, with a binary size of 68 bytes <c>create_file/2</c> runs
-        30 percent slower then with 64 bytes, and will cause much more
-        memory fragmentation. Note that if the binaries were to be sent
-        between processes (for example a non-raw file) the results
+      <p>So, with a binary size of 68 bytes, <c>create_file/2</c> runs
+        30 percent slower than with 64 bytes, and causes much more
+        memory fragmentation. Notice that if the binaries were to be sent
+        between processes (for example, a non-raw file), the results
         would probably be completely different.</p>
     </note>
     <p>A raw file is really a port. When writing data to a port, it is
-      efficient to write a list of binaries. There is no need to
+      efficient to write a list of binaries. It is not needed to
       flatten a deep list before writing. On Unix hosts, scatter output,
       which writes a set of buffers in one operation, is used when
-      possible. In this way <c>file:write(FD, [Bin1, Bin2 | Bin3])</c>
-      will write the contents of the binaries without copying the data
-      at all except for perhaps deep down in the operating system
+      possible. In this way <c>write(FD, [Bin1, Bin2 | Bin3])</c>
+      writes the contents of the binaries without copying the data
+      at all, except for perhaps deep down in the operating system
       kernel.</p>
     <p>For raw files, <c>pwrite/2</c> and <c>pread/2</c> are
       efficiently implemented. The file driver is called only once for
       the whole operation, and the list iteration is done in the file
       driver.</p>
     <p>The options <c>delayed_write</c> and <c>read_ahead</c> to 
-      <c>file:open/2</c> makes the file driver cache data to reduce
+      <seealso marker="#open/2"><c>open/2</c></seealso>
+      make the file driver cache data to reduce
       the number of operating system calls. The function
-      <c>create_file/2</c> in the example above takes 60 seconds
-      seconds without the <c>delayed_write</c> option, which is 2.6
+      <c>create_file/2</c> in the recent example takes 60 seconds
+      without option <c>delayed_write</c>, which is 2.6
       times slower.</p>
-    <p>And, as a really bad example, <c>create_file_slow/2</c> above
-      without the <c>raw</c>, <c>binary</c> and <c>delayed_write</c>
-      options, that is it calls <c>file:open(Name, [write])</c>, needs
+    <p>As a bad example, <c>create_file_slow/2</c>
+      without options <c>raw</c>, <c>binary</c>, and <c>delayed_write</c>,
+      meaning it calls <c>open(Name, [write])</c>, needs
       1 min 20 seconds for the job, which is 3.5 times slower than
       the first example, and 150 times slower than the optimized
-      <c>create_file/2</c>. </p>
-  </section>
-
-  <section>
-    <title>Warnings</title>
-    <p>If an error occurs when accessing an open file with the <c>io</c>
-      module, the process which handles the file will exit. The dead
-      file process might hang if a process tries to access it later.
+      <c>create_file/2</c>.</p>
+      <warning>
+	<p>If an error occurs when accessing an open file with module
+      <seealso marker="stdlib:io"><c>io</c></seealso>,
+      the process handling the file exits. The dead
+      file process can hang if a process tries to access it later.
       This will be fixed in a future release.</p>
+      </warning>
   </section>
 
   <section>
-    <title>SEE ALSO</title>
-    <p><seealso marker="stdlib:filename">filename(3)</seealso></p>
+    <title>See Also</title>
+    <p><seealso marker="stdlib:filename"><c>filename(3)</c></seealso></p>
   </section>
 </erlref>
 
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index 456108a2fe..0d938d550b 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -30,68 +30,60 @@
     <checked></checked>
     <date>2007-03-21</date>
     <rev>A</rev>
-    <file>gen_sctp.sgml</file>
+    <file>gen_sctp.xml</file>
   </header>
   <module>gen_sctp</module>
-  <modulesummary>The gen_sctp module provides functions for communicating with sockets using the SCTP protocol.</modulesummary>
+  <modulesummary>Functions for communicating with sockets using the SCTP
+    protocol.</modulesummary>
   <description>
-    <p>The <c>gen_sctp</c> module provides functions for communicating with
+    <p>This module provides functions for communicating with
       sockets using the SCTP protocol. The implementation assumes that
       the OS kernel supports SCTP
-      <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">(RFC2960)</url> through the user-level
-      <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets API Extensions.</url>
-      During development this implementation was tested on 
-      Linux Fedora Core 5.0 (kernel 2.6.15-2054 or later is needed),
-      and on Solaris 10, 11. During OTP adaptation it was tested on
-      SUSE Linux Enterprise Server 10 (x86_64) kernel 2.6.16.27-0.6-smp,
-      with lksctp-tools-1.0.6, briefly on Solaris 10, and later on
-      SUSE Linux Enterprise Server 10 Service Pack 1 (x86_64)
-      kernel 2.6.16.54-0.2.3-smp with lksctp-tools-1.0.7,
-      and later also on FreeBSD 8.2.
-    </p>
-    <p>
-      This module was written for one-to-many style sockets
+      <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">(RFC 2960)</url>
+      through the user-level
+      <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets API Extensions</url>.</p>
+    <p>During development, this implementation was tested on:</p>
+    <list type="bulleted">
+      <item>Linux Fedora Core 5.0 (kernel 2.6.15-2054 or later is needed)</item>
+      <item>Solaris 10, 11</item>
+    </list>
+    <p>During OTP adaptation it was tested on:</p>
+    <list type="bulleted">
+      <item>SUSE Linux Enterprise Server 10 (x86_64) kernel 2.6.16.27-0.6-smp,
+        with lksctp-tools-1.0.6</item>
+      <item>Briefly on Solaris 10</item>
+      <item>SUSE Linux Enterprise Server 10 Service Pack 1 (x86_64)
+        kernel 2.6.16.54-0.2.3-smp with lksctp-tools-1.0.7</item>
+      <item>FreeBSD 8.2</item>
+    </list>
+    <p>This module was written for one-to-many style sockets
       (type <c>seqpacket</c>). With the addition of
-      <seealso marker="#peeloff/2">peeloff/2</seealso>, one-to-one style
-      sockets (type <c>stream</c>) were introduced.
-    </p>
-    <p>Record definitions for the <c>gen_sctp</c> module can be found using:</p>
-<pre>  -include_lib("kernel/include/inet_sctp.hrl").    </pre>
+      <seealso marker="#peeloff/2"><c>peeloff/2</c></seealso>,
+      one-to-one style sockets (type <c>stream</c>) were introduced.</p>
+    <p>Record definitions for this module can be found using:</p>
+    <pre>
+-include_lib("kernel/include/inet_sctp.hrl").</pre>
     <p>These record definitions use the "new" spelling 'adaptation',
       not the deprecated 'adaption', regardless of which
       spelling the underlying C API uses.</p>
   </description>
 
-  <section>
-    <marker id="contents"></marker>
-    <title>CONTENTS</title>
-    <list type="bulleted">
-      <item><seealso marker="#types">DATA TYPES</seealso></item>
-      <item><seealso marker="#exports">EXPORTS</seealso></item>
-      <item><seealso marker="#options">SCTP SOCKET OPTIONS</seealso></item>
-      <item><seealso marker="#examples">SCTP EXAMPLES</seealso></item>
-      <item><seealso marker="#seealso">SEE ALSO</seealso></item>
-    </list>
-    <marker id="types"></marker>
-  </section>
-
   <datatypes>
     <datatype>
       <name>assoc_id()</name>
       <desc>
         <p><marker id="type-assoc_id"/>
-	  An opaque term returned in for example #sctp_paddr_change{}
-          that identifies an association for an SCTP socket. The term
-          is opaque except for the special value <c>0</c> that has a
-          meaning such as "the whole endpoint" or "all future associations".
-        </p>
+          An opaque term returned in, for example, <c>#sctp_paddr_change{}</c>,
+          which identifies an association for an SCTP socket. The term
+          is opaque except for the special value <c>0</c>, which has a
+          meaning such as "the whole endpoint" or "all future associations".</p>
       </desc>
     </datatype>
     <datatype>
       <name name="option"/>
       <desc>
-        <p>One of the 
-          <seealso marker="#options">SCTP Socket Options.</seealso></p>
+        <p>One of the
+          <seealso marker="#options">SCTP Socket Options</seealso>.</p>
       </desc>
     </datatype>
     <datatype>
@@ -101,8 +93,8 @@
     <datatype>
       <name>sctp_socket()</name>
       <desc>
-        <p><marker id="type-sctp_socket"/>
-	 Socket identifier returned from <c>open/*</c>.</p>
+        <p><marker id="type-sctp_socket"/>Socket identifier returned from
+          <seealso marker="#open/0"><c>open/*</c></seealso>.</p>
         <marker id="exports"></marker>
       </desc>
     </datatype>
@@ -111,405 +103,438 @@
   <funcs>
     <func>
       <name name="abort" arity="2"/>
-      <fsummary>Abnormally terminate the association given by Assoc, without flushing of unsent data</fsummary>
+      <fsummary>Abnormally terminate the association specified by
+        <c>Assoc</c>, without flushing of unsent data.</fsummary>
       <desc>
-        <p>Abnormally terminates the association given by <c><anno>Assoc</anno></c>, without
+        <p>Abnormally terminates the association specified by
+          <c><anno>Assoc</anno></c>, without
           flushing of unsent data. The socket itself remains open. Other
-          associations opened on this socket are still valid, and it can be
-          used in new associations.</p>
+          associations opened on this socket are still valid, and the socket
+          can be used in new associations.</p>
       </desc>
     </func>
+
     <func>
       <name name="close" arity="1"/>
-      <fsummary>Completely close the socket and all associations on it</fsummary>
+      <fsummary>Close the socket and all associations on it.</fsummary>
       <desc>
-        <p>Completely closes the socket and all associations on it. The unsent
-          data is flushed as in <c>eof/2</c>. The <c>close/1</c> call 
+        <p>Closes the socket and all associations on it. The unsent
+          data is flushed as in <seealso marker="#eof/2"><c>eof/2</c></seealso>.
+          The <c>close/1</c> call
           is blocking or otherwise depending of the value of
-          the <seealso marker="inet#option-linger">linger</seealso> socket
-          <seealso marker="#options">option</seealso>.
-          If <c>close</c> does not linger or linger timeout expires,
+          the <seealso marker="inet#option-linger"><c>linger</c></seealso>
+          socket <seealso marker="#options">option</seealso>.
+          If <c>close</c> does not linger or linger time-out expires,
           the call returns and the data is flushed in the background.</p>
       </desc>
     </func>
+
     <func>
       <name name="connect" arity="4"/>
       <fsummary>Same as <c>connect(Socket, Addr, Port, Opts, infinity)</c>.</fsummary>
       <desc>
-        <p>Same as <c>connect(<anno>Socket</anno>, <anno>Addr</anno>, <anno>Port</anno>, <anno>Opts</anno>, infinity)</c>.</p>
+        <p>Same as <c>connect(<anno>Socket</anno>, <anno>Addr</anno>,
+          <anno>Port</anno>, <anno>Opts</anno>, infinity)</c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="connect" arity="5"/>
-      <fsummary>Establish a new association for the socket <c>Socket</c>, with a peer (SCTP server socket)</fsummary>
+      <fsummary>Establish a new association for socket <c>Socket</c>, with a
+        peer (SCTP server socket).</fsummary>
       <desc>
-        <p>Establishes a new association for the socket <c><anno>Socket</anno></c>,
-          with the peer (SCTP server socket) given by
-          <c><anno>Addr</anno></c> and <c><anno>Port</anno></c>. The <c><anno>Timeout</anno></c>,
-          is expressed in milliseconds. A socket can be associated with multiple peers.</p>
-
-        <p><em>WARNING:</em>Using a value of <c><anno>Timeout</anno></c> less than
-        the maximum time taken by the OS to establish an association (around 4.5 minutes
-        if the default values from RFC 4960 are used) can result in
-        inconsistent or incorrect return values. This is especially
-        relevant for associations sharing the same <c><anno>Socket</anno></c>
-        (i.e. source address and port) since the controlling process
-        blocks until <c>connect/*</c> returns.
-	  <seealso marker="#connect_init/4">connect_init/*</seealso>
-	  provides an alternative not subject to this limitation.</p>
-
+        <p>Establishes a new association for socket <c><anno>Socket</anno></c>,
+          with the peer (SCTP server socket) specified by
+          <c><anno>Addr</anno></c> and <c><anno>Port</anno></c>.
+          <c><anno>Timeout</anno></c>, is expressed in milliseconds.
+          A socket can be associated with multiple peers.</p>
+        <warning><p>Using a value of <c><anno>Timeout</anno></c> less than
+          the maximum time taken by the OS to establish an association (around
+          4.5 minutes if the default values from
+          <url href="https://tools.ietf.org/html/rfc4960">RFC 4960</url>
+          are used), can result
+          in inconsistent or incorrect return values. This is especially
+          relevant for associations sharing the same <c><anno>Socket</anno></c>
+          (that is, source address and port), as the controlling process
+          blocks until <c>connect/*</c> returns.
+          <seealso marker="#connect_init/4"><c>connect_init/*</c></seealso>
+          provides an alternative without this limitation.</p>
+        </warning>
         <p><marker id="record-sctp_assoc_change"></marker>
           The result of <c>connect/*</c> is an <c>#sctp_assoc_change{}</c>
-          event which contains, in particular, the new 
-          <seealso marker="#type-assoc_id">Association ID</seealso>.</p>
-<pre>   #sctp_assoc_change{
-        state             = atom(),
-        error             = atom(),
-        outbound_streams  = integer(),
-        inbound_streams   = integer(),
-        assoc_id          = assoc_id()
-  }        </pre>
+          event that contains, in particular, the new
+          <seealso marker="#type-assoc_id">Association ID</seealso>:</p>
+        <pre>
+#sctp_assoc_change{
+      state             = atom(),
+      error             = atom(),
+      outbound_streams  = integer(),
+      inbound_streams   = integer(),
+      assoc_id          = assoc_id()
+}</pre>
         <p>The number of outbound and inbound streams can be set by
-          giving an <c>sctp_initmsg</c> option to <c>connect</c>
-          as in:</p>
-<pre>  connect(Socket, Ip, Port>,
-        [{sctp_initmsg,#sctp_initmsg{num_ostreams=OutStreams,
-                                     max_instreams=MaxInStreams}}])        </pre>
+          giving an <c>sctp_initmsg</c> option to <c>connect</c> as in:</p>
+        <pre>
+connect(Socket, Ip, Port>,
+      [{sctp_initmsg,#sctp_initmsg{num_ostreams=OutStreams,
+                                   max_instreams=MaxInStreams}}])</pre>
         <p>All options <c><anno>Opt</anno></c> are set on the socket before the
-          association is attempted. If an option record has got undefined
+          association is attempted. If an option record has undefined
           field values, the options record is first read from the socket
-          for those values. In effect, <c><anno>Opt</anno></c> option records only
-          define field values to change before connecting.</p>
+          for those values. In effect, <c><anno>Opt</anno></c> option records
+          only define field values to change before connecting.</p>
         <p>The returned <c>outbound_streams</c> and <c>inbound_streams</c>
-          are the actual stream numbers on the socket, which may be different
-          from the requested values (<c>OutStreams</c> and <c>MaxInStreams</c>
+          are the stream numbers on the socket. These can be different
+          from the requested values (<c>OutStreams</c> and <c>MaxInStreams</c>,
           respectively) if the peer requires lower values.</p>
-        <p>The following values of <c>state</c> are possible:</p>
-        <list type="bulleted">
-          <item>
-            <p><c>comm_up</c>: association successfully established. This
-              indicates a successful completion of <c>connect</c>.</p>
-          </item>
-          <item>
-            <p><c>cant_assoc</c>: association cannot be established
-              (<c>connect/*</c> failure).</p>
-          </item>
-        </list>
-        <p>All other states do not normally occur in the output from
-          <c>connect/*</c>. Rather, they may occur in
+        <p><c>state</c> can have the following values:</p>
+        <taglist>
+          <tag><c>comm_up</c></tag>
+          <item><p>Association is successfully established. This
+            indicates a successful completion of <c>connect</c>.</p></item>
+          <tag><c>cant_assoc</c></tag>
+          <item><p>The association cannot be established
+            (<c>connect/*</c> failure).</p></item>
+        </taglist>
+        <p>Other states do not normally occur in the output from
+          <c>connect/*</c>. Rather, they can occur in
           <c>#sctp_assoc_change{}</c> events received instead of data in
-          <seealso marker="#recv/1">recv/*</seealso> calls.
-          All of them indicate losing the association due to various
-          error conditions, and are listed here for the sake of completeness.
-          The <c>error</c> field may provide more detailed diagnostics.</p>
-        <list type="bulleted">
-          <item>
-            <p><c>comm_lost</c>;</p>
-          </item>
-          <item>
-            <p><c>restart</c>;</p>
-          </item>
-          <item>
-            <p><c>shutdown_comp</c>.</p>
-          </item>
-        </list>
+          <seealso marker="#recv/1"><c>recv/*</c></seealso> calls.
+          All of them indicate losing the association because of various error
+          conditions, and are listed here for the sake of completeness:</p>
+        <taglist>
+          <tag><c>comm_lost</c></tag>
+          <item></item>
+          <tag><c>restart</c></tag>
+          <item></item>
+          <tag><c>shutdown_comp</c></tag>
+          <item></item>
+        </taglist>
+        <p>Field <c>error</c> can provide more detailed diagnostics.</p>
       </desc>
     </func>
+
     <func>
       <name name="connect_init" arity="4"/>
-      <fsummary>Same as <c>connect_init(Socket, Addr, Port, Opts, infinity)</c>.</fsummary>
+      <fsummary>Same as <c>connect_init(Socket, Addr, Port, Opts, infinity)</c>..</fsummary>
       <desc>
-        <p>Same as <c>connect_init(<anno>Socket</anno>, <anno>Addr</anno>, <anno>Port</anno>, <anno>Opts</anno>, infinity)</c>.</p>
+        <p>Same as <c>connect_init(<anno>Socket</anno>, <anno>Addr</anno>,
+          <anno>Port</anno>, <anno>Opts</anno>, infinity)</c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="connect_init" arity="5"/>
-      <fsummary>Initiate a new association for the socket <c>Socket</c>, with a peer (SCTP server socket)</fsummary>
+      <fsummary>Initiate a new association for socket <c>Socket</c>, with a
+        peer (SCTP server socket).</fsummary>
       <desc>
-        <p>Initiates a new association for the socket <c><anno>Socket</anno></c>,
-          with the peer (SCTP server socket) given by
+        <p>Initiates a new association for socket <c><anno>Socket</anno></c>,
+          with the peer (SCTP server socket) specified by
           <c><anno>Addr</anno></c> and <c><anno>Port</anno></c>.</p>
-	<p>The fundamental difference between this API
-	and <c>connect/*</c> is that the return value is that of the
-	underlying OS connect(2) system call. If <c>ok</c> is returned
-	then the result of the association establishement is received
-	by the calling process as
-	an <seealso marker="#record-sctp_assoc_change">
-	    #sctp_assoc_change{}</seealso>
-	event. The calling process must be prepared to receive this, or
-	poll for it using <c>recv/*</c> depending on the value of the
-	active option.</p>
-	<p>The parameters are as described
-	in <seealso marker="#connect/5">connect/*</seealso>, with the
-	exception of the <c><anno>Timeout</anno></c> value.</p>
-	<p>The timer associated with <c><anno>Timeout</anno></c> only supervises
-	IP resolution of <c><anno>Addr</anno></c></p>
+        <p>The fundamental difference between this API
+          and <c>connect/*</c> is that the return value is that of the
+          underlying OS <c>connect(2)</c> system call. If <c>ok</c> is returned,
+          the result of the association establishment is received
+          by the calling process as an
+          <seealso marker="#record-sctp_assoc_change"><c>#sctp_assoc_change{}</c></seealso>
+          event. The calling process must be prepared to receive this, or
+          poll for it using
+          <seealso marker="#recv/1"><c>recv/*</c></seealso>,
+          depending on the value of the active option.</p>
+        <p>The parameters are as described in
+          <seealso marker="#connect/5"><c>connect/*</c></seealso>,
+           except the <c><anno>Timeout</anno></c> value.</p>
+        <p>The timer associated with <c><anno>Timeout</anno></c> only supervises
+          IP resolution of <c><anno>Addr</anno></c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="controlling_process" arity="2"/>
-      <fsummary>Assign a new controlling process pid to the socket</fsummary>
+      <fsummary>Assign a new controlling process pid to the socket.</fsummary>
       <desc>
-        <p>Assigns a new controlling process <c><anno>Pid</anno></c> to <c><anno>Socket</anno></c>. Same implementation
-          as <c>gen_udp:controlling_process/2</c>.</p>
+        <p>Assigns a new controlling process <c><anno>Pid</anno></c> to
+          <c><anno>Socket</anno></c>. Same implementation as
+          <seealso marker="gen_udp:controlling_process/2"><c>gen_udp:controlling_process/2</c></seealso>.
+        </p>
       </desc>
     </func>
+
     <func>
       <name name="eof" arity="2"/>
-      <fsummary>Gracefully terminate the association given by Assoc, with flushing of all unsent data</fsummary>
+      <fsummary>Gracefully terminate the association specified by <c>Assoc</c>,
+        with flushing of all unsent data.</fsummary>
       <desc>
-        <p>Gracefully terminates the association given by <c><anno>Assoc</anno></c>, with
+        <p>Gracefully terminates the association specified by
+          <c><anno>Assoc</anno></c>, with
           flushing of all unsent data. The socket itself remains open. Other
-          associations opened on this socket are still valid, and it can be
-          used in new associations.</p>
+          associations opened on this socket are still valid. The socket can
+          be used in new associations.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="error_string" arity="1"/>
+      <fsummary>Translate an SCTP error number into a string.</fsummary>
+      <desc>
+        <p>Translates an SCTP error number from, for example,
+          <c>#sctp_remote_error{}</c> or <c>#sctp_send_failed{}</c> into
+          an explanatory string, or one of the atoms <c>ok</c> for no
+          error or <c>undefined</c> for an unrecognized error.</p>
       </desc>
     </func>
+
     <func>
       <name name="listen" arity="2" clause_i="1"/>
       <name name="listen" arity="2" clause_i="2"/>
       <fsummary>Set up a socket to listen.</fsummary>
       <desc>
         <p>Sets up a socket to listen on the IP address and port number
-	it is bound to.</p>
-	<p>For type <c>seqpacket</c> sockets (the default)
-	<c><anno>IsServer</anno></c> must be <c>true</c> or <c>false</c>.
-	In contrast to TCP, in SCTP there is no listening queue length.
-	If <c><anno>IsServer</anno></c> is <c>true</c> the socket accepts new associations, i.e.
-	it will become an SCTP server socket.</p>
-	<p>For type <c>stream</c> sockets <anno>Backlog</anno> defines
-	the backlog queue length just like in TCP.</p>
+          it is bound to.</p>
+        <p>For type <c>seqpacket</c>, sockets (the default)
+          <c><anno>IsServer</anno></c> must be <c>true</c> or <c>false</c>.
+          In contrast to TCP, there is no listening queue length in SCTP.
+          If <c><anno>IsServer</anno></c> is <c>true</c>, the socket accepts
+          new associations, that is, it becomes an SCTP server socket.</p>
+	<p>For type <c>stream</c>, sockets <anno>Backlog</anno> define
+          the backlog queue length just like in TCP.</p>
       </desc>
     </func>
+
     <func>
       <name name="open" arity="0"/>
       <name name="open" arity="1" clause_i="1"/>
       <name name="open" arity="1" clause_i="2"/>
       <name name="open" arity="2"/>
-      <fsummary>Create an SCTP socket and bind it to local addresses</fsummary>
+      <fsummary>Create an SCTP socket and binds it to local addresses.</fsummary>
       <desc>
-        <p>Creates an SCTP socket and binds it to the local addresses 
-          specified by all <c>{ip,<anno>IP</anno>}</c> (or synonymously <c>{ifaddr,<anno>IP</anno>}</c>)
-          options (this feature is called SCTP multi-homing).
-          The default <c><anno>IP</anno></c> and <c><anno>Port</anno></c> are <c>any</c>
+        <p>Creates an SCTP socket and binds it to the local addresses
+          specified by all <c>{ip,<anno>IP</anno>}</c> (or synonymously
+          <c>{ifaddr,<anno>IP</anno>}</c>)
+          options (this feature is called SCTP multi-homing). The default
+          <c><anno>IP</anno></c> and <c><anno>Port</anno></c> are <c>any</c>
           and <c>0</c>, meaning bind to all local addresses on any
-          one free port.</p>
-
-        <p>Other options are:</p>
+          free port.</p>
+        <p>Other options:</p>
         <taglist>
           <tag><c>inet6</c></tag>
           <item>
-            <p>Set up the socket for IPv6.</p>
+            <p>Sets up the socket for IPv6.</p>
           </item>
           <tag><c>inet</c></tag>
           <item>
-            <p>Set up the socket for IPv4. This is the default.</p>
+            <p>Sets up the socket for IPv4. This is the default.</p>
           </item>
         </taglist>
-
         <p>A default set of socket <seealso marker="#options">options</seealso>
-          is used. In particular, the socket is opened in 
+          is used. In particular, the socket is opened in
           <seealso marker="#option-binary">binary</seealso> and
           <seealso marker="#option-active">passive</seealso> mode,
-	  with <anno>SockType</anno> <c>seqpacket</c>,
-          and with reasonably large
+	  with <anno>SockType</anno> <c>seqpacket</c>, and with reasonably large
           <seealso marker="inet#option-sndbuf">kernel</seealso> and driver
-          <seealso marker="inet#option-buffer">buffers.</seealso></p>
+          <seealso marker="inet#option-buffer">buffers</seealso>.</p>
       </desc>
     </func>
+
     <func>
       <name name="peeloff" arity="2"/>
-      <fsummary>
-	Peel off a type <c>stream</c> socket from a type <c>seqpacket</c> one
-      </fsummary>
+      <fsummary>Peel off a type <c>stream</c> socket from a type
+        <c>seqpacket</c> one.</fsummary>
       <desc>
-	<p>
-	  Branch off an existing association <anno>Assoc</anno>
-	  in a socket <anno>Socket</anno> of type <c>seqpacket</c>
-	  (one-to-many style) into
-	  a new socket <anno>NewSocket</anno> of type <c>stream</c>
-	  (one-to-one style).
-	</p>
-	<p>
-	  The existing association argument <anno>Assoc</anno>
-	  can be either a
-	  <seealso marker="#record-sctp_assoc_change">
-	    #sctp_assoc_change{}
-	  </seealso>
-	  record as returned from e.g
-	  <seealso marker="#recv-2">recv/*</seealso>,
-	  <seealso marker="#connect-5">connect/*</seealso> or
-	  from a listening socket in active mode. Or it can be just
-	  the field <c>assoc_id</c> integer from such a record.
-	</p>
+        <p>Branches off an existing association <c><anno>Assoc</anno></c>
+          in a socket <c><anno>Socket</anno></c> of type <c>seqpacket</c>
+          (one-to-many style) into
+          a new socket <c><anno>NewSocket</anno></c> of type <c>stream</c>
+          (one-to-one style).</p>
+        <p>The existing association argument <c><anno>Assoc</anno></c>
+          can be either a
+          <seealso marker="#record-sctp_assoc_change"><c>#sctp_assoc_change{}</c></seealso>
+          record as returned from, for example,
+          <seealso marker="#recv-2"><c>recv/*</c></seealso>,
+          <seealso marker="#connect-5"><c>connect/*</c></seealso>, or
+	  from a listening socket in active mode. It can also be just
+	  the field <c>assoc_id</c> integer from such a record.</p>
       </desc>
     </func>
+
     <func>
       <name name="recv" arity="1"/>
       <name name="recv" arity="2"/>
-      <fsummary>Receive a message from a socket</fsummary>
+      <fsummary>Receive a message from a socket.</fsummary>
       <desc>
-        <p>Receives the <c><anno>Data</anno></c> message from any association of the socket.
-          If the receive times out <c>{error,timeout</c> is returned.
-          The default timeout is <c>infinity</c>.
-          <c><anno>FromIP</anno></c> and <c><anno>FromPort</anno></c> indicate the sender's address.</p>
-        <p><c><anno>AncData</anno></c> is a list of Ancillary Data items which
-          may be received along with the main <c><anno>Data</anno></c>.
+        <p>Receives the <c><anno>Data</anno></c> message from any association
+          of the socket.
+          If the receive times out, <c>{error,timeout}</c> is returned.
+          The default time-out is <c>infinity</c>. <c><anno>FromIP</anno></c>
+          and <c><anno>FromPort</anno></c> indicate the address of the
+          sender.</p>
+        <p><c><anno>AncData</anno></c> is a list of ancillary data items that
+          can be received along with the main <c><anno>Data</anno></c>.
           This list can be empty, or contain a single
-          <seealso marker="#record-sctp_sndrcvinfo">#sctp_sndrcvinfo{}</seealso>
-          record, if receiving of such ancillary data is enabled
-          (see option 
-          <seealso marker="#option-sctp_events">sctp_events</seealso>).
-          It is enabled by default, since such ancillary data
-          provide an easy way of determining the association and stream
-          over which the message has been received.
-          (An alternative way would be to get the Association ID from the
-          <c><anno>FromIP</anno></c> and <c><anno>FromPort</anno></c> using the
-          <seealso marker="#option-sctp_get_peer_addr_info">sctp_get_peer_addr_info</seealso> socket option,
-          but this would still not produce the Stream number).</p>
-        <p>The actual <c><anno>Data</anno></c> received may be a <c>binary()</c>,
-          or <c>list()</c> of bytes (integers in the range 0 through 255)
-          depending on the socket mode, or an SCTP Event.
-                    <marker id="sctp_events"></marker>
-
-          The following SCTP Events are possible:</p>
+          <seealso marker="#record-sctp_sndrcvinfo"><c>#sctp_sndrcvinfo{}</c></seealso>
+          record if receiving of such ancillary data is enabled (see option
+          <seealso marker="#option-sctp_events"><c>sctp_events</c></seealso>).
+          It is enabled by default, as such ancillary data
+          provides an easy way of determining the association and stream
+          over which the message is received.
+          (An alternative way is to get the association ID from
+          <c><anno>FromIP</anno></c> and <c><anno>FromPort</anno></c> using
+          socket option
+          <seealso marker="#option-sctp_get_peer_addr_info"><c>sctp_get_peer_addr_info</c></seealso>,
+          but this does still not produce the stream number).</p>
+        <p>The <c><anno>Data</anno></c> received can be a <c>binary()</c>
+          or a <c>list()</c> of bytes (integers in the range 0 through 255)
+          depending on the socket mode, or an SCTP event.</p>
+        <marker id="sctp_events"></marker>
+        <p>Possible SCTP events:</p>
         <list type="bulleted">
           <item>
-            <p><seealso marker="#record-sctp_sndrcvinfo">#sctp_sndrcvinfo{}</seealso></p>
+            <seealso marker="#record-sctp_sndrcvinfo"><c>#sctp_sndrcvinfo{}</c></seealso>
           </item>
           <item>
-            <p><seealso marker="#record-sctp_assoc_change">#sctp_assoc_change{}</seealso>;</p>
+            <seealso marker="#record-sctp_assoc_change"><c>#sctp_assoc_change{}</c></seealso>
           </item>
           <item>
-<pre>  #sctp_paddr_change{
-        addr      = {ip_address(),port()},
-        state     = atom(),
-        error     = integer(),
-        assoc_id  = assoc_id()
-  }            </pre>
-            <p>Indicates change of the status of the peer's IP address given by
-              <c>addr</c> within the association <c>assoc_id</c>.
-              Possible values of <c>state</c> (mostly self-explanatory) include:</p>
-            <list type="bulleted">
-              <item>
-                <p><c>addr_unreachable</c>;</p>
-              </item>
-              <item>
-                <p><c>addr_available</c>;</p>
-              </item>
-              <item>
-                <p><c>addr_removed</c>;</p>
-              </item>
-              <item>
-                <p><c>addr_added</c>;</p>
+            <pre>
+#sctp_paddr_change{
+      addr      = {ip_address(),port()},
+      state     = atom(),
+      error     = integer(),
+      assoc_id  = assoc_id()
+}</pre>
+            <p>Indicates change of the status of the IP address of the peer
+              specified by
+              <c>addr</c> within association <c>assoc_id</c>. Possible
+              values of <c>state</c> (mostly self-explanatory) include:</p>
+            <taglist>
+              <tag><c>addr_unreachable</c></tag>
+              <item></item>
+              <tag><c>addr_available</c></tag>
+              <item></item>
+              <tag><c>addr_removed</c></tag>
+              <item></item>
+              <tag><c>addr_added</c></tag>
+              <item></item>
+              <tag><c>addr_made_prim</c></tag>
+              <item></item>
+              <tag><c>addr_confirmed</c></tag>
+              <item></item>
+            </taglist>
+            <p>In case of an error (for example, <c>addr_unreachable</c>),
+              field <c>error</c> provides more diagnostics. In such cases,
+              event <c>#sctp_paddr_change{}</c> is automatically
+              converted into an <c>error</c> term returned by
+              <seealso marker="#recv/1"><c>recv</c></seealso>.
+              The <c>error</c> field value can be converted into a string using
+              <seealso marker="#error_string/1"><c>error_string/1</c></seealso>.
+            </p>
+          </item>
+          <item>
+          <pre>
+#sctp_send_failed{
+      flags     = true | false,
+      error     = integer(),
+      info      = #sctp_sndrcvinfo{},
+      assoc_id  = assoc_id()
+      data      = binary()
+}</pre>
+            <p>The sender can receive this event if a send operation fails.</p>
+            <taglist>
+              <tag><c>flags</c></tag>
+              <item><p>A Boolean specifying if the data has been transmitted
+                over the wire.</p></item>
+              <tag><c>error</c></tag>
+              <item><p>Provides extended diagnostics, use
+                <seealso marker="#error_string/1"><c>error_string/1</c>.</seealso></p>
               </item>
-              <item>
-                <p><c>addr_made_prim</c>.</p>
+              <tag><c>info</c></tag>
+              <item><p>The original
+                <seealso marker="#record-sctp_sndrcvinfo"><c>#sctp_sndrcvinfo{}</c></seealso>
+                record used in the failed
+                <seealso marker="#send/3"><c>send/*</c>.</seealso></p>
               </item>
-              <item>
-                <p><c>addr_confirmed</c>.</p>
+              <tag><c>data</c></tag>
+              <item><p>The whole original data chunk attempted to be sent.</p>
               </item>
-            </list>
-            <p>In case of an error (e.g. <c>addr_unreachable</c>), the
-              <c>error</c> field provides additional diagnostics. In such cases,
-              the <c>#sctp_paddr_change{}</c> Event is automatically 
-              converted into an <c>error</c> term returned by 
-              <c>gen_sctp:recv</c>. The <c>error</c> field value can be
-              converted into a string using <c>error_string/1</c>.</p>
-          </item>
-          <item>
-<pre>  #sctp_send_failed{
-        flags     = true | false,
-        error     = integer(),
-        info      = #sctp_sndrcvinfo{},
-        assoc_id  = assoc_id()
-        data      = binary()
-  }            </pre>
-            <p>The sender may receive this event if a send operation fails.
-              The <c>flags</c> is a Boolean specifying whether the data have
-              actually been transmitted over the wire; <c>error</c> provides
-              extended diagnostics, use <c>error_string/1</c>;
-              <c>info</c> is the original
-              <seealso marker="#record-sctp_sndrcvinfo">#sctp_sndrcvinfo{}</seealso> record used in the failed
-              <seealso marker="#send/3">send/*,</seealso> and <c>data</c> 
-              is the whole original data chunk attempted to be sent.</p>
+            </taglist>
             <p>In the current implementation of the Erlang/SCTP binding,
-              this Event is internally converted into an <c>error</c> term 
-              returned by <c>recv/*</c>.</p>
+              this event is internally converted into an <c>error</c> term
+              returned by
+              <seealso marker="#recv/1"><c>recv/*</c></seealso>.</p>
           </item>
           <item>
-<pre>  #sctp_adaptation_event{
-        adaptation_ind = integer(),
-        assoc_id       = assoc_id()
-  }            </pre>
-            <p>Delivered when a peer sends an Adaptation Layer Indication
-              parameter (configured through the option
-              <seealso marker="#option-sctp_adaptation_layer">sctp_adaptation_layer</seealso>).
-              Note that with the current implementation of
+          <pre>
+#sctp_adaptation_event{
+      adaptation_ind = integer(),
+      assoc_id       = assoc_id()
+}</pre>
+            <p>Delivered when a peer sends an adaptation layer indication
+              parameter (configured through option
+              <seealso marker="#option-sctp_adaptation_layer"><c>sctp_adaptation_layer</c></seealso>).
+              Notice that with the current implementation of
               the Erlang/SCTP binding, this event is disabled by default.</p>
           </item>
           <item>
-<pre>  #sctp_pdapi_event{
-        indication = sctp_partial_delivery_aborted,
-        assoc_id   = assoc_id()
-  }            </pre>
+          <pre>
+#sctp_pdapi_event{
+      indication = sctp_partial_delivery_aborted,
+      assoc_id   = assoc_id()
+}</pre>
             <p>A partial delivery failure. In the current implementation of
-              the Erlang/SCTP binding, this Event is internally converted
-              into an <c>error</c> term returned by <c>recv/*</c>.</p>
+              the Erlang/SCTP binding, this event is internally converted
+              into an <c>error</c> term returned by
+              <seealso marker="#recv/1"><c>recv/*</c></seealso>.</p>
           </item>
         </list>
       </desc>
     </func>
+
     <func>
       <name name="send" arity="3"/>
-      <fsummary>Send a message using an <c>#sctp_sndrcvinfo{}</c>record</fsummary>
+      <fsummary>Send a message using an <c>#sctp_sndrcvinfo{}</c>record.</fsummary>
       <desc>
-        <p>Sends the <c><anno>Data</anno></c> message with all sending parameters from a
-          <seealso marker="#record-sctp_sndrcvinfo">#sctp_sndrcvinfo{}</seealso> record.
-          This way, the user can specify the PPID (passed to the remote end)
-          and Context (passed to the local SCTP layer) which can be used
-          for example for error identification.
+        <p>Sends the <c><anno>Data</anno></c> message with all sending
+          parameters from a
+          <seealso marker="#record-sctp_sndrcvinfo"><c>#sctp_sndrcvinfo{}</c></seealso>
+          record. This way, the user can specify the PPID (passed to the remote
+          end) and context (passed to the local SCTP layer), which can be used,
+          for example, for error identification.
           However, such a fine level of user control is rarely required.
-          The send/4 function is sufficient for most applications.</p>
+          The function <c>send/4</c> is sufficient for most applications.</p>
       </desc>
     </func>
+
     <func>
       <name name="send" arity="4"/>
-      <fsummary>Send a message over an existing association and given stream</fsummary>
+      <fsummary>Send a message over an existing association and specified
+        stream.</fsummary>
       <desc>
-        <p>Sends <c><anno>Data</anno></c> message over an existing association and given
-          stream.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="error_string" arity="1"/>
-      <fsummary>Translate an SCTP error number into a string</fsummary>
-      <desc>
-        <p>Translates an SCTP error number from for example 
-          <c>#sctp_remote_error{}</c> or <c>#sctp_send_failed{}</c> into
-          an explanatory string, or one of the atoms <c>ok</c> for no
-          error and <c>undefined</c> for an unrecognized error.</p>
+        <p>Sends a <c><anno>Data</anno></c> message over an existing association
+          and specified stream.</p>
       </desc>
     </func>
   </funcs>
 
   <section>
     <marker id="options"></marker>
-    <title>SCTP SOCKET OPTIONS</title>
+    <title>SCTP Socket Options</title>
     <p>The set of admissible SCTP socket options is by construction
-      orthogonal to the sets of TCP, UDP and generic INET options:
-      only those options which are explicitly listed below are allowed
+      orthogonal to the sets of TCP, UDP, and generic <c>inet</c> options.
+      Only options listed here are allowed
       for SCTP sockets. Options can be set on the socket using
-      <seealso marker="#open/1"><c>gen_sctp:open/1,2</c></seealso>
-      or <seealso marker="inet#setopts/2"><c>inet:setopts/2</c></seealso>,
-      retrieved using <seealso marker="inet#getopts/2"><c>inet:getopts/2</c></seealso>,
-      and when calling <seealso marker="#connect/4"><c>gen_sctp:connect/4,5</c></seealso>
-      options can be changed.</p>
+      <seealso marker="#open/1"><c>open/1,2</c></seealso> or
+      <seealso marker="inet#setopts/2"><c>inet:setopts/2</c></seealso>,
+      retrieved using
+      <seealso marker="inet#getopts/2"><c>inet:getopts/2</c></seealso>.
+      Options can be changed when calling
+      <seealso marker="#connect/4"><c>connect/4,5</c></seealso>.</p>
     <marker id="option-binary"></marker>
     <marker id="option-list"></marker>
     <taglist>
       <tag><c>{mode, list|binary}</c> or just <c>list</c> or <c>binary</c></tag>
       <item>
-        <p>Determines the type of data returned from <c>gen_sctp:recv/1,2</c>.</p>
+        <p>Determines the type of data returned from
+          <seealso marker="#recv/1"><c>recv/1,2</c></seealso>.</p>
         <marker id="option-active"></marker>
       </item>
       <tag><c>{active, true|false|once|N}</c></tag>
@@ -517,176 +542,177 @@
         <list type="bulleted">
           <item>
             <p>If <c>false</c> (passive mode, the default),
-              the caller needs to do an explicit <c>gen_sctp:recv</c> call
-              in order to retrieve the available data from the socket.</p>
+              the caller must do an explicit
+              <seealso marker="#recv/1"><c>recv</c></seealso> call
+              to retrieve the available data from the socket.</p>
           </item>
           <item>
             <p>If <c>true</c> (full active mode), the pending data or events are
               sent to the owning process.</p>
-            <p><em>NB:</em> This can cause the message queue to overflow,
+            <p>Notice that this can cause the message queue to overflow,
               as there is no way to throttle the sender in this case
-              (no flow control!).</p>
+              (no flow control).</p>
           </item>
           <item>
             <p>If <c>once</c>, only one message is automatically placed
               in the message queue, and after that the mode is automatically
-              reset to passive. This provides flow control as well as
+              reset to passive. This provides flow control and
               the possibility for the receiver to listen for its incoming
               SCTP data interleaved with other inter-process messages.</p>
           </item>
           <item>
             <p>If <c>active</c> is specified as an integer <c>N</c> in the
-              range -32768 to 32767 (inclusive), then that number is added to
-              the socket's count of the number of data messages to be
+              range -32768 to 32767 (inclusive), that number is added to
+              the socket's counting of data messages to be
               delivered to the controlling process. If the result of the
-              addition would be negative, the count is set to 0. Once the
-              count reaches 0, either through the delivery of messages or by
-              being explicitly set with <seealso
-              marker="inet#setopts/2">inet:setopts/2</seealso>, the socket's
-              mode is automatically reset to passive (<c>{active,
-              false}</c>) mode. When a socket in this active mode transitions to
+              addition is negative, the count is set to <c>0</c>. Once the
+              count reaches <c>0</c>, either through the delivery of messages
+              or by being explicitly set with
+              <seealso marker="inet#setopts/2"><c>inet:setopts/2</c></seealso>,
+              the socket mode is automatically reset to passive (<c>{active,
+              false}</c>). When a socket in this active mode transitions to
               passive mode, the message <c>{sctp_passive, Socket}</c> is sent
               to the controlling process to notify it that if it wants to
               receive more data messages from the socket, it must call
-              <seealso marker="inet#setopts/2">inet:setopts/2</seealso> to set
-              the socket back into an active mode.</p>
+              <seealso marker="inet#setopts/2"><c>inet:setopts/2</c></seealso>
+              to set the socket back into an active mode.</p>
           </item>
         </list>
       </item>
-     <tag><c>{tos, integer()}</c></tag>
+      <tag><c>{tos, integer()}</c></tag>
       <item>
-        <p>Sets the Type-Of-Service field on the IP datagrams being sent,
-          to the given value, which effectively determines a prioritization
+        <p>Sets the Type-Of-Service field on the IP datagrams that are sent,
+          to the specified value. This effectively determines a prioritization
           policy for the outbound packets. The acceptable values
-          are system-dependent. TODO: we do not provide
-          symbolic names for these values yet.</p>
+          are system-dependent.</p>
       </item>
       <tag><c>{priority, integer()}</c></tag>
       <item>
         <p>A protocol-independent equivalent of <c>tos</c> above. Setting
-          priority implies setting tos as well.</p>
+          priority implies setting <c>tos</c> as well.</p>
       </item>
       <tag><c>{dontroute, true|false}</c></tag>
       <item>
-        <p>By default <c>false</c>. If <c>true</c>, the kernel does not
-          send packets via any gateway, only sends them to directly
+        <p>Defaults to <c>false</c>. If <c>true</c>, the kernel does not
+          send packets through any gateway, only sends them to directly
           connected hosts.</p>
       </item>
       <tag><c>{reuseaddr, true|false}</c></tag>
       <item>
-        <p>By default <c>false</c>. If true, the local binding address
-          <c>{IP,Port}</c> of the socket can be re-used immediately:
-          no waiting in the CLOSE_WAIT state is performed (may be
+        <p>Defaults to <c>false</c>. If true, the local binding address
+          <c>{IP,Port}</c> of the socket can be reused immediately.
+          No waiting in state <c>CLOSE_WAIT</c> is performed (can  be
           required for high-throughput servers).</p>
       </item>
-	  <tag><c>{sndbuf, integer()}</c></tag>
+      <tag><c>{sndbuf, integer()}</c></tag>
       <item>
-        <p>The size, in bytes, of the *kernel* send buffer for this socket.
+        <p>The size, in bytes, of the OS kernel send buffer for this socket.
           Sending errors would occur for datagrams larger than
           <c>val(sndbuf)</c>. Setting this option also adjusts
           the size of the driver buffer (see <c>buffer</c> above).</p>
       </item>
       <tag><c>{recbuf, integer()}</c></tag>
       <item>
-        <p>The size, in bytes, of the *kernel* recv buffer for this socket.
+        <p>The size, in bytes, of the OS kernel receive buffer for this socket.
           Sending errors would occur for datagrams larger than
-          <c>val(sndbuf)</c>. Setting this option also adjusts
+          <c>val(recbuf)</c>. Setting this option also adjusts
           the size of the driver buffer (see <c>buffer</c> above).</p>
       </item>
-
-		  <tag><c>{sctp_module, module()}</c></tag>
-		  <item> <p>
-				  Override which callback module is used. Defaults to
-				  <c>inet_sctp</c> for IPv4 and <c>inet6_sctp</c> for IPv6.
-			  </p>
-		  </item>
-
-
+      <tag><c>{sctp_module, module()}</c></tag>
+      <item>
+        <p>Overrides which callback module is used. Defaults to
+          <c>inet_sctp</c> for IPv4 and <c>inet6_sctp</c> for IPv6.</p>
+      </item>
       <tag><c>{sctp_rtoinfo, #sctp_rtoinfo{}}</c></tag>
       <item>
-<pre>  #sctp_rtoinfo{
-        assoc_id = assoc_id(),
-        initial  = integer(),
-        max      = integer(),
-        min      = integer()
-  }        </pre>
-        <p>Determines re-transmission time-out parameters, in milliseconds,
-          for the association(s) given by <c>assoc_id</c>. 
-          If <c>assoc_id = 0</c> (default) indicates the whole endpoint. See
-          <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC2960</url> and
-          <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets API Extensions for SCTP</url> for the exact semantics of the fields values.</p>
+      <pre>
+#sctp_rtoinfo{
+      assoc_id = assoc_id(),
+      initial  = integer(),
+      max      = integer(),
+      min      = integer()
+}</pre>
+        <p>Determines retransmission time-out parameters, in milliseconds,
+          for the association(s) specified by <c>assoc_id</c>.</p>
+        <p><c>assoc_id = 0</c> (default) indicates the whole endpoint. See
+          <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC
+          2960</url> and
+          <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets
+          API Extensions for SCTP</url>
+          for the exact semantics of the field values.</p>
       </item>
       <tag><c>{sctp_associnfo, #sctp_assocparams{}}</c></tag>
       <item>
-<pre>  #sctp_assocparams{
-        assoc_id                 = assoc_id(),
-        asocmaxrxt               = integer(),
-        number_peer_destinations = integer(),
-        peer_rwnd                = integer(),
-        local_rwnd               = integer(),
-        cookie_life              = integer()
-  }        </pre>
-        <p>Determines association parameters for the association(s) given by
-          <c>assoc_id</c>. <c>assoc_id = 0</c> (default) indicates
-          the whole endpoint. See 
-          <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets API Extensions for SCTP</url> for the discussion of their semantics. Rarely used.</p>
+      <pre>
+#sctp_assocparams{
+      assoc_id                 = assoc_id(),
+      asocmaxrxt               = integer(),
+      number_peer_destinations = integer(),
+      peer_rwnd                = integer(),
+      local_rwnd               = integer(),
+      cookie_life              = integer()
+}</pre>
+        <p>Determines association parameters for the association(s) specified by
+          <c>assoc_id</c>.</p>
+        <p><c>assoc_id = 0</c> (default) indicates the whole endpoint. See
+          <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets API Extensions for SCTP</url>
+          for the discussion of their semantics. Rarely used.</p>
       </item>
       <tag><c>{sctp_initmsg, #sctp_initmsg{}}</c></tag>
       <item>
-<pre>  #sctp_initmsg{
-       num_ostreams   = integer(),
-       max_instreams  = integer(),
-       max_attempts   = integer(),
-       max_init_timeo = integer()
-  }        </pre>
-        <p>Determines the default parameters which this socket attempts
+      <pre>
+#sctp_initmsg{
+     num_ostreams   = integer(),
+     max_instreams  = integer(),
+     max_attempts   = integer(),
+     max_init_timeo = integer()
+}</pre>
+        <p>Determines the default parameters that this socket tries
           to negotiate with its peer while establishing an association with it.
-          Should be set after <c>open/*</c> but before the first
-          <c>connect/*</c>. <c>#sctp_initmsg{}</c> can also be used
-          as ancillary data with the first call of <c>send/*</c> to
+          Is to be set after
+          <seealso marker="#open/1"><c>open/*</c></seealso>
+          but before the first
+          <seealso marker="#connect/4"><c>connect/*</c></seealso>.
+          <c>#sctp_initmsg{}</c> can also be used
+          as ancillary data with the first call of
+          <seealso marker="#send/3"><c>send/*</c></seealso> to
           a new peer (when a new association is created).</p>
-        <list type="bulleted">
-          <item>
-            <p><c>num_ostreams</c>: number of outbound streams;</p>
-          </item>
-          <item>
-            <p><c>max_instreams</c>: max number of in-bound streams;</p>
-          </item>
-          <item>
-            <p><c>max_attempts</c>: max re-transmissions while
-              establishing an association;</p>
-          </item>
-          <item>
-            <p><c>max_init_timeo</c>: time-out in milliseconds
-              for establishing an association.</p>
-          </item>
-        </list>
+        <taglist>
+          <tag><c>num_ostreams</c></tag>
+          <item>Number of outbound streams</item>
+          <tag><c>max_instreams</c></tag>
+          <item>Maximum number of inbound streams</item>
+          <tag><c>max_attempts</c></tag>
+          <item>Maximum retransmissions while establishing an association</item>
+          <tag><c>max_init_timeo</c></tag>
+          <item>Time-out, in milliseconds, for establishing an association</item>
+        </taglist>
       </item>
       <tag><c>{sctp_autoclose, integer() >= 0}</c></tag>
       <item>
-        <p>Determines the time (in seconds) after which an idle association is
+        <p>Determines the time, in seconds, after which an idle association is
           automatically closed. <c>0</c> means that the association is
           never automatically closed.</p>
       </item>
       <tag><c>{sctp_nodelay, true|false}</c></tag>
       <item>
         <p>Turns on|off the Nagle algorithm for merging small packets
-          into larger ones (which improves throughput at the expense
-          of latency).</p>
+          into larger ones. This improves throughput at the expense
+          of latency.</p>
       </item>
       <tag><c>{sctp_disable_fragments, true|false}</c></tag>
       <item>
         <p>If <c>true</c>, induces an error on an attempt to send
-          a message which is larger than the current PMTU size
-          (which would require fragmentation/re-assembling).
-          Note that message fragmentation does not affect
+          a message larger than the current PMTU size
+          (which would require fragmentation/reassembling).
+          Notice that message fragmentation does not affect
           the logical atomicity of its delivery; this option
           is provided for performance reasons only.</p>
       </item>
       <tag><c>{sctp_i_want_mapped_v4_addr, true|false}</c></tag>
       <item>
         <p>Turns on|off automatic mapping of IPv4 addresses into IPv6 ones
-          (if the socket address family is AF_INET6).</p>
+          (if the socket address family is <c>AF_INET6</c>).</p>
       </item>
       <tag><c>{sctp_maxseg, integer()}</c></tag>
       <item>
@@ -695,176 +721,171 @@
       </item>
       <tag><c>{sctp_primary_addr, #sctp_prim{}}</c></tag>
       <item>
-<pre>  #sctp_prim{
-        assoc_id = assoc_id(),
-        addr     = {IP, Port}
-  }
-  IP = ip_address()
-  Port = port_number()        </pre>
-        <p>For the association given by <c>assoc_id</c>,
-          <c>{IP,Port}</c> must be one of the peer's addresses.
-          This option determines that the given address is
-          treated by the local SCTP stack as the peer's primary address.</p>
+      <pre>
+#sctp_prim{
+      assoc_id = assoc_id(),
+      addr     = {IP, Port}
+}
+ IP = ip_address()
+ Port = port_number()</pre>
+        <p>For the association specified by <c>assoc_id</c>,
+          <c>{IP,Port}</c> must be one of the peer addresses.
+          This option determines that the specified address is treated by
+          the local SCTP stack as the primary address of the peer.</p>
       </item>
       <tag><c>{sctp_set_peer_primary_addr, #sctp_setpeerprim{}}</c></tag>
       <item>
-<pre>  #sctp_setpeerprim{
-        assoc_id = assoc_id(),
-        addr     = {IP, Port}
-  }
-  IP = ip_address()
-  Port = port_number()        </pre>
-        <p>When set, informs the peer that it should use <c>{IP, Port}</c>
+      <pre>
+#sctp_setpeerprim{
+      assoc_id = assoc_id(),
+      addr     = {IP, Port}
+}
+ IP = ip_address()
+ Port = port_number()</pre>
+        <p>When set, informs the peer to use <c>{IP, Port}</c>
           as the primary address of the local endpoint for the association
-          given by <c>assoc_id</c>.</p>
+          specified by <c>assoc_id</c>.</p>
         <marker id="option-sctp_adaptation_layer"></marker>
       </item>
       <tag><c>{sctp_adaptation_layer, #sctp_setadaptation{}}</c></tag>
       <item>
         <marker id="record-sctp_setadaptation"></marker>
-<pre>  #sctp_setadaptation{
-        adaptation_ind = integer()
-  }        </pre>
-        <p>When set, requests that the local endpoint uses the value given by
-          <c>adaptation_ind</c> as the Adaptation Indication parameter for
-          establishing new associations. See
-          <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC2960</url> and
-          <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets API Extenstions for SCTP</url> for more details.</p>
+      <pre>
+#sctp_setadaptation{
+      adaptation_ind = integer()
+}</pre>
+        <p>When set, requests that the local endpoint uses the value specified
+          by <c>adaptation_ind</c> as the Adaptation Indication parameter for
+          establishing new associations. For details, see
+          <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC 2960</url>
+          and
+          <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets
+          API Extenstions for SCTP</url>.</p>
       </item>
       <tag><c>{sctp_peer_addr_params, #sctp_paddrparams{}}</c></tag>
       <item>
-<pre>  #sctp_paddrparams{
-        assoc_id   = assoc_id(),
-        address    = {IP, Port},
-        hbinterval = integer(),
-        pathmaxrxt = integer(),
-        pathmtu    = integer(),
-        sackdelay  = integer(),
-        flags      = list()
-  }
-  IP = ip_address()
-  Port = port_number()        </pre>
-        <p>This option determines various per-address parameters for
-          the association given by <c>assoc_id</c> and the peer address
-          <c>address</c> (the SCTP protocol supports multi-homing,
-          so more than 1 address can correspond to a given association).</p>
-        <list type="bulleted">
-          <item>
-            <p><c>hbinterval</c>: heartbeat interval, in milliseconds;</p>
-          </item>
-          <item>
-            <p><c>pathmaxrxt</c>: max number of retransmissions
-              before this address is considered unreachable (and an
-              alternative address is selected);</p>
-          </item>
-          <item>
-            <p><c>pathmtu</c>: fixed Path MTU, if automatic discovery is
-              disabled (see <c>flags</c> below);</p>
-          </item>
-          <item>
-            <p><c>sackdelay</c>: delay in milliseconds for SAC messages
-              (if the delay is enabled, see <c>flags</c> below);</p>
-          </item>
-          <item>
-            <p><c>flags</c>: the following flags are available:</p>
-            <list type="bulleted">
-              <item>
-                <p><c>hb_enable</c>:  enable heartbeat; </p>
-              </item>
-              <item>
-                <p><c>hb_disable</c>: disable heartbeat;</p>
-              </item>
-              <item>
-                <p><c>hb_demand</c>: initiate heartbeat immediately;</p>
-              </item>
-              <item>
-                <p><c>pmtud_enable</c>: enable automatic Path MTU discovery;</p>
-              </item>
-              <item>
-                <p><c>pmtud_disable</c>: disable automatic Path MTU discovery;</p>
-              </item>
-              <item>
-                <p><c>sackdelay_enable</c>: enable SAC delay;</p>
-              </item>
-              <item>
-                <p><c>sackdelay_disable</c>: disable SAC delay.</p>
-              </item>
-            </list>
+        <pre>
+#sctp_paddrparams{
+      assoc_id   = assoc_id(),
+      address    = {IP, Port},
+      hbinterval = integer(),
+      pathmaxrxt = integer(),
+      pathmtu    = integer(),
+      sackdelay  = integer(),
+      flags      = list()
+}
+IP = ip_address()
+Port = port_number()</pre>
+        <p>Determines various per-address parameters for
+          the association specified by <c>assoc_id</c> and the peer address
+          <c>address</c> (the SCTP protocol supports multi-homing, so
+          more than one address can correspond to a specified association).</p>
+        <taglist>
+          <tag><c>hbinterval</c></tag>
+          <item><p>Heartbeat interval, in milliseconds</p></item>
+          <tag><c>pathmaxrxt</c></tag>
+          <item><p>Maximum number of retransmissions before this address is
+            considered unreachable (and an alternative address is selected)</p>
           </item>
-        </list>
+          <tag><c>pathmtu</c></tag>
+          <item><p>Fixed Path MTU, if automatic discovery is disabled (see
+            <c>flags</c> below)</p></item>
+          <tag><c>sackdelay</c></tag>
+          <item><p>Delay, in milliseconds, for SAC messages (if the delay is
+            enabled, see <c>flags</c> below)</p></item>
+          <tag><c>flags</c></tag>
+          <item><p>The following flags are available:</p>
+            <taglist>
+              <tag><c>hb_enable</c></tag>
+              <item>Enables heartbeat</item>
+              <tag><c>hb_disable</c></tag>
+              <item>Disables heartbeat</item>
+              <tag><c>hb_demand</c></tag>
+              <item>Initiates heartbeat immediately</item>
+              <tag><c>pmtud_enable</c></tag>
+              <item>Enables automatic Path MTU discovery</item>
+              <tag><c>pmtud_disable</c></tag>
+              <item>Disables automatic Path MTU discovery</item>
+              <tag><c>sackdelay_enable</c></tag>
+              <item>Enables SAC delay</item>
+              <tag><c>sackdelay_disable</c></tag>
+              <item>Disables SAC delay</item>
+            </taglist></item>
+        </taglist>
       </item>
       <tag><c>{sctp_default_send_param, #sctp_sndrcvinfo{}}</c></tag>
       <item>
         <marker id="record-sctp_sndrcvinfo"></marker>
-<pre>  #sctp_sndrcvinfo{
-        stream     = integer(),
-        ssn        = integer(),
-        flags      = list(),
-        ppid       = integer(),
-        context    = integer(),
-        timetolive = integer(),
-        tsn        = integer(),
-        cumtsn     = integer(),
-        assoc_id   = assoc_id()
-  }        </pre>
+        <pre>
+#sctp_sndrcvinfo{
+      stream     = integer(),
+      ssn        = integer(),
+      flags      = list(),
+      ppid       = integer(),
+      context    = integer(),
+      timetolive = integer(),
+      tsn        = integer(),
+      cumtsn     = integer(),
+      assoc_id   = assoc_id()
+}</pre>
         <p><c>#sctp_sndrcvinfo{}</c> is used both in this socket option, and as
           ancillary data while sending or receiving SCTP messages. When
-          set as an option, it provides a default values for subsequent
-          <c>gen_sctp:send</c>calls on the association given by
-          <c>assoc_id</c>. <c>assoc_id = 0</c> (default) indicates
-          the whole endpoint. The following fields typically need
-          to be specified by the sender:</p>
-        <list type="bulleted">
-          <item>
-            <p><c>sinfo_stream</c>: stream number (0-base) within the association
-              to send the messages through;</p>
-          </item>
-          <item>
-            <p><c>sinfo_flags</c>: the following flags are recognised:</p>
-            <list type="bulleted">
-              <item>
-                <p><c>unordered</c>: the message is to be sent unordered;</p>
-              </item>
-              <item>
-                <p><c>addr_over</c>: the address specified in
-                  <c>gen_sctp:send</c> overwrites the primary peer address;</p>
-              </item>
-              <item>
-                <p><c>abort</c>: abort the current association without
-                  flushing any unsent data;</p>
-              </item>
-              <item>
-                <p><c>eof</c>: gracefully shut down the current
-                  association, with flushing of unsent data.</p>
-              </item>
-            </list>
-            <p>Other fields are rarely used. See 
-              <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC2960</url> and 
-              <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets API Extensions for SCTP</url> for full information.</p>
-          </item>
-        </list>
+          set as an option, it provides default values for subsequent
+          <seealso marker="#send/3"><c>send</c></seealso>
+          calls on the association specified by
+          <c>assoc_id</c>.</p>
+        <p><c>assoc_id = 0</c> (default) indicates
+          the whole endpoint.</p>
+        <p>The following fields typically must be specified by the sender:</p>
+        <taglist>
+          <tag><c>sinfo_stream</c></tag>
+          <item><p>Stream number (0-base) within the association
+            to send the messages through;</p></item>
+          <tag><c>sinfo_flags</c></tag>
+          <item><p>The following flags are recognised:</p>
+            <taglist>
+              <tag><c>unordered</c></tag>
+              <item>The message is to be sent unordered</item>
+              <tag><c>addr_over</c></tag>
+              <item>The address specified in
+                <seealso marker="#send/3"><c>send</c></seealso>
+                overwrites the primary peer address</item>
+              <tag><c>abort</c></tag>
+              <item>Aborts the current association without flushing any unsent
+                data</item>
+              <tag><c>eof</c></tag>
+              <item>Gracefully shuts down the current association, with
+                flushing of unsent data</item>
+            </taglist>
+              <p>Other fields are rarely used. For complete information, see
+                <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC 2960</url>
+                and
+                <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets
+                API Extensions for SCTP</url>.</p></item>
+        </taglist>
         <marker id="option-sctp_events"></marker>
       </item>
       <tag><c>{sctp_events, #sctp_event_subscribe{}}</c></tag>
       <item>
         <marker id="record-sctp_event_subscribe"></marker>
-<pre>  #sctp_event_subscribe{
-          data_io_event          = true | false,
-          association_event      = true | false,
-          address_event          = true | false,
-          send_failure_event     = true | false,
-          peer_error_event       = true | false,
-          shutdown_event         = true | false,
-          partial_delivery_event = true | false,
-          adaptation_layer_event = true | false
-    }        </pre>
+        <pre>
+#sctp_event_subscribe{
+        data_io_event          = true | false,
+        association_event      = true | false,
+        address_event          = true | false,
+        send_failure_event     = true | false,
+        peer_error_event       = true | false,
+        shutdown_event         = true | false,
+        partial_delivery_event = true | false,
+        adaptation_layer_event = true | false
+}</pre>
         <p>This option determines which
           <seealso marker="#sctp_events">SCTP Events</seealso> are to be
-          received (via <seealso marker="#recv/1">recv/*</seealso>)
-          along with the data. The only
-          exception is <c>data_io_event</c> which enables or disables
-          receiving of 
-          <seealso marker="#record-sctp_sndrcvinfo">#sctp_sndrcvinfo{}</seealso>
+          received (through
+          <seealso marker="#recv/1"><c>recv/*</c></seealso>)
+          along with the data. The only exception is <c>data_io_event</c>,
+          which enables or disables receiving of
+          <seealso marker="#record-sctp_sndrcvinfo"><c>#sctp_sndrcvinfo{}</c></seealso>
           ancillary data, not events.
           By default, all flags except <c>adaptation_layer_event</c> are
           enabled, although <c>sctp_data_io_event</c> and
@@ -873,201 +894,185 @@
       </item>
       <tag><c>{sctp_delayed_ack_time, #sctp_assoc_value{}}</c></tag>
       <item>
-<pre>  #sctp_assoc_value{
-        assoc_id    = assoc_id(),
-        assoc_value = integer()
-  }        </pre>
+        <pre>
+#sctp_assoc_value{
+      assoc_id    = assoc_id(),
+      assoc_value = integer()
+}</pre>
         <p>Rarely used. Determines the ACK time
-          (given by <c>assoc_value</c> in milliseconds) for
-          the given association or the whole endpoint
+          (specified by <c>assoc_value</c>, in milliseconds) for
+          the specified association or the whole endpoint
           if <c>assoc_value = 0</c> (default).</p>
       </item>
       <tag><c>{sctp_status, #sctp_status{}}</c></tag>
       <item>
-<pre>  #sctp_status{
-        assoc_id            = assoc_id(),
-        state               = atom(),
-        rwnd                = integer(),
-        unackdata           = integer(),
-        penddata            = integer(),
-        instrms             = integer(),
-        outstrms            = integer(),
-        fragmentation_point = integer(),
-        primary             = #sctp_paddrinfo{}
-  }        </pre>
+        <pre>
+#sctp_status{
+      assoc_id            = assoc_id(),
+      state               = atom(),
+      rwnd                = integer(),
+      unackdata           = integer(),
+      penddata            = integer(),
+      instrms             = integer(),
+      outstrms            = integer(),
+      fragmentation_point = integer(),
+      primary             = #sctp_paddrinfo{}
+}</pre>
         <p>This option is read-only. It determines the status of
-          the SCTP association given by <c>assoc_id</c>. Possible values of
-          <c>state</c> follows. The state designations are mostly
-          self-explanatory. <c>state_empty</c> is the default which means
-          that no other state is active:</p>
-        <list type="bulleted">
-          <item>
-            <p><c>sctp_state_empty</c></p>
-          </item>
-          <item>
-            <p><c>sctp_state_closed</c></p>
-          </item>
-          <item>
-            <p><c>sctp_state_cookie_wait</c></p>
-          </item>
-          <item>
-            <p><c>sctp_state_cookie_echoed</c></p>
-          </item>
-          <item>
-            <p><c>sctp_state_established</c></p>
-          </item>
-          <item>
-            <p><c>sctp_state_shutdown_pending</c></p>
-          </item>
-          <item>
-            <p><c>sctp_state_shutdown_sent</c></p>
-          </item>
-          <item>
-            <p><c>sctp_state_shutdown_received</c></p>
-          </item>
-          <item>
-            <p><c>sctp_state_shutdown_ack_sent</c></p>
-          </item>
-        </list>
-        <p>The semantics of other fields is the following:</p>
-        <list type="bulleted">
-          <item>
-            <p><c>sstat_rwnd</c>: the association peer's current receiver
-              window size;</p>
-          </item>
-          <item>
-            <p><c>sstat_unackdata</c>: number of unacked data chunks;</p>
-          </item>
-          <item>
-            <p><c>sstat_penddata</c>: number of data chunks pending receipt;</p>
-          </item>
-          <item>
-            <p><c>sstat_instrms</c>: number of inbound streams;</p>
-          </item>
-          <item>
-            <p><c>sstat_outstrms</c>: number of outbound streams;</p>
-          </item>
-          <item>
-            <p><c>sstat_fragmentation_point</c>: message size at which SCTP
-              fragmentation will occur;</p>
-          </item>
-          <item>
-            <p><c>sstat_primary</c>: information on the current primary peer
-              address (see below for the format of <c>#sctp_paddrinfo{}</c>).</p>
-          </item>
-        </list>
+          the SCTP association specified by <c>assoc_id</c>.
+          The following are the
+          possible values of <c>state</c> (the state designations are mostly
+          self-explanatory):</p>
+        <taglist>
+          <tag><c>sctp_state_empty</c></tag>
+          <item>Default. Means that no other state is active.</item>
+          <tag><c>sctp_state_closed</c></tag>
+          <item></item>
+          <tag><c>sctp_state_cookie_wait</c></tag>
+          <item></item>
+          <tag><c>sctp_state_cookie_echoed</c></tag>
+          <item></item>
+          <tag><c>sctp_state_established</c></tag>
+          <item></item>
+          <tag><c>sctp_state_shutdown_pending</c></tag>
+          <item></item>
+          <tag><c>sctp_state_shutdown_sent</c></tag>
+          <item></item>
+          <tag><c>sctp_state_shutdown_received</c></tag>
+          <item></item>
+          <tag><c>sctp_state_shutdown_ack_sent</c></tag>
+          <item></item>
+        </taglist>
+        <p>Semantics of the other fields:</p>
+        <taglist>
+          <tag><c>sstat_rwnd</c></tag>
+          <item>Current receiver window size of the association</item>
+          <tag><c>sstat_unackdata</c></tag>
+          <item>Number of unacked data chunks</item>
+          <tag><c>sstat_penddata</c></tag>
+          <item>Number of data chunks pending receipt</item>
+          <tag><c>sstat_instrms</c></tag>
+          <item>Number of inbound streams</item>
+          <tag><c>sstat_outstrms</c></tag>
+          <item>Number of outbound streams</item>
+          <tag><c>sstat_fragmentation_point</c></tag>
+          <item>Message size at which SCTP fragmentation occurs</item>
+          <tag><c>sstat_primary</c></tag>
+          <item>Information on the current primary peer address (see below for
+            the format of <c>#sctp_paddrinfo{}</c>)</item>
+        </taglist>
         <marker id="option-sctp_get_peer_addr_info"></marker>
       </item>
       <tag><c>{sctp_get_peer_addr_info, #sctp_paddrinfo{}}</c></tag>
       <item>
         <marker id="record-sctp_paddrinfo"></marker>
-<pre>  #sctp_paddrinfo{
-        assoc_id  = assoc_id(),
-        address   = {IP, Port},
-        state     = inactive | active | unconfirmed,
-        cwnd      = integer(),
-        srtt      = integer(),
-        rto       = integer(),
-        mtu       = integer()
-  }
-  IP = ip_address()
-  Port = port_number()        </pre>
+        <pre>
+#sctp_paddrinfo{
+      assoc_id  = assoc_id(),
+      address   = {IP, Port},
+      state     = inactive | active | unconfirmed,
+      cwnd      = integer(),
+      srtt      = integer(),
+      rto       = integer(),
+      mtu       = integer()
+}
+IP = ip_address()
+Port = port_number()</pre>
         <p>This option is read-only. It determines the parameters specific to
-          the peer's address given by <c>address</c> within the association
-          given by <c>assoc_id</c>. The <c>address</c> field must be set by the
+          the peer address specified by <c>address</c> within the association
+          specified by <c>assoc_id</c>. Field <c>address</c> fmust be set by the
           caller; all other fields are filled in on return.
           If <c>assoc_id = 0</c> (default), the <c>address</c>
           is automatically translated into the corresponding
-          association ID. This option is rarely used; see
-          <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC2960</url> and
-          <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets API Extensions for SCTP</url> for the semantics of all fields.</p>
+          association ID. This option is rarely used.
+          For the semantics of all fields, see
+          <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC 2960</url>
+          and
+          <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets
+          API Extensions for SCTP</url>.</p>
       </item>
     </taglist>
   </section>
 
   <section>
     <marker id="examples"></marker>
-    <title>SCTP EXAMPLES</title>
-    <list type="bulleted">
-      <item>
-        <p>Example of an Erlang SCTP Server which receives SCTP messages and
-          prints them on the standard output:</p>
-<pre>  -module(sctp_server).
-  
-  -export([server/0,server/1,server/2]).
-  -include_lib("kernel/include/inet.hrl").
-  -include_lib("kernel/include/inet_sctp.hrl").
-  
-  server() -&gt;
-      server(any, 2006).
-  
-  server([Host,Port]) when is_list(Host), is_list(Port) -&gt;
-      {ok, #hostent{h_addr_list = [IP|_]}} = inet:gethostbyname(Host),
-      io:format("~w -&gt; ~w~n", [Host, IP]),
-      server([IP, list_to_integer(Port)]).
-  
-  server(IP, Port) when is_tuple(IP) orelse IP == any orelse IP == loopback,
-                        is_integer(Port) -&gt;
-      {ok,S} = gen_sctp:open(Port, [{recbuf,65536}, {ip,IP}]),
-      io:format("Listening on ~w:~w. ~w~n", [IP,Port,S]),
-      ok     = gen_sctp:listen(S, true),
-      server_loop(S).
-  
-  server_loop(S) -&gt;
-      case gen_sctp:recv(S) of
-      {error, Error} -&gt;
-          io:format("SCTP RECV ERROR: ~p~n", [Error]);
-      Data -&gt;
-          io:format("Received: ~p~n", [Data])
-      end,
-      server_loop(S).        </pre>
-      </item>
-      <item>
-        <p>Example of an Erlang SCTP Client which interacts with the above Server.
-          Note that in this example, the Client creates an association with
-          the Server with 5 outbound streams. For this reason, sending of
-          "Test 0" over Stream 0 succeeds, but sending of "Test 5"
-          over Stream 5 fails. The client then <c>abort</c>s the association,
-          which results in the corresponding Event being received on
-          the Server side.</p>
-<pre>  -module(sctp_client).
-  
-  -export([client/0, client/1, client/2]).
-  -include_lib("kernel/include/inet.hrl").
-  -include_lib("kernel/include/inet_sctp.hrl").
+    <title>SCTP Examples</title>
+      <p>Example of an Erlang SCTP server that receives SCTP messages and
+         prints them on the standard output:</p>
+      <pre>
+-module(sctp_server).
+
+-export([server/0,server/1,server/2]).
+-include_lib("kernel/include/inet.hrl").
+-include_lib("kernel/include/inet_sctp.hrl").
+
+server() -&gt;
+    server(any, 2006).
+
+server([Host,Port]) when is_list(Host), is_list(Port) -&gt;
+    {ok, #hostent{h_addr_list = [IP|_]}} = inet:gethostbyname(Host),
+    io:format("~w -&gt; ~w~n", [Host, IP]),
+    server([IP, list_to_integer(Port)]).
+
+server(IP, Port) when is_tuple(IP) orelse IP == any orelse IP == loopback,
+                      is_integer(Port) -&gt;
+    {ok,S} = gen_sctp:open(Port, [{recbuf,65536}, {ip,IP}]),
+    io:format("Listening on ~w:~w. ~w~n", [IP,Port,S]),
+    ok     = gen_sctp:listen(S, true),
+    server_loop(S).
+
+server_loop(S) -&gt;
+    case gen_sctp:recv(S) of
+    {error, Error} -&gt;
+        io:format("SCTP RECV ERROR: ~p~n", [Error]);
+    Data -&gt;
+        io:format("Received: ~p~n", [Data])
+    end,
+    server_loop(S).</pre>
+      <p>Example of an Erlang SCTP client interacting with the above server.
+        Notice that in this example the client creates an association with
+        the server with 5 outbound streams. Therefore, sending of
+        <c>"Test 0"</c> over stream 0 succeeds, but sending of <c>"Test 5"</c>
+        over stream 5 fails. The client then <c>abort</c>s the association,
+        which results in that the corresponding event is received on
+        the server side.</p>
+      <pre>
+-module(sctp_client).
+
+-export([client/0, client/1, client/2]).
+-include_lib("kernel/include/inet.hrl").
+-include_lib("kernel/include/inet_sctp.hrl").
+
+client() -&gt;
+    client([localhost]).
+
+client([Host]) -&gt;
+    client(Host, 2006);
  
-  client() -&gt;
-      client([localhost]).
-  
-  client([Host]) -&gt;
-      client(Host, 2006);
-  
-  client([Host, Port]) when is_list(Host), is_list(Port) -&gt;
-      client(Host,list_to_integer(Port)),
-      init:stop().
-  
-  client(Host, Port) when is_integer(Port) -&gt;
-      {ok,S}     = gen_sctp:open(),
-      {ok,Assoc} = gen_sctp:connect
-          (S, Host, Port, [{sctp_initmsg,#sctp_initmsg{num_ostreams=5}}]),
-      io:format("Connection Successful, Assoc=~p~n", [Assoc]),
-      
-      io:write(gen_sctp:send(S, Assoc, 0, &lt;&lt;"Test 0"&gt;&gt;)),
-      io:nl(),
-      timer:sleep(10000),
-      io:write(gen_sctp:send(S, Assoc, 5, &lt;&lt;"Test 5"&gt;&gt;)),
-      io:nl(),
-      timer:sleep(10000),
-      io:write(gen_sctp:abort(S, Assoc)),
-      io:nl(),
-      
-      timer:sleep(1000),
-      gen_sctp:close(S).        </pre>
-      </item>
-      <item>
-        <p>A very simple Erlang SCTP Client which uses the
-          connect_init API.</p>
-<pre>-module(ex3).
+client([Host, Port]) when is_list(Host), is_list(Port) -&gt;
+    client(Host,list_to_integer(Port)),
+    init:stop().
+
+client(Host, Port) when is_integer(Port) -&gt;
+    {ok,S}     = gen_sctp:open(),
+    {ok,Assoc} = gen_sctp:connect
+        (S, Host, Port, [{sctp_initmsg,#sctp_initmsg{num_ostreams=5}}]),
+    io:format("Connection Successful, Assoc=~p~n", [Assoc]),
+
+    io:write(gen_sctp:send(S, Assoc, 0, &lt;&lt;"Test 0"&gt;&gt;)),
+    io:nl(),
+    timer:sleep(10000),
+    io:write(gen_sctp:send(S, Assoc, 5, &lt;&lt;"Test 5"&gt;&gt;)),
+    io:nl(),
+    timer:sleep(10000),
+    io:write(gen_sctp:abort(S, Assoc)),
+    io:nl(),
+
+    timer:sleep(1000),
+    gen_sctp:close(S).</pre>
+      <p>A simple Erlang SCTP client that uses the <c>connect_init</c> API:</p>
+      <pre>
+-module(ex3).
 
 -export([client/4]).
 -include_lib("kernel/include/inet.hrl").
@@ -1099,7 +1104,7 @@ client_loop(S, Peer1, Port1, AssocId1, Peer2, Port2, AssocId2) -&gt;
             io:format("Association 2 connect result: ~p. AssocId: ~p~n",
                       [SAC#sctp_assoc_change.state, SAC#sctp_assoc_change.assoc_id]),
             client_loop(S, Peer1, Port1, AssocId1, Peer2, Port2,
-                        SAC#sctp_assoc_change.assoc_id);
+                       SAC#sctp_assoc_change.assoc_id);
 
         {sctp, S, Peer1, Port1, Data} -&gt;
             io:format("Association 1: received ~p~n", [Data]),
@@ -1118,20 +1123,19 @@ client_loop(S, Peer1, Port1, AssocId1, Peer2, Port2, AssocId2) -&gt;
 
     after 5000 -&gt;
             ok
-    end.
-</pre>
-      </item>
-    </list>
+    end.</pre>
   </section>
 
   <section>
     <marker id="seealso"></marker>
-    <title>SEE ALSO</title>
-    <p><seealso marker="inet">inet(3)</seealso>,
-      <seealso marker="gen_tcp">gen_tcp(3)</seealso>,
-      <seealso marker="gen_udp">gen_udp(3)</seealso>,
-      <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC2960</url> (Stream Control Transmission Protocol),
-      <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets API Extensions for SCTP.</url></p>
+    <title>See Also</title>
+    <p><seealso marker="gen_tcp"><c>gen_tcp(3)</c></seealso>,
+      <seealso marker="gen_udp"><c>gen_udp(3)</c></seealso>,
+      <seealso marker="inet"><c>inet(3)</c></seealso>,
+      <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC 2960</url>
+      (Stream Control Transmission Protocol),
+      <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets
+      API Extensions for SCTP</url></p>
   </section>
 </erlref>
 
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index 6a19e76c4f..3212d6b5dd 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -21,7 +21,6 @@
       limitations under the License.
     
     </legalnotice>
-
     <title>gen_tcp</title>
     <prepared>[email protected]</prepared>
     <docno></docno>
@@ -29,13 +28,13 @@
     <rev>A</rev>
   </header>
   <module>gen_tcp</module>
-  <modulesummary>Interface to TCP/IP sockets</modulesummary>
+  <modulesummary>Interface to TCP/IP sockets.</modulesummary>
   <description>
-    <p>The <c>gen_tcp</c> module provides functions for communicating
+    <p>This module provides functions for communicating
       with sockets using the TCP/IP protocol.</p>
-    <p>The following code fragment provides a simple example of 
+    <p>The following code fragment is a simple example of
       a client connecting to a server at port 5678, transferring a
-      binary and closing the connection:</p>
+      binary, and closing the connection:</p>
     <code type="none">
 client() ->
     SomeHostInNet = "localhost", % to make it runnable on one machine
@@ -43,8 +42,8 @@ client() ->
                                  [binary, {packet, 0}]),
     ok = gen_tcp:send(Sock, "Some Data"),
     ok = gen_tcp:close(Sock).</code>
-    <p>At the other end a server is listening on port 5678, accepts
-      the connection and receives the binary:</p>
+    <p>At the other end, a server is listening on port 5678, accepts
+      the connection, and receives the binary:</p>
     <code type="none">
 server() ->
     {ok, LSock} = gen_tcp:listen(5678, [binary, {packet, 0}, 
@@ -61,7 +60,8 @@ do_recv(Sock, Bs) ->
         {error, closed} ->
             {ok, list_to_binary(Bs)}
     end.</code>
-    <p>For more examples, see the <seealso marker="#examples">examples</seealso> section.</p>
+    <p>For more examples, see section
+      <seealso marker="#examples">Examples</seealso>.</p>
   </description>
 
   <datatypes>
@@ -79,9 +79,10 @@ do_recv(Sock, Bs) ->
     </datatype>
     <datatype>
       <name>socket()</name>
-      <desc>
-        <p><marker id="type-socket"/>
-	As returned by accept/1,2 and connect/3,4.</p>
+      <desc><p><marker id="type-socket"/>
+	As returned by
+        <seealso marker="#accept/1"><c>accept/1,2</c></seealso> and
+        <seealso marker="#connect/3"><c>connect/3,4</c></seealso>.</p>
         <marker id="connect"></marker>
       </desc>
     </datatype>
@@ -89,285 +90,256 @@ do_recv(Sock, Bs) ->
 
   <funcs>
     <func>
+      <name name="accept" arity="1"/>
+      <name name="accept" arity="2"/>
+      <fsummary>Accept an incoming connection request on a listening socket.</fsummary>
+      <type_desc variable="ListenSocket">Returned by
+        <seealso marker="#listen/2"><c>listen/2</c></seealso>.
+      </type_desc>
+      <desc>
+        <p>Accepts an incoming connection request on a listening socket.
+          <c><anno>Socket</anno></c> must be a socket returned from
+          <seealso marker="#listen/2"><c>listen/2</c></seealso>.
+          <c><anno>Timeout</anno></c> specifies a time-out value in
+          milliseconds. Defaults to <c>infinity</c>.</p>
+        <p>Returns:</p>
+        <list type="bulleted">
+          <item><p><c>{ok, <anno>Socket</anno>}</c> if a connection is
+            established</p></item>
+          <item><p><c>{error, closed}</c> if <c><anno>ListenSocket</anno></c>
+            is closed</p></item>
+          <item><p><c>{error, timeout}</c> if no connection is established
+            within the specified time</p></item>
+          <item><p><c>{error, system_limit}</c> if all available ports in the
+            Erlang emulator are in use</p></item>
+          <item><p>A POSIX error value if something else goes wrong, see
+            <seealso marker="inet"><c>inet(3)</c></seealso> for possible
+            error values</p></item>
+        </list>
+        <p>Packets can be sent to the returned socket <c><anno>Socket</anno></c>
+          using
+          <seealso marker="#send/2"><c>send/2</c></seealso>.
+          Packets sent from the peer are delivered as messages (unless
+          <c>{active, false}</c> is specified in the option list for the
+          listening socket, in which case packets are retrieved by calling
+          <seealso marker="#recv/2"><c>recv/2</c></seealso>):</p>
+        <code type="none">
+{tcp, Socket, Data}</code>
+        <note>
+          <p>The <c>accept</c> call does
+            <em>not</em> have to be issued from the socket owner
+            process. Using version 5.5.3 and higher of the emulator,
+            multiple simultaneous accept calls can be issued from
+            different processes, which allows for a pool of acceptor
+            processes handling incoming connections.</p>
+        </note>
+      </desc>
+    </func>
+
+    <func>
+      <name name="close" arity="1"/>
+      <fsummary>Close a TCP socket.</fsummary>
+      <desc>
+        <p>Closes a TCP socket.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="connect" arity="3"/>
       <name name="connect" arity="4"/>
-      <fsummary>Connect to a TCP port</fsummary>
+      <fsummary>Connect to a TCP port.</fsummary>
       <desc>
         <p>Connects to a server on TCP port <c><anno>Port</anno></c> on the host
-          with IP address <c><anno>Address</anno></c>. The <c><anno>Address</anno></c> argument
-          can be either a hostname, or an IP address.</p>
-        <p>The available options are:</p>
+          with IP address <c><anno>Address</anno></c>. Argument
+          <c><anno>Address</anno></c> can be a hostname or an IP address.</p>
+        <p>The following options are available:</p>
         <taglist>
-         <tag><c>{ip, ip_address()}</c></tag>
-          <item>
-            <p>If the host has several network interfaces, this option
-              specifies which one to use.</p>
+          <tag><c>{ip, ip_address()}</c></tag>
+          <item><p>If the host has many network interfaces, this option
+            specifies which one to use.</p></item>
+          <tag><c>{ifaddr, ip_address()}</c></tag>
+          <item><p>Same as <c>{ip, ip_address()}</c>. If the host has many
+            network interfaces, this option specifies which one to use.</p>
           </item>
-
-		  <tag><c>{ifaddr, ip_address()}</c></tag>
-          <item>
-			  <p>Same as <c>{ip, ip_address()}</c>. If the host has several network interfaces, this option
-              specifies which one to use.</p>
-		  </item>
-
           <tag><c>{fd, integer() >= 0}</c></tag>
-          <item>
-            <p>If a socket has somehow been connected without using
-              <c>gen_tcp</c>, use this option to pass the file
-              descriptor for it. If <c>{ip, ip_address()}</c>
-              and/or <c>{port, port_number()}</c> is combined with
-              this option the fd will be bound to the given interface
-              and port before connecting. If these options are not given
-              it is assumed that the fd is already bound appropriately.
-            </p>
-          </item>
-
+          <item><p>If a socket has somehow been connected without using
+            <c>gen_tcp</c>, use this option to pass the file descriptor
+            for it. If <c>{ip, ip_address()}</c> and/or
+            <c>{port, port_number()}</c> is combined with this option,  the
+            <c>fd</c> is bound to the specified interface and port before
+            connecting. If these options are not specified, it is assumed that
+            the <c>fd</c> is already bound appropriately.</p></item>
           <tag><c>inet</c></tag>
-          <item>
-            <p>Set up the socket for IPv4.</p>
-          </item>
-
-		  <tag><c>inet6</c></tag>
-		  <item>
-            <p>Set up the socket for IPv6.</p>
-          </item>
-
+          <item><p>Sets up the socket for IPv4.</p></item>
+          <tag><c>inet6</c></tag>
+          <item><p>Sets up the socket for IPv6.</p></item>
           <tag><c>{port, Port}</c></tag>
-          <item>
-            <p>Specify which local port number to use.</p>
-          </item>
-
-		  <tag><c>{tcp_module, module()}</c></tag>
-		  <item> <p>
-				  Override which callback module is used. Defaults to
-				  <c>inet_tcp</c> for IPv4 and <c>inet6_tcp</c> for IPv6.
-			  </p>
-		  </item>
-
+          <item><p>Specifies which local port number to use.</p></item>
+          <tag><c>{tcp_module, module()}</c></tag>
+          <item><p>Overrides which callback module is used. Defaults to
+            <c>inet_tcp</c> for IPv4 and <c>inet6_tcp</c> for IPv6.</p></item>
           <tag><c>Opt</c></tag>
-          <item>
-            <p>See
-              <seealso marker="inet#setopts/2">inet:setopts/2</seealso>.</p>
+          <item><p>See
+            <seealso marker="inet#setopts/2"><c>inet:setopts/2</c></seealso>.</p>
           </item>
         </taglist>
         <p>Packets can be sent to the returned socket <c><anno>Socket</anno></c>
-          using <c>send/2</c>. Packets sent from the peer are delivered
-          as messages:</p>
+          using <seealso marker="#send/2"><c>send/2</c></seealso>.
+          Packets sent from the peer are delivered as messages:</p>
         <code type="none">
 {tcp, Socket, Data}</code>
-        <p>If the socket is in <c>{active, N}</c> mode (see <seealso marker="inet#setopts/2">
-          inet:setopts/2</seealso> for details) and its message counter
-          drops to 0, the following message is delivered to indicate that the
+        <p>If the socket is in <c>{active, N}</c> mode (see
+          <seealso marker="inet#setopts/2"><c>inet:setopts/2</c></seealso>
+          for details) and its message counter drops to <c>0</c>, the following
+          message is delivered to indicate that the
           socket has transitioned to passive (<c>{active, false}</c>) mode:</p>
         <code type="none">
 {tcp_passive, Socket}</code>
         <p>If the socket is closed, the following message is delivered:</p>
         <code type="none">
 {tcp_closed, Socket}</code>
-        <p>If an error occurs on the socket, the following message is
-          delivered:</p>
+        <p>If an error occurs on the socket, the following message is delivered
+          (unless <c>{active, false}</c> is specified in the option list for
+          the socket, in which case packets are retrieved by calling
+          <seealso marker="#recv/2"><c>recv/2</c></seealso>):</p>
         <code type="none">
 {tcp_error, Socket, Reason}</code>
-        <p>unless <c>{active, false}</c> is specified in the option list
-          for the socket, in which case packets are retrieved by
-          calling <c>recv/2</c>.</p>
-        <p>The optional <c><anno>Timeout</anno></c> parameter specifies a timeout in
-          milliseconds. The default value is <c>infinity</c>.</p>
+        <p>The optional <c><anno>Timeout</anno></c> parameter specifies a
+          time-out in milliseconds. Defaults to <c>infinity</c>.</p>
         <note>
-          <p>The default values for options given to <c>connect</c> can
-            be affected by the Kernel configuration parameter
-            <c>inet_default_connect_options</c>. See
-            <seealso marker="inet">inet(3)</seealso> for details.</p>
+          <p>The default values for options specified to <c>connect</c> can
+            be affected by the <c>Kernel</c> configuration parameter
+            <c>inet_default_connect_options</c>. For details, see
+            <seealso marker="inet"><c>inet(3)</c></seealso>.</p>
         </note>
       </desc>
     </func>
+
+    <func>
+      <name name="controlling_process" arity="2"/>
+      <fsummary>Change controlling process of a socket.</fsummary>
+      <desc>
+        <p>Assigns a new controlling process <c><anno>Pid</anno></c> to
+          <c><anno>Socket</anno></c>. The controlling process is the process
+          that receives messages from the socket. If called by any other
+          process than the current controlling process,
+          <c>{error, not_owner}</c> is returned.</p>
+      </desc>
+    </func>
+
     <func>
       <name name="listen" arity="2"/>
-      <fsummary>Set up a socket to listen on a port</fsummary>
+      <fsummary>Set up a socket to listen on a port.</fsummary>
       <desc>
-        <p>Sets up a socket to listen on the port <c><anno>Port</anno></c> on
+        <p>Sets up a socket to listen on port <c><anno>Port</anno></c> on
           the local host.</p>
-        <p>If <c><anno>Port</anno> == 0</c>, the underlying OS assigns an available
-          port number, use <c>inet:port/1</c> to retrieve it.</p>
-        <p>The available options are:</p>
+        <p>If <c><anno>Port</anno> == 0</c>, the underlying OS assigns an
+          available port number, use
+          <seealso marker="inet#port/1"><c>inet:port/1</c></seealso>
+          to retrieve it.</p>
+        <p>The following options are available:</p>
         <taglist>
           <tag><c>list</c></tag>
-          <item>
-            <p>Received <c>Packet</c> is delivered as a list.</p>
-          </item>
+          <item><p>Received <c>Packet</c> is delivered as a list.</p></item>
           <tag><c>binary</c></tag>
-          <item>
-            <p>Received <c>Packet</c> is delivered as a binary.</p>
-          </item>
+          <item><p>Received <c>Packet</c> is delivered as a binary.</p></item>
           <tag><c>{backlog, B}</c></tag>
-          <item>
-            <p><c>B</c> is an integer &gt;= 0. The backlog value defaults
-              to 5. The backlog value defines the maximum length that
-              the queue of pending connections may grow to.</p>
-          </item>
+          <item><p><c>B</c> is an integer &gt;= <c>0</c>. The backlog value
+            defines the maximum length that the queue of pending connections
+            can grow to. Defaults to <c>5</c>.</p></item>
           <tag><c>{ip, ip_address()}</c></tag>
-          <item>
-            <p>If the host has several network interfaces, this option
-              specifies which one to listen on.</p>
-          </item>
+          <item><p>If the host has many network interfaces, this option
+            specifies which one to listen on.</p></item>
           <tag><c>{port, Port}</c></tag>
-          <item>
-            <p>Specify which local port number to use.</p>
-          </item>
+          <item><p>Specifies which local port number to use.</p></item>
           <tag><c>{fd, Fd}</c></tag>
-          <item>
-            <p>If a socket has somehow been connected without using
-              <c>gen_tcp</c>, use this option to pass the file
-              descriptor for it.</p>
+          <item><p>If a socket has somehow been connected without using
+            <c>gen_tcp</c>, use this option to pass the file
+            descriptor for it.</p></item>
+          <tag><c>{ifaddr, ip_address()}</c></tag>
+          <item><p>Same as <c>{ip, ip_address()}</c>. If the host has many
+            network interfaces, this option specifies which one to use.</p>
           </item>
-
-		  <tag><c>{ifaddr, ip_address()}</c></tag>
-          <item>
-			  <p>Same as <c>{ip, ip_address()}</c>. If the host has several network interfaces, this option
-              specifies which one to use.</p>
-		  </item>
-
           <tag><c>inet6</c></tag>
-          <item>
-            <p>Set up the socket for IPv6.</p>
-          </item>
+          <item><p>Sets up the socket for IPv6.</p></item>
           <tag><c>inet</c></tag>
-          <item>
-            <p>Set up the socket for IPv4.</p>
-          </item>
-
-		  <tag><c>{tcp_module, module()}</c></tag>
-		  <item> <p>
-				  Override which callback module is used. Defaults to
-				  <c>inet_tcp</c> for IPv4 and <c>inet6_tcp</c> for IPv6.
-			  </p>
-		  </item>
-
+          <item><p>Sets up the socket for IPv4.</p></item>
+          <tag><c>{tcp_module, module()}</c></tag>
+          <item><p>Overrides which callback module is used. Defaults to
+            <c>inet_tcp</c> for IPv4 and <c>inet6_tcp</c> for IPv6.</p></item>
           <tag><c>Opt</c></tag>
-          <item>
-            <p>See
-              <seealso marker="inet#setopts/2">inet:setopts/2</seealso>.</p>
-          </item>
+          <item><p>See
+            <seealso marker="inet#setopts/2"><c>inet:setopts/2</c></seealso>.
+            </p></item>
         </taglist>
-        <p>The returned socket <c><anno>ListenSocket</anno></c> can only be used in
-          calls to <c>accept/1,2</c>.</p>
+        <p>The returned socket <c><anno>ListenSocket</anno></c> can only be
+          used in calls to
+          <seealso marker="#accept/1"><c>accept/1,2</c></seealso>.</p>
         <note>
-          <p>The default values for options given to <c>listen</c> can
-            be affected by the Kernel configuration parameter
-            <c>inet_default_listen_options</c>. See
-            <seealso marker="inet">inet(3)</seealso> for details.</p>
+          <p>The default values for options specified to <c>listen</c> can
+            be affected by the <c>Kernel</c> configuration parameter
+            <c>inet_default_listen_options</c>. For details, see
+            <seealso marker="inet"><c>inet(3)</c></seealso>.</p>
         </note>
       </desc>
     </func>
-    <func>
-      <name name="accept" arity="1"/>
-      <name name="accept" arity="2"/>
-      <fsummary>Accept an incoming connection request on a listen socket</fsummary>
-      <type_desc variable="ListenSocket">Returned by <c>listen/2</c>.
-      </type_desc>
-      <desc>
-        <p>Accepts an incoming connection request on a listen socket.
-          <c><anno>Socket</anno></c> must be a socket returned from <c>listen/2</c>.
-          <c><anno>Timeout</anno></c> specifies a timeout value in ms, defaults to
-          <c>infinity</c>.</p>
-        <p>Returns <c>{ok, <anno>Socket</anno>}</c> if a connection is established,
-          or <c>{error, closed}</c> if <c><anno>ListenSocket</anno></c> is closed,
-          or <c>{error, timeout}</c> if no connection is established
-          within the specified time,
-          or <c>{error, system_limit}</c> if all available ports in the
-          Erlang emulator are in use. May also return a POSIX error
-          value if something else goes wrong, see inet(3) for possible
-          error values.</p>
-        <p>Packets can be sent to the returned socket <c><anno>Socket</anno></c>
-          using <c>send/2</c>. Packets sent from the peer are delivered
-          as messages:</p>
-        <code type="none">
-{tcp, Socket, Data}</code>
-        <p>unless <c>{active, false}</c> was specified in the option
-          list for the listen socket, in which case packets are
-          retrieved by calling <c>recv/2</c>.</p>
-        <note>
-          <p>It is worth noting that the <c>accept</c> call does
-            <em>not</em> have to be issued from the socket owner
-            process. Using version 5.5.3 and higher of the emulator,
-            multiple simultaneous accept calls can be issued from
-            different processes, which allows for a pool of acceptor
-            processes handling incoming connections.</p>
-        </note>
-      </desc>
-    </func>
-    <func>
-      <name name="send" arity="2"/>
-      <fsummary>Send a packet</fsummary>
-      <desc>
-        <p>Sends a packet on a socket. </p>
-        <p>There is no <c>send</c> call with timeout option, you use the
-          <c>send_timeout</c> socket option if timeouts are
-          desired.  See the <seealso marker="#examples">examples</seealso> section.</p>
-      </desc>
-    </func>
+
     <func>
       <name name="recv" arity="2"/>
       <name name="recv" arity="3"/>
-      <fsummary>Receive a packet from a passive socket</fsummary>
+      <fsummary>Receive a packet from a passive socket.</fsummary>
       <type_desc variable="HttpPacket">See the description of
-         <c>HttpPacket</c> in <seealso marker="erts:erlang#decode_packet/3">
-         erlang:decode_packet/3</seealso>.
+        <c>HttpPacket</c> in
+        <seealso marker="erts:erlang#decode_packet/3"><c>erlang:decode_packet/3</c></seealso>
+      in <c>ERTS</c>.
       </type_desc>
       <desc>
-        <p>This function receives a packet from a socket in passive
-          mode. A closed socket is indicated by a return value
+        <p>Receives a packet from a socket in passive
+          mode. A closed socket is indicated by return value
           <c>{error, closed}</c>.</p>
-        <p>The <c><anno>Length</anno></c> argument is only meaningful when
+        <p>Argument <c><anno>Length</anno></c> is only meaningful when
           the socket is in <c>raw</c> mode and denotes the number of
-          bytes to read. If <c><anno>Length</anno></c> = 0, all available bytes are
-          returned. If <c><anno>Length</anno></c> &gt; 0, exactly <c><anno>Length</anno></c>
-          bytes are returned, or an error; possibly discarding less
-          than <c><anno>Length</anno></c> bytes of data when the socket gets closed
-          from the other side.</p>
-        <p>The optional <c><anno>Timeout</anno></c> parameter specifies a timeout in
-          milliseconds. The default value is <c>infinity</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="controlling_process" arity="2"/>
-      <fsummary>Change controlling process of a socket</fsummary>
-      <desc>
-        <p>Assigns a new controlling process <c><anno>Pid</anno></c> to
-          <c><anno>Socket</anno></c>. The controlling process is the process which
-          receives messages from the socket. If called by any other
-          process than the current controlling process,
-          <c>{error, not_owner}</c> is returned.</p>
+          bytes to read. If <c><anno>Length</anno></c> is <c>0</c>, all
+          available bytes are returned.
+          If <c><anno>Length</anno></c> &gt; <c>0</c>, exactly
+          <c><anno>Length</anno></c> bytes are returned, or an error;
+          possibly discarding less than <c><anno>Length</anno></c> bytes of
+          data when the socket is closed from the other side.</p>
+        <p>The optional <c><anno>Timeout</anno></c> parameter specifies a
+          time-out in milliseconds. Defaults to <c>infinity</c>.</p>
       </desc>
     </func>
+
     <func>
-      <name name="close" arity="1"/>
-      <fsummary>Close a TCP socket</fsummary>
+      <name name="send" arity="2"/>
+      <fsummary>Send a packet.</fsummary>
       <desc>
-        <p>Closes a TCP socket.</p>
+        <p>Sends a packet on a socket.</p>
+        <p>There is no <c>send</c> call with a time-out option, use socket
+          option <c>send_timeout</c> if time-outs are desired. See section
+          <seealso marker="#examples">Examples</seealso>.</p>
       </desc>
     </func>
+
     <func>
       <name name="shutdown" arity="2"/>
-      <fsummary>Asynchronously close a socket</fsummary>
+      <fsummary>Asynchronously close a socket.</fsummary>
       <desc>
-        <p>Close a socket in one or two directions.</p>
-        <p><c><anno>How</anno> == write</c> means closing the socket for writing,
-          reading from it is still possible.</p>
-        <p>If <c><anno>How</anno> == read</c>, or there is no outgoing
+        <p>Closes a socket in one or two directions.</p>
+        <p><c><anno>How</anno> == write</c> means closing the socket for
+          writing, reading from it is still possible.</p>
+        <p>If <c><anno>How</anno> == read</c> or there is no outgoing
           data buffered in the <c><anno>Socket</anno></c> port,
-          then the socket is shutdown immediately and any error encountered
+          the socket is shut down immediately and any error encountered
           is returned in <c><anno>Reason</anno></c>.</p>
-        <p>If there is data buffered in the socket port, then the attempt
+        <p>If there is data buffered in the socket port, the attempt
           to shutdown the socket is postponed until that data is written to the
-          kernel socket send buffer. Any errors encountered will result
-          in the socket being closed and <c>{error, closed}</c> being returned
-          on the next
-          <seealso marker="gen_tcp#recv/2">recv/2</seealso> or
-          <seealso marker="gen_tcp#send/2">send/2</seealso>.</p>
-        <p>To be able to handle that the peer has done a shutdown on
-          the write side, the <c>{exit_on_close, false}</c> option
-          is useful.</p>
+          kernel socket send buffer. If any errors are encountered, the socket
+          is closed and <c>{error, closed}</c> is returned on the next
+          <seealso marker="#recv/2"><c>recv/2</c></seealso> or
+          <seealso marker="#send/2"><c>send/2</c></seealso>.</p>
+        <p>Option <c>{exit_on_close, false}</c> is useful if the peer has done
+          a shutdown on the write side.</p>
       </desc>
     </func>
   </funcs>
@@ -375,14 +347,14 @@ do_recv(Sock, Bs) ->
   <section>
     <title>Examples</title>
     <marker id="examples"></marker>
-    <p>The following example illustrates usage of the {active,once}
-      option and multiple accepts by implementing a server as a
-      number of worker processes doing accept on one single listen
-      socket. The start/2 function takes the number of worker
-      processes as well as a port number to listen for incoming
-      connections on. If <c>LPort</c> is specified as <c>0</c>, an
-      ephemeral portnumber is used, why the start function returns
-      the actual portnumber allocated:</p>
+    <p>The following example illustrates use of option
+    <c>{active,once}</c> and multiple accepts by implementing a server
+    as a number of worker processes doing accept on a single listening
+    socket. Function <c>start/2</c> takes the number of worker
+    processes and the port number on which to listen for incoming
+    connections. If <c>LPort</c> is specified as <c>0</c>, an
+    ephemeral port number is used, which is why the start function
+    returns the actual port number allocated:</p>
     <code type="none">
 start(Num,LPort) ->
     case gen_tcp:listen(LPort,[{active, false},{packet,2}]) of
@@ -421,7 +393,7 @@ loop(S) ->
             io:format("Socket ~w closed [~w]~n",[S,self()]),
             ok
     end.</code>
-    <p>A simple client could look like this:</p>
+    <p>Example of a simple client:</p>
     <code type="none">
 client(PortNo,Message) ->
     {ok,Sock} = gen_tcp:connect("localhost",PortNo,[{active,false},
@@ -430,30 +402,29 @@ client(PortNo,Message) ->
     A = gen_tcp:recv(Sock,0),
     gen_tcp:close(Sock),
     A.</code>
-    <p>The fact that the <c>send</c> call does not accept a timeout
-      option, is because timeouts on send is handled through the socket
+    <p>The <c>send</c> call does not accept a time-out
+      option because time-outs on send is handled through socket
       option <c>send_timeout</c>. The behavior of a send operation with
-      no receiver is in a very high degree defined by the underlying TCP
-      stack, as well as the network infrastructure. If one wants to write
-      code that handles a hanging receiver that might eventually cause
-      the sender to hang on a <c>send</c> call, one writes code like
-      the following.</p>
-    <p>Consider a process that receives data from a client process that
-      is to be forwarded to a server on the network. The process has
-      connected to the server via TCP/IP and does not get any acknowledge
-      for each message it sends, but has to rely on the send timeout
-      option to detect that the other end is unresponsive. We could use
-      the <c>send_timeout</c> option when connecting:</p>
+      no receiver is mainly defined by the underlying TCP
+      stack and the network infrastructure. To write
+      code that handles a hanging receiver that can eventually cause
+      the sender to hang on a <c>send</c> do like the following.</p>
+    <p>Consider a process that receives data from a client process
+      to be forwarded to a server on the network. The process is
+      connected to the server through TCP/IP and does not get any acknowledge
+      for each message it sends, but has to rely on the send time-out
+      option to detect that the other end is unresponsive. Option
+      <c>send_timeout</c> can be used when connecting:</p>
     <code type="none">
-    ...
-    {ok,Sock} = gen_tcp:connect(HostAddress, Port,
-                                [{active,false},
-                                 {send_timeout, 5000},
-                                 {packet,2}]),
-                    loop(Sock), % See below
-    ...    </code>
-    <p>In the loop where requests are handled, we can now detect send
-      timeouts:</p>
+...
+{ok,Sock} = gen_tcp:connect(HostAddress, Port,
+                            [{active,false},
+                             {send_timeout, 5000},
+                             {packet,2}]),
+                loop(Sock), % See below
+...</code>
+    <p>In the loop where requests are handled, send time-outs can now be
+      detected:</p>
     <code type="none">
 loop(Sock) ->
     receive
@@ -477,11 +448,11 @@ loop(Sock) ->
                     Client ! {self(), data_sent},
                     loop(Sock)
             end
-    end.    </code>
-    <p>Usually it would suffice to detect timeouts on receive, as most
+    end.</code>
+    <p>Usually it suffices to detect time-outs on receive, as most
       protocols include some sort of acknowledgment from the server,
-      but if the protocol is strictly one way, the <c>send_timeout</c>
-      option comes in handy!</p>
+      but if the protocol is strictly one way, option <c>send_timeout</c>
+      comes in handy.</p>
   </section>
 </erlref>
 
diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml
index 79cd87dcef..67789d8555 100644
--- a/lib/kernel/doc/src/gen_udp.xml
+++ b/lib/kernel/doc/src/gen_udp.xml
@@ -29,9 +29,9 @@
     <rev>A</rev>
   </header>
   <module>gen_udp</module>
-  <modulesummary>Interface to UDP sockets</modulesummary>
+  <modulesummary>Interface to UDP sockets.</modulesummary>
   <description>
-    <p>The <c>gen_udp</c> module provides functions for communicating
+    <p>This module provides functions for communicating
       with sockets using the UDP protocol.</p>
   </description>
 
@@ -45,175 +45,140 @@
     <datatype>
       <name>socket()</name>
       <desc>
-        <p><marker id="type-socket"/>As returned by open/1,2.</p>
+        <marker id="type-socket"/>
+        <p>As returned by
+          <seealso marker="#open/1"><c>open/1,2</c></seealso>.</p>
       </desc>
     </datatype>
   </datatypes>
 
   <funcs>
     <func>
+      <name name="close" arity="1"/>
+      <fsummary>Close a UDP socket.</fsummary>
+      <desc>
+        <p>Closes a UDP socket.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="controlling_process" arity="2"/>
+      <fsummary>Change controlling process of a socket.</fsummary>
+      <desc>
+        <p>Assigns a new controlling process <c><anno>Pid</anno></c> to
+          <c><anno>Socket</anno></c>. The controlling process is the process
+          that receives messages from the socket. If called by any other
+          process than the current controlling process,
+          <c>{error, not_owner}</c> is returned.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="open" arity="1"/>
       <name name="open" arity="2"/>
-      <fsummary>Associate a UDP port number with the process calling it</fsummary>
+      <fsummary>Associate a UDP port number with the process calling it.</fsummary>
       <desc>
-        <p>Associates a UDP port number (<c><anno>Port</anno></c>) with the calling
-          process.</p>
-        <p>The available options are:</p>
+        <p>Associates a UDP port number (<c><anno>Port</anno></c>) with the
+          calling process.</p>
+        <p>The following options are available:</p>
         <taglist>
           <tag><c>list</c></tag>
-          <item>
-            <p>Received <c>Packet</c> is delivered as a list.</p>
-          </item>
+          <item><p>Received <c>Packet</c> is delivered as a list.</p></item>
           <tag><c>binary</c></tag>
-          <item>
-            <p>Received <c>Packet</c> is delivered as a binary.</p>
-          </item>
+          <item><p>Received <c>Packet</c> is delivered as a binary.</p></item>
           <tag><c>{ip, ip_address()}</c></tag>
-          <item>
-            <p>If the host has several network interfaces, this option
-              specifies which one to use.</p>
-          </item>
-
-		  <tag><c>{ifaddr, ip_address()}</c></tag>
-          <item>
-			  <p>Same as <c>{ip, ip_address()}</c>. If the host has several network interfaces, this option
-              specifies which one to use.</p>
-		  </item>
-
-
+          <item><p>If the host has many network interfaces, this option
+            specifies which one to use.</p></item>
+          <tag><c>{ifaddr, ip_address()}</c></tag>
+          <item><p>Same as <c>{ip, ip_address()}</c>. If the host has many
+            network interfaces, this option specifies which one to
+            use.</p></item>
           <tag><c>{fd, integer() >= 0}</c></tag>
-          <item>
-            <p>If a socket has somehow been opened without using
-              <c>gen_udp</c>, use this option to pass the file
-              descriptor for it. If <c><anno>Port</anno></c> is not set to 0
-              and/or <c>{ip, ip_address()}</c> is combined with this option
-              the fd will be bound to the given interface and port after being
-              opened. If these options are not given it is assumed that the fd
-              is already bound appropriately.
-            </p>
-          </item>
+          <item><p>If a socket has somehow been opened without using
+            <c>gen_udp</c>, use this option to pass the file descriptor
+            for it. If <c><anno>Port</anno></c> is not set to <c>0</c> and/or
+            <c>{ip, ip_address()}</c> is combined with this option, the
+            <c>fd</c> is bound to the specified interface and port after it is
+            being opened. If these options are not specified, it is assumed that
+            the <c>fd</c> is already bound appropriately.</p></item>
           <tag><c>inet6</c></tag>
-          <item>
-            <p>Set up the socket for IPv6.</p>
-          </item>
+          <item><p>Sets up the socket for IPv6.</p></item>
           <tag><c>inet</c></tag>
-          <item>
-            <p>Set up the socket for IPv4.</p>
-          </item>
-
-		  <tag><c>{udp_module, module()}</c></tag>
-		  <item> <p>
-				  Override which callback module is used. Defaults to
-				  <c>inet_udp</c> for IPv4 and <c>inet6_udp</c> for IPv6.
-			  </p>
-		  </item>
-
+          <item><p>Sets up the socket for IPv4.</p></item>
+          <tag><c>{udp_module, module()}</c></tag>
+          <item><p>Overrides which callback module is used. Defaults to
+            <c>inet_udp</c> for IPv4 and <c>inet6_udp</c> for IPv6.</p></item>
           <tag><c>{multicast_if, Address}</c></tag>
-          <item>
-			  <p>Set the local device for a multicast socket.</p>
-          </item>
- 
+          <item><p>Sets the local device for a multicast socket.</p></item>
           <tag><c>{multicast_loop, true | false}</c></tag>
-          <item>
-			  <p>
-				  When <c>true</c> sent multicast packets will be looped back to the local
-				  sockets.
-			  </p>
-          </item>
-
+          <item><p>When <c>true</c>, sent multicast packets are looped back to
+            the local sockets.</p></item>
           <tag><c>{multicast_ttl, Integer}</c></tag>
-          <item>
-			  <p>
-				  The <c>multicast_ttl</c> option changes the time-to-live (TTL) for
-				  outgoing multicast datagrams in order to control the scope of the 
-				  multicasts.
-			  </p>
-			  <p>
-				  Datagrams with a TTL of 1 are not forwarded beyond the local
-				  network.
-				  <br />Default: 1
-			  </p>
-          </item>
-
-		  <tag><c>{add_membership, {MultiAddress, InterfaceAddress}}</c></tag>
-          <item>
-			  <p>Join a multicast group. </p>
-          </item>
-
-		  <tag><c>{drop_membership, {MultiAddress, InterfaceAddress}}</c></tag>
-          <item>
-			  <p>Leave multicast group.</p>
-          </item>
-
+          <item><p>Option <c>multicast_ttl</c> changes the time-to-live (TTL)
+            for outgoing multicast datagrams to control the scope of the
+            multicasts.</p>
+            <p>Datagrams with a TTL of 1 are not forwarded beyond the local
+              network. Defaults to <c>1</c>.</p></item>
+          <tag><c>{add_membership, {MultiAddress, InterfaceAddress}}</c></tag>
+          <item><p>Joins a multicast group.</p></item>
+          <tag><c>{drop_membership, {MultiAddress, InterfaceAddress}}</c></tag>
+          <item><p>Leaves a multicast group.</p></item>
           <tag><c>Opt</c></tag>
-          <item>
-            <p>See
-              <seealso marker="inet#setopts/2">inet:setopts/2</seealso>.</p>
-          </item>
+          <item><p>See
+            <seealso marker="inet#setopts/2"><c>inet:setopts/2</c></seealso>.
+            </p></item>
         </taglist>
         <p>The returned socket <c><anno>Socket</anno></c> is used to send
-          packets from this port with <c>send/4</c>. When UDP packets arrive
-          at the opened port, if the socket is in an active mode the packets
+          packets from this port with
+          <seealso marker="#send/4"><c>send/4</c></seealso>.
+          When UDP packets arrive
+          at the opened port, if the socket is in an active mode, the packets
           are delivered as messages to the controlling process:</p>
         <code type="none">
 {udp, Socket, IP, InPortNo, Packet}</code>
         <p>If the socket is not in an active mode, data can be
-          retrieved via the <seealso marker="#recv/2">recv/2,3</seealso> calls.
-          Note that arriving UDP packets that are longer than
-          the receive buffer option specifies, might be truncated
+          retrieved through the
+          <seealso marker="#recv/2"><c>recv/2,3</c></seealso> calls.
+          Notice that arriving UDP packets that are longer than
+          the receive buffer option specifies can be truncated
           without warning.</p>
-        <p>When a socket in <c>{active, N}</c> mode (see <seealso marker="inet#setopts/2">
-          inet:setopts/2</seealso> for details) transitions to passive
-          (<c>{active, false}</c>) mode, the controlling process is notified by a
-          message of the following form:</p>
+        <p>When a socket in <c>{active, N}</c> mode (see
+          <seealso marker="inet#setopts/2"><c>inet:setopts/2</c></seealso>
+          for details), transitions to passive (<c>{active, false}</c>) mode,
+          the controlling process is notified by a message of the following
+          form:</p>
         <code type="none">
 {udp_passive, Socket}</code>
         <p><c>IP</c> and <c>InPortNo</c> define the address from which
-          <c>Packet</c> came. <c>Packet</c> is a list of bytes if
-          the option <c>list</c> was specified. <c>Packet</c> is a
-          binary if the option <c>binary</c> was specified.</p>
+          <c>Packet</c> comes. <c>Packet</c> is a list of bytes if
+          option <c>list</c> is specified. <c>Packet</c> is a
+          binary if option <c>binary</c> is specified.</p>
         <p>Default value for the receive buffer option is
           <c>{recbuf, 8192}</c>.</p>
-        <p>If <c><anno>Port</anno> == 0</c>, the underlying OS assigns a free UDP
-          port, use <c>inet:port/1</c> to retrieve it.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="send" arity="4"/>
-      <fsummary>Send a packet</fsummary>
-      <desc>
-        <p>Sends a packet to the specified address and port.
-          The <c><anno>Address</anno></c> argument can be either a hostname, or an
-          IP address.</p>
+        <p>If <c><anno>Port</anno> == 0</c>, the underlying OS assigns a free
+          UDP port, use
+          <seealso marker="inet#port/1"><c>inet:port/1</c></seealso>
+          to retrieve it.</p>
       </desc>
     </func>
+
     <func>
       <name name="recv" arity="2"/>
       <name name="recv" arity="3"/>
-      <fsummary>Receive a packet from a passive socket</fsummary>
-      <desc>
-        <p>This function receives a packet from a socket in passive
-          mode.</p>
-        <p>The optional <c><anno>Timeout</anno></c> parameter specifies a timeout in
-          milliseconds. The default value is <c>infinity</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="controlling_process" arity="2"/>
-      <fsummary>Change controlling process of a socket</fsummary>
+      <fsummary>Receive a packet from a passive socket.</fsummary>
       <desc>
-        <p>Assigns a new controlling process <c><anno>Pid</anno></c> to
-          <c><anno>Socket</anno></c>. The controlling process is the process which
-          receives messages from the socket. If called by any other
-          process than the current controlling process,
-          <c>{error, not_owner}</c> is returned.</p>
+        <p>Receives a packet from a socket in passive mode. Optional parameter
+          <c><anno>Timeout</anno></c> specifies a time-out in milliseconds.
+          Defaults to <c>infinity</c>.</p>
       </desc>
     </func>
+
     <func>
-      <name name="close" arity="1"/>
-      <fsummary>Close a UDP socket</fsummary>
+      <name name="send" arity="4"/>
+      <fsummary>Send a packet.</fsummary>
       <desc>
-        <p>Closes a UDP socket.</p>
+        <p>Sends a packet to the specified address and port. Argument
+          <c><anno>Address</anno></c> can be a hostname or an IP address.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/kernel/doc/src/global.xml b/lib/kernel/doc/src/global.xml
index bd75945115..4442741f54 100644
--- a/lib/kernel/doc/src/global.xml
+++ b/lib/kernel/doc/src/global.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2013</year>
+      <year>1996</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -29,82 +29,67 @@
     <rev></rev>
   </header>
   <module>global</module>
-  <modulesummary>A Global Name Registration Facility</modulesummary>
+  <modulesummary>A global name registration facility.</modulesummary>
   <description>
-    <p>This documentation describes the Global module which consists
-      of the following functionalities:</p>
-
+    <p>This module consists of the following services:</p>
     <list type="bulleted">
-      <item>registration of global names;</item>
-      <item>global locks;</item>
-      <item>maintenance of the fully connected network.</item>
+      <item>Registration of global names</item>
+      <item>Global locks</item>
+      <item>Maintenance of the fully connected network</item>
     </list>
-
-    <p>These services are controlled via the process
-      <c>global_name_server</c> which exists on every node. The global
-      name server is started automatically when a node is started.
+    <p>These services are controlled through the process
+      <c>global_name_server</c> that exists on every node. The global
+      name server starts automatically when a node is started.
       With the term <em>global</em> is meant over a system consisting
-      of several Erlang nodes.</p>
- 
+      of many Erlang nodes.</p>
     <p>The ability to globally register names is a central concept in
       the programming of distributed Erlang systems. In this module,
       the equivalent of the <c>register/2</c> and <c>whereis/1</c>
-      BIFs (for local name registration) are implemented, but for a
+      BIFs (for local name registration) are provided, but for a
       network of Erlang nodes. A registered name is an alias for a
       process identifier (pid). The global name server monitors
-      globally registered pids. If a process terminates, the name will
-      also be globally unregistered.</p>
-
+      globally registered pids. If a process terminates, the name is
+      also globally unregistered.</p>
     <p>The registered names are stored in replica global name tables on
       every node. There is no central storage point. Thus,
       the translation of a name to a pid is fast, as it is always done
-      locally. When any action in taken which results in a change to
-      the global name table, all tables on other nodes are automatically
-      updated.</p>
-
+      locally. For any action resulting in a change to the global name table,
+      all tables on other nodes are automatically updated.</p>
     <p>Global locks have lock identities and are set on a specific
-      resource. For instance, the specified resource could be a pid.
+      resource. For example, the specified resource can be a pid.
       When a global lock is set, access to the locked resource is
-      denied for all other resources other than the lock requester.</p>
-
-    <p>Both the registration and lock functionalities are atomic. All
-      nodes involved in these actions will have the same view of
+      denied for all resources other than the lock requester.</p>
+    <p>Both the registration and lock services are atomic.
+      All nodes involved in these actions have the same view of
       the information.</p>
-
     <p>The global name server also performs the critical task of
-      continuously monitoring changes in node configuration: if a node
-      which runs a globally registered process goes down, the name
-      will be globally unregistered. To this end the global name
+      continuously monitoring changes in node configuration. If a node
+      that runs a globally registered process goes down, the name
+      is globally unregistered. To this end, the global name
       server subscribes to <c>nodeup</c> and <c>nodedown</c> messages
-      sent from the <c>net_kernel</c> module. Relevant Kernel
+      sent from module <c>net_kernel</c>. Relevant Kernel
       application variables in this context are <c>net_setuptime</c>,
       <c>net_ticktime</c>, and <c>dist_auto_connect</c>. See also
-      <seealso marker="kernel_app#net_setuptime">kernel(6)</seealso>.</p>
-
-    <p>The name server will also maintain a fully connected network. For
+      <seealso marker="kernel_app#net_setuptime"><c>kernel(6)</c></seealso>.</p>
+    <p>The name server also maintains a fully connected network. For
       example, if node <c>N1</c> connects to node <c>N2</c> (which is
       already connected to <c>N3</c>), the global name servers on the
-      nodes <c>N1</c> and <c>N3</c> will make sure that also <c>N1</c>
-      and <c>N3</c> are connected. If this is not desired, the command
-      line flag <c>-connect_all false</c> can be used (see also
-      <seealso marker="erts:erl#connect_all">erl(1)</seealso>). In
-      this case the name registration facility cannot be used, but the
-      lock mechanism will still work.</p>
-
+      nodes <c>N1</c> and <c>N3</c> ensure that also <c>N1</c>
+      and <c>N3</c> are connected. If this is not desired,
+      command-line flag <c>-connect_all false</c> can be used (see also
+      <seealso marker="erts:erl#connect_all"><c>erl(1)</c></seealso>).
+      In this case, the name registration service cannot be used, but the
+      lock mechanism still works.</p>
     <p>If the global name server fails to connect nodes (<c>N1</c> and
-      <c>N3</c> in the example above) a warning event is sent to the
+      <c>N3</c> in the example), a warning event is sent to the
       error logger. The presence of such an event does not exclude the
-      possibility that the nodes will later connect--one can for
-      example try the command <c>rpc:call(N1, net_adm, ping, [N2])</c> in
-      the Erlang shell--but it indicates some kind of problem with
-      the network.</p>
-
+      nodes to connect later (you can, for
+      example, try command <c>rpc:call(N1, net_adm, ping, [N2])</c> in
+      the Erlang shell), but it indicates a network problem.</p>
     <note>
-      <p>If the fully connected network is not set up properly, the
-        first thing to try is to increase the value of
-        <c>net_setuptime</c>.</p>
+      <p>If the fully connected network is not set up properly, try
+        first to increase the value of <c>net_setuptime</c>.</p>
     </note>
-
   </description>
 
   <datatypes>
@@ -117,7 +102,7 @@
     <func>
       <name name="del_lock" arity="1"/>
       <name name="del_lock" arity="2"/>
-      <fsummary>Delete a lock</fsummary>
+      <fsummary>Delete a lock.</fsummary>
       <desc>
         <p>Deletes the lock <c><anno>Id</anno></c> synchronously.</p>
       </desc>
@@ -125,11 +110,13 @@
 
     <func>
       <name name="notify_all_name" arity="3"/>
-      <fsummary>Name resolving function that notifies both pids</fsummary>
+      <fsummary>Name resolving function that notifies both pids.</fsummary>
       <desc>
-        <p>This function can be used as a name resolving function for
-          <c>register_name/3</c> and <c>re_register_name/3</c>. It
-          unregisters both pids, and sends the message
+        <p>Can be used as a name resolving function for
+          <seealso marker="#register_name/3"><c>register_name/3</c></seealso>
+          and
+          <seealso marker="#re_register_name/3"><c>re_register_name/3</c></seealso>.</p>
+        <p>The function unregisters both pids and sends the message
           <c>{global_name_conflict, <anno>Name</anno>, OtherPid}</c> to both
           processes.</p>
       </desc>
@@ -137,85 +124,97 @@
 
     <func>
       <name name="random_exit_name" arity="3"/>
-      <fsummary>Name resolving function that kills one pid</fsummary>
+      <fsummary>Name resolving function that kills one pid.</fsummary>
       <desc>
-        <p>This function can be used as a name resolving function for
-          <c>register_name/3</c> and <c>re_register_name/3</c>. It
-          randomly chooses one of the pids for registration and kills
-          the other one.</p>
+        <p>Can be used as a name resolving function for
+          <seealso marker="#register_name/3"><c>register_name/3</c></seealso>
+          and
+          <seealso marker="#re_register_name/3"><c>re_register_name/3</c></seealso>.</p>
+        <p>The function randomly selects one of the pids for registration and
+          kills the other one.</p>
       </desc>
     </func>
 
     <func>
       <name name="random_notify_name" arity="3"/>
-      <fsummary>Name resolving function that notifies one pid</fsummary>
+      <fsummary>Name resolving function that notifies one pid.</fsummary>
       <desc>
-        <p>This function can be used as a name resolving function for
-          <c>register_name/3</c> and <c>re_register_name/3</c>. It
-          randomly chooses one of the pids for registration, and sends
-          the message <c>{global_name_conflict, <anno>Name</anno>}</c> to the other
-          pid.</p>
+        <p>Can be used as a name resolving function for
+          <seealso marker="#register_name/3"><c>register_name/3</c></seealso>
+          and
+          <seealso marker="#re_register_name/3"><c>re_register_name/3</c></seealso>.</p>
+        <p>The function randomly selects one of the pids for registration, and
+          sends the message <c>{global_name_conflict, <anno>Name</anno>}</c> to
+          the other pid.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="re_register_name" arity="2"/>
+      <name name="re_register_name" arity="3"/>
+      <fsummary>Atomically re-register a name.</fsummary>
+      <type name="method"/>
+      <type_desc name="method">{<c>Module</c>, <c>Function</c>}
+        is also allowed.
+      </type_desc>
+      <desc>
+        <p>Atomically changes the registered name <c><anno>Name</anno></c> on
+          all nodes to refer to <c><anno>Pid</anno></c>.</p>
+        <p>Function <c><anno>Resolve</anno></c> has the same behavior as in
+          <seealso marker="#register_name/2"><c>register_name/2,3</c></seealso>.
+        </p>
       </desc>
     </func>
 
     <func>
       <name name="register_name" arity="2"/>
       <name name="register_name" arity="3"/>
-      <fsummary>Globally register a name for a pid</fsummary>
+      <fsummary>Globally register a name for a pid.</fsummary>
       <type name="method"/>
-      <type_desc name="method">{<c>Module</c>, <c>Function</c>}
-        is currently also allowed for backward compatibility, but its use is
-	deprecated
+      <type_desc name="method">{<c>Module</c>, <c>Function</c>} is also
+        allowed for backward compatibility, but its use is deprecated.
       </type_desc>
       <desc>
-        <p>Globally associates the name <c><anno>Name</anno></c> with a pid, that is,
-          Globally notifies all nodes of a new global name in a network
+        <p>Globally associates name <c><anno>Name</anno></c> with a pid, that
+          is, globally notifies all nodes of a new global name in a network
           of Erlang nodes.</p>
-
         <p>When new nodes are added to the network, they are informed
           of the globally registered names that already exist.
           The network is also informed of any global names in newly
           connected nodes. If any name clashes are discovered,
-          the <c><anno>Resolve</anno></c> function is called. Its purpose is to
+          function <c><anno>Resolve</anno></c> is called. Its purpose is to
           decide which pid is correct. If the function crashes, or
           returns anything other than one of the pids, the name is
           unregistered. This function is called once for each name
           clash.</p>
-
 	<warning>
 	  <p>If you plan to change code without restarting your system,
 	  you must use an external fun (<c>fun Module:Function/Arity</c>)
-	  as the <c><anno>Resolve</anno></c> function; if you use a
-	  local fun you can never replace the code for the module that
-	  the fun belongs to.
-	  </p>
+	  as function <c><anno>Resolve</anno></c>. If you use a
+	  local fun, you can never replace the code for the module that
+	  the fun belongs to.</p>
 	</warning>
-
-        <p>There are three pre-defined resolve functions:
+        <p>Three predefined resolve functions exist:
           <c>random_exit_name/3</c>, <c>random_notify_name/3</c>, and
-          <c>notify_all_name/3</c>. If no <c><anno>Resolve</anno></c> function is
-          defined, <c>random_exit_name</c> is used. This means that one
-          of the two registered processes will be selected as correct
+          <c>notify_all_name/3</c>. If no <c><anno>Resolve</anno></c> function
+          is defined, <c>random_exit_name</c> is used. This means that one
+          of the two registered processes is selected as correct
           while the other is killed.</p>
-
-        <p>This function is completely synchronous. This means that
+        <p>This function is completely synchronous, that is,
           when this function returns, the name is either registered on
           all nodes or none.</p>
-
         <p>The function returns <c>yes</c> if successful, <c>no</c> if
           it fails. For example, <c>no</c> is returned if an attempt
           is made to register an already registered process or to
           register a process with a name that is already in use.</p>
-
         <note>
-          <p>Releases up to and including OTP R10 did not check if the
-            process was already registered. As a consequence the
-            global name table could become inconsistent. The old
+          <p>Releases up to and including Erlang/OTP R10 did not check if the
+            process was already registered. The global name table could
+            therefore become inconsistent. The old
             (buggy) behavior can be chosen by giving the Kernel
             application variable <c>global_multi_name_action</c> the
             value <c>allow</c>.</p>
         </note>
-
         <p>If a process with a registered name dies, or the node goes
           down, the name is unregistered on all nodes.</p>
       </desc>
@@ -223,38 +222,20 @@
 
     <func>
       <name name="registered_names" arity="0"/>
-      <fsummary>All globally registered names</fsummary>
-      <desc>
-        <p>Returns a lists of all globally registered names.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="re_register_name" arity="2"/>
-      <name name="re_register_name" arity="3"/>
-      <fsummary>Atomically re-register a name</fsummary>
-      <type name="method"/>
-      <type_desc name="method">{<c>Module</c>, <c>Function</c>}
-        is also allowed
-      </type_desc>
+      <fsummary>All globally registered names.</fsummary>
       <desc>
-        <p>Atomically changes the registered name <c><anno>Name</anno></c> on all
-          nodes to refer to <c><anno>Pid</anno></c>.</p>
-
-        <p>The <c><anno>Resolve</anno></c> function has the same behavior as in
-          <c>register_name/2,3</c>.</p>
+        <p>Returns a list of all globally registered names.</p>
       </desc>
     </func>
 
     <func>
       <name name="send" arity="2"/>
-      <fsummary>Send a message to a globally registered pid</fsummary>
+      <fsummary>Send a message to a globally registered pid.</fsummary>
       <desc>
-        <p>Sends the message <c><anno>Msg</anno></c> to the pid globally registered
+        <p>Sends message <c><anno>Msg</anno></c> to the pid globally registered
           as <c><anno>Name</anno></c>.</p>
-
-        <p>Failure: If <c><anno>Name</anno></c> is not a globally registered
-          name, the calling function will exit with reason
+        <p>If <c><anno>Name</anno></c> is not a globally registered
+          name, the calling function exits with reason
           <c>{badarg, {<anno>Name</anno>, <anno>Msg</anno>}}</c>.</p>
       </desc>
     </func>
@@ -263,7 +244,7 @@
       <name name="set_lock" arity="1"/>
       <name name="set_lock" arity="2"/>
       <name name="set_lock" arity="3"/>
-      <fsummary>Set a lock on the specified nodes</fsummary>
+      <fsummary>Set a lock on the specified nodes.</fsummary>
       <type name="id"/>
       <type name="retries"/>
       <desc>
@@ -271,50 +252,48 @@
           are specified) on <c><anno>ResourceId</anno></c> for
           <c><anno>LockRequesterId</anno></c>. If a lock already exists on
           <c><anno>ResourceId</anno></c> for another requester than
-          <c><anno>LockRequesterId</anno></c>, and <c><anno>Retries</anno></c> is not equal to 0,
-          the process sleeps for a while and will try to execute
-          the action later. When <c><anno>Retries</anno></c> attempts have been made,
-          <c>false</c> is returned, otherwise <c>true</c>. If
-          <c><anno>Retries</anno></c> is <c>infinity</c>, <c>true</c> is eventually
-          returned (unless the lock is never released).</p>
-
-        <p>If no value for <c><anno>Retries</anno></c> is given, <c>infinity</c> is
-          used.</p>
-
+          <c><anno>LockRequesterId</anno></c>, and <c><anno>Retries</anno></c>
+          is not equal to <c>0</c>, the process sleeps for a while and tries
+          to execute the action later. When <c><anno>Retries</anno></c>
+          attempts have been made, <c>false</c> is returned, otherwise
+          <c>true</c>. If <c><anno>Retries</anno></c> is <c>infinity</c>,
+          <c>true</c> is eventually returned (unless the lock is never
+          released).</p>
+        <p>If no value for <c><anno>Retries</anno></c> is specified,
+          <c>infinity</c> is used.</p>
         <p>This function is completely synchronous.</p>
-
-        <p>If a process which holds a lock dies, or the node goes
+        <p>If a process that holds a lock dies, or the node goes
           down, the locks held by the process are deleted.</p>
-
         <p>The global name server keeps track of all processes sharing
           the same lock, that is, if two processes set the same lock,
           both processes must delete the lock.</p>
-
         <p>This function does not address the problem of a deadlock. A
           deadlock can never occur as long as processes only lock one
-          resource at a time. But if some processes try to lock two or
-          more resources, a deadlock may occur. It is up to the
+          resource at a time. A deadlock can occur if some processes
+          try to lock two or more resources. It is up to the
           application to detect and rectify a deadlock.</p>
-
         <note>
-          <p>Some values of <c><anno>ResourceId</anno></c> should be avoided or
-            Erlang/OTP will not work properly. A list of resources to
-            avoid: <c>global</c>, <c>dist_ac</c>,
-            <c>mnesia_table_lock</c>, <c>mnesia_adjust_log_writes</c>,
-            <c>pg2</c>.</p>
+          <p>Avoid the following values of <c><anno>ResourceId</anno></c>,
+            otherwise Erlang/OTP does not work properly:</p>
+          <list type="bulleted">
+            <item><c>dist_ac</c></item>
+            <item><c>global</c></item>
+            <item><c>mnesia_adjust_log_writes</c></item>
+            <item><c>mnesia_table_lock</c></item>
+            <item><c>pg2</c></item>
+          </list>
         </note>
-
       </desc>
     </func>
 
     <func>
       <name name="sync" arity="0"/>
-      <fsummary>Synchronize the global name server</fsummary>
+      <fsummary>Synchronize the global name server.</fsummary>
       <desc>
         <p>Synchronizes the global name server with all nodes known to
-          this node. These are the nodes which are returned from
+          this node. These are the nodes that are returned from
           <c>erlang:nodes()</c>. When this function returns,
-          the global name server will receive global information from
+          the global name server receives global information from
           all nodes. This function can be called when new nodes are
           added to the network.</p>
         <p>The only possible error reason <c>Reason</c> is
@@ -326,24 +305,25 @@
       <name name="trans" arity="2"/>
       <name name="trans" arity="3"/>
       <name name="trans" arity="4"/>
-      <fsummary>Micro transaction facility</fsummary>
+      <fsummary>Micro transaction facility.</fsummary>
       <type name="retries"/>
       <type name="trans_fun"/>
       <desc>
-        <p>Sets a lock on <c><anno>Id</anno></c> (using <c>set_lock/3</c>). If this
-          succeeds, <c><anno>Fun</anno>()</c> is evaluated and the result <c><anno>Res</anno></c>
-          is returned.  Returns <c>aborted</c> if the lock attempt
-          failed. If <c><anno>Retries</anno></c> is set to <c>infinity</c>,
-          the transaction will not abort.</p>
-
-        <p><c>infinity</c> is the default setting and will be used if 
-          no value is given for <c><anno>Retries</anno></c>.</p>
+        <p>Sets a lock on <c><anno>Id</anno></c> (using
+          <seealso marker="#set_lock/3"><c>set_lock/3</c></seealso>).
+          If this succeeds, <c><anno>Fun</anno>()</c> is evaluated and the
+          result <c><anno>Res</anno></c>
+          is returned. Returns <c>aborted</c> if the lock attempt fails.
+          If <c><anno>Retries</anno></c> is set to <c>infinity</c>,
+          the transaction does not abort.</p>
+        <p><c>infinity</c> is the default setting and is used if
+          no value is specified for <c><anno>Retries</anno></c>.</p>
       </desc>
     </func>
 
     <func>
       <name name="unregister_name" arity="1"/>
-      <fsummary>Remove a globally registered name for a pid</fsummary>
+      <fsummary>Remove a globally registered name for a pid.</fsummary>
       <desc>
         <p>Removes the globally registered name <c><anno>Name</anno></c> from
           the network of Erlang nodes.</p>
@@ -352,7 +332,7 @@
 
     <func>
       <name name="whereis_name" arity="1"/>
-      <fsummary>Get the pid with a given globally registered name</fsummary>
+      <fsummary>Get the pid with a specified globally registered name.</fsummary>
       <desc>
         <p>Returns the pid with the globally registered name
           <c><anno>Name</anno></c>. Returns <c>undefined</c> if the name is not
@@ -363,8 +343,8 @@
 
   <section>
     <title>See Also</title>
-    <p><seealso marker="global_group">global_group(3)</seealso>,
-       <seealso marker="net_kernel">net_kernel(3)</seealso></p>
+    <p><seealso marker="global_group"><c>global_group(3)</c></seealso>,
+      <seealso marker="net_kernel"><c>net_kernel(3)</c></seealso></p>
   </section>
 </erlref>
 
diff --git a/lib/kernel/doc/src/global_group.xml b/lib/kernel/doc/src/global_group.xml
index 4b21b0a14a..8f947b9adf 100644
--- a/lib/kernel/doc/src/global_group.xml
+++ b/lib/kernel/doc/src/global_group.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2013</year>
+      <year>1998</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -26,22 +26,22 @@
     <prepared>Esko Vierum&auml;ki</prepared>
     <docno></docno>
     <date>1998-12-18</date>
-    <rev>b</rev>
+    <rev>B</rev>
   </header>
   <module>global_group</module>
-  <modulesummary>Grouping Nodes to Global Name Registration Groups</modulesummary>
+  <modulesummary>Grouping nodes to global name registration groups.</modulesummary>
   <description>
-    <p>The global group function makes it possible to group the nodes
-      in a system into partitions, each partition having its own global
-      name space, refer to <c>global(3)</c>. These partitions are
-      called global groups.</p>
-    <p>The main advantage of dividing systems to global groups is that
+    <p>This module makes it possible to partition the nodes of a
+      system into <em>global groups</em>. Each global group has its own
+      global namespace, see <seealso marker="global">
+      <c>global(3)</c></seealso>.</p>
+    <p>The main advantage of dividing systems into global groups is that
       the background load decreases while the number of nodes to be
       updated is reduced when manipulating globally registered names.</p>
     <p>The Kernel configuration parameter <c>global_groups</c> defines
       the global groups (see also
-      <seealso marker="kernel_app">kernel(6)</seealso>,
-      <seealso marker="config">config(4)</seealso>:</p>
+      <seealso marker="kernel_app#global_groups"><c>kernel(6)</c></seealso>
+      and <seealso marker="config"><c>config(4)</c></seealso>):</p>
     <code type="none">
 {global_groups, [GroupTuple :: group_tuple()]}</code>
     <p>For the processes and nodes to run smoothly using the global
@@ -54,22 +54,24 @@
       </item>
       <item>
         <p>All involved nodes must agree on the global group definition,
-          or the behavior of the system is undefined.</p>
+          otherwise the behavior of the system is undefined.</p>
       </item>
       <item>
-        <p><em>All</em> nodes in the system should belong to exactly
+        <p><em>All</em> nodes in the system must belong to exactly
           one global group.</p>
       </item>
     </list>
-    <p>In the following description, a <em>group node</em> is a node
+    <p>In the following descriptions, a <em>group node</em> is a node
       belonging to the same global group as the local node.</p>
   </description>
-  <datatypes>
+
+ <datatypes>
     <datatype>
       <name name="group_tuple"/>
       <desc>
         <p>A <c>GroupTuple</c> without <c>PublishType</c> is the same as a
-          <c>GroupTuple</c> with <c>PublishType == normal</c>.</p>
+          <c>GroupTuple</c> with <c>PublishType</c> equal to <c>normal</c>.
+	</p>
       </desc>
     </datatype>
     <datatype>
@@ -78,52 +80,57 @@
     <datatype>
       <name name="publish_type"/>
       <desc>
-        <p>A node started with the command line flag <c>-hidden</c>, see
-          <seealso marker="erts:erl">erl(1)</seealso>, is said to be a
-          <em>hidden</em> node. A hidden node will establish hidden
+        <p>A node started with command-line flag <c>-hidden</c> (see
+          <seealso marker="erts:erl"><c>erl(1)</c></seealso>) is said
+          to be a <em>hidden</em> node. A hidden node establishes hidden
           connections to nodes not part of the same global group, but
           normal (visible) connections to nodes part of the same global
           group.</p>
-        <p>A global group defined with <c>PublishType == hidden</c>, is
-          said to be a hidden global group. All nodes in a hidden global
-          group are hidden nodes, regardless if they are started with
-          the <c>-hidden</c> command line flag or not.</p>
+        <p>A global group defined with <c>PublishType</c> equal to
+	  <c>hidden</c> is said to be a hidden global group.
+	  All nodes in a hidden global
+          group are hidden nodes, whether they are started with
+          command-line flag <c>-hidden</c> or not.</p>
       </desc>
     </datatype>
     <datatype>
       <name name="name"/>
       <desc><p>A registered name.</p></desc>
     </datatype>
+
     <datatype>
       <name name="where"/>
     </datatype>
   </datatypes>
+
   <funcs>
     <func>
       <name name="global_groups" arity="0"/>
-      <fsummary>Return the global group names</fsummary>
+      <fsummary>Return the global group names.</fsummary>
       <desc>
-        <p>Returns a tuple containing the name of the global group
+        <p>Returns a tuple containing the name of the global group that
           the local node belongs to, and the list of all other known
           group names. Returns <c>undefined</c> if no global groups are
           defined.</p>
       </desc>
     </func>
+
     <func>
       <name name="info" arity="0"/>
-      <fsummary>Information about global groups</fsummary>
+      <fsummary>Information about global groups.</fsummary>
       <type name="info_item"/>
       <type name="sync_state"/>
       <desc>
         <p>Returns a list containing information about the global
-          groups. Each element of the list is a tuple. The order of
-          the tuples is not defined.</p>
+          groups. Each list element is a tuple. The order of
+          the tuples is undefined.</p>
         <taglist>
           <tag><c>{state, <anno>State</anno>}</c></tag>
           <item>
             <p>If the local node is part of a global group,
-              <c><anno>State</anno> == synced</c>. If no global groups are defined,
-              <c><anno>State</anno> == no_conf</c>.</p>
+              <c><anno>State</anno></c> is equal to <c>synced</c>.
+              If no global groups are defined,
+              <c><anno>State</anno></c> is equal to <c>no_conf</c>.</p>
           </item>
           <tag><c>{own_group_name, <anno>GroupName</anno>}</c></tag>
           <item>
@@ -152,117 +159,131 @@
           <tag><c>{other_groups, <anno>Groups</anno>}</c></tag>
           <item>
             <p><c><anno>Groups</anno></c> is a list of tuples
-              <c>{<anno>GroupName</anno>, <anno>Nodes</anno>}</c>, specifying the name and nodes
+              <c>{<anno>GroupName</anno>, <anno>Nodes</anno>}</c>,
+              specifying the name and nodes
               of the other global groups.</p>
           </item>
           <tag><c>{monitoring, <anno>Pids</anno>}</c></tag>
           <item>
-            <p>A list of pids, specifying the processes which have
+            <p>A list of pids, specifying the processes that have
               subscribed to <c>nodeup</c> and <c>nodedown</c> messages.</p>
           </item>
         </taglist>
       </desc>
     </func>
+
     <func>
       <name name="monitor_nodes" arity="1"/>
-      <fsummary>Subscribe to node status changes</fsummary>
+      <fsummary>Subscribe to node status changes.</fsummary>
       <desc>
-        <p>Depending on <c><anno>Flag</anno></c>, the calling process starts
-          subscribing (<c><anno>Flag</anno> == true</c>) or stops subscribing
-          (<c><anno>Flag</anno> == false</c>) to node status change messages.</p>
-        <p>A process which has subscribed will receive the messages
+        <p>Depending on <c><anno>Flag</anno></c>, the calling process
+          starts subscribing (<c><anno>Flag</anno></c> equal to
+          <c>true</c>) or stops subscribing (<c><anno>Flag</anno></c>
+          equal to <c>false</c>) to node status change messages.</p>
+        <p>A process that has subscribed receives the messages
           <c>{nodeup, Node}</c> and <c>{nodedown, Node}</c> when a
           group node connects or disconnects, respectively.</p>
       </desc>
     </func>
+
     <func>
       <name name="own_nodes" arity="0"/>
-      <fsummary>Return the group nodes</fsummary>
+      <fsummary>Return the group nodes.</fsummary>
       <desc>
         <p>Returns the names of all group nodes, regardless of their
           current status.</p>
       </desc>
     </func>
+
     <func>
       <name name="registered_names" arity="1"/>
-      <fsummary>Return globally registered names</fsummary>
+      <fsummary>Return globally registered names.</fsummary>
       <desc>
-        <p>Returns a list of all names which are globally registered
+        <p>Returns a list of all names that are globally registered
           on the specified node or in the specified global group.</p>
       </desc>
     </func>
+
     <func>
       <name name="send" arity="2"/>
       <name name="send" arity="3"/>
-      <fsummary>Send a message to a globally registered pid</fsummary>
+      <fsummary>Send a message to a globally registered pid.</fsummary>
       <desc>
         <p>Searches for <c><anno>Name</anno></c>, globally registered on
-          the specified node or in the specified global group, or --
-          if the <c><anno>Where</anno></c> argument is not provided -- in any global
-          group. The global groups are searched in the order in which
-          they appear in the value of the <c>global_groups</c>
-          configuration parameter.</p>
-        <p>If <c><anno>Name</anno></c> is found, the message <c><anno>Msg</anno></c> is sent to
+          the specified node or in the specified global group, or
+          (if argument <c><anno>Where</anno></c> is not provided) in any
+          global group. The global groups are searched in the order that
+          they appear in the value of configuration parameter
+          <c>global_groups</c>.</p>
+        <p>If <c><anno>Name</anno></c> is found, message
+          <c><anno>Msg</anno></c> is sent to
           the corresponding pid. The pid is also the return value of
           the function. If the name is not found, the function returns
           <c>{badarg, {<anno>Name</anno>, <anno>Msg</anno>}}</c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="sync" arity="0"/>
-      <fsummary>Synchronize the group nodes</fsummary>
+      <fsummary>Synchronize the group nodes.</fsummary>
       <desc>
         <p>Synchronizes the group nodes, that is, the global name
-          servers on the group nodes. Also check the names globally
+          servers on the group nodes. Also checks the names globally
           registered in the current global group and unregisters them
           on any known node not part of the group.</p>
         <p>If synchronization is not possible, an error report is sent
-          to the error logger (see also <c>error_logger(3)</c>).</p>
-        <p>Failure:
-          <c>{error, {'invalid global_groups definition', Bad}}</c> if
-          the <c>global_groups</c> configuration parameter has an
+          to the error logger (see also
+          <seealso marker="error_logger"><c>error_logger(3)</c></seealso>.
+        </p>
+        <p>Returns <c>{error, {'invalid global_groups definition', Bad}}</c>
+          if configuration parameter <c>global_groups</c> has an
           invalid value <c>Bad</c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="whereis_name" arity="1"/>
       <name name="whereis_name" arity="2"/>
-      <fsummary>Get the pid with a given globally registered name</fsummary>
+      <fsummary>Get the pid with a specified globally registered name.</fsummary>
       <desc>
         <p>Searches for <c><anno>Name</anno></c>, globally registered on
-          the specified node or in the specified global group, or -- if
-          the <c><anno>Where</anno></c> argument is not provided -- in any global
-          group. The global groups are searched in the order in which
-          they appear in the value of the <c>global_groups</c>
-          configuration parameter.</p>
-        <p>If <c><anno>Name</anno></c> is found, the corresponding pid is returned.
-          If the name is not found, the function returns
+          the specified node or in the specified global group, or
+          (if argument <c><anno>Where</anno></c> is not provided) in any global
+          group. The global groups are searched in the order that
+          they appear in the value of configuration parameter
+          <c>global_groups</c>.</p>
+        <p>If <c><anno>Name</anno></c> is found, the corresponding pid is
+          returned. If the name is not found, the function returns
           <c>undefined</c>.</p>
       </desc>
     </func>
   </funcs>
 
   <section>
-    <title>NOTE</title>
-    <p>In the situation where a node has lost its connections to other
-      nodes in its global group, but has connections to nodes in other
-      global groups, a request from another global group may produce an
-      incorrect or misleading result. For example, the isolated node may
-      not have accurate information about registered names in its
-      global group.</p>
-    <p>Note also that the <c>send/2,3</c> function is not secure.</p>
-    <p>Distribution of applications is highly dependent of the global
-      group definitions. It is not recommended that an application is 
-      distributed over several global groups of the obvious reason that
-      the registered names may be moved to another global group at
-      failover/takeover. There is nothing preventing doing this, but
-      the application code must in such case handle the situation.</p>
+    <title>Notes</title>
+    <list type="bulleted">
+      <item><p>In the situation where a node has lost its connections to other
+        nodes in its global group, but has connections to nodes in other
+        global groups, a request from another global group can produce an
+        incorrect or misleading result. For example, the isolated node can
+        have inaccurate information about registered names in its
+        global group.</p></item>
+     <item><p>Function
+       <seealso marker="#send/2"><c>send/2,3</c></seealso>
+       is not secure.</p></item>
+     <item><p>Distribution of applications is highly dependent of the global
+        group definitions. It is not recommended that an application is
+        distributed over many global groups, as
+        the registered names can be moved to another global group at
+        failover/takeover. Nothing prevents this to be done, but
+        the application code must then handle the situation.</p></item>
+    </list>
   </section>
 
   <section>
-    <title>SEE ALSO</title>
-    <p><seealso marker="erts:erl">erl(1)</seealso>,
-      <seealso marker="global">global(3)</seealso></p>
+    <title>See Also</title>
+    <p><seealso marker="global"><c>global(3)</c></seealso>,
+      <seealso marker="erts:erl"><c>erl(1)</c></seealso></p>
   </section>
 </erlref>
 
diff --git a/lib/kernel/doc/src/heart.xml b/lib/kernel/doc/src/heart.xml
index b9fad17ce1..7c37c5ea00 100644
--- a/lib/kernel/doc/src/heart.xml
+++ b/lib/kernel/doc/src/heart.xml
@@ -29,131 +29,180 @@
     <rev>A</rev>
   </header>
   <module>heart</module>
-  <modulesummary>Heartbeat Monitoring of an Erlang Runtime System</modulesummary>
+  <modulesummary>Heartbeat monitoring of an Erlang runtime system.</modulesummary>
   <description>
     <p>This modules contains the interface to the <c>heart</c> process.
       <c>heart</c> sends periodic heartbeats to an external port
       program, which is also named <c>heart</c>. The purpose of
-      the heart port program is to check that the Erlang runtime system
+      the <c>heart</c> port program is to check that the Erlang runtime system
       it is supervising is still running. If the port program has not
       received any heartbeats within <c>HEART_BEAT_TIMEOUT</c> seconds
-      (default is 60 seconds), the system can be rebooted. Also, if
+      (defaults to 60 seconds), the system can be rebooted. Also, if
       the system is equipped with a hardware watchdog timer and is
       running Solaris, the watchdog can be used to supervise the entire
       system.</p>
-    <p>An Erlang runtime system to be monitored by a heart program,
-      should be started with the command line flag <c>-heart</c> (see
-      also <seealso marker="erts:erl">erl(1)</seealso>). The <c>heart</c>
-      process is then started automatically:</p>
+    <p>An Erlang runtime system to be monitored by a heart program
+      is to be started with command-line flag <c>-heart</c> (see
+      also <seealso marker="erts:erl"><c>erl(1)</c></seealso>).
+      The <c>heart</c> process is then started automatically:</p>
     <pre>
 % <input>erl -heart ...</input></pre>
-    <p>If the system should be rebooted because of missing heart-beats,
-      or a terminated Erlang runtime system, the environment variable
-      <c>HEART_COMMAND</c> has to be set before the system is started.
-      If this variable is not set, a warning text will be printed but
-      the system will not reboot. However, if the hardware watchdog is
-      used, it will trigger a reboot <c>HEART_BEAT_BOOT_DELAY</c>
-      seconds later nevertheless (default is 60).</p>
-    <p>To reboot on the WINDOWS platform <c>HEART_COMMAND</c> can be
+    <p>If the system is to be rebooted because of missing heartbeats,
+      or a terminated Erlang runtime system, environment variable
+      <c>HEART_COMMAND</c> must be set before the system is started.
+      If this variable is not set, a warning text is printed but
+      the system does not reboot. However, if the hardware watchdog is
+      used, it still triggers a reboot <c>HEART_BEAT_BOOT_DELAY</c>
+      seconds later (defaults to 60 seconds).</p>
+    <p>To reboot on Windows, <c>HEART_COMMAND</c> can be
       set to <c>heart -shutdown</c> (included in the Erlang delivery)
-      or of course to any other suitable program which can activate a
-      reboot.</p>
-    <p>The hardware watchdog will not be started under Solaris if
-      the environment variable <c>HW_WD_DISABLE</c> is set.</p>
-    <p>The <c>HEART_BEAT_TIMEOUT</c> and <c>HEART_BEAT_BOOT_DELAY</c>
-      environment variables can be used to configure the heart timeouts,
-      they can be set in the operating system shell before Erlang is
-      started or be specified at the command line:</p>
+      or to any other suitable program that can activate a reboot.</p>
+    <p>The hardware watchdog is not started under Solaris if
+      environment variable <c>HW_WD_DISABLE</c> is set.</p>
+    <p>The environment variables <c>HEART_BEAT_TIMEOUT</c> and
+      <c>HEART_BEAT_BOOT_DELAY</c> can be used to configure the heart
+      time-outs; they can be set in the operating system shell before Erlang
+      is started or be specified at the command line:</p>
     <pre>
 % <input>erl -heart -env HEART_BEAT_TIMEOUT 30 ...</input></pre>
     <p>The value (in seconds) must be in the range 10 &lt; X &lt;= 65535.</p>
-    <p>It should be noted that if the system clock is adjusted with
-      more than <c>HEART_BEAT_TIMEOUT</c> seconds, <c>heart</c> will
-      timeout and try to reboot the system. This can happen, for
-      example, if the system clock is adjusted automatically by use of
-      NTP (Network Time Protocol).</p>
-
-  <p> If a crash occurs, an <c><![CDATA[erl_crash.dump]]></c> will <em>not</em> be written
-	  unless the environment variable <c><![CDATA[ERL_CRASH_DUMP_SECONDS]]></c> is set.
-  </p>
-
+    <p>Notice that if the system clock is adjusted with
+      more than <c>HEART_BEAT_TIMEOUT</c> seconds, <c>heart</c>
+      times out and tries to reboot the system. This can occur, for
+      example, if the system clock is adjusted automatically by use of the
+      Network Time Protocol (NTP).</p>
+    <p>If a crash occurs, an <c><![CDATA[erl_crash.dump]]></c> is <em>not</em>
+      written unless environment variable
+        <c><![CDATA[ERL_CRASH_DUMP_SECONDS]]></c> is set:</p>
     <pre>
 % <input>erl -heart -env ERL_CRASH_DUMP_SECONDS 10 ...</input></pre>
-
-  <p> If a regular core dump is wanted, let heart know by setting the kill signal to abort
-      using the environment variable <c><![CDATA[HEART_KILL_SIGNAL=SIGABRT]]></c>.
-      If unset, or not set to <c><![CDATA[SIGABRT]]></c>, the default behaviour will be a kill
-      signal using <c><![CDATA[SIGKILL]]></c>.
-  </p>
-
+    <p>If a regular core dump is wanted, let <c>heart</c> know by setting
+      the kill signal to abort using environment variable
+      <c><![CDATA[HEART_KILL_SIGNAL=SIGABRT]]></c>. If unset, or not set to
+      <c><![CDATA[SIGABRT]]></c>, the default behavior is a kill signal using
+      <c><![CDATA[SIGKILL]]></c>:</p>
     <pre>
 % <input>erl -heart -env HEART_KILL_SIGNAL SIGABRT ...</input></pre>
-
-  <p>
-	  Furthermore, <c><![CDATA[ERL_CRASH_DUMP_SECONDS]]></c> has the following behaviour on
-	  <c>heart</c>:
-  </p>
-  <taglist>
-	  <tag><c><![CDATA[ERL_CRASH_DUMP_SECONDS=0]]></c></tag>
-	  <item><p>
-			  Suppresses the writing a crash dump file entirely,
-			  thus rebooting the runtime system immediately.
-			  This is the same as not setting the environment variable.
-		  </p>
-	  </item>
-	  <tag><c><![CDATA[ERL_CRASH_DUMP_SECONDS=-1]]></c></tag>
-	  <item><p> Setting the environment variable to a negative value will not reboot
-			  the runtime system until the crash dump file has been completly written.
-		  </p>
-	  </item>
-	  <tag><c><![CDATA[ERL_CRASH_DUMP_SECONDS=S]]></c></tag>
-	  <item><p>
-			  Heart will wait for <c>S</c> seconds to let the crash dump file be written.
-			  After <c>S</c> seconds <c>heart</c> will reboot the runtime system regardless of
-			  the crash dump file has been written or not.
-		  </p>
-	  </item>
-  </taglist>
-
-    <p>In the following descriptions, all function fails with reason
+    <p>Furthermore, <c><![CDATA[ERL_CRASH_DUMP_SECONDS]]></c> has the
+      following behavior on <c>heart</c>:</p>
+    <taglist>
+      <tag><c><![CDATA[ERL_CRASH_DUMP_SECONDS=0]]></c></tag>
+      <item><p>Suppresses the writing of a crash dump file entirely,
+        thus rebooting the runtime system immediately.
+        This is the same as not setting the environment variable.</p>
+      </item>
+      <tag><c><![CDATA[ERL_CRASH_DUMP_SECONDS=-1]]></c></tag>
+      <item><p>Setting the environment variable to a negative value does not
+        reboot the runtime system until the crash dump file is completly
+        written.</p>
+      </item>
+      <tag><c><![CDATA[ERL_CRASH_DUMP_SECONDS=S]]></c></tag>
+      <item><p><c>heart</c> waits for <c>S</c> seconds to let the crash dump
+        file be written. After <c>S</c> seconds, <c>heart</c> reboots the
+        runtime system, whether the crash dump file is written or not.</p>
+      </item>
+    </taglist>
+    <p>In the following descriptions, all functions fail with reason
       <c>badarg</c> if <c>heart</c> is not started.</p>
   </description>
+
+  <datatypes>
+      <datatype>
+          <name name="heart_option"/>
+      </datatype>
+  </datatypes>
+
   <funcs>
     <func>
       <name name="set_cmd" arity="1"/>
-      <fsummary>Set a temporary reboot command</fsummary>
+      <fsummary>Set a temporary reboot command.</fsummary>
       <desc>
-        <p>Sets a temporary reboot command. This command is used if 
+        <p>Sets a temporary reboot command. This command is used if
           a <c>HEART_COMMAND</c> other than the one specified with
-          the environment variable should be used in order to reboot
-          the system. The new Erlang runtime system will (if it
-          misbehaves) use the environment variable
-          <c>HEART_COMMAND</c> to reboot.</p>
-
-        <p>Limitations: The <c><anno>Cmd</anno></c> command string
-        will be sent to the heart program as a ISO-latin-1 or UTF-8
-        encoded binary depending on the file name encoding mode of the
-        emulator (see
-	<seealso marker="kernel:file#native_name_encoding/0"><c>file:native_name_encoding/0</c></seealso>).
-	The size of the encoded binary must be less than 2047 bytes.</p>
+          the environment variable is to be used to reboot
+          the system. The new Erlang runtime system uses (if it misbehaves)
+          environment variable <c>HEART_COMMAND</c> to reboot.</p>
+        <p>Limitations: Command string <c><anno>Cmd</anno></c> is sent to the
+          <c>heart</c> program as an ISO Latin-1 or UTF-8 encoded binary,
+          depending on the filename encoding mode of the emulator (see
+          <seealso marker="kernel:file#native_name_encoding/0"><c>file:native_name_encoding/0</c></seealso>).
+          The size of the encoded binary must be less than 2047 bytes.</p>
       </desc>
     </func>
+
     <func>
       <name name="clear_cmd" arity="0"/>
-      <fsummary>Clear the temporary boot command</fsummary>
+      <fsummary>Clear the temporary boot command.</fsummary>
       <desc>
         <p>Clears the temporary boot command. If the system terminates,
           the normal <c>HEART_COMMAND</c> is used to reboot.</p>
       </desc>
     </func>
+
     <func>
       <name name="get_cmd" arity="0"/>
+      <fsummary>Get the temporary reboot command.</fsummary>
+      <desc>
+        <p>Gets the temporary reboot command. If the command is cleared,
+          the empty string is returned.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="set_callback" arity="2"/>
+      <fsummary>Set a validation callback</fsummary>
+      <desc>
+          <p> This validation callback will be executed before any
+          heartbeat is sent to the port program. For the validation to
+          succeed it needs to return with the value <c>ok</c>.
+        </p>
+        <p>An exception within the callback will be treated as a validation failure.</p>
+        <p>The callback will be removed if the system reboots.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="clear_callback" arity="0"/>
+      <fsummary>Clear the validation callback</fsummary>
+      <desc>
+          <p>Removes the validation callback call before heartbeats.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="get_callback" arity="0"/>
+      <fsummary>Get the validation callback</fsummary>
+      <desc>
+          <p>Get the validation callback. If the callback is cleared, <c>none</c> will be returned.</p>
+      </desc>
+    </func>
+
+    <func>
+        <name name="set_options" arity="1"/>
+        <fsummary>Set a list of options</fsummary>
+        <desc>
+            <p> Valid options <c>set_options</c> are: </p>
+            <taglist>
+                <tag><c>check_schedulers</c></tag>
+                <item>
+                    <p>If enabled, a signal will be sent to each scheduler to check its
+                        responsiveness. The system check occurs before any heartbeat sent
+                        to the port program. If any scheduler is not responsive enough the
+                        heart program will not receive its heartbeat and thus eventually terminate the node.
+                    </p>
+                </item>
+            </taglist>
+            <p> Returns with the value <c>ok</c> if the options are valid.</p>
+        </desc>
+    </func>
+    <func>
+      <name name="get_options" arity="0"/>
       <fsummary>Get the temporary reboot command</fsummary>
       <desc>
-        <p>Get the temporary reboot command. If the command is cleared,
-          the empty string will be returned.</p>
+          <p>Returns <c>{ok, Options}</c> where <c>Options</c> is a list of current options enabled for heart.
+              If the callback is cleared, <c>none</c> will be returned.</p>
       </desc>
     </func>
+
+
   </funcs>
 </erlref>
 
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 088d78c1d6..cfff393b8c 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -29,43 +29,47 @@
     <rev>A</rev>
   </header>
   <module>inet</module>
-  <modulesummary>Access to TCP/IP Protocols</modulesummary>
+  <modulesummary>Access to TCP/IP protocols.</modulesummary>
   <description>
-    <p>Provides access to TCP/IP protocols.</p>
-    <p>See also <em>ERTS User's Guide, Inet configuration</em> for more
-      information on how to configure an Erlang runtime system for IP
-      communication.</p>
-    <p>Two Kernel configuration parameters affect the behaviour of all
-      sockets opened on an Erlang node:
-      <c>inet_default_connect_options</c> can contain a list of default
-      options used for all sockets returned when doing <c>connect</c>,
-      and <c>inet_default_listen_options</c> can contain a list of
-      default options used when issuing a <c>listen</c> call. When
-      <c>accept</c> is issued, the values of the listensocket options
-      are inherited, why no such application variable is needed for
+    <p>This module provides access to TCP/IP protocols.</p>
+    <p>See also
+      <seealso marker="erts:inet_cfg">ERTS User's Guide:
+      Inet Configuration</seealso> for more information about how to
+      configure an Erlang runtime system for IP communication.</p>
+    <p>The following two <c>Kernel</c> configuration parameters affect the
+      behavior of all sockets opened on an Erlang node:</p>
+    <list type="bulleted">
+      <item><p><c>inet_default_connect_options</c> can contain a list of
+        default options used for all sockets returned when doing
+        <c>connect</c>.</p></item>
+      <item><p><c>inet_default_listen_options</c> can contain a list of
+        default options used when issuing a <c>listen</c> call.</p></item>
+    </list>
+    <p>When <c>accept</c> is issued, the values of the listening socket options
+      are inherited. No such application variable is therefore needed for
       <c>accept</c>.</p>
-    <p>Using the Kernel configuration parameters mentioned above, one
-      can set default options for all TCP sockets on a node. This should
-      be used with care, but options like <c>{delay_send,true}</c>
-      might be specified in this way. An example of starting an Erlang
-      node with all sockets using delayed send could look like this:</p>
+    <p>Using the <c>Kernel</c> configuration parameters above, one
+      can set default options for all TCP sockets on a node, but use this
+      with care. Options such as <c>{delay_send,true}</c> can be
+      specified in this way. The following is an example of starting an Erlang
+      node with all sockets using delayed send:</p>
     <pre>
 $ <input>erl -sname test -kernel \</input>
 <input>inet_default_connect_options '[{delay_send,true}]' \</input>
 <input>inet_default_listen_options '[{delay_send,true}]'</input></pre>
-    <p>Note that the default option <c>{active, true}</c> currently
+    <p>Notice that default option <c>{active, true}</c>
       cannot be changed, for internal reasons.</p>
     <p>Addresses as inputs to functions can be either a string or a
-      tuple. For instance, the IP address 150.236.20.73 can be passed to
-      <c>gethostbyaddr/1</c> either as the string "150.236.20.73"
-      or as the tuple <c>{150, 236, 20, 73}</c>.</p>
-    <p>IPv4 address examples:</p>
+      tuple. For example, the IP address 150.236.20.73 can be passed to
+      <c>gethostbyaddr/1</c>, either as string <c>"150.236.20.73"</c>
+      or as tuple <c>{150, 236, 20, 73}</c>.</p>
+    <p><em>IPv4 address examples:</em></p>
     <code type="none">
 Address          ip_address()
 -------          ------------
 127.0.0.1        {127,0,0,1}
 192.168.42.2     {192,168,42,2}</code>
-    <p>IPv6 address examples:</p>
+    <p><em>IPv6 address examples:</em></p>
     <code type="none">
 Address          ip_address()
 -------          ------------
@@ -77,7 +81,9 @@ FFFF::192.168.42.2
                 {16#3ffe,16#b80,16#1f8d,16#2,16#204,16#acff,16#fe17,16#bf38}
 fe80::204:acff:fe17:bf38
                 {16#fe80,0,0,0,0,16#204,16#acff,16#fe17,16#bf38}</code>
-    <p>A function that may be useful is <seealso marker="#parse_address/1">parse_address/1</seealso>:</p>
+    <p>Function
+      <seealso marker="#parse_address/1"><c>parse_address/1</c></seealso>
+        can be useful:</p>
     <pre>
 1> <input>inet:parse_address("192.168.42.2").</input>
 {ok,{192,168,42,2}}
@@ -89,9 +95,12 @@ fe80::204:acff:fe17:bf38
     <datatype>
       <name name="hostent"/>
       <desc>
-        <p>The record is defined in the Kernel include file "inet.hrl".
-          Add the following directive to the module:</p>
-<code>-include_lib("kernel/include/inet.hrl").</code></desc>
+        <p>The record is defined in the <c>Kernel</c> include file
+          <c>"inet.hrl"</c>.</p>
+        <p>Add the following directive to the module:</p>
+        <code>
+-include_lib("kernel/include/inet.hrl").</code>
+      </desc>
     </datatype>
     <datatype>
       <name name="hostname"/>
@@ -110,17 +119,20 @@ fe80::204:acff:fe17:bf38
     </datatype>
     <datatype>
       <name name="posix"/>
-      <desc><p>An atom which is named from the Posix error codes
-         used in Unix, and in the runtime libraries of most
-          C compilers. See
+      <desc>
+        <p>An atom that is named from the POSIX error codes used in Unix,
+          and in the runtime libraries of most C compilers. See section
           <seealso marker="#error_codes">POSIX Error Codes</seealso>.</p>
       </desc>
     </datatype>
     <datatype>
       <name>socket()</name>
-      <desc><p><marker id="type-socket"></marker>
-         See <seealso marker="gen_tcp#type-socket">gen_tcp(3)</seealso>
-         and <seealso marker="gen_udp#type-socket">gen_udp(3)</seealso>.</p>
+      <desc>
+        <p><marker id="type-socket"></marker>See
+          <seealso marker="gen_tcp#type-socket"><c>gen_tcp:type-socket</c></seealso>
+          and
+          <seealso marker="gen_udp#type-socket"><c>gen_udp:type-socket</c></seealso>.
+        </p>
       </desc>
     </datatype>
     <datatype>
@@ -131,443 +143,415 @@ fe80::204:acff:fe17:bf38
   <funcs>
     <func>
       <name name="close" arity="1"/>
-      <fsummary>Close a socket of any type</fsummary>
+      <fsummary>Close a socket of any type.</fsummary>
       <desc>
         <p>Closes a socket of any type.</p>
       </desc>
     </func>
+
     <func>
-      <name name="get_rc" arity="0"/>
-      <fsummary>Return a list of IP configuration parameters</fsummary>
+      <name name="format_error" arity="1"/>
+      <fsummary>Return a descriptive string for an error reason.</fsummary>
       <desc>
-        <p>Returns the state of the Inet configuration database in
-          form of a list of recorded configuration parameters. (See the
-          ERTS User's Guide, Inet configuration, for more information).
-          Only parameters with other than default values are returned.</p>
+        <p>Returns a diagnostic error string. For possible POSIX values and
+          corresponding strings, see section
+          <seealso marker="#error_codes">POSIX Error Codes</seealso>.</p>
       </desc>
     </func>
+
     <func>
-      <name name="format_error" arity="1"/>
-      <fsummary>Return a descriptive string for an error reason</fsummary>
+      <name name="get_rc" arity="0"/>
+      <fsummary>Return a list of IP configuration parameters.</fsummary>
       <desc>
-        <p>Returns a diagnostic error string. See the section below
-          for possible Posix values and the corresponding
-          strings.</p>
+        <p>Returns the state of the <c>Inet</c> configuration database in
+          form of a list of recorded configuration parameters. For more
+          information, see <seealso marker="erts:inet_cfg">ERTS User's Guide:
+          Inet Configuration</seealso>.
+          Only parameters with other than default values are returned.</p>
       </desc>
     </func>
+
     <func>
       <name name="getaddr" arity="2"/>
-      <fsummary>Return the IP-address for a host</fsummary>
+      <fsummary>Return the IP address for a host.</fsummary>
       <desc>
-        <p>Returns the IP-address for <c><anno>Host</anno></c> as a tuple of
-          integers. <c><anno>Host</anno></c> can be an IP-address, a single hostname
-          or a fully qualified hostname.</p>
+        <p>Returns the IP address for <c><anno>Host</anno></c> as a tuple of
+          integers. <c><anno>Host</anno></c> can be an IP address, a single
+          hostname, or a fully qualified hostname.</p>
       </desc>
     </func>
+
     <func>
       <name name="getaddrs" arity="2"/>
-      <fsummary>Return the IP-addresses for a host</fsummary>
+      <fsummary>Return the IP addresses for a host.</fsummary>
       <desc>
-        <p>Returns a list of all IP-addresses for <c><anno>Host</anno></c>.
-          <c><anno>Host</anno></c> can be an IP-address, a single hostname or a fully
-          qualified hostname.</p>
+        <p>Returns a list of all IP addresses for <c><anno>Host</anno></c>.
+          <c><anno>Host</anno></c> can be an IP address, a single hostname, or
+          a fully qualified hostname.</p>
       </desc>
     </func>
+
     <func>
       <name name="gethostbyaddr" arity="1"/>
-      <fsummary>Return a hostent record for the host with the given address</fsummary>
+      <fsummary>Return a hostent record for the host with the specified
+        address.</fsummary>
       <desc>
-        <p>Returns a <c>hostent</c> record given an address.</p>
-      </desc>
+        <p>Returns a <c>hostent</c> record for the host with the specified
+          address.</p></desc>
     </func>
+
     <func>
       <name name="gethostbyname" arity="1"/>
-      <fsummary>Return a hostent record for the host with the given name</fsummary>
+      <fsummary>Return a hostent record for the host with the specified name.
+      </fsummary>
       <desc>
-        <p>Returns a <c>hostent</c> record given a hostname.</p>
+        <p>Returns a <c>hostent</c> record for the host with the specified
+          hostname.</p>
       </desc>
     </func>
+
     <func>
       <name name="gethostbyname" arity="2"/>
-      <fsummary>Return a hostent record for the host with the given name</fsummary>
+      <fsummary>Return a hostent record for the host with the specified name.
+      </fsummary>
       <desc>
-        <p>Returns a <c>hostent</c> record given a hostname, restricted
-          to the given address family.</p>
+        <p>Returns a <c>hostent</c> record for the host with the specified
+          name, restricted to the specified address family.</p>
       </desc>
     </func>
+
     <func>
       <name name="gethostname" arity="0"/>
-      <fsummary>Return the local hostname</fsummary>
+      <fsummary>Return the local hostname.</fsummary>
       <desc>
-        <p>Returns the local hostname. Will never fail.</p>
+        <p>Returns the local hostname. Never fails.</p>
       </desc>
     </func>
 
     <func>
       <name name="getifaddrs" arity="0"/>
-      <fsummary>Return a list of interfaces and their addresses</fsummary>
-    <desc>
-      <p>
-	Returns a list of 2-tuples containing interface names and the
-	interface's addresses. <c><anno>Ifname</anno></c> is a Unicode string.
-	<c><anno>Hwaddr</anno></c> is hardware dependent, e.g on Ethernet interfaces
-	it is the 6-byte Ethernet address (MAC address (EUI-48 address)).
-      </p>
-      <p>
-	The <c>{addr,<anno>Addr</anno>}</c>, <c>{netmask,_}</c> and <c>{broadaddr,_}</c>
-	tuples are repeated in the result list iff the interface has multiple
-	addresses. If you come across an interface that has
-	multiple <c>{flag,_}</c> or <c>{hwaddr,_}</c> tuples you have
-	a really strange interface or possibly a bug in this function.
-	The <c>{flag,_}</c> tuple is mandatory, all other optional.
-      </p>
-      <p>
-	Do not rely too much on the order of <c><anno>Flag</anno></c> atoms or
-	<c><anno>Ifopt</anno></c> tuples. There are some rules, though:</p>
-	<list>
-	  <item>
-	    Immediately after <c>{addr,_}</c> follows <c>{netmask,_}</c>
-	  </item>
-	  <item>
-	    Immediately thereafter follows <c>{broadaddr,_}</c> if
-	    the <c>broadcast</c> flag is <em>not</em> set and the
-	    <c>pointtopoint</c> flag <em>is</em> set.
-	  </item>
-	  <item>
-	    Any <c>{netmask,_}</c>, <c>{broadaddr,_}</c> or
-	    <c>{dstaddr,_}</c> tuples that follow an <c>{addr,_}</c>
-	    tuple concerns that address.
-	  </item>
-	</list>
-      <p>
-	The <c>{hwaddr,_}</c> tuple is not returned on Solaris since the
-	hardware address historically belongs to the link layer and only
-	the superuser can read such addresses.
-      </p>
-      <p>
-	On Windows, the data is fetched from quite different OS API
-	functions, so the <c><anno>Netmask</anno></c> and <c><anno>Broadaddr</anno></c>
-	values may be calculated, just as some <c><anno>Flag</anno></c> values.
-	You have been warned. Report flagrant bugs.
-      </p>
-    </desc>
+      <fsummary>Return a list of interfaces and their addresses.</fsummary>
+      <desc>
+        <p>Returns a list of 2-tuples containing interface names and the
+          interface addresses. <c><anno>Ifname</anno></c> is a Unicode string.
+          <c><anno>Hwaddr</anno></c> is hardware dependent, for example, on
+          Ethernet interfaces
+          it is the 6-byte Ethernet address (MAC address (EUI-48 address)).</p>
+        <p>The tuples <c>{addr,<anno>Addr</anno>}</c>, <c>{netmask,_}</c>, and
+          <c>{broadaddr,_}</c> are repeated in the result list if the interface
+          has multiple addresses. If you come across an interface with
+          multiple <c>{flag,_}</c> or <c>{hwaddr,_}</c> tuples, you have
+          a strange interface or possibly a bug in this function. The tuple
+          <c>{flag,_}</c> is mandatory, all others are optional.</p>
+        <p>Do not rely too much on the order of <c><anno>Flag</anno></c> atoms
+          or <c><anno>Ifopt</anno></c> tuples. There are however some rules:</p>
+        <list type="bulleted">
+          <item><p>Immediately after
+            <c>{addr,_}</c> follows <c>{netmask,_}</c>.</p></item>
+          <item><p>Immediately thereafter follows <c>{broadaddr,_}</c> if flag
+            <c>broadcast</c> is <em>not</em> set and flag
+            <c>pointtopoint</c> <em>is</em> set.</p></item>
+          <item><p>Any <c>{netmask,_}</c>, <c>{broadaddr,_}</c>, or
+            <c>{dstaddr,_}</c> tuples that follow an <c>{addr,_}</c>
+            tuple concerns that address.</p></item>
+        </list>
+        <p>The tuple <c>{hwaddr,_}</c> is not returned on Solaris, as the
+          hardware address historically belongs to the link layer and only
+          the superuser can read such addresses.</p>
+	<warning>
+	  <p>On Windows, the data is fetched from different OS API functions,
+            so the <c><anno>Netmask</anno></c> and <c><anno>Broadaddr</anno></c>
+            values can be calculated, just as some <c><anno>Flag</anno></c>
+            values. Report flagrant bugs.</p>
+	</warning>
+      </desc>
     </func>
 
     <func>
       <name name="getopts" arity="2"/>
-      <fsummary>Get one or more options for a socket</fsummary>
+      <fsummary>Get one or more options for a socket.</fsummary>
       <type name="socket_getopt"/>
       <type name="socket_setopt"/>
       <desc>
-        <p>Gets one or more options for a socket.
-          See <seealso marker="#setopts/2">setopts/2</seealso>
-          for a list of available options.</p>
-        <p>The number of elements in the returned <c><anno>OptionValues</anno></c>
+        <p>Gets one or more options for a socket. For a list of available
+          options, see
+          <seealso marker="#setopts/2"><c>setopts/2</c></seealso>.</p>
+        <p>The number of elements in the returned
+          <c><anno>OptionValues</anno></c>
           list does not necessarily correspond to the number of options
           asked for. If the operating system fails to support an option,
-          it is simply left out in the returned list. An error tuple is only
-          returned when getting options for the socket is impossible
-          (i.e. the socket is closed or the buffer size in a raw request
+          it is left out in the returned list. An error tuple is returned
+          only when getting options for the socket is impossible (that is,
+          the socket is closed or the buffer size in a raw request
           is too large). This behavior is kept for backward
           compatibility reasons.</p>
-        <p>A raw option request <c>RawOptReq = {raw, Protocol, OptionNum, ValueSpec}</c> can be used to get information about
+        <p>A raw option request
+          <c>RawOptReq = {raw, Protocol, OptionNum, ValueSpec}</c>
+          can be used to get information about
           socket options not (explicitly) supported by the emulator. The
-          use of raw socket options makes the code non portable, but
+          use of raw socket options makes the code non-portable, but
           allows the Erlang programmer to take advantage of unusual features
           present on the current platform.</p>
-        <p>The <c>RawOptReq</c> consists of the tag <c>raw</c> followed
-          by the protocol level, the option number and either a binary
+        <p><c>RawOptReq</c> consists of tag <c>raw</c> followed
+          by the protocol level, the option number, and either a binary
           or the size, in bytes, of the
-          buffer in which the option value is to be stored. A binary
-          should be used when the underlying <c>getsockopt</c> requires
-          <em>input</em>
-          in the argument field, in which case the size of the binary
-          should correspond to the required buffer
+          buffer in which the option value is to be stored. A binary is to be
+          used when the underlying <c>getsockopt</c> requires <em>input</em>
+          in the argument field. In this case, the binary size
+          is to correspond to the required buffer
           size of the return value. The supplied values in a <c>RawOptReq</c>
-          correspond to the second, third and fourth/fifth parameters to the
+          correspond to the second, third, and fourth/fifth parameters to the
           <c>getsockopt</c> call in the C socket API. The value stored
-          in the buffer is returned as a binary <c>ValueBin</c>
+          in the buffer is returned as a binary <c>ValueBin</c>,
           where all values are coded in the native endianess.</p>
-        <p>Asking for and inspecting raw socket options require low
-          level information about the current operating system and TCP
-          stack.</p>
-        <p>As an example, consider a Linux machine where the
-          <c>TCP_INFO</c> option could be used to collect TCP statistics
-          for a socket. Lets say we're interested in the
-          <c>tcpi_sacked</c> field of the <c>struct tcp_info</c>
-          filled in when asking for <c>TCP_INFO</c>. To
-          be able to access this information, we need to know both the
-          numeric value of the protocol level <c>IPPROTO_TCP</c>, the
-          numeric value of the option <c>TCP_INFO</c>, the size of the
-          <c>struct tcp_info</c> and the size and offset of
-          the specific field. By inspecting the headers or writing a small C
-          program, we found <c>IPPROTO_TCP</c> to be 6,
-          <c>TCP_INFO</c> to be 11, the structure size to be 92 (bytes),
-          the offset of <c>tcpi_sacked</c> to be 28 bytes and the actual
-          value to be a 32 bit integer. We could use the following
-          code to retrieve the value:</p>
+        <p>Asking for and inspecting raw socket options require low-level
+          information about the current operating system and TCP stack.</p>
+        <p><em>Example:</em></p>
+        <p>Consider a Linux machine where option
+          <c>TCP_INFO</c> can be used to collect TCP statistics
+          for a socket. Assume you are interested in field
+          <c>tcpi_sacked</c> of <c>struct tcp_info</c>
+          filled in when asking for <c>TCP_INFO</c>. To be able to access
+          this information, you need to know the following:</p>
+        <list type="bulleted">
+          <item>The numeric value of protocol level <c>IPPROTO_TCP</c></item>
+          <item>The numeric value of option <c>TCP_INFO</c></item>
+          <item>The size of <c>struct tcp_info</c></item>
+          <item>The size and offset of the specific field</item>
+        </list>
+        <p>By inspecting the headers or writing a small C program, it is found
+          that <c>IPPROTO_TCP</c> is 6, <c>TCP_INFO</c> is 11, the structure
+          size is 92 (bytes), the offset of <c>tcpi_sacked</c> is 28 bytes,
+          and the value is a 32-bit integer. The following code can be used
+          to retrieve the value:</p>
         <code type="none"><![CDATA[
-        get_tcpi_sacked(Sock) ->
-            {ok,[{raw,_,_,Info}]} = inet:getopts(Sock,[{raw,6,11,92}]),
-            <<_:28/binary,TcpiSacked:32/native,_/binary>> = Info,
-            TcpiSacked.]]></code>
-        <p>Preferably, you would check the machine type, the OS
-          and the kernel version prior to executing anything similar to the
-          code above.</p>
+get_tcpi_sacked(Sock) ->
+    {ok,[{raw,_,_,Info}]} = inet:getopts(Sock,[{raw,6,11,92}]),
+    <<_:28/binary,TcpiSacked:32/native,_/binary>> = Info,
+    TcpiSacked.]]></code>
+        <p>Preferably, you would check the machine type, the operating system,
+          and the <c>Kernel</c> version before executing anything similar to
+          this code.</p>
       </desc>
     </func>
 
     <func>
       <name name="getstat" arity="1"/>
       <name name="getstat" arity="2"/>
-      <fsummary>Get one or more statistic options for a socket</fsummary>
+      <fsummary>Get one or more statistic options for a socket.</fsummary>
       <type name="stat_option"/>
       <desc>
         <p>Gets one or more statistic options for a socket.</p>
-
-	<p><c>getstat(<anno>Socket</anno>)</c> is equivalent to
-	  <c>getstat(<anno>Socket</anno>, [recv_avg, recv_cnt, recv_dvi,
-	  recv_max, recv_oct, send_avg, send_cnt, send_dvi, send_max,
-	  send_oct])</c>.</p>
-	  <p>The following options are available:</p>
+        <p><c>getstat(<anno>Socket</anno>)</c> is equivalent to
+          <c>getstat(<anno>Socket</anno>, [recv_avg, recv_cnt, recv_dvi,
+          recv_max, recv_oct, send_avg, send_cnt, send_dvi, send_max,
+          send_oct])</c>.</p>
+        <p>The following options are available:</p>
         <taglist>
-	  <tag><c>recv_avg</c></tag>
-	  <item>
-            <p>Average size of packets in bytes received by the socket.</p>
-	  </item>
-	  <tag><c>recv_cnt</c></tag>
-	  <item>
+          <tag><c>recv_avg</c></tag>
+          <item>
+            <p>Average size of packets, in bytes, received by the socket.</p>
+          </item>
+          <tag><c>recv_cnt</c></tag>
+          <item>
             <p>Number of packets received by the socket.</p>
-	  </item>
-	  <tag><c>recv_dvi</c></tag>
-	  <item>
-            <p>Average packet size deviation in bytes received by the socket.</p>
-	  </item>
-	  <tag><c>recv_max</c></tag>
-	  <item>
-            <p>The size of the largest packet in bytes received by the socket.</p>
-	  </item>
-	  <tag><c>recv_oct</c></tag>
-	  <item>
+          </item>
+          <tag><c>recv_dvi</c></tag>
+          <item>
+            <p>Average packet size deviation, in bytes, received by the socket.</p>
+          </item>
+          <tag><c>recv_max</c></tag>
+          <item>
+            <p>Size of the largest packet, in bytes, received by the socket.</p>
+          </item>
+          <tag><c>recv_oct</c></tag>
+          <item>
             <p>Number of bytes received by the socket.</p>
-	  </item>
-
-	  <tag><c>send_avg</c></tag>
-	  <item>
-            <p>Average size of packets in bytes sent from the socket.</p>
-	  </item>
-	  <tag><c>send_cnt</c></tag>
-	  <item>
+          </item>
+          <tag><c>send_avg</c></tag>
+          <item>
+            <p>Average size of packets, in bytes, sent from the socket.</p>
+          </item>
+          <tag><c>send_cnt</c></tag>
+          <item>
             <p>Number of packets sent from the socket.</p>
-	  </item>
-	  <tag><c>send_dvi</c></tag>
-	  <item>
-            <p>Average packet size deviation in bytes sent from the socket.</p>
-	  </item>
-	  <tag><c>send_max</c></tag>
-	  <item>
-            <p>The size of the largest packet in bytes sent from the socket.</p>
-	  </item>
-	  <tag><c>send_oct</c></tag>
-	  <item>
+          </item>
+          <tag><c>send_dvi</c></tag>
+          <item>
+            <p>Average packet size deviation, in bytes, sent from the socket.</p>
+          </item>
+          <tag><c>send_max</c></tag>
+          <item>
+            <p>Size of the largest packet, in bytes, sent from the socket.</p>
+          </item>
+          <tag><c>send_oct</c></tag>
+          <item>
             <p>Number of bytes sent from the socket.</p>
-	  </item>
+          </item>
         </taglist>
       </desc>
     </func>
+
     <func>
       <name name="ntoa" arity="1" />
-      <fsummary>Convert IPv6 / IPV4 adress to ascii</fsummary>
+      <fsummary>Convert IPv6/IPV4 address to ASCII.</fsummary>
+      <desc>
+	<p>Parses an
+          <seealso marker="#type-ip_address"><c>ip_address()</c></seealso>
+          and returns an IPv4 or IPv6 address string.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="parse_address" arity="1" />
+      <fsummary>Parse an IPv4 or IPv6 address.</fsummary>
       <desc>
-	<p>Parses an <seealso marker="#type-ip_address">ip_address()</seealso> and returns an IPv4 or IPv6 address string.</p>
+	<p>Parses an IPv4 or IPv6 address string and returns an
+          <seealso marker="#type-ip4_address"><c>ip4_address()</c></seealso> or
+          <seealso marker="#type-ip6_address"><c>ip6_address()</c></seealso>.
+          Accepts a shortened IPv4 address string.</p>
       </desc>
     </func>
+
     <func>
       <name name="parse_ipv4_address" arity="1" />
-      <fsummary>Parse an IPv4 address</fsummary>
+      <fsummary>Parse an IPv4 address.</fsummary>
       <desc>
-	<p>Parses an IPv4 address string and returns an <seealso marker="#type-ip4_address">ip4_address()</seealso>.
-	 Accepts a shortened IPv4 shortened address string.</p>
+	<p>Parses an IPv4 address string and returns an
+          <seealso marker="#type-ip4_address"><c>ip4_address()</c></seealso>.
+	  Accepts a shortened IPv4 address string.</p>
       </desc>
     </func>
+
     <func>
       <name name="parse_ipv4strict_address" arity="1" />
       <fsummary>Parse an IPv4 address strict.</fsummary>
       <desc>
-	<p>Parses an IPv4 address string containing four fields, i.e <em>not</em> shortened, and returns an <seealso marker="#type-ip4_address">ip4_address()</seealso>.</p>
+	<p>Parses an IPv4 address string containing four fields, that is,
+          <em>not</em> shortened, and returns an
+          <seealso marker="#type-ip4_address"><c>ip4_address()</c></seealso>.
+        </p>
       </desc>
     </func>
+
     <func>
       <name name="parse_ipv6_address" arity="1" />
-      <fsummary>Parse an IPv6 address</fsummary>
+      <fsummary>Parse an IPv6 address.</fsummary>
       <desc>
-	<p>Parses an IPv6 address string and returns an <seealso marker="#type-ip6_address">ip6_address()</seealso>.
-	 If an IPv4 address string is passed, an IPv4-mapped IPv6 address is returned.</p>
+	<p>Parses an IPv6 address string and returns an
+          <seealso marker="#type-ip6_address"><c>ip6_address()</c></seealso>.
+          If an IPv4 address string is specified, an IPv4-mapped IPv6 address
+          is returned.</p>
       </desc>
     </func>
+
     <func>
       <name name="parse_ipv6strict_address" arity="1" />
       <fsummary>Parse an IPv6 address strict.</fsummary>
       <desc>
-	<p>Parses an IPv6 address string and returns an <seealso marker="#type-ip6_address">ip6_address()</seealso>.
-	Does <em>not</em> accept IPv4 adresses.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="parse_address" arity="1" />
-      <fsummary>Parse an IPv4 or IPv6 address.</fsummary>
-      <desc>
-	<p>Parses an IPv4 or IPv6 address string and returns an <seealso marker="#type-ip4_address">ip4_address()</seealso> or <seealso marker="#type-ip6_address">ip6_address()</seealso>. Accepts a shortened IPv4 address string.</p>
+	<p>Parses an IPv6 address string and returns an
+          <seealso marker="#type-ip6_address"><c>ip6_address()</c></seealso>.
+          Does <em>not</em> accept IPv4 addresses.</p>
       </desc>
     </func>
+
     <func>
       <name name="parse_strict_address" arity="1" />
       <fsummary>Parse an IPv4 or IPv6 address strict.</fsummary>
       <desc>
-	<p>Parses an IPv4 or IPv6 address string and returns an <seealso marker="#type-ip4_address">ip4_address()</seealso> or <seealso marker="#type-ip6_address">ip6_address()</seealso>. Does <em>not</em> accept a shortened IPv4 address string.</p>
+	<p>Parses an IPv4 or IPv6 address string and returns an
+          <seealso marker="#type-ip4_address"><c>ip4_address()</c></seealso> or
+          <seealso marker="#type-ip6_address"><c>ip6_address()</c></seealso>.
+          Does <em>not</em> accept a shortened IPv4 address string.</p>
       </desc>
     </func>
+
     <func>
       <name name="peername" arity="1"/>
-      <fsummary>Return the address and port for the other end of a connection</fsummary>
+      <fsummary>Return the address and port for the other end of a connection.
+      </fsummary>
       <desc>
-        <p>
-	  Returns the address and port for the other end of a
-          connection.
-	</p>
-	<p>
-	  Note that for SCTP sockets this function only returns
-	  one of the socket's peer addresses.  The function
-	  <seealso marker="#peernames/1">peernames/1,2</seealso>
-	  returns all.
-	</p>
+        <p>Returns the address and port for the other end of a connection.</p>
+	<p>Notice that for SCTP sockets, this function returns only
+	  one of the peer addresses of the socket. Function
+	  <seealso marker="#peernames/1"><c>peernames/1,2</c></seealso>
+	  returns all.</p>
       </desc>
     </func>
+
     <func>
       <name name="peernames" arity="1"/>
-      <fsummary>
-	Return all address/port numbers for the other end of a connection
-      </fsummary>
+      <fsummary>Return all address/port numbers for the other end of a
+        connection.</fsummary>
       <desc>
-	<p>
-	  Equivalent to
+	<p>Equivalent to
 	  <seealso marker="#peernames/2"><c>peernames(<anno>Socket</anno>, 0)</c></seealso>.
-	  Note that this function's behaviour for an SCTP
+        </p>
+        <p>Notice that the behavior of this function for an SCTP
 	  one-to-many style socket is not defined by the
-	  <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">SCTP Sockets API Extensions</url>.
-	</p>
+	  <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">SCTP Sockets API Extensions</url>.</p>
       </desc>
     </func>
+
     <func>
       <name name="peernames" arity="2"/>
-      <fsummary>
-	Return all address/port numbers for the other end of a connection
-      </fsummary>
+      <fsummary>Return all address/port numbers for the other end of a
+        connection.</fsummary>
       <desc>
-	<p>
-	  Returns a list of all address/port number pairs for the other end
-	  of a socket's association <c><anno>Assoc</anno></c>.
-	</p>
-	<p>
-	  This function can return multiple addresses for multihomed
-	  sockets such as SCTP sockets.  For other sockets it
-	  returns a one element list.
-	</p>
-	<p>
-	  Note that the <c><anno>Assoc</anno></c> parameter is by the
+	<p>Returns a list of all address/port number pairs for the other end
+	  of an association <c><anno>Assoc</anno></c> of a socket.</p>
+	<p>This function can return multiple addresses for multihomed
+	  sockets, such as SCTP sockets. For other sockets it
+	  returns a one-element list.</p>
+	<p>Notice that parameter <c><anno>Assoc</anno></c> is by the
 	  <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">SCTP Sockets API Extensions</url>
 	  defined to be ignored for
-	  one-to-one style sockets.  What the special value <c>0</c>
-	  means hence its behaviour for one-to-many style sockets
-	  is unfortunately not defined.
-	</p>
+	  one-to-one style sockets. What the special value <c>0</c>
+	  means, hence its behavior for one-to-many style sockets,
+	  is unfortunately undefined.</p>
       </desc>
     </func>
+
     <func>
       <name name="port" arity="1"/>
-      <fsummary>Return the local port number for a socket</fsummary>
+      <fsummary>Return the local port number for a socket.</fsummary>
       <desc>
         <p>Returns the local port number for a socket.</p>
       </desc>
     </func>
-    <func>
-      <name name="sockname" arity="1"/>
-      <fsummary>Return the local address and port number for a socket</fsummary>
-      <desc>
-        <p>Returns the local address and port number for a socket.</p>
-	<p>
-	  Note that for SCTP sockets this function only returns
-	  one of the socket addresses.  The function
-	  <seealso marker="#socknames/1">socknames/1,2</seealso>
-	  returns all.
-	</p>
-      </desc>
-    </func>
-    <func>
-      <name name="socknames" arity="1"/>
-      <fsummary>Return all local address/port numbers for a socket</fsummary>
-      <desc>
-	<p>
-	  Equivalent to
-	  <seealso marker="#socknames/2"><c>socknames(<anno>Socket</anno>, 0)</c></seealso>.
-	</p>
-      </desc>
-    </func>
-    <func>
-      <name name="socknames" arity="2"/>
-      <fsummary>Return all local address/port numbers for a socket</fsummary>
-      <desc>
-	<p>
-	  Returns a list of all local address/port number pairs for a socket
-	  for the given association <c><anno>Assoc</anno></c>.
-	</p>
-	<p>
-	  This function can return multiple addresses for multihomed
-	  sockets such as SCTP sockets.  For other sockets it
-	  returns a one element list.
-	</p>
-	<p>
-	  Note that the <c><anno>Assoc</anno></c> parameter is by the
-	  <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">SCTP Sockets API Extensions</url>
-	  defined to be ignored for one-to-one style sockets.
-	  For one-to-many style sockets the special value <c>0</c>
-	  is defined to mean that the returned addresses shall be
-	  without regard to any particular association.
-	  How different SCTP implementations interprets this varies somewhat.
-	</p>
-      </desc>
-    </func>
+
     <func>
       <name name="setopts" arity="2"/>
-      <fsummary>Set one or more options for a socket</fsummary>
+      <fsummary>Set one or more options for a socket.</fsummary>
       <type name="socket_setopt"/>
       <desc>
-        <p>Sets one or more options for a socket. The following options
-          are available:</p>
+        <p>Sets one or more options for a socket.</p>
+        <p>The following options are available:</p>
         <taglist>
           <tag><c>{active, true | false | once | N}</c></tag>
           <item>
             <p>If the value is <c>true</c>, which is the default,
-              everything received from the socket will be sent as
-              messages to the receiving process. If the value is
-              <c>false</c> (passive mode), the process must explicitly
-              receive incoming data by calling
+              everything received from the socket is sent as
+              messages to the receiving process.</p>
+            <p>If the value is <c>false</c> (passive mode), the process must
+              explicitly receive incoming data by calling
               <seealso marker="gen_tcp#recv/2"><c>gen_tcp:recv/2,3</c></seealso>,
-              <seealso marker="gen_udp#recv/2"><c>gen_udp:recv/2,3</c></seealso>
+              <seealso marker="gen_udp#recv/2"><c>gen_udp:recv/2,3</c></seealso>,
               or <seealso marker="gen_sctp#recv/1"><c>gen_sctp:recv/1,2</c></seealso>
               (depending on the type of socket).</p>
             <p>If the value is <c>once</c> (<c>{active, once}</c>),
-              <em>one</em> data message from the socket will be sent
-              to the process.  To receive one more message,
-              <c>setopts/2</c> must be called again with the
-              <c>{active, once}</c> option.</p>
+              <em>one</em> data message from the socket is sent
+              to the process. To receive one more message,
+              <c>setopts/2</c> must be called again with option
+              <c>{active, once}</c>.</p>
             <p>If the value is an integer <c>N</c> in the range -32768 to 32767
               (inclusive), the value is added to the socket's count of data
               messages sent to the controlling process. A socket's default
-              message count is 0. If a negative value is specified and its
-              magnitude is equal to or greater than the socket's current
-              message count, the socket's message count is set to 0. Once
-              the socket's message count reaches 0, either due to sending
+              message count is <c>0</c>. If a negative value is specified, and
+              its magnitude is equal to or greater than the socket's current
+              message count, the socket's message count is set to <c>0</c>.
+              Once the socket's message count reaches <c>0</c>, either because
+              of sending
               received data messages to the process or by being explicitly set,
               the process is then notified by a special message, specific to
               the type of socket, that the socket has entered passive
@@ -575,339 +559,298 @@ fe80::204:acff:fe17:bf38
               messages <c>setopts/2</c> must be called again to set the
               socket back into an active mode.</p>
             <p>When using <c>{active, once}</c> or <c>{active, N}</c>, the
-              socket changes behaviour automatically when data is received.
-              This can sometimes be confusing in combination with
-              connection-oriented sockets (i.e. <c>gen_tcp</c>) as a socket
-              with <c>{active, false}</c> behaviour reports closing
+              socket changes behavior automatically when data is received.
+              This can be confusing in combination with connection-oriented
+              sockets (that is, <c>gen_tcp</c>), as a socket
+              with <c>{active, false}</c> behavior reports closing
               differently than a socket with <c>{active, true}</c>
-              behaviour. To make programming easier, a socket where
-              the peer closed and this was detected while in
-              <c>{active, false}</c> mode, will still generate the
-              message
+              behavior. To simplify programming, a socket where
+              the peer closed, and this is detected while in
+              <c>{active, false}</c> mode, still generates message
               <c>{tcp_closed,Socket}</c> when set to <c>{active, once}</c>,
-              <c>{active, true}</c> or <c>{active, N}</c> mode. It is therefore
-              safe to assume that the message
-              <c>{tcp_closed,Socket}</c>, possibly followed by socket
-              port termination (depending on the <c>exit_on_close</c>
-              option) will eventually appear when a socket changes
+              <c>{active, true}</c>, or <c>{active, N}</c> mode.
+              It is therefore safe to assume that message
+              <c>{tcp_closed,Socket}</c>, possibly followed by socket port
+              termination (depending on option <c>exit_on_close</c>)
+              eventually appears when a socket changes
               back and forth between <c>{active, true}</c> and
               <c>{active, false}</c> mode. However,
-              <em>when</em> peer closing is detected is all up to the
+              <em>when</em> peer closing is detected it is all up to the
               underlying TCP/IP stack and protocol.</p>
-            <p>Note that <c>{active, true}</c> mode provides no flow
-              control; a fast sender could easily overflow the
-              receiver with incoming messages. The same is true of
-              <c>{active, N}</c> mode while the message count is greater
-              than zero. Use active mode only if
+            <p>Notice that <c>{active, true}</c> mode provides no flow
+              control; a fast sender can easily overflow the
+              receiver with incoming messages. The same is true for
+              <c>{active, N}</c> mode, while the message count is greater
+              than zero.</p>
+            <p>Use active mode only if
               your high-level protocol provides its own flow control
-              (for instance, acknowledging received messages) or the
+              (for example, acknowledging received messages) or the
               amount of data exchanged is small. <c>{active, false}</c>
-              mode, use of the <c>{active, once}</c> mode or <c>{active, N}</c>
+              mode, use of the <c>{active, once}</c> mode, or <c>{active, N}</c>
               mode with values of <c>N</c> appropriate for the application
-              provides flow control; the other side will not be able send
+              provides flow control. The other side cannot send
               faster than the receiver can read.</p>
           </item>
-
-          <tag><c>{broadcast, Boolean}</c>(UDP sockets)</tag>
+          <tag><c>{broadcast, Boolean}</c> (UDP sockets)</tag>
           <item>
-            <p>Enable/disable permission to send broadcasts.</p>
-			<marker id="option-buffer"></marker>
+            <p>Enables/disables permission to send broadcasts.</p>
+            <marker id="option-buffer"></marker>
+          </item>
+          <tag><c>{buffer, Size}</c></tag>
+          <item>
+            <p>The size of the user-level software buffer used by
+              the driver. Not to be confused with options <c>sndbuf</c>
+              and <c>recbuf</c>, which correspond to the
+              <c>Kernel</c> socket buffers. It is recommended
+              to have <c>val(buffer) &gt;= max(val(sndbuf),val(recbuf))</c> to
+              avoid performance issues because of unnecessary copying.
+              <c>val(buffer)</c> is automatically set to the above
+              maximum when values <c>sndbuf</c> or <c>recbuf</c> are set.
+              However, as the sizes set for <c>sndbuf</c> and <c>recbuf</c>
+              usually become larger, you are encouraged to use
+              <seealso marker="#getopts/2"><c>getopts/2</c></seealso>
+              to analyze the behavior of your operating system.</p>
           </item>
-
-                  <tag><c>{buffer, Size}</c></tag>
-		  <item>
-                    <p>The size of the user-level software buffer used by
-                    the driver. Not to be confused with <c>sndbuf</c>
-                    and <c>recbuf</c> options which correspond to
-                    the kernel socket buffers. It is recommended
-                    to have <c>val(buffer) &gt;= max(val(sndbuf),val(recbuf))</c> to
-                    avoid performance issues due to unnecessary copying.
-                    In fact, the <c>val(buffer)</c> is automatically set to
-                    the above maximum when <c>sndbuf</c> or <c>recbuf</c> values are set.
-                    However, since the actual sizes set for <c>sndbuf</c> and <c>recbuf</c>
-                    usually becomes larger, you are encouraged to use
-                    <seealso marker="inet#getopts/2"><c>inet:getopts/2</c></seealso>
-                     to analyze the behavior of your operating system.</p>
-		  </item>
-
           <tag><c>{delay_send, Boolean}</c></tag>
           <item>
             <p>Normally, when an Erlang process sends to a socket,
-              the driver will try to immediately send the data. If that
-              fails, the driver will use any means available to queue
+              the driver tries to send the data immediately. If that
+              fails, the driver uses any means available to queue
               up the message to be sent whenever the operating system
               says it can handle it. Setting <c>{delay_send, true}</c>
-              will make <em>all</em> messages queue up. This makes
-              the messages actually sent onto the network be larger but
-              fewer. The option actually affects the scheduling of send
+              makes <em>all</em> messages queue up. The messages sent
+              to the network are then larger but fewer.
+              The option affects the scheduling of send
               requests versus Erlang processes instead of changing any
-              real property of the socket. Needless to say it is an
-              implementation specific option. Default is <c>false</c>.</p>
+              real property of the socket. The option is
+              implementation-specific. Defaults to <c>false</c>.</p>
+          </item>
+          <tag><c>{deliver, port | term}</c></tag>
+          <item>
+            <p>When <c>{active, true}</c>, data is delivered on the form
+              <c>port</c> : <c>{S, {data, [H1,..Hsz | Data]}}</c> or
+              <c>term</c> : <c>{tcp, S, [H1..Hsz | Data]}</c>.</p>
           </item>
-
-		  <tag><c>{deliver, port | term}</c></tag>
-		  <item> <p> When <c>{active, true}</c> delivers data on the forms
-				  <c>port</c> : <c>{S, {data, [H1,..Hsz | Data]}}</c> or
-				  <c>term</c> : <c>{tcp, S, [H1..Hsz | Data]}</c>.
-				  </p>
-		  </item>
-
           <tag><c>{dontroute, Boolean}</c></tag>
           <item>
-            <p>Enable/disable routing bypass for outgoing messages.</p>
+            <p>Enables/disables routing bypass for outgoing messages.</p>
           </item>
-
           <tag><c>{exit_on_close, Boolean}</c></tag>
           <item>
-            <p>By default this option is set to <c>true</c>.</p>
+            <p>This option is set to <c>true</c> by default.</p>
             <p>The only reason to set it to <c>false</c> is if you want
-              to continue sending data to the socket after a close has
-              been detected, for instance if the peer has used
-              <seealso marker="gen_tcp#shutdown/2">gen_tcp:shutdown/2</seealso>
-              to shutdown the write side.</p>
+              to continue sending data to the socket after a close is
+              detected, for example, if the peer uses
+              <seealso marker="gen_tcp#shutdown/2"><c>gen_tcp:shutdown/2</c></seealso>
+              to shut down the write side.</p>
           </item>
-
           <tag><c>{header, Size}</c></tag>
           <item>
-            <p>This option is only meaningful if the <c>binary</c>
-              option was specified when the socket was created. If
-              the <c>header</c> option is specified, the first
+            <p>This option is only meaningful if option <c>binary</c>
+              was specified when the socket was created. If option
+              <c>header</c> is specified, the first
               <c>Size</c> number bytes of data received from the socket
-              will be elements of a list, and the rest of the data will
-              be a binary given as the tail of the same list. If for
-              example <c>Size == 2</c>, the data received will match
+              are elements of a list, and the remaining data is
+              a binary specified as the tail of the same list. For example,
+              if <c>Size == 2</c>, the data received matches
               <c>[Byte1,Byte2|Binary]</c>.</p>
           </item>
-
           <tag><c>{high_msgq_watermark, Size}</c></tag>
           <item>
-	    <p>The socket message queue will be set into a busy
-	    state when the amount of data queued on the message
-	    queue reaches this limit. Note that this limit only
-	    concerns data that have not yet reached the ERTS internal
-	    socket implementation. Default value used is 8 kB.</p>
-	    <p>Senders of data to the socket will be suspended if
-	    either the socket message queue is busy, or the socket
-	    itself is busy.</p>
-	    <p>For more information see the <c>low_msgq_watermark</c>,
-	    <c>high_watermark</c>, and <c>low_watermark</c> options.</p>
-	    <p>Note that distribution sockets will disable the use of
-	    <c>high_msgq_watermark</c> and <c>low_msgq_watermark</c>,
-	    and will instead use the
-	    <seealso marker="erts:erlang#system_info_dist_buf_busy_limit">distribution
-	    buffer busy limit</seealso> which is a similar feature.</p>
+	    <p>The socket message queue is set to a busy
+	      state when the amount of data on the message
+	      queue reaches this limit. Notice that this limit only
+	      concerns data that has not yet reached the <c>ERTS</c> internal
+	      socket implementation. Defaults to 8 kB.</p>
+	    <p>Senders of data to the socket are suspended if
+	      either the socket message queue is busy or the socket
+	      itself is busy.</p>
+	    <p>For more information, see options <c>low_msgq_watermark</c>,
+	      <c>high_watermark</c>, and <c>low_watermark</c>.</p>
+	    <p>Notice that distribution sockets disable the use of
+	      <c>high_msgq_watermark</c> and <c>low_msgq_watermark</c>.
+	      Instead use the
+	      <seealso marker="erts:erlang#system_info_dist_buf_busy_limit">distribution buffer busy limit</seealso>,
+              which is a similar feature.</p>
           </item>
-
           <tag><c>{high_watermark, Size}</c> (TCP/IP sockets)</tag>
           <item>
-	    <p>The socket will be set into a busy state when the amount
-	    of data queued internally by the ERTS socket implementation
-	    reaches this limit. Default value used is 8 kB.</p>
-	    <p>Senders of data to the socket will be suspended if
-	    either the socket message queue is busy, or the socket
-	    itself is busy.</p>
-	    <p>For more information see the <c>low_watermark</c>,
-	    <c>high_msgq_watermark</c>, and <c>low_msqg_watermark</c>
-	    options.</p>
+	    <p>The socket is set to a busy state when the amount
+	      of data queued internally by the <c>ERTS</c> socket implementation
+	      reaches this limit. Defaults to 8 kB.</p>
+	    <p>Senders of data to the socket are suspended if
+	      either the socket message queue is busy or the socket
+	      itself is busy.</p>
+	    <p>For more information, see options <c>low_watermark</c>,
+	      <c>high_msgq_watermark</c>, and <c>low_msqg_watermark</c>.</p>
           </item>
-
 	  <tag><c>{ipv6_v6only, Boolean}</c></tag>
 	  <item>
-	    <p>
-	      Restricts the socket to only use IPv6, prohibiting any
+	    <p>Restricts the socket to use only IPv6, prohibiting any
 	      IPv4 connections. This is only applicable for
-	      IPv6 sockets (option <c>inet6</c>).
-	    </p>
-	    <p>
-	      On most platforms this option has to be set on the socket
-	      before associating it to an address. Therefore it is only
-	      reasonable to give it when creating the socket and not
-	      to use it when calling the function
-	      (<seealso marker="#setopts/2">setopts/2</seealso>)
-	      containing this description.
-	    </p>
-	    <p>
-	      The behaviour of a socket with this socket option set to
-	      <c>true</c> is becoming the only portable one. The original
+	      IPv6 sockets (option <c>inet6</c>).</p>
+            <p>On most platforms this option must be set on the socket
+	      before associating it to an address. It is therefore only
+	      reasonable to specify it when creating the socket and not
+	      to use it when calling function
+	      (<seealso marker="#setopts/2"><c>setopts/2</c></seealso>)
+	      containing this description.</p>
+	    <p>The behavior of a socket with this option set to
+	      <c>true</c> is the only portable one. The original
 	      idea when IPv6 was new of using IPv6 for all traffic
 	      is now not recommended by FreeBSD (you can use
 	      <c>{ipv6_v6only,false}</c> to override the recommended
 	      system default value),
-	      forbidden by OpenBSD (the supported GENERIC kernel)
-	      and impossible on Windows (that has separate
+	      forbidden by OpenBSD (the supported GENERIC kernel),
+	      and impossible on Windows (which has separate
 	      IPv4 and IPv6 protocol stacks). Most Linux distros
 	      still have a system default value of <c>false</c>.
-	      This policy shift among operating systems towards
-	      separating IPv6 from IPv4 traffic has evolved since
+	      This policy shift among operating systems to
+	      separate IPv6 from IPv4 traffic has evolved, as
 	      it gradually proved hard and complicated to get
-	      a dual stack implementation correct and secure.
-	    </p>
-	    <p>
-	      On some platforms the only allowed value for this option
-	      is <c>true</c>, e.g. OpenBSD and Windows. Trying to set
-	      this option to <c>false</c> when creating the socket
-	      will in this case fail.
-	    </p>
-	    <p>
-	      Setting this option on platforms where it does not exist
-	      is ignored and getting this option with
-	      <seealso marker="#getopts/2">getopts/2</seealso>
-	      returns no value i.e the returned list will not contain an
-	      <c>{ipv6_v6only,_}</c> tuple. On Windows the option acually
-	      does not exist, but it is emulated as being a
-	      read-only option with the value <c>true</c>.
-	    </p>
-	    <p>
-	      So it boils down to that setting this option to <c>true</c>
-	      when creating a socket will never fail except possibly
-	      (at the time of this writing) on a platform where you
+	      a dual stack implementation correct and secure.</p>
+	    <p>On some platforms, the only allowed value for this option
+	      is <c>true</c>, for example, OpenBSD and Windows. Trying to set
+	      this option to <c>false</c>, when creating the socket, fails
+	      in this case.</p>
+	    <p>Setting this option on platforms where it does not exist
+	      is ignored. Getting this option with
+	      <seealso marker="#getopts/2"><c>getopts/2</c></seealso>
+	      returns no value, that is, the returned list does not contain an
+	      <c>{ipv6_v6only,_}</c> tuple. On Windows, the option
+	      does not exist, but it is emulated as a
+	      read-only option with value <c>true</c>.</p>
+	    <p>Therefore, setting this option to <c>true</c>
+	      when creating a socket never fails, except possibly on a
+              platform where you
 	      have customized the kernel to only allow <c>false</c>,
-	      which might be doable (but weird) on e.g. OpenBSD.
-	    </p>
-	    <p>
-	      If you read back the option value using
-	      <seealso marker="#getopts/2">getopts/2</seealso>
-	      and get no value the option does not exist in the host OS
-	      and all bets are off regarding the behaviour of both
-	      an IPv6 and an IPv4 socket listening on the same port
-	      as well as for an IPv6 socket getting IPv4 traffic.
-	    </p>
+	      which can be doable (but awkward) on, for example, OpenBSD.</p>
+	    <p>If you read back the option value using
+	      <seealso marker="#getopts/2"><c>getopts/2</c></seealso>
+	      and get no value, the option does not exist in the host
+              operating system. The behavior of both an IPv6 and an IPv4
+	      socket listening on the same port, and for an IPv6 socket
+	      getting IPv4 traffic is then no longer predictable.</p>
 	  </item>
-
           <tag><c>{keepalive, Boolean}</c>(TCP/IP sockets)</tag>
           <item>
             <p>Enables/disables periodic transmission on a connected
-              socket, when no other data is being exchanged. If
+              socket when no other data is exchanged. If
               the other end does not respond, the connection is
-              considered broken and an error message will be sent to
-              the controlling process. Default disabled.</p>
-			<marker id="option-linger"></marker>
+              considered broken and an error message is sent to
+              the controlling process. Defaults to <c>disabled</c>.</p>
+            <marker id="option-linger"></marker>
+          </item>
+          <tag><c>{linger, {true|false, Seconds}}</c></tag>
+          <item>
+            <p>Determines the time-out, in seconds, for flushing unsent data
+              in the <c>close/1</c> socket call. If the first component of
+              the value tuple is <c>false</c>, the second is ignored. This
+              means that <c>close/1</c> returns immediately, not waiting
+              for data to be flushed. Otherwise, the second component is
+              the flushing time-out, in seconds.</p>
           </item>
-
-		  <tag><c>{linger, {true|false, Seconds}}</c></tag>
-		  <item>
-			  <p>Determines the timeout in seconds for flushing unsent data in the
-				  <c>close/1</c> socket call. If the 1st component of the value
-				  tuple is <c>false</c>, the 2nd one is ignored, which means that
-				  <c>close/1</c> returns immediately not waiting
-				  for data to be flushed. Otherwise, the 2nd component is
-				  the flushing time-out in seconds.</p>
-		  </item>
-
           <tag><c>{low_msgq_watermark, Size}</c></tag>
           <item>
 	    <p>If the socket message queue is in a busy state, the
-	    socket message queue will be set in a not busy state when
-	    the amount of data queued in the message queue falls
-	    below this limit. Note that this limit only concerns data
-	    that have not yet reached the ERTS internal socket
-	    implementation. Default value used is 4 kB.</p>
-	    <p>Senders that have been suspended due to either a
-	    busy message queue or a busy socket, will be resumed
-	    when neither the socket message queue, nor the socket
-	    are busy.</p>
-	    <p>For more information see the <c>high_msgq_watermark</c>,
-	    <c>high_watermark</c>, and <c>low_watermark</c> options.</p>
-	    <p>Note that distribution sockets will disable the use of
-	    <c>high_msgq_watermark</c> and <c>low_msgq_watermark</c>,
-	    and will instead use the
-	    <seealso marker="erts:erlang#system_info_dist_buf_busy_limit">distribution
-	    buffer busy limit</seealso> which is a similar feature.</p>
+	      socket message queue is set in a not busy state when
+	      the amount of data queued in the message queue falls
+	      below this limit. Notice that this limit only concerns data
+	      that has not yet reached the <c>ERTS</c> internal socket
+	      implementation. Defaults to 4 kB.</p>
+	    <p>Senders that are suspended because of either a
+	      busy message queue or a busy socket are resumed
+	      when the socket message queue and the socket
+	      are not busy.</p>
+	    <p>For more information, see options <c>high_msgq_watermark</c>,
+	      <c>high_watermark</c>, and <c>low_watermark</c>.</p>
+	    <p>Notice that distribution sockets disable the use of
+	      <c>high_msgq_watermark</c> and <c>low_msgq_watermark</c>.
+	      Instead they use the
+	      <seealso marker="erts:erlang#system_info_dist_buf_busy_limit">distribution
+	      buffer busy limit</seealso>, which is a similar feature.</p>
           </item>
-
           <tag><c>{low_watermark, Size}</c> (TCP/IP sockets)</tag>
           <item>
-	    <p>If the socket is in a busy state, the socket will
-	    be set in a not busy state when the amount of data
-	    queued internally by the ERTS socket implementation
-	    falls below this limit. Default value used is 4 kB.</p>
-	    <p>Senders that have been suspended due to either a
-	    busy message queue or a busy socket, will be resumed
-	    when neither the socket message queue, nor the socket
-	    are busy.</p>
-	    <p>For more information see the <c>high_watermark</c>,
-	    <c>high_msgq_watermark</c>, and <c>low_msgq_watermark</c>
-	    options.</p>
+	    <p>If the socket is in a busy state, the socket is
+	      set in a not busy state when the amount of data
+	      queued internally by the <c>ERTS</c> socket implementation
+	      falls below this limit. Defaults to 4 kB.</p>
+	    <p>Senders that are suspended because of a
+	      busy message queue or a busy socket are resumed
+	      when the socket message queue and the socket are not busy.</p>
+	    <p>For more information, see options <c>high_watermark</c>,
+	      <c>high_msgq_watermark</c>, and <c>low_msgq_watermark</c>.</p>
           </item>
-
-		  <tag><c>{mode, Mode :: binary | list}</c></tag>
+          <tag><c>{mode, Mode :: binary | list}</c></tag>
           <item>
-			  <p>Received <c>Packet</c> is delivered as defined by Mode.</p>
-		  </item>
-
+            <p>Received <c>Packet</c> is delivered as defined by <c>Mode</c>.
+            </p>
+          </item>
 	  <tag><c>{netns, Namespace :: file:filename_all()}</c></tag>
 	  <item>
-	    <p>Set a network namespace for the socket. The <c>Namespace</c>
-	    parameter is a filename defining the namespace for example
-	    <c>"/var/run/netns/example"</c> typically created by the command
-	    <c>ip netns add example</c>. This option must be used in a
-	    function call that creates a socket i.e
-	    <seealso marker="gen_tcp#connect/3">
-	      gen_tcp:connect/3,4</seealso>,
-	    <seealso marker="gen_tcp#listen/2">
-	      gen_tcp:listen/2</seealso>,
-	    <seealso marker="gen_udp#open/1">
-	      gen_udp:open/1,2</seealso> or
-	    <seealso marker="gen_sctp#open/0">
-	      gen_sctp:open/0-2</seealso>.
-	    </p>
-	    <p>This option uses the Linux specific syscall
-	    <c>setns()</c> such as in Linux kernel 3.0 or later
-	    and therefore only exists when the runtime system
-	    has been compiled for such an operating system.
-	    </p>
-	    <p>
-	    The virtual machine also needs elevated privileges either
-	    running as superuser or (for Linux) having the capability
-	    <c>CAP_SYS_ADMIN</c> according to the documentation for setns(2).
-	    However, during testing also <c>CAP_SYS_PTRACE</c>
-	    and <c>CAP_DAC_READ_SEARCH</c> has proven to be necessary.
-	    Example:</p><code>
-setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp
-</code>
-            <p>Note also that the filesystem containing the virtual machine
-	    executable (<c>beam.smp</c> in the example above) has to be local,
-	    mounted without the <c>nosetuid</c> flag,
-	    support extended attributes and that
-	    the kernel has to support file capabilities.
-	    All this runs out of the box on at least Ubuntu 12.04 LTS,
-	    except that SCTP sockets appears to not support
-	    network namespaces.
-	    </p>
-	    <p>The <c>Namespace</c> is a file name and is encoded
-	    and decoded as discussed in
-	    <seealso marker="file">file</seealso>
-	    except that the emulator flag <c>+fnu</c> is ignored and
-	    <seealso marker="#getopts/2">getopts/2</seealso>
-	    for this option will return a binary for the filename
-	    if the stored filename can not be decoded,
-	    which should only happen if you set the option using a binary
-	    that can not be decoded with the emulator's filename encoding:
-	    <seealso marker="file#native_name_encoding/0">
-	      file:native_name_encoding/0</seealso>.
-	    </p>
-	  </item>
-
-		  <tag><c>list</c></tag>
+	    <p>Sets a network namespace for the socket. Parameter
+	      <c>Namespace</c> is a filename defining the namespace, for
+	      example, <c>"/var/run/netns/example"</c>, typically created by
+	      command <c>ip netns add example</c>. This option must be used in
+	      a function call that creates a socket, that is,
+	      <seealso marker="gen_tcp#connect/3"><c>gen_tcp:connect/3,4</c></seealso>,
+	      <seealso marker="gen_tcp#listen/2"><c>gen_tcp:listen/2</c></seealso>,
+	      <seealso marker="gen_udp#open/1"><c>gen_udp:open/1,2</c></seealso>, or
+	    <seealso marker="gen_sctp#open/0"><c>gen_sctp:open/0,1,2</c></seealso>.</p>
+	    <p>This option uses the Linux-specific syscall
+	      <c>setns()</c>, such as in Linux kernel 3.0 or later,
+	      and therefore only exists when the runtime system
+	      is compiled for such an operating system.</p>
+	    <p>The virtual machine also needs elevated privileges, either
+	      running as superuser or (for Linux) having capability
+	      <c>CAP_SYS_ADMIN</c> according to the documentation for
+	      <c>setns(2)</c>.
+	      However, during testing also <c>CAP_SYS_PTRACE</c>
+	      and <c>CAP_DAC_READ_SEARCH</c> have proven to be necessary.</p>
+            <p><em>Example:</em></p>
+	    <code>
+setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp</code>
+            <p>Notice that the filesystem containing the virtual machine
+	      executable (<c>beam.smp</c> in the example) must be local,
+	      mounted without flag <c>nosetuid</c>,
+	      support extended attributes, and
+	      the kernel must support file capabilities.
+	      All this runs out of the box on at least Ubuntu 12.04 LTS,
+	      except that SCTP sockets appear to not support
+	      network namespaces.</p>
+	    <p><c>Namespace</c> is a filename and is encoded
+	      and decoded as discussed in module
+	      <seealso marker="file">file</seealso>, with the
+              following exceptions:</p>
+	    <list type="bulleted">
+	      <item><p>Emulator flag <c>+fnu</c> is ignored.</p></item>
+	      <item><p><seealso marker="#getopts/2"><c>getopts/2</c></seealso>
+	      for this option returns a binary for the filename if the stored
+	      filename cannot be decoded. This is only to occur if you set the
+	      option using a binary that cannot be decoded with the emulator's
+	      filename encoding:
+	      <seealso marker="file#native_name_encoding/0"><c>file:native_name_encoding/0</c></seealso>.</p></item>
+	    </list>
+          </item>
+          <tag><c>list</c></tag>
           <item>
-			  <p>Received <c>Packet</c> is delivered as a list.</p>
-		  </item>
-
-		  <tag><c>binary</c></tag>
+            <p>Received <c>Packet</c> is delivered as a list.</p>
+          </item>
+          <tag><c>binary</c></tag>
           <item>
-			  <p>Received <c>Packet</c> is delivered as a binary.</p>
-		  </item>
-
+            <p>Received <c>Packet</c> is delivered as a binary.</p>
+          </item>
           <tag><c>{nodelay, Boolean}</c>(TCP/IP sockets)</tag>
           <item>
-            <p>If <c>Boolean == true</c>, the <c>TCP_NODELAY</c> option
-              is turned on for the socket, which means that even small
-              amounts of data will be sent immediately.</p>
+            <p>If <c>Boolean == true</c>, option <c>TCP_NODELAY</c>
+              is turned on for the socket, which means that also small
+              amounts of data are sent immediately.</p>
           </item>
           <tag><c>{packet, PacketType}</c>(TCP/IP sockets)</tag>
           <item>
             <p>Defines the type of packets to use for a socket.
-              The following values are valid:</p>
+	      Possible values:</p>
             <taglist>
               <tag><c>raw | 0</c></tag>
               <item>
@@ -917,104 +860,99 @@ setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp
               <item>
                 <p>Packets consist of a header specifying the number of
                   bytes in the packet, followed by that number of bytes.
-                  The length of header can be one, two, or four bytes;
+                  The header length can be one, two, or four bytes, and
                   containing an unsigned integer in big-endian byte order.
-                  Each send operation will generate the header, and the header
-                  will be stripped off on each receive operation.</p>
-                <p>In current implementation the 4-byte header is limited to 2Gb.</p>
+                  Each send operation generates the header, and the header
+                  is stripped off on each receive operation.</p>
+                <p>The 4-byte header is limited to 2Gb.</p>
               </item>
               <tag><c>asn1 | cdr | sunrm | fcgi | tpkt | line</c></tag>
               <item>
                 <p>These packet types only have effect on receiving.
                   When sending a packet, it is the responsibility of
                   the application to supply a correct header. On
-                  receiving, however, there will be one message sent to
+                  receiving, however, one message is sent to
                   the controlling process for each complete packet
                   received, and, similarly, each call to
                   <c>gen_tcp:recv/2,3</c> returns one complete packet.
                   The header is <em>not</em> stripped off.</p>
-                <p>The meanings of the packet types are as follows:
-                                    <br></br>
-<c>asn1</c> - ASN.1 BER,
-                                    <br></br>
-<c>sunrm</c> - Sun's RPC encoding,
-                                    <br></br>
-<c>cdr</c> - CORBA (GIOP 1.1),
-                                    <br></br>
-<c>fcgi</c> - Fast CGI,
-                                    <br></br>
-<c>tpkt</c> - TPKT format [RFC1006],
-                                    <br></br>
-<c>line</c> - Line mode, a packet is a line
-                  terminated with newline, lines longer than
-                  the receive buffer are truncated.</p>
-              </item>
+                <p>The meanings of the packet types are as follows:</p>
+		<list type="bulleted">
+		  <item><c>asn1</c> - ASN.1 BER</item>
+		  <item><c>sunrm</c> - Sun's RPC encoding</item>
+		  <item><c>cdr</c> - CORBA (GIOP 1.1)</item>
+		  <item><c>fcgi</c> - Fast CGI</item>
+		  <item><c>tpkt</c> - TPKT format [RFC1006]</item>
+		  <item><c>line</c> - Line mode, a packet is a line-terminated
+		    with newline, lines longer than the receive buffer are
+		    truncated</item>
+		</list>
+	      </item>
               <tag><c>http | http_bin</c></tag>
               <item>
                 <p>The Hypertext Transfer Protocol. The packets
                  are returned with the format according to <c>HttpPacket</c>
-                 described in <seealso marker="erts:erlang#decode_packet/3">
-                 erlang:decode_packet/3</seealso>. A socket in passive
-                 mode will return <c>{ok, HttpPacket}</c> from <c>gen_tcp:recv</c>
-                 while an active socket will send messages like <c>{http,
-                 Socket, HttpPacket}</c>.</p>
+                 described in
+                 <seealso marker="erts:erlang#decode_packet/3">
+                 <c>erlang:decode_packet/3</c></seealso> in <c>ERTS</c>.
+                 A socket in passive
+                 mode returns <c>{ok, HttpPacket}</c> from <c>gen_tcp:recv</c>
+                 while an active socket sends messages like
+		 <c>{http, Socket, HttpPacket}</c>.</p>
               </item>
               <tag><c>httph | httph_bin</c></tag>
               <item>
-                <p>These two types are often not needed as the socket will
-		automatically switch from <c>http</c>/<c>http_bin</c> to
+                <p>These two types are often not needed, as the socket
+		automatically switches from <c>http</c>/<c>http_bin</c> to
 		<c>httph</c>/<c>httph_bin</c> internally after the first line
-		has been read. There might be occasions however when they are
+		is read. However, there can be occasions when they are
 		useful, such as parsing trailers from chunked encoding.</p>
               </item>
             </taglist>
           </item>
           <tag><c>{packet_size, Integer}</c>(TCP/IP sockets)</tag>
           <item>
-            <p>Sets the max allowed length of the packet body. If
+            <p>Sets the maximum allowed length of the packet body. If
               the packet header indicates that the length of the packet
-              is longer than the max allowed length, the packet is
-              considered invalid. The same happens if the packet header
-              is too big for the socket receive buffer.</p>
-	    <p>For line oriented protocols (<c>line</c>,<c>http*</c>),
-	    option <c>packet_size</c> also guarantees that lines up to the
-	    indicated length are accepted and not considered invalid due
-	    to internal buffer limitations.</p>
+              is longer than the maximum allowed length, the packet is
+              considered invalid. The same occurs if the packet header
+              is too large for the socket receive buffer.</p>
+	    <p>For line-oriented protocols (<c>line</c>, <c>http*</c>),
+	      option <c>packet_size</c> also guarantees that lines up to the
+	      indicated length are accepted and not considered invalid
+	      because of internal buffer limitations.</p>
           </item>
           <tag><c>{line_delimiter, Char}</c>(TCP/IP sockets)</tag>
           <item>
-            <p>Sets the line delimiting character for line oriented protocols
-              (<c>line</c>). Default value is <c>$\n</c>.</p>
+            <p>Sets the line delimiting character for line-oriented protocols
+              (<c>line</c>). Defaults to <c>$\n</c>.</p>
+          </item>
+          <tag><c>{priority, Priority}</c></tag>
+          <item>
+            <p>Sets the protocol-defined priority for all packets to be sent
+              on this socket.</p>
+          </item>
+          <tag><c>{raw, Protocol, OptionNum, ValueBin}</c></tag>
+          <item>
+            <p>See below.</p>
           </item>
-
-		  <tag><c>{priority, Priority}</c></tag>
-          <item> <p>Set the protocol-defined priority for all packets to be sent
-			  on this socket.</p>
-		  </item>
-
-		  <tag><c>{raw, Protocol, OptionNum, ValueBin}</c></tag>
-          <item> <p>See below.</p>
-		  </item>
-
           <tag><c>{read_packets, Integer}</c>(UDP sockets)</tag>
           <item>
-            <p>Sets the max number of UDP packets to read without
+            <p>Sets the maximum number of UDP packets to read without
               intervention from the socket when data is available.
               When this many packets have been read and delivered
               to the destination process, new packets are not read
               until a new notification of available data has arrived.
-              The default is 5, and if this parameter is set too
-              high the system can become unresponsive due to
+              Defaults to <c>5</c>. If this parameter is set too
+              high, the system can become unresponsive because of
               UDP packet flooding.</p>
           </item>
           <tag><c>{recbuf, Size}</c></tag>
           <item>
             <p>The minimum size of the receive buffer to use for
               the socket. You are encouraged to use
-              <seealso marker="inet#getopts/2"><c>inet:getopts/2</c></seealso>,
-               to retrieve the actual size set by your operating system.
-
-            </p>
+              <seealso marker="#getopts/2"><c>getopts/2</c></seealso>
+              to retrieve the size set by your operating system.</p>
           </item>
           <tag><c>{reuseaddr, Boolean}</c></tag>
           <item>
@@ -1023,118 +961,160 @@ setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp
           </item>
           <tag><c>{send_timeout, Integer}</c></tag>
           <item>
-            <p>Only allowed for connection oriented sockets.</p>
+            <p>Only allowed for connection-oriented sockets.</p>
             <p>Specifies a longest time to wait for a send operation to
               be accepted by the underlying TCP stack. When the limit is
-              exceeded, the send operation will return
-              <c>{error,timeout}</c>. How much of a packet that actually
-              got sent is unknown, why the socket should be closed
-              whenever a timeout has occurred (see <c>send_timeout_close</c>).
-              Default is <c>infinity</c>.</p>
+              exceeded, the send operation returns
+              <c>{error,timeout}</c>. How much of a packet that
+              got sent is unknown; the socket is therefore to be closed
+              whenever a time-out has occurred (see <c>send_timeout_close</c>
+              below). Defaults to <c>infinity</c>.</p>
           </item>
           <tag><c>{send_timeout_close, Boolean}</c></tag>
           <item>
-            <p>Only allowed for connection oriented sockets.</p>
+            <p>Only allowed for connection-oriented sockets.</p>
             <p>Used together with <c>send_timeout</c> to specify whether
-              the socket will be automatically closed when the send operation
+              the socket is to be automatically closed when the send operation
               returns <c>{error,timeout}</c>. The recommended setting is
-              <c>true</c> which will automatically close the socket.
-              Default is <c>false</c> due to backward compatibility.</p>
-			<marker id="option-sndbuf"></marker>
+              <c>true</c>, which automatically closes the socket.
+              Defaults to <c>false</c> because of backward compatibility.</p>
+            <marker id="option-sndbuf"></marker>
           </item>
-
           <tag><c>{show_econnreset, Boolean}</c>(TCP/IP sockets)</tag>
           <item>
-            <p>When this option is set to <c>false</c>, as it is by
-              default, an RST that is received from the TCP peer is treated
-              as a normal close (as though a FIN was sent). A caller
-              to <seealso marker="gen_tcp#recv/2">gen_tcp:recv/2</seealso>
-              will get <c>{error, closed}</c>. In active
-              mode the controlling process will receive a
+            <p>When this option is set to <c>false</c>, which is
+              default, an RST received from the TCP peer is treated
+              as a normal close (as though an FIN was sent). A caller to
+              <seealso marker="gen_tcp#recv/2"><c>gen_tcp:recv/2</c></seealso>
+              gets <c>{error, closed}</c>. In active
+              mode, the controlling process receives a
               <c>{tcp_close, Socket}</c> message, indicating that the
               peer has closed the connection.</p>
-            <p>Setting this option to <c>true</c> will allow you to
+            <p>Setting this option to <c>true</c> allows you to
               distinguish between a connection that was closed normally,
-              and one which was aborted (intentionally or unintentionally)
+              and one that was aborted (intentionally or unintentionally)
               by the TCP peer. A call to
-              <seealso marker="gen_tcp#recv/2">gen_tcp:recv/2</seealso>
-              will return <c>{error, econnreset}</c>. In
-              active mode, the controlling process will receive a
+              <seealso marker="gen_tcp#recv/2"><c>gen_tcp:recv/2</c></seealso>
+              returns <c>{error, econnreset}</c>. In
+              active mode, the controlling process receives a
               <c>{tcp_error, Socket, econnreset}</c> message
               before the usual <c>{tcp_closed, Socket}</c>, as is
               the case for any other socket error. Calls to
-              <seealso marker="gen_tcp#send/2">gen_tcp:send/2</seealso>
-              will also return <c>{error, econnreset}</c> when it
+              <seealso marker="gen_tcp#send/2"><c>gen_tcp:send/2</c></seealso>
+              also returns <c>{error, econnreset}</c> when it
               is detected that a TCP peer has sent an RST.</p>
             <p>A connected socket returned from
-              <seealso marker="gen_tcp#accept/1">gen_tcp:accept/1</seealso>
-              will inherit the <c>show_econnreset</c> setting from the
+              <seealso marker="gen_tcp#accept/1"><c>gen_tcp:accept/1</c></seealso>
+              inherits the <c>show_econnreset</c> setting from the
               listening socket.</p>
-			<marker id="option-show_econnreset"></marker>
+            <marker id="option-show_econnreset"></marker>
           </item>
-
           <tag><c>{sndbuf, Size}</c></tag>
           <item>
             <p>The minimum size of the send buffer to use for the socket.
-            You are encouraged to use
-            <seealso marker="inet#getopts/2"><c>inet:getopts/2</c></seealso>,
-            to retrieve the actual size set by your operating system.
-            </p>
+              You are encouraged to use
+              <seealso marker="#getopts/2"><c>getopts/2</c></seealso>,
+              to retrieve the size set by your operating system.</p>
           </item>
           <tag><c>{priority, Integer}</c></tag>
           <item>
-            <p>Sets the SO_PRIORITY socket level option on platforms where
-              this is implemented. The behaviour and allowed range varies on
-              different systems. The option is ignored on platforms where the
-              option is not implemented. Use with caution.</p>
+            <p>Sets the <c>SO_PRIORITY</c> socket level option on platforms
+              where this is implemented. The behavior and allowed range varies
+              between different systems.
+              The option is ignored on platforms where it
+              is not implemented. Use with caution.</p>
           </item>
           <tag><c>{tos, Integer}</c></tag>
           <item>
-            <p>Sets IP_TOS IP level options on platforms where this is
-              implemented. The behaviour and allowed range varies on different
-              systems. The option is ignored on platforms where the option is
-              not implemented. Use with caution.</p>
+            <p>Sets <c>IP_TOS IP</c> level options on platforms where this is
+              implemented. The behavior and allowed range varies between
+              different systems.
+              The option is ignored on platforms where it is not
+              implemented. Use with caution.</p>
           </item>
         </taglist>
-
-        <p>In addition to the options mentioned above, <em>raw</em>
+        <p>In addition to these options, <em>raw</em>
           option specifications can be used. The raw options are
-          specified as a tuple of arity four, beginning with the tag
-          <c>raw</c>, followed by the protocol level, the option number
-          and the actual option value specified as a binary. This
-          corresponds to the second, third and fourth argument to the
+          specified as a tuple of arity four, beginning with tag
+          <c>raw</c>, followed by the protocol level, the option number,
+          and the option value specified as a binary. This
+          corresponds to the second, third, and fourth arguments to the
           <c>setsockopt</c> call in the C socket API. The option value
-          needs to be coded in the native endianess of the platform and,
-          if a structure is required, needs to follow the struct
+          must be coded in the native endianess of the platform and,
+          if a structure is required, must follow the structure
           alignment conventions on the specific platform.</p>
-        <p>Using raw socket options require detailed knowledge about
+        <p>Using raw socket options requires detailed knowledge about
           the current operating system and TCP stack.</p>
-        <p>As an example of the usage of raw options, consider a Linux
-          system where you want to set the <c>TCP_LINGER2</c> option on
-          the <c>IPPROTO_TCP</c> protocol level in the stack. You know
+        <p><em>Example:</em></p>
+        <p>This example concerns the use of raw options. Consider a Linux
+          system where you want to set option <c>TCP_LINGER2</c> on
+          protocol level <c>IPPROTO_TCP</c> in the stack. You know
           that on this particular system it defaults to 60 (seconds),
-          but you would like to lower it to 30 for a particular
-          socket. The <c>TCP_LINGER2</c> option is not explicitly
-          supported by inet, but you know that the protocol level
-          translates to the number 6, the option number to the number 8
-          and the value is to be given as a 32 bit integer. You can use
-          this line of code to set the option for the socket named
+          but you want to lower it to 30 for a particular
+          socket. Option <c>TCP_LINGER2</c> is not explicitly
+          supported by <c>inet</c>, but you know that the protocol level
+          translates to number 6, the option number to number 8,
+          and the value is to be specified as a 32-bit integer. You can use
+          this code line to set the option for the socket named
           <c>Sock</c>:</p>
         <code type="none"><![CDATA[
-        inet:setopts(Sock,[{raw,6,8,<<30:32/native>>}]),]]></code>
+inet:setopts(Sock,[{raw,6,8,<<30:32/native>>}]),]]></code>
         <p>As many options are silently discarded by the stack if they
-          are given out of range, it could be a good idea to check that
-          a raw option really got accepted. This code places the value
-          in the variable TcpLinger2:</p>
+          are specified out of range; it can be a good idea to check that
+          a raw option is accepted. The following code places the value
+          in variable <c>TcpLinger2:</c></p>
         <code type="none"><![CDATA[
-        {ok,[{raw,6,8,<<TcpLinger2:32/native>>}]}=inet:getopts(Sock,[{raw,6,8,4}]),]]></code>
-        <p>Code such as the examples above is inherently non portable,
-          even different versions of the same  OS on the same platform
-          may respond differently to this kind of option
+{ok,[{raw,6,8,<<TcpLinger2:32/native>>}]}=inet:getopts(Sock,[{raw,6,8,4}]),]]></code>
+        <p>Code such as these examples is inherently non-portable,
+          even different versions of the same OS on the same platform
+          can respond differently to this kind of option
           manipulation. Use with care.</p>
-        <p>Note that the default options for TCP/IP sockets can be
-          changed with the Kernel configuration parameters mentioned in
-          the beginning of this document.</p>
+        <p>Notice that the default options for TCP/IP sockets can be
+          changed with the <c>Kernel</c> configuration parameters mentioned in
+          the beginning of this manual page.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="sockname" arity="1"/>
+      <fsummary>Return the local address and port number for a socket.
+      </fsummary>
+      <desc>
+        <p>Returns the local address and port number for a socket.</p>
+	<p>Notice that for SCTP sockets this function returns only
+	  one of the socket addresses. Function
+	  <seealso marker="#socknames/1"><c>socknames/1,2</c></seealso>
+	  returns all.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="socknames" arity="1"/>
+      <fsummary>Return all local address/port numbers for a socket.</fsummary>
+      <desc>
+	<p>Equivalent to
+	  <seealso marker="#socknames/2"><c>socknames(<anno>Socket</anno>, 0)</c></seealso>.
+        </p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="socknames" arity="2"/>
+      <fsummary>Return all local address/port numbers for a socket.</fsummary>
+      <desc>
+	<p>Returns a list of all local address/port number pairs for a socket
+	  for the specified association <c><anno>Assoc</anno></c>.</p>
+	<p>This function can return multiple addresses for multihomed
+	  sockets, such as SCTP sockets. For other sockets it
+	  returns a one-element list.</p>
+	<p>Notice that parameter <c><anno>Assoc</anno></c> is by the
+	  <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">SCTP Sockets API Extensions</url>
+	  defined to be ignored for one-to-one style sockets.
+	  For one-to-many style sockets, the special value <c>0</c>
+	  is defined to mean that the returned addresses must be
+	  without any particular association.
+	  How different SCTP implementations interprets this varies somewhat.
+        </p>
       </desc>
     </func>
   </funcs>
@@ -1143,148 +1123,147 @@ setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp
     <marker id="error_codes"></marker>
     <title>POSIX Error Codes</title>
     <list type="bulleted">
-      <item><c>e2big</c> - argument list too long</item>
-      <item><c>eacces</c> - permission denied</item>
-      <item><c>eaddrinuse</c> - address already in use</item>
-      <item><c>eaddrnotavail</c> - cannot assign requested address</item>
-      <item><c>eadv</c> - advertise error</item>
-      <item><c>eafnosupport</c> - address family not supported by
-       protocol family</item>
-      <item><c>eagain</c> - resource temporarily unavailable</item>
+      <item><c>e2big</c> - Too long argument list</item>
+      <item><c>eacces</c> - Permission denied</item>
+      <item><c>eaddrinuse</c> - Address already in use</item>
+      <item><c>eaddrnotavail</c> - Cannot assign requested address</item>
+      <item><c>eadv</c> - Advertise error</item>
+      <item><c>eafnosupport</c> - Address family not supported by
+        protocol family</item>
+      <item><c>eagain</c> - Resource temporarily unavailable</item>
       <item><c>ealign</c> - EALIGN</item>
-      <item><c>ealready</c> - operation already in progress</item>
-      <item><c>ebade</c> - bad exchange descriptor</item>
-      <item><c>ebadf</c> - bad file number</item>
-      <item><c>ebadfd</c> - file descriptor in bad state</item>
-      <item><c>ebadmsg</c> - not a data message</item>
-      <item><c>ebadr</c> - bad request descriptor</item>
-      <item><c>ebadrpc</c> - RPC structure is bad</item>
-      <item><c>ebadrqc</c> - bad request code</item>
-      <item><c>ebadslt</c> - invalid slot</item>
-      <item><c>ebfont</c> - bad font file format</item>
-      <item><c>ebusy</c> - file busy</item>
-      <item><c>echild</c> - no children</item>
-      <item><c>echrng</c> - channel number out of range</item>
-      <item><c>ecomm</c> - communication error on send</item>
-      <item><c>econnaborted</c> - software caused connection abort</item>
-      <item><c>econnrefused</c> - connection refused</item>
-      <item><c>econnreset</c> - connection reset by peer</item>
-      <item><c>edeadlk</c> - resource deadlock avoided</item>
-      <item><c>edeadlock</c> - resource deadlock avoided</item>
-      <item><c>edestaddrreq</c> - destination address required</item>
-      <item><c>edirty</c> - mounting a dirty fs w/o force</item>
-      <item><c>edom</c> - math argument out of range</item>
-      <item><c>edotdot</c> - cross mount point</item>
-      <item><c>edquot</c> - disk quota exceeded</item>
-      <item><c>eduppkg</c> - duplicate package name</item>
-      <item><c>eexist</c> - file already exists</item>
-      <item><c>efault</c> - bad address in system call argument</item>
-      <item><c>efbig</c> - file too large</item>
-      <item><c>ehostdown</c> - host is down</item>
-      <item><c>ehostunreach</c> - host is unreachable</item>
-      <item><c>eidrm</c> - identifier removed</item>
-      <item><c>einit</c> - initialization error</item>
-      <item><c>einprogress</c> - operation now in progress</item>
-      <item><c>eintr</c> - interrupted system call</item>
-      <item><c>einval</c> - invalid argument</item>
+      <item><c>ealready</c> - Operation already in progress</item>
+      <item><c>ebade</c> - Bad exchange descriptor</item>
+      <item><c>ebadf</c> - Bad file number</item>
+      <item><c>ebadfd</c> - File descriptor in bad state</item>
+      <item><c>ebadmsg</c> - Not a data message</item>
+      <item><c>ebadr</c> - Bad request descriptor</item>
+      <item><c>ebadrpc</c> - Bad RPC structure</item>
+      <item><c>ebadrqc</c> - Bad request code</item>
+      <item><c>ebadslt</c> - Invalid slot</item>
+      <item><c>ebfont</c> - Bad font file format</item>
+      <item><c>ebusy</c> - File busy</item>
+      <item><c>echild</c> - No children</item>
+      <item><c>echrng</c> - Channel number out of range</item>
+      <item><c>ecomm</c> - Communication error on send</item>
+      <item><c>econnaborted</c> - Software caused connection abort</item>
+      <item><c>econnrefused</c> - Connection refused</item>
+      <item><c>econnreset</c> - Connection reset by peer</item>
+      <item><c>edeadlk</c> - Resource deadlock avoided</item>
+      <item><c>edeadlock</c> - Resource deadlock avoided</item>
+      <item><c>edestaddrreq</c> - Destination address required</item>
+      <item><c>edirty</c> - Mounting a dirty fs without force</item>
+      <item><c>edom</c> - Math argument out of range</item>
+      <item><c>edotdot</c> - Cross mount point</item>
+      <item><c>edquot</c> - Disk quota exceeded</item>
+      <item><c>eduppkg</c> - Duplicate package name</item>
+      <item><c>eexist</c> - File already exists</item>
+      <item><c>efault</c> - Bad address in system call argument</item>
+      <item><c>efbig</c> - File too large</item>
+      <item><c>ehostdown</c> - Host is down</item>
+      <item><c>ehostunreach</c> - Host is unreachable</item>
+      <item><c>eidrm</c> - Identifier removed</item>
+      <item><c>einit</c> - Initialization error</item>
+      <item><c>einprogress</c> - Operation now in progress</item>
+      <item><c>eintr</c> - Interrupted system call</item>
+      <item><c>einval</c> - Invalid argument</item>
       <item><c>eio</c> - I/O error</item>
-      <item><c>eisconn</c> - socket is already connected</item>
-      <item><c>eisdir</c> - illegal operation on a directory</item>
-      <item><c>eisnam</c> - is a named file</item>
-      <item><c>el2hlt</c> - level 2 halted</item>
-      <item><c>el2nsync</c> - level 2 not synchronized</item>
-      <item><c>el3hlt</c> - level 3 halted</item>
-      <item><c>el3rst</c> - level 3 reset</item>
+      <item><c>eisconn</c> - Socket is already connected</item>
+      <item><c>eisdir</c> - Illegal operation on a directory</item>
+      <item><c>eisnam</c> - Is a named file</item>
+      <item><c>el2hlt</c> - Level 2 halted</item>
+      <item><c>el2nsync</c> - Level 2 not synchronized</item>
+      <item><c>el3hlt</c> - Level 3 halted</item>
+      <item><c>el3rst</c> - Level 3 reset</item>
       <item><c>elbin</c> - ELBIN</item>
-      <item><c>elibacc</c> - cannot access a needed shared library</item>
-      <item><c>elibbad</c> - accessing a corrupted shared library</item>
-      <item><c>elibexec</c> - cannot exec a shared library directly</item>
-      <item><c>elibmax</c> - attempting to link in more shared
-       libraries than system limit</item>
-      <item><c>elibscn</c> - .lib section in a.out corrupted</item>
-      <item><c>elnrng</c> - link number out of range</item>
-      <item><c>eloop</c> - too many levels of symbolic links</item>
-      <item><c>emfile</c> - too many open files</item>
-      <item><c>emlink</c> - too many links</item>
-      <item><c>emsgsize</c> - message too long</item>
-      <item><c>emultihop</c> - multihop attempted</item>
-      <item><c>enametoolong</c> - file name too long</item>
-      <item><c>enavail</c> - not available</item>
+      <item><c>elibacc</c> - Cannot access a needed shared library</item>
+      <item><c>elibbad</c> - Accessing a corrupted shared library</item>
+      <item><c>elibexec</c> - Cannot exec a shared library directly</item>
+      <item><c>elibmax</c> - Attempting to link in more shared
+        libraries than system limit</item>
+      <item><c>elibscn</c> - <c>.lib</c> section in <c>a.out</c>
+        corrupted</item>
+      <item><c>elnrng</c> - Link number out of range</item>
+      <item><c>eloop</c> - Too many levels of symbolic links</item>
+      <item><c>emfile</c> - Too many open files</item>
+      <item><c>emlink</c> - Too many links</item>
+      <item><c>emsgsize</c> - Message too long</item>
+      <item><c>emultihop</c> - Multihop attempted</item>
+      <item><c>enametoolong</c> - Filename too long</item>
+      <item><c>enavail</c> - Unavailable</item>
       <item><c>enet</c> - ENET</item>
-      <item><c>enetdown</c> - network is down</item>
-      <item><c>enetreset</c> - network dropped connection on reset</item>
-      <item><c>enetunreach</c> - network is unreachable</item>
-      <item><c>enfile</c> - file table overflow</item>
-      <item><c>enoano</c> - anode table overflow</item>
-      <item><c>enobufs</c> - no buffer space available</item>
-      <item><c>enocsi</c> - no CSI structure available</item>
-      <item><c>enodata</c> - no data available</item>
-      <item><c>enodev</c> - no such device</item>
-      <item><c>enoent</c> - no such file or directory</item>
-      <item><c>enoexec</c> - exec format error</item>
-      <item><c>enolck</c> - no locks available</item>
-      <item><c>enolink</c> - link has be severed</item>
-      <item><c>enomem</c> - not enough memory</item>
-      <item><c>enomsg</c> - no message of desired type</item>
-      <item><c>enonet</c> - machine is not on the network</item>
-      <item><c>enopkg</c> - package not installed</item>
-      <item><c>enoprotoopt</c> - bad protocol option</item>
-      <item><c>enospc</c> - no space left on device</item>
-      <item><c>enosr</c> - out of stream resources or not a stream
-       device</item>
-      <item><c>enosym</c> - unresolved symbol name</item>
-      <item><c>enosys</c> - function not implemented</item>
-      <item><c>enotblk</c> - block device required</item>
-      <item><c>enotconn</c> - socket is not connected</item>
-      <item><c>enotdir</c> - not a directory</item>
-      <item><c>enotempty</c> - directory not empty</item>
-      <item><c>enotnam</c> - not a named file</item>
-      <item><c>enotsock</c> - socket operation on non-socket</item>
-      <item><c>enotsup</c> - operation not supported</item>
-      <item><c>enotty</c> - inappropriate device for ioctl</item>
-      <item><c>enotuniq</c> - name not unique on network</item>
-      <item><c>enxio</c> - no such device or address</item>
-      <item><c>eopnotsupp</c> - operation not supported on socket</item>
-      <item><c>eperm</c> - not owner</item>
-      <item><c>epfnosupport</c> - protocol family not supported</item>
-      <item><c>epipe</c> - broken pipe</item>
-      <item><c>eproclim</c> - too many processes</item>
-      <item><c>eprocunavail</c> - bad procedure for program</item>
-      <item><c>eprogmismatch</c> - program version wrong</item>
-      <item><c>eprogunavail</c> - RPC program not available</item>
-      <item><c>eproto</c> - protocol error</item>
-      <item><c>eprotonosupport</c> - protocol not supported</item>
-      <item><c>eprototype</c> - protocol wrong type for socket</item>
-      <item><c>erange</c> - math result unrepresentable</item>
+      <item><c>enetdown</c> - Network is down</item>
+      <item><c>enetreset</c> - Network dropped connection on reset</item>
+      <item><c>enetunreach</c> - Network is unreachable</item>
+      <item><c>enfile</c> - File table overflow</item>
+      <item><c>enoano</c> - Anode table overflow</item>
+      <item><c>enobufs</c> - No buffer space available</item>
+      <item><c>enocsi</c> - No CSI structure available</item>
+      <item><c>enodata</c> - No data available</item>
+      <item><c>enodev</c> - No such device</item>
+      <item><c>enoent</c> - No such file or directory</item>
+      <item><c>enoexec</c> - Exec format error</item>
+      <item><c>enolck</c> - No locks available</item>
+      <item><c>enolink</c> - Link has been severed</item>
+      <item><c>enomem</c> - Not enough memory</item>
+      <item><c>enomsg</c> - No message of desired type</item>
+      <item><c>enonet</c> - Machine is not on the network</item>
+      <item><c>enopkg</c> - Package not installed</item>
+      <item><c>enoprotoopt</c> - Bad protocol option</item>
+      <item><c>enospc</c> - No space left on device</item>
+      <item><c>enosr</c> - Out of stream resources or not a stream device</item>
+      <item><c>enosym</c> - Unresolved symbol name</item>
+      <item><c>enosys</c> - Function not implemented</item>
+      <item><c>enotblk</c> - Block device required</item>
+      <item><c>enotconn</c> - Socket is not connected</item>
+      <item><c>enotdir</c> - Not a directory</item>
+      <item><c>enotempty</c> - Directory not empty</item>
+      <item><c>enotnam</c> - Not a named file</item>
+      <item><c>enotsock</c> - Socket operation on non-socket</item>
+      <item><c>enotsup</c> - Operation not supported</item>
+      <item><c>enotty</c> - Inappropriate device for <c>ioctl</c></item>
+      <item><c>enotuniq</c> - Name not unique on network</item>
+      <item><c>enxio</c> - No such device or address</item>
+      <item><c>eopnotsupp</c> - Operation not supported on socket</item>
+      <item><c>eperm</c> - Not owner</item>
+      <item><c>epfnosupport</c> - Protocol family not supported</item>
+      <item><c>epipe</c> - Broken pipe</item>
+      <item><c>eproclim</c> - Too many processes</item>
+      <item><c>eprocunavail</c> - Bad procedure for program</item>
+      <item><c>eprogmismatch</c> - Wrong program version</item>
+      <item><c>eprogunavail</c> - RPC program unavailable</item>
+      <item><c>eproto</c> - Protocol error</item>
+      <item><c>eprotonosupport</c> - Protocol not supported</item>
+      <item><c>eprototype</c> - Wrong protocol type for socket</item>
+      <item><c>erange</c> - Math result unrepresentable</item>
       <item><c>erefused</c> - EREFUSED</item>
-      <item><c>eremchg</c> - remote address changed</item>
-      <item><c>eremdev</c> - remote device</item>
-      <item><c>eremote</c> - pathname hit remote file system</item>
-      <item><c>eremoteio</c> - remote i/o error</item>
+      <item><c>eremchg</c> - Remote address changed</item>
+      <item><c>eremdev</c> - Remote device</item>
+      <item><c>eremote</c> - Pathname hit remote filesystem</item>
+      <item><c>eremoteio</c> - Remote I/O error</item>
       <item><c>eremoterelease</c> - EREMOTERELEASE</item>
-      <item><c>erofs</c> - read-only file system</item>
-      <item><c>erpcmismatch</c> - RPC version is wrong</item>
-      <item><c>erremote</c> - object is remote</item>
-      <item><c>eshutdown</c> - cannot send after socket shutdown</item>
-      <item><c>esocktnosupport</c> - socket type not supported</item>
-      <item><c>espipe</c> - invalid seek</item>
-      <item><c>esrch</c> - no such process</item>
-      <item><c>esrmnt</c> - srmount error</item>
-      <item><c>estale</c> - stale remote file handle</item>
+      <item><c>erofs</c> - Read-only filesystem</item>
+      <item><c>erpcmismatch</c> - Wrong RPC version</item>
+      <item><c>erremote</c> - Object is remote</item>
+      <item><c>eshutdown</c> - Cannot send after socket shutdown</item>
+      <item><c>esocktnosupport</c> - Socket type not supported</item>
+      <item><c>espipe</c> - Invalid seek</item>
+      <item><c>esrch</c> - No such process</item>
+      <item><c>esrmnt</c> - Srmount error</item>
+      <item><c>estale</c> - Stale remote file handle</item>
       <item><c>esuccess</c> - Error 0</item>
-      <item><c>etime</c> - timer expired</item>
-      <item><c>etimedout</c> - connection timed out</item>
-      <item><c>etoomanyrefs</c> - too many references</item>
-      <item><c>etxtbsy</c> - text file or pseudo-device busy</item>
-      <item><c>euclean</c> - structure needs cleaning</item>
-      <item><c>eunatch</c> - protocol driver not attached</item>
-      <item><c>eusers</c> - too many users</item>
-      <item><c>eversion</c> - version mismatch</item>
-      <item><c>ewouldblock</c> - operation would block</item>
-      <item><c>exdev</c> - cross-domain link</item>
-      <item><c>exfull</c> - message tables full</item>
-      <item><c>nxdomain</c> - the hostname or domain name could not be
-       found</item>
+      <item><c>etime</c> - Timer expired</item>
+      <item><c>etimedout</c> - Connection timed out</item>
+      <item><c>etoomanyrefs</c> - Too many references</item>
+      <item><c>etxtbsy</c> - Text file or pseudo-device busy</item>
+      <item><c>euclean</c> - Structure needs cleaning</item>
+      <item><c>eunatch</c> - Protocol driver not attached</item>
+      <item><c>eusers</c> - Too many users</item>
+      <item><c>eversion</c> - Version mismatch</item>
+      <item><c>ewouldblock</c> - Operation would block</item>
+      <item><c>exdev</c> - Cross-domain link</item>
+      <item><c>exfull</c> - Message tables full</item>
+      <item><c>nxdomain</c> - Hostname or domain name cannot be found</item>
     </list>
   </section>
 </erlref>
diff --git a/lib/kernel/doc/src/inet_res.xml b/lib/kernel/doc/src/inet_res.xml
index 851a36aba9..4ada4203c0 100644
--- a/lib/kernel/doc/src/inet_res.xml
+++ b/lib/kernel/doc/src/inet_res.xml
@@ -11,7 +11,7 @@
       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
@@ -19,7 +19,7 @@
       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.
-    
+
     </legalnotice>
 
     <title>inet_res</title>
@@ -29,52 +29,50 @@
     <rev>A</rev>
   </header>
   <module>inet_res</module>
-  <modulesummary>A Rudimentary DNS Client</modulesummary>
+  <modulesummary>A rudimentary DNS client.</modulesummary>
   <description>
-    <p>Performs DNS name resolving towards recursive name servers</p>
-    <p>See also 
-      <seealso marker="erts:inet_cfg">
-        ERTS User's Guide: Inet configuration
-      </seealso> for more
-      information on how to configure an Erlang runtime system for IP
-      communication and how to enable this DNS client by defining
-      <c><![CDATA['dns']]></c> as a lookup method. It then acts
-      as a backend for the resolving functions in
-      <seealso marker="kernel:inet">inet</seealso>.</p>
+    <p>This module performs DNS name resolving to recursive name servers.</p>
+    <p>See also
+      <seealso marker="erts:inet_cfg">ERTS User's Guide: Inet Configuration</seealso>
+      for more information about how to configure an Erlang runtime system
+      for IP communication, and how to enable this DNS client by defining
+      <c><![CDATA['dns']]></c> as a lookup method.
+      The DNS client then acts as a backend for the resolving functions in
+      <seealso marker="kernel:inet"><c>inet</c></seealso>.</p>
     <p>This DNS client can resolve DNS records even if it
       is not used for normal name resolving in the node.</p>
-    <p>This is not a full-fledged resolver. It is just a
-      DNS client that relies on asking trusted recursive nameservers.</p>
+    <p>This is not a full-fledged resolver, only a
+      DNS client that relies on asking trusted recursive name servers.</p>
   </description>
 
   <section>
     <title>Name Resolving</title>
     <p>UDP queries are used unless resolver option
       <c>usevc</c> is <c>true</c>, which forces TCP queries.
-      If the query is to large for UDP, TCP is used instead.
-      For regular DNS queries 512 bytes is the size limit.
-      When EDNS is enabled (resolver option
-      <c>edns</c> is set to the EDNS version i.e <c>0</c>
+      If the query is too large for UDP, TCP is used instead.
+      For regular DNS queries, 512 bytes is the size limit.</p>
+    <p>When EDNS is enabled (resolver option
+      <c>edns</c> is set to the EDNS version (that is, <c>0</c>
       instead of <c>false</c>), resolver option
-      <c>udp_payload_size</c> sets the limit. If a nameserver
-      replies with the TC bit set (truncation), indicating
+      <c>udp_payload_size</c> sets the limit. If a name server
+      replies with the TC bit set (truncation), indicating that
       the answer is incomplete, the query is retried
-      to that nameserver using TCP. The resolver option
+      to that name server using TCP. Resolver option
       <c>udp_payload_size</c> also sets the advertised
-      size for the max allowed reply size, if EDNS is
-      enabled, otherwise the nameserver uses the limit
-      512 byte. If the reply is larger it gets truncated,
-      forcing a TCP re-query.</p>
-    <p>For UDP queries, the resolver options <c>timeout</c>
+      size for the maximum allowed reply size, if EDNS is
+      enabled, otherwise the name server uses the limit
+      512 bytes. If the reply is larger, it gets truncated,
+      forcing a TCP requery.</p>
+    <p>For UDP queries, resolver options <c>timeout</c>
       and <c>retry</c> control retransmission.
-      Each nameserver in the <c>nameservers</c> list is
-      tried with a timeout of <c>timeout</c> / <c>retry</c>.
-      Then all nameservers are tried again doubling the
-      timeout, for a total of <c>retry</c> times.</p>
-    <p>For queries that not use the <c>search</c> list,
+      Each name server in the <c>nameservers</c> list is
+      tried with a time-out of <c>timeout</c>/<c>retry</c>.
+      Then all name servers are tried again, doubling the
+      time-out, for a total of <c>retry</c> times.</p>
+    <p>For queries not using the <c>search</c> list,
       if the query to all <c>nameservers</c> results in
-      <c>{error,nxdomain}</c>or an empty answer, the same
-      query is tried for the <c>alt_nameservers</c>.</p>
+      <c>{error,nxdomain}</c> or an empty answer, the same
+      query is tried for <c>alt_nameservers</c>.</p>
   </section>
 
   <section>
@@ -92,11 +90,13 @@
       <name name="res_error"/>
     </datatype>
   </datatypes>
+
   <section>
     <title>DNS Types</title>
     <p><marker id="dns_types"/>
       The following data types concern the DNS client:</p>
   </section>
+
   <datatypes>
     <datatype>
       <name name="dns_name"/>
@@ -112,10 +112,10 @@
       <name name="dns_msg"/>
       <desc>
         <p>This is the start of a hiearchy of opaque data structures
-          that can be examined with access functions in inet_dns that
-          return lists of {Field,Value} tuples. The arity 2 functions
-          just return the value for a given field.</p>
-<pre>
+          that can be examined with access functions in <c>inet_dns</c>, which
+          return lists of <c>{Field,Value}</c> tuples. The arity 2 functions
+          only return the value for a specified field.</p>
+        <pre>
 dns_msg() = DnsMsg
     inet_dns:msg(DnsMsg) ->
         [ {header, dns_header()}
@@ -163,63 +163,55 @@ dns_rr() = DnsRr
                      | {z, integer()}
                      | {data, dns_data()} ]
     inet_dns:rr(DnsRr, Field) -> Value</pre>
-
-<p>There is an info function for the types above:</p>
-
-<pre>
+        <p>There is an information function for the types above:</p>
+        <pre>
 inet_dns:record_type(dns_msg()) -> msg;
 inet_dns:record_type(dns_header()) -> header;
 inet_dns:record_type(dns_query()) -> dns_query;
 inet_dns:record_type(dns_rr()) -> rr;
 inet_dns:record_type(_) -> undefined.</pre>
-
-<p>So; inet_dns:(inet_dns:record_type(X))(X) will convert
-any of these data structures into a {Field,Value} list.</p>
+        <p>So, <c>inet_dns:(inet_dns:record_type(X))(X)</c> converts
+          any of these data structures into a <c>{Field,Value}</c> list.</p>
       </desc>
     </datatype>
     <datatype>
       <name name="dns_data"/>
-      <desc><p><c><anno>Regexp</anno></c> is a string with characters encoded in the
-         UTF-8 coding standard.</p>
+      <desc>
+        <p><c><anno>Regexp</anno></c> is a string with characters encoded
+          in the UTF-8 coding standard.</p>
       </desc>
     </datatype>
   </datatypes>
 
-
   <funcs>
-
     <func>
       <name name="getbyname" arity="2"/>
       <name name="getbyname" arity="3"/>
-      <fsummary>Resolve a DNS record of the given type for the given host
-      </fsummary>
+      <fsummary>Resolve a DNS record of the specified type for the specified
+      host.</fsummary>
       <desc>
-        <p>Resolve a DNS record of the given type for the given host,
-          of class <c>in</c>. On success returns a <c>hostent()</c> record with
-          <c>dns_data()</c> elements in the address list field.
-        </p><p>
-          This function uses the resolver option <c>search</c> that
+        <p>Resolves a DNS record of the specified type for the specified host,
+          of class <c>in</c>. Returns, on success, a <c>hostent()</c> record
+          with <c>dns_data()</c> elements in the address list field.</p>
+        <p>This function uses resolver option <c>search</c> that
           is a list of domain names. If the name to resolve contains
           no dots, it is prepended to each domain name in the
           search list, and they are tried in order. If the name
           contains dots, it is first tried as an absolute name
-          and if that fails the search list is used. If the name
-          has a trailing dot it is simply supposed to be
-          an absolute name and the search list is not used.
-        </p>
+          and if that fails, the search list is used. If the name
+          has a trailing dot, it is supposed to be
+          an absolute name and the search list is not used.</p>
       </desc>
     </func>
 
     <func>
       <name name="gethostbyaddr" arity="1"/>
       <name name="gethostbyaddr" arity="2"/>
-      <fsummary>Return a hostent record for the host with the given address
-      </fsummary>
+      <fsummary>Return a hostent record for the host with the specified
+        address.</fsummary>
       <desc>
         <p>Backend functions used by
-          <seealso marker="kernel:inet#gethostbyaddr/1">
-            inet:gethostbyaddr/1
-          </seealso>.
+          <seealso marker="kernel:inet#gethostbyaddr/1"><c>inet:gethostbyaddr/1</c></seealso>.
         </p>
       </desc>
     </func>
@@ -228,22 +220,19 @@ any of these data structures into a {Field,Value} list.</p>
       <name name="gethostbyname" arity="1"/>
       <name name="gethostbyname" arity="2"/>
       <name name="gethostbyname" arity="3"/>
-      <fsummary>Return a hostent record for the host with the given name
+      <fsummary>Return a hostent record for the host with the specified name.
       </fsummary>
       <desc>
         <p>Backend functions used by
-          <seealso marker="kernel:inet#gethostbyname/1">
-            inet:gethostbyname/1,2
-          </seealso>.
-        </p><p>
-          This function uses the resolver option <c>search</c> just like 
-          <seealso marker="#getbyname/2">getbyname/2,3</seealso>.
-        </p><p>
-          If the resolver option <c>inet6</c> is <c>true</c>,
-          an IPv6 address is looked up, and if that fails
-          the IPv4 address is looked up and returned on
-          IPv6 mapped IPv4 format.
+          <seealso marker="kernel:inet#gethostbyname/1"><c>inet:gethostbyname/1,2</c></seealso>.
         </p>
+        <p>This function uses resolver option <c>search</c> just like
+          <seealso marker="#getbyname/2"><c>getbyname/2,3</c></seealso>.
+        </p>
+        <p>If resolver option <c>inet6</c> is <c>true</c>,
+          an IPv6 address is looked up. If that fails,
+          the IPv4 address is looked up and returned on
+          IPv6-mapped IPv4 format.</p>
       </desc>
     </func>
 
@@ -251,22 +240,21 @@ any of these data structures into a {Field,Value} list.</p>
       <name name="lookup" arity="3"/>
       <name name="lookup" arity="4"/>
       <name name="lookup" arity="5"/>
-      <fsummary>Resolve the DNS data for the record of the given type and class
-        for the given name
-      </fsummary>
+      <fsummary>Resolve the DNS data for the record of the specified type
+        and class for the specified name.</fsummary>
       <desc>
-        <p>Resolve the DNS data for the record of the given type and class
-          for the given name. On success filters out the answer records
-          with the correct <c><anno>Class</anno></c> and <c><anno>Type</anno></c> and returns
-          a list of their data fields. So a lookup for type <c>any</c>
-          will give an empty answer since the answer records have
+        <p>Resolves the DNS data for the record of the specified type and class
+          for the specified name. On success, filters out the answer records
+          with the correct <c><anno>Class</anno></c> and
+          <c><anno>Type</anno></c>, and returns
+          a list of their data fields. So, a lookup for type <c>any</c>
+          gives an empty answer, as the answer records have
           specific types that are not <c>any</c>. An empty answer
-          as well as a failed lookup returns an empty list.
-        </p><p>
-          Calls <seealso marker="#resolve/3">resolve/2..4</seealso>
+          or a failed lookup returns an empty list.</p>
+        <p>Calls
+          <seealso marker="#resolve/3"><c>resolve/*</c></seealso>
           with the same arguments and filters the result, so
-          <c><anno>Opts</anno></c> is explained there.
-        </p>
+          <c><anno>Opts</anno></c> is described for those functions.</p>
       </desc>      
     </func>
 
@@ -274,90 +262,77 @@ any of these data structures into a {Field,Value} list.</p>
       <name name="resolve" arity="3"/>
       <name name="resolve" arity="4"/>
       <name name="resolve" arity="5"/>
-      <fsummary>Resolve a DNS record of the given type and class
-        for the given name
-      </fsummary>
+      <fsummary>Resolve a DNS record of the specified type and class
+        for the specified name.</fsummary>
       <desc>
-        <p>Resolve a DNS record of the given type and class for the given name.
-          The returned <c>dns_msg()</c> can be examined using
-          access functions in <c>inet_db</c> as described 
-          in <seealso marker="#dns_types">DNS Types</seealso>.
-        </p><p>
-          If <c><anno>Name</anno></c> is an <c>ip_address()</c>, the domain name
-          to query for is generated as the standard reverse
-          ".IN-ADDR.ARPA." name for an IPv4 address, or the
-          ".IP6.ARPA." name for an IPv6 address.
-          In this case you most probably want to use
-          <c><anno>Class</anno> = in</c> and <c><anno>Type</anno> = ptr</c> but it
-          is not done automatically.
-        </p><p>
-          <c><anno>Opts</anno></c> override the corresponding resolver options.
-          If the option <c>nameservers</c> is given, it is
-          also assumed that it is the complete list of nameserves,
-          so the resolver option <c>alt_nameserves</c> is ignored.
-          Of course, if that option is also given to this function,
-          it is used.
-        </p><p>
-          The <c>verbose</c> option (or rather <c>{verbose,true}</c>),
+        <p>Resolves a DNS record of the specified type and class for the
+          specified name. The returned <c>dns_msg()</c> can be examined using
+          access functions in <c>inet_db</c>, as described in section
+          in <seealso marker="#dns_types">DNS Types</seealso>.</p>
+        <p>If <c><anno>Name</anno></c> is an <c>ip_address()</c>, the domain
+          name to query for is generated as the standard reverse
+          <c>".IN-ADDR.ARPA."</c> name for an IPv4 address, or the
+          <c>".IP6.ARPA."</c> name for an IPv6 address.
+          In this case, you most probably want to use
+          <c><anno>Class</anno> = in</c> and <c><anno>Type</anno> = ptr</c>,
+          but it is not done automatically.</p>
+        <p><c><anno>Opts</anno></c> overrides the corresponding resolver
+          options. If option <c>nameservers</c> is specified, it is
+          assumed that it is the complete list of name serves,
+          so resolver option <c>alt_nameserves</c> is ignored.
+          However, if option <c>alt_nameserves</c> is also specified to this
+          function, it is used.</p>
+        <p>Option <c>verbose</c> (or rather <c>{verbose,true}</c>)
           causes diagnostics printout through
-          <seealso marker="stdlib:io#format/3">io:format/2</seealso>
-          of queries, replies retransmissions, etc, similar
-          to from utilities like <c>dig</c>, <c>nslookup</c> et.al.
-        </p><p>
-          If <c><anno>Opt</anno></c> is an arbitrary atom it is interpreted
+          <seealso marker="stdlib:io#format/3"><c>io:format/2</c></seealso>
+          of queries, replies retransmissions, and so on, similar
+          to from utilities, such as <c>dig</c> and <c>nslookup</c>.</p>
+        <p>If <c><anno>Opt</anno></c> is any atom, it is interpreted
           as <c>{<anno>Opt</anno>,true}</c> unless the atom string starts with
-          <c>"no"</c> making the interpretation <c>{<anno>Opt</anno>,false}</c>.
-          For example: <c>usevc</c> is an alias for <c>{usevc,true}</c>,
-          and <c>nousevc</c> an alias for <c>{usevc,false}</c>.
-        </p><p>
-          The <c>inet6</c> option currently has no effect on this function.
-          You probably want to use <c><anno>Type</anno> = a | aaaa</c> instead.
-        </p>
+          <c>"no"</c>, making the
+          interpretation <c>{<anno>Opt</anno>,false}</c>.
+          For example, <c>usevc</c> is an alias for <c>{usevc,true}</c>
+          and <c>nousevc</c> is an alias for <c>{usevc,false}</c>.</p>
+        <p>Option <c>inet6</c> has no effect on this function. You
+          probably want to use <c><anno>Type</anno> = a | aaaa</c> instead.</p>
       </desc>      
     </func>
-
   </funcs>
 
-
-
   <section>
-    <title>Examples</title>
-    <p>Access functions example: how
-      <seealso marker="#lookup/3">lookup/3</seealso>
-      could have been implemented using
-      <seealso marker="#resolve/3">resolve/3</seealso>
-      from outside the module.
-    </p><code type="none">
-    example_lookup(Name, Class, Type) ->
-        case inet_res:resolve(Name, Class, Type) of
-            {ok,Msg} ->
-                [inet_dns:rr(RR, data)
-                 || RR &lt;- inet_dns:msg(Msg, anlist),
-                    inet_dns:rr(RR, type) =:= Type,
-                    inet_dns:rr(RR, class) =:= Class];
-            {error,_} ->
-                []
-        end.</code>
+    <title>Example</title>
+    <p>This access functions example shows how
+      <seealso marker="#lookup/3"><c>lookup/3</c></seealso>
+      can be implemented using
+      <seealso marker="#resolve/3"><c>resolve/3</c></seealso>
+      from outside the module:</p>
+    <code type="none">
+example_lookup(Name, Class, Type) ->
+    case inet_res:resolve(Name, Class, Type) of
+        {ok,Msg} ->
+            [inet_dns:rr(RR, data)
+             || RR &lt;- inet_dns:msg(Msg, anlist),
+                 inet_dns:rr(RR, type) =:= Type,
+                 inet_dns:rr(RR, class) =:= Class];
+        {error,_} ->
+            []
+     end.</code>
   </section>
 
-
-
   <section>
     <title>Legacy Functions</title>
-    <p>These have been deprecated due to the annoying double
-      meaning of the nameservers/timeout argument, and
-      because they had no decent place for a resolver options list.</p>
+    <p>These are deprecated because the annoying double
+      meaning of the name servers/time-out argument, and
+      because they have no decent place for a resolver options list.</p>
   </section>
 
   <funcs>
-
     <func>
       <name name="nslookup" arity="3"/>
       <name name="nslookup" arity="4" clause_i="1"/>
       <name name="nslookup" arity="4" clause_i="2"/>
-      <fsummary>Resolve a DNS record of the given type and class
-        for the given name
-      </fsummary>
+      <fsummary>Resolve a DNS record of the specified type and class for the
+        specified name.</fsummary>
       <type variable="Name"/>
       <type variable="Class"/>
       <type variable="Type"/>
@@ -365,23 +340,20 @@ any of these data structures into a {Field,Value} list.</p>
       <type variable="Nameservers"/>
       <type variable="Reason"/>
       <desc>
-        <p>Resolve a DNS record of the given type and class for the given name.
-        </p>
+        <p>Resolves a DNS record of the specified type and class for the
+          specified name.</p>
       </desc>      
     </func>
 
     <func>
       <name name="nnslookup" arity="4"/>
       <name name="nnslookup" arity="5"/>
-      <fsummary>Resolve a DNS record of the given type and class
-        for the given name
-      </fsummary>
+      <fsummary>Resolve a DNS record of the specified type and class
+        for the specified name.</fsummary>
       <desc>
-        <p>Resolve a DNS record of the given type and class for the given name.
-        </p>
+        <p>Resolves a DNS record of the specified type and class for the
+          specified name.</p>
       </desc>      
     </func>
-
   </funcs>
-
 </erlref>
diff --git a/lib/kernel/doc/src/init_stub.xml b/lib/kernel/doc/src/init_stub.xml
index eae2cbea95..de00fb8dd7 100644
--- a/lib/kernel/doc/src/init_stub.xml
+++ b/lib/kernel/doc/src/init_stub.xml
@@ -31,13 +31,9 @@
     <rev>A</rev>
   </header>
   <module>init</module>
-  <modulesummary>Coordination of System Startup</modulesummary>
-  <description><p>
-
-  The module init is moved to the runtime system
-  application.  Please see <seealso
-  marker="erts:init">init(3)</seealso> in the
-  erts reference manual instead.
-
-  </p></description>
+  <modulesummary>Coordination of system startup.</modulesummary>
+  <description>
+  <p>This module is moved to the
+    <seealso marker="erts:init"><c>ERTS</c></seealso> application.</p>
+  </description>
 </erlref>
diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index 956c57f7c1..9e6fb60bb7 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -4,7 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>1996</year><year>2015</year>
+      <year>1996</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -29,66 +29,59 @@
     <rev></rev>
   </header>
   <app>kernel</app>
-  <appsummary>The Kernel Application</appsummary>
+  <appsummary>The Kernel application.</appsummary>
   <description>
-    <p>The Kernel application is the first application started. It is
+    <p>The <c>Kernel</c> application has all the code necessary to run
+      the Erlang runtime system: file servers, code servers,
+      and so on.</p>
+    <p>The <c>Kernel</c> application is the first application started. It is
       mandatory in the sense that the minimal system based on
-      Erlang/OTP consists of Kernel and STDLIB. The Kernel application
-      contains the following services:</p>
+      Erlang/OTP consists of <c>Kernel</c> and <c>STDLIB</c>. <c>Kernel</c>
+      contains the following functional areas:</p>
     <list type="bulleted">
-      <item>application controller, see <seealso marker="application">application(3)</seealso></item>
-      <item><c>code</c></item>
-      <item><c>disk_log</c></item>
-      <item><c>dist_ac</c>, distributed application controller</item>
-      <item><c>erl_boot_server</c></item>
-      <item><c>erl_ddll</c></item>
-      <item><c>error_logger</c></item>
-      <item><c>error_logger_format_depth</c></item>
-      <item><c>file</c></item>
-      <item><c>global</c></item>
-      <item><c>global_group</c></item>
-      <item><c>heart</c></item>
-      <item><c>inet</c></item>
-      <item><c>net_kernel</c></item>
-      <item><c>os</c></item>
-      <item><c>pg2</c></item>
-      <item><c>rpc</c></item>
-      <item><c>seq_trace</c></item>
-      <item><c>user</c></item>
+      <item>Start, stop, supervision, configuration, and distribution of applications</item>
+      <item>Code loading</item>
+      <item>Logging</item>
+      <item>Error logging</item>
+      <item>Global name service</item>
+      <item>Supervision of Erlang/OTP</item>
+      <item>Communication with sockets</item>
+      <item>Operating system interface</item>
     </list>
   </description>
 
   <section>
     <title>Error Logger Event Handlers</title>
     <p>Two standard error logger event handlers are defined in
-      the Kernel application. These are described in
-      <seealso marker="error_logger">error_logger(3)</seealso>.</p>
+      the <c>Kernel</c> application. These are described in
+      <seealso marker="error_logger"><c>error_logger(3)</c></seealso>.</p>
   </section>
 
   <section>
     <title>Configuration</title>
-    <p>The following configuration parameters are defined for the Kernel
-      application. See <seealso marker="app">app(4)</seealso> for more
-      information about configuration parameters.</p>
+    <p>The following configuration parameters are defined for the <c>Kernel</c>
+      application. For more information about configuration parameters,
+    see file <seealso marker="app"><c>app(4)</c></seealso>.</p>
     <taglist>
       <tag><c>browser_cmd = string() | {M,F,A}</c></tag>
       <item>
-        <p>When pressing the Help button in a tool such as Debugger or
-          TV, the help text (an HTML file <c>File</c>) is by default
-          displayed in a Netscape browser which is required to be up and
-          running. This parameter can be used to change the command for
+        <p>When pressing the <em>Help</em> button in a tool such as Debugger,
+          the help text (an HTML file <c>File</c>) is by default
+          displayed in a Netscape browser, which is required to be
+          operational. This parameter can be used to change the command for
           how to display the help text if another browser than Netscape
-          is preferred, or another platform than Unix or Windows is
+          is preferred, or if another platform than Unix or Windows is
           used.</p>
         <p>If set to a string <c>Command</c>, the command
-          <c>"Command File"</c> will be evaluated using <c>os:cmd/1</c>.</p>
-        <p>If set to a module-function-args tuple <c>{M,F,A}</c>,
-          the call <c>apply(M,F,[File|A])</c> will be evaluated.</p>
+          <c>"Command File"</c> is evaluated using
+	<seealso marker="os#cmd/1"><c>os:cmd/1</c></seealso>.</p>
+        <p>If set to a module-function-args tuple, <c>{M,F,A}</c>,
+          the call <c>apply(M,F,[File|A])</c> is evaluated.</p>
       </item>
       <tag><c>distributed = [Distrib]</c></tag>
       <item>
-        <p>Specifies which applications are distributed and on which
-          nodes they may execute. In this parameter:</p>
+        <p>Specifies which applications that are distributed and on which
+          nodes they are allowed to execute. In this parameter:</p>
         <list type="bulleted">
           <item><c>Distrib = {App,Nodes} | {App,Time,Nodes}</c></item>
           <item><c>App = atom()</c></item>
@@ -96,25 +89,24 @@
           <item><c>Nodes = [node() | {node(),...,node()}]</c></item>
         </list>
         <p>The parameter is described in
-	  <seealso marker="application">application(3)</seealso>, function
-          <c>load/2</c>.</p>
+	  <seealso marker="application#load/2"><c>application:load/2</c></seealso>.</p>
       </item>
       <tag><c>dist_auto_connect = Value</c></tag>
       <item>
-        <p>Specifies when nodes will be automatically connected. If
+        <p>Specifies when nodes are automatically connected. If
           this parameter is not specified, a node is always
-          automatically connected, e.g when a message is to be sent to
+          automatically connected, for example, when a message is to be sent to
           that node. <c>Value</c> is one of:</p>
         <taglist>
           <tag><c>never</c></tag>
-          <item>Connections are never automatically established, they
+          <item><p>Connections are never automatically established, they
            must be explicitly connected. See
-	   <seealso marker="net_kernel">net_kernel(3)</seealso>.</item>
+	   <seealso marker="net_kernel"><c>net_kernel(3)</c></seealso>.</p></item>
           <tag><c>once</c></tag>
-          <item>Connections will be established automatically, but only
+          <item><p>Connections are established automatically, but only
            once per node. If a node goes down, it must thereafter be
            explicitly connected. See
-	   <seealso marker="net_kernel">net_kernel(3)</seealso>.</item>
+	   <seealso marker="net_kernel"><c>net_kernel(3)</c></seealso>.</p></item>
         </taglist>
       </item>
       <tag><c>permissions = [Perm]</c></tag>
@@ -127,25 +119,24 @@
           <item><c>Bool = boolean()</c></item>
         </list>
         <p>Permissions are described in
-	  <seealso marker="application">application(3)</seealso>, function
-          <c>permit/2</c>.</p>
+	  <seealso marker="application#permit/2"><c>application:permit/2</c></seealso>.</p>
       </item>
       <tag><c>error_logger = Value</c></tag>
       <item>
         <p><c>Value</c> is one of:</p>
         <taglist>
           <tag><c>tty</c></tag>
-          <item>Installs the standard event handler which prints error
-           reports to <c>stdio</c>. This is the default option.</item>
+          <item><p>Installs the standard event handler, which prints error
+           reports to <c>stdio</c>. This is the default option.</p></item>
           <tag><c>{file, FileName}</c></tag>
-          <item>Installs the standard event handler which prints error
-           reports to the file <c>FileName</c>, where <c>FileName</c>
-           is a string.</item>
+          <item><p>Installs the standard event handler, which prints error
+           reports to file <c>FileName</c>, where <c>FileName</c>
+           is a string.</p></item>
           <tag><c>false</c></tag>
           <item>
             <p>No standard event handler is installed, but
               the initial, primitive event handler is kept, printing
-              raw event messages to tty.</p>
+              raw event messages to <c>tty</c>.</p>
           </item>
           <tag><c>silent</c></tag>
           <item>
@@ -156,111 +147,110 @@
       <tag><c>error_logger_format_depth = Depth</c></tag>
       <item>
         <marker id="error_logger_format_depth"></marker>
-	<p>This parameter can be used to limit the size of the
+	<p>Can be used to limit the size of the
 	formatted output from the error logger event handlers.</p>
 
-	<note><p>This configuration parameter was introduced in OTP 18.1.
-	It is currently experimental. Based on user feedback it
-	may be changed or improved in future releases, for example
+	<note><p>This configuration parameter was introduced in OTP 18.1
+	and is experimental. Based on user feedback, it
+	can be changed or improved in future releases, for example,
 	to gain better control over how to limit the size of the
-	formatted output. We have no plans to entirely remove this
-	new feature, unless it turns out to be completely
-	useless. In OTP 19, the default may be changed to limit the
-	formatted output.</p></note>
+	formatted output. We have no plans to remove this
+	new feature entirely, unless it turns out to be
+	useless.</p></note>
 
-        <p><c>Depth</c> is a positive integer that is the maximum
+        <p><c>Depth</c> is a positive integer representing the maximum
         depth to which terms are printed by the error logger event
-        handlers included in OTP. Specifically, the two event handlers
+        handlers included in OTP. This
+        configuration parameter is used by the two event handlers
         defined by the <c>Kernel</c> application and the two event
-        handlers in the <c>SASL</c> application will use this
-        configuration parameter. (If you have implemented you own
-        error handlers, this configuration parameter will have no
-        effect on them.)</p>
+        handlers in the <c>SASL</c> application.
+	(If you have implemented your own error handlers, this configuration
+	parameter has no effect on them.)</p>
 
-	<p>The way <c>Depth</c> is used, is that format strings
-	string passed to the event handlers will be rewritten.
-	The "~p" and "~w" format controls will be replaced with
-	"~P" and "~W", respectively, and <c>Depth</c> will be
-	used as the depth parameter. See
-	<seealso marker="stdlib:io#format/2">io:format/2</seealso>.</p>
+	<p><c>Depth</c> is used as follows: Format strings
+	passed to the event handlers are rewritten.
+	The format controls <c>~p</c> and <c>~w</c> are replaced with
+	<c>~P</c> and <c>~W</c>, respectively, and <c>Depth</c> is
+	used as the depth parameter. For details, see
+	<seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
+	in <c>STDLIB</c>.</p>
 
 	<note><p>A reasonable starting value for <c>Depth</c> is
-	<c>30</c>.  You should test crashing various processes in your
-	application and examine the logs from the crashes, and then
-	either increase or decrease the value.</p></note>
+	<c>30</c>. We recommend to test crashing various processes in your
+	application, examine the logs from the crashes, and then
+	increase or decrease the value.</p></note>
      </item>
       <tag><c>global_groups = [GroupTuple]</c></tag>
       <item>
+        <marker id="global_groups"></marker>
         <p>Defines global groups, see
-	  <seealso marker="global_group">global_group(3)</seealso>.</p>
+	  <seealso marker="global_group"><c>global_group(3)</c></seealso>.
+	In this parameter:</p>
         <list type="bulleted">
-          <item><c>GroupTuple = {GroupName, [Node]} | {GroupName, PublishType, [Node]}</c></item>
-          <item><c>GroupName = atom()</c></item>
-          <item><c>PublishType = normal | hidden</c></item>
-          <item><c>Node = node()</c></item>
+          <item><p><c>GroupTuple = {GroupName, [Node]} | {GroupName, PublishType, [Node]}</c></p></item>
+          <item><p><c>GroupName = atom()</c></p></item>
+          <item><p><c>PublishType = normal | hidden</c></p></item>
+          <item><p><c>Node = node()</c></p></item>
         </list>
       </item>
       <tag><c>inet_default_connect_options = [{Opt, Val}]</c></tag>
       <item>
         <p>Specifies default options for <c>connect</c> sockets,
-          see <seealso marker="inet">inet(3)</seealso>.</p>
+          see <seealso marker="inet"><c>inet(3)</c></seealso>.</p>
       </item>
       <tag><c>inet_default_listen_options = [{Opt, Val}]</c></tag>
       <item>
         <p>Specifies default options for <c>listen</c> (and
-          <c>accept</c>) sockets, see <seealso marker="inet">inet(3)</seealso>.</p>
+          <c>accept</c>) sockets, see <seealso marker="inet"><c>inet(3)</c></seealso>.</p>
       </item>
       <tag><c>{inet_dist_use_interface, ip_address()}</c></tag>
       <item>
-        <p>If the host of an Erlang node has several network interfaces,
-          this parameter specifies which one to listen on. See
-          <seealso marker="inet">inet(3)</seealso> for the type definition
-	  of <c>ip_address()</c>.</p>
+        <p>If the host of an Erlang node has many network interfaces,
+          this parameter specifies which one to listen on. For the type definition
+	  of <c>ip_address()</c>,
+	  see <seealso marker="inet"><c>inet(3)</c></seealso>.</p>
       </item>
-      <tag><c>{inet_dist_listen_min, First}</c></tag>
+      <tag><c>{inet_dist_listen_min, First}</c> and <c>{inet_dist_listen_max, Last}</c></tag>
       <item>
-        <p>See below.</p>
-      </item>
-      <tag><c>{inet_dist_listen_max, Last}</c></tag>
-      <item>
-        <p>Define the <c>First..Last</c> port range for the listener
+        <p>Defines the <c>First..Last</c> port range for the listener
           socket of a distributed Erlang node.</p>
       </item>
       <tag><c>{inet_dist_listen_options, Opts}</c></tag>
       <item>
-        <p>Define a list of extra socket options to be used when opening the
+        <p>Defines a list of extra socket options to be used when opening the
 	  listening socket for a distributed Erlang node.
-	  See <seealso marker="gen_tcp#listen/2">gen_tcp:listen/2</seealso></p>
+	  See <seealso marker="gen_tcp#listen/2"><c>gen_tcp:listen/2</c></seealso>.</p>
       </item>
       <tag><c>{inet_dist_connect_options, Opts}</c></tag>
       <item>
-        <p>Define a list of extra socket options to be used when connecting to
+        <p>Defines a list of extra socket options to be used when connecting to
 	  other distributed Erlang nodes.
-	  See <seealso marker="gen_tcp#connect/4">gen_tcp:connect/4</seealso></p>
+	  See <seealso marker="gen_tcp#connect/4"><c>gen_tcp:connect/4</c></seealso>.</p>
       </item>
       <tag><c>inet_parse_error_log = silent</c></tag>
       <item>
-        <p>If this configuration parameter is set, no
+        <p>If set, no
           <c>error_logger</c> messages are generated when erroneous
           lines are found and skipped in the various Inet configuration
           files.</p>
       </item>
       <tag><c>inetrc = Filename</c></tag>
       <item>
-        <p>The name (string) of an Inet user configuration file. See
-          ERTS User's Guide, Inet configuration.</p>
+        <p>The name (string) of an Inet user configuration file. For details,
+	see section
+	<seealso marker="erts:inet_cfg"><c>Inet Configuration</c></seealso>
+	in the <c>ERTS</c> User's Guide.</p>
       </item>
       <tag><c>net_setuptime = SetupTime</c></tag>
       <item>
         <marker id="net_setuptime"></marker>
         <p><c>SetupTime</c> must be a positive integer or floating point
-          number, and will be interpreted as the maximally allowed time
+          number, and is interpreted as the maximum allowed time
           for each network operation during connection setup to another
-          Erlang node. The maximum allowed value is 120; if higher values
-          are given, 120 will be used. The default value if the variable
-          is not given, or if the value is incorrect (e.g. not a number),
-          is 7 seconds.</p>
-        <p>Note that this value does not limit the total connection
+          Erlang node. The maximum allowed value is <c>120</c>. If higher values
+          are specified, <c>120</c> is used. Default is 7 seconds if the variable
+          is not specified, or if the value is incorrect (for example, not a number).</p>
+        <p>Notice that this value does not limit the total connection
           setup time, but rather each individual network operation during
           the connection setup and handshake.</p>
       </item>
@@ -268,45 +258,44 @@
       <item>
         <marker id="net_ticktime"></marker>
         <p>Specifies the <c>net_kernel</c> tick time. <c>TickTime</c>
-          is given in seconds. Once every <c>TickTime/4</c> second, all
-          connected nodes are ticked (if anything else has been written
-          to a node) and if nothing has been received from another node
-          within the last four (4) tick times that node is considered
-          to be down. This ensures that nodes which are not responding,
+          is specified in seconds. Once every <c>TickTime/4</c> second, all
+          connected nodes are ticked (if anything else is written
+          to a node). If nothing is received from another node
+          within the last four tick times, that node is considered
+          to be down. This ensures that nodes that are not responding,
           for reasons such as hardware errors, are considered to be
           down.</p>
         <p>The time <c>T</c>, in which a node that is not responding is
-          detected, is calculated as: <c><![CDATA[MinT < T < MaxT]]></c> where:</p>
+          detected, is calculated as <c><![CDATA[MinT < T < MaxT]]></c>, where:</p>
         <code type="none">
 MinT = TickTime - TickTime / 4
 MaxT = TickTime + TickTime / 4</code>
-        <p><c>TickTime</c> is by default 60 (seconds). Thus,
+        <p><c>TickTime</c> defaults to <c>60</c> (seconds). Thus,
           <c><![CDATA[45 < T < 75]]></c> seconds.</p>
-        <p><em>Note:</em> All communicating nodes should have the same 
+        <p>Notice that <em>all</em> communicating nodes are to have the <em>same</em>
           <c>TickTime</c> value specified.</p>
-        <p><em>Note:</em> Normally, a terminating node is detected
-          immediately.</p>
+        <p>Normally, a terminating node is detected immediately.</p>
       </item>
       <tag><c>shutdown_timeout = integer() | infinity</c></tag>
       <item>
-        <p>Specifies the time <c>application_controller</c> will wait
+        <p>Specifies the time <c>application_controller</c> waits
           for an application to terminate during node shutdown. If the
-          timer expires, <c>application_controller</c> will brutally
-          kill <c>application_master</c> of the hanging
+          timer expires, <c>application_controller</c> brutally
+          kills <c>application_master</c> of the hanging
           application. If this parameter is undefined, it defaults
           to <c>infinity</c>.</p>
       </item>
       <tag><c>sync_nodes_mandatory = [NodeName]</c></tag>
       <item>
-        <p>Specifies which other nodes <em>must</em> be alive in order
+        <p>Specifies which other nodes that <em>must</em> be alive
           for this node to start properly. If some node in the list
-          does not start within the specified time, this node will not
+          does not start within the specified time, this node does not
           start either. If this parameter is undefined, it defaults to
-          [].</p>
+          <c>[]</c>.</p>
       </item>
       <tag><c>sync_nodes_optional = [NodeName]</c></tag>
       <item>
-        <p>Specifies which other nodes <em>can</em> be alive in order
+        <p>Specifies which other nodes that <em>can</em> be alive
           for this node to start properly. If some node in this list
           does not start within the specified time, this node starts
           anyway. If this parameter is undefined, it defaults to
@@ -314,66 +303,65 @@ MaxT = TickTime + TickTime / 4</code>
       </item>
       <tag><c>sync_nodes_timeout = integer() | infinity</c></tag>
       <item>
-        <p>Specifies the amount of time (in milliseconds) this node
-          will wait for the mandatory and optional nodes to start. If
+        <p>Specifies the time (in milliseconds) that this node
+          waits for the mandatory and optional nodes to start. If
           this parameter is undefined, no node synchronization is
-          performed. This option also makes sure that <c>global</c> is
+          performed. This option ensures that <c>global</c> is
           synchronized.</p>
       </item>
       <tag><c>start_dist_ac = true | false</c></tag>
       <item>
         <p>Starts the <c>dist_ac</c> server if the parameter is
-          <c>true</c>. This parameter should be set to <c>true</c> for
-          systems that use distributed applications.</p>
-        <p>The default value is <c>false</c>.  If this parameter is
-          undefined, the server is started if the parameter
+          <c>true</c>. This parameter is to be set to <c>true</c> for
+          systems using distributed applications.</p>
+        <p>Defaults to <c>false</c>.  If this parameter is
+          undefined, the server is started if parameter
           <c>distributed</c> is set.</p>
       </item>
       <tag><c>start_boot_server = true | false</c></tag>
       <item>
         <p>Starts the <c>boot_server</c> if the parameter is <c>true</c>
-          (see <seealso marker="erl_boot_server">erl_boot_server(3)</seealso>).
-	  This parameter should be
-          set to <c>true</c> in an embedded system which uses this
-          service.</p>
-        <p>The default value is <c>false</c>.</p>
+          (see <seealso marker="erl_boot_server"><c>erl_boot_server(3)</c></seealso>).
+	  This parameter is to be set to <c>true</c> in an embedded system
+	  using this service.</p>
+        <p>Defaults to <c>false</c>.</p>
       </item>
       <tag><c>boot_server_slaves = [SlaveIP]</c></tag>
       <item>
-        <p>If the <c>start_boot_server</c> configuration parameter is
+        <p>If configuration parameter <c>start_boot_server</c> is
           <c>true</c>, this parameter can be used to initialize
-          <c>boot_server</c> with a list of slave IP addresses.
-          <c>SlaveIP = string() | atom | {integer(),integer(),integer(),integer()}</c></p>
+          <c>boot_server</c> with a list of slave IP addresses:</p>
+	<p>
+          <c>SlaveIP = string() | atom | {integer(),integer(),integer(),integer()}</c>,</p>
         <p>where <c><![CDATA[0 <= integer() <=255]]></c>.</p>
-        <p>Examples of <c>SlaveIP</c> in atom, string and tuple form
-          are:          <br></br>
-<c>'150.236.16.70', "150,236,16,70", {150,236,16,70}</c>.</p>
-        <p>The default value is <c>[]</c>.</p>
+        <p>Examples of <c>SlaveIP</c> in atom, string, and tuple form:</p>
+	<p><c>'150.236.16.70', "150,236,16,70", {150,236,16,70}</c>.</p>
+        <p>Defaults to <c>[]</c>.</p>
       </item>
       <tag><c>start_disk_log = true | false</c></tag>
       <item>
         <p>Starts the <c>disk_log_server</c> if the parameter is
-          <c>true</c> (see <seealso marker="disk_log">disk_log(3)</seealso>).
-	  This parameter should be
-          set to true in an embedded system which uses this service.</p>
-        <p>The default value is <c>false</c>.</p>
+          <c>true</c> (see <seealso marker="disk_log"><c>disk_log(3)</c></seealso>).
+	  This parameter is to be set to <c>true</c> in an embedded system
+	  using this service.</p>
+        <p>Defaults to <c>false</c>.</p>
       </item>
       <tag><c>start_pg2 = true | false</c></tag>
       <item>
+        <marker id="start_pg2"></marker>
         <p>Starts the <c>pg2</c> server (see
-	  <seealso marker="pg2">pg2(3)</seealso>) if
-          the parameter is <c>true</c>. This parameter should be set to
-          <c>true</c> in an embedded system which uses this service.</p>
-        <p>The default value is <c>false</c>.</p>
+	  <seealso marker="pg2"><c>pg2(3)</c></seealso>) if
+          the parameter is <c>true</c>. This parameter is to be set to
+          <c>true</c> in an embedded system that uses this service.</p>
+        <p>Defaults to <c>false</c>.</p>
       </item>
       <tag><c>start_timer = true | false</c></tag>
       <item>
         <p>Starts the <c>timer_server</c> if the parameter is
-          <c>true</c> (see <seealso marker="stdlib:timer">timer(3)</seealso>).
-	  This parameter should be
-          set to <c>true</c> in an embedded system which uses this
-          service.</p>
-        <p>The default value is <c>false</c>.</p>
+          <c>true</c> (see <seealso marker="stdlib:timer"><c>stdlib:timer(3)</c></seealso>).
+	  This parameter is to be set to <c>true</c> in an embedded system
+	  using this service.</p>
+        <p>Defaults to <c>false</c>.</p>
       </item>
       <tag><c>shutdown_func = {Mod, Func}</c></tag>
       <item>
@@ -383,7 +371,7 @@ MaxT = TickTime + TickTime / 4</code>
           <item><c>Func = atom()</c></item>
         </list>
         <p>Sets a function that <c>application_controller</c> calls
-          when it starts to terminate. The function is called as:
+          when it starts to terminate. The function is called as
           <c>Mod:Func(Reason)</c>, where <c>Reason</c> is the terminate
           reason for <c>application_controller</c>, and it must
           return as soon as possible for <c>application_controller</c>
@@ -394,25 +382,25 @@ MaxT = TickTime + TickTime / 4</code>
 
   <section>
     <title>See Also</title>
-    <p><seealso marker="app">app(4)</seealso>,
-      <seealso marker="application">application(3)</seealso>, 
-      <seealso marker="code">code(3)</seealso>, 
-      <seealso marker="disk_log">disk_log(3)</seealso>, 
-      <seealso marker="erl_boot_server">erl_boot_server(3)</seealso>,
-      <seealso marker="erl_ddll">erl_ddll(3)</seealso>, 
-      <seealso marker="error_logger">error_logger(3)</seealso>, 
-      <seealso marker="file">file(3)</seealso>, 
-      <seealso marker="global">global(3)</seealso>, 
-      <seealso marker="global_group">global_group(3)</seealso>, 
-      <seealso marker="heart">heart(3)</seealso>, 
-      <seealso marker="inet">inet(3)</seealso>, 
-      <seealso marker="net_kernel">net_kernel(3)</seealso>, 
-      <seealso marker="os">os(3)</seealso>, 
-      <seealso marker="pg2">pg2(3)</seealso>, 
-      <seealso marker="rpc">rpc(3)</seealso>, 
-      <seealso marker="seq_trace">seq_trace(3)</seealso>, 
-      <seealso marker="stdlib:timer">timer(3)</seealso>,
-      <seealso marker="user">user(3)</seealso></p>
+    <p><seealso marker="app"><c>app(4)</c></seealso>,
+      <seealso marker="application"><c>application(3)</c></seealso>,
+      <seealso marker="code"><c>code(3)</c></seealso>,
+      <seealso marker="disk_log"><c>disk_log(3)</c></seealso>,
+      <seealso marker="erl_boot_server"><c>erl_boot_server(3)</c></seealso>,
+      <seealso marker="erl_ddll"><c>erl_ddll(3)</c></seealso>,
+      <seealso marker="error_logger"><c>error_logger(3)</c></seealso>,
+      <seealso marker="file"><c>file(3)</c></seealso>,
+      <seealso marker="global"><c>global(3)</c></seealso>,
+      <seealso marker="global_group"><c>global_group(3)</c></seealso>,
+      <seealso marker="heart"><c>heart(3)</c></seealso>,
+      <seealso marker="inet"><c>inet(3)</c></seealso>,
+      <seealso marker="net_kernel"><c>net_kernel(3)</c></seealso>,
+      <seealso marker="os"><c>os(3)</c></seealso>,
+      <seealso marker="pg2"><c>pg2(3)</c></seealso>,
+      <seealso marker="rpc"><c>rpc(3)</c></seealso>,
+      <seealso marker="seq_trace"><c>seq_trace(3)</c></seealso>,
+      <seealso marker="user"><c>user(3)</c></seealso>,
+      <seealso marker="stdlib:timer"><c>timer(3)</c></seealso></p>
   </section>
 </appref>
 
diff --git a/lib/kernel/doc/src/net_adm.xml b/lib/kernel/doc/src/net_adm.xml
index 4ef9d361f6..e97c8fad11 100644
--- a/lib/kernel/doc/src/net_adm.xml
+++ b/lib/kernel/doc/src/net_adm.xml
@@ -25,95 +25,105 @@
     <title>net_adm</title>
     <prepared>Claes Wikstrom</prepared>
     <docno>1</docno>
-    <date>96-09-10</date>
+    <date>1996-09-10</date>
     <rev>A</rev>
   </header>
   <module>net_adm</module>
-  <modulesummary>Various Erlang Net Administration Routines</modulesummary>
+  <modulesummary>Various Erlang net administration routines.</modulesummary>
   <description>
     <p>This module contains various network utility functions.</p>
   </description>
+
   <funcs>
     <func>
       <name name="dns_hostname" arity="1"/>
-      <fsummary>Official name of a host</fsummary>
+      <fsummary>Official name of a host.</fsummary>
       <desc>
         <p>Returns the official name of <c><anno>Host</anno></c>, or
           <c>{error, <anno>Host</anno>}</c> if no such name is found. See also
-          <c>inet(3)</c>.</p>
+          <seealso marker="inet"><c>inet(3)</c></seealso>.</p>
       </desc>
     </func>
+
     <func>
       <name name="host_file" arity="0"/>
-      <fsummary>Read the <c>.hosts.erlang</c>file</fsummary>
+      <fsummary>Read file <c>.hosts.erlang</c>.</fsummary>
       <desc>
-        <p>Reads the <c>.hosts.erlang</c> file, see the section
-          <em>Files</em> below. Returns the hosts in this file as a
-          list, or returns <c>{error, <anno>Reason</anno>}</c> if the file could not
-          be read or the Erlang terms on the file could not be interpreted.</p>
+        <p>Reads file <c>.hosts.erlang</c>, see section
+          <seealso marker="#files">Files</seealso>. Returns the hosts in this
+          file as a list. Returns <c>{error, <anno>Reason</anno>}</c> if the
+          file cannot be read or the Erlang terms on the file cannot be
+          interpreted.</p>
       </desc>
     </func>
+
     <func>
       <name name="localhost" arity="0"/>
-      <fsummary>Name of the local host</fsummary>
+      <fsummary>Name of the local host.</fsummary>
       <desc>
         <p>Returns the name of the local host. If Erlang was started
-          with the <c>-name</c> command line flag, <c><anno>Name</anno></c> is
+          with command-line flag <c>-name</c>, <c><anno>Name</anno></c> is
           the fully qualified name.</p>
       </desc>
     </func>
+
     <func>
       <name name="names" arity="0"/>
       <name name="names" arity="1"/>
-      <fsummary>Names of Erlang nodes at a host</fsummary>
+      <fsummary>Names of Erlang nodes at a host.</fsummary>
       <desc>
-        <p>Similar to <c>epmd -names</c>, see <c>epmd(1)</c>.
-          <c><anno>Host</anno></c> defaults to the local host. Returns the names and
-          associated port numbers of the Erlang nodes that <c>epmd</c>
-          at the specified host has registered.</p>
-        <p>Returns <c>{error, address}</c> if <c>epmd</c> is not
-          running.</p>
+        <p>Similar to <c>epmd -names</c>, see
+          <seealso marker="erts:epmd"><c>erts:epmd(1)</c></seealso>.
+          <c><anno>Host</anno></c> defaults to the local host. Returns the
+          names and associated port numbers of the Erlang nodes that
+          <c>epmd</c> registered at the specified host. Returns
+          <c>{error, address}</c> if <c>epmd</c> is not operational.</p>
+        <p><em>Example:</em></p>
         <pre>
 (arne@dunn)1> <input>net_adm:names().</input>
 {ok,[{"arne",40262}]}</pre>
       </desc>
     </func>
+
     <func>
       <name name="ping" arity="1"/>
-      <fsummary>Set up a connection to a node</fsummary>
+      <fsummary>Set up a connection to a node.</fsummary>
       <desc>
-        <p>Tries to set up a connection to <c><anno>Node</anno></c>. Returns
-          <c>pang</c> if it fails, or <c>pong</c> if it is successful.</p>
+        <p>Sets up a connection to <c><anno>Node</anno></c>. Returns
+          <c>pong</c> if it is successful, otherwise <c>pang</c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="world" arity="0"/>
       <name name="world" arity="1"/>
-      <fsummary>Lookup and connect to all nodes at all hosts in <c>.hosts.erlang</c></fsummary>
+      <fsummary>Lookup and connect to all nodes at all hosts in
+        <c>.hosts.erlang</c>.</fsummary>
       <type name="verbosity"/>
       <desc>
-        <p>This function calls <c>names(Host)</c> for all hosts which
+        <p>Calls <c>names(Host)</c> for all hosts that
           are specified in the Erlang host file <c>.hosts.erlang</c>,
-          collects the replies and then evaluates <c>ping(Node)</c> on
-          all those nodes. Returns the list of all nodes that were,
-	  successfully pinged.</p>
+          collects the replies, and then evaluates <c>ping(Node)</c> on
+          all those nodes. Returns the list of all nodes that are
+          successfully pinged.</p>
         <p><c><anno>Arg</anno></c> defaults to <c>silent</c>.
-	 If <c><anno>Arg</anno> == verbose</c>, the function writes information about which
-          nodes it is pinging to stdout.</p>
+          If <c><anno>Arg</anno> == verbose</c>, the function writes
+          information about which nodes it is pinging to <c>stdout</c>.</p>
         <p>This function can be useful when a node is started, and
-          the names of the other nodes in the network are not initially
-          known.</p>
-        <p>Failure: <c>{error, Reason}</c> if <c>host_file()</c>
+          the names of the other network nodes are not initially known.</p>
+        <p>Returns <c>{error, Reason}</c> if <c>host_file()</c>
           returns <c>{error, Reason}</c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="world_list" arity="1"/>
       <name name="world_list" arity="2"/>
-      <fsummary>Lookup and connect to all nodes at specified hosts</fsummary>
+      <fsummary>Lookup and connect to all nodes at specified hosts.</fsummary>
       <type name="verbosity"/>
       <desc>
-        <p>As <c>world/0,1</c>, but the hosts are given as argument
+        <p>Same as <seealso marker="#world/1"><c>world/0,1</c></seealso>,
+          but the hosts are specified as argument
           instead of being read from <c>.hosts.erlang</c>.</p>
       </desc>
     </func>
@@ -121,13 +131,14 @@
 
   <section>
     <title>Files</title>
-    <p>The <c>.hosts.erlang</c> file consists of a number of host names
+    <marker id="files"/>
+    <p>File <c>.hosts.erlang</c> consists of a number of host names
       written as Erlang terms. It is looked for in the current work
       directory, the user's home directory, and <c>$OTP_ROOT</c>
       (the root directory of Erlang/OTP), in that order.</p>
-    <p>The format of the <c>.hosts.erlang</c> file must be one host
-      name per line. The host names must be within quotes as shown in
-      the following example:</p>
+    <p>The format of file <c>.hosts.erlang</c> must be one host
+      name per line. The host names must be within quotes.</p>
+    <p><em>Example:</em></p>
     <pre>
 'super.eua.ericsson.se'.
 'renat.eua.ericsson.se'.
diff --git a/lib/kernel/doc/src/net_kernel.xml b/lib/kernel/doc/src/net_kernel.xml
index a0132db8db..2d52adc2eb 100644
--- a/lib/kernel/doc/src/net_kernel.xml
+++ b/lib/kernel/doc/src/net_kernel.xml
@@ -25,284 +25,298 @@
     <title>net_kernel</title>
     <prepared>Claes Wikstrom</prepared>
     <docno>1</docno>
-    <date>96-09-10</date>
+    <date>1996-09-10</date>
     <rev>A</rev>
   </header>
   <module>net_kernel</module>
-  <modulesummary>Erlang Networking Kernel</modulesummary>
+  <modulesummary>Erlang networking kernel.</modulesummary>
   <description>
     <p>The net kernel is a system process, registered as
-      <c>net_kernel</c>, which must be running for distributed Erlang
+      <c>net_kernel</c>, which must be operational for distributed Erlang
       to work. The purpose of this process is to implement parts of
       the BIFs <c>spawn/4</c> and <c>spawn_link/4</c>, and to provide 
       monitoring of the network.</p>
-    <p>An Erlang node is started using the command line flag
+    <p>An Erlang node is started using command-line flag
       <c>-name</c> or <c>-sname</c>:</p>
-<pre>$ <input>erl -sname foobar</input></pre>
+     <pre>
+$ <input>erl -sname foobar</input></pre>
     <p>It is also possible to call <c>net_kernel:start([foobar])</c>
       directly from the normal Erlang shell prompt:</p>
-<pre>1> <input>net_kernel:start([foobar, shortnames]).</input>
+    <pre>
+1> <input>net_kernel:start([foobar, shortnames]).</input>
 {ok,&lt;0.64.0>}
 (foobar@gringotts)2></pre>
-    <p>If the node is started with the command line flag <c>-sname</c>,
-      the node name will be <c>foobar@Host</c>, where <c>Host</c> is
+    <p>If the node is started with command-line flag <c>-sname</c>,
+      the node name is <c>foobar@Host</c>, where <c>Host</c> is
       the short name of the host (not the fully qualified domain name).
-      If started with the <c>-name</c> flag, <c>Host</c> is the fully
-      qualified domain name. See <c>erl(1)</c>.</p>
+      If started with flag <c>-name</c>, the node name is <c>foobar@Host</c>,
+      where <c>Host</c> is the fully qualified domain name.
+      For more information, see
+      <seealso marker="erts:erl"><c>erl</c></seealso>.</p>
     <p>Normally, connections are established automatically when
       another node is referenced. This functionality can be disabled
-      by setting the Kernel configuration parameter
+      by setting <c>Kernel</c> configuration parameter
       <c>dist_auto_connect</c> to <c>false</c>, see
-      <seealso marker="kernel_app">kernel(6)</seealso>. In this case,
+      <seealso marker="kernel_app"><c>kernel(6)</c></seealso>. In this case,
       connections must be established explicitly by calling
-      <c>net_kernel:connect_node/1</c>.</p>
-    <p>Which nodes are allowed to communicate with each other is handled
-      by the magic cookie system, see
-      <seealso marker="doc/reference_manual:distributed">Distributed Erlang</seealso> in the Erlang Reference Manual.</p>
+      <seealso marker="#connect_node/1"><c>connect_node/1</c></seealso>.</p>
+    <p>Which nodes that are allowed to communicate with each other is handled
+      by the magic cookie system, see section
+      <seealso marker="doc/reference_manual:distributed">Distributed Erlang</seealso>
+      in the Erlang Reference Manual.</p>
   </description>
+
   <funcs>
     <func>
       <name name="allow" arity="1"/>
-      <fsummary>Limit access to a specified set of nodes</fsummary>
+      <fsummary>Permit access to a specified set of nodes</fsummary>
       <desc>
-        <p>Limits access to the specified set of nodes. Any access
-          attempts made from (or to) nodes not in <c><anno>Nodes</anno></c> will be
-          rejected.</p>
+        <p>Permits access to the specified set of nodes.</p>
+        <p>Before the first call to <c>allow/1</c>, any node with the correct
+          cookie can be connected. When <c>allow/1</c> is called, a list
+          of allowed nodes is established. Any access attempts made from (or to)
+          nodes not in that list will be rejected.</p>
+        <p>Subsequent calls to <c>allow/1</c> will add the specified nodes
+          to the list of allowed nodes. It is not possible to remove nodes
+          from the list.</p>
         <p>Returns <c>error</c> if any element in <c><anno>Nodes</anno></c> is not
           an atom.</p>
       </desc>
     </func>
+
     <func>
       <name name="connect_node" arity="1"/>
-      <fsummary>Establish a connection to a node</fsummary>
+      <fsummary>Establish a connection to a node.</fsummary>
       <desc>
-        <p>Establishes a connection to <c><anno>Node</anno></c>. Returns <c>true</c>
-          if successful, <c>false</c> if not, and <c>ignored</c> if
-          the local node is not alive.</p>
+        <p>Establishes a connection to <c><anno>Node</anno></c>. Returns
+          <c>true</c> if successful, <c>false</c> if not, and <c>ignored</c>
+          if the local node is not alive.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="get_net_ticktime" arity="0"/>
+      <fsummary>Get <c>net_ticktime</c>.</fsummary>
+      <desc>
+        <p>Gets <c>net_ticktime</c> (see
+          <seealso marker="kernel_app"><c>kernel(6)</c></seealso>).</p>
+        <p>Defined return values (<c><anno>Res</anno></c>):</p>
+        <taglist>
+          <tag><c><anno>NetTicktime</anno></c></tag>
+          <item><p><c>net_ticktime</c> is <c><anno>NetTicktime</anno></c>
+            seconds.</p></item>
+          <tag><c>{ongoing_change_to, <anno>NetTicktime</anno>}</c></tag>
+          <item><p><c>net_kernel</c> is currently changing
+            <c>net_ticktime</c> to <c><anno>NetTicktime</anno></c>
+            seconds.</p></item>
+          <tag><c>ignored</c></tag>
+          <item><p>The local node is not alive.</p></item>
+        </taglist>
       </desc>
     </func>
+
     <func>
       <name name="monitor_nodes" arity="1"/>
       <name name="monitor_nodes" arity="2"/>
-      <fsummary>Subscribe to node status change messages</fsummary>
+      <fsummary>Subscribe to node status change messages.</fsummary>
       <desc>
         <p>The calling process subscribes or unsubscribes to node
           status change messages. A <c>nodeup</c> message is delivered
-          to all subscribing process when a new node is connected, and
+          to all subscribing processes when a new node is connected, and
           a <c>nodedown</c> message is delivered when a node is
           disconnected.</p>
-        <p>If <c><anno>Flag</anno></c> is <c>true</c>, a new subscription is started.
-          If <c><anno>Flag</anno></c> is <c>false</c>, all previous subscriptions --
-          started with the same <c><anno>Options</anno></c> -- are stopped. Two
+        <p>If <c><anno>Flag</anno></c> is <c>true</c>, a new subscription is
+          started. If <c><anno>Flag</anno></c> is <c>false</c>, all previous
+          subscriptions started with the same <c><anno>Options</anno></c>
+          are stopped. Two
           option lists are considered the same if they contain the same
           set of options.</p>
-        <p>As of <c>kernel</c> version 2.11.4, and <c>erts</c> version
+        <p>As from <c>Kernel</c> version 2.11.4, and <c>ERTS</c> version
           5.5.4, the following is guaranteed:</p>
         <list type="bulleted">
-          <item><c>nodeup</c> messages will be delivered before delivery
-           of any message from the remote node passed through the
-           newly established connection.</item>
-          <item><c>nodedown</c> messages will not be delivered until all
-           messages from the remote node that have been passed
-           through the connection have been delivered.</item>
+          <item><p><c>nodeup</c> messages are delivered before delivery
+            of any message from the remote node passed through the
+            newly established connection.</p></item>
+          <item><p><c>nodedown</c> messages are not delivered until all
+            messages from the remote node that have been passed
+            through the connection have been delivered.</p></item>
         </list>
-        <p>Note, that this is <em>not</em> guaranteed for <c>kernel</c>
+        <p>Notice that this is <em>not</em> guaranteed for <c>Kernel</c>
           versions before 2.11.4.</p>
-        <p>As of <c>kernel</c> version 2.11.4 subscriptions can also be
-          made before the <c>net_kernel</c> server has been started,
-          i.e., <c>net_kernel:monitor_nodes/[1,2]</c> does not return
+        <p>As from <c>Kernel</c> version 2.11.4, subscriptions can also be
+          made before the <c>net_kernel</c> server is started, that is,
+          <c>net_kernel:monitor_nodes/[1,2]</c> does not return
           <c>ignored</c>.</p>
-        <p>As of <c>kernel</c> version 2.13, and <c>erts</c> version
+        <p>As from <c>Kernel</c> version 2.13, and <c>ERTS</c> version
           5.7, the following is guaranteed:</p>
         <list type="bulleted">
-          <item><c>nodeup</c> messages will be delivered after the
-	  corresponding node appears in results from
-	  <c>erlang:nodes/X</c>.</item>
-          <item><c>nodedown</c> messages will be delivered after the
-	  corresponding node has disappeared in results from
-	  <c>erlang:nodes/X</c>.</item>
+          <item><p><c>nodeup</c> messages are delivered after the
+	    corresponding node appears in results from
+	    <c>erlang:nodes/X</c>.</p></item>
+          <item><p><c>nodedown</c> messages are delivered after the
+	    corresponding node has disappeared in results from
+	    <c>erlang:nodes/X</c>.</p></item>
         </list>
-        <p>Note, that this is <em>not</em> guaranteed for <c>kernel</c>
+        <p>Notice that this is <em>not</em> guaranteed for <c>Kernel</c>
           versions before 2.13.</p>
         <p>The format of the node status change messages depends on
-          <c><anno>Options</anno></c>. If <c><anno>Options</anno></c> is [], which is the default,
-          the format is:</p>
+          <c><anno>Options</anno></c>. If <c><anno>Options</anno></c> is
+          <c>[]</c>, which is the default, the format is as follows:</p>
         <code type="none">
 {nodeup, Node} | {nodedown, Node}
   Node = node()</code>
-        <p>If <c><anno>Options</anno> /= []</c>, the format is:</p>
+        <p>If <c><anno>Options</anno></c> is not <c>[]</c>, the format is
+          as follows:</p>
         <code type="none">
 {nodeup, Node, InfoList} | {nodedown, Node, InfoList}
   Node = node()
   InfoList = [{Tag, Val}]</code>
         <p><c>InfoList</c> is a list of tuples. Its contents depends on
           <c><anno>Options</anno></c>, see below.</p>
-        <p>Also, when <c>OptionList == []</c> only visible nodes, that
+        <p>Also, when <c>OptionList == []</c>, only visible nodes, that
           is, nodes that appear in the result of
-          <seealso marker="erts:erlang#nodes/0">nodes/0</seealso>, are
-          monitored.</p>
+          <seealso marker="erts:erlang#nodes/0"><c>erlang:nodes/0</c></seealso>,
+          are monitored.</p>
         <p><c><anno>Option</anno></c> can be any of the following:</p>
         <taglist>
           <tag><c>{node_type, NodeType}</c></tag>
           <item>
-            <p>Currently valid values for <c>NodeType</c> are:</p>
+            <p>Valid values for <c>NodeType</c>:</p>
             <taglist>
               <tag><c>visible</c></tag>
-              <item>Subscribe to node status change messages for visible
+              <item><p>Subscribe to node status change messages for visible
                nodes only. The tuple <c>{node_type, visible}</c> is
-               included in <c>InfoList</c>.</item>
+               included in <c>InfoList</c>.</p></item>
               <tag><c>hidden</c></tag>
-              <item>Subscribe to node status change messages for hidden
+              <item><p>Subscribe to node status change messages for hidden
                nodes only. The tuple <c>{node_type, hidden}</c> is
-               included in <c>InfoList</c>.</item>
+               included in <c>InfoList</c>.</p></item>
               <tag><c>all</c></tag>
-              <item>Subscribe to node status change messages for both
+              <item><p>Subscribe to node status change messages for both
                visible and hidden nodes. The tuple
-              <c>{node_type, visible | hidden}</c> is included in
-              <c>InfoList</c>.</item>
+               <c>{node_type, visible | hidden}</c> is included in
+               <c>InfoList</c>.</p></item>
             </taglist>
           </item>
           <tag><c>nodedown_reason</c></tag>
           <item>
             <p>The tuple <c>{nodedown_reason, Reason}</c> is included in
-              <c>InfoList</c> in <c>nodedown</c> messages. <c>Reason</c>
-              can be:</p>
+              <c>InfoList</c> in <c>nodedown</c> messages.</p>
+            <p><c>Reason</c> can be any of the following:</p>
             <taglist>
               <tag><c>connection_setup_failed</c></tag>
-              <item>The connection setup failed (after <c>nodeup</c>
-               messages had been sent).</item>
+              <item><p>The connection setup failed (after <c>nodeup</c>
+                messages were sent).</p></item>
               <tag><c>no_network</c></tag>
-              <item>No network available.</item>
+              <item><p>No network is available.</p></item>
               <tag><c>net_kernel_terminated</c></tag>
-              <item>The <c>net_kernel</c> process terminated.</item>
+              <item><p>The <c>net_kernel</c> process terminated.</p></item>
               <tag><c>shutdown</c></tag>
-              <item>Unspecified connection shutdown.</item>
+              <item><p>Unspecified connection shutdown.</p></item>
               <tag><c>connection_closed</c></tag>
-              <item>The connection was closed.</item>
+              <item><p>The connection was closed.</p></item>
               <tag><c>disconnect</c></tag>
-              <item>The connection was disconnected (forced from the
-               current node).</item>
+              <item><p>The connection was disconnected (forced from the
+                current node).</p></item>
               <tag><c>net_tick_timeout</c></tag>
-              <item>Net tick timeout.</item>
+              <item><p>Net tick time-out.</p></item>
               <tag><c>send_net_tick_failed</c></tag>
-              <item>Failed to send net tick over the connection.</item>
+              <item><p>Failed to send net tick over the connection.</p></item>
               <tag><c>get_status_failed</c></tag>
-              <item>Status information retrieval from the <c>Port</c>
-               holding the connection failed.</item>
+              <item><p>Status information retrieval from the <c>Port</c>
+                holding the connection failed.</p></item>
             </taglist>
           </item>
         </taglist>
       </desc>
     </func>
-    <func>
-      <name name="get_net_ticktime" arity="0"/>
-      <fsummary>Get <c>net_ticktime</c></fsummary>
-      <desc>
-        <p>Gets <c>net_ticktime</c> (see
-          <seealso marker="kernel_app">kernel(6)</seealso>).</p>
-        <p>Currently defined return values (<c><anno>Res</anno></c>):</p>
-        <taglist>
-          <tag><c><anno>NetTicktime</anno></c></tag>
-          <item>
-            <p><c>net_ticktime</c> is <c><anno>NetTicktime</anno></c> seconds.</p>
-          </item>
-          <tag><c>{ongoing_change_to, <anno>NetTicktime</anno>}</c></tag>
-          <item>
-            <p><c>net_kernel</c> is currently changing
-              <c>net_ticktime</c> to <c><anno>NetTicktime</anno></c> seconds.</p>
-          </item>
-          <tag><c>ignored</c></tag>
-          <item>
-            <p>The local node is not alive.</p>
-          </item>
-        </taglist>
-      </desc>
-    </func>
+
     <func>
       <name name="set_net_ticktime" arity="1"/>
       <name name="set_net_ticktime" arity="2"/>
-      <fsummary>Set <c>net_ticktime</c></fsummary>
+      <fsummary>Set <c>net_ticktime</c>.</fsummary>
       <desc>
         <p>Sets <c>net_ticktime</c> (see
-          <seealso marker="kernel_app">kernel(6)</seealso>) to
-          <c><anno>NetTicktime</anno></c> seconds. <c><anno>TransitionPeriod</anno></c> defaults
-          to 60.</p>
+          <seealso marker="kernel_app"><c>kernel(6)</c></seealso>) to
+          <c><anno>NetTicktime</anno></c> seconds.
+          <c><anno>TransitionPeriod</anno></c> defaults to <c>60</c>.</p>
         <p>Some definitions:</p>
         <taglist>
-          <tag>The minimum transition traffic interval (<c>MTTI</c>)</tag>
-          <item>
-            <p><c>minimum(<anno>NetTicktime</anno>, PreviousNetTicktime)*1000 div 4</c> milliseconds.</p>
-          </item>
-          <tag>The transition period</tag>
-          <item>
-            <p>The time of the least number of consecutive <c>MTTI</c>s
-              to cover <c><anno>TransitionPeriod</anno></c> seconds following
-              the call to <c>set_net_ticktime/2</c> (i.e.
-              ((<c><anno>TransitionPeriod</anno>*1000 - 1) div MTTI + 1)*MTTI</c>
-              milliseconds).</p>
-          </item>
+          <tag>Minimum transition traffic interval (<c>MTTI</c>)</tag>
+          <item><p><c>minimum(<anno>NetTicktime</anno>,
+            PreviousNetTicktime)*1000 div 4</c> milliseconds.</p></item>
+          <tag>Transition period</tag>
+          <item><p>The time of the least number of consecutive <c>MTTI</c>s
+            to cover <c><anno>TransitionPeriod</anno></c> seconds following
+            the call to <c>set_net_ticktime/2</c> (that is,
+            ((<c><anno>TransitionPeriod</anno>*1000 - 1) div MTTI + 1)*MTTI</c>
+            milliseconds).</p></item>
         </taglist>
-        <p>If <c><![CDATA[<anno>NetTicktime</anno> < PreviousNetTicktime]]></c>, the actual
-          <c>net_ticktime</c> change will be done at the end of
-          the transition period; otherwise, at the beginning. During
-          the transition period, <c>net_kernel</c> will ensure that
-          there will be outgoing traffic on all connections at least
+        <p>If
+          <c><![CDATA[NetTicktime < PreviousNetTicktime]]></c>,
+          the <c>net_ticktime</c> change is done at the end of
+          the transition period; otherwise at the beginning. During
+          the transition period, <c>net_kernel</c> ensures that
+          there is outgoing traffic on all connections at least
           every <c>MTTI</c> millisecond.</p>
         <note>
-          <p>The <c>net_ticktime</c> changes have to be initiated on all
+          <p>The <c>net_ticktime</c> changes must be initiated on all
             nodes in the network (with the same <c><anno>NetTicktime</anno></c>)
             before the end of any transition period on any node;
-            otherwise, connections may erroneously be disconnected.</p>
+            otherwise connections can erroneously be disconnected.</p>
         </note>
         <p>Returns one of the following:</p>
         <taglist>
           <tag><c>unchanged</c></tag>
           <item>
-            <p><c>net_ticktime</c> already had the value of
-              <c><anno>NetTicktime</anno></c> and was left unchanged.</p>
+            <p><c>net_ticktime</c> already has the value of
+              <c><anno>NetTicktime</anno></c> and is left unchanged.</p>
           </item>
           <tag><c>change_initiated</c></tag>
           <item>
-            <p><c>net_kernel</c> has initiated the change of
-              <c>net_ticktime</c> to <c><anno>NetTicktime</anno></c> seconds.</p>
+            <p><c>net_kernel</c> initiated the change of
+              <c>net_ticktime</c> to <c><anno>NetTicktime</anno></c>
+              seconds.</p>
           </item>
           <tag><c>{ongoing_change_to, <anno>NewNetTicktime</anno>}</c></tag>
           <item>
-            <p>The request was <em>ignored</em>; because,
-              <c>net_kernel</c> was busy changing <c>net_ticktime</c> to
+            <p>The request is <em>ignored</em> because
+              <c>net_kernel</c> is busy changing <c>net_ticktime</c> to
               <c><anno>NewNetTicktime</anno></c> seconds.</p>
           </item>
         </taglist>
       </desc>
     </func>
+
     <func>
       <name>start([Name]) -> {ok, pid()} | {error, Reason}</name>
       <name>start([Name, NameType]) -> {ok, pid()} | {error, Reason}</name>
       <name>start([Name, NameType, Ticktime]) -> {ok, pid()} | {error, Reason}</name>
-      <fsummary>Turn an Erlang runtime system into a distributed node</fsummary>
+      <fsummary>Turn an Erlang runtime system into a distributed node.</fsummary>
       <type>
         <v>Name = atom()</v>
         <v>NameType = shortnames | longnames</v>
         <v>Reason = {already_started, pid()} | term()</v>
       </type>
       <desc>
-        <p>Note that the argument is a list with exactly one, two or
-          three arguments. <c>NameType</c> defaults to <c>longnames</c>
-          and <c>Ticktime</c> to 15000.</p>
         <p>Turns a non-distributed node into a distributed node by
           starting <c>net_kernel</c> and other necessary processes.</p>
+        <p>Notice that the argument is a list with exactly one, two, or
+          three arguments. <c>NameType</c> defaults to <c>longnames</c>
+          and <c>Ticktime</c> to <c>15000</c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="stop" arity="0"/>
-      <fsummary>Turn a node into a non-distributed Erlang runtime system</fsummary>
+      <fsummary>Turn a node into a non-distributed Erlang runtime system.</fsummary>
       <desc>
         <p>Turns a distributed node into a non-distributed node. For
           other nodes in the network, this is the same as the node
-          going down. Only possible when the net kernel was started
-          using <c>start/1</c>, otherwise returns
-          <c>{error, not_allowed}</c>. Returns <c>{error, not_found}</c>
-          if the local node is not alive.</p>
+          going down. Only possible when the net kernel was started using
+          <seealso marker="#start/1"><c>start/1</c></seealso>,
+          otherwise <c>{error, not_allowed}</c> is returned. Returns
+          <c>{error, not_found}</c> if the local node is not alive.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 5341a793ef..504f85abc2 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,100 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 4.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p><c>code:load_abs([10100])</c> would bring down the
+	    entire runtime system and create a crash dump. Corrected
+	    to generate an error exception in the calling
+	    process.</p>
+	    <p>Also corrected specs for code loading functions and
+	    added more information in the documentation about the
+	    error reasons returned by code-loading functions.</p>
+          <p>
+	    Own Id: OTP-9375</p>
+        </item>
+        <item>
+          <p>
+	    <seealso
+	    marker="kernel:gen_tcp#accept/2"><c>gen_tcp:accept/2</c></seealso>
+	    was not <seealso
+	    marker="erts:time_correction#Time_Warp_Safe_Code">time
+	    warp safe</seealso>. This since it used the same time as
+	    returned by <seealso
+	    marker="erts:erlang#now/0"><c>erlang:now/0</c></seealso>
+	    when calculating timeout. This has now been fixed.</p>
+          <p>
+	    Own Id: OTP-13254 Aux Id: OTP-11997, OTP-13222 </p>
+        </item>
+        <item>
+	    <p> Correct the contract for <c>inet:getifaddrs/1</c>.
+	    </p>
+          <p>
+	    Own Id: OTP-13335 Aux Id: ERL-95 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Time warp safety improvements.</p>
+          <p>
+	    Introduced the options <c>monotonic_timestamp</c>, and
+	    <c>strict_monotonic_timestamp</c> to the trace,
+	    sequential trace, and system profile functionality. This
+	    since the already existing <c>timestamp</c> option is not
+	    time warp safe.</p>
+          <p>
+	    Introduced the option <c>safe_fixed_monotonic_time</c> to
+	    <c>ets:info/2</c> and <c>dets:info/2</c>. This since the
+	    already existing <c>safe_fixed</c> option is not time
+	    warp safe.</p>
+          <p>
+	    Own Id: OTP-13222 Aux Id: OTP-11997 </p>
+        </item>
+        <item>
+          <p>
+	    Add validation callback for heart</p>
+          <p>
+	    The erlang heart process may now have a validation
+	    callback installed. The validation callback will be
+	    executed, if present, before any heartbeat to heart port
+	    program. If the validation fails, or stalls, no heartbeat
+	    will be sent and the node will go down.</p>
+          <p>
+	    With the option <c>'check_schedulers'</c> heart executes
+	    a responsiveness check of the schedulers before a
+	    heartbeat is sent to the port program. If the
+	    responsiveness check fails, the heartbeat will not be
+	    performed (as intended).</p>
+          <p>
+	    Own Id: OTP-13250</p>
+        </item>
+        <item>
+          <p>
+	    Clarify documentation of <c>net_kernel:allow/1</c></p>
+          <p>
+	    Own Id: OTP-13299</p>
+        </item>
+        <item>
+          <p>
+	    EPMD supports both IPv4 and IPv6</p>
+          <p>
+	    Also affects oldest supported windows version.</p>
+          <p>
+	    Own Id: OTP-13364</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 4.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -529,8 +623,7 @@
 	    Erlang/OTP has been ported to the realtime operating
 	    system OSE. The port supports both smp and non-smp
 	    emulator. For details around the port and how to started
-	    see the User's Guide in the <seealso
-	    marker="ose:ose_intro">ose</seealso> application. </p>
+	    see the User's Guide in the ose application. </p>
           <p>
 	    Note that not all parts of Erlang/OTP has been ported. </p>
           <p>
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index 682d4a2eac..2427aabcd5 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -29,97 +29,107 @@
     <rev></rev>
   </header>
   <module>os</module>
-  <modulesummary>Operating System Specific Functions</modulesummary>
+  <modulesummary>Operating system-specific functions.</modulesummary>
   <description>
-    <p>The functions in this module are operating system specific.
-      Careless use of these functions will result in programs that will
+    <p>The functions in this module are operating system-specific.
+      Careless use of these functions results in programs that will
       only run on a specific platform. On the other hand, with careful
-      use these functions can be of help in enabling a program to run on
+      use, these functions can be of help in enabling a program to run on
       most platforms.</p>
   </description>
+
   <funcs>
     <func>
       <name name="cmd" arity="1"/>
-      <fsummary>Execute a command in a shell of the target OS</fsummary>
+      <fsummary>Execute a command in a shell of the target OS.</fsummary>
       <desc>
-        <p>Executes <c><anno>Command</anno></c> in a command shell of the target OS,
-          captures the standard output of the command and returns this
+        <p>Executes <c><anno>Command</anno></c> in a command shell of the
+          target OS,
+          captures the standard output of the command, and returns this
           result as a string. This function is a replacement of
-          the previous <c>unix:cmd/1</c>; on a Unix platform they are
-          equivalent.</p>
-        <p>Examples:</p>
+          the previous function <c>unix:cmd/1</c>; they are equivalent on a
+          Unix platform.</p>
+        <p><em>Examples:</em></p>
         <code type="none">
 LsOut = os:cmd("ls"), % on unix platform
 DirOut = os:cmd("dir"), % on Win32 platform</code>
-        <p>Note that in some cases, standard output of a command when
+        <p>Notice that in some cases, standard output of a command when
           called from another program (for example, <c>os:cmd/1</c>)
-          may differ, compared to the standard output of the command
+          can differ, compared with the standard output of the command
           when called directly from an OS command shell.</p>
       </desc>
     </func>
+
     <func>
       <name name="find_executable" arity="1"/>
       <name name="find_executable" arity="2"/>
-      <fsummary>Absolute filename of a program</fsummary>
+      <fsummary>Absolute filename of a program.</fsummary>
       <desc>
-        <p>These two functions look up an executable program given its
-          name and a search path, in the same way as the underlying
-          operating system. <c>find_executable/1</c> uses the current
-          execution path (that is, the environment variable PATH on
+        <p>These two functions look up an executable program, with the
+          specified name and a search path, in the same way as the underlying
+          OS. <c>find_executable/1</c> uses the current
+          execution path (that is, the environment variable <c>PATH</c> on
           Unix and Windows).</p>
-        <p><c><anno>Path</anno></c>, if given, should conform to the syntax of
-          execution paths on the operating system. The absolute
-          filename of the executable program <c><anno>Name</anno></c> is returned,
-          or <c>false</c> if the program was not found.</p>
+        <p><c><anno>Path</anno></c>, if specified, is to conform to the syntax
+          of execution paths on the OS. Returns the absolute filename of the
+          executable program <c><anno>Name</anno></c>,
+          or <c>false</c> if the program is not found.</p>
       </desc>
     </func>
+
     <func>
       <name name="getenv" arity="0"/>
-      <fsummary>List all environment variables</fsummary>
+      <fsummary>List all environment variables.</fsummary>
       <desc>
         <p>Returns a list of all environment variables.
-          Each environment variable is given as a single string on
+          Each environment variable is expressed as a single string on
           the format <c>"VarName=Value"</c>, where <c>VarName</c> is
           the name of the variable and <c>Value</c> its value.</p>
-	<p>If Unicode file name encoding is in effect (see the <seealso
-	marker="erts:erl#file_name_encoding">erl manual
-	page</seealso>), the strings may contain characters with
-	codepoints > 255.</p>
+	<p>If Unicode filename encoding is in effect (see the
+          <seealso marker="erts:erl#file_name_encoding"><c>erl</c> manual
+	  page</seealso>), the strings can contain characters with
+	  codepoints &gt; 255.</p>
       </desc>
     </func>
+
     <func>
       <name name="getenv" arity="1"/>
-      <fsummary>Get the value of an environment variable</fsummary>
+      <fsummary>Get the value of an environment variable.</fsummary>
       <desc>
         <p>Returns the <c><anno>Value</anno></c> of the environment variable
-          <c><anno>VarName</anno></c>, or <c>false</c> if the environment variable
-          is undefined.</p>
-	<p>If Unicode file name encoding is in effect (see the <seealso
-	marker="erts:erl#file_name_encoding">erl manual
-	page</seealso>), the strings (both <c><anno>VarName</anno></c> and
-	<c><anno>Value</anno></c>) may contain characters with codepoints > 255.</p>
+          <c><anno>VarName</anno></c>, or <c>false</c> if the environment
+          variable is undefined.</p>
+	<p>If Unicode filename encoding is in effect (see the
+          <seealso marker="erts:erl#file_name_encoding"><c>erl</c> manual
+	  page</seealso>), the strings <c><anno>VarName</anno></c> and
+	  <c><anno>Value</anno></c> can contain characters with
+          codepoints &gt; 255.</p>
       </desc>
     </func>
+
     <func>
       <name name="getenv" arity="2"/>
-      <fsummary>Get the value of an environment variable</fsummary>
+      <fsummary>Get the value of an environment variable.</fsummary>
       <desc>
         <p>Returns the <c><anno>Value</anno></c> of the environment variable
-          <c><anno>VarName</anno></c>, or <c>DefaultValue</c> if the environment variable
-          is undefined.</p>
-	<p>If Unicode file name encoding is in effect (see the <seealso
-	marker="erts:erl#file_name_encoding">erl manual
-	page</seealso>), the strings (both <c><anno>VarName</anno></c> and
-	<c><anno>Value</anno></c>) may contain characters with codepoints > 255.</p>
+          <c><anno>VarName</anno></c>, or <c>DefaultValue</c> if the
+          environment variable is undefined.</p>
+	<p>If Unicode filename encoding is in effect (see the
+          <seealso marker="erts:erl#file_name_encoding"><c>erl</c> manual
+	page</seealso>), the strings <c><anno>VarName</anno></c> and
+	<c><anno>Value</anno></c> can contain characters with
+        codepoints &gt; 255.</p>
       </desc>
     </func>
+
     <func>
       <name name="getpid" arity="0"/>
-      <fsummary>Return the process identifier of the emulator process</fsummary>
+      <fsummary>Return the process identifier of the emulator
+        process.</fsummary>
       <desc>
         <p>Returns the process identifier of the current Erlang emulator
-          in the format most commonly used by the operating system
-          environment. <c><anno>Value</anno></c> is returned as a string containing
+          in the format most commonly used by the OS environment.
+          Returns <c><anno>Value</anno></c> as a string containing
           the (usually) numerical identifier for a process. On Unix,
           this is typically the return value of the <c>getpid()</c>
           system call. On Windows,
@@ -127,125 +137,156 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
           system call is used.</p>
       </desc>
     </func>
+
     <func>
       <name name="putenv" arity="2"/>
-      <fsummary>Set a new value for an environment variable</fsummary>
+      <fsummary>Set a new value for an environment variable.</fsummary>
       <desc>
-        <p>Sets a new <c><anno>Value</anno></c> for the environment variable
+        <p>Sets a new <c><anno>Value</anno></c> for environment variable
           <c><anno>VarName</anno></c>.</p>
-	<p>If Unicode filename encoding is in effect (see the <seealso
-	marker="erts:erl#file_name_encoding">erl manual
-	page</seealso>), the strings (both <c><anno>VarName</anno></c> and
-	<c><anno>Value</anno></c>) may contain characters with codepoints > 255.</p>
-	<p>On Unix platforms, the environment will be set using UTF-8 encoding
-	if Unicode file name translation is in effect. On Windows the 
-	environment is set using wide character interfaces.</p>
+	<p>If Unicode filename encoding is in effect (see the
+          <seealso marker="erts:erl#file_name_encoding"><c>erl</c> manual
+	  page</seealso>), the strings <c><anno>VarName</anno></c> and
+	  <c><anno>Value</anno></c> can contain characters with
+          codepoints &gt; 255.</p>
+	<p>On Unix platforms, the environment is set using UTF-8 encoding
+	  if Unicode filename translation is in effect. On Windows, the
+	  environment is set using wide character interfaces.</p>
       </desc>
     </func>
+
     <func>
       <name name="system_time" arity="0"/>
-      <fsummary>Current OS system time</fsummary>
+      <fsummary>Current OS system time.</fsummary>
       <desc>
-	<p>Returns current
+	<p>Returns the current
 	<seealso marker="erts:time_correction#OS_System_Time">OS system time</seealso>
 	in <c>native</c>
 	<seealso marker="erts:erlang#type_time_unit">time unit</seealso>.</p>
-
-	<note><p>This time is <em>not</em> a monotonically increasing time.</p></note>
+	<note><p>This time is <em>not</em> a monotonically increasing time.</p>
+        </note>
       </desc>
     </func>
+
     <func>
       <name name="system_time" arity="1"/>
-      <fsummary>Current OS system time</fsummary>
+      <fsummary>Current OS system time.</fsummary>
       <desc>
-	<p>Returns current
+	<p>Returns the current
 	<seealso marker="erts:time_correction#OS_System_Time">OS system time</seealso>
 	converted into the <c><anno>Unit</anno></c> passed as argument.</p>
-
-	<p>Calling <c>os:system_time(<anno>Unit</anno>)</c> is equivalent to: 
-	<seealso marker="erts:erlang#convert_time_unit/3"><c>erlang:convert_time_unit</c></seealso><c>(</c><seealso marker="#system_time/0"><c>os:system_time()</c></seealso><c>,
+	<p>Calling <c>os:system_time(<anno>Unit</anno>)</c> is equivalent to
+	<seealso marker="erts:erlang#convert_time_unit/3"><c>erlang:convert_time_unit</c></seealso>(<seealso marker="#system_time/0"><c>os:system_time()</c></seealso><c>,
 	native, <anno>Unit</anno>)</c>.</p>
-
-	<note><p>This time is <em>not</em> a monotonically increasing time.</p></note>
+	<note><p>This time is <em>not</em> a monotonically increasing time.</p>
+        </note>
       </desc>
     </func>
+
     <func>
       <name name="timestamp" arity="0"/>
-      <fsummary>Current OS system time on the erlang:timestamp/0 format</fsummary>
+      <fsummary>Current OS system time on the <c>erlang:timestamp/0</c> format.</fsummary>
       <type_desc variable="Timestamp">Timestamp = {MegaSecs, Secs, MicroSecs}</type_desc>
       <desc>
-      <p>Returns current
+      <p>Returns the current
 	<seealso marker="erts:time_correction#OS_System_Time">OS system time</seealso>
-        in the same format as <seealso marker="erts:erlang#timestamp/0">erlang:timestamp/0</seealso>.
-	The tuple can be used together with the function
-	<seealso marker="stdlib:calendar#now_to_universal_time/1">calendar:now_to_universal_time/1</seealso> 
-        or <seealso marker="stdlib:calendar#now_to_local_time/1">calendar:now_to_local_time/1</seealso> to
-        get calendar time. Using the calendar time together with the <c>MicroSecs</c> part of the return
-        tuple from this function allows you to log timestamps in high resolution and consistent with the
-        time in the rest of the operating system.</p>
-      <p>Example of code formatting a string in the format &quot;DD Mon YYYY HH:MM:SS.mmmmmm&quot;, where
-         DD is the day of month, Mon is the textual month name, YYYY is the year, HH:MM:SS is the time and
-         mmmmmm is the microseconds in six positions:</p>
-<code>
+        in the same format as
+        <seealso marker="erts:erlang#timestamp/0"><c>erlang:timestamp/0</c></seealso>.
+	The tuple can be used together with function
+	<seealso marker="stdlib:calendar#now_to_universal_time/1"><c>calendar:now_to_universal_time/1</c></seealso>
+        or <seealso marker="stdlib:calendar#now_to_local_time/1"><c>calendar:now_to_local_time/1</c></seealso>
+        to get calendar time. Using the calendar time, together with the
+        <c>MicroSecs</c> part of the return tuple from this function, allows
+        you to log time stamps in high resolution and consistent with the
+        time in the rest of the OS.</p>
+      <p>Example of code formatting a string in format
+        &quot;DD Mon YYYY HH:MM:SS.mmmmmm&quot;, where DD is the day of month,
+        Mon is the textual month name, YYYY is the year, HH:MM:SS is the time,
+        and mmmmmm is the microseconds in six positions:</p>
+      <code>
 -module(print_time).
 -export([format_utc_timestamp/0]).
 format_utc_timestamp() ->
     TS = {_,_,Micro} = os:timestamp(),
-    {{Year,Month,Day},{Hour,Minute,Second}} = 
-	calendar:now_to_universal_time(TS),
+    {{Year,Month,Day},{Hour,Minute,Second}} =
+calendar:now_to_universal_time(TS),
     Mstr = element(Month,{"Jan","Feb","Mar","Apr","May","Jun","Jul",
-			  "Aug","Sep","Oct","Nov","Dec"}),
+    "Aug","Sep","Oct","Nov","Dec"}),
     io_lib:format("~2w ~s ~4w ~2w:~2..0w:~2..0w.~6..0w",
-		  [Day,Mstr,Year,Hour,Minute,Second,Micro]).
-</code>
-
-       <p>The module above could be used in the following way:</p>
-<pre>
+    [Day,Mstr,Year,Hour,Minute,Second,Micro]).</code>
+       <p>This module can be used as follows:</p>
+       <pre>
 1> <input>io:format("~s~n",[print_time:format_utc_timestamp()]).</input>
-29 Apr 2009  9:55:30.051711
-</pre>
+29 Apr 2009  9:55:30.051711</pre>
        <p>OS system time can also be retreived by
-	<seealso marker="#system_time/0"><c>os:system_time/0</c></seealso>,
-	and <seealso marker="#system_time/1"><c>os:system_time/1</c></seealso>.</p>
+	<seealso marker="#system_time/0"><c>system_time/0</c></seealso> and
+	<seealso marker="#system_time/1"><c>system_time/1</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="perf_counter" arity="0"/>
+      <fsummary>Returns a performance counter</fsummary>
+      <desc>
+        <p>Returns the current performance counter value in <c>perf_counter</c>
+	<seealso marker="erts:erlang#type_time_unit">time unit</seealso>.
+        This is a highly optimized call that might not be traceable.
+        </p>
+      </desc>
+    </func>
+    <func>
+      <name name="perf_counter" arity="1"/>
+      <fsummary>Returns a performance counter</fsummary>
+      <desc><p>Returns a performance counter that can be used as a very fast and
+      high resolution timestamp. This counter is read directly from the hardware or operating
+      system with the same guarantees. This means that two consecutive calls
+      to the function are not guaranteed to be monotonic, though it most likely will be.
+      The performance counter will be converted to the resolution passed as an argument.</p>
+      <pre>1> <input>T1 = os:perf_counter(1000),receive after 10000 -> ok end,T2 = os:perf_counter(1000).</input>
+176525861
+2> <input>T2 - T1.</input>
+10004</pre>
       </desc>
     </func>
     <func>
       <name name="type" arity="0"/>
-      <fsummary>Return the OS family and, in some cases, OS name of the current operating system</fsummary>
+      <fsummary>Return the OS family and, in some cases, the OS name of the
+        current OS.</fsummary>
       <desc>
-        <p>Returns the <c><anno>Osfamily</anno></c> and, in some cases, <c><anno>Osname</anno></c>
-          of the current operating system.</p>
-        <p>On Unix, <c><anno>Osname</anno></c> will have same value as
+        <p>Returns the <c><anno>Osfamily</anno></c> and, in some cases, the
+          <c><anno>Osname</anno></c> of the current OS.</p>
+        <p>On Unix, <c><anno>Osname</anno></c> has the same value as
           <c>uname -s</c> returns, but in lower case. For example, on
-          Solaris 1 and 2, it will be <c>sunos</c>.</p>
-        <p>In Windows, <c><anno>Osname</anno></c> will be either <c>nt</c> (on
-          Windows NT), or <c>windows</c> (on Windows 95).</p>
+          Solaris 1 and 2, it is <c>sunos</c>.</p>
+        <p>On Windows, <c><anno>Osname</anno></c> is <c>nt</c>.</p>
         <note>
-          <p>Think twice before using this function. Use the
-            <c>filename</c> module if you want to inspect or build
-            file names in a portable way.
-            Avoid matching on the <c><anno>Osname</anno></c> atom.</p>
+          <p>Think twice before using this function. Use module
+            <seealso marker="stdlib:filename"><c>filename</c></seealso>
+            if you want to inspect or build filenames in a portable way.
+            Avoid matching on atom <c><anno>Osname</anno></c>.</p>
         </note>
       </desc>
     </func>
+
     <func>
       <name name="unsetenv" arity="1"/>
-      <fsummary>Delete an environment variable</fsummary>
+      <fsummary>Delete an environment variable.</fsummary>
       <desc>
 	<p>Deletes the environment variable <c><anno>VarName</anno></c>.</p>
-	<p>If Unicode filename encoding is in effect (see the <seealso
-	marker="erts:erl#file_name_encoding">erl manual
-	page</seealso>), the string (<c><anno>VarName</anno></c>) may
-	contain characters with codepoints > 255.</p>
+	<p>If Unicode filename encoding is in effect (see the
+        <seealso marker="erts:erl#file_name_encoding"><c>erl</c> manual
+	page</seealso>), the string <c><anno>VarName</anno></c> can
+	contain characters with codepoints &gt; 255.</p>
       </desc>
     </func>
+
     <func>
       <name name="version" arity="0"/>
-      <fsummary>Return the Operating System version</fsummary>
+      <fsummary>Return the OS versions.</fsummary>
       <desc>
-        <p>Returns the operating system version.
+        <p>Returns the OS version.
           On most systems, this function returns a tuple, but a string
-          will be returned instead if the system has versions which
+          is returned instead if the system has versions that
           cannot be expressed as three numbers.</p>
         <note>
           <p>Think twice before using this function. If you still need
diff --git a/lib/kernel/doc/src/pg2.xml b/lib/kernel/doc/src/pg2.xml
index 8c2fdb4cd3..0631b317b4 100644
--- a/lib/kernel/doc/src/pg2.xml
+++ b/lib/kernel/doc/src/pg2.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2013</year>
+      <year>1997</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,135 +30,136 @@
     <checked>[email protected]</checked>
     <date>1997-08-18</date>
     <rev>A2</rev>
-    <file>pg2.sgml</file>
+    <file>pg2.xml</file>
   </header>
   <module>pg2</module>
-  <modulesummary>Distributed Named Process Groups</modulesummary>
+  <modulesummary>Distributed named process groups.</modulesummary>
   <description>
-    <p>This module implements process groups. Each message may be sent
-      to one, some, or all members of the group.
-      </p>
+    <p>This module implements process groups. Each message can be sent
+      to one, some, or all group members.</p>
     <p>A group of processes can be accessed by a common name. For
       example, if there is a group named <c>foobar</c>, there can be a
-      set of processes (which can be located on different nodes) which
+      set of processes (which can be located on different nodes) that
       are all members of the group <c>foobar</c>. There are no special
       functions for sending a message to the group. Instead, client
-      functions should be written with the functions
-      <c>get_members/1</c> and <c>get_local_members/1</c> to find out
-      which processes are members of the group. Then the message can be
-      sent to one or more members of the group.
-      </p>
-    <p>If a member terminates, it is automatically removed from the
-      group.
-      </p>
+      functions are to be written with the functions
+      <seealso marker="#get_members/1"><c>get_members/1</c></seealso> and
+      <seealso marker="#get_local_members/1"><c>get_local_members/1</c></seealso>
+      to determine which processes are members of the group.
+      Then the message can be sent to one or more group members.</p>
+    <p>If a member terminates, it is automatically removed from the group.</p>
     <warning>
-      <p>This module is used by the <c>disk_log</c> module for
+      <p>This module is used by module
+        <seealso marker="disk_log"><c>disk_log</c></seealso> for
         managing distributed disk logs. The disk log names are used as
-        group names, which means that some action may need to be taken
+        group names, which means that some action can be needed
         to avoid name clashes.</p>
     </warning>
   </description>
+
   <datatypes>
     <datatype>
       <name name="name"/>
       <desc><p>The name of a process group.</p></desc>
     </datatype>
   </datatypes>
+
   <funcs>
     <func>
       <name name="create" arity="1"/>
-      <fsummary>Create a new, empty process group</fsummary>
+      <fsummary>Create a new, empty process group.</fsummary>
       <desc>
         <p>Creates a new, empty process group. The group is globally
-          visible on all nodes. If the group exists, nothing happens.
-          </p>
+          visible on all nodes. If the group exists, nothing happens.</p>
       </desc>
     </func>
+
     <func>
       <name name="delete" arity="1"/>
-      <fsummary>Delete a process group</fsummary>
+      <fsummary>Delete a process group.</fsummary>
       <desc>
-        <p>Deletes a process group.
-          </p>
+        <p>Deletes a process group.</p>
       </desc>
     </func>
+
     <func>
       <name name="get_closest_pid" arity="1"/>
-      <fsummary>Common dispatch function</fsummary>
+      <fsummary>Common dispatch function.</fsummary>
       <desc>
-        <p>This is a useful dispatch function which can be used from
+        <p>A useful dispatch function that can be used from
           client functions. It returns a process on the local node, if
-          such a process exist. Otherwise, it chooses one randomly.
-          </p>
+          such a process exists. Otherwise, it selects one randomly.</p>
       </desc>
     </func>
+
     <func>
-      <name name="get_members" arity="1"/>
-      <fsummary>Return all processes in a group</fsummary>
+      <name name="get_local_members" arity="1"/>
+      <fsummary>Return all local processes in a group.</fsummary>
       <desc>
-        <p>Returns all processes in the group <c>Name</c>. This
-          function should be used from within a client function that
-          accesses the group. It is therefore optimized for speed.
-          </p>
+        <p>Returns all processes running on the local node in the
+          group <c>Name</c>. This function is to be used from
+          within a client function that accesses the group. It is therefore
+          optimized for speed.</p>
       </desc>
     </func>
+
     <func>
-      <name name="get_local_members" arity="1"/>
-      <fsummary>Return all local processes in a group</fsummary>
+      <name name="get_members" arity="1"/>
+      <fsummary>Return all processes in a group.</fsummary>
       <desc>
-        <p>Returns all processes running on the local node in the
-          group <c>Name</c>. This function should to be used from
-          within a client function that accesses the group. It is therefore
-          optimized for speed.
-          </p>
+        <p>Returns all processes in the group <c>Name</c>. This
+          function is to be used from within a client function that
+          accesses the group. It is therefore optimized for speed.</p>
       </desc>
     </func>
+
     <func>
       <name name="join" arity="2"/>
-      <fsummary>Join a process to a group</fsummary>
+      <fsummary>Join a process to a group.</fsummary>
       <desc>
         <p>Joins the process <c>Pid</c> to the group <c>Name</c>.
-	  A process can join a group several times; it must then
-	  leave the group the same number of times.
-          </p>
+	  A process can join a group many times and must then
+	  leave the group the same number of times.</p>
       </desc>
     </func>
+
     <func>
       <name name="leave" arity="2"/>
-      <fsummary>Make a process leave a group</fsummary>
+      <fsummary>Make a process leave a group.</fsummary>
       <desc>
         <p>Makes the process <c>Pid</c> leave the group <c>Name</c>.
 	  If the process is not a member of the group, <c>ok</c> is
-	  returned.
-          </p>
-      </desc>
-    </func>
-    <func>
-      <name name="which_groups" arity="0"/>
-      <fsummary>Return a list of all known groups</fsummary>
-      <desc>
-        <p>Returns a list of all known groups.
-          </p>
+	  returned.</p>
       </desc>
     </func>
+
     <func>
       <name name="start" arity="0"/>
       <name name="start_link" arity="0"/>
-      <fsummary>Start the pg2 server</fsummary>
+      <fsummary>Start the <c>pg2</c> server.</fsummary>
       <desc>
-        <p>Starts the pg2 server. Normally, the server does not need
+        <p>Starts the <c>pg2</c> server. Normally, the server does not need
           to be started explicitly, as it is started dynamically if it
           is needed. This is useful during development, but in a
-          target system the server should be started explicitly. Use
-          configuration parameters for <c>kernel</c> for this.
-          </p>
+          target system the server is to be started explicitly. Use the
+          configuration parameters for
+          <seealso marker="kernel_app#start_pg2"><c>kernel(6)</c></seealso>
+	  for this.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="which_groups" arity="0"/>
+      <fsummary>Return a list of all known groups.</fsummary>
+      <desc>
+        <p>Returns a list of all known groups.</p>
       </desc>
     </func>
   </funcs>
 
   <section>
     <title>See Also</title>
-    <p><seealso marker="kernel_app">kernel(6)</seealso></p>
+    <p><seealso marker="kernel_app"><c>kernel(6)</c></seealso></p>
   </section>
 </erlref>
 
diff --git a/lib/kernel/doc/src/ref_man.xml b/lib/kernel/doc/src/ref_man.xml
index 7eb48a5f1d..32f4f8900e 100644
--- a/lib/kernel/doc/src/ref_man.xml
+++ b/lib/kernel/doc/src/ref_man.xml
@@ -29,9 +29,7 @@
     <rev></rev>
   </header>
   <description>
-    <p>The <em>Kernel</em> application has all the code necessary to run
-      the Erlang runtime system itself: file servers and code servers
-      and so on.</p>
+
   </description>
   <xi:include href="kernel_app.xml"/>
   <xi:include href="application.xml"/>
@@ -45,9 +43,9 @@
   <xi:include href="error_handler.xml"/>
   <xi:include href="error_logger.xml"/>
   <xi:include href="file.xml"/>
+  <xi:include href="gen_sctp.xml"/>
   <xi:include href="gen_tcp.xml"/>
   <xi:include href="gen_udp.xml"/>
-  <xi:include href="gen_sctp.xml"/>
   <xi:include href="global.xml"/>
   <xi:include href="global_group.xml"/>
   <xi:include href="heart.xml"/>
diff --git a/lib/kernel/doc/src/ref_man.xml.src b/lib/kernel/doc/src/ref_man.xml.src
deleted file mode 100644
index 7eb48a5f1d..0000000000
--- a/lib/kernel/doc/src/ref_man.xml.src
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>1996</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-
-    </legalnotice>
-
-    <title>Kernel Reference Manual</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p>The <em>Kernel</em> application has all the code necessary to run
-      the Erlang runtime system itself: file servers and code servers
-      and so on.</p>
-  </description>
-  <xi:include href="kernel_app.xml"/>
-  <xi:include href="application.xml"/>
-  <xi:include href="auth.xml"/>
-  <xi:include href="code.xml"/>
-  <xi:include href="disk_log.xml"/>
-  <xi:include href="erl_boot_server.xml"/>
-  <xi:include href="erl_ddll.xml"/>
-  <xi:include href="erl_prim_loader_stub.xml"/>
-  <xi:include href="erlang_stub.xml"/>
-  <xi:include href="error_handler.xml"/>
-  <xi:include href="error_logger.xml"/>
-  <xi:include href="file.xml"/>
-  <xi:include href="gen_tcp.xml"/>
-  <xi:include href="gen_udp.xml"/>
-  <xi:include href="gen_sctp.xml"/>
-  <xi:include href="global.xml"/>
-  <xi:include href="global_group.xml"/>
-  <xi:include href="heart.xml"/>
-  <xi:include href="inet.xml"/>
-  <xi:include href="inet_res.xml"/>
-  <xi:include href="init_stub.xml"/>
-  <xi:include href="net_adm.xml"/>
-  <xi:include href="net_kernel.xml"/>
-  <xi:include href="os.xml"/>
-  <xi:include href="pg2.xml"/>
-  <xi:include href="rpc.xml"/>
-  <xi:include href="seq_trace.xml"/>
-  <xi:include href="user.xml"/>
-  <xi:include href="wrap_log_reader.xml"/>
-  <xi:include href="zlib_stub.xml"/>
-  <xi:include href="app.xml"/>
-  <xi:include href="config.xml"/>
-</application>
diff --git a/lib/kernel/doc/src/rpc.xml b/lib/kernel/doc/src/rpc.xml
index c323a84e50..f8d81d749d 100644
--- a/lib/kernel/doc/src/rpc.xml
+++ b/lib/kernel/doc/src/rpc.xml
@@ -25,328 +25,388 @@
     <title>rpc</title>
     <prepared>Claes Wikstrom</prepared>
     <docno>1</docno>
-    <date>96-09-10</date>
+    <date>1996-09-10</date>
     <rev>A</rev>
   </header>
   <module>rpc</module>
-  <modulesummary>Remote Procedure Call Services</modulesummary>
+  <modulesummary>Remote Procedure Call services.</modulesummary>
   <description>
-    <p>This module contains services which are similar to remote
-      procedure calls. It also contains broadcast facilities and 
+    <p>This module contains services similar to Remote
+      Procedure Calls. It also contains broadcast facilities and
       parallel evaluators. A remote procedure call is a method to call
       a function on a remote node and collect the answer. It is used
       for collecting information on a remote node, or for running a
       function with some specific side effects on the remote node.</p>
   </description>
+
   <datatypes>
     <datatype>
       <name name="key"/>
       <desc>
-        <p>As returned by <seealso marker="#async_call/4">
-          <c>async_call/4</c>.</seealso></p>
+        <p>As returned by
+          <seealso marker="#async_call/4"><c>async_call/4</c></seealso>.</p>
       </desc>
     </datatype>
   </datatypes>
+
   <funcs>
     <func>
-      <name name="call" arity="4"/>
-      <fsummary>Evaluate a function call on a node</fsummary>
+      <name name="abcast" arity="2"/>
+      <fsummary>Broadcast a message asynchronously to a registered process on
+        all nodes.</fsummary>
       <desc>
-        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> on the node
-          <c><anno>Node</anno></c> and returns the corresponding value <c><anno>Res</anno></c>, or
-          <c>{badrpc, <anno>Reason</anno>}</c> if the call fails.</p>
+        <p>Equivalent to <c>abcast([node()|nodes()], <anno>Name</anno>,
+        <anno>Msg</anno>)</c>.</p>
       </desc>
     </func>
+
     <func>
-      <name name="call" arity="5"/>
-      <fsummary>Evaluate a function call on a node</fsummary>
+      <name name="abcast" arity="3"/>
+      <fsummary>Broadcast a message asynchronously to a registered process on
+        specific nodes.</fsummary>
       <desc>
-        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> on the node
-          <c><anno>Node</anno></c> and returns the corresponding value <c><anno>Res</anno></c>, or
-          <c>{badrpc, <anno>Reason</anno>}</c> if the call fails. <c><anno>Timeout</anno></c> is
-          a timeout value in milliseconds. If the call times out,
-          <c><anno>Reason</anno></c> is <c>timeout</c>.</p>
-        <p>If the reply arrives after the call times out, no message
-          will contaminate the caller's message queue, since this
-          function spawns off a middleman process to act as (a void)
-          destination for such an orphan reply. This feature also makes
-          this function more expensive than <c>call/4</c> at
-          the caller's end.</p>
+        <p>Broadcasts the message <c><anno>Msg</anno></c> asynchronously to
+          the registered process <c><anno>Name</anno></c> on the specified
+          nodes.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="async_call" arity="4"/>
+      <fsummary>Evaluate a function call on a node, asynchronous
+      version.</fsummary>
+      <desc>
+        <p>Implements <em>call streams with promises</em>, a type of
+          RPC that does not suspend the caller until the result is
+          finished. Instead, a key is returned, which can be used
+          later to collect the value. The key can be viewed as a
+          promise to deliver the answer.</p>
+        <p>In this case, the key <c><anno>Key</anno></c> is returned, which
+          can be used in a subsequent call to
+          <seealso marker="#yield/1"><c>yield/1</c></seealso> or
+          <seealso marker="#nb_yield/1"><c>nb_yield/1,2</c></seealso>
+          to retrieve the value of evaluating <c>apply(<anno>Module</anno>,
+          <anno>Function</anno>, <anno>Args</anno>)</c> on node
+          <c><anno>Node</anno></c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="block_call" arity="4"/>
-      <fsummary>Evaluate a function call on a node in the RPC server's context</fsummary>
+      <fsummary>Evaluate a function call on a node in the RPC server's
+        context.</fsummary>
       <desc>
-        <p>Like <c>call/4</c>, but the RPC server at <c><anno>Node</anno></c> does
+        <p>Same as <seealso marker="#call/4"><c>call/4</c></seealso>,
+          but the RPC server at <c><anno>Node</anno></c> does
           not create a separate process to handle the call. Thus,
           this function can be used if the intention of the call is to
           block the RPC server from any other incoming requests until
-          the request has been handled. The function can also be used 
+          the request has been handled. The function can also be used
           for efficiency reasons when very small fast functions are
-          evaluated, for example BIFs that are guaranteed not to
+          evaluated, for example, BIFs that are guaranteed not to
           suspend.</p>
       </desc>
     </func>
+
     <func>
       <name name="block_call" arity="5"/>
-      <fsummary>Evaluate a function call on a node in the RPC server's context</fsummary>
+      <fsummary>Evaluate a function call on a node in the RPC server's
+        context.</fsummary>
       <desc>
-        <p>Like <c>block_call/4</c>, but with a timeout value in
-          the same manner as <c>call/5</c>.</p>
+        <p>Same as
+          <seealso marker="#block_call/4"><c>block_call/4</c></seealso>,
+          but with a time-out value in the same manner as
+          <seealso marker="#call/5"><c>call/5</c></seealso>.</p>
       </desc>
     </func>
+
     <func>
-      <name name="async_call" arity="4"/>
-      <fsummary>Evaluate a function call on a node, asynchronous version</fsummary>
+      <name name="call" arity="4"/>
+      <fsummary>Evaluate a function call on a node.</fsummary>
       <desc>
-        <p>Implements <em>call streams with promises</em>, a type of
-          RPC which does not suspend the caller until the result is
-          finished. Instead, a key is returned which can be used at a
-          later stage to collect the value. The key can be viewed as a
-          promise to deliver the answer.</p>
-        <p>In this case, the key <c><anno>Key</anno></c> is returned, which can be
-          used in a subsequent call to <c>yield/1</c> or
-          <c>nb_yield/1,2</c> to retrieve the value of evaluating
-          <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> on the node <c><anno>Node</anno></c>.</p>
+        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
+          <anno>Args</anno>)</c> on node <c><anno>Node</anno></c> and returns
+          the corresponding value <c><anno>Res</anno></c>, or
+          <c>{badrpc, <anno>Reason</anno>}</c> if the call fails.</p>
       </desc>
     </func>
+
     <func>
-      <name name="yield" arity="1"/>
-      <fsummary>Deliver the result of evaluating a function call on a node (blocking)</fsummary>
+      <name name="call" arity="5"/>
+      <fsummary>Evaluate a function call on a node.</fsummary>
       <desc>
-        <p>Returns the promised answer from a previous
-          <c>async_call/4</c>. If the answer is available, it is
-          returned immediately. Otherwise, the calling process is
-          suspended until the answer arrives from <c>Node</c>.</p>
+        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
+          <anno>Args</anno>)</c> on node <c><anno>Node</anno></c> and returns
+          the corresponding value <c><anno>Res</anno></c>, or
+          <c>{badrpc, <anno>Reason</anno>}</c> if the call fails.
+          <c><anno>Timeout</anno></c> is
+          a time-out value in milliseconds. If the call times out,
+          <c><anno>Reason</anno></c> is <c>timeout</c>.</p>
+        <p>If the reply arrives after the call times out, no message
+          contaminates the caller's message queue, as this
+          function spawns off a middleman process to act as (a void)
+          destination for such an orphan reply. This feature also makes
+          this function more expensive than <c>call/4</c> at
+          the caller's end.</p>
       </desc>
     </func>
+
     <func>
-      <name name="nb_yield" arity="1"/>
-      <fsummary>Deliver the result of evaluating a function call on a node (non-blocking)</fsummary>
+      <name name="cast" arity="4"/>
+      <fsummary>Run a function on a node ignoring the result.</fsummary>
       <desc>
-        <p>Equivalent to <c>nb_yield(<anno>Key</anno>, 0)</c>.</p>
+        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
+          <anno>Args</anno>)</c> on node
+          <c><anno>Node</anno></c>. No response is delivered and the calling
+          process is not suspended until the evaluation is complete, as
+          is the case with
+          <seealso marker="#call/4"><c>call/4,5</c></seealso>.</p>
       </desc>
     </func>
+
     <func>
-      <name name="nb_yield" arity="2"/>
-      <fsummary>Deliver the result of evaluating a function call on a node (non-blocking)</fsummary>
+      <name name="eval_everywhere" arity="3"/>
+      <fsummary>Run a function on all nodes, ignoring the result.</fsummary>
       <desc>
-        <p>This is a non-blocking version of <c>yield/1</c>. It returns
-          the tuple <c>{value, <anno>Val</anno>}</c> when the computation has
-          finished, or <c>timeout</c> when <c><anno>Timeout</anno></c> milliseconds
-          has elapsed.</p>
+        <p>Equivalent to <c>eval_everywhere([node()|nodes()],
+          <anno>Module</anno>, <anno>Function</anno>,
+          <anno>Args</anno>)</c>.</p>
       </desc>
     </func>
+
+    <func>
+      <name name="eval_everywhere" arity="4"/>
+      <fsummary>Run a function on specific nodes, ignoring the
+        result.</fsummary>
+      <desc>
+        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
+          <anno>Args</anno>)</c> on
+          the specified nodes. No answers are collected.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="multi_server_call" arity="2"/>
+      <fsummary>Interact with the servers on a number of nodes.</fsummary>
+      <desc>
+        <p>Equivalent to <c>multi_server_call([node()|nodes()],
+          <anno>Name</anno>, <anno>Msg</anno>)</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="multi_server_call" arity="3"/>
+      <fsummary>Interact with the servers on a number of nodes.</fsummary>
+      <desc>
+        <p>Can be used when interacting with servers called
+          <c><anno>Name</anno></c> on the specified nodes. It is assumed that
+          the servers receive messages in the format
+          <c>{From, <anno>Msg</anno>}</c> and reply using
+          <c>From ! {<anno>Name</anno>, Node, <anno>Reply</anno>}</c>, where
+          <c>Node</c> is the name of the node where the server is located.
+          The function returns <c>{<anno>Replies</anno>,
+          <anno>BadNodes</anno>}</c>, where <c><anno>Replies</anno></c> is a
+          list of all <c><anno>Reply</anno></c> values, and
+          <c><anno>BadNodes</anno></c> is one of the following:</p>
+        <list type="bulleted">
+          <item>A list of the nodes that do not exist</item>
+          <item>A list of the nodes where the server does not exist</item>
+          <item>A list of the nodes where the server terminatd before sending
+          any reply.</item>
+        </list>
+      </desc>
+    </func>
+
     <func>
       <name name="multicall" arity="3"/>
-      <fsummary>Evaluate a function call on a number of nodes</fsummary>
+      <fsummary>Evaluate a function call on a number of nodes.</fsummary>
       <desc>
-        <p>Equivalent to <c>multicall([node()|nodes()], <anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>, infinity)</c>.</p>
+        <p>Equivalent to <c>multicall([node()|nodes()], <anno>Module</anno>,
+          <anno>Function</anno>, <anno>Args</anno>, infinity)</c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="multicall" arity="4" clause_i="1"/>
-      <fsummary>Evaluate a function call on a number of nodes</fsummary>
+      <fsummary>Evaluate a function call on a number of nodes.</fsummary>
       <desc>
-        <p>Equivalent to <c>multicall(<anno>Nodes</anno>, <anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>, infinity)</c>.</p>
+        <p>Equivalent to <c>multicall(<anno>Nodes</anno>, <anno>Module</anno>,
+          <anno>Function</anno>, <anno>Args</anno>, infinity)</c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="multicall" arity="4" clause_i="2"/>
-      <fsummary>Evaluate a function call on a number of nodes</fsummary>
+      <fsummary>Evaluate a function call on a number of nodes.</fsummary>
       <desc>
-        <p>Equivalent to <c>multicall([node()|nodes()], <anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>, <anno>Timeout</anno>)</c>.</p>
+        <p>Equivalent to <c>multicall([node()|nodes()], <anno>Module</anno>,
+          <anno>Function</anno>, <anno>Args</anno>,
+          <anno>Timeout</anno>)</c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="multicall" arity="5"/>
-      <fsummary>Evaluate a function call on a number of nodes</fsummary>
+      <fsummary>Evaluate a function call on a number of nodes.</fsummary>
       <desc>
-        <p>In contrast to an RPC, a multicall is an RPC which is sent
+        <p>In contrast to an RPC, a multicall is an RPC that is sent
           concurrently from one client to multiple servers. This is
-          useful for collecting some information from a set of nodes,
+          useful for collecting information from a set of nodes,
           or for calling a function on a set of nodes to achieve some
           side effects. It is semantically the same as iteratively
           making a series of RPCs on all the nodes, but the multicall
-          is faster as all the requests are sent at the same time
+          is faster, as all the requests are sent at the same time
           and are collected one by one as they come back.</p>
-        <p>The function evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c>
-          on the specified nodes and collects the answers. It returns 
-          <c>{<anno>ResL</anno>, <anno>BadNodes</anno>}</c>, where <c><anno>BadNodes</anno></c> is a list
+        <p>The function evaluates <c>apply(<anno>Module</anno>,
+          <anno>Function</anno>, <anno>Args</anno>)</c>
+          on the specified nodes and collects the answers. It returns
+          <c>{<anno>ResL</anno>, <anno>BadNodes</anno>}</c>, where
+          <c><anno>BadNodes</anno></c> is a list
           of the nodes that terminated or timed out during computation,
           and <c><anno>ResL</anno></c> is a list of the return values.
           <c><anno>Timeout</anno></c> is a time (integer) in milliseconds, or
           <c>infinity</c>.</p>
         <p>The following example is useful when new object code is to
-          be loaded on all nodes in the network, and also indicates
-          some side effects RPCs may produce:</p>
+          be loaded on all nodes in the network, and indicates
+          some side effects that RPCs can produce:</p>
         <code type="none">
-%% Find object code for module Mod 
-{Mod, Bin, File} = code:get_object_code(Mod), 
+%% Find object code for module Mod
+{Mod, Bin, File} = code:get_object_code(Mod),
 
-%% and load it on all nodes including this one 
+%% and load it on all nodes including this one
 {ResL, _} = rpc:multicall(code, load_binary, [Mod, File, Bin]),
 
 %% and then maybe check the ResL list.</code>
       </desc>
     </func>
+
     <func>
-      <name name="cast" arity="4"/>
-      <fsummary>Run a function on a node ignoring the result</fsummary>
+      <name name="nb_yield" arity="1"/>
+      <fsummary>Deliver the result of evaluating a function call on a node
+        (non-blocking).</fsummary>
       <desc>
-        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> on the node
-          <c><anno>Node</anno></c>. No response is delivered and the calling
-          process is not suspended until the evaluation is complete, as
-          is the case with <c>call/4,5</c>.</p>
+        <p>Equivalent to <c>nb_yield(<anno>Key</anno>, 0)</c>.</p>
       </desc>
     </func>
+
     <func>
-      <name name="eval_everywhere" arity="3"/>
-      <fsummary>Run a function on all nodes, ignoring the result</fsummary>
+      <name name="nb_yield" arity="2"/>
+      <fsummary>Deliver the result of evaluating a function call on a node
+        (non-blocking).</fsummary>
       <desc>
-        <p>Equivalent to <c>eval_everywhere([node()|nodes()], <anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c>.</p>
+        <p>Non-blocking version of
+          <seealso marker="#yield/1"><c>yield/1</c></seealso>. It returns
+          the tuple <c>{value, <anno>Val</anno>}</c> when the computation is
+          finished, or <c>timeout</c> when <c><anno>Timeout</anno></c>
+          milliseconds has elapsed.</p>
       </desc>
     </func>
+
     <func>
-      <name name="eval_everywhere" arity="4"/>
-      <fsummary>Run a function on specific nodes, ignoring the result</fsummary>
+      <name name="parallel_eval" arity="1"/>
+      <fsummary>Evaluate many function calls on all nodes in
+        parallel.</fsummary>
       <desc>
-        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> on
-          the specified nodes. No answers are collected.</p>
+        <p>Evaluates, for every tuple in <c><anno>FuncCalls</anno></c>,
+          <c>apply(<anno>Module</anno>, <anno>Function</anno>,
+          <anno>Args</anno>)</c> on some node in
+          the network. Returns the list of return values, in the same
+          order as in <c><anno>FuncCalls</anno></c>.</p>
       </desc>
     </func>
+
     <func>
-      <name name="abcast" arity="2"/>
-      <fsummary>Broadcast a message asynchronously to a registered process on all nodes</fsummary>
+      <name name="pinfo" arity="1"/>
+      <fsummary>Information about a process.</fsummary>
       <desc>
-        <p>Equivalent to <c>abcast([node()|nodes()], <anno>Name</anno>, <anno>Msg</anno>)</c>.</p>
+        <p>Location transparent version of the BIF
+          <seealso marker="erts:erlang#process_info/1"><c>erlang:process_info/1</c></seealso> in <c>ERTS</c>.</p>
       </desc>
     </func>
+
     <func>
-      <name name="abcast" arity="3"/>
-      <fsummary>Broadcast a message asynchronously to a registered process on specific nodes</fsummary>
+      <name name="pinfo" arity="2" clause_i="1"/>
+      <name name="pinfo" arity="2" clause_i="2"/>
+      <fsummary>Information about a process.</fsummary>
       <desc>
-        <p>Broadcasts the message <c><anno>Msg</anno></c> asynchronously to
-          the registered process <c><anno>Name</anno></c> on the specified nodes.</p>
+        <p>Location transparent version of the BIF
+          <seealso marker="erts:erlang#process_info/2"><c>erlang:process_info/2</c></seealso> in <c>ERTS</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="pmap" arity="3"/>
+      <fsummary>Parallell evaluation of mapping a function over a
+        list.</fsummary>
+      <desc>
+        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
+          [<anno>Elem</anno>|<anno>ExtraArgs</anno>])</c> for every element
+          <c><anno>Elem</anno></c> in <c><anno>List1</anno></c>, in parallel.
+          Returns the list of return values, in the same order as in
+          <c><anno>List1</anno></c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="sbcast" arity="2"/>
-      <fsummary>Broadcast a message synchronously to a registered process on all nodes</fsummary>
+      <fsummary>Broadcast a message synchronously to a registered process on
+        all nodes.</fsummary>
       <desc>
-        <p>Equivalent to <c>sbcast([node()|nodes()], <anno>Name</anno>, <anno>Msg</anno>)</c>.</p>
+        <p>Equivalent to <c>sbcast([node()|nodes()], <anno>Name</anno>,
+          <anno>Msg</anno>)</c>.</p>
       </desc>
     </func>
+
     <func>
       <name name="sbcast" arity="3"/>
-      <fsummary>Broadcast a message synchronously to a registered process on specific nodes</fsummary>
+      <fsummary>Broadcast a message synchronously to a registered process on
+        specific nodes.</fsummary>
       <desc>
         <p>Broadcasts the message <c><anno>Msg</anno></c> synchronously to
-          the registered process <c><anno>Name</anno></c> on the specified nodes.</p>
-        <p>Returns <c>{<anno>GoodNodes</anno>, <anno>BadNodes</anno>}</c>, where <c><anno>GoodNodes</anno></c>
-          is the list of nodes which have <c><anno>Name</anno></c> as a registered
-          process.</p>
+          the registered process <c><anno>Name</anno></c> on the specified
+          nodes.</p>
+        <p>Returns <c>{<anno>GoodNodes</anno>, <anno>BadNodes</anno>}</c>,
+          where <c><anno>GoodNodes</anno></c> is the list of nodes that have
+          <c><anno>Name</anno></c> as a registered process.</p>
         <p>The function is synchronous in the sense that it is known
           that all servers have received the message when the call
           returns. It is not possible to know that the servers have
-          actually processed the message.</p>
+          processed the message.</p>
         <p>Any further messages sent to the servers, after this
-          function has returned, will be received by all servers after
+          function has returned, are received by all servers after
           this message.</p>
       </desc>
     </func>
+
     <func>
       <name name="server_call" arity="4"/>
-      <fsummary>Interact with a server on a node</fsummary>
+      <fsummary>Interact with a server on a node.</fsummary>
       <desc>
-        <p>This function can be used when interacting with a server
-          called <c><anno>Name</anno></c> at node <c><anno>Node</anno></c>. It is assumed that
-          the server receives messages in the format
-          <c>{From, <anno>Msg</anno>}</c> and replies using <c>From ! {<anno>ReplyWrapper</anno>, <anno>Node</anno>, <anno>Reply</anno>}</c>. This function makes such
+        <p>Can be used when interacting with a server called
+          <c><anno>Name</anno></c> on node <c><anno>Node</anno></c>. It is
+          assumed that the server receives messages in the format
+          <c>{From, <anno>Msg</anno>}</c> and replies using
+          <c>From ! {<anno>ReplyWrapper</anno>, <anno>Node</anno>,
+          <anno>Reply</anno>}</c>. This function makes such
           a server call and ensures that the entire call is packed into
-          an atomic transaction which either succeeds or fails. It
+          an atomic transaction, which either succeeds or fails. It
           never hangs, unless the server itself hangs.</p>
-        <p>The function returns the answer <c><anno>Reply</anno></c> as produced by
-          the server <c><anno>Name</anno></c>, or <c>{error, <anno>Reason</anno>}</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="multi_server_call" arity="2"/>
-      <fsummary>Interact with the servers on a number of nodes</fsummary>
-      <desc>
-        <p>Equivalent to <c>multi_server_call([node()|nodes()], <anno>Name</anno>, <anno>Msg</anno>)</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="multi_server_call" arity="3"/>
-      <fsummary>Interact with the servers on a number of nodes</fsummary>
-      <desc>
-        <p>This function can be used when interacting with servers
-          called <c><anno>Name</anno></c> on the specified nodes. It is assumed that
-          the servers receive messages in the format <c>{From, <anno>Msg</anno>}</c>
-          and reply using <c>From ! {<anno>Name</anno>, Node, <anno>Reply</anno>}</c>, where
-          <c>Node</c> is the name of the node where the server is
-          located. The function returns <c>{<anno>Replies</anno>, <anno>BadNodes</anno>}</c>,
-          where <c><anno>Replies</anno></c> is a list of all <c><anno>Reply</anno></c> values and
-          <c><anno>BadNodes</anno></c> is a list of the nodes which did not exist, or
-          where the server did not exist, or where the server terminated
-          before sending any reply.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="safe_multi_server_call" arity="2"/>
-      <name name="safe_multi_server_call" arity="3"/>
-      <fsummary>Interact with the servers on a number of nodes (deprecated)</fsummary>
-      <desc>
-        <warning>
-          <p>This function is deprecated. Use
-            <c>multi_server_call/2,3</c> instead.</p>
-        </warning>
-        <p>In Erlang/OTP R6B and earlier releases,
-          <c>multi_server_call/2,3</c> could not handle the case
-          where the remote node exists, but there is no server called
-          <c><anno>Name</anno></c>. Instead this function had to be used. In
-          Erlang/OTP R7B and later releases, however, the functions are
-          equivalent, except for this function being slightly slower.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="parallel_eval" arity="1"/>
-      <fsummary>Evaluate several function calls on all nodes in parallel</fsummary>
-      <desc>
-        <p>For every tuple in <c><anno>FuncCalls</anno></c>, evaluates
-          <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> on some node in
-          the network. Returns the list of return values, in the same
-          order as in <c><anno>FuncCalls</anno></c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="pmap" arity="3"/>
-      <fsummary>Parallell evaluation of mapping a function over a list </fsummary>
-      <desc>
-        <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>, [<anno>Elem</anno>|<anno>ExtraArgs</anno>])</c>,
-          for every element <c><anno>Elem</anno></c> in <c><anno>List1</anno></c>, in parallel.
-          Returns the list of return values, in the same order as in
-          <c><anno>List1</anno></c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="pinfo" arity="1"/>
-      <fsummary>Information about a process</fsummary>
-      <desc>
-        <p>Location transparent version of the BIF
-          <seealso marker="erts:erlang#process_info/1">
-          <c>process_info/1</c></seealso>.</p>
+        <p>The function returns the answer <c><anno>Reply</anno></c> as
+          produced by the server <c><anno>Name</anno></c>, or
+          <c>{error, <anno>Reason</anno>}</c>.</p>
       </desc>
     </func>
+
     <func>
-      <name name="pinfo" arity="2"/>
-      <fsummary>Information about a process</fsummary>
+      <name name="yield" arity="1"/>
+      <fsummary>Deliver the result of evaluating a function call on a node
+        (blocking).</fsummary>
       <desc>
-        <p>Location transparent version of the BIF
-          <seealso marker="erts:erlang#process_info/2">
-          <c>process_info/2</c></seealso>.</p>
+        <p>Returns the promised answer from a previous
+          <seealso marker="#async_call/4"><c>async_call/4</c></seealso>.
+          If the answer is available, it is
+          returned immediately. Otherwise, the calling process is
+          suspended until the answer arrives from <c>Node</c>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/kernel/doc/src/seq_trace.xml b/lib/kernel/doc/src/seq_trace.xml
index 3439111035..d29aceb564 100644
--- a/lib/kernel/doc/src/seq_trace.xml
+++ b/lib/kernel/doc/src/seq_trace.xml
@@ -29,24 +29,17 @@
     <rev>A</rev>
   </header>
   <module>seq_trace</module>
-  <modulesummary>Sequential Tracing of Messages</modulesummary>
+  <modulesummary>Sequential tracing of messages.</modulesummary>
   <description>
     <p>Sequential tracing makes it possible to trace all messages
       resulting from one initial message. Sequential tracing is
-      completely independent of the ordinary tracing in Erlang, which
-      is controlled by the <c>erlang:trace/3</c> BIF. See the chapter
-      <seealso marker="#whatis">What is Sequential Tracing</seealso>
-      below for more information about what sequential tracing is and
-      how it can be used.</p>
-    <p><c>seq_trace</c> provides functions which control all aspects of 
+      independent of the ordinary tracing in Erlang, which
+      is controlled by the <c>erlang:trace/3</c> BIF. For more information
+      about what sequential tracing is and how it can be used, see section
+      <seealso marker="#whatis">Sequential Tracing</seealso>.</p>
+    <p><c>seq_trace</c> provides functions that control all aspects of
       sequential tracing. There are functions for activation,
-      deactivation, inspection and for collection of the trace output.</p>
-    <note>
-      <p>The implementation of sequential tracing is in beta status.
-        This means that the programming interface still might undergo
-        minor adjustments (possibly incompatible) based on feedback
-        from users.</p>
-    </note>
+      deactivation, inspection, and for collection of the trace output.</p>
   </description>
   <datatypes>
     <datatype>
@@ -127,7 +120,36 @@ seq_trace:set_token(OldToken), % activate the trace token again
               enables/disables a timestamp to be generated for each
               traced event. Default is <c>false</c>.</p>
           </item>
+          <tag><c>set_token(strict_monotonic_timestamp, <anno>Bool</anno>)</c></tag>
+          <item>
+            <p>A trace token flag (<c>true | false</c>) which
+            enables/disables a strict monotonic timestamp to be generated
+	    for each traced event. Default is <c>false</c>. Timestamps will
+	    consist of
+	    <seealso marker="erts:time_correction#Erlang_Monotonic_Time">Erlang
+	    monotonic time</seealso> and a monotonically increasing
+	    integer. The time-stamp has the same format and value
+	    as produced by <c>{erlang:monotonic_time(nano_seconds),
+	    erlang:unique_integer([monotonic])}</c>.</p>
+          </item>
+          <tag><c>set_token(monotonic_timestamp, <anno>Bool</anno>)</c></tag>
+          <item>
+            <p>A trace token flag (<c>true | false</c>) which
+            enables/disables a strict monotonic timestamp to be generated
+	    for each traced event. Default is <c>false</c>. Timestamps
+	    will use
+	    <seealso marker="erts:time_correction#Erlang_Monotonic_Time">Erlang
+	    monotonic time</seealso>. The time-stamp has the same
+	    format and value as produced by
+	    <c>erlang:monotonic_time(nano_seconds)</c>.</p>
+          </item>
         </taglist>
+	  <p>If multiple timestamp flags are passed, <c>timestamp</c> has
+	  precedence over <c>strict_monotonic_timestamp</c> which
+	  in turn has precedence over <c>monotonic_timestamp</c>. All
+	  timestamp flags are remembered, so if two are passed
+	  and the one with highest precedence later is disabled
+	  the other one will become active.</p>
       </desc>
     </func>
     <func>
@@ -210,20 +232,21 @@ seq_trace:set_token(OldToken), % activate the trace token again
   </funcs>
 
   <section>
-    <title>Trace Messages Sent To the System Tracer</title>
-    <p>The format of the messages are:</p>
+    <title>Trace Messages Sent to the System Tracer</title>
+    <p>The format of the messages is one of the following, depending on if
+      flag <c>timestamp</c> of the trace token is set to <c>true</c> or
+      <c>false</c>:</p>
     <code type="none">
 {seq_trace, Label, SeqTraceInfo, TimeStamp}</code>
     <p>or</p>
     <code type="none">
 {seq_trace, Label, SeqTraceInfo}</code>
-    <p>depending on whether the <c>timestamp</c> flag of the trace
-      token is set to <c>true</c> or <c>false</c>. Where:</p>
+    <p>Where:</p>
     <code type="none">
 Label = int()
 TimeStamp = {Seconds, Milliseconds, Microseconds}  
   Seconds = Milliseconds = Microseconds = int()</code>
-    <p>The <c>SeqTraceInfo</c> can have the following formats:</p>
+    <p><c>SeqTraceInfo</c> can have the following formats:</p>
     <taglist>
       <tag><c>{send, Serial, From, To, Message}</c></tag>
       <item>
@@ -233,141 +256,151 @@ TimeStamp = {Seconds, Milliseconds, Microseconds}
       <tag><c>{'receive', Serial, From, To, Message}</c></tag>
       <item>
         <p>Used when a process <c>To</c> receives a message with a
-          trace token that has the <c>'receive'</c> flag set to
-          <c>true</c>.</p>
+          trace token that has flag <c>'receive'</c> set to <c>true</c>.</p>
       </item>
       <tag><c>{print, Serial, From, _, Info}</c></tag>
       <item>
-        <p>Used when a process <c>From</c> has called 
+        <p>Used when a process <c>From</c> has called
           <c>seq_trace:print(Label, TraceInfo)</c> and has a trace
-          token with the <c>print</c> flag set to <c>true</c> and
+          token with flag <c>print</c> set to <c>true</c>, and
           <c>label</c> set to <c>Label</c>.</p>
       </item>
     </taglist>
     <p><c>Serial</c> is a tuple <c>{PreviousSerial, ThisSerial}</c>,
-      where the first integer <c>PreviousSerial</c> denotes the serial
-      counter passed in the last received message which carried a trace 
-      token. If the process is the first one in a new sequential trace,
-      <c>PreviousSerial</c> is set to the value of the process internal 
-      "trace clock". The second integer <c>ThisSerial</c> is the serial
-      counter that a process sets on outgoing messages and it is based
-      on the process internal "trace clock" which is incremented by one
-      before it is attached to the trace token in the message.</p>
+      where:</p>
+    <list type="bulleted">
+      <item><p>Integer <c>PreviousSerial</c> denotes the serial
+        counter passed in the last received message that carried a trace
+        token. If the process is the first in a new sequential trace,
+        <c>PreviousSerial</c> is set to the value of the process internal
+        "trace clock".</p></item>
+      <item><p>Integer <c>ThisSerial</c> is the serial
+        counter that a process sets on outgoing messages. It is based
+        on the process internal "trace clock", which is incremented by one
+        before it is attached to the trace token in the message.</p></item>
+    </list>
   </section>
 
   <section>
     <marker id="whatis"></marker>
-    <title>What is Sequential Tracing</title>
+    <title>Sequential Tracing</title>
     <p>Sequential tracing is a way to trace a sequence of messages sent
       between different local or remote processes, where the sequence
-      is initiated by one single message. In short it works like this:</p>
+      is initiated by a single message. In short, it works as follows:</p>
     <p>Each process has a <em>trace token</em>, which can be empty or
-      not empty. When not empty the trace token can be seen as
+      not empty. When not empty, the trace token can be seen as
       the tuple <c>{Label, Flags, Serial, From}</c>. The trace token is
       passed invisibly with each message.</p>
-    <p>In order to start a sequential trace the user must explicitly set
+    <p>To start a sequential trace, the user must explicitly set
       the trace token in the process that will send the first message
       in a sequence.</p>
     <p>The trace token of a process is set each time the process
       matches a message in a receive statement, according to the trace
       token carried by the received message, empty or not.</p>
-    <p>On each Erlang node a process can be set as the <em>system tracer</em>. This process will receive trace messages each time
+    <p>On each Erlang node, a process can be set as the <em>system tracer</em>.
+      This process receives trace messages each time
       a message with a trace token is sent or received (if the trace
       token flag <c>send</c> or <c>'receive'</c> is set). The system
-      tracer can then print each trace event, write it to a file or
+      tracer can then print each trace event, write it to a file, or
       whatever suitable.</p>
     <note>
-      <p>The system tracer will only receive those trace events that
+      <p>The system tracer only receives those trace events that
         occur locally within the Erlang node. To get the whole picture
-        of a sequential trace that involves processes on several Erlang
+        of a sequential trace, involving processes on many Erlang
         nodes, the output from the system tracer on each involved node
-        must be merged (off line).</p>
+        must be merged (offline).</p>
     </note>
-    <p>In the following sections Sequential Tracing and its most
-      fundamental concepts are described.</p>
+    <p>The following sections describe sequential tracing and its most
+      fundamental concepts.</p>
   </section>
 
   <section>
     <title>Trace Token</title>
-    <p>Each process has a current trace token. Initially the token is
+    <p>Each process has a current trace token. Initially, the token is
       empty. When the process sends a message to another process, a
-      copy of the current token will be sent "invisibly" along with
+      copy of the current token is sent "invisibly" along with
       the message.</p>
-    <p>The current token of a process is set in two ways, either</p>
-    <list type="ordered">
+    <p>The current token of a process is set in one of the following two
+      ways:</p>
+    <list type="bulleted">
       <item>
-        <p>explicitly by the process itself, through a call to
-          <c>seq_trace:set_token</c>, or</p>
+        <p>Explicitly by the process itself, through a call to
+          <c>seq_trace:set_token/1,2</c></p>
       </item>
       <item>
-        <p>when a message is received.</p>
+        <p>When a message is received</p>
       </item>
     </list>
-    <p>In both cases the current token will be set. In particular, if
-      the token of a message received is empty, the current token of
+    <p>In both cases, the current token is set. In particular, if
+      the token of a received message is empty, the current token of
       the process is set to empty.</p>
-    <p>A trace token contains a label, and a set of flags. Both
-      the label and the flags are set in 1 and 2 above.</p>
+    <p>A trace token contains a label and a set of flags. Both
+      the label and the flags are set in both alternatives above.</p>
   </section>
 
   <section>
     <title>Serial</title>
-    <p>The trace token contains a component which is called
-      <c>serial</c>. It consists of two integers <c>Previous</c> and
+    <p>The trace token contains a component called
+      <c>serial</c>. It consists of two integers, <c>Previous</c> and
       <c>Current</c>. The purpose is to uniquely identify each traced
-      event within a trace sequence and to order the messages
-      chronologically and in the different branches if any.</p>
+      event within a trace sequence, as well as to order the messages
+      chronologically and in the different branches, if any.</p>
     <p>The algorithm for updating <c>Serial</c> can be described as
       follows:</p>
-    <p>Let each process have two counters <c>prev_cnt</c> and
-      <c>curr_cnt</c> which both are set to 0 when a process is created.
+    <p>Let each process have two counters, <c>prev_cnt</c> and
+      <c>curr_cnt</c>, both are set to <c>0</c> when a process is created.
       The counters are updated at the following occasions:</p>
     <list type="bulleted">
       <item>
-        <p><em>When the process is about to send a message and the trace token is not empty.</em></p>
+        <p><em>When the process is about to send a message and the trace token
+          is not empty.</em></p>
         <p>Let the serial of the trace token be <c>tprev</c> and
-          <c>tcurr</c>.          <br></br>
-<c>curr_cnt := curr_cnt + 1</c>          <br></br>
-<c>tprev := prev_cnt</c>          <br></br>
-<c>tcurr := curr_cnt</c></p>
+          <c>tcurr</c>.</p>
+        <pre>
+curr_cnt := curr_cnt + 1
+tprev := prev_cnt
+tcurr := curr_cnt</pre>
         <p>The trace token with <c>tprev</c> and <c>tcurr</c> is then
           passed along with the message.</p>
       </item>
       <item>
-        <p><em>When the process calls</em><c>seq_trace:print(Label, Info)</c>, <em>Label matches the label part of the trace token and the trace token print flag is true.</em></p>
-        <p>The same algorithm as for send above.</p>
+        <p><em>When the process calls</em> <c>seq_trace:print(Label, Info)</c>,
+          <c>Label</c> <em>matches the label part of the trace token and the
+          trace token print flag is <c>true</c>.</em></p>
+        <p>The algorithm is the same as for send above.</p>
       </item>
       <item>
-        <p><em>When a message is received and contains a nonempty trace token.</em></p>
+        <p><em>When a message is received and contains a non-empty trace
+          token.</em></p>
         <p>The process trace token is set to the trace token from
           the message.</p>
         <p>Let the serial of the trace token be <c>tprev</c> and
-          <c>tcurr</c>.          <br></br>
-<c><![CDATA[if (curr_cnt < tcurr )]]></c>          <br></br>
-
-          &nbsp; &nbsp; &nbsp; &nbsp;<c>curr_cnt := tcurr</c>          <br></br>
-<c>prev_cnt := tcurr</c></p>
+          <c>tcurr</c>.</p>
+        <code>
+<![CDATA[if (curr_cnt < tcurr )]]>
+   curr_cnt := tcurr
+prev_cnt := tcurr</code>
       </item>
     </list>
-    <p>The <c>curr_cnt</c> of a process is incremented each time
+    <p><c>curr_cnt</c> of a process is incremented each time
       the process is involved in a sequential trace. The counter can
       reach its limit (27 bits) if a process is very long-lived and is
-      involved in much sequential tracing. If the counter overflows it
-      will not be possible to use the serial for ordering of the trace
-      events. To prevent the counter from overflowing in the middle of
-      a sequential trace the function <c>seq_trace:reset_trace/0</c>
-      can be called to reset the <c>prev_cnt</c> and <c>curr_cnt</c> of
-      all processes in the Erlang node. This function will also set all
-      trace tokens in processes and their message queues to empty and
-      will thus stop all ongoing sequential tracing.</p>
+      involved in much sequential tracing. If the counter overflows, the
+      serial for ordering of the trace events cannot be used. To prevent
+      the counter from overflowing in the middle of
+      a sequential trace, function <c>seq_trace:reset_trace/0</c>
+      can be called to reset <c>prev_cnt</c> and <c>curr_cnt</c> of
+      all processes in the Erlang node. This function also sets all
+      trace tokens in processes and their message queues to empty, and
+      thus stops all ongoing sequential tracing.</p>
   </section>
 
   <section>
-    <title>Performance considerations</title>
-    <p>The performance degradation for a system which is enabled for
-      Sequential Tracing is negligible as long as no tracing is
-      activated. When tracing is activated there will of course be an
-      extra cost for each traced message but all other messages will be
+    <title>Performance Considerations</title>
+    <p>The performance degradation for a system that is enabled for
+      sequential tracing is negligible as long as no tracing is
+      activated. When tracing is activated, there is an
+      extra cost for each traced message, but all other messages are
       unaffected.</p>
   </section>
 
@@ -375,13 +408,13 @@ TimeStamp = {Seconds, Milliseconds, Microseconds}
     <title>Ports</title>
     <p>Sequential tracing is not performed across ports.</p>
     <p>If the user for some reason wants to pass the trace token to a
-      port this has to be done manually in the code of the port
+      port, this must be done manually in the code of the port
       controlling process. The port controlling processes have to check
       the appropriate sequential trace settings (as obtained from
-      <c>seq_trace:get_token/1</c> and include trace information in
+      <c>seq_trace:get_token/1</c>) and include trace information in
       the message data sent to their respective ports.</p>
     <p>Similarly, for messages received from a port, a port controller
-      has to retrieve trace specific information, and set appropriate
+      has to retrieve trace-specific information, and set appropriate
       sequential trace flags through calls to
       <c>seq_trace:set_token/2</c>.</p>
   </section>
@@ -389,23 +422,23 @@ TimeStamp = {Seconds, Milliseconds, Microseconds}
   <section>
     <title>Distribution</title>
     <p>Sequential tracing between nodes is performed transparently.
-      This applies to C-nodes built with Erl_Interface too. A C-node
-      built with Erl_Interface only maintains one trace token, which
-      means that the C-node will appear as one process from
+      This applies to C-nodes built with <c>Erl_Interface</c> too. A C-node
+      built with <c>Erl_Interface</c> only maintains one trace token, which
+      means that the C-node appears as one process from
       the sequential tracing point of view.</p>
-    <p>In order to be able to perform sequential tracing between
+    <p>To be able to perform sequential tracing between
       distributed Erlang nodes, the distribution protocol has been
-      extended (in a backward compatible way). An Erlang node which
-      supports sequential tracing can communicate with an older
-      (OTP R3B) node but messages passed within that node can of course
+      extended (in a backward compatible way). An Erlang node
+      supporting sequential tracing can communicate with an older
+      (Erlang/OTP R3B) node but messages passed within that node can
       not be traced.</p>
   </section>
 
   <section>
-    <title>Example of Usage</title>
-    <p>The example shown here will give rough idea of how the new
-      primitives can be used and what kind of output it will produce.</p>
-    <p>Assume that we have an initiating process with
+    <title>Example of Use</title>
+    <p>This example gives a rough idea of how the new
+      primitives can be used and what kind of output it produces.</p>
+    <p>Assume that you have an initiating process with
       <c><![CDATA[Pid == <0.30.0>]]></c> like this:</p>
     <code type="none">
 -module(seqex).
@@ -434,8 +467,8 @@ loop() ->
             PortController ! {ack,Ack}
     end,
     loop().</code>
-    <p>A possible output from the system's sequential_tracer (inspired
-      by AXE-10 and MD-110) could look like:</p>
+    <p>A possible output from the system's <c>sequential_tracer</c> can be
+      like this:</p>
     <pre>
 17:&lt;0.30.0> Info {0,1} WITH
 "**** Trace Started ****"
@@ -446,7 +479,7 @@ loop() ->
 17:&lt;0.30.0> Received {2,4} FROM &lt;0.31.0> WITH
 {ack,{received,the_message}}</pre>
     <p>The implementation of a system tracer process that produces
-      the printout above could look like this:</p>
+      this printout can look like this:</p>
     <code type="none">
 tracer() ->
     receive
@@ -473,16 +506,15 @@ print_trace({'receive',Serial,From,To,Message}) ->
 print_trace({send,Serial,From,To,Message}) ->
     io:format("~p Sent ~p TO ~p WITH~n~p~n", 
               [From,Serial,To,Message]).</code>
-    <p>The code that creates a process that runs the tracer function
-      above and sets that process as the system tracer could look like
-      this:</p>
+    <p>The code that creates a process that runs this tracer function
+      and sets that process as the system tracer can look like this:</p>
     <code type="none">
 start() ->
     Pid = spawn(?MODULE,tracer,[]),
     seq_trace:set_system_tracer(Pid), % set Pid as the system tracer 
     ok.</code>
-    <p>With a function like <c>test/0</c> below the whole example can be
-      started.</p>
+    <p>With a function like <c>test/0</c>, the whole example can be
+      started:</p>
     <code type="none">
 test() ->
     P = spawn(?MODULE, loop, [port]),
diff --git a/lib/kernel/doc/src/user.xml b/lib/kernel/doc/src/user.xml
index 24119bea82..440b7878e8 100644
--- a/lib/kernel/doc/src/user.xml
+++ b/lib/kernel/doc/src/user.xml
@@ -27,13 +27,13 @@
     <title>user</title>
     <prepared>Robert Virding</prepared>
     <docno>1</docno>
-    <date>96-10-10</date>
+    <date>1996-10-10</date>
     <rev>A</rev>
   </header>
   <module>user</module>
-  <modulesummary>Standard I/O Server</modulesummary>
+  <modulesummary>Standard I/O server.</modulesummary>
   <description>
-    <p><c>user</c> is a server which responds to all the messages
+    <p><c>user</c> is a server that responds to all messages
       defined in the I/O interface. The code in <c>user.erl</c> can be
       used as a model for building alternative I/O servers.</p>
   </description>
diff --git a/lib/kernel/doc/src/wrap_log_reader.xml b/lib/kernel/doc/src/wrap_log_reader.xml
index c021f42cac..7fb9c1c023 100644
--- a/lib/kernel/doc/src/wrap_log_reader.xml
+++ b/lib/kernel/doc/src/wrap_log_reader.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2013</year>
+      <year>1998</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -26,39 +26,43 @@
     <prepared>Esko Vierum&auml;ki</prepared>
     <responsible>Esko Vierum&auml;ki</responsible>
     <docno></docno>
-    <approved>nobody</approved>
-    <checked>no</checked>
-    <date>98-09-21</date>
+    <approved></approved>
+    <checked></checked>
+    <date>1998-09-21</date>
     <rev>A</rev>
     <file>wrap_log_reader.sgml</file>
   </header>
   <module>wrap_log_reader</module>
-  <modulesummary>A function to read internally formatted wrap disk logs</modulesummary>
+  <modulesummary>A service to read internally formatted wrap disk logs.
+  </modulesummary>
   <description>
-    <p><c>wrap_log_reader</c> is a function to read internally formatted
-      wrap disk logs, refer to disk_log(3). <c>wrap_log_reader</c> does not
-      interfere with disk_log activities; there is however a known bug in this
-      version of the <c>wrap_log_reader</c>, see chapter <c>bugs</c> below.
-      </p>
-    <p>A wrap disk log file consists of several files, called index files. 
-      A log file can be opened and closed. It is also possible to open just one index file
-      separately. If an non-existent or a non-internally formatted file is opened,
-      an error message is returned. If the file is corrupt, no attempt to repair it
-      will be done but an error message is returned. 
-      </p>
-    <p>If a log is configured to be distributed, there is a possibility that all items 
-      are not loggen on all nodes. <c>wrap_log_reader</c> does only read the log on
-      the called node, it is entirely up to the user to be sure that all items are read.
-      </p>
+    <p>This module makes it possible to read internally formatted
+      wrap disk logs, see
+      <seealso marker="disk_log"><c>disk_log(3)</c></seealso>.
+      <c>wrap_log_reader</c> does not
+      interfere with <c>disk_log</c> activities; there is however a bug in this
+      version of the <c>wrap_log_reader</c>, see section
+      <seealso marker="#bugs">Known Limitations</seealso>.</p>
+    <p>A wrap disk log file consists of many files, called index files. A log
+      file can be opened and closed. Also, a single index file can be opened
+      separately. If a non-existent or non-internally formatted file is opened,
+      an error message is returned. If the file is corrupt, no attempt is made
+      to repair it, but an error message is returned.</p>
+    <p>If a log is configured to be distributed, it is possible that all items
+      are not logged on all nodes. <c>wrap_log_reader</c> only reads the log on
+      the called node; it is up to the user to be sure that all items
+      are read.</p>
   </description>
+
   <datatypes>
     <datatype>
       <name name="continuation"/>
-      <desc><p>Continuation returned by
-         <c>open/1,2</c> or <c>chunk/1,2</c>.</p>
+      <desc>
+        <p>Continuation returned by <c>open/1,2</c> or <c>chunk/1,2</c>.</p>
       </desc>
     </datatype>
   </datatypes>
+
   <funcs>
     <func>
       <name name="chunk" arity="1"/>
@@ -66,87 +70,83 @@
       <fsummary>Read a chunk of objects written to a wrap log.</fsummary>
       <type name="chunk_ret"/>
       <desc>
-        <p>This function makes it possible to efficiently read the
-          terms which have been appended to a log. It minimises disk
-          I/O by reading large 8K chunks from the file.
-          </p>
-        <p>The first time <c>chunk</c> is called an initial
-          continuation returned from the <c>open/1</c>, <c>open/2</c> must be provided.
-          </p>
+        <p>Enables to efficiently read the
+          terms that are appended to a log. Minimises disk
+          I/O by reading 64 kilobyte chunks from the file.</p>
+        <p>The first time <c>chunk()</c> is called, an initial
+          continuation returned from <c>open/1</c> or <c>open/2</c> must be
+          provided.</p>
         <p>When <c>chunk/3</c> is called, <c><anno>N</anno></c> controls the
           maximum number of terms that are read from the log in each
-          chunk.  Default is <c>infinity</c>, which means that all the
+          chunk. Defaults to <c>infinity</c>, which means that all the
           terms contained in the 8K chunk are read. If less than
-          <c><anno>N</anno></c> terms are returned, this does not necessarily mean
-          that end of file is reached.
-          </p>
-        <p>The <c>chunk</c> function returns a tuple
-          <c>{<anno>Continuation2</anno>, <anno>Terms</anno>}</c>, where <c><anno>Terms</anno></c> is a list
+          <c><anno>N</anno></c> terms are returned, this does not necessarily
+          mean that end of file is reached.</p>
+        <p>Returns a tuple <c>{<anno>Continuation2</anno>,
+          <anno>Terms</anno>}</c>, where <c><anno>Terms</anno></c> is a list
           of terms found in the log. <c><anno>Continuation2</anno></c> is yet
-          another continuation which must be passed on into any
-          subsequent calls to <c>chunk</c>. With a series of calls to
-          <c>chunk</c> it is then possible to extract all terms from a
-          log.
-          </p>
-        <p>The <c>chunk</c> function returns a tuple
-          <c>{<anno>Continuation2</anno>, <anno>Terms</anno>, <anno>Badbytes</anno>}</c> if the log is opened
-          in read only mode and the read chunk is corrupt. <c><anno>Badbytes</anno></c>
+          another continuation that  must be passed on to any
+          subsequent calls to <c>chunk()</c>. With a series of calls to
+          <c>chunk()</c>, it is then possible to extract all terms from a log.</p>
+        <p>Returns a tuple <c>{<anno>Continuation2</anno>,
+          <anno>Terms</anno>, <anno>Badbytes</anno>}</c> if the log is opened
+          in read only mode and the read chunk is corrupt.
+          <c><anno>Badbytes</anno></c>
           indicates the number of non-Erlang terms found in the chunk.
-          Note also that the log is not repaired.
-          </p>
-        <p><c>chunk</c> returns <c>{<anno>Continuation2</anno>, eof}</c> when the end of the log is
-          reached, and <c>{error, <anno>Reason</anno>}</c> if an error occurs.
-          </p>
-        <p>The returned continuation may or may not be valid in the next call to
-          <c>chunk</c>.  This is because the log may wrap and delete
-          the file into which the continuation points. To make sure
-          this does not happen, the log can be blocked during the
-          search.
-          </p>
+          Notice that the log is not repaired.</p>
+        <p>Returns <c>{<anno>Continuation2</anno>, eof}</c> when
+          the end of the log is reached, and <c>{error, <anno>Reason</anno>}</c>
+          if an error occurs.</p>
+        <p>The returned continuation either is or is not valid in the next call
+          to this function. This is because the log can wrap and delete
+          the file into which the continuation points. To ensure
+          this does not occur, the log can be blocked during the search.</p>
       </desc>
     </func>
+
     <func>
       <name name="close" arity="1"/>
-      <fsummary>Close a log</fsummary>
+      <fsummary>Close a log.</fsummary>
       <desc>
-        <p>This function closes a log file properly.
-          </p>
+        <p>Closes a log file properly.</p>
       </desc>
     </func>
+
     <func>
       <name name="open" arity="1"/>
       <name name="open" arity="2"/>
-      <fsummary>Open a log file</fsummary>
+      <fsummary>Open a log file.</fsummary>
       <type name="open_ret"/>
       <desc>
-        <p><c><anno>Filename</anno></c> specifies the name of the file which is to be read. </p>
-        <p><c><anno>N</anno></c> specifies the index of the file which is to be read.
-          If <c><anno>N</anno></c> is omitted the whole wrap log file will be read; if it
-          is specified only the specified index file will be read.
-          </p>
-        <p>The <c>open</c> function returns <c>{ok, <anno>Continuation</anno>}</c> if the
-          log/index file was successfully opened. The <c><anno>Continuation</anno></c>
-          is to be used when chunking or closing the file. 
-          </p>
-        <p>The function returns <c>{error, <anno>Reason</anno>}</c> for all errors.
-          </p>
+        <p><c><anno>Filename</anno></c> specifies the name of the file to be
+          read.</p>
+        <p><c><anno>N</anno></c> specifies the index of the file to be read.
+          If <c><anno>N</anno></c> is omitted, the whole wrap log file is read;
+          if it is specified, only the specified index file is read.</p>
+        <p>Returns <c>{ok, <anno>Continuation</anno>}</c> if the
+          log/index file is opened successfully.
+          <c><anno>Continuation</anno></c>
+          is to be used when chunking or closing the file.</p>
+        <p>Returns <c>{error, <anno>Reason</anno>}</c> for all errors.</p>
       </desc>
     </func>
   </funcs>
 
   <section>
-    <title>Bugs</title>
-    <p>This version of the <c>wrap_log_reader</c> does not detect if the <c>disk_log</c>
-      wraps to a new index file between a <c>wrap_log_reader:open</c> and the first 
-      <c>wrap_log_reader:chunk</c>.
-      In this case the chuck will actually read the last logged items in the log file,
-      because the opened index file was truncated by the <c>disk_log</c>.
-      </p>
+    <title>Known Limitations</title>
+    <marker id="bugs"/>
+    <p>This version of <c>wrap_log_reader</c> does not detect if
+      <c>disk_log</c> wraps to a new index file between a call to
+      <c>wrap_log_reader:open()</c> and the first call to
+      <c>wrap_log_reader:chunk()</c>.
+      If this occurs, the call to <c>chunk()</c> reads the last logged
+      items in the log file, as the opened index file was truncated by
+      <c>disk_log</c>.</p>
   </section>
 
   <section>
     <title>See Also</title>
-    <p><seealso marker="disk_log">disk_log(3)</seealso></p>
+    <p><seealso marker="disk_log"><c>disk_log(3)</c></seealso></p>
   </section>
 </erlref>
 
diff --git a/lib/kernel/doc/src/zlib_stub.xml b/lib/kernel/doc/src/zlib_stub.xml
index d1823b01aa..ea2a6af2bd 100644
--- a/lib/kernel/doc/src/zlib_stub.xml
+++ b/lib/kernel/doc/src/zlib_stub.xml
@@ -31,13 +31,9 @@
     <rev>A</rev>
   </header>
   <module>zlib</module>
-  <modulesummary>Zlib Compression interface.</modulesummary>
-  <description><p>
-
-  The module zlib is moved to the runtime system
-  application.  Please see <seealso
-  marker="erts:zlib">zlib(3)</seealso> in the
-  erts reference manual instead.
-
-  </p></description>
+  <modulesummary>Zlib compression interface.</modulesummary>
+  <description>
+  <p>This module is moved to the
+    <seealso marker="erts:zlib"><c>ERTS</c></seealso> application.</p>
+  </description>
 </erlref>
diff --git a/lib/kernel/examples/uds_dist/c_src/uds_drv.c b/lib/kernel/examples/uds_dist/c_src/uds_drv.c
index e32ad69adf..8c028ba910 100644
--- a/lib/kernel/examples/uds_dist/c_src/uds_drv.c
+++ b/lib/kernel/examples/uds_dist/c_src/uds_drv.c
@@ -957,28 +957,24 @@ static void put_packet_length(char *b, int len)
 
 /*
 ** Malloc wrappers
-** Note!
-** The function erl_exit is actually not a pert of the 
-** driver interface, but it is very nice to use if one wants to halt
-** with a core and an erlang crash dump.
 */
 static void *my_malloc(size_t size) 
 {
-    void erl_exit(int, char *, ...);
     void *ptr;
 
     if ((ptr = driver_alloc(size)) == NULL) {
-	erl_exit(1,"Could not allocate %lu bytes of memory",(unsigned long) size);
+	fprintf(stderr, "Could not allocate %lu bytes of memory",(unsigned long) size);
+	abort();
     }
     return ptr;
 }
 
 static void *my_realloc(void *ptr, size_t size)
 {
-    void erl_exit(int, char *, ...);
     void *nptr;
     if ((nptr = driver_realloc(ptr, size)) == NULL) {
-	erl_exit(1,"Could not reallocate %lu bytes of memory",(unsigned long) size);
+	fprintf(stderr, "Could not reallocate %lu bytes of memory",(unsigned long) size);
+	abort();
     }
     return nptr;
 }
diff --git a/lib/kernel/include/file.hrl b/lib/kernel/include/file.hrl
index 7cf033f7f5..36112bb040 100644
--- a/lib/kernel/include/file.hrl
+++ b/lib/kernel/include/file.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2015. 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.
@@ -23,37 +23,40 @@
 %%--------------------------------------------------------------------------
 
 -record(file_info,
-        {size   :: non_neg_integer(),   % Size of file in bytes.
-         type   :: 'device' | 'directory' | 'other' | 'regular' | 'symlink',
-         access :: 'read' | 'write' | 'read_write' | 'none',
-         atime  :: file:date_time() | non_neg_integer(),
+        {size   :: non_neg_integer() | 'undefined',  % Size of file in bytes.
+         type   :: 'device' | 'directory' | 'other' | 'regular' | 'symlink'
+                 | 'undefined',
+         access :: 'read' | 'write' | 'read_write' | 'none' | 'undefined',
+         atime  :: file:date_time() | non_neg_integer() | 'undefined',
                                      % The local time the file was last read:
                                      % {{Year, Mon, Day}, {Hour, Min, Sec}}.
                                      % atime, ctime, mtime may also be unix epochs()
-         mtime  :: file:date_time() | non_neg_integer(),
+         mtime  :: file:date_time() | non_neg_integer() | 'undefined',
                                      % The local time the file was last written.
-         ctime  :: file:date_time() | non_neg_integer(),
+         ctime  :: file:date_time() | non_neg_integer() | 'undefined',
                                      % The interpretation of this time field
                                      % is dependent on operating system.
                                      % On Unix it is the last time the file
                                      % or the inode was changed.  On Windows,
                                      % it is the creation time.
-         mode   :: non_neg_integer(), % File permissions.  On Windows,
+         mode   :: non_neg_integer() | 'undefined',
+                                     % File permissions.  On Windows,
                                      % the owner permissions will be
                                      % duplicated for group and user.
-         links  :: non_neg_integer(),
+         links  :: non_neg_integer() | 'undefined',
                                      % Number of links to the file (1 if the
                                      % filesystem doesn't support links).
-         major_device :: non_neg_integer(),
+         major_device :: non_neg_integer() | 'undefined',
                                      % Identifies the file system (Unix),
                                      % or the drive number (A: = 0, B: = 1)
                                      % (Windows).
          %% The following are Unix specific.
          %% They are set to zero on other operating systems.
-         minor_device :: non_neg_integer(), % Only valid for devices.
-         inode   :: non_neg_integer(),       % Inode number for file.
-         uid     :: non_neg_integer(),       % User id for owner.
-         gid     :: non_neg_integer()}).     % Group id for owner.
+         minor_device :: non_neg_integer() | 'undefined',
+                                             % Only valid for devices.
+         inode   :: non_neg_integer() | 'undefined',  % Inode number for file.
+         uid     :: non_neg_integer() | 'undefined',   % User id for owner.
+         gid     :: non_neg_integer() | 'undefined'}). % Group id for owner.
 
 
 -record(file_descriptor,
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index 352c02562b..d1cb47f6ea 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -28,11 +28,15 @@
 	 get_path/0, 
 	 load_file/1,
 	 ensure_loaded/1,
+	 ensure_modules_loaded/1,
 	 load_abs/1,
 	 load_abs/2,
 	 load_binary/3,
 	 load_native_partial/2,
 	 load_native_sticky/3,
+	 atomic_load/1,
+	 prepare_loading/1,
+	 finish_loading/1,
 	 delete/1,
 	 purge/1,
 	 soft_purge/1,
@@ -60,7 +64,7 @@
 	 del_path/1,
 	 replace_path/2,
 	 rehash/0,
-	 start_link/0, start_link/1,
+	 start_link/0,
 	 which/1,
 	 where_is_file/1,
 	 where_is_file/2,
@@ -68,7 +72,10 @@
 	 clash/0,
      get_mode/0]).
 
+-deprecated({rehash,0,next_major_release}).
+
 -export_type([load_error_rsn/0, load_ret/0]).
+-export_type([prepared_code/0]).
 
 -include_lib("kernel/include/file.hrl").
 
@@ -77,16 +84,20 @@
 %%----------------------------------------------------------------------------
 
 -type load_error_rsn() :: 'badfile'
-                        | 'native_code'
                         | 'nofile'
                         | 'not_purged'
-                        | 'on_load'
+                        | 'on_load_failure'
                         | 'sticky_directory'.
 -type load_ret() :: {'error', What :: load_error_rsn()}
                   | {'module', Module :: module()}.
 -type loaded_ret_atoms() :: 'cover_compiled' | 'preloaded'.
 -type loaded_filename() :: (Filename :: file:filename()) | loaded_ret_atoms().
 
+-define(PREPARED, '$prepared$').
+-opaque prepared_code() ::
+	  {?PREPARED,[{module(),{binary(),string(),_}}]}.
+
+
 %%% BIFs
 
 -export([get_chunk/2, is_module_native/1, make_stub_module/3, module_md5/1]).
@@ -135,14 +146,16 @@ load_file(Mod) when is_atom(Mod) ->
 
 -spec ensure_loaded(Module) -> {module, Module} | {error, What} when
       Module :: module(),
-      What :: embedded | badfile | native_code | nofile | on_load.
+      What :: embedded | badfile | nofile | on_load_failure.
 ensure_loaded(Mod) when is_atom(Mod) -> 
     call({ensure_loaded,Mod}).
 
 %% XXX File as an atom is allowed only for backwards compatibility.
 -spec load_abs(Filename) -> load_ret() when
       Filename :: file:filename().
-load_abs(File) when is_list(File); is_atom(File) -> call({load_abs,File,[]}).
+load_abs(File) when is_list(File); is_atom(File) ->
+    Mod = list_to_atom(filename:basename(File)),
+    call({load_abs,File,Mod}).
 
 %% XXX Filename is also an atom(), e.g. 'cover_compiled'
 -spec load_abs(Filename :: loaded_filename(), Module :: module()) -> load_ret().
@@ -245,7 +258,7 @@ is_sticky(Mod) when is_atom(Mod) -> call({is_sticky,Mod}).
 
 -spec set_path(Path) -> 'true' | {'error', What} when
       Path :: [Dir :: file:filename()],
-      What :: 'bad_directory' | 'bad_path'.
+      What :: 'bad_directory'.
 set_path(PathList) when is_list(PathList) -> call({set_path,PathList}).
 
 -spec get_path() -> Path when
@@ -293,23 +306,328 @@ replace_path(Name, Dir) when (is_atom(Name) orelse is_list(Name)),
     call({replace_path,Name,Dir}).
 
 -spec rehash() -> 'ok'.
-rehash() -> call(rehash).
+rehash() ->
+    cache_warning(),
+    ok.
 
 -spec get_mode() -> 'embedded' | 'interactive'.
 get_mode() -> call(get_mode).
 
+%%%
+%%% Loading of several modules in parallel.
+%%%
+
+-spec ensure_modules_loaded([Module]) ->
+   'ok' | {'error',[{Module,What}]} when
+      Module :: module(),
+      What :: badfile | nofile | on_load_failure.
+
+ensure_modules_loaded(Modules) when is_list(Modules) ->
+    case prepare_ensure(Modules, []) of
+	Ms when is_list(Ms) ->
+	    ensure_modules_loaded_1(Ms);
+	error ->
+	    error(function_clause, [Modules])
+    end.
+
+ensure_modules_loaded_1(Ms0) ->
+    Ms = lists:usort(Ms0),
+    {Prep,Error0} = load_mods(Ms),
+    {OnLoad,Normal} = partition_on_load(Prep),
+    Error1 = case finish_loading(Normal, true) of
+		 ok -> Error0;
+		 {error,Err} -> Err ++ Error0
+	     end,
+    ensure_modules_loaded_2(OnLoad, Error1).
+
+ensure_modules_loaded_2([{M,_}|Ms], Errors) ->
+    case ensure_loaded(M) of
+	{module,M} ->
+	    ensure_modules_loaded_2(Ms, Errors);
+	{error,Err} ->
+	    ensure_modules_loaded_2(Ms, [{M,Err}|Errors])
+    end;
+ensure_modules_loaded_2([], []) ->
+    ok;
+ensure_modules_loaded_2([], [_|_]=Errors) ->
+    {error,Errors}.
+
+prepare_ensure([M|Ms], Acc) when is_atom(M) ->
+    case erlang:module_loaded(M) of
+	true ->
+	    prepare_ensure(Ms, Acc);
+	false ->
+	    prepare_ensure(Ms, [M|Acc])
+    end;
+prepare_ensure([], Acc) ->
+    Acc;
+prepare_ensure(_, _) ->
+    error.
+
+-spec atomic_load(Modules) -> 'ok' | {'error',[{Module,What}]} when
+      Modules :: [Module | {Module, Filename, Binary}],
+      Module :: module(),
+      Filename :: file:filename(),
+      Binary :: binary(),
+      What :: 'badfile' | 'nofile' | 'on_load_not_allowed' | 'duplicated' |
+	      'not_purged' | 'sticky_directory' | 'pending_on_load'.
+
+atomic_load(Modules) ->
+    case do_prepare_loading(Modules) of
+	{ok,Prep} ->
+	    finish_loading(Prep, false);
+	{error,_}=Error ->
+	    Error;
+	badarg ->
+	    error(function_clause, [Modules])
+    end.
+
+-spec prepare_loading(Modules) ->
+           {'ok',Prepared} | {'error',[{Module,What}]} when
+      Modules :: [Module | {Module, Filename, Binary}],
+      Module :: module(),
+      Filename :: file:filename(),
+      Binary :: binary(),
+      Prepared :: prepared_code(),
+      What :: 'badfile' | 'nofile' | 'on_load_not_allowed' | 'duplicated'.
+
+prepare_loading(Modules) ->
+    case do_prepare_loading(Modules) of
+	{ok,Prep} ->
+	    {ok,{?PREPARED,Prep}};
+	{error,_}=Error ->
+	    Error;
+	badarg ->
+	    error(function_clause, [Modules])
+    end.
+
+-spec finish_loading(Prepared) -> 'ok' | {'error',[{Module,What}]} when
+      Prepared :: prepared_code(),
+      Module :: module(),
+      What :: 'not_purged' | 'sticky_directory' | 'pending_on_load'.
+
+finish_loading({?PREPARED,Prepared}=Arg) when is_list(Prepared) ->
+    case verify_prepared(Prepared) of
+	ok ->
+	    finish_loading(Prepared, false);
+	error ->
+	    error(function_clause, [Arg])
+    end.
+
+partition_load([Item|T], Bs, Ms) ->
+    case Item of
+	{M,File,Bin} when is_atom(M) andalso
+			  is_list(File) andalso
+			  is_binary(Bin) ->
+	    partition_load(T, [Item|Bs], Ms);
+	M when is_atom(M) ->
+	    partition_load(T, Bs, [Item|Ms]);
+	_ ->
+	    error
+    end;
+partition_load([], Bs, Ms) ->
+    {Bs,Ms}.
+
+do_prepare_loading(Modules) ->
+    case partition_load(Modules, [], []) of
+	{ModBins,Ms} ->
+	    case prepare_loading_1(ModBins, Ms) of
+		{error,_}=Error ->
+		    Error;
+		Prep when is_list(Prep) ->
+		    {ok,Prep}
+	    end;
+	error ->
+	    badarg
+    end.
+
+prepare_loading_1(ModBins, Ms) ->
+    %% erlang:finish_loading/1 *will* detect duplicates.
+    %% However, we want to detect all errors that can be detected
+    %% by only examining the input data before call the LastAction
+    %% fun.
+    case prepare_check_uniq(ModBins, Ms) of
+	ok ->
+	    prepare_loading_2(ModBins, Ms);
+	Error ->
+	    Error
+    end.
+
+prepare_loading_2(ModBins, Ms) ->
+    {Prep0,Error0} = load_bins(ModBins),
+    {Prep1,Error1} = load_mods(Ms),
+    case Error0 ++ Error1 of
+	[] ->
+	    prepare_loading_3(Prep0 ++ Prep1);
+	[_|_]=Error ->
+	    {error,Error}
+    end.
+
+prepare_loading_3(Prep) ->
+    case partition_on_load(Prep) of
+	{[_|_]=OnLoad,_} ->
+	    Error = [{M,on_load_not_allowed} || {M,_} <- OnLoad],
+	    {error,Error};
+	{[],_} ->
+	    Prep
+    end.
+
+prepare_check_uniq([{M,_,_}|T], Ms) ->
+    prepare_check_uniq(T, [M|Ms]);
+prepare_check_uniq([], Ms) ->
+    prepare_check_uniq_1(lists:sort(Ms), []).
+
+prepare_check_uniq_1([M|[M|_]=Ms], Acc) ->
+    prepare_check_uniq_1(Ms, [{M,duplicated}|Acc]);
+prepare_check_uniq_1([_|Ms], Acc) ->
+    prepare_check_uniq_1(Ms, Acc);
+prepare_check_uniq_1([], []) ->
+    ok;
+prepare_check_uniq_1([], [_|_]=Errors) ->
+    {error,Errors}.
+
+partition_on_load(Prep) ->
+    P = fun({_,{Bin,_,_}}) ->
+		erlang:has_prepared_code_on_load(Bin)
+	end,
+    lists:partition(P, Prep).
+
+verify_prepared([{M,{Prep,Name,_Native}}|T])
+  when is_atom(M), is_binary(Prep), is_list(Name) ->
+    try erlang:has_prepared_code_on_load(Prep) of
+	false ->
+	    verify_prepared(T);
+	_ ->
+	    error
+    catch
+	error:_ ->
+	    error
+    end;
+verify_prepared([]) ->
+    ok;
+verify_prepared(_) ->
+    error.
+
+finish_loading(Prepared0, EnsureLoaded) ->
+    Prepared = [{M,{Bin,File}} || {M,{Bin,File,_}} <- Prepared0],
+    Native0 = [{M,Code} || {M,{_,_,Code}} <- Prepared0,
+			   Code =/= undefined],
+    case call({finish_loading,Prepared,EnsureLoaded}) of
+	ok ->
+	    finish_loading_native(Native0);
+	{error,Errors}=E when EnsureLoaded ->
+	    S0 = sofs:relation(Errors),
+	    S1 = sofs:domain(S0),
+	    R0 = sofs:relation(Native0),
+	    R1 = sofs:drestriction(R0, S1),
+	    Native = sofs:to_external(R1),
+	    finish_loading_native(Native),
+	    E;
+	{error,_}=E ->
+	    E
+    end.
+
+finish_loading_native([{Mod,Code}|Ms]) ->
+    _ = load_native_partial(Mod, Code),
+    finish_loading_native(Ms);
+finish_loading_native([]) ->
+    ok.
+
+load_mods([]) ->
+    {[],[]};
+load_mods(Mods) ->
+    Path = get_path(),
+    F = prepare_loading_fun(),
+    {ok,{Succ,Error0}} = erl_prim_loader:get_modules(Mods, F, Path),
+    Error = [case E of
+		 badfile -> {M,E};
+		 _ -> {M,nofile}
+	     end || {M,E} <- Error0],
+    {Succ,Error}.
+
+load_bins([]) ->
+    {[],[]};
+load_bins(BinItems) ->
+    F = prepare_loading_fun(),
+    do_par(F, BinItems).
+
+-type prep_fun_type() :: fun((module(), file:filename(), binary()) ->
+				    {ok,_} | {error,_}).
+
+-spec prepare_loading_fun() -> prep_fun_type().
+
+prepare_loading_fun() ->
+    GetNative = get_native_fun(),
+    fun(Mod, FullName, Beam) ->
+	    case erlang:prepare_loading(Mod, Beam) of
+		Prepared when is_binary(Prepared) ->
+		    {ok,{Prepared,FullName,GetNative(Beam)}};
+		{error,_}=Error ->
+		    Error
+	    end
+    end.
+
+get_native_fun() ->
+    Architecture = erlang:system_info(hipe_architecture),
+    try hipe_unified_loader:chunk_name(Architecture) of
+	ChunkTag ->
+	    fun(Beam) -> code:get_chunk(Beam, ChunkTag) end
+    catch _:_ ->
+	    fun(_) -> undefined end
+    end.
+
+do_par(Fun, L) ->
+    {_,Ref} = spawn_monitor(do_par_fun(Fun, L)),
+    receive
+	{'DOWN',Ref,process,_,Res} ->
+	    Res
+    end.
+
+-spec do_par_fun(prep_fun_type(), list()) -> fun(() -> no_return()).
+
+do_par_fun(Fun, L) ->
+    fun() ->
+	    _ = [spawn_monitor(do_par_fun_2(Fun, Item)) ||
+		    Item <- L],
+	    exit(do_par_recv(length(L), [], []))
+    end.
+
+-spec do_par_fun_2(prep_fun_type(),
+		   {module(),file:filename(),binary()}) ->
+			  fun(() -> no_return()).
+
+do_par_fun_2(Fun, Item) ->
+    fun() ->
+	    {Mod,Filename,Bin} = Item,
+	    try Fun(Mod, Filename, Bin) of
+		{ok,Res} ->
+		    exit({good,{Mod,Res}});
+		{error,Error} ->
+		    exit({bad,{Mod,Error}})
+	    catch
+		_:Error ->
+		    exit({bad,{Mod,Error}})
+	    end
+    end.
+
+do_par_recv(0, Good, Bad) ->
+    {Good,Bad};
+do_par_recv(N, Good, Bad) ->
+    receive
+	{'DOWN',_,process,_,{good,Res}} ->
+	    do_par_recv(N-1, [Res|Good], Bad);
+	{'DOWN',_,process,_,{bad,Res}} ->
+	    do_par_recv(N-1, Good, [Res|Bad])
+    end.
+
 %%-----------------------------------------------------------------
 
 call(Req) ->
-    code_server:call(code_server, Req).
+    code_server:call(Req).
 
 -spec start_link() -> {'ok', pid()} | {'error', 'crash'}.
 start_link() ->
-    start_link([stick]).
-
--spec start_link(Flags :: [atom()]) -> {'ok', pid()} | {'error', 'crash'}.
-start_link(Flags) ->
-    do_start(Flags).
+    do_start().
     
 %%-----------------------------------------------------------------
 %% In the init phase, code must not use any modules not yet loaded,
@@ -321,35 +639,21 @@ start_link(Flags) ->
 %% us, so the module is loaded.
 %%-----------------------------------------------------------------
 
-do_start(Flags) ->
+do_start() ->
+    maybe_warn_for_cache(),
     load_code_server_prerequisites(),
 
-    Mode = get_mode(Flags),
-    case init:get_argument(root) of 
-	{ok,[[Root0]]} ->
-	    Root = filename:join([Root0]), % Normalize.  Use filename
-	    case code_server:start_link([Root,Mode]) of
-		{ok,_Pid} = Ok2 ->
-		    if
-			Mode =:= interactive ->
-			    case lists:member(stick, Flags) of
-				true -> do_stick_dirs();
-				_    -> ok
-			    end;
-			true ->
-			    ok
-		    end,
-		    %% Quietly load native code for all modules loaded so far
-                    Architecture = erlang:system_info(hipe_architecture),
-		    load_native_code_for_all_loaded(Architecture),
-		    Ok2;
-		Other ->
-		    Other
-	    end;
-	Other ->
-	    error_logger:error_msg("Can not start code server ~w ~n", [Other]),
-	    {error, crash}
-    end.
+    {ok,[[Root0]]} = init:get_argument(root),
+    Mode = start_get_mode(),
+    Root = filename:join([Root0]),	    % Normalize.
+    Res = code_server:start_link([Root,Mode]),
+
+    maybe_stick_dirs(Mode),
+
+    %% Quietly load native code for all modules loaded so far.
+    Architecture = erlang:system_info(hipe_architecture),
+    load_native_code_for_all_loaded(Architecture),
+    Res.
 
 %% Make sure that all modules that the code_server process calls
 %% (directly or indirectly) are loaded. Otherwise the code_server
@@ -369,6 +673,16 @@ load_code_server_prerequisites() ->
     _ = [M = M:module_info(module) || M <- Needed],
     ok.
 
+maybe_stick_dirs(interactive) ->
+    case init:get_argument(nostick) of
+	{ok,[[]]} ->
+	    ok;
+	_ ->
+	    do_stick_dirs()
+    end;
+maybe_stick_dirs(_) ->
+    ok.
+
 do_stick_dirs() ->
     do_s(compiler),
     do_s(stdlib),
@@ -386,19 +700,12 @@ do_s(Lib) ->
 	    ok
     end.
 
-get_mode(Flags) ->
-    case lists:member(embedded, Flags) of
-	true ->
+start_get_mode() ->
+    case init:get_argument(mode) of
+	{ok,[["embedded"]]} ->
 	    embedded;
-	_Otherwise -> 
-	    case init:get_argument(mode) of
-		{ok,[["embedded"]]} ->
-		    embedded;
-		{ok,[["minimal"]]} ->
-		    minimal;
-		_Else ->
-		    interactive
-	    end
+	_ ->
+	    interactive
     end.
 
 %% Find out which version of a particular module we would
@@ -452,30 +759,14 @@ which(File, Base, [Directory|Tail]) ->
       Filename :: file:filename(),
       Absname :: file:filename().
 where_is_file(File) when is_list(File) ->
-    case call({is_cached,File}) of
-	no ->
-	    Path = get_path(),
-	    which(File, ".", Path);
-	Dir ->
-	    filename:join(Dir, File)
-    end.
+    Path = get_path(),
+    which(File, ".", Path).
 
 -spec where_is_file(Path :: file:filename(), Filename :: file:filename()) ->
         file:filename() | 'non_existing'.
 
 where_is_file(Path, File) when is_list(Path), is_list(File) ->
-    CodePath = get_path(),
-    if
-	Path =:= CodePath ->
-	    case call({is_cached, File}) of
-		no ->
-		    which(File, ".", Path);
-		Dir ->
-		    filename:join(Dir, File)
-	    end;
-	true ->
-	    which(File, ".", Path)
-    end.
+    which(File, ".", Path).
 
 -spec set_primary_archive(ArchiveFile :: file:filename(),
 			  ArchiveBin :: binary(),
@@ -553,6 +844,22 @@ has_ext(Ext, Extlen, File) ->
     end.
 
 %%%
+%%% Warning for deprecated code path cache.
+%%%
+
+maybe_warn_for_cache() ->
+    case init:get_argument(code_path_cache) of
+	{ok, _} ->
+	    cache_warning();
+	error ->
+	    ok
+    end.
+
+cache_warning() ->
+    W = "The code path cache functionality has been removed",
+    error_logger:warning_report(W).
+
+%%%
 %%% Silently load native code for all modules loaded so far.
 %%%
 
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
index e461c95d19..fb08b4c22b 100644
--- a/lib/kernel/src/code_server.erl
+++ b/lib/kernel/src/code_server.erl
@@ -22,29 +22,28 @@
 %% This file holds the server part of the code_server.
 
 -export([start_link/1,
-	 call/2,
-	 system_continue/3, 
-	 system_terminate/4,
+	 call/1,
 	 system_code_change/4,
 	 error_msg/2, info_msg/2
 	]).
 
 -include_lib("kernel/include/file.hrl").
+-include_lib("stdlib/include/ms_transform.hrl").
 
 -import(lists, [foreach/2]).
 
--define(ANY_NATIVE_CODE_LOADED, any_native_code_loaded).
+-type on_load_item() :: {reference(),module(),file:name_all(),[pid()]}.
 
--record(state, {supervisor,
-		root,
-		path,
-		moddb,
-		namedb,
-		cache = no_cache,
-		mode = interactive,
-		on_load = []}).
+-record(state, {supervisor :: pid(),
+		root :: file:name_all(),
+		path :: [file:name_all()],
+		moddb :: ets:tab(),
+		namedb :: ets:tab(),
+		mode = interactive :: 'interactive' | 'embedded',
+		on_load = [] :: [on_load_item()]}).
 -type state() :: #state{}.
 
+-spec start_link([term()]) -> {'ok', pid()}.
 start_link(Args) ->
     Ref = make_ref(),
     Parent = self(),
@@ -59,7 +58,7 @@ start_link(Args) ->
 %% Init the code_server process.
 %% -----------------------------------------------------------
 
-init(Ref, Parent, [Root,Mode0]) ->
+init(Ref, Parent, [Root,Mode]) ->
     register(?MODULE, self()),
     process_flag(trap_exit, true),
 
@@ -68,13 +67,9 @@ init(Ref, Parent, [Root,Mode0]) ->
 		    %% Pre-loaded modules are always sticky.
 		    ets:insert(Db, [{M,preloaded},{{sticky,M},true}])
 	    end, erlang:pre_loaded()),
-    ets:insert(Db, init:fetch_loaded()),
-
-    Mode = 
-	case Mode0 of
-	    minimal -> interactive;
-	    _       -> Mode0
-	end,
+    Loaded0 = init:fetch_loaded(),
+    Loaded = [{M,filename:join([P])} || {M,P} <- Loaded0], %Normalize.
+    ets:insert(Db, Loaded),
 
     IPath =
 	case Mode of
@@ -89,24 +84,15 @@ init(Ref, Parent, [Root,Mode0]) ->
 	end,
 
     Path = add_loader_path(IPath, Mode),
-    State0 = #state{root = Root,
-		    path = Path,
-		    moddb = Db,
-		    namedb = init_namedb(Path),
-		    mode = Mode},
-
-    State =
-	case init:get_argument(code_path_cache) of
-	    {ok, _} -> 
-		create_cache(State0);
-	    error -> 
-		State0
-	end,
-
-    put(?ANY_NATIVE_CODE_LOADED, false),
+    State = #state{supervisor = Parent,
+		   root = Root,
+		   path = Path,
+		   moddb = Db,
+		   namedb = init_namedb(Path),
+		   mode = Mode},
 
     Parent ! {Ref,{ok,self()}},
-    loop(State#state{supervisor = Parent}).
+    loop(State).
 
 get_user_lib_dirs() ->
     case os:getenv("ERL_LIBS") of
@@ -142,8 +128,9 @@ split_paths([C|T], S, Path, Paths) ->
 split_paths([], _S, Path, Paths) ->
     lists:reverse(Paths, [lists:reverse(Path)]).
 
-call(Name, Req) ->
-    Name ! {code_call, self(), Req},
+-spec call(term()) -> term().
+call(Req) ->
+    ?MODULE ! {code_call, self(), Req},
     receive 
 	{?MODULE, Reply} ->
 	    Reply
@@ -255,65 +242,39 @@ handle_call({dir,Dir}, {_From,_Tag}, S) ->
     Resp = do_dir(Root,Dir,S#state.namedb),
     {reply,Resp,S};
 
-handle_call({load_file,Mod}, Caller, St) ->
-    case modp(Mod) of
-	false ->
-	    {reply,{error,badarg},St};
-	true ->
-	    load_file(Mod, Caller, St)
-    end;
+handle_call({load_file,Mod}, Caller, St) when is_atom(Mod) ->
+    load_file(Mod, Caller, St);
 
 handle_call({add_path,Where,Dir0}, {_From,_Tag},
-	    #state{cache=Cache0,namedb=Namedb,path=Path0}=S) ->
-    case Cache0 of
-	no_cache ->
-	    {Resp,Path} = add_path(Where, Dir0, Path0, Namedb),
-	    {reply,Resp,S#state{path=Path}};
-	_ ->
-	    Dir = absname(Dir0), %% Cache always expands the path 
-	    {Resp,Path} = add_path(Where, Dir, Path0, Namedb),
-	    Cache = update_cache([Dir], Where, Cache0),
-	    {reply,Resp,S#state{path=Path,cache=Cache}}
-    end;
+	    #state{namedb=Namedb,path=Path0}=S) ->
+    {Resp,Path} = add_path(Where, Dir0, Path0, Namedb),
+    {reply,Resp,S#state{path=Path}};
 
 handle_call({add_paths,Where,Dirs0}, {_From,_Tag},
-	    #state{cache=Cache0,namedb=Namedb,path=Path0}=S) ->
-    case Cache0 of
-	no_cache ->
-	    {Resp,Path} = add_paths(Where, Dirs0, Path0, Namedb),
-	    {reply,Resp,S#state{path=Path}};
-	_ ->
-	    %% Cache always expands the path 
-	    Dirs = [absname(Dir) || Dir <- Dirs0], 
-	    {Resp,Path} = add_paths(Where, Dirs, Path0, Namedb),
-	    Cache=update_cache(Dirs,Where,Cache0),
-	    {reply,Resp,S#state{cache=Cache,path=Path}}
-    end;
+	    #state{namedb=Namedb,path=Path0}=S) ->
+    {Resp,Path} = add_paths(Where, Dirs0, Path0, Namedb),
+    {reply,Resp,S#state{path=Path}};
 
 handle_call({set_path,PathList}, {_From,_Tag},
 	    #state{path=Path0,namedb=Namedb}=S) ->
     {Resp,Path,NewDb} = set_path(PathList, Path0, Namedb),
-    {reply,Resp,rehash_cache(S#state{path=Path,namedb=NewDb})};
+    {reply,Resp,S#state{path=Path,namedb=NewDb}};
 
 handle_call({del_path,Name}, {_From,_Tag},
 	    #state{path=Path0,namedb=Namedb}=S) ->
     {Resp,Path} = del_path(Name, Path0, Namedb),
-    {reply,Resp,rehash_cache(S#state{path=Path})};
+    {reply,Resp,S#state{path=Path}};
 
 handle_call({replace_path,Name,Dir}, {_From,_Tag},
 	    #state{path=Path0,namedb=Namedb}=S) ->
     {Resp,Path} = replace_path(Name, Dir, Path0, Namedb),
-    {reply,Resp,rehash_cache(S#state{path=Path})};
-
-handle_call(rehash, {_From,_Tag}, S0) ->
-    S = create_cache(S0),
-    {reply,ok,S};
+    {reply,Resp,S#state{path=Path}};
 
 handle_call(get_path, {_From,_Tag}, S) ->
     {reply,S#state.path,S};
 
 %% Messages to load, delete and purge modules/files.
-handle_call({load_abs,File,Mod}, Caller, S) ->
+handle_call({load_abs,File,Mod}, Caller, S) when is_atom(Mod) ->
     case modp(File) of
 	false ->
 	    {reply,{error,badarg},S};
@@ -321,75 +282,60 @@ handle_call({load_abs,File,Mod}, Caller, S) ->
 	    load_abs(File, Mod, Caller, S)
     end;
 
-handle_call({load_binary,Mod,File,Bin}, Caller, S) ->
+handle_call({load_binary,Mod,File,Bin}, Caller, S) when is_atom(Mod) ->
     do_load_binary(Mod, File, Bin, Caller, S);
 
 handle_call({load_native_partial,Mod,Bin}, {_From,_Tag}, S) ->
     Architecture = erlang:system_info(hipe_architecture),
     Result = (catch hipe_unified_loader:load(Mod, Bin, Architecture)),
-    Status = hipe_result_to_status(Result),
+    Status = hipe_result_to_status(Result, S),
     {reply,Status,S};
 
 handle_call({load_native_sticky,Mod,Bin,WholeModule}, {_From,_Tag}, S) ->
     Architecture = erlang:system_info(hipe_architecture),
     Result = (catch hipe_unified_loader:load_module(Mod, Bin, WholeModule,
                                                     Architecture)),
-    Status = hipe_result_to_status(Result),
+    Status = hipe_result_to_status(Result, S),
     {reply,Status,S};
 
-handle_call({ensure_loaded,Mod0}, Caller, St0) ->
-    Fun = fun (M, St) ->
-		  case erlang:module_loaded(M) of
-		      true ->
-			  {reply,{module,M},St};
-		      false when St#state.mode =:= interactive ->
-			  load_file(M, Caller, St);
-		      false -> 
-			  {reply,{error,embedded},St}
-		  end
-	  end,
-    do_mod_call(Fun, Mod0, {error,badarg}, St0);
-
-handle_call({delete,Mod0}, {_From,_Tag}, S) ->
-    Fun = fun (M, St) ->
-		  case catch erlang:delete_module(M) of
-		      true ->
-			  ets:delete(St#state.moddb, M),
-			  {reply,true,St};
-		      _ -> 
-			  {reply,false,St}
-		  end
-	  end,
-    do_mod_call(Fun, Mod0, false, S);
+handle_call({ensure_loaded,Mod}, Caller, St) when is_atom(Mod) ->
+    case erlang:module_loaded(Mod) of
+	true ->
+	    {reply,{module,Mod},St};
+	false when St#state.mode =:= interactive ->
+	    load_file(Mod, Caller, St);
+	false ->
+	    {reply,{error,embedded},St}
+    end;
 
-handle_call({purge,Mod0}, {_From,_Tag}, St0) ->
-    do_mod_call(fun (M, St) ->
-			{reply,do_purge(M),St}
-		end, Mod0, false, St0);
+handle_call({delete,Mod}, {_From,_Tag}, St) when is_atom(Mod) ->
+    case catch erlang:delete_module(Mod) of
+	true ->
+	    ets:delete(St#state.moddb, Mod),
+	    {reply,true,St};
+	_ ->
+	    {reply,false,St}
+    end;
+
+handle_call({purge,Mod}, {_From,_Tag}, St) when is_atom(Mod) ->
+    {reply,do_purge(Mod),St};
 
-handle_call({soft_purge,Mod0}, {_From,_Tag}, St0) ->
-    do_mod_call(fun (M, St) ->
-			{reply,do_soft_purge(M),St}
-		end, Mod0, true, St0);
+handle_call({soft_purge,Mod}, {_From,_Tag}, St) when is_atom(Mod) ->
+    {reply,do_soft_purge(Mod),St};
 
-handle_call({is_loaded,Mod0}, {_From,_Tag}, St0) ->
-    do_mod_call(fun (M, St) ->
-			{reply,is_loaded(M, St#state.moddb),St}
-		end, Mod0, false, St0);
+handle_call({is_loaded,Mod}, {_From,_Tag}, St) when is_atom(Mod) ->
+    {reply,is_loaded(Mod, St#state.moddb),St};
 
 handle_call(all_loaded, {_From,_Tag}, S) ->
     Db = S#state.moddb,
     {reply,all_loaded(Db),S};
 
-handle_call({get_object_code,Mod0}, {_From,_Tag}, St0) ->
-    Fun = fun(M, St) ->
-		  Path = St#state.path,
-		  case mod_to_bin(Path, atom_to_list(M)) of
-		      {_,Bin,FName} -> {reply,{M,Bin,FName},St};
-		      Error -> {reply,Error,St}
-		  end
-	  end,
-    do_mod_call(Fun, Mod0, error, St0);
+handle_call({get_object_code,Mod}, {_From,_Tag}, St) when is_atom(Mod) ->
+    Path = St#state.path,
+    case mod_to_bin(Path, Mod) of
+	{_,Bin,FName} -> {reply,{Mod,Bin,FName},St};
+	Error -> {reply,Error,St}
+    end;
 
 handle_call({is_sticky, Mod}, {_From,_Tag}, S) ->
     Db = S#state.moddb,
@@ -398,9 +344,6 @@ handle_call({is_sticky, Mod}, {_From,_Tag}, S) ->
 handle_call(stop,{_From,_Tag}, S) ->
     {stop,normal,stopped,S};
 
-handle_call({is_cached,_File}, {_From,_Tag}, S=#state{cache=no_cache}) ->
-    {reply, no, S};
-
 handle_call({set_primary_archive, File, ArchiveBin, FileInfo, ParserFun}, {_From,_Tag}, S=#state{mode=Mode}) ->
     case erl_prim_loader:set_primary_archive(File, ArchiveBin, FileInfo, ParserFun) of
 	{ok, Files} ->
@@ -409,107 +352,16 @@ handle_call({set_primary_archive, File, ArchiveBin, FileInfo, ParserFun}, {_From
 	    {reply, Error, S}
     end;
 
-handle_call({is_cached,File}, {_From,_Tag}, S=#state{cache=Cache}) ->
-    ObjExt = objfile_extension(),
-    Ext = filename:extension(File),
-    Type = case Ext of
-	       ObjExt -> obj;
-	       ".app" -> app;
-	       _ -> undef
-	   end,
-    if Type =:= undef -> 
-	    {reply, no, S};
-       true ->
-	    Key = {Type,list_to_atom(filename:rootname(File, Ext))},
-	    case ets:lookup(Cache, Key) of
-		[] -> 
-		    {reply, no, S};
-		[{Key,Dir}] ->
-		    {reply, Dir, S}
-	    end
-    end;
-
 handle_call(get_mode, {_From,_Tag}, S=#state{mode=Mode}) ->
     {reply, Mode, S};
 
+handle_call({finish_loading,Prepared,EnsureLoaded}, {_,_}, S) ->
+    {reply,finish_loading(Prepared, EnsureLoaded, S),S};
+
 handle_call(Other,{_From,_Tag}, S) ->			
     error_msg(" ** Codeserver*** ignoring ~w~n ",[Other]),
     {noreply,S}.
 
-do_mod_call(Action, Module, _Error, St) when is_atom(Module) ->
-    Action(Module, St);
-do_mod_call(Action, Module, Error, St) ->
-    try list_to_atom(Module) of
-	Atom when is_atom(Atom) ->
-	    Action(Atom, St)
-    catch
-	error:badarg ->
-	    {reply,Error,St}
-    end.
-
-%% --------------------------------------------------------------
-%% Cache functions 
-%% --------------------------------------------------------------
-
-create_cache(St = #state{cache = no_cache}) ->
-    Cache = ets:new(code_cache, [protected]),
-    rehash_cache(Cache, St);
-create_cache(St) ->
-    rehash_cache(St).
-
-rehash_cache(St = #state{cache = no_cache}) ->
-    St;
-rehash_cache(St = #state{cache = OldCache}) ->
-    ets:delete(OldCache), 
-    Cache = ets:new(code_cache, [protected]),
-    rehash_cache(Cache, St).
-
-rehash_cache(Cache, St = #state{path = Path}) ->
-    Exts = [{obj,objfile_extension()}, {app,".app"}],
-    {Cache,NewPath} = locate_mods(lists:reverse(Path), first, Exts, Cache, []),
-    St#state{cache = Cache, path=NewPath}.
-
-update_cache(Dirs, Where, Cache0) ->
-    Exts = [{obj,objfile_extension()}, {app,".app"}],
-    {Cache, _} = locate_mods(Dirs, Where, Exts, Cache0, []),
-    Cache.
-
-locate_mods([Dir0|Path], Where, Exts, Cache, Acc) ->
-    Dir = absname(Dir0), %% Cache always expands the path 
-    case erl_prim_loader:list_dir(Dir) of
-	{ok, Files} -> 
-	    Cache = filter_mods(Files, Where, Exts, Dir, Cache),
-	    locate_mods(Path, Where, Exts, Cache, [Dir|Acc]);
-	error ->
-	    locate_mods(Path, Where, Exts, Cache, Acc)
-    end;
-locate_mods([], _, _, Cache, Path) ->
-    {Cache,Path}.
-
-filter_mods([File|Rest], Where, Exts, Dir, Cache) ->
-    Ext = filename:extension(File),
-    Root = list_to_atom(filename:rootname(File, Ext)),
-    case lists:keyfind(Ext, 2, Exts) of
-	{Type, _} ->
-	    Key = {Type,Root},
-	    case Where of
-		first ->
-		    true = ets:insert(Cache, {Key,Dir});
-		last ->
-		    case ets:lookup(Cache, Key) of
-			[] ->
-			    true = ets:insert(Cache, {Key,Dir});
-			_ ->
-			    ignore
-		    end
-	    end;
-	false ->
-	    ok
-    end,
-    filter_mods(Rest, Where, Exts, Dir, Cache);
-filter_mods([], _, _, _, Cache) ->
-    Cache.
-
 %% --------------------------------------------------------------
 %% Path handling functions.
 %% --------------------------------------------------------------
@@ -1207,9 +1059,9 @@ add_paths(_,_,Path,_) ->
     {ok,Path}.
 
 do_load_binary(Module, File, Binary, Caller, St) ->
-    case modp(Module) andalso modp(File) andalso is_binary(Binary) of
+    case modp(File) andalso is_binary(Binary) of
 	true ->
-	    case erlang:module_loaded(to_atom(Module)) of
+	    case erlang:module_loaded(Module) of
 		true -> do_purge(Module);
 		false -> ok
 	    end,
@@ -1222,15 +1074,10 @@ modp(Atom) when is_atom(Atom) -> true;
 modp(List) when is_list(List) -> int_list(List);
 modp(_)                       -> false.
 
-load_abs(File, Mod0, Caller, St) ->
+load_abs(File, Mod, Caller, St) ->
     Ext = objfile_extension(),
     FileName0 = lists:concat([File, Ext]),
     FileName = absname(FileName0),
-    Mod = if Mod0 =:= [] ->
-		  list_to_atom(filename:basename(FileName0, Ext));
-	     true ->
-		  Mod0
-	  end,
     case erl_prim_loader:get_file(FileName) of
 	{ok,Bin,_} ->
 	    try_load_module(FileName, Mod, Bin, Caller, St);
@@ -1238,21 +1085,10 @@ load_abs(File, Mod0, Caller, St) ->
 	    {reply,{error,nofile},St}
     end.
 
-try_load_module(Mod, Dir, Caller, St) ->
-    File = filename:append(Dir, to_list(Mod) ++
-			   objfile_extension()),
-    case erl_prim_loader:get_file(File) of
-	error -> 
-	    {reply,error,St};
-	{ok,Binary,FName} ->
-	    try_load_module(absname(FName), Mod, Binary, Caller, St)
-    end.
-
 try_load_module(File, Mod, Bin, {From,_}=Caller, St0) ->
-    M = to_atom(Mod),
-    case pending_on_load(M, From, St0) of
+    case pending_on_load(Mod, From, St0) of
 	no ->
-	    try_load_module_1(File, M, Bin, Caller, St0);
+	    try_load_module_1(File, Mod, Bin, Caller, St0);
 	{yes,St} ->
 	    {noreply,St}
     end.
@@ -1271,9 +1107,9 @@ try_load_module_2(File, Mod, Bin, Caller, undefined, St) ->
     try_load_module_3(File, Mod, Bin, Caller, undefined, St);
 try_load_module_2(File, Mod, Bin, Caller, Architecture,
                   #state{moddb=Db}=St) ->
-    case catch load_native_code(Mod, Bin, Architecture) of
+    case catch hipe_unified_loader:load_native_code(Mod, Bin, Architecture) of
         {module,Mod} = Module ->
-            ets:insert(Db, {Mod,File}),
+	    ets:insert(Db, [{{native,Mod},true},{Mod,File}]),
             {reply,Module,St};
         no_native ->
             try_load_module_3(File, Mod, Bin, Caller, Architecture, St);
@@ -1287,7 +1123,7 @@ try_load_module_3(File, Mod, Bin, Caller, Architecture,
     case erlang:load_module(Mod, Bin) of
         {module,Mod} = Module ->
             ets:insert(Db, {Mod,File}),
-            post_beam_load(Mod, Architecture),
+            post_beam_load([Mod], Architecture, St),
             {reply,Module,St};
         {error,on_load} ->
             handle_on_load(Mod, File, Caller, St);
@@ -1296,79 +1132,45 @@ try_load_module_3(File, Mod, Bin, Caller, Architecture,
             {reply,Error,St}
     end.
 
-load_native_code(Mod, Bin, Architecture) ->
-    %% During bootstrapping of Open Source Erlang, we don't have any hipe
-    %% loader modules, but the Erlang emulator might be hipe enabled.
-    %% Therefore we must test for that the loader modules are available
-    %% before trying to to load native code.
-    case erlang:module_loaded(hipe_unified_loader) of
-	false ->
-	    no_native;
-	true ->
-	    Result = hipe_unified_loader:load_native_code(Mod, Bin,
-                                                          Architecture),
-	    case Result of
-		{module,_} ->
-		    put(?ANY_NATIVE_CODE_LOADED, true);
-		_ ->
-		    ok
-	    end,
-	    Result
-    end.
-
-hipe_result_to_status(Result) ->
+hipe_result_to_status(Result, #state{moddb=Db}) ->
     case Result of
-	{module,_} ->
-	    put(?ANY_NATIVE_CODE_LOADED, true),
+	{module,Mod} ->
+	    ets:insert(Db, [{{native,Mod},true}]),
 	    Result;
 	_ ->
 	    {error,Result}
     end.
 
-post_beam_load(Mod, Architecture) ->
+post_beam_load(_, undefined, _) ->
+    %% HiPE is disabled.
+    ok;
+post_beam_load(Mods0, _Architecture, #state{moddb=Db}) ->
     %% post_beam_load/2 can potentially be very expensive because it
-    %% blocks multi-scheduling; thus we want to avoid the call if we
-    %% know that it is not needed.
-    case get(?ANY_NATIVE_CODE_LOADED) of
-	true -> hipe_unified_loader:post_beam_load(Mod, Architecture);
-	false -> ok
-    end.
+    %% blocks multi-scheduling. Therefore, we only want to call
+    %% it with modules that are known to have native code loaded.
+    Mods = [M || M <- Mods0, ets:member(Db, {native,M})],
+    hipe_unified_loader:post_beam_load(Mods).
 
 int_list([H|T]) when is_integer(H) -> int_list(T);
 int_list([_|_])                    -> false;
 int_list([])                       -> true.
 
-load_file(Mod0, {From,_}=Caller, St0) ->
-    Mod = to_atom(Mod0),
+load_file(Mod, {From,_}=Caller, St0) ->
     case pending_on_load(Mod, From, St0) of
 	no -> load_file_1(Mod, Caller, St0);
 	{yes,St} -> {noreply,St}
     end.
 
-load_file_1(Mod, Caller, #state{path=Path,cache=no_cache}=St) ->
+load_file_1(Mod, Caller, #state{path=Path}=St) ->
     case mod_to_bin(Path, Mod) of
 	error ->
 	    {reply,{error,nofile},St};
 	{Mod,Binary,File} ->
-	    try_load_module(File, Mod, Binary, Caller, St)
-    end;
-load_file_1(Mod, Caller, #state{cache=Cache}=St0) ->
-    Key = {obj,Mod},
-    case ets:lookup(Cache, Key) of
-	[] -> 
-	    St = rehash_cache(St0),
-	    case ets:lookup(St#state.cache, Key) of
-		[] -> 
-		    {reply,{error,nofile},St};
-		[{Key,Dir}] ->
-		    try_load_module(Mod, Dir, Caller, St)
-	    end;
-	[{Key,Dir}] ->
-	    try_load_module(Mod, Dir, Caller, St0)
+	    try_load_module_1(File, Mod, Binary, Caller, St)
     end.
 
 mod_to_bin([Dir|Tail], Mod) ->
-    File = filename:append(Dir, to_list(Mod) ++ objfile_extension()),
+    File = filename:append(Dir, atom_to_list(Mod) ++ objfile_extension()),
     case erl_prim_loader:get_file(File) of
 	error -> 
 	    mod_to_bin(Tail, Mod);
@@ -1421,248 +1223,76 @@ absname_vr([[X, $:]|Name], _, _AbsBase) ->
     absname(filename:join(Name), Dcwd).
 
 
-%% do_purge(Module)
-%%  Kill all processes running code from *old* Module, and then purge the
-%%  module. Return true if any processes killed, else false.
-
-do_purge(Mod0) ->
-    Mod = to_atom(Mod0),
-    case erlang:check_old_code(Mod) of
-	false ->
-	    false;
-	true ->
-	    Res = check_proc_code(erlang:processes(), Mod, true),
-	    try
-		erlang:purge_module(Mod)
-	    catch
-		_:_ -> ignore
-	    end,
-	    Res
+is_loaded(M, Db) ->
+    case ets:lookup(Db, M) of
+	[{M,File}] -> {file,File};
+	[] -> false
     end.
 
-%% do_soft_purge(Module)
-%% Purge old code only if no procs remain that run old code.
-%% Return true in that case, false if procs remain (in this
-%% case old code is not purged)
-
-do_soft_purge(Mod0) ->
-    Mod = to_atom(Mod0),
-    case erlang:check_old_code(Mod) of
-	false ->
-	    true;
-	true ->
-	    case check_proc_code(erlang:processes(), Mod, false) of
-		false ->
-		    false;
-		true ->
-		    try
-			erlang:purge_module(Mod)
-		    catch
-			_:_ -> ignore
-		    end,
-		    true
-	    end
+do_purge(Mod) ->
+    {_WasOld, DidKill} = erts_code_purger:purge(Mod),
+    DidKill.
+
+do_soft_purge(Mod) ->
+    erts_code_purger:soft_purge(Mod).
+
+
+%%%
+%%% Loading of multiple modules in parallel.
+%%%
+
+finish_loading(Prepared, EnsureLoaded, #state{moddb=Db}=St) ->
+    Ps = [fun(L) -> finish_loading_ensure(L, EnsureLoaded) end,
+	  fun(L) -> abort_if_pending_on_load(L, St) end,
+	  fun(L) -> abort_if_sticky(L, Db) end,
+	  fun(L) -> do_finish_loading(L, St) end],
+    run(Ps, Prepared).
+
+finish_loading_ensure(Prepared, true) ->
+    {ok,[P || {M,_}=P <- Prepared, not erlang:module_loaded(M)]};
+finish_loading_ensure(Prepared, false) ->
+    {ok,Prepared}.
+
+abort_if_pending_on_load(L, #state{on_load=[]}) ->
+    {ok,L};
+abort_if_pending_on_load(L, #state{on_load=OnLoad}) ->
+    Pending = [{M,pending_on_load} ||
+		  {M,_} <- L,
+		  lists:keymember(M, 2, OnLoad)],
+    case Pending of
+	[] -> {ok,L};
+	[_|_] -> {error,Pending}
     end.
 
-%%
-%% check_proc_code(Pids, Mod, Hard) - Send asynchronous
-%%   requests to all processes to perform a check_process_code
-%%   operation. Each process will check their own state and
-%%   reply with the result. If 'Hard' equals
-%%   - true, processes that refer 'Mod' will be killed. If
-%%     any processes were killed true is returned; otherwise,
-%%     false.
-%%   - false, and any processes refer 'Mod', false will
-%%     returned; otherwise, true.
-%%
-%%   Requests will be sent to all processes identified by
-%%   Pids at once, but without allowing GC to be performed.
-%%   Check process code operations that are aborted due to
-%%   GC need, will be restarted allowing GC. However, only
-%%   ?MAX_CPC_GC_PROCS outstanding operation allowing GC at
-%%   a time will be allowed. This in order not to blow up
-%%   memory wise.
-%%
-%%   We also only allow ?MAX_CPC_NO_OUTSTANDING_KILLS
-%%   outstanding kills. This both in order to avoid flooding
-%%   our message queue with 'DOWN' messages and limiting the
-%%   amount of memory used to keep references to all
-%%   outstanding kills.
-%%
-
-%% We maybe should allow more than two outstanding
-%% GC requests, but for now we play it safe...
--define(MAX_CPC_GC_PROCS, 2).
--define(MAX_CPC_NO_OUTSTANDING_KILLS, 10).
-
--record(cpc_static, {hard, module, tag}).
-
--record(cpc_kill, {outstanding = [],
-		   no_outstanding = 0,
-		   waiting = [],
-		   killed = false}).
-
-check_proc_code(Pids, Mod, Hard) ->
-    Tag = erlang:make_ref(),
-    CpcS = #cpc_static{hard = Hard,
-		       module = Mod,
-		       tag = Tag},
-    check_proc_code(CpcS, cpc_init(CpcS, Pids, 0), 0, [], #cpc_kill{}, true).
-
-check_proc_code(#cpc_static{hard = true}, 0, 0, [],
-		#cpc_kill{outstanding = [], waiting = [], killed = Killed},
-		true) ->
-    %% No outstanding requests. We did a hard check, so result is whether or
-    %% not we killed any processes...
-    Killed;
-check_proc_code(#cpc_static{hard = false}, 0, 0, [], _KillState, Success) ->
-    %% No outstanding requests and we did a soft check...
-    Success;
-check_proc_code(#cpc_static{hard = false, tag = Tag} = CpcS, NoReq0, NoGcReq0,
-		[], _KillState, false) ->
-    %% Failed soft check; just cleanup the remaining replies corresponding
-    %% to the requests we've sent...
-    {NoReq1, NoGcReq1} = receive
-			     {check_process_code, {Tag, _P, GC}, _Res} ->
-				 case GC of
-				     false -> {NoReq0-1, NoGcReq0};
-				     true -> {NoReq0, NoGcReq0-1}
-				 end
-			 end,
-    check_proc_code(CpcS, NoReq1, NoGcReq1, [], _KillState, false);
-check_proc_code(#cpc_static{tag = Tag} = CpcS, NoReq0, NoGcReq0, NeedGC0,
-		KillState0, Success) ->
-
-    %% Check if we should request a GC operation
-    {NoGcReq1, NeedGC1} = case NoGcReq0 < ?MAX_CPC_GC_PROCS of
-			      GcOpAllowed when GcOpAllowed == false;
-					       NeedGC0 == [] ->
-				  {NoGcReq0, NeedGC0};
-			      _ ->
-				  {NoGcReq0+1, cpc_request_gc(CpcS,NeedGC0)}
-			  end,
-
-    %% Wait for a cpc reply or 'DOWN' message
-    {NoReq1, NoGcReq2, Pid, Result, KillState1} = cpc_recv(Tag,
-							   NoReq0,
-							   NoGcReq1,
-							   KillState0),
-
-    %% Check the result of the reply
-    case Result of
-	aborted ->
-	    %% Operation aborted due to the need to GC in order to
-	    %% determine if the process is referring the module.
-	    %% Schedule the operation for restart allowing GC...
-	    check_proc_code(CpcS, NoReq1, NoGcReq2, [Pid|NeedGC1], KillState1,
-			    Success);
-	false ->
-	    %% Process not referring the module; done with this process...
-	    check_proc_code(CpcS, NoReq1, NoGcReq2, NeedGC1, KillState1,
-			    Success);
-	true ->
-	    %% Process referring the module...
-	    case CpcS#cpc_static.hard of
-		false ->
-		    %% ... and soft check. The whole operation failed so
-		    %% no point continuing; clean up and fail...
-		    check_proc_code(CpcS, NoReq1, NoGcReq2, [], KillState1,
-				    false);
-		true ->
-		    %% ... and hard check; schedule kill of it...
-		    check_proc_code(CpcS, NoReq1, NoGcReq2, NeedGC1,
-				    cpc_sched_kill(Pid, KillState1), Success)
-	    end;
-	'DOWN' ->
-	    %% Handled 'DOWN' message
-	    check_proc_code(CpcS, NoReq1, NoGcReq2, NeedGC1,
-			    KillState1, Success)
+abort_if_sticky(L, Db) ->
+    Sticky = [{M,sticky_directory} || {M,_} <- L, is_sticky(M, Db)],
+    case Sticky of
+	[] -> {ok,L};
+	[_|_] -> {error,Sticky}
     end.
 
-cpc_recv(Tag, NoReq, NoGcReq, #cpc_kill{outstanding = []} = KillState) ->
-    receive
-	{check_process_code, {Tag, Pid, GC}, Res} ->
-	    cpc_handle_cpc(NoReq, NoGcReq, GC, Pid, Res, KillState)
-    end;
-cpc_recv(Tag, NoReq, NoGcReq,
-	 #cpc_kill{outstanding = [R0, R1, R2, R3, R4 | _]} = KillState) ->
-    receive
-	{'DOWN', R, process, _, _} when R == R0;
-					R == R1;
-					R == R2;
-					R == R3;
-					R == R4 ->
-	    cpc_handle_down(NoReq, NoGcReq, R, KillState); 
-	{check_process_code, {Tag, Pid, GC}, Res} ->
-	    cpc_handle_cpc(NoReq, NoGcReq, GC, Pid, Res, KillState)
-    end;
-cpc_recv(Tag, NoReq, NoGcReq, #cpc_kill{outstanding = [R|_]} = KillState) ->
-    receive
-	{'DOWN', R, process, _, _} ->
-	    cpc_handle_down(NoReq, NoGcReq, R, KillState); 
-	{check_process_code, {Tag, Pid, GC}, Res} ->
-	    cpc_handle_cpc(NoReq, NoGcReq, GC, Pid, Res, KillState)
+do_finish_loading(Prepared, #state{moddb=Db}=St) ->
+    MagicBins = [B || {_,{B,_}} <- Prepared],
+    case erlang:finish_loading(MagicBins) of
+	ok ->
+	    MFs = [{M,F} || {M,{_,F}} <- Prepared],
+	    true = ets:insert(Db, MFs),
+	    Ms = [M || {M,_} <- MFs],
+	    Architecture = erlang:system_info(hipe_architecture),
+	    post_beam_load(Ms, Architecture, St),
+	    ok;
+	{Reason,Ms} ->
+	    {error,[{M,Reason} || M <- Ms]}
     end.
 
-cpc_handle_down(NoReq, NoGcReq, R, #cpc_kill{outstanding = Rs,
-					     no_outstanding = N} = KillState) ->
-    {NoReq, NoGcReq, undefined, 'DOWN',
-     cpc_sched_kill_waiting(KillState#cpc_kill{outstanding = cpc_list_rm(R, Rs),
-					       no_outstanding = N-1})}.
-
-cpc_list_rm(R, [R|Rs]) ->
-    Rs;
-cpc_list_rm(R0, [R1|Rs]) ->
-    [R1|cpc_list_rm(R0, Rs)].
-
-cpc_handle_cpc(NoReq, NoGcReq, false, Pid, Res, KillState) ->
-    {NoReq-1, NoGcReq, Pid, Res, KillState};
-cpc_handle_cpc(NoReq, NoGcReq, true, Pid, Res, KillState) ->
-    {NoReq, NoGcReq-1, Pid, Res, KillState}.
-
-cpc_sched_kill_waiting(#cpc_kill{waiting = []} = KillState) ->
-    KillState;
-cpc_sched_kill_waiting(#cpc_kill{outstanding = Rs,
-				 no_outstanding = N,
-				 waiting = [P|Ps]} = KillState) ->
-    R = erlang:monitor(process, P),
-    exit(P, kill),
-    KillState#cpc_kill{outstanding = [R|Rs],
-		       no_outstanding = N+1,
-		       waiting = Ps,
-		       killed = true}.
-
-cpc_sched_kill(Pid, #cpc_kill{no_outstanding = N, waiting = Pids} = KillState)
-  when N >= ?MAX_CPC_NO_OUTSTANDING_KILLS ->
-    KillState#cpc_kill{waiting = [Pid|Pids]};
-cpc_sched_kill(Pid,
-	       #cpc_kill{outstanding = Rs, no_outstanding = N} = KillState) ->
-    R = erlang:monitor(process, Pid),
-    exit(Pid, kill),
-    KillState#cpc_kill{outstanding = [R|Rs],
-		       no_outstanding = N+1,
-		       killed = true}.
-
-cpc_request(#cpc_static{tag = Tag, module = Mod}, Pid, AllowGc) ->
-    erlang:check_process_code(Pid, Mod, [{async, {Tag, Pid, AllowGc}},
-					 {allow_gc, AllowGc}]).
-
-cpc_request_gc(CpcS, [Pid|Pids]) ->
-    cpc_request(CpcS, Pid, true),
-    Pids.
-
-cpc_init(_CpcS, [], NoReqs) ->
-    NoReqs;
-cpc_init(CpcS, [Pid|Pids], NoReqs) ->
-    cpc_request(CpcS, Pid, false),
-    cpc_init(CpcS, Pids, NoReqs+1).
-
-% end of check_proc_code() implementation.
-
-is_loaded(M, Db) ->
-    case ets:lookup(Db, M) of
-	[{M,File}] -> {file,File};
-	[] -> false
+run([F], Data) ->
+    F(Data);
+run([F|Fs], Data0) ->
+    case F(Data0) of
+	{ok,Data} ->
+	    run(Fs, Data);
+	{error,_}=Error ->
+	    Error
     end.
 
 %% -------------------------------------------------------
@@ -1746,26 +1376,16 @@ finish_on_load_report(Mod, Term) ->
 %% -------------------------------------------------------
 
 all_loaded(Db) ->
-    all_l(Db, ets:slot(Db, 0), 1, []).
-
-all_l(_Db, '$end_of_table', _, Acc) ->
-    Acc;
-all_l(Db, ModInfo, N, Acc) ->
-    NewAcc = strip_mod_info(ModInfo,Acc),
-    all_l(Db, ets:slot(Db, N), N + 1, NewAcc).
+    Ms = ets:fun2ms(fun({M,_}=T) when is_atom(M) -> T end),
+    ets:select(Db, Ms).
 
-
-strip_mod_info([{{sticky,_},_}|T], Acc) -> strip_mod_info(T, Acc);
-strip_mod_info([H|T], Acc)              -> strip_mod_info(T, [H|Acc]);
-strip_mod_info([], Acc)                 -> Acc.
-
-% error_msg(Format) ->
-%     error_msg(Format,[]).
+-spec error_msg(io:format(), [term()]) -> 'ok'.
 error_msg(Format, Args) ->
     Msg = {notify,{error, group_leader(), {self(), Format, Args}}},
     error_logger ! Msg,
     ok.
 
+-spec info_msg(io:format(), [term()]) -> 'ok'.
 info_msg(Format, Args) ->
     Msg = {notify,{info_msg, group_leader(), {self(), Format, Args}}},
     error_logger ! Msg,
@@ -1779,6 +1399,3 @@ archive_extension() ->
 
 to_list(X) when is_list(X) -> X;
 to_list(X) when is_atom(X) -> atom_to_list(X).
-
-to_atom(X) when is_atom(X) -> X;
-to_atom(X) when is_list(X) -> list_to_atom(X).
diff --git a/lib/kernel/src/disk_log.erl b/lib/kernel/src/disk_log.erl
index f5450f30af..9b44021872 100644
--- a/lib/kernel/src/disk_log.erl
+++ b/lib/kernel/src/disk_log.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2015. 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.
@@ -1310,13 +1310,20 @@ compare_arg(_Attr, _Val, _A) ->
 
 %% -> {ok, Res, log(), Cnt} | Error
 do_open(A) ->
-    L = #log{name = A#arg.name,
-	     filename = A#arg.file,
-	     size = A#arg.size,
-	     head = mk_head(A#arg.head, A#arg.format),
-	     mode = A#arg.mode,
-	     version = A#arg.version},
-    do_open2(L, A).
+    #arg{type = Type, format = Format, name = Name, head = Head0,
+         file = FName, repair = Repair, size = Size, mode = Mode,
+         version = V} = A,
+    Head = mk_head(Head0, Format),
+    case do_open2(Type, Format, Name, FName, Repair, Size, Mode, Head, V) of
+        {ok, Ret, Extra, FormatType, NoItems} ->
+            L = #log{name = Name, type = Type, format = Format,
+                     filename = FName, size = Size,
+                     format_type = FormatType, head = Head, mode = Mode,
+                     version = V, extra = Extra},
+            {ok, Ret, L, NoItems};
+        Error ->
+            Error
+    end.
 
 mk_head({head, Term}, internal) -> {ok, term_to_binary(Term)};
 mk_head({head, Bytes}, external) -> {ok, check_bytes(Bytes)};
@@ -1432,57 +1439,44 @@ do_inc_wrap_file(L) ->
 %%-----------------------------------------------------------------
 %% -> {ok, Reply, log(), Cnt} | Error
 %% Note: the header is always written, even if the log size is too small.
-do_open2(L, #arg{type = halt, format = internal, name = Name, 
-		 file = FName, repair = Repair, size = Size, mode = Mode}) ->
-    case catch disk_log_1:int_open(FName, Repair, Mode, L#log.head) of
+do_open2(halt, internal, Name, FName, Repair, Size, Mode, Head, _V) ->
+    case catch disk_log_1:int_open(FName, Repair, Mode, Head) of
 	{ok, {_Alloc, FdC, {NoItems, _NoBytes}, FileSize}} ->
             Halt = #halt{fdc = FdC, curB = FileSize, size = Size},
-	    {ok, {ok, Name}, L#log{format_type = halt_int, extra = Halt}, 
-	     NoItems};
+	    {ok, {ok, Name}, Halt, halt_int, NoItems};
 	{repaired, FdC, Rec, Bad, FileSize} ->
             Halt = #halt{fdc = FdC, curB = FileSize, size = Size},
 	    {ok, {repaired, Name, {recovered, Rec}, {badbytes, Bad}},
-	     L#log{format_type = halt_int, extra = Halt},
-	     Rec};
+             Halt, halt_int, Rec};
 	Error ->
 	    Error
     end;
-do_open2(L, #arg{type = wrap, format = internal, size = {MaxB, MaxF}, 
-		 name = Name, repair = Repair, file = FName, mode = Mode,
-		 version = V}) ->
+do_open2(wrap, internal, Name, FName, Repair, Size, Mode, Head, V) ->
+    {MaxB, MaxF} = Size,
     case catch 
-      disk_log_1:mf_int_open(FName, MaxB, MaxF, Repair, Mode, L#log.head, V) of
+      disk_log_1:mf_int_open(FName, MaxB, MaxF, Repair, Mode, Head, V) of
 	{ok, Handle, Cnt} ->
-	    {ok, {ok, Name}, L#log{type = wrap,
-				   format_type = wrap_int, 
-				   extra = Handle}, Cnt};
+	    {ok, {ok, Name}, Handle, wrap_int, Cnt};
 	{repaired, Handle, Rec, Bad, Cnt} ->
 	    {ok, {repaired, Name, {recovered, Rec}, {badbytes, Bad}},
-	     L#log{type = wrap, format_type = wrap_int, extra = Handle}, Cnt};
+	     Handle, wrap_int, Cnt};
 	Error ->
 	    Error
     end;
-do_open2(L, #arg{type = halt, format = external, file = FName, name = Name,
-		 size = Size, repair = Repair, mode = Mode}) ->
-    case catch disk_log_1:ext_open(FName, Repair, Mode, L#log.head) of
+do_open2(halt, external, Name, FName, Repair, Size, Mode, Head, _V) ->
+    case catch disk_log_1:ext_open(FName, Repair, Mode, Head) of
 	{ok, {_Alloc, FdC, {NoItems, _NoBytes}, FileSize}} ->
             Halt = #halt{fdc = FdC, curB = FileSize, size = Size},
-	    {ok, {ok, Name}, 
-             L#log{format_type = halt_ext, format = external, extra = Halt}, 
-	     NoItems};
+	    {ok, {ok, Name}, Halt, halt_ext, NoItems};
 	Error ->
 	    Error
     end;
-do_open2(L, #arg{type = wrap, format = external, size = {MaxB, MaxF},
-		 name = Name, file = FName, repair = Repair, mode = Mode,
-		 version = V}) ->
+do_open2(wrap, external, Name, FName, Repair, Size, Mode, Head, V) ->
+    {MaxB, MaxF} = Size,
     case catch 
-      disk_log_1:mf_ext_open(FName, MaxB, MaxF, Repair, Mode, L#log.head, V) of
+      disk_log_1:mf_ext_open(FName, MaxB, MaxF, Repair, Mode, Head, V) of
 	{ok, Handle, Cnt} ->
-	    {ok, {ok, Name}, L#log{type = wrap,
-				   format_type = wrap_ext, 
-				   extra = Handle,
-				   format = external}, Cnt};
+	    {ok, {ok, Name}, Handle, wrap_ext, Cnt};
 	Error ->
 	    Error
     end.
diff --git a/lib/kernel/src/disk_log.hrl b/lib/kernel/src/disk_log.hrl
index 6c0aea070f..3262d979ee 100644
--- a/lib/kernel/src/disk_log.hrl
+++ b/lib/kernel/src/disk_log.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2015. 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.
@@ -152,8 +152,8 @@
 	 users = 0         :: non_neg_integer(),   %% non-linked users
 	 filename          :: file:filename(),	   %% real name of the file
 	 owners = []       :: [{pid(), boolean()}],%% [{pid, notify}]
-	 type = halt	   :: dlog_type(),
-	 format = internal :: dlog_format(),
+	 type              :: dlog_type(),
+	 format            :: dlog_format(),
 	 format_type	   :: dlog_format_type(),
 	 head = none,         %%  none | {head, H} | {M,F,A}
 	                      %%  called when wraplog wraps
diff --git a/lib/kernel/src/disk_log_1.erl b/lib/kernel/src/disk_log_1.erl
index 9b9fd086f1..2e61363aa6 100644
--- a/lib/kernel/src/disk_log_1.erl
+++ b/lib/kernel/src/disk_log_1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -79,6 +79,7 @@ log(FdC, FileName, X) ->
 logl(X) ->
     logl(X, [], 0).
 
+-dialyzer({no_improper_lists, logl/3}).
 logl([X | T], Bs, Size) ->
     Sz = byte_size(X),
     BSz = <<Sz:?SIZESZ/unit:8>>,
@@ -1142,6 +1143,7 @@ write_index_file(read_write, FName, NewFile, OldFile, OldCnt) ->
 	    file_error(FileName, E)
     end.
 
+-dialyzer({no_improper_lists, to_8_bytes/4}).
 to_8_bytes(<<N:32,T/binary>>, NT, FileName, Fd) ->
     to_8_bytes(T, [NT | <<N:64>>], FileName, Fd);
 to_8_bytes(B, NT, _FileName, _Fd) when byte_size(B) =:= 0 ->
@@ -1276,6 +1278,7 @@ ext_split_bins(CurB, MaxB, FirstPos, Bins) ->
     MaxBs = MaxB - CurB, IsFirst = CurB =:= FirstPos,
     ext_split_bins(MaxBs, IsFirst, [], Bins, 0, 0).
 
+-dialyzer({no_improper_lists, ext_split_bins/6}).
 ext_split_bins(MaxBs, IsFirst, First, [X | Last], Bs, N) ->
     NBs = Bs + byte_size(X),
     if
@@ -1296,6 +1299,7 @@ int_split_bins(CurB, MaxB, FirstPos, Bins) ->
     MaxBs = MaxB - CurB, IsFirst = CurB =:= FirstPos,
     int_split_bins(MaxBs, IsFirst, [], Bins, 0, 0).
 
+-dialyzer({no_improper_lists, int_split_bins/6}).
 int_split_bins(MaxBs, IsFirst, First, [X | Last], Bs, N) ->
     Sz = byte_size(X),
     NBs = Bs + Sz + ?HEADERSZ,
diff --git a/lib/kernel/src/dist_util.erl b/lib/kernel/src/dist_util.erl
index c9fc26d62c..e3817fcce5 100644
--- a/lib/kernel/src/dist_util.erl
+++ b/lib/kernel/src/dist_util.erl
@@ -196,7 +196,7 @@ check_dflag_xnc(#hs_data{other_node = Node,
 	    error_msg("** ~w: Connection attempt ~s node ~w ~s "
 		      "since it cannot handle extended ~s. "
 		      "**~n", [node(), Dir, Node, How, What]),
-	    ?shutdown(Node)
+	    ?shutdown2(Node, {check_dflag_xnc_failed, What})
     end.
 
 
@@ -576,13 +576,13 @@ recv_challenge(#hs_data{socket=Socket,other_node=Node,
 			   [Node, Challenge,Version]),
 		    {Flags,Challenge};
 		_ ->
-		    ?shutdown(no_node)
+		    ?shutdown2(no_node, {recv_challenge_failed, no_node, Ns})
 	    catch
 		error:badarg ->
-		    ?shutdown(no_node)
+		    ?shutdown2(no_node, {recv_challenge_failed, no_node, Ns})
 	    end;
-	_ ->
-	    ?shutdown(no_node)	    
+	Other ->
+	    ?shutdown2(no_node, {recv_challenge_failed, Other})
     end.
 
 
@@ -626,10 +626,10 @@ recv_challenge_ack(#hs_data{socket = Socket, f_recv = FRecv,
 		_ ->
 		    error_msg("** Connection attempt to "
 			      "disallowed node ~w ** ~n", [NodeB]),
-		    ?shutdown(NodeB)
+		    ?shutdown2(NodeB, {recv_challenge_ack_failed, bad_cookie})
 	    end;
-	_ ->
-	    ?shutdown(NodeB)
+	Other ->
+	    ?shutdown2(NodeB, {recv_challenge_ack_failed, Other})
     end.
 
 recv_status(#hs_data{kernel_pid = Kernel, socket = Socket, 
@@ -639,7 +639,7 @@ recv_status(#hs_data{kernel_pid = Kernel, socket = Socket,
 	    Stat = list_to_atom(StrStat),
 	    ?debug({dist_util,self(),recv_status, Node, Stat}),
 	    case Stat of
-		not_allowed -> ?shutdown(Node);
+		not_allowed -> ?shutdown2(Node, {recv_status_failed, not_allowed});
 		nok  -> 
 		    %% wait to be killed by net_kernel
 		    receive
@@ -656,10 +656,10 @@ recv_status(#hs_data{kernel_pid = Kernel, socket = Socket,
 		    end;
 		_ -> Stat
 	    end;
-	_Error ->
+	Error ->
 	    ?debug({dist_util,self(),recv_status_error, 
-		Node, _Error}),
-	    ?shutdown(Node)
+		Node, Error}),
+	    ?shutdown2(Node, {recv_status_failed, Error})
     end.
 
 
@@ -758,7 +758,7 @@ setup_timer(Pid, Timeout) ->
 	    setup_timer(Pid, Timeout)
     after Timeout ->
 	    ?trace("Timer expires ~p, ~p~n",[Pid, Timeout]),
-	    ?shutdown(timer)
+	    ?shutdown2(timer, setup_timer_timeout)
     end.
 
 reset_timer(Timer) ->
diff --git a/lib/kernel/src/erl_distribution.erl b/lib/kernel/src/erl_distribution.erl
index 99db7a8bf0..559e2a853b 100644
--- a/lib/kernel/src/erl_distribution.erl
+++ b/lib/kernel/src/erl_distribution.erl
@@ -21,20 +21,47 @@
 
 -behaviour(supervisor).
 
--export([start_link/0,start_link/1,init/1,start/1,stop/0]).
+-export([start_link/0,start_link/2,init/1,start/1,stop/0]).
 
 -define(DBG,erlang:display([?MODULE,?LINE])).
 
+%% Called during system start-up.
+
 start_link() ->
-    case catch start_p() of
-	{ok,Args} ->
-	    start_link(Args);
-	_ ->
-	    ignore
+    do_start_link([{sname,shortnames},{name,longnames}]).
+
+%% Called from net_kernel:start/1 to start distribution after the
+%% system has already started.
+
+start(Args) ->
+    C = {net_sup_dynamic, {?MODULE,start_link,[Args,false]}, permanent,
+	 1000, supervisor, [erl_distribution]},
+    supervisor:start_child(kernel_sup, C).
+
+%% Stop distribution.
+
+stop() ->
+    case supervisor:terminate_child(kernel_sup, net_sup_dynamic) of
+	ok ->
+	    supervisor:delete_child(kernel_sup, net_sup_dynamic);
+	Error ->
+	    case whereis(net_sup) of
+		Pid when is_pid(Pid) ->
+		    %% Dist. started through -sname | -name flags
+		    {error, not_allowed};
+		_ ->
+		    Error
+	    end
     end.
 
-start_link(Args) ->
-    supervisor:start_link({local,net_sup},erl_distribution,Args).
+%%%
+%%% Internal helper functions.
+%%%
+
+%% Helper start function.
+
+start_link(Args, CleanHalt) ->
+    supervisor:start_link({local,net_sup}, ?MODULE, [Args,CleanHalt]).
 
 init(NetArgs) ->
     Epmd = 
@@ -47,31 +74,20 @@ init(NetArgs) ->
 		  permanent,2000,worker,[EpmdMod]}]
 	end,
     Auth = {auth,{auth,start_link,[]},permanent,2000,worker,[auth]},
-    Kernel = {net_kernel,{net_kernel,start_link,[NetArgs]},
+    Kernel = {net_kernel,{net_kernel,start_link,NetArgs},
 	      permanent,2000,worker,[net_kernel]},
     EarlySpecs = net_kernel:protocol_childspecs(),
     {ok,{{one_for_all,0,1}, EarlySpecs ++ Epmd ++ [Auth,Kernel]}}.
 
-start_p() ->
-    sname(),
-    lname(),
-    false.
-
-sname() ->
-    case init:get_argument(sname) of
+do_start_link([{Arg,Flag}|T]) ->
+    case init:get_argument(Arg) of
 	{ok,[[Name]]} ->
-	    throw({ok,[list_to_atom(Name),shortnames|ticktime()]});
+	    start_link([list_to_atom(Name),Flag|ticktime()], true);
 	_ ->
-	    false
-    end.
-
-lname() ->
-    case init:get_argument(name) of
-	{ok,[[Name]]} ->
-	    throw({ok,[list_to_atom(Name),longnames|ticktime()]});
-	_ ->
-	    false
-    end.
+	    do_start_link(T)
+    end;
+do_start_link([]) ->
+    ignore.
 
 ticktime() ->
     %% catch, in case the system was started with boot file start_old,
@@ -84,23 +100,3 @@ ticktime() ->
 	_ ->
 	    []
     end.
-
-start(Args) ->
-    C = {net_sup_dynamic, {erl_distribution, start_link, [Args]}, permanent,
-	 1000, supervisor, [erl_distribution]},
-    supervisor:start_child(kernel_sup, C).
-
-stop() ->
-    case supervisor:terminate_child(kernel_sup, net_sup_dynamic) of
-	ok ->
-	    supervisor:delete_child(kernel_sup, net_sup_dynamic);
-	Error ->
-	    case whereis(net_sup) of
-		Pid when is_pid(Pid) ->
-		    %% Dist. started through -sname | -name flags
-		    {error, not_allowed};
-		_ ->
-		    Error
-	    end
-    end.
-
diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl
index 55ce9a7e64..c6202dd796 100644
--- a/lib/kernel/src/erl_epmd.erl
+++ b/lib/kernel/src/erl_epmd.erl
@@ -32,7 +32,7 @@
 %% External exports
 -export([start/0, start_link/0, stop/0, port_please/2, 
 	 port_please/3, names/0, names/1,
-	 register_node/2, open/0, open/1, open/2]).
+	 register_node/2, register_node/3, open/0, open/1, open/2]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, 
@@ -102,7 +102,9 @@ names(EpmdAddr) ->
 
 
 register_node(Name, PortNo) ->
-    gen_server:call(erl_epmd, {register, Name, PortNo}, infinity).
+    register_node(Name, PortNo, inet).
+register_node(Name, PortNo, Family) ->
+    gen_server:call(erl_epmd, {register, Name, PortNo, Family}, infinity).
 
 %%%----------------------------------------------------------------------
 %%% Callback functions from gen_server
@@ -120,10 +122,10 @@ init(_) ->
 -spec handle_call(calls(), term(), state()) ->
         {'reply', term(), state()} | {'stop', 'shutdown', 'ok', state()}.
 
-handle_call({register, Name, PortNo}, _From, State) ->
+handle_call({register, Name, PortNo, Family}, _From, State) ->
     case State#state.socket of
 	P when P < 0 ->
-	    case do_register_node(Name, PortNo) of
+	    case do_register_node(Name, PortNo, Family) of
 		{alive, Socket, Creation} ->
 		    S = State#state{socket = Socket,
 				    port_no = PortNo,
@@ -206,8 +208,12 @@ open({A,B,C,D,E,F,G,H}=EpmdAddr, Timeout) when ?ip6(A,B,C,D,E,F,G,H) ->
 close(Socket) ->
     gen_tcp:close(Socket).
 
-do_register_node(NodeName, TcpPort) ->
-    case open() of
+do_register_node(NodeName, TcpPort, Family) ->
+    Localhost = case Family of
+        inet -> open({127,0,0,1});
+        inet6 -> open({0,0,0,0,0,0,0,1})
+    end,
+    case Localhost of
 	{ok, Socket} ->
 	    Name = to_string(NodeName),
 	    Extra = "",
diff --git a/lib/kernel/src/error_logger.erl b/lib/kernel/src/error_logger.erl
index eb231fd155..30a9457bb3 100644
--- a/lib/kernel/src/error_logger.erl
+++ b/lib/kernel/src/error_logger.erl
@@ -435,5 +435,82 @@ add_node(X, Pid) ->
 
 %% Can't do io_lib:format
 
-display2(Tag,F,A) ->
-    erlang:display({error_logger,Tag,F,A}).
+display2({{_Y,_Mo,_D},{_H,_Mi,_S}} = Date, F, A) ->
+    display_date(Date),
+    display3(string_p(F), F, A).
+
+display_date({{Y,Mo,D},{H,Mi,S}}) ->
+    erlang:display_string(
+      integer_to_list(Y) ++ "-" ++
+	  two_digits(Mo) ++ "-" ++
+	  two_digits(D)  ++ " " ++
+	  two_digits(H)  ++ ":" ++
+	  two_digits(Mi) ++ ":" ++
+	  two_digits(S)  ++ " ").
+
+two_digits(N) when 0 =< N, N =< 9 ->
+    [$0, $0 + N];
+two_digits(N) ->
+    integer_to_list(N).
+
+display3(true, F, A) ->
+    %% Format string with arguments
+    erlang:display_string(F ++ "\n"),
+    [begin
+	 erlang:display_string("\t"),
+	 erlang:display(Arg)
+     end || Arg <- A],
+    ok;
+display3(false, Atom, A) when is_atom(Atom) ->
+    %% The widest atom seems to be 'supervisor_report' at 17.
+    ColumnWidth = 20,
+    AtomString = atom_to_list(Atom),
+    AtomLength = length(AtomString),
+    Padding = lists:duplicate(ColumnWidth - AtomLength, $\s),
+    erlang:display_string(AtomString ++ Padding),
+    display4(A);
+display3(_, F, A) ->
+    erlang:display({F, A}).
+
+display4([A, []]) ->
+    %% Not sure why crash reports look like this.
+    display4(A);
+display4(A = [_|_]) ->
+    case lists:all(fun({Key,_Value}) -> is_atom(Key); (_) -> false end, A) of
+	true ->
+	    erlang:display_string("\n"),
+	    lists:foreach(
+	      fun({Key, Value}) ->
+		      erlang:display_string(
+			"    " ++
+			    atom_to_list(Key) ++
+			    ": "),
+		      erlang:display(Value)
+	      end, A);
+	false ->
+	    erlang:display(A)
+    end;
+display4(A) ->
+    erlang:display(A).
+
+string_p([]) ->
+    false;
+string_p(Term) ->
+    string_p1(Term).
+
+string_p1([H|T]) when is_integer(H), H >= $\s, H < 255 ->
+    string_p1(T);
+string_p1([$\n|T]) -> string_p1(T);
+string_p1([$\r|T]) -> string_p1(T);
+string_p1([$\t|T]) -> string_p1(T);
+string_p1([$\v|T]) -> string_p1(T);
+string_p1([$\b|T]) -> string_p1(T);
+string_p1([$\f|T]) -> string_p1(T);
+string_p1([$\e|T]) -> string_p1(T);
+string_p1([H|T]) when is_list(H) ->
+    case string_p1(H) of
+	true -> string_p1(T);
+	_    -> false
+    end;
+string_p1([]) -> true;
+string_p1(_) ->  false.
diff --git a/lib/kernel/src/erts_debug.erl b/lib/kernel/src/erts_debug.erl
index 39308c0043..8e2b5ad214 100644
--- a/lib/kernel/src/erts_debug.erl
+++ b/lib/kernel/src/erts_debug.erl
@@ -34,7 +34,8 @@
 -export([breakpoint/2, disassemble/1, display/1, dist_ext_to_term/2,
          dump_monitors/1, dump_links/1, flat_size/1,
          get_internal_state/1, instructions/0, lock_counters/1,
-         map_info/1, same/2, set_internal_state/2]).
+         map_info/1, same/2, set_internal_state/2,
+         size_shared/1, copy_shared/1]).
 
 -spec breakpoint(MFA, Flag) -> non_neg_integer() when
       MFA :: {Module :: module(),
@@ -86,6 +87,18 @@ dump_links(_) ->
 flat_size(_) ->
     erlang:nif_error(undef).
 
+-spec size_shared(Term) -> non_neg_integer() when
+      Term :: term().
+
+size_shared(_) ->
+    erlang:nif_error(undef).
+
+-spec copy_shared(Term) -> term() when
+      Term :: term().
+
+copy_shared(_) ->
+    erlang:nif_error(undef).
+
 -spec get_internal_state(W) -> term() when
       W :: reds_left | node_and_dist_references | monitoring_nodes
          | next_pid | 'DbTable_words' | check_io_debug
@@ -230,7 +243,7 @@ map_size(Map,Seen0,Sum0) ->
     %% is not allowed to leak anywhere. They are only allowed in
     %% containers (cons cells and tuples, not maps), in gc and
     %% in erts_debug:same/2
-    case erts_internal:map_type(Map) of
+    case erts_internal:term_type(Map) of
         flatmap ->
             Kt = erts_internal:map_to_tuple_keys(Map),
             Vs = maps:values(Map),
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index 1007f04413..1076e02422 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -1227,7 +1227,8 @@ change_time(Name, {{AY, AM, AD}, {AH, AMin, ASec}}=Atime,
 %% Send data using sendfile
 %%
 
--define(MAX_CHUNK_SIZE, (1 bsl 20)*20). %% 20 MB, has to fit in primary memory
+%% 1 MB, Windows seems to behave badly if it is much larger then this
+-define(MAX_CHUNK_SIZE, (1 bsl 20)).
 
 -spec sendfile(RawFile, Socket, Offset, Bytes, Opts) ->
    {'ok', non_neg_integer()} | {'error', inet:posix() | 
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index d7dba4ac80..8cb2a725e8 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -114,7 +114,8 @@
         option().
 -type socket() :: port().
 
--export_type([option/0, option_name/0, connect_option/0, listen_option/0]).
+-export_type([option/0, option_name/0, connect_option/0, listen_option/0,
+              socket/0]).
 
 %%
 %% Connect a socket
diff --git a/lib/kernel/src/global.erl b/lib/kernel/src/global.erl
index 2be1efaf24..0c73ead7c5 100644
--- a/lib/kernel/src/global.erl
+++ b/lib/kernel/src/global.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2015. 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.
@@ -459,17 +459,17 @@ init([]) ->
                  no_trace
          end,
 
+    Ca = case init:get_argument(connect_all) of
+             {ok, [["false"]]} ->
+                 false;
+             _ ->
+                 true
+         end,
     S = #state{the_locker = start_the_locker(DoTrace),
                trace = T0,
-               the_registrar = start_the_registrar()},
-    S1 = trace_message(S, {init, node()}, []),
-
-    case init:get_argument(connect_all) of
-	{ok, [["false"]]} ->
-	    {ok, S1#state{connect_all = false}};
-	_ ->
-	    {ok, S1#state{connect_all = true}}
-    end.
+               the_registrar = start_the_registrar(),
+               connect_all = Ca},
+    {ok, trace_message(S, {init, node()}, [])}.
 
 %%-----------------------------------------------------------------
 %% Connection algorithm
@@ -2068,23 +2068,17 @@ get_known() ->
     gen_server:call(global_name_server, get_known, infinity).
 
 random_sleep(Times) ->
-    case (Times rem 10) of
-	0 -> erase(random_seed);
-	_ -> ok
-    end,
-    case get(random_seed) of
-	undefined ->
-	    _ = random:seed(erlang:phash2([erlang:node()]),
-			    erlang:monotonic_time(),
-			    erlang:unique_integer()),
-	    ok;
-	_ -> ok
-    end,
+    _ = case Times rem 10 of
+	    0 ->
+		_ = rand:seed(exsplus);
+	    _ ->
+		ok
+	end,
     %% First time 1/4 seconds, then doubling each time up to 8 seconds max.
     Tmax = if Times > 5 -> 8000;
 	      true -> ((1 bsl Times) * 1000) div 8
 	   end,
-    T = random:uniform(Tmax),
+    T = rand:uniform(Tmax),
     ?trace({random_sleep, {me,self()}, {times,Times}, {t,T}, {tmax,Tmax}}),
     receive after T -> ok end.
 
diff --git a/lib/kernel/src/global_group.erl b/lib/kernel/src/global_group.erl
index 848df13c39..e71f83f9d3 100644
--- a/lib/kernel/src/global_group.erl
+++ b/lib/kernel/src/global_group.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2015. 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.
@@ -273,7 +273,7 @@ init([]) ->
 	    {ok, #state{publish_type = PT, group_publish_type = PubTpGrp,
 			sync_state = synced, group_name = DefGroupName, 
 			no_contact = lists:sort(DefNodes), 
-			other_grps = DefOther}}
+			other_grps = DefOther, connect_all = Ca}}
     end.
 
 
diff --git a/lib/kernel/src/heart.erl b/lib/kernel/src/heart.erl
index 464b6919f1..eea78aabdf 100644
--- a/lib/kernel/src/heart.erl
+++ b/lib/kernel/src/heart.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -34,7 +34,11 @@
 %%%
 %%% It recognizes the flag '-heart'
 %%%--------------------------------------------------------------------
--export([start/0, init/2, set_cmd/1, clear_cmd/0, get_cmd/0, cycle/0]).
+-export([start/0, init/2,
+         set_cmd/1, clear_cmd/0, get_cmd/0,
+         set_callback/2, clear_callback/0, get_callback/0,
+         set_options/1, get_options/0,
+         cycle/0]).
 
 -define(START_ACK, 1).
 -define(HEART_BEAT, 2).
@@ -49,6 +53,16 @@
 -define(CYCLE_TIMEOUT, 10000).
 -define(HEART_PORT_NAME, heart_port).
 
+%% valid heart options
+-define(SCHEDULER_CHECK_OPT, check_schedulers).
+
+-type heart_option() :: ?SCHEDULER_CHECK_OPT.
+
+-record(state,{port :: port(),
+               cmd  :: [] | binary(),
+               options :: [heart_option()],
+               callback :: 'undefined' | {atom(), atom()}}).
+
 %%---------------------------------------------------------------------
 
 -spec start() -> 'ignore' | {'error', term()} | {'ok', pid()}.
@@ -81,11 +95,11 @@ wait_for_init_ack(From) ->
 init(Starter, Parent) ->
     process_flag(trap_exit, true),
     process_flag(priority, max),
-    register(heart, self()),
+    register(?MODULE, self()),
     case catch start_portprogram() of
 	{ok, Port} ->
 	    Starter ! {ok, self()},
-	    loop(Parent, Port, "");
+	    loop(Parent, #state{port=Port, cmd=[], options=[]});
 	no_heart ->
 	    Starter ! {no_heart, self()};
 	error ->
@@ -96,33 +110,68 @@ init(Starter, Parent) ->
       Cmd :: string().
 
 set_cmd(Cmd) ->
-    heart ! {self(), set_cmd, Cmd},
+    ?MODULE ! {self(), set_cmd, Cmd},
     wait().
 
 -spec get_cmd() -> {ok, Cmd} when
       Cmd :: string().
 
 get_cmd() ->
-    heart ! {self(), get_cmd},
+    ?MODULE ! {self(), get_cmd},
     wait().
 
 -spec clear_cmd() -> ok.
 
 clear_cmd() ->
-    heart ! {self(), clear_cmd},
+    ?MODULE ! {self(), clear_cmd},
+    wait().
+
+-spec set_callback(Module,Function) -> 'ok' | {'error', {'bad_callback', {Module, Function}}} when
+      Module :: atom(),
+      Function :: atom().
+
+set_callback(Module, Function) ->
+    ?MODULE ! {self(), set_callback, {Module,Function}},
+    wait().
+
+-spec get_callback() -> {'ok', {Module, Function}} | 'none' when
+      Module :: atom(),
+      Function :: atom().
+
+get_callback() ->
+    ?MODULE ! {self(), get_callback},
+    wait().
+
+-spec clear_callback() -> ok.
+
+clear_callback() ->
+    ?MODULE ! {self(), clear_callback},
+    wait().
+
+-spec set_options(Options) -> 'ok' | {'error', {'bad_options', Options}} when
+      Options :: [heart_option()].
+
+set_options(Options) ->
+    ?MODULE ! {self(), set_options, Options},
     wait().
 
+-spec get_options() -> {'ok', Options} | 'none' when
+      Options :: [atom()].
+
+get_options() ->
+    ?MODULE ! {self(), get_options},
+    wait().
 
 %%% Should be used solely by the release handler!!!!!!!
 -spec cycle() -> 'ok' | {'error', term()}.
 
 cycle() ->
-    heart ! {self(), cycle},
+    ?MODULE ! {self(), cycle},
     wait().
 
 wait() ->
     receive
-	{heart, Res} ->
+	{?MODULE, Res} ->
 	    Res
     end.
 
@@ -182,8 +231,8 @@ wait_ack(Port) ->
 	    {error, Reason}
     end.
 
-loop(Parent, Port, Cmd) ->
-    _ = send_heart_beat(Port),
+loop(Parent, #state{port=Port}=S) ->
+    _ = send_heart_beat(S),
     receive
 	{From, set_cmd, NewCmd0} ->
 	    Enc = file:native_name_encoding(),
@@ -191,37 +240,72 @@ loop(Parent, Port, Cmd) ->
 		NewCmd when is_binary(NewCmd), byte_size(NewCmd) < 2047 ->
 		    _ = send_heart_cmd(Port, NewCmd),
 		    _ = wait_ack(Port),
-		    From ! {heart, ok},
-		    loop(Parent, Port, NewCmd);
+		    From ! {?MODULE, ok},
+		    loop(Parent, S#state{cmd=NewCmd});
 		_ ->
-		    From ! {heart, {error, {bad_cmd, NewCmd0}}},
-		    loop(Parent, Port, Cmd)
+		    From ! {?MODULE, {error, {bad_cmd, NewCmd0}}},
+		    loop(Parent, S)
 	    end;
 	{From, clear_cmd} ->
-	    From ! {heart, ok},
-	    _ = send_heart_cmd(Port, ""),
+	    From ! {?MODULE, ok},
+	    _ = send_heart_cmd(Port, []),
 	    _ = wait_ack(Port),
-	    loop(Parent, Port, "");
+	    loop(Parent, S#state{cmd = []});
 	{From, get_cmd} ->
-	    From ! {heart, get_heart_cmd(Port)},
-	    loop(Parent, Port, Cmd);
+	    From ! {?MODULE, get_heart_cmd(Port)},
+            loop(Parent, S);
+	{From, set_callback, Callback} ->
+            case Callback of
+                {M,F} when is_atom(M), is_atom(F) ->
+                    From ! {?MODULE, ok},
+                    loop(Parent, S#state{callback=Callback});
+                _ ->
+		    From ! {?MODULE, {error, {bad_callback, Callback}}},
+                    loop(Parent, S)
+            end;
+        {From, get_callback} ->
+            Res = case S#state.callback of
+                      undefined -> none;
+                      Cb -> {ok, Cb}
+                  end,
+            From ! {?MODULE, Res},
+            loop(Parent, S);
+        {From, clear_callback} ->
+            From ! {?MODULE, ok},
+            loop(Parent, S#state{callback=undefined});
+	{From, set_options, Options} ->
+            case validate_options(Options) of
+                Validated when is_list(Validated) ->
+                    From ! {?MODULE, ok},
+                    loop(Parent, S#state{options=Validated});
+                _ ->
+		    From ! {?MODULE, {error, {bad_options, Options}}},
+                    loop(Parent, S)
+            end;
+        {From, get_options} ->
+            Res = case S#state.options of
+                      [] -> none;
+                      Cb -> {ok, Cb}
+                  end,
+            From ! {?MODULE, Res},
+            loop(Parent, S);
 	{From, cycle} ->
 	    %% Calls back to loop
-	    do_cycle_port_program(From, Parent, Port, Cmd);  
+	    do_cycle_port_program(From, Parent, S);
 	{'EXIT', Parent, shutdown} ->
 	    no_reboot_shutdown(Port);
 	{'EXIT', Parent, Reason} ->
 	    exit(Port, Reason),
 	    exit(Reason);
 	{'EXIT', Port, badsig} ->  % we can ignore badsig-messages!
-	    loop(Parent, Port, Cmd);
+	    loop(Parent, S);
 	{'EXIT', Port, _Reason} ->
-	    exit({port_terminated, {heart, loop, [Parent, Port, Cmd]}});
+	    exit({port_terminated, {?MODULE, loop, [Parent, S]}});
 	_ -> 
-	    loop(Parent, Port, Cmd)
+	    loop(Parent, S)
     after
 	?TIMEOUT ->
-	    loop(Parent, Port, Cmd)
+	    loop(Parent, S)
     end.
 
 -spec no_reboot_shutdown(port()) -> no_return().
@@ -233,38 +317,47 @@ no_reboot_shutdown(Port) ->
 	    exit(normal)
     end.
 
-do_cycle_port_program(Caller, Parent, Port, Cmd) ->
+validate_options(Opts) -> validate_options(Opts,[]).
+validate_options([],Res) -> Res;
+validate_options([?SCHEDULER_CHECK_OPT=Opt|Opts],Res) -> validate_options(Opts,[Opt|Res]);
+validate_options(_,_) -> error.
+
+do_cycle_port_program(Caller, Parent, #state{port=Port} = S) ->
     unregister(?HEART_PORT_NAME),
     case catch start_portprogram() of
 	{ok, NewPort} ->
 	    _ = send_shutdown(Port),
 	    receive
 		{'EXIT', Port, _Reason} ->
-		    _ = send_heart_cmd(NewPort, Cmd),
-		    Caller ! {heart, ok},
-		    loop(Parent, NewPort, Cmd)
+		    _ = send_heart_cmd(NewPort, S#state.cmd),
+		    Caller ! {?MODULE, ok},
+		    loop(Parent, S#state{port=NewPort})
 	    after
 		?CYCLE_TIMEOUT ->
 		    %% Huh! Two heart port programs running...
 		    %% well, the old one has to be sick not to respond
 		    %% so we'll settle for the new one...
-		    _ = send_heart_cmd(NewPort, Cmd),
-		    Caller ! {heart, {error, stop_error}},
-		    loop(Parent, NewPort, Cmd)
+		    _ = send_heart_cmd(NewPort, S#state.cmd),
+		    Caller ! {?MODULE, {error, stop_error}},
+		    loop(Parent, S#state{port=NewPort})
 	    end;
 	no_heart ->
-	    Caller ! {heart, {error, no_heart}},
-	    loop(Parent, Port, Cmd);
+	    Caller ! {?MODULE, {error, no_heart}},
+	    loop(Parent, S);
 	error ->
-	    Caller ! {heart, {error, start_error}},
-	    loop(Parent, Port, Cmd)
+	    Caller ! {?MODULE, {error, start_error}},
+	    loop(Parent, S)
     end.
     
 
 %% "Beates" the heart once.
-send_heart_beat(Port) -> Port ! {self(), {command, [?HEART_BEAT]}}.
+send_heart_beat(#state{port=Port, callback=Cb, options=Opts}) ->
+    ok = check_system(Opts),
+    ok = check_callback(Cb),
+    Port ! {self(), {command, [?HEART_BEAT]}}.
 
 %% Set a new HEART_COMMAND.
+-dialyzer({no_improper_lists, send_heart_cmd/2}).
 send_heart_cmd(Port, []) ->
     Port ! {self(), {command, [?CLEAR_CMD]}};
 send_heart_cmd(Port, Cmd) ->
@@ -277,6 +370,24 @@ get_heart_cmd(Port) ->
 	    {ok, Cmd}
     end.
 
+check_system([]) -> ok;
+check_system([?SCHEDULER_CHECK_OPT|Opts]) ->
+    ok = erts_internal:system_check(schedulers),
+    check_system(Opts).
+
+%% validate system by performing a check before the heartbeat
+%% return 'ok' if everything is alright.
+%% Terminate if with reason if something is a miss.
+%% It is fine to timeout in the callback, in fact that is the intention
+%% if something goes wront -> no heartbeat.
+
+check_callback(Callback) ->
+    case Callback of
+        undefined -> ok;
+        {M,F} ->
+            erlang:apply(M,F,[])
+    end.
+
 %% Sends shutdown command to the port.
 send_shutdown(Port) -> Port ! {self(), {command, [?SHUT_DOWN]}}.
 
diff --git a/lib/kernel/src/hipe_unified_loader.erl b/lib/kernel/src/hipe_unified_loader.erl
index ddbbc548dd..087cceb5d8 100644
--- a/lib/kernel/src/hipe_unified_loader.erl
+++ b/lib/kernel/src/hipe_unified_loader.erl
@@ -44,7 +44,7 @@
 -export([chunk_name/1,
 	 %% Only the code and code_server modules may call the entries below!
 	 load_native_code/3,
-	 post_beam_load/2,
+	 post_beam_load/1,
 	 load_module/4,
 	 load/3]).
 
@@ -105,7 +105,7 @@ load_native_code(Mod, Bin, Architecture) when is_atom(Mod), is_binary(Bin) ->
   case code:get_chunk(Bin, chunk_name(Architecture)) of
     undefined -> no_native;
     NativeCode when is_binary(NativeCode) ->
-      erlang:system_flag(multi_scheduling, block),
+      erlang:system_flag(multi_scheduling, block_normal),
       try
         OldReferencesToPatch = patch_to_emu_step1(Mod),
         case load_module(Mod, NativeCode, Bin, OldReferencesToPatch,
@@ -114,23 +114,23 @@ load_native_code(Mod, Bin, Architecture) when is_atom(Mod), is_binary(Bin) ->
           Result -> Result
         end
       after
-        erlang:system_flag(multi_scheduling, unblock)
+        erlang:system_flag(multi_scheduling, unblock_normal)
       end
   end.
 
 %%========================================================================
 
--spec post_beam_load(atom(), hipe_architecture()) -> 'ok'.
+-spec post_beam_load([module()]) -> 'ok'.
 
-%% does nothing on a hipe-disabled system
-post_beam_load(_Mod, undefined) ->
+post_beam_load([])->
   ok;
-post_beam_load(Mod, _) when is_atom(Mod) ->
-  erlang:system_flag(multi_scheduling, block),
+post_beam_load([_|_]=Mods) ->
+  erlang:system_flag(multi_scheduling, block_normal),
   try
-    patch_to_emu(Mod)
+    _ = [patch_to_emu(Mod) || Mod <- Mods],
+    ok
   after
-    erlang:system_flag(multi_scheduling, unblock)
+    erlang:system_flag(multi_scheduling, unblock_normal)
   end,
   ok.
 
@@ -151,11 +151,11 @@ version_check(Version, Mod) when is_atom(Mod) ->
                      'bad_crc' | {'module', Mod} when Mod :: atom().
 
 load_module(Mod, Bin, Beam, Architecture) ->
-  erlang:system_flag(multi_scheduling, block),
+  erlang:system_flag(multi_scheduling, block_normal),
   try
     load_module_nosmp(Mod, Bin, Beam, Architecture)
   after
-    erlang:system_flag(multi_scheduling, unblock)
+    erlang:system_flag(multi_scheduling, unblock_normal)
   end.
 
 load_module_nosmp(Mod, Bin, Beam, Architecture) ->
@@ -173,11 +173,11 @@ load_module(Mod, Bin, Beam, OldReferencesToPatch, Architecture) ->
               'bad_crc' | {'module', Mod} when Mod :: atom().
 
 load(Mod, Bin, Architecture) ->
-  erlang:system_flag(multi_scheduling, block),
+  erlang:system_flag(multi_scheduling, block_normal),
   try
     load_nosmp(Mod, Bin, Architecture)
   after
-    erlang:system_flag(multi_scheduling, unblock)
+    erlang:system_flag(multi_scheduling, unblock_normal)
   end.
 
 load_nosmp(Mod, Bin, Architecture) ->
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index b573112445..c1ae99ea24 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -289,7 +289,7 @@ getifaddrs(Socket) ->
 -spec getifaddrs() -> {ok, Iflist} | {error, posix()} when
       Iflist :: [{Ifname,[Ifopt]}],
       Ifname :: string(),
-      Ifopt :: {flag,[Flag]} | {addr,Addr} | {netmask,Netmask}
+      Ifopt :: {flags,[Flag]} | {addr,Addr} | {netmask,Netmask}
              | {broadaddr,Broadaddr} | {dstaddr,Dstaddr}
              | {hwaddr,Hwaddr},
       Flag :: up | broadcast | loopback | pointtopoint
diff --git a/lib/kernel/src/inet_config.erl b/lib/kernel/src/inet_config.erl
index 803fae846e..a0d5344f11 100644
--- a/lib/kernel/src/inet_config.erl
+++ b/lib/kernel/src/inet_config.erl
@@ -188,9 +188,6 @@ do_load_resolv({win32,Type}, longnames) ->
     win32_load_from_registry(Type),
     inet_db:set_lookup([native]);
 
-do_load_resolv({ose,_}, _) ->
-    inet_db:set_lookup([file]);
-
 do_load_resolv(_, _) ->
     inet_db:set_lookup([native]).
 
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index b5555ca1a5..7452c6bc98 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -116,6 +116,6 @@
   {applications, []},
   {env, [{error_logger, tty}]},
   {mod, {kernel, []}},
-  {runtime_dependencies, ["erts-7.0", "stdlib-2.6", "sasl-2.6"]}
+  {runtime_dependencies, ["erts-8.0", "stdlib-2.6", "sasl-2.6"]}
  ]
 }.
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 860d3640d0..a13819a183 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -18,9 +18,9 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max one major revision back
- [{<<"4\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-18.*
-  {<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17
+ [{<<"5\\.0(\\.[0-9]+)*">>,[restart_new_emulator]},       % OTP-19.*
+  {<<"4\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}],  % OTP-18.*
  %% Down to - max one major revision back
- [{<<"4\\.[0-1](\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-18.*
-  {<<"3\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}]  % OTP-17
+ [{<<"5\\.0(\\.[0-9]+)*">>,[restart_new_emulator]},      % OTP-19.*
+  {<<"4\\.[0-2](\\.[0-9]+)*">>,[restart_new_emulator]}]  % OTP-18.*
 }.
diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl
index 5f33f25a0d..40544da6c3 100644
--- a/lib/kernel/src/kernel.erl
+++ b/lib/kernel/src/kernel.erl
@@ -98,7 +98,7 @@ init([]) ->
 	      {kernel_config, start_link, []},
 	      permanent, 2000, worker, [kernel_config]},
     Code = {code_server,
-	    {code, start_link, get_code_args()},
+	    {code, start_link, []},
 	    permanent, 2000, worker, [code]},
     File = {file_server_2,
 	    {file_server, start_link, []},
@@ -158,12 +158,6 @@ init(safe) ->
 
     {ok, {SupFlags, Boot ++ DiskLog ++ Pg2}}.
 
-get_code_args() ->
-    case init:get_argument(nostick) of
-	{ok, [[]]} -> [[nostick]];
-	_ -> []
-    end.
-
 start_dist_ac() ->
     Spec = [{dist_ac,{dist_ac,start_link,[]},permanent,2000,worker,[dist_ac]}],
     case application:get_env(kernel, start_dist_ac) of
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index 35a54f591e..a19c116388 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -53,18 +53,25 @@
 -define(tckr_dbg(X), ok).
 -endif.
 
-%% User Interface Exports
--export([start/1, start_link/1, stop/0,
-	 kernel_apply/3,
+%% Documented API functions.
+
+-export([allow/1,
+	 connect_node/1,
 	 monitor_nodes/1,
 	 monitor_nodes/2,
+	 start/1,
+	 stop/0]).
+
+%% Exports for internal use.
+
+-export([start_link/2,
+	 kernel_apply/3,
 	 longnames/0,
-	 allow/1,
 	 protocol_childspecs/0,
 	 epmd_module/0]).
 
 -export([connect/1, disconnect/1, hidden_connect/1, passive_cnct/1]).
--export([connect_node/1, hidden_connect_node/1]). %% explicit connect
+-export([hidden_connect_node/1]). %% explicit connect
 -export([set_net_ticktime/1, set_net_ticktime/2, get_net_ticktime/0]).
 
 -export([node_info/1, node_info/2, nodes_info/0,
@@ -73,7 +80,8 @@
 
 -export([publish_on_node/1, update_publish_nodes/1]).
 
-%% Internal Exports
+%% Internal exports for spawning processes.
+
 -export([do_spawn/3,
 	 spawn_func/6,
 	 ticker/2,
@@ -341,18 +349,18 @@ request(Req) ->
 start(Args) ->
     erl_distribution:start(Args).
 
-%% This is the main startup routine for net_kernel
-%% The defaults are longnames and a ticktime of 15 secs to the tcp_drv.
+%% This is the main startup routine for net_kernel (only for internal
+%% use by the Kernel application.
 
-start_link([Name]) ->
-    start_link([Name, longnames]);
+start_link([Name], CleanHalt) ->
+    start_link([Name, longnames], CleanHalt);
+start_link([Name, LongOrShortNames], CleanHalt) ->
+    start_link([Name, LongOrShortNames, 15000], CleanHalt);
 
-start_link([Name, LongOrShortNames]) ->
-    start_link([Name, LongOrShortNames, 15000]);
-
-start_link([Name, LongOrShortNames, Ticktime]) ->
-    case gen_server:start_link({local, net_kernel}, net_kernel,
-			       {Name, LongOrShortNames, Ticktime}, []) of
+start_link([Name, LongOrShortNames, Ticktime], CleanHalt) ->
+    Args = {Name, LongOrShortNames, Ticktime, CleanHalt},
+    case gen_server:start_link({local, net_kernel}, ?MODULE,
+			       Args, []) of
 	{ok, Pid} ->
 	    {ok, Pid};
 	{error, {already_started, Pid}} ->
@@ -361,12 +369,9 @@ start_link([Name, LongOrShortNames, Ticktime]) ->
 	    exit(nodistribution)
     end.
 
-%% auth:get_cookie should only be able to return an atom
-%% tuple cookies are unknowns
-
-init({Name, LongOrShortNames, TickT}) ->
+init({Name, LongOrShortNames, TickT, CleanHalt}) ->
     process_flag(trap_exit,true),
-    case init_node(Name, LongOrShortNames) of
+    case init_node(Name, LongOrShortNames, CleanHalt) of
 	{ok, Node, Listeners} ->
 	    process_flag(priority, max),
 	    Ticktime = to_integer(TickT),
@@ -1201,12 +1206,12 @@ get_proto_mod(_Family, _Protocol, []) ->
 
 %% -------- Initialisation functions ------------------------
 
-init_node(Name, LongOrShortNames) ->
-    {NameWithoutHost,_Host} = lists:splitwith(fun($@)->false;(_)->true end,
-				  atom_to_list(Name)),
+init_node(Name, LongOrShortNames, CleanHalt) ->
+    {NameWithoutHost0,_Host} = split_node(Name),
     case create_name(Name, LongOrShortNames, 1) of
 	{ok,Node} ->
-	    case start_protos(list_to_atom(NameWithoutHost),Node) of
+	    NameWithoutHost = list_to_atom(NameWithoutHost0),
+	    case start_protos(NameWithoutHost, Node, CleanHalt) of
 		{ok, Ls} ->
 		    {ok, Node, Ls};
 		Error ->
@@ -1240,8 +1245,7 @@ create_name(Name, LongOrShortNames, Try) ->
     end.
 
 create_hostpart(Name, LongOrShortNames) ->
-    {Head,Host} = lists:splitwith(fun($@)->false;(_)->true end,
-				  atom_to_list(Name)),
+    {Head,Host} = split_node(Name),
     Host1 = case {Host,LongOrShortNames} of
 		{[$@,_|_],longnames} ->
 		    {ok,Host};
@@ -1268,6 +1272,9 @@ create_hostpart(Name, LongOrShortNames) ->
 	    end,
     {Head,Host1}.
 
+split_node(Name) ->
+    lists:splitwith(fun(C) -> C =/= $@ end, atom_to_list(Name)).
+
 %%
 %%
 %%
@@ -1307,21 +1314,26 @@ epmd_module() ->
 %% Start all protocols
 %%
 
-start_protos(Name,Node) ->
+start_protos(Name, Node, CleanHalt) ->
     case init:get_argument(proto_dist) of
 	{ok, [Protos]} ->
-	    start_protos(Name,Protos, Node);
+	    start_protos(Name, Protos, Node, CleanHalt);
 	_ ->
-	    start_protos(Name,["inet_tcp"], Node)
+	    start_protos(Name, ["inet_tcp"], Node, CleanHalt)
     end.
 
-start_protos(Name,Ps, Node) ->
-    case start_protos(Name, Ps, Node, []) of
-	[] -> {error, badarg};
-	Ls -> {ok, Ls}
+start_protos(Name, Ps, Node, CleanHalt) ->
+    case start_protos(Name, Ps, Node, [], CleanHalt) of
+	[] ->
+	    case CleanHalt of
+		true -> halt(1);
+		false -> {error, badarg}
+	    end;
+	Ls ->
+	    {ok, Ls}
     end.
 
-start_protos(Name, [Proto | Ps], Node, Ls) ->
+start_protos(Name, [Proto | Ps], Node, Ls, CleanHalt) ->
     Mod = list_to_atom(Proto ++ "_dist"),
     case catch Mod:listen(Name) of
 	{ok, {Socket, Address, Creation}} ->
@@ -1334,33 +1346,48 @@ start_protos(Name, [Proto | Ps], Node, Ls) ->
 		      address = Address,
 		      accept = AcceptPid,
 		      module = Mod },
-		    start_protos(Name,Ps, Node, [L|Ls]);
+		    start_protos(Name,Ps, Node, [L|Ls], CleanHalt);
 		_ ->
 		    Mod:close(Socket),
-		    error_logger:info_msg("Invalid node name: ~p~n", [Node]),
-		    start_protos(Name, Ps, Node, Ls)
+		    S = "invalid node name: " ++ atom_to_list(Node),
+		    proto_error(CleanHalt, Proto, S),
+		    start_protos(Name, Ps, Node, Ls, CleanHalt)
 	    end;
 	{'EXIT', {undef,_}} ->
-	    error_logger:info_msg("Protocol: ~tp: not supported~n", [Proto]),
-	    start_protos(Name,Ps, Node, Ls);
+	    proto_error(CleanHalt, Proto, "not supported"),
+	    start_protos(Name, Ps, Node, Ls, CleanHalt);
 	{'EXIT', Reason} ->
-	    error_logger:info_msg("Protocol: ~tp: register error: ~tp~n",
-				  [Proto, Reason]),
-	    start_protos(Name,Ps, Node, Ls);
+	    register_error(CleanHalt, Proto, Reason),
+	    start_protos(Name, Ps, Node, Ls, CleanHalt);
 	{error, duplicate_name} ->
-	    error_logger:info_msg("Protocol: ~tp: the name " ++
-				  atom_to_list(Node) ++
-				  " seems to be in use by another Erlang node",
-				  [Proto]),
-	    start_protos(Name,Ps, Node, Ls);
+	    S = "the name " ++ atom_to_list(Node) ++
+		" seems to be in use by another Erlang node",
+	    proto_error(CleanHalt, Proto, S),
+	    start_protos(Name, Ps, Node, Ls, CleanHalt);
 	{error, Reason} ->
-	    error_logger:info_msg("Protocol: ~tp: register/listen error: ~tp~n",
-				  [Proto, Reason]),
-	    start_protos(Name,Ps, Node, Ls)
+	    register_error(CleanHalt, Proto, Reason),
+	    start_protos(Name, Ps, Node, Ls, CleanHalt)
     end;
-start_protos(_,[], _Node, Ls) ->
+start_protos(_, [], _Node, Ls, _CleanHalt) ->
     Ls.
 
+register_error(false, Proto, Reason) ->
+    S = io_lib:format("register/listen error: ~p", [Reason]),
+    proto_error(false, Proto, lists:flatten(S));
+register_error(true, Proto, Reason) ->
+    S = "Protocol '" ++ Proto ++ "': register/listen error: ",
+    erlang:display_string(S),
+    erlang:display(Reason).
+
+proto_error(CleanHalt, Proto, String) ->
+    S = "Protocol '" ++ Proto ++ "': " ++ String ++ "\n",
+    case CleanHalt of
+	false ->
+	    error_logger:info_msg(S);
+	true ->
+	    erlang:display_string(S)
+    end.
+
 set_node(Node, Creation) when node() =:= nonode@nohost ->
     case catch erlang:setnode(Node, Creation) of
 	true ->
diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
index 3330b38d84..4947088635 100644
--- a/lib/kernel/src/os.erl
+++ b/lib/kernel/src/os.erl
@@ -27,7 +27,9 @@
 
 %%% BIFs
 
--export([getenv/0, getenv/1, getenv/2, getpid/0, putenv/2, system_time/0, system_time/1,
+-export([getenv/0, getenv/1, getenv/2, getpid/0,
+         perf_counter/0, perf_counter/1,
+         putenv/2, system_time/0, system_time/1,
 	 timestamp/0, unsetenv/1]).
 
 -spec getenv() -> [string()].
@@ -60,6 +62,18 @@ getenv(VarName, DefaultValue) ->
 getpid() ->
     erlang:nif_error(undef).
 
+-spec perf_counter() -> Counter when
+      Counter :: integer().
+
+perf_counter() ->
+    erlang:nif_error(undef).
+
+-spec perf_counter(Unit) -> integer() when
+      Unit :: erlang:time_unit().
+
+perf_counter(Unit) ->
+      erlang:convert_time_unit(os:perf_counter(), perf_counter, Unit).
+
 -spec putenv(VarName, Value) -> true when
       VarName :: string(),
       Value :: string().
@@ -93,7 +107,7 @@ unsetenv(_) ->
 %%% End of BIFs
 
 -spec type() -> {Osfamily, Osname} when
-      Osfamily :: unix | win32 | ose,
+      Osfamily :: unix | win32,
       Osname :: atom().
 
 type() ->
@@ -212,174 +226,33 @@ extensions() ->
       Command :: atom() | io_lib:chars().
 cmd(Cmd) ->
     validate(Cmd),
-    Bytes = case type() of
-		{unix, _} ->
-		    unix_cmd(Cmd);
-		{win32, Wtype} ->
-		    Command0 = case {os:getenv("COMSPEC"),Wtype} of
-				  {false,windows} -> lists:concat(["command.com /c", Cmd]);
-				  {false,_} -> lists:concat(["cmd /c", Cmd]);
-				  {Cspec,_} -> lists:concat([Cspec," /c",Cmd])
-			      end,
-		    %% open_port/2 awaits string() in Command, but io_lib:chars() can be
-		    %% deep lists according to io_lib module description.
-		    Command = lists:flatten(Command0),
-		    Port = open_port({spawn, Command}, [stream, in, eof, hide]),
-		    get_data(Port, [])
-	    end,
-    String = unicode:characters_to_list(list_to_binary(Bytes)),
+    {SpawnCmd, SpawnOpts, SpawnInput} = mk_cmd(os:type(), Cmd),
+    Port = open_port({spawn, SpawnCmd}, [binary, stderr_to_stdout,
+                                         stream, in, eof, hide | SpawnOpts]),
+    true = port_command(Port, SpawnInput),
+    Bytes = get_data(Port, []),
+    String = unicode:characters_to_list(Bytes),
     if  %% Convert to unicode list if possible otherwise return bytes
 	is_list(String) -> String;
-	true -> Bytes
-    end.
-
-unix_cmd(Cmd) ->
-    Tag = make_ref(),
-    {Pid,Mref} = erlang:spawn_monitor(
-		   fun() ->
-			   process_flag(trap_exit, true),
-			   Port = start_port(),
-			   erlang:port_command(Port, mk_cmd(Cmd)),
-			   exit({Tag,unix_get_data(Port)})
-		   end),
-    receive
-	{'DOWN',Mref,_,Pid,{Tag,Result}} ->
-	    Result;
-	{'DOWN',Mref,_,Pid,Reason} ->
-	    exit(Reason)
+	true -> binary_to_list(Bytes)
     end.
 
-%% The -s flag implies that only the positional parameters are set,
-%% and the commands are read from standard input. We set the
-%% $1 parameter for easy identification of the resident shell.
-%%
--define(ROOT,          "/").
--define(ROOT_ANDROID,  "/system").
--define(SHELL, "bin/sh -s unix:cmd 2>&1").
--define(PORT_CREATOR_NAME, os_cmd_port_creator).
-
-%%
-%% Serializing open_port through a process to avoid smp lock contention
-%% when many concurrent os:cmd() want to do vfork (OTP-7890).
-%%
--spec start_port() -> port().
-start_port() ->
-    Ref = make_ref(),
-    Request = {Ref,self()},
-    {Pid, Mon} = case whereis(?PORT_CREATOR_NAME) of
-		     undefined ->
-			 spawn_monitor(fun() ->
-					       start_port_srv(Request)
-				       end);
-		     P ->
-			 P ! Request,
-			 M = erlang:monitor(process, P),
-			 {P, M}
-		 end,
-    receive
-	{Ref, Port} when is_port(Port) ->
-	    erlang:demonitor(Mon, [flush]),
-	    Port;
-	{Ref, Error} ->
-	    erlang:demonitor(Mon, [flush]),
-	    exit(Error);
-	{'DOWN', Mon, process, Pid, _Reason} ->
-	    start_port()
-    end.
-
-start_port_srv(Request) ->
-    %% We don't want a group leader of some random application. Use
-    %% kernel_sup's group leader.
-    {group_leader, GL} = process_info(whereis(kernel_sup),
-				      group_leader),
-    true = group_leader(GL, self()),
-    process_flag(trap_exit, true),
-    StayAlive = try register(?PORT_CREATOR_NAME, self())
-		catch
-		    error:_ -> false
-		end,
-    start_port_srv_handle(Request),
-    case StayAlive of
-	true -> start_port_srv_loop();
-	false -> exiting
-    end.
-
-start_port_srv_handle({Ref,Client}) ->
-    Path  = case lists:reverse(erlang:system_info(system_architecture)) of
-      % androideabi
-      "ibaediordna" ++ _ -> filename:join([?ROOT_ANDROID, ?SHELL]);
-      _ -> filename:join([?ROOT, ?SHELL])
-    end,
-    Reply = try open_port({spawn, Path},[stream]) of
-		Port when is_port(Port) ->
-		    (catch port_connect(Port, Client)),
-		    unlink(Port),
-		    Port
-	    catch
-		error:Reason ->
-		    {Reason,erlang:get_stacktrace()}
-	    end,
-    Client ! {Ref,Reply},
-    ok.
-
-start_port_srv_loop() ->
-    receive
-	{Ref, Client} = Request when is_reference(Ref),
-				     is_pid(Client) ->
-	    start_port_srv_handle(Request);
-	_Junk ->
-	    ok
-    end,
-    start_port_srv_loop().
-
-%%
-%%  unix_get_data(Port) -> Result
-%%
-unix_get_data(Port) ->
-    unix_get_data(Port, []).
-
-unix_get_data(Port, Sofar) ->
-    receive
-	{Port,{data, Bytes}} ->
-	    case eot(Bytes) of
-		{done, Last} ->
-		    lists:flatten([Sofar|Last]);
-		more  ->
-		    unix_get_data(Port, [Sofar|Bytes])
-	    end;
-	{'EXIT', Port, _} ->
-	    lists:flatten(Sofar)
-    end.
-
-%%
-%% eot(String) -> more | {done, Result}
-%%
-eot(Bs) ->
-    eot(Bs, []).
-
-eot([4| _Bs], As) ->
-    {done, lists:reverse(As)};
-eot([B| Bs], As) ->
-    eot(Bs, [B| As]);
-eot([], _As) ->
-    more.
-
-%%
-%% mk_cmd(Cmd) -> {ok, ShellCommandString} | {error, ErrorString}
-%%
-%% We do not allow any input to Cmd (hence commands that want
-%% to read from standard input will return immediately).
-%% Standard error is redirected to standard output.
-%%
-%% We use ^D (= EOT = 4) to mark the end of the stream.
-%%
-mk_cmd(Cmd) when is_atom(Cmd) ->		% backward comp.
-    mk_cmd(atom_to_list(Cmd));
-mk_cmd(Cmd) ->
-    %% We insert a new line after the command, in case the command
-    %% contains a comment character.
-    [$(, unicode:characters_to_binary(Cmd), "\n) </dev/null; echo  \"\^D\"\n"].
-
+mk_cmd({win32,Wtype}, Cmd) ->
+    Command = case {os:getenv("COMSPEC"),Wtype} of
+                  {false,windows} -> lists:concat(["command.com /c", Cmd]);
+                  {false,_} -> lists:concat(["cmd /c", Cmd]);
+                  {Cspec,_} -> lists:concat([Cspec," /c",Cmd])
+              end,
+    {Command, [], []};
+mk_cmd(OsType,Cmd) when is_atom(Cmd) ->
+    mk_cmd(OsType, atom_to_list(Cmd));
+mk_cmd(_,Cmd) ->
+    %% Have to send command in like this in order to make sh commands like
+    %% cd and ulimit available
+    {"/bin/sh -s unix:cmd", [out],
+     %% We insert a new line after the command, in case the command
+     %% contains a comment character.
+     ["(", unicode:characters_to_binary(Cmd), "\n); exit\n"]}.
 
 validate(Atom) when is_atom(Atom) ->
     ok;
@@ -397,7 +270,7 @@ validate1([]) ->
 get_data(Port, Sofar) ->
     receive
 	{Port, {data, Bytes}} ->
-	    get_data(Port, [Sofar|Bytes]);
+	    get_data(Port, [Sofar,Bytes]);
 	{Port, eof} ->
 	    Port ! {self(), close},
 	    receive
@@ -410,5 +283,5 @@ get_data(Port, Sofar) ->
 	    after 1 ->				% force context switch
 		    ok
 	    end,
-	    lists:flatten(Sofar)
+	    iolist_to_binary(Sofar)
     end.
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index d3db8eb80a..5f83713cf7 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -52,10 +52,6 @@
 	 parallel_eval/1,
 	 pmap/3, pinfo/1, pinfo/2]).
 
-%% Deprecated calls.
--deprecated([{safe_multi_server_call,2},{safe_multi_server_call,3}]).
--export([safe_multi_server_call/2,safe_multi_server_call/3]).
-
 %% gen_server exports
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
 	 terminate/2, code_change/3]).
@@ -357,8 +353,12 @@ do_call(Node, Request, Timeout) ->
 rpc_check_t({'EXIT', {timeout,_}}) -> {badrpc, timeout};
 rpc_check_t(X) -> rpc_check(X).
 	    
-rpc_check({'EXIT', {{nodedown,_},_}}) -> {badrpc, nodedown};
-rpc_check({'EXIT', X}) -> exit(X);
+rpc_check({'EXIT', {{nodedown,_},_}}) ->
+    {badrpc, nodedown};
+rpc_check({'EXIT', _}=Exit) ->
+    %% Should only happen if the rex process on the other node
+    %% died.
+    {badrpc, Exit};
 rpc_check(X) -> X.
 
 
@@ -587,27 +587,6 @@ multi_server_call(Nodes, Name, Msg)
     Monitors = send_nodes(Nodes, Name, Msg, []),
     rec_nodes(Name, Monitors).
 
-%% Deprecated functions. Were only needed when communicating with R6 nodes.
-
--spec safe_multi_server_call(Name, Msg) -> {Replies, BadNodes} when
-      Name :: atom(),
-      Msg :: term(),
-      Replies :: [Reply :: term()],
-      BadNodes :: [node()].
-
-safe_multi_server_call(Name, Msg) ->
-    multi_server_call(Name, Msg).
-
--spec safe_multi_server_call(Nodes, Name, Msg) -> {Replies, BadNodes} when
-      Nodes :: [node()],
-      Name :: atom(),
-      Msg :: term(),
-      Replies :: [Reply :: term()],
-      BadNodes :: [node()].
-
-safe_multi_server_call(Nodes, Name, Msg) ->
-    multi_server_call(Nodes, Name, Msg).
-
 
 rec_nodes(Name, Nodes) -> 
     rec_nodes(Name, Nodes, [], []).
@@ -748,6 +727,11 @@ pinfo(Pid) ->
 -spec pinfo(Pid, Item) -> {Item, Info} | undefined | [] when
       Pid :: pid(),
       Item :: atom(),
+      Info :: term();
+           (Pid, ItemList) -> [{Item, Info}] | undefined | [] when
+      Pid :: pid(),
+      Item :: atom(),
+      ItemList :: [Item],
       Info :: term().
 
 pinfo(Pid, Item) when node(Pid) =:= node() ->
diff --git a/lib/kernel/src/seq_trace.erl b/lib/kernel/src/seq_trace.erl
index 07ccd3e494..a7a782c29c 100644
--- a/lib/kernel/src/seq_trace.erl
+++ b/lib/kernel/src/seq_trace.erl
@@ -23,7 +23,9 @@
 -define(SEQ_TRACE_SEND, 1).       %(1 << 0)
 -define(SEQ_TRACE_RECEIVE, 2).    %(1 << 1)
 -define(SEQ_TRACE_PRINT, 4).      %(1 << 2)
--define(SEQ_TRACE_TIMESTAMP, 8).  %(1 << 3)
+-define(SEQ_TRACE_NOW_TIMESTAMP, 8). %(1 << 3)
+-define(SEQ_TRACE_STRICT_MON_TIMESTAMP, 16). %(1 << 4)
+-define(SEQ_TRACE_MON_TIMESTAMP, 32). %(1 << 5)
 
 -export([set_token/1,
 	 set_token/2,
@@ -37,7 +39,7 @@
 
 %%---------------------------------------------------------------------------
 
--type flag()       :: 'send' | 'receive' | 'print' | 'timestamp'.
+-type flag()       :: 'send' | 'receive' | 'print' | 'timestamp' | 'monotonic_timestamp' | 'strict_monotonic_timestamp'.
 -type component()  :: 'label' | 'serial' | flag().
 -type value()      :: (Integer :: non_neg_integer())
                     | {Previous :: non_neg_integer(),
@@ -135,5 +137,9 @@ decode_flags(Flags) ->
     Print = (Flags band ?SEQ_TRACE_PRINT) > 0,
     Send = (Flags band ?SEQ_TRACE_SEND) > 0,
     Rec = (Flags band ?SEQ_TRACE_RECEIVE) > 0,
-    Ts = (Flags band ?SEQ_TRACE_TIMESTAMP) > 0,
-    [{print,Print},{send,Send},{'receive',Rec},{timestamp,Ts}].
+    NowTs = (Flags band ?SEQ_TRACE_NOW_TIMESTAMP) > 0,
+    StrictMonTs = (Flags band ?SEQ_TRACE_STRICT_MON_TIMESTAMP) > 0,
+    MonTs = (Flags band ?SEQ_TRACE_MON_TIMESTAMP) > 0,
+    [{print,Print},{send,Send},{'receive',Rec},{timestamp,NowTs},
+     {strict_monotonic_timestamp, StrictMonTs},
+     {monotonic_timestamp, MonTs}].
diff --git a/lib/kernel/src/user_drv.erl b/lib/kernel/src/user_drv.erl
index ca3c53ff93..b794d4f45e 100644
--- a/lib/kernel/src/user_drv.erl
+++ b/lib/kernel/src/user_drv.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -559,6 +559,7 @@ put_int16(N, Tail) ->
 %% is sent back to the process sending the request. This command was added in
 %% OTP 18 to make sure that data sent from io:format is actually printed
 %% to the console before the vm stops when calling erlang:halt(integer()).
+-dialyzer({no_improper_lists, io_command/1}).
 io_command({put_chars_sync, unicode,Cs,Reply}) ->
     {{command,[?OP_PUTC_SYNC|unicode:characters_to_binary(Cs,utf8)]},Reply};
 io_command({put_chars, unicode,Cs}) ->
diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index 9e972b4f95..7b233741e0 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -79,7 +79,8 @@ MODULES= \
 	zlib_SUITE \
 	loose_node \
 	sendfile_SUITE \
-	standard_error_SUITE
+	standard_error_SUITE \
+	multi_load_SUITE
 
 APP_FILES = \
 	appinc.app \
@@ -112,7 +113,7 @@ RELSYSDIR = $(RELEASE_PATH)/kernel_test
 # ----------------------------------------------------
 
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index 0c198b90ae..a0a7632d1b 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(application_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2
@@ -40,14 +40,14 @@
 	 shutdown_func/1, do_shutdown/1, shutdown_timeout/1, shutdown_deadlock/1]).
 
 -define(TESTCASE, testcase_name).
--define(testcase, ?config(?TESTCASE, Config)).
+-define(testcase, proplists:get_value(?TESTCASE, Config)).
 
 -export([init_per_testcase/2, end_per_testcase/2, start_type/0, 
 	 start_phase/0, conf_change/0]).
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(2)).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     [failover, failover_comp, permissions, load,
@@ -81,21 +81,15 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(otp_2973=Case, Config) ->
-    code:add_path(?config(data_dir,Config)),
-    Dog = test_server:timetrap(?default_timeout),
-    [{?TESTCASE, Case}, {watchdog, Dog}|Config];
+    code:add_path(proplists:get_value(data_dir,Config)),
+    [{?TESTCASE, Case}|Config];
 init_per_testcase(Case, Config) ->
-    Dog = test_server:timetrap(?default_timeout),
-    [{?TESTCASE, Case}, {watchdog, Dog}|Config].
+    [{?TESTCASE, Case}|Config].
 
 end_per_testcase(otp_2973, Config) ->
-    code:del_path(?config(data_dir,Config)),
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    code:del_path(proplists:get_value(data_dir,Config)),
     ok;
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
 -define(UNTIL(Seq), loop_until_true(fun() -> Seq end)).
@@ -120,10 +114,8 @@ loop_until_true(Fun) ->
 %% Should be started in a CC view with:
 %% erl -sname XXX -rsh ctrsh where XX not in [cp1, cp2, cp3]
 %%-----------------------------------------------------------------
-failover(suite) -> [];
-failover(doc) ->
-    ["Tests failover and takeover for distributed applications.  Tests",
-     "start, load etc implicitly."];
+%% Tests failover and takeover for distributed applications.  Tests
+%% start, load etc implicitly.
 failover(Conf) when is_list(Conf) ->
     %% start a help process to check the start type
     StPid = spawn_link(?MODULE, start_type, []),
@@ -133,14 +125,14 @@ failover(Conf) when is_list(Conf) ->
     NoSyncTime = config_fun_fast(config_fo(NodeNames)),
     WithSyncTime = config_fun(config_fo(NodeNames)),
 
-    % Test [cp1, cp2, cp3]
+    %% Test [cp1, cp2, cp3]
     {ok, Cp1} = start_node_config(Ncp1, NoSyncTime, Conf),
     {ok, Cp2} = start_node_config(Ncp2, NoSyncTime, Conf),
     {ok, Cp3} = start_node_config(Ncp3, WithSyncTime, Conf),
     Cps = [Cp1, Cp2, Cp3],
     wait_for_ready_net(),
 
-    % Start app1 and make sure cp1 starts it
+    %% Start app1 and make sure cp1 starts it
     {[ok,ok,ok],[]} = 
         rpc:multicall(Cps, application, load, [app1()]),
     ?UNTIL(is_loaded(app1, Cps)),
@@ -150,12 +142,12 @@ failover(Conf) when is_list(Conf) ->
     false = is_started(app1, Cp2),
     ok = get_start_type(#st{normal = 3}),
 
-    % Stop cp1 and make sure cp2 starts app1
+    %% Stop cp1 and make sure cp2 starts app1
     stop_node_nice(Cp1),
     ?UNTIL(is_started(app1, Cp2)),
     ok = get_start_type(#st{normal = 3}),
 
-    % Restart cp1 and make sure it restarts app1
+    %% Restart cp1 and make sure it restarts app1
     {ok, Cp1_2} = start_node_config(Ncp1, NoSyncTime, Conf),
     global:sync(),
     ok = rpc:call(Cp1_2, application, load, [app1()]),
@@ -164,8 +156,8 @@ failover(Conf) when is_list(Conf) ->
     ?UNTIL(not is_started(app1, Cp2)),
     ok = get_start_type(#st{takeover = 3}),
 
-    % Test [{cp1, cp2}, cp3]
-    % Start app_sp and make sure cp2 starts it (cp1 has more apps started)
+    %% Test [{cp1, cp2}, cp3]
+    %% Start app_sp and make sure cp2 starts it (cp1 has more apps started)
     {[ok,ok,ok],[]} =
         rpc:multicall([Cp1_2, Cp2, Cp3], application, load, [app_sp()]),
     {[ok,ok,ok],[]} = 
@@ -175,17 +167,17 @@ failover(Conf) when is_list(Conf) ->
     false = is_started(app_sp, Cp3),
     ok = get_start_type(#st{normal = 3}),
 	
-    % Stop cp2 and make sure cp1 starts app_sp
+    %% Stop cp2 and make sure cp1 starts app_sp
     stop_node_nice(Cp2),
     ?UNTIL(is_started(app_sp, Cp1_2)),
     ok = get_start_type(#st{failover = 3}),
 	
-    % Stop cp1 and make sure cp3 starts app_sp
+    %% Stop cp1 and make sure cp3 starts app_sp
     stop_node_nice(Cp1_2),
     ?UNTIL(is_started(app_sp, Cp3)),
     ok = get_start_type(#st{normal = 3, failover = 3}),
 
-    % Restart cp2 and make sure it restarts app_sp
+    %% Restart cp2 and make sure it restarts app_sp
     {ok, Cp2_2} = start_node_config(Ncp2, NoSyncTime, Conf),
     global:sync(),
     ok = rpc:call(Cp2_2, application, load, [app_sp()]),
@@ -194,16 +186,16 @@ failover(Conf) when is_list(Conf) ->
     ?UNTIL(not is_started(app_sp, Cp3)),
     ok = get_start_type(#st{takeover = 3}),
 
-    % Restart cp1 and make sure it doesn't restart app_sp
+    %% Restart cp1 and make sure it doesn't restart app_sp
     {ok, Cp1_3} = start_node_config(Ncp1, NoSyncTime, Conf),
     global:sync(),
     ok = rpc:call(Cp1_3, application, load, [app_sp()]),
     ok = rpc:call(Cp1_3, application, start, [app_sp, permanent]),
-    test_server:sleep(500),
+    ct:sleep(500),
     false = is_started(app_sp, Cp1_3),
     true = is_started(app_sp, Cp2_2),
 
-    % Force takeover to cp1
+    %% Force takeover to cp1
     ok = rpc:call(Cp1_3, application, takeover, [app_sp, permanent]),
     ?UNTIL(is_started(app_sp, Cp1_3)),
     ?UNTIL(not is_started(app_sp, Cp2_2)),
@@ -225,11 +217,9 @@ failover(Conf) when is_list(Conf) ->
 %% Should be started in a CC view with:
 %% erl -sname XXX -rsh ctrsh where XX not in [cp1, cp2, cp3]
 %%-----------------------------------------------------------------
-failover_comp(suite) -> [];
-failover_comp(doc) ->
-    ["Tests failover and takeover for distributed applications.  Tests",
-     "start, load etc implicitly. The applications do not use start_phases,"
-     "i.e the failover should be trasfered to normal start type."];
+%% Tests failover and takeover for distributed applications.  Tests
+%% start, load etc implicitly. The applications do not use start_phases
+%% i.e. the failover should be transfered to normal start type.
 failover_comp(Conf) when is_list(Conf) ->
     %% start a help process to check the start type
     StPid = spawn_link(?MODULE, start_type, []),
@@ -239,14 +229,14 @@ failover_comp(Conf) when is_list(Conf) ->
     NoSyncTime = config_fun_fast(config(NodeNames)),
     WithSyncTime = config_fun(config(NodeNames)),
 
-    % Test [cp1, cp2, cp3]
+    %% Test [cp1, cp2, cp3]
     {ok, Cp1} = start_node_config(Ncp1, NoSyncTime, Conf),
     {ok, Cp2} = start_node_config(Ncp2, NoSyncTime, Conf),
     {ok, Cp3} = start_node_config(Ncp3, WithSyncTime, Conf),
     Cps = [Cp1, Cp2, Cp3],
     wait_for_ready_net(),
 
-    % Start app1 and make sure cp1 starts it
+    %% Start app1 and make sure cp1 starts it
     {[ok,ok,ok],[]} = 
         rpc:multicall(Cps, application, load, [app1()]),
     ?UNTIL(is_loaded(app1, Cps)),
@@ -256,12 +246,12 @@ failover_comp(Conf) when is_list(Conf) ->
     false = is_started(app1, Cp2),
     ok = get_start_type(#st{normal = 3}),
 
-    % Stop cp1 and make sure cp2 starts app1
+    %% Stop cp1 and make sure cp2 starts app1
     stop_node_nice(Cp1),
     ?UNTIL(is_started(app1, Cp2)),
     ok = get_start_type(#st{normal = 3}),
 
-    % Restart cp1 and make sure it restarts app1
+    %% Restart cp1 and make sure it restarts app1
     {ok, Cp1_2} = start_node_config(Ncp1, NoSyncTime, Conf),
     global:sync(),
     ok = rpc:call(Cp1_2, application, load, [app1()]),
@@ -271,8 +261,8 @@ failover_comp(Conf) when is_list(Conf) ->
     ?UNTIL(not is_started(app1, Cp2)),
     ok = get_start_type(#st{takeover = 3}),
 
-    % Test [{cp1, cp2}, cp3]
-    % Start app3 and make sure cp2 starts it (cp1 has more apps started)
+    %% Test [{cp1, cp2}, cp3]
+    %% Start app3 and make sure cp2 starts it (cp1 has more apps started)
     {[ok,ok,ok],[]} =
         rpc:multicall([Cp1_2, Cp2, Cp3], application, load, [app3()]),
     ?UNTIL(is_loaded(app3, [Cp1_2, Cp2, Cp3])),
@@ -283,17 +273,17 @@ failover_comp(Conf) when is_list(Conf) ->
     false = is_started(app3, Cp3),
     ok = get_start_type(#st{normal = 3}),
 	
-    % Stop cp2 and make sure cp1 starts app3
+    %% Stop cp2 and make sure cp1 starts app3
     stop_node_nice(Cp2),
     ?UNTIL(is_started(app3, Cp1_2)),
     ok = get_start_type(#st{normal = 3}),
 	
-    % Stop cp1 and make sure cp3 starts app3
+    %% Stop cp1 and make sure cp3 starts app3
     stop_node_nice(Cp1_2),
     ?UNTIL(is_started(app3, Cp3)),
     ok = get_start_type(#st{normal = 6}),
 
-    % Restart cp2 and make sure it restarts app3
+    %% Restart cp2 and make sure it restarts app3
     {ok, Cp2_2} = start_node_config(Ncp2, NoSyncTime, Conf),
     global:sync(),
     ok = rpc:call(Cp2_2, application, load, [app3()]),
@@ -303,17 +293,17 @@ failover_comp(Conf) when is_list(Conf) ->
     ?UNTIL(not is_started(app3, Cp3)),
     ok = get_start_type(#st{takeover = 3}),
 
-    % Restart cp1 and make sure it doesn't restart app3
+    %% Restart cp1 and make sure it doesn't restart app3
     {ok, Cp1_3} = start_node_config(Ncp1, NoSyncTime, Conf),
     global:sync(),
     ok = rpc:call(Cp1_3, application, load, [app3()]),
     true = is_loaded(app3, Cp1_3),
     ok = rpc:call(Cp1_3, application, start, [app3, permanent]),
-    test_server:sleep(5000),
+    ct:sleep(5000),
     false = is_started(app3, Cp1_3),
     true = is_started(app3, Cp2_2),
 
-    % Force takeover to cp1
+    %% Force takeover to cp1
     ok = rpc:call(Cp1_3, application, takeover, [app3, permanent]),
     ?UNTIL(is_started(app3, Cp1_3)),
     ?UNTIL(not is_started(app3, Cp2_2)),
@@ -335,23 +325,21 @@ failover_comp(Conf) when is_list(Conf) ->
 %% Should be started in a CC view with:
 %% erl -sname XXX -rsh ctrsh where XX not in [cp1, cp2, cp3]
 %%-----------------------------------------------------------------
-permissions(suite) -> [];
-permissions(doc) ->
-    ["Tests permissions for distributed applications."];
+%% Tests permissions for distributed applications.
 permissions(Conf) when is_list(Conf) ->
 
     NodeNames = [Ncp1, Ncp2, Ncp3] = node_names([cp1, cp2, cp3], Conf),
     NoSyncTime = config_fun_fast(config2(NodeNames)),
     WithSyncTime = config_fun(config2(NodeNames)),
 
-    % Test [cp1, cp2, cp3]
+    %% Test [cp1, cp2, cp3]
     {ok, Cp1} = start_node_config(Ncp1, NoSyncTime, Conf),
     {ok, Cp2} = start_node_config(Ncp2, NoSyncTime, Conf),
     {ok, Cp3} = start_node_config(Ncp3, WithSyncTime, Conf),
     Cps = [Cp1, Cp2, Cp3],
     wait_for_ready_net(),
 
-    % Start app1 and make sure cp1 starts it
+    %% Start app1 and make sure cp1 starts it
     {[ok,ok,ok],[]} =
         rpc:multicall(Cps, application, load, [app1()]),
     ?UNTIL(is_loaded(app1, Cps)),
@@ -360,50 +348,50 @@ permissions(Conf) when is_list(Conf) ->
     ?UNTIL(is_started(app1, Cp1)),
     false = is_started(app1, Cp2),
 
-    % Unpermit app1 on cp1, make sure cp2 starts it
+    %% Unpermit app1 on cp1, make sure cp2 starts it
     ok = rpc:call(Cp1, application, permit, [app1, false]),
     false = is_started(app1, Cp1),
     true = is_started(app1, Cp2),
 
-    % Unpermit app1 on cp2, make sure cp3 starts it
+    %% Unpermit app1 on cp2, make sure cp3 starts it
     ok = rpc:call(Cp2, application, permit, [app1, false]),
     false = is_started(app1, Cp1),
     false = is_started(app1, Cp2),
     true = is_started(app1, Cp3),
 
-    % Permit cp2 again
+    %% Permit cp2 again
     ok = rpc:call(Cp2, application, permit, [app1, true]),
     false = is_started(app1, Cp1),
     false = is_started(app1, Cp3),
     true = is_started(app1, Cp2),
 
-    % Start app3, make sure noone starts it
+    %% Start app3, make sure noone starts it
     {[ok,ok,ok],[]} = 
         rpc:multicall(Cps, application, load, [app3()]),
     ?UNTIL(is_loaded(app3, Cps)),
     {[ok,ok,ok],[]} = 
         rpc:multicall(Cps, application, start, [app3, permanent]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     false = is_started(app3, Cp1),
     false = is_started(app3, Cp2),
     false = is_started(app3, Cp3),
 
-    % Permit app3 on Cp3
+    %% Permit app3 on Cp3
     ok = rpc:call(Cp3, application, permit, [app3, true]),
     true = is_started(app3, Cp3),
 
-    % Permit app3 on Cp2, make sure it starts it
+    %% Permit app3 on Cp2, make sure it starts it
     ok = rpc:call(Cp2, application, permit, [app3, true]),
     true = is_started(app3, Cp2),
     false = is_started(app3, Cp3),
 
-    % Permit app3 on Cp1, make sure it doesn't start it
+    %% Permit app3 on Cp1, make sure it doesn't start it
     ok = rpc:call(Cp1, application, permit, [app3, true]),
     false = is_started(app3, Cp1),
     true = is_started(app3, Cp2),
     false = is_started(app3, Cp3),
 
-    % Stop Cp2, make sure Cp1 starts app3
+    %% Stop Cp2, make sure Cp1 starts app3
     stop_node_nice(Cp2),
     ?UNTIL(is_started(app3, Cp1)),
 
@@ -415,15 +403,13 @@ permissions(Conf) when is_list(Conf) ->
 %% Should be started in a CC view with:
 %% erl -sname XXX -rsh ctrsh where XX not in [cp1, cp2, cp3]
 %%-----------------------------------------------------------------
-load(suite) -> [];
-load(doc) ->
-    ["Tests loading of distributed applications."];
+%% Tests loading of distributed applications.
 load(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2, Ncp3] = node_names([cp1, cp2, cp3], Conf),
     NoSyncTime = config_fun_fast(config3(NodeNames)),
     WithSyncTime = config_fun(config3(NodeNames)),
 
-    % Test [cp1, cp2, cp3]
+    %% Test [cp1, cp2, cp3]
     {ok, Cp1} = start_node_config(Ncp1, NoSyncTime, Conf),
     {ok, Cp2} = start_node_config(Ncp2, NoSyncTime, Conf),
     {ok, Cp3} = start_node_config(Ncp3, WithSyncTime, Conf),
@@ -439,7 +425,7 @@ load(Conf) when is_list(Conf) ->
     false = is_started(app1, Cp2),
     false = is_started(app1, Cp3),
 
-    % Load app1 with different specs and make sure we get an error
+    %% Load app1 with different specs and make sure we get an error
     {[{error,_},{error,_}],[]} = 
         rpc:multicall([Cp1, Cp2], application, load, [app1(), d1(NodeNames)]),
     {error, _} = rpc:call(Cp3, application, load, [app1(), d2(NodeNames)]),
@@ -452,15 +438,13 @@ load(Conf) when is_list(Conf) ->
 %%-----------------------------------------------------------------
 %% Same test as load/1, only with code path cache enabled.
 %%-----------------------------------------------------------------
-load_use_cache(suite) -> [];
-load_use_cache(doc) ->
-    ["Tests loading of distributed applications. Code path cache enabled."];
+%% Tests loading of distributed applications. Code path cache enabled.
 load_use_cache(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2, Ncp3] = node_names([cp1, cp2, cp3], Conf),
     NoSyncTime = config_fun_fast(config3(NodeNames)),
     WithSyncTime = config_fun(config3(NodeNames)),
 
-    % Test [cp1, cp2, cp3]
+    %% Test [cp1, cp2, cp3]
     {ok, Cp1} = start_node_with_cache(Ncp1, NoSyncTime, Conf),
     {ok, Cp2} = start_node_with_cache(Ncp2, NoSyncTime, Conf),
     {ok, Cp3} = start_node_with_cache(Ncp3, WithSyncTime, Conf),
@@ -475,7 +459,7 @@ load_use_cache(Conf) when is_list(Conf) ->
     ?UNTIL(is_started(app1, Cp1)),
     false = is_started(app1, Cp2),
 
-    % Load app1 with different specs and make sure we get an error
+    %% Load app1 with different specs and make sure we get an error
     {[{error,_},{error,_}],[]} = 
         rpc:multicall([Cp1, Cp2], application, load, [app1(), d1(NodeNames)]),
     {error, _} = rpc:call(Cp3, application, load, [app1(), d2(NodeNames)]),
@@ -489,9 +473,7 @@ load_use_cache(Conf) when is_list(Conf) ->
 %% Should be started in a CC view with:
 %% erl -sname XXX -rsh ctrsh where XX not in [cp1, cp2, cp3]
 %%-----------------------------------------------------------------
-start_phases(suite) -> [];
-start_phases(doc) ->
-    ["Tests new start phases and failover."];
+%% Tests new start phases and failover.
 start_phases(Conf) when is_list(Conf) ->
     %% start a help process to check the start type
     SpPid = spawn_link(?MODULE, start_phase, []),
@@ -553,17 +535,15 @@ start_phases(Conf) when is_list(Conf) ->
     ok.
 
 
-script_start(doc) ->
-    ["Start distributed applications from within a boot script.  Test ",
-     "same as failover."];
-script_start(suite) -> [];
+%% Start distributed applications from within a boot script.  Test
+%%  same as failover.
 script_start(Conf) when is_list(Conf) ->
     %% start a help process to check the start type
     StPid = spawn_link(?MODULE, start_type, []),
     yes = global:register_name(st_type, StPid),
 
 
-    % Create the .app files and the boot script
+    %% Create the .app files and the boot script
     ok = create_app(),
     {{KernelVer,StdlibVer}, _} = create_script("latest"),
     case is_real_system(KernelVer, StdlibVer) of
@@ -578,7 +558,7 @@ script_start(Conf) when is_list(Conf) ->
     NoSyncTime = config_fun_fast(config_fo(NodeNames)),
     WithSyncTime = config_fun(config_fo(NodeNames)),
 
-    % Test [cp1, cp2, cp3]
+    %% Test [cp1, cp2, cp3]
     {ok, Cp1} = start_node_boot_config(Ncp1, NoSyncTime, Conf, latest),
     {ok, Cp2} = start_node_boot_config(Ncp2, NoSyncTime, Conf, latest),
     {ok, Cp3} = start_node_boot_config(Ncp3, WithSyncTime, Conf, latest),
@@ -590,16 +570,16 @@ script_start(Conf) when is_list(Conf) ->
     false = is_started(app1, Cp2),
     ok = get_start_type(#st{normal = 9}),
 
-    % Stop cp1 and make sure cp2 starts app1, app2 normally (no
-    % start_phases defined) and app_sp as failover (start_phases
-    % defined)
+    %% Stop cp1 and make sure cp2 starts app1, app2 normally (no
+    %% start_phases defined) and app_sp as failover (start_phases
+    %% defined)
     stop_node_nice(Cp1),
     ?UNTIL(is_started(app1, Cp2)),
     ?UNTIL(is_started(app2, Cp2)),
     ?UNTIL(is_started(app_sp, Cp2)),
     ok = get_start_type(#st{normal = 6, failover = 3}),
 	
-    % Restart cp1, Cp1 takesover app1 and app2
+    %% Restart cp1, Cp1 takesover app1 and app2
     {ok, Cp1_2} = start_node_boot_config(Ncp1, NoSyncTime, Conf, latest),
     global:sync(),
     ?UNTIL(is_started(app1, Cp1_2)),
@@ -610,20 +590,20 @@ script_start(Conf) when is_list(Conf) ->
     ?UNTIL(not is_started(app2, Cp2)),
     ok = get_start_type(#st{takeover = 6}),
 	
-    % Stop cp2 and make sure cp1 starts app_sp.
+    %% Stop cp2 and make sure cp1 starts app_sp.
     false = is_started(app_sp, Cp1_2),
     stop_node_nice(Cp2),
     ?UNTIL(is_started(app_sp, Cp1_2)),
     ok = get_start_type(#st{failover = 3}),
 	
-    % Stop cp1 and make sure cp3 starts app1, app2 and app_sp
+    %% Stop cp1 and make sure cp3 starts app1, app2 and app_sp
     stop_node_nice(Cp1_2),
     ?UNTIL(is_started(app_sp, Cp3)),
     ?UNTIL(is_started(app1, Cp3)),
     ?UNTIL(is_started(app2, Cp3)),
     ok = get_start_type(#st{normal = 6, failover = 3}),
 	
-    % Restart cp2 and make sure it takesover app1, app2 and app_sp
+    %% Restart cp2 and make sure it takesover app1, app2 and app_sp
     {ok, Cp2_2} = start_node_boot_config(Ncp2, NoSyncTime, Conf, latest),
     global:sync(),
     ?UNTIL(is_started(app_sp, Cp2_2)),
@@ -634,7 +614,7 @@ script_start(Conf) when is_list(Conf) ->
     ?UNTIL(not is_started(app2, Cp3)),
     ok = get_start_type(#st{takeover = 9}),
 
-    % Restart cp1 and make sure it takesover app1, app2
+    %% Restart cp1 and make sure it takesover app1, app2
     {ok, Cp1_3} = start_node_boot_config(Ncp1, NoSyncTime, Conf, latest),
     global:sync(),
     ?UNTIL(is_started(app1, Cp1_3)),
@@ -645,7 +625,7 @@ script_start(Conf) when is_list(Conf) ->
     ?UNTIL(not is_started(app2, Cp2_2)),
     ok = get_start_type(#st{takeover = 6}),
 
-    % Force takeover to cp1
+    %% Force takeover to cp1
     ok = rpc:call(Cp1_3, application, takeover, [app_sp, permanent]),
     ?UNTIL(is_started(app_sp, Cp1_3)),
     ?UNTIL(not is_started(app_sp, Cp2_2)),
@@ -668,15 +648,13 @@ script_start(Conf) when is_list(Conf) ->
 
     ok.
 
-permit_false_start_local(doc) ->
-    ["Start local applications with permission false.  Set",
-     "permit true on different nodes."];
-permit_false_start_local(suite) -> [];
+%% Start local applications with permission false.  Set
+%% permit true on different nodes.
 permit_false_start_local(Conf) when is_list(Conf) ->
     %% This configuration does not start dist_ac.
     Config = write_config_file(fun config_perm/1, Conf),
 
-    % Test [cp1, cp2, cp3]
+    %% Test [cp1, cp2, cp3]
     [Ncp1, Ncp2, Ncp3] = node_names([cp1, cp2, cp3], Conf),
     {ok, Cp1} = start_node(Ncp1, Config),
     {ok, Cp2} = start_node(Ncp2, Config),
@@ -694,99 +672,99 @@ permit_false_start_local(Conf) when is_list(Conf) ->
     {[ok,ok,ok],[]} = 
         rpc:multicall([Cp1, Cp2, Cp3], application, load, [app3()]),
 
-    test_server:sleep(1000),
+    ct:sleep(1000),
     false = is_started(app1, Cp1),
     false = is_started(app1, Cp2),
     false = is_started(app1, Cp3),
 
-    %Permit a not started application
+    %% Permit a not started application
     ok = rpc:call(Cp1, application, permit, [app3, true]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     false = is_started(app3, Cp1),
     false = is_started(app3, Cp2),
     false = is_started(app3, Cp3),
 
-    %Permit a not loaded application
+    %% Permit a not loaded application
     {error,{not_loaded,app_notloaded}} = 
 	rpc:call(Cp1, application, permit, [app_notloaded, true]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     false = is_started(app_notloaded, Cp1),
     false = is_started(app_notloaded, Cp2),
     false = is_started(app_notloaded, Cp3),
 
-    %Unpermit a not started application
+    %% Unpermit a not started application
     ok = rpc:call(Cp1, application, permit, [app3, false]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     false = is_started(app3, Cp1),
     false = is_started(app3, Cp2),
     false = is_started(app3, Cp3),
 
-    %Unpermit a not loaded application
+    %% Unpermit a not loaded application
     {error,{not_loaded,app_notloaded}} = 
 	rpc:call(Cp1, application, permit, [app_notloaded, false]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     false = is_started(app_notloaded, Cp1),
     false = is_started(app_notloaded, Cp2),
     false = is_started(app_notloaded, Cp3),
 
-    % Permit app1 on CP1 and make sure it is started
+    %% Permit app1 on CP1 and make sure it is started
     ok = rpc:call(Cp1, application, permit, [app1, true]),
     ?UNTIL(is_started(app1, Cp1)),
     false = is_started(app1, Cp2),
     false = is_started(app1, Cp3),
 
-    % Permit it again
+    %% Permit it again
     ok = rpc:call(Cp1, application, permit, [app1, true]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     true = is_started(app1, Cp1),
     false = is_started(app1, Cp2),
     false = is_started(app1, Cp3),
 
-    % Permit app2 on CP1 and make sure it is started
+    %% Permit app2 on CP1 and make sure it is started
     ok = rpc:call(Cp1, application, permit, [app2, true]),
     ?UNTIL(is_started(app2, Cp1)),
     false = is_started(app2, Cp2),
     false = is_started(app2, Cp3),
 
-    % Permit app1 on CP2 and make sure it is started
+    %% Permit app1 on CP2 and make sure it is started
     ok = rpc:call(Cp2, application, permit, [app1, true]),
     ?UNTIL(is_started(app1, Cp2)),
     true = is_started(app1, Cp1),
     false = is_started(app1, Cp3),
 
-    % Unpermit app1 on CP1 and make sure it is stopped
+    %% Unpermit app1 on CP1 and make sure it is stopped
     ok = rpc:call(Cp1, application, permit, [app1, false]),
     ?UNTIL(false =:= is_started(app1, Cp1)),
     true = is_started(app1, Cp2),
     false = is_started(app1, Cp3),
 
-    % Unpermit it agin
+    %% Unpermit it agin
     ok = rpc:call(Cp1, application, permit, [app1, false]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     false = is_started(app1, Cp1),
     true = is_started(app1, Cp2),
     false = is_started(app1, Cp3),
 
-    % Permit app1 on CP1 and make sure it is started
+    %% Permit app1 on CP1 and make sure it is started
     ok = rpc:call(Cp1, application, permit, [app1, true]),
     ?UNTIL(is_started(app1, Cp1)),
     true = is_started(app1, Cp2),
     false = is_started(app1, Cp3),
 
-    % Unpermit app1 on CP1 and make sure it is stopped
+    %% Unpermit app1 on CP1 and make sure it is stopped
     ok = rpc:call(Cp1, application, permit, [app1, false]),
     ?UNTIL(false =:= is_started(app1, Cp1)),
     true = is_started(app1, Cp2),
     false = is_started(app1, Cp3),
 
-    % Unpermit app1 on CP2 and make sure it is stopped
+    %% Unpermit app1 on CP2 and make sure it is stopped
     ok = rpc:call(Cp2, application, permit, [app1, false]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     ?UNTIL(false =:= is_started(app1, Cp2)),
     false = is_started(app1, Cp1),
     false = is_started(app1, Cp3),
 
-    % Unpermit app2 on CP1 and make sure it is stopped
+    %% Unpermit app2 on CP1 and make sure it is stopped
     ok = rpc:call(Cp1, application, permit, [app2, false]),
     ?UNTIL(false =:= is_started(app2, Cp2)),
     false = is_started(app2, Cp1),
@@ -798,16 +776,14 @@ permit_false_start_local(Conf) when is_list(Conf) ->
     ok.
     
 
-permit_false_start_dist(doc) ->
-    ["Start distributed applications with permission false.  Set",
-     "permit true on different nodes."];
-permit_false_start_dist(suite) -> [];
+%% Start distributed applications with permission false.  Set
+%% permit true on different nodes.
 permit_false_start_dist(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2, Ncp3] = node_names([cp1, cp2, cp3], Conf),
     NoSyncTime = config_fun_fast(config_perm2(NodeNames)),
     WithSyncTime = config_fun(config_perm2(NodeNames)),
 
-    % Test [cp1, cp2, cp3]
+    %% Test [cp1, cp2, cp3]
     {ok, Cp1} = start_node_config(Ncp1, NoSyncTime, Conf),
     {ok, Cp2} = start_node_config(Ncp2, NoSyncTime, Conf),
     {ok, Cp3} = start_node_config(Ncp3, WithSyncTime, Conf),
@@ -822,36 +798,36 @@ permit_false_start_dist(Conf) when is_list(Conf) ->
     {[ok,ok,ok],[]} = 
         rpc:multicall(Cps, application, load, [app2()]),
 
-    test_server:sleep(1000),
+    ct:sleep(1000),
     false = is_started(app1, Cp1),
     false = is_started(app1, Cp2),
     false = is_started(app1, Cp3),
 
-    %Permit a not started application
+    %% Permit a not started application
     ok = rpc:call(Cp1, application, permit, [app2, true]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     false = is_started(app2, Cp1),
     false = is_started(app2, Cp2),
     false = is_started(app2, Cp3),
 
-    %Permit a not loaded application
+    %% Permit a not loaded application
     {error,{not_loaded,app3}} = 
 	rpc:call(Cp1, application, permit, [app3, true]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     false = is_started(app3, Cp1),
     false = is_started(app3, Cp2),
     false = is_started(app3, Cp3),
 
-    %Unpermit a not started application
+    %% Unpermit a not started application
     ok = rpc:call(Cp1, application, permit, [app2, false]),
     {[ok,ok,ok],[]} = 
         rpc:multicall([Cp1, Cp2, Cp3], application, start, [app2, permanent]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     false = is_started(app2, Cp1),
     false = is_started(app2, Cp2),
     false = is_started(app2, Cp3),
 
-    %Unpermit a not loaded application
+    %% Unpermit a not loaded application
     {error,{not_loaded,app3}} = 
 	rpc:call(Cp1, application, permit, [app3, false]),
     {[ok,ok,ok],[]} = 
@@ -859,42 +835,42 @@ permit_false_start_dist(Conf) when is_list(Conf) ->
     ?UNTIL(is_loaded(app3, Cps)),
     {[ok,ok,ok],[]} = 
         rpc:multicall(Cps, application, start, [app3, permanent]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     false = is_started(app3, Cp1),
     false = is_started(app3, Cp2),
     false = is_started(app3, Cp3),
 
-    % Permit app1 on CP1 and make sure it is started
+    %% Permit app1 on CP1 and make sure it is started
     ok = rpc:call(Cp1, application, permit, [app1, true]),
     ?UNTIL(is_started(app1, Cp1)),
     false = is_started(app1, Cp2),
     false = is_started(app1, Cp3),
 
-    % Permit it again
+    %% Permit it again
     ok = rpc:call(Cp1, application, permit, [app1, true]),
     ?UNTIL(is_started(app1, Cp1)),
     false = is_started(app1, Cp2),
     false = is_started(app1, Cp3),
 
-    % Permit app2 on CP1 and make sure it is started
+    %% Permit app2 on CP1 and make sure it is started
     ok = rpc:call(Cp1, application, permit, [app2, true]),
     ?UNTIL(is_started(app2, Cp1)),
     false = is_started(app2, Cp2),
     false = is_started(app2, Cp3),
 
-    % Permit app1 on CP2 and make sure it is not started
+    %% Permit app1 on CP2 and make sure it is not started
     ok = rpc:call(Cp2, application, permit, [app1, true]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     true = is_started(app1, Cp1),
     false = is_started(app1, Cp2),
     false = is_started(app1, Cp3),
 
-    % Crash CP1 and make sure app1, but not app2, is started on CP2
+    %% Crash CP1 and make sure app1, but not app2, is started on CP2
     stop_node_nice(Cp1),
     ?UNTIL(is_started(app1, Cp2)),
     false = is_started(app2, Cp2),
 
-    % Restart CP1 again, check nothing is running on it
+    %% Restart CP1 again, check nothing is running on it
     {ok, Cp1_2} = start_node_config(Ncp1, NoSyncTime, Conf),
     global:sync(),
     ok = rpc:call(Cp1_2, application, load, [app1()]),
@@ -909,19 +885,19 @@ permit_false_start_dist(Conf) when is_list(Conf) ->
     false = is_started(app1, Cp1_2),
     false = is_started(app2, Cp1_2),
 
-    % Permit app3 on CP3 and make sure it is started
+    %% Permit app3 on CP3 and make sure it is started
     ok = rpc:call(Cp3, application, permit, [app3, true]),
     ?UNTIL(is_started(app3, Cp3)),
     false = is_started(app3, Cp1_2),
     false = is_started(app3, Cp2),
 
-    % Permit app3 on CP1 and make sure it is moved there from CP3
+    %% Permit app3 on CP1 and make sure it is moved there from CP3
     ok = rpc:call(Cp1_2, application, permit, [app3, true]),
     ?UNTIL(is_started(app3, Cp1_2)),
     false = is_started(app3, Cp2),
     false = is_started(app3, Cp3),
 
-    % Unpermit app3 on CP3 and CP1 and make sure it is stopped
+    %% Unpermit app3 on CP3 and CP1 and make sure it is stopped
     ok = rpc:call(Cp3, application, permit, [app3, false]),
     ok = rpc:call(Cp1_2, application, permit, [app3, false]),
     ?UNTIL(false =:= is_started(app3, Cp1_2)),
@@ -933,27 +909,25 @@ permit_false_start_dist(Conf) when is_list(Conf) ->
     stop_node_nice(Cp3),
     ok.
 
-nodedown_start(doc) ->
-    ["app1 distributed as [cp1, cp2].  Call application:start(app1) on",
-     "cp2, but not on cp1.  Kill cp1.  Make sure app1 is started on cp2."];
-nodedown_start(suite) -> [];
+%% app1 distributed as [cp1, cp2].  Call application:start(app1) on
+%% cp2, but not on cp1.  Kill cp1.  Make sure app1 is started on cp2.
 nodedown_start(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2] = node_names([cp1, cp2], Conf),
     NoSyncTime = config_fun_fast(config4(NodeNames)),
     WithSyncTime = config_fun(config4(NodeNames)),
 
-    % Test [cp1, cp2]
+    %% Test [cp1, cp2]
     {ok, Cp1} = start_node_config(Ncp1, NoSyncTime, Conf),
     {ok, Cp2} = start_node_config(Ncp2, WithSyncTime, Conf),
     wait_for_ready_net(),
 
-    % Start app1 and make sure cp1 starts it
+    %% Start app1 and make sure cp1 starts it
     {[ok,ok],[]} = 
         rpc:multicall([Cp1, Cp2], application, load, [app1()]),
     _ = rpc:cast(Cp2, application, start, [app1, permanent]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
 
-    % Crash CP1 and make sure app1 is started on CP2
+    %% Crash CP1 and make sure app1 is started on CP2
     stop_node_nice(Cp1),
     ?UNTIL(is_started(app1, Cp2)),
     
@@ -961,8 +935,7 @@ nodedown_start(Conf) when is_list(Conf) ->
     ok.
 
 
-ensure_started(suite) -> [];
-ensure_started(doc) -> ["Test application:ensure_started/1."];
+%% Test application:ensure_started/1.
 ensure_started(_Conf) ->
 
     {ok, Fd} = file:open("app1.app", [write]),
@@ -981,8 +954,7 @@ ensure_started(_Conf) ->
     ok = application:unload(app1),
     ok.
 
-ensure_all_started(suite) -> [];
-ensure_all_started(doc) -> ["Test application:ensure_all_started/1-2."];
+%% Test application:ensure_all_started/1-2.
 ensure_all_started(_Conf) ->
 
     {ok, Fd1} = file:open("app1.app", [write]),
@@ -1069,11 +1041,9 @@ ensure_all_started(_Conf) ->
 %% Ticket: OTP-1586
 %% Slogan: recursive load of applications fails
 %%-----------------------------------------------------------------
-otp_1586(suite) -> [];
-otp_1586(doc) ->
-    ["Test recursive load of applications."];
+%% Test recursive load of applications.
 otp_1586(Conf) when is_list(Conf) ->
-    Dir = ?config(priv_dir,Conf),
+    Dir = proplists:get_value(priv_dir,Conf),
     {ok, Fd} = file:open(filename:join(Dir, "app5.app"), [write]),
     w_app5(Fd),
     file:close(Fd),
@@ -1090,21 +1060,19 @@ otp_1586(Conf) when is_list(Conf) ->
 %% Slogan: start of distrib apps fails when the nodes start
 %%         simultaneously
 %%-----------------------------------------------------------------
-otp_2078(suite) -> [];
-otp_2078(doc) ->
-    ["Test start of distrib apps fails when the nodes start simultaneously."];
+%% Test start of distrib apps fails when the nodes start simultaneously.
 otp_2078(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2] = node_names([cp1, cp2], Conf),
     NoSyncTime = config_fun_fast(config4(NodeNames)),
     WithSyncTime = config_fun(config4(NodeNames)),
 
-    % Test [cp1, cp2]
+    %% Test [cp1, cp2]
     {ok, Cp1} = start_node_config(Ncp1, NoSyncTime, Conf),
     {ok, Cp2} = start_node_config(Ncp2, WithSyncTime, Conf),
     Cps = [Cp1, Cp2],
     wait_for_ready_net(),
 
-    % Start app1 and make sure cp1 starts it
+    %% Start app1 and make sure cp1 starts it
     {[ok,ok],[]} = 
         rpc:multicall(Cps, application, load, [app1()]),
     ?UNTIL(is_loaded(app1, Cps)),
@@ -1112,8 +1080,8 @@ otp_2078(Conf) when is_list(Conf) ->
     ?UNTIL(is_started(app1, Cp1)),
     false = is_started(app1, Cp2),
 
-    % Start app1 on cp2; make sure it works (the bug was that this start
-    % returned error)
+    %% Start app1 on cp2; make sure it works (the bug was that this start
+    %% returned error)
     ok = rpc:call(Cp2, application, start, [app1, permanent]),
     true = is_started(app1, Cp1),
     false = is_started(app1, Cp2),
@@ -1122,15 +1090,13 @@ otp_2078(Conf) when is_list(Conf) ->
     stop_node_nice(Cp2),
     ok.
 
-otp_2012(suite) -> [];
-otp_2012(doc) ->
-    ["Test change of configuration parameters without changing code."];
+%% Test change of configuration parameters without changing code.
 otp_2012(Conf) when is_list(Conf) ->
     %% start a help process to check the config change
     CcPid = spawn_link(?MODULE, conf_change, []),
     yes = global:register_name(conf_change, CcPid),
 
-    % Write a .app file
+    %% Write a .app file
     {ok, Fd} = file:open("app1.app", [write]),
     w_app1(Fd),
     file:close(Fd),
@@ -1138,7 +1104,7 @@ otp_2012(Conf) when is_list(Conf) ->
     w_app1(Fd2),
     file:close(Fd2),
 
-    % Start app1 
+    %% Start app1
     ok = application:load(app1()),
     ok = application:start(app1, permanent),
 
@@ -1149,7 +1115,7 @@ otp_2012(Conf) when is_list(Conf) ->
     ok = application_controller:config_change(EnvBefore),
     ok = get_conf_change([{[], [{new1, hi}, {new2, moi}], []}]),
     
-    % Start app2
+    %% Start app2
     ok = application:load(app2()),
     ok = application:start(app2, permanent),
 
@@ -1173,11 +1139,9 @@ otp_2012(Conf) when is_list(Conf) ->
 %% Ticket: OTP-2718
 %% Slogan: transient app which fails during start is ignored
 %%-----------------------------------------------------------------
-otp_2718(suite) -> [];
-otp_2718(doc) ->
-    ["Test fail of transient app at start."];
+%% Test fail of transient app at start.
 otp_2718(Conf) when is_list(Conf) ->
-    {ok, Cp1} = start_node_args(cp1, "-pa " ++ ?config(data_dir,Conf)),
+    {ok, Cp1} = start_node_args(cp1, "-pa " ++ proplists:get_value(data_dir,Conf)),
     wait_for_ready_net(),
 
     %% normal exit from the application
@@ -1185,7 +1149,7 @@ otp_2718(Conf) when is_list(Conf) ->
     ?UNTIL(is_loaded(trans_normal, Cp1)),
     {error, {{'EXIT',normal},_}} =
 	rpc:call(Cp1, application, start, [trans_normal, transient]),
-    test_server:sleep(2000),
+    ct:sleep(2000),
     false = is_started(trans_normal, Cp1),
 
     %% abnormal exit from the application
@@ -1193,7 +1157,7 @@ otp_2718(Conf) when is_list(Conf) ->
     {error, {bad_return,{{trans_abnormal_sup,start,[normal,[]]},
 			       {'EXIT',abnormal}}}} =
 	rpc:call(Cp1, application, start, [trans_abnormal, transient]),
-    test_server:sleep(3000),
+    ct:sleep(3000),
     {badrpc,nodedown} = which_applications(Cp1),
     ok.
 
@@ -1201,11 +1165,9 @@ otp_2718(Conf) when is_list(Conf) ->
 %% Ticket: OTP-2973
 %% Slogan: application:start does not test if an appl is already starting...
 %%-----------------------------------------------------------------
-otp_2973(suite) -> [];
-otp_2973(doc) ->
-    ["Test of two processes simultanously starting the same application."];
+%% Test of two processes simultanously starting the same application.
 otp_2973(Conf) when is_list(Conf) ->
-    % Write a .app file
+    %% Write a .app file
     {ok, Fd} = file:open("app0.app", [write]),
     w_app(Fd, app0()),
     file:close(Fd),
@@ -1222,14 +1184,14 @@ otp_2973(Conf) when is_list(Conf) ->
 				     {Pid2, res, Res2x} ->
 					 {Res1x, Res2x}
 				   after 2000 ->
-					   test_server:fail(timeout_pid2)
+					   ct:fail(timeout_pid2)
 				   end;
 			     {Pid2, res, Res2x} ->
 				 receive 
 				     {Pid1, res, Res1x} ->
 					 {Res1x, Res2x}
 				 after 2000 ->
-					 test_server:fail(timeout_pid1)
+					 ct:fail(timeout_pid1)
 				 end
 			 end,
 
@@ -1243,11 +1205,11 @@ otp_2973(Conf) when is_list(Conf) ->
 	_ ->
 	    Txt = io_lib:format("Illegal results from start: ~p ~p ",
 				      [Res1, Res2]),
-	    test_server:fail(lists:flatten(Txt))
+	    ct:fail(lists:flatten(Txt))
     end,
 
 
-    % Write a .app file
+    %% Write a .app file
     {ok, Fda} = file:open("app_start_error.app", [write]),
     w_app_start_error(Fda),
     file:close(Fda),
@@ -1261,14 +1223,14 @@ otp_2973(Conf) when is_list(Conf) ->
 				       {Pid2, res, Res2y} ->
 					   {Res1y, Res2y}
 				   after 2000 ->
-					   test_server:fail(timeout_pid2)
+					   ct:fail(timeout_pid2)
 				   end;
 			       {Pid2, res, Res2y} ->
 				   receive 
 				       {Pid1, res, Res1y} ->
 					   {Res1y, Res2y}
 				   after 2000 ->
-					   test_server:fail(timeout_pid1)
+					   ct:fail(timeout_pid1)
 				   end
 			   end,
 
@@ -1278,7 +1240,7 @@ otp_2973(Conf) when is_list(Conf) ->
 	    ok;
 	_ ->
 	    Txta = io_lib:format("Illegal results from start ~p ~p ",[Res1a, Res2a]),
-	    test_server:fail(lists:flatten(Txta))
+	    ct:fail(lists:flatten(Txta))
     end,
 
     ok.
@@ -1289,36 +1251,34 @@ otp_2973(Conf) when is_list(Conf) ->
 %% Ticket: OTP-3184
 %% Slogan: crash the node if permanent appl has illegal env parameter values
 %%-----------------------------------------------------------------
-otp_3184(suite) -> [];
-otp_3184(doc) ->
-    ["When a distributed application is started the permit flag is checked "
-     "that the permit flag is not changed during the start. "
-     "Te check must only be made if the application is started on the own node"];
+%% When a distributed application is started the permit flag is checked
+%% that the permit flag is not changed during the start.
+%% The check must only be made if the application is started on the own node.
 otp_3184(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2] = node_names([cp1, cp2], Conf),
     NoSyncTime = config_fun_fast(config3184(NodeNames)),
     WithSyncTime = config_fun(config3184(NodeNames)),
 
-    % Test [cp1, cp2]
+    %% Test [cp1, cp2]
     {ok, Cp1} = start_node_config(Ncp1, NoSyncTime, Conf),
     {ok, Cp2} = start_node_config(Ncp2, WithSyncTime, Conf),
     wait_for_ready_net(),
 
-    % Start app1 and make sure it is not started
+    %% Start app1 and make sure it is not started
     {[ok,ok],[]} = 
         rpc:multicall([Cp1, Cp2], application, load, [app1()]),
-    test_server:sleep(3000),
+    ct:sleep(3000),
     false = is_started(app1, Cp1),
     false = is_started(app1, Cp2),
 
-    % Start app1 on cp1
+    %% Start app1 on cp1
     ok = rpc:call(Cp1, application, permit, [app1, true]),
     ok = rpc:call(Cp1, application, start, [app1, permanent]),
     ok = rpc:call(Cp2, application, start, [app1, permanent]),
     ?UNTIL(is_started(app1, Cp1)),
     false = is_started(app1, Cp2),
     
-    % Check that the application is marked as running in application_controller
+    %% Check that the application is marked as running in application_controller
     X = rpc:call(Cp1, application_controller, info, []),
     {value, {running, Xrunning}} = lists:keysearch(running, 1, X),
     {value, Xapp1} = lists:keysearch(app1, 1, Xrunning),
@@ -1337,15 +1297,13 @@ otp_3184(Conf) when is_list(Conf) ->
 %% Ticket: OTP-3002
 %% Slogan: crash the node if permanent appl has illegal env parameter values
 %%-----------------------------------------------------------------
-otp_3002(suite) -> [];
-otp_3002(doc) ->
-    ["crash the node if permanent appl has illegal env parameter values."];
+%% crash the node if permanent appl has illegal env parameter values.
 otp_3002(Conf) when is_list(Conf) ->
-    % Create the boot script
+    %% Create the boot script
     {{KernelVer,StdlibVer}, {LatestDir, LatestName}} =
 	create_script_3002("script_3002"),
-    ?t:format(0, "LatestDir = ~p~n", [LatestDir]),
-    ?t:format(0, "LatestName = ~p~n", [LatestName]),
+    ct:pal(?HI_VERBOSITY, "LatestDir = ~p~n", [LatestDir]),
+    ct:pal(?HI_VERBOSITY, "LatestName = ~p~n", [LatestName]),
 
     case is_real_system(KernelVer, StdlibVer) of
 	      true ->
@@ -1371,10 +1329,9 @@ otp_3002(Conf) when is_list(Conf) ->
 %%         when it received dist_ac_app_stopped).
 %%-----------------------------------------------------------------
 
-otp_4066(suite) -> [];
-otp_4066(doc) -> ["Check that application stop don't cause dist_ac crash"];
+%% Check that application stop don't cause dist_ac crash.
 otp_4066(Conf) when is_list(Conf) ->
-    % Write config files
+    %% Write config files
     [Ncp1, Ncp2] = node_names([cp1, cp2], Conf),
     Host = from($@, atom_to_list(node())),
     Cp1 = list_to_atom(Ncp1 ++ "@" ++ Host),
@@ -1382,12 +1339,12 @@ otp_4066(Conf) when is_list(Conf) ->
     AllNodes = [Cp1, Cp2],
     App1Nodes = {app1, AllNodes},
 
-    Dir = ?config(priv_dir,Conf),
+    Dir = proplists:get_value(priv_dir,Conf),
     {ok, FdC} = file:open(filename:join(Dir, "otp_4066.config"), [write]),
     write_config(FdC, config_4066(AllNodes, 5000, [App1Nodes])),
     file:close(FdC),
 
-    % Write the app1.app file
+    %% Write the app1.app file
     {ok, FdA12} = file:open(filename:join(Dir, "app1.app"), [write]),
     w_app1(FdA12),
     file:close(FdA12),
@@ -1402,29 +1359,29 @@ otp_4066(Conf) when is_list(Conf) ->
 
     ok = rpc:call(Cp1, application, start, [app1]),
     wait_until_started(app1, [Cp1]),
-    test_server:format("--- App1 started at Cp1 ---~n", []),
+    io:format("--- App1 started at Cp1 ---~n", []),
     print_dac_state(AllNodes),
 
-    % Cp2 previously crashed on this stop
+    %% Cp2 previously crashed on this stop
     ok = rpc:call(Cp1, application, stop, [app1]),
     wait_until_stopped(app1, [Cp1]),
-    test_server:format("--- App1 stopped at Cp1 ---~n", []),
+    io:format("--- App1 stopped at Cp1 ---~n", []),
     print_dac_state(AllNodes),
 
     ok = rpc:call(Cp1, application, start, [app1]),
     wait_until_started(app1, [Cp1]),
-    test_server:format("--- App1 started at Cp1 ---~n", []),
+    io:format("--- App1 started at Cp1 ---~n", []),
     print_dac_state(AllNodes),
 
     ok = rpc:call(Cp2, application, load, [app1, App1Nodes]),
     ok = rpc:call(Cp2, application, start, [app1]),
-    test_server:format("--- App1 started at Cp2 ---~n", []),
+    io:format("--- App1 started at Cp2 ---~n", []),
     print_dac_state(AllNodes),
 
 
     stop_node_nice(Cp1),
     wait_until_started(app1, [Cp2]),
-    test_server:format("--- Cp1 crashed; failover to Cp2  ---~n", []),
+    io:format("--- Cp1 crashed; failover to Cp2  ---~n", []),
     print_dac_state(Cp2),
 
     stop_node_nice(Cp2),
@@ -1440,7 +1397,7 @@ write_config(Fd, Config) ->
 
 print_dac_state(Node) when is_atom(Node) ->
     State = gen_server:call({dist_ac, Node}, info),
-    test_server:format(" * dist_ac state on node ~p:~n    ~p~n",
+    io:format(" * dist_ac state on node ~p:~n    ~p~n",
                        [Node, State]);
 print_dac_state(Nodes) when is_list(Nodes) ->
     lists:foreach(fun (N) -> print_dac_state(N) end, Nodes).
@@ -1450,9 +1407,7 @@ print_dac_state(Nodes) when is_list(Nodes) ->
 %% Ticket: OTP-4227
 %% Slogan: Bad return value from application.
 %%-----------------------------------------------------------------
-otp_4227(suite) -> [];
-otp_4227(doc) ->
-    ["Test start of depending app when required app crashed."];
+%% Test start of depending app when required app crashed.
 otp_4227(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, Ncp2] = node_names([cp1, cp2], Conf),
     NoSyncTime = config_fun_fast(config_4227(NodeNames)),
@@ -1475,11 +1430,11 @@ otp_4227(Conf) when is_list(Conf) ->
 
     %% Start app9 and brutally kill it, then try to start app10
     ok = rpc:call(Cp1, application, start, [app9]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
     Pid9 = rpc:call(Cp1, erlang, whereis, [ch_sup19]),
     true = erlang:is_pid(Pid9),
     true = erlang:exit(Pid9, kill),
-    test_server:sleep(1000),
+    ct:sleep(1000),
 
     %% This gave {error, no_report} before the patch
     {error, {not_running, app9}} = 
@@ -1518,7 +1473,7 @@ otp_5363(Conf) when is_list(Conf) ->
     %% the code, but only that the correct processes ARE killed.
 
     OldPath = code:get_path(),
-    code:add_patha(?config(data_dir,Conf)),
+    code:add_patha(proplists:get_value(data_dir,Conf)),
     try
 	ok = application:load(app_group_leader()),
 	ok = application:start(group_leader),
@@ -1532,7 +1487,7 @@ otp_5363(Conf) when is_list(Conf) ->
 		      undefined = whereis(nisse);
 		  Bad ->
 		      io:format("~p\n", [Bad]),
-		      ?t:fail()
+		      ct:fail(failed)
 	      end
     after
         code:set_path(OldPath)
@@ -1543,14 +1498,12 @@ otp_5363(Conf) when is_list(Conf) ->
 %% Ticket: OTP-5606
 %% Slogan: Problems with starting a distributed application
 %%-----------------------------------------------------------------
-otp_5606(suite) -> [];
-otp_5606(doc) ->
-    ["Test of several processes simultanously starting the same "
-     "distributed application."];
+%% Test of several processes simultanously starting the same
+%% distributed application.
 otp_5606(Conf) when is_list(Conf) ->
 
     %% Write a config file
-    Dir = ?config(priv_dir, Conf),
+    Dir = proplists:get_value(priv_dir, Conf),
     {ok, Fd} = file:open(filename:join(Dir, "sys.config"), [write]),
     NodeNames = [Ncp1, Ncp2] = node_names([cp1, cp2], Conf),
     (config4(NodeNames))(Fd, 10000),
@@ -1586,7 +1539,7 @@ otp_5606(Conf) when is_list(Conf) ->
 	[Res1, Res2, Res3, Res4] ->
 	    Txt = io_lib:format("Illegal results from start ~p ~p ~p ~p",
 				[Res1, Res2, Res3, Res4]),
-	    test_server:fail(lists:flatten(Txt))
+	    ct:fail(lists:flatten(Txt))
     end,
 
     {error, {already_started, app1}} = 
@@ -1601,7 +1554,7 @@ otp_5606_loop(ResL) when length(ResL)<4 ->
 	{_Pid, Res} ->
 	    otp_5606_loop([Res|ResL])
     after 5000 ->
-	    test_server:fail(timeout_waiting_for_res)
+	    ct:fail(timeout_waiting_for_res)
     end;
 otp_5606_loop(ResL) ->
     ResL.
@@ -1613,9 +1566,7 @@ loop5606(Pid) ->
 	    Pid ! {self(), Res}
     end.
 	    
-get_env(suite) -> [];
-get_env(doc) ->
-    ["Tests get_env/* functions"];
+%% Tests get_env/* functions.
 get_env(Conf) when is_list(Conf) ->
     {ok, _}   = application:get_env(kernel, error_logger),
     undefined = application:get_env(undefined_app, a),
@@ -1627,14 +1578,12 @@ get_env(Conf) when is_list(Conf) ->
 %% Should be started in a CC view with:
 %% erl -sname XXX -rsh ctrsh where XX not in [cp1, cp2, cp3]
 %%-----------------------------------------------------------------
-get_key(suite) -> [];
-get_key(doc) ->
-    ["Tests read the .app keys."];
+%% Tests read the .app keys.
 get_key(Conf) when is_list(Conf) ->
     NodeNames = [Ncp1, _Ncp2, _Ncp3] = node_names([cp1, cp2, cp3], Conf),
     WithSyncTime = config_fun(config_inc(NodeNames)),
 
-    % Test [cp1, cp2, cp3]
+    %% Test [cp1, cp2, cp3]
     {ok, Cp1} = start_node_config(Ncp1, WithSyncTime, Conf),
 
     ok = rpc:call(Cp1, application, load, [appinc(), d3(NodeNames)]),
@@ -1731,8 +1680,7 @@ get_key(Conf) when is_list(Conf) ->
 %%% Testing of change of distributed parameter.
 %%%-----------------------------------------------------------------
 
-distr_changed_tc1(suite) -> [];
-distr_changed_tc1(doc) -> ["Test change of distributed parameter."];
+%% Test change of distributed parameter.
 distr_changed_tc1(Conf) when is_list(Conf) ->
 
     {OldKernel, OldEnv, {Cp1, Cp2, Cp3}, {_Ncp1, _Ncp2, _Ncp3}, _Config2} = 
@@ -1757,7 +1705,7 @@ distr_changed_tc1(Conf) when is_list(Conf) ->
 	rpc:multicall([Cp1, Cp2, Cp3], 
 		      application_controller, config_change, [OldEnv]),
     
-    test_server:sleep(7000),
+    ct:sleep(7000),
     
     DcInfo1 = rpc:call(Cp1, dist_ac, info, []),
     DcInfo2 = rpc:call(Cp2, dist_ac, info, []),
@@ -1778,7 +1726,7 @@ distr_changed_tc1(Conf) when is_list(Conf) ->
 		  ok;
 	      EWa1 ->
 		  X1 = io_lib:format("distribution error: Cp1 ~p ",[EWa1]),
-		  test_server:fail(lists:flatten(X1))
+		  ct:fail(lists:flatten(X1))
 	  end,
 		  
     case lists:sort(Wa2) of
@@ -1786,7 +1734,7 @@ distr_changed_tc1(Conf) when is_list(Conf) ->
 		  ok;
 	      EWa2 ->
 		  X2 = io_lib:format("distribution error: Cp2 ~p ",[EWa2]),
-		  test_server:fail(lists:flatten(X2))
+		  ct:fail(lists:flatten(X2))
 	  end,
 		  
     case lists:sort(Wa3) of
@@ -1794,7 +1742,7 @@ distr_changed_tc1(Conf) when is_list(Conf) ->
 		  ok;
 	      EWa3 ->
 		  X3 = io_lib:format("distribution error: Cp3 ~p ",[EWa3]),
-		  test_server:fail(lists:flatten(X3))
+		  ct:fail(lists:flatten(X3))
 	  end,
 		  
     DcInfo1n = rpc:call(Cp1, dist_ac, info, []),
@@ -1816,9 +1764,7 @@ distr_changed_tc1(Conf) when is_list(Conf) ->
 
     ok.
 
-distr_changed_tc2(suite) -> [];
-distr_changed_tc2(doc) -> ["Test change of distributed parameter, "
-			   "move appls by crashing a node."];
+%% Test change of distributed parameter, move appls by crashing a node.
 distr_changed_tc2(Conf) when is_list(Conf) ->
 
     {OldKernel, OldEnv, {Cp1, Cp2, Cp3}, {Ncp1, _Ncp2, _Ncp3}, Config2} = 
@@ -1843,21 +1789,16 @@ distr_changed_tc2(Conf) when is_list(Conf) ->
 	rpc:multicall([Cp1, Cp2, Cp3], 
 		      application_controller, config_change, [OldEnv]),
     
-    test_server:sleep(4000),
+    ct:sleep(4000),
     stop_node_nice(Cp1),   
-    test_server:sleep(10000),
+    ct:sleep(10000),
 
-%    _DcInfo1 = rpc:call(Cp1, dist_ac, info, []),
     _DcInfo2 = rpc:call(Cp2, dist_ac, info, []),
     _DcInfo3 = rpc:call(Cp3, dist_ac, info, []),
-%    ?t:format(0,"#### DcInfo1 ~n~p~n",[_DcInfo1]),
 
-%    DcWa1 = which_applications(Cp1),
     DcWa2 = which_applications(Cp2),
     DcWa3 = which_applications(Cp3),
     
-%    Wa1 = lists:foldl(fun({A1, _N1, _V1}, AccIn) -> [A1 | AccIn] end,
-%			    [], DcWa1),
     Wa2 = lists:foldl(fun({A2, _N2, _V2}, AccIn) -> [A2 | AccIn] end,
 			    [], DcWa2),
     Wa3 = lists:foldl(fun({A3, _N3, _V3}, AccIn) -> [A3 | AccIn] end,
@@ -1869,7 +1810,7 @@ distr_changed_tc2(Conf) when is_list(Conf) ->
 		  ok;
 	      EWa2 ->
 		  X2 = io_lib:format("distribution error: Cp2 ~p ",[EWa2]),
-		  test_server:fail(lists:flatten(X2))
+		  ct:fail(lists:flatten(X2))
 	  end,
 		  
     case lists:sort(Wa3) of
@@ -1877,12 +1818,12 @@ distr_changed_tc2(Conf) when is_list(Conf) ->
 		  ok;
 	      EWa3 ->
 		  X3 = io_lib:format("distribution error: Cp3 ~p ",[EWa3]),
-		  test_server:fail(lists:flatten(X3))
+		  ct:fail(lists:flatten(X3))
 	  end,
 
 
     {ok, Cp1} = start_node_boot(Ncp1, Config2, dc),
-    test_server:sleep(10000),
+    ct:sleep(10000),
 
     _DcInfo1rs = rpc:call(Cp1, dist_ac, info, []),
     _DcInfo2rs = rpc:call(Cp2, dist_ac, info, []),
@@ -1904,7 +1845,7 @@ distr_changed_tc2(Conf) when is_list(Conf) ->
 		  ok;
 	      EWa1rs ->
 		  X1rs = io_lib:format("distribution error: Cp1 ~p ",[EWa1rs]),
-		  test_server:fail(lists:flatten(X1rs))
+		  ct:fail(lists:flatten(X1rs))
 	  end,
 		  
     case lists:sort(Wa2rs) of
@@ -1912,7 +1853,7 @@ distr_changed_tc2(Conf) when is_list(Conf) ->
 		  ok;
 	      EWa2rs ->
 		  X2rs = io_lib:format("distribution error: Cp2 ~p ",[EWa2rs]),
-		  test_server:fail(lists:flatten(X2rs))
+		  ct:fail(lists:flatten(X2rs))
 	  end,
 		  
     case lists:sort(Wa3rs) of
@@ -1920,7 +1861,7 @@ distr_changed_tc2(Conf) when is_list(Conf) ->
 		  ok;
 	      EWa3rs ->
 		  X3rs = io_lib:format("distribution error: Cp3 ~p ",[EWa3rs]),
-		  test_server:fail(lists:flatten(X3rs))
+		  ct:fail(lists:flatten(X3rs))
 	  end,
 
 
@@ -1939,15 +1880,12 @@ distr_changed_tc2(Conf) when is_list(Conf) ->
 %%%-----------------------------------------------------------------
 %%% Testing of application configuration change
 %%%-----------------------------------------------------------------
-config_change(suite) ->
-    [];
-config_change(doc) ->
-    ["Test change of application configuration"];
+%% Test change of application configuration.
 config_change(Conf) when is_list(Conf) ->
 
     %% Change to data_dir
     {ok, CWD} = file:get_cwd(),
-    DataDir = ?config(data_dir, Conf),
+    DataDir = proplists:get_value(data_dir, Conf),
     ok = file:set_cwd(DataDir),
 
     %% Find out application data from boot script
@@ -2009,10 +1947,7 @@ get_appls([], Res) ->
     Res.
 
 
-persistent_env(suite) ->
-    [];
-persistent_env(doc) ->
-    ["Test set_env/4 and unset_env/3 with persistent true"];
+%% Test set_env/4 and unset_env/3 with persistent true.
 persistent_env(Conf) when is_list(Conf) ->
     ok = application:set_env(appinc, own2, persist, [{persistent, true}]),
     ok = application:set_env(appinc, key1, persist, [{persistent, true}]),
@@ -2056,10 +1991,7 @@ persistent_env(Conf) when is_list(Conf) ->
 %%%-----------------------------------------------------------------
 %%% Tests the 'shutdown_func' kernel config parameter
 %%%-----------------------------------------------------------------
-shutdown_func(suite) ->
-    [];
-shutdown_func(doc) ->
-    ["Tests the 'shutdown_func' kernel config parameter"];
+%% Tests the 'shutdown_func' kernel config parameter.
 shutdown_func(Config) when is_list(Config) ->
     {ok,Cp1} = start_node(?MODULE_STRING++"_shutdown_func"),
     wait_for_ready_net(),
@@ -2077,10 +2009,10 @@ shutdown_func(Config) when is_list(Config) ->
 		      {'DOWN', Mref, _, Pid, noconnection} ->
 			  ok
 		  after 10000 ->
-			  test_server:fail(timeout)
+			  ct:fail(timeout)
 		  end
 	  after 10000 ->
-		  test_server:fail(timeout)
+		  ct:fail(timeout)
 	  end.
 
 
@@ -2098,7 +2030,7 @@ do_shutdown(Reason) ->
 %%% Tests the 'shutdown_timeout' kernel config parameter
 %%%-----------------------------------------------------------------
 shutdown_timeout(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
     {ok,Cp1} = start_node(?MODULE_STRING++"_shutdown_timeout"),
     wait_for_ready_net(),
     ok = rpc:call(Cp1, application, set_env, [kernel, shutdown_timeout, 1000]),
@@ -2121,7 +2053,7 @@ shutdown_timeout(Config) when is_list(Config) ->
 %%% Provokes a (previous) application shutdown deadlock
 %%%-----------------------------------------------------------------
 shutdown_deadlock(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
     code:add_path(filename:join([DataDir,deadlock])),
     %% ok = rpc:call(Cp1, application, start, [sasl]),
     ok = application:start(deadlock),
@@ -2596,7 +2528,7 @@ is_started(Name, Node) ->
 	false -> false
     end.
 
-% Waits until application Name is started on at least one node.
+%% Waits until application Name is started on at least one node.
 wait_until_started(Name, Nodes) ->
     case lists:member(true,
 		      lists:map(fun (N) ->
@@ -2606,11 +2538,11 @@ wait_until_started(Name, Nodes) ->
 	true ->
 	    true;
 	false ->
-	    test_server:sleep(500),
+	    ct:sleep(500),
 	    wait_until_started(Name, Nodes)
     end.
 
-% Waits until application Name is stopped on all nodes.
+%% Waits until application Name is stopped on all nodes.
 wait_until_stopped(Name, Nodes) ->
     case lists:member(true,
 		      lists:map(fun (N) ->
@@ -2620,7 +2552,7 @@ wait_until_stopped(Name, Nodes) ->
 	false ->
 	    true;
 	true ->
-	    test_server:sleep(500),
+	    ct:sleep(500),
 	    wait_until_stopped(Name, Nodes)
     end.
 
@@ -2662,13 +2594,13 @@ start_node_args(Name, Args) ->
 
 start_node_boot_3002(Name, Boot) ->
     Pa = filename:dirname(code:which(?MODULE)),
-    ?t:format(0, "start_node_boot ~p~n",
-	      [" -pa " ++ Pa ++ " -env ERL_CRASH_DUMP erl_crash_dump." ++ 
-	       atom_to_list(Name) ++ " -boot " ++ Boot ++ 
-	       " -sasl dummy \"missing "]),
+    ct:pal(?HI_VERBOSITY, "start_node_boot ~p~n",
+	   [" -pa " ++ Pa ++ " -env ERL_CRASH_DUMP erl_crash_dump." ++
+		atom_to_list(Name) ++ " -boot " ++ Boot ++
+		" -sasl dummy \"missing "]),
     test_server:start_node(Name, slave, 
                            [{args, " -pa " ++ Pa ++
-                             " -env ERL_CRASH_DUMP erl_crash_dump." ++ 
+                             " -env ERL_CRASH_DUMP erl_crash_dump." ++
                              atom_to_list(Name) ++ " -boot " ++ Boot ++ 
                              " -sasl dummy \"missing "}]).
 
@@ -2678,18 +2610,20 @@ start_node_boot_config(Name, SysConfigFun, Conf, Boot) ->
 
 start_node_boot(Name, Config, Boot) ->
     Pa = filename:dirname(code:which(?MODULE)),
-    ?t:format(0, "start_node_boot ~p~n",[" -pa " ++ Pa ++ " -config " ++ Config ++
-						" -boot " ++ atom_to_list(Boot)]),
-    test_server:start_node(Name, slave, [{args, " -pa " ++ Pa ++ " -config " ++ Config ++
-						" -boot " ++ atom_to_list(Boot)}]).
+    ct:pal(?HI_VERBOSITY,
+	   "start_node_boot ~p~n",[" -pa " ++ Pa ++ " -config " ++ Config ++
+				       " -boot " ++ atom_to_list(Boot)]),
+    test_server:start_node(Name, slave,
+			   [{args, " -pa " ++ Pa ++ " -config " ++ Config ++
+				 " -boot " ++ atom_to_list(Boot)}]).
 
 start_node_config_sf(Name, SysConfigFun, Conf) ->
     ConfigFile = write_config_file(SysConfigFun, Conf),
-    DataDir = ?config(data_dir, Conf), % is it used?
+    DataDir = proplists:get_value(data_dir, Conf), % is it used?
     start_node(Name, ConfigFile, " -pa " ++ DataDir).
 
 write_config_file(SysConfigFun, Conf) ->
-    Dir = ?config(priv_dir, Conf),
+    Dir = proplists:get_value(priv_dir, Conf),
     {ok, Fd} = file:open(filename:join(Dir, "sys.config"), [write]),
     SysConfigFun(Fd),
     file:close(Fd),
@@ -2713,8 +2647,8 @@ get_start_type(Expected) ->
     get_start_type(Expected, 30*5, #st{}).
 
 get_start_type(_Expected, 0, Ack) ->
-    test_server:format("====== ~p ======~n", [Ack]),
-    test_server:fail(not_valid_start_type);
+    io:format("====== ~p ======~n", [Ack]),
+    ct:fail(not_valid_start_type);
 get_start_type(Expected, Times, Ack0) ->
     #st{normal = N0, local = L0, takeover = T0, failover = F0} = Ack0,
     global:send(st_type, {st, read, self()}),
@@ -2760,13 +2694,13 @@ get_start_phase(Expected) ->
 	Expected ->
 	    ok;
 	{sp, T1, I1, So1, Sp1, G1} ->
-           test_server:format("=============== {sp,T,I,So,Sp,G} ~p ~n",[" "]),
-           test_server:format("=========== got ~p ~n",
+           io:format("=============== {sp,T,I,So,Sp,G} ~p ~n",[" "]),
+           io:format("=========== got ~p ~n",
                               [{sp, T1, I1, So1, Sp1, G1}]),
-           test_server:format("====== expected ~p ~n", [Expected]),
-           test_server:fail(not_valid_start_phase)
+           io:format("====== expected ~p ~n", [Expected]),
+           ct:fail(not_valid_start_phase)
     after 5000 ->
-           test_server:fail(not_valid_start_phase)
+           ct:fail(not_valid_start_phase)
     end.
 
 start_phase() ->
@@ -2797,10 +2731,10 @@ get_conf_change(Expected) ->
 	{cc, Expected} ->
 	    ok;
 	{cc, List} ->
-	    test_server:format("====== ~p ======~n",[{cc, List}]),
-	    test_server:fail(not_valid_conf_change)
+	    io:format("====== ~p ======~n",[{cc, List}]),
+	    ct:fail(not_valid_conf_change)
     after 5000 ->
-	    test_server:fail(not_valid_conf_change_to)
+	    ct:fail(not_valid_conf_change_to)
     end.
 
 conf_change() ->
@@ -2896,7 +2830,7 @@ create_script_3002(ScriptName) ->
 
 distr_changed_prep(Conf) when is_list(Conf) ->
 
-    % Write .app files
+    %% Write .app files
     {ok, Fd1} = file:open("app1.app", [write]),
     w_app1(Fd1),
     file:close(Fd1),
@@ -2917,7 +2851,7 @@ distr_changed_prep(Conf) when is_list(Conf) ->
     file:close(Fd6),
 
 
-    % Create the .app files and the boot script
+    %% Create the .app files and the boot script
     {{KernelVer,StdlibVer}, _} = create_script_dc("dc"),
 
     case is_real_system(KernelVer, StdlibVer) of
@@ -2933,13 +2867,13 @@ distr_changed_prep(Conf) when is_list(Conf) ->
     NoSyncTime = config_fun_fast(config_dc(NodeNames)),
     WithSyncTime = config_fun(config_dc(NodeNames)),
 
-    Dir = ?config(priv_dir,Conf),
+    Dir = proplists:get_value(priv_dir,Conf),
     {ok, Fd_dc2} = file:open(filename:join(Dir, "sys2.config"), [write]),
     (config_dc2(NodeNames))(Fd_dc2),
     file:close(Fd_dc2),
     Config2 = filename:join(Dir, "sys2"),
     
-    % Test [cp1, cp2, cp3]
+    %% Test [cp1, cp2, cp3]
     {ok, Cp1} = start_node_boot_config(Ncp1, NoSyncTime, Conf, dc),
     {ok, Cp2} = start_node_boot_config(Ncp2, NoSyncTime, Conf, dc),
     {ok, Cp3} = start_node_boot_config(Ncp3, WithSyncTime, Conf, dc),
diff --git a/lib/kernel/test/bif_SUITE.erl b/lib/kernel/test/bif_SUITE.erl
index dd3010567a..54c0f1cec4 100644
--- a/lib/kernel/test/bif_SUITE.erl
+++ b/lib/kernel/test/bif_SUITE.erl
@@ -22,36 +22,33 @@
 	 init_per_group/2,end_per_group/2]).
 
 -export([ 
-	 spawn1/1, spawn2/1, spawn3/1, spawn4/1,
+	  spawn1/1, spawn2/1, spawn3/1, spawn4/1,
 
-	
-	 spawn_link1/1, spawn_link2/1, spawn_link3/1, spawn_link4/1,
 
-	
-	 spawn_opt2/1, spawn_opt3/1, spawn_opt4/1, spawn_opt5/1,
+	  spawn_link1/1, spawn_link2/1, spawn_link3/1, spawn_link4/1,
 
-	 spawn_failures/1,
 
-	 run_fun/1,
-     decode_packet_delim/1,
-	 wilderness/1]).
+	  spawn_opt2/1, spawn_opt3/1, spawn_opt4/1, spawn_opt5/1,
 
--export([init_per_testcase/2, end_per_testcase/2]).
+	  spawn_failures/1,
+
+	  run_fun/1,
+	  decode_packet_delim/1,
+	  wilderness/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-export([init_per_testcase/2, end_per_testcase/2]).
 
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
+-include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [{group, spawn_tests}, {group, spawn_link_tests},
@@ -77,360 +74,333 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-spawn1(doc) -> ["Test spawn/1"];
-spawn1(suite) ->
-    [];
+%% Test spawn/1.
 spawn1(Config) when is_list(Config) ->
-    ?line Node = node(),
-    ?line Parent = self(),
-    ?line {_, _, FA, _} = fetch_proc_vals(self()),
-
-    % spawn
-    ?line P = spawn(fun() -> Parent ! {self(), fetch_proc_vals(self())} end),
-    ?line receive
-	      {P, PV} ->
-		  ?line Node = node(P),
-		  ?line check_proc_vals(false, normal, FA, 0, PV)
-	  end,
+    Node = node(),
+    Parent = self(),
+    {_, _, FA, _} = fetch_proc_vals(self()),
+
+    %% spawn
+    P = spawn(fun() -> Parent ! {self(), fetch_proc_vals(self())} end),
+    receive
+	{P, PV} ->
+	    Node = node(P),
+	    check_proc_vals(false, normal, FA, 0, PV)
+    end,
     ok.
 
-spawn2(doc) -> ["Test spawn/2"];
-spawn2(suite) ->
-    [];
+%% Test spawn/2.
 spawn2(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_node(spawn2),
+    {ok, Node} = start_node(spawn2),
 
-    ?line Parent = self(),
-    ?line {_, _, FA, _} = fetch_proc_vals(self()),
+    Parent = self(),
+    {_, _, FA, _} = fetch_proc_vals(self()),
 
-    % spawn_link
-    ?line P = spawn(Node,
-		    fun() -> Parent ! {self(), fetch_proc_vals(self())} end),
-    ?line receive
-	      {P, PV} ->
-		  ?line Node = node(P),
-		  ?line check_proc_vals(false, normal, FA, 0, PV)
-	  end,
+    %% spawn_link
+    P = spawn(Node,
+	      fun() -> Parent ! {self(), fetch_proc_vals(self())} end),
+    receive
+	{P, PV} ->
+	    Node = node(P),
+	    check_proc_vals(false, normal, FA, 0, PV)
+    end,
 
-    ?line true = stop_node(Node),
+    true = stop_node(Node),
     ok.
 
 
-spawn3(doc) -> ["Test spawn/3"];
-spawn3(suite) ->
-    [];
+%% Test spawn/3.
 spawn3(Config) when is_list(Config) ->
-    ?line Node = node(),
-
-    ?line Parent = self(),
-    ?line {_, _, FA, _} = fetch_proc_vals(self()),
-
-    % spawn_link
-    ?line P = spawn(?MODULE,
-		    run_fun,
-		    [fun() ->
-			     Parent ! {self(), fetch_proc_vals(self())}
-		     end]),
-    ?line receive
-	      {P, PV} ->
-		  ?line Node = node(P),
-		  ?line check_proc_vals(false, normal, FA, 0, PV)
-	  end,
+    Node = node(),
+
+    Parent = self(),
+    {_, _, FA, _} = fetch_proc_vals(self()),
+
+    %% spawn_link
+    P = spawn(?MODULE,
+	      run_fun,
+	      [fun() ->
+		       Parent ! {self(), fetch_proc_vals(self())}
+	       end]),
+    receive
+	{P, PV} ->
+	    Node = node(P),
+	    check_proc_vals(false, normal, FA, 0, PV)
+    end,
     ok.
 
-spawn4(doc) -> ["Test spawn/4"];
-spawn4(suite) ->
-    [];
+%% Test spawn/4.
 spawn4(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_node(spawn4),
-
-    ?line Parent = self(),
-    ?line {_, _, FA, _} = fetch_proc_vals(self()),
-
-    % spawn_link
-    ?line P = spawn(Node,
-		    ?MODULE,
-		    run_fun,
-		    [fun() ->
-			     Parent ! {self(), fetch_proc_vals(self())}
-		     end]),
-    ?line receive
-	      {P, PV} ->
-		  ?line Node = node(P),
-		  ?line check_proc_vals(false, normal, FA, 0, PV)
-	  end,
-
-    ?line true = stop_node(Node),
+    {ok, Node} = start_node(spawn4),
+
+    Parent = self(),
+    {_, _, FA, _} = fetch_proc_vals(self()),
+
+    %% spawn_link
+    P = spawn(Node,
+	      ?MODULE,
+	      run_fun,
+	      [fun() ->
+		       Parent ! {self(), fetch_proc_vals(self())}
+	       end]),
+    receive
+	{P, PV} ->
+	    Node = node(P),
+	    check_proc_vals(false, normal, FA, 0, PV)
+    end,
+
+    true = stop_node(Node),
     ok.
 
 
 
-spawn_link1(doc) -> ["Test spawn_link/1"];
-spawn_link1(suite) ->
-    [];
+%% Test spawn_link/1.
 spawn_link1(Config) when is_list(Config) ->
-    ?line Node = node(),
-    ?line Parent = self(),
-    ?line {_, _, FA, _} = fetch_proc_vals(self()),
-
-    % spawn_link
-    ?line P = spawn_link(fun() -> Parent ! {self(), fetch_proc_vals(self())} end),
-    ?line receive
-	      {P, PV} ->
-		  ?line Node = node(P),
-		  ?line check_proc_vals(true, normal, FA, 0, PV)
-	  end,
+    Node = node(),
+    Parent = self(),
+    {_, _, FA, _} = fetch_proc_vals(self()),
+
+    %% spawn_link
+    P = spawn_link(fun() -> Parent ! {self(), fetch_proc_vals(self())} end),
+    receive
+	{P, PV} ->
+	    Node = node(P),
+	    check_proc_vals(true, normal, FA, 0, PV)
+    end,
     ok.
 
-spawn_link2(doc) -> ["Test spawn_link/2"];
-spawn_link2(suite) ->
-    [];
+%% Test spawn_link/2.
 spawn_link2(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_node(spawn_link2),
+    {ok, Node} = start_node(spawn_link2),
 
-    ?line Parent = self(),
-    ?line {_, _, FA, _} = fetch_proc_vals(self()),
+    Parent = self(),
+    {_, _, FA, _} = fetch_proc_vals(self()),
 
-    % spawn_link
-    ?line P = spawn_link(Node,
-			 fun() -> Parent ! {self(), fetch_proc_vals(self())} end),
-    ?line receive
-	      {P, PV} ->
-		  ?line Node = node(P),
-		  ?line check_proc_vals(true, normal, FA, 0, PV)
-	  end,
+    %% spawn_link
+    P = spawn_link(Node,
+		   fun() -> Parent ! {self(), fetch_proc_vals(self())} end),
+    receive
+	{P, PV} ->
+	    Node = node(P),
+	    check_proc_vals(true, normal, FA, 0, PV)
+    end,
 
-    ?line true = stop_node(Node),
+    true = stop_node(Node),
     ok.
 
-spawn_link3(doc) -> ["Test spawn_link/3"];
-spawn_link3(suite) ->
-    [];
+%% Test spawn_link/3.
 spawn_link3(Config) when is_list(Config) ->
-    ?line Node = node(),
-
-    ?line Parent = self(),
-    ?line {_, _, FA, _} = fetch_proc_vals(self()),
-
-    % spawn_link
-    ?line P = spawn_link(?MODULE,
-			 run_fun,
-			 [fun() ->
-				  Parent ! {self(), fetch_proc_vals(self())}
-			  end]),
-    ?line receive
-	      {P, PV} ->
-		  ?line Node = node(P),
-		  ?line check_proc_vals(true, normal, FA, 0, PV)
-	  end,
+    Node = node(),
+
+    Parent = self(),
+    {_, _, FA, _} = fetch_proc_vals(self()),
+
+    %% spawn_link
+    P = spawn_link(?MODULE,
+		   run_fun,
+		   [fun() ->
+			    Parent ! {self(), fetch_proc_vals(self())}
+		    end]),
+    receive
+	{P, PV} ->
+	    Node = node(P),
+	    check_proc_vals(true, normal, FA, 0, PV)
+    end,
     ok.
 
-spawn_link4(doc) -> ["Test spawn_link/4"];
-spawn_link4(suite) ->
-    [];
+%% Test spawn_link/4.
 spawn_link4(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_node(spawn_link4),
-
-    ?line Parent = self(),
-    ?line {_, _, FA, _} = fetch_proc_vals(self()),
-
-    % spawn_link
-    ?line P = spawn_link(Node,
-			 ?MODULE,
-			 run_fun,
-			 [fun() ->
-				  Parent ! {self(), fetch_proc_vals(self())}
-			  end]),
-    ?line receive
-	      {P, PV} ->
-		  ?line Node = node(P),
-		  ?line check_proc_vals(true, normal, FA, 0, PV)
-	  end,
-
-    ?line true = stop_node(Node),
+    {ok, Node} = start_node(spawn_link4),
+
+    Parent = self(),
+    {_, _, FA, _} = fetch_proc_vals(self()),
+
+    %% spawn_link
+    P = spawn_link(Node,
+		   ?MODULE,
+		   run_fun,
+		   [fun() ->
+			    Parent ! {self(), fetch_proc_vals(self())}
+		    end]),
+    receive
+	{P, PV} ->
+	    Node = node(P),
+	    check_proc_vals(true, normal, FA, 0, PV)
+    end,
+
+    true = stop_node(Node),
     ok.
 
 
-spawn_opt2(doc) -> ["Test spawn_opt/2"];
-spawn_opt2(suite) ->
-    [];
+%% Test spawn_opt/2.
 spawn_opt2(Config) when is_list(Config) ->
-    ?line Node = node(),
-    ?line Parent = self(),
-    ?line {_, _, FA, _} = fetch_proc_vals(self()),
-
-     ?line P1 = spawn_opt(fun() ->
- 				 Parent ! {self(), fetch_proc_vals(self())}
- 			 end,
-			  [{fullsweep_after, 0},{min_heap_size, 1000},
-			   link, {priority, max}]),
-     ?line receive
- 	      {P1, PV1} ->
- 		  ?line Node = node(P1),
- 		  ?line check_proc_vals(true, max, 0, 1000, PV1)
- 	  end,
-    ?line P2 = spawn_opt(fun() -> Parent ! {self(), fetch_proc_vals(self())} end,
-			 [{min_heap_size, 10}]),
-    ?line receive
-	      {P2, PV2} ->
-		  ?line Node = node(P2),
-		  ?line check_proc_vals(false, normal, FA, 10, PV2)
-	  end,
+    Node = node(),
+    Parent = self(),
+    {_, _, FA, _} = fetch_proc_vals(self()),
+
+    P1 = spawn_opt(fun() ->
+			   Parent ! {self(), fetch_proc_vals(self())}
+		   end,
+		   [{fullsweep_after, 0},{min_heap_size, 1000},
+		    link, {priority, max}]),
+    receive
+	{P1, PV1} ->
+	    Node = node(P1),
+	    check_proc_vals(true, max, 0, 1000, PV1)
+    end,
+    P2 = spawn_opt(fun() -> Parent ! {self(), fetch_proc_vals(self())} end,
+		   [{min_heap_size, 10}]),
+    receive
+	{P2, PV2} ->
+	    Node = node(P2),
+	    check_proc_vals(false, normal, FA, 10, PV2)
+    end,
     ok.
 
-spawn_opt3(doc) -> ["Test spawn_opt/3"];
-spawn_opt3(suite) ->
-    [];
+%% Test spawn_opt/3.
 spawn_opt3(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_node(spawn_opt3),
-    ?line Parent = self(),
-    ?line {_, _, FA, _} = fetch_proc_vals(self()),
-    ?line P1 = spawn_opt(Node,
-			 fun() ->
-				 Parent ! {self(), fetch_proc_vals(self())}
-			 end,
-			 [{fullsweep_after,0}, {min_heap_size,1000},
-			  link, {priority, max}]),
-    ?line receive
-	      {P1, PV1} ->
-		  ?line Node = node(P1),
-		  ?line check_proc_vals(true, max, 0, 1000, PV1)
-	  end,
-    ?line P2 = spawn_opt(Node,
-			fun() -> Parent ! {self(), fetch_proc_vals(self())} end,
-			 [{min_heap_size, 10}]),
-    ?line receive
-	      {P2, PV2} ->
-		  ?line Node = node(P2),
-		  ?line check_proc_vals(false, normal, FA, 10, PV2)
-	  end,
-    ?line true = stop_node(Node),
+    {ok, Node} = start_node(spawn_opt3),
+    Parent = self(),
+    {_, _, FA, _} = fetch_proc_vals(self()),
+    P1 = spawn_opt(Node,
+		   fun() ->
+			   Parent ! {self(), fetch_proc_vals(self())}
+		   end,
+		   [{fullsweep_after,0}, {min_heap_size,1000},
+		    link, {priority, max}]),
+    receive
+	{P1, PV1} ->
+	    Node = node(P1),
+	    check_proc_vals(true, max, 0, 1000, PV1)
+    end,
+    P2 = spawn_opt(Node,
+		   fun() -> Parent ! {self(), fetch_proc_vals(self())} end,
+		   [{min_heap_size, 10}]),
+    receive
+	{P2, PV2} ->
+	    Node = node(P2),
+	    check_proc_vals(false, normal, FA, 10, PV2)
+    end,
+    true = stop_node(Node),
     ok.
 
-spawn_opt4(doc) -> ["Test spawn_opt/4"];
-spawn_opt4(suite) ->
-    [];
+%% Test spawn_opt/4.
 spawn_opt4(Config) when is_list(Config) ->
-    ?line Node = node(),
-    ?line Parent = self(),
-    ?line {_, _, FA, _} = fetch_proc_vals(self()),
-    ?line P1 = spawn_opt(?MODULE,
-			 run_fun,
-			 [fun() ->
-				  Parent ! {self(), fetch_proc_vals(self())}
-			  end],
-			 [{fullsweep_after,0}, {min_heap_size,1000},
-			  link, {priority, max}]),
-    ?line receive
-	      {P1, PV1} ->
-		  ?line Node = node(P1),
-		  ?line check_proc_vals(true, max, 0, 1000, PV1)
-	  end,
-    ?line P2 = spawn_opt(?MODULE,
-			 run_fun,
-			 [fun() ->
-				  Parent ! {self(), fetch_proc_vals(self())}
-			  end],
-			     [{min_heap_size, 10}]),
-    ?line receive
-	      {P2, PV2} ->
-		  ?line Node = node(P2),
-		  ?line check_proc_vals(false, normal, FA, 10, PV2)
-	  end,
+    Node = node(),
+    Parent = self(),
+    {_, _, FA, _} = fetch_proc_vals(self()),
+    P1 = spawn_opt(?MODULE,
+		   run_fun,
+		   [fun() ->
+			    Parent ! {self(), fetch_proc_vals(self())}
+		    end],
+		   [{fullsweep_after,0}, {min_heap_size,1000},
+		    link, {priority, max}]),
+    receive
+	{P1, PV1} ->
+	    Node = node(P1),
+	    check_proc_vals(true, max, 0, 1000, PV1)
+    end,
+    P2 = spawn_opt(?MODULE,
+		   run_fun,
+		   [fun() ->
+			    Parent ! {self(), fetch_proc_vals(self())}
+		    end],
+		   [{min_heap_size, 10}]),
+    receive
+	{P2, PV2} ->
+	    Node = node(P2),
+	    check_proc_vals(false, normal, FA, 10, PV2)
+    end,
     ok.
 
-spawn_opt5(doc) -> ["Test spawn_opt/5"];
-spawn_opt5(suite) ->
-    [];
+%% Test spawn_opt/5.
 spawn_opt5(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_node(spawn_opt5),
-    ?line Parent = self(),
-    ?line {_, _, FA, _} = fetch_proc_vals(self()),
-    ?line P1 = spawn_opt(Node,
-			 ?MODULE,
-			 run_fun,
-			 [fun() ->
-				  Parent ! {self(), fetch_proc_vals(self())}
-			  end],
-			 [{fullsweep_after,0}, {min_heap_size,1000},
-			  link, {priority, max}]),
-    ?line receive
-	      {P1, PV1} ->
-		  ?line Node = node(P1),
-		  ?line check_proc_vals(true, max, 0, 1000, PV1)
-	  end,
-    ?line P2 = spawn_opt(Node,
-			 ?MODULE,
-			 run_fun,
-			 [fun() ->
-				  Parent ! {self(), fetch_proc_vals(self())}
-			  end],
-			  [{min_heap_size, 10}]),
-    ?line receive
-	      {P2, PV2} ->
-		  ?line Node = node(P2),
-		  ?line check_proc_vals(false, normal, FA, 10, PV2)
-	  end,
-    ?line true = stop_node(Node),
+    {ok, Node} = start_node(spawn_opt5),
+    Parent = self(),
+    {_, _, FA, _} = fetch_proc_vals(self()),
+    P1 = spawn_opt(Node,
+		   ?MODULE,
+		   run_fun,
+		   [fun() ->
+			    Parent ! {self(), fetch_proc_vals(self())}
+		    end],
+		   [{fullsweep_after,0}, {min_heap_size,1000},
+		    link, {priority, max}]),
+    receive
+	{P1, PV1} ->
+	    Node = node(P1),
+	    check_proc_vals(true, max, 0, 1000, PV1)
+    end,
+    P2 = spawn_opt(Node,
+		   ?MODULE,
+		   run_fun,
+		   [fun() ->
+			    Parent ! {self(), fetch_proc_vals(self())}
+		    end],
+		   [{min_heap_size, 10}]),
+    receive
+	{P2, PV2} ->
+	    Node = node(P2),
+	    check_proc_vals(false, normal, FA, 10, PV2)
+    end,
+    true = stop_node(Node),
     ok.
 
-spawn_failures(doc) ->
-    ["Test failure behavior of spawn bifs"];
-spawn_failures(suite) ->
-    [];
+%% Test failure behavior of spawn bifs.
 spawn_failures(Config) when is_list(Config) ->
-    ?line ThisNode = node(),
-    ?line {ok, Node} = start_node(spawn_remote_failure),
-
-    % unknown nodes
-    test_server:format("Testing unknown nodes~n", []),
-    ?line CrashPid1 = (catch spawn_opt('unknown@node',
-				       erlang,
-				       nodes,
-				       [],
-				       [])),
-    ?line true = is_pid(CrashPid1),
-    ?line ThisNode = node(CrashPid1),
-    ?line CrashPid2 = (catch spawn_opt('unknown@node',
-				       fun () -> erlang:nodes() end,
-				       [])),
-    ?line true = is_pid(CrashPid2),
-    ?line ThisNode = node(CrashPid2),
-
-    ?line CrashPid3 = (catch spawn('unknown@node',
-				   erlang,
-				   nodes,
-				   [])),
-    ?line true = is_pid(CrashPid3),
-    ?line ThisNode = node(CrashPid3),
-    ?line CrashPid4 = (catch spawn('unknown@node',
-				   fun () -> erlang:nodes() end)),
-    ?line true = is_pid(CrashPid4),
-    ?line ThisNode = node(CrashPid4),
-
-    ?line OTE = process_flag(trap_exit,true),
-    ?line CrashPid5 = (catch spawn_link('unknown@node',
-					erlang,
-					nodes,
-					[])),
+    ThisNode = node(),
+    {ok, Node} = start_node(spawn_remote_failure),
+
+    %% unknown nodes
+    io:format("Testing unknown nodes~n", []),
+    CrashPid1 = (catch spawn_opt('unknown@node',
+				 erlang,
+				 nodes,
+				 [],
+				 [])),
+    true = is_pid(CrashPid1),
+    ThisNode = node(CrashPid1),
+    CrashPid2 = (catch spawn_opt('unknown@node',
+				 fun () -> erlang:nodes() end,
+				 [])),
+    true = is_pid(CrashPid2),
+    ThisNode = node(CrashPid2),
+
+    CrashPid3 = (catch spawn('unknown@node',
+			     erlang,
+			     nodes,
+			     [])),
+    true = is_pid(CrashPid3),
+    ThisNode = node(CrashPid3),
+    CrashPid4 = (catch spawn('unknown@node',
+			     fun () -> erlang:nodes() end)),
+    true = is_pid(CrashPid4),
+    ThisNode = node(CrashPid4),
+
+    OTE = process_flag(trap_exit,true),
+    CrashPid5 = (catch spawn_link('unknown@node',
+				  erlang,
+				  nodes,
+				  [])),
     receive
 	{'EXIT', CrashPid5, noconnection} ->
-	    ?line true = is_pid(CrashPid5),
-	    ?line ThisNode = node(CrashPid5)
+	    true = is_pid(CrashPid5),
+	    ThisNode = node(CrashPid5)
     end,
-    ?line CrashPid6 = (catch spawn_link('unknown@node',
-					fun () -> erlang:nodes() end)),
+    CrashPid6 = (catch spawn_link('unknown@node',
+				  fun () -> erlang:nodes() end)),
     receive
 	{'EXIT', CrashPid6, noconnection} ->
-	    ?line true = is_pid(CrashPid6),
-	    ?line ThisNode = node(CrashPid6)
+	    true = is_pid(CrashPid6),
+	    ThisNode = node(CrashPid6)
     end,
     process_flag(trap_exit,OTE),
     case OTE of
 	false ->
 	    receive
 		{'EXIT', P, R} ->
-		    ?line test_server:fail({'EXIT', P, R})
+		    ct:fail({'EXIT', P, R})
 	    after 0 ->
 		    ok
 	    end;
@@ -438,132 +408,125 @@ spawn_failures(Config) when is_list(Config) ->
 	    ok
     end,
 
-    % bad node
-    test_server:format("Testing bad nodes~n", []),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_opt("Node",erlang,nodes,[],[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_opt("Node",
-						   fun () ->
-							   erlang:nodes()
-						   end,
-						   [])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_link("Node",
-						    fun () ->
-							    erlang:nodes()
-						    end)),
-    ?line {'EXIT', {badarg, _}} = (catch spawn("Node",erlang,nodes,[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn("Node",
-					       fun () ->
-						       erlang:nodes()
-					       end)),
-
-    % bad module
-    test_server:format("Testing bad modules~n", []),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_opt(Node,"erlang",nodes,[],[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_opt("erlang",nodes,[],[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_link(Node,"erlang",nodes,[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_link("erlang",nodes,[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn(Node,"erlang",nodes,[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn("erlang",nodes,[])),
-
-    % bad function
-    test_server:format("Testing bad functions~n", []),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_opt(Node,erlang,"nodes",[],[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_opt(Node,not_a_fun,[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_opt(erlang,"nodes",[],[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_opt(not_a_fun,[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_link(Node,erlang,"nodes",[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_link(Node,not_a_fun)),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_link(erlang,"nodes",[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_link(not_a_fun)),
-    ?line {'EXIT', {badarg, _}} = (catch spawn(Node,erlang,"nodes",[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn(Node,not_a_fun)),
-    ?line {'EXIT', {badarg, _}} = (catch spawn(erlang,"nodes",[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn(not_a_fun)),
-
-
-    % bad argument
-    test_server:format("Testing bad arguments~n", []),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_opt(Node,erlang,nodes,[a|b],[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_opt(erlang,nodes,[a|b],[])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_link(Node,erlang,nodes,[a|b])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_link(erlang,nodes,[a|b])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn(Node,erlang,nodes,[a|b])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn(erlang,nodes,[a|b])),
-
-    % bad option
-    test_server:format("Testing bad options~n", []),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_opt(Node,erlang,nodes,[],[a|b])),
-    ?line {'EXIT', {badarg, _}} = (catch spawn_opt(erlang,nodes,[],[a|b])),
-
-
-    ?line true = stop_node(Node),
+    %% bad node
+    io:format("Testing bad nodes~n", []),
+    {'EXIT', {badarg, _}} = (catch spawn_opt("Node",erlang,nodes,[],[])),
+    {'EXIT', {badarg, _}} = (catch spawn_opt("Node",
+					     fun () ->
+						     erlang:nodes()
+					     end,
+					     [])),
+    {'EXIT', {badarg, _}} = (catch spawn_link("Node",
+					      fun () ->
+						      erlang:nodes()
+					      end)),
+    {'EXIT', {badarg, _}} = (catch spawn("Node",erlang,nodes,[])),
+    {'EXIT', {badarg, _}} = (catch spawn("Node",
+					 fun () ->
+						 erlang:nodes()
+					 end)),
+
+    %% bad module
+    io:format("Testing bad modules~n", []),
+    {'EXIT', {badarg, _}} = (catch spawn_opt(Node,"erlang",nodes,[],[])),
+    {'EXIT', {badarg, _}} = (catch spawn_opt("erlang",nodes,[],[])),
+    {'EXIT', {badarg, _}} = (catch spawn_link(Node,"erlang",nodes,[])),
+    {'EXIT', {badarg, _}} = (catch spawn_link("erlang",nodes,[])),
+    {'EXIT', {badarg, _}} = (catch spawn(Node,"erlang",nodes,[])),
+    {'EXIT', {badarg, _}} = (catch spawn("erlang",nodes,[])),
+
+    %% bad function
+    io:format("Testing bad functions~n", []),
+    {'EXIT', {badarg, _}} = (catch spawn_opt(Node,erlang,"nodes",[],[])),
+    {'EXIT', {badarg, _}} = (catch spawn_opt(Node,not_a_fun,[])),
+    {'EXIT', {badarg, _}} = (catch spawn_opt(erlang,"nodes",[],[])),
+    {'EXIT', {badarg, _}} = (catch spawn_opt(not_a_fun,[])),
+    {'EXIT', {badarg, _}} = (catch spawn_link(Node,erlang,"nodes",[])),
+    {'EXIT', {badarg, _}} = (catch spawn_link(Node,not_a_fun)),
+    {'EXIT', {badarg, _}} = (catch spawn_link(erlang,"nodes",[])),
+    {'EXIT', {badarg, _}} = (catch spawn_link(not_a_fun)),
+    {'EXIT', {badarg, _}} = (catch spawn(Node,erlang,"nodes",[])),
+    {'EXIT', {badarg, _}} = (catch spawn(Node,not_a_fun)),
+    {'EXIT', {badarg, _}} = (catch spawn(erlang,"nodes",[])),
+    {'EXIT', {badarg, _}} = (catch spawn(not_a_fun)),
+
+
+    %% bad argument
+    io:format("Testing bad arguments~n", []),
+    {'EXIT', {badarg, _}} = (catch spawn_opt(Node,erlang,nodes,[a|b],[])),
+    {'EXIT', {badarg, _}} = (catch spawn_opt(erlang,nodes,[a|b],[])),
+    {'EXIT', {badarg, _}} = (catch spawn_link(Node,erlang,nodes,[a|b])),
+    {'EXIT', {badarg, _}} = (catch spawn_link(erlang,nodes,[a|b])),
+    {'EXIT', {badarg, _}} = (catch spawn(Node,erlang,nodes,[a|b])),
+    {'EXIT', {badarg, _}} = (catch spawn(erlang,nodes,[a|b])),
+
+    %% bad option
+    io:format("Testing bad options~n", []),
+    {'EXIT', {badarg, _}} = (catch spawn_opt(Node,erlang,nodes,[],[a|b])),
+    {'EXIT', {badarg, _}} = (catch spawn_opt(erlang,nodes,[],[a|b])),
+
+
+    true = stop_node(Node),
     ok.
 
 check_proc_vals(Link, Priority, FullsweepAfter, MinHeapSize, {Ls, P, FA, HS}) ->
-    ?line Link = lists:member(self(), Ls),
-    ?line Priority = P,
+    Link = lists:member(self(), Ls),
+    Priority = P,
     FullsweepAfter = FA,
     true = (HS >= MinHeapSize),
-    ?line ok.
+    ok.
 
 fetch_proc_vals(Pid) ->
-    ?line PI = process_info(Pid),
-    ?line {value,{links, Ls}} = lists:keysearch(links, 1, PI),
-    ?line {value,{priority,P}} = lists:keysearch(priority, 1, PI),
+    PI = process_info(Pid),
+    {value,{links, Ls}} = lists:keysearch(links, 1, PI),
+    {value,{priority,P}} = lists:keysearch(priority, 1, PI),
     {value,{garbage_collection,Gs}} =
 	lists:keysearch(garbage_collection, 1, PI),
     {value,{fullsweep_after,FA}} =
 	lists:keysearch(fullsweep_after, 1, Gs),
     {value,{heap_size,HS}} = lists:keysearch(heap_size, 1, PI),
-    ?line {Ls, P, FA, HS}.
-     
-decode_packet_delim(doc) ->
-    ["Test erlang:packet_delim/3 with {line_delimiter,0} option"];
-decode_packet_delim(suite) ->
-    [];
+    {Ls, P, FA, HS}.
+
+%% Test erlang:packet_delim/3 with {line_delimiter,0} option.
 decode_packet_delim(Config) when is_list(Config) ->
     {ok,<<"abc",0>>,<<"efg",0>>} =
         erlang:decode_packet(line, <<"abc",0,"efg",0>>, [{line_delimiter, 0}]),
     {more, undefined} = erlang:decode_packet(line, <<"abc",0,"efg",0>>, []).
 
-% This testcase should probably be moved somewhere else
-wilderness(doc) ->
-    ["Test that memory allocation command line options affecting the"
-     "wilderness of the heap are interpreted correct by the emulator "];
-wilderness(suite) ->
-    [];
+%% This testcase should probably be moved somewhere else
+
+%% Test that memory allocation command line options affecting the
+%% wilderness of the heap are interpreted correct by the emulator.
 wilderness(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    ?line OKParams = {512, 8},
-    ?line Alloc = erlang:system_info(allocator),
-    ?line test_server:format("Test server allocator info:~n~p", [Alloc]),
+    OKParams = {512, 8},
+    Alloc = erlang:system_info(allocator),
+    io:format("Test server allocator info:~n~p", [Alloc]),
     Result = case Alloc of
 		 {Allocator, _, _, _} when Allocator == glibc;
 					   Allocator == dlmalloc ->
-		     ?line run_wilderness_test(OKParams, OKParams),
-		     ?line {comment,
-			    "Allocator used: " ++ atom_to_list(Allocator)};
+		     run_wilderness_test(OKParams, OKParams),
+		     {comment,
+		      "Allocator used: " ++ atom_to_list(Allocator)};
 		 {OtherAllocator, _, _, _} ->
-		     ?line {skipped,
-			    "Only run when glibc is used. "
-			    "Allocator used: "
-			    ++ atom_to_list(OtherAllocator)}
+		     {skipped,
+		      "Only run when glibc is used. "
+		      "Allocator used: "
+		      ++ atom_to_list(OtherAllocator)}
 	     end,
-    ?line test_server:timetrap_cancel(Dog),
     Result.
-    
+
 run_wilderness_test({Set_tt, Set_tp}, {Exp_tt, Exp_tp}) ->
     Self = self(),
     Ref = make_ref(),
     SuiteDir = filename:dirname(code:which(?MODULE)),
-    ?line {ok, Node} = test_server:start_node(allocator_test,
-					      slave,
-					      [{args,
-						" -pa "
-						++ SuiteDir
-						++" +MYtt "++to_string(Set_tt)
-						++" +MYtp "++to_string(Set_tp)},
-					       {linked, false}]),
+    {ok, Node} = test_server:start_node(allocator_test,
+					slave,
+					[{args,
+					  " -pa "
+					  ++ SuiteDir
+					  ++" +MYtt "++to_string(Set_tt)
+					  ++" +MYtp "++to_string(Set_tp)},
+					 {linked, false}]),
     spawn(Node, fun () ->
 			Self ! {Ref, erlang:system_info(allocator)}
 		end),
@@ -571,15 +534,15 @@ run_wilderness_test({Set_tt, Set_tp}, {Exp_tt, Exp_tp}) ->
 	{Ref, {A, V, F, S}} ->
 	    Ett = Exp_tt*1024,
 	    Etp = Exp_tp*1024,
-	    ?line test_server:format("Test allocator info:~n~p",
-				     [{A, V, F, S}]),
-	    ?line {value, {sys_alloc, SA_Opts}}
+	    io:format("Test allocator info:~n~p",
+		      [{A, V, F, S}]),
+	    {value, {sys_alloc, SA_Opts}}
 		= lists:keysearch(sys_alloc, 1, S),
-	    ?line {value, {tt, Ett}} = lists:keysearch(tt, 1, SA_Opts),
-	    ?line {value, {tp, Etp}} = lists:keysearch(tp, 1, SA_Opts)
+	    {value, {tt, Ett}} = lists:keysearch(tt, 1, SA_Opts),
+	    {value, {tp, Etp}} = lists:keysearch(tp, 1, SA_Opts)
     end,
     stop_node(Node).
-	     
+
 to_string(X) when is_integer(X) ->
     integer_to_list(X);
 to_string(X) when is_atom(X) ->
@@ -605,12 +568,12 @@ get_nodenames(N, T, Acc) ->
 					++ integer_to_list(C)) | Acc]).
 
 start_node(TestCase) ->
-    ?line [Name] = get_nodenames(1, TestCase),
-    ?line Pa = filename:dirname(code:which(?MODULE)),
-    ?line test_server:start_node(Name, slave, [{args, "-pa " ++ Pa}]).
+    [Name] = get_nodenames(1, TestCase),
+    Pa = filename:dirname(code:which(?MODULE)),
+    test_server:start_node(Name, slave, [{args, "-pa " ++ Pa}]).
 
 stop_node(Node) ->
-    ?line true = test_server:stop_node(Node).
+    true = test_server:stop_node(Node).
 
 run_fun(Fun) ->
     Fun().
diff --git a/lib/kernel/test/cleanup.erl b/lib/kernel/test/cleanup.erl
index 7eb0a9e140..26000b545f 100644
--- a/lib/kernel/test/cleanup.erl
+++ b/lib/kernel/test/cleanup.erl
@@ -21,7 +21,7 @@
 
 -export([all/0,groups/0,init_per_group/2,end_per_group/2, cleanup/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 all() -> 
     [cleanup].
@@ -36,15 +36,14 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-cleanup(suite) -> [];
 cleanup(_) ->
-    ?line Localhost = list_to_atom(net_adm:localhost()),
-    ?line net_adm:world_list([Localhost]),
-    ?line case nodes() of
-	      [] ->
-		  ok;
-	      Nodes when is_list(Nodes) ->
-		  Kill = fun(Node) -> spawn(Node, erlang, halt, []) end,
-		  ?line lists:foreach(Kill, Nodes),
-		  ?line test_server:fail({nodes_left, Nodes})
-	  end.
+    Localhost = list_to_atom(net_adm:localhost()),
+    net_adm:world_list([Localhost]),
+    case nodes() of
+	[] ->
+	    ok;
+	Nodes when is_list(Nodes) ->
+	    Kill = fun(Node) -> spawn(Node, erlang, halt, []) end,
+	    lists:foreach(Kill, Nodes),
+	    ct:fail({nodes_left, Nodes})
+    end.
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index ef5303defd..1b7672d362 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(code_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([set_path/1, get_path/1, add_path/1, add_paths/1, del_path/1,
@@ -30,12 +30,12 @@
 	 upgrade/1,
 	 sticky_dir/1, pa_pz_option/1, add_del_path/1,
 	 dir_disappeared/1, ext_mod_dep/1, clash/1,
-	 load_cached/1, start_node_with_cache/1, add_and_rehash/1,
-	 where_is_file_cached/1, where_is_file_no_cache/1,
+	 where_is_file/1,
 	 purge_stacktrace/1, mult_lib_roots/1, bad_erl_libs/1,
 	 code_archive/1, code_archive2/1, on_load/1, on_load_binary/1,
 	 on_load_embedded/1, on_load_errors/1, big_boot_embedded/1,
-	 native_early_modules/1, get_mode/1]).
+	 native_early_modules/1, get_mode/1,
+	 normalized_paths/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2,
 	 init_per_suite/1, end_per_suite/1]).
@@ -47,7 +47,9 @@
 
 -export([compile_load/4]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,5}}].
 
 all() ->
     [set_path, get_path, add_path, add_paths, del_path,
@@ -56,12 +58,11 @@ all() ->
      load_binary, dir_req, object_code, set_path_file,
      upgrade,
      sticky_dir, pa_pz_option, add_del_path, dir_disappeared,
-     ext_mod_dep, clash, load_cached, start_node_with_cache,
-     add_and_rehash, where_is_file_no_cache,
-     where_is_file_cached, purge_stacktrace, mult_lib_roots,
+     ext_mod_dep, clash, where_is_file,
+     purge_stacktrace, mult_lib_roots,
      bad_erl_libs, code_archive, code_archive2, on_load,
      on_load_binary, on_load_embedded, on_load_errors,
-     big_boot_embedded, native_early_modules, get_mode].
+     big_boot_embedded, native_early_modules, get_mode, normalized_paths].
 
 groups() ->
     [].
@@ -94,34 +95,28 @@ init_per_testcase(big_boot_embedded, Config) ->
 	    {skip, "Needs crypto!"}
     end;
 init_per_testcase(_Func, Config) ->
-    Dog=?t:timetrap(?t:minutes(5)),
-    P=code:get_path(),
-    P=code:get_path(),
-    [{watchdog, Dog}, {code_path, P}|Config].
+    P = code:get_path(),
+    [{code_path, P}|Config].
 
 end_per_testcase(TC, Config) when TC == mult_lib_roots;
 				  TC == big_boot_embedded ->
     {ok, HostName} = inet:gethostname(),
     NodeName = list_to_atom(atom_to_list(TC)++"@"++HostName),
-    ?t:stop_node(NodeName),
+    test_server:stop_node(NodeName),
     end_per_testcase(Config);
 end_per_testcase(_Func, Config) ->
     end_per_testcase(Config).
 
 end_per_testcase(Config) ->
     code:purge(code_b_test),
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    P=?config(code_path, Config),
+    P=proplists:get_value(code_path, Config),
     true=code:set_path(P),
     P=code:get_path(),
     ok.
 
-set_path(suite) -> [];
-set_path(doc) -> [];
 set_path(Config) when is_list(Config) ->
     P = code:get_path(),
-    NonExDir = filename:join(?config(priv_dir, Config), ?t:temp_name("hej")),
+    NonExDir = filename:join(proplists:get_value(priv_dir, Config), test_server:temp_name("hej")),
     {'EXIT',_} = (catch code:set_path({a})),
     {error, bad_directory} = (catch code:set_path([{a}])),
     {error, bad_directory} = code:set_path(NonExDir),
@@ -135,19 +130,15 @@ set_path(Config) when is_list(Config) ->
     [LibDir] = code:get_path(),
     ok.
 
-get_path(suite) -> [];
-get_path(doc) -> [];
 get_path(Config) when is_list(Config) ->
     P = code:get_path(),
-    % test that all directories are strings (lists).
+    %% test that all directories are strings (lists).
     [] = lists:filter(fun
 	    (Dir) when is_list(Dir) -> false;
 	    (_) -> true
 	end, P),
     ok.
 
-add_path(suite) -> [];
-add_path(doc) -> [];
 add_path(Config) when is_list(Config) ->
     P = code:get_path(),
     {'EXIT',_} = (catch code:add_path({})),
@@ -168,8 +159,6 @@ add_path(Config) when is_list(Config) ->
     code:set_path(P),
     ok.
 
-add_paths(suite) -> [];
-add_paths(doc) -> [];
 add_paths(Config) when is_list(Config) ->
     P = code:get_path(),
     ok = code:add_paths([{}]),
@@ -215,8 +204,6 @@ add_paths(Config) when is_list(Config) ->
     code:set_path(P),
     ok.
 
-del_path(suite) -> [];
-del_path(doc) -> [];
 del_path(Config) when is_list(Config) ->
     P = code:get_path(),
     try
@@ -226,18 +213,18 @@ del_path(Config) when is_list(Config) ->
     end.
 
 del_path_1(P) ->
-    test_server:format("Initial code:get_path()=~p~n",[P]),
+    io:format("Initial code:get_path()=~p~n",[P]),
     {'EXIT',_} = (catch code:del_path(3)),
     false = code:del_path(my_dummy_name),
     false = code:del_path("/kdlk/my_dummy_dir"),
     Dir = filename:join([code:lib_dir(kernel),"ebin"]),
-    test_server:format("kernel dir: ~p~n",[Dir]),
+    io:format("kernel dir: ~p~n",[Dir]),
 
     true = code:del_path(kernel),
     NewP = code:get_path(),
-    test_server:format("Path after removing 'kernel':~p~n",[NewP]),
+    io:format("Path after removing 'kernel':~p~n",[NewP]),
     ReferenceP = lists:delete(Dir,P),
-    test_server:format("Reference path:~p~n",[ReferenceP]),
+    io:format("Reference path:~p~n",[ReferenceP]),
     NewP = ReferenceP, % check that dir is deleted
     code:set_path(P),
 
@@ -251,10 +238,8 @@ del_path_1(P) ->
     NewP1 = lists:delete(Dir,P), % check that dir is deleted
     ok.
 
-replace_path(suite) -> [];
-replace_path(doc) -> [];
 replace_path(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     P = code:get_path(),
     {'EXIT',_} = (catch code:replace_path(3,"")),
     {error, bad_name} = code:replace_path(dummy_name,""),
@@ -289,10 +274,9 @@ replace_path(Config) when is_list(Config) ->
 
     ok.
 
-dir_disappeared(suite) -> [];
-dir_disappeared(doc) -> ["OTP-3977"];
+%% OTP-3977.
 dir_disappeared(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Dir = filename:join(PrivDir, "temp"),
     ok = file:make_dir(Dir),
     true = code:add_path(Dir),
@@ -300,8 +284,6 @@ dir_disappeared(Config) when is_list(Config) ->
     non_existing = code:which(bubbelskrammel),
     ok.
 
-load_file(suite) -> [];
-load_file(doc) -> [];
 load_file(Config) when is_list(Config) ->
     {error, nofile} = code:load_file(duuuumy_mod),
     {error, badfile} = code:load_file(code_a_test),
@@ -316,21 +298,18 @@ load_file(Config) when is_list(Config) ->
 test_dir() ->
     filename:dirname(code:which(?MODULE)).
 
-load_abs(suite) -> [];
-load_abs(doc) -> [];
 load_abs(Config) when is_list(Config) ->
     TestDir = test_dir(),
     {error, nofile} = code:load_abs(TestDir ++ "/duuuumy_mod"),
     {error, badfile} = code:load_abs(TestDir ++ "/code_a_test"),
     {'EXIT', _} = (catch code:load_abs({})),
+    {'EXIT', _} = (catch code:load_abs("Non-latin-имя-файла")),
     {module, code_b_test} = code:load_abs(TestDir ++ "/code_b_test"),
     code:stick_dir(TestDir),
     {error, sticky_directory} = code:load_abs(TestDir ++ "/code_b_test"),
     code:unstick_dir(TestDir),
     ok.
 
-ensure_loaded(suite) -> [];
-ensure_loaded(doc) -> [];
 ensure_loaded(Config) when is_list(Config) ->
     {module, lists} = code:ensure_loaded(lists),
     case init:get_argument(mode) of
@@ -347,8 +326,6 @@ ensure_loaded(Config) when is_list(Config) ->
 	    ok
     end.
 
-delete(suite) -> [];
-delete(doc) -> [];
 delete(Config) when is_list(Config) ->
     OldFlag = process_flag(trap_exit, true),
     code:purge(code_b_test),
@@ -365,8 +342,6 @@ delete(Config) when is_list(Config) ->
     process_flag(trap_exit, OldFlag),
     ok.
 
-purge(suite) -> [];
-purge(doc) -> [];
 purge(Config) when is_list(Config) ->
     OldFlag = process_flag(trap_exit, true),
     code:purge(code_b_test),
@@ -382,8 +357,23 @@ purge(Config) when is_list(Config) ->
 
 purge_many_exits(Config) when is_list(Config) ->
     OldFlag = process_flag(trap_exit, true),
+
     code:purge(code_b_test),
     {'EXIT',_} = (catch code:purge({})),
+
+    CodePurgeF = fun(M, Exp) -> Exp = code:purge(M) end,
+    purge_many_exits_do(CodePurgeF),
+
+    %% Let's repeat test for erlang:purge_module as it does the same thing
+    %% now in erts-8.0 (except for return value).
+    ErlangPurgeF = fun(M, _Exp) -> erlang:purge_module(M) end,
+    purge_many_exits_do(ErlangPurgeF),
+
+    process_flag(trap_exit, OldFlag),
+    ok.
+
+
+purge_many_exits_do(PurgeF) ->
     false = code:purge(code_b_test),
     TPids = lists:map(fun (_) ->
 			      {code_b_test:do_spawn(),
@@ -394,7 +384,7 @@ purge_many_exits(Config) when is_list(Config) ->
 					  end)}
 			 end,
 			 lists:seq(1, 1000)),
-    % Give them time to start...
+    %% Give them time to start...
     receive after 1000 -> ok end,
     true = code:delete(code_b_test),
     lists:foreach(fun ({Pid1, Pid2}) ->
@@ -402,7 +392,7 @@ purge_many_exits(Config) when is_list(Config) ->
 			  false = code_b_test:check_exit(Pid1),
 			  true = erlang:is_process_alive(Pid2)
 		  end, TPids),
-    true = code:purge(code_b_test),
+    PurgeF(code_b_test, true),
     lists:foreach(fun ({Pid1, Pid2}) ->
 			  false = erlang:is_process_alive(Pid1),
 			  true = code_b_test:check_exit(Pid1),
@@ -411,13 +401,9 @@ purge_many_exits(Config) when is_list(Config) ->
 		  end, TPids),
     lists:foreach(fun ({_Pid1, Pid2}) ->
 			  receive {'EXIT', Pid2, _} -> ok end
-		  end, TPids),
-    process_flag(trap_exit, OldFlag),
-    ok.
+		  end, TPids).
 
 
-soft_purge(suite) -> [];
-soft_purge(doc) -> [];
 soft_purge(Config) when is_list(Config) ->
     OldFlag = process_flag(trap_exit, true),
     code:purge(code_b_test),
@@ -434,8 +420,6 @@ soft_purge(Config) when is_list(Config) ->
     process_flag(trap_exit, OldFlag),
     ok.
 
-is_loaded(suite) -> [];
-is_loaded(doc) -> [];
 is_loaded(Config) when is_list(Config) ->
     code:purge(code_b_test),
     code:delete(code_b_test),
@@ -449,10 +433,8 @@ is_loaded(Config) when is_list(Config) ->
     code:delete(code_b_test),
     ok.
 
-all_loaded(suite) -> [];
-all_loaded(doc) -> [];
 all_loaded(Config) when is_list(Config) ->
-    case ?t:is_cover() of
+    case test_server:is_cover() of
 	true -> {skip,"Cover is running"};
 	false -> all_loaded_1()
     end.
@@ -480,8 +462,6 @@ all_unique([]) -> ok;
 all_unique([_]) -> ok;
 all_unique([{X,_}|[{Y,_}|_]=T]) when X < Y -> all_unique(T).
 
-load_binary(suite) -> [];
-load_binary(doc) -> [];
 load_binary(Config) when is_list(Config) ->
     TestDir = test_dir(),
     File = TestDir ++ "/code_b_test" ++ code:objfile_extension(),
@@ -498,7 +478,7 @@ load_binary(Config) when is_list(Config) ->
     ok.
 
 upgrade(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
 
     %%T = [beam, hipe],
     T = [beam],
@@ -530,15 +510,11 @@ compile_load(Mod, Dir, Ver, CodeType) ->
     CompOpts = [binary, report] ++ Target ++ Version,
 
     Src = filename:join(Dir, atom_to_list(Mod) ++ ".erl"),
-    %io:format("compile:file(~p,~p)\n", [Src, CompOpts]),
     {ok,Mod,Code} = compile:file(Src, CompOpts),
     ObjFile = filename:basename(Src,".erl") ++ ".beam",
     {module,Mod} = code:load_binary(Mod, ObjFile, Code),
-    %IsNative = code:is_module_native(Mod),
     ok.
 
-dir_req(suite) -> [];
-dir_req(doc) -> [];
 dir_req(Config) when is_list(Config) ->
     {ok,[[Root0]]} = init:get_argument(root),
     Root = filename:join([Root0]),	% Normalised form.
@@ -553,8 +529,6 @@ dir_req(Config) when is_list(Config) ->
     {error, bad_name} = code:priv_dir(duuumy),
     ok.
 
-object_code(suite) -> [];
-object_code(doc) -> [];
 object_code(Config) when is_list(Config) ->
     TestDir = test_dir(),
     P = code:get_path(),
@@ -575,22 +549,20 @@ object_code(Config) when is_list(Config) ->
     P=code:get_path(),
     ok.
 
-set_path_file(suite) -> [];
-set_path_file(doc) -> ["Test that set_path does not accept ",
-		       "files as pathnames (known previous bug)"];
+%% Test that set_path does not accept
+%% files as pathnames (known previous bug)
 set_path_file(Config) when is_list(Config) ->
-    File=filename:join(?config(priv_dir, Config), "testfil"),
+    File=filename:join(proplists:get_value(priv_dir, Config), "testfil"),
     ok=file:write_file(File, list_to_binary("lite data")),
     {error, bad_directory}=code:set_path([File]).
 
-sticky_dir(suite) -> [];
-sticky_dir(doc) -> ["Test that a module with the same name as a module in ",
-		    "a sticky directory cannot be loaded."];
+%% Test that a module with the same name as a module in
+%% a sticky directory cannot be loaded.
 sticky_dir(Config) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
-    {ok,Node} = ?t:start_node(sticky_dir, slave, [{args,"-pa "++Pa}]),
+    {ok,Node} = test_server:start_node(sticky_dir, slave, [{args,"-pa "++Pa}]),
     Mods = [code,lists,erlang,init],
-    OutDir = filename:join(?config(priv_dir, Config), sticky_dir),
+    OutDir = filename:join(proplists:get_value(priv_dir, Config), sticky_dir),
     _ = file:make_dir(OutDir),
     Ret = rpc:call(Node, erlang, apply,
 		   [fun sticky_compiler/2,[Mods,OutDir]]),
@@ -599,9 +571,9 @@ sticky_dir(Config) when is_list(Config) ->
 	    ok;
 	Other ->
 	    io:format("~p\n", [Other]),
-	    ?t:fail()
+	    ct:fail(failed)
     end,
-    ?t:stop_node(Node),
+    test_server:stop_node(Node),
     ok.
 
 sticky_compiler(Files, PrivDir) ->
@@ -626,34 +598,31 @@ do_sticky_compile(Mod, Dir) ->
 	    ok
     end.
 
-pa_pz_option(suite) -> [];
-pa_pz_option(doc) -> ["Test that the -pa and -pz options work as expected"];
+%% Test that the -pa and -pz options work as expected.
 pa_pz_option(Config) when is_list(Config) ->
-    DDir = ?config(data_dir,Config),
+    DDir = proplists:get_value(data_dir,Config),
     PaDir = filename:join(DDir,"pa"),
     PzDir = filename:join(DDir,"pz"),
-    {ok, Node}=?t:start_node(pa_pz1, slave,
+    {ok, Node}=test_server:start_node(pa_pz1, slave,
 	[{args,
 		"-pa " ++ PaDir
 		++ " -pz " ++ PzDir}]),
     Ret=rpc:call(Node, code, get_path, []),
     [PaDir|Paths] = Ret,
     [PzDir|_] = lists:reverse(Paths),
-    ?t:stop_node(Node),
-    {ok, Node2}=?t:start_node(pa_pz2, slave,
+    test_server:stop_node(Node),
+    {ok, Node2}=test_server:start_node(pa_pz2, slave,
 	[{args,
 		"-mode embedded " ++ "-pa "
 		++ PaDir ++ " -pz " ++ PzDir}]),
     Ret2=rpc:call(Node2, code, get_path, []),
     [PaDir|Paths2] = Ret2,
     [PzDir|_] = lists:reverse(Paths2),
-    ?t:stop_node(Node2).
+    test_server:stop_node(Node2).
 
-add_del_path(suite) ->
-    [];
-add_del_path(doc) -> ["add_path, del_path should not cause priv_dir(App) to fail"];
+%% add_path, del_path should not cause priv_dir(App) to fail.
 add_del_path(Config) when is_list(Config) ->
-    DDir = ?config(data_dir,Config),
+    DDir = proplists:get_value(data_dir,Config),
     Dir1 = filename:join(DDir,"dummy_app-1.0/ebin"),
     Dir2 = filename:join(DDir,"dummy_app-2.0/ebin"),
     code:add_patha(Dir1),
@@ -667,43 +636,35 @@ add_del_path(Config) when is_list(Config) ->
 
 
 clash(Config) when is_list(Config) ->
-    DDir = ?config(data_dir,Config)++"clash/",
+    DDir = proplists:get_value(data_dir,Config)++"clash/",
     P = code:get_path(),
-    [TestServerPath|_] = [Path || Path <- code:get_path(),
-				  re:run(Path,"test_server/?$",[unicode]) /= nomatch],
 
     %% test non-clashing entries
 
-    %% remove TestServerPath to prevent clash with test-server path
-    true = code:del_path(TestServerPath),
     true = code:add_path(DDir++"foobar-0.1/ebin"),
     true = code:add_path(DDir++"zork-0.8/ebin"),
-    test_server:capture_start(),
+    ct:capture_start(),
     ok = code:clash(),
-    test_server:capture_stop(),
-    [OKMsg|_] = test_server:capture_get(),
+    ct:capture_stop(),
+    [OKMsg|_] = ct:capture_get(),
     true = lists:prefix("** Found 0 name clashes", OKMsg),
     true = code:set_path(P),
 
     %% test clashing entries
 
-    %% remove TestServerPath to prevent clash with test-server path
-    true = code:del_path(TestServerPath),
     true = code:add_path(DDir++"foobar-0.1/ebin"),
     true = code:add_path(DDir++"foobar-0.1.ez/foobar-0.1/ebin"),
-    test_server:capture_start(),
+    ct:capture_start(),
     ok = code:clash(),
-    test_server:capture_stop(),
-    [ClashMsg|_] = test_server:capture_get(),
+    ct:capture_stop(),
+    [ClashMsg|_] = ct:capture_get(),
     {match, [" hides "]} = re:run(ClashMsg, "\\*\\* .*( hides ).*",
 					[{capture,all_but_first,list}]),
     true = code:set_path(P),
 
     %% test "Bad path can't read"
 
-    %% remove TestServerPath to prevent clash with test-server path
-    Priv = ?config(priv_dir, Config),
-    true = code:del_path(TestServerPath),
+    Priv = proplists:get_value(priv_dir, Config),
     TmpEzFile = Priv++"foobar-0.tmp.ez",
     {ok, _} = file:copy(DDir++"foobar-0.1.ez", TmpEzFile),
     true = code:add_path(TmpEzFile++"/foobar-0.1/ebin"),
@@ -715,20 +676,17 @@ clash(Config) when is_list(Config) ->
 	 _ ->
     	    ok = file:delete(TmpEzFile)
     end,
-    test_server:capture_start(),
+    ct:capture_start(),
     ok = code:clash(),
-    test_server:capture_stop(),
-    [BadPathMsg|_] = test_server:capture_get(),
+    ct:capture_stop(),
+    [BadPathMsg|_] = ct:capture_get(),
     true = lists:prefix("** Bad path can't read", BadPathMsg),
     true = code:set_path(P),
     file:delete(TmpEzFile++".moved"), %% Only effect on windows
     ok.
 
-ext_mod_dep(suite) ->
-    [];
-ext_mod_dep(doc) ->
-    ["Every module that the code_server uses should be preloaded, "
-     "this test case verifies that"];
+%% Every module that the code_server uses should be preloaded,
+%% this test case verifies that.
 ext_mod_dep(Config) when is_list(Config) ->
     xref:start(s),
     xref:set_default(s, [{verbose,false},{warnings,false},
@@ -744,7 +702,7 @@ ext_mod_dep(Config) when is_list(Config) ->
     	    xref:stop(s),
 	    case Else of
 		ok -> ok;
-		_ -> test_server:fail(Else)
+		_ -> ct:fail(Else)
 	    end
     end.
 
@@ -768,6 +726,7 @@ analyse([], [This={M,F,A}|Path], Visited, ErrCnt0) ->
     OK = [erlang, os, prim_file, erl_prim_loader, init, ets,
 	  code_server, lists, lists_sort, unicode, binary, filename,
 	  gb_sets, gb_trees, hipe_unified_loader, hipe_bifs,
+	  erts_code_purger,
 	  prim_zip, zlib],
     ErrCnt1 =
 	case lists:member(M, OK) or erlang:is_builtin(M,F,A) of
@@ -793,7 +752,7 @@ analyse2(MFA={_,_,_}, Path, Visited0) ->
     analyse(FL, [MFA|Path], my_usort([MFA|Visited0]), 0).
 
 %%%% We need to check these manually...
-% fun's are ok as long as they are defined locally.
+%% fun's are ok as long as they are defined locally.
 check_funs({'$M_EXPR','$F_EXPR',_},
 	   [{unicode,characters_to_binary_int,3},
 	    {unicode,characters_to_binary,3},
@@ -838,18 +797,7 @@ check_funs({'$M_EXPR','$F_EXPR',1},
 	    {code_server,start_link,1}]) -> 0;
 check_funs({'$M_EXPR','$F_EXPR',1},
 	   [{lists,filter,2},
-	    {code_server,try_archive_subdirs,3},
-	    {code_server,all_archive_subdirs,1},
-	    {code_server,archive_subdirs,1},
-	    {code_server,insert_name,3},
-	    {code_server,replace_name,2},
-	    {code_server,update,2},
-	    {code_server,maybe_update,2},
-	    {code_server,do_add,4},
-	    {code_server,add_path,4},
-	    {code_server,handle_call,3},
-	    {code_server,loop,1},
-	    {code_server,system_continue,3}]) -> 0;
+	    {code_server,try_archive_subdirs,3}|_]) -> 0;
 check_funs({'$M_EXPR','$F_EXPR',_},
 	   [{erlang,apply,2},
 	    {erlang,spawn_link,1},
@@ -876,19 +824,21 @@ check_funs({'$M_EXPR','$F_EXPR',1},
 	    {hipe_unified_loader,get_refs_from,2}| _]) -> 0;
 check_funs({'$M_EXPR',warning_msg,2},
 	   [{code_server,finish_on_load_report,2} | _]) -> 0;
+check_funs({'$M_EXPR','$F_EXPR',1},
+	   [{code_server,run,2}|_]) -> 0;
 %% This is cheating! /raimo
 %%
 %% check_funs(This = {M,_,_}, Path) ->
 %%     case catch atom_to_list(M) of
 %% 	[$h,$i,$p,$e | _] ->
-%% 	    test_server:format("hipe_module_ignored(~p, ~p)~n", [This, Path]),
+%% 	    io:format("hipe_module_ignored(~p, ~p)~n", [This, Path]),
 %% 	    0;
 %% 	_ ->
-%% 	    test_server:format("not_verified(~p, ~p)~n", [This, Path]),
+%% 	    io:format("not_verified(~p, ~p)~n", [This, Path]),
 %% 	    1
 %%     end;
 check_funs(This, Path) ->
-    test_server:format("not_verified(~p, ~p)~n", [This, Path]),
+    io:format("not_verified(~p, ~p)~n", [This, Path]),
     1.
 
 my_usort(List) ->
@@ -904,140 +854,7 @@ uniq([H|T],A) ->
     uniq(T,[H|A]).
 
 
-load_cached(suite) ->
-    [];
-load_cached(doc) ->
-    [];
-load_cached(Config) when is_list(Config) ->
-    Priv = ?config(priv_dir, Config),
-    WD = filename:dirname(code:which(?MODULE)),
-    {ok,Node} =
-	?t:start_node(code_cache_node, peer, [{args,
-					       "-pa \"" ++ WD ++ "\""},
-					      {erl, [this]}]),
-    CCTabCreated = fun(Tab) ->
-			   case ets:info(Tab, name) of
-			       code_cache -> true;
-			       _ -> false
-			   end
-		   end,
-    Tabs = rpc:call(Node, ets, all, []),
-    case rpc:call(Node, lists, any, [CCTabCreated,Tabs]) of
-	true ->
-	    ?t:stop_node(Node),
-	    ?t:fail("Code cache should not be active!");
-	false ->
-	    ok
-    end,
-    rpc:call(Node, code, del_path, [Priv]),
-    rpc:call(Node, code, add_pathz, [Priv]),
-
-    FullModName = Priv ++ "/code_cache_test",
-    {ok,Dev} = file:open(FullModName ++ ".erl", [write]),
-    io:format(Dev, "-module(code_cache_test). -export([a/0]). a() -> ok.~n", []),
-    ok = file:close(Dev),
-    {ok,code_cache_test} = compile:file(FullModName, [{outdir,Priv}]),
-
-    F = fun load_loop/2,
-    N = 1000,
-    {T0,T1} = rpc:call(Node, erlang, apply, [F, [N,code_cache_test]]),
-    TNoCache = now_diff(T1, T0),
-    rpc:call(Node, code, rehash, []),
-    {T2,T3} = rpc:call(Node, erlang, apply, [F, [N,code_cache_test]]),
-    TCache = now_diff(T3, T2),
-    AvgNoCache = TNoCache/N,
-    AvgCache = TCache/N,
-    io:format("Avg. load time (no_cache/cache): ~w/~w~n", [AvgNoCache,AvgCache]),
-    ?t:stop_node(Node),
-    if AvgNoCache =< AvgCache ->
-	    ?t:fail("Cache not working properly.");
-       true ->
-	    ok
-    end.
-
-load_loop(N, M) ->
-    load_loop(N, M, now()).
-load_loop(0, _M, T0) ->
-    {T0,now()};
-load_loop(N, M, T0) ->
-    code:load_file(M),
-    code:delete(M),
-    code:purge(M),
-    load_loop(N-1, M, T0).
-
-now_diff({A2, B2, C2}, {A1, B1, C1}) ->
-    ((A2-A1)*1000000 + B2-B1)*1000000 + C2-C1.
-
-start_node_with_cache(suite) ->
-    [];
-start_node_with_cache(doc) ->
-    [];
-start_node_with_cache(Config) when is_list(Config) ->
-    {ok,Node} =
-	?t:start_node(code_cache_node, peer, [{args,
-					       "-code_path_cache"},
-					      {erl, [this]}]),
-    Tabs = rpc:call(Node, ets, all, []),
-    io:format("Tabs: ~w~n", [Tabs]),
-    CCTabCreated = fun(Tab) ->
-			   case rpc:call(Node, ets, info, [Tab,name]) of
-			       code_cache -> true;
-			       _ -> false
-			   end
-		   end,
-    true = lists:any(CCTabCreated, Tabs),
-    ?t:stop_node(Node),
-    ok.
-
-add_and_rehash(suite) ->
-    [];
-add_and_rehash(doc) ->
-    [];
-add_and_rehash(Config) when is_list(Config) ->
-    Priv = ?config(priv_dir, Config),
-    WD = filename:dirname(code:which(?MODULE)),
-    {ok,Node} =
-	?t:start_node(code_cache_node, peer, [{args,
-					       "-pa \"" ++ WD ++ "\""},
-					      {erl, [this]}]),
-    CCTabCreated = fun(Tab) ->
-			   case ets:info(Tab, name) of
-			       code_cache -> true;
-			       _ -> false
-			   end
-		   end,
-    Tabs0 = rpc:call(Node, ets, all, []),
-    case rpc:call(Node, lists, any, [CCTabCreated,Tabs0]) of
-	true ->
-	    ?t:stop_node(Node),
-	    ?t:fail("Code cache should not be active!");
-	false ->
-	    ok
-    end,
-    ok = rpc:call(Node, code, rehash, []),	             % create cache
-    Tabs1 = rpc:call(Node, ets, all, []),
-    true = rpc:call(Node, lists, any, [CCTabCreated,Tabs1]), % cache table created
-    ok = rpc:call(Node, code, rehash, []),
-    OkDir = filename:join(Priv, ""),
-    BadDir = filename:join(Priv, "guggemuffsussiputt"),
-    CP = [OkDir | rpc:call(Node, code, get_path, [])],
-    true = rpc:call(Node, code, set_path, [CP]),
-    CP1 = [BadDir | CP],
-    {error,_} = rpc:call(Node, code, set_path, [CP1]),
-    true = rpc:call(Node, code, del_path, [OkDir]),
-    true = rpc:call(Node, code, add_path, [OkDir]),
-    true = rpc:call(Node, code, add_path, [OkDir]),
-    {error,_} = rpc:call(Node, code, add_path, [BadDir]),
-    ok = rpc:call(Node, code, rehash, []),
-
-    ?t:stop_node(Node),
-    ok.
-
-where_is_file_no_cache(suite) ->
-    [];
-where_is_file_no_cache(doc) ->
-    [];
-where_is_file_no_cache(Config) when is_list(Config) ->
+where_is_file(Config) when is_list(Config) ->
     {T,KernelBeamFile} = timer:tc(code, where_is_file, ["kernel.beam"]),
     io:format("Load time: ~w ms~n", [T]),
     KernelEbinDir = filename:dirname(KernelBeamFile),
@@ -1046,39 +863,7 @@ where_is_file_no_cache(Config) when is_list(Config) ->
     non_existing = code:where_is_file("kernel"), % no such file
     ok.
 
-where_is_file_cached(suite) ->
-    [];
-where_is_file_cached(doc) ->
-    [];
-where_is_file_cached(Config) when is_list(Config) ->
-    {ok,Node} =
-	?t:start_node(code_cache_node, peer, [{args,
-					       "-code_path_cache"},
-					      {erl, [this]}]),
-    Tabs = rpc:call(Node, ets, all, []),
-    io:format("Tabs: ~w~n", [Tabs]),
-    CCTabCreated = fun(Tab) ->
-			   case rpc:call(Node, ets, info, [Tab,name]) of
-			       code_cache -> true;
-			       _ -> false
-			   end
-		   end,
-    true = lists:any(CCTabCreated, Tabs),
-    KernelBeamFile = rpc:call(Node, code, where_is_file, ["kernel.beam"]),
-    {T,KernelBeamFile} = rpc:call(Node, timer, tc, [code,where_is_file,["kernel.beam"]]),
-    io:format("Load time: ~w ms~n", [T]),
-    KernelEbinDir = rpc:call(Node, filename, dirname, [KernelBeamFile]),
-    AppFile = rpc:call(Node, filename, join, [KernelEbinDir,"kernel.app"]),
-    AppFile = rpc:call(Node, code, where_is_file, ["kernel.app"]),
-    non_existing = rpc:call(Node, code, where_is_file, ["kernel"]), % no such file
-    ?t:stop_node(Node),
-    ok.
-
-
-purge_stacktrace(suite) ->
-    [];
-purge_stacktrace(doc) ->
-    ["Test that stacktrace is deleted when purging a referred module"];
+%% Test that stacktrace is deleted when purging a referred module.
 purge_stacktrace(Config) when is_list(Config) ->
     code:purge(code_b_test),
     try code_b_test:call(fun(b) -> ok end, a)
@@ -1119,7 +904,7 @@ purge_stacktrace(Config) when is_list(Config) ->
     ok.
 
 mult_lib_roots(Config) when is_list(Config) ->
-    DataDir = filename:join(?config(data_dir, Config), "mult_lib_roots"),
+    DataDir = filename:join(proplists:get_value(data_dir, Config), "mult_lib_roots"),
     mult_lib_compile(DataDir, "my_dummy_app-b/ebin/lists"),
     mult_lib_compile(DataDir,
 			   "my_dummy_app-c/ebin/code_SUITE_mult_root_module"),
@@ -1129,12 +914,11 @@ mult_lib_roots(Config) when is_list(Config) ->
 	filename:join(DataDir, "second_root"),
 
     {ok,Node} =
-	?t:start_node(mult_lib_roots, slave,
+	test_server:start_node(mult_lib_roots, slave,
 		      [{args,"-env ERL_LIBS "++ErlLibs}]),
 
-    TSPath = filename:dirname(code:which(test_server)),
     Path0 = rpc:call(Node, code, get_path, []),
-    [TSPath,"."|Path1] = Path0,
+    ["."|Path1] = Path0,
     [Kernel|Path2] = Path1,
     [Stdlib|Path3] = Path2,
     mult_lib_verify_lib(Kernel, "kernel"),
@@ -1178,16 +962,19 @@ mult_lib_remove_prefix([$/|T], []) -> T.
 
 bad_erl_libs(Config) when is_list(Config) ->
     {ok,Node} =
-	?t:start_node(mult_lib_roots, slave,
-		      [{args,"-env ERL_LIBS "}]),
-
-    ?t:stop_node(Node),
+	test_server:start_node(bad_erl_libs, slave, []),
+    Code = rpc:call(Node,code,get_path,[]),
+    test_server:stop_node(Node),
 
     {ok,Node2} =
-	?t:start_node(mult_lib_roots, slave,
-		      [{args,"-env ERL_LIBS /no/such/dir"}]),
+	test_server:start_node(bad_erl_libs, slave,
+			       [{args,"-env ERL_LIBS /no/such/dir"}]),
+    Code2 = rpc:call(Node,code,get_path,[]),
+    test_server:stop_node(Node2),
+
+    %% Test that code path is not affected by the faulty ERL_LIBS
+    Code = Code2,
 
-    ?t:stop_node(Node2),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1202,8 +989,8 @@ code_archive2(Config) when is_list(Config) ->
 
 do_code_archive(Config, Root, StripVsn) when is_list(Config) ->
     %% Copy the orig files to priv_dir
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     App = code_archive_dict,
     VsnBase = atom_to_list(App) ++ "-1.0",
     Base =
@@ -1238,7 +1025,7 @@ do_code_archive(Config, Root, StripVsn) when is_list(Config) ->
 
     %% Set up ERL_LIBS and start a slave node.
     {ok, Node} =
-	?t:start_node(code_archive, slave,
+	test_server:start_node(code_archive, slave,
 		      [{args,"-env ERL_LIBS " ++ RootDir}]),
     CodePath = rpc:call(Node, code, get_path, []),
     AppEbin = filename:join([Archive, Base, "ebin"]),
@@ -1269,7 +1056,7 @@ do_code_archive(Config, Root, StripVsn) when is_list(Config) ->
     error =  rpc:call(Node, App, find, [Tab, Key]),
     ok =  rpc:call(Node, App, erase, [Tab]),
 
-    ?t:stop_node(Node),
+    test_server:stop_node(Node),
     ok.
 
 compile_app(TopDir, AppName) ->
@@ -1295,15 +1082,12 @@ compile_files([File | Files], SrcDir, OutDir) ->
 compile_files([], _, _) ->
     ok.
 
-big_boot_embedded(suite) ->
-    [];
-big_boot_embedded(doc) ->
-    ["Test that a boot file with (almost) all of OTP can be used to start an"
-     " embeddedd system."];
+%% Test that a boot file with (almost) all of OTP can be used to start an
+%% embeddedd system.
 big_boot_embedded(Config) when is_list(Config) ->
     {BootArg,AppsInBoot} = create_big_boot(Config),
     {ok, Node} =
-	?t:start_node(big_boot_embedded, slave,
+	test_server:start_node(big_boot_embedded, slave,
 		      [{args,"-boot "++BootArg++" -mode embedded"}]),
     RemoteNodeApps =
 	[ {X,Y} || {X,_,Y} <-
@@ -1314,7 +1098,7 @@ big_boot_embedded(Config) when is_list(Config) ->
 on_load(Config) when is_list(Config) ->
     Master = on_load_test_case_process,
 
-    Data = filename:join([?config(data_dir, Config),"on_load"]),
+    Data = filename:join([proplists:get_value(data_dir, Config),"on_load"]),
     ok = file:set_cwd(Data),
     up_to_date = make:all([{d,'MASTER',Master}]),
 
@@ -1358,7 +1142,7 @@ on_load(Config) when is_list(Config) ->
     on_load_wait_for_all(Refs),
     receive
 	Any ->
-	    ?t:fail({unexpected,Any})
+	    ct:fail({unexpected,Any})
     after 10 ->
 	    ok
     end.
@@ -1426,7 +1210,7 @@ on_load_embedded(Config) when is_list(Config) ->
     end.
 
 on_load_embedded_1(Config) ->
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
 
     %% Link the on_load_app application into the lib directory.
     LibRoot = code:lib_dir(),
@@ -1437,6 +1221,9 @@ on_load_embedded_1(Config) ->
     case file:make_symlink(OnLoadApp, LinkName) of
 	{error,enotsup} ->
 	    throw({skip,"Support for symlinks required"});
+	{error,eperm} ->
+	    %% On Windows, we may not have permissions to create symlinks.
+	    throw({skip,"Support for symlinks required"});
 	ok -> ok
     end,
 
@@ -1481,7 +1268,7 @@ create_boot(Config, Options) ->
     filename:join(LatestDir, LatestName).
 
 create_script(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Name = PrivDir ++ "on_load_test",
     Apps = application_controller:which_applications(),
     {value,{_,_,KernelVer}} = lists:keysearch(kernel, 1, Apps),
@@ -1508,33 +1295,46 @@ create_big_boot(Config) ->
     ok = file:set_cwd(OldDir),
     {filename:join(LatestDir, LatestName),Apps}.
 
-% The following apps cannot be loaded
-% hipe .app references (or can reference) files that have no
-% corresponding beam file (if hipe is not enabled)
+%% The following apps cannot be loaded.
+%% hipe .app references (or can reference) files that have no
+%% corresponding beam file (if hipe is not enabled).
 filter_app("hipe",_) -> false;
-% Dialyzer and typer depends on hipe
+
+%% Dialyzer and typer depends on hipe
 filter_app("dialyzer",_) -> false;
 filter_app("typer",_) -> false;
-% Orber requires explicit configuration
+
+%% Orber requires explicit configuration
 filter_app("orber",_) -> false;
-% cos* depends on orber
+
+%% cos* depends on orber
 filter_app("cos"++_,_) -> false;
-% ic has a mod instruction in the app file but no corresponding start function
+
+%% ic has a mod instruction in the app file but no corresponding start
+%% function
 filter_app("ic",_) -> false;
-% Netconf has some dependency that I really do not understand (maybe like orber)
+
+%% Netconf has some dependency that I really do not understand (maybe
+%% like orber)
 filter_app("netconf",_) -> false;
-% Safe has the same kind of error in the .app file as ic
+
+%% Safe has the same kind of error in the .app file as ic
 filter_app("safe",_) -> false;
-% Comte cannot be started in the "usual" way
+
+%% Comte cannot be started in the "usual" way
 filter_app("comte",_) -> false;
-% OS_mon does not find it's port program when running cerl
+
+%% OS_mon does not find its port program when running cerl
 filter_app("os_mon",true) -> false;
-% erts is not a "real" app either =/
+
+%% erts is not a "real" app either =/
 filter_app("erts",_) -> false;
-% Other apps should be OK.
+
+%% Other apps should be OK.
 filter_app(_,_) -> true.
+
 create_big_script(Config,Local) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Name = filename:join(PrivDir,"full_script_test"),
     InitialApplications=application:loaded_applications(),
     %% Applications left loaded by the application suite, unload them!
@@ -1568,7 +1368,7 @@ on_load_errors(Config) when is_list(Config) ->
     Master = on_load_error_test_case_process,
     register(Master, self()),
 
-    Data = filename:join([?config(data_dir, Config),"on_load_errors"]),
+    Data = filename:join([proplists:get_value(data_dir, Config),"on_load_errors"]),
     ok = file:set_cwd(Data),
     up_to_date = make:all([{d,'MASTER',Master}]),
 
@@ -1594,11 +1394,22 @@ on_load_errors(Config) when is_list(Config) ->
     %% There should be no more messages.
     receive
 	Unexpected ->
-	    ?t:fail({unexpected,Unexpected})
+	    ct:fail({unexpected,Unexpected})
     after 10 ->
 	    ok
     end,
 
+    %% Make sure that the code loading functions return the correct
+    %% error code.
+    Simple = simple_on_load_error,
+    SimpleList = atom_to_list(Simple),
+    {error,on_load_failure} = code:load_file(Simple),
+    {error,on_load_failure} = code:ensure_loaded(Simple),
+    {ok,SimpleCode} = file:read_file("simple_on_load_error.beam"),
+    {error,on_load_failure} = code:load_binary(Simple, "", SimpleCode),
+    {error,on_load_failure} = code:load_abs(SimpleList),
+    {error,on_load_failure} = code:load_abs(SimpleList, Simple),
+
     ok.
 
 do_on_load_error(ReturnValue) ->
@@ -1612,8 +1423,7 @@ do_on_load_error(ReturnValue) ->
 	    {undef,[{on_load_error,main,[],_}|_]} = Exit
     end.
 
-native_early_modules(suite) -> [];
-native_early_modules(doc) -> ["Test that the native code of early loaded modules is loaded"];
+%% Test that the native code of early loaded modules is loaded.
 native_early_modules(Config) when is_list(Config) ->
     case erlang:system_info(hipe_architecture) of
 	undefined ->
@@ -1641,11 +1451,26 @@ native_early_modules_1(Architecture) ->
             ok
     end.
 
-get_mode(suite) -> [];
-get_mode(doc) -> ["Test that the mode of the code server is properly retrieved"];
+%% Test that the mode of the code server is properly retrieved.
 get_mode(Config) when is_list(Config) ->
     interactive = code:get_mode().
 
+%% Make sure that the paths for all loaded modules have been normalized.
+normalized_paths(_Config) ->
+    do_normalized_paths(erlang:loaded()).
+
+do_normalized_paths([M|Ms]) ->
+    case code:which(M) of
+	Special when is_atom(Special) ->
+	    do_normalized_paths(Ms);
+	File when is_list(File) ->
+	    File = filename:join([File]),
+	    do_normalized_paths(Ms)
+    end;
+do_normalized_paths([]) ->
+    ok.
+
+
 %%-----------------------------------------------------------------
 %% error_logger handler.
 %% (Copied from stdlib/test/proc_lib_SUITE.erl.)
@@ -1672,7 +1497,7 @@ terminate(_Reason, State) ->
 %%%
 
 start_node(Name, Param) ->
-    ?t:start_node(Name, slave, [{args, Param}]).
+    test_server:start_node(Name, slave, [{args, Param}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
diff --git a/lib/kernel/test/code_SUITE_data/on_load_errors/simple_on_load_error.erl b/lib/kernel/test/code_SUITE_data/on_load_errors/simple_on_load_error.erl
new file mode 100644
index 0000000000..603c282257
--- /dev/null
+++ b/lib/kernel/test/code_SUITE_data/on_load_errors/simple_on_load_error.erl
@@ -0,0 +1,5 @@
+-module(simple_on_load_error).
+-on_load(on_load/0).
+
+on_load() ->
+    nope.
diff --git a/lib/kernel/test/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl
index 9988347581..135144bbe7 100644
--- a/lib/kernel/test/disk_log_SUITE.erl
+++ b/lib/kernel/test/disk_log_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(disk_log_SUITE).
 
-%-define(debug, true).
+%%-define(debug, true).
 
 -ifdef(debug).
 -define(format(S, A), io:format(S, A)).
@@ -29,10 +29,10 @@
 -define(config(X,Y), foo).
 -define(t,test_server).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(format(S, A), ok).
--define(privdir(Conf), ?config(priv_dir, Conf)).
--define(datadir(Conf), ?config(data_dir, Conf)).
+-define(privdir(Conf), proplists:get_value(priv_dir, Conf)).
+-define(datadir(Conf), proplists:get_value(data_dir, Conf)).
 -endif.
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -102,8 +102,6 @@
 
 -export([client/4]).
 
--define(default_timeout, ?t:minutes(1)).
-
 %% error_logger
 -export([init/1,
 	 handle_event/2, handle_call/2, handle_info/2,
@@ -139,7 +137,9 @@
 			  change_size_after, default_size]).
 
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     [{group, halt_int}, {group, wrap_int},
@@ -194,259 +194,229 @@ end_per_group(_GroupName, Config) ->
 
 
 
-init_per_testcase(Case, Config) ->
-    case should_skip(Case,Config) of
-	true ->
-	    CS = check_nfs(Config),
-	    {skipped, lists:flatten
-	     (io_lib:format
-	      ("The test does not work "
-	       "with current NFS cache size (~w),"
-	       " to get this test to run, "
-	       "~s the NFS cache size~n",  
-	       [CS, case CS of
-			0 ->
-			    "enlarge";
-			_ ->
-			    "zero"
-		    end]))};
-	_ ->
-	    Dog=?t:timetrap(?t:minutes(2)),
-	    [{watchdog, Dog}|Config]
-    end.
+init_per_testcase(_Case, Config) ->
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
 
-halt_int_inf(suite) -> [];
-halt_int_inf(doc) -> ["Test simple halt disk log, size infinity"];
+%% Test simple halt disk log, size infinity.
 halt_int_inf(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
-    ?line ok = disk_log:start(),
+    ok = disk_log:start(),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {format,internal},
-				   {file, File}]),
-    ?line simple_log(a),
-    ?line ok = disk_log:close(a),
-    ?line ok = file:delete(File).
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {format,internal},
+			     {file, File}]),
+    simple_log(a),
+    ok = disk_log:close(a),
+    ok = file:delete(File).
 
 
-halt_int_sz_1(suite) -> [];
-halt_int_sz_1(doc) -> ["Test simple halt disk log, size defined"];
+%% Test simple halt disk log, size defined.
 halt_int_sz_1(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,18000},
-				   {format,internal},
-				   {file, File}]),
-    ?line simple_log(a),
-    ?line ok = disk_log:truncate(a),
-    ?line [] = get_all_terms(a),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,18000},
+			     {format,internal},
+			     {file, File}]),
+    simple_log(a),
+    ok = disk_log:truncate(a),
+    [] = get_all_terms(a),
     T1 = mk_bytes(10000),
     T2 = mk_bytes(5000),
-    ?line ok = disk_log:log(a, T1),
-    ?line case get_all_terms(a) of
-	      [T1] ->
-		  ok;
-	      E1 ->
-		  test_server_fail({bad_terms, E1, [T1]})
-	  end,
-    ?line ok = disk_log:log(a, T2),
-    ?line {error, {full, a}} = disk_log:log(a, T1),
-    ?line ok = disk_log:alog(a, T1),
-    ?line case get_all_terms(a) of
-	      [T1, T2] ->
-		  ok;
-	      E2 ->
-		  test_server_fail({bad_terms, E2, [T1, T2]})
-	  end,
-    ?line ok = disk_log:close(a),
-    ?line ok = file:delete(File).
+    ok = disk_log:log(a, T1),
+    case get_all_terms(a) of
+	[T1] ->
+	    ok;
+	E1 ->
+	    test_server_fail({bad_terms, E1, [T1]})
+    end,
+    ok = disk_log:log(a, T2),
+    {error, {full, a}} = disk_log:log(a, T1),
+    ok = disk_log:alog(a, T1),
+    case get_all_terms(a) of
+	[T1, T2] ->
+	    ok;
+	E2 ->
+	    test_server_fail({bad_terms, E2, [T1, T2]})
+    end,
+    ok = disk_log:close(a),
+    ok = file:delete(File).
 
-halt_int_sz_2(suite) -> [];
-halt_int_sz_2(doc) -> ["Test simple halt disk log, size ~8192"];
+%% Test simple halt disk log, size ~8192.
 halt_int_sz_2(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File1 = filename:join(Dir, "a.LOG"),
     File2 = filename:join(Dir, "b.LOG"),
     File3 = filename:join(Dir, "c.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,8191},
-				   {format,internal},
-				   {file, File1}]),
-    ?line {ok, b} = disk_log:open([{name,b}, {type,halt}, {size,8192},
-				   {format,internal},
-				   {file, File2}]),
-    ?line {ok, c} = disk_log:open([{name,c}, {type,halt}, {size,8193},
-				   {format,internal},
-				   {file, File3}]),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,8191},
+			     {format,internal},
+			     {file, File1}]),
+    {ok, b} = disk_log:open([{name,b}, {type,halt}, {size,8192},
+			     {format,internal},
+			     {file, File2}]),
+    {ok, c} = disk_log:open([{name,c}, {type,halt}, {size,8193},
+			     {format,internal},
+			     {file, File3}]),
     T1 = mk_bytes(8191-16), % 16 is size of header + magics for 1 item
     T2 = mk_bytes(8192-16),
     T3 = mk_bytes(8193-16),
-    ?line ok = disk_log:log(a, T1),
-    ?line ok = disk_log:log(b, T2),
-    ?line ok = disk_log:log(c, T3),
-    ?line case get_all_terms(a) of
-	      [T1] ->
-		  ok;
-	      E1 ->
-		  test_server_fail({bad_terms, E1, [T1]})
-	  end,
-    ?line case get_all_terms(b) of
-	      [T2] ->
-		  ok;
-	      E2 ->
-		  test_server_fail({bad_terms, E2, [T2]})
-	  end,
-    ?line case get_all_terms(c) of
-	      [T3] ->
-		  ok;
-	      E3 ->
-		  test_server_fail({bad_terms, E3, [T3]})
-	  end,
-    ?line ok = disk_log:truncate(a),
-    ?line ok = disk_log:truncate(b),
-    ?line {error, {full, a}} = disk_log:log(a, T2),
-    ?line {error, {full, b}} = disk_log:log(b, T3),
-    ?line [] = get_all_terms(a),
-    ?line [] = get_all_terms(b),
-    ?line ok = disk_log:close(a),
-    ?line ok = disk_log:close(b),
-    ?line ok = disk_log:close(c),
-    ?line ok = file:delete(File1),
-    ?line ok = file:delete(File2),
-    ?line ok = file:delete(File3),
+    ok = disk_log:log(a, T1),
+    ok = disk_log:log(b, T2),
+    ok = disk_log:log(c, T3),
+    case get_all_terms(a) of
+	[T1] ->
+	    ok;
+	E1 ->
+	    test_server_fail({bad_terms, E1, [T1]})
+    end,
+    case get_all_terms(b) of
+	[T2] ->
+	    ok;
+	E2 ->
+	    test_server_fail({bad_terms, E2, [T2]})
+    end,
+    case get_all_terms(c) of
+	[T3] ->
+	    ok;
+	E3 ->
+	    test_server_fail({bad_terms, E3, [T3]})
+    end,
+    ok = disk_log:truncate(a),
+    ok = disk_log:truncate(b),
+    {error, {full, a}} = disk_log:log(a, T2),
+    {error, {full, b}} = disk_log:log(b, T3),
+    [] = get_all_terms(a),
+    [] = get_all_terms(b),
+    ok = disk_log:close(a),
+    ok = disk_log:close(b),
+    ok = disk_log:close(c),
+    ok = file:delete(File1),
+    ok = file:delete(File2),
+    ok = file:delete(File3),
     ok.
 
 
-halt_int_ro(suite) -> [];
-halt_int_ro(doc) -> ["Test simple halt disk log, read only, internal"];
+%% Test simple halt disk log, read only, internal.
 halt_int_ro(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
 
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {format,internal}, {file, File}]),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {format,internal}, {file, File}]),
     simple_log(a),
-    ?line ok = disk_log:close(a),
+    ok = disk_log:close(a),
 
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {format,internal}, {file, File},
-				   {mode,read_only}]),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {format,internal}, {file, File},
+			     {mode,read_only}]),
     T1 = "not allowed to write",
-    ?line {error, {read_only_mode, a}} = disk_log:log(a, T1),
-    ?line ok = disk_log:close(a),
-    ?line ok = file:delete(File).
+    {error, {read_only_mode, a}} = disk_log:log(a, T1),
+    ok = disk_log:close(a),
+    ok = file:delete(File).
 
-halt_ext_ro(suite) -> [];
-halt_ext_ro(doc) -> ["Test simple halt disk log, read only, external"];
+%% Test simple halt disk log, read only, external.
 halt_ext_ro(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {format,external}, {file, File}]),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {format,external}, {file, File}]),
     xsimple_log(File, a),
-    ?line ok = disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {format,external}, {file, File},
-				   {mode,read_only}]),
+    ok = disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {format,external}, {file, File},
+			     {mode,read_only}]),
     T1 = "not allowed to write",
-    ?line {error, {read_only_mode, a}}  = disk_log:blog(a, T1),
-    ?line ok = disk_log:close(a),
-    ?line ok = file:delete(File).
+    {error, {read_only_mode, a}}  = disk_log:blog(a, T1),
+    ok = disk_log:close(a),
+    ok = file:delete(File).
 
-wrap_int_ro(suite) -> [];
-wrap_int_ro(doc) -> ["Test simple wrap disk log, read only, internal"];
+%% Test simple wrap disk log, read only, internal.
 wrap_int_ro(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
-				   {format,internal}, {file, File}]),
+    {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
+			     {format,internal}, {file, File}]),
     simple_log(a),
-    ?line ok = disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
-				   {format,internal}, {file, File}, {mode,read_only}]),
+    ok = disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
+			     {format,internal}, {file, File}, {mode,read_only}]),
     T1 = "not allowed to write",
-    ?line {error, {read_only_mode, a}} = disk_log:log(a, T1),
-    ?line ok = disk_log:close(a),
-    ?line del(File, 4).
+    {error, {read_only_mode, a}} = disk_log:log(a, T1),
+    ok = disk_log:close(a),
+    del(File, 4).
 
-wrap_ext_ro(suite) -> [];
-wrap_ext_ro(doc) -> ["Test simple wrap disk log, read only, external"];
+%% Test simple wrap disk log, read only, external.
 wrap_ext_ro(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
-				   {format,external}, {file, File}]),
+    {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
+			     {format,external}, {file, File}]),
     x2simple_log(File ++ ".1", a),
-    ?line ok = disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
-				   {format,external}, {file, File},
-				   {mode,read_only}]),
+    ok = disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
+			     {format,external}, {file, File},
+			     {mode,read_only}]),
     T1 = "not allowed to write",
-    ?line {error, {read_only_mode, a}}  = disk_log:blog(a, T1),
-    ?line {error, {read_only_mode, a}}  = disk_log:inc_wrap_file(a),
-    ?line ok = disk_log:close(a),
+    {error, {read_only_mode, a}}  = disk_log:blog(a, T1),
+    {error, {read_only_mode, a}}  = disk_log:inc_wrap_file(a),
+    ok = disk_log:close(a),
     del(File, 4).
 
-halt_trunc(suite) -> [];
-halt_trunc(doc) -> ["Test truncation of halt disk log"];
+%% Test truncation of halt disk log.
 halt_trunc(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {format,internal}, {file, File}]),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {format,internal}, {file, File}]),
     simple_log(a),
-    ?line ok = disk_log:close(a),
-    ?line {error,{badarg,repair_read_only}} =
+    ok = disk_log:close(a),
+    {error,{badarg,repair_read_only}} =
 	disk_log:open([{name,a}, {type,halt}, {size,infinity},
 		       {repair, truncate}, {format,internal},
 		       {file, File}, {mode,read_only}]),
-    ?line ok = file:delete(File).
+    ok = file:delete(File).
 
-halt_misc(suite) -> [];
-halt_misc(doc) -> ["Test truncation of halt disk log"];
+%% Test truncation of halt disk log.
 halt_misc(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {format,internal}, {file, File}]),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {format,internal}, {file, File}]),
     simple_log(a),
-    ?line ok = disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {format,internal}, {file, File},
-				   {mode,read_only}]),
+    ok = disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {format,internal}, {file, File},
+			     {mode,read_only}]),
     T1 = "not allowed to write",
-    ?line {error, {read_only_mode, a}} = disk_log:log(a, T1),
-    ?line {error, {read_only_mode, a}} = disk_log:sync(a),
-    ?line {error, {read_only_mode, a}} = disk_log:reopen(a, "b.LOG"),
-    ?line {error, {read_only_mode, a}} = 
+    {error, {read_only_mode, a}} = disk_log:log(a, T1),
+    {error, {read_only_mode, a}} = disk_log:sync(a),
+    {error, {read_only_mode, a}} = disk_log:reopen(a, "b.LOG"),
+    {error, {read_only_mode, a}} =
         disk_log:change_header(a, {head,header}),
-    ?line {error, {read_only_mode, a}} = 
+    {error, {read_only_mode, a}} =
         disk_log:change_size(a, infinity),
-    ?line ok = disk_log:close(a),
-    ?line ok = file:delete(File).
+    ok = disk_log:close(a),
+    ok = file:delete(File).
 
-halt_ro_alog(suite) -> [];
-halt_ro_alog(doc) -> ["Test truncation of halt disk log, read only"];
+%% Test truncation of halt disk log, read only.
 halt_ro_alog(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {format,internal}, {file, File}]),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {format,internal}, {file, File}]),
     simple_log(a),
-    ?line ok = disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {notify,true}, {format,internal},
-				   {file, File}, {mode,read_only}]),
+    ok = disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {notify,true}, {format,internal},
+			     {file, File}, {mode,read_only}]),
     T1 = "not allowed to write",
-    ?line ok = disk_log:alog(a, T1),
-    ?line ok = halt_ro_alog_wait_notify(a, T1),
-    ?line ok = disk_log:close(a),
-    ?line ok = file:delete(File).
+    ok = disk_log:alog(a, T1),
+    ok = halt_ro_alog_wait_notify(a, T1),
+    ok = disk_log:close(a),
+    ok = file:delete(File).
 
 halt_ro_alog_wait_notify(Log, T) ->
     Term = term_to_binary(T),
@@ -459,23 +429,22 @@ halt_ro_alog_wait_notify(Log, T) ->
 	    failed
     end.
 
-halt_ro_balog(suite) -> [];
-halt_ro_balog(doc) -> ["Test truncation of halt disk log, read only"];
+%% Test truncation of halt disk log, read only.
 halt_ro_balog(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {format,internal}, {file, File}]),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {format,internal}, {file, File}]),
     simple_log(a),
-    ?line ok = disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {notify,true}, {format,external},
-				   {file, File}, {mode,read_only}]),
+    ok = disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {notify,true}, {format,external},
+			     {file, File}, {mode,read_only}]),
     T1 = "not allowed to write",
-    ?line ok = disk_log:balog(a, T1),
-    ?line ok = halt_ro_balog_wait_notify(a, T1),
-    ?line ok = disk_log:close(a),
-    ?line ok = file:delete(File).
+    ok = disk_log:balog(a, T1),
+    ok = halt_ro_balog_wait_notify(a, T1),
+    ok = disk_log:close(a),
+    ok = file:delete(File).
 
 halt_ro_balog_wait_notify(Log, T) ->
     Term = list_to_binary(T),
@@ -488,127 +457,123 @@ halt_ro_balog_wait_notify(Log, T) ->
 	    failed
     end.
 
-halt_ro_crash(suite) -> [];
-halt_ro_crash(doc) -> ["Test truncation of halt disk log, read only, repair"];
+%% Test truncation of halt disk log, read only, repair.
 halt_ro_crash(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
 
-    ?line file:delete(File),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-			   {format,internal},{file, File}]),
+    file:delete(File),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {format,internal},{file, File}]),
     simple_log(a),
-    ?line ok = disk_log:close(a),
+    ok = disk_log:close(a),
     crash(File, 10),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {notify,true}, {format,internal},
-				   {file, File}, {mode,read_only}]),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {notify,true}, {format,internal},
+			     {file, File}, {mode,read_only}]),
 
-    ?line Error1 = {error, {read_only_mode, a}} = disk_log:truncate(a),
-    ?line "The disk log" ++ _ = format_error(Error1),
+    Error1 = {error, {read_only_mode, a}} = disk_log:truncate(a),
+    "The disk log" ++ _ = format_error(Error1),
 
     %% crash/1 sets the length of the first item to something big (2.5 kb).
     %% In R6B, binary_to_term accepts garbage at the end of the binary,
     %% which means that the first item is recognized!
     %% This is how it was before R6B:
-    %% ?line {C1,T1,15} = disk_log:chunk(a,start),
-    %% ?line {C2,T2} = disk_log:chunk(a,C1),
+    %% {C1,T1,15} = disk_log:chunk(a,start),
+    %% {C2,T2} = disk_log:chunk(a,C1),
     {C1,_OneItem,7478} = disk_log:chunk(a,start),
     {C2, [], 7} = disk_log:chunk(a,C1),
-    ?line eof = disk_log:chunk(a,C2),
-    ?line ok = disk_log:close(a),
-    ?line ok = file:delete(File).
+    eof = disk_log:chunk(a,C2),
+    ok = disk_log:close(a),
+    ok = file:delete(File).
 
 
 
 
 
-wrap_int_1(suite) -> [];
-wrap_int_1(doc) -> ["Test wrap disk log, internal"];
+%% Test wrap disk log, internal.
 wrap_int_1(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
-				   {format,internal},
-				   {file, File}]),
-    ?line [_] = 
+    {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
+			     {format,internal},
+			     {file, File}]),
+    [_] =
         lists:filter(fun(P) -> disk_log:pid2name(P) =/= undefined end, 
                      erlang:processes()),
     simple_log(a),
-    ?line ok = disk_log:close(a),
+    ok = disk_log:close(a),
     del(File, 4),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
-				   {format,internal},
-				   {file, File}]),
-    ?line [] = get_all_terms(a),
+    {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
+			     {format,internal},
+			     {file, File}]),
+    [] = get_all_terms(a),
     T1 = mk_bytes(10000), % file 2
     T2 = mk_bytes(5000),  % file 3
     T3 = mk_bytes(4000),  % file 4
     T4 = mk_bytes(2000),  % file 4
     T5 = mk_bytes(5000),  % file 1
     T6 = mk_bytes(5000),  % file 2
-    ?line ok = disk_log:log(a, T1),
-    ?line ok = disk_log:log(a, T2),
-    ?line ok = disk_log:log(a, T3),
-    ?line ok = disk_log:log_terms(a, [T4, T5, T6]),
-    ?line case get_all_terms(a) of
-	      [T2,T3,T4,T5,T6] ->
-		  ok;
-	      E1 ->
-		  test_server_fail({bad_terms, E1, [T2,T3,T4,T5,T6]})
-	  end,
-    ?line ok = disk_log:close(a),
+    ok = disk_log:log(a, T1),
+    ok = disk_log:log(a, T2),
+    ok = disk_log:log(a, T3),
+    ok = disk_log:log_terms(a, [T4, T5, T6]),
+    case get_all_terms(a) of
+	[T2,T3,T4,T5,T6] ->
+	    ok;
+	E1 ->
+	    test_server_fail({bad_terms, E1, [T2,T3,T4,T5,T6]})
+    end,
+    ok = disk_log:close(a),
     del(File, 4).
 
-wrap_int_2(suite) -> [];
-wrap_int_2(doc) -> ["Test wrap disk log, internal"];
+%% Test wrap disk log, internal.
 wrap_int_2(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File1 = filename:join(Dir, "a.LOG"),
     File2 = filename:join(Dir, "b.LOG"),
     File3 = filename:join(Dir, "c.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8191,3}},
-				   {format,internal},
-				   {file, File1}]),
-    ?line {ok, b} = disk_log:open([{name,b}, {type,wrap}, {size,{8192,3}},
-				   {format,internal},
-				   {file, File2}]),
-    ?line {ok, c} = disk_log:open([{name,c}, {type,wrap}, {size,{8193,3}},
-				   {format,internal},
-				   {file, File3}]),
+    {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8191,3}},
+			     {format,internal},
+			     {file, File1}]),
+    {ok, b} = disk_log:open([{name,b}, {type,wrap}, {size,{8192,3}},
+			     {format,internal},
+			     {file, File2}]),
+    {ok, c} = disk_log:open([{name,c}, {type,wrap}, {size,{8193,3}},
+			     {format,internal},
+			     {file, File3}]),
     T1 = mk_bytes(8191-16), % 16 is size of header + magics for 1 item
     T2 = mk_bytes(8192-16),
     T3 = mk_bytes(8193-16),
-    ?line ok = disk_log:log(a, T1),
-    ?line ok = disk_log:log(b, T2),
-    ?line ok = disk_log:log(c, T3),
-    ?line case get_all_terms(a) of
-	      [T1] ->
-		  ok;
-	      E1 ->
-		  test_server_fail({bad_terms, E1, [T1]})
-	  end,
-    ?line case get_all_terms(b) of
-	      [T2] ->
-		  ok;
-	      E2 ->
-		  test_server_fail({bad_terms, E2, [T2]})
-	  end,
-    ?line case get_all_terms(c) of
-	      [T3] ->
-		  ok;
-	      E3 ->
-		  test_server_fail({bad_terms, E3, [T3]})
-	  end,
-    ?line ok = disk_log:close(a),
-    ?line ok = disk_log:close(b),
-    ?line ok = disk_log:close(c),
+    ok = disk_log:log(a, T1),
+    ok = disk_log:log(b, T2),
+    ok = disk_log:log(c, T3),
+    case get_all_terms(a) of
+	[T1] ->
+	    ok;
+	E1 ->
+	    test_server_fail({bad_terms, E1, [T1]})
+    end,
+    case get_all_terms(b) of
+	[T2] ->
+	    ok;
+	E2 ->
+	    test_server_fail({bad_terms, E2, [T2]})
+    end,
+    case get_all_terms(c) of
+	[T3] ->
+	    ok;
+	E3 ->
+	    test_server_fail({bad_terms, E3, [T3]})
+    end,
+    ok = disk_log:close(a),
+    ok = disk_log:close(b),
+    ok = disk_log:close(c),
     del(File1, 3),
     del(File2, 3),
     del(File3, 3).
 
-inc_wrap_file(suite) -> [];
-inc_wrap_file(doc) -> ["Test disk log, force a change to next file"];
+%% Test disk log, force a change to next file.
 inc_wrap_file(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File1 = filename:join(Dir, "a.LOG"),
@@ -616,262 +581,257 @@ inc_wrap_file(Conf) when is_list(Conf) ->
     File3 = filename:join(Dir, "c.LOG"),
 
     %% Test that halt logs gets an error message
-    ?line {ok, a} = disk_log:open([{name, a}, {type, halt}, 
-				   {format, internal},
-				   {file, File1}]),
-    ?line ok = disk_log:log(a, "message one"),
-    ?line {error, {halt_log, a}} = disk_log:inc_wrap_file(a),
+    {ok, a} = disk_log:open([{name, a}, {type, halt},
+			     {format, internal},
+			     {file, File1}]),
+    ok = disk_log:log(a, "message one"),
+    {error, {halt_log, a}} = disk_log:inc_wrap_file(a),
 
     %% test an internally formatted wrap log file
-    ?line {ok, b} = disk_log:open([{name, b}, {type, wrap}, {size, {100,3}},
-				   {format, internal}, {head, 'thisisahead'},
-				   {file, File2}]),
-    ?line ok = disk_log:log(b, "message one"),
-    ?line ok = disk_log:inc_wrap_file(b),
-    ?line ok = disk_log:log(b, "message two"),
-    ?line ok = disk_log:inc_wrap_file(b),
-    ?line ok = disk_log:log(b, "message three"),
-    ?line ok = disk_log:inc_wrap_file(b),
-    ?line ok = disk_log:log(b, "message four"),
-    ?line T1 = get_all_terms(b),
-    ?line ['thisisahead', "message two", 
-	   'thisisahead', "message three", 
-	   'thisisahead', "message four"] = T1,
+    {ok, b} = disk_log:open([{name, b}, {type, wrap}, {size, {100,3}},
+			     {format, internal}, {head, 'thisisahead'},
+			     {file, File2}]),
+    ok = disk_log:log(b, "message one"),
+    ok = disk_log:inc_wrap_file(b),
+    ok = disk_log:log(b, "message two"),
+    ok = disk_log:inc_wrap_file(b),
+    ok = disk_log:log(b, "message three"),
+    ok = disk_log:inc_wrap_file(b),
+    ok = disk_log:log(b, "message four"),
+    T1 = get_all_terms(b),
+    ['thisisahead', "message two",
+     'thisisahead', "message three",
+     'thisisahead', "message four"] = T1,
 
     %% test an externally formatted wrap log file
-    ?line {ok, c} = disk_log:open([{name, c}, {type, wrap}, {size, {100,3}},
-				   {format,external}, {head,"this is a head "},
-				   {file, File3}]),
-    ?line ok = disk_log:blog(c, "message one"),
-    ?line ok = disk_log:inc_wrap_file(c),
-    ?line ok = disk_log:blog(c, "message two"),
-    ?line ok = disk_log:inc_wrap_file(c),
-    ?line ok = disk_log:blog(c, "message three"),
-    ?line ok = disk_log:inc_wrap_file(c),
-    ?line ok = disk_log:blog(c, "message four"),
-    ?line ok = disk_log:sync(c),
-    ?line {ok, Fd31} = file:open(File3 ++ ".1", [read]),
-    ?line {ok,"this is a head message four"} = file:read(Fd31, 200),
-    ?line {ok, Fd32} = file:open(File3 ++ ".2", [read]),
-    ?line {ok,"this is a head message two"} = file:read(Fd32, 200),
-    ?line {ok, Fd33} = file:open(File3 ++ ".3", [read]),
-    ?line {ok,"this is a head message three"} = file:read(Fd33, 200),
-    ?line ok = file:close(Fd31),
-    ?line ok = file:close(Fd32),
-    ?line ok = file:close(Fd33),
-
-    ?line ok = disk_log:close(a),
-    ?line ok = disk_log:close(b),
-    ?line ok = disk_log:close(c),
-    ?line ok = file:delete(File1),
+    {ok, c} = disk_log:open([{name, c}, {type, wrap}, {size, {100,3}},
+			     {format,external}, {head,"this is a head "},
+			     {file, File3}]),
+    ok = disk_log:blog(c, "message one"),
+    ok = disk_log:inc_wrap_file(c),
+    ok = disk_log:blog(c, "message two"),
+    ok = disk_log:inc_wrap_file(c),
+    ok = disk_log:blog(c, "message three"),
+    ok = disk_log:inc_wrap_file(c),
+    ok = disk_log:blog(c, "message four"),
+    ok = disk_log:sync(c),
+    {ok, Fd31} = file:open(File3 ++ ".1", [read]),
+    {ok,"this is a head message four"} = file:read(Fd31, 200),
+    {ok, Fd32} = file:open(File3 ++ ".2", [read]),
+    {ok,"this is a head message two"} = file:read(Fd32, 200),
+    {ok, Fd33} = file:open(File3 ++ ".3", [read]),
+    {ok,"this is a head message three"} = file:read(Fd33, 200),
+    ok = file:close(Fd31),
+    ok = file:close(Fd32),
+    ok = file:close(Fd33),
+
+    ok = disk_log:close(a),
+    ok = disk_log:close(b),
+    ok = disk_log:close(c),
+    ok = file:delete(File1),
     del(File2, 3),
     del(File3, 3).
 
 
 
 
-halt_ext_inf(suite) -> [];
-halt_ext_inf(doc) -> ["Test halt disk log, external, infinity"];
+%% Test halt disk log, external, infinity.
 halt_ext_inf(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
-				   {format,external},
-				   {file, File}]),
-    ?line xsimple_log(File, a),
-    ?line ok = disk_log:close(a),
-    ?line ok = file:delete(File).
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,infinity},
+			     {format,external},
+			     {file, File}]),
+    xsimple_log(File, a),
+    ok = disk_log:close(a),
+    ok = file:delete(File).
 
 
-halt_ext_sz_1(suite) -> [];
-halt_ext_sz_1(doc) -> ["Test halt disk log, external, size defined"];
+%% Test halt disk log, external, size defined.
 halt_ext_sz_1(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,18000},
-				   {format,external},
-				   {file, File}]),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,18000},
+			     {format,external},
+			     {file, File}]),
     xsimple_log(File, a),
-    ?line ok = disk_log:truncate(a),
-    ?line [] = get_list(File, a),
+    ok = disk_log:truncate(a),
+    [] = get_list(File, a),
     {B1, T1} = x_mk_bytes(10000),
     {B2, T2} = x_mk_bytes(5000),
     {B3, T3} = x_mk_bytes(1000),
-    ?line ok = disk_log:blog(a, B1),
-    ?line case get_list(File, a) of
-	      T1 ->
-		  ok;
-	      E1 ->
-		  test_server_fail({bad_terms, E1, T1})
-	  end,
-    ?line ok = disk_log:blog(a, B2),
-    ?line {error, {full, a}} = disk_log:blog_terms(a, [B3,B3,B1]),
-    ?line ok = disk_log:balog(a, B1),
-    ?line Tmp = T1 ++ T2 ++ T3 ++ T3,
-    ?line case get_list(File, a) of
-	      Tmp ->
-		  ok;
-	      E2 ->
-		  test_server_fail({bad_terms, E2, Tmp})
-	  end,
-    ?line ok = disk_log:close(a),
-    ?line ok = file:delete(File).
+    ok = disk_log:blog(a, B1),
+    case get_list(File, a) of
+	T1 ->
+	    ok;
+	E1 ->
+	    test_server_fail({bad_terms, E1, T1})
+    end,
+    ok = disk_log:blog(a, B2),
+    {error, {full, a}} = disk_log:blog_terms(a, [B3,B3,B1]),
+    ok = disk_log:balog(a, B1),
+    Tmp = T1 ++ T2 ++ T3 ++ T3,
+    case get_list(File, a) of
+	Tmp ->
+	    ok;
+	E2 ->
+	    test_server_fail({bad_terms, E2, Tmp})
+    end,
+    ok = disk_log:close(a),
+    ok = file:delete(File).
 
-halt_ext_sz_2(suite) -> [];
-halt_ext_sz_2(doc) -> ["Test halt disk log, external, size defined"];
+%% Test halt disk log, external, size defined.
 halt_ext_sz_2(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File1 = filename:join(Dir, "a.LOG"),
     File2 = filename:join(Dir, "b.LOG"),
     File3 = filename:join(Dir, "c.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,8191},
-				   {format,external},
-				   {file, File1}]),
-    ?line {ok, b} = disk_log:open([{name,b}, {type,halt}, {size,8192},
-				   {format,external},
-				   {file, File2}]),
-    ?line {ok, c} = disk_log:open([{name,c}, {type,halt}, {size,8193},
-				   {format,external},
-				   {file, File3}]),
+    {ok, a} = disk_log:open([{name,a}, {type,halt}, {size,8191},
+			     {format,external},
+			     {file, File1}]),
+    {ok, b} = disk_log:open([{name,b}, {type,halt}, {size,8192},
+			     {format,external},
+			     {file, File2}]),
+    {ok, c} = disk_log:open([{name,c}, {type,halt}, {size,8193},
+			     {format,external},
+			     {file, File3}]),
     {B1, T1} = x_mk_bytes(8191),
     {B2, T2} = x_mk_bytes(8192),
     {B3, T3} = x_mk_bytes(8193),
-    ?line ok = disk_log:blog(a, B1),
-    ?line ok = disk_log:blog(b, B2),
-    ?line ok = disk_log:blog(c, B3),
-    ?line case get_list(File1, a) of
-	      T1 ->
-		  ok;
-	      E1 ->
-		  test_server_fail({bad_terms, E1, T1})
-	  end,
-    ?line case get_list(File2, b) of
-	      T2 ->
-		  ok;
-	      E2 ->
-		  test_server_fail({bad_terms, E2, T2})
-	  end,
-    ?line case get_list(File3, c) of
-	      T3 ->
-		  ok;
-	      E3 ->
-		  test_server_fail({bad_terms, E3, T3})
-	  end,
-    ?line ok = disk_log:truncate(a),
-    ?line ok = disk_log:truncate(b),
-    ?line {error, {full, a}} = disk_log:blog(a, B2),
-    ?line Error1 = {error, {full, b}} = disk_log:blog(b, B3),
-    ?line "The halt log" ++ _ = format_error(Error1),
-    ?line true = info(b, full, false),
-    ?line [] = get_list(File1, a),
-    ?line [] = get_list(File2, b),
-    ?line ok = disk_log:close(a),
-    ?line ok = disk_log:close(b),
-    ?line ok = disk_log:close(c),
-    ?line ok = file:delete(File1),
-    ?line ok = file:delete(File2),
-    ?line ok = file:delete(File3),
+    ok = disk_log:blog(a, B1),
+    ok = disk_log:blog(b, B2),
+    ok = disk_log:blog(c, B3),
+    case get_list(File1, a) of
+	T1 ->
+	    ok;
+	E1 ->
+	    test_server_fail({bad_terms, E1, T1})
+    end,
+    case get_list(File2, b) of
+	T2 ->
+	    ok;
+	E2 ->
+	    test_server_fail({bad_terms, E2, T2})
+    end,
+    case get_list(File3, c) of
+	T3 ->
+	    ok;
+	E3 ->
+	    test_server_fail({bad_terms, E3, T3})
+    end,
+    ok = disk_log:truncate(a),
+    ok = disk_log:truncate(b),
+    {error, {full, a}} = disk_log:blog(a, B2),
+    Error1 = {error, {full, b}} = disk_log:blog(b, B3),
+    "The halt log" ++ _ = format_error(Error1),
+    true = info(b, full, false),
+    [] = get_list(File1, a),
+    [] = get_list(File2, b),
+    ok = disk_log:close(a),
+    ok = disk_log:close(b),
+    ok = disk_log:close(c),
+    ok = file:delete(File1),
+    ok = file:delete(File2),
+    ok = file:delete(File3),
     ok.
 
 
-wrap_ext_1(suite) -> [];
-wrap_ext_1(doc) -> ["Test wrap disk log, external, size defined"];
+%% Test wrap disk log, external, size defined.
 wrap_ext_1(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
-				   {format,external},
-				   {file, File}]),
+    {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
+			     {format,external},
+			     {file, File}]),
     x2simple_log(File ++ ".1", a),
-    ?line ok = disk_log:close(a),
-%    del(File, 4),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
-				   {format,external},
-				   {file, File}]),
+    ok = disk_log:close(a),
+    %%    del(File, 4),
+    {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8000, 4}},
+			     {format,external},
+			     {file, File}]),
     {B1, _T1} = x_mk_bytes(10000), % file 2
     {B2, T2} = x_mk_bytes(5000),  % file 3
     {B3, T3} = x_mk_bytes(4000),  % file 4
     {B4, T4} = x_mk_bytes(2000),  % file 4
     {B5, T5} = x_mk_bytes(5000),  % file 1
     {B6, T6} = x_mk_bytes(5000),  % file 2
-    ?line ok = disk_log:blog(a, B1),
-    ?line ok = disk_log:blog(a, B2),
-    ?line ok = disk_log:blog(a, B3),
-    ?line ok = disk_log:blog_terms(a, [B4, B5, B6]),
-    ?line case get_list(File ++ ".3", a) of
-	      T2 ->
-		  ok;
-	      E2 ->
-		  test_server_fail({bad_terms, E2, T2})
-	  end,
-    ?line T34 = T3 ++ T4,
-    ?line case get_list(File ++ ".4", a) of
-	      T34 ->
-		  ok;
-	      E34 ->
-		  test_server_fail({bad_terms, E34, T34})
-	  end,
-    ?line case get_list(File ++ ".1", a) of
-	      T5 ->
-		  ok;
-	      E5 ->
-		  test_server_fail({bad_terms, E5, T5})
-	  end,
-    ?line case get_list(File ++ ".2", a) of
-	      T6 ->
-		  ok;
-	      E6 ->
-		  test_server_fail({bad_terms, E6, T6})
-	  end,
-    ?line ok = disk_log:close(a),
+    ok = disk_log:blog(a, B1),
+    ok = disk_log:blog(a, B2),
+    ok = disk_log:blog(a, B3),
+    ok = disk_log:blog_terms(a, [B4, B5, B6]),
+    case get_list(File ++ ".3", a) of
+	T2 ->
+	    ok;
+	E2 ->
+	    test_server_fail({bad_terms, E2, T2})
+    end,
+    T34 = T3 ++ T4,
+    case get_list(File ++ ".4", a) of
+	T34 ->
+	    ok;
+	E34 ->
+	    test_server_fail({bad_terms, E34, T34})
+    end,
+    case get_list(File ++ ".1", a) of
+	T5 ->
+	    ok;
+	E5 ->
+	    test_server_fail({bad_terms, E5, T5})
+    end,
+    case get_list(File ++ ".2", a) of
+	T6 ->
+	    ok;
+	E6 ->
+	    test_server_fail({bad_terms, E6, T6})
+    end,
+    ok = disk_log:close(a),
     del(File, 4).
 
-wrap_ext_2(suite) -> [];
-wrap_ext_2(doc) -> ["Test wrap disk log, external, size defined"];
+%% Test wrap disk log, external, size defined.
 wrap_ext_2(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File1 = filename:join(Dir, "a.LOG"),
     File2 = filename:join(Dir, "b.LOG"),
     File3 = filename:join(Dir, "c.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8191,3}},
-				   {format,external},
-				   {file, File1}]),
-    ?line {ok, b} = disk_log:open([{name,b}, {type,wrap}, {size,{8192,3}},
-				   {format,external},
-				   {file, File2}]),
-    ?line {ok, c} = disk_log:open([{name,c}, {type,wrap}, {size,{8193,3}},
-				   {format,external},
-				   {file, File3}]),
+    {ok, a} = disk_log:open([{name,a}, {type,wrap}, {size,{8191,3}},
+			     {format,external},
+			     {file, File1}]),
+    {ok, b} = disk_log:open([{name,b}, {type,wrap}, {size,{8192,3}},
+			     {format,external},
+			     {file, File2}]),
+    {ok, c} = disk_log:open([{name,c}, {type,wrap}, {size,{8193,3}},
+			     {format,external},
+			     {file, File3}]),
     {B1, T1} = x_mk_bytes(8191),
     {B2, T2} = x_mk_bytes(8192),
     {B3, T3} = x_mk_bytes(8193),
-    ?line ok = disk_log:blog(a, B1),
-    ?line ok = disk_log:blog(b, B2),
-    ?line ok = disk_log:blog(c, B3),
-    ?line case get_list(File1 ++ ".1", a) of
-	      T1 ->
-		  ok;
-	      E1 ->
-		  test_server_fail({bad_terms, E1, T1})
-	  end,
-    ?line case get_list(File2 ++ ".1", b) of
-	      T2 ->
-		  ok;
-	      E2 ->
-		  test_server_fail({bad_terms, E2, T2})
-	  end,
-    ?line case get_list(File3 ++ ".1", c) of
-	      T3 ->
-		  ok;
-	      E3 ->
-		  test_server_fail({bad_terms, E3, T3})
-	  end,
-    ?line ok = disk_log:close(a),
-    ?line ok = disk_log:close(b),
-    ?line ok = disk_log:close(c),
-    ?line del(File1, 3),
-    ?line del(File2, 3),
-    ?line del(File3, 3),
+    ok = disk_log:blog(a, B1),
+    ok = disk_log:blog(b, B2),
+    ok = disk_log:blog(c, B3),
+    case get_list(File1 ++ ".1", a) of
+	T1 ->
+	    ok;
+	E1 ->
+	    test_server_fail({bad_terms, E1, T1})
+    end,
+    case get_list(File2 ++ ".1", b) of
+	T2 ->
+	    ok;
+	E2 ->
+	    test_server_fail({bad_terms, E2, T2})
+    end,
+    case get_list(File3 ++ ".1", c) of
+	T3 ->
+	    ok;
+	E3 ->
+	    test_server_fail({bad_terms, E3, T3})
+    end,
+    ok = disk_log:close(a),
+    ok = disk_log:close(b),
+    ok = disk_log:close(c),
+    del(File1, 3),
+    del(File2, 3),
+    del(File3, 3),
     ok.
 
 simple_log(Log) ->
@@ -879,61 +839,61 @@ simple_log(Log) ->
     T2 = hopp,
     T3 = {tjena, 12},
     T4 = mk_bytes(10000),
-    ?line ok = disk_log:log(Log, T1),
-    ?line ok = disk_log:log_terms(Log, [T2, T3]),
-    ?line case get_all_terms(Log) of
-	      [T1, T2, T3] ->
-		  ok;
-	      E1 ->
-		  test_server_fail({bad_terms, E1, [T1, T2, T3]})
-	  end,
-    ?line ok = disk_log:log(a, T4),
-    ?line case get_all_terms(Log) of
-	      [T1, T2, T3, T4] ->
-		  ok;
-	      E2 ->
-		  test_server_fail({bad_terms, E2, [T1, T2, T3, T4]})
-	  end.
+    ok = disk_log:log(Log, T1),
+    ok = disk_log:log_terms(Log, [T2, T3]),
+    case get_all_terms(Log) of
+	[T1, T2, T3] ->
+	    ok;
+	E1 ->
+	    test_server_fail({bad_terms, E1, [T1, T2, T3]})
+    end,
+    ok = disk_log:log(a, T4),
+    case get_all_terms(Log) of
+	[T1, T2, T3, T4] ->
+	    ok;
+	E2 ->
+	    test_server_fail({bad_terms, E2, [T1, T2, T3, T4]})
+    end.
 
 xsimple_log(File, Log) ->
     T1 = "hej",
     T2 = list_to_binary("hopp"),
     T3 = list_to_binary(["sena", list_to_binary("sejer")]),
     T4 = list_to_binary(By = mk_bytes(10000)),
-    ?line ok = disk_log:blog(Log, T1),
-    ?line ok = disk_log:blog_terms(Log, [T2, T3]),
-    ?line X = "hejhoppsenasejer",
-    ?line X2 = get_list(File, Log),
-    ?line case X2 of
-	      X -> ok;
-	      Z1 -> test_server_fail({bad_terms, Z1, X2})
-	  end,
-    ?line ok = disk_log:blog(Log, T4),
-    ?line Tmp = get_list(File, Log),
-    ?line case X ++ By of
-	      Tmp -> ok;
-	      Z2 -> test_server_fail({bad_terms, Z2, X ++ By})
-	  end.
+    ok = disk_log:blog(Log, T1),
+    ok = disk_log:blog_terms(Log, [T2, T3]),
+    X = "hejhoppsenasejer",
+    X2 = get_list(File, Log),
+    case X2 of
+	X -> ok;
+	Z1 -> test_server_fail({bad_terms, Z1, X2})
+    end,
+    ok = disk_log:blog(Log, T4),
+    Tmp = get_list(File, Log),
+    case X ++ By of
+	Tmp -> ok;
+	Z2 -> test_server_fail({bad_terms, Z2, X ++ By})
+    end.
 
 x2simple_log(File, Log) ->
     T1 = "hej",
     T2 = list_to_binary("hopp"),
     T3 = list_to_binary(["sena", list_to_binary("sejer")]),
     T4 = list_to_binary(By = mk_bytes(1000)),
-    ?line ok = disk_log:blog(Log, T1),
-    ?line ok = disk_log:blog_terms(Log, [T2, T3]),
-    ?line X = "hejhoppsenasejer",
-    ?line X2 = get_list(File, Log),
-    ?line case X2 of
-	      X -> ok;
-	      Z1 -> test_server_fail({bad_terms, Z1, X2})
-	  end,
-    ?line ok = disk_log:blog(Log, T4),
-    ?line Tmp = get_list(File, Log),
-    ?line case X ++ By of
-	      Tmp -> ok;
-	      Z2 -> test_server_fail({bad_terms, Z2, X ++ By})
-	  end.
+    ok = disk_log:blog(Log, T1),
+    ok = disk_log:blog_terms(Log, [T2, T3]),
+    X = "hejhoppsenasejer",
+    X2 = get_list(File, Log),
+    case X2 of
+	X -> ok;
+	Z1 -> test_server_fail({bad_terms, Z1, X2})
+    end,
+    ok = disk_log:blog(Log, T4),
+    Tmp = get_list(File, Log),
+    case X ++ By of
+	Tmp -> ok;
+	Z2 -> test_server_fail({bad_terms, Z2, X ++ By})
+    end.
 
 x_mk_bytes(N) ->
     X = lists:duplicate(N, $a),
@@ -947,7 +907,7 @@ mk_bytes(N) when N > 4 ->
     end.
 
 get_list(File, Log) ->
-    ?t:format(0, "File ~p~n",[File]),
+    ct:pal(?HI_VERBOSITY, "File ~p~n", [File]),
     ok = disk_log:sync(Log),
     {ok, B} = file:read_file(File),
     binary_to_list(B).
@@ -955,7 +915,7 @@ get_list(File, Log) ->
 
 get_all_terms(Log, File, Type) ->
     {ok, _Log} = disk_log:open([{name,Log}, {type,Type}, {size,infinity},
-			       {format,internal}, {file, File}, 
+				{format,internal}, {file, File},
 				{mode, read_only}]),
     Ts = get_all_terms(Log),
     ok = disk_log:close(Log),
@@ -976,14 +936,14 @@ get_all_terms1(Log, Cont, Res) ->
 
 get_all_terms_and_bad(Log, File, Type) ->
     {ok, _Log} = disk_log:open([{name,Log}, {type,Type}, {size,infinity},
-			       {format,internal}, {file, File}, 
+				{format,internal}, {file, File},
 				{mode, read_only}]),
     Ts = get_all_terms_and_bad(Log),
     ok = disk_log:close(Log),
     Ts.
 
 get_all_terms_and_bad(Log) ->
-    ?line read_only = info(Log, mode, foo),
+    read_only = info(Log, mode, foo),
     get_all_terms_and_bad1(Log, start, [], 0).
 
 %% 
@@ -999,7 +959,7 @@ get_all_terms_and_bad1(Log, Cont, Res, Bad0) ->
 
 get_all_binary_terms_and_bad(Log, File, Type) ->
     {ok, _Log} = disk_log:open([{name,Log}, {type,Type}, {size,infinity},
-			       {format,internal}, {file, File}, 
+				{format,internal}, {file, File},
 				{mode, read_only}]),
     Ts = get_all_binary_terms_and_bad(Log),
     ok = disk_log:close(Log),
@@ -1037,7 +997,7 @@ xx() ->
 			     {format,internal}, {file, File}]),
     W = xwr(a, 400),
     disk_log:close(a),
-%    file:delete(File),
+    %%    file:delete(File),
     W.
 
 %% old: 6150
@@ -1186,73 +1146,72 @@ end_times({T1,W1}) ->
     {T2-T1, W2-W1}.
 
 
-head_func(suite) -> [];
-head_func(doc) -> ["Test head parameter"];
+%% Test head parameter.
 head_func(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
     ets:new(xxx, [named_table, set, public]),
     ets:insert(xxx, {wrapc, 0}),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
-				   {size, {100,4}},
-				   {head_func, {?MODULE, hf, []}}]),
-    ?line B = mk_bytes(60),
-    ?line disk_log:log(a, B),
-    ?line disk_log:alog(a, B),
-    ?line disk_log:alog(a, B),
-    ?line disk_log:log(a, B),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
+			     {size, {100,4}},
+			     {head_func, {?MODULE, hf, []}}]),
+    B = mk_bytes(60),
+    disk_log:log(a, B),
+    disk_log:alog(a, B),
+    disk_log:alog(a, B),
+    disk_log:log(a, B),
     H = [1,2,3],
-    ?line [{wrapc, 4}] = ets:lookup(xxx, wrapc),
+    [{wrapc, 4}] = ets:lookup(xxx, wrapc),
     ets:delete(xxx),
-    ?line case get_all_terms(a) of
-	      [H,B,H,B,H,B,H,B] ->
-		  ok;
-	      E1 ->
-		  test_server_fail({bad_terms, E1, 
-				    [H,B,H,B,H,B,H,B]})
-	  end,
-    ?line 8  = no_written_items(a),
+    case get_all_terms(a) of
+	[H,B,H,B,H,B,H,B] ->
+	    ok;
+	E1 ->
+	    test_server_fail({bad_terms, E1,
+			      [H,B,H,B,H,B,H,B]})
+    end,
+    8  = no_written_items(a),
     disk_log:close(a),
     del(File, 4),
 
-    % invalid header function
-    ?line {error, {invalid_header, {_, {term}}}} = 
+    %% invalid header function
+    {error, {invalid_header, {_, {term}}}} =
 	disk_log:open([{name, n}, {file, File}, {type, halt},
 		       {format, external},
 		       {head_func, {?MODULE, head_fun, [{term}]}}]),
     file:delete(File),
 
-    ?line {error, {invalid_header, _}} = 
+    {error, {invalid_header, _}} =
 	disk_log:open([{name, n}, {file, File}, {type, halt},
 		       {format, external},
 		       {head_func, {?MODULE, head_fun, [{ok,{term}}]}}]),
     file:delete(File),
 
-    ?line {ok,n} =
+    {ok,n} =
 	disk_log:open([{name, n}, {file, File}, {type, halt},
 		       {format, external},
 		       {head_func, {?MODULE, head_fun, [{ok,<<"head">>}]}}]),
-    ?line ok = disk_log:close(n),
-    ?line {ok,<<"head">>} = file:read_file(File),
+    ok = disk_log:close(n),
+    {ok,<<"head">>} = file:read_file(File),
     file:delete(File),
 
-    ?line {ok,n} =
+    {ok,n} =
 	disk_log:open([{name, n}, {file, File}, {type, halt},
 		       {format, external},
 		       {head_func, {?MODULE, head_fun, [{ok,"head"}]}}]),
-    ?line ok = disk_log:close(n),
-    ?line {ok,<<"head">>} = file:read_file(File),
+    ok = disk_log:close(n),
+    {ok,<<"head">>} = file:read_file(File),
     file:delete(File),
 
-    ?line Error1 = {error, {badarg, _}} = 
+    Error1 = {error, {badarg, _}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {head_func, {tjo,hej,san}},{size, {100, 4}}]),
-    ?line "The argument " ++ _ = format_error(Error1),
-    
-    ?line Error2 = {error, {invalid_header, _}} = 
+    "The argument " ++ _ = format_error(Error1),
+
+    Error2 = {error, {invalid_header, _}} =
 	disk_log:open([{name, n}, {file, File}, {type, halt},
 		       {head_func, {tjo,hej,[san]}}]),
-    ?line "The disk log header" ++ _ = format_error(Error2),
+    "The disk log header" ++ _ = format_error(Error2),
     file:delete(File).
 
 
@@ -1263,194 +1222,186 @@ hf() ->
     ets:update_counter(xxx, wrapc, 1),
     {ok, [1,2,3]}.
 
-plain_head(suite) -> [];
-plain_head(doc) -> ["Test head parameter"];
+%% Test head parameter.
 plain_head(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
     H = [1,2,3],
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
-				   {size, {100,4}}, {head, H}]),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
+			     {size, {100,4}}, {head, H}]),
     %% This one is not "counted".
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
-				   {size, {100,4}}, {head, H}]),
-    ?line B = mk_bytes(60),
-    ?line disk_log:log(a, B),
-    ?line disk_log:alog(a, B),
-    ?line disk_log:alog(a, B),
-    ?line disk_log:log(a, B),
-    ?line case get_all_terms(a) of
-	      [H,B,H,B,H,B,H,B] ->
-		  ok;
-	      E1 ->
-		  test_server_fail({bad_terms, E1, 
-				    [H,B,H,B,H,B,H,B]})
-	  end,
-    ?line 8 = no_written_items(a),
-    ?line ok = disk_log:close(a),
-    ?line {error, no_such_log} = disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
+			     {size, {100,4}}, {head, H}]),
+    B = mk_bytes(60),
+    disk_log:log(a, B),
+    disk_log:alog(a, B),
+    disk_log:alog(a, B),
+    disk_log:log(a, B),
+    case get_all_terms(a) of
+	[H,B,H,B,H,B,H,B] ->
+	    ok;
+	E1 ->
+	    test_server_fail({bad_terms, E1,
+			      [H,B,H,B,H,B,H,B]})
+    end,
+    8 = no_written_items(a),
+    ok = disk_log:close(a),
+    {error, no_such_log} = disk_log:close(a),
     del(File, 4).
 
 
 
-one_header(suite) -> [];
-one_header(doc) -> ["Test that a header is just printed once in a log file"];
+%% Test that a header is just printed once in a log file.
 one_header(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
     H = [1,2,3],
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
-				   {size, {100,4}}, {head, H}]),
-    ?line B = mk_bytes(60),
-    ?line ok = disk_log:log(a, B),
-    ?line ok = disk_log:alog(a, B),
-    ?line ok = disk_log:alog(a, B),
-    ?line ok = disk_log:log(a, B),
-    ?line case get_all_terms(a) of
-	      [H,B,H,B,H,B,H,B] ->
-		  ok;
-	      E1 ->
-		  test_server_fail({bad_terms, E1, 
-				    [H,B,H,B,H,B,H,B]})
-	  end,
-    ?line 8  = no_written_items(a),
-    ?line ok = disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
+			     {size, {100,4}}, {head, H}]),
+    B = mk_bytes(60),
+    ok = disk_log:log(a, B),
+    ok = disk_log:alog(a, B),
+    ok = disk_log:alog(a, B),
+    ok = disk_log:log(a, B),
+    case get_all_terms(a) of
+	[H,B,H,B,H,B,H,B] ->
+	    ok;
+	E1 ->
+	    test_server_fail({bad_terms, E1,
+			      [H,B,H,B,H,B,H,B]})
+    end,
+    8  = no_written_items(a),
+    ok = disk_log:close(a),
     del(File, 4),
 
     Fileb = filename:join(Dir, "b.LOG"),
-    ?line {ok, b} = disk_log:open([{name,b}, {file, Fileb}, {head, H}]),
-    ?line ok = disk_log:close(b),
-    ?line {ok, b} = disk_log:open([{name,b}, {file, Fileb}, {head, H}]),
-    ?line ok = disk_log:log(b, "first log"),
-    ?line ok = disk_log:alog(b, "second log"),
-    ?line ok = disk_log:close(b),
-    ?line {ok, b} = disk_log:open([{name,b}, {file, Fileb}, {head, H}]),
-    ?line ok = disk_log:alog(b, "3rd log"),
-    ?line ok = disk_log:log(b, "4th log"),
-    ?line case get_all_terms(b) of
-	      [H, "first log", "second log", "3rd log", "4th log"] ->
-		  ok;
-	      E2 ->
-		  test_server_fail({bad_terms, E2, 
-				    [H, "first log", "second log", 
-				     "3rd log", "4th log"]})
-	  end,
-    ?line 2  = no_written_items(b),
-    ?line ok = disk_log:close(b),
-    ?line ok = file:delete(Fileb),
+    {ok, b} = disk_log:open([{name,b}, {file, Fileb}, {head, H}]),
+    ok = disk_log:close(b),
+    {ok, b} = disk_log:open([{name,b}, {file, Fileb}, {head, H}]),
+    ok = disk_log:log(b, "first log"),
+    ok = disk_log:alog(b, "second log"),
+    ok = disk_log:close(b),
+    {ok, b} = disk_log:open([{name,b}, {file, Fileb}, {head, H}]),
+    ok = disk_log:alog(b, "3rd log"),
+    ok = disk_log:log(b, "4th log"),
+    case get_all_terms(b) of
+	[H, "first log", "second log", "3rd log", "4th log"] ->
+	    ok;
+	E2 ->
+	    test_server_fail({bad_terms, E2,
+			      [H, "first log", "second log",
+			       "3rd log", "4th log"]})
+    end,
+    2  = no_written_items(b),
+    ok = disk_log:close(b),
+    ok = file:delete(Fileb),
 
     Filec = filename:join(Dir, "c.LOG"),
     H2 = "this is a header ",
-    ?line {ok, c} = disk_log:open([{name,c}, {format, external}, 
-				   {file, Filec}, {head, H2}]),
-    ?line ok = disk_log:close(c),
-    ?line {ok, c} = disk_log:open([{name,c}, {format, external}, 
-				   {file, Filec}, {head, H2}]),
-    ?line ok = disk_log:blog(c, "first log"),
-    ?line ok = disk_log:balog(c, "second log"),
-    ?line ok = disk_log:close(c),
-    ?line {ok, c} = disk_log:open([{name,c}, {format, external}, 
-				   {file, Filec}, {head, H2}]),
-    ?line ok = disk_log:balog(c, "3rd log"),
-    ?line ok = disk_log:blog(c, "4th log"),
-    ?line ok = disk_log:sync(c),
-    ?line {ok, Fdc} = file:open(Filec, [read]),
-    ?line {ok,"this is a header first logsecond log3rd log4th log"} = 
+    {ok, c} = disk_log:open([{name,c}, {format, external},
+			     {file, Filec}, {head, H2}]),
+    ok = disk_log:close(c),
+    {ok, c} = disk_log:open([{name,c}, {format, external},
+			     {file, Filec}, {head, H2}]),
+    ok = disk_log:blog(c, "first log"),
+    ok = disk_log:balog(c, "second log"),
+    ok = disk_log:close(c),
+    {ok, c} = disk_log:open([{name,c}, {format, external},
+			     {file, Filec}, {head, H2}]),
+    ok = disk_log:balog(c, "3rd log"),
+    ok = disk_log:blog(c, "4th log"),
+    ok = disk_log:sync(c),
+    {ok, Fdc} = file:open(Filec, [read]),
+    {ok,"this is a header first logsecond log3rd log4th log"} =
 	file:read(Fdc, 200),
-    ?line ok = file:close(Fdc),
-    ?line 2  = no_written_items(c),
-    ?line disk_log:close(c),
-    ?line ok = file:delete(Filec),
+    ok = file:close(Fdc),
+    2  = no_written_items(c),
+    disk_log:close(c),
+    ok = file:delete(Filec),
     ok.
 
 
 
-wrap_notif(suite) -> [];
-wrap_notif(doc) -> ["Test notify parameter, wrap"];
+%% Test notify parameter, wrap.
 wrap_notif(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
-				   {size, {100,4}}, {notify, true}]),
-    ?line B = mk_bytes(60),
-    ?line disk_log:log(a, B),
-    ?line disk_log:alog(a, B),
-    ?line disk_log:alog(a, B),
-    ?line disk_log:log(a, B),
-    ?line disk_log:log(a, B),
-    ?line rec(3, {disk_log, node(), a, {wrap, 0}}),
-    ?line rec(1, {disk_log, node(), a, {wrap, 1}}),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
+			     {size, {100,4}}, {notify, true}]),
+    B = mk_bytes(60),
+    disk_log:log(a, B),
+    disk_log:alog(a, B),
+    disk_log:alog(a, B),
+    disk_log:log(a, B),
+    disk_log:log(a, B),
+    rec(3, {disk_log, node(), a, {wrap, 0}}),
+    rec(1, {disk_log, node(), a, {wrap, 1}}),
     disk_log:close(a),
     del(File, 4).
 
-full_notif(suite) -> [];
-full_notif(doc) -> ["Test notify parameter, wrap, filled file"];
+%% Test notify parameter, wrap, filled file.
 full_notif(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
     file:delete(File),
 
-    ?line {ok, a} = disk_log:open([{name, a}, {file, File}, {type, halt},
-				   {size, 100}, {notify, true}]),
-    ?line B = mk_bytes(60),
-    ?line disk_log:log(a, B),
-    ?line disk_log:alog(a, B),
-    ?line rec(1, {disk_log, node(), a, full}),
+    {ok, a} = disk_log:open([{name, a}, {file, File}, {type, halt},
+			     {size, 100}, {notify, true}]),
+    B = mk_bytes(60),
+    disk_log:log(a, B),
+    disk_log:alog(a, B),
+    rec(1, {disk_log, node(), a, full}),
     disk_log:close(a),
     file:delete(File).
 
-trunc_notif(suite) -> [];
-trunc_notif(doc) -> ["Test notify parameter, wrap, truncated file"];
+%% Test notify parameter, wrap, truncated file.
 trunc_notif(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
     File2 = filename:join(Dir, "a.DUMP"),
-    ?line {ok, a} = disk_log:open([{name, a}, {file, File}, {type, halt},
-				   {size, 100}, {notify, true}]),
-    ?line B = mk_bytes(60),
-    ?line disk_log:log(a, B),
-    ?line disk_log:truncate(a),
-    ?line rec(1, {disk_log, node(), a, {truncated, 1}}),
-    ?line disk_log:log(a, B),
-    ?line ok = disk_log:reopen(a, File2),
-    ?line rec(1, {disk_log, node(), a, {truncated, 1}}),
+    {ok, a} = disk_log:open([{name, a}, {file, File}, {type, halt},
+			     {size, 100}, {notify, true}]),
+    B = mk_bytes(60),
+    disk_log:log(a, B),
+    disk_log:truncate(a),
+    rec(1, {disk_log, node(), a, {truncated, 1}}),
+    disk_log:log(a, B),
+    ok = disk_log:reopen(a, File2),
+    rec(1, {disk_log, node(), a, {truncated, 1}}),
     disk_log:close(a),
     file:delete(File),
     file:delete(File2).
 
-blocked_notif(suite) -> [];
-blocked_notif(doc) -> 
-    ["Test notify parameters 'format_external' and 'blocked_log"];
+%% Test notify parameters 'format_external' and 'blocked_log.
 blocked_notif(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "n.LOG"),
     No = 4,
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {size, {100,No}}, {notify, true}, 
-				   {format, external}]),
-    ?line B = mk_bytes(60),
-    ?line Error1 = {error,{format_external,n}} = disk_log:log(n, B),
-    ?line "The requested operation" ++ _ = format_error(Error1),
-    ?line ok = disk_log:blog(n, B),
-    ?line ok = disk_log:alog(n, B),
-    ?line rec(1, {disk_log, node(), n, {format_external, term_to_binary(B)}}),
-    ?line ok = disk_log:alog_terms(n, [B,B,B,B]),
-    ?line rec(1, {disk_log, node(), n, {format_external, 
-				 lists:map(fun term_to_binary/1, [B,B,B,B])}}),
-    ?line ok = disk_log:block(n, false),
-    ?line ok = disk_log:alog(n, B),
-    ?line rec(1, {disk_log, node(), n, {blocked_log, term_to_binary(B)}}),
-    ?line ok = disk_log:balog(n, B),
-    ?line rec(1, {disk_log, node(), n, {blocked_log, list_to_binary(B)}}),
-    ?line ok = disk_log:balog_terms(n, [B,B,B,B]),
-    ?line disk_log:close(n),
-    ?line rec(1, {disk_log, node(), n, {blocked_log, 
-				 lists:map(fun list_to_binary/1, [B,B,B,B])}}),
-    ?line del(File, No).
-
-
-new_idx_vsn(suite) -> [];
-new_idx_vsn(doc) -> ["Test the new version of the .idx file"];
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {size, {100,No}}, {notify, true},
+			     {format, external}]),
+    B = mk_bytes(60),
+    Error1 = {error,{format_external,n}} = disk_log:log(n, B),
+    "The requested operation" ++ _ = format_error(Error1),
+    ok = disk_log:blog(n, B),
+    ok = disk_log:alog(n, B),
+    rec(1, {disk_log, node(), n, {format_external, term_to_binary(B)}}),
+    ok = disk_log:alog_terms(n, [B,B,B,B]),
+    rec(1, {disk_log, node(), n, {format_external,
+				  lists:map(fun term_to_binary/1, [B,B,B,B])}}),
+    ok = disk_log:block(n, false),
+    ok = disk_log:alog(n, B),
+    rec(1, {disk_log, node(), n, {blocked_log, term_to_binary(B)}}),
+    ok = disk_log:balog(n, B),
+    rec(1, {disk_log, node(), n, {blocked_log, list_to_binary(B)}}),
+    ok = disk_log:balog_terms(n, [B,B,B,B]),
+    disk_log:close(n),
+    rec(1, {disk_log, node(), n, {blocked_log,
+				  lists:map(fun list_to_binary/1, [B,B,B,B])}}),
+    del(File, No).
+
+
+%% Test the new version of the .idx file.
 new_idx_vsn(Conf) when is_list(Conf) ->
     DataDir = ?datadir(Conf),
     PrivDir = ?privdir(Conf),
@@ -1459,201 +1410,197 @@ new_idx_vsn(Conf) when is_list(Conf) ->
     Kurt2 = filename:join(PrivDir, "kurt2.LOG"),
 
     %% Test that a wrap log file can have more than 255 files
-    ?line {ok, new_vsn} = disk_log:open([{file, File}, {name, new_vsn}, 
-					 {type, wrap}, {size, {40, 270}}]),
-    ?line ok = log(new_vsn, 280),
-    ?line {ok, Bin} = file:read_file(add_ext(File, "idx")),
-    ?line <<0,0:32,2,10:32,1:64,1:64,_/binary>> = Bin,
-    ?line disk_log:close(new_vsn),
-    ?line del(File, 270),
+    {ok, new_vsn} = disk_log:open([{file, File}, {name, new_vsn},
+				   {type, wrap}, {size, {40, 270}}]),
+    ok = log(new_vsn, 280),
+    {ok, Bin} = file:read_file(add_ext(File, "idx")),
+    <<0,0:32,2,10:32,1:64,1:64,_/binary>> = Bin,
+    disk_log:close(new_vsn),
+    del(File, 270),
 
     %% convert a very old version (0) of wrap log file to the new format (2)
     copy_wrap_log("kurt.LOG", 4, DataDir, PrivDir),
 
-    ?line {repaired, kurt, {recovered, 1}, {badbytes, 0}} =
+    {repaired, kurt, {recovered, 1}, {badbytes, 0}} =
 	disk_log:open([{file, Kurt}, {name, kurt}, 
 		       {type, wrap}, {size, {40, 4}}]),
-    ?line ok = disk_log:log(kurt, "this is a logged message number X"),
-    ?line ok = disk_log:log(kurt, "this is a logged message number Y"),
-    ?line {ok, BinK} = file:read_file(add_ext(Kurt, "idx")),
-    ?line <<0,0:32,2,2:32,1:64,1:64,1:64,1:64>> = BinK,
-    ?line {{40,4}, 2} = disk_log_1:read_size_file_version(Kurt),
+    ok = disk_log:log(kurt, "this is a logged message number X"),
+    ok = disk_log:log(kurt, "this is a logged message number Y"),
+    {ok, BinK} = file:read_file(add_ext(Kurt, "idx")),
+    <<0,0:32,2,2:32,1:64,1:64,1:64,1:64>> = BinK,
+    {{40,4}, 2} = disk_log_1:read_size_file_version(Kurt),
     disk_log:close(kurt),
-    ?line del(Kurt, 4),
+    del(Kurt, 4),
 
     %% keep the old format (1)
     copy_wrap_log("kurt2.LOG", 4, DataDir, PrivDir),
 
-    ?line {repaired, kurt2, {recovered, 1}, {badbytes, 0}} =
+    {repaired, kurt2, {recovered, 1}, {badbytes, 0}} =
 	disk_log:open([{file, Kurt2}, {name, kurt2}, 
 		       {type, wrap}, {size, {40, 4}}]),
-    ?line ok = disk_log:log(kurt2, "this is a logged message number X"),
-    ?line ok = disk_log:log(kurt2, "this is a logged message number Y"),
-    ?line {ok, BinK2} = file:read_file(add_ext(Kurt2, "idx")),
-    ?line <<0,2:32,1:32,1:32,1:32,1:32>> = BinK2,
-    ?line {{40,4}, 1} = disk_log_1:read_size_file_version(Kurt2),
+    ok = disk_log:log(kurt2, "this is a logged message number X"),
+    ok = disk_log:log(kurt2, "this is a logged message number Y"),
+    {ok, BinK2} = file:read_file(add_ext(Kurt2, "idx")),
+    <<0,2:32,1:32,1:32,1:32,1:32>> = BinK2,
+    {{40,4}, 1} = disk_log_1:read_size_file_version(Kurt2),
     disk_log:close(kurt2),
-    ?line del(Kurt2, 4),
+    del(Kurt2, 4),
 
     ok.
 
-reopen(suite) -> [];
-reopen(doc) -> 
-    ["Test reopen/1 on halt and wrap logs."];
+%% Test reopen/1 on halt and wrap logs.
 reopen(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line NewFile = filename:join(Dir, "nn.LOG"),
-    ?line B = mk_bytes(60),
-    
-    ?line file:delete(File),    % cleanup
-    ?line file:delete(NewFile), % cleanup
-    ?line Q = qlen(),
+    File = filename:join(Dir, "n.LOG"),
+    NewFile = filename:join(Dir, "nn.LOG"),
+    B = mk_bytes(60),
+
+    file:delete(File),    % cleanup
+    file:delete(NewFile), % cleanup
+    Q = qlen(),
 
     %% External halt log.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {notify, true}, {head, "header"}, 
-				   {size, infinity},{format, external}]),
-    ?line ok = disk_log:blog(n, B),
-    ?line ok = disk_log:breopen(n, NewFile, "head"),
-    ?line rec(1, {disk_log, node(), n, {truncated, 2}}),
-    ?line ok = disk_log:blog(n, B),
-    ?line ok = disk_log:blog(n, B),
-    ?line ok = disk_log:breopen(n, NewFile, "head"),
-    ?line rec(1, {disk_log, node(), n, {truncated, 3}}),
-    ?line ok = disk_log:close(n),
-    ?line {ok,BinaryFile} = file:read_file(File),
-    ?line "head" = binary_to_list(BinaryFile),
-    ?line file:delete(File),
-    ?line file:delete(NewFile),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {notify, true}, {head, "header"},
+			     {size, infinity},{format, external}]),
+    ok = disk_log:blog(n, B),
+    ok = disk_log:breopen(n, NewFile, "head"),
+    rec(1, {disk_log, node(), n, {truncated, 2}}),
+    ok = disk_log:blog(n, B),
+    ok = disk_log:blog(n, B),
+    ok = disk_log:breopen(n, NewFile, "head"),
+    rec(1, {disk_log, node(), n, {truncated, 3}}),
+    ok = disk_log:close(n),
+    {ok,BinaryFile} = file:read_file(File),
+    "head" = binary_to_list(BinaryFile),
+    file:delete(File),
+    file:delete(NewFile),
 
     %% Internal halt log.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {notify, true}, {head, header}, 
-				   {size, infinity}]),
-    ?line ok = disk_log:log(n, B),
-    ?line Error1 = {error, {same_file_name, n}} = disk_log:reopen(n, File),
-    ?line "Current and new" ++ _ = format_error(Error1),
-    ?line ok = disk_log:reopen(n, NewFile),
-    ?line rec(1, {disk_log, node(), n, {truncated, 2}}),
-    ?line ok = disk_log:log(n, B),
-    ?line ok = disk_log:log(n, B),
-    ?line ok = disk_log:reopen(n, NewFile),
-    ?line rec(1, {disk_log, node(), n, {truncated, 3}}),
-    ?line ok = disk_log:close(n),
-    ?line [header, _B, _B] = get_all_terms(nn, NewFile, halt),
-    ?line file:delete(File),
-    ?line file:delete(NewFile),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {notify, true}, {head, header},
+			     {size, infinity}]),
+    ok = disk_log:log(n, B),
+    Error1 = {error, {same_file_name, n}} = disk_log:reopen(n, File),
+    "Current and new" ++ _ = format_error(Error1),
+    ok = disk_log:reopen(n, NewFile),
+    rec(1, {disk_log, node(), n, {truncated, 2}}),
+    ok = disk_log:log(n, B),
+    ok = disk_log:log(n, B),
+    ok = disk_log:reopen(n, NewFile),
+    rec(1, {disk_log, node(), n, {truncated, 3}}),
+    ok = disk_log:close(n),
+    [header, _B, _B] = get_all_terms(nn, NewFile, halt),
+    file:delete(File),
+    file:delete(NewFile),
 
     %% Internal wrap log.
-    ?line No = 4,
-    ?line del(File, No),	% cleanup
-    ?line del(NewFile, No),	% cleanup
-
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {notify, true}, 
-				   {head, header}, {size, {100, No}}]),
-    ?line ok = disk_log:log(n, B),
-    ?line ok = disk_log:log_terms(n, [B,B,B]),
+    No = 4,
+    del(File, No),	% cleanup
+    del(NewFile, No),	% cleanup
+
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {notify, true},
+			     {head, header}, {size, {100, No}}]),
+    ok = disk_log:log(n, B),
+    ok = disk_log:log_terms(n, [B,B,B]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(3, {disk_log, node(), n, {wrap, 0}}),
-    ?line ok = disk_log:log_terms(n, [B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 2}}),
-    ?line ok = disk_log:log_terms(n, [B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 2}}),
-    ?line ok = disk_log:reopen(n, NewFile, new_header),
-    ?line rec(1, {disk_log, node(), n, {truncated, 8}}),
-    ?line ok = disk_log:log_terms(n, [B,B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line ok = disk_log:log_terms(n, [B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line ok = disk_log:close(n),
-    ?line [header, _, header, _, header, _, header, _] = 
+    rec(3, {disk_log, node(), n, {wrap, 0}}),
+    ok = disk_log:log_terms(n, [B]),
+    rec(1, {disk_log, node(), n, {wrap, 2}}),
+    ok = disk_log:log_terms(n, [B]),
+    rec(1, {disk_log, node(), n, {wrap, 2}}),
+    ok = disk_log:reopen(n, NewFile, new_header),
+    rec(1, {disk_log, node(), n, {truncated, 8}}),
+    ok = disk_log:log_terms(n, [B,B]),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    ok = disk_log:log_terms(n, [B]),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    ok = disk_log:close(n),
+    [header, _, header, _, header, _, header, _] =
 	get_all_terms(nn, NewFile, wrap),
-    ?line [new_header, _, header, _, header, _] = get_all_terms(n, File, wrap),
+    [new_header, _, header, _, header, _] = get_all_terms(n, File, wrap),
 
-    ?line del(NewFile, No),
-    ?line file:delete(File ++ ".2"),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {notify, true}, 
-				   {head, header}, {size, {100, No}}]),
+    del(NewFile, No),
+    file:delete(File ++ ".2"),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {notify, true},
+			     {head, header}, {size, {100, No}}]),
     %% One file is missing...
-    ?line ok = disk_log:reopen(n, NewFile),
-    ?line rec(1, {disk_log, node(), n, {truncated, 6}}),
-    ?line ok = disk_log:close(n),
+    ok = disk_log:reopen(n, NewFile),
+    rec(1, {disk_log, node(), n, {truncated, 6}}),
+    ok = disk_log:close(n),
 
-    ?line del(File, No),
-    ?line del(NewFile, No),
-    ?line Q = qlen(),
+    del(File, No),
+    del(NewFile, No),
+    Q = qlen(),
     ok.
 
 
-block_blocked(suite) -> [];
-block_blocked(doc) -> 
-    ["Test block/1 on external and internal logs."];
+%% Test block/1 on external and internal logs.
 block_blocked(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
-    ?line B = mk_bytes(60),
+    B = mk_bytes(60),
     Halt = join(Dir, "halt.LOG"),
 
-    % External logs.
-    ?line file:delete(Halt), % cleanup
-    ?line {ok, halt} = disk_log:open([{name, halt}, {type, halt}, 
-				      {format, external}, {file, Halt}]),
-    ?line ok = disk_log:sync(halt),
-    ?line ok = disk_log:block(halt, false),
-    ?line Error1 = {error, {blocked_log, halt}} = disk_log:block(halt),
-    ?line "The blocked disk" ++ _ = format_error(Error1),
-    ?line {error, {blocked_log, halt}} = disk_log:sync(halt),
-    ?line {error, {blocked_log, halt}} = disk_log:truncate(halt),
-    ?line {error, {blocked_log, halt}} = disk_log:change_size(halt, infinity),
-    ?line {error, {blocked_log, halt}} = 
+    %% External logs.
+    file:delete(Halt), % cleanup
+    {ok, halt} = disk_log:open([{name, halt}, {type, halt},
+				{format, external}, {file, Halt}]),
+    ok = disk_log:sync(halt),
+    ok = disk_log:block(halt, false),
+    Error1 = {error, {blocked_log, halt}} = disk_log:block(halt),
+    "The blocked disk" ++ _ = format_error(Error1),
+    {error, {blocked_log, halt}} = disk_log:sync(halt),
+    {error, {blocked_log, halt}} = disk_log:truncate(halt),
+    {error, {blocked_log, halt}} = disk_log:change_size(halt, infinity),
+    {error, {blocked_log, halt}} =
         disk_log:change_notify(halt, self(), false),
-    ?line {error, {blocked_log, halt}} = 
+    {error, {blocked_log, halt}} =
         disk_log:change_header(halt, {head, header}),
-    ?line {error, {blocked_log, halt}} = disk_log:reopen(halt, "foo"),
-    ?line ok = disk_log:close(halt),
-
-    ?line {ok, halt} = disk_log:open([{name, halt}, {type, halt}, 
-				      {format, external}]),
-    ?line ok = disk_log:sync(halt),
-    ?line ok = disk_log:block(halt, true),
-    ?line {error, {blocked_log, halt}} = disk_log:blog(halt, B),
-    ?line {error, {blocked_log, halt}} = disk_log:blog(halt, B),
-    ?line {error, {blocked_log, halt}} = disk_log:block(halt),
-    ?line {error, {blocked_log, halt}} = disk_log:sync(halt),
-    ?line {error, {blocked_log, halt}} = disk_log:truncate(halt),
-    ?line {error, {blocked_log, halt}} = disk_log:change_size(halt, infinity),
-    ?line {error, {blocked_log, halt}} = 
+    {error, {blocked_log, halt}} = disk_log:reopen(halt, "foo"),
+    ok = disk_log:close(halt),
+
+    {ok, halt} = disk_log:open([{name, halt}, {type, halt},
+				{format, external}]),
+    ok = disk_log:sync(halt),
+    ok = disk_log:block(halt, true),
+    {error, {blocked_log, halt}} = disk_log:blog(halt, B),
+    {error, {blocked_log, halt}} = disk_log:blog(halt, B),
+    {error, {blocked_log, halt}} = disk_log:block(halt),
+    {error, {blocked_log, halt}} = disk_log:sync(halt),
+    {error, {blocked_log, halt}} = disk_log:truncate(halt),
+    {error, {blocked_log, halt}} = disk_log:change_size(halt, infinity),
+    {error, {blocked_log, halt}} =
         disk_log:change_notify(halt, self(), false),
-    ?line {error, {blocked_log, halt}} = 
+    {error, {blocked_log, halt}} =
         disk_log:change_header(halt, {head, header}),
-    ?line {error, {blocked_log, halt}} = disk_log:reopen(halt, "foo"),
-
-    ?line ok = disk_log:unblock(halt),
-    ?line ok = disk_log:close(halt),
-    ?line file:delete(Halt),
-
-    % Internal logs.
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line No = 4,
-    ?line del(File, No), % cleanup
-    ?line {ok, halt} = disk_log:open([{name, halt}, {file, File}, {type, wrap},
-				      {size, {100, No}}]),
-    ?line ok = disk_log:block(halt, true),
-    ?line eof = disk_log:chunk(halt, start),
-    ?line Error2 = {error, end_of_log} = disk_log:chunk_step(halt, start, 1),
-    ?line "An attempt" ++ _ = format_error(Error2),
-    ?line {error, {blocked_log, halt}} = disk_log:log(halt, B),
-    ?line {error, {blocked_log, halt}} = disk_log:inc_wrap_file(halt),
-    ?line ok = disk_log:unblock(halt),
-    ?line ok = disk_log:block(halt, false),
-    ?line {error, {blocked_log, halt}} = disk_log:log(halt, B),
-    ?line {error, {blocked_log, halt}} = disk_log:inc_wrap_file(halt),
-    ?line Parent = self(),
-    ?line Pid = 
+    {error, {blocked_log, halt}} = disk_log:reopen(halt, "foo"),
+
+    ok = disk_log:unblock(halt),
+    ok = disk_log:close(halt),
+    file:delete(Halt),
+
+    %% Internal logs.
+    File = filename:join(Dir, "n.LOG"),
+    No = 4,
+    del(File, No), % cleanup
+    {ok, halt} = disk_log:open([{name, halt}, {file, File}, {type, wrap},
+				{size, {100, No}}]),
+    ok = disk_log:block(halt, true),
+    eof = disk_log:chunk(halt, start),
+    Error2 = {error, end_of_log} = disk_log:chunk_step(halt, start, 1),
+    "An attempt" ++ _ = format_error(Error2),
+    {error, {blocked_log, halt}} = disk_log:log(halt, B),
+    {error, {blocked_log, halt}} = disk_log:inc_wrap_file(halt),
+    ok = disk_log:unblock(halt),
+    ok = disk_log:block(halt, false),
+    {error, {blocked_log, halt}} = disk_log:log(halt, B),
+    {error, {blocked_log, halt}} = disk_log:inc_wrap_file(halt),
+    Parent = self(),
+    Pid =
         spawn_link(fun() -> 
                            {error, {blocked_log, halt}} = 
                                disk_log:chunk(halt, start),
@@ -1661,109 +1608,107 @@ block_blocked(Conf) when is_list(Conf) ->
                                disk_log:chunk_step(halt, start, 1),
                            Parent ! {self(), stopped}
                    end),
-    ?line receive {Pid,stopped} -> ok end,
-    ?line ok = disk_log:close(halt),
-    ?line del(File, No).
+    receive {Pid,stopped} -> ok end,
+    ok = disk_log:close(halt),
+    del(File, No).
 
-block_queue(suite) -> [];
-block_queue(doc) -> 
-    ["Run commands from the queue by unblocking."];
+%% Run commands from the queue by unblocking.
 block_queue(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
-    ?line Q = qlen(),
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line No = 4,
-    ?line del(File, No), % cleanup
-    ?line B = mk_bytes(60),    
-
-    ?line Pid = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = sync_do(Pid, {open, File}),
-
-    ?line ok = disk_log:block(n, true),
-    ?line async_do(Pid, {blog, B}),
-    ?line ok = disk_log:unblock(n),
-    ?line ok = get_reply(),
-    ?line 1 = no_written_items(n),
-    ?line Error1 = {error,{not_blocked,n}} = disk_log:unblock(n),
-    ?line "The disk log" ++ _ = format_error(Error1),
-
-    ?line ok = disk_log:block(n, true),
-    ?line async_do(Pid, {balog, "one string"}),
-    ?line ok = disk_log:unblock(n),
-    ?line ok = get_reply(),
-    ?line 2 = no_written_items(n),
-
-    ?line ok = disk_log:block(n, true),
-    ?line async_do(Pid, sync),
-    ?line ok = disk_log:unblock(n),
-    ?line ok = get_reply(),
-    
-    ?line ok = disk_log:block(n, true),
-    ?line async_do(Pid, truncate),
-    ?line ok = disk_log:unblock(n),
-    ?line ok = get_reply(),
-    ?line 0 = no_items(n),
-
-    ?line ok = disk_log:block(n, true),
-    ?line async_do(Pid, {block, false}),
-    ?line ok = disk_log:unblock(n),
-    ?line ok = get_reply(),
-    ?line {error, {blocked_log, _}} = disk_log:blog(n, B),
-    ?line ok = sync_do(Pid, unblock),
-
-    ?line ok = disk_log:block(n, true),
-    ?line async_do(Pid, {change_notify, Pid, true}),
-    ?line ok = disk_log:unblock(n),
-    ?line ok = get_reply(),
-    ?line [{_, true}] = owners(n),
-
-    ?line ok = disk_log:block(n, true),
-    ?line async_do(Pid, {change_notify, Pid, false}),
-    ?line ok = disk_log:unblock(n),
-    ?line ok = get_reply(),
-    ?line [{_, false}] = owners(n),
-
-    ?line ok = disk_log:block(n, true),
-    ?line async_do(Pid, {change_header, {head, header}}),
-    ?line ok = disk_log:unblock(n),
-    ?line {error, {badarg, head}} = get_reply(),
-
-    ?line ok = disk_log:block(n, true),
-    ?line async_do(Pid, {change_size, 17}),
-    ?line ok = disk_log:unblock(n),
-    ?line {error, {badarg, size}} = get_reply(),
-
-    ?line ok = disk_log:block(n, true),
-    ?line async_do(Pid, inc_wrap_file),
-    ?line ok = disk_log:unblock(n),
-    ?line ok = get_reply(),
-
-    ?line ok = sync_do(Pid, close),
-    ?line del(File, No),
-
-    ?line _Pid2 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = sync_do(Pid, {int_open, File}),
-
-    ?line ok = disk_log:block(n, true),
-    ?line async_do(Pid, {chunk, start}),
-    ?line ok = disk_log:unblock(n),
-    ?line eof = get_reply(),
-
-    ?line ok = disk_log:block(n, true),
-    ?line async_do(Pid, {chunk_step, start, 100}),
-    ?line ok = disk_log:unblock(n),
-    ?line {ok, _Cont} = get_reply(),
-
-    ?line ok = disk_log:block(n, true),
-    ?line async_do(Pid, {log,a_term}),
-    ?line ok = disk_log:unblock(n),
-    ?line ok = get_reply(),
-    ?line 1 = no_written_items(n),
-
-    ?line ok = sync_do(Pid, close),
-    ?line sync_do(Pid, terminate),
-    ?line del(File, No),
+    Q = qlen(),
+    File = filename:join(Dir, "n.LOG"),
+    No = 4,
+    del(File, No), % cleanup
+    B = mk_bytes(60),
+
+    Pid = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = sync_do(Pid, {open, File}),
+
+    ok = disk_log:block(n, true),
+    async_do(Pid, {blog, B}),
+    ok = disk_log:unblock(n),
+    ok = get_reply(),
+    1 = no_written_items(n),
+    Error1 = {error,{not_blocked,n}} = disk_log:unblock(n),
+    "The disk log" ++ _ = format_error(Error1),
+
+    ok = disk_log:block(n, true),
+    async_do(Pid, {balog, "one string"}),
+    ok = disk_log:unblock(n),
+    ok = get_reply(),
+    2 = no_written_items(n),
+
+    ok = disk_log:block(n, true),
+    async_do(Pid, sync),
+    ok = disk_log:unblock(n),
+    ok = get_reply(),
+
+    ok = disk_log:block(n, true),
+    async_do(Pid, truncate),
+    ok = disk_log:unblock(n),
+    ok = get_reply(),
+    0 = no_items(n),
+
+    ok = disk_log:block(n, true),
+    async_do(Pid, {block, false}),
+    ok = disk_log:unblock(n),
+    ok = get_reply(),
+    {error, {blocked_log, _}} = disk_log:blog(n, B),
+    ok = sync_do(Pid, unblock),
+
+    ok = disk_log:block(n, true),
+    async_do(Pid, {change_notify, Pid, true}),
+    ok = disk_log:unblock(n),
+    ok = get_reply(),
+    [{_, true}] = owners(n),
+
+    ok = disk_log:block(n, true),
+    async_do(Pid, {change_notify, Pid, false}),
+    ok = disk_log:unblock(n),
+    ok = get_reply(),
+    [{_, false}] = owners(n),
+
+    ok = disk_log:block(n, true),
+    async_do(Pid, {change_header, {head, header}}),
+    ok = disk_log:unblock(n),
+    {error, {badarg, head}} = get_reply(),
+
+    ok = disk_log:block(n, true),
+    async_do(Pid, {change_size, 17}),
+    ok = disk_log:unblock(n),
+    {error, {badarg, size}} = get_reply(),
+
+    ok = disk_log:block(n, true),
+    async_do(Pid, inc_wrap_file),
+    ok = disk_log:unblock(n),
+    ok = get_reply(),
+
+    ok = sync_do(Pid, close),
+    del(File, No),
+
+    _Pid2 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = sync_do(Pid, {int_open, File}),
+
+    ok = disk_log:block(n, true),
+    async_do(Pid, {chunk, start}),
+    ok = disk_log:unblock(n),
+    eof = get_reply(),
+
+    ok = disk_log:block(n, true),
+    async_do(Pid, {chunk_step, start, 100}),
+    ok = disk_log:unblock(n),
+    {ok, _Cont} = get_reply(),
+
+    ok = disk_log:block(n, true),
+    async_do(Pid, {log,a_term}),
+    ok = disk_log:unblock(n),
+    ok = get_reply(),
+    1 = no_written_items(n),
+
+    ok = sync_do(Pid, close),
+    sync_do(Pid, terminate),
+    del(File, No),
 
     %% Test of the queue. Three processes involved here. Pid1's block
     %% request is queued. Pid2's log requests are put in the queue.
@@ -1771,171 +1716,165 @@ block_queue(Conf) when is_list(Conf) ->
     %% Pid2's log requests are executed when Pid1 unblocks.
     %% (This example should show that the pair 'queue' and 'messages' 
     %% in State does the trick - one does not need a "real" queue.)
-    ?line P0 = pps(),
+    P0 = pps(),
     Name = n,
-    ?line Pid1 = spawn_link(?MODULE, lserv, [Name]),
-    ?line {ok, Name} = sync_do(Pid1, {int_open, File, {1000,2}}),
-    ?line Pid2 = spawn_link(?MODULE, lserv, [Name]),
-    ?line {ok, Name} = sync_do(Pid2, {int_open, File, {1000,2}}),
-    ?line ok = disk_log:block(Name),
-    ?line async_do(Pid1, {alog,{1,a}}),
-    ?line ok = get_reply(),
-    ?line async_do(Pid1, {alog,{2,b}}),
-    ?line ok = get_reply(),
-    ?line async_do(Pid1, {alog,{3,c}}),
-    ?line ok = get_reply(),
-    ?line async_do(Pid1, {alog,{4,d}}),
-    ?line ok = get_reply(),
-    ?line async_do(Pid1, block),
-    ?line async_do(Pid2, {alog,{5,e}}),
-    ?line ok = get_reply(),
-    ?line async_do(Pid2, {alog,{6,f}}),
-    ?line ok = get_reply(),
-    ?line ok = disk_log:unblock(Name),
-    ?line ok = get_reply(),
-    ?line async_do(Pid2, {alog,{7,g}}),
-    ?line ok = get_reply(),
-    ?line async_do(Pid2, {alog,{8,h}}),
-    ?line ok = get_reply(),
-    ?line async_do(Pid1, unblock),
-    ?line ok = get_reply(),
-    ?line ok = sync_do(Pid1, close),
-    ?line ok = sync_do(Pid2, close),
-    ?line sync_do(Pid1, terminate),
-    ?line sync_do(Pid2, terminate),
+    Pid1 = spawn_link(?MODULE, lserv, [Name]),
+    {ok, Name} = sync_do(Pid1, {int_open, File, {1000,2}}),
+    Pid2 = spawn_link(?MODULE, lserv, [Name]),
+    {ok, Name} = sync_do(Pid2, {int_open, File, {1000,2}}),
+    ok = disk_log:block(Name),
+    async_do(Pid1, {alog,{1,a}}),
+    ok = get_reply(),
+    async_do(Pid1, {alog,{2,b}}),
+    ok = get_reply(),
+    async_do(Pid1, {alog,{3,c}}),
+    ok = get_reply(),
+    async_do(Pid1, {alog,{4,d}}),
+    ok = get_reply(),
+    async_do(Pid1, block),
+    async_do(Pid2, {alog,{5,e}}),
+    ok = get_reply(),
+    async_do(Pid2, {alog,{6,f}}),
+    ok = get_reply(),
+    ok = disk_log:unblock(Name),
+    ok = get_reply(),
+    async_do(Pid2, {alog,{7,g}}),
+    ok = get_reply(),
+    async_do(Pid2, {alog,{8,h}}),
+    ok = get_reply(),
+    async_do(Pid1, unblock),
+    ok = get_reply(),
+    ok = sync_do(Pid1, close),
+    ok = sync_do(Pid2, close),
+    sync_do(Pid1, terminate),
+    sync_do(Pid2, terminate),
     Terms = get_all_terms(Name, File, wrap),
-    ?line true = [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g},{8,h}] == Terms,
+    true = [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g},{8,h}] == Terms,
     del(File, 2),
-    ?line Q = qlen(),
-    ?line true = (P0 == pps()),
+    Q = qlen(),
+    true = (P0 == pps()),
     ok.
 
-block_queue2(suite) -> [];
-block_queue2(doc) -> 
-    ["OTP-4880. Blocked processes did not get disk_log_stopped message."];
+%% OTP-4880. Blocked processes did not get disk_log_stopped message.
 block_queue2(Conf) when is_list(Conf) ->
-    ?line Q = qlen(),
-    ?line P0 = pps(),
+    Q = qlen(),
+    P0 = pps(),
     Dir = ?privdir(Conf),
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line No = 4,
+    File = filename:join(Dir, "n.LOG"),
+    No = 4,
 
     %% log requests are queued, and processed when the log is closed
-    ?line Pid = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = sync_do(Pid, {open, File}),
-    ?line ok = sync_do(Pid, block),
+    Pid = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = sync_do(Pid, {open, File}),
+    ok = sync_do(Pid, block),
     %% Asynchronous stuff is ignored.
-    ?line ok = disk_log:balog_terms(n, [<<"foo">>,<<"bar">>]),
-    ?line ok = disk_log:balog_terms(n, [<<"more">>,<<"terms">>]),
+    ok = disk_log:balog_terms(n, [<<"foo">>,<<"bar">>]),
+    ok = disk_log:balog_terms(n, [<<"more">>,<<"terms">>]),
     Parent = self(),
-    ?line Fun = 
+    Fun =
         fun() ->
                 {error,no_such_log} = disk_log:sync(n),
                 receive {disk_log, _, {error, disk_log_stopped}} -> ok end,
                 Parent ! disk_log_stopped_ok
         end,
-    ?line spawn(Fun),
-    ?line ok = sync_do(Pid, close),
-    ?line receive disk_log_stopped_ok -> ok end,
-    ?line sync_do(Pid, terminate),
-    ?line {ok,<<>>} = file:read_file(File ++ ".1"),
-    ?line del(File, No),    
-    ?line Q = qlen(),
-    ?line true = (P0 == pps()),
+    spawn(Fun),
+    ok = sync_do(Pid, close),
+    receive disk_log_stopped_ok -> ok end,
+    sync_do(Pid, terminate),
+    {ok,<<>>} = file:read_file(File ++ ".1"),
+    del(File, No),
+    Q = qlen(),
+    true = (P0 == pps()),
     ok.
 
 
-unblock(suite) -> [];
-unblock(doc) -> 
-    ["Test unblock/1."];
+%% Test unblock/1.
 unblock(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "n.LOG"),
     No = 1,
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {size, {100,No}}, {notify, true}, 
-				   {format, external}]),
-    ?line ok = disk_log:block(n),
-    ?line spawn_link(?MODULE, try_unblock, [n]),
-    ?line timer:sleep(100),
-    ?line disk_log:close(n),
-    ?line del(File, No).
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {size, {100,No}}, {notify, true},
+			     {format, external}]),
+    ok = disk_log:block(n),
+    spawn_link(?MODULE, try_unblock, [n]),
+    timer:sleep(100),
+    disk_log:close(n),
+    del(File, No).
 
 try_unblock(Log) ->
-    ?line Error = {error, {not_blocked_by_pid, n}} = disk_log:unblock(Log),
-    ?line "The disk log" ++ _ = format_error(Error).
+    Error = {error, {not_blocked_by_pid, n}} = disk_log:unblock(Log),
+    "The disk log" ++ _ = format_error(Error).
 
 
-open_overwrite(suite) -> [];
-open_overwrite(doc) -> 
-    ["Test open/1 when old files exist."];
+%% Test open/1 when old files exist.
 open_overwrite(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line No = 4,
-    ?line del(File, No), % cleanup
+    File = filename:join(Dir, "n.LOG"),
+    No = 4,
+    del(File, No), % cleanup
 
-    % read write
-    ?line First = "n.LOG.1",
-    ?line make_file(Dir, First, 8),
+    %% read write
+    First = "n.LOG.1",
+    make_file(Dir, First, 8),
 
-    ?line Error1 = {error, {not_a_log_file, _}} = 
+    Error1 = {error, {not_a_log_file, _}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {format, internal}, {size, {100, No}}]),
-    ?line "The file" ++ _ = format_error(Error1),
-    ?line del(File, No),
+    "The file" ++ _ = format_error(Error1),
+    del(File, No),
 
-    ?line make_file(Dir, First, 4),
+    make_file(Dir, First, 4),
 
-    ?line {error, {not_a_log_file, _}} = 
+    {error, {not_a_log_file, _}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {format, internal}, {size, {100, No}}]),
-    ?line del(File, No),
+    del(File, No),
 
-    ?line make_file(Dir, First, 0),
+    make_file(Dir, First, 0),
 
-    ?line {error, {not_a_log_file, _}} = 
+    {error, {not_a_log_file, _}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap}, 
 		       {format, internal}, {size, {100, No}}]),
-    % read only
-    ?line make_file(Dir, First, 6),
+    %% read only
+    make_file(Dir, First, 6),
 
-    ?line {error, {not_a_log_file, _}} = 
+    {error, {not_a_log_file, _}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},{mode, read_only},
 		       {format, internal}, {size, {100, No}}]),
-    ?line del(File, No),
+    del(File, No),
 
-    ?line make_file(Dir, First, 0),
+    make_file(Dir, First, 0),
 
-    ?line {error, {not_a_log_file, _}} = 
+    {error, {not_a_log_file, _}} =
 	disk_log:open([{name, n}, {file, File},{type, wrap}, 
 		       {mode, read_only}, {format, internal},
 		       {size, {100, No}}]),
-    ?line del(File, No),
-    
-    ?line {error, _} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				      {mode, read_only},
-				      {format, internal},{size, {100, No}}]),
+    del(File, No),
+
+    {error, _} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+				{mode, read_only},
+				{format, internal},{size, {100, No}}]),
 
     file:delete(File),
-    ?line {ok,n} = disk_log:open([{name,n},{file,File},
-                                  {mode,read_write},{type,halt}]),
-    ?line ok = disk_log:close(n),
-    ?line ok = unwritable(File),
-    ?line {error, {file_error, File, _}} = 
-       disk_log:open([{name,n},{file,File},{mode,read_write},{type,halt}]),
-    ?line ok = writable(File),
+    {ok,n} = disk_log:open([{name,n},{file,File},
+			    {mode,read_write},{type,halt}]),
+    ok = disk_log:close(n),
+    ok = unwritable(File),
+    {error, {file_error, File, _}} =
+	disk_log:open([{name,n},{file,File},{mode,read_write},{type,halt}]),
+    ok = writable(File),
     file:delete(File),
 
-    ?line {ok,n} = disk_log:open([{name,n},{file,File},{format,external},
-                                  {mode,read_write},{type,halt}]),
-    ?line ok = disk_log:close(n),
-    ?line ok = unwritable(File),
-    ?line {error, {file_error, File, _}} = 
+    {ok,n} = disk_log:open([{name,n},{file,File},{format,external},
+			    {mode,read_write},{type,halt}]),
+    ok = disk_log:close(n),
+    ok = unwritable(File),
+    {error, {file_error, File, _}} =
         disk_log:open([{name,n},{file,File},{format,external},
                        {mode,read_write},{type,halt}]),
-    ?line ok = writable(File),
+    ok = writable(File),
     file:delete(File),
 
     ok.
@@ -1953,424 +1892,412 @@ make_file(Dir, File, N) ->
     end,
     ok = file:close(F).
 
-open_size(suite) -> [];
-open_size(doc) -> 
-    ["Test open/1 option size."];
+%% Test open/1 option size.
 open_size(Conf) when is_list(Conf) ->
 
-    ?line Dir = ?privdir(Conf),
-    ?line File = filename:join(Dir, "n.LOG"),
+    Dir = ?privdir(Conf),
+    File = filename:join(Dir, "n.LOG"),
 
-    ?line No = 4,
-    ?line file:delete(File),
-    ?line del(File, No),	% cleanup
+    No = 4,
+    file:delete(File),
+    del(File, No),	% cleanup
 
     %% missing size option
-    ?line {error, {badarg, size}} = 
+    {error, {badarg, size}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {format, internal}]),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
 			     {format, internal},{size, {100, No}}]),
-    ?line B = mk_bytes(60),    
-    ?line ok = disk_log:log_terms(n, [B, B, B, B]),
-    ?line ok = disk_log:sync(n),
-    ?line ok = disk_log:block(n),
+    B = mk_bytes(60),
+    ok = disk_log:log_terms(n, [B, B, B, B]),
+    ok = disk_log:sync(n),
+    ok = disk_log:block(n),
 
     %% size option does not match existing size file, read_only
-    ?line Error1 = {error, {size_mismatch, _, _}} = 
+    Error1 = {error, {size_mismatch, _, _}} =
 	disk_log:open([{name, nn}, {file, File}, {type, wrap}, 
 		       {mode, read_only}, {format, internal},
 		       {size, {100, No + 1}}]),
-    ?line "The given size" ++ _ = format_error(Error1),
-    ?line {ok, nn} = disk_log:open([{name, nn}, {file, File}, {type, wrap},
+    "The given size" ++ _ = format_error(Error1),
+    {ok, nn} = disk_log:open([{name, nn}, {file, File}, {type, wrap},
 			      {mode, read_only},
 			      {format, internal},{size, {100, No}}]),
-    ?line [_, _, _, _] = get_all_terms1(nn, start, []),
-    ?line disk_log:close(nn),
+    [_, _, _, _] = get_all_terms1(nn, start, []),
+    disk_log:close(nn),
 
-    ?line ok = disk_log:unblock(n),
-    ?line ok = disk_log:close(n),
+    ok = disk_log:unblock(n),
+    ok = disk_log:close(n),
 
     %% size option does not match existing size file, read_write
-    ?line {error, {size_mismatch, _, _}} = 
+    {error, {size_mismatch, _, _}} =
 	disk_log:open([{name, nn}, {file, File}, {type, wrap}, 
 		       {format, internal}, {size, {100, No + 1}}]),
     %% size option does not match existing size file, truncating
-    ?line {ok, nn} = 
+    {ok, nn} =
 	disk_log:open([{name, nn}, {file, File}, {type, wrap}, 
 		       {repair, truncate}, {format, internal}, 
 		       {size, {100, No + 1}}]),
-    ?line ok = disk_log:close(nn),
+    ok = disk_log:close(nn),
 
-    ?line del(File, No),
+    del(File, No),
     ok.
 
 
-open_truncate(suite) -> [];
-open_truncate(doc) -> 
-    ["Test open/1 with {repair, truncate}."];
+%% Test open/1 with {repair, truncate}.
 open_truncate(Conf) when is_list(Conf) ->
 
-    ?line Dir = ?privdir(Conf),
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line No = 4,
-    ?line del(File, No),	% cleanup
-
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, internal},{size, {100, No}}]),
-    ?line B = mk_bytes(60),    
-    ?line ok = disk_log:log_terms(n, [B, B, B, B]),
-    ?line ok = disk_log:close(n),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {repair,truncate},
-				   {format, internal},{size, {100, No}}]),
-    ?line ok = disk_log:close(n),
-    ?line [] = get_all_terms(n, File, wrap),
-    ?line del(File, No),
+    Dir = ?privdir(Conf),
+    File = filename:join(Dir, "n.LOG"),
+    No = 4,
+    del(File, No),	% cleanup
+
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, internal},{size, {100, No}}]),
+    B = mk_bytes(60),
+    ok = disk_log:log_terms(n, [B, B, B, B]),
+    ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {repair,truncate},
+			     {format, internal},{size, {100, No}}]),
+    ok = disk_log:close(n),
+    [] = get_all_terms(n, File, wrap),
+    del(File, No),
     ok.
-    
 
-open_error(suite) -> [];
-open_error(doc) -> 
-    ["Try some invalid open/1 options."];
+
+%% Try some invalid open/1 options.
 open_error(Conf) when is_list(Conf) ->
-    ?line Dir = ?privdir(Conf),
+    Dir = ?privdir(Conf),
 
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line No = 4,
-    ?line del(File, No),	% cleanup
+    File = filename:join(Dir, "n.LOG"),
+    No = 4,
+    del(File, No),	% cleanup
 
-    ?line {error, {badarg, name}} = disk_log:open([{file, File}]),
-    ?line {error, {badarg, file}} = disk_log:open([{name,{foo,bar}}]),
-    ?line {error, {badarg, [{foo,bar}]}} = disk_log:open([{foo,bar}]),
+    {error, {badarg, name}} = disk_log:open([{file, File}]),
+    {error, {badarg, file}} = disk_log:open([{name,{foo,bar}}]),
+    {error, {badarg, [{foo,bar}]}} = disk_log:open([{foo,bar}]),
 
     %% external logs, read_only.
-    ?line {error, {file_error, _, enoent}} = 
+    {error, {file_error, _, enoent}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {size, {100,No}},
 		       {format, external}, {mode, read_only}]),
-    ?line Error5 = {error, {file_error, _, enoent}} = 
+    Error5 = {error, {file_error, _, enoent}} =
 	disk_log:open([{name, n}, {file, File}, {type, halt},
 		       {size, 100},
 		       {format, external}, {mode, read_only}]),
-    ?line true = lists:prefix("\"" ++ File, format_error(Error5)),
+    true = lists:prefix("\"" ++ File, format_error(Error5)),
 
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
 			     {format, external},{size, {100, No}}]),
     %% Already owner, ignored.
-    ?line {ok, n} =
+    {ok, n} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {format, external}, {size, {100, No}}]),
-    ?line Error2 = {error, {name_already_open, n}} =
+    Error2 = {error, {name_already_open, n}} =
 	disk_log:open([{name, n}, {file, another_file}, {type, wrap},
 		       {format, external}, {size, {100, No}}]),
-    ?line "The disk log" ++ _ = format_error(Error2),
-    ?line Error1 = {error, {arg_mismatch, notify, false, true}} = 
+    "The disk log" ++ _ = format_error(Error2),
+    Error1 = {error, {arg_mismatch, notify, false, true}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {format, external}, {size, {100, No}}, {notify, true}]),
-    ?line "The value" ++ _ = format_error(Error1),
-    ?line Error3 = {error, {open_read_write, n}} =
+    "The value" ++ _ = format_error(Error1),
+    Error3 = {error, {open_read_write, n}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap}, 
 		       {mode, read_only},
 		       {format, external}, {size, {100, No}}]),
-    ?line "The disk log" ++ _ = format_error(Error3),
-    ?line {error, {badarg, size}} = 
+    "The disk log" ++ _ = format_error(Error3),
+    {error, {badarg, size}} =
         disk_log:open([{name, n}, {file, File}, {type, halt},
                        {format, external}, {size, {100, No}}]),
-    ?line {error, {arg_mismatch, type, wrap, halt}} = 
+    {error, {arg_mismatch, type, wrap, halt}} =
 	disk_log:open([{name, n}, {file, File}, {type, halt},
 		       {format, external}]),
-    ?line {error, {arg_mismatch, format, external, internal}} = 
+    {error, {arg_mismatch, format, external, internal}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {format, internal}, {size, {100, No}}]),
-    ?line {error, {arg_mismatch, repair, true, false}} = 
+    {error, {arg_mismatch, repair, true, false}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {format, external}, {repair, false}]),
-    ?line {error, {size_mismatch, {100,4}, {1000,4}}} =
+    {error, {size_mismatch, {100,4}, {1000,4}}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {format, external}, {size, {1000, No}}]),
-    ?line {error, {arg_mismatch, head, none, _}} = 
+    {error, {arg_mismatch, head, none, _}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {head, "header"},
 		       {format, external}, {size, {100, No}}]),
-    ?line {error, {badarg, size}} = 
+    {error, {badarg, size}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {format, external}, {size, 100}]),
 
-    ?line ok = disk_log:close(n),
+    ok = disk_log:close(n),
 
-    ?line {ok, n} =
+    {ok, n} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {mode, read_only},
 		       {format, external}, {size, {100, No}}]),
-    ?line Error4 = {error, {open_read_only, n}} = 
+    Error4 = {error, {open_read_only, n}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {mode, read_write},
 		       {format, external}, {size, {100, No}}]),
-    ?line "The disk log" ++ _ = format_error(Error4),
-    ?line ok = disk_log:close(n),
+    "The disk log" ++ _ = format_error(Error4),
+    ok = disk_log:close(n),
 
-    ?line del(File, No).    
+    del(File, No).
 
 
-close_race(suite) -> [];
-close_race(doc) -> 
-    ["Do something quickly after close/1"];
+%% Do something quickly after close/1.
 close_race(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line No = 1,
-    ?line del(File, No),  % cleanup
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {size, {100,No}}, {notify, true}, 
-				   {format, internal}]),
-    ?line ok = disk_log:close(n),
-    ?line Error1 = {error, no_such_log} = disk_log:close(n),
-    ?line "There is no disk" ++ _ = format_error(Error1),
-
-    % Pid1 blocks, Pid2 closes without being suspended.
-    ?line Pid1 = spawn_link(?MODULE, lserv, [n]),
-    ?line Pid2 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = sync_do(Pid1, {open, File}),
-    ?line {ok, n} = sync_do(Pid2, {open, File}),
-    ?line ok = sync_do(Pid1, block),
-    ?line [{_, false}, {_, false}] = sync_do(Pid1, owners),
-    ?line ok = sync_do(Pid2, close),
-    ?line [{_, false}] = sync_do(Pid1, owners),
-    ?line ok = sync_do(Pid1, close),
-    ?line sync_do(Pid1, terminate),
-    ?line sync_do(Pid2, terminate),
-    ?line {error, no_such_log} = disk_log:info(n),
-
-    % Pid3 blocks, Pid3 closes. Pid4 should still be ablo to use log.
-    ?line Pid3 = spawn_link(?MODULE, lserv, [n]),
-    ?line Pid4 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = sync_do(Pid3, {open, File}),
-    ?line {ok, n} = sync_do(Pid4, {open, File}),
-    ?line ok = sync_do(Pid3, block),
-    ?line ok = sync_do(Pid3, close),
-    ?line [{_Pid4, false}] = sync_do(Pid4, owners),
-    ?line sync_do(Pid3, terminate),
-    ?line sync_do(Pid4, terminate),
-    ?line {error, no_such_log} = disk_log:info(n),
-
-    % Pid5 blocks, Pid5 terminates. Pid6 should still be ablo to use log.
-    ?line Pid5 = spawn_link(?MODULE, lserv, [n]),
-    ?line Pid6 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = sync_do(Pid5, {open, File}),
-    ?line {ok, n} = sync_do(Pid6, {open, File}),
-    ?line ok = sync_do(Pid5, block),
-    ?line sync_do(Pid5, terminate),
-    ?line [{_Pid6, false}] = sync_do(Pid6, owners),
-    ?line sync_do(Pid6, terminate),
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line del(File, No),  % cleanup
+    File = filename:join(Dir, "n.LOG"),
+    No = 1,
+    del(File, No),  % cleanup
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {size, {100,No}}, {notify, true},
+			     {format, internal}]),
+    ok = disk_log:close(n),
+    Error1 = {error, no_such_log} = disk_log:close(n),
+    "There is no disk" ++ _ = format_error(Error1),
+
+    %% Pid1 blocks, Pid2 closes without being suspended.
+    Pid1 = spawn_link(?MODULE, lserv, [n]),
+    Pid2 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = sync_do(Pid1, {open, File}),
+    {ok, n} = sync_do(Pid2, {open, File}),
+    ok = sync_do(Pid1, block),
+    [{_, false}, {_, false}] = sync_do(Pid1, owners),
+    ok = sync_do(Pid2, close),
+    [{_, false}] = sync_do(Pid1, owners),
+    ok = sync_do(Pid1, close),
+    sync_do(Pid1, terminate),
+    sync_do(Pid2, terminate),
+    {error, no_such_log} = disk_log:info(n),
+
+    %% Pid3 blocks, Pid3 closes. Pid4 should still be ablo to use log.
+    Pid3 = spawn_link(?MODULE, lserv, [n]),
+    Pid4 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = sync_do(Pid3, {open, File}),
+    {ok, n} = sync_do(Pid4, {open, File}),
+    ok = sync_do(Pid3, block),
+    ok = sync_do(Pid3, close),
+    [{_Pid4, false}] = sync_do(Pid4, owners),
+    sync_do(Pid3, terminate),
+    sync_do(Pid4, terminate),
+    {error, no_such_log} = disk_log:info(n),
+
+    %% Pid5 blocks, Pid5 terminates. Pid6 should still be ablo to use log.
+    Pid5 = spawn_link(?MODULE, lserv, [n]),
+    Pid6 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = sync_do(Pid5, {open, File}),
+    {ok, n} = sync_do(Pid6, {open, File}),
+    ok = sync_do(Pid5, block),
+    sync_do(Pid5, terminate),
+    [{_Pid6, false}] = sync_do(Pid6, owners),
+    sync_do(Pid6, terminate),
+    {error, no_such_log} = disk_log:info(n),
+    del(File, No),  % cleanup
     ok.
 
-close_block(suite) -> [];
-close_block(doc) -> 
-    ["Block, unblock, close, terminate."];
+%% Block, unblock, close, terminate.
 close_block(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
-    ?line File = filename:join(Dir, "n.LOG"),
+    File = filename:join(Dir, "n.LOG"),
     No = 1,
     del(File, No),	% cleanup
 
     P0 = pps(),
     %% One of two owners terminates.
-    ?line Pid1 = spawn_link(?MODULE, lserv, [n]),
-    ?line Pid2 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = sync_do(Pid1, {open, File}),
-    ?line {ok, n} = sync_do(Pid2, {open, File}),
-    ?line [_, _] = sync_do(Pid1, owners),
-    ?line [_, _] = sync_do(Pid2, owners),
-    ?line 0 = sync_do(Pid1, users),
-    ?line 0 = sync_do(Pid2, users),
-    ?line sync_do(Pid1, terminate),
-    ?line [_] = sync_do(Pid2, owners),
-    ?line 0 = sync_do(Pid2, users),
-    ?line sync_do(Pid2, terminate),    
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line true = (P0 == pps()),    
+    Pid1 = spawn_link(?MODULE, lserv, [n]),
+    Pid2 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = sync_do(Pid1, {open, File}),
+    {ok, n} = sync_do(Pid2, {open, File}),
+    [_, _] = sync_do(Pid1, owners),
+    [_, _] = sync_do(Pid2, owners),
+    0 = sync_do(Pid1, users),
+    0 = sync_do(Pid2, users),
+    sync_do(Pid1, terminate),
+    [_] = sync_do(Pid2, owners),
+    0 = sync_do(Pid2, users),
+    sync_do(Pid2, terminate),
+    {error, no_such_log} = disk_log:info(n),
+    true = (P0 == pps()),
 
     %% Users terminate (no link...).
-    ?line Pid3 = spawn_link(?MODULE, lserv, [n]),
-    ?line Pid4 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = sync_do(Pid3, {open, File, none}),
-    ?line {ok, n} = sync_do(Pid4, {open, File, none}),
-    ?line [] = sync_do(Pid3, owners),
-    ?line [] = sync_do(Pid4, owners),
-    ?line 2 = sync_do(Pid3, users),
-    ?line 2 = sync_do(Pid4, users),
-    ?line sync_do(Pid3, terminate),
-    ?line [] = sync_do(Pid4, owners),
-    ?line 2 = sync_do(Pid4, users),
-    ?line sync_do(Pid4, terminate),    
-    ?line disk_log:close(n),
-    ?line disk_log:close(n),
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line true = (P0 == pps()),    
-
-    % Blocking owner terminates.
-    ?line Pid5 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {linkto, none},{size, {100,No}},
-				   {format, external}]),
-    ?line {ok, n} = sync_do(Pid5, {open, File}),
-    ?line ok = sync_do(Pid5, block),
-    ?line {blocked, true} = status(n),
-    ?line [_] = owners(n),
-    ?line sync_do(Pid5, terminate),
-    ?line ok = status(n),
-    ?line [] = owners(n),
-    ?line 1 = users(n),
-    ?line ok = disk_log:close(n),
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line true = (P0 == pps()),    
-
-    % Blocking user terminates.
-    ?line Pid6 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {size, {100,No}}, {format, external}]),
-    ?line {ok, n} = sync_do(Pid6, {open, File, none}),
-    ?line ok = sync_do(Pid6, block),
-    ?line {blocked, true} = status(n),
-    ?line [_] = owners(n),
-    ?line 1 = users(n),
-    ?line sync_do(Pid6, terminate), % very silently...
-    ?line ok = status(n),
-    ?line [_] = owners(n),
-    ?line 1 = users(n),
-    ?line ok = disk_log:close(n),
-    ?line [] = owners(n),
-    ?line 1 = users(n),
-    ?line ok = disk_log:close(n),
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line true = (P0 == pps()),    
-
-    % Blocking owner terminates.
-    ?line Pid7 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {linkto, none},
-				   {size, {100,No}}, {format, external}]),
-    ?line {ok, n} = sync_do(Pid7, {open, File}),
-    ?line ok = sync_do(Pid7, block),
-    ?line {blocked, true} = status(n),
-    ?line [_] = owners(n),
-    ?line 1 = users(n),
-    ?line sync_do(Pid7, terminate),
-    ?line ok = status(n),
-    ?line [] = owners(n),
-    ?line 1 = users(n),
-    ?line ok = disk_log:close(n),
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line true = (P0 == pps()),    
+    Pid3 = spawn_link(?MODULE, lserv, [n]),
+    Pid4 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = sync_do(Pid3, {open, File, none}),
+    {ok, n} = sync_do(Pid4, {open, File, none}),
+    [] = sync_do(Pid3, owners),
+    [] = sync_do(Pid4, owners),
+    2 = sync_do(Pid3, users),
+    2 = sync_do(Pid4, users),
+    sync_do(Pid3, terminate),
+    [] = sync_do(Pid4, owners),
+    2 = sync_do(Pid4, users),
+    sync_do(Pid4, terminate),
+    disk_log:close(n),
+    disk_log:close(n),
+    {error, no_such_log} = disk_log:info(n),
+    true = (P0 == pps()),
+
+    %% Blocking owner terminates.
+    Pid5 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {linkto, none},{size, {100,No}},
+			     {format, external}]),
+    {ok, n} = sync_do(Pid5, {open, File}),
+    ok = sync_do(Pid5, block),
+    {blocked, true} = status(n),
+    [_] = owners(n),
+    sync_do(Pid5, terminate),
+    ok = status(n),
+    [] = owners(n),
+    1 = users(n),
+    ok = disk_log:close(n),
+    {error, no_such_log} = disk_log:info(n),
+    true = (P0 == pps()),
+
+    %% Blocking user terminates.
+    Pid6 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {size, {100,No}}, {format, external}]),
+    {ok, n} = sync_do(Pid6, {open, File, none}),
+    ok = sync_do(Pid6, block),
+    {blocked, true} = status(n),
+    [_] = owners(n),
+    1 = users(n),
+    sync_do(Pid6, terminate), % very silently...
+    ok = status(n),
+    [_] = owners(n),
+    1 = users(n),
+    ok = disk_log:close(n),
+    [] = owners(n),
+    1 = users(n),
+    ok = disk_log:close(n),
+    {error, no_such_log} = disk_log:info(n),
+    true = (P0 == pps()),
+
+    %% Blocking owner terminates.
+    Pid7 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {linkto, none},
+			     {size, {100,No}}, {format, external}]),
+    {ok, n} = sync_do(Pid7, {open, File}),
+    ok = sync_do(Pid7, block),
+    {blocked, true} = status(n),
+    [_] = owners(n),
+    1 = users(n),
+    sync_do(Pid7, terminate),
+    ok = status(n),
+    [] = owners(n),
+    1 = users(n),
+    ok = disk_log:close(n),
+    {error, no_such_log} = disk_log:info(n),
+    true = (P0 == pps()),
 
     %% Two owners, the blocking one terminates.
-    ?line Pid8 = spawn_link(?MODULE, lserv, [n]),
-    ?line Pid9 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = sync_do(Pid8, {open, File}),
-    ?line {ok, n} = sync_do(Pid9, {open, File}),
-    ?line ok = sync_do(Pid8, block),
-    ?line {blocked, true} = status(n),
-    ?line sync_do(Pid8, terminate),
-    ?line ok = status(n),
-    ?line [_] = sync_do(Pid9, owners),
-    ?line 0 = sync_do(Pid9, users),
-    ?line sync_do(Pid9, terminate),    
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line true = (P0 == pps()),    
-
-    % Blocking user closes.
-    ?line Pid10 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {size, {100,No}}, {format, external}]),
-    ?line {ok, n} = sync_do(Pid10, {open, File, none}),
-    ?line ok = sync_do(Pid10, block),
-    ?line {blocked, true} = status(n),
-    ?line [_] = owners(n),
-    ?line 1 = users(n),
-    ?line ok = sync_do(Pid10, close),
-    ?line ok = status(n),
-    ?line [_] = owners(n),
-    ?line 0 = users(n),
-    ?line ok = disk_log:close(n),
-    ?line sync_do(Pid10, terminate),
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line true = (P0 == pps()),    
-
-    % Blocking user unblocks and closes.
-    ?line Pid11 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {size, {100,No}}, {format, external}]),
-    ?line {ok, n} = sync_do(Pid11, {open, File, none}),
-    ?line ok = sync_do(Pid11, block),
-    ?line {blocked, true} = status(n),
-    ?line [_] = owners(n),
-    ?line 1 = users(n),
-    ?line ok = sync_do(Pid11, unblock),
-    ?line ok = sync_do(Pid11, close),
-    ?line ok = status(n),
-    ?line [_] = owners(n),
-    ?line 0 = users(n),
-    ?line ok = disk_log:close(n),
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line sync_do(Pid11, terminate),
-    ?line true = (P0 == pps()),    
-
-    % Blocking owner closes.
-    ?line Pid12 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {linkto, none},
-				   {size, {100,No}}, {format, external}]),
-    ?line {ok, n} = sync_do(Pid12, {open, File}),
-    ?line ok = sync_do(Pid12, block),
-    ?line {blocked, true} = status(n),
-    ?line [_] = owners(n),
-    ?line 1 = users(n),
-    ?line ok = sync_do(Pid12, close),
-    ?line ok = status(n),
-    ?line [] = owners(n),
-    ?line 1 = users(n),
-    ?line ok = disk_log:close(n),
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line sync_do(Pid12, terminate),
-    ?line true = (P0 == pps()),    
-
-    % Blocking owner unblocks and closes.
-    ?line Pid13 = spawn_link(?MODULE, lserv, [n]),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {linkto, none},
-				   {size, {100,No}}, {format, external}]),
-    ?line {ok, n} = sync_do(Pid13, {open, File}),
-    ?line ok = sync_do(Pid13, block),
-    ?line {blocked, true} = status(n),
-    ?line [_] = owners(n),
-    ?line 1 = users(n),
-    ?line ok = sync_do(Pid13, unblock),
-    ?line ok = sync_do(Pid13, close),
-    ?line ok = status(n),
-    ?line [] = owners(n),
-    ?line 1 = users(n),
-    ?line ok = disk_log:close(n),
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line sync_do(Pid13, terminate),
-    ?line true = (P0 == pps()),
+    Pid8 = spawn_link(?MODULE, lserv, [n]),
+    Pid9 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = sync_do(Pid8, {open, File}),
+    {ok, n} = sync_do(Pid9, {open, File}),
+    ok = sync_do(Pid8, block),
+    {blocked, true} = status(n),
+    sync_do(Pid8, terminate),
+    ok = status(n),
+    [_] = sync_do(Pid9, owners),
+    0 = sync_do(Pid9, users),
+    sync_do(Pid9, terminate),
+    {error, no_such_log} = disk_log:info(n),
+    true = (P0 == pps()),
+
+    %% Blocking user closes.
+    Pid10 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {size, {100,No}}, {format, external}]),
+    {ok, n} = sync_do(Pid10, {open, File, none}),
+    ok = sync_do(Pid10, block),
+    {blocked, true} = status(n),
+    [_] = owners(n),
+    1 = users(n),
+    ok = sync_do(Pid10, close),
+    ok = status(n),
+    [_] = owners(n),
+    0 = users(n),
+    ok = disk_log:close(n),
+    sync_do(Pid10, terminate),
+    {error, no_such_log} = disk_log:info(n),
+    true = (P0 == pps()),
+
+    %% Blocking user unblocks and closes.
+    Pid11 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {size, {100,No}}, {format, external}]),
+    {ok, n} = sync_do(Pid11, {open, File, none}),
+    ok = sync_do(Pid11, block),
+    {blocked, true} = status(n),
+    [_] = owners(n),
+    1 = users(n),
+    ok = sync_do(Pid11, unblock),
+    ok = sync_do(Pid11, close),
+    ok = status(n),
+    [_] = owners(n),
+    0 = users(n),
+    ok = disk_log:close(n),
+    {error, no_such_log} = disk_log:info(n),
+    sync_do(Pid11, terminate),
+    true = (P0 == pps()),
+
+    %% Blocking owner closes.
+    Pid12 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {linkto, none},
+			     {size, {100,No}}, {format, external}]),
+    {ok, n} = sync_do(Pid12, {open, File}),
+    ok = sync_do(Pid12, block),
+    {blocked, true} = status(n),
+    [_] = owners(n),
+    1 = users(n),
+    ok = sync_do(Pid12, close),
+    ok = status(n),
+    [] = owners(n),
+    1 = users(n),
+    ok = disk_log:close(n),
+    {error, no_such_log} = disk_log:info(n),
+    sync_do(Pid12, terminate),
+    true = (P0 == pps()),
+
+    %% Blocking owner unblocks and closes.
+    Pid13 = spawn_link(?MODULE, lserv, [n]),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {linkto, none},
+			     {size, {100,No}}, {format, external}]),
+    {ok, n} = sync_do(Pid13, {open, File}),
+    ok = sync_do(Pid13, block),
+    {blocked, true} = status(n),
+    [_] = owners(n),
+    1 = users(n),
+    ok = sync_do(Pid13, unblock),
+    ok = sync_do(Pid13, close),
+    ok = status(n),
+    [] = owners(n),
+    1 = users(n),
+    ok = disk_log:close(n),
+    {error, no_such_log} = disk_log:info(n),
+    sync_do(Pid13, terminate),
+    true = (P0 == pps()),
 
     del(File, No),	% cleanup
     ok.
 
-close_deadlock(suite) -> [];
-close_deadlock(doc) -> 
-    ["OTP-4745. Deadlock with just an ordinary log could happen."];
+%% OTP-4745. Deadlock with just an ordinary log could happen.
 close_deadlock(Conf) when is_list(Conf) ->
-    ?line true = is_alive(),
+    true = is_alive(),
 
-    ?line PrivDir = ?privdir(Conf),
+    PrivDir = ?privdir(Conf),
 
-    ?line F1 = filename:join(PrivDir, "a.LOG"),
-    ?line file:delete(F1),
+    F1 = filename:join(PrivDir, "a.LOG"),
+    file:delete(F1),
     Self = self(),
 
     %% One process opens the log at the same time as another process
@@ -2378,11 +2305,11 @@ close_deadlock(Conf) when is_list(Conf) ->
     Name = a,
     Fun = fun() -> open_close(Self, Name, F1) end,
     P = spawn(Fun),
-    ?line receive {P, Name} -> ok end,
-    ?line {ok, L} = disk_log:open([{name,Name},{file,F1}]),
-    ?line ok = disk_log:close(L),
-    ?line receive {P, done} -> ok end,    
-    ?line file:delete(F1),
+    receive {P, Name} -> ok end,
+    {ok, L} = disk_log:open([{name,Name},{file,F1}]),
+    ok = disk_log:close(L),
+    receive {P, done} -> ok end,
+    file:delete(F1),
 
     %% One process opens the log at the same time as another process
     %% closes the log due to file error while truncating.
@@ -2390,38 +2317,38 @@ close_deadlock(Conf) when is_list(Conf) ->
     %% "work". When it works, as it seems to do right now :), the
     %% disk_log_server gets {error, no_such_log}, receives the EXIT
     %% message caused by truncate, and tries to open the log again.
-    ?line No = 4,
-    ?line LDir = F1 ++ ".2",
-    ?line file:del_dir(LDir),
-    ?line del(F1, No),
-    ?line ok = file:make_dir(LDir),
+    No = 4,
+    LDir = F1 ++ ".2",
+    file:del_dir(LDir),
+    del(F1, No),
+    ok = file:make_dir(LDir),
     Fun2 = fun() -> open_truncate(Self, Name, F1, No) end,
     P2 = spawn(Fun2),
-    ?line receive {P2, Name} -> ok end,
-    ?line {ok, L} = disk_log:open([{name, Name}, {file, F1}, {type, wrap},
-				   {format, external}]),
+    receive {P2, Name} -> ok end,
+    {ok, L} = disk_log:open([{name, Name}, {file, F1}, {type, wrap},
+			     {format, external}]),
     %% Note: truncate causes the disk log process to terminate. One
     %% cannot say if open above happened before, after, or during the
     %% termination. The link to the owner is removed before termination.
-    ?line case disk_log:close(L) of
-              ok -> ok;
-              {error,no_such_log} -> 
-                  ok
-          end,
-    ?line receive {P2, done} -> ok end,
-    ?line del(F1, No),
-    ?line file:del_dir(LDir),
+    case disk_log:close(L) of
+	ok -> ok;
+	{error,no_such_log} ->
+	    ok
+    end,
+    receive {P2, done} -> ok end,
+    del(F1, No),
+    file:del_dir(LDir),
 
     %% To the same thing, this time using distributed logs.
     %% (Does not seem to work very well, unfortunately.)
     FunD = fun() -> open_close_dist(Self, Name, F1) end,
     PD = spawn(FunD),
     receive {PD, Name} -> ok end,
-    ?line {[_], []} = disk_log:open([{name,Name},{file,F1},
-                                     {distributed,[node()]}]),
-    ?line ok = disk_log:close(L),
+    {[_], []} = disk_log:open([{name,Name},{file,F1},
+			       {distributed,[node()]}]),
+    ok = disk_log:close(L),
     receive {PD, done} -> ok end,
-    ?line file:delete(F1),
+    file:delete(F1),
 
     ok.
 
@@ -2467,7 +2394,7 @@ sync_do(Pid, Req) ->
     end.
 
 lserv(Log) ->
-    ?line receive 
+    receive
 	{From, {open, File}} ->
 	    From ! disk_log:open([{name, Log}, {file, File}, {type, wrap},
 				  {size, {100,1}}, {format, external}]);
@@ -2534,664 +2461,652 @@ lserv(Log) ->
     lserv(Log).
 
 
-error_repair(suite) -> [];
-error_repair(doc) -> 
-    ["Error while repairing."];
+%% Error while repairing.
 error_repair(Conf) when is_list(Conf) ->
-    % not all error situations are covered by this test
+    %% not all error situations are covered by this test
 
     DataDir = ?datadir(Conf),
     PrivDir = ?privdir(Conf),
 
-    ?line File = filename:join(PrivDir, "n.LOG"),
-    ?line No = 4,
-    ?line file:delete(File),
-    ?line del(File, No),	% cleanup
+    File = filename:join(PrivDir, "n.LOG"),
+    No = 4,
+    file:delete(File),
+    del(File, No),	% cleanup
 
-    % kurt.LOG is not closed and has four logged items, one is recovered
-    ?line copy_wrap_log("kurt.LOG", "n.LOG", No, DataDir, PrivDir),
-    ?line {repaired,n,{recovered,1},{badbytes,0}} =
+    %% kurt.LOG is not closed and has four logged items, one is recovered
+    copy_wrap_log("kurt.LOG", "n.LOG", No, DataDir, PrivDir),
+    {repaired,n,{recovered,1},{badbytes,0}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap}, {size,{40,No}}]),
-    ?line 1 = cur_cnt(n),
-    ?line 53 = curb(n),
-    ?line 4 = no_items(n),
-    ?line ok = disk_log:close(n),
-    
-    % temporary repair file cannot be created
-    ?line copy_wrap_log("kurt.LOG", "n.LOG", No, DataDir, PrivDir),
-    ?line Dir = File ++ ".4" ++ ".TMP",
-    ?line ok = file:make_dir(Dir),
-    ?line P0 = pps(),
-    ?line {error, {file_error, _, _}} =
+    1 = cur_cnt(n),
+    53 = curb(n),
+    4 = no_items(n),
+    ok = disk_log:close(n),
+
+    %% temporary repair file cannot be created
+    copy_wrap_log("kurt.LOG", "n.LOG", No, DataDir, PrivDir),
+    Dir = File ++ ".4" ++ ".TMP",
+    ok = file:make_dir(Dir),
+    P0 = pps(),
+    {error, {file_error, _, _}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap}, {size,{40,4}}]),
-    ?line true = (P0 == pps()),
-    ?line del(File, No),
-    ?line ok = file:del_dir(Dir),
+    true = (P0 == pps()),
+    del(File, No),
+    ok = file:del_dir(Dir),
 
     %% repair a file
-    ?line P1 = pps(),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, internal}, {size, {40,No}}]),
-    ?line ok = disk_log:log_terms(n, [{this,is}]), % first file full
-    ?line ok = disk_log:log_terms(n, [{some,terms}]), % second file full
-    ?line ok = disk_log:close(n),
-    ?line BadFile = add_ext(File, 2), % current file
-    ?line set_opened(BadFile),
-    ?line crash(BadFile, 28), % the binary is now invalid
-    ?line {repaired,n,{recovered,0},{badbytes,26}} =
-	 disk_log:open([{name, n}, {file, File}, {type, wrap},
-			{format, internal}, {size, {40,No}}]),
-    ?line ok = disk_log:close(n),
-    ?line true = (P1 == pps()),
-    ?line del(File, No),
+    P1 = pps(),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, internal}, {size, {40,No}}]),
+    ok = disk_log:log_terms(n, [{this,is}]), % first file full
+    ok = disk_log:log_terms(n, [{some,terms}]), % second file full
+    ok = disk_log:close(n),
+    BadFile = add_ext(File, 2), % current file
+    set_opened(BadFile),
+    crash(BadFile, 28), % the binary is now invalid
+    {repaired,n,{recovered,0},{badbytes,26}} =
+	disk_log:open([{name, n}, {file, File}, {type, wrap},
+		       {format, internal}, {size, {40,No}}]),
+    ok = disk_log:close(n),
+    true = (P1 == pps()),
+    del(File, No),
 
     %% yet another repair
-    ?line P2 = pps(),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, internal}, {size, {4000,No}}]),
-    ?line ok = disk_log:log_terms(n, [{this,is},{some,terms}]),
-    ?line ok = disk_log:close(n),
-    ?line BadFile2 = add_ext(File, 1), % current file
-    ?line set_opened(BadFile2),
-    ?line crash(BadFile2, 51), % the second binary is now invalid
-    ?line {repaired,n,{recovered,1},{badbytes,26}} = 
+    P2 = pps(),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, internal}, {size, {4000,No}}]),
+    ok = disk_log:log_terms(n, [{this,is},{some,terms}]),
+    ok = disk_log:close(n),
+    BadFile2 = add_ext(File, 1), % current file
+    set_opened(BadFile2),
+    crash(BadFile2, 51), % the second binary is now invalid
+    {repaired,n,{recovered,1},{badbytes,26}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {format, internal}, {size, {4000,No}}]),
-    ?line ok = disk_log:close(n),
-    ?line true = (P2 == pps()),
-    ?line del(File, No),
+    ok = disk_log:close(n),
+    true = (P2 == pps()),
+    del(File, No),
 
     %% Repair, large term
-    ?line Big = term_to_binary(lists:duplicate(66000,$a)),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, internal}, {size, {40,No}}]),
-    ?line ok = disk_log:log_terms(n, [Big]),
-    ?line ok = disk_log:close(n),
-    ?line set_opened(add_ext(File, 1)),
-    ?line {repaired,n,{recovered,1},{badbytes,0}} = 
+    Big = term_to_binary(lists:duplicate(66000,$a)),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, internal}, {size, {40,No}}]),
+    ok = disk_log:log_terms(n, [Big]),
+    ok = disk_log:close(n),
+    set_opened(add_ext(File, 1)),
+    {repaired,n,{recovered,1},{badbytes,0}} =
 	disk_log:open([{name, n}, {file, File}, {type, wrap},
 		       {format, internal}, {size, {40,No}}]),
-    ?line {_, [Got]} = disk_log:chunk(n, start),
-    ?line ok = disk_log:close(n),
-    ?line Got = Big,
-    ?line del(File, No),
+    {_, [Got]} = disk_log:chunk(n, start),
+    ok = disk_log:close(n),
+    Got = Big,
+    del(File, No),
 
     %% A term a little smaller than a chunk, then big terms.
-    ?line BigSmall = mk_bytes(1024*64-8-12),
-    ?line file:delete(File),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}]),
-    ?line ok = disk_log:log_terms(n, [BigSmall, Big, Big]),
-    ?line ok = disk_log:close(n),    
-    ?line set_opened(File),
-    ?line FileSize = file_size(File),
-    ?line crash(File, FileSize-byte_size(Big)-4),
-    ?line Error1 = {error, {need_repair, _}} = 
+    BigSmall = mk_bytes(1024*64-8-12),
+    file:delete(File),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}]),
+    ok = disk_log:log_terms(n, [BigSmall, Big, Big]),
+    ok = disk_log:close(n),
+    set_opened(File),
+    FileSize = file_size(File),
+    crash(File, FileSize-byte_size(Big)-4),
+    Error1 = {error, {need_repair, _}} =
         disk_log:open([{name, n}, {file, File}, {repair, false},
                        {type, halt}, {format, internal}]),
-    ?line "The disk log" ++ _ = format_error(Error1),
-    ?line {repaired,n,{recovered,2},{badbytes,132013}} = 
+    "The disk log" ++ _ = format_error(Error1),
+    {repaired,n,{recovered,2},{badbytes,132013}} =
         disk_log:open([{name, n}, {file, File}, {repair, true},
                        {type, halt}, {format, internal}]),
-    ?line ok = disk_log:close(n),
-    ?line file:delete(File),
+    ok = disk_log:close(n),
+    file:delete(File),
 
     %% The header is recovered.
-    ?line {ok,n} =
+    {ok,n} =
 	disk_log:open([{name, n}, {file, File}, {type, halt},
 		       {format, internal},
 		       {head_func, {?MODULE, head_fun, [{ok,"head"}]}}]),
-    ?line ok = disk_log:log_terms(n, [list,'of',terms]),
-    ?line ["head",list,'of',terms] = get_all_terms(n),
-    ?line ok = disk_log:close(n),
-    ?line set_opened(File),
-    ?line crash(File, 30),
-    ?line {repaired,n,{recovered,3},{badbytes,16}} = 
+    ok = disk_log:log_terms(n, [list,'of',terms]),
+    ["head",list,'of',terms] = get_all_terms(n),
+    ok = disk_log:close(n),
+    set_opened(File),
+    crash(File, 30),
+    {repaired,n,{recovered,3},{badbytes,16}} =
         disk_log:open([{name, n}, {file, File}, {type, halt},
 		       {format, internal},{repair,true},
 		       {head_func, {?MODULE, head_fun, [{ok,"head"}]}}]),
-    ?line ["head",'of',terms] = get_all_terms(n),
-    ?line ok = disk_log:close(n),
+    ["head",'of',terms] = get_all_terms(n),
+    ok = disk_log:close(n),
 
     file:delete(File),
 
     ok.
-    
+
 set_opened(File) ->
     {ok, Fd} = file:open(File, [raw, binary, read, write]),
     ok = file:write(Fd, [?LOGMAGIC, ?OPENED]),
     ok = file:close(Fd).
 
-error_log(suite) -> [];
-error_log(doc) -> 
-    ["Error while repairing."];
+%% Error while repairing.
 error_log(Conf) when is_list(Conf) ->
-    ?line Dir = ?privdir(Conf),
-
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line No = 4,
-    ?line file:delete(File),
-    ?line del(File, No),	% cleanup
-    ?line LDir = File ++ ".2",
-
-    ?line Q = qlen(),
-    % dummy just to get all processes "above" disk_log going
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, external},{size, {100, No}}]),
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
-
-    % inc_wrap_file fails, the external log is not terminated
-    ?line P0 = pps(),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, external},{size, {100, No}}]),
-    ?line ok = file:make_dir(LDir),
-    ?line {error, {file_error, _, _}} = disk_log:inc_wrap_file(n),
-    ?line timer:sleep(500),
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
-
-    % inc_wrap_file fails, the internal log is not terminated, ./File.2/ exists
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, internal},{size, {100, No}}]),
-    ?line {error, {file_error, _, _}} = disk_log:inc_wrap_file(n),
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
-
-    % truncate fails, the log is terminated, ./File.2/ exists
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, external},{size, {100, No}}]),
-    ?line {error, {file_error, _, _}} = disk_log:truncate(n),
-    ?line true = (P0 == pps()),
-    ?line del(File, No),
+    Dir = ?privdir(Conf),
+
+    File = filename:join(Dir, "n.LOG"),
+    No = 4,
+    file:delete(File),
+    del(File, No),	% cleanup
+    LDir = File ++ ".2",
+
+    Q = qlen(),
+    %% dummy just to get all processes "above" disk_log going
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, external},{size, {100, No}}]),
+    ok = disk_log:close(n),
+    del(File, No),
+
+    %% inc_wrap_file fails, the external log is not terminated
+    P0 = pps(),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, external},{size, {100, No}}]),
+    ok = file:make_dir(LDir),
+    {error, {file_error, _, _}} = disk_log:inc_wrap_file(n),
+    timer:sleep(500),
+    ok = disk_log:close(n),
+    del(File, No),
+
+    %% inc_wrap_file fails, the internal log is not terminated, ./File.2/ exists
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, internal},{size, {100, No}}]),
+    {error, {file_error, _, _}} = disk_log:inc_wrap_file(n),
+    ok = disk_log:close(n),
+    del(File, No),
+
+    %% truncate fails, the log is terminated, ./File.2/ exists
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, external},{size, {100, No}}]),
+    {error, {file_error, _, _}} = disk_log:truncate(n),
+    true = (P0 == pps()),
+    del(File, No),
 
     %% OTP-4880.
-    % reopen (rename) fails, the log is terminated, ./File.2/ exists
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, external},{size, 100000}]),
-    ?line {error, {file_error, _, eisdir}} = disk_log:reopen(n, LDir),
-    ?line true = (P0 == pps()),
-    ?line file:delete(File),
+    %% reopen (rename) fails, the log is terminated, ./File.2/ exists
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, external},{size, 100000}]),
+    {error, {file_error, _, eisdir}} = disk_log:reopen(n, LDir),
+    true = (P0 == pps()),
+    file:delete(File),
 
-    ?line B = mk_bytes(60),
+    B = mk_bytes(60),
 
     %% OTP-4880. reopen a wrap log, rename fails
-    ?line File2 = filename:join(Dir, "n.LOG2"),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File2}, {type, wrap},
-				   {format, external},{size, {100, No}}]),
-    ?line ok = disk_log:blog_terms(n, [B,B,B]),
-    ?line {error, {file_error, _, eisdir}} = disk_log:reopen(n, File),
-    ?line {error, no_such_log} = disk_log:close(n),
-    ?line del(File2, No),
-    ?line del(File, No),
-
-    % log, external wrap log, ./File.2/ exists
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, external},{size, {100, No}}]),
-    ?line {error, {file_error, _, _}} = disk_log:blog_terms(n, [B,B,B]),
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
-
-    % log, internal wrap log, ./File.2/ exists
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, internal},{size, {100, No}}]),
-    ?line {error, {file_error, _, _}} = disk_log:log_terms(n, [B,B,B]),
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
-
-    ?line ok = file:del_dir(LDir),
-
-    % can't remove file when changing size
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, internal},{size, {100, No}}]),
-    ?line ok = disk_log:log_terms(n, [B,B,B,B]),
-    ?line ok = disk_log:change_size(n, {100, No-2}),
-    ?line Three = File ++ ".3",
-    ?line ok = file:delete(Three),
-    ?line ok = file:make_dir(Three),
-    ?line {error, {file_error, _, _}} = disk_log:log_terms(n, [B,B,B]),
-    ?line timer:sleep(500),
-    ?line ok = disk_log:close(n),
-    ?line ok = file:del_dir(Three),
-    ?line del(File, No),
-    ?line Q = qlen(),
+    File2 = filename:join(Dir, "n.LOG2"),
+    {ok, n} = disk_log:open([{name, n}, {file, File2}, {type, wrap},
+			     {format, external},{size, {100, No}}]),
+    ok = disk_log:blog_terms(n, [B,B,B]),
+    {error, {file_error, _, eisdir}} = disk_log:reopen(n, File),
+    {error, no_such_log} = disk_log:close(n),
+    del(File2, No),
+    del(File, No),
+
+    %% log, external wrap log, ./File.2/ exists
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, external},{size, {100, No}}]),
+    {error, {file_error, _, _}} = disk_log:blog_terms(n, [B,B,B]),
+    ok = disk_log:close(n),
+    del(File, No),
+
+    %% log, internal wrap log, ./File.2/ exists
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, internal},{size, {100, No}}]),
+    {error, {file_error, _, _}} = disk_log:log_terms(n, [B,B,B]),
+    ok = disk_log:close(n),
+    del(File, No),
+
+    ok = file:del_dir(LDir),
+
+    %% can't remove file when changing size
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, internal},{size, {100, No}}]),
+    ok = disk_log:log_terms(n, [B,B,B,B]),
+    ok = disk_log:change_size(n, {100, No-2}),
+    Three = File ++ ".3",
+    ok = file:delete(Three),
+    ok = file:make_dir(Three),
+    {error, {file_error, _, _}} = disk_log:log_terms(n, [B,B,B]),
+    timer:sleep(500),
+    ok = disk_log:close(n),
+    ok = file:del_dir(Three),
+    del(File, No),
+    Q = qlen(),
     ok.
-    
-chunk(suite) -> [];
-chunk(doc) -> 
-    ["Test chunk and chunk_step."];
+
+%% Test chunk and chunk_step.
 chunk(Conf) when is_list(Conf) ->
     %% See also halt_ro_crash/1 above.
 
     Dir = ?privdir(Conf),
-    ?line File = filename:join(Dir, "n.LOG"),
+    File = filename:join(Dir, "n.LOG"),
     No = 4,
-    ?line B = mk_bytes(60),
-    ?line BB = mk_bytes(64000), % 64 kB chunks
-    ?line del(File, No),% cleanup
+    B = mk_bytes(60),
+    BB = mk_bytes(64000), % 64 kB chunks
+    del(File, No),% cleanup
 
     %% Make sure chunk_step skips the rest of the binary.
     %% OTP-3716. This was a bug...
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, internal}, {size, {50,No}}]),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, internal}, {size, {50,No}}]),
     %% 1, 2 and 3 on file one, 4 on file two.
-    ?line ok = disk_log:log_terms(n, [1,2,3,4]),
-    ?line {I1, [1]} = disk_log:chunk(n, start, 1),
-    ?line [{node,Node}] = disk_log:chunk_info(I1),
-    ?line Node = node(),
-    ?line Error1 = {error, {no_continuation, foobar}} = 
+    ok = disk_log:log_terms(n, [1,2,3,4]),
+    {I1, [1]} = disk_log:chunk(n, start, 1),
+    [{node,Node}] = disk_log:chunk_info(I1),
+    Node = node(),
+    Error1 = {error, {no_continuation, foobar}} =
         disk_log:chunk_info(foobar),
-    ?line "The term" ++ _ = format_error(Error1),
-    ?line {ok, I2} = disk_log:chunk_step(n, I1, 1),
-    ?line {error, {badarg, continuation}} = disk_log:chunk_step(n, foobar, 1),
-    ?line {I3, [4]} = disk_log:chunk(n, I2, 1),
-    ?line {ok, I4} = disk_log:chunk_step(n, I3, -1),
-    ?line {_, [1]} = disk_log:chunk(n, I4, 1),
-    ?line {error, {badarg, continuation}} = disk_log:bchunk(n, 'begin'),
-    ?line {Ib1, [Bin1,Bin2]} = disk_log:bchunk(n, start, 2),
-    ?line 1 = binary_to_term(Bin1),
-    ?line 2 = binary_to_term(Bin2),
-    ?line {ok, Ib2} = disk_log:chunk_step(n, Ib1, 1),
-    ?line {Ib3, [Bin3]} = disk_log:bchunk(n, Ib2, 1),
-    ?line 4 = binary_to_term(Bin3),
-    ?line {ok, Ib4} = disk_log:chunk_step(n, Ib3, -1),
-    ?line {_, [Bin4]} = disk_log:bchunk(n, Ib4, 1),
-    ?line 1 = binary_to_term(Bin4),
-    ?line {Ib5, [Bin1, Bin2, Bin17]} = disk_log:bchunk(n, start),
-    ?line 3 = binary_to_term(Bin17),
-    ?line {Ib6, [Bin3]} = disk_log:bchunk(n, Ib5, infinity),
-    ?line eof = disk_log:bchunk(n, Ib6, infinity),
-    ?line ok = disk_log:close(n),
-    ?line del(File, No), % cleanup
+    "The term" ++ _ = format_error(Error1),
+    {ok, I2} = disk_log:chunk_step(n, I1, 1),
+    {error, {badarg, continuation}} = disk_log:chunk_step(n, foobar, 1),
+    {I3, [4]} = disk_log:chunk(n, I2, 1),
+    {ok, I4} = disk_log:chunk_step(n, I3, -1),
+    {_, [1]} = disk_log:chunk(n, I4, 1),
+    {error, {badarg, continuation}} = disk_log:bchunk(n, 'begin'),
+    {Ib1, [Bin1,Bin2]} = disk_log:bchunk(n, start, 2),
+    1 = binary_to_term(Bin1),
+    2 = binary_to_term(Bin2),
+    {ok, Ib2} = disk_log:chunk_step(n, Ib1, 1),
+    {Ib3, [Bin3]} = disk_log:bchunk(n, Ib2, 1),
+    4 = binary_to_term(Bin3),
+    {ok, Ib4} = disk_log:chunk_step(n, Ib3, -1),
+    {_, [Bin4]} = disk_log:bchunk(n, Ib4, 1),
+    1 = binary_to_term(Bin4),
+    {Ib5, [Bin1, Bin2, Bin17]} = disk_log:bchunk(n, start),
+    3 = binary_to_term(Bin17),
+    {Ib6, [Bin3]} = disk_log:bchunk(n, Ib5, infinity),
+    eof = disk_log:bchunk(n, Ib6, infinity),
+    ok = disk_log:close(n),
+    del(File, No), % cleanup
 
     %% external log, cannot read chunks
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, external}, {size, {100,No}}]),
-    ?line {error, {badarg, continuation}} = disk_log:chunk(n, 'begin'),
-    ?line {error, {format_external, n}} = disk_log:chunk(n, start),
-    ?line Error2 = {error, {not_internal_wrap, n}} = 
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, external}, {size, {100,No}}]),
+    {error, {badarg, continuation}} = disk_log:chunk(n, 'begin'),
+    {error, {format_external, n}} = disk_log:chunk(n, start),
+    Error2 = {error, {not_internal_wrap, n}} =
         disk_log:chunk_step(n, start, 1),
-    ?line "The requested" ++ _ = format_error(Error2),
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
+    "The requested" ++ _ = format_error(Error2),
+    ok = disk_log:close(n),
+    del(File, No),
 
     %% wrap, read_write
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, internal}, {size, {100,No}}]),
-    ?line ok = disk_log:log_terms(n, [B,B,B,B]),
-    ?line {C1, [_]} = disk_log:chunk(n, start),
-    ?line {C2, [_]} = disk_log:chunk(n, C1),
-    ?line {C3, [_]} = disk_log:chunk(n, C2),
-    ?line {C4, [_]} = disk_log:chunk(n, C3, 1),
-    ?line eof = disk_log:chunk(n, C4),
-    ?line {C5, [_]} = disk_log:chunk(n, start),
-    ?line {ok, C6} = disk_log:chunk_step(n, C5, 1),
-    ?line {C7, [_]} = disk_log:chunk(n, C6),
-    ?line {ok, C8} = disk_log:chunk_step(n, C7, 1),
-    ?line {_, [_]} = disk_log:chunk(n, C8),
-    ?line ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, internal}, {size, {100,No}}]),
+    ok = disk_log:log_terms(n, [B,B,B,B]),
+    {C1, [_]} = disk_log:chunk(n, start),
+    {C2, [_]} = disk_log:chunk(n, C1),
+    {C3, [_]} = disk_log:chunk(n, C2),
+    {C4, [_]} = disk_log:chunk(n, C3, 1),
+    eof = disk_log:chunk(n, C4),
+    {C5, [_]} = disk_log:chunk(n, start),
+    {ok, C6} = disk_log:chunk_step(n, C5, 1),
+    {C7, [_]} = disk_log:chunk(n, C6),
+    {ok, C8} = disk_log:chunk_step(n, C7, 1),
+    {_, [_]} = disk_log:chunk(n, C8),
+    ok = disk_log:close(n),
 
     %% wrap, read_only
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {mode, read_only},
-				   {format, internal}, {size, {100,No}}]),
-    ?line {CC1, [_]} = disk_log:chunk(n, start),
-    ?line {CC2, [_]} = disk_log:chunk(n, CC1),
-    ?line {CC3, [_]} = disk_log:chunk(n, CC2),
-    ?line {CC4, [_]} = disk_log:chunk(n, CC3, 1),
-    ?line eof = disk_log:chunk(n, CC4),
-    ?line {CC5, [_]} = disk_log:chunk(n, start),
-    ?line {ok, CC6} = disk_log:chunk_step(n, CC5, 1),
-    ?line {CC7, [_]} = disk_log:chunk(n, CC6),
-    ?line {ok, CC8} = disk_log:chunk_step(n, CC7, 1),
-    ?line {_, [_]} = disk_log:chunk(n, CC8),
-    ?line ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {mode, read_only},
+			     {format, internal}, {size, {100,No}}]),
+    {CC1, [_]} = disk_log:chunk(n, start),
+    {CC2, [_]} = disk_log:chunk(n, CC1),
+    {CC3, [_]} = disk_log:chunk(n, CC2),
+    {CC4, [_]} = disk_log:chunk(n, CC3, 1),
+    eof = disk_log:chunk(n, CC4),
+    {CC5, [_]} = disk_log:chunk(n, start),
+    {ok, CC6} = disk_log:chunk_step(n, CC5, 1),
+    {CC7, [_]} = disk_log:chunk(n, CC6),
+    {ok, CC8} = disk_log:chunk_step(n, CC7, 1),
+    {_, [_]} = disk_log:chunk(n, CC8),
+    ok = disk_log:close(n),
 
     %% OTP-3716. A bug: {Error, List} and {Error, List, Bad} could be
     %% returned from chunk/2.
     %% Magic bytes not OK.
     %% File header (8 bytes) OK, item header not OK.
-    ?line InvalidFile = add_ext(File, 1),
-    ?line crash(InvalidFile, 15),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {mode, read_only},
-				   {format, internal}, {size, {100,No}}]),
-    ?line {_, [], 61} = disk_log:chunk(n, start),
-    ?line ok = disk_log:close(n),
+    InvalidFile = add_ext(File, 1),
+    crash(InvalidFile, 15),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {mode, read_only},
+			     {format, internal}, {size, {100,No}}]),
+    {_, [], 61} = disk_log:chunk(n, start),
+    ok = disk_log:close(n),
     %% read_write...
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, internal}, {size, {100,No}}]),
-    ?line Error3 = {error, {corrupt_log_file, Culprit}} = 
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, internal}, {size, {100,No}}]),
+    Error3 = {error, {corrupt_log_file, Culprit}} =
         disk_log:chunk(n, start),
-    ?line "The disk log file" ++ _ = format_error(Error3),
-    ?line Culprit = InvalidFile,
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
+    "The disk log file" ++ _ = format_error(Error3),
+    Culprit = InvalidFile,
+    ok = disk_log:close(n),
+    del(File, No),
 
     %% Two wrap log files, writing the second one, then reading the first
     %% one, where a bogus term resides.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, internal}, {size, {40,No}}]),
-    ?line ok = disk_log:log_terms(n, [{this,is}]), % first file full
-    ?line ok = disk_log:log_terms(n, [{some,terms}]), % second file full
-    ?line 2 = curf(n),
-    ?line BadFile = add_ext(File, 1),
-    ?line crash(BadFile, 28), % the _binary_ is now invalid
-    ?line {error, {corrupt_log_file, BFile}} = disk_log:chunk(n, start, 1),
-    ?line BadFile = BFile,
-    ?line ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, internal}, {size, {40,No}}]),
+    ok = disk_log:log_terms(n, [{this,is}]), % first file full
+    ok = disk_log:log_terms(n, [{some,terms}]), % second file full
+    2 = curf(n),
+    BadFile = add_ext(File, 1),
+    crash(BadFile, 28), % the _binary_ is now invalid
+    {error, {corrupt_log_file, BFile}} = disk_log:chunk(n, start, 1),
+    BadFile = BFile,
+    ok = disk_log:close(n),
     %% The same, with a halt log.
-    ?line file:delete(File), % cleanup
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}]),
-    ?line ok = disk_log:log_terms(n, [{this,is}]),
-    ?line ok = disk_log:sync(n),
-    ?line crash(File, 28), % the _binary_ is now invalid
-    ?line {error, {corrupt_log_file, File2}} = disk_log:chunk(n, start, 1),
-    ?line crash(File, 10),
-    ?line {error,{corrupt_log_file,_}} = disk_log:bchunk(n, start, 1),
-    ?line true = File == File2,
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
+    file:delete(File), % cleanup
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}]),
+    ok = disk_log:log_terms(n, [{this,is}]),
+    ok = disk_log:sync(n),
+    crash(File, 28), % the _binary_ is now invalid
+    {error, {corrupt_log_file, File2}} = disk_log:chunk(n, start, 1),
+    crash(File, 10),
+    {error,{corrupt_log_file,_}} = disk_log:bchunk(n, start, 1),
+    true = File == File2,
+    ok = disk_log:close(n),
+    del(File, No),
 
     %% halt, read_write
-    ?line file:delete(File), % cleanup
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}]),
-    ?line ok = disk_log:log_terms(n, [BB,BB,BB,BB]),
-    ?line {D1, [Ch1]} = disk_log:chunk(n, start, 1),
-    ?line Ch1 = BB,
-    ?line {D2, [Ch2]} = disk_log:chunk(n, D1, 1),
-    ?line Ch2 = BB,
-    ?line {D3, [Ch3]} = disk_log:chunk(n, D2, 1),
-    ?line Ch3 = BB,
-    ?line {D4, [Ch4]} = disk_log:chunk(n, D3, 1),
-    ?line Ch4 = BB,
-    ?line eof = disk_log:chunk(n, D4),
-    ?line ok = disk_log:close(n),
+    file:delete(File), % cleanup
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}]),
+    ok = disk_log:log_terms(n, [BB,BB,BB,BB]),
+    {D1, [Ch1]} = disk_log:chunk(n, start, 1),
+    Ch1 = BB,
+    {D2, [Ch2]} = disk_log:chunk(n, D1, 1),
+    Ch2 = BB,
+    {D3, [Ch3]} = disk_log:chunk(n, D2, 1),
+    Ch3 = BB,
+    {D4, [Ch4]} = disk_log:chunk(n, D3, 1),
+    Ch4 = BB,
+    eof = disk_log:chunk(n, D4),
+    ok = disk_log:close(n),
 
     %% halt, read_only
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal},{mode,read_only}]),
-    ?line {E1, [Ch5]} = disk_log:chunk(n, start, 1),
-    ?line Ch5 = BB,
-    ?line {E2, [Ch6]} = disk_log:chunk(n, E1, 1),
-    ?line Ch6 = BB,
-    ?line {E3, [Ch7]} = disk_log:chunk(n, E2, 1),
-    ?line Ch7 = BB,
-    ?line {E4, [Ch8]} = disk_log:chunk(n, E3, 1),
-    ?line Ch8 = BB,
-    ?line eof = disk_log:chunk(n, E4),
-    ?line ok = disk_log:close(n),
-    ?line file:delete(File), % cleanup
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal},{mode,read_only}]),
+    {E1, [Ch5]} = disk_log:chunk(n, start, 1),
+    Ch5 = BB,
+    {E2, [Ch6]} = disk_log:chunk(n, E1, 1),
+    Ch6 = BB,
+    {E3, [Ch7]} = disk_log:chunk(n, E2, 1),
+    Ch7 = BB,
+    {E4, [Ch8]} = disk_log:chunk(n, E3, 1),
+    Ch8 = BB,
+    eof = disk_log:chunk(n, E4),
+    ok = disk_log:close(n),
+    file:delete(File), % cleanup
 
     %% More than 64 kB term.
-    ?line BBB = term_to_binary(lists:duplicate(66000,$a)),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}]),
-    ?line ok = disk_log:log_terms(n, [BBB]),
-    ?line {F1, [BBB1]} = disk_log:chunk(n, start),
-    ?line BBB1 = BBB,
-    ?line eof = disk_log:chunk(n, F1),
-    ?line ok = disk_log:close(n),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}, {mode, read_only}]),
-    ?line {F1r, [BBB2]} = disk_log:chunk(n, start),
-    ?line BBB2 = BBB,
-    ?line eof = disk_log:chunk(n, F1r),
-    ?line ok = disk_log:close(n),
-
-    ?line truncate(File, 8192),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}]),
-    ?line {error, {corrupt_log_file, _}} = disk_log:chunk(n, start),
-    ?line ok = disk_log:close(n),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}, {mode, read_only}]),
-    ?line {K1, [], 8176} = disk_log:chunk(n, start),
-    ?line eof = disk_log:chunk(n, K1),
-    ?line ok = disk_log:close(n),
-    ?line file:delete(File), % cleanup
+    BBB = term_to_binary(lists:duplicate(66000,$a)),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}]),
+    ok = disk_log:log_terms(n, [BBB]),
+    {F1, [BBB1]} = disk_log:chunk(n, start),
+    BBB1 = BBB,
+    eof = disk_log:chunk(n, F1),
+    ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}, {mode, read_only}]),
+    {F1r, [BBB2]} = disk_log:chunk(n, start),
+    BBB2 = BBB,
+    eof = disk_log:chunk(n, F1r),
+    ok = disk_log:close(n),
+
+    truncate(File, 8192),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}]),
+    {error, {corrupt_log_file, _}} = disk_log:chunk(n, start),
+    ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}, {mode, read_only}]),
+    {K1, [], 8176} = disk_log:chunk(n, start),
+    eof = disk_log:chunk(n, K1),
+    ok = disk_log:close(n),
+    file:delete(File), % cleanup
 
     %% OTP-3716. A bug: eof in the middle of the last element is not ok.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}]),
-    ?line ok = disk_log:log_terms(n, [B,BB]),
-    ?line ok = disk_log:close(n),
-    ?line truncate(File, 80),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}]),
-    ?line {G1, [_]} = disk_log:chunk(n, start, 1),
-    ?line {error, {corrupt_log_file, _}} = disk_log:chunk(n, G1, 1),
-    ?line ok = disk_log:close(n),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}, {mode, read_only}]),
-    ?line {G1r, [_]} = disk_log:chunk(n, start, 1),
-    ?line {_, [], 4} = disk_log:chunk(n, G1r, 1),
-    ?line ok = disk_log:close(n),
-    ?line file:delete(File), % cleanup
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}]),
+    ok = disk_log:log_terms(n, [B,BB]),
+    ok = disk_log:close(n),
+    truncate(File, 80),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}]),
+    {G1, [_]} = disk_log:chunk(n, start, 1),
+    {error, {corrupt_log_file, _}} = disk_log:chunk(n, G1, 1),
+    ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}, {mode, read_only}]),
+    {G1r, [_]} = disk_log:chunk(n, start, 1),
+    {_, [], 4} = disk_log:chunk(n, G1r, 1),
+    ok = disk_log:close(n),
+    file:delete(File), % cleanup
 
     %% Opening a wrap log read-only. The second of four terms is destroyed.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, internal}, {size, {4000,No}}]),
-    ?line ok = disk_log:log_terms(n, 
-				  [{this,is},{some,terms},{on,a},{wrap,file}]),
-    ?line ok = disk_log:close(n),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, internal}, {mode, read_only}]),
-    ?line CrashFile = add_ext(File, 1),
-    ?line crash(CrashFile, 51), % the binary term {some,terms} is now bad
-    ?line {H1, [{this,is}], 18} = disk_log:chunk(n, start, 10),
-    ?line {H2, [{on,a},{wrap,file}]} = disk_log:chunk(n, H1),
-    ?line eof = disk_log:chunk(n, H2),
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, internal}, {size, {4000,No}}]),
+    ok = disk_log:log_terms(n,
+			    [{this,is},{some,terms},{on,a},{wrap,file}]),
+    ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, internal}, {mode, read_only}]),
+    CrashFile = add_ext(File, 1),
+    crash(CrashFile, 51), % the binary term {some,terms} is now bad
+    {H1, [{this,is}], 18} = disk_log:chunk(n, start, 10),
+    {H2, [{on,a},{wrap,file}]} = disk_log:chunk(n, H1),
+    eof = disk_log:chunk(n, H2),
+    ok = disk_log:close(n),
+    del(File, No),
 
     %% The same as last, but with a halt log.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}, {mode, read_write}]),
-    ?line ok = disk_log:alog_terms(n, [{this,is},{some,terms}]),
-    ?line ok = disk_log:log_terms(n, [{on,a},{halt,file}]),
-    ?line ok = disk_log:close(n),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}, {mode, read_only}]),
-    ?line crash(File, 51), % the binary term {some,terms} is now bad
-    ?line {J1, [{this,is}], 18} = disk_log:chunk(n, start, 10),
-    ?line {J2, [{on,a},{halt,file}]} = disk_log:chunk(n, J1),
-    ?line eof = disk_log:chunk(n, J2),
-    ?line ok = disk_log:close(n),
-    ?line file:delete(File),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}, {mode, read_write}]),
+    ok = disk_log:alog_terms(n, [{this,is},{some,terms}]),
+    ok = disk_log:log_terms(n, [{on,a},{halt,file}]),
+    ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}, {mode, read_only}]),
+    crash(File, 51), % the binary term {some,terms} is now bad
+    {J1, [{this,is}], 18} = disk_log:chunk(n, start, 10),
+    {J2, [{on,a},{halt,file}]} = disk_log:chunk(n, J1),
+    eof = disk_log:chunk(n, J2),
+    ok = disk_log:close(n),
+    file:delete(File),
 
     %% OTP-7641. Same as last one, but the size of the bad term is
     %% less than ?HEADERSz (8) bytes.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}, {mode, read_write}]),
-    ?line ok = disk_log:alog_terms(n, [{this,is},{s}]),
-    ?line ok = disk_log:log_terms(n, [{on,a},{halt,file}]),
-    ?line ok = disk_log:close(n),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}, {mode, read_only}]),
-    ?line crash(File, 44), % the binary term {s} is now bad
-    ?line {J11, [{this,is}], 7} = disk_log:chunk(n, start, 10),
-    ?line {J21, [{on,a},{halt,file}]} = disk_log:chunk(n, J11),
-    ?line eof = disk_log:chunk(n, J21),
-    ?line ok = disk_log:close(n),
-    ?line file:delete(File),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}, {mode, read_write}]),
+    ok = disk_log:alog_terms(n, [{this,is},{s}]),
+    ok = disk_log:log_terms(n, [{on,a},{halt,file}]),
+    ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}, {mode, read_only}]),
+    crash(File, 44), % the binary term {s} is now bad
+    {J11, [{this,is}], 7} = disk_log:chunk(n, start, 10),
+    {J21, [{on,a},{halt,file}]} = disk_log:chunk(n, J11),
+    eof = disk_log:chunk(n, J21),
+    ok = disk_log:close(n),
+    file:delete(File),
 
     %% Minimal MD5-proctected term, and maximal unprotected term.
     %% A chunk ends in the middle of the MD5-sum.
-    ?line MD5term = mk_bytes(64*1024-8),
-    ?line NotMD5term = mk_bytes((64*1024-8)-1),
-    ?line Term2 = mk_bytes((64*1024-8)-16),
-    ?line MD5L = [MD5term,NotMD5term,Term2,MD5term,MD5term,NotMD5term],
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}]),
-    ?line ok = disk_log:log_terms(n, MD5L),
-    ?line true = MD5L == get_all_terms(n),
-    ?line ok = disk_log:close(n),
-    ?line true = MD5L == get_all_terms(n, File, halt),
-    ?line crash(File, 21), % the MD5-sum of the first term is now bad
-    ?line true = {tl(MD5L),64*1024-8} == get_all_terms_and_bad(n, File, halt),
-    ?line {_,64*1024-8} = get_all_binary_terms_and_bad(n, File, halt),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
-				   {format, internal}]),
-    ?line {error, {corrupt_log_file, _}} = disk_log:chunk(n, start),
-    ?line ok = disk_log:close(n),
-    ?line file:delete(File),
+    MD5term = mk_bytes(64*1024-8),
+    NotMD5term = mk_bytes((64*1024-8)-1),
+    Term2 = mk_bytes((64*1024-8)-16),
+    MD5L = [MD5term,NotMD5term,Term2,MD5term,MD5term,NotMD5term],
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}]),
+    ok = disk_log:log_terms(n, MD5L),
+    true = MD5L == get_all_terms(n),
+    ok = disk_log:close(n),
+    true = MD5L == get_all_terms(n, File, halt),
+    crash(File, 21), % the MD5-sum of the first term is now bad
+    true = {tl(MD5L),64*1024-8} == get_all_terms_and_bad(n, File, halt),
+    {_,64*1024-8} = get_all_binary_terms_and_bad(n, File, halt),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+			     {format, internal}]),
+    {error, {corrupt_log_file, _}} = disk_log:chunk(n, start),
+    ok = disk_log:close(n),
+    file:delete(File),
 
     %% A file with "old" terms (magic word is MAGICINT).
     DataDir = ?datadir(Conf),
     OldTermsFileOrig = filename:join(DataDir, "old_terms.LOG"),
     OldTermsFile = filename:join(Dir, "old_terms.LOG"),
-    ?line copy_file(OldTermsFileOrig, OldTermsFile),
-    ?line {[_,_,_,_],0} = get_all_terms_and_bad(n, OldTermsFile, halt),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, OldTermsFile}, 
-                                   {type, halt}, {format, internal}]),
-    ?line [_,_,_,_] = get_all_terms(n),
-    ?line ok = disk_log:close(n),
-    ?line file:delete(OldTermsFile),
+    copy_file(OldTermsFileOrig, OldTermsFile),
+    {[_,_,_,_],0} = get_all_terms_and_bad(n, OldTermsFile, halt),
+    {ok, n} = disk_log:open([{name, n}, {file, OldTermsFile},
+			     {type, halt}, {format, internal}]),
+    [_,_,_,_] = get_all_terms(n),
+    ok = disk_log:close(n),
+    file:delete(OldTermsFile),
 
     ok.
 
-error_index(suite) -> [];
-error_index(doc) -> 
-    ["OTP-5558. Keep the contents of index files after disk crash."];
+%% OTP-5558. Keep the contents of index files after disk crash.
 error_index(Conf) when is_list(Conf) ->
-    ?line Dir = ?privdir(Conf),
+    Dir = ?privdir(Conf),
 
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line IdxFile = File ++ ".idx",
-    ?line No = 4,
-    ?line file:delete(File),
-    ?line del(File, No),	% cleanup
+    File = filename:join(Dir, "n.LOG"),
+    IdxFile = File ++ ".idx",
+    No = 4,
+    file:delete(File),
+    del(File, No),	% cleanup
 
     Args = [{name,n},{type,wrap},{size,{100,No}},{file,File}],
-    ?line {ok, n} = disk_log:open(Args),
-    ?line ok = disk_log:close(n),
-    ?line Q = qlen(),
+    {ok, n} = disk_log:open(Args),
+    ok = disk_log:close(n),
+    Q = qlen(),
     P0 = pps(),
-    ?line ok = file:write_file(IdxFile, <<"abc">>),
-    ?line {error, {invalid_index_file, _}} = disk_log:open(Args),
-    ?line {error, {invalid_index_file, _}} = disk_log:open(Args),
-    ?line {error, {invalid_index_file, _}} = disk_log:open(Args),
-
-    ?line del(File, No),
-    ?line true = (P0 == pps()),
-    ?line true = (Q == qlen()),
+    ok = file:write_file(IdxFile, <<"abc">>),
+    {error, {invalid_index_file, _}} = disk_log:open(Args),
+    {error, {invalid_index_file, _}} = disk_log:open(Args),
+    {error, {invalid_index_file, _}} = disk_log:open(Args),
+
+    del(File, No),
+    true = (P0 == pps()),
+    true = (Q == qlen()),
     ok.
-    
-truncate(suite) -> [];
-truncate(doc) -> 
-    ["Test truncate/1 on halt and wrap logs."];
+
+%% Test truncate/1 on halt and wrap logs.
 truncate(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
 
-    ?line Q = qlen(),
+    Q = qlen(),
     Halt = join(Dir, "halt.LOG"),
-    % Halt logs.
-
-    ?line file:delete(Halt), % cleanup
-    ?line {ok, halt} = disk_log:open([{name, halt}, {type, halt}, {file, Halt},
-				      {head, header}, {notify, true}]),
-    ?line infinity = sz(halt),
-    ?line ok = disk_log:truncate(halt, tjohej),
-    ?line rec(1, {disk_log, node(), halt, {truncated, 1}}),
-    ?line ok = disk_log:change_size(halt, 10000),
-    ?line 10000 = sz(halt),
-    ?line disk_log:close(halt),
-    ?line [tjohej] = get_all_terms(halt, Halt, halt),
-    ?line file:delete(Halt),
-
-    ?line {ok, halt} = disk_log:open([{name, halt}, {type, halt}, {file, Halt},
-				      {head, header}, {notify, true}]),
-    ?line ok = disk_log:truncate(halt),
-    ?line rec(1, {disk_log, node(), halt, {truncated, 1}}),
-    ?line disk_log:close(halt),
-    ?line [header] = get_all_terms(halt, Halt, halt),
-    ?line file:delete(Halt),
-    
-    ?line {ok, halt} = disk_log:open([{name, halt}, {type, halt}, 
-                                      {file, Halt}, {format, external},
-				      {head, "header"}, {notify, false}]),
-    ?line ok = disk_log:btruncate(halt, "apa"),
-    ?line disk_log:close(halt),
-    ?line 3 = file_size(Halt),
-    ?line file:delete(Halt),
-    
+    %% Halt logs.
+
+    file:delete(Halt), % cleanup
+    {ok, halt} = disk_log:open([{name, halt}, {type, halt}, {file, Halt},
+				{head, header}, {notify, true}]),
+    infinity = sz(halt),
+    ok = disk_log:truncate(halt, tjohej),
+    rec(1, {disk_log, node(), halt, {truncated, 1}}),
+    ok = disk_log:change_size(halt, 10000),
+    10000 = sz(halt),
+    disk_log:close(halt),
+    [tjohej] = get_all_terms(halt, Halt, halt),
+    file:delete(Halt),
+
+    {ok, halt} = disk_log:open([{name, halt}, {type, halt}, {file, Halt},
+				{head, header}, {notify, true}]),
+    ok = disk_log:truncate(halt),
+    rec(1, {disk_log, node(), halt, {truncated, 1}}),
+    disk_log:close(halt),
+    [header] = get_all_terms(halt, Halt, halt),
+    file:delete(Halt),
+
+    {ok, halt} = disk_log:open([{name, halt}, {type, halt},
+				{file, Halt}, {format, external},
+				{head, "header"}, {notify, false}]),
+    ok = disk_log:btruncate(halt, "apa"),
+    disk_log:close(halt),
+    3 = file_size(Halt),
+    file:delete(Halt),
+
     %% Wrap logs.
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line No = 4,
-    ?line B = mk_bytes(60),
-    ?line del(File, No),	% cleanup
+    File = filename:join(Dir, "n.LOG"),
+    No = 4,
+    B = mk_bytes(60),
+    del(File, No),	% cleanup
 
     %% Internal with header.
-    ?line Size = {100, No},
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {head, header}, {notify, true}, 
-				   {size, Size}]),
-    ?line ok = disk_log:log_terms(n, [B,B,B]),
+    Size = {100, No},
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {head, header}, {notify, true},
+			     {size, Size}]),
+    ok = disk_log:log_terms(n, [B,B,B]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(2, {disk_log, node(), n, {wrap, 0}}),
-    ?line ok = disk_log:truncate(n, apa),
-    ?line rec(1, {disk_log, node(), n, {truncated, 6}}),
-    ?line {0, 0} = no_overflows(n),
-    ?line 23 = curb(n),
-    ?line 1 = curf(n),
-    ?line 1 = cur_cnt(n),
-    ?line true = (Size == sz(n)),
-
-    ?line ok = disk_log:log_terms(n, [B, B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line ok = disk_log:close(n),
-    ?line [apa, _, header, _] = get_all_terms(n, File, wrap),
-    ?line del(File, No),
-    
+    rec(2, {disk_log, node(), n, {wrap, 0}}),
+    ok = disk_log:truncate(n, apa),
+    rec(1, {disk_log, node(), n, {truncated, 6}}),
+    {0, 0} = no_overflows(n),
+    23 = curb(n),
+    1 = curf(n),
+    1 = cur_cnt(n),
+    true = (Size == sz(n)),
+
+    ok = disk_log:log_terms(n, [B, B]),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    ok = disk_log:close(n),
+    [apa, _, header, _] = get_all_terms(n, File, wrap),
+    del(File, No),
+
     %% Internal without general header.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {notify, true}, 
-				   {size, {100, No}}]),
-    ?line ok = disk_log:log_terms(n, [B,B,B]),
-    ?line rec(2, {disk_log, node(), n, {wrap, 0}}),
-    ?line ok = disk_log:truncate(n, apa),
-    ?line rec(1, {disk_log, node(), n, {truncated, 3}}),
-    ?line {0, 0} = no_overflows(n),
-    ?line 23 = curb(n),
-    ?line 1 = curf(n),
-    ?line 1 = cur_cnt(n),
-    ?line true = (Size == sz(n)),
-
-    ?line ok = disk_log:log_terms(n, [B, B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line ok = disk_log:close(n),
-    ?line [apa, _, _] = get_all_terms(n, File, wrap),
-    ?line del(File, No),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {notify, true},
+			     {size, {100, No}}]),
+    ok = disk_log:log_terms(n, [B,B,B]),
+    rec(2, {disk_log, node(), n, {wrap, 0}}),
+    ok = disk_log:truncate(n, apa),
+    rec(1, {disk_log, node(), n, {truncated, 3}}),
+    {0, 0} = no_overflows(n),
+    23 = curb(n),
+    1 = curf(n),
+    1 = cur_cnt(n),
+    true = (Size == sz(n)),
+
+    ok = disk_log:log_terms(n, [B, B]),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    ok = disk_log:close(n),
+    [apa, _, _] = get_all_terms(n, File, wrap),
+    del(File, No),
 
     %% Internal without any header.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {notify, true}, 
-				   {size, {100, No}}]),
-    ?line ok = disk_log:log_terms(n, [B,B,B]),
-    ?line rec(2, {disk_log, node(), n, {wrap, 0}}),
-    ?line ok = disk_log:truncate(n),
-    ?line rec(1, {disk_log, node(), n, {truncated, 3}}),
-    ?line {0, 0} = no_overflows(n),
-    ?line 8 = curb(n),
-    ?line 1 = curf(n),
-    ?line 0 = cur_cnt(n),
-    ?line true = (Size == sz(n)),
-
-    ?line ok = disk_log:log_terms(n, [B, B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line ok = disk_log:close(n),
-    ?line [_, _] = get_all_terms(n, File, wrap),
-    ?line del(File, No),
-    ?line Q = qlen(),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {notify, true},
+			     {size, {100, No}}]),
+    ok = disk_log:log_terms(n, [B,B,B]),
+    rec(2, {disk_log, node(), n, {wrap, 0}}),
+    ok = disk_log:truncate(n),
+    rec(1, {disk_log, node(), n, {truncated, 3}}),
+    {0, 0} = no_overflows(n),
+    8 = curb(n),
+    1 = curf(n),
+    0 = cur_cnt(n),
+    true = (Size == sz(n)),
+
+    ok = disk_log:log_terms(n, [B, B]),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    ok = disk_log:close(n),
+    [_, _] = get_all_terms(n, File, wrap),
+    del(File, No),
+    Q = qlen(),
     ok.
 
 
-many_users(suite) -> [];
-many_users(doc) -> 
-    ["Test many users logging and sync:ing at the same time."];
+%% Test many users logging and sync:ing at the same time.
 many_users(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     N = 100,
@@ -3199,32 +3114,32 @@ many_users(Conf) when is_list(Conf) ->
     Fun1 = fun(Name, Pid, I) -> disk_log:log(Name, {Pid, I}) end,
     Fun2 = fun(Name, Pid, I) -> ok = disk_log:log(Name, {Pid, I}),
 				disk_log:sync(Name) end,
-    ?line {C1, T1} = many(Fun2, NoClients, N, halt, internal, infinity, Dir),
-    ?line true = lists:duplicate(NoClients, ok) == C1,
-    ?line true = length(T1) == N*NoClients,
-    ?line {C2, T2} = many(Fun1, NoClients, N, halt, internal, 1000, Dir),
-    ?line true = lists:duplicate(NoClients, {error, {full,"log.LOG"}}) == C2,
-    ?line true = length(T2) > 0,
-    ?line {C3, T3} = many(Fun2, NoClients, N, wrap, internal, 
-			  {300*NoClients,200}, Dir),
-    ?line true = lists:duplicate(NoClients, ok) == C3,
-    ?line true = length(T3) == N*NoClients,
+    {C1, T1} = many(Fun2, NoClients, N, halt, internal, infinity, Dir),
+    true = lists:duplicate(NoClients, ok) == C1,
+    true = length(T1) == N*NoClients,
+    {C2, T2} = many(Fun1, NoClients, N, halt, internal, 1000, Dir),
+    true = lists:duplicate(NoClients, {error, {full,"log.LOG"}}) == C2,
+    true = length(T2) > 0,
+    {C3, T3} = many(Fun2, NoClients, N, wrap, internal,
+		    {300*NoClients,200}, Dir),
+    true = lists:duplicate(NoClients, ok) == C3,
+    true = length(T3) == N*NoClients,
     ok.
 
 many(Fun, NoClients, N, Type, Format, Size, Dir) ->
     Name = "log.LOG",
     File = filename:join(Dir, Name),
     del_files(Size, File),
-    ?line Q = qlen(),
-    ?line {ok, _} = disk_log:open([{name,Name}, {type,Type}, {size,Size}, 
-				   {format,Format}, {file,File}]),
-    ?line Pids = spawn_clients(NoClients, client, [self(), Name, N, Fun]),
-    ?line Checked = check_clients(Pids),
-    ?line ok = disk_log:close(Name),
-    ?line Terms = get_all_terms(Name, File, Type),
-    ?line del_files(Size, File),
-    ?line Q = qlen(),
-    ?line {Checked, Terms}.
+    Q = qlen(),
+    {ok, _} = disk_log:open([{name,Name}, {type,Type}, {size,Size},
+			     {format,Format}, {file,File}]),
+    Pids = spawn_clients(NoClients, client, [self(), Name, N, Fun]),
+    Checked = check_clients(Pids),
+    ok = disk_log:close(Name),
+    Terms = get_all_terms(Name, File, Type),
+    del_files(Size, File),
+    Q = qlen(),
+    {Checked, Terms}.
 
 spawn_clients(0, _F, _A) ->
     [];
@@ -3251,211 +3166,208 @@ del_files(_Size, File) ->
 
 
 
-info_current(suite) -> [];
-info_current(doc) -> 
-    ["Test no_current_{bytes, items} as returned by info/0."];
+%% Test no_current_{bytes, items} as returned by info/0.
 info_current(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
-    ?line File = filename:join(Dir, "n.LOG"),
+    File = filename:join(Dir, "n.LOG"),
     No = 4,
     B = mk_bytes(60),
     BB = mk_bytes(160), % bigger than a single wrap log file
     SB = mk_bytes(10),  % much smaller than a single wrap log file
-    ?line del(File, No),% cleanup
+    del(File, No),% cleanup
 
-    ?line Q = qlen(),
+    Q = qlen(),
     %% Internal with header.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {head, header}, {size, {100,No}}]),
-    ?line {26, 1} = {curb(n), cur_cnt(n)},
-    ?line {1, 1}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:log(n, B),
-    ?line {94, 2} = {curb(n), cur_cnt(n)},
-    ?line {2, 2}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:close(n),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {notify, true}, 
-				   {head, header}, {size, {100,No}}]),
-    ?line {94, 2} = {curb(n), cur_cnt(n)},
-    ?line {0, 2}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:log(n, B),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line {94, 2} = {curb(n), cur_cnt(n)},
-    ?line {2, 4}  = {no_written_items(n), no_items(n)},
-    ?line disk_log:inc_wrap_file(n),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line {26, 1} = {curb(n), cur_cnt(n)},
-    ?line {3, 4}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:log_terms(n, [B,B,B]),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {head, header}, {size, {100,No}}]),
+    {26, 1} = {curb(n), cur_cnt(n)},
+    {1, 1}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:log(n, B),
+    {94, 2} = {curb(n), cur_cnt(n)},
+    {2, 2}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {notify, true},
+			     {head, header}, {size, {100,No}}]),
+    {94, 2} = {curb(n), cur_cnt(n)},
+    {0, 2}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:log(n, B),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    {94, 2} = {curb(n), cur_cnt(n)},
+    {2, 4}  = {no_written_items(n), no_items(n)},
+    disk_log:inc_wrap_file(n),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    {26, 1} = {curb(n), cur_cnt(n)},
+    {3, 4}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:log_terms(n, [B,B,B]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line rec(1, {disk_log, node(), n, {wrap, 2}}),
-    ?line {94, 2} = {curb(n), cur_cnt(n)},
-    ?line {8, 7}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:log_terms(n, [B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 2}}),
-    ?line ok = disk_log:log_terms(n, [B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 2}}),
-    ?line {94, 2} = {curb(n), cur_cnt(n)},
-    ?line {12, 7}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:log_terms(n, [BB,BB]),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    rec(1, {disk_log, node(), n, {wrap, 2}}),
+    {94, 2} = {curb(n), cur_cnt(n)},
+    {8, 7}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:log_terms(n, [B]),
+    rec(1, {disk_log, node(), n, {wrap, 2}}),
+    ok = disk_log:log_terms(n, [B]),
+    rec(1, {disk_log, node(), n, {wrap, 2}}),
+    {94, 2} = {curb(n), cur_cnt(n)},
+    {12, 7}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:log_terms(n, [BB,BB]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(2, {disk_log, node(), n, {wrap, 2}}),
-    ?line {194, 2} = {curb(n), cur_cnt(n)},
-    ?line {16, 7}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:log_terms(n, [SB,SB,SB]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 2}}),
-    ?line {80, 4} = {curb(n), cur_cnt(n)},
-    ?line {20, 9}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
+    rec(2, {disk_log, node(), n, {wrap, 2}}),
+    {194, 2} = {curb(n), cur_cnt(n)},
+    {16, 7}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:log_terms(n, [SB,SB,SB]),
+    rec(1, {disk_log, node(), n, {wrap, 2}}),
+    {80, 4} = {curb(n), cur_cnt(n)},
+    {20, 9}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:close(n),
+    del(File, No),
 
     %% Internal without header.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {size, {100,No}}]),
-    ?line {8, 0} = {curb(n), cur_cnt(n)},
-    ?line {0, 0}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:log(n, B),
-    ?line {76, 1} = {curb(n), cur_cnt(n)},
-    ?line {1, 1}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:close(n),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {notify, true}, {size, {100,No}}]),
-    ?line {76, 1} = {curb(n), cur_cnt(n)},
-    ?line {0, 1}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:log(n, B),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line {76, 1} = {curb(n), cur_cnt(n)},
-    ?line {1, 2}  = {no_written_items(n), no_items(n)},
-    ?line disk_log:inc_wrap_file(n),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line {8, 0} = {curb(n), cur_cnt(n)},
-    ?line {1, 2}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:log_terms(n, [B,B,B]),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {size, {100,No}}]),
+    {8, 0} = {curb(n), cur_cnt(n)},
+    {0, 0}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:log(n, B),
+    {76, 1} = {curb(n), cur_cnt(n)},
+    {1, 1}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {notify, true}, {size, {100,No}}]),
+    {76, 1} = {curb(n), cur_cnt(n)},
+    {0, 1}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:log(n, B),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    {76, 1} = {curb(n), cur_cnt(n)},
+    {1, 2}  = {no_written_items(n), no_items(n)},
+    disk_log:inc_wrap_file(n),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    {8, 0} = {curb(n), cur_cnt(n)},
+    {1, 2}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:log_terms(n, [B,B,B]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line rec(1, {disk_log, node(), n, {wrap, 1}}),
-    ?line {76, 1} = {curb(n), cur_cnt(n)},
-    ?line {4, 4}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:log_terms(n, [B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 1}}),
-    ?line ok = disk_log:log_terms(n, [B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 1}}),
-    ?line {76, 1} = {curb(n), cur_cnt(n)},
-    ?line {6, 4}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:log_terms(n, [BB,BB]),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    rec(1, {disk_log, node(), n, {wrap, 1}}),
+    {76, 1} = {curb(n), cur_cnt(n)},
+    {4, 4}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:log_terms(n, [B]),
+    rec(1, {disk_log, node(), n, {wrap, 1}}),
+    ok = disk_log:log_terms(n, [B]),
+    rec(1, {disk_log, node(), n, {wrap, 1}}),
+    {76, 1} = {curb(n), cur_cnt(n)},
+    {6, 4}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:log_terms(n, [BB,BB]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(2, {disk_log, node(), n, {wrap, 1}}),
-    ?line {176, 1} = {curb(n), cur_cnt(n)},
-    ?line {8, 4}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:log_terms(n, [SB,SB,SB]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 1}}),
-    ?line {62, 3} = {curb(n), cur_cnt(n)},
-    ?line {11, 6}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
+    rec(2, {disk_log, node(), n, {wrap, 1}}),
+    {176, 1} = {curb(n), cur_cnt(n)},
+    {8, 4}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:log_terms(n, [SB,SB,SB]),
+    rec(1, {disk_log, node(), n, {wrap, 1}}),
+    {62, 3} = {curb(n), cur_cnt(n)},
+    {11, 6}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:close(n),
+    del(File, No),
 
     %% External with header.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, external}, {head, "header"}, 
-				   {size, {100,No}}]),
-    ?line {6, 1} = {curb(n), cur_cnt(n)},
-    ?line {1, 1}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:blog(n, B),
-    ?line {62, 2} = {curb(n), cur_cnt(n)},
-    ?line {2, 2}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:close(n),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, external}, {head, "header"}, 
-				   {notify, true}, {size, {100,No}}]),
-    ?line {62, 2} = {curb(n), cur_cnt(n)},
-    ?line {0, 2}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:blog(n, B),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line {62, 2} = {curb(n), cur_cnt(n)},
-    ?line {2, 4}  = {no_written_items(n), no_items(n)},
-    ?line disk_log:inc_wrap_file(n),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line {6, 1} = {curb(n), cur_cnt(n)},
-    ?line {3, 4}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:blog_terms(n, [B,B,B]),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, external}, {head, "header"},
+			     {size, {100,No}}]),
+    {6, 1} = {curb(n), cur_cnt(n)},
+    {1, 1}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:blog(n, B),
+    {62, 2} = {curb(n), cur_cnt(n)},
+    {2, 2}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, external}, {head, "header"},
+			     {notify, true}, {size, {100,No}}]),
+    {62, 2} = {curb(n), cur_cnt(n)},
+    {0, 2}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:blog(n, B),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    {62, 2} = {curb(n), cur_cnt(n)},
+    {2, 4}  = {no_written_items(n), no_items(n)},
+    disk_log:inc_wrap_file(n),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    {6, 1} = {curb(n), cur_cnt(n)},
+    {3, 4}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:blog_terms(n, [B,B,B]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line rec(1, {disk_log, node(), n, {wrap, 2}}),
-    ?line {62, 2} = {curb(n), cur_cnt(n)},
-    ?line {8, 7}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:blog_terms(n, [B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 2}}),
-    ?line ok = disk_log:blog_terms(n, [B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 2}}),
-    ?line {62, 2} = {curb(n), cur_cnt(n)},
-    ?line {12, 7}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:blog_terms(n, [BB,BB]),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    rec(1, {disk_log, node(), n, {wrap, 2}}),
+    {62, 2} = {curb(n), cur_cnt(n)},
+    {8, 7}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:blog_terms(n, [B]),
+    rec(1, {disk_log, node(), n, {wrap, 2}}),
+    ok = disk_log:blog_terms(n, [B]),
+    rec(1, {disk_log, node(), n, {wrap, 2}}),
+    {62, 2} = {curb(n), cur_cnt(n)},
+    {12, 7}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:blog_terms(n, [BB,BB]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(2, {disk_log, node(), n, {wrap, 2}}),
-    ?line {162, 2} = {curb(n), cur_cnt(n)},
-    ?line {16, 7}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:blog_terms(n, [SB,SB,SB]),
-
-    ?line rec(1, {disk_log, node(), n, {wrap, 2}}),
-    ?line {24, 4} = {curb(n), cur_cnt(n)},
-    ?line {20, 9}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
+    rec(2, {disk_log, node(), n, {wrap, 2}}),
+    {162, 2} = {curb(n), cur_cnt(n)},
+    {16, 7}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:blog_terms(n, [SB,SB,SB]),
+
+    rec(1, {disk_log, node(), n, {wrap, 2}}),
+    {24, 4} = {curb(n), cur_cnt(n)},
+    {20, 9}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:close(n),
+    del(File, No),
 
     %% External without header.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {format, external}, {size, {100,No}}]),
-    ?line {0, 0} = {curb(n), cur_cnt(n)},
-    ?line {0, 0}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:blog(n, B),
-    ?line {56, 1} = {curb(n), cur_cnt(n)},
-    ?line {1, 1}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:close(n),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
-				   {notify, true}, 
-				   {format, external}, {size, {100,No}}]),
-    ?line {56, 1} = {curb(n), cur_cnt(n)},
-    ?line {0, 1}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:blog(n, B),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line {56, 1} = {curb(n), cur_cnt(n)},
-    ?line {1, 2}  = {no_written_items(n), no_items(n)},
-    ?line disk_log:inc_wrap_file(n),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line {0, 0} = {curb(n), cur_cnt(n)},
-    ?line {1, 2}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:blog_terms(n, [B,B,B]),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {format, external}, {size, {100,No}}]),
+    {0, 0} = {curb(n), cur_cnt(n)},
+    {0, 0}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:blog(n, B),
+    {56, 1} = {curb(n), cur_cnt(n)},
+    {1, 1}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:close(n),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+			     {notify, true},
+			     {format, external}, {size, {100,No}}]),
+    {56, 1} = {curb(n), cur_cnt(n)},
+    {0, 1}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:blog(n, B),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    {56, 1} = {curb(n), cur_cnt(n)},
+    {1, 2}  = {no_written_items(n), no_items(n)},
+    disk_log:inc_wrap_file(n),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    {0, 0} = {curb(n), cur_cnt(n)},
+    {1, 2}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:blog_terms(n, [B,B,B]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line rec(1, {disk_log, node(), n, {wrap, 1}}),
-    ?line {56, 1} = {curb(n), cur_cnt(n)},
-    ?line {4, 4}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:blog_terms(n, [B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 1}}),
-    ?line ok = disk_log:blog_terms(n, [B]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 1}}),
-    ?line {56, 1} = {curb(n), cur_cnt(n)},
-    ?line {6, 4}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:blog_terms(n, [BB,BB]),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    rec(1, {disk_log, node(), n, {wrap, 1}}),
+    {56, 1} = {curb(n), cur_cnt(n)},
+    {4, 4}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:blog_terms(n, [B]),
+    rec(1, {disk_log, node(), n, {wrap, 1}}),
+    ok = disk_log:blog_terms(n, [B]),
+    rec(1, {disk_log, node(), n, {wrap, 1}}),
+    {56, 1} = {curb(n), cur_cnt(n)},
+    {6, 4}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:blog_terms(n, [BB,BB]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(2, {disk_log, node(), n, {wrap, 1}}),
-    ?line {156, 1} = {curb(n), cur_cnt(n)},
-    ?line {8, 4}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:blog_terms(n, [SB,SB,SB]),
-    ?line rec(1, {disk_log, node(), n, {wrap, 1}}),
-    ?line {18, 3} = {curb(n), cur_cnt(n)},
-    ?line {11, 6}  = {no_written_items(n), no_items(n)},
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
-
-    ?line Q = qlen(),
+    rec(2, {disk_log, node(), n, {wrap, 1}}),
+    {156, 1} = {curb(n), cur_cnt(n)},
+    {8, 4}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:blog_terms(n, [SB,SB,SB]),
+    rec(1, {disk_log, node(), n, {wrap, 1}}),
+    {18, 3} = {curb(n), cur_cnt(n)},
+    {11, 6}  = {no_written_items(n), no_items(n)},
+    ok = disk_log:close(n),
+    del(File, No),
+
+    Q = qlen(),
     ok.
 
 
 
-change_size_before(suite) -> [];
 change_size_before(doc) -> 
     ["Change size of a wrap log file before we have reached "
      "to the file index corresponding to the new size"];
@@ -3478,138 +3390,136 @@ change_size_before(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
     del(File, 5),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, 
-				   {type, wrap}, {size, {100,5}}]),
-    ?line disk_log:log(a, Log_1_1),
-    ?line disk_log:log(a, Log_1_2),
-    ?line disk_log:log(a, Log_2_1),
-    ?line disk_log:log(a, Log_2_2),
-    ?line disk_log:change_size(a, {100, 3}),
-    ?line [Log_1_1, Log_1_2,
-	   Log_2_1, Log_2_2] = get_all_terms(a),
-    ?line disk_log:log(a, Log_3_1),
-    ?line disk_log:log(a, Log_3_2),
-    ?line disk_log:log(a, Log_1_2_1),
-    ?line disk_log:log(a, Log_1_2_2),
-    ?line [Log_2_1, Log_2_2,
-	   Log_3_1, Log_3_2,
-	   Log_1_2_1, Log_1_2_2] = get_all_terms(a),
-
-    ?line disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, 
-				   {size, {100,3}}]),
-    ?line [Log_2_1, Log_2_2,
-	   Log_3_1, Log_3_2,
-	   Log_1_2_1, Log_1_2_2] = get_all_terms(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File},
+			     {type, wrap}, {size, {100,5}}]),
+    disk_log:log(a, Log_1_1),
+    disk_log:log(a, Log_1_2),
+    disk_log:log(a, Log_2_1),
+    disk_log:log(a, Log_2_2),
+    disk_log:change_size(a, {100, 3}),
+    [Log_1_1, Log_1_2,
+     Log_2_1, Log_2_2] = get_all_terms(a),
+    disk_log:log(a, Log_3_1),
+    disk_log:log(a, Log_3_2),
+    disk_log:log(a, Log_1_2_1),
+    disk_log:log(a, Log_1_2_2),
+    [Log_2_1, Log_2_2,
+     Log_3_1, Log_3_2,
+     Log_1_2_1, Log_1_2_2] = get_all_terms(a),
+
+    disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
+			     {size, {100,3}}]),
+    [Log_2_1, Log_2_2,
+     Log_3_1, Log_3_2,
+     Log_1_2_1, Log_1_2_2] = get_all_terms(a),
     disk_log:close(a),
     del(File, 5),
 
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, 
-				   {size, {60,5}}, {format, external}]),
-    ?line disk_log:blog(a, Log_1_1),
-    ?line disk_log:blog(a, Log_1_2),
-    ?line disk_log:blog(a, Log_2_1),
-    ?line disk_log:blog(a, Log_2_2),
-    ?line disk_log:change_size(a, {60, 3}),
-    ?line ok = disk_log:sync(a),
-    ?line {ok, Fd1} = file:open(File ++ ".1", [read]),
-    ?line Log11_12 = Log_1_1 ++ Log_1_2,
-    ?line {ok,Log11_12} = file:read(Fd1, 200),
-    ?line ok = file:close(Fd1),
-    ?line {ok, Fd2} = file:open(File ++ ".2", [read]),
-%    ?t:format(0, "~p~n",[file:read(Fd2, 200)]),
-    ?line Log21_22 = Log_2_1 ++ Log_2_2,
-    ?line {ok,Log21_22} = file:read(Fd2, 200),
-    ?line ok = file:close(Fd2),
-    ?line disk_log:blog(a, Log_3_1),
-    ?line disk_log:blog(a, Log_3_2),
-    ?line disk_log:blog(a, Log_1_2_1),
-    ?line disk_log:blog(a, Log_1_2_2),
-    ?line ok = disk_log:sync(a),
-    ?line {ok, Fd2a} = file:open(File ++ ".2", [read]),
-    ?line {ok,Log21_22} = file:read(Fd2a, 200),
-    ?line ok = file:close(Fd2a),
-    ?line {ok, Fd3a} = file:open(File ++ ".3", [read]),
-    ?line Log31_32 = Log_3_1 ++ Log_3_2,
-    ?line {ok,Log31_32} = file:read(Fd3a, 200),
-    ?line ok = file:close(Fd3a),
-    ?line {ok, Fd1a} = file:open(File ++ ".1", [read]),
-    ?line Log121_122 = Log_1_2_1 ++ Log_1_2_2,
-    ?line {ok,Log121_122} = file:read(Fd1a, 200),
-    ?line ok = file:close(Fd1a),
-
-    ?line disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, 
-				   {size, {60,3}}, {format, external}]),
-    ?line {ok, Fd2b} = file:open(File ++ ".2", [read]),
-    ?line {ok,Log21_22} = file:read(Fd2b, 200),
-    ?line ok = file:close(Fd2b),
-    ?line {ok, Fd3b} = file:open(File ++ ".3", [read]),
-    ?line {ok,Log31_32} = file:read(Fd3b, 200),
-    ?line ok = file:close(Fd3b),
-    ?line {ok, Fd1b} = file:open(File ++ ".1", [read]),
-    ?line {ok,Log121_122} = file:read(Fd1b, 200),
-    ?line ok = file:close(Fd1b),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
+			     {size, {60,5}}, {format, external}]),
+    disk_log:blog(a, Log_1_1),
+    disk_log:blog(a, Log_1_2),
+    disk_log:blog(a, Log_2_1),
+    disk_log:blog(a, Log_2_2),
+    disk_log:change_size(a, {60, 3}),
+    ok = disk_log:sync(a),
+    {ok, Fd1} = file:open(File ++ ".1", [read]),
+    Log11_12 = Log_1_1 ++ Log_1_2,
+    {ok,Log11_12} = file:read(Fd1, 200),
+    ok = file:close(Fd1),
+    {ok, Fd2} = file:open(File ++ ".2", [read]),
+    Log21_22 = Log_2_1 ++ Log_2_2,
+    {ok,Log21_22} = file:read(Fd2, 200),
+    ok = file:close(Fd2),
+    disk_log:blog(a, Log_3_1),
+    disk_log:blog(a, Log_3_2),
+    disk_log:blog(a, Log_1_2_1),
+    disk_log:blog(a, Log_1_2_2),
+    ok = disk_log:sync(a),
+    {ok, Fd2a} = file:open(File ++ ".2", [read]),
+    {ok,Log21_22} = file:read(Fd2a, 200),
+    ok = file:close(Fd2a),
+    {ok, Fd3a} = file:open(File ++ ".3", [read]),
+    Log31_32 = Log_3_1 ++ Log_3_2,
+    {ok,Log31_32} = file:read(Fd3a, 200),
+    ok = file:close(Fd3a),
+    {ok, Fd1a} = file:open(File ++ ".1", [read]),
+    Log121_122 = Log_1_2_1 ++ Log_1_2_2,
+    {ok,Log121_122} = file:read(Fd1a, 200),
+    ok = file:close(Fd1a),
+
+    disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
+			     {size, {60,3}}, {format, external}]),
+    {ok, Fd2b} = file:open(File ++ ".2", [read]),
+    {ok,Log21_22} = file:read(Fd2b, 200),
+    ok = file:close(Fd2b),
+    {ok, Fd3b} = file:open(File ++ ".3", [read]),
+    {ok,Log31_32} = file:read(Fd3b, 200),
+    ok = file:close(Fd3b),
+    {ok, Fd1b} = file:open(File ++ ".1", [read]),
+    {ok,Log121_122} = file:read(Fd1b, 200),
+    ok = file:close(Fd1b),
     disk_log:close(a),
     del(File, 5),
 
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100,5}}]),
-    ?line disk_log:log(a, Log_1_1),
-    ?line disk_log:log(a, Log_1_2),
-    ?line disk_log:log(a, Log_2_1),
-    ?line disk_log:log(a, Log_2_2),
-    ?line disk_log:change_size(a, {60, 3}),
-    ?line [Log_1_1, Log_1_2,
-	   Log_2_1, Log_2_2] = get_all_terms(a),
-    ?line disk_log:log(a, Log_3_1),
-    ?line disk_log:log(a, Log_1_2_1),
-    ?line [Log_2_1, Log_2_2,
-	   Log_3_1,
-	   Log_1_2_1] = get_all_terms(a),
-
-    ?line disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {60,3}}]),
-    ?line [Log_2_1, Log_2_2,
-	   Log_3_1,
-	   Log_1_2_1] = get_all_terms(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100,5}}]),
+    disk_log:log(a, Log_1_1),
+    disk_log:log(a, Log_1_2),
+    disk_log:log(a, Log_2_1),
+    disk_log:log(a, Log_2_2),
+    disk_log:change_size(a, {60, 3}),
+    [Log_1_1, Log_1_2,
+     Log_2_1, Log_2_2] = get_all_terms(a),
+    disk_log:log(a, Log_3_1),
+    disk_log:log(a, Log_1_2_1),
+    [Log_2_1, Log_2_2,
+     Log_3_1,
+     Log_1_2_1] = get_all_terms(a),
+
+    disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {60,3}}]),
+    [Log_2_1, Log_2_2,
+     Log_3_1,
+     Log_1_2_1] = get_all_terms(a),
     disk_log:close(a),
     del(File, 5),
 
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {60, 3}}]),
-    ?line disk_log:log(a, Log_1_1),
-    ?line disk_log:log(a, Log_2_1),
-    ?line disk_log:change_size(a, {100, 5}),
-    ?line [Log_1_1,
-	   Log_2_1] = get_all_terms(a),
-    ?line disk_log:log(a, Log_2_2),
-    ?line disk_log:log(a, Log_3_1),
-    ?line disk_log:log(a, Log_3_2),
-    ?line disk_log:log(a, Log_4_1),
-    ?line disk_log:log(a, Log_4_2),
-    ?line disk_log:log(a, Log_5_1),
-    ?line disk_log:log(a, Log_5_2),
-    ?line disk_log:log(a, Log_1_2_1),
-    ?line [Log_2_1, Log_2_2,
-	   Log_3_1, Log_3_2,
-	   Log_4_1, Log_4_2,
-	   Log_5_1, Log_5_2,
-	   Log_1_2_1] = get_all_terms(a),
-
-    ?line disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100, 5}}]),
-    ?line [Log_2_1, Log_2_2,
-	   Log_3_1, Log_3_2,
-	   Log_4_1, Log_4_2,
-	   Log_5_1, Log_5_2,
-	   Log_1_2_1] = get_all_terms(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {60, 3}}]),
+    disk_log:log(a, Log_1_1),
+    disk_log:log(a, Log_2_1),
+    disk_log:change_size(a, {100, 5}),
+    [Log_1_1,
+     Log_2_1] = get_all_terms(a),
+    disk_log:log(a, Log_2_2),
+    disk_log:log(a, Log_3_1),
+    disk_log:log(a, Log_3_2),
+    disk_log:log(a, Log_4_1),
+    disk_log:log(a, Log_4_2),
+    disk_log:log(a, Log_5_1),
+    disk_log:log(a, Log_5_2),
+    disk_log:log(a, Log_1_2_1),
+    [Log_2_1, Log_2_2,
+     Log_3_1, Log_3_2,
+     Log_4_1, Log_4_2,
+     Log_5_1, Log_5_2,
+     Log_1_2_1] = get_all_terms(a),
+
+    disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100, 5}}]),
+    [Log_2_1, Log_2_2,
+     Log_3_1, Log_3_2,
+     Log_4_1, Log_4_2,
+     Log_5_1, Log_5_2,
+     Log_1_2_1] = get_all_terms(a),
     disk_log:close(a),
     del(File, 5).
 
 
 
-change_size_during(suite) -> [];
-change_size_during(doc) -> ["Change size of a wrap log file while logging  "
-			    "to a file index between the old and the new size"];
+%% Change size of a wrap log file while logging to a file index
+%% between the old and the new size.
 change_size_during(Conf) when is_list(Conf) ->
 
     Log_1_1 = "first log  first message",
@@ -3633,114 +3543,111 @@ change_size_during(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100,5}}]),
-    ?line disk_log:log(a, Log_1_1),
-    ?line disk_log:log(a, Log_1_2),
-    ?line disk_log:log(a, Log_2_1),
-    ?line disk_log:log(a, Log_2_2),
-    ?line disk_log:log(a, Log_3_1),
-    ?line disk_log:log(a, Log_3_2),
-    ?line disk_log:log(a, Log_4_1),
-    ?line disk_log:log(a, Log_4_2),
-    ?line disk_log:log(a, Log_5_1),
-    ?line disk_log:log(a, Log_5_2),
-    ?line disk_log:log(a, Log_1_1),
-    ?line disk_log:log(a, Log_1_2),
-    ?line disk_log:log(a, Log_2_1),
-    ?line disk_log:log(a, Log_2_2),
-    ?line disk_log:log(a, Log_3_1),
-    ?line disk_log:log(a, Log_3_2),
-    ?line disk_log:log(a, Log_4_1),
-    ?line disk_log:log(a, Log_4_2),
-    ?line disk_log:change_size(a, {100, 3}),
-    ?line [Log_5_1, Log_5_2,
-	   Log_1_1, Log_1_2,
-	   Log_2_1, Log_2_2,
-	   Log_3_1, Log_3_2,
-	   Log_4_1, Log_4_2] = get_all_terms(a),
-    ?line disk_log:log(a, Log_1_2_1),
-    ?line disk_log:log(a, Log_1_2_2),
-    ?line [Log_2_1, Log_2_2,
-	   Log_3_1, Log_3_2,
-	   Log_4_1, Log_4_2,
-	   Log_1_2_1, Log_1_2_2] = get_all_terms(a),
-
-    ?line disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100,3}}]),
-    ?line [Log_2_1, Log_2_2,
-	   Log_3_1, Log_3_2,
-	   Log_4_1, Log_4_2,
-	   Log_1_2_1, Log_1_2_2] = get_all_terms(a),
-    ?line disk_log:log(a, Log_2_2_1),
-    ?line disk_log:log(a, Log_2_2_2),
-    ?line disk_log:log(a, Log_3_2_1),
-    ?line disk_log:log(a, Log_3_2_2),
-    ?line disk_log:log(a, Log_1_3_1),
-    ?line disk_log:log(a, Log_1_3_2),
-    ?line [Log_2_2_1, Log_2_2_2,
-	   Log_3_2_1, Log_3_2_2,
-	   Log_1_3_1, Log_1_3_2] = get_all_terms(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100,5}}]),
+    disk_log:log(a, Log_1_1),
+    disk_log:log(a, Log_1_2),
+    disk_log:log(a, Log_2_1),
+    disk_log:log(a, Log_2_2),
+    disk_log:log(a, Log_3_1),
+    disk_log:log(a, Log_3_2),
+    disk_log:log(a, Log_4_1),
+    disk_log:log(a, Log_4_2),
+    disk_log:log(a, Log_5_1),
+    disk_log:log(a, Log_5_2),
+    disk_log:log(a, Log_1_1),
+    disk_log:log(a, Log_1_2),
+    disk_log:log(a, Log_2_1),
+    disk_log:log(a, Log_2_2),
+    disk_log:log(a, Log_3_1),
+    disk_log:log(a, Log_3_2),
+    disk_log:log(a, Log_4_1),
+    disk_log:log(a, Log_4_2),
+    disk_log:change_size(a, {100, 3}),
+    [Log_5_1, Log_5_2,
+     Log_1_1, Log_1_2,
+     Log_2_1, Log_2_2,
+     Log_3_1, Log_3_2,
+     Log_4_1, Log_4_2] = get_all_terms(a),
+    disk_log:log(a, Log_1_2_1),
+    disk_log:log(a, Log_1_2_2),
+    [Log_2_1, Log_2_2,
+     Log_3_1, Log_3_2,
+     Log_4_1, Log_4_2,
+     Log_1_2_1, Log_1_2_2] = get_all_terms(a),
+
     disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100,3}}]),
-    ?line [Log_2_2_1, Log_2_2_2,
-	   Log_3_2_1, Log_3_2_2,
-	   Log_1_3_1, Log_1_3_2] = get_all_terms(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100,3}}]),
+    [Log_2_1, Log_2_2,
+     Log_3_1, Log_3_2,
+     Log_4_1, Log_4_2,
+     Log_1_2_1, Log_1_2_2] = get_all_terms(a),
+    disk_log:log(a, Log_2_2_1),
+    disk_log:log(a, Log_2_2_2),
+    disk_log:log(a, Log_3_2_1),
+    disk_log:log(a, Log_3_2_2),
+    disk_log:log(a, Log_1_3_1),
+    disk_log:log(a, Log_1_3_2),
+    [Log_2_2_1, Log_2_2_2,
+     Log_3_2_1, Log_3_2_2,
+     Log_1_3_1, Log_1_3_2] = get_all_terms(a),
+    disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100,3}}]),
+    [Log_2_2_1, Log_2_2_2,
+     Log_3_2_1, Log_3_2_2,
+     Log_1_3_1, Log_1_3_2] = get_all_terms(a),
     disk_log:close(a),
     del(File, 5),
 
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100,5}}]),
-    ?line disk_log:log(a, Log_1_1),
-    ?line disk_log:log(a, Log_1_2),
-    ?line disk_log:log(a, Log_2_1),
-    ?line disk_log:log(a, Log_2_2),
-    ?line disk_log:log(a, Log_3_1),
-    ?line disk_log:log(a, Log_3_2),
-    ?line disk_log:log(a, Log_4_1),
-    ?line disk_log:log(a, Log_4_2),
-    ?line disk_log:log(a, Log_5_1),
-    ?line disk_log:log(a, Log_5_2),
-    ?line disk_log:log(a, Log_1_1),
-    ?line disk_log:log(a, Log_1_2),
-    ?line disk_log:log(a, Log_2_1),
-    ?line disk_log:log(a, Log_2_2),
-    ?line disk_log:log(a, Log_3_1),
-    ?line disk_log:log(a, Log_3_2),
-    ?line disk_log:log(a, Log_4_1),
-    ?line disk_log:log(a, Log_4_2),
-    ?line disk_log:log(a, Log_5_1),
-    ?line disk_log:log(a, Log_5_2),
-    ?line disk_log:change_size(a, {100, 3}),
-    ?line [Log_1_1, Log_1_2,
-	   Log_2_1, Log_2_2,
-	   Log_3_1, Log_3_2,
-	   Log_4_1, Log_4_2,
-	   Log_5_1, Log_5_2] = get_all_terms(a),
-    ?line disk_log:log(a, Log_1_2_1),
-    ?line disk_log:log(a, Log_1_2_2),
-    ?line disk_log:log(a, Log_2_2_1),
-    ?line disk_log:log(a, Log_2_2_2),
-    ?line disk_log:log(a, Log_3_2_1),
-    ?line disk_log:log(a, Log_3_2_2),
-    ?line disk_log:log(a, Log_1_3_1),
-    ?line disk_log:log(a, Log_1_3_2),
-    ?line [Log_2_2_1, Log_2_2_2,
-	   Log_3_2_1, Log_3_2_2,
-	   Log_1_3_1, Log_1_3_2] = get_all_terms(a),
-
-    ?line disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100,3}}]),
-    ?line [Log_2_2_1, Log_2_2_2,
-	   Log_3_2_1, Log_3_2_2,
-	   Log_1_3_1, Log_1_3_2] = get_all_terms(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100,5}}]),
+    disk_log:log(a, Log_1_1),
+    disk_log:log(a, Log_1_2),
+    disk_log:log(a, Log_2_1),
+    disk_log:log(a, Log_2_2),
+    disk_log:log(a, Log_3_1),
+    disk_log:log(a, Log_3_2),
+    disk_log:log(a, Log_4_1),
+    disk_log:log(a, Log_4_2),
+    disk_log:log(a, Log_5_1),
+    disk_log:log(a, Log_5_2),
+    disk_log:log(a, Log_1_1),
+    disk_log:log(a, Log_1_2),
+    disk_log:log(a, Log_2_1),
+    disk_log:log(a, Log_2_2),
+    disk_log:log(a, Log_3_1),
+    disk_log:log(a, Log_3_2),
+    disk_log:log(a, Log_4_1),
+    disk_log:log(a, Log_4_2),
+    disk_log:log(a, Log_5_1),
+    disk_log:log(a, Log_5_2),
+    disk_log:change_size(a, {100, 3}),
+    [Log_1_1, Log_1_2,
+     Log_2_1, Log_2_2,
+     Log_3_1, Log_3_2,
+     Log_4_1, Log_4_2,
+     Log_5_1, Log_5_2] = get_all_terms(a),
+    disk_log:log(a, Log_1_2_1),
+    disk_log:log(a, Log_1_2_2),
+    disk_log:log(a, Log_2_2_1),
+    disk_log:log(a, Log_2_2_2),
+    disk_log:log(a, Log_3_2_1),
+    disk_log:log(a, Log_3_2_2),
+    disk_log:log(a, Log_1_3_1),
+    disk_log:log(a, Log_1_3_2),
+    [Log_2_2_1, Log_2_2_2,
+     Log_3_2_1, Log_3_2_2,
+     Log_1_3_1, Log_1_3_2] = get_all_terms(a),
+
+    disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, {size, {100,3}}]),
+    [Log_2_2_1, Log_2_2_2,
+     Log_3_2_1, Log_3_2_2,
+     Log_1_3_1, Log_1_3_2] = get_all_terms(a),
     disk_log:close(a),
     del(File, 5).
 
 
-change_size_after(suite) -> [];
-change_size_after(doc) -> 
-    ["Change size of a wrap log file before we have reached "
-     "(on the second round) "
-     "to the file index corresponding to the new size"];
+%% Change size of a wrap log file before we have reached (on the
+%% second round) to the file index corresponding to the new size.
 change_size_after(Conf) when is_list(Conf) ->
 
     Log_1_1 = "first log  first message",
@@ -3758,172 +3665,169 @@ change_size_after(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "a.LOG"),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, 
-                                   {size, {100,5}}]),
-    ?line disk_log:log(a, Log_1_1),
-    ?line disk_log:log(a, Log_1_2),
-    ?line disk_log:log(a, Log_2_1),
-    ?line disk_log:log(a, Log_2_2),
-    ?line disk_log:log(a, Log_3_1),
-    ?line disk_log:log(a, Log_3_2),
-    ?line disk_log:log(a, Log_4_1),
-    ?line disk_log:log(a, Log_4_2),
-    ?line disk_log:log(a, Log_5_1),
-    ?line disk_log:log(a, Log_5_2),
-    ?line disk_log:log(a, Log_1_1),
-    ?line disk_log:log(a, Log_1_2),
-    ?line disk_log:log(a, Log_2_1),
-    ?line disk_log:log(a, Log_2_2),
-    ?line disk_log:change_size(a, {100, 3}),
-    ?line [Log_3_1,Log_3_2,
-	   Log_4_1, Log_4_2,
-	   Log_5_1, Log_5_2,
-	   Log_1_1, Log_1_2,
-	   Log_2_1, Log_2_2] = get_all_terms(a),
-    ?line disk_log:log(a, Log_3_1),
-    ?line disk_log:log(a, Log_3_2),
-    ?line disk_log:log(a, Log_1_2_1),
-    ?line disk_log:log(a, Log_1_2_2),
-    ?line [Log_2_1, Log_2_2,
-	   Log_3_1, Log_3_2,
-	   Log_1_2_1, Log_1_2_2] = get_all_terms(a),
-
-    ?line disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, 
-                                   {size, {100,3}}]),
-    ?line [Log_2_1, Log_2_2,
-	   Log_3_1, Log_3_2,
-	   Log_1_2_1, Log_1_2_2] = get_all_terms(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
+			     {size, {100,5}}]),
+    disk_log:log(a, Log_1_1),
+    disk_log:log(a, Log_1_2),
+    disk_log:log(a, Log_2_1),
+    disk_log:log(a, Log_2_2),
+    disk_log:log(a, Log_3_1),
+    disk_log:log(a, Log_3_2),
+    disk_log:log(a, Log_4_1),
+    disk_log:log(a, Log_4_2),
+    disk_log:log(a, Log_5_1),
+    disk_log:log(a, Log_5_2),
+    disk_log:log(a, Log_1_1),
+    disk_log:log(a, Log_1_2),
+    disk_log:log(a, Log_2_1),
+    disk_log:log(a, Log_2_2),
+    disk_log:change_size(a, {100, 3}),
+    [Log_3_1,Log_3_2,
+     Log_4_1, Log_4_2,
+     Log_5_1, Log_5_2,
+     Log_1_1, Log_1_2,
+     Log_2_1, Log_2_2] = get_all_terms(a),
+    disk_log:log(a, Log_3_1),
+    disk_log:log(a, Log_3_2),
+    disk_log:log(a, Log_1_2_1),
+    disk_log:log(a, Log_1_2_2),
+    [Log_2_1, Log_2_2,
+     Log_3_1, Log_3_2,
+     Log_1_2_1, Log_1_2_2] = get_all_terms(a),
+
+    disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
+			     {size, {100,3}}]),
+    [Log_2_1, Log_2_2,
+     Log_3_1, Log_3_2,
+     Log_1_2_1, Log_1_2_2] = get_all_terms(a),
     disk_log:close(a),
     del(File, 5),
 
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, 
-                                   {size, {100,5}}]),
-    ?line disk_log:log(a, Log_1_1),
-    ?line disk_log:log(a, Log_1_2),
-    ?line disk_log:log(a, Log_2_1),
-    ?line disk_log:log(a, Log_2_2),
-    ?line disk_log:log(a, Log_3_1),
-    ?line disk_log:log(a, Log_3_2),
-    ?line disk_log:log(a, Log_4_1),
-    ?line disk_log:log(a, Log_4_2),
-    ?line disk_log:log(a, Log_5_1),
-    ?line disk_log:log(a, Log_5_2),
-    ?line disk_log:log(a, Log_1_1),
-    ?line disk_log:log(a, Log_1_2),
-    ?line disk_log:log(a, Log_2_1),
-    ?line disk_log:log(a, Log_2_2),
-    ?line disk_log:change_size(a, {60, 3}),
-    ?line [Log_3_1,Log_3_2,
-	   Log_4_1, Log_4_2,
-	   Log_5_1, Log_5_2,
-	   Log_1_1, Log_1_2,
-	   Log_2_1, Log_2_2] = get_all_terms(a),
-    ?line disk_log:log(a, Log_3_1),
-    ?line disk_log:log(a, Log_1_2_1),
-    ?line [Log_2_1, Log_2_2,
-	   Log_3_1,
-	   Log_1_2_1] = get_all_terms(a),
-
-    ?line disk_log:close(a),
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, 
-                                   {size, {60,3}}]),
-    ?line [Log_2_1, Log_2_2,
-	   Log_3_1,
-	   Log_1_2_1] = get_all_terms(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
+			     {size, {100,5}}]),
+    disk_log:log(a, Log_1_1),
+    disk_log:log(a, Log_1_2),
+    disk_log:log(a, Log_2_1),
+    disk_log:log(a, Log_2_2),
+    disk_log:log(a, Log_3_1),
+    disk_log:log(a, Log_3_2),
+    disk_log:log(a, Log_4_1),
+    disk_log:log(a, Log_4_2),
+    disk_log:log(a, Log_5_1),
+    disk_log:log(a, Log_5_2),
+    disk_log:log(a, Log_1_1),
+    disk_log:log(a, Log_1_2),
+    disk_log:log(a, Log_2_1),
+    disk_log:log(a, Log_2_2),
+    disk_log:change_size(a, {60, 3}),
+    [Log_3_1,Log_3_2,
+     Log_4_1, Log_4_2,
+     Log_5_1, Log_5_2,
+     Log_1_1, Log_1_2,
+     Log_2_1, Log_2_2] = get_all_terms(a),
+    disk_log:log(a, Log_3_1),
+    disk_log:log(a, Log_1_2_1),
+    [Log_2_1, Log_2_2,
+     Log_3_1,
+     Log_1_2_1] = get_all_terms(a),
+
+    disk_log:close(a),
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
+			     {size, {60,3}}]),
+    [Log_2_1, Log_2_2,
+     Log_3_1,
+     Log_1_2_1] = get_all_terms(a),
     disk_log:close(a),
     del(File, 5).
 
 
 
-default_size(suite) -> [];
-default_size(doc) -> ["Open an existing wrap log without size option "];
+%% Open an existing wrap log without size option .
 default_size(Conf) when is_list(Conf) ->
-    ?line Dir = ?privdir(Conf),
-    ?line File = filename:join(Dir, "a.LOG"),
-    ?line {error, {badarg, size}} = disk_log:open([{name,a}, {file, File}, 
+    Dir = ?privdir(Conf),
+    File = filename:join(Dir, "a.LOG"),
+    {error, {badarg, size}} = disk_log:open([{name,a}, {file, File},
                                                    {type, wrap}]),
 
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}, 
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap},
                                    {size, {100,5}}]),
-    ?line disk_log:close(a),
+    disk_log:close(a),
 
-    ?line {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}]),
-    ?line {100, 5} = disk_log_1:read_size_file(File),
-    ?line ok = disk_log:close(a),
-    ?line del(File, 5).
+    {ok, a} = disk_log:open([{name,a}, {file, File}, {type, wrap}]),
+    {100, 5} = disk_log_1:read_size_file(File),
+    ok = disk_log:close(a),
+    del(File, 5).
 
-change_size2(suite) -> [];
-change_size2(doc) -> ["Testing change_size/2 a bit more..."];
+%% Testing change_size/2 a bit more...
 change_size2(Conf) when is_list(Conf) ->
     
     Dir = ?privdir(Conf),
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line No = 4,
-    ?line del(File, No),	% cleanup
+    File = filename:join(Dir, "n.LOG"),
+    No = 4,
+    del(File, No),	% cleanup
 
     %% External halt.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {size, 100000},
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {size, 100000},
                                    {format, external}, {type, halt}]),
-    ?line B = mk_bytes(60), % 56 actually...
-    ?line ok = disk_log:blog_terms(n, [B,list_to_binary(B),B]),
-    ?line Error1 = {error, {new_size_too_small,n,168}} = 
+    B = mk_bytes(60), % 56 actually...
+    ok = disk_log:blog_terms(n, [B,list_to_binary(B),B]),
+    Error1 = {error, {new_size_too_small,n,168}} =
         disk_log:change_size(n, 167),
-    ?line "The current size" ++ _ = format_error(Error1),
-    ?line ok = disk_log:change_size(n, infinity),
-    ?line ok = disk_log:change_size(n, 168),
-    ?line ok = disk_log:close(n),
-    ?line file:delete(File), % cleanup
+    "The current size" ++ _ = format_error(Error1),
+    ok = disk_log:change_size(n, infinity),
+    ok = disk_log:change_size(n, 168),
+    ok = disk_log:close(n),
+    file:delete(File), % cleanup
 
     %% External wrap.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
 				   {size, {100,No}}, {notify, true},
 				   {format, external}]),
-    ?line BB = mk_bytes(160),
-    ?line ok = disk_log:blog_terms(n, [BB, BB, BB, BB]), % create all files
+    BB = mk_bytes(160),
+    ok = disk_log:blog_terms(n, [BB, BB, BB, BB]), % create all files
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(3, {disk_log, node(), n, {wrap, 0}}),
-    ?line ok = disk_log:blog_terms(n, [BB, BB]),
+    rec(3, {disk_log, node(), n, {wrap, 0}}),
+    ok = disk_log:blog_terms(n, [BB, BB]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(2, {disk_log, node(), n, {wrap, 1}}),
-    ?line ok = disk_log:change_size(n, {100, 2}),
-    ?line ok = disk_log:change_size(n, {100, 2}),
-    ?line {100, 2} = sz(n),
-    ?line ok = disk_log:balog_terms(n, [BB, BB]),
-    ?line ok = disk_log:balog_terms(n, [BB]),
-    ?line ok = disk_log:blog_terms(n, [BB]),
+    rec(2, {disk_log, node(), n, {wrap, 1}}),
+    ok = disk_log:change_size(n, {100, 2}),
+    ok = disk_log:change_size(n, {100, 2}),
+    {100, 2} = sz(n),
+    ok = disk_log:balog_terms(n, [BB, BB]),
+    ok = disk_log:balog_terms(n, [BB]),
+    ok = disk_log:blog_terms(n, [BB]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(4, {disk_log, node(), n, {wrap, 1}}),
-    ?line ok = disk_log:change_size(n, {100, 4}),
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
+    rec(4, {disk_log, node(), n, {wrap, 1}}),
+    ok = disk_log:change_size(n, {100, 4}),
+    ok = disk_log:close(n),
+    del(File, No),
 
     %% Internal wrap.
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
 				   {size, {100,No}}, {notify, true},
 				   {format, internal}]),
-    ?line ok = disk_log:blog_terms(n, [BB, BB, BB, BB]), % create all files
+    ok = disk_log:blog_terms(n, [BB, BB, BB, BB]), % create all files
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(3, {disk_log, node(), n, {wrap, 0}}),
-    ?line ok = disk_log:blog_terms(n, [BB, BB]),
+    rec(3, {disk_log, node(), n, {wrap, 0}}),
+    ok = disk_log:blog_terms(n, [BB, BB]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(2, {disk_log, node(), n, {wrap, 1}}),
-    ?line ok = disk_log:change_size(n, {100, 2}),
-    ?line {100, 2} = sz(n),
-    ?line ok = disk_log:blog_terms(n, [BB, BB, BB, BB]),
+    rec(2, {disk_log, node(), n, {wrap, 1}}),
+    ok = disk_log:change_size(n, {100, 2}),
+    {100, 2} = sz(n),
+    ok = disk_log:blog_terms(n, [BB, BB, BB, BB]),
     %% Used to be one message, but now one per wrapped file.
-    ?line rec(4, {disk_log, node(), n, {wrap, 1}}),
-    ?line ok = disk_log:close(n),
-    ?line del(File, No).
+    rec(4, {disk_log, node(), n, {wrap, 1}}),
+    ok = disk_log:close(n),
+    del(File, No).
 
-change_size_truncate(suite) -> [];
-change_size_truncate(doc) -> ["OTP-3484: truncating index file"];
+%% OTP-3484: truncating index file.
 change_size_truncate(Conf) when is_list(Conf) ->
     
     Dir = ?privdir(Conf),
-    ?line File = filename:join(Dir, "bert.LOG"),
-    ?line No = 3,
-    ?line B = mk_bytes(60),
+    File = filename:join(Dir, "bert.LOG"),
+    No = 3,
+    B = mk_bytes(60),
 
     %% The problem here is truncation of the index file. One cannot easily
     %% check that the index file is correctly updated, but print_index_file()
@@ -3933,541 +3837,527 @@ change_size_truncate(Conf) when is_list(Conf) ->
     %% Change the size immediately after creating the log, while there
     %% are no log files. This used to write stuff a negative offset
     %% from the beginning of the file.
-    ?line del(File, No+1),
-    ?line {ok, bert} = disk_log:open([{name,bert}, {type,wrap}, {file, File},
+    del(File, No+1),
+    {ok, bert} = disk_log:open([{name,bert}, {type,wrap}, {file, File},
 				      {notify, true}, {size,{1000,255}}]),
-    ?line ok = disk_log:change_size(bert,{100,No}),
-    ?line ok = disk_log:blog(bert, B),
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 0}}),
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 0}}),
-    ?line 3 = curf(bert),
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 1}}),
-    ?line 1 = curf(bert),
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 1}}),
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 1}}),
-
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 1}}),
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 1}}),
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 1}}),
-
-    % Three items expected.
-    % disk_log_1:print_index_file("bert.LOG.idx"),
-    ?line 3 = curf(bert),
-    ?line ok = disk_log:change_size(bert,{100,1}),
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 1}}),
-    % Three items expected.
-    % disk_log_1:print_index_file("bert.LOG.idx"),
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 1}}),
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 1}}),
-    % One item expected.
-    % disk_log_1:print_index_file("bert.LOG.idx"),
-
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 1}}),
-    ?line ok = disk_log:close(bert),
-    ?line del(File, No),
+    ok = disk_log:change_size(bert,{100,No}),
+    ok = disk_log:blog(bert, B),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 0}}),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 0}}),
+    3 = curf(bert),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 1}}),
+    1 = curf(bert),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 1}}),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 1}}),
+
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 1}}),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 1}}),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 1}}),
+
+    %% Three items expected.
+    %% disk_log_1:print_index_file("bert.LOG.idx"),
+    3 = curf(bert),
+    ok = disk_log:change_size(bert,{100,1}),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 1}}),
+    %% Three items expected.
+    %% disk_log_1:print_index_file("bert.LOG.idx"),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 1}}),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 1}}),
+    %% One item expected.
+    %% disk_log_1:print_index_file("bert.LOG.idx"),
+
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 1}}),
+    ok = disk_log:close(bert),
+    del(File, No),
 
     %% Part 2.
     %% Change the size twice, the second time while the the effects of
     %% the first changed have not yet been handled. Finally close before
     %% the index file has been truncated.
 
-    ?line del(File, No),
-    ?line {ok, bert} = disk_log:open([{name,bert}, {type,wrap}, {file, File},
+    del(File, No),
+    {ok, bert} = disk_log:open([{name,bert}, {type,wrap}, {file, File},
 				      {notify, true}, {size,{100,No}}]),
-    ?line ok = disk_log:blog(bert, B),
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 0}}),
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 0}}),
+    ok = disk_log:blog(bert, B),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 0}}),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 0}}),
 
-    ?line 3 = curf(bert),
-    ?line ok = disk_log:change_size(bert,{100,No-1}),
+    3 = curf(bert),
+    ok = disk_log:change_size(bert,{100,No-1}),
 
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 1}}),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 1}}),
 
-    ?line 1 = curf(bert),
-    ?line ok = disk_log:change_size(bert,{100,No+1}),    
+    1 = curf(bert),
+    ok = disk_log:change_size(bert,{100,No+1}),
 
-    % Three items expected.
-    % disk_log_1:print_index_file("bert.LOG.idx"),
+    %% Three items expected.
+    %% disk_log_1:print_index_file("bert.LOG.idx"),
 
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 1}}),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 1}}),
 
-    % Three items expected.
-    % disk_log_1:print_index_file("bert.LOG.idx"),
+    %% Three items expected.
+    %% disk_log_1:print_index_file("bert.LOG.idx"),
 
-    ?line 2 = curf(bert),
-    ?line ok = disk_log:change_size(bert,{100,1}),    
+    2 = curf(bert),
+    ok = disk_log:change_size(bert,{100,1}),
 
-    % Three items expected.
-    % disk_log_1:print_index_file("bert.LOG.idx"),
+    %% Three items expected.
+    %% disk_log_1:print_index_file("bert.LOG.idx"),
 
-    ?line ok = disk_log:close(bert),
+    ok = disk_log:close(bert),
     
-    % State: .siz is 1, current file is 2, index file size is 3...
+    %% State: .siz is 1, current file is 2, index file size is 3...
 
-    ?line {ok, bert} = disk_log:open([{name,bert}, {file, File}, 
+    {ok, bert} = disk_log:open([{name,bert}, {file, File},
 				      {type,wrap}, {notify, true}]),
     
-    % Three items expected.
-    % disk_log_1:print_index_file("bert.LOG.idx"),
+    %% Three items expected.
+    %% disk_log_1:print_index_file("bert.LOG.idx"),
     
-    ?line 2 = curf(bert),
-    ?line ok = disk_log:blog(bert, B),
-    ?line rec(1, {disk_log, node(), bert, {wrap, 1}}),
-    ?line ok = disk_log:close(bert),
+    2 = curf(bert),
+    ok = disk_log:blog(bert, B),
+    rec(1, {disk_log, node(), bert, {wrap, 1}}),
+    ok = disk_log:close(bert),
 
-    ?line {ok, bert} = disk_log:open([{name,bert}, {file, File}, 
+    {ok, bert} = disk_log:open([{name,bert}, {file, File},
 				      {type,wrap}, {notify, true}]),
     
-    % Two items expected.
-    % disk_log_1:print_index_file("bert.LOG.idx"),
+    %% Two items expected.
+    %% disk_log_1:print_index_file("bert.LOG.idx"),
     
-    ?line 1 = curf(bert),
-    ?line ok = disk_log:blog(bert, B),
+    1 = curf(bert),
+    ok = disk_log:blog(bert, B),
     %% Expect {wrap 0}. Nothing lost now, last wrap notification
     %% reported one lost item.
-    ?line rec(1, {disk_log, node(), bert, {wrap, 0}}),
+    rec(1, {disk_log, node(), bert, {wrap, 0}}),
 
-    % One item expected.
-    % disk_log_1:print_index_file("bert.LOG.idx"),
-    ?line ok = disk_log:close(bert),
+    %% One item expected.
+    %% disk_log_1:print_index_file("bert.LOG.idx"),
+    ok = disk_log:close(bert),
 
-    ?line del(File, No),
+    del(File, No),
     ok.
 
-change_attribute(suite) -> [];
-change_attribute(doc) -> 
-    ["Change notify and head"];
+%% Change notify and head.
 change_attribute(Conf) when is_list(Conf) ->
 
     Dir = ?privdir(Conf),
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line No = 4,
-    ?line del(File, No),	% cleanup
-    ?line B = mk_bytes(60),
+    File = filename:join(Dir, "n.LOG"),
+    No = 4,
+    del(File, No),	% cleanup
+    B = mk_bytes(60),
 
-    ?line Q = qlen(),
+    Q = qlen(),
 
-    % test change_notify
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+    %% test change_notify
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
 				   {size, {100,No}}]),
-    ?line {ok, n} = disk_log:open([{name, n}]), % ignored...
-    ?line ok = disk_log:log_terms(n, [B,B]),
-    ?line {error, {badarg, notify}} = disk_log:change_notify(n, self(), wrong),
-    ?line ok = disk_log:change_notify(n, self(), false),
-    ?line ok = disk_log:change_notify(n, self(), true),
-    ?line Error1 = {error, {not_owner, _}} = 
+    {ok, n} = disk_log:open([{name, n}]), % ignored...
+    ok = disk_log:log_terms(n, [B,B]),
+    {error, {badarg, notify}} = disk_log:change_notify(n, self(), wrong),
+    ok = disk_log:change_notify(n, self(), false),
+    ok = disk_log:change_notify(n, self(), true),
+    Error1 = {error, {not_owner, _}} =
         disk_log:change_notify(n, none, true),
-    ?line "The pid" ++ _ = format_error(Error1),
-    ?line 2 = no_written_items(n),
-    ?line 0 = users(n),
-    ?line Parent = self(),
-    ?line Pid = spawn(fun() -> disk_log:close(n), Parent ! {self(),done} end),
-    ?line receive {Pid, done} -> ok end,
-    ?line 0 = users(n),
-    ?line 1 = length(owners(n)),
-
-    % test change_header
-    ?line {error, {badarg, head}} = disk_log:change_header(n, none),
-    ?line {error, {badarg, head}} = 
+    "The pid" ++ _ = format_error(Error1),
+    2 = no_written_items(n),
+    0 = users(n),
+    Parent = self(),
+    Pid = spawn(fun() -> disk_log:close(n), Parent ! {self(),done} end),
+    receive {Pid, done} -> ok end,
+    0 = users(n),
+    1 = length(owners(n)),
+
+    %% test change_header
+    {error, {badarg, head}} = disk_log:change_header(n, none),
+    {error, {badarg, head}} =
 	disk_log:change_header(n, {head_func, {1,2,3}}),
-    ?line ok = disk_log:change_header(n, {head, header}),
-    ?line ok = disk_log:log(n, B),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line 4 = no_written_items(n),
-    ?line ok = disk_log:change_header(n, {head, none}),
-    ?line ok = disk_log:log(n, B),
-    ?line rec(1, {disk_log, node(), n, {wrap, 0}}),
-    ?line 5 = no_written_items(n),
-    ?line ok = disk_log:change_header(n, 
+    ok = disk_log:change_header(n, {head, header}),
+    ok = disk_log:log(n, B),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    4 = no_written_items(n),
+    ok = disk_log:change_header(n, {head, none}),
+    ok = disk_log:log(n, B),
+    rec(1, {disk_log, node(), n, {wrap, 0}}),
+    5 = no_written_items(n),
+    ok = disk_log:change_header(n,
 			     {head_func, {?MODULE, head_fun, [{ok,header}]}}),
-    ?line ok = disk_log:log(n, B),
-    ?line rec(1, {disk_log, node(), n, {wrap, 1}}),
-    ?line 7 = no_written_items(n),
-    ?line ok = disk_log:close(n),
-    ?line {error, no_such_log} = disk_log:close(n),
-    ?line del(File, No),
-    ?line file:delete(File), % cleanup
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {format, external},
+    ok = disk_log:log(n, B),
+    rec(1, {disk_log, node(), n, {wrap, 1}}),
+    7 = no_written_items(n),
+    ok = disk_log:close(n),
+    {error, no_such_log} = disk_log:close(n),
+    del(File, No),
+    file:delete(File), % cleanup
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {format, external},
 				   {type, halt}]),
-    ?line {error, {badarg, head}} = disk_log:change_header(n, {head, header}),
-    ?line ok = disk_log:change_header(n, {head, "header"}),
-    ?line ok = disk_log:close(n),
-    ?line file:delete(File),
+    {error, {badarg, head}} = disk_log:change_header(n, {head, header}),
+    ok = disk_log:change_header(n, {head, "header"}),
+    ok = disk_log:close(n),
+    file:delete(File),
     
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
 				   {size, {100,No}}]),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
 				   {size, {100,No}}]),
-    ?line ok = disk_log:change_notify(n, self(), true),
-    ?line ok = disk_log:change_header(n, {head, tjolahopp}),
-    ?line {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
+    ok = disk_log:change_notify(n, self(), true),
+    ok = disk_log:change_header(n, {head, tjolahopp}),
+    {ok, n} = disk_log:open([{name, n}, {file, File}, {type, wrap},
 				   {size, {100,No}}, {notify, true}]),
-    ?line ok = disk_log:close(n),
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line Q = qlen(),
-    ?line del(File, No).
+    ok = disk_log:close(n),
+    {error, no_such_log} = disk_log:info(n),
+    Q = qlen(),
+    del(File, No).
     
 
-dist_open(suite) -> [];
-dist_open(doc) -> 
-    ["Open a distributed log"];
+%% Open a distributed log.
 dist_open(Conf) when is_list(Conf) ->
-    ?line PrivDir = ?privdir(Conf),
-    ?line true = is_alive(),
-
-    ?line Q = qlen(),
-    ?line File = filename:join(PrivDir, "n.LOG"),
-    ?line File1 = filename:join(PrivDir, "n1.LOG"),
-    ?line No = 3,
-    ?line file:delete(File),
-    ?line del(File, No),	% cleanup
-    ?line del(File1, No),	% cleanup
-    ?line B = mk_bytes(60),
-
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok, Node} = start_node(disk_log, "-pa " ++ PA),
-    ?line wait_for_ready_net(),
+    PrivDir = ?privdir(Conf),
+    true = is_alive(),
+
+    Q = qlen(),
+    File = filename:join(PrivDir, "n.LOG"),
+    File1 = filename:join(PrivDir, "n1.LOG"),
+    No = 3,
+    file:delete(File),
+    del(File, No),	% cleanup
+    del(File1, No),	% cleanup
+    B = mk_bytes(60),
+
+    PA = filename:dirname(code:which(?MODULE)),
+    {ok, Node} = start_node(disk_log, "-pa " ++ PA),
+    wait_for_ready_net(),
 
     %% open non-distributed on this node:
-    ?line {ok,n} = disk_log:open([{name, n}, {file, File}, {type, halt},
+    {ok,n} = disk_log:open([{name, n}, {file, File}, {type, halt},
                                   {distributed, []}]),
 
-    ?line Error1 = {error, {halt_log, n}} = disk_log:inc_wrap_file(n),
-    ?line "The halt log" ++ _ = format_error(Error1),
-    ?line ok = disk_log:lclose(n),
-    ?line file:delete(File),
+    Error1 = {error, {halt_log, n}} = disk_log:inc_wrap_file(n),
+    "The halt log" ++ _ = format_error(Error1),
+    ok = disk_log:lclose(n),
+    file:delete(File),
 
     %% open distributed on this node:
-    ?line {[_],[]} = disk_log:open([{name, n}, {file, File}, {type, halt},
+    {[_],[]} = disk_log:open([{name, n}, {file, File}, {type, halt},
 				    {distributed, [node()]}]),
     %% the error message is ignored:
-    ?line ok = disk_log:inc_wrap_file(n),
-    ?line ok = disk_log:close(n),
-    ?line file:delete(File),
+    ok = disk_log:inc_wrap_file(n),
+    ok = disk_log:close(n),
+    file:delete(File),
 
     %% open a wrap log on this node, write something on this node
-    ?line {[_],[]} = disk_log:open([{name, n}, {file, File},
+    {[_],[]} = disk_log:open([{name, n}, {file, File},
 				    {type, wrap}, {size, {50, No}},
 				    {distributed, [node()]}]),
-    ?line ok = disk_log:log(n, B),
-    ?line ok = disk_log:close(n),
+    ok = disk_log:log(n, B),
+    ok = disk_log:close(n),
 
     %% open a wrap log on this node and aother node, write something
-    ?line {[_],[]} = disk_log:open([{name, n}, {file, File},
+    {[_],[]} = disk_log:open([{name, n}, {file, File},
 				    {type, wrap}, {size, {50, No}},
 				    {distributed, [node()]}]),
-    ?line {[_],[]} = disk_log:open([{name, n}, {file, File1},
+    {[_],[]} = disk_log:open([{name, n}, {file, File1},
 				    {type, wrap}, {size, {50, No}},
 				    {distributed, [Node]}]),
-    ?line ok = disk_log:log(n, B),
-    ?line ok = rpc:call(Node, disk_log, log, [n, B]),
-    ?line ok = disk_log:close(n),
-    ?line del(File, No),
-    ?line del(File1, No),
-    ?line file:delete(File),
+    ok = disk_log:log(n, B),
+    ok = rpc:call(Node, disk_log, log, [n, B]),
+    ok = disk_log:close(n),
+    del(File, No),
+    del(File1, No),
+    file:delete(File),
 
     %% open a wrap log on this node and another node, use lclose
-    ?line {[_],[]} = disk_log:open([{name, n}, {file, File},
+    {[_],[]} = disk_log:open([{name, n}, {file, File},
 				    {type, wrap}, {size, {50, No}},
 				    {distributed, [node()]}]),
-    ?line {[_],[]} = disk_log:open([{name, n}, {file, File},
+    {[_],[]} = disk_log:open([{name, n}, {file, File},
 				    {type, wrap}, {size, {50, No}},
 				    {distributed, [node()]},
                                     {linkto,none}]),
-    ?line {[_],[]} = disk_log:open([{name, n}, {file, File1},
+    {[_],[]} = disk_log:open([{name, n}, {file, File1},
 				    {type, wrap}, {size, {50, No}},
 				    {distributed, [Node]}]),
-    ?line [_, _] = distributed(n),
-    ?line ok = disk_log:lclose(n, Node),
-    ?line [_] = distributed(n),
-    ?line ok = disk_log:lclose(n),
-    ?line ok = disk_log:lclose(n),
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line del(File, No),
-    ?line del(File1, No),
-    ?line file:delete(File),
-
-    % open an invalid log file, and see how error are handled
-    ?line First = "n.LOG.1",
-    ?line make_file(PrivDir, First, 8),
-
-    ?line {[], [_,_]} = disk_log:open([{name, n}, {file, File},
+    [_, _] = distributed(n),
+    ok = disk_log:lclose(n, Node),
+    [_] = distributed(n),
+    ok = disk_log:lclose(n),
+    ok = disk_log:lclose(n),
+    {error, no_such_log} = disk_log:info(n),
+    del(File, No),
+    del(File1, No),
+    file:delete(File),
+
+    %% open an invalid log file, and see how error are handled
+    First = "n.LOG.1",
+    make_file(PrivDir, First, 8),
+
+    {[], [_,_]} = disk_log:open([{name, n}, {file, File},
 				       {type, wrap}, {size, {50, No}},
 				       {distributed, [Node,node()]}]),
-    ?line del(File, No),
-    ?line file:delete(File),
+    del(File, No),
+    file:delete(File),
 
-    % open a wrap on one other node (not on this node)
-    ?line {[_],[]} = disk_log:open([{name, n}, {file, File},
+    %% open a wrap on one other node (not on this node)
+    {[_],[]} = disk_log:open([{name, n}, {file, File},
 				    {type, wrap}, {size, {50, No}},
 				    {distributed, [Node]}]),
-    ?line ok = rpc:call(Node, disk_log, log, [n, B]),
-    ?line {error, no_such_log} = disk_log:lclose(n),
-    ?line ok = disk_log:close(n),
+    ok = rpc:call(Node, disk_log, log, [n, B]),
+    {error, no_such_log} = disk_log:lclose(n),
+    ok = disk_log:close(n),
 
-    ?line Q = qlen(),
+    Q = qlen(),
 
-    ?line {error, no_such_log} = disk_log:info(n),
-    ?line del(File, No),
-    ?line file:delete(File),
-    ?line stop_node(Node),
+    {error, no_such_log} = disk_log:info(n),
+    del(File, No),
+    file:delete(File),
+    stop_node(Node),
     ok.
     
-dist_error_open(suite) -> [];
-dist_error_open(doc) -> 
-    ["Open a log distributed and not distributed"];
+%% Open a log distributed and not distributed.
 dist_error_open(Conf) when is_list(Conf) ->
-    ?line PrivDir = ?privdir(Conf),
-    ?line true = is_alive(),
-
-    ?line Q = qlen(),
-    ?line File = filename:join(PrivDir, "bert.LOG"),
-    ?line File1 = filename:join(PrivDir, "bert1.LOG"),
-    ?line No = 3,
-    ?line file:delete(File),
-    ?line del(File, No),	% cleanup
-    ?line del(File1, No),	% cleanup
-
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok, Node} = start_node(disk_log, "-pa " ++ PA),
-    ?line wait_for_ready_net(),
-
-    % open non-distributed on this node:
-    ?line {ok,n} = disk_log:open([{name, n}, {file, File},
+    PrivDir = ?privdir(Conf),
+    true = is_alive(),
+
+    Q = qlen(),
+    File = filename:join(PrivDir, "bert.LOG"),
+    File1 = filename:join(PrivDir, "bert1.LOG"),
+    No = 3,
+    file:delete(File),
+    del(File, No),	% cleanup
+    del(File1, No),	% cleanup
+
+    PA = filename:dirname(code:which(?MODULE)),
+    {ok, Node} = start_node(disk_log, "-pa " ++ PA),
+    wait_for_ready_net(),
+
+    %% open non-distributed on this node:
+    {ok,n} = disk_log:open([{name, n}, {file, File},
 				  {type, wrap}, {size, {50, No}}]),
 
-    % trying to open distributed on this node (error):
-    ?line {[],[Error1={ENode,{error,{node_already_open,n}}}]} = 
+    %% trying to open distributed on this node (error):
+    {[],[Error1={ENode,{error,{node_already_open,n}}}]} =
 	disk_log:open([{name, n}, {file, File},
 		       {type, wrap}, {size, {50, No}},
 		       {distributed, [node()]}]),
-    ?line true = 
+    true =
         lists:prefix(lists:flatten(io_lib:format("~p: The distribution", 
                                                  [ENode])),
                      format_error(Error1)),
-    ?line ok = disk_log:lclose(n),
+    ok = disk_log:lclose(n),
 
-    % open distributed on this node:
-    ?line {[_],[]} = disk_log:open([{name, n}, {file, File},
+    %% open distributed on this node:
+    {[_],[]} = disk_log:open([{name, n}, {file, File},
 				    {type, wrap}, {size, {50, No}},
 				    {distributed, [node()]}]),
     
-    % trying to open non-distributed on this node (error):
-    ?line {_,{node_already_open,n}} = 
+    %% trying to open non-distributed on this node (error):
+    {_,{node_already_open,n}} =
 	disk_log:open([{name, n}, {file, File},
 		       {type, wrap}, {size, {50, No}}]),
 
-    ?line ok = disk_log:close(n),
-    ?line Q = qlen(),
+    ok = disk_log:close(n),
+    Q = qlen(),
 
-    ?line del(File, No),
-    ?line del(File1, No),
-    ?line file:delete(File),
-    ?line stop_node(Node),
+    del(File, No),
+    del(File1, No),
+    file:delete(File),
+    stop_node(Node),
     ok.
 
-dist_notify(suite) -> [];
-dist_notify(doc) -> 
-    ["Notification from other node"];
+%% Notification from other node.
 dist_notify(Conf) when is_list(Conf) ->
-    ?line PrivDir = ?privdir(Conf),
-    ?line true = is_alive(),
+    PrivDir = ?privdir(Conf),
+    true = is_alive(),
     
-    ?line File = filename:join(PrivDir, "bert.LOG"),
-    ?line File1 = filename:join(PrivDir, "bert1.LOG"),
-    ?line No = 3,
-    ?line B = mk_bytes(60),
-    ?line file:delete(File),
-    ?line file:delete(File1),
-    ?line del(File, No),	% cleanup
-    ?line del(File1, No),
-
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok, Node} = start_node(disk_log, "-pa " ++ PA),
-    ?line wait_for_ready_net(),
-
-    % opening distributed on this node:
-    ?line {[_],[]} = disk_log:open([{name, n}, {file, File}, {notify, false},
+    File = filename:join(PrivDir, "bert.LOG"),
+    File1 = filename:join(PrivDir, "bert1.LOG"),
+    No = 3,
+    B = mk_bytes(60),
+    file:delete(File),
+    file:delete(File1),
+    del(File, No),	% cleanup
+    del(File1, No),
+
+    PA = filename:dirname(code:which(?MODULE)),
+    {ok, Node} = start_node(disk_log, "-pa " ++ PA),
+    wait_for_ready_net(),
+
+    %% opening distributed on this node:
+    {[_],[]} = disk_log:open([{name, n}, {file, File}, {notify, false},
 				    {type, wrap}, {size, {50, No}},
 				    {distributed, [node()]}]),
 
-    % opening distributed on other node:
-    ?line {[_],[]} = disk_log:open([{name, n}, {file, File1}, 
+    %% opening distributed on other node:
+    {[_],[]} = disk_log:open([{name, n}, {file, File1},
 				    {notify, true}, {linkto, self()},
 				    {type, wrap}, {size, {50, No}},
 				    {distributed, [Node]}]),
-    ?line disk_log:alog(n, B),
-    ?line disk_log:alog(n, B),
-    ?line ok = disk_log:sync(n),
-    ?line rec(1, {disk_log, Node, n, {wrap, 0}}),
-    ?line ok = disk_log:close(n),
-
-    ?line del(File, No),
-    ?line del(File1, No),
-    ?line file:delete(File),
-    ?line stop_node(Node),
+    disk_log:alog(n, B),
+    disk_log:alog(n, B),
+    ok = disk_log:sync(n),
+    rec(1, {disk_log, Node, n, {wrap, 0}}),
+    ok = disk_log:close(n),
+
+    del(File, No),
+    del(File1, No),
+    file:delete(File),
+    stop_node(Node),
     ok.
 
-dist_terminate(suite) -> [];
-dist_terminate(doc) -> 
-    ["Terminating nodes with distributed logs"];
+%% Terminating nodes with distributed logs.
 dist_terminate(Conf) when is_list(Conf) ->
-    ?line Dir = ?privdir(Conf),
-    ?line true = is_alive(),
+    Dir = ?privdir(Conf),
+    true = is_alive(),
 
-    ?line File = filename:join(Dir, "n.LOG"),
-    ?line File1 = filename:join(Dir, "n1.LOG"),
+    File = filename:join(Dir, "n.LOG"),
+    File1 = filename:join(Dir, "n1.LOG"),
     No = 1,
     del(File, No),	% cleanup
     del(File1, No),	% cleanup
 
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok, Node} = start_node(disk_log, "-pa " ++ PA),
-    ?line wait_for_ready_net(),
+    PA = filename:dirname(code:which(?MODULE)),
+    {ok, Node} = start_node(disk_log, "-pa " ++ PA),
+    wait_for_ready_net(),
 
     %% Distributed versions of two of the situations in close_block(/1.
 
     %% One of two owners terminates.
-    ?line Pid1 = spawn_link(?MODULE, lserv, [n]),
-    ?line Pid2 = spawn_link(?MODULE, lserv, [n]),
-    ?line {[{_, {ok, n}}], []} = sync_do(Pid1, {dist_open, File, node()}),
-    ?line {[{_, {ok, n}}], []} = sync_do(Pid2, {dist_open, File1, Node}),
-    ?line [_] = sync_do(Pid1, owners),
-    ?line [_] = sync_do(Pid2, owners),
-    ?line 0 = sync_do(Pid1, users),
-    ?line 0 = sync_do(Pid2, users),
-    ?line sync_do(Pid1, terminate),
-    ?line [_] = sync_do(Pid2, owners),
-    ?line 0 = sync_do(Pid2, users),
-    ?line sync_do(Pid2, terminate),    
-    ?line {error, no_such_log} = disk_log:info(n),
+    Pid1 = spawn_link(?MODULE, lserv, [n]),
+    Pid2 = spawn_link(?MODULE, lserv, [n]),
+    {[{_, {ok, n}}], []} = sync_do(Pid1, {dist_open, File, node()}),
+    {[{_, {ok, n}}], []} = sync_do(Pid2, {dist_open, File1, Node}),
+    [_] = sync_do(Pid1, owners),
+    [_] = sync_do(Pid2, owners),
+    0 = sync_do(Pid1, users),
+    0 = sync_do(Pid2, users),
+    sync_do(Pid1, terminate),
+    [_] = sync_do(Pid2, owners),
+    0 = sync_do(Pid2, users),
+    sync_do(Pid2, terminate),
+    {error, no_such_log} = disk_log:info(n),
 
     %% Users terminate (no link...).
-    ?line Pid3 = spawn_link(?MODULE, lserv, [n]),
-    ?line Pid4 = spawn_link(?MODULE, lserv, [n]),
-    ?line {[{_, {ok, n}}], []} = 
+    Pid3 = spawn_link(?MODULE, lserv, [n]),
+    Pid4 = spawn_link(?MODULE, lserv, [n]),
+    {[{_, {ok, n}}], []} =
 	sync_do(Pid3, {dist_open, File, none, node()}),
-    ?line {[{_, {ok, n}}], []} = 
+    {[{_, {ok, n}}], []} =
 	sync_do(Pid4, {dist_open, File1, none, Node}),
-    ?line [] = sync_do(Pid3, owners),
-    ?line [] = sync_do(Pid4, owners),
-    ?line 1 = sync_do(Pid3, users),
-    ?line 1 = sync_do(Pid4, users),
-    ?line sync_do(Pid3, terminate),
-    ?line [] = sync_do(Pid4, owners),
-    ?line 1 = sync_do(Pid4, users),
-    ?line sync_do(Pid4, terminate),    
-    ?line ok = disk_log:close(n), % closing all nodes
-    ?line {error, no_such_log} = disk_log:info(n),
+    [] = sync_do(Pid3, owners),
+    [] = sync_do(Pid4, owners),
+    1 = sync_do(Pid3, users),
+    1 = sync_do(Pid4, users),
+    sync_do(Pid3, terminate),
+    [] = sync_do(Pid4, owners),
+    1 = sync_do(Pid4, users),
+    sync_do(Pid4, terminate),
+    ok = disk_log:close(n), % closing all nodes
+    {error, no_such_log} = disk_log:info(n),
     
-    ?line del(File, No),
-    ?line del(File1, No),
-    ?line stop_node(Node),
+    del(File, No),
+    del(File1, No),
+    stop_node(Node),
     ok.
 
-dist_accessible(suite) -> [];
-dist_accessible(doc) -> 
-    ["Accessible logs on nodes"];
+%% Accessible logs on nodes.
 dist_accessible(Conf) when is_list(Conf) ->
-    ?line PrivDir = ?privdir(Conf),
-
-    ?line true = is_alive(),
-
-    ?line F1 = filename:join(PrivDir, "a.LOG"),
-    ?line file:delete(F1),
-    ?line F2 = filename:join(PrivDir, "b.LOG"),
-    ?line file:delete(F2),
-    ?line F3 = filename:join(PrivDir, "c.LOG"),
-    ?line file:delete(F3),
-    ?line F4 = filename:join(PrivDir, "d.LOG"),
-    ?line file:delete(F1),
-    ?line F5 = filename:join(PrivDir, "e.LOG"),
-    ?line file:delete(F2),
-    ?line F6 = filename:join(PrivDir, "f.LOG"),
-    ?line file:delete(F3),
-
-    ?line {[],[]} = disk_log:accessible_logs(),
-    ?line {ok, a} = disk_log:open([{name, a}, {type, halt}, {file, F1}]),
-    ?line {[a],[]} = disk_log:accessible_logs(),
-    ?line {ok, b} = disk_log:open([{name, b}, {type, halt}, {file, F2}]),
-    ?line {[a,b],[]} = disk_log:accessible_logs(),
-    ?line {ok, c} = disk_log:open([{name, c}, {type, halt}, {file, F3}]),
-    ?line {[a,b,c],[]} = disk_log:accessible_logs(),
-
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok, Node} = start_node(disk_log, "-pa " ++ PA),
-    ?line wait_for_ready_net(),
-
-    ?line {[_],[]} = disk_log:open([{name, a}, {file, F4}, {type, halt},
+    PrivDir = ?privdir(Conf),
+
+    true = is_alive(),
+
+    F1 = filename:join(PrivDir, "a.LOG"),
+    file:delete(F1),
+    F2 = filename:join(PrivDir, "b.LOG"),
+    file:delete(F2),
+    F3 = filename:join(PrivDir, "c.LOG"),
+    file:delete(F3),
+    F4 = filename:join(PrivDir, "d.LOG"),
+    file:delete(F1),
+    F5 = filename:join(PrivDir, "e.LOG"),
+    file:delete(F2),
+    F6 = filename:join(PrivDir, "f.LOG"),
+    file:delete(F3),
+
+    {[],[]} = disk_log:accessible_logs(),
+    {ok, a} = disk_log:open([{name, a}, {type, halt}, {file, F1}]),
+    {[a],[]} = disk_log:accessible_logs(),
+    {ok, b} = disk_log:open([{name, b}, {type, halt}, {file, F2}]),
+    {[a,b],[]} = disk_log:accessible_logs(),
+    {ok, c} = disk_log:open([{name, c}, {type, halt}, {file, F3}]),
+    {[a,b,c],[]} = disk_log:accessible_logs(),
+
+    PA = filename:dirname(code:which(?MODULE)),
+    {ok, Node} = start_node(disk_log, "-pa " ++ PA),
+    wait_for_ready_net(),
+
+    {[_],[]} = disk_log:open([{name, a}, {file, F4}, {type, halt},
 				    {distributed, [Node]}]),
-    ?line {[a,b,c],[]} = disk_log:accessible_logs(),
-    ?line {[],[a]} = rpc:call(Node, disk_log, accessible_logs, []),
-    ?line {[_],[]} = disk_log:open([{name, b}, {file, F5}, {type, halt},
+    {[a,b,c],[]} = disk_log:accessible_logs(),
+    {[],[a]} = rpc:call(Node, disk_log, accessible_logs, []),
+    {[_],[]} = disk_log:open([{name, b}, {file, F5}, {type, halt},
 				    {distributed, [Node]}]),
-    ?line {[],[a,b]} = rpc:call(Node, disk_log, accessible_logs, []),
-    ?line {[_],[]} = disk_log:open([{name, c}, {file, F6}, {type, halt},
+    {[],[a,b]} = rpc:call(Node, disk_log, accessible_logs, []),
+    {[_],[]} = disk_log:open([{name, c}, {file, F6}, {type, halt},
 				    {distributed, [Node]}]),
-    ?line {[],[a,b,c]} = rpc:call(Node, disk_log, accessible_logs, []),
-    ?line {[a,b,c],[]} = disk_log:accessible_logs(),
-    ?line ok = disk_log:close(a),
-    ?line {[b,c],[a]} = disk_log:accessible_logs(),
-    ?line ok = disk_log:close(b),
-    ?line {[c],[a,b]} = disk_log:accessible_logs(),
-    ?line ok = disk_log:close(b),
-    ?line {[c],[a]} = disk_log:accessible_logs(),
-    ?line {[],[a,c]} = rpc:call(Node, disk_log, accessible_logs, []),
-    ?line ok = disk_log:close(c),
-    ?line {[],[a,c]} = disk_log:accessible_logs(),
-    ?line ok = disk_log:close(c),
-    ?line {[],[a]} = disk_log:accessible_logs(),
-    ?line {[],[a]} = rpc:call(Node, disk_log, accessible_logs, []),
-    ?line ok = disk_log:close(a),
-    ?line {[],[]} = disk_log:accessible_logs(),
-    ?line {[],[]} = rpc:call(Node, disk_log, accessible_logs, []),
-
-    ?line file:delete(F1),
-    ?line file:delete(F2),
-    ?line file:delete(F3),
-    ?line file:delete(F4),
-    ?line file:delete(F5),
-    ?line file:delete(F6),
-
-    ?line stop_node(Node),
+    {[],[a,b,c]} = rpc:call(Node, disk_log, accessible_logs, []),
+    {[a,b,c],[]} = disk_log:accessible_logs(),
+    ok = disk_log:close(a),
+    {[b,c],[a]} = disk_log:accessible_logs(),
+    ok = disk_log:close(b),
+    {[c],[a,b]} = disk_log:accessible_logs(),
+    ok = disk_log:close(b),
+    {[c],[a]} = disk_log:accessible_logs(),
+    {[],[a,c]} = rpc:call(Node, disk_log, accessible_logs, []),
+    ok = disk_log:close(c),
+    {[],[a,c]} = disk_log:accessible_logs(),
+    ok = disk_log:close(c),
+    {[],[a]} = disk_log:accessible_logs(),
+    {[],[a]} = rpc:call(Node, disk_log, accessible_logs, []),
+    ok = disk_log:close(a),
+    {[],[]} = disk_log:accessible_logs(),
+    {[],[]} = rpc:call(Node, disk_log, accessible_logs, []),
+
+    file:delete(F1),
+    file:delete(F2),
+    file:delete(F3),
+    file:delete(F4),
+    file:delete(F5),
+    file:delete(F6),
+
+    stop_node(Node),
     ok.
 
-dist_deadlock(suite) -> [];
-dist_deadlock(doc) -> 
-    ["OTP-4405. Deadlock between two nodes could happen."];
+%% OTP-4405. Deadlock between two nodes could happen.
 dist_deadlock(Conf) when is_list(Conf) ->
-    ?line PrivDir = ?privdir(Conf),
+    PrivDir = ?privdir(Conf),
 
-    ?line true = is_alive(),
+    true = is_alive(),
 
-    ?line F1 = filename:join(PrivDir, "a.LOG"),
-    ?line file:delete(F1),
-    ?line F2 = filename:join(PrivDir, "b.LOG"),
-    ?line file:delete(F2),
+    F1 = filename:join(PrivDir, "a.LOG"),
+    file:delete(F1),
+    F2 = filename:join(PrivDir, "b.LOG"),
+    file:delete(F2),
 
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok, Node1} = start_node(disk_log_node1, "-pa " ++ PA),
-    ?line {ok, Node2} = start_node(disk_log_node2, "-pa " ++ PA),
-    ?line wait_for_ready_net(),
+    PA = filename:dirname(code:which(?MODULE)),
+    {ok, Node1} = start_node(disk_log_node1, "-pa " ++ PA),
+    {ok, Node2} = start_node(disk_log_node2, "-pa " ++ PA),
+    wait_for_ready_net(),
 
     Self = self(),
     Fun1 = fun() -> dist_dl(Node2, a, F1, Self) end,
@@ -4477,11 +4367,11 @@ dist_deadlock(Conf) when is_list(Conf) ->
     receive {P1, a} -> ok end,
     receive {P2, b} -> ok end,
 
-    ?line stop_node(Node1),
-    ?line stop_node(Node2),
+    stop_node(Node1),
+    stop_node(Node2),
 
-    ?line file:delete(F1),
-    ?line file:delete(F2),
+    file:delete(F1),
+    file:delete(F2),
     ok.
 
 dist_dl(Node, Name, File, Pid) ->
@@ -4492,12 +4382,10 @@ dist_dl(Node, Name, File, Pid) ->
     Pid ! {self(), Name},
     ok.
 
-dist_open2(suite) -> [];
-dist_open2(doc) -> 
-    ["OTP-4480. Opening several logs simultaneously."];
+%% OTP-4480. Opening several logs simultaneously.
 dist_open2(Conf) when is_list(Conf) ->
-    ?line true = is_alive(),
-    ?line {ok, _Pg2} = pg2:start(),
+    true = is_alive(),
+    {ok, _Pg2} = pg2:start(),
 
     dist_open2_1(Conf, 0),
     dist_open2_1(Conf, 100),
@@ -4513,9 +4401,9 @@ dist_open2(Conf) when is_list(Conf) ->
     %% to open the log. The second one succeeds, and the third one is
     %% attached.
     P0 = pps(),
-    ?line File0 = "n.LOG",
-    ?line File = filename:join(PrivDir, File0),
-    ?line make_file(PrivDir, File0, 8),
+    File0 = "n.LOG",
+    File = filename:join(PrivDir, File0),
+    make_file(PrivDir, File0, 8),
 
     Parent = self(),
     F1 = fun() -> R = disk_log:open([{name, Log}, {file, File},
@@ -4529,18 +4417,18 @@ dist_open2(Conf) when is_list(Conf) ->
                   Parent ! {self(), R},
                   timer:sleep(300)
          end,
-    ?line Pid1 = spawn(F1),
+    Pid1 = spawn(F1),
     timer:sleep(10),
-    ?line Pid2 = spawn(F2),
-    ?line Pid3 = spawn(F2),
+    Pid2 = spawn(F2),
+    Pid3 = spawn(F2),
 
-    ?line receive {Pid1,R1} -> {[],[_]} = R1 end,
-    ?line receive {Pid2,R2} -> {[_],[]} = R2 end,
-    ?line receive {Pid3,R3} -> {[_],[]} = R3 end,
+    receive {Pid1,R1} -> {[],[_]} = R1 end,
+    receive {Pid2,R2} -> {[_],[]} = R2 end,
+    receive {Pid3,R3} -> {[_],[]} = R3 end,
 
     timer:sleep(500),
-    ?line file:delete(File),
-    ?line true = (P0 == pps()),
+    file:delete(File),
+    true = (P0 == pps()),
 
     %% This time the first process has a naughty head_func. This test
     %% does not add very much. Perhaps it should be removed. However,
@@ -4561,15 +4449,15 @@ dist_open2(Conf) when is_list(Conf) ->
                                     {type,halt}]),
                  Parent ! {self(), R}
          end,
-    ?line Pid4 = spawn(F3),
+    Pid4 = spawn(F3),
     timer:sleep(10),
-    ?line Pid5 = spawn(F4),
-    ?line Pid6 = spawn(F4),
+    Pid5 = spawn(F4),
+    Pid6 = spawn(F4),
     %% The timing is crucial here.
-    ?line R = case receive {Pid4,R4} -> R4 end of
+    R = case receive {Pid4,R4} -> R4 end of
                   {error, no_such_log} ->
-                      ?line R5 = receive {Pid5, R5a} -> R5a end,
-                      ?line R6 = receive {Pid6, R6a} -> R6a end,
+                      R5 = receive {Pid5, R5a} -> R5a end,
+                      R6 = receive {Pid6, R6a} -> R6a end,
                       case {R5, R6} of
                           {{repaired, _, _, _}, {ok, Log}} -> ok;
                           {{ok, Log}, {repaired, _, _, _}} -> ok;
@@ -4577,16 +4465,16 @@ dist_open2(Conf) when is_list(Conf) ->
                       end,
                       ok;
                   {ok, Log} -> % uninteresting case
-                      ?line receive {Pid5,_R5} -> ok end,
-                      ?line receive {Pid6,_R6} -> ok end,
+                      receive {Pid5,_R5} -> ok end,
+                      receive {Pid6,_R6} -> ok end,
                       {comment, 
                        "Timing dependent test did not check anything."}
               end,
 
     timer:sleep(100),
-    ?line {error, no_such_log} = disk_log:close(Log),
+    {error, no_such_log} = disk_log:close(Log),
     file:delete(File),
-    ?line true = (P0 == pps()),
+    true = (P0 == pps()),
 
     No = 2,
     Log2 = n2,
@@ -4598,7 +4486,7 @@ dist_open2(Conf) when is_list(Conf) ->
     %% processes should be able to attach to other log without having to
     %% wait.
 
-    ?line {ok,Log} = 
+    {ok,Log} =
         disk_log:open([{name,Log},{file,File},{type,wrap},{size,{100,No}}]),
     Pid = spawn(fun() -> 
                         receive {HeadPid, start} -> ok end,
@@ -4607,15 +4495,15 @@ dist_open2(Conf) when is_list(Conf) ->
                         HeadPid ! {self(), done}
                 end),
     HeadFunc = {?MODULE, slow_header, [Pid]},
-    ?line ok = disk_log:change_header(Log, {head_func, HeadFunc}),
-    ?line ok = disk_log:inc_wrap_file(Log), % header is written
+    ok = disk_log:change_header(Log, {head_func, HeadFunc}),
+    ok = disk_log:inc_wrap_file(Log), % header is written
 
     timer:sleep(100),
-    ?line ok = disk_log:close(Log),
+    ok = disk_log:close(Log),
 
     file:delete(File2),
     del(File, No),
-    ?line true = (P0 == pps()),
+    true = (P0 == pps()),
 
     R.
     
@@ -4625,13 +4513,13 @@ dist_open2_1(Conf, Delay) ->
     Log = n,
 
     A0 = [{name,Log},{file,File},{type,halt}],
-    ?line create_opened_log(File, A0),
+    create_opened_log(File, A0),
     P0 = pps(),
 
     Log2 = log2,
     File2 = "log2.LOG",
-    ?line file:delete(File2),
-    ?line {ok,Log2} = disk_log:open([{name,Log2},{file,File2},{type,halt}]),
+    file:delete(File2),
+    {ok,Log2} = disk_log:open([{name,Log2},{file,File2},{type,halt}]),
 
     Parent = self(),
     F = fun() -> 
@@ -4639,28 +4527,28 @@ dist_open2_1(Conf, Delay) ->
                 timer:sleep(Delay),
                 Parent ! {self(), R}
         end,
-    ?line Pid1 = spawn(F),
+    Pid1 = spawn(F),
     timer:sleep(10),
-    ?line Pid2 = spawn(F),
-    ?line Pid3 = spawn(F),
-    ?line {error, no_such_log} = disk_log:log(Log, term), % is repairing now
-    ?line 0 = qlen(),
+    Pid2 = spawn(F),
+    Pid3 = spawn(F),
+    {error, no_such_log} = disk_log:log(Log, term), % is repairing now
+    0 = qlen(),
 
     %% The file is already open, so this will not take long.
-    ?line {ok,Log2} = disk_log:open([{name,Log2},{file,File2},{type,halt}]),
-    ?line 0 = qlen(), % still repairing
-    ?line ok = disk_log:close(Log2),
-    ?line {error, no_such_log} = disk_log:close(Log2),
-    ?line file:delete(File2),
-
-    ?line receive {Pid1,R1} -> {repaired,_,_,_} = R1 end,
-    ?line receive {Pid2,R2} -> {ok,_} = R2 end,
-    ?line receive {Pid3,R3} -> {ok,_} = R3 end,
+    {ok,Log2} = disk_log:open([{name,Log2},{file,File2},{type,halt}]),
+    0 = qlen(), % still repairing
+    ok = disk_log:close(Log2),
+    {error, no_such_log} = disk_log:close(Log2),
+    file:delete(File2),
+
+    receive {Pid1,R1} -> {repaired,_,_,_} = R1 end,
+    receive {Pid2,R2} -> {ok,_} = R2 end,
+    receive {Pid3,R3} -> {ok,_} = R3 end,
     timer:sleep(500),
-    ?line {error, no_such_log} = disk_log:info(Log),
+    {error, no_such_log} = disk_log:info(Log),
 
     file:delete(File),
-    ?line true = (P0 == pps()),
+    true = (P0 == pps()),
 
     ok.
 
@@ -4669,18 +4557,18 @@ dist_open2_2(Conf, Delay) ->
     File = filename:join(Dir, "n.LOG"),
     Log = n,
 
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok, Node1} = start_node(disk_log_node2, "-pa " ++ PA),
-    ?line wait_for_ready_net(),
+    PA = filename:dirname(code:which(?MODULE)),
+    {ok, Node1} = start_node(disk_log_node2, "-pa " ++ PA),
+    wait_for_ready_net(),
     P0 = pps(),
 
     A0 = [{name,Log},{file,File},{type,halt}],
-    ?line create_opened_log(File, A0),
+    create_opened_log(File, A0),
 
     Log2 = log2,
     File2 = "log2.LOG",
-    ?line file:delete(File2),
-    ?line {[{Node1,{ok,Log2}}],[]} = 
+    file:delete(File2),
+    {[{Node1,{ok,Log2}}],[]} =
         disk_log:open([{name,Log2},{file,File2},{type,halt},
                        {distributed,[Node1]}]),
 
@@ -4693,32 +4581,32 @@ dist_open2_2(Conf, Delay) ->
                 Parent ! {self(), R}
         end,
     %% And {priority, ...} probably has no effect either.
-    ?line Pid1 = spawn_opt(F, [{priority, low}]),
-    % timer:sleep(1), % no guarantee that Pid1 will return {repaired, ...}
-    ?line Pid2 = spawn_opt(F, [{priority, low}]),
-    ?line {error, no_such_log} = 
+    Pid1 = spawn_opt(F, [{priority, low}]),
+    %% timer:sleep(1), % no guarantee that Pid1 will return {repaired, ...}
+    Pid2 = spawn_opt(F, [{priority, low}]),
+    {error, no_such_log} =
         disk_log:log(Log, term), % maybe repairing now
-    ?line 0 = qlen(),
+    0 = qlen(),
 
     %% The file is already open, so this will not take long.
-    ?line {[{Node1,{ok,Log2}}],[]} = 
+    {[{Node1,{ok,Log2}}],[]} =
         disk_log:open([{name,Log2},{file,File2},{type,halt},
                        {distributed,[Node1]}]),
-    ?line 0 = qlen(), % probably still repairing
-    ?line ok = disk_log:close(Log2),
-    ?line file:delete(File2),
+    0 = qlen(), % probably still repairing
+    ok = disk_log:close(Log2),
+    file:delete(File2),
 
-    ?line receive {Pid1,R1} -> R1 end,
-    ?line receive {Pid2,R2} -> R2 end,
-    ?line case {R1, R2} of
+    receive {Pid1,R1} -> R1 end,
+    receive {Pid2,R2} -> R2 end,
+    case {R1, R2} of
 	      {{[{Node1,{repaired,_,_,_}}],[]}, 
 	       {[{Node1,{ok,Log}}],[]}}         -> ok;
 	      {{[{Node1,{ok,Log}}],[]}, 
 	       {[{Node1,{repaired,_,_,_}}],[]}} -> ok
 	  end,
 
-    ?line true = (P0 == pps()),
-    ?line stop_node(Node1),
+    true = (P0 == pps()),
+    stop_node(Node1),
     file:delete(File),
     ok.
 
@@ -4751,38 +4639,35 @@ log_terms(Log, N) ->
     ok = disk_log:log(Log, {term, N}),
     log_terms(Log, N-1).
 
-other_groups(suite) -> [];
-other_groups(doc) -> 
-    ["OTP-5810. Cope with pg2 groups that are not disk logs."];
+%% OTP-5810. Cope with pg2 groups that are not disk logs.
 other_groups(Conf) when is_list(Conf) ->
-    ?line true = is_alive(),
-    ?line PrivDir = ?privdir(Conf),
+    true = is_alive(),
+    PrivDir = ?privdir(Conf),
 
-    ?line File = filename:join(PrivDir, "n.LOG"),
-    ?line file:delete(File),
+    File = filename:join(PrivDir, "n.LOG"),
+    file:delete(File),
 
-    ?line {[],[]} = disk_log:accessible_logs(),
-    ?line {[_],[]} = disk_log:open([{name, n}, {file, File}, {type, halt},
+    {[],[]} = disk_log:accessible_logs(),
+    {[_],[]} = disk_log:open([{name, n}, {file, File}, {type, halt},
 				    {distributed, [node()]}]),
-    ?line {[],[n]} = disk_log:accessible_logs(),
+    {[],[n]} = disk_log:accessible_logs(),
     Group = grupp,
-    ?line pg2:create(Group),
-    ?line ok = pg2:join(Group, self()),
-    ?line {[],[n]} = disk_log:accessible_logs(),
-    ?line [_] = 
+    pg2:create(Group),
+    ok = pg2:join(Group, self()),
+    {[],[n]} = disk_log:accessible_logs(),
+    [_] =
         lists:filter(fun(P) -> disk_log:pid2name(P) =/= undefined end, 
                      erlang:processes()),
-    ?line pg2:delete(Group),
-    ?line {[],[n]} = disk_log:accessible_logs(),
-    ?line ok = disk_log:close(n),
-    ?line {[],[]} = disk_log:accessible_logs(),
-    ?line file:delete(File),
+    pg2:delete(Group),
+    {[],[n]} = disk_log:accessible_logs(),
+    ok = disk_log:close(n),
+    {[],[]} = disk_log:accessible_logs(),
+    file:delete(File),
 
     ok.
 
 -define(MAX, 16384). % MAX in disk_log_1.erl
-evil(suite) -> [];
-evil(doc) -> ["Evil cases such as closed file descriptor port."];
+%% Evil cases such as closed file descriptor port.
 evil(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "n.LOG"),
@@ -4790,62 +4675,62 @@ evil(Conf) when is_list(Conf) ->
 
     %% Not a very thorough test.
 
-    ?line ok = setup_evil_filled_cache_wrap(Log, Dir),
-    ?line {error, {file_error,_,einval}} = disk_log:log(Log, apa),
-    ?line ok = disk_log:close(Log),
+    ok = setup_evil_filled_cache_wrap(Log, Dir),
+    {error, {file_error,_,einval}} = disk_log:log(Log, apa),
+    ok = disk_log:close(Log),
 
-    ?line ok = setup_evil_filled_cache_halt(Log, Dir),
-    ?line {error, {file_error,_,einval}} = disk_log:truncate(Log, apa),
-    ?line ok = stop_evil(Log),
+    ok = setup_evil_filled_cache_halt(Log, Dir),
+    {error, {file_error,_,einval}} = disk_log:truncate(Log, apa),
+    ok = stop_evil(Log),
 
     %% White box test. 
     file:delete(File),
-    ?line Ports0 = erlang:ports(),
-    ?line {ok, Log} = disk_log:open([{name,Log},{file,File},{type,halt},
+    Ports0 = erlang:ports(),
+    {ok, Log} = disk_log:open([{name,Log},{file,File},{type,halt},
                                      {size,?MAX+50},{format,external}]),
-    ?line [Fd] = erlang:ports() -- Ports0,
-    ?line {B,_} = x_mk_bytes(30),
-    ?line ok = disk_log:blog(Log, <<0:(?MAX+1)/unit:8>>),
-    ?line exit(Fd, kill),
-    ?line {error, {file_error,_,einval}} = disk_log:blog_terms(Log, [B,B]),
-    ?line ok= disk_log:close(Log),
+    [Fd] = erlang:ports() -- Ports0,
+    {B,_} = x_mk_bytes(30),
+    ok = disk_log:blog(Log, <<0:(?MAX+1)/unit:8>>),
+    exit(Fd, kill),
+    {error, {file_error,_,einval}} = disk_log:blog_terms(Log, [B,B]),
+    ok= disk_log:close(Log),
     file:delete(File),
 
-    ?line ok = setup_evil_wrap(Log, Dir),
-    ?line {error, {file_error,_,einval}} = disk_log:close(Log),
+    ok = setup_evil_wrap(Log, Dir),
+    {error, {file_error,_,einval}} = disk_log:close(Log),
 
-    ?line ok = setup_evil_wrap(Log, Dir),
-    ?line {error, {file_error,_,einval}} = disk_log:log(Log, apa),
-    ?line ok = stop_evil(Log),
+    ok = setup_evil_wrap(Log, Dir),
+    {error, {file_error,_,einval}} = disk_log:log(Log, apa),
+    ok = stop_evil(Log),
 
-    ?line ok = setup_evil_halt(Log, Dir),
-    ?line {error, {file_error,_,einval}} = disk_log:log(Log, apa),
-    ?line ok = stop_evil(Log),
+    ok = setup_evil_halt(Log, Dir),
+    {error, {file_error,_,einval}} = disk_log:log(Log, apa),
+    ok = stop_evil(Log),
 
-    ?line ok = setup_evil_wrap(Log, Dir),
-    ?line {error, {file_error,_,einval}} = disk_log:reopen(Log, apa),
-    ?line {error, {file_error,_,einval}} = disk_log:reopen(Log, apa),
-    ?line ok = stop_evil(Log),
+    ok = setup_evil_wrap(Log, Dir),
+    {error, {file_error,_,einval}} = disk_log:reopen(Log, apa),
+    {error, {file_error,_,einval}} = disk_log:reopen(Log, apa),
+    ok = stop_evil(Log),
 
-    ?line ok = setup_evil_wrap(Log, Dir),
-    ?line {error, {file_error,_,einval}} = disk_log:reopen(Log, apa),
-    ?line ok = stop_evil(Log),
+    ok = setup_evil_wrap(Log, Dir),
+    {error, {file_error,_,einval}} = disk_log:reopen(Log, apa),
+    ok = stop_evil(Log),
 
-    ?line ok = setup_evil_wrap(Log, Dir),
-    ?line {error, {file_error,_,einval}} = disk_log:inc_wrap_file(Log),
-    ?line ok = stop_evil(Log),
+    ok = setup_evil_wrap(Log, Dir),
+    {error, {file_error,_,einval}} = disk_log:inc_wrap_file(Log),
+    ok = stop_evil(Log),
 
-    ?line ok = setup_evil_wrap(Log, Dir),
-    ?line {error, {file_error,_,einval}} = disk_log:chunk(Log, start),
-    ?line ok = stop_evil(Log),
+    ok = setup_evil_wrap(Log, Dir),
+    {error, {file_error,_,einval}} = disk_log:chunk(Log, start),
+    ok = stop_evil(Log),
 
-    ?line ok = setup_evil_wrap(Log, Dir),
-    ?line {error, {file_error,_,einval}} = disk_log:truncate(Log),
-    ?line ok = stop_evil(Log),
+    ok = setup_evil_wrap(Log, Dir),
+    {error, {file_error,_,einval}} = disk_log:truncate(Log),
+    ok = stop_evil(Log),
 
-    ?line ok = setup_evil_wrap(Log, Dir),
-    ?line {error, {file_error,_,einval}} = disk_log:chunk_step(Log, start, 1),
-    ?line ok = stop_evil(Log),
+    ok = setup_evil_wrap(Log, Dir),
+    {error, {file_error,_,einval}} = disk_log:chunk_step(Log, start, 1),
+    ok = stop_evil(Log),
 
     io:format("messages: ~p~n", [erlang:process_info(self(), messages)]),
     del(File, 2),
@@ -4894,25 +4779,23 @@ setup_evil_filled_cache(Log, Args, Dir) ->
     exit(Fd, kill),
     ok.
 
-otp_6278(suite) -> [];
-otp_6278(doc) -> ["OTP-6278. open/1 creates no status or crash report."];
+%% OTP-6278. open/1 creates no status or crash report.
 otp_6278(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = filename:join(Dir, "no_such_dir/no_such_file"),
-    ?line error_logger:add_report_handler(?MODULE, self()),
-    ?line {error, {file_error, _, _}} = 
+    error_logger:add_report_handler(?MODULE, self()),
+    {error, {file_error, _, _}} =
         disk_log:open([{name,n},{file,File}]),
     receive
 	{crash_report,_Pid,Report} ->
-	    ?line io:format("Unexpected: ~p\n", [Report]),
-	    ?line ?t:fail()
+	    io:format("Unexpected: ~p\n", [Report]),
+	    ct:fail(failed)
     after 1000 ->
             ok
     end,
-    ?line error_logger:delete_report_handler(?MODULE).
+    error_logger:delete_report_handler(?MODULE).
 
-otp_10131(suite) -> [];
-otp_10131(doc) -> ["OTP-10131. head_func type."];
+%% OTP-10131. head_func type.
 otp_10131(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     Log = otp_10131,
@@ -4979,7 +4862,7 @@ copy_wrap_log(FromName, ToName, N, FromDir, ToDir) ->
 -define(BUFSIZE, 8192).
 
 copy_file(Src, Dest) ->
-    % ?t:format("copying from ~p to ~p~n", [Src, Dest]),
+    %% io:format("copying from ~p to ~p~n", [Src, Dest]),
     {ok, InFd} = file:open(Src, [raw, binary, read]),
     {ok, OutFd} = file:open(Dest, [raw, binary, write]),
     ok = copy_file1(InFd, OutFd),
@@ -5104,50 +4987,15 @@ get_known(Node) ->
 
 %% Copied from erl_distribution_SUITE.erl:
 start_node(Name, Param) ->
-    ?t:start_node(Name, slave, [{args, Param}]).
+    test_server:start_node(Name, slave, [{args, Param}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
-
-%from(H, [H | T]) -> T;
-%from(H, [_ | T]) -> from(H, T);
-%from(_H, []) -> [].
-
-
-%% Check for NFS cache size, this is called from init_per_testcase() and
-%% makes different tests run depending on the size of the NFS cache on 
-%% VxWorks. Possibly this could be adopted to Windows too, but we seldom use
-%% NFS when testing on windows, so I can find better things to do.
-%% The port program used simply reads the nfsCacheSize variable on the board.
-%% If the board is configured without NFS, the port program will fail to load
-%% and this will return 0, which may or may not be the wrong thing to do.
-
-check_nfs(_Config) ->
-    0.
+    test_server:stop_node(Node).
 
-skip_expand([]) ->
-    [];
-skip_expand([Case | T]) ->
-    case (catch apply(?MODULE, Case, [suite])) of
-	{'EXIT', _} ->
-	    [Case | skip_expand(T)];
-	[] ->
-	    [Case | skip_expand(T)];
-	Res ->
-	    skip_expand(Res) ++ skip_expand(T)
-    end.
-	    
-    
-skip_list(Config) ->
-    case check_nfs(Config) of
-	0 ->
-	    skip_expand(?SKIP_NO_CACHE);
-	_ ->
-	    skip_expand(?SKIP_LARGE_CACHE)
-    end.
+%% from(H, [H | T]) -> T;
+%% from(H, [_ | T]) -> from(H, T);
+%% from(_H, []) -> [].
 
-should_skip(_Test,_Config) ->
-    false.
 
 %%-----------------------------------------------------------------
 %% The error_logger handler used.
diff --git a/lib/kernel/test/erl_boot_server_SUITE.erl b/lib/kernel/test/erl_boot_server_SUITE.erl
index 954880e252..aef1d69f62 100644
--- a/lib/kernel/test/erl_boot_server_SUITE.erl
+++ b/lib/kernel/test/erl_boot_server_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(erl_boot_server_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
 
@@ -34,7 +34,9 @@
 %% Changed for the new erl_boot_server for R3A by Bjorn Gustavsson.
 %%-----------------------------------------------------------------
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [start, start_link, stop, add, delete, responses].
@@ -57,274 +59,262 @@ end_per_group(_GroupName, Config) ->
 
 -define(all_ones, {255, 255, 255, 255}).
 
-start(doc) -> "Tests the erl_boot_server:start/1 function.";
+%% Tests the erl_boot_server:start/1 function.
 start(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(50)),
-    ?line [Host1, Host2|_] = good_hosts(Config),
+    [Host1, Host2|_] = good_hosts(Config),
 
     %% Bad arguments.
     BadHost = "bad__host",
-    ?line {error, {badarg, {}}} = erl_boot_server:start({}),
-    ?line {error, {badarg, atom}} = erl_boot_server:start(atom),
-    ?line {error, {badarg, [atom, BadHost]}} =
+    {error, {badarg, {}}} = erl_boot_server:start({}),
+    {error, {badarg, atom}} = erl_boot_server:start(atom),
+    {error, {badarg, [atom, BadHost]}} =
 	erl_boot_server:start([atom, BadHost]),
-    ?line {error, {badarg, [Host1, BadHost]}} =
+    {error, {badarg, [Host1, BadHost]}} =
 	erl_boot_server:start([Host1, BadHost]),
 
     %% Test once.
-    ?line {ok, Pid1} = erl_boot_server:start([Host1]),
-    ?line {error, {already_started, Pid1}} =
+    {ok, Pid1} = erl_boot_server:start([Host1]),
+    {error, {already_started, Pid1}} =
 	erl_boot_server:start([Host1]),
-    ?line exit(Pid1, kill),
+    exit(Pid1, kill),
 
     %% Test again.
-    test_server:sleep(1),
-    ?line {ok, Pid2} = erl_boot_server:start([Host1, Host2]),
-    ?line {error, {already_started, Pid2}} =
+    ct:sleep(1),
+    {ok, Pid2} = erl_boot_server:start([Host1, Host2]),
+    {error, {already_started, Pid2}} =
 	erl_boot_server:start([Host1, Host2]),
-    ?line exit(Pid2, kill),
-    test_server:sleep(1),
+    exit(Pid2, kill),
+    ct:sleep(1),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
-start_link(doc) -> "Tests the erl_boot_server:start_link/1 function.";
+%% Tests the erl_boot_server:start_link/1 function.
 start_link(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line [Host1, Host2|_] = good_hosts(Config),
+    [Host1, Host2|_] = good_hosts(Config),
 
     OldFlag = process_flag(trap_exit, true),
-    ?line {error, {badarg, {}}} = erl_boot_server:start_link({}),
-    ?line {error, {badarg, atom}} = erl_boot_server:start_link(atom),
-    ?line BadHost = "bad__host",
-    ?line {error, {badarg, [atom, BadHost]}} =
+    {error, {badarg, {}}} = erl_boot_server:start_link({}),
+    {error, {badarg, atom}} = erl_boot_server:start_link(atom),
+    BadHost = "bad__host",
+    {error, {badarg, [atom, BadHost]}} =
 	erl_boot_server:start_link([atom, BadHost]),
 
-    ?line {ok, Pid1} = erl_boot_server:start_link([Host1]),
-    ?line {error, {already_started, Pid1}} =
+    {ok, Pid1} = erl_boot_server:start_link([Host1]),
+    {error, {already_started, Pid1}} =
 	erl_boot_server:start_link([Host1]),
-    ?line shutdown(Pid1),
+    shutdown(Pid1),
 
-    ?line {ok, Pid2} = erl_boot_server:start_link([Host1, Host2]),
-    ?line {error, {already_started, Pid2}} =
+    {ok, Pid2} = erl_boot_server:start_link([Host1, Host2]),
+    {error, {already_started, Pid2}} =
 	erl_boot_server:start_link([Host1, Host2]),
-    ?line shutdown(Pid2),
+    shutdown(Pid2),
     process_flag(trap_exit, OldFlag),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
-stop(doc) -> "Tests that no processes are left if a boot server is killed.";
+%% Tests that no processes are left if a boot server is killed.
 stop(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(50)),
-    ?line [Host1|_] = good_hosts(Config),
+    [Host1|_] = good_hosts(Config),
 
     %% Start a boot server and kill it.  Make sure that any helper processes
     %% dies.
-    % Make sure the inet_gethost_native server is already started,
-    % otherwise it will make this test fail:
-    ?line inet:getaddr(localhost, inet),
-    ?line Before = processes(),
-    ?line {ok, Pid} = erl_boot_server:start([Host1]),
-    ?line New = processes() -- [Pid|Before],
-    ?line exit(Pid, kill),
-    ?line receive after 100 -> ok end,
-    ?line case [P || P <- New, is_process_alive(P)] of
-	      [] ->
-		  ok;
-	      NotKilled ->
-		  test_server:fail({not_killed, NotKilled})
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    %% Make sure the inet_gethost_native server is already started,
+    %% otherwise it will make this test fail:
+    inet:getaddr(localhost, inet),
+    Before = processes(),
+    {ok, Pid} = erl_boot_server:start([Host1]),
+    New = processes() -- [Pid|Before],
+    exit(Pid, kill),
+    receive after 100 -> ok end,
+    case [P || P <- New, is_process_alive(P)] of
+	[] ->
+	    ok;
+	NotKilled ->
+	    ct:fail({not_killed, NotKilled})
+    end,
     ok.
 
-add(doc) -> "Tests the erl_boot_server:add/1 function.";
+%% Tests the erl_boot_server:add/1 function.
 add(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line OldFlag = process_flag(trap_exit, true),
-    ?line {ok, Pid1} = erl_boot_server:start_link([]),
-    ?line [] = erl_boot_server:which_slaves(),
-    ?line [Host1, Host2, Host3|_] = good_hosts(Config),
+    OldFlag = process_flag(trap_exit, true),
+    {ok, Pid1} = erl_boot_server:start_link([]),
+    [] = erl_boot_server:which_slaves(),
+    [Host1, Host2, Host3|_] = good_hosts(Config),
 
     %% Try bad values.
-    ?line {error, {badarg, {}}} = erl_boot_server:add_slave({}),
-    ?line {error, {badarg, [atom]}} = erl_boot_server:add_slave([atom]),
-    ?line BadHost = "bad__host",
-    ?line {error, {badarg, BadHost}} = erl_boot_server:add_slave(BadHost),
-    ?line [] = erl_boot_server:which_slaves(),
+    {error, {badarg, {}}} = erl_boot_server:add_slave({}),
+    {error, {badarg, [atom]}} = erl_boot_server:add_slave([atom]),
+    BadHost = "bad__host",
+    {error, {badarg, BadHost}} = erl_boot_server:add_slave(BadHost),
+    [] = erl_boot_server:which_slaves(),
 
     %% Add good host names.
-    ?line {ok, Ip1} = inet:getaddr(Host1, inet),
-    ?line {ok, Ip2} = inet:getaddr(Host2, inet),
-    ?line {ok, Ip3} = inet:getaddr(Host3, inet),
-    ?line MIp1 = {?all_ones, Ip1},
-    ?line MIp2 = {?all_ones, Ip2},
-    ?line MIp3 = {?all_ones, Ip3},
-    ?line ok = erl_boot_server:add_slave(Host1),
-    ?line [MIp1] = erl_boot_server:which_slaves(),
-    ?line ok = erl_boot_server:add_slave(Host2),
-    ?line M_Ip1_Ip2 = lists:sort([MIp1, MIp2]),
-    ?line M_Ip1_Ip2 = lists:sort(erl_boot_server:which_slaves()),
-    ?line ok = erl_boot_server:add_slave(Host3),
-    ?line M_Ip1_Ip2_Ip3 = lists:sort([MIp3|M_Ip1_Ip2]),
-    ?line M_Ip1_Ip2_Ip3 = erl_boot_server:which_slaves(),
+    {ok, Ip1} = inet:getaddr(Host1, inet),
+    {ok, Ip2} = inet:getaddr(Host2, inet),
+    {ok, Ip3} = inet:getaddr(Host3, inet),
+    MIp1 = {?all_ones, Ip1},
+    MIp2 = {?all_ones, Ip2},
+    MIp3 = {?all_ones, Ip3},
+    ok = erl_boot_server:add_slave(Host1),
+    [MIp1] = erl_boot_server:which_slaves(),
+    ok = erl_boot_server:add_slave(Host2),
+    M_Ip1_Ip2 = lists:sort([MIp1, MIp2]),
+    M_Ip1_Ip2 = lists:sort(erl_boot_server:which_slaves()),
+    ok = erl_boot_server:add_slave(Host3),
+    M_Ip1_Ip2_Ip3 = lists:sort([MIp3|M_Ip1_Ip2]),
+    M_Ip1_Ip2_Ip3 = erl_boot_server:which_slaves(),
 
     %% Add duplicate names.
-    ?line ok = erl_boot_server:add_slave(Host3),
-    ?line M_Ip1_Ip2_Ip3 = erl_boot_server:which_slaves(),
+    ok = erl_boot_server:add_slave(Host3),
+    M_Ip1_Ip2_Ip3 = erl_boot_server:which_slaves(),
 
     %% More bad names.
-    ?line {error, {badarg, BadHost}} = erl_boot_server:add_slave(BadHost),
-    ?line M_Ip1_Ip2_Ip3 = erl_boot_server:which_slaves(),
+    {error, {badarg, BadHost}} = erl_boot_server:add_slave(BadHost),
+    M_Ip1_Ip2_Ip3 = erl_boot_server:which_slaves(),
 
     %% Cleanup.
-    ?line shutdown(Pid1),
-    ?line process_flag(trap_exit, OldFlag),
-    ?line test_server:timetrap_cancel(Dog),
+    shutdown(Pid1),
+    process_flag(trap_exit, OldFlag),
     ok.
 
-delete(doc) -> "Tests the erl_boot_server:delete/1 function.";
+%% Tests the erl_boot_server:delete/1 function.
 delete(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line OldFlag = process_flag(trap_exit, true),
+    OldFlag = process_flag(trap_exit, true),
 
-    ?line [Host1, Host2, Host3|_] = good_hosts(Config),
-    ?line {ok, Ip1} = inet:getaddr(Host1, inet),
-    ?line {ok, Ip2} = inet:getaddr(Host2, inet),
-    ?line {ok, Ip3} = inet:getaddr(Host3, inet),
-    ?line MIp1 = {?all_ones, Ip1},
-    ?line MIp2 = {?all_ones, Ip2},
-    ?line MIp3 = {?all_ones, Ip3},
+    [Host1, Host2, Host3|_] = good_hosts(Config),
+    {ok, Ip1} = inet:getaddr(Host1, inet),
+    {ok, Ip2} = inet:getaddr(Host2, inet),
+    {ok, Ip3} = inet:getaddr(Host3, inet),
+    MIp1 = {?all_ones, Ip1},
+    MIp2 = {?all_ones, Ip2},
+    MIp3 = {?all_ones, Ip3},
 
-    ?line {ok, Pid1} = erl_boot_server:start_link([Host1, Host2, Host3]),
-    ?line M_Ip123 = lists:sort([MIp1, MIp2, MIp3]),
-    ?line M_Ip123 = erl_boot_server:which_slaves(),
+    {ok, Pid1} = erl_boot_server:start_link([Host1, Host2, Host3]),
+    M_Ip123 = lists:sort([MIp1, MIp2, MIp3]),
+    M_Ip123 = erl_boot_server:which_slaves(),
 
     %% Do some bad attempts and check that the list of slaves is intact.
-    ?line {error, {badarg, {}}} = erl_boot_server:delete_slave({}),
-    ?line {error, {badarg, [atom]}} = erl_boot_server:delete_slave([atom]),
-    ?line BadHost = "bad__host",
-    ?line {error, {badarg, BadHost}} = erl_boot_server:delete_slave(BadHost),
-    ?line M_Ip123 = erl_boot_server:which_slaves(),
+    {error, {badarg, {}}} = erl_boot_server:delete_slave({}),
+    {error, {badarg, [atom]}} = erl_boot_server:delete_slave([atom]),
+    BadHost = "bad__host",
+    {error, {badarg, BadHost}} = erl_boot_server:delete_slave(BadHost),
+    M_Ip123 = erl_boot_server:which_slaves(),
 
     %% Delete Host2 and make sure it's gone.
-    ?line ok = erl_boot_server:delete_slave(Host2),
-    ?line M_Ip13 = lists:sort([MIp1, MIp3]),
-    ?line M_Ip13 = erl_boot_server:which_slaves(),
-
-    ?line ok = erl_boot_server:delete_slave(Host1),
-    ?line [MIp3] = erl_boot_server:which_slaves(),
-    ?line ok = erl_boot_server:delete_slave(Host1),
-    ?line [MIp3] = erl_boot_server:which_slaves(),
-
-    ?line {error, {badarg, BadHost}} = erl_boot_server:delete_slave(BadHost),
-    ?line [MIp3] = erl_boot_server:which_slaves(),
-
-    ?line ok = erl_boot_server:delete_slave(Ip3),
-    ?line [] = erl_boot_server:which_slaves(),
-    ?line ok = erl_boot_server:delete_slave(Ip3),
-    ?line [] = erl_boot_server:which_slaves(),
-
-    ?line shutdown(Pid1),
-    ?line process_flag(trap_exit, OldFlag),
-    ?line test_server:timetrap_cancel(Dog),
+    ok = erl_boot_server:delete_slave(Host2),
+    M_Ip13 = lists:sort([MIp1, MIp3]),
+    M_Ip13 = erl_boot_server:which_slaves(),
+
+    ok = erl_boot_server:delete_slave(Host1),
+    [MIp3] = erl_boot_server:which_slaves(),
+    ok = erl_boot_server:delete_slave(Host1),
+    [MIp3] = erl_boot_server:which_slaves(),
+
+    {error, {badarg, BadHost}} = erl_boot_server:delete_slave(BadHost),
+    [MIp3] = erl_boot_server:which_slaves(),
+
+    ok = erl_boot_server:delete_slave(Ip3),
+    [] = erl_boot_server:which_slaves(),
+    ok = erl_boot_server:delete_slave(Ip3),
+    [] = erl_boot_server:which_slaves(),
+
+    shutdown(Pid1),
+    process_flag(trap_exit, OldFlag),
     ok.
 
-responses(doc) -> "Tests erl_boot_server responses to slave requests.";
+%% Tests erl_boot_server responses to slave requests.
 responses(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(30)),
-    ?line process_flag(trap_exit, true),
+    process_flag(trap_exit, true),
     %% Copy from inet_boot.hrl
     EBOOT_PORT = 4368,
     EBOOT_REQUEST = "EBOOTQ",
     EBOOT_REPLY =   "EBOOTR",
 
-    ?line {ok,Host} = inet:gethostname(),
-    ?line {ok,Ip} = inet:getaddr(Host, inet),
+    {ok,Host} = inet:gethostname(),
+    {ok,Ip} = inet:getaddr(Host, inet),
 
     ThisVer = erlang:system_info(version),
 
-    ?line {ok,BootPid} = erl_boot_server:start_link([Host]),
+    {ok,BootPid} = erl_boot_server:start_link([Host]),
 
     %% Send junk
-    ?line S1 = open_udp(),
-    ?line prim_inet:sendto(S1, Ip, EBOOT_PORT, ["0"]),
+    S1 = open_udp(),
+    prim_inet:sendto(S1, Ip, EBOOT_PORT, ["0"]),
     receive
 	What ->
-	    ?line close_udp(S1),
-	    ?line ?t:fail({"got unexpected response",What})
+	    close_udp(S1),
+	    ct:fail({"got unexpected response",What})
     after 100 ->
 	    ok
     end,
 
     %% Req from a slave with same erlang vsn.
-    ?line S2 = open_udp(),
-    ?line prim_inet:sendto(S2, Ip, EBOOT_PORT, [EBOOT_REQUEST,ThisVer]),
+    S2 = open_udp(),
+    prim_inet:sendto(S2, Ip, EBOOT_PORT, [EBOOT_REQUEST,ThisVer]),
     receive
 	{udp,S2,Ip,_Port1,Resp1} ->
-	    ?line close_udp(S2),
-	    ?line EBOOT_REPLY = string:substr(Resp1, 1, length(EBOOT_REPLY)),
-	    ?line Rest1 = string:substr(Resp1, length(EBOOT_REPLY)+1, length(Resp1)),
-	    ?line [_,_,_ | ThisVer] = Rest1
+	    close_udp(S2),
+	    EBOOT_REPLY = string:substr(Resp1, 1, length(EBOOT_REPLY)),
+	    Rest1 = string:substr(Resp1, length(EBOOT_REPLY)+1, length(Resp1)),
+	    [_,_,_ | ThisVer] = Rest1
     after 2000 ->
-	    ?line close_udp(S2),
-	    ?line ?t:fail("no boot server response; same vsn")
+	    close_udp(S2),
+	    ct:fail("no boot server response; same vsn")
     end,
-    
+
     %% Req from a slave with other erlang vsn.
-    ?line S3 = open_udp(),
-    ?line prim_inet:sendto(S3, Ip, EBOOT_PORT, [EBOOT_REQUEST,"1.0"]),
+    S3 = open_udp(),
+    prim_inet:sendto(S3, Ip, EBOOT_PORT, [EBOOT_REQUEST,"1.0"]),
     receive
 	Anything ->
-	    ?line close_udp(S3),
-	    ?line ?t:fail({"got unexpected response",Anything})
+	    close_udp(S3),
+	    ct:fail({"got unexpected response",Anything})
     after 100 ->
 	    ok
     end,
 
     %% Kill the boot server and wait for it to disappear.
-    ?line unlink(BootPid),
-    ?line BootPidMref = erlang:monitor(process, BootPid),
-    ?line exit(BootPid, kill),
+    unlink(BootPid),
+    BootPidMref = erlang:monitor(process, BootPid),
+    exit(BootPid, kill),
     receive
 	{'DOWN',BootPidMref,_,_,_} -> ok
     end,
 
-    ?line {ok,BootPid2} = erl_boot_server:start_link(["127.0.0.1"]),
+    {ok,BootPid2} = erl_boot_server:start_link(["127.0.0.1"]),
 
     %% Req from slave with invalid ip address.
-    ?line S4 = open_udp(),
+    S4 = open_udp(),
     Ret =
 	case Ip of
 	    {127,0,0,1} ->
 		{comment,"IP address for this host is 127.0.0.1"};
 	    _ ->
-		?line prim_inet:sendto(S4, Ip, EBOOT_PORT,
-				       [EBOOT_REQUEST,ThisVer]),
+		prim_inet:sendto(S4, Ip, EBOOT_PORT,
+				 [EBOOT_REQUEST,ThisVer]),
 		receive
 		    Huh ->
-			?line close_udp(S4),
-			?line ?t:fail({"got unexpected response",Huh})
+			close_udp(S4),
+			ct:fail({"got unexpected response",Huh})
 		after 100 ->
 			ok
 		end
 	end,
 
-    ?line unlink(BootPid2),
-    ?line exit(BootPid2, kill),
+    unlink(BootPid2),
+    exit(BootPid2, kill),
 
     %% Now wait for any late unexpected messages.
     receive
 	Whatever ->
-	    ?line ?t:fail({unexpected_message,Whatever})
+	    ct:fail({unexpected_message,Whatever})
     after 4000 ->
-	    ?line close_udp(S1),
-	    ?line close_udp(S3),
-	    ?line close_udp(S4),
+	    close_udp(S1),
+	    close_udp(S3),
+	    close_udp(S4),
 	    ok
     end,
 
-    ?line test_server:timetrap_cancel(Dog),
     Ret.
 
 shutdown(Pid) ->
@@ -335,7 +325,7 @@ shutdown(Pid) ->
     after 1000 ->
 	    %% The timeout used to be 1 ms, which could be too short time for the
 	    %% SMP emulator on a slow computer with one CPU.
-	    test_server:fail(shutdown)
+	    ct:fail(shutdown)
     end.
 
 good_hosts(_Config) ->
@@ -347,10 +337,10 @@ good_hosts(_Config) ->
     [GoodHost1, GoodHost2, GoodHost3].
 
 open_udp() ->
-    ?line {ok, S} = prim_inet:open(udp, inet, dgram),
-    ?line ok = prim_inet:setopts(S, [{mode,list},{active,true}, 
-				     {deliver,term},{broadcast,true}]),
-    ?line {ok,_} = prim_inet:bind(S, {0,0,0,0}, 0),
+    {ok, S} = prim_inet:open(udp, inet, dgram),
+    ok = prim_inet:setopts(S, [{mode,list},{active,true},
+			       {deliver,term},{broadcast,true}]),
+    {ok,_} = prim_inet:bind(S, {0,0,0,0}, 0),
     S.
 
 close_udp(S) ->
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index 2f73ab170a..9951ac17e9 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -19,8 +19,7 @@
 %%
 -module(erl_distribution_SUITE).
 
-%-define(line_trace, 1).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
@@ -61,7 +60,9 @@
 %% erl -sname master -rsh ctrsh
 %%-----------------------------------------------------------------
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,4}}].
 
 all() -> 
     [tick, tick_change, illegal_nodenames, hidden_node,
@@ -91,27 +92,22 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(4)),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
+end_per_testcase(_Func, _Config) ->
+    ok.
 
-tick(suite) -> [];
-tick(doc) -> [];
 tick(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(120)),
     PaDir = filename:dirname(code:which(erl_distribution_SUITE)),
-    
+
     %% First check that the normal case is OK!
-    ?line {ok, Node} = start_node(dist_test, "-pa " ++ PaDir),
+    {ok, Node} = start_node(dist_test, "-pa " ++ PaDir),
     rpc:call(Node, erl_distribution_SUITE, tick_cli_test, [node()]),
-    
+
     erlang:monitor_node(Node, true),
     receive
 	{nodedown, Node} ->
-	    test_server:fail("nodedown from other node")
+	    ct:fail("nodedown from other node")
     after 30000 ->
 	    erlang:monitor_node(Node, false),
 	    stop_node(Node)
@@ -129,20 +125,20 @@ tick(Config) when is_list(Config) ->
     %% Set the ticktime on the server node to 100 secs so the server
     %% node doesn't tick the client node within the interval ...
 
-    ?line {ok, ServNode} = start_node(dist_test_server,
-				      "-kernel net_ticktime 100 "
-				      "-pa " ++ PaDir),
+    {ok, ServNode} = start_node(dist_test_server,
+				"-kernel net_ticktime 100 "
+				"-pa " ++ PaDir),
     rpc:call(ServNode, erl_distribution_SUITE, tick_serv_test, [Node, node()]),
 
-    ?line {ok, _} = start_node(dist_test,
-			       "-kernel net_ticktime 12 "
-			       "-pa " ++ PaDir),
+    {ok, _} = start_node(dist_test,
+			 "-kernel net_ticktime 12 "
+			 "-pa " ++ PaDir),
     rpc:call(Node, erl_distribution_SUITE, tick_cli_test, [ServNode]),
-    
+
     spawn_link(erl_distribution_SUITE, keep_conn, [Node]),
 
     {tick_serv, ServNode} ! {i_want_the_result, self()},
-    
+
     monitor_node(ServNode, true),
     monitor_node(Node, true),
 
@@ -154,56 +150,47 @@ tick(Config) when is_list(Config) ->
 	{tick_test, Error} ->
 	    stop_node(ServNode),
 	    stop_node(Node),
-	    test_server:fail(Error);
+	    ct:fail(Error);
 	{nodedown, Node} ->
 	    stop_node(ServNode),
-	    test_server:fail("client node died");
+	    ct:fail("client node died");
 	{nodedown, ServNode} ->
 	    stop_node(Node),
-	    test_server:fail("server node died")
+	    ct:fail("server node died")
     end,
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
-table_waste(doc) ->
-    ["Checks that pinging nonexistyent nodes does not waste space in distribution table"];
-table_waste(suite) ->
-    [];
+%% Checks that pinging nonexistyent nodes does not waste space in distribution table.
 table_waste(Config) when is_list(Config) ->
-    ?line {ok, HName} = inet:gethostname(), 
+    {ok, HName} = inet:gethostname(),
     F = fun(0,_F) -> [];
 	   (N,F) -> 
-		?line Name = list_to_atom("erl_distribution_"++integer_to_list(N)++
-				    "@"++HName), 
-		?line pang = net_adm:ping(Name), 
-		?line F(N-1,F) 
+		Name = list_to_atom("erl_distribution_"++integer_to_list(N)++
+					"@"++HName),
+		pang = net_adm:ping(Name),
+		F(N-1,F)
 	end,
-    ?line F(256,F),
-    ?line {ok, N} = start_node(erl_distribution_300,""),
-    ?line stop_node(N),
+    F(256,F),
+    {ok, N} = start_node(erl_distribution_300,""),
+    stop_node(N),
     ok.
-    
-    
 
-illegal_nodenames(doc) ->
-    ["Test that pinging an illegal nodename does not kill the node"];
-illegal_nodenames(suite) ->
-    [];
+
+
+%% Test that pinging an illegal nodename does not kill the node.
 illegal_nodenames(Config) when is_list(Config) ->
-    ?line Dog=?t:timetrap(?t:minutes(2)),
     PaDir = filename:dirname(code:which(erl_distribution_SUITE)),
-    ?line {ok, Node}=start_node(illegal_nodenames, "-pa " ++ PaDir),
+    {ok, Node}=start_node(illegal_nodenames, "-pa " ++ PaDir),
     monitor_node(Node, true),
-    ?line RPid=rpc:call(Node, erlang, spawn,
-	     [?MODULE, pinger, [self()]]),
+    RPid=rpc:call(Node, erlang, spawn,
+		  [?MODULE, pinger, [self()]]),
     receive
 	{RPid, pinged} ->
 	    ok;
 	{nodedown, Node} ->
-	    ?t:fail("Remote node died.")
+	    ct:fail("Remote node died.")
     end,
     stop_node(Node),
-    ?t:timetrap_cancel(Dog),
     ok.
 
 pinger(Starter) ->
@@ -213,7 +200,7 @@ pinger(Starter) ->
     ok.
 
 
-net_setuptime(doc) -> ["Test that you can set the net_setuptime properly"];
+%% Test that you can set the net_setuptime properly.
 net_setuptime(Config) when is_list(Config) ->
     %% In this test case, we reluctantly accept shorter times than the given
     %% setup time, because the connection attempt can end in a
@@ -221,18 +208,18 @@ net_setuptime(Config) when is_list(Config) ->
 
     Res0 = do_test_setuptime("2"),
     io:format("Res0 = ~p", [Res0]),
-    ?line true = (Res0 =< 4000),
+    true = (Res0 =< 4000),
     Res1 = do_test_setuptime("0.3"),
     io:format("Res1 = ~p", [Res1]),
-    ?line true = (Res1 =< 500),
+    true = (Res1 =< 500),
     ok.
 
 do_test_setuptime(Setuptime) when is_list(Setuptime) ->
-    ?line PaDir = filename:dirname(code:which(?MODULE)),
-    ?line {ok, Node} = start_node(dist_setuptime_test, "-pa " ++ PaDir ++ 
-				  " -kernel net_setuptime " ++ Setuptime),
-    ?line Res = rpc:call(Node,?MODULE,time_ping,[?DUMMY_NODE]),
-    ?line stop_node(Node),
+    PaDir = filename:dirname(code:which(?MODULE)),
+    {ok, Node} = start_node(dist_setuptime_test, "-pa " ++ PaDir ++
+				" -kernel net_setuptime " ++ Setuptime),
+    Res = rpc:call(Node,?MODULE,time_ping,[?DUMMY_NODE]),
+    stop_node(Node),
     Res.
 
 time_ping(Node) ->
@@ -296,160 +283,159 @@ tick_cli_test1(Node) ->
     end.
 
 
-tick_change(doc) -> ["OTP-4255"];
-tick_change(suite) -> [];
+%% OTP-4255.
 tick_change(Config) when is_list(Config) ->
-    ?line PaDir = filename:dirname(code:which(?MODULE)),
-    ?line [BN, CN] = get_nodenames(2, tick_change),
-    ?line DefaultTT = net_kernel:get_net_ticktime(),
-    ?line unchanged = net_kernel:set_net_ticktime(DefaultTT, 60),
-    ?line case DefaultTT of
-	      I when is_integer(I) -> ?line ok;
-	      _                 -> ?line ?t:fail(DefaultTT)
-	  end,
-
-    % In case other nodes are connected
+    PaDir = filename:dirname(code:which(?MODULE)),
+    [BN, CN] = get_nodenames(2, tick_change),
+    DefaultTT = net_kernel:get_net_ticktime(),
+    unchanged = net_kernel:set_net_ticktime(DefaultTT, 60),
+    case DefaultTT of
+	I when is_integer(I) -> ok;
+	_                 -> ct:fail(DefaultTT)
+    end,
+
+    %% In case other nodes are connected
     case nodes(connected) of
-	[] -> ?line net_kernel:set_net_ticktime(10, 0);
-	_ ->  ?line rpc:multicall(nodes([this, connected]), net_kernel,
-				  set_net_ticktime, [10, 5])
+	[] -> net_kernel:set_net_ticktime(10, 0);
+	_ ->  rpc:multicall(nodes([this, connected]), net_kernel,
+			    set_net_ticktime, [10, 5])
     end,
 
-    ?line wait_until(fun () -> 10 == net_kernel:get_net_ticktime() end),
-    ?line {ok, B} = start_node(BN, "-kernel net_ticktime 10 -pa " ++ PaDir),
-    ?line {ok, C} = start_node(CN, "-kernel net_ticktime 10 -hidden -pa "
-			       ++ PaDir),
+    wait_until(fun () -> 10 == net_kernel:get_net_ticktime() end),
+    {ok, B} = start_node(BN, "-kernel net_ticktime 10 -pa " ++ PaDir),
+    {ok, C} = start_node(CN, "-kernel net_ticktime 10 -hidden -pa "
+			 ++ PaDir),
 
-    ?line OTE = process_flag(trap_exit, true),
+    OTE = process_flag(trap_exit, true),
     case catch begin
-		   ?line run_tick_change_test(B, C, 10, 1, PaDir),
-		   ?line run_tick_change_test(B, C, 1, 10, PaDir)
+		   run_tick_change_test(B, C, 10, 1, PaDir),
+		   run_tick_change_test(B, C, 1, 10, PaDir)
 	       end of
 	{'EXIT', Reason} ->
-	    ?line stop_node(B),
-	    ?line stop_node(C),
+	    stop_node(B),
+	    stop_node(C),
 	    %% In case other nodes are connected
 	    case nodes(connected) of
-		[] -> ?line net_kernel:set_net_ticktime(DefaultTT, 0);
-		_ ->  ?line rpc:multicall(nodes([this, connected]), net_kernel,
-					  set_net_ticktime, [DefaultTT, 10])
+		[] -> net_kernel:set_net_ticktime(DefaultTT, 0);
+		_ ->  rpc:multicall(nodes([this, connected]), net_kernel,
+				    set_net_ticktime, [DefaultTT, 10])
 	    end,
-	    ?line wait_until(fun () -> 
-				     DefaultTT == net_kernel:get_net_ticktime()
-			     end),
-	    ?line process_flag(trap_exit, OTE),
-	    ?t:fail(Reason);
+	    wait_until(fun () ->
+			       DefaultTT == net_kernel:get_net_ticktime()
+		       end),
+	    process_flag(trap_exit, OTE),
+	    ct:fail(Reason);
 	_ ->
 	    ok
     end,
-    ?line process_flag(trap_exit, OTE),
-    ?line stop_node(B),
-    ?line stop_node(C),
+    process_flag(trap_exit, OTE),
+    stop_node(B),
+    stop_node(C),
 
-    % In case other nodes are connected
+    %% In case other nodes are connected
     case nodes(connected) of
-	[] -> ?line net_kernel:set_net_ticktime(DefaultTT, 0);
-	_ ->  ?line rpc:multicall(nodes([this, connected]), net_kernel,
-				  set_net_ticktime, [DefaultTT, 5])
+	[] -> net_kernel:set_net_ticktime(DefaultTT, 0);
+	_ ->  rpc:multicall(nodes([this, connected]), net_kernel,
+			    set_net_ticktime, [DefaultTT, 5])
     end,
 
-    ?line wait_until(fun () -> DefaultTT == net_kernel:get_net_ticktime() end),
-    ?line ok.
+    wait_until(fun () -> DefaultTT == net_kernel:get_net_ticktime() end),
+    ok.
 
 
 wait_for_nodedowns(Tester, Ref) ->
     receive
 	{nodedown, Node} ->
-	    ?t:format("~p~n", [{node(), {nodedown, Node}}]),
-	    ?line Tester ! {Ref, {node(), {nodedown, Node}}}
+	    io:format("~p~n", [{node(), {nodedown, Node}}]),
+	    Tester ! {Ref, {node(), {nodedown, Node}}}
     end,
     wait_for_nodedowns(Tester, Ref).
 
 run_tick_change_test(B, C, PrevTT, TT, PaDir) ->
-    ?line [DN, EN] = get_nodenames(2, tick_change),
-
-    ?line Tester = self(),
-    ?line Ref = make_ref(),
-    ?line MonitorNodes = fun (Nodes) ->
-				 ?line lists:foreach(
-					 fun (N) ->
-						 ?line monitor_node(N,true)
-					 end,
-					 Nodes),
-				 wait_for_nodedowns(Tester, Ref)
-			 end,
-
-    ?line {ok, D} = start_node(DN, "-kernel net_ticktime "
-			       ++ integer_to_list(PrevTT) ++ " -pa " ++ PaDir),
-
-    ?line NMA = spawn_link(fun () -> MonitorNodes([B, C, D]) end),
-    ?line NMB = spawn_link(B, fun () -> MonitorNodes([node(), C, D]) end),
-    ?line NMC = spawn_link(C, fun () -> MonitorNodes([node(), B, D]) end),
-
-    ?line MaxTT = case PrevTT > TT of
-		      true  -> ?line PrevTT;
-		      false -> ?line TT
-		  end,
+    [DN, EN] = get_nodenames(2, tick_change),
 
-    ?line CheckResult = make_ref(),
-    ?line spawn_link(fun () ->
-			     receive
-			     after (25 + MaxTT)*1000 ->
-				     Tester ! CheckResult
-			     end
-		     end),
+    Tester = self(),
+    Ref = make_ref(),
+    MonitorNodes = fun (Nodes) ->
+			   lists:foreach(
+			     fun (N) ->
+				     monitor_node(N,true)
+			     end,
+			     Nodes),
+			   wait_for_nodedowns(Tester, Ref)
+		   end,
+
+    {ok, D} = start_node(DN, "-kernel net_ticktime "
+			 ++ integer_to_list(PrevTT) ++ " -pa " ++ PaDir),
+
+    NMA = spawn_link(fun () -> MonitorNodes([B, C, D]) end),
+    NMB = spawn_link(B, fun () -> MonitorNodes([node(), C, D]) end),
+    NMC = spawn_link(C, fun () -> MonitorNodes([node(), B, D]) end),
+
+    MaxTT = case PrevTT > TT of
+		true  -> PrevTT;
+		false -> TT
+	    end,
 
-    % In case other nodes than these are connected
+    CheckResult = make_ref(),
+    spawn_link(fun () ->
+		       receive
+		       after (25 + MaxTT)*1000 ->
+			       Tester ! CheckResult
+		       end
+	       end),
+
+    %% In case other nodes than these are connected
     case nodes(connected) -- [B, C, D] of
-	[] -> ?line ok;
-	OtherNodes -> ?line rpc:multicall(OtherNodes, net_kernel,
-					  set_net_ticktime, [TT, 20])
+	[] -> ok;
+	OtherNodes -> rpc:multicall(OtherNodes, net_kernel,
+				    set_net_ticktime, [TT, 20])
     end,
 
-    ?line change_initiated = net_kernel:set_net_ticktime(TT,20),
-    ?line {ongoing_change_to,_} = net_kernel:set_net_ticktime(TT,20),
-    ?line sleep(3),
-    ?line change_initiated = rpc:call(B,net_kernel,set_net_ticktime,[TT,15]),
-    ?line sleep(7),
-    ?line change_initiated = rpc:call(C,net_kernel,set_net_ticktime,[TT,10]),
-
-    ?line {ok, E} = start_node(EN, "-kernel net_ticktime "
-			       ++ integer_to_list(TT) ++ " -pa " ++ PaDir),
-    ?line NME  = spawn_link(E, fun () -> MonitorNodes([node(), B, C, D]) end),
-    ?line NMA2 = spawn_link(fun () -> MonitorNodes([E]) end),
-    ?line NMB2 = spawn_link(B, fun () -> MonitorNodes([E]) end),
-    ?line NMC2 = spawn_link(C, fun () -> MonitorNodes([E]) end),
-
-    receive CheckResult -> ?line ok end,
-
-    ?line unlink(NMA),  exit(NMA, kill),
-    ?line unlink(NMB),  exit(NMB, kill),
-    ?line unlink(NMC),  exit(NMC, kill),
-    ?line unlink(NME),  exit(NME, kill),
-    ?line unlink(NMA2), exit(NMA2, kill),
-    ?line unlink(NMB2), exit(NMB2, kill),
-    ?line unlink(NMC2), exit(NMC2, kill),
+    change_initiated = net_kernel:set_net_ticktime(TT,20),
+    {ongoing_change_to,_} = net_kernel:set_net_ticktime(TT,20),
+    sleep(3),
+    change_initiated = rpc:call(B,net_kernel,set_net_ticktime,[TT,15]),
+    sleep(7),
+    change_initiated = rpc:call(C,net_kernel,set_net_ticktime,[TT,10]),
+
+    {ok, E} = start_node(EN, "-kernel net_ticktime "
+			 ++ integer_to_list(TT) ++ " -pa " ++ PaDir),
+    NME  = spawn_link(E, fun () -> MonitorNodes([node(), B, C, D]) end),
+    NMA2 = spawn_link(fun () -> MonitorNodes([E]) end),
+    NMB2 = spawn_link(B, fun () -> MonitorNodes([E]) end),
+    NMC2 = spawn_link(C, fun () -> MonitorNodes([E]) end),
+
+    receive CheckResult -> ok end,
+
+    unlink(NMA),  exit(NMA, kill),
+    unlink(NMB),  exit(NMB, kill),
+    unlink(NMC),  exit(NMC, kill),
+    unlink(NME),  exit(NME, kill),
+    unlink(NMA2), exit(NMA2, kill),
+    unlink(NMB2), exit(NMB2, kill),
+    unlink(NMC2), exit(NMC2, kill),
 
     %% The node not changing ticktime should have been disconnected from the
     %% other nodes
-    receive {Ref, {Node, {nodedown, D}}} when Node == node() -> ?line ok
-    after 0 -> ?line exit({?LINE, no_nodedown})
+    receive {Ref, {Node, {nodedown, D}}} when Node == node() -> ok
+    after 0 -> exit({?LINE, no_nodedown})
     end,
-    receive {Ref, {B, {nodedown, D}}} -> ?line ok
-    after 0 -> ?line exit({?LINE, no_nodedown})
+    receive {Ref, {B, {nodedown, D}}} -> ok
+    after 0 -> exit({?LINE, no_nodedown})
     end,
-    receive {Ref, {C, {nodedown, D}}} -> ?line ok
-    after 0 -> ?line exit({?LINE, no_nodedown})
+    receive {Ref, {C, {nodedown, D}}} -> ok
+    after 0 -> exit({?LINE, no_nodedown})
     end,
-    receive {Ref, {E, {nodedown, D}}} -> ?line ok
-    after 0 -> ?line exit({?LINE, no_nodedown})
+    receive {Ref, {E, {nodedown, D}}} -> ok
+    after 0 -> exit({?LINE, no_nodedown})
     end,
 
     %% No other connections should have been broken
     receive
 	{Ref, Reason} ->
-	    ?line stop_node(E),
-	    ?line exit({?LINE, Reason});
+	    stop_node(E),
+	    exit({?LINE, Reason});
 	{'EXIT', Pid, Reason} when Pid == NMA;
 				   Pid == NMB;
 				   Pid == NMC;
@@ -457,70 +443,65 @@ run_tick_change_test(B, C, PrevTT, TT, PaDir) ->
 				   Pid == NMA2;
 				   Pid == NMB2;
 				   Pid == NMC2 ->
-	    ?line stop_node(E),
+	    stop_node(E),
 
-	    ?line exit({?LINE, {node(Pid), Reason}})
+	    exit({?LINE, {node(Pid), Reason}})
     after 0 ->
-	    ?line TT = net_kernel:get_net_ticktime(),
-	    ?line TT = rpc:call(B, net_kernel, get_net_ticktime, []),
-	    ?line TT = rpc:call(C, net_kernel, get_net_ticktime, []),
-	    ?line TT = rpc:call(E, net_kernel, get_net_ticktime, []),
-	    ?line stop_node(E),
-	    ?line ok
+	    TT = net_kernel:get_net_ticktime(),
+	    TT = rpc:call(B, net_kernel, get_net_ticktime, []),
+	    TT = rpc:call(C, net_kernel, get_net_ticktime, []),
+	    TT = rpc:call(E, net_kernel, get_net_ticktime, []),
+	    stop_node(E),
+	    ok
     end.
 
 %%
 %% Basic tests of hidden node.
 %%
-hidden_node(doc) ->
-    ["Basic test of hidden node"];
-hidden_node(suite) ->
-    [];
+%% Basic test of hidden node.
 hidden_node(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(40)),
     PaDir = filename:dirname(code:which(?MODULE)),
     VArgs = "-pa " ++ PaDir,
     HArgs = "-hidden -pa " ++ PaDir,
-    ?line {ok, V} = start_node(visible_node, VArgs),
+    {ok, V} = start_node(visible_node, VArgs),
     VMN = start_monitor_nodes_proc(V),
-    ?line {ok, H} = start_node(hidden_node, HArgs),
-    % Connect visible_node -> hidden_node
+    {ok, H} = start_node(hidden_node, HArgs),
+    %% Connect visible_node -> hidden_node
     connect_nodes(V, H),
     test_nodes(V, H),
     stop_node(H),
     sleep(5),
     check_monitor_nodes_res(VMN, H),
     stop_node(V),
-    ?line {ok, H} = start_node(hidden_node, HArgs),
+    {ok, H} = start_node(hidden_node, HArgs),
     HMN = start_monitor_nodes_proc(H),
-    ?line {ok, V} = start_node(visible_node, VArgs),
-    % Connect hidden_node -> visible_node
+    {ok, V} = start_node(visible_node, VArgs),
+    %% Connect hidden_node -> visible_node
     connect_nodes(H, V),
     test_nodes(V, H),
     stop_node(V),
     sleep(5),
     check_monitor_nodes_res(HMN, V),
     stop_node(H),
-    ?line ?t:timetrap_cancel(Dog),
     ok.
 
 connect_nodes(A, B) ->
-    % Check that they haven't already connected.
-    ?line false = lists:member(A, rpc:call(B, erlang, nodes, [connected])),
-    ?line false = lists:member(B, rpc:call(A, erlang, nodes, [connected])),
-    % Connect them.
-    ?line pong = rpc:call(A, net_adm, ping, [B]).
-    
+    %% Check that they haven't already connected.
+    false = lists:member(A, rpc:call(B, erlang, nodes, [connected])),
+    false = lists:member(B, rpc:call(A, erlang, nodes, [connected])),
+    %% Connect them.
+    pong = rpc:call(A, net_adm, ping, [B]).
+
 
 test_nodes(V, H) ->
-    % No nodes should be visible on hidden_node
-    ?line [] = rpc:call(H, erlang, nodes, []),
-    % visible_node should be hidden on hidden_node
-    ?line true = lists:member(V, rpc:call(H, erlang, nodes, [hidden])),
-    % hidden_node node shouldn't be visible on visible_node
-    ?line false = lists:member(H, rpc:call(V, erlang, nodes, [])),
-    % hidden_node should be hidden on visible_node
-    ?line true = lists:member(H, rpc:call(V, erlang, nodes, [hidden])).
+    %% No nodes should be visible on hidden_node
+    [] = rpc:call(H, erlang, nodes, []),
+    %% visible_node should be hidden on hidden_node
+    true = lists:member(V, rpc:call(H, erlang, nodes, [hidden])),
+    %% hidden_node node shouldn't be visible on visible_node
+    false = lists:member(H, rpc:call(V, erlang, nodes, [])),
+    %% hidden_node should be hidden on visible_node
+    true = lists:member(H, rpc:call(V, erlang, nodes, [hidden])).
 
 mn_loop(MNs) ->
     receive
@@ -548,21 +529,19 @@ start_monitor_nodes_proc(Node) ->
 	    ok
     end,
     Pid.
-	    
+
 
 check_monitor_nodes_res(Pid, Node) ->
     Ref = make_ref(),
     Pid ! {monitor_nodes_result, Ref, self()},
     receive
 	{Ref, MNs} ->
-	    ?line false = lists:keysearch(Node, 2, MNs)
+	    false = lists:keysearch(Node, 2, MNs)
     end.
 
 
 
-inet_dist_options_options(suite) -> [];
-inet_dist_options_options(doc) ->
-    ["Check the kernel inet_dist_{listen,connect}_options options"];
+%% Check the kernel inet_dist_{listen,connect}_options options.
 inet_dist_options_options(Config) when is_list(Config) ->
     Prio = 1,
     case gen_udp:open(0, [{priority,Prio}]) of
@@ -571,7 +550,7 @@ inet_dist_options_options(Config) when is_list(Config) ->
 		{ok,[{priority,Prio}]} ->
 		    ok = gen_udp:close(Socket),
 		    do_inet_dist_options_options(Prio);
-		      _ ->
+		_ ->
 		    ok = gen_udp:close(Socket),
 		    {skip,
 		     "Can not set priority "++integer_to_list(Prio)++
@@ -595,25 +574,25 @@ do_inet_dist_options_options(Prio) ->
 	"-hidden "
 	"-kernel inet_dist_connect_options "++PriorityString++" "
 	"-kernel inet_dist_listen_options "++PriorityString,
-    ?line {ok,Node1} =
+    {ok,Node1} =
 	start_node(inet_dist_options_1, InetDistOptions),
-    ?line {ok,Node2} =
+    {ok,Node2} =
 	start_node(inet_dist_options_2, InetDistOptions),
     %%
-    ?line pong =
+    pong =
 	rpc:call(Node1, net_adm, ping, [Node2]),
-    ?line PrioritiesNode1 =
+    PrioritiesNode1 =
 	rpc:call(Node1, ?MODULE, get_socket_priorities, []),
-    ?line PrioritiesNode2 =
+    PrioritiesNode2 =
 	rpc:call(Node2, ?MODULE, get_socket_priorities, []),
-    ?line ?t:format("PrioritiesNode1 = ~p", [PrioritiesNode1]),
-    ?line ?t:format("PrioritiesNode2 = ~p", [PrioritiesNode2]),
-    ?line Elevated = [P || P <- PrioritiesNode1, P =:= Prio],
-    ?line Elevated = [P || P <- PrioritiesNode2, P =:= Prio],
-    ?line [_|_] = Elevated,
+    io:format("PrioritiesNode1 = ~p", [PrioritiesNode1]),
+    io:format("PrioritiesNode2 = ~p", [PrioritiesNode2]),
+    Elevated = [P || P <- PrioritiesNode1, P =:= Prio],
+    Elevated = [P || P <- PrioritiesNode2, P =:= Prio],
+    [_|_] = Elevated,
     %%
-    ?line stop_node(Node2),
-    ?line stop_node(Node1),
+    stop_node(Node2),
+    stop_node(Node1),
     ok.
 
 get_socket_priorities() ->
@@ -624,185 +603,178 @@ get_socket_priorities() ->
 		element(2, erlang:port_info(Port, name)) =:= "tcp_inet"]].
 
 
-	    
+
 %%
 %% Testcase:
 %%   monitor_nodes_nodedown_reason
 %%
 
-monitor_nodes_nodedown_reason(doc) -> [];
-monitor_nodes_nodedown_reason(suite) -> [];
 monitor_nodes_nodedown_reason(Config) when is_list(Config) ->
-    ?line MonNodeState = monitor_node_state(),
-    ?line ok = net_kernel:monitor_nodes(true),
-    ?line ok = net_kernel:monitor_nodes(true, [nodedown_reason]),
-
-    ?line Names = get_numbered_nodenames(5, node),
-    ?line [NN1, NN2, NN3, NN4, NN5] = Names,
-
-    ?line {ok, N1} = start_node(NN1),
-    ?line {ok, N2} = start_node(NN2),
-    ?line {ok, N3} = start_node(NN3),
-    ?line {ok, N4} = start_node(NN4, "-hidden"),
-    
-    ?line receive {nodeup, N1} -> ok end,
-    ?line receive {nodeup, N2} -> ok end,
-    ?line receive {nodeup, N3} -> ok end,
-
-    ?line receive {nodeup, N1, []} -> ok end,
-    ?line receive {nodeup, N2, []} -> ok end,
-    ?line receive {nodeup, N3, []} -> ok end,
-
-    ?line stop_node(N1),
-    ?line stop_node(N4),
-    ?line true = net_kernel:disconnect(N2),
-    ?line TickTime = net_kernel:get_net_ticktime(),
-    ?line SleepTime = TickTime + (TickTime div 4),
-    ?line spawn(N3, fun () ->
-			    block_emu(SleepTime*1000),
-			    halt()
-		    end),
-
-    ?line receive {nodedown, N1} -> ok end,
-    ?line receive {nodedown, N2} -> ok end,
-    ?line receive {nodedown, N3} -> ok end,
-
-    ?line receive {nodedown, N1, [{nodedown_reason, R1}]} -> connection_closed = R1 end,
-    ?line receive {nodedown, N2, [{nodedown_reason, R2}]} -> disconnect = R2 end,
-    ?line receive {nodedown, N3, [{nodedown_reason, R3}]} -> net_tick_timeout = R3 end,
-
-    ?line ok = net_kernel:monitor_nodes(false, [nodedown_reason]),
-
-    ?line {ok, N5} = start_node(NN5),
-    ?line stop_node(N5),
-
-    ?line receive {nodeup, N5} -> ok end,
-    ?line receive {nodedown, N5} -> ok end,
-    ?line print_my_messages(),
-    ?line ok = check_no_nodedown_nodeup(1000),
-    ?line ok = net_kernel:monitor_nodes(false),
-    ?line MonNodeState = monitor_node_state(),
-    ?line ok.
-
-
-monitor_nodes_complex_nodedown_reason(doc) -> [];
-monitor_nodes_complex_nodedown_reason(suite) -> [];
+    MonNodeState = monitor_node_state(),
+    ok = net_kernel:monitor_nodes(true),
+    ok = net_kernel:monitor_nodes(true, [nodedown_reason]),
+
+    Names = get_numbered_nodenames(5, node),
+    [NN1, NN2, NN3, NN4, NN5] = Names,
+
+    {ok, N1} = start_node(NN1),
+    {ok, N2} = start_node(NN2),
+    {ok, N3} = start_node(NN3),
+    {ok, N4} = start_node(NN4, "-hidden"),
+
+    receive {nodeup, N1} -> ok end,
+    receive {nodeup, N2} -> ok end,
+    receive {nodeup, N3} -> ok end,
+
+    receive {nodeup, N1, []} -> ok end,
+    receive {nodeup, N2, []} -> ok end,
+    receive {nodeup, N3, []} -> ok end,
+
+    stop_node(N1),
+    stop_node(N4),
+    true = net_kernel:disconnect(N2),
+    TickTime = net_kernel:get_net_ticktime(),
+    SleepTime = TickTime + (TickTime div 4),
+    spawn(N3, fun () ->
+		      block_emu(SleepTime*1000),
+		      halt()
+	      end),
+
+    receive {nodedown, N1} -> ok end,
+    receive {nodedown, N2} -> ok end,
+    receive {nodedown, N3} -> ok end,
+
+    receive {nodedown, N1, [{nodedown_reason, R1}]} -> connection_closed = R1 end,
+    receive {nodedown, N2, [{nodedown_reason, R2}]} -> disconnect = R2 end,
+    receive {nodedown, N3, [{nodedown_reason, R3}]} -> net_tick_timeout = R3 end,
+
+    ok = net_kernel:monitor_nodes(false, [nodedown_reason]),
+
+    {ok, N5} = start_node(NN5),
+    stop_node(N5),
+
+    receive {nodeup, N5} -> ok end,
+    receive {nodedown, N5} -> ok end,
+    print_my_messages(),
+    ok = check_no_nodedown_nodeup(1000),
+    ok = net_kernel:monitor_nodes(false),
+    MonNodeState = monitor_node_state(),
+    ok.
+
+
 monitor_nodes_complex_nodedown_reason(Config) when is_list(Config) ->
-    ?line MonNodeState = monitor_node_state(),
-    ?line Me = self(),
-    ?line ok = net_kernel:monitor_nodes(true, [nodedown_reason]),
-    ?line [Name] = get_nodenames(1, monitor_nodes_complex_nodedown_reason),
-    ?line {ok, Node} = start_node(Name, ""),
-    ?line Pid = spawn(Node,
-		      fun() ->
-			      Me ! {stuff,
-				    self(),
-				    [make_ref(),
-				     {processes(), erlang:ports()}]}
-		      end),
-    ?line receive {nodeup, Node, []} -> ok end,
-    ?line {ok, NodeInfo} = net_kernel:node_info(Node),
-    ?line {value,{owner, Owner}} = lists:keysearch(owner, 1, NodeInfo),
-    ?line ComplexTerm = receive {stuff, Pid, _} = Msg ->
-				{Msg, term_to_binary(Msg)}
-			end,
-    ?line exit(Owner, ComplexTerm),
-    ?line receive
-	      {nodedown, Node, [{nodedown_reason, NodeDownReason}]} ->
-		  ?line ok
-	  end,
+    MonNodeState = monitor_node_state(),
+    Me = self(),
+    ok = net_kernel:monitor_nodes(true, [nodedown_reason]),
+    [Name] = get_nodenames(1, monitor_nodes_complex_nodedown_reason),
+    {ok, Node} = start_node(Name, ""),
+    Pid = spawn(Node,
+		fun() ->
+			Me ! {stuff,
+			      self(),
+			      [make_ref(),
+			       {processes(), erlang:ports()}]}
+		end),
+    receive {nodeup, Node, []} -> ok end,
+    {ok, NodeInfo} = net_kernel:node_info(Node),
+    {value,{owner, Owner}} = lists:keysearch(owner, 1, NodeInfo),
+    ComplexTerm = receive {stuff, Pid, _} = Msg ->
+			  {Msg, term_to_binary(Msg)}
+		  end,
+    exit(Owner, ComplexTerm),
+    receive
+	{nodedown, Node, [{nodedown_reason, NodeDownReason}]} ->
+	    ok
+    end,
     %% If the complex nodedown_reason messed something up garbage collections
     %% are likely to dump core
-    ?line garbage_collect(),
-    ?line garbage_collect(),
-    ?line garbage_collect(),
-    ?line ComplexTerm = NodeDownReason,
-    ?line ok = net_kernel:monitor_nodes(false, [nodedown_reason]),
-    ?line no_msgs(),
-    ?line MonNodeState = monitor_node_state(),
-    ?line ok.
-    
-
-    
+    garbage_collect(),
+    garbage_collect(),
+    garbage_collect(),
+    ComplexTerm = NodeDownReason,
+    ok = net_kernel:monitor_nodes(false, [nodedown_reason]),
+    no_msgs(),
+    MonNodeState = monitor_node_state(),
+    ok.
+
+
+
 
 %%
 %% Testcase:
 %%   monitor_nodes_node_type
 %%
 
-monitor_nodes_node_type(doc) -> [];
-monitor_nodes_node_type(suite) -> [];
 monitor_nodes_node_type(Config) when is_list(Config) ->
-    ?line MonNodeState = monitor_node_state(),
-    ?line ok = net_kernel:monitor_nodes(true),
-    ?line ok = net_kernel:monitor_nodes(true, [{node_type, all}]),
-    ?line Names = get_numbered_nodenames(9, node),
-%    ?line ?t:format("Names: ~p~n", [Names]),
-    ?line [NN1, NN2, NN3, NN4, NN5, NN6, NN7, NN8, NN9] = Names,
-
-    ?line {ok, N1} = start_node(NN1),
-    ?line {ok, N2} = start_node(NN2),
-    ?line {ok, N3} = start_node(NN3, "-hidden"),
-    ?line {ok, N4} = start_node(NN4, "-hidden"),
-
-    ?line receive {nodeup, N1} -> ok end,
-    ?line receive {nodeup, N2} -> ok end,
-    
-    ?line receive {nodeup, N1, [{node_type, visible}]} -> ok end,
-    ?line receive {nodeup, N2, [{node_type, visible}]} -> ok end,
-    ?line receive {nodeup, N3, [{node_type, hidden}]} -> ok end,
-    ?line receive {nodeup, N4, [{node_type, hidden}]} -> ok end,
-
-    ?line stop_node(N1),
-    ?line stop_node(N2),
-    ?line stop_node(N3),
-    ?line stop_node(N4),
-
-    ?line receive {nodedown, N1} -> ok end,
-    ?line receive {nodedown, N2} -> ok end,
-
-    ?line receive {nodedown, N1, [{node_type, visible}]} -> ok end,
-    ?line receive {nodedown, N2, [{node_type, visible}]} -> ok end,
-    ?line receive {nodedown, N3, [{node_type, hidden}]} -> ok end,
-    ?line receive {nodedown, N4, [{node_type, hidden}]} -> ok end,
-
-    ?line ok = net_kernel:monitor_nodes(false, [{node_type, all}]),
-    ?line {ok, N5} = start_node(NN5),
-
-    ?line receive {nodeup, N5} -> ok end,
-    ?line stop_node(N5),
-    ?line receive {nodedown, N5} -> ok end,
-
-    ?line ok = net_kernel:monitor_nodes(true, [{node_type, hidden}]),
-    ?line {ok, N6} = start_node(NN6),
-    ?line {ok, N7} = start_node(NN7, "-hidden"),
-
-
-    ?line receive {nodeup, N6} -> ok end,
-    ?line receive {nodeup, N7, [{node_type, hidden}]} -> ok end,
-    ?line stop_node(N6),
-    ?line stop_node(N7),
-
-    ?line receive {nodedown, N6} -> ok end,
-    ?line receive {nodedown, N7, [{node_type, hidden}]} -> ok end,
-
-    ?line ok = net_kernel:monitor_nodes(true, [{node_type, visible}]),
-    ?line ok = net_kernel:monitor_nodes(false, [{node_type, hidden}]),
-    ?line ok = net_kernel:monitor_nodes(false),
-
-    ?line {ok, N8} = start_node(NN8),
-    ?line {ok, N9} = start_node(NN9, "-hidden"),
-
-    ?line receive {nodeup, N8, [{node_type, visible}]} -> ok end,
-    ?line stop_node(N8),
-    ?line stop_node(N9),
-
-    ?line receive {nodedown, N8, [{node_type, visible}]} -> ok end,
-    ?line print_my_messages(),
-    ?line ok = check_no_nodedown_nodeup(1000),
-    ?line ok = net_kernel:monitor_nodes(false, [{node_type, visible}]),
-    ?line MonNodeState = monitor_node_state(),
-    ?line ok.
+    MonNodeState = monitor_node_state(),
+    ok = net_kernel:monitor_nodes(true),
+    ok = net_kernel:monitor_nodes(true, [{node_type, all}]),
+    Names = get_numbered_nodenames(9, node),
+    [NN1, NN2, NN3, NN4, NN5, NN6, NN7, NN8, NN9] = Names,
+
+    {ok, N1} = start_node(NN1),
+    {ok, N2} = start_node(NN2),
+    {ok, N3} = start_node(NN3, "-hidden"),
+    {ok, N4} = start_node(NN4, "-hidden"),
+
+    receive {nodeup, N1} -> ok end,
+    receive {nodeup, N2} -> ok end,
+
+    receive {nodeup, N1, [{node_type, visible}]} -> ok end,
+    receive {nodeup, N2, [{node_type, visible}]} -> ok end,
+    receive {nodeup, N3, [{node_type, hidden}]} -> ok end,
+    receive {nodeup, N4, [{node_type, hidden}]} -> ok end,
+
+    stop_node(N1),
+    stop_node(N2),
+    stop_node(N3),
+    stop_node(N4),
+
+    receive {nodedown, N1} -> ok end,
+    receive {nodedown, N2} -> ok end,
+
+    receive {nodedown, N1, [{node_type, visible}]} -> ok end,
+    receive {nodedown, N2, [{node_type, visible}]} -> ok end,
+    receive {nodedown, N3, [{node_type, hidden}]} -> ok end,
+    receive {nodedown, N4, [{node_type, hidden}]} -> ok end,
+
+    ok = net_kernel:monitor_nodes(false, [{node_type, all}]),
+    {ok, N5} = start_node(NN5),
+
+    receive {nodeup, N5} -> ok end,
+    stop_node(N5),
+    receive {nodedown, N5} -> ok end,
+
+    ok = net_kernel:monitor_nodes(true, [{node_type, hidden}]),
+    {ok, N6} = start_node(NN6),
+    {ok, N7} = start_node(NN7, "-hidden"),
+
+
+    receive {nodeup, N6} -> ok end,
+    receive {nodeup, N7, [{node_type, hidden}]} -> ok end,
+    stop_node(N6),
+    stop_node(N7),
+
+    receive {nodedown, N6} -> ok end,
+    receive {nodedown, N7, [{node_type, hidden}]} -> ok end,
+
+    ok = net_kernel:monitor_nodes(true, [{node_type, visible}]),
+    ok = net_kernel:monitor_nodes(false, [{node_type, hidden}]),
+    ok = net_kernel:monitor_nodes(false),
+
+    {ok, N8} = start_node(NN8),
+    {ok, N9} = start_node(NN9, "-hidden"),
+
+    receive {nodeup, N8, [{node_type, visible}]} -> ok end,
+    stop_node(N8),
+    stop_node(N9),
+
+    receive {nodedown, N8, [{node_type, visible}]} -> ok end,
+    print_my_messages(),
+    ok = check_no_nodedown_nodeup(1000),
+    ok = net_kernel:monitor_nodes(false, [{node_type, visible}]),
+    MonNodeState = monitor_node_state(),
+    ok.
 
 
 %%
@@ -810,95 +782,89 @@ monitor_nodes_node_type(Config) when is_list(Config) ->
 %%   monitor_nodes
 %%
 
-monitor_nodes_misc(doc) -> [];
-monitor_nodes_misc(suite) -> [];
 monitor_nodes_misc(Config) when is_list(Config) ->
-    ?line MonNodeState = monitor_node_state(),
-    ?line ok = net_kernel:monitor_nodes(true),
-    ?line ok = net_kernel:monitor_nodes(true, [{node_type, all}, nodedown_reason]),
-    ?line ok = net_kernel:monitor_nodes(true, [nodedown_reason, {node_type, all}]),
-    ?line Names = get_numbered_nodenames(3, node),
-%    ?line ?t:format("Names: ~p~n", [Names]),
-    ?line [NN1, NN2, NN3] = Names,
-
-    ?line {ok, N1} = start_node(NN1),
-    ?line {ok, N2} = start_node(NN2, "-hidden"),
-
-    ?line receive {nodeup, N1} -> ok end,
-
-    ?line receive {nodeup, N1, [{node_type, visible}]} -> ok end,
-    ?line receive {nodeup, N1, [{node_type, visible}]} -> ok end,
-    ?line receive {nodeup, N2, [{node_type, hidden}]} -> ok end,
-    ?line receive {nodeup, N2, [{node_type, hidden}]} -> ok end,
-
-    ?line stop_node(N1),
-    ?line stop_node(N2),
-
-    ?line VisbleDownInfo = lists:sort([{node_type, visible},
-				       {nodedown_reason, connection_closed}]),
-    ?line HiddenDownInfo = lists:sort([{node_type, hidden},
-				       {nodedown_reason, connection_closed}]),
-
-    ?line receive {nodedown, N1} -> ok end,
-
-    ?line receive {nodedown, N1, Info1A} -> VisbleDownInfo = lists:sort(Info1A) end,
-    ?line receive {nodedown, N1, Info1B} -> VisbleDownInfo = lists:sort(Info1B) end,
-    ?line receive {nodedown, N2, Info2A} -> HiddenDownInfo = lists:sort(Info2A) end,
-    ?line receive {nodedown, N2, Info2B} -> HiddenDownInfo = lists:sort(Info2B) end,
-
-    ?line ok = net_kernel:monitor_nodes(false, [{node_type, all}, nodedown_reason]),
-
-    ?line {ok, N3} = start_node(NN3),
-    ?line receive {nodeup, N3} -> ok end,
-    ?line stop_node(N3),
-    ?line receive {nodedown, N3} -> ok end,
-    ?line print_my_messages(),
-    ?line ok = check_no_nodedown_nodeup(1000),
-    ?line ok = net_kernel:monitor_nodes(false),
-    ?line MonNodeState = monitor_node_state(),
-    ?line ok.
-
-
-monitor_nodes_otp_6481(doc) ->
-    ["Tests that {nodeup, Node} messages are received before "
-     "messages from Node and that {nodedown, Node} messages are"
-     "received after messages from Node"];
-monitor_nodes_otp_6481(suite) ->
-    [];
+    MonNodeState = monitor_node_state(),
+    ok = net_kernel:monitor_nodes(true),
+    ok = net_kernel:monitor_nodes(true, [{node_type, all}, nodedown_reason]),
+    ok = net_kernel:monitor_nodes(true, [nodedown_reason, {node_type, all}]),
+    Names = get_numbered_nodenames(3, node),
+    [NN1, NN2, NN3] = Names,
+
+    {ok, N1} = start_node(NN1),
+    {ok, N2} = start_node(NN2, "-hidden"),
+
+    receive {nodeup, N1} -> ok end,
+
+    receive {nodeup, N1, [{node_type, visible}]} -> ok end,
+    receive {nodeup, N1, [{node_type, visible}]} -> ok end,
+    receive {nodeup, N2, [{node_type, hidden}]} -> ok end,
+    receive {nodeup, N2, [{node_type, hidden}]} -> ok end,
+
+    stop_node(N1),
+    stop_node(N2),
+
+    VisbleDownInfo = lists:sort([{node_type, visible},
+				 {nodedown_reason, connection_closed}]),
+    HiddenDownInfo = lists:sort([{node_type, hidden},
+				 {nodedown_reason, connection_closed}]),
+
+    receive {nodedown, N1} -> ok end,
+
+    receive {nodedown, N1, Info1A} -> VisbleDownInfo = lists:sort(Info1A) end,
+    receive {nodedown, N1, Info1B} -> VisbleDownInfo = lists:sort(Info1B) end,
+    receive {nodedown, N2, Info2A} -> HiddenDownInfo = lists:sort(Info2A) end,
+    receive {nodedown, N2, Info2B} -> HiddenDownInfo = lists:sort(Info2B) end,
+
+    ok = net_kernel:monitor_nodes(false, [{node_type, all}, nodedown_reason]),
+
+    {ok, N3} = start_node(NN3),
+    receive {nodeup, N3} -> ok end,
+    stop_node(N3),
+    receive {nodedown, N3} -> ok end,
+    print_my_messages(),
+    ok = check_no_nodedown_nodeup(1000),
+    ok = net_kernel:monitor_nodes(false),
+    MonNodeState = monitor_node_state(),
+    ok.
+
+
+%% Tests that {nodeup, Node} messages are received before
+%% messages from Node and that {nodedown, Node} messages are
+%% received after messages from Node.
 monitor_nodes_otp_6481(Config) when is_list(Config) ->
-    ?line ?t:format("Testing nodedown...~n"),
-    ?line monitor_nodes_otp_6481_test(Config, nodedown),
-    ?line ?t:format("ok~n"),
-    ?line ?t:format("Testing nodeup...~n"),
-    ?line monitor_nodes_otp_6481_test(Config, nodeup),
-    ?line ?t:format("ok~n"),
-    ?line ok.
+    io:format("Testing nodedown...~n"),
+    monitor_nodes_otp_6481_test(Config, nodedown),
+    io:format("ok~n"),
+    io:format("Testing nodeup...~n"),
+    monitor_nodes_otp_6481_test(Config, nodeup),
+    io:format("ok~n"),
+    ok.
 
 monitor_nodes_otp_6481_test(Config, TestType) when is_list(Config) ->
-    ?line MonNodeState = monitor_node_state(),
-    ?line NodeMsg = make_ref(),
-    ?line Me = self(),
-    ?line [Name] = get_nodenames(1, monitor_nodes_otp_6481),
-    ?line case TestType of
-	      nodedown -> ?line ok = net_kernel:monitor_nodes(true);
-	      nodeup -> ?line ok
-	  end,
-    ?line Seq = lists:seq(1,10000),
-    ?line MN = spawn_link(
-		 fun () ->
-			 ?line lists:foreach(
-				 fun (_) ->
-					 ?line ok = net_kernel:monitor_nodes(true)
-				 end,
-				 Seq),
-			 ?line Me ! {mon_set, self()},
-			 ?line receive after infinity -> ok end
-		 end),
-    ?line receive {mon_set, MN} -> ok end,
-    ?line case TestType of
-	      nodedown -> ?line ok;
-	      nodeup -> ?line ok = net_kernel:monitor_nodes(true)
-	  end,
+    MonNodeState = monitor_node_state(),
+    NodeMsg = make_ref(),
+    Me = self(),
+    [Name] = get_nodenames(1, monitor_nodes_otp_6481),
+    case TestType of
+	nodedown -> ok = net_kernel:monitor_nodes(true);
+	nodeup -> ok
+    end,
+    Seq = lists:seq(1,10000),
+    MN = spawn_link(
+	   fun () ->
+		   lists:foreach(
+		     fun (_) ->
+			     ok = net_kernel:monitor_nodes(true)
+		     end,
+		     Seq),
+		   Me ! {mon_set, self()},
+		   receive after infinity -> ok end
+	   end),
+    receive {mon_set, MN} -> ok end,
+    case TestType of
+	nodedown -> ok;
+	nodeup -> ok = net_kernel:monitor_nodes(true)
+    end,
 
     %% Whitebox:
     %% nodedown test: Since this process was the first one monitoring
@@ -909,60 +875,60 @@ monitor_nodes_otp_6481_test(Config, TestType) when is_list(Config) ->
     %%                on nodeup
 
     %% Verify the monitor_nodes order expected
-    ?line TestMonNodeState = monitor_node_state(),
-    %?line ?t:format("~p~n", [TestMonNodeState]),
-    ?line TestMonNodeState = 
+    TestMonNodeState = monitor_node_state(),
+    %% io:format("~p~n", [TestMonNodeState]),
+    TestMonNodeState =
 	MonNodeState
 	++ case TestType of
-	      nodedown -> [{self(), []}];
-	      nodeup -> []
+	       nodedown -> [{self(), []}];
+	       nodeup -> []
 	   end
 	++ lists:map(fun (_) -> {MN, []} end, Seq)
 	++ case TestType of
-	      nodedown -> [];
-	      nodeup -> [{self(), []}]
+	       nodedown -> [];
+	       nodeup -> [{self(), []}]
 	   end,
 
 
-    ?line {ok, Node} = start_node(Name, "", this),
-    ?line receive {nodeup, Node} -> ok end,
-
-    ?line RemotePid = spawn(Node,
-		fun () ->
-			receive after 1500 -> ok end,
-			% infinit loop of msgs
-			% we want an endless stream of messages and the kill
-			% the node mercilessly.
-			% We then want to ensure that the nodedown message arrives
-			% last ... without garbage after it.
-			_ = spawn(fun() -> node_loop_send(Me, NodeMsg, 1) end),
-			receive {Me, kill_it} -> ok end, 
-			halt()
-		end),
+    {ok, Node} = start_node(Name, "", this),
+    receive {nodeup, Node} -> ok end,
+
+    RemotePid = spawn(Node,
+		      fun () ->
+			      receive after 1500 -> ok end,
+			      %% infinit loop of msgs
+			      %% we want an endless stream of messages and the kill
+			      %% the node mercilessly.
+			      %% We then want to ensure that the nodedown message arrives
+			      %% last ... without garbage after it.
+			      _ = spawn(fun() -> node_loop_send(Me, NodeMsg, 1) end),
+			      receive {Me, kill_it} -> ok end,
+			      halt()
+		      end),
 
-    ?line net_kernel:disconnect(Node),
-    ?line receive {nodedown, Node} -> ok end,
+    net_kernel:disconnect(Node),
+    receive {nodedown, Node} -> ok end,
 
     %% Verify that '{nodeup, Node}' comes before '{NodeMsg, 1}' (the message
     %% bringing up the connection).
-    ?line no_msgs(500),
-    ?line {nodeup, Node} = receive Msg1 -> Msg1 end,
-    ?line {NodeMsg, 1}   = receive Msg2 -> Msg2 end,
-    % msg stream has begun, kill the node
-    ?line RemotePid ! {self(), kill_it},
+    no_msgs(500),
+    {nodeup, Node} = receive Msg1 -> Msg1 end,
+    {NodeMsg, 1}   = receive Msg2 -> Msg2 end,
+    %% msg stream has begun, kill the node
+    RemotePid ! {self(), kill_it},
 
     %% Verify that '{nodedown, Node}' comes after the last '{NodeMsg, N}'
     %% message.
-    ?line {nodedown, Node} = flush_node_msgs(NodeMsg, 2),
-    ?line no_msgs(500),
-
-    ?line Mon = erlang:monitor(process, MN),
-    ?line unlink(MN),
-    ?line exit(MN, bang),
-    ?line receive {'DOWN', Mon, process, MN, bang} -> ok end,
-    ?line ok = net_kernel:monitor_nodes(false),
-    ?line MonNodeState = monitor_node_state(),
-    ?line ok.
+    {nodedown, Node} = flush_node_msgs(NodeMsg, 2),
+    no_msgs(500),
+
+    Mon = erlang:monitor(process, MN),
+    unlink(MN),
+    exit(MN, bang),
+    receive {'DOWN', Mon, process, MN, bang} -> ok end,
+    ok = net_kernel:monitor_nodes(false),
+    MonNodeState = monitor_node_state(),
+    ok.
 
 flush_node_msgs(NodeMsg, No) ->
     case receive Msg -> Msg end of
@@ -974,105 +940,97 @@ node_loop_send(Pid, Msg, No) ->
     Pid ! {Msg, No},
     node_loop_send(Pid, Msg, No + 1).
 
-monitor_nodes_errors(doc) ->
-    [];
-monitor_nodes_errors(suite) ->
-    [];
 monitor_nodes_errors(Config) when is_list(Config) ->
-    ?line MonNodeState = monitor_node_state(),
-    ?line error = net_kernel:monitor_nodes(asdf),
-    ?line {error,
-	   {unknown_options,
-	    [gurka]}} = net_kernel:monitor_nodes(true,
-						 [gurka]),
-    ?line {error,
-	   {options_not_a_list,
-	    gurka}} = net_kernel:monitor_nodes(true,
-					       gurka),
-    ?line {error,
-	   {option_value_mismatch,
-	    [{node_type,visible},
-	     {node_type,hidden}]}}
+    MonNodeState = monitor_node_state(),
+    error = net_kernel:monitor_nodes(asdf),
+    {error,
+     {unknown_options,
+      [gurka]}} = net_kernel:monitor_nodes(true,
+					   [gurka]),
+    {error,
+     {options_not_a_list,
+      gurka}} = net_kernel:monitor_nodes(true,
+					 gurka),
+    {error,
+     {option_value_mismatch,
+      [{node_type,visible},
+       {node_type,hidden}]}}
 	= net_kernel:monitor_nodes(true,
 				   [{node_type,hidden},
 				    {node_type,visible}]),
-    ?line {error,
-	   {option_value_mismatch,
-	    [{node_type,visible},
-	     {node_type,all}]}}
+    {error,
+     {option_value_mismatch,
+      [{node_type,visible},
+       {node_type,all}]}}
 	= net_kernel:monitor_nodes(true,
 				   [{node_type,all},
 				    {node_type,visible}]),
-    ?line {error,
-	   {bad_option_value,
-	    {node_type,
-	     blaha}}}
+    {error,
+     {bad_option_value,
+      {node_type,
+       blaha}}}
 	= net_kernel:monitor_nodes(true, [{node_type, blaha}]),
-    ?line MonNodeState = monitor_node_state(),
-    ?line ok.
+    MonNodeState = monitor_node_state(),
+    ok.
 
-monitor_nodes_combinations(doc) ->
-    [];
-monitor_nodes_combinations(suite) ->
-    [];
 monitor_nodes_combinations(Config) when is_list(Config) ->
-    ?line MonNodeState = monitor_node_state(),
-    ?line monitor_nodes_all_comb(true),
-    ?line [VisibleName, HiddenName] = get_nodenames(2,
-						    monitor_nodes_combinations),
-    ?line {ok, Visible} = start_node(VisibleName, ""),
-    ?line receive_all_comb_nodeup_msgs(visible, Visible),
-    ?line no_msgs(),
-    ?line stop_node(Visible),
-    ?line receive_all_comb_nodedown_msgs(visible, Visible, connection_closed),
-    ?line no_msgs(),
-    ?line {ok, Hidden} = start_node(HiddenName, "-hidden"),
-    ?line receive_all_comb_nodeup_msgs(hidden, Hidden),
-    ?line no_msgs(),
-    ?line stop_node(Hidden),
-    ?line receive_all_comb_nodedown_msgs(hidden, Hidden, connection_closed),
-    ?line no_msgs(),
-    ?line monitor_nodes_all_comb(false),
-    ?line MonNodeState = monitor_node_state(),
-    ?line no_msgs(),
-    ?line ok.
+    MonNodeState = monitor_node_state(),
+    monitor_nodes_all_comb(true),
+    [VisibleName, HiddenName] = get_nodenames(2,
+					      monitor_nodes_combinations),
+    {ok, Visible} = start_node(VisibleName, ""),
+    receive_all_comb_nodeup_msgs(visible, Visible),
+    no_msgs(),
+    stop_node(Visible),
+    receive_all_comb_nodedown_msgs(visible, Visible, connection_closed),
+    no_msgs(),
+    {ok, Hidden} = start_node(HiddenName, "-hidden"),
+    receive_all_comb_nodeup_msgs(hidden, Hidden),
+    no_msgs(),
+    stop_node(Hidden),
+    receive_all_comb_nodedown_msgs(hidden, Hidden, connection_closed),
+    no_msgs(),
+    monitor_nodes_all_comb(false),
+    MonNodeState = monitor_node_state(),
+    no_msgs(),
+    ok.
 
 monitor_nodes_all_comb(Flag) ->
-    ?line ok = net_kernel:monitor_nodes(Flag),
-    ?line ok = net_kernel:monitor_nodes(Flag,
-					[nodedown_reason]),
-    ?line ok = net_kernel:monitor_nodes(Flag,
-					[{node_type, hidden}]),
-    ?line ok = net_kernel:monitor_nodes(Flag,
-					[{node_type, visible}]),
-    ?line ok = net_kernel:monitor_nodes(Flag,
-					[{node_type, all}]),
-    ?line ok = net_kernel:monitor_nodes(Flag,
-					[nodedown_reason,
-					 {node_type, hidden}]),
-    ?line ok = net_kernel:monitor_nodes(Flag,
-					[nodedown_reason,
-					 {node_type, visible}]),
-    ?line ok = net_kernel:monitor_nodes(Flag,
-					[nodedown_reason,
-					 {node_type, all}]),
+    ok = net_kernel:monitor_nodes(Flag),
+    ok = net_kernel:monitor_nodes(Flag,
+				  [nodedown_reason]),
+    ok = net_kernel:monitor_nodes(Flag,
+				  [{node_type, hidden}]),
+    ok = net_kernel:monitor_nodes(Flag,
+				  [{node_type, visible}]),
+    ok = net_kernel:monitor_nodes(Flag,
+				  [{node_type, all}]),
+    ok = net_kernel:monitor_nodes(Flag,
+				  [nodedown_reason,
+				   {node_type, hidden}]),
+    ok = net_kernel:monitor_nodes(Flag,
+				  [nodedown_reason,
+				   {node_type, visible}]),
+    ok = net_kernel:monitor_nodes(Flag,
+				  [nodedown_reason,
+				   {node_type, all}]),
     %% There currently are 8 different combinations
-    ?line 8.
+    8.
 
 
 receive_all_comb_nodeup_msgs(visible, Node) ->
-    ?t:format("Receive nodeup visible...~n"),
+    io:format("Receive nodeup visible...~n"),
     Exp = [{nodeup, Node},
 	   {nodeup, Node, []}]
 	++ mk_exp_mn_all_comb_nodeup_msgs_common(visible, Node),
     receive_mn_msgs(Exp),
-    ?t:format("ok~n"),
+    io:format("ok~n"),
     ok;
 receive_all_comb_nodeup_msgs(hidden, Node) ->
-    ?t:format("Receive nodeup hidden...~n"),
+    io:format("Receive nodeup hidden...~n"),
     Exp = mk_exp_mn_all_comb_nodeup_msgs_common(hidden, Node),
     receive_mn_msgs(Exp),
-    ?t:format("ok~n"),
+    io:format("ok~n"),
     ok.
 
 mk_exp_mn_all_comb_nodeup_msgs_common(Type, Node) ->
@@ -1083,20 +1041,20 @@ mk_exp_mn_all_comb_nodeup_msgs_common(Type, Node) ->
      {nodeup, Node, InfoNt}].
 
 receive_all_comb_nodedown_msgs(visible, Node, Reason) ->
-    ?t:format("Receive nodedown visible...~n"),
+    io:format("Receive nodedown visible...~n"),
     Exp = [{nodedown, Node},
 	   {nodedown, Node, [{nodedown_reason, Reason}]}]
 	++ mk_exp_mn_all_comb_nodedown_msgs_common(visible,
 						   Node,
 						   Reason),
     receive_mn_msgs(Exp),
-    ?t:format("ok~n"),
+    io:format("ok~n"),
     ok;
 receive_all_comb_nodedown_msgs(hidden, Node, Reason) ->
-    ?t:format("Receive nodedown hidden...~n"),
+    io:format("Receive nodedown hidden...~n"),
     Exp = mk_exp_mn_all_comb_nodedown_msgs_common(hidden, Node, Reason),
     receive_mn_msgs(Exp),
-    ?t:format("ok~n"),
+    io:format("ok~n"),
     ok.
 
 mk_exp_mn_all_comb_nodedown_msgs_common(Type, Node, Reason) ->
@@ -1110,81 +1068,73 @@ mk_exp_mn_all_comb_nodedown_msgs_common(Type, Node, Reason) ->
 receive_mn_msgs([]) ->
     ok;
 receive_mn_msgs(Msgs) ->
-    ?t:format("Expecting msgs: ~p~n", [Msgs]),
+    io:format("Expecting msgs: ~p~n", [Msgs]),
     receive
 	{_Dir, _Node} = Msg ->
-	    ?t:format("received ~p~n", [Msg]),
+	    io:format("received ~p~n", [Msg]),
 	    case lists:member(Msg, Msgs) of
 		true -> receive_mn_msgs(lists:delete(Msg, Msgs));
-		false -> ?t:fail({unexpected_message, Msg,
+		false -> ct:fail({unexpected_message, Msg,
 				  expected_messages, Msgs})
 	    end;
 	{Dir, Node, Info} ->
 	    Msg = {Dir, Node, lists:sort(Info)},
-	    ?t:format("received ~p~n", [Msg]),
+	    io:format("received ~p~n", [Msg]),
 	    case lists:member(Msg, Msgs) of
 		true -> receive_mn_msgs(lists:delete(Msg, Msgs));
-		false -> ?t:fail({unexpected_message, Msg,
+		false -> ct:fail({unexpected_message, Msg,
 				  expected_messages, Msgs})
 	    end;
 	Msg ->
-	    ?t:format("received ~p~n", [Msg]),
-	    ?t:fail({unexpected_message, Msg,
+	    io:format("received ~p~n", [Msg]),
+	    ct:fail({unexpected_message, Msg,
 		     expected_messages, Msgs})
     end.
 
-monitor_nodes_cleanup(doc) ->
-    [];
-monitor_nodes_cleanup(suite) ->
-    [];
 monitor_nodes_cleanup(Config) when is_list(Config) ->
-    ?line MonNodeState = monitor_node_state(),
-    ?line Me = self(),
-    ?line No = monitor_nodes_all_comb(true),
-    ?line Inf = spawn(fun () ->
-			      monitor_nodes_all_comb(true),
-			      Me ! {mons_set, self()},
-			      receive after infinity -> ok end
-		      end),
-    ?line TO = spawn(fun () ->
-			     monitor_nodes_all_comb(true),
-			     Me ! {mons_set, self()},
-			     receive after 500 -> ok end
-		     end),
-    ?line receive {mons_set, Inf} -> ok end,
-    ?line receive {mons_set, TO} -> ok end,
-    ?line MNLen = length(MonNodeState) + No*3,
-    ?line MNLen = length(monitor_node_state()),
-    ?line MonInf = erlang:monitor(process, Inf),
-    ?line MonTO = erlang:monitor(process, TO),
-    ?line exit(Inf, bang),
-    ?line No = monitor_nodes_all_comb(false),
-    ?line receive {'DOWN', MonInf, process, Inf, bang} -> ok end,
-    ?line receive {'DOWN', MonTO, process, TO, normal} -> ok end,
-    ?line MonNodeState = monitor_node_state(),
-    ?line no_msgs(),
-    ?line ok.
-
-monitor_nodes_many(doc) ->
-    [];
-monitor_nodes_many(suite) ->
-    [];
+    MonNodeState = monitor_node_state(),
+    Me = self(),
+    No = monitor_nodes_all_comb(true),
+    Inf = spawn(fun () ->
+			monitor_nodes_all_comb(true),
+			Me ! {mons_set, self()},
+			receive after infinity -> ok end
+		end),
+    TO = spawn(fun () ->
+		       monitor_nodes_all_comb(true),
+		       Me ! {mons_set, self()},
+		       receive after 500 -> ok end
+	       end),
+    receive {mons_set, Inf} -> ok end,
+    receive {mons_set, TO} -> ok end,
+    MNLen = length(MonNodeState) + No*3,
+    MNLen = length(monitor_node_state()),
+    MonInf = erlang:monitor(process, Inf),
+    MonTO = erlang:monitor(process, TO),
+    exit(Inf, bang),
+    No = monitor_nodes_all_comb(false),
+    receive {'DOWN', MonInf, process, Inf, bang} -> ok end,
+    receive {'DOWN', MonTO, process, TO, normal} -> ok end,
+    MonNodeState = monitor_node_state(),
+    no_msgs(),
+    ok.
+
 monitor_nodes_many(Config) when is_list(Config) ->
-    ?line MonNodeState = monitor_node_state(),
-    ?line [Name] = get_nodenames(1, monitor_nodes_many),
+    MonNodeState = monitor_node_state(),
+    [Name] = get_nodenames(1, monitor_nodes_many),
     %% We want to perform more than 2^16 net_kernel:monitor_nodes
     %% since this will wrap an internal counter
-    ?line No = (1 bsl 16) + 17,
-    ?line repeat(fun () -> ok = net_kernel:monitor_nodes(true) end, No),
-    ?line No = length(monitor_node_state()) - length(MonNodeState),
-    ?line {ok, Node} = start_node(Name),
-    ?line repeat(fun () -> receive {nodeup, Node} -> ok end end, No),
-    ?line stop_node(Node),
-    ?line repeat(fun () -> receive {nodedown, Node} -> ok end end, No),
-    ?line ok = net_kernel:monitor_nodes(false),
-    ?line no_msgs(10),
-    ?line MonNodeState = monitor_node_state(),
-    ?line ok.
+    No = (1 bsl 16) + 17,
+    repeat(fun () -> ok = net_kernel:monitor_nodes(true) end, No),
+    No = length(monitor_node_state()) - length(MonNodeState),
+    {ok, Node} = start_node(Name),
+    repeat(fun () -> receive {nodeup, Node} -> ok end end, No),
+    stop_node(Node),
+    repeat(fun () -> receive {nodedown, Node} -> ok end end, No),
+    ok = net_kernel:monitor_nodes(false),
+    no_msgs(10),
+    MonNodeState = monitor_node_state(),
+    ok.
 
 %% Misc. functions
 
@@ -1196,59 +1146,45 @@ monitor_node_state() ->
 
 
 check_no_nodedown_nodeup(TimeOut) ->
-    ?line receive
-	      {nodeup, _, _} = Msg -> ?line ?t:fail({unexpected_nodeup, Msg});
-	      {nodeup, _} = Msg -> ?line ?t:fail({unexpected_nodeup, Msg});
-	      {nodedown, _, _} = Msg -> ?line ?t:fail({unexpected_nodedown, Msg});
-	      {nodedown, _} = Msg -> ?line ?t:fail({unexpected_nodedown, Msg})
-	  after TimeOut ->
-		  ok
-	  end.
+    receive
+	{nodeup, _, _} = Msg -> ct:fail({unexpected_nodeup, Msg});
+	{nodeup, _} = Msg -> ct:fail({unexpected_nodeup, Msg});
+	{nodedown, _, _} = Msg -> ct:fail({unexpected_nodedown, Msg});
+	{nodedown, _} = Msg -> ct:fail({unexpected_nodedown, Msg})
+    after TimeOut ->
+	    ok
+    end.
 
 print_my_messages() ->
-    ?line {messages, Messages} = process_info(self(), messages),
-    ?line ?t:format("Messages: ~p~n", [Messages]),
-    ?line ok.
+    {messages, Messages} = process_info(self(), messages),
+    io:format("Messages: ~p~n", [Messages]),
+    ok.
 
 
 sleep(T) -> receive after T * 1000 -> ok end.	
 
 start_node(Name, Param, this) ->
     NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)),
-    ?t:start_node(Name, peer, [{args, NewParam}, {erl, [this]}]);
+    test_server:start_node(Name, peer, [{args, NewParam}, {erl, [this]}]);
 start_node(Name, Param, "this") ->
     NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)),
-    ?t:start_node(Name, peer, [{args, NewParam}, {erl, [this]}]);
+    test_server:start_node(Name, peer, [{args, NewParam}, {erl, [this]}]);
 start_node(Name, Param, Rel) when is_atom(Rel) ->
     NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)),
-    ?t:start_node(Name, peer, [{args, NewParam}, {erl, [{release, atom_to_list(Rel)}]}]);
+    test_server:start_node(Name, peer, [{args, NewParam}, {erl, [{release, atom_to_list(Rel)}]}]);
 start_node(Name, Param, Rel) when is_list(Rel) ->
     NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)),
-    ?t:start_node(Name, peer, [{args, NewParam}, {erl, [{release, Rel}]}]).
+    test_server:start_node(Name, peer, [{args, NewParam}, {erl, [{release, Rel}]}]).
 
 start_node(Name, Param) ->
     NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)),
-    ?t:start_node(Name, slave, [{args, NewParam}]).
-%    M = list_to_atom(from($@, atom_to_list(node()))),
-%    slave:start_link(M, Name, Param).
+    test_server:start_node(Name, slave, [{args, NewParam}]).
 
 start_node(Name) ->
     start_node(Name, "").
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
-%    erlang:monitor_node(Node, true),
-%    rpc:cast(Node, init, stop, []),
-%    receive
-%	{nodedown, Node} ->
-%	    ok
-%    after 10000 ->
-%	    test_server:fail({stop_node, Node})
-%    end.
-
-% from(H, [H | T]) -> T;
-% from(H, [_ | T]) -> from(H, T);
-% from(H, []) -> [].
+    test_server:stop_node(Node).
 
 get_nodenames(N, T) ->
     get_nodenames(N, T, []).
diff --git a/lib/kernel/test/erl_distribution_wb_SUITE.erl b/lib/kernel/test/erl_distribution_wb_SUITE.erl
index c107e92fae..dc60b8b9e9 100644
--- a/lib/kernel/test/erl_distribution_wb_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_wb_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(erl_distribution_wb_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/inet.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -71,7 +71,7 @@
 
 -define(i16(X1,X0),
         (?u16(X1,X0) - 
-         (if (X1) > 127 -> 16#10000; true -> 0 end))).
+	     (if (X1) > 127 -> 16#10000; true -> 0 end))).
 
 -define(u16(X1,X0),
         (((X1) bsl 8) bor (X0))).
@@ -79,7 +79,9 @@
 -define(u32(X3,X2,X1,X0),
         (((X3) bsl 24) bor ((X2) bsl 16) bor ((X1) bsl 8) bor (X0))).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [whitebox, switch_options, missing_compulsory_dflags].
@@ -101,39 +103,33 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(1)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
-
-switch_options(doc) ->
-    ["Tests switching of options for the tcp port, as this is done"
-     " when the distribution port is to be shortcut into the emulator."
-     " Maybe this should be in the inet test suite, but only the distribution"
-     " does such horrible things..."];
+    Config.
+
+end_per_testcase(_Func, _Config) ->
+    ok.
+
+%% Tests switching of options for the tcp port, as this is done
+%% when the distribution port is to be shortcut into the emulator.
+%% Maybe this should be in the inet test suite, but only the distribution
+%% does such horrible things...
 switch_options(Config) when is_list(Config) ->
     ok = test_switch_active(),
     ok = test_switch_active_partial() ,
     ok = test_switch_active_and_packet(),    
     ok.
-    
 
-whitebox(doc) ->
-    ["Whitebox testing of distribution handshakes. Tests both BC with R5 and "
-     "the md5 version. Note that after R6B, this should be revised to "
-     "remove BC code."];
+
+%% Whitebox testing of distribution handshakes.
 whitebox(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_node(?MODULE,""),
-    ?line Cookie = erlang:get_cookie(),
-    ?line {_,Host} = split(node()),
-    ?line ok = pending_up_md5(Node, join(ccc,Host), Cookie),
-    ?line ok = simultaneous_md5(Node, join('A',Host), Cookie),
-    ?line ok = simultaneous_md5(Node, join(zzzzzzzzzzzzzz,Host), Cookie),
-    ?line stop_node(Node),
+    {ok, Node} = start_node(?MODULE,""),
+    Cookie = erlang:get_cookie(),
+    {_,Host} = split(node()),
+    ok = pending_up_md5(Node, join(ccc,Host), Cookie),
+    ok = simultaneous_md5(Node, join('A',Host), Cookie),
+    ok = simultaneous_md5(Node, join(zzzzzzzzzzzzzz,Host), Cookie),
+    stop_node(Node),
     ok.
-    
+
 %%
 %% The actual tests
 %%
@@ -143,56 +139,56 @@ whitebox(Config) when is_list(Config) ->
 %%
 
 test_switch_active() ->
-    ?line {Client, Server} = socket_pair(0, 4),
-    ?line ok = write_packets_32(Client, 1, 5),
+    {Client, Server} = socket_pair(0, 4),
+    ok = write_packets_32(Client, 1, 5),
     receive after 2000 -> ok end,
-    ?line ok = read_packets(Server, 1, 1),
+    ok = read_packets(Server, 1, 1),
     receive after 2000 -> ok end,
-    ?line ok = read_packets(Server, 2, 2),
-    ?line inet:setopts(Server, [{active, true}]),
-    ?line ok = receive_packets(Server, 3, 5),
+    ok = read_packets(Server, 2, 2),
+    inet:setopts(Server, [{active, true}]),
+    ok = receive_packets(Server, 3, 5),
     close_pair({Client, Server}),
     ok.
-    
+
 test_switch_active_partial() ->
-    ?line {Client, Server} = socket_pair(0, 4),
-    ?line ok = write_packets_32(Client, 1, 2),
-    ?line ok = gen_tcp:send(Client,[?int32(4), [0,0,0]]),
+    {Client, Server} = socket_pair(0, 4),
+    ok = write_packets_32(Client, 1, 2),
+    ok = gen_tcp:send(Client,[?int32(4), [0,0,0]]),
     receive after 2000 -> ok end,
-    ?line ok = read_packets(Server, 1, 1),
+    ok = read_packets(Server, 1, 1),
     receive after 2000 -> ok end,
-    ?line ok = read_packets(Server, 2, 2),
-    ?line inet:setopts(Server, [{active, true}]),
-    ?line ok = gen_tcp:send(Client,[3]),
-    ?line ok = write_packets_32(Client, 4, 5),
-    ?line ok = receive_packets(Server, 3, 5),
+    ok = read_packets(Server, 2, 2),
+    inet:setopts(Server, [{active, true}]),
+    ok = gen_tcp:send(Client,[3]),
+    ok = write_packets_32(Client, 4, 5),
+    ok = receive_packets(Server, 3, 5),
     close_pair({Client, Server}),
     ok.
-    
+
 do_test_switch_active_and_packet(SendBefore, SendAfter) ->
-    ?line {Client, Server} = socket_pair(0, 2),
-    ?line ok = write_packets_16(Client, 1, 2),
-    ?line ok = gen_tcp:send(Client,SendBefore),
+    {Client, Server} = socket_pair(0, 2),
+    ok = write_packets_16(Client, 1, 2),
+    ok = gen_tcp:send(Client,SendBefore),
     receive after 2000 -> ok end,
-    ?line ok = read_packets(Server, 1, 1),
+    ok = read_packets(Server, 1, 1),
     receive after 2000 -> ok end,
-    ?line ok = read_packets(Server, 2, 2),
-    ?line inet:setopts(Server, [{packet,4}, {active, true}]),
-    ?line ok = gen_tcp:send(Client,SendAfter),
-    ?line ok = write_packets_32(Client, 4, 5),
-    ?line ok = receive_packets(Server, 3, 5),
+    ok = read_packets(Server, 2, 2),
+    inet:setopts(Server, [{packet,4}, {active, true}]),
+    ok = gen_tcp:send(Client,SendAfter),
+    ok = write_packets_32(Client, 4, 5),
+    ok = receive_packets(Server, 3, 5),
     close_pair({Client, Server}),
     ok.
 
 test_switch_active_and_packet() ->
-    ?line ok = do_test_switch_active_and_packet([0],[0,0,4,0,0,0,3]),
-    ?line ok = do_test_switch_active_and_packet([0,0],[0,4,0,0,0,3]),
-    ?line ok = do_test_switch_active_and_packet([0,0,0],[4,0,0,0,3]),
-    ?line ok = do_test_switch_active_and_packet([0,0,0,4],[0,0,0,3]),
-    ?line ok = do_test_switch_active_and_packet([0,0,0,4,0],[0,0,3]),
-    ?line ok = do_test_switch_active_and_packet([0,0,0,4,0,0],[0,3]),
-    ?line ok = do_test_switch_active_and_packet([0,0,0,4,0,0,0],[3]),
-    ?line ok = do_test_switch_active_and_packet([0,0,0,4,0,0,0,3],[]),
+    ok = do_test_switch_active_and_packet([0],[0,0,4,0,0,0,3]),
+    ok = do_test_switch_active_and_packet([0,0],[0,4,0,0,0,3]),
+    ok = do_test_switch_active_and_packet([0,0,0],[4,0,0,0,3]),
+    ok = do_test_switch_active_and_packet([0,0,0,4],[0,0,0,3]),
+    ok = do_test_switch_active_and_packet([0,0,0,4,0],[0,0,3]),
+    ok = do_test_switch_active_and_packet([0,0,0,4,0,0],[0,3]),
+    ok = do_test_switch_active_and_packet([0,0,0,4,0,0,0],[3]),
+    ok = do_test_switch_active_and_packet([0,0,0,4,0,0,0,3],[]),
     ok.
 
 
@@ -200,181 +196,180 @@ test_switch_active_and_packet() ->
 %% Handshake tests
 %%
 pending_up_md5(Node,OurName,Cookie) ->
-    ?line {NA,NB} = split(Node),
-    ?line {port,PortNo,_} = erl_epmd:port_please(NA,NB),
-    ?line {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
-					  [{active,false},
-					   {packet,2}]),
-    ?line send_name(SocketA,OurName,5),
-    ?line ok = recv_status(SocketA),
-    ?line {hidden,Node,5,HisChallengeA} = recv_challenge(SocketA), % See 1)
-    ?line OurChallengeA = gen_challenge(),
-    ?line OurDigestA = gen_digest(HisChallengeA, Cookie),
-    ?line send_challenge_reply(SocketA, OurChallengeA, OurDigestA),
-    ?line ok = recv_challenge_ack(SocketA, OurChallengeA, Cookie),
-    %%%
-    %%% OK, one connection is up, now lets be nasty and try another up:
-    %%%
-    %%% But wait for a while, the other node might not have done setnode 
-    %%% just yet...
-    ?line receive after 1000 -> ok end,
-    ?line {ok, SocketB} = gen_tcp:connect(atom_to_list(NB),PortNo,
-					  [{active,false},
-					   {packet,2}]),
-    ?line send_name(SocketB,OurName,5),
-    ?line alive = recv_status(SocketB),
-    ?line send_status(SocketB, true),
-    ?line gen_tcp:close(SocketA),
-    ?line {hidden,Node,5,HisChallengeB} = recv_challenge(SocketB), % See 1)
-    ?line OurChallengeB = gen_challenge(),
-    ?line OurDigestB = gen_digest(HisChallengeB, Cookie),
-    ?line send_challenge_reply(SocketB, OurChallengeB, OurDigestB),
-    ?line ok = recv_challenge_ack(SocketB, OurChallengeB, Cookie),
-    %%%
-    %%% Well, are we happy?
-    %%%
-    
-    ?line inet:setopts(SocketB, [{active, false},
-				 {packet, 4}]),    
-    ?line gen_tcp:send(SocketB,build_rex_message('',OurName)),
-    ?line {Header, Message} = recv_message(SocketB),
-    ?line io:format("Received header ~p, data ~p.~n",
+    {NA,NB} = split(Node),
+    {port,PortNo,_} = erl_epmd:port_please(NA,NB),
+    {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
+				    [{active,false},
+				     {packet,2}]),
+    send_name(SocketA,OurName,5),
+    ok = recv_status(SocketA),
+    {hidden,Node,5,HisChallengeA} = recv_challenge(SocketA), % See 1)
+    OurChallengeA = gen_challenge(),
+    OurDigestA = gen_digest(HisChallengeA, Cookie),
+    send_challenge_reply(SocketA, OurChallengeA, OurDigestA),
+    ok = recv_challenge_ack(SocketA, OurChallengeA, Cookie),
+%%%
+%%% OK, one connection is up, now lets be nasty and try another up:
+%%%
+%%% But wait for a while, the other node might not have done setnode
+%%% just yet...
+    receive after 1000 -> ok end,
+    {ok, SocketB} = gen_tcp:connect(atom_to_list(NB),PortNo,
+				    [{active,false},
+				     {packet,2}]),
+    send_name(SocketB,OurName,5),
+    alive = recv_status(SocketB),
+    send_status(SocketB, true),
+    gen_tcp:close(SocketA),
+    {hidden,Node,5,HisChallengeB} = recv_challenge(SocketB), % See 1)
+    OurChallengeB = gen_challenge(),
+    OurDigestB = gen_digest(HisChallengeB, Cookie),
+    send_challenge_reply(SocketB, OurChallengeB, OurDigestB),
+    ok = recv_challenge_ack(SocketB, OurChallengeB, Cookie),
+%%%
+%%% Well, are we happy?
+%%%
+
+    inet:setopts(SocketB, [{active, false},
+			   {packet, 4}]),
+    gen_tcp:send(SocketB,build_rex_message('',OurName)),
+    {Header, Message} = recv_message(SocketB),
+    io:format("Received header ~p, data ~p.~n",
 	      [Header, Message]),
-    ?line gen_tcp:close(SocketB),
+    gen_tcp:close(SocketB),
     ok.
 
 simultaneous_md5(Node, OurName, Cookie) when OurName < Node ->
-    ?line pong = net_adm:ping(Node),
-    ?line LSocket = case gen_tcp:listen(0, [{active, false}, {packet,2}]) of
+    pong = net_adm:ping(Node),
+    LSocket = case gen_tcp:listen(0, [{active, false}, {packet,2}]) of
 		  {ok, Socket} ->
 		      Socket;
 		  Else ->
 		      exit(Else)
 	      end,
-    ?line EpmdSocket = register(OurName, LSocket, 1, 5),
-    ?line {NA, NB} = split(Node),
-    ?line rpc:cast(Node, net_adm, ping, [OurName]),
-    ?line receive after 1000 -> ok end,
-    ?line {port, PortNo, _} = erl_epmd:port_please(NA,NB),
-    ?line {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
-					  [{active,false},
-					   {packet,2}]),
-    ?line send_name(SocketA,OurName,5),
+    EpmdSocket = register(OurName, LSocket, 1, 5),
+    {NA, NB} = split(Node),
+    rpc:cast(Node, net_adm, ping, [OurName]),
+    receive after 1000 -> ok end,
+    {port, PortNo, _} = erl_epmd:port_please(NA,NB),
+    {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
+				    [{active,false},
+				     {packet,2}]),
+    send_name(SocketA,OurName,5),
     %% We are still not marked up on the other side, as our first message 
     %% is not sent.
-    ?line SocketB = case gen_tcp:accept(LSocket) of
+    SocketB = case gen_tcp:accept(LSocket) of
 		  {ok, Socket1} ->
-		      ?line Socket1;
+		      Socket1;
 		  Else2 ->
-		      ?line exit(Else2)
+		      exit(Else2)
 	      end,
-    ?line nok = recv_status(SocketA),
-    % Now we are expected to close A
-    ?line gen_tcp:close(SocketA),
-    % But still Socket B will continue
-    ?line {normal,Node,5} = recv_name(SocketB),  % See 1)
-    ?line send_status(SocketB, ok_simultaneous),
-    ?line MyChallengeB = gen_challenge(),
-    ?line send_challenge(SocketB, OurName, MyChallengeB,5),
-    ?line HisChallengeB = recv_challenge_reply(SocketB, MyChallengeB, Cookie),
-    ?line DigestB = gen_digest(HisChallengeB,Cookie),
-    ?line send_challenge_ack(SocketB, DigestB),
-    ?line inet:setopts(SocketB, [{active, false},
-			  {packet, 4}]),    
-    % This should be the ping message.
-    ?line {Header, Message} = recv_message(SocketB),
-    ?line io:format("Received header ~p, data ~p.~n",
+    nok = recv_status(SocketA),
+    %% Now we are expected to close A
+    gen_tcp:close(SocketA),
+    %% But still Socket B will continue
+    {normal,Node,5} = recv_name(SocketB),  % See 1)
+    send_status(SocketB, ok_simultaneous),
+    MyChallengeB = gen_challenge(),
+    send_challenge(SocketB, OurName, MyChallengeB,5),
+    HisChallengeB = recv_challenge_reply(SocketB, MyChallengeB, Cookie),
+    DigestB = gen_digest(HisChallengeB,Cookie),
+    send_challenge_ack(SocketB, DigestB),
+    inet:setopts(SocketB, [{active, false},
+			   {packet, 4}]),
+    %% This should be the ping message.
+    {Header, Message} = recv_message(SocketB),
+    io:format("Received header ~p, data ~p.~n",
 	      [Header, Message]),
-    ?line gen_tcp:close(SocketB),
-    ?line gen_tcp:close(LSocket),
-    ?line gen_tcp:close(EpmdSocket),
+    gen_tcp:close(SocketB),
+    gen_tcp:close(LSocket),
+    gen_tcp:close(EpmdSocket),
     ok;
-    
+
 simultaneous_md5(Node, OurName, Cookie) when OurName > Node ->
-    ?line pong = net_adm:ping(Node),
-    ?line LSocket = case gen_tcp:listen(0, [{active, false}, {packet,2}]) of
-			{ok, Socket} ->
-			    ?line Socket;
-			Else ->
-			    ?line exit(Else)
-		    end,
-    ?line EpmdSocket = register(OurName, LSocket, 1, 5),
-    ?line {NA, NB} = split(Node),
-    ?line rpc:cast(Node, net_adm, ping, [OurName]),
-    ?line receive after 1000 -> ok end,
-    ?line {port, PortNo, _} = erl_epmd:port_please(NA,NB),
-    ?line {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
-					  [{active,false},
-					   {packet,2}]),
-    ?line SocketB = case gen_tcp:accept(LSocket) of
+    pong = net_adm:ping(Node),
+    LSocket = case gen_tcp:listen(0, [{active, false}, {packet,2}]) of
+		  {ok, Socket} ->
+		      Socket;
+		  Else ->
+		      exit(Else)
+	      end,
+    EpmdSocket = register(OurName, LSocket, 1, 5),
+    {NA, NB} = split(Node),
+    rpc:cast(Node, net_adm, ping, [OurName]),
+    receive after 1000 -> ok end,
+    {port, PortNo, _} = erl_epmd:port_please(NA,NB),
+    {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
+				    [{active,false},
+				     {packet,2}]),
+    SocketB = case gen_tcp:accept(LSocket) of
 		  {ok, Socket1} ->
-		      ?line Socket1;
+		      Socket1;
 		  Else2 ->
-		      ?line exit(Else2)
+		      exit(Else2)
 	      end,
-    ?line send_name(SocketA,OurName,5),
-    ?line ok_simultaneous = recv_status(SocketA),
+    send_name(SocketA,OurName,5),
+    ok_simultaneous = recv_status(SocketA),
     %% Socket B should die during this
-    ?line case catch begin
-			 ?line {normal,Node,5} = recv_name(SocketB),  % See 1)
-			 ?line send_status(SocketB, ok_simultaneous),
-			 ?line MyChallengeB = gen_challenge(),
-			 ?line send_challenge(SocketB, OurName, MyChallengeB,
-					      5),
-			 ?line HisChallengeB = recv_challenge_reply(
-						 SocketB, 
-						 MyChallengeB, 
-						 Cookie),
-			 ?line DigestB = gen_digest(HisChallengeB,Cookie),
-			 ?line send_challenge_ack(SocketB, DigestB),
-			 ?line inet:setopts(SocketB, [{active, false},
-						      {packet, 4}]),    
-			 ?line {HeaderB, MessageB} = recv_message(SocketB),
-			 ?line io:format("Received header ~p, data ~p.~n",
-					 [HeaderB, MessageB])
-		     end of
-	      {'EXIT', Exitcode} ->
-		  ?line io:format("Expected exitsignal caught: ~p.~n",
-				  [Exitcode]);
-	      Success ->
-		  ?line io:format("Unexpected success: ~p~n",
-				  [Success]),
-		  ?line exit(unexpected_success)
-	  end,
-    ?line gen_tcp:close(SocketB),
+    case catch begin
+		   {normal,Node,5} = recv_name(SocketB),  % See 1)
+		   send_status(SocketB, ok_simultaneous),
+		   MyChallengeB = gen_challenge(),
+		   send_challenge(SocketB, OurName, MyChallengeB,
+				  5),
+		   HisChallengeB = recv_challenge_reply(
+				     SocketB,
+				     MyChallengeB,
+				     Cookie),
+		   DigestB = gen_digest(HisChallengeB,Cookie),
+		   send_challenge_ack(SocketB, DigestB),
+		   inet:setopts(SocketB, [{active, false},
+					  {packet, 4}]),
+		   {HeaderB, MessageB} = recv_message(SocketB),
+		   io:format("Received header ~p, data ~p.~n",
+			     [HeaderB, MessageB])
+	       end of
+	{'EXIT', Exitcode} ->
+	    io:format("Expected exitsignal caught: ~p.~n",
+		      [Exitcode]);
+	Success ->
+	    io:format("Unexpected success: ~p~n",
+		      [Success]),
+	    exit(unexpected_success)
+    end,
+    gen_tcp:close(SocketB),
     %% But still Socket A will continue
-    ?line {hidden,Node,5,HisChallengeA} = recv_challenge(SocketA), % See 1)
-    ?line OurChallengeA = gen_challenge(),
-    ?line OurDigestA = gen_digest(HisChallengeA, Cookie),
-    ?line send_challenge_reply(SocketA, OurChallengeA, OurDigestA),
-    ?line ok = recv_challenge_ack(SocketA, OurChallengeA, Cookie),
-    
-    ?line inet:setopts(SocketA, [{active, false},
-				 {packet, 4}]),    
-    ?line gen_tcp:send(SocketA,build_rex_message('',OurName)),
-    ?line {Header, Message} = recv_message(SocketA),
-    ?line io:format("Received header ~p, data ~p.~n",
+    {hidden,Node,5,HisChallengeA} = recv_challenge(SocketA), % See 1)
+    OurChallengeA = gen_challenge(),
+    OurDigestA = gen_digest(HisChallengeA, Cookie),
+    send_challenge_reply(SocketA, OurChallengeA, OurDigestA),
+    ok = recv_challenge_ack(SocketA, OurChallengeA, Cookie),
+
+    inet:setopts(SocketA, [{active, false},
+			   {packet, 4}]),
+    gen_tcp:send(SocketA,build_rex_message('',OurName)),
+    {Header, Message} = recv_message(SocketA),
+    io:format("Received header ~p, data ~p.~n",
 	      [Header, Message]),
-    ?line gen_tcp:close(SocketA),
-    ?line gen_tcp:close(LSocket),
-    ?line gen_tcp:close(EpmdSocket),
+    gen_tcp:close(SocketA),
+    gen_tcp:close(LSocket),
+    gen_tcp:close(EpmdSocket),
     ok.
 
-missing_compulsory_dflags(doc) -> [];
 missing_compulsory_dflags(Config) when is_list(Config) ->
-    ?line [Name1, Name2] = get_nodenames(2, missing_compulsory_dflags),
-    ?line {ok, Node} = start_node(Name1,""),
-    ?line {NA,NB} = split(Node),
-    ?line {port,PortNo,_} = erl_epmd:port_please(NA,NB),
-    ?line {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
-					  [{active,false},
-					   {packet,2}]),
-    ?line BadNode = list_to_atom(atom_to_list(Name2)++"@"++atom_to_list(NB)),
-    ?line send_name(SocketA,BadNode,5,0),
-    ?line not_allowed = recv_status(SocketA),
-    ?line gen_tcp:close(SocketA),
-    ?line stop_node(Node),
-    ?line ok.
+    [Name1, Name2] = get_nodenames(2, missing_compulsory_dflags),
+    {ok, Node} = start_node(Name1,""),
+    {NA,NB} = split(Node),
+    {port,PortNo,_} = erl_epmd:port_please(NA,NB),
+    {ok, SocketA} = gen_tcp:connect(atom_to_list(NB),PortNo,
+				    [{active,false},
+				     {packet,2}]),
+    BadNode = list_to_atom(atom_to_list(Name2)++"@"++atom_to_list(NB)),
+    send_name(SocketA,BadNode,5,0),
+    not_allowed = recv_status(SocketA),
+    gen_tcp:close(SocketA),
+    stop_node(Node),
+    ok.
 
 %%
 %% Here comes the utilities
@@ -437,7 +432,7 @@ socket_pair(ClientPack, ServerPack) ->
     {ok, Server} = gen_tcp:accept(Listen),
     gen_tcp:close(Listen),
     {Client, Server}.
-    
+
 close_pair({Client, Server}) ->
     gen_tcp:close(Client),
     gen_tcp:close(Server),
@@ -454,7 +449,7 @@ close_pair({Client, Server}) ->
 
 gen_challenge() ->
     rand:uniform(1000000).
-    
+
 %% Generate a message digest from Challenge number and Cookie	
 gen_digest(Challenge, Cookie) when is_integer(Challenge), is_atom(Cookie) ->
     C0 = erlang:md5_init(),
@@ -595,15 +590,15 @@ do_register_node(NodeName, TcpPort, VLow, VHigh) ->
 	    Elen = length(Extra),
 	    Len = 1+2+1+1+2+2+2+length(Name)+2+Elen,
 	    gen_tcp:send(Socket, [?int16(Len), $x,
-				   ?int16(TcpPort),
-				   $M,
-				   0,
-				   ?int16(VHigh),
-				   ?int16(VLow),
-				   ?int16(length(Name)),
-				   Name,
-				   ?int16(Elen),
-				   Extra]),
+				  ?int16(TcpPort),
+				  $M,
+				  0,
+				  ?int16(VHigh),
+				  ?int16(VLow),
+				  ?int16(length(Name)),
+				  Name,
+				  ?int16(Elen),
+				  Extra]),
 	    case wait_for_reg_reply(Socket, []) of
 		{error, epmd_close} ->
 		    exit(epmd_broken);
@@ -666,11 +661,11 @@ split(Atom) ->
 build_rex_message(Cookie,OurName) ->
     [$?,term_to_binary({6,self(),Cookie,rex}),
      term_to_binary({'$gen_cast',
-		    {cast,
-		     rpc,
-		     cast,
-		     [OurName, hello, world, []],
-		     self()} })].
+		     {cast,
+		      rpc,
+		      cast,
+		      [OurName, hello, world, []],
+		      self()} })].
 
 %% Receive a distribution message    
 recv_message(Socket) ->
@@ -698,10 +693,10 @@ join(Name,Host) ->
 
 %% start/stop slave.
 start_node(Name, Param) ->
-    ?t:start_node(Name, slave, [{args, Param}]).
+    test_server:start_node(Name, slave, [{args, Param}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 
 get_nodenames(N, T) ->
diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index 0803cf428f..3ea925ee9a 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -20,31 +20,35 @@
 -module(erl_prim_loader_SUITE).
 
 -include_lib("kernel/include/file.hrl").
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2,end_per_testcase/2,
 	 init_per_group/2,end_per_group/2]).
 
 -export([get_path/1, set_path/1, get_file/1, normalize_and_backslash/1,
 	 inet_existing/1, inet_coming_up/1, inet_disconnects/1,
 	 multiple_slaves/1, file_requests/1,
 	 local_archive/1, remote_archive/1,
-	 primary_archive/1, virtual_dir_in_archive/1]).
+	 primary_archive/1, virtual_dir_in_archive/1,
+	 get_modules/1]).
 
--export([init_per_testcase/2, end_per_testcase/2]).
 
 %%-----------------------------------------------------------------
 %% Test suite for erl_prim_loader. (Most code is run during system start/stop.)
 %%-----------------------------------------------------------------
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,3}}].
 
 all() -> 
     [get_path, set_path, get_file,
      normalize_and_backslash, inet_existing,
      inet_coming_up, inet_disconnects, multiple_slaves,
      file_requests, local_archive, remote_archive,
-     primary_archive, virtual_dir_in_archive].
+     primary_archive, virtual_dir_in_archive,
+     get_modules].
 
 groups() -> 
     [].
@@ -62,53 +66,88 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(3)),
-    [{watchdog, Dog}|Config].
+init_per_testcase(_Func, Config) ->
+    Config.
 
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
+end_per_testcase(_Func, _Config) ->
+    ok.
 
-get_path(doc) -> [];
 get_path(Config) when is_list(Config) ->
-    ?line case erl_prim_loader:get_path() of
-	      {ok, Path} when is_list(Path) ->
-		  ok;
-	      _ ->
-		  test_server:fail(get_path)
-	  end,
+    case erl_prim_loader:get_path() of
+	{ok, Path} when is_list(Path) ->
+	    ok;
+	_ ->
+	    ct:fail(get_path)
+    end,
     ok.
 
-set_path(doc) -> [];
 set_path(Config) when is_list(Config) ->
-    ?line {ok, Path} = erl_prim_loader:get_path(),
-    ?line ok = erl_prim_loader:set_path(Path),
-    ?line {ok, Path} = erl_prim_loader:get_path(),
+    {ok, Path} = erl_prim_loader:get_path(),
+    ok = erl_prim_loader:set_path(Path),
+    {ok, Path} = erl_prim_loader:get_path(),
     NewPath = Path ++ ["dummy_dir","/dummy_dir/dummy_dir"],
-    ?line ok = erl_prim_loader:set_path(NewPath),
-    ?line {ok, NewPath} = erl_prim_loader:get_path(),
+    ok = erl_prim_loader:set_path(NewPath),
+    {ok, NewPath} = erl_prim_loader:get_path(),
 
-    ?line ok = erl_prim_loader:set_path(Path), % Reset path.
-    ?line {ok, Path} = erl_prim_loader:get_path(),
+    ok = erl_prim_loader:set_path(Path), % Reset path.
+    {ok, Path} = erl_prim_loader:get_path(),
 
-    ?line {'EXIT',_} = (catch erl_prim_loader:set_path(not_a_list)),
-    ?line {ok, Path} = erl_prim_loader:get_path(),
+    {'EXIT',_} = (catch erl_prim_loader:set_path(not_a_list)),
+    {ok, Path} = erl_prim_loader:get_path(),
     ok.
 
-get_file(doc) -> [];
 get_file(Config) when is_list(Config) ->
-    ?line case erl_prim_loader:get_file("lists" ++ code:objfile_extension()) of
-	      {ok,Bin,File} when is_binary(Bin), is_list(File) ->
-		  ok;
-	      _ ->
-		  test_server:fail(get_valid_file)
-	  end,
-    ?line error = erl_prim_loader:get_file("duuuuuuummmy_file"),
-    ?line error = erl_prim_loader:get_file(duuuuuuummmy_file),
-    ?line error = erl_prim_loader:get_file({dummy}),
+    case erl_prim_loader:get_file("lists" ++ code:objfile_extension()) of
+	{ok,Bin,File} when is_binary(Bin), is_list(File) ->
+	    ok;
+	_ ->
+	    ct:fail(get_valid_file)
+    end,
+    error = erl_prim_loader:get_file("duuuuuuummmy_file"),
+    error = erl_prim_loader:get_file(duuuuuuummmy_file),
+    error = erl_prim_loader:get_file({dummy}),
+    ok.
+
+get_modules(_Config) ->
+    case test_server:is_cover() of
+	false -> do_get_modules();
+	true -> {skip,"Cover"}
+    end.
+
+do_get_modules() ->
+    MsGood = lists:sort([lists,gen_server,gb_trees,code_server]),
+    Ms = [certainly_not_existing|MsGood],
+    SuccExp = [begin
+		   F = code:which(M),
+		   {ok,Code} = file:read_file(F),
+		   {M,{F,erlang:md5(Code)}}
+	       end || M <- MsGood],
+    FailExp = [{certainly_not_existing,enoent}],
+
+    io:format("SuccExp = ~p\n", [SuccExp]),
+    io:format("FailExp = ~p\n", [FailExp]),
+
+    Path = code:get_path(),
+    Process = fun(_, F, Code) -> {ok,{F,erlang:md5(Code)}} end,
+    {ok,{Succ,FailExp}} = erl_prim_loader:get_modules(Ms, Process, Path),
+    SuccExp = lists:sort(Succ),
+
+    Name = inet_get_modules,
+    {ok, Node, BootPid} = complete_start_node(Name),
+    ThisDir = filename:dirname(code:which(?MODULE)),
+    true = rpc:call(Node, code, add_patha, [ThisDir]),
+    _ = rpc:call(Node, code, ensure_loaded, [?MODULE]),
+    {ok,{InetSucc,FailExp}} = rpc:call(Node, erl_prim_loader,
+				       get_modules, [Ms,Process,Path]),
+    SuccExp = lists:sort(InetSucc),
+
+    stop_node(Node),
+    unlink(BootPid),
+    exit(BootPid, kill),
+
     ok.
 
+
 normalize_and_backslash(Config) ->
     %% Test OTP-11170
     case os:type() of
@@ -118,7 +157,7 @@ normalize_and_backslash(Config) ->
 	    test_normalize_and_backslash(Config)
     end.
 test_normalize_and_backslash(Config) ->
-    PrivDir = ?config(priv_dir,Config),
+    PrivDir = proplists:get_value(priv_dir,Config),
     Dir = filename:join(PrivDir,"\\"),
     File = filename:join(Dir,"file-OTP-11170"),
     ok = file:make_dir(Dir),
@@ -129,41 +168,27 @@ test_normalize_and_backslash(Config) ->
     ok = file:del_dir(Dir),
     ok.
 
-inet_existing(doc) -> ["Start a node using the 'inet' loading method, ",
-		       "from an already started boot server."];
+%% Start a node using the 'inet' loading method,
+%% from an already started boot server.
 inet_existing(Config) when is_list(Config) ->
     Name = erl_prim_test_inet_existing,
-    Host = host(),
-    Cookie = atom_to_list(erlang:get_cookie()),
-    IpStr = ip_str(Host),
-    LFlag = get_loader_flag(os:type()),
-    Args = LFlag ++ " -hosts " ++ IpStr ++
-	" -setcookie " ++ Cookie,
-    {ok, BootPid} = erl_boot_server:start_link([Host]),
-    {ok, Node} = start_node(Name, Args),
+    BootPid = start_boot_server(),
+    Node = start_node_using_inet(Name),
     {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
     stop_node(Node),
     unlink(BootPid),
     exit(BootPid, kill),
     ok.
 
-inet_coming_up(doc) -> ["Start a node using the 'inet' loading method, ",
-			"but start the boot server afterwards."];
+%% Start a node using the 'inet' loading method,
+%% but start the boot server afterwards.
 inet_coming_up(Config) when is_list(Config) ->
     Name = erl_prim_test_inet_coming_up,
-    Cookie = atom_to_list(erlang:get_cookie()),
-    Host = host(),
-    IpStr = ip_str(Host),
-    LFlag = get_loader_flag(os:type()),
-    Args = LFlag ++ 
-	" -hosts " ++ IpStr ++
-	" -setcookie " ++ Cookie,
-    {ok, Node} = start_node(Name, Args, [{wait, false}]),
+    Node = start_node_using_inet(Name, [{wait,false}]),
 
     %% Wait a while, then start boot server, and wait for node to start.
-    test_server:sleep(test_server:seconds(6)),
-    io:format("erl_boot_server:start_link([~p]).", [Host]),
-    {ok, BootPid} = erl_boot_server:start_link([Host]),
+    ct:sleep({seconds,6}),
+    BootPid = start_boot_server(),
     wait_really_started(Node, 25),
 
     %% Check loader argument, then cleanup.
@@ -174,41 +199,36 @@ inet_coming_up(Config) when is_list(Config) ->
     ok.
 
 wait_really_started(Node, 0) ->
-    test_server:fail({not_booted,Node});
+    ct:fail({not_booted,Node});
 wait_really_started(Node, N) ->
     case rpc:call(Node, init, get_status, []) of
  	{started, _} ->
  	    ok;
 	_ ->
-	    test_server:sleep(1000),
+	    ct:sleep(1000),
  	    wait_really_started(Node, N - 1)
     end.
 
-inet_disconnects(doc) -> ["Start a node using the 'inet' loading method, ",
-			  "then lose the connection."];
+%% Start a node using the 'inet' loading method,
+%% then lose the connection.
 inet_disconnects(Config) when is_list(Config) ->
     case test_server:is_native(erl_boot_server) of
 	true ->
 	    {skip,"erl_boot_server is native"};
 	false ->
-	    ?line Name = erl_prim_test_inet_disconnects,
-	    ?line Host = host(),
-	    ?line Cookie = atom_to_list(erlang:get_cookie()),
-	    ?line IpStr = ip_str(Host),
-	    ?line LFlag = get_loader_flag(os:type()),
-	    ?line Args = LFlag ++ " -hosts " ++ IpStr ++
-		" -setcookie " ++ Cookie,
-	    
-	    ?line {ok, BootPid} = erl_boot_server:start([Host]),
+	    Name = erl_prim_test_inet_disconnects,
+
+	    BootPid = start_boot_server(),
+	    unlink(BootPid),
 	    Self = self(),
 	    %% This process shuts down the boot server during loading.
-	    ?line Stopper = spawn_link(fun() -> stop_boot(BootPid, Self) end),
-	    ?line receive
-		      {Stopper,ready} -> ok
-		  end,
+	    Stopper = spawn_link(fun() -> stop_boot(BootPid, Self) end),
+	    receive
+		{Stopper,ready} -> ok
+	    end,
 
 	    %% Let the loading begin...
-	    ?line {ok, Node} = start_node(Name, Args, [{wait, false}]),
+	    Node = start_node_using_inet(Name, [{wait,false}]),
 
 	    %% When the stopper is ready, the slave node should be
 	    %% looking for a boot server again.
@@ -216,18 +236,18 @@ inet_disconnects(Config) when is_list(Config) ->
 		{Stopper,ok} -> 
 		    ok;
 		{Stopper,{error,Reason}} ->
-		    ?line ?t:fail(Reason)
+		    ct:fail(Reason)
 	    after 60000 -> 
-		    ?line ?t:fail(stopper_died)
+		    ct:fail(stopper_died)
 	    end,
 
 	    %% Start new boot server to see that loading is continued.
-	    ?line {ok, BootPid2} = erl_boot_server:start_link([Host]),
-	    ?line wait_really_started(Node, 25),
-	    ?line {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
-	    ?line stop_node(Node),
-	    ?line unlink(BootPid2),
-	    ?line exit(BootPid2, kill),
+	    BootPid2 = start_boot_server(),
+	    wait_really_started(Node, 25),
+	    {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
+	    stop_node(Node),
+	    unlink(BootPid2),
+	    exit(BootPid2, kill),
 	    ok
     end.
 
@@ -256,81 +276,72 @@ get_calls(Count, Pid) ->
 	    {error,{trace_msg_timeout,Count}}
     end.	
 
-multiple_slaves(doc) ->
-    ["Start nodes in parallell, all using the 'inet' loading method, ",
-     "verify that the boot server manages"];
+%% Start nodes in parallel, all using the 'inet' loading method;
+%% verify that the boot server manages.
 multiple_slaves(Config) when is_list(Config) ->
-    case os:type() of
-	{ose,_} ->
-	    {comment, "OSE: multiple nodes not supported"};
-	_ ->
-	    ?line Name = erl_prim_test_multiple_slaves,
-	    ?line Host = host(),
-	    ?line Cookie = atom_to_list(erlang:get_cookie()),
-	    ?line IpStr = ip_str(Host),
-	    ?line LFlag = get_loader_flag(os:type()),
-	    ?line Args = LFlag ++ " -hosts " ++ IpStr ++
-		" -setcookie " ++ Cookie,
-
-	    NoOfNodes = 10,			% no of slave nodes to be started
-
-	    NamesAndNodes = 
-		lists:map(fun(N) ->
-				  NameN = atom_to_list(Name) ++ 
-				          integer_to_list(N),
-				  NodeN = NameN ++ "@" ++ Host,
-				  {list_to_atom(NameN),list_to_atom(NodeN)}
-			  end, lists:seq(1, NoOfNodes)),
-
-	    ?line Nodes = start_multiple_nodes(NamesAndNodes, Args, []),
-
-	    %% "queue up" the nodes to wait for the boot server to respond
-	    %% (note: test_server supervises each node start by accept()
-	    %% on a socket, the timeout value for the accept has to be quite 
-	    %% long for this test to work).
-	    ?line test_server:sleep(test_server:seconds(5)),
-	    %% start the code loading circus!
-	    ?line {ok,BootPid} = erl_boot_server:start_link([Host]),
-	    %% give the nodes a chance to boot up before attempting to stop them
-	    ?line test_server:sleep(test_server:seconds(10)),
-
-	    ?line wait_and_shutdown(lists:reverse(Nodes), 30),
-
-	    ?line unlink(BootPid),
-	    ?line exit(BootPid, kill),
-	    ok
-    end.
+    Name = erl_prim_test_multiple_slaves,
+    Host = host(),
+    IpStr = ip_str(Host),
+    Args = " -loader inet -hosts " ++ IpStr,
+
+    NoOfNodes = 10,			% no of slave nodes to be started
+
+    NamesAndNodes = 
+        lists:map(fun(N) ->
+                          NameN = atom_to_list(Name) ++ 
+                              integer_to_list(N),
+                          NodeN = NameN ++ "@" ++ Host,
+                          {list_to_atom(NameN),list_to_atom(NodeN)}
+                  end, lists:seq(1, NoOfNodes)),
+
+    Nodes = start_multiple_nodes(NamesAndNodes, Args, []),
+
+    %% "queue up" the nodes to wait for the boot server to respond
+    %% (note: test_server supervises each node start by accept()
+    %% on a socket, the timeout value for the accept has to be quite 
+    %% long for this test to work).
+    ct:sleep({seconds,5}),
+    %% start the code loading circus!
+    BootPid = start_boot_server(),
+    %% give the nodes a chance to boot up before attempting to stop them
+    ct:sleep({seconds,10}),
+
+    wait_and_shutdown(lists:reverse(Nodes), 30),
+
+    unlink(BootPid),
+    exit(BootPid, kill),
+    ok.
 
 start_multiple_nodes([{Name,Node} | NNs], Args, Started) ->
-    ?line {ok,Node} = start_node(Name, Args, [{wait, false}]),
+    {ok,Node} = start_node(Name, Args, [{wait, false}]),
     start_multiple_nodes(NNs, Args, [Node | Started]);
 start_multiple_nodes([], _, Nodes) ->
     Nodes.
 
 wait_and_shutdown([Node | Nodes], Tries) ->
-    ?line wait_really_started(Node, Tries),
-    ?line {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
-    ?line stop_node(Node),
+    wait_really_started(Node, Tries),
+    {ok,[["inet"]]} = rpc:call(Node, init, get_argument, [loader]),
+    stop_node(Node),
     wait_and_shutdown(Nodes, Tries);
 wait_and_shutdown([], _) ->
     ok.
 
 
-file_requests(doc) -> ["Start a node using the 'inet' loading method, ",
-		       "verify that the boot server responds to file requests."];
+%% Start a node using the 'inet' loading method,
+%% verify that the boot server responds to file requests.
 file_requests(Config) when is_list(Config) ->
-    ?line {ok, Node, BootPid} = complete_start_node(erl_prim_test_file_req),
+    {ok, Node, BootPid} = complete_start_node(erl_prim_test_file_req),
 
     %% compare with results from file server calls (the
     %% boot server uses the same file sys and cwd)
     {ok,Files} = file:list_dir("."),
     io:format("Files: ~p~n",[Files]),
-    ?line {ok,Files} = rpc:call(Node, erl_prim_loader, list_dir, ["."]),
+    {ok,Files} = rpc:call(Node, erl_prim_loader, list_dir, ["."]),
     {ok,Info} = file:read_file_info(code:which(test_server)),
-    ?line {ok,Info} = rpc:call(Node, erl_prim_loader, read_file_info,
-			       [code:which(test_server)]),
+    {ok,Info} = rpc:call(Node, erl_prim_loader, read_file_info,
+			 [code:which(test_server)]),
 
-    PrivDir = ?config(priv_dir,Config),
+    PrivDir = proplists:get_value(priv_dir,Config),
     Dir = filename:join(PrivDir,?MODULE_STRING++"_file_requests"),
     ok = file:make_dir(Dir),
     Alias = filename:join(Dir,"symlink"),
@@ -354,163 +365,140 @@ file_requests(Config) when is_list(Config) ->
     end,
 
     {ok,Cwd} = file:get_cwd(),
-    ?line {ok,Cwd} = rpc:call(Node, erl_prim_loader, get_cwd, []),
+    {ok,Cwd} = rpc:call(Node, erl_prim_loader, get_cwd, []),
     case file:get_cwd("C:") of
 	{error,enotsup} ->
 	    ok;
 	{ok,DCwd} ->
-	    ?line {ok,DCwd} = rpc:call(Node, erl_prim_loader, get_cwd, ["C:"])
+	    {ok,DCwd} = rpc:call(Node, erl_prim_loader, get_cwd, ["C:"])
     end,
 
-    ?line stop_node(Node),
-    ?line unlink(BootPid),
-    ?line exit(BootPid, kill),
+    stop_node(Node),
+    unlink(BootPid),
+    exit(BootPid, kill),
     ok.
 
-complete_start_node(Name) ->
-    ?line Host = host(),
-    ?line Cookie = atom_to_list(erlang:get_cookie()),
-    ?line IpStr = ip_str(Host),
-    ?line LFlag = get_loader_flag(os:type()),
-    ?line Args = LFlag ++ " -hosts " ++ IpStr ++
-	" -setcookie " ++ Cookie,
-
-    ?line {ok,BootPid} = erl_boot_server:start_link([Host]),
-
-    ?line {ok,Node} = start_node(Name, Args),
-    ?line wait_really_started(Node, 25),
-    {ok, Node, BootPid}.
-
-local_archive(suite) ->
-    [];
-local_archive(doc) ->
-    ["Read files from local archive."];
+%% Read files from local archive.
 local_archive(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     KernelDir = filename:basename(code:lib_dir(kernel)),
     Archive = filename:join([PrivDir, KernelDir ++ init:archive_extension()]),
     file:delete(Archive),
-    ?line {ok, Archive} = create_archive(Archive, [KernelDir]),
+    {ok, Archive} = create_archive(Archive, [KernelDir]),
 
     Node = node(),
     BeamName = "inet.beam",
-    ?line ok = test_archive(Node, Archive, KernelDir, BeamName),
+    ok = test_archive(Node, Archive, KernelDir, BeamName),
 
     %% Cleanup
-    ?line ok = rpc:call(Node, erl_prim_loader, release_archives, []),
-    ?line ok = file:delete(Archive),
+    ok = rpc:call(Node, erl_prim_loader, purge_archive_cache, []),
+    ok = file:delete(Archive),
     ok.
 
-remote_archive(suite) ->
-    {req, [{local_slave_nodes, 1}, {time, 10}]};
-remote_archive(doc) ->
-    ["Read files from remote archive."];
+%% Read files from remote archive.
 remote_archive(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     KernelDir = filename:basename(code:lib_dir(kernel)),
     Archive = filename:join([PrivDir, KernelDir ++ init:archive_extension()]),
     file:delete(Archive),
-    ?line {ok, Archive} = create_archive(Archive, [KernelDir]), 
+    {ok, Archive} = create_archive(Archive, [KernelDir]),
 
-    ?line {ok, Node, BootPid} = complete_start_node(remote_archive),
+    {ok, Node, BootPid} = complete_start_node(remote_archive),
 
     BeamName = "inet.beam",
-    ?line ok = test_archive(Node, Archive, KernelDir, BeamName),
+    ok = test_archive(Node, Archive, KernelDir, BeamName),
 
     %% Cleanup
-    ?line stop_node(Node),
-    ?line unlink(BootPid),
-    ?line exit(BootPid, kill),
+    stop_node(Node),
+    unlink(BootPid),
+    exit(BootPid, kill),
     ok.
 
-primary_archive(suite) ->
-    {req, [{local_slave_nodes, 1}, {time, 10}]};
-primary_archive(doc) ->
-    ["Read files from primary archive."];
+%% Read files from primary archive.
 primary_archive(Config) when is_list(Config) ->
     %% Copy the orig files to priv_dir
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Archive = filename:join([PrivDir, "primary_archive.zip"]),
     file:delete(Archive),
-    DataDir = ?config(data_dir, Config),
-    ?line {ok, _} = zip:create(Archive, ["primary_archive"],
-			       [{compress, []}, {cwd, DataDir}]),
-    ?line {ok, _} = zip:extract(Archive, [{cwd, PrivDir}]),
+    DataDir = proplists:get_value(data_dir, Config),
+    {ok, _} = zip:create(Archive, ["primary_archive"],
+			 [{compress, []}, {cwd, DataDir}]),
+    {ok, _} = zip:extract(Archive, [{cwd, PrivDir}]),
     TopDir = filename:join([PrivDir, "primary_archive"]),
 
     %% Compile the code
     DictDir = "primary_archive_dict-1.0",
     DummyDir = "primary_archive_dummy",
-    ?line ok = compile_app(TopDir, DictDir),
-    ?line ok = compile_app(TopDir, DummyDir),
-    
+    ok = compile_app(TopDir, DictDir),
+    ok = compile_app(TopDir, DummyDir),
+
     %% Create the archive
     {ok, TopFiles} = file:list_dir(TopDir),
-    ?line {ok, {_, ArchiveBin}} = zip:create(Archive, TopFiles,
-					     [memory, {compress, []}, {cwd, TopDir}]),
-    
+    {ok, {_, ArchiveBin}} = zip:create(Archive, TopFiles,
+				       [memory, {compress, []}, {cwd, TopDir}]),
+
     %% Use temporary node to simplify cleanup
-    ?line Cookie = atom_to_list(erlang:get_cookie()),
-    ?line Args = " -setcookie " ++ Cookie,
-    ?line {ok,Node} = start_node(primary_archive, Args),
-    ?line wait_really_started(Node, 25),
-    ?line {_,_,_} = rpc:call(Node, erlang, date, []),
+    Cookie = atom_to_list(erlang:get_cookie()),
+    Args = " -setcookie " ++ Cookie,
+    {ok,Node} = start_node(primary_archive, Args),
+    wait_really_started(Node, 25),
+    {_,_,_} = rpc:call(Node, erlang, date, []),
 
     %% Set primary archive 
     ExpectedEbins = [Archive, DictDir ++ "/ebin", DummyDir ++ "/ebin"],
     io:format("ExpectedEbins: ~p\n", [ExpectedEbins]),
-    ?line {ok, FileInfo} = prim_file:read_file_info(Archive),
-    ?line {ok, Ebins} = rpc:call(Node, erl_prim_loader, set_primary_archive,
-				 [Archive, ArchiveBin, FileInfo,
-				  fun escript:parse_file/1]),
-    ?line ExpectedEbins = lists:sort(Ebins), % assert
-    
-    ?line {ok, TopFiles2} = rpc:call(Node, erl_prim_loader, list_dir, [Archive]),
-    ?line [DictDir, DummyDir] = lists:sort(TopFiles2),
+    {ok, FileInfo} = prim_file:read_file_info(Archive),
+    {ok, Ebins} = rpc:call(Node, erl_prim_loader, set_primary_archive,
+			   [Archive, ArchiveBin, FileInfo,
+			    fun escript:parse_file/1]),
+    ExpectedEbins = lists:sort(Ebins), % assert
+
+    {ok, TopFiles2} = rpc:call(Node, erl_prim_loader, list_dir, [Archive]),
+    [DictDir, DummyDir] = lists:sort(TopFiles2),
     BeamName = "primary_archive_dict_app.beam",
-    ?line ok = test_archive(Node, Archive, DictDir, BeamName),
-    
+    ok = test_archive(Node, Archive, DictDir, BeamName),
+
     %% Cleanup
-    ?line {ok, []} = rpc:call(Node, erl_prim_loader, set_primary_archive,
-			      [undefined, undefined, undefined,
-			       fun escript:parse_file/1]),
-    ?line stop_node(Node),
-    ?line ok = file:delete(Archive),
+    {ok, []} = rpc:call(Node, erl_prim_loader, set_primary_archive,
+			[undefined, undefined, undefined,
+			 fun escript:parse_file/1]),
+    stop_node(Node),
+    ok = file:delete(Archive),
     ok.
 
 test_archive(Node, TopDir, AppDir, BeamName) ->
     %% List dir
     io:format("test_archive: ~p\n", [rpc:call(Node, erl_prim_loader, list_dir, [TopDir])]),
-    ?line {ok, TopFiles} = rpc:call(Node, erl_prim_loader, list_dir, [TopDir]),
-    ?line true = lists:member(AppDir, TopFiles),
+    {ok, TopFiles} = rpc:call(Node, erl_prim_loader, list_dir, [TopDir]),
+    true = lists:member(AppDir, TopFiles),
     AbsAppDir = TopDir ++ "/" ++ AppDir,
-    ?line {ok, AppFiles} = rpc:call(Node, erl_prim_loader, list_dir, [AbsAppDir]),
-    ?line true = lists:member("ebin", AppFiles),
+    {ok, AppFiles} = rpc:call(Node, erl_prim_loader, list_dir, [AbsAppDir]),
+    true = lists:member("ebin", AppFiles),
     Ebin = AbsAppDir ++ "/ebin",
-    ?line {ok, EbinFiles} = rpc:call(Node, erl_prim_loader, list_dir, [Ebin]),
+    {ok, EbinFiles} = rpc:call(Node, erl_prim_loader, list_dir, [Ebin]),
     Beam = Ebin ++ "/" ++ BeamName,
-    ?line true = lists:member(BeamName, EbinFiles),
-    ?line error = rpc:call(Node, erl_prim_loader, list_dir, [TopDir ++ "/no_such_file"]),
-    ?line error = rpc:call(Node, erl_prim_loader, list_dir, [TopDir ++ "/ebin/no_such_file"]),
-    
+    true = lists:member(BeamName, EbinFiles),
+    error = rpc:call(Node, erl_prim_loader, list_dir, [TopDir ++ "/no_such_file"]),
+    error = rpc:call(Node, erl_prim_loader, list_dir, [TopDir ++ "/ebin/no_such_file"]),
+
     %% File info
-    ?line {ok, #file_info{type = directory}} =
+    {ok, #file_info{type = directory}} =
 	rpc:call(Node, erl_prim_loader, read_file_info, [TopDir]),
-    ?line {ok, #file_info{type = directory}} =
+    {ok, #file_info{type = directory}} =
 	rpc:call(Node, erl_prim_loader, read_file_info, [Ebin]),
-    ?line {ok, #file_info{type = regular} = FI}  =
+    {ok, #file_info{type = regular} = FI}  =
 	rpc:call(Node, erl_prim_loader, read_file_info, [Beam]),
-    ?line error = rpc:call(Node, erl_prim_loader, read_file_info, [TopDir ++ "/no_such_file"]),
-    ?line error = rpc:call(Node, erl_prim_loader, read_file_info, [TopDir ++ "/ebin/no_such_file"]),
-    
+    error = rpc:call(Node, erl_prim_loader, read_file_info, [TopDir ++ "/no_such_file"]),
+    error = rpc:call(Node, erl_prim_loader, read_file_info, [TopDir ++ "/ebin/no_such_file"]),
+
     %% Get file
-    ?line {ok, Bin, Beam} = rpc:call(Node, erl_prim_loader, get_file, [Beam]),
-    ?line if
-	      FI#file_info.size =:= byte_size(Bin) -> ok;
-	      true -> exit({FI#file_info.size, byte_size(Bin)})
-	  end,
-    ?line error = rpc:call(Node, erl_prim_loader, get_file, ["/no_such_file"]),
-    ?line error = rpc:call(Node, erl_prim_loader, get_file, ["/ebin/no_such_file"]),
+    {ok, Bin, Beam} = rpc:call(Node, erl_prim_loader, get_file, [Beam]),
+    if
+	FI#file_info.size =:= byte_size(Bin) -> ok;
+	true -> exit({FI#file_info.size, byte_size(Bin)})
+    end,
+    error = rpc:call(Node, erl_prim_loader, get_file, ["/no_such_file"]),
+    error = rpc:call(Node, erl_prim_loader, get_file, ["/ebin/no_such_file"]),
     ok.
 
 create_archive(Archive, AppDirs) ->
@@ -520,12 +508,9 @@ create_archive(Archive, AppDirs) ->
     zip:create(Archive, AppDirs, Opts).
 
 
-virtual_dir_in_archive(suite) ->
-    [];
-virtual_dir_in_archive(doc) ->
-    ["Read virtual directories from archive."];
+%% Read virtual directories from archive.
 virtual_dir_in_archive(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Data = <<"A little piece of data.">>,
     ArchiveBase = "archive_with_virtual_dirs",
     Archive = filename:join([PrivDir, ArchiveBase ++ init:archive_extension()]),
@@ -534,32 +519,62 @@ virtual_dir_in_archive(Config) when is_list(Config) ->
     FileInArchive = filename:join([ArchiveBase, EbinBase, FileBase]),
     BinFiles = [{FileInArchive, Data}],
     Opts = [{compress, []}],
-    ?line file:delete(Archive),
+    file:delete(Archive),
     io:format("zip:create(~p,\n\t~p,\n\t~p).\n", [Archive, BinFiles, Opts]),
-    ?line {ok, Archive} = zip:create(Archive, BinFiles, Opts),
+    {ok, Archive} = zip:create(Archive, BinFiles, Opts),
 
     %% Verify that there is no directories
-    ?line {ok, BinFiles} = zip:unzip(Archive, [memory]),
+    {ok, BinFiles} = zip:unzip(Archive, [memory]),
 
     FullPath = filename:join([Archive, FileInArchive]),
-    ?line {ok, _} = erl_prim_loader:read_file_info(FullPath),
+    {ok, _} = erl_prim_loader:read_file_info(FullPath),
 
     %% Read one virtual dir
     EbinDir = filename:dirname(FullPath),
-    ?line {ok, _} = erl_prim_loader:read_file_info(EbinDir),
-    ?line {ok, [FileBase]} = erl_prim_loader:list_dir(EbinDir),
+    {ok, _} = erl_prim_loader:read_file_info(EbinDir),
+    {ok, [FileBase]} = erl_prim_loader:list_dir(EbinDir),
 
     %% Read another virtual dir
     AppDir = filename:dirname(EbinDir),
-    ?line {ok, _} = erl_prim_loader:read_file_info(AppDir),
-    ?line {ok, [EbinBase]} = erl_prim_loader:list_dir(AppDir),
-    
+    {ok, _} = erl_prim_loader:read_file_info(AppDir),
+    {ok, [EbinBase]} = erl_prim_loader:list_dir(AppDir),
+
     %% Cleanup
-    ?line ok = erl_prim_loader:release_archives(),
-    ?line ok = file:delete(Archive),
+    ok = erl_prim_loader:purge_archive_cache(),
+    ok = file:delete(Archive),
     ok.
 
-%% Misc. functions
+%%%
+%%% Helper functions.
+%%%
+
+complete_start_node(Name) ->
+    BootPid = start_boot_server(),
+    Node = start_node_using_inet(Name),
+    wait_really_started(Node, 25),
+    {ok, Node, BootPid}.
+
+start_boot_server() ->
+    %% Many linux systems define:
+    %%   127.0.0.1 localhost
+    %%   127.0.1.1 somehostname
+    %% Therefore, to allow the tests to work on those kind of systems,
+    %% also include "localhost" in the list of allowed hosts.
+
+    Hosts = [host(),ip_str("localhost")],
+    {ok,BootPid} = erl_boot_server:start_link(Hosts),
+    BootPid.
+
+start_node_using_inet(Name) ->
+    start_node_using_inet(Name, []).
+
+start_node_using_inet(Name, Opts) ->
+    Host = host(),
+    IpStr = ip_str(Host),
+    Args = " -loader inet -hosts " ++ IpStr,
+    {ok,Node} = start_node(Name, Args, Opts),
+    Node.
+
 
 ip_str({A, B, C, D}) ->
     lists:concat([A, ".", B, ".", C, ".", D]);
@@ -585,14 +600,11 @@ host() ->
 stop_node(Node) ->
     test_server:stop_node(Node).
 
-get_loader_flag(_) ->
-    " -loader inet ".
-
 compile_app(TopDir, AppName) ->
     AppDir = filename:join([TopDir, AppName]),
     SrcDir = filename:join([AppDir, "src"]),
     OutDir = filename:join([AppDir, "ebin"]),
-    ?line {ok, Files} = file:list_dir(SrcDir),
+    {ok, Files} = file:list_dir(SrcDir),
     compile_files(Files, SrcDir, OutDir).
 
 compile_files([File | Files], SrcDir, OutDir) ->
diff --git a/lib/kernel/test/error_handler_SUITE.erl b/lib/kernel/test/error_handler_SUITE.erl
index d93ec643ce..6092eebb62 100644
--- a/lib/kernel/test/error_handler_SUITE.erl
+++ b/lib/kernel/test/error_handler_SUITE.erl
@@ -26,7 +26,9 @@
 %% Callback from error_handler.
 -export(['$handle_undefined_function'/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() ->
     [undefined_function_handler].
diff --git a/lib/kernel/test/error_logger_SUITE.erl b/lib/kernel/test/error_logger_SUITE.erl
index f1988b68d9..07d039349c 100644
--- a/lib/kernel/test/error_logger_SUITE.erl
+++ b/lib/kernel/test/error_logger_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(error_logger_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %%-----------------------------------------------------------------
 %% We don't have to test the normal behaviour here, i.e. the tty
@@ -40,7 +40,9 @@
 	 terminate/2]).
 
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [error_report, info_report, error, info, emulator, tty,
@@ -64,159 +66,149 @@ end_per_group(_GroupName, Config) ->
 
 %%-----------------------------------------------------------------
 
-error_report(suite) -> [];
-error_report(doc) -> [];
 error_report(Config) when is_list(Config) ->
-    ?line error_logger:add_report_handler(?MODULE, self()),
+    error_logger:add_report_handler(?MODULE, self()),
     Rep1 = [{tag1,"data1"},{tag2,data2},{tag3,3}],
     Rep2 = [testing,"testing",{tag1,"tag1"}],
     Rep3 = "This is a string !",
     Rep4 = {this,is,a,tuple},
-    ?line ok = error_logger:error_report(Rep1),
+    ok = error_logger:error_report(Rep1),
     reported(error_report, std_error, Rep1),
-    ?line ok = error_logger:error_report(Rep2),
+    ok = error_logger:error_report(Rep2),
     reported(error_report, std_error, Rep2),
-    ?line ok = error_logger:error_report(Rep3),
+    ok = error_logger:error_report(Rep3),
     reported(error_report, std_error, Rep3),
-    ?line ok = error_logger:error_report(Rep4),
+    ok = error_logger:error_report(Rep4),
     reported(error_report, std_error, Rep4),
 
-    ?line ok = error_logger:error_report(test_type, Rep1),
+    ok = error_logger:error_report(test_type, Rep1),
     reported(error_report, test_type, Rep1),
-    ?line ok = error_logger:error_report(test_type, Rep2),
+    ok = error_logger:error_report(test_type, Rep2),
     reported(error_report, test_type, Rep2),
-    ?line ok = error_logger:error_report(test_type, Rep3),
+    ok = error_logger:error_report(test_type, Rep3),
     reported(error_report, test_type, Rep3),
-    ?line ok = error_logger:error_report(test_type, Rep4),
+    ok = error_logger:error_report(test_type, Rep4),
     reported(error_report, test_type, Rep4),
 
-    ?line ok = error_logger:error_report("test_type", Rep1),
+    ok = error_logger:error_report("test_type", Rep1),
     reported(error_report, "test_type", Rep1),
-    ?line ok = error_logger:error_report({test,type}, Rep2),
+    ok = error_logger:error_report({test,type}, Rep2),
     reported(error_report, {test,type}, Rep2),
-    ?line ok = error_logger:error_report([test,type], Rep3),
+    ok = error_logger:error_report([test,type], Rep3),
     reported(error_report, [test,type], Rep3),
-    ?line ok = error_logger:error_report(1, Rep4),
+    ok = error_logger:error_report(1, Rep4),
     reported(error_report, 1, Rep4),
 
-    ?line my_yes = error_logger:delete_report_handler(?MODULE),
+    my_yes = error_logger:delete_report_handler(?MODULE),
     ok.
 
 %%-----------------------------------------------------------------
 
-info_report(suite) -> [];
-info_report(doc) -> [];
 info_report(Config) when is_list(Config) ->
-    ?line error_logger:add_report_handler(?MODULE, self()),
+    error_logger:add_report_handler(?MODULE, self()),
     Rep1 = [{tag1,"data1"},{tag2,data2},{tag3,3}],
     Rep2 = [testing,"testing",{tag1,"tag1"}],
     Rep3 = "This is a string !",
     Rep4 = {this,is,a,tuple},
-    ?line ok = error_logger:info_report(Rep1),
+    ok = error_logger:info_report(Rep1),
     reported(info_report, std_info, Rep1),
-    ?line ok = error_logger:info_report(Rep2),
+    ok = error_logger:info_report(Rep2),
     reported(info_report, std_info, Rep2),
-    ?line ok = error_logger:info_report(Rep3),
+    ok = error_logger:info_report(Rep3),
     reported(info_report, std_info, Rep3),
-    ?line ok = error_logger:info_report(Rep4),
+    ok = error_logger:info_report(Rep4),
     reported(info_report, std_info, Rep4),
 
-    ?line ok = error_logger:info_report(test_type, Rep1),
+    ok = error_logger:info_report(test_type, Rep1),
     reported(info_report, test_type, Rep1),
-    ?line ok = error_logger:info_report(test_type, Rep2),
+    ok = error_logger:info_report(test_type, Rep2),
     reported(info_report, test_type, Rep2),
-    ?line ok = error_logger:info_report(test_type, Rep3),
+    ok = error_logger:info_report(test_type, Rep3),
     reported(info_report, test_type, Rep3),
-    ?line ok = error_logger:info_report(test_type, Rep4),
+    ok = error_logger:info_report(test_type, Rep4),
     reported(info_report, test_type, Rep4),
 
-    ?line ok = error_logger:info_report("test_type", Rep1),
+    ok = error_logger:info_report("test_type", Rep1),
     reported(info_report, "test_type", Rep1),
-    ?line ok = error_logger:info_report({test,type}, Rep2),
+    ok = error_logger:info_report({test,type}, Rep2),
     reported(info_report, {test,type}, Rep2),
-    ?line ok = error_logger:info_report([test,type], Rep3),
+    ok = error_logger:info_report([test,type], Rep3),
     reported(info_report, [test,type], Rep3),
-    ?line ok = error_logger:info_report(1, Rep4),
+    ok = error_logger:info_report(1, Rep4),
     reported(info_report, 1, Rep4),
 
-    ?line my_yes = error_logger:delete_report_handler(?MODULE),
+    my_yes = error_logger:delete_report_handler(?MODULE),
     ok.
 
 %%-----------------------------------------------------------------
 
-error(suite) -> [];
-error(doc) -> [];
 error(Config) when is_list(Config) ->
-    ?line error_logger:add_report_handler(?MODULE, self()),
+    error_logger:add_report_handler(?MODULE, self()),
     Msg1 = "This is a plain text string~n",
     Msg2 = "This is a text with arguments ~p~n",
     Arg2 = "This is the argument",
     Msg3 = {erroneous,msg},
 
-    ?line ok = error_logger:error_msg(Msg1),
+    ok = error_logger:error_msg(Msg1),
     reported(error, Msg1, []),
-    ?line ok = error_logger:error_msg(Msg2, Arg2),
+    ok = error_logger:error_msg(Msg2, Arg2),
     reported(error, Msg2, Arg2),
-    ?line ok = error_logger:error_msg(Msg3),
+    ok = error_logger:error_msg(Msg3),
     reported(error, Msg3, []),
 
-    ?line ok = error_logger:error_msg(Msg1, []),
+    ok = error_logger:error_msg(Msg1, []),
     reported(error, Msg1, []),
-    ?line ok = error_logger:error_msg(Msg2, Arg2),
+    ok = error_logger:error_msg(Msg2, Arg2),
     reported(error, Msg2, Arg2),
-    ?line ok = error_logger:error_msg(Msg3, []),
+    ok = error_logger:error_msg(Msg3, []),
     reported(error, Msg3, []),
 
-    ?line ok = error_logger:format(Msg1, []),
+    ok = error_logger:format(Msg1, []),
     reported(error, Msg1, []),
-    ?line ok = error_logger:format(Msg2, Arg2),
+    ok = error_logger:format(Msg2, Arg2),
     reported(error, Msg2, Arg2),
-    ?line ok = error_logger:format(Msg3, []),
+    ok = error_logger:format(Msg3, []),
     reported(error, Msg3, []),
 
-    ?line my_yes = error_logger:delete_report_handler(?MODULE),
+    my_yes = error_logger:delete_report_handler(?MODULE),
     ok.
 
 %%-----------------------------------------------------------------
 
-info(suite) -> [];
-info(doc) -> [];
 info(Config) when is_list(Config) ->
-    ?line error_logger:add_report_handler(?MODULE, self()),
+    error_logger:add_report_handler(?MODULE, self()),
     Msg1 = "This is a plain text string~n",
     Msg2 = "This is a text with arguments ~p~n",
     Arg2 = "This is the argument",
     Msg3 = {erroneous,msg},
 
-    ?line ok = error_logger:info_msg(Msg1),
+    ok = error_logger:info_msg(Msg1),
     reported(info_msg, Msg1, []),
-    ?line ok = error_logger:info_msg(Msg2, Arg2),
+    ok = error_logger:info_msg(Msg2, Arg2),
     reported(info_msg, Msg2, Arg2),
-    ?line ok = error_logger:info_msg(Msg3),
+    ok = error_logger:info_msg(Msg3),
     reported(info_msg, Msg3, []),
 
-    ?line ok = error_logger:info_msg(Msg1, []),
+    ok = error_logger:info_msg(Msg1, []),
     reported(info_msg, Msg1, []),
-    ?line ok = error_logger:info_msg(Msg2, Arg2),
+    ok = error_logger:info_msg(Msg2, Arg2),
     reported(info_msg, Msg2, Arg2),
-    ?line ok = error_logger:info_msg(Msg3, []),
+    ok = error_logger:info_msg(Msg3, []),
     reported(info_msg, Msg3, []),
 
-    ?line my_yes = error_logger:delete_report_handler(?MODULE),
+    my_yes = error_logger:delete_report_handler(?MODULE),
     ok.
 
 %%-----------------------------------------------------------------
 
-emulator(suite) -> [];
-emulator(doc) -> [];
 emulator(Config) when is_list(Config) ->
-    ?line error_logger:add_report_handler(?MODULE, self()),
+    error_logger:add_report_handler(?MODULE, self()),
     Msg = "Error in process ~p on node ~p with exit value:~n~p~n",
     Error = {badmatch,4},
     Stack = [{module, function, 2, []}],
     Pid = spawn(?MODULE, generate_error, [Error, Stack]),
     reported(error, Msg, [Pid, node(), {Error, Stack}]),
-    ?line my_yes = error_logger:delete_report_handler(?MODULE),
+    my_yes = error_logger:delete_report_handler(?MODULE),
     ok.
 
 generate_error(Error, Stack) ->
@@ -227,52 +219,44 @@ generate_error(Error, Stack) ->
 %% want to interact with the test run.
 %%-----------------------------------------------------------------
 
-tty(suite) -> [];
-tty(doc) -> [];
 tty(Config) when is_list(Config) ->
-    ?line {'EXIT', _Reason} = (catch error_logger:tty(dummy)),
+    {'EXIT', _Reason} = (catch error_logger:tty(dummy)),
     ok.
 
 %%-----------------------------------------------------------------
 %% If where already exists a logfile we skip this test case !!
 %%-----------------------------------------------------------------
 
-logfile(suite) -> [];
-logfile(doc) -> [];
 logfile(Config) when is_list(Config) ->
-    ?line case error_logger:logfile(filename) of
-	      {error, no_log_file} -> % Ok, we continues.
-		  do_logfile();
-	      _ ->
-		  ok
-	  end.
+    case error_logger:logfile(filename) of
+	{error, no_log_file} -> % Ok, we continues.
+	    do_logfile();
+	_ ->
+	    ok
+    end.
 
 do_logfile() ->
-    ?line {error, _} = error_logger:logfile(close),
-    ?line {error, _} = error_logger:logfile({open,{error}}),
-    ?line ok = error_logger:logfile({open, "dummy_logfile.log"}),
-    ?line "dummy_logfile.log" = error_logger:logfile(filename),
-    ?line ok = error_logger:logfile(close),
-    ?line {'EXIT',_} = (catch error_logger:logfile(dummy)),
+    {error, _} = error_logger:logfile(close),
+    {error, _} = error_logger:logfile({open,{error}}),
+    ok = error_logger:logfile({open, "dummy_logfile.log"}),
+    "dummy_logfile.log" = error_logger:logfile(filename),
+    ok = error_logger:logfile(close),
+    {'EXIT',_} = (catch error_logger:logfile(dummy)),
     ok.
 
 %%-----------------------------------------------------------------
 
-add(suite) -> [];
-add(doc) -> [];
 add(Config) when is_list(Config) ->
-    ?line {'EXIT',_} = (catch error_logger:add_report_handler("dummy")),
-    ?line {'EXIT',_} = error_logger:add_report_handler(non_existing),
-    ?line my_error = error_logger:add_report_handler(?MODULE, [error]),
+    {'EXIT',_} = (catch error_logger:add_report_handler("dummy")),
+    {'EXIT',_} = error_logger:add_report_handler(non_existing),
+    my_error = error_logger:add_report_handler(?MODULE, [error]),
     ok.
 
 %%-----------------------------------------------------------------
 
-delete(suite) -> [];
-delete(doc) -> [];
 delete(Config) when is_list(Config) ->
-    ?line {'EXIT',_} = (catch error_logger:delete_report_handler("dummy")),
-    ?line {error,_} = error_logger:delete_report_handler(non_existing),
+    {'EXIT',_} = (catch error_logger:delete_report_handler("dummy")),
+    {error,_} = error_logger:delete_report_handler(non_existing),
     ok.
 
 %%-----------------------------------------------------------------
@@ -284,7 +268,7 @@ reported(Tag, Type, Report) ->
 	    test_server:messages_get(),
 	    ok
     after 1000 ->
-	    test_server:fail(no_report_received)
+	    ct:fail(no_report_received)
     end.
 
 %%-----------------------------------------------------------------
diff --git a/lib/kernel/test/error_logger_warn_SUITE.erl b/lib/kernel/test/error_logger_warn_SUITE.erl
index a3a3b2f8c6..4fad781520 100644
--- a/lib/kernel/test/error_logger_warn_SUITE.erl
+++ b/lib/kernel/test/error_logger_warn_SUITE.erl
@@ -29,7 +29,7 @@
 %% Internal exports.
 -export([init/1,handle_event/2,handle_info/2,handle_call/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(EXPECT(Pattern),
 	(fun() ->
@@ -42,11 +42,10 @@
 		 end
 	 end)()).
 
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
 
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [basic, warnings_info, warnings_errors, rb_basic,
@@ -70,69 +69,58 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+
+end_per_testcase(_Case, _Config) ->
     ok.
 
-basic(doc) ->
-    ["Tests basic error logger functionality"];
+%% Tests basic error logger functionality.
 basic(Config) when is_list(Config) ->
     put(elw_config,Config),
     basic().
 
-warnings_info(doc) ->
-    ["Tests mapping warnings to info functionality"];
+%% Tests mapping warnings to info functionality.
 warnings_info(Config) when is_list(Config) ->
     put(elw_config,Config),
     warnings_info().
 
-warnings_errors(doc) ->
-    ["Tests mapping warnings to errors functionality"];
+%% Tests mapping warnings to errors functionality.
 warnings_errors(Config) when is_list(Config) ->
     put(elw_config,Config),
     warnings_errors().
 
-rb_basic(doc) ->
-    ["Tests basic rb functionality"];
+%% Tests basic rb functionality.
 rb_basic(Config) when is_list(Config) ->
     put(elw_config,Config),
     rb_basic().
 
-rb_warnings_info(doc) ->
-    ["Tests warnings as info rb functionality"];
+%% Tests warnings as info rb functionality.
 rb_warnings_info(Config) when is_list(Config) ->
     put(elw_config,Config),
     rb_warnings_info().
 
-rb_warnings_errors(doc) ->
-    ["Tests warnings as errors rb functionality"];
+%% Tests warnings as errors rb functionality.
 rb_warnings_errors(Config) when is_list(Config) ->
     put(elw_config,Config),
     rb_warnings_errors().
 
-rb_trunc(doc) ->
-    ["Tests rb functionality on truncated data"];
+%% Tests rb functionality on truncated data.
 rb_trunc(Config) when is_list(Config) ->
     put(elw_config,Config),
     rb_trunc().
 
-rb_utc(doc) ->
-    ["Tests UTC mapping in rb (-sasl utc_log true)"];
+%% Tests UTC mapping in rb (-sasl utc_log true).
 rb_utc(Config) when is_list(Config) ->
     put(elw_config,Config),
     rb_utc().
 
-file_utc(doc) ->
-    ["Tests UTC mapping in file logger (-stdlib utc_log true)"];
+%% Tests UTC mapping in file logger (-stdlib utc_log true).
 file_utc(Config) when is_list(Config) ->
     put(elw_config,Config),
     file_utc().
 
 
-% a small gen_event
+%% a small gen_event
 
 init([Pid]) ->
     {ok, Pid}.
@@ -236,7 +224,7 @@ warnings_errors() ->
     stop_node(Node),
     ok.
 
-% RB...
+%% RB...
 
 quote(String) ->
     case os:type() of
@@ -283,7 +271,7 @@ findstrc(String,File) ->
             0
     end.
 
-% Doesn't count empty lines
+%% Doesn't count empty lines
 lines(File) ->
     length(
       string:tokens(
@@ -291,17 +279,17 @@ lines(File) ->
 	  element(2,file:read_file(File))),
 	"\n")).
 
-%directories anf filenames
+%% Directories and filenames
 ld() ->
     Config = get(elw_config),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     filename:absname(PrivDir).
 
 lf() ->
     filename:join([ld(),"logfile.txt"]).
 rd() ->
     Config = get(elw_config),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     LogDir = filename:join(PrivDir,"log"),
     file:make_dir(LogDir),
     filename:absname(LogDir).
@@ -315,7 +303,7 @@ nice_stop_node(Name) ->
 	{nodedown,Name} -> ok
     end.
 
-%clean out rd() before each report test in order to get only one file...
+%% Clean out rd() before each report test in order to get only one file...
 clean_rd() ->
     {ok,L} = file:list_dir(rd()),
     lists:foreach(fun(F) ->
@@ -352,10 +340,10 @@ one_rb_findstr(Param,String) ->
     rb:stop_log(),
     findstr(String,lf()).
 
-% Tests
+%% Tests
 rb_basic() ->
     clean_rd(),
-    % Behold, the magic parameters to activate rb logging...
+    %% Behold, the magic parameters to activate rb logging...
     Node = start_node(nn(),"-boot start_sasl -sasl error_logger_mf_dir "++
                       quote(rd())++" error_logger_mf_maxbytes 5000 "
                       "error_logger_mf_maxfiles 5"),
@@ -378,7 +366,7 @@ rb_basic() ->
     0 = one_rb_findstr([info_msg],pid_to_list(Self)),
     0 = one_rb_findstr([info_report],pid_to_list(Self)),
     2 = one_rb_findstr([],pid_to_list(Self)),
-    true = (one_rb_findstr([progress],"===") > 4),
+    true = (one_rb_findstr([progress],"===") > 3),
     rb:stop(),
     application:stop(sasl),
     stop_node(Node),
@@ -408,7 +396,7 @@ rb_warnings_info() ->
     1 = one_rb_findstr([info_msg],pid_to_list(Self)),
     1 = one_rb_findstr([info_report],pid_to_list(Self)),
     2 = one_rb_findstr([],pid_to_list(Self)),
-    true = (one_rb_findstr([progress],"===") > 4),
+    true = (one_rb_findstr([progress],"===") > 3),
     rb:stop(),
     application:stop(sasl),
     stop_node(Node),
@@ -438,7 +426,7 @@ rb_warnings_errors() ->
     0 = one_rb_findstr([info_msg],pid_to_list(Self)),
     0 = one_rb_findstr([info_report],pid_to_list(Self)),
     2 = one_rb_findstr([],pid_to_list(Self)),
-    true = (one_rb_findstr([progress],"===") > 4),
+    true = (one_rb_findstr([progress],"===") > 3),
     rb:stop(),
     application:stop(sasl),
     stop_node(Node),
@@ -471,7 +459,7 @@ rb_trunc() ->
     0 = one_rb_findstr([info_msg],pid_to_list(Self)),
     0 = one_rb_findstr([info_report],pid_to_list(Self)),
     1 = one_rb_findstr([],pid_to_list(Self)),
-    true = (one_rb_findstr([progress],"===") > 4),
+    true = (one_rb_findstr([progress],"===") > 3),
     rb:stop(),
     application:stop(sasl),
     stop_node(Node),
@@ -513,9 +501,7 @@ rb_utc() ->
 file_utc() ->
     file:delete(lf()),
     SS="-stdlib utc_log true -kernel error_logger "++ oquote("{file,"++iquote(lf())++"}"),
-    %erlang:display(SS),
     Node = start_node(nn(),SS),
-    %erlang:display(rpc:call(Node,application,get_env,[kernel,error_logger])),
     Self = self(),
     GL = group_leader(),
     fake_gl(Node,error_msg,"~p~n",[Self]),
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 09d9a45197..f0d5b4ac12 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -51,20 +51,20 @@
 	 pos1/1, pos2/1, pos3/1]).
 -export([close/1, consult1/1, path_consult/1, delete/1]).
 -export([ eval1/1, path_eval/1, script1/1, path_script/1,
-	 open1/1,
-	 old_modes/1, new_modes/1, path_open/1, open_errors/1]).
+	  open1/1,
+	  old_modes/1, new_modes/1, path_open/1, open_errors/1]).
 -export([ file_info_basic_file/1, file_info_basic_directory/1,
-	 file_info_bad/1, file_info_times/1, file_write_file_info/1]).
+	  file_info_bad/1, file_info_times/1, file_write_file_info/1]).
 -export([rename/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([otp_5814/1, otp_10852/1]).
 
 -export([ read_not_really_compressed/1,
-	 read_compressed_cooked/1, read_compressed_cooked_binary/1,
-	 read_cooked_tar_problem/1,
-	 write_compressed/1, compress_errors/1, catenated_gzips/1,
-	 compress_async_crash/1]).
+	  read_compressed_cooked/1, read_compressed_cooked_binary/1,
+	  read_cooked_tar_problem/1,
+	  write_compressed/1, compress_errors/1, catenated_gzips/1,
+	  compress_async_crash/1]).
 
 -export([ make_link/1, read_link_info_for_non_link/1, symlinks/1]).
 
@@ -83,7 +83,7 @@
 -export([unicode/1]).
 -export([altname/1]).
 
--export([large_file/1, large_write/1]).
+-export([large_file/0, large_file/1, large_write/0, large_write/1]).
 
 -export([read_line_1/1, read_line_2/1, read_line_3/1,read_line_4/1]).
 
@@ -106,13 +106,15 @@
 %% System probe functions that might be handy to check from the shell
 -export([disc_free/1, memsize/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -define(THROW_ERROR(RES), throw({fail, ?LINE, RES})).
 
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [unicode, altname, read_write_file, {group, dirs},
@@ -168,16 +170,11 @@ init_per_suite(Config) when is_list(Config) ->
 		     ok ->
 			 [{sasl,started}]
 		 end,
-    ok = case os:type() of
-	     {ose,_} ->
-		 ok;
-	     _ ->
-		 application:start(os_mon)
-	 end,
+    application:start(os_mon),
 
     case os:type() of
 	{win32, _} ->
-	    Priv = ?config(priv_dir, Config),
+	    Priv = proplists:get_value(priv_dir, Config),
 	    HasAccessTime =
 		case ?FILE_MODULE:read_file_info(Priv) of
 		    {ok, #file_info{atime={_, {0, 0, 0}}}} ->
@@ -199,12 +196,7 @@ end_per_suite(Config) when is_list(Config) ->
 	    ok
     end,
 
-    case os:type() of
-	{ose,_} ->
-	    ok;
-	_ ->
-	    application:stop(os_mon)
-    end,
+    application:stop(os_mon),
     case proplists:get_value(sasl, Config) of
 	started ->
 	    application:stop(sasl);
@@ -271,73 +263,66 @@ mini_server(Parent) ->
 	    mini_server(Parent)
     end.
 
-standard_io(suite) ->
-    [];
-standard_io(doc) ->
-    ["Test that standard i/o-servers work with file module"];
+%% Test that standard i/o-servers work with file module.
 standard_io(Config) when is_list(Config) ->
     %% Really just a smoke test
-    ?line Pid = spawn(?MODULE,mini_server,[self()]),
-    ?line register(mini_server,Pid),
-    ?line ok = file:write(mini_server,<<"hej\n">>),
-    ?line receive
-	     {io_request,_,_,{put_chars,<<"hej\n">>}} ->
-		  ok
-	  after 1000 ->
-		  exit(noreply)
-	  end,
-    ?line {ok,"aaaaa"} = file:read(mini_server,5),
-    ?line receive
-	     {io_request,_,_,{get_chars,'',5}} ->
-		  ok
-	  after 1000 ->
-		  exit(noreply)
-	  end,
-    ?line {ok,"hej\n"} = file:read_line(mini_server),
-    ?line receive
-	     {io_request,_,_,{get_line,''}} ->
-		  ok
-	  after 1000 ->
-		  exit(noreply)
-	  end,
-    ?line OldGL = group_leader(),
-    ?line group_leader(Pid,self()),
-    ?line ok = file:write(standard_io,<<"hej\n">>),
-    ?line group_leader(OldGL,self()),
-    ?line receive
-	     {io_request,_,_,{put_chars,<<"hej\n">>}} ->
-		  ok
-	  after 1000 ->
-		  exit(noreply)
-	  end,
-    ?line group_leader(Pid,self()),
-    ?line {ok,"aaaaa"} = file:read(standard_io,5),
-    ?line group_leader(OldGL,self()),
-    ?line receive
-	     {io_request,_,_,{get_chars,'',5}} ->
-		  ok
-	  after 1000 ->
-		  exit(noreply)
-	  end,
-    ?line group_leader(Pid,self()),
-    ?line {ok,"hej\n"} = file:read_line(standard_io),
-    ?line group_leader(OldGL,self()),
-    ?line receive
-	     {io_request,_,_,{get_line,''}} ->
-		  ok
-	  after 1000 ->
-		  exit(noreply)
-	  end,
+    Pid = spawn(?MODULE,mini_server,[self()]),
+    register(mini_server,Pid),
+    ok = file:write(mini_server,<<"hej\n">>),
+    receive
+	{io_request,_,_,{put_chars,<<"hej\n">>}} ->
+	    ok
+    after 1000 ->
+	    exit(noreply)
+    end,
+    {ok,"aaaaa"} = file:read(mini_server,5),
+    receive
+	{io_request,_,_,{get_chars,'',5}} ->
+	    ok
+    after 1000 ->
+	    exit(noreply)
+    end,
+    {ok,"hej\n"} = file:read_line(mini_server),
+    receive
+	{io_request,_,_,{get_line,''}} ->
+	    ok
+    after 1000 ->
+	    exit(noreply)
+    end,
+    OldGL = group_leader(),
+    group_leader(Pid,self()),
+    ok = file:write(standard_io,<<"hej\n">>),
+    group_leader(OldGL,self()),
+    receive
+	{io_request,_,_,{put_chars,<<"hej\n">>}} ->
+	    ok
+    after 1000 ->
+	    exit(noreply)
+    end,
+    group_leader(Pid,self()),
+    {ok,"aaaaa"} = file:read(standard_io,5),
+    group_leader(OldGL,self()),
+    receive
+	{io_request,_,_,{get_chars,'',5}} ->
+	    ok
+    after 1000 ->
+	    exit(noreply)
+    end,
+    group_leader(Pid,self()),
+    {ok,"hej\n"} = file:read_line(standard_io),
+    group_leader(OldGL,self()),
+    receive
+	{io_request,_,_,{get_line,''}} ->
+	    ok
+    after 1000 ->
+	    exit(noreply)
+    end,
     Pid ! die,
     receive after 1000 -> ok end.
 
-old_io_protocol(suite) ->
-    [];
-old_io_protocol(doc) ->
-    ["Test that the old file IO protocol =< R16B still works"];
+%% Test that the old file IO protocol =< R16B still works.
 old_io_protocol(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(5)),
-    RootDir = ?config(priv_dir,Config),
+    RootDir = proplists:get_value(priv_dir,Config),
     Name = filename:join(RootDir,
 			 atom_to_list(?MODULE)
 			 ++"old_io_protocol.fil"),
@@ -350,14 +335,11 @@ old_io_protocol(Config) when is_list(Config) ->
     end,
     ok = ?FILE_MODULE:close(Fd),
     {ok, <<>>} = ?FILE_MODULE:read_file(Name),
-    test_server:timetrap_cancel(Dog),
     [] = flush(),
     ok.
 
-unicode_mode(suite) -> [];
-unicode_mode(doc) -> [""];
 unicode_mode(Config) ->
-    Dir = {dir, ?config(priv_dir,Config)},
+    Dir = {dir, proplists:get_value(priv_dir,Config)},
     OptVariants = [[Dir],
 		   [Dir, {encoding, utf8}],
 		   [Dir, binary],
@@ -503,105 +485,98 @@ um_filename(Str = [_|_], Dir, Options) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-read_write_file(suite) -> [];
-read_write_file(doc) -> [];
 read_write_file(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_read_write_file"),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_read_write_file"),
 
     %% Try writing and reading back some term
-    ?line SomeTerm = {"This term",{will,be},[written,$t,$o],1,file,[]},
-    ?line ok = ?FILE_MODULE:write_file(Name,term_to_binary(SomeTerm)),
-    ?line {ok,Bin1} = ?FILE_MODULE:read_file(Name),
-    ?line SomeTerm = binary_to_term(Bin1),
-  
+    SomeTerm = {"This term",{will,be},[written,$t,$o],1,file,[]},
+    ok = ?FILE_MODULE:write_file(Name,term_to_binary(SomeTerm)),
+    {ok,Bin1} = ?FILE_MODULE:read_file(Name),
+    SomeTerm = binary_to_term(Bin1),
+
     %% Try a "null" term
-    ?line NullTerm = [],
-    ?line ok = ?FILE_MODULE:write_file(Name,term_to_binary(NullTerm)),
-    ?line {ok,Bin2} = ?FILE_MODULE:read_file(Name),
-    ?line NullTerm = binary_to_term(Bin2),
+    NullTerm = [],
+    ok = ?FILE_MODULE:write_file(Name,term_to_binary(NullTerm)),
+    {ok,Bin2} = ?FILE_MODULE:read_file(Name),
+    NullTerm = binary_to_term(Bin2),
 
     %% Try some "complicated" types
-    ?line BigNum = 123456789012345678901234567890,
-    ?line ComplTerm = {self(),make_ref(),BigNum,3.14159},
-    ?line ok = ?FILE_MODULE:write_file(Name,term_to_binary(ComplTerm)),
-    ?line {ok,Bin3} = ?FILE_MODULE:read_file(Name),
-    ?line ComplTerm = binary_to_term(Bin3),
+    BigNum = 123456789012345678901234567890,
+    ComplTerm = {self(),make_ref(),BigNum,3.14159},
+    ok = ?FILE_MODULE:write_file(Name,term_to_binary(ComplTerm)),
+    {ok,Bin3} = ?FILE_MODULE:read_file(Name),
+    ComplTerm = binary_to_term(Bin3),
 
     %% Try reading a nonexistent file
-    ?line Name2 = filename:join(RootDir, 
-				atom_to_list(?MODULE)
-				++"_nonexistent_file"),
-    ?line {error, enoent} = ?FILE_MODULE:read_file(Name2),
-    ?line {error, enoent} = ?FILE_MODULE:read_file(""),
-    ?line {error, enoent} = ?FILE_MODULE:read_file(''),
-
-    % Try writing to a bad filename
-    ?line {error, enoent} = 
+    Name2 = filename:join(RootDir,
+			  atom_to_list(?MODULE)
+			  ++"_nonexistent_file"),
+    {error, enoent} = ?FILE_MODULE:read_file(Name2),
+    {error, enoent} = ?FILE_MODULE:read_file(""),
+    {error, enoent} = ?FILE_MODULE:read_file(''),
+
+    %% Try writing to a bad filename
+    {error, enoent} =
 	?FILE_MODULE:write_file("",term_to_binary(NullTerm)),
 
-    % Try writing something else than a binary
-    ?line {error, badarg} = ?FILE_MODULE:write_file(Name,{1,2,3}),
-    ?line {error, badarg} = ?FILE_MODULE:write_file(Name,self()),
+    %% Try writing something else than a binary
+    {error, badarg} = ?FILE_MODULE:write_file(Name,{1,2,3}),
+    {error, badarg} = ?FILE_MODULE:write_file(Name,self()),
 
     %% Some non-term binaries
-    ?line ok = ?FILE_MODULE:write_file(Name,[]),
-    ?line {ok,Bin4} = ?FILE_MODULE:read_file(Name),
-    ?line 0 = byte_size(Bin4),
+    ok = ?FILE_MODULE:write_file(Name,[]),
+    {ok,Bin4} = ?FILE_MODULE:read_file(Name),
+    0 = byte_size(Bin4),
 
-    ?line ok = ?FILE_MODULE:write_file(Name,[Bin1,[],[[Bin2]]]),
-    ?line {ok,Bin5} = ?FILE_MODULE:read_file(Name),
-    ?line {Bin1,Bin2} = split_binary(Bin5,byte_size(Bin1)),
+    ok = ?FILE_MODULE:write_file(Name,[Bin1,[],[[Bin2]]]),
+    {ok,Bin5} = ?FILE_MODULE:read_file(Name),
+    {Bin1,Bin2} = split_binary(Bin5,byte_size(Bin1)),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-make_del_dir(suite) -> [];
-make_del_dir(doc) -> [];
 make_del_dir(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_mk-dir"),
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
-    ?line {error, eexist} = ?FILE_MODULE:make_dir(NewDir),
-    ?line ok = ?FILE_MODULE:del_dir(NewDir),
-    ?line {error, enoent} = ?FILE_MODULE:del_dir(NewDir),
-    % Make sure we are not in a directory directly under test_server
-    % as that would result in eacces errors when trying to delete '..',
-    % because there are processes having that directory as current.
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
-    ?line {ok,CurrentDir} = file:get_cwd(),
+    RootDir = proplists:get_value(priv_dir,Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_mk-dir"),
+    ok = ?FILE_MODULE:make_dir(NewDir),
+    {error, eexist} = ?FILE_MODULE:make_dir(NewDir),
+    ok = ?FILE_MODULE:del_dir(NewDir),
+    {error, enoent} = ?FILE_MODULE:del_dir(NewDir),
+    %% Make sure we are not in a directory directly under test_server
+    %% as that would result in eacces errors when trying to delete '..',
+    %% because there are processes having that directory as current.
+    ok = ?FILE_MODULE:make_dir(NewDir),
+    {ok,CurrentDir} = file:get_cwd(),
     case {os:type(), length(NewDir) >= 260 } of
 	{{win32,_}, true} ->
 	    io:format("Skip set_cwd for windows path longer than 260 (MAX_PATH)\n", []),
 	    io:format("\nNewDir = ~p\n", [NewDir]);
     	_ ->
-	    ?line ok = ?FILE_MODULE:set_cwd(NewDir)
+	    ok = ?FILE_MODULE:set_cwd(NewDir)
     end,
     try
 	%% Check that we get an error when trying to create...
 	%% a deep directory
-	?line NewDir2 = filename:join(RootDir, 
-				      atom_to_list(?MODULE)
-				      ++"_mk-dir-noexist/foo"),
-	?line {error, enoent} = ?FILE_MODULE:make_dir(NewDir2),
+	NewDir2 = filename:join(RootDir,
+				atom_to_list(?MODULE)
+				++"_mk-dir-noexist/foo"),
+	{error, enoent} = ?FILE_MODULE:make_dir(NewDir2),
 	%% a nameless directory
-	?line {error, enoent} = ?FILE_MODULE:make_dir(""),
+	{error, enoent} = ?FILE_MODULE:make_dir(""),
 	%% a directory with illegal name
-	?line {error, badarg} = ?FILE_MODULE:make_dir({1,2,3}),
-	
+	{error, badarg} = ?FILE_MODULE:make_dir({1,2,3}),
+
 	%% a directory with illegal name, even if it's a (bad) list
-	?line {error, badarg} = ?FILE_MODULE:make_dir([1,2,3,{}]),
-	
+	{error, badarg} = ?FILE_MODULE:make_dir([1,2,3,{}]),
+
 	%% Maybe this isn't an error, exactly, but worth mentioning anyway:
 	%% ok = ?FILE_MODULE:make_dir([$f,$o,$o,0,$b,$a,$r])),
 	%% The above line works, and created a directory "./foo"
@@ -609,40 +584,36 @@ make_del_dir(Config) when is_list(Config) ->
 	%% a directory, but with a name that incorporates the "bar" part of
 	%% the list, so that [$f,$o,$o,0,$f,$o,$o] wouldn't refer to the same
 	%% dir. But this would slow it down.
-	
+
 	%% Try deleting some bad directories
 	%% Deleting the parent directory to the current, sounds dangerous, huh?
 	%% Don't worry ;-) the parent directory should never be empty, right?
-	?line case ?FILE_MODULE:del_dir('..') of
-		  {error, eexist} -> ok;
-		  {error, eacces} -> ok;		%OpenBSD
-		  {error, einval} -> ok			%FreeBSD
-	      end,
-	?line {error, enoent} = ?FILE_MODULE:del_dir(""),
-	?line {error, badarg} = ?FILE_MODULE:del_dir([3,2,1,{}]),
-	
-	?line [] = flush(),
-	?line test_server:timetrap_cancel(Dog)
+	case ?FILE_MODULE:del_dir('..') of
+	    {error, eexist} -> ok;
+	    {error, eacces} -> ok;		%OpenBSD
+	    {error, einval} -> ok			%FreeBSD
+	end,
+	{error, enoent} = ?FILE_MODULE:del_dir(""),
+	{error, badarg} = ?FILE_MODULE:del_dir([3,2,1,{}]),
+
+	[] = flush()
     after
-	 ?FILE_MODULE:set_cwd(CurrentDir)
+	?FILE_MODULE:set_cwd(CurrentDir)
     end,
     ok.
 
-cur_dir_0(suite) -> [];
-cur_dir_0(doc) -> [];
 cur_dir_0(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
     %% Find out the current dir, and cd to it ;-)
-    ?line {ok,BaseDir} = ?FILE_MODULE:get_cwd(),
-    ?line Dir1 = BaseDir ++ "", %% Check that it's a string
-    ?line ok = ?FILE_MODULE:set_cwd(Dir1),
+    {ok,BaseDir} = ?FILE_MODULE:get_cwd(),
+    Dir1 = BaseDir ++ "", %% Check that it's a string
+    ok = ?FILE_MODULE:set_cwd(Dir1),
 
     %% Make a new dir, and cd to that
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_curdir"),
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
+    RootDir = proplists:get_value(priv_dir,Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_curdir"),
+    ok = ?FILE_MODULE:make_dir(NewDir),
     case {os:type(), length(NewDir) >= 260} of
 	{{win32,_}, true} ->
 	    io:format("Skip set_cwd for windows path longer than 260 (MAX_PATH):\n"),
@@ -675,50 +646,44 @@ cur_dir_0(Config) when is_list(Config) ->
 	    {ok,OldDirFiles} = ?FILE_MODULE:list_dir("."),
 	    false = lists:member(UncommonName,OldDirFiles)
     end,
-	
+
     %% Try doing some bad things
-    ?line {error, badarg} = ?FILE_MODULE:set_cwd({foo,bar}),
-    ?line {error, enoent} = ?FILE_MODULE:set_cwd(""),
-    ?line {error, enoent} = ?FILE_MODULE:set_cwd(".......a......"),
-    ?line {ok,BaseDir} = ?FILE_MODULE:get_cwd(), %% Still there?
+    {error, badarg} = ?FILE_MODULE:set_cwd({foo,bar}),
+    {error, enoent} = ?FILE_MODULE:set_cwd(""),
+    {error, enoent} = ?FILE_MODULE:set_cwd(".......a......"),
+    {ok,BaseDir} = ?FILE_MODULE:get_cwd(), %% Still there?
 
     %% On Windows, there should only be slashes, no backslashes,
     %% in the return value of get_cwd().
     %% (The test is harmless on Unix, because filenames usually
     %% don't contain backslashes.)
 
-    ?line {ok, BaseDir} = ?FILE_MODULE:get_cwd(),
-    ?line false = lists:member($\\, BaseDir),
+    {ok, BaseDir} = ?FILE_MODULE:get_cwd(),
+    false = lists:member($\\, BaseDir),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 %% Tests ?FILE_MODULE:get_cwd/1.
 
-cur_dir_1(suite) -> [];
-cur_dir_1(doc) -> [];
 cur_dir_1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-
-    ?line case os:type() of
-	   {win32, _} ->
-		  win_cur_dir_1(Config);
-	    _ ->
-		  ?line {error, enotsup} = ?FILE_MODULE:get_cwd("d:")
-      end,
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    case os:type() of
+	{win32, _} ->
+	    win_cur_dir_1(Config);
+	_ ->
+	    {error, enotsup} = ?FILE_MODULE:get_cwd("d:")
+    end,
+    [] = flush(),
     ok.
-	
+
 win_cur_dir_1(_Config) ->
-    ?line {ok,BaseDir} = ?FILE_MODULE:get_cwd(),
+    {ok,BaseDir} = ?FILE_MODULE:get_cwd(),
 
     %% Get the drive letter from the current directory,
     %% and try to get current directory for that drive.
 
-    ?line [Drive,$:|_] = BaseDir,
-    ?line {ok,BaseDir} = ?FILE_MODULE:get_cwd([Drive,$:]),
+    [Drive,$:|_] = BaseDir,
+    {ok,BaseDir} = ?FILE_MODULE:get_cwd([Drive,$:]),
     io:format("BaseDir = ~s\n", [BaseDir]),
 
     %% Unfortunately, there is no way to move away from the
@@ -733,7 +698,7 @@ win_cur_dir_1(_Config) ->
 %%%
 
 list_dir_error(Config) ->
-    Priv = ?config(priv_dir, Config),
+    Priv = proplists:get_value(priv_dir, Config),
     NonExisting = filename:join(Priv, "non-existing-dir"),
     {error,enoent} = ?FILE_MODULE:list_dir(NonExisting),
     ok.
@@ -743,7 +708,7 @@ list_dir_error(Config) ->
 %%%
 
 list_dir(Config) ->
-    RootDir = ?config(priv_dir, Config),
+    RootDir = proplists:get_value(priv_dir, Config),
     TestDir = filename:join(RootDir, ?MODULE_STRING++"_list_dir"),
     ?FILE_MODULE:make_dir(TestDir),
     list_dir_1(TestDir, 42, []).
@@ -773,7 +738,7 @@ untranslatable_names(Config) ->
 
 untranslatable_names_1(Config) ->
     {ok,OldCwd} = file:get_cwd(),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Dir = filename:join(PrivDir, "untranslatable_names"),
     ok = file:make_dir(Dir),
     Node = start_node(untranslatable_names, "+fnu"),
@@ -814,7 +779,7 @@ untranslatable_names_error(Config) ->
 
 untranslatable_names_error_1(Config) ->
     {ok,OldCwd} = file:get_cwd(),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Dir = filename:join(PrivDir, "untranslatable_names_error"),
     ok = file:make_dir(Dir),
     Node = start_node(untranslatable_names, "+fnue"),
@@ -862,7 +827,7 @@ start_node(Name, Args) ->
     ct:log("Trying to start ~w@~s~n", [Name,Host]),
     case test_server:start_node(Name, peer, [{args,Args}]) of
 	{error,Reason} ->
-	    test_server:fail(Reason);
+	    ct:fail(Reason);
 	{ok,Node} ->
 	    ct:log("Node ~p started~n", [Node]),
 	    Node
@@ -873,568 +838,504 @@ start_node(Name, Args) ->
 
 
 
-open1(suite) -> [];
-open1(doc) -> [];
 open1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_files"),
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
-    ?line Name = filename:join(NewDir, "foo1.fil"),
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name,read_write),
-    ?line {ok,Fd2} = ?FILE_MODULE:open(Name,read),
-    ?line Str = "{a,tuple}.\n",
-    ?line io:format(Fd1,Str,[]),
-    ?line {ok,0} = ?FILE_MODULE:position(Fd1,bof),
-    ?line Str = io:get_line(Fd1,''),
-    ?line case io:get_line(Fd2,'') of
-	      Str -> Str;
-	      eof -> Str
-	  end,
-    ?line ok = ?FILE_MODULE:close(Fd2),
-    ?line {ok,0} = ?FILE_MODULE:position(Fd1,bof),
-    ?line ok = ?FILE_MODULE:truncate(Fd1),
-    ?line eof = io:get_line(Fd1,''),
-    ?line ok = ?FILE_MODULE:close(Fd1),
-    ?line {ok,Fd3} = ?FILE_MODULE:open(Name,read),
-    ?line eof = io:get_line(Fd3,''),
-    ?line ok = ?FILE_MODULE:close(Fd3),
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    RootDir = proplists:get_value(priv_dir,Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_files"),
+    ok = ?FILE_MODULE:make_dir(NewDir),
+    Name = filename:join(NewDir, "foo1.fil"),
+    {ok,Fd1} = ?FILE_MODULE:open(Name,read_write),
+    {ok,Fd2} = ?FILE_MODULE:open(Name,read),
+    Str = "{a,tuple}.\n",
+    io:format(Fd1,Str,[]),
+    {ok,0} = ?FILE_MODULE:position(Fd1,bof),
+    Str = io:get_line(Fd1,''),
+    Str = io:get_line(Fd2,''),
+    ok = ?FILE_MODULE:close(Fd2),
+    {ok,0} = ?FILE_MODULE:position(Fd1,bof),
+    ok = ?FILE_MODULE:truncate(Fd1),
+    eof = io:get_line(Fd1,''),
+    ok = ?FILE_MODULE:close(Fd1),
+    {ok,Fd3} = ?FILE_MODULE:open(Name,read),
+    eof = io:get_line(Fd3,''),
+    ok = ?FILE_MODULE:close(Fd3),
+    [] = flush(),
     ok.
 
 %% Tests all open modes.
 
-old_modes(suite) -> [];
-old_modes(doc) -> [];
 old_modes(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_old_open_modes"),
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
-    ?line Name1 = filename:join(NewDir, "foo1.fil"),
-    ?line Marker = "hello, world",
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_old_open_modes"),
+    ok = ?FILE_MODULE:make_dir(NewDir),
+    Name1 = filename:join(NewDir, "foo1.fil"),
+    Marker = "hello, world",
 
     %% write
-    ?line {ok, Fd1} = ?FILE_MODULE:open(Name1, write),
-    ?line ok = io:write(Fd1, Marker),
-    ?line ok = io:put_chars(Fd1, ".\n"),
-    ?line ok = ?FILE_MODULE:close(Fd1),
+    {ok, Fd1} = ?FILE_MODULE:open(Name1, write),
+    ok = io:write(Fd1, Marker),
+    ok = io:put_chars(Fd1, ".\n"),
+    ok = ?FILE_MODULE:close(Fd1),
 
     %% read
-    ?line {ok, Fd2} = ?FILE_MODULE:open(Name1, read),
-    ?line {ok, Marker} = io:read(Fd2, prompt),
-    ?line ok = ?FILE_MODULE:close(Fd2),
+    {ok, Fd2} = ?FILE_MODULE:open(Name1, read),
+    {ok, Marker} = io:read(Fd2, prompt),
+    ok = ?FILE_MODULE:close(Fd2),
 
     %% read_write
-    ?line {ok, Fd3} = ?FILE_MODULE:open(Name1, read_write),
-    ?line {ok, Marker} = io:read(Fd3, prompt),
-    ?line ok = io:write(Fd3, Marker),
-    ?line ok = ?FILE_MODULE:close(Fd3),
+    {ok, Fd3} = ?FILE_MODULE:open(Name1, read_write),
+    {ok, Marker} = io:read(Fd3, prompt),
+    ok = io:write(Fd3, Marker),
+    ok = ?FILE_MODULE:close(Fd3),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 
-new_modes(suite) -> [];
-new_modes(doc) -> [];
 new_modes(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_new_open_modes"),
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
-    ?line Name1 = filename:join(NewDir, "foo1.fil"),
-    ?line Marker = "hello, world",
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_new_open_modes"),
+    ok = ?FILE_MODULE:make_dir(NewDir),
+    Name1 = filename:join(NewDir, "foo1.fil"),
+    Marker = "hello, world",
 
     %% write
-    ?line {ok, Fd1} = ?FILE_MODULE:open(Name1, [write]),
-    ?line ok = io:write(Fd1, Marker),
-    ?line ok = io:put_chars(Fd1, ".\n"),
-    ?line ok = ?FILE_MODULE:close(Fd1),
+    {ok, Fd1} = ?FILE_MODULE:open(Name1, [write]),
+    ok = io:write(Fd1, Marker),
+    ok = io:put_chars(Fd1, ".\n"),
+    ok = ?FILE_MODULE:close(Fd1),
 
     %% read
-    ?line {ok, Fd2} = ?FILE_MODULE:open(Name1, [read]),
-    ?line {ok, Marker} = io:read(Fd2, prompt),
-    ?line ok = ?FILE_MODULE:close(Fd2),
+    {ok, Fd2} = ?FILE_MODULE:open(Name1, [read]),
+    {ok, Marker} = io:read(Fd2, prompt),
+    ok = ?FILE_MODULE:close(Fd2),
 
     %% read and write
-    ?line {ok, Fd3} = ?FILE_MODULE:open(Name1, [read, write]),
-    ?line {ok, Marker} = io:read(Fd3, prompt),
-    ?line ok = io:write(Fd3, Marker),
-    ?line ok = ?FILE_MODULE:close(Fd3),
+    {ok, Fd3} = ?FILE_MODULE:open(Name1, [read, write]),
+    {ok, Marker} = io:read(Fd3, prompt),
+    ok = io:write(Fd3, Marker),
+    ok = ?FILE_MODULE:close(Fd3),
 
     %% read by default
-    ?line {ok, Fd4} = ?FILE_MODULE:open(Name1, []),
-    ?line {ok, Marker} = io:read(Fd4, prompt),
-    ?line ok = ?FILE_MODULE:close(Fd4),
+    {ok, Fd4} = ?FILE_MODULE:open(Name1, []),
+    {ok, Marker} = io:read(Fd4, prompt),
+    ok = ?FILE_MODULE:close(Fd4),
 
     %% read and binary
-    ?line {ok, Fd5} = ?FILE_MODULE:open(Name1, [read, binary]),
-    ?line {ok, Marker} = io:read(Fd5, prompt),
-    ?line ok = ?FILE_MODULE:close(Fd5),
+    {ok, Fd5} = ?FILE_MODULE:open(Name1, [read, binary]),
+    {ok, Marker} = io:read(Fd5, prompt),
+    ok = ?FILE_MODULE:close(Fd5),
 
     %% read, raw
-    ?line {ok, Fd6} = ?FILE_MODULE:open(Name1, [read, raw]),
-    ?line {ok, [$\[]} = ?FILE_MODULE:read(Fd6, 1),
-    ?line ok = ?FILE_MODULE:close(Fd6),
-
-    %% write and sync
-    case ?FILE_MODULE:open(Name1, [write, sync]) of
-	{ok, Fd7} ->
-	    ok = io:write(Fd7, Marker),
-	    ok = io:put_chars(Fd7, ".\n"),
-	    ok = ?FILE_MODULE:close(Fd7),
-	    {ok, Fd8} = ?FILE_MODULE:open(Name1, [read]),
-	    {ok, Marker} = io:read(Fd8, prompt),
-	    ok = ?FILE_MODULE:close(Fd8);
-	{error, enotsup} ->
-	    %% for platforms that don't support the sync option
-	    ok
-    end,
-
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
-    ok.
+    {ok, Fd6} = ?FILE_MODULE:open(Name1, [read, raw]),
+    {ok, [$\[]} = ?FILE_MODULE:read(Fd6, 1),
+     ok = ?FILE_MODULE:close(Fd6),
+
+     %% write and sync
+     case ?FILE_MODULE:open(Name1, [write, sync]) of
+	 {ok, Fd7} ->
+	     ok = io:write(Fd7, Marker),
+	     ok = io:put_chars(Fd7, ".\n"),
+	     ok = ?FILE_MODULE:close(Fd7),
+	     {ok, Fd8} = ?FILE_MODULE:open(Name1, [read]),
+	     {ok, Marker} = io:read(Fd8, prompt),
+	     ok = ?FILE_MODULE:close(Fd8);
+	 {error, enotsup} ->
+	     %% for platforms that don't support the sync option
+	     ok
+     end,
+
+     [] = flush(),
+     ok.
 
-path_open(suite) -> [];
-path_open(doc) -> [];
 path_open(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_path_open"),
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
-    ?line FileName = "path_open.fil",
-    ?line Name = filename:join(RootDir, FileName),
-    ?line {ok,Fd1,_FullName1} =
+    RootDir = proplists:get_value(priv_dir,Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_path_open"),
+    ok = ?FILE_MODULE:make_dir(NewDir),
+    FileName = "path_open.fil",
+    Name = filename:join(RootDir, FileName),
+    {ok,Fd1,_FullName1} =
 	?FILE_MODULE:path_open(
-	  [RootDir,
-	   "nosuch1",
-	   NewDir],FileName,write),
-    ?line io:format(Fd1,"ABCDEFGH",[]),
-    ?line ok = ?FILE_MODULE:close(Fd1),
+	   [RootDir,
+	    "nosuch1",
+	    NewDir],FileName,write),
+    io:format(Fd1,"ABCDEFGH",[]),
+    ok = ?FILE_MODULE:close(Fd1),
 
     %% locate it in the last dir
-    ?line {ok,Fd2,_FullName2} =
+    {ok,Fd2,_FullName2} =
 	?FILE_MODULE:path_open(
-	  ["nosuch1",
-	   NewDir,
-	   RootDir],FileName,read),
-    ?line {ok,2} = 
+	   ["nosuch1",
+	    NewDir,
+	    RootDir],FileName,read),
+    {ok,2} =
 	?FILE_MODULE:position(Fd2,2), "C" = io:get_chars(Fd2,'',1),
-    ?line ok = ?FILE_MODULE:close(Fd2),
+    ok = ?FILE_MODULE:close(Fd2),
     %% Try a failing path
-    ?line {error, enoent} = ?FILE_MODULE:path_open(
-			      ["nosuch1",
-			       NewDir],FileName,read),
+    {error, enoent} = ?FILE_MODULE:path_open(
+			 ["nosuch1",
+			  NewDir],FileName,read),
     %% Check that it's found regardless of path, if an absolute name given
-    ?line {ok,Fd3,_FullPath3} =
+    {ok,Fd3,_FullPath3} =
 	?FILE_MODULE:path_open(
-	  ["nosuch1",
-	   NewDir],Name,read),
-    ?line {ok,2} = 
+	   ["nosuch1",
+	    NewDir],Name,read),
+    {ok,2} =
 	?FILE_MODULE:position(Fd3,2), "C" = io:get_chars(Fd3,'',1),
-    ?line ok = ?FILE_MODULE:close(Fd3),
+    ok = ?FILE_MODULE:close(Fd3),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
-close(suite) -> [];
-close(doc) -> [];
 close(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_close.fil"),
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name,read_write),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_close.fil"),
+    {ok,Fd1} = ?FILE_MODULE:open(Name,read_write),
     %% Just closing it is no fun, we did that a million times already
     %% This is a common error, for code written before Erlang 4.3
     %% bacause then ?FILE_MODULE:open just returned a Pid, and not everyone
     %% really checked what they got.
-    ?line {'EXIT',_Msg} = (catch ok = ?FILE_MODULE:close({ok,Fd1})),
-    ?line ok = ?FILE_MODULE:close(Fd1),
+    {'EXIT',_Msg} = (catch ok = ?FILE_MODULE:close({ok,Fd1})),
+    ok = ?FILE_MODULE:close(Fd1),
 
     %% Try closing one more time
-    ?line Val = ?FILE_MODULE:close(Fd1),
-    ?line io:format("Second close gave: ~p",[Val]),
+    Val = ?FILE_MODULE:close(Fd1),
+    io:format("Second close gave: ~p",[Val]),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
-access(suite) -> [];
-access(doc) -> [];
 access(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_access.fil"),
-    ?line Str = "ABCDEFGH",
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name,write),
-    ?line io:format(Fd1,Str,[]),
-    ?line ok = ?FILE_MODULE:close(Fd1),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_access.fil"),
+    Str = "ABCDEFGH",
+    {ok,Fd1} = ?FILE_MODULE:open(Name,write),
+    io:format(Fd1,Str,[]),
+    ok = ?FILE_MODULE:close(Fd1),
     %% Check that we can't write when in read only mode
-    ?line {ok,Fd2} = ?FILE_MODULE:open(Name,read),
-    ?line case catch io:format(Fd2,"XXXX",[]) of
-	      ok ->
-		  test_server:fail({format,write});
-	      _ ->
-		  ok
-	  end,
-    ?line ok = ?FILE_MODULE:close(Fd2),
-    ?line {ok,Fd3} = ?FILE_MODULE:open(Name,read),
-    ?line Str = io:get_line(Fd3,''),
-    ?line ok = ?FILE_MODULE:close(Fd3),
+    {ok,Fd2} = ?FILE_MODULE:open(Name,read),
+    case catch io:format(Fd2,"XXXX",[]) of
+	ok ->
+	    ct:fail({format,write});
+	_ ->
+	    ok
+    end,
+    ok = ?FILE_MODULE:close(Fd2),
+    {ok,Fd3} = ?FILE_MODULE:open(Name,read),
+    Str = io:get_line(Fd3,''),
+    ok = ?FILE_MODULE:close(Fd3),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 %% Tests ?FILE_MODULE:read/2 and ?FILE_MODULE:write/2.
 
-read_write(suite) -> [];
-read_write(doc) -> [];
 read_write(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_read_write"),
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
-    ?line Marker = "hello, world",
-    ?line MarkerB = list_to_binary(Marker),
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_read_write"),
+    ok = ?FILE_MODULE:make_dir(NewDir),
+    Marker = "hello, world",
+    MarkerB = list_to_binary(Marker),
 
     %% Plain file.
-    ?line Name1 = filename:join(NewDir, "plain.fil"),
-    ?line {ok, Fd1} = ?FILE_MODULE:open(Name1, [read, write]),
-    ?line read_write_test(Fd1, Marker, []),
+    Name1 = filename:join(NewDir, "plain.fil"),
+    {ok, Fd1} = ?FILE_MODULE:open(Name1, [read, write]),
+    read_write_test(Fd1, Marker, []),
 
     %% Raw file.
-    ?line Name2 = filename:join(NewDir, "raw.fil"),
-    ?line {ok, Fd2} = ?FILE_MODULE:open(Name2, [read, write, raw]),
-    ?line read_write_test(Fd2, Marker, []),
+    Name2 = filename:join(NewDir, "raw.fil"),
+    {ok, Fd2} = ?FILE_MODULE:open(Name2, [read, write, raw]),
+    read_write_test(Fd2, Marker, []),
 
     %% Plain binary file.
-    ?line Name3 = filename:join(NewDir, "plain-b.fil"),
-    ?line {ok, Fd3} = ?FILE_MODULE:open(Name3, [read, write, binary]),
-    ?line read_write_test(Fd3, MarkerB, <<>>),
+    Name3 = filename:join(NewDir, "plain-b.fil"),
+    {ok, Fd3} = ?FILE_MODULE:open(Name3, [read, write, binary]),
+    read_write_test(Fd3, MarkerB, <<>>),
 
     %% Raw binary file.
-    ?line Name4 = filename:join(NewDir, "raw-b.fil"),
-    ?line {ok, Fd4} = ?FILE_MODULE:open(Name4, [read, write, raw, binary]),
-    ?line read_write_test(Fd4, MarkerB, <<>>),
+    Name4 = filename:join(NewDir, "raw-b.fil"),
+    {ok, Fd4} = ?FILE_MODULE:open(Name4, [read, write, raw, binary]),
+    read_write_test(Fd4, MarkerB, <<>>),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 read_write_test(File, Marker, Empty) ->
-    ?line ok = ?FILE_MODULE:write(File, Marker),
-    ?line {ok, 0} = ?FILE_MODULE:position(File, 0),
-    ?line {ok, Empty} = ?FILE_MODULE:read(File, 0),
-    ?line {ok, Marker} = ?FILE_MODULE:read(File, 100),
-    ?line eof = ?FILE_MODULE:read(File, 100),
-    ?line {ok, Empty} = ?FILE_MODULE:read(File, 0),
-    ?line ok = ?FILE_MODULE:close(File),
-    ?line [] = flush(),
+    ok = ?FILE_MODULE:write(File, Marker),
+    {ok, 0} = ?FILE_MODULE:position(File, 0),
+    {ok, Empty} = ?FILE_MODULE:read(File, 0),
+    {ok, Marker} = ?FILE_MODULE:read(File, 100),
+    eof = ?FILE_MODULE:read(File, 100),
+    {ok, Empty} = ?FILE_MODULE:read(File, 0),
+    ok = ?FILE_MODULE:close(File),
+    [] = flush(),
     ok.
 
 
 %% Tests ?FILE_MODULE:pread/2 and ?FILE_MODULE:pwrite/2.
 
-pread_write(suite) -> [];
-pread_write(doc) -> [];
 pread_write(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_pread_write"),
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
-    ?line List = "hello, world",
-    ?line Bin = list_to_binary(List),
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_pread_write"),
+    ok = ?FILE_MODULE:make_dir(NewDir),
+    List = "hello, world",
+    Bin = list_to_binary(List),
 
     %% Plain file.
-    ?line Name1 = filename:join(NewDir, "plain.fil"),
-    ?line {ok, Fd1} = ?FILE_MODULE:open(Name1, [read, write]),
-    ?line pread_write_test(Fd1, List),
+    Name1 = filename:join(NewDir, "plain.fil"),
+    {ok, Fd1} = ?FILE_MODULE:open(Name1, [read, write]),
+    pread_write_test(Fd1, List),
 
     %% Raw file.
-    ?line Name2 = filename:join(NewDir, "raw.fil"),
-    ?line {ok, Fd2} = ?FILE_MODULE:open(Name2, [read, write, raw]),
-    ?line pread_write_test(Fd2, List),
+    Name2 = filename:join(NewDir, "raw.fil"),
+    {ok, Fd2} = ?FILE_MODULE:open(Name2, [read, write, raw]),
+    pread_write_test(Fd2, List),
 
     %% Plain file. Binary mode.
-    ?line Name3 = filename:join(NewDir, "plain-binary.fil"),
-    ?line {ok, Fd3} = ?FILE_MODULE:open(Name3, [binary, read, write]),
-    ?line pread_write_test(Fd3, Bin),
+    Name3 = filename:join(NewDir, "plain-binary.fil"),
+    {ok, Fd3} = ?FILE_MODULE:open(Name3, [binary, read, write]),
+    pread_write_test(Fd3, Bin),
 
     %% Raw file. Binary mode.
-    ?line Name4 = filename:join(NewDir, "raw-binary.fil"),
-    ?line {ok, Fd4} = ?FILE_MODULE:open(Name4, [binary, read, write, raw]),
-    ?line pread_write_test(Fd4, Bin),
+    Name4 = filename:join(NewDir, "raw-binary.fil"),
+    {ok, Fd4} = ?FILE_MODULE:open(Name4, [binary, read, write, raw]),
+    pread_write_test(Fd4, Bin),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 pread_write_test(File, Data) ->
-    ?line io:format("~p:pread_write_test(~p,~p)~n", [?MODULE, File, Data]),
-    ?line Size = if is_binary(Data) -> byte_size(Data);
-		    is_list(Data) -> length(Data)
-		 end,
-    ?line I = Size + 17,
-    ?line ok = ?FILE_MODULE:pwrite(File, 0, Data),
+    io:format("~p:pread_write_test(~p,~p)~n", [?MODULE, File, Data]),
+    Size = if is_binary(Data) -> byte_size(Data);
+	      is_list(Data) -> length(Data)
+	   end,
+    I = Size + 17,
+    ok = ?FILE_MODULE:pwrite(File, 0, Data),
     Res = ?FILE_MODULE:pread(File, 0, I),
-    ?line {ok, Data} = Res,
-    ?line eof = ?FILE_MODULE:pread(File, I, 1),
-    ?line ok = ?FILE_MODULE:pwrite(File, [{0, Data}, {I, Data}]),
-    ?line {ok, [Data, eof, Data]} = 
+    {ok, Data} = Res,
+    eof = ?FILE_MODULE:pread(File, I, 1),
+    ok = ?FILE_MODULE:pwrite(File, [{0, Data}, {I, Data}]),
+    {ok, [Data, eof, Data]} =
 	?FILE_MODULE:pread(File, [{0, Size}, {2*I, 1}, {I, Size}]),
-    ?line Plist = lists:seq(21*I, 0, -I),
-    ?line Pwrite = lists:map(fun(P)->{P,Data}end, Plist),
-    ?line Pread = [{22*I,Size} | lists:map(fun(P)->{P,Size}end, Plist)],
-    ?line Presult = [eof | lists:map(fun(_)->Data end, Plist)],
-    ?line ok = ?FILE_MODULE:pwrite(File, Pwrite),
-    ?line {ok, Presult} = ?FILE_MODULE:pread(File, Pread),
-    ?line ok = ?FILE_MODULE:close(File),
-    ?line [] = flush(),
+    Plist = lists:seq(21*I, 0, -I),
+    Pwrite = lists:map(fun(P)->{P,Data}end, Plist),
+    Pread = [{22*I,Size} | lists:map(fun(P)->{P,Size}end, Plist)],
+    Presult = [eof | lists:map(fun(_)->Data end, Plist)],
+    ok = ?FILE_MODULE:pwrite(File, Pwrite),
+    {ok, Presult} = ?FILE_MODULE:pread(File, Pread),
+    ok = ?FILE_MODULE:close(File),
+    [] = flush(),
     ok.
 
-append(doc) -> "Test appending to a file.";
-append(suite) -> [];
+%% Test appending to a file.
 append(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_append"),
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_append"),
+    ok = ?FILE_MODULE:make_dir(NewDir),
 
-    ?line First = "First line\n",
-    ?line Second = "Seond lines comes here\n",
-    ?line Third = "And here is the third line\n",
+    First = "First line\n",
+    Second = "Seond lines comes here\n",
+    Third = "And here is the third line\n",
 
     %% Write a small text file.
-    ?line Name1 = filename:join(NewDir, "a_file.txt"),
-    ?line {ok, Fd1} = ?FILE_MODULE:open(Name1, [write]),
-    ?line ok = io:format(Fd1, First, []),
-    ?line ok = io:format(Fd1, Second, []),
-    ?line ok = ?FILE_MODULE:close(Fd1),
+    Name1 = filename:join(NewDir, "a_file.txt"),
+    {ok, Fd1} = ?FILE_MODULE:open(Name1, [write]),
+    ok = io:format(Fd1, First, []),
+    ok = io:format(Fd1, Second, []),
+    ok = ?FILE_MODULE:close(Fd1),
 
     %% Open it a again and a append a line to it.
-    ?line {ok, Fd2} = ?FILE_MODULE:open(Name1, [append]),
-    ?line ok = io:format(Fd2, Third, []),
-    ?line ok = ?FILE_MODULE:close(Fd2),
+    {ok, Fd2} = ?FILE_MODULE:open(Name1, [append]),
+    ok = io:format(Fd2, Third, []),
+    ok = ?FILE_MODULE:close(Fd2),
 
     %% Read it back and verify.
-    ?line Expected = list_to_binary([First, Second, Third]),
-    ?line {ok, Expected} = ?FILE_MODULE:read_file(Name1),
+    Expected = list_to_binary([First, Second, Third]),
+    {ok, Expected} = ?FILE_MODULE:read_file(Name1),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
-open_errors(suite) -> [];
-open_errors(doc) -> [];
 open_errors(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line DataDir = 
+    DataDir =
 	filename:dirname(
-	  filename:join(?config(data_dir, Config), "x")),
-    ?line DataDirSlash = DataDir++"/",
-    ?line {error, E1} = ?FILE_MODULE:open(DataDir, [read]),
-    ?line {error, E2} = ?FILE_MODULE:open(DataDirSlash, [read]),
-    ?line {error, E3} = ?FILE_MODULE:open(DataDir, [write]),
-    ?line {error, E4} = ?FILE_MODULE:open(DataDirSlash, [write]),
-    ?line {eisdir,eisdir,eisdir,eisdir} = {E1,E2,E3,E4},
-
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+	  filename:join(proplists:get_value(data_dir, Config), "x")),
+    DataDirSlash = DataDir++"/",
+    {error, E1} = ?FILE_MODULE:open(DataDir, [read]),
+    {error, E2} = ?FILE_MODULE:open(DataDirSlash, [read]),
+    {error, E3} = ?FILE_MODULE:open(DataDir, [write]),
+    {error, E4} = ?FILE_MODULE:open(DataDirSlash, [write]),
+    {eisdir,eisdir,eisdir,eisdir} = {E1,E2,E3,E4},
+
+    [] = flush(),
     ok.
 
-exclusive(suite) -> [];
-exclusive(doc) -> "Test exclusive access to a file.";
+%% Test exclusive access to a file.
 exclusive(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line NewDir = filename:join(RootDir,
-				 atom_to_list(?MODULE)
-				 ++"_exclusive"),
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
-    ?line Name = filename:join(NewDir, "ex_file.txt"),
-    ?line {ok, Fd} = ?FILE_MODULE:open(Name, [write, exclusive]),
-    ?line {error, eexist} = ?FILE_MODULE:open(Name, [write, exclusive]),
-    ?line ok = ?FILE_MODULE:close(Fd),
-    ?line test_server:timetrap_cancel(Dog),
+    RootDir = proplists:get_value(priv_dir,Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_exclusive"),
+    ok = ?FILE_MODULE:make_dir(NewDir),
+    Name = filename:join(NewDir, "ex_file.txt"),
+    {ok, Fd} = ?FILE_MODULE:open(Name, [write, exclusive]),
+    {error, eexist} = ?FILE_MODULE:open(Name, [write, exclusive]),
+    ok = ?FILE_MODULE:close(Fd),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-pos1(suite) -> [];
-pos1(doc) -> [];
 pos1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_pos1.fil"),
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name,write),
-    ?line io:format(Fd1,"ABCDEFGH",[]),
-    ?line ok = ?FILE_MODULE:close(Fd1),
-    ?line {ok,Fd2} = ?FILE_MODULE:open(Name,read),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_pos1.fil"),
+    {ok,Fd1} = ?FILE_MODULE:open(Name,write),
+    io:format(Fd1,"ABCDEFGH",[]),
+    ok = ?FILE_MODULE:close(Fd1),
+    {ok,Fd2} = ?FILE_MODULE:open(Name,read),
 
     %% Start pos is first char
-    ?line io:format("Relative positions"),
-    ?line "A" = io:get_chars(Fd2,'',1),
-    ?line {ok,2} = ?FILE_MODULE:position(Fd2,{cur,1}), 
-    ?line "C" = io:get_chars(Fd2,'',1),
-    ?line {ok,0} = ?FILE_MODULE:position(Fd2,{cur,-3}), 
-    ?line "A" = io:get_chars(Fd2,'',1),
+    io:format("Relative positions"),
+    "A" = io:get_chars(Fd2,'',1),
+    {ok,2} = ?FILE_MODULE:position(Fd2,{cur,1}),
+    "C" = io:get_chars(Fd2,'',1),
+    {ok,0} = ?FILE_MODULE:position(Fd2,{cur,-3}),
+    "A" = io:get_chars(Fd2,'',1),
     %% Backwards from first char should be an error
-    ?line {ok,0} = ?FILE_MODULE:position(Fd2,{cur,-1}),
-    ?line {error, einval} = ?FILE_MODULE:position(Fd2,{cur,-1}),
+    {ok,0} = ?FILE_MODULE:position(Fd2,{cur,-1}),
+    {error, einval} = ?FILE_MODULE:position(Fd2,{cur,-1}),
     %% Reset position and move again
-    ?line {ok,0} = ?FILE_MODULE:position(Fd2,0),
-    ?line {ok,2} = ?FILE_MODULE:position(Fd2,{cur,2}), 
-    ?line "C" = io:get_chars(Fd2,'',1),
+    {ok,0} = ?FILE_MODULE:position(Fd2,0),
+    {ok,2} = ?FILE_MODULE:position(Fd2,{cur,2}),
+    "C" = io:get_chars(Fd2,'',1),
     %% Go a lot forwards
-    ?line {ok,13} = ?FILE_MODULE:position(Fd2,{cur,10}), 
-    ?line eof = io:get_chars(Fd2,'',1),
+    {ok,13} = ?FILE_MODULE:position(Fd2,{cur,10}),
+    eof = io:get_chars(Fd2,'',1),
 
     %% Try some fixed positions
-    ?line io:format("Fixed positions"),
-    ?line {ok,8} = 
+    io:format("Fixed positions"),
+    {ok,8} =
 	?FILE_MODULE:position(Fd2,8), eof = io:get_chars(Fd2,'',1),
-    ?line {ok,8} = 
+    {ok,8} =
 	?FILE_MODULE:position(Fd2,cur), eof = io:get_chars(Fd2,'',1),
-    ?line {ok,7} = 
+    {ok,7} =
 	?FILE_MODULE:position(Fd2,7), "H" = io:get_chars(Fd2,'',1),
-    ?line {ok,0} = 
+    {ok,0} =
 	?FILE_MODULE:position(Fd2,0), "A" = io:get_chars(Fd2,'',1),
-    ?line {ok,3} = 
+    {ok,3} =
 	?FILE_MODULE:position(Fd2,3), "D" = io:get_chars(Fd2,'',1),
-    ?line {ok,12} = 
+    {ok,12} =
 	?FILE_MODULE:position(Fd2,12), eof = io:get_chars(Fd2,'',1),
-    ?line {ok,3} = 
+    {ok,3} =
 	?FILE_MODULE:position(Fd2,3), "D" = io:get_chars(Fd2,'',1),
     %% Try the {bof,X} notation
-    ?line {ok,3} = ?FILE_MODULE:position(Fd2,{bof,3}),
-    ?line "D" = io:get_chars(Fd2,'',1),
+    {ok,3} = ?FILE_MODULE:position(Fd2,{bof,3}),
+    "D" = io:get_chars(Fd2,'',1),
 
     %% Try eof positions
-    ?line io:format("EOF positions"),
-    ?line {ok,8} = 
+    io:format("EOF positions"),
+    {ok,8} =
 	?FILE_MODULE:position(Fd2,{eof,0}), eof=io:get_chars(Fd2,'',1),
-    ?line {ok,7} = 
+    {ok,7} =
 	?FILE_MODULE:position(Fd2,{eof,-1}),
-    ?line "H" = io:get_chars(Fd2,'',1),
-    ?line {ok,0} = 
+    "H" = io:get_chars(Fd2,'',1),
+    {ok,0} =
 	?FILE_MODULE:position(Fd2,{eof,-8}), "A"=io:get_chars(Fd2,'',1),
-    ?line {error, einval} = ?FILE_MODULE:position(Fd2,{eof,-9}),
+    {error, einval} = ?FILE_MODULE:position(Fd2,{eof,-9}),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
-pos2(suite) -> [];
-pos2(doc) -> [];
 pos2(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_pos2.fil"),
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name,write),
-    ?line io:format(Fd1,"ABCDEFGH",[]),
-    ?line ok = ?FILE_MODULE:close(Fd1),
-    ?line {ok,Fd2} = ?FILE_MODULE:open(Name,read),
-    ?line {error, einval} = ?FILE_MODULE:position(Fd2,-1),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_pos2.fil"),
+    {ok,Fd1} = ?FILE_MODULE:open(Name,write),
+    io:format(Fd1,"ABCDEFGH",[]),
+    ok = ?FILE_MODULE:close(Fd1),
+    {ok,Fd2} = ?FILE_MODULE:open(Name,read),
+    {error, einval} = ?FILE_MODULE:position(Fd2,-1),
 
     %% Make sure that we still can search after an error.
-    ?line {ok,0} = ?FILE_MODULE:position(Fd2, 0),
-    ?line {ok,3} = ?FILE_MODULE:position(Fd2, {bof,3}),
-    ?line "D" = io:get_chars(Fd2,'',1),
+    {ok,0} = ?FILE_MODULE:position(Fd2, 0),
+    {ok,3} = ?FILE_MODULE:position(Fd2, {bof,3}),
+    "D" = io:get_chars(Fd2,'',1),
 
-    ?line [] = flush(),
-    ?line io:format("DONE"),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
+    io:format("DONE"),
     ok.
 
-pos3(suite) -> [];
-pos3(doc) -> ["When it does not use raw mode, file:position had a bug."];
+%% When it does not use raw mode, file:position had a bug.
 pos3(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(data_dir, Config),
-    ?line Name = filename:join(RootDir, "realmen.html.gz"),
+    RootDir = proplists:get_value(data_dir, Config),
+    Name = filename:join(RootDir, "realmen.html.gz"),
 
-    ?line {ok, Fd} = ?FILE_MODULE:open(Name, [read, binary]),
-    ?line {ok, _}  = ?FILE_MODULE:read(Fd, 5),
-    ?line {error, einval} = ?FILE_MODULE:position(Fd, {bof, -1}),
+    {ok, Fd} = ?FILE_MODULE:open(Name, [read, binary]),
+    {ok, _}  = ?FILE_MODULE:read(Fd, 5),
+    {error, einval} = ?FILE_MODULE:position(Fd, {bof, -1}),
 
     %% Here ok had returned =(
-    ?line {error, einval} = ?FILE_MODULE:position(Fd, {cur, -10}),
+    {error, einval} = ?FILE_MODULE:position(Fd, {cur, -10}),
     %% That test is actually questionable since file:position/2
     %% is documented to leave the file position undefined after
     %% it has returned an error.  But on Posix systems the position
     %% is guaranteed to be unchanged after an error return.  On e.g
     %% Windows there is nothing stated about this in the documentation.
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
-file_info_basic_file(suite) -> [];
-file_info_basic_file(doc) -> [];
 file_info_basic_file(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir, Config),
+    RootDir = proplists:get_value(priv_dir, Config),
 
     %% Create a short file.
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_basic_test.fil"),
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name, write),
-    ?line io:put_chars(Fd1, "foo bar"),
-    ?line ok = ?FILE_MODULE:close(Fd1),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_basic_test.fil"),
+    {ok,Fd1} = ?FILE_MODULE:open(Name, write),
+    io:put_chars(Fd1, "foo bar"),
+    ok = ?FILE_MODULE:close(Fd1),
 
     %% Test that the file has the expected attributes.
     %% The times are tricky, so we will save them to a separate test case.
     {ok,FileInfo} = ?FILE_MODULE:read_file_info(Name),
     {ok,FileInfo} = ?FILE_MODULE:read_file_info(Name, [raw]),
     #file_info{size=Size,type=Type,access=Access,
-                         atime=AccessTime,mtime=ModifyTime} = FileInfo,
-    ?line io:format("Access ~p, Modify ~p", [AccessTime, ModifyTime]),
-    ?line Size = 7,
-    ?line Type = regular,
-    ?line read_write = Access,
-    ?line true = abs(time_dist(filter_atime(AccessTime, Config),
-			       filter_atime(ModifyTime,
-					    Config))) < 2,
-    ?line all_integers(tuple_to_list(AccessTime) ++ tuple_to_list(ModifyTime)),
-
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+	       atime=AccessTime,mtime=ModifyTime} = FileInfo,
+    io:format("Access ~p, Modify ~p", [AccessTime, ModifyTime]),
+    Size = 7,
+    Type = regular,
+    read_write = Access,
+    true = abs(time_dist(filter_atime(AccessTime, Config),
+			 filter_atime(ModifyTime,
+				      Config))) < 2,
+    all_integers(tuple_to_list(AccessTime) ++ tuple_to_list(ModifyTime)),
+
+    [] = flush(),
     ok.
 
-file_info_basic_directory(suite) -> [];
-file_info_basic_directory(doc) -> [];
 file_info_basic_directory(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(5)),
-
     %% Note: filename:join/1 removes any trailing slash,
     %% which is essential for ?FILE_MODULE:file_info/1 to work on
     %% platforms such as Windows95.
-    RootDir = filename:join([?config(priv_dir, Config)]),
+    RootDir = filename:join([proplists:get_value(priv_dir, Config)]),
 
     %% Test that the RootDir directory has the expected attributes.
     test_directory(RootDir, read_write),
@@ -1445,65 +1346,57 @@ file_info_basic_directory(Config) when is_list(Config) ->
     %% directories.
     case os:type() of
         {win32, _} ->
-            ?line test_directory("/", read_write),
-            ?line test_directory("c:/", read_write),
-            ?line test_directory("c:\\", read_write);
+            test_directory("/", read_write),
+            test_directory("c:/", read_write),
+            test_directory("c:\\", read_write);
         _ ->
-            ?line test_directory("/", read)
+            test_directory("/", read)
     end,
-    test_server:timetrap_cancel(Dog).
+    ok.
 
 test_directory(Name, ExpectedAccess) ->
     {ok,FileInfo} = ?FILE_MODULE:read_file_info(Name),
     {ok,FileInfo} = ?FILE_MODULE:read_file_info(Name, [raw]),
     #file_info{size=Size,type=Type,access=Access,
                atime=AccessTime,mtime=ModifyTime} = FileInfo,
-    ?line io:format("Testing directory ~s", [Name]),
-    ?line io:format("Directory size is ~p", [Size]),
-    ?line io:format("Access ~p", [Access]),
-    ?line io:format("Access time ~p; Modify time~p", 
-		    [AccessTime, ModifyTime]),
-    ?line Type = directory,
-    ?line Access = ExpectedAccess,
-    ?line all_integers(tuple_to_list(AccessTime) ++ tuple_to_list(ModifyTime)),
-    ?line [] = flush(),
+    io:format("Testing directory ~s", [Name]),
+    io:format("Directory size is ~p", [Size]),
+    io:format("Access ~p", [Access]),
+    io:format("Access time ~p; Modify time~p",
+	      [AccessTime, ModifyTime]),
+    Type = directory,
+    Access = ExpectedAccess,
+    all_integers(tuple_to_list(AccessTime) ++ tuple_to_list(ModifyTime)),
+    [] = flush(),
     ok.
 
 all_integers([{A,B,C}|T]) ->
     all_integers([A,B,C|T]);
 all_integers([Int|Rest]) when is_integer(Int) ->
-    ?line all_integers(Rest);
+    all_integers(Rest);
 all_integers([]) -> ok.
 
 %% Try something nonexistent.
 
-file_info_bad(suite) -> [];
-file_info_bad(doc) -> [];
 file_info_bad(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = filename:join([?config(priv_dir, Config)]),
+    RootDir = filename:join([proplists:get_value(priv_dir, Config)]),
     FileName = filename:join(RootDir, atom_to_list(?MODULE) ++ "_nonexistent"),
     {error,enoent} = ?FILE_MODULE:read_file_info(FileName),
     {error,enoent} = ?FILE_MODULE:read_file_info(FileName, [raw]),
-    ?line {error, enoent} = ?FILE_MODULE:read_file_info(""),
+    {error, enoent} = ?FILE_MODULE:read_file_info(""),
     {error, enoent} = ?FILE_MODULE:read_file_info("", [raw]),
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 %% Test that the file times behave as they should.
 
-file_info_times(suite) -> [];
-file_info_times(doc) -> [];
 file_info_times(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
     %% We have to try this twice, since if the test runs across the change
     %% of a month the time diff calculations will fail. But it won't happen
     %% if you run it twice in succession.
-    ?line test_server:m_out_of_n(
-	    1,2,
-	    fun() -> ?line file_info_int(Config) end),
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:m_out_of_n(
+      1,2,
+      fun() -> file_info_int(Config) end),
     ok.
 
 file_info_int(Config) ->
@@ -1511,14 +1404,14 @@ file_info_int(Config) ->
     %% which is essential for ?FILE_MODULE:file_info/1 to work on
     %% platforms such as Windows95.
 
-    ?line RootDir = filename:join([?config(priv_dir, Config)]),
-    ?line test_server:format("RootDir = ~p", [RootDir]),
+    RootDir = filename:join([proplists:get_value(priv_dir, Config)]),
+    io:format("RootDir = ~p", [RootDir]),
 
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_file_info.fil"),
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name,write),
-    ?line io:put_chars(Fd1,"foo"),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_file_info.fil"),
+    {ok,Fd1} = ?FILE_MODULE:open(Name,write),
+    io:put_chars(Fd1,"foo"),
 
     %% check that the file got a modify date max a few seconds away from now
     {ok,FileInfo1} = ?FILE_MODULE:read_file_info(Name),
@@ -1531,31 +1424,31 @@ file_info_int(Config) ->
 
     #file_info{type=regular,atime=AccTime1,mtime=ModTime1} = FileInfo1,
 
-    ?line Now = erlang:localtime(), %???
-    ?line io:format("Now ~p",[Now]),
-    ?line io:format("Open file Acc ~p Mod ~p",[AccTime1,ModTime1]),
-    ?line true = abs(time_dist(filter_atime(Now, Config),
-			       filter_atime(AccTime1,
-					    Config))) < 8,
-    ?line true = abs(time_dist(Now,ModTime1)) < 8,
+    Now = erlang:localtime(), %???
+    io:format("Now ~p",[Now]),
+    io:format("Open file Acc ~p Mod ~p",[AccTime1,ModTime1]),
+    true = abs(time_dist(filter_atime(Now, Config),
+			 filter_atime(AccTime1,
+				      Config))) < 8,
+    true = abs(time_dist(Now,ModTime1)) < 8,
 
     %% Sleep until we can be sure the seconds value has changed.
     %% Note: FAT-based filesystem (like on Windows 95) have
     %% a resolution of 2 seconds.
-    ?line test_server:sleep(test_server:seconds(2.2)),
+    timer:sleep(2200),
 
     %% close the file, and watch the modify date change
-    ?line ok = ?FILE_MODULE:close(Fd1),
+    ok = ?FILE_MODULE:close(Fd1),
     {ok,FileInfo2} = ?FILE_MODULE:read_file_info(Name),
     {ok,FileInfo2} = ?FILE_MODULE:read_file_info(Name, [raw]),
     #file_info{size=Size,type=regular,access=Access,
                atime=AccTime2,mtime=ModTime2} = FileInfo2,
-    ?line io:format("Closed file Acc ~p Mod ~p",[AccTime2,ModTime2]),
-    ?line true = time_dist(ModTime1,ModTime2) >= 0,
+    io:format("Closed file Acc ~p Mod ~p",[AccTime2,ModTime2]),
+    true = time_dist(ModTime1,ModTime2) >= 0,
 
     %% this file is supposed to be binary, so it'd better keep it's size
-    ?line Size = 3,
-    ?line Access = read_write,
+    Size = 3,
+    Access = read_write,
 
     %% Do some directory checking
     {ok,FileInfo3} = ?FILE_MODULE:read_file_info(RootDir),
@@ -1563,12 +1456,12 @@ file_info_int(Config) ->
     #file_info{size=DSize,type=directory,access=DAccess,
                atime=AccTime3,mtime=ModTime3} = FileInfo3,
     %% this dir was modified only a few secs ago
-    ?line io:format("Dir Acc ~p; Mod ~p; Now ~p", [AccTime3, ModTime3, Now]),
-    ?line true = abs(time_dist(Now,ModTime3)) < 5,
-    ?line DAccess = read_write,
-    ?line io:format("Dir size is ~p",[DSize]),
+    io:format("Dir Acc ~p; Mod ~p; Now ~p", [AccTime3, ModTime3, Now]),
+    true = abs(time_dist(Now,ModTime3)) < 5,
+    DAccess = read_write,
+    io:format("Dir size is ~p",[DSize]),
 
-    ?line [] = flush(),
+    [] = flush(),
     ok.
 
 %% Filter access times, to copy with a deficiency of FAT file systems
@@ -1579,9 +1472,9 @@ filter_atime(Atime, Config) ->
 	true ->
 	    case Atime of
 	    	{Date, _} ->
-	    	   {Date, {0, 0, 0}};
+		    {Date, {0, 0, 0}};
 		{Y, M, D, _, _, _} ->
-		   {Y, M, D, 0, 0, 0}
+		    {Y, M, D, 0, 0, 0}
 	    end;
 	false ->
 	    Atime
@@ -1589,50 +1482,47 @@ filter_atime(Atime, Config) ->
 
 %% Test the write_file_info/2 function.
 
-file_write_file_info(suite) -> [];
-file_write_file_info(doc) -> [];
 file_write_file_info(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = get_good_directory(Config),
-    ?line test_server:format("RootDir = ~p", [RootDir]),
+    RootDir = get_good_directory(Config),
+    io:format("RootDir = ~p", [RootDir]),
 
     %% Set the file to read only AND update the file times at the same time.
     %% (This used to fail on Windows NT/95 for a local filesystem.)
     %% Note: Seconds must be even; see note in file_info_times/1.
 
-    ?line Name1 = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_write_file_info_ro"),
-    ?line ok = ?FILE_MODULE:write_file(Name1, "hello"),
-    ?line Time = {{1997, 01, 02}, {12, 35, 42}},
-    ?line Info = #file_info{mode=8#400, atime=Time, mtime=Time, ctime=Time},
-    ?line ok = ?FILE_MODULE:write_file_info(Name1, Info),
+    Name1 = filename:join(RootDir,
+			  atom_to_list(?MODULE)
+			  ++"_write_file_info_ro"),
+    ok = ?FILE_MODULE:write_file(Name1, "hello"),
+    Time = {{1997, 01, 02}, {12, 35, 42}},
+    Info = #file_info{mode=8#400, atime=Time, mtime=Time, ctime=Time},
+    ok = ?FILE_MODULE:write_file_info(Name1, Info),
 
     %% Read back the times.
 
-    ?line {ok, ActualInfo} = ?FILE_MODULE:read_file_info(Name1),
-    ?line #file_info{mode=_Mode, atime=ActAtime, mtime=Time,
-		     ctime=ActCtime} = ActualInfo,
-    ?line FilteredAtime = filter_atime(Time, Config),
-    ?line FilteredAtime = filter_atime(ActAtime, Config),
-    ?line case os:type() of
-	      {win32, _} ->
-		  %% On Windows, "ctime" means creation time and it can
-		  %% be set.
-		  ActCtime = Time;
-	      _ ->
-		  ok
-	  end,
-    ?line {error, eacces} = ?FILE_MODULE:write_file(Name1, "hello again"),
+    {ok, ActualInfo} = ?FILE_MODULE:read_file_info(Name1),
+    #file_info{mode=_Mode, atime=ActAtime, mtime=Time,
+	       ctime=ActCtime} = ActualInfo,
+    FilteredAtime = filter_atime(Time, Config),
+    FilteredAtime = filter_atime(ActAtime, Config),
+    case os:type() of
+	{win32, _} ->
+	    %% On Windows, "ctime" means creation time and it can
+	    %% be set.
+	    ActCtime = Time;
+	_ ->
+	    ok
+    end,
+    {error, eacces} = ?FILE_MODULE:write_file(Name1, "hello again"),
 
     %% Make the file writable again.
 
-    ?line ?FILE_MODULE:write_file_info(Name1, #file_info{mode=8#600}),
-    ?line ok = ?FILE_MODULE:write_file(Name1, "hello again"),
+    ?FILE_MODULE:write_file_info(Name1, #file_info{mode=8#600}),
+    ok = ?FILE_MODULE:write_file(Name1, "hello again"),
 
     %% And unwritable.
-    ?line ?FILE_MODULE:write_file_info(Name1, #file_info{mode=8#400}),
-    ?line {error, eacces} = ?FILE_MODULE:write_file(Name1, "hello again"),
+    ?FILE_MODULE:write_file_info(Name1, #file_info{mode=8#400}),
+    {error, eacces} = ?FILE_MODULE:write_file(Name1, "hello again"),
 
     %% Same with raw.
     ?FILE_MODULE:write_file_info(Name1, #file_info{mode=8#600}, [raw]),
@@ -1643,634 +1533,577 @@ file_write_file_info(Config) when is_list(Config) ->
     %% Write the times again.
     %% Note: Seconds must be even; see note in file_info_times/1.
 
-    ?line NewTime = {{1997, 02, 15}, {13, 18, 20}},
-    ?line NewInfo = #file_info{atime=NewTime, mtime=NewTime, ctime=NewTime},
-    ?line ok = ?FILE_MODULE:write_file_info(Name1, NewInfo),
-    ?line {ok, ActualInfo2} = ?FILE_MODULE:read_file_info(Name1),
-    ?line #file_info{atime=NewActAtime, mtime=NewTime,
-		     ctime=NewActCtime} = ActualInfo2,
-    ?line NewFilteredAtime = filter_atime(NewTime, Config),
-    ?line NewFilteredAtime = filter_atime(NewActAtime, Config),
-    ?line case os:type() of
-	      {win32, _} -> NewActCtime = NewTime;
-	      _ -> ok
-	  end,
+    NewTime = {{1997, 02, 15}, {13, 18, 20}},
+    NewInfo = #file_info{atime=NewTime, mtime=NewTime, ctime=NewTime},
+    ok = ?FILE_MODULE:write_file_info(Name1, NewInfo),
+    {ok, ActualInfo2} = ?FILE_MODULE:read_file_info(Name1),
+    #file_info{atime=NewActAtime, mtime=NewTime,
+	       ctime=NewActCtime} = ActualInfo2,
+    NewFilteredAtime = filter_atime(NewTime, Config),
+    NewFilteredAtime = filter_atime(NewActAtime, Config),
+    case os:type() of
+	{win32, _} -> NewActCtime = NewTime;
+	_ -> ok
+    end,
 
     %% The file should still be unwritable.
-    ?line {error, eacces} = ?FILE_MODULE:write_file(Name1, "hello again"),
+    {error, eacces} = ?FILE_MODULE:write_file(Name1, "hello again"),
 
     %% Make the file writeable again, so that we can remove the
     %% test suites ... :-)
-    ?line ?FILE_MODULE:write_file_info(Name1, #file_info{mode=8#600}),
+    ?FILE_MODULE:write_file_info(Name1, #file_info{mode=8#600}),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 %% Returns a directory on a file system that has correct file times.
 
 get_good_directory(Config) ->
-    ?line ?config(priv_dir, Config).
+    proplists:get_value(priv_dir, Config).
 
 
-consult1(suite) -> [];
-consult1(doc) -> [];
 consult1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_consult.fil"),
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name,write),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_consult.fil"),
+    {ok,Fd1} = ?FILE_MODULE:open(Name,write),
     %% note that there is no final \n (only a space)
-    ?line io:format(Fd1,
-		    "{this,[is,1.0],'journey'}.\n\"into\". (sound). ",
-		    []),
-    ?line ok = ?FILE_MODULE:close(Fd1),
-    ?line {ok,[{this,[is,1.0],journey},"into",sound]} = 
+    io:format(Fd1,
+	      "{this,[is,1.0],'journey'}.\n\"into\". (sound). ",
+	      []),
+    ok = ?FILE_MODULE:close(Fd1),
+    {ok,[{this,[is,1.0],journey},"into",sound]} =
 	?FILE_MODULE:consult(Name),
 
-    ?line {ok,Fd2} = ?FILE_MODULE:open(Name,write),
+    {ok,Fd2} = ?FILE_MODULE:open(Name,write),
     %% note the missing double quote
-    ?line io:format(
-	    Fd2,"{this,[is,1.0],'journey'}.\n \"into. (sound). ",[]),
-    ?line ok = ?FILE_MODULE:close(Fd2),
-    ?line {error, {_, _, _} = Msg} = ?FILE_MODULE:consult(Name),
-    ?line io:format("Errmsg: ~p",[Msg]),
+    io:format(
+      Fd2,"{this,[is,1.0],'journey'}.\n \"into. (sound). ",[]),
+    ok = ?FILE_MODULE:close(Fd2),
+    {error, {_, _, _} = Msg} = ?FILE_MODULE:consult(Name),
+    io:format("Errmsg: ~p",[Msg]),
 
-    ?line {error, enoent} = ?FILE_MODULE:consult(Name ++ ".nonexistent"),
+    {error, enoent} = ?FILE_MODULE:consult(Name ++ ".nonexistent"),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
-path_consult(suite) -> [];
-path_consult(doc) -> [];
 path_consult(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line FileName = atom_to_list(?MODULE)++"_path_consult.fil",
-    ?line Name = filename:join(RootDir, FileName),
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name,write),
-    ?line io:format(Fd1,"{this,is,a,journey,into,sound}.\n",[]),
-    ?line ok = ?FILE_MODULE:close(Fd1),
+    RootDir = proplists:get_value(priv_dir,Config),
+    FileName = atom_to_list(?MODULE)++"_path_consult.fil",
+    Name = filename:join(RootDir, FileName),
+    {ok,Fd1} = ?FILE_MODULE:open(Name,write),
+    io:format(Fd1,"{this,is,a,journey,into,sound}.\n",[]),
+    ok = ?FILE_MODULE:close(Fd1),
     %% File last in path
-    ?line {ok,[{this,is,a,journey,into,sound}],Dir} =
+    {ok,[{this,is,a,journey,into,sound}],Dir} =
 	?FILE_MODULE:path_consult(
-	  [filename:join(RootDir, "dir1"),
-	   filename:join(RootDir, ".."),
-	   filename:join(RootDir, "dir2"),
-	   RootDir], FileName),
-    ?line true = lists:prefix(RootDir,Dir),
+	   [filename:join(RootDir, "dir1"),
+	    filename:join(RootDir, ".."),
+	    filename:join(RootDir, "dir2"),
+	    RootDir], FileName),
+    true = lists:prefix(RootDir,Dir),
 
     %% While maybe not an error, it may be worth noting that
     %% when the full path to a file is given, it's always found
     %% regardless of the contents of the path
-    ?line {ok,_,_} = ?FILE_MODULE:path_consult(["nosuch1","nosuch2"],Name),
+    {ok,_,_} = ?FILE_MODULE:path_consult(["nosuch1","nosuch2"],Name),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 
-eval1(suite) -> [];
-eval1(doc) -> [];
 eval1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)++"_eval.fil"),
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name,write),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)++"_eval.fil"),
+    {ok,Fd1} = ?FILE_MODULE:open(Name,write),
     %% note that there is no final \n (only a space)
-    ?line io:format(Fd1,"put(evaluated_ok,\ntrue). ",[]),
-    ?line ok = ?FILE_MODULE:close(Fd1),
-    ?line ok = ?FILE_MODULE:eval(Name),
-    ?line true = get(evaluated_ok),
-    
-    ?line {ok,Fd2} = ?FILE_MODULE:open(Name,write),
+    io:format(Fd1,"put(evaluated_ok,\ntrue). ",[]),
+    ok = ?FILE_MODULE:close(Fd1),
+    ok = ?FILE_MODULE:eval(Name),
+    true = get(evaluated_ok),
+
+    {ok,Fd2} = ?FILE_MODULE:open(Name,write),
     %% note that there is no final \n (only a space)
-    ?line io:format(Fd2,"put(evaluated_ok,\nR). ",[]),
-    ?line ok = ?FILE_MODULE:close(Fd2),
-    ?line ok = ?FILE_MODULE:eval(
-		  Name, 
-		  erl_eval:add_binding('R', true, erl_eval:new_bindings())),
-    ?line true = get(evaluated_ok),
-    
-    ?line {ok,Fd3} = ?FILE_MODULE:open(Name,write),
+    io:format(Fd2,"put(evaluated_ok,\nR). ",[]),
+    ok = ?FILE_MODULE:close(Fd2),
+    ok = ?FILE_MODULE:eval(
+	    Name,
+	    erl_eval:add_binding('R', true, erl_eval:new_bindings())),
+    true = get(evaluated_ok),
+
+    {ok,Fd3} = ?FILE_MODULE:open(Name,write),
     %% garbled
-    ?line io:format(Fd3,"puGARBLED-GARBLED\ntrue). ",[]),
-    ?line ok = ?FILE_MODULE:close(Fd3),
-    ?line {error, {_, _, _} = Msg} = ?FILE_MODULE:eval(Name),
-    ?line io:format("Errmsg1: ~p",[Msg]),
-    
-    ?line {error, enoent} = ?FILE_MODULE:eval(Name ++ ".nonexistent"),
-
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    io:format(Fd3,"puGARBLED-GARBLED\ntrue). ",[]),
+    ok = ?FILE_MODULE:close(Fd3),
+    {error, {_, _, _} = Msg} = ?FILE_MODULE:eval(Name),
+    io:format("Errmsg1: ~p",[Msg]),
+
+    {error, enoent} = ?FILE_MODULE:eval(Name ++ ".nonexistent"),
+
+    [] = flush(),
     ok.
 
-path_eval(suite) -> [];
-path_eval(doc) -> [];
 path_eval(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line FileName = atom_to_list(?MODULE)++"_path_eval.fil",
-    ?line Name = filename:join(RootDir, FileName),
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name,write),
-    ?line io:format(Fd1,"put(evaluated_ok,true).\n",[]),
-    ?line ok = ?FILE_MODULE:close(Fd1),
+    RootDir = proplists:get_value(priv_dir,Config),
+    FileName = atom_to_list(?MODULE)++"_path_eval.fil",
+    Name = filename:join(RootDir, FileName),
+    {ok,Fd1} = ?FILE_MODULE:open(Name,write),
+    io:format(Fd1,"put(evaluated_ok,true).\n",[]),
+    ok = ?FILE_MODULE:close(Fd1),
     %% File last in path
-    ?line {ok,Dir} =
+    {ok,Dir} =
 	?FILE_MODULE:path_eval(
-	  [filename:join(RootDir, "dir1"),
-	   filename:join(RootDir, ".."),
-	   filename:join(RootDir, "dir2"),
-	   RootDir],FileName),
-    ?line true = get(evaluated_ok),
-    ?line true = lists:prefix(RootDir,Dir),
-    
+	   [filename:join(RootDir, "dir1"),
+	    filename:join(RootDir, ".."),
+	    filename:join(RootDir, "dir2"),
+	    RootDir],FileName),
+    true = get(evaluated_ok),
+    true = lists:prefix(RootDir,Dir),
+
     %% While maybe not an error, it may be worth noting that
     %% when the full path to a file is given, it's always found
     %% regardless of the contents of the path
-    ?line {ok,Fd2} = ?FILE_MODULE:open(Name,write),
-    ?line io:format(Fd2,"put(evaluated_ok,R).\n",[]),
-    ?line ok = ?FILE_MODULE:close(Fd2),
-    ?line {ok,_} = ?FILE_MODULE:path_eval(
-		      ["nosuch1","nosuch2"],
-		      Name,
-		      erl_eval:add_binding('R', true, erl_eval:new_bindings())),
-    
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    {ok,Fd2} = ?FILE_MODULE:open(Name,write),
+    io:format(Fd2,"put(evaluated_ok,R).\n",[]),
+    ok = ?FILE_MODULE:close(Fd2),
+    {ok,_} = ?FILE_MODULE:path_eval(
+		["nosuch1","nosuch2"],
+		Name,
+		erl_eval:add_binding('R', true, erl_eval:new_bindings())),
+
+    [] = flush(),
     ok.
 
 
-script1(suite) -> [];
-script1(doc) -> "";
 script1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)++"_script.fil"),
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name,write),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)++"_script.fil"),
+    {ok,Fd1} = ?FILE_MODULE:open(Name,write),
     %% note that there is no final \n (only a space)
-    ?line io:format(Fd1,"A = 11,\nB = 6,\nA+B. ",[]),
-    ?line ok = ?FILE_MODULE:close(Fd1),
-    ?line {ok,17} = ?FILE_MODULE:script(Name),
-    
-    ?line {ok,Fd2} = ?FILE_MODULE:open(Name,write),
+    io:format(Fd1,"A = 11,\nB = 6,\nA+B. ",[]),
+    ok = ?FILE_MODULE:close(Fd1),
+    {ok,17} = ?FILE_MODULE:script(Name),
+
+    {ok,Fd2} = ?FILE_MODULE:open(Name,write),
     %% note that there is no final \n (only a space)
-    ?line io:format(Fd2,"A = 11,\nA+B. ",[]),
-    ?line ok = ?FILE_MODULE:close(Fd2),
-    ?line {ok,17} = ?FILE_MODULE:script(
-		       Name, 
-		       erl_eval:add_binding('B', 6, erl_eval:new_bindings())),
-    
-    ?line {ok,Fd3} = ?FILE_MODULE:open(Name,write),
-    ?line io:format(Fd3,"A = 11,\nB = six,\nA+B. ",[]),
-    ?line ok = ?FILE_MODULE:close(Fd3),
-    ?line {error, {_, _, _} = Msg} = ?FILE_MODULE:script(Name),
-    ?line io:format("Errmsg1: ~p",[Msg]),
-
-    ?line {error, enoent} = ?FILE_MODULE:script(Name ++ ".nonexistent"),
-    
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    io:format(Fd2,"A = 11,\nA+B. ",[]),
+    ok = ?FILE_MODULE:close(Fd2),
+    {ok,17} = ?FILE_MODULE:script(
+		 Name,
+		 erl_eval:add_binding('B', 6, erl_eval:new_bindings())),
+
+    {ok,Fd3} = ?FILE_MODULE:open(Name,write),
+    io:format(Fd3,"A = 11,\nB = six,\nA+B. ",[]),
+    ok = ?FILE_MODULE:close(Fd3),
+    {error, {_, _, _} = Msg} = ?FILE_MODULE:script(Name),
+    io:format("Errmsg1: ~p",[Msg]),
+
+    {error, enoent} = ?FILE_MODULE:script(Name ++ ".nonexistent"),
+
+    [] = flush(),
     ok.
-    
-path_script(suite) -> [];
-path_script(doc) -> [];
+
 path_script(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line FileName = atom_to_list(?MODULE)++"_path_script.fil",
-    ?line Name = filename:join(RootDir, FileName),
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name,write),
-    ?line io:format(Fd1,"A = 11,\nB = 6,\nA+B.\n",[]),
-    ?line ok = ?FILE_MODULE:close(Fd1),
+    RootDir = proplists:get_value(priv_dir,Config),
+    FileName = atom_to_list(?MODULE)++"_path_script.fil",
+    Name = filename:join(RootDir, FileName),
+    {ok,Fd1} = ?FILE_MODULE:open(Name,write),
+    io:format(Fd1,"A = 11,\nB = 6,\nA+B.\n",[]),
+    ok = ?FILE_MODULE:close(Fd1),
     %% File last in path
-    ?line {ok, 17, Dir} =
+    {ok, 17, Dir} =
 	?FILE_MODULE:path_script(
 	   [filename:join(RootDir, "dir1"),
 	    filename:join(RootDir, ".."),
 	    filename:join(RootDir, "dir2"),
 	    RootDir],FileName),
-    ?line true = lists:prefix(RootDir,Dir),
-    
+    true = lists:prefix(RootDir,Dir),
+
     %% While maybe not an error, it may be worth noting that
     %% when the full path to a file is given, it's always found
     %% regardless of the contents of the path
-    ?line {ok,Fd2} = ?FILE_MODULE:open(Name,write),
-    ?line io:format(Fd2,"A = 11,\nA+B.",[]),
-    ?line ok = ?FILE_MODULE:close(Fd2),
-    ?line {ok, 17, Dir} = 
+    {ok,Fd2} = ?FILE_MODULE:open(Name,write),
+    io:format(Fd2,"A = 11,\nA+B.",[]),
+    ok = ?FILE_MODULE:close(Fd2),
+    {ok, 17, Dir} =
 	?FILE_MODULE:path_script(
 	   ["nosuch1","nosuch2"],
 	   Name,
 	   erl_eval:add_binding('B', 6, erl_eval:new_bindings())),
-    
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+
+    [] = flush(),
     ok.
 
-    
 
-truncate(suite) -> [];
-truncate(doc) -> [];
+
 truncate(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_truncate.fil"),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_truncate.fil"),
 
     %% Create a file with some data.
-    ?line MyData = "0123456789abcdefghijklmnopqrstuvxyz",
-    ?line ok = ?FILE_MODULE:write_file(Name, MyData),
+    MyData = "0123456789abcdefghijklmnopqrstuvxyz",
+    ok = ?FILE_MODULE:write_file(Name, MyData),
 
     %% Truncate the file to 10 characters.
-    ?line {ok, Fd} = ?FILE_MODULE:open(Name, read_write),
-    ?line {ok, 10} = ?FILE_MODULE:position(Fd, 10),
-    ?line ok = ?FILE_MODULE:truncate(Fd),
-    ?line ok = ?FILE_MODULE:close(Fd),
+    {ok, Fd} = ?FILE_MODULE:open(Name, read_write),
+    {ok, 10} = ?FILE_MODULE:position(Fd, 10),
+    ok = ?FILE_MODULE:truncate(Fd),
+    ok = ?FILE_MODULE:close(Fd),
 
     %% Read back the file and check that it has been truncated.
-    ?line Expected = list_to_binary("0123456789"),
-    ?line {ok, Expected} = ?FILE_MODULE:read_file(Name),
+    Expected = list_to_binary("0123456789"),
+    {ok, Expected} = ?FILE_MODULE:read_file(Name),
 
     %% Open the file read only and verify that it is not possible to
     %% truncate it, OTP-1960
-    ?line {ok, Fd2} = ?FILE_MODULE:open(Name, read),
-    ?line {ok, 5} = ?FILE_MODULE:position(Fd2, 5),
-    ?line {error, _} = ?FILE_MODULE:truncate(Fd2),
+    {ok, Fd2} = ?FILE_MODULE:open(Name, read),
+    {ok, 5} = ?FILE_MODULE:position(Fd2, 5),
+    {error, _} = ?FILE_MODULE:truncate(Fd2),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 
-datasync(suite) -> [];
-datasync(doc) -> "Tests that ?FILE_MODULE:datasync/1 at least doesn't crash.";
+%% Tests that ?FILE_MODULE:datasync/1 at least doesn't crash.
 datasync(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Sync = filename:join(PrivDir,
-			       atom_to_list(?MODULE)
-			       ++"_sync.fil"),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Sync = filename:join(PrivDir,
+			 atom_to_list(?MODULE)
+			 ++"_sync.fil"),
 
     %% Raw open.
-    ?line {ok, Fd} = ?FILE_MODULE:open(Sync, [write, raw]),
-    ?line ok = ?FILE_MODULE:datasync(Fd),
-    ?line ok = ?FILE_MODULE:close(Fd),
+    {ok, Fd} = ?FILE_MODULE:open(Sync, [write, raw]),
+    ok = ?FILE_MODULE:datasync(Fd),
+    ok = ?FILE_MODULE:close(Fd),
 
     %% Ordinary open.
-    ?line {ok, Fd2} = ?FILE_MODULE:open(Sync, [write]),
-    ?line ok = ?FILE_MODULE:datasync(Fd2),
-    ?line ok = ?FILE_MODULE:close(Fd2),
+    {ok, Fd2} = ?FILE_MODULE:open(Sync, [write]),
+    ok = ?FILE_MODULE:datasync(Fd2),
+    ok = ?FILE_MODULE:close(Fd2),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 
-sync(suite) -> [];
-sync(doc) -> "Tests that ?FILE_MODULE:sync/1 at least doesn't crash.";
+%% Tests that ?FILE_MODULE:sync/1 at least doesn't crash.
 sync(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Sync = filename:join(PrivDir, 
-			       atom_to_list(?MODULE)
-			       ++"_sync.fil"),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Sync = filename:join(PrivDir,
+			 atom_to_list(?MODULE)
+			 ++"_sync.fil"),
 
     %% Raw open.
-    ?line {ok, Fd} = ?FILE_MODULE:open(Sync, [write, raw]),
-    ?line ok = ?FILE_MODULE:sync(Fd),
-    ?line ok = ?FILE_MODULE:close(Fd),
+    {ok, Fd} = ?FILE_MODULE:open(Sync, [write, raw]),
+    ok = ?FILE_MODULE:sync(Fd),
+    ok = ?FILE_MODULE:close(Fd),
 
     %% Ordinary open.
-    ?line {ok, Fd2} = ?FILE_MODULE:open(Sync, [write]),
-    ?line ok = ?FILE_MODULE:sync(Fd2),
-    ?line ok = ?FILE_MODULE:close(Fd2),
+    {ok, Fd2} = ?FILE_MODULE:open(Sync, [write]),
+    ok = ?FILE_MODULE:sync(Fd2),
+    ok = ?FILE_MODULE:close(Fd2),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
-advise(suite) -> [];
-advise(doc) -> "Tests that ?FILE_MODULE:advise/4 at least doesn't crash.";
+%% Tests that ?FILE_MODULE:advise/4 at least doesn't crash.
 advise(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Advise = filename:join(PrivDir,
-			       atom_to_list(?MODULE)
-			       ++"_advise.fil"),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Advise = filename:join(PrivDir,
+			   atom_to_list(?MODULE)
+			   ++"_advise.fil"),
 
     Line1 = "Hello\n",
     Line2 = "World!\n",
 
-    ?line {ok, Fd} = ?FILE_MODULE:open(Advise, [write]),
-    ?line ok = ?FILE_MODULE:advise(Fd, 0, 0, normal),
-    ?line ok = io:format(Fd, "~s", [Line1]),
-    ?line ok = io:format(Fd, "~s", [Line2]),
-    ?line ok = ?FILE_MODULE:close(Fd),
-
-    ?line {ok, Fd2} = ?FILE_MODULE:open(Advise, [write]),
-    ?line ok = ?FILE_MODULE:advise(Fd2, 0, 0, random),
-    ?line ok = io:format(Fd2, "~s", [Line1]),
-    ?line ok = io:format(Fd2, "~s", [Line2]),
-    ?line ok = ?FILE_MODULE:close(Fd2),
-
-    ?line {ok, Fd3} = ?FILE_MODULE:open(Advise, [write]),
-    ?line ok = ?FILE_MODULE:advise(Fd3, 0, 0, sequential),
-    ?line ok = io:format(Fd3, "~s", [Line1]),
-    ?line ok = io:format(Fd3, "~s", [Line2]),
-    ?line ok = ?FILE_MODULE:close(Fd3),
-
-    ?line {ok, Fd4} = ?FILE_MODULE:open(Advise, [write]),
-    ?line ok = ?FILE_MODULE:advise(Fd4, 0, 0, will_need),
-    ?line ok = io:format(Fd4, "~s", [Line1]),
-    ?line ok = io:format(Fd4, "~s", [Line2]),
-    ?line ok = ?FILE_MODULE:close(Fd4),
-
-    ?line {ok, Fd5} = ?FILE_MODULE:open(Advise, [write]),
-    ?line ok = ?FILE_MODULE:advise(Fd5, 0, 0, dont_need),
-    ?line ok = io:format(Fd5, "~s", [Line1]),
-    ?line ok = io:format(Fd5, "~s", [Line2]),
-    ?line ok = ?FILE_MODULE:close(Fd5),
-
-    ?line {ok, Fd6} = ?FILE_MODULE:open(Advise, [write]),
-    ?line ok = ?FILE_MODULE:advise(Fd6, 0, 0, no_reuse),
-    ?line ok = io:format(Fd6, "~s", [Line1]),
-    ?line ok = io:format(Fd6, "~s", [Line2]),
-    ?line ok = ?FILE_MODULE:close(Fd6),
-
-    ?line {ok, Fd7} = ?FILE_MODULE:open(Advise, [write]),
-    ?line {error, einval} = ?FILE_MODULE:advise(Fd7, 0, 0, bad_advise),
-    ?line ok = ?FILE_MODULE:close(Fd7),
+    {ok, Fd} = ?FILE_MODULE:open(Advise, [write]),
+    ok = ?FILE_MODULE:advise(Fd, 0, 0, normal),
+    ok = io:format(Fd, "~s", [Line1]),
+    ok = io:format(Fd, "~s", [Line2]),
+    ok = ?FILE_MODULE:close(Fd),
+
+    {ok, Fd2} = ?FILE_MODULE:open(Advise, [write]),
+    ok = ?FILE_MODULE:advise(Fd2, 0, 0, random),
+    ok = io:format(Fd2, "~s", [Line1]),
+    ok = io:format(Fd2, "~s", [Line2]),
+    ok = ?FILE_MODULE:close(Fd2),
+
+    {ok, Fd3} = ?FILE_MODULE:open(Advise, [write]),
+    ok = ?FILE_MODULE:advise(Fd3, 0, 0, sequential),
+    ok = io:format(Fd3, "~s", [Line1]),
+    ok = io:format(Fd3, "~s", [Line2]),
+    ok = ?FILE_MODULE:close(Fd3),
+
+    {ok, Fd4} = ?FILE_MODULE:open(Advise, [write]),
+    ok = ?FILE_MODULE:advise(Fd4, 0, 0, will_need),
+    ok = io:format(Fd4, "~s", [Line1]),
+    ok = io:format(Fd4, "~s", [Line2]),
+    ok = ?FILE_MODULE:close(Fd4),
+
+    {ok, Fd5} = ?FILE_MODULE:open(Advise, [write]),
+    ok = ?FILE_MODULE:advise(Fd5, 0, 0, dont_need),
+    ok = io:format(Fd5, "~s", [Line1]),
+    ok = io:format(Fd5, "~s", [Line2]),
+    ok = ?FILE_MODULE:close(Fd5),
+
+    {ok, Fd6} = ?FILE_MODULE:open(Advise, [write]),
+    ok = ?FILE_MODULE:advise(Fd6, 0, 0, no_reuse),
+    ok = io:format(Fd6, "~s", [Line1]),
+    ok = io:format(Fd6, "~s", [Line2]),
+    ok = ?FILE_MODULE:close(Fd6),
+
+    {ok, Fd7} = ?FILE_MODULE:open(Advise, [write]),
+    {error, einval} = ?FILE_MODULE:advise(Fd7, 0, 0, bad_advise),
+    ok = ?FILE_MODULE:close(Fd7),
 
     %% test write without advise, then a read after an advise
-    ?line {ok, Fd8} = ?FILE_MODULE:open(Advise, [write]),
-    ?line ok = io:format(Fd8, "~s", [Line1]),
-    ?line ok = io:format(Fd8, "~s", [Line2]),
-    ?line ok = ?FILE_MODULE:close(Fd8),
-    ?line {ok, Fd9} = ?FILE_MODULE:open(Advise, [read]),
+    {ok, Fd8} = ?FILE_MODULE:open(Advise, [write]),
+    ok = io:format(Fd8, "~s", [Line1]),
+    ok = io:format(Fd8, "~s", [Line2]),
+    ok = ?FILE_MODULE:close(Fd8),
+    {ok, Fd9} = ?FILE_MODULE:open(Advise, [read]),
     Offset = 0,
     %% same as a 0 length in some implementations
     Length = length(Line1) + length(Line2),
-    ?line ok = ?FILE_MODULE:advise(Fd9, Offset, Length, sequential),
-    ?line {ok, Line1} = ?FILE_MODULE:read_line(Fd9),
-    ?line {ok, Line2} = ?FILE_MODULE:read_line(Fd9),
-    ?line eof = ?FILE_MODULE:read_line(Fd9),
-    ?line ok = ?FILE_MODULE:close(Fd9),
-
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    ok = ?FILE_MODULE:advise(Fd9, Offset, Length, sequential),
+    {ok, Line1} = ?FILE_MODULE:read_line(Fd9),
+    {ok, Line2} = ?FILE_MODULE:read_line(Fd9),
+    eof = ?FILE_MODULE:read_line(Fd9),
+    ok = ?FILE_MODULE:close(Fd9),
+
+    [] = flush(),
     ok.
 
-allocate(suite) -> [];
-allocate(doc) -> "Tests that ?FILE_MODULE:allocate/3 at least doesn't crash.";
+%% Tests that ?FILE_MODULE:allocate/3 at least doesn't crash.
 allocate(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Allocate = filename:join(PrivDir,
-			       atom_to_list(?MODULE)
-			       ++"_allocate.fil"),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Allocate = filename:join(PrivDir,
+			     atom_to_list(?MODULE)
+			     ++"_allocate.fil"),
 
     Line1 = "Hello\n",
     Line2 = "World!\n",
 
-    ?line {ok, Fd} = ?FILE_MODULE:open(Allocate, [write, binary]),
+    {ok, Fd} = ?FILE_MODULE:open(Allocate, [write, binary]),
     allocate_and_assert(Fd, 1, iolist_size([Line1, Line2])),
-    ?line ok = io:format(Fd, "~s", [Line1]),
-    ?line ok = io:format(Fd, "~s", [Line2]),
-    ?line ok = ?FILE_MODULE:close(Fd),
+    ok = io:format(Fd, "~s", [Line1]),
+    ok = io:format(Fd, "~s", [Line2]),
+    ok = ?FILE_MODULE:close(Fd),
 
-    ?line {ok, Fd2} = ?FILE_MODULE:open(Allocate, [write, binary]),
+    {ok, Fd2} = ?FILE_MODULE:open(Allocate, [write, binary]),
     allocate_and_assert(Fd2, 1, iolist_size(Line1)),
-    ?line ok = io:format(Fd2, "~s", [Line1]),
-    ?line ok = io:format(Fd2, "~s", [Line2]),
-    ?line ok = ?FILE_MODULE:close(Fd2),
+    ok = io:format(Fd2, "~s", [Line1]),
+    ok = io:format(Fd2, "~s", [Line2]),
+    ok = ?FILE_MODULE:close(Fd2),
 
-    ?line {ok, Fd3} = ?FILE_MODULE:open(Allocate, [write, binary]),
+    {ok, Fd3} = ?FILE_MODULE:open(Allocate, [write, binary]),
     allocate_and_assert(Fd3, 1, iolist_size(Line1) + 1),
-    ?line ok = io:format(Fd3, "~s", [Line1]),
-    ?line ok = io:format(Fd3, "~s", [Line2]),
-    ?line ok = ?FILE_MODULE:close(Fd3),
+    ok = io:format(Fd3, "~s", [Line1]),
+    ok = io:format(Fd3, "~s", [Line2]),
+    ok = ?FILE_MODULE:close(Fd3),
 
-    ?line {ok, Fd4} = ?FILE_MODULE:open(Allocate, [write, binary]),
+    {ok, Fd4} = ?FILE_MODULE:open(Allocate, [write, binary]),
     allocate_and_assert(Fd4, 1, 4 * iolist_size([Line1, Line2])),
-    ?line ok = io:format(Fd4, "~s", [Line1]),
-    ?line ok = io:format(Fd4, "~s", [Line2]),
-    ?line ok = ?FILE_MODULE:close(Fd4),
+    ok = io:format(Fd4, "~s", [Line1]),
+    ok = io:format(Fd4, "~s", [Line2]),
+    ok = ?FILE_MODULE:close(Fd4),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 allocate_and_assert(Fd, Offset, Length) ->
-    % Just verify that calls to ?PRIM_FILE:allocate/3 don't crash or have
-    % any other negative side effect. We can't really asssert against a
-    % specific return value, because support for file space pre-allocation
-    % depends on the OS, OS version and underlying filesystem.
-    %
-    % The Linux kernel added support for fallocate() in version 2.6.23,
-    % which currently works only for the ext4, ocfs2, xfs and btrfs file
-    % systems. posix_fallocate() is available in glibc as of version
-    % 2.1.94, but it was buggy until glibc version 2.7.
-    %
-    % Mac OS X, as of version 10.3, supports the fcntl operation F_PREALLOCATE.
-    %
-    % Solaris supports posix_fallocate() but only for the UFS file system
-    % apparently (not supported for ZFS).
-    %
-    % FreeBSD 9.0 is the first FreeBSD release supporting posix_fallocate().
-    %
-    % For Windows there's apparently no way to pre-allocate file space, at
-    % least with same semantics as posix_fallocate(), fallocate() and
-    % fcntl F_PREALLOCATE.
+    %% Just verify that calls to ?PRIM_FILE:allocate/3 don't crash or have
+    %% any other negative side effect. We can't really asssert against a
+    %% specific return value, because support for file space pre-allocation
+    %% depends on the OS, OS version and underlying filesystem.
+    %%
+    %% The Linux kernel added support for fallocate() in version 2.6.23,
+    %% which currently works only for the ext4, ocfs2, xfs and btrfs file
+    %% systems. posix_fallocate() is available in glibc as of version
+    %% 2.1.94, but it was buggy until glibc version 2.7.
+    %%
+    %% Mac OS X, as of version 10.3, supports the fcntl operation F_PREALLOCATE.
+    %%
+    %% Solaris supports posix_fallocate() but only for the UFS file system
+    %% apparently (not supported for ZFS).
+    %%
+    %% FreeBSD 9.0 is the first FreeBSD release supporting posix_fallocate().
+    %%
+    %% For Windows there's apparently no way to pre-allocate file space, at
+    %% least with same semantics as posix_fallocate(), fallocate() and
+    %% fcntl F_PREALLOCATE.
     Result = ?FILE_MODULE:allocate(Fd, Offset, Length),
     case os:type() of
         {win32, _} ->
-            ?line {error, enotsup} = Result;
+            {error, enotsup} = Result;
         _ ->
-            ?line _ = Result
+            _ = Result
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-delete(suite) -> [];
-delete(doc) -> [];
 delete(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_delete.fil"),
-    ?line {ok, Fd1} = ?FILE_MODULE:open(Name, write),
-    ?line io:format(Fd1,"ok.\n",[]),
-    ?line ok = ?FILE_MODULE:close(Fd1),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_delete.fil"),
+    {ok, Fd1} = ?FILE_MODULE:open(Name, write),
+    io:format(Fd1,"ok.\n",[]),
+    ok = ?FILE_MODULE:close(Fd1),
     %% Check that the file is readable
-    ?line {ok, Fd2} = ?FILE_MODULE:open(Name, read),
-    ?line ok = ?FILE_MODULE:close(Fd2),
-    ?line ok = ?FILE_MODULE:delete(Name),
+    {ok, Fd2} = ?FILE_MODULE:open(Name, read),
+    ok = ?FILE_MODULE:close(Fd2),
+    ok = ?FILE_MODULE:delete(Name),
     %% Check that the file is not readable anymore
-    ?line {error, _} = ?FILE_MODULE:open(Name, read),
+    {error, _} = ?FILE_MODULE:open(Name, read),
     %% Try deleting a nonexistent file
-    ?line {error, enoent} = ?FILE_MODULE:delete(Name),
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    {error, enoent} = ?FILE_MODULE:delete(Name),
+    [] = flush(),
     ok.
 
-rename(suite) ->[];
-rename(doc) ->[];
 rename(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line FileName1 = atom_to_list(?MODULE)++"_rename.fil",
-    ?line FileName2 = atom_to_list(?MODULE)++"_rename.ful",
-    ?line Name1 = filename:join(RootDir, FileName1),
-    ?line Name2 = filename:join(RootDir, FileName2),
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name1,write),
-    ?line ok = ?FILE_MODULE:close(Fd1),
+    RootDir = proplists:get_value(priv_dir,Config),
+    FileName1 = atom_to_list(?MODULE)++"_rename.fil",
+    FileName2 = atom_to_list(?MODULE)++"_rename.ful",
+    Name1 = filename:join(RootDir, FileName1),
+    Name2 = filename:join(RootDir, FileName2),
+    {ok,Fd1} = ?FILE_MODULE:open(Name1,write),
+    ok = ?FILE_MODULE:close(Fd1),
     %% Rename, and check that id really changed name
-    ?line ok = ?FILE_MODULE:rename(Name1,Name2),
-    ?line {error, _} = ?FILE_MODULE:open(Name1,read),
-    ?line {ok,Fd2} = ?FILE_MODULE:open(Name2,read),
-    ?line ok = ?FILE_MODULE:close(Fd2),
+    ok = ?FILE_MODULE:rename(Name1,Name2),
+    {error, _} = ?FILE_MODULE:open(Name1,read),
+    {ok,Fd2} = ?FILE_MODULE:open(Name2,read),
+    ok = ?FILE_MODULE:close(Fd2),
     %% Try renaming something to itself
-    ?line ok = ?FILE_MODULE:rename(Name2,Name2),
+    ok = ?FILE_MODULE:rename(Name2,Name2),
     %% Try renaming something that doesn't exist
-    ?line {error, enoent} = ?FILE_MODULE:rename(Name1,Name2),
+    {error, enoent} = ?FILE_MODULE:rename(Name1,Name2),
     %% Try renaming to something else than a string
-    ?line {error, badarg} = ?FILE_MODULE:rename(Name1,{foo,bar}),
-    
+    {error, badarg} = ?FILE_MODULE:rename(Name1,{foo,bar}),
+
     %% Move between directories
-    ?line DirName1 = filename:join(RootDir,
-				   atom_to_list(?MODULE)
-				   ++"_rename_dir"),
-    ?line DirName2 = filename:join(RootDir,
-				   atom_to_list(?MODULE)
-				   ++"_second_rename_dir"),
-    ?line Name1foo = filename:join(DirName1, "foo.fil"),
-    ?line Name2foo = filename:join(DirName2, "foo.fil"),
-    ?line Name2bar = filename:join(DirName2, "bar.dir"),
-    ?line ok = ?FILE_MODULE:make_dir(DirName1),
+    DirName1 = filename:join(RootDir,
+			     atom_to_list(?MODULE)
+			     ++"_rename_dir"),
+    DirName2 = filename:join(RootDir,
+			     atom_to_list(?MODULE)
+			     ++"_second_rename_dir"),
+    Name1foo = filename:join(DirName1, "foo.fil"),
+    Name2foo = filename:join(DirName2, "foo.fil"),
+    Name2bar = filename:join(DirName2, "bar.dir"),
+    ok = ?FILE_MODULE:make_dir(DirName1),
     %% The name has to include the full file name, path in not enough
-    ?line expect({error, eisdir}, {error, eexist}, 
-		 ?FILE_MODULE:rename(Name2,DirName1)),
-    ?line ok = ?FILE_MODULE:rename(Name2, Name1foo),
+    expect({error, eisdir}, {error, eexist},
+	   ?FILE_MODULE:rename(Name2,DirName1)),
+    ok = ?FILE_MODULE:rename(Name2, Name1foo),
     %% Now rename the directory
-    ?line ok = ?FILE_MODULE:rename(DirName1,DirName2),
+    ok = ?FILE_MODULE:rename(DirName1,DirName2),
     %% And check that the file is there now
-    ?line {ok,Fd3} = ?FILE_MODULE:open(Name2foo, read),
-    ?line ok = ?FILE_MODULE:close(Fd3),
+    {ok,Fd3} = ?FILE_MODULE:open(Name2foo, read),
+    ok = ?FILE_MODULE:close(Fd3),
     %% Try some dirty things now: move the directory into itself
-    ?line {error, Msg1} = ?FILE_MODULE:rename(DirName2, Name2bar),
-    ?line io:format("Errmsg1: ~p",[Msg1]),
+    {error, Msg1} = ?FILE_MODULE:rename(DirName2, Name2bar),
+    io:format("Errmsg1: ~p",[Msg1]),
     %% move dir into a file in itself
-    ?line {error, Msg2} = ?FILE_MODULE:rename(DirName2, Name2foo),
-    ?line io:format("Errmsg2: ~p",[Msg2]),
+    {error, Msg2} = ?FILE_MODULE:rename(DirName2, Name2foo),
+    io:format("Errmsg2: ~p",[Msg2]),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-names(suite) -> [];
-names(doc) -> [];
 names(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(5)),
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line FileName = "foo1.fil",
-    ?line Name1 = filename:join(RootDir, FileName),
-    ?line Name2 = [RootDir,"/","foo1",".","fil"],
-    ?line Name3 = [RootDir,"/",foo,$1,[[[],[],'.']],"f",il],
-    ?line {ok,Fd0} = ?FILE_MODULE:open(Name1,write),
-    ?line ok = ?FILE_MODULE:close(Fd0),
+    RootDir = proplists:get_value(priv_dir,Config),
+    FileName = "foo1.fil",
+    Name1 = filename:join(RootDir, FileName),
+    Name2 = [RootDir,"/","foo1",".","fil"],
+    Name3 = [RootDir,"/",foo,$1,[[[],[],'.']],"f",il],
+    {ok,Fd0} = ?FILE_MODULE:open(Name1,write),
+    ok = ?FILE_MODULE:close(Fd0),
 
     %% Try some file names
-    ?line {ok,Fd1} = ?FILE_MODULE:open(Name1,read),
-    ?line ok = ?FILE_MODULE:close(Fd1),
-    ?line {ok,Fd2f} = ?FILE_MODULE:open(lists:flatten(Name2),read),
-    ?line ok = ?FILE_MODULE:close(Fd2f),
-    ?line {ok,Fd2} = ?FILE_MODULE:open(Name2,read),
-    ?line ok = ?FILE_MODULE:close(Fd2),
-    ?line {ok,Fd3} = ?FILE_MODULE:open(Name3,read),
-    ?line ok = ?FILE_MODULE:close(Fd3),
-	case length(Name1) > 255 of
-		true ->
-			io:format("Path too long for an atom:\n\n~p\n", [Name1]);
-		false ->
-			Name4 = list_to_atom(Name1),
-			{ok,Fd4} = ?FILE_MODULE:open(Name4,read),
-			ok = ?FILE_MODULE:close(Fd4)
-	end,
+    {ok,Fd1} = ?FILE_MODULE:open(Name1,read),
+    ok = ?FILE_MODULE:close(Fd1),
+    {ok,Fd2f} = ?FILE_MODULE:open(lists:flatten(Name2),read),
+    ok = ?FILE_MODULE:close(Fd2f),
+    {ok,Fd2} = ?FILE_MODULE:open(Name2,read),
+    ok = ?FILE_MODULE:close(Fd2),
+    {ok,Fd3} = ?FILE_MODULE:open(Name3,read),
+    ok = ?FILE_MODULE:close(Fd3),
+    case length(Name1) > 255 of
+	true ->
+	    io:format("Path too long for an atom:\n\n~p\n", [Name1]);
+	false ->
+	    Name4 = list_to_atom(Name1),
+	    {ok,Fd4} = ?FILE_MODULE:open(Name4,read),
+	    ok = ?FILE_MODULE:close(Fd4)
+    end,
 
     %% Try some path names
-    ?line Path1 = RootDir,
-    ?line Path2 = [RootDir],
-    ?line Path3 = ['',[],[RootDir,[[]]]],
-    ?line {ok,Fd11,_} = ?FILE_MODULE:path_open([Path1],FileName,read),
-    ?line ok = ?FILE_MODULE:close(Fd11),
-    ?line {ok,Fd12,_} = ?FILE_MODULE:path_open([Path2],FileName,read),
-    ?line ok = ?FILE_MODULE:close(Fd12),
-    ?line {ok,Fd13,_} = ?FILE_MODULE:path_open([Path3],FileName,read),
-    ?line ok = ?FILE_MODULE:close(Fd13),
-	case length(Path1) > 255 of
-		true->
-			io:format("Path too long for an atom:\n\n~p\n", [Path1]);
-		false ->
-			Path4 = list_to_atom(Path1),
-			{ok,Fd14,_} = ?FILE_MODULE:path_open([Path4],FileName,read),
-			ok = ?FILE_MODULE:close(Fd14)
-	end,
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    Path1 = RootDir,
+    Path2 = [RootDir],
+    Path3 = ['',[],[RootDir,[[]]]],
+    {ok,Fd11,_} = ?FILE_MODULE:path_open([Path1],FileName,read),
+    ok = ?FILE_MODULE:close(Fd11),
+    {ok,Fd12,_} = ?FILE_MODULE:path_open([Path2],FileName,read),
+    ok = ?FILE_MODULE:close(Fd12),
+    {ok,Fd13,_} = ?FILE_MODULE:path_open([Path3],FileName,read),
+    ok = ?FILE_MODULE:close(Fd13),
+    case length(Path1) > 255 of
+	true->
+	    io:format("Path too long for an atom:\n\n~p\n", [Path1]);
+	false ->
+	    Path4 = list_to_atom(Path1),
+	    {ok,Fd14,_} = ?FILE_MODULE:path_open([Path4],FileName,read),
+	    ok = ?FILE_MODULE:close(Fd14)
+    end,
+    [] = flush(),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-e_delete(suite) -> [];
-e_delete(doc) -> [];
 e_delete(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line Base = filename:join(RootDir, 
-			       atom_to_list(?MODULE)++"_e_delete"),
-    ?line ok = ?FILE_MODULE:make_dir(Base),
+    RootDir = proplists:get_value(priv_dir, Config),
+    Base = filename:join(RootDir,
+			 atom_to_list(?MODULE)++"_e_delete"),
+    ok = ?FILE_MODULE:make_dir(Base),
 
     %% Delete a non-existing file.
-    ?line {error, enoent} = 
+    {error, enoent} =
 	?FILE_MODULE:delete(filename:join(Base, "non_existing")),
 
     %% Delete a directory.
-    ?line {error, eperm} = ?FILE_MODULE:delete(Base),
+    {error, eperm} = ?FILE_MODULE:delete(Base),
 
     %% Use a path-name with a non-directory component.
-    ?line Afile = filename:join(Base, "a_file"),
-    ?line ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
-    ?line {error, E} = 
+    Afile = filename:join(Base, "a_file"),
+    ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
+    {error, E} =
 	expect({error, enotdir}, {error, enoent}, 
 	       ?FILE_MODULE:delete(filename:join(Afile, "another_file"))),
-    ?line io:format("Result: ~p~n", [E]),
+    io:format("Result: ~p~n", [E]),
 
     %% No permission.
-    ?line case os:type() of
-		{win32, _} ->
-		  %% Remove a character device.
-		  ?line {error, eacces} = ?FILE_MODULE:delete("nul");
-		_ ->
-		  ?line ?FILE_MODULE:write_file_info(
-			   Base, #file_info {mode=0}),
-		  ?line {error, eacces} = ?FILE_MODULE:delete(Afile),
-		  ?line ?FILE_MODULE:write_file_info(
-			   Base, #file_info {mode=8#600})
-	  end,
+    case os:type() of
+	{win32, _} ->
+	    %% Remove a character device.
+	    {error, eacces} = ?FILE_MODULE:delete("nul");
+	_ ->
+	    ?FILE_MODULE:write_file_info(
+	       Base, #file_info {mode=0}),
+	    {error, eacces} = ?FILE_MODULE:delete(Afile),
+	    ?FILE_MODULE:write_file_info(
+	       Base, #file_info {mode=8#600})
+    end,
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 %%% FreeBSD gives EEXIST when renaming a file to an empty dir, although the
@@ -2278,13 +2111,10 @@ e_delete(Config) when is_list(Config) ->
 %%% (What about FreeBSD? We store our nightly build results on a FreeBSD
 %%% file system, that's what.)
 
-e_rename(suite) -> [];
-e_rename(doc) -> [];
 e_rename(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
-    RootDir = ?config(priv_dir, Config),
+    RootDir = proplists:get_value(priv_dir, Config),
     Base = filename:join(RootDir,
-	atom_to_list(?MODULE)++"_e_rename"),
+			 atom_to_list(?MODULE)++"_e_rename"),
     ok = ?FILE_MODULE:make_dir(Base),
 
     %% Create an empty directory.
@@ -2295,15 +2125,15 @@ e_rename(Config) when is_list(Config) ->
     NonEmptyDir = filename:join(Base, "non_empty_dir"),
     ok = ?FILE_MODULE:make_dir(NonEmptyDir),
     ok = ?FILE_MODULE:write_file(
-	filename:join(NonEmptyDir, "a_file"),
-	"hello\n"),
+	    filename:join(NonEmptyDir, "a_file"),
+	    "hello\n"),
 
     %% Create another non-empty directory.
     ADirectory = filename:join(Base, "a_directory"),
     ok = ?FILE_MODULE:make_dir(ADirectory),
     ok = ?FILE_MODULE:write_file(
-	filename:join(ADirectory, "a_file"),
-	"howdy\n\n"),
+	    filename:join(ADirectory, "a_file"),
+	    "howdy\n\n"),
 
     %% Create a data file.
     File = filename:join(Base, "just_a_file"),
@@ -2317,15 +2147,15 @@ e_rename(Config) when is_list(Config) ->
 
     %% Move Base into Base/new_name.
     {error, einval} = 
-    ?FILE_MODULE:rename(Base, filename:join(Base, "new_name")),
+	?FILE_MODULE:rename(Base, filename:join(Base, "new_name")),
 
     %% Overwrite a directory with a file.
     expect({error, eexist}, %FreeBSD (?)
-	{error, eisdir},
-	?FILE_MODULE:rename(File, EmptyDir)),
+	   {error, eisdir},
+	   ?FILE_MODULE:rename(File, EmptyDir)),
     expect({error, eexist}, %FreeBSD (?)
-	{error, eisdir},
-	?FILE_MODULE:rename(File, NonEmptyDir)),
+	   {error, eisdir},
+	   ?FILE_MODULE:rename(File, NonEmptyDir)),
 
     %% Move a non-existing file.
     NonExistingFile = filename:join(Base, "non_existing_file"),
@@ -2333,8 +2163,8 @@ e_rename(Config) when is_list(Config) ->
 
     %% Overwrite a file with a directory.
     expect({error, eexist}, %FreeBSD (?)
-	{error, enotdir},
-	?FILE_MODULE:rename(ADirectory, File)),
+	   {error, enotdir},
+	   ?FILE_MODULE:rename(ADirectory, File)),
 
     %% Move a file to another filesystem.
     %% XXX - This test case is bogus. We cannot be guaranteed that
@@ -2343,49 +2173,42 @@ e_rename(Config) when is_list(Config) ->
     %%
     %% XXX - Gross hack!
     Comment = case os:type() of
-	{unix, _} ->
-	    OtherFs = "/tmp",
-	    NameOnOtherFs = filename:join(OtherFs, filename:basename(File)),
-	    {ok, Com} = case ?FILE_MODULE:rename(File, NameOnOtherFs) of
-		{error, exdev} ->
-		    %% The file could be in 
-		    %% the same filesystem!
-		    {ok, ok};
-		ok ->
-		    {ok, {comment, 
-			    "Moving between filesystems "
-			    "suceeded, files are probably "
-			    "in the same filesystem!"}};
-		{error, eperm} ->
-		    {ok, {comment, "SBS! You don't "
-			    "have the permission to do "
-			    "this test!"}};
-		Else ->
-		    Else
-	    end,
-	    Com;
-	{win32, _} ->
-	    %% At least Windows NT can 
-	    %% successfully move a file to
-	    %% another drive.
-	    ok;
-	{ose, _} ->
-	    %% disabled for now
-	    ok
-    end,
+		  {unix, _} ->
+		      OtherFs = "/tmp",
+		      NameOnOtherFs = filename:join(OtherFs, filename:basename(File)),
+		      {ok, Com} = case ?FILE_MODULE:rename(File, NameOnOtherFs) of
+				      {error, exdev} ->
+					  %% The file could be in
+					  %% the same filesystem!
+					  {ok, ok};
+				      ok ->
+					  {ok, {comment,
+						"Moving between filesystems "
+						"suceeded, files are probably "
+						"in the same filesystem!"}};
+				      {error, eperm} ->
+					  {ok, {comment, "SBS! You don't "
+						"have the permission to do "
+						"this test!"}};
+				      Else ->
+					  Else
+				  end,
+		      Com;
+		  {win32, _} ->
+		      %% At least Windows NT can
+		      %% successfully move a file to
+		      %% another drive.
+		      ok
+	      end,
     [] = flush(),
-    test_server:timetrap_cancel(Dog),
     Comment.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-e_make_dir(suite) -> [];
-e_make_dir(doc) -> [];
 e_make_dir(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
-    RootDir = ?config(priv_dir, Config),
+    RootDir = proplists:get_value(priv_dir, Config),
     Base = filename:join(RootDir, 
-          	       atom_to_list(?MODULE)++"_e_make_dir"),
+			 atom_to_list(?MODULE)++"_e_make_dir"),
     ok = ?FILE_MODULE:make_dir(Base),
 
     %% A component of the path does not exist.
@@ -2408,18 +2231,14 @@ e_make_dir(Config) when is_list(Config) ->
 	    ?FILE_MODULE:write_file_info(Base, #file_info {mode=0}),
 	    {error, eacces} = ?FILE_MODULE:make_dir(filename:join(Base, "xxxx")),
 	    ?FILE_MODULE:write_file_info(
-		     Base, #file_info {mode=8#600})
+	       Base, #file_info {mode=8#600})
     end,
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-e_del_dir(suite) -> [];
-e_del_dir(doc) -> [];
 e_del_dir(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(10)),
-    RootDir = ?config(priv_dir, Config),
+    RootDir = proplists:get_value(priv_dir, Config),
     Base = test_server:temp_name(filename:join(RootDir, "e_del_dir")),
     io:format("Base: ~p", [Base]),
     ok = ?FILE_MODULE:make_dir(Base),
@@ -2432,21 +2251,21 @@ e_del_dir(Config) when is_list(Config) ->
     Afile = filename:join(Base, "a_directory"),
     ok = ?FILE_MODULE:write_file(Afile, "hello\n"),
     {error, E1} = expect({error, enotdir}, {error, enoent},
-	?FILE_MODULE:del_dir(
-	    filename:join(Afile, "another_directory"))),
+			 ?FILE_MODULE:del_dir(
+			    filename:join(Afile, "another_directory"))),
     io:format("Result: ~p", [E1]),
 
     %% Delete a non-empty directory.
     {error, E2} = expect({error, enotempty}, {error, eexist}, {error, eacces},
-	       ?FILE_MODULE:del_dir(Base)),
+			 ?FILE_MODULE:del_dir(Base)),
     io:format("Result: ~p", [E2]),
 
     %% Remove the current directory.
     {error, E3} = expect({error, einval}, 
-	       {error, eperm}, % Linux and DUX
-	       {error, eacces},
-	       {error, ebusy},
-	       ?FILE_MODULE:del_dir(".")),
+			 {error, eperm}, % Linux and DUX
+			 {error, eacces},
+			 {error, ebusy},
+			 ?FILE_MODULE:del_dir(".")),
     io:format("Result: ~p", [E3]),
 
     %% No permission.
@@ -2461,7 +2280,6 @@ e_del_dir(Config) when is_list(Config) ->
 	    ?FILE_MODULE:write_file_info( Base, #file_info {mode=8#600})
     end,
     [] = flush(),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2470,35 +2288,35 @@ e_del_dir(Config) when is_list(Config) ->
 %% Trying reading and positioning from a compressed file.
 
 read_compressed_cooked(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line Real = filename:join(Data, "realmen.html.gz"),
-    ?line {ok, Fd} = ?FILE_MODULE:open(Real, [read,compressed]),
-    ?line try_read_file_list(Fd).
+    Data = proplists:get_value(data_dir, Config),
+    Real = filename:join(Data, "realmen.html.gz"),
+    {ok, Fd} = ?FILE_MODULE:open(Real, [read,compressed]),
+    try_read_file_list(Fd).
 
 read_compressed_cooked_binary(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line Real = filename:join(Data, "realmen.html.gz"),
-    ?line {ok, Fd} = ?FILE_MODULE:open(Real, [read,compressed,binary]),
-    ?line try_read_file_binary(Fd).
+    Data = proplists:get_value(data_dir, Config),
+    Real = filename:join(Data, "realmen.html.gz"),
+    {ok, Fd} = ?FILE_MODULE:open(Real, [read,compressed,binary]),
+    try_read_file_binary(Fd).
 
 %% Trying reading and positioning from an uncompressed file,
 %% but with the compressed flag given.
 
 read_not_really_compressed(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line Priv = ?config(priv_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
+    Priv = proplists:get_value(priv_dir, Config),
 
     %% The file realmen.html might have got CRs added (by WinZip).
     %% Remove them, or the file positions will not be correct.
 
-    ?line Real = filename:join(Data, "realmen.html"),
-    ?line RealPriv = filename:join(Priv, 
-				   atom_to_list(?MODULE)++"_realmen.html"),
-    ?line {ok, RealDataBin} = ?FILE_MODULE:read_file(Real),
-    ?line RealData = remove_crs(binary_to_list(RealDataBin), []),
-    ?line ok = ?FILE_MODULE:write_file(RealPriv, RealData),
-    ?line {ok, Fd} = ?FILE_MODULE:open(RealPriv, [read, compressed]),
-    ?line try_read_file_list(Fd).
+    Real = filename:join(Data, "realmen.html"),
+    RealPriv = filename:join(Priv,
+			     atom_to_list(?MODULE)++"_realmen.html"),
+    {ok, RealDataBin} = ?FILE_MODULE:read_file(Real),
+    RealData = remove_crs(binary_to_list(RealDataBin), []),
+    ok = ?FILE_MODULE:write_file(RealPriv, RealData),
+    {ok, Fd} = ?FILE_MODULE:open(RealPriv, [read, compressed]),
+    try_read_file_list(Fd).
 
 remove_crs([$\r|Rest], Result) ->
     remove_crs(Rest, Result);
@@ -2508,146 +2326,134 @@ remove_crs([], Result) ->
     lists:reverse(Result).
 
 try_read_file_list(Fd) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-
     %% Seek to the current position (nothing should happen).
 
-    ?line {ok, 0} = ?FILE_MODULE:position(Fd, 0),
-    ?line {ok, 0} = ?FILE_MODULE:position(Fd, {cur, 0}),
+    {ok, 0} = ?FILE_MODULE:position(Fd, 0),
+    {ok, 0} = ?FILE_MODULE:position(Fd, {cur, 0}),
 
     %% Read a few lines from a compressed file.
 
-    ?line ShouldBe = "<TITLE>Real Programmers Don't Use PASCAL</TITLE>\n",
-    ?line ShouldBe = io:get_line(Fd, ''),
+    ShouldBe = "<TITLE>Real Programmers Don't Use PASCAL</TITLE>\n",
+    ShouldBe = io:get_line(Fd, ''),
 
     %% Now seek forward.
 
-    ?line {ok, 381} = ?FILE_MODULE:position(Fd, 381),
-    ?line Back = "Back in the good old days -- the \"Golden Era\" " ++
+    {ok, 381} = ?FILE_MODULE:position(Fd, 381),
+    Back = "Back in the good old days -- the \"Golden Era\" " ++
 	"of computers, it was\n",
-    ?line Back = io:get_line(Fd, ''),
+    Back = io:get_line(Fd, ''),
 
     %% Try to search forward relative to the current position.
 
-    ?line {ok, CurPos} = ?FILE_MODULE:position(Fd, {cur, 0}),
-    ?line RealPos = 4273,
-    ?line {ok, RealPos} = ?FILE_MODULE:position(Fd, {cur, RealPos-CurPos}),
-    ?line RealProg = "<LI> Real Programmers aren't afraid to use GOTOs.\n",
-    ?line RealProg = io:get_line(Fd, ''),
+    {ok, CurPos} = ?FILE_MODULE:position(Fd, {cur, 0}),
+    RealPos = 4273,
+    {ok, RealPos} = ?FILE_MODULE:position(Fd, {cur, RealPos-CurPos}),
+    RealProg = "<LI> Real Programmers aren't afraid to use GOTOs.\n",
+    RealProg = io:get_line(Fd, ''),
 
     %% Seek backward.
 
-    ?line AfterTitle = length("<TITLE>"),
-    ?line {ok, AfterTitle} = ?FILE_MODULE:position(Fd, AfterTitle),
-    ?line Title = "Real Programmers Don't Use PASCAL</TITLE>\n",
-    ?line Title = io:get_line(Fd, ''),
+    AfterTitle = length("<TITLE>"),
+    {ok, AfterTitle} = ?FILE_MODULE:position(Fd, AfterTitle),
+    Title = "Real Programmers Don't Use PASCAL</TITLE>\n",
+    Title = io:get_line(Fd, ''),
 
     %% Seek past the end of the file.
 
-    ?line {ok, _} = ?FILE_MODULE:position(Fd, 25000),
+    {ok, _} = ?FILE_MODULE:position(Fd, 25000),
 
     %% Done.
 
-    ?line ?FILE_MODULE:close(Fd),
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    ?FILE_MODULE:close(Fd),
+    [] = flush(),
     ok.
 
 try_read_file_binary(Fd) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-
     %% Seek to the current position (nothing should happen).
 
-    ?line {ok, 0} = ?FILE_MODULE:position(Fd, 0),
-    ?line {ok, 0} = ?FILE_MODULE:position(Fd, {cur, 0}),
+    {ok, 0} = ?FILE_MODULE:position(Fd, 0),
+    {ok, 0} = ?FILE_MODULE:position(Fd, {cur, 0}),
 
     %% Read a few lines from a compressed file.
 
-    ?line ShouldBe = <<"<TITLE>Real Programmers Don't Use PASCAL</TITLE>\n">>,
-    ?line ShouldBe = io:get_line(Fd, ''),
+    ShouldBe = <<"<TITLE>Real Programmers Don't Use PASCAL</TITLE>\n">>,
+    ShouldBe = io:get_line(Fd, ''),
 
     %% Now seek forward.
 
-    ?line {ok, 381} = ?FILE_MODULE:position(Fd, 381),
-    ?line Back = <<"Back in the good old days -- the \"Golden Era\" "
-		  "of computers, it was\n">>,
-    ?line Back = io:get_line(Fd, ''),
+    {ok, 381} = ?FILE_MODULE:position(Fd, 381),
+    Back = <<"Back in the good old days -- the \"Golden Era\" "
+	     "of computers, it was\n">>,
+    Back = io:get_line(Fd, ''),
 
     %% Try to search forward relative to the current position.
 
-    ?line {ok, CurPos} = ?FILE_MODULE:position(Fd, {cur, 0}),
-    ?line RealPos = 4273,
-    ?line {ok, RealPos} = ?FILE_MODULE:position(Fd, {cur, RealPos-CurPos}),
-    ?line RealProg = <<"<LI> Real Programmers aren't afraid to use GOTOs.\n">>,
-    ?line RealProg = io:get_line(Fd, ''),
+    {ok, CurPos} = ?FILE_MODULE:position(Fd, {cur, 0}),
+    RealPos = 4273,
+    {ok, RealPos} = ?FILE_MODULE:position(Fd, {cur, RealPos-CurPos}),
+    RealProg = <<"<LI> Real Programmers aren't afraid to use GOTOs.\n">>,
+    RealProg = io:get_line(Fd, ''),
 
     %% Seek backward.
 
-    ?line AfterTitle = length("<TITLE>"),
-    ?line {ok, AfterTitle} = ?FILE_MODULE:position(Fd, AfterTitle),
-    ?line Title = <<"Real Programmers Don't Use PASCAL</TITLE>\n">>,
-    ?line Title = io:get_line(Fd, ''),
+    AfterTitle = length("<TITLE>"),
+    {ok, AfterTitle} = ?FILE_MODULE:position(Fd, AfterTitle),
+    Title = <<"Real Programmers Don't Use PASCAL</TITLE>\n">>,
+    Title = io:get_line(Fd, ''),
 
     %% Done.
 
-    ?line ?FILE_MODULE:close(Fd),
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    ?FILE_MODULE:close(Fd),
+    [] = flush(),
     ok.
 
 read_cooked_tar_problem(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
+    Data = proplists:get_value(data_dir, Config),
+    ProblemFile = filename:join(Data, "cooked_tar_problem.tar.gz"),
+    {ok,Fd} = ?FILE_MODULE:open(ProblemFile, [read,compressed,binary]),
+
+    {ok,34304} = file:position(Fd, 34304),
+    {ok,Bin} = file:read(Fd, 512),
+    512 = byte_size(Bin),
 
-    ?line Data = ?config(data_dir, Config),
-    ?line ProblemFile = filename:join(Data, "cooked_tar_problem.tar.gz"),
-    ?line {ok,Fd} = ?FILE_MODULE:open(ProblemFile, [read,compressed,binary]),
+    {ok,34304+512+1024} = file:position(Fd, {cur,1024}),
 
-    ?line {ok,34304} = file:position(Fd, 34304),
-    ?line {ok,Bin} = file:read(Fd, 512),
-    ?line 512 = byte_size(Bin),
-    
-    ?line {ok,34304+512+1024} = file:position(Fd, {cur,1024}),
-    
-    ?line ok = file:close(Fd),
+    ok = file:close(Fd),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-write_compressed(suite) -> [];
-write_compressed(doc) -> [];
 write_compressed(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Priv = ?config(priv_dir, Config),
-    ?line MyFile = filename:join(Priv, 
-				 atom_to_list(?MODULE)++"_test.gz"),
+    Priv = proplists:get_value(priv_dir, Config),
+    MyFile = filename:join(Priv,
+			   atom_to_list(?MODULE)++"_test.gz"),
 
     %% Write a file.
 
-    ?line {ok, Fd} = ?FILE_MODULE:open(MyFile, [write, compressed]),
-    ?line {ok, 0} = ?FILE_MODULE:position(Fd, 0),
-    ?line Prefix = "hello\n",
-    ?line End = "end\n",
-    ?line ok = io:put_chars(Fd, Prefix),
-    ?line {ok, 143} = ?FILE_MODULE:position(Fd, 143),
-    ?line ok = io:put_chars(Fd, End),
-    ?line ok = ?FILE_MODULE:close(Fd),
+    {ok, Fd} = ?FILE_MODULE:open(MyFile, [write, compressed]),
+    {ok, 0} = ?FILE_MODULE:position(Fd, 0),
+    Prefix = "hello\n",
+    End = "end\n",
+    ok = io:put_chars(Fd, Prefix),
+    {ok, 143} = ?FILE_MODULE:position(Fd, 143),
+    ok = io:put_chars(Fd, End),
+    ok = ?FILE_MODULE:close(Fd),
 
     %% Read the file and verify the contents.
 
-    ?line {ok, Fd1} = ?FILE_MODULE:open(MyFile, [read, compressed]),
-    ?line Prefix = io:get_line(Fd1, ''),
-    ?line Second = lists:duplicate(143-length(Prefix), 0) ++ End,
-    ?line Second = io:get_line(Fd1, ''),
-    ?line ok = ?FILE_MODULE:close(Fd1),
+    {ok, Fd1} = ?FILE_MODULE:open(MyFile, [read, compressed]),
+    Prefix = io:get_line(Fd1, ''),
+    Second = lists:duplicate(143-length(Prefix), 0) ++ End,
+    Second = io:get_line(Fd1, ''),
+    ok = ?FILE_MODULE:close(Fd1),
 
     %% Verify successful compression by uncompressing the file
     %% using zlib:gunzip/1.
 
-    ?line {ok,Contents} = file:read_file(MyFile),
-    ?line <<"hello\n",0:137/unit:8,"end\n">> = zlib:gunzip(Contents),
+    {ok,Contents} = file:read_file(MyFile),
+    <<"hello\n",0:137/unit:8,"end\n">> = zlib:gunzip(Contents),
 
     %% Ensure that the file is compressed.
 
@@ -2656,99 +2462,92 @@ write_compressed(Config) when is_list(Config) ->
 	{ok, #file_info{size=Size}} when Size < TotalSize ->
 	    ok;
 	{ok, #file_info{size=Size}} when Size == TotalSize ->
-	    test_server:fail(file_not_compressed)
+	    ct:fail(file_not_compressed)
     end,
 
     %% Write again to ensure that the file is truncated.
 
-    ?line {ok, Fd2} = ?FILE_MODULE:open(MyFile, [write, compressed]),
-    ?line NewString = "aaaaaaaaaaa",
-    ?line ok = io:put_chars(Fd2, NewString),
-    ?line ok = ?FILE_MODULE:close(Fd2),
-    ?line {ok, Fd3} = ?FILE_MODULE:open(MyFile, [read, compressed]),
-    ?line {ok, NewString} = ?FILE_MODULE:read(Fd3, 1024),
-    ?line ok = ?FILE_MODULE:close(Fd3),
+    {ok, Fd2} = ?FILE_MODULE:open(MyFile, [write, compressed]),
+    NewString = "aaaaaaaaaaa",
+    ok = io:put_chars(Fd2, NewString),
+    ok = ?FILE_MODULE:close(Fd2),
+    {ok, Fd3} = ?FILE_MODULE:open(MyFile, [read, compressed]),
+    {ok, NewString} = ?FILE_MODULE:read(Fd3, 1024),
+    ok = ?FILE_MODULE:close(Fd3),
 
     %% Done.
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 catenated_gzips(Config) when is_list(Config) ->
-    ?line Priv = ?config(priv_dir, Config),
-    ?line MyFile = filename:join(Priv, ?MODULE_STRING++"_test.gz"),
+    Priv = proplists:get_value(priv_dir, Config),
+    MyFile = filename:join(Priv, ?MODULE_STRING++"_test.gz"),
 
     First = "Hello, all good men going to search parties. ",
     Second = "Now I really need your help.",
     All = iolist_to_binary([First|Second]),
-    ?line Cat = [zlib:gzip(First),zlib:gzip(Second)],
-    
-    ?line ok = file:write_file(MyFile, Cat),
+    Cat = [zlib:gzip(First),zlib:gzip(Second)],
 
-    ?line {ok,Fd} = file:open(MyFile, [read,compressed,binary]),
-    ?line {ok,All} = file:read(Fd, 100000),
-    ?line ok = file:close(Fd),
+    ok = file:write_file(MyFile, Cat),
+
+    {ok,Fd} = file:open(MyFile, [read,compressed,binary]),
+    {ok,All} = file:read(Fd, 100000),
+    ok = file:close(Fd),
 
     ok.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-compress_errors(suite) -> [];
-compress_errors(doc) -> [];
 compress_errors(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line DataDir = 
+    DataDir =
 	filename:dirname(
-	  filename:join(?config(data_dir, Config), "x")),
-    ?line DataDirSlash = DataDir++"/",
-    ?line {error, enoent} = ?FILE_MODULE:open("non_existing__",
-					      [compressed, read]),
-    ?line {error, einval} = ?FILE_MODULE:open("non_existing__",
-					      [compressed, read, write]),
-    ?line {error, einval} = ?FILE_MODULE:open("non_existing__",
-					      [compressed, read, append]),
-    ?line {error, einval} = ?FILE_MODULE:open("non_existing__",
-					      [compressed, write, append]),
-    ?line {error, E1} = ?FILE_MODULE:open(DataDir, [compressed, read]),
-    ?line {error, E2} = ?FILE_MODULE:open(DataDirSlash, [compressed, read]),
-    ?line {error, E3} = ?FILE_MODULE:open(DataDir, [compressed, write]),
-    ?line {error, E4} = ?FILE_MODULE:open(DataDirSlash, [compressed, write]),
-    ?line {eisdir,eisdir,eisdir,eisdir} = {E1,E2,E3,E4},
+	  filename:join(proplists:get_value(data_dir, Config), "x")),
+    DataDirSlash = DataDir++"/",
+    {error, enoent} = ?FILE_MODULE:open("non_existing__",
+					[compressed, read]),
+    {error, einval} = ?FILE_MODULE:open("non_existing__",
+					[compressed, read, write]),
+    {error, einval} = ?FILE_MODULE:open("non_existing__",
+					[compressed, read, append]),
+    {error, einval} = ?FILE_MODULE:open("non_existing__",
+					[compressed, write, append]),
+    {error, E1} = ?FILE_MODULE:open(DataDir, [compressed, read]),
+    {error, E2} = ?FILE_MODULE:open(DataDirSlash, [compressed, read]),
+    {error, E3} = ?FILE_MODULE:open(DataDir, [compressed, write]),
+    {error, E4} = ?FILE_MODULE:open(DataDirSlash, [compressed, write]),
+    {eisdir,eisdir,eisdir,eisdir} = {E1,E2,E3,E4},
 
     %% Read a corrupted .gz file.
 
-    ?line Corrupted = filename:join(DataDir, "corrupted.gz"),
-    ?line {ok, Fd} = ?FILE_MODULE:open(Corrupted, [read, compressed]),
-    ?line {error, eio} = ?FILE_MODULE:read(Fd, 100),
-    ?line ?FILE_MODULE:close(Fd),
+    Corrupted = filename:join(DataDir, "corrupted.gz"),
+    {ok, Fd} = ?FILE_MODULE:open(Corrupted, [read, compressed]),
+    {error, eio} = ?FILE_MODULE:read(Fd, 100),
+    ?FILE_MODULE:close(Fd),
 
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-compress_async_crash(suite) -> [];
-compress_async_crash(doc) -> [];
 compress_async_crash(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line Path = filename:join(DataDir, "test.gz"),
+    DataDir = proplists:get_value(data_dir, Config),
+    Path = filename:join(DataDir, "test.gz"),
     ExpectedData = <<"qwerty">>,
 
-    ?line _ = ?FILE_MODULE:delete(Path),
-    ?line {ok, Fd} = ?FILE_MODULE:open(Path, [write, binary, compressed]),
-    ?line ok = ?FILE_MODULE:write(Fd, ExpectedData),
-    ?line ok = ?FILE_MODULE:close(Fd),
+    _ = ?FILE_MODULE:delete(Path),
+    {ok, Fd} = ?FILE_MODULE:open(Path, [write, binary, compressed]),
+    ok = ?FILE_MODULE:write(Fd, ExpectedData),
+    ok = ?FILE_MODULE:close(Fd),
 
-    % Test that when using async thread pool, the emulator doesn't crash
-    % when the efile port driver is stopped while a compressed file operation
-    % is in progress (being carried by an async thread).
-    ?line ok = compress_async_crash_loop(10000, Path, ExpectedData),
-    ?line ok = ?FILE_MODULE:delete(Path),
+    %% Test that when using async thread pool, the emulator doesn't crash
+    %% when the efile port driver is stopped while a compressed file operation
+    %% is in progress (being carried by an async thread).
+    ok = compress_async_crash_loop(10000, Path, ExpectedData),
+    ok = ?FILE_MODULE:delete(Path),
     ok.
 
 compress_async_crash_loop(0, _Path, _ExpectedData) ->
@@ -2756,35 +2555,35 @@ compress_async_crash_loop(0, _Path, _ExpectedData) ->
 compress_async_crash_loop(N, Path, ExpectedData) ->
     Parent = self(),
     {Pid, Ref} = spawn_monitor(
-            fun() ->
-                    ?line {ok, Fd} = ?FILE_MODULE:open(
-                                        Path, [read, compressed, raw, binary]),
-                    Len = byte_size(ExpectedData),
-                    Parent ! {self(), continue},
-                    ?line {ok, ExpectedData} = ?FILE_MODULE:read(Fd, Len),
-                    ?line ok = ?FILE_MODULE:close(Fd),
-                    receive foobar -> ok end
-            end),
+		   fun() ->
+			   {ok, Fd} = ?FILE_MODULE:open(
+					 Path, [read, compressed, raw, binary]),
+			   Len = byte_size(ExpectedData),
+			   Parent ! {self(), continue},
+			   {ok, ExpectedData} = ?FILE_MODULE:read(Fd, Len),
+			   ok = ?FILE_MODULE:close(Fd),
+			   receive foobar -> ok end
+		   end),
     receive
         {Pid, continue} ->
             exit(Pid, shutdown),
             receive
                 {'DOWN', Ref, _, _, Reason} ->
-                    ?line shutdown = Reason
+                    shutdown = Reason
             end;
         {'DOWN', Ref, _, _, Reason2} ->
-            test_server:fail({worker_exited, Reason2})
+            ct:fail({worker_exited, Reason2})
     after 60000 ->
             exit(Pid, shutdown),
             erlang:demonitor(Ref, [flush]),
-            test_server:fail(worker_timeout)
+            ct:fail(worker_timeout)
     end,
     compress_async_crash_loop(N - 1, Path, ExpectedData).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 unicode(Config) when is_list(Config) ->
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     Name = filename:join(Dir, "data-utf8.txt"),
     Txt = lists:seq(128, 255),
     D = unicode:characters_to_binary(Txt, latin1, latin1),
@@ -2817,53 +2616,46 @@ unicode(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-altname(doc) ->
-    "Test the file:altname/1 function";
-altname(suite) ->
-    [];
+%% Test the file:altname/1 function.
 altname(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 "long alternative path name with spaces"),
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
-    ?line Name = filename:join(NewDir, "a_file_with_long_name"),
-    ?line ShortName = filename:join(NewDir, "short"),
-    ?line NonexName = filename:join(NewDir, "nonexistent"),
-    ?line ok = ?FILE_MODULE:write_file(Name, "some contents\n"),
-    ?line ok = ?FILE_MODULE:write_file(ShortName, "some contents\n"),
-    ?line Result = 
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   "long alternative path name with spaces"),
+    ok = ?FILE_MODULE:make_dir(NewDir),
+    Name = filename:join(NewDir, "a_file_with_long_name"),
+    ShortName = filename:join(NewDir, "short"),
+    NonexName = filename:join(NewDir, "nonexistent"),
+    ok = ?FILE_MODULE:write_file(Name, "some contents\n"),
+    ok = ?FILE_MODULE:write_file(ShortName, "some contents\n"),
+    Result =
 	case ?FILE_MODULE:altname(NewDir) of
 	    {error, enotsup} ->
 		{skipped, "Altname not supported on this platform"};
 	    {ok, "LONGAL~1"} -> 
-		?line {ok, "A_FILE~1"} = ?FILE_MODULE:altname(Name),
-		?line {ok, "C:/"} = ?FILE_MODULE:altname("C:/"),
-		?line {ok, "C:\\"} = ?FILE_MODULE:altname("C:\\"),
-		?line {error,enoent} = ?FILE_MODULE:altname(NonexName),
-		?line {ok, "short"} = ?FILE_MODULE:altname(ShortName),
+		{ok, "A_FILE~1"} = ?FILE_MODULE:altname(Name),
+		{ok, "C:/"} = ?FILE_MODULE:altname("C:/"),
+		{ok, "C:\\"} = ?FILE_MODULE:altname("C:\\"),
+		{error,enoent} = ?FILE_MODULE:altname(NonexName),
+		{ok, "short"} = ?FILE_MODULE:altname(ShortName),
 		ok
 	end,
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    [] = flush(),
     Result.
 
 
-make_link(doc) -> "Test creating a hard link.";
-make_link(suite) -> [];
+%% Test creating a hard link.
 make_link(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_make_link"),
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
-    
-    ?line Name = filename:join(NewDir, "a_file"),
-    ?line ok = ?FILE_MODULE:write_file(Name, "some contents\n"),
-    
-    ?line Alias = filename:join(NewDir, "an_alias"),
-    ?line Result = 
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_make_link"),
+    ok = ?FILE_MODULE:make_dir(NewDir),
+
+    Name = filename:join(NewDir, "a_file"),
+    ok = ?FILE_MODULE:write_file(Name, "some contents\n"),
+
+    Alias = filename:join(NewDir, "an_alias"),
+    Result =
 	case ?FILE_MODULE:make_link(Name, Alias) of
 	    {error, enotsup} ->
 		{skipped, "Links not supported on this platform"};
@@ -2873,53 +2665,45 @@ make_link(Config) when is_list(Config) ->
 		%% which should in behave exactly as 
 		%% ?FILE_MODULE:read_file_info/1
 		%% since they are not used on symbolic links.
-		
-		?line {ok, Info} = ?FILE_MODULE:read_link_info(Name),
+
+		{ok, Info} = ?FILE_MODULE:read_link_info(Name),
                 {ok,Info} = ?FILE_MODULE:read_link_info(Name, [raw]),
-		?line {ok, Info} = ?FILE_MODULE:read_link_info(Alias),
+		{ok, Info} = ?FILE_MODULE:read_link_info(Alias),
                 {ok,Info} = ?FILE_MODULE:read_link_info(Alias, [raw]),
-		?line #file_info{links = 2, type = regular} = Info,
-		?line {error, eexist} = 
+		#file_info{links = 2, type = regular} = Info,
+		{error, eexist} =
 		    ?FILE_MODULE:make_link(Name, Alias),
 		ok
 	end,
-    
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+
+    [] = flush(),
     Result.
 
-read_link_info_for_non_link(doc) ->
-    "Test that reading link info for an ordinary file or directory works "
-	"(on all platforms).";
-read_link_info_for_non_link(suite) -> [];
+%% Test that reading link info for an ordinary file or directory works
+%% (on all platforms).
 read_link_info_for_non_link(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-
-    ?line {ok, #file_info{type=directory}} = 
+    {ok, #file_info{type=directory}} =
 	?FILE_MODULE:read_link_info("."),
     {ok, #file_info{type=directory}} = ?FILE_MODULE:read_link_info(".", [raw]),
-		  
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+
+    [] = flush(),
     ok.
 
-symlinks(doc) -> "Test operations on symbolic links (for Unix).";
-symlinks(suite) -> [];
+%% Test operations on symbolic links (for Unix).
 symlinks(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line {error, _} = ?FILE_MODULE:read_link(lists:duplicate(10000,$a)),
+    {error, _} = ?FILE_MODULE:read_link(lists:duplicate(10000,$a)),
     {error, _} = ?FILE_MODULE:read_link_all(lists:duplicate(10000,$a)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_symlinks"),
-    ?line ok = ?FILE_MODULE:make_dir(NewDir),
-    
-    ?line Name = filename:join(NewDir, "a_plain_file"),
-    ?line ok = ?FILE_MODULE:write_file(Name, "some stupid content\n"),
-    
-    ?line Alias = filename:join(NewDir, "a_symlink_alias"),
-    ?line Result = 
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_symlinks"),
+    ok = ?FILE_MODULE:make_dir(NewDir),
+
+    Name = filename:join(NewDir, "a_plain_file"),
+    ok = ?FILE_MODULE:write_file(Name, "some stupid content\n"),
+
+    Alias = filename:join(NewDir, "a_symlink_alias"),
+    Result =
 	case ?FILE_MODULE:make_symlink(Name, Alias) of
 	    {error, enotsup} ->
 		{skipped, "Links not supported on this platform"};
@@ -2927,41 +2711,37 @@ symlinks(Config) when is_list(Config) ->
 		{win32,_} = os:type(),
 		{skipped, "Windows user not privileged to create symlinks"};
 	    ok ->
-		?line {ok, Info1} = ?FILE_MODULE:read_file_info(Name),
+		{ok, Info1} = ?FILE_MODULE:read_file_info(Name),
                 {ok,Info1} = ?FILE_MODULE:read_file_info(Name, [raw]),
-		?line {ok, Info1} = ?FILE_MODULE:read_file_info(Alias),
+		{ok, Info1} = ?FILE_MODULE:read_file_info(Alias),
                 {ok,Info1} = ?FILE_MODULE:read_file_info(Alias, [raw]),
-		?line {ok, Info1} = ?FILE_MODULE:read_link_info(Name),
+		{ok, Info1} = ?FILE_MODULE:read_link_info(Name),
                 {ok,Info1} = ?FILE_MODULE:read_link_info(Name, [raw]),
-		?line #file_info{links = 1, type = regular} = Info1,
-		
-		?line {ok, Info2} = ?FILE_MODULE:read_link_info(Alias),
+		#file_info{links = 1, type = regular} = Info1,
+
+		{ok, Info2} = ?FILE_MODULE:read_link_info(Alias),
                 {ok,Info2} = ?FILE_MODULE:read_link_info(Alias, [raw]),
-		?line #file_info{links=1, type=symlink} = Info2,
-		?line {ok, Name} = ?FILE_MODULE:read_link(Alias),
+		#file_info{links=1, type=symlink} = Info2,
+		{ok, Name} = ?FILE_MODULE:read_link(Alias),
 		{ok, Name} = ?FILE_MODULE:read_link_all(Alias),
 		%% If all is good, delete dir again (avoid hanging dir on windows)
 		rm_rf(?FILE_MODULE,NewDir),
 		ok
-	  end,
-    
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+	end,
+
+    [] = flush(),
     Result.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-copy(doc) -> [];
-copy(suite) -> [];
 copy(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
+    RootDir = proplists:get_value(priv_dir, Config),
     %% Create a text file.
-    ?line Name1 = filename:join(RootDir, atom_to_list(?MODULE)++"_copy_1.txt"),
-    ?line Line = "The quick brown fox jumps over a lazy dog. 0123456789\n",
-    ?line Len = length(Line),
-    ?line {ok, Handle1} = ?FILE_MODULE:open(Name1, [write]),
-    ?line {_, Size1} = 
+    Name1 = filename:join(RootDir, atom_to_list(?MODULE)++"_copy_1.txt"),
+    Line = "The quick brown fox jumps over a lazy dog. 0123456789\n",
+    Len = length(Line),
+    {ok, Handle1} = ?FILE_MODULE:open(Name1, [write]),
+    {_, Size1} =
 	iterate({0, 0},
 		done,
 		fun({_, S}) when S >= 128*1024 ->
@@ -2971,45 +2751,44 @@ copy(Config) when is_list(Config) ->
 			ok = ?FILE_MODULE:write(Handle1, [H, " ", Line]),
 			{N + 1, S + length(H) + 1 + Len}
 		end),
-    ?line ?FILE_MODULE:close(Handle1),
+    ?FILE_MODULE:close(Handle1),
     %% Make a copy
-    ?line Name2 = filename:join(RootDir, atom_to_list(?MODULE)++"_copy_2.txt"),
-    ?line {ok, Size1} = ?FILE_MODULE:copy(Name1, Name2),
+    Name2 = filename:join(RootDir, atom_to_list(?MODULE)++"_copy_2.txt"),
+    {ok, Size1} = ?FILE_MODULE:copy(Name1, Name2),
     %% Concatenate 1
-    ?line Name3 = filename:join(RootDir, atom_to_list(?MODULE)++"_copy_3.txt"),
-    ?line {ok, Handle3} = ?FILE_MODULE:open(Name3, [raw, write, binary]),
-    ?line {ok, Size1} = ?FILE_MODULE:copy(Name1, Handle3),
-    ?line {ok, Handle2} = ?FILE_MODULE:open(Name2, [read, binary]),
-    ?line {ok, Size1} = ?FILE_MODULE:copy(Handle2, Handle3),
-    ?line ok = ?FILE_MODULE:close(Handle3),
-    ?line ok = ?FILE_MODULE:close(Handle2),
+    Name3 = filename:join(RootDir, atom_to_list(?MODULE)++"_copy_3.txt"),
+    {ok, Handle3} = ?FILE_MODULE:open(Name3, [raw, write, binary]),
+    {ok, Size1} = ?FILE_MODULE:copy(Name1, Handle3),
+    {ok, Handle2} = ?FILE_MODULE:open(Name2, [read, binary]),
+    {ok, Size1} = ?FILE_MODULE:copy(Handle2, Handle3),
+    ok = ?FILE_MODULE:close(Handle3),
+    ok = ?FILE_MODULE:close(Handle2),
     %% Concatenate 2
-    ?line Name4 = filename:join(RootDir, atom_to_list(?MODULE)++"_copy_4.txt"),
-    ?line {ok, Handle4} = ?FILE_MODULE:open(Name4, [write, binary]),
-    ?line {ok, Size1} = ?FILE_MODULE:copy(Name1, Handle4),
-    ?line {ok, Handle5} = ?FILE_MODULE:open(Name2, [raw, read, binary]),
-    ?line {ok, Size1} = ?FILE_MODULE:copy(Handle5, Handle4),
-    ?line ok = ?FILE_MODULE:close(Handle5),
-    ?line ok = ?FILE_MODULE:close(Handle4),
+    Name4 = filename:join(RootDir, atom_to_list(?MODULE)++"_copy_4.txt"),
+    {ok, Handle4} = ?FILE_MODULE:open(Name4, [write, binary]),
+    {ok, Size1} = ?FILE_MODULE:copy(Name1, Handle4),
+    {ok, Handle5} = ?FILE_MODULE:open(Name2, [raw, read, binary]),
+    {ok, Size1} = ?FILE_MODULE:copy(Handle5, Handle4),
+    ok = ?FILE_MODULE:close(Handle5),
+    ok = ?FILE_MODULE:close(Handle4),
     %% %% Just for test of the test
-    %% ?line {ok, Handle2q} = ?FILE_MODULE:open(Name2, [write, append]),
-    %% ?line ok = ?FILE_MODULE:write(Handle2q, "q"),
-    %% ?line ok = ?FILE_MODULE:close(Handle2q),
+    %% {ok, Handle2q} = ?FILE_MODULE:open(Name2, [write, append]),
+    %% ok = ?FILE_MODULE:write(Handle2q, "q"),
+    %% ok = ?FILE_MODULE:close(Handle2q),
     %% Compare the files
-    ?line {ok, Handle1a} = ?FILE_MODULE:open(Name1, [raw, read]),
-    ?line {ok, Handle2a} = ?FILE_MODULE:open(Name2, [raw, read]),
-    ?line true = stream_cmp(fd_stream_factory([Handle1a]), 
-			    fd_stream_factory([Handle2a])),
-    ?line {ok, 0} = ?FILE_MODULE:position(Handle1a, 0),
-    ?line {ok, 0} = ?FILE_MODULE:position(Handle2a, 0),
-    ?line {ok, Handle3a} = ?FILE_MODULE:open(Name3, [raw, read]),
-    ?line true = stream_cmp(fd_stream_factory([Handle1a, Handle2a]), 
-			    fd_stream_factory([Handle2a])),
-    ?line ok = ?FILE_MODULE:close(Handle1a),
-    ?line ok = ?FILE_MODULE:close(Handle2a),
-    ?line ok = ?FILE_MODULE:close(Handle3a),
-    ?line [] = flush(),
-    ?line test_server:timetrap_cancel(Dog),
+    {ok, Handle1a} = ?FILE_MODULE:open(Name1, [raw, read]),
+    {ok, Handle2a} = ?FILE_MODULE:open(Name2, [raw, read]),
+    true = stream_cmp(fd_stream_factory([Handle1a]),
+		      fd_stream_factory([Handle2a])),
+    {ok, 0} = ?FILE_MODULE:position(Handle1a, 0),
+    {ok, 0} = ?FILE_MODULE:position(Handle2a, 0),
+    {ok, Handle3a} = ?FILE_MODULE:open(Name3, [raw, read]),
+    true = stream_cmp(fd_stream_factory([Handle1a, Handle2a]),
+		      fd_stream_factory([Handle2a])),
+    ok = ?FILE_MODULE:close(Handle1a),
+    ok = ?FILE_MODULE:close(Handle2a),
+    ok = ?FILE_MODULE:close(Handle3a),
+    [] = flush(),
     ok.
 
 
@@ -3030,7 +2809,7 @@ fd_stream_factory([Fd | T] = L) ->
 	    end
     end.
 
-		    
+
 
 stream_cmp(F1, F2) when is_function(F1), is_function(F2) ->
     stream_cmp(F1(), F2());
@@ -3055,80 +2834,75 @@ stream_cmp([H | T1], [H | T2]) ->
 
 %% Test the get_cwd(), open(), and copy() file server calls.
 new_slave(_RootDir, Cwd) ->
-    ?line L = "qwertyuiopasdfghjklzxcvbnm",
-    ?line N = length(L),
-    ?line {ok, Cwd}         = ?FILE_MODULE:get_cwd(),
-    ?line {error, enotsup}  = ?FILE_MODULE:get_cwd("C:"), % Unix only testcase
-    ?line {ok, FD1}         = ?FILE_MODULE:open("file1.txt", write),
-    ?line ok                = ?FILE_MODULE:close(FD1),
-    ?line {ok, FD2}         = ?FILE_MODULE:open("file1.txt", 
-						[write, append, 
-						 binary, compressed,
-						 delayed_write,
-						 {delayed_write, 0, 0},
-						 read_ahead,
-						 {read_ahead, 0}]),
-    ?line ok                = ?FILE_MODULE:write(FD2, L),
-    ?line ok                = ?FILE_MODULE:close(FD2),
-    ?line {ok, N2}          = ?FILE_MODULE:copy("file1.txt", "file2.txt"),
-    ?line io:format("Size ~p, compressed ~p.~n", [N, N2]),
-    ?line {ok, FD3}         = ?FILE_MODULE:open("file2.txt", 
-						[binary, compressed]),
+    L = "qwertyuiopasdfghjklzxcvbnm",
+    N = length(L),
+    {ok, Cwd}         = ?FILE_MODULE:get_cwd(),
+    {error, enotsup}  = ?FILE_MODULE:get_cwd("C:"), % Unix only testcase
+    {ok, FD1}         = ?FILE_MODULE:open("file1.txt", write),
+    ok                = ?FILE_MODULE:close(FD1),
+    {ok, FD2}         = ?FILE_MODULE:open("file1.txt",
+					  [write, append,
+					   binary, compressed,
+					   delayed_write,
+					   {delayed_write, 0, 0},
+					   read_ahead,
+					   {read_ahead, 0}]),
+    ok                = ?FILE_MODULE:write(FD2, L),
+    ok                = ?FILE_MODULE:close(FD2),
+    {ok, N2}          = ?FILE_MODULE:copy("file1.txt", "file2.txt"),
+    io:format("Size ~p, compressed ~p.~n", [N, N2]),
+    {ok, FD3}         = ?FILE_MODULE:open("file2.txt",
+					  [binary, compressed]),
     %% The file_io_server will translate the binary into a list
-    ?line {ok, L}           = ?FILE_MODULE:read(FD3, N+1),
-    ?line ok                = ?FILE_MODULE:close(FD3),
+    {ok, L}           = ?FILE_MODULE:read(FD3, N+1),
+    ok                = ?FILE_MODULE:close(FD3),
     %%
-    ?line ok                = ?FILE_MODULE:delete("file1.txt"),
-    ?line ok                = ?FILE_MODULE:delete("file2.txt"),
-    ?line []                = flush(),
+    ok                = ?FILE_MODULE:delete("file1.txt"),
+    ok                = ?FILE_MODULE:delete("file2.txt"),
+    []                = flush(),
     ok.
 
 
 %% Test the get_cwd() and open() file server calls.
 old_slave(_RootDir, Cwd) ->
-    ?line L = "qwertyuiopasdfghjklzxcvbnm",
-    ?line N = length(L),
-    ?line {ok, Cwd}         = ?FILE_MODULE:get_cwd(),
-    ?line {error, enotsup}  = ?FILE_MODULE:get_cwd("C:"), % Unix only testcase
-    ?line {ok, FD1}         = ?FILE_MODULE:open("file1.txt", write),
-    ?line ok                = ?FILE_MODULE:close(FD1),
-    ?line {ok, FD2}         = ?FILE_MODULE:open("file1.txt", 
-						[write, binary, compressed]),
-    ?line ok                = ?FILE_MODULE:write(FD2, L),
-    ?line ok                = ?FILE_MODULE:close(FD2),
-    ?line {ok, FD3}         = ?FILE_MODULE:open("file1.txt", [write, append]),
-    ?line ok                = ?FILE_MODULE:close(FD3),
-    ?line {ok, FD4}         = ?FILE_MODULE:open("file1.txt", 
-						[binary, compressed]),
+    L = "qwertyuiopasdfghjklzxcvbnm",
+    N = length(L),
+    {ok, Cwd}         = ?FILE_MODULE:get_cwd(),
+    {error, enotsup}  = ?FILE_MODULE:get_cwd("C:"), % Unix only testcase
+    {ok, FD1}         = ?FILE_MODULE:open("file1.txt", write),
+    ok                = ?FILE_MODULE:close(FD1),
+    {ok, FD2}         = ?FILE_MODULE:open("file1.txt",
+					  [write, binary, compressed]),
+    ok                = ?FILE_MODULE:write(FD2, L),
+    ok                = ?FILE_MODULE:close(FD2),
+    {ok, FD3}         = ?FILE_MODULE:open("file1.txt", [write, append]),
+    ok                = ?FILE_MODULE:close(FD3),
+    {ok, FD4}         = ?FILE_MODULE:open("file1.txt",
+					  [binary, compressed]),
     %% The file_io_server will translate the binary into a list
-    ?line {ok, L}           = ?FILE_MODULE:read(FD4, N+1),
-    ?line ok                = ?FILE_MODULE:close(FD4),
+    {ok, L}           = ?FILE_MODULE:read(FD4, N+1),
+    ok                = ?FILE_MODULE:close(FD4),
     %%
-    ?line ok                = ?FILE_MODULE:delete("file1.txt"),
-    ?line []                = flush(),
+    ok                = ?FILE_MODULE:delete("file1.txt"),
+    []                = flush(),
     ok.
 
 run_test(Test, Args) ->
-    ?line case (catch apply(?MODULE, Test, Args)) of
-	      {'EXIT', _} = Exit ->
-		  {done, Exit, get(test_server_loc)};
-	      Result ->
-		  {done, Result}
-	  end.
+    case (catch apply(?MODULE, Test, Args)) of
+	{'EXIT', _} = Exit ->
+	    {done, Exit, get(test_server_loc)};
+	Result ->
+	    {done, Result}
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-delayed_write(suite) ->
-    [];
-delayed_write(doc) ->
-    ["Tests the file open option {delayed_write, Size, Delay}"];
+%% Tests the file open option {delayed_write, Size, Delay}.
 
 delayed_write(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:seconds(20)),
-    
-    RootDir = ?config(priv_dir, Config),
+    RootDir = proplists:get_value(priv_dir, Config),
     File = filename:join(RootDir, 
-          	       atom_to_list(?MODULE)++"_delayed_write.txt"),
+			 atom_to_list(?MODULE)++"_delayed_write.txt"),
     Data1 = "asdfghjkl",
     Data2 = "qwertyuio",
     Data3 = "zxcvbnm,.",
@@ -3143,18 +2917,18 @@ delayed_write(Config) when is_list(Config) ->
     {ok, Fd1} = 
 	?FILE_MODULE:open(File, [write, {delayed_write, Size+1, 2000}]),
     ok = ?FILE_MODULE:write(Fd1, Data1),
-    ?t:sleep(1000), % Just in case the file system is slow
+    timer:sleep(1000), % Just in case the file system is slow
     {ok, Fd2} = ?FILE_MODULE:open(File, [read]),
     eof = ?FILE_MODULE:read(Fd2, 1),
     ok = ?FILE_MODULE:write(Fd1, Data1), % Data flush on size
-    ?t:sleep(1000), % Just in case the file system is slow
+    timer:sleep(1000), % Just in case the file system is slow
     {ok, Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 2*Size+1),
     ok = ?FILE_MODULE:write(Fd1, Data1),
-    ?t:sleep(3000), % Wait until data flush on timeout
+    timer:sleep(3000), % Wait until data flush on timeout
     {ok, Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 3*Size+1),
     ok = ?FILE_MODULE:write(Fd1, Data1),
     ok = ?FILE_MODULE:close(Fd1), % Data flush on close
-    ?t:sleep(1000), % Just in case the file system is slow
+    timer:sleep(1000), % Just in case the file system is slow
     {ok, Data1Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 4*Size+1),
     ok = ?FILE_MODULE:close(Fd2),
     %%
@@ -3162,33 +2936,33 @@ delayed_write(Config) when is_list(Config) ->
     %% raw file, default parameters.
     Parent = self(),
     Fun = fun() ->
-	    Child = self(),
-	    Test = 
-	    fun () ->
-		    {ok, Fd} = ?FILE_MODULE:open(File, 
-			[raw, write, delayed_write]),
-		    ok = ?FILE_MODULE:write(Fd, Data1),
-		    Parent ! {Child, wrote},
-		    receive 
-			{Parent, continue, Reason} -> 
-			    {ok, Reason}
-		    end
-	    end,
-	    case (catch Test()) of
-		{ok, Reason} -> exit(Reason);
-		Unknown ->
-		    exit({Unknown, get(test_server_loc)})
-	    end
-    end,
+		  Child = self(),
+		  Test =
+		      fun () ->
+			      {ok, Fd} = ?FILE_MODULE:open(File,
+							   [raw, write, delayed_write]),
+			      ok = ?FILE_MODULE:write(Fd, Data1),
+			      Parent ! {Child, wrote},
+			      receive
+				  {Parent, continue, Reason} ->
+				      {ok, Reason}
+			      end
+		      end,
+		  case (catch Test()) of
+		      {ok, Reason} -> exit(Reason);
+		      Unknown ->
+			  exit({Unknown, get(test_server_loc)})
+		  end
+	  end,
     Child1 = spawn(Fun),
     Mref1 = erlang:monitor(process, Child1),
     receive 
         {Child1, wrote} -> 
             ok;
         {'DOWN', Mref1, _, _, _} = Down1a ->
-            ?t:fail(Down1a)
+            ct:fail(Down1a)
     end,
-    ?t:sleep(1000), % Just in case the file system is slow
+    timer:sleep(1000), % Just in case the file system is slow
     {ok, Fd3} = ?FILE_MODULE:open(File, [read]),
     eof = ?FILE_MODULE:read(Fd3, 1),
     Child1 ! {Parent, continue, normal},
@@ -3196,9 +2970,9 @@ delayed_write(Config) when is_list(Config) ->
         {'DOWN', Mref1, process, Child1, normal} -> 
             ok;
         {'DOWN', Mref1, _, _, _} = Down1b ->
-            ?t:fail(Down1b)
+            ct:fail(Down1b)
     end,
-    ?t:sleep(1000), % Just in case the file system is slow
+    timer:sleep(1000), % Just in case the file system is slow
     {ok, Data1} = ?FILE_MODULE:pread(Fd3, bof, Size+1),
     ok = ?FILE_MODULE:close(Fd3),
     %%
@@ -3209,9 +2983,9 @@ delayed_write(Config) when is_list(Config) ->
         {Child2, wrote} -> 
             ok;
         {'DOWN', Mref2, _, _, _} = Down2a ->
-            ?t:fail(Down2a)
+            ct:fail(Down2a)
     end,
-    ?t:sleep(1000), % Just in case the file system is slow
+    timer:sleep(1000), % Just in case the file system is slow
     {ok, Fd4} = ?FILE_MODULE:open(File, [read]),
     eof = ?FILE_MODULE:read(Fd4, 1),
     Child2 ! {Parent, continue, kill},
@@ -3219,15 +2993,15 @@ delayed_write(Config) when is_list(Config) ->
         {'DOWN', Mref2, process, Child2, kill} -> 
             ok;
         {'DOWN', Mref2, _, _, _} = Down2b ->
-            ?t:fail(Down2b)
+            ct:fail(Down2b)
     end,
-    ?t:sleep(1000), % Just in case the file system is slow
+    timer:sleep(1000), % Just in case the file system is slow
     eof = ?FILE_MODULE:pread(Fd4, bof, 1),
     ok  = ?FILE_MODULE:close(Fd4),
     %%
     %% Test if file position works with delayed_write
     {ok, Fd5} = ?FILE_MODULE:open(File, [raw, read, write, 
-          			       delayed_write]),
+					 delayed_write]),
     ok = ?FILE_MODULE:truncate(Fd5),
     ok = ?FILE_MODULE:write(Fd5, [Data1|Data2]),
     {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
@@ -3239,93 +3013,82 @@ delayed_write(Config) when is_list(Config) ->
     ok = ?FILE_MODULE:close(Fd5),
     %%
     [] = flush(),
-    ?t:timetrap_cancel(Dog),
     ok.
 
 
-pid2name(doc) -> "Tests file:pid2name/1.";
-pid2name(suite) -> [];
+%% Tests file:pid2name/1.
 pid2name(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line Base = test_server:temp_name(
-		   filename:join(RootDir, "pid2name_")),
-    ?line Name1 = [Base, '.txt'],
-    ?line Name2 = Base ++ ".txt",
+    RootDir = proplists:get_value(priv_dir, Config),
+    Base = test_server:temp_name(
+	     filename:join(RootDir, "pid2name_")),
+    Name1 = [Base, '.txt'],
+    Name2 = Base ++ ".txt",
     %%
-    ?line {ok, Pid} = file:open(Name1, [write]),
-    ?line {ok, Name2} = file:pid2name(Pid),
-    ?line undefined = file:pid2name(self()),
-    ?line ok = file:close(Pid),
-    ?line test_server:sleep(1000),
-    ?line false = is_process_alive(Pid),
-    ?line undefined = file:pid2name(Pid),
-    %%
-    ?line test_server:timetrap_cancel(Dog),
+    {ok, Pid} = file:open(Name1, [write]),
+    {ok, Name2} = file:pid2name(Pid),
+    undefined = file:pid2name(self()),
+    ok = file:close(Pid),
+    ct:sleep(1000),
+    false = is_process_alive(Pid),
+    undefined = file:pid2name(Pid),
     ok.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-read_ahead(suite) ->
-    [];
-read_ahead(doc) ->
-    ["Tests the file open option {read_ahead, Size}"];
+%% Tests the file open option {read_ahead, Size}.
 
 read_ahead(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(20)),
-    %%
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line File = filename:join(RootDir, 
-			       atom_to_list(?MODULE)++"_read_ahead.txt"),
-    ?line Data1 = "asdfghjkl", % Must be
-    ?line Data2 = "qwertyuio", % same
-    ?line Data3 = "zxcvbnm,.", % length
-    ?line Size = length(Data1),
-    ?line Size = length(Data2),
-    ?line Size = length(Data3),
+    RootDir = proplists:get_value(priv_dir, Config),
+    File = filename:join(RootDir,
+			 atom_to_list(?MODULE)++"_read_ahead.txt"),
+    Data1 = "asdfghjkl", % Must be
+    Data2 = "qwertyuio", % same
+    Data3 = "zxcvbnm,.", % length
+    Size = length(Data1),
+    Size = length(Data2),
+    Size = length(Data3),
     %%
     %% Test caching of normal non-raw file
-    ?line {ok, Fd1} = ?FILE_MODULE:open(File, [write]),
-    ?line ok = ?FILE_MODULE:write(Fd1, [Data1|Data1]),
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Fd2} = ?FILE_MODULE:open(File, [read, {read_ahead, 2*Size}]),
-    ?line {ok, Data1} = ?FILE_MODULE:read(Fd2, Size),
-    ?line ok = ?FILE_MODULE:pwrite(Fd1, Size, Data2),
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Data1} = ?FILE_MODULE:read(Fd2, Size), % Will read cached data
-    ?line Data2Data2Data2 = Data2++Data2++Data2,
-    ?line ok = ?FILE_MODULE:pwrite(Fd1, eof, Data2Data2Data2),
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Data2Data2Data2} = 
+    {ok, Fd1} = ?FILE_MODULE:open(File, [write]),
+    ok = ?FILE_MODULE:write(Fd1, [Data1|Data1]),
+    timer:sleep(1000), % Just in case the file system is slow
+    {ok, Fd2} = ?FILE_MODULE:open(File, [read, {read_ahead, 2*Size}]),
+    {ok, Data1} = ?FILE_MODULE:read(Fd2, Size),
+    ok = ?FILE_MODULE:pwrite(Fd1, Size, Data2),
+    timer:sleep(1000), % Just in case the file system is slow
+    {ok, Data1} = ?FILE_MODULE:read(Fd2, Size), % Will read cached data
+    Data2Data2Data2 = Data2++Data2++Data2,
+    ok = ?FILE_MODULE:pwrite(Fd1, eof, Data2Data2Data2),
+    timer:sleep(1000), % Just in case the file system is slow
+    {ok, Data2Data2Data2} =
 	?FILE_MODULE:read(Fd2, 3*Size), % Read more than cache buffer
-    ?line ok = ?FILE_MODULE:close(Fd1),
-    ?line ok = ?FILE_MODULE:close(Fd2),
+    ok = ?FILE_MODULE:close(Fd1),
+    ok = ?FILE_MODULE:close(Fd2),
     %% Test caching of raw file and default parameters
-    ?line {ok, Fd3} = ?FILE_MODULE:open(File, [raw, write]),
-    ?line ok = ?FILE_MODULE:write(Fd3, [Data1|Data1]),
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Fd4} = ?FILE_MODULE:open(File, [raw, read, read_ahead]),
-    ?line {ok, Data1} = ?FILE_MODULE:read(Fd4, Size),
-    ?line ok = ?FILE_MODULE:pwrite(Fd3, Size, Data2),
-    ?line ?t:sleep(1000), % Just in case the file system is slow
-    ?line {ok, Data1} = ?FILE_MODULE:read(Fd4, Size), % Will read cached data
-    ?line ok = ?FILE_MODULE:close(Fd3),
-    ?line ok = ?FILE_MODULE:close(Fd4),
+    {ok, Fd3} = ?FILE_MODULE:open(File, [raw, write]),
+    ok = ?FILE_MODULE:write(Fd3, [Data1|Data1]),
+    timer:sleep(1000), % Just in case the file system is slow
+    {ok, Fd4} = ?FILE_MODULE:open(File, [raw, read, read_ahead]),
+    {ok, Data1} = ?FILE_MODULE:read(Fd4, Size),
+    ok = ?FILE_MODULE:pwrite(Fd3, Size, Data2),
+    timer:sleep(1000), % Just in case the file system is slow
+    {ok, Data1} = ?FILE_MODULE:read(Fd4, Size), % Will read cached data
+    ok = ?FILE_MODULE:close(Fd3),
+    ok = ?FILE_MODULE:close(Fd4),
     %% Test if the file position works in combination with read_ahead
-    ?line {ok, Fd5} = ?FILE_MODULE:open(File, [raw, read, write, read_ahead]),
-    ?line ok = ?FILE_MODULE:truncate(Fd5),
-    ?line ok = ?FILE_MODULE:write(Fd5, [Data1,Data1|Data3]),
-    ?line {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
-    ?line {ok, Data1} = ?FILE_MODULE:read(Fd5, Size),
-    ?line ok = ?FILE_MODULE:write(Fd5, Data2),
-    ?line {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
-    ?line Data1Data2Data3 = Data1++Data2++Data3,
-    ?line {ok, Data1Data2Data3} = ?FILE_MODULE:read(Fd5, 3*Size+1),
-    ?line ok = ?FILE_MODULE:close(Fd5),
+    {ok, Fd5} = ?FILE_MODULE:open(File, [raw, read, write, read_ahead]),
+    ok = ?FILE_MODULE:truncate(Fd5),
+    ok = ?FILE_MODULE:write(Fd5, [Data1,Data1|Data3]),
+    {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
+    {ok, Data1} = ?FILE_MODULE:read(Fd5, Size),
+    ok = ?FILE_MODULE:write(Fd5, Data2),
+    {ok, 0} = ?FILE_MODULE:position(Fd5, bof),
+    Data1Data2Data3 = Data1++Data2++Data3,
+    {ok, Data1Data2Data3} = ?FILE_MODULE:read(Fd5, 3*Size+1),
+    ok = ?FILE_MODULE:close(Fd5),
     %%
-    ?line [] = flush(),
-    ?line ?t:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 
@@ -3334,137 +3097,131 @@ read_ahead(Config) when is_list(Config) ->
 
 
 
-segment_read(suite) ->
-    [];
-segment_read(doc) ->
-    ["Tests the segmenting of large reads"];
+%% Tests the segmenting of large reads.
 segment_read(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(60)),
-    %%
-    ?line Name = filename:join(?config(priv_dir, Config),
-			       ?MODULE_STRING ++ "_segment_read"),
-    ?line SegSize = 256*1024,
-    ?line SegCnt = SegSize div 4,
-    ?line Cnt = 4 * SegCnt,
-    ?line ok = create_file(Name, Cnt),
+    Name = filename:join(proplists:get_value(priv_dir, Config),
+			 ?MODULE_STRING ++ "_segment_read"),
+    SegSize = 256*1024,
+    SegCnt = SegSize div 4,
+    Cnt = 4 * SegCnt,
+    ok = create_file(Name, Cnt),
     %% 
     %% read_file/1
     %%
-    ?line {ok, Bin} = ?FILE_MODULE:read_file(Name),
-    ?line true = verify_bin(Bin, 0, Cnt),
+    {ok, Bin} = ?FILE_MODULE:read_file(Name),
+    true = verify_bin(Bin, 0, Cnt),
     %%
     %% read/2
     %%
     %% Not segmented
-    ?line {ok, FD1} = ?FILE_MODULE:open(Name, [read, raw, binary]),
-    ?line {ok, B1a} = ?FILE_MODULE:read(FD1, SegSize),
-    ?line {ok, B1b} = ?FILE_MODULE:read(FD1, SegSize),
-    ?line {ok, B1c} = ?FILE_MODULE:read(FD1, SegSize),
-    ?line {ok, B1d} = ?FILE_MODULE:read(FD1, SegSize),
-    ?line ok = ?FILE_MODULE:close(FD1),
-    ?line true = verify_bin(B1a, 0*SegCnt, SegCnt),
-    ?line true = verify_bin(B1b, 1*SegCnt, SegCnt),
-    ?line true = verify_bin(B1c, 2*SegCnt, SegCnt),
-    ?line true = verify_bin(B1d, 3*SegCnt, SegCnt),
+    {ok, FD1} = ?FILE_MODULE:open(Name, [read, raw, binary]),
+    {ok, B1a} = ?FILE_MODULE:read(FD1, SegSize),
+    {ok, B1b} = ?FILE_MODULE:read(FD1, SegSize),
+    {ok, B1c} = ?FILE_MODULE:read(FD1, SegSize),
+    {ok, B1d} = ?FILE_MODULE:read(FD1, SegSize),
+    ok = ?FILE_MODULE:close(FD1),
+    true = verify_bin(B1a, 0*SegCnt, SegCnt),
+    true = verify_bin(B1b, 1*SegCnt, SegCnt),
+    true = verify_bin(B1c, 2*SegCnt, SegCnt),
+    true = verify_bin(B1d, 3*SegCnt, SegCnt),
     %%
     %% Segmented
-    ?line {ok, FD2} = ?FILE_MODULE:open(Name, [read, raw, binary]),
-    ?line {ok, B2a} = ?FILE_MODULE:read(FD2, 1*SegSize),
-    ?line {ok, B2b} = ?FILE_MODULE:read(FD2, 2*SegSize),
-    ?line {ok, B2c} = ?FILE_MODULE:read(FD2, 2*SegSize),
-    ?line ok = ?FILE_MODULE:close(FD2),
-    ?line true = verify_bin(B2a, 0*SegCnt, 1*SegCnt),
-    ?line true = verify_bin(B2b, 1*SegCnt, 2*SegCnt),
-    ?line true = verify_bin(B2c, 3*SegCnt, 1*SegCnt),
+    {ok, FD2} = ?FILE_MODULE:open(Name, [read, raw, binary]),
+    {ok, B2a} = ?FILE_MODULE:read(FD2, 1*SegSize),
+    {ok, B2b} = ?FILE_MODULE:read(FD2, 2*SegSize),
+    {ok, B2c} = ?FILE_MODULE:read(FD2, 2*SegSize),
+    ok = ?FILE_MODULE:close(FD2),
+    true = verify_bin(B2a, 0*SegCnt, 1*SegCnt),
+    true = verify_bin(B2b, 1*SegCnt, 2*SegCnt),
+    true = verify_bin(B2c, 3*SegCnt, 1*SegCnt),
     %%
     %% pread/3
     %%
-    ?line {ok, FD3} = ?FILE_MODULE:open(Name, [read, raw, binary]),
+    {ok, FD3} = ?FILE_MODULE:open(Name, [read, raw, binary]),
     %%
     %% Not segmented
-    ?line {ok, B3d} = ?FILE_MODULE:pread(FD3, 3*SegSize, SegSize),
-    ?line {ok, B3c} = ?FILE_MODULE:pread(FD3, 2*SegSize, SegSize),
-    ?line {ok, B3b} = ?FILE_MODULE:pread(FD3, 1*SegSize, SegSize),
-    ?line {ok, B3a} = ?FILE_MODULE:pread(FD3, 0*SegSize, SegSize),
-    ?line true = verify_bin(B3a, 0*SegCnt, SegCnt),
-    ?line true = verify_bin(B3b, 1*SegCnt, SegCnt),
-    ?line true = verify_bin(B3c, 2*SegCnt, SegCnt),
-    ?line true = verify_bin(B3d, 3*SegCnt, SegCnt),
+    {ok, B3d} = ?FILE_MODULE:pread(FD3, 3*SegSize, SegSize),
+    {ok, B3c} = ?FILE_MODULE:pread(FD3, 2*SegSize, SegSize),
+    {ok, B3b} = ?FILE_MODULE:pread(FD3, 1*SegSize, SegSize),
+    {ok, B3a} = ?FILE_MODULE:pread(FD3, 0*SegSize, SegSize),
+    true = verify_bin(B3a, 0*SegCnt, SegCnt),
+    true = verify_bin(B3b, 1*SegCnt, SegCnt),
+    true = verify_bin(B3c, 2*SegCnt, SegCnt),
+    true = verify_bin(B3d, 3*SegCnt, SegCnt),
     %%
     %% Segmented
-    ?line {ok, B3g} = ?FILE_MODULE:pread(FD3, 3*SegSize, 2*SegSize),
-    ?line {ok, B3f} = ?FILE_MODULE:pread(FD3, 1*SegSize, 2*SegSize),
-    ?line {ok, B3e} = ?FILE_MODULE:pread(FD3, 0*SegSize, 1*SegSize),
-    ?line true = verify_bin(B3e, 0*SegCnt, 1*SegCnt),
-    ?line true = verify_bin(B3f, 1*SegCnt, 2*SegCnt),
-    ?line true = verify_bin(B3g, 3*SegCnt, 1*SegCnt),
+    {ok, B3g} = ?FILE_MODULE:pread(FD3, 3*SegSize, 2*SegSize),
+    {ok, B3f} = ?FILE_MODULE:pread(FD3, 1*SegSize, 2*SegSize),
+    {ok, B3e} = ?FILE_MODULE:pread(FD3, 0*SegSize, 1*SegSize),
+    true = verify_bin(B3e, 0*SegCnt, 1*SegCnt),
+    true = verify_bin(B3f, 1*SegCnt, 2*SegCnt),
+    true = verify_bin(B3g, 3*SegCnt, 1*SegCnt),
     %%
-    ?line ok = ?FILE_MODULE:close(FD3),
+    ok = ?FILE_MODULE:close(FD3),
     %%
     %% pread/2
     %%
-    ?line {ok, FD5} = ?FILE_MODULE:open(Name, [read, raw, binary]),
+    {ok, FD5} = ?FILE_MODULE:open(Name, [read, raw, binary]),
     %%
     %% +---+---+---+---+
     %% | 4 | 3 | 2 | 1 |
     %% +---+---+---+---+
     %% <       ^       >
-    ?line {ok, [B5d, B5c, B5b, B5a]} = 
+    {ok, [B5d, B5c, B5b, B5a]} =
 	?FILE_MODULE:pread(FD5, [{3*SegSize, SegSize},
 				 {2*SegSize, SegSize},
 				 {1*SegSize, SegSize},
 				 {0*SegSize, SegSize}]),
-    ?line true = verify_bin(B5a, 0*SegCnt, SegCnt),
-    ?line true = verify_bin(B5b, 1*SegCnt, SegCnt),
-    ?line true = verify_bin(B5c, 2*SegCnt, SegCnt),
-    ?line true = verify_bin(B5d, 3*SegCnt, SegCnt),
+    true = verify_bin(B5a, 0*SegCnt, SegCnt),
+    true = verify_bin(B5b, 1*SegCnt, SegCnt),
+    true = verify_bin(B5c, 2*SegCnt, SegCnt),
+    true = verify_bin(B5d, 3*SegCnt, SegCnt),
     %%
     %% +---+-------+-------+
     %% | 3 |   2   |   1   |
     %% +---+-------+-------+
     %% <     ^     ^   >
-    ?line {ok, [B5g, B5f, B5e]} = 
+    {ok, [B5g, B5f, B5e]} =
 	?FILE_MODULE:pread(FD5, [{3*SegSize, 2*SegSize},
 				 {1*SegSize, 2*SegSize},
 				 {0*SegSize, 1*SegSize}]),
-    ?line true = verify_bin(B5e, 0*SegCnt, 1*SegCnt),
-    ?line true = verify_bin(B5f, 1*SegCnt, 2*SegCnt),
-    ?line true = verify_bin(B5g, 3*SegCnt, 1*SegCnt),
+    true = verify_bin(B5e, 0*SegCnt, 1*SegCnt),
+    true = verify_bin(B5f, 1*SegCnt, 2*SegCnt),
+    true = verify_bin(B5g, 3*SegCnt, 1*SegCnt),
     %%
     %%
     %% +-------+-----------+
     %% |   2   |     1     |
     %% +-------+-----------+
     %% <     ^     ^   >
-    ?line {ok, [B5i, B5h]} = 
+    {ok, [B5i, B5h]} =
 	?FILE_MODULE:pread(FD5, [{2*SegSize, 3*SegSize},
 				 {0*SegSize, 2*SegSize}]),
-    ?line true = verify_bin(B5h, 0*SegCnt, 2*SegCnt),
-    ?line true = verify_bin(B5i, 2*SegCnt, 2*SegCnt),
+    true = verify_bin(B5h, 0*SegCnt, 2*SegCnt),
+    true = verify_bin(B5i, 2*SegCnt, 2*SegCnt),
     %%
     %% +-------+---+---+
     %% |   3   | 2 | 1 |
     %% +-------+---+---+
     %% <     ^     ^   >
-    ?line {ok, [B5l, B5k, B5j]} = 
+    {ok, [B5l, B5k, B5j]} =
 	?FILE_MODULE:pread(FD5, [{3*SegSize, 1*SegSize},
 				 {2*SegSize, 1*SegSize},
 				 {0*SegSize, 2*SegSize}]),
-    ?line true = verify_bin(B5j, 0*SegCnt, 2*SegCnt),
-    ?line true = verify_bin(B5k, 2*SegCnt, 1*SegCnt),
-    ?line true = verify_bin(B5l, 3*SegCnt, 1*SegCnt),
+    true = verify_bin(B5j, 0*SegCnt, 2*SegCnt),
+    true = verify_bin(B5k, 2*SegCnt, 1*SegCnt),
+    true = verify_bin(B5l, 3*SegCnt, 1*SegCnt),
     %%
     %% Real time response time test.
     %%
     Req = lists:flatten(lists:duplicate(17,
 					[{2*SegSize, 2*SegSize},
 					 {0*SegSize, 2*SegSize}])),
-    ?line {{ok, _}, Comment} = 
+    {{ok, _}, Comment} =
 	response_analysis(?FILE_MODULE, pread, [FD5, Req]),
-    ?line ok = ?FILE_MODULE:close(FD5),
+    ok = ?FILE_MODULE:close(FD5),
     %%
-    ?line [] = flush(),
-    ?line ?t:timetrap_cancel(Dog),
+    [] = flush(),
     {comment, Comment}.
 
 
@@ -3473,100 +3230,95 @@ segment_read(Config) when is_list(Config) ->
 
 
 
-segment_write(suite) ->
-    [];
-segment_write(doc) ->
-    ["Tests the segmenting of large writes"];
+%% Tests the segmenting of large writes.
 segment_write(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(60)),
-    %%
-    ?line Name = filename:join(?config(priv_dir, Config),
-			       ?MODULE_STRING ++ "_segment_write"),
-    ?line SegSize = 256*1024,
-    ?line SegCnt = SegSize div 4,
-    ?line Cnt = 4 * SegCnt,
-    ?line Bin = create_bin(0, Cnt),
+    Name = filename:join(proplists:get_value(priv_dir, Config),
+			 ?MODULE_STRING ++ "_segment_write"),
+    SegSize = 256*1024,
+    SegCnt = SegSize div 4,
+    Cnt = 4 * SegCnt,
+    Bin = create_bin(0, Cnt),
     %%
     %% write/2
     %%
     %% Not segmented
-    ?line {ok, FD1} = ?FILE_MODULE:open(Name, [write, raw, binary]),
-    ?line ok = ?FILE_MODULE:write(FD1, subbin(Bin, 0*SegSize, 1*SegSize)),
-    ?line ok = ?FILE_MODULE:write(FD1, subbin(Bin, 1*SegSize, 1*SegSize)),
-    ?line ok = ?FILE_MODULE:write(FD1, subbin(Bin, 2*SegSize, 1*SegSize)),
-    ?line ok = ?FILE_MODULE:write(FD1, subbin(Bin, 3*SegSize, 1*SegSize)),
-    ?line ok = ?FILE_MODULE:close(FD1),
-    ?line true = verify_file(Name, Cnt),
+    {ok, FD1} = ?FILE_MODULE:open(Name, [write, raw, binary]),
+    ok = ?FILE_MODULE:write(FD1, subbin(Bin, 0*SegSize, 1*SegSize)),
+    ok = ?FILE_MODULE:write(FD1, subbin(Bin, 1*SegSize, 1*SegSize)),
+    ok = ?FILE_MODULE:write(FD1, subbin(Bin, 2*SegSize, 1*SegSize)),
+    ok = ?FILE_MODULE:write(FD1, subbin(Bin, 3*SegSize, 1*SegSize)),
+    ok = ?FILE_MODULE:close(FD1),
+    true = verify_file(Name, Cnt),
     %%
     %% Segmented
-    ?line {ok, FD2} = ?FILE_MODULE:open(Name, [write, raw, binary]),
-    ?line ok = ?FILE_MODULE:write(FD2, subbin(Bin, 0*SegSize, 1*SegSize)),
-    ?line ok = ?FILE_MODULE:write(FD2, subbin(Bin, 1*SegSize, 2*SegSize)),
-    ?line ok = ?FILE_MODULE:write(FD2, subbin(Bin, 3*SegSize, 1*SegSize)),
-    ?line ok = ?FILE_MODULE:close(FD2),
-    ?line true = verify_file(Name, Cnt),
+    {ok, FD2} = ?FILE_MODULE:open(Name, [write, raw, binary]),
+    ok = ?FILE_MODULE:write(FD2, subbin(Bin, 0*SegSize, 1*SegSize)),
+    ok = ?FILE_MODULE:write(FD2, subbin(Bin, 1*SegSize, 2*SegSize)),
+    ok = ?FILE_MODULE:write(FD2, subbin(Bin, 3*SegSize, 1*SegSize)),
+    ok = ?FILE_MODULE:close(FD2),
+    true = verify_file(Name, Cnt),
     %%
     %% +---+---+---+---+
     %% |   |   |   |   |
     %% +---+---+---+---+
     %% <       ^       >
-    ?line ok = write_file(Name, [subbin(Bin, 0*SegSize, 1*SegSize),
-				 subbin(Bin, 1*SegSize, 1*SegSize),
-				 subbin(Bin, 2*SegSize, 1*SegSize),
-				 subbin(Bin, 3*SegSize, 1*SegSize)]),
-    ?line true = verify_file(Name, Cnt),
+    ok = write_file(Name, [subbin(Bin, 0*SegSize, 1*SegSize),
+			   subbin(Bin, 1*SegSize, 1*SegSize),
+			   subbin(Bin, 2*SegSize, 1*SegSize),
+			   subbin(Bin, 3*SegSize, 1*SegSize)]),
+    true = verify_file(Name, Cnt),
     %%
     %% +---+-------+---+
     %% |   |       |   |
     %% +---+-------+---+
     %% <     ^     ^   >
-    ?line ok = write_file(Name, [subbin(Bin, 0*SegSize, 1*SegSize),
-				 subbin(Bin, 1*SegSize, 2*SegSize),
-				 subbin(Bin, 3*SegSize, 1*SegSize)]),
-    ?line true = verify_file(Name, Cnt),
+    ok = write_file(Name, [subbin(Bin, 0*SegSize, 1*SegSize),
+			   subbin(Bin, 1*SegSize, 2*SegSize),
+			   subbin(Bin, 3*SegSize, 1*SegSize)]),
+    true = verify_file(Name, Cnt),
     %%
     %% +-------+-------+
     %% |       |       |
     %% +-------+-------+
     %% <     ^     ^   >
-    ?line ok = write_file(Name, [subbin(Bin, 0*SegSize, 2*SegSize),
-				 subbin(Bin, 2*SegSize, 2*SegSize)]),
-    ?line true = verify_file(Name, Cnt),
+    ok = write_file(Name, [subbin(Bin, 0*SegSize, 2*SegSize),
+			   subbin(Bin, 2*SegSize, 2*SegSize)]),
+    true = verify_file(Name, Cnt),
     %%
     %% +-------+---+---+
     %% |       |   |   |
     %% +-------+---+---+
     %% <     ^     ^   >
-    ?line ok = write_file(Name, [subbin(Bin, 0*SegSize, 2*SegSize),
-				 subbin(Bin, 2*SegSize, 1*SegSize),
-				 subbin(Bin, 3*SegSize, 1*SegSize)]),
-    ?line true = verify_file(Name, Cnt),
+    ok = write_file(Name, [subbin(Bin, 0*SegSize, 2*SegSize),
+			   subbin(Bin, 2*SegSize, 1*SegSize),
+			   subbin(Bin, 3*SegSize, 1*SegSize)]),
+    true = verify_file(Name, Cnt),
     %%
     %% pwrite/3
     %%
     %% Not segmented
-    ?line {ok, FD3} = ?FILE_MODULE:open(Name, [write, raw, binary]),
-    ?line ok = ?FILE_MODULE:pwrite(FD3, 3*SegSize, 
-				   subbin(Bin, 3*SegSize, 1*SegSize)),
-    ?line ok = ?FILE_MODULE:pwrite(FD3, 2*SegSize, 
-				   subbin(Bin, 2*SegSize, 1*SegSize)),
-    ?line ok = ?FILE_MODULE:pwrite(FD3, 1*SegSize, 
-				   subbin(Bin, 1*SegSize, 1*SegSize)),
-    ?line ok = ?FILE_MODULE:pwrite(FD3, 0*SegSize, 
-				   subbin(Bin, 0*SegSize, 1*SegSize)),
-    ?line ok = ?FILE_MODULE:close(FD3),
-    ?line true = verify_file(Name, Cnt),
+    {ok, FD3} = ?FILE_MODULE:open(Name, [write, raw, binary]),
+    ok = ?FILE_MODULE:pwrite(FD3, 3*SegSize,
+			     subbin(Bin, 3*SegSize, 1*SegSize)),
+    ok = ?FILE_MODULE:pwrite(FD3, 2*SegSize,
+			     subbin(Bin, 2*SegSize, 1*SegSize)),
+    ok = ?FILE_MODULE:pwrite(FD3, 1*SegSize,
+			     subbin(Bin, 1*SegSize, 1*SegSize)),
+    ok = ?FILE_MODULE:pwrite(FD3, 0*SegSize,
+			     subbin(Bin, 0*SegSize, 1*SegSize)),
+    ok = ?FILE_MODULE:close(FD3),
+    true = verify_file(Name, Cnt),
     %%
     %% Segmented
-    ?line {ok, FD4} = ?FILE_MODULE:open(Name, [write, raw, binary]),
-    ?line ok = ?FILE_MODULE:pwrite(FD4, 3*SegSize, 
-				   subbin(Bin, 3*SegSize, 1*SegSize)),
-    ?line ok = ?FILE_MODULE:pwrite(FD4, 1*SegSize, 
-				   subbin(Bin, 1*SegSize, 2*SegSize)),
-    ?line ok = ?FILE_MODULE:pwrite(FD4, 0*SegSize, 
-				   subbin(Bin, 0*SegSize, 1*SegSize)),
-    ?line ok = ?FILE_MODULE:close(FD4),
-    ?line true = verify_file(Name, Cnt),
+    {ok, FD4} = ?FILE_MODULE:open(Name, [write, raw, binary]),
+    ok = ?FILE_MODULE:pwrite(FD4, 3*SegSize,
+			     subbin(Bin, 3*SegSize, 1*SegSize)),
+    ok = ?FILE_MODULE:pwrite(FD4, 1*SegSize,
+			     subbin(Bin, 1*SegSize, 2*SegSize)),
+    ok = ?FILE_MODULE:pwrite(FD4, 0*SegSize,
+			     subbin(Bin, 0*SegSize, 1*SegSize)),
+    ok = ?FILE_MODULE:close(FD4),
+    true = verify_file(Name, Cnt),
 
 
 
@@ -3574,125 +3326,118 @@ segment_write(Config) when is_list(Config) ->
     %% pwrite/2
     %%
     %% Not segmented
-    ?line {ok, FD5} = ?FILE_MODULE:open(Name, [write, raw, binary]),
-    ?line ok = ?FILE_MODULE:pwrite(FD5, [{3*SegSize,
-					  subbin(Bin, 3*SegSize, 1*SegSize)}]),
-    ?line ok = ?FILE_MODULE:pwrite(FD5, [{2*SegSize,
-					  subbin(Bin, 2*SegSize, 1*SegSize)}]),
-    ?line ok = ?FILE_MODULE:pwrite(FD5, [{1*SegSize,
-					  subbin(Bin, 1*SegSize, 1*SegSize)}]),
-    ?line ok = ?FILE_MODULE:pwrite(FD5, [{0*SegSize,
-					  subbin(Bin, 0*SegSize, 1*SegSize)}]),
-    ?line ok = ?FILE_MODULE:close(FD5),
-    ?line true = verify_file(Name, Cnt),
+    {ok, FD5} = ?FILE_MODULE:open(Name, [write, raw, binary]),
+    ok = ?FILE_MODULE:pwrite(FD5, [{3*SegSize,
+				    subbin(Bin, 3*SegSize, 1*SegSize)}]),
+    ok = ?FILE_MODULE:pwrite(FD5, [{2*SegSize,
+				    subbin(Bin, 2*SegSize, 1*SegSize)}]),
+    ok = ?FILE_MODULE:pwrite(FD5, [{1*SegSize,
+				    subbin(Bin, 1*SegSize, 1*SegSize)}]),
+    ok = ?FILE_MODULE:pwrite(FD5, [{0*SegSize,
+				    subbin(Bin, 0*SegSize, 1*SegSize)}]),
+    ok = ?FILE_MODULE:close(FD5),
+    true = verify_file(Name, Cnt),
     %%
     %% Segmented
-    ?line {ok, FD6} = ?FILE_MODULE:open(Name, [write, raw, binary]),
-    ?line ok = ?FILE_MODULE:pwrite(FD6, [{3*SegSize,
-					  subbin(Bin, 3*SegSize, 1*SegSize)}]),
-    ?line ok = ?FILE_MODULE:pwrite(FD6, [{1*SegSize,
-					  subbin(Bin, 1*SegSize, 2*SegSize)}]),
-    ?line ok = ?FILE_MODULE:pwrite(FD6, [{0*SegSize,
-					  subbin(Bin, 0*SegSize, 1*SegSize)}]),
-    ?line ok = ?FILE_MODULE:close(FD6),
-    ?line true = verify_file(Name, Cnt),
+    {ok, FD6} = ?FILE_MODULE:open(Name, [write, raw, binary]),
+    ok = ?FILE_MODULE:pwrite(FD6, [{3*SegSize,
+				    subbin(Bin, 3*SegSize, 1*SegSize)}]),
+    ok = ?FILE_MODULE:pwrite(FD6, [{1*SegSize,
+				    subbin(Bin, 1*SegSize, 2*SegSize)}]),
+    ok = ?FILE_MODULE:pwrite(FD6, [{0*SegSize,
+				    subbin(Bin, 0*SegSize, 1*SegSize)}]),
+    ok = ?FILE_MODULE:close(FD6),
+    true = verify_file(Name, Cnt),
     %%
     %% +---+---+---+---+
     %% | 4 | 3 | 2 | 1 |
     %% +---+---+---+---+
     %% <       ^       >
-    ?line ok = pwrite_file(Name, [{3*SegSize, 
-				   subbin(Bin, 3*SegSize, 1*SegSize)},
-				  {2*SegSize, 
-				   subbin(Bin, 2*SegSize, 1*SegSize)},
-				  {1*SegSize, 
-				   subbin(Bin, 1*SegSize, 1*SegSize)},
-				  {0*SegSize, 
-				   subbin(Bin, 0*SegSize, 1*SegSize)}]),
-    ?line true = verify_file(Name, Cnt),
+    ok = pwrite_file(Name, [{3*SegSize,
+			     subbin(Bin, 3*SegSize, 1*SegSize)},
+			    {2*SegSize,
+			     subbin(Bin, 2*SegSize, 1*SegSize)},
+			    {1*SegSize,
+			     subbin(Bin, 1*SegSize, 1*SegSize)},
+			    {0*SegSize,
+			     subbin(Bin, 0*SegSize, 1*SegSize)}]),
+    true = verify_file(Name, Cnt),
     %%
     %% +---+-------+---+
     %% | 3 |   2   | 1 |
     %% +---+-------+---+
     %% <     ^     ^   >
-    ?line ok = pwrite_file(Name, [{3*SegSize, 
-				   subbin(Bin, 3*SegSize, 1*SegSize)},
-				  {1*SegSize, 
-				   subbin(Bin, 1*SegSize, 2*SegSize)},
-				  {0*SegSize, 
-				   subbin(Bin, 0*SegSize, 1*SegSize)}]),
-    ?line true = verify_file(Name, Cnt),
+    ok = pwrite_file(Name, [{3*SegSize,
+			     subbin(Bin, 3*SegSize, 1*SegSize)},
+			    {1*SegSize,
+			     subbin(Bin, 1*SegSize, 2*SegSize)},
+			    {0*SegSize,
+			     subbin(Bin, 0*SegSize, 1*SegSize)}]),
+    true = verify_file(Name, Cnt),
     %%
     %% +-------+-------+
     %% |   2   |   1   |
     %% +-------+-------+
     %% <     ^     ^   >
-    ?line ok = pwrite_file(Name, [{2*SegSize, 
-				   subbin(Bin, 2*SegSize, 2*SegSize)},
-				  {0*SegSize, 
-				   subbin(Bin, 0*SegSize, 2*SegSize)}]),
-    ?line true = verify_file(Name, Cnt),
+    ok = pwrite_file(Name, [{2*SegSize,
+			     subbin(Bin, 2*SegSize, 2*SegSize)},
+			    {0*SegSize,
+			     subbin(Bin, 0*SegSize, 2*SegSize)}]),
+    true = verify_file(Name, Cnt),
     %%
     %% +-------+---+---+
     %% |   3   | 2 | 1 |
     %% +-------+---+---+
     %% <     ^     ^   >
-    ?line ok = pwrite_file(Name, [{3*SegSize, 
-				   subbin(Bin, 3*SegSize, 1*SegSize)},
-				  {2*SegSize, 
-				   subbin(Bin, 2*SegSize, 1*SegSize)},
-				  {0*SegSize, 
-				   subbin(Bin, 0*SegSize, 2*SegSize)}]),
-    ?line true = verify_file(Name, Cnt),
+    ok = pwrite_file(Name, [{3*SegSize,
+			     subbin(Bin, 3*SegSize, 1*SegSize)},
+			    {2*SegSize,
+			     subbin(Bin, 2*SegSize, 1*SegSize)},
+			    {0*SegSize,
+			     subbin(Bin, 0*SegSize, 2*SegSize)}]),
+    true = verify_file(Name, Cnt),
     %%
     %% Real time response time test.
     %%
-    ?line {ok, FD7} = ?FILE_MODULE:open(Name, [write, raw, binary]),
+    {ok, FD7} = ?FILE_MODULE:open(Name, [write, raw, binary]),
     Req = lists:flatten(lists:duplicate(17,
 					[{2*SegSize, 
 					  subbin(Bin, 2*SegSize, 2*SegSize)},
-					{0*SegSize, 
-					 subbin(Bin, 0*SegSize, 2*SegSize)}])),
-    ?line {ok, Comment} = 
+					 {0*SegSize,
+					  subbin(Bin, 0*SegSize, 2*SegSize)}])),
+    {ok, Comment} =
 	response_analysis(?FILE_MODULE, pwrite, [FD7, Req]),
-    ?line ok = ?FILE_MODULE:close(FD7),
+    ok = ?FILE_MODULE:close(FD7),
     %%
-    ?line [] = flush(),
-    ?line ?t:timetrap_cancel(Dog),
+    [] = flush(),
     {comment, Comment}.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-ipread(suite) ->
-    [];
-ipread(doc) ->
-    ["Test Dets special indirect pread"];
+%% Test Dets special indirect pread.
 ipread(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(30)),
+    Dir = proplists:get_value(priv_dir, Config),
+    ok = ipread_int(Dir, [raw, binary]),
+    ok = ipread_int(Dir, [raw]),
+    ok = ipread_int(Dir, [binary]),
+    ok = ipread_int(Dir, []),
+    ok = ipread_int(Dir, [ram, binary]),
+    ok = ipread_int(Dir, [ram]),
     %%
-    ?line Dir = ?config(priv_dir, Config),
-    ?line ok = ipread_int(Dir, [raw, binary]),
-    ?line ok = ipread_int(Dir, [raw]),
-    ?line ok = ipread_int(Dir, [binary]),
-    ?line ok = ipread_int(Dir, []),
-    ?line ok = ipread_int(Dir, [ram, binary]),
-    ?line ok = ipread_int(Dir, [ram]),
-    %%
-    ?line [] = flush(),
-    ?line ?t:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 ipread_int(Dir, ModeList) ->
-    ?line Name = 
+    Name =
 	filename:join(Dir, 
 		      lists:flatten([?MODULE_STRING, "_ipread",
-		       lists:map(fun (X) ->
-					 ["_", atom_to_list(X)]
-				 end,
-				 ModeList)])),
-    ?line io:format("ipread_int<~p, ~p>~n", [Name, ModeList]),
-    ?line {Conv, Sizeof} = 
+				     lists:map(fun (X) ->
+						       ["_", atom_to_list(X)]
+					       end,
+					       ModeList)])),
+    io:format("ipread_int<~p, ~p>~n", [Name, ModeList]),
+    {Conv, Sizeof} =
 	case lists:member(binary, ModeList) of
 	    true ->
 		{fun (Bin) when is_binary(Bin) -> Bin;
@@ -3705,144 +3450,130 @@ ipread_int(Dir, ModeList) ->
 		 end, 
 		 fun erlang:length/1}
 	end,
-    ?line Pos = 4711,
-    ?line Data = Conv("THE QUICK BROWN FOX JUMPS OVER A LAZY DOG"),
-    ?line Size = Sizeof(Data),
-    ?line Init = Conv("                 "),
-    ?line SizeInit = Sizeof(Init),
-    ?line Head = Conv(<<Size:32/big-unsigned, Pos:32/big-unsigned>>),
-    ?line Filler = Conv(bytes($ , Pos-SizeInit-Sizeof(Head))),
-    ?line Size1 = Size+1,
-    ?line SizePos = Size+Pos,
+    Pos = 4711,
+    Data = Conv("THE QUICK BROWN FOX JUMPS OVER A LAZY DOG"),
+    Size = Sizeof(Data),
+    Init = Conv("                 "),
+    SizeInit = Sizeof(Init),
+    Head = Conv(<<Size:32/big-unsigned, Pos:32/big-unsigned>>),
+    Filler = Conv(bytes($ , Pos-SizeInit-Sizeof(Head))),
+    Size1 = Size+1,
+    SizePos = Size+Pos,
     %%
-    ?line {ok, FD} = ?FILE_MODULE:open(Name, [write, read | ModeList]),
-    ?line ok = ?FILE_MODULE:truncate(FD),
-    ?line ok = ?FILE_MODULE:write(FD, Init),
-    ?line ok = ?FILE_MODULE:write(FD, Head),
-    ?line ok = ?FILE_MODULE:write(FD, Filler),
-    ?line ok = ?FILE_MODULE:write(FD, Data),
+    {ok, FD} = ?FILE_MODULE:open(Name, [write, read | ModeList]),
+    ok = ?FILE_MODULE:truncate(FD),
+    ok = ?FILE_MODULE:write(FD, Init),
+    ok = ?FILE_MODULE:write(FD, Head),
+    ok = ?FILE_MODULE:write(FD, Filler),
+    ok = ?FILE_MODULE:write(FD, Data),
     %% Correct read
-    ?line {ok, {Size, Pos, Data}} = 
+    {ok, {Size, Pos, Data}} =
 	?FILE_MODULE:ipread_s32bu_p32bu(FD, SizeInit, infinity),
     %% Invalid header - size > max
-    ?line eof = 
+    eof =
 	?FILE_MODULE:ipread_s32bu_p32bu(FD, SizeInit, Size-1),
     %% Data block protudes over eof
-    ?line ok = 
+    ok =
 	?FILE_MODULE:pwrite(FD, SizeInit, 
 			    <<Size1:32/big-unsigned, 
-			     Pos:32/big-unsigned>>),
-    ?line {ok, {Size1, Pos, Data}} = 
+			      Pos:32/big-unsigned>>),
+    {ok, {Size1, Pos, Data}} =
 	?FILE_MODULE:ipread_s32bu_p32bu(FD, SizeInit, Size1),
     %% Data block outside file
-    ?line ok =
+    ok =
 	?FILE_MODULE:pwrite(FD, SizeInit, 
 			    <<Size:32/big-unsigned, 
-			     SizePos:32/big-unsigned>>),
-    ?line {ok, {Size, SizePos, eof}} =
+			      SizePos:32/big-unsigned>>),
+    {ok, {Size, SizePos, eof}} =
 	?FILE_MODULE:ipread_s32bu_p32bu(FD, SizeInit, Size),
     %% Zero size
-    ?line ok = 
+    ok =
 	?FILE_MODULE:pwrite(FD, SizeInit, 
 			    <<0:32/big-unsigned, 
-			     Pos:32/big-unsigned>>),
-    ?line {ok, {0, Pos, eof}} = 
+			      Pos:32/big-unsigned>>),
+    {ok, {0, Pos, eof}} =
 	?FILE_MODULE:ipread_s32bu_p32bu(FD, SizeInit, Size),
     %% Invalid header - protudes over eof
-    ?line eof = 
+    eof =
 	?FILE_MODULE:ipread_s32bu_p32bu(FD, 
 					Pos+Size-(Sizeof(Head)-1), 
 					infinity),
     %% Header not even in file
-    ?line eof = 
+    eof =
 	?FILE_MODULE:ipread_s32bu_p32bu(FD, Pos+Size, infinity),
     %%
-    ?line ok = ?FILE_MODULE:close(FD),
+    ok = ?FILE_MODULE:close(FD),
     ok.
 
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-interleaved_read_write(suite) ->
-    [];
-interleaved_read_write(doc) ->
-    ["Tests interleaved read and writes"];
+%% Tests interleaved read and writes.
 interleaved_read_write(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(30)),
-    %%
-    ?line Dir = ?config(priv_dir, Config),
-    ?line File = 
+    Dir = proplists:get_value(priv_dir, Config),
+    File =
 	filename:join(Dir, ?MODULE_STRING++"interleaved_read_write.txt"),
-    ?line {ok,F1} = ?FILE_MODULE:open(File, [write]),
-    ?line ok = ?FILE_MODULE:write(F1, "data---r1."), % 10 chars each
-    ?line ok = ?FILE_MODULE:write(F1, "data---r2."),
-    ?line ok = ?FILE_MODULE:write(F1, "data---r3."),
-    ?line ok = ?FILE_MODULE:close(F1),
-    ?line {ok,F2} = ?FILE_MODULE:open(File, [read, write]),
-    ?line {ok, "data---r1."} = ?FILE_MODULE:read(F2, 10),
-    ?line ok = ?FILE_MODULE:write(F2, "data---w2."),
-    ?line ok = ?FILE_MODULE:close(F2),
-    ?line {ok,F3} = ?FILE_MODULE:open(File, [read]),
-    ?line {ok, "data---r1."} = ?FILE_MODULE:read(F3, 10),
-    ?line {ok, "data---w2."} = ?FILE_MODULE:read(F3, 10),
-    ?line {ok, "data---r3."} = ?FILE_MODULE:read(F3, 10),
-    ?line eof = ?FILE_MODULE:read(F3, 1),
-    ?line ok = ?FILE_MODULE:close(F2),
+    {ok,F1} = ?FILE_MODULE:open(File, [write]),
+    ok = ?FILE_MODULE:write(F1, "data---r1."), % 10 chars each
+    ok = ?FILE_MODULE:write(F1, "data---r2."),
+    ok = ?FILE_MODULE:write(F1, "data---r3."),
+    ok = ?FILE_MODULE:close(F1),
+    {ok,F2} = ?FILE_MODULE:open(File, [read, write]),
+    {ok, "data---r1."} = ?FILE_MODULE:read(F2, 10),
+    ok = ?FILE_MODULE:write(F2, "data---w2."),
+    ok = ?FILE_MODULE:close(F2),
+    {ok,F3} = ?FILE_MODULE:open(File, [read]),
+    {ok, "data---r1."} = ?FILE_MODULE:read(F3, 10),
+    {ok, "data---w2."} = ?FILE_MODULE:read(F3, 10),
+    {ok, "data---r3."} = ?FILE_MODULE:read(F3, 10),
+    eof = ?FILE_MODULE:read(F3, 1),
+    ok = ?FILE_MODULE:close(F2),
     %%
-    ?line [] = flush(),
-    ?line ?t:timetrap_cancel(Dog),
+    [] = flush(),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-otp_5814(suite) ->
-    [];
-otp_5814(doc) ->
-    ["OTP-5814. eval/consult/script return correct line numbers"];
+%% OTP-5814. eval/consult/script return correct line numbers.
 otp_5814(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(10)),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     File = filename:join(PrivDir, "otp_5814"),
     Path = [PrivDir],
-    ?line ok = file:write_file(File, <<"{a,b,c}.
+    ok = file:write_file(File, <<"{a,b,c}.
                                         a.
-                                        b.
-                                        c.
-                                        {d,e,
-                                        [}.">>),
-    ?line {error, {6,erl_parse,_}} = file:eval(File),
-    ?line {error, {6,erl_parse,_}} = file:consult(File),
-    ?line {error, {6,erl_parse,_}} = file:path_consult(Path, File),
-    ?line {error, {6,erl_parse,_}} = file:path_eval(Path, File),
-    ?line {error, {6,erl_parse,_}} = file:script(File),
-    ?line {error, {6,erl_parse,_}} = file:path_script(Path, File),
-
-    ?line ok = file:write_file(File, <<>>),
-    ?line {error, {1,file,undefined_script}} = file:path_script(Path, File),
+b.
+c.
+{d,e,
+ [}.">>),
+    {error, {6,erl_parse,_}} = file:eval(File),
+ {error, {6,erl_parse,_}} = file:consult(File),
+ {error, {6,erl_parse,_}} = file:path_consult(Path, File),
+ {error, {6,erl_parse,_}} = file:path_eval(Path, File),
+ {error, {6,erl_parse,_}} = file:script(File),
+ {error, {6,erl_parse,_}} = file:path_script(Path, File),
+
+ ok = file:write_file(File, <<>>),
+ {error, {1,file,undefined_script}} = file:path_script(Path, File),
 
     %% The error is not propagated...
-    ?line ok = file:write_file(File, <<"a.
+ ok = file:write_file(File, <<"a.
                                         b.
-                                        1/0.">>),
-    ?line {error, {3, file, {error, badarith, _}}} = file:eval(File),
-    
-    ?line ok = file:write_file(File, <<"erlang:raise(throw, apa, []).">>),
-    ?line {error, {1, file, {throw, apa, _}}} = file:eval(File),
+1/0.">>),
+    {error, {3, file, {error, badarith, _}}} = file:eval(File),
 
-    file:delete(File),
-    ?line ?t:timetrap_cancel(Dog),
-    ok.
+ok = file:write_file(File, <<"erlang:raise(throw, apa, []).">>),
+{error, {1, file, {throw, apa, _}}} = file:eval(File),
+
+file:delete(File),
+ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-otp_10852(suite) ->
-    [];
-otp_10852(doc) ->
-    ["OTP-10852. +fnu and latin1 filenames"];
+%% OTP-10852. +fnu and latin1 filenames.
 otp_10852(Config) when is_list(Config) ->
     Node = start_node(erl_pp_helper, "+fnu"),
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     B = filename:join(Dir, <<"\xE4">>),
     ok = rpc_call(Node, get_cwd, [B]),
     {error, no_translation} = rpc_call(Node, set_cwd, [B]),
@@ -3857,10 +3588,10 @@ otp_10852(Config) when is_list(Config) ->
     ok = rpc_call(Node, read_file, [B]),
     ok = rpc_call(Node, make_link, [B,B]),
     case rpc_call(Node, make_symlink, [B,B]) of
-		ok -> ok;
-		{error, E} when (E =:= enotsup) or (E =:= eperm) ->
-			{win32,_} = os:type()
-	end,
+	ok -> ok;
+	{error, E} when (E =:= enotsup) or (E =:= eperm) ->
+	    {win32,_} = os:type()
+    end,
     ok = rpc_call(Node, delete, [B]),
     ok = rpc_call(Node, make_dir, [B]),
     ok = rpc_call(Node, del_dir, [B]),
@@ -3883,58 +3614,58 @@ rpc_call(N, F, As) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-large_file(suite) ->
-    [];
-large_file(doc) ->
-    ["Tests positioning in large files (> 4G)"];
+large_file() ->
+    [{timetrap,{minutes,20}}].
+
+%% Tests positioning in large files (> 4G).
 large_file(Config) when is_list(Config) ->
     run_large_file_test(Config,
 			fun(Name) -> do_large_file(Name) end,
 			"_large_file").
 
 do_large_file(Name) ->
-    ?line Watchdog = ?t:timetrap(?t:minutes(20)),
-
-    ?line S = "1234567890",
+    S = "1234567890",
     L = length(S),
     R = lists:reverse(S),
     P = 1 bsl 32,
     Ss = lists:sort(S),
     Rs = lists:reverse(Ss),
-    ?line {ok,F}  = ?FILE_MODULE:open(Name, [raw,read,write]),
-    ?line ok      = ?FILE_MODULE:write(F, S),
-    ?line {ok,P}  = ?FILE_MODULE:position(F, P),
-    ?line ok      = ?FILE_MODULE:write(F, R),
-    ?line {ok,0}  = ?FILE_MODULE:position(F, bof),
-    ?line {ok,S}  = ?FILE_MODULE:read(F, L),
-    ?line {ok,P}  = ?FILE_MODULE:position(F, {eof,-L}),
-    ?line {ok,R}  = ?FILE_MODULE:read(F, L+1),
-    ?line {ok,S}  = ?FILE_MODULE:pread(F, 0, L),
-    ?line {ok,R}  = ?FILE_MODULE:pread(F, P, L+1),
-    ?line ok      = ?FILE_MODULE:pwrite(F, 0, Ss),
-    ?line ok      = ?FILE_MODULE:pwrite(F, P, Rs),
-    ?line {ok,0}  = ?FILE_MODULE:position(F, bof),
-    ?line {ok,Ss} = ?FILE_MODULE:read(F, L),
-    ?line {ok,P}  = ?FILE_MODULE:position(F, {eof,-L}),
-    ?line {ok,Rs} = ?FILE_MODULE:read(F, L+1),
-    ?line ok      = ?FILE_MODULE:close(F),
+    {ok,F}  = ?FILE_MODULE:open(Name, [raw,read,write]),
+    ok      = ?FILE_MODULE:write(F, S),
+    {ok,P}  = ?FILE_MODULE:position(F, P),
+    ok      = ?FILE_MODULE:write(F, R),
+    {ok,0}  = ?FILE_MODULE:position(F, bof),
+    {ok,S}  = ?FILE_MODULE:read(F, L),
+    {ok,P}  = ?FILE_MODULE:position(F, {eof,-L}),
+    {ok,R}  = ?FILE_MODULE:read(F, L+1),
+    {ok,S}  = ?FILE_MODULE:pread(F, 0, L),
+    {ok,R}  = ?FILE_MODULE:pread(F, P, L+1),
+    ok      = ?FILE_MODULE:pwrite(F, 0, Ss),
+    ok      = ?FILE_MODULE:pwrite(F, P, Rs),
+    {ok,0}  = ?FILE_MODULE:position(F, bof),
+    {ok,Ss} = ?FILE_MODULE:read(F, L),
+    {ok,P}  = ?FILE_MODULE:position(F, {eof,-L}),
+    {ok,Rs} = ?FILE_MODULE:read(F, L+1),
+    ok      = ?FILE_MODULE:close(F),
     %% Reopen the file with 'append'; used to fail on Windows causing
     %% writes to go to the beginning of the file for files > 4GB.
-    ?line PL = P + L,
-    ?line PLL = PL + L,
-    ?line {ok,F1}  = ?FILE_MODULE:open(Name, [raw,read,write,append]),
-    ?line ok       = ?FILE_MODULE:write(F1, R),
-    ?line {ok,PLL} = ?FILE_MODULE:position(F1, {cur,0}),
-    ?line {ok,Rs}  = ?FILE_MODULE:pread(F1, P, L),
-    ?line {ok,PL}  = ?FILE_MODULE:position(F1, {eof,-L}),
-    ?line {ok,R}   = ?FILE_MODULE:read(F1, L+1),
-    ?line ok       = ?FILE_MODULE:close(F1),
-    %%
-    ?line ?t:timetrap_cancel(Watchdog),
+    PL = P + L,
+    PLL = PL + L,
+    {ok,F1}  = ?FILE_MODULE:open(Name, [raw,read,write,append]),
+    ok       = ?FILE_MODULE:write(F1, R),
+    {ok,PLL} = ?FILE_MODULE:position(F1, {cur,0}),
+    {ok,Rs}  = ?FILE_MODULE:pread(F1, P, L),
+    {ok,PL}  = ?FILE_MODULE:position(F1, {eof,-L}),
+    {ok,R}   = ?FILE_MODULE:read(F1, L+1),
+    ok       = ?FILE_MODULE:close(F1),
+
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+large_write() ->
+    [{timetrap,{minutes,20}}].
+
 large_write(Config) when is_list(Config) ->
     run_large_file_test(Config,
 			fun(Name) -> do_large_write(Name) end,
@@ -3964,8 +3695,8 @@ do_large_write(Name) ->
 
 response_analysis(Module, Function, Arguments) ->
     Parent = self(),
-    ?line erlang:yield(), % Schedule out before test
-    ?line Child = 
+    erlang:yield(), % Schedule out before test
+    Child =
 	spawn_link(
 	  fun () ->
 		  receive {Parent, start, Ts} -> ok end,
@@ -3985,19 +3716,19 @@ response_analysis(Module, Function, Arguments) ->
 		  Parent ! {self(), stopped, response_stat(Stat, micro_ts())}
 	  end),
     Child ! {Parent, start, micro_ts()},
-    ?line Result = apply(Module, Function, Arguments),
-    ?line Child ! {Parent, stop},
-    ?line {N, Sum, _, M, Max} = receive {Child, stopped, X} -> X end,
-    ?line Mean_ms = (0.001*Sum) / (N-1),
-    ?line Max_ms = 0.001 * Max,
-    ?line Comment = 
+    Result = apply(Module, Function, Arguments),
+    Child ! {Parent, stop},
+    {N, Sum, _, M, Max} = receive {Child, stopped, X} -> X end,
+    Mean_ms = (0.001*Sum) / (N-1),
+    Max_ms = 0.001 * Max,
+    Comment =
 	lists:flatten(
 	  io_lib:format(
 	    "Scheduling interval: Mean = ~.3f ms, "
 	    ++"Max = ~.3f ms for no ~p of ~p.~n",
 	    [Mean_ms, Max_ms, M, (N-1)])),
-    ?line {Result, Comment}.
-    
+    {Result, Comment}.
+
 micro_ts() ->
     erlang:monotonic_time(micro_seconds).
 
@@ -4021,10 +3752,10 @@ response_stat({N, Sum, Ts0, M, Max}, Ts) ->
 %% create_file/2 below is some 44 times faster.
 
 create_file_slow(Name, N) when is_integer(N), N >= 0 ->
-    ?line {ok, FD} = 
+    {ok, FD} =
 	?FILE_MODULE:open(Name, [raw, write, delayed_write, binary]),
-    ?line ok = create_file_slow(FD, 0, N),
-    ?line ok = ?FILE_MODULE:close(FD),
+    ok = create_file_slow(FD, 0, N),
+    ok = ?FILE_MODULE:close(FD),
     ok.
 
 create_file_slow(_FD, M, M) ->
@@ -4039,10 +3770,10 @@ create_file_slow(FD, M, N) ->
 %% from 0 to N-1.
 
 create_file(Name, N) when is_integer(N), N >= 0 ->
-    ?line {ok, FD} = 
+    {ok, FD} =
 	?FILE_MODULE:open(Name, [raw, write, delayed_write, binary]),
-    ?line ok = create_file(FD, 0, N),
-    ?line ok = ?FILE_MODULE:close(FD),
+    ok = create_file(FD, 0, N),
+    ok = ?FILE_MODULE:close(FD),
     ok.
 
 create_file(_FD, M, M) ->
@@ -4059,10 +3790,10 @@ create_file(FD, M, N0, R) when M + 8 =< N0 ->
     N1  = N0-1,  N2  = N0-2,  N3  = N0-3,  N4  = N0-4, 
     N5  = N0-5,  N6  = N0-6,  N7  = N0-7,  N8  = N0-8, 
     create_file(FD, M, N8, 
-		  [<<N8:32/unsigned,  N7:32/unsigned, 
-		    N6:32/unsigned,  N5:32/unsigned, 
-		    N4:32/unsigned,  N3:32/unsigned, 
-		    N2:32/unsigned,  N1:32/unsigned>> | R]);
+		[<<N8:32/unsigned,  N7:32/unsigned,
+		   N6:32/unsigned,  N5:32/unsigned,
+		   N4:32/unsigned,  N3:32/unsigned,
+		   N2:32/unsigned,  N1:32/unsigned>> | R]);
 create_file(FD, M, N0, R) ->
     N1 = N0-1,
     create_file(FD, M, N1, [<<N1:32/unsigned>> | R]).
@@ -4079,14 +3810,14 @@ create_bin(M, N0, R) when M+8 =< N0 ->
     N5  = N0-5,  N6  = N0-6,  N7  = N0-7,  N8  = N0-8, 
     create_bin(M, N8,
 	       [<<N8:32/unsigned,  N7:32/unsigned, 
-		 N6:32/unsigned,  N5:32/unsigned, 
-		 N4:32/unsigned,  N3:32/unsigned, 
-		 N2:32/unsigned,  N1:32/unsigned>> | R]);
+		  N6:32/unsigned,  N5:32/unsigned,
+		  N4:32/unsigned,  N3:32/unsigned,
+		  N2:32/unsigned,  N1:32/unsigned>> | R]);
 create_bin(M, N0, R) ->
     N1 = N0-1,
     create_bin(M, N1, [<<N1:32/unsigned>> | R]).
-    
-    
+
+
 
 
 verify_bin(<<>>, _, 0) ->
@@ -4098,8 +3829,8 @@ verify_bin(Bin, N, Cnt) ->
     N4 = N + 4, N5 = N + 5, N6 = N + 6, N7 = N + 7, 
     case Bin of
 	<<N0:32/unsigned, N1:32/unsigned, N2:32/unsigned, N3:32/unsigned, 
-	 N4:32/unsigned, N5:32/unsigned, N6:32/unsigned, N7:32/unsigned,
-	 B/binary>> ->
+	  N4:32/unsigned, N5:32/unsigned, N6:32/unsigned, N7:32/unsigned,
+	  B/binary>> ->
 	    verify_bin(B, N+8, Cnt-8);
 	<<N:32/unsigned, B/binary>> ->
 	    verify_bin(B, N+1, Cnt-1);
@@ -4180,13 +3911,13 @@ pwrite_file(Name, Data) ->
 
 read_line_testdata(PrivDir) ->
     All0 = [{fun read_line_create0/1,"Testdata1.txt",5,10},
-	   {fun read_line_create1/1,"Testdata2.txt",401,802},
-	   {fun read_line_create2/1,"Testdata3.txt",1,2},
-	   {fun read_line_create3/1,"Testdata4.txt",601,fail},
-	   {fun read_line_create4/1,"Testdata5.txt",601,1002},
-	   {fun read_line_create5/1,"Testdata6.txt",601,1202},
-	   {fun read_line_create6/1,"Testdata7.txt",601,1202},
-	   {fun read_line_create7/1,"Testdata8.txt",4001,8002}],
+	    {fun read_line_create1/1,"Testdata2.txt",401,802},
+	    {fun read_line_create2/1,"Testdata3.txt",1,2},
+	    {fun read_line_create3/1,"Testdata4.txt",601,fail},
+	    {fun read_line_create4/1,"Testdata5.txt",601,1002},
+	    {fun read_line_create5/1,"Testdata6.txt",601,1202},
+	    {fun read_line_create6/1,"Testdata7.txt",601,1202},
+	    {fun read_line_create7/1,"Testdata8.txt",4001,8002}],
     [ {A,filename:join([PrivDir,B]),C,D} || {A,B,C,D} <- All0 ].
 
 read_line_create_files(TestData) ->
@@ -4195,105 +3926,93 @@ read_line_create_files(TestData) ->
 read_line_remove_files(TestData) ->
     [ file:delete(File) || {_Function,File,_,_} <- TestData ].
 
-read_line_1(suite) -> 
-    [];
-read_line_1(doc) ->
-    ["read_line with prim_file"];
+%% read_line with prim_file.
 read_line_1(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line All = read_line_testdata(PrivDir),
-    ?line read_line_create_files(All),
-    ?line [ begin 
-		io:format("read_line_all: ~s~n",[File]),
-		{X,_} = read_line_all(File),
-		true
-	    end || {_,File,X,_} <- All ],
-    ?line [ begin 
-		io:format("read_line_all_alternating: ~s~n",[File]),
-		{Y,_} = read_line_all_alternating(File),
-		true
-	    end || {_,File,_,Y} <- All , Y =/= fail],
-    ?line [ begin 
-		io:format("read_line_all_alternating (failing as should): ~s~n",[File]),
-		{'EXIT',_} = (catch read_line_all_alternating(File)),
-		true
-	    end || {_,File,_,Y} <- All , Y =:= fail],
-    ?line read_line_remove_files(All),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    All = read_line_testdata(PrivDir),
+    read_line_create_files(All),
+    [ begin
+	  io:format("read_line_all: ~s~n",[File]),
+	  {X,_} = read_line_all(File),
+	  true
+      end || {_,File,X,_} <- All ],
+    [ begin
+	  io:format("read_line_all_alternating: ~s~n",[File]),
+	  {Y,_} = read_line_all_alternating(File),
+	  true
+      end || {_,File,_,Y} <- All , Y =/= fail],
+    [ begin
+	  io:format("read_line_all_alternating (failing as should): ~s~n",[File]),
+	  {'EXIT',_} = (catch read_line_all_alternating(File)),
+	  true
+      end || {_,File,_,Y} <- All , Y =:= fail],
+    read_line_remove_files(All),
     ok.
-read_line_2(suite) -> 
-    [];
-read_line_2(doc) ->
-    ["read_line with file"];
+%% read_line with file.
 read_line_2(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line All = read_line_testdata(PrivDir),
-    ?line read_line_create_files(All),
-    ?line [ begin 
-		io:format("read_line_all: ~s~n",[File]),
-		{X,_} = read_line_all2(File),
-		true
-	    end || {_,File,X,_} <- All ],
-    ?line [ begin 
-		io:format("read_line_all_alternating: ~s~n",[File]),
-		{Y,_} = read_line_all_alternating2(File),
-		true
-	    end || {_,File,_,Y} <- All , Y =/= fail],
-    ?line [ begin 
-		io:format("read_line_all_alternating (failing as should): ~s~n",[File]),
-		{'EXIT',_} = (catch read_line_all_alternating2(File)),
-		true
-	    end || {_,File,_,Y} <- All , Y =:= fail],
-    ?line read_line_remove_files(All),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    All = read_line_testdata(PrivDir),
+    read_line_create_files(All),
+    [ begin
+	  io:format("read_line_all: ~s~n",[File]),
+	  {X,_} = read_line_all2(File),
+	  true
+      end || {_,File,X,_} <- All ],
+    [ begin
+	  io:format("read_line_all_alternating: ~s~n",[File]),
+	  {Y,_} = read_line_all_alternating2(File),
+	  true
+      end || {_,File,_,Y} <- All , Y =/= fail],
+    [ begin
+	  io:format("read_line_all_alternating (failing as should): ~s~n",[File]),
+	  {'EXIT',_} = (catch read_line_all_alternating2(File)),
+	  true
+      end || {_,File,_,Y} <- All , Y =:= fail],
+    read_line_remove_files(All),
     ok.
-read_line_3(suite) -> 
-    [];
-read_line_3(doc) ->
-    ["read_line with raw file"];
+%% read_line with raw file.
 read_line_3(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line All = read_line_testdata(PrivDir),
-    ?line read_line_create_files(All),
-    ?line [ begin 
-		io:format("read_line_all: ~s~n",[File]),
-		{X,_} = read_line_all3(File),
-		true
-	    end || {_,File,X,_} <- All ],
-    ?line [ begin 
-		io:format("read_line_all_alternating: ~s~n",[File]),
-		{Y,_} = read_line_all_alternating3(File),
-		true
-	    end || {_,File,_,Y} <- All , Y =/= fail],
-    ?line [ begin 
-		io:format("read_line_all_alternating (failing as should): ~s~n",[File]),
-		{'EXIT',_} = (catch read_line_all_alternating3(File)),
-		true
-	    end || {_,File,_,Y} <- All , Y =:= fail],
-    ?line read_line_remove_files(All),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    All = read_line_testdata(PrivDir),
+    read_line_create_files(All),
+    [ begin
+	  io:format("read_line_all: ~s~n",[File]),
+	  {X,_} = read_line_all3(File),
+	  true
+      end || {_,File,X,_} <- All ],
+    [ begin
+	  io:format("read_line_all_alternating: ~s~n",[File]),
+	  {Y,_} = read_line_all_alternating3(File),
+	  true
+      end || {_,File,_,Y} <- All , Y =/= fail],
+    [ begin
+	  io:format("read_line_all_alternating (failing as should): ~s~n",[File]),
+	  {'EXIT',_} = (catch read_line_all_alternating3(File)),
+	  true
+      end || {_,File,_,Y} <- All , Y =:= fail],
+    read_line_remove_files(All),
     ok.
-read_line_4(suite) -> 
-    [];
-read_line_4(doc) ->
-    ["read_line with raw buffered file"];
+%% read_line with raw buffered file.
 read_line_4(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line All = read_line_testdata(PrivDir),
-    ?line read_line_create_files(All),
-    ?line [ begin 
-		io:format("read_line_all: ~s~n",[File]),
-		{X,_} = read_line_all4(File),
-		true
-	    end || {_,File,X,_} <- All ],
-    ?line [ begin 
-		io:format("read_line_all_alternating: ~s~n",[File]),
-		{Y,_} = read_line_all_alternating4(File),
-		true
-	    end || {_,File,_,Y} <- All , Y =/= fail],
-    ?line [ begin 
-		io:format("read_line_all_alternating (failing as should): ~s~n",[File]),
-		{'EXIT',_} = (catch read_line_all_alternating4(File)),
-		true
-	    end || {_,File,_,Y} <- All , Y =:= fail],
-    ?line read_line_remove_files(All),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    All = read_line_testdata(PrivDir),
+    read_line_create_files(All),
+    [ begin
+	  io:format("read_line_all: ~s~n",[File]),
+	  {X,_} = read_line_all4(File),
+	  true
+      end || {_,File,X,_} <- All ],
+    [ begin
+	  io:format("read_line_all_alternating: ~s~n",[File]),
+	  {Y,_} = read_line_all_alternating4(File),
+	  true
+      end || {_,File,_,Y} <- All , Y =/= fail],
+    [ begin
+	  io:format("read_line_all_alternating (failing as should): ~s~n",[File]),
+	  {'EXIT',_} = (catch read_line_all_alternating4(File)),
+	  true
+      end || {_,File,_,Y} <- All , Y =:= fail],
+    read_line_remove_files(All),
     ok.
 
 rl_lines() ->
@@ -4548,7 +4267,7 @@ run_large_file_test(Config, Run, Name) ->
 	{{unix,sunos},OsVersion} when OsVersion < {5,5,1} ->
 	    {skip,"Only supported on Win32, Unix or SunOS >= 5.5.1"};
 	{{unix,_},_} ->
-	    N = disc_free(?config(priv_dir, Config)),
+	    N = disc_free(proplists:get_value(priv_dir, Config)),
 	    io:format("Free disk: ~w KByte~n", [N]),
 	    if N < 5 * (1 bsl 20) ->
 		    %% Less than 5 GByte free
@@ -4562,9 +4281,9 @@ run_large_file_test(Config, Run, Name) ->
 
 
 do_run_large_file_test(Config, Run, Name0) ->
-    Name = filename:join(?config(priv_dir, Config),
+    Name = filename:join(proplists:get_value(priv_dir, Config),
 			 ?MODULE_STRING ++ Name0),
-    
+
     %% Set up a process that will delete this file.
     Tester = self(),
     Deleter = 
@@ -4577,7 +4296,7 @@ do_run_large_file_test(Config, Run, Name0) ->
 		  end,
 		  ?FILE_MODULE:delete(Name)
 	  end),
-    
+
     %% Run the test case.
     Res = Run(Name),
 
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl
index 32006d893e..dcd2cb28a6 100644
--- a/lib/kernel/test/file_name_SUITE.erl
+++ b/lib/kernel/test/file_name_SUITE.erl
@@ -19,7 +19,7 @@
 %% %CopyrightEnd%
 %%
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
 %%
@@ -79,14 +79,14 @@
 
 
 init_per_testcase(_Func, Config) ->
-    Dog = test_server:timetrap(test_server:seconds(60)),
-    [{watchdog,Dog}|Config].
+    Config.
 
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog).
+end_per_testcase(_Func, _Config) ->
+    ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [normal, icky, very_icky, normalize, home_dir].
@@ -101,19 +101,16 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
-home_dir(suite) ->
-    [];
-home_dir(doc) ->
-    ["Check that Erlang can be started with unicode named home directory"];
+%% Check that Erlang can be started with unicode named home directory.
 home_dir(Config) when is_list(Config) ->
     try
 	Name=[960,945,964,961,953,954],
-	Priv = ?config(priv_dir, Config),
+	Priv = proplists:get_value(priv_dir, Config),
 	UniMode = file:native_name_encoding() =/= latin1,
 	if 
 	    not UniMode ->
@@ -142,7 +139,12 @@ home_dir(Config) when is_list(Config) ->
 	    test_server:stop_node(Node),
 	    ok
 	after
-	    os:putenv(SaveOldName,SaveOldValue),
+	    case SaveOldValue of
+		false ->
+		    os:unsetenv(SaveOldName);
+		_ ->
+		    os:putenv(SaveOldName,SaveOldValue)
+	    end,
 	    rm_rf(prim_file,NewHome)
 	end
     catch
@@ -154,49 +156,41 @@ home_dir(Config) when is_list(Config) ->
 	    {skipped,"Runs only on Unix/Windows"}
     end.
 
-normalize(suite) ->
-    [];
-normalize(doc) ->
-    ["Check that filename normalization works"];
+%% Check that filename normalization works.
 normalize(Config) when is_list(Config) ->
-    random:seed({1290,431421,830412}),
+    rand:seed(exsplus, {1290,431421,830412}),
     try
-	?line UniMode = file:native_name_encoding() =/= latin1,
+	UniMode = file:native_name_encoding() =/= latin1,
 	if 
 	    not UniMode ->
 		throw(need_unicode_mode);
 	    true ->
 		ok
 	end,
-	?line Pairs = [rand_comp_decomp(200) || _ <- lists:seq(1,1000)],
+	Pairs = [rand_comp_decomp(200) || _ <- lists:seq(1,1000)],
 	case os:type() of
 	    {unix,darwin} ->
-		?line [ true = (A =:= prim_file:internal_native2name(B)) ||
+		[ true = (A =:= prim_file:internal_native2name(B)) ||
 		    {A,B} <- Pairs ];
 	    _ ->
 		ok
 	end,
-	?line [ true = (A =:= prim_file:internal_normalize_utf8(B)) ||
-		  {A,B} <- Pairs ]
-	
+	[ true = (A =:= prim_file:internal_normalize_utf8(B)) ||
+	    {A,B} <- Pairs ]
+
     catch
 	throw:need_unicode_mode ->
 	    io:format("Sorry, can only run in unicode mode.~n"),
 	    {skipped,"VM needs to be started in Unicode filename mode"}
     end.
-    
-normal(suite) ->
-    [];
-normal(doc) ->
-    "Check file operations on normal file names regardless of unicode mode";
+
+%% Check file operations on normal file names regardless of unicode mode.
 normal(Config) when is_list(Config) ->
     {ok,Dir} = file:get_cwd(),
     try
-	Priv = ?config(priv_dir, Config),
+	Priv = proplists:get_value(priv_dir, Config),
 	file:set_cwd(Priv),
-	put(file_module,prim_file),
 	ok = check_normal(prim_file),
-	put(file_module,file),
 	ok = check_normal(file),
 	%% If all is good, delete dir again (avoid hanging dir on windows)
 	rm_rf(file,"normal_dir"),
@@ -204,12 +198,9 @@ normal(Config) when is_list(Config) ->
     after
 	file:set_cwd(Dir)
     end.
-    
 
-icky(suite) ->
-    [];
-icky(doc) ->
-    "Check file operations on normal file names regardless of unicode mode";
+
+%% Check file operations on normal file names regardless of unicode mode.
 icky(Config) when is_list(Config) ->
     case hopeless_darwin() of
 	true ->
@@ -217,11 +208,9 @@ icky(Config) when is_list(Config) ->
 	false ->
 	    {ok,Dir} = file:get_cwd(),
 	    try
-		Priv = ?config(priv_dir, Config),
+		Priv = proplists:get_value(priv_dir, Config),
 		file:set_cwd(Priv),
-		put(file_module,prim_file),
 		ok = check_icky(prim_file),
-		put(file_module,file),
 		ok = check_icky(file),
 		%% If all is good, delete dir again (avoid hanging dir on windows)
 		rm_rf(file,"icky_dir"),
@@ -230,10 +219,7 @@ icky(Config) when is_list(Config) ->
 		file:set_cwd(Dir)
 	    end
     end.
-very_icky(suite) ->
-    [];
-very_icky(doc) ->
-    "Check file operations on normal file names regardless of unicode mode";
+%% Check file operations on normal file names regardless of unicode mode.
 very_icky(Config) when is_list(Config) ->
     case hopeless_darwin() of
 	true ->
@@ -241,14 +227,12 @@ very_icky(Config) when is_list(Config) ->
 	false ->
 	    {ok,Dir} = file:get_cwd(),
 	    try
-		Priv = ?config(priv_dir, Config),
+		Priv = proplists:get_value(priv_dir, Config),
 		file:set_cwd(Priv),
-		put(file_module,prim_file),
 		case check_very_icky(prim_file) of
 		    need_unicode_mode ->
 			{skipped,"VM needs to be started in Unicode filename mode"};
 		    ok ->
-			put(file_module,file),
 			ok = check_very_icky(file),
 			%% If all is good, delete dir again
 			%% (avoid hanging dir on windows)
@@ -259,78 +243,79 @@ very_icky(Config) when is_list(Config) ->
 		file:set_cwd(Dir)
 	    end
     end.
-    
+
 
 check_normal(Mod) -> 
     {ok,Dir} = Mod:get_cwd(),
     try
-	?line make_normal_dir(Mod),
-	?line {ok, L0} = Mod:list_dir("."),
-	?line L1 = lists:sort(L0),
-	%erlang:display(L1),
-	?line L1 = lists:sort(list(normal_dir())),
-	?line {ok,D2} = Mod:get_cwd(),
-	?line true = is_list(D2),
-	?line case Mod:altname("fil1") of
+	NormalDir = make_normal_dir(Mod, "normal_dir"),
+	io:format("Normaldir = ~p\n", [NormalDir]),
+	L1 = lists:sort(list(NormalDir)),
+	{ok, L0} = Mod:list_dir("."),
+	io:format("L0 = ~p\n", [L0]),
+	L1 = lists:sort(L0),
+	{ok,D2} = Mod:get_cwd(),
+	true = is_list(D2),
+	case Mod:altname("fil1") of
 	    {error,enotsup} ->
 		ok;
 	    {ok,LLL} when is_list(LLL) ->
 		ok
 	end,
-	?line [ true = is_list(El) || El <- L1],
-	?line Syms = [ {S,Targ,list_to_binary(get_data(Targ,normal_dir()))} 
-		 || {T,S,Targ} <- normal_dir(), T =:= symlink ],
-	?line [ {ok, Cont} = Mod:read_file(SymL) || {SymL,_,Cont} <- Syms ],
-	?line [ {ok, Targ} = fixlink(Mod:read_link(SymL)) || {SymL,Targ,_} <- Syms ],
-	?line chk_cre_dir(Mod,[{directory,"temp_dir",normal_dir()}]),
-	?line {ok,BeginAt} = Mod:get_cwd(),
-	?line true = is_list(BeginAt),
-	?line {error,enoent} = Mod:set_cwd("tmp_dir"),
-	?line ok = Mod:set_cwd("temp_dir"),
-	?line {ok, NowAt} = Mod:get_cwd(),
-	?line true = BeginAt =/= NowAt,
-	?line ok = Mod:set_cwd(".."),
-	?line {ok,BeginAt} = Mod:get_cwd(),
-	?line rm_r(Mod,"temp_dir"),
-	?line true = is_list(Dir),
-	?line [ true = is_list(FN) || FN <- L0 ],
-	case has_links() of
-	    true ->
-		?line ok = Mod:make_link("fil1","nisse"),
-		?line {ok, <<"fil1">>} = Mod:read_file("nisse"),
-		?line {ok, #file_info{type = regular}} = Mod:read_link_info("nisse"),
-		?line ok = Mod:delete("nisse"),
-		?line {ok, <<"fil1">>} = Mod:read_file("fil1"),
-		?line {error,enoent} = Mod:read_file("nisse"),
-		?line {error,enoent} = Mod:read_link_info("nisse");
-	    false ->
+	[ true = is_list(El) || El <- L1],
+	Syms = [ {S,Targ,list_to_binary(get_data(Targ, NormalDir))}
+		 || {T,S,Targ} <- NormalDir, T =:= symlink ],
+	[ {ok, Cont} = Mod:read_file(SymL) || {SymL,_,Cont} <- Syms ],
+	[ {ok, Targ} = fixlink(Mod:read_link(SymL)) || {SymL,Targ,_} <- Syms ],
+
+	{ok,BeginAt} = Mod:get_cwd(),
+	true = is_list(BeginAt),
+	TempDir = "temp_dir",
+	make_normal_dir(Mod, TempDir),
+	{error,enoent} = Mod:set_cwd("tmp_dir"),
+	{ok, NowAt} = Mod:get_cwd(),
+	true = BeginAt =/= NowAt,
+	ok = Mod:set_cwd(".."),
+	{ok,BeginAt} = Mod:get_cwd(),
+	rm_r(Mod, TempDir),
+	true = is_list(Dir),
+	[ true = is_list(FN) || FN <- L0 ],
+	case Mod:make_link("fil1","nisse") of
+	    ok ->
+		{ok, <<"fil1">>} = Mod:read_file("nisse"),
+		{ok, #file_info{type = regular}} = Mod:read_link_info("nisse"),
+		ok = Mod:delete("nisse"),
+		{ok, <<"fil1">>} = Mod:read_file("fil1"),
+		{error,enoent} = Mod:read_file("nisse"),
+		{error,enoent} = Mod:read_link_info("nisse");
+	    {error,enotsup} ->
 		ok
 	end,
-	?line [ begin
-	      ?line {ok, FD} = Mod:open(Name,[read]),
-	      ?line {ok, Content} = Mod:read(FD,1024),
-	      ?line ok = file:close(FD)
-	  end || {regular,Name,Content} <- normal_dir() ],
-	?line [ begin
-	      ?line {ok, FD} = Mod:open(Name,[read,binary]),
-	      ?line BC = list_to_binary(Content),
-	      ?line {ok, BC} = Mod:read(FD,1024),
-	      ?line ok = file:close(FD)
-	  end || {regular,Name,Content} <- normal_dir() ],
-	?line Mod:rename("fil1","tmp_fil1"),
-	?line {ok, <<"fil1">>} = Mod:read_file("tmp_fil1"),
-	?line {error,enoent} = Mod:read_file("fil1"),
-	?line Mod:rename("tmp_fil1","fil1"),
-	?line {ok, <<"fil1">>} = Mod:read_file("fil1"),
-	?line {error,enoent} = Mod:read_file("tmp_fil1"),
-	?line {ok,FI} = Mod:read_file_info("fil1"),
-	?line NewMode = FI#file_info.mode band (bnot 8#333),
-	?line NewMode2 = NewMode bor 8#222,
-	?line true = NewMode2 =/= NewMode,
-	?line ok = Mod:write_file_info("fil1",FI#file_info{mode = NewMode}),
-	?line {ok,#file_info{mode = NewMode}} = Mod:read_file_info("fil1"),
-	?line ok = Mod:write_file_info("fil1",FI#file_info{mode = NewMode2}),
-	?line {ok,#file_info{mode = NewMode2}} = Mod:read_file_info("fil1"),
+	[ begin
+	      {ok, FD} = Mod:open(Name,[read]),
+	      {ok, Content} = Mod:read(FD,1024),
+	      ok = file:close(FD)
+	  end || {regular,Name,Content} <- NormalDir ],
+	[ begin
+	      {ok, FD} = Mod:open(Name,[read,binary]),
+	      BC = list_to_binary(Content),
+	      {ok, BC} = Mod:read(FD,1024),
+	      ok = file:close(FD)
+	  end || {regular,Name,Content} <- NormalDir ],
+	Mod:rename("fil1","tmp_fil1"),
+	{ok, <<"fil1">>} = Mod:read_file("tmp_fil1"),
+	{error,enoent} = Mod:read_file("fil1"),
+	Mod:rename("tmp_fil1","fil1"),
+	{ok, <<"fil1">>} = Mod:read_file("fil1"),
+	{error,enoent} = Mod:read_file("tmp_fil1"),
+	{ok,FI} = Mod:read_file_info("fil1"),
+	NewMode = FI#file_info.mode band (bnot 8#333),
+	NewMode2 = NewMode bor 8#222,
+	true = NewMode2 =/= NewMode,
+	ok = Mod:write_file_info("fil1",FI#file_info{mode = NewMode}),
+	{ok,#file_info{mode = NewMode}} = Mod:read_file_info("fil1"),
+	ok = Mod:write_file_info("fil1",FI#file_info{mode = NewMode2}),
+	{ok,#file_info{mode = NewMode2}} = Mod:read_file_info("fil1"),
 	ok
     after
         case Mod:read_file_info("fil1") of
@@ -347,129 +332,130 @@ check_normal(Mod) ->
 check_icky(Mod) -> 
     {ok,Dir} = Mod:get_cwd(),
     try
-	?line true=(length("åäö") =:= 3),
-	?line UniMode = file:native_name_encoding() =/= latin1,
-	?line make_icky_dir(Mod),
+	true=(length("åäö") =:= 3),
+	UniMode = file:native_name_encoding() =/= latin1,
+	IckyDir = make_icky_dir(Mod, "icky_dir"),
  	{ok, L0} = Mod:list_dir_all("."),
- 	?line L1 = lists:sort(L0),
-	io:format("~p~n~p~n~n",[L1,lists:sort(list(icky_dir()))]),
- 	?line L1 = lists:sort(convlist(list(icky_dir()))),
- 	?line {ok,D2} = Mod:get_cwd(),
- 	?line true = is_list(D2),
-%% Altname only on windows, and there are no non native filenames there
-%% 	?line case Mod:altname("fil1") of
-%% 	    {error,enotsup} ->
-%% 		ok;
-%% 	    {ok,LLL} when is_list(LLL) ->
-%% 		ok
-%% 	end,
- 	?line [ true = ((is_list(El) or (UniMode and is_binary(El))))  || El <- L1],
- 	?line Syms = [ {S,conv(Targ),list_to_binary(get_data(Targ,icky_dir()))} 
- 		 || {T,S,Targ} <- icky_dir(), T =:= symlink ],
- 	?line [ {ok, Cont} = Mod:read_file(SymL) || {SymL,_,Cont} <- Syms ],
+	L1 = lists:sort(L0),
+	io:format("~p~n~p~n~n",[L1,lists:sort(list(IckyDir))]),
+	L1 = lists:sort(convlist(list(IckyDir))),
+	{ok,D2} = Mod:get_cwd(),
+	true = is_list(D2),
+	%% Altname only on windows, and there are no non native filenames there
+	%% 	case Mod:altname("fil1") of
+	%% 	    {error,enotsup} ->
+	%% 		ok;
+	%% 	    {ok,LLL} when is_list(LLL) ->
+	%% 		ok
+	%% 	end,
+	[ true = ((is_list(El) or (UniMode and is_binary(El))))  || El <- L1],
+	Syms = [ {S,conv(Targ),list_to_binary(get_data(Targ,IckyDir))}
+		 || {T,S,Targ} <- IckyDir, T =:= symlink ],
+	[ {ok, Cont} = Mod:read_file(SymL) || {SymL,_,Cont} <- Syms ],
  	[ {ok, Targ} = fixlink(Mod:read_link_all(SymL)) ||
 	    {SymL,Targ,_} <- Syms ],
-        ?line chk_cre_dir(Mod,[{directory,"åäö_dir",icky_dir()}]),
- 	?line {ok,BeginAt} = Mod:get_cwd(),
- 	?line true = is_list(BeginAt),
-        ?line {error,enoent} = Mod:set_cwd("åä_dir"),
-	?line ok = Mod:set_cwd("åäö_dir"),
- 	?line {ok, NowAt} = Mod:get_cwd(),
- 	?line true = is_list(NowAt),
- 	?line true = BeginAt =/= NowAt,
- 	?line ok = Mod:set_cwd(".."),
- 	?line {ok,BeginAt} = Mod:get_cwd(),
-        ?line rm_r2(Mod,"åäö_dir"),
+
+	{ok,BeginAt} = Mod:get_cwd(),
+	true = is_list(BeginAt),
+        _ = make_icky_dir(Mod, "åäö_dir"),
+        {error,enoent} = Mod:set_cwd("åä_dir"),
+	{ok, NowAt} = Mod:get_cwd(),
+	true = is_list(NowAt),
+	true = BeginAt =/= NowAt,
+	ok = Mod:set_cwd(".."),
+	{ok,BeginAt} = Mod:get_cwd(),
+        rm_r2(Mod,"åäö_dir"),
 	{OS,_} = os:type(),
-	% Check that treat_icky really converts to the same as the OS
+
+	%% Check that treat_icky really converts to the same as the OS
 	case UniMode of
 	    true ->
-		?line chk_cre_dir(Mod,[{directory,"åäö_dir",[]}]),
-		?line ok = Mod:set_cwd("åäö_dir"),
-		?line ok = Mod:write_file(<<"ååå">>,<<"hello">>),
-		?line Treated = treat_icky(<<"ååå">>),
+		ok = Mod:make_dir("åäö_dir"),
+		ok = Mod:set_cwd("åäö_dir"),
+		ok = Mod:write_file(<<"ååå">>,<<"hello">>),
+		Treated = treat_icky(<<"ååå">>),
 		{ok,[Treated]} = Mod:list_dir_all("."),
-		?line ok = Mod:delete(<<"ååå">>),
-		?line {ok,[]} = Mod:list_dir("."),
-		?line ok = Mod:set_cwd(".."),
-		?line rm_r2(Mod,"åäö_dir");
+		ok = Mod:delete(<<"ååå">>),
+		{ok,[]} = Mod:list_dir("."),
+		ok = Mod:set_cwd(".."),
+		rm_r2(Mod,"åäö_dir");
 	    false ->
 		ok
 	end,
 
-        ?line chk_cre_dir(Mod,[{directory,treat_icky(<<"åäö_dir">>),icky_dir()}]),
+	_ = make_icky_dir(Mod, treat_icky(<<"åäö_dir">>)),
 	if 
 	    UniMode and (OS =/= win32) ->
-		?line {error,enoent} = Mod:set_cwd("åäö_dir");
+		{error,enoent} = Mod:set_cwd("åäö_dir");
 	    true ->
 		ok
 	end,
- 	?line {ok,BeginAt} = Mod:get_cwd(),
-	case has_links() of
-	    true ->
-		?line ok = Mod:make_link("fil1","nisseö"),
-		?line {ok, <<"fil1">>} = Mod:read_file("nisseö"),
-		?line {ok, #file_info{type = regular}} = Mod:read_link_info("nisseö"),
-		?line ok = Mod:delete("nisseö"),
-		?line ok = Mod:make_link("fil1",treat_icky(<<"nisseö">>)),
-		?line {ok, <<"fil1">>} = Mod:read_file(treat_icky(<<"nisseö">>)),
-		?line {ok, #file_info{type = regular}} = Mod:read_link_info(treat_icky(<<"nisseö">>)),
-		?line ok = Mod:delete(treat_icky(<<"nisseö">>)),
-		?line {ok, <<"fil1">>} = Mod:read_file("fil1"),
-		?line {error,enoent} = Mod:read_file("nisseö"),
-		?line {error,enoent} = Mod:read_link_info("nisseö"),
-		?line {error,enoent} = Mod:read_file(treat_icky(<<"nisseö">>)),
-		?line {error,enoent} = Mod:read_link_info(treat_icky(<<"nisseö">>));
-	    false ->
+	ok = Mod:set_cwd(".."),
+	{ok,BeginAt} = Mod:get_cwd(),
+	case Mod:make_link("fil1", "nisseö") of
+	    ok ->
+		{ok, <<"fil1">>} = Mod:read_file("nisseö"),
+		{ok, #file_info{type = regular}} = Mod:read_link_info("nisseö"),
+		ok = Mod:delete("nisseö"),
+		ok = Mod:make_link("fil1",treat_icky(<<"nisseö">>)),
+		{ok, <<"fil1">>} = Mod:read_file(treat_icky(<<"nisseö">>)),
+		{ok, #file_info{type = regular}} = Mod:read_link_info(treat_icky(<<"nisseö">>)),
+		ok = Mod:delete(treat_icky(<<"nisseö">>)),
+		{ok, <<"fil1">>} = Mod:read_file("fil1"),
+		{error,enoent} = Mod:read_file("nisseö"),
+		{error,enoent} = Mod:read_link_info("nisseö"),
+		{error,enoent} = Mod:read_file(treat_icky(<<"nisseö">>)),
+		{error,enoent} = Mod:read_link_info(treat_icky(<<"nisseö">>));
+	    {error,enotsup} ->
 		ok
 	end,
- 	?line [ begin
- 	      ?line {ok, FD} = Mod:open(Name,[read]),
- 	      ?line {ok, Content} = Mod:read(FD,1024),
- 	      ?line ok = file:close(FD)
- 	  end || {regular,Name,Content} <- icky_dir() ],
- 	?line [ begin
- 	      ?line {ok, FD} = Mod:open(Name,[read,binary]),
- 	      ?line BC = list_to_binary([Content]),
- 	      ?line {ok, BC} = Mod:read(FD,1024),
- 	      ?line ok = file:close(FD)
- 	  end || {regular,Name,Content} <- icky_dir() ],
-        ?line Mod:rename("åäö2","åäö_fil1"),
-        ?line {ok, <<"åäö2">>} = Mod:read_file("åäö_fil1"),
-        ?line {error,enoent} = Mod:read_file("åäö2"),
-        ?line Mod:rename("åäö_fil1","åäö2"),
-        ?line {ok, <<"åäö2">>} = Mod:read_file("åäö2"),
-        ?line {error,enoent} = Mod:read_file("åäö_fil1"),
+	[ begin
+	      {ok, FD} = Mod:open(Name,[read]),
+	      {ok, Content} = Mod:read(FD,1024),
+	      ok = file:close(FD)
+	  end || {regular,Name,Content} <- IckyDir ],
+	[ begin
+	      {ok, FD} = Mod:open(Name,[read,binary]),
+	      BC = list_to_binary([Content]),
+	      {ok, BC} = Mod:read(FD,1024),
+	      ok = file:close(FD)
+	  end || {regular,Name,Content} <- IckyDir ],
+        Mod:rename("åäö2","åäö_fil1"),
+        {ok, <<"åäö2">>} = Mod:read_file("åäö_fil1"),
+        {error,enoent} = Mod:read_file("åäö2"),
+        Mod:rename("åäö_fil1","åäö2"),
+        {ok, <<"åäö2">>} = Mod:read_file("åäö2"),
+        {error,enoent} = Mod:read_file("åäö_fil1"),
 
-        ?line Mod:rename("åäö2",treat_icky(<<"åäö_fil1">>)),
-        ?line {ok, <<"åäö2">>} = Mod:read_file(treat_icky(<<"åäö_fil1">>)),
+        Mod:rename("åäö2",treat_icky(<<"åäö_fil1">>)),
+        {ok, <<"åäö2">>} = Mod:read_file(treat_icky(<<"åäö_fil1">>)),
 	if
 	    UniMode and (OS =/= win32) ->
 		{error,enoent} = Mod:read_file("åäö_fil1");
 	    true ->
 		ok
 	end,
-        ?line {error,enoent} = Mod:read_file("åäö2"),
-        ?line Mod:rename(treat_icky(<<"åäö_fil1">>),"åäö2"),
-        ?line {ok, <<"åäö2">>} = Mod:read_file("åäö2"),
-        ?line {error,enoent} = Mod:read_file("åäö_fil1"),
-        ?line {error,enoent} = Mod:read_file(treat_icky(<<"åäö_fil1">>)),
+        {error,enoent} = Mod:read_file("åäö2"),
+        Mod:rename(treat_icky(<<"åäö_fil1">>),"åäö2"),
+        {ok, <<"åäö2">>} = Mod:read_file("åäö2"),
+        {error,enoent} = Mod:read_file("åäö_fil1"),
+        {error,enoent} = Mod:read_file(treat_icky(<<"åäö_fil1">>)),
 
-        ?line {ok,FI} = Mod:read_file_info("åäö2"),
-	?line NewMode = FI#file_info.mode band (bnot 8#333),
-	?line NewMode2 = NewMode bor 8#222,
- 	?line true = NewMode2 =/= NewMode,
-        ?line ok = Mod:write_file_info("åäö2",FI#file_info{mode = NewMode}),
-        ?line {ok,#file_info{mode = NewMode}} = Mod:read_file_info("åäö2"),
-        ?line ok = Mod:write_file_info("åäö2",FI#file_info{mode = NewMode2}),
-        ?line {ok,#file_info{mode = NewMode2}} = Mod:read_file_info("åäö2"),
+        {ok,FI} = Mod:read_file_info("åäö2"),
+	NewMode = FI#file_info.mode band (bnot 8#333),
+	NewMode2 = NewMode bor 8#222,
+	true = NewMode2 =/= NewMode,
+        ok = Mod:write_file_info("åäö2",FI#file_info{mode = NewMode}),
+        {ok,#file_info{mode = NewMode}} = Mod:read_file_info("åäö2"),
+        ok = Mod:write_file_info("åäö2",FI#file_info{mode = NewMode2}),
+        {ok,#file_info{mode = NewMode2}} = Mod:read_file_info("åäö2"),
 
-        ?line {ok,FII} = Mod:read_file_info(treat_icky(<<"åäö5">>)),
- 	?line true = NewMode2 =/= NewMode,
-        ?line ok = Mod:write_file_info(treat_icky(<<"åäö5">>),FII#file_info{mode = NewMode}),
-        ?line {ok,#file_info{mode = NewMode}} = Mod:read_file_info(treat_icky(<<"åäö5">>)),
-        ?line ok = Mod:write_file_info(<<"åäö5">>,FII#file_info{mode = NewMode2}),
-        ?line {ok,#file_info{mode = NewMode2}} = Mod:read_file_info(treat_icky(<<"åäö5">>)),
+        {ok,FII} = Mod:read_file_info(treat_icky(<<"åäö5">>)),
+	true = NewMode2 =/= NewMode,
+        ok = Mod:write_file_info(treat_icky(<<"åäö5">>),FII#file_info{mode = NewMode}),
+        {ok,#file_info{mode = NewMode}} = Mod:read_file_info(treat_icky(<<"åäö5">>)),
+        ok = Mod:write_file_info(<<"åäö5">>,FII#file_info{mode = NewMode2}),
+        {ok,#file_info{mode = NewMode2}} = Mod:read_file_info(treat_icky(<<"åäö5">>)),
 	ok
     after
 	Mod:set_cwd(Dir),
@@ -479,90 +465,90 @@ check_icky(Mod) ->
 check_very_icky(Mod) -> 
     {ok,Dir} = Mod:get_cwd(),
     try
-	?line true=(length("åäö") =:= 3),
-	?line UniMode = file:native_name_encoding() =/= latin1,
+	true=(length("åäö") =:= 3),
+	UniMode = file:native_name_encoding() =/= latin1,
 	if
 	    not UniMode ->
 		throw(need_unicode_mode);
 	    true ->
 		ok
 	end,
-	?line make_very_icky_dir(Mod),
- 	{ok, L0} = Mod:list_dir_all("."),
- 	?line L1 = lists:sort(L0),
- 	?line L1 = lists:sort(convlist(list(very_icky_dir()))),
- 	?line {ok,D2} = Mod:get_cwd(),
- 	?line true = is_list(D2),
- 	?line [ true = ((is_list(El) or is_binary(El)))  || El <- L1],
- 	?line Syms = [ {S,conv(Targ),list_to_binary(get_data(Targ,very_icky_dir()))} 
- 		 || {T,S,Targ} <- very_icky_dir(), T =:= symlink ],
- 	?line [ {ok, Cont} = Mod:read_file(SymL) || {SymL,_,Cont} <- Syms ],
- 	?line [ {ok, Targ} = fixlink(Mod:read_link_all(SymL)) ||
-		  {SymL,Targ,_} <- Syms ],
- 	?line chk_cre_dir(Mod,[{directory,[1088,1079,1091]++"_dir",very_icky_dir()}]),
- 	?line {ok,BeginAt} = Mod:get_cwd(),
- 	?line true = is_list(BeginAt),
-        ?line {error,enoent} = Mod:set_cwd("åä_dir"),
-	?line ok = Mod:set_cwd([1088,1079,1091]++"_dir"),
- 	?line {ok, NowAt} = Mod:get_cwd(),
- 	?line true = is_list(NowAt),
- 	?line true = BeginAt =/= NowAt,
- 	?line ok = Mod:set_cwd(".."),
- 	?line {ok,BeginAt} = Mod:get_cwd(),
- 	?line rm_r2(Mod,[1088,1079,1091]++"_dir"),
+	VeryIckyDir = make_very_icky_dir(Mod, "very_icky_dir"),
+	Expected = lists:sort(convlist(list(VeryIckyDir))),
+	{ok, Actual} = Mod:list_dir_all("."),
+	Expected = lists:sort(Actual),
+	{ok,D2} = Mod:get_cwd(),
+	true = is_list(D2),
+	[ true = ((is_list(El) or is_binary(El)))  || El <- Expected],
+	Syms = [{S,conv(Targ),list_to_binary(get_data(Targ, VeryIckyDir))}
+		|| {symlink,S,Targ} <- VeryIckyDir],
+	[ {ok, Cont} = Mod:read_file(SymL) || {SymL,_,Cont} <- Syms ],
+	[ {ok, Targ} = fixlink(Mod:read_link_all(SymL)) ||
+	    {SymL,Targ,_} <- Syms ],
 
-	case has_links() of
-	    true ->
-		?line ok = Mod:make_link("fil1","nisse"++[1088,1079,1091]),
-		?line {ok, <<"fil1">>} = 
+	{ok,BeginAt} = Mod:get_cwd(),
+	OtherDir = [1088,1079,1091] ++ "_dir",
+	true = is_list(BeginAt),
+	make_very_icky_dir(Mod, OtherDir),
+        {error,enoent} = Mod:set_cwd("åä_dir"),
+	{ok, NowAt} = Mod:get_cwd(),
+	true = is_list(NowAt),
+	true = BeginAt =/= NowAt,
+	ok = Mod:set_cwd(".."),
+	{ok,BeginAt} = Mod:get_cwd(),
+	rm_r2(Mod, OtherDir),
+
+	case Mod:make_link("fil1","nisse"++[1088,1079,1091]) of
+	    ok ->
+		{ok, <<"fil1">>} =
 		    Mod:read_file("nisse"++[1088,1079,1091]),
-		?line {ok, #file_info{type = regular}} = 
+		{ok, #file_info{type = regular}} =
 		    Mod:read_link_info("nisse"++[1088,1079,1091]),
-		?line ok = Mod:delete("nisse"++[1088,1079,1091]),
-		?line ok = Mod:make_link("fil1",<<"nisseö">>),
-		?line {ok, <<"fil1">>} = Mod:read_file(<<"nisseö">>),
-		?line {ok, #file_info{type = regular}} = 
+		ok = Mod:delete("nisse"++[1088,1079,1091]),
+		ok = Mod:make_link("fil1",<<"nisseö">>),
+		{ok, <<"fil1">>} = Mod:read_file(<<"nisseö">>),
+		{ok, #file_info{type = regular}} =
 		    Mod:read_link_info(<<"nisseö">>),
-		?line ok = Mod:delete(<<"nisseö">>),
-		?line {ok, <<"fil1">>} = Mod:read_file("fil1"),
-		?line {error,enoent} = Mod:read_file("nisse"++[1088,1079,1091]),
-		?line {error,enoent} = Mod:read_link_info("nisse"++[1088,1079,1091]),
-		?line {error,enoent} = Mod:read_file(<<"nisseö">>),
-		?line {error,enoent} = Mod:read_link_info(<<"nisseö">>);
-	    false ->
+		ok = Mod:delete(<<"nisseö">>),
+		{ok, <<"fil1">>} = Mod:read_file("fil1"),
+		{error,enoent} = Mod:read_file("nisse"++[1088,1079,1091]),
+		{error,enoent} = Mod:read_link_info("nisse"++[1088,1079,1091]),
+		{error,enoent} = Mod:read_file(<<"nisseö">>),
+		{error,enoent} = Mod:read_link_info(<<"nisseö">>);
+	    {error,enotsup} ->
 		ok
 	end,
- 	?line [ begin
- 	      ?line {ok, FD} = Mod:open(Name,[read]),
- 	      ?line {ok, Content} = Mod:read(FD,1024),
- 	      ?line ok = file:close(FD)
- 	  end || {regular,Name,Content} <- very_icky_dir() ],
- 	?line [ begin
- 	      ?line {ok, FD} = Mod:open(Name,[read,binary]),
- 	      ?line BC = list_to_binary([Content]),
- 	      ?line {ok, BC} = Mod:read(FD,1024),
- 	      ?line ok = file:close(FD)
- 	  end || {regular,Name,Content} <- very_icky_dir() ],
- 	?line Mod:rename([956,965,963,954,959,49],
-			 [956,965,963,954,959]++"_fil1"),
-        ?line {ok, <<"åäö2">>} = Mod:read_file([956,965,963,954,959]++"_fil1"),
- 	?line {error,enoent} = Mod:read_file([956,965,963,954,959,49]),
- 	?line Mod:rename([956,965,963,954,959]++"_fil1",[956,965,963,954,959,49]),
-        ?line {ok, <<"åäö2">>} = Mod:read_file([956,965,963,954,959,49]),
- 	?line {error,enoent} = Mod:read_file([956,965,963,954,959]++"_fil1"),
+	[ begin
+	      {ok, FD} = Mod:open(Name,[read]),
+	      {ok, Content} = Mod:read(FD,1024),
+	      ok = file:close(FD)
+	  end || {regular,Name,Content} <- VeryIckyDir ],
+	[ begin
+	      {ok, FD} = Mod:open(Name,[read,binary]),
+	      BC = list_to_binary([Content]),
+	      {ok, BC} = Mod:read(FD,1024),
+	      ok = file:close(FD)
+	  end || {regular,Name,Content} <- VeryIckyDir ],
+	Mod:rename([956,965,963,954,959,49],
+		   [956,965,963,954,959]++"_fil1"),
+        {ok, <<"åäö2">>} = Mod:read_file([956,965,963,954,959]++"_fil1"),
+	{error,enoent} = Mod:read_file([956,965,963,954,959,49]),
+	Mod:rename([956,965,963,954,959]++"_fil1",[956,965,963,954,959,49]),
+        {ok, <<"åäö2">>} = Mod:read_file([956,965,963,954,959,49]),
+	{error,enoent} = Mod:read_file([956,965,963,954,959]++"_fil1"),
 
- 	?line {ok,FI} = Mod:read_file_info([956,965,963,954,959,49]),
-	?line NewMode = FI#file_info.mode band (bnot 8#333),
-	?line NewMode2 = NewMode bor 8#222,
- 	?line true = NewMode2 =/= NewMode,
- 	?line ok = Mod:write_file_info([956,965,963,954,959,49],
-				       FI#file_info{mode = NewMode}),
- 	?line {ok,#file_info{mode = NewMode}} = 
-	           Mod:read_file_info([956,965,963,954,959,49]),
- 	?line ok = Mod:write_file_info([956,965,963,954,959,49],
-				       FI#file_info{mode = NewMode2}),
- 	?line {ok,#file_info{mode = NewMode2}} = 
-	          Mod:read_file_info([956,965,963,954,959,49]),
+	{ok,FI} = Mod:read_file_info([956,965,963,954,959,49]),
+	NewMode = FI#file_info.mode band (bnot 8#333),
+	NewMode2 = NewMode bor 8#222,
+	true = NewMode2 =/= NewMode,
+	ok = Mod:write_file_info([956,965,963,954,959,49],
+				 FI#file_info{mode = NewMode}),
+	{ok,#file_info{mode = NewMode}} =
+	    Mod:read_file_info([956,965,963,954,959,49]),
+	ok = Mod:write_file_info([956,965,963,954,959,49],
+				 FI#file_info{mode = NewMode2}),
+	{ok,#file_info{mode = NewMode2}} =
+	    Mod:read_file_info([956,965,963,954,959,49]),
 	ok
     catch
 	throw:need_unicode_mode ->
@@ -592,7 +578,6 @@ rm_rf(Mod,Dir) ->
     end.
 
 rm_r(Mod,Dir) ->
-    %erlang:display({rm_r,Dir}),
     case  Mod:read_link_info(Dir) of
 	{ok, #file_info{type = directory}} ->
 	    {ok,#file_info{type = directory}} =  Mod:read_file_info(Dir),
@@ -610,7 +595,7 @@ rm_r(Mod,Dir) ->
     end.
 %% For icky test, allow binaries sometimes
 rm_r2(Mod,Dir) ->
-    %erlang:display({rm_r2,Dir}),
+    %% erlang:display({rm_r2,Dir}),
     case  Mod:read_link_info(Dir) of
 	{ok, #file_info{type = directory}} ->
 	    {ok,#file_info{type = directory}} =  Mod:read_file_info(Dir),
@@ -627,90 +612,35 @@ rm_r2(Mod,Dir) ->
 	{ok, #file_info{type = symlink}} ->
 	    ok = Mod:delete(Dir)
     end.
-chk_cre_dir(_,[]) ->
-    ok;
-chk_cre_dir(Mod,[{regular,Name,Content}|T]) ->
-    %io:format("~p~n",[Name]),
-    ok = Mod:write_file(Name,Content),
-    chk_cre_dir(Mod,T);
-chk_cre_dir(Mod,[{link,Name,Target}|T]) ->
-    ok = Mod:make_link(Target,Name),
-    chk_cre_dir(Mod,T);
-chk_cre_dir(Mod,[{symlink,Name,Target}|T]) ->
-    ok = Mod:make_symlink(Target,Name),
-    chk_cre_dir(Mod,T);
-chk_cre_dir(Mod,[{directory,Name,Content}|T]) ->
-    ok = Mod:make_dir(Name),
-    %io:format("Content = ~p~n",[Content]),
-    Content2 = [{Ty,filename:join(Name,N),case Ty of link -> filename:join(Name,C); _ -> C end} || {Ty,N,C} <- Content ],
-    %io:format("Content2 = ~p~n",[Content2]),
-    chk_cre_dir(Mod,Content2),
-    chk_cre_dir(Mod,T).
- 
-has_links() ->   
-    case os:type() of
-	{win32,_} ->
-	    case os:version() of
-		{N,NN,_} when (N > 5) andalso (NN >= 1) ->
-		    true;
-		_ ->
-		    false
-	    end;
-	_ ->
-	    true
-    end.
-
-make_normal_dir(Mod) ->
-    rm_rf(Mod,"normal_dir"),
-    Mod:make_dir("normal_dir"),
-    Mod:set_cwd("normal_dir"),
-    Mod:write_file("fil1","fil1"),
-    Mod:write_file("fil2","fil2"),
-    case has_links() of
-	true ->
-	    Mod:make_link("fil2","fil3"),
-	    Mod:make_symlink("fil2","fil4");
-	_ ->
-	    ok
-    end,
-    Mod:make_dir("subdir"),
-    Mod:write_file(filename:join("subdir","subfil1"),"subfil1"),
-    ok.
-    
-normal_dir() ->
-    [{regular,"fil1","fil1"},
-     {regular,"fil2","fil2"}] ++
-	case has_links() of
-	    true ->
-		[{regular,"fil3","fil2"},
-		 {symlink,"fil4","fil2"}];
-	    false ->
-		[]
-	end ++
-	[{directory,"subdir",
-	  [{regular,"subfil1","subfil1"}]}].
 
-make_icky_dir(Mod) ->
-    rm_rf(Mod,"icky_dir"),
-    Icky=icky_dir(),
-    chk_cre_dir(Mod,[{directory,"icky_dir",linkify([],Icky)}]),
-    Mod:set_cwd("icky_dir"),
-    ok.
+make_normal_dir(Mod, DirName) ->
+    Dir = [{regular,"fil1","fil1"},
+	   {regular,"fil2","fil2"},
+	   {hardlink,"fil3","fil2"},
+	   {symlink,"fil4","fil2"},
+	   {directory,"subdir",
+	    [{regular,"subfil1","subfil1"}]}],
+    rm_rf(Mod, DirName),
+    Mod:make_dir(DirName),
+    Mod:set_cwd(DirName),
+    make_dir_contents(Dir, Mod).
 
-linkify(_Passed,[]) ->
-    [];
-linkify(Passed,[{regular,Name,Content}|T]) ->
-    Regulars = [ {N,C} || {regular,N,C} <- Passed, N =/= Name ],
-    case lists:keysearch(Content,2,Regulars) of
-	{value, {Linkto, Content}} ->
-	    [{link,Name,Linkto} | linkify(Passed,T)];
-	_ ->
-	    [{regular,Name,Content} | linkify([{regular,Name,Content}|Passed],T)]
-    end;
-linkify(Passed,[{directory, Name, Content}|T]) ->
-    [{directory,Name, linkify(Content,Content)}|linkify(Passed,T)];
-linkify(Passed,[H|T]) ->
-    [H|linkify([H|Passed],T)].
+make_icky_dir(Mod, IckyDirName) ->
+    Icky = [{regular,"fil1","fil1"},
+	    {regular,"åäö2","åäö2"},
+	    {hardlink,"åäö3","åäö2"},
+	    {symlink,"åäö4","åäö2"},
+	    {regular,treat_icky(<<"åäö5">>),"åäö5"},
+	    {symlink,treat_icky(<<"åäö6">>),treat_icky(<<"åäö5">>)},
+	    {directory,treat_icky(<<"åäösubdir2">>),
+	     [{regular,treat_icky(<<"åäösubfil2">>),"åäösubfil12"},
+	      {regular,"åäösubfil3","åäösubfil13"}]},
+	    {directory,"åäösubdir",
+	     [{regular,"åäösubfil1","åäösubfil1"}]}],
+    rm_rf(Mod, IckyDirName),
+    ok = Mod:make_dir(IckyDirName),
+    ok = Mod:set_cwd(IckyDirName),
+    make_dir_contents(Icky, Mod).
 
 hopeless_darwin() ->
     case {os:type(),os:version()} of
@@ -720,58 +650,24 @@ hopeless_darwin() ->
 	    false
     end.
 
-icky_dir() ->
-    [{regular,"fil1","fil1"},
-     {regular,"åäö2","åäö2"}] ++
-	case has_links() of
-	    true ->
-		[{regular,"åäö3","åäö2"},
-		 {symlink,"åäö4","åäö2"}];
-	    false ->
-		[]
-	end ++
-	[{regular,treat_icky(<<"åäö5">>),"åäö5"}] ++
-	 case has_links() of
-	     true -> 
-		 [{symlink,treat_icky(<<"åäö6">>),treat_icky(<<"åäö5">>)}];
-	     false -> 
-		 []
-	 end ++
-	[{directory,treat_icky(<<"åäösubdir2">>),
-	  [{regular,treat_icky(<<"åäösubfil2">>),"åäösubfil12"},
-	   {regular,"åäösubfil3","åäösubfil13"}]},
-	 {directory,"åäösubdir",
-	  [{regular,"åäösubfil1","åäösubfil1"}]}].
-
-make_very_icky_dir(Mod) ->
-    rm_rf(Mod,"very_icky_dir"),
-    Icky=very_icky_dir(),
-    chk_cre_dir(Mod,[{directory,"very_icky_dir",linkify([],Icky)}]),
-    Mod:set_cwd("very_icky_dir"),
-    ok.
-
-very_icky_dir() ->
-    [{regular,"fil1","fil1"},
-     {regular,[956,965,963,954,959,49],"åäö2"}] ++
-	case has_links() of
-	    true ->
-		[{regular,[956,965,963,954,959,50],"åäö2"},
-		 {symlink,[956,965,963,954,959,51],[956,965,963,954,959,49]}];
-	    false ->
-		[]
-	end ++
-     [{regular,treat_icky(<<"åäö5">>),"åäö5"}] ++
-	case has_links() of
-	    true ->
-		[{symlink,treat_icky(<<"åäö6">>),treat_icky(<<"åäö5">>)}];
-	    false -> 
-		[]
-	end ++
-      [{directory,treat_icky(<<"åäösubdir2">>),
-      [{regular,treat_icky(<<"åäösubfil2">>),"åäösubfil12"},
-       {regular,"åäösubfil3","åäösubfil13"}]},
-      {directory,[956,965,963,954,959]++"subdir1",
-       [{regular,[956,965,963,954,959]++"subfil1","åäösubfil1"}]}].
+make_very_icky_dir(Mod, DirName) ->
+    Desc = [{regular,"fil1","fil1"},
+	    {regular,[956,965,963,954,959,49],"åäö2"},
+	    {hardlink,[956,965,963,954,959,50],
+	     [956,965,963,954,959,49],
+	     "åäö2"},
+	    {symlink,[956,965,963,954,959,51],[956,965,963,954,959,49]},
+	    {regular,treat_icky(<<"åäö5">>),"åäö5"},
+	    {symlink,treat_icky(<<"åäö6">>),treat_icky(<<"åäö5">>)},
+	    {directory,treat_icky(<<"åäösubdir2">>),
+	     [{regular,treat_icky(<<"åäösubfil2">>),"åäösubfil12"},
+	      {regular,"åäösubfil3","åäösubfil13"}]},
+	    {directory,[956,965,963,954,959]++"subdir1",
+	     [{regular,[956,965,963,954,959]++"subfil1","åäösubfil1"}]}],
+    rm_rf(Mod, DirName),
+    ok = Mod:make_dir(DirName),
+    ok = Mod:set_cwd(DirName),
+    make_dir_contents(Desc, Mod).
 
 %% Some OS'es simply do not allow non UTF8 filenames
 treat_icky(Bin) ->
@@ -784,7 +680,7 @@ treat_icky(Bin) ->
 	    Bin
     end.
 
-% Handle windows having absolute soft link targets.
+%% Handle windows having absolute soft link targets.
 fixlink({ok,Link}) ->
     case os:type() of
 	{win32,_} ->
@@ -811,7 +707,7 @@ list([]) ->
     [];
 list([{_,Name,_} | T]) ->
     [Name | list(T)].
-    
+
 
 get_data(FN,List) ->
     case lists:keysearch(FN,2,List) of
@@ -827,7 +723,7 @@ get_data(FN,List) ->
 convlist(L) ->
     convlist(file:native_name_encoding(),L).
 convlist(latin1,[Bin|T]) when is_binary(Bin) ->
-    %erlang:display('Convert...'),
+    %% erlang:display('Convert...'),
     [binary_to_list(Bin)| convlist(latin1,T)];
 convlist(Any,[H|T]) ->
     [H|convlist(Any,T)];
@@ -844,18 +740,60 @@ conv(L) ->
     end.
 
 
+make_dir_contents([{regular,Name,Contents}=H|T], Mod) ->
+    ok = Mod:write_file(Name, Contents),
+    [H|make_dir_contents(T, Mod)];
+make_dir_contents([{hardlink,Target,Name}|T], Mod) ->
+    case Mod:make_link(Name, Target) of
+	ok ->
+	    [{regular,Target,Name}|make_dir_contents(T, Mod)];
+	{error,enotsup} ->
+	    make_dir_contents(T, Mod)
+    end;
+make_dir_contents([{hardlink,Target,Name,Contents}|T], Mod) ->
+    case Mod:make_link(Name, Target) of
+	ok ->
+	    [{regular,Target,Contents}|make_dir_contents(T, Mod)];
+	{error,enotsup} ->
+	    make_dir_contents(T, Mod)
+    end;
+make_dir_contents([{symlink,Target,Name}=H|T], Mod) ->
+    case Mod:make_symlink(Name, Target) of
+	ok ->
+	    [H|make_dir_contents(T, Mod)];
+	{error,enotsup} ->
+	    make_dir_contents(T, Mod);
+	{error,eperm} ->
+	    make_dir_contents(T, Mod)
+    end;
+make_dir_contents([{directory,Dir,C0}|T], Mod) ->
+    ok = Mod:make_dir(Dir),
+    C1 = [case Op of
+	      Link when Link =:= hardlink; Link =:= symlink ->
+		  {Op,filename:join(Dir, Name0),filename:join(Dir, Extra)};
+	      _ ->
+		  {Op,filename:join(Dir, Name0),Extra}
+	  end || {Op,Name0,Extra} <- C0],
+    C2 = make_dir_contents(C1, Mod),
+    C = [{Op,filename:basename(Name0),Extra} ||
+	    {Op,Name0,Extra} <- C2],
+    [{directory,Dir,C}|make_dir_contents(T, Mod)];
+make_dir_contents([], _Mod) ->
+    [].
+
+
 rand_comp_decomp(Max) ->
-    N = random:uniform(Max),
+    N = rand:uniform(Max),
     L = [ rand_decomp() || _ <- lists:seq(1,N) ],
     LC = [ A || {A,_} <- L],
     LD = lists:flatten([B || {_,B} <- L]),
     LB = unicode:characters_to_binary(LD,unicode,utf8),
     {LC,LB}.
-    
+
 rand_decomp() ->
     BT = bigtup(),
     SZ = tuple_size(BT),
-    element(random:uniform(SZ),BT).
+    element(rand:uniform(SZ),BT).
 bigtup() ->
     {{192,[65,768]},
      {200,[69,768]},
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index 91a57d3290..48cd245204 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -19,7 +19,7 @@
 %% 
 -module(gen_sctp_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/inet_sctp.hrl").
 
 %%-compile(export_all).
@@ -29,7 +29,8 @@
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2, end_per_testcase/2]).
 -export(
-   [basic/1,
+   [skip_old_solaris/1,
+    basic/1,
     api_open_close/1,api_listen/1,api_connect_init/1,api_opts/1,
     xfer_min/1,xfer_active/1,def_sndrcvinfo/1,implicit_inet6/1,
     open_multihoming_ipv4_socket/1,
@@ -42,22 +43,32 @@
     names_unihoming_ipv4/1, names_unihoming_ipv6/1,
     names_multihoming_ipv4/1, names_multihoming_ipv6/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
-all() -> 
-    [basic, api_open_close, api_listen, api_connect_init,
-     api_opts, xfer_min, xfer_active, def_sndrcvinfo, implicit_inet6,
-     open_multihoming_ipv4_socket,
-     open_unihoming_ipv6_socket,
-     open_multihoming_ipv6_socket,
-     open_multihoming_ipv4_and_ipv6_socket, active_n,
-     basic_stream, xfer_stream_min, peeloff_active_once,
-     peeloff_active_true, peeloff_active_n, buffers,
-     names_unihoming_ipv4, names_unihoming_ipv6,
-     names_multihoming_ipv4, names_multihoming_ipv6].
+all() ->
+    G = case is_old_solaris() of
+	    true -> old_solaris;
+	    false -> extensive
+	end,
+    [{group,smoke},
+     {group,G}].
 
 groups() -> 
-    [].
+    [{smoke,[],[basic,basic_stream]},
+     {old_solaris,[],[skip_old_solaris]},
+     {extensive,[],
+      [api_open_close, api_listen, api_connect_init,
+       api_opts, xfer_min, xfer_active, def_sndrcvinfo, implicit_inet6,
+       open_multihoming_ipv4_socket,
+       open_unihoming_ipv6_socket,
+       open_multihoming_ipv6_socket,
+       open_multihoming_ipv4_and_ipv6_socket, active_n,
+       xfer_stream_min, peeloff_active_once,
+       peeloff_active_true, peeloff_active_n, buffers,
+       names_unihoming_ipv4, names_unihoming_ipv6,
+       names_multihoming_ipv4, names_multihoming_ipv6]}].
 
 init_per_suite(_Config) ->
     case gen_sctp:open() of
@@ -81,48 +92,44 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Func, Config) ->
-    Dog = test_server:timetrap(test_server:seconds(15)),
-    [{watchdog, Dog}|Config].
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog).
+    Config.
 
+end_per_testcase(_Func, _Config) ->
+    ok.
 
 
 -define(LOGVAR(Var), begin io:format(??Var" = ~p~n", [Var]) end).
 
+is_old_solaris() ->
+    os:type() =:= {unix,sunos} andalso os:version() < {5,12,0}.
 
+skip_old_solaris(_Config) ->
+    {skip,"Unreliable test cases and/or implementation on old Solaris"}.
 
-basic(doc) ->
-    "Hello world";
-basic(suite) ->
-    [];
+%% Hello world.
 basic(Config) when is_list(Config) ->
-    ?line {ok,S} = gen_sctp:open(),
-    ?line ok = gen_sctp:close(S),
+    {ok,S} = gen_sctp:open(),
+    ok = gen_sctp:close(S),
     ok.
 
-xfer_min(doc) ->
-    "Minimal data transfer";
-xfer_min(suite) ->
-    [];
+%% Minimal data transfer.
 xfer_min(Config) when is_list(Config) ->
-    ?line Stream = 0,
-    ?line Data = <<"The quick brown fox jumps over a lazy dog 0123456789">>,
-    ?line Loopback = {127,0,0,1},
-    ?line {ok,Sb} = gen_sctp:open([{type,seqpacket}]),
-    ?line {ok,Pb} = inet:port(Sb),
-    ?line ok = gen_sctp:listen(Sb, true),
-
-    ?line {ok,Sa} = gen_sctp:open(),
-    ?line {ok,Pa} = inet:port(Sa),
-    ?line {ok,#sctp_assoc_change{state=comm_up,
-				 error=0,
-				 outbound_streams=SaOutboundStreams,
-				 inbound_streams=SaInboundStreams,
-				 assoc_id=SaAssocId}=SaAssocChange} =
+    Stream = 0,
+    Data = <<"The quick brown fox jumps over a lazy dog 0123456789">>,
+    Loopback = {127,0,0,1},
+    {ok,Sb} = gen_sctp:open([{type,seqpacket}]),
+    {ok,Pb} = inet:port(Sb),
+    ok = gen_sctp:listen(Sb, true),
+
+    {ok,Sa} = gen_sctp:open(),
+    {ok,Pa} = inet:port(Sa),
+    {ok,#sctp_assoc_change{state=comm_up,
+			   error=0,
+			   outbound_streams=SaOutboundStreams,
+			   inbound_streams=SaInboundStreams,
+			   assoc_id=SaAssocId}=SaAssocChange} =
 	gen_sctp:connect(Sa, Loopback, Pb, []),
-    ?line {SbAssocId,SaOutboundStreams,SaInboundStreams} =
+    {SbAssocId,SaOutboundStreams,SaInboundStreams} =
 	case recv_event(log_ok(gen_sctp:recv(Sb, infinity))) of
 	    {Loopback,Pa,
 	     #sctp_assoc_change{state=comm_up,
@@ -142,184 +149,181 @@ xfer_min(Config) when is_list(Config) ->
 				    outbound_streams=SbOutboundStreams,
 				    inbound_streams=SbInboundStreams,
 				    assoc_id=AssocId}} =
-		    ?line recv_event(log_ok(gen_sctp:recv(Sb, infinity))),
+		    recv_event(log_ok(gen_sctp:recv(Sb, infinity))),
 		{AssocId,SbInboundStreams,SbOutboundStreams}
 	end,
 
-    ?line ok = gen_sctp:send(Sa, SaAssocId, 0, Data),
-    ?line case log_ok(gen_sctp:recv(Sb, infinity)) of
-	      {Loopback,
-	       Pa,
-	       [#sctp_sndrcvinfo{stream=Stream,
-				 assoc_id=SbAssocId}],
-	       Data} -> ok;
-	      Event1 ->
-		  case recv_event(Event1) of
-		      {Loopback,Pa,
-		       #sctp_paddr_change{addr = {Loopback,_},
-					  state = State,
-					  error = 0,
-					  assoc_id = SbAssocId}}
-			when State =:= addr_available;
-			     State =:= addr_confirmed ->
-			  {Loopback,
-			   Pa,
-			   [#sctp_sndrcvinfo{stream=Stream,
-					     assoc_id=SbAssocId}],
-			   Data} = log_ok(gen_sctp:recv(Sb, infinity))
-		  end
-	  end,
-    ?line ok = gen_sctp:send(Sb, SbAssocId, 0, Data),
-    ?line case log_ok(gen_sctp:recv(Sa, infinity)) of
-	      {Loopback,Pb,
-	       [#sctp_sndrcvinfo{stream=Stream,
-				 assoc_id=SaAssocId}],
-	       Data} ->
-		  ok;
-	      Event2 ->
-		  {Loopback,Pb,
-		   #sctp_paddr_change{addr={_,Pb},
-				      state=addr_confirmed,
-				      error=0,
-				      assoc_id=SaAssocId}} =
-		      ?line recv_event(Event2),
-		  ?line {Loopback,
-			 Pb,
-			 [#sctp_sndrcvinfo{stream=Stream,
-					   assoc_id=SaAssocId}],
-			 Data} =
-		      log_ok(gen_sctp:recv(Sa, infinity))
-	  end,
+    ok = gen_sctp:send(Sa, SaAssocId, 0, Data),
+    case log_ok(gen_sctp:recv(Sb, infinity)) of
+	{Loopback,
+	 Pa,
+	 [#sctp_sndrcvinfo{stream=Stream,
+			   assoc_id=SbAssocId}],
+	 Data} -> ok;
+	Event1 ->
+	    case recv_event(Event1) of
+		{Loopback,Pa,
+		 #sctp_paddr_change{addr = {Loopback,_},
+				    state = State,
+				    error = 0,
+				    assoc_id = SbAssocId}}
+		  when State =:= addr_available;
+		       State =:= addr_confirmed ->
+		    {Loopback,
+		     Pa,
+		     [#sctp_sndrcvinfo{stream=Stream,
+				       assoc_id=SbAssocId}],
+		     Data} = log_ok(gen_sctp:recv(Sb, infinity))
+	    end
+    end,
+    ok = gen_sctp:send(Sb, SbAssocId, 0, Data),
+    case log_ok(gen_sctp:recv(Sa, infinity)) of
+	{Loopback,Pb,
+	 [#sctp_sndrcvinfo{stream=Stream,
+			   assoc_id=SaAssocId}],
+	 Data} ->
+	    ok;
+	Event2 ->
+	    {Loopback,Pb,
+	     #sctp_paddr_change{addr={_,Pb},
+				state=addr_confirmed,
+				error=0,
+				assoc_id=SaAssocId}} =
+		recv_event(Event2),
+	    {Loopback,
+	     Pb,
+	     [#sctp_sndrcvinfo{stream=Stream,
+			       assoc_id=SaAssocId}],
+	     Data} =
+		log_ok(gen_sctp:recv(Sa, infinity))
+    end,
     %%
-    ?line ok = gen_sctp:eof(Sa, SaAssocChange),
-    ?line {Loopback,Pa,#sctp_shutdown_event{assoc_id=SbAssocId}} =
+    ok = gen_sctp:eof(Sa, SaAssocChange),
+    {Loopback,Pa,#sctp_shutdown_event{assoc_id=SbAssocId}} =
 	recv_event(log_ok(gen_sctp:recv(Sb, infinity))),
-    ?line {Loopback,Pb,
-	   #sctp_assoc_change{state=shutdown_comp,
-			      error=0,
-			      assoc_id=SaAssocId}} =
+    {Loopback,Pb,
+     #sctp_assoc_change{state=shutdown_comp,
+			error=0,
+			assoc_id=SaAssocId}} =
 	recv_event(log_ok(gen_sctp:recv(Sa, infinity))),
-    ?line {Loopback,Pa,
-	   #sctp_assoc_change{state=shutdown_comp,
-			      error=0,
-			      assoc_id=SbAssocId}} =
+    {Loopback,Pa,
+     #sctp_assoc_change{state=shutdown_comp,
+			error=0,
+			assoc_id=SbAssocId}} =
 	recv_event(log_ok(gen_sctp:recv(Sb, infinity))),
-    ?line ok = gen_sctp:close(Sa),
-    ?line ok = gen_sctp:close(Sb),
+    ok = gen_sctp:close(Sa),
+    ok = gen_sctp:close(Sb),
 
-    ?line receive
-	      Msg -> test_server:fail({received,Msg})
-	  after 17 -> ok
-	  end,
+    receive
+	Msg -> ct:fail({received,Msg})
+    after 17 -> ok
+    end,
     ok.
 
-xfer_active(doc) ->
-    "Minimal data transfer in active mode";
-xfer_active(suite) ->
-    [];
+%% Minimal data transfer in active mode.
 xfer_active(Config) when is_list(Config) ->
-    ?line Timeout = 2000,
-    ?line Stream = 0,
-    ?line Data = <<"The quick brown fox jumps over a lazy dog 0123456789">>,
-    ?line Loopback = {127,0,0,1},
-    ?line {ok,Sb} = gen_sctp:open([{active,true}]),
-    ?line {ok,Pb} = inet:port(Sb),
-    ?line ok = gen_sctp:listen(Sb, true),
-
-    ?line {ok,Sa} = gen_sctp:open([{active,true}]),
-    ?line {ok,Pa} = inet:port(Sa),
-    ?line ok = gen_sctp:connect_init(Sa, Loopback, Pb, []),
-    ?line #sctp_assoc_change{state=comm_up,
-			     error=0,
-			     outbound_streams=SaOutboundStreams,
-			     inbound_streams=SaInboundStreams,
-			     assoc_id=SaAssocId} = SaAssocChange =
+    Timeout = 2000,
+    Stream = 0,
+    Data = <<"The quick brown fox jumps over a lazy dog 0123456789">>,
+    Loopback = {127,0,0,1},
+    {ok,Sb} = gen_sctp:open([{active,true}]),
+    {ok,Pb} = inet:port(Sb),
+    ok = gen_sctp:listen(Sb, true),
+
+    {ok,Sa} = gen_sctp:open([{active,true}]),
+    {ok,Pa} = inet:port(Sa),
+    ok = gen_sctp:connect_init(Sa, Loopback, Pb, []),
+    #sctp_assoc_change{state=comm_up,
+		       error=0,
+		       outbound_streams=SaOutboundStreams,
+		       inbound_streams=SaInboundStreams,
+		       assoc_id=SaAssocId} = SaAssocChange =
 	recv_assoc_change(Sa, Loopback, Pb, Timeout),
-    ?line io:format("Sa=~p, Pa=~p, Sb=~p, Pb=~p, SaAssocId=~p, "
-		    "SaOutboundStreams=~p, SaInboundStreams=~p~n",
-		    [Sa,Pa,Sb,Pb,SaAssocId,
-		     SaOutboundStreams,SaInboundStreams]),
-    ?line #sctp_assoc_change{state=comm_up,
-			     error=0,
-			     outbound_streams=SbOutboundStreams,
-			     inbound_streams=SbInboundStreams,
-			     assoc_id=SbAssocId} =
+    io:format("Sa=~p, Pa=~p, Sb=~p, Pb=~p, SaAssocId=~p, "
+	      "SaOutboundStreams=~p, SaInboundStreams=~p~n",
+	      [Sa,Pa,Sb,Pb,SaAssocId,
+	       SaOutboundStreams,SaInboundStreams]),
+    #sctp_assoc_change{state=comm_up,
+		       error=0,
+		       outbound_streams=SbOutboundStreams,
+		       inbound_streams=SbInboundStreams,
+		       assoc_id=SbAssocId} =
 	recv_assoc_change(Sb, Loopback, Pa, Timeout),
-    ?line SbOutboundStreams = SaInboundStreams,
-    ?line SbInboundStreams = SaOutboundStreams,
-    ?line io:format("SbAssocId=~p~n", [SbAssocId]),
-
-    ?line case recv_paddr_change(Sa, Loopback, Pb, 314) of
-	      #sctp_paddr_change{state=addr_confirmed,
-				 addr={_,Pb},
-				 error=0,
-				 assoc_id=SaAssocId} -> ok;
-	      #sctp_paddr_change{state=addr_available,
-				 addr={_,Pb},
-				 error=0,
-				 assoc_id=SaAssocId} -> ok;
-	      timeout -> ok
-	  end,
-    ?line case recv_paddr_change(Sb, Loopback, Pa, 314) of
-	      #sctp_paddr_change{state=addr_confirmed,
-				 addr={Loopback,Pa},
-				 error=0,
-				 assoc_id=SbAssocId} -> ok;
-	      #sctp_paddr_change{state=addr_available,
-				 addr={Loopback,P},
-				 error=0,
-				 assoc_id=SbAssocId} ->
-		  ?line match_unless_solaris(Pa, P);
-	      timeout -> ok
-	  end,
-    ?line [] = flush(),
-
-    ?line ok =
+    SbOutboundStreams = SaInboundStreams,
+    SbInboundStreams = SaOutboundStreams,
+    io:format("SbAssocId=~p~n", [SbAssocId]),
+
+    case recv_paddr_change(Sa, Loopback, Pb, 314) of
+	#sctp_paddr_change{state=addr_confirmed,
+			   addr={_,Pb},
+			   error=0,
+			   assoc_id=SaAssocId} -> ok;
+	#sctp_paddr_change{state=addr_available,
+			   addr={_,Pb},
+			   error=0,
+			   assoc_id=SaAssocId} -> ok;
+	timeout -> ok
+    end,
+    case recv_paddr_change(Sb, Loopback, Pa, 314) of
+	#sctp_paddr_change{state=addr_confirmed,
+			   addr={Loopback,Pa},
+			   error=0,
+			   assoc_id=SbAssocId} -> ok;
+	#sctp_paddr_change{state=addr_available,
+			   addr={Loopback,P},
+			   error=0,
+			   assoc_id=SbAssocId} ->
+	    match_unless_solaris(Pa, P);
+	timeout -> ok
+    end,
+    [] = flush(),
+
+    ok =
 	do_from_other_process(
 	  fun () -> gen_sctp:send(Sa, SaAssocId, 0, Data) end),
-    ?line receive
-	      {sctp,Sb,Loopback,Pa,
-	       {[#sctp_sndrcvinfo{stream=Stream,
-				  assoc_id=SbAssocId}],
-		Data}} -> ok
-	  after Timeout ->
-		  ?line test_server:fail({timeout,flush()})
-	  end,
-    ?line ok = gen_sctp:send(Sb, SbAssocId, 0, Data),
-    ?line receive
-	      {sctp,Sa,Loopback,Pb,
-	       {[#sctp_sndrcvinfo{stream=Stream,
-				  assoc_id=SaAssocId}],
-		Data}} -> ok
-	  after Timeout ->
-		  ?line test_server:fail({timeout,flush()})
-	  end,
+    receive
+	{sctp,Sb,Loopback,Pa,
+	 {[#sctp_sndrcvinfo{stream=Stream,
+			    assoc_id=SbAssocId}],
+	  Data}} -> ok
+    after Timeout ->
+	    ct:fail({timeout,flush()})
+    end,
+    ok = gen_sctp:send(Sb, SbAssocId, 0, Data),
+    receive
+	{sctp,Sa,Loopback,Pb,
+	 {[#sctp_sndrcvinfo{stream=Stream,
+			    assoc_id=SaAssocId}],
+	  Data}} -> ok
+    after Timeout ->
+	    ct:fail({timeout,flush()})
+    end,
     %%
-    ?line ok = gen_sctp:abort(Sa, SaAssocChange),
-    ?line case recv_assoc_change(Sb, Loopback, Pa, Timeout) of
-	      #sctp_assoc_change{state=comm_lost,
-				 assoc_id=SbAssocId} -> ok;
-	      timeout ->
-		  ?line test_server:fail({timeout,flush()})
-	  end,
-    ?line ok = gen_sctp:close(Sb),
-    ?line case recv_assoc_change(Sa, Loopback, Pb, Timeout) of
-	      #sctp_assoc_change{state=comm_lost,
-				 assoc_id=SaAssocId} -> ok;
-	      timeout ->
-		  ?line io:format("timeout waiting for comm_lost on Sa~n"),
-		  ?line match_unless_solaris(ok, {timeout,flush()})
-	  end,
-    ?line receive
-	      {sctp_error,Sa,enotconn} -> ok % Solaris
-	  after 17 -> ok
-	  end,
-    ?line ok = gen_sctp:close(Sa),
+    ok = gen_sctp:abort(Sa, SaAssocChange),
+    case recv_assoc_change(Sb, Loopback, Pa, Timeout) of
+	#sctp_assoc_change{state=comm_lost,
+			   assoc_id=SbAssocId} -> ok;
+	timeout ->
+	    ct:fail({timeout,flush()})
+    end,
+    ok = gen_sctp:close(Sb),
+    case recv_assoc_change(Sa, Loopback, Pb, Timeout) of
+	#sctp_assoc_change{state=comm_lost,
+			   assoc_id=SaAssocId} -> ok;
+	timeout ->
+	    io:format("timeout waiting for comm_lost on Sa~n"),
+	    match_unless_solaris(ok, {timeout,flush()})
+    end,
+    receive
+	{sctp_error,Sa,enotconn} -> ok % Solaris
+    after 17 -> ok
+    end,
+    ok = gen_sctp:close(Sa),
     %%
-    ?line receive
-	      Msg -> test_server:fail({unexpected,[Msg]++flush()})
-	  after 17 -> ok
-	  end,
+    receive
+	Msg -> ct:fail({unexpected,[Msg]++flush()})
+    after 17 -> ok
+    end,
     ok.
 
 recv_assoc_change(S, Addr, Port, Timeout) ->
@@ -346,142 +350,139 @@ recv_paddr_change(S, Addr, Port, Timeout) ->
 	    timeout
     end.
 
-def_sndrcvinfo(doc) ->
-    "Test that #sctp_sndrcvinfo{} parameters set on a socket "
-	"are used by gen_sctp:send/4";
-def_sndrcvinfo(suite) ->
-    [];
+%% Test that #sctp_sndrcvinfo{} parameters set on a socket
+%% are used by gen_sctp:send/4.
 def_sndrcvinfo(Config) when is_list(Config) ->
-    ?line Loopback = {127,0,0,1},
-    ?line Data = <<"What goes up, must come down.">>,
+    Loopback = {127,0,0,1},
+    Data = <<"What goes up, must come down.">>,
     %%
-    ?line S1 =
+    S1 =
 	log_ok(gen_sctp:open(
 		 0, [{sctp_default_send_param,#sctp_sndrcvinfo{ppid=17}}])),
     ?LOGVAR(S1),
-    ?line P1 =
+    P1 =
 	log_ok(inet:port(S1)),
     ?LOGVAR(P1),
-    ?line #sctp_sndrcvinfo{ppid=17, context=0, timetolive=0, assoc_id=0} =
+    #sctp_sndrcvinfo{ppid=17, context=0, timetolive=0, assoc_id=0} =
 	getopt(S1, sctp_default_send_param),
-    ?line ok =
+    ok =
 	gen_sctp:listen(S1, true),
     %%
-    ?line S2 =
+    S2 =
 	log_ok(gen_sctp:open()),
     ?LOGVAR(S2),
-    ?line P2 =
+    P2 =
 	log_ok(inet:port(S2)),
     ?LOGVAR(P2),
-    ?line #sctp_sndrcvinfo{ppid=0, context=0, timetolive=0, assoc_id=0} =
+    #sctp_sndrcvinfo{ppid=0, context=0, timetolive=0, assoc_id=0} =
 	getopt(S2, sctp_default_send_param),
     %%
-    ?line #sctp_assoc_change{
+    #sctp_assoc_change{
        state=comm_up,
        error=0,
        assoc_id=S2AssocId} = S2AssocChange =
 	log_ok(gen_sctp:connect(S2, Loopback, P1, [])),
     ?LOGVAR(S2AssocChange),
-    ?line case recv_event(log_ok(gen_sctp:recv(S1))) of
-	      {Loopback,P2,
-	       #sctp_assoc_change{
-			  state=comm_up,
-			  error=0,
-			  assoc_id=S1AssocId}} ->
-		  ?LOGVAR(S1AssocId);
-	      {Loopback,P2,
-	       #sctp_paddr_change{
-			  state=addr_confirmed,
-			  error=0,
-			  assoc_id=S1AssocId}} ->
-		  ?LOGVAR(S1AssocId),
-		  {Loopback,P2,
-		   #sctp_assoc_change{
-			      state=comm_up,
-			      error=0,
-			      assoc_id=S1AssocId}} =
-		      recv_event(log_ok(gen_sctp:recv(S1)))
-	  end,
-
-    ?line #sctp_sndrcvinfo{
+    case recv_event(log_ok(gen_sctp:recv(S1))) of
+	{Loopback,P2,
+	 #sctp_assoc_change{
+	    state=comm_up,
+	    error=0,
+	    assoc_id=S1AssocId}} ->
+	    ?LOGVAR(S1AssocId);
+	{Loopback,P2,
+	 #sctp_paddr_change{
+	    state=addr_confirmed,
+	    error=0,
+	    assoc_id=S1AssocId}} ->
+	    ?LOGVAR(S1AssocId),
+	    {Loopback,P2,
+	     #sctp_assoc_change{
+		state=comm_up,
+		error=0,
+		assoc_id=S1AssocId}} =
+		recv_event(log_ok(gen_sctp:recv(S1)))
+    end,
+
+    #sctp_sndrcvinfo{
        ppid=17, context=0, timetolive=0} = %, assoc_id=S1AssocId} =
 	getopt(
 	  S1, sctp_default_send_param, #sctp_sndrcvinfo{assoc_id=S1AssocId}),
-    ?line #sctp_sndrcvinfo{
+    #sctp_sndrcvinfo{
        ppid=0, context=0, timetolive=0} = %, assoc_id=S2AssocId} =
 	getopt(
 	  S2, sctp_default_send_param, #sctp_sndrcvinfo{assoc_id=S2AssocId}),
     %%
-    ?line ok =
+    ok =
 	gen_sctp:send(S1, S1AssocId, 1, <<"1: ",Data/binary>>),
-    ?line case log_ok(gen_sctp:recv(S2)) of
-	      {Loopback,P1,
-	       [#sctp_sndrcvinfo{
-		   stream=1, ppid=17, context=0, assoc_id=S2AssocId}],
-	       <<"1: ",Data/binary>>} -> ok;
-	      Event1 ->
-		  ?line {Loopback,P1,
-			 #sctp_paddr_change{state=addr_confirmed,
-					    addr={_,P1},
-					    error=0,
-					    assoc_id=S2AssocId}} =
-		      recv_event(Event1),
-		  ?line {Loopback,P1,
-			 [#sctp_sndrcvinfo{
-			     stream=1, ppid=17, context=0, assoc_id=S2AssocId}],
-			 <<"1: ",Data/binary>>} =
-		      log_ok(gen_sctp:recv(S2))
-	  end,
+    case log_ok(gen_sctp:recv(S2)) of
+	{Loopback,P1,
+	 [#sctp_sndrcvinfo{
+	     stream=1, ppid=17, context=0, assoc_id=S2AssocId}],
+	 <<"1: ",Data/binary>>} -> ok;
+	Event1 ->
+	    {Loopback,P1,
+	     #sctp_paddr_change{state=addr_confirmed,
+				addr={_,P1},
+				error=0,
+				assoc_id=S2AssocId}} =
+		recv_event(Event1),
+	    {Loopback,P1,
+	     [#sctp_sndrcvinfo{
+		 stream=1, ppid=17, context=0, assoc_id=S2AssocId}],
+	     <<"1: ",Data/binary>>} =
+		log_ok(gen_sctp:recv(S2))
+    end,
     %%
-    ?line ok =
+    ok =
 	setopt(
 	  S1, sctp_default_send_param, #sctp_sndrcvinfo{ppid=18}),
-    ?line ok =
+    ok =
 	setopt(
 	  S1, sctp_default_send_param,
 	  #sctp_sndrcvinfo{ppid=19, assoc_id=S1AssocId}),
-    ?line #sctp_sndrcvinfo{
+    #sctp_sndrcvinfo{
        ppid=18, context=0, timetolive=0, assoc_id=0} =
 	getopt(S1, sctp_default_send_param),
-    ?line #sctp_sndrcvinfo{
+    #sctp_sndrcvinfo{
        ppid=19, context=0, timetolive=0, assoc_id=S1AssocId} =
 	getopt(
 	  S1, sctp_default_send_param, #sctp_sndrcvinfo{assoc_id=S1AssocId}),
     %%
-    ?line ok =
+    ok =
 	gen_sctp:send(S1, S1AssocId, 0, <<"2: ",Data/binary>>),
-    ?line case log_ok(gen_sctp:recv(S2)) of
-	      {Loopback,P1,
-	       [#sctp_sndrcvinfo{
-		   stream=0, ppid=19, context=0, assoc_id=S2AssocId}],
-	       <<"2: ",Data/binary>>} -> ok
-	  end,
-    ?line ok =
+    case log_ok(gen_sctp:recv(S2)) of
+	{Loopback,P1,
+	 [#sctp_sndrcvinfo{
+	     stream=0, ppid=19, context=0, assoc_id=S2AssocId}],
+	 <<"2: ",Data/binary>>} -> ok
+    end,
+    ok =
 	gen_sctp:send(S2, S2AssocChange, 1, <<"3: ",Data/binary>>),
-    ?line case log_ok(gen_sctp:recv(S1)) of
-	      {Loopback,P2,
-	       [#sctp_sndrcvinfo{
-		   stream=1, ppid=0, context=0, assoc_id=S1AssocId}],
-	       <<"3: ",Data/binary>>} -> ok;
-	      Event2 ->
-		  case recv_event(Event2) of
-		      {Loopback,P2,
-		       #sctp_paddr_change{
-				  addr={Loopback,_},
-				  state=State,
-				  error=0, assoc_id=S1AssocId}}
-			when State =:= addr_available;
-			     State =:= addr_confirmed ->
-			  ?line case log_ok(gen_sctp:recv(S1)) of
-				    {Loopback,P2,
-				     [#sctp_sndrcvinfo{
-					 stream=1, ppid=0, context=0,
-					 assoc_id=S1AssocId}],
-				     <<"3: ",Data/binary>>} -> ok
-				end
-		  end
-	  end,
-    ?line ok =
+    case log_ok(gen_sctp:recv(S1)) of
+	{Loopback,P2,
+	 [#sctp_sndrcvinfo{
+	     stream=1, ppid=0, context=0, assoc_id=S1AssocId}],
+	 <<"3: ",Data/binary>>} -> ok;
+	Event2 ->
+	    case recv_event(Event2) of
+		{Loopback,P2,
+		 #sctp_paddr_change{
+		    addr={Loopback,_},
+		    state=State,
+		    error=0, assoc_id=S1AssocId}}
+		  when State =:= addr_available;
+		       State =:= addr_confirmed ->
+		    case log_ok(gen_sctp:recv(S1)) of
+			{Loopback,P2,
+			 [#sctp_sndrcvinfo{
+			     stream=1, ppid=0, context=0,
+			     assoc_id=S1AssocId}],
+			 <<"3: ",Data/binary>>} -> ok
+		    end
+	    end
+    end,
+    ok =
 	do_from_other_process(
 	  fun () ->
 		  gen_sctp:send(
@@ -489,22 +490,22 @@ def_sndrcvinfo(Config) when is_list(Config) ->
 		    #sctp_sndrcvinfo{stream=0, ppid=20, assoc_id=S2AssocId},
 		    <<"4: ",Data/binary>>)
 	  end),
-    ?line case log_ok(do_from_other_process(fun() -> gen_sctp:recv(S1) end)) of
-	      {Loopback,P2,
-	       [#sctp_sndrcvinfo{
-		   stream=0, ppid=20, context=0, assoc_id=S1AssocId}],
-	       <<"4: ",Data/binary>>} -> ok
-	  end,
+    case log_ok(do_from_other_process(fun() -> gen_sctp:recv(S1) end)) of
+	{Loopback,P2,
+	 [#sctp_sndrcvinfo{
+	     stream=0, ppid=20, context=0, assoc_id=S1AssocId}],
+	 <<"4: ",Data/binary>>} -> ok
+    end,
     %%
-    ?line ok =
+    ok =
 	gen_sctp:close(S1),
-    ?line ok =
+    ok =
 	gen_sctp:close(S2),
-    ?line receive
-	      Msg ->
-		  test_server:fail({received,Msg})
-	  after 17 -> ok
-	  end,
+    receive
+	Msg ->
+	    ct:fail({received,Msg})
+    after 17 -> ok
+    end,
     ok.
 
 getopt(S, Opt) ->
@@ -541,147 +542,138 @@ flush() ->
 	    []
     end.
 
-api_open_close(doc) ->
-    "Test the API function open/1,2 and close/1";
-api_open_close(suite) ->
-    [];
+%% Test the API function open/1,2 and close/1.
 api_open_close(Config) when is_list(Config) ->
-    ?line {ok,S1} = gen_sctp:open(0),
-    ?line {ok,P}  = inet:port(S1),
-    ?line ok      = gen_sctp:close(S1),
+    {ok,S1} = gen_sctp:open(0),
+    {ok,P}  = inet:port(S1),
+    ok      = gen_sctp:close(S1),
 
-    ?line {ok,S2} = gen_sctp:open(P),
-    ?line {ok,P}  = inet:port(S2),
-    ?line ok      = gen_sctp:close(S2),
+    {ok,S2} = gen_sctp:open(P),
+    {ok,P}  = inet:port(S2),
+    ok      = gen_sctp:close(S2),
 
-    ?line {ok,S3} = gen_sctp:open([{port,P}]),
-    ?line {ok,P}  = inet:port(S3),
-    ?line ok      = gen_sctp:close(S3),
+    {ok,S3} = gen_sctp:open([{port,P}]),
+    {ok,P}  = inet:port(S3),
+    ok      = gen_sctp:close(S3),
 
-    ?line {ok,S4} = gen_sctp:open(P, []),
-    ?line {ok,P}  = inet:port(S4),
-    ?line ok      = gen_sctp:close(S4),
+    {ok,S4} = gen_sctp:open(P, []),
+    {ok,P}  = inet:port(S4),
+    ok      = gen_sctp:close(S4),
 
-    ?line {ok,S5} = gen_sctp:open(P, [{ifaddr,any}]),
-    ?line {ok,P}  = inet:port(S5),
-    ?line ok      = gen_sctp:close(S5),
+    {ok,S5} = gen_sctp:open(P, [{ifaddr,any}]),
+    {ok,P}  = inet:port(S5),
+    ok      = gen_sctp:close(S5),
 
-    ?line ok      = gen_sctp:close(S5),
+    ok      = gen_sctp:close(S5),
 
-    ?line try gen_sctp:close(0)
-	  catch error:badarg -> ok
-	  end,
+    try gen_sctp:close(0)
+    catch error:badarg -> ok
+    end,
 
-    ?line try gen_sctp:open({})
-	  catch error:badarg -> ok
-	  end,
+    try gen_sctp:open({})
+    catch error:badarg -> ok
+    end,
 
-    ?line try gen_sctp:open(-1)
-	  catch error:badarg -> ok
-	  end,
+    try gen_sctp:open(-1)
+    catch error:badarg -> ok
+    end,
 
-    ?line try gen_sctp:open(65536)
-	  catch error:badarg -> ok
-	  end,
+    try gen_sctp:open(65536)
+    catch error:badarg -> ok
+    end,
 
-    ?line try gen_sctp:open(make_ref(), [])
-	  catch error:badarg -> ok
-	  end,
+    try gen_sctp:open(make_ref(), [])
+    catch error:badarg -> ok
+    end,
 
-    ?line try gen_sctp:open(0, {})
-	  catch error:badarg -> ok
-	  end,
+    try gen_sctp:open(0, {})
+    catch error:badarg -> ok
+    end,
 
-    ?line try gen_sctp:open(0, [make_ref()])
-	  catch error:badarg -> ok
-	  end,
+    try gen_sctp:open(0, [make_ref()])
+    catch error:badarg -> ok
+    end,
 
-    ?line try gen_sctp:open([{invalid_option,0}])
-	  catch error:badarg -> ok
-	  end,
+    try gen_sctp:open([{invalid_option,0}])
+    catch error:badarg -> ok
+    end,
 
-    ?line try gen_sctp:open(0, [{mode,invalid_mode}])
-	  catch error:badarg -> ok
-	  end,
+    try gen_sctp:open(0, [{mode,invalid_mode}])
+    catch error:badarg -> ok
+    end,
     ok.
 
-api_listen(doc) ->
-    "Test the API function listen/2";
-api_listen(suite) ->
-    [];
+%% Test the API function listen/2.
 api_listen(Config) when is_list(Config) ->
-    ?line Localhost = {127,0,0,1},
-
-    ?line try gen_sctp:listen(0, true)
-	  catch error:badarg -> ok
-	  end,
-
-    ?line {ok,S} = gen_sctp:open(),
-    ?line {ok,Pb} = inet:port(S),
-    ?line try gen_sctp:listen(S, not_allowed_for_listen)
-	  catch error:badarg -> ok
-	  end,
-    ?line ok = gen_sctp:close(S),
-    ?line {error,closed} = gen_sctp:listen(S, true),
-
-    ?line {ok,Sb} = gen_sctp:open(Pb),
-    ?line {ok,Sa} = gen_sctp:open(),
-    ?line case gen_sctp:connect(Sa, localhost, Pb, []) of
-	      {error,econnrefused} ->
-		  ?line {ok,{Localhost,
-			     Pb,[],
-			     #sctp_assoc_change{
-				  state=comm_lost}}} =
-		      gen_sctp:recv(Sa, infinity);
-	      {error,#sctp_assoc_change{state=cant_assoc}} ->
-		  ok%;
-		  %% {error,{Localhost,Pb,_,#sctp_assoc_change{state=cant_assoc}}} ->
-		  %% 	  ok
-	  end,
-    ?line ok = gen_sctp:listen(Sb, true),
-    ?line {ok,#sctp_assoc_change{state=comm_up,
-				 error=0}} =
+    Localhost = {127,0,0,1},
+
+    try gen_sctp:listen(0, true)
+    catch error:badarg -> ok
+    end,
+
+    {ok,S} = gen_sctp:open(),
+    {ok,Pb} = inet:port(S),
+    try gen_sctp:listen(S, not_allowed_for_listen)
+    catch error:badarg -> ok
+    end,
+    ok = gen_sctp:close(S),
+    {error,closed} = gen_sctp:listen(S, true),
+
+    {ok,Sb} = gen_sctp:open(Pb),
+    {ok,Sa} = gen_sctp:open(),
+    case gen_sctp:connect(Sa, localhost, Pb, []) of
+	{error,econnrefused} ->
+	    {ok,{Localhost,
+		 Pb,[],
+		 #sctp_assoc_change{
+		    state=comm_lost}}} =
+		gen_sctp:recv(Sa, infinity);
+	{error,#sctp_assoc_change{state=cant_assoc}} ->
+	    ok%;
+	    %% {error,{Localhost,Pb,_,#sctp_assoc_change{state=cant_assoc}}} ->
+	    %% 	  ok
+    end,
+    ok = gen_sctp:listen(Sb, true),
+    {ok,#sctp_assoc_change{state=comm_up,
+			   error=0}} =
 	gen_sctp:connect(Sa, localhost, Pb, []),
-    ?line ok = gen_sctp:close(Sa),
-    ?line ok = gen_sctp:close(Sb),
+    ok = gen_sctp:close(Sa),
+    ok = gen_sctp:close(Sb),
     ok.
 
-api_connect_init(doc) ->
-    "Test the API function connect_init/4";
-api_connect_init(suite) ->
-    [];
+%% Test the API function connect_init/4.
 api_connect_init(Config) when is_list(Config) ->
-    ?line Localhost = {127,0,0,1},
-
-    ?line {ok,S} = gen_sctp:open(),
-    ?line {ok,Pb} = inet:port(S),
-    ?line try gen_sctp:connect_init(S, Localhost, not_allowed_for_port, [])
-	  catch error:badarg -> ok
-	  end,
-    ?line try gen_sctp:connect_init(S, Localhost, 12345, not_allowed_for_opts)
-	  catch error:badarg -> ok
-	  end,
-    ?line ok = gen_sctp:close(S),
-    ?line {error,closed} = gen_sctp:connect_init(S, Localhost, 12345, []),
-
-    ?line {ok,Sb} = gen_sctp:open(Pb),
-    ?line {ok,Sa} = gen_sctp:open(),
-    ?line case gen_sctp:connect_init(Sa, localhost, Pb, []) of
-	      {error,econnrefused} ->
-		  ?line {Localhost,Pb,#sctp_assoc_change{state=comm_lost}} =
-		      recv_event(log_ok(gen_sctp:recv(Sa, infinity)));
-	      ok ->
-		  ?line {Localhost,Pb,#sctp_assoc_change{state=cant_assoc}} =
-		      recv_event(log_ok(gen_sctp:recv(Sa, infinity)))
-	  end,
-    ?line ok = gen_sctp:listen(Sb, true),
-    ?line case gen_sctp:connect_init(Sa, localhost, Pb, []) of
-	      ok ->
-		  ?line {Localhost,Pb,#sctp_assoc_change{state=comm_up}} =
-		      recv_event(log_ok(gen_sctp:recv(Sa, infinity)))
-	  end,
-    ?line ok = gen_sctp:close(Sa),
-    ?line ok = gen_sctp:close(Sb),
+    Localhost = {127,0,0,1},
+
+    {ok,S} = gen_sctp:open(),
+    {ok,Pb} = inet:port(S),
+    try gen_sctp:connect_init(S, Localhost, not_allowed_for_port, [])
+    catch error:badarg -> ok
+    end,
+    try gen_sctp:connect_init(S, Localhost, 12345, not_allowed_for_opts)
+    catch error:badarg -> ok
+    end,
+    ok = gen_sctp:close(S),
+    {error,closed} = gen_sctp:connect_init(S, Localhost, 12345, []),
+
+    {ok,Sb} = gen_sctp:open(Pb),
+    {ok,Sa} = gen_sctp:open(),
+    case gen_sctp:connect_init(Sa, localhost, Pb, []) of
+	{error,econnrefused} ->
+	    {Localhost,Pb,#sctp_assoc_change{state=comm_lost}} =
+		recv_event(log_ok(gen_sctp:recv(Sa, infinity)));
+	ok ->
+	    {Localhost,Pb,#sctp_assoc_change{state=cant_assoc}} =
+		recv_event(log_ok(gen_sctp:recv(Sa, infinity)))
+    end,
+    ok = gen_sctp:listen(Sb, true),
+    case gen_sctp:connect_init(Sa, localhost, Pb, []) of
+	ok ->
+	    {Localhost,Pb,#sctp_assoc_change{state=comm_up}} =
+		recv_event(log_ok(gen_sctp:recv(Sa, infinity)))
+    end,
+    ok = gen_sctp:close(Sa),
+    ok = gen_sctp:close(Sb),
     ok.
 
 recv_event({Addr,Port,[],#sctp_assoc_change{}=AssocChange}) ->
@@ -703,94 +695,86 @@ recv_event({Addr,Port,
 	    #sctp_shutdown_event{assoc_id=Assoc}=ShutdownEvent}) ->
     {Addr,Port,ShutdownEvent}.
 
-api_opts(doc) ->
-    "Test socket options";
-api_opts(suite) ->
-    [];
+%% Test socket options.
 api_opts(Config) when is_list(Config) ->
-    ?line Sndbuf = 32768,
-    ?line Recbuf = 65536,
-    ?line {ok,S} = gen_sctp:open(0),
-    ?line OSType = os:type(),
-    ?line case {inet:setopts(S, [{linger,{true,2}}]),OSType} of
-              {ok,_} ->
-                  ok;
-              {{error,einval},{unix,sunos}} ->
-                  ok
-          end,
-    ?line ok = inet:setopts(S, [{sndbuf,Sndbuf}]),
-    ?line ok = inet:setopts(S, [{recbuf,Recbuf}]),
-    ?line case inet:getopts(S, [sndbuf]) of
-	      {ok,[{sndbuf,SB}]} when SB >= Sndbuf -> ok
-	  end,
-    ?line case inet:getopts(S, [recbuf]) of
-	      {ok,[{recbuf,RB}]} when RB >= Recbuf -> ok
-	  end.
+    Sndbuf = 32768,
+    Recbuf = 65536,
+    {ok,S} = gen_sctp:open(0),
+    OSType = os:type(),
+    case {inet:setopts(S, [{linger,{true,2}}]),OSType} of
+	{ok,_} ->
+	    ok;
+	{{error,einval},{unix,sunos}} ->
+	    ok
+    end,
+    ok = inet:setopts(S, [{sndbuf,Sndbuf}]),
+    ok = inet:setopts(S, [{recbuf,Recbuf}]),
+    case inet:getopts(S, [sndbuf]) of
+	{ok,[{sndbuf,SB}]} when SB >= Sndbuf -> ok
+    end,
+    case inet:getopts(S, [recbuf]) of
+	{ok,[{recbuf,RB}]} when RB >= Recbuf -> ok
+    end.
 
 implicit_inet6(Config) when is_list(Config) ->
-    ?line Hostname = log_ok(inet:gethostname()),
-    ?line
-	case gen_sctp:open(0, [inet6]) of
-	    {ok,S1} ->
-		?line
-		    case inet:getaddr(Hostname, inet6) of
-			{ok,Host} ->
-			    ?line Loopback = {0,0,0,0,0,0,0,1},
-			    ?line io:format("~s ~p~n", ["Loopback",Loopback]),
-			    ?line implicit_inet6(S1, Loopback),
-			    ?line ok = gen_sctp:close(S1),
-			    %%
-			    ?line Localhost =
-				log_ok(inet:getaddr("localhost", inet6)),
-			    ?line io:format("~s ~p~n", ["localhost",Localhost]),
-			    ?line S2 =
-				log_ok(gen_sctp:open(0, [{ip,Localhost}])),
-			    ?line implicit_inet6(S2, Localhost),
-			    ?line ok = gen_sctp:close(S2),
-			    %%
-			    ?line io:format("~s ~p~n", [Hostname,Host]),
-			    ?line S3 =
-				log_ok(gen_sctp:open(0, [{ifaddr,Host}])),
-			    ?line implicit_inet6(S3, Host),
-			    ?line ok = gen_sctp:close(S1);
-			{error,eafnosupport} ->
-			    ?line ok = gen_sctp:close(S1),
-			    {skip,"Can not look up IPv6 address"}
-		    end;
-	    _ ->
-		{skip,"IPv6 not supported"}
-	end.
+    Hostname = log_ok(inet:gethostname()),
+    case gen_sctp:open(0, [inet6]) of
+	{ok,S1} ->
+	    case inet:getaddr(Hostname, inet6) of
+		{ok,Host} ->
+		    Loopback = {0,0,0,0,0,0,0,1},
+		    io:format("~s ~p~n", ["Loopback",Loopback]),
+		    implicit_inet6(S1, Loopback),
+		    ok = gen_sctp:close(S1),
+		    %%
+		    Localhost =
+			log_ok(inet:getaddr("localhost", inet6)),
+		    io:format("~s ~p~n", ["localhost",Localhost]),
+		    S2 =
+			log_ok(gen_sctp:open(0, [{ip,Localhost}])),
+		    implicit_inet6(S2, Localhost),
+		    ok = gen_sctp:close(S2),
+		    %%
+		    io:format("~s ~p~n", [Hostname,Host]),
+		    S3 =
+			log_ok(gen_sctp:open(0, [{ifaddr,Host}])),
+		    implicit_inet6(S3, Host),
+		    ok = gen_sctp:close(S1);
+		{error,eafnosupport} ->
+		    ok = gen_sctp:close(S1),
+		    {skip,"Can not look up IPv6 address"}
+	    end;
+	_ ->
+	    {skip,"IPv6 not supported"}
+    end.
 
 implicit_inet6(S1, Addr) ->
-    ?line ok = gen_sctp:listen(S1, true),
-    ?line P1 = log_ok(inet:port(S1)),
-    ?line S2 = log_ok(gen_sctp:open(0, [inet6])),
-    ?line P2 = log_ok(inet:port(S2)),
-    ?line #sctp_assoc_change{state=comm_up} =
+    ok = gen_sctp:listen(S1, true),
+    P1 = log_ok(inet:port(S1)),
+    S2 = log_ok(gen_sctp:open(0, [inet6])),
+    P2 = log_ok(inet:port(S2)),
+    #sctp_assoc_change{state=comm_up} =
 	log_ok(gen_sctp:connect(S2, Addr, P1, [])),
-    ?line case recv_event(log_ok(gen_sctp:recv(S1))) of
-	      {Addr,P2,#sctp_assoc_change{state=comm_up}} ->
-		  ok;
-	      {Addr,P2,#sctp_paddr_change{state=addr_confirmed,
-					  addr={Addr,P2},
-					  error=0}} ->
-		  {Addr,P2,#sctp_assoc_change{state=comm_up}} =
-		      recv_event(log_ok(gen_sctp:recv(S1)))
-	  end,
-    ?line case log_ok(inet:sockname(S1)) of
-	      {Addr,P1} -> ok;
-	      {{0,0,0,0,0,0,0,0},P1} -> ok
-	  end,
-    ?line case log_ok(inet:sockname(S2)) of
-	      {Addr,P2} -> ok;
-	      {{0,0,0,0,0,0,0,0},P2} -> ok
-	  end,
-    ?line ok = gen_sctp:close(S2).
-
-active_n(doc) ->
-    "Verify {active,N} socket management";
-active_n(suite) ->
-    [];
+    case recv_event(log_ok(gen_sctp:recv(S1))) of
+	{Addr,P2,#sctp_assoc_change{state=comm_up}} ->
+	    ok;
+	{Addr,P2,#sctp_paddr_change{state=addr_confirmed,
+				    addr={Addr,P2},
+				    error=0}} ->
+	    {Addr,P2,#sctp_assoc_change{state=comm_up}} =
+		recv_event(log_ok(gen_sctp:recv(S1)))
+    end,
+    case log_ok(inet:sockname(S1)) of
+	{Addr,P1} -> ok;
+	{{0,0,0,0,0,0,0,0},P1} -> ok
+    end,
+    case log_ok(inet:sockname(S2)) of
+	{Addr,P2} -> ok;
+	{{0,0,0,0,0,0,0,0},P2} -> ok
+    end,
+    ok = gen_sctp:close(S2).
+
+%% Verify {active,N} socket management.
 active_n(Config) when is_list(Config) ->
     N = 3,
     S1 = ok(gen_sctp:open([{active,N}])),
@@ -887,51 +871,45 @@ active_n(Config) when is_list(Config) ->
     ok = gen_sctp:close(S1),
     ok.
 
-basic_stream(doc) ->
-    "Hello world stream socket";
-basic_stream(suite) ->
-    [];
+%% Hello world stream socket.
 basic_stream(Config) when is_list(Config) ->
-    ?line {ok,S} = gen_sctp:open([{type,stream}]),
-    ?line ok = gen_sctp:listen(S, true),
-    ?line ok =
+    {ok,S} = gen_sctp:open([{type,stream}]),
+    ok = gen_sctp:listen(S, true),
+    ok =
 	do_from_other_process(
 	  fun () -> gen_sctp:listen(S, 10) end),
-    ?line ok = gen_sctp:close(S),
+    ok = gen_sctp:close(S),
     ok.
 
-xfer_stream_min(doc) ->
-    "Minimal data transfer";
-xfer_stream_min(suite) ->
-    [];
+%% Minimal data transfer.
 xfer_stream_min(Config) when is_list(Config) ->
-    ?line Stream = 0,
-    ?line Data = <<"The quick brown fox jumps over a lazy dog 0123456789">>,
-    ?line Loopback = {127,0,0,1},
-    ?line {ok,Sb} = gen_sctp:open([{type,seqpacket}]),
-    ?line ?LOGVAR(Sb),
-    ?line {ok,Pb} = inet:port(Sb),
-    ?line ?LOGVAR(Pb),
-    ?line ok = gen_sctp:listen(Sb, true),
-
-    ?line {ok,Sa} = gen_sctp:open([{type,stream}]),
-    ?line ?LOGVAR(Sa),
-    ?line {ok,Pa} = inet:port(Sa),
-    ?line ?LOGVAR(Pa),
-    ?line #sctp_assoc_change{state=comm_up,
-			     error=0,
-			     outbound_streams=SaOutboundStreams,
-			     inbound_streams=SaInboundStreams,
-			     assoc_id=SaAssocId_X} =
+    Stream = 0,
+    Data = <<"The quick brown fox jumps over a lazy dog 0123456789">>,
+    Loopback = {127,0,0,1},
+    {ok,Sb} = gen_sctp:open([{type,seqpacket}]),
+    ?LOGVAR(Sb),
+    {ok,Pb} = inet:port(Sb),
+    ?LOGVAR(Pb),
+    ok = gen_sctp:listen(Sb, true),
+
+    {ok,Sa} = gen_sctp:open([{type,stream}]),
+    ?LOGVAR(Sa),
+    {ok,Pa} = inet:port(Sa),
+    ?LOGVAR(Pa),
+    #sctp_assoc_change{state=comm_up,
+		       error=0,
+		       outbound_streams=SaOutboundStreams,
+		       inbound_streams=SaInboundStreams,
+		       assoc_id=SaAssocId_X} =
 	log_ok(gen_sctp:connect(Sa, Loopback, Pb, [])),
-    ?line ?LOGVAR(SaAssocId_X),
-    ?line [{_,#sctp_paddrinfo{assoc_id=SaAssocId,state=active}}] =
+    ?LOGVAR(SaAssocId_X),
+    [{_,#sctp_paddrinfo{assoc_id=SaAssocId,state=active}}] =
 	log_ok(inet:getopts(Sa, [{sctp_get_peer_addr_info,
 				  #sctp_paddrinfo{address={Loopback,Pb}}}])),
-    ?line ?LOGVAR(SaAssocId),
-    ?line match_unless_solaris(SaAssocId_X, SaAssocId),
+    ?LOGVAR(SaAssocId),
+    match_unless_solaris(SaAssocId_X, SaAssocId),
 
-    ?line {SbOutboundStreams,SbInboundStreams,SbAssocId} =
+    {SbOutboundStreams,SbInboundStreams,SbAssocId} =
 	case recv_event(log_ok(gen_sctp:recv(Sb, infinity))) of
 	    {Loopback,Pa,
 	     #sctp_assoc_change{state=comm_up,
@@ -946,87 +924,87 @@ xfer_stream_min(Config) when is_list(Config) ->
 				error=0,
 				assoc_id=AI}} ->
 		{Loopback,Pa,
-		 ?line #sctp_assoc_change{state=comm_up,
-					  error=0,
-					  outbound_streams=OS,
-					  inbound_streams=IS,
-					  assoc_id=AI}} =
+		 #sctp_assoc_change{state=comm_up,
+				    error=0,
+				    outbound_streams=OS,
+				    inbound_streams=IS,
+				    assoc_id=AI}} =
 		    recv_event(log_ok(gen_sctp:recv(Sb, infinity))),
 		{OS,IS,AI}
 	end,
-    ?line ?LOGVAR(SbAssocId),
-    ?line SaOutboundStreams = SbInboundStreams,
-    ?line ?LOGVAR(SaOutboundStreams),
-    ?line SbOutboundStreams = SaInboundStreams,
-    ?line ?LOGVAR(SbOutboundStreams),
-    ?line ok = gen_sctp:send(Sa, SaAssocId, 0, Data),
-    ?line case log_ok(gen_sctp:recv(Sb, infinity)) of
-	      {Loopback,
-	       Pa,
-	       [#sctp_sndrcvinfo{stream=Stream,
-				 assoc_id=SbAssocId}],
-	       Data} -> ok;
-	      {Loopback,
-	       Pa,[],
-	       #sctp_paddr_change{addr = {Loopback,_},
-				  state = addr_available,
-				  error = 0,
-				  assoc_id = SbAssocId}} ->
-		  {Loopback,
-		   Pa,
-		   [#sctp_sndrcvinfo{stream=Stream,
-				     assoc_id=SbAssocId}],
-		   Data} = log_ok(gen_sctp:recv(Sb, infinity));
-	      {Loopback,
-	       Pa,
-	       [#sctp_sndrcvinfo{stream=Stream,
-				 assoc_id=SbAssocId}],
-	       #sctp_paddr_change{addr = {Loopback,_},
-				  state = addr_confirmed,
-				  error = 0,
-				  assoc_id = SbAssocId}} ->
-		  {Loopback,
-		   Pa,
-		   [#sctp_sndrcvinfo{stream=Stream,
-				     assoc_id=SbAssocId}],
-		   Data} = log_ok(gen_sctp:recv(Sb, infinity))
-	  end,
-    ?line ok =
+    ?LOGVAR(SbAssocId),
+    SaOutboundStreams = SbInboundStreams,
+    ?LOGVAR(SaOutboundStreams),
+    SbOutboundStreams = SaInboundStreams,
+    ?LOGVAR(SbOutboundStreams),
+    ok = gen_sctp:send(Sa, SaAssocId, 0, Data),
+    case log_ok(gen_sctp:recv(Sb, infinity)) of
+	{Loopback,
+	 Pa,
+	 [#sctp_sndrcvinfo{stream=Stream,
+			   assoc_id=SbAssocId}],
+	 Data} -> ok;
+	{Loopback,
+	 Pa,[],
+	 #sctp_paddr_change{addr = {Loopback,_},
+			    state = addr_available,
+			    error = 0,
+			    assoc_id = SbAssocId}} ->
+	    {Loopback,
+	     Pa,
+	     [#sctp_sndrcvinfo{stream=Stream,
+			       assoc_id=SbAssocId}],
+	     Data} = log_ok(gen_sctp:recv(Sb, infinity));
+	{Loopback,
+	 Pa,
+	 [#sctp_sndrcvinfo{stream=Stream,
+			   assoc_id=SbAssocId}],
+	 #sctp_paddr_change{addr = {Loopback,_},
+			    state = addr_confirmed,
+			    error = 0,
+			    assoc_id = SbAssocId}} ->
+	    {Loopback,
+	     Pa,
+	     [#sctp_sndrcvinfo{stream=Stream,
+			       assoc_id=SbAssocId}],
+	     Data} = log_ok(gen_sctp:recv(Sb, infinity))
+    end,
+    ok =
 	do_from_other_process(
 	  fun () -> gen_sctp:send(Sb, SbAssocId, 0, Data) end),
-    ?line case log_ok(gen_sctp:recv(Sa, infinity)) of
-	      {Loopback,Pb,
-	       [#sctp_sndrcvinfo{stream=Stream,
-				 assoc_id=SaAssocId}],
-	       Data} -> ok;
-	      Event1 ->
-		  ?line {Loopback,Pb,
-			 #sctp_paddr_change{state=addr_confirmed,
-					    addr={_,Pb},
-					    error=0,
-					    assoc_id=SaAssocId}} =
-		      recv_event(Event1),
-		  ?line {Loopback,Pb,
-			 [#sctp_sndrcvinfo{stream=Stream,
-					   assoc_id=SaAssocId}],
-			 Data} =
-		      log_ok(gen_sctp:recv(Sa, infinity))
-	  end,
-    ?line ok = gen_sctp:close(Sa),
-    ?line {Loopback,Pa,
-	   #sctp_shutdown_event{assoc_id=SbAssocId}} =
+    case log_ok(gen_sctp:recv(Sa, infinity)) of
+	{Loopback,Pb,
+	 [#sctp_sndrcvinfo{stream=Stream,
+			   assoc_id=SaAssocId}],
+	 Data} -> ok;
+	Event1 ->
+	    {Loopback,Pb,
+	     #sctp_paddr_change{state=addr_confirmed,
+				addr={_,Pb},
+				error=0,
+				assoc_id=SaAssocId}} =
+		recv_event(Event1),
+	    {Loopback,Pb,
+	     [#sctp_sndrcvinfo{stream=Stream,
+			       assoc_id=SaAssocId}],
+	     Data} =
+		log_ok(gen_sctp:recv(Sa, infinity))
+    end,
+    ok = gen_sctp:close(Sa),
+    {Loopback,Pa,
+     #sctp_shutdown_event{assoc_id=SbAssocId}} =
 	recv_event(log_ok(gen_sctp:recv(Sb, infinity))),
-    ?line {Loopback,Pa,
-	   #sctp_assoc_change{state=shutdown_comp,
-			      error=0,
-			      assoc_id=SbAssocId}} =
+    {Loopback,Pa,
+     #sctp_assoc_change{state=shutdown_comp,
+			error=0,
+			assoc_id=SbAssocId}} =
 	recv_event(log_ok(gen_sctp:recv(Sb, infinity))),
-    ?line ok = gen_sctp:close(Sb),
+    ok = gen_sctp:close(Sb),
 
-    ?line receive
-	      Msg -> test_server:fail({received,Msg})
-	  after 17 -> ok
-	  end,
+    receive
+	Msg -> ct:fail({received,Msg})
+    after 17 -> ok
+    end,
     ok.
 
 
@@ -1058,205 +1036,184 @@ do_from_other_process(Fun) ->
     end.
 
 
-peeloff_active_once(doc) ->
-    "Peel off an SCTP stream socket ({active,once})";
-peeloff_active_once(suite) ->
-    [];
+%% Peel off an SCTP stream socket ({active,once}).
 
 peeloff_active_once(Config) ->
     peeloff(Config, [{active,once}]).
 
-peeloff_active_true(doc) ->
-    "Peel off an SCTP stream socket ({active,true})";
-peeloff_active_true(suite) ->
-    [];
+%% Peel off an SCTP stream socket ({active,true}).
 
 peeloff_active_true(Config) ->
     peeloff(Config, [{active,true}]).
 
-peeloff_active_n(doc) ->
-    "Peel off an SCTP stream socket ({active,N})";
-peeloff_active_n(suite) ->
-    [];
+%% Peel off an SCTP stream socket ({active,N}).
 
 peeloff_active_n(Config) ->
     peeloff(Config, [{active,1}]).
 
 peeloff(Config, SockOpts) when is_list(Config) ->
-    ?line Addr = {127,0,0,1},
-    ?line Stream = 0,
-    ?line Timeout = 333,
-    ?line S1 = socket_open([{ifaddr,Addr}|SockOpts], Timeout),
-    ?line ?LOGVAR(S1),
-    ?line P1 = socket_call(S1, get_port),
-    ?line ?LOGVAR(P1),
-    ?line Socket1 = socket_call(S1, get_socket),
-    ?line ?LOGVAR(Socket1),
-    ?line socket_call(S1, {listen,true}),
-    ?line S2 = socket_open([{ifaddr,Addr}|SockOpts], Timeout),
-    ?line ?LOGVAR(S2),
-    ?line P2 = socket_call(S2, get_port),
-    ?line ?LOGVAR(P2),
-    ?line Socket2 = socket_call(S2, get_socket),
-    ?line ?LOGVAR(Socket2),
+    Addr = {127,0,0,1},
+    Stream = 0,
+    Timeout = 333,
+    S1 = socket_open([{ifaddr,Addr}|SockOpts], Timeout),
+    ?LOGVAR(S1),
+    P1 = socket_call(S1, get_port),
+    ?LOGVAR(P1),
+    Socket1 = socket_call(S1, get_socket),
+    ?LOGVAR(Socket1),
+    socket_call(S1, {listen,true}),
+    S2 = socket_open([{ifaddr,Addr}|SockOpts], Timeout),
+    ?LOGVAR(S2),
+    P2 = socket_call(S2, get_port),
+    ?LOGVAR(P2),
+    Socket2 = socket_call(S2, get_socket),
+    ?LOGVAR(Socket2),
     %%
-    ?line socket_call(S2, {connect_init,Addr,P1,[]}),
-    ?line S2Ai =
+    socket_call(S2, {connect_init,Addr,P1,[]}),
+    S2Ai =
 	receive
 	    {S2,{Addr,P1,
 		 #sctp_assoc_change{
-			state=comm_up,
-			assoc_id=AssocId2}}} -> AssocId2
+		    state=comm_up,
+		    assoc_id=AssocId2}}} -> AssocId2
 	after Timeout ->
 		socket_bailout([S1,S2])
 	end,
-    ?line ?LOGVAR(S2Ai),
-    ?line S1Ai =
+    ?LOGVAR(S2Ai),
+    S1Ai =
 	receive
 	    {S1,{Addr,P2,
 		 #sctp_assoc_change{
-			state=comm_up,
-			assoc_id=AssocId1}}} -> AssocId1
+		    state=comm_up,
+		    assoc_id=AssocId1}}} -> AssocId1
 	after Timeout ->
 		socket_bailout([S1,S2])
 	end,
-    ?line ?LOGVAR(S1Ai),
+    ?LOGVAR(S1Ai),
     %%
-    ?line socket_call(S2, {send,S2Ai,Stream,<<"Number one">>}),
-    ?line
-	receive
-	    {S1,{Addr,P2,S1Ai,Stream,<<"Number one">>}} -> ok
-	after Timeout ->
-		socket_bailout([S1,S2])
-	end,
-    ?line socket_call(S2, {send,Socket1,S1Ai,Stream,<<"Number two">>}),
-    ?line
-	receive
-	    {S2,{Addr,P1,S2Ai,Stream,<<"Number two">>}} -> ok
-	after Timeout ->
-		socket_bailout([S1,S2])
-	end,
+    socket_call(S2, {send,S2Ai,Stream,<<"Number one">>}),
+    receive
+	{S1,{Addr,P2,S1Ai,Stream,<<"Number one">>}} -> ok
+    after Timeout ->
+	    socket_bailout([S1,S2])
+    end,
+    socket_call(S2, {send,Socket1,S1Ai,Stream,<<"Number two">>}),
+    receive
+	{S2,{Addr,P1,S2Ai,Stream,<<"Number two">>}} -> ok
+    after Timeout ->
+	    socket_bailout([S1,S2])
+    end,
     %%
-    ?line S3 = socket_peeloff(Socket1, S1Ai, SockOpts, Timeout),
-    ?line ?LOGVAR(S3),
-    ?line P3_X = socket_call(S3, get_port),
-    ?line ?LOGVAR(P3_X),
-    ?line P3 = case P3_X of 0 -> P1; _ -> P3_X end,
-    ?line [{_,#sctp_paddrinfo{assoc_id=S3Ai,state=active}}] =
+    S3 = socket_peeloff(Socket1, S1Ai, SockOpts, Timeout),
+    ?LOGVAR(S3),
+    P3_X = socket_call(S3, get_port),
+    ?LOGVAR(P3_X),
+    P3 = case P3_X of 0 -> P1; _ -> P3_X end,
+    [{_,#sctp_paddrinfo{assoc_id=S3Ai,state=active}}] =
 	socket_call(S3,
 		    {getopts,[{sctp_get_peer_addr_info,
 			       #sctp_paddrinfo{address={Addr,P2}}}]}),
-    %%?line S3Ai = S1Ai,
-    ?line ?LOGVAR(S3Ai),
+    %%S3Ai = S1Ai,
+    ?LOGVAR(S3Ai),
     %%
-    ?line socket_call(S3, {send,S3Ai,Stream,<<"Number three">>}),
-    ?line
-	receive
-	    {S2,{Addr,P3,S2Ai,Stream,<<"Number three">>}} -> ok
-	after Timeout ->
-		socket_bailout([S1,S2,S3])
-	end,
-    ?line socket_call(S3, {send,Socket2,S2Ai,Stream,<<"Number four">>}),
-    ?line
-	receive
-	    {S3,{Addr,P2,S3Ai,Stream,<<"Number four">>}} -> ok
-	after Timeout ->
-		socket_bailout([S1,S2,S3])
-	end,
+    socket_call(S3, {send,S3Ai,Stream,<<"Number three">>}),
+    receive
+	{S2,{Addr,P3,S2Ai,Stream,<<"Number three">>}} -> ok
+    after Timeout ->
+	    socket_bailout([S1,S2,S3])
+    end,
+    socket_call(S3, {send,Socket2,S2Ai,Stream,<<"Number four">>}),
+    receive
+	{S3,{Addr,P2,S3Ai,Stream,<<"Number four">>}} -> ok
+    after Timeout ->
+	    socket_bailout([S1,S2,S3])
+    end,
     %%
-    ?line inet:i(sctp),
-    ?line socket_close_verbose(S1),
-    ?line socket_close_verbose(S2),
-    ?line
-	receive
-	    {S3,{Addr,P2,#sctp_shutdown_event{assoc_id=S3Ai_X}}} ->
-		?line match_unless_solaris(S3Ai, S3Ai_X)
-	after Timeout ->
-		socket_bailout([S3])
-	end,
-    ?line
-	receive
-	    {S3,{Addr,P2,#sctp_assoc_change{state=shutdown_comp,
-					    assoc_id=S3Ai}}} -> ok
-	after Timeout ->
-		socket_bailout([S3])
-	end,
-    ?line socket_close_verbose(S3),
-    ?line [] = flush(),
+    inet:i(sctp),
+    socket_close_verbose(S1),
+    socket_close_verbose(S2),
+    receive
+	{S3,{Addr,P2,#sctp_shutdown_event{assoc_id=S3Ai_X}}} ->
+	    match_unless_solaris(S3Ai, S3Ai_X)
+    after Timeout ->
+	    socket_bailout([S3])
+    end,
+    receive
+	{S3,{Addr,P2,#sctp_assoc_change{state=shutdown_comp,
+					assoc_id=S3Ai}}} -> ok
+    after Timeout ->
+	    socket_bailout([S3])
+    end,
+    socket_close_verbose(S3),
+    [] = flush(),
     ok.
 
 
 
-buffers(doc) ->
-    ["Check sndbuf and recbuf behaviour"];
-buffers(suite) ->
-    [];
+%% Check sndbuf and recbuf behaviour.
 buffers(Config) when is_list(Config) ->
-    ?line Limit = 4096,
-    ?line Addr = {127,0,0,1},
-    ?line Stream = 1,
-    ?line Timeout = 3333,
-    ?line S1 = socket_open([{ip,Addr}], Timeout),
-    ?line ?LOGVAR(S1),
-    ?line P1 = socket_call(S1, get_port),
-    ?line ?LOGVAR(P1),
-    ?line ok = socket_call(S1, {listen,true}),
-    ?line S2 = socket_open([{ip,Addr}], Timeout),
-    ?line ?LOGVAR(S2),
-    ?line P2 = socket_call(S2, get_port),
-    ?line ?LOGVAR(P2),
+    Limit = 4096,
+    Addr = {127,0,0,1},
+    Stream = 1,
+    Timeout = 3333,
+    S1 = socket_open([{ip,Addr}], Timeout),
+    ?LOGVAR(S1),
+    P1 = socket_call(S1, get_port),
+    ?LOGVAR(P1),
+    ok = socket_call(S1, {listen,true}),
+    S2 = socket_open([{ip,Addr}], Timeout),
+    ?LOGVAR(S2),
+    P2 = socket_call(S2, get_port),
+    ?LOGVAR(P2),
     %%
-    ?line socket_call(S2, {connect_init,Addr,P1,[]}),
-    ?line S2Ai =
+    socket_call(S2, {connect_init,Addr,P1,[]}),
+    S2Ai =
 	receive
 	    {S2,{Addr,P1,
 		 #sctp_assoc_change{
-			state=comm_up,
-			assoc_id=AssocId2}}} -> AssocId2
+		    state=comm_up,
+		    assoc_id=AssocId2}}} -> AssocId2
 	after Timeout ->
 		socket_bailout([S1,S2])
 	end,
-    ?line S1Ai =
+    S1Ai =
 	receive
 	    {S1,{Addr,P2,
 		 #sctp_assoc_change{
-			state=comm_up,
-			assoc_id=AssocId1}}} -> AssocId1
+		    state=comm_up,
+		    assoc_id=AssocId1}}} -> AssocId1
 	after Timeout ->
 		socket_bailout([S1,S2])
 	end,
     %%
-    ?line socket_call(S1, {setopts,[{recbuf,Limit}]}),
-    ?line Recbuf =
+    socket_call(S1, {setopts,[{recbuf,Limit}]}),
+    Recbuf =
 	case socket_call(S1, {getopts,[recbuf]}) of
 	    [{recbuf,RB1}] when RB1 >= Limit -> RB1
 	end,
-    ?line Data = mk_data(Recbuf+Limit),
-    ?line socket_call(S2, {setopts,[{sndbuf,Recbuf+Limit}]}),
-    ?line socket_call(S2, {send,S2Ai,Stream,Data}),
-    ?line
-	receive
-	    {S1,{Addr,P2,S1Ai,Stream,Data}} -> ok
-	after Timeout ->
-		socket_bailout([S1,S2])
-	end,
+    Data = mk_data(Recbuf+Limit),
+    socket_call(S2, {setopts,[{sndbuf,Recbuf+Limit}]}),
+    socket_call(S2, {send,S2Ai,Stream,Data}),
+    receive
+	{S1,{Addr,P2,S1Ai,Stream,Data}} -> ok
+    after Timeout ->
+	    socket_bailout([S1,S2])
+    end,
     %%
-    ?line socket_close_verbose(S1),
-    ?line
-	receive
-	    {S2,{Addr,P1,#sctp_shutdown_event{assoc_id=S2Ai}}} -> ok
-	after Timeout ->
-		socket_bailout([S2])
-	end,
-    ?line
-	receive
-	    {S2,{Addr,P1,#sctp_assoc_change{state=shutdown_comp,
-					    assoc_id=S2Ai}}} -> ok
-	after Timeout ->
-		socket_bailout([S2])
-	end,
-    ?line socket_close_verbose(S2),
-    ?line [] = flush(),
+    socket_close_verbose(S1),
+    receive
+	{S2,{Addr,P1,#sctp_shutdown_event{assoc_id=S2Ai}}} -> ok
+    after Timeout ->
+	    socket_bailout([S2])
+    end,
+    receive
+	{S2,{Addr,P1,#sctp_assoc_change{state=shutdown_comp,
+					assoc_id=S2Ai}}} -> ok
+    after Timeout ->
+	    socket_bailout([S2])
+    end,
+    socket_close_verbose(S2),
+    [] = flush(),
     ok.
 
 mk_data(Bytes) ->
@@ -1269,153 +1226,129 @@ mk_data(_, _, Bin) ->
 
 
 
-open_multihoming_ipv4_socket(doc) ->
-    "Test opening a multihoming ipv4 socket";
-open_multihoming_ipv4_socket(suite) ->
-    [];
+%% Test opening a multihoming ipv4 socket.
 open_multihoming_ipv4_socket(Config) when is_list(Config) ->
-    ?line case get_addrs_by_family(inet, 2) of
-	      {ok, [Addr1, Addr2]} ->
-		  ?line do_open_and_connect([Addr1, Addr2], Addr1);
-	      {error, Reason} ->
-		  {skip, Reason}
-	  end.
-
-open_unihoming_ipv6_socket(doc) ->
-    %% This test is mostly aimed to indicate
-    %% whether host has a non-working ipv6 setup
-    "Test opening a unihoming (non-multihoming) ipv6 socket";
-open_unihoming_ipv6_socket(suite) ->
-    [];
+    case get_addrs_by_family(inet, 2) of
+	{ok, [Addr1, Addr2]} ->
+	    do_open_and_connect([Addr1, Addr2], Addr1);
+	{error, Reason} ->
+	    {skip, Reason}
+    end.
+
+%% This test is mostly aimed to indicate whether host has a
+%% non-working ipv6 setup.  Test opening a unihoming (non-multihoming)
+%% ipv6 socket.
 open_unihoming_ipv6_socket(Config) when is_list(Config) ->
-    ?line case get_addrs_by_family(inet6, 1) of
-	      {ok, [Addr]} ->
-		  ?line do_open_and_connect([Addr], Addr);
-	      {error, Reason} ->
-		  {skip, Reason}
-	  end.
-
-
-open_multihoming_ipv6_socket(doc) ->
-    "Test opening a multihoming ipv6 socket";
-open_multihoming_ipv6_socket(suite) ->
-    [];
+    case get_addrs_by_family(inet6, 1) of
+	{ok, [Addr]} ->
+	    do_open_and_connect([Addr], Addr);
+	{error, Reason} ->
+	    {skip, Reason}
+    end.
+
+
+%% Test opening a multihoming ipv6 socket.
 open_multihoming_ipv6_socket(Config) when is_list(Config) ->
-    ?line case get_addrs_by_family(inet6, 2) of
-	      {ok, [Addr1, Addr2]} ->
-		  ?line do_open_and_connect([Addr1, Addr2], Addr1);
-	      {error, Reason} ->
-		  {skip, Reason}
-	  end.
-
-open_multihoming_ipv4_and_ipv6_socket(doc) ->
-    "Test opening a multihoming ipv6 socket with ipv4 and ipv6 addresses";
-open_multihoming_ipv4_and_ipv6_socket(suite) ->
-    [];
+    case get_addrs_by_family(inet6, 2) of
+	{ok, [Addr1, Addr2]} ->
+	    do_open_and_connect([Addr1, Addr2], Addr1);
+	{error, Reason} ->
+	    {skip, Reason}
+    end.
+
+%% Test opening a multihoming ipv6 socket with ipv4 and ipv6 addresses.
 open_multihoming_ipv4_and_ipv6_socket(Config) when is_list(Config) ->
-    ?line case get_addrs_by_family(inet_and_inet6, 2) of
-	      {ok, [[InetAddr1, InetAddr2], [Inet6Addr1, Inet6Addr2]]} ->
-		  %% Connect to the first address to test bind
-		  ?line do_open_and_connect([InetAddr1, Inet6Addr1, InetAddr2],
-					    InetAddr1),
-		  ?line do_open_and_connect([Inet6Addr1, InetAddr1],
-					    Inet6Addr1),
-
-		  %% Connect an address, not the first,
-		  %% to test sctp_bindx
-		  ?line do_open_and_connect([Inet6Addr1, Inet6Addr2, InetAddr1],
-					    Inet6Addr2),
-		  ?line do_open_and_connect([Inet6Addr1, Inet6Addr2, InetAddr1],
-					    InetAddr1);
-	      {error, Reason} ->
-		  {skip, Reason}
-	  end.
-
-names_unihoming_ipv4(doc) ->
-    "Test inet:socknames/peernames on unihoming IPv4 sockets";
-names_unihoming_ipv4(suite) ->
-    [];
+    case get_addrs_by_family(inet_and_inet6, 2) of
+	{ok, [[InetAddr1, InetAddr2], [Inet6Addr1, Inet6Addr2]]} ->
+	    %% Connect to the first address to test bind
+	    do_open_and_connect([InetAddr1, Inet6Addr1, InetAddr2],
+				InetAddr1),
+	    do_open_and_connect([Inet6Addr1, InetAddr1],
+				Inet6Addr1),
+
+	    %% Connect an address, not the first,
+	    %% to test sctp_bindx
+	    do_open_and_connect([Inet6Addr1, Inet6Addr2, InetAddr1],
+				Inet6Addr2),
+	    do_open_and_connect([Inet6Addr1, Inet6Addr2, InetAddr1],
+				InetAddr1);
+	{error, Reason} ->
+	    {skip, Reason}
+    end.
+
+%% Test inet:socknames/peernames on unihoming IPv4 sockets.
 names_unihoming_ipv4(Config) when is_list(Config) ->
-    ?line do_names(Config, inet, 1).
+    do_names(Config, inet, 1).
 
-names_unihoming_ipv6(doc) ->
-    "Test inet:socknames/peernames on unihoming IPv6 sockets";
-names_unihoming_ipv6(suite) ->
-    [];
+%% Test inet:socknames/peernames on unihoming IPv6 sockets.
 names_unihoming_ipv6(Config) when is_list(Config) ->
-    ?line do_names(Config, inet6, 1).
+    do_names(Config, inet6, 1).
 
-names_multihoming_ipv4(doc) ->
-    "Test inet:socknames/peernames on multihoming IPv4 sockets";
-names_multihoming_ipv4(suite) ->
-    [];
+%% Test inet:socknames/peernames on multihoming IPv4 sockets.
 names_multihoming_ipv4(Config) when is_list(Config) ->
-    ?line do_names(Config, inet, 2).
+    do_names(Config, inet, 2).
 
-names_multihoming_ipv6(doc) ->
-    "Test inet:socknames/peernames on multihoming IPv6 sockets";
-names_multihoming_ipv6(suite) ->
-    [];
+%% Test inet:socknames/peernames on multihoming IPv6 sockets.
 names_multihoming_ipv6(Config) when is_list(Config) ->
-    ?line do_names(Config, inet6, 2).
+    do_names(Config, inet6, 2).
 
 
 
 do_names(_, FamilySpec, AddressCount) ->
     Fun =
 	fun (ServerSocket, _, ServerAssoc, ClientSocket, _, ClientAssoc) ->
-		?line ServerSocknamesNoassoc =
+		ServerSocknamesNoassoc =
 		    lists:sort(ok(inet:socknames(ServerSocket))),
-		?line ?LOGVAR(ServerSocknamesNoassoc),
-		?line ServerSocknames =
+		?LOGVAR(ServerSocknamesNoassoc),
+		ServerSocknames =
 		    lists:sort(ok(inet:socknames(ServerSocket, ServerAssoc))),
-		?line ?LOGVAR(ServerSocknames),
-		?line [_|_] =
+		?LOGVAR(ServerSocknames),
+		[_|_] =
 		    ordsets:intersection
 		      (ServerSocknamesNoassoc, ServerSocknames),
-		?line ClientSocknamesNoassoc =
+		ClientSocknamesNoassoc =
 		    lists:sort(ok(inet:socknames(ClientSocket))),
-		?line ?LOGVAR(ClientSocknamesNoassoc),
-		?line ClientSocknames =
+		?LOGVAR(ClientSocknamesNoassoc),
+		ClientSocknames =
 		    lists:sort(ok(inet:socknames(ClientSocket, ClientAssoc))),
-		?line ?LOGVAR(ClientSocknames),
-		?line [_|_] =
+		?LOGVAR(ClientSocknames),
+		[_|_] =
 		    ordsets:intersection
 		      (ClientSocknamesNoassoc, ClientSocknames),
-		?line err([einval,enotconn], inet:peernames(ServerSocket)),
-		?line ServerPeernames =
+		err([einval,enotconn], inet:peernames(ServerSocket)),
+		ServerPeernames =
 		    lists:sort(ok(inet:peernames(ServerSocket, ServerAssoc))),
-		?line ?LOGVAR(ServerPeernames),
-		?line err([einval,enotconn], inet:peernames(ClientSocket)),
-		?line ClientPeernames =
+		?LOGVAR(ServerPeernames),
+		err([einval,enotconn], inet:peernames(ClientSocket)),
+		ClientPeernames =
 		    lists:sort(ok(inet:peernames(ClientSocket, ClientAssoc))),
-		?line ?LOGVAR(ClientPeernames),
-		?line ServerSocknames = ClientPeernames,
-		?line ClientSocknames = ServerPeernames,
-		?line {ok,Socket} =
+		?LOGVAR(ClientPeernames),
+		ServerSocknames = ClientPeernames,
+		ClientSocknames = ServerPeernames,
+		{ok,Socket} =
 		    gen_sctp:peeloff(ServerSocket, ServerAssoc),
-		?line SocknamesNoassoc =
+		SocknamesNoassoc =
 		    lists:sort(ok(inet:socknames(Socket))),
-		?line ?LOGVAR(SocknamesNoassoc),
-		?line Socknames =
+		?LOGVAR(SocknamesNoassoc),
+		Socknames =
 		    lists:sort(ok(inet:socknames(Socket, ServerAssoc))),
-		?line ?LOGVAR(Socknames),
-		?line true =
+		?LOGVAR(Socknames),
+		true =
 		    ordsets:is_subset(SocknamesNoassoc, Socknames),
-		?line Peernames =
+		Peernames =
 		    lists:sort(ok(inet:peernames(Socket, ServerAssoc))),
-		?line ?LOGVAR(Peernames),
-		?line ok = gen_sctp:close(Socket),
-		?line Socknames = ClientPeernames,
-		?line ClientSocknames = Peernames,
+		?LOGVAR(Peernames),
+		ok = gen_sctp:close(Socket),
+		Socknames = ClientPeernames,
+		ClientSocknames = Peernames,
 		ok
 	end,
-    ?line case get_addrs_by_family(FamilySpec, AddressCount) of
-	      {ok, Addresses} when length(Addresses) =:= AddressCount ->
-		  ?line do_open_and_connect(Addresses, hd(Addresses), Fun);
-	      {error, Reason} ->
-		  {skip, Reason}
-	  end.
+    case get_addrs_by_family(FamilySpec, AddressCount) of
+	{ok, Addresses} when length(Addresses) =:= AddressCount ->
+	    do_open_and_connect(Addresses, hd(Addresses), Fun);
+	{error, Reason} ->
+	    {skip, Reason}
+    end.
 
 
 
@@ -1451,29 +1384,28 @@ get_addrs_by_family(Family, NumAddrs) ->
 
 get_addrs_by_family_aux(Family, NumAddrs) when Family =:= inet;
 					       Family =:= inet6 ->
-    ?line
-	case inet:getaddr(localhost, Family) of
-	    {error,eafnosupport} ->
-		{skip, f("No support for ~p", Family)};
-	    {ok, _} ->
-		?line IfAddrs = ok(inet:getifaddrs()),
-		?line case filter_addrs_by_family(IfAddrs, Family) of
-			  Addrs when length(Addrs) >= NumAddrs ->
-			      {ok, lists:sublist(Addrs, NumAddrs)};
-			  [] ->
-			      {error, f("Need ~p ~p address(es) found none~n",
-					[NumAddrs, Family])};
-			  Addrs ->
-			      {error,
-			       f("Need ~p ~p address(es) found only ~p: ~p~n",
-				 [NumAddrs, Family, length(Addrs), Addrs])}
-		      end
-	end;
+    case inet:getaddr(localhost, Family) of
+	{error,eafnosupport} ->
+	    {skip, f("No support for ~p", Family)};
+	{ok, _} ->
+	    IfAddrs = ok(inet:getifaddrs()),
+	    case filter_addrs_by_family(IfAddrs, Family) of
+		Addrs when length(Addrs) >= NumAddrs ->
+		    {ok, lists:sublist(Addrs, NumAddrs)};
+		[] ->
+		    {error, f("Need ~p ~p address(es) found none~n",
+			      [NumAddrs, Family])};
+		Addrs ->
+		    {error,
+		     f("Need ~p ~p address(es) found only ~p: ~p~n",
+		       [NumAddrs, Family, length(Addrs), Addrs])}
+	    end
+    end;
 get_addrs_by_family_aux(inet_and_inet6, NumAddrs) ->
-    ?line catch {ok, [case get_addrs_by_family_aux(Family, NumAddrs) of
-			  {ok, Addrs}     -> Addrs;
-			  {error, Reason} -> throw({error, Reason})
-		      end || Family <- [inet, inet6]]}.
+    catch {ok, [case get_addrs_by_family_aux(Family, NumAddrs) of
+		    {ok, Addrs}     -> Addrs;
+		    {error, Reason} -> throw({error, Reason})
+		end || Family <- [inet, inet6]]}.
 
 filter_addrs_by_family(IfAddrs, Family) ->
     lists:flatten([[Addr || {addr, Addr} <- Info,
@@ -1502,21 +1434,21 @@ f(F, A) ->
     lists:flatten(io_lib:format(F, A)).
 
 do_open_and_connect(ServerAddresses, AddressToConnectTo) ->
-    ?line Fun = fun (_, _, _, _, _, _) -> ok end,
-    ?line do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun).
+    Fun = fun (_, _, _, _, _, _) -> ok end,
+    do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun).
 %%
 do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun) ->
-    ?line ServerFamily = get_family_by_addrs(ServerAddresses),
-    ?line io:format("Serving ~p addresses: ~p~n",
-		    [ServerFamily, ServerAddresses]),
-    ?line S1 = ok(gen_sctp:open(0, [{ip,Addr} || Addr <- ServerAddresses] ++
-				    [ServerFamily])),
-    ?line ok = gen_sctp:listen(S1, true),
-    ?line P1 = ok(inet:port(S1)),
-    ?line ClientFamily = get_family_by_addr(AddressToConnectTo),
-    ?line io:format("Connecting to ~p ~p~n",
-		    [ClientFamily, AddressToConnectTo]),
-    ?line ClientOpts =
+    ServerFamily = get_family_by_addrs(ServerAddresses),
+    io:format("Serving ~p addresses: ~p~n",
+	      [ServerFamily, ServerAddresses]),
+    S1 = ok(gen_sctp:open(0, [{ip,Addr} || Addr <- ServerAddresses] ++
+			      [ServerFamily])),
+    ok = gen_sctp:listen(S1, true),
+    P1 = ok(inet:port(S1)),
+    ClientFamily = get_family_by_addr(AddressToConnectTo),
+    io:format("Connecting to ~p ~p~n",
+	      [ClientFamily, AddressToConnectTo]),
+    ClientOpts =
 	[ClientFamily |
 	 case ClientFamily of
 	     inet6 ->
@@ -1524,39 +1456,39 @@ do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun) ->
 	     _ ->
 		 []
 	 end],
-    ?line S2 = ok(gen_sctp:open(0, ClientOpts)),
+    S2 = ok(gen_sctp:open(0, ClientOpts)),
     log(open),
     %% Verify client can connect
-    ?line #sctp_assoc_change{state=comm_up} = S2Assoc =
+    #sctp_assoc_change{state=comm_up} = S2Assoc =
 	ok(gen_sctp:connect(S2, AddressToConnectTo, P1, [])),
     log(comm_up),
     %% verify server side also receives comm_up from client
-    ?line S1Assoc = recv_comm_up_eventually(S1),
-    ?line Result = Fun(S1, ServerFamily, S1Assoc, S2, ClientFamily, S2Assoc),
-    ?line ok = gen_sctp:close(S2),
-    ?line ok = gen_sctp:close(S1),
+    S1Assoc = recv_comm_up_eventually(S1),
+    Result = Fun(S1, ServerFamily, S1Assoc, S2, ClientFamily, S2Assoc),
+    ok = gen_sctp:close(S2),
+    ok = gen_sctp:close(S1),
     Result.
 
 %% If at least one of the addresses is an ipv6 address, return inet6, else inet.
 get_family_by_addrs(Addresses) ->
-    ?line case lists:usort([get_family_by_addr(Addr) || Addr <- Addresses]) of
-	      [inet, inet6] -> inet6;
-	      [inet]        -> inet;
-	      [inet6]       -> inet6
-	  end.
+    case lists:usort([get_family_by_addr(Addr) || Addr <- Addresses]) of
+	[inet, inet6] -> inet6;
+	[inet]        -> inet;
+	[inet6]       -> inet6
+    end.
 
 get_family_by_addr(Addr) when tuple_size(Addr) =:= 4 -> inet;
 get_family_by_addr(Addr) when tuple_size(Addr) =:= 8 -> inet6.
 
 recv_comm_up_eventually(S) ->
-    ?line case ok(gen_sctp:recv(S)) of
-	      {_Addr, _Port, _Info,
-	       #sctp_assoc_change{state=comm_up} = Assoc} ->
-		  Assoc;
-	      {_Addr, _Port, _Info, _OtherSctpMsg} = Msg ->
-		  ?line log({unexpected,Msg}),
-		  ?line recv_comm_up_eventually(S)
-	  end.
+    case ok(gen_sctp:recv(S)) of
+	{_Addr, _Port, _Info,
+	 #sctp_assoc_change{state=comm_up} = Assoc} ->
+	    Assoc;
+	{_Addr, _Port, _Info, _OtherSctpMsg} = Msg ->
+	    log({unexpected,Msg}),
+	    recv_comm_up_eventually(S)
+    end.
 
 %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% socket gen_server ultra light
@@ -1609,7 +1541,7 @@ socket_bailout([S|Ss]) ->
     socket_bailout(Ss);
 socket_bailout([]) ->
     io:format("flush: ~p.~n", [flush()]),
-    test_server:fail(socket_bailout).
+    ct:fail(socket_bailout).
 
 socket_history({State,Flush}) ->
     {lists:keysort(
@@ -1697,8 +1629,8 @@ s_loop(Socket, Timeout, Parent, Handler, State) ->
 	    case gb_get({assoc_change,AssocId}, State) of
 		[{_,{Addr,Port,
 		     #sctp_assoc_change{
-			    state=comm_up,
-			    inbound_streams=Is}}}|_]
+			state=comm_up,
+			inbound_streams=Is}}}|_]
 		  when 0 =< Stream, Stream < Is-> ok;
 		[] -> ok
 	    end,
diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index 962471c20c..4d829bcac6 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -38,7 +38,9 @@
 
 -export([getsockfd/0,closesockfd/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [{group, t_accept}, {group, t_connect}, {group, t_recv},
@@ -65,74 +67,67 @@ end_per_group(_,_Config) ->
     ok.
 
 init_per_testcase(_Func, Config) ->
-    Dog = test_server:timetrap(test_server:seconds(60)),
-    [{watchdog, Dog}|Config].
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog).
+    Config.
+
+end_per_testcase(_Func, _Config) ->
+    ok.
 
 %%% gen_tcp:accept/1,2
 
 
-t_accept_timeout(doc) -> "Test that gen_tcp:accept/2 (with timeout) works.";
-t_accept_timeout(suite) -> [];
+%% Test that gen_tcp:accept/2 (with timeout) works.
 t_accept_timeout(Config) when is_list(Config) ->
-    ?line {ok, L} = gen_tcp:listen(0, []),
-    ?line timeout({gen_tcp, accept, [L, 200]}, 0.2, 1.0).
+    {ok, L} = gen_tcp:listen(0, []),
+    timeout({gen_tcp, accept, [L, 200]}, 0.2, 1.0).
 
 %%% gen_tcp:connect/X
 
 
-t_connect_timeout(doc) -> "Test that gen_tcp:connect/4 (with timeout) works.";
+%% Test that gen_tcp:connect/4 (with timeout) works.
 t_connect_timeout(Config) when is_list(Config) ->
-    %%?line BadAddr = {134,138,177,16},
-    %%?line TcpPort = 80,
-    ?line {ok, BadAddr} =  unused_ip(),
-    ?line TcpPort = 45638,
-    ?line ok = io:format("Connecting to ~p, port ~p", [BadAddr, TcpPort]),
-    ?line connect_timeout({gen_tcp,connect,[BadAddr,TcpPort,[],200]}, 0.2, 5.0).
-
-t_connect_bad(doc) ->
-    ["Test that gen_tcp:connect/3 handles non-existings hosts, and other ",
-     "invalid things."];
-t_connect_bad(suite) -> [];
+    %%BadAddr = {134,138,177,16},
+    %%TcpPort = 80,
+    {ok, BadAddr} =  unused_ip(),
+    TcpPort = 45638,
+    ok = io:format("Connecting to ~p, port ~p", [BadAddr, TcpPort]),
+    connect_timeout({gen_tcp,connect,[BadAddr,TcpPort,[],200]}, 0.2, 5.0).
+
+%% Test that gen_tcp:connect/3 handles non-existings hosts, and other
+%% invalid things.
 t_connect_bad(Config) when is_list(Config) ->
-    ?line NonExistingPort = 45638,		% Not in use, I hope.
-    ?line {error, Reason1} = gen_tcp:connect(localhost, NonExistingPort, []),
-    ?line io:format("Error for connection attempt to port not in use: ~p",
-		    [Reason1]),
-
-    ?line {error, Reason2} = gen_tcp:connect("non-existing-host-xxx", 7, []),
-    ?line io:format("Error for connection attempt to non-existing host: ~p",
-		    [Reason2]),
+    NonExistingPort = 45638,		% Not in use, I hope.
+    {error, Reason1} = gen_tcp:connect(localhost, NonExistingPort, []),
+    io:format("Error for connection attempt to port not in use: ~p",
+	      [Reason1]),
+
+    {error, Reason2} = gen_tcp:connect("non-existing-host-xxx", 7, []),
+    io:format("Error for connection attempt to non-existing host: ~p",
+	      [Reason2]),
     ok.
 
 
 %%% gen_tcp:recv/X
 
 
-t_recv_timeout(doc) -> "Test that gen_tcp:recv/3 (with timeout works).";
-t_recv_timeout(suite) -> [];
+%% Test that gen_tcp:recv/3 (with timeout works).
 t_recv_timeout(Config) when is_list(Config) ->
-    ?line {ok, L} = gen_tcp:listen(0, []),
-    ?line {ok, Port} = inet:port(L),
-    ?line {ok, Client} = gen_tcp:connect(localhost, Port, [{active, false}]),
-    ?line {ok, _A} = gen_tcp:accept(L),
-    ?line timeout({gen_tcp, recv, [Client, 0, 200]}, 0.2, 5.0).
-
-t_recv_eof(doc) -> "Test that end of file on a socket is reported correctly.";
-t_recv_eof(suite) -> [];
+    {ok, L} = gen_tcp:listen(0, []),
+    {ok, Port} = inet:port(L),
+    {ok, Client} = gen_tcp:connect(localhost, Port, [{active, false}]),
+    {ok, _A} = gen_tcp:accept(L),
+    timeout({gen_tcp, recv, [Client, 0, 200]}, 0.2, 5.0).
+
+%% Test that end of file on a socket is reported correctly.
 t_recv_eof(Config) when is_list(Config) ->
-    ?line {ok, L} = gen_tcp:listen(0, []),
-    ?line {ok, Port} = inet:port(L),
-    ?line {ok, Client} = gen_tcp:connect(localhost, Port, [{active, false}]),
-    ?line {ok, A} = gen_tcp:accept(L),
-    ?line ok = gen_tcp:close(A),
-    ?line {error, closed} = gen_tcp:recv(Client, 0),
+    {ok, L} = gen_tcp:listen(0, []),
+    {ok, Port} = inet:port(L),
+    {ok, Client} = gen_tcp:connect(localhost, Port, [{active, false}]),
+    {ok, A} = gen_tcp:accept(L),
+    ok = gen_tcp:close(A),
+    {error, closed} = gen_tcp:recv(Client, 0),
     ok.
 
-t_recv_delim(doc) -> "Test using message delimiter $X";
-t_recv_delim(suite) -> [];
+%% Test using message delimiter $X.
 t_recv_delim(Config) when is_list(Config) ->
     {ok, L} = gen_tcp:listen(0, []),
     {ok, Port} = inet:port(L),
@@ -149,96 +144,96 @@ t_recv_delim(Config) when is_list(Config) ->
 %%% gen_tcp:shutdown/2
 
 t_shutdown_write(Config) when is_list(Config) ->
-    ?line {ok, L} = gen_tcp:listen(0, []),
-    ?line {ok, Port} = inet:port(L),
-    ?line {ok, Client} = gen_tcp:connect(localhost, Port, [{active, false}]),
-    ?line {ok, A} = gen_tcp:accept(L),
-    ?line ok = gen_tcp:shutdown(A, write),
-    ?line {error, closed} = gen_tcp:recv(Client, 0),
+    {ok, L} = gen_tcp:listen(0, []),
+    {ok, Port} = inet:port(L),
+    {ok, Client} = gen_tcp:connect(localhost, Port, [{active, false}]),
+    {ok, A} = gen_tcp:accept(L),
+    ok = gen_tcp:shutdown(A, write),
+    {error, closed} = gen_tcp:recv(Client, 0),
     ok.
 
 t_shutdown_both(Config) when is_list(Config) ->
-    ?line {ok, L} = gen_tcp:listen(0, []),
-    ?line {ok, Port} = inet:port(L),
-    ?line {ok, Client} = gen_tcp:connect(localhost, Port, [{active, false}]),
-    ?line {ok, A} = gen_tcp:accept(L),
-    ?line ok = gen_tcp:shutdown(A, read_write),
-    ?line {error, closed} = gen_tcp:recv(Client, 0),
+    {ok, L} = gen_tcp:listen(0, []),
+    {ok, Port} = inet:port(L),
+    {ok, Client} = gen_tcp:connect(localhost, Port, [{active, false}]),
+    {ok, A} = gen_tcp:accept(L),
+    ok = gen_tcp:shutdown(A, read_write),
+    {error, closed} = gen_tcp:recv(Client, 0),
     ok.
 
 t_shutdown_error(Config) when is_list(Config) ->
-    ?line {ok, L} = gen_tcp:listen(0, []),
-    ?line {error, enotconn} = gen_tcp:shutdown(L, read_write),
-    ?line ok = gen_tcp:close(L),
-    ?line {error, closed} = gen_tcp:shutdown(L, read_write),
+    {ok, L} = gen_tcp:listen(0, []),
+    {error, enotconn} = gen_tcp:shutdown(L, read_write),
+    ok = gen_tcp:close(L),
+    {error, closed} = gen_tcp:shutdown(L, read_write),
     ok.
 
 t_shutdown_async(Config) when is_list(Config) ->
-    ?line {OS, _} = os:type(),
-    ?line {ok, L} = gen_tcp:listen(0, [{sndbuf, 4096}]),
-    ?line {ok, Port} = inet:port(L),
-    ?line {ok, Client} = gen_tcp:connect(localhost, Port,
-					 [{recbuf, 4096},
-					  {active, false}]),
-    ?line {ok, S} = gen_tcp:accept(L),
-    ?line PayloadSize = 1024 * 1024,
-    ?line Payload = lists:duplicate(PayloadSize, $.),
-    ?line ok = gen_tcp:send(S, Payload),
-    ?line case erlang:port_info(S, queue_size) of
-	      {queue_size, N} when N > 0 -> ok;
-	      {queue_size, 0} when OS =:= win32 -> ok;
-	      {queue_size, 0} = T -> ?t:fail({unexpected, T})
-	  end,
-
-    ?line ok = gen_tcp:shutdown(S, write),
-    ?line {ok, Buf} = gen_tcp:recv(Client, PayloadSize),
-    ?line {error, closed} = gen_tcp:recv(Client, 0),
-    ?line case length(Buf) of
-	      PayloadSize -> ok;
-	      Sz -> ?t:fail({payload_size,
-			     {expected, PayloadSize},
-			     {received, Sz}})
-	  end.
+    {OS, _} = os:type(),
+    {ok, L} = gen_tcp:listen(0, [{sndbuf, 4096}]),
+    {ok, Port} = inet:port(L),
+    {ok, Client} = gen_tcp:connect(localhost, Port,
+				   [{recbuf, 4096},
+				    {active, false}]),
+    {ok, S} = gen_tcp:accept(L),
+    PayloadSize = 1024 * 1024,
+    Payload = lists:duplicate(PayloadSize, $.),
+    ok = gen_tcp:send(S, Payload),
+    case erlang:port_info(S, queue_size) of
+	{queue_size, N} when N > 0 -> ok;
+	{queue_size, 0} when OS =:= win32 -> ok;
+	{queue_size, 0} = T -> ct:fail({unexpected, T})
+    end,
+
+    ok = gen_tcp:shutdown(S, write),
+    {ok, Buf} = gen_tcp:recv(Client, PayloadSize),
+    {error, closed} = gen_tcp:recv(Client, 0),
+    case length(Buf) of
+	PayloadSize -> ok;
+	Sz -> ct:fail({payload_size,
+		       {expected, PayloadSize},
+		       {received, Sz}})
+    end.
 
 
 %%% gen_tcp:fdopen/2
 
 t_fdopen(Config) when is_list(Config) ->
-    ?line Question = "Aaaa... Long time ago in a small town in Germany,",
-    ?line Question1 = list_to_binary(Question),
-    ?line Question2 = [<<"Aaaa">>, "... ", $L, <<>>, $o, "ng time ago ",
-                       ["in ", [], <<"a small town">>, [" in Germany,", <<>>]]],
-    ?line Question1 = iolist_to_binary(Question2),
-    ?line Answer = "there was a shoemaker, Schumacher was his name.",
-    ?line {ok, L} = gen_tcp:listen(0, [{active, false}]),
-    ?line {ok, Port} = inet:port(L),
-    ?line {ok, Client} = gen_tcp:connect(localhost, Port, [{active, false}]),
-    ?line {ok, A} = gen_tcp:accept(L),
-    ?line {ok, FD} = prim_inet:getfd(A),
-    ?line {ok, Server} = gen_tcp:fdopen(FD, []),
-    ?line ok = gen_tcp:send(Client, Question),
-    ?line {ok, Question} = gen_tcp:recv(Server, length(Question), 2000),
-    ?line ok = gen_tcp:send(Client, Question1),
-    ?line {ok, Question} = gen_tcp:recv(Server, length(Question), 2000),
-    ?line ok = gen_tcp:send(Client, Question2),
-    ?line {ok, Question} = gen_tcp:recv(Server, length(Question), 2000),
-    ?line ok = gen_tcp:send(Server, Answer),
-    ?line {ok, Answer} = gen_tcp:recv(Client, length(Answer), 2000),
-    ?line ok = gen_tcp:close(Client),
-    ?line {error,closed} = gen_tcp:recv(A, 1, 2000),
-    ?line ok = gen_tcp:close(Server),
-    ?line ok = gen_tcp:close(A),
-    ?line ok = gen_tcp:close(L),
+    Question = "Aaaa... Long time ago in a small town in Germany,",
+    Question1 = list_to_binary(Question),
+    Question2 = [<<"Aaaa">>, "... ", $L, <<>>, $o, "ng time ago ",
+		 ["in ", [], <<"a small town">>, [" in Germany,", <<>>]]],
+    Question1 = iolist_to_binary(Question2),
+    Answer = "there was a shoemaker, Schumacher was his name.",
+    {ok, L} = gen_tcp:listen(0, [{active, false}]),
+    {ok, Port} = inet:port(L),
+    {ok, Client} = gen_tcp:connect(localhost, Port, [{active, false}]),
+    {ok, A} = gen_tcp:accept(L),
+    {ok, FD} = prim_inet:getfd(A),
+    {ok, Server} = gen_tcp:fdopen(FD, []),
+    ok = gen_tcp:send(Client, Question),
+    {ok, Question} = gen_tcp:recv(Server, length(Question), 2000),
+    ok = gen_tcp:send(Client, Question1),
+    {ok, Question} = gen_tcp:recv(Server, length(Question), 2000),
+    ok = gen_tcp:send(Client, Question2),
+    {ok, Question} = gen_tcp:recv(Server, length(Question), 2000),
+    ok = gen_tcp:send(Server, Answer),
+    {ok, Answer} = gen_tcp:recv(Client, length(Answer), 2000),
+    ok = gen_tcp:close(Client),
+    {error,closed} = gen_tcp:recv(A, 1, 2000),
+    ok = gen_tcp:close(Server),
+    ok = gen_tcp:close(A),
+    ok = gen_tcp:close(L),
     ok.
 
 t_fdconnect(Config) when is_list(Config) ->
     Question = "Aaaa... Long time ago in a small town in Germany,",
     Question1 = list_to_binary(Question),
     Question2 = [<<"Aaaa">>, "... ", $L, <<>>, $o, "ng time ago ",
-                       ["in ", [], <<"a small town">>, [" in Germany,", <<>>]]],
+		 ["in ", [], <<"a small town">>, [" in Germany,", <<>>]]],
     Question1 = iolist_to_binary(Question2),
     Answer = "there was a shoemaker, Schumacher was his name.",
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     Lib = "gen_tcp_api_SUITE",
     ok = erlang:load_nif(filename:join(Path,Lib), []),
     {ok, L} = gen_tcp:listen(0, [{active, false}]),
@@ -266,53 +261,51 @@ t_fdconnect(Config) when is_list(Config) ->
 %%% implicit inet6 option to api functions
 
 t_implicit_inet6(Config) when is_list(Config) ->
-    ?line Host = ok(inet:gethostname()),
-    ?line
-	case inet:getaddr(Host, inet6) of
-	    {ok,Addr} ->
-		?line t_implicit_inet6(Host, Addr);
-	    {error,Reason} ->
-		{skip,
-		 "Can not look up IPv6 address: "
-		 ++atom_to_list(Reason)}
-	end.
+    Host = ok(inet:gethostname()),
+    case inet:getaddr(Host, inet6) of
+	{ok,Addr} ->
+	    t_implicit_inet6(Host, Addr);
+	{error,Reason} ->
+	    {skip,
+	     "Can not look up IPv6 address: "
+	     ++atom_to_list(Reason)}
+    end.
 
 t_implicit_inet6(Host, Addr) ->
-    ?line
-	case gen_tcp:listen(0, [inet6]) of
-	    {ok,S1} ->
-		?line Loopback = {0,0,0,0,0,0,0,1},
-		?line io:format("~s ~p~n", ["::1",Loopback]),
-		?line implicit_inet6(S1, Loopback),
-		?line ok = gen_tcp:close(S1),
-		%%
-		?line Localhost = "localhost",
-		?line Localaddr = ok(inet:getaddr(Localhost, inet6)),
-		?line io:format("~s ~p~n", [Localhost,Localaddr]),
-		?line S2 = ok(gen_tcp:listen(0, [{ip,Localaddr}])),
-		?line implicit_inet6(S2, Localaddr),
-		?line ok = gen_tcp:close(S2),
-		%%
-		?line io:format("~s ~p~n", [Host,Addr]),
-		?line S3 = ok(gen_tcp:listen(0, [{ifaddr,Addr}])),
-		?line implicit_inet6(S3, Addr),
-		?line ok = gen_tcp:close(S3);
-	    {error,_} ->
-		{skip,"IPv6 not supported"}
-	end.
+    case gen_tcp:listen(0, [inet6]) of
+	{ok,S1} ->
+	    Loopback = {0,0,0,0,0,0,0,1},
+	    io:format("~s ~p~n", ["::1",Loopback]),
+	    implicit_inet6(S1, Loopback),
+	    ok = gen_tcp:close(S1),
+	    %%
+	    Localhost = "localhost",
+	    Localaddr = ok(inet:getaddr(Localhost, inet6)),
+	    io:format("~s ~p~n", [Localhost,Localaddr]),
+	    S2 = ok(gen_tcp:listen(0, [{ip,Localaddr}])),
+	    implicit_inet6(S2, Localaddr),
+	    ok = gen_tcp:close(S2),
+	    %%
+	    io:format("~s ~p~n", [Host,Addr]),
+	    S3 = ok(gen_tcp:listen(0, [{ifaddr,Addr}])),
+	    implicit_inet6(S3, Addr),
+	    ok = gen_tcp:close(S3);
+	{error,_} ->
+	    {skip,"IPv6 not supported"}
+    end.
 
 implicit_inet6(S, Addr) ->
-    ?line P = ok(inet:port(S)),
-    ?line S2 = ok(gen_tcp:connect(Addr, P, [])),
-    ?line P2 = ok(inet:port(S2)),
-    ?line S1 = ok(gen_tcp:accept(S)),
-    ?line P1 = P = ok(inet:port(S1)),
-    ?line {Addr,P2} = ok(inet:peername(S1)),
-    ?line {Addr,P1} = ok(inet:peername(S2)),
-    ?line {Addr,P1} = ok(inet:sockname(S1)),
-    ?line {Addr,P2} = ok(inet:sockname(S2)),
-    ?line ok = gen_tcp:close(S2),
-    ?line ok = gen_tcp:close(S1).
+    P = ok(inet:port(S)),
+    S2 = ok(gen_tcp:connect(Addr, P, [])),
+    P2 = ok(inet:port(S2)),
+    S1 = ok(gen_tcp:accept(S)),
+    P1 = P = ok(inet:port(S1)),
+    {Addr,P2} = ok(inet:peername(S1)),
+    {Addr,P1} = ok(inet:peername(S2)),
+    {Addr,P1} = ok(inet:sockname(S1)),
+    {Addr,P2} = ok(inet:sockname(S2)),
+    ok = gen_tcp:close(S2),
+    ok = gen_tcp:close(S1).
 
 
 %%% Utilities
@@ -323,13 +316,13 @@ implicit_inet6(S, Addr) ->
 timeout({M,F,A}, Lower, Upper) ->
     case test_server:timecall(M, F, A) of
 	{Time, Result} when Time < Lower ->
-	    test_server:fail({too_short_time, Time, Result});
+	    ct:fail({too_short_time, Time, Result});
 	{Time, Result} when Time > Upper ->
-	    test_server:fail({too_long_time, Time, Result});
+	    ct:fail({too_long_time, Time, Result});
 	{_, {error, timeout}} ->
 	    ok;
 	{_, Result} ->
-	    test_server:fail({unexpected_result, Result})
+	    ct:fail({unexpected_result, Result})
     end.
 
 connect_timeout({M,F,A}, Lower, Upper) ->
@@ -344,28 +337,28 @@ connect_timeout({M,F,A}, Lower, Upper) ->
 		    Pinfo = erlang:port_info(Socket),
 		    Db = inet_db:lookup_socket(Socket),
 		    Peer = inet:peername(Socket),
-		    test_server:fail({too_short_time, Time, 
-				      [Result,Pinfo,Db,Peer]});
+		    ct:fail({too_short_time, Time,
+			     [Result,Pinfo,Db,Peer]});
 		_ ->
-		    test_server:fail({too_short_time, Time, Result})
+		    ct:fail({too_short_time, Time, Result})
 	    end;
 	{Time, Result} when Time > Upper ->
-	    test_server:fail({too_long_time, Time, Result});
+	    ct:fail({too_long_time, Time, Result});
 	{_, {error, timeout}} ->
 	    ok;
 	{_, Result} ->
-	    test_server:fail({unexpected_result, Result})
+	    ct:fail({unexpected_result, Result})
     end.
 
 %% Try to obtain an unused IP address in the local network.
 
 unused_ip() ->
-    ?line {ok, Host} = inet:gethostname(),
-    ?line {ok, Hent} = inet:gethostbyname(Host),
-    ?line #hostent{h_addr_list=[{A, B, C, _D}|_]} = Hent,
+    {ok, Host} = inet:gethostname(),
+    {ok, Hent} = inet:gethostbyname(Host),
+    #hostent{h_addr_list=[{A, B, C, _D}|_]} = Hent,
     %% Note: In our net, addresses below 16 are reserved for routers and
     %% other strange creatures.
-    ?line IP = unused_ip(A, B, C, 16),
+    IP = unused_ip(A, B, C, 16),
     io:format("we = ~p, unused_ip = ~p~n", [Hent, IP]),
     IP.
 
diff --git a/lib/kernel/test/gen_tcp_echo_SUITE.erl b/lib/kernel/test/gen_tcp_echo_SUITE.erl
index 6dcb21758b..f4b67af8c8 100644
--- a/lib/kernel/test/gen_tcp_echo_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_echo_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(gen_tcp_echo_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %%-compile(export_all).
 
@@ -34,7 +34,9 @@
 -define(TPKT_VRSN, 3).
 -define(LINE_LENGTH, 1023). % (default value of gen_tcp option 'recbuf') - 1
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,5}}].
 
 all() -> 
     [active_echo, passive_echo, active_once_echo,
@@ -59,94 +61,75 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Func, Config) ->
-    Dog = test_server:timetrap(test_server:minutes(5)),
-    [{watchdog, Dog}|Config].
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog).
-
-active_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in active mode)."];
-active_echo(suite) -> [];
+    Config.
+
+end_per_testcase(_Func, _Config) ->
+    ok.
+
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in active mode).
 active_echo(Config) when is_list(Config) ->
-    ?line echo_test([], fun active_echo/4, [{echo, fun echo_server/0}]).
+    echo_test([], fun active_echo/4, [{echo, fun echo_server/0}]).
 
-passive_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in passive mode)."];
-passive_echo(suite) -> [];
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in passive mode).
 passive_echo(Config) when is_list(Config) ->
-    ?line echo_test([{active, false}], fun passive_echo/4,
-		    [{echo, fun echo_server/0}]).
+    echo_test([{active, false}], fun passive_echo/4,
+	      [{echo, fun echo_server/0}]).
 
-active_once_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in active once mode)."];
-active_once_echo(suite) -> [];
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in active once mode).
 active_once_echo(Config) when is_list(Config) ->
-    ?line echo_test([{active, once}], fun active_once_echo/4,
-		    [{echo, fun echo_server/0}]).
-
-slow_active_echo(doc) ->
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in active mode). ",
-     "The echo server is a special one that delays between every character."];
-slow_active_echo(suite) -> [];
+    echo_test([{active, once}], fun active_once_echo/4,
+	      [{echo, fun echo_server/0}]).
+
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in active mode).
+%% The echo server is a special one that delays between every character.
 slow_active_echo(Config) when is_list(Config) ->
-    ?line echo_test([], fun active_echo/4, 
-		    [slow_echo, {echo, fun slow_echo_server/0}]).
-
-slow_passive_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to an echo server and receiving them again (socket in passive mode).",
-     "The echo server is a special one that delays between every character."];
-slow_passive_echo(suite) -> [];
+    echo_test([], fun active_echo/4,
+	      [slow_echo, {echo, fun slow_echo_server/0}]).
+
+%% Test sending packets of various sizes and various packet types
+%% to an echo server and receiving them again (socket in passive mode).
+%% The echo server is a special one that delays between every character.
 slow_passive_echo(Config) when is_list(Config) ->
-    ?line echo_test([{active, false}], fun passive_echo/4,
-		    [slow_echo, {echo, fun slow_echo_server/0}]).
-
-limit_active_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in active mode) "
-     "with packet_size limitation."];
-limit_active_echo(suite) -> [];
+    echo_test([{active, false}], fun passive_echo/4,
+	      [slow_echo, {echo, fun slow_echo_server/0}]).
+
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in active mode)
+%% with packet_size limitation.
 limit_active_echo(Config) when is_list(Config) ->
-    ?line echo_test([{packet_size, 10}], 
-		    fun active_echo/4, 
-		    [{packet_size, 10}, {echo, fun echo_server/0}]).
-
-limit_passive_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in passive mode) ",
-     "with packet_size limitation."];
-limit_passive_echo(suite) -> [];
+    echo_test([{packet_size, 10}],
+	      fun active_echo/4,
+	      [{packet_size, 10}, {echo, fun echo_server/0}]).
+
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in passive mode)
+%% with packet_size limitation.
 limit_passive_echo(Config) when is_list(Config) ->
-    ?line echo_test([{packet_size, 10},{active, false}], 
-		    fun passive_echo/4,
-		    [{packet_size, 10}, {echo, fun echo_server/0}]).
-
-large_limit_active_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in active mode) "
-     "with large packet_size limitation."];
-large_limit_active_echo(suite) -> [];
+    echo_test([{packet_size, 10},{active, false}],
+	      fun passive_echo/4,
+	      [{packet_size, 10}, {echo, fun echo_server/0}]).
+
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in active mode)
+%% with large packet_size limitation.
 large_limit_active_echo(Config) when is_list(Config) ->
-    ?line echo_test([{packet_size, 10}], 
-		    fun active_echo/4, 
-		    [{packet_size, (1 bsl 32)-1}, 
-		     {echo, fun echo_server/0}]).
-
-large_limit_passive_echo(doc) -> 
-    ["Test sending packets of various sizes and various packet types ",
-     "to the echo port and receiving them again (socket in passive mode) ",
-     "with large packet_size limitation."];
-large_limit_passive_echo(suite) -> [];
+    echo_test([{packet_size, 10}],
+	      fun active_echo/4,
+	      [{packet_size, (1 bsl 32)-1},
+	       {echo, fun echo_server/0}]).
+
+%% Test sending packets of various sizes and various packet types
+%% to the echo port and receiving them again (socket in passive mode)
+%% with large packet_size limitation.
 large_limit_passive_echo(Config) when is_list(Config) ->
-    ?line echo_test([{packet_size, 10},{active, false}], 
-		    fun passive_echo/4,
-		    [{packet_size, (1 bsl 32) -1}, 
-		     {echo, fun echo_server/0}]).
+    echo_test([{packet_size, 10},{active, false}],
+	      fun passive_echo/4,
+	      [{packet_size, (1 bsl 32) -1},
+	       {echo, fun echo_server/0}]).
 
 echo_test(SockOpts, EchoFun, Config0) ->
     echo_test_1(SockOpts, EchoFun, Config0),
@@ -154,53 +137,53 @@ echo_test(SockOpts, EchoFun, Config0) ->
     echo_test_1([{delay_send,true}|SockOpts], EchoFun, Config0).
 
 echo_test_1(SockOpts, EchoFun, Config0) ->
-    ?line EchoSrvFun = ?config(echo, Config0),
-    ?line {ok, EchoPort} = EchoSrvFun(),
-    ?line Config = [{echo_port, EchoPort}|Config0],
-    
-    ?line echo_packet([{packet, 1}|SockOpts], EchoFun, Config),
-    ?line echo_packet([{packet, 2}|SockOpts], EchoFun, Config),
-    ?line echo_packet([{packet, 4}|SockOpts], EchoFun, Config),
-    ?line echo_packet([{packet, sunrm}|SockOpts], EchoFun, Config),
-    ?line echo_packet([{packet, cdr}|SockOpts], EchoFun,
-		      [{type, {cdr, big}}|Config]),
-    ?line echo_packet([{packet, cdr}|SockOpts], EchoFun,
-		      [{type, {cdr, little}}|Config]),
-    ?line case lists:keymember(packet_size, 1, SockOpts) of
-	      false ->
-		  % This is cheating, we should test that packet_size
-		  % also works for line and http.
-		  echo_packet([{packet, line}|SockOpts], EchoFun, Config),
-		  echo_packet([{packet, http}|SockOpts], EchoFun, Config),
-		  echo_packet([{packet, http_bin}|SockOpts], EchoFun, Config);
-
-	      true -> ok
-	  end,
-    ?line echo_packet([{packet, tpkt}|SockOpts], EchoFun, Config),
-    
-    ?line ShortTag = [16#E0],
-    ?line LongTag = [16#1F, 16#83, 16#27],
-    ?line echo_packet([{packet, asn1}|SockOpts], EchoFun,
-		      [{type, {asn1, short, ShortTag}}|Config]),
-    ?line echo_packet([{packet, asn1}|SockOpts], EchoFun,
-		      [{type, {asn1, long, ShortTag}}|Config]),
-    ?line echo_packet([{packet, asn1}|SockOpts], EchoFun,
-		      [{type, {asn1, short, LongTag}}|Config]),
-    ?line echo_packet([{packet, asn1}|SockOpts], EchoFun,
-		      [{type, {asn1, long, LongTag}}|Config]),
+    EchoSrvFun = proplists:get_value(echo, Config0),
+    {ok, EchoPort} = EchoSrvFun(),
+    Config = [{echo_port, EchoPort}|Config0],
+
+    echo_packet([{packet, 1}|SockOpts], EchoFun, Config),
+    echo_packet([{packet, 2}|SockOpts], EchoFun, Config),
+    echo_packet([{packet, 4}|SockOpts], EchoFun, Config),
+    echo_packet([{packet, sunrm}|SockOpts], EchoFun, Config),
+    echo_packet([{packet, cdr}|SockOpts], EchoFun,
+		[{type, {cdr, big}}|Config]),
+    echo_packet([{packet, cdr}|SockOpts], EchoFun,
+		[{type, {cdr, little}}|Config]),
+    case lists:keymember(packet_size, 1, SockOpts) of
+	false ->
+	    %% This is cheating, we should test that packet_size
+	    %% also works for line and http.
+	    echo_packet([{packet, line}|SockOpts], EchoFun, Config),
+	    echo_packet([{packet, http}|SockOpts], EchoFun, Config),
+	    echo_packet([{packet, http_bin}|SockOpts], EchoFun, Config);
+
+	true -> ok
+    end,
+    echo_packet([{packet, tpkt}|SockOpts], EchoFun, Config),
+
+    ShortTag = [16#E0],
+    LongTag = [16#1F, 16#83, 16#27],
+    echo_packet([{packet, asn1}|SockOpts], EchoFun,
+		[{type, {asn1, short, ShortTag}}|Config]),
+    echo_packet([{packet, asn1}|SockOpts], EchoFun,
+		[{type, {asn1, long, ShortTag}}|Config]),
+    echo_packet([{packet, asn1}|SockOpts], EchoFun,
+		[{type, {asn1, short, LongTag}}|Config]),
+    echo_packet([{packet, asn1}|SockOpts], EchoFun,
+		[{type, {asn1, long, LongTag}}|Config]),
     ok.
 
 echo_packet(SockOpts, EchoFun, Opts) ->
     Type = case lists:keysearch(type, 1, Opts) of
-	{value, {type, T}} ->
-	    T;
-	_ ->
-	    {value, {packet, T}} = lists:keysearch(packet, 1, SockOpts),
-	    T
-    end,
+	       {value, {type, T}} ->
+		   T;
+	       _ ->
+		   {value, {packet, T}} = lists:keysearch(packet, 1, SockOpts),
+		   T
+	   end,
 
     %% Connect to the echo server.
-    EchoPort = ?config(echo_port, Opts),
+    EchoPort = proplists:get_value(echo_port, Opts),
     {ok, Echo} = gen_tcp:connect(localhost, EchoPort, SockOpts),
 
     SlowEcho = lists:member(slow_echo, Opts),
@@ -223,83 +206,78 @@ echo_packet_http(Echo, Type, EchoFun) ->
     EchoFun(Echo, Type, P2, http_reply(P2, Type)).
 
 echo_packet0(Echo, Type, EchoFun, SlowEcho, Opts) ->
-    ?line PacketSize =
+    PacketSize =
 	case lists:keysearch(packet_size, 1, Opts) of
 	    {value,{packet_size,Sz}} when Sz < 10 -> Sz;
 	    {value,{packet_size,_}} -> 10;
 	    false -> 0
 	end,
     %% Echo small packets first.
-    ?line echo_packet1(Echo, Type, EchoFun, 0),
-    ?line echo_packet1(Echo, Type, EchoFun, 1),
-    ?line echo_packet1(Echo, Type, EchoFun, 2),
-    ?line echo_packet1(Echo, Type, EchoFun, 3),
-    ?line echo_packet1(Echo, Type, EchoFun, 4),
-    ?line echo_packet1(Echo, Type, EchoFun, 7),
+    echo_packet1(Echo, Type, EchoFun, 0),
+    echo_packet1(Echo, Type, EchoFun, 1),
+    echo_packet1(Echo, Type, EchoFun, 2),
+    echo_packet1(Echo, Type, EchoFun, 3),
+    echo_packet1(Echo, Type, EchoFun, 4),
+    echo_packet1(Echo, Type, EchoFun, 7),
     if PacketSize =/= 0 ->
-	    ?line echo_packet1(Echo, Type, EchoFun, 
-			       {PacketSize-1, PacketSize}),
-	    ?line echo_packet1(Echo, Type, EchoFun, 
-			       {PacketSize, PacketSize}),
-	    ?line echo_packet1(Echo, Type, EchoFun, 
-			       {PacketSize+1, PacketSize});
+	    echo_packet1(Echo, Type, EchoFun,
+			 {PacketSize-1, PacketSize}),
+	    echo_packet1(Echo, Type, EchoFun,
+			 {PacketSize, PacketSize}),
+	    echo_packet1(Echo, Type, EchoFun,
+			 {PacketSize+1, PacketSize});
        not SlowEcho -> % Go on with bigger packets if not slow echo server.
-	    ?line echo_packet1(Echo, Type, EchoFun, 10),
-	    ?line echo_packet1(Echo, Type, EchoFun, 13),
-	    ?line echo_packet1(Echo, Type, EchoFun, 126),
-	    ?line echo_packet1(Echo, Type, EchoFun, 127),
-	    ?line echo_packet1(Echo, Type, EchoFun, 128),
-	    ?line echo_packet1(Echo, Type, EchoFun, 255),
-	    ?line echo_packet1(Echo, Type, EchoFun, 256),
-	    ?line echo_packet1(Echo, Type, EchoFun, 1023),
-	    ?line echo_packet1(Echo, Type, EchoFun, 3747),
-	    ?line echo_packet1(Echo, Type, EchoFun, 32767),
-	    ?line echo_packet1(Echo, Type, EchoFun, 32768),
-	    ?line echo_packet1(Echo, Type, EchoFun, 65531),
-	    ?line echo_packet1(Echo, Type, EchoFun, 65535),
-	    ?line echo_packet1(Echo, Type, EchoFun, 65536),
-	    ?line echo_packet1(Echo, Type, EchoFun, 70000),
-	    ?line echo_packet1(Echo, Type, EchoFun, infinite);
+	    echo_packet1(Echo, Type, EchoFun, 10),
+	    echo_packet1(Echo, Type, EchoFun, 13),
+	    echo_packet1(Echo, Type, EchoFun, 126),
+	    echo_packet1(Echo, Type, EchoFun, 127),
+	    echo_packet1(Echo, Type, EchoFun, 128),
+	    echo_packet1(Echo, Type, EchoFun, 255),
+	    echo_packet1(Echo, Type, EchoFun, 256),
+	    echo_packet1(Echo, Type, EchoFun, 1023),
+	    echo_packet1(Echo, Type, EchoFun, 3747),
+	    echo_packet1(Echo, Type, EchoFun, 32767),
+	    echo_packet1(Echo, Type, EchoFun, 32768),
+	    echo_packet1(Echo, Type, EchoFun, 65531),
+	    echo_packet1(Echo, Type, EchoFun, 65535),
+	    echo_packet1(Echo, Type, EchoFun, 65536),
+	    echo_packet1(Echo, Type, EchoFun, 70000),
+	    echo_packet1(Echo, Type, EchoFun, infinite);
        true -> ok
     end,
-    ?line gen_tcp:close(Echo),
+    gen_tcp:close(Echo),
     ok.
 
 echo_packet1(EchoSock, Type, EchoFun, Size) ->
-    ?line case packet(Size, Type) of
-	      false ->
-		  ok;
-	      Packet ->
-		  ?line io:format("Type ~p, size ~p, time ~p", 
-				  [Type, Size, time()]),
-		  ?line 
-		      case EchoFun(EchoSock, Type, Packet, [Packet]) of
-			  ok -> 
-			      ?line 
-				  case Size of
-				      {N, Max} when N > Max -> 
-					  ?line 
-					      test_server:fail(
-						{packet_through, {N, Max}});
-				      _ -> ok
-				  end;
-			  {error, emsgsize} ->
-			      ?line
-				  case Size of
-				      {N, Max} when N > Max -> 
-					  io:format(" Blocked!");
-				      _ -> 
-					  ?line
-					      test_server:fail(
-						{packet_blocked, Size})
-				  end;
-			  Error ->
-			      ?line test_server:fail(Error)
-		      end
-	  end.
+    case packet(Size, Type) of
+	false ->
+	    ok;
+	Packet ->
+	    io:format("Type ~p, size ~p, time ~p",
+		      [Type, Size, time()]),
+	    case EchoFun(EchoSock, Type, Packet, [Packet]) of
+		ok ->
+		    case Size of
+			{N, Max} when N > Max ->
+			    ct:fail(
+			      {packet_through, {N, Max}});
+			_ -> ok
+		    end;
+		{error, emsgsize} ->
+		    case Size of
+			{N, Max} when N > Max ->
+			    io:format(" Blocked!");
+			_ ->
+			    ct:fail(
+			      {packet_blocked, Size})
+		    end;
+		Error ->
+		    ct:fail(Error)
+	    end
+    end.
 
 active_echo(Sock, Type, Packet, PacketEchos) ->
-    ?line ok = gen_tcp:send(Sock, Packet),
+    ok = gen_tcp:send(Sock, Packet),
     active_recv(Sock, Type, PacketEchos).
 
 active_recv(_, _, []) ->
@@ -310,21 +288,21 @@ active_recv(Sock, Type, [PacketEcho|Tail]) ->
 	      http_bin -> http;
 	      _ -> tcp
 	  end,
-    ?line receive Recv->Recv end,
+    receive Recv->Recv end,
     %%io:format("Active received: ~p\n",[Recv]),
-    ?line case Recv of
-	      {Tag, Sock, PacketEcho} ->
-		  active_recv(Sock, Type, Tail);
-	      {Tag, Sock, Bad} ->
-		  ?line test_server:fail({wrong_data, Bad, expected, PacketEcho});
-	      {tcp_error, Sock, Reason} ->
-		  {error, Reason};
-	      Other ->
-		  ?line test_server:fail({unexpected_message, Other, Tag})
-	  end.
+    case Recv of
+	{Tag, Sock, PacketEcho} ->
+	    active_recv(Sock, Type, Tail);
+	{Tag, Sock, Bad} ->
+	    ct:fail({wrong_data, Bad, expected, PacketEcho});
+	{tcp_error, Sock, Reason} ->
+	    {error, Reason};
+	Other ->
+	    ct:fail({unexpected_message, Other, Tag})
+    end.
 
 passive_echo(Sock, _Type, Packet, PacketEchos) ->
-    ?line ok = gen_tcp:send(Sock, Packet),
+    ok = gen_tcp:send(Sock, Packet),
     passive_recv(Sock, PacketEchos).
 
 passive_recv(_, []) ->
@@ -332,22 +310,22 @@ passive_recv(_, []) ->
 passive_recv(Sock, [PacketEcho | Tail]) ->
     Recv = gen_tcp:recv(Sock, 0),
     %%io:format("Passive received: ~p\n",[Recv]),
-    ?line case Recv of
-	      {ok, PacketEcho} ->
-		  passive_recv(Sock, Tail);
-	      {ok, Bad} ->
-		  io:format("Expected: ~p\nGot: ~p\n",[PacketEcho,Bad]),
-		  ?line test_server:fail({wrong_data, Bad});
-	      {error,PacketEcho} ->
-		  passive_recv(Sock, Tail); % expected error
-	      {error, _}=Error ->
-		  Error;
-	      Other ->
-		  ?line test_server:fail({unexpected_message, Other})
-	  end.
+    case Recv of
+	{ok, PacketEcho} ->
+	    passive_recv(Sock, Tail);
+	{ok, Bad} ->
+	    io:format("Expected: ~p\nGot: ~p\n",[PacketEcho,Bad]),
+	    ct:fail({wrong_data, Bad});
+	{error,PacketEcho} ->
+	    passive_recv(Sock, Tail); % expected error
+	{error, _}=Error ->
+	    Error;
+	Other ->
+	    ct:fail({unexpected_message, Other})
+    end.
 
 active_once_echo(Sock, Type, Packet, PacketEchos) ->
-    ?line ok = gen_tcp:send(Sock, Packet),
+    ok = gen_tcp:send(Sock, Packet),
     active_once_recv(Sock, Type, PacketEchos).
 
 active_once_recv(_, _, []) ->
@@ -358,17 +336,17 @@ active_once_recv(Sock, Type, [PacketEcho | Tail]) ->
 	      http_bin -> http;
 	      _ -> tcp
 	  end,
-    ?line receive
-	      {Tag, Sock, PacketEcho} ->
-		  inet:setopts(Sock, [{active, once}]),
-		  active_once_recv(Sock, Type, Tail);
-	      {Tag, Sock, Bad} ->
-		  ?line test_server:fail({wrong_data, Bad});
-	      {tcp_error, Sock, Reason} ->
-		  {error, Reason};
-	      Other ->
-		  ?line test_server:fail({unexpected_message, Other, expected, {Tag, Sock, PacketEcho}})
-	  end.
+    receive
+	{Tag, Sock, PacketEcho} ->
+	    inet:setopts(Sock, [{active, once}]),
+	    active_once_recv(Sock, Type, Tail);
+	{Tag, Sock, Bad} ->
+	    ct:fail({wrong_data, Bad});
+	{tcp_error, Sock, Reason} ->
+	    {error, Reason};
+	Other ->
+	    ct:fail({unexpected_message, Other, expected, {Tag, Sock, PacketEcho}})
+    end.
 
 %%% Building of random packets.
 
@@ -442,14 +420,7 @@ random_char(Chars) ->
     lists:nth(uniform(length(Chars)), Chars).
 
 uniform(N) ->
-    case get(random_seed) of
-	undefined ->
-	    {X, Y, Z} = time(),
-	    random:seed(X, Y, Z);
-	_ ->
-	    ok
-    end,
-    random:uniform(N).
+    rand:uniform(N).
 
 put_int32(X, big, List) ->
     [ (X bsr 24) band 16#ff, 
@@ -458,9 +429,9 @@ put_int32(X, big, List) ->
       (X) band 16#ff | List ];
 put_int32(X, little, List) ->
     [ (X) band 16#ff,
-     (X bsr 8) band 16#ff,
-     (X bsr 16) band 16#ff,
-     (X bsr 24) band 16#ff | List].
+      (X bsr 8) band 16#ff,
+      (X bsr 16) band 16#ff,
+      (X bsr 24) band 16#ff | List].
 
 put_int16(X, ByteOrder) ->
     put_int16(X, ByteOrder, []).
@@ -470,16 +441,16 @@ put_int16(X, big, List) ->
       (X) band 16#ff | List ];
 put_int16(X, little, List) ->
     [ (X) band 16#ff,
-     (X bsr 8) band 16#ff | List ].
+      (X bsr 8) band 16#ff | List ].
 
 %%% A normal echo server, for systems that don't have one.
 
 echo_server() ->
     Self = self(),
-    ?line spawn_link(fun() -> echo_server(Self) end),
-    ?line receive
-	      {echo_port, Port} ->
-		  {ok, Port}
+    spawn_link(fun() -> echo_server(Self) end),
+    receive
+	{echo_port, Port} ->
+	    {ok, Port}
     end.
 
 echo_server(ReplyTo) ->
@@ -512,11 +483,11 @@ echoer_loop(Sock) ->
 
 slow_echo_server() ->
     Self = self(),
-    ?line spawn_link(fun() -> slow_echo_server(Self) end),
-    ?line receive
-	      {echo_port, Port} ->
-		  {ok, Port}
-	  end.
+    spawn_link(fun() -> slow_echo_server(Self) end),
+    receive
+	{echo_port, Port} ->
+	    {ok, Port}
+    end.
 
 slow_echo_server(ReplyTo) ->
     {ok, S} = gen_tcp:listen(0, [{active, false}, {nodelay, true}]),
@@ -552,17 +523,17 @@ slow_send(_, []) ->
 
 http_request(Uri) ->
     list_to_binary(["POST ", Uri, <<" HTTP/1.1\r\n"
-     "Connection: close\r\n"
-     "Host: localhost:8000\r\n"
-     "User-Agent: perl post\r\n"
-     "Content-Length: 4\r\n"
-     "Content-Type: text/xml; charset=utf-8\r\n"
-     "Other-Field: with some text\r\n"
-     "Multi-Line: Once upon a time in a land far far away,\r\n"
-     " there lived a princess imprisoned in the highest tower\r\n"
-     " of the most haunted castle.\r\n"
-     "Invalid line without a colon\r\n"
-     "\r\n">>]).
+				    "Connection: close\r\n"
+				    "Host: localhost:8000\r\n"
+				    "User-Agent: perl post\r\n"
+				    "Content-Length: 4\r\n"
+				    "Content-Type: text/xml; charset=utf-8\r\n"
+				    "Other-Field: with some text\r\n"
+				    "Multi-Line: Once upon a time in a land far far away,\r\n"
+				    " there lived a princess imprisoned in the highest tower\r\n"
+				    " of the most haunted castle.\r\n"
+				    "Invalid line without a colon\r\n"
+				    "\r\n">>]).
 
 http_uri_variants() ->
     ["*",
@@ -575,11 +546,11 @@ http_uri_variants() ->
 
 http_response() ->
     <<"HTTP/1.0 404 Object Not Found\r\n"
-     "Server: inets/4.7.16\r\n"
-     "Date: Fri, 04 Jul 2008 17:16:22 GMT\r\n"
-     "Content-Type: text/html\r\n"
-     "Content-Length: 207\r\n"
-     "\r\n">>.
+      "Server: inets/4.7.16\r\n"
+      "Date: Fri, 04 Jul 2008 17:16:22 GMT\r\n"
+      "Content-Type: text/html\r\n"
+      "Content-Length: 207\r\n"
+      "\r\n">>.
 
 http_reply(Bin, Type) ->
     {ok, Line, Rest} = erlang:decode_packet(Type,Bin,[]),
@@ -596,7 +567,3 @@ http_reply(<<>>, Acc, _) ->
 http_reply(Bin, Acc, HType) ->
     {ok, Line, Rest} = erlang:decode_packet(HType,Bin,[]),	
     http_reply(Rest, [Line | Acc], HType).
-
-
-
-
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 81c6dcd0fd..173cf76237 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -19,15 +19,15 @@
 %%
 -module(gen_tcp_misc_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
-
-%-compile(export_all).
+-include_lib("common_test/include/ct.hrl").
 
 -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, controlling_process_self/1,
 	 no_accept/1, close_with_pending_output/1, active_n/1,
-	 data_before_close/1, iter_max_socks/1, get_status/1,
+	 data_before_close/1,
+	 iter_max_socks/0, iter_max_socks/1,
+	 get_status/1,
 	 passive_sockets/1, accept_closed_by_other_process/1,
 	 init_per_testcase/2, end_per_testcase/2,
 	 otp_3924/1, otp_3924_sender/4, closed_socket/1,
@@ -41,7 +41,7 @@
 	 busy_send/1, busy_disconnect_passive/1, busy_disconnect_active/1,
 	 fill_sendq/1, partial_recv_and_close/1, 
 	 partial_recv_and_close_2/1,partial_recv_and_close_3/1,so_priority/1,
-	 % Accept tests
+	 %% 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_in_order4/1,
@@ -50,7 +50,8 @@
 	 killing_acceptor/1,killing_multi_acceptors/1,killing_multi_acceptors2/1,
 	 several_accepts_in_one_go/1, accept_system_limit/1,
 	 active_once_closed/1, send_timeout/1, send_timeout_active/1,
-	 otp_7731/1, zombie_sockets/1, otp_7816/1, otp_8102/1, wrapping_oct/1,
+	 otp_7731/1, zombie_sockets/1, otp_7816/1, otp_8102/1,
+	 wrapping_oct/0, wrapping_oct/1,
          otp_9389/1]).
 
 %% Internal exports.
@@ -58,41 +59,15 @@
 	 oct_acceptor/1,
 	 otp_7731_server/1, zombie_server/2, do_iter_max_socks/2]).
 
-init_per_testcase(wrapping_oct, Config) when is_list(Config) ->
-    Dog = case os:type() of
-	      {ose,_} ->
-		  test_server:timetrap(test_server:minutes(20));
-	      _Else ->
-		  test_server:timetrap(test_server:seconds(600))
-	  end,
-    [{watchdog, Dog}|Config];
-init_per_testcase(iter_max_socks, Config) when is_list(Config) ->
-    Dog = case os:type() of
-              {win32,_} ->
-                  test_server:timetrap(test_server:minutes(30));
-              _Else ->
-                  test_server:timetrap(test_server:seconds(240))
-          end,
-    [{watchdog, Dog}|Config];
-init_per_testcase(accept_system_limit, Config) when is_list(Config) ->
-    case os:type() of
-        {ose,_} ->
-            {skip,"Skip in OSE"};
-        _ ->
-            Dog = test_server:timetrap(test_server:seconds(240)),
-            [{watchdog,Dog}|Config]
-    end;
-init_per_testcase(wrapping_oct, Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(600)),
-    [{watchdog, Dog}|Config];
-init_per_testcase(_Func, Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(240)),
-    [{watchdog, Dog}|Config].
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+init_per_testcase(_Func, Config) ->
+    Config.
+
+end_per_testcase(_Func, _Config) ->
+    ok.
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,4}}].
 
 all() -> 
     [controlling_process, controlling_process_self, no_accept,
@@ -136,11 +111,13 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-default_options(doc) ->
-    ["Tests kernel application variables inet_default_listen_options and "
-     "inet_default_connect_options"];
-default_options(suite) ->
-    [];
+-define(UNIQ_NODE_NAME,
+  list_to_atom(?MODULE_STRING ++ "__" ++
+               atom_to_list(?FUNCTION_NAME) ++ "_" ++
+	       integer_to_list(erlang:unique_integer([positive])))).
+
+%% Tests kernel application variables inet_default_listen_options and
+%% inet_default_connect_options.
 default_options(Config) when is_list(Config) ->
     %% First check the delay_send option
     {true,true,true}=do_delay_send_1(),
@@ -215,7 +192,7 @@ default_options(Config) when is_list(Config) ->
 
 do_delay_on_other_node(XArgs, Function) ->
     Dir = filename:dirname(code:which(?MODULE)),
-    {ok,Node} = test_server:start_node(test_default_options_slave,slave,
+    {ok,Node} = test_server:start_node(?UNIQ_NODE_NAME, slave,
                                        [{args,"-pa " ++ Dir ++ " " ++ XArgs}]),
     Res = rpc:call(Node,erlang,apply,[Function,[]]),
     test_server:stop_node(Node),
@@ -312,11 +289,9 @@ do_delay_send_7() ->
     gen_tcp:close(LS),
     {B1,B2,B3}.
 
-controlling_process(doc) ->
-    ["Open a listen port and change controlling_process for it",
-     "The result should be ok of done by the owner process,"
-     "Otherwise is should return {error,not_owner} or similar"];
-controlling_process(suite) -> [];
+%% Open a listen port and change controlling_process for it
+%% The result should be ok of done by the owner process,
+%% Otherwise is should return {error,not_owner} or similar.
 controlling_process(Config) when is_list(Config) ->
     {ok,S} = gen_tcp:listen(0,[]),
     Pid2 = spawn(?MODULE,not_owner,[S]),
@@ -345,9 +320,8 @@ not_owner(S) ->
 	    ok
     end.
 
-controlling_process_self(doc) ->
-    ["Open a listen port and assign the controlling process to "
-     "it self, then exit and make sure the port is closed properly."];
+%% Open a listen port and assign the controlling process to
+%% it self, then exit and make sure the port is closed properly.
 controlling_process_self(Config) when is_list(Config) ->
     S = self(),
     process_flag(trap_exit,true),
@@ -371,11 +345,9 @@ controlling_process_self(Config) when is_list(Config) ->
     end.
     
 
-no_accept(doc) ->
-    ["Open a listen port and connect to it, then close the listen port ",
-     "without doing any accept.  The connected socket should receive ",
-     "a tcp_closed message."];
-no_accept(suite) -> [];
+%% Open a listen port and connect to it, then close the listen port
+%% without doing any accept.  The connected socket should receive
+%% a tcp_closed message.
 no_accept(Config) when is_list(Config) ->
     {ok, L} = gen_tcp:listen(0, []),
     {ok, {_, Port}} = inet:sockname(L),
@@ -385,14 +357,12 @@ no_accept(Config) when is_list(Config) ->
         {tcp_closed, Client} ->
             ok
     after 5000 ->
-            test_server:fail(never_closed)
+            ct:fail(never_closed)
     
     end.
 
-close_with_pending_output(doc) ->
-    ["Send several packets to a socket and close it.  All packets should arrive ",
-     "to the other end."];
-close_with_pending_output(suite) -> [];
+%% Send several packets to a socket and close it.  All packets should
+%% arrive to the other end.
 close_with_pending_output(Config) when is_list(Config) ->
     {ok, L} = gen_tcp:listen(0, [binary, {active, false}]),
     {ok, {_, Port}} = inet:sockname(L),
@@ -408,16 +378,16 @@ close_with_pending_output(Config) when is_list(Config) ->
 			  gen_tcp:close(A),
 			  gen_tcp:close(L);
 		      {ok, Bin} ->
-			  test_server:fail({small_packet,
+			  ct:fail({small_packet,
                                                   byte_size(Bin)});
 		      Error ->
-			  test_server:fail({unexpected, Error})
+			  ct:fail({unexpected, Error})
 		  end,
 	    ok;
 	{error, no_remote_hosts} ->
 	    {skipped,"No remote hosts"};
 	{error, Other} ->
-	    ?t:fail({failed_to_start_slave_node, Other})
+	    ct:fail({failed_to_start_slave_node, Other})
     end.
 
 sender(Port, Packets, Host) ->
@@ -435,9 +405,7 @@ send_loop(Sock, Data, Left) ->
     send_loop(Sock, Data, Left-1).
 
 %% Test {active,N} option
-active_n(doc) ->
-    ["Verify operation of the {active,N} option."];
-active_n(suite) -> [];
+%% Verify operation of the {active,N} option.
 active_n(Config) when is_list(Config) ->
     N = 3,
     LS = ok(gen_tcp:listen(0, [{active,N}])),
@@ -547,9 +515,7 @@ active_n(Config) when is_list(Config) ->
 %% I expect propagation of a close to be quite fast
 %% so 100 ms seems reasonable.
 
-otp_3924(doc) ->
-    ["Tests that a socket can be closed fast enough."];
-otp_3924(suite) -> [];
+%% Tests that a socket can be closed fast enough.
 otp_3924(Config) when is_list(Config) ->
     MaxDelay = (case has_superfluous_schedulers() of
 	    true -> 4;
@@ -567,8 +533,8 @@ otp_3924_1(MaxDelay) ->
     {ok, Node} = start_node(otp_3924),
     DataLen = 100*1024,
     Data = otp_3924_data(DataLen),
-    % Repeat the test a couple of times to prevent the test from passing
-    % by chance.
+    %% Repeat the test a couple of times to prevent the test from passing
+    %% by chance.
     repeat(10, fun(N) ->
                        ok = otp_3924(MaxDelay, Node, Data, DataLen, N)
                end),
@@ -607,17 +573,17 @@ otp_3924_receive_data(LSock, Sender, MaxDelay, Len, N) ->
     process_flag(priority, OP),
     receive
 	{'EXIT', _, TimeoutRef} ->
-	    test_server:fail({close_not_fast_enough,MaxDelay,N});
+	    ct:fail({close_not_fast_enough,MaxDelay,N});
 	{'EXIT', Sender, Reason} ->
-	    test_server:fail({sender_exited, Reason});
+	    ct:fail({sender_exited, Reason});
 	{'EXIT', _Other, Reason} ->
-	    test_server:fail({linked_process_exited, Reason})
+	    ct:fail({linked_process_exited, Reason})
     after 0 ->
 	    case Data of
 		{'EXIT', {A,B}} ->
-		    test_server:fail({A,B,N});
+		    ct:fail({A,B,N});
 		{'EXIT', Failure} ->
-		    test_server:fail(Failure);
+		    ct:fail(Failure);
 		_ ->
 		    Data
 	    end
@@ -676,8 +642,7 @@ otp_3924_sender(Receiver, Host, Port, Data) ->
     end.
 
 
-data_before_close(doc) ->
-    ["Tests that a huge amount of data can be received before a close."];
+%% Tests that a huge amount of data can be received before a close.
 data_before_close(Config) when is_list(Config) ->
     {ok, L} = gen_tcp:listen(0, [binary]),
     {ok, {_, TcpPort}} = inet:sockname(L),
@@ -689,7 +654,7 @@ data_before_close(Config) when is_list(Config) ->
             io:format("Result: ~p", [Result]);
         {Wrong, Result} ->
             io:format("Result: ~p", [Result]),
-            test_server:fail({wrong_count, Wrong})
+            ct:fail({wrong_count, Wrong})
     end,
     ok.
 
@@ -714,11 +679,9 @@ make_zero_packet(N) when N rem 2 == 0 ->
 make_zero_packet(N) ->
     P = make_zero_packet(N div 2),
     [0, P|P].
-get_status(doc) ->    
-    ["OTP-2924",
-     "test that the socket process does not crash when sys:get_status(Pid)",
-     "is called."];
-get_status(suite) -> [];
+
+%% OTP-2924. Test that the socket process does not crash when
+%% sys:get_status(Pid) is called.
 get_status(Config) when is_list(Config) ->
     {ok,{socket,Pid,_,_}} = gen_tcp:listen(5678,[]),
     {status,Pid,_,_} = sys:get_status(Pid).
@@ -726,9 +689,11 @@ get_status(Config) when is_list(Config) ->
 -define(RECOVER_SLEEP, 60000).
 -define(RETRY_SLEEP, 15000).
 
-iter_max_socks(doc) ->
-    ["Open as many sockets as possible. Do this several times and check ",
-     "that we get the same number of sockets every time."];
+iter_max_socks() ->
+    [{timetrap,{minutes,30}}].
+
+%% Open as many sockets as possible. Do this several times and check
+%% that we get the same number of sockets every time.
 iter_max_socks(Config) when is_list(Config) ->
     N = case os:type() of {win32,_} -> 10; _ -> 20 end,
     %% Run on a different node in order to limit the effect if this test fails.
@@ -757,7 +722,7 @@ do_iter_max_socks(N, First) when is_integer(First) ->
        true ->
 	    io:format("Sleeping for ~p seconds...~n",
 			    [?RETRY_SLEEP/1000]), 
-	    ?t:sleep(?RETRY_SLEEP),
+	    ct:sleep(?RETRY_SLEEP),
 	    io:format("Trying again...~n", []),
 	    RetryMS = max_socks(),
 	    if RetryMS == First ->
@@ -775,10 +740,10 @@ all_equal([Rule | T]) ->
 all_equal(Rule, [Rule | T]) ->
     all_equal(Rule, T);
 all_equal(_, [_ | _]) ->
-    ?t:sleep(?RECOVER_SLEEP), % Wait a while and *hope* that we'll
-                                    % recover so other tests won't be
-                                    % affected.
-    ?t:fail(max_socket_mismatch);
+    ct:sleep(?RECOVER_SLEEP), % Wait a while and *hope* that we'll
+                                    %% recover so other tests won't be
+                                    %% affected.
+    ct:fail(max_socket_mismatch);
 all_equal(_Rule, []) ->
     ok.
 
@@ -820,21 +785,20 @@ start_remote(Name) ->
     Pa = filename:dirname(code:which(?MODULE)),
     test_server:start_node(Name, slave, [{remote, true}, {args, "-pa " ++ Pa}]).
 
-passive_sockets(doc) ->
-    ["Tests that when 'the other side' on a passive socket closes, the connecting",
-     "side still can read until the end of data."];
+%% Tests that when 'the other side' on a passive socket closes, the
+%% connecting, side still can read until the end of data.
 passive_sockets(Config) when is_list(Config) ->
     spawn_link(?MODULE, passive_sockets_server,
                [[{active,false}],self()]),
     receive
         {socket,Port} -> ok
     end,
-    ?t:sleep(500),
+    ct:sleep(500),
     case gen_tcp:connect("localhost", Port, [{active, false}]) of
         {ok, Sock} ->
             passive_sockets_read(Sock);
         Error ->
-            ?t:fail({"Could not connect to server", Error})
+            ct:fail({"Could not connect to server", Error})
     end.
 
 %%
@@ -850,7 +814,7 @@ passive_sockets_read(Sock) ->
 	    gen_tcp:close(Sock);
 	Error ->
 	    gen_tcp:close(Sock),
-	    ?t:fail({"Did not get {error, closed} before other error", Error})
+	    ct:fail({"Did not get {error, closed} before other error", Error})
     end.
 
 passive_sockets_server(Opts, Parent) ->
@@ -860,17 +824,17 @@ passive_sockets_server(Opts, Parent) ->
             Parent ! {socket,Port},
             passive_sockets_server_accept(LSock);
         Error ->
-            ?t:fail({"Could not create listen socket", Error})
+            ct:fail({"Could not create listen socket", Error})
     end.
 
 passive_sockets_server_accept(Sock) ->
     case gen_tcp:accept(Sock) of
         {ok, Socket} ->
-            ?t:sleep(500),   % Simulate latency
+            timer:sleep(500),			% Simulate latency
             passive_sockets_server_send(Socket, 5),
             passive_sockets_server_accept(Sock);
         Error ->
-            ?t:fail({"Could not accept connection", Error})
+            ct:fail({"Could not accept connection", Error})
     end.
 
 passive_sockets_server_send(Socket, 0) ->
@@ -880,16 +844,15 @@ passive_sockets_server_send(Socket, X) ->
     Data = lists:duplicate(1024*X, $a),
     case gen_tcp:send(Socket, Data) of
         ok ->
-            ?t:sleep(50),   % Simulate some processing.
+            ct:sleep(50),   % Simulate some processing.
             passive_sockets_server_send(Socket, X-1);
         {error, _Reason} ->
-            ?t:fail("Failed to send data")
+            ct:fail("Failed to send data")
     end.
 
 
-accept_closed_by_other_process(doc) ->
-    ["Tests the return value from gen_tcp:accept when ",
-     "the socket is closed from another process. (OTP-3817)"];
+%% Tests the return value from gen_tcp:accept when
+%% the socket is closed from another process. (OTP-3817)
 accept_closed_by_other_process(Config) when is_list(Config) ->
     Parent = self(),
     {ok, ListenSocket} = gen_tcp:listen(0, []),
@@ -904,7 +867,7 @@ accept_closed_by_other_process(Config) when is_list(Config) ->
         {Child, {error, closed}} ->
             ok;
         {Child, Other} ->
-            ?t:fail({"Wrong result of gen_tcp:accept", Other})
+            ct:fail({"Wrong result of gen_tcp:accept", Other})
     end.
 
 repeat(N, Fun) ->
@@ -917,10 +880,7 @@ repeat(_, _, _) ->
     ok.
 
 
-closed_socket(suite) ->
-    [];
-closed_socket(doc) ->
-    ["Tests the response when using a closed socket as argument"];
+%% Tests the response when using a closed socket as argument.
 closed_socket(Config) when is_list(Config) ->
     {ok, LS1} = gen_tcp:listen(0, []),
     erlang:yield(),
@@ -932,7 +892,7 @@ closed_socket(Config) when is_list(Config) ->
     %% in inet_db processes the 'EXIT' message from the port,
     %% the socket is unregistered.
     %%
-    %% test_server:sleep(test_server:seconds(2)),
+    %% ct:sleep({seconds,2})
     %%
     {error, R_send} = gen_tcp:send(LS1, "data"),
     {error, R_recv} = gen_tcp:recv(LS1, 17),
@@ -974,7 +934,7 @@ shutdown_common(Active) ->
     do_sort(P, []),
     receive
 	Any ->
-	    ?t:fail({unexpected_message,Any})
+	    ct:fail({unexpected_message,Any})
     after 0 -> ok
     end.
 
@@ -1055,7 +1015,7 @@ shutdown_pending(Config) when is_list(Config) ->
             io:format("~p\n", [Msg]),
             N = list_to_integer(Msg) - 5;
         Other ->
-            ?t:fail({unexpected,Other})
+            ct:fail({unexpected,Other})
     end,
     ok.
 
@@ -1107,9 +1067,9 @@ show_econnreset_active(Config) when is_list(Config) ->
        {tcp_closed, S} ->
 	   ok;
        Other ->
-	   ?t:fail({unexpected1, Other})
+	   ct:fail({unexpected1, Other})
     after 1000 ->
-	?t:fail({timeout, {server, no_tcp_closed}})
+	ct:fail({timeout, {server, no_tcp_closed}})
     end,
 
     %% Now test with option switched on.
@@ -1128,14 +1088,14 @@ show_econnreset_active(Config) when is_list(Config) ->
 		{tcp_closed, S1} ->
 		    ok;
 		Other1 ->
-		    ?t:fail({unexpected2, Other1})
+		    ct:fail({unexpected2, Other1})
 	    after 1 ->
-		?t:fail({timeout, {server, no_tcp_closed}})
+		ct:fail({timeout, {server, no_tcp_closed}})
 	    end;
 	Other2 ->
-	    ?t:fail({unexpected3, Other2})
+	    ct:fail({unexpected3, Other2})
     after 1000 ->
-	?t:fail({timeout, {server, no_tcp_error}})
+	ct:fail({timeout, {server, no_tcp_error}})
     end.
 
 show_econnreset_active_once(Config) when is_list(Config) ->
@@ -1149,7 +1109,7 @@ show_econnreset_active_once(Config) when is_list(Config) ->
     ok = gen_tcp:close(L),
     ok = inet:setopts(Client, [{linger, {true, 0}}]),
     ok = gen_tcp:close(Client),
-    ok = ?t:sleep(20),
+    ok = ct:sleep(20),
     ok = receive Msg -> {unexpected_msg, Msg} after 0 -> ok end,
     ok = inet:setopts(S, [{active, once}]),
     receive
@@ -1158,14 +1118,14 @@ show_econnreset_active_once(Config) when is_list(Config) ->
 		{tcp_closed, S} ->
 		    ok;
 		Other1 ->
-		    ?t:fail({unexpected1, Other1})
+		    ct:fail({unexpected1, Other1})
 	    after 1 ->
-		?t:fail({timeout, {server, no_tcp_closed}})
+		ct:fail({timeout, {server, no_tcp_closed}})
 	    end;
 	Other2 ->
-	    ?t:fail({unexpected2, Other2})
+	    ct:fail({unexpected2, Other2})
     after 1000 ->
-	?t:fail({timeout, {server, no_tcp_error}})
+	ct:fail({timeout, {server, no_tcp_error}})
     end.
 
 show_econnreset_passive(Config) when is_list(Config) ->
@@ -1177,7 +1137,7 @@ show_econnreset_passive(Config) when is_list(Config) ->
     ok = gen_tcp:close(L),
     ok = inet:setopts(S, [{linger, {true, 0}}]),
     ok = gen_tcp:close(S),
-    ok = ?t:sleep(1),
+    ok = ct:sleep(1),
     {error, closed} = gen_tcp:recv(Client, 0),
 
     %% Now test with option switched on.
@@ -1190,7 +1150,7 @@ show_econnreset_passive(Config) when is_list(Config) ->
     ok = gen_tcp:close(L1),
     ok = inet:setopts(S1, [{linger, {true, 0}}]),
     ok = gen_tcp:close(S1),
-    ok = ?t:sleep(1),
+    ok = ct:sleep(1),
     {error, econnreset} = gen_tcp:recv(Client1, 0).
 
 econnreset_after_sync_send(Config) when is_list(Config) ->
@@ -1202,7 +1162,7 @@ econnreset_after_sync_send(Config) when is_list(Config) ->
     ok = gen_tcp:close(L),
     ok = inet:setopts(S, [{linger, {true, 0}}]),
     ok = gen_tcp:close(S),
-    ok = ?t:sleep(20),
+    ok = ct:sleep(20),
     {error, closed} = gen_tcp:send(Client, "Whatever"),
 
     %% Now test with option switched on.
@@ -1215,7 +1175,7 @@ econnreset_after_sync_send(Config) when is_list(Config) ->
     ok = gen_tcp:close(L1),
     ok = inet:setopts(S1, [{linger, {true, 0}}]),
     ok = gen_tcp:close(S1),
-    ok = ?t:sleep(20),
+    ok = ct:sleep(20),
     {error, econnreset} = gen_tcp:send(Client1, "Whatever").
 
 econnreset_after_async_send_active(Config) when is_list(Config) ->
@@ -1232,23 +1192,23 @@ econnreset_after_async_send_active(Config) when is_list(Config) ->
     case erlang:port_info(Client, queue_size) of
 	{queue_size, N} when N > 0 -> ok;
 	{queue_size, 0} when OS =:= win32 -> ok;
-	{queue_size, 0} = T -> ?t:fail(T)
+	{queue_size, 0} = T -> ct:fail(T)
     end,
     ok = gen_tcp:send(S, "Whatever"),
-    ok = ?t:sleep(20),
+    ok = ct:sleep(20),
     ok = inet:setopts(S, [{linger, {true, 0}}]),
     ok = gen_tcp:close(S),
-    ok = ?t:sleep(20),
+    ok = ct:sleep(20),
     receive
 	{tcp, Client, "Whatever"} ->
 	    receive
 		{tcp_closed, Client} ->
 		    ok;
 		Other1 ->
-		    ?t:fail({unexpected1, Other1})
+		    ct:fail({unexpected1, Other1})
 	    end;
 	Other2 ->
-	    ?t:fail({unexpected2, Other2})
+	    ct:fail({unexpected2, Other2})
     end,
 
     %% Now test with option switched on.
@@ -1263,13 +1223,13 @@ econnreset_after_async_send_active(Config) when is_list(Config) ->
     case erlang:port_info(Client1, queue_size) of
 	{queue_size, N1} when N1 > 0 -> ok;
 	{queue_size, 0} when OS =:= win32 -> ok;
-	{queue_size, 0} = T1 -> ?t:fail(T1)
+	{queue_size, 0} = T1 -> ct:fail(T1)
     end,
     ok = gen_tcp:send(S1, "Whatever"),
-    ok = ?t:sleep(20),
+    ok = ct:sleep(20),
     ok = inet:setopts(S1, [{linger, {true, 0}}]),
     ok = gen_tcp:close(S1),
-    ok = ?t:sleep(20),
+    ok = ct:sleep(20),
     receive
 	{tcp, Client1, "Whatever"} ->
 	    receive
@@ -1278,13 +1238,13 @@ econnreset_after_async_send_active(Config) when is_list(Config) ->
 			{tcp_closed, Client1} ->
 			    ok;
 			Other3 ->
-			    ?t:fail({unexpected3, Other3})
+			    ct:fail({unexpected3, Other3})
 		    end;
 		Other4 ->
-		    ?t:fail({unexpected4, Other4})
+		    ct:fail({unexpected4, Other4})
 	    end;
 	Other5 ->
-	    ?t:fail({unexpected5, Other5})
+	    ct:fail({unexpected5, Other5})
     end.
 
 econnreset_after_async_send_active_once(Config) when is_list(Config) ->
@@ -1302,13 +1262,13 @@ econnreset_after_async_send_active_once(Config) when is_list(Config) ->
     case erlang:port_info(Client, queue_size) of
 	{queue_size, N} when N > 0 -> ok;
 	{queue_size, 0} when OS =:= win32 -> ok;
-	{queue_size, 0} = T -> ?t:fail(T)
+	{queue_size, 0} = T -> ct:fail(T)
     end,
     ok = gen_tcp:send(S, "Whatever"),
-    ok = ?t:sleep(20),
+    ok = ct:sleep(20),
     ok = inet:setopts(S, [{linger, {true, 0}}]),
     ok = gen_tcp:close(S),
-    ok = ?t:sleep(20),
+    ok = ct:sleep(20),
     ok = receive Msg -> {unexpected_msg, Msg} after 0 -> ok end,
     ok = inet:setopts(Client, [{active, once}]),
     receive
@@ -1317,10 +1277,10 @@ econnreset_after_async_send_active_once(Config) when is_list(Config) ->
 		{tcp_closed, Client} ->
 		    ok;
 		Other ->
-		    ?t:fail({unexpected1, Other})
+		    ct:fail({unexpected1, Other})
 	    end;
 	Other ->
-	    ?t:fail({unexpected2, Other})
+	    ct:fail({unexpected2, Other})
     end.
 
 econnreset_after_async_send_passive(Config) when is_list(Config) ->
@@ -1341,10 +1301,10 @@ econnreset_after_async_send_passive(Config) when is_list(Config) ->
     case erlang:port_info(Client, queue_size) of
 	{queue_size, N} when N > 0 -> ok;
 	{queue_size, 0} when OS =:= win32 -> ok;
-	{queue_size, 0} = T -> ?t:fail(T)
+	{queue_size, 0} = T -> ct:fail(T)
     end,
     ok = gen_tcp:close(S),
-    ok = ?t:sleep(20),
+    ok = ct:sleep(20),
     {error, closed} = gen_tcp:recv(Client, 0),
 
     %% Now test with option switched on.
@@ -1360,7 +1320,7 @@ econnreset_after_async_send_passive(Config) when is_list(Config) ->
     ok = gen_tcp:send(S1, "Whatever"),
     ok = gen_tcp:send(Client1, Payload),
     ok = gen_tcp:close(S1),
-    ok = ?t:sleep(20),
+    ok = ct:sleep(20),
     {error, econnreset} = gen_tcp:recv(Client1, 0).
 
 %%
@@ -1387,11 +1347,11 @@ linger_zero(Config) when is_list(Config) ->
     case erlang:port_info(Client, queue_size) of
 	{queue_size, N} when N > 0 -> ok;
 	{queue_size, 0} when OS =:= win32 -> ok;
-	{queue_size, 0} = T -> ?t:fail(T)
+	{queue_size, 0} = T -> ct:fail(T)
     end,
     ok = inet:setopts(Client, [{linger, {true, 0}}]),
     ok = gen_tcp:close(Client),
-    ok = ?t:sleep(1),
+    ok = ct:sleep(1),
     undefined = erlang:port_info(Client, connected),
     {error, econnreset} = gen_tcp:recv(S, PayloadSize).
 
@@ -1466,7 +1426,7 @@ busy_send_loop(Server, Client, N) ->
                           busy_send_2(Server, Client, N+1)
                   after 10000 ->
                             %% If this happens, see busy_send_srv
-                            ?t:fail({timeout,{server,not_send,flush([])}})
+                            ct:fail({timeout,{server,not_send,flush([])}})
                   end
     end.
 
@@ -1477,7 +1437,7 @@ busy_send_2(Server, Client, _N) ->
         {Server,[closed]} ->
             receive {Client,[0,{error,closed}]} -> ok end
     after 10000 ->
-              ?t:fail({timeout,{server,not_closed,flush([])}})
+              ct:fail({timeout,{server,not_closed,flush([])}})
     end.
 
 busy_send_srv(L, Master, Msg) ->
@@ -1567,7 +1527,7 @@ busy_disconnect_active_send(S, Data) ->
 	{error,closed} ->
 	    receive
 		{tcp_closed,S} -> ok;
-		_Other -> ?t:fail()
+		_Other -> ct:fail(failed)
 	    end
     end.
 
@@ -1646,7 +1606,7 @@ fill_sendq_loop(Server, Client, Reader) ->
 						("Got reader closed.~n"),
 					ok
 				after 3000 ->
-					?t:fail({timeout,{closed,reader}})
+					ct:fail({timeout,{closed,reader}})
 				end;
 			  {Reader,[{error,closed}]} ->
 			  io:format("Got reader closed.~n"),
@@ -1654,10 +1614,10 @@ fill_sendq_loop(Server, Client, Reader) ->
 					io:format("Got server closed~n"),
 					ok
 				after 3000 ->
-					?t:fail({timeout,{closed,server}})
+					ct:fail({timeout,{closed,server}})
 				end
 		  after 3000 ->
-			  ?t:fail({timeout,{closed,[server,reader]}})
+			  ct:fail({timeout,{closed,[server,reader]}})
 		  end
     end.
 
@@ -1865,7 +1825,7 @@ test_prio_accept_async() ->
     spawn(?MODULE,priority_server,[{self(),Ref}]),
     Port = receive
                {Ref,P} -> P
-           after 5000 -> ?t:fail({error,"helper process timeout"})
+           after 5000 -> ct:fail({error,"helper process timeout"})
            end,
     receive
     after 3000 -> ok
@@ -1879,15 +1839,15 @@ test_prio_accept_async() ->
         {Ref,{ok,[{priority,4},{tos,Tos1}]}} ->
             ok;
         {Ref,Error} ->
-            ?t:fail({missmatch,Error})
-    after 5000 -> ?t:fail({error,"helper process timeout"})
+            ct:fail({missmatch,Error})
+    after 5000 -> ct:fail({error,"helper process timeout"})
     end,
     receive
         {Ref,{ok,[{priority,4},{tos,Tos1}]}} ->
             ok;
         {Ref,Error2} ->
-            ?t:fail({missmatch,Error2})
-    after 5000 -> ?t:fail({error,"helper process timeout"})
+            ct:fail({missmatch,Error2})
+    after 5000 -> ct:fail({error,"helper process timeout"})
     end,
 
     {ok,[{priority,4},{tos,Tos2}]} = inet:getopts(Sock2,[priority,tos]),
@@ -1909,10 +1869,6 @@ priority_server({Parent,Ref}) ->
 test_prio_fail() ->
     {ok,L} = gen_tcp:listen(0, [{active,false}]),
     {error,_} = inet:setopts(L,[{priority,1000}]),
-%   This error could only happen in linux kernels earlier than 2.6.24.4
-%   Privilege check is now disabled and IP_TOS can never fail (only silently
-%   be masked).
-%   {error,_} = inet:setopts(L,[{tos,6 bsl 5}]),
     gen_tcp:close(L),
     ok.
 
@@ -1924,10 +1880,7 @@ test_prio_udp() ->
     gen_udp:close(S),
     ok.
 
-so_priority(doc) ->
-    ["Tests the so_priority and ip_tos options on sockets when applicable."];
-so_priority(suite) ->
-    [];
+%% Tests the so_priority and ip_tos options on sockets when applicable.
 so_priority(Config) when is_list(Config) ->
     {ok,L} = gen_tcp:listen(0, [{active,false}]),
     ok = inet:setopts(L,[{priority,1}]),
@@ -1947,7 +1900,7 @@ so_priority(Config) when is_list(Config) ->
 		{unix,linux} ->
 		    case os:version() of
 			{X,Y,_} when (X > 2) or ((X =:= 2) and (Y >= 4)) ->
-			    ?t:fail({error,
+			    ct:fail({error,
 					   "so_priority should work on this "
 					   "OS, but does not"});
 			_ ->
@@ -2006,10 +1959,7 @@ mktmofun(Tmo,Parent,LS) ->
     fun() -> Parent ! {accepted,self(), catch gen_tcp:accept(LS,Tmo)} end.
 
 %% Accept tests
-primitive_accept(suite) ->
-    [];
-primitive_accept(doc) ->
-    ["Test singular accept"];
+%% Test singular accept.
 primitive_accept(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     {ok,PortNo}=inet:port(LS),
@@ -2027,10 +1977,7 @@ primitive_accept(Config) when is_list(Config) ->
     end.
 
 	
-multi_accept_close_listen(suite) ->
-    [];
-multi_accept_close_listen(doc) ->
-    ["Closing listen socket when multi-accepting"];
+%% Closing listen socket when multi-accepting.
 multi_accept_close_listen(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2043,10 +1990,7 @@ multi_accept_close_listen(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{_,{error,closed}},{_,{error,closed}},
                           {_,{error,closed}},{_,{error,closed}}],4,500).
 	
-accept_timeout(suite) ->
-    [];
-accept_timeout(doc) ->
-    ["Single accept with timeout"];
+%% Single accept with timeout.
 accept_timeout(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2054,10 +1998,7 @@ accept_timeout(Config) when is_list(Config) ->
     P = spawn(F),
     ok = ?EXPECT_ACCEPTS([{P,{error,timeout}}],1,2000).
 
-accept_timeouts_in_order(suite) ->
-    [];
-accept_timeouts_in_order(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order"];
+%% Check that multi-accept timeouts happen in the correct order.
 accept_timeouts_in_order(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2068,10 +2009,7 @@ accept_timeouts_in_order(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{P1,{error,timeout}},{P2,{error,timeout}},
                           {P3,{error,timeout}},{P4,{error,timeout}}],infinity,2000).
 
-accept_timeouts_in_order2(suite) ->
-    [];
-accept_timeouts_in_order2(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order (more)"];
+%% Check that multi-accept timeouts happen in the correct order (more).
 accept_timeouts_in_order2(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2082,10 +2020,7 @@ accept_timeouts_in_order2(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{P4,{error,timeout}},{P3,{error,timeout}},
                           {P2,{error,timeout}},{P1,{error,timeout}}],infinity,2000).
 
-accept_timeouts_in_order3(suite) ->
-    [];
-accept_timeouts_in_order3(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order (even more)"];
+%% Check that multi-accept timeouts happen in the correct order (even more).
 accept_timeouts_in_order3(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2096,11 +2031,8 @@ accept_timeouts_in_order3(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{P4,{error,timeout}},{P1,{error,timeout}},
                           {P3,{error,timeout}},{P2,{error,timeout}}],infinity,2000).
 
-accept_timeouts_in_order4(suite) ->
-    [];
-accept_timeouts_in_order4(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order after "
-     "mixing millsec and sec timeouts"];
+%% Check that multi-accept timeouts happen in the correct order after
+%% mixing millsec and sec timeouts.
 accept_timeouts_in_order4(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2111,11 +2043,8 @@ accept_timeouts_in_order4(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{P1,{error,timeout}},{P2,{error,timeout}},
 			  {P4,{error,timeout}},{P3,{error,timeout}}],infinity,2000).
 
-accept_timeouts_in_order5(suite) ->
-    [];
-accept_timeouts_in_order5(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order after "
-     "mixing millsec and sec timeouts (more)"];
+%% Check that multi-accept timeouts happen in the correct order after
+%% mixing millsec and sec timeouts (more).
 accept_timeouts_in_order5(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2126,11 +2055,8 @@ accept_timeouts_in_order5(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{P4,{error,timeout}},{P1,{error,timeout}},
 			  {P3,{error,timeout}},{P2,{error,timeout}}],infinity,2000).
 
-accept_timeouts_in_order6(suite) ->
-    [];
-accept_timeouts_in_order6(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order after "
-     "mixing millsec and sec timeouts (even more)"];
+%% Check that multi-accept timeouts happen in the correct order after
+%% mixing millsec and sec timeouts (even more).
 accept_timeouts_in_order6(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2141,11 +2067,8 @@ accept_timeouts_in_order6(Config) when is_list(Config) ->
     ok = ?EXPECT_ACCEPTS([{P4,{error,timeout}},{P2,{error,timeout}},
 			  {P3,{error,timeout}},{P1,{error,timeout}}],infinity,2000).
 
-accept_timeouts_in_order7(suite) ->
-    [];
-accept_timeouts_in_order7(doc) ->
-    ["Check that multi-accept timeouts happen in the correct order after "
-     "mixing millsec and sec timeouts (even more++)"];
+%% Check that multi-accept timeouts happen in the correct order after
+%% mixing millsec and sec timeouts (even more++).
 accept_timeouts_in_order7(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2162,10 +2085,7 @@ accept_timeouts_in_order7(Config) when is_list(Config) ->
 			  {P1,{error,timeout}},{P3,{error,timeout}},
 			  {P8,{error,timeout}},{P7,{error,timeout}}],infinity,2000).
 
-accept_timeouts_mixed(suite) ->
-    [];
-accept_timeouts_mixed(doc) ->
-    ["Check that multi-accept timeouts behave correctly when mixed with successful timeouts"];
+%% Check that multi-accept timeouts behave correctly when mixed with successful timeouts.
 accept_timeouts_mixed(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2185,10 +2105,7 @@ accept_timeouts_mixed(Config) when is_list(Config) ->
     gen_tcp:connect("localhost",PortNo,[]),
     ok = ?EXPECT_ACCEPTS([{P4,{ok,Port1}}] when is_port(Port1),infinity,100).
 
-killing_acceptor(suite) ->
-    [];
-killing_acceptor(doc) ->
-    ["Check that single acceptor behaves as expected when killed"];
+%% Check that single acceptor behaves as expected when killed.
 killing_acceptor(Config) when is_list(Config) ->    
     {ok,LS}=gen_tcp:listen(0,[]),
     Pid = spawn(fun() -> erlang:display({accepted,self(),gen_tcp:accept(LS)}) end),
@@ -2203,10 +2120,7 @@ killing_acceptor(Config) when is_list(Config) ->
     false  = lists:member(accepting, L2),
     ok.
 
-killing_multi_acceptors(suite) ->
-    [];
-killing_multi_acceptors(doc) ->
-    ["Check that multi acceptors behaves as expected when killed"];
+%% Check that multi acceptors behaves as expected when killed.
 killing_multi_acceptors(Config) when is_list(Config) ->    
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2228,10 +2142,7 @@ killing_multi_acceptors(Config) when is_list(Config) ->
     false  = lists:member(accepting, L3),
     ok.
 
-killing_multi_acceptors2(suite) ->
-    [];
-killing_multi_acceptors2(doc) ->
-    ["Check that multi acceptors behaves as expected when killed (more)"];
+%% Check that multi acceptors behaves as expected when killed (more).
 killing_multi_acceptors2(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2265,11 +2176,8 @@ killing_multi_acceptors2(Config) when is_list(Config) ->
     false  = lists:member(accepting, L5),
     ok.
     
-several_accepts_in_one_go(suite) ->
-    [];
-several_accepts_in_one_go(doc) ->
-    ["checks that multi-accept works when more than one accept can be "
-     "done at once (wb test of inet_driver)"];
+%% Checks that multi-accept works when more than one accept can be
+%% done at once (wb test of inet_driver).
 several_accepts_in_one_go(Config) when is_list(Config) ->
     {ok,LS}=gen_tcp:listen(0,[]),
     Parent = self(),
@@ -2312,11 +2220,8 @@ wait_until_accepting(Proc,N) ->
     end.
 
 
-accept_system_limit(suite) ->
-    [];
-accept_system_limit(doc) ->
-    ["Check that accept returns {error, system_limit} "
-     "(and not {error, enfile}) when running out of ports"];
+%% Check that accept returns {error, system_limit}
+%% (and not {error, enfile}) when running out of ports.
 accept_system_limit(Config) when is_list(Config) ->
     {ok, LS} = gen_tcp:listen(0, []),
     {ok, TcpPort} = inet:port(LS),
@@ -2365,10 +2270,7 @@ open_ports(L) ->
     end.
 
 
-active_once_closed(suite) ->
-    [];
-active_once_closed(doc) ->
-    ["Check that active once and tcp_close messages behave as expected"];
+%% Check that active once and tcp_close messages behave as expected.
 active_once_closed(Config) when is_list(Config) ->
     (fun() ->
 	     {Loop,A} = setup_closed_ao(),
@@ -2416,75 +2318,84 @@ active_once_closed(Config) when is_list(Config) ->
 	     ok = receive {tcp_closed, A} -> ok after 1000 -> error end
      end)().
    
-send_timeout(suite) ->
-    [];
-send_timeout(doc) ->
-    ["Test the send_timeout socket option"];
+%% Test the send_timeout socket option.
 send_timeout(Config) when is_list(Config) ->
+    Dir = filename:dirname(code:which(?MODULE)),
+    {ok,RNode} = test_server:start_node(?UNIQ_NODE_NAME, slave,
+					[{args,"-pa " ++ Dir}]),
+
     %% Basic
-    BasicFun =
-	fun(AutoClose) ->
-	     {Loop,A,RNode} = setup_timeout_sink(1000, AutoClose),
-	     {error,timeout} =
-		 Loop(fun() ->
-			      Res = gen_tcp:send(A,<<1:10000>>),
-			      %%erlang:display(Res),
-			      Res
-		      end),
-	     %% Check that the socket is not busy/closed...
-	     Error = after_send_timeout(AutoClose),
-	     {error,Error} = gen_tcp:send(A,<<"Hej">>),
-	     test_server:stop_node(RNode)
-	end,
-    BasicFun(false),
-    BasicFun(true),
-    %% Check timeout length
+    send_timeout_basic(false, RNode),
+    send_timeout_basic(true, RNode),
+
+    BinData = <<1:10000>>,
+
+    %% Check timeout length.
     Self = self(),
     Pid = spawn(fun() ->
-                        {Loop,A,RNode} = setup_timeout_sink(1000, true),
-                        {error,timeout} = Loop(fun() ->
-                                     Res = gen_tcp:send(A,<<1:10000>>),
-                                     %%erlang:display(Res),
-                                     Self ! Res,
-                                     Res
-                             end),
-                        test_server:stop_node(RNode)
+                        A = setup_timeout_sink(RNode, 1000, true),
+			Send = fun() ->
+				       Res = gen_tcp:send(A, BinData),
+				       Self ! Res,
+				       Res
+			       end,
+			{error,timeout} = timeout_sink_loop(Send)
 	      end),
     Diff = get_max_diff(),
     io:format("Max time for send: ~p~n",[Diff]),
     true = (Diff > 500) and (Diff < 1500),
-    %% Let test_server slave die...
+
+    %% Wait for the process to die.
     Mon = erlang:monitor(process, Pid),
     receive {'DOWN',Mon,process,Pid,_} -> ok end,
+
     %% Check that parallell writers do not hang forever
-    ParaFun =
-	fun(AutoClose) ->
-		{Loop,A,RNode} = setup_timeout_sink(1000, AutoClose),
-		SenderFun = fun() ->
-				    {error,Error} =
-					Loop(fun() ->
-						     gen_tcp:send(A, <<1:10000>>)
-					     end),
-				    Self ! {error,Error}
-			    end,
-		spawn_link(SenderFun),
-		spawn_link(SenderFun),
-                receive
-                    {error,timeout} -> ok
-                after 10000 ->
-                          exit(timeout)
-                end,
-		NextErr = after_send_timeout(AutoClose),
-                receive
-                    {error,NextErr} -> ok
-                after 10000 ->
-                          exit(timeout)
-                end,
-		{error,NextErr} = gen_tcp:send(A,<<"Hej">>),
-		test_server:stop_node(RNode)
-	end,
-    ParaFun(false),
-    ParaFun(true),
+    send_timeout_para(false, RNode),
+    send_timeout_para(true, RNode),
+
+    test_server:stop_node(RNode),
+
+    ok.
+
+send_timeout_basic(AutoClose, RNode) ->
+    BinData = <<1:10000>>,
+
+    A = setup_timeout_sink(RNode, 1000, AutoClose),
+    Send = fun() -> gen_tcp:send(A, BinData) end,
+    {error,timeout} = timeout_sink_loop(Send),
+
+    %% Check that the socket is not busy/closed...
+    Error = after_send_timeout(AutoClose),
+    {error,Error} = gen_tcp:send(A, <<"Hej">>),
+    ok.
+
+send_timeout_para(AutoClose, RNode) ->
+    BinData = <<1:10000>>,
+
+    A = setup_timeout_sink(RNode, 1000, AutoClose),
+    Self = self(),
+    SenderFun = fun() ->
+			Send = fun() -> gen_tcp:send(A, BinData) end,
+			{error,Error} = timeout_sink_loop(Send),
+			Self ! {error,Error}
+		end,
+    spawn_link(SenderFun),
+    spawn_link(SenderFun),
+
+    receive
+	{error,timeout} -> ok
+    after 10000 ->
+	    exit(timeout)
+    end,
+
+    NextErr = after_send_timeout(AutoClose),
+    receive
+	{error,NextErr} -> ok
+    after 10000 ->
+	    exit(timeout)
+    end,
+
+    {error,NextErr} = gen_tcp:send(A, <<"Hej">>),
     ok.
 
 mad_sender(S) ->
@@ -2500,46 +2411,41 @@ mad_sender(S) ->
 flush() ->
     receive
 	_X ->
-	    %erlang:display(_X),
 	    flush()
     after 0 ->
 	    ok
     end.
 
-send_timeout_active(suite) ->
-    [];
-send_timeout_active(doc) ->
-    ["Test the send_timeout socket option for active sockets"];
+%% Test the send_timeout socket option for active sockets.
 send_timeout_active(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:seconds(20)),
-    %% Basic
-    BasicFun = 
-	fun(AutoClose) ->
-		{Loop,A,RNode,C} = setup_active_timeout_sink(1, AutoClose),
-		inet:setopts(A, [{active, once}]),
-		Mad = spawn_link(RNode,fun() -> mad_sender(C) end),
-		{error,timeout} =
-                Loop(fun() ->
-                             receive
-                                 {tcp, _Sock, _Data} ->
-                                     inet:setopts(A, [{active, once}]),
-                                     Res = gen_tcp:send(A,lists:duplicate(1000, $a)),
-                                     %erlang:display(Res),
-                                     Res;
-                                 Err ->
-                                     io:format("sock closed: ~p~n", [Err]),
-                                     Err
-                             end
-                     end),
-                unlink(Mad),
-		exit(Mad,kill),
-		test_server:stop_node(RNode)
+    Dir = filename:dirname(code:which(?MODULE)),
+    {ok,RNode} = test_server:start_node(?UNIQ_NODE_NAME, slave,
+					[{args,"-pa " ++ Dir}]),
+    do_send_timeout_active(false, RNode),
+    do_send_timeout_active(true, RNode),
+    test_server:stop_node(RNode),
+    ok.
+
+do_send_timeout_active(AutoClose, RNode) ->
+    {A,C} = setup_active_timeout_sink(RNode, 1, AutoClose),
+    inet:setopts(A, [{active, once}]),
+    Mad = spawn_link(RNode, fun() -> mad_sender(C) end),
+    ListData = lists:duplicate(1000, $a),
+    F = fun() ->
+		receive
+		    {tcp, _Sock, _Data} ->
+			inet:setopts(A, [{active, once}]),
+			Res = gen_tcp:send(A, ListData),
+			Res;
+		    Err ->
+			io:format("sock closed: ~p~n", [Err]),
+			Err
+		end
 	end,
-    BasicFun(false),
-    flush(),
-    BasicFun(true),
+    {error,timeout} = timeout_sink_loop(F),
+    unlink(Mad),
+    exit(Mad, kill),
     flush(),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 after_send_timeout(AutoClose) ->
@@ -2581,9 +2487,9 @@ get_max_diff(Max) ->
 	    
 setup_closed_ao() ->
     Dir = filename:dirname(code:which(?MODULE)),
-    {ok,R} = test_server:start_node(test_default_options_slave,slave,
+    {ok,R} = test_server:start_node(?UNIQ_NODE_NAME, slave,
                                     [{args,"-pa " ++ Dir}]),
-    Host = list_to_atom(lists:nth(2,string:tokens(atom_to_list(node()),"@"))),
+    Host = get_hostname(node()),
     {ok, L} = gen_tcp:listen(0, [{active,false},{packet,2}]),
     Fun = fun(F) ->
                   receive
@@ -2622,11 +2528,8 @@ setup_closed_ao() ->
     test_server:stop_node(R),
     {Loop,A}.
     
-setup_timeout_sink(Timeout, AutoClose) ->
-    Dir = filename:dirname(code:which(?MODULE)),
-    {ok,R} = test_server:start_node(test_default_options_slave,slave,
-                                    [{args,"-pa " ++ Dir}]),
-    Host = list_to_atom(lists:nth(2,string:tokens(atom_to_list(node()),"@"))),
+setup_timeout_sink(RNode, Timeout, AutoClose) ->
+    Host = get_hostname(node()),
     {ok, L} = gen_tcp:listen(0, [{active,false},{packet,2},
 				 {send_timeout,Timeout},
 				 {send_timeout_close,AutoClose}]),
@@ -2637,7 +2540,7 @@ setup_timeout_sink(Timeout, AutoClose) ->
 		      die -> ok
 		  end
 	  end,
-    Pid =  rpc:call(R,erlang,spawn,[fun() -> Fun(Fun) end]),
+    Pid =  rpc:call(RNode, erlang, spawn, [fun() -> Fun(Fun) end]),
     {ok, Port} = inet:port(L),
     Remote = fun(Fu) ->
 		     Pid ! {self(), Fu},
@@ -2651,36 +2554,23 @@ setup_timeout_sink(Timeout, AutoClose) ->
     {ok,A} = gen_tcp:accept(L),
     gen_tcp:send(A,"Hello"),
     {ok, "Hello"} = Remote(fun() -> gen_tcp:recv(C,0) end),
-    Loop2 = fun(_,_,0) ->
-		    {failure, timeout};
-	       (L2,F2,N) ->
-		    Ret = F2(),
-		    io:format("~p~n",[Ret]),
-		    case Ret of
-			ok -> receive after 1 -> ok end,
-			      L2(L2,F2,N-1);
-			Other -> Other
-		    end
-	    end,
-    Loop = fun(F3) ->  Loop2(Loop2,F3,1000) end,
-    {Loop,A,R}.
-
-setup_active_timeout_sink(Timeout, AutoClose) ->
-    Dir = filename:dirname(code:which(?MODULE)),
-    {ok,R} = test_server:start_node(test_default_options_slave,slave,
-                                    [{args,"-pa " ++ Dir}]),
-    Host = list_to_atom(lists:nth(2,string:tokens(atom_to_list(node()),"@"))),
-    {ok, L} = gen_tcp:listen(0, [binary,{active,false},{packet,0},{nodelay, true},{keepalive, true},
-				 {send_timeout,Timeout},
-				 {send_timeout_close,AutoClose}]),
+    A.
+
+setup_active_timeout_sink(RNode, Timeout, AutoClose) ->
+    Host = get_hostname(node()),
+    ListenOpts =  [binary,{active,false},{packet,0},
+		   {nodelay,true},{keepalive,true},
+		   {send_timeout,Timeout},{send_timeout_close,AutoClose}],
+    {ok, L} = gen_tcp:listen(0, ListenOpts),
     Fun = fun(F) ->
 		  receive
 		      {From,X} when is_function(X) ->
-			  From ! {self(),X()}, F(F);
+			  From ! {self(),X()},
+			  F(F);
 		      die -> ok
 		  end
 	  end,
-    Pid =  rpc:call(R,erlang,spawn,[fun() -> Fun(Fun) end]),
+    Pid = rpc:call(RNode, erlang, spawn, [fun() -> Fun(Fun) end]),
     {ok, Port} = inet:port(L),
     Remote = fun(Fu) ->
 		     Pid ! {self(), Fu},
@@ -2688,26 +2578,22 @@ setup_active_timeout_sink(Timeout, AutoClose) ->
 		     end
 	     end,
     {ok, C} = Remote(fun() ->
-			     gen_tcp:connect(Host,Port,
-					     [{active,false}])
+			     gen_tcp:connect(Host, Port, [{active,false}])
 		     end),
     {ok,A} = gen_tcp:accept(L),
-    gen_tcp:send(A,"Hello"),
-    {ok, "H"++_} = Remote(fun() -> gen_tcp:recv(C,0) end),
-    Loop2 = fun(_,_,0) ->
-		    {failure, timeout};
-	       (L2,F2,N) ->
-		    Ret = F2(),
-		    io:format("~p~n",[Ret]),
-		    case Ret of
-			ok -> receive after 1 -> ok end,
-			      L2(L2,F2,N-1);
-			Other -> Other
-		    end
-	    end,
-    Loop = fun(F3) ->  Loop2(Loop2,F3,1000) end,
-    {Loop,A,R,C}.
+    gen_tcp:send(A, "Hello"),
+    {ok, "H"++_} = Remote(fun() -> gen_tcp:recv(C, 0) end),
+    {A,C}.
 
+timeout_sink_loop(Action) ->
+    Ret = Action(),
+    case Ret of
+	ok ->
+	    receive after 1 -> ok end,
+	    timeout_sink_loop(Action);
+	Other ->
+	    Other
+    end.
      
 has_superfluous_schedulers() ->
     case {erlang:system_info(schedulers),
@@ -2718,10 +2604,8 @@ has_superfluous_schedulers() ->
     end.
 
 
-otp_7731(suite) -> [];    
-otp_7731(doc) -> 
-    "Leaking message from inet_drv {inet_reply,P,ok} "
-    "when a socket sending resumes working after a send_timeout";
+%% Leaking message from inet_drv {inet_reply,P,ok}
+%% when a socket sending resumes working after a send_timeout.
 otp_7731(Config) when is_list(Config) ->
     ServerPid = spawn_link(?MODULE, otp_7731_server, [self()]),
     receive {ServerPid, ready, PortNum} -> ok end,
@@ -2738,7 +2622,7 @@ otp_7731(Config) when is_list(Config) ->
 
     %% Now make sure inet_drv does not leak any internal messages.
     receive Msg ->
-	    test_server:fail({unexpected, Msg})
+	    ct:fail({unexpected, Msg})
     after 1000 ->
 	    ok
     end,
@@ -2791,8 +2675,7 @@ otp_7731_recv(Socket) ->
 %% OTP-7615: TCP-ports hanging in CLOSING state when sending large
 %% buffer followed by a recv() that returns error due to closed
 %% connection.
-zombie_sockets(suite) -> [];
-zombie_sockets(doc) -> ["OTP-7615 Leaking closed ports."];
+%% OTP-7615 Leaking closed ports.
 zombie_sockets(Config) when is_list(Config) ->
     register(zombie_collector,self()),
     Calls = 10,
@@ -2872,9 +2755,7 @@ zombie_serve_client(Socket, Bin) ->
     gen_tcp:close(Socket),
     zombie_collector ! {closed, Socket}.
 
-otp_7816(suite) -> [];    
-otp_7816(doc) -> 
-    "Hanging send on windows when sending iolist with more than 16 binaries.";
+%% Hanging send on windows when sending iolist with more than 16 binaries.
 otp_7816(Config) when is_list(Config) ->
     Client = self(),
     Server = spawn_link(fun()-> otp_7816_server(Client) end),
@@ -2963,8 +2844,7 @@ otp_7816_recv(CSocket, BytesLeft) ->
 		  error
 	  end.
 
-otp_8102(doc) -> ["Receive a packet with a faulty packet header"];
-otp_8102(suite) -> [];
+%% Receive a packet with a faulty packet header.
 otp_8102(Config) when is_list(Config) ->
     {ok, LSocket} = gen_tcp:listen(0, []),
     {ok, {_, PortNum}} = inet:sockname(LSocket),
@@ -3004,8 +2884,7 @@ otp_8102_do(LSocket, PortNum, {Bin,PType}) ->
     gen_tcp:close(SSocket),    
     gen_tcp:close(RSocket).
 
-otp_9389(doc) -> ["Verify packet_size handles long HTTP header lines"];
-otp_9389(suite) -> [];
+%% Verify packet_size handles long HTTP header lines.
 otp_9389(Config) when is_list(Config) ->
     {ok, LS} = gen_tcp:listen(0, [{active,false}]),
     {ok, {_, PortNum}} = inet:sockname(LS),
@@ -3064,10 +2943,10 @@ otp_9389_loop(S, OrigLinkHdr, State) ->
             error({timeout,header})
     end.
 
-wrapping_oct(doc) ->
-    "Check that 64bit octet counters work."; 
-wrapping_oct(suite) ->
-    [];
+wrapping_oct() ->
+    [{timetrap,{minutes,10}}].
+
+%% Check that 64bit octet counters work.
 wrapping_oct(Config) when is_list(Config) ->
     {ok,Sock} = gen_tcp:listen(0,[{active,false},{mode,binary}]),
     {ok,Port} = inet:port(Sock),
@@ -3131,3 +3010,7 @@ oct_aloop(S,X,Times) ->
     end.
 
 ok({ok,V}) -> V.
+
+get_hostname(Name) ->
+    "@"++Host = lists:dropwhile(fun(C) -> C =/= $@ end, atom_to_list(Name)),
+    Host.
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index 8d8c953303..19cdc03603 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -17,17 +17,16 @@
 %% 
 %% %CopyrightEnd%
 %%
-%
-% test the behavior of gen_udp. Testing udp is really a very unfunny task,
-% because udp is not deterministic.
-%
--module(gen_udp_SUITE).
--include_lib("test_server/include/test_server.hrl").
 
+%%
+%% Test the behavior of gen_udp. Testing udp is really a very unfunny task,
+%% because udp is not deterministic.
+%%
+-module(gen_udp_SUITE).
+-include_lib("common_test/include/ct.hrl").
 
--define(default_timeout, ?t:minutes(1)).
 
-% XXX - we should pick a port that we _know_ is closed. That's pretty hard.
+%% 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, 
@@ -38,7 +37,9 @@
 	 buffer_size/1, binary_passive_recv/1, bad_address/1,
 	 read_packets/1, open_fd/1, connect/1, implicit_inet6/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [send_to_closed, buffer_size, binary_passive_recv,
@@ -62,28 +63,22 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
+    Config.
 
 end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %%-------------------------------------------------------------
 %% Send two packets to a closed port (on some systems this causes the socket
 %% to be closed).
 
-send_to_closed(doc) ->
-    ["Tests core functionality."];
-send_to_closed(suite) ->
-    [];
+%% Tests core functionality.
 send_to_closed(Config) when is_list(Config) ->
-    ?line {ok, Sock} = gen_udp:open(0),
-    ?line ok = gen_udp:send(Sock, {127,0,0,1}, ?CLOSED_PORT, "foo"),
+    {ok, Sock} = gen_udp:open(0),
+    ok = gen_udp:send(Sock, {127,0,0,1}, ?CLOSED_PORT, "foo"),
     timer:sleep(2),
-    ?line ok = gen_udp:send(Sock, {127,0,0,1}, ?CLOSED_PORT, "foo"),
-    ?line ok = gen_udp:close(Sock),
+    ok = gen_udp:send(Sock, {127,0,0,1}, ?CLOSED_PORT, "foo"),
+    ok = gen_udp:close(Sock),
     ok.
 
 
@@ -91,19 +86,16 @@ send_to_closed(Config) when is_list(Config) ->
 %%-------------------------------------------------------------
 %% Test that the UDP socket buffer sizes are settable
 
-buffer_size(suite) ->
-    [];
-buffer_size(doc) ->
-    ["Test UDP buffer size setting."];
+%% Test UDP buffer size setting.
 buffer_size(Config) when is_list(Config) ->
-    ?line Len = 256,
-    ?line Bin = list_to_binary(lists:seq(0, Len-1)),
-    ?line M = 8192 div Len,
-    ?line Spec0 =
+    Len = 256,
+    Bin = list_to_binary(lists:seq(0, Len-1)),
+    M = 8192 div Len,
+    Spec0 =
 	[{opt,M},{safe,M-3},{long,M+1},
 	 {opt,2*M},{safe,2*M-3},{long,2*M+1},
 	 {opt,4*M},{safe,4*M-3},{long,4*M+1}],
-    ?line Spec =
+    Spec =
 	[case Tag of
 	     opt ->
 		 [{recbuf,Val*Len},{sndbuf,(Val + 2)*Len}];
@@ -115,12 +107,12 @@ buffer_size(Config) when is_list(Config) ->
 		  [truncated,emsgsize,timeout]}
 	 end || {Tag,Val} <- Spec0],
     %%
-    ?line {ok, ClientSocket}  = gen_udp:open(0, [binary]),
-    ?line {ok, ClientPort} = inet:port(ClientSocket),
-    ?line Client = self(),
-    ?line ClientIP = {127,0,0,1},
-    ?line ServerIP = {127,0,0,1},
-    ?line Server =
+    {ok, ClientSocket}  = gen_udp:open(0, [binary]),
+    {ok, ClientPort} = inet:port(ClientSocket),
+    Client = self(),
+    ClientIP = {127,0,0,1},
+    ServerIP = {127,0,0,1},
+    Server =
 	spawn_link(
 	  fun () -> 
 		  {ok, ServerSocket}  = gen_udp:open(0, [binary]),
@@ -130,78 +122,77 @@ buffer_size(Config) when is_list(Config) ->
 				     ServerSocket, 1, Spec),
 		  ok = gen_udp:close(ServerSocket)
 	  end),
-    ?line Mref = erlang:monitor(process, Server),
-    ?line receive
-	      {Server,port,ServerPort} ->
-		  ?line buffer_size_client(Server, ServerIP, ServerPort,
-					   ClientSocket, 1, Spec)
-	  end,
-    ?line ok = gen_udp:close(ClientSocket),
-    ?line receive
-	      {'DOWN',Mref,_,_,normal} ->
-		  ?line ok
-	  end.
+    Mref = erlang:monitor(process, Server),
+    receive
+	{Server,port,ServerPort} ->
+	    buffer_size_client(Server, ServerIP, ServerPort,
+			       ClientSocket, 1, Spec)
+    end,
+    ok = gen_udp:close(ClientSocket),
+    receive
+	{'DOWN',Mref,_,_,normal} ->
+	    ok
+    end.
 
 buffer_size_client(_, _, _, _, _, []) ->
-    ?line ok;
+    ok;
 buffer_size_client(Server, IP, Port, 
 		   Socket, Cnt, [Opts|T]) when is_list(Opts) ->
-    ?line io:format("buffer_size_client Cnt=~w setopts ~p.~n", [Cnt,Opts]),
-    ?line ok = inet:setopts(Socket, Opts),
-    ?line Server ! {self(),setopts,Cnt},
-    ?line receive {Server,setopts,Cnt} -> ok end,
-    ?line buffer_size_client(Server, IP, Port, Socket, Cnt+1, T);
+    io:format("buffer_size_client Cnt=~w setopts ~p.~n", [Cnt,Opts]),
+    ok = inet:setopts(Socket, Opts),
+    Server ! {self(),setopts,Cnt},
+    receive {Server,setopts,Cnt} -> ok end,
+    buffer_size_client(Server, IP, Port, Socket, Cnt+1, T);
 buffer_size_client(Server, IP, Port, 
 		   Socket, Cnt, [{B,Replies}|T]=Opts) when is_binary(B) ->
-    ?line io:format(
-	    "buffer_size_client Cnt=~w send size ~w expecting ~p.~n",
-	    [Cnt,size(B),Replies]),
-    ?line ok = gen_udp:send(Socket, IP, Port, <<Cnt,B/binary>>),
-    ?line receive
-	      {Server,Cnt,Reply} ->
-		  ?line Tag =
-		      if
-			  is_tuple(Reply) ->
-			      element(1, Reply);
-			  is_atom(Reply) ->
-			      Reply
-		      end,
-		  ?line case lists:member(Tag, Replies) of
-			    true -> ok;
-			    false ->
-				?line 
-				    ?t:fail({reply_mismatch,Cnt,Reply,Replies,
-					     byte_size(B),
-					     inet:getopts(Socket,
-							  [sndbuf,recbuf])})
-			end,
-		  ?line buffer_size_client(Server, IP, Port, Socket, Cnt+1, T)
-	  after 1313 ->
-		  ?line buffer_size_client(Server, IP, Port, Socket, Cnt, Opts)
-	  end.
+    io:format(
+      "buffer_size_client Cnt=~w send size ~w expecting ~p.~n",
+      [Cnt,size(B),Replies]),
+    ok = gen_udp:send(Socket, IP, Port, <<Cnt,B/binary>>),
+    receive
+	{Server,Cnt,Reply} ->
+	    Tag =
+		if
+		    is_tuple(Reply) ->
+			element(1, Reply);
+		    is_atom(Reply) ->
+			Reply
+		end,
+	    case lists:member(Tag, Replies) of
+		true -> ok;
+		false ->
+		    ct:fail({reply_mismatch,Cnt,Reply,Replies,
+			     byte_size(B),
+			     inet:getopts(Socket,
+					  [sndbuf,recbuf])})
+	    end,
+	    buffer_size_client(Server, IP, Port, Socket, Cnt+1, T)
+    after 1313 ->
+	    buffer_size_client(Server, IP, Port, Socket, Cnt, Opts)
+    end.
 
 buffer_size_server(_, _, _, _, _, []) -> 
     ok;
 buffer_size_server(Client, IP, Port, 
 		   Socket, Cnt, [Opts|T]) when is_list(Opts) ->
     receive {Client,setopts,Cnt} -> ok end,
-    ?line io:format("buffer_size_server Cnt=~w setopts ~p.~n", [Cnt,Opts]),
+    io:format("buffer_size_server Cnt=~w setopts ~p.~n", [Cnt,Opts]),
     ok = inet:setopts(Socket, Opts),
     Client ! {self(),setopts,Cnt},
     buffer_size_server(Client, IP, Port, Socket, Cnt+1, T);
 buffer_size_server(Client, IP, Port, 
 		   Socket, Cnt, [{B,_}|T]) when is_binary(B) ->
-    ?line io:format(
-	    "buffer_size_server Cnt=~w expecting size ~w.~n",
-	    [Cnt,size(B)]),
+    io:format(
+      "buffer_size_server Cnt=~w expecting size ~w.~n",
+      [Cnt,size(B)]),
     Client ! 
 	{self(),Cnt,
 	 case buffer_size_server_recv(Socket, IP, Port, Cnt) of
 	     D when is_binary(D) ->
 		 SizeD = byte_size(D),
-		 ?line io:format(
-			 "buffer_size_server Cnt=~w received size ~w.~n",
-			 [Cnt,SizeD]),
+		 io:format(
+		   "buffer_size_server Cnt=~w received size ~w.~n",
+		   [Cnt,SizeD]),
 		 case B of
 		     D ->
 			 correct;
@@ -211,9 +202,9 @@ buffer_size_server(Client, IP, Port,
 			 {unexpected,D}
 		 end;
 	     Error ->
-		 ?line io:format(
-			 "buffer_size_server Cnt=~w received error ~w.~n",
-			 [Cnt,Error]),
+		 io:format(
+		   "buffer_size_server Cnt=~w received error ~w.~n",
+		   [Cnt,Error]),
 		 Error
 	 end},
     buffer_size_server(Client, IP, Port, Socket, Cnt+1, T).
@@ -236,50 +227,44 @@ buffer_size_server_recv(Socket, IP, Port, Cnt) ->
 %% OTP-3823 gen_udp:recv does not return address in binary mode
 %%
 
-binary_passive_recv(suite) ->
-    [];
-binary_passive_recv(doc) ->
-    ["OTP-3823 gen_udp:recv does not return address in binary mode"];
+%% OTP-3823 gen_udp:recv does not return address in binary mode.
 binary_passive_recv(Config) when is_list(Config) ->
-    ?line D1       = "The quick brown fox jumps over a lazy dog",
-    ?line D2       = list_to_binary(D1),
-    ?line D3       = ["The quick", <<" brown ">>, "fox jumps ", <<"over ">>,
-                      <<>>, $a, [[], " lazy ", <<"dog">>]],
-    ?line D2       = iolist_to_binary(D3),
-    ?line B        = D2,
-    ?line {ok, R}  = gen_udp:open(0, [binary, {active, false}]),
-    ?line {ok, RP} = inet:port(R),
-    ?line {ok, S}  = gen_udp:open(0),
-    ?line {ok, SP} = inet:port(S),
-    ?line ok       = gen_udp:send(S, localhost, RP, D1),
-    ?line {ok, {{127, 0, 0, 1}, SP, B}} = gen_udp:recv(R, byte_size(B)+1),
-    ?line ok       = gen_udp:send(S, localhost, RP, D2),
-    ?line {ok, {{127, 0, 0, 1}, SP, B}} = gen_udp:recv(R, byte_size(B)+1),
-    ?line ok       = gen_udp:send(S, localhost, RP, D3),
-    ?line {ok, {{127, 0, 0, 1}, SP, B}} = gen_udp:recv(R, byte_size(B)+1),
-    ?line ok       = gen_udp:close(S),
-    ?line ok       = gen_udp:close(R),
+    D1       = "The quick brown fox jumps over a lazy dog",
+    D2       = list_to_binary(D1),
+    D3       = ["The quick", <<" brown ">>, "fox jumps ", <<"over ">>,
+		<<>>, $a, [[], " lazy ", <<"dog">>]],
+    D2       = iolist_to_binary(D3),
+    B        = D2,
+    {ok, R}  = gen_udp:open(0, [binary, {active, false}]),
+    {ok, RP} = inet:port(R),
+    {ok, S}  = gen_udp:open(0),
+    {ok, SP} = inet:port(S),
+    ok       = gen_udp:send(S, localhost, RP, D1),
+    {ok, {{127, 0, 0, 1}, SP, B}} = gen_udp:recv(R, byte_size(B)+1),
+    ok       = gen_udp:send(S, localhost, RP, D2),
+    {ok, {{127, 0, 0, 1}, SP, B}} = gen_udp:recv(R, byte_size(B)+1),
+    ok       = gen_udp:send(S, localhost, RP, D3),
+    {ok, {{127, 0, 0, 1}, SP, B}} = gen_udp:recv(R, byte_size(B)+1),
+    ok       = gen_udp:close(S),
+    ok       = gen_udp:close(R),
     ok.
 
 
 %%-------------------------------------------------------------
 %% OTP-3836 inet_udp crashes when IP-address is larger than 255.
 
-bad_address(suite) ->
-    [];
-bad_address(doc) ->
-    ["OTP-3836 inet_udp crashes when IP-address is larger than 255."];
+%% OTP-3836 inet_udp crashes when IP-address is larger than 255.
 bad_address(Config) when is_list(Config) ->
-    ?line {ok, R}  = gen_udp:open(0),
-    ?line {ok, RP} = inet:port(R),
-    ?line {ok, S}  = gen_udp:open(0),
-    ?line {ok, _SP} = inet:port(S),
-    ?line {'EXIT', badarg} = 
+    {ok, R}  = gen_udp:open(0),
+    {ok, RP} = inet:port(R),
+    {ok, S}  = gen_udp:open(0),
+    {ok, _SP} = inet:port(S),
+    {'EXIT', badarg} =
 	(catch gen_udp:send(S, {127,0,0,1,0}, RP, "void")),
-    ?line {'EXIT', badarg} = 
+    {'EXIT', badarg} =
 	(catch gen_udp:send(S, {127,0,0,256}, RP, "void")),
-    ?line ok       = gen_udp:close(S),
-    ?line ok       = gen_udp:close(R),
+    ok       = gen_udp:close(S),
+    ok       = gen_udp:close(R),
     ok.
 
 
@@ -298,8 +283,7 @@ bad_address(Config) when is_list(Config) ->
 %% What happens on the SMP emulator remains to be seen...
 %%
 
-read_packets(doc) ->
-    ["OTP-6249 UDP option for number of packet reads."];
+%% OTP-6249 UDP option for number of packet reads.
 read_packets(Config) when is_list(Config) ->
     case erlang:system_info(smp_support) of
 	false ->
@@ -311,35 +295,35 @@ read_packets(Config) when is_list(Config) ->
     end.
 
 read_packets_1() ->
-    ?line N1 = 5,
-    ?line N2 = 7,
-    ?line {ok,R} = gen_udp:open(0, [{read_packets,N1}]),
-    ?line {ok,RP} = inet:port(R),
-    ?line {ok,Node} = start_node(gen_udp_SUITE_read_packets),
-    ?line Die = make_ref(),
-    ?line Loop = erlang:spawn_link(fun () -> infinite_loop(Die) end),
+    N1 = 5,
+    N2 = 7,
+    {ok,R} = gen_udp:open(0, [{read_packets,N1}]),
+    {ok,RP} = inet:port(R),
+    {ok,Node} = start_node(gen_udp_SUITE_read_packets),
+    Die = make_ref(),
+    Loop = erlang:spawn_link(fun () -> infinite_loop(Die) end),
     %%
-    ?line Msgs1 = [erlang:integer_to_list(M) || M <- lists:seq(1, N1*3)],
-    ?line [V1|_] = read_packets_test(R, RP, Msgs1, Node),
-    ?line {ok,[{read_packets,N1}]} = inet:getopts(R, [read_packets]),
+    Msgs1 = [erlang:integer_to_list(M) || M <- lists:seq(1, N1*3)],
+    [V1|_] = read_packets_test(R, RP, Msgs1, Node),
+    {ok,[{read_packets,N1}]} = inet:getopts(R, [read_packets]),
     %%
-    ?line ok = inet:setopts(R, [{read_packets,N2}]),
-    ?line Msgs2 = [erlang:integer_to_list(M) || M <- lists:seq(1, N2*3)],
-    ?line [V2|_] = read_packets_test(R, RP, Msgs2, Node),
-    ?line {ok,[{read_packets,N2}]} = inet:getopts(R, [read_packets]),
+    ok = inet:setopts(R, [{read_packets,N2}]),
+    Msgs2 = [erlang:integer_to_list(M) || M <- lists:seq(1, N2*3)],
+    [V2|_] = read_packets_test(R, RP, Msgs2, Node),
+    {ok,[{read_packets,N2}]} = inet:getopts(R, [read_packets]),
     %%
-    ?line stop_node(Node),
-    ?line Mref = erlang:monitor(process, Loop),
-    ?line Loop ! Die,
-    ?line receive
-	      {'DOWN',Mref,_,_, normal} ->
-		  case {V1,V2} of
-		      {N1,N2} ->
-			  ok;
-		      _ when V1 =/= N1, V2 =/= N2 ->
-			  ok
-		  end
-	  end.
+    stop_node(Node),
+    Mref = erlang:monitor(process, Loop),
+    Loop ! Die,
+    receive
+	{'DOWN',Mref,_,_, normal} ->
+	    case {V1,V2} of
+		{N1,N2} ->
+		    ok;
+		_ when V1 =/= N1, V2 =/= N2 ->
+		    ok
+	    end
+    end.
 
 infinite_loop(Die) ->
     receive 
@@ -407,21 +391,21 @@ read_packets_recv(N) ->
 
 read_packets_verify(R, SP, Msg, Trace) ->    
     lists:reverse(
-	  lists:sort(read_packets_verify(R, SP, Msg, Trace, 0))).
-    
+      lists:sort(read_packets_verify(R, SP, Msg, Trace, 0))).
+
 read_packets_verify(R, SP, Msgs, [{trace,Self,OutIn,_}|Trace], M) 
   when Self =:= self(), OutIn =:= out;
        Self =:= self(), OutIn =:= in ->
     push(M, read_packets_verify(R, SP, Msgs, Trace, 0));
 read_packets_verify(R, SP, [Msg|Msgs],
-		      [{trace,Self,'receive',{udp,R,{127,0,0,1},SP,Msg}}
-		       |Trace], M) 
+		    [{trace,Self,'receive',{udp,R,{127,0,0,1},SP,Msg}}
+		     |Trace], M)
   when Self =:= self() ->
     read_packets_verify(R, SP, Msgs, Trace, M+1);
 read_packets_verify(_R, _SP, [], [], M) ->
     push(M, []);
 read_packets_verify(_R, _SP, Msgs, Trace, M) ->
-    ?t:fail({read_packets_verify,mismatch,Msgs,Trace,M}).
+    ct:fail({read_packets_verify,mismatch,Msgs,Trace,M}).
 
 push(0, Vs) ->
     Vs;
@@ -438,10 +422,7 @@ flush() ->
 
 
 
-open_fd(suite) ->
-    [];
-open_fd(doc) ->
-    ["Test that the 'fd' option works"];
+%% Test that the 'fd' option works.
 open_fd(Config) when is_list(Config) ->
     Msg = "Det gör ont när knoppar brista. Varför skulle annars våren tveka?",
     Addr = {127,0,0,1},
@@ -460,10 +441,10 @@ open_fd(Config) when is_list(Config) ->
 		{udp,S3,Addr,P2,Msg} ->
 		    ok
 	    after 1000 ->
-		    ?t:fail(io_lib:format("~w", [flush()]))
+		    ct:fail(io_lib:format("~w", [flush()]))
 	    end
     after 1000 ->
-	    ?t:fail(io_lib:format("~w", [flush()]))
+	    ct:fail(io_lib:format("~w", [flush()]))
     end.
 
 active_n(Config) when is_list(Config) ->
@@ -569,88 +550,84 @@ active_n(Config) when is_list(Config) ->
     ok = gen_udp:close(S1),
     ok.
 
-%
-% Utils
-%
+%%
+%% Utils
+%%
+
 start_node(Name) ->
     Pa = filename:dirname(code:which(?MODULE)),
-    ?t:start_node(Name, slave, [{args, "-pa " ++ Pa}]).
+    test_server:start_node(Name, slave, [{args, "-pa " ++ Pa}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 
-connect(suite) ->
-    [];
-connect(doc) ->
-    ["Test that connect/3 has effect"];
+%% Test that connect/3 has effect.
 connect(Config) when is_list(Config) ->
-    ?line Addr = {127,0,0,1},
-    ?line {ok,S1} = gen_udp:open(0),
-    ?line {ok,P1} = inet:port(S1),
-    ?line {ok,S2} = gen_udp:open(0),
-    ?line ok = inet:setopts(S2, [{active,false}]),
-    ?line ok = gen_udp:close(S1),
-    ?line ok = gen_udp:connect(S2, Addr, P1),
-    ?line ok = gen_udp:send(S2, <<16#deadbeef:32>>),
-    ?line ok = case gen_udp:recv(S2, 0, 5) of
-        {error,econnrefused} -> ok;
-	{error,econnreset} -> ok;
-	Other -> Other
-    end,
+    Addr = {127,0,0,1},
+    {ok,S1} = gen_udp:open(0),
+    {ok,P1} = inet:port(S1),
+    {ok,S2} = gen_udp:open(0),
+    ok = inet:setopts(S2, [{active,false}]),
+    ok = gen_udp:close(S1),
+    ok = gen_udp:connect(S2, Addr, P1),
+    ok = gen_udp:send(S2, <<16#deadbeef:32>>),
+    ok = case gen_udp:recv(S2, 0, 5) of
+	     {error,econnrefused} -> ok;
+	     {error,econnreset} -> ok;
+	     Other -> Other
+	 end,
     ok.
 
 implicit_inet6(Config) when is_list(Config) ->
-    ?line Host = ok(inet:gethostname()),
-    ?line
-	case inet:getaddr(Host, inet6) of
-	    {ok,Addr} ->
-		?line implicit_inet6(Host, Addr);
-	    {error,Reason} ->
-		{skip,
-		 "Can not look up IPv6 address: "
-		 ++atom_to_list(Reason)}
-	end.
+    Host = ok(inet:gethostname()),
+    case inet:getaddr(Host, inet6) of
+	{ok,Addr} ->
+	    implicit_inet6(Host, Addr);
+	{error,Reason} ->
+	    {skip,
+	     "Can not look up IPv6 address: "
+	     ++atom_to_list(Reason)}
+    end.
 
 implicit_inet6(Host, Addr) ->
-    ?line Active = {active,false},
-    ?line
-	case gen_udp:open(0, [inet6,Active]) of
-	    {ok,S1} ->
-		?line Loopback = {0,0,0,0,0,0,0,1},
-		?line io:format("~s ~p~n", ["::1",Loopback]),
-		?line implicit_inet6(S1, Active, Loopback),
-		?line ok = gen_udp:close(S1),
-		%%
-		?line Localhost = "localhost",
-		?line Localaddr = ok(inet:getaddr(Localhost, inet6)),
-		?line io:format("~s ~p~n", [Localhost,Localaddr]),
-		?line S2 = ok(gen_udp:open(0, [{ip,Localaddr},Active])),
-		?line implicit_inet6(S2, Active, Localaddr),
-		?line ok = gen_udp:close(S2),
-		%%
-		?line io:format("~s ~p~n", [Host,Addr]),
-		?line S3 = ok(gen_udp:open(0, [{ifaddr,Addr},Active])),
-		?line implicit_inet6(S3, Active, Addr),
-		?line ok = gen_udp:close(S3);
-	    _ ->
-		{skip,"IPv6 not supported"}
-	end.
+    Active = {active,false},
+    case gen_udp:open(0, [inet6,Active]) of
+	{ok,S1} ->
+	    Loopback = {0,0,0,0,0,0,0,1},
+	    io:format("~s ~p~n", ["::1",Loopback]),
+	    implicit_inet6(S1, Active, Loopback),
+	    ok = gen_udp:close(S1),
+	    %%
+	    Localhost = "localhost",
+	    Localaddr = ok(inet:getaddr(Localhost, inet6)),
+	    io:format("~s ~p~n", [Localhost,Localaddr]),
+	    S2 = ok(gen_udp:open(0, [{ip,Localaddr},Active])),
+	    implicit_inet6(S2, Active, Localaddr),
+	    ok = gen_udp:close(S2),
+	    %%
+	    io:format("~s ~p~n", [Host,Addr]),
+	    S3 = ok(gen_udp:open(0, [{ifaddr,Addr},Active])),
+	    implicit_inet6(S3, Active, Addr),
+	    ok = gen_udp:close(S3);
+	_ ->
+	    {skip,"IPv6 not supported"}
+    end.
 
 implicit_inet6(S1, Active, Addr) ->
-    ?line P1 = ok(inet:port(S1)),
-    ?line S2 = ok(gen_udp:open(0, [inet6,Active])),
-    ?line P2 = ok(inet:port(S2)),
-    ?line ok = gen_udp:connect(S2, Addr, P1),
-    ?line ok = gen_udp:connect(S1, Addr, P2),
-    ?line {Addr,P2} = ok(inet:peername(S1)),
-    ?line {Addr,P1} = ok(inet:peername(S2)),
-    ?line {Addr,P1} = ok(inet:sockname(S1)),
-    ?line {Addr,P2} = ok(inet:sockname(S2)),
-    ?line ok = gen_udp:send(S1, Addr, P2, "ping"),
-    ?line {Addr,P1,"ping"} = ok(gen_udp:recv(S2, 1024, 1000)),
-    ?line ok = gen_udp:send(S2, Addr, P1, "pong"),
-    ?line {Addr,P2,"pong"} = ok(gen_udp:recv(S1, 1024)),
-    ?line ok = gen_udp:close(S2).
+    P1 = ok(inet:port(S1)),
+    S2 = ok(gen_udp:open(0, [inet6,Active])),
+    P2 = ok(inet:port(S2)),
+    ok = gen_udp:connect(S2, Addr, P1),
+    ok = gen_udp:connect(S1, Addr, P2),
+    {Addr,P2} = ok(inet:peername(S1)),
+    {Addr,P1} = ok(inet:peername(S2)),
+    {Addr,P1} = ok(inet:sockname(S1)),
+    {Addr,P2} = ok(inet:sockname(S2)),
+    ok = gen_udp:send(S1, Addr, P2, "ping"),
+    {Addr,P1,"ping"} = ok(gen_udp:recv(S2, 1024, 1000)),
+    ok = gen_udp:send(S2, Addr, P1, "pong"),
+    {Addr,P2,"pong"} = ok(gen_udp:recv(S1, 1024)),
+    ok = gen_udp:close(S2).
 
 ok({ok,V}) -> V.
diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl
index 73ee86eba4..dd4cf82d4a 100644
--- a/lib/kernel/test/global_SUITE.erl
+++ b/lib/kernel/test/global_SUITE.erl
@@ -19,8 +19,6 @@
 %%
 -module(global_SUITE).
 
-%-define(line_trace, 1).
-
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 init_per_suite/1, end_per_suite/1,
 	 names/1, names_hidden/1, locks/1, locks_hidden/1,
@@ -51,7 +49,7 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(NODES, [node()|nodes()]).
 
@@ -61,7 +59,8 @@
 -define(GLOBAL_LOCK, global).
 
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     case init:get_argument(ring_line) of
@@ -86,10 +85,10 @@ groups() ->
        ring]}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 init_per_suite(Config) ->
     Config.
@@ -99,9 +98,9 @@ end_per_suite(_Config) ->
 
 
 -define(TESTCASE, testcase_name).
--define(testcase, ?config(?TESTCASE, Config)).
+-define(testcase, proplists:get_value(?TESTCASE, Config)).
 -define(nodes_tag, '$global_nodes').
--define(registered, ?config(registered, Config)).
+-define(registered, proplists:get_value(registered, Config)).
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     ok = gen_server:call(global_name_server, high_level_trace_start,infinity),
@@ -115,16 +114,16 @@ init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
 
 end_per_testcase(_Case, Config) ->
     ct:log("Calling end_per_testcase!",[]),
-    ?line write_high_level_trace(Config),
-    ?line _ = 
+    write_high_level_trace(Config),
+    _ =
         gen_server:call(global_name_server, high_level_trace_stop, infinity),
     [global:unregister_name(N) || N <- global:registered_names()],
-    ?line InitRegistered = ?registered,
-    ?line Registered = registered(),
-    ?line [io:format("~s local names: ~p~n", [What, N]) ||
-              {What, N} <- [{"Added", Registered -- InitRegistered},
-                            {"Removed", InitRegistered -- Registered}],
-              N =/= []],
+    InitRegistered = ?registered,
+    Registered = registered(),
+    [io:format("~s local names: ~p~n", [What, N]) ||
+	{What, N} <- [{"Added", Registered -- InitRegistered},
+		      {"Removed", InitRegistered -- Registered}],
+	N =/= []],
 
     ok.
 
@@ -147,12 +146,11 @@ end_per_testcase(_Case, Config) ->
 %%% and releases the lock. Now the name should exist on both our own node
 %%% and on the slave node (we wait until that is true; it seems that we
 %%% can do rpc calls to another node before the connection is really up).
-register_1(suite) -> [];
 register_1(Config) when is_list(Config) ->
     Timeout = 15,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),
+    init_condition(Config),
     P = spawn_link(?MODULE, lock_global, [self(), Config]),
     receive
 	{P, ok} ->
@@ -161,7 +159,7 @@ register_1(Config) when is_list(Config) ->
     end,
     P ! step2,
     io:format("p1: sent step2~n"),
-    ?line yes = global:register_name(foo, self()),
+    yes = global:register_name(foo, self()),
     io:format("p1: registered~n"),
     P ! step3,
     receive
@@ -172,11 +170,11 @@ register_1(Config) when is_list(Config) ->
 	I =:= I2 ->
 	    ok;
 	true ->
-	    test_server:fail({notsync, I, I2})
+	    ct:fail({notsync, I, I2})
     end,
-    ?line _ = global:unregister_name(foo),
+    _ = global:unregister_name(foo),
     write_high_level_trace(Config),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
 lock_global(Parent, Config) ->
@@ -203,7 +201,7 @@ lock_global(Parent, Config) ->
     io:format("p2: received step3~n"),
     I = global:whereis_name(foo),
     io:format("p2: name ~p~n", [I]),
-    ?line ?UNTIL(I =:= rpc:call(N1, global, whereis_name, [foo])),
+    ?UNTIL(I =:= rpc:call(N1, global, whereis_name, [foo])),
     I2 = I,
     slave:stop(N1),
     io:format("p2: name2 ~p~n", [I2]),
@@ -216,75 +214,73 @@ lock_global(Parent, Config) ->
 %%% 'try_again_locker' would be called, and this time cause both 1 and 2
 %%% to obtain a lock for 'global' on node 3, which would keep the
 %%% name registry from ever becoming consistent again.
-both_known_1(suite) -> [];
 both_known_1(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),
+    init_condition(Config),
 
-    ?line OrigNames = global:registered_names(),
+    OrigNames = global:registered_names(),
 
-    ?line [Cp1, Cp2, Cp3] = start_nodes([cp1, cp2, cp3], slave, Config),
+    [Cp1, Cp2, Cp3] = start_nodes([cp1, cp2, cp3], slave, Config),
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
-    ?line rpc_disconnect_node(Cp1, Cp2, Config),
+    rpc_disconnect_node(Cp1, Cp2, Config),
 
-    ?line {_Pid1, yes} = rpc:call(Cp1, ?MODULE, start_proc, [p1]),
-    ?line {_Pid2, yes} = rpc:call(Cp2, ?MODULE, start_proc, [p2]),
+    {_Pid1, yes} = rpc:call(Cp1, ?MODULE, start_proc, [p1]),
+    {_Pid2, yes} = rpc:call(Cp2, ?MODULE, start_proc, [p2]),
 
-    ?line Names10 = rpc:call(Cp1, global, registered_names, []),
-    ?line Names20 = rpc:call(Cp2, global, registered_names, []),
-    ?line Names30 = rpc:call(Cp3, global, registered_names, []),
+    Names10 = rpc:call(Cp1, global, registered_names, []),
+    Names20 = rpc:call(Cp2, global, registered_names, []),
+    Names30 = rpc:call(Cp3, global, registered_names, []),
 
     Names1 = Names10 -- OrigNames,
     Names2 = Names20 -- OrigNames,
     Names3 = Names30 -- OrigNames,
 
-    ?line [p1] = lists:sort(Names1),
-    ?line [p2] = lists:sort(Names2),
-    ?line [p1, p2] = lists:sort(Names3),
+    [p1] = lists:sort(Names1),
+    [p2] = lists:sort(Names2),
+    [p1, p2] = lists:sort(Names3),
 
-    ?line Locker = spawn(Cp3, ?MODULE, lock_global2, [{global, l3},
-					     self()]),
+    Locker = spawn(Cp3, ?MODULE, lock_global2, [{global, l3},
+						self()]),
 
-    ?line receive
-	      {locked, S} ->
-		  true = S
-	  end,
+    receive
+	{locked, S} ->
+	    true = S
+    end,
 
-    ?line pong = rpc:call(Cp1, net_adm, ping, [Cp2]),
+    pong = rpc:call(Cp1, net_adm, ping, [Cp2]),
 
     %% Bring cp1 and cp2 together, while someone has locked global.
     %% They will now loop in 'loop_locker'.
 
-    ?line Names10_2 = rpc:call(Cp1, global, registered_names, []),
-    ?line Names20_2 = rpc:call(Cp2, global, registered_names, []),
-    ?line Names30_2 = rpc:call(Cp3, global, registered_names, []),
+    Names10_2 = rpc:call(Cp1, global, registered_names, []),
+    Names20_2 = rpc:call(Cp2, global, registered_names, []),
+    Names30_2 = rpc:call(Cp3, global, registered_names, []),
 
     Names1_2 = Names10_2 -- OrigNames,
     Names2_2 = Names20_2 -- OrigNames,
     Names3_2 = Names30_2 -- OrigNames,
 
-    ?line [p1] = lists:sort(Names1_2),
-    ?line [p2] = lists:sort(Names2_2),
-    ?line [p1, p2] = lists:sort(Names3_2),
+    [p1] = lists:sort(Names1_2),
+    [p2] = lists:sort(Names2_2),
+    [p1, p2] = lists:sort(Names3_2),
 
     %% Let go of the lock, and expect the lockers to resolve the name
     %% registry.
     Locker ! {ok, self()},
 
-    ?line 
     ?UNTIL(begin
-	       ?line Names10_3 = rpc:call(Cp1, global, registered_names, []),
-	       ?line Names20_3 = rpc:call(Cp2, global, registered_names, []),
-	       ?line Names30_3 = rpc:call(Cp3, global, registered_names, []),
-	       
+	       Names10_3 = rpc:call(Cp1, global, registered_names, []),
+	       Names20_3 = rpc:call(Cp2, global, registered_names, []),
+	       Names30_3 = rpc:call(Cp3, global, registered_names, []),
+
 	       Names1_3 = Names10_3 -- OrigNames,
 	       Names2_3 = Names20_3 -- OrigNames,
 	       Names3_3 = Names30_3 -- OrigNames,
-	       
+
 	       N1 = lists:sort(Names1_3),
 	       N2 = lists:sort(Names2_3),
 	       N3 = lists:sort(Names3_3),
@@ -296,51 +292,49 @@ both_known_1(Config) when is_list(Config) ->
     stop_node(Cp2),
     stop_node(Cp3),
 
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
-lost_unregister(suite) -> [];
-lost_unregister(doc) ->
-    ["OTP-6428. An unregistered name reappears."];
+%% OTP-6428. An unregistered name reappears.
 lost_unregister(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),
+    init_condition(Config),
 
-    ?line {ok, B} = start_node(b, Config),
-    ?line {ok, C} = start_node(c, Config),
+    {ok, B} = start_node(b, Config),
+    {ok, C} = start_node(c, Config),
     Nodes = [node(), B, C],
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
-    % start a proc and register it
-    ?line {Pid, yes} = start_proc(test),
+    %% start a proc and register it
+    {Pid, yes} = start_proc(test),
 
-    ?line ?UNTIL(Pid =:= global:whereis_name(test)),
-    ?line check_everywhere(Nodes, test, Config),
+    ?UNTIL(Pid =:= global:whereis_name(test)),
+    check_everywhere(Nodes, test, Config),
 
-    ?line rpc_disconnect_node(B, C, Config),
-    ?line check_everywhere(Nodes, test, Config),
-    ?line _ = rpc:call(B, global, unregister_name, [test]),
-    ?line ?UNTIL(undefined =:= global:whereis_name(test)),
-    ?line Pid = rpc:call(C, global, whereis_name, [test]),
-    ?line check_everywhere(Nodes--[C], test, Config),
-    ?line pong = rpc:call(B, net_adm, ping, [C]),
+    rpc_disconnect_node(B, C, Config),
+    check_everywhere(Nodes, test, Config),
+    _ = rpc:call(B, global, unregister_name, [test]),
+    ?UNTIL(undefined =:= global:whereis_name(test)),
+    Pid = rpc:call(C, global, whereis_name, [test]),
+    check_everywhere(Nodes--[C], test, Config),
+    pong = rpc:call(B, net_adm, ping, [C]),
 
     %% Now the name has reappeared on node B.
-    ?line ?UNTIL(Pid =:= global:whereis_name(test)),
-    ?line check_everywhere(Nodes, test, Config),
+    ?UNTIL(Pid =:= global:whereis_name(test)),
+    check_everywhere(Nodes, test, Config),
 
     exit_p(Pid),
 
-    ?line ?UNTIL(undefined =:= global:whereis_name(test)),
-    ?line check_everywhere(Nodes, test, Config),
+    ?UNTIL(undefined =:= global:whereis_name(test)),
+    check_everywhere(Nodes, test, Config),
 
     write_high_level_trace(Config),
     stop_node(B),
     stop_node(C),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
 -define(UNTIL_LOOP, 300).
@@ -350,7 +344,7 @@ lost_unregister(Config) when is_list(Config) ->
 init_high_level_trace(Time) ->
     Mul = try 
               test_server:timetrap_scale_factor()
-              catch _:_ -> 1 
+	  catch _:_ -> 1
           end,
     put(?end_tag, msec() + Time * Mul * 1000),
     %% Assures that started nodes start the high level trace automatically.
@@ -395,7 +389,7 @@ write_high_level_trace(Nodes, Config) ->
     %% 'info' returns more than the trace, which is nice.
     Data = [{Node, {info, rpc:call(Node, global, info, [])}} ||
                Node <- Nodes],
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     DataFile = filename:join([Dir, lists:concat(["global_", ?testcase])]),
     file:write_file(DataFile, term_to_binary({high_level_trace, When, Data})).
 
@@ -413,37 +407,35 @@ lock_global2(Id, Parent) ->
 %% erl -sname XXX -rsh ctrsh where XX not in [cp1, cp2, cp3]
 %%-----------------------------------------------------------------
 
-%cp1 - cp3 are started, and the name 'test' registered for a process on
-%test_server. Then it is checked that the name is registered on all
-%nodes, using whereis_name. Check that the same
-%name can't be registered with another value. Exit the registered
-%process and check that the name disappears. Register a new process
-%(Pid2) under the name 'test'. Let another new process (Pid3)
-%reregister itself under the same name. Test global:send/2. Test
-%unregister. Kill Pid3. Start a process (Pid6) on cp3,
-%register it as 'test', stop cp1 - cp3 and check that 'test' disappeared.
-%Kill Pid2 and check that 'test' isn't registered.
-
-names(suite) -> [];
+%% cp1 - cp3 are started, and the name 'test' registered for a process on
+%% test_server. Then it is checked that the name is registered on all
+%% nodes, using whereis_name. Check that the same
+%% name can't be registered with another value. Exit the registered
+%% process and check that the name disappears. Register a new process
+%% (Pid2) under the name 'test'. Let another new process (Pid3)
+%% reregister itself under the same name. Test global:send/2. Test
+%% unregister. Kill Pid3. Start a process (Pid6) on cp3,
+%% register it as 'test', stop cp1 - cp3 and check that 'test' disappeared.
+%% Kill Pid2 and check that 'test' isn't registered.
+
 names(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
-    ?line {ok, Cp1} = start_node(cp1, Config),
-    ?line {ok, Cp2} = start_node(cp2, Config),
-    ?line {ok, Cp3} = start_node(cp3, Config),
+    {ok, Cp1} = start_node(cp1, Config),
+    {ok, Cp2} = start_node(cp2, Config),
+    {ok, Cp3} = start_node(cp3, Config),
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
-    % start a proc and register it
-    ?line {Pid, yes} = start_proc(test),
+    %% start a proc and register it
+    {Pid, yes} = start_proc(test),
 
-    % test that it is registered at all nodes
-    ?line 
-    ?UNTIL(begin 
+    %% test that it is registered at all nodes
+        ?UNTIL(begin
             (Pid =:= global:whereis_name(test)) and
             (Pid =:= rpc:call(Cp1, global, whereis_name, [test])) and
             (Pid =:= rpc:call(Cp2, global, whereis_name, [test])) and
@@ -451,156 +443,148 @@ names(Config) when is_list(Config) ->
             ([test] =:= global:registered_names() -- OrigNames)
            end),
     
-    % try to register the same name
-    ?line no = global:register_name(test, self()),
-    ?line no = rpc:call(Cp1, global, register_name, [test, self()]),
+    %% try to register the same name
+    no = global:register_name(test, self()),
+    no = rpc:call(Cp1, global, register_name, [test, self()]),
     
-    % let process exit, check that it is unregistered automatically
+    %% let process exit, check that it is unregistered automatically
     exit_p(Pid),
 
-    ?line
-    ?UNTIL((undefined =:= global:whereis_name(test)) and
+        ?UNTIL((undefined =:= global:whereis_name(test)) and
            (undefined =:= rpc:call(Cp1, global, whereis_name, [test])) and
            (undefined =:= rpc:call(Cp2, global, whereis_name, [test])) and
            (undefined =:= rpc:call(Cp3, global, whereis_name, [test]))),
     
-    % test re_register
-    ?line {Pid2, yes} = start_proc(test),
-    ?line ?UNTIL(Pid2 =:= rpc:call(Cp3, global, whereis_name, [test])),
+    %% test re_register
+    {Pid2, yes} = start_proc(test),
+    ?UNTIL(Pid2 =:= rpc:call(Cp3, global, whereis_name, [test])),
     Pid3 = rpc:call(Cp3, ?MODULE, start_proc2, [test]),
-    ?line ?UNTIL(Pid3 =:= rpc:call(Cp3, global, whereis_name, [test])),
+    ?UNTIL(Pid3 =:= rpc:call(Cp3, global, whereis_name, [test])),
     Pid3 = global:whereis_name(test),
 
-    % test sending
+    %% test sending
     global:send(test, {ping, self()}),
     receive
 	{pong, Cp3} -> ok
     after
-	2000 -> test_server:fail(timeout1)
+	2000 -> ct:fail(timeout1)
     end,
 
     rpc:call(Cp1, global, send, [test, {ping, self()}]),
     receive
 	{pong, Cp3} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
 
-    ?line _ = global:unregister_name(test),
-    ?line
-    ?UNTIL((undefined =:= global:whereis_name(test)) and
+    _ = global:unregister_name(test),
+        ?UNTIL((undefined =:= global:whereis_name(test)) and
            (undefined =:= rpc:call(Cp1, global, whereis_name, [test])) and
            (undefined =:= rpc:call(Cp2, global, whereis_name, [test])) and
            (undefined =:= rpc:call(Cp3, global, whereis_name, [test]))),
 
     exit_p(Pid3),
 
-    ?line ?UNTIL(undefined =:= global:whereis_name(test)),
+    ?UNTIL(undefined =:= global:whereis_name(test)),
 
-    % register a proc
-    ?line {_Pid6, yes} = rpc:call(Cp3, ?MODULE, start_proc, [test]),
+    %% register a proc
+    {_Pid6, yes} = rpc:call(Cp3, ?MODULE, start_proc, [test]),
 
     write_high_level_trace(Config),
-    % stop the nodes, and make sure names are released.
+
+    %% stop the nodes, and make sure names are released.
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
 
-    ?line ?UNTIL(undefined =:= global:whereis_name(test)),
+    ?UNTIL(undefined =:= global:whereis_name(test)),
     exit_p(Pid2),
 
-    ?line ?UNTIL(undefined =:= global:whereis_name(test)),
-    ?line init_condition(Config),
+    ?UNTIL(undefined =:= global:whereis_name(test)),
+    init_condition(Config),
     ok.
 
-names_hidden(suite) -> [];
-names_hidden(doc) ->
-    ["Tests that names on a hidden node doesn't interfere with names on "
-     "visible nodes."];
+%% Tests that names on a hidden node doesn't interfere with names on
+%% visible nodes.
 names_hidden(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
-    ?line OrigNodes = nodes(),
-
-    ?line {ok, Cp1} = start_node(cp1, Config),
-    ?line {ok, Cp2} = start_node(cp2, Config),
-    ?line {ok, Cp3} = start_hidden_node(cp3, Config),
-    ?line pong = rpc:call(Cp1, net_adm, ping, [Cp3]),
-    ?line pong = rpc:call(Cp3, net_adm, ping, [Cp2]),
-    ?line pong = rpc:call(Cp3, net_adm, ping, [node()]),
-
-    ?line [] = [Cp1, Cp2 | OrigNodes] -- nodes(),
-
-    % start a proc on hidden node and register it
-    ?line {HPid, yes} = rpc:call(Cp3, ?MODULE, start_proc, [test]),
-    ?line Cp3 = node(HPid),
-
-    % Check that it didn't get registered on visible nodes
-    ?line
-    ?UNTIL((undefined =:= global:whereis_name(test)) and
+    init_condition(Config),
+    OrigNames = global:registered_names(),
+    OrigNodes = nodes(),
+
+    {ok, Cp1} = start_node(cp1, Config),
+    {ok, Cp2} = start_node(cp2, Config),
+    {ok, Cp3} = start_hidden_node(cp3, Config),
+    pong = rpc:call(Cp1, net_adm, ping, [Cp3]),
+    pong = rpc:call(Cp3, net_adm, ping, [Cp2]),
+    pong = rpc:call(Cp3, net_adm, ping, [node()]),
+
+    [] = [Cp1, Cp2 | OrigNodes] -- nodes(),
+
+    %% start a proc on hidden node and register it
+    {HPid, yes} = rpc:call(Cp3, ?MODULE, start_proc, [test]),
+    Cp3 = node(HPid),
+
+    %% Check that it didn't get registered on visible nodes
+        ?UNTIL((undefined =:= global:whereis_name(test)) and
            (undefined =:= rpc:call(Cp1, global, whereis_name, [test])) and
            (undefined =:= rpc:call(Cp2, global, whereis_name, [test]))),
 
-    % start a proc on visible node and register it
-    ?line {Pid, yes} = start_proc(test),
-    ?line true = (Pid =/= HPid),
+    %% start a proc on visible node and register it
+    {Pid, yes} = start_proc(test),
+    true = (Pid =/= HPid),
 
-    % test that it is registered at all nodes
-    ?line
-    ?UNTIL((Pid =:= global:whereis_name(test)) and
+    %% test that it is registered at all nodes
+        ?UNTIL((Pid =:= global:whereis_name(test)) and
            (Pid =:= rpc:call(Cp1, global, whereis_name, [test])) and
            (Pid =:= rpc:call(Cp2, global, whereis_name, [test])) and
            (HPid =:= rpc:call(Cp3, global, whereis_name, [test])) and
            ([test] =:= global:registered_names() -- OrigNames)),
     
-    % try to register the same name
-    ?line no = global:register_name(test, self()),
-    ?line no = rpc:call(Cp1, global, register_name, [test, self()]),
+    %% try to register the same name
+    no = global:register_name(test, self()),
+    no = rpc:call(Cp1, global, register_name, [test, self()]),
     
-    % let process exit, check that it is unregistered automatically
+    %% let process exit, check that it is unregistered automatically
     exit_p(Pid),
 
-    ?line 
-    ?UNTIL((undefined =:= global:whereis_name(test)) and
+        ?UNTIL((undefined =:= global:whereis_name(test)) and
            (undefined =:= rpc:call(Cp1, global, whereis_name, [test])) and
            (undefined =:= rpc:call(Cp2, global, whereis_name, [test])) and
            (HPid      =:= rpc:call(Cp3, global, whereis_name, [test]))),
     
-    % test re_register
-    ?line {Pid2, yes} = start_proc(test),
-    ?line ?UNTIL(Pid2 =:= rpc:call(Cp2, global, whereis_name, [test])),
+    %% test re_register
+    {Pid2, yes} = start_proc(test),
+    ?UNTIL(Pid2 =:= rpc:call(Cp2, global, whereis_name, [test])),
     Pid3 = rpc:call(Cp2, ?MODULE, start_proc2, [test]),
-    ?line ?UNTIL(Pid3 =:= rpc:call(Cp2, global, whereis_name, [test])),
-    ?line Pid3 = global:whereis_name(test),
+    ?UNTIL(Pid3 =:= rpc:call(Cp2, global, whereis_name, [test])),
+    Pid3 = global:whereis_name(test),
 
-    % test sending
-    ?line Pid3 = global:send(test, {ping, self()}),
+    %% test sending
+    Pid3 = global:send(test, {ping, self()}),
     receive
 	{pong, Cp2} -> ok
     after
-	2000 -> test_server:fail(timeout1)
+	2000 -> ct:fail(timeout1)
     end,
 
     rpc:call(Cp1, global, send, [test, {ping, self()}]),
     receive
 	{pong, Cp2} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
 
-    ?line _ = rpc:call(Cp3, global, unregister_name, [test]),
-    ?line
-    ?UNTIL((Pid3      =:= global:whereis_name(test)) and
+    _ = rpc:call(Cp3, global, unregister_name, [test]),
+        ?UNTIL((Pid3      =:= global:whereis_name(test)) and
            (Pid3      =:= rpc:call(Cp1, global, whereis_name, [test])) and
            (Pid3      =:= rpc:call(Cp2, global, whereis_name, [test])) and
            (undefined =:= rpc:call(Cp3, global, whereis_name, [test]))),
 
-    ?line _ = global:unregister_name(test),
-    ?line
-    ?UNTIL((undefined =:= global:whereis_name(test)) and
+    _ = global:unregister_name(test),
+        ?UNTIL((undefined =:= global:whereis_name(test)) and
            (undefined =:= rpc:call(Cp1, global, whereis_name, [test])) and
            (undefined =:= rpc:call(Cp2, global, whereis_name, [test])) and
            (undefined =:= rpc:call(Cp3, global, whereis_name, [test]))),
@@ -608,277 +592,297 @@ names_hidden(Config) when is_list(Config) ->
     exit_p(Pid3),
     exit_p(HPid),
 
-    ?line ?UNTIL(undefined =:= global:whereis_name(test)),
+    ?UNTIL(undefined =:= global:whereis_name(test)),
 
     write_high_level_trace(Config),
-    % stop the nodes, and make sure names are released.
+
+    %% stop the nodes, and make sure names are released.
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
 
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
-locks(suite) -> [];
 locks(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line {ok, Cp1} = start_node(cp1, Config),
-    ?line {ok, Cp2} = start_node(cp2, Config),
-    ?line {ok, Cp3} = start_node(cp3, Config),
-
-    ?line wait_for_ready_net(Config),
-
-    % start two procs
-    ?line Pid = start_proc(),
-    ?line Pid2 = rpc:call(Cp1, ?MODULE, start_proc, []),
-    % set a lock, and make sure noone else can set the same lock
-    ?line true = global:set_lock({test_lock, self()}, ?NODES, 1),
-    ?line false = req(Pid, {set_lock, test_lock, self()}),
-    ?line false = req(Pid2, {set_lock, test_lock, self()}),
-    % delete, and let another proc set the lock
+    init_condition(Config),
+    {ok, Cp1} = start_node(cp1, Config),
+    {ok, Cp2} = start_node(cp2, Config),
+    {ok, Cp3} = start_node(cp3, Config),
+
+    wait_for_ready_net(Config),
+
+    %% start two procs
+    Pid = start_proc(),
+    Pid2 = rpc:call(Cp1, ?MODULE, start_proc, []),
+
+    %% set a lock, and make sure noone else can set the same lock
+    true = global:set_lock({test_lock, self()}, ?NODES, 1),
+    false = req(Pid, {set_lock, test_lock, self()}),
+    false = req(Pid2, {set_lock, test_lock, self()}),
+
+    %% delete, and let another proc set the lock
     global:del_lock({test_lock, self()}),
-    ?line true = req(Pid, {set_lock, test_lock, self()}),
-    ?line false = req(Pid2, {set_lock, test_lock, self()}),
-    ?line false = global:set_lock({test_lock, self()}, ?NODES,1),
-    % kill lock-holding proc, make sure the lock is released
+    true = req(Pid, {set_lock, test_lock, self()}),
+    false = req(Pid2, {set_lock, test_lock, self()}),
+    false = global:set_lock({test_lock, self()}, ?NODES,1),
+
+    %% kill lock-holding proc, make sure the lock is released
     exit_p(Pid),
     ?UNTIL(true =:= global:set_lock({test_lock, self()}, ?NODES,1)),
     Pid2 ! {set_lock_loop, test_lock, self()},
-    % make sure we don't have the msg
+
+    %% make sure we don't have the msg
     receive
-	{got_lock, Pid2} -> test_server:fail(got_lock)
+	{got_lock, Pid2} -> ct:fail(got_lock)
     after
 	1000 -> ok
     end,
     global:del_lock({test_lock, self()}),
-    % make sure pid2 got the lock
+
+    %% make sure pid2 got the lock
     receive
 	{got_lock, Pid2} -> ok
     after
-	% 12000 >> 5000, which is the max time before a new retry for
-        % set_lock
-	12000 -> test_server:fail(got_lock2)
+	%% 12000 >> 5000, which is the max time before a new retry for
+        %% set_lock
+	12000 -> ct:fail(got_lock2)
     end,
 
-    % let proc set the same lock
-    ?line true = req(Pid2, {set_lock, test_lock, self()}),
-    % let proc set new lock
-    ?line true = req(Pid2, {set_lock, test_lock2, self()}),
-    ?line false = global:set_lock({test_lock, self()},?NODES,1),    
-    ?line false = global:set_lock({test_lock2, self()}, ?NODES,1),    
+    %% let proc set the same lock
+    true = req(Pid2, {set_lock, test_lock, self()}),
+
+    %% let proc set new lock
+    true = req(Pid2, {set_lock, test_lock2, self()}),
+    false = global:set_lock({test_lock, self()},?NODES,1),
+    false = global:set_lock({test_lock2, self()}, ?NODES,1),
     exit_p(Pid2),
-%    erlang:display({locks1, ets:tab2list(global_locks)}),
     ?UNTIL(true =:= global:set_lock({test_lock, self()}, ?NODES, 1)),
     ?UNTIL(true =:= global:set_lock({test_lock2, self()}, ?NODES, 1)),
-    ?line global:del_lock({test_lock, self()}),
-    ?line global:del_lock({test_lock2, self()}),
-
-    % let proc set two locks
-    ?line Pid3 = rpc:call(Cp1, ?MODULE, start_proc, []),
-    ?line true = req(Pid3, {set_lock, test_lock, self()}),
-    ?line true = req(Pid3, {set_lock, test_lock2, self()}),
-    % del one lock
-    ?line Pid3 ! {del_lock, test_lock2},
-    ?line test_server:sleep(100),
-    % check that one lock is still set, but not the other
-    ?line false = global:set_lock({test_lock, self()}, ?NODES, 1),    
-    ?line true = global:set_lock({test_lock2, self()}, ?NODES, 1),    
-    ?line global:del_lock({test_lock2, self()}),
-    % kill lock-holder
+    global:del_lock({test_lock, self()}),
+    global:del_lock({test_lock2, self()}),
+
+    %% let proc set two locks
+    Pid3 = rpc:call(Cp1, ?MODULE, start_proc, []),
+    true = req(Pid3, {set_lock, test_lock, self()}),
+    true = req(Pid3, {set_lock, test_lock2, self()}),
+
+    %% del one lock
+    Pid3 ! {del_lock, test_lock2},
+    ct:sleep(100),
+
+    %% check that one lock is still set, but not the other
+    false = global:set_lock({test_lock, self()}, ?NODES, 1),
+    true = global:set_lock({test_lock2, self()}, ?NODES, 1),
+    global:del_lock({test_lock2, self()}),
+
+    %% kill lock-holder
     exit_p(Pid3),
-%    erlang:display({locks2, ets:tab2list(global_locks)}),
+
     ?UNTIL(true =:= global:set_lock({test_lock, self()}, ?NODES, 1)),
-    ?line global:del_lock({test_lock, self()}),
+    global:del_lock({test_lock, self()}),
     ?UNTIL(true =:= global:set_lock({test_lock2, self()}, ?NODES, 1)),
-    ?line global:del_lock({test_lock2, self()}),
-
-    % start one proc on each node
-    ?line Pid4 = start_proc(),
-    ?line Pid5 = rpc:call(Cp1, ?MODULE, start_proc, []),
-    ?line Pid6 = rpc:call(Cp2, ?MODULE, start_proc, []),
-    ?line Pid7 = rpc:call(Cp3, ?MODULE, start_proc, []),
-    % set lock on two nodes
-    ?line true = req(Pid4, {set_lock, test_lock, self(), [node(), Cp1]}),
-    ?line false = req(Pid5, {set_lock, test_lock, self(), [node(), Cp1]}),
-    % set same lock on other two nodes
-    ?line true = req(Pid6, {set_lock, test_lock, self(), [Cp2, Cp3]}),
-    ?line false = req(Pid7, {set_lock, test_lock, self(), [Cp2, Cp3]}),
-    % release lock
+    global:del_lock({test_lock2, self()}),
+
+    %% start one proc on each node
+    Pid4 = start_proc(),
+    Pid5 = rpc:call(Cp1, ?MODULE, start_proc, []),
+    Pid6 = rpc:call(Cp2, ?MODULE, start_proc, []),
+    Pid7 = rpc:call(Cp3, ?MODULE, start_proc, []),
+
+    %% set lock on two nodes
+    true = req(Pid4, {set_lock, test_lock, self(), [node(), Cp1]}),
+    false = req(Pid5, {set_lock, test_lock, self(), [node(), Cp1]}),
+
+    %% set same lock on other two nodes
+    true = req(Pid6, {set_lock, test_lock, self(), [Cp2, Cp3]}),
+    false = req(Pid7, {set_lock, test_lock, self(), [Cp2, Cp3]}),
+
+    %% release lock
     Pid6 ! {del_lock, test_lock, [Cp2, Cp3]},
-    % try to set lock on a node that already has the lock
-    ?line false = req(Pid6, {set_lock, test_lock, self(), [Cp1, Cp2, Cp3]}),
 
-    % set lock on a node
+    %% try to set lock on a node that already has the lock
+    false = req(Pid6, {set_lock, test_lock, self(), [Cp1, Cp2, Cp3]}),
+
+    %% set lock on a node
     exit_p(Pid4),
     ?UNTIL(true =:= req(Pid5, {set_lock, test_lock, self(), [node(), Cp1]})),
-    ?line Pid8 = start_proc(),
-    ?line false = req(Pid8, {set_lock, test_lock, self()}),
+    Pid8 = start_proc(),
+    false = req(Pid8, {set_lock, test_lock, self()}),
     write_high_level_trace(Config),
-    % stop the nodes, and make sure locks are released.
+
+    %% stop the nodes, and make sure locks are released.
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
-    ?line test_server:sleep(100),
-    ?line true = req(Pid8, {set_lock, test_lock, self()}),
+    ct:sleep(100),
+    true = req(Pid8, {set_lock, test_lock, self()}),
     exit_p(Pid8),
-    ?line test_server:sleep(10),
+    ct:sleep(10),
 
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
-    
 
-locks_hidden(suite) -> [];
-locks_hidden(doc) ->
-    ["Tests that locks on a hidden node doesn't interere with locks on "
-     "visible nodes."];
+
+%% Tests that locks on a hidden node doesn't interere with locks on
+%% visible nodes.
 locks_hidden(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNodes = nodes(),
-    ?line {ok, Cp1} = start_node(cp1, Config),
-    ?line {ok, Cp2} = start_node(cp2, Config),
-    ?line {ok, Cp3} = start_hidden_node(cp3, Config),
-    ?line pong = rpc:call(Cp1, net_adm, ping, [Cp3]),
-    ?line pong = rpc:call(Cp3, net_adm, ping, [Cp2]),
-    ?line pong = rpc:call(Cp3, net_adm, ping, [node()]),
-
-    ?line [] = [Cp1, Cp2 | OrigNodes] -- nodes(),
-
-    % start two procs
-    ?line Pid = start_proc(),
-    ?line Pid2 = rpc:call(Cp1, ?MODULE, start_proc, []),
-    ?line HPid = rpc:call(Cp3, ?MODULE, start_proc, []),
-    % Make sure hidden node doesn't interfere with visible nodes lock
-    ?line true = req(HPid, {set_lock, test_lock, self()}), 
-    ?line true = global:set_lock({test_lock, self()}, ?NODES, 1),
-    ?line false = req(Pid, {set_lock, test_lock, self()}),
-    ?line true = req(HPid, {del_lock_sync, test_lock, self()}),     
-    ?line false = req(Pid2, {set_lock, test_lock, self()}),
-    % delete, and let another proc set the lock
+    init_condition(Config),
+    OrigNodes = nodes(),
+    {ok, Cp1} = start_node(cp1, Config),
+    {ok, Cp2} = start_node(cp2, Config),
+    {ok, Cp3} = start_hidden_node(cp3, Config),
+    pong = rpc:call(Cp1, net_adm, ping, [Cp3]),
+    pong = rpc:call(Cp3, net_adm, ping, [Cp2]),
+    pong = rpc:call(Cp3, net_adm, ping, [node()]),
+
+    [] = [Cp1, Cp2 | OrigNodes] -- nodes(),
+
+    %% start two procs
+    Pid = start_proc(),
+    Pid2 = rpc:call(Cp1, ?MODULE, start_proc, []),
+    HPid = rpc:call(Cp3, ?MODULE, start_proc, []),
+
+    %% Make sure hidden node doesn't interfere with visible nodes lock
+    true = req(HPid, {set_lock, test_lock, self()}),
+    true = global:set_lock({test_lock, self()}, ?NODES, 1),
+    false = req(Pid, {set_lock, test_lock, self()}),
+    true = req(HPid, {del_lock_sync, test_lock, self()}),
+    false = req(Pid2, {set_lock, test_lock, self()}),
+
+    %% delete, and let another proc set the lock
     global:del_lock({test_lock, self()}),
-    ?line true = req(Pid, {set_lock, test_lock, self()}),
-    ?line false = req(Pid2, {set_lock, test_lock, self()}),
-    ?line false = global:set_lock({test_lock, self()}, ?NODES,1),
-    % kill lock-holding proc, make sure the lock is released
+    true = req(Pid, {set_lock, test_lock, self()}),
+    false = req(Pid2, {set_lock, test_lock, self()}),
+    false = global:set_lock({test_lock, self()}, ?NODES,1),
+
+    %% kill lock-holding proc, make sure the lock is released
     exit_p(Pid),
     ?UNTIL(true =:= global:set_lock({test_lock, self()}, ?NODES, 1)),
     ?UNTIL(true =:= req(HPid, {set_lock, test_lock, self()})),
     Pid2 ! {set_lock_loop, test_lock, self()},
-    % make sure we don't have the msg
+
+    %% make sure we don't have the msg
     receive
-	{got_lock, Pid2} -> test_server:fail(got_lock)
+	{got_lock, Pid2} -> ct:fail(got_lock)
     after
 	1000 -> ok
     end,
     global:del_lock({test_lock, self()}),
-    % make sure pid2 got the lock
+
+    %% make sure pid2 got the lock
     receive
 	{got_lock, Pid2} -> ok
     after
-	% 12000 >> 5000, which is the max time before a new retry for
-        % set_lock
-	12000 -> test_server:fail(got_lock2)
+	%% 12000 >> 5000, which is the max time before a new retry for
+        %% set_lock
+	12000 -> ct:fail(got_lock2)
     end,
-    ?line true = req(HPid, {del_lock_sync, test_lock, self()}),     
-
-    % let proc set the same lock
-    ?line true = req(Pid2, {set_lock, test_lock, self()}),
-    % let proc set new lock
-    ?line true = req(Pid2, {set_lock, test_lock2, self()}),
-    ?line true = req(HPid, {set_lock, test_lock, self()}), 
-    ?line true = req(HPid, {set_lock, test_lock2, self()}), 
+    true = req(HPid, {del_lock_sync, test_lock, self()}),
+
+    %% let proc set the same lock
+    true = req(Pid2, {set_lock, test_lock, self()}),
+
+    %% let proc set new lock
+    true = req(Pid2, {set_lock, test_lock2, self()}),
+    true = req(HPid, {set_lock, test_lock, self()}),
+    true = req(HPid, {set_lock, test_lock2, self()}),
     exit_p(HPid),
-    ?line false = global:set_lock({test_lock, self()},?NODES,1),    
-    ?line false = global:set_lock({test_lock2, self()}, ?NODES,1),    
+    false = global:set_lock({test_lock, self()},?NODES,1),
+    false = global:set_lock({test_lock2, self()}, ?NODES,1),
+
     exit_p(Pid2),
-%    erlang:display({locks1, ets:tab2list(global_locks)}),
     ?UNTIL(true =:= global:set_lock({test_lock, self()}, ?NODES, 1)),
     ?UNTIL(true =:= global:set_lock({test_lock2, self()}, ?NODES, 1)),
-    ?line global:del_lock({test_lock, self()}),
-    ?line global:del_lock({test_lock2, self()}),
+    global:del_lock({test_lock, self()}),
+    global:del_lock({test_lock2, self()}),
 
     write_high_level_trace(Config),
-    % stop the nodes, and make sure locks are released.
+
+    %% stop the nodes, and make sure locks are released.
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
 
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
-    
 
-bad_input(suite) -> [];
+
 bad_input(Config) when is_list(Config) ->
     Timeout = 15,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
+    init_condition(Config),
     Pid = whereis(global_name_server),
-    ?line {'EXIT', _} = (catch global:set_lock(bad_id)),
-    ?line {'EXIT', _} = (catch global:set_lock({id, self()}, bad_nodes)),
-    ?line {'EXIT', _} = (catch global:del_lock(bad_id)),
-    ?line {'EXIT', _} = (catch global:del_lock({id, self()}, bad_nodes)),
-    ?line {'EXIT', _} = (catch global:register_name(name, bad_pid)),
-    ?line {'EXIT', _} = (catch global:reregister_name(name, bad_pid)),
-    ?line {'EXIT', _} = (catch global:trans(bad_id, {m,f})),
-    ?line {'EXIT', _} = (catch global:trans({id, self()}, {m,f}, [node()], -1)),
-    ?line Pid = whereis(global_name_server),
-    ?line init_condition(Config),
+    {'EXIT', _} = (catch global:set_lock(bad_id)),
+    {'EXIT', _} = (catch global:set_lock({id, self()}, bad_nodes)),
+    {'EXIT', _} = (catch global:del_lock(bad_id)),
+    {'EXIT', _} = (catch global:del_lock({id, self()}, bad_nodes)),
+    {'EXIT', _} = (catch global:register_name(name, bad_pid)),
+    {'EXIT', _} = (catch global:reregister_name(name, bad_pid)),
+    {'EXIT', _} = (catch global:trans(bad_id, {m,f})),
+    {'EXIT', _} = (catch global:trans({id, self()}, {m,f}, [node()], -1)),
+    Pid = whereis(global_name_server),
+    init_condition(Config),
     ok.
 
-names_and_locks(suite) -> [];
 names_and_locks(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
-
-    ?line {ok, Cp1} = start_node(cp1, Config),
-    ?line {ok, Cp2} = start_node(cp2, Config),
-    ?line {ok, Cp3} = start_node(cp3, Config),
-
-    % start one proc on each node
-    ?line PidTS = start_proc(),
-    ?line Pid1 = rpc:call(Cp1, ?MODULE, start_proc, []),
-    ?line Pid2 = rpc:call(Cp2, ?MODULE, start_proc, []),
-    ?line Pid3 = rpc:call(Cp3, ?MODULE, start_proc, []),
-    % register some of them
-    ?line yes = global:register_name(test1, Pid1),
-    ?line yes = global:register_name(test2, Pid2),
-    ?line yes = global:register_name(test3, Pid3),
-    ?line no = global:register_name(test3, PidTS),
-    ?line yes = global:register_name(test4, PidTS),
-    
-    % set lock on two nodes
-    ?line true = req(PidTS, {set_lock, test_lock, self(), [node(), Cp1]}),
-    ?line false = req(Pid1, {set_lock, test_lock, self(), [node(), Cp1]}),
-    % set same lock on other two nodes
-    ?line true = req(Pid2, {set_lock, test_lock, self(), [Cp2, Cp3]}),
-    ?line false = req(Pid3, {set_lock, test_lock, self(), [Cp2, Cp3]}),
-    % release lock
+    init_condition(Config),
+    OrigNames = global:registered_names(),
+
+    {ok, Cp1} = start_node(cp1, Config),
+    {ok, Cp2} = start_node(cp2, Config),
+    {ok, Cp3} = start_node(cp3, Config),
+
+    %% start one proc on each node
+    PidTS = start_proc(),
+    Pid1 = rpc:call(Cp1, ?MODULE, start_proc, []),
+    Pid2 = rpc:call(Cp2, ?MODULE, start_proc, []),
+    Pid3 = rpc:call(Cp3, ?MODULE, start_proc, []),
+
+    %% register some of them
+    yes = global:register_name(test1, Pid1),
+    yes = global:register_name(test2, Pid2),
+    yes = global:register_name(test3, Pid3),
+    no = global:register_name(test3, PidTS),
+    yes = global:register_name(test4, PidTS),
+
+    %% set lock on two nodes
+    true = req(PidTS, {set_lock, test_lock, self(), [node(), Cp1]}),
+    false = req(Pid1, {set_lock, test_lock, self(), [node(), Cp1]}),
+
+    %% set same lock on other two nodes
+    true = req(Pid2, {set_lock, test_lock, self(), [Cp2, Cp3]}),
+    false = req(Pid3, {set_lock, test_lock, self(), [Cp2, Cp3]}),
+
+    %% release lock
     Pid2 ! {del_lock, test_lock, [Cp2, Cp3]},
-    ?line test_server:sleep(100),
-    % try to set lock on a node that already has the lock
-    ?line false = req(Pid2, {set_lock, test_lock, self(), [Cp1, Cp2, Cp3]}),
-    % set two locks
-    ?line true = req(Pid2, {set_lock, test_lock, self(), [Cp2, Cp3]}),
-    ?line true = req(Pid2, {set_lock, test_lock2, self(), [Cp2, Cp3]}),
-
-    % kill some processes, make sure all locks/names are released
+    ct:sleep(100),
+
+    %% try to set lock on a node that already has the lock
+    false = req(Pid2, {set_lock, test_lock, self(), [Cp1, Cp2, Cp3]}),
+
+    %% set two locks
+    true = req(Pid2, {set_lock, test_lock, self(), [Cp2, Cp3]}),
+    true = req(Pid2, {set_lock, test_lock2, self(), [Cp2, Cp3]}),
+
+    %% kill some processes, make sure all locks/names are released
     exit_p(PidTS),
-    ?line ?UNTIL(undefined =:= global:whereis_name(test4)),
-    ?line true = global:set_lock({test_lock, self()}, [node(), Cp1], 1),    
+    ?UNTIL(undefined =:= global:whereis_name(test4)),
+    true = global:set_lock({test_lock, self()}, [node(), Cp1], 1),
     global:del_lock({test_lock, self()}, [node(), Cp1]),
     
     exit_p(Pid2),
-    ?line
-    ?UNTIL((undefined =:= global:whereis_name(test2)) and
+        ?UNTIL((undefined =:= global:whereis_name(test2)) and
            (true =:= global:set_lock({test_lock, self()}, [Cp2, Cp3], 1)) and
            (true =:= global:set_lock({test_lock2, self()}, [Cp2, Cp3], 1))),
 
@@ -888,117 +892,113 @@ names_and_locks(Config) when is_list(Config) ->
     exit_p(Pid1),
     exit_p(Pid3),
 
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+    ?UNTIL(OrigNames =:= global:registered_names()),
 
     write_high_level_trace(Config),
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
 
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
-    
-lock_die(suite) -> [];
-lock_die(doc) ->
-    ["OTP-6341. Remove locks using monitors."];
+
+%% OTP-6341. Remove locks using monitors.
 lock_die(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
-    ?line {ok, Cp1} = start_node(cp1, Config),
-    ?line {ok, Cp2} = start_node(cp2, Config),
+    {ok, Cp1} = start_node(cp1, Config),
+    {ok, Cp2} = start_node(cp2, Config),
 
     %% First test.
     LockId = {id, self()},
-    ?line Pid2 = start_proc(),
-    ?line true = req(Pid2, {set_lock2, LockId, self()}),
+    Pid2 = start_proc(),
+    true = req(Pid2, {set_lock2, LockId, self()}),
 
-    ?line true = global:set_lock(LockId, [Cp1]),
+    true = global:set_lock(LockId, [Cp1]),
     %% Id is locked on Cp1 and Cp2 (by Pid2) but not by self(): 
     %% (there is no mon. ref)
-    ?line _ = global:del_lock(LockId, [node(), Cp1, Cp2]),
+    _ = global:del_lock(LockId, [node(), Cp1, Cp2]),
+
+    exit_p(Pid2),
 
-    ?line exit_p(Pid2),
-    
     %% Second test.
-    ?line Pid3 = start_proc(),
-    ?line true = req(Pid3, {set_lock, id, self(), [Cp1]}),
+    Pid3 = start_proc(),
+    true = req(Pid3, {set_lock, id, self(), [Cp1]}),
     %% The lock is removed from Cp1 thanks to monitors.
-    ?line exit_p(Pid3),
-    
-    ?line true = global:set_lock(LockId, [node(), Cp1]),
-    ?line _ = global:del_lock(LockId, [node(), Cp1]),
+    exit_p(Pid3),
+
+    true = global:set_lock(LockId, [node(), Cp1]),
+    _ = global:del_lock(LockId, [node(), Cp1]),
 
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+    ?UNTIL(OrigNames =:= global:registered_names()),
     write_high_level_trace(Config),
     stop_node(Cp1),
     stop_node(Cp2),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
-name_die(suite) -> [];
-name_die(doc) ->
-    ["OTP-6341. Remove names using monitors."];
+%% OTP-6341. Remove names using monitors.
 name_die(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
-    ?line [Cp1] = Cps = start_nodes([z], peer,  Config), % z > test_server
+    init_condition(Config),
+    OrigNames = global:registered_names(),
+    [Cp1] = Cps = start_nodes([z], peer,  Config), % z > test_server
     Nodes = lists:sort([node() | Cps]),
-    ?line wait_for_ready_net(Config),
-    
+    wait_for_ready_net(Config),
+
     Name = name_die,
-    ?line Pid = rpc:call(Cp1, ?MODULE, start_proc, []),
+    Pid = rpc:call(Cp1, ?MODULE, start_proc, []),
 
     %% Test 1. No resolver is called if the same pid is registered on
     %% both partitions.
     T1 = node(),
     Part1 = [T1],
     Part2 = [Cp1],
-    ?line rpc_cast(Cp1, 
-                   ?MODULE, part_2_2, [Config,
-                                       Part1, 
-                                       Part2, 
-                                       []]),
-    ?line ?UNTIL(is_ready_partition(Config)),
-    ?line ?UNTIL(undefined =:= global:whereis_name(Name)),
-    ?line yes = global:register_name(Name, Pid),
-
-    ?line pong = net_adm:ping(Cp1),
-    ?line wait_for_ready_net(Nodes, Config),
-    ?line assert_pid(global:whereis_name(Name)),
+    rpc_cast(Cp1,
+	     ?MODULE, part_2_2, [Config,
+				 Part1,
+				 Part2,
+				 []]),
+    ?UNTIL(is_ready_partition(Config)),
+    ?UNTIL(undefined =:= global:whereis_name(Name)),
+    yes = global:register_name(Name, Pid),
+
+    pong = net_adm:ping(Cp1),
+    wait_for_ready_net(Nodes, Config),
+    assert_pid(global:whereis_name(Name)),
     exit_p(Pid),
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+    ?UNTIL(OrigNames =:= global:registered_names()),
 
     %% Test 2. Register a name running outside the current partition.
     %% Killing the pid will not remove the name from the current
     %% partition, unless monitors are used.
-    ?line Pid2 = rpc:call(Cp1, ?MODULE, start_proc, []),
-    Dir = ?config(priv_dir, Config),
+    Pid2 = rpc:call(Cp1, ?MODULE, start_proc, []),
+    Dir = proplists:get_value(priv_dir, Config),
     KillFile = filename:join([Dir, "kill.txt"]),
     file:delete(KillFile),
-    ?line erlang:spawn(Cp1, fun() -> kill_pid(Pid2, KillFile, Config) end),
-    ?line rpc_cast(Cp1, 
-                   ?MODULE, part_2_2, [Config,
-                                       Part1, 
-                                       Part2, 
-                                       []]),
-    ?line ?UNTIL(is_ready_partition(Config)),
-    ?line ?UNTIL(undefined =:= global:whereis_name(Name)),
-    ?line yes = global:register_name(Name, Pid2),
-    ?line touch(KillFile, "kill"),    
-    ?line file_contents(KillFile, "done", Config),
+    erlang:spawn(Cp1, fun() -> kill_pid(Pid2, KillFile, Config) end),
+    rpc_cast(Cp1,
+	     ?MODULE, part_2_2, [Config,
+				 Part1,
+				 Part2,
+				 []]),
+    ?UNTIL(is_ready_partition(Config)),
+    ?UNTIL(undefined =:= global:whereis_name(Name)),
+    yes = global:register_name(Name, Pid2),
+    touch(KillFile, "kill"),
+    file_contents(KillFile, "done", Config),
     file:delete(KillFile),
 
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+    ?UNTIL(OrigNames =:= global:registered_names()),
     write_high_level_trace(Config),
     stop_nodes(Cps),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
 kill_pid(Pid, File, Config) ->
@@ -1006,186 +1006,178 @@ kill_pid(Pid, File, Config) ->
     exit_p(Pid),
     touch(File, "done").
 
-basic_partition(suite) -> [];
-basic_partition(doc) ->
-    ["Tests that two partitioned networks exchange correct info."];
+%% Tests that two partitioned networks exchange correct info.
 basic_partition(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
-
-    ?line [Cp1, Cp2, Cp3] = start_nodes([cp1, cp2, cp3], peer, Config),
-    ?line [Cp1, Cp2, Cp3] = lists:sort(nodes()),
-
-    ?line wait_for_ready_net(Config),
-
-    % make cp2 and cp3 connected, partitioned from us and cp1
-    ?line rpc_cast(Cp2, ?MODULE, part1, [Config, node(), Cp1, Cp3]),
-    ?line ?UNTIL(is_ready_partition(Config)),
-   
-    % start different processes in both partitions
-    ?line {Pid, yes} = start_proc(test),
-
-    % connect to other partition
-    ?line pong = net_adm:ping(Cp2),
-    ?line pong = net_adm:ping(Cp3),
-    ?line [Cp1, Cp2, Cp3] = lists:sort(nodes()),
-    
-    % check names
-    ?line ?UNTIL(Pid =:= rpc:call(Cp2, global, whereis_name, [test])),
-    ?line ?UNTIL(undefined =/= global:whereis_name(test2)),
-    ?line Pid2 = global:whereis_name(test2),
-    ?line Pid2 = rpc:call(Cp2, global, whereis_name, [test2]),
-    ?line assert_pid(Pid2),
-    ?line Pid3 = global:whereis_name(test4),
-    ?line ?UNTIL(Pid3 =:= rpc:call(Cp1, global, whereis_name, [test4])),
-    ?line assert_pid(Pid3),
-
-    % kill all procs
-    ?line Pid3 = global:send(test4, die),
-    % sleep to let the proc die
+    init_condition(Config),
+    OrigNames = global:registered_names(),
+
+    [Cp1, Cp2, Cp3] = start_nodes([cp1, cp2, cp3], peer, Config),
+    [Cp1, Cp2, Cp3] = lists:sort(nodes()),
+
+    wait_for_ready_net(Config),
+
+    %% make cp2 and cp3 connected, partitioned from us and cp1
+    rpc_cast(Cp2, ?MODULE, part1, [Config, node(), Cp1, Cp3]),
+    ?UNTIL(is_ready_partition(Config)),
+
+    %% start different processes in both partitions
+    {Pid, yes} = start_proc(test),
+
+    %% connect to other partition
+    pong = net_adm:ping(Cp2),
+    pong = net_adm:ping(Cp3),
+    [Cp1, Cp2, Cp3] = lists:sort(nodes()),
+
+    %% check names
+    ?UNTIL(Pid =:= rpc:call(Cp2, global, whereis_name, [test])),
+    ?UNTIL(undefined =/= global:whereis_name(test2)),
+    Pid2 = global:whereis_name(test2),
+    Pid2 = rpc:call(Cp2, global, whereis_name, [test2]),
+    assert_pid(Pid2),
+    Pid3 = global:whereis_name(test4),
+    ?UNTIL(Pid3 =:= rpc:call(Cp1, global, whereis_name, [test4])),
+    assert_pid(Pid3),
+
+    %% kill all procs
+    Pid3 = global:send(test4, die),
+    %% sleep to let the proc die
     wait_for_exit(Pid3),
-    ?line ?UNTIL(undefined =:= global:whereis_name(test4)),
-    
+    ?UNTIL(undefined =:= global:whereis_name(test4)),
+
     exit_p(Pid),
     exit_p(Pid2),
 
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+    ?UNTIL(OrigNames =:= global:registered_names()),
 
     write_high_level_trace(Config),
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
-basic_name_partition(suite) ->
-    [];
-basic_name_partition(doc) ->
-    ["Creates two partitions with two nodes in each partition.",
-     "Tests that names are exchanged correctly, and that EXITs",
-     "during connect phase are handled correctly."];
+%% Creates two partitions with two nodes in each partition.
+%% Tests that names are exchanged correctly, and that EXITs
+%% during connect phase are handled correctly.
 basic_name_partition(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
-    ?line [Cp1, Cp2, Cp3] = start_nodes([cp1, cp2, cp3], peer, Config),
-    ?line [Cp1, Cp2, Cp3] = lists:sort(nodes()),
+    [Cp1, Cp2, Cp3] = start_nodes([cp1, cp2, cp3], peer, Config),
+    [Cp1, Cp2, Cp3] = lists:sort(nodes()),
     Nodes = ?NODES,
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
-    % There used to be more than one name registered for some
-    % processes. That was a mistake; there is no support for more than
-    % one name per process, and the manual is quite clear about that
-    % ("equivalent to the register/2 and whereis/1 BIFs"). The
-    % resolver procedure did not take care of such "duplicated" names,
-    % which caused this testcase to fail every now and then.
+    %% There used to be more than one name registered for some
+    %% processes. That was a mistake; there is no support for more than
+    %% one name per process, and the manual is quite clear about that
+    %% ("equivalent to the register/2 and whereis/1 BIFs"). The
+    %% resolver procedure did not take care of such "duplicated" names,
+    %% which caused this testcase to fail every now and then.
 
-    % make cp2 and cp3 connected, partitioned from us and cp1
-    % us:  register name03
-    % cp1: register name12
-    % cp2: register name12
-    % cp3: register name03
-    
-    ?line rpc_cast(Cp2, ?MODULE, part1_5, [Config, node(), Cp1, Cp3]),
-    ?line ?UNTIL(is_ready_partition(Config)),
-    
-    % start different processes in both partitions
-    ?line {_, yes} = start_proc_basic(name03),
-    ?line {_, yes} = rpc:call(Cp1, ?MODULE, start_proc_basic, [name12]),
-    test_server:sleep(1000),
+    %% make cp2 and cp3 connected, partitioned from us and cp1
+    %% us:  register name03
+    %% cp1: register name12
+    %% cp2: register name12
+    %% cp3: register name03
 
-    % connect to other partition
-    ?line pong = net_adm:ping(Cp3),
-    
-    ?line ?UNTIL([Cp1, Cp2, Cp3] =:= lists:sort(nodes())),
-    ?line wait_for_ready_net(Config),
-    % check names
-    ?line Pid03 = global:whereis_name(name03),
-    ?line assert_pid(Pid03),
-    ?line true = lists:member(node(Pid03), [node(), Cp3]),
-    ?line check_everywhere(Nodes, name03, Config),
-   
-    ?line Pid12 = global:whereis_name(name12),
-    ?line assert_pid(Pid12),
-    ?line true = lists:member(node(Pid12), [Cp1, Cp2]),
-    ?line check_everywhere(Nodes, name12, Config),
-
-    % kill all procs
-    ?line Pid12 = global:send(name12, die),
-    ?line Pid03 = global:send(name03, die),
-    % sleep to let the procs die
+    rpc_cast(Cp2, ?MODULE, part1_5, [Config, node(), Cp1, Cp3]),
+    ?UNTIL(is_ready_partition(Config)),
+
+    %% start different processes in both partitions
+    {_, yes} = start_proc_basic(name03),
+    {_, yes} = rpc:call(Cp1, ?MODULE, start_proc_basic, [name12]),
+    ct:sleep(1000),
+
+    %% connect to other partition
+    pong = net_adm:ping(Cp3),
+
+    ?UNTIL([Cp1, Cp2, Cp3] =:= lists:sort(nodes())),
+    wait_for_ready_net(Config),
+
+    %% check names
+    Pid03 = global:whereis_name(name03),
+    assert_pid(Pid03),
+    true = lists:member(node(Pid03), [node(), Cp3]),
+    check_everywhere(Nodes, name03, Config),
+
+    Pid12 = global:whereis_name(name12),
+    assert_pid(Pid12),
+    true = lists:member(node(Pid12), [Cp1, Cp2]),
+    check_everywhere(Nodes, name12, Config),
+
+    %% kill all procs
+    Pid12 = global:send(name12, die),
+    Pid03 = global:send(name03, die),
+
+    %% sleep to let the procs die
     wait_for_exit(Pid12),
     wait_for_exit(Pid03),
-    ?line 
     ?UNTIL(begin
 	       Names = [name03, name12],
 	       lists:duplicate(length(Names), undefined)
 		   =:= [global:whereis_name(Name) || Name <- Names]
 	   end),
-    
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+
+    ?UNTIL(OrigNames =:= global:registered_names()),
 
     write_high_level_trace(Config),
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
-%Peer nodes cp0 - cp6 are started. Break apart the connections from
-%cp3-cp6 to cp0-cp2 and test_server so we get two partitions.
-%In the cp3-cp6 partition, start one process on each node and register
-%using both erlang:register, and global:register (test1 on cp3, test2 on
-%cp4, test3 on cp5, test4 on cp6), using different resolution functions:
-%default for test1, notify_all_name for test2, random_notify_name for test3
-%and one for test4 that sends a message to test_server and keeps the
-%process which is greater in the standard ordering. In the other partition,
-%do the same (test1 on test_server, test2 on cp0, test3 on cp1, test4 on cp2).
-%Sleep a little, then from test_server, connect to cp3-cp6 in order.
-%Check that the values for the registered names are the expected ones, and
-%that the messages from test4 arrive.
-
-advanced_partition(suite) ->
-    [];
-advanced_partition(doc) ->
-    ["Test that names are resolved correctly when two",
-     "partitioned networks connect."];
+%% Peer nodes cp0 - cp6 are started. Break apart the connections from
+%% cp3-cp6 to cp0-cp2 and test_server so we get two partitions.
+%% In the cp3-cp6 partition, start one process on each node and register
+%% using both erlang:register, and global:register (test1 on cp3, test2 on
+%% cp4, test3 on cp5, test4 on cp6), using different resolution functions:
+%% default for test1, notify_all_name for test2, random_notify_name for test3
+%% and one for test4 that sends a message to test_server and keeps the
+%% process which is greater in the standard ordering. In the other partition,
+%% do the same (test1 on test_server, test2 on cp0, test3 on cp1, test4 on cp2).
+%% Sleep a little, then from test_server, connect to cp3-cp6 in order.
+%% Check that the values for the registered names are the expected ones, and
+%% that the messages from test4 arrive.
+
+%% Test that names are resolved correctly when two
+%% partitioned networks connect.
 advanced_partition(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
-    ?line [Cp0, Cp1, Cp2, Cp3, Cp4, Cp5, Cp6]
+    [Cp0, Cp1, Cp2, Cp3, Cp4, Cp5, Cp6]
 	= start_nodes([cp0, cp1, cp2, cp3, cp4, cp5, cp6], peer, Config),
     Nodes = lists:sort([node(), Cp0, Cp1, Cp2, Cp3, Cp4, Cp5, Cp6]),
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
-    % make cp3-cp6 connected, partitioned from us and cp0-cp2
-    ?line rpc_cast(Cp3, ?MODULE, part2,
-                   [Config, self(), node(), Cp0, Cp1, Cp2, Cp3, Cp4, Cp5,Cp6]),
-    ?line ?UNTIL(is_ready_partition(Config)),
-    
-    % start different processes in this partition
-    ?line start_procs(self(), Cp0, Cp1, Cp2, Config),
-
-    % connect to other partition
-    ?line pong = net_adm:ping(Cp3),
-    ?line pong = net_adm:ping(Cp4),
-    ?line pong = net_adm:ping(Cp5),
-    ?line pong = net_adm:ping(Cp6),
-    
-    ?line wait_for_ready_net(Config),
+    %% make cp3-cp6 connected, partitioned from us and cp0-cp2
+    rpc_cast(Cp3, ?MODULE, part2,
+	     [Config, self(), node(), Cp0, Cp1, Cp2, Cp3, Cp4, Cp5,Cp6]),
+    ?UNTIL(is_ready_partition(Config)),
+
+    %% start different processes in this partition
+    start_procs(self(), Cp0, Cp1, Cp2, Config),
+
+    %% connect to other partition
+    pong = net_adm:ping(Cp3),
+    pong = net_adm:ping(Cp4),
+    pong = net_adm:ping(Cp5),
+    pong = net_adm:ping(Cp6),
+
+    wait_for_ready_net(Config),
 
-    ?line 
     ?UNTIL(lists:member(undefined,
 			[rpc:call(Cp3, erlang, whereis, [test1]),
 			 rpc:call(node(), erlang, whereis, [test1])])),
@@ -1200,43 +1192,42 @@ advanced_partition(Config) when is_list(Config) ->
     Mt3 = rpc:call(Cp1, erlang, whereis, [test3]),
     _Mt4 = rpc:call(Cp2, erlang, whereis, [test4]),
 
-    % check names
-    ?line Pid1 = global:whereis_name(test1),
-    ?line Pid1 = rpc:call(Cp3, global, whereis_name, [test1]),
-    ?line assert_pid(Pid1),
-    ?line true = lists:member(Pid1, [Nt1, Mt1]),
-    ?line true = lists:member(undefined, [Nt1, Mt1]),
-    ?line check_everywhere(Nodes, test1, Config),
-    
-    ?line undefined = global:whereis_name(test2),
-    ?line undefined = rpc:call(Cp3, global, whereis_name, [test2]),
-    ?line yes = sreq(Nt2, {got_notify, self()}),
-    ?line yes = sreq(Mt2, {got_notify, self()}),
-    ?line check_everywhere(Nodes, test2, Config),
-
-    ?line Pid3 = global:whereis_name(test3),
-    ?line Pid3 = rpc:call(Cp3, global, whereis_name, [test3]),
-    ?line assert_pid(Pid3),
-    ?line true = lists:member(Pid3, [Nt3, Mt3]),
-    ?line no = sreq(Pid3, {got_notify, self()}),
-    ?line yes = sreq(other(Pid3, [Nt2, Nt3]), {got_notify, self()}),
-    ?line check_everywhere(Nodes, test3, Config),
-
-    ?line Pid4 = global:whereis_name(test4),
-    ?line Pid4 = rpc:call(Cp3, global, whereis_name, [test4]),
-    ?line assert_pid(Pid4),
-%    ?line true = lists:member(Pid4, [Nt4, Mt4]),
-    ?line Pid4 = Nt4,
-    ?line check_everywhere(Nodes, test4, Config),
-    
-    ?line 1 = collect_resolves(),
-
-    ?line Pid1 = global:send(test1, die),
+    %% check names
+    Pid1 = global:whereis_name(test1),
+    Pid1 = rpc:call(Cp3, global, whereis_name, [test1]),
+    assert_pid(Pid1),
+    true = lists:member(Pid1, [Nt1, Mt1]),
+    true = lists:member(undefined, [Nt1, Mt1]),
+    check_everywhere(Nodes, test1, Config),
+
+    undefined = global:whereis_name(test2),
+    undefined = rpc:call(Cp3, global, whereis_name, [test2]),
+    yes = sreq(Nt2, {got_notify, self()}),
+    yes = sreq(Mt2, {got_notify, self()}),
+    check_everywhere(Nodes, test2, Config),
+
+    Pid3 = global:whereis_name(test3),
+    Pid3 = rpc:call(Cp3, global, whereis_name, [test3]),
+    assert_pid(Pid3),
+    true = lists:member(Pid3, [Nt3, Mt3]),
+    no = sreq(Pid3, {got_notify, self()}),
+    yes = sreq(other(Pid3, [Nt2, Nt3]), {got_notify, self()}),
+    check_everywhere(Nodes, test3, Config),
+
+    Pid4 = global:whereis_name(test4),
+    Pid4 = rpc:call(Cp3, global, whereis_name, [test4]),
+    assert_pid(Pid4),
+    Pid4 = Nt4,
+    check_everywhere(Nodes, test4, Config),
+
+    1 = collect_resolves(),
+
+    Pid1 = global:send(test1, die),
     exit_p(Pid3),
     exit_p(Pid4),
     wait_for_exit(Pid1),
     wait_for_exit(Pid3),
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+    ?UNTIL(OrigNames =:= global:registered_names()),
 
     write_high_level_trace(Config),
     stop_node(Cp0),
@@ -1246,93 +1237,90 @@ advanced_partition(Config) when is_list(Config) ->
     stop_node(Cp4),
     stop_node(Cp5),
     stop_node(Cp6),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
-    
-%Peer nodes cp0 - cp6 are started, and partitioned just like in
-%advanced_partition. Start cp8, only connected to test_server. Let cp6
-%break apart from the rest, and 12 s later, ping cp0 and cp3, and
-%register the name test5. After the same 12 s, let cp5 halt.
-%Wait for the death of cp5. Ping cp3 (at the same time as cp6 does).
-%Take down cp2. Start cp7, restart cp2. Ping cp4, cp6 and cp8.
-%Now, expect all nodes to be connected and have the same picture of all
-%registered names.
-
-stress_partition(suite) ->
-    [];
-stress_partition(doc) ->
-    ["Stress global, make a partitioned net, make some nodes",
-     "go up/down a bit."];
+
+%% Peer nodes cp0 - cp6 are started, and partitioned just like in
+%% advanced_partition. Start cp8, only connected to test_server. Let cp6
+%% break apart from the rest, and 12 s later, ping cp0 and cp3, and
+%% register the name test5. After the same 12 s, let cp5 halt.
+%% Wait for the death of cp5. Ping cp3 (at the same time as cp6 does).
+%% Take down cp2. Start cp7, restart cp2. Ping cp4, cp6 and cp8.
+%% Now, expect all nodes to be connected and have the same picture of all
+%% registered names.
+
+%% Stress global, make a partitioned net, make some nodes
+%% go up/down a bit.
 stress_partition(Config) when is_list(Config) ->
     Timeout = 90,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
-    ?line [Cp0, Cp1, Cp2, Cp3, Cp4, Cp5, Cp6]
+    [Cp0, Cp1, Cp2, Cp3, Cp4, Cp5, Cp6]
 	= start_nodes([cp0, cp1, cp2, cp3, cp4, cp5, cp6], peer, Config),
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
-    % make cp3-cp5 connected, partitioned from us and cp0-cp2
-    % cp6 is alone (single node).  cp6 pings cp0 and cp3 in 12 secs...
-    ?line rpc_cast(Cp3, ?MODULE, part3,
-                   [Config, self(), node(), Cp0, Cp1, Cp2, Cp3, Cp4, Cp5,Cp6]),
-    ?line ?UNTIL(is_ready_partition(Config)),
-    
-    % start different processes in this partition
-    ?line start_procs(self(), Cp0, Cp1, Cp2, Config),
+    %% make cp3-cp5 connected, partitioned from us and cp0-cp2
+    %% cp6 is alone (single node).  cp6 pings cp0 and cp3 in 12 secs...
+    rpc_cast(Cp3, ?MODULE, part3,
+	     [Config, self(), node(), Cp0, Cp1, Cp2, Cp3, Cp4, Cp5,Cp6]),
+    ?UNTIL(is_ready_partition(Config)),
+
+    %% start different processes in this partition
+    start_procs(self(), Cp0, Cp1, Cp2, Config),
+
+    {ok, Cp8} = start_peer_node(cp8, Config),
 
-    ?line {ok, Cp8} = start_peer_node(cp8, Config),
-    
     monitor_node(Cp5, true),
     receive
 	{nodedown, Cp5} -> ok
     after
-	20000 -> test_server:fail({no_nodedown, Cp5})
+	20000 -> ct:fail({no_nodedown, Cp5})
     end,
     monitor_node(Cp5, false),    
 
-    % Ok, now cp6 pings us, and cp5 will go down.
-    
-    % connect to other partition
-    ?line pong = net_adm:ping(Cp3),
-    ?line rpc_cast(Cp2, ?MODULE, crash, [0]),
-    
-    % Start new nodes
-    ?line {ok, Cp7} = start_peer_node(cp7, Config),
-    ?line {ok, Cp2_2} = start_peer_node(cp2, Config),
+    %% Ok, now cp6 pings us, and cp5 will go down.
+
+    %% connect to other partition
+    pong = net_adm:ping(Cp3),
+    rpc_cast(Cp2, ?MODULE, crash, [0]),
+
+    %% Start new nodes
+    {ok, Cp7} = start_peer_node(cp7, Config),
+    {ok, Cp2_2} = start_peer_node(cp2, Config),
     Nodes = lists:sort([node(), Cp0, Cp1, Cp2_2, Cp3, Cp4, Cp6, Cp7, Cp8]),
     put(?nodes_tag, Nodes),
 
-    ?line pong = net_adm:ping(Cp4),
-    ?line pong = net_adm:ping(Cp6),
-    ?line pong = net_adm:ping(Cp8),
+    pong = net_adm:ping(Cp4),
+    pong = net_adm:ping(Cp6),
+    pong = net_adm:ping(Cp8),
 
-    ?line wait_for_ready_net(Nodes, Config),
+    wait_for_ready_net(Nodes, Config),
 
-    % Make sure that all nodes have the same picture of all names
-    ?line check_everywhere(Nodes, test1, Config),
-    ?line assert_pid(global:whereis_name(test1)),
-    
-    ?line check_everywhere(Nodes, test2, Config),
-    ?line undefined = global:whereis_name(test2),
+    %% Make sure that all nodes have the same picture of all names
+    check_everywhere(Nodes, test1, Config),
+    assert_pid(global:whereis_name(test1)),
 
-    ?line check_everywhere(Nodes, test3, Config),
-    ?line assert_pid(global:whereis_name(test3)),
+    check_everywhere(Nodes, test2, Config),
+    undefined = global:whereis_name(test2),
 
-    ?line check_everywhere(Nodes, test4, Config),
-    ?line assert_pid(global:whereis_name(test4)),
+    check_everywhere(Nodes, test3, Config),
+    assert_pid(global:whereis_name(test3)),
 
-    ?line check_everywhere(Nodes, test5, Config),
-    ?line ?UNTIL(undefined =:= global:whereis_name(test5)),
-    
-    ?line assert_pid(global:send(test1, die)),
-    ?line assert_pid(global:send(test3, die)),
-    ?line assert_pid(global:send(test4, die)),
+    check_everywhere(Nodes, test4, Config),
+    assert_pid(global:whereis_name(test4)),
+
+    check_everywhere(Nodes, test5, Config),
+    ?UNTIL(undefined =:= global:whereis_name(test5)),
+
+    assert_pid(global:send(test1, die)),
+    assert_pid(global:send(test3, die)),
+    assert_pid(global:send(test4, die)),
 
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+    ?UNTIL(OrigNames =:= global:registered_names()),
 
     write_high_level_trace(Config),
     stop_node(Cp0),
@@ -1344,15 +1332,13 @@ stress_partition(Config) when is_list(Config) ->
     stop_node(Cp6),
     stop_node(Cp7),
     stop_node(Cp8),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
 
 %% Use this one to test alot of connection tests
-%%  erl -sname ts -rsh ctrsh -pa /clearcase/otp/internal_tools/test_server/ebin/ -ring_line 10000 -s test_server run_test global_SUITE
+%%  erl -sname ts -ring_line 10000 -s test_server run_test global_SUITE
 
-ring_line(suite) -> [];
-ring_line(doc) -> [""];
 ring_line(Config) when is_list(Config) ->
     {ok, [[N]]} = init:get_argument(ring_line),
     loop_it(list_to_integer(N), Config).
@@ -1361,74 +1347,70 @@ loop_it(N, Config) -> loop_it(N,N, Config).
 
 loop_it(0,_, _Config) -> ok;
 loop_it(N,M, Config) ->
-    test_server:format(1, "Round: ~w", [M-N]),
+    ct:pal(?HI_VERBOSITY, "Round: ~w", [M-N]),
     ring(Config),
     line(Config),
     loop_it(N-1,M, Config).
 
 
-ring(suite) ->
-    [];
-ring(doc) ->
-    ["Make 10 single nodes, all having the same name.",
-     "Make all ping its predecessor, pinging in a ring.",
-     "Make sure that there's just one winner."];
+%% Make 10 single nodes, all having the same name.
+%% Make all ping its predecessor, pinging in a ring.
+%% Make sure that there's just one winner.
 ring(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
-    ?line [Cp0, Cp1, Cp2, Cp3, Cp4, Cp5, Cp6, Cp7, Cp8]
+    [Cp0, Cp1, Cp2, Cp3, Cp4, Cp5, Cp6, Cp7, Cp8]
 	= start_nodes([cp0, cp1, cp2, cp3, cp4, cp5, cp6, cp7, cp8], 
                       peer, Config),
     Nodes = lists:sort([node(), Cp0, Cp1, Cp2, Cp3, Cp4, Cp5, Cp6, Cp7, Cp8]),
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
     Time = msec() + 7000,
 
-    ?line rpc_cast(Cp0, ?MODULE, single_node, [Time, Cp8, Config]),
-    ?line rpc_cast(Cp1, ?MODULE, single_node, [Time, Cp0, Config]),
-    ?line rpc_cast(Cp2, ?MODULE, single_node, [Time, Cp1, Config]),
-    ?line rpc_cast(Cp3, ?MODULE, single_node, [Time, Cp2, Config]),
-    ?line rpc_cast(Cp4, ?MODULE, single_node, [Time, Cp3, Config]),
-    ?line rpc_cast(Cp5, ?MODULE, single_node, [Time, Cp4, Config]),
-    ?line rpc_cast(Cp6, ?MODULE, single_node, [Time, Cp5, Config]),
-    ?line rpc_cast(Cp7, ?MODULE, single_node, [Time, Cp6, Config]),
-    ?line rpc_cast(Cp8, ?MODULE, single_node, [Time, Cp7, Config]),
-    
-    % sleep to make the partitioned net ready
-    test_server:sleep(Time - msec()),
-
-    ?line pong = net_adm:ping(Cp0),
-    ?line pong = net_adm:ping(Cp1),
-    ?line pong = net_adm:ping(Cp2),
-    ?line pong = net_adm:ping(Cp3),
-    ?line pong = net_adm:ping(Cp4),
-    ?line pong = net_adm:ping(Cp5),
-    ?line pong = net_adm:ping(Cp6),
-    ?line pong = net_adm:ping(Cp7),
-    ?line pong = net_adm:ping(Cp8),
-
-    ?line pong = net_adm:ping(Cp0),
-    ?line pong = net_adm:ping(Cp1),
-    ?line pong = net_adm:ping(Cp2),
-    ?line pong = net_adm:ping(Cp3),
-    ?line pong = net_adm:ping(Cp4),
-    ?line pong = net_adm:ping(Cp5),
-    ?line pong = net_adm:ping(Cp6),
-    ?line pong = net_adm:ping(Cp7),
-    ?line pong = net_adm:ping(Cp8),
-
-    ?line wait_for_ready_net(Nodes, Config),
-
-    % Just make sure that all nodes have the same picture of all names
-    ?line check_everywhere(Nodes, single_name, Config),
-    ?line assert_pid(global:whereis_name(single_name)),
-
-    ?line 
+    rpc_cast(Cp0, ?MODULE, single_node, [Time, Cp8, Config]),
+    rpc_cast(Cp1, ?MODULE, single_node, [Time, Cp0, Config]),
+    rpc_cast(Cp2, ?MODULE, single_node, [Time, Cp1, Config]),
+    rpc_cast(Cp3, ?MODULE, single_node, [Time, Cp2, Config]),
+    rpc_cast(Cp4, ?MODULE, single_node, [Time, Cp3, Config]),
+    rpc_cast(Cp5, ?MODULE, single_node, [Time, Cp4, Config]),
+    rpc_cast(Cp6, ?MODULE, single_node, [Time, Cp5, Config]),
+    rpc_cast(Cp7, ?MODULE, single_node, [Time, Cp6, Config]),
+    rpc_cast(Cp8, ?MODULE, single_node, [Time, Cp7, Config]),
+
+    %% sleep to make the partitioned net ready
+    ct:sleep(Time - msec()),
+
+    pong = net_adm:ping(Cp0),
+    pong = net_adm:ping(Cp1),
+    pong = net_adm:ping(Cp2),
+    pong = net_adm:ping(Cp3),
+    pong = net_adm:ping(Cp4),
+    pong = net_adm:ping(Cp5),
+    pong = net_adm:ping(Cp6),
+    pong = net_adm:ping(Cp7),
+    pong = net_adm:ping(Cp8),
+
+    pong = net_adm:ping(Cp0),
+    pong = net_adm:ping(Cp1),
+    pong = net_adm:ping(Cp2),
+    pong = net_adm:ping(Cp3),
+    pong = net_adm:ping(Cp4),
+    pong = net_adm:ping(Cp5),
+    pong = net_adm:ping(Cp6),
+    pong = net_adm:ping(Cp7),
+    pong = net_adm:ping(Cp8),
+
+    wait_for_ready_net(Nodes, Config),
+
+    %% Just make sure that all nodes have the same picture of all names
+    check_everywhere(Nodes, single_name, Config),
+    assert_pid(global:whereis_name(single_name)),
+
     ?UNTIL(begin
                {Ns2, []} = rpc:multicall(Nodes, erlang, whereis, 
                                          [single_name]),
@@ -1437,10 +1419,10 @@ ring(Config) when is_list(Config) ->
                                  end,
                                  0, Ns2)
            end),
-    
-    ?line assert_pid(global:send(single_name, die)),
 
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+    assert_pid(global:send(single_name, die)),
+
+    ?UNTIL(OrigNames =:= global:registered_names()),
 
     write_high_level_trace(Config),
     stop_node(Cp0),
@@ -1452,64 +1434,60 @@ ring(Config) when is_list(Config) ->
     stop_node(Cp6),
     stop_node(Cp7),
     stop_node(Cp8),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
-simple_ring(suite) ->
-    [];
-simple_ring(doc) ->
-    ["Simpler version of the ring case.  Used because there are some",
-     "distribution problems with many nodes.",
-     "Make 6 single nodes, all having the same name.",
-     "Make all ping its predecessor, pinging in a ring.",
-     "Make sure that there's just one winner."];
+%% Simpler version of the ring case.  Used because there are some
+%% distribution problems with many nodes.
+%% Make 6 single nodes, all having the same name.
+%% Make all ping its predecessor, pinging in a ring.
+%% Make sure that there's just one winner.
 simple_ring(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
     Names = [cp0, cp1, cp2, cp3, cp4, cp5],
-    ?line [Cp0, Cp1, Cp2, Cp3, Cp4, Cp5]
+    [Cp0, Cp1, Cp2, Cp3, Cp4, Cp5]
 	= start_nodes(Names, peer, Config),
     Nodes = lists:sort([node(), Cp0, Cp1, Cp2, Cp3, Cp4, Cp5]),
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
     Time = msec() + 5000,
 
-    ?line rpc_cast(Cp0, ?MODULE, single_node, [Time, Cp5, Config]),
-    ?line rpc_cast(Cp1, ?MODULE, single_node, [Time, Cp0, Config]),
-    ?line rpc_cast(Cp2, ?MODULE, single_node, [Time, Cp1, Config]),
-    ?line rpc_cast(Cp3, ?MODULE, single_node, [Time, Cp2, Config]),
-    ?line rpc_cast(Cp4, ?MODULE, single_node, [Time, Cp3, Config]),
-    ?line rpc_cast(Cp5, ?MODULE, single_node, [Time, Cp4, Config]),
-    
-    % sleep to make the partitioned net ready
-    test_server:sleep(Time - msec()),
-
-    ?line pong = net_adm:ping(Cp0),
-    ?line pong = net_adm:ping(Cp1),
-    ?line pong = net_adm:ping(Cp2),
-    ?line pong = net_adm:ping(Cp3),
-    ?line pong = net_adm:ping(Cp4),
-    ?line pong = net_adm:ping(Cp5),
-
-    ?line pong = net_adm:ping(Cp0),
-    ?line pong = net_adm:ping(Cp1),
-    ?line pong = net_adm:ping(Cp2),
-    ?line pong = net_adm:ping(Cp3),
-    ?line pong = net_adm:ping(Cp4),
-    ?line pong = net_adm:ping(Cp5),
-
-    ?line wait_for_ready_net(Nodes, Config),
-
-    % Just make sure that all nodes have the same picture of all names
-    ?line check_everywhere(Nodes, single_name, Config),
-    ?line assert_pid(global:whereis_name(single_name)),
-
-    ?line 
+    rpc_cast(Cp0, ?MODULE, single_node, [Time, Cp5, Config]),
+    rpc_cast(Cp1, ?MODULE, single_node, [Time, Cp0, Config]),
+    rpc_cast(Cp2, ?MODULE, single_node, [Time, Cp1, Config]),
+    rpc_cast(Cp3, ?MODULE, single_node, [Time, Cp2, Config]),
+    rpc_cast(Cp4, ?MODULE, single_node, [Time, Cp3, Config]),
+    rpc_cast(Cp5, ?MODULE, single_node, [Time, Cp4, Config]),
+
+    %% sleep to make the partitioned net ready
+    ct:sleep(Time - msec()),
+
+    pong = net_adm:ping(Cp0),
+    pong = net_adm:ping(Cp1),
+    pong = net_adm:ping(Cp2),
+    pong = net_adm:ping(Cp3),
+    pong = net_adm:ping(Cp4),
+    pong = net_adm:ping(Cp5),
+
+    pong = net_adm:ping(Cp0),
+    pong = net_adm:ping(Cp1),
+    pong = net_adm:ping(Cp2),
+    pong = net_adm:ping(Cp3),
+    pong = net_adm:ping(Cp4),
+    pong = net_adm:ping(Cp5),
+
+    wait_for_ready_net(Nodes, Config),
+
+    %% Just make sure that all nodes have the same picture of all names
+    check_everywhere(Nodes, single_name, Config),
+    assert_pid(global:whereis_name(single_name)),
+
     ?UNTIL(begin
                {Ns2, []} = rpc:multicall(Nodes, erlang, whereis, 
                                          [single_name]),
@@ -1518,10 +1496,10 @@ simple_ring(Config) when is_list(Config) ->
                                  end,
                                  0, Ns2)
            end),
-    
-    ?line assert_pid(global:send(single_name, die)),
 
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+    assert_pid(global:send(single_name, die)),
+
+    ?UNTIL(OrigNames =:= global:registered_names()),
 
     write_high_level_trace(Config),
     stop_node(Cp0),
@@ -1530,72 +1508,68 @@ simple_ring(Config) when is_list(Config) ->
     stop_node(Cp3),
     stop_node(Cp4),
     stop_node(Cp5),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
-line(suite) ->
-    [];
-line(doc) ->
-    ["Make 6 single nodes, all having the same name.",
-     "Make all ping its predecessor, pinging in a line.",
-     "Make sure that there's just one winner."];
+%% Make 6 single nodes, all having the same name.
+%% Make all ping its predecessor, pinging in a line.
+%% Make sure that there's just one winner.
 line(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
-    ?line [Cp0, Cp1, Cp2, Cp3, Cp4, Cp5, Cp6, Cp7, Cp8]
+    [Cp0, Cp1, Cp2, Cp3, Cp4, Cp5, Cp6, Cp7, Cp8]
 	= start_nodes([cp0, cp1, cp2, cp3, cp4, cp5, cp6, cp7, cp8], 
                       peer, Config),
     Nodes = lists:sort([node(), Cp0, Cp1, Cp2, Cp3, Cp4, Cp5, Cp6, Cp7, Cp8]),
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
     Time = msec() + 7000,
 
-    ?line rpc_cast(Cp0, ?MODULE, single_node, 
-                   [Time, Cp0, Config]), % ping ourself!
-    ?line rpc_cast(Cp1, ?MODULE, single_node, [Time, Cp0, Config]),
-    ?line rpc_cast(Cp2, ?MODULE, single_node, [Time, Cp1, Config]),
-    ?line rpc_cast(Cp3, ?MODULE, single_node, [Time, Cp2, Config]),
-    ?line rpc_cast(Cp4, ?MODULE, single_node, [Time, Cp3, Config]),
-    ?line rpc_cast(Cp5, ?MODULE, single_node, [Time, Cp4, Config]),
-    ?line rpc_cast(Cp6, ?MODULE, single_node, [Time, Cp5, Config]),
-    ?line rpc_cast(Cp7, ?MODULE, single_node, [Time, Cp6, Config]),
-    ?line rpc_cast(Cp8, ?MODULE, single_node, [Time, Cp7, Config]),
-
-    % sleep to make the partitioned net ready
-    test_server:sleep(Time - msec()),
-
-    ?line pong = net_adm:ping(Cp0),
-    ?line pong = net_adm:ping(Cp1),
-    ?line pong = net_adm:ping(Cp2),
-    ?line pong = net_adm:ping(Cp3),
-    ?line pong = net_adm:ping(Cp4),
-    ?line pong = net_adm:ping(Cp5),
-    ?line pong = net_adm:ping(Cp6),
-    ?line pong = net_adm:ping(Cp7),
-    ?line pong = net_adm:ping(Cp8),
-
-    ?line pong = net_adm:ping(Cp0),
-    ?line pong = net_adm:ping(Cp1),
-    ?line pong = net_adm:ping(Cp2),
-    ?line pong = net_adm:ping(Cp3),
-    ?line pong = net_adm:ping(Cp4),
-    ?line pong = net_adm:ping(Cp5),
-    ?line pong = net_adm:ping(Cp6),
-    ?line pong = net_adm:ping(Cp7),
-    ?line pong = net_adm:ping(Cp8),
-
-    ?line wait_for_ready_net(Nodes, Config),
-
-    % Just make sure that all nodes have the same picture of all names
-    ?line check_everywhere(Nodes, single_name, Config),
-    ?line assert_pid(global:whereis_name(single_name)),
-
-    ?line 
+    rpc_cast(Cp0, ?MODULE, single_node,
+	     [Time, Cp0, Config]), % ping ourself!
+    rpc_cast(Cp1, ?MODULE, single_node, [Time, Cp0, Config]),
+    rpc_cast(Cp2, ?MODULE, single_node, [Time, Cp1, Config]),
+    rpc_cast(Cp3, ?MODULE, single_node, [Time, Cp2, Config]),
+    rpc_cast(Cp4, ?MODULE, single_node, [Time, Cp3, Config]),
+    rpc_cast(Cp5, ?MODULE, single_node, [Time, Cp4, Config]),
+    rpc_cast(Cp6, ?MODULE, single_node, [Time, Cp5, Config]),
+    rpc_cast(Cp7, ?MODULE, single_node, [Time, Cp6, Config]),
+    rpc_cast(Cp8, ?MODULE, single_node, [Time, Cp7, Config]),
+
+    %% Sleep to make the partitioned net ready
+    ct:sleep(Time - msec()),
+
+    pong = net_adm:ping(Cp0),
+    pong = net_adm:ping(Cp1),
+    pong = net_adm:ping(Cp2),
+    pong = net_adm:ping(Cp3),
+    pong = net_adm:ping(Cp4),
+    pong = net_adm:ping(Cp5),
+    pong = net_adm:ping(Cp6),
+    pong = net_adm:ping(Cp7),
+    pong = net_adm:ping(Cp8),
+
+    pong = net_adm:ping(Cp0),
+    pong = net_adm:ping(Cp1),
+    pong = net_adm:ping(Cp2),
+    pong = net_adm:ping(Cp3),
+    pong = net_adm:ping(Cp4),
+    pong = net_adm:ping(Cp5),
+    pong = net_adm:ping(Cp6),
+    pong = net_adm:ping(Cp7),
+    pong = net_adm:ping(Cp8),
+
+    wait_for_ready_net(Nodes, Config),
+
+    %% Just make sure that all nodes have the same picture of all names
+    check_everywhere(Nodes, single_name, Config),
+    assert_pid(global:whereis_name(single_name)),
+
     ?UNTIL(begin
 	       {Ns2, []} = rpc:multicall(Nodes, erlang, whereis,
 					 [single_name]),
@@ -1604,10 +1578,10 @@ line(Config) when is_list(Config) ->
                                  end,
                                  0, Ns2)
 	   end),
-    
-    ?line assert_pid(global:send(single_name, die)),
 
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+    assert_pid(global:send(single_name, die)),
+
+    ?UNTIL(OrigNames =:= global:registered_names()),
 
     write_high_level_trace(Config),
     stop_node(Cp0),
@@ -1619,65 +1593,61 @@ line(Config) when is_list(Config) ->
     stop_node(Cp6),
     stop_node(Cp7),
     stop_node(Cp8),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
 
-simple_line(suite) ->
-    [];
-simple_line(doc) ->
-    ["Simpler version of the line case.  Used because there are some",
-     "distribution problems with many nodes.",
-     "Make 6 single nodes, all having the same name.",
-     "Make all ping its predecessor, pinging in a line.",
-     "Make sure that there's just one winner."];
+%% Simpler version of the line case.  Used because there are some
+%% distribution problems with many nodes.
+%% Make 6 single nodes, all having the same name.
+%% Make all ping its predecessor, pinging in a line.
+%% Make sure that there's just one winner.
 simple_line(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
-    ?line [Cp0, Cp1, Cp2, Cp3, Cp4, Cp5]
+    [Cp0, Cp1, Cp2, Cp3, Cp4, Cp5]
 	= start_nodes([cp0, cp1, cp2, cp3, cp4, cp5], peer, Config),
     Nodes = lists:sort([node(), Cp0, Cp1, Cp2, Cp3, Cp4, Cp5]),
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
     Time = msec() + 5000,
 
-    ?line rpc_cast(Cp0, ?MODULE, single_node, 
-                   [Time, Cp0, Config]), % ping ourself!
-    ?line rpc_cast(Cp1, ?MODULE, single_node, [Time, Cp0, Config]),
-    ?line rpc_cast(Cp2, ?MODULE, single_node, [Time, Cp1, Config]),
-    ?line rpc_cast(Cp3, ?MODULE, single_node, [Time, Cp2, Config]),
-    ?line rpc_cast(Cp4, ?MODULE, single_node, [Time, Cp3, Config]),
-    ?line rpc_cast(Cp5, ?MODULE, single_node, [Time, Cp4, Config]),
-    
-    % sleep to make the partitioned net ready
-    test_server:sleep(Time - msec()),
-
-    ?line pong = net_adm:ping(Cp0),
-    ?line pong = net_adm:ping(Cp1),
-    ?line pong = net_adm:ping(Cp2),
-    ?line pong = net_adm:ping(Cp3),
-    ?line pong = net_adm:ping(Cp4),
-    ?line pong = net_adm:ping(Cp5),
-
-    ?line pong = net_adm:ping(Cp0),
-    ?line pong = net_adm:ping(Cp1),
-    ?line pong = net_adm:ping(Cp2),
-    ?line pong = net_adm:ping(Cp3),
-    ?line pong = net_adm:ping(Cp4),
-    ?line pong = net_adm:ping(Cp5),
-
-    ?line wait_for_ready_net(Nodes, Config),
-
-    % Just make sure that all nodes have the same picture of all names
-    ?line check_everywhere(Nodes, single_name, Config),
-    ?line assert_pid(global:whereis_name(single_name)),
-
-    ?line 
+    rpc_cast(Cp0, ?MODULE, single_node,
+	     [Time, Cp0, Config]), % ping ourself!
+    rpc_cast(Cp1, ?MODULE, single_node, [Time, Cp0, Config]),
+    rpc_cast(Cp2, ?MODULE, single_node, [Time, Cp1, Config]),
+    rpc_cast(Cp3, ?MODULE, single_node, [Time, Cp2, Config]),
+    rpc_cast(Cp4, ?MODULE, single_node, [Time, Cp3, Config]),
+    rpc_cast(Cp5, ?MODULE, single_node, [Time, Cp4, Config]),
+
+    %% sleep to make the partitioned net ready
+    ct:sleep(Time - msec()),
+
+    pong = net_adm:ping(Cp0),
+    pong = net_adm:ping(Cp1),
+    pong = net_adm:ping(Cp2),
+    pong = net_adm:ping(Cp3),
+    pong = net_adm:ping(Cp4),
+    pong = net_adm:ping(Cp5),
+
+    pong = net_adm:ping(Cp0),
+    pong = net_adm:ping(Cp1),
+    pong = net_adm:ping(Cp2),
+    pong = net_adm:ping(Cp3),
+    pong = net_adm:ping(Cp4),
+    pong = net_adm:ping(Cp5),
+
+    wait_for_ready_net(Nodes, Config),
+
+    %% Just make sure that all nodes have the same picture of all names
+    check_everywhere(Nodes, single_name, Config),
+    assert_pid(global:whereis_name(single_name)),
+
     ?UNTIL(begin
 	       {Ns2, []} = rpc:multicall(Nodes, erlang, whereis,
 					 [single_name]),
@@ -1686,10 +1656,10 @@ simple_line(Config) when is_list(Config) ->
                                  end,
                                  0, Ns2)
 	   end),
-    
-    ?line assert_pid(global:send(single_name, die)),
 
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+    assert_pid(global:send(single_name, die)),
+
+    ?UNTIL(OrigNames =:= global:registered_names()),
 
     write_high_level_trace(Config),
     stop_node(Cp0),
@@ -1698,82 +1668,74 @@ simple_line(Config) when is_list(Config) ->
     stop_node(Cp3),
     stop_node(Cp4),
     stop_node(Cp5),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
-    
-otp_1849(suite) -> [];
-otp_1849(doc) ->
-    ["Test ticket: Global should keep track of all pids that set the same lock."];
+
+%% Test ticket: Global should keep track of all pids that set the same lock.
 otp_1849(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line {ok, Cp1} = start_node(cp1, Config),
-    ?line {ok, Cp2} = start_node(cp2, Config),
-    ?line {ok, Cp3} = start_node(cp3, Config),
-
-    ?line wait_for_ready_net(Config),
-
-    % start procs on each node
-    ?line Pid1 = rpc:call(Cp1, ?MODULE, start_proc, []),
-    ?line assert_pid(Pid1),
-    ?line Pid2 = rpc:call(Cp2, ?MODULE, start_proc, []),
-    ?line assert_pid(Pid2),
-    ?line Pid3 = rpc:call(Cp3, ?MODULE, start_proc, []),
-    ?line assert_pid(Pid3),
-
-    % set a lock on every node
-    ?line true = req(Pid1, {set_lock2, {test_lock, ?MODULE}, self()}),
-    ?line true = req(Pid2, {set_lock2, {test_lock, ?MODULE}, self()}),
-    ?line true = req(Pid3, {set_lock2, {test_lock, ?MODULE}, self()}),
-
-    ?line
-    ?UNTIL(begin 
+    init_condition(Config),
+    {ok, Cp1} = start_node(cp1, Config),
+    {ok, Cp2} = start_node(cp2, Config),
+    {ok, Cp3} = start_node(cp3, Config),
+
+    wait_for_ready_net(Config),
+
+    %% start procs on each node
+    Pid1 = rpc:call(Cp1, ?MODULE, start_proc, []),
+    assert_pid(Pid1),
+    Pid2 = rpc:call(Cp2, ?MODULE, start_proc, []),
+    assert_pid(Pid2),
+    Pid3 = rpc:call(Cp3, ?MODULE, start_proc, []),
+    assert_pid(Pid3),
+
+    %% set a lock on every node
+    true = req(Pid1, {set_lock2, {test_lock, ?MODULE}, self()}),
+    true = req(Pid2, {set_lock2, {test_lock, ?MODULE}, self()}),
+    true = req(Pid3, {set_lock2, {test_lock, ?MODULE}, self()}),
+
+    ?UNTIL(begin
                [{test_lock, ?MODULE, Lock1}] = 
                    rpc:call(Cp1, ets, tab2list, [global_locks]),
                3 =:= length(Lock1)
            end),
 
-    ?line true = req(Pid3, {del_lock2, {test_lock, ?MODULE}, self()}),
-    ?line
+    true = req(Pid3, {del_lock2, {test_lock, ?MODULE}, self()}),
     ?UNTIL(begin
                [{test_lock, ?MODULE, Lock2}] = 
                    rpc:call(Cp1, ets, tab2list, [global_locks]),
                2 =:= length(Lock2)
            end),
 
-    ?line true = req(Pid2, {del_lock2, {test_lock, ?MODULE}, self()}),
-    ?line
+    true = req(Pid2, {del_lock2, {test_lock, ?MODULE}, self()}),
     ?UNTIL(begin
                [{test_lock, ?MODULE, Lock3}] = 
                    rpc:call(Cp1, ets, tab2list, [global_locks]),
                1 =:= length(Lock3)
            end),
 
-    ?line true = req(Pid1, {del_lock2, {test_lock, ?MODULE}, self()}),
-    ?line ?UNTIL([] =:= rpc:call(Cp1, ets, tab2list, [global_locks])),
+    true = req(Pid1, {del_lock2, {test_lock, ?MODULE}, self()}),
+    ?UNTIL([] =:= rpc:call(Cp1, ets, tab2list, [global_locks])),
 
 
-    ?line true = req(Pid1, {set_lock2, {test_lock, ?MODULE}, self()}),
-    ?line true = req(Pid2, {set_lock2, {test_lock, ?MODULE}, self()}),
-    ?line true = req(Pid3, {set_lock2, {test_lock, ?MODULE}, self()}),
-    ?line false = req(Pid2, {set_lock2, {test_lock, not_valid}, self()}),
+    true = req(Pid1, {set_lock2, {test_lock, ?MODULE}, self()}),
+    true = req(Pid2, {set_lock2, {test_lock, ?MODULE}, self()}),
+    true = req(Pid3, {set_lock2, {test_lock, ?MODULE}, self()}),
+    false = req(Pid2, {set_lock2, {test_lock, not_valid}, self()}),
 
     exit_p(Pid1),
-    ?line
     ?UNTIL(begin
                [{test_lock, ?MODULE, Lock10}] = 
                    rpc:call(Cp1, ets, tab2list, [global_locks]),
                2 =:= length(Lock10)
            end),
-    ?line
     ?UNTIL(begin
                [{test_lock, ?MODULE, Lock11}] = 
                    rpc:call(Cp2, ets, tab2list, [global_locks]),
                2 =:= length(Lock11)
            end),
-    ?line
     ?UNTIL(begin
                [{test_lock, ?MODULE, Lock12}] = 
                    rpc:call(Cp3, ets, tab2list, [global_locks]),
@@ -1784,13 +1746,11 @@ otp_1849(Config) when is_list(Config) ->
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
-    
 
-otp_3162(suite) -> [];
-otp_3162(doc) ->
-    ["Test ticket: Deadlock in global"];
+
+%% Test ticket: Deadlock in global.
 otp_3162(Config) when is_list(Config) ->
     StartFun = fun() ->
                        {ok, Cp1} = start_node(cp1, Config),
@@ -1804,77 +1764,74 @@ do_otp_3162(StartFun, Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line [Cp1, Cp2, Cp3] = StartFun(),
+    init_condition(Config),
+    [Cp1, Cp2, Cp3] = StartFun(),
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
-    % start procs on each node
-    ?line Pid1 = rpc:call(Cp1, ?MODULE, start_proc4, [kalle]),
-    ?line assert_pid(Pid1),
-    ?line Pid2 = rpc:call(Cp2, ?MODULE, start_proc4, [stina]),
-    ?line assert_pid(Pid2),
-    ?line Pid3 = rpc:call(Cp3, ?MODULE, start_proc4, [vera]),
-    ?line assert_pid(Pid3),
+    %% start procs on each node
+    Pid1 = rpc:call(Cp1, ?MODULE, start_proc4, [kalle]),
+    assert_pid(Pid1),
+    Pid2 = rpc:call(Cp2, ?MODULE, start_proc4, [stina]),
+    assert_pid(Pid2),
+    Pid3 = rpc:call(Cp3, ?MODULE, start_proc4, [vera]),
+    assert_pid(Pid3),
 
-    ?line rpc_disconnect_node(Cp1, Cp2, Config),
+    rpc_disconnect_node(Cp1, Cp2, Config),
 
-    ?line ?UNTIL
+    ?UNTIL
        ([Cp3] =:= lists:sort(rpc:call(Cp1, erlang, nodes, [])) -- [node()]),
 
     ?UNTIL([kalle, vera] =:=
-	   lists:sort(rpc:call(Cp1, global, registered_names, []))),
-    ?line ?UNTIL
+	       lists:sort(rpc:call(Cp1, global, registered_names, []))),
+    ?UNTIL
        ([Cp3] =:= lists:sort(rpc:call(Cp2, erlang, nodes, [])) -- [node()]),
     ?UNTIL([stina, vera] =:=
-           lists:sort(rpc:call(Cp2, global, registered_names, []))),
-    ?line ?UNTIL
+	       lists:sort(rpc:call(Cp2, global, registered_names, []))),
+    ?UNTIL
        ([Cp1, Cp2] =:= 
-        lists:sort(rpc:call(Cp3, erlang, nodes, [])) -- [node()]),
+	    lists:sort(rpc:call(Cp3, erlang, nodes, [])) -- [node()]),
     ?UNTIL([kalle, stina, vera] =:=
-  	   lists:sort(rpc:call(Cp3, global, registered_names, []))),
+	       lists:sort(rpc:call(Cp3, global, registered_names, []))),
 
-    ?line pong = rpc:call(Cp2, net_adm, ping, [Cp1]),
+    pong = rpc:call(Cp2, net_adm, ping, [Cp1]),
 
-    ?line ?UNTIL
+    ?UNTIL
        ([Cp2, Cp3] =:=
-        lists:sort(rpc:call(Cp1, erlang, nodes, [])) -- [node()]),
-    ?line 
+	    lists:sort(rpc:call(Cp1, erlang, nodes, [])) -- [node()]),
     ?UNTIL(begin
 	       NN = lists:sort(rpc:call(Cp1, global, registered_names, [])),
 	       [kalle, stina, vera] =:= NN
 	   end),
-    ?line ?UNTIL
+    ?UNTIL
        ([Cp1, Cp3] =:=
-        lists:sort(rpc:call(Cp2, erlang, nodes, [])) -- [node()]),
+	    lists:sort(rpc:call(Cp2, erlang, nodes, [])) -- [node()]),
     ?UNTIL([kalle, stina, vera] =:=
-	lists:sort(rpc:call(Cp2, global, registered_names, []))),
-    ?line ?UNTIL
+	       lists:sort(rpc:call(Cp2, global, registered_names, []))),
+    ?UNTIL
        ([Cp1, Cp2] =:=
-        lists:sort(rpc:call(Cp3, erlang, nodes, [])) -- [node()]),
+	    lists:sort(rpc:call(Cp3, erlang, nodes, [])) -- [node()]),
     ?UNTIL([kalle, stina, vera] =:=
- 	lists:sort(rpc:call(Cp3, global, registered_names, []))),
+	       lists:sort(rpc:call(Cp3, global, registered_names, []))),
 
     write_high_level_trace(Config),
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
-    
 
-otp_5640(suite) -> [];
-otp_5640(doc) ->
-    ["OTP-5640. 'allow' multiple names for registered processes."];
+
+%% OTP-5640. 'allow' multiple names for registered processes.
 otp_5640(Config) when is_list(Config) ->
     Timeout = 25,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
     init_condition(Config),
-    ?line {ok, B} = start_node(b, Config),
+    {ok, B} = start_node(b, Config),
 
-    ?line Nodes = lists:sort([node(), B]),
-    ?line wait_for_ready_net(Nodes, Config),
+    Nodes = lists:sort([node(), B]),
+    wait_for_ready_net(Nodes, Config),
 
     Server = whereis(global_name_server),
     ServerB = rpc:call(B, erlang, whereis, [global_name_server]),
@@ -1882,50 +1839,50 @@ otp_5640(Config) when is_list(Config) ->
     Me = self(),
     Proc = spawn(fun() -> otp_5640_proc(Me) end),
 
-    ?line yes = global:register_name(name1, Proc),
-    ?line no = global:register_name(name2, Proc),
+    yes = global:register_name(name1, Proc),
+    no = global:register_name(name2, Proc),
 
-    ?line ok = application:set_env(kernel, global_multi_name_action, allow),
-    ?line yes = global:register_name(name2, Proc),
+    ok = application:set_env(kernel, global_multi_name_action, allow),
+    yes = global:register_name(name2, Proc),
 
-    test_server:sleep(100),
-    ?line Proc = global:whereis_name(name1),
-    ?line Proc = global:whereis_name(name2),
-    ?line check_everywhere(Nodes, name1, Config),
-    ?line check_everywhere(Nodes, name2, Config),
+    ct:sleep(100),
+    Proc = global:whereis_name(name1),
+    Proc = global:whereis_name(name2),
+    check_everywhere(Nodes, name1, Config),
+    check_everywhere(Nodes, name2, Config),
 
-    ?line {monitors_2levels, MonBy1} = mon_by_servers(Proc),
-    ?line [] = ([Server,Server,ServerB,ServerB] -- MonBy1),
-    ?line {links,[]} = process_info(Proc, links),
-    ?line _ = global:unregister_name(name1),
+    {monitors_2levels, MonBy1} = mon_by_servers(Proc),
+    [] = ([Server,Server,ServerB,ServerB] -- MonBy1),
+    {links,[]} = process_info(Proc, links),
+    _ = global:unregister_name(name1),
 
-    test_server:sleep(100),
-    ?line undefined = global:whereis_name(name1),
-    ?line Proc = global:whereis_name(name2),
-    ?line check_everywhere(Nodes, name1, Config),
-    ?line check_everywhere(Nodes, name2, Config),
+    ct:sleep(100),
+    undefined = global:whereis_name(name1),
+    Proc = global:whereis_name(name2),
+    check_everywhere(Nodes, name1, Config),
+    check_everywhere(Nodes, name2, Config),
 
-    ?line {monitors_2levels, MonBy2} = mon_by_servers(Proc),
-    ?line [] = ([Server,ServerB] -- MonBy2),
+    {monitors_2levels, MonBy2} = mon_by_servers(Proc),
+    [] = ([Server,ServerB] -- MonBy2),
     TmpMonBy2 = MonBy2 -- [Server,ServerB],
-    ?line TmpMonBy2 = TmpMonBy2 -- [Server,ServerB],
-    ?line {links,[]} = process_info(Proc, links),
+    TmpMonBy2 = TmpMonBy2 -- [Server,ServerB],
+    {links,[]} = process_info(Proc, links),
 
-    ?line yes = global:register_name(name1, Proc),
+    yes = global:register_name(name1, Proc),
 
     Proc ! die,
 
-    test_server:sleep(100),
-    ?line undefined = global:whereis_name(name1),
-    ?line undefined = global:whereis_name(name2),
-    ?line check_everywhere(Nodes, name1, Config),
-    ?line check_everywhere(Nodes, name2, Config),
-    ?line {monitors, GMonitors} = process_info(Server, monitors),
-    ?line false = lists:member({process, Proc}, GMonitors),
+    ct:sleep(100),
+    undefined = global:whereis_name(name1),
+    undefined = global:whereis_name(name2),
+    check_everywhere(Nodes, name1, Config),
+    check_everywhere(Nodes, name2, Config),
+    {monitors, GMonitors} = process_info(Server, monitors),
+    false = lists:member({process, Proc}, GMonitors),
 
     write_high_level_trace(Config),
     stop_node(B),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
 otp_5640_proc(_Parent) ->
@@ -1934,45 +1891,42 @@ otp_5640_proc(_Parent) ->
             exit(normal)
     end.
 
-otp_5737(suite) -> [];
-otp_5737(doc) ->
-    ["OTP-5737. set_lock/3 and trans/4 accept Retries = 0."];
+%% OTP-5737. set_lock/3 and trans/4 accept Retries = 0.
 otp_5737(Config) when is_list(Config) ->
     Timeout = 25,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
+    init_condition(Config),
 
     LockId = {?MODULE,self()},
     Nodes = [node()],
-    ?line {'EXIT', _} = (catch global:set_lock(LockId, Nodes, -1)),
-    ?line {'EXIT', _} = (catch global:set_lock(LockId, Nodes, a)),
-    ?line true = global:set_lock(LockId, Nodes, 0),
+    {'EXIT', _} = (catch global:set_lock(LockId, Nodes, -1)),
+    {'EXIT', _} = (catch global:set_lock(LockId, Nodes, a)),
+    true = global:set_lock(LockId, Nodes, 0),
     Time1 = now(),
-    ?line false = global:set_lock({?MODULE,not_me}, Nodes, 0),
-    ?line true = timer:now_diff(now(), Time1) < 5000,
-    ?line _ = global:del_lock(LockId, Nodes),
+    false = global:set_lock({?MODULE,not_me}, Nodes, 0),
+    true = timer:now_diff(now(), Time1) < 5000,
+    _ = global:del_lock(LockId, Nodes),
 
     Fun = fun() -> ok end,
-    ?line {'EXIT', _} = (catch global:trans(LockId, Fun, Nodes, -1)),
-    ?line {'EXIT', _} = (catch global:trans(LockId, Fun, Nodes, a)),
-    ?line ok = global:trans(LockId, Fun, Nodes, 0),
+    {'EXIT', _} = (catch global:trans(LockId, Fun, Nodes, -1)),
+    {'EXIT', _} = (catch global:trans(LockId, Fun, Nodes, a)),
+    ok = global:trans(LockId, Fun, Nodes, 0),
 
     write_high_level_trace(Config),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
-otp_6931(suite) -> [];
-otp_6931(doc) -> ["OTP-6931. Ignore nodeup when connect_all=false."];
+%% OTP-6931. Ignore nodeup when connect_all=false.
 otp_6931(Config) when is_list(Config) ->
     Me = self(),
-    ?line {ok, CAf} = start_non_connecting_node(ca_false, Config),
-    ?line ok = rpc:call(CAf, error_logger, add_report_handler, [?MODULE, Me]),
-    ?line info = rpc:call(CAf, error_logger, warning_map, []),
-    ?line {global_name_server,CAf} ! {nodeup, fake_node},
+    {ok, CAf} = start_non_connecting_node(ca_false, Config),
+    ok = rpc:call(CAf, error_logger, add_report_handler, [?MODULE, Me]),
+    info = rpc:call(CAf, error_logger, warning_map, []),
+    {global_name_server,CAf} ! {nodeup, fake_node},
     timer:sleep(100),
     stop_node(CAf),
-    receive {nodeup,fake_node} -> test_server:fail({info_report, was, sent})
+    receive {nodeup,fake_node} -> ct:fail({info_report, was, sent})
     after 1000 -> ok
     end,
     ok.
@@ -1980,18 +1934,17 @@ otp_6931(Config) when is_list(Config) ->
 %%%-----------------------------------------------------------------
 %%% Testing a disconnected node. Not two partitions.
 %%%-----------------------------------------------------------------
-simple_disconnect(suite) -> [];
-simple_disconnect(doc) -> ["OTP-5563. Disconnected nodes (not partitions)"];
+%% OTP-5563. Disconnected nodes (not partitions).
 simple_disconnect(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
     %% Three nodes (test_server, n_1, n_2). 
-    ?line [Cp1, Cp2] = Cps = start_nodes([n_1, n_2], peer, Config),
-    ?line wait_for_ready_net(Config),
+    [Cp1, Cp2] = Cps = start_nodes([n_1, n_2], peer, Config),
+    wait_for_ready_net(Config),
 
     Nodes = lists:sort([node() | Cps]),
 
@@ -2001,39 +1954,39 @@ simple_disconnect(Config) when is_list(Config) ->
     Resolver = {no_module, resolve_none}, % will never be called
     PingNode = Cp2,
 
-    ?line {_Pid1, yes} = 
+    {_Pid1, yes} =
         rpc:call(Cp1, ?MODULE, start_resolver, [Name, Resolver]),
-    test_server:sleep(100),
+    ct:sleep(100),
 
     %% Disconnect test_server and Cp2. 
-    ?line true = erlang:disconnect_node(Cp2),
-    test_server:sleep(500),
+    true = erlang:disconnect_node(Cp2),
+    ct:sleep(500),
 
     %% _Pid is registered on Cp1. The exchange of names between Cp2 and
     %% test_server sees two identical pids.
-    ?line pong = net_adm:ping(PingNode),
-    ?line ?UNTIL(Cps =:= lists:sort(nodes())),
+    pong = net_adm:ping(PingNode),
+    ?UNTIL(Cps =:= lists:sort(nodes())),
 
-    ?line {_, Trace0} = collect_tracers(Nodes),
-    ?line Resolvers = [P || {_Node,new_resolver,{pid,P}} <- Trace0],
-    ?line lists:foreach(fun(P) -> P ! die end, Resolvers),
-    ?line lists:foreach(fun(P) -> wait_for_exit(P) end, Resolvers),
-    ?line check_everywhere(Nodes, Name, Config),
-    ?line undefined = global:whereis_name(Name),
+    {_, Trace0} = collect_tracers(Nodes),
+    Resolvers = [P || {_Node,new_resolver,{pid,P}} <- Trace0],
+    lists:foreach(fun(P) -> P ! die end, Resolvers),
+    lists:foreach(fun(P) -> wait_for_exit(P) end, Resolvers),
+    check_everywhere(Nodes, Name, Config),
+    undefined = global:whereis_name(Name),
 
-    ?line {_, Trace1} = collect_tracers(Nodes),
+    {_, Trace1} = collect_tracers(Nodes),
     Trace = Trace0 ++ Trace1, 
-    ?line [] = [foo || {_, resolve_none, _, _} <- Trace],
+    [] = [foo || {_, resolve_none, _, _} <- Trace],
 
-    ?line Gs = name_servers(Nodes),
-    ?line [_, _, _] = monitored_by_node(Trace, Gs),
+    Gs = name_servers(Nodes),
+    [_, _, _] = monitored_by_node(Trace, Gs),
 
     lists:foreach(fun(N) -> rpc:call(N, ?MODULE, stop_tracer, []) end, Nodes),
 
-    ?line OrigNames = global:registered_names(),
+    OrigNames = global:registered_names(),
     write_high_level_trace(Config),
     stop_nodes(Cps),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
 %% Not used right now.
@@ -2052,7 +2005,7 @@ simple_dis(Nodes0, Name, Resolver, Config) ->
 simple_dis_node(_Node, DisNodes, _Name, _Resolver, Config) ->
     lists:foreach(
       fun(OtherNode) -> _ = erlang:disconnect_node(OtherNode) end, DisNodes),
-    ?line ?UNTIL(DisNodes -- nodes() =:= DisNodes),
+    ?UNTIL(DisNodes -- nodes() =:= DisNodes),
     ok.
 
 
@@ -2072,19 +2025,18 @@ simple_dis_node(_Node, DisNodes, _Name, _Resolver, Config) ->
 
 -define(RES(F), {F, fun ?MODULE:F/3}).
 
-simple_resolve(suite) -> [];
-simple_resolve(doc) -> ["OTP-5563. Partitions and names."];
+%% OTP-5563. Partitions and names.
 simple_resolve(Config) when is_list(Config) ->
     Timeout = 360,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
-    ?line [N1, A2, Z2] = Cps = start_nodes([n_1, a_2, z_2], peer, Config),
+    [N1, A2, Z2] = Cps = start_nodes([n_1, a_2, z_2], peer, Config),
     Nodes = lists:sort([node() | Cps]),
-    ?line wait_for_ready_net(Config),
-    
+    wait_for_ready_net(Config),
+
     lists:foreach(fun(N) -> 
                           rpc:call(N, ?MODULE, start_tracer, [])
                   end, Nodes),
@@ -2193,20 +2145,19 @@ simple_resolve(Config) when is_list(Config) ->
     %% then a new attempt (nodeup etc.) is made. This time the
     %% resolver does not disconnect any node.
     res(?RES(disconnect_first), Cps, Cf#cf{link = Z2, n2 = Z2,
-                                     nodes = [node(), N1, A2, Z2]}),
+					   nodes = [node(), N1, A2, Z2]}),
 
-    ?line lists:foreach(fun(N) -> 
-                                rpc:call(N, ?MODULE, stop_tracer, [])
-                        end, Nodes),
+    lists:foreach(fun(N) ->
+			  rpc:call(N, ?MODULE, stop_tracer, [])
+		  end, Nodes),
 
-    ?line OrigNames = global:registered_names(),
+    OrigNames = global:registered_names(),
     write_high_level_trace(Config),
     stop_nodes(Cps),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
-simple_resolve2(suite) -> [];
-simple_resolve2(doc) -> ["OTP-5563. Partitions and names."];
+%% OTP-5563. Partitions and names.
 simple_resolve2(Config) when is_list(Config) ->
     %% Continuation of simple_resolve. Of some reason it did not
     %% always work to re-start z_2. "Cannot be a global bug."
@@ -2214,13 +2165,13 @@ simple_resolve2(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
-    ?line [N1, A2, Z2] = Cps = start_nodes([n_1, a_2, z_2], peer, Config),
-    ?line wait_for_ready_net(Config),
+    [N1, A2, Z2] = Cps = start_nodes([n_1, a_2, z_2], peer, Config),
+    wait_for_ready_net(Config),
     Nodes = lists:sort([node() | Cps]),
-    
+
     lists:foreach(fun(N) -> 
                           rpc:call(N, ?MODULE, start_tracer, [])
                   end, Nodes),
@@ -2230,33 +2181,32 @@ simple_resolve2(Config) when is_list(Config) ->
 
     %% Halt z_2. 
     res(?RES(halt_second), Cps, Cf#cf{link = N1, n1 = N1, n2 = Z2, ping  = A2,
-                                nodes = [node(), N1, A2], n_res = 1}),
+				      nodes = [node(), N1, A2], n_res = 1}),
 
-    ?line lists:foreach(fun(N) -> 
-                                rpc:call(N, ?MODULE, stop_tracer, [])
-                        end, Nodes),
+    lists:foreach(fun(N) ->
+			  rpc:call(N, ?MODULE, stop_tracer, [])
+		  end, Nodes),
 
-    ?line OrigNames = global:registered_names(),
+    OrigNames = global:registered_names(),
     write_high_level_trace(Config),
     stop_nodes(Cps), % Not all nodes may be present, but it works anyway.
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
-simple_resolve3(suite) -> [];
-simple_resolve3(doc) -> ["OTP-5563. Partitions and names."];
+%% OTP-5563. Partitions and names.
 simple_resolve3(Config) when is_list(Config) ->
     %% Continuation of simple_resolve.
 
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
-    ?line [N1, A2, Z2] = Cps = start_nodes([n_1, a_2, z_2], peer, Config),
-    ?line wait_for_ready_net(Config),
+    [N1, A2, Z2] = Cps = start_nodes([n_1, a_2, z_2], peer, Config),
+    wait_for_ready_net(Config),
     Nodes = lists:sort([node() | Cps]),
-    
+
     lists:foreach(fun(N) -> 
                           rpc:call(N, ?MODULE, start_tracer, [])
                   end, Nodes),
@@ -2267,27 +2217,27 @@ simple_resolve3(Config) when is_list(Config) ->
     %% Halt a_2. 
     res(?RES(halt_second), Cps, Cf#cf{link = node(), n2 = A2, 
                                       nodes = [node(), N1], n_res = 1}),
-    
-    ?line lists:foreach(fun(N) -> 
-                                rpc:call(N, ?MODULE, stop_tracer, [])
-                        end, Nodes),
 
-    ?line OrigNames = global:registered_names(),
+    lists:foreach(fun(N) ->
+			  rpc:call(N, ?MODULE, stop_tracer, [])
+		  end, Nodes),
+
+    OrigNames = global:registered_names(),
     write_high_level_trace(Config),
     stop_nodes(Cps), % Not all nodes may be present, but it works anyway.
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
 res({Res,Resolver}, [N1, A2, Z2], Cf) ->
     %% Note: there are no links anymore, but monitors.
     #cf{link = LinkedNode, ping = PingNode, n1 = Res1, n2 = OtherNode,
         nodes = Nodes0, n_res = NRes, config = Config} = Cf,
-    ?t:format("~n~nResolver: ~p", [Res]),
-    ?t:format(" Registered on partition 1:  ~p", [Res1]),
-    ?t:format(" Registered on partition 2:  ~p", [OtherNode]),
-    ?t:format(" Pinged node:                ~p", [PingNode]),
-    ?t:format(" Linked node:                ~p", [LinkedNode]),
-    ?t:format(" Expected # resolvers:       ~p", [NRes]),
+    io:format("~n~nResolver: ~p", [Res]),
+    io:format(" Registered on partition 1:  ~p", [Res1]),
+    io:format(" Registered on partition 2:  ~p", [OtherNode]),
+    io:format(" Pinged node:                ~p", [PingNode]),
+    io:format(" Linked node:                ~p", [LinkedNode]),
+    io:format(" Expected # resolvers:       ~p", [NRes]),
     Nodes = lists:sort(Nodes0),
     T1 = node(),
     Part1 = [T1, N1],
@@ -2299,67 +2249,67 @@ res({Res,Resolver}, [N1, A2, Z2], Cf) ->
     %% expected monitors remain between registered processes and the
     %% global_name_server.
 
-    ?line rpc_cast(OtherNode, 
-                   ?MODULE, 
-                   part_2_2, 
-                   [Config, Part1, Part2, [{Name, Resolver}]]),
-    ?line ?UNTIL(is_ready_partition(Config)),
-    ?line {_Pid1, yes} = 
+    rpc_cast(OtherNode,
+	     ?MODULE,
+	     part_2_2,
+	     [Config, Part1, Part2, [{Name, Resolver}]]),
+    ?UNTIL(is_ready_partition(Config)),
+    {_Pid1, yes} =
         rpc:call(Res1, ?MODULE, start_resolver, [Name, Resolver]),
 
-    ?line pong = net_adm:ping(PingNode),
-    ?line wait_for_ready_net(Nodes, Config),
+    pong = net_adm:ping(PingNode),
+    wait_for_ready_net(Nodes, Config),
 
-    ?line check_everywhere(Nodes, Name, Config),
-    ?line case global:whereis_name(Name) of
-              undefined when LinkedNode =:= none -> ok;
-              Pid -> assert_pid(Pid)
-          end,
+    check_everywhere(Nodes, Name, Config),
+    case global:whereis_name(Name) of
+	undefined when LinkedNode =:= none -> ok;
+	Pid -> assert_pid(Pid)
+    end,
 
-    ?line {_, Trace0} = collect_tracers(Nodes),
-    ?line Resolvers = [P || {_Node,new_resolver,{pid,P}} <- Trace0],
+    {_, Trace0} = collect_tracers(Nodes),
+    Resolvers = [P || {_Node,new_resolver,{pid,P}} <- Trace0],
 
-    ?line NRes = length(Resolvers),
+    NRes = length(Resolvers),
 
     %% Wait for extra monitor processes to be created.
     %% This applies as long as global:do_monitor/1 spawns processes.
     %% (Some day monitor() will be truly synchronous.)
-    test_server:sleep(100),
+    ct:sleep(100),
 
-    ?line lists:foreach(fun(P) -> P ! die end, Resolvers),
-    ?line lists:foreach(fun(P) -> wait_for_exit(P) end, Resolvers),
+    lists:foreach(fun(P) -> P ! die end, Resolvers),
+    lists:foreach(fun(P) -> wait_for_exit(P) end, Resolvers),
 
-    ?line check_everywhere(Nodes, Name, Config),
-    ?line undefined = global:whereis_name(Name),
+    check_everywhere(Nodes, Name, Config),
+    undefined = global:whereis_name(Name),
 
     %% Wait for monitors to remove names.
-    test_server:sleep(100),
+    ct:sleep(100),
 
-    ?line {_, Trace1} = collect_tracers(Nodes),
+    {_, Trace1} = collect_tracers(Nodes),
     Trace = Trace0 ++ Trace1, 
 
-    ?line Gs = name_servers([T1, N1, A2, Z2]),
-    ?line MonitoredByNode = monitored_by_node(Trace, Gs),
-    ?line MonitoredBy = [M || {_N,M} <- MonitoredByNode],
-  
+    Gs = name_servers([T1, N1, A2, Z2]),
+    MonitoredByNode = monitored_by_node(Trace, Gs),
+    MonitoredBy = [M || {_N,M} <- MonitoredByNode],
+
     X = MonitoredBy -- Gs,
     LengthGs = length(Gs),
-    ?line case MonitoredBy of
-              [] when LinkedNode =:= none -> ok;
-              Gs -> ok;
-              _ when LengthGs < 4, X =:= [] -> ok;
-              _ -> ?t:format("ERROR:~nMonitoredBy ~p~n"
-                             "global_name_servers ~p~n", 
-                             [MonitoredByNode, Gs]),
-                   ?t:fail(monitor_mismatch)
-          end,
+    case MonitoredBy of
+	[] when LinkedNode =:= none -> ok;
+	Gs -> ok;
+	_ when LengthGs < 4, X =:= [] -> ok;
+	_ -> io:format("ERROR:~nMonitoredBy ~p~n"
+		       "global_name_servers ~p~n",
+		       [MonitoredByNode, Gs]),
+	     ct:fail(monitor_mismatch)
+    end,
     ok.
 
 name_servers(Nodes) ->
     lists:sort([rpc:call(N, erlang, whereis, [global_name_server]) || 
                    N <- Nodes,
                    pong =:= net_adm:ping(N)]).
-    
+
 monitored_by_node(Trace, Servers) ->
     lists:sort([{node(M),M} || 
                    {_Node,_P,died,{monitors_2levels,ML}} <- Trace, 
@@ -2371,7 +2321,7 @@ part_2_2(Config, Part1, Part2, NameResolvers) ->
     make_partition(Config, Part1, Part2),
     lists:foreach
       (fun({Name, Resolver}) ->
-               ?line {Pid2, yes} = start_resolver(Name, Resolver),
+               {Pid2, yes} = start_resolver(Name, Resolver),
                trace_message({node(), part_2_2, nodes(), {pid2,Pid2}})
        end, NameResolvers).
 
@@ -2396,7 +2346,7 @@ exit_resolver(name, _Pid1, _Pid2) ->
 lock_resolver(name, Pid1, _Pid2) ->
     Id = {?MODULE, self()},
     Nodes = [node()],
-    ?line true = global:set_lock(Id, Nodes),
+    true = global:set_lock(Id, Nodes),
     _ = global:del_lock(Id, Nodes),
     Pid1.
 
@@ -2426,7 +2376,7 @@ start_resolver(Name, Resolver) ->
     receive
 	{Pid, Res} -> {Pid, Res}
     end.
-    
+
 init_resolver(Parent, Name, Resolver) ->
     X = global:register_name(Name, self(), Resolver),
     Parent ! {self(), X},
@@ -2455,18 +2405,17 @@ mon_by_servers(Proc) ->
 
 -define(REGNAME, contact_a_2).
 
-leftover_name(suite) -> [];
-leftover_name(doc) -> ["OTP-5563. Bug: nodedown while synching."];
+%% OTP-5563. Bug: nodedown while synching.
 leftover_name(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
-    ?line [N1, A2, Z2] = Cps = start_nodes([n_1, a_2, z_2], peer,  Config),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
+    [N1, A2, Z2] = Cps = start_nodes([n_1, a_2, z_2], peer,  Config),
     Nodes = lists:sort([node() | Cps]),
-    ?line wait_for_ready_net(Config),
-    
+    wait_for_ready_net(Config),
+
     lists:foreach(fun(N) -> 
                           rpc:call(N, ?MODULE, start_tracer, [])
                   end, Nodes),
@@ -2474,20 +2423,20 @@ leftover_name(Config) when is_list(Config) ->
     Name = name, % registered on a_2
     ResName = resolved_name, % registered on n_1 and a_2
     %% 
-    ?line _Pid = ping_a_2_fun(?REGNAME, N1, A2),
+    _Pid = ping_a_2_fun(?REGNAME, N1, A2),
 
     T1 = node(),
     Part1 = [T1, N1],
     Part2 = [A2, Z2],
     NoResolver = {no_module, resolve_none},
     Resolver = fun contact_a_2/3,
-    ?line rpc_cast(A2, 
-                   ?MODULE, part_2_2, [Config,
-                                       Part1, 
-                                       Part2, 
-                                       [{Name, NoResolver},
-                                        {ResName, Resolver}]]),
-    ?line ?UNTIL(is_ready_partition(Config)),
+    rpc_cast(A2,
+	     ?MODULE, part_2_2, [Config,
+				 Part1,
+				 Part2,
+				 [{Name, NoResolver},
+				  {ResName, Resolver}]]),
+    ?UNTIL(is_ready_partition(Config)),
 
     %% resolved_name is resolved to run on a_2, an insert operation is
     %% sent to n_1. The resolver function halts a_2, but the nodedown
@@ -2496,36 +2445,36 @@ leftover_name(Config) when is_list(Config) ->
     %% delayed). Unless "artificial" nodedown messages are sent the
     %% name would linger on indefinitely. [There is no test case for
     %% the situation that no nodedown message at all is sent.]
-    ?line {_Pid1, yes} = 
+    {_Pid1, yes} =
         rpc:call(N1, ?MODULE, start_resolver, 
                  [ResName, fun contact_a_2/3]),
-    test_server:sleep(1000),
+    ct:sleep(1000),
 
-    ?line trace_message({node(), pinging, z_2}),
-    ?line pong = net_adm:ping(Z2),
-    ?line ?UNTIL((Nodes -- [A2]) =:= lists:sort(?NODES)),
-    ?t:sleep(1000),
+    trace_message({node(), pinging, z_2}),
+    pong = net_adm:ping(Z2),
+    ?UNTIL((Nodes -- [A2]) =:= lists:sort(?NODES)),
+    ct:sleep(1000),
 
-    ?line {_,Trace0} = collect_tracers(Nodes),
+    {_,Trace0} = collect_tracers(Nodes),
 
-    ?line Resolvers = [P || {_Node,new_resolver,{pid,P}} <- Trace0],
-    ?line lists:foreach(fun(P) -> P ! die end, Resolvers),
-    ?line lists:foreach(fun(P) -> wait_for_exit(P) end, Resolvers),
+    Resolvers = [P || {_Node,new_resolver,{pid,P}} <- Trace0],
+    lists:foreach(fun(P) -> P ! die end, Resolvers),
+    lists:foreach(fun(P) -> wait_for_exit(P) end, Resolvers),
 
-    ?line lists:foreach(fun(N) -> 
-                                rpc:call(N, ?MODULE, stop_tracer, [])
-                        end, Nodes),
+    lists:foreach(fun(N) ->
+			  rpc:call(N, ?MODULE, stop_tracer, [])
+		  end, Nodes),
 
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+    ?UNTIL(OrigNames =:= global:registered_names()),
     write_high_level_trace(Config),
     stop_nodes(Cps),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
 %% Runs on n_1
 contact_a_2(resolved_name, Pid1, Pid2) ->
     trace_message({node(), ?REGNAME, {pid1,Pid1}, {pid2,Pid2}, 
-                  {node1,node(Pid1)}, {node2,node(Pid2)}}),
+		   {node1,node(Pid1)}, {node2,node(Pid2)}}),
     ?REGNAME ! doit,
     Pid2.
 
@@ -2543,15 +2492,14 @@ ping_a_2(RegName, N1, A2) ->
                 {nodedown, A2} -> ok
             end
     end.
-                     
+
 halt_node(Node) ->
     rpc:call(Node, erlang, halt, []).
 
 %%%-----------------------------------------------------------------
 %%% Testing re-registration of a name.
 %%%-----------------------------------------------------------------
-re_register_name(suite) -> [];
-re_register_name(doc) -> ["OTP-5563. Name is re-registered."];
+%% OTP-5563. Name is re-registered.
 re_register_name(Config) when is_list(Config) ->
     %% When re-registering a name the link to the old pid used to
     %% linger on. Don't think is was a serious bug though--some memory
@@ -2560,18 +2508,18 @@ re_register_name(Config) when is_list(Config) ->
     Timeout = 15,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
+    init_condition(Config),
     Me = self(),
     Pid1 = spawn(fun() -> proc(Me) end),
-    ?line yes = global:register_name(name, Pid1),
+    yes = global:register_name(name, Pid1),
     Pid2 = spawn(fun() -> proc(Me) end),
-    ?line _ = global:re_register_name(name, Pid2),
+    _ = global:re_register_name(name, Pid2),
     Pid2 ! die,
     Pid1 ! die,
     receive {Pid1, MonitoredBy1} -> [] = MonitoredBy1 end,
     receive {Pid2, MonitoredBy2} -> [_] = MonitoredBy2 end,
-    ?line _ = global:unregister_name(name),
-    ?line init_condition(Config),
+    _ = global:unregister_name(name),
+    init_condition(Config),
     ok.
 
 proc(Parent) ->
@@ -2583,15 +2531,14 @@ proc(Parent) ->
 %%%-----------------------------------------------------------------
 %%% 
 %%%-----------------------------------------------------------------
-name_exit(suite) -> [];
-name_exit(doc) -> ["OTP-5563. Registered process dies."];
+%% OTP-5563. Registered process dies.
 name_exit(Config) when is_list(Config) ->
     StartFun = fun() ->
                        {ok, N1} = start_node_rel(n_1, this, Config),
                        {ok, N2} = start_node_rel(n_2, this, Config),
                        [N1, N2]
                end,
-    ?t:format("Test of current release~n"),    
+    io:format("Test of current release~n"),
     do_name_exit(StartFun, current, Config).
 
 do_name_exit(StartFun, Version, Config) ->
@@ -2607,17 +2554,17 @@ do_name_exit(StartFun, Version, Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
     %% Three nodes (test_server, n_1, n_2). 
-    ?line Cps = StartFun(),
+    Cps = StartFun(),
     Nodes = lists:sort([node() | Cps]),
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
     lists:foreach(fun(N) -> rpc:call(N, ?MODULE, start_tracer, []) end,Nodes),
 
     Name = name,
-    ?line {Pid, yes} = start_proc(Name),
+    {Pid, yes} = start_proc(Name),
 
     Me = self(),
     LL = spawn(fun() -> long_lock(Me) end),
@@ -2628,23 +2575,23 @@ do_name_exit(StartFun, Version, Config) ->
     Pid ! die,                    
     wait_for_exit_fast(Pid),
 
-    ?t:sleep(100),
+    ct:sleep(100),
     %% Name has been removed from node()'s table, but nowhere else
     %% since there is a lock on 'global'.
     {R1,[]} = rpc:multicall(Nodes, global, whereis_name, [Name]),
-    ?line case Version of
-              old -> [_,_] = lists:usort(R1);
-              current -> [undefined, undefined, undefined] = R1
-          end,
-    ?t:sleep(3000),
-    ?line check_everywhere(Nodes, Name, Config),
+    case Version of
+	old -> [_,_] = lists:usort(R1);
+	current -> [undefined, undefined, undefined] = R1
+    end,
+    ct:sleep(3000),
+    check_everywhere(Nodes, Name, Config),
 
     lists:foreach(fun(N) -> rpc:call(N, ?MODULE, stop_tracer, []) end, Nodes),
-    ?line OrigNames = global:registered_names(),
+    OrigNames = global:registered_names(),
     exit(LL, kill),
     write_high_level_trace(Config),
     stop_nodes(Cps),
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
 long_lock(Parent) ->
@@ -2657,17 +2604,16 @@ long_lock(Parent) ->
 %%%-----------------------------------------------------------------
 %%% Testing the support for external nodes (cnodes)
 %%%-----------------------------------------------------------------
-external_nodes(suite) -> [];
-external_nodes(doc) -> ["OTP-5563. External nodes (cnodes)."];
+%% OTP-5563. External nodes (cnodes).
 external_nodes(Config) when is_list(Config) ->
     Timeout = 30,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
-    ?line [NodeB, NodeC] = start_nodes([b, c], peer, Config),
-    ?line wait_for_ready_net(Config),
+    [NodeB, NodeC] = start_nodes([b, c], peer, Config),
+    wait_for_ready_net(Config),
 
     %% Nodes = ?NODES,
     %% lists:foreach(fun(N) -> rpc:call(N, ?MODULE, start_tracer, []) end,
@@ -2676,75 +2622,75 @@ external_nodes(Config) when is_list(Config) ->
 
     %% Two partitions: [test_server] and [b, c].
     %% c registers an external name on b
-    ?line rpc_cast(NodeB, ?MODULE, part_ext, 
-                   [Config, node(), NodeC, Name]),
-    ?line ?UNTIL(is_ready_partition(Config)),
+    rpc_cast(NodeB, ?MODULE, part_ext,
+	     [Config, node(), NodeC, Name]),
+    ?UNTIL(is_ready_partition(Config)),
 
-    ?line pong = net_adm:ping(NodeB),
-    ?line ?UNTIL([NodeB, NodeC] =:= lists:sort(nodes())),
-    ?line wait_for_ready_net(Config),
+    pong = net_adm:ping(NodeB),
+    ?UNTIL([NodeB, NodeC] =:= lists:sort(nodes())),
+    wait_for_ready_net(Config),
 
-    ?line Cpid = rpc:call(NodeC, erlang, whereis, [Name]),
+    Cpid = rpc:call(NodeC, erlang, whereis, [Name]),
     ExternalName = [{name,Cpid,NodeB}],
-    ?line ExternalName = get_ext_names(),
-    ?line ExternalName = rpc:call(NodeB, gen_server, call, 
-                                  [global_name_server, get_names_ext]),
-    ?line ExternalName = rpc:call(NodeC, gen_server, call, 
-                                  [global_name_server, get_names_ext]),
-
-    ?line [_] = cnode_links(Cpid),
-    ?line [_,_,_] = cnode_monitored_by(Cpid),
-    ?line no = global:register_name(Name, self()),
-    ?line yes = global:re_register_name(Name, self()),
-    ?line ?UNTIL([] =:= cnode_monitored_by(Cpid)),
-    ?line ?UNTIL([] =:= cnode_links(Cpid)),
-    ?line [] = gen_server:call(global_name_server, get_names_ext, infinity),
-
-    ?line Cpid ! {register, self(), Name},
-    ?line receive {Cpid, Reply1} -> no = Reply1 end,
-    ?line _ = global:unregister_name(Name),
-    test_server:sleep(1000),
-    ?line Cpid ! {register, self(), Name},
-    ?line ?UNTIL(length(get_ext_names()) =:= 1),
-    ?line receive {Cpid, Reply2} -> yes = Reply2 end,
-
-    ?line Cpid ! {unregister, self(), Name},
-    ?line ?UNTIL(length(get_ext_names()) =:= 0),
-    ?line receive {Cpid, Reply3} -> ok = Reply3 end,
+    ExternalName = get_ext_names(),
+    ExternalName = rpc:call(NodeB, gen_server, call,
+			    [global_name_server, get_names_ext]),
+    ExternalName = rpc:call(NodeC, gen_server, call,
+			    [global_name_server, get_names_ext]),
+
+    [_] = cnode_links(Cpid),
+    [_,_,_] = cnode_monitored_by(Cpid),
+    no = global:register_name(Name, self()),
+    yes = global:re_register_name(Name, self()),
+    ?UNTIL([] =:= cnode_monitored_by(Cpid)),
+    ?UNTIL([] =:= cnode_links(Cpid)),
+    [] = gen_server:call(global_name_server, get_names_ext, infinity),
+
+    Cpid ! {register, self(), Name},
+    receive {Cpid, Reply1} -> no = Reply1 end,
+    _ = global:unregister_name(Name),
+    ct:sleep(1000),
+    Cpid ! {register, self(), Name},
+    ?UNTIL(length(get_ext_names()) =:= 1),
+    receive {Cpid, Reply2} -> yes = Reply2 end,
+
+    Cpid ! {unregister, self(), Name},
+    ?UNTIL(length(get_ext_names()) =:= 0),
+    receive {Cpid, Reply3} -> ok = Reply3 end,
 
     Cpid ! die,
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
-    ?line [] = get_ext_names(),
-    ?line [] = rpc:call(NodeB, gen_server, call, 
-                        [global_name_server, get_names_ext]),
-    ?line [] = rpc:call(NodeC, gen_server, call, 
-                        [global_name_server, get_names_ext]),
+    ?UNTIL(OrigNames =:= global:registered_names()),
+    [] = get_ext_names(),
+    [] = rpc:call(NodeB, gen_server, call,
+		  [global_name_server, get_names_ext]),
+    [] = rpc:call(NodeC, gen_server, call,
+		  [global_name_server, get_names_ext]),
 
-    ?line Cpid2 = erlang:spawn(NodeC, fun() -> cnode_proc(NodeB) end),
-    ?line Cpid2 ! {register, self(), Name},
-    ?line receive {Cpid2, Reply4} -> yes = Reply4 end,
+    Cpid2 = erlang:spawn(NodeC, fun() -> cnode_proc(NodeB) end),
+    Cpid2 ! {register, self(), Name},
+    receive {Cpid2, Reply4} -> yes = Reply4 end,
 
     %% It could be a bug that Cpid2 is linked to 'global_name_server'
     %% at node 'b'. The effect: Cpid2 dies when node 'b' crashes.
     stop_node(NodeB),
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
-    ?line [] = get_ext_names(),
-    ?line [] = rpc:call(NodeC, gen_server, call, 
-                        [global_name_server, get_names_ext]),
+    ?UNTIL(OrigNames =:= global:registered_names()),
+    [] = get_ext_names(),
+    [] = rpc:call(NodeC, gen_server, call,
+		  [global_name_server, get_names_ext]),
 
-    %% ?line {_, Trace} = collect_tracers(Nodes),
+    %% {_, Trace} = collect_tracers(Nodes),
     %% lists:foreach(fun(M) -> erlang:display(M) end, Trace),
 
     ThisNode = node(),
-    ?line Cpid3 = erlang:spawn(NodeC, fun() -> cnode_proc(ThisNode) end),
-    ?line Cpid3 ! {register, self(), Name},
-    ?line receive {Cpid3, Reply5} -> yes = Reply5 end,
+    Cpid3 = erlang:spawn(NodeC, fun() -> cnode_proc(ThisNode) end),
+    Cpid3 ! {register, self(), Name},
+    receive {Cpid3, Reply5} -> yes = Reply5 end,
 
-    ?line ?UNTIL(length(get_ext_names()) =:= 1),
+    ?UNTIL(length(get_ext_names()) =:= 1),
     stop_node(NodeC),
-    ?line ?UNTIL(length(get_ext_names()) =:= 0),
+    ?UNTIL(length(get_ext_names()) =:= 0),
 
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
 get_ext_names() ->
@@ -2791,19 +2737,16 @@ cnode_proc(E) ->
     cnode_proc(E).
 
 
-many_nodes(suite) ->
-    [];
-many_nodes(doc) ->
-    ["OTP-5770. Start many nodes. Make them connect at the same time."];
+%% OTP-5770. Start many nodes. Make them connect at the same time.
 many_nodes(Config) when is_list(Config) ->
     Timeout = 240,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
 
     {Rels, N_cps} = 
-        case ?t:os_type() of
+        case test_server:os_type() of
             {unix, Osname} when Osname =:= linux; 
                                 Osname =:= openbsd; 
                                 Osname =:= darwin ->
@@ -2814,12 +2757,12 @@ many_nodes(Config) when is_list(Config) ->
             _ -> 
                 {node_rel(1, 32, this), 32}
         end,
-    ?line Cps = [begin {ok, Cp} = start_node_rel(Name, Rel, Config), Cp end ||
-                    {Name,Rel} <- Rels],
+    Cps = [begin {ok, Cp} = start_node_rel(Name, Rel, Config), Cp end ||
+	      {Name,Rel} <- Rels],
     Nodes = lists:sort(?NODES),
-    ?line wait_for_ready_net(Nodes, Config),
+    wait_for_ready_net(Nodes, Config),
 
-    ?line Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     GoFile = filename:join([Dir, "go.txt"]),
     file:delete(GoFile),
 
@@ -2830,34 +2773,34 @@ many_nodes(Config) when is_list(Config) ->
                 file:delete(File),
                 rpc_cast(N, ?MODULE, isolated_node, [File, GoFile, Cps, Config])
         end,
-    ?line lists:foreach(IsoFun, CpsFiles),
-    
-    ?line all_nodes_files(CpsFiles, "isolated", Config),
-    ?line Time = msec(),
-    ?line sync_until(),
+    lists:foreach(IsoFun, CpsFiles),
+
+    all_nodes_files(CpsFiles, "isolated", Config),
+    Time = msec(),
+    sync_until(),
     erlang:display(ready_to_go),
-    ?line touch(GoFile, "go"),
-    ?line all_nodes_files(CpsFiles, "done", Config),
-    ?line Time2 = msec(),
+    touch(GoFile, "go"),
+    all_nodes_files(CpsFiles, "done", Config),
+    Time2 = msec(),
 
-    ?line lists:foreach(fun(N) -> pong = net_adm:ping(N) end, Cps),
+    lists:foreach(fun(N) -> pong = net_adm:ping(N) end, Cps),
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
     write_high_level_trace(Config), % The test succeeded, but was it slow?
 
-    ?line lists:foreach(fun({_N, File}) -> file:delete(File) end, CpsFiles),
-    ?line file:delete(GoFile),
+    lists:foreach(fun({_N, File}) -> file:delete(File) end, CpsFiles),
+    file:delete(GoFile),
 
-    ?line ?UNTIL(OrigNames =:= global:registered_names()),
+    ?UNTIL(OrigNames =:= global:registered_names()),
     write_high_level_trace(Config),
-    ?line stop_nodes(Cps),
-    ?line init_condition(Config),
+    stop_nodes(Cps),
+    init_condition(Config),
     Diff = Time2 - Time,
     Return = lists:flatten(io_lib:format("~w nodes took ~w ms", 
                                          [N_cps, Diff])),
     erlang:display({{nodes,N_cps},{time,Diff}}),
-    ?t:format("~s~n", [Return]),
+    io:format("~s~n", [Return]),
     {comment, Return}.
 
 node_rel(From, To, Rel) ->
@@ -2883,7 +2826,7 @@ isolated_node(File, GoFile, Nodes, Config) ->
     touch(File, "got_go"),
     lists:foreach(fun(N) -> _ = net_adm:ping(N) end, shuffle(Nodes)),
     touch(File, "pinged"),
-    ?line ?UNTIL((Ns -- get_known(node())) =:= []),
+    ?UNTIL((Ns -- get_known(node())) =:= []),
     touch(File, "done").
 
 touch(File, List) ->
@@ -2931,19 +2874,17 @@ sync_until(LogFile) ->
     timer:sleep(Time).
 
 shuffle(L) ->
-    [E || {_, E} <- lists:keysort(1, [{random:uniform(), E} || E <- L])].
+    [E || {_, E} <- lists:keysort(1, [{rand:uniform(), E} || E <- L])].
 
-sync_0(suite) -> [];
-sync_0(doc) ->
-    ["OTP-5770. sync/0."];
+%% OTP-5770. sync/0.
 sync_0(Config) when is_list(Config) ->
     Timeout = 180,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
+    init_condition(Config),
 
     N_cps = 
-        case ?t:os_type() of
+        case test_server:os_type() of
             {unix, Osname} when Osname =:= linux; 
                                 Osname =:= openbsd; 
                                 Osname =:= darwin ->
@@ -2958,82 +2899,80 @@ sync_0(Config) when is_list(Config) ->
 
     Names = [lists:concat([cp,N]) || N <- lists:seq(1, N_cps)],
     Cps = start_and_sync(Names),
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
     write_high_level_trace(Config),
     stop_nodes(Cps),
 
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
 start_and_sync([]) ->
     [];
 start_and_sync([Name | Names]) ->
-    ?line {ok, N} = start_node(Name, slave, []),
-    ?line {Time, _Void} = rpc:call(N, timer, tc, [global, sync, []]),
-    ?t:format("~p: ~p~n", [Name, Time]),
+    {ok, N} = start_node(Name, slave, []),
+    {Time, _Void} = rpc:call(N, timer, tc, [global, sync, []]),
+    io:format("~p: ~p~n", [Name, Time]),
     [N | start_and_sync(Names)].
 
 %%%-----------------------------------------------------------------
 %%% Testing of change of global_groups parameter.
 %%%-----------------------------------------------------------------
-global_groups_change(suite) -> [];
-global_groups_change(doc) -> ["Test change of global_groups parameter."];
+%% Test change of global_groups parameter.
 global_groups_change(Config) ->
     Timeout = 90,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),
-    ?line M = from($@, atom_to_list(node())),
-
-    % Create the .app files and the boot script
-    ?line {KernelVer, StdlibVer} = create_script_dc("dc"),
-    ?line case is_real_system(KernelVer, StdlibVer) of
-	      true ->
-		  Options = [];
-	      false  ->
-		  Options = [local]
-	  end,
+    init_condition(Config),
+    M = from($@, atom_to_list(node())),
+
+    %% Create the .app files and the boot script
+    {KernelVer, StdlibVer} = create_script_dc("dc"),
+    case is_real_system(KernelVer, StdlibVer) of
+	true ->
+	    Options = [];
+	false  ->
+	    Options = [local]
+    end,
+
+    ok = systools:make_script("dc", Options),
 
-    ?line ok = systools:make_script("dc", Options),
-    
     [Ncp1,Ncp2,Ncp3,Ncp4,Ncp5,NcpA,NcpB,NcpC,NcpD,NcpE] = 
         node_names([cp1,cp2,cp3,cp4,cp5,cpA,cpB,cpC,cpD,cpE], Config),
 
-    % Write config files
-    ?line Dir = ?config(priv_dir,Config),
-    ?line {ok, Fd_dc} = file:open(filename:join(Dir, "sys.config"), [write]),
-    ?line config_dc1(Fd_dc, Ncp1, Ncp2, Ncp3, NcpA, NcpB, NcpC, NcpD, NcpE),
-    ?line file:close(Fd_dc),
-    ?line Config1 = filename:join(Dir, "sys"),
-    
-    % Test [cp1, cp2, cp3]
-    ?line {ok, Cp1} = start_node_boot(Ncp1, Config1, dc),
-    ?line {ok, Cp2} = start_node_boot(Ncp2, Config1, dc),
-    ?line {ok, Cp3} = start_node_boot(Ncp3, Config1, dc),
-    ?line {ok, CpA} = start_node_boot(NcpA, Config1, dc),
-    ?line {ok, CpB} = start_node_boot(NcpB, Config1, dc),
-    ?line {ok, CpC} = start_node_boot(NcpC, Config1, dc),
-    ?line {ok, CpD} = start_node_boot(NcpD, Config1, dc),
-    ?line {ok, CpE} = start_node_boot(NcpE, Config1, dc),
-
-    ?line pong = rpc:call(Cp1, net_adm, ping, [Cp2]),
-    ?line pong = rpc:call(Cp1, net_adm, ping, [Cp3]),
-    ?line pang = rpc:call(Cp1, net_adm, ping,
-                          [list_to_atom(lists:concat(["cp5@", M]))]),
-    ?line pong = rpc:call(Cp2, net_adm, ping, [Cp3]),
-    ?line pang = rpc:call(Cp2, net_adm, ping,
-                          [list_to_atom(lists:concat(["cp5@", M]))]),
-
-    ?line {TestGG4, yes} = rpc:call(CpB, ?MODULE, start_proc, [test]),
-    ?line {TestGG5, yes} = rpc:call(CpE, ?MODULE, start_proc, [test]),
-
-
-    ?line pong = rpc:call(CpA, net_adm, ping, [CpC]),
-    ?line pong = rpc:call(CpC, net_adm, ping, [CpB]),
-    ?line pong = rpc:call(CpD, net_adm, ping, [CpC]),
-    ?line pong = rpc:call(CpE, net_adm, ping, [CpD]),
-
-    ?line
+    %% Write config files
+    Dir = proplists:get_value(priv_dir,Config),
+    {ok, Fd_dc} = file:open(filename:join(Dir, "sys.config"), [write]),
+    config_dc1(Fd_dc, Ncp1, Ncp2, Ncp3, NcpA, NcpB, NcpC, NcpD, NcpE),
+    file:close(Fd_dc),
+    Config1 = filename:join(Dir, "sys"),
+
+    %% Test [cp1, cp2, cp3]
+    {ok, Cp1} = start_node_boot(Ncp1, Config1, dc),
+    {ok, Cp2} = start_node_boot(Ncp2, Config1, dc),
+    {ok, Cp3} = start_node_boot(Ncp3, Config1, dc),
+    {ok, CpA} = start_node_boot(NcpA, Config1, dc),
+    {ok, CpB} = start_node_boot(NcpB, Config1, dc),
+    {ok, CpC} = start_node_boot(NcpC, Config1, dc),
+    {ok, CpD} = start_node_boot(NcpD, Config1, dc),
+    {ok, CpE} = start_node_boot(NcpE, Config1, dc),
+
+    pong = rpc:call(Cp1, net_adm, ping, [Cp2]),
+    pong = rpc:call(Cp1, net_adm, ping, [Cp3]),
+    pang = rpc:call(Cp1, net_adm, ping,
+		    [list_to_atom(lists:concat(["cp5@", M]))]),
+    pong = rpc:call(Cp2, net_adm, ping, [Cp3]),
+    pang = rpc:call(Cp2, net_adm, ping,
+		    [list_to_atom(lists:concat(["cp5@", M]))]),
+
+    {TestGG4, yes} = rpc:call(CpB, ?MODULE, start_proc, [test]),
+    {TestGG5, yes} = rpc:call(CpE, ?MODULE, start_proc, [test]),
+
+
+    pong = rpc:call(CpA, net_adm, ping, [CpC]),
+    pong = rpc:call(CpC, net_adm, ping, [CpB]),
+    pong = rpc:call(CpD, net_adm, ping, [CpC]),
+    pong = rpc:call(CpE, net_adm, ping, [CpD]),
+
     ?UNTIL(begin
                TestGG4_1 = rpc:call(CpA, global, whereis_name, [test]),
                TestGG4_2 = rpc:call(CpB, global, whereis_name, [test]),
@@ -3050,88 +2989,87 @@ global_groups_change(Config) ->
                (TestGG5_2 =:= TestGG5)
            end),
 
-    ?line ?t:format( "#### nodes() ~p~n",[nodes()]),
+    io:format( "#### nodes() ~p~n",[nodes()]),
 
-    ?line XDcWa1 = rpc:call(Cp1, global_group, info, []),
-    ?line XDcWa2 = rpc:call(Cp2, global_group, info, []),
-    ?line XDcWa3 = rpc:call(Cp3, global_group, info, []),
-    ?line ?t:format( "#### XDcWa1 ~p~n",[XDcWa1]),
-    ?line ?t:format( "#### XDcWa2 ~p~n",[XDcWa2]),
-    ?line ?t:format( "#### XDcWa3 ~p~n",[XDcWa3]),
+    XDcWa1 = rpc:call(Cp1, global_group, info, []),
+    XDcWa2 = rpc:call(Cp2, global_group, info, []),
+    XDcWa3 = rpc:call(Cp3, global_group, info, []),
+    io:format( "#### XDcWa1 ~p~n",[XDcWa1]),
+    io:format( "#### XDcWa2 ~p~n",[XDcWa2]),
+    io:format( "#### XDcWa3 ~p~n",[XDcWa3]),
+
+    stop_node(CpC),
 
-    ?line stop_node(CpC),
- 
     %% Read the current configuration parameters, and change them
-    ?line OldEnv = 
+    OldEnv =
         rpc:call(Cp1, application_controller, prep_config_change, []),
-    ?line {value, {kernel, OldKernel}} = lists:keysearch(kernel, 1, OldEnv),
+    {value, {kernel, OldKernel}} = lists:keysearch(kernel, 1, OldEnv),
 
-    ?line GG1 = 
+    GG1 =
         lists:sort([mk_node(Ncp1, M), mk_node(Ncp2, M), mk_node(Ncp5, M)]),
-    ?line GG2 = lists:sort([mk_node(Ncp3, M)]),
-    ?line GG3 = lists:sort([mk_node(Ncp4, M)]),
-    ?line GG4 = lists:sort([mk_node(NcpA, M), mk_node(NcpB, M)]),
-    ?line GG5 = 
+    GG2 = lists:sort([mk_node(Ncp3, M)]),
+    GG3 = lists:sort([mk_node(Ncp4, M)]),
+    GG4 = lists:sort([mk_node(NcpA, M), mk_node(NcpB, M)]),
+    GG5 =
         lists:sort([mk_node(NcpC, M), mk_node(NcpD, M), mk_node(NcpE, M)]),
 
-    ?line NewNG = {global_groups,[{gg1, normal, GG1},
-				  {gg2, normal, GG2},
-				  {gg3, normal, GG3},
-				  {gg4, normal, GG4},
-				  {gg5, hidden, GG5}]},
-    
-    ?line NewKernel = 
+    NewNG = {global_groups,[{gg1, normal, GG1},
+			    {gg2, normal, GG2},
+			    {gg3, normal, GG3},
+			    {gg4, normal, GG4},
+			    {gg5, hidden, GG5}]},
+
+    NewKernel =
         [{kernel, lists:keyreplace(global_groups, 1, OldKernel, NewNG)}],
-    ?line ok = rpc:call(Cp1, application_controller, test_change_apps, 
-			[[kernel], [NewKernel]]),
-    ?line ok = rpc:call(Cp2, application_controller, test_change_apps, 
-			[[kernel], [NewKernel]]),
-    ?line ok = rpc:call(Cp3, application_controller, test_change_apps, 
-			[[kernel], [NewKernel]]),
-    ?line ok = rpc:call(CpA, application_controller, test_change_apps, 
-			[[kernel], [NewKernel]]),
-    ?line ok = rpc:call(CpB, application_controller, test_change_apps, 
-			[[kernel], [NewKernel]]),
-    ?line ok = rpc:call(CpD, application_controller, test_change_apps, 
-			[[kernel], [NewKernel]]),
-    ?line ok = rpc:call(CpE, application_controller, test_change_apps, 
-			[[kernel], [NewKernel]]),
-    
-    ?line ?t:format("####  ~p~n",[multicall]),
-    ?line ?t:format( "####  ~p~n",[multicall]),
+    ok = rpc:call(Cp1, application_controller, test_change_apps,
+		  [[kernel], [NewKernel]]),
+    ok = rpc:call(Cp2, application_controller, test_change_apps,
+		  [[kernel], [NewKernel]]),
+    ok = rpc:call(Cp3, application_controller, test_change_apps,
+		  [[kernel], [NewKernel]]),
+    ok = rpc:call(CpA, application_controller, test_change_apps,
+		  [[kernel], [NewKernel]]),
+    ok = rpc:call(CpB, application_controller, test_change_apps,
+		  [[kernel], [NewKernel]]),
+    ok = rpc:call(CpD, application_controller, test_change_apps,
+		  [[kernel], [NewKernel]]),
+    ok = rpc:call(CpE, application_controller, test_change_apps,
+		  [[kernel], [NewKernel]]),
+
+    io:format("####  ~p~n",[multicall]),
+    io:format( "####  ~p~n",[multicall]),
     %% no idea to check the result from the rpc because the other
     %% nodes will disconnect test server, and thus the result will
     %% always be {badrpc, nodedown}
-    ?line rpc:multicall([Cp1, Cp2, Cp3, CpA, CpB, CpD, CpE], 
-                        application_controller, config_change, [OldEnv]),
+    rpc:multicall([Cp1, Cp2, Cp3, CpA, CpB, CpD, CpE],
+		  application_controller, config_change, [OldEnv]),
 
-    ?line {ok, Fd_dc2} = file:open(filename:join(Dir, "sys2.config"), [write]),
-    ?line config_dc2(Fd_dc2, NewNG, Ncp1, Ncp2, Ncp3),
-    ?line file:close(Fd_dc2),
-    ?line Config2 = filename:join(Dir, "sys2"),
-    ?line {ok, CpC} = start_node_boot(NcpC, Config2, dc),
+    {ok, Fd_dc2} = file:open(filename:join(Dir, "sys2.config"), [write]),
+    config_dc2(Fd_dc2, NewNG, Ncp1, Ncp2, Ncp3),
+    file:close(Fd_dc2),
+    Config2 = filename:join(Dir, "sys2"),
+    {ok, CpC} = start_node_boot(NcpC, Config2, dc),
 
-    ?line sync_and_wait(CpA),
-    ?line sync_and_wait(CpD),
-    
-    ?line pong = rpc:call(CpA, net_adm, ping, [CpC]),
-    ?line pong = rpc:call(CpC, net_adm, ping, [CpB]),
-    ?line pong = rpc:call(CpD, net_adm, ping, [CpC]),
-    ?line pong = rpc:call(CpE, net_adm, ping, [CpD]),
-    
-    ?line GG5 = 
+    sync_and_wait(CpA),
+    sync_and_wait(CpD),
+
+    pong = rpc:call(CpA, net_adm, ping, [CpC]),
+    pong = rpc:call(CpC, net_adm, ping, [CpB]),
+    pong = rpc:call(CpD, net_adm, ping, [CpC]),
+    pong = rpc:call(CpE, net_adm, ping, [CpD]),
+
+    GG5 =
         lists:sort([mk_node(NcpC, M)|rpc:call(CpC, erlang, nodes, [])]),
-    ?line GG5 = 
+    GG5 =
         lists:sort([mk_node(NcpD, M)|rpc:call(CpD, erlang, nodes, [])]),
-    ?line GG5 = 
+    GG5 =
         lists:sort([mk_node(NcpE, M)|rpc:call(CpE, erlang, nodes, [])]),
 
-    ?line false = 
+    false =
         lists:member(mk_node(NcpC, M), rpc:call(CpA, erlang, nodes, [])),
-    ?line false = 
+    false =
         lists:member(mk_node(NcpC, M), rpc:call(CpB, erlang, nodes, [])),
 
-    ?line
     ?UNTIL(begin
                TestGG4a = rpc:call(CpA, global, whereis_name, [test]),
                TestGG4b = rpc:call(CpB, global, whereis_name, [test]),
@@ -3148,171 +3086,171 @@ global_groups_change(Config) ->
                (TestGG5 =:= TestGG5e)
            end),
 
-    ?line Info1 = rpc:call(Cp1, global_group, info, []),
-    ?line Info2 = rpc:call(Cp2, global_group, info, []),
-    ?line Info3 = rpc:call(Cp3, global_group, info, []),
-    ?line InfoA = rpc:call(CpA, global_group, info, []),
-    ?line InfoB = rpc:call(CpB, global_group, info, []),
-    ?line InfoC = rpc:call(CpC, global_group, info, []),
-    ?line InfoD = rpc:call(CpD, global_group, info, []),
-    ?line InfoE = rpc:call(CpE, global_group, info, []),
-    ?line ?t:format( "#### Info1 ~p~n",[Info1]),
-    ?line ?t:format( "#### Info2 ~p~n",[Info2]),
-    ?line ?t:format( "#### Info3 ~p~n",[Info3]),
-    ?line ?t:format( "#### InfoA ~p~n",[InfoA]),
-    ?line ?t:format( "#### InfoB ~p~n",[InfoB]),
-    ?line ?t:format( "#### InfoC ~p~n",[InfoC]),
-    ?line ?t:format( "#### InfoD ~p~n",[InfoD]),
-    ?line ?t:format( "#### InfoE ~p~n",[InfoE]),
-
-    ?line {global_groups, GGNodes} = NewNG,
-
-    ?line Info1ok = [{state, synced},
-		     {own_group_name, gg1},
-		     {own_group_nodes, GG1},
-		     {synced_nodes, [mk_node(Ncp2, M)]},
-		     {sync_error, []},
-		     {no_contact, [mk_node(Ncp5, M)]},
-		     {other_groups, remove_gg_pub_type(lists:keydelete
-                                                          (gg1, 1, GGNodes))},
-		     {monitoring, []}],
-    
-    
-    ?line Info2ok = [{state, synced},
-		     {own_group_name, gg1},
-		     {own_group_nodes, GG1},
-		     {synced_nodes, [mk_node(Ncp1, M)]},
-		     {sync_error, []},
-		     {no_contact, [mk_node(Ncp5, M)]},
-		     {other_groups, remove_gg_pub_type(lists:keydelete
-                                                          (gg1, 1, GGNodes))},
-		     {monitoring, []}],
-    
-    ?line Info3ok = [{state, synced},
-		     {own_group_name, gg2},
-		     {own_group_nodes, GG2},
-		     {synced_nodes, []},
-		     {sync_error, []},
-		     {no_contact, []},
-		     {other_groups, remove_gg_pub_type(lists:keydelete
-                                                          (gg2, 1, GGNodes))},
-		     {monitoring, []}],
-
-    ?line InfoAok = [{state, synced},
-		     {own_group_name, gg4},
-		     {own_group_nodes, GG4},
-		     {synced_nodes, lists:delete(mk_node(NcpA, M), GG4)},
-		     {sync_error, []},
-		     {no_contact, []},
-		     {other_groups, remove_gg_pub_type(lists:keydelete
-                                                          (gg4, 1, GGNodes))},
-		     {monitoring, []}],
-
-    ?line InfoBok = [{state, synced},
-		     {own_group_name, gg4},
-		     {own_group_nodes, GG4},
-		     {synced_nodes, lists:delete(mk_node(NcpB, M), GG4)},
-		     {sync_error, []},
-		     {no_contact, []},
-		     {other_groups, remove_gg_pub_type(lists:keydelete
-                                                          (gg4, 1, GGNodes))},
-		     {monitoring, []}],
-
-    ?line InfoCok = [{state, synced},
-		     {own_group_name, gg5},
-		     {own_group_nodes, GG5},
-		     {synced_nodes, lists:delete(mk_node(NcpC, M), GG5)},
-		     {sync_error, []},
-		     {no_contact, []},
-		     {other_groups, remove_gg_pub_type(lists:keydelete
-                                                          (gg5, 1, GGNodes))},
-		     {monitoring, []}],
-
-    ?line InfoDok = [{state, synced},
-		     {own_group_name, gg5},
-		     {own_group_nodes, GG5},
-		     {synced_nodes, lists:delete(mk_node(NcpD, M), GG5)},
-		     {sync_error, []},
-		     {no_contact, []},
-		     {other_groups, remove_gg_pub_type(lists:keydelete
-                                                          (gg5, 1, GGNodes))},
-		     {monitoring, []}],
-
-    ?line InfoEok = [{state, synced},
-		     {own_group_name, gg5},
-		     {own_group_nodes, GG5},
-		     {synced_nodes, lists:delete(mk_node(NcpE, M), GG5)},
-		     {sync_error, []},
-		     {no_contact, []},
-		     {other_groups, remove_gg_pub_type(lists:keydelete
-                                                          (gg5, 1, GGNodes))},
-		     {monitoring, []}],
-    
-
-    ?line case Info1 of
-	      Info1ok -> 
-		  ok;
-	      _ ->
-		  test_server:fail({{"could not change the global groups"
-                                     " in node", Cp1}, {Info1, Info1ok}})
-	  end,
+    Info1 = rpc:call(Cp1, global_group, info, []),
+    Info2 = rpc:call(Cp2, global_group, info, []),
+    Info3 = rpc:call(Cp3, global_group, info, []),
+    InfoA = rpc:call(CpA, global_group, info, []),
+    InfoB = rpc:call(CpB, global_group, info, []),
+    InfoC = rpc:call(CpC, global_group, info, []),
+    InfoD = rpc:call(CpD, global_group, info, []),
+    InfoE = rpc:call(CpE, global_group, info, []),
+    io:format( "#### Info1 ~p~n",[Info1]),
+    io:format( "#### Info2 ~p~n",[Info2]),
+    io:format( "#### Info3 ~p~n",[Info3]),
+    io:format( "#### InfoA ~p~n",[InfoA]),
+    io:format( "#### InfoB ~p~n",[InfoB]),
+    io:format( "#### InfoC ~p~n",[InfoC]),
+    io:format( "#### InfoD ~p~n",[InfoD]),
+    io:format( "#### InfoE ~p~n",[InfoE]),
+
+    {global_groups, GGNodes} = NewNG,
+
+    Info1ok = [{state, synced},
+	       {own_group_name, gg1},
+	       {own_group_nodes, GG1},
+	       {synced_nodes, [mk_node(Ncp2, M)]},
+	       {sync_error, []},
+	       {no_contact, [mk_node(Ncp5, M)]},
+	       {other_groups, remove_gg_pub_type(lists:keydelete
+						   (gg1, 1, GGNodes))},
+	       {monitoring, []}],
+
+
+    Info2ok = [{state, synced},
+	       {own_group_name, gg1},
+	       {own_group_nodes, GG1},
+	       {synced_nodes, [mk_node(Ncp1, M)]},
+	       {sync_error, []},
+	       {no_contact, [mk_node(Ncp5, M)]},
+	       {other_groups, remove_gg_pub_type(lists:keydelete
+						   (gg1, 1, GGNodes))},
+	       {monitoring, []}],
+
+    Info3ok = [{state, synced},
+	       {own_group_name, gg2},
+	       {own_group_nodes, GG2},
+	       {synced_nodes, []},
+	       {sync_error, []},
+	       {no_contact, []},
+	       {other_groups, remove_gg_pub_type(lists:keydelete
+						   (gg2, 1, GGNodes))},
+	       {monitoring, []}],
+
+    InfoAok = [{state, synced},
+	       {own_group_name, gg4},
+	       {own_group_nodes, GG4},
+	       {synced_nodes, lists:delete(mk_node(NcpA, M), GG4)},
+	       {sync_error, []},
+	       {no_contact, []},
+	       {other_groups, remove_gg_pub_type(lists:keydelete
+						   (gg4, 1, GGNodes))},
+	       {monitoring, []}],
+
+    InfoBok = [{state, synced},
+	       {own_group_name, gg4},
+	       {own_group_nodes, GG4},
+	       {synced_nodes, lists:delete(mk_node(NcpB, M), GG4)},
+	       {sync_error, []},
+	       {no_contact, []},
+	       {other_groups, remove_gg_pub_type(lists:keydelete
+						   (gg4, 1, GGNodes))},
+	       {monitoring, []}],
+
+    InfoCok = [{state, synced},
+	       {own_group_name, gg5},
+	       {own_group_nodes, GG5},
+	       {synced_nodes, lists:delete(mk_node(NcpC, M), GG5)},
+	       {sync_error, []},
+	       {no_contact, []},
+	       {other_groups, remove_gg_pub_type(lists:keydelete
+						   (gg5, 1, GGNodes))},
+	       {monitoring, []}],
+
+    InfoDok = [{state, synced},
+	       {own_group_name, gg5},
+	       {own_group_nodes, GG5},
+	       {synced_nodes, lists:delete(mk_node(NcpD, M), GG5)},
+	       {sync_error, []},
+	       {no_contact, []},
+	       {other_groups, remove_gg_pub_type(lists:keydelete
+						   (gg5, 1, GGNodes))},
+	       {monitoring, []}],
+
+    InfoEok = [{state, synced},
+	       {own_group_name, gg5},
+	       {own_group_nodes, GG5},
+	       {synced_nodes, lists:delete(mk_node(NcpE, M), GG5)},
+	       {sync_error, []},
+	       {no_contact, []},
+	       {other_groups, remove_gg_pub_type(lists:keydelete
+						   (gg5, 1, GGNodes))},
+	       {monitoring, []}],
+
+
+    case Info1 of
+	Info1ok ->
+	    ok;
+	_ ->
+	    ct:fail({{"could not change the global groups"
+		      " in node", Cp1}, {Info1, Info1ok}})
+    end,
 
-    ?line case Info2 of
-	      Info2ok -> 
-		  ok;
-	      _ ->
-		  test_server:fail({{"could not change the global groups"
-                                     " in node", Cp2}, {Info2, Info2ok}})
-	  end,
+    case Info2 of
+	Info2ok ->
+	    ok;
+	_ ->
+	    ct:fail({{"could not change the global groups"
+		      " in node", Cp2}, {Info2, Info2ok}})
+    end,
 
-    ?line case Info3 of
-	      Info3ok -> 
-		  ok;
-	      _ ->
-		  test_server:fail({{"could not change the global groups"
-                                     " in node", Cp3}, {Info3, Info3ok}})
-	  end,
+    case Info3 of
+	Info3ok ->
+	    ok;
+	_ ->
+	    ct:fail({{"could not change the global groups"
+		      " in node", Cp3}, {Info3, Info3ok}})
+    end,
 
-    ?line case InfoA of
-	      InfoAok -> 
-		  ok;
-	      _ ->
-		  test_server:fail({{"could not change the global groups"
-                                     " in node", CpA}, {InfoA, InfoAok}})
-	  end,
+    case InfoA of
+	InfoAok ->
+	    ok;
+	_ ->
+	    ct:fail({{"could not change the global groups"
+		      " in node", CpA}, {InfoA, InfoAok}})
+    end,
 
-    ?line case InfoB of
-	      InfoBok -> 
-		  ok;
-	      _ ->
-		  test_server:fail({{"could not change the global groups"
-                                     " in node", CpB}, {InfoB, InfoBok}})
-	  end,
+    case InfoB of
+	InfoBok ->
+	    ok;
+	_ ->
+	    ct:fail({{"could not change the global groups"
+		      " in node", CpB}, {InfoB, InfoBok}})
+    end,
 
 
-    ?line case InfoC of
-	      InfoCok -> 
-		  ok;
-	      _ ->
-		  test_server:fail({{"could not change the global groups"
-                                     " in node", CpC}, {InfoC, InfoCok}})
-	  end,
+    case InfoC of
+	InfoCok ->
+	    ok;
+	_ ->
+	    ct:fail({{"could not change the global groups"
+		      " in node", CpC}, {InfoC, InfoCok}})
+    end,
 
-    ?line case InfoD of
-	      InfoDok -> 
-		  ok;
-	      _ ->
-		  test_server:fail({{"could not change the global groups"
-                                     " in node", CpD}, {InfoD, InfoDok}})
-	  end,
+    case InfoD of
+	InfoDok ->
+	    ok;
+	_ ->
+	    ct:fail({{"could not change the global groups"
+		      " in node", CpD}, {InfoD, InfoDok}})
+    end,
 
-    ?line case InfoE of
-	      InfoEok -> 
-		  ok;
-	      _ ->
-		  test_server:fail({{"could not change the global groups"
-                                     " in node", CpE}, {InfoE, InfoEok}})
-	  end,
+    case InfoE of
+	InfoEok ->
+	    ok;
+	_ ->
+	    ct:fail({{"could not change the global groups"
+		      " in node", CpE}, {InfoE, InfoEok}})
+    end,
 
     write_high_level_trace(Config), % no good since CpC was restarted
     stop_node(Cp1),   
@@ -3324,7 +3262,7 @@ global_groups_change(Config) ->
     stop_node(CpD),
     stop_node(CpE),
 
-    ?line init_condition(Config),
+    init_condition(Config),
     ok.
 
 sync_and_wait(Node) ->
@@ -3354,43 +3292,43 @@ sync_and_wait(Node) ->
 is_real_system(KernelVsn, StdlibVsn) ->
     LibDir = code:lib_dir(),
     filelib:is_dir(filename:join(LibDir,  "kernel-" ++ KernelVsn))
-      andalso
-    filelib:is_dir(filename:join(LibDir,  "stdlib-" ++ StdlibVsn)).
+	andalso
+	filelib:is_dir(filename:join(LibDir,  "stdlib-" ++ StdlibVsn)).
 
 create_script_dc(ScriptName) ->
-    ?line Name = filename:join(".", ScriptName),
-    ?line Apps = application_controller:which_applications(),
-    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
-    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
-    ?line {ok,Fd} = file:open(Name ++ ".rel", [write]),
-    ?line {_, Version} = init:script_id(),
-    ?line io:format(Fd,
-		    "{release, {\"Test release 3\", \"~s\"}, \n"
-		    " {erts, \"4.4\"}, \n"
-		    " [{kernel, \"~s\"}, {stdlib, \"~s\"}]}.\n",
-		    [Version, KernelVer, StdlibVer]),
-    ?line file:close(Fd),
+    Name = filename:join(".", ScriptName),
+    Apps = application_controller:which_applications(),
+    {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+    {ok,Fd} = file:open(Name ++ ".rel", [write]),
+    {_, Version} = init:script_id(),
+    io:format(Fd,
+	      "{release, {\"Test release 3\", \"~s\"}, \n"
+	      " {erts, \"4.4\"}, \n"
+	      " [{kernel, \"~s\"}, {stdlib, \"~s\"}]}.\n",
+	      [Version, KernelVer, StdlibVer]),
+    file:close(Fd),
     {KernelVer, StdlibVer}.
 
 %% Not used?
 config_dc(Fd, Ncp1, Ncp2, Ncp3) ->
     M = from($@, atom_to_list(node())),
     io:format(Fd, "[{kernel, [{sync_nodes_optional, ['~s@~s','~s@~s','~s@~s']},"
-	          "{sync_nodes_timeout, 1000},"
-                  "{global_groups, [{gg1, ['~s@~s', '~s@~s']},"
-	          "               {gg2, ['~s@~s']}]}"
-	          "              ]}].~n",
+	      "{sync_nodes_timeout, 1000},"
+	      "{global_groups, [{gg1, ['~s@~s', '~s@~s']},"
+	      "               {gg2, ['~s@~s']}]}"
+	      "              ]}].~n",
 	      [Ncp1, M, Ncp2, M, Ncp3, M,  Ncp1, M, Ncp2, M, Ncp3, M]).
 
 
 config_dc1(Fd, Ncp1, Ncp2, Ncp3, NcpA, NcpB, NcpC, NcpD, NcpE) ->
     M = from($@, atom_to_list(node())),
     io:format(Fd, "[{kernel, [{sync_nodes_optional, ['~s@~s','~s@~s','~s@~s','~s@~s','~s@~s','~s@~s','~s@~s','~s@~s']},"
-	          "{sync_nodes_timeout, 1000},"
-                  "{global_groups, [{gg1, ['~s@~s', '~s@~s']},"
-	          "                 {gg2, ['~s@~s']},"
-	          "                 {gg4, normal, ['~s@~s','~s@~s','~s@~s']},"
-	          "                 {gg5, hidden, ['~s@~s','~s@~s']}]}]}].~n",
+	      "{sync_nodes_timeout, 1000},"
+	      "{global_groups, [{gg1, ['~s@~s', '~s@~s']},"
+	      "                 {gg2, ['~s@~s']},"
+	      "                 {gg4, normal, ['~s@~s','~s@~s','~s@~s']},"
+	      "                 {gg5, hidden, ['~s@~s','~s@~s']}]}]}].~n",
 	      [Ncp1, M, Ncp2, M, Ncp3, M,  
                NcpA, M, NcpB, M, NcpC, M, NcpD, M, NcpE, M, 
                Ncp1, M, Ncp2, M, 
@@ -3401,8 +3339,8 @@ config_dc1(Fd, Ncp1, Ncp2, Ncp3, NcpA, NcpB, NcpC, NcpD, NcpE) ->
 config_dc2(Fd, NewGG, Ncp1, Ncp2, Ncp3) ->
     M = from($@, atom_to_list(node())),
     io:format(Fd, "[{kernel, [{sync_nodes_optional, ['~s@~s','~s@~s','~s@~s']},"
-	          "{sync_nodes_timeout, 1000},"
-                  "~p]}].~n",
+	      "{sync_nodes_timeout, 1000},"
+	      "~p]}].~n",
 	      [Ncp1, M, Ncp2, M, Ncp3, M, NewGG]).
 
 
@@ -3414,33 +3352,33 @@ from(_H, []) -> [].
 
 other(A, [A, _B]) -> A;
 other(_, [_A, B]) -> B.
-     
+
 
 %% this one runs at cp2
 part1(Config, Main, Cp1, Cp3) ->
     case catch begin
 		   make_partition(Config, [Main, Cp1], [node(), Cp3]),
-		   ?line {_Pid, yes} = start_proc(test2),
-		   ?line {_Pid2, yes} = start_proc(test4)
+		   {_Pid, yes} = start_proc(test2),
+		   {_Pid2, yes} = start_proc(test4)
 	       end of
 	{_, yes} -> ok; % w("ok", []);
 	{'EXIT', _R} ->
 	    ok
-	    % w("global_SUITE line:~w: ~p", [?LINE, _R])
+	    %% w("global_SUITE line:~w: ~p", [?LINE, _R])
     end.
 
 %% Runs at Cp2
 part1_5(Config, Main, Cp1, Cp3) ->
     case catch begin
 		   make_partition(Config, [Main, Cp1], [node(), Cp3]),
-		   ?line {_Pid1, yes} = start_proc_basic(name12),
-		   ?line {_Pid2, yes} = 
+		   {_Pid1, yes} = start_proc_basic(name12),
+		   {_Pid2, yes} =
                        rpc:call(Cp3, ?MODULE, start_proc_basic, [name03])
 	       end of
 	{_, yes} -> ok; % w("ok", []);
 	{'EXIT', _R} ->
 	    ok
-            % w("global_SUITE line:~w: ~p", [?LINE, _R])
+            %% w("global_SUITE line:~w: ~p", [?LINE, _R])
     end.
 
 w(X,Y) ->
@@ -3451,7 +3389,7 @@ w(X,Y) ->
 %% this one runs on one node in Part2
 %% The partition is ready when is_ready_partition(Config) returns (true).
 make_partition(Config, Part1, Part2) ->
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     Ns = [begin 
               Name = lists:concat([atom_to_list(N),"_",msec(),".part"]),
               File = filename:join([Dir, Name]),
@@ -3503,7 +3441,7 @@ is_ready_partition(Config) ->
     true.
 
 make_partition_file(Config) ->
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     filename:join([Dir, atom_to_list(make_partition_done)]).
 
 %% this one runs at cp3
@@ -3514,37 +3452,36 @@ part2(Config, Parent, Main, Cp0, Cp1, Cp2, Cp3, Cp4, Cp5, Cp6) ->
 part3(Config, Parent, Main, Cp0, Cp1, Cp2, Cp3, Cp4, Cp5, Cp6) ->
     make_partition(Config, [Main, Cp0, Cp1, Cp2], [Cp3, Cp4, Cp5, Cp6]),
     start_procs(Parent, Cp4, Cp5, Cp6, Config),
-    % Make Cp6 alone
-    ?line rpc_cast(Cp5, ?MODULE, crash, [12000]),
-    ?line rpc_cast(Cp6, ?MODULE, alone, [Cp0, Cp3]).
+    %% Make Cp6 alone
+    rpc_cast(Cp5, ?MODULE, crash, [12000]),
+    rpc_cast(Cp6, ?MODULE, alone, [Cp0, Cp3]).
 
 start_procs(Parent, N1, N2, N3, Config) ->
     S1 = lists:sort([N1, N2, N3]),
-    ?line 
     ?UNTIL(begin
 	       NN = lists:sort(nodes()),
 	       S1 =:= NN
 	   end),
-    ?line Pid3 = start_proc3(test1),
-    ?line Pid4 = rpc:call(N1, ?MODULE, start_proc3, [test2]),
-    ?line assert_pid(Pid4),
-    ?line Pid5 = rpc:call(N2, ?MODULE, start_proc3, [test3]),
-    ?line assert_pid(Pid5),
-    ?line Pid6 = rpc:call(N3, ?MODULE, start_proc3, [test4]),
-    ?line assert_pid(Pid6),
-    ?line yes = global:register_name(test1, Pid3),
-    ?line yes = global:register_name(test2, Pid4, {global, notify_all_name}),
-    ?line yes = global:register_name(test3, Pid5, {global, random_notify_name}),
+    Pid3 = start_proc3(test1),
+    Pid4 = rpc:call(N1, ?MODULE, start_proc3, [test2]),
+    assert_pid(Pid4),
+    Pid5 = rpc:call(N2, ?MODULE, start_proc3, [test3]),
+    assert_pid(Pid5),
+    Pid6 = rpc:call(N3, ?MODULE, start_proc3, [test4]),
+    assert_pid(Pid6),
+    yes = global:register_name(test1, Pid3),
+    yes = global:register_name(test2, Pid4, {global, notify_all_name}),
+    yes = global:register_name(test3, Pid5, {global, random_notify_name}),
     Resolve = fun(Name, Pid1, Pid2) ->
 		      Parent ! {resolve_called, Name, node()},
 		      {Min, Max} = minmax(Pid1, Pid2),
 		      exit(Min, kill),
 		      Max
 	      end,
-    ?line yes = global:register_name(test4, Pid6, Resolve).
+    yes = global:register_name(test4, Pid6, Resolve).
+
 
 
-    
 collect_resolves() -> cr(0).
 cr(Res) ->
     receive
@@ -3574,7 +3511,7 @@ start_proc() ->
     receive
 	Pid -> Pid
     end.
-    
+
 
 start_proc(Name) ->
     Pid = spawn(?MODULE, p_init, [self(), Name]),
@@ -3618,7 +3555,7 @@ single_node(Time, Node, Config) ->
     lists:foreach(fun(N) -> _ = erlang:disconnect_node(N) end, nodes()),
     ?UNTIL(get_known(node()) =:= [node()]),
     spawn(?MODULE, init_2, []),
-    test_server:sleep(Time - msec()),
+    ct:sleep(Time - msec()),
     net_adm:ping(Node).
 
 init_2() ->
@@ -3630,12 +3567,12 @@ loop_2() ->
     receive
 	die -> ok
     end.
-    
+
 msec() ->
     msec(now()).
 
 msec(T) ->
-     element(1,T)*1000000000 + element(2,T)*1000 + element(3,T) div 1000.
+    element(1,T)*1000000000 + element(2,T)*1000 + element(3,T) div 1000.
 
 assert_pid(Pid) ->
     if
@@ -3680,13 +3617,15 @@ sreq(Pid, Msg) ->
 alone(N1, N2) ->
     lists:foreach(fun(Node) -> true = erlang:disconnect_node(Node) end,
                   nodes()),
-    test_server:sleep(12000),
+    ct:sleep(12000),
     net_adm:ping(N1),
     net_adm:ping(N2),
     yes = global:register_name(test5, self()).
 
 crash(Time) ->
-    test_server:sleep(Time),
+    %% ct:sleep/1 will not work because it calls a server process
+    %% that does not run on other nodes.
+    timer:sleep(Time),
     erlang:halt().
 
 loop() ->
@@ -3748,23 +3687,23 @@ pr_diff(Str, T0, T1) ->
 	       {_, {H,M,S}} = calendar:time_difference(T0, T1),
 	       ((H*60+M)*60)+S
 	   end,
-    test_server:format(1,"~13s: ~w (diff: ~w)",[Str, T1, Diff]),
+    ct:pal(?HI_VERBOSITY,"~13s: ~w (diff: ~w)",[Str, T1, Diff]),
     if
 	Diff > 100 ->
-	    test_server:format(1,"~s: ** LARGE DIFF ~w~n", [Str, Diff]);
+	    io:format(1,"~s: ** LARGE DIFF ~w~n", [Str, Diff]);
 	true -> 
 	    ok
     end.
 -endif.	    
 
 now_diff({A1,B1,C1},{A2,B2,C2}) ->
-     C1-C2 + 1000000*((B1-B2) + 1000000*(A1-A2)).
+    C1-C2 + 1000000*((B1-B2) + 1000000*(A1-A2)).
 
 start_node_boot(Name, Config, Boot) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Res = test_server:start_node(Name, peer, [{args, " -pa " ++ Pa ++ 
-						     " -config " ++ Config ++
-						     " -boot " ++ atom_to_list(Boot)}]),
+						   " -config " ++ Config ++
+						   " -boot " ++ atom_to_list(Boot)}]),
     record_started_node(Res).
 
 %% Increase the timeout for when an upcoming connection is teared down
@@ -3790,13 +3729,13 @@ start_node(Name0, How, Args, Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     R = test_server:start_node(Name, How, [{args,
 					    Args ++ " " ++
-					    "-kernel net_setuptime 100 "
-%					    "-noshell "
+						"-kernel net_setuptime 100 "
+					    %%					    "-noshell "
 					    "-pa " ++ Pa},
 					   {linked, false}
-]),
+					  ]),
     %% {linked,false} only seems to work for slave nodes.
-%    test_server:sleep(1000),
+    %%    ct:sleep(1000),
     record_started_node(R).
 
 start_node_rel(Name0, Rel, Config) ->
@@ -3807,14 +3746,14 @@ start_node_rel(Name0, Rel, Config) ->
                             Rel when is_atom(Rel) ->
                                 {[{release, atom_to_list(Rel)}], ""};
                             RelList ->
-			       {RelList, ""}
-		       end,
+				{RelList, ""}
+			end,
     Env = [],
     Pa = filename:dirname(code:which(?MODULE)),
     Res = test_server:start_node(Name, peer, 
                                  [{args,
                                    Compat ++ 
-                                   " -kernel net_setuptime 100 "
+				       " -kernel net_setuptime 100 "
                                    " -pa " ++ Pa},
                                   {erl, Release}] ++ Env),
     record_started_node(Res).
@@ -3844,12 +3783,12 @@ stop_nodes(Nodes) ->
     lists:foreach(fun(Node) -> stop_node(Node) end, Nodes).
 
 stop_node(Node) ->
-    ?line ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 
 stop() ->
     lists:foreach(fun(Node) ->
-			  ?t:stop_node(Node)
+			  test_server:stop_node(Node)
 		  end, nodes()).
 
 dbg_logs(Name) -> dbg_logs(Name, ?NODES).
@@ -3857,44 +3796,41 @@ dbg_logs(Name) -> dbg_logs(Name, ?NODES).
 dbg_logs(Name, Nodes) ->
     lists:foreach(fun(N) ->
 			  F = lists:concat([Name, ".log.", N, ".txt"]),
-			  ?line ok = sys:log_to_file({global_name_server, N}, F)
+			  ok = sys:log_to_file({global_name_server, N}, F)
 		  end, Nodes).
 
 
-global_lost_nodes(suite) ->
-    [];
-global_lost_nodes(doc) ->
-    ["Tests that locally loaded nodes do not loose contact with other nodes."];
+%% Tests that locally loaded nodes do not loose contact with other nodes.
 global_lost_nodes(Config) when is_list(Config) ->
     Timeout = 60,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    
-    ?line {ok, Node1} = start_node(node1, Config),
-    ?line {ok, Node2} = start_node(node2, Config),
+    init_condition(Config),
+
+    {ok, Node1} = start_node(node1, Config),
+    {ok, Node2} = start_node(node2, Config),
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
-    ?line io:format("Nodes: ~p", [nodes()]),
-    ?line io:format("Nodes at node1: ~p",
-		    [rpc:call(Node1, erlang, nodes, [])]),
-    ?line io:format("Nodes at node2: ~p",
-		    [rpc:call(Node2, erlang, nodes, [])]),
+    io:format("Nodes: ~p", [nodes()]),
+    io:format("Nodes at node1: ~p",
+	      [rpc:call(Node1, erlang, nodes, [])]),
+    io:format("Nodes at node2: ~p",
+	      [rpc:call(Node2, erlang, nodes, [])]),
 
-    ?line rpc_cast(Node1, ?MODULE, global_load, [node_1,Node2,node_2]),
-    ?line rpc_cast(Node2, ?MODULE, global_load, [node_2,Node1,node_1]),
+    rpc_cast(Node1, ?MODULE, global_load, [node_1,Node2,node_2]),
+    rpc_cast(Node2, ?MODULE, global_load, [node_2,Node1,node_1]),
 
     lost_nodes_waiter(Node1, Node2),
 
     write_high_level_trace(Config),
-    ?line stop_node(Node1),
-    ?line stop_node(Node2),
-    ?line init_condition(Config),
+    stop_node(Node1),
+    stop_node(Node2),
+    init_condition(Config),
     ok.    
 
 global_load(MyName, OtherNode, OtherName) ->
-    ?line yes = global:register_name(MyName, self()),
+    yes = global:register_name(MyName, self()),
     io:format("Registered ~p",[MyName]),
     global_load1(OtherNode, OtherName, 0).
 
@@ -3902,32 +3838,32 @@ global_load1(_OtherNode, _OtherName, 2) ->
     io:format("*** ~p giving up. No use.", [node()]),
     init:stop();
 global_load1(OtherNode, OtherName, Fails) ->	
-    test_server:sleep(1000),
-    ?line case catch global:whereis_name(OtherName) of
-	      Pid when is_pid(Pid) ->
-		  io:format("~p says: ~p is still there.",
-			    [node(),OtherName]),
-		  global_load1(OtherNode, OtherName, Fails);
-	      Other ->
-		  io:format("~p says: ~p is lost (~p) Pinging.",
-			    [ node(), OtherName, Other]),
-		  case net_adm:ping(OtherNode) of
-		      pong ->
-			  io:format("Re-established contact to ~p",
-				    [OtherName]);
-		      pang ->
-			  io:format("PANIC! Other node is DEAD.", []),
-			  init:stop()
-		  end,
- 		  global_load1(OtherNode, OtherName, Fails+1)
-	  end.
+    ct:sleep(1000),
+    case catch global:whereis_name(OtherName) of
+	Pid when is_pid(Pid) ->
+	    io:format("~p says: ~p is still there.",
+		      [node(),OtherName]),
+	    global_load1(OtherNode, OtherName, Fails);
+	Other ->
+	    io:format("~p says: ~p is lost (~p) Pinging.",
+		      [ node(), OtherName, Other]),
+	    case net_adm:ping(OtherNode) of
+		pong ->
+		    io:format("Re-established contact to ~p",
+			      [OtherName]);
+		pang ->
+		    io:format("PANIC! Other node is DEAD.", []),
+		    init:stop()
+	    end,
+	    global_load1(OtherNode, OtherName, Fails+1)
+    end.
 
 lost_nodes_waiter(N1, N2) ->
-    ?line net_kernel:monitor_nodes(true),
+    net_kernel:monitor_nodes(true),
     receive
 	{nodedown, Node} when Node =:= N1 ; Node =:= N2 ->
 	    io:format("~p went down!",[Node]),
-	    ?line ?t:fail("Node went down.")
+	    ct:fail("Node went down.")
     after 10000 ->
 	    ok
     end,
@@ -3935,36 +3871,33 @@ lost_nodes_waiter(N1, N2) ->
 
 
 
-mass_death(suite) ->
-    [];
-mass_death(doc) ->
-    ["Tests the simultaneous death of many processes with registered names"];
+%% Tests the simultaneous death of many processes with registered names.
 mass_death(Config) when is_list(Config) ->
     Timeout = 90,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line OrigNames = global:registered_names(),
+    init_condition(Config),
+    OrigNames = global:registered_names(),
     %% Start nodes
-    ?line Cps = [cp1,cp2,cp3,cp4,cp5],
-    ?line Nodes = [begin {ok, Node} = start_node(Cp, Config), Node end ||
-                      Cp <- Cps],
-    ?line io:format("Nodes: ~p~n", [Nodes]),
-    ?line Ns = lists:seq(1, 40),
+    Cps = [cp1,cp2,cp3,cp4,cp5],
+    Nodes = [begin {ok, Node} = start_node(Cp, Config), Node end ||
+		Cp <- Cps],
+    io:format("Nodes: ~p~n", [Nodes]),
+    Ns = lists:seq(1, 40),
     %% Start processes with globally registered names on the nodes
-    ?line {Pids,[]} = rpc:multicall(Nodes, ?MODULE, mass_spawn, [Ns]),
-    ?line io:format("Pids: ~p~n", [Pids]),
+    {Pids,[]} = rpc:multicall(Nodes, ?MODULE, mass_spawn, [Ns]),
+    io:format("Pids: ~p~n", [Pids]),
     %% Wait...
-    ?line test_server:sleep(10000),
+    ct:sleep(10000),
     %% Check the globally registered names
-    ?line NewNames = global:registered_names(),
-    ?line io:format("NewNames: ~p~n", [NewNames]),
-    ?line Ndiff = lists:sort(NewNames--OrigNames),
-    ?line io:format("Ndiff: ~p~n", [Ndiff]),
-    ?line Ndiff = lists:sort(mass_names(Nodes, Ns)),
+    NewNames = global:registered_names(),
+    io:format("NewNames: ~p~n", [NewNames]),
+    Ndiff = lists:sort(NewNames--OrigNames),
+    io:format("Ndiff: ~p~n", [Ndiff]),
+    Ndiff = lists:sort(mass_names(Nodes, Ns)),
     %%
     %% Kill the root pids
-    ?line lists:foreach(fun (Pid) -> Pid ! drop_dead end, Pids),
+    lists:foreach(fun (Pid) -> Pid ! drop_dead end, Pids),
     %% Start probing and wait for all registered names to disappear
     {YYYY,MM,DD} = date(),
     {H,M,S} = time(),
@@ -3973,22 +3906,21 @@ mass_death(Config) when is_list(Config) ->
     wait_mass_death(Nodes, OrigNames, erlang:now(), Config).
 
 wait_mass_death(Nodes, OrigNames, Then, Config) ->
-    ?line Names = global:registered_names(),
-    ?line 
-	case Names--OrigNames of
-	    [] ->
- 		?line T = now_diff(erlang:now(), Then) div 1000,
-		?line lists:foreach(
-			fun (Node) ->
-				stop_node(Node)
-			end, Nodes),
-                ?line init_condition(Config),
- 		{comment,lists:flatten(io_lib:format("~.3f s~n", [T/1000.0]))};
-	    Ndiff ->
-		?line io:format("Ndiff: ~p~n", [Ndiff]),
-		?line test_server:sleep(1000),
-		?line wait_mass_death(Nodes, OrigNames, Then, Config)
-	end.
+    Names = global:registered_names(),
+    case Names--OrigNames of
+	[] ->
+	    T = now_diff(erlang:now(), Then) div 1000,
+	    lists:foreach(
+	      fun (Node) ->
+		      stop_node(Node)
+	      end, Nodes),
+	    init_condition(Config),
+	    {comment,lists:flatten(io_lib:format("~.3f s~n", [T/1000.0]))};
+	Ndiff ->
+	    io:format("Ndiff: ~p~n", [Ndiff]),
+	    ct:sleep(1000),
+	    wait_mass_death(Nodes, OrigNames, Then, Config)
+    end.
 
 mass_spawn([]) ->
     ok;
@@ -4018,7 +3950,7 @@ mass_name(Node, N) ->
 start_nodes(L, How, Config) ->
     start_nodes2(L, How, 0, Config),
     Nodes = collect_nodes(0, length(L)),
-    ?line ?UNTIL([] =:= Nodes -- nodes()),
+    ?UNTIL([] =:= Nodes -- nodes()),
     put(?nodes_tag, Nodes),
     %% Pinging doesn't help, we have to wait too, for nodes() to become
     %% correct on the other node.
@@ -4042,7 +3974,7 @@ verify_nodes(Nodes, Config) ->
 verify_nodes([], _N, _Config) ->
     [];
 verify_nodes([Node | Rest], N, Config) ->
-    ?line ?UNTIL(
+    ?UNTIL(
        case rpc:call(Node, erlang, nodes, []) of
 	   Nodes when is_list(Nodes) ->
 	       case N =:= lists:sort([Node | Nodes]) of
@@ -4074,7 +4006,7 @@ start_nodes2([Name | Rest], How, N, Config) ->
 		  Self ! {N, R},
 		  %% sleeping is necessary, or with peer nodes, they will
 		  %% go down again, despite {linked, false}.
-		  test_server:sleep(100000)
+		  ct:sleep(100000)
 	  end),
     start_nodes2(Rest, How, N+1, Config).
 
@@ -4155,14 +4087,12 @@ remove_gg_pub_type([{GG, _, Nodes}|Rest]) ->
 %% Better do this in a slave node.
 %% (The transition from links to monitors does not affect this case.)
 
-garbage_messages(suite) ->
-    [];
 garbage_messages(Config) when is_list(Config) ->
     Timeout = 25,
     ct:timetrap({seconds,Timeout}),
     init_high_level_trace(Timeout),
-    ?line init_condition(Config),    
-    ?line [Slave] = start_nodes([garbage_messages], slave, Config),
+    init_condition(Config),
+    [Slave] = start_nodes([garbage_messages], slave, Config),
     Fun = fun() ->
 		  {links,L} = process_info(whereis(global_name_server), links),
 		  lists:foreach(fun(Pid) -> Pid ! {garbage,to,you} end, L),
@@ -4170,15 +4100,15 @@ garbage_messages(Config) when is_list(Config) ->
 		      _Any -> ok
 		  end
 	  end,
-    ?line Pid = spawn_link(Slave, erlang, apply, [Fun,[]]),
-    ?t:sleep(2000),
-    ?line Global = rpc:call(Slave, erlang, whereis, [global_name_server]),
-    ?line {registered_name,global_name_server} =
+    Pid = spawn_link(Slave, erlang, apply, [Fun,[]]),
+    ct:sleep(2000),
+    Global = rpc:call(Slave, erlang, whereis, [global_name_server]),
+    {registered_name,global_name_server} =
 	rpc:call(Slave, erlang, process_info, [Global,registered_name]),
-    ?line true = unlink(Pid),
+    true = unlink(Pid),
     write_high_level_trace(Config),
-    ?line stop_node(Slave),
-    ?line init_condition(Config),
+    stop_node(Slave),
+    init_condition(Config),
     ok.
 
 wait_for_ready_net(Config) ->
@@ -4186,13 +4116,13 @@ wait_for_ready_net(Config) ->
 
 wait_for_ready_net(Nodes0, Config) ->
     Nodes = lists:sort(Nodes0),
-    ?t:format("wait_for_ready_net ~p~n", [Nodes]),
+    io:format("wait_for_ready_net ~p~n", [Nodes]),
     ?UNTIL(begin
                lists:all(fun(N) -> Nodes =:= get_known(N) end, Nodes) and
-               lists:all(fun(N) -> 
-                                 LNs = rpc:call(N, erlang, nodes, []),
-                                 Nodes =:= lists:sort([N | LNs])
-                         end, Nodes)
+		   lists:all(fun(N) ->
+				     LNs = rpc:call(N, erlang, nodes, []),
+				     Nodes =:= lists:sort([N | LNs])
+			     end, Nodes)
            end).
 
 get_known(Node) ->
@@ -4207,7 +4137,7 @@ quite_a_few_nodes(Max) ->
     N = try 
             ulimit("ulimit -u")
         catch _:_ ->
-            ulimit("ulimit -p") % can fail...
+		ulimit("ulimit -p") % can fail...
         end,
     lists:min([(N - 40) div 3, Max]).
 
@@ -4264,15 +4194,15 @@ start_tracer() ->
     Pid = spawn(fun() -> tracer([]) end),
     case catch register(my_tracer, Pid) of
         {'EXIT', _} ->
-            ?t:fail(re_register_my_tracer);
+            ct:fail(re_register_my_tracer);
         _ ->
             ok
     end.
 
 tracer(L) ->
     receive 
-        % {save, Term} ->
-        %     tracer([{now(),Term} | L]);
+        %% {save, Term} ->
+        %%     tracer([{now(),Term} | L]);
         {get, From} ->
             From ! {trace, lists:reverse(L)},
             tracer([]);
@@ -4305,7 +4235,7 @@ collect_tracers(Nodes) ->
 trace_message(M) ->
     case catch my_tracer ! M of
         {'EXIT', _} ->
-            ?t:fail(my_tracer_not_registered);
+            ct:fail(my_tracer_not_registered);
         _ ->
             ok
     end.
diff --git a/lib/kernel/test/global_group_SUITE.erl b/lib/kernel/test/global_group_SUITE.erl
index 0a994c3bf0..8b9e1c5ae8 100644
--- a/lib/kernel/test/global_group_SUITE.erl
+++ b/lib/kernel/test/global_group_SUITE.erl
@@ -28,15 +28,17 @@
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 
-%-compile(export_all).
+%%-compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(NODES, [node()|nodes()]).
 
 -define(UNTIL(Seq), loop_until_true(fun() -> Seq end)).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,5}}].
 
 all() -> 
     [start_gg_proc, no_gg_proc, no_gg_proc_sync, compatible,
@@ -46,10 +48,10 @@ groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_suite(Config) ->
@@ -77,15 +79,13 @@ end_per_suite(_Config) ->
     ok.
 
 -define(TESTCASE, testcase_name).
--define(testcase, ?config(?TESTCASE, Config)).
+-define(testcase, proplists:get_value(?TESTCASE, Config)).
 
-init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(5)),
-    [{?TESTCASE, Case}, {watchdog, Dog}|Config].
+init_per_testcase(Case, Config) ->
+    Config.
 
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
+end_per_testcase(_Func, _Config) ->
+    ok.
 
 %%-----------------------------------------------------------------
 %% Test suites for global groups.
@@ -94,198 +94,191 @@ end_per_testcase(_Func, Config) ->
 %%-----------------------------------------------------------------
 
 
-start_gg_proc(suite) -> [];
-start_gg_proc(doc) -> ["Check that the global_group processes are started automatically. "];
+%% Check that the global_group processes are started automatically. .
 start_gg_proc(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(120)),
-
-    ?line Dir = ?config(priv_dir, Config),
-    ?line File = filename:join(Dir, "global_group.config"),
-    ?line {ok, Fd}=file:open(File, [write]),
+    Dir = proplists:get_value(priv_dir, Config),
+    File = filename:join(Dir, "global_group.config"),
+    {ok, Fd}=file:open(File, [write]),
     [Ncp1,Ncp2,Ncp3] = node_names([cp1, cp2, cp3], Config),
-    ?line config(Fd, Ncp1, Ncp2, Ncp3, "cpx", "cpy", "cpz", "cpq"),
+    config(Fd, Ncp1, Ncp2, Ncp3, "cpx", "cpy", "cpz", "cpq"),
 
-    ?line Cp1nn = node_at(Ncp1),
-    ?line Cp2nn = node_at(Ncp2),
-    ?line Cp3nn = node_at(Ncp3),
+    Cp1nn = node_at(Ncp1),
+    Cp2nn = node_at(Ncp2),
+    Cp3nn = node_at(Ncp3),
 
-    ?line {ok, Cp1} = start_node(Ncp1, Config),
-    ?line {ok, Cp2} = start_node(Ncp2, Config),
-    ?line {ok, Cp3} = start_node(Ncp3, Config),
+    {ok, Cp1} = start_node(Ncp1, Config),
+    {ok, Cp2} = start_node(Ncp2, Config),
+    {ok, Cp3} = start_node(Ncp3, Config),
 
-    ?line [] = rpc:call(Cp1, global_group, registered_names, [{node, Cp1nn}]),
-    ?line [] = rpc:call(Cp2, global_group, registered_names, [{node, Cp2nn}]),
-    ?line [] = rpc:call(Cp3, global_group, registered_names, [{node, Cp3nn}]),
+    [] = rpc:call(Cp1, global_group, registered_names, [{node, Cp1nn}]),
+    [] = rpc:call(Cp2, global_group, registered_names, [{node, Cp2nn}]),
+    [] = rpc:call(Cp3, global_group, registered_names, [{node, Cp3nn}]),
 
-    % stop the nodes, and make sure names are released.
+    %% stop the nodes, and make sure names are released.
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
 
-    ?line ?UNTIL(undefined =:= global:whereis_name(test)),
-    ?line test_server:timetrap_cancel(Dog),
+    ?UNTIL(undefined =:= global:whereis_name(test)),
     ok.
-    
 
 
-no_gg_proc(suite) -> [];
-no_gg_proc(doc) -> ["Start a system without global groups. Nodes are not "
-		    "synced at start (sync_nodes_optional is not defined)"];
+
+%% Start a system without global groups. Nodes are not
+%% synced at start (sync_nodes_optional is not defined).
 no_gg_proc(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(200)),
-
-    ?line Dir = ?config(priv_dir, Config),
-    ?line File = filename:join(Dir, "no_global_group.config"),
-    ?line {ok, Fd} = file:open(File, [write]),
-    ?line config_no(Fd),
-
-    ?line NN = node_name(atom_to_list(node())),
-    ?line Cp1nn = list_to_atom("cp1@" ++ NN),
-    ?line Cp2nn = list_to_atom("cp2@" ++ NN),
-    ?line Cp3nn = list_to_atom("cp3@" ++ NN),
-    ?line Cpxnn = list_to_atom("cpx@" ++ NN),
-    ?line Cpynn = list_to_atom("cpy@" ++ NN),
-    ?line Cpznn = list_to_atom("cpz@" ++ NN),
-
-    ?line {ok, Cp1} = start_node_no(cp1, Config),
-    ?line {ok, Cp2} = start_node_no(cp2, Config),
-    ?line {ok, Cp3} = start_node_no(cp3, Config),
-    ?line {ok, Cpx} = start_node_no(cpx, Config),
-    ?line {ok, Cpy} = start_node_no(cpy, Config),
-    ?line {ok, Cpz} = start_node_no(cpz, Config),
+    Dir = proplists:get_value(priv_dir, Config),
+    File = filename:join(Dir, "no_global_group.config"),
+    {ok, Fd} = file:open(File, [write]),
+    config_no(Fd),
+
+    NN = node_name(atom_to_list(node())),
+    Cp1nn = list_to_atom("cp1@" ++ NN),
+    Cp2nn = list_to_atom("cp2@" ++ NN),
+    Cp3nn = list_to_atom("cp3@" ++ NN),
+    Cpxnn = list_to_atom("cpx@" ++ NN),
+    Cpynn = list_to_atom("cpy@" ++ NN),
+    Cpznn = list_to_atom("cpz@" ++ NN),
+
+    {ok, Cp1} = start_node_no(cp1, Config),
+    {ok, Cp2} = start_node_no(cp2, Config),
+    {ok, Cp3} = start_node_no(cp3, Config),
+    {ok, Cpx} = start_node_no(cpx, Config),
+    {ok, Cpy} = start_node_no(cpy, Config),
+    {ok, Cpz} = start_node_no(cpz, Config),
 
     %% let the nodes know of each other
-    ?line pong = rpc:call(Cp1, net_adm, ping, [Cp2nn]),
-    ?line pong = rpc:call(Cp2, net_adm, ping, [Cp3nn]),
-    ?line pong = rpc:call(Cp3, net_adm, ping, [Cpxnn]),
-    ?line pong = rpc:call(Cpx, net_adm, ping, [Cpynn]),
-    ?line pong = rpc:call(Cpy, net_adm, ping, [Cpznn]),
+    pong = rpc:call(Cp1, net_adm, ping, [Cp2nn]),
+    pong = rpc:call(Cp2, net_adm, ping, [Cp3nn]),
+    pong = rpc:call(Cp3, net_adm, ping, [Cpxnn]),
+    pong = rpc:call(Cpx, net_adm, ping, [Cpynn]),
+    pong = rpc:call(Cpy, net_adm, ping, [Cpznn]),
 
-    ?line wait_for_ready_net(),
+    wait_for_ready_net(),
 
-    ?line [test_server] = rpc:call(Cp1, global_group, registered_names, [{node, Cp1nn}]),
-    ?line [test_server] = rpc:call(Cp2, global_group, registered_names, [{node, Cp2nn}]),
-    ?line [test_server] = rpc:call(Cp3, global_group, registered_names, [{node, Cp3nn}]),
-    ?line [test_server] = rpc:call(Cp1, global_group, registered_names, [{node, Cpxnn}]),
-    ?line [test_server] = rpc:call(Cp2, global_group, registered_names, [{node, Cpynn}]),
-    ?line [test_server] = rpc:call(Cp3, global_group, registered_names, [{node, Cpznn}]),
+    [test_server] = rpc:call(Cp1, global_group, registered_names, [{node, Cp1nn}]),
+    [test_server] = rpc:call(Cp2, global_group, registered_names, [{node, Cp2nn}]),
+    [test_server] = rpc:call(Cp3, global_group, registered_names, [{node, Cp3nn}]),
+    [test_server] = rpc:call(Cp1, global_group, registered_names, [{node, Cpxnn}]),
+    [test_server] = rpc:call(Cp2, global_group, registered_names, [{node, Cpynn}]),
+    [test_server] = rpc:call(Cp3, global_group, registered_names, [{node, Cpznn}]),
 
 
-    % start a proc and register it
-    ?line {Pid2, yes} = rpc:call(Cp2, ?MODULE, start_proc, [test2]),
+    %% start a proc and register it
+    {Pid2, yes} = rpc:call(Cp2, ?MODULE, start_proc, [test2]),
 
-    ?line RegNames = lists:sort([test2,test_server]),
+    RegNames = lists:sort([test2,test_server]),
 
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp1, global_group, registered_names, [{node, Cp1nn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp2, global_group, registered_names, [{node, Cp2nn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp3, global_group, registered_names, [{node, Cp3nn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp1, global_group, registered_names, [{node, Cpxnn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp2, global_group, registered_names, [{node, Cpynn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp3, global_group, registered_names, [{node, Cpznn}])),
 
 
-    ?line undefined = rpc:call(Cp3, global_group, global_groups, []),
+    undefined = rpc:call(Cp3, global_group, global_groups, []),
+
+    Own_nodes_should = [node(), Cp1nn, Cp2nn, Cp3nn,
+			Cpxnn, Cpynn, Cpznn],
+    Own_nodes = rpc:call(Cp3, global_group, own_nodes, []),
+    [] = (Own_nodes -- Own_nodes_should),
+    [] = (Own_nodes_should -- Own_nodes),
+
+    Pid2 = rpc:call(Cp1, global_group, send, [test2, {ping, self()}]),
+    receive
+	{pong, Cp2} -> ok
+    after
+	2000 -> ct:fail(timeout2)
+    end,
+    Pid2 = rpc:call(Cp2, global_group, send, [test2, {ping, self()}]),
+    receive
+	{pong, Cp2} -> ok
+    after
+	2000 -> ct:fail(timeout3)
+    end,
+    Pid2 = rpc:call(Cpz, global_group, send, [test2, {ping, self()}]),
+    receive
+	{pong, Cp2} -> ok
+    after
+	2000 -> ct:fail(timeout4)
+    end,
 
-    ?line Own_nodes_should = [node(), Cp1nn, Cp2nn, Cp3nn, 
-			      Cpxnn, Cpynn, Cpznn],
-    ?line Own_nodes = rpc:call(Cp3, global_group, 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
-	      {pong, Cp2} -> ok
-				 after
-				     2000 -> test_server:fail(timeout2)
-				 end,
-    ?line Pid2 = rpc:call(Cp2, global_group, send, [test2, {ping, self()}]),
-    ?line receive
-	      {pong, Cp2} -> ok
-				 after
-				     2000 -> test_server:fail(timeout3)
-				 end,
-    ?line Pid2 = rpc:call(Cpz, global_group, send, [test2, {ping, self()}]),
-    ?line receive
-	      {pong, Cp2} -> ok
-				 after
-				     2000 -> test_server:fail(timeout4)
-				 end,
-
-
-    % start a proc and register it
-    ?line {PidX, yes} = rpc:call(Cpx, ?MODULE, start_proc, [test]),
+
+    %% start a proc and register it
+    {PidX, yes} = rpc:call(Cpx, ?MODULE, start_proc, [test]),
 
 
     %%------------------------------------
     %% Test monitor nodes
     %%------------------------------------
-    ?line Pid2 = rpc:call(Cp1, global_group, send, [{node, Cp2nn}, test2, monitor]),
-    ?line PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, monitor]),
+    Pid2 = rpc:call(Cp1, global_group, send, [{node, Cp2nn}, test2, monitor]),
+    PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, monitor]),
 
 
-    % Kill node Cp1
-    ?line Pid2 = 
+    %% Kill node Cp1
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, {wait_nodedown, Cp1}]),
-    ?line PidX = 
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, {wait_nodedown, Cp1}]),
-    ?line test_server:sleep(100),
-    ?line stop_node(Cp1),
-    ?line test_server:sleep(1000),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    ct:sleep(100),
+    stop_node(Cp1),
+    ct:sleep(1000),
+
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
 
-    % Kill node Cpz
-    ?line Pid2 = 
+    %% Kill node Cpz
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, {wait_nodedown, Cpz}]),
-    ?line PidX = 
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, {wait_nodedown, Cpz}]),
-    ?line test_server:sleep(100),
-    ?line stop_node(Cpz),
-    ?line test_server:sleep(1000),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    ct:sleep(100),
+    stop_node(Cpz),
+    ct:sleep(1000),
 
-    % Restart node Cp1
-    ?line Pid2 = 
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+
+    %% Restart node Cp1
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, {wait_nodeup, Cp1}]),
-    ?line PidX = 
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, {wait_nodeup, Cp1}]),
-    ?line {ok, Cp1} = start_node_no(cp1, Config),
-    ?line pong = rpc:call(Cp2, net_adm, ping, [Cp1nn]),
-    ?line pong = rpc:call(Cpx, net_adm, ping, [Cp1nn]),
-    ?line wait_for_ready_net(),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    {ok, Cp1} = start_node_no(cp1, Config),
+    pong = rpc:call(Cp2, net_adm, ping, [Cp1nn]),
+    pong = rpc:call(Cpx, net_adm, ping, [Cp1nn]),
+    wait_for_ready_net(),
 
-    % Restart node Cpz
-    ?line Pid2 = 
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+
+    %% Restart node Cpz
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, {wait_nodeup, Cpz}]),
-    ?line PidX = 
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, {wait_nodeup, Cpz}]),
-    ?line {ok, Cpz} = start_node_no(cpz, Config),
-    ?line pong = rpc:call(Cp2, net_adm, ping, [Cpznn]),
-    ?line pong = rpc:call(Cpx, net_adm, ping, [Cpznn]),
-    ?line wait_for_ready_net(),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    {ok, Cpz} = start_node_no(cpz, Config),
+    pong = rpc:call(Cp2, net_adm, ping, [Cpznn]),
+    pong = rpc:call(Cpx, net_adm, ping, [Cpznn]),
+    wait_for_ready_net(),
 
-    % stop the nodes, and make sure names are released.
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+
+    %% stop the nodes, and make sure names are released.
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
@@ -293,174 +286,169 @@ no_gg_proc(Config) when is_list(Config) ->
     stop_node(Cpy),
     stop_node(Cpz),
 
-    ?line ?UNTIL(undefined =:= global:whereis_name(test)),
-    ?line test_server:timetrap_cancel(Dog),
+    ?UNTIL(undefined =:= global:whereis_name(test)),
     ok.
-    
 
 
 
-no_gg_proc_sync(suite) -> [];
-no_gg_proc_sync(doc) -> 
-    ["Start a system without global groups, but syncing the nodes by using " 
-     "sync_nodes_optional."];
-no_gg_proc_sync(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(200)),
 
-    ?line Dir = ?config(priv_dir, Config),
-    ?line File = filename:join(Dir, "no_global_group_sync.config"),
-    ?line {ok, Fd} = file:open(File, [write]),
+%% Start a system without global groups, but syncing the nodes by using
+%% sync_nodes_optional.
+no_gg_proc_sync(Config) when is_list(Config) ->
+    Dir = proplists:get_value(priv_dir, Config),
+    File = filename:join(Dir, "no_global_group_sync.config"),
+    {ok, Fd} = file:open(File, [write]),
 
     [Ncp1,Ncp2,Ncp3,Ncpx,Ncpy,Ncpz] = 
         node_names([cp1,cp2,cp3,cpx,cpy,cpz], Config),
-    ?line config_sync(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz),
-
-    ?line Cp1nn = node_at(Ncp1),
-    ?line Cp2nn = node_at(Ncp2),
-    ?line Cp3nn = node_at(Ncp3),
-    ?line Cpxnn = node_at(Ncpx),
-    ?line Cpynn = node_at(Ncpy),
-    ?line Cpznn = node_at(Ncpz),
-
-    ?line {ok, Cp1} = start_node_no2(Ncp1, Config),
-    ?line {ok, Cp2} = start_node_no2(Ncp2, Config),
-    ?line {ok, Cp3} = start_node_no2(Ncp3, Config),
-    ?line {ok, Cpx} = start_node_no2(Ncpx, Config),
-    ?line {ok, Cpy} = start_node_no2(Ncpy, Config),
-    ?line {ok, Cpz} = start_node_no2(Ncpz, Config),
+    config_sync(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz),
+
+    Cp1nn = node_at(Ncp1),
+    Cp2nn = node_at(Ncp2),
+    Cp3nn = node_at(Ncp3),
+    Cpxnn = node_at(Ncpx),
+    Cpynn = node_at(Ncpy),
+    Cpznn = node_at(Ncpz),
+
+    {ok, Cp1} = start_node_no2(Ncp1, Config),
+    {ok, Cp2} = start_node_no2(Ncp2, Config),
+    {ok, Cp3} = start_node_no2(Ncp3, Config),
+    {ok, Cpx} = start_node_no2(Ncpx, Config),
+    {ok, Cpy} = start_node_no2(Ncpy, Config),
+    {ok, Cpz} = start_node_no2(Ncpz, Config),
 
     %% let the nodes know of each other
-    ?line pong = rpc:call(Cp1, net_adm, ping, [Cp2nn]),
-    ?line pong = rpc:call(Cp2, net_adm, ping, [Cp3nn]),
-    ?line pong = rpc:call(Cp3, net_adm, ping, [Cpxnn]),
-    ?line pong = rpc:call(Cpx, net_adm, ping, [Cpynn]),
-    ?line pong = rpc:call(Cpy, net_adm, ping, [Cpznn]),
+    pong = rpc:call(Cp1, net_adm, ping, [Cp2nn]),
+    pong = rpc:call(Cp2, net_adm, ping, [Cp3nn]),
+    pong = rpc:call(Cp3, net_adm, ping, [Cpxnn]),
+    pong = rpc:call(Cpx, net_adm, ping, [Cpynn]),
+    pong = rpc:call(Cpy, net_adm, ping, [Cpznn]),
 
-    ?line wait_for_ready_net(),
+    wait_for_ready_net(),
 
-    ?line [test_server] = rpc:call(Cp1, global_group, registered_names, [{node, Cp1nn}]),
-    ?line [test_server] = rpc:call(Cp2, global_group, registered_names, [{node, Cp2nn}]),
-    ?line [test_server] = rpc:call(Cp3, global_group, registered_names, [{node, Cp3nn}]),
-    ?line [test_server] = rpc:call(Cp1, global_group, registered_names, [{node, Cpxnn}]),
-    ?line [test_server] = rpc:call(Cp2, global_group, registered_names, [{node, Cpynn}]),
-    ?line [test_server] = rpc:call(Cp3, global_group, registered_names, [{node, Cpznn}]),
+    [test_server] = rpc:call(Cp1, global_group, registered_names, [{node, Cp1nn}]),
+    [test_server] = rpc:call(Cp2, global_group, registered_names, [{node, Cp2nn}]),
+    [test_server] = rpc:call(Cp3, global_group, registered_names, [{node, Cp3nn}]),
+    [test_server] = rpc:call(Cp1, global_group, registered_names, [{node, Cpxnn}]),
+    [test_server] = rpc:call(Cp2, global_group, registered_names, [{node, Cpynn}]),
+    [test_server] = rpc:call(Cp3, global_group, registered_names, [{node, Cpznn}]),
 
 
-    % start a proc and register it
-    ?line {Pid2, yes} = rpc:call(Cp2, ?MODULE, start_proc, [test2]),
+    %% start a proc and register it
+    {Pid2, yes} = rpc:call(Cp2, ?MODULE, start_proc, [test2]),
 
-    ?line RegNames = lists:sort([test2,test_server]),
+    RegNames = lists:sort([test2,test_server]),
 
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp1, global_group, registered_names, [{node, Cp1nn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp2, global_group, registered_names, [{node, Cp2nn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp3, global_group, registered_names, [{node, Cp3nn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp1, global_group, registered_names, [{node, Cpxnn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp2, global_group, registered_names, [{node, Cpynn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp3, global_group, registered_names, [{node, Cpznn}])),
 
 
-    ?line undefined = rpc:call(Cp3, global_group, global_groups, []),
+    undefined = rpc:call(Cp3, global_group, global_groups, []),
 
-    ?line Own_nodes_should = [node(), Cp1nn, Cp2nn, Cp3nn, 
-			      Cpxnn, Cpynn, Cpznn],
-    ?line Own_nodes = rpc:call(Cp3, global_group, 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
-	      {pong, Cp2} -> ok
-				 after
-				     2000 -> test_server:fail(timeout2)
-				 end,
-    ?line Pid2 = rpc:call(Cp2, global_group, send, [test2, {ping, self()}]),
-    ?line receive
-	      {pong, Cp2} -> ok
-				 after
-				     2000 -> test_server:fail(timeout3)
-				 end,
-    ?line Pid2 = rpc:call(Cpz, global_group, send, [test2, {ping, self()}]),
-    ?line receive
-	      {pong, Cp2} -> ok
-				 after
-				     2000 -> test_server:fail(timeout4)
-				 end,
-
-
-    % start a proc and register it
-    ?line {PidX, yes} = rpc:call(Cpx, ?MODULE, start_proc, [test]),
+    Own_nodes_should = [node(), Cp1nn, Cp2nn, Cp3nn,
+			Cpxnn, Cpynn, Cpznn],
+    Own_nodes = rpc:call(Cp3, global_group, own_nodes, []),
+    [] = (Own_nodes -- Own_nodes_should),
+    [] = (Own_nodes_should -- Own_nodes),
+
+    Pid2 = rpc:call(Cp1, global_group, send, [test2, {ping, self()}]),
+    receive
+	{pong, Cp2} -> ok
+    after
+	2000 -> ct:fail(timeout2)
+    end,
+    Pid2 = rpc:call(Cp2, global_group, send, [test2, {ping, self()}]),
+    receive
+	{pong, Cp2} -> ok
+    after
+	2000 -> ct:fail(timeout3)
+    end,
+    Pid2 = rpc:call(Cpz, global_group, send, [test2, {ping, self()}]),
+    receive
+	{pong, Cp2} -> ok
+    after
+	2000 -> ct:fail(timeout4)
+    end,
+
+
+    %% start a proc and register it
+    {PidX, yes} = rpc:call(Cpx, ?MODULE, start_proc, [test]),
 
 
     %%------------------------------------
     %% Test monitor nodes
     %%------------------------------------
-    ?line Pid2 = rpc:call(Cp1, global_group, send, [{node, Cp2nn}, test2, monitor]),
-    ?line PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, monitor]),
+    Pid2 = rpc:call(Cp1, global_group, send, [{node, Cp2nn}, test2, monitor]),
+    PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, monitor]),
 
 
-    % Kill node Cp1
-    ?line Pid2 = 
+    %% Kill node Cp1
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, {wait_nodedown, Cp1}]),
-    ?line PidX = 
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, {wait_nodedown, Cp1}]),
-    ?line test_server:sleep(100),
-    ?line stop_node(Cp1),
-    ?line test_server:sleep(1000),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    ct:sleep(100),
+    stop_node(Cp1),
+    ct:sleep(1000),
+
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
 
-    % Kill node Cpz
-    ?line Pid2 = 
+    %% Kill node Cpz
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, {wait_nodedown, Cpz}]),
-    ?line PidX = 
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, {wait_nodedown, Cpz}]),
-    ?line test_server:sleep(100),
-    ?line stop_node(Cpz),
-    ?line test_server:sleep(1000),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    ct:sleep(100),
+    stop_node(Cpz),
+    ct:sleep(1000),
 
-    % Restart node Cp1
-    ?line Pid2 = 
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+
+    %% Restart node Cp1
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, {wait_nodeup, Cp1}]),
-    ?line PidX = 
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, {wait_nodeup, Cp1}]),
-    ?line {ok, Cp1} = start_node_no2(Ncp1, Config),
-    ?line pong = rpc:call(Cp2, net_adm, ping, [Cp1nn]),
-    ?line pong = rpc:call(Cpx, net_adm, ping, [Cp1nn]),
-    ?line wait_for_ready_net(),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    {ok, Cp1} = start_node_no2(Ncp1, Config),
+    pong = rpc:call(Cp2, net_adm, ping, [Cp1nn]),
+    pong = rpc:call(Cpx, net_adm, ping, [Cp1nn]),
+    wait_for_ready_net(),
 
-    % Restart node Cpz
-    ?line Pid2 = 
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+
+    %% Restart node Cpz
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, {wait_nodeup, Cpz}]),
-    ?line PidX = 
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, {wait_nodeup, Cpz}]),
-    ?line {ok, Cpz} = start_node_no2(Ncpz, Config),
-    ?line pong = rpc:call(Cp2, net_adm, ping, [Cpznn]),
-    ?line pong = rpc:call(Cpx, net_adm, ping, [Cpznn]),
-    ?line wait_for_ready_net(),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    {ok, Cpz} = start_node_no2(Ncpz, Config),
+    pong = rpc:call(Cp2, net_adm, ping, [Cpznn]),
+    pong = rpc:call(Cpx, net_adm, ping, [Cpznn]),
+    wait_for_ready_net(),
 
-    % stop the nodes, and make sure names are released.
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+
+    %% stop the nodes, and make sure names are released.
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
@@ -468,173 +456,168 @@ no_gg_proc_sync(Config) when is_list(Config) ->
     stop_node(Cpy),
     stop_node(Cpz),
 
-    ?line ?UNTIL(undefined =:= global:whereis_name(test)),
-    ?line test_server:timetrap_cancel(Dog),
+    ?UNTIL(undefined =:= global:whereis_name(test)),
     ok.
-    
 
 
 
-compatible(suite) -> [];
-compatible(doc) -> 
-    ["Check that a system without global groups is compatible with the old R4 system."];
-compatible(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(200)),
 
-    ?line Dir = ?config(priv_dir, Config),
-    ?line File = filename:join(Dir, "global_group_comp.config"),
-    ?line {ok, Fd} = file:open(File, [write]),
+%% Check that a system without global groups is compatible with the old R4 system.
+compatible(Config) when is_list(Config) ->
+    Dir = proplists:get_value(priv_dir, Config),
+    File = filename:join(Dir, "global_group_comp.config"),
+    {ok, Fd} = file:open(File, [write]),
 
     [Ncp1,Ncp2,Ncp3,Ncpx,Ncpy,Ncpz] = 
         node_names([cp1,cp2,cp3,cpx,cpy,cpz], Config),
-    ?line config_comp(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz),
-
-    ?line Cp1nn = node_at(Ncp1),
-    ?line Cp2nn = node_at(Ncp2),
-    ?line Cp3nn = node_at(Ncp3),
-    ?line Cpxnn = node_at(Ncpx),
-    ?line Cpynn = node_at(Ncpy),
-    ?line Cpznn = node_at(Ncpz),
-
-    ?line {ok, Cp1} = start_node_comp(Ncp1, Config),
-    ?line {ok, Cp2} = start_node_comp(Ncp2, Config),
-    ?line {ok, Cp3} = start_node_comp(Ncp3, Config),
-    ?line {ok, Cpx} = start_node_comp(Ncpx, Config),
-    ?line {ok, Cpy} = start_node_comp(Ncpy, Config),
-    ?line {ok, Cpz} = start_node_comp(Ncpz, Config),
+    config_comp(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz),
+
+    Cp1nn = node_at(Ncp1),
+    Cp2nn = node_at(Ncp2),
+    Cp3nn = node_at(Ncp3),
+    Cpxnn = node_at(Ncpx),
+    Cpynn = node_at(Ncpy),
+    Cpznn = node_at(Ncpz),
+
+    {ok, Cp1} = start_node_comp(Ncp1, Config),
+    {ok, Cp2} = start_node_comp(Ncp2, Config),
+    {ok, Cp3} = start_node_comp(Ncp3, Config),
+    {ok, Cpx} = start_node_comp(Ncpx, Config),
+    {ok, Cpy} = start_node_comp(Ncpy, Config),
+    {ok, Cpz} = start_node_comp(Ncpz, Config),
 
     %% let the nodes know of each other
-    ?line pong = rpc:call(Cp1, net_adm, ping, [Cp2nn]),
-    ?line pong = rpc:call(Cp2, net_adm, ping, [Cp3nn]),
-    ?line pong = rpc:call(Cp3, net_adm, ping, [Cpxnn]),
-    ?line pong = rpc:call(Cpx, net_adm, ping, [Cpynn]),
-    ?line pong = rpc:call(Cpy, net_adm, ping, [Cpznn]),
+    pong = rpc:call(Cp1, net_adm, ping, [Cp2nn]),
+    pong = rpc:call(Cp2, net_adm, ping, [Cp3nn]),
+    pong = rpc:call(Cp3, net_adm, ping, [Cpxnn]),
+    pong = rpc:call(Cpx, net_adm, ping, [Cpynn]),
+    pong = rpc:call(Cpy, net_adm, ping, [Cpznn]),
 
-    ?line wait_for_ready_net(),
+    wait_for_ready_net(),
 
-    ?line [test_server] = rpc:call(Cp1, global_group, registered_names, [{node, Cp1nn}]),
-    ?line [test_server] = rpc:call(Cp2, global_group, registered_names, [{node, Cp2nn}]),
-    ?line [test_server] = rpc:call(Cp3, global_group, registered_names, [{node, Cp3nn}]),
-    ?line [test_server] = rpc:call(Cp1, global_group, registered_names, [{node, Cpxnn}]),
-    ?line [test_server] = rpc:call(Cp2, global_group, registered_names, [{node, Cpynn}]),
-    ?line [test_server] = rpc:call(Cp3, global_group, registered_names, [{node, Cpznn}]),
+    [test_server] = rpc:call(Cp1, global_group, registered_names, [{node, Cp1nn}]),
+    [test_server] = rpc:call(Cp2, global_group, registered_names, [{node, Cp2nn}]),
+    [test_server] = rpc:call(Cp3, global_group, registered_names, [{node, Cp3nn}]),
+    [test_server] = rpc:call(Cp1, global_group, registered_names, [{node, Cpxnn}]),
+    [test_server] = rpc:call(Cp2, global_group, registered_names, [{node, Cpynn}]),
+    [test_server] = rpc:call(Cp3, global_group, registered_names, [{node, Cpznn}]),
 
 
-    % start a proc and register it
-    ?line {Pid2, yes} = rpc:call(Cp2, ?MODULE, start_proc, [test2]),
+    %% start a proc and register it
+    {Pid2, yes} = rpc:call(Cp2, ?MODULE, start_proc, [test2]),
 
-    ?line RegNames = lists:sort([test2,test_server]),
+    RegNames = lists:sort([test2,test_server]),
 
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp1, global_group, registered_names, [{node, Cp1nn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp2, global_group, registered_names, [{node, Cp2nn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp3, global_group, registered_names, [{node, Cp3nn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp1, global_group, registered_names, [{node, Cpxnn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp2, global_group, registered_names, [{node, Cpynn}])),
-    ?line RegNames = 
+    RegNames =
 	lists:sort(
 	  rpc:call(Cp3, global_group, registered_names, [{node, Cpznn}])),
 
 
-    ?line undefined = rpc:call(Cp3, global_group, global_groups, []),
+    undefined = rpc:call(Cp3, global_group, global_groups, []),
 
-    ?line Own_nodes_should = [node(), Cp1nn, Cp2nn, Cp3nn, 
-			      Cpxnn, Cpynn, Cpznn],
-    ?line Own_nodes = rpc:call(Cp3, global_group, 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
-	      {pong, Cp2} -> ok
-				 after
-				     2000 -> test_server:fail(timeout2)
-				 end,
-    ?line Pid2 = rpc:call(Cp2, global_group, send, [test2, {ping, self()}]),
-    ?line receive
-	      {pong, Cp2} -> ok
-				 after
-				     2000 -> test_server:fail(timeout3)
-				 end,
-    ?line Pid2 = rpc:call(Cpz, global_group, send, [test2, {ping, self()}]),
-    ?line receive
-	      {pong, Cp2} -> ok
-				 after
-				     2000 -> test_server:fail(timeout4)
-				 end,
-
-
-    % start a proc and register it
-    ?line {PidX, yes} = rpc:call(Cpx, ?MODULE, start_proc, [test]),
+    Own_nodes_should = [node(), Cp1nn, Cp2nn, Cp3nn,
+			Cpxnn, Cpynn, Cpznn],
+    Own_nodes = rpc:call(Cp3, global_group, own_nodes, []),
+    [] = (Own_nodes -- Own_nodes_should),
+    [] = (Own_nodes_should -- Own_nodes),
+
+    Pid2 = rpc:call(Cp1, global_group, send, [test2, {ping, self()}]),
+    receive
+	{pong, Cp2} -> ok
+    after
+	2000 -> ct:fail(timeout2)
+    end,
+    Pid2 = rpc:call(Cp2, global_group, send, [test2, {ping, self()}]),
+    receive
+	{pong, Cp2} -> ok
+    after
+	2000 -> ct:fail(timeout3)
+    end,
+    Pid2 = rpc:call(Cpz, global_group, send, [test2, {ping, self()}]),
+    receive
+	{pong, Cp2} -> ok
+    after
+	2000 -> ct:fail(timeout4)
+    end,
+
+
+    %% start a proc and register it
+    {PidX, yes} = rpc:call(Cpx, ?MODULE, start_proc, [test]),
 
 
     %%------------------------------------
     %% Test monitor nodes
     %%------------------------------------
-    ?line Pid2 = rpc:call(Cp1, global_group, send, [{node, Cp2nn}, test2, monitor]),
-    ?line PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, monitor]),
+    Pid2 = rpc:call(Cp1, global_group, send, [{node, Cp2nn}, test2, monitor]),
+    PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, monitor]),
 
 
-    % Kill node Cp1
-    ?line Pid2 = 
+    %% Kill node Cp1
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, {wait_nodedown, Cp1}]),
-    ?line PidX = 
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, {wait_nodedown, Cp1}]),
-    ?line test_server:sleep(100),
-    ?line stop_node(Cp1),
-    ?line test_server:sleep(1000),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    ct:sleep(100),
+    stop_node(Cp1),
+    ct:sleep(1000),
+
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
 
-    % Kill node Cpz
-    ?line Pid2 = 
+    %% Kill node Cpz
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, {wait_nodedown, Cpz}]),
-    ?line PidX = 
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, {wait_nodedown, Cpz}]),
-    ?line test_server:sleep(100),
-    ?line stop_node(Cpz),
-    ?line test_server:sleep(1000),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    ct:sleep(100),
+    stop_node(Cpz),
+    ct:sleep(1000),
+
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
 
-    % Restart node Cp1
-    ?line Pid2 = 
+    %% Restart node Cp1
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, {wait_nodeup, Cp1}]),
-    ?line PidX = 
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, {wait_nodeup, Cp1}]),
-    ?line {ok, Cp1} = start_node_comp(Ncp1, Config),
-    ?line pong = rpc:call(Cp2, net_adm, ping, [Cp1nn]),
-    ?line pong = rpc:call(Cpx, net_adm, ping, [Cp1nn]),
-    ?line wait_for_ready_net(),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    {ok, Cp1} = start_node_comp(Ncp1, Config),
+    pong = rpc:call(Cp2, net_adm, ping, [Cp1nn]),
+    pong = rpc:call(Cpx, net_adm, ping, [Cp1nn]),
+    wait_for_ready_net(),
+
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
 
-    % Restart node Cpz
-    ?line Pid2 = 
+    %% Restart node Cpz
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, {wait_nodeup, Cpz}]),
-    ?line PidX = 
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, {wait_nodeup, Cpz}]),
-    ?line {ok, Cpz} = start_node_comp(Ncpz, Config),
-    ?line pong = rpc:call(Cp2, net_adm, ping, [Cpznn]),
-    ?line pong = rpc:call(Cpx, net_adm, ping, [Cpznn]),
-    ?line wait_for_ready_net(),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    {ok, Cpz} = start_node_comp(Ncpz, Config),
+    pong = rpc:call(Cp2, net_adm, ping, [Cpznn]),
+    pong = rpc:call(Cpx, net_adm, ping, [Cpznn]),
+    wait_for_ready_net(),
+
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
 
-    % stop the nodes, and make sure names are released.
+    %% stop the nodes, and make sure names are released.
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
@@ -642,147 +625,137 @@ compatible(Config) when is_list(Config) ->
     stop_node(Cpy),
     stop_node(Cpz),
 
-    ?line ?UNTIL(undefined =:= global:whereis_name(test)),
-    ?line test_server:timetrap_cancel(Dog),
+    ?UNTIL(undefined =:= global:whereis_name(test)),
     ok.
-    
 
 
 
-one_grp(suite) -> [];
-one_grp(doc) -> ["Test a system with only one global group. "];
-one_grp(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(120)),
 
-    ?line Dir = ?config(priv_dir, Config),
-    ?line File = filename:join(Dir, "global_group.config"),
-    ?line {ok, Fd} = file:open(File, [write]),
+%% Test a system with only one global group. .
+one_grp(Config) when is_list(Config) ->
+    Dir = proplists:get_value(priv_dir, Config),
+    File = filename:join(Dir, "global_group.config"),
+    {ok, Fd} = file:open(File, [write]),
     [Ncp1,Ncp2,Ncp3] = node_names([cp1, cp2, cp3], Config),
-    ?line config(Fd, Ncp1, Ncp2, Ncp3, "cpx", "cpy", "cpz", "cpq"),
+    config(Fd, Ncp1, Ncp2, Ncp3, "cpx", "cpy", "cpz", "cpq"),
 
-    ?line {ok, Cp1} = start_node(Ncp1, Config),
-    ?line {ok, Cp2} = start_node(Ncp2, Config),
-    ?line {ok, Cp3} = start_node(Ncp3, Config),
+    {ok, Cp1} = start_node(Ncp1, Config),
+    {ok, Cp2} = start_node(Ncp2, Config),
+    {ok, Cp3} = start_node(Ncp3, Config),
 
-    % sleep a while to make the global_group to sync...
-    test_server:sleep(1000),
+    %% sleep a while to make the global_group to sync...
+    ct:sleep(1000),
 
-    % start a proc and register it
-    ?line {Pid, yes} = rpc:call(Cp1, ?MODULE, start_proc, [test]),
+    %% start a proc and register it
+    {Pid, yes} = rpc:call(Cp1, ?MODULE, start_proc, [test]),
 
-    % test that it is registered at all nodes
-    ?line Pid = rpc:call(Cp1, global, whereis_name, [test]),
-    ?line Pid = rpc:call(Cp2, global, whereis_name, [test]),
-    ?line Pid = rpc:call(Cp3, global, whereis_name, [test]),
+    %% test that it is registered at all nodes
+    Pid = rpc:call(Cp1, global, whereis_name, [test]),
+    Pid = rpc:call(Cp2, global, whereis_name, [test]),
+    Pid = rpc:call(Cp3, global, whereis_name, [test]),
     
-    % try to register the same name
-    ?line no = rpc:call(Cp1, global, register_name, [test, self()]),
+    %% try to register the same name
+    no = rpc:call(Cp1, global, register_name, [test, self()]),
     
-    % let process exit, check that it is unregistered automatically
+    %% let process exit, check that it is unregistered automatically
     Pid ! die,
-    ?line 
-    ?UNTIL(begin
+        ?UNTIL(begin
                (undefined =:= rpc:call(Cp1, global, whereis_name, [test])) and
                (undefined =:= rpc:call(Cp2, global, whereis_name, [test])) and
                (undefined =:= rpc:call(Cp3, global, whereis_name, [test]))
            end),
     
-    % test re_register
-    ?line {Pid2, yes} = rpc:call(Cp1, ?MODULE, start_proc, [test]),
-    ?line Pid2 = rpc:call(Cp3, global, whereis_name, [test]),    
+    %% test re_register
+    {Pid2, yes} = rpc:call(Cp1, ?MODULE, start_proc, [test]),
+    Pid2 = rpc:call(Cp3, global, whereis_name, [test]),
     Pid3 = rpc:call(Cp3, ?MODULE, start_proc_rereg, [test]),
-    ?line Pid3 = rpc:call(Cp3, global, whereis_name, [test]),        
+    Pid3 = rpc:call(Cp3, global, whereis_name, [test]),
 
-    % test sending
+    %% test sending
     rpc:call(Cp1, global, send, [test, {ping, self()}]),
     receive
 	{pong, Cp3} -> ok
     after
-	2000 -> test_server:fail(timeout1)
+	2000 -> ct:fail(timeout1)
     end,
 
     rpc:call(Cp3, global, send, [test, {ping, self()}]),
     receive
 	{pong, Cp3} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
 
-    ?line rpc:call(Cp3, global, unregister_name, [test]),    
-    ?line undefined = rpc:call(Cp1, global, whereis_name, [test]),
-    ?line undefined = rpc:call(Cp2, global, whereis_name, [test]),
-    ?line undefined = rpc:call(Cp3, global, whereis_name, [test]),
+    rpc:call(Cp3, global, unregister_name, [test]),
+    undefined = rpc:call(Cp1, global, whereis_name, [test]),
+    undefined = rpc:call(Cp2, global, whereis_name, [test]),
+    undefined = rpc:call(Cp3, global, whereis_name, [test]),
 
     Pid3 ! die,
-    ?line ?UNTIL(undefined =:= rpc:call(Cp3, global, whereis_name, [test])),
+    ?UNTIL(undefined =:= rpc:call(Cp3, global, whereis_name, [test])),
 
-    % register a proc
-    ?line {_, yes} = rpc:call(Cp3, ?MODULE, start_proc, [test]),
+    %% register a proc
+    {_, yes} = rpc:call(Cp3, ?MODULE, start_proc, [test]),
 
-    % stop the nodes, and make sure names are released.
+    %% stop the nodes, and make sure names are released.
     stop_node(Cp3),
 
-    ?line ?UNTIL(undefined =:= rpc:call(Cp1, global, whereis_name, [test])),
+    ?UNTIL(undefined =:= rpc:call(Cp1, global, whereis_name, [test])),
     Pid2 ! die,
 
     stop_node(Cp1),
     stop_node(Cp2),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
-    
 
 
 
 
-one_grp_x(suite) -> [];
-one_grp_x(doc) -> ["Check a system with only one global group. "
-		   "Start the nodes with different time intervals. "];
-one_grp_x(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(120)),
 
-    ?line Dir = ?config(priv_dir, Config),
-    ?line File = filename:join(Dir, "global_group.config"),
-    ?line {ok, Fd} = file:open(File, [write]),
+%% Check a system with only one global group.
+%% Start the nodes with different time intervals.
+one_grp_x(Config) when is_list(Config) ->
+    Dir = proplists:get_value(priv_dir, Config),
+    File = filename:join(Dir, "global_group.config"),
+    {ok, Fd} = file:open(File, [write]),
     [Ncp1,Ncp2,Ncp3] = node_names([cp1, cp2, cp3], Config),
-    ?line config(Fd, Ncp1, Ncp2, Ncp3, "cpx", "cpy", "cpz", "cpq"),
+    config(Fd, Ncp1, Ncp2, Ncp3, "cpx", "cpy", "cpz", "cpq"),
 
-    ?line {ok, Cp1} = start_node(Ncp1, Config),
-    % sleep a while to make the global_group to sync...
-    test_server:sleep(1000),
+    {ok, Cp1} = start_node(Ncp1, Config),
+    %% sleep a while to make the global_group to sync...
+    ct:sleep(1000),
 
-    % start a proc and register it
-    ?line {Pid, yes} = rpc:call(Cp1, ?MODULE, start_proc, [test]),
+    %% start a proc and register it
+    {Pid, yes} = rpc:call(Cp1, ?MODULE, start_proc, [test]),
 
-    ?line {ok, Cp2} = start_node(Ncp2, Config),
-    % sleep a while to make the global_group to sync...
-    test_server:sleep(1000),
+    {ok, Cp2} = start_node(Ncp2, Config),
+    %% sleep a while to make the global_group to sync...
+    ct:sleep(1000),
 
-    % test that it is registered at all nodes
-    ?line Pid = rpc:call(Cp1, global, whereis_name, [test]),
-    ?line Pid = rpc:call(Cp2, global, whereis_name, [test]),
+    %% test that it is registered at all nodes
+    Pid = rpc:call(Cp1, global, whereis_name, [test]),
+    Pid = rpc:call(Cp2, global, whereis_name, [test]),
 
-    ?line {ok, Cp3} = start_node(Ncp3, Config),
-    % sleep a while to make the global_group to sync...
-    test_server:sleep(1000),
+    {ok, Cp3} = start_node(Ncp3, Config),
+    %% sleep a while to make the global_group to sync...
+    ct:sleep(1000),
 
-    ?line Pid = rpc:call(Cp3, global, whereis_name, [test]),
+    Pid = rpc:call(Cp3, global, whereis_name, [test]),
     
-    % try to register the same name
-    ?line no = rpc:call(Cp1, global, register_name, [test, self()]),
+    %% try to register the same name
+    no = rpc:call(Cp1, global, register_name, [test, self()]),
     
-    % let process exit, check that it is unregistered automatically
+    %% let process exit, check that it is unregistered automatically
     Pid ! die,
-    ?line 
-    ?UNTIL(begin
+        ?UNTIL(begin
                (undefined =:= rpc:call(Cp1, global, whereis_name, [test])) and
                (undefined =:= rpc:call(Cp2, global, whereis_name, [test])) and
                (undefined =:= rpc:call(Cp3, global, whereis_name, [test]))
            end),
     
-    % test re_register
-    ?line {Pid2, yes} = rpc:call(Cp1, ?MODULE, start_proc, [test]),
-    ?line Pid2 = rpc:call(Cp3, global, whereis_name, [test]),    
+    %% test re_register
+    {Pid2, yes} = rpc:call(Cp1, ?MODULE, start_proc, [test]),
+    Pid2 = rpc:call(Cp3, global, whereis_name, [test]),
 
     Pid2 ! die,
 
@@ -790,296 +763,291 @@ one_grp_x(Config) when is_list(Config) ->
     stop_node(Cp2),
     stop_node(Cp3),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
-    
 
 
 
 
 
-two_grp(suite) -> [];
-two_grp(doc) -> ["Test a two global group system. "];
-two_grp(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(200)),
 
-    ?line Dir = ?config(priv_dir, Config),
-    ?line File = filename:join(Dir, "global_group.config"),
-    ?line {ok, Fd} = file:open(File, [write]),
+%% Test a two global group system. .
+two_grp(Config) when is_list(Config) ->
+    Dir = proplists:get_value(priv_dir, Config),
+    File = filename:join(Dir, "global_group.config"),
+    {ok, Fd} = file:open(File, [write]),
 
     [Ncp1,Ncp2,Ncp3,Ncpx,Ncpy,Ncpz,Ncpq] = 
         node_names([cp1,cp2,cp3,cpx,cpy,cpz,cpq], Config),
-    ?line config(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz, Ncpq),
-
-    ?line Cp1nn = node_at(Ncp1),
-    ?line Cp2nn = node_at(Ncp2),
-    ?line Cp3nn = node_at(Ncp3),
-    ?line Cpxnn = node_at(Ncpx),
-    ?line Cpynn = node_at(Ncpy),
-    ?line Cpznn = node_at(Ncpz),
-
-    ?line {ok, Cp1} = start_node(Ncp1, Config),
-    ?line {ok, Cp2} = start_node(Ncp2, Config),
-    ?line {ok, Cp3} = start_node(Ncp3, Config),
-    ?line {ok, Cpx} = start_node(Ncpx, Config),
-    ?line {ok, Cpy} = start_node(Ncpy, Config),
-    ?line {ok, Cpz} = start_node(Ncpz, Config),
+    config(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz, Ncpq),
+
+    Cp1nn = node_at(Ncp1),
+    Cp2nn = node_at(Ncp2),
+    Cp3nn = node_at(Ncp3),
+    Cpxnn = node_at(Ncpx),
+    Cpynn = node_at(Ncpy),
+    Cpznn = node_at(Ncpz),
+
+    {ok, Cp1} = start_node(Ncp1, Config),
+    {ok, Cp2} = start_node(Ncp2, Config),
+    {ok, Cp3} = start_node(Ncp3, Config),
+    {ok, Cpx} = start_node(Ncpx, Config),
+    {ok, Cpy} = start_node(Ncpy, Config),
+    {ok, Cpz} = start_node(Ncpz, Config),
 
     %% The groups (cpq not started):
     %% [{nc1, [cp1,cp2,cp3]}, {nc2, [cpx,cpy,cpz]}, {nc3, [cpq]}]
 
-    % sleep a while to make the global_groups to sync...
-    test_server:sleep(1000),
-
-    % check the global group names
-    ?line {nc1, [nc2, nc3]} = rpc:call(Cp1, global_group, global_groups, []),
-    ?line {nc1, [nc2, nc3]} = rpc:call(Cp2, global_group, global_groups, []),
-    ?line {nc1, [nc2, nc3]} = rpc:call(Cp3, global_group, global_groups, []),
-    ?line {nc2, [nc1, nc3]} = rpc:call(Cpx, global_group, global_groups, []),
-    ?line {nc2, [nc1, nc3]} = rpc:call(Cpy, global_group, global_groups, []),
-    ?line {nc2, [nc1, nc3]} = rpc:call(Cpz, global_group, global_groups, []),
-
-    % check the global group nodes
-    ?line [Cp1nn, Cp2nn, Cp3nn] = rpc:call(Cp1, global_group, own_nodes, []),
-    ?line [Cp1nn, Cp2nn, Cp3nn] = rpc:call(Cp2, global_group, own_nodes, []),
-    ?line [Cp1nn, Cp2nn, Cp3nn] = rpc:call(Cp3, global_group, own_nodes, []),
-    ?line [Cpxnn, Cpynn, Cpznn] = rpc:call(Cpx, global_group, own_nodes, []),
-    ?line [Cpxnn, Cpynn, Cpznn] = rpc:call(Cpy, global_group, own_nodes, []),
-    ?line [Cpxnn, Cpynn, Cpznn] = rpc:call(Cpz, global_group, own_nodes, []),
-
-
-    % start a proc and register it
-    ?line {Pid1, yes} = rpc:call(Cp1, ?MODULE, start_proc, [test]),
-
-    ?line Pid1 = rpc:call(Cp1, global_group, send, [test, {io, from_cp1}]),
-    ?line Pid1 = rpc:call(Cpx, global_group, send, [test, {io, from_cpx}]),
-    ?line Pid1 = rpc:call(Cp1, global_group, send, [{group,nc1}, test, 
-                                                    {io, from_cp1}]),
-    ?line [test] = 
+    %% sleep a while to make the global_groups to sync...
+    ct:sleep(1000),
+
+    %% check the global group names
+    {nc1, [nc2, nc3]} = rpc:call(Cp1, global_group, global_groups, []),
+    {nc1, [nc2, nc3]} = rpc:call(Cp2, global_group, global_groups, []),
+    {nc1, [nc2, nc3]} = rpc:call(Cp3, global_group, global_groups, []),
+    {nc2, [nc1, nc3]} = rpc:call(Cpx, global_group, global_groups, []),
+    {nc2, [nc1, nc3]} = rpc:call(Cpy, global_group, global_groups, []),
+    {nc2, [nc1, nc3]} = rpc:call(Cpz, global_group, global_groups, []),
+
+    %% check the global group nodes
+    [Cp1nn, Cp2nn, Cp3nn] = rpc:call(Cp1, global_group, own_nodes, []),
+    [Cp1nn, Cp2nn, Cp3nn] = rpc:call(Cp2, global_group, own_nodes, []),
+    [Cp1nn, Cp2nn, Cp3nn] = rpc:call(Cp3, global_group, own_nodes, []),
+    [Cpxnn, Cpynn, Cpznn] = rpc:call(Cpx, global_group, own_nodes, []),
+    [Cpxnn, Cpynn, Cpznn] = rpc:call(Cpy, global_group, own_nodes, []),
+    [Cpxnn, Cpynn, Cpznn] = rpc:call(Cpz, global_group, own_nodes, []),
+
+
+    %% start a proc and register it
+    {Pid1, yes} = rpc:call(Cp1, ?MODULE, start_proc, [test]),
+
+    Pid1 = rpc:call(Cp1, global_group, send, [test, {io, from_cp1}]),
+    Pid1 = rpc:call(Cpx, global_group, send, [test, {io, from_cpx}]),
+    Pid1 = rpc:call(Cp1, global_group, send, [{group,nc1}, test,
+					      {io, from_cp1}]),
+    [test] =
         rpc:call(Cpx, global_group, registered_names, [{node, Cp1nn}]),
-    ?line [test] = 
+    [test] =
         rpc:call(Cpx, global_group, registered_names, [{group, nc1}]),
-    ?line [] = rpc:call(Cpx, global_group, registered_names, [{node, Cpxnn}]),
-    ?line [] = rpc:call(Cpx, global_group, registered_names, [{group, nc2}]),
-    ?line Pid1 = rpc:call(Cpx, global_group, send, [{group,nc1}, test, 
-                                                    {io, from_cp1}]),
-    ?line {badarg,{test,{io,from_cpx}}} = 
+    [] = rpc:call(Cpx, global_group, registered_names, [{node, Cpxnn}]),
+    [] = rpc:call(Cpx, global_group, registered_names, [{group, nc2}]),
+    Pid1 = rpc:call(Cpx, global_group, send, [{group,nc1}, test,
+					      {io, from_cp1}]),
+    {badarg,{test,{io,from_cpx}}} =
 	rpc:call(Cp1, global_group, send, [{group,nc2}, test, {io, from_cpx}]),
-    ?line {badarg,{test,{io,from_cpx}}} = 
+    {badarg,{test,{io,from_cpx}}} =
 	rpc:call(Cpx, global_group, send, [{group,nc2}, test, {io, from_cpx}]),
 
 
 
-    % test that it is registered at all nodes
-    ?line Pid1 = rpc:call(Cp1, global, whereis_name, [test]),
-    ?line Pid1 = rpc:call(Cp2, global, whereis_name, [test]),
-    ?line Pid1 = rpc:call(Cp3, global, whereis_name, [test]),
-    ?line undefined = rpc:call(Cpx, global, whereis_name, [test]),
-    ?line undefined = rpc:call(Cpy, global, whereis_name, [test]),
-    ?line undefined = rpc:call(Cpz, global, whereis_name, [test]),
-    
-    % start a proc and register it
-    ?line {PidX, yes} = rpc:call(Cpx, ?MODULE, start_proc, [test]),
-
-    % test that it is registered at all nodes
-    ?line Pid1 = rpc:call(Cp1, global, whereis_name, [test]),
-    ?line Pid1 = rpc:call(Cp2, global, whereis_name, [test]),
-    ?line Pid1 = rpc:call(Cp3, global, whereis_name, [test]),
-    ?line PidX = rpc:call(Cpx, global, whereis_name, [test]),
-    ?line PidX = rpc:call(Cpy, global, whereis_name, [test]),
-    ?line PidX = rpc:call(Cpz, global, whereis_name, [test]),
-    
+    %% test that it is registered at all nodes
+    Pid1 = rpc:call(Cp1, global, whereis_name, [test]),
+    Pid1 = rpc:call(Cp2, global, whereis_name, [test]),
+    Pid1 = rpc:call(Cp3, global, whereis_name, [test]),
+    undefined = rpc:call(Cpx, global, whereis_name, [test]),
+    undefined = rpc:call(Cpy, global, whereis_name, [test]),
+    undefined = rpc:call(Cpz, global, whereis_name, [test]),
+
+    %% start a proc and register it
+    {PidX, yes} = rpc:call(Cpx, ?MODULE, start_proc, [test]),
+
+    %% test that it is registered at all nodes
+    Pid1 = rpc:call(Cp1, global, whereis_name, [test]),
+    Pid1 = rpc:call(Cp2, global, whereis_name, [test]),
+    Pid1 = rpc:call(Cp3, global, whereis_name, [test]),
+    PidX = rpc:call(Cpx, global, whereis_name, [test]),
+    PidX = rpc:call(Cpy, global, whereis_name, [test]),
+    PidX = rpc:call(Cpz, global, whereis_name, [test]),
+
     Pid1 ! die,
     %% If we don't wait for global on other nodes to have updated its
     %% tables, 'test' may still be defined at the point when it is
     %% tested a few lines below.
-    ?line
-    ?UNTIL(begin 
+    ?UNTIL(begin
                Pid = rpc:call(Cp2, global, whereis_name, [test]),
                undefined =:= Pid
            end),
 
-    % start a proc and register it
-    ?line {Pid2, yes} = rpc:call(Cp2, ?MODULE, start_proc, [test2]),
+    %% start a proc and register it
+    {Pid2, yes} = rpc:call(Cp2, ?MODULE, start_proc, [test2]),
+
+    %% test that it is registered at all nodes
+    Pid2 = rpc:call(Cp1, global, whereis_name, [test2]),
+    Pid2 = rpc:call(Cp2, global, whereis_name, [test2]),
+    Pid2 = rpc:call(Cp3, global, whereis_name, [test2]),
+    PidX = rpc:call(Cpx, global, whereis_name, [test]),
+    PidX = rpc:call(Cpy, global, whereis_name, [test]),
+    PidX = rpc:call(Cpz, global, whereis_name, [test]),
+
+    undefined = rpc:call(Cp1, global, whereis_name, [test]),
+    undefined = rpc:call(Cp2, global, whereis_name, [test]),
+    undefined = rpc:call(Cp3, global, whereis_name, [test]),
+    undefined = rpc:call(Cpx, global, whereis_name, [test2]),
+    undefined = rpc:call(Cpy, global, whereis_name, [test2]),
+    undefined = rpc:call(Cpz, global, whereis_name, [test2]),
 
-    % test that it is registered at all nodes
-    ?line Pid2 = rpc:call(Cp1, global, whereis_name, [test2]),
-    ?line Pid2 = rpc:call(Cp2, global, whereis_name, [test2]),
-    ?line Pid2 = rpc:call(Cp3, global, whereis_name, [test2]),
-    ?line PidX = rpc:call(Cpx, global, whereis_name, [test]),
-    ?line PidX = rpc:call(Cpy, global, whereis_name, [test]),
-    ?line PidX = rpc:call(Cpz, global, whereis_name, [test]),
-    
-    ?line undefined = rpc:call(Cp1, global, whereis_name, [test]),
-    ?line undefined = rpc:call(Cp2, global, whereis_name, [test]),
-    ?line undefined = rpc:call(Cp3, global, whereis_name, [test]),
-    ?line undefined = rpc:call(Cpx, global, whereis_name, [test2]),
-    ?line undefined = rpc:call(Cpy, global, whereis_name, [test2]),
-    ?line undefined = rpc:call(Cpz, global, whereis_name, [test2]),
-    
 
-    ?line Pid2 = rpc:call(Cp1, global_group, send, [test2, {ping, self()}]),
+    Pid2 = rpc:call(Cp1, global_group, send, [test2, {ping, self()}]),
     receive
 	{pong, Cp2} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
-    ?line Pid2 = rpc:call(Cp2, global_group, send, [test2, {ping, self()}]),
+    Pid2 = rpc:call(Cp2, global_group, send, [test2, {ping, self()}]),
     receive
 	{pong, Cp2} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
-    ?line Pid2 = rpc:call(Cp3, global_group, send, [test2, {ping, self()}]),
+    Pid2 = rpc:call(Cp3, global_group, send, [test2, {ping, self()}]),
     receive
 	{pong, Cp2} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
 
-    ?line PidX = rpc:call(Cpx, global_group, send, [test, {ping, self()}]),
+    PidX = rpc:call(Cpx, global_group, send, [test, {ping, self()}]),
     receive
 	{pong, Cpx} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
-    ?line PidX = rpc:call(Cpy, global_group, send, [test, {ping, self()}]),
+    PidX = rpc:call(Cpy, global_group, send, [test, {ping, self()}]),
     receive
 	{pong, Cpx} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
-    ?line PidX = rpc:call(Cpz, global_group, send, [test, {ping, self()}]),
+    PidX = rpc:call(Cpz, global_group, send, [test, {ping, self()}]),
     receive
 	{pong, Cpx} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
 
-    ?line Pid2 = rpc:call(Cpx, global_group, send, [{node, Cp1nn}, test2, 
-                                                    {ping, self()}]),
+    Pid2 = rpc:call(Cpx, global_group, send, [{node, Cp1nn}, test2,
+					      {ping, self()}]),
     receive
 	{pong, Cp2} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
-    ?line Pid2 = rpc:call(Cpy, global_group, send, [{node, Cp2nn}, test2, 
-                                                    {ping, self()}]),
+    Pid2 = rpc:call(Cpy, global_group, send, [{node, Cp2nn}, test2,
+					      {ping, self()}]),
     receive
 	{pong, Cp2} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
-    ?line Pid2 = rpc:call(Cpz, global_group, send, [{node, Cp3nn}, test2, 
-                                                    {ping, self()}]),
+    Pid2 = rpc:call(Cpz, global_group, send, [{node, Cp3nn}, test2,
+					      {ping, self()}]),
     receive
 	{pong, Cp2} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
 
-    ?line PidX = rpc:call(Cpx, global_group, send, [{node, Cpznn}, test, 
-                                                    {ping, self()}]),
+    PidX = rpc:call(Cpx, global_group, send, [{node, Cpznn}, test,
+					      {ping, self()}]),
     receive
 	{pong, Cpx} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
-    ?line PidX = rpc:call(Cpy, global_group, send, [{node, Cpxnn}, test, 
-                                                    {ping, self()}]),
+    PidX = rpc:call(Cpy, global_group, send, [{node, Cpxnn}, test,
+					      {ping, self()}]),
     receive
 	{pong, Cpx} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
-    ?line PidX = rpc:call(Cpz, global_group, send, [{node, Cpynn}, test, 
-                                                    {ping, self()}]),
+    PidX = rpc:call(Cpz, global_group, send, [{node, Cpynn}, test,
+					      {ping, self()}]),
     receive
 	{pong, Cpx} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
 
-    ?line Pid2 = rpc:call(Cpx, global_group, send, [{group, nc1}, test2, 
-                                                    {ping, self()}]),
+    Pid2 = rpc:call(Cpx, global_group, send, [{group, nc1}, test2,
+					      {ping, self()}]),
     receive
 	{pong, Cp2} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
-    ?line PidX = rpc:call(Cpy, global_group, send, [{group, nc2}, test, 
-                                                    {ping, self()}]),
+    PidX = rpc:call(Cpy, global_group, send, [{group, nc2}, test,
+					      {ping, self()}]),
     receive
 	{pong, Cpx} -> ok
     after
-	2000 -> test_server:fail(timeout2)
+	2000 -> ct:fail(timeout2)
     end,
 
     %%------------------------------------
     %% Test monitor nodes
     %%------------------------------------
-    ?line Pid2 = 
+    Pid2 =
         rpc:call(Cp1, global_group, send, [{node, Cp2nn}, test2, monitor]),
-    ?line PidX = 
+    PidX =
         rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, monitor]),    
 
 
-    % Kill node Cp1
-    ?line Pid2 = rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, 
-                                                    {wait_nodedown, Cp1}]),
-    ?line PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, 
-                                                    {wait_nodedown, Cp1}]),
-    ?line test_server:sleep(100),
-    ?line stop_node(Cp1),
-    ?line test_server:sleep(1000),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop_nodedown),
-    ?line  PidX = 
+    %% Kill node Cp1
+    Pid2 = rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2,
+					      {wait_nodedown, Cp1}]),
+    PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test,
+					      {wait_nodedown, Cp1}]),
+    ct:sleep(100),
+    stop_node(Cp1),
+    ct:sleep(1000),
+
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop_nodedown),
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, to_loop]),
 
-    % Kill node Cpz
-    ?line Pid2 = rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, 
-                                                    {wait_nodedown, Cpz}]),
-    ?line PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, 
-                                                    {wait_nodedown, Cpz}]),
-    ?line test_server:sleep(100),
-    ?line stop_node(Cpz),
-    ?line test_server:sleep(1000),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop_nodedown),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
-    ?line Pid2 = 
+    %% Kill node Cpz
+    Pid2 = rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2,
+					      {wait_nodedown, Cpz}]),
+    PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test,
+					      {wait_nodedown, Cpz}]),
+    ct:sleep(100),
+    stop_node(Cpz),
+    ct:sleep(1000),
+
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop_nodedown),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, to_loop]),
 
-    % Restart node Cp1
-    ?line [Cp1nn, Cp2nn, Cp3nn] = rpc:call(Cp2, global_group, own_nodes, []),
-    ?line Pid2 = rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, 
-                                                    {wait_nodeup, Cp1}]),
-    ?line PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, 
-                                                    {wait_nodeup, Cp1}]),
-    ?line test_server:sleep(100),
-    ?line {ok, Cp1} = start_node(Ncp1, Config),
-    ?line test_server:sleep(5000),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop_nodeup),
-    ?line PidX = 
+    %% Restart node Cp1
+    [Cp1nn, Cp2nn, Cp3nn] = rpc:call(Cp2, global_group, own_nodes, []),
+    Pid2 = rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2,
+					      {wait_nodeup, Cp1}]),
+    PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test,
+					      {wait_nodeup, Cp1}]),
+    ct:sleep(100),
+    {ok, Cp1} = start_node(Ncp1, Config),
+    ct:sleep(5000),
+
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop_nodeup),
+    PidX =
 	rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, to_loop]),
 
 
-    % Restart node Cpz
-    ?line Pid2 = rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, 
-                                                    {wait_nodeup, Cpz}]),
-    ?line PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test, 
-                                                    {wait_nodeup, Cpz}]),
-    ?line test_server:sleep(100),
-    ?line {ok, Cpz} = start_node(Ncpz, Config),
-    ?line test_server:sleep(5000),
-    
-    ?line ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop_nodeup),
-    ?line ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
-    ?line Pid2 = 
+    %% Restart node Cpz
+    Pid2 = rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2,
+					      {wait_nodeup, Cpz}]),
+    PidX = rpc:call(Cpx, global_group, send, [{node, Cpxnn}, test,
+					      {wait_nodeup, Cpz}]),
+    ct:sleep(100),
+    {ok, Cpz} = start_node(Ncpz, Config),
+    ct:sleep(5000),
+
+    ok = assert_loop(Cp2, Cp2nn, test2, Pid2, loop_nodeup),
+    ok = assert_loop(Cpx, Cpxnn, test, PidX, loop),
+    Pid2 =
 	rpc:call(Cp2, global_group, send, [{node, Cp2nn}, test2, to_loop]),
 
 
@@ -1093,72 +1061,68 @@ two_grp(Config) when is_list(Config) ->
     stop_node(Cpy),
     stop_node(Cpz),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
-    
 
 
-hidden_groups(suite) -> [];
-hidden_groups(doc) -> ["Test hidden global groups."];
-hidden_groups(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(200)),
 
-    ?line Dir = ?config(priv_dir, Config),
-    ?line File = filename:join(Dir, "global_group.config"),
-    ?line {ok, Fd} = file:open(File, [write]),
+%% Test hidden global groups.
+hidden_groups(Config) when is_list(Config) ->
+    Dir = proplists:get_value(priv_dir, Config),
+    File = filename:join(Dir, "global_group.config"),
+    {ok, Fd} = file:open(File, [write]),
 
     [Ncp1,Ncp2,Ncp3,Ncpx,Ncpy,Ncpz,Ncpq] = 
         node_names([cp1,cp2,cp3,cpx,cpy,cpz,cpq], Config),
-    ?line config_hidden(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz, Ncpq),
-
-    ?line {ok, Cp1} = start_node(Ncp1, Config),
-    ?line {ok, Cp2} = start_node(Ncp2, Config),
-    ?line {ok, Cp3} = start_node(Ncp3, Config),
-    ?line {ok, Cpx} = start_node(Ncpx, Config),
-    ?line {ok, Cpy} = start_node(Ncpy, Config),
-    ?line {ok, Cpz} = start_node(Ncpz, Config),
-    ?line {ok, Cpq} = start_node(Ncpq, Config),
-
-    % sleep a while to make the global_groups to sync...
-    test_server:sleep(1000),
-
-    % check the global group names
-    ?line {nc1, [nc2, nc3]} = rpc:call(Cp1, global_group, global_groups, []),
-    ?line {nc1, [nc2, nc3]} = rpc:call(Cp2, global_group, global_groups, []),
-    ?line {nc1, [nc2, nc3]} = rpc:call(Cp3, global_group, global_groups, []),
-    ?line {nc2, [nc1, nc3]} = rpc:call(Cpx, global_group, global_groups, []),
-    ?line {nc2, [nc1, nc3]} = rpc:call(Cpy, global_group, global_groups, []),
-    ?line {nc2, [nc1, nc3]} = rpc:call(Cpz, global_group, global_groups, []),
-
-    % check the global group nodes
-    ?line [Cp1, Cp2, Cp3] = rpc:call(Cp1, global_group, own_nodes, []),
-    ?line [Cp1, Cp2, Cp3] = rpc:call(Cp2, global_group, own_nodes, []),
-    ?line [Cp1, Cp2, Cp3] = rpc:call(Cp3, global_group, own_nodes, []),
-    ?line [Cpx, Cpy, Cpz] = rpc:call(Cpx, global_group, own_nodes, []),
-    ?line [Cpx, Cpy, Cpz] = rpc:call(Cpy, global_group, own_nodes, []),
-    ?line [Cpx, Cpy, Cpz] = rpc:call(Cpz, global_group, own_nodes, []),
-    ?line [Cpq]           = rpc:call(Cpq, global_group, own_nodes, []),
-
-    % Make some inter group connections
-    ?line pong = rpc:call(Cp1, net_adm, ping, [Cpx]),
-    ?line pong = rpc:call(Cpy, net_adm, ping, [Cp2]),
-    ?line pong = rpc:call(Cp3, net_adm, ping, [Cpx]),
-    ?line pong = rpc:call(Cpz, net_adm, ping, [Cp3]),
-    ?line pong = rpc:call(Cpq, net_adm, ping, [Cp1]),
-    ?line pong = rpc:call(Cpz, net_adm, ping, [Cpq]),
-
-    % Check that no inter group connections are visible
+    config_hidden(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz, Ncpq),
+
+    {ok, Cp1} = start_node(Ncp1, Config),
+    {ok, Cp2} = start_node(Ncp2, Config),
+    {ok, Cp3} = start_node(Ncp3, Config),
+    {ok, Cpx} = start_node(Ncpx, Config),
+    {ok, Cpy} = start_node(Ncpy, Config),
+    {ok, Cpz} = start_node(Ncpz, Config),
+    {ok, Cpq} = start_node(Ncpq, Config),
+
+    %% sleep a while to make the global_groups to sync...
+    ct:sleep(1000),
+
+    %% check the global group names
+    {nc1, [nc2, nc3]} = rpc:call(Cp1, global_group, global_groups, []),
+    {nc1, [nc2, nc3]} = rpc:call(Cp2, global_group, global_groups, []),
+    {nc1, [nc2, nc3]} = rpc:call(Cp3, global_group, global_groups, []),
+    {nc2, [nc1, nc3]} = rpc:call(Cpx, global_group, global_groups, []),
+    {nc2, [nc1, nc3]} = rpc:call(Cpy, global_group, global_groups, []),
+    {nc2, [nc1, nc3]} = rpc:call(Cpz, global_group, global_groups, []),
+
+    %% check the global group nodes
+    [Cp1, Cp2, Cp3] = rpc:call(Cp1, global_group, own_nodes, []),
+    [Cp1, Cp2, Cp3] = rpc:call(Cp2, global_group, own_nodes, []),
+    [Cp1, Cp2, Cp3] = rpc:call(Cp3, global_group, own_nodes, []),
+    [Cpx, Cpy, Cpz] = rpc:call(Cpx, global_group, own_nodes, []),
+    [Cpx, Cpy, Cpz] = rpc:call(Cpy, global_group, own_nodes, []),
+    [Cpx, Cpy, Cpz] = rpc:call(Cpz, global_group, own_nodes, []),
+    [Cpq]           = rpc:call(Cpq, global_group, own_nodes, []),
+
+    %% Make some inter group connections
+    pong = rpc:call(Cp1, net_adm, ping, [Cpx]),
+    pong = rpc:call(Cpy, net_adm, ping, [Cp2]),
+    pong = rpc:call(Cp3, net_adm, ping, [Cpx]),
+    pong = rpc:call(Cpz, net_adm, ping, [Cp3]),
+    pong = rpc:call(Cpq, net_adm, ping, [Cp1]),
+    pong = rpc:call(Cpz, net_adm, ping, [Cpq]),
+
+    %% Check that no inter group connections are visible
     NC1Nodes = lists:sort([Cp1, Cp2, Cp3]),
     NC2Nodes = lists:sort([Cpx, Cpy, Cpz]),
-    ?line NC1Nodes = lists:sort([Cp1|rpc:call(Cp1, erlang, nodes, [])]),
-    ?line NC1Nodes = lists:sort([Cp2|rpc:call(Cp2, erlang, nodes, [])]),
-    ?line NC1Nodes = lists:sort([Cp3|rpc:call(Cp3, erlang, nodes, [])]),
-    ?line NC2Nodes = lists:sort([Cpx|rpc:call(Cpx, erlang, nodes, [])]),
-    ?line NC2Nodes = lists:sort([Cpy|rpc:call(Cpy, erlang, nodes, [])]),
-    ?line NC2Nodes = lists:sort([Cpz|rpc:call(Cpz, erlang, nodes, [])]),
+    NC1Nodes = lists:sort([Cp1|rpc:call(Cp1, erlang, nodes, [])]),
+    NC1Nodes = lists:sort([Cp2|rpc:call(Cp2, erlang, nodes, [])]),
+    NC1Nodes = lists:sort([Cp3|rpc:call(Cp3, erlang, nodes, [])]),
+    NC2Nodes = lists:sort([Cpx|rpc:call(Cpx, erlang, nodes, [])]),
+    NC2Nodes = lists:sort([Cpy|rpc:call(Cpy, erlang, nodes, [])]),
+    NC2Nodes = lists:sort([Cpz|rpc:call(Cpz, erlang, nodes, [])]),
     NC12Nodes = lists:append(NC1Nodes, NC2Nodes),
-    ?line false = lists:any(fun(N) -> lists:member(N, NC12Nodes) end,
-			    rpc:call(Cpq, erlang, nodes, [])),
+    false = lists:any(fun(N) -> lists:member(N, NC12Nodes) end,
+		      rpc:call(Cpq, erlang, nodes, [])),
 
 
     stop_node(Cp1),
@@ -1169,63 +1133,58 @@ hidden_groups(Config) when is_list(Config) ->
     stop_node(Cpz),
     stop_node(Cpq),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
-    
 
-test_exit(suite) -> [];
-test_exit(doc) -> ["Checks when the search process exits. "];
-test_exit(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(120)),
 
-    ?line NN = node_name(atom_to_list(node())),
-    ?line Cp1nn = list_to_atom("cp1@" ++ NN),
+%% Checks when the search process exits. .
+test_exit(Config) when is_list(Config) ->
+    NN = node_name(atom_to_list(node())),
+    Cp1nn = list_to_atom("cp1@" ++ NN),
 
-    ?line {ok, Cp1} = start_node(cp1, Config),
-    ?line {ok, Cp2} = start_node(cp2, Config),
-    ?line {ok, Cp3} = start_node(cp3, Config),
+    {ok, Cp1} = start_node(cp1, Config),
+    {ok, Cp2} = start_node(cp2, Config),
+    {ok, Cp3} = start_node(cp3, Config),
 
-    test_server:sleep(1000),
+    ct:sleep(1000),
 
-    ?line {error, illegal_function_call} = 
+    {error, illegal_function_call} =
         rpc:call(Cp1, global_group, registered_names_test, [{node, Cp1nn}]),
-    ?line {badarg,_} = 
+    {badarg,_} =
         rpc:call(Cp1, global_group, send, [king, "The message"]),
-    ?line undefined = rpc:call(Cp1, global_group, whereis_name, [king]),
+    undefined = rpc:call(Cp1, global_group, whereis_name, [king]),
 
-    % stop the nodes, and make sure names are released.
+    %% stop the nodes, and make sure names are released.
     stop_node(Cp1),
     stop_node(Cp2),
     stop_node(Cp3),
 
-    % sleep to let the nodes die
-    test_server:sleep(1000),
+    %% sleep to let the nodes die
+    ct:sleep(1000),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
-    
+
 
 start_node(Name, Config) ->
     Pa=filename:dirname(code:which(?MODULE)),
-    Dir=?config(priv_dir, Config),
+    Dir=proplists:get_value(priv_dir, Config),
     ConfFile = "  -config " ++ filename:join(Dir, "global_group"),
     test_server:start_node(Name, slave, [{args, "-pa " ++ Pa ++ ConfFile}]).
 
 start_node_no(Name, Config) ->
     Pa=filename:dirname(code:which(?MODULE)),
-    Dir=?config(priv_dir, Config),
+    Dir=proplists:get_value(priv_dir, Config),
     ConfFile = "  -config " ++ filename:join(Dir, "no_global_group"),
     test_server:start_node(Name, slave, [{args, "-pa " ++ Pa ++ ConfFile}]).
 
 start_node_no2(Name, Config) ->
     Pa=filename:dirname(code:which(?MODULE)),
-    Dir=?config(priv_dir, Config),
+    Dir=proplists:get_value(priv_dir, Config),
     ConfFile = "  -config " ++ filename:join(Dir, "no_global_group_sync"),
     test_server:start_node(Name, slave, [{args, "-pa " ++ Pa ++ ConfFile}]).
 
 start_node_comp(Name, Config) ->
     Pa=filename:dirname(code:which(?MODULE)),
-    Dir=?config(priv_dir, Config),
+    Dir=proplists:get_value(priv_dir, Config),
     ConfFile = "  -config " ++ filename:join(Dir, "global_group_comp"),
     test_server:start_node(Name, slave, [{args, "-pa " ++ Pa ++ ConfFile}]).
 
@@ -1242,17 +1201,17 @@ node_name(Name, Config) ->
     lists:concat([Name,U,?testcase,U,Pid,U,U,L]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 
 wait_for_ready_net() ->
     Nodes = lists:sort(?NODES),
     ?UNTIL(begin
                lists:all(fun(N) -> Nodes =:= get_known(N) end, Nodes) and
-               lists:all(fun(N) -> 
-                                 LNs = rpc:call(N, erlang, nodes, []),
-                                 Nodes =:= lists:sort([N | LNs])
-                         end, Nodes)
+		   lists:all(fun(N) ->
+				     LNs = rpc:call(N, erlang, nodes, []),
+				     Nodes =:= lists:sort([N | LNs])
+			     end, Nodes)
            end).
 
 get_known(Node) ->
@@ -1262,11 +1221,11 @@ get_known(Node) ->
 config_hidden(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz, Ncpq) ->
     M = from($@, atom_to_list(node())),
     io:format(Fd, "[{kernel, [{sync_nodes_optional, ['~s@~s','~s@~s','~s@~s', "
-                                                   " '~s@~s','~s@~s','~s@~s']},"
-	                     "{sync_nodes_timeout, 1000},"
-                             "{global_groups, [{nc1, hidden, ['~s@~s','~s@~s','~s@~s']}, "
-                                              "{nc2, hidden, ['~s@~s','~s@~s','~s@~s']}, "
-	                                      "{nc3, normal, ['~s@~s']}]} ] }]. ~n",
+	      " '~s@~s','~s@~s','~s@~s']},"
+	      "{sync_nodes_timeout, 1000},"
+	      "{global_groups, [{nc1, hidden, ['~s@~s','~s@~s','~s@~s']}, "
+	      "{nc2, hidden, ['~s@~s','~s@~s','~s@~s']}, "
+	      "{nc3, normal, ['~s@~s']}]} ] }]. ~n",
 	      [Ncp1, M, Ncp2, M, Ncp3, M,  
                Ncpx, M, Ncpy, M, Ncpz, M, 
                Ncp1, M, Ncp2, M, Ncp3, M,  
@@ -1276,11 +1235,11 @@ config_hidden(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz, Ncpq) ->
 config(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz, Ncpq) ->
     M = from($@, atom_to_list(node())),
     io:format(Fd, "[{kernel, [{sync_nodes_optional, ['~s@~s','~s@~s','~s@~s', "
-                                                   " '~s@~s','~s@~s','~s@~s']},"
-	          "{sync_nodes_timeout, 1000},"
-                  "{global_groups, [{nc1, ['~s@~s','~s@~s','~s@~s']}, "
-                                " {nc2, ['~s@~s','~s@~s','~s@~s']}, "
-	                         "{nc3, ['~s@~s']}]} ] }]. ~n",
+	      " '~s@~s','~s@~s','~s@~s']},"
+	      "{sync_nodes_timeout, 1000},"
+	      "{global_groups, [{nc1, ['~s@~s','~s@~s','~s@~s']}, "
+	      " {nc2, ['~s@~s','~s@~s','~s@~s']}, "
+	      "{nc3, ['~s@~s']}]} ] }]. ~n",
 	      [Ncp1, M, Ncp2, M, Ncp3, M,  
                Ncpx, M, Ncpy, M, Ncpz, M, 
                Ncp1, M, Ncp2, M, Ncp3, M,  
@@ -1293,9 +1252,9 @@ config_no(Fd) ->
 config_sync(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz) ->
     M = from($@, atom_to_list(node())),
     io:format(Fd, "[{kernel, [{sync_nodes_optional, ['~s@~s','~s@~s','~s@~s', "
-                                                   " '~s@~s','~s@~s','~s@~s']},"
-	          "{sync_nodes_timeout, 1000},"
-                  "{global_groups, []} ] }] .~n",
+	      " '~s@~s','~s@~s','~s@~s']},"
+	      "{sync_nodes_timeout, 1000},"
+	      "{global_groups, []} ] }] .~n",
 	      [Ncp1, M, Ncp2, M, Ncp3, M,  
                Ncpx, M, Ncpy, M, Ncpz, M]).
 
@@ -1303,8 +1262,8 @@ config_sync(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz) ->
 config_comp(Fd, Ncp1, Ncp2, Ncp3, Ncpx, Ncpy, Ncpz) ->
     M = from($@, atom_to_list(node())),
     io:format(Fd, "[{kernel, [{sync_nodes_optional, ['~s@~s','~s@~s','~s@~s', "
-                                                   " '~s@~s','~s@~s','~s@~s']},"
-	          "{sync_nodes_timeout, 1000} ] }] .~n",
+	      " '~s@~s','~s@~s','~s@~s']},"
+	      "{sync_nodes_timeout, 1000} ] }] .~n",
 	      [Ncp1, M, Ncp2, M, Ncp3, M,  
                Ncpx, M, Ncpy, M, Ncpz, M]).
 
@@ -1325,7 +1284,7 @@ start_proc(Name) ->
     receive
 	{Pid, Res} -> {Pid, Res}
     end.
-    
+
 start_proc_rereg(Name) ->
     Pid = spawn(?MODULE, init2, [self(), Name]),
     receive
@@ -1437,9 +1396,9 @@ assert_loop(Cp, CpName, Name, NamePid, Loop) ->
         Loop ->
             ok;
         Other1 ->
-            test_server:fail(Other1)
+            ct:fail(Other1)
     after 5000 ->
-            test_server:fail(timeout)
+            ct:fail(timeout)
     end.
 
 loop_until_true(Fun) ->
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index 83efbb4c35..6ce1ee54e5 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(heart_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -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, 
@@ -27,6 +27,8 @@
 	 node_start_immediately_after_crash/1,
 	 node_start_soon_after_crash/1,
 	 set_cmd/1, clear_cmd/1, get_cmd/1,
+	 callback_api/1,
+         options_api/1,
 	 dont_drop/1, kill_pid/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -35,37 +37,43 @@
 
 -define(DEFAULT_TIMEOUT_SECS, 120).
 
+-define(UNIQ_NODE_NAME,
+  list_to_atom(?MODULE_STRING ++ "__" ++
+               atom_to_list(?FUNCTION_NAME) ++ "_" ++
+	       integer_to_list(erlang:unique_integer([positive])))).
+
 init_per_testcase(_Func, Config) ->
-    Dog=test_server:timetrap(test_server:seconds(?DEFAULT_TIMEOUT_SECS)),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Func, Config) ->
+end_per_testcase(_Func, _Config) ->
     Nodes = nodes(),
     lists:foreach(fun(X) ->
 		NNam = list_to_atom(hd(string:tokens(atom_to_list(X),"@"))),
 		case NNam of
 		    heart_test ->
-			?t:format(1, "WARNING: Killed ~p~n", [X]),
+			ct:pal(?HI_VERBOSITY, "WARNING: Killed ~p~n", [X]),
 			rpc:cast(X, erlang, halt, []);
 		    _ ->
 			ok
 		end
-	end, Nodes),
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog).
+	end, Nodes).
 
 %%-----------------------------------------------------------------
 %% Test suite for heart.
 %% Should be started in a CC view with:
 %% erl -sname master -rsh ctrsh
 %%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> [
 	start, restart, reboot,
 	node_start_immediately_after_crash,
 	node_start_soon_after_crash,
 	set_cmd, clear_cmd, get_cmd,
+	callback_api,
+        options_api,
 	kill_pid
     ].
 
@@ -93,7 +101,7 @@ end_per_suite(Config) when is_list(Config) ->
 start_check(Type, Name) ->
     start_check(Type, Name, []).
 start_check(Type, Name, Envs) ->
-    Args = case ?t:os_type() of
+    Args = case test_server:os_type() of
 	{win32,_} ->
 	    "+t50000 -heart " ++ env_encode([{"HEART_COMMAND", no_reboot}|Envs]);
 	_ ->
@@ -103,32 +111,30 @@ start_check(Type, Name, Envs) ->
 	loose ->
 	    loose_node:start(Name, Args, ?DEFAULT_TIMEOUT_SECS);
 	_ ->
-	    ?t:start_node(Name, Type, [{args, Args}])
+	    test_server:start_node(Name, Type, [{args, Args}])
     end,
     erlang:monitor_node(Node, true),
     case rpc:call(Node, erlang, whereis, [heart]) of
 	Pid when is_pid(Pid) ->
 	    ok;
 	_ ->
-	    test_server:fail(heart_not_started)
+	    ct:fail(heart_not_started)
     end,
     {ok, Node}.
 
-start(doc) -> [];
-start(suite) -> {req, [{time, 10}]};
 start(Config) when is_list(Config) ->
-    {ok, Node} = start_check(slave, heart_test),
+    {ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
     rpc:call(Node, init, reboot, []),
     receive
 	{nodedown, Node} -> ok
-    after 2000 -> test_server:fail(node_not_closed)
+    after 2000 -> ct:fail(node_not_closed)
     end,
-    test_server:sleep(5000),
+    timer:sleep(5000),
     case net_adm:ping(Node) of
 	pang ->
 	    ok;
 	_ -> 
-	    test_server:fail(node_rebooted)
+	    ct:fail(node_rebooted)
     end,
     test_server:stop_node(Node).
 
@@ -141,34 +147,24 @@ start(Config) when is_list(Config) ->
 %% restart
 %% Purpose:
 %%   Check that a node is up and running after a init:restart/0
-restart(doc) -> [];
-restart(suite) -> 
-   case ?t:os_type() of
-	{Fam, _} when Fam == unix; Fam == win32 ->
-	    {req, [{time,10}]};
-	_ ->
-	    {skip, "Only run on unix and win32"}
-    end;
 restart(Config) when is_list(Config) ->
-    {ok, Node} = start_check(loose, heart_test),
+    {ok, Node} = start_check(loose, ?UNIQ_NODE_NAME),
     rpc:call(Node, init, restart, []),
     receive
 	{nodedown, Node} ->
 	    ok
-    after 2000 ->
-	    test_server:fail(node_not_closed)
+    after 5000 ->
+	    ct:fail(node_not_closed)
     end,
-    test_server:sleep(5000),
+    timer:sleep(5000),
     node_check_up_down(Node, 2000),
     loose_node:stop(Node).
 
 %% reboot
 %% Purpose:
 %%   Check that a node is up and running after a init:reboot/0
-reboot(doc) -> [];
-reboot(suite) -> {req, [{time, 10}]};
 reboot(Config) when is_list(Config) ->
-    {ok, Node} = start_check(slave, heart_test),
+    {ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
 
     ok = rpc:call(Node, heart, set_cmd,
 			[atom_to_list(lib:progname()) ++ 
@@ -178,9 +174,9 @@ reboot(Config) when is_list(Config) ->
 	{nodedown, Node} ->
 	    ok
     after 2000 ->
-	    test_server:fail(node_not_closed)
+	    ct:fail(node_not_closed)
     end,
-    test_server:sleep(5000),
+    timer:sleep(5000),
     node_check_up_down(Node, 2000),
     ok.
 
@@ -192,7 +188,6 @@ reboot(Config) when is_list(Config) ->
 %% May currently dump core in beam debug build due to lock-order violation
 %% This should be removed when a non-lockad information retriever is implemented
 %% for crash dumps
-node_start_immediately_after_crash(suite) -> {req, [{time, 10}]};
 node_start_immediately_after_crash(Config) when is_list(Config) ->
     Config2 = ignore_cores:setup(?MODULE, node_start_immediately_after_crash, Config, true),
     try
@@ -203,7 +198,8 @@ node_start_immediately_after_crash(Config) when is_list(Config) ->
  
 
 node_start_immediately_after_crash_test(Config) when is_list(Config) ->
-    {ok, Node} = start_check(loose, heart_test_imm, [{"ERL_CRASH_DUMP_SECONDS", "0"}]),
+    {ok, Node} = start_check(loose, ?UNIQ_NODE_NAME,
+			     [{"ERL_CRASH_DUMP_SECONDS", "0"}]),
 
     ok = rpc:call(Node, heart, set_cmd,
 	[atom_to_list(lib:progname()) ++
@@ -225,13 +221,13 @@ node_start_immediately_after_crash_test(Config) when is_list(Config) ->
     T0 = now(),
 
     receive {nodedown, Node} ->
-	    test_server:format("Took ~.2f s. for node to go down~n", [timer:now_diff(now(), T0)/1000000]),
+	    io:format("Took ~.2f s. for node to go down~n", [timer:now_diff(now(), T0)/1000000]),
 	    ok
     %% timeout is very liberal here. nodedown is received in about 1 s. on linux (palantir)
     %% and in about 10 s. on solaris (carcharoth)
-    after (15000*test_server:timetrap_scale_factor()) -> test_server:fail(node_not_closed)
+    after (15000*test_server:timetrap_scale_factor()) -> ct:fail(node_not_closed)
     end,
-    test_server:sleep(3000),
+    timer:sleep(3000),
     node_check_up_down(Node, 2000),
     loose_node:stop(Node).
 
@@ -244,7 +240,6 @@ node_start_immediately_after_crash_test(Config) when is_list(Config) ->
 %% May currently dump core in beam debug build due to lock-order violation
 %% This should be removed when a non-lockad information retriever is implemented
 %% for crash dumps
-node_start_soon_after_crash(suite) -> {req, [{time, 10}]};
 node_start_soon_after_crash(Config) when is_list(Config) ->
     Config2 = ignore_cores:setup(?MODULE, node_start_soon_after_crash, Config, true),
     try
@@ -254,7 +249,8 @@ node_start_soon_after_crash(Config) when is_list(Config) ->
     end.
  
 node_start_soon_after_crash_test(Config) when is_list(Config) ->
-    {ok, Node} = start_check(loose, heart_test_soon, [{"ERL_CRASH_DUMP_SECONDS", "10"}]),
+    {ok, Node} = start_check(loose, ?UNIQ_NODE_NAME,
+			     [{"ERL_CRASH_DUMP_SECONDS", "10"}]),
 
     ok = rpc:call(Node, heart, set_cmd,
 	[atom_to_list(lib:progname()) ++
@@ -274,9 +270,9 @@ node_start_soon_after_crash_test(Config) when is_list(Config) ->
     rpc:cast(Node, Mod, do, []),
 
     receive {nodedown, Node} -> ok
-    after (15000*test_server:timetrap_scale_factor()) -> test_server:fail(node_not_closed)
+    after (15000*test_server:timetrap_scale_factor()) -> ct:fail(node_not_closed)
     end,
-    test_server:sleep(20000),
+    timer:sleep(20000),
     node_check_up_down(Node, 15000),
     loose_node:stop(Node).
 
@@ -289,16 +285,15 @@ node_check_up_down(Node, Tmo) ->
 	    receive
 		{nodedown, Node} -> ok
 	    after Tmo ->
-		    test_server:fail(node_not_closed2)
+		    ct:fail(node_not_closed2)
 	    end;
 	_ ->
-	    test_server:fail(node_not_rebooted)
+	    ct:fail(node_not_rebooted)
     end.
 
 %% Only tests bad command, correct behaviour is tested in reboot/1.
-set_cmd(suite) -> [];
 set_cmd(Config) when is_list(Config) ->
-    {ok, Node} = start_check(slave, heart_test),
+    {ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
     Cmd = wrong_atom,
     {error, {bad_cmd, Cmd}} = rpc:call(Node, heart, set_cmd, [Cmd]),
     Cmd1 = lists:duplicate(2047, $a),
@@ -310,9 +305,8 @@ set_cmd(Config) when is_list(Config) ->
     stop_node(Node),
     ok.
 
-clear_cmd(suite) -> {req,[{time,15}]};
 clear_cmd(Config) when is_list(Config) ->
-    {ok, Node} = start_check(slave, heart_test),
+    {ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
     ok = rpc:call(Node, heart, set_cmd,
 			[atom_to_list(lib:progname()) ++
 			 " -noshell -heart " ++ name(Node) ++ "&"]),
@@ -321,14 +315,14 @@ clear_cmd(Config) when is_list(Config) ->
 	{nodedown, Node} ->
 	    ok
     after 2000 ->
-	    test_server:fail(node_not_closed)
+	    ct:fail(node_not_closed)
     end,
-    test_server:sleep(5000),
+    timer:sleep(5000),
     case net_adm:ping(Node) of
 	pong ->
 	    erlang:monitor_node(Node, true);
 	_ ->
-	    test_server:fail(node_not_rebooted)
+	    ct:fail(node_not_rebooted)
     end,
     ok = rpc:call(Node, heart, set_cmd,
 			["erl -noshell -heart " ++ name(Node) ++ "&"]),
@@ -338,35 +332,95 @@ clear_cmd(Config) when is_list(Config) ->
 	{nodedown, Node} ->
 	    ok
     after 2000 ->
-	    test_server:fail(node_not_closed)
+	    ct:fail(node_not_closed)
     end,
-    test_server:sleep(5000),
+    timer:sleep(5000),
     case net_adm:ping(Node) of
 	pang ->
 	    ok;
 	_ ->
-	    test_server:fail(node_rebooted)
+	    ct:fail(node_rebooted)
     end,
     ok.
 
-get_cmd(suite) -> [];
 get_cmd(Config) when is_list(Config) ->
-    {ok, Node} = start_check(slave, heart_test),
+    {ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
     Cmd = "test",
     ok  = rpc:call(Node, heart, set_cmd, [Cmd]),
     {ok, Cmd} = rpc:call(Node, heart, get_cmd, []),
     stop_node(Node),
     ok.
 
-dont_drop(suite) -> 
+callback_api(Config) when is_list(Config) ->
+    {ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
+    none = rpc:call(Node, heart, get_callback, []),
+    M0 = self(),
+    F0 = ok,
+    {error, {bad_callback, {M0,F0}}} = rpc:call(Node, heart, set_callback, [M0,F0]),
+    none = rpc:call(Node, heart, get_callback, []),
+    M1 = lists:duplicate(28, $a),
+    F1 = lists:duplicate(28, $b),
+    {error, {bad_callback, {M1,F1}}} = rpc:call(Node, heart, set_callback, [M1,F1]),
+    none = rpc:call(Node, heart, get_callback, []),
+
+    M2 = heart_check_module,
+    F2 = cb_ok,
+    F3 = cb_error,
+    Code0 = generate(M2, [], [
+	    atom_to_list(F2) ++ "() -> ok.",
+            atom_to_list(F3) ++ "() -> exit(\"callback_error (as intended)\")."
+	]),
+    {module, M2} = rpc:call(Node, erlang, load_module, [M2, Code0]),
+    ok = rpc:call(Node, M2, F2, []),
+    ok = rpc:call(Node, heart, set_callback, [M2,F2]),
+    {ok, {M2,F2}} = rpc:call(Node, heart, get_callback, []),
+    ok = rpc:call(Node, heart, clear_callback, []),
+    none = rpc:call(Node, heart, get_callback, []),
+    ok = rpc:call(Node, heart, set_callback, [M2,F2]),
+    {ok, {M2,F2}} = rpc:call(Node, heart, get_callback, []),
+    ok = rpc:call(Node, heart, set_callback, [M2,F3]),
+    receive {nodedown, Node} -> ok
+    after 5000 -> ct:fail(node_not_killed)
+    end,
+    stop_node(Node),
+    ok.
+
+options_api(Config) when is_list(Config) ->
+    {ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
+    none = rpc:call(Node, heart, get_options, []),
+    M0 = self(),
+    F0 = ok,
+    {error, {bad_options, {M0,F0}}} = rpc:call(Node, heart, set_options, [{M0,F0}]),
+    none = rpc:call(Node, heart, get_options, []),
+    Ls = lists:duplicate(28, $b),
+    {error, {bad_options, Ls}} = rpc:call(Node, heart, set_options, [Ls]),
+    none = rpc:call(Node, heart, get_options, []),
+
+    ok = rpc:call(Node, heart, set_options, [[check_schedulers]]),
+    {ok, [check_schedulers]} = rpc:call(Node, heart, get_options, []),
+    ok = rpc:call(Node, heart, set_options, [[]]),
+    none = rpc:call(Node, heart, get_options, []),
+
+    ok = rpc:call(Node, heart, set_options, [[check_schedulers]]),
+    {ok, [check_schedulers]} = rpc:call(Node, heart, get_options, []),
+    {error, {bad_options, Ls}} = rpc:call(Node, heart, set_options, [Ls]),
+    {ok, [check_schedulers]} = rpc:call(Node, heart, get_options, []),
+
+    receive after 3000 -> ok end, %% wait 3 secs
+
+    ok = rpc:call(Node, heart, set_options, [[]]),
+    none = rpc:call(Node, heart, get_options, []),
+    stop_node(Node),
+    ok.
+
+
 %%% Removed as it may crash epmd/distribution in colourful
 %%% ways. While we ARE finding out WHY, it would
 %%% be nice for others to be able to run the kernel test suite
-%%% without "exploding machines", so thats why I removed it for now.
-    [];
-dont_drop(doc) ->
-    ["Tests that the heart command does not get dropped when ",
-     "set just before halt on very high I/O load."];
+%%% without "exploding machines", so that's why I removed it for now.
+
+%% Tests that the heart command does not get dropped when
+%% set just before halt on very high I/O load..
 dont_drop(Config) when is_list(Config) ->
     %%% Have to do it some times to make it happen...
     [ok,ok,ok,ok,ok,ok,ok,ok,ok,ok] = do_dont_drop(Config,10),
@@ -388,7 +442,7 @@ do_dont_drop(Config,N) ->
     Env = [{"HEART_COMMAND", FirstCmd}],
     Func = "start_heart_stress",
     Arg = NN3 ++ "@" ++ Host ++ " " ++
-	filename:join(?config(data_dir, Config), "simple_echo"),
+	filename:join(proplists:get_value(data_dir, Config), "simple_echo"),
     start_node_run(Name,Env,Func,Arg),
     case wait_for_any_of(list_to_atom(NN2 ++ "@" ++ Host),
 	    list_to_atom(NN3 ++ "@" ++ Host)) of
@@ -421,16 +475,13 @@ wait_for_any_of(N1,N2,Times) ->
     end.
 
 
-kill_pid(suite) ->
-    [];
-kill_pid(doc) ->
-    ["Tests that heart kills the old erlang node before executing ",
-     "heart command."];
+%% Tests that heart kills the old erlang node before executing
+%% heart command.
 kill_pid(Config) when is_list(Config) ->
     ok = do_kill_pid(Config).
 
 do_kill_pid(_Config) ->
-    Name = heart_test,
+    Name = ?UNIQ_NODE_NAME,
     Env = [{"HEART_COMMAND", "nickeNyfikenFarEttJobb"}],
     {ok,Node} = start_node_run(Name,Env,suicide_by_heart,[]),
     ok = wait_for_node(Node,15),
diff --git a/lib/kernel/test/ignore_cores.erl b/lib/kernel/test/ignore_cores.erl
index db61c4003b..24b95e273c 100644
--- a/lib/kernel/test/ignore_cores.erl
+++ b/lib/kernel/test/ignore_cores.erl
@@ -28,7 +28,7 @@
 
 -module(ignore_cores).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([init/1, fini/1, setup/3, setup/4, restore/1, dir/1]).
 
@@ -53,7 +53,7 @@ init(Config) ->
 fini(Config) ->
     #ignore_cores{org_cwd = OrgCWD,
 		  org_path = OrgPath,
-		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+		  org_pwd_env = OrgPWD} = proplists:get_value(ignore_cores, Config),
     ok = file:set_cwd(OrgCWD),
     true = code:set_path(OrgPath),
     case OrgPWD of
@@ -70,10 +70,10 @@ setup(Suite, Testcase, Config, SetCwd) when is_atom(Suite),
                                             is_list(Config) ->
     #ignore_cores{org_cwd = OrgCWD,
 		  org_path = OrgPath,
-		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+		  org_pwd_env = OrgPWD} = proplists:get_value(ignore_cores, Config),
     Path = lists:map(fun (".") -> OrgCWD; (Dir) -> Dir end, OrgPath),
     true = code:set_path(Path),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     IgnDir = filename:join([PrivDir,
 			 atom_to_list(Suite)
 			 ++ "_"
@@ -94,7 +94,7 @@ setup(Suite, Testcase, Config, SetCwd) when is_atom(Suite),
     end,
     ok = file:write_file(filename:join([IgnDir, "ignore_core_files"]), <<>>),
     %% cores are dumped in /cores on MacOS X
-    CoresDir = case {?t:os_type(), filelib:is_dir("/cores")} of
+    CoresDir = case {test_server:os_type(), filelib:is_dir("/cores")} of
 		   {{unix,darwin}, true} ->
 		       filelib:fold_files("/cores",
 					  "^core.*$",
@@ -119,7 +119,7 @@ restore(Config) ->
 		  org_path = OrgPath,
 		  org_pwd_env = OrgPWD,
 		  ign_dir = IgnDir,
-		  cores_dir = CoresDir} = ?config(ignore_cores, Config),
+		  cores_dir = CoresDir} = proplists:get_value(ignore_cores, Config),
     try
 	case CoresDir of
 	    false ->
@@ -155,5 +155,5 @@ restore(Config) ->
 
 
 dir(Config) ->
-    #ignore_cores{ign_dir = Dir} = ?config(ignore_cores, Config),
+    #ignore_cores{ign_dir = Dir} = proplists:get_value(ignore_cores, Config),
     Dir.
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index 5ba06bb032..38cb02a6ec 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(inet_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/inet.hrl").
 -include_lib("kernel/src/inet_dns.hrl").
 
@@ -46,7 +46,9 @@
 	 kill_gethost/0, parallell_gethost/0, test_netns/0]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [t_gethostbyaddr, t_gethostbyname, t_getaddr,
@@ -97,35 +99,30 @@ init_per_testcase(lookup_bad_search_option, Config) ->
     Prev = ets:lookup(Db, Key),
     ets:delete(Db, Key),
     ets:insert(Db, {Key,[lookup_bad_search_option]}),
-    ?t:format("Misconfigured resolver lookup order", []),
-    Dog = test_server:timetrap(test_server:seconds(60)),
-    [{Key,Prev},{watchdog,Dog}|Config];
+    io:format("Misconfigured resolver lookup order", []),
+    [{Key,Prev}|Config];
 init_per_testcase(_Func, Config) ->
-    Dog = test_server:timetrap(test_server:seconds(60)),
-    [{watchdog,Dog}|Config].
+    Config.
 
 end_per_testcase(lookup_bad_search_option, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
     Db = inet_db,
     Key = res_lookup,
-    Prev = ?config(Key, Config),
+    Prev = proplists:get_value(Key, Config),
     ets:delete(Db, Key),
     ets:insert(Db, Prev),
-    ?t:format("Restored resolver lookup order", []);
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog).
+    io:format("Restored resolver lookup order", []);
+end_per_testcase(_Func, _Config) ->
+    ok.
 
 t_gethostbyaddr() ->
     required(v4).
-t_gethostbyaddr(doc) -> "Test the inet:gethostbyaddr/1 function.";
+%% Test the inet:gethostbyaddr/1 function.
 t_gethostbyaddr(Config) when is_list(Config) ->
     {Name,FullName,IPStr,{A,B,C,D}=IP,Aliases,_,_} = ct:get_config(test_host_ipv4_only),
     Rname = integer_to_list(D) ++ "." ++
-            integer_to_list(C) ++ "." ++
-            integer_to_list(B) ++ "." ++
-            integer_to_list(A) ++ ".in-addr.arpa",
+	integer_to_list(C) ++ "." ++
+	integer_to_list(B) ++ "." ++
+	integer_to_list(A) ++ ".in-addr.arpa",
     {ok,HEnt} = inet:gethostbyaddr(IPStr),
     {ok,HEnt} = inet:gethostbyaddr(IP),
     {error,Error} = inet:gethostbyaddr(Name),
@@ -155,79 +152,77 @@ t_gethostbyaddr(Config) when is_list(Config) ->
     ok.
 
 t_gethostbyaddr_v6() -> required(v6).
-t_gethostbyaddr_v6(doc) -> "Test the inet:gethostbyaddr/1 inet6 function.";
+%% Test the inet:gethostbyaddr/1 inet6 function.
 t_gethostbyaddr_v6(Config) when is_list(Config) ->
-    ?line {Name6, FullName6, IPStr6, IP6, Aliases6} =
+    {Name6, FullName6, IPStr6, IP6, Aliases6} =
 	ct:get_config(test_host_ipv6_only),
 
-    ?line case inet:gethostbyaddr(IPStr6) of
+    case inet:gethostbyaddr(IPStr6) of
         %% Even if IPv6 is not supported, the native resolver may succeed
 	%% looking up the host. DNS lookup will probably fail.
 	{error,nxdomain} ->
 	    {skip, "IPv6 test fails! IPv6 not supported on this host!?"};
 	{ok,HEnt6} ->
-	    ?line {ok,HEnt6} = inet:gethostbyaddr(IP6),
-	    ?line {error,Error6} = inet:gethostbyaddr(Name6),
-	    ?line ok = io:format("Failure reason: ~p: ~s",
-				 [Error6, inet:format_error(Error6)]),
-	    ?line HEnt6_ = HEnt6#hostent{h_addrtype = inet6,
-					 h_length = 16,
-					 h_addr_list = [IP6]},
-	    ?line HEnt6_ = HEnt6,
-	    ?line check_elems([{HEnt6#hostent.h_name,[Name6,FullName6]},
-			       {HEnt6#hostent.h_aliases,[[],Aliases6]}]),
-
-	    ?line {_DName6, _DFullName6, DIPStr6, DIP6, _} =
-		      ct:get_config(test_dummy_ipv6_host),
-	    ?line {error,nxdomain} = inet:gethostbyaddr(DIPStr6),
-	    ?line {error,nxdomain} = inet:gethostbyaddr(DIP6),    
+	    {ok,HEnt6} = inet:gethostbyaddr(IP6),
+	    {error,Error6} = inet:gethostbyaddr(Name6),
+	    ok = io:format("Failure reason: ~p: ~s",
+			   [Error6, inet:format_error(Error6)]),
+	    HEnt6_ = HEnt6#hostent{h_addrtype = inet6,
+				   h_length = 16,
+				   h_addr_list = [IP6]},
+	    HEnt6_ = HEnt6,
+	    check_elems([{HEnt6#hostent.h_name,[Name6,FullName6]},
+			 {HEnt6#hostent.h_aliases,[[],Aliases6]}]),
+
+	    {_DName6, _DFullName6, DIPStr6, DIP6, _} =
+		ct:get_config(test_dummy_ipv6_host),
+	    {error,nxdomain} = inet:gethostbyaddr(DIPStr6),
+	    {error,nxdomain} = inet:gethostbyaddr(DIP6),
 	    ok
     end.
 
 t_gethostbyname() -> required(v4).
-t_gethostbyname(doc) -> "Test the inet:gethostbyname/1 function.";
-t_gethostbyname(suite) -> [];
+%% Test the inet:gethostbyname/1 function.
 t_gethostbyname(Config) when is_list(Config) ->
-    ?line {Name,FullName,IPStr,IP,Aliases,IP_46_Str,_} =
+    {Name,FullName,IPStr,IP,Aliases,IP_46_Str,_} =
 	ct:get_config(test_host_ipv4_only),
-    ?line {ok,_} = inet:gethostbyname(IPStr),
-    ?line {ok,HEnt} = inet:gethostbyname(Name),
-    ?line {ok,HEnt} = inet:gethostbyname(list_to_atom(Name)),
-    ?line HEnt_ = HEnt#hostent{h_addrtype = inet,
-			       h_length = 4,
-			       h_addr_list = [IP]},
-
-    ?line HEnt_ = HEnt,
-    ?line check_elems([{HEnt#hostent.h_name,[Name,FullName]},
-		       {HEnt#hostent.h_aliases,[[],Aliases]}]),
-    ?line {ok,HEntF} = inet:gethostbyname(FullName),
-    ?line HEntF_ = HEntF#hostent{h_name = FullName,
-				 h_addrtype = inet,
-				 h_length = 4,
-				 h_addr_list = [IP]},
-    ?line HEntF_ = HEntF,
-    ?line check_elems([{HEnt#hostent.h_aliases,[[],Aliases]}]),
+    {ok,_} = inet:gethostbyname(IPStr),
+    {ok,HEnt} = inet:gethostbyname(Name),
+    {ok,HEnt} = inet:gethostbyname(list_to_atom(Name)),
+    HEnt_ = HEnt#hostent{h_addrtype = inet,
+			 h_length = 4,
+			 h_addr_list = [IP]},
+
+    HEnt_ = HEnt,
+    check_elems([{HEnt#hostent.h_name,[Name,FullName]},
+		 {HEnt#hostent.h_aliases,[[],Aliases]}]),
+    {ok,HEntF} = inet:gethostbyname(FullName),
+    HEntF_ = HEntF#hostent{h_name = FullName,
+			   h_addrtype = inet,
+			   h_length = 4,
+			   h_addr_list = [IP]},
+    HEntF_ = HEntF,
+    check_elems([{HEnt#hostent.h_aliases,[[],Aliases]}]),
     %%
-    ?line FullNameU = toupper(FullName),
-    ?line {ok,HEntU} = inet:gethostbyname(FullNameU),
-    ?line FullNameU = toupper(HEntU#hostent.h_name),
-    ?line #hostent{
+    FullNameU = toupper(FullName),
+    {ok,HEntU} = inet:gethostbyname(FullNameU),
+    FullNameU = toupper(HEntU#hostent.h_name),
+    #hostent{
        h_addrtype = inet,
        h_length = 4,
        h_addr_list = [IP]} = HEntU,
-    ?line check_elems(
-	    [{[toupper(H) || H <- HEntU#hostent.h_aliases],
-	      [[],[toupper(A) || A <- Aliases]]}]),
+    check_elems(
+      [{[toupper(H) || H <- HEntU#hostent.h_aliases],
+	[[],[toupper(A) || A <- Aliases]]}]),
 
-    ?line {DName, _DFullName, _DIPStr, _DIP, _, _, _} =
+    {DName, _DFullName, _DIPStr, _DIP, _, _, _} =
 	ct:get_config(test_dummy_host),
-    ?line {error,nxdomain} = inet:gethostbyname(DName),
-    ?line {error,nxdomain} = inet:gethostbyname(IP_46_Str),
+    {error,nxdomain} = inet:gethostbyname(DName),
+    {error,nxdomain} = inet:gethostbyname(IP_46_Str),
     ok.
 
 t_gethostbyname_v6() -> required(v6).
-t_gethostbyname_v6(doc) -> "Test the inet:gethostbyname/1 inet6 function.";
-t_gethostbyname_v6(suite) -> [];
+%% Test the inet:gethostbyname/1 inet6 function.
 t_gethostbyname_v6(Config) when is_list(Config) ->
     {Name, FullName, IPStr, IP, Aliases} =
 	ct:get_config(test_host_ipv6_only),
@@ -287,33 +282,31 @@ check_elem(Val, [Val|_], _) -> ok;
 check_elem(Val, [_|Tests], Tests0) ->
     check_elem(Val, Tests, Tests0);
 check_elem(Val, [], Tests0) ->
-    ?t:fail({no_match,Val,Tests0}).
+    ct:fail({no_match,Val,Tests0}).
 
 
 t_getaddr() -> required(v4).
-t_getaddr(doc) -> "Test the inet:getaddr/2 function.";
-t_getaddr(suite) -> [];
+%% Test the inet:getaddr/2 function.
 t_getaddr(Config) when is_list(Config) ->
-    ?line {Name,FullName,IPStr,IP,_,IP_46_Str,IP46} =
+    {Name,FullName,IPStr,IP,_,IP_46_Str,IP46} =
 	ct:get_config(test_host_ipv4_only),
-    ?line {ok,IP} = inet:getaddr(list_to_atom(Name), inet),
-    ?line {ok,IP} = inet:getaddr(Name, inet),
-    ?line {ok,IP} = inet:getaddr(FullName, inet),
-    ?line {ok,IP} = inet:getaddr(IP, inet),
-    ?line {ok,IP} = inet:getaddr(IPStr, inet),
-    ?line {error,nxdomain} = inet:getaddr(IP_46_Str, inet),
-    ?line {error,eafnosupport} = inet:getaddr(IP46, inet),
-
-    ?line {DName, DFullName, DIPStr, DIP, _, _, _} = ct:get_config(test_dummy_host),
-    ?line {error,nxdomain} = inet:getaddr(DName, inet),
-    ?line {error,nxdomain} = inet:getaddr(DFullName, inet),
-    ?line {ok,DIP} = inet:getaddr(DIPStr, inet),
-    ?line {ok,DIP} = inet:getaddr(DIP, inet),
+    {ok,IP} = inet:getaddr(list_to_atom(Name), inet),
+    {ok,IP} = inet:getaddr(Name, inet),
+    {ok,IP} = inet:getaddr(FullName, inet),
+    {ok,IP} = inet:getaddr(IP, inet),
+    {ok,IP} = inet:getaddr(IPStr, inet),
+    {error,nxdomain} = inet:getaddr(IP_46_Str, inet),
+    {error,eafnosupport} = inet:getaddr(IP46, inet),
+
+    {DName, DFullName, DIPStr, DIP, _, _, _} = ct:get_config(test_dummy_host),
+    {error,nxdomain} = inet:getaddr(DName, inet),
+    {error,nxdomain} = inet:getaddr(DFullName, inet),
+    {ok,DIP} = inet:getaddr(DIPStr, inet),
+    {ok,DIP} = inet:getaddr(DIP, inet),
     ok.
 
 t_getaddr_v6() -> required(v4) ++ required(v6).
-t_getaddr_v6(doc) -> "Test the inet:getaddr/2 function.";
-t_getaddr_v6(suite) -> [];
+%% Test the inet:getaddr/2 function.
 t_getaddr_v6(Config) when is_list(Config) ->
     {Name,FullName,IPStr,IP,_} =
 	ct:get_config(test_host_ipv6_only),
@@ -341,16 +334,15 @@ t_getaddr_v6(Config) when is_list(Config) ->
     end.
 
 ipv4_to_ipv6() -> required(v4).
-ipv4_to_ipv6(doc) -> "Test if IPv4 address is converted to IPv6 address.";
-ipv4_to_ipv6(suite) -> [];
+%% Test if IPv4 address is converted to IPv6 address.
 ipv4_to_ipv6(Config) when is_list(Config) ->
     %% Test what happens if an IPv4 address is looked up in an IPv6 context.
     %% If the native resolver succeeds to look it up, an IPv4 compatible
     %% address should be returned. If no IPv6 support on this host, an
     %% error should beturned.
-    ?line {_Name,_FullName,IPStr,_IP,Aliases,IP_46_Str,IP_46} =
+    {_Name,_FullName,IPStr,_IP,Aliases,IP_46_Str,IP_46} =
 	ct:get_config(test_host_ipv4_only),
-    ?line IP4to6Res =
+    IP4to6Res =
 	case inet:getaddr(IPStr, inet6) of
 	    {ok,IP_46} ->
 		io:format("IPv4->IPv6: success~n"),
@@ -362,36 +354,34 @@ ipv4_to_ipv6(Config) when is_list(Config) ->
 		io:format("IPv6->IPv4: eafnosupport~n"),
 		E;
 	    Other ->
-		?line ?t:fail({ipv4_to_ipv6_lookup_failed,Other})
+		ct:fail({ipv4_to_ipv6_lookup_failed,Other})
 	end,
-    ?line case {IP4to6Res,inet:gethostbyname(IPStr, inet6)} of
-	      {true,{ok,HEnt}} ->
-		  ?line HEnt_ = HEnt#hostent{h_addrtype = inet6,
-					     h_length = 16,
-					     h_addr_list = [IP_46]},
-		  ?line HEnt_ = HEnt,
-		  ?line check_elems([{HEnt#hostent.h_name,[IP_46_Str,IPStr]},
-				     {HEnt#hostent.h_aliases,[[],Aliases]}]);
-	      {_,IP4to6Res} -> ok
-	  end,
+    case {IP4to6Res,inet:gethostbyname(IPStr, inet6)} of
+	{true,{ok,HEnt}} ->
+	    HEnt_ = HEnt#hostent{h_addrtype = inet6,
+				 h_length = 16,
+				 h_addr_list = [IP_46]},
+	    HEnt_ = HEnt,
+	    check_elems([{HEnt#hostent.h_name,[IP_46_Str,IPStr]},
+			 {HEnt#hostent.h_aliases,[[],Aliases]}]);
+	{_,IP4to6Res} -> ok
+    end,
     ok.
 
-host_and_addr() -> required(hosts).
-host_and_addr(doc) -> ["Test looking up hosts and addresses. Use 'ypcat hosts' ",
-		       "or the local eqivalent to find all hosts."];
-host_and_addr(suite) -> [];
-host_and_addr(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(5)),
+host_and_addr() ->
+    [{timetrap,{minutes,5}}|required(hosts)].
 
-    ?line lists:foreach(fun try_host/1, get_hosts(Config)),
-    ?line test_server:timetrap_cancel(Dog),
+%% Test looking up hosts and addresses. Use 'ypcat hosts'
+%% or the local eqivalent to find all hosts.
+host_and_addr(Config) when is_list(Config) ->
+    lists:foreach(fun try_host/1, get_hosts(Config)),
     ok.
 
 try_host({Ip0, Host}) ->
-    ?line {ok,Ip} = inet:getaddr(Ip0, inet),
-    ?line {ok,{hostent, _, _, inet, _, Ips1}} = inet:gethostbyaddr(Ip),
-    ?line {ok,{hostent, _, _, inet, _, _Ips2}} = inet:gethostbyname(Host),
-    ?line true = lists:member(Ip, Ips1),
+    {ok,Ip} = inet:getaddr(Ip0, inet),
+    {ok,{hostent, _, _, inet, _, Ips1}} = inet:gethostbyaddr(Ip),
+    {ok,{hostent, _, _, inet, _, _Ips2}} = inet:gethostbyname(Host),
+    true = lists:member(Ip, Ips1),
     ok.
 
 %% Get all hosts from the system using 'ypcat hosts' or the local
@@ -438,18 +428,18 @@ get_hosts([C|Rest], Cur, Ip, Result) ->
     get_hosts(Rest, [C|Cur], Ip, Result);
 get_hosts([], _, _, Result) ->
     Result.
-    
+
 
 parse_hosts(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir,Config),
-    ?line HostFile = filename:join(DataDir, "hosts"),
-    ?line inet_parse:hosts(HostFile),
-    ?line HostFileErr1 = filename:join(DataDir, "hosts_err1"),
-    ?line inet_parse:hosts(HostFileErr1),
-    ?line Resolv = filename:join(DataDir,"resolv.conf"),
-    ?line inet_parse:resolv(Resolv),
-    ?line ResolvErr1 = filename:join(DataDir,"resolv.conf.err1"),
-    ?line inet_parse:resolv(ResolvErr1).
+    DataDir = proplists:get_value(data_dir,Config),
+    HostFile = filename:join(DataDir, "hosts"),
+    inet_parse:hosts(HostFile),
+    HostFileErr1 = filename:join(DataDir, "hosts_err1"),
+    inet_parse:hosts(HostFileErr1),
+    Resolv = filename:join(DataDir,"resolv.conf"),
+    inet_parse:resolv(Resolv),
+    ResolvErr1 = filename:join(DataDir,"resolv.conf.err1"),
+    inet_parse:resolv(ResolvErr1).
 
 parse_address(Config) when is_list(Config) ->
     V4Strict =
@@ -521,10 +511,10 @@ parse_address(Config) when is_list(Config) ->
 	 {{0,0,0,0,0,65535,258,65534},"::FFFF:1.2.255.254"},
 	 {{16#ffff,16#ffff,16#ffff,16#ffff,16#ffff,16#ffff,16#ffff,16#ffff},
 	  "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"}
-	|[{{D2,0,0,0,0,P,(D1 bsl 8) bor D2,(D3 bsl 8) bor D4},
-	   erlang:integer_to_list(D2, 16)++"::"++Q++S}
-	  || {{D1,D2,D3,D4},S} <- V4Strict,
-	     {P,Q} <- [{0,""},{16#17,"17:"},{16#ff0,"0ff0:"}]]],
+	 |[{{D2,0,0,0,0,P,(D1 bsl 8) bor D2,(D3 bsl 8) bor D4},
+	    erlang:integer_to_list(D2, 16)++"::"++Q++S}
+	   || {{D1,D2,D3,D4},S} <- V4Strict,
+	      {P,Q} <- [{0,""},{16#17,"17:"},{16#ff0,"0ff0:"}]]],
     V4Sloppy =
 	[{{10,1,16#98,16#76},"10.0x019876"},
 	 {{8#12,1,8#130,8#321},"012.01.054321"},
@@ -624,42 +614,37 @@ parse_strict_address(Config) when is_list(Config) ->
     {ok, {3089,3106,23603,50240,0,0,119,136}} =
 	inet:parse_strict_address("c11:0c22:5c33:c440::077:0088").
 
-t_gethostnative(suite) ->[];
-t_gethostnative(doc) ->[];
 t_gethostnative(Config) when is_list(Config) ->
-%% this will result in 26 bytes sent which causes problem in Windows
-%% if the port-program has not assured stdin to be read in BINARY mode
-%% OTP-2555
-    ?line case inet_gethost_native:gethostbyname(
-	    "a23456789012345678901234") of
+    %% this will result in 26 bytes sent which causes problem in Windows
+    %% if the port-program has not assured stdin to be read in BINARY mode
+    %% OTP-2555
+    case inet_gethost_native:gethostbyname(
+	   "a23456789012345678901234") of
 	{error,notfound} ->
-	    ?line ok;
+	    ok;
 	{error,no_data} ->
-	    ?line ok
+	    ok
     end.
 
-gethostnative_parallell(suite) ->    
-    [];
-gethostnative_parallell(doc) ->
-    ["Check that the emulator survives crashes in gethost_native"];
+%% Check that the emulator survives crashes in gethost_native.
 gethostnative_parallell(Config) when is_list(Config) ->
-    ?line {ok,Hostname} = inet:gethostname(),
-    ?line {ok,_} = inet:gethostbyname(Hostname),
+    {ok,Hostname} = inet:gethostname(),
+    {ok,_} = inet:gethostbyname(Hostname),
     case whereis(inet_gethost_native) of
 	Pid when is_pid(Pid) ->
-	    ?line do_gethostnative_parallell();
+	    do_gethostnative_parallell();
 	_ ->
-	    ?line {skipped, "Not running native gethostbyname"}
+	    {skipped, "Not running native gethostbyname"}
     end.
 
 do_gethostnative_parallell() ->
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok,Node} = ?t:start_node(gethost_parallell, slave, 
-				     [{args, "-pa " ++ PA}]),
-    ?line ok = rpc:call(Node, ?MODULE, parallell_gethost, []),
-    ?line receive after 10000 -> ok end,
-    ?line pong = net_adm:ping(Node),
-    ?line ?t:stop_node(Node),
+    PA = filename:dirname(code:which(?MODULE)),
+    {ok,Node} = test_server:start_node(gethost_parallell, slave,
+				       [{args, "-pa " ++ PA}]),
+    ok = rpc:call(Node, ?MODULE, parallell_gethost, []),
+    receive after 10000 -> ok end,
+    pong = net_adm:ping(Node),
+    test_server:stop_node(Node),
     ok.
 
 parallell_gethost() ->
@@ -752,7 +737,7 @@ wait_for_gethost(N) ->
 	    %% This is what I call an exit tuple :)
 	    exit({inet,gethostbyname, returned, Otherwise, 'when',
 		  'N','=',N,'and','hostname','=',Hostname,'and',
-		 kill_gethost_n,'=',get(kill_gethost_n)})
+		  kill_gethost_n,'=',get(kill_gethost_n)})
     end,
     case whereis(inet_gethost_native) of
 	Pid when is_pid(Pid) ->
@@ -764,23 +749,20 @@ wait_for_gethost(N) ->
 	    end,
 	    wait_for_gethost(N-1)
     end.
-	    
-cname_loop(suite) ->
-    [];
-cname_loop(doc) ->
-    ["Check that the resolver handles a CNAME loop"];
+
+%% Check that the resolver handles a CNAME loop.
 cname_loop(Config) when is_list(Config) ->
     %% getbyname (hostent_by_domain)
-    ?line ok = inet_db:add_rr("mydomain.com", in, ?S_CNAME, ttl, "mydomain.com"),
-    ?line {error,nxdomain} = inet_db:getbyname("mydomain.com", ?S_A),
-    ?line ok = inet_db:del_rr("mydomain.com", in, ?S_CNAME, "mydomain.com"),
+    ok = inet_db:add_rr("mydomain.com", in, ?S_CNAME, ttl, "mydomain.com"),
+    {error,nxdomain} = inet_db:getbyname("mydomain.com", ?S_A),
+    ok = inet_db:del_rr("mydomain.com", in, ?S_CNAME, "mydomain.com"),
     %% res_hostent_by_domain
     RR = #dns_rr{domain = "mydomain.com",
 		 class = in,
 		 type = ?S_CNAME,
 		 data = "mydomain.com"},
     Rec = #dns_rec{anlist = [RR]},
-    ?line {error,nxdomain} = inet_db:res_hostent_by_domain("mydomain.com", ?S_A, Rec),
+    {error,nxdomain} = inet_db:res_hostent_by_domain("mydomain.com", ?S_A, Rec),
     ok.
 
 
@@ -795,80 +777,75 @@ cname_loop(Config) when is_list(Config) ->
 				lookup_processes=20}).
 
 gethostnative_soft_restart() -> required(hosts).
-gethostnative_soft_restart(suite) ->    
-    [];
-gethostnative_soft_restart(doc) ->
-    ["Check that no name lookups fails during soft restart "
-     "of inet_gethost_native"];
+
+%% Check that no name lookups fails during soft restart
+%% of inet_gethost_native.
 gethostnative_soft_restart(Config) when is_list(Config) ->
-    ?line gethostnative_control(Config, 
-				#gethostnative_control{
-				  control_seq=[soft_restart]}).
+    gethostnative_control(Config,
+			  #gethostnative_control{
+			     control_seq=[soft_restart]}).
 
 
 gethostnative_debug_level() -> required(hosts).
-gethostnative_debug_level(suite) ->    
-    [];
-gethostnative_debug_level(doc) ->
-    ["Check that no name lookups fails during debug level change "
-     "of inet_gethost_native"];
+
+%% Check that no name lookups fails during debug level change
+%% of inet_gethost_native.
 gethostnative_debug_level(Config) when is_list(Config) ->
-    ?line gethostnative_control(Config, 
-				#gethostnative_control{
-				  control_seq=[{debug_level,1},
-					       {debug_level,0}]}).
+    gethostnative_control(Config,
+			  #gethostnative_control{
+			     control_seq=[{debug_level,1},
+					  {debug_level,0}]}).
 
 gethostnative_control(Config, Optrec) ->
-    ?line case inet_db:res_option(lookup) of
-	      [native] ->
-		  case whereis(inet_gethost_native) of
-		      Pid when is_pid(Pid) ->
-			  ?line gethostnative_control_1(Config, Optrec);
-		      _ ->
-			  ?line {skipped, "Not running native gethostbyname"}
-		  end;
-	      _ ->
-		  ?line {skipped, "Native not only lookup metod"}
-	 end.
+    case inet_db:res_option(lookup) of
+	[native] ->
+	    case whereis(inet_gethost_native) of
+		Pid when is_pid(Pid) ->
+		    gethostnative_control_1(Config, Optrec);
+		_ ->
+		    {skipped, "Not running native gethostbyname"}
+	    end;
+	_ ->
+	    {skipped, "Native not only lookup metod"}
+    end.
 
 gethostnative_control_1(Config,
 			#gethostnative_control{
-			  control_seq=Seq,
-			  control_interval=Interval,
-			  lookup_delay=Delay,
-			  lookup_count=Cnt,
-			  lookup_processes=N}) ->
-    ?line {ok, Hostname} = inet:gethostname(),
-    ?line {ok, _} = inet:gethostbyname(Hostname),
-    ?line Hosts = 
+			   control_seq=Seq,
+			   control_interval=Interval,
+			   lookup_delay=Delay,
+			   lookup_count=Cnt,
+			   lookup_processes=N}) ->
+    {ok, Hostname} = inet:gethostname(),
+    {ok, _} = inet:gethostbyname(Hostname),
+    Hosts =
 	[Hostname|[H || {_,H} <- get_hosts(Config)]
 	 ++[H++D || H <- ["www.","www1.","www2.",""],
 		    D <- ["erlang.org","erlang.se"]]
 	 ++[H++"cslab.ericsson.net" || H <- ["morgoth.","hades.","styx."]]],
     %% Spawn some processes to do parallel lookups while
     %% I repeatedly do inet_gethost_native:control/1.
-    ?line TrapExit = process_flag(trap_exit, true),
-    ?line gethostnative_control_2([undefined], Interval, Delay, Cnt, N, Hosts),
-    ?line test_server:format(
-	    "First intermission: now starting control sequence ~w\n",
-	    [Seq]),
-    ?line erlang:display(first_intermission),
-    ?line gethostnative_control_2(Seq, Interval, Delay, Cnt, N, Hosts),
-    ?line erlang:display(second_intermission),
-    ?line test_server:format(
-	    "Second intermission:  now stopping control sequence ~w\n",
-	    [Seq]),
-    ?line gethostnative_control_2([undefined], Interval, Delay, Cnt, N, Hosts),
-    ?line true = process_flag(trap_exit, TrapExit),
-    ?line ok.
+    TrapExit = process_flag(trap_exit, true),
+    gethostnative_control_2([undefined], Interval, Delay, Cnt, N, Hosts),
+    io:format(
+      "First intermission: now starting control sequence ~w\n",
+      [Seq]),
+    erlang:display(first_intermission),
+    gethostnative_control_2(Seq, Interval, Delay, Cnt, N, Hosts),
+    erlang:display(second_intermission),
+    io:format(
+      "Second intermission:  now stopping control sequence ~w\n",
+      [Seq]),
+    gethostnative_control_2([undefined], Interval, Delay, Cnt, N, Hosts),
+    true = process_flag(trap_exit, TrapExit),
+    ok.
 
 gethostnative_control_2(Seq, Interval, Delay, Cnt, N, Hosts) ->
-    ?line Tag = make_ref(),
-    ?line Parent = self(),
-    ?line Lookupers = 
+    Tag = make_ref(),
+    Parent = self(),
+    Lookupers =
 	[spawn_link(
 	   fun () -> 
-		   random:seed(),
 		   lookup_loop(Hosts, Delay, Tag, Parent, Cnt, Hosts) 
 	   end)
 	 || _ <- lists:seq(1, N)],
@@ -878,7 +855,7 @@ gethostnative_control_2(Seq, Interval, Delay, Cnt, N, Hosts) ->
 gethostnative_control_3(Tag, Reason) ->
     receive
 	{Tag,Error} ->
-	    ?line gethostnative_control_3(Tag, Error)
+	    gethostnative_control_3(Tag, Error)
     after 0 ->
 	    Reason
     end.
@@ -893,27 +870,26 @@ control_loop([Op|Ops], Interval, Tag, Lookupers, Seq) ->
 		 Seq).
 
 control_loop_1(Op, Interval, Tag, Lookupers) ->
-    ?line
-	receive
-	    {'EXIT',Pid,Reason} ->
-		?line case Reason of
-			  Tag -> % Done
-			      ?line control_loop_1
-				      (Op, Interval, Tag,
-				       lists:delete(Pid, Lookupers));
-			  _ ->
-			      ?line io:format("Lookuper ~p died: ~p",
-					      [Pid,Reason]),
-			      ?line test_server:fail("Lookuper died")
-		      end
-	after Interval ->
-		?line if Op =/= undefined -> 
-			      ?line ok = inet_gethost_native:control(Op);
-			 true ->
-			      ?line ok
-		      end,
-		?line Lookupers
-	end.
+    receive
+	{'EXIT',Pid,Reason} ->
+	    case Reason of
+		Tag -> % Done
+		    control_loop_1
+		      (Op, Interval, Tag,
+		       lists:delete(Pid, Lookupers));
+		_ ->
+		    io:format("Lookuper ~p died: ~p",
+			      [Pid,Reason]),
+		    ct:fail("Lookuper died")
+	    end
+    after Interval ->
+	    if Op =/= undefined ->
+		    ok = inet_gethost_native:control(Op);
+	       true ->
+		    ok
+	    end,
+	    Lookupers
+    end.
 
 lookup_loop(_, _Delay, Tag, _Parent,  0, _Hosts) ->
     exit(Tag);
@@ -924,21 +900,18 @@ lookup_loop([H|Hs], Delay, Tag, Parent, Cnt, Hosts) ->
 	{ok,_Hent} -> ok;
 	{error,nxdomain} -> ok;
 	Error ->
-	    ?line io:format("Name lookup error for ~p for ~p: ~p",
-			    [self(),H,Error]),
+	    io:format("Name lookup error for ~p for ~p: ~p",
+		      [self(),H,Error]),
 	    Parent ! {Tag,Error}
     end,
     receive 
-    after random:uniform(Delay) -> 
+    after rand:uniform(Delay) ->
 	    lookup_loop(Hs, Delay, Tag, Parent, Cnt-1, Hosts) 
     end.
 
 
 
-lookup_bad_search_option(suite) ->
-    [];
-lookup_bad_search_option(doc) ->
-    ["Test lookup with erroneously configured lookup option (OTP-12133)"];
+%% Test lookup with erroneously configured lookup option (OTP-12133).
 lookup_bad_search_option(Config) when is_list(Config) ->
     %% Manipulation of resolver config is done in init_per_testcase
     %% and end_per_testcase to ensure cleanup.
@@ -948,24 +921,21 @@ lookup_bad_search_option(Config) when is_list(Config) ->
 
 
 
-getif(suite) ->
-    [];
-getif(doc) ->
-    ["Tests basic functionality of getiflist, getif, and ifget"];
+%% Tests basic functionality of getiflist, getif, and ifget.
 getif(Config) when is_list(Config) ->
-    ?line case os:type() of
-	      {unix,Osname} ->
-		  ?line do_getif(Osname);
-	      {_,_} ->
-		  {skip,"inet:getif/0 probably not supported"}
-	  end.
+    case os:type() of
+	{unix,Osname} ->
+	    do_getif(Osname);
+	{_,_} ->
+	    {skip,"inet:getif/0 probably not supported"}
+    end.
 
 do_getif(Osname) ->
-    ?line {ok,Hostname} = inet:gethostname(),
-    ?line {ok,Address} = inet:getaddr(Hostname, inet),
-    ?line {ok,Loopback} = inet:getaddr("localhost", inet),
-    ?line {ok,Interfaces} = inet:getiflist(),
-    ?line HWAs =
+    {ok,Hostname} = inet:gethostname(),
+    {ok,Address} = inet:getaddr(Hostname, inet),
+    {ok,Loopback} = inet:getaddr("localhost", inet),
+    {ok,Interfaces} = inet:getiflist(),
+    HWAs =
 	lists:sort(
 	  lists:foldl(
 	    fun (I, Acc) ->
@@ -974,10 +944,10 @@ do_getif(Osname) ->
 			{ok,[]} -> Acc
 		    end
 	    end, [], Interfaces)),
-    ?line io:format("HWAs = ~p~n", [HWAs]),
-    ?line (Osname =/= sunos)
-	andalso ((length(HWAs) > 0) orelse (?t:fail(no_HWAs))),
-    ?line Addresses = 
+    io:format("HWAs = ~p~n", [HWAs]),
+    (Osname =/= sunos)
+	andalso ((length(HWAs) > 0) orelse (ct:fail(no_HWAs))),
+    Addresses =
 	lists:sort(
 	  lists:foldl(
 	    fun (I, Acc) ->
@@ -986,99 +956,95 @@ do_getif(Osname) ->
 			{ok,[]} -> Acc
 		    end
 	    end, [], Interfaces)),
-    ?line {ok,Getif} = inet:getif(),
-    ?line Addresses = lists:sort([A || {A,_,_} <- Getif]),
-    ?line true = ip_member(Address, Addresses),
-    ?line true = ip_member(Loopback, Addresses),
-    ?line ok.
-
-getif_ifr_name_overflow(doc) ->
-    "Test long interface names do not overrun buffer";
+    {ok,Getif} = inet:getif(),
+    Addresses = lists:sort([A || {A,_,_} <- Getif]),
+    true = ip_member(Address, Addresses),
+    true = ip_member(Loopback, Addresses),
+    ok.
+
+%% Test long interface names do not overrun buffer.
 getif_ifr_name_overflow(Config) when is_list(Config) ->
-    ?line case os:type() of
-	      {unix,Osname} ->
-		  ?line do_getif_ifr_name_overflow(Osname);
-	      {_,_} ->
-		  {skip,"inet:ifget/2 probably not supported"}
-	  end.
+    case os:type() of
+	{unix,Osname} ->
+	    do_getif_ifr_name_overflow(Osname);
+	{_,_} ->
+	    {skip,"inet:ifget/2 probably not supported"}
+    end.
 
 do_getif_ifr_name_overflow(_) ->
     %% emulator should not crash
-    ?line {ok,[]} = inet:ifget(lists:duplicate(128, "x"), [addr]),
+    {ok,[]} = inet:ifget(lists:duplicate(128, "x"), [addr]),
     ok.
 
-getservbyname_overflow(doc) ->
-    "Test long service names do not overrun buffer";
+%% Test long service names do not overrun buffer.
 getservbyname_overflow(Config) when is_list(Config) ->
     %% emulator should not crash
-    ?line {error,einval} = inet:getservbyname(list_to_atom(lists:flatten(lists:duplicate(128, "x"))), tcp),
+    {error,einval} = inet:getservbyname(list_to_atom(lists:flatten(lists:duplicate(128, "x"))), tcp),
     ok.
 
-getifaddrs(doc) ->
-    "Test inet:gifaddrs/0";
+%% Test inet:gifaddrs/0.
 getifaddrs(Config) when is_list (Config) ->
-    ?line {ok,IfAddrs} = inet:getifaddrs(),
-    ?line ?t:format("IfAddrs = ~p.~n", [IfAddrs]),
-    ?line
-	case
-	    {os:type(),
-	     [If ||
-		 {If,Opts} <- IfAddrs,
-		 lists:keymember(hwaddr, 1, Opts)]} of
-	    {{unix,sunos},[]} -> ok;
-	    {OT,[]} ->
-		?t:fail({should_have_hwaddr,OT});
-	    _ -> ok
-	end,
-    ?line Addrs =
+    {ok,IfAddrs} = inet:getifaddrs(),
+    io:format("IfAddrs = ~p.~n", [IfAddrs]),
+    case
+	{os:type(),
+	 [If ||
+	     {If,Opts} <- IfAddrs,
+	     lists:keymember(hwaddr, 1, Opts)]} of
+	{{unix,sunos},[]} -> ok;
+	{OT,[]} ->
+	    ct:fail({should_have_hwaddr,OT});
+	_ -> ok
+    end,
+    Addrs =
 	[element(1, A) || A <- ifaddrs(IfAddrs)],
-    ?line ?t:format("Addrs = ~p.~n", [Addrs]),
-    ?line [check_addr(Addr) || Addr <- Addrs],
+    io:format("Addrs = ~p.~n", [Addrs]),
+    [check_addr(Addr) || Addr <- Addrs],
     ok.
 
 check_addr(Addr)
   when tuple_size(Addr) =:= 8,
        element(1, Addr) band 16#FFC0 =:= 16#FE80 ->
-    ?line ?t:format("Addr: ~p link local; SKIPPED!~n", [Addr]),
+    io:format("Addr: ~p link local; SKIPPED!~n", [Addr]),
     ok;
 check_addr(Addr) ->
-    ?line ?t:format("Addr: ~p.~n", [Addr]),
-    ?line Ping = "ping",
-    ?line Pong = "pong",
-    ?line {ok,L} = gen_tcp:listen(0, [{ip,Addr},{active,false}]),
-    ?line {ok,P} = inet:port(L),
-    ?line {ok,S1} = gen_tcp:connect(Addr, P, [{active,false}]),
-    ?line {ok,S2} = gen_tcp:accept(L),
-    ?line ok = gen_tcp:send(S2, Ping),
-    ?line {ok,Ping} = gen_tcp:recv(S1, length(Ping)),
-    ?line ok = gen_tcp:send(S1, Pong),
-    ?line ok = gen_tcp:close(S1),
-    ?line {ok,Pong} = gen_tcp:recv(S2, length(Pong)),
-    ?line ok = gen_tcp:close(S2),
-    ?line ok = gen_tcp:close(L),
+    io:format("Addr: ~p.~n", [Addr]),
+    Ping = "ping",
+    Pong = "pong",
+    {ok,L} = gen_tcp:listen(0, [{ip,Addr},{active,false}]),
+    {ok,P} = inet:port(L),
+    {ok,S1} = gen_tcp:connect(Addr, P, [{active,false}]),
+    {ok,S2} = gen_tcp:accept(L),
+    ok = gen_tcp:send(S2, Ping),
+    {ok,Ping} = gen_tcp:recv(S1, length(Ping)),
+    ok = gen_tcp:send(S1, Pong),
+    ok = gen_tcp:close(S1),
+    {ok,Pong} = gen_tcp:recv(S2, length(Pong)),
+    ok = gen_tcp:close(S2),
+    ok = gen_tcp:close(L),
     ok.
 
 -record(ifopts, {name,flags,addrs=[],hwaddr}).
 
 ifaddrs([]) -> [];
 ifaddrs([{If,Opts}|IOs]) ->
-    ?line #ifopts{flags=Flags} = Ifopts =
+    #ifopts{flags=Flags} = Ifopts =
 	check_ifopts(Opts, #ifopts{name=If}),
-    ?line case Flags =/= undefined andalso lists:member(up, Flags) of
-	      true  ->
-		  Ifopts#ifopts.addrs;
-	      false ->
-		  []
-	  end++ifaddrs(IOs).
+    case Flags =/= undefined andalso lists:member(up, Flags) of
+	true  ->
+	    Ifopts#ifopts.addrs;
+	false ->
+	    []
+    end++ifaddrs(IOs).
 
 check_ifopts([], #ifopts{name=If,flags=Flags,addrs=Raddrs}=Ifopts) ->
     Addrs = lists:reverse(Raddrs),
     R = Ifopts#ifopts{addrs=Addrs},
-    ?t:format("~p.~n", [R]),
+    io:format("~p.~n", [R]),
     %% See how we did...
     if  is_list(Flags) -> ok;
 	true ->
-	    ?t:fail({flags_undefined,If})
+	    ct:fail({flags_undefined,If})
     end,
     case lists:member(broadcast, Flags) of
 	true ->
@@ -1086,12 +1052,12 @@ check_ifopts([], #ifopts{name=If,flags=Flags,addrs=Raddrs}=Ifopts) ->
 		 {_,_,_} -> A;
 		 {T,_} when tuple_size(T) =:= 8 -> A;
 		 _ ->
-		     ?t:fail({broaddr_missing,If,A})
+		     ct:fail({broaddr_missing,If,A})
 	     end || A <- Addrs];
 	false ->
 	    [case A of {_,_} -> A;
 		 _ ->
-		     ?t:fail({should_have_netmask,If,A})
+		     ct:fail({should_have_netmask,If,A})
 	     end || A <- Addrs]
     end,
     R;
@@ -1102,13 +1068,17 @@ check_ifopts([{flags,Fs}|Opts], #ifopts{flags=Flags}=Ifopts) ->
 	Flags ->
 	    check_ifopts(Opts, Ifopts#ifopts{});
 	_ ->
-	    ?t:fail({multiple_flags,Fs,Ifopts})
+	    ct:fail({multiple_flags,Fs,Ifopts})
     end;
 check_ifopts(
   [{addr,Addr},{netmask,Netmask},{broadaddr,Broadaddr}|Opts],
   #ifopts{addrs=Addrs}=Ifopts) ->
     check_ifopts(Opts, Ifopts#ifopts{addrs=[{Addr,Netmask,Broadaddr}|Addrs]});
 check_ifopts(
+  [{addr,Addr},{netmask,Netmask},{dstaddr,_}|Opts],
+  #ifopts{addrs=Addrs}=Ifopts) ->
+    check_ifopts(Opts, Ifopts#ifopts{addrs=[{Addr,Netmask}|Addrs]});
+check_ifopts(
   [{addr,Addr},{netmask,Netmask}|Opts],
   #ifopts{addrs=Addrs}=Ifopts) ->
     check_ifopts(Opts, Ifopts#ifopts{addrs=[{Addr,Netmask}|Addrs]});
@@ -1118,7 +1088,7 @@ check_ifopts([{hwaddr,Hwaddr}|Opts], #ifopts{hwaddr=undefined}=Ifopts)
   when is_list(Hwaddr) ->
     check_ifopts(Opts, Ifopts#ifopts{hwaddr=Hwaddr});
 check_ifopts([{hwaddr,HwAddr}|_], #ifopts{}=Ifopts) ->
-    ?t:fail({multiple_hwaddrs,HwAddr,Ifopts}).
+    ct:fail({multiple_hwaddrs,HwAddr,Ifopts}).
 
 %% Works just like lists:member/2, except that any {127,_,_,_} tuple
 %% matches any other {127,_,_,_}. We do this to handle Linux systems
@@ -1152,9 +1122,13 @@ simple_netns(Config) when is_list(Config) ->
 	    jog_netns_opt(L),
 	    ok = gen_tcp:close(L),
 	    %%
-	    {ok,S} = gen_sctp:open(),
-	    jog_netns_opt(S),
-	    ok = gen_sctp:close(S);
+	    case gen_sctp:open() of
+		{ok,S} ->
+		    jog_netns_opt(S),
+		    ok = gen_sctp:close(S);
+		{error,eprotonosupport} ->
+		    ok
+	    end;
 	{error,einval} ->
 	    {skip,"setns() not supported"}
     end.
@@ -1168,24 +1142,28 @@ jog_netns_opt(S) ->
     ok.
 
 
+%% Smoke test netns support.
 simple_netns_open(Config) when is_list(Config) ->
+    %% Note: {error,enoent} will be returned if the run-time executable
+    %%       has support for netns, but /proc/self/ns/net is missing.
     case gen_udp:open(0, [binary,{netns,"/"},inet]) of
 	{ok,U} ->
 	    ok = gen_udp:close(U);
-	{error,E1} when E1 =:= einval; E1 =:= eperm ->
+	{error,E1} when E1 =:= einval; E1 =:= eperm; E1 =:= enoent ->
 	    ok
     end,
     case gen_tcp:listen(0, [binary,{netns,"/"},inet]) of
 	{ok,T} ->
 	    ok = gen_tcp:close(T);
-	{error,E2} when E2 =:= einval; E2 =:= eperm ->
+	{error,E2} when E2 =:= einval; E2 =:= eperm; E2 =:= enoent ->
 	    ok
     end,
     try gen_sctp:open(0, [binary,{netns,"/"},inet]) of
 	{ok,S} ->
 	    ok = gen_sctp:close(S);
 	{error,E3}
-	  when E3 =:= einval; E3 =:= eperm; E3 =:= eprotonosupport ->
+	  when E3 =:= einval; E3 =:= eperm;
+	       E3 =:= enoent; E3 =:= eprotonosupport ->
 	    ok
     catch
 	error:badarg ->
diff --git a/lib/kernel/test/inet_res_SUITE.erl b/lib/kernel/test/inet_res_SUITE.erl
index ace4ccb8bd..a82849b2d3 100644
--- a/lib/kernel/test/inet_res_SUITE.erl
+++ b/lib/kernel/test/inet_res_SUITE.erl
@@ -20,7 +20,6 @@
 -module(inet_res_SUITE).
 
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
 
 -include_lib("kernel/include/inet.hrl").
 -include_lib("kernel/src/inet_dns.hrl").
@@ -43,7 +42,9 @@
 
 -define(RUN_NAMED, "run-named").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [basic, resolve, edns0, txt_record, files_monitor,
@@ -78,8 +79,8 @@ zone_dir(TC) ->
     end.
 
 init_per_testcase(Func, Config) ->
-    PrivDir = ?config(priv_dir, Config),
-    DataDir = ?config(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     try ns_init(zone_dir(Func), PrivDir, DataDir) of
 	NsSpec ->
 	    Lookup = inet_db:res_option(lookup),
@@ -89,29 +90,27 @@ init_per_testcase(Func, Config) ->
 		    inet_db:ins_alt_ns(IP, Port);
 		_ -> ok
 	    end,
-	    Dog = test_server:timetrap(test_server:seconds(20)),
-	    [{nameserver,NsSpec},{res_lookup,Lookup},{watchdog,Dog}|Config]
+	    [{nameserver,NsSpec},{res_lookup,Lookup}|Config]
     catch
 	SkipReason ->
 	    {skip,SkipReason}
     end.
 
 end_per_testcase(_Func, Config) ->
-    test_server:timetrap_cancel(?config(watchdog, Config)),
-    inet_db:set_lookup(?config(res_lookup, Config)),
-    NsSpec = ?config(nameserver, Config),
+    inet_db:set_lookup(proplists:get_value(res_lookup, Config)),
+    NsSpec = proplists:get_value(nameserver, Config),
     case NsSpec of
 	{_,{IP,Port},_} ->
 	    inet_db:del_alt_ns(IP, Port);
 	_ -> ok
     end,
-    ns_end(NsSpec, ?config(priv_dir, Config)).
+    ns_end(NsSpec, proplists:get_value(priv_dir, Config)).
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Nameserver control
 
 ns(Config) ->
-    {_ZoneDir,NS,_P} = ?config(nameserver, Config),
+    {_ZoneDir,NS,_P} = proplists:get_value(nameserver, Config),
     NS.
 
 ns_init(ZoneDir, PrivDir, DataDir) ->
@@ -120,7 +119,7 @@ ns_init(ZoneDir, PrivDir, DataDir) ->
 	{unix,_} ->
 	    PortNum = case {os:type(),os:version()} of
 			  {{unix,solaris},{M,V,_}} when M =< 5, V < 10 ->
-			      11895 + random:uniform(100);
+			      11895 + rand:uniform(100);
 			  _ ->
 			      {ok,S} = gen_udp:open(0, [{reuseaddr,true}]),
 			      {ok,PNum} = inet:port(S),
@@ -278,8 +277,7 @@ proxy_ns({proxy,_,_,ProxyNS}) -> ProxyNS.
 %%
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-basic(doc) ->
-    ["Lookup an A record with different API functions"];
+%% Lookup an A record with different API functions.
 basic(Config) when is_list(Config) ->
     NS = ns(Config),
     Name = "ns.otptest",
@@ -341,8 +339,7 @@ basic(Config) when is_list(Config) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-resolve(doc) ->
-    ["Lookup different records using resolve/2..4"];
+%% Lookup different records using resolve/2..4.
 resolve(Config) when is_list(Config) ->
     Class = in,
     NS = ns(Config),
@@ -472,8 +469,7 @@ check_msg(Class, Type, Msg, AnList, NsList) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-edns0(doc) ->
-    ["Test EDNS and truncation"];
+%% Test EDNS and truncation.
 edns0(Config) when is_list(Config) ->
     NS = ns(Config),
     Domain = "otptest",
@@ -534,10 +530,7 @@ inet_res_filter(Anlist, Class, Type) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-txt_record(suite) ->
-    [];
-txt_record(doc) ->
-    ["Tests TXT records"];
+%% Tests TXT records.
 txt_record(Config) when is_list(Config) ->
     D1 = "cslab.ericsson.net",
     D2 = "mail1.cslab.ericsson.net",
@@ -556,10 +549,7 @@ txt_record(Config) when is_list(Config) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-files_monitor(suite) ->
-    [];
-files_monitor(doc) ->
-    ["Tests monitoring of /etc/hosts and /etc/resolv.conf, but not them"];
+%% Tests monitoring of /etc/hosts and /etc/resolv.conf, but not them.
 files_monitor(Config) when is_list(Config) ->
     Search = inet_db:res_option(search),
     HostsFile = inet_db:res_option(hosts_file),
@@ -574,7 +564,7 @@ files_monitor(Config) when is_list(Config) ->
     end.
 
 do_files_monitor(Config) ->
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     {ok,Hostname} = inet:gethostname(),
     io:format("Hostname = ~p.~n", [Hostname]),
     FQDN =
@@ -648,8 +638,7 @@ do_files_monitor(Config) ->
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-last_ms_answer(doc) ->
-    ["Answer just when timeout is triggered (OTP-9221)"];
+%% Answer just when timeout is triggered (OTP-9221).
 last_ms_answer(Config) when is_list(Config) ->
     NS = ns(Config),
     Name = "ns.otptest",
diff --git a/lib/kernel/test/inet_sockopt_SUITE.erl b/lib/kernel/test/inet_sockopt_SUITE.erl
index cb522c8abe..d682398ba8 100644
--- a/lib/kernel/test/inet_sockopt_SUITE.erl
+++ b/lib/kernel/test/inet_sockopt_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(inet_sockopt_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 
 -define(C_GET_IPPROTO_TCP,1).
@@ -62,7 +62,9 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [simple, loop_all, simple_raw, simple_raw_getbin,
@@ -90,97 +92,91 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Func, Config) ->
-    Dog = test_server:timetrap(test_server:seconds(60)),
-    [{watchdog,Dog}|Config].
+    Config.
 
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog).
+end_per_testcase(_Func, _Config) ->
+    ok.
 
-simple(suite) -> [];
-simple(doc) -> "Test inet:setopt/getopt simple functionality.";
+%% Test inet:setopt/getopt simple functionality.
 simple(Config) when is_list(Config) ->
-    ?line XOpt = case os:type() of
-		     {unix,_} -> [{reuseaddr,true}];
-		     _ -> []
-		 end,
-    ?line Opt = [{nodelay,true},
-		 {keepalive,true},{packet,4},
-		 {active,false}|XOpt],
-    ?line OptTags = [X || {X,_} <- Opt],
-    ?line {S1,S2} = create_socketpair(Opt, Opt),
-    ?line {ok,Opt} = inet:getopts(S1,OptTags),
-    ?line {ok,Opt} = inet:getopts(S2,OptTags),
-    ?line COpt = [{X,case X of nodelay -> false;_ -> Y end} || {X,Y} <- Opt],
-    ?line inet:setopts(S1,COpt),
-    ?line {ok,COpt} = inet:getopts(S1,OptTags),
-    ?line {ok,Opt} = inet:getopts(S2,OptTags),
-    ?line gen_tcp:close(S1),
-    ?line gen_tcp:close(S2),
+    XOpt = case os:type() of
+	       {unix,_} -> [{reuseaddr,true}];
+	       _ -> []
+	   end,
+    Opt = [{nodelay,true},
+	   {keepalive,true},{packet,4},
+	   {active,false}|XOpt],
+    OptTags = [X || {X,_} <- Opt],
+    {S1,S2} = create_socketpair(Opt, Opt),
+    {ok,Opt} = inet:getopts(S1,OptTags),
+    {ok,Opt} = inet:getopts(S2,OptTags),
+    COpt = [{X,case X of nodelay -> false;_ -> Y end} || {X,Y} <- Opt],
+    inet:setopts(S1,COpt),
+    {ok,COpt} = inet:getopts(S1,OptTags),
+    {ok,Opt} = inet:getopts(S2,OptTags),
+    gen_tcp:close(S1),
+    gen_tcp:close(S2),
     ok.
 
-loop_all(suite) -> [];
-loop_all(doc) -> "Loop through all socket options and check that they work";
+%% Loop through all socket options and check that they work.
 loop_all(Config) when is_list(Config) ->
-    ?line ListenFailures = 
+    ListenFailures =
 	lists:foldr(make_check_fun(listen,1),[],all_listen_options()),
-    ?line ConnectFailures = 
+    ConnectFailures =
 	lists:foldr(make_check_fun(connect,2),[],all_connect_options()),
-    ?line case ListenFailures++ConnectFailures of
-	      [] ->
-		  ?line ok;
-	      Failed ->
-		  ?line {comment,lists:flatten(
-				   io_lib:format("Non mandatory failed:~w",
-						 [Failed]))}
-	  end.
+    case ListenFailures++ConnectFailures of
+	[] ->
+	    ok;
+	Failed ->
+	    {comment,lists:flatten(
+		       io_lib:format("Non mandatory failed:~w",
+				     [Failed]))}
+    end.
 
 
 
-simple_raw(suite) -> [];
-simple_raw(doc) -> "Test simple setopt/getopt of raw options.";
+%% Test simple setopt/getopt of raw options.
 simple_raw(Config) when is_list(Config) ->
     do_simple_raw(Config,false).
-simple_raw_getbin(suite) -> [];
-simple_raw_getbin(doc) -> "Test simple setopt/getopt of raw options, "
-			      "with binaries in getopt.";
+
+%% Test simple setopt/getopt of raw options, with binaries in getopt.
 simple_raw_getbin(Config) when is_list(Config) ->
     do_simple_raw(Config,true).
 
 do_simple_raw(Config,Binary) when is_list(Config) ->
-    ?line Port = start_helper(Config),
-    ?line SolSocket = ask_helper(Port,?C_GET_SOL_SOCKET),
-    ?line SoKeepAlive = ask_helper(Port,?C_GET_SO_KEEPALIVE),
-    ?line OptionTrue = {raw,SolSocket,SoKeepAlive,<<1:32/native>>},
-    ?line OptionFalse = {raw,SolSocket,SoKeepAlive,<<0:32/native>>},
-    ?line {S1,S2} = create_socketpair([OptionTrue],[{keepalive,true}]),
-    ?line {ok,[{keepalive,true}]} = inet:getopts(S1,[keepalive]),
-    ?line {ok,[{keepalive,true}]} = inet:getopts(S2,[keepalive]),
-    ?line {ok,[{raw,SolSocket,SoKeepAlive,X1B}]} = 
+    Port = start_helper(Config),
+    SolSocket = ask_helper(Port,?C_GET_SOL_SOCKET),
+    SoKeepAlive = ask_helper(Port,?C_GET_SO_KEEPALIVE),
+    OptionTrue = {raw,SolSocket,SoKeepAlive,<<1:32/native>>},
+    OptionFalse = {raw,SolSocket,SoKeepAlive,<<0:32/native>>},
+    {S1,S2} = create_socketpair([OptionTrue],[{keepalive,true}]),
+    {ok,[{keepalive,true}]} = inet:getopts(S1,[keepalive]),
+    {ok,[{keepalive,true}]} = inet:getopts(S2,[keepalive]),
+    {ok,[{raw,SolSocket,SoKeepAlive,X1B}]} =
 	inet:getopts(S1,[{raw,SolSocket,SoKeepAlive,binarify(4,Binary)}]),
-    ?line X1 = nintbin2int(X1B),
-    ?line {ok,[{raw,SolSocket,SoKeepAlive,X2B}]} = 
+    X1 = nintbin2int(X1B),
+    {ok,[{raw,SolSocket,SoKeepAlive,X2B}]} =
 	inet:getopts(S2,[{raw,SolSocket,SoKeepAlive,binarify(4,Binary)}]),
-    ?line X2 = nintbin2int(X2B),
-    ?line true = X1 > 0,
-    ?line true = X2 > 0,
-    ?line inet:setopts(S1,[{keepalive,false}]),
-    ?line inet:setopts(S2,[OptionFalse]),
-    ?line {ok,[{keepalive,false}]} = inet:getopts(S1,[keepalive]),
-    ?line {ok,[{keepalive,false}]} = inet:getopts(S2,[keepalive]),
-    ?line {ok,[{raw,SolSocket,SoKeepAlive,Y1B}]} = 
+    X2 = nintbin2int(X2B),
+    true = X1 > 0,
+    true = X2 > 0,
+    inet:setopts(S1,[{keepalive,false}]),
+    inet:setopts(S2,[OptionFalse]),
+    {ok,[{keepalive,false}]} = inet:getopts(S1,[keepalive]),
+    {ok,[{keepalive,false}]} = inet:getopts(S2,[keepalive]),
+    {ok,[{raw,SolSocket,SoKeepAlive,Y1B}]} =
 	inet:getopts(S1,[{raw,SolSocket,SoKeepAlive,binarify(4,Binary)}]),
-    ?line Y1 = nintbin2int(Y1B),
-    ?line {ok,[{raw,SolSocket,SoKeepAlive,Y2B}]} = 
+    Y1 = nintbin2int(Y1B),
+    {ok,[{raw,SolSocket,SoKeepAlive,Y2B}]} =
 	inet:getopts(S2,[{raw,SolSocket,SoKeepAlive,binarify(4,Binary)}]),
-    ?line Y2 = nintbin2int(Y2B),
-    ?line true = Y1 == 0,
-    ?line true = Y2 == 0,
-    ?line gen_tcp:close(S1),
-    ?line gen_tcp:close(S2),
-    ?line stop_helper(Port),
+    Y2 = nintbin2int(Y2B),
+    true = Y1 == 0,
+    true = Y2 == 0,
+    gen_tcp:close(S1),
+    gen_tcp:close(S2),
+    stop_helper(Port),
     ok.
-    
+
 nintbin2int(<<Int:32/native>>) -> Int;
 nintbin2int(<<Int:24/native>>) -> Int;
 nintbin2int(<<Int:16/native>>) -> Int;
@@ -189,13 +185,12 @@ nintbin2int(<<>>) -> 0.
 
 
 
-multiple_raw(suite) -> [];
-multiple_raw(doc) -> "Test setopt/getopt of multiple raw options.";
+%% Test setopt/getopt of multiple raw options.
 multiple_raw(Config) when is_list(Config) ->
     do_multiple_raw(Config,false).
-multiple_raw_getbin(suite) -> [];
-multiple_raw_getbin(doc) -> "Test setopt/getopt of multiple raw options, "
-			      "with binaries in getopt.";
+
+%% Test setopt/getopt of multiple raw options, with binaries in
+%% getopt.
 multiple_raw_getbin(Config) when is_list(Config) ->
     do_multiple_raw(Config,true).
 
@@ -265,145 +260,143 @@ do_multiple_raw(Config, Binary) ->
 
 
 
-doc_examples_raw(suite) -> [];
-doc_examples_raw(doc) -> "Test that the example code from the documentation "
-			     "works";
+%% Test that the example code from the documentation works.
 doc_examples_raw(Config) when is_list(Config) ->
     do_doc_examples_raw(Config,false).
-doc_examples_raw_getbin(suite) -> [];
-doc_examples_raw_getbin(doc) -> "Test that the example code from the "
-				    "documentation works when getopt uses "
-				    "binaries";
+
+%% Test that the example code from the documentation works when getopt
+%% uses binaries.
 doc_examples_raw_getbin(Config) when is_list(Config) ->
     do_doc_examples_raw(Config,true).
+
 do_doc_examples_raw(Config,Binary) when is_list(Config) ->
-    ?line Port = start_helper(Config),
-    ?line Proto = ask_helper(Port,?C_GET_IPPROTO_TCP),
-    ?line TcpInfo = ask_helper(Port,?C_GET_TCP_INFO),
-    ?line TcpInfoSize = ask_helper(Port,?C_GET_TCP_INFO_SIZE),
-    ?line TcpiSackedOffset = ask_helper(Port,?C_GET_OFF_TCPI_SACKED),
-    ?line TcpiOptionsOffset = ask_helper(Port,?C_GET_OFF_TCPI_OPTIONS),
-    ?line TcpiSackedSize = ask_helper(Port,?C_GET_SIZ_TCPI_SACKED),
-    ?line TcpiOptionsSize = ask_helper(Port,?C_GET_SIZ_TCPI_OPTIONS),
-    ?line TcpLinger2 = ask_helper(Port,?C_GET_TCP_LINGER2),
-    ?line stop_helper(Port),
+    Port = start_helper(Config),
+    Proto = ask_helper(Port,?C_GET_IPPROTO_TCP),
+    TcpInfo = ask_helper(Port,?C_GET_TCP_INFO),
+    TcpInfoSize = ask_helper(Port,?C_GET_TCP_INFO_SIZE),
+    TcpiSackedOffset = ask_helper(Port,?C_GET_OFF_TCPI_SACKED),
+    TcpiOptionsOffset = ask_helper(Port,?C_GET_OFF_TCPI_OPTIONS),
+    TcpiSackedSize = ask_helper(Port,?C_GET_SIZ_TCPI_SACKED),
+    TcpiOptionsSize = ask_helper(Port,?C_GET_SIZ_TCPI_OPTIONS),
+    TcpLinger2 = ask_helper(Port,?C_GET_TCP_LINGER2),
+    stop_helper(Port),
     case all_ok([Proto,TcpInfo,TcpInfoSize,TcpiSackedOffset,
 		 TcpiOptionsOffset,TcpiSackedSize,TcpiOptionsSize,
 		 TcpLinger2]) of
 	false ->
 	    {skipped,"Does not run on this OS."};
 	true ->
-	    ?line {Sock,I} = create_socketpair([],[]),
-	    ?line {ok,[{raw,Proto,TcpLinger2,<<OrigLinger:32/native>>}]} = 
+	    {Sock,I} = create_socketpair([],[]),
+	    {ok,[{raw,Proto,TcpLinger2,<<OrigLinger:32/native>>}]} =
 		inet:getopts(Sock,[{raw,Proto,TcpLinger2,binarify(4,Binary)}]),
-	    ?line NewLinger = OrigLinger div 2,
-	    ?line ok = inet:setopts(Sock,[{raw,Proto,TcpLinger2,
-					   <<NewLinger:32/native>>}]),
-	    ?line {ok,[{raw,Proto,TcpLinger2,<<NewLinger:32/native>>}]} = 
+	    NewLinger = OrigLinger div 2,
+	    ok = inet:setopts(Sock,[{raw,Proto,TcpLinger2,
+				     <<NewLinger:32/native>>}]),
+	    {ok,[{raw,Proto,TcpLinger2,<<NewLinger:32/native>>}]} =
 		inet:getopts(Sock,[{raw,Proto,TcpLinger2,binarify(4,Binary)}]),
-	    ?line ok = inet:setopts(Sock,[{raw,Proto,TcpLinger2,
-					   <<OrigLinger:32/native>>}]),
-	    ?line {ok,[{raw,Proto,TcpLinger2,<<OrigLinger:32/native>>}]} = 
+	    ok = inet:setopts(Sock,[{raw,Proto,TcpLinger2,
+				     <<OrigLinger:32/native>>}]),
+	    {ok,[{raw,Proto,TcpLinger2,<<OrigLinger:32/native>>}]} =
 		inet:getopts(Sock,[{raw,Proto,TcpLinger2,binarify(4,Binary)}]),
-	    ?line {ok,[{raw,_,_,Info}]} = 
+	    {ok,[{raw,_,_,Info}]} =
 		inet:getopts(Sock,[{raw,Proto,TcpInfo,
 				    binarify(TcpInfoSize,Binary)}]),
-	    ?line Bit1 = TcpiSackedSize * 8,
-            ?line <<_:TcpiSackedOffset/binary,
-		   TcpiSacked:Bit1/native,_/binary>> = 
+	    Bit1 = TcpiSackedSize * 8,
+            <<_:TcpiSackedOffset/binary,
+	      TcpiSacked:Bit1/native,_/binary>> =
 		Info,
-	    ?line 0 = TcpiSacked,
-	    ?line Bit2 = TcpiOptionsSize * 8,
-            ?line <<_:TcpiOptionsOffset/binary,
-		   TcpiOptions:Bit2/native,_/binary>> = 
+	    0 = TcpiSacked,
+	    Bit2 = TcpiOptionsSize * 8,
+            <<_:TcpiOptionsOffset/binary,
+	      TcpiOptions:Bit2/native,_/binary>> =
 		Info,
-	    ?line true = TcpiOptions =/= 0,
-	    ?line gen_tcp:close(Sock),
-	    ?line gen_tcp:close(I),
+	    true = TcpiOptions =/= 0,
+	    gen_tcp:close(Sock),
+	    gen_tcp:close(I),
 	    ok
     end.
-	    
-large_raw(suite) -> [];
-large_raw(doc) -> "Test structs and large/too large buffers when raw";
+
+%% Test structs and large/too large buffers when raw.
 large_raw(Config) when is_list(Config) ->
     do_large_raw(Config,false).
-large_raw_getbin(suite) -> [];
-large_raw_getbin(doc) -> "Test structs and large/too large buffers when raw"
-			 "using binaries to getopts";
+
+%% Test structs and large/too large buffers when raw
+%% using binaries to getopts.
 large_raw_getbin(Config) when is_list(Config) ->
     do_large_raw(Config,true).
+
 do_large_raw(Config,Binary) when is_list(Config) ->
-    ?line Port = start_helper(Config),
-    ?line Proto = ask_helper(Port,?C_GET_SOL_SOCKET),
-    ?line Linger = ask_helper(Port,?C_GET_SO_LINGER),
-    ?line LingerSize = ask_helper(Port,?C_GET_LINGER_SIZE),
-    ?line LingerOnOffOffset = ask_helper(Port,?C_GET_OFF_LINGER_L_ONOFF),
-    ?line LingerLingerOffset = ask_helper(Port,?C_GET_OFF_LINGER_L_LINGER),
-    ?line LingerOnOffSize = ask_helper(Port,?C_GET_SIZ_LINGER_L_ONOFF),
-    ?line LingerLingerSize = ask_helper(Port,?C_GET_SIZ_LINGER_L_LINGER),
-    ?line stop_helper(Port),
+    Port = start_helper(Config),
+    Proto = ask_helper(Port,?C_GET_SOL_SOCKET),
+    Linger = ask_helper(Port,?C_GET_SO_LINGER),
+    LingerSize = ask_helper(Port,?C_GET_LINGER_SIZE),
+    LingerOnOffOffset = ask_helper(Port,?C_GET_OFF_LINGER_L_ONOFF),
+    LingerLingerOffset = ask_helper(Port,?C_GET_OFF_LINGER_L_LINGER),
+    LingerOnOffSize = ask_helper(Port,?C_GET_SIZ_LINGER_L_ONOFF),
+    LingerLingerSize = ask_helper(Port,?C_GET_SIZ_LINGER_L_LINGER),
+    stop_helper(Port),
     case all_ok([Proto,Linger,LingerSize,LingerOnOffOffset,
 		 LingerLingerOffset,LingerOnOffSize,LingerLingerSize]) of
 	false ->
 	    {skipped,"Does not run on this OS."};
 	true ->
-	    ?line {Sock1,Sock2} = create_socketpair([{linger,{true,10}}],
-					       [{linger,{false,0}}]),
-	    ?line LargeSize = 1024, % Solaris can take up to 1024*9, 
-				    % linux 1024*63... 
-	    ?line TooLargeSize = 1024*64,
-	    ?line {ok,[{raw,Proto,Linger,Linger1}]} = 
+	    {Sock1,Sock2} = create_socketpair([{linger,{true,10}}],
+					      [{linger,{false,0}}]),
+	    LargeSize = 1024,  % Solaris can take up to 1024*9,
+						% linux 1024*63...
+	    TooLargeSize = 1024*64,
+	    {ok,[{raw,Proto,Linger,Linger1}]} =
 		inet:getopts(Sock1,[{raw,Proto,Linger,
 				     binarify(LargeSize,Binary)}]),
-	    ?line {ok,[{raw,Proto,Linger,Linger2}]} = 
+	    {ok,[{raw,Proto,Linger,Linger2}]} =
 		inet:getopts(Sock2,[{raw,Proto,Linger,
 				     binarify(LingerSize,Binary)}]),
-	    ?line true = byte_size(Linger1) =:= LingerSize,
-	    ?line LingerLingerBits = LingerLingerSize * 8,
-	    ?line LingerOnOffBits = LingerOnOffSize * 8,
-	    ?line <<_:LingerLingerOffset/binary,
-		   Ling1:LingerLingerBits/native,_/binary>> = Linger1,
-	    ?line <<_:LingerOnOffOffset/binary,
-		   Off1:LingerOnOffBits/native,_/binary>> = Linger1,
-	    ?line <<_:LingerOnOffOffset/binary,
-		   Off2:LingerOnOffBits/native,_/binary>> = Linger2,
-	    ?line true = Off1 =/= 0,
-	    ?line true = Off2 == 0,
-	    ?line true = Ling1 == 10,
-	    ?line {error,einval} = 
+	    true = byte_size(Linger1) =:= LingerSize,
+	    LingerLingerBits = LingerLingerSize * 8,
+	    LingerOnOffBits = LingerOnOffSize * 8,
+	    <<_:LingerLingerOffset/binary,
+	      Ling1:LingerLingerBits/native,_/binary>> = Linger1,
+	    <<_:LingerOnOffOffset/binary,
+	      Off1:LingerOnOffBits/native,_/binary>> = Linger1,
+	    <<_:LingerOnOffOffset/binary,
+	      Off2:LingerOnOffBits/native,_/binary>> = Linger2,
+	    true = Off1 =/= 0,
+	    true = Off2 == 0,
+	    true = Ling1 == 10,
+	    {error,einval} =
 		inet:getopts(Sock1,[{raw,Proto,Linger,TooLargeSize}]),
-	    ?line gen_tcp:close(Sock1),
-	    ?line gen_tcp:close(Sock2),
+	    gen_tcp:close(Sock1),
+	    gen_tcp:close(Sock2),
 	    ok
     end.
 
-combined(suite) -> [];
-combined(doc) -> "Test raw structs combined w/ other options ";
+%% Test raw structs combined w/ other options .
 combined(Config) when is_list(Config) ->
     do_combined(Config,false).
-combined_getbin(suite) -> [];
-combined_getbin(doc) -> "Test raw structs combined w/ other options and "
-			"binarise in getopts";
+
+%% Test raw structs combined w/ other options and
+%% binarise in getopts.
 combined_getbin(Config) when is_list(Config) ->
     do_combined(Config,true).
+
 do_combined(Config,Binary) when is_list(Config) ->
-    ?line Port = start_helper(Config),
-    ?line Proto = ask_helper(Port,?C_GET_SOL_SOCKET),
-    ?line Linger = ask_helper(Port,?C_GET_SO_LINGER),
-    ?line LingerSize = ask_helper(Port,?C_GET_LINGER_SIZE),
-    ?line LingerOnOffOffset = ask_helper(Port,?C_GET_OFF_LINGER_L_ONOFF),
-    ?line LingerLingerOffset = ask_helper(Port,?C_GET_OFF_LINGER_L_LINGER),
-    ?line LingerOnOffSize = ask_helper(Port,?C_GET_SIZ_LINGER_L_ONOFF),
-    ?line LingerLingerSize = ask_helper(Port,?C_GET_SIZ_LINGER_L_LINGER),
-    ?line stop_helper(Port),
+    Port = start_helper(Config),
+    Proto = ask_helper(Port,?C_GET_SOL_SOCKET),
+    Linger = ask_helper(Port,?C_GET_SO_LINGER),
+    LingerSize = ask_helper(Port,?C_GET_LINGER_SIZE),
+    LingerOnOffOffset = ask_helper(Port,?C_GET_OFF_LINGER_L_ONOFF),
+    LingerLingerOffset = ask_helper(Port,?C_GET_OFF_LINGER_L_LINGER),
+    LingerOnOffSize = ask_helper(Port,?C_GET_SIZ_LINGER_L_ONOFF),
+    LingerLingerSize = ask_helper(Port,?C_GET_SIZ_LINGER_L_LINGER),
+    stop_helper(Port),
     case all_ok([Proto,Linger,LingerSize,LingerOnOffOffset,
 		 LingerLingerOffset,LingerOnOffSize,LingerLingerSize]) of
 	false ->
 	    {skipped,"Does not run on this OS."};
 	true ->
-	    ?line LingerLingerBits = LingerLingerSize * 8,
-	    ?line LingerOnOffBits = LingerOnOffSize * 8,
-	    ?line {LingerOn,LingerOff} = 
+	    LingerLingerBits = LingerLingerSize * 8,
+	    LingerOnOffBits = LingerOnOffSize * 8,
+	    {LingerOn,LingerOff} =
 		case LingerOnOffOffset <  LingerLingerOffset of
 		    true ->
 			Pad1 =
@@ -423,11 +416,11 @@ do_combined(Config,Binary) when is_list(Config) ->
 				 lists:duplicate(Pad3Siz,
 						 0)),
 			{<<Pad1/binary,1:LingerOnOffBits/native,
-			  Pad2/binary,10:LingerLingerBits/native,
-			  Pad3/binary>>,
+			   Pad2/binary,10:LingerLingerBits/native,
+			   Pad3/binary>>,
 			 <<Pad1/binary,0:LingerOnOffBits/native,
-			  Pad2/binary,0:LingerLingerBits/native,
-			  Pad3/binary>>};
+			   Pad2/binary,0:LingerLingerBits/native,
+			   Pad3/binary>>};
 		    false ->
 			Pad1 =
 			    list_to_binary(
@@ -446,177 +439,174 @@ do_combined(Config,Binary) when is_list(Config) ->
 				 lists:duplicate(Pad3Siz,
 						 0)),
 			{<<Pad1/binary,1:LingerLingerBits/native,
-			  Pad2/binary,10:LingerOnOffBits/native,
-			  Pad3/binary>>,
+			   Pad2/binary,10:LingerOnOffBits/native,
+			   Pad3/binary>>,
 			 <<Pad1/binary,0:LingerLingerBits/native,
-			  Pad2/binary,0:LingerOnOffBits/native,
-			  Pad3/binary>>}
+			   Pad2/binary,0:LingerOnOffBits/native,
+			   Pad3/binary>>}
 		end,
-	    ?line RawLingerOn = {raw,Proto,Linger,LingerOn},
-	    ?line RawLingerOff = {raw,Proto,Linger,LingerOff},
-	    ?line {Sock1,Sock2} = 
+	    RawLingerOn = {raw,Proto,Linger,LingerOn},
+	    RawLingerOff = {raw,Proto,Linger,LingerOff},
+	    {Sock1,Sock2} =
 		create_socketpair([{keepalive,true},
 				   RawLingerOn],
 				  [{keepalive,false},
 				   RawLingerOff]),
-	    ?line {ok,[{raw,Proto,Linger,Linger1},{keepalive,Keep1}]} = 
+	    {ok,[{raw,Proto,Linger,Linger1},{keepalive,Keep1}]} =
 		inet:getopts(Sock1,[{raw,Proto,Linger, 
 				     binarify(LingerSize,Binary)},keepalive]),
-	    ?line {ok,[{raw,Proto,Linger,Linger2},{keepalive,Keep2}]} = 
+	    {ok,[{raw,Proto,Linger,Linger2},{keepalive,Keep2}]} =
 		inet:getopts(Sock2,[{raw,Proto,Linger,
 				     binarify(LingerSize,Binary)},keepalive]),
-	    ?line true = byte_size(Linger1) =:= LingerSize,
-	    ?line <<_:LingerLingerOffset/binary,
-		   Ling1:LingerLingerBits/native,_/binary>> = Linger1,
-	    ?line <<_:LingerOnOffOffset/binary,
-		   Off1:LingerOnOffBits/native,_/binary>> = Linger1,
-	    ?line <<_:LingerOnOffOffset/binary,
-		   Off2:LingerOnOffBits/native,_/binary>> = Linger2,
-	    ?line true = Off1 =/= 0,
-	    ?line true = Off2 == 0,
-	    ?line true = Ling1 == 10,
-	    ?line true = Keep1 =:= true,
-	    ?line true = Keep2 =:= false,
-	    ?line {Sock3,Sock4} = 
+	    true = byte_size(Linger1) =:= LingerSize,
+	    <<_:LingerLingerOffset/binary,
+	      Ling1:LingerLingerBits/native,_/binary>> = Linger1,
+	    <<_:LingerOnOffOffset/binary,
+	      Off1:LingerOnOffBits/native,_/binary>> = Linger1,
+	    <<_:LingerOnOffOffset/binary,
+	      Off2:LingerOnOffBits/native,_/binary>> = Linger2,
+	    true = Off1 =/= 0,
+	    true = Off2 == 0,
+	    true = Ling1 == 10,
+	    true = Keep1 =:= true,
+	    true = Keep2 =:= false,
+	    {Sock3,Sock4} =
 		create_socketpair([RawLingerOn,{keepalive,true}],
 				  [RawLingerOff,{keepalive,false}]),
-	    ?line {ok,[{raw,Proto,Linger,Linger3},{keepalive,Keep3}]} = 
+	    {ok,[{raw,Proto,Linger,Linger3},{keepalive,Keep3}]} =
 		inet:getopts(Sock3,[{raw,Proto,Linger,
 				     binarify(LingerSize,Binary)},keepalive]),
-	    ?line {ok,[{raw,Proto,Linger,Linger4},{keepalive,Keep4}]} = 
+	    {ok,[{raw,Proto,Linger,Linger4},{keepalive,Keep4}]} =
 		inet:getopts(Sock4,[{raw,Proto,Linger,
 				     binarify(LingerSize,Binary)},keepalive]),
-	    ?line true = byte_size(Linger3) =:= LingerSize,
-	    ?line <<_:LingerLingerOffset/binary,
-		   Ling3:LingerLingerBits/native,_/binary>> = Linger3,
-	    ?line <<_:LingerOnOffOffset/binary,
-		   Off3:LingerOnOffBits/native,_/binary>> = Linger3,
-	    ?line <<_:LingerOnOffOffset/binary,
-		   Off4:LingerOnOffBits/native,_/binary>> = Linger4,
-	    ?line true = Off3 =/= 0,
-	    ?line true = Off4 == 0,
-	    ?line true = Ling3 == 10,
-	    ?line true = Keep3 =:= true,
-	    ?line true = Keep4 =:= false,
-	    ?line {Sock5,Sock6} = 
+	    true = byte_size(Linger3) =:= LingerSize,
+	    <<_:LingerLingerOffset/binary,
+	      Ling3:LingerLingerBits/native,_/binary>> = Linger3,
+	    <<_:LingerOnOffOffset/binary,
+	      Off3:LingerOnOffBits/native,_/binary>> = Linger3,
+	    <<_:LingerOnOffOffset/binary,
+	      Off4:LingerOnOffBits/native,_/binary>> = Linger4,
+	    true = Off3 =/= 0,
+	    true = Off4 == 0,
+	    true = Ling3 == 10,
+	    true = Keep3 =:= true,
+	    true = Keep4 =:= false,
+	    {Sock5,Sock6} =
 		create_socketpair([{packet,4},RawLingerOn,{keepalive,true}],
 				  [{packet,2},RawLingerOff,{keepalive,false}]),
-	    ?line {ok,[{packet,Pack5},{raw,Proto,Linger,Linger5},
-		       {keepalive,Keep5}]} = 
+	    {ok,[{packet,Pack5},{raw,Proto,Linger,Linger5},
+		 {keepalive,Keep5}]} =
 		inet:getopts(Sock5,[packet,{raw,Proto,Linger,
 					    binarify(LingerSize,Binary)},
 				    keepalive]),
-	    ?line {ok,[{packet,Pack6},{raw,Proto,Linger,Linger6},
-		       {keepalive,Keep6}]} = 
+	    {ok,[{packet,Pack6},{raw,Proto,Linger,Linger6},
+		 {keepalive,Keep6}]} =
 		inet:getopts(Sock6,[packet,{raw,Proto,Linger,
 					    binarify(LingerSize,Binary)},
 				    keepalive]),
-	    ?line true = byte_size(Linger5) =:= LingerSize,
-	    ?line <<_:LingerLingerOffset/binary,
-		   Ling5:LingerLingerBits/native,_/binary>> = Linger5,
-	    ?line <<_:LingerOnOffOffset/binary,
-		   Off5:LingerOnOffBits/native,_/binary>> = Linger5,
-	    ?line <<_:LingerOnOffOffset/binary,
-		   Off6:LingerOnOffBits/native,_/binary>> = Linger6,
-	    ?line true = Off5 =/= 0,
-	    ?line true = Off6 == 0,
-	    ?line true = Ling5 == 10,
-	    ?line true = Keep5 =:= true,
-	    ?line true = Keep6 =:= false,
-	    ?line true = Pack5 =:= 4,
-	    ?line true = Pack6 =:= 2,
-	    ?line inet:setopts(Sock6,[{packet,4},RawLingerOn,
-				      {keepalive,true}]),
-	    ?line {ok,[{packet,Pack7},{raw,Proto,Linger,Linger7},
-		       {keepalive,Keep7}]} = 
+	    true = byte_size(Linger5) =:= LingerSize,
+	    <<_:LingerLingerOffset/binary,
+	      Ling5:LingerLingerBits/native,_/binary>> = Linger5,
+	    <<_:LingerOnOffOffset/binary,
+	      Off5:LingerOnOffBits/native,_/binary>> = Linger5,
+	    <<_:LingerOnOffOffset/binary,
+	      Off6:LingerOnOffBits/native,_/binary>> = Linger6,
+	    true = Off5 =/= 0,
+	    true = Off6 == 0,
+	    true = Ling5 == 10,
+	    true = Keep5 =:= true,
+	    true = Keep6 =:= false,
+	    true = Pack5 =:= 4,
+	    true = Pack6 =:= 2,
+	    inet:setopts(Sock6,[{packet,4},RawLingerOn,
+				{keepalive,true}]),
+	    {ok,[{packet,Pack7},{raw,Proto,Linger,Linger7},
+		 {keepalive,Keep7}]} =
 		inet:getopts(Sock6,[packet,{raw,Proto,Linger,
 					    binarify(LingerSize,Binary)},
 				    keepalive]),
-	    ?line <<_:LingerOnOffOffset/binary,
-		   Off7:LingerOnOffBits/native,_/binary>> = Linger7,
-	    ?line true = Off7 =/= 0,
-	    ?line true = Keep7 =:= true,
-	    ?line true = Pack7 =:= 4,
-	    ?line gen_tcp:close(Sock1),
-	    ?line gen_tcp:close(Sock2),
-	    ?line gen_tcp:close(Sock3),
-	    ?line gen_tcp:close(Sock4),
-	    ?line gen_tcp:close(Sock5),
-	    ?line gen_tcp:close(Sock6),
+	    <<_:LingerOnOffOffset/binary,
+	      Off7:LingerOnOffBits/native,_/binary>> = Linger7,
+	    true = Off7 =/= 0,
+	    true = Keep7 =:= true,
+	    true = Pack7 =:= 4,
+	    gen_tcp:close(Sock1),
+	    gen_tcp:close(Sock2),
+	    gen_tcp:close(Sock3),
+	    gen_tcp:close(Sock4),
+	    gen_tcp:close(Sock5),
+	    gen_tcp:close(Sock6),
 	    ok
     end.
 
 
 
-ipv6_v6only_udp(suite) -> [];
-ipv6_v6only_udp(doc) -> "Test socket option ipv6_v6only for UDP";
+%% Test socket option ipv6_v6only for UDP.
 ipv6_v6only_udp(Config) when is_list(Config) ->
     ipv6_v6only(Config, gen_udp).
 
-ipv6_v6only_tcp(suite) -> [];
-ipv6_v6only_tcp(doc) -> "Test socket option ipv6_v6only for TCP";
+%% Test socket option ipv6_v6only for TCP.
 ipv6_v6only_tcp(Config) when is_list(Config) ->
     ipv6_v6only(Config, gen_tcp).
 
-ipv6_v6only_sctp(suite) -> [];
-ipv6_v6only_sctp(doc) -> "Test socket option ipv6_v6only for SCTP";
+%% Test socket option ipv6_v6only for SCTP.
 ipv6_v6only_sctp(Config) when is_list(Config) ->
     ipv6_v6only(Config, gen_sctp).
 
 ipv6_v6only(Config, Module) when is_list(Config) ->
-    ?line case ipv6_v6only_open(Module, []) of
-	      {ok,S1} ->
-		  ?line case inet:getopts(S1, [ipv6_v6only]) of
-			    {ok,[{ipv6_v6only,Default}]}
-			      when is_boolean(Default) ->
-				?line ok =
-				    ipv6_v6only_close(Module, S1),
-				?line ipv6_v6only(Config, Module, Default);
-			    {ok,[]} ->
-				?line io:format("Not implemented.~n", []),
-				%% This list of OS:es where the option is
-				%% supposed to be not implemented is just
-				%% a guess, and may grow with time.
-				?line case {os:type(),os:version()} of
-					  {{unix,linux},{2,M,_}}
-					  when M =< 4 -> ok
-				      end,
-				%% At least this should work
-				?line {ok,S2} =
-				    ipv6_v6only_open(
-				      Module,
-				      [{ipv6_v6only,true}]),
-				?line ok =
-				    ipv6_v6only_close(Module, S2)
-			end;
-	      {error,_} ->
-		  {skipped,"Socket type not supported"}
-	  end.
+    case ipv6_v6only_open(Module, []) of
+	{ok,S1} ->
+	    case inet:getopts(S1, [ipv6_v6only]) of
+		{ok,[{ipv6_v6only,Default}]}
+		  when is_boolean(Default) ->
+		    ok =
+			ipv6_v6only_close(Module, S1),
+		    ipv6_v6only(Config, Module, Default);
+		{ok,[]} ->
+		    io:format("Not implemented.~n", []),
+		    %% This list of OS:es where the option is
+		    %% supposed to be not implemented is just
+		    %% a guess, and may grow with time.
+		    case {os:type(),os:version()} of
+			{{unix,linux},{2,M,_}}
+			  when M =< 4 -> ok
+		    end,
+		    %% At least this should work
+		    {ok,S2} =
+			ipv6_v6only_open(
+			  Module,
+			  [{ipv6_v6only,true}]),
+		    ok =
+			ipv6_v6only_close(Module, S2)
+	    end;
+	{error,_} ->
+	    {skipped,"Socket type not supported"}
+    end.
 
 ipv6_v6only(Config, Module, Default) when is_list(Config) ->
-    ?line io:format("Default ~w.~n", [Default]),
-    ?line {ok,S1} =
+    io:format("Default ~w.~n", [Default]),
+    {ok,S1} =
 	ipv6_v6only_open(Module, [{ipv6_v6only,Default}]),
-    ?line {ok,[{ipv6_v6only,Default}]} =
+    {ok,[{ipv6_v6only,Default}]} =
 	inet:getopts(S1, [ipv6_v6only]),
-    ?line ok =
+    ok =
 	ipv6_v6only_close(Module, S1),
-    ?line NotDefault = not Default,
-    ?line case ipv6_v6only_open(Module, [{ipv6_v6only,NotDefault}]) of
-	      {ok,S2} ->
-		  ?line io:format("Read-write.~n", []),
-		  ?line {ok,[{ipv6_v6only,NotDefault}]} =
-		      inet:getopts(S2, [ipv6_v6only]),
-		  ok;
-	      {error,einval} ->
-		  ?line io:format("Read-only.~n", []),
-		  %% This option is known to be read-only and true
-		  %% on Windows and OpenBSD
-		  ?line case os:type() of
-			    {unix,openbsd} when Default =:= true -> ok;
-			    {win32,_} when Default =:= true -> ok
-			end
-	  end.
+    NotDefault = not Default,
+    case ipv6_v6only_open(Module, [{ipv6_v6only,NotDefault}]) of
+	{ok,S2} ->
+	    io:format("Read-write.~n", []),
+	    {ok,[{ipv6_v6only,NotDefault}]} =
+		inet:getopts(S2, [ipv6_v6only]),
+	    ok;
+	{error,einval} ->
+	    io:format("Read-only.~n", []),
+	    %% This option is known to be read-only and true
+	    %% on Windows and OpenBSD
+	    case os:type() of
+		{unix,openbsd} when Default =:= true -> ok;
+		{win32,_} when Default =:= true -> ok
+	    end
+    end.
 
 ipv6_v6only_open(Module, Opts) ->
     Module:case Module of
@@ -628,47 +618,46 @@ ipv6_v6only_close(Module, Socket) ->
     Module:close(Socket).
 
 
-use_ipv6_v6only_udp(suite) -> [];
-use_ipv6_v6only_udp(doc) -> "Test using socket option ipv6_v6only for UDP";
+%% Test using socket option ipv6_v6only for UDP.
 use_ipv6_v6only_udp(Config) when is_list(Config) ->
-    ?line case gen_udp:open(0, [inet6,{ipv6_v6only,true}]) of
-	      {ok,S6} ->
-		  ?line case inet:getopts(S6, [ipv6_v6only]) of
-			    {ok,[{ipv6_v6only,true}]} ->
-				use_ipv6_v6only_udp(Config, S6);
-			    {ok,Other} ->
-				{skipped,{getopts,Other}}
-			end;
-	      {error,_} ->
-		  {skipped,"Socket type not supported"}
-	  end.
+    case gen_udp:open(0, [inet6,{ipv6_v6only,true}]) of
+	{ok,S6} ->
+	    case inet:getopts(S6, [ipv6_v6only]) of
+		{ok,[{ipv6_v6only,true}]} ->
+		    use_ipv6_v6only_udp(Config, S6);
+		{ok,Other} ->
+		    {skipped,{getopts,Other}}
+	    end;
+	{error,_} ->
+	    {skipped,"Socket type not supported"}
+    end.
 
 use_ipv6_v6only_udp(_Config, S6) ->
-    ?line {ok,Port} = inet:port(S6),
-    ?line {ok,S4} = gen_udp:open(Port, [inet]),
-    ?line E6 = " IPv6-echo.",
-    ?line E4 = " IPv4-echo.",
-    ?line Sender =
+    {ok,Port} = inet:port(S6),
+    {ok,S4} = gen_udp:open(Port, [inet]),
+    E6 = " IPv6-echo.",
+    E4 = " IPv4-echo.",
+    Sender =
 	spawn_link(fun () -> use_ipv6_v6only_udp_sender(Port, E6, E4) end),
-    ?line use_ipv6_v6only_udp_listener(
-	    S6, S4, E6, E4, monitor(process, Sender)).
+    use_ipv6_v6only_udp_listener(
+      S6, S4, E6, E4, monitor(process, Sender)).
 
 use_ipv6_v6only_udp_listener(S6, S4, E6, E4, Mref) ->
-    ?line receive
-	      {udp,S6,IP,P,Data} ->
-		  ?line ok = gen_udp:send(S6, IP, P, [Data|E6]),
-		  ?line use_ipv6_v6only_udp_listener(S6, S4, E6, E4, Mref);
-	      {udp,S4,IP,P,Data} ->
-		  ?line ok = gen_udp:send(S4, IP, P, [Data|E4]),
-		  ?line use_ipv6_v6only_udp_listener(S6, S4, E6, E4, Mref);
-	      {'DOWN',Mref,_,_,normal} ->
-		  ok;
-	      {'DOWN',Mref,_,_,Result} ->
-		  %% Since we are linked we will never arrive here
-		  Result;
-	      Other ->
-		  ?line exit({failed,{listener_unexpected,Other}})
-	  end.
+    receive
+	{udp,S6,IP,P,Data} ->
+	    ok = gen_udp:send(S6, IP, P, [Data|E6]),
+	    use_ipv6_v6only_udp_listener(S6, S4, E6, E4, Mref);
+	{udp,S4,IP,P,Data} ->
+	    ok = gen_udp:send(S4, IP, P, [Data|E4]),
+	    use_ipv6_v6only_udp_listener(S6, S4, E6, E4, Mref);
+	{'DOWN',Mref,_,_,normal} ->
+	    ok;
+	{'DOWN',Mref,_,_,Result} ->
+	    %% Since we are linked we will never arrive here
+	    Result;
+	Other ->
+	    exit({failed,{listener_unexpected,Other}})
+    end.
 
 use_ipv6_v6only_udp_sender(Port, E6, E4) ->
     D6 = "IPv6-send.",
@@ -693,12 +682,9 @@ sndrcv(Ip, Port, Opts, Data) ->
 
 
 
-type_errors(suite) ->
-    [];
-type_errors(doc) ->
-    "Test that raw data requests are not executed for bad types";
+%% Test that raw data requests are not executed for bad types.
 type_errors(Config) when is_list(Config) ->
-    ?line BadSetOptions =
+    BadSetOptions =
 	[
 	 {raw,x,3,<<1:32>>},
 	 {raw,1,tre,<<1:32>>},
@@ -716,7 +702,7 @@ type_errors(Config) when is_list(Config) ->
 	 rav,
 	 {linger,banan}
 	],
-    ?line BadGetOptions =
+    BadGetOptions =
 	[
 	 {raw,x,3,<<1:32>>},
 	 {raw,1,tre,<<1:32>>},
@@ -735,46 +721,46 @@ type_errors(Config) when is_list(Config) ->
 	 rav,
 	 {linger,banan}
 	],
-    ?line lists:foreach(fun(Option) ->
-				?line case 
-				      catch create_socketpair([Option],[]) of
-					  {'EXIT',badarg} ->
-					      ?line ok;
-					  Unexpected1 ->
-					      ?line exit({unexpected,
-							  Unexpected1})
-				      end,
-				?line case 
-				      catch create_socketpair([],[Option]) of
-					  {'EXIT',badarg} ->
-					      ?line ok;
-					  Unexpected2 ->
-					      ?line exit({unexpected,
-							  Unexpected2})
-				      end,
-				?line {Sock1,Sock2} = create_socketpair([],[]),
-				?line case inet:setopts(Sock1, [Option]) of
-					  {error,einval} ->
-					      ?line ok;
-					  Unexpected3 ->
-					      ?line exit({unexpected,
-							  Unexpected3})
-				      end,
-				?line gen_tcp:close(Sock1),
-				?line gen_tcp:close(Sock2)
-			end,BadSetOptions),
-    ?line {Sock1,Sock2} = create_socketpair([],[]),
-    ?line lists:foreach(fun(Option) ->
-				?line case inet:getopts(Sock1, [Option]) of
-					  {error,einval} ->
-					      ?line ok;
-					  Unexpected ->
-					      ?line exit({unexpected,
-							  Unexpected})
-				      end
-			end,BadGetOptions),
-    ?line gen_tcp:close(Sock1),
-    ?line gen_tcp:close(Sock2),
+    lists:foreach(fun(Option) ->
+			  case
+			      catch create_socketpair([Option],[]) of
+			      {'EXIT',badarg} ->
+				  ok;
+			      Unexpected1 ->
+				  exit({unexpected,
+					Unexpected1})
+			  end,
+			  case
+			      catch create_socketpair([],[Option]) of
+			      {'EXIT',badarg} ->
+				  ok;
+			      Unexpected2 ->
+				  exit({unexpected,
+					Unexpected2})
+			  end,
+			  {Sock1,Sock2} = create_socketpair([],[]),
+			  case inet:setopts(Sock1, [Option]) of
+			      {error,einval} ->
+				  ok;
+			      Unexpected3 ->
+				  exit({unexpected,
+					Unexpected3})
+			  end,
+			  gen_tcp:close(Sock1),
+			  gen_tcp:close(Sock2)
+		  end,BadSetOptions),
+    {Sock1,Sock2} = create_socketpair([],[]),
+    lists:foreach(fun(Option) ->
+			  case inet:getopts(Sock1, [Option]) of
+			      {error,einval} ->
+				  ok;
+			      Unexpected ->
+				  exit({unexpected,
+					Unexpected})
+			  end
+		  end,BadGetOptions),
+    gen_tcp:close(Sock1),
+    gen_tcp:close(Sock2),
     ok.
 
 all_ok([]) ->
@@ -784,59 +770,59 @@ all_ok([H|T]) when H >= 0 ->
 all_ok(_) ->
     false.
 
-			  
+
 make_check_fun(Type,Element) ->
     fun({Name,V1,V2,Mand,Chang},Acc) ->
-	    ?line {LO1,CO1} = setelement(Element,{[],[]}, [{Name,V1}]),
-	    ?line {LO2,CO2} = setelement(Element,{[],[]}, [{Name,V2}]),
-	    ?line {X1,Y1} = create_socketpair(LO1,CO1),
-	    ?line {X2,Y2} = create_socketpair(LO2,CO2),
-	    ?line S1 = element(Element,{X1,Y1}),
-	    ?line S2 = element(Element,{X2,Y2}),
-	    ?line {ok,[{Name,R1}]} = inet:getopts(S1,[Name]),
-	    ?line {ok,[{Name,R2}]} = inet:getopts(S2,[Name]),
+	    {LO1,CO1} = setelement(Element,{[],[]}, [{Name,V1}]),
+	    {LO2,CO2} = setelement(Element,{[],[]}, [{Name,V2}]),
+	    {X1,Y1} = create_socketpair(LO1,CO1),
+	    {X2,Y2} = create_socketpair(LO2,CO2),
+	    S1 = element(Element,{X1,Y1}),
+	    S2 = element(Element,{X2,Y2}),
+	    {ok,[{Name,R1}]} = inet:getopts(S1,[Name]),
+	    {ok,[{Name,R2}]} = inet:getopts(S2,[Name]),
 	    NewAcc =
 		case R1 =/= R2 of
 		    true ->
 			case Chang of
 			    true ->
-				?line inet:setopts(S1,[{Name,V2}]),
-				?line {ok,[{Name,R3}]} = 
+				inet:setopts(S1,[{Name,V2}]),
+				{ok,[{Name,R3}]} =
 				    inet:getopts(S1,[Name]),
 				case {R3 =/= R1, R3 =:= R2} of
 				    {true,true} ->
-					?line Acc;
+					Acc;
 				    _ ->
 					case Mand of
 					    true ->
-						?line exit
-							({failed_sockopt,
-							  {change,
-							   Name}});
+						exit
+						  ({failed_sockopt,
+						    {change,
+						     Name}});
 					    false ->
-						?line [{change,Name}|Acc]
+						[{change,Name}|Acc]
 					end
 				end;
 			    false ->
-				?line Acc
+				Acc
 			end;
 		    false ->
 			case Mand of
 			    true ->
-				?line exit({failed_sockopt,
-					    {Type,Name}});
+				exit({failed_sockopt,
+				      {Type,Name}});
 			    false ->
-				?line [{Type,Name}|Acc]
+				[{Type,Name}|Acc]
 			end
 		end,
-	    ?line gen_tcp:close(X1),
-	    ?line gen_tcp:close(Y1),
-	    ?line gen_tcp:close(X2),
-	    ?line gen_tcp:close(Y2),
+	    gen_tcp:close(X1),
+	    gen_tcp:close(Y1),
+	    gen_tcp:close(X2),
+	    gen_tcp:close(Y2),
 	    NewAcc
-     end.
+    end.
 
-% {OptionName,Value1,Value2,Mandatory,Changeable}
+%% {OptionName,Value1,Value2,Mandatory,Changeable}
 all_listen_options() ->
     [{tos,0,1,false,true}, 
      {priority,0,1,false,true}, 
@@ -887,19 +873,19 @@ all_connect_options() ->
      {delay_send,false,true,true,true}, 
      {packet_size,0,4,true,true}
     ].
-    
+
 
 create_socketpair(ListenOptions,ConnectOptions) ->
-    ?line {ok,LS}=gen_tcp:listen(0,ListenOptions),
-    ?line {ok,Port}=inet:port(LS),
-    ?line {ok,CS}=gen_tcp:connect(localhost,Port,ConnectOptions),
-    ?line {ok,AS}=gen_tcp:accept(LS),
-    ?line gen_tcp:close(LS),
+    {ok,LS}=gen_tcp:listen(0,ListenOptions),
+    {ok,Port}=inet:port(LS),
+    {ok,CS}=gen_tcp:connect(localhost,Port,ConnectOptions),
+    {ok,AS}=gen_tcp:accept(LS),
+    gen_tcp:close(LS),
     {AS,CS}.
 
 
 start_helper(Config) ->
-    Progname = filename:join(?config(data_dir, Config), "sockopt_helper"),
+    Progname = filename:join(proplists:get_value(data_dir, Config), "sockopt_helper"),
     Port = open_port({spawn,Progname},[eof,line]),
     Port.
 
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index 54ab5aa566..e85d50bd0c 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -19,13 +19,13 @@
 %%
 -module(init_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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([get_arguments/1, get_argument/1, boot_var/1, restart/1,
-	 many_restarts/1,
+	 many_restarts/0, many_restarts/1,
 	 get_plain_arguments/1,
 	 reboot/1, stop/1, get_status/1, script_id/1]).
 -export([boot1/1, boot2/1]).
@@ -41,7 +41,9 @@
 %% Should be started in a CC view with:
 %% erl -sname master -rsh ctrsh
 %%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     [get_arguments, get_argument, boot_var,
@@ -65,46 +67,35 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:seconds(?DEFAULT_TIMEOUT_SEC)),
-    [{watchdog, Dog}|Config].
+init_per_testcase(Func, Config) ->
+    Config.
 
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
+end_per_testcase(_Func, _Config) ->
+    ok.
 
-init(doc) -> [];
-init(suite) -> [];
 init(Config) when is_list(Config) ->
     Config.
 
-fini(doc) -> [];
-fini(suite) -> [];
 fini(Config) when is_list(Config) ->
     Host = list_to_atom(from($@, atom_to_list(node()))),
     Node = list_to_atom(lists:concat([init_test, "@", Host])),
     stop_node(Node),
     Config.
 
-get_arguments(doc) ->[];
-get_arguments(suite) -> {req, [distribution, {local_slave_nodes, 1}]};
 get_arguments(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(10)),
-
     Args = args(),
-    ?line {ok, Node} = start_node(init_test, Args),
-    ?line case rpc:call(Node, init, get_arguments, []) of
-	      Arguments when is_list(Arguments) ->
-		  stop_node(Node),
-		  check_a(Arguments),
-		  check_b(Arguments),
-		  check_c(Arguments),
-		  check_d(Arguments);
-	      _ ->
-		  stop_node(Node),
-		  ?t:fail(get_arguments)
-	  end,
-    ?line ?t:timetrap_cancel(Dog),
+    {ok, Node} = start_node(init_test, Args),
+    case rpc:call(Node, init, get_arguments, []) of
+	Arguments when is_list(Arguments) ->
+	    stop_node(Node),
+	    check_a(Arguments),
+	    check_b(Arguments),
+	    check_c(Arguments),
+	    check_d(Arguments);
+	_ ->
+	    stop_node(Node),
+	    ct:fail(get_arguments)
+    end,
     ok.
 
 check_a(Args) ->
@@ -115,10 +106,10 @@ check_a(Args) ->
 		false ->
 		    ok;
 		_ ->
-		    ?t:fail(check_a1)
+		    ct:fail(check_a1)
 	    end;
 	_ ->
-	    ?t:fail(check_a2)
+	    ct:fail(check_a2)
     end.
 
 check_b(Args) ->
@@ -132,13 +123,13 @@ check_b(Args) ->
 			false ->
 			    ok;
 			_ ->
-			    ?t:fail(check_b1)
+			    ct:fail(check_b1)
 		    end;
 		_ ->
-		    ?t:fail(check_b2)
+		    ct:fail(check_b2)
 	    end;
 	_ ->
-	    ?t:fail(check_b3)
+	    ct:fail(check_b3)
     end.
 
 check_c(Args) ->
@@ -152,13 +143,13 @@ check_c(Args) ->
 			false ->
 			    ok;
 			_ ->
-			    ?t:fail(check_c1)
+			    ct:fail(check_c1)
 		    end;
 		_ ->
-		    ?t:fail(check_c2)
+		    ct:fail(check_c2)
 	    end;
 	_ ->
-	    ?t:fail(check_c3)
+	    ct:fail(check_c3)
     end.
 
 check_d(Args) ->
@@ -169,62 +160,54 @@ check_d(Args) ->
 		false ->
 		    ok;
 		_ ->
-		    ?t:fail(check_d1)
+		    ct:fail(check_d1)
 	    end;
 	_ ->
-	    ?t:fail(check_d2)
+	    ct:fail(check_d2)
     end.
 
-get_argument(doc) ->[];
-get_argument(suite) -> {req, [distribution, {local_slave_nodes, 1}]};
 get_argument(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(10)),
-
     Args = args(),
-    ?line {ok, Node} = start_node(init_test, Args),
-    ?line case rpc:call(Node, init, get_argument, [b]) of
-	      {ok, [["hej", "hopp"],["san", "sa"]]} ->
-		  ok;
-	      _ ->
-		  stop_node(Node),
-		  ?t:fail({get_argument, b})
-	  end,
-    ?line case rpc:call(Node, init, get_argument, [a]) of
-	      {ok, [["kalle"]]} ->
-		  ok;
-	      _ ->
-		  stop_node(Node),
-		  ?t:fail({get_argument, a})
-	  end,
-    ?line case rpc:call(Node, init, get_argument, [c]) of
-	      {ok, [["4", "5", "6"], ["7", "8", "9"]]} ->
-		  ok;
-	      _ ->
-		  stop_node(Node),
-		  ?t:fail({get_argument, c})
-	  end,
-    ?line case rpc:call(Node, init, get_argument, [d]) of
-	      {ok, [[]]} ->
-		  ok;
-	      _ ->
-		  stop_node(Node),
-		  ?t:fail({get_argument, d})
-	  end,
-    ?line case rpc:call(Node, init, get_argument, [e]) of
-	      error ->
-		  ok;
-	      _ ->
-		  stop_node(Node),
-		  ?t:fail({get_argument, e})
-	  end,
+    {ok, Node} = start_node(init_test, Args),
+    case rpc:call(Node, init, get_argument, [b]) of
+	{ok, [["hej", "hopp"],["san", "sa"]]} ->
+	    ok;
+	_ ->
+	    stop_node(Node),
+	    ct:fail({get_argument, b})
+    end,
+    case rpc:call(Node, init, get_argument, [a]) of
+	{ok, [["kalle"]]} ->
+	    ok;
+	_ ->
+	    stop_node(Node),
+	    ct:fail({get_argument, a})
+    end,
+    case rpc:call(Node, init, get_argument, [c]) of
+	{ok, [["4", "5", "6"], ["7", "8", "9"]]} ->
+	    ok;
+	_ ->
+	    stop_node(Node),
+	    ct:fail({get_argument, c})
+    end,
+    case rpc:call(Node, init, get_argument, [d]) of
+	{ok, [[]]} ->
+	    ok;
+	_ ->
+	    stop_node(Node),
+	    ct:fail({get_argument, d})
+    end,
+    case rpc:call(Node, init, get_argument, [e]) of
+	error ->
+	    ok;
+	_ ->
+	    stop_node(Node),
+	    ct:fail({get_argument, e})
+    end,
     stop_node(Node),
-    ?line ?t:timetrap_cancel(Dog),
     ok.
 
-get_plain_arguments(doc) ->[];
-get_plain_arguments(suite) -> {req, [distribution, {local_slave_nodes, 1}]};
 get_plain_arguments(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(10)),
     Longstring = 
 	"fjdkfjdkfjfdaa2fjdkfjdkfjfdaa2fjdkfjdkfjfdaa2"
 	"fjdkfjdkfjfdaa2fjdkfjdkfjfdaa2fjdkfjdkfjfdaa2"
@@ -235,18 +218,17 @@ get_plain_arguments(Config) when is_list(Config) ->
 	"fjdkfjdkfjfdaa2fjdkfjdkfjfdaa2fjdkfjdkfjfdaa2"
 	"fjdkfjdkfjfdaa2fjdkfjdkfjfdaa2fjdkfjdkfjfdaa2"
 	"fjdkfjdkfjfdaa2fjdkfjdkfjfdaa2fjdkfjdkfjfdaa2",
-    ?line true = (length(Longstring) > 255),
+    true = (length(Longstring) > 255),
     Args = long_args(Longstring),
-    ?line {ok, Node} = start_node(init_test, Args),
-    ?line case rpc:call(Node, init, get_plain_arguments, []) of
-	      ["a", "b", "c", Longstring] ->
-		  ok;
-	      As ->
-		  stop_node(Node),
-		  ?t:fail({get_argument, As})
-	  end,
+    {ok, Node} = start_node(init_test, Args),
+    case rpc:call(Node, init, get_plain_arguments, []) of
+	["a", "b", "c", Longstring] ->
+	    ok;
+	As ->
+	    stop_node(Node),
+	    ct:fail({get_argument, As})
+    end,
     stop_node(Node),
-    ?line ?t:timetrap_cancel(Dog),
 
     ok.
 
@@ -254,199 +236,183 @@ get_plain_arguments(Config) when is_list(Config) ->
 %% ------------------------------------------------
 %% Use -boot_var flag to set $TEST_VAR in boot script.
 %% ------------------------------------------------
-boot_var(doc) -> [];
-boot_var(suite) -> {req, [distribution, {local_slave_nodes, 1}]};
 boot_var(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(100)),
-
     {BootScript, TEST_VAR, KernelVsn, StdlibVsn} = create_boot(Config),
 
     %% Should fail as we have not given -boot_var TEST_VAR
-    ?line {error, timeout} =
-    start_node(init_test, "-boot " ++ BootScript),
+    {error, timeout} =
+	start_node(init_test, "-boot " ++ BootScript),
 
     case is_real_system(KernelVsn, StdlibVsn) of
 	true ->
 	    %% Now it should work !!
-	    ?line {ok, Node} =
-	    start_node(init_test,
-		"-boot " ++ BootScript ++
-		" -boot_var TEST_VAR " ++ TEST_VAR),
+	    {ok, Node} =
+		start_node(init_test,
+			   "-boot " ++ BootScript ++
+			       " -boot_var TEST_VAR \"" ++
+			       TEST_VAR ++ "\""),
 	    stop_node(Node),
 	    Res = ok;
 	_ ->
 	    %% What we need is not so much version numbers on the directories, but
 	    %% for the boot var TEST_VAR to appear in the boot script, and it doesn't
 	    %% if we give the 'local' option to systools:make_script.
-	    ?t:format(
-		"Test case not complete as we are not~n"
-		"running in a real system!~n"
-		"Probably this test is performed in a "
-		"clearcase view or source tree.~n"
-		"Need version numbers on the kernel and "
-		"stdlib directories!~n",
-		[]),
+	    io:format(
+	      "Test case not complete as we are not~n"
+	      "running in a real system!~n"
+	      "Probably this test is performed in a "
+	      "clearcase view or source tree.~n"
+	      "Need version numbers on the kernel and "
+	      "stdlib directories!~n",
+	      []),
 	    Res = {skip,
-		"Test case only partially run since it is run "
-		"in a clearcase view or in a source tree. "
-		"Need an installed system to complete this test."}
+		   "Test case only partially run since it is run "
+		   "in a clearcase view or in a source tree. "
+		   "Need an installed system to complete this test."}
     end,
-    ?line ?t:timetrap_cancel(Dog),
     Res.
 
 create_boot(Config) ->
-    ?line {ok, OldDir} = file:get_cwd(),
-    ?line {LatestDir, LatestName, KernelVsn, StdlibVsn} =
+    {ok, OldDir} = file:get_cwd(),
+    {LatestDir, LatestName, KernelVsn, StdlibVsn} =
 	create_script(Config),
     LibDir = code:lib_dir(),
-    ?line ok = file:set_cwd(LatestDir),
-    ?line ok = systools:make_script(LatestName,
-				    [{variables, [{"TEST_VAR", LibDir}]}]),
-    ?line ok = file:set_cwd(OldDir),
+    ok = file:set_cwd(LatestDir),
+    ok = systools:make_script(LatestName,
+			      [{variables, [{"TEST_VAR", LibDir}]}]),
+    ok = file:set_cwd(OldDir),
     {LatestDir ++ "/" ++ LatestName, LibDir, KernelVsn, StdlibVsn}.
 
 is_real_system(KernelVsn, StdlibVsn) ->
     LibDir = code:lib_dir(),
-    filelib:is_dir(filename:join(LibDir, "kernel"++KernelVsn)) andalso
-	filelib:is_dir(filename:join(LibDir, "stdlib"++StdlibVsn)).
-    
+    filelib:is_dir(filename:join(LibDir, "kernel-"++KernelVsn)) andalso
+	filelib:is_dir(filename:join(LibDir, "stdlib-"++StdlibVsn)).
+
 %% ------------------------------------------------
 %% Slave executes erlang:halt() on master nodedown.
 %% Therefore the slave process must be killed
 %% before restart.
 %% ------------------------------------------------
-many_restarts(doc) -> [];
-many_restarts(suite) ->
-    case ?t:os_type() of
-	{Fam, _} when Fam == unix; Fam == win32 ->
-	    {req, [distribution, {local_slave_nodes, 1}, {time, 5}]};
-	_ ->
-	    {skip, "Only run on unix and win32"}
-    end;
+many_restarts() ->
+    [{timetrap,{minutes,8}}].
 
 many_restarts(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(480)),
-    ?line {ok, Node} = loose_node:start(init_test, "", ?DEFAULT_TIMEOUT_SEC),
-    ?line loop_restart(30,Node,rpc:call(Node,erlang,whereis,[error_logger])),
-    ?line loose_node:stop(Node),
-    ?line ?t:timetrap_cancel(Dog),
+    {ok, Node} = loose_node:start(init_test, "", ?DEFAULT_TIMEOUT_SEC),
+    loop_restart(30,Node,rpc:call(Node,erlang,whereis,[error_logger])),
+    loose_node:stop(Node),
     ok.
 
 loop_restart(0,_,_) ->
     ok;
 loop_restart(N,Node,EHPid) ->
-    ?line erlang:monitor_node(Node, true),
-    ?line ok = rpc:call(Node, init, restart, []),
-    ?line receive
-	      {nodedown, Node} ->
-		  ok
-	  after 10000 ->
-		  loose_node:stop(Node),
-		  ?t:fail(not_stopping)
-	  end,
-    ?line ok = wait_for(30, Node, EHPid),
-    ?line loop_restart(N-1,Node,rpc:call(Node,erlang,whereis,[error_logger])).
+    erlang:monitor_node(Node, true),
+    ok = rpc:call(Node, init, restart, []),
+    receive
+	{nodedown, Node} ->
+	    ok
+    after 10000 ->
+	    loose_node:stop(Node),
+	    ct:fail(not_stopping)
+    end,
+    ok = wait_for(30, Node, EHPid),
+    loop_restart(N-1,Node,rpc:call(Node,erlang,whereis,[error_logger])).
 
 wait_for(0,Node,_) ->
     loose_node:stop(Node),    
     error;
 wait_for(N,Node,EHPid) ->
-    ?line case rpc:call(Node, erlang, whereis, [error_logger]) of
+    case rpc:call(Node, erlang, whereis, [error_logger]) of
 	Pid when is_pid(Pid), Pid =/= EHPid ->
-		  %% ?line erlang:display(ok),
-		  ?line ok;
+	    %% erlang:display(ok),
+	    ok;
 	_X ->
-		  %% ?line erlang:display(_X),
-		  %% ?line Procs = rpc:call(Node, erlang, processes, []),
-		  %% ?line erlang:display(Procs),
-		  %% case is_list(Procs) of
-		  %%     true ->
-		  %% 	  ?line [(catch erlang:display(
-		  %% 			  rpc:call(Node, 
-		  %% 				   erlang, 
-		  %% 				   process_info, 
-		  %% 				   [Y,registered_name]))) 
-		  %% 		 || Y <- Procs];
-		  %%     _ ->
-		  %% 	  ok
-		  %% end,
-		  receive
-		      after 100 ->
-			      ok
-		      end,
-		  ?line wait_for(N-1,Node,EHPid)
-	  end.
+	    %% erlang:display(_X),
+	    %% Procs = rpc:call(Node, erlang, processes, []),
+	    %% erlang:display(Procs),
+	    %% case is_list(Procs) of
+	    %%     true ->
+	    %% 	  [(catch erlang:display(
+	    %% 			  rpc:call(Node,
+	    %% 				   erlang,
+	    %% 				   process_info,
+	    %% 				   [Y,registered_name])))
+	    %% 		 || Y <- Procs];
+	    %%     _ ->
+	    %% 	  ok
+	    %% end,
+	    receive
+	    after 100 ->
+		    ok
+	    end,
+	    wait_for(N-1,Node,EHPid)
+    end.
 
 %% ------------------------------------------------
 %% Slave executes erlang:halt() on master nodedown.
 %% Therefore the slave process must be killed
 %% before restart.
 %% ------------------------------------------------
-restart(doc) -> [];
-restart(suite) ->
-    case ?t:os_type() of
-	{Fam, _} when Fam == unix; Fam == win32 ->
-	    {req, [distribution, {local_slave_nodes, 1}, {time, 5}]};
-	_ ->
-	    {skip, "Only run on unix and win32"}
-    end;
 restart(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(40)),
-    ?line Args = args(),
+    Args = args(),
 
     %% Currently test_server:start_node cannot be used. The restarted
     %% node immediately halts due to the implementation of
     %% test_server:start_node.
-    ?line {ok, Node} = loose_node:start(init_test, Args, ?DEFAULT_TIMEOUT_SEC),
+    {ok, Node} = loose_node:start(init_test, Args, ?DEFAULT_TIMEOUT_SEC),
     %% Ok, the node is up, now the real test test begins.
-    ?line erlang:monitor_node(Node, true),
-    ?line InitPid = rpc:call(Node, erlang, whereis, [init]),
-    ?line Procs = rpc:call(Node, erlang, processes, []),
-    ?line MaxPid = lists:last(Procs),
-    ?line ok = rpc:call(Node, init, restart, []),
-    ?line receive
-	      {nodedown, Node} ->
-		  ok
-	  after 10000 ->
-		  loose_node:stop(Node),
-		  ?t:fail(not_stopping)
-	  end,
-    ?line ok = wait_restart(30, Node),
+    erlang:monitor_node(Node, true),
+    InitPid = rpc:call(Node, erlang, whereis, [init]),
+    PurgerPid = rpc:call(Node, erlang, whereis, [erts_code_purger]),
+    Procs = rpc:call(Node, erlang, processes, []),
+    MaxPid = lists:last(Procs),
+    ok = rpc:call(Node, init, restart, []),
+    receive
+	{nodedown, Node} ->
+	    ok
+    after 10000 ->
+	    loose_node:stop(Node),
+	    ct:fail(not_stopping)
+    end,
+    ok = wait_restart(30, Node),
 
     %% Still the same init process!
-    ?line InitPid1 = rpc:call(Node, erlang, whereis, [init]),
+    InitPid1 = rpc:call(Node, erlang, whereis, [init]),
     InitP = pid_to_list(InitPid),
-    ?line InitP = pid_to_list(InitPid1),
-
-    ?line NewProcs0 = rpc:call(Node, erlang, processes, []),
-    NewProcs = lists:delete(InitPid1, NewProcs0),
-    ?line case check_processes(NewProcs, MaxPid) of
-	      true ->
-		  ok;
-	      _ ->
-		  loose_node:stop(Node),
-		  ?t:fail(processes_not_greater)
-	  end,
+    InitP = pid_to_list(InitPid1),
+
+    %% and same purger process!
+    PurgerPid1 = rpc:call(Node, erlang, whereis, [erts_code_purger]),
+    PurgerP = pid_to_list(PurgerPid),
+    PurgerP = pid_to_list(PurgerPid1),
+
+    NewProcs0 = rpc:call(Node, erlang, processes, []),
+    NewProcs = NewProcs0 -- [InitPid1, PurgerPid1],
+    case check_processes(NewProcs, MaxPid) of
+	true ->
+	    ok;
+	_ ->
+	    loose_node:stop(Node),
+	    ct:fail(processes_not_greater)
+    end,
 
     %% Test that, for instance, the same argument still exists.
-    ?line case rpc:call(Node, init, get_argument, [c]) of
-	      {ok, [["4", "5", "6"], ["7", "8", "9"]]} ->
-		  ok;
-	      _ ->
-		  loose_node:stop(Node),
-		  ?t:fail({get_argument, restart_fail})
-	  end,
+    case rpc:call(Node, init, get_argument, [c]) of
+	{ok, [["4", "5", "6"], ["7", "8", "9"]]} ->
+	    ok;
+	_ ->
+	    loose_node:stop(Node),
+	    ct:fail({get_argument, restart_fail})
+    end,
     loose_node:stop(Node),
-    ?line ?t:timetrap_cancel(Dog),
     ok.
 
 wait_restart(0, _Node) ->
-    ?t:fail(not_restarted);
+    ct:fail(not_restarted);
 wait_restart(N, Node) ->
     case net_adm:ping(Node) of
 	pong -> ok;
 	_ -> 
-	    ?t:sleep(1000),
+	    ct:sleep(1000),
 	    wait_restart(N - 1, Node)
     end.
 
@@ -474,124 +440,98 @@ apid(Pid) ->
 %% The reboot facility using heart is tested
 %% in the heart_SUITE.
 %% ------------------------------------------------
-reboot(doc) -> [];
-reboot(suite) -> {req, [distribution, {local_slave_nodes, 1}]};
 reboot(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(40)),
-
     Args = args(),
-    ?line {ok, Node} = start_node(init_test, Args),
+    {ok, Node} = start_node(init_test, Args),
     erlang:monitor_node(Node, true),
-    ?line ok = rpc:call(Node, init, reboot, []),
-    ?line receive
-	      {nodedown, Node} ->
-		  ok
-	  after 10000 ->
-		  stop_node(Node),
-		  ?t:fail(not_stopping)
-	  end,
-    ?t:sleep(5000),
-    ?line case net_adm:ping(Node) of
-	      pang ->
-		  ok;
-	      _ ->
-		  stop_node(Node),
-		  ?t:fail(system_rebooted)
-	  end,
-    ?line ?t:timetrap_cancel(Dog),
+    ok = rpc:call(Node, init, reboot, []),
+    receive
+	{nodedown, Node} ->
+	    ok
+    after 10000 ->
+	    stop_node(Node),
+	    ct:fail(not_stopping)
+    end,
+    ct:sleep(5000),
+    case net_adm:ping(Node) of
+	pang ->
+	    ok;
+	_ ->
+	    stop_node(Node),
+	    ct:fail(system_rebooted)
+    end,
     ok.
 
 %% ------------------------------------------------
 %%
 %% ------------------------------------------------
-stop(doc) -> [];
-stop(suite) -> [];
 stop(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(20)),
     Args = args(),
-    ?line {ok, Node} = start_node(init_test, Args),
+    {ok, Node} = start_node(init_test, Args),
     erlang:monitor_node(Node, true),
-    ?line ok = rpc:call(Node, init, reboot, []),
-    ?line receive
-	      {nodedown, Node} ->
-		  ok
-	  after 10000 ->
-		  stop_node(Node),
-		  ?t:fail(not_stopping)
-	  end,
-    ?t:sleep(5000),
-    ?line case net_adm:ping(Node) of
-	      pang ->
-		  ok;
-	      _ ->
-		  stop_node(Node),
-		  ?t:fail(system_rebooted)
-	  end,
-    ?line ?t:timetrap_cancel(Dog),
+    ok = rpc:call(Node, init, reboot, []),
+    receive
+	{nodedown, Node} ->
+	    ok
+    after 10000 ->
+	    stop_node(Node),
+	    ct:fail(not_stopping)
+    end,
+    ct:sleep(5000),
+    case net_adm:ping(Node) of
+	pang ->
+	    ok;
+	_ ->
+	    stop_node(Node),
+	    ct:fail(system_rebooted)
+    end,
     ok.
 
 %% ------------------------------------------------
 %% 
 %% ------------------------------------------------
-get_status(doc) -> [];
-get_status(suite) -> [];
 get_status(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(10)),
-    ?line ?t:timetrap_cancel(Dog),
+    {Start, _} = init:get_status(),
 
-    ?line {Start, _} = init:get_status(),
     %% Depending on how the test_server is started Start has
     %% different values. staring if test_server started with
     %% -s flag.
-    ?line case lists:member(Start, [started, starting]) of
-	      true ->
-		  ok;
-	      _ ->
-		  ?t:fail(get_status)
-	  end.
+    case lists:member(Start, [started, starting]) of
+	true ->
+	    ok;
+	_ ->
+	    ct:fail(get_status)
+    end.
 
 %% ------------------------------------------------
 %% 
 %% ------------------------------------------------
-script_id(doc) -> [];
-script_id(suite) -> [];
 script_id(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(10)),
-
-    ?line {Name, Vsn} = init:script_id(),
-    ?line if
-	      is_list(Name), is_list(Vsn) ->
-		  ok;
-	      true ->
-		  ?t:fail(not_standard_script)
-	  end,
-    ?line ?t:timetrap_cancel(Dog),
+    {Name, Vsn} = init:script_id(),
+    if
+	is_list(Name), is_list(Vsn) ->
+	    ok;
+	true ->
+	    ct:fail(not_standard_script)
+    end,
     ok.
 
 %% ------------------------------------------------
 %% Start the slave system with -boot flag.
 %% ------------------------------------------------
 
-boot1(doc) -> [];
-boot1(suite) -> {req, [distribution, {local_slave_nodes, 1}, {time, 35}]};
 boot1(Config) when is_list(Config) ->
-    ?line Dog = ?t:timetrap(?t:seconds(80)),
     Args = args() ++ " -boot start_sasl",
-    ?line {ok, Node} = start_node(init_test, Args),
-    ?line stop_node(Node),
+    {ok, Node} = start_node(init_test, Args),
+    stop_node(Node),
 
     %% Try to start with non existing boot file.
     Args1 = args() ++ " -boot dummy_script",
-    ?line {error, timeout} = start_node(init_test, Args1),
+    {error, timeout} = start_node(init_test, Args1),
 
-    ?line ?t:timetrap_cancel(Dog),
     ok.
 
-boot2(doc) -> [];
-boot2(suite) -> {req, [distribution, {local_slave_nodes, 1}, {time, 35}]};
 boot2(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:seconds(80)),
-
     %% Absolute boot file name
     Boot = filename:join([code:root_dir(), "bin", "start_sasl"]),
 
@@ -604,9 +544,9 @@ boot2(Config) when is_list(Config) ->
 	    %% Absolute boot file name for Windows -- all slashes are
 	    %% converted to backslashes.
 	    Win_boot = lists:map(fun
-		    ($/) -> $\\;
-		    (C) -> C 
-		end, Boot),
+				     ($/) -> $\\;
+				     (C) -> C
+				end, Boot),
 	    Args2 = args() ++ " -boot \"" ++ Win_boot ++ "\"",
 	    {ok, Node2} = start_node(init_test, Args2),
 	    stop_node(Node2);
@@ -614,16 +554,15 @@ boot2(Config) when is_list(Config) ->
 	    ok
     end,
 
-    ?t:timetrap_cancel(Dog),
     ok.
 
 %% Misc. functions    
 
 start_node(Name, Param) ->
-    ?t:start_node(Name, slave, [{args, Param}]).
+    test_server:start_node(Name, slave, [{args, Param}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 from(H, [H | T]) -> T;
 from(H, [_ | T]) -> from(H, T);
@@ -639,18 +578,18 @@ long_args(A) ->
 		    [A])).
 
 create_script(Config) ->
-    ?line PrivDir = ?config(priv_dir,Config),
-    ?line Name = PrivDir ++ "boot_var_test",
-    ?line Apps = application_controller:which_applications(),
-    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
-    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
-    ?line {ok,Fd} = file:open(Name ++ ".rel", [write]),
-    ?line io:format(Fd,
-		    "{release, {\"Test release 3\", \"P2A\"}, \n"
-		    " {erts, \"4.4\"}, \n"
-		    " [{kernel, \"~s\"}, {stdlib, \"~s\"}]}.\n",
-		    [KernelVer,StdlibVer]),
-    ?line file:close(Fd),
+    PrivDir = proplists:get_value(priv_dir,Config),
+    Name = PrivDir ++ "boot_var_test",
+    Apps = application_controller:which_applications(),
+    {value,{_,_,KernelVer}} = lists:keysearch(kernel,1,Apps),
+    {value,{_,_,StdlibVer}} = lists:keysearch(stdlib,1,Apps),
+    {ok,Fd} = file:open(Name ++ ".rel", [write]),
+    io:format(Fd,
+	      "{release, {\"Test release 3\", \"P2A\"}, \n"
+	      " {erts, \"4.4\"}, \n"
+	      " [{kernel, \"~s\"}, {stdlib, \"~s\"}]}.\n",
+	      [KernelVer,StdlibVer]),
+    file:close(Fd),
     {filename:dirname(Name), filename:basename(Name),
-    KernelVer, StdlibVer}.
+     KernelVer, StdlibVer}.
 
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index 8adae1f606..414504e257 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 %%
 -module(interactive_shell_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.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, 
@@ -30,15 +30,14 @@
 -export([toerl_server/3]).
 
 init_per_testcase(_Func, Config) ->
-    Dog = test_server:timetrap(test_server:minutes(3)),
-    [{watchdog,Dog}|Config].
-
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog).
+    Config.
 
+end_per_testcase(_Func, _Config) ->
+    ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,3}}].
 
 all() -> 
     [get_columns_and_rows, exit_initial, job_control_local,
@@ -55,7 +54,7 @@ init_per_suite(Config) ->
     [{default_shell,DefShell},{term,Term}|Config].
 
 end_per_suite(Config) ->
-    Term = ?config(term,Config),
+    Term = proplists:get_value(term,Config),
     os:putenv("TERM",Term),
     ok.
 
@@ -66,68 +65,66 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-%-define(DEBUG,1).
+%%-define(DEBUG,1).
 -ifdef(DEBUG).
 -define(dbg(Data),erlang:display(Data)).
 -else.
 -define(dbg(Data),noop).
 -endif.
 
-get_columns_and_rows(suite) -> [];
-get_columns_and_rows(doc) -> ["Test that the shell can access columns and rows"];
+%% Test that the shell can access columns and rows.
 get_columns_and_rows(Config) when is_list(Config) ->
     case proplists:get_value(default_shell,Config) of
 	old ->
 	    %% Old shell tests
 	    ?dbg(old_shell),
-	    ?line rtnode([{putline,""},
-			  {putline, "2."},
-			  {getline, "2"},
-			  {putline,"io:columns()."},
-			  {getline_re,".*{error,enotsup}"},
-			  {putline,"io:rows()."},
-			  {getline_re,".*{error,enotsup}"}
-
-			 ],[]),
-	    ?line rtnode([{putline,""},
-			  {putline, "2."},
-			  {getline, "2"},
-			  {putline,"io:columns()."},
-			  {getline_re,".*{ok,90}"},
-			  {putline,"io:rows()."},
-			  {getline_re,".*{ok,40}"}],
-			 [],
-			 "stty rows 40; stty columns 90; ");
+	    rtnode([{putline,""},
+		    {putline, "2."},
+		    {getline, "2"},
+		    {putline,"io:columns()."},
+		    {getline_re,".*{error,enotsup}"},
+		    {putline,"io:rows()."},
+		    {getline_re,".*{error,enotsup}"}
+
+		   ],[]),
+	    rtnode([{putline,""},
+		    {putline, "2."},
+		    {getline, "2"},
+		    {putline,"io:columns()."},
+		    {getline_re,".*{ok,90}"},
+		    {putline,"io:rows()."},
+		    {getline_re,".*{ok,40}"}],
+		   [],
+		   "stty rows 40; stty columns 90; ");
 	new ->
-	    % New shell tests
+	    %% New shell tests
 	    ?dbg(new_shell),
-	    ?line rtnode([{putline,""},
-			  {putline, "2."},
-			  {getline, "2"},
-			  {putline,"io:columns()."},
-			  %% Behaviour change in R12B-5, returns 80
-			  %%		  {getline,"{error,enotsup}"},
-			  {getline,"{ok,80}"},
-			  {putline,"io:rows()."},
-			  %% Behaviour change in R12B-5, returns 24
-			  %%		  {getline,"{error,enotsup}"}
-			  {getline,"{ok,24}"}
-			 ],[]),
-	    ?line rtnode([{putline,""},
-			  {putline, "2."},
-			  {getline, "2"},
-			  {putline,"io:columns()."},
-			  {getline,"{ok,90}"},
-			  {putline,"io:rows()."},
-			  {getline,"{ok,40}"}],
-			 [],
-			 "stty rows 40; stty columns 90; ")
+	    rtnode([{putline,""},
+		    {putline, "2."},
+		    {getline, "2"},
+		    {putline,"io:columns()."},
+		    %% Behaviour change in R12B-5, returns 80
+		    %%		  {getline,"{error,enotsup}"},
+		    {getline,"{ok,80}"},
+		    {putline,"io:rows()."},
+		    %% Behaviour change in R12B-5, returns 24
+		    %%		  {getline,"{error,enotsup}"}
+		    {getline,"{ok,24}"}
+		   ],[]),
+	    rtnode([{putline,""},
+		    {putline, "2."},
+		    {getline, "2"},
+		    {putline,"io:columns()."},
+		    {getline,"{ok,90}"},
+		    {putline,"io:rows()."},
+		    {getline,"{ok,40}"}],
+		   [],
+		   "stty rows 40; stty columns 90; ")
     end.
-    
-    
 
-exit_initial(suite) -> [];
-exit_initial(doc) -> ["Tests that exit of initial shell restarts shell"];
+
+
+%% Tests that exit of initial shell restarts shell.
 exit_initial(Config) when is_list(Config) ->
     case proplists:get_value(default_shell,Config) of
 	old ->
@@ -152,9 +149,7 @@ exit_initial(Config) when is_list(Config) ->
 		    {getline_re,"35"}],[])
     end.
 
-job_control_local(suite) -> [];
-job_control_local(doc) -> [ "Tests that local shell can be "
-			    "started by means of job control" ];
+%% Tests that local shell can be started by means of job control.
 job_control_local(Config) when is_list(Config) ->
     case proplists:get_value(default_shell,Config) of
 	old ->
@@ -162,133 +157,130 @@ job_control_local(Config) when is_list(Config) ->
 	    {skip,"No new shell found"};
 	new ->
 	    %% New shell tests
-	    ?line rtnode([{putline,""},
-			  {putline, "2."},
-			  {getline, "2"},
-			  {putline,[7]},
-			  {sleep,timeout(short)},
-			  {putline,""},
-			  {getline," -->"},
-			  {putline,"s"},
-			  {putline,"c"},
-			  {putline_raw,""},
-			  {getline,"Eshell"},
-			  {putline_raw,""},
-			  {getline,"1>"},
-			  {putline,"35."},
-			  {getline,"35"}],[])
+	    rtnode([{putline,""},
+		    {putline, "2."},
+		    {getline, "2"},
+		    {putline,[7]},
+		    {sleep,timeout(short)},
+		    {putline,""},
+		    {getline," -->"},
+		    {putline,"s"},
+		    {putline,"c"},
+		    {putline_raw,""},
+		    {getline,"Eshell"},
+		    {putline_raw,""},
+		    {getline,"1>"},
+		    {putline,"35."},
+		    {getline,"35"}],[])
     end.
 
-job_control_remote(suite) -> [];
 job_control_remote(doc) -> [ "Tests that remote shell can be "
 			     "started by means of job control" ];
 job_control_remote(Config) when is_list(Config) ->
     case {node(),proplists:get_value(default_shell,Config)} of
 	{nonode@nohost,_} ->
-	    ?line exit(not_distributed);
+	    exit(not_distributed);
 	{_,old} ->
 	    {skip,"No new shell found"};
 	_ ->
-	    ?line RNode = create_nodename(),
-	    ?line MyNode = atom2list(node()),
-	    ?line Pid = spawn_link(fun() ->
-					   receive die ->
-						   ok
-					   end 
-				   end),
-	    ?line PidStr = pid_to_list(Pid),
-	    ?line register(kalaskula,Pid),
-	    ?line CookieString = lists:flatten(
-				   io_lib:format("~w",
-						 [erlang:get_cookie()])),
-	    ?line Res = rtnode([{putline,""},
-				{putline, "erlang:get_cookie()."},
-				{getline, CookieString},
-				{putline,[7]},
-				{sleep,timeout(short)},
-				{putline,""},
-				{getline," -->"},
-				{putline,"r '"++MyNode++"'"},
-				{putline,"c"},
-				{putline_raw,""},
-				{getline,"Eshell"},
-				{sleep,timeout(short)},
-				{putline_raw,""},
-				{getline,"("++MyNode++")1>"},
-				{putline,"whereis(kalaskula)."},
-				{getline,PidStr},
-				{sleep,timeout(short)}, % Race, known bug.
-				{putline_raw,"exit()."},
-				{getline,"***"},
-				{putline,[7]},
-				{putline,""},
-				{getline," -->"},
-				{putline,"c 1"},
-				{putline,""},
-				{sleep,timeout(short)},
-				{putline_raw,""},
-				{getline,"("++RNode++")"}],RNode),
-	    ?line Pid ! die,
-	    ?line Res
+	    RNode = create_nodename(),
+	    MyNode = atom2list(node()),
+	    Pid = spawn_link(fun() ->
+				     receive die ->
+					     ok
+				     end
+			     end),
+	    PidStr = pid_to_list(Pid),
+	    register(kalaskula,Pid),
+	    CookieString = lists:flatten(
+			     io_lib:format("~w",
+					   [erlang:get_cookie()])),
+	    Res = rtnode([{putline,""},
+			  {putline, "erlang:get_cookie()."},
+			  {getline, CookieString},
+			  {putline,[7]},
+			  {sleep,timeout(short)},
+			  {putline,""},
+			  {getline," -->"},
+			  {putline,"r '"++MyNode++"'"},
+			  {putline,"c"},
+			  {putline_raw,""},
+			  {getline,"Eshell"},
+			  {sleep,timeout(short)},
+			  {putline_raw,""},
+			  {getline,"("++MyNode++")1>"},
+			  {putline,"whereis(kalaskula)."},
+			  {getline,PidStr},
+			  {sleep,timeout(short)}, % Race, known bug.
+			  {putline_raw,"exit()."},
+			  {getline,"***"},
+			  {putline,[7]},
+			  {putline,""},
+			  {getline," -->"},
+			  {putline,"c 1"},
+			  {putline,""},
+			  {sleep,timeout(short)},
+			  {putline_raw,""},
+			  {getline,"("++RNode++")"}],RNode),
+	    Pid ! die,
+	    Res
     end.
-job_control_remote_noshell(suite) -> [];
-job_control_remote_noshell(doc) -> 
-    [ "Tests that remote shell can be "
-      "started by means of job control to -noshell node" ];
+
+%% Tests that remote shell can be
+%% started by means of job control to -noshell node.
 job_control_remote_noshell(Config) when is_list(Config) ->
     case {node(),proplists:get_value(default_shell,Config)} of
 	{nonode@nohost,_} ->
-	    ?line exit(not_distributed);
+	    exit(not_distributed);
 	{_,old} ->
 	    {skip,"No new shell found"};
 	_ ->
-	    ?line RNode = create_nodename(),
-	    ?line NSNode = start_noshell_node(interactive_shell_noshell),
-	    ?line Pid = spawn_link(NSNode, fun() ->
-						   receive die ->
-							   ok
-						   end 
-					   end),
-	    ?line PidStr = rpc:call(NSNode,erlang,pid_to_list,[Pid]),
-	    ?line true = rpc:call(NSNode,erlang,register,[kalaskula,Pid]),
-	    ?line NSNodeStr = atom2list(NSNode),
-	    ?line CookieString = lists:flatten(
-				   io_lib:format("~w",
-						 [erlang:get_cookie()])),
-	    ?line Res = rtnode([{putline,""},
-				{putline, "erlang:get_cookie()."},
-				{getline, CookieString},
-				{putline,[7]},
-				{sleep,timeout(short)},
-				{putline,""},
-				{getline," -->"},
-				{putline,"r '"++NSNodeStr++"'"},
-				{putline,"c"},
-				{putline_raw,""},
-				{getline,"Eshell"},
-				{sleep,timeout(short)},
-				{putline_raw,""},
-				{getline,"("++NSNodeStr++")1>"},
-				{putline,"whereis(kalaskula)."},
-				{getline,PidStr},
-				{sleep,timeout(short)}, % Race, known bug.
-				{putline_raw,"exit()."},
-				{getline,"***"},
-				{putline,[7]},
-				{putline,""},
-				{getline," -->"},
-				{putline,"c 1"},
-				{putline,""},
-				{sleep,timeout(short)},
-				{putline_raw,""},
-				{getline,"("++RNode++")"}],RNode),
-	    ?line Pid ! die,
-	    ?line stop_noshell_node(NSNode),
-	    ?line Res
+	    RNode = create_nodename(),
+	    NSNode = start_noshell_node(interactive_shell_noshell),
+	    Pid = spawn_link(NSNode, fun() ->
+					     receive die ->
+						     ok
+					     end
+				     end),
+	    PidStr = rpc:call(NSNode,erlang,pid_to_list,[Pid]),
+	    true = rpc:call(NSNode,erlang,register,[kalaskula,Pid]),
+	    NSNodeStr = atom2list(NSNode),
+	    CookieString = lists:flatten(
+			     io_lib:format("~w",
+					   [erlang:get_cookie()])),
+	    Res = rtnode([{putline,""},
+			  {putline, "erlang:get_cookie()."},
+			  {getline, CookieString},
+			  {putline,[7]},
+			  {sleep,timeout(short)},
+			  {putline,""},
+			  {getline," -->"},
+			  {putline,"r '"++NSNodeStr++"'"},
+			  {putline,"c"},
+			  {putline_raw,""},
+			  {getline,"Eshell"},
+			  {sleep,timeout(short)},
+			  {putline_raw,""},
+			  {getline,"("++NSNodeStr++")1>"},
+			  {putline,"whereis(kalaskula)."},
+			  {getline,PidStr},
+			  {sleep,timeout(short)}, % Race, known bug.
+			  {putline_raw,"exit()."},
+			  {getline,"***"},
+			  {putline,[7]},
+			  {putline,""},
+			  {getline," -->"},
+			  {putline,"c 1"},
+			  {putline,""},
+			  {sleep,timeout(short)},
+			  {putline_raw,""},
+			  {getline,"("++RNode++")"}],RNode),
+	    Pid ! die,
+	    stop_noshell_node(NSNode),
+	    Res
     end.
 
-ctrl_keys(suite) -> [];
-ctrl_keys(doc) -> ["Tests various control keys"];
+%% Tests various control keys.
 ctrl_keys(_Conf) when is_list(_Conf) ->
     Cu=[$\^u],
     Cw=[$\^w],
@@ -308,7 +300,7 @@ ctrl_keys(_Conf) when is_list(_Conf) ->
 	    {getline,"\"hello world\""},
 	    {putline,"\"hello world\""++Cu++Cy++"."},
 	    {getline,"\"hello world\""}]
-	    ++wordLeft()++wordRight(),[]).
+	   ++wordLeft()++wordRight(),[]).
 
 
 wordLeft() ->
@@ -337,46 +329,46 @@ wordRight(Chars) ->
 rtnode(C,N) ->
     rtnode(C,N,[]).
 rtnode(Commands,Nodename,ErlPrefix) ->
-    ?line case get_progs() of
-	      {error,_Reason} ->
-		  ?line {skip,"No runerl present"};
-	      {RunErl,ToErl,Erl} ->
-		  ?line case create_tempdir() of
-			    {error, Reason2} ->
-				?line {skip, Reason2};
-			    Tempdir ->
-				?line SPid = 
-				    start_runerl_node(RunErl,ErlPrefix++"\\\""++Erl++"\\\"",
-						      Tempdir,Nodename),
-				?line CPid = start_toerl_server(ToErl,Tempdir),
-				?line erase(getline_skipped),
-				?line Res = 
-				    (catch get_and_put(CPid, Commands,1)),
-				?line case stop_runerl_node(CPid) of
-					  {error,_} ->
-					      ?line CPid2 = 
-						  start_toerl_server
-						    (ToErl,Tempdir),
-					      ?line erase(getline_skipped),
-					      ?line ok = get_and_put
-							   (CPid2, 
-							    [{putline,[7]},
-							     {sleep,
-							      timeout(short)},
-							     {putline,""},
-							     {getline," -->"},
-							     {putline,"s"},
-							     {putline,"c"},
-							     {putline,""}],1),
-					      ?line stop_runerl_node(CPid2);
-					  _ ->
-					      ?line ok
-				      end,
-				?line wait_for_runerl_server(SPid),
-				?line ok = rm_rf(Tempdir),
-				?line ok = Res
-			end
-	  end.
+    case get_progs() of
+	{error,_Reason} ->
+	    {skip,"No runerl present"};
+	{RunErl,ToErl,Erl} ->
+	    case create_tempdir() of
+		{error, Reason2} ->
+		    {skip, Reason2};
+		Tempdir ->
+		    SPid =
+			start_runerl_node(RunErl,ErlPrefix++"\\\""++Erl++"\\\"",
+					  Tempdir,Nodename),
+		    CPid = start_toerl_server(ToErl,Tempdir),
+		    erase(getline_skipped),
+		    Res =
+			(catch get_and_put(CPid, Commands,1)),
+		    case stop_runerl_node(CPid) of
+			{error,_} ->
+			    CPid2 =
+				start_toerl_server
+				  (ToErl,Tempdir),
+			    erase(getline_skipped),
+			    ok = get_and_put
+				   (CPid2,
+				    [{putline,[7]},
+				     {sleep,
+				      timeout(short)},
+				     {putline,""},
+				     {getline," -->"},
+				     {putline,"s"},
+				     {putline,"c"},
+				     {putline,""}],1),
+			    stop_runerl_node(CPid2);
+			_ ->
+			    ok
+		    end,
+		    wait_for_runerl_server(SPid),
+		    ok = rm_rf(Tempdir),
+		    ok = Res
+	    end
+    end.
 
 timeout(long) ->
     2 * timeout(normal);
@@ -389,7 +381,7 @@ timeout(normal) ->
 start_noshell_node(Name) ->
     PADir =  filename:dirname(code:which(?MODULE)),
     {ok, Node} = test_server:start_node(Name,slave,[{args," -noshell -pa "++
-						     PADir++" "}]),
+							 PADir++" "}]),
     Node.
 stop_noshell_node(Node) ->
     test_server:stop_node(Node).
@@ -397,20 +389,20 @@ stop_noshell_node(Node) ->
 
 rm_rf(Dir) ->
     try
-      {ok,List} = file:list_dir(Dir),
-      Files = [filename:join([Dir,X]) || X <- List],
-      [case file:list_dir(Y) of
-	   {error, enotdir} ->
-	       ok = file:delete(Y);
-	   _ ->
-	       ok = rm_rf(Y)
-       end || Y <- Files],
-       ok = file:del_dir(Dir),
-       ok
+	{ok,List} = file:list_dir(Dir),
+	Files = [filename:join([Dir,X]) || X <- List],
+	[case file:list_dir(Y) of
+	     {error, enotdir} ->
+		 ok = file:delete(Y);
+	     _ ->
+		 ok = rm_rf(Y)
+	 end || Y <- Files],
+	ok = file:del_dir(Dir),
+	ok
     catch
 	_:Exception -> {error, {Exception,Dir}}
     end.
-       
+
 
 get_and_put(_CPid,[],_) ->
     ok;
@@ -479,7 +471,7 @@ get_and_put(CPid, [{putline_raw, Line}|T],N) ->
     Timeout = timeout(normal),
     receive
 	{send_line, ok} ->
-	     get_and_put(CPid, T,N+1)
+	    get_and_put(CPid, T,N+1)
     after Timeout ->
 	    error_logger:error_msg("~p: putline_raw timeout (~p) sending "
 				   "\"~s\" (command number ~p)~n",
@@ -493,7 +485,7 @@ get_and_put(CPid, [{putline, Line}|T],N) ->
     Timeout = timeout(normal),
     receive
 	{send_line, ok} ->
-	     get_and_put(CPid, [{getline, []}|T],N)
+	    get_and_put(CPid, [{getline, []}|T],N)
     after Timeout ->
 	    error_logger:error_msg("~p: putline timeout (~p) sending "
 				   "\"~s\" (command number ~p)~n[~p]~n",
@@ -510,8 +502,8 @@ wait_for_runerl_server(SPid) ->
     after Timeout ->
 	    {error, timeout}
     end.
-	
-    
+
+
 
 stop_runerl_node(CPid) ->
     Ref = erlang:monitor(process, CPid),
@@ -562,11 +554,11 @@ create_tempdir(Dir,X) when X > $Z, X < $a ->
     create_tempdir(Dir,$a);
 create_tempdir(Dir,X) when X > $z -> 
     Estr = lists:flatten(
-		     io_lib:format("Unable to create ~s, reason eexist",
-				   [Dir++[$z]])),
+	     io_lib:format("Unable to create ~s, reason eexist",
+			   [Dir++[$z]])),
     {error, Estr};
 create_tempdir(Dir0, Ch) ->
-    % Expect fairly standard unix.
+    %% Expect fairly standard unix.
     Dir = Dir0++[Ch],
     case file:make_dir(Dir) of
 	{error, eexist} ->
@@ -604,13 +596,13 @@ start_runerl_node(RunErl,Erl,Tempdir,Nodename) ->
 		   [];
 	       _ ->
 		   " -sname "++(if is_atom(Nodename) -> atom_to_list(Nodename);
-				  true -> Nodename 
-			       end)++
+				   true -> Nodename
+				end)++
 		       " -setcookie "++atom_to_list(erlang:get_cookie())
 	   end,
     spawn(fun() ->
 		  os:cmd("\""++RunErl++"\" "++Tempdir++"/ "++Tempdir++" \""++
-			 Erl++XArg++"\"")
+			     Erl++XArg++"\"")
 	  end).
 
 start_toerl_server(ToErl,Tempdir) ->
@@ -668,7 +660,7 @@ toerl_loop(Port,Acc) ->
 		_ ->
 		    toerl_loop(Port,[{Tag0,Data}|Acc])
 	    end;
-	 {Pid,{get_line,Timeout}} ->
+	{Pid,{get_line,Timeout}} ->
 	    case Acc of
 		[] ->
 		    case get_data_within(Port,Timeout,[]) of
@@ -717,10 +709,10 @@ toerl_loop(Port,Acc) ->
 	Other ->
 	    {error, {unexpected, Other}}
     end.
-	
+
 millistamp() ->
     erlang:monotonic_time(milli_seconds).
-    
+
 get_data_within(Port, X, Acc) when X =< 0 ->
     ?dbg({get_data_within, X, Acc, ?LINE}),
     receive
@@ -751,7 +743,7 @@ get_data_within(Port, Timeout, Acc) ->
     after Timeout ->
 	    timeout
     end.
-	    
+
 get_default_shell() ->
     try
 	rtnode([{putline,""},
diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index 8ae2e4b23b..e02aa2aa8d 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -21,21 +21,20 @@
 %%% Kernel application test suite.
 %%%-----------------------------------------------------------------
 -module(kernel_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 
-% Test server specific exports
+%% 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([init_per_testcase/2, end_per_testcase/2]).
 
-% Test cases must be exported.
+%% Test cases must be exported.
 -export([app_test/1, appup_test/1]).
 
-%%
-%% all/1
-%%
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     [app_test, appup_test].
@@ -61,15 +60,12 @@ init_per_testcase(_Case, Config) ->
 end_per_testcase(_Case, _Config) ->
     ok.
 
-%
-% Test cases starts here.
-%
-app_test(doc) ->
-    ["Tests the applications consistency."];
-app_test(suite) ->
-    [];
+%%
+%% Test cases starts here.
+%%
+%% Tests the applications consistency.
 app_test(Config) when is_list(Config) ->
-    ?line ok=?t:app_test(kernel),
+    ok=test_server:app_test(kernel),
     ok.
 
 
diff --git a/lib/kernel/test/kernel_config_SUITE.erl b/lib/kernel/test/kernel_config_SUITE.erl
index 4be44015c9..5f36ad995c 100644
--- a/lib/kernel/test/kernel_config_SUITE.erl
+++ b/lib/kernel/test/kernel_config_SUITE.erl
@@ -19,13 +19,15 @@
 %%
 -module(kernel_config_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, sync/1]).
 
 -export([init_per_suite/1, end_per_suite/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     [sync].
@@ -40,13 +42,9 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-init_per_suite(doc) -> [];
-init_per_suite(suite) -> [];
 init_per_suite(Config) when is_list(Config) ->
     Config.
 
-end_per_suite(doc) -> [];
-end_per_suite(suite) -> [];
 end_per_suite(Config) when is_list(Config) ->
     stop_node(init_test),
     Config.
@@ -54,7 +52,7 @@ end_per_suite(Config) when is_list(Config) ->
 config(Fd) ->
     M = from($@, atom_to_list(node())),
     io:format(Fd, "[{kernel, [{sync_nodes_optional, ['cp1@~s','cp2@~s']},"
-	          "{sync_nodes_timeout, 15000}]}].~n",
+	      "{sync_nodes_timeout, 15000}]}].~n",
 	      [M, M]).
 
 from(H, [H | T]) -> T;
@@ -67,12 +65,9 @@ from(_, []) -> [].
 %% Should be started in a CC view with:
 %% erl -sname XXX where XX not in [cp1, cp2]
 %%-----------------------------------------------------------------
-sync(doc) -> [];
-sync(suite) -> [];
 sync(Conf) when is_list(Conf) ->
-    ?line Dog = ?t:timetrap(?t:seconds(120)),
-    % Write a config file
-    Dir = ?config(priv_dir,Conf),
+    %% Write a config file
+    Dir = proplists:get_value(priv_dir,Conf),
     {ok, Fd} = file:open(Dir ++ "sys.config", [write]),
     config(Fd),
     file:close(Fd),
@@ -81,34 +76,33 @@ sync(Conf) when is_list(Conf) ->
     %% Reset wall_clock
     {T1,_} = erlang:statistics(wall_clock),
     io:format("~p~n", [{t1, T1}]),
-    ?line Command = lists:concat([lib:progname(),
-				  " -detached -sname cp1 ",
-				  "-config ", Config,
-				  " -env ERL_CRASH_DUMP erl_crash_dump.cp1"]),
+    Command = lists:concat([lib:progname(),
+			    " -detached -sname cp1 ",
+			    "-config ", Config,
+			    " -env ERL_CRASH_DUMP erl_crash_dump.cp1"]),
     io:format("Command: ~s", [Command]),
-    ?line open_port({spawn, Command}, [stream]),
+    open_port({spawn, Command}, [stream]),
     io:format("started~n"),
-    ?line ?t:sleep(12000),
+    ct:sleep(12000),
     io:format("waited12~n"),
-    ?line Host = from($@, atom_to_list(node())),
-    ?line Cp1 = list_to_atom("cp1@"++Host),
-    ?line wait_for_node(Cp1),
+    Host = from($@, atom_to_list(node())),
+    Cp1 = list_to_atom("cp1@"++Host),
+    wait_for_node(Cp1),
     io:format("waitednode~n"),
     %% Check time since last call
-    ?line {TT, T} = erlang:statistics(wall_clock),
+    {TT, T} = erlang:statistics(wall_clock),
     io:format("~p~n", [{t2, {TT, T}}]),
-    ?line stop_node(cp1),
+    stop_node(cp1),
     if
-	TT-T1 < 15000 -> ?line ?t:fail({too_short_time, TT-T1});
+	TT-T1 < 15000 -> ct:fail({too_short_time, TT-T1});
 	true -> ok
     end,
-    ?line ?t:timetrap_cancel(Dog),
     ok.
 
 wait_for_node(Node) ->
     case rpc:call(Node, init, get_status, []) of
 	{started,_} -> ok;
-	{badrpc, R} -> ?line ?t:fail({rpc_failed, R});
+	{badrpc, R} -> ct:fail({rpc_failed, R});
 	_Other -> wait_for_node(Node)
     end.
 
diff --git a/lib/kernel/test/multi_load_SUITE.erl b/lib/kernel/test/multi_load_SUITE.erl
new file mode 100644
index 0000000000..9cba6fc06e
--- /dev/null
+++ b/lib/kernel/test/multi_load_SUITE.erl
@@ -0,0 +1,419 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2012. 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%
+%%
+
+-module(multi_load_SUITE).
+-export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
+	 init_per_group/2,end_per_group/2,
+	 basic_atomic_load/1,basic_errors/1,sticky_dir/1,
+	 on_load_failing/1,ensure_modules_loaded/1,
+	 native_code/1]).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("syntax_tools/include/merl.hrl").
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
+
+all() ->
+    [basic_atomic_load,basic_errors,sticky_dir,on_load_failing,
+     ensure_modules_loaded,native_code].
+
+groups() ->
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+basic_atomic_load(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Dir = filename:join(PrivDir, multi_load_sticky_dir),
+    _ = file:make_dir(Dir),
+
+    OldPath = code:get_path(),
+    try
+	code:add_patha(Dir),
+	do_basic(Dir)
+    after
+	code:set_path(OldPath)
+    end,
+
+    ok.
+
+do_basic(Dir) ->
+    MsVer1_0 = make_modules(5, versioned_module(1)),
+    MsVer1 = [{M,filename:absname(F, Dir),Bin} || {M,F,Bin} <- MsVer1_0],
+    _ = [ok = file:write_file(F, Bin) || {_,F,Bin} <- MsVer1],
+
+    Ms = [M || {M,_,_} <- MsVer1],
+    [] = [loaded || M <- Ms, is_loaded(M)],
+
+    ok = code:atomic_load(Ms),
+    _ = [1 = M:M() || M <- Ms],
+    _ = [F = code:which(M) || {M,F,_} <- MsVer1],
+    [] = [not_loaded || M <- Ms, not is_loaded(M)],
+
+    MsVer2 = update_modules(Ms, versioned_module(2)),
+    {ok,Prepared} = code:prepare_loading(MsVer2),
+    ok = code:finish_loading(Prepared),
+    _ = [2 = M:M() || M <- Ms],
+    _ = [F = code:which(M) || {M,F,_} <- MsVer2],
+    [] = [not_loaded || M <- Ms, not is_loaded(M)],
+
+    MsVer3 = update_modules(Ms, versioned_module(2)),
+    NotPurged = lists:sort([{M,not_purged} || M <- Ms]),
+    NotPurged = atomic_load_error(MsVer3, true),
+
+    ok.
+
+versioned_module(Ver) ->
+    fun(Mod) ->
+	    ?Q(["-module('@Mod@').\n",
+		"-export(['@Mod@'/0]).\n",
+		"'@Mod@'() -> _@Ver@.\n"])
+    end.
+
+basic_errors(_Config) ->
+    atomic_load_fc([42]),
+    atomic_load_fc([{"mod","file","bin"}]),
+
+    finish_loading_fc(atom),
+    {ok,{PrepTag,_}} = code:prepare_loading([code]),
+    finish_loading_fc({PrepTag,[x]}),
+    finish_loading_fc({PrepTag,[{m,{<<>>,"",<<>>}}]}),
+    Prep = prepared_with_wrong_magic_bin(),
+    finish_loading_fc(Prep),
+
+    [{x,badfile}] = atomic_load_error([{x,"x",<<"bad">>}], false),
+    [{a,badfile},{some_nonexistent_file,nofile}] =
+	atomic_load_error([some_nonexistent_file,{a,"a",<<>>}],
+			  false),
+
+    %% Modules mentioned more than once.
+    Mods = make_modules(2, fun basic_module/1),
+    Ms = [M || {M,_,_} <- Mods],
+    DupMods = Mods ++ [mnesia] ++ Mods ++ [mnesia],
+    DupErrors0 = lists:sort([mnesia|Ms]),
+    DupErrors = [{M,duplicated} || M <- DupErrors0],
+    DupErrors = atomic_load_error(DupMods, false),
+
+    ok.
+
+atomic_load_fc(L) ->
+    {'EXIT',{function_clause,[{code,atomic_load,[L],_}|_]}} =
+	(catch code:atomic_load(L)),
+    {'EXIT',{function_clause,[{code,prepare_loading,[L],_}|_]}} =
+	(catch code:prepare_loading(L)).
+
+finish_loading_fc(Term) ->
+    {'EXIT',{function_clause,[{code,finish_loading,[Term],_}|_]}} =
+	(catch code:finish_loading(Term)).
+
+prepared_with_wrong_magic_bin() ->
+    {ok,Prep} = code:prepare_loading([?MODULE]),
+    prep_magic(Prep).
+
+prep_magic([H|T]) ->
+    [prep_magic(H)|prep_magic(T)];
+prep_magic(Tuple) when is_tuple(Tuple) ->
+    L = prep_magic(tuple_to_list(Tuple)),
+    list_to_tuple(L);
+prep_magic(Bin) when is_binary(Bin) ->
+    try erlang:has_prepared_code_on_load(Bin) of
+	false ->
+	    %% Create a different kind of magic binary.
+	    ets:match_spec_compile([{'_',[true],['$_']}])
+    catch
+	_:_ ->
+	    Bin
+    end;
+prep_magic(Other) ->
+    Other.
+
+sticky_dir(_Config) ->
+    Mod0 = make_module(lists, fun basic_module/1),
+    Mod1 = make_module(gen_server, fun basic_module/1),
+    Ms = [Mod0,Mod1],
+    SD = sticky_directory,
+    StickyErrors = [{gen_server,SD},{lists,SD}],
+    StickyErrors = atomic_load_error(Ms, true),
+
+    ok.
+
+on_load_failing(_Config) ->
+    OnLoad = make_modules(1, fun on_load_module/1),
+    [{OnLoadMod,_,_}] = OnLoad,
+    Ms = make_modules(10, fun basic_module/1) ++ OnLoad,
+
+    %% Fail because there is a module with on_load in the list.
+    on_load_failure(OnLoadMod, Ms),
+    on_load_failure(OnLoadMod, [lists:last(Ms)]),
+
+    %% Fail because there already is a pending on_load.
+    [{HangingOnLoad,_,_}|_] = Ms,
+    spawn_hanging_on_load(HangingOnLoad),
+    NoOnLoadMs = lists:droplast(Ms),
+    {error,[{HangingOnLoad,pending_on_load}]} =
+	code:atomic_load(NoOnLoadMs),
+    hanging_on_load ! stop_hanging_and_unload,
+
+    ok.
+
+on_load_failure(OnLoadMod, Ms) ->
+    [{OnLoadMod,on_load_not_allowed}] = atomic_load_error(Ms, false).
+
+spawn_hanging_on_load(Mod) ->
+    {Mod,Name,Bin} = make_module(Mod, "unknown",
+				 fun(_) ->
+					 hanging_on_load_module(Mod)
+				 end),
+    spawn_link(fun() ->
+		       {error,on_load_failure} =
+			   code:load_binary(Mod, Name, Bin)
+	       end).
+
+hanging_on_load_module(Mod) ->
+    ?Q(["-module('@Mod@').\n",
+	"-on_load(hang/0).\n",
+	"hang() ->\n"
+	"  register(hanging_on_load, self()),\n"
+	"  receive _ -> unload end.\n"]).
+
+ensure_modules_loaded(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Dir = filename:join(PrivDir, multi_load_ensure_modules_loaded),
+    _ = file:make_dir(Dir),
+
+    OldPath = code:get_path(),
+    try
+	code:add_patha(Dir),
+	do_ensure_modules_loaded(Dir)
+    after
+	code:set_path(OldPath)
+    end,
+
+    ok.
+
+do_ensure_modules_loaded(Dir) ->
+    %% Create a dummy "lists" module and place it in our code path.
+    {lists,ListsFile,ListsCode} = make_module(lists, fun basic_module/1),
+    ok = file:write_file(filename:absname(ListsFile, Dir), ListsCode),
+    {error,sticky_directory} = code:load_file(lists),
+
+    %% Make a new module that we can load.
+    Mod = make_module_file(Dir, fun basic_module/1),
+    false = is_loaded(Mod),
+
+    %% Make a new module with an on_load function.
+    OLMod = make_module_file(Dir, fun on_load_module/1),
+    false = is_loaded(OLMod),
+
+    %% lists should not be loaded again; Mod and OLMod should be
+    %% loaded.  ?MODULE should not be reloaded, but there is no easy
+    %% way to test that.  Repeating modules is OK.
+    ok = code:ensure_modules_loaded([?MODULE,lists,Mod,OLMod,
+				     Mod,OLMod,Mod,lists]),
+    last = lists:last([last]),
+    true = is_loaded(Mod),
+    ok = Mod:Mod(),
+    true = is_loaded(OLMod),
+    _ = OLMod:module_info(),
+
+    %% Unload the modules that were loaded.
+    [begin
+	 code:purge(M),
+	 code:delete(M),
+	 code:purge(M),
+	 false = is_loaded(M)
+     end || M <- [Mod,OLMod]],
+
+    %% If there are some errors, all other modules should be loaded
+    %% anyway.
+    [{BadMod,BadFile,_}] = make_modules(1, fun basic_module/1),
+    ok = file:write_file(filename:absname(BadFile, Dir), <<"bad_code">>),
+    BadOLMod = make_module_file(Dir, fun failing_on_load_module/1),
+    BadEgg = bad__egg,
+    NativeMod = a_native_module,
+    NativeModFile = atom_to_list(NativeMod) ++ ".beam",
+    {NativeMod,_,NativeCode} = make_module(NativeMod, NativeModFile,
+					   fun basic_module/1, [native]),
+    ok = file:write_file(filename:absname(NativeModFile, Dir), NativeCode),
+    ModulesToLoad = [OLMod,?MODULE,Mod,BadOLMod,NativeMod,
+		     BadEgg,BadMod,lists],
+    {error,Error0} = code:ensure_modules_loaded(ModulesToLoad),
+    Error = lists:sort([{BadEgg,nofile},
+			{BadMod,badfile},
+			{BadOLMod,on_load_failure}]),
+    Error = lists:sort(Error0),
+    true = is_loaded(Mod),
+    true = is_loaded(OLMod),
+    true = is_loaded(NativeMod),
+
+    ModuleNative = case erlang:system_info(hipe_architecture) of
+		       undefined -> false;
+		       _ -> true
+		   end,
+    ModuleNative = NativeMod:module_info(native),
+
+    ok.
+
+failing_on_load_module(Mod) ->
+    ?Q(["-module('@Mod@').\n",
+	"-on_load(f/0).\n",
+	"f() -> fail.\n"]).
+
+native_code(_Config) ->
+    case erlang:system_info(hipe_architecture) of
+	undefined ->
+	    {skip,"No native support"};
+	_ ->
+	    do_native_code()
+    end.
+
+do_native_code() ->
+    CalledMod = native_called_module,
+    CallingMod = native_calling_module,
+
+    %% Create a module in native code that calls another module.
+    CallingMod = make_and_load(CallingMod,
+			       calling_module_fun(CalledMod),
+			       [native]),
+
+    %% Create a threaded-code module.
+    _ = make_and_load(CalledMod, called_module_fun(42), []),
+    42 = CallingMod:call(),
+
+    %% Now replace it with a changed module in native code.
+    code:purge(CalledMod),
+    make_and_load(CalledMod, called_module_fun(43), [native]),
+    true = test_server:is_native(CalledMod),
+    43 = CallingMod:call(),
+
+    %% Reload the called module and call it.
+    code:purge(CalledMod),
+    ModVer3 = make_module(CalledMod, "", called_module_fun(changed)),
+    ok = code:atomic_load([ModVer3]),
+    false = test_server:is_native(CalledMod),
+    changed = CallingMod:call(),
+    code:purge(CalledMod),
+
+    ok.
+
+make_and_load(Mod, Fun, Opts) ->
+    {Mod,_,Code} = make_module(Mod, "", Fun, Opts),
+    {module,Mod} = code:load_binary(Mod, "", Code),
+    Mod.
+
+calling_module_fun(Called) ->
+    fun(Mod) ->
+	    ?Q(["-module('@Mod@').\n",
+		"-export([call/0]).\n",
+		"call() -> _@Called@:f().\n"])
+    end.
+
+called_module_fun(Ret) ->
+    fun(Mod) ->
+	    ?Q(["-module('@Mod@').\n",
+		"-export([f/0]).\n",
+		"f() -> _@Ret@.\n"])
+    end.
+
+%%%
+%%% Common utilities
+%%%
+
+atomic_load_error(Modules, ErrorInFinishLoading) ->
+    {error,Errors0} = code:atomic_load(Modules),
+    {Errors1,Bool} =
+	case code:prepare_loading(Modules) of
+	    {ok,Prepared} ->
+		{error,Es0} = code:finish_loading(Prepared),
+		{Es0,true};
+	     {error,Es0} ->
+		{Es0,false}
+	end,
+    Errors = lists:sort(Errors0),
+    Errors = lists:sort(Errors1),
+    case {ErrorInFinishLoading,Bool} of
+	{B,B} ->
+	    Errors;
+	{false,true} ->
+	    ct:fail("code:prepare_loading/1 should have failed");
+	{true,false} ->
+	    ct:fail("code:prepare_loading/1 should have succeeded")
+    end.
+
+is_loaded(Mod) ->
+    case erlang:module_loaded(Mod) of
+	false ->
+	    false = code:is_loaded(Mod);
+	true ->
+	    {file,_} = code:is_loaded(Mod),
+	    true
+    end.
+
+basic_module(Mod) ->
+    ?Q(["-module('@Mod@').\n"
+	"-export(['@Mod@'/0]).\n",
+	"'@Mod@'() -> ok."]).
+
+on_load_module(Mod) ->
+    ?Q(["-module('@Mod@').\n",
+	"-on_load(f/0).\n",
+	"f() -> ok.\n"]).
+
+make_module_file(Dir, Fun) ->
+    [{Mod,File,Code}] = make_modules(1, Fun),
+    ok = file:write_file(filename:absname(File, Dir), Code),
+    Mod.
+
+make_modules(0, _) ->
+    [];
+make_modules(N, Fun) ->
+    U = erlang:unique_integer([positive]),
+    ModName = "m__" ++ integer_to_list(N) ++ "_" ++ integer_to_list(U),
+    Mod = list_to_atom(ModName),
+    ModItem = make_module(Mod, Fun),
+    [ModItem|make_modules(N-1, Fun)].
+
+update_modules(Ms, Fun) ->
+    [make_module(M, Fun) || M <- Ms].
+
+make_module(Mod, Fun) ->
+    Filename = atom_to_list(Mod) ++ ".beam",
+    make_module(Mod, Filename, Fun).
+
+make_module(Mod, Filename, Fun) ->
+    make_module(Mod, Filename, Fun, []).
+
+make_module(Mod, Filename, Fun, Opts) ->
+    Tree = Fun(Mod),
+    merl:print(Tree),
+    {ok,Mod,Code} = merl:compile(Tree, Opts),
+    {Mod,Filename,Code}.
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index 29d8d10262..782d34416b 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -20,17 +20,22 @@
 -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]).
+	 init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2]).
 -export([space_in_cwd/1, quoting/1, cmd_unicode/1, space_in_name/1, bad_command/1,
-	 find_executable/1, unix_comment_in_command/1, deep_list_command/1, evil/1]).
+	 find_executable/1, unix_comment_in_command/1, deep_list_command/1,
+         large_output_command/1, perf_counter_api/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() ->
     [space_in_cwd, quoting, cmd_unicode, space_in_name, bad_command,
-     find_executable, unix_comment_in_command, deep_list_command, evil].
+     find_executable, unix_comment_in_command, deep_list_command,
+     large_output_command, perf_counter_api].
 
 groups() ->
     [].
@@ -47,16 +52,19 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+init_per_testcase(_TC,Config) ->
+    Config.
+
+end_per_testcase(_,_Config) ->
+    ok.
 
-space_in_cwd(doc) ->
-    "Test that executing a command in a current working directory "
-	"with space in its name works.";
-space_in_cwd(suite) -> [];
+%% Test that executing a command in a current working directory
+%% with space in its name works.
 space_in_cwd(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Dirname = filename:join(PrivDir, "cwd with space"),
-    ?line ok = file:make_dir(Dirname),
-    ?line ok = file:set_cwd(Dirname),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Dirname = filename:join(PrivDir, "cwd with space"),
+    ok = file:make_dir(Dirname),
+    ok = file:set_cwd(Dirname),
 
     %% Using `more' gives the almost the same result on both Unix and Windows.
 
@@ -67,70 +75,66 @@ space_in_cwd(Config) when is_list(Config) ->
 		  "more </dev/null"
 	  end,
 
-    ?line case os:cmd(Cmd) of
-	      [] -> ok;				% Unix.
-	      "\r\n" -> ok;			% Windows.
-	      Other ->
-		  ?line test_server:fail({unexpected, Other})
-	  end,
+    case os:cmd(Cmd) of
+	[] -> ok;				% Unix.
+	"\r\n" -> ok;			% Windows.
+	Other ->
+	    ct:fail({unexpected, Other})
+    end,
 
-    ?t:sleep(5),
-    ?line [] = receive_all(),
+    ct:sleep(5),
+    [] = receive_all(),
     ok.
 
-quoting(doc) -> "Test that various ways of quoting arguments work.";
-quoting(suite) -> [];
+%% Test that various ways of quoting arguments work.
 quoting(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line Echo = filename:join(DataDir, "my_echo"),
-
-    ?line comp("one", os:cmd(Echo ++ " one")),
-    ?line comp("one::two", os:cmd(Echo ++ " one two")),
-    ?line comp("one two", os:cmd(Echo ++ " \"one two\"")),
-    ?line comp("x::one two::y", os:cmd(Echo ++ " x \"one two\" y")),
-    ?line comp("x::one two", os:cmd(Echo ++ " x \"one two\"")),
-    ?line comp("one two::y", os:cmd(Echo ++ " \"one two\" y")),
-    ?line comp("x::::y", os:cmd(Echo ++ " x \"\" y")),
-    ?t:sleep(5),
-    ?line [] = receive_all(),
+    DataDir = proplists:get_value(data_dir, Config),
+    Echo = filename:join(DataDir, "my_echo"),
+
+    comp("one", os:cmd(Echo ++ " one")),
+    comp("one::two", os:cmd(Echo ++ " one two")),
+    comp("one two", os:cmd(Echo ++ " \"one two\"")),
+    comp("x::one two::y", os:cmd(Echo ++ " x \"one two\" y")),
+    comp("x::one two", os:cmd(Echo ++ " x \"one two\"")),
+    comp("one two::y", os:cmd(Echo ++ " \"one two\" y")),
+    comp("x::::y", os:cmd(Echo ++ " x \"\" y")),
+    ct:sleep(5),
+    [] = receive_all(),
     ok.
 
 
-cmd_unicode(doc) -> "Test that unicode arguments work.";
-cmd_unicode(suite) -> [];
+%% Test that unicode arguments work.
 cmd_unicode(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line Echo = filename:join(DataDir, "my_echo"),
-
-    ?line comp("one", os:cmd(Echo ++ " one")),
-    ?line comp("one::two", os:cmd(Echo ++ " one two")),
-    ?line comp("åäö::ϼΩ", os:cmd(Echo ++ " åäö " ++ [1020, 937])),
-    ?t:sleep(5),
-    ?line [] = receive_all(),
+    DataDir = proplists:get_value(data_dir, Config),
+    Echo = filename:join(DataDir, "my_echo"),
+
+    comp("one", os:cmd(Echo ++ " one")),
+    comp("one::two", os:cmd(Echo ++ " one two")),
+    comp("åäö::ϼΩ", os:cmd(Echo ++ " åäö " ++ [1020, 937])),
+    ct:sleep(5),
+    [] = receive_all(),
     ok.
 
 
-space_in_name(doc) ->
-    "Test that program with a space in its name can be executed.";
-space_in_name(suite) -> [];
+%% Test that program with a space in its name can be executed.
 space_in_name(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line DataDir = ?config(data_dir, Config),
-    ?line Spacedir = filename:join(PrivDir, "program files"),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    Spacedir = filename:join(PrivDir, "program files"),
     Ext = case os:type() of
 	      {win32,_} -> ".exe";
 	      _ -> ""
 	  end,
-    ?line OrigEcho = filename:join(DataDir, "my_echo" ++ Ext),
-    ?line Echo0 = filename:join(Spacedir, "my_echo" ++ Ext),
+    OrigEcho = filename:join(DataDir, "my_echo" ++ Ext),
+    Echo0 = filename:join(Spacedir, "my_echo" ++ Ext),
 
     %% Copy the `my_echo' program to a directory whose name contains a space.
 
-    ?line ok = file:make_dir(Spacedir),
-    ?line {ok, Bin} = file:read_file(OrigEcho),
-    ?line ok = file:write_file(Echo0, Bin),
-    ?line Echo = filename:nativename(Echo0),
-    ?line ok = file:change_mode(Echo, 8#777),	% Make it executable on Unix.
+    ok = file:make_dir(Spacedir),
+    {ok, Bin} = file:read_file(OrigEcho),
+    ok = file:write_file(Echo0, Bin),
+    Echo = filename:nativename(Echo0),
+    ok = file:change_mode(Echo, 8#777),	% Make it executable on Unix.
 
     %% Run the echo program.
     %% Quoting on windows depends on if the full path of the executable
@@ -146,78 +150,74 @@ space_in_name(Config) when is_list(Config) ->
 		_ ->
 		    "\""
 	    end,
-    ?line comp("", os:cmd(Quote ++ Echo ++ Quote)),
-    ?line comp("a::b::c", os:cmd(Quote ++ Echo ++ Quote ++ " a b c")),
-    ?t:sleep(5),
-    ?line [] = receive_all(),
+    comp("", os:cmd(Quote ++ Echo ++ Quote)),
+    comp("a::b::c", os:cmd(Quote ++ Echo ++ Quote ++ " a b c")),
+    ct:sleep(5),
+    [] = receive_all(),
     ok.
 
-bad_command(doc) ->
-    "Check that a bad command doesn't crasch the server or the emulator (it used to).";
-bad_command(suite) -> [];
+%% Check that a bad command doesn't crasch the server or the emulator (it used to).
 bad_command(Config) when is_list(Config) ->
-    ?line catch os:cmd([a|b]),
-    ?line catch os:cmd({bad, thing}),
+    catch os:cmd([a|b]),
+    catch os:cmd({bad, thing}),
 
     %% This should at least not crash (on Unix it typically returns
     %% a message from the shell).
-    ?line os:cmd("xxxxx"),
+    os:cmd("xxxxx"),
 
     ok.
 
-find_executable(suite) -> [];
-find_executable(doc) -> [];
 find_executable(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
-	    ?line DataDir = filename:join(?config(data_dir, Config), "win32"),
-	    ?line ok = file:set_cwd(filename:join([DataDir, "current"])),
-	    ?line Bin = filename:join(DataDir, "bin"),
-	    ?line Abin = filename:join(DataDir, "abin"),
-	    ?line UsrBin = filename:join([DataDir, "usr", "bin"]),
-	    ?line {ok, Current} = file:get_cwd(),
+	    DataDir = filename:join(proplists:get_value(data_dir, Config), "win32"),
+	    ok = file:set_cwd(filename:join([DataDir, "current"])),
+	    Bin = filename:join(DataDir, "bin"),
+	    Abin = filename:join(DataDir, "abin"),
+	    UsrBin = filename:join([DataDir, "usr", "bin"]),
+	    {ok, Current} = file:get_cwd(),
 
-	    ?line Path = lists:concat([Bin, ";", Abin, ";", UsrBin]),
-	    ?line io:format("Path = ~s", [Path]),
+	    Path = lists:concat([Bin, ";", Abin, ";", UsrBin]),
+	    io:format("Path = ~s", [Path]),
 
 	    %% Search for programs in Bin (second element in PATH).
-	    ?line find_exe(Abin, "my_ar", ".exe", Path),
-	    ?line find_exe(Abin, "my_ascii", ".com", Path),
-	    ?line find_exe(Abin, "my_adb", ".bat", Path),
+	    find_exe(Abin, "my_ar", ".exe", Path),
+	    find_exe(Abin, "my_ascii", ".com", Path),
+	    find_exe(Abin, "my_adb", ".bat", Path),
 	    %% OTP-3626 find names of executables given with extension
-	    ?line find_exe(Abin, "my_ar.exe", "", Path),
-	    ?line find_exe(Abin, "my_ascii.com", "", Path),
-	    ?line find_exe(Abin, "my_adb.bat", "", Path),
-	    ?line find_exe(Abin, "my_ar.EXE", "", Path),
-	    ?line find_exe(Abin, "my_ascii.COM", "", Path),
-	    ?line find_exe(Abin, "MY_ADB.BAT", "", Path),
+	    find_exe(Abin, "my_ar.exe", "", Path),
+	    find_exe(Abin, "my_ascii.com", "", Path),
+	    find_exe(Abin, "my_adb.bat", "", Path),
+	    find_exe(Abin, "my_ar.EXE", "", Path),
+	    find_exe(Abin, "my_ascii.COM", "", Path),
+	    find_exe(Abin, "MY_ADB.BAT", "", Path),
 
 	    %% Search for programs in Abin (second element in PATH).
-	    ?line find_exe(Abin, "my_ar", ".exe", Path),
-	    ?line find_exe(Abin, "my_ascii", ".com", Path),
-	    ?line find_exe(Abin, "my_adb", ".bat", Path),
+	    find_exe(Abin, "my_ar", ".exe", Path),
+	    find_exe(Abin, "my_ascii", ".com", Path),
+	    find_exe(Abin, "my_adb", ".bat", Path),
 
 	    %% Search for programs in the current working directory.
-	    ?line find_exe(Current, "my_program", ".exe", Path),
-	    ?line find_exe(Current, "my_command", ".com", Path),
-	    ?line find_exe(Current, "my_batch", ".bat", Path),
+	    find_exe(Current, "my_program", ".exe", Path),
+	    find_exe(Current, "my_command", ".com", Path),
+	    find_exe(Current, "my_batch", ".bat", Path),
 	    ok;
 	{unix, _}  ->
-	    DataDir = ?config(data_dir, Config),
+	    DataDir = proplists:get_value(data_dir, Config),
 
 	    %% Smoke test.
 	    case lib:progname() of
 		erl ->
-		    ?line ErlPath = os:find_executable("erl"),
-		    ?line true = is_list(ErlPath),
-		    ?line true = filelib:is_regular(ErlPath);
+		    ErlPath = os:find_executable("erl"),
+		    true = is_list(ErlPath),
+		    true = filelib:is_regular(ErlPath);
 		_ ->
 		    %% Don't bother -- the progname could include options.
 		    ok
 	    end,
 
 	    %% Never return a directory name.
-	    ?line false = os:find_executable("unix", [DataDir]),
+	    false = os:find_executable("unix", [DataDir]),
 	    ok
     end.
 
@@ -233,29 +233,23 @@ find_exe(Where, Name, Ext, Path) ->
 		Other ->
 		    io:format("Expected ~p; got (converted to absolute) ~p",
 			      [Expected, Other]),
-		    test_server:fail()
+		    ct:fail(failed)
 	    end;
 	Other ->
 	    io:format("Expected ~p; got ~p", [Expected, Other]),
-	    test_server:fail()
+	    ct:fail(failed)
     end.
 
-unix_comment_in_command(doc) ->
-    "OTP-1805: Test that os:cmd(\"ls #\") works correctly (used to hang).";
-unix_comment_in_command(suite) -> [];
+%% OTP-1805: Test that os:cmd(\ls #\) works correctly (used to hang).
 unix_comment_in_command(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(20)),
-    ?line Priv = ?config(priv_dir, Config),
-    ?line ok = file:set_cwd(Priv),
-    ?line _ = os:cmd("ls #"),			% Any result is ok.
-    ?t:sleep(5),
-    ?line [] = receive_all(),
-    ?line test_server:timetrap_cancel(Dog),
+    Priv = proplists:get_value(priv_dir, Config),
+    ok = file:set_cwd(Priv),
+    _ = os:cmd("ls #"),			% Any result is ok.
+    ct:sleep(5),
+    [] = receive_all(),
     ok.
 
-deep_list_command(doc) ->
-    "Check that a deep list in command works equally on unix and on windows.";
-deep_list_command(suite) -> [];
+%% Check that a deep list in command works equally on unix and on windows.
 deep_list_command(Config) when is_list(Config) ->
     %% As a 'io_lib' module description says: "There is no guarantee that the
     %% character lists returned from some of the functions are flat, they can
@@ -267,50 +261,46 @@ deep_list_command(Config) when is_list(Config) ->
     %% FYI: [$e, $c, "ho"] =:= io_lib:format("ec~s", ["ho"])
     ok.
 
-
--define(EVIL_PROCS, 100).
--define(EVIL_LOOPS, 100).
--define(PORT_CREATOR, os_cmd_port_creator).
-evil(Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:minutes(5)),
-    Parent = self(),
-    Ps = lists:map(fun (N) ->
-			   spawn_link(fun () ->
-					      evil_loop(Parent, ?EVIL_LOOPS,N)
-				      end)
-		   end, lists:seq(1, ?EVIL_PROCS)),
-    Devil = spawn_link(fun () -> devil(hd(Ps), hd(lists:reverse(Ps))) end),
-    lists:foreach(fun (P) -> receive {P, done} -> ok end end, Ps),
-    unlink(Devil),
-    exit(Devil, kill),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-devil(P1, P2) ->
-    erlang:display({?PORT_CREATOR, whereis(?PORT_CREATOR)}),
-    (catch ?PORT_CREATOR ! lists:seq(1,1000000)),
-    (catch ?PORT_CREATOR ! lists:seq(1,666)),
-    (catch ?PORT_CREATOR ! grrrrrrrrrrrrrrrr),
-    (catch ?PORT_CREATOR ! {'EXIT', P1, buhuuu}),
-    (catch ?PORT_CREATOR ! {'EXIT', hd(erlang:ports()), buhuuu}),
-    (catch ?PORT_CREATOR ! {'EXIT', P2, arggggggg}),
-    receive after 500 -> ok end,
-    (catch exit(whereis(?PORT_CREATOR), kill)),
-    (catch ?PORT_CREATOR ! ">8|"),
-    receive after 500 -> ok end,
-    (catch exit(whereis(?PORT_CREATOR), diiiiiiiiiiiiiiiiiiiie)),
-    receive after 100 -> ok end,
-    devil(P1, P2).
-
-evil_loop(Parent, Loops, N) ->
-    Res = integer_to_list(N),
-    evil_loop(Parent, Loops, Res, "echo " ++ Res).
-
-evil_loop(Parent, 0, _Res, _Cmd) ->
-    Parent ! {self(), done};
-evil_loop(Parent, Loops, Res, Cmd) ->
-    comp(Res, os:cmd(Cmd)),
-    evil_loop(Parent, Loops-1, Res, Cmd).
+%% Test to take sure that the correct data is
+%% received when doing large commands.
+large_output_command(Config) when is_list(Config) ->
+    %% Maximum allowed on windows is 8192, so we test well below that
+    AAA = lists:duplicate(7000, $a),
+    comp(AAA,os:cmd("echo " ++ AAA)).
+
+%% Test that the os:perf_counter api works as expected
+perf_counter_api(_Config) ->
+
+    true = is_integer(os:perf_counter()),
+    true = os:perf_counter() > 0,
+
+    T1 = os:perf_counter(),
+    timer:sleep(100),
+    T2 = os:perf_counter(),
+    TsDiff = erlang:convert_time_unit(T2 - T1, perf_counter, nano_seconds),
+    ct:pal("T1: ~p~n"
+           "T2: ~p~n"
+           "TsDiff: ~p~n",
+           [T1,T2,TsDiff]),
+
+    %% We allow a 15% diff
+    true = TsDiff < 115000000,
+    true = TsDiff > 85000000,
+
+    T1Ms = os:perf_counter(1000),
+    timer:sleep(100),
+    T2Ms = os:perf_counter(1000),
+    MsDiff = T2Ms - T1Ms,
+    ct:pal("T1Ms: ~p~n"
+           "T2Ms: ~p~n"
+           "MsDiff: ~p~n",
+           [T1Ms,T2Ms,MsDiff]),
+
+    %% We allow a 15% diff
+    true = MsDiff < 115,
+    true = MsDiff > 85.
+
+%% Util functions
 
 comp(Expected, Got) ->
     case strip_nl(Got) of
@@ -319,7 +309,7 @@ comp(Expected, Got) ->
 	Other ->
 	    ok = io:format("Expected: ~ts\n", [Expected]),
 	    ok = io:format("Got:      ~ts\n", [Other]),
-	    test_server:fail()
+	    ct:fail(failed)
     end.
 
 %% Like lib:nonl/1, but strips \r as well as \n.
diff --git a/lib/kernel/test/pdict_SUITE.erl b/lib/kernel/test/pdict_SUITE.erl
index 6de4ff9f77..a89fdf4797 100644
--- a/lib/kernel/test/pdict_SUITE.erl
+++ b/lib/kernel/test/pdict_SUITE.erl
@@ -18,10 +18,9 @@
 %% %CopyrightEnd%
 %%
 -module(pdict_SUITE).
-%% NB: The ?line macro cannot be used when testing the dictionary.
 
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(M(A,B),m(A,B,?MODULE,?LINE)).
 -ifdef(DEBUG).
@@ -32,22 +31,24 @@
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
+	 mixed/1,
 	 simple/1, complicated/1, heavy/1, simple_all_keys/1, info/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 -export([other_process/2]).
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(test_server:minutes(10)),
-    [{watchdog, Dog} | Config].
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
-    [simple, complicated, heavy, simple_all_keys, info].
+    [simple, complicated, heavy, simple_all_keys, info,
+     mixed].
 
 groups() -> 
     [].
@@ -65,10 +66,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-simple(doc) ->
-    ["Tests simple functionality in process dictionary."];
-simple(suite) ->
-    [];
+%% Tests simple functionality in process dictionary.
 simple(Config) when is_list(Config) ->
     XX = get(),
     ok = match_keys(XX),
@@ -109,7 +107,7 @@ complicated(Config) when is_list(Config) ->
     Previous = get(),
     ok = match_keys(Previous),
     Previous = erase(),
-    N = case ?t:is_debug() of
+    N = case test_server:is_debug() of
 	    false -> 500000;
 	    true -> 5000
 	end,
@@ -143,10 +141,7 @@ comp_4([{{key,_}=K,{value,_}=Val}|T]) ->
     comp_4(T);
 comp_4([]) -> ok.
 
-heavy(doc) ->
-    ["Tests heavy usage of the process dictionary"];
-heavy(suite) ->
-    [];
+%% Tests heavy usage of the process dictionary.
 heavy(Config) when is_list(Config) ->
     XX = get(),
     erase(),
@@ -156,7 +151,7 @@ heavy(Config) when is_list(Config) ->
     ?M([],get()),
     time(5000),
     ?M([],get()),
-    case {os:type(),?t:is_debug()} of
+    case {os:type(),test_server:is_debug()} of
 	{_,true} -> ok;	    
 	_ ->
 	    time(50000),
@@ -185,10 +180,7 @@ simple_all_keys_del_loop([K|Ks]) ->
     ok = match_keys(get()),
     simple_all_keys_del_loop(Ks).
 
-info(doc) ->
-    ["Tests process_info(Pid, dictionary)"];
-info(suite) ->
-    [];
+%% Tests process_info(Pid, dictionary).
 info(Config) when is_list(Config) ->
     L = [a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,
 	    q,r,s,t,u,v,x,y,z,'A','B','C','D'],
@@ -369,3 +361,60 @@ match_keys(All) ->
     Ks = lists:sort([K||{K,_}<-All]),
     Ks = lists:sort(erlang:get_keys()),
     ok.
+
+
+%% Do random mixed put/erase to test grow/shrink
+%% Written for a temporary bug in gc during shrink
+mixed(_Config) ->
+    Rand0 = rand:seed_s(exsplus),
+    io:format("Random seed = ~p\n\n", [rand:export_seed_s(Rand0)]),
+
+    erts_debug:set_internal_state(available_internal_state, true),
+    try
+	C = do_mixed([10,0,100,50,1000,500,600,100,150,1,11,2,30,0],
+		     0,
+		     array:new(),
+		     1,
+		     Rand0),
+	io:format("\nDid total of ~p operations\n", [C])
+    after
+	erts_debug:set_internal_state(available_internal_state, false)
+    end.
+
+do_mixed([], _, _, C, _) ->
+    C;
+do_mixed([GoalN | Tail], GoalN, Array, C, Rand0) ->
+    io:format("Reached goal of ~p keys in dict after ~p mixed ops\n",[GoalN, C]),
+    GoalN = array:size(Array),
+    do_mixed(Tail, GoalN, Array, C, Rand0);
+do_mixed([GoalN | _]=Goals, CurrN, Array0, C, Rand0) ->
+    CurrN = array:size(Array0),
+    GrowPercent = case GoalN > CurrN of
+		      true when CurrN == 0 -> 100;
+		      true -> 75;
+		      false -> 25
+		  end,
+    {R, Rand1} = rand:uniform_s(100, Rand0),
+    case R of
+	_ when R =< GrowPercent ->   %%%%%%%%%%%%% GROW
+	    {Key, Rand2} = rand:uniform_s(10000, Rand1),
+	    case put(Key, {Key,C}) of
+		undefined ->
+		    Array1 = array:set(CurrN, Key, Array0),
+		    do_mixed(Goals, CurrN+1, Array1, C+1, Rand2);
+		_ ->
+		    do_mixed(Goals, CurrN, Array0, C+1, Rand2)
+	    end;
+
+	_ ->                          %%%%%%%%%% SHRINK
+	    {Kix, Rand2} = rand:uniform_s(CurrN, Rand1),
+	    Key = array:get(Kix-1, Array0),
+
+	    %% provoke GC during shrink
+	    erts_debug:set_internal_state(fill_heap, true),
+
+	    {Key, _} = erase(Key),
+	    Array1 = array:set(Kix-1, array:get(CurrN-1, Array0), Array0),
+	    Array2 = array:resize(CurrN-1, Array1),
+	    do_mixed(Goals, CurrN-1, Array2, C+1, Rand2)
+    end.
diff --git a/lib/kernel/test/pg2_SUITE.erl b/lib/kernel/test/pg2_SUITE.erl
index 832d2d1c27..53544be763 100644
--- a/lib/kernel/test/pg2_SUITE.erl
+++ b/lib/kernel/test/pg2_SUITE.erl
@@ -21,9 +21,9 @@
 %%-----------------------------------------------------------------
 -module(pg2_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
--define(datadir, ?config(data_dir, Config)).
--define(privdir, ?config(priv_dir, Config)).
+-include_lib("common_test/include/ct.hrl").
+-define(datadir, proplists:get_value(data_dir, Config)).
+-define(privdir, proplists:get_value(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, 
@@ -33,27 +33,23 @@
 	 otp_7277/1, otp_8259/1, otp_8653/1,
          compat/1, basic/1]).
 
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
-
 -define(TESTCASE, testcase_name).
--define(testcase, ?config(?TESTCASE, Config)).
+-define(testcase, proplists:get_value(?TESTCASE, Config)).
 
 %% Internal export.
 -export([mk_part_node_and_group/3, part2/4,
          mk_part_node/3, part1/5, p_init/3, start_proc/1, sane/0]).
 
 init_per_testcase(Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{?TESTCASE, Case}, {watchdog, Dog} | Config].
+    [{?TESTCASE, Case}| Config].
 
 end_per_testcase(_Case, _Config) ->
     test_server_ctrl:kill_slavenodes(),
-    Dog = ?config(watchdog, _Config),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [{group, tickets}].
@@ -76,67 +72,59 @@ end_per_group(_GroupName, Config) ->
 
 
 
-otp_7277(doc) ->
-    "OTP-7277. Bugfix leave().";
-otp_7277(suite) -> [];
+%% OTP-7277. Bugfix leave().
 otp_7277(Config) when is_list(Config) ->
-    ?line ok = pg2:create(a),
-    ?line ok = pg2:create(b),
+    ok = pg2:create(a),
+    ok = pg2:create(b),
     P = spawn(forever()),
-    ?line ok = pg2:join(a, P),
-    ?line ok = pg2:leave(b, P),
-    ?line true = exit(P, kill),
+    ok = pg2:join(a, P),
+    ok = pg2:leave(b, P),
+    true = exit(P, kill),
     case {pg2:get_members(a), pg2:get_local_members(a)} of
         {[], []} ->
             ok;
         _ ->
             timer:sleep(100),
-            ?line [] = pg2:get_members(a),
-            ?line [] = pg2:get_local_members(a)
+            [] = pg2:get_members(a),
+            [] = pg2:get_local_members(a)
     end,
-    ?line _ = pg2:delete(a),
-    ?line _ = pg2:delete(b),
+    _ = pg2:delete(a),
+    _ = pg2:delete(b),
     ok.
 
 -define(UNTIL(Seq), loop_until_true(fun() -> Seq end, Config)).
 -define(UNTIL_LOOP, 300).
 
-otp_8653(suite) -> [];
-otp_8653(doc) ->
-    ["OTP-8259. Member was not removed after being killed."];
+%% OTP-8259. Member was not removed after being killed.
 otp_8653(Config) when is_list(Config) ->
-    Timeout = 15,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
-
-    ?line [A, B, C] = start_nodes([a, b, c], peer, Config),
+    [A, B, C] = start_nodes([a, b, c], peer, Config),
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
-    % make b and c connected, partitioned from node() and a
-    ?line rpc_cast(B, ?MODULE, part2, [Config, node(), A, C]),
-    ?line ?UNTIL(is_ready_partition(Config)),
+    %% make b and c connected, partitioned from node() and a
+    rpc_cast(B, ?MODULE, part2, [Config, node(), A, C]),
+    ?UNTIL(is_ready_partition(Config)),
 
-    % Connect to the other partition.
-    ?line pong = net_adm:ping(B),
+    %% Connect to the other partition.
+    pong = net_adm:ping(B),
     timer:sleep(100),
-    ?line pong = net_adm:ping(C),
-    ?line _ = global:sync(),
-    ?line [A, B, C] = lists:sort(nodes()),
+    pong = net_adm:ping(C),
+    _ = global:sync(),
+    [A, B, C] = lists:sort(nodes()),
 
     G = pg2_otp_8653,
-    ?line ?UNTIL(begin
-                     GA = lists:sort(rpc:call(A, pg2, get_members, [G])),
-                     GB = lists:sort(rpc:call(B, pg2, get_members, [G])),
-                     GC = lists:sort(rpc:call(C, pg2, get_members, [G])),
-                     GT = lists:sort(pg2:get_members(G)),
-                     GA =:= GB andalso
-                     GB =:= GC andalso
-                     GC =:= GT andalso
-                     8 =:= length(GA)
-                 end),
-    ?line ok = pg2:delete(G),
-    ?line stop_nodes([A,B,C]),
-    ?line test_server:timetrap_cancel(Dog),
+    ?UNTIL(begin
+	       GA = lists:sort(rpc:call(A, pg2, get_members, [G])),
+	       GB = lists:sort(rpc:call(B, pg2, get_members, [G])),
+	       GC = lists:sort(rpc:call(C, pg2, get_members, [G])),
+	       GT = lists:sort(pg2:get_members(G)),
+	       GA =:= GB andalso
+		   GB =:= GC andalso
+		   GC =:= GT andalso
+		   8 =:= length(GA)
+	   end),
+    ok = pg2:delete(G),
+    stop_nodes([A,B,C]),
     ok.
 
 part2(Config, Main, A, C) ->
@@ -158,54 +146,48 @@ mk_part_node_and_group(File, MyPart0, Config) ->
     _ = [ok = pg2:join(G, Pid) || _ <- [1,1]],
     touch(File, "done").
 
-otp_8259(suite) -> [];
-otp_8259(doc) ->
-    ["OTP-8259. Member was not removed after being killed."];
+%% OTP-8259. Member was not removed after being killed.
 otp_8259(Config) when is_list(Config) ->
-    Timeout = 15,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
-
-    ?line [A, B, C] = start_nodes([a, b, c], peer, Config),
+    [A, B, C] = start_nodes([a, b, c], peer, Config),
 
-    ?line wait_for_ready_net(Config),
+    wait_for_ready_net(Config),
 
     G = pg2_otp_8259,
     Name = otp_8259_a_global_name,
 
-    % start different processes in both partitions
-    ?line {Pid, yes} = rpc:call(A, ?MODULE, start_proc, [Name]),
+    %% start different processes in both partitions
+    {Pid, yes} = rpc:call(A, ?MODULE, start_proc, [Name]),
 
-    ?line ok = pg2:create(G),
-    ?line ok = pg2:join(G, Pid),
+    ok = pg2:create(G),
+    ok = pg2:join(G, Pid),
 
-    % make b and c connected, partitioned from node() and a
-    ?line rpc_cast(B, ?MODULE, part1, [Config, node(), A, C, Name]),
-    ?line ?UNTIL(is_ready_partition(Config)),
+    %% make b and c connected, partitioned from node() and a
+    rpc_cast(B, ?MODULE, part1, [Config, node(), A, C, Name]),
+    ?UNTIL(is_ready_partition(Config)),
 
-    % Connect to the other partition.
-    % The resolver on node b will be called.
-    ?line pong = net_adm:ping(B),
+    %% Connect to the other partition.
+    %% The resolver on node b will be called.
+    pong = net_adm:ping(B),
     timer:sleep(100),
-    ?line pong = net_adm:ping(C),
-    ?line _ = global:sync(),
-    ?line [A, B, C] = lists:sort(nodes()),
+    pong = net_adm:ping(C),
+    _ = global:sync(),
+    [A, B, C] = lists:sort(nodes()),
 
     %% Pid has been killed by the resolver.
     %% Pid has been removed from pg2 on all nodes, in particular node B.
-    ?line ?UNTIL([] =:= rpc:call(B, pg2, get_members, [G])),
-    ?line ?UNTIL([] =:= pg2:get_members(G)),
-    ?line ?UNTIL([] =:= rpc:call(A, pg2, get_members, [G])),
-    ?line ?UNTIL([] =:= rpc:call(C, pg2, get_members, [G])),
-
-    ?line ok = pg2:delete(G),
-    ?line stop_nodes([A,B,C]),
-    ?line test_server:timetrap_cancel(Dog),
+    ?UNTIL([] =:= rpc:call(B, pg2, get_members, [G])),
+    ?UNTIL([] =:= pg2:get_members(G)),
+    ?UNTIL([] =:= rpc:call(A, pg2, get_members, [G])),
+    ?UNTIL([] =:= rpc:call(C, pg2, get_members, [G])),
+
+    ok = pg2:delete(G),
+    stop_nodes([A,B,C]),
     ok.
 
 part1(Config, Main, A, C, Name) ->
     case catch begin
 		   make_partition(Config, [Main, A], [node(), C]),
-		   ?line {_Pid, yes} = start_proc(Name)
+		   {_Pid, yes} = start_proc(Name)
 	       end of
 	{_, yes} -> ok
     end.
@@ -236,39 +218,33 @@ loop() ->
 	    exit(normal)
     end.
 
-compat(suite) -> [];
-compat(doc) ->
-    ["OTP-8259. Check that 'exchange' and 'del_member' work."];
+%% OTP-8259. Check that 'exchange' and 'del_member' work.
 compat(Config) when is_list(Config) ->
-    case ?t:is_release_available("r13b") of
+    case test_server:is_release_available("r13b") of
         true ->
-            Timeout = 15,
-            ?line Dog = test_server:timetrap({seconds,Timeout}),
             Pid = spawn(forever()),
             G = a,
-            ?line ok = pg2:create(G),
-            ?line ok = pg2:join(G, Pid),
-            ?line ok = pg2:join(G, Pid),
-            ?line {ok, A} = start_node_rel(r13, r13b, slave),
-            ?line pong = net_adm:ping(A),
-            ?line wait_for_ready_net(Config),
-            ?line {ok, _} = rpc:call(A, pg2, start, []),
-            ?line ?UNTIL([Pid,Pid] =:= rpc:call(A, pg2, get_members, [a])),
-            ?line true = exit(Pid, kill),
-            ?line ?UNTIL([] =:= pg2:get_members(a)),
-            ?line ?UNTIL([] =:= rpc:call(A, pg2, get_members, [a])),
-            ?t:stop_node(A),
-            ?line test_server:timetrap_cancel(Dog);
+            ok = pg2:create(G),
+            ok = pg2:join(G, Pid),
+            ok = pg2:join(G, Pid),
+            {ok, A} = start_node_rel(r13, r13b, slave),
+            pong = net_adm:ping(A),
+            wait_for_ready_net(Config),
+            {ok, _} = rpc:call(A, pg2, start, []),
+            ?UNTIL([Pid,Pid] =:= rpc:call(A, pg2, get_members, [a])),
+            true = exit(Pid, kill),
+            ?UNTIL([] =:= pg2:get_members(a)),
+            ?UNTIL([] =:= rpc:call(A, pg2, get_members, [a])),
+            test_server:stop_node(A),
+	    ok;
         false ->
 	    {skipped, "No support for old node"}
     end.
 
-basic(suite) -> [];
-basic(doc) ->
-    ["OTP-8259. Some basic tests."];
+%% OTP-8259. Some basic tests.
 basic(Config) when is_list(Config) ->
     _ = [pg2:delete(G) || G <- pg2:which_groups()],
-    ?line _ = [do(Cs, T, Config) || {T,Cs} <- ts()],
+    _ = [do(Cs, T, Config) || {T,Cs} <- ts()],
     ok.
 
 ts() ->
@@ -373,7 +349,7 @@ ts() ->
     ].
 
 do(Cs, T, Config) ->
-    ?t:format("*** Test ~p ***~n", [T]),
+    io:format("*** Test ~p ***~n", [T]),
     {ok,T} = (catch {do(Cs, [], [], Config),T}).
 
 do([{nodeup,N} | Cs], Ps, Ns, Config) ->
@@ -425,7 +401,7 @@ doit(N, C, Ps, Ns) ->
         Result when Result =:= R orelse R =:= ignore ->
             sane(Ns);
         Else ->
-            ?t:format("~p and ~p: expected ~p, but got ~p~n",
+            io:format("~p and ~p: expected ~p, but got ~p~n",
                       [F, As, R, Else]),
             throw({error,{F, As, R, Else}})
     end.
@@ -446,8 +422,8 @@ killit(N, P, Ps, Ns) ->
     lists:keydelete(P, 1, Ps).
 
 pr(Node, C) ->
-    _ = [?t:format("~p: ", [Node]) || Node =/= node()],
-    ?t:format("do ~p~n", [C]).
+    _ = [io:format("~p: ", [Node]) || Node =/= node()],
+    io:format("do ~p~n", [C]).
 
 get_node(N, Ns) ->
     if
@@ -475,7 +451,7 @@ replace_pids(A, Ps) ->
 
 sane(Ns) ->
     Nodes = [node()] ++ [NN || {_,NN} <- Ns],
-    _ = [?t:format("~p, pg2_table:~n   ~p~n",  % debug
+    _ = [io:format("~p, pg2_table:~n   ~p~n",  % debug
                    [N, rpc:call(N, ets, tab2list, [pg2_table])]) ||
             N <- Nodes],
     R = [case rpc:call(Node, ?MODULE, sane, []) of
@@ -509,7 +485,7 @@ wsane(Ns) ->
           Pid when is_pid(Pid), node(Pid) =:= N ->
               true =
                   lists:member(Pid, rpc:call(N, pg2, get_local_members, [G]));
-%% FIXME. Om annan nod: member, local = [].
+	  %% FIXME. Om annan nod: member, local = [].
           _ -> [] = rpc:call(N, pg2, get_local_members, [G])
       end || N <- Ns]
      || G <- pg2:which_groups()].
@@ -558,21 +534,21 @@ start_node_rel(Name, Rel, How) ->
                             Rel when is_atom(Rel) ->
                                 {[{release, atom_to_list(Rel)}], ""};
                             RelList ->
-			       {RelList, ""}
-		       end,
-    ?line Pa = filename:dirname(code:which(?MODULE)),
-    ?line Res = test_server:start_node(Name, How,
-                                       [{args,
-                                         Compat ++
-                                         " -kernel net_setuptime 100 "
-                                         " -pa " ++ Pa},
-                                        {erl, Release}]),
+				{RelList, ""}
+			end,
+    Pa = filename:dirname(code:which(?MODULE)),
+    Res = test_server:start_node(Name, How,
+				 [{args,
+				   Compat ++
+				       " -kernel net_setuptime 100 "
+				   " -pa " ++ Pa},
+				  {erl, Release}]),
     Res.
 
 start_nodes(L, How, Config) ->
     start_nodes2(L, How, 0, Config),
     Nodes = collect_nodes(0, length(L)),
-    ?line ?UNTIL([] =:= Nodes -- nodes()),
+    ?UNTIL([] =:= Nodes -- nodes()),
     %% Pinging doesn't help, we have to wait too, for nodes() to become
     %% correct on the other node.
     lists:foreach(fun(E) ->
@@ -588,7 +564,7 @@ verify_nodes(Nodes, Config) ->
 verify_nodes([], _N, _Config) ->
     [];
 verify_nodes([Node | Rest], N, Config) ->
-    ?line ?UNTIL(
+    ?UNTIL(
        case rpc:call(Node, erlang, nodes, []) of
 	   Nodes when is_list(Nodes) ->
 	       case N =:= lists:sort([Node | Nodes]) of
@@ -620,7 +596,7 @@ start_nodes2([Name | Rest], How, N, Config) ->
 		  Self ! {N, R},
 		  %% sleeping is necessary, or with peer nodes, they will
 		  %% go down again, despite {linked, false}.
-		  test_server:sleep(100000)
+		  ct:sleep(100000)
 	  end),
     start_nodes2(Rest, How, N+1, Config).
 
@@ -640,7 +616,7 @@ start_node(Name0, How, Args, Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     test_server:start_node(Name, How, [{args,
                                         Args ++ " " ++
-                                        "-kernel net_setuptime 100 "
+					    "-kernel net_setuptime 100 "
                                         "-noshell "
                                         "-pa " ++ Pa},
                                        {linked, false}]).
@@ -648,7 +624,7 @@ stop_nodes(Nodes) ->
     lists:foreach(fun(Node) -> stop_node(Node) end, Nodes).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 get_known(Node) ->
     case catch gen_server:call({global_name_server,Node},get_known,infinity) of
@@ -672,7 +648,7 @@ make_partition(Config, Part1, Part2) ->
     make_partition(Config, Part1, Part2, mk_part_node).
 
 make_partition(Config, Part1, Part2, Function) ->
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     Ns = [begin
               Name = lists:concat([atom_to_list(N),"_",msec(),".part"]),
               File = filename:join([Dir, Name]),
@@ -726,13 +702,13 @@ wait_for_ready_net(Config) ->
 
 wait_for_ready_net(Nodes0, Config) ->
     Nodes = lists:sort(Nodes0),
-    ?t:format("wait_for_ready_net ~p~n", [Nodes]),
+    io:format("wait_for_ready_net ~p~n", [Nodes]),
     ?UNTIL(begin
                lists:all(fun(N) -> Nodes =:= get_known(N) end, Nodes) and
-               lists:all(fun(N) ->
-                                 LNs = rpc:call(N, erlang, nodes, []),
-                                 Nodes =:= lists:sort([N | LNs])
-                         end, Nodes)
+		   lists:all(fun(N) ->
+				     LNs = rpc:call(N, erlang, nodes, []),
+				     Nodes =:= lists:sort([N | LNs])
+			     end, Nodes)
            end).
 
 %% To make it less probable that some low-level problem causes
@@ -788,11 +764,11 @@ file_contents(File, ContentsList, Config, LogFile) ->
            end).
 
 make_partition_file(Config) ->
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     filename:join([Dir, atom_to_list(make_partition_done)]).
 
 msec() ->
     msec(now()).
 
 msec(T) ->
-     element(1,T)*1000000000 + element(2,T)*1000 + element(3,T) div 1000.
+    element(1,T)*1000000000 + element(2,T)*1000 + element(3,T) div 1000.
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index 3e6d8492f7..a3036f011c 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -36,7 +36,7 @@
 	  file_write_file_info_a/1, file_write_file_info_b/1,
 	  file_read_file_info_opts/1, file_write_file_info_opts/1,
 	  file_write_read_file_info_opts/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]).
@@ -62,7 +62,7 @@
 
 -export([allocate/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -define(PRIM_FILE, prim_file).
@@ -105,7 +105,7 @@ groups() ->
        file_write_file_info_a, file_write_file_info_b,
        file_read_file_info_opts, file_write_file_info_opts,
        file_write_read_file_info_opts
-   ]},
+      ]},
      {errors, [],
       [e_delete, e_rename, e_make_dir, e_del_dir]},
      {compression, [],
@@ -125,7 +125,7 @@ end_per_group(_GroupName, Config) ->
 init_per_suite(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
-	    Priv = ?config(priv_dir, Config),
+	    Priv = proplists:get_value(priv_dir, Config),
 	    HasAccessTime =
 		case file:read_file_info(Priv) of
 		    {ok, #file_info{atime={_, {0, 0, 0}}}} ->
@@ -181,92 +181,86 @@ time_dist({_D1, _T1} = DT1, {_D2, _T2} = DT2) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-read_write_file(suite) -> [];
-read_write_file(doc) -> [];
 read_write_file(Config) when is_list(Config) ->
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_read_write_file"),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_read_write_file"),
 
     %% Try writing and reading back some term
-    ?line SomeTerm = {"This term",{will,be},[written,$t,$o],1,file,[]},
-    ?line ok = ?PRIM_FILE:write_file(Name,term_to_binary(SomeTerm)),
-    ?line {ok,Bin1} = ?PRIM_FILE:read_file(Name),
-    ?line SomeTerm = binary_to_term(Bin1),
-  
+    SomeTerm = {"This term",{will,be},[written,$t,$o],1,file,[]},
+    ok = ?PRIM_FILE:write_file(Name,term_to_binary(SomeTerm)),
+    {ok,Bin1} = ?PRIM_FILE:read_file(Name),
+    SomeTerm = binary_to_term(Bin1),
+
     %% Try a "null" term
-    ?line NullTerm = [],
-    ?line ok = ?PRIM_FILE:write_file(Name,term_to_binary(NullTerm)),
-    ?line {ok,Bin2} = ?PRIM_FILE:read_file(Name),
-    ?line NullTerm = binary_to_term(Bin2),
+    NullTerm = [],
+    ok = ?PRIM_FILE:write_file(Name,term_to_binary(NullTerm)),
+    {ok,Bin2} = ?PRIM_FILE:read_file(Name),
+    NullTerm = binary_to_term(Bin2),
 
     %% Try some "complicated" types
-    ?line BigNum = 123456789012345678901234567890,
-    ?line ComplTerm = {self(),make_ref(),BigNum,3.14159},
-    ?line ok = ?PRIM_FILE:write_file(Name,term_to_binary(ComplTerm)),
-    ?line {ok,Bin3} = ?PRIM_FILE:read_file(Name),
-    ?line ComplTerm = binary_to_term(Bin3),
+    BigNum = 123456789012345678901234567890,
+    ComplTerm = {self(),make_ref(),BigNum,3.14159},
+    ok = ?PRIM_FILE:write_file(Name,term_to_binary(ComplTerm)),
+    {ok,Bin3} = ?PRIM_FILE:read_file(Name),
+    ComplTerm = binary_to_term(Bin3),
 
     %% Try reading a nonexistent file
-    ?line Name2 = filename:join(RootDir, 
-				atom_to_list(?MODULE)
-				++"_nonexistent_file"),
-    ?line {error, enoent} = ?PRIM_FILE:read_file(Name2),
-    ?line {error, enoent} = ?PRIM_FILE:read_file(""),
-
-    % Try writing to a bad filename
-    ?line {error, enoent} = 
+    Name2 = filename:join(RootDir,
+			  atom_to_list(?MODULE)
+			  ++"_nonexistent_file"),
+    {error, enoent} = ?PRIM_FILE:read_file(Name2),
+    {error, enoent} = ?PRIM_FILE:read_file(""),
+
+    %% Try writing to a bad filename
+    {error, enoent} =
 	?PRIM_FILE:write_file("",term_to_binary(NullTerm)),
 
-    % Try writing something else than a binary
-    ?line {error, badarg} = ?PRIM_FILE:write_file(Name,{1,2,3}),
-    ?line {error, badarg} = ?PRIM_FILE:write_file(Name,self()),
+    %% Try writing something else than a binary
+    {error, badarg} = ?PRIM_FILE:write_file(Name,{1,2,3}),
+    {error, badarg} = ?PRIM_FILE:write_file(Name,self()),
 
     %% Some non-term binaries
-    ?line ok = ?PRIM_FILE:write_file(Name,[]),
-    ?line {ok,Bin4} = ?PRIM_FILE:read_file(Name),
-    ?line 0 = byte_size(Bin4),
+    ok = ?PRIM_FILE:write_file(Name,[]),
+    {ok,Bin4} = ?PRIM_FILE:read_file(Name),
+    0 = byte_size(Bin4),
 
-    ?line ok = ?PRIM_FILE:write_file(Name,[Bin1,[],[[Bin2]]]),
-    ?line {ok,Bin5} = ?PRIM_FILE:read_file(Name),
-    ?line {Bin1,Bin2} = split_binary(Bin5,byte_size(Bin1)),
+    ok = ?PRIM_FILE:write_file(Name,[Bin1,[],[[Bin2]]]),
+    {ok,Bin5} = ?PRIM_FILE:read_file(Name),
+    {Bin1,Bin2} = split_binary(Bin5,byte_size(Bin1)),
 
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-make_del_dir_a(suite) -> [];
-make_del_dir_a(doc) -> [];
 make_del_dir_a(Config) when is_list(Config) ->
     make_del_dir(Config, [], "_a").
 
-make_del_dir_b(suite) -> [];
-make_del_dir_b(doc) -> [];
 make_del_dir_b(Config) when is_list(Config) ->
-    ?line {ok, Handle} = ?PRIM_FILE:start(),
+    {ok, Handle} = ?PRIM_FILE:start(),
     Result = make_del_dir(Config, Handle, "_b"),
-    ?line ok = ?PRIM_FILE:stop(Handle),
+    ok = ?PRIM_FILE:stop(Handle),
     %% Just to make sure the state of the server makes a difference
-    ?line {error, einval} = ?PRIM_FILE_call(get_cwd, Handle, []),
+    {error, einval} = ?PRIM_FILE_call(get_cwd, Handle, []),
     Result.
 
 make_del_dir(Config, Handle, Suffix) ->
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_mk-dir"++Suffix),
-    ?line ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
-    ?line {error, eexist} = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
-    ?line ok = ?PRIM_FILE_call(del_dir, Handle, [NewDir]),
-    ?line {error, enoent} = ?PRIM_FILE_call(del_dir, Handle, [NewDir]),
-
-    % Make sure we are not in a directory directly under test_server
-    % as that would result in eacces errors when trying to delete '..',
-    % because there are processes having that directory as current.
-    ?line ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
-    ?line {ok, CurrentDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
+    RootDir = proplists:get_value(priv_dir,Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_mk-dir"++Suffix),
+    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
+    {error, eexist} = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
+    ok = ?PRIM_FILE_call(del_dir, Handle, [NewDir]),
+    {error, enoent} = ?PRIM_FILE_call(del_dir, Handle, [NewDir]),
+
+    %% Make sure we are not in a directory directly under test_server
+    %% as that would result in eacces errors when trying to delete '..',
+    %% because there are processes having that directory as current.
+    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
+    {ok, CurrentDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
     case {os:type(), length(NewDir) >= 260 } of
 	{{win32,_}, true} ->
 	    io:format("Skip set_cwd for windows path longer than 260 (MAX_PATH)\n", []),
@@ -277,18 +271,18 @@ make_del_dir(Config, Handle, Suffix) ->
     try
 	%% Check that we get an error when trying to create...
 	%% a deep directory
-	?line NewDir2 = filename:join(RootDir, 
-				      atom_to_list(?MODULE)
-				      ++"_mk-dir-noexist/foo"),
-	?line {error, enoent} = ?PRIM_FILE_call(make_dir, Handle, [NewDir2]),
+	NewDir2 = filename:join(RootDir,
+				atom_to_list(?MODULE)
+				++"_mk-dir-noexist/foo"),
+	{error, enoent} = ?PRIM_FILE_call(make_dir, Handle, [NewDir2]),
 	%% a nameless directory
-	?line {error, enoent} = ?PRIM_FILE_call(make_dir, Handle, [""]),
+	{error, enoent} = ?PRIM_FILE_call(make_dir, Handle, [""]),
 	%% a directory with illegal name
-	?line {error, badarg} = ?PRIM_FILE_call(make_dir, Handle, ['mk-dir']),
-	
+	{error, badarg} = ?PRIM_FILE_call(make_dir, Handle, ['mk-dir']),
+
 	%% a directory with illegal name, even if it's a (bad) list
-	?line {error, badarg} = ?PRIM_FILE_call(make_dir, Handle, [[1,2,3,{}]]),
-	
+	{error, badarg} = ?PRIM_FILE_call(make_dir, Handle, [[1,2,3,{}]]),
+
 	%% Maybe this isn't an error, exactly, but worth mentioning anyway:
 	%% ok = ?PRIM_FILE:make_dir([$f,$o,$o,0,$b,$a,$r])),
 	%% The above line works, and created a directory "./foo"
@@ -296,41 +290,37 @@ make_del_dir(Config, Handle, Suffix) ->
 	%% a directory, but with a name that incorporates the "bar" part of
 	%% the list, so that [$f,$o,$o,0,$f,$o,$o] wouldn't refer to the same
 	%% dir. But this would slow it down.
-	
+
 	%% Try deleting some bad directories
 	%% Deleting the parent directory to the current, sounds dangerous, huh?
 	%% Don't worry ;-) the parent directory should never be empty, right?
-	?line case ?PRIM_FILE_call(del_dir, Handle, [".."]) of
-		  {error, eexist} -> ok;
-		  {error, eacces} -> ok;	%OpenBSD
-		  {error, einval} -> ok		%FreeBSD
-	      end,
-	?line {error, enoent} = ?PRIM_FILE_call(del_dir, Handle, [""]),
-	?line {error, badarg} = ?PRIM_FILE_call(del_dir, Handle, [[3,2,1,{}]])
+	case ?PRIM_FILE_call(del_dir, Handle, [".."]) of
+	    {error, eexist} -> ok;
+	    {error, eacces} -> ok;	%OpenBSD
+	    {error, einval} -> ok		%FreeBSD
+	end,
+	{error, enoent} = ?PRIM_FILE_call(del_dir, Handle, [""]),
+	{error, badarg} = ?PRIM_FILE_call(del_dir, Handle, [[3,2,1,{}]])
     after
-	?line ok = ?PRIM_FILE_call(set_cwd, Handle, [CurrentDir])
+	ok = ?PRIM_FILE_call(set_cwd, Handle, [CurrentDir])
     end,
     ok.
 
-cur_dir_0a(suite) -> [];
-cur_dir_0a(doc) -> [];
 cur_dir_0a(Config) when is_list(Config) ->
     cur_dir_0(Config, []).
 
-cur_dir_0b(suite) -> [];
-cur_dir_0b(doc) -> [];
 cur_dir_0b(Config) when is_list(Config) ->
-    ?line {ok, Handle} = ?PRIM_FILE:start(),
+    {ok, Handle} = ?PRIM_FILE:start(),
     Result = cur_dir_0(Config, Handle),
-    ?line ok = ?PRIM_FILE:stop(Handle),
+    ok = ?PRIM_FILE:stop(Handle),
     Result.
 
 cur_dir_0(Config, Handle) ->
     %% Find out the current dir, and cd to it ;-)
-    ?line {ok,BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
-    ?line Dir1 = BaseDir ++ "", %% Check that it's a string
-    ?line ok = ?PRIM_FILE_call(set_cwd, Handle, [Dir1]),
-    ?line DirName = atom_to_list(?MODULE) ++
+    {ok,BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
+    Dir1 = BaseDir ++ "", %% Check that it's a string
+    ok = ?PRIM_FILE_call(set_cwd, Handle, [Dir1]),
+    DirName = atom_to_list(?MODULE) ++
 	case Handle of
 	    [] ->
 		"_curdir";
@@ -339,9 +329,9 @@ cur_dir_0(Config, Handle) ->
 	end,
 
     %% Make a new dir, and cd to that
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line NewDir = filename:join(RootDir, DirName),
-    ?line ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
+    RootDir = proplists:get_value(priv_dir,Config),
+    NewDir = filename:join(RootDir, DirName),
+    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
     case {os:type(), length(NewDir) >= 260} of
 	{{win32,_}, true} ->
 	    io:format("Skip set_cwd for windows path longer than 260 (MAX_PATH):\n"),
@@ -361,7 +351,7 @@ cur_dir_0(Config, Handle) ->
 	    %% Delete the directory and return to the old current directory
 	    %% and check that the created file isn't there (too!)
 	    expect({error, einval}, {error, eacces}, {error, eexist},
-		 ?PRIM_FILE_call(del_dir, Handle, [NewDir])),
+		   ?PRIM_FILE_call(del_dir, Handle, [NewDir])),
 	    ?PRIM_FILE_call(delete, Handle, [UncommonName]),
 	    {ok,[]} = ?PRIM_FILE_call(list_dir, Handle, ["."]),
 	    ok = ?PRIM_FILE_call(set_cwd, Handle, [Dir1]),
@@ -375,13 +365,13 @@ cur_dir_0(Config, Handle) ->
     end,
 
     %% Try doing some bad things
-    ?line {error, badarg} = 
+    {error, badarg} =
 	?PRIM_FILE_call(set_cwd, Handle, [{foo,bar}]),
-    ?line {error, enoent} = 
+    {error, enoent} =
 	?PRIM_FILE_call(set_cwd, Handle, [""]),
-    ?line {error, enoent} = 
+    {error, enoent} =
 	?PRIM_FILE_call(set_cwd, Handle, [".......a......"]),
-    ?line {ok,BaseDir} = 
+    {ok,BaseDir} =
 	?PRIM_FILE_call(get_cwd, Handle, []), %% Still there?
 
     %% On Windows, there should only be slashes, no backslashes,
@@ -389,44 +379,40 @@ cur_dir_0(Config, Handle) ->
     %% (The test is harmless on Unix, because filenames usually
     %% don't contain backslashes.)
 
-    ?line {ok, BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
-    ?line false = lists:member($\\, BaseDir),
+    {ok, BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
+    false = lists:member($\\, BaseDir),
 
     ok.
 
 %% Tests ?PRIM_FILE:get_cwd/1.
 
-cur_dir_1a(suite) -> [];
-cur_dir_1a(doc) -> [];
 cur_dir_1a(Config) when is_list(Config) ->
     cur_dir_1(Config, []).
 
-cur_dir_1b(suite) -> [];
-cur_dir_1b(doc) -> [];
 cur_dir_1b(Config) when is_list(Config) ->
-    ?line {ok, Handle} = ?PRIM_FILE:start(),
+    {ok, Handle} = ?PRIM_FILE:start(),
     Result = cur_dir_1(Config, Handle),
-    ?line ok = ?PRIM_FILE:stop(Handle),
+    ok = ?PRIM_FILE:stop(Handle),
     Result.
 
 cur_dir_1(Config, Handle) ->
-    ?line case os:type() of
-	      {win32, _} ->
-		  win_cur_dir_1(Config, Handle);
-	      _ ->
-		  ?line {error, enotsup} =
-		      ?PRIM_FILE_call(get_cwd, Handle, ["d:"])
-	  end,
+    case os:type() of
+	{win32, _} ->
+	    win_cur_dir_1(Config, Handle);
+	_ ->
+	    {error, enotsup} =
+		?PRIM_FILE_call(get_cwd, Handle, ["d:"])
+    end,
     ok.
-	
+
 win_cur_dir_1(_Config, Handle) ->
-    ?line {ok, BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
+    {ok, BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
 
     %% Get the drive letter from the current directory,
     %% and try to get current directory for that drive.
 
-    ?line [Drive, $:|_] = BaseDir,
-    ?line {ok, BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, [[Drive, $:]]),
+    [Drive, $:|_] = BaseDir,
+    {ok, BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, [[Drive, $:]]),
     io:format("BaseDir = ~s\n", [BaseDir]),
 
     %% Unfortunately, there is no way to move away from the
@@ -439,440 +425,405 @@ win_cur_dir_1(_Config, Handle) ->
 
 
 
-open1(suite) -> [];
-open1(doc) -> [];
 open1(Config) when is_list(Config) ->
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_files"),
-    ?line ok = ?PRIM_FILE:make_dir(NewDir),
-    ?line Name = filename:join(NewDir, "foo1.fil"),
-    ?line {ok,Fd1} = ?PRIM_FILE:open(Name, [read, write]),
-    ?line {ok,Fd2} = ?PRIM_FILE:open(Name, [read]),
-    ?line Str = "{a,tuple}.\n",
-    ?line Length = length(Str),
-    ?line ?PRIM_FILE:write(Fd1,Str),
-    ?line {ok,0} = ?PRIM_FILE:position(Fd1,bof),
-    ?line {ok, Str} = ?PRIM_FILE:read(Fd1,Length),
-    ?line case ?PRIM_FILE:read(Fd2,Length) of
-	      {ok,Str} -> Str;
-	      eof -> Str
-	  end,
-    ?line ok = ?PRIM_FILE:close(Fd2),
-    ?line {ok,0} = ?PRIM_FILE:position(Fd1,bof),
-    ?line ok = ?PRIM_FILE:truncate(Fd1),
-    ?line eof = ?PRIM_FILE:read(Fd1,Length),
-    ?line ok = ?PRIM_FILE:close(Fd1),
-    ?line {ok,Fd3} = ?PRIM_FILE:open(Name, [read]),
-    ?line eof = ?PRIM_FILE:read(Fd3,Length),
-    ?line ok = ?PRIM_FILE:close(Fd3),
+    RootDir = proplists:get_value(priv_dir,Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_files"),
+    ok = ?PRIM_FILE:make_dir(NewDir),
+    Name = filename:join(NewDir, "foo1.fil"),
+    {ok,Fd1} = ?PRIM_FILE:open(Name, [read, write]),
+    {ok,Fd2} = ?PRIM_FILE:open(Name, [read]),
+    Str = "{a,tuple}.\n",
+    Length = length(Str),
+    ?PRIM_FILE:write(Fd1,Str),
+    {ok,0} = ?PRIM_FILE:position(Fd1,bof),
+    {ok, Str} = ?PRIM_FILE:read(Fd1,Length),
+    {ok, Str} = ?PRIM_FILE:read(Fd2,Length),
+    ok = ?PRIM_FILE:close(Fd2),
+    {ok,0} = ?PRIM_FILE:position(Fd1,bof),
+    ok = ?PRIM_FILE:truncate(Fd1),
+    eof = ?PRIM_FILE:read(Fd1,Length),
+    ok = ?PRIM_FILE:close(Fd1),
+    {ok,Fd3} = ?PRIM_FILE:open(Name, [read]),
+    eof = ?PRIM_FILE:read(Fd3,Length),
+    ok = ?PRIM_FILE:close(Fd3),
     ok.
 
 %% Tests all open modes.
 
-modes(suite) -> [];
-modes(doc) -> [];
 modes(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_open_modes"),
-    ?line ok = ?PRIM_FILE:make_dir(NewDir),
-    ?line Name1 = filename:join(NewDir, "foo1.fil"),
-    ?line Marker = "hello, world",
-    ?line Length = length(Marker),
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_open_modes"),
+    ok = ?PRIM_FILE:make_dir(NewDir),
+    Name1 = filename:join(NewDir, "foo1.fil"),
+    Marker = "hello, world",
+    Length = length(Marker),
 
     %% write
-    ?line {ok, Fd1} = ?PRIM_FILE:open(Name1, [write]),
-    ?line ok = ?PRIM_FILE:write(Fd1, Marker),
-    ?line ok = ?PRIM_FILE:write(Fd1, ".\n"),
-    ?line ok = ?PRIM_FILE:close(Fd1),
+    {ok, Fd1} = ?PRIM_FILE:open(Name1, [write]),
+    ok = ?PRIM_FILE:write(Fd1, Marker),
+    ok = ?PRIM_FILE:write(Fd1, ".\n"),
+    ok = ?PRIM_FILE:close(Fd1),
 
     %% read
-    ?line {ok, Fd2} = ?PRIM_FILE:open(Name1, [read]),
-    ?line {ok, Marker} = ?PRIM_FILE:read(Fd2, Length),
-    ?line ok = ?PRIM_FILE:close(Fd2),
+    {ok, Fd2} = ?PRIM_FILE:open(Name1, [read]),
+    {ok, Marker} = ?PRIM_FILE:read(Fd2, Length),
+    ok = ?PRIM_FILE:close(Fd2),
 
     %% read and write
-    ?line {ok, Fd3} = ?PRIM_FILE:open(Name1, [read, write]),
-    ?line {ok, Marker} = ?PRIM_FILE:read(Fd3, Length),
-    ?line ok = ?PRIM_FILE:write(Fd3, Marker),
-    ?line ok = ?PRIM_FILE:close(Fd3),
+    {ok, Fd3} = ?PRIM_FILE:open(Name1, [read, write]),
+    {ok, Marker} = ?PRIM_FILE:read(Fd3, Length),
+    ok = ?PRIM_FILE:write(Fd3, Marker),
+    ok = ?PRIM_FILE:close(Fd3),
 
     %% read by default
-    ?line {ok, Fd4} = ?PRIM_FILE:open(Name1, []),
-    ?line {ok, Marker} = ?PRIM_FILE:read(Fd4, Length),
-    ?line ok = ?PRIM_FILE:close(Fd4),
+    {ok, Fd4} = ?PRIM_FILE:open(Name1, []),
+    {ok, Marker} = ?PRIM_FILE:read(Fd4, Length),
+    ok = ?PRIM_FILE:close(Fd4),
 
     %% read and binary
-    ?line BinaryMarker = list_to_binary(Marker),
-    ?line {ok, Fd5} = ?PRIM_FILE:open(Name1, [read, binary]),
-    ?line {ok, BinaryMarker} = ?PRIM_FILE:read(Fd5, Length),
-    ?line ok = ?PRIM_FILE:close(Fd5),
+    BinaryMarker = list_to_binary(Marker),
+    {ok, Fd5} = ?PRIM_FILE:open(Name1, [read, binary]),
+    {ok, BinaryMarker} = ?PRIM_FILE:read(Fd5, Length),
+    ok = ?PRIM_FILE:close(Fd5),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
-close(suite) -> [];
-close(doc) -> [];
 close(Config) when is_list(Config) ->
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_close.fil"),
-    ?line {ok,Fd1} = ?PRIM_FILE:open(Name, [read, write]),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_close.fil"),
+    {ok,Fd1} = ?PRIM_FILE:open(Name, [read, write]),
     %% Just closing it is no fun, we did that a million times already
     %% This is a common error, for code written before Erlang 4.3
     %% bacause then ?PRIM_FILE:open just returned a Pid, and not everyone
     %% really checked what they got.
-    ?line {'EXIT',_Msg} = (catch ok = ?PRIM_FILE:close({ok,Fd1})),
-    ?line ok = ?PRIM_FILE:close(Fd1),
+    {'EXIT',_Msg} = (catch ok = ?PRIM_FILE:close({ok,Fd1})),
+    ok = ?PRIM_FILE:close(Fd1),
 
     %% Try closing one more time
-    ?line Val = ?PRIM_FILE:close(Fd1),
-    ?line io:format("Second close gave: ~p", [Val]),
+    Val = ?PRIM_FILE:close(Fd1),
+    io:format("Second close gave: ~p", [Val]),
 
     ok.
 
-access(suite) -> [];
-access(doc) -> [];
 access(Config) when is_list(Config) ->
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_access.fil"),
-    ?line Str = "ABCDEFGH",
-    ?line {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
-    ?line ?PRIM_FILE:write(Fd1,Str),
-    ?line ok = ?PRIM_FILE:close(Fd1),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_access.fil"),
+    Str = "ABCDEFGH",
+    {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
+    ?PRIM_FILE:write(Fd1,Str),
+    ok = ?PRIM_FILE:close(Fd1),
     %% Check that we can't write when in read only mode
-    ?line {ok,Fd2} = ?PRIM_FILE:open(Name, [read]),
-    ?line case catch ?PRIM_FILE:write(Fd2,"XXXX") of
-	      ok ->
-		  test_server:fail({access,write});
-	      _ ->
-		  ok
-	  end,
-    ?line ok = ?PRIM_FILE:close(Fd2),
-    ?line {ok, Fd3} = ?PRIM_FILE:open(Name, [read]),
-    ?line {ok, Str} = ?PRIM_FILE:read(Fd3,length(Str)),
-    ?line ok = ?PRIM_FILE:close(Fd3),
+    {ok,Fd2} = ?PRIM_FILE:open(Name, [read]),
+    case catch ?PRIM_FILE:write(Fd2,"XXXX") of
+	ok ->
+	    ct:fail({access,write});
+	_ ->
+	    ok
+    end,
+    ok = ?PRIM_FILE:close(Fd2),
+    {ok, Fd3} = ?PRIM_FILE:open(Name, [read]),
+    {ok, Str} = ?PRIM_FILE:read(Fd3,length(Str)),
+    ok = ?PRIM_FILE:close(Fd3),
 
     ok.
 
 %% Tests ?PRIM_FILE:read/2 and ?PRIM_FILE:write/2.
 
-read_write(suite) -> [];
-read_write(doc) -> [];
 read_write(Config) when is_list(Config) ->
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_read_write"),
-    ?line ok = ?PRIM_FILE:make_dir(NewDir),
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_read_write"),
+    ok = ?PRIM_FILE:make_dir(NewDir),
 
     %% Raw file.
-    ?line Name = filename:join(NewDir, "raw.fil"),
-    ?line {ok, Fd} = ?PRIM_FILE:open(Name, [read, write]),
-    ?line read_write_test(Fd),
+    Name = filename:join(NewDir, "raw.fil"),
+    {ok, Fd} = ?PRIM_FILE:open(Name, [read, write]),
+    read_write_test(Fd),
 
     ok.
 
 read_write_test(File) ->
-    ?line Marker = "hello, world",
-    ?line ok = ?PRIM_FILE:write(File, Marker),
-    ?line {ok, 0} = ?PRIM_FILE:position(File, 0),
-    ?line {ok, Marker} = ?PRIM_FILE:read(File, 100),
-    ?line eof = ?PRIM_FILE:read(File, 100),
-    ?line ok = ?PRIM_FILE:close(File),
+    Marker = "hello, world",
+    ok = ?PRIM_FILE:write(File, Marker),
+    {ok, 0} = ?PRIM_FILE:position(File, 0),
+    {ok, Marker} = ?PRIM_FILE:read(File, 100),
+    eof = ?PRIM_FILE:read(File, 100),
+    ok = ?PRIM_FILE:close(File),
     ok.
 
 
 %% Tests ?PRIM_FILE:pread/2 and ?PRIM_FILE:pwrite/2.
 
-pread_write(suite) -> [];
-pread_write(doc) -> [];
 pread_write(Config) when is_list(Config) ->
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_pread_write"),
-    ?line ok = ?PRIM_FILE:make_dir(NewDir),
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_pread_write"),
+    ok = ?PRIM_FILE:make_dir(NewDir),
 
     %% Raw file.
-    ?line Name = filename:join(NewDir, "raw.fil"),
-    ?line {ok, Fd} = ?PRIM_FILE:open(Name, [read, write]),
-    ?line pread_write_test(Fd),
+    Name = filename:join(NewDir, "raw.fil"),
+    {ok, Fd} = ?PRIM_FILE:open(Name, [read, write]),
+    pread_write_test(Fd),
 
     ok.
 
 pread_write_test(File) ->
-    ?line Marker = "hello, world",
-    ?line Len = length(Marker),
-    ?line ok = ?PRIM_FILE:write(File, Marker),
-    ?line {ok, Marker} = ?PRIM_FILE:pread(File, 0, 100),
-    ?line eof = ?PRIM_FILE:pread(File, 100, 1),
-    ?line ok = ?PRIM_FILE:pwrite(File, Len, Marker),
-    ?line {ok, Marker} = ?PRIM_FILE:pread(File, Len, 100),
-    ?line eof = ?PRIM_FILE:pread(File, 100, 1),
-    ?line MM = Marker ++ Marker,
-    ?line {ok, MM} = ?PRIM_FILE:pread(File, 0, 100),
-    ?line ok = ?PRIM_FILE:close(File),
+    Marker = "hello, world",
+    Len = length(Marker),
+    ok = ?PRIM_FILE:write(File, Marker),
+    {ok, Marker} = ?PRIM_FILE:pread(File, 0, 100),
+    eof = ?PRIM_FILE:pread(File, 100, 1),
+    ok = ?PRIM_FILE:pwrite(File, Len, Marker),
+    {ok, Marker} = ?PRIM_FILE:pread(File, Len, 100),
+    eof = ?PRIM_FILE:pread(File, 100, 1),
+    MM = Marker ++ Marker,
+    {ok, MM} = ?PRIM_FILE:pread(File, 0, 100),
+    ok = ?PRIM_FILE:close(File),
     ok.
 
-append(doc) -> "Test appending to a file.";
-append(suite) -> [];
+%% Test appending to a file.
 append(Config) when is_list(Config) ->
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_append"),
-    ?line ok = ?PRIM_FILE:make_dir(NewDir),
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_append"),
+    ok = ?PRIM_FILE:make_dir(NewDir),
 
-    ?line First = "First line\n",
-    ?line Second = "Seond lines comes here\n",
-    ?line Third = "And here is the third line\n",
+    First = "First line\n",
+    Second = "Seond lines comes here\n",
+    Third = "And here is the third line\n",
 
     %% Write a small text file.
-    ?line Name1 = filename:join(NewDir, "a_file.txt"),
-    ?line {ok, Fd1} = ?PRIM_FILE:open(Name1, [write]),
-    ?line ok = ?PRIM_FILE:write(Fd1, First),
-    ?line ok = ?PRIM_FILE:write(Fd1, Second),
-    ?line ok = ?PRIM_FILE:close(Fd1),
+    Name1 = filename:join(NewDir, "a_file.txt"),
+    {ok, Fd1} = ?PRIM_FILE:open(Name1, [write]),
+    ok = ?PRIM_FILE:write(Fd1, First),
+    ok = ?PRIM_FILE:write(Fd1, Second),
+    ok = ?PRIM_FILE:close(Fd1),
 
     %% Open it a again and a append a line to it.
-    ?line {ok, Fd2} = ?PRIM_FILE:open(Name1, [append]),
-    ?line ok = ?PRIM_FILE:write(Fd2, Third),
-    ?line ok = ?PRIM_FILE:close(Fd2),
+    {ok, Fd2} = ?PRIM_FILE:open(Name1, [append]),
+    ok = ?PRIM_FILE:write(Fd2, Third),
+    ok = ?PRIM_FILE:close(Fd2),
 
     %% Read it back and verify.
-    ?line Expected = list_to_binary([First, Second, Third]),
-    ?line {ok, Expected} = ?PRIM_FILE:read_file(Name1),
+    Expected = list_to_binary([First, Second, Third]),
+    {ok, Expected} = ?PRIM_FILE:read_file(Name1),
 
     ok.
 
-exclusive(suite) -> [];
-exclusive(doc) -> "Test exclusive access to a file.";
+%% Test exclusive access to a file.
 exclusive(Config) when is_list(Config) ->
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line NewDir = filename:join(RootDir,
-				 atom_to_list(?MODULE)
-				 ++"_exclusive"),
-    ?line ok = ?PRIM_FILE:make_dir(NewDir),
-    ?line Name = filename:join(NewDir, "ex_file.txt"),
-    ?line {ok,Fd} = ?PRIM_FILE:open(Name, [write, exclusive]),
-    ?line {error, eexist} = ?PRIM_FILE:open(Name, [write, exclusive]),
-    ?line ok = ?PRIM_FILE:close(Fd),
+    RootDir = proplists:get_value(priv_dir,Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_exclusive"),
+    ok = ?PRIM_FILE:make_dir(NewDir),
+    Name = filename:join(NewDir, "ex_file.txt"),
+    {ok,Fd} = ?PRIM_FILE:open(Name, [write, exclusive]),
+    {error, eexist} = ?PRIM_FILE:open(Name, [write, exclusive]),
+    ok = ?PRIM_FILE:close(Fd),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-pos1(suite) -> [];
-pos1(doc) -> [];
 pos1(Config) when is_list(Config) ->
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_pos1.fil"),
-    ?line {ok, Fd1} = ?PRIM_FILE:open(Name, [write]),
-    ?line ?PRIM_FILE:write(Fd1,"ABCDEFGH"),
-    ?line ok        = ?PRIM_FILE:close(Fd1),
-    ?line {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_pos1.fil"),
+    {ok, Fd1} = ?PRIM_FILE:open(Name, [write]),
+    ?PRIM_FILE:write(Fd1,"ABCDEFGH"),
+    ok        = ?PRIM_FILE:close(Fd1),
+    {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
 
     %% Start pos is first char
-    ?line io:format("Relative positions"),
-    ?line {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
-    ?line {ok, 2}   = ?PRIM_FILE:position(Fd2,{cur,1}), 
-    ?line {ok, "C"} = ?PRIM_FILE:read(Fd2,1),
-    ?line {ok, 0}   = ?PRIM_FILE:position(Fd2,{cur,-3}), 
-    ?line {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
+    io:format("Relative positions"),
+    {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, 2}   = ?PRIM_FILE:position(Fd2,{cur,1}),
+    {ok, "C"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, 0}   = ?PRIM_FILE:position(Fd2,{cur,-3}),
+    {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
     %% Backwards from first char should be an error
-    ?line {ok,0}    = ?PRIM_FILE:position(Fd2,{cur,-1}),
-    ?line {error, einval} = ?PRIM_FILE:position(Fd2,{cur,-1}),
+    {ok,0}    = ?PRIM_FILE:position(Fd2,{cur,-1}),
+    {error, einval} = ?PRIM_FILE:position(Fd2,{cur,-1}),
     %% Reset position and move again
-    ?line {ok, 0}   = ?PRIM_FILE:position(Fd2,0),
-    ?line {ok, 2}   = ?PRIM_FILE:position(Fd2,{cur,2}), 
-    ?line {ok, "C"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, 0}   = ?PRIM_FILE:position(Fd2,0),
+    {ok, 2}   = ?PRIM_FILE:position(Fd2,{cur,2}),
+    {ok, "C"} = ?PRIM_FILE:read(Fd2,1),
     %% Go a lot forwards
-    ?line {ok, 13}  = ?PRIM_FILE:position(Fd2,{cur,10}), 
-    ?line eof       = ?PRIM_FILE:read(Fd2,1),
+    {ok, 13}  = ?PRIM_FILE:position(Fd2,{cur,10}),
+    eof       = ?PRIM_FILE:read(Fd2,1),
 
     %% Try some fixed positions
-    ?line io:format("Fixed positions"),
-    ?line {ok, 8}   = ?PRIM_FILE:position(Fd2,8), 
-    ?line eof = ?PRIM_FILE:read(Fd2,1),
-    ?line {ok, 8}   = ?PRIM_FILE:position(Fd2,cur), 
-    ?line eof = ?PRIM_FILE:read(Fd2,1),
-    ?line {ok, 7}   = ?PRIM_FILE:position(Fd2,7), 
-    ?line {ok, "H"} = ?PRIM_FILE:read(Fd2,1),
-    ?line {ok, 0}   = ?PRIM_FILE:position(Fd2,0), 
-    ?line {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
-    ?line {ok, 3}   = ?PRIM_FILE:position(Fd2,3), 
-    ?line {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
-    ?line {ok, 12}  = ?PRIM_FILE:position(Fd2,12), 
-    ?line eof       = ?PRIM_FILE:read(Fd2,1),
-    ?line {ok, 3}   = ?PRIM_FILE:position(Fd2,3), 
-    ?line {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
+    io:format("Fixed positions"),
+    {ok, 8}   = ?PRIM_FILE:position(Fd2,8),
+    eof = ?PRIM_FILE:read(Fd2,1),
+    {ok, 8}   = ?PRIM_FILE:position(Fd2,cur),
+    eof = ?PRIM_FILE:read(Fd2,1),
+    {ok, 7}   = ?PRIM_FILE:position(Fd2,7),
+    {ok, "H"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, 0}   = ?PRIM_FILE:position(Fd2,0),
+    {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, 3}   = ?PRIM_FILE:position(Fd2,3),
+    {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, 12}  = ?PRIM_FILE:position(Fd2,12),
+    eof       = ?PRIM_FILE:read(Fd2,1),
+    {ok, 3}   = ?PRIM_FILE:position(Fd2,3),
+    {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
     %% Try the {bof,X} notation
-    ?line {ok, 3}   = ?PRIM_FILE:position(Fd2,{bof,3}),
-    ?line {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, 3}   = ?PRIM_FILE:position(Fd2,{bof,3}),
+    {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
 
     %% Try eof positions
-    ?line io:format("EOF positions"),
-    ?line {ok, 8}   = ?PRIM_FILE:position(Fd2,{eof,0}), 
-    ?line eof       = ?PRIM_FILE:read(Fd2,1),
-    ?line {ok, 7}   = ?PRIM_FILE:position(Fd2,{eof,-1}),
-    ?line {ok, "H"} = ?PRIM_FILE:read(Fd2,1),
-    ?line {ok, 0}   = ?PRIM_FILE:position(Fd2,{eof,-8}), 
-    ?line {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
-    ?line {error, einval} = ?PRIM_FILE:position(Fd2,{eof,-9}),
+    io:format("EOF positions"),
+    {ok, 8}   = ?PRIM_FILE:position(Fd2,{eof,0}),
+    eof       = ?PRIM_FILE:read(Fd2,1),
+    {ok, 7}   = ?PRIM_FILE:position(Fd2,{eof,-1}),
+    {ok, "H"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, 0}   = ?PRIM_FILE:position(Fd2,{eof,-8}),
+    {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
+    {error, einval} = ?PRIM_FILE:position(Fd2,{eof,-9}),
     ok.
 
-pos2(suite) -> [];
-pos2(doc) -> [];
 pos2(Config) when is_list(Config) ->
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_pos2.fil"),
-    ?line {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
-    ?line ?PRIM_FILE:write(Fd1,"ABCDEFGH"),
-    ?line ok = ?PRIM_FILE:close(Fd1),
-    ?line {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
-    ?line {error, einval} = ?PRIM_FILE:position(Fd2,-1),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_pos2.fil"),
+    {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
+    ?PRIM_FILE:write(Fd1,"ABCDEFGH"),
+    ok = ?PRIM_FILE:close(Fd1),
+    {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
+    {error, einval} = ?PRIM_FILE:position(Fd2,-1),
 
     %% Make sure that we still can search after an error.
-    ?line {ok, 0}   = ?PRIM_FILE:position(Fd2, 0),
-    ?line {ok, 3}   = ?PRIM_FILE:position(Fd2, {bof,3}),
-    ?line {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, 0}   = ?PRIM_FILE:position(Fd2, 0),
+    {ok, 3}   = ?PRIM_FILE:position(Fd2, {bof,3}),
+    {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
 
-    ?line io:format("DONE"),
+    io:format("DONE"),
     ok.
 
 
-file_info_basic_file_a(suite) -> [];
-file_info_basic_file_a(doc) -> [];
 file_info_basic_file_a(Config) when is_list(Config) ->
     file_info_basic_file(Config, [], "_a").
 
-file_info_basic_file_b(suite) -> [];
-file_info_basic_file_b(doc) -> [];
 file_info_basic_file_b(Config) when is_list(Config) ->
-    ?line {ok, Handle} = ?PRIM_FILE:start(),
+    {ok, Handle} = ?PRIM_FILE:start(),
     Result = file_info_basic_file(Config, Handle, "_b"),
-    ?line ok = ?PRIM_FILE:stop(Handle),
+    ok = ?PRIM_FILE:stop(Handle),
     Result.
 
 file_info_basic_file(Config, Handle, Suffix) ->
-    ?line RootDir = ?config(priv_dir, Config),
+    RootDir = proplists:get_value(priv_dir, Config),
 
     %% Create a short file.
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_basic_test"++Suffix++".fil"),
-    ?line {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
-    ?line ?PRIM_FILE:write(Fd1, "foo bar"),
-    ?line ok = ?PRIM_FILE:close(Fd1),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_basic_test"++Suffix++".fil"),
+    {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
+    ?PRIM_FILE:write(Fd1, "foo bar"),
+    ok = ?PRIM_FILE:close(Fd1),
 
     %% Test that the file has the expected attributes.
     %% The times are tricky, so we will save them to a separate test case.
-    ?line {ok, FileInfo} = ?PRIM_FILE_call(read_file_info, Handle, [Name]),
-    ?line #file_info{size = Size, type = Type, access = Access,
-		     atime = AccessTime, mtime = ModifyTime} = 
+    {ok, FileInfo} = ?PRIM_FILE_call(read_file_info, Handle, [Name]),
+    #file_info{size = Size, type = Type, access = Access,
+	       atime = AccessTime, mtime = ModifyTime} =
 	FileInfo,
-    ?line io:format("Access ~p, Modify ~p", [AccessTime, ModifyTime]),
-    ?line Size = 7,
-    ?line Type = regular,
-    ?line Access = read_write,
-    ?line true = abs(time_dist(filter_atime(AccessTime, Config),
-			       filter_atime(ModifyTime,
-					    Config))) < 2,
-    ?line {AD, AT} = AccessTime,
-    ?line all_integers(tuple_to_list(AD) ++ tuple_to_list(AT)),
-    ?line {MD, MT} = ModifyTime,
-    ?line all_integers(tuple_to_list(MD) ++ tuple_to_list(MT)),
+    io:format("Access ~p, Modify ~p", [AccessTime, ModifyTime]),
+    Size = 7,
+    Type = regular,
+    Access = read_write,
+    true = abs(time_dist(filter_atime(AccessTime, Config),
+			 filter_atime(ModifyTime,
+				      Config))) < 2,
+    {AD, AT} = AccessTime,
+    all_integers(tuple_to_list(AD) ++ tuple_to_list(AT)),
+    {MD, MT} = ModifyTime,
+    all_integers(tuple_to_list(MD) ++ tuple_to_list(MT)),
 
     ok.
 
-file_info_basic_directory_a(suite) -> [];
-file_info_basic_directory_a(doc) -> [];
 file_info_basic_directory_a(Config) when is_list(Config) ->
     file_info_basic_directory(Config, []).
 
-file_info_basic_directory_b(suite) -> [];
-file_info_basic_directory_b(doc) -> [];
 file_info_basic_directory_b(Config) when is_list(Config) ->
-    ?line {ok, Handle} = ?PRIM_FILE:start(),
+    {ok, Handle} = ?PRIM_FILE:start(),
     Result = file_info_basic_directory(Config, Handle),
-    ?line ok = ?PRIM_FILE:stop(Handle),
+    ok = ?PRIM_FILE:stop(Handle),
     Result.
 
 file_info_basic_directory(Config, Handle) ->
     %% Note: filename:join/1 removes any trailing slash,
     %% which is essential for ?PRIM_FILE:read_file_info/1 to work on
     %% platforms such as Windows95.
-    ?line RootDir = filename:join([?config(priv_dir, Config)]),
+    RootDir = filename:join([proplists:get_value(priv_dir, Config)]),
 
     %% Test that the RootDir directory has the expected attributes.
-    ?line test_directory(RootDir, read_write, Handle),
+    test_directory(RootDir, read_write, Handle),
 
     %% Note that on Windows file systems, "/" or "c:/" are *NOT* directories.
     %% Therefore, test that ?PRIM_FILE:read_file_info/1 behaves 
     %% as if they were directories.
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line test_directory("/", read_write, Handle),
-		  ?line test_directory("c:/", read_write, Handle),
-		  ?line test_directory("c:\\", read_write, Handle);
-	      _ ->
-		  ?line test_directory("/", read, Handle)
-	  end,
+    case os:type() of
+	{win32, _} ->
+	    test_directory("/", read_write, Handle),
+	    test_directory("c:/", read_write, Handle),
+	    test_directory("c:\\", read_write, Handle);
+	_ ->
+	    test_directory("/", read, Handle)
+    end,
     ok.
 
 test_directory(Name, ExpectedAccess, Handle) ->
-    ?line {ok, FileInfo} = ?PRIM_FILE_call(read_file_info, Handle, [Name]),
-    ?line #file_info{size = Size, type = Type, access = Access,
-		     atime = AccessTime, mtime = ModifyTime} = 
+    {ok, FileInfo} = ?PRIM_FILE_call(read_file_info, Handle, [Name]),
+    #file_info{size = Size, type = Type, access = Access,
+	       atime = AccessTime, mtime = ModifyTime} =
 	FileInfo,
-    ?line io:format("Testing directory ~s", [Name]),
-    ?line io:format("Directory size is ~p", [Size]),
-    ?line io:format("Access ~p", [Access]),
-    ?line io:format("Access time ~p; Modify time~p", 
-		    [AccessTime, ModifyTime]),
-    ?line Type = directory,
-    ?line Access = ExpectedAccess,
-    ?line {AD, AT} = AccessTime,
-    ?line all_integers(tuple_to_list(AD) ++ tuple_to_list(AT)),
-    ?line {MD, MT} = ModifyTime,
-    ?line all_integers(tuple_to_list(MD) ++ tuple_to_list(MT)),
+    io:format("Testing directory ~s", [Name]),
+    io:format("Directory size is ~p", [Size]),
+    io:format("Access ~p", [Access]),
+    io:format("Access time ~p; Modify time~p",
+	      [AccessTime, ModifyTime]),
+    Type = directory,
+    Access = ExpectedAccess,
+    {AD, AT} = AccessTime,
+    all_integers(tuple_to_list(AD) ++ tuple_to_list(AT)),
+    {MD, MT} = ModifyTime,
+    all_integers(tuple_to_list(MD) ++ tuple_to_list(MT)),
     ok.
 
 all_integers([Int|Rest]) when is_integer(Int) ->
-    ?line all_integers(Rest);
+    all_integers(Rest);
 all_integers([]) ->
     ok.
 
 %% Try something nonexistent.
 
-file_info_bad_a(suite) -> [];
-file_info_bad_a(doc) -> [];
 file_info_bad_a(Config) when is_list(Config) ->
     file_info_bad(Config, []).
 
-file_info_bad_b(suite) -> [];
-file_info_bad_b(doc) -> [];
 file_info_bad_b(Config) when is_list(Config) ->
-    ?line {ok, Handle} = ?PRIM_FILE:start(),
+    {ok, Handle} = ?PRIM_FILE:start(),
     Result = file_info_bad(Config, Handle),
-    ?line ok = ?PRIM_FILE:stop(Handle),
+    ok = ?PRIM_FILE:stop(Handle),
     Result.
 
 file_info_bad(Config, Handle) ->
-    ?line RootDir = filename:join([?config(priv_dir, Config)]),
-    ?line {error, enoent} = 
+    RootDir = filename:join([proplists:get_value(priv_dir, Config)]),
+    {error, enoent} =
 	?PRIM_FILE_call(
 	   read_file_info, Handle, 
 	   [filename:join(RootDir,
@@ -881,28 +832,22 @@ file_info_bad(Config, Handle) ->
 
 %% Test that the file times behave as they should.
 
-file_info_times_a(suite) -> [];
-file_info_times_a(doc) -> [];
 file_info_times_a(Config) when is_list(Config) ->
     file_info_times(Config, [], "_a").
 
-file_info_times_b(suite) -> [];
-file_info_times_b(doc) -> [];
 file_info_times_b(Config) when is_list(Config) ->
-    ?line {ok, Handle} = ?PRIM_FILE:start(),
+    {ok, Handle} = ?PRIM_FILE:start(),
     Result = file_info_times(Config, Handle, "_b"),
-    ?line ok = ?PRIM_FILE:stop(Handle),
+    ok = ?PRIM_FILE:stop(Handle),
     Result.
 
 file_info_times(Config, Handle, Suffix) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(60)),
     %% We have to try this twice, since if the test runs across the change
     %% of a month the time diff calculations will fail. But it won't happen
     %% if you run it twice in succession.
-    ?line test_server:m_out_of_n(
-	    1,2,
-	    fun() -> ?line file_info_int(Config, Handle, Suffix) end),
-    ?line test_server:timetrap_cancel(Dog),
+    test_server:m_out_of_n(
+      1,2,
+      fun() -> file_info_int(Config, Handle, Suffix) end),
     ok.
 
 file_info_int(Config, Handle, Suffix) ->
@@ -910,55 +855,55 @@ file_info_int(Config, Handle, Suffix) ->
     %% which is essential for ?PRIM_FILE:read_file_info/1 to work on
     %% platforms such as Windows95.
 
-    ?line RootDir = filename:join([?config(priv_dir, Config)]),
-    ?line test_server:format("RootDir = ~p", [RootDir]),
+    RootDir = filename:join([proplists:get_value(priv_dir, Config)]),
+    io:format("RootDir = ~p", [RootDir]),
 
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_file_info"++Suffix++".fil"),
-    ?line {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
-    ?line ?PRIM_FILE:write(Fd1,"foo"),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_file_info"++Suffix++".fil"),
+    {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
+    ?PRIM_FILE:write(Fd1,"foo"),
 
     %% check that the file got a modify date max a few seconds away from now
-    ?line {ok, #file_info{type = regular, 
-			  atime = AccTime1, mtime = ModTime1}} = 
+    {ok, #file_info{type = regular,
+		    atime = AccTime1, mtime = ModTime1}} =
 	?PRIM_FILE_call(read_file_info, Handle, [Name]),
-    ?line Now = erlang:localtime(),
-    ?line io:format("Now ~p",[Now]),
-    ?line io:format("Open file Acc ~p Mod ~p",[AccTime1,ModTime1]),
-    ?line true = abs(time_dist(filter_atime(Now, Config),
-			       filter_atime(AccTime1,
-					    Config))) < 8,
-    ?line true = abs(time_dist(Now, ModTime1)) < 8,
-    
+    Now = erlang:localtime(),
+    io:format("Now ~p",[Now]),
+    io:format("Open file Acc ~p Mod ~p",[AccTime1,ModTime1]),
+    true = abs(time_dist(filter_atime(Now, Config),
+			 filter_atime(AccTime1,
+				      Config))) < 8,
+    true = abs(time_dist(Now, ModTime1)) < 8,
+
     %% Sleep until we can be sure the seconds value has changed.
     %% Note: FAT-based filesystem (like on Windows 95) have
     %% a resolution of 2 seconds.
-    ?line test_server:sleep(test_server:seconds(2.2)),
+    ct:sleep({seconds,2.2}),
 
     %% close the file, and watch the modify date change
-    ?line ok = ?PRIM_FILE:close(Fd1),
-    ?line {ok, #file_info{size = Size, type = regular, access = Access, 
-			  atime = AccTime2, mtime = ModTime2}} = 
+    ok = ?PRIM_FILE:close(Fd1),
+    {ok, #file_info{size = Size, type = regular, access = Access,
+		    atime = AccTime2, mtime = ModTime2}} =
 	?PRIM_FILE_call(read_file_info, Handle, [Name]),
-    ?line io:format("Closed file Acc ~p Mod ~p",[AccTime2,ModTime2]),
-    ?line true = time_dist(ModTime1, ModTime2) >= 0,
+    io:format("Closed file Acc ~p Mod ~p",[AccTime2,ModTime2]),
+    true = time_dist(ModTime1, ModTime2) >= 0,
 
     %% this file is supposed to be binary, so it'd better keep it's size
-    ?line Size = 3,
-    ?line Access = read_write,
+    Size = 3,
+    Access = read_write,
 
     %% Do some directory checking
-    ?line {ok, #file_info{size = DSize, type = directory, 
-			  access = DAccess, 
-			  atime = AccTime3, mtime = ModTime3}} = 
+    {ok, #file_info{size = DSize, type = directory,
+		    access = DAccess,
+		    atime = AccTime3, mtime = ModTime3}} =
 	?PRIM_FILE_call(read_file_info, Handle, [RootDir]),
     %% this dir was modified only a few secs ago
-    ?line io:format("Dir Acc ~p; Mod ~p; Now ~p", 
-		    [AccTime3, ModTime3, Now]),
-    ?line true = abs(time_dist(Now, ModTime3)) < 5,
-    ?line DAccess = read_write,
-    ?line io:format("Dir size is ~p",[DSize]),
+    io:format("Dir Acc ~p; Mod ~p; Now ~p",
+	      [AccTime3, ModTime3, Now]),
+    true = abs(time_dist(Now, ModTime3)) < 5,
+    DAccess = read_write,
+    io:format("Dir size is ~p",[DSize]),
     ok.
 
 %% Filter access times, to cope with a deficiency of FAT file systems
@@ -969,9 +914,9 @@ filter_atime(Atime, Config) ->
 	true ->
 	    case Atime of
 	    	{Date, _} ->
-	    	   {Date, {0, 0, 0}};
+		    {Date, {0, 0, 0}};
 		{Y, M, D, _, _, _} ->
-		   {Y, M, D, 0, 0, 0}
+		    {Y, M, D, 0, 0, 0}
 	    end;
 	false ->
 	    Atime
@@ -979,171 +924,153 @@ filter_atime(Atime, Config) ->
 
 %% Test the write_file_info/2 function.
 
-file_write_file_info_a(suite) -> [];
-file_write_file_info_a(doc) -> [];
 file_write_file_info_a(Config) when is_list(Config) ->
     file_write_file_info(Config, [], "_a").
 
-file_write_file_info_b(suite) -> [];
-file_write_file_info_b(doc) -> [];
 file_write_file_info_b(Config) when is_list(Config) ->
-    ?line {ok, Handle} = ?PRIM_FILE:start(),
+    {ok, Handle} = ?PRIM_FILE:start(),
     Result = file_write_file_info(Config, Handle, "_b"),
-    ?line ok = ?PRIM_FILE:stop(Handle),
+    ok = ?PRIM_FILE:stop(Handle),
     Result.
 
 file_write_file_info(Config, Handle, Suffix) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = get_good_directory(Config),
-    ?line test_server:format("RootDir = ~p", [RootDir]),
+    RootDir = get_good_directory(Config),
+    io:format("RootDir = ~p", [RootDir]),
 
     %% Set the file to read only AND update the file times at the same time.
     %% (This used to fail on Windows NT/95 for a local filesystem.)
     %% Note: Seconds must be even; see note in file_info_times/1.
 
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_write_file_info_ro"++Suffix),
-    ?line ok = ?PRIM_FILE:write_file(Name, "hello"),
-    ?line Time = {{1997, 01, 02}, {12, 35, 42}},
-    ?line Info = #file_info{mode=8#400, atime=Time, mtime=Time, ctime=Time},
-    ?line ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, Info]),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_write_file_info_ro"++Suffix),
+    ok = ?PRIM_FILE:write_file(Name, "hello"),
+    Time = {{1997, 01, 02}, {12, 35, 42}},
+    Info = #file_info{mode=8#400, atime=Time, mtime=Time, ctime=Time},
+    ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, Info]),
 
     %% Read back the times.
 
-    ?line {ok, ActualInfo} = 
+    {ok, ActualInfo} =
 	?PRIM_FILE_call(read_file_info, Handle, [Name]),
-    ?line #file_info{mode=_Mode, atime=ActAtime, mtime=Time,
-		     ctime=ActCtime} = ActualInfo,
-    ?line FilteredAtime = filter_atime(Time, Config),
-    ?line FilteredAtime = filter_atime(ActAtime, Config),
-    ?line case os:type() of
-	      {win32, _} ->
-		  %% On Windows, "ctime" means creation time and it can
-		  %% be set.
-		  ActCtime = Time;
-	      _ ->
-		  ok
-	  end,
-    ?line {error, eacces} = ?PRIM_FILE:write_file(Name, "hello again"),
+    #file_info{mode=_Mode, atime=ActAtime, mtime=Time,
+	       ctime=ActCtime} = ActualInfo,
+    FilteredAtime = filter_atime(Time, Config),
+    FilteredAtime = filter_atime(ActAtime, Config),
+    case os:type() of
+	{win32, _} ->
+	    %% On Windows, "ctime" means creation time and it can
+	    %% be set.
+	    ActCtime = Time;
+	_ ->
+	    ok
+    end,
+    {error, eacces} = ?PRIM_FILE:write_file(Name, "hello again"),
 
     %% Make the file writable again.
 
-    ?line ?PRIM_FILE_call(write_file_info, Handle, 
-			  [Name, #file_info{mode=8#600}]),
-    ?line ok = ?PRIM_FILE:write_file(Name, "hello again"),
+    ?PRIM_FILE_call(write_file_info, Handle,
+		    [Name, #file_info{mode=8#600}]),
+    ok = ?PRIM_FILE:write_file(Name, "hello again"),
 
     %% And unwritable.
-    ?line ?PRIM_FILE_call(write_file_info, Handle, 
-			  [Name, #file_info{mode=8#400}]),
-    ?line {error, eacces} = ?PRIM_FILE:write_file(Name, "hello again"),
+    ?PRIM_FILE_call(write_file_info, Handle,
+		    [Name, #file_info{mode=8#400}]),
+    {error, eacces} = ?PRIM_FILE:write_file(Name, "hello again"),
 
     %% Write the times again.
     %% Note: Seconds must be even; see note in file_info_times/1.
 
-    ?line NewTime = {{1997, 02, 15}, {13, 18, 20}},
-    ?line NewInfo = #file_info{atime=NewTime, mtime=NewTime, ctime=NewTime},
-    ?line ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, NewInfo]),
-    ?line {ok, ActualInfo2} = 
+    NewTime = {{1997, 02, 15}, {13, 18, 20}},
+    NewInfo = #file_info{atime=NewTime, mtime=NewTime, ctime=NewTime},
+    ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, NewInfo]),
+    {ok, ActualInfo2} =
 	?PRIM_FILE_call(read_file_info, Handle, [Name]),
-    ?line #file_info{atime=NewActAtime, mtime=NewTime,
-		     ctime=NewActCtime} = ActualInfo2,
-    ?line NewFilteredAtime = filter_atime(NewTime, Config),
-    ?line NewFilteredAtime = filter_atime(NewActAtime, Config),
-    ?line case os:type() of
-	      {win32, _} -> NewActCtime = NewTime;
-	      _ -> ok
-	  end,
+    #file_info{atime=NewActAtime, mtime=NewTime,
+	       ctime=NewActCtime} = ActualInfo2,
+    NewFilteredAtime = filter_atime(NewTime, Config),
+    NewFilteredAtime = filter_atime(NewActAtime, Config),
+    case os:type() of
+	{win32, _} -> NewActCtime = NewTime;
+	_ -> ok
+    end,
 
     %% The file should still be unwritable.
-    ?line {error, eacces} = ?PRIM_FILE:write_file(Name, "hello again"),
+    {error, eacces} = ?PRIM_FILE:write_file(Name, "hello again"),
 
     %% Make the file writeable again, so that we can remove the
     %% test suites ... :-)
-    ?line ?PRIM_FILE_call(write_file_info, Handle, 
-			  [Name, #file_info{mode=8#600}]),
-    ?line test_server:timetrap_cancel(Dog),
+    ?PRIM_FILE_call(write_file_info, Handle,
+		    [Name, #file_info{mode=8#600}]),
     ok.
 
 %% Test the write_file_info/3 function.
 
-file_write_file_info_opts(suite) -> [];
-file_write_file_info_opts(doc) -> [];
 file_write_file_info_opts(Config) when is_list(Config) ->
     {ok, Handle} = ?PRIM_FILE:start(),
-    Dog = test_server:timetrap(test_server:seconds(10)),
     RootDir = get_good_directory(Config),
-    test_server:format("RootDir = ~p", [RootDir]),
+    io:format("RootDir = ~p", [RootDir]),
 
     Name = filename:join(RootDir, atom_to_list(?MODULE) ++"_write_file_info_opts"),
     ok   = ?PRIM_FILE:write_file(Name, "hello_opts"),
 
     lists:foreach(fun
-	    ({FI, Opts}) ->
-		ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, FI, Opts])
-	end, [ 
-	    {#file_info{ mode=8#600, atime = Time, mtime = Time, ctime = Time}, Opts} || 
-	    Opts <- [[{time, posix}]],
-	    Time <- [ 0,1,-1,100,-100,1000,-1000,10000,-10000 ]
-	]),
-
-    % REM: determine date range dependent on time_t = Uint32 | Sint32 | Sint64
-    % Determine time_t on os:type()?
-    lists:foreach(fun
-	    ({FI, Opts}) ->
-		ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, FI, Opts])
-	end, [ 
-	    {#file_info{ mode=8#400, atime = Time, mtime = Time, ctime = Time}, Opts} || 
-	    Opts <- [[{time, universal}],[{time, local}]],
-	    Time <- [
-		{{1970,1,1},{0,0,0}},
-		{{1970,1,1},{0,0,1}},
-		{{1969,12,31},{23,59,59}},
-		{{1908,2,3},{23,59,59}},
-		{{2012,2,3},{23,59,59}},
-		{{2037,2,3},{23,59,59}},
-		erlang:localtime()
-	    ]]),
+		      ({FI, Opts}) ->
+			 ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, FI, Opts])
+		 end, [
+			{#file_info{ mode=8#600, atime = Time, mtime = Time, ctime = Time}, Opts} ||
+			  Opts <- [[{time, posix}]],
+			  Time <- [ 0,1,-1,100,-100,1000,-1000,10000,-10000 ]
+		      ]),
+
+    %% REM: determine date range dependent on time_t = Uint32 | Sint32 | Sint64
+    %% Determine time_t on os:type()?
+    lists:foreach(fun ({FI, Opts}) ->
+			 ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, FI, Opts])
+		 end, [ {#file_info{ mode=8#400, atime = Time, mtime = Time, ctime = Time}, Opts} ||
+			  Opts <- [[{time, universal}],[{time, local}]],
+			  Time <- [
+				   {{1970,1,1},{0,0,0}},
+				   {{1970,1,1},{0,0,1}},
+			%	   {{1969,12,31},{23,59,59}},
+			%	   {{1908,2,3},{23,59,59}},
+				   {{2012,2,3},{23,59,59}},
+				   {{2037,2,3},{23,59,59}},
+				   erlang:localtime()
+				  ]]),
     ok   = ?PRIM_FILE:stop(Handle),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-file_read_file_info_opts(suite) -> [];
-file_read_file_info_opts(doc) -> [];
 file_read_file_info_opts(Config) when is_list(Config) ->
     {ok, Handle} = ?PRIM_FILE:start(),
-    Dog = test_server:timetrap(test_server:seconds(10)),
     RootDir = get_good_directory(Config),
-    test_server:format("RootDir = ~p", [RootDir]),
+    io:format("RootDir = ~p", [RootDir]),
 
     Name = filename:join(RootDir, atom_to_list(?MODULE) ++"_read_file_info_opts"),
     ok   = ?PRIM_FILE:write_file(Name, "hello_opts"),
 
     lists:foreach(fun
-	    (Opts) ->
-		{ok,_} = ?PRIM_FILE_call(read_file_info, Handle, [Name, Opts])
-    end, [[{time, Type}] || Type <- [local, universal, posix]]),
+		      (Opts) ->
+			 {ok,_} = ?PRIM_FILE_call(read_file_info, Handle, [Name, Opts])
+		 end, [[{time, Type}] || Type <- [local, universal, posix]]),
     ok   = ?PRIM_FILE:stop(Handle),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %% Test the write and read back *_file_info/3 functions.
 
-file_write_read_file_info_opts(suite) -> [];
-file_write_read_file_info_opts(doc) -> [];
 file_write_read_file_info_opts(Config) when is_list(Config) ->
     {ok, Handle} = ?PRIM_FILE:start(),
-    Dog = test_server:timetrap(test_server:seconds(10)),
     RootDir = get_good_directory(Config),
-    test_server:format("RootDir = ~p", [RootDir]),
+    io:format("RootDir = ~p", [RootDir]),
 
     Name = filename:join(RootDir, atom_to_list(?MODULE) ++"_read_write_file_info_opts"),
     ok   = ?PRIM_FILE:write_file(Name, "hello_opts2"),
 
     ok = file_write_read_file_info_opts(Handle, Name, {{1989, 04, 28}, {19,30,22}}, [{time, local}]),
     ok = file_write_read_file_info_opts(Handle, Name, {{1989, 04, 28}, {19,30,22}}, [{time, universal}]),
-    ok = file_write_read_file_info_opts(Handle, Name, {{1930, 04, 28}, {19,30,22}}, [{time, local}]),
-    ok = file_write_read_file_info_opts(Handle, Name, {{1930, 04, 28}, {19,30,22}}, [{time, universal}]),
+    %% will not work on platforms with unsigned time_t
+    %ok = file_write_read_file_info_opts(Handle, Name, {{1930, 04, 28}, {19,30,22}}, [{time, local}]),
+    %ok = file_write_read_file_info_opts(Handle, Name, {{1930, 04, 28}, {19,30,22}}, [{time, universal}]),
     ok = file_write_read_file_info_opts(Handle, Name, 1, [{time, posix}]),
     ok = file_write_read_file_info_opts(Handle, Name, -1, [{time, posix}]),
     ok = file_write_read_file_info_opts(Handle, Name, 300000, [{time, posix}]),
@@ -1151,14 +1078,15 @@ file_write_read_file_info_opts(Config) when is_list(Config) ->
     ok = file_write_read_file_info_opts(Handle, Name, 0, [{time, posix}]),
 
     ok = ?PRIM_FILE:stop(Handle),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 file_write_read_file_info_opts(Handle, Name, Mtime, Opts) ->
     {ok, FI} = ?PRIM_FILE_call(read_file_info, Handle, [Name, Opts]),
     FI2 = FI#file_info{ mtime = Mtime },
     ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, FI2, Opts]),
-    {ok, FI2} = ?PRIM_FILE_call(read_file_info, Handle, [Name, Opts]),
+    {ok, FI3} = ?PRIM_FILE_call(read_file_info, Handle, [Name, Opts]),
+    io:format("Expecting mtime = ~p, got ~p~n", [FI2#file_info.mtime, FI3#file_info.mtime]),
+    FI2 = FI3,
     ok.
 
 
@@ -1166,136 +1094,131 @@ file_write_read_file_info_opts(Handle, Name, Mtime, Opts) ->
 %% Returns a directory on a file system that has correct file times.
 
 get_good_directory(Config) ->
-    ?line ?config(priv_dir, Config).
+    proplists:get_value(priv_dir, Config).
 
-truncate(suite) -> [];
-truncate(doc) -> [];
 truncate(Config) when is_list(Config) ->
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_truncate.fil"),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_truncate.fil"),
 
     %% Create a file with some data.
-    ?line MyData = "0123456789abcdefghijklmnopqrstuvxyz",
-    ?line ok = ?PRIM_FILE:write_file(Name, MyData),
+    MyData = "0123456789abcdefghijklmnopqrstuvxyz",
+    ok = ?PRIM_FILE:write_file(Name, MyData),
 
     %% Truncate the file to 10 characters.
-    ?line {ok, Fd} = ?PRIM_FILE:open(Name, [read, write]),
-    ?line {ok, 10} = ?PRIM_FILE:position(Fd, 10),
-    ?line ok = ?PRIM_FILE:truncate(Fd),
-    ?line ok = ?PRIM_FILE:close(Fd),
+    {ok, Fd} = ?PRIM_FILE:open(Name, [read, write]),
+    {ok, 10} = ?PRIM_FILE:position(Fd, 10),
+    ok = ?PRIM_FILE:truncate(Fd),
+    ok = ?PRIM_FILE:close(Fd),
 
     %% Read back the file and check that it has been truncated.
-    ?line Expected = list_to_binary("0123456789"),
-    ?line {ok, Expected} = ?PRIM_FILE:read_file(Name),
+    Expected = list_to_binary("0123456789"),
+    {ok, Expected} = ?PRIM_FILE:read_file(Name),
 
     %% Open the file read only and verify that it is not possible to
     %% truncate it, OTP-1960
-    ?line {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
-    ?line {ok, 5} = ?PRIM_FILE:position(Fd2, 5),
-    ?line {error, _} = ?PRIM_FILE:truncate(Fd2),
+    {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
+    {ok, 5} = ?PRIM_FILE:position(Fd2, 5),
+    {error, _} = ?PRIM_FILE:truncate(Fd2),
 
     ok.
 
 
-datasync(suite) -> [];
-datasync(doc) -> "Tests that ?PRIM_FILE:datasync/1 at least doesn't crash.";
+%% Tests that ?PRIM_FILE:datasync/1 at least doesn't crash.
 datasync(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Sync = filename:join(PrivDir,
-			       atom_to_list(?MODULE)
-			       ++"_sync.fil"),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Sync = filename:join(PrivDir,
+			 atom_to_list(?MODULE)
+			 ++"_sync.fil"),
 
     %% Raw open.
-    ?line {ok, Fd} = ?PRIM_FILE:open(Sync, [write]),
-    ?line ok = ?PRIM_FILE:datasync(Fd),
-    ?line ok = ?PRIM_FILE:close(Fd),
+    {ok, Fd} = ?PRIM_FILE:open(Sync, [write]),
+    ok = ?PRIM_FILE:datasync(Fd),
+    ok = ?PRIM_FILE:close(Fd),
 
     ok.
 
 
-sync(suite) -> [];
-sync(doc) -> "Tests that ?PRIM_FILE:sync/1 at least doesn't crash.";
+%% Tests that ?PRIM_FILE:sync/1 at least doesn't crash.
 sync(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Sync = filename:join(PrivDir, 
-			       atom_to_list(?MODULE)
-			       ++"_sync.fil"),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Sync = filename:join(PrivDir,
+			 atom_to_list(?MODULE)
+			 ++"_sync.fil"),
 
     %% Raw open.
-    ?line {ok, Fd} = ?PRIM_FILE:open(Sync, [write]),
-    ?line ok = ?PRIM_FILE:sync(Fd),
-    ?line ok = ?PRIM_FILE:close(Fd),
+    {ok, Fd} = ?PRIM_FILE:open(Sync, [write]),
+    ok = ?PRIM_FILE:sync(Fd),
+    ok = ?PRIM_FILE:close(Fd),
 
     ok.
 
 
-advise(suite) -> [];
-advise(doc) -> "Tests that ?PRIM_FILE:advise/4 at least doesn't crash.";
+%% Tests that ?PRIM_FILE:advise/4 at least doesn't crash.
 advise(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Advise = filename:join(PrivDir,
-			       atom_to_list(?MODULE)
-			       ++"_advise.fil"),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Advise = filename:join(PrivDir,
+			   atom_to_list(?MODULE)
+			   ++"_advise.fil"),
 
     Line1 = "Hello\n",
     Line2 = "World!\n",
 
-    ?line {ok, Fd} = ?PRIM_FILE:open(Advise, [write]),
-    ?line ok = ?PRIM_FILE:advise(Fd, 0, 0, normal),
-    ?line ok = ?PRIM_FILE:write(Fd, Line1),
-    ?line ok = ?PRIM_FILE:write(Fd, Line2),
-    ?line ok = ?PRIM_FILE:close(Fd),
-
-    ?line {ok, Fd2} = ?PRIM_FILE:open(Advise, [write]),
-    ?line ok = ?PRIM_FILE:advise(Fd2, 0, 0, random),
-    ?line ok = ?PRIM_FILE:write(Fd2, Line1),
-    ?line ok = ?PRIM_FILE:write(Fd2, Line2),
-    ?line ok = ?PRIM_FILE:close(Fd2),
-
-    ?line {ok, Fd3} = ?PRIM_FILE:open(Advise, [write]),
-    ?line ok = ?PRIM_FILE:advise(Fd3, 0, 0, sequential),
-    ?line ok = ?PRIM_FILE:write(Fd3, Line1),
-    ?line ok = ?PRIM_FILE:write(Fd3, Line2),
-    ?line ok = ?PRIM_FILE:close(Fd3),
-
-    ?line {ok, Fd4} = ?PRIM_FILE:open(Advise, [write]),
-    ?line ok = ?PRIM_FILE:advise(Fd4, 0, 0, will_need),
-    ?line ok = ?PRIM_FILE:write(Fd4, Line1),
-    ?line ok = ?PRIM_FILE:write(Fd4, Line2),
-    ?line ok = ?PRIM_FILE:close(Fd4),
-
-    ?line {ok, Fd5} = ?PRIM_FILE:open(Advise, [write]),
-    ?line ok = ?PRIM_FILE:advise(Fd5, 0, 0, dont_need),
-    ?line ok = ?PRIM_FILE:write(Fd5, Line1),
-    ?line ok = ?PRIM_FILE:write(Fd5, Line2),
-    ?line ok = ?PRIM_FILE:close(Fd5),
-
-    ?line {ok, Fd6} = ?PRIM_FILE:open(Advise, [write]),
-    ?line ok = ?PRIM_FILE:advise(Fd6, 0, 0, no_reuse),
-    ?line ok = ?PRIM_FILE:write(Fd6, Line1),
-    ?line ok = ?PRIM_FILE:write(Fd6, Line2),
-    ?line ok = ?PRIM_FILE:close(Fd6),
-
-    ?line {ok, Fd7} = ?PRIM_FILE:open(Advise, [write]),
-    ?line {error, einval} = ?PRIM_FILE:advise(Fd7, 0, 0, bad_advise),
-    ?line ok = ?PRIM_FILE:close(Fd7),
+    {ok, Fd} = ?PRIM_FILE:open(Advise, [write]),
+    ok = ?PRIM_FILE:advise(Fd, 0, 0, normal),
+    ok = ?PRIM_FILE:write(Fd, Line1),
+    ok = ?PRIM_FILE:write(Fd, Line2),
+    ok = ?PRIM_FILE:close(Fd),
+
+    {ok, Fd2} = ?PRIM_FILE:open(Advise, [write]),
+    ok = ?PRIM_FILE:advise(Fd2, 0, 0, random),
+    ok = ?PRIM_FILE:write(Fd2, Line1),
+    ok = ?PRIM_FILE:write(Fd2, Line2),
+    ok = ?PRIM_FILE:close(Fd2),
+
+    {ok, Fd3} = ?PRIM_FILE:open(Advise, [write]),
+    ok = ?PRIM_FILE:advise(Fd3, 0, 0, sequential),
+    ok = ?PRIM_FILE:write(Fd3, Line1),
+    ok = ?PRIM_FILE:write(Fd3, Line2),
+    ok = ?PRIM_FILE:close(Fd3),
+
+    {ok, Fd4} = ?PRIM_FILE:open(Advise, [write]),
+    ok = ?PRIM_FILE:advise(Fd4, 0, 0, will_need),
+    ok = ?PRIM_FILE:write(Fd4, Line1),
+    ok = ?PRIM_FILE:write(Fd4, Line2),
+    ok = ?PRIM_FILE:close(Fd4),
+
+    {ok, Fd5} = ?PRIM_FILE:open(Advise, [write]),
+    ok = ?PRIM_FILE:advise(Fd5, 0, 0, dont_need),
+    ok = ?PRIM_FILE:write(Fd5, Line1),
+    ok = ?PRIM_FILE:write(Fd5, Line2),
+    ok = ?PRIM_FILE:close(Fd5),
+
+    {ok, Fd6} = ?PRIM_FILE:open(Advise, [write]),
+    ok = ?PRIM_FILE:advise(Fd6, 0, 0, no_reuse),
+    ok = ?PRIM_FILE:write(Fd6, Line1),
+    ok = ?PRIM_FILE:write(Fd6, Line2),
+    ok = ?PRIM_FILE:close(Fd6),
+
+    {ok, Fd7} = ?PRIM_FILE:open(Advise, [write]),
+    {error, einval} = ?PRIM_FILE:advise(Fd7, 0, 0, bad_advise),
+    ok = ?PRIM_FILE:close(Fd7),
 
     %% test write without advise, then a read after an advise
-    ?line {ok, Fd8} = ?PRIM_FILE:open(Advise, [write]),
-    ?line ok = ?PRIM_FILE:write(Fd8, Line1),
-    ?line ok = ?PRIM_FILE:write(Fd8, Line2),
-    ?line ok = ?PRIM_FILE:close(Fd8),
-    ?line {ok, Fd9} = ?PRIM_FILE:open(Advise, [read]),
+    {ok, Fd8} = ?PRIM_FILE:open(Advise, [write]),
+    ok = ?PRIM_FILE:write(Fd8, Line1),
+    ok = ?PRIM_FILE:write(Fd8, Line2),
+    ok = ?PRIM_FILE:close(Fd8),
+    {ok, Fd9} = ?PRIM_FILE:open(Advise, [read]),
     Offset = 0,
     %% same as a 0 length in some implementations
     Length = length(Line1) + length(Line2),
-    ?line ok = ?PRIM_FILE:advise(Fd9, Offset, Length, sequential),
-    ?line {ok, Line1} = ?PRIM_FILE:read_line(Fd9),
-    ?line {ok, Line2} = ?PRIM_FILE:read_line(Fd9),
-    ?line eof = ?PRIM_FILE:read_line(Fd9),
-    ?line ok = ?PRIM_FILE:close(Fd9),
+    ok = ?PRIM_FILE:advise(Fd9, Offset, Length, sequential),
+    {ok, Line1} = ?PRIM_FILE:read_line(Fd9),
+    {ok, Line2} = ?PRIM_FILE:read_line(Fd9),
+    eof = ?PRIM_FILE:read_line(Fd9),
+    ok = ?PRIM_FILE:close(Fd9),
 
     ok.
 
@@ -1307,7 +1230,6 @@ large_write(Config) when is_list(Config) ->
 			"_large_write").
 
 do_large_write(Name) ->
-    Dog = test_server:timetrap(test_server:minutes(60)),
     ChunkSize = (256 bsl 20) + 1,	% 256 M + 1
     Chunks = 16,			% times 16 -> 4 G + 16
     Base = 100,
@@ -1320,187 +1242,177 @@ do_large_write(Name) ->
 	ok when Wordsize =:= 8 ->
 	    {ok,#file_info{size=Size}} = file:read_file_info(Name),
 	    {ok,Fd} = prim_file:open(Name, [read]),
-	    check_large_write(Dog, Fd, ChunkSize, 0, Interleave);
+	    check_large_write(Fd, ChunkSize, 0, Interleave);
 	{error,einval} when Wordsize =:= 4 ->
 	    ok
     end.
 
-check_large_write(Dog, Fd, ChunkSize, Pos, [X|Interleave]) ->
+check_large_write(Fd, ChunkSize, Pos, [X|Interleave]) ->
     Pos1 = Pos + ChunkSize,
     {ok,Pos1} = prim_file:position(Fd, {cur,ChunkSize}),
     {ok,[X]} = prim_file:read(Fd, 1),
-    check_large_write(Dog, Fd, ChunkSize, Pos1+1, Interleave);
-check_large_write(Dog, Fd, _, _, []) ->
+    check_large_write(Fd, ChunkSize, Pos1+1, Interleave);
+check_large_write(Fd, _, _, []) ->
     eof = prim_file:read(Fd, 1),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-allocate(suite) -> [];
-allocate(doc) -> "Tests that ?PRIM_FILE:allocate/3 at least doesn't crash.";
+%% Tests that ?PRIM_FILE:allocate/3 at least doesn't crash.
 allocate(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Allocate = filename:join(PrivDir,
-			       atom_to_list(?MODULE)
-			       ++"_allocate.fil"),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Allocate = filename:join(PrivDir,
+			     atom_to_list(?MODULE)
+			     ++"_allocate.fil"),
 
     Line1 = "Hello\n",
     Line2 = "World!\n",
 
-    ?line {ok, Fd} = ?PRIM_FILE:open(Allocate, [write, binary]),
+    {ok, Fd} = ?PRIM_FILE:open(Allocate, [write, binary]),
     allocate_and_assert(Fd, 1, iolist_size([Line1, Line2])),
-    ?line ok = ?PRIM_FILE:write(Fd, Line1),
-    ?line ok = ?PRIM_FILE:write(Fd, Line2),
-    ?line ok = ?PRIM_FILE:close(Fd),
+    ok = ?PRIM_FILE:write(Fd, Line1),
+    ok = ?PRIM_FILE:write(Fd, Line2),
+    ok = ?PRIM_FILE:close(Fd),
 
-    ?line {ok, Fd2} = ?PRIM_FILE:open(Allocate, [write, binary]),
+    {ok, Fd2} = ?PRIM_FILE:open(Allocate, [write, binary]),
     allocate_and_assert(Fd2, 1, iolist_size(Line1)),
-    ?line ok = ?PRIM_FILE:write(Fd2, Line1),
-    ?line ok = ?PRIM_FILE:write(Fd2, Line2),
-    ?line ok = ?PRIM_FILE:close(Fd2),
+    ok = ?PRIM_FILE:write(Fd2, Line1),
+    ok = ?PRIM_FILE:write(Fd2, Line2),
+    ok = ?PRIM_FILE:close(Fd2),
 
-    ?line {ok, Fd3} = ?PRIM_FILE:open(Allocate, [write, binary]),
+    {ok, Fd3} = ?PRIM_FILE:open(Allocate, [write, binary]),
     allocate_and_assert(Fd3, 1, iolist_size(Line1) + 1),
-    ?line ok = ?PRIM_FILE:write(Fd3, Line1),
-    ?line ok = ?PRIM_FILE:write(Fd3, Line2),
-    ?line ok = ?PRIM_FILE:close(Fd3),
+    ok = ?PRIM_FILE:write(Fd3, Line1),
+    ok = ?PRIM_FILE:write(Fd3, Line2),
+    ok = ?PRIM_FILE:close(Fd3),
 
-    ?line {ok, Fd4} = ?PRIM_FILE:open(Allocate, [write, binary]),
+    {ok, Fd4} = ?PRIM_FILE:open(Allocate, [write, binary]),
     allocate_and_assert(Fd4, 1, 4 * iolist_size([Line1, Line2])),
-    ?line ok = ?PRIM_FILE:write(Fd4, Line1),
-    ?line ok = ?PRIM_FILE:write(Fd4, Line2),
-    ?line ok = ?PRIM_FILE:close(Fd4),
+    ok = ?PRIM_FILE:write(Fd4, Line1),
+    ok = ?PRIM_FILE:write(Fd4, Line2),
+    ok = ?PRIM_FILE:close(Fd4),
 
     ok.
 
 allocate_and_assert(Fd, Offset, Length) ->
-    % Just verify that calls to ?PRIM_FILE:allocate/3 don't crash or have
-    % any other negative side effect. We can't really asssert against a
-    % specific return value, because support for file space pre-allocation
-    % depends on the OS, OS version and underlying filesystem.
-    %
-    % The Linux kernel added support for fallocate() in version 2.6.23,
-    % which currently works only for the ext4, ocfs2, xfs and btrfs file
-    % systems. posix_fallocate() is available in glibc as of version
-    % 2.1.94, but it was buggy until glibc version 2.7.
-    %
-    % Mac OS X, as of version 10.3, supports the fcntl operation F_PREALLOCATE.
-    %
-    % Solaris supports posix_fallocate() but only for the UFS file system
-    % apparently (not supported for ZFS).
-    %
-    % FreeBSD 9.0 is the first FreeBSD release supporting posix_fallocate().
-    %
-    % For Windows there's apparently no way to pre-allocate file space, at
-    % least with similar API/semantics as posix_fallocate(), fallocate() or
-    % fcntl F_PREALLOCATE.
+    %% Just verify that calls to ?PRIM_FILE:allocate/3 don't crash or have
+    %% any other negative side effect. We can't really asssert against a
+    %% specific return value, because support for file space pre-allocation
+    %% depends on the OS, OS version and underlying filesystem.
+    %%
+    %% The Linux kernel added support for fallocate() in version 2.6.23,
+    %% which currently works only for the ext4, ocfs2, xfs and btrfs file
+    %% systems. posix_fallocate() is available in glibc as of version
+    %% 2.1.94, but it was buggy until glibc version 2.7.
+    %%
+    %% Mac OS X, as of version 10.3, supports the fcntl operation F_PREALLOCATE.
+    %%
+    %% Solaris supports posix_fallocate() but only for the UFS file system
+    %% apparently (not supported for ZFS).
+    %%
+    %% FreeBSD 9.0 is the first FreeBSD release supporting posix_fallocate().
+    %%
+    %% For Windows there's apparently no way to pre-allocate file space, at
+    %% least with similar API/semantics as posix_fallocate(), fallocate() or
+    %% fcntl F_PREALLOCATE.
     Result = ?PRIM_FILE:allocate(Fd, Offset, Length),
     case os:type() of
         {win32, _} ->
-            ?line {error, enotsup} = Result;
+            {error, enotsup} = Result;
         _ ->
-            ?line _ = Result
+            _ = Result
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-delete_a(suite) -> [];
-delete_a(doc) -> [];
 delete_a(Config) when is_list(Config) ->
     delete(Config, [], "_a").
 
-delete_b(suite) -> [];
-delete_b(doc) -> [];
 delete_b(Config) when is_list(Config) ->
-    ?line {ok, Handle} = ?PRIM_FILE:start(),
+    {ok, Handle} = ?PRIM_FILE:start(),
     Result = delete(Config, Handle, "_b"),
-    ?line ok = ?PRIM_FILE:stop(Handle),
+    ok = ?PRIM_FILE:stop(Handle),
     Result.
 
 delete(Config, Handle, Suffix) ->
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line Name = filename:join(RootDir, 
-			       atom_to_list(?MODULE)
-			       ++"_delete"++Suffix++".fil"),
-    ?line {ok, Fd1} = ?PRIM_FILE:open(Name, [write]),
-    ?line ?PRIM_FILE:write(Fd1,"ok.\n"),
-    ?line ok = ?PRIM_FILE:close(Fd1),
+    RootDir = proplists:get_value(priv_dir,Config),
+    Name = filename:join(RootDir,
+			 atom_to_list(?MODULE)
+			 ++"_delete"++Suffix++".fil"),
+    {ok, Fd1} = ?PRIM_FILE:open(Name, [write]),
+    ?PRIM_FILE:write(Fd1,"ok.\n"),
+    ok = ?PRIM_FILE:close(Fd1),
     %% Check that the file is readable
-    ?line {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
-    ?line ok = ?PRIM_FILE:close(Fd2),
-    ?line ok = ?PRIM_FILE_call(delete, Handle, [Name]),
+    {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
+    ok = ?PRIM_FILE:close(Fd2),
+    ok = ?PRIM_FILE_call(delete, Handle, [Name]),
     %% Check that the file is not readable anymore
-    ?line {error, _} = ?PRIM_FILE:open(Name, [read]),
+    {error, _} = ?PRIM_FILE:open(Name, [read]),
     %% Try deleting a nonexistent file
-    ?line {error, enoent} = ?PRIM_FILE_call(delete, Handle, [Name]),
+    {error, enoent} = ?PRIM_FILE_call(delete, Handle, [Name]),
     ok.
 
-rename_a(suite) ->[];
-rename_a(doc) ->[];
 rename_a(Config) when is_list(Config) ->
     rename(Config, [], "_a").
 
-rename_b(suite) ->[];
-rename_b(doc) ->[];
 rename_b(Config) when is_list(Config) ->
-    ?line {ok, Handle} = ?PRIM_FILE:start(),
+    {ok, Handle} = ?PRIM_FILE:start(),
     Result = rename(Config, Handle, "_b"),
-    ?line ok = ?PRIM_FILE:stop(Handle),
+    ok = ?PRIM_FILE:stop(Handle),
     Result.
 
 rename(Config, Handle, Suffix) ->
-    ?line RootDir = ?config(priv_dir,Config),
-    ?line FileName1 = atom_to_list(?MODULE)++"_rename"++Suffix++".fil",
-    ?line FileName2 = atom_to_list(?MODULE)++"_rename"++Suffix++".ful",
-    ?line Name1 = filename:join(RootDir, FileName1),
-    ?line Name2 = filename:join(RootDir, FileName2),
-    ?line {ok,Fd1} = ?PRIM_FILE:open(Name1, [write]),
-    ?line ok = ?PRIM_FILE:close(Fd1),
+    RootDir = proplists:get_value(priv_dir,Config),
+    FileName1 = atom_to_list(?MODULE)++"_rename"++Suffix++".fil",
+    FileName2 = atom_to_list(?MODULE)++"_rename"++Suffix++".ful",
+    Name1 = filename:join(RootDir, FileName1),
+    Name2 = filename:join(RootDir, FileName2),
+    {ok,Fd1} = ?PRIM_FILE:open(Name1, [write]),
+    ok = ?PRIM_FILE:close(Fd1),
     %% Rename, and check that it really changed name
-    ?line ok = ?PRIM_FILE_call(rename, Handle, [Name1, Name2]),
-    ?line {error, _} = ?PRIM_FILE:open(Name1, [read]),
-    ?line {ok, Fd2} = ?PRIM_FILE:open(Name2, [read]),
-    ?line ok = ?PRIM_FILE:close(Fd2),
+    ok = ?PRIM_FILE_call(rename, Handle, [Name1, Name2]),
+    {error, _} = ?PRIM_FILE:open(Name1, [read]),
+    {ok, Fd2} = ?PRIM_FILE:open(Name2, [read]),
+    ok = ?PRIM_FILE:close(Fd2),
     %% Try renaming something to itself
-    ?line ok = ?PRIM_FILE_call(rename, Handle, [Name2, Name2]),
+    ok = ?PRIM_FILE_call(rename, Handle, [Name2, Name2]),
     %% Try renaming something that doesn't exist
-    ?line {error, enoent} = 
+    {error, enoent} =
 	?PRIM_FILE_call(rename, Handle, [Name1, Name2]),
     %% Try renaming to something else than a string
-    ?line {error, badarg} = 
+    {error, badarg} =
 	?PRIM_FILE_call(rename, Handle, [Name1, foobar]),
-    
+
     %% Move between directories
-    ?line DirName1 = filename:join(RootDir,
-				   atom_to_list(?MODULE)
-				   ++"_rename_dir"++Suffix),
-    ?line DirName2 = filename:join(RootDir,
-				   atom_to_list(?MODULE)
-				   ++"_second_rename_dir"++Suffix),
-    ?line Name1foo = filename:join(DirName1, "foo.fil"),
-    ?line Name2foo = filename:join(DirName2, "foo.fil"),
-    ?line Name2bar = filename:join(DirName2, "bar.dir"),
-    ?line ok = ?PRIM_FILE:make_dir(DirName1),
+    DirName1 = filename:join(RootDir,
+			     atom_to_list(?MODULE)
+			     ++"_rename_dir"++Suffix),
+    DirName2 = filename:join(RootDir,
+			     atom_to_list(?MODULE)
+			     ++"_second_rename_dir"++Suffix),
+    Name1foo = filename:join(DirName1, "foo.fil"),
+    Name2foo = filename:join(DirName2, "foo.fil"),
+    Name2bar = filename:join(DirName2, "bar.dir"),
+    ok = ?PRIM_FILE:make_dir(DirName1),
     %% The name has to include the full file name, path is not enough
-    ?line expect(
-	    {error, eexist}, {error, eisdir},
-	    ?PRIM_FILE_call(rename, Handle, [Name2, DirName1])),
-    ?line ok = 
+    expect(
+      {error, eexist}, {error, eisdir},
+      ?PRIM_FILE_call(rename, Handle, [Name2, DirName1])),
+    ok =
 	?PRIM_FILE_call(rename, Handle, [Name2, Name1foo]),
     %% Now rename the directory
-    ?line ok = ?PRIM_FILE_call(rename, Handle, [DirName1, DirName2]),
+    ok = ?PRIM_FILE_call(rename, Handle, [DirName1, DirName2]),
     %% And check that the file is there now
-    ?line {ok,Fd3} = ?PRIM_FILE:open(Name2foo, [read]),
-    ?line ok = ?PRIM_FILE:close(Fd3),
+    {ok,Fd3} = ?PRIM_FILE:open(Name2foo, [read]),
+    ok = ?PRIM_FILE:close(Fd3),
     %% Try some dirty things now: move the directory into itself
-    ?line {error, Msg1} = 
+    {error, Msg1} =
 	?PRIM_FILE_call(rename, Handle, [DirName2, Name2bar]),
-    ?line io:format("Errmsg1: ~p",[Msg1]),
+    io:format("Errmsg1: ~p",[Msg1]),
     %% move dir into a file in itself
-    ?line {error, Msg2} = 
+    {error, Msg2} =
 	?PRIM_FILE_call(rename, Handle, [DirName2, Name2foo]),
-    ?line io:format("Errmsg2: ~p",[Msg2]),
+    io:format("Errmsg2: ~p",[Msg2]),
 
     ok.
 
@@ -1509,45 +1421,41 @@ rename(Config, Handle, Suffix) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-e_delete(suite) -> [];
-e_delete(doc) -> [];
 e_delete(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line Base = filename:join(RootDir, 
-			       atom_to_list(?MODULE)++"_e_delete"),
-    ?line ok = ?PRIM_FILE:make_dir(Base),
+    RootDir = proplists:get_value(priv_dir, Config),
+    Base = filename:join(RootDir,
+			 atom_to_list(?MODULE)++"_e_delete"),
+    ok = ?PRIM_FILE:make_dir(Base),
 
     %% Delete a non-existing file.
-    ?line {error, enoent} = 
+    {error, enoent} =
 	?PRIM_FILE:delete(filename:join(Base, "non_existing")),
 
     %% Delete a directory.
-    ?line {error, eperm} = ?PRIM_FILE:delete(Base),
+    {error, eperm} = ?PRIM_FILE:delete(Base),
 
     %% Use a path-name with a non-directory component.
-    ?line Afile = filename:join(Base, "a_file"),
-    ?line ok = ?PRIM_FILE:write_file(Afile, "hello\n"),
-    ?line {error, E} = 
+    Afile = filename:join(Base, "a_file"),
+    ok = ?PRIM_FILE:write_file(Afile, "hello\n"),
+    {error, E} =
 	expect(
 	  {error, enotdir}, {error, enoent}, 
 	  ?PRIM_FILE:delete(filename:join(Afile, "another_file"))),
-    ?line io:format("Result: ~p~n", [E]),
+    io:format("Result: ~p~n", [E]),
 
     %% No permission.
-    ?line case os:type() of
-	      {win32, _} ->
-		  %% Remove a character device.
-		  ?line {error, eacces} = ?PRIM_FILE:delete("nul");
-	      _ ->
-		  ?line ?PRIM_FILE:write_file_info(
-			   Base, #file_info {mode=0}),
-		  ?line {error, eacces} = ?PRIM_FILE:delete(Afile),
-		  ?line ?PRIM_FILE:write_file_info(
-			   Base, #file_info {mode=8#600})
-	  end,
-
-    ?line test_server:timetrap_cancel(Dog),
+    case os:type() of
+	{win32, _} ->
+	    %% Remove a character device.
+	    {error, eacces} = ?PRIM_FILE:delete("nul");
+	_ ->
+	    ?PRIM_FILE:write_file_info(
+	       Base, #file_info {mode=0}),
+	    {error, eacces} = ?PRIM_FILE:delete(Afile),
+	    ?PRIM_FILE:write_file_info(
+	       Base, #file_info {mode=8#600})
+    end,
+
     ok.
 
 %%% FreeBSD gives EEXIST when renaming a file to an empty dir, although the
@@ -1555,66 +1463,63 @@ e_delete(Config) when is_list(Config) ->
 %%% (What about FreeBSD? We store our nightly build results on a FreeBSD
 %%% file system, that's what.)
 
-e_rename(suite) -> [];
-e_rename(doc) -> [];
 e_rename(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line Base = filename:join(RootDir,
-	atom_to_list(?MODULE)++"_e_rename"),
-    ?line ok = ?PRIM_FILE:make_dir(Base),
+    RootDir = proplists:get_value(priv_dir, Config),
+    Base = filename:join(RootDir,
+			 atom_to_list(?MODULE)++"_e_rename"),
+    ok = ?PRIM_FILE:make_dir(Base),
 
     %% Create an empty directory.
-    ?line EmptyDir = filename:join(Base, "empty_dir"),
-    ?line ok = ?PRIM_FILE:make_dir(EmptyDir),
+    EmptyDir = filename:join(Base, "empty_dir"),
+    ok = ?PRIM_FILE:make_dir(EmptyDir),
 
     %% Create a non-empty directory.
-    ?line NonEmptyDir = filename:join(Base, "non_empty_dir"),
-    ?line ok = ?PRIM_FILE:make_dir(NonEmptyDir),
-    ?line ok = ?PRIM_FILE:write_file(
-	filename:join(NonEmptyDir, "a_file"),
-	"hello\n"),
+    NonEmptyDir = filename:join(Base, "non_empty_dir"),
+    ok = ?PRIM_FILE:make_dir(NonEmptyDir),
+    ok = ?PRIM_FILE:write_file(
+	    filename:join(NonEmptyDir, "a_file"),
+	    "hello\n"),
 
     %% Create another non-empty directory.
-    ?line ADirectory = filename:join(Base, "a_directory"),
-    ?line ok = ?PRIM_FILE:make_dir(ADirectory),
-    ?line ok = ?PRIM_FILE:write_file(
-	filename:join(ADirectory, "a_file"),
-	"howdy\n\n"),
+    ADirectory = filename:join(Base, "a_directory"),
+    ok = ?PRIM_FILE:make_dir(ADirectory),
+    ok = ?PRIM_FILE:write_file(
+	    filename:join(ADirectory, "a_file"),
+	    "howdy\n\n"),
 
     %% Create a data file.
-    ?line File = filename:join(Base, "just_a_file"),
-    ?line ok = ?PRIM_FILE:write_file(File, "anything goes\n\n"),
+    File = filename:join(Base, "just_a_file"),
+    ok = ?PRIM_FILE:write_file(File, "anything goes\n\n"),
 
     %% Move an existing directory to a non-empty directory.
-    ?line {error, eexist} = 
-    ?PRIM_FILE:rename(ADirectory, NonEmptyDir),
+    {error, eexist} =
+	?PRIM_FILE:rename(ADirectory, NonEmptyDir),
 
     %% Move a root directory.
-    ?line {error, einval} = ?PRIM_FILE:rename("/", "arne"),
+    {error, einval} = ?PRIM_FILE:rename("/", "arne"),
 
     %% Move Base into Base/new_name.
-    ?line {error, einval} = 
-    ?PRIM_FILE:rename(Base, filename:join(Base, "new_name")),
+    {error, einval} =
+	?PRIM_FILE:rename(Base, filename:join(Base, "new_name")),
 
     %% Overwrite a directory with a file.
-    ?line expect({error, eexist}, % FreeBSD (?)
-	{error, eisdir},
-	?PRIM_FILE:rename(File, EmptyDir)),
-    ?line expect({error, eexist}, % FreeBSD (?)
-	{error, eisdir},
-	?PRIM_FILE:rename(File, NonEmptyDir)),
+    expect({error, eexist}, % FreeBSD (?)
+	   {error, eisdir},
+	   ?PRIM_FILE:rename(File, EmptyDir)),
+    expect({error, eexist}, % FreeBSD (?)
+	   {error, eisdir},
+	   ?PRIM_FILE:rename(File, NonEmptyDir)),
 
     %% Move a non-existing file.
-    ?line NonExistingFile = filename:join(
-	Base, "non_existing_file"),
-    ?line {error, enoent} = 
-    ?PRIM_FILE:rename(NonExistingFile, NonEmptyDir),
+    NonExistingFile = filename:join(
+			Base, "non_existing_file"),
+    {error, enoent} =
+	?PRIM_FILE:rename(NonExistingFile, NonEmptyDir),
 
     %% Overwrite a file with a directory.
-    ?line expect({error, eexist}, % FreeBSD (?)
-	{error, enotdir},
-	?PRIM_FILE:rename(ADirectory, File)),
+    expect({error, eexist}, % FreeBSD (?)
+	   {error, enotdir},
+	   ?PRIM_FILE:rename(ADirectory, File)),
 
     %% Move a file to another filesystem.
     %% XXX - This test case is bogus. We cannot be guaranteed that
@@ -1622,166 +1527,149 @@ e_rename(Config) when is_list(Config) ->
     %%       different filesystems.
     %%
     %% XXX - Gross hack!
-    ?line Comment = 
-    case os:type() of
-	{win32, _} ->
-	    %% At least Windows NT can
-	    %% successfully move a file to
-	    %% another drive.
-	    ok;
-	{unix, _ } ->
-	    OtherFs = "/tmp",
-	    ?line NameOnOtherFs =
-	    filename:join(OtherFs, 
-		filename:basename(File)),
-	    ?line {ok, Com} = 
-	    case ?PRIM_FILE:rename(
-		    File, NameOnOtherFs) of
-		{error, exdev} ->
-		    %% The file could be in 
-		    %% the same filesystem!
-		    {ok, ok};
-		ok ->
-		    {ok, {comment, 
-			    "Moving between filesystems "
-			    "suceeded, files are probably "
-			    "in the same filesystem!"}};
-		{error, eperm} ->
-		    {ok, {comment, "SBS! You don't "
-			    "have the permission to do "
-			    "this test!"}};
-		Else ->
-		    Else
-	    end,
-	    Com;
-	{ose, _} ->
-	    %% disabled for now
-	    ok
-    end,
-    ?line test_server:timetrap_cancel(Dog),
+    Comment =
+	case os:type() of
+	    {win32, _} ->
+		%% At least Windows NT can
+		%% successfully move a file to
+		%% another drive.
+		ok;
+	    _ ->
+		OtherFs = "/tmp",
+		NameOnOtherFs =
+		    filename:join(OtherFs,
+				  filename:basename(File)),
+		{ok, Com} =
+		    case ?PRIM_FILE:rename(
+			    File, NameOnOtherFs) of
+			{error, exdev} ->
+			    %% The file could be in
+			    %% the same filesystem!
+			    {ok, ok};
+			ok ->
+			    {ok, {comment,
+				  "Moving between filesystems "
+				  "suceeded, files are probably "
+				  "in the same filesystem!"}};
+			{error, eperm} ->
+			    {ok, {comment, "SBS! You don't "
+				  "have the permission to do "
+				  "this test!"}};
+			Else ->
+			    Else
+		    end,
+		Com
+	end,
     Comment.
 
-e_make_dir(suite) -> [];
-e_make_dir(doc) -> [];
 e_make_dir(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line Base = filename:join(RootDir, 
-			       atom_to_list(?MODULE)++"_e_make_dir"),
-    ?line ok = ?PRIM_FILE:make_dir(Base),
+    RootDir = proplists:get_value(priv_dir, Config),
+    Base = filename:join(RootDir,
+			 atom_to_list(?MODULE)++"_e_make_dir"),
+    ok = ?PRIM_FILE:make_dir(Base),
 
     %% A component of the path does not exist.
-    ?line {error, enoent} = 
+    {error, enoent} =
 	?PRIM_FILE:make_dir(filename:join([Base, "a", "b"])),
 
     %% Use a path-name with a non-directory component.
-    ?line Afile = filename:join(Base, "a_directory"),
-    ?line ok = ?PRIM_FILE:write_file(Afile, "hello\n"),
-    ?line case ?PRIM_FILE:make_dir(
-		  filename:join(Afile, "another_directory")) of
-	      {error, enotdir} -> io:format("Result: enotdir");
-	      {error, enoent} -> io:format("Result: enoent")
-	  end,
+    Afile = filename:join(Base, "a_directory"),
+    ok = ?PRIM_FILE:write_file(Afile, "hello\n"),
+    case ?PRIM_FILE:make_dir(
+	    filename:join(Afile, "another_directory")) of
+	{error, enotdir} -> io:format("Result: enotdir");
+	{error, enoent} -> io:format("Result: enoent")
+    end,
 
     %% No permission (on Unix only).
     case os:type() of
 	{win32, _} ->
 	    ok;
 	_ ->
-	    ?line ?PRIM_FILE:write_file_info(Base, #file_info {mode=0}),
-	    ?line {error, eacces} = 
+	    ?PRIM_FILE:write_file_info(Base, #file_info {mode=0}),
+	    {error, eacces} =
 		?PRIM_FILE:make_dir(filename:join(Base, "xxxx")),
-	    ?line 
-		?PRIM_FILE:write_file_info(Base, #file_info {mode=8#600})
+	    ?PRIM_FILE:write_file_info(Base, #file_info {mode=8#600})
     end,
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
-e_del_dir(suite) -> [];
-e_del_dir(doc) -> [];
 e_del_dir(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line Base = filename:join(RootDir, 
-			       atom_to_list(?MODULE)++"_e_del_dir"),
-    ?line io:format("Base: ~p", [Base]),
-    ?line ok = ?PRIM_FILE:make_dir(Base),
+    RootDir = proplists:get_value(priv_dir, Config),
+    Base = filename:join(RootDir,
+			 atom_to_list(?MODULE)++"_e_del_dir"),
+    io:format("Base: ~p", [Base]),
+    ok = ?PRIM_FILE:make_dir(Base),
 
     %% Delete a non-existent directory.
-    ?line {error, enoent} = 
+    {error, enoent} =
 	?PRIM_FILE:del_dir(filename:join(Base, "non_existing")),
 
     %% Use a path-name with a non-directory component.
-    ?line Afile = filename:join(Base, "a_directory"),
-    ?line ok = ?PRIM_FILE:write_file(Afile, "hello\n"),
-    ?line {error, E1} = 
+    Afile = filename:join(Base, "a_directory"),
+    ok = ?PRIM_FILE:write_file(Afile, "hello\n"),
+    {error, E1} =
 	expect({error, enotdir}, {error, enoent},
 	       ?PRIM_FILE:del_dir(
 		  filename:join(Afile, "another_directory"))),
-    ?line io:format("Result: ~p", [E1]),
+    io:format("Result: ~p", [E1]),
 
     %% Delete a non-empty directory.
     %% Delete a non-empty directory.
-    ?line {error, E2} = 
+    {error, E2} =
 	expect({error, enotempty}, {error, eexist}, {error, eacces},
 	       ?PRIM_FILE:del_dir(Base)),
-    ?line io:format("Result: ~p", [E2]),
+    io:format("Result: ~p", [E2]),
 
     %% Remove the current directory.
-    ?line {error, E3} = 
+    {error, E3} =
 	expect({error, einval}, 
 	       {error, eperm}, % Linux and DUX
 	       {error, eacces},
 	       {error, ebusy},
 	       ?PRIM_FILE:del_dir(".")),
-    ?line io:format("Result: ~p", [E3]),
+    io:format("Result: ~p", [E3]),
 
     %% No permission.
     case os:type() of
 	{win32, _} ->
 	    ok;
 	_ ->
-	    ?line ADirectory = filename:join(Base, "no_perm"),
-	    ?line ok = ?PRIM_FILE:make_dir(ADirectory),
-	    ?line ?PRIM_FILE:write_file_info(Base, #file_info {mode=0}),
-	    ?line {error, eacces} = ?PRIM_FILE:del_dir(ADirectory),
-	    ?line ?PRIM_FILE:write_file_info(
-		     Base, #file_info {mode=8#600})
+	    ADirectory = filename:join(Base, "no_perm"),
+	    ok = ?PRIM_FILE:make_dir(ADirectory),
+	    ?PRIM_FILE:write_file_info(Base, #file_info {mode=0}),
+	    {error, eacces} = ?PRIM_FILE:del_dir(ADirectory),
+	    ?PRIM_FILE:write_file_info(
+	       Base, #file_info {mode=8#600})
     end,
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 
 %% Trying reading and positioning from a compressed file.
 
-read_compressed(suite) -> [];
-read_compressed(doc) -> [];
 read_compressed(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line Real = filename:join(Data, "realmen.html.gz"),
-    ?line {ok, Fd} = ?PRIM_FILE:open(Real, [read, compressed]),
-    ?line try_read_file(Fd).
+    Data = proplists:get_value(data_dir, Config),
+    Real = filename:join(Data, "realmen.html.gz"),
+    {ok, Fd} = ?PRIM_FILE:open(Real, [read, compressed]),
+    try_read_file(Fd).
 
 %% Trying reading and positioning from an uncompressed file,
 %% but with the compressed flag given.
 
-read_not_really_compressed(suite) -> [];
-read_not_really_compressed(doc) -> [];
 read_not_really_compressed(Config) when is_list(Config) ->
-    ?line Data = ?config(data_dir, Config),
-    ?line Priv = ?config(priv_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
+    Priv = proplists:get_value(priv_dir, Config),
 
     %% The file realmen.html might have got CRs added (by WinZip).
     %% Remove them, or the file positions will not be correct.
 
-    ?line Real = filename:join(Data, "realmen.html"),
-    ?line RealPriv = filename:join(Priv, 
-				   atom_to_list(?MODULE)++"_realmen.html"),
-    ?line {ok, RealDataBin} = ?PRIM_FILE:read_file(Real),
-    ?line RealData = remove_crs(binary_to_list(RealDataBin), []),
-    ?line ok = ?PRIM_FILE:write_file(RealPriv, RealData),
-    ?line {ok, Fd} = ?PRIM_FILE:open(RealPriv, [read, compressed]),
-    ?line try_read_file(Fd).
+    Real = filename:join(Data, "realmen.html"),
+    RealPriv = filename:join(Priv,
+			     atom_to_list(?MODULE)++"_realmen.html"),
+    {ok, RealDataBin} = ?PRIM_FILE:read_file(Real),
+    RealData = remove_crs(binary_to_list(RealDataBin), []),
+    ok = ?PRIM_FILE:write_file(RealPriv, RealData),
+    {ok, Fd} = ?PRIM_FILE:open(RealPriv, [read, compressed]),
+    try_read_file(Fd).
 
 remove_crs([$\r|Rest], Result) ->
     remove_crs(Rest, Result);
@@ -1791,72 +1679,66 @@ remove_crs([], Result) ->
     lists:reverse(Result).
 
 try_read_file(Fd) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-
     %% Seek to the current position (nothing should happen).
 
-    ?line {ok, 0} = ?PRIM_FILE:position(Fd, 0),
-    ?line {ok, 0} = ?PRIM_FILE:position(Fd, {cur, 0}),
+    {ok, 0} = ?PRIM_FILE:position(Fd, 0),
+    {ok, 0} = ?PRIM_FILE:position(Fd, {cur, 0}),
 
     %% Read a few lines from a compressed file.
 
-    ?line ShouldBe = "<TITLE>Real Programmers Don't Use PASCAL</TITLE>\n",
-    ?line {ok, ShouldBe} = ?PRIM_FILE:read(Fd, length(ShouldBe)),
+    ShouldBe = "<TITLE>Real Programmers Don't Use PASCAL</TITLE>\n",
+    {ok, ShouldBe} = ?PRIM_FILE:read(Fd, length(ShouldBe)),
 
     %% Now seek forward.
 
-    ?line {ok, 381} = ?PRIM_FILE:position(Fd, 381),
-    ?line Back = "Back in the good old days -- the \"Golden Era\" " ++
+    {ok, 381} = ?PRIM_FILE:position(Fd, 381),
+    Back = "Back in the good old days -- the \"Golden Era\" " ++
 	"of computers, it was\n",
-    ?line {ok, Back} = ?PRIM_FILE:read(Fd, length(Back)),
+    {ok, Back} = ?PRIM_FILE:read(Fd, length(Back)),
 
     %% Try to search forward relative to the current position.
 
-    ?line {ok, CurPos} = ?PRIM_FILE:position(Fd, {cur, 0}),
-    ?line RealPos = 4273,
-    ?line {ok, RealPos} = ?PRIM_FILE:position(Fd, {cur, RealPos-CurPos}),
-    ?line RealProg = "<LI> Real Programmers aren't afraid to use GOTOs.\n",
-    ?line {ok, RealProg} = ?PRIM_FILE:read(Fd, length(RealProg)),
+    {ok, CurPos} = ?PRIM_FILE:position(Fd, {cur, 0}),
+    RealPos = 4273,
+    {ok, RealPos} = ?PRIM_FILE:position(Fd, {cur, RealPos-CurPos}),
+    RealProg = "<LI> Real Programmers aren't afraid to use GOTOs.\n",
+    {ok, RealProg} = ?PRIM_FILE:read(Fd, length(RealProg)),
 
     %% Seek backward.
 
-    ?line AfterTitle = length("<TITLE>"),
-    ?line {ok, AfterTitle} = ?PRIM_FILE:position(Fd, AfterTitle),
-    ?line Title = "Real Programmers Don't Use PASCAL</TITLE>\n",
-    ?line {ok, Title} = ?PRIM_FILE:read(Fd, length(Title)),
+    AfterTitle = length("<TITLE>"),
+    {ok, AfterTitle} = ?PRIM_FILE:position(Fd, AfterTitle),
+    Title = "Real Programmers Don't Use PASCAL</TITLE>\n",
+    {ok, Title} = ?PRIM_FILE:read(Fd, length(Title)),
 
     %% Done.
 
-    ?line ?PRIM_FILE:close(Fd),
-    ?line test_server:timetrap_cancel(Dog),
+    ?PRIM_FILE:close(Fd),
     ok.
 
-write_compressed(suite) -> [];
-write_compressed(doc) -> [];
 write_compressed(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Priv = ?config(priv_dir, Config),
-    ?line MyFile = filename:join(Priv, 
-				 atom_to_list(?MODULE)++"_test.gz"),
+    Priv = proplists:get_value(priv_dir, Config),
+    MyFile = filename:join(Priv,
+			   atom_to_list(?MODULE)++"_test.gz"),
 
     %% Write a file.
 
-    ?line {ok, Fd} = ?PRIM_FILE:open(MyFile, [write, compressed]),
-    ?line {ok, 0} = ?PRIM_FILE:position(Fd, 0),
-    ?line Prefix = "hello\n",
-    ?line End = "end\n",
-    ?line ok = ?PRIM_FILE:write(Fd, Prefix),
-    ?line {ok, 143} = ?PRIM_FILE:position(Fd, 143),
-    ?line ok = ?PRIM_FILE:write(Fd, End),
-    ?line ok = ?PRIM_FILE:close(Fd),
+    {ok, Fd} = ?PRIM_FILE:open(MyFile, [write, compressed]),
+    {ok, 0} = ?PRIM_FILE:position(Fd, 0),
+    Prefix = "hello\n",
+    End = "end\n",
+    ok = ?PRIM_FILE:write(Fd, Prefix),
+    {ok, 143} = ?PRIM_FILE:position(Fd, 143),
+    ok = ?PRIM_FILE:write(Fd, End),
+    ok = ?PRIM_FILE:close(Fd),
 
     %% Read the file and verify the contents.
 
-    ?line {ok, Fd1} = ?PRIM_FILE:open(MyFile, [read, compressed]),
-    ?line {ok, Prefix} = ?PRIM_FILE:read(Fd1, length(Prefix)),
-    ?line Second = lists:duplicate(143-length(Prefix), 0) ++ End,
-    ?line {ok, Second} = ?PRIM_FILE:read(Fd1, length(Second)),
-    ?line ok = ?PRIM_FILE:close(Fd1),
+    {ok, Fd1} = ?PRIM_FILE:open(MyFile, [read, compressed]),
+    {ok, Prefix} = ?PRIM_FILE:read(Fd1, length(Prefix)),
+    Second = lists:duplicate(143-length(Prefix), 0) ++ End,
+    {ok, Second} = ?PRIM_FILE:read(Fd1, length(Second)),
+    ok = ?PRIM_FILE:close(Fd1),
 
     %% Ensure that the file is compressed.
 
@@ -1865,71 +1747,61 @@ write_compressed(Config) when is_list(Config) ->
 	{ok, #file_info{size=Size}} when Size < TotalSize ->
 	    ok;
 	{ok, #file_info{size=Size}} when Size == TotalSize ->
-	    test_server:fail(file_not_compressed)
+	    ct:fail(file_not_compressed)
     end,
 
     %% Write again to ensure that the file is truncated.
 
-    ?line {ok, Fd2} = ?PRIM_FILE:open(MyFile, [write, compressed]),
-    ?line NewString = "aaaaaaaaaaa",
-    ?line ok = ?PRIM_FILE:write(Fd2, NewString),
-    ?line ok = ?PRIM_FILE:close(Fd2),
-    ?line {ok, Fd3} = ?PRIM_FILE:open(MyFile, [read, compressed]),
-    ?line {ok, NewString} = ?PRIM_FILE:read(Fd3, 1024),
-    ?line ok = ?PRIM_FILE:close(Fd3),
+    {ok, Fd2} = ?PRIM_FILE:open(MyFile, [write, compressed]),
+    NewString = "aaaaaaaaaaa",
+    ok = ?PRIM_FILE:write(Fd2, NewString),
+    ok = ?PRIM_FILE:close(Fd2),
+    {ok, Fd3} = ?PRIM_FILE:open(MyFile, [read, compressed]),
+    {ok, NewString} = ?PRIM_FILE:read(Fd3, 1024),
+    ok = ?PRIM_FILE:close(Fd3),
 
-    %% Done.
-
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
-compress_errors(suite) -> [];
-compress_errors(doc) -> [];
 compress_errors(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line Data = ?config(data_dir, Config),
-    ?line {error, enoent} = ?PRIM_FILE:open("non_existing__",
+    Data = proplists:get_value(data_dir, Config),
+    {error, enoent} = ?PRIM_FILE:open("non_existing__",
 				      [compressed, read]),
-    ?line {error, einval} = ?PRIM_FILE:open("non_existing__",
+    {error, einval} = ?PRIM_FILE:open("non_existing__",
 				      [compressed, read, write]),
 
     %% Read a corrupted .gz file.
 
-    ?line Corrupted = filename:join(Data, "corrupted.gz"),
-    ?line {ok, Fd} = ?PRIM_FILE:open(Corrupted, [read, compressed]),
-    ?line {error, eio} = ?PRIM_FILE:read(Fd, 100),
-    ?line ?PRIM_FILE:close(Fd),
+    Corrupted = filename:join(Data, "corrupted.gz"),
+    {ok, Fd} = ?PRIM_FILE:open(Corrupted, [read, compressed]),
+    {error, eio} = ?PRIM_FILE:read(Fd, 100),
+    ?PRIM_FILE:close(Fd),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 
-make_link_a(doc) -> "Test creating a hard link.";
-make_link_a(suite) -> [];
+%% Test creating a hard link.
 make_link_a(Config) when is_list(Config) ->
     make_link(Config, [], "_a").
 
-make_link_b(doc) -> "Test creating a hard link.";
-make_link_b(suite) -> [];
+%% Test creating a hard link.
 make_link_b(Config) when is_list(Config) ->
-    ?line {ok, Handle} = ?PRIM_FILE:start(),
+    {ok, Handle} = ?PRIM_FILE:start(),
     Result = make_link(Config, Handle, "_b"),
-    ?line ok = ?PRIM_FILE:stop(Handle),
+    ok = ?PRIM_FILE:stop(Handle),
     Result.
 
 make_link(Config, Handle, Suffix) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_make_link"++Suffix),
-    ?line ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
-    
-    ?line Name = filename:join(NewDir, "a_file"),
-    ?line ok = ?PRIM_FILE:write_file(Name, "some contents\n"),
-    
-    ?line Alias = filename:join(NewDir, "an_alias"),
-    ?line Result = 
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_make_link"++Suffix),
+    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
+
+    Name = filename:join(NewDir, "a_file"),
+    ok = ?PRIM_FILE:write_file(Name, "some contents\n"),
+
+    Alias = filename:join(NewDir, "an_alias"),
+    Result =
 	case ?PRIM_FILE_call(make_link, Handle, [Name, Alias]) of
 	    {error, enotsup} ->
 		{skipped, "Links not supported on this platform"};
@@ -1939,58 +1811,48 @@ make_link(Config, Handle, Suffix) ->
 		%% which should in behave exactly as 
 		%% ?PRIM_FILE:read_file_info/1
 		%% since they are not used on symbolic links.
-		
-		?line {ok, Info} = 
+
+		{ok, Info} =
 		    ?PRIM_FILE_call(read_link_info, Handle, [Name]),
-		?line {ok, Info} = 
+		{ok, Info} =
 		    ?PRIM_FILE_call(read_link_info, Handle, [Alias]),
-		?line #file_info{links = 2, type = regular} = Info,
-		?line {error, eexist} = 
+		#file_info{links = 2, type = regular} = Info,
+		{error, eexist} =
 		    ?PRIM_FILE_call(make_link, Handle, [Name, Alias]),
 		ok
 	end,
-    
-    ?line test_server:timetrap_cancel(Dog),
+
     Result.
 
-read_link_info_for_non_link(doc) ->
-    "Test that reading link info for an ordinary file or directory works "
-	"(on all platforms).";
-read_link_info_for_non_link(suite) -> [];
+%% Test that reading link info for an ordinary file or directory works
+%% (on all platforms).
 read_link_info_for_non_link(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-
-    ?line {ok, #file_info{type=directory}} = ?PRIM_FILE:read_link_info("."),
-		  
-    ?line test_server:timetrap_cancel(Dog),
+    {ok, #file_info{type=directory}} = ?PRIM_FILE:read_link_info("."),
     ok.
-    
-symlinks_a(doc) -> "Test operations on symbolic links (for Unix).";
-symlinks_a(suite) -> [];
+
+%% Test operations on symbolic links (for Unix).
 symlinks_a(Config) when is_list(Config) ->
     symlinks(Config, [], "_a").
 
-symlinks_b(doc) -> "Test operations on symbolic links (for Unix).";
-symlinks_b(suite) -> [];
+%% Test operations on symbolic links (for Unix).
 symlinks_b(Config) when is_list(Config) ->
-    ?line {ok, Handle} = ?PRIM_FILE:start(),
+    {ok, Handle} = ?PRIM_FILE:start(),
     Result = symlinks(Config, Handle, "_b"),
-    ?line ok = ?PRIM_FILE:stop(Handle),
+    ok = ?PRIM_FILE:stop(Handle),
     Result.
 
 symlinks(Config, Handle, Suffix) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir, 
-				 atom_to_list(?MODULE)
-				 ++"_make_symlink"++Suffix),
-    ?line ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
-    
-    ?line Name = filename:join(NewDir, "a_plain_file"),
-    ?line ok = ?PRIM_FILE:write_file(Name, "some stupid content\n"),
-    
-    ?line Alias = filename:join(NewDir, "a_symlink_alias"),
-    ?line Result = 
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)
+			   ++"_make_symlink"++Suffix),
+    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
+
+    Name = filename:join(NewDir, "a_plain_file"),
+    ok = ?PRIM_FILE:write_file(Name, "some stupid content\n"),
+
+    Alias = filename:join(NewDir, "a_symlink_alias"),
+    Result =
 	case ?PRIM_FILE_call(make_symlink, Handle, [Name, Alias]) of
 	    {error, enotsup} ->
 		{skipped, "Links not supported on this platform"};
@@ -1998,18 +1860,18 @@ symlinks(Config, Handle, Suffix) ->
 		{win32,_} = os:type(),
 		{skipped, "Windows user not privileged to create links"};
 	    ok ->
-		?line {ok, Info1} = 
+		{ok, Info1} =
 		    ?PRIM_FILE_call(read_file_info, Handle, [Name]),
-		?line {ok, Info1} = 
+		{ok, Info1} =
 		    ?PRIM_FILE_call(read_file_info, Handle, [Alias]),
-		?line {ok, Info1} = 
+		{ok, Info1} =
 		    ?PRIM_FILE_call(read_link_info, Handle, [Name]),
-		?line #file_info{links = 1, type = regular} = Info1,
-		
-		?line {ok, Info2} = 
+		#file_info{links = 1, type = regular} = Info1,
+
+		{ok, Info2} =
 		    ?PRIM_FILE_call(read_link_info, Handle, [Alias]),
-		?line #file_info{links=1, type=symlink} = Info2,
-		?line {ok, Name} = 
+		#file_info{links=1, type=symlink} = Info2,
+		{ok, Name} =
 		    ?PRIM_FILE_call(read_link, Handle, [Alias]),
 		{ok, Name} =
 		    ?PRIM_FILE_call(read_link_all, Handle, [Alias]),
@@ -2017,45 +1879,39 @@ symlinks(Config, Handle, Suffix) ->
 		rm_rf(?PRIM_FILE,NewDir),
 		ok
 	end,
-    
-    ?line test_server:timetrap_cancel(Dog),
+
     Result.
 
 %% Creates as many files as possible during a certain time, 
 %% periodically calls list_dir/2 to check if it works,
 %% then deletes all files.
 
-list_dir_limit(doc) ->
-    "Tests if large directories can be read";
-list_dir_limit(suite) ->
-    [];
+%% Tests if large directories can be read.
 list_dir_limit(Config) when is_list(Config) ->
-    ?line MaxTime = 120, 
-    ?line MaxNumber = 20000, 
-    ?line Dog = test_server:timetrap(
-		  test_server:seconds(2*MaxTime + MaxTime)),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line NewDir = filename:join(RootDir,
-				 atom_to_list(?MODULE)++"_list_dir_limit"),
-    ?line {ok, Handle1} = ?PRIM_FILE:start(),
-    ?line ok = ?PRIM_FILE_call(make_dir, Handle1, [NewDir]),
+    MaxTime = 120,
+    MaxNumber = 20000,
+    ct:timetrap({seconds,2*MaxTime + MaxTime}),
+    RootDir = proplists:get_value(priv_dir, Config),
+    NewDir = filename:join(RootDir,
+			   atom_to_list(?MODULE)++"_list_dir_limit"),
+    {ok, Handle1} = ?PRIM_FILE:start(),
+    ok = ?PRIM_FILE_call(make_dir, Handle1, [NewDir]),
     Ref = erlang:start_timer(MaxTime*1000, self(), []),
-    ?line Result = list_dir_limit_loop(NewDir, Handle1, Ref, MaxNumber, 0),
-    ?line Time = case erlang:cancel_timer(Ref) of
-		     false -> MaxTime;
-		     T -> MaxTime - (T div 1000)
-		 end,
-    ?line Number = case Result of
-		       {ok, N} -> N;
-		       {error, _Reason, N} -> N;
-		       _ -> 0
-		   end,
-    ?line {ok, Handle2} = ?PRIM_FILE:start(),
-    ?line list_dir_limit_cleanup(NewDir, Handle2, Number, 0),
-    ?line ok = ?PRIM_FILE:stop(Handle1),
-    ?line ok = ?PRIM_FILE:stop(Handle2),
-    ?line {ok, Number} = Result,
-    ?line test_server:timetrap_cancel(Dog),
+    Result = list_dir_limit_loop(NewDir, Handle1, Ref, MaxNumber, 0),
+    Time = case erlang:cancel_timer(Ref) of
+	       false -> MaxTime;
+	       T -> MaxTime - (T div 1000)
+	   end,
+    Number = case Result of
+		 {ok, N} -> N;
+		 {error, _Reason, N} -> N;
+		 _ -> 0
+	     end,
+    {ok, Handle2} = ?PRIM_FILE:start(),
+    list_dir_limit_cleanup(NewDir, Handle2, Number, 0),
+    ok = ?PRIM_FILE:stop(Handle1),
+    ok = ?PRIM_FILE:stop(Handle2),
+    {ok, Number} = Result,
     {comment, 
      "Created " ++ integer_to_list(Number) ++ " files in " 
      ++ integer_to_list(Time) ++ " seconds."}.
@@ -2124,7 +1980,7 @@ list_dir_limit_cleanup(Dir, Handle, N, Cnt) ->
 %%%
 
 list_dir_error(Config) ->
-    Priv = ?config(priv_dir, Config),
+    Priv = proplists:get_value(priv_dir, Config),
     NonExisting = filename:join(Priv, "non-existing-dir"),
     {error,enoent} = prim_file:list_dir(NonExisting),
     ok.
@@ -2134,7 +1990,7 @@ list_dir_error(Config) ->
 %%%
 
 list_dir(Config) ->
-    RootDir = ?config(priv_dir, Config),
+    RootDir = proplists:get_value(priv_dir, Config),
     TestDir = filename:join(RootDir, ?MODULE_STRING++"_list_dir"),
     ?PRIM_FILE:make_dir(TestDir),
     list_dir_1(TestDir, 42, []).
@@ -2165,7 +2021,7 @@ run_large_file_test(Config, Run, Name) ->
 	{{unix,sunos},OsVersion} when OsVersion < {5,5,1} ->
 	    {skip,"Only supported on Win32, Unix or SunOS >= 5.5.1"};
 	{{unix,_},_} ->
-	    N = unix_free(?config(priv_dir, Config)),
+	    N = unix_free(proplists:get_value(priv_dir, Config)),
 	    io:format("Free disk: ~w KByte~n", [N]),
 	    if N < 5 bsl 20 ->
 		    %% Less than 5 GByte free
@@ -2179,9 +2035,9 @@ run_large_file_test(Config, Run, Name) ->
 
 
 do_run_large_file_test(Config, Run, Name0) ->
-    Name = filename:join(?config(priv_dir, Config),
+    Name = filename:join(proplists:get_value(priv_dir, Config),
 			 ?MODULE_STRING ++ Name0),
-    
+
     %% Set up a process that will delete this file.
     Tester = self(),
     Deleter = 
@@ -2194,7 +2050,7 @@ do_run_large_file_test(Config, Run, Name0) ->
 		  end,
 		  prim_file:delete(Name)
 	  end),
-    
+
     %% Run the test case.
     Res = Run(Name),
 
diff --git a/lib/kernel/test/ram_file_SUITE.erl b/lib/kernel/test/ram_file_SUITE.erl
index 933dc88d21..d90995923a 100644
--- a/lib/kernel/test/ram_file_SUITE.erl
+++ b/lib/kernel/test/ram_file_SUITE.erl
@@ -26,9 +26,10 @@
 	 init_per_testcase/2, end_per_testcase/2]).
 -export([open_modes/1, open_old_modes/1, pread_pwrite/1, position/1,
 	 truncate/1, sync/1, get_set_file/1, compress/1, uuencode/1,
-	 large_file_errors/1, large_file_light/1, large_file_heavy/1]).
+	 large_file_errors/1, large_file_light/1,
+	 large_file_heavy/0, large_file_heavy/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -define(FILE_MODULE, file).         % Name of module to test
@@ -36,7 +37,9 @@
 
 %%--------------------------------------------------------------------------
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [open_modes, open_old_modes, pread_pwrite, position,
@@ -59,37 +62,23 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Time = 
-	case Func of
-	    large_file_heavy -> 
-		?t:minutes(5);
-	    _ ->
-		?t:seconds(10)
-	end,
-    Dog = ?t:timetrap(Time),
-    %% error_logger:info_msg("~p:~p *****~n", [?MODULE, Func]),
-    [{watchdog, Dog} | Config].
+init_per_testcase(Func, Config) ->
+    Config.
 
 end_per_testcase(_Func, Config) ->
-    %% error_logger:info_msg("~p:~p END *****~n", [?MODULE, Func]),
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
+    Config.
 
 %%--------------------------------------------------------------------------
 %% Test suites
 
-open_modes(suite) ->
-    [];
-open_modes(doc) ->
-    ["Test that the basic read, write and binary options works for open/2."];
+%% Test that the basic read, write and binary options works for open/2.
 open_modes(Config) when is_list(Config) ->
-    ?line Str1 = "The quick brown fox ",
-    ?line Str2 = "jumps over a lazy dog ",
-    ?line Str  = Str1 ++ Str2,
-    ?line Bin1 = list_to_binary(Str1),
-    ?line Bin2 = list_to_binary(Str2),
-    ?line Bin  = list_to_binary(Str),
+    Str1 = "The quick brown fox ",
+    Str2 = "jumps over a lazy dog ",
+    Str  = Str1 ++ Str2,
+    Bin1 = list_to_binary(Str1),
+    Bin2 = list_to_binary(Str2),
+    Bin  = list_to_binary(Str),
     %%
     open_read_write(?FILE_MODULE, Str1, [ram, read, write], Str2),
     open_read(?FILE_MODULE, Str, [ram]),
@@ -98,18 +87,15 @@ open_modes(Config) when is_list(Config) ->
     %%
     ok.
 
-open_old_modes(suite) ->
-    [];
-open_old_modes(doc) ->
-    ["Test that the old style read, write and binary options ", 
-     "works for open/2."];
+%% Test that the old style read, write and binary options
+%% works for open/2.
 open_old_modes(Config) when is_list(Config) ->
-    ?line Str1 = "The quick brown fox ",
-    ?line Str2 = "jumps over a lazy dog ",
-    ?line Str  = Str1 ++ Str2,
-    ?line Bin1 = list_to_binary(Str1),
-    ?line Bin2 = list_to_binary(Str2),
-    ?line Bin  = list_to_binary(Str),
+    Str1 = "The quick brown fox ",
+    Str2 = "jumps over a lazy dog ",
+    Str  = Str1 ++ Str2,
+    Bin1 = list_to_binary(Str1),
+    Bin2 = list_to_binary(Str2),
+    Bin  = list_to_binary(Str),
     %%
     open_read_write(?RAM_FILE_MODULE, Str1, read_write, Str2),
     open_read(?RAM_FILE_MODULE, Str, read),
@@ -119,57 +105,54 @@ open_old_modes(Config) when is_list(Config) ->
     ok.
 
 open_read_write(Module, Data1, Options, Data2) ->
-    ?line io:format("~p:open_read_write(~p, ~p, ~p, ~p)~n", 
-		    [?MODULE, Module, Data1, Options, Data2]),
-    %%
-    ?line Size1 = sizeof(Data1),
-    ?line Size2 = sizeof(Data2),
-    ?line Data  = append(Data1, Data2),
-    ?line Size  = Size1 + Size2,
-    %%
-    ?line {ok, Fd}    = Module:open(Data1, Options),
-    ?line {ok, Data1} = Module:read(Fd, Size1),
-    ?line eof         = Module:read(Fd, 1),
-    ?line {ok, Zero}  = Module:read(Fd, 0),
-    ?line 0           = sizeof(Zero),
-    ?line ok          = Module:write(Fd, Data2),
-    ?line {ok, 0}     = Module:position(Fd, bof),
-    ?line {ok, Data}  = Module:read(Fd, Size),
-    ?line eof         = Module:read(Fd, 1),
-    ?line {ok, Zero}  = Module:read(Fd, 0),
-    ?line ok          = Module:close(Fd),
-    %%
-    ?line ok.
+    io:format("~p:open_read_write(~p, ~p, ~p, ~p)~n",
+	      [?MODULE, Module, Data1, Options, Data2]),
+    %%
+    Size1 = sizeof(Data1),
+    Size2 = sizeof(Data2),
+    Data  = append(Data1, Data2),
+    Size  = Size1 + Size2,
+    %%
+    {ok, Fd}    = Module:open(Data1, Options),
+    {ok, Data1} = Module:read(Fd, Size1),
+    eof         = Module:read(Fd, 1),
+    {ok, Zero}  = Module:read(Fd, 0),
+    0           = sizeof(Zero),
+    ok          = Module:write(Fd, Data2),
+    {ok, 0}     = Module:position(Fd, bof),
+    {ok, Data}  = Module:read(Fd, Size),
+    eof         = Module:read(Fd, 1),
+    {ok, Zero}  = Module:read(Fd, 0),
+    ok          = Module:close(Fd),
+    %%
+    ok.
 
 open_read(Module, Data, Options) ->
-    ?line io:format("~p:open_read(~p, ~p, ~p)~n", 
-		    [?MODULE, Module, Data, Options]),
-    %%
-    ?line Size = sizeof(Data),
-    %%
-    ?line {ok, Fd}         = Module:open(Data, Options),
-    ?line {ok, Data}       = Module:read(Fd, Size),
-    ?line eof              = Module:read(Fd, 1),
-    ?line {ok, Zero}       = Module:read(Fd, 0),
-    ?line 0                = sizeof(Zero),
-    ?line {error, ebadf}   = Module:write(Fd, Data),
-    ?line {ok, 0}          = Module:position(Fd, bof),
-    ?line {ok, Data}       = Module:read(Fd, Size),
-    ?line eof              = Module:read(Fd, 1),
-    ?line {ok, Zero}       = Module:read(Fd, 0),
-    ?line ok               = Module:close(Fd),
+    io:format("~p:open_read(~p, ~p, ~p)~n",
+	      [?MODULE, Module, Data, Options]),
+    %%
+    Size = sizeof(Data),
+    %%
+    {ok, Fd}         = Module:open(Data, Options),
+    {ok, Data}       = Module:read(Fd, Size),
+    eof              = Module:read(Fd, 1),
+    {ok, Zero}       = Module:read(Fd, 0),
+    0                = sizeof(Zero),
+    {error, ebadf}   = Module:write(Fd, Data),
+    {ok, 0}          = Module:position(Fd, bof),
+    {ok, Data}       = Module:read(Fd, Size),
+    eof              = Module:read(Fd, 1),
+    {ok, Zero}       = Module:read(Fd, 0),
+    ok               = Module:close(Fd),
     %%
-    ?line ok.
+    ok.
 
 
 
-pread_pwrite(suite) ->
-    [];
-pread_pwrite(doc) ->
-    ["Test that pread/2,3 and pwrite/2,3 works."];
+%% Test that pread/2,3 and pwrite/2,3 works.
 pread_pwrite(Config) when is_list(Config) ->
-    ?line Str = "Flygande bäckaziner söka hwila på mjuqa tuvor x",
-    ?line Bin = list_to_binary(Str),
+    Str = "Flygande bäckaziner söka hwila på mjuqa tuvor x",
+    Bin = list_to_binary(Str),
     %%
     pread_pwrite_test(?FILE_MODULE, Str, [ram, read, write]),
     pread_pwrite_test(?FILE_MODULE, Bin, [ram, binary, read, write]),
@@ -179,36 +162,33 @@ pread_pwrite(Config) when is_list(Config) ->
     ok.
 
 pread_pwrite_test(Module, Data, Options) ->
-    ?line io:format("~p:pread_pwrite_test(~p, ~p, ~p)~n", 
-		    [?MODULE, Module, Data, Options]),
-    %%
-    ?line Size = sizeof(Data),
-    %%
-    ?line {ok, Fd}         = Module:open([], Options),
-    ?line ok               = Module:pwrite(Fd, 0, Data),
-    ?line {ok, Data}       = Module:pread(Fd, 0, Size+1),
-    ?line eof              = Module:pread(Fd, Size+1, 1),
-    ?line {ok, Zero}       = Module:pread(Fd, Size+1, 0),
-    ?line 0                = sizeof(Zero),
-    ?line ok               = Module:pwrite(Fd, [{0, Data}, {Size+17, Data}]),
-    ?line {ok, [Data, 
-		eof, 
-		Data,
-		Zero]}     = Module:pread(Fd, [{Size+17, Size+1},
-					       {2*Size+17+1, 1},
-					       {0, Size},
-					       {2*Size+17+1, 0}]),
-    ?line ok               = Module:close(Fd),
-    %%
-    ?line ok.
-
-position(suite) ->
-    [];
-position(doc) ->
-    ["Test that position/2 works."];
+    io:format("~p:pread_pwrite_test(~p, ~p, ~p)~n",
+	      [?MODULE, Module, Data, Options]),
+    %%
+    Size = sizeof(Data),
+    %%
+    {ok, Fd}         = Module:open([], Options),
+    ok               = Module:pwrite(Fd, 0, Data),
+    {ok, Data}       = Module:pread(Fd, 0, Size+1),
+    eof              = Module:pread(Fd, Size+1, 1),
+    {ok, Zero}       = Module:pread(Fd, Size+1, 0),
+    0                = sizeof(Zero),
+    ok               = Module:pwrite(Fd, [{0, Data}, {Size+17, Data}]),
+    {ok, [Data,
+	  eof,
+	  Data,
+	  Zero]}     = Module:pread(Fd, [{Size+17, Size+1},
+					 {2*Size+17+1, 1},
+					 {0, Size},
+					 {2*Size+17+1, 0}]),
+    ok               = Module:close(Fd),
+    %%
+    ok.
+
+%% Test that position/2 works.
 position(Config) when is_list(Config) ->
-    ?line Str = "Att vara eller icke vara, det är frågan. ",
-    ?line Bin = list_to_binary(Str),
+    Str = "Att vara eller icke vara, det är frågan. ",
+    Bin = list_to_binary(Str),
     %%
     position_test(?FILE_MODULE, Str, [ram, read]),
     position_test(?FILE_MODULE, Bin, [ram, binary]),
@@ -218,79 +198,76 @@ position(Config) when is_list(Config) ->
     ok.
 
 position_test(Module, Data, Options) ->
-    ?line io:format("~p:position_test(~p, ~p, ~p)~n", 
-		    [?MODULE, Module, Data, Options]),
-    %%
-    ?line Size = sizeof(Data),
-    ?line Size_7 = Size+7,
-    %%
-    ?line Slice_0_2 = slice(Data, 0, 2),
-    ?line Slice_0_3 = slice(Data, 0, 3),
-    ?line Slice_2_5 = slice(Data, 2, 5),
-    ?line Slice_3_4 = slice(Data, 3, 4),
-    ?line Slice_5   = slice(Data, 5, Size),
-    %%
-    ?line {ok, Fd}          = Module:open(Data, Options),
-    %%
-    ?line io:format("CUR positions"),
-    ?line {ok, Slice_0_2}   = Module:read(Fd, 2),
-    ?line {ok, 2}           = Module:position(Fd, cur),
-    ?line {ok, Slice_2_5}   = Module:read(Fd, 5),
-    ?line {ok, 3}           = Module:position(Fd, {cur, -4}),
-    ?line {ok, Slice_3_4}   = Module:read(Fd, 4),
-    ?line {ok, 0}           = Module:position(Fd, {cur, -7}),
-    ?line {ok, Slice_0_3}   = Module:read(Fd, 3),
-    ?line {ok, 0}           = Module:position(Fd, {cur, -3}),
-    ?line {error, einval}   = Module:position(Fd, {cur, -1}),
-    ?line {ok, 0}           = Module:position(Fd, 0),
-    ?line {ok, 2}           = Module:position(Fd, {cur, 2}),
-    ?line {ok, Slice_2_5}   = Module:read(Fd, 5),
-    ?line {ok, Size_7}      = Module:position(Fd, {cur, Size}),
-    ?line {ok, Zero}        = Module:read(Fd, 0),
-    ?line 0                 = sizeof(Zero),
-    ?line eof               = Module:read(Fd, 1),
-    %%
-    ?line io:format("Absolute and BOF positions"),
-    ?line {ok, Size}        = Module:position(Fd, Size),
-    ?line eof               = Module:read(Fd, 1),
-    ?line {ok, 5}           = Module:position(Fd, 5),
-    ?line {ok, Slice_5}     = Module:read(Fd, Size),
-    ?line {ok, 2}           = Module:position(Fd, {bof, 2}),
-    ?line {ok, Slice_2_5}   = Module:read(Fd, 5),
-    ?line {ok, 3}           = Module:position(Fd, 3),
-    ?line {ok, Slice_3_4}   = Module:read(Fd, 4),
-    ?line {ok, 0}           = Module:position(Fd, bof),
-    ?line {ok, Slice_0_2}   = Module:read(Fd, 2),
-    ?line {ok, Size_7}      = Module:position(Fd, {bof, Size_7}),
-    ?line {ok, Zero}        = Module:read(Fd, 0),
-    %%
-    ?line io:format("EOF positions"),
-    ?line {ok, Size}        = Module:position(Fd, eof),
-    ?line eof               = Module:read(Fd, 1),
-    ?line {ok, 5}           = Module:position(Fd, {eof, -Size+5}),
-    ?line {ok, Slice_5}     = Module:read(Fd, Size),
-    ?line {ok, 2}           = Module:position(Fd, {eof, -Size+2}),
-    ?line {ok, Slice_2_5}   = Module:read(Fd, 5),
-    ?line {ok, 3}           = Module:position(Fd, {eof, -Size+3}),
-    ?line {ok, Slice_3_4}   = Module:read(Fd, 4),
-    ?line {ok, 0}           = Module:position(Fd, {eof, -Size}),
-    ?line {ok, Slice_0_2}   = Module:read(Fd, 2),
-    ?line {ok, Size_7}      = Module:position(Fd, {eof, 7}),
-    ?line {ok, Zero}        = Module:read(Fd, 0),
-    ?line eof               = Module:read(Fd, 1),
-    %%
-    ?line ok.
-
-
-
-truncate(suite) ->
-    [];
-truncate(doc) ->
-    ["Test that truncate/1 works."];
+    io:format("~p:position_test(~p, ~p, ~p)~n",
+	      [?MODULE, Module, Data, Options]),
+    %%
+    Size = sizeof(Data),
+    Size_7 = Size+7,
+    %%
+    Slice_0_2 = slice(Data, 0, 2),
+    Slice_0_3 = slice(Data, 0, 3),
+    Slice_2_5 = slice(Data, 2, 5),
+    Slice_3_4 = slice(Data, 3, 4),
+    Slice_5   = slice(Data, 5, Size),
+    %%
+    {ok, Fd}          = Module:open(Data, Options),
+    %%
+    io:format("CUR positions"),
+    {ok, Slice_0_2}   = Module:read(Fd, 2),
+    {ok, 2}           = Module:position(Fd, cur),
+    {ok, Slice_2_5}   = Module:read(Fd, 5),
+    {ok, 3}           = Module:position(Fd, {cur, -4}),
+    {ok, Slice_3_4}   = Module:read(Fd, 4),
+    {ok, 0}           = Module:position(Fd, {cur, -7}),
+    {ok, Slice_0_3}   = Module:read(Fd, 3),
+    {ok, 0}           = Module:position(Fd, {cur, -3}),
+    {error, einval}   = Module:position(Fd, {cur, -1}),
+    {ok, 0}           = Module:position(Fd, 0),
+    {ok, 2}           = Module:position(Fd, {cur, 2}),
+    {ok, Slice_2_5}   = Module:read(Fd, 5),
+    {ok, Size_7}      = Module:position(Fd, {cur, Size}),
+    {ok, Zero}        = Module:read(Fd, 0),
+    0                 = sizeof(Zero),
+    eof               = Module:read(Fd, 1),
+    %%
+    io:format("Absolute and BOF positions"),
+    {ok, Size}        = Module:position(Fd, Size),
+    eof               = Module:read(Fd, 1),
+    {ok, 5}           = Module:position(Fd, 5),
+    {ok, Slice_5}     = Module:read(Fd, Size),
+    {ok, 2}           = Module:position(Fd, {bof, 2}),
+    {ok, Slice_2_5}   = Module:read(Fd, 5),
+    {ok, 3}           = Module:position(Fd, 3),
+    {ok, Slice_3_4}   = Module:read(Fd, 4),
+    {ok, 0}           = Module:position(Fd, bof),
+    {ok, Slice_0_2}   = Module:read(Fd, 2),
+    {ok, Size_7}      = Module:position(Fd, {bof, Size_7}),
+    {ok, Zero}        = Module:read(Fd, 0),
+    %%
+    io:format("EOF positions"),
+    {ok, Size}        = Module:position(Fd, eof),
+    eof               = Module:read(Fd, 1),
+    {ok, 5}           = Module:position(Fd, {eof, -Size+5}),
+    {ok, Slice_5}     = Module:read(Fd, Size),
+    {ok, 2}           = Module:position(Fd, {eof, -Size+2}),
+    {ok, Slice_2_5}   = Module:read(Fd, 5),
+    {ok, 3}           = Module:position(Fd, {eof, -Size+3}),
+    {ok, Slice_3_4}   = Module:read(Fd, 4),
+    {ok, 0}           = Module:position(Fd, {eof, -Size}),
+    {ok, Slice_0_2}   = Module:read(Fd, 2),
+    {ok, Size_7}      = Module:position(Fd, {eof, 7}),
+    {ok, Zero}        = Module:read(Fd, 0),
+    eof               = Module:read(Fd, 1),
+    %%
+    ok.
+
+
+
+%% Test that truncate/1 works.
 truncate(Config) when is_list(Config) ->
-    ?line Str = "Mån ädlare att lida och fördraga "
+    Str = "Mån ädlare att lida och fördraga "
 	++ "ett bittert ödes stygn av pilar, ",
-    ?line Bin = list_to_binary(Str),
+    Bin = list_to_binary(Str),
     %%
     ok = truncate_test(?FILE_MODULE, Str, [ram, read, write]),
     ok = truncate_test(?FILE_MODULE, Bin, [ram, binary, read, write]),
@@ -305,35 +282,32 @@ truncate(Config) when is_list(Config) ->
     ok.
 
 truncate_test(Module, Data, Options) ->
-    ?line io:format("~p:truncate_test(~p, ~p, ~p)~n", 
-		    [?MODULE, Module, Data, Options]),
-    %%
-    ?line Size = sizeof(Data),
-    ?line Size1 = Size-2,
-    ?line Data1 = slice(Data, 0, Size1),
-    %%
-    ?line {ok, Fd}    = Module:open(Data, Options),
-    ?line {ok, Size1} = Module:position(Fd, Size1),
-    ?line case Module:truncate(Fd) of
-	      ok ->
-		  ?line {ok, 0}     = Module:position(Fd, 0),
-		  ?line {ok, Data1} = Module:read(Fd, Size),
-		  ?line ok          = Module:close(Fd),
-		  ?line ok;
-	      Error ->
-		  ?line ok      = Module:close(Fd),
-		  ?line Error
-	  end.
-
-
-
-sync(suite) ->
-    [];
-sync(doc) ->
-    ["Test that sync/1 at least does not crash."];
+    io:format("~p:truncate_test(~p, ~p, ~p)~n",
+	      [?MODULE, Module, Data, Options]),
+    %%
+    Size = sizeof(Data),
+    Size1 = Size-2,
+    Data1 = slice(Data, 0, Size1),
+    %%
+    {ok, Fd}    = Module:open(Data, Options),
+    {ok, Size1} = Module:position(Fd, Size1),
+    case Module:truncate(Fd) of
+	ok ->
+	    {ok, 0}     = Module:position(Fd, 0),
+	    {ok, Data1} = Module:read(Fd, Size),
+	    ok          = Module:close(Fd),
+	    ok;
+	Error ->
+	    ok      = Module:close(Fd),
+	    Error
+    end.
+
+
+
+%% Test that sync/1 at least does not crash.
 sync(Config) when is_list(Config) ->
-    ?line Str = "än att ta till vapen mot ett hav av kval. ",
-    ?line Bin = list_to_binary(Str),
+    Str = "än att ta till vapen mot ett hav av kval. ",
+    Bin = list_to_binary(Str),
     %%
     sync_test(?FILE_MODULE, Str, [ram, read, write]),
     sync_test(?FILE_MODULE, Bin, [ram, binary, read, write]),
@@ -348,28 +322,25 @@ sync(Config) when is_list(Config) ->
     ok.
 
 sync_test(Module, Data, Options) ->
-    ?line io:format("~p:sync_test(~p, ~p, ~p)~n", 
-		    [?MODULE, Module, Data, Options]),
+    io:format("~p:sync_test(~p, ~p, ~p)~n",
+	      [?MODULE, Module, Data, Options]),
     %%
-    ?line Size = sizeof(Data),
+    Size = sizeof(Data),
     %%
-    ?line {ok, Fd}    = Module:open(Data, Options),
-    ?line ok          = Module:sync(Fd),
-    ?line {ok, Data}  = Module:read(Fd, Size+1),
-    ?line ok.
+    {ok, Fd}    = Module:open(Data, Options),
+    ok          = Module:sync(Fd),
+    {ok, Data}  = Module:read(Fd, Size+1),
+    ok.
 
 
 
-get_set_file(suite) ->
-    [];
-get_set_file(doc) ->
-    ["Tests get_file/1, set_file/2, get_file_close/1 and get_size/1."];
+%% Tests get_file/1, set_file/2, get_file_close/1 and get_size/1.
 get_set_file(Config) when is_list(Config) ->
     %% These two strings should not be of equal length.
-    ?line Str  = "När högan nord blir snöbetäckt, ",
-    ?line Str2 = "får alla harar byta dräkt. ",
-    ?line Bin  = list_to_binary(Str),
-    ?line Bin2 = list_to_binary(Str2),
+    Str  = "När högan nord blir snöbetäckt, ",
+    Str2 = "får alla harar byta dräkt. ",
+    Bin  = list_to_binary(Str),
+    Bin2 = list_to_binary(Str2),
     %%
     ok = get_set_file_test(Str, read_write, Str2),
     ok = get_set_file_test(Bin, [binary, read, write], Bin2),
@@ -379,87 +350,84 @@ get_set_file(Config) when is_list(Config) ->
     ok.
 
 get_set_file_test(Data, Options, Data2) ->
-    ?line io:format("~p:get_set_file_test(~p, ~p, ~p)~n", 
-		    [?MODULE, Data, Options, Data2]),
-    %%
-    ?line Size  = sizeof(Data),
-    ?line Size2 = sizeof(Data2),
-    %%
-    ?line {ok, Fd}        = ?RAM_FILE_MODULE:open(Data, Options),
-    ?line {ok, Size}      = ?RAM_FILE_MODULE:get_size(Fd),
-    ?line {ok, Data}      = ?RAM_FILE_MODULE:get_file(Fd),
-    ?line {ok, Data}      = ?RAM_FILE_MODULE:get_file_close(Fd),
-    ?line {error, einval} = ?RAM_FILE_MODULE:get_size(Fd),
-    ?line {ok, Fd2}       = ?RAM_FILE_MODULE:open(Data, Options),
-    ?line case ?RAM_FILE_MODULE:set_file(Fd2, Data2) of
-	      {ok, Size2} ->
-		  ?line {ok, Size2} = ?RAM_FILE_MODULE:get_size(Fd2),
-		  ?line {ok, Data2} = ?RAM_FILE_MODULE:get_file(Fd2),
-		  ?line {ok, Data2} = ?RAM_FILE_MODULE:get_file_close(Fd2),
-		  ?line ok;
-	      {error, _} = Error ->
-		  ?line {ok, Data}  = ?RAM_FILE_MODULE:get_file_close(Fd2),
-		  ?line Error
-	  end.
-    
-
-    
-compress(suite) ->
-    [];
-compress(doc) ->
-    ["Test that compress/1 and uncompress/1 works."];
+    io:format("~p:get_set_file_test(~p, ~p, ~p)~n",
+	      [?MODULE, Data, Options, Data2]),
+    %%
+    Size  = sizeof(Data),
+    Size2 = sizeof(Data2),
+    %%
+    {ok, Fd}        = ?RAM_FILE_MODULE:open(Data, Options),
+    {ok, Size}      = ?RAM_FILE_MODULE:get_size(Fd),
+    {ok, Data}      = ?RAM_FILE_MODULE:get_file(Fd),
+    {ok, Data}      = ?RAM_FILE_MODULE:get_file_close(Fd),
+    {error, einval} = ?RAM_FILE_MODULE:get_size(Fd),
+    {ok, Fd2}       = ?RAM_FILE_MODULE:open(Data, Options),
+    case ?RAM_FILE_MODULE:set_file(Fd2, Data2) of
+	{ok, Size2} ->
+	    {ok, Size2} = ?RAM_FILE_MODULE:get_size(Fd2),
+	    {ok, Data2} = ?RAM_FILE_MODULE:get_file(Fd2),
+	    {ok, Data2} = ?RAM_FILE_MODULE:get_file_close(Fd2),
+	    ok;
+	{error, _} = Error ->
+	    {ok, Data}  = ?RAM_FILE_MODULE:get_file_close(Fd2),
+	    Error
+    end.
+
+
+
+%% Test that compress/1 and uncompress/1 works.
 compress(Config) when is_list(Config) ->
-    ?line Data   = ?config(data_dir, Config),
-    ?line Real   = filename:join(Data, "realmen.html"),
-    ?line RealGz = filename:join(Data, "realmen.html.gz"),
+    Data   = proplists:get_value(data_dir, Config),
+    Real   = filename:join(Data, "realmen.html"),
+    RealGz = filename:join(Data, "realmen.html.gz"),
     %%
     %% Uncompress test
     %%
-    ?line {ok, FdReal}   = ?FILE_MODULE:open(Real, []),
-    ?line {ok, Fd}       = ?FILE_MODULE:open([], [ram, read, write]),
-    ?line {ok, FdRealGz} = ?FILE_MODULE:open(RealGz, []),
+    {ok, FdReal}   = ?FILE_MODULE:open(Real, []),
+    {ok, Fd}       = ?FILE_MODULE:open([], [ram, read, write]),
+    {ok, FdRealGz} = ?FILE_MODULE:open(RealGz, []),
     %%
-    ?line {ok, SzGz}     = ?FILE_MODULE:copy(FdRealGz, Fd),
-    ?line {ok, Sz}       = ?RAM_FILE_MODULE:uncompress(Fd),
-    ?line {ok, 0}        = ?FILE_MODULE:position(Fd, bof),
-    ?line true           = compare(FdReal, Fd),
+    {ok, SzGz}     = ?FILE_MODULE:copy(FdRealGz, Fd),
+    {ok, Sz}       = ?RAM_FILE_MODULE:uncompress(Fd),
+    {ok, 0}        = ?FILE_MODULE:position(Fd, bof),
+    true           = compare(FdReal, Fd),
     %%
-    ?line true           = (SzGz =< Sz),
+    true           = (SzGz =< Sz),
     %%
     %% Compress and uncompress test
     %%
-    ?line {ok, 0}        = ?FILE_MODULE:position(FdReal, bof),
-    ?line {ok, 0}        = ?FILE_MODULE:position(Fd, bof),
-    ?line ok             = ?FILE_MODULE:truncate(Fd),
-    ?line {ok, Sz}       = ?FILE_MODULE:copy(FdReal, Fd),
-    ?line {ok, SzGz}     = ?RAM_FILE_MODULE:compress(Fd),
-    ?line {ok, Sz}       = ?RAM_FILE_MODULE:uncompress(Fd),
-    ?line {ok, 0}        = ?FILE_MODULE:position(Fd, bof),
-    ?line {ok, 0}        = ?FILE_MODULE:position(FdReal, bof),
-    ?line true           = compare(FdReal, Fd),
+    {ok, 0}        = ?FILE_MODULE:position(FdReal, bof),
+    {ok, 0}        = ?FILE_MODULE:position(Fd, bof),
+    ok             = ?FILE_MODULE:truncate(Fd),
+    {ok, Sz}       = ?FILE_MODULE:copy(FdReal, Fd),
+    {ok, SzGz}     = ?RAM_FILE_MODULE:compress(Fd),
+    {ok, Sz}       = ?RAM_FILE_MODULE:uncompress(Fd),
+    {ok, 0}        = ?FILE_MODULE:position(Fd, bof),
+    {ok, 0}        = ?FILE_MODULE:position(FdReal, bof),
+    true           = compare(FdReal, Fd),
     %%
-    ?line ok             = ?FILE_MODULE:close(FdReal),
-    ?line ok             = ?FILE_MODULE:close(Fd),
-    ?line ok             = ?FILE_MODULE:close(FdRealGz),
+    ok             = ?FILE_MODULE:close(FdReal),
+    ok             = ?FILE_MODULE:close(Fd),
+    ok             = ?FILE_MODULE:close(FdRealGz),
 
 
     %% Test uncompressing data that will be expanded many times.
-    ?line Huge = iolist_to_binary(mk_42(18)),
-    ?line HugeSize = byte_size(Huge),
-    ?line HugeGz = zlib:gzip(Huge),
+    Huge = iolist_to_binary(mk_42(18)),
+    HugeSize = byte_size(Huge),
+    HugeGz = zlib:gzip(Huge),
 
-    ?line {ok,HugeFd} = ?FILE_MODULE:open([], [ram,read,write,binary]),
-    ?line ok = ?FILE_MODULE:write(HugeFd, HugeGz),
-    ?line {ok,HugeSize} = ?RAM_FILE_MODULE:uncompress(HugeFd),
-    ?line {ok,0} = ?FILE_MODULE:position(HugeFd, bof),
-    ?line {ok,Huge} = ?FILE_MODULE:read(HugeFd, HugeSize),
+    {ok,HugeFd} = ?FILE_MODULE:open([], [ram,read,write,binary]),
+    ok = ?FILE_MODULE:write(HugeFd, HugeGz),
+    {ok,HugeSize} = ?RAM_FILE_MODULE:uncompress(HugeFd),
+    {ok,0} = ?FILE_MODULE:position(HugeFd, bof),
+    {ok,Huge} = ?FILE_MODULE:read(HugeFd, HugeSize),
 
     %% Uncompressing again should do nothing.
-    ?line {ok,HugeSize} = ?RAM_FILE_MODULE:uncompress(HugeFd),
-    ?line {ok,0} = ?FILE_MODULE:position(HugeFd, bof),
-    ?line {ok,Huge} = ?FILE_MODULE:read(HugeFd, HugeSize),
+    {ok,HugeSize} = ?RAM_FILE_MODULE:uncompress(HugeFd),
+    {ok,0} = ?FILE_MODULE:position(HugeFd, bof),
+    {ok,Huge} = ?FILE_MODULE:read(HugeFd, HugeSize),
 
-    ?line ok = ?FILE_MODULE:close(HugeFd),
+    ok = ?FILE_MODULE:close(HugeFd),
 
     ok.
 
@@ -469,118 +437,108 @@ mk_42(N) ->
     B = mk_42(N-1),
     [B|B].
 
-uuencode(suite) ->
-    [];
-uuencode(doc) ->
-    ["Test that uuencode/1 and uudecode/1 works."];
+%% Test that uuencode/1 and uudecode/1 works.
 uuencode(Config) when is_list(Config) ->
-    ?line Data   = ?config(data_dir, Config),
-    ?line Real   = filename:join(Data, "realmen.html"),
-    ?line RealUu = filename:join(Data, "realmen.html.uu"),
+    Data   = proplists:get_value(data_dir, Config),
+    Real   = filename:join(Data, "realmen.html"),
+    RealUu = filename:join(Data, "realmen.html.uu"),
     %%
     %% Uudecode test
     %%
-    ?line {ok, FdReal}   = ?FILE_MODULE:open(Real, []),
-    ?line {ok, Fd}       = ?FILE_MODULE:open([], [ram, read, write]),
-    ?line {ok, FdRealUu} = ?FILE_MODULE:open(RealUu, []),
+    {ok, FdReal}   = ?FILE_MODULE:open(Real, []),
+    {ok, Fd}       = ?FILE_MODULE:open([], [ram, read, write]),
+    {ok, FdRealUu} = ?FILE_MODULE:open(RealUu, []),
     %%
-    ?line {ok, SzUu}     = ?FILE_MODULE:copy(FdRealUu, Fd),
-    ?line {ok, Sz}       = ?RAM_FILE_MODULE:uudecode(Fd),
-    ?line true           = (Sz =< SzUu),
-    ?line {ok, 0}        = ?FILE_MODULE:position(Fd, bof),
-    ?line true           = compare(FdReal, Fd),
+    {ok, SzUu}     = ?FILE_MODULE:copy(FdRealUu, Fd),
+    {ok, Sz}       = ?RAM_FILE_MODULE:uudecode(Fd),
+    true           = (Sz =< SzUu),
+    {ok, 0}        = ?FILE_MODULE:position(Fd, bof),
+    true           = compare(FdReal, Fd),
     %%
     %% Uuencode and decode test
     %%
     F = fun(Offs) ->
 		Size = Sz - Offs,
-		?line {ok, Offs}     = ?FILE_MODULE:position(FdReal, {bof,Offs}),
-		?line {ok, 0}        = ?FILE_MODULE:position(Fd, bof),
-		?line ok             = ?FILE_MODULE:truncate(Fd),
-		?line {ok, Size}     = ?FILE_MODULE:copy(FdReal, Fd),
-		?line {ok, SizeUu}   = ?RAM_FILE_MODULE:uuencode(Fd),
-		?line true           = (Size =< SizeUu),
-		?line {ok, Size}     = ?RAM_FILE_MODULE:uudecode(Fd),
-		?line {ok, Offs}     = ?FILE_MODULE:position(FdReal, {bof,Offs}),
-		?line {ok, 0}        = ?FILE_MODULE:position(Fd, bof),
-		?line true           = compare(FdReal, Fd)
+		{ok, Offs}     = ?FILE_MODULE:position(FdReal, {bof,Offs}),
+		{ok, 0}        = ?FILE_MODULE:position(Fd, bof),
+		ok             = ?FILE_MODULE:truncate(Fd),
+		{ok, Size}     = ?FILE_MODULE:copy(FdReal, Fd),
+		{ok, SizeUu}   = ?RAM_FILE_MODULE:uuencode(Fd),
+		true           = (Size =< SizeUu),
+		{ok, Size}     = ?RAM_FILE_MODULE:uudecode(Fd),
+		{ok, Offs}     = ?FILE_MODULE:position(FdReal, {bof,Offs}),
+		{ok, 0}        = ?FILE_MODULE:position(Fd, bof),
+		true           = compare(FdReal, Fd)
 	end,
     lists:foreach(F, lists:seq(0,Sz-1, 43)),
 
-    ?line ok             = ?FILE_MODULE:close(FdReal),
-    ?line ok             = ?FILE_MODULE:close(Fd),
-    ?line ok             = ?FILE_MODULE:close(FdRealUu),
+    ok             = ?FILE_MODULE:close(FdReal),
+    ok             = ?FILE_MODULE:close(Fd),
+    ok             = ?FILE_MODULE:close(FdRealUu),
     %%
     ok.
 
 
-
-large_file_errors(suite) ->
-    [];
-large_file_errors(doc) ->
-    ["Test error checking of large file offsets."];
+%% Test error checking of large file offsets.
 large_file_errors(Config) when is_list(Config) ->
-    ?line TwoGig = 1 bsl 31,
-    ?line {ok,Fd}         = ?RAM_FILE_MODULE:open("1234567890", [read,write]),
-    ?line {error, einval} = ?FILE_MODULE:read(Fd, TwoGig),
-    ?line {error, badarg} = ?FILE_MODULE:read(Fd, -1),
-    ?line {error, einval} = ?FILE_MODULE:position(Fd, {bof,TwoGig}),
-    ?line {error, einval} = ?FILE_MODULE:position(Fd, {bof,-TwoGig-1}),
-    ?line {error, einval} = ?FILE_MODULE:position(Fd, {bof,-1}),
-    ?line {error, einval} = ?FILE_MODULE:position(Fd, {cur,TwoGig}),
-    ?line {error, einval} = ?FILE_MODULE:position(Fd, {cur,-TwoGig-1}),
-    ?line {error, einval} = ?FILE_MODULE:position(Fd, {eof,TwoGig}),
-    ?line {error, einval} = ?FILE_MODULE:position(Fd, {eof,-TwoGig-1}),
-    ?line {error, einval} = ?FILE_MODULE:pread(Fd, TwoGig, 1),
-    ?line {error, einval} = ?FILE_MODULE:pread(Fd, -TwoGig-1, 1),
-    ?line {error, einval} = ?FILE_MODULE:pread(Fd, -1, 1),
-    ?line {error, einval} = ?FILE_MODULE:pwrite(Fd, TwoGig, "@"),
-    ?line {error, einval} = ?FILE_MODULE:pwrite(Fd, -TwoGig-1, "@"),
-    ?line {error, einval} = ?FILE_MODULE:pwrite(Fd, -1, "@"),
-    ?line {error, einval} = ?FILE_MODULE:pread(Fd, TwoGig, 0),
-    ?line {error, einval} = ?FILE_MODULE:pread(Fd, -TwoGig-1, 0),
-    ?line {error, einval} = ?FILE_MODULE:pread(Fd, -1, 0),
-    ?line ok              = ?FILE_MODULE:close(Fd),
+    TwoGig = 1 bsl 31,
+    {ok,Fd}         = ?RAM_FILE_MODULE:open("1234567890", [read,write]),
+    {error, einval} = ?FILE_MODULE:read(Fd, TwoGig),
+    {error, badarg} = ?FILE_MODULE:read(Fd, -1),
+    {error, einval} = ?FILE_MODULE:position(Fd, {bof,TwoGig}),
+    {error, einval} = ?FILE_MODULE:position(Fd, {bof,-TwoGig-1}),
+    {error, einval} = ?FILE_MODULE:position(Fd, {bof,-1}),
+    {error, einval} = ?FILE_MODULE:position(Fd, {cur,TwoGig}),
+    {error, einval} = ?FILE_MODULE:position(Fd, {cur,-TwoGig-1}),
+    {error, einval} = ?FILE_MODULE:position(Fd, {eof,TwoGig}),
+    {error, einval} = ?FILE_MODULE:position(Fd, {eof,-TwoGig-1}),
+    {error, einval} = ?FILE_MODULE:pread(Fd, TwoGig, 1),
+    {error, einval} = ?FILE_MODULE:pread(Fd, -TwoGig-1, 1),
+    {error, einval} = ?FILE_MODULE:pread(Fd, -1, 1),
+    {error, einval} = ?FILE_MODULE:pwrite(Fd, TwoGig, "@"),
+    {error, einval} = ?FILE_MODULE:pwrite(Fd, -TwoGig-1, "@"),
+    {error, einval} = ?FILE_MODULE:pwrite(Fd, -1, "@"),
+    {error, einval} = ?FILE_MODULE:pread(Fd, TwoGig, 0),
+    {error, einval} = ?FILE_MODULE:pread(Fd, -TwoGig-1, 0),
+    {error, einval} = ?FILE_MODULE:pread(Fd, -1, 0),
+    ok              = ?FILE_MODULE:close(Fd),
     ok.
 
 
 
-large_file_light(suite) ->
-    [];
-large_file_light(doc) ->
-    ["Test light operations on a \"large\" ram_file."];
+%% Test light operations on a \large\ ram_file.
 large_file_light(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     %% Marker for next test case that is to heavy to run in a suite.
-    ?line ok = ?FILE_MODULE:write_file(
-		  filename:join(PrivDir, "large_file_light"),
-		  <<"TAG">>),
-    %%
-    ?line Data = "abcdefghijklmnopqrstuvwzyz",
-    ?line Size = sizeof(Data),
-    ?line Max = (1 bsl 31) - 1,
-    ?line Max__1 = Max - 1,
-    ?line {ok, Fd}        = ?RAM_FILE_MODULE:open(Data, [read]),
-    ?line {ok, Data}      = ?FILE_MODULE:read(Fd, Size+1),
-    ?line {ok, Max__1}    = ?FILE_MODULE:position(Fd, {eof, Max-Size-1}),
-    ?line eof             = ?FILE_MODULE:read(Fd, 1),
-    ?line {ok, Max}       = ?FILE_MODULE:position(Fd, {bof, Max}),
-    ?line {ok, Zero}      = ?FILE_MODULE:read(Fd, 0),
-    ?line 0               = sizeof(Zero),
-    ?line eof             = ?FILE_MODULE:read(Fd, 1),
-    ?line eof             = ?FILE_MODULE:pread(Fd, Max__1, 1),
-    ?line {ok, Zero}      = ?FILE_MODULE:pread(Fd, Max, 0),
-    ?line eof             = ?FILE_MODULE:pread(Fd, Max, 1),
+    ok = ?FILE_MODULE:write_file(
+	    filename:join(PrivDir, "large_file_light"),
+	    <<"TAG">>),
+    %%
+    Data = "abcdefghijklmnopqrstuvwzyz",
+    Size = sizeof(Data),
+    Max = (1 bsl 31) - 1,
+    Max__1 = Max - 1,
+    {ok, Fd}        = ?RAM_FILE_MODULE:open(Data, [read]),
+    {ok, Data}      = ?FILE_MODULE:read(Fd, Size+1),
+    {ok, Max__1}    = ?FILE_MODULE:position(Fd, {eof, Max-Size-1}),
+    eof             = ?FILE_MODULE:read(Fd, 1),
+    {ok, Max}       = ?FILE_MODULE:position(Fd, {bof, Max}),
+    {ok, Zero}      = ?FILE_MODULE:read(Fd, 0),
+    0               = sizeof(Zero),
+    eof             = ?FILE_MODULE:read(Fd, 1),
+    eof             = ?FILE_MODULE:pread(Fd, Max__1, 1),
+    {ok, Zero}      = ?FILE_MODULE:pread(Fd, Max, 0),
+    eof             = ?FILE_MODULE:pread(Fd, Max, 1),
     ok.
 
 
 
-large_file_heavy(suite) ->
-    [];
-large_file_heavy(doc) ->
-    ["Test operations on a maximum size (2 GByte - 1) ram_file."];
+large_file_heavy() ->
+    [{timetrap,{minutes,5}}].
+
+%% Test operations on a maximum size (2 GByte - 1) ram_file.
 large_file_heavy(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     %% Check previous test case marker.
     case ?FILE_MODULE:read_file_info(
 	    filename:join(PrivDir, "large_file_light")) of
@@ -591,33 +549,33 @@ large_file_heavy(Config) when is_list(Config) ->
     end.
 
 do_large_file_heavy(_Config) ->
-    ?line Data = "qwertyuiopasdfghjklzxcvbnm",
-    ?line Size = sizeof(Data),
-    ?line Max = (1 bsl 31) - 1,
-    ?line Max__1 = Max - 1,
-    ?line Max__3 = Max - 3,
-    ?line {ok, Fd}        = ?RAM_FILE_MODULE:open(Data, [read,write]),
-    ?line {ok, Data}      = ?FILE_MODULE:read(Fd, Size+1),
-    ?line {ok, Max}       = ?FILE_MODULE:position(Fd, {eof, Max-Size}),
-    ?line eof             = ?FILE_MODULE:read(Fd, 1),
-    ?line erlang:display({allocating,2,'GByte',please,be,patient,'...'}),
-    ?line ok              = ?FILE_MODULE:write(Fd, ""),
-    ?line erlang:display({allocating,2,'GByte',succeeded}),
-    ?line {ok, Max__1}    = ?FILE_MODULE:position(Fd, {eof, -1}),
-    ?line {ok, [0]}       = ?FILE_MODULE:read(Fd, 1),
-    ?line {ok, []}        = ?FILE_MODULE:read(Fd, 0),
-    ?line eof             = ?FILE_MODULE:read(Fd, 1),
-    ?line ok              = ?FILE_MODULE:pwrite(Fd, Max-3, "TAG"),
-    ?line {ok, Max}       = ?FILE_MODULE:position(Fd, cur),
-    ?line {ok, Max__3}    = ?FILE_MODULE:position(Fd, {eof, -3}),
-    ?line {ok, "TAG"}     = ?FILE_MODULE:read(Fd, 3+1),
-    ?line {ok, Max__3}    = ?FILE_MODULE:position(Fd, {cur, -3}),
-    ?line ok              = ?FILE_MODULE:write(Fd, "tag"),
-    ?line {ok, Max}       = ?FILE_MODULE:position(Fd, cur),
-    ?line {ok, 0}         = ?FILE_MODULE:position(Fd, bof),
-    ?line {ok, "tag"}     = ?FILE_MODULE:pread(Fd, Max__3, 3+1),
-    ?line {ok, 0}         = ?FILE_MODULE:position(Fd, cur),
-    ?line ok              = ?FILE_MODULE:close(Fd),
+    Data = "qwertyuiopasdfghjklzxcvbnm",
+    Size = sizeof(Data),
+    Max = (1 bsl 31) - 1,
+    Max__1 = Max - 1,
+    Max__3 = Max - 3,
+    {ok, Fd}        = ?RAM_FILE_MODULE:open(Data, [read,write]),
+    {ok, Data}      = ?FILE_MODULE:read(Fd, Size+1),
+    {ok, Max}       = ?FILE_MODULE:position(Fd, {eof, Max-Size}),
+    eof             = ?FILE_MODULE:read(Fd, 1),
+    erlang:display({allocating,2,'GByte',please,be,patient,'...'}),
+    ok              = ?FILE_MODULE:write(Fd, ""),
+    erlang:display({allocating,2,'GByte',succeeded}),
+    {ok, Max__1}    = ?FILE_MODULE:position(Fd, {eof, -1}),
+    {ok, [0]}       = ?FILE_MODULE:read(Fd, 1),
+    {ok, []}        = ?FILE_MODULE:read(Fd, 0),
+    eof             = ?FILE_MODULE:read(Fd, 1),
+    ok              = ?FILE_MODULE:pwrite(Fd, Max-3, "TAG"),
+    {ok, Max}       = ?FILE_MODULE:position(Fd, cur),
+    {ok, Max__3}    = ?FILE_MODULE:position(Fd, {eof, -3}),
+    {ok, "TAG"}     = ?FILE_MODULE:read(Fd, 3+1),
+    {ok, Max__3}    = ?FILE_MODULE:position(Fd, {cur, -3}),
+    ok              = ?FILE_MODULE:write(Fd, "tag"),
+    {ok, Max}       = ?FILE_MODULE:position(Fd, cur),
+    {ok, 0}         = ?FILE_MODULE:position(Fd, bof),
+    {ok, "tag"}     = ?FILE_MODULE:pread(Fd, Max__3, 3+1),
+    {ok, 0}         = ?FILE_MODULE:position(Fd, cur),
+    ok              = ?FILE_MODULE:close(Fd),
     ok.
 
 %%--------------------------------------------------------------------------
@@ -651,7 +609,7 @@ compare_data(A, B) when is_binary(A), is_list(B) ->
     A == list_to_binary(B);
 compare_data(A, B) when is_binary(A), is_binary(B) ->
     A == B.
-	    
+
 sizeof(Data) when is_list(Data) ->
     length(Data);
 sizeof(Data) when is_binary(Data) ->
diff --git a/lib/kernel/test/rpc_SUITE.erl b/lib/kernel/test/rpc_SUITE.erl
index ed30c2dffa..101cff7ed2 100644
--- a/lib/kernel/test/rpc_SUITE.erl
+++ b/lib/kernel/test/rpc_SUITE.erl
@@ -28,9 +28,11 @@
 
 -export([suicide/2, suicide/3, f/0, f2/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     [call, block_call, multicall, multicall_timeout,
@@ -55,272 +57,252 @@ end_per_group(_GroupName, Config) ->
 
 
 
-call(doc) -> "Test different rpc calls";
+%% Test different rpc calls.
 call(Config) when is_list(Config) ->
-    Timetrap = ?t:timetrap(?t:seconds(30)),
-    ?line PA = filename:dirname(code:which(?MODULE)),
+    PA = filename:dirname(code:which(?MODULE)),
     %% Note. First part of nodename sets response delay in seconds
-    ?line {ok, N1} = ?t:start_node('3_rpc_SUITE_call', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N2} = ?t:start_node('1_rcp_SUITE_call', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N3} = ?t:start_node('4_rcp_SUITE_call', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N4} = ?t:start_node('8_rcp_SUITE_call', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line ok = io:format("~p~n", [[N1, N2, N3]]),
-    ?line {hej,_,N1} = rpc:call(N1, ?MODULE, f, []),
-    ?line {hej,_,N2} = rpc:call(N2, ?MODULE, f, [], 2000),
-    ?line {badrpc,timeout} = rpc:call(N3, ?MODULE, f, [], 2000),
-    ?line receive after 6000 -> ok end,
-    ?line [] = flush([]),
-    ?line {hej,_,N4} = rpc:call(N4, ?MODULE, f, []),
-    ?line ?t:stop_node(N1),
-    ?line ?t:stop_node(N2),
-    ?line ?t:stop_node(N3),
-    ?line ?t:stop_node(N4),
-    ?t:timetrap_cancel(Timetrap),
+    {ok, N1} = test_server:start_node('3_rpc_SUITE_call', slave,
+				      [{args, "-pa " ++ PA}]),
+    {ok, N2} = test_server:start_node('1_rcp_SUITE_call', slave,
+				      [{args, "-pa " ++ PA}]),
+    {ok, N3} = test_server:start_node('4_rcp_SUITE_call', slave,
+				      [{args, "-pa " ++ PA}]),
+    {ok, N4} = test_server:start_node('8_rcp_SUITE_call', slave,
+				      [{args, "-pa " ++ PA}]),
+    ok = io:format("~p~n", [[N1, N2, N3]]),
+    {hej,_,N1} = rpc:call(N1, ?MODULE, f, []),
+    {hej,_,N2} = rpc:call(N2, ?MODULE, f, [], 2000),
+    {badrpc,timeout} = rpc:call(N3, ?MODULE, f, [], 2000),
+    receive after 6000 -> ok end,
+    [] = flush([]),
+    {hej,_,N4} = rpc:call(N4, ?MODULE, f, []),
+    test_server:stop_node(N1),
+    test_server:stop_node(N2),
+    test_server:stop_node(N3),
+    test_server:stop_node(N4),
     ok.
 
-block_call(doc) -> "Test different rpc calls";
+%% Test different rpc calls.
 block_call(Config) when is_list(Config) ->
-    Timetrap = ?t:timetrap(?t:seconds(30)),
-    ?line PA = filename:dirname(code:which(?MODULE)),
+    PA = filename:dirname(code:which(?MODULE)),
     %% Note. First part of nodename sets response delay in seconds
-    ?line {ok, N1} = ?t:start_node('3_rpc_SUITE_block_call', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N2} = ?t:start_node('1_rcp_SUITE_block_call', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N3} = ?t:start_node('4_rcp_SUITE_block_call', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N4} = ?t:start_node('8_rcp_SUITE_block_call', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line ok = io:format("~p~n", [[N1, N2, N3]]),
-    ?line {hej,_,N1} = rpc:block_call(N1, ?MODULE, f, []),
-    ?line {hej,_,N2} = rpc:block_call(N2, ?MODULE, f, [], 2000),
-    ?line {badrpc,timeout} = rpc:block_call(N3, ?MODULE, f, [], 2000),
-    ?line receive after 6000 -> ok end,
-    ?line [] = flush([]),
-    ?line {hej,_,N4} = rpc:block_call(N4, ?MODULE, f, []),
-    ?line ?t:stop_node(N1),
-    ?line ?t:stop_node(N2),
-    ?line ?t:stop_node(N3),
-    ?line ?t:stop_node(N4),
-    ?t:timetrap_cancel(Timetrap),
+    {ok, N1} = test_server:start_node('3_rpc_SUITE_block_call', slave,
+				      [{args, "-pa " ++ PA}]),
+    {ok, N2} = test_server:start_node('1_rcp_SUITE_block_call', slave,
+				      [{args, "-pa " ++ PA}]),
+    {ok, N3} = test_server:start_node('4_rcp_SUITE_block_call', slave,
+				      [{args, "-pa " ++ PA}]),
+    {ok, N4} = test_server:start_node('8_rcp_SUITE_block_call', slave,
+				      [{args, "-pa " ++ PA}]),
+    ok = io:format("~p~n", [[N1, N2, N3]]),
+    {hej,_,N1} = rpc:block_call(N1, ?MODULE, f, []),
+    {hej,_,N2} = rpc:block_call(N2, ?MODULE, f, [], 2000),
+    {badrpc,timeout} = rpc:block_call(N3, ?MODULE, f, [], 2000),
+    receive after 6000 -> ok end,
+    [] = flush([]),
+    {hej,_,N4} = rpc:block_call(N4, ?MODULE, f, []),
+    test_server:stop_node(N1),
+    test_server:stop_node(N2),
+    test_server:stop_node(N3),
+    test_server:stop_node(N4),
     ok.
 
 
-multicall(doc) ->
-    "OTP-3449";
+%% OTP-3449.
 multicall(Config) when is_list(Config) ->
-    Timetrap = ?t:timetrap(?t:seconds(20)),
-    ?line PA = filename:dirname(code:which(?MODULE)),
+    PA = filename:dirname(code:which(?MODULE)),
     %% Note. First part of nodename sets response delay in seconds
-    ?line {ok, N1} = ?t:start_node('3_rpc_SUITE_multicall', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N2} = ?t:start_node('1_rcp_SUITE_multicall', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line ok = io:format("~p~n", [[N1, N2]]),
-    ?line {[{hej,_,N1},{hej,_,N2}],[]} = 
-	   rpc:multicall([N1, N2], ?MODULE, f, []),
-    ?line Msgs = flush([]),
-    ?line [] = Msgs,
-    ?line ?t:stop_node(N1),
-    ?line ?t:stop_node(N2),
-    ?t:timetrap_cancel(Timetrap),
+    {ok, N1} = test_server:start_node('3_rpc_SUITE_multicall', slave,
+				      [{args, "-pa " ++ PA}]),
+    {ok, N2} = test_server:start_node('1_rcp_SUITE_multicall', slave,
+				      [{args, "-pa " ++ PA}]),
+    ok = io:format("~p~n", [[N1, N2]]),
+    {[{hej,_,N1},{hej,_,N2}],[]} =
+	rpc:multicall([N1, N2], ?MODULE, f, []),
+    Msgs = flush([]),
+    [] = Msgs,
+    test_server:stop_node(N1),
+    test_server:stop_node(N2),
     ok.
 
 multicall_timeout(Config) when is_list(Config) ->
-    Timetrap = ?t:timetrap(?t:seconds(30)),
-    ?line PA = filename:dirname(code:which(?MODULE)),
+    PA = filename:dirname(code:which(?MODULE)),
     %% Note. First part of nodename sets response delay in seconds
-    ?line {ok, N1} = ?t:start_node('11_rpc_SUITE_multicall', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N2} = ?t:start_node('8_rpc_SUITE_multicall', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N3} = ?t:start_node('5_rpc_SUITE_multicall', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N4} = ?t:start_node('2_rcp_SUITE_multicall', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line ok = io:format("~p~n", [[N1, N2]]),
-    ?line {[{hej,_,N3},{hej,_,N4}],[N1, N2]} = 
-	   rpc:multicall([N3, N1, N2, N4], ?MODULE, f, [], ?t:seconds(6)),
-    ?t:sleep(?t:seconds(8)), %% Wait for late answers
-    ?line Msgs = flush([]),
-    ?line [] = Msgs,
-    ?line ?t:stop_node(N1),
-    ?line ?t:stop_node(N2),
-    ?line ?t:stop_node(N3),
-    ?line ?t:stop_node(N4),
-    ?t:timetrap_cancel(Timetrap),
+    {ok, N1} = test_server:start_node('11_rpc_SUITE_multicall', slave,
+				      [{args, "-pa " ++ PA}]),
+    {ok, N2} = test_server:start_node('8_rpc_SUITE_multicall', slave,
+				      [{args, "-pa " ++ PA}]),
+    {ok, N3} = test_server:start_node('5_rpc_SUITE_multicall', slave,
+				      [{args, "-pa " ++ PA}]),
+    {ok, N4} = test_server:start_node('2_rcp_SUITE_multicall', slave,
+				      [{args, "-pa " ++ PA}]),
+    ok = io:format("~p~n", [[N1, N2]]),
+    {[{hej,_,N3},{hej,_,N4}],[N1, N2]} =
+	rpc:multicall([N3, N1, N2, N4], ?MODULE, f, [], 6000),
+    ct:sleep({seconds,8}),			%Wait for late answers
+    Msgs = flush([]),
+    [] = Msgs,
+    test_server:stop_node(N1),
+    test_server:stop_node(N2),
+    test_server:stop_node(N3),
+    test_server:stop_node(N4),
     ok.
 
 multicall_dies(Config) when is_list(Config) ->
-    Timetrap = ?t:timetrap(?t:seconds(30)),
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok, N1} = ?t:start_node('rpc_SUITE_multicall_dies_1', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N2} = ?t:start_node('rcp_SUITE_multicall_dies_2', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line Nodes = [N1, N2],
+    PA = filename:dirname(code:which(?MODULE)),
+    {ok, N1} = test_server:start_node('rpc_SUITE_multicall_dies_1', slave,
+				      [{args, "-pa " ++ PA}]),
+    {ok, N2} = test_server:start_node('rcp_SUITE_multicall_dies_2', slave,
+				      [{args, "-pa " ++ PA}]),
+    Nodes = [N1, N2],
     %%
-    ?line {[{badrpc, {'EXIT', normal}}, {badrpc, {'EXIT', normal}}], []} = 
+    {[{badrpc, {'EXIT', normal}}, {badrpc, {'EXIT', normal}}], []} =
 	do_multicall(Nodes, erlang, exit, [normal]),
-    ?line {[{badrpc, {'EXIT', abnormal}}, {badrpc, {'EXIT', abnormal}}], []} = 
+    {[{badrpc, {'EXIT', abnormal}}, {badrpc, {'EXIT', abnormal}}], []} =
 	do_multicall(Nodes, erlang, exit, [abnormal]),
-    ?line {[{badrpc, {'EXIT', {badarith, _}}}, 
-	    {badrpc, {'EXIT', {badarith, _}}}], 
-	   []} = 
+    {[{badrpc, {'EXIT', {badarith, _}}},
+      {badrpc, {'EXIT', {badarith, _}}}],
+     []} =
 	do_multicall(Nodes, erlang, 'div', [1, 0]),
-    ?line {[{badrpc, {'EXIT', {badarg, _}}}, 
-	    {badrpc, {'EXIT', {badarg, _}}}], 
-	   []} = 
+    {[{badrpc, {'EXIT', {badarg, _}}},
+      {badrpc, {'EXIT', {badarg, _}}}],
+     []} =
 	do_multicall(Nodes, erlang, atom_to_list, [1]),
-    ?line {[{badrpc, {'EXIT', {undef, _}}}, 
-	    {badrpc, {'EXIT', {undef, _}}}], 
-	   []} = 
+    {[{badrpc, {'EXIT', {undef, _}}},
+      {badrpc, {'EXIT', {undef, _}}}],
+     []} =
 	do_multicall(Nodes, ?MODULE, suicide, []),
-    ?line {[timeout, timeout], []} = 
+    {[timeout, timeout], []} =
 	do_multicall(Nodes, ?MODULE, suicide, [link, normal]),
-    ?line {[{badrpc, {'EXIT', abnormal}}, {badrpc, {'EXIT', abnormal}}], []} = 
+    {[{badrpc, {'EXIT', abnormal}}, {badrpc, {'EXIT', abnormal}}], []} =
 	do_multicall(Nodes, ?MODULE, suicide, [link, abnormal]),
-    ?line {[timeout, timeout], []} = 
+    {[timeout, timeout], []} =
 	do_multicall(Nodes, ?MODULE, suicide, [exit, normal]),
-    ?line {[{badrpc, {'EXIT', abnormal}}, {badrpc, {'EXIT', abnormal}}], []} = 
+    {[{badrpc, {'EXIT', abnormal}}, {badrpc, {'EXIT', abnormal}}], []} =
 	do_multicall(Nodes, ?MODULE, suicide, [exit, abnormal]),
-    ?line {[{badrpc, {'EXIT', killed}}, {badrpc, {'EXIT', killed}}], []} = 
+    {[{badrpc, {'EXIT', killed}}, {badrpc, {'EXIT', killed}}], []} =
 	do_multicall(Nodes, ?MODULE, suicide, [exit, kill]),
     %%
-    ?line ?t:stop_node(N1),
-    ?line ?t:stop_node(N2),
-    ?t:timetrap_cancel(Timetrap),
+    test_server:stop_node(N1),
+    test_server:stop_node(N2),
     ok.
 
 do_multicall(Nodes, Mod, Func, Args) ->
-    ?line ok = io:format("~p:~p~p~n", [Mod, Func, Args]),
-    ?line Result = rpc:multicall(Nodes, Mod, Func, Args),
-    ?line Msgs = flush([]),
-    ?line [] = Msgs,
+    ok = io:format("~p:~p~p~n", [Mod, Func, Args]),
+    Result = rpc:multicall(Nodes, Mod, Func, Args),
+    Msgs = flush([]),
+    [] = Msgs,
     Result.
 
 
 
-multicall_node_dies(doc) ->    
-    "";
 multicall_node_dies(Config) when is_list(Config) ->
-    Timetrap = ?t:timetrap(?t:seconds(60)),
-    %%
     do_multicall_2_nodes_dies(?MODULE, suicide, [erlang, halt, []]),
     do_multicall_2_nodes_dies(?MODULE, suicide, [init, stop, []]),
     do_multicall_2_nodes_dies(?MODULE, suicide, [rpc, stop, []]),
-    %%
-    ?t:timetrap_cancel(Timetrap),
     ok.
 
 do_multicall_2_nodes_dies(Mod, Func, Args) ->
-    ?line ok = io:format("~p:~p~p~n", [Mod, Func, Args]),
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok, N1} = ?t:start_node('rpc_SUITE_multicall_node_dies_1', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line {ok, N2} = ?t:start_node('rcp_SUITE_multicall_node_dies_2', slave, 
-				   [{args, "-pa " ++ PA}]),
-    ?line Nodes = [N1, N2],
-    ?line {[], Nodes} = rpc:multicall(Nodes, Mod, Func, Args),
-    ?line Msgs = flush([]),
-    ?line [] = Msgs,
+    ok = io:format("~p:~p~p~n", [Mod, Func, Args]),
+    PA = filename:dirname(code:which(?MODULE)),
+    {ok, N1} = test_server:start_node('rpc_SUITE_multicall_node_dies_1', slave,
+				      [{args, "-pa " ++ PA}]),
+    {ok, N2} = test_server:start_node('rcp_SUITE_multicall_node_dies_2', slave,
+				      [{args, "-pa " ++ PA}]),
+    Nodes = [N1, N2],
+    {[], Nodes} = rpc:multicall(Nodes, Mod, Func, Args),
+    Msgs = flush([]),
+    [] = Msgs,
     ok.
 
 
 
-called_dies(doc) ->
-    "OTP-3766";
+%% OTP-3766.
 called_dies(Config) when is_list(Config) ->
-    Timetrap = ?t:timetrap(?t:seconds(210)),
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line {ok, N} = ?t:start_node(rpc_SUITE_called_dies, slave, 
-				  [{args, "-pa " ++ PA}]),
+    PA = filename:dirname(code:which(?MODULE)),
+    {ok, N} = test_server:start_node(rpc_SUITE_called_dies, slave,
+				     [{args, "-pa " ++ PA}]),
     %%
-    ?line rep(fun (Tag, Call, Args) ->
-		      {Tag,{badrpc,{'EXIT',normal}}} = 
-			  {Tag,apply(rpc, Call, Args)}
-	      end, N, erlang, exit, [normal]),
-    ?line rep(fun (Tag, Call, Args) ->
-		      {Tag,{badrpc,{'EXIT',abnormal}}} = 
-			  {Tag,apply(rpc, Call, Args)}
-	      end, N, erlang, exit, [abnormal]),
-    ?line rep(fun (Tag, Call, Args) ->
-		      {Tag,{badrpc,{'EXIT',{badarith,_}}}} = 
-			  {Tag,apply(rpc, Call, Args)}
-	      end, N, erlang, 'div', [1,0]),
-    ?line rep(fun (Tag, Call, Args) ->
-		      {Tag,{badrpc,{'EXIT',{badarg,_}}}} = 
-			  {Tag,apply(rpc, Call, Args)}
-	      end, N, erlang, atom_to_list, [1]),
-    ?line rep(fun (Tag, Call, Args) ->
-		      {Tag,{badrpc,{'EXIT',{undef,_}}}} = 
-			  {Tag,apply(rpc, Call, Args)}
-	      end, N, ?MODULE, suicide, []),
+    rep(fun (Tag, Call, Args) ->
+		{Tag,{badrpc,{'EXIT',normal}}} =
+		    {Tag,apply(rpc, Call, Args)}
+	end, N, erlang, exit, [normal]),
+    rep(fun (Tag, Call, Args) ->
+		{Tag,{badrpc,{'EXIT',abnormal}}} =
+		    {Tag,apply(rpc, Call, Args)}
+	end, N, erlang, exit, [abnormal]),
+    rep(fun (Tag, Call, Args) ->
+		{Tag,{badrpc,{'EXIT',{badarith,_}}}} =
+		    {Tag,apply(rpc, Call, Args)}
+	end, N, erlang, 'div', [1,0]),
+    rep(fun (Tag, Call, Args) ->
+		{Tag,{badrpc,{'EXIT',{badarg,_}}}} =
+		    {Tag,apply(rpc, Call, Args)}
+	end, N, erlang, atom_to_list, [1]),
+    rep(fun (Tag, Call, Args) ->
+		{Tag,{badrpc,{'EXIT',{undef,_}}}} =
+		    {Tag,apply(rpc, Call, Args)}
+	end, N, ?MODULE, suicide, []),
     %%
     TrapExit = process_flag(trap_exit, true),
     %%
-    ?line rep(fun (Tag, Call, Args=[Node|_]) when Node == node() ->
-		      {Tag,timeout} = 
-			  {Tag,apply(rpc, Call, Args)},
-		      {Tag,flush,[{'EXIT',_,normal}]} = 
-			  {Tag,flush,flush([])};
-		  (Tag, Call, Args) ->
-		      {Tag,timeout} = 
-			  {Tag,apply(rpc, Call, Args)}
-	      end, N, ?MODULE, suicide, [link,normal]),
-    ?line rep(fun (Tag, Call, Args=[Node|_]) when Node == node() ->
-		      {Tag,timeout} = 
-			  {Tag,apply(rpc, Call, Args)},
-		      {Tag,flush,[{'EXIT',_,abnormal}]} = 
-			  {Tag,flush,flush([])};
-		  (Tag, block_call, Args) ->
-		      {Tag,timeout} = 
-			  {Tag,apply(rpc, block_call, Args)};
-		  (Tag, Call, Args) ->
-		      {Tag,{badrpc,{'EXIT',abnormal}}} = 
-			  {Tag,apply(rpc, Call, Args)}
-	      end, N, ?MODULE, suicide, [link,abnormal]),
-    ?line rep(fun (Tag, Call, Args=[Node|_]) when Node == node() ->
-		      {Tag,timeout} = 
-			  {Tag,apply(rpc, Call, Args)},
-		      {Tag,flush,[{'EXIT',_,normal}]} = 
-			  {Tag,flush,flush([])};
-		  (Tag, Call, Args) ->
-		      {Tag,timeout} = 
-			  {Tag,apply(rpc, Call, Args)}
-	      end, N, ?MODULE, suicide, [exit,normal]),
-    ?line rep(fun (Tag, Call, Args=[Node|_]) when Node == node() ->
-		      {Tag,timeout} = 
-			  {Tag,apply(rpc, Call, Args)},
-		      {Tag,flush,[{'EXIT',_,abnormal}]} = 
-			  {Tag,flush,flush([])};
-		  (Tag, block_call, Args) ->
-		      {Tag,timeout} = 
-			  {Tag,apply(rpc, block_call, Args)};
-		  (Tag, Call, Args) ->
-		      {Tag,{badrpc,{'EXIT',abnormal}}} = 
-			  {Tag,apply(rpc, Call, Args)}
-	      end, N, ?MODULE, suicide, [exit,abnormal]),
+    rep(fun (Tag, Call, Args=[Node|_]) when Node == node() ->
+		{Tag,timeout} =
+		    {Tag,apply(rpc, Call, Args)},
+		{Tag,flush,[{'EXIT',_,normal}]} =
+		    {Tag,flush,flush([])};
+	    (Tag, Call, Args) ->
+		{Tag,timeout} =
+		    {Tag,apply(rpc, Call, Args)}
+	end, N, ?MODULE, suicide, [link,normal]),
+    rep(fun (Tag, Call, Args=[Node|_]) when Node == node() ->
+		{Tag,timeout} =
+		    {Tag,apply(rpc, Call, Args)},
+		{Tag,flush,[{'EXIT',_,abnormal}]} =
+		    {Tag,flush,flush([])};
+	    (Tag, block_call, Args) ->
+		{Tag,timeout} =
+		    {Tag,apply(rpc, block_call, Args)};
+	    (Tag, Call, Args) ->
+		{Tag,{badrpc,{'EXIT',abnormal}}} =
+		    {Tag,apply(rpc, Call, Args)}
+	end, N, ?MODULE, suicide, [link,abnormal]),
+    rep(fun (Tag, Call, Args=[Node|_]) when Node == node() ->
+		{Tag,timeout} =
+		    {Tag,apply(rpc, Call, Args)},
+		{Tag,flush,[{'EXIT',_,normal}]} =
+		    {Tag,flush,flush([])};
+	    (Tag, Call, Args) ->
+		{Tag,timeout} =
+		    {Tag,apply(rpc, Call, Args)}
+	end, N, ?MODULE, suicide, [exit,normal]),
+    rep(fun (Tag, Call, Args=[Node|_]) when Node == node() ->
+		{Tag,timeout} =
+		    {Tag,apply(rpc, Call, Args)},
+		{Tag,flush,[{'EXIT',_,abnormal}]} =
+		    {Tag,flush,flush([])};
+	    (Tag, block_call, Args) ->
+		{Tag,timeout} =
+		    {Tag,apply(rpc, block_call, Args)};
+	    (Tag, Call, Args) ->
+		{Tag,{badrpc,{'EXIT',abnormal}}} =
+		    {Tag,apply(rpc, Call, Args)}
+	end, N, ?MODULE, suicide, [exit,abnormal]),
     %%
     process_flag(trap_exit, TrapExit),
     %%
-    ?line rep(fun %% A local [exit,kill] would kill the test case process
-		  (_Tag, _Call, [Node|_]) when Node == node() ->
-		      ok;
-		  %% A block_call [exit,kill] would kill the rpc server
-		  (_Tag, block_call, _Args) -> ok;
-		  (Tag, Call, Args) ->
-		      {Tag,{badrpc,{'EXIT',killed}}} = 
-			  {Tag,apply(rpc, Call, Args)}
-	      end, N, ?MODULE, suicide, [exit,kill]),
+    rep(fun %% A local [exit,kill] would kill the test case process
+	    (_Tag, _Call, [Node|_]) when Node == node() ->
+	       ok;
+	    %% A block_call [exit,kill] would kill the rpc server
+	    (_Tag, block_call, _Args) -> ok;
+	    (Tag, Call, Args) ->
+	       {Tag,{badrpc,{'EXIT',killed}}} =
+		   {Tag,apply(rpc, Call, Args)}
+       end, N, ?MODULE, suicide, [exit,kill]),
     %%
-    ?line [] = flush([]),
-    ?line ?t:stop_node(N),
-    ?t:timetrap_cancel(Timetrap),
+    [] = flush([]),
+    test_server:stop_node(N),
     ok.
 
 rep(Fun, N, M, F, A) ->
@@ -335,7 +317,7 @@ rep(Fun, N, M, F, A) ->
     Fun(9, block_call, [N, M, F, A, infinity]),
     Fun(10, block_call, [N, M, F, A, 3000]),
     ok.
-    
+
 
 suicide(link, Reason) ->
     spawn_link(
@@ -364,109 +346,83 @@ suicide(Mod, Func, Args) ->
 
 
 
-called_node_dies(doc) ->
-    "";
-called_node_dies(suite) -> [];
 called_node_dies(Config) when is_list(Config) ->
-    Timetrap = ?t:timetrap(?t:minutes(2)),
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    %%
-    ?line node_rep(
-	    fun (Tag, Call, Args) ->
-		    {Tag,{badrpc,nodedown}} = 
-			{Tag,apply(rpc, Call, Args)}
-	    end, "rpc_SUITE_called_node_dies_1", 
-	    PA, ?MODULE, suicide, [erlang,halt,[]]),
-    ?line node_rep(
-	    fun (Tag, Call, Args) ->
-		    {Tag,{badrpc,nodedown}} = 
-			{Tag,apply(rpc, Call, Args)}
-	    end, "rpc_SUITE_called_node_dies_2", 
-	    PA, ?MODULE, suicide, [init,stop,[]]),
-    ?line node_rep(
-	    fun (Tag, Call, Args=[_|_]) ->
-		    {Tag,{'EXIT',{killed,_}}} = 
-			{Tag,catch {noexit,apply(rpc, Call, Args)}}
-	    end, "rpc_SUITE_called_node_dies_3", 
-	    PA, ?MODULE, suicide, [erlang,exit,[rex,kill]]),
-    ?line node_rep(
-	    fun %% Cannot block call rpc - will hang
-		(_Tag, block_call, _Args) -> ok;
-		(Tag, Call, Args=[_|_]) ->
-		    {Tag,{'EXIT',{normal,_}}} = 
-			{Tag,catch {noexit,apply(rpc, Call, Args)}}
-	    end, "rpc_SUITE_called_node_dies_4", 
-	    PA, ?MODULE, suicide, [rpc,stop,[]]),
-    %%
-    ?t:timetrap_cancel(Timetrap),
+    PA = filename:dirname(code:which(?MODULE)),
+
+    node_rep(
+      fun (Call, Args) ->
+	      {badrpc,nodedown} = apply(rpc, Call, Args)
+      end, "rpc_SUITE_called_node_dies_1",
+      PA, ?MODULE, suicide, [erlang,halt,[]]),
+
+    node_rep(
+      fun (Call, Args) ->
+	      {badrpc,nodedown} = apply(rpc, Call, Args)
+      end, "rpc_SUITE_called_node_dies_2",
+      PA, ?MODULE, suicide, [init,stop,[]]),
+
+    node_rep(
+      fun (Call, Args=[_|_]) ->
+	      {badrpc,{'EXIT',{killed,_}}} = apply(rpc, Call, Args)
+      end, "rpc_SUITE_called_node_dies_3",
+      PA, ?MODULE, suicide, [erlang,exit,[rex,kill]]),
+
+    node_rep(
+      fun (block_call, _Args) ->
+	      %% Cannot block call rpc - will hang
+	      ok;
+	  (Call, Args=[_|_]) ->
+	      {badrpc,{'EXIT',{normal,_}}} = apply(rpc, Call, Args)
+      end, "rpc_SUITE_called_node_dies_4",
+      PA, ?MODULE, suicide, [rpc,stop,[]]),
+
     ok.
 
 node_rep(Fun, Name, PA, M, F, A) ->
-    {ok, Na} = ?t:start_node(list_to_atom(Name++"_a"), slave, 
-			      [{args, "-pa " ++ PA}]),
-    Fun(a, call, [Na, M, F, A]),
-    catch ?t:stop_node(Na),
-    {ok, Nb} = ?t:start_node(list_to_atom(Name++"_b"), slave, 
-			      [{args, "-pa " ++ PA}]),
-    Fun(b, call, [Nb, M, F, A, infinity]),
-    catch ?t:stop_node(Nb),
-    {ok, Nc} = ?t:start_node(list_to_atom(Name++"_c"), slave, 
-			      [{args, "-pa " ++ PA}]),
-    Fun(c, call, [Nc, M, F, A, infinity]),
-    catch ?t:stop_node(Nc),
-    %%
-    {ok, Nd} = ?t:start_node(list_to_atom(Name++"_d"), slave, 
-			      [{args, "-pa " ++ PA}]),
-    Fun(d, block_call, [Nd, M, F, A]),
-    catch ?t:stop_node(Nd),
-    {ok, Ne} = ?t:start_node(list_to_atom(Name++"_e"), slave, 
-			      [{args, "-pa " ++ PA}]),
-    Fun(e, block_call, [Ne, M, F, A, infinity]),
-    catch ?t:stop_node(Ne),
-    {ok, Nf} = ?t:start_node(list_to_atom(Name++"_f"), slave, 
-			      [{args, "-pa " ++ PA}]),
-    Fun(f, block_call, [Nf, M, F, A, infinity]),
-    catch ?t:stop_node(Nf),
+    node_rep_call(a, call, [M,F,A], Fun, Name, PA),
+    node_rep_call(b, call, [M,F,A,infinity], Fun, Name, PA),
+    node_rep_call(c, block_call, [M,F,A], Fun, Name, PA),
+    node_rep_call(d, block_call, [M,F,A,infinity], Fun, Name, PA).
+
+node_rep_call(Tag, Call, Args, Fun, Name0, PA) ->
+    Name = list_to_atom(Name0 ++ "_" ++ atom_to_list(Tag)),
+    {ok, N} = test_server:start_node(Name, slave,
+				     [{args, "-pa " ++ PA}]),
+    Fun(Call, [N|Args]),
+    catch test_server:stop_node(N),
     ok.
 
-
-
-called_throws(doc) ->
-    "OTP-3766";
+%% OTP-3766.
 called_throws(Config) when is_list(Config) ->
-    Timetrap = ?t:timetrap(?t:seconds(10)),
-    ?line PA = filename:dirname(code:which(?MODULE)),
+    PA = filename:dirname(code:which(?MODULE)),
     %%
-    ?line {ok, N} = ?t:start_node(rpc_SUITE_called_throws, slave, 
-				  [{args, "-pa " ++ PA}]),
+    {ok, N} = test_server:start_node(rpc_SUITE_called_throws, slave,
+				     [{args, "-pa " ++ PA}]),
     %%
-    ?line rep(fun (Tag, Call, Args) ->
-		      {Tag,up} = 
-			  {Tag,apply(rpc, Call, Args)}
-	      end, N, erlang, throw, [up]),
-    ?line rep(fun (Tag, Call, Args) ->
-		      {Tag,{badrpc,{'EXIT',reason}}} = 
-			  {Tag,apply(rpc, Call, Args)}
-	      end, N, erlang, throw, [{'EXIT',reason}]),
+    rep(fun (Tag, Call, Args) ->
+		{Tag,up} =
+		    {Tag,apply(rpc, Call, Args)}
+	end, N, erlang, throw, [up]),
+    rep(fun (Tag, Call, Args) ->
+		{Tag,{badrpc,{'EXIT',reason}}} =
+		    {Tag,apply(rpc, Call, Args)}
+	end, N, erlang, throw, [{'EXIT',reason}]),
     %%
-    ?line ?t:stop_node(N),
-    ?t:timetrap_cancel(Timetrap),
+    test_server:stop_node(N),
     ok.
 
 
 
 call_benchmark(Config) when is_list(Config) ->
-    Timetrap = ?t:timetrap(?t:seconds(120)),
     PA = filename:dirname(code:which(?MODULE)),
-    {ok, Node} = ?t:start_node(rpc_SUITE_call_benchmark, slave,
-			       [{args, "-pa " ++ PA}]),
+    {ok, Node} = test_server:start_node(rpc_SUITE_call_benchmark, slave,
+					[{args, "-pa " ++ PA}]),
     Iter = case erlang:system_info(modified_timing_level) of
 	       undefined -> 10000;
 	       _ -> 500		     %Modified timing - spawn is slower
 	   end,
     Res = do_call_benchmark(Node, Iter),
-    ?t:stop_node(Node),
-    ?t:timetrap_cancel(Timetrap),
+    test_server:stop_node(Node),
     Res.
 
 do_call_benchmark(Node, M) when is_integer(M), M > 0 ->
@@ -486,31 +442,28 @@ do_call_benchmark(Node, I, M) ->
     do_call_benchmark(Node, I+1, M).
 
 async_call(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:seconds(120)),
-
     %% Note: First part of nodename sets response delay in seconds.
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?line NodeArgs = [{args,"-pa "++ PA}],
-    ?line {ok,Node1} = ?t:start_node('1_rpc_SUITE_call', slave, NodeArgs),
-    ?line {ok,Node2} = ?t:start_node('10_rpc_SUITE_call', slave, NodeArgs),
-    ?line {ok,Node3} = ?t:start_node('20_rpc_SUITE_call', slave, NodeArgs),
-    ?line Promise1 = rpc:async_call(Node1, ?MODULE, f, []),
-    ?line Promise2 = rpc:async_call(Node2, ?MODULE, f, []),
-    ?line Promise3 = rpc:async_call(Node3, ?MODULE, f, []),
+    PA = filename:dirname(code:which(?MODULE)),
+    NodeArgs = [{args,"-pa "++ PA}],
+    {ok,Node1} = test_server:start_node('1_rpc_SUITE_call', slave, NodeArgs),
+    {ok,Node2} = test_server:start_node('10_rpc_SUITE_call', slave, NodeArgs),
+    {ok,Node3} = test_server:start_node('20_rpc_SUITE_call', slave, NodeArgs),
+    Promise1 = rpc:async_call(Node1, ?MODULE, f, []),
+    Promise2 = rpc:async_call(Node2, ?MODULE, f, []),
+    Promise3 = rpc:async_call(Node3, ?MODULE, f, []),
 
     %% Test fast timeouts.
-    ?line timeout = rpc:nb_yield(Promise2),
-    ?line timeout = rpc:nb_yield(Promise2, 10),
+    timeout = rpc:nb_yield(Promise2),
+    timeout = rpc:nb_yield(Promise2, 10),
 
     %% Let Node1 finish its work before yielding.
-    ?t:sleep(?t:seconds(2)),
-    ?line {hej,_,Node1} = rpc:yield(Promise1),
+    ct:sleep({seconds,2}),
+    {hej,_,Node1} = rpc:yield(Promise1),
 
     %% Wait for the Node2 and Node3.
-    ?line {value,{hej,_,Node2}} = rpc:nb_yield(Promise2, infinity),
-    ?line {hej,_,Node3} = rpc:yield(Promise3),
+    {value,{hej,_,Node2}} = rpc:nb_yield(Promise2, infinity),
+    {hej,_,Node3} = rpc:yield(Promise3),
 
-    ?t:timetrap_cancel(Dog),
     ok.
 
 %%%
diff --git a/lib/kernel/test/sendfile_SUITE.erl b/lib/kernel/test/sendfile_SUITE.erl
index a82b9c5fcd..775689a6bc 100644
--- a/lib/kernel/test/sendfile_SUITE.erl
+++ b/lib/kernel/test/sendfile_SUITE.erl
@@ -53,7 +53,7 @@ init_per_suite(Config) ->
 	{{unix,sunos}, {5,8,_}} ->
 	    {skip, "Solaris 8 not supported for now"};
 	_ ->
-	    Priv = ?config(priv_dir, Config),
+	    Priv = proplists:get_value(priv_dir, Config),
 	    SFilename = filename:join(Priv, "sendfile_small.html"),
 	    {ok, DS} = file:open(SFilename,[write,raw]),
 	    file:write(DS,"yo baby yo"),
diff --git a/lib/kernel/test/seq_trace_SUITE.erl b/lib/kernel/test/seq_trace_SUITE.erl
index 7df0bc3d2f..15128ab69c 100644
--- a/lib/kernel/test/seq_trace_SUITE.erl
+++ b/lib/kernel/test/seq_trace_SUITE.erl
@@ -27,17 +27,21 @@
 	 trace_exit/1, distributed_exit/1, call/1, port/1,
 	 match_set_seq_token/1, gc_seq_token/1]).
 
-% internal exports
+%% internal exports
 -export([simple_tracer/2, one_time_receiver/0, one_time_receiver/1,
 	 start_tracer/0, stop_tracer/1, 
 	 do_match_set_seq_token/1, do_gc_seq_token/1, countdown_start/2]).
 
-						%-define(line_trace, 1).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
--define(default_timeout, ?t:minutes(1)).
+-define(TIMESTAMP_MODES, [no_timestamp,
+			  timestamp,
+			  monotonic_timestamp,
+			  strict_monotonic_timestamp]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [token_set_get, tracer_set_get, print, send,
@@ -62,343 +66,373 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
 %% Verifies that the set_token and get_token functions work as expected
 
-token_set_get(doc) -> [];
-token_set_get(suite) -> [];
 token_set_get(Config) when is_list(Config) ->
-    ?line Self = self(),
-    ?line seq_trace:reset_trace(),
+    do_token_set_get(timestamp),
+    do_token_set_get(monotonic_timestamp),
+    do_token_set_get(strict_monotonic_timestamp).
+    
+do_token_set_get(TsType) ->
+    io:format("Testing ~p~n", [TsType]),
+    Flags = case TsType of
+		timestamp -> 15;
+		strict_monotonic_timestamp -> 23;
+		monotonic_timestamp -> 39
+	    end,
+    Self = self(),
+    seq_trace:reset_trace(),
     %% Test that initial seq_trace is disabled
-    ?line [] = seq_trace:get_token(),
+    [] = seq_trace:get_token(),
     %% Test setting and reading the different fields
-    ?line 0 = seq_trace:set_token(label,17),
-    ?line {label,17} = seq_trace:get_token(label),
-    ?line false = seq_trace:set_token(print,true),
-    ?line {print,true} = seq_trace:get_token(print),
-    ?line false = seq_trace:set_token(send,true),
-    ?line {send,true} = seq_trace:get_token(send),
-    ?line false = seq_trace:set_token('receive',true),
-    ?line {'receive',true} = seq_trace:get_token('receive'),
-    ?line false = seq_trace:set_token(timestamp,true),
-    ?line {timestamp,true} = seq_trace:get_token(timestamp),
+    0 = seq_trace:set_token(label,17),
+    {label,17} = seq_trace:get_token(label),
+    false = seq_trace:set_token(print,true),
+    {print,true} = seq_trace:get_token(print),
+    false = seq_trace:set_token(send,true),
+    {send,true} = seq_trace:get_token(send),
+    false = seq_trace:set_token('receive',true),
+    {'receive',true} = seq_trace:get_token('receive'),
+    false = seq_trace:set_token(TsType,true),
+    {TsType,true} = seq_trace:get_token(TsType),
     %% Check the whole token
-    ?line {15,17,0,Self,0} = seq_trace:get_token(), % all flags are set
+    {Flags,17,0,Self,0} = seq_trace:get_token(), % all flags are set
     %% Test setting and reading the 'serial' field
-    ?line {0,0} = seq_trace:set_token(serial,{3,5}),
-    ?line {serial,{3,5}} = seq_trace:get_token(serial),
+    {0,0} = seq_trace:set_token(serial,{3,5}),
+    {serial,{3,5}} = seq_trace:get_token(serial),
     %% Check the whole token, test that a whole token can be set and get
-    ?line {15,17,5,Self,3} = seq_trace:get_token(),
-    ?line seq_trace:set_token({15,19,7,Self,5}),
-    ?line {15,19,7,Self,5} = seq_trace:get_token(),
+    {Flags,17,5,Self,3} = seq_trace:get_token(),
+    seq_trace:set_token({Flags,19,7,Self,5}),
+    {Flags,19,7,Self,5} = seq_trace:get_token(),
     %% Check that receive timeout does not reset token
-    ?line receive after 0 -> ok end,
-    ?line {15,19,7,Self,5} = seq_trace:get_token(),
+    receive after 0 -> ok end,
+    {Flags,19,7,Self,5} = seq_trace:get_token(),
     %% Check that token can be unset
-    ?line {15,19,7,Self,5} = seq_trace:set_token([]),
-    ?line [] = seq_trace:get_token(),
+    {Flags,19,7,Self,5} = seq_trace:set_token([]),
+    [] = seq_trace:get_token(),
     %% Check that Previous serial counter survived unset token
-    ?line 0 = seq_trace:set_token(label, 17),
-    ?line {0,17,0,Self,5} = seq_trace:get_token(),
+    0 = seq_trace:set_token(label, 17),
+    {0,17,0,Self,5} = seq_trace:get_token(),
     %% Check that reset_trace resets the token and clears
     %% the Previous serial counter
-    ?line seq_trace:reset_trace(),
-    ?line [] = seq_trace:get_token(),
-    ?line 0 = seq_trace:set_token(label, 19),
-    ?line {0,19,0,Self,0} = seq_trace:get_token(),
+    seq_trace:reset_trace(),
+    [] = seq_trace:get_token(),
+    0 = seq_trace:set_token(label, 19),
+    {0,19,0,Self,0} = seq_trace:get_token(),
     %% Cleanup
-    ?line seq_trace:reset_trace(),
+    seq_trace:reset_trace(),
     ok.
 
-tracer_set_get(doc) -> [];
-tracer_set_get(suite) -> [];
 tracer_set_get(Config) when is_list(Config) ->
-    ?line Self = self(),
-    ?line seq_trace:set_system_tracer(self()),
-    ?line Self = seq_trace:get_system_tracer(),
-    ?line Self = seq_trace:set_system_tracer(false),
-    ?line false = seq_trace:get_system_tracer(),
+    Self = self(),
+    seq_trace:set_system_tracer(self()),
+    Self = seq_trace:get_system_tracer(),
+    Self = seq_trace:set_system_tracer(false),
+    false = seq_trace:get_system_tracer(),
 
     %% Set the system tracer to a port.
 
-    ?line Port = load_tracer(Config),
-    ?line seq_trace:set_system_tracer(Port),
-    ?line Port = seq_trace:get_system_tracer(),
-    ?line Port = seq_trace:set_system_tracer(false),
-    ?line false = seq_trace:get_system_tracer(),
+    Port = load_tracer(Config),
+    seq_trace:set_system_tracer(Port),
+    Port = seq_trace:get_system_tracer(),
+    Port = seq_trace:set_system_tracer(false),
+    false = seq_trace:get_system_tracer(),
     ok.
 
-print(doc) -> [];
-print(suite) -> [];
 print(Config) when is_list(Config) ->
-    ?line start_tracer(),
-    ?line seq_trace:set_token(print,true),
-    ?line seq_trace:print(0,print1),
-    ?line seq_trace:print(1,print2),
-    ?line seq_trace:print(print3),
-    ?line seq_trace:reset_trace(),
-    ?line [{0,{print,_,_,[],print1}},
-	   {0,{print,_,_,[],print3}}] = stop_tracer(2).
+    lists:foreach(fun do_print/1, ?TIMESTAMP_MODES).
+    
+do_print(TsType) ->
+    start_tracer(),
+    set_token_flags([print, TsType]),
+    seq_trace:print(0,print1),
+    seq_trace:print(1,print2),
+    seq_trace:print(print3),
+    seq_trace:reset_trace(),
+    [{0,{print,_,_,[],print1}, Ts0},
+	   {0,{print,_,_,[],print3}, Ts1}] = stop_tracer(2),
+    check_ts(TsType, Ts0),
+    check_ts(TsType, Ts1).
     
-send(doc) -> [];
-send(suite) -> [];
 send(Config) when is_list(Config) ->
-    ?line seq_trace:reset_trace(),
-    ?line start_tracer(),
-    ?line Receiver = spawn(?MODULE,one_time_receiver,[]),
-    ?line seq_trace:set_token(send,true),
-    ?line Receiver ! send,
-    ?line Self = self(),
-    ?line seq_trace:reset_trace(),
-    ?line [{0,{send,_,Self,Receiver,send}}] = stop_tracer(1).
-
-distributed_send(doc) -> [];
-distributed_send(suite) -> [];
+    lists:foreach(fun do_send/1, ?TIMESTAMP_MODES).
+
+do_send(TsType) ->
+    seq_trace:reset_trace(),
+    start_tracer(),
+    Receiver = spawn(?MODULE,one_time_receiver,[]),
+    set_token_flags([send, TsType]),
+    Receiver ! send,
+    Self = self(),
+    seq_trace:reset_trace(),
+    [{0,{send,_,Self,Receiver,send}, Ts}] = stop_tracer(1),
+    check_ts(TsType, Ts).
+
 distributed_send(Config) when is_list(Config) ->
-    ?line {ok,Node} = start_node(seq_trace_other,[]),
-    ?line {_,Dir} = code:is_loaded(?MODULE),
-    ?line Mdir = filename:dirname(Dir),
-    ?line true = rpc:call(Node,code,add_patha,[Mdir]),
-    ?line seq_trace:reset_trace(),
-    ?line start_tracer(),
-    ?line Receiver = spawn(Node,?MODULE,one_time_receiver,[]),
-    ?line seq_trace:set_token(send,true),
-    ?line Receiver ! send,
-    ?line Self = self(),
-    ?line seq_trace:reset_trace(),
-    ?line stop_node(Node),
-    ?line [{0,{send,_,Self,Receiver,send}}] = stop_tracer(1).
-
-recv(doc) -> [];
-recv(suite) -> [];
+    lists:foreach(fun do_distributed_send/1, ?TIMESTAMP_MODES).
+
+do_distributed_send(TsType) ->
+    {ok,Node} = start_node(seq_trace_other,[]),
+    {_,Dir} = code:is_loaded(?MODULE),
+    Mdir = filename:dirname(Dir),
+    true = rpc:call(Node,code,add_patha,[Mdir]),
+    seq_trace:reset_trace(),
+    start_tracer(),
+    Receiver = spawn(Node,?MODULE,one_time_receiver,[]),
+    set_token_flags([send,TsType]),
+    Receiver ! send,
+    Self = self(),
+    seq_trace:reset_trace(),
+    stop_node(Node),
+    [{0,{send,_,Self,Receiver,send}, Ts}] = stop_tracer(1),
+    check_ts(TsType, Ts).
+    
+
 recv(Config) when is_list(Config) ->
-    ?line seq_trace:reset_trace(),
-    ?line start_tracer(),
-    ?line Receiver = spawn(?MODULE,one_time_receiver,[]),
-    ?line seq_trace:set_token('receive',true),
-    ?line Receiver ! 'receive',
+    lists:foreach(fun do_recv/1, ?TIMESTAMP_MODES).
+
+do_recv(TsType) ->
+    seq_trace:reset_trace(),
+    start_tracer(),
+    Receiver = spawn(?MODULE,one_time_receiver,[]),
+    set_token_flags(['receive',TsType]),
+    Receiver ! 'receive',
     %% let the other process receive the message:
-    ?line receive after 1 -> ok end,
-    ?line Self = self(),
-    ?line seq_trace:reset_trace(),
-    ?line [{0,{'receive',_,Self,Receiver,'receive'}}] = stop_tracer(1).
+    receive after 1 -> ok end,
+    Self = self(),
+    seq_trace:reset_trace(),
+    [{0,{'receive',_,Self,Receiver,'receive'}, Ts}] = stop_tracer(1),
+    check_ts(TsType, Ts).
 
-distributed_recv(doc) -> [];
-distributed_recv(suite) -> [];
 distributed_recv(Config) when is_list(Config) ->
-    ?line {ok,Node} = start_node(seq_trace_other,[]),
-    ?line {_,Dir} = code:is_loaded(?MODULE),
-    ?line Mdir = filename:dirname(Dir),
-    ?line true = rpc:call(Node,code,add_patha,[Mdir]),
-    ?line seq_trace:reset_trace(),
-    ?line rpc:call(Node,?MODULE,start_tracer,[]),
-    ?line Receiver = spawn(Node,?MODULE,one_time_receiver,[]),
-    ?line seq_trace:set_token('receive',true),
-    ?line Receiver ! 'receive',
+    lists:foreach(fun do_distributed_recv/1, ?TIMESTAMP_MODES).
+
+do_distributed_recv(TsType) ->
+    {ok,Node} = start_node(seq_trace_other,[]),
+    {_,Dir} = code:is_loaded(?MODULE),
+    Mdir = filename:dirname(Dir),
+    true = rpc:call(Node,code,add_patha,[Mdir]),
+    seq_trace:reset_trace(),
+    rpc:call(Node,?MODULE,start_tracer,[]),
+    Receiver = spawn(Node,?MODULE,one_time_receiver,[]),
+    set_token_flags(['receive',TsType]),
+    Receiver ! 'receive',
     %% let the other process receive the message:
-    ?line receive after 1 -> ok end,
-    ?line Self = self(),
-    ?line seq_trace:reset_trace(),
-    ?line Result = rpc:call(Node,?MODULE,stop_tracer,[1]),
-    ?line stop_node(Node),
-    ?line ok = io:format("~p~n",[Result]),
-    ?line [{0,{'receive',_,Self,Receiver,'receive'}}] = Result.
-
-trace_exit(doc) -> [];
-trace_exit(suite) -> [];
+    receive after 1 -> ok end,
+    Self = self(),
+    seq_trace:reset_trace(),
+    Result = rpc:call(Node,?MODULE,stop_tracer,[1]),
+    stop_node(Node),
+    ok = io:format("~p~n",[Result]),
+    [{0,{'receive',_,Self,Receiver,'receive'}, Ts}] = Result,
+    check_ts(TsType, Ts).
+
 trace_exit(Config) when is_list(Config) ->
-    ?line seq_trace:reset_trace(),
-    ?line start_tracer(),
-    ?line Receiver = spawn_link(?MODULE, one_time_receiver, [exit]),
-    ?line process_flag(trap_exit, true),
-    ?line seq_trace:set_token(send,true),
-    ?line Receiver ! {before, exit},
+    lists:foreach(fun do_trace_exit/1, ?TIMESTAMP_MODES).
+
+do_trace_exit(TsType) ->
+    seq_trace:reset_trace(),
+    start_tracer(),
+    Receiver = spawn_link(?MODULE, one_time_receiver, [exit]),
+    process_flag(trap_exit, true),
+    set_token_flags([send, TsType]),
+    Receiver ! {before, exit},
     %% let the other process receive the message:
-    ?line receive
+    receive
 	      {'EXIT', Receiver, {exit, {before, exit}}} ->
 		  seq_trace:set_token([]);
 	      Other ->
 		  seq_trace:set_token([]),
-		  ?t:fail({received, Other})
+		  ct:fail({received, Other})
 	  end,
-    ?line Self = self(),
-    ?line Result = stop_tracer(2),
-    ?line seq_trace:reset_trace(),
-    ?line ok = io:format("~p~n", [Result]),
-    ?line [{0, {send, {0,1}, Self, Receiver, {before, exit}}}, 
+    Self = self(),
+    Result = stop_tracer(2),
+    seq_trace:reset_trace(),
+    ok = io:format("~p~n", [Result]),
+    [{0, {send, {0,1}, Self, Receiver, {before, exit}}, Ts0},
 	   {0, {send, {1,2}, Receiver, Self,
-	       {'EXIT', Receiver, {exit, {before, exit}}}}}] = Result.
+	       {'EXIT', Receiver, {exit, {before, exit}}}}, Ts1}] = Result,
+    check_ts(TsType, Ts0),
+    check_ts(TsType, Ts1).
 
-distributed_exit(doc) -> [];
-distributed_exit(suite) -> [];
 distributed_exit(Config) when is_list(Config) ->
-    ?line {ok, Node} = start_node(seq_trace_other, []),
-    ?line {_, Dir} = code:is_loaded(?MODULE),
-    ?line Mdir = filename:dirname(Dir),
-    ?line true = rpc:call(Node, code, add_patha, [Mdir]),
-    ?line seq_trace:reset_trace(),
-    ?line rpc:call(Node, ?MODULE, start_tracer,[]),
-    ?line Receiver = spawn_link(Node, ?MODULE, one_time_receiver, [exit]),
-    ?line process_flag(trap_exit, true),
-    ?line seq_trace:set_token(send, true),
-    ?line Receiver ! {before, exit},
+    lists:foreach(fun do_distributed_exit/1, ?TIMESTAMP_MODES).
+
+do_distributed_exit(TsType) ->
+    {ok, Node} = start_node(seq_trace_other, []),
+    {_, Dir} = code:is_loaded(?MODULE),
+    Mdir = filename:dirname(Dir),
+    true = rpc:call(Node, code, add_patha, [Mdir]),
+    seq_trace:reset_trace(),
+    rpc:call(Node, ?MODULE, start_tracer,[]),
+    Receiver = spawn_link(Node, ?MODULE, one_time_receiver, [exit]),
+    process_flag(trap_exit, true),
+    set_token_flags([send, TsType]),
+    Receiver ! {before, exit},
     %% let the other process receive the message:
-    ?line receive
+    receive
 	      {'EXIT', Receiver, {exit, {before, exit}}} ->
 		  seq_trace:set_token([]);
 	      Other ->
 		  seq_trace:set_token([]),
-		  ?t:fail({received, Other})
+		  ct:fail({received, Other})
 	  end,
-    ?line Self = self(),
-    ?line Result = rpc:call(Node, ?MODULE, stop_tracer, [1]),
-    ?line seq_trace:reset_trace(),
-    ?line stop_node(Node),
-    ?line ok = io:format("~p~n", [Result]),
-    ?line [{0, {send, {1, 2}, Receiver, Self, 
-		{'EXIT', Receiver, {exit, {before, exit}}}}}] = Result.
+    Self = self(),
+    Result = rpc:call(Node, ?MODULE, stop_tracer, [1]),
+    seq_trace:reset_trace(),
+    stop_node(Node),
+    ok = io:format("~p~n", [Result]),
+    [{0, {send, {1, 2}, Receiver, Self,
+		{'EXIT', Receiver, {exit, {before, exit}}}}, Ts}] = Result,
+    check_ts(TsType, Ts).
 
 call(doc) -> 
     "Tests special forms {is_seq_trace} and {get_seq_token} "
 	"in trace match specs.";
-call(suite) -> 
-    [];
 call(Config) when is_list(Config) ->
-    ?line Self = self(),
-    ?line seq_trace:reset_trace(),
-    ?line TrA = transparent_tracer(),
-    ?line 1 = 
+    Self = self(),
+    seq_trace:reset_trace(),
+    TrA = transparent_tracer(),
+    1 =
 	erlang:trace(Self, true, 
 		     [call, set_on_spawn, {tracer, TrA(pid)}]),
-    ?line 1 = 
+    1 =
 	erlang:trace_pattern({?MODULE, call_tracee_1, 1},
 			     [{'_',
 			       [],
 			       [{message, {{{self}, {get_seq_token}}}}]}],
 			     [local]),
-    ?line 1 =
+    1 =
 	erlang:trace_pattern({?MODULE, call_tracee_2, 1},
 			     [{'_',
 			      [{is_seq_trace}],
 			      [{message, {{{self}, {get_seq_token}}}}]}],
 			     [local]),
-    ?line RefA = make_ref(),
-    ?line Pid2A = spawn_link(
+    RefA = make_ref(),
+    Pid2A = spawn_link(
 		    fun() ->
 			    receive {_, msg, RefA} -> ok end,
 			    RefA = call_tracee_2(RefA),
 			    Self ! {self(), msg, RefA}
 		   end),
-    ?line Pid1A = spawn_link(
+    Pid1A = spawn_link(
 		    fun() ->
 			    receive {_, msg, RefA} -> ok end,
 			    RefA = call_tracee_1(RefA),
 			    Pid2A ! {self(), msg, RefA}
 		    end),
-    ?line Pid1A ! {Self, msg, RefA},
+    Pid1A ! {Self, msg, RefA},
     %% The message is passed Self -> Pid1B -> Pid2B -> Self.
     %% Traced functions are called in Pid1B and Pid2B. 
-    ?line receive {Pid2A, msg, RefA} -> ok end,
+    receive {Pid2A, msg, RefA} -> ok end,
     %% Only call_tracee1 will be traced since the guard for 
     %% call_tracee2 requires a sequential trace. The trace
     %% token is undefined.
-    ?line Token2A = [],
-    ?line {ok, [{trace, Pid1A, call, 
+    Token2A = [],
+    {ok, [{trace, Pid1A, call,
 		 {?MODULE, call_tracee_1, [RefA]},
 		 {Pid1A, Token2A}}]} = 
 	TrA({stop, 1}),
 
-    ?line seq_trace:reset_trace(),
+    seq_trace:reset_trace(),
 
-    ?line TrB = transparent_tracer(),
-    ?line 1 = 
+    TrB = transparent_tracer(),
+    1 =
 	erlang:trace(Self, true, 
 		     [call, set_on_spawn, {tracer, TrB(pid)}]),
-    ?line Label = 17,
-    ?line seq_trace:set_token(label, Label), % Token enters here!!
-    ?line RefB = make_ref(),
-    ?line Pid2B = spawn_link(
+    Label = 17,
+    seq_trace:set_token(label, Label), % Token enters here!!
+    RefB = make_ref(),
+    Pid2B = spawn_link(
 		    fun() ->
 			    receive {_, msg, RefB} -> ok end,
 			    RefB = call_tracee_2(RefB),
 			    Self ! {self(), msg, RefB}
 		   end),
-    ?line Pid1B = spawn_link(
+    Pid1B = spawn_link(
 		    fun() ->
 			    receive {_, msg, RefB} -> ok end,
 			    RefB = call_tracee_1(RefB),
 			    Pid2B ! {self(), msg, RefB}
 		    end),
-    ?line Pid1B ! {Self, msg, RefB},
+    Pid1B ! {Self, msg, RefB},
     %% The message is passed Self -> Pid1B -> Pid2B -> Self, and the 
     %% seq_trace token follows invisibly. Traced functions are 
     %% called in Pid1B and Pid2B. Seq_trace flags == 0 so no
     %% seq_trace messages are generated.
-    ?line receive {Pid2B, msg, RefB} -> ok end,
+    receive {Pid2B, msg, RefB} -> ok end,
     %% The values of these counters {.., 1, _, 0}, {.., 2, _, 1}
     %% depend on that seq_trace has been reset just before this test.
-    ?line Token1B = {0, Label, 1, Self, 0},
-    ?line Token2B = {0, Label, 2, Pid1B, 1},
-    ?line {ok, [{trace, Pid1B, call, 
+    Token1B = {0, Label, 1, Self, 0},
+    Token2B = {0, Label, 2, Pid1B, 1},
+    {ok, [{trace, Pid1B, call,
 		 {?MODULE, call_tracee_1, [RefB]},
 		 {Pid1B, Token1B}},
 		{trace, Pid2B, call, 
 		 {?MODULE, call_tracee_2, [RefB]},
 		 {Pid2B, Token2B}}]} =
 	TrB({stop,2}),
-    ?line seq_trace:reset_trace(),
+    seq_trace:reset_trace(),
     ok.
 
-port(doc) ->
-    "Send trace messages to a port.";
-port(suite) -> [];
+%% Send trace messages to a port.
 port(Config) when is_list(Config) ->
-    ?line Port = load_tracer(Config),
-    ?line seq_trace:set_system_tracer(Port),
-
-    ?line seq_trace:set_token(print, true),
-    ?line Small = [small,term],
-    ?line seq_trace:print(0, Small),
-    ?line case get_port_message(Port) of
-	      {seq_trace,0,{print,_,_,[],Small}} ->
+    lists:foreach(fun (TsType) -> do_port(TsType, Config) end,
+		  ?TIMESTAMP_MODES).
+
+do_port(TsType, Config) ->
+    io:format("Testing ~p~n",[TsType]),
+    Port = load_tracer(Config),
+    seq_trace:set_system_tracer(Port),
+
+    set_token_flags([print, TsType]),
+    Small = [small,term],
+    seq_trace:print(0, Small),
+    case get_port_message(Port) of
+	      {seq_trace,0,{print,_,_,[],Small}} when TsType == no_timestamp ->
+		  ok;
+	      {seq_trace,0,{print,_,_,[],Small},Ts0} when TsType /= no_timestamp ->
+		  check_ts(TsType, Ts0),
 		  ok;
 	      Other ->
-		  ?line seq_trace:reset_trace(),
-		  ?line ?t:fail({unexpected,Other})
+		  seq_trace:reset_trace(),
+		  ct:fail({unexpected,Other})
 	  end,
     %% OTP-4218 Messages from ports should not affect seq trace token.
     %%
     %% Check if trace token still is active on this process after
     %% the get_port_message/1 above that receives from a port.
-    ?line OtherSmall = [other | Small],
-    ?line seq_trace:print(0, OtherSmall),
-    ?line seq_trace:reset_trace(),
-    ?line case get_port_message(Port) of
-	      {seq_trace,0,{print,_,_,[],OtherSmall}} ->
+    OtherSmall = [other | Small],
+    seq_trace:print(0, OtherSmall),
+    seq_trace:reset_trace(),
+    case get_port_message(Port) of
+	      {seq_trace,0,{print,_,_,[],OtherSmall}} when TsType == no_timestamp ->
+		  ok;
+	      {seq_trace,0,{print,_,_,[],OtherSmall}, Ts1} when TsType /= no_timestamp ->
+		  check_ts(TsType, Ts1),
 		  ok;
 	      Other1 ->
-		  ?line ?t:fail({unexpected,Other1})
+		  ct:fail({unexpected,Other1})
 	  end,
 
 
-    ?line seq_trace:set_token(print, true),
-    ?line Huge = huge_data(),
-    ?line seq_trace:print(0, Huge),
-    ?line seq_trace:reset_trace(),
-    ?line case get_port_message(Port) of
+    seq_trace:set_token(print, true),
+    Huge = huge_data(),
+    seq_trace:print(0, Huge),
+    seq_trace:reset_trace(),
+    case get_port_message(Port) of
 	      {seq_trace,0,{print,_,_,[],Huge}} ->
 		  ok;
 	      Other2 ->
-		  ?line ?t:fail({unexpected,Other2})
+		  ct:fail({unexpected,Other2})
 	  end,
+    unlink(Port),
+    exit(Port,kill),
     ok.
 
 get_port_message(Port) ->
@@ -406,21 +440,19 @@ get_port_message(Port) ->
 	{Port,{data,Bin}} when is_binary(Bin) ->
 	    binary_to_term(Bin);
 	Other ->
-	    ?t:fail({unexpected,Other})
+	    ct:fail({unexpected,Other})
     after 5000 ->
-	    ?t:fail(timeout)
+	    ct:fail(timeout)
     end.
 
 
 
-match_set_seq_token(suite) ->
-    [];
 match_set_seq_token(doc) ->
     ["Tests that match spec function set_seq_token does not "
      "corrupt the heap"];
 match_set_seq_token(Config) when is_list(Config) ->
-    ?line Parent = self(),
-    ?line Timetrap = test_server:timetrap(test_server:seconds(20)),
+    Parent = self(),
+
     %% OTP-4222 Match spec 'set_seq_token' corrupts heap
     %%
     %% This test crashes the emulator if the bug in question is present,
@@ -428,13 +460,13 @@ match_set_seq_token(Config) when is_list(Config) ->
     %%
     %% All the timeout stuff is here to get decent accuracy of the error
     %% return value, instead of just 'timeout'.
-    %
-    ?line {ok, Sandbox} = start_node(seq_trace_other, []),
-    ?line true = rpc:call(Sandbox, code, add_patha, 
+    %%
+    {ok, Sandbox} = start_node(seq_trace_other, []),
+    true = rpc:call(Sandbox, code, add_patha,
 			  [filename:dirname(code:which(?MODULE))]),
-    ?line Lbl = 4711,
+    Lbl = 4711,
     %% Do the possibly crashing test
-    ?line P1 =
+    P1 =
 	spawn(
 	  fun () ->
 		  Parent ! {self(),
@@ -442,16 +474,16 @@ match_set_seq_token(Config) when is_list(Config) ->
 				     ?MODULE, do_match_set_seq_token, [Lbl])}
 	  end),
     %% Probe the node with a simple rpc request, to see if it is alive.
-    ?line P2 =
+    P2 =
 	spawn(
 	  fun () ->
 		  receive after 4000 -> ok end,
 		  Parent ! {self(), rpc:call(Sandbox, erlang, abs, [-1])}
 	  end),
     %% If the test node hangs completely, this timer expires.
-    ?line R3 = erlang:start_timer(8000, self(), void),
+    R3 = erlang:start_timer(8000, self(), void),
     %%
-    ?line {ok, Log} = 
+    {ok, Log} =
 	receive
 	    {P1, Result} ->
 		exit(P2, done),
@@ -466,10 +498,9 @@ match_set_seq_token(Config) when is_list(Config) ->
 		exit(P2, timeout),
 		{error, "Test node hung"}
 	end,
-    ?line ok = check_match_set_seq_token_log(Lbl, Log),
+    ok = check_match_set_seq_token_log(Lbl, Log),
     %%
-    ?line stop_node(Sandbox),
-    ?line test_server:timetrap_cancel(Timetrap),
+    stop_node(Sandbox),
     ok.
 
 %% OTP-4222 Match spec 'set_seq_token' corrupts heap
@@ -561,14 +592,12 @@ bounce(Ref) ->
 
 
 
-gc_seq_token(suite) ->
-    [];
 gc_seq_token(doc) ->
     ["Tests that a seq_trace token on a message in the inqueue ",
      "can be garbage collected."];
 gc_seq_token(Config) when is_list(Config) ->
-    ?line Parent = self(),
-    ?line Timetrap = test_server:timetrap(test_server:seconds(20)),
+    Parent = self(),
+
     %% OTP-4555 Seq trace token causes free mem read in gc
     %%
     %% This test crashes the emulator if the bug in question is present,
@@ -576,13 +605,13 @@ gc_seq_token(Config) when is_list(Config) ->
     %%
     %% All the timeout stuff is here to get decent accuracy of the error
     %% return value, instead of just 'timeout'.
-    %
-    ?line {ok, Sandbox} = start_node(seq_trace_other, []),
-    ?line true = rpc:call(Sandbox, code, add_patha, 
+    %%
+    {ok, Sandbox} = start_node(seq_trace_other, []),
+    true = rpc:call(Sandbox, code, add_patha,
 			  [filename:dirname(code:which(?MODULE))]),
-    ?line Label = 4711,
+    Label = 4711,
     %% Do the possibly crashing test
-    ?line P1 =
+    P1 =
 	spawn(
 	  fun () ->
  		  Parent ! {self(),
@@ -590,16 +619,16 @@ gc_seq_token(Config) when is_list(Config) ->
 				     ?MODULE, do_gc_seq_token, [Label])}
 	  end),
     %% Probe the node with a simple rpc request, to see if it is alive.
-    ?line P2 =
+    P2 =
 	spawn(
 	  fun () ->
 		  receive after 4000 -> ok end,
 		  Parent ! {self(), rpc:call(Sandbox, erlang, abs, [-1])}
 	  end),
     %% If the test node hangs completely, this timer expires.
-    ?line R3 = erlang:start_timer(8000, self(), void),
+    R3 = erlang:start_timer(8000, self(), void),
     %%
-    ?line ok = 
+    ok =
 	receive
 	    {P1, Result} ->
 		exit(P2, done),
@@ -615,8 +644,7 @@ gc_seq_token(Config) when is_list(Config) ->
 		{error, "Test node hung"}
 	end,
     %%
-    ?line stop_node(Sandbox),
-    ?line test_server:timetrap_cancel(Timetrap),
+    stop_node(Sandbox),
     ok.
 
 do_gc_seq_token(Label) ->
@@ -734,7 +762,7 @@ simple_tracer(Data, DN) ->
 	{seq_trace,Label,Info,Ts} ->
 	    simple_tracer([{Label,Info,Ts}|Data], DN+1);
 	{seq_trace,Label,Info} ->
-	    simple_tracer([{Label,Info}|Data], DN+1);
+	    simple_tracer([{Label,Info, no_timestamp}|Data], DN+1);
 	{stop,N,From} when DN >= N ->
 	    From ! {tracerlog,lists:reverse(Data)}
     end.
@@ -759,7 +787,55 @@ start_tracer() ->
     seq_trace:set_system_tracer(Pid),
     Pid.
 
-    
+
+set_token_flags([]) ->
+    ok;
+set_token_flags([no_timestamp|Flags]) ->
+    seq_trace:set_token(timestamp, false),
+    seq_trace:set_token(monotonic_timestamp, false),
+    seq_trace:set_token(strict_monotonic_timestamp, false),
+    set_token_flags(Flags);
+set_token_flags([Flag|Flags]) ->
+    seq_trace:set_token(Flag, true),
+    set_token_flags(Flags).
+
+check_ts(no_timestamp, Ts) ->
+    try
+	no_timestamp = Ts
+    catch
+	_ : _ ->
+	    ct:fail({unexpected_timestamp, Ts})
+    end,
+    ok;
+check_ts(timestamp, Ts) ->
+    try
+	{Ms,S,Us} = Ts,
+	true = is_integer(Ms),
+	true = is_integer(S),
+	true = is_integer(Us)
+    catch
+	_ : _ ->
+	    ct:fail({unexpected_timestamp, Ts})
+    end,
+    ok;
+check_ts(monotonic_timestamp, Ts) ->
+    try
+	true = is_integer(Ts)
+    catch
+	_ : _ ->
+	    ct:fail({unexpected_timestamp, Ts})
+    end,
+    ok;
+check_ts(strict_monotonic_timestamp, Ts) ->
+    try
+	{MT, UMI} = Ts,
+	true = is_integer(MT),
+	true = is_integer(UMI)
+    catch
+	_ : _ ->
+	    ct:fail({unexpected_timestamp, Ts})
+    end,
+    ok.
 	
 start_node(Name, Param) ->
     test_server:start_node(Name, slave, [{args, Param}]).
@@ -768,7 +844,7 @@ stop_node(Node) ->
     test_server:stop_node(Node).
 
 load_tracer(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     ok = erl_ddll:load_driver(Path, echo_drv),
     open_port({spawn,echo_drv}, [eof,binary]).
 
diff --git a/lib/kernel/test/wrap_log_reader_SUITE.erl b/lib/kernel/test/wrap_log_reader_SUITE.erl
index 9a93b9037f..c797354a3e 100644
--- a/lib/kernel/test/wrap_log_reader_SUITE.erl
+++ b/lib/kernel/test/wrap_log_reader_SUITE.erl
@@ -20,7 +20,7 @@
 
 -module(wrap_log_reader_SUITE).
 
-%-define(debug, true).
+%%-define(debug, true).
 
 -ifdef(debug).
 -define(format(S, A), io:format(S, A)).
@@ -29,9 +29,9 @@
 -define(config(X,Y), foo).
 -define(t,test_server).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(format(S, A), ok).
--define(privdir(Conf), ?config(priv_dir, Conf)).
+-define(privdir(Conf), proplists:get_value(priv_dir, Conf)).
 -endif.
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -47,7 +47,9 @@
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [no_file, {group, one}, {group, two}, {group, four},
@@ -71,75 +73,70 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
-    Dog=?t:timetrap(?t:seconds(60)),
-    [{watchdog, Dog} | Config].
+init_per_testcase(Func, Config) ->
+    Config.
 
 end_per_testcase(_Func, _Config) ->
-    Dog=?config(watchdog, _Config),
-    ?t:timetrap_cancel(Dog).
+    ok.
 
-no_file(suite) -> [];
-no_file(doc) -> ["No log file exists"];
+%% No log file exists.
 no_file(Conf) when is_list(Conf) ->
-    ?line code:add_path(?config(data_dir,Conf)),
+    code:add_path(proplists:get_value(data_dir,Conf)),
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
     delete_files(File),
     start(),
 
     wlt ! {open, self(), File},
-    ?line rec({error, {index_file_not_found, File}}, ?LINE),
+    rec({error, {index_file_not_found, File}}, ?LINE),
     wlt ! {open, self(), File, 1},
-    ?line rec({error, {index_file_not_found, File}}, ?LINE),
+    rec({error, {index_file_not_found, File}}, ?LINE),
     wlt ! {open, self(), File, 4},
-    ?line rec({error, {index_file_not_found, File}}, ?LINE),
+    rec({error, {index_file_not_found, File}}, ?LINE),
 
     stop(),
     delete_files(File),
     ok.
 
 
-one_empty(suite) -> [];
-one_empty(doc) -> ["One empty index file"];
+%% One empty index file.
 one_empty(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
     delete_files(File),
     start(),
 
-    ?line open(sune, File, ?LINE),
+    open(sune, File, ?LINE),
     %% open
-    ?line do_chunk([{open,File}, eof], wlt, ?LINE),
-    ?line do_chunk([{open,File,1}, eof], wlt, ?LINE),
+    do_chunk([{open,File}, eof], wlt, ?LINE),
+    do_chunk([{open,File,1}, eof], wlt, ?LINE),
     wlt ! {open, self(), File, 2},
-    ?line rec({error, {file_not_found, add_ext(File, 2)}}, ?LINE),
-    ?line close(sune),
+    rec({error, {file_not_found, add_ext(File, 2)}}, ?LINE),
+    close(sune),
 
     %% closed
-    ?line do_chunk([{open,File}, eof], wlt, ?LINE),
-    ?line do_chunk([{open,File,1}, eof], wlt, ?LINE),
+    do_chunk([{open,File}, eof], wlt, ?LINE),
+    do_chunk([{open,File,1}, eof], wlt, ?LINE),
     wlt ! {open, self(), File, 2},
-    ?line rec({error, {file_not_found, add_ext(File, 2)}}, ?LINE),
+    rec({error, {file_not_found, add_ext(File, 2)}}, ?LINE),
 
     stop(),
     delete_files(File),
     ok.
 
-one_filled(suite) -> [];
-one_filled(doc) -> ["One filled index file"];
+%% One filled index file.
 one_filled(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
     delete_files(File),
     start(),
 
-    ?line open(sune, File, ?LINE),
-    ?line log_terms(sune, ["first round, one", "first round, two"]),
-    ?line sync(sune),
+    open(sune, File, ?LINE),
+    log_terms(sune, ["first round, one", "first round, two"]),
+    sync(sune),
     %% open
     test_one(File),
-    ?line close(sune),
+    close(sune),
     %% closed
     test_one(File),
 
@@ -148,34 +145,33 @@ one_filled(Conf) when is_list(Conf) ->
     ok.
 
 test_one(File) ->
-    ?line do_chunk([{open,File}, 
-		    {chunk, ["first round, one", "first round, two"]}, 
-		    eof], wlt, ?LINE),
-    ?line do_chunk([{open,File,1}, 
-		    {chunk, ["first round, one", "first round, two"]}, 
-		    eof], wlt, ?LINE),
+    do_chunk([{open,File},
+	      {chunk, ["first round, one", "first round, two"]},
+	      eof], wlt, ?LINE),
+    do_chunk([{open,File,1},
+	      {chunk, ["first round, one", "first round, two"]},
+	      eof], wlt, ?LINE),
     wlt ! {open, self(), File, 2},
-    ?line rec({error, {file_not_found, add_ext(File, 2)}}, ?LINE),
-    ?line do_chunk([{open,File,1}, {chunk, 1, ["first round, one"]}, 
-		    {chunk, 1, ["first round, two"]}, eof], wlt, ?LINE),
+    rec({error, {file_not_found, add_ext(File, 2)}}, ?LINE),
+    do_chunk([{open,File,1}, {chunk, 1, ["first round, one"]},
+	      {chunk, 1, ["first round, two"]}, eof], wlt, ?LINE),
     ok.
 
 
-two_filled(suite) -> [];
-two_filled(doc) -> ["Two filled index files"];
+%% Two filled index files.
 two_filled(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = list_to_atom(join(Dir, "sune.LOG")),
     delete_files(File),
     start(),
 
-    ?line open(sune, File, ?LINE),
-    ?line log_terms(sune, ["first round, 11", "first round, 12"]),
-    ?line log_terms(sune, ["first round, 21", "first round, 22"]),
-    ?line sync(sune),
+    open(sune, File, ?LINE),
+    log_terms(sune, ["first round, 11", "first round, 12"]),
+    log_terms(sune, ["first round, 21", "first round, 22"]),
+    sync(sune),
     %% open
     test_two(File),
-    ?line close(sune),
+    close(sune),
     %% closed
     test_two(File),
 
@@ -184,37 +180,36 @@ two_filled(Conf) when is_list(Conf) ->
     ok.
 
 test_two(File) ->
-    ?line do_chunk([{open,File}, 
-		    {chunk, infinity, ["first round, 11", "first round, 12"]},
-		    {chunk, ["first round, 21", "first round, 22"]},
-		    eof], wlt, ?LINE),
-    ?line do_chunk([{open,File,1}, 
-		    {chunk, ["first round, 11", "first round, 12"]},
-		    eof], wlt, ?LINE),
-    ?line do_chunk([{open,File,2}, 
-		    {chunk, ["first round, 21", "first round, 22"]},
-		    eof], wlt, ?LINE),
+    do_chunk([{open,File},
+	      {chunk, infinity, ["first round, 11", "first round, 12"]},
+	      {chunk, ["first round, 21", "first round, 22"]},
+	      eof], wlt, ?LINE),
+    do_chunk([{open,File,1},
+	      {chunk, ["first round, 11", "first round, 12"]},
+	      eof], wlt, ?LINE),
+    do_chunk([{open,File,2},
+	      {chunk, ["first round, 21", "first round, 22"]},
+	      eof], wlt, ?LINE),
     wlt ! {open, self(), File, 3},
-    ?line rec({error, {file_not_found, add_ext(File, 3)}}, ?LINE),
-    ?line do_chunk([{open,File,1}, {chunk, 1, ["first round, 11"]},
-		    {chunk, 2, ["first round, 12"]}, eof], wlt, ?LINE),
+    rec({error, {file_not_found, add_ext(File, 3)}}, ?LINE),
+    do_chunk([{open,File,1}, {chunk, 1, ["first round, 11"]},
+	      {chunk, 2, ["first round, 12"]}, eof], wlt, ?LINE),
     ok.
 
 
-four_filled(suite) -> [];
-four_filled(doc) -> ["Four filled index files"];
+%% Four filled index files.
 four_filled(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
     delete_files(File),
     start(),
 
-    ?line open(sune, File, ?LINE),
-    ?line init_files(0),
-    ?line sync(sune),
+    open(sune, File, ?LINE),
+    init_files(0),
+    sync(sune),
     %% open
     test_four(File),
-    ?line close(sune),
+    close(sune),
     %% closed
     test_four(File),
 
@@ -223,42 +218,41 @@ four_filled(Conf) when is_list(Conf) ->
     ok.
 
 test_four(File) ->
-    ?line do_chunk([{open,File}, 
-		    {chunk, ["first round, 11", "first round, 12"]},
-		    {chunk, ["first round, 21", "first round, 22"]},
-		    {chunk, ["first round, 31", "first round, 32"]},
-		    {chunk, ["first round, 41", "first round, 42"]},
-		    eof], wlt, ?LINE),
-    ?line do_chunk([{open,File,1}, 
-		    {chunk, ["first round, 11", "first round, 12"]},
-		    eof], wlt, ?LINE),
-    ?line do_chunk([{open,File,4}, 
-		    {chunk, ["first round, 41", "first round, 42"]},
-		    eof], wlt, ?LINE),
+    do_chunk([{open,File},
+	      {chunk, ["first round, 11", "first round, 12"]},
+	      {chunk, ["first round, 21", "first round, 22"]},
+	      {chunk, ["first round, 31", "first round, 32"]},
+	      {chunk, ["first round, 41", "first round, 42"]},
+	      eof], wlt, ?LINE),
+    do_chunk([{open,File,1},
+	      {chunk, ["first round, 11", "first round, 12"]},
+	      eof], wlt, ?LINE),
+    do_chunk([{open,File,4},
+	      {chunk, ["first round, 41", "first round, 42"]},
+	      eof], wlt, ?LINE),
     wlt ! {open, self(), File, 5},
-    ?line rec({error, {file_not_found, add_ext(File, 5)}}, ?LINE),
-    ?line do_chunk([{open,File,1}, {chunk, 1, ["first round, 11"]},
-		    {chunk, 2, ["first round, 12"]}, eof], wlt, ?LINE),
-    ?line do_chunk([{open,File,4}, {chunk, 1, ["first round, 41"]},
-		    {chunk, 2, ["first round, 42"]}, eof], wlt, ?LINE),
+    rec({error, {file_not_found, add_ext(File, 5)}}, ?LINE),
+    do_chunk([{open,File,1}, {chunk, 1, ["first round, 11"]},
+	      {chunk, 2, ["first round, 12"]}, eof], wlt, ?LINE),
+    do_chunk([{open,File,4}, {chunk, 1, ["first round, 41"]},
+	      {chunk, 2, ["first round, 42"]}, eof], wlt, ?LINE),
     ok.
 
 
-wrap_filled(suite) -> [];
-wrap_filled(doc) -> ["First wrap, open, filled index file"];
+%% First wrap, open, filled index file.
 wrap_filled(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
     delete_files(File),
     start(),
 
-    ?line open(sune, File, ?LINE),
-    ?line init_files(0),
-    ?line log_terms(sune, ["second round, 11", "second round, 12"]),
-    ?line sync(sune),
+    open(sune, File, ?LINE),
+    init_files(0),
+    log_terms(sune, ["second round, 11", "second round, 12"]),
+    sync(sune),
     %% open
     test_wrap(File),
-    ?line close(sune),
+    close(sune),
     %% closed
     test_wrap(File),
 
@@ -267,103 +261,100 @@ wrap_filled(Conf) when is_list(Conf) ->
     ok.
 
 test_wrap(File) ->
-    ?line do_chunk([{open,File}, 
-		    {chunk, ["first round, 21", "first round, 22"]},
-		    {chunk, ["first round, 31", "first round, 32"]},
-		    {chunk, ["first round, 41", "first round, 42"]},
-		    {chunk, ["second round, 11", "second round, 12"]},
-		    eof], wlt, ?LINE),
-    ?line do_chunk([{open,File,1}, 
-		    {chunk, ["second round, 11", "second round, 12"]},
-		    eof], wlt, ?LINE),
-    ?line do_chunk([{open,File,2}, 
-		    {chunk, ["first round, 21", "first round, 22"]},
-		    eof], wlt, ?LINE),
+    do_chunk([{open,File},
+	      {chunk, ["first round, 21", "first round, 22"]},
+	      {chunk, ["first round, 31", "first round, 32"]},
+	      {chunk, ["first round, 41", "first round, 42"]},
+	      {chunk, ["second round, 11", "second round, 12"]},
+	      eof], wlt, ?LINE),
+    do_chunk([{open,File,1},
+	      {chunk, ["second round, 11", "second round, 12"]},
+	      eof], wlt, ?LINE),
+    do_chunk([{open,File,2},
+	      {chunk, ["first round, 21", "first round, 22"]},
+	      eof], wlt, ?LINE),
     wlt ! {open, self(), File, 5},
-    ?line rec({error, {file_not_found, add_ext(File, 5)}}, ?LINE),
-    ?line do_chunk([{open,File,1}, {chunk, 1, ["second round, 11"]},
-		    {chunk, 2, ["second round, 12"]}, eof], wlt, ?LINE),
-    ?line do_chunk([{open,File,4}, {chunk, 1, ["first round, 41"]},
-		    {chunk, 2, ["first round, 42"]}, eof], wlt, ?LINE),
+    rec({error, {file_not_found, add_ext(File, 5)}}, ?LINE),
+    do_chunk([{open,File,1}, {chunk, 1, ["second round, 11"]},
+	      {chunk, 2, ["second round, 12"]}, eof], wlt, ?LINE),
+    do_chunk([{open,File,4}, {chunk, 1, ["first round, 41"]},
+	      {chunk, 2, ["first round, 42"]}, eof], wlt, ?LINE),
     ok.
 
-wrapping(suite) -> [];
-wrapping(doc) -> ["Wrapping at the same time as reading"];
+%% Wrapping at the same time as reading.
 wrapping(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
     delete_files(File),
     start(),
 
-    ?line open(sune, File, ?LINE),
-    ?line init_files(1100),
-    ?line sync(sune),
-    ?line C1 = 
+    open(sune, File, ?LINE),
+    init_files(1100),
+    sync(sune),
+    C1 =
 	do_chunk([{open,File}, {chunk, 1, ["first round, 11"]}], wlt, ?LINE),
-    ?line log_terms(sune, ["second round, 11", "second round, 12"]),
-    ?line sync(sune),
-    ?line do_chunk([{chunk, 1, ["first round, 12"]}, 
-		    %% Here two bad bytes are found.
-		    {chunk, ["first round, 21", "first round, 22"]},
-		    {chunk, ["first round, 31", "first round, 32"]},
-		    {chunk, ["first round, 41", "first round, 42"]}, eof],
-		   wlt, ?LINE, C1),
+    log_terms(sune, ["second round, 11", "second round, 12"]),
+    sync(sune),
+    do_chunk([{chunk, 1, ["first round, 12"]},
+	      %% Here two bad bytes are found.
+	      {chunk, ["first round, 21", "first round, 22"]},
+	      {chunk, ["first round, 31", "first round, 32"]},
+	      {chunk, ["first round, 41", "first round, 42"]}, eof],
+	     wlt, ?LINE, C1),
     start(),
     delete_files(File),
-    ?line open(sune, File, ?LINE),
-    ?line init_files(1100),
-    ?line sync(sune),
-    ?line C2 = 
+    open(sune, File, ?LINE),
+    init_files(1100),
+    sync(sune),
+    C2 =
 	do_chunk([{open,File}, {chunk, 1, ["first round, 11"]}], wlt, ?LINE),
-    ?line log_terms(sune, ["second round, 11", "second round, 12"]),
-    ?line close(sune),
-    ?line do_chunk([{chunk, 1, ["first round, 12"]}, 
-		    %% Here two bad bytes are found.
-		    {chunk, ["first round, 21", "first round, 22"]},
-		    {chunk, ["first round, 31", "first round, 32"]},
-		    {chunk, ["first round, 41", "first round, 42"]}, eof],
-		   wlt, ?LINE, C2),
+    log_terms(sune, ["second round, 11", "second round, 12"]),
+    close(sune),
+    do_chunk([{chunk, 1, ["first round, 12"]},
+	      %% Here two bad bytes are found.
+	      {chunk, ["first round, 21", "first round, 22"]},
+	      {chunk, ["first round, 31", "first round, 32"]},
+	      {chunk, ["first round, 41", "first round, 42"]}, eof],
+	     wlt, ?LINE, C2),
     start(),
     delete_files(File),
-    ?line open(sune, File, ?LINE),
-    ?line init_files(1100),
-    ?line sync(sune),
-    ?line C3 = do_chunk([{open,File}], wlt, ?LINE),
-    ?line log_terms(sune, ["second round, 11"]),
-    ?line sync(sune),
-    ?line do_chunk([{chunk, 1, ["second round, 11"]}, 
-		    {chunk, 1, ["first round, 21"]},
-		    {chunk, 1, ["first round, 22"]}, 
-		    {chunk, ["first round, 31", "first round, 32"]},
-		    {chunk, ["first round, 41", "first round, 42"]}, eof],
-		   wlt, ?LINE, C3),
+    open(sune, File, ?LINE),
+    init_files(1100),
+    sync(sune),
+    C3 = do_chunk([{open,File}], wlt, ?LINE),
+    log_terms(sune, ["second round, 11"]),
+    sync(sune),
+    do_chunk([{chunk, 1, ["second round, 11"]},
+	      {chunk, 1, ["first round, 21"]},
+	      {chunk, 1, ["first round, 22"]},
+	      {chunk, ["first round, 31", "first round, 32"]},
+	      {chunk, ["first round, 41", "first round, 42"]}, eof],
+	     wlt, ?LINE, C3),
 
     stop(),
     delete_files(File),
     ok.
 
-external(suite) -> [];
-external(doc) -> ["External format"];
+%% External format.
 external(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
     delete_files(File),
     start(),
 
-    ?line open_ext(sune, File, ?FILE),
-    ?line init_files_ext(0),
-    ?line close(sune),
+    open_ext(sune, File, ?FILE),
+    init_files_ext(0),
+    close(sune),
     P0 = pps(),
     wlt ! {open, self(), File},
-    ?line rec({error, {not_a_log_file, add_ext(File, 1)}}, ?LINE),
-    ?line true = (P0 == pps()),    
+    rec({error, {not_a_log_file, add_ext(File, 1)}}, ?LINE),
+    true = (P0 == pps()),
 
     stop(),
     delete_files(File),
     ok.
 
-error(suite) -> [];
-error(doc) -> ["Error situations"];
+%% Error situations.
 error(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
     File = join(Dir, "sune.LOG"),
@@ -372,69 +363,69 @@ error(Conf) when is_list(Conf) ->
 
     P0 = pps(),
     wlt ! {open, self(), File, 1},
-    ?line rec({error, {index_file_not_found, File}}, ?LINE),
+    rec({error, {index_file_not_found, File}}, ?LINE),
     wlt ! {open, self(), File},
-    ?line rec({error, {index_file_not_found, File}}, ?LINE),
-    ?line true = (P0 == pps()),
+    rec({error, {index_file_not_found, File}}, ?LINE),
+    true = (P0 == pps()),
 
-    ?line open(sune, File, ?LINE),
-    ?line close(sune),
+    open(sune, File, ?LINE),
+    close(sune),
     P1 = pps(),
-    ?line First = add_ext(File, 1),
-    ?line ok = file:delete(First),
+    First = add_ext(File, 1),
+    ok = file:delete(First),
     wlt ! {open, self(), File},
-    ?line rec({error, {not_a_log_file, First}}, ?LINE),
-    ?line true = (P1 == pps()),
+    rec({error, {not_a_log_file, First}}, ?LINE),
+    true = (P1 == pps()),
 
     delete_files(File),
-    ?line open(sune, File, ?LINE),
-    ?line init_files(0),
-    ?line close(sune),
+    open(sune, File, ?LINE),
+    init_files(0),
+    close(sune),
     P2 = pps(),
-    ?line C = do_chunk([{open,File}, 
-			{chunk, ["first round, 11", "first round, 12"]}],
-		       wlt, ?LINE),
-    ?line Second = add_ext(File, 2),
-    ?line ok = file:delete(Second),
+    C = do_chunk([{open,File},
+		  {chunk, ["first round, 11", "first round, 12"]}],
+		 wlt, ?LINE),
+    Second = add_ext(File, 2),
+    ok = file:delete(Second),
     wlt ! {chunk, self(), C},
-    ?line rec({error, {file_error, Second, {error, enoent}}}, ?LINE),
-    ?line ok = file:write_file(Second, <<17:(3*8)>>), % three bytes
+    rec({error, {file_error, Second, {error, enoent}}}, ?LINE),
+    ok = file:write_file(Second, <<17:(3*8)>>), % three bytes
     wlt ! {chunk, self(), C},
-    ?line rec({error, {not_a_log_file, Second}}, ?LINE),
-    ?line do_chunk([close], wlt, ?LINE, C),
-    ?line true = (P2 == pps()),
+    rec({error, {not_a_log_file, Second}}, ?LINE),
+    do_chunk([close], wlt, ?LINE, C),
+    true = (P2 == pps()),
 
     delete_files(File),
-    ?line open(sune, File, ?LINE),
-    ?line init_files(0),
-    ?line close(sune),
+    open(sune, File, ?LINE),
+    init_files(0),
+    close(sune),
     P3 = pps(),
     timer:sleep(1100),
     Now = calendar:local_time(),
-    ?line ok = file:change_time(First, Now),
-    ?line C2 = do_chunk([{open,File}, 
-			 {chunk, ["first round, 11", "first round, 12"]}],
-			wlt, ?LINE),
+    ok = file:change_time(First, Now),
+    C2 = do_chunk([{open,File},
+		   {chunk, ["first round, 11", "first round, 12"]}],
+		  wlt, ?LINE),
     wlt ! {chunk, self(), C2},
-    ?line rec({error,{is_wrapped,First}}, ?LINE),
-    ?line do_chunk([close], wlt, ?LINE, C2),
+    rec({error,{is_wrapped,First}}, ?LINE),
+    do_chunk([close], wlt, ?LINE, C2),
     IndexFile = add_ext(File, idx),
-    ?line ok = file:write_file(IndexFile, <<17:(3*8)>>),
+    ok = file:write_file(IndexFile, <<17:(3*8)>>),
     wlt ! {open, self(), File, 1},
-    ?line rec({error, {index_file_not_found, File}}, ?LINE),
-    ?line true = (P3 == pps()),
+    rec({error, {index_file_not_found, File}}, ?LINE),
+    true = (P3 == pps()),
 
     stop(),
     delete_files(File),
     ok.
 
 start() ->
-    ?line ok = wrap_log_test:stop(),
+    ok = wrap_log_test:stop(),
     dl_wait(),
-    ?line ok = wrap_log_test:init().
+    ok = wrap_log_test:init().
 
 stop() ->
-    ?line ok = wrap_log_test:stop(),
+    ok = wrap_log_test:stop(),
     dl_wait().
 
 %% Give disk logs opened by 'logger' and 'wlt' time to close after
@@ -458,24 +449,24 @@ delete_files(File) ->
     ok.
 
 init_files(Delay) ->
-    ?line log_terms(sune, ["first round, 11", "first round, 12"]),
+    log_terms(sune, ["first round, 11", "first round, 12"]),
     timer:sleep(Delay),
-    ?line log_terms(sune, ["first round, 21", "first round, 22"]),
+    log_terms(sune, ["first round, 21", "first round, 22"]),
     timer:sleep(Delay),
-    ?line log_terms(sune, ["first round, 31", "first round, 32"]),
+    log_terms(sune, ["first round, 31", "first round, 32"]),
     timer:sleep(Delay),
-    ?line log_terms(sune, ["first round, 41", "first round, 42"]),
+    log_terms(sune, ["first round, 41", "first round, 42"]),
     timer:sleep(Delay),
     ok.
 
 init_files_ext(Delay) ->
-    ?line blog_terms(sune, ["first round, 11", "first round, 12"]),
+    blog_terms(sune, ["first round, 11", "first round, 12"]),
     timer:sleep(Delay),
-    ?line blog_terms(sune, ["first round, 21", "first round, 22"]),
+    blog_terms(sune, ["first round, 21", "first round, 22"]),
     timer:sleep(Delay),
-    ?line blog_terms(sune, ["first round, 31", "first round, 32"]),
+    blog_terms(sune, ["first round, 31", "first round, 32"]),
     timer:sleep(Delay),
-    ?line blog_terms(sune, ["first round, 41", "first round, 42"]),
+    blog_terms(sune, ["first round, 41", "first round, 42"]),
     timer:sleep(Delay),
     ok.
 
@@ -487,27 +478,27 @@ do_chunk(Commands, Server, Where) ->
 
 do_chunk([{open, File, One} | Cs], S, W, _C) ->
     S ! {open, self(), File, One},
-    ?line NC = rec1(ok, {W,?LINE}),
+    NC = rec1(ok, {W,?LINE}),
     do_chunk(Cs, S, W, NC);
 do_chunk([{open, File} | Cs], S, W, _C) ->
     S ! {open, self(), File},
-    ?line NC = rec1(ok, {W,?LINE}),
+    NC = rec1(ok, {W,?LINE}),
     do_chunk(Cs, S, W, NC);
 do_chunk([{chunk, Terms} | Cs], S, W, C) ->
     S ! {chunk, self(), C},
-    ?line NC = rec2(Terms, {W,?LINE}),
+    NC = rec2(Terms, {W,?LINE}),
     do_chunk(Cs, S, W, NC);
 do_chunk([{chunk, N, Terms} | Cs], S, W, C) ->
     S ! {chunk, self(), C, N},
-    ?line NC = rec2(Terms, {W,?LINE}),
+    NC = rec2(Terms, {W,?LINE}),
     do_chunk(Cs, S, W, NC);
 do_chunk([eof], S, W, C) ->
     S ! {chunk, self(), C},
-    ?line C1 = rec2(eof, {W,?LINE}),
+    C1 = rec2(eof, {W,?LINE}),
     do_chunk([close], S, W, C1);
 do_chunk([close], S, W, C) ->
     S ! {close, self(), C},
-    ?line rec(ok, {W,?LINE});
+    rec(ok, {W,?LINE});
 do_chunk([], _S, _W, C) ->
     C.
 
@@ -542,24 +533,24 @@ blog_terms(File, Terms) ->
 rec1(M, Where) ->
     receive 
         {M, C} -> C;
-        Else -> test_server:fail({error, {Where, Else}})
-    after 1000  -> test_server:fail({error, {Where, time_out}})
+        Else -> ct:fail({error, {Where, Else}})
+    after 1000  -> ct:fail({error, {Where, time_out}})
     end.
 
 rec2(M, Where) ->
     receive 
         {C, M} -> C;
-        Else -> test_server:fail({error, {Where, Else}})
-    after 1000  -> test_server:fail({error, {Where, time_out}})
+        Else -> ct:fail({error, {Where, Else}})
+    after 1000  -> ct:fail({error, {Where, time_out}})
     end.
 
 rec(M, Where) ->
     receive 
         M ->
             ok;
-        Else -> ?t:fail({error, {Where, Else}})
-    after 5000 -> ?t:fail({error, {Where, time_out}})
+        Else -> ct:fail({error, {Where, Else}})
+    after 5000 -> ct:fail({error, {Where, time_out}})
     end.
-	    
+
 pps() ->
     {erlang:ports(), lists:filter(fun erlang:is_process_alive/1, processes())}.
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl
index 6aaa024a82..97e1e2caa5 100644
--- a/lib/kernel/test/zlib_SUITE.erl
+++ b/lib/kernel/test/zlib_SUITE.erl
@@ -20,7 +20,7 @@
 
 -module(zlib_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -compile(export_all).
 
@@ -47,11 +47,10 @@
 -define(DATA_ERROR, {'EXIT',{data_error,[{zlib,_,_,_}|_]}}).
 
 init_per_testcase(_Func, Config) ->
-    Dog = test_server:timetrap(test_server:seconds(60)),
-    [{watchdog, Dog}|Config].
-end_per_testcase(_Func, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog).
+    Config.
+
+end_per_testcase(_Func, _Config) ->
+    ok.
 
 error(Format, Args, File, Line) ->
     io:format("~p:~p: ERROR: " ++ Format, [File,Line|Args]),
@@ -70,7 +69,9 @@ error(Format, Args, File, Line) ->
 %%     end,
 %%     log("<>ERROR<>~n" ++ Format, Args, File, Line).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [{group, api}, {group, examples}, {group, func}, smp,
@@ -106,80 +107,78 @@ end_per_group(_GroupName, Config) ->
 
 
 
-api_open_close(doc) -> "Test open/0 and close/1";
-api_open_close(suite) -> [];
+%% Test open/0 and close/1.
 api_open_close(Config) when is_list(Config) ->
-    ?line Fd1 = zlib:open(),
-    ?line Fd2 = zlib:open(),
+    Fd1 = zlib:open(),
+    Fd2 = zlib:open(),
     ?m(false,Fd1 == Fd2),
     ?m(ok,zlib:close(Fd1)),
     ?m(?BARG, zlib:close(Fd1)),
     ?m(ok,zlib:close(Fd2)),
-    
+
     %% Make sure that we don't get any EXIT messages if trap_exit is enabled.
-    ?line process_flag(trap_exit, true),
-    ?line Fd3 = zlib:open(),
+    process_flag(trap_exit, true),
+    Fd3 = zlib:open(),
     ?m(ok,zlib:close(Fd3)),
     receive
-	Any -> ?line ?t:fail({unexpected_message,Any})
+	Any -> ct:fail({unexpected_message,Any})
     after 10 -> ok
     end.
 
-api_deflateInit(doc) -> "Test deflateInit/2 and /6";
-api_deflateInit(suite) -> [];
+%% Test deflateInit/2 and /6.
 api_deflateInit(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m(?BARG, zlib:deflateInit(gurka, none)),
     ?m(?BARG, zlib:deflateInit(gurka, gurka)),
     ?m(?BARG, zlib:deflateInit(Z1, gurka)),
     Levels = [none, default, best_speed, best_compression] ++ lists:seq(0,9),
     lists:foreach(fun(Level) ->
-			  ?line Z = zlib:open(),
+			  Z = zlib:open(),
 			  ?m(ok, zlib:deflateInit(Z, Level)),
 			  ?m(ok,zlib:close(Z))
 		  end, Levels),
     %% /6
     ?m(?BARG, zlib:deflateInit(Z1,gurka,deflated,-15,8,default)),
-    
+
     ?m(?BARG, zlib:deflateInit(Z1,default,undefined,-15,8,default)),
-    
+
     ?m(?BARG, zlib:deflateInit(Z1,default,deflated,48,8,default)),
     ?m(?BARG, zlib:deflateInit(Z1,default,deflated,-20,8,default)),
     ?m(?BARG, zlib:deflateInit(Z1,default,deflated,-7,8,default)),
     ?m(?BARG, zlib:deflateInit(Z1,default,deflated,7,8,default)),
-    
+
     ?m(?BARG, zlib:deflateInit(Z1,default,deflated,-15,0,default)),
     ?m(?BARG, zlib:deflateInit(Z1,default,deflated,-15,10,default)),    
-    
+
     ?m(?BARG, zlib:deflateInit(Z1,default,deflated,-15,8,0)),
     ?m(?BARG, zlib:deflateInit(Z1,default,deflated,-15,8,undefined)),
-    
+
     lists:foreach(fun(Level) ->
-			  ?line Z = zlib:open(),
+			  Z = zlib:open(),
 			  ?m(ok, zlib:deflateInit(Z, Level, deflated, -15, 8, default)),
 			  ?m(ok,zlib:close(Z))
 		  end, Levels),
-    
+
     lists:foreach(fun(Wbits) ->
-			  ?line Z11 = zlib:open(),
+			  Z11 = zlib:open(),
 			  ?m(ok, zlib:deflateInit(Z11,best_compression,deflated,
 						  Wbits,8,default)),
-			  ?line Z12 = zlib:open(),
+			  Z12 = zlib:open(),
 			  ?m(ok, zlib:deflateInit(Z12,default,deflated,-Wbits,8,default)),
 			  ?m(ok,zlib:close(Z11)),
 			  ?m(ok,zlib:close(Z12))
 		  end, lists:seq(8, 15)),
-    
+
     lists:foreach(fun(MemLevel) ->
-			  ?line Z = zlib:open(),
+			  Z = zlib:open(),
 			  ?m(ok, zlib:deflateInit(Z,default,deflated,-15, 
 						  MemLevel,default)),
 			  ?m(ok,zlib:close(Z))
 		  end, lists:seq(1,8)),
-    
+
     Strategies = [filtered,huffman_only,rle,default],
     lists:foreach(fun(Strategy) ->
-			  ?line Z = zlib:open(),
+			  Z = zlib:open(),
 			  ?m(ok, zlib:deflateInit(Z,best_speed,deflated,-15,8,Strategy)),
 			  ?m(ok,zlib:close(Z))
 		  end, Strategies),
@@ -187,10 +186,9 @@ api_deflateInit(Config) when is_list(Config) ->
     ?m({'EXIT',_}, zlib:deflateInit(Z1,none,deflated,-15,8,default)), %% ?? 
     ?m(ok, zlib:close(Z1)).
 
-api_deflateSetDictionary(doc) -> "Test deflateSetDictionary";
-api_deflateSetDictionary(suite) -> [];
+%% Test deflateSetDictionary.
 api_deflateSetDictionary(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1, default)),
     ?m(Id when is_integer(Id), zlib:deflateSetDictionary(Z1, <<1,1,2,3,4,5,1>>)),
     ?m(Id when is_integer(Id), zlib:deflateSetDictionary(Z1, [1,1,2,3,4,5,1])),
@@ -200,10 +198,9 @@ api_deflateSetDictionary(Config) when is_list(Config) ->
     ?m({'EXIT',{stream_error,_}},zlib:deflateSetDictionary(Z1,<<1,1,2,3,4,5,1>>)),
     ?m(ok, zlib:close(Z1)).
 
-api_deflateReset(doc) -> "Test deflateReset";
-api_deflateReset(suite) -> [];
+%% Test deflateReset.
 api_deflateReset(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1, default)),
     ?m(_, zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, none)),
     ?m(ok, zlib:deflateReset(Z1)),
@@ -211,20 +208,18 @@ api_deflateReset(Config) when is_list(Config) ->
     %% FIXME how do I make this go wrong??
     ?m(ok, zlib:close(Z1)).
 
-api_deflateParams(doc) -> "Test deflateParams";
-api_deflateParams(suite) -> [];
+%% Test deflateParams.
 api_deflateParams(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1, default)),
     ?m(_, zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, none)),
     ?m(ok, zlib:deflateParams(Z1, best_compression, huffman_only)),
     ?m(_, zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, sync)),
     ?m(ok, zlib:close(Z1)).
 
-api_deflate(doc) -> "Test deflate";
-api_deflate(suite) -> [];
+%% Test deflate.
 api_deflate(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1, default)),
     ?m([B] when is_binary(B), zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, finish)),
     ?m(ok, zlib:deflateReset(Z1)),
@@ -235,19 +230,18 @@ api_deflate(Config) when is_list(Config) ->
     ?m(B when is_list(B), zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, sync)),
     ?m(B when is_list(B), zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, full)),
     ?m(B when is_list(B), zlib:deflate(Z1, <<>>, finish)),
-    
+
     ?m(?BARG, zlib:deflate(gurka, <<1,1,1,1,1,1,1,1,1>>, full)),
     ?m(?BARG, zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, asdj)),
     ?m(?BARG, zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, 198)),
     %% Causes problems ERROR REPORT
     ?m(?BARG, zlib:deflate(Z1, [asdj,asd], none)),
-    
+
     ?m(ok, zlib:close(Z1)).
 
-api_deflateEnd(doc) -> "Test deflateEnd";
-api_deflateEnd(suite) -> [];
+%% Test deflateEnd.
 api_deflateEnd(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1, default)),
     ?m(ok, zlib:deflateEnd(Z1)),
     ?m({'EXIT', {einval,_}}, zlib:deflateEnd(Z1)), %% ??
@@ -259,20 +253,19 @@ api_deflateEnd(Config) when is_list(Config) ->
     ?m(B when is_list(B), zlib:deflate(Z1, <<"Kilroy was here">>)),
     ?m(B when is_list(B), zlib:deflate(Z1, <<"Kilroy was here">>, finish)),
     ?m(ok, zlib:deflateEnd(Z1)),
-    
+
     ?m(ok, zlib:close(Z1)).
 
-api_inflateInit(doc) -> "Test inflateInit /1 and /2";
-api_inflateInit(suite) -> [];
+%% Test inflateInit /1 and /2.
 api_inflateInit(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m(?BARG, zlib:inflateInit(gurka)),
     ?m(ok, zlib:inflateInit(Z1)),
     ?m({'EXIT',{einval,_}}, zlib:inflateInit(Z1, 15)), %% ??
     lists:foreach(fun(Wbits) ->
-			  ?line Z11 = zlib:open(),
+			  Z11 = zlib:open(),
 			  ?m(ok, zlib:inflateInit(Z11,Wbits)),
-			  ?line Z12 = zlib:open(),
+			  Z12 = zlib:open(),
 			  ?m(ok, zlib:inflateInit(Z12,-Wbits)),
 			  ?m(ok,zlib:close(Z11)),
 			  ?m(ok,zlib:close(Z12))
@@ -284,10 +277,9 @@ api_inflateInit(Config) when is_list(Config) ->
     ?m(?BARG, zlib:inflateInit(Z1, -16)),
     ?m(ok, zlib:close(Z1)).
 
-api_inflateSetDictionary(doc) -> "Test inflateSetDictionary";
-api_inflateSetDictionary(suite) -> [];
+%% Test inflateSetDictionary.
 api_inflateSetDictionary(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m(ok, zlib:inflateInit(Z1)),
     ?m(?BARG, zlib:inflateSetDictionary(gurka,<<1,1,1,1,1>>)),
     ?m(?BARG, zlib:inflateSetDictionary(Z1,102)),
@@ -296,27 +288,26 @@ api_inflateSetDictionary(Config) when is_list(Config) ->
     ?m({'EXIT',{stream_error,_}}, zlib:inflateSetDictionary(Z1,Dict)),
     ?m(ok, zlib:close(Z1)).
 
-api_inflateSync(doc) -> "Test inflateSync";
-api_inflateSync(suite) -> [];
+%% Test inflateSync.
 api_inflateSync(Config) when is_list(Config) ->
     {skip,"inflateSync/1 sucks"}.
-%%     ?line Z1 = zlib:open(),
+%%     Z1 = zlib:open(),
 %%     ?m(ok, zlib:deflateInit(Z1)),
-%%     ?line B1list0 = zlib:deflate(Z1, "gurkan gurra ger galna tunnor", full),
-%%     ?line B2 = zlib:deflate(Z1, "grodan boll", finish),
+%%     B1list0 = zlib:deflate(Z1, "gurkan gurra ger galna tunnor", full),
+%%     B2 = zlib:deflate(Z1, "grodan boll", finish),
 %%     io:format("~p\n", [B1list0]),
 %%     io:format("~p\n", [B2]),
 %%     ?m(ok, zlib:deflateEnd(Z1)),
-%%     ?line B1 = clobber(14, list_to_binary(B1list0)),
-%%     ?line Compressed = list_to_binary([B1,B2]),
-%%     ?line io:format("~p\n", [Compressed]),
+%%     B1 = clobber(14, list_to_binary(B1list0)),
+%%     Compressed = list_to_binary([B1,B2]),
+%%     io:format("~p\n", [Compressed]),
 
 %%     ?m(ok, zlib:inflateInit(Z1)),
 %%     ?m(?BARG, zlib:inflateSync(gurka)),
 %%     ?m({'EXIT',{data_error,_}}, zlib:inflate(Z1, Compressed)),
 %%     ?m(ok, zlib:inflateSync(Z1)),
-%%     ?line Ubs = zlib:inflate(Z1, []),
-%%     ?line <<"grodan boll">> = list_to_binary(Ubs),
+%%     Ubs = zlib:inflate(Z1, []),
+%%     <<"grodan boll">> = list_to_binary(Ubs),
 %%     ?m(ok, zlib:close(Z1)).
 
 clobber(N, Bin) when is_binary(Bin) ->
@@ -327,21 +318,19 @@ clobber(N, Bin) when is_binary(Bin) ->
 	   end,
     list_to_binary(tuple_to_list(setelement(N, T, Byte))).
 
-api_inflateReset(doc) -> "Test inflateReset";
-api_inflateReset(suite) -> [];
+%% Test inflateReset.
 api_inflateReset(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m(ok, zlib:inflateInit(Z1)),
     ?m(?BARG, zlib:inflateReset(gurka)),
     ?m(ok, zlib:inflateReset(Z1)),
     ?m(ok, zlib:close(Z1)).
 
-api_inflate(doc) -> "Test inflate";
-api_inflate(suite) -> [];
+%% Test inflate.
 api_inflate(Config) when is_list(Config) ->
     Data = [<<1,2,2,3,3,3,4,4,4,4>>],
-    ?line Compressed = zlib:compress(Data),
-    ?line Z1 = zlib:open(),
+    Compressed = zlib:compress(Data),
+    Z1 = zlib:open(),
     ?m(ok, zlib:inflateInit(Z1)),
     ?m([], zlib:inflate(Z1, <<>>)),
     ?m(Data, zlib:inflate(Z1, Compressed)),
@@ -356,17 +345,16 @@ api_inflate(Config) when is_list(Config) ->
     ?m({'EXIT',{data_error,_}}, zlib:inflate(Z1, <<2,1,2,1,2>>)), 
     ?m(ok, zlib:close(Z1)).
 
-api_inflateChunk(doc) -> "Test inflateChunk";
-api_inflateChunk(suite) -> [];
+%% Test inflateChunk.
 api_inflateChunk(Config) when is_list(Config) ->
     ChunkSize = 1024,
     Data = << <<(I rem 150)>> || I <- lists:seq(1, 3 * ChunkSize) >>,
     Part1 = binary:part(Data, 0, ChunkSize),
     Part2 = binary:part(Data, ChunkSize, ChunkSize),
     Part3 = binary:part(Data, ChunkSize * 2, ChunkSize),
-    ?line Compressed = zlib:compress(Data),
-    ?line Z1 = zlib:open(),
-    ?line zlib:setBufSize(Z1, ChunkSize),
+    Compressed = zlib:compress(Data),
+    Z1 = zlib:open(),
+    zlib:setBufSize(Z1, ChunkSize),
     ?m(ok, zlib:inflateInit(Z1)),
     ?m([], zlib:inflateChunk(Z1, <<>>)),
     ?m({more, Part1}, zlib:inflateChunk(Z1, Compressed)),
@@ -379,7 +367,7 @@ api_inflateChunk(Config) when is_list(Config) ->
 
     ?m(ok, zlib:inflateReset(Z1)),
 
-    ?line zlib:setBufSize(Z1, size(Data)),
+    zlib:setBufSize(Z1, size(Data)),
     ?m(Data, zlib:inflateChunk(Z1, Compressed)),
     ?m(ok, zlib:inflateEnd(Z1)),
 
@@ -389,10 +377,9 @@ api_inflateChunk(Config) when is_list(Config) ->
     ?m({'EXIT',{data_error,_}}, zlib:inflateEnd(Z1)),
     ?m(ok, zlib:close(Z1)).
 
-api_inflateEnd(doc) -> "Test inflateEnd";
-api_inflateEnd(suite) -> [];
+%% Test inflateEnd.
 api_inflateEnd(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m({'EXIT',{einval,_}}, zlib:inflateEnd(Z1)), 
     ?m(ok, zlib:inflateInit(Z1)),
     ?m(?BARG, zlib:inflateEnd(gurka)),
@@ -403,18 +390,16 @@ api_inflateEnd(Config) when is_list(Config) ->
     ?m(ok, zlib:inflateEnd(Z1)),
     ?m(ok, zlib:close(Z1)).
 
-api_getBufsz(doc) -> "Test getBufsz";
-api_getBufsz(suite) -> [];
+%% Test getBufsz.
 api_getBufsz(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m(Val when is_integer(Val), zlib:getBufSize(Z1)),
     ?m(?BARG, zlib:getBufSize(gurka)),
     ?m(ok, zlib:close(Z1)).
 
-api_setBufsz(doc) -> "Test setBufsz";
-api_setBufsz(suite) -> [];
+%% Test setBufsz.
 api_setBufsz(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m(?BARG, zlib:setBufSize(Z1, gurka)),
     ?m(?BARG, zlib:setBufSize(gurka, 1232330)),
     Sz = ?m( Val when is_integer(Val), zlib:getBufSize(Z1)),
@@ -424,25 +409,23 @@ api_setBufsz(Config) when is_list(Config) ->
     ?m(ok, zlib:close(Z1)).
 
 %%% Debug function ??
-api_getQSize(doc) -> "Test getQSize";
-api_getQSize(suite) -> [];
+%% Test getQSize.
 api_getQSize(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     Q = ?m(Val when is_integer(Val), zlib:getQSize(Z1)),
     io:format("QSize ~p ~n", [Q]),
     ?m(?BARG, zlib:getQSize(gurka)),
     ?m(ok, zlib:close(Z1)).
 
-api_crc32(doc) -> "Test crc32";
-api_crc32(suite) -> [];
+%% Test crc32.
 api_crc32(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1,best_speed,deflated,-15,8,default)),
     Bin = <<1,1,1,1,1,1,1,1,1>>,
     Compressed1 = ?m(_, zlib:deflate(Z1, Bin, none)),
     Compressed2 = ?m(_, zlib:deflate(Z1, <<>>, finish)),
     Compressed = list_to_binary(Compressed1 ++ Compressed2),
-     CRC1 = ?m( CRC1 when is_integer(CRC1), zlib:crc32(Z1)),
+    CRC1 = ?m( CRC1 when is_integer(CRC1), zlib:crc32(Z1)),
     ?m(CRC1 when is_integer(CRC1), zlib:crc32(Z1,Bin)),
     ?m(CRC1 when is_integer(CRC1), zlib:crc32(Z1,binary_to_list(Bin))),
     ?m(CRC2 when is_integer(CRC2), zlib:crc32(Z1,Compressed)),
@@ -460,10 +443,9 @@ api_crc32(Config) when is_list(Config) ->
     ?m(ok, zlib:deflateEnd(Z1)),
     ?m(ok, zlib:close(Z1)).    
 
-api_adler32(doc) -> "Test adler32";
-api_adler32(suite) -> [];
+%% Test adler32.
 api_adler32(Config) when is_list(Config) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     ?m(ok, zlib:deflateInit(Z1,best_speed,deflated,-15,8,default)),
     Bin = <<1,1,1,1,1,1,1,1,1>>,
     Compressed1 = ?m(_, zlib:deflate(Z1, Bin, none)),
@@ -484,12 +466,11 @@ api_adler32(Config) when is_list(Config) ->
     ?m(ok, zlib:deflateEnd(Z1)),
     ?m(ok, zlib:close(Z1)).    
 
-api_un_compress(doc) -> "Test compress";
-api_un_compress(suite) -> [];
+%% Test compress.
 api_un_compress(Config) when is_list(Config) ->
     ?m(?BARG,zlib:compress(not_a_binary)),
     Bin = <<1,11,1,23,45>>,
-    ?line  Comp = zlib:compress(Bin),
+    Comp = zlib:compress(Bin),
     ?m(?BARG,zlib:uncompress(not_a_binary)),
     ?m({'EXIT',{data_error,_}}, zlib:uncompress(<<171,171,171,171,171>>)),
     ?m({'EXIT',{data_error,_}}, zlib:uncompress(<<>>)),
@@ -501,58 +482,40 @@ api_un_compress(Config) when is_list(Config) ->
     ?m(Bin, zlib:uncompress(binary_to_list(Comp))),
     ?m(Bin, zlib:uncompress(Comp)).
 
-api_un_zip(doc) -> "Test zip";
-api_un_zip(suite) -> [];
+%% Test zip.
 api_un_zip(Config) when is_list(Config) ->
     ?m(?BARG,zlib:zip(not_a_binary)),
     Bin = <<1,11,1,23,45>>,
-    ?line  Comp = zlib:zip(Bin),
+    Comp = zlib:zip(Bin),
     ?m(Comp, zlib:zip(binary_to_list(Bin))),
     ?m(?BARG,zlib:unzip(not_a_binary)),
     ?m({'EXIT',{data_error,_}}, zlib:unzip(<<171,171,171,171,171>>)),
     ?m({'EXIT',{data_error,_}}, zlib:unzip(<<>>)),
     ?m(Bin, zlib:unzip(Comp)),
     ?m(Bin, zlib:unzip(binary_to_list(Comp))),
-    
+
     %% OTP-6396
     B = <<131,104,19,100,0,13,99,95,99,105,100,95,99,115,103,115,110,95,50,97,1,107,0,4,208,161,246,29,107,0,3,237,166,224,107,0,6,66,240,153,0,2,10,1,0,8,97,116,116,97,99,104,101,100,104,2,100,0,22,117,112,100,97,116,101,95,112,100,112,95,99,111,110,116,101,120,116,95,114,101,113,107,0,114,69,3,12,1,11,97,31,113,150,64,104,132,61,64,104,12,3,197,31,113,150,64,104,132,61,64,104,12,1,11,97,31,115,150,64,104,116,73,64,104,0,0,0,0,0,0,65,149,16,61,65,149,16,61,1,241,33,4,5,0,33,4,4,10,6,10,181,4,10,6,10,181,38,15,99,111,109,109,97,110,100,1,114,45,97,112,110,45,49,3,99,111,109,5,109,110,99,57,57,6,109,99,99,50,52,48,4,103,112,114,115,8,0,104,2,104,2,100,0,8,97,99,116,105,118,97,116,101,104,23,100,0,11,112,100,112,95,99,111,110,116,1,120,116,100,0,7,112,114,105,109,97,114,121,97,1,100,0,9,117,110,100,101,102,105,110,101,100,97,1,97,4,97,4,97,7,100,0,9,117,110,100,101,102,105,110,101,100,100,0,9,117,110,100,101,102,105,110,10100,100,0,9,117,110,100,101,102,105,110,101,100,100,0,5,102,97,108,115,101,100,0,9,117,110,100,101,102,105,110,101,100,100,0,9,117,110,100,101,102,105,110,101,100,100,0,9,117,110,100,101,102,105,1,101,100,97,0,100,0,9,117,110,100,101,102,105,110,101,100,107,0,4,16,0,1,144,107,0,4,61,139,186,181,107,0,4,10,8,201,49,100,0,9,117,110,100,101,102,105,110,101,100,100,0,9,117,110,100,101,102,105,0,101,100,100,0,9,117,110,100,101,102,105,110,101,100,104,2,104,3,98,0,0,7,214,97,11,97,20,104,3,97,17,97,16,97,21,106,108,0,0,0,3,104,2,97,1,104,2,104,3,98,0,0,7,214,97,11,97,20,104,3,97,17,97,167,20,104,2,97,4,104,2,104,3,98,0,0,7,214,97,11,97,20,104,3,97,17,97,16,97,21,104,2,97,10,104,2,104,3,98,0,0,7,214,97,11,97,20,104,3,97,17,97,16,97,26,106,100,0,5,118,101,114,57,57,100,0,9,117,110,0,101,102,105,110,101,100,107,0,2,0,244,107,0,4,10,6,102,195,107,0,4,10,6,102,195,100,0,9,117,110,100,101,102,105,110,101,100,100,0,9,117,110,100,101,102,105,110,101,100,107,0,125,248,143,0,203,25115,157,116,65,185,65,172,55,87,164,88,225,50,203,251,115,157,116,65,185,65,172,55,87,164,88,225,50,0,0,82,153,50,0,200,98,87,148,237,193,185,65,149,167,69,144,14,16,153,50,3,81,70,94,13,109,193,1,120,5,181,113,198,118,50,3,81,70,94,13,109,193,185,120,5,181,113,198,118,153,3,81,70,94,13,109,193,185,120,5,181,113,198,118,153,50,16,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,113,92,2,119,128,0,0,108,0,0,1,107,0,114,69,3,12,1,11,97,31,113,150,64,104,132,61,64,104,12,3,11,97,31,113,150,64,104,132,61,64,104,12,1,11,97,31,115,150,64,104,116,73,64,104,0,0,0,0,0,0,65,149,16,61,65,149,16,61,1,241,33,4,0,33,4,4,10,6,10,181,4,10,6,10,181,38,15,99,111,109,109,97,110,100,101,114,45,97,112,110,45,49,3,99,111,109,5,109,110,99,57,57,6,109,99,99,50,52,48,4,103,112,114,115,8,0,106>>,
     Z = zlib:zip(B),
     ?m(B, zlib:unzip(Z)).
 
-%% api_g_un_zip_file(doc) -> "Test gunzip_file";
-%% api_g_un_zip_file(suite) -> [];
-%% api_g_un_zip_file(Config) when is_list(Config) ->
-%%     ?line Out = conf(data_dir,Config), 
-%%     io:format("Using OutDir ~p ~n", [Out]),
-%%     F = filename:join(Out,"testing1"),
-%%     Data = <<1,1,255,255,255,1,1>>,
-%%     ?m(ok, file:write_file(F,Data)),
-%%     ?line Compressed = zlib:gzip_file(F),
-%%     ?m(ok, file:write_file(F++".gz",Compressed)),
-%%     ?m(Data, zlib:gunzip_file(F++".gz")),
-%%     ?m({error,enoent}, zlib:gunzip_file(gurka)),
-%%     ?m({error,enoent}, zlib:gzip_file(gurka)),
-%%     ?m({error,what}, zlib:gunzip_file(F)),
-%%     ?line ok.
-
-api_g_un_zip(doc) -> "Test gunzip";
-api_g_un_zip(suite) -> [];
+%% Test gunzip.
 api_g_un_zip(Config) when is_list(Config) ->
     ?m(?BARG,zlib:gzip(not_a_binary)),
     Bin = <<1,11,1,23,45>>,
-    ?line Comp = zlib:gzip(Bin),
+    Comp = zlib:gzip(Bin),
     ?m(Comp, zlib:gzip(binary_to_list(Bin))),
     ?m(?BARG, zlib:gunzip(not_a_binary)),
     ?m(?DATA_ERROR, zlib:gunzip(<<171,171,171,171,171>>)),
     ?m(?DATA_ERROR, zlib:gunzip(<<>>)),
     ?m(Bin, zlib:gunzip(Comp)),
     ?m(Bin, zlib:gunzip(binary_to_list(Comp))),
-    
+
     %% Bad CRC; bad length.
     BadCrc = bad_crc_data(),
-    ?line ?m({'EXIT',{data_error,_}},(catch zlib:gunzip(BadCrc))),
+    ?m({'EXIT',{data_error,_}},(catch zlib:gunzip(BadCrc))),
     BadLen = bad_len_data(),
-    ?line ?m({'EXIT',{data_error,_}},(catch zlib:gunzip(BadLen))),
+    ?m({'EXIT',{data_error,_}},(catch zlib:gunzip(BadLen))),
     ok.
 
 bad_crc_data() ->
@@ -564,45 +527,42 @@ bad_len_data() ->
     <<31,139,8,0,0,0,0,0,0,3,211,2,0,91,38,185,9,2,0,0,0>>.
 
 
-intro(suite) -> [];
-intro(doc) -> "";
 intro(Config) when is_list(Config) ->
     D = <<"This is a binary">>,
     [put({ex, N}, <<"This is a binary">>) || N <- [0,1,2,3,4]],
     put({ex, 5}, end_of_data),
     put(ex,0),
-    ?line Read = fun() ->
-			 N = get(ex),
-			 put(ex,N+1),
-			 get({ex,N})
-		 end,
-    
-    ?line Z = zlib:open(),
-    ?line ok = zlib:deflateInit(Z,default),
-    
-    ?line Compress = fun(end_of_data, _Cont) -> [];
-			(Data, Cont) ->
-			     [zlib:deflate(Z, Data)|Cont(Read(),Cont)]
-		     end,
-    ?line Compressed = Compress(Read(),Compress),
-    ?line Last = zlib:deflate(Z, [], finish),
-    ?line ok = zlib:deflateEnd(Z),
-    ?line zlib:close(Z),
-    ?line Res = list_to_binary([Compressed|Last]),
+    Read = fun() ->
+		   N = get(ex),
+		   put(ex,N+1),
+		   get({ex,N})
+	   end,
+
+    Z = zlib:open(),
+    ok = zlib:deflateInit(Z,default),
+
+    Compress = fun(end_of_data, _Cont) -> [];
+		  (Data, Cont) ->
+		       [zlib:deflate(Z, Data)|Cont(Read(),Cont)]
+	       end,
+    Compressed = Compress(Read(),Compress),
+    Last = zlib:deflate(Z, [], finish),
+    ok = zlib:deflateEnd(Z),
+    zlib:close(Z),
+    Res = list_to_binary([Compressed|Last]),
     Orig = list_to_binary(lists:duplicate(5, D)),
     ?m(Orig, zlib:uncompress(Res)).
 
 
-large_deflate(doc) -> "Test deflate large file, which had a bug reported on erlang-bugs";
-large_deflate(suite) -> [];
+%% Test deflate large file, which had a bug reported on erlang-bugs.
 large_deflate(Config) when is_list(Config) ->
     large_deflate_do().
 large_deflate_do() ->
-    ?line Z = zlib:open(),
-    ?line Plain = rand_bytes(zlib:getBufSize(Z)*5),
-    ?line ok = zlib:deflateInit(Z),
-    ?line _ZlibHeader = zlib:deflate(Z, [], full),
-    ?line Deflated = zlib:deflate(Z, Plain, full),
+    Z = zlib:open(),
+    Plain = rand_bytes(zlib:getBufSize(Z)*5),
+    ok = zlib:deflateInit(Z),
+    _ZlibHeader = zlib:deflate(Z, [], full),
+    Deflated = zlib:deflate(Z, Plain, full),
     ?m(ok, zlib:close(Z)),
     ?m(Plain, zlib:unzip(list_to_binary([Deflated, 3, 0]))).
 
@@ -617,23 +577,22 @@ rand_bytes(Bin, Sz) ->
     rand_bytes(<<(erlang:md5(Bin))/binary, Bin/binary>>, Sz).
 
 
-zip_usage(doc) -> "Test a standard compressed zip file";
-zip_usage(suite) -> [];
+%% Test a standard compressed zip file.
 zip_usage(Config) when is_list(Config) ->
     zip_usage(zip_usage({get_arg,Config}));
 zip_usage({get_arg,Config}) ->
-    ?line Out = conf(data_dir,Config), 
-    ?line {ok,ZIP} = file:read_file(filename:join(Out,"zipdoc.zip")),
-    ?line {ok,ORIG} = file:read_file(filename:join(Out,"zipdoc")),
+    Out = conf(data_dir,Config),
+    {ok,ZIP} = file:read_file(filename:join(Out,"zipdoc.zip")),
+    {ok,ORIG} = file:read_file(filename:join(Out,"zipdoc")),
     {run,ZIP,ORIG};
 zip_usage({run,ZIP,ORIG}) ->    
-    ?line <<_:14/binary, CRC:32/little, 
-	   CompSz:32/little, UnCompSz:32/little,_:31/binary,
-	   Compressed:CompSz/binary, _/binary>> = ZIP,
-    
+    <<_:14/binary, CRC:32/little,
+      CompSz:32/little, UnCompSz:32/little,_:31/binary,
+      Compressed:CompSz/binary, _/binary>> = ZIP,
+
     %%io:format("CRC ~p CSz ~p UnCSz ~p ~n", [CRC,CompSz,UnCompSz]),
-    ?line Split = split_bin(Compressed,[]),
-    ?line Z = zlib:open(),
+    Split = split_bin(Compressed,[]),
+    Z = zlib:open(),
 
     ?m(ok, zlib:inflateInit(Z, -15)),
     Bs = [zlib:inflate(Z, Part) || Part <- Split],
@@ -643,86 +602,84 @@ zip_usage({run,ZIP,ORIG}) ->
     ?m(true, zlib:crc32(Z,UC0) == zlib:crc32(Z,ORIG)),
     ?m(ok, zlib:inflateEnd(Z)),
 
-    ?line UC1 = zlib:unzip(Compressed),
+    UC1 = zlib:unzip(Compressed),
     ?m(UnCompSz, byte_size(UC1)),
     ?m(true, zlib:crc32(Z,UC1) == zlib:crc32(Z,ORIG)),
-    
+
     ?m(ok, zlib:inflateInit(Z, -15)),
-    ?line UC2 = zlib:inflate(Z, Compressed),
+    UC2 = zlib:inflate(Z, Compressed),
     ?m(UnCompSz, byte_size(list_to_binary(UC2))),
     ?m(CRC, zlib:crc32(Z)),
     ?m(true, zlib:crc32(Z,UC2) == zlib:crc32(Z,ORIG)),
     ?m(ok, zlib:inflateEnd(Z)),
-    
+
     ?m(ok, zlib:inflateInit(Z, -15)),
-    ?line UC3 = zlib:inflate(Z, Split), % Test multivec.
+    UC3 = zlib:inflate(Z, Split), % Test multivec.
     ?m(UnCompSz, byte_size(list_to_binary(UC3))),
     ?m(true, zlib:crc32(Z,UC3) == zlib:crc32(Z,ORIG)),
     ?m(CRC, zlib:crc32(Z)),
     ?m(ok, zlib:inflateEnd(Z)),
-    
+
     ?m(ok, zlib:inflateInit(Z, -15)),
     ?m(ok, zlib:setBufSize(Z, UnCompSz *2)),
-    ?line UC4 = zlib:inflate(Z, Compressed),
+    UC4 = zlib:inflate(Z, Compressed),
     ?m(UnCompSz, byte_size(list_to_binary(UC4))),
     ?m(CRC, zlib:crc32(Z)),
     ?m(CRC, zlib:crc32(Z,UC4)),
     ?m(true, zlib:crc32(Z,UC4) == zlib:crc32(Z,ORIG)),
     ?m(ok, zlib:inflateEnd(Z)),
-    
-    ?line C1 = zlib:zip(ORIG), 
-    ?line UC5 =  zlib:unzip(C1),
+
+    C1 = zlib:zip(ORIG),
+    UC5 =  zlib:unzip(C1),
     ?m(CRC, zlib:crc32(Z,UC5)),
     ?m(true,zlib:crc32(Z,UC5) == zlib:crc32(Z,ORIG)),
-    
+
     ?m(ok, zlib:deflateInit(Z, default, deflated, -15, 8, default)),
-    ?line  C2 = zlib:deflate(Z, ORIG, finish),
+    C2 = zlib:deflate(Z, ORIG, finish),
     ?m(true, C1 == list_to_binary(C2)),
     ?m(ok, zlib:deflateEnd(Z)),
-    
+
     ?m(ok, zlib:deflateInit(Z, none, deflated, -15, 8, filtered)),
     ?m(ok, zlib:deflateParams(Z, default, default)),
-    ?line  C3 = zlib:deflate(Z, ORIG, finish),
+    C3 = zlib:deflate(Z, ORIG, finish),
     ?m(true, C1 == list_to_binary(C3)),
     ?m(ok, zlib:deflateEnd(Z)),
 
-    ?line ok = zlib:close(Z),
-    ?line ok.
+    ok = zlib:close(Z),
+    ok.
 
-gz_usage(doc) -> "Test a standard compressed gzipped file";
-gz_usage(suite) -> [];
+%% Test a standard compressed gzipped file.
 gz_usage(Config) when is_list(Config) ->
     gz_usage(gz_usage({get_arg,Config}));
 gz_usage({get_arg,Config}) ->
-    ?line Out = conf(data_dir,Config), 
-    ?line {ok,GZIP} = file:read_file(filename:join(Out,"zipdoc.1.gz")),
-    ?line {ok,ORIG} = file:read_file(filename:join(Out,"zipdoc")),
-    ?line {ok,GZIP2} = file:read_file(filename:join(Out,"zipdoc.txt.gz")),
+    Out = conf(data_dir,Config),
+    {ok,GZIP} = file:read_file(filename:join(Out,"zipdoc.1.gz")),
+    {ok,ORIG} = file:read_file(filename:join(Out,"zipdoc")),
+    {ok,GZIP2} = file:read_file(filename:join(Out,"zipdoc.txt.gz")),
     {run,GZIP,ORIG,GZIP2};    
 gz_usage({run,GZIP,ORIG,GZIP2}) ->
-    ?line Z = zlib:open(),
-    ?line  UC1 = zlib:gunzip(GZIP),
+    Z = zlib:open(),
+    UC1 = zlib:gunzip(GZIP),
     ?m(true,zlib:crc32(Z,UC1) == zlib:crc32(Z,ORIG)),
-    ?line  UC3 = zlib:gunzip(GZIP2),
+    UC3 = zlib:gunzip(GZIP2),
     ?m(true,zlib:crc32(Z,UC3) == zlib:crc32(Z,ORIG)),
-    ?line Compressed = zlib:gzip(ORIG),
-    ?line  UC5 = zlib:gunzip(Compressed),
+    Compressed = zlib:gzip(ORIG),
+    UC5 = zlib:gunzip(Compressed),
     ?m(true,zlib:crc32(Z,UC5) == zlib:crc32(Z,ORIG)),
-    ?line ok = zlib:close(Z).
+    ok = zlib:close(Z).
 
-gz_usage2(doc) -> "Test more of a standard compressed gzipped file";
-gz_usage2(suite) -> [];
+%% Test more of a standard compressed gzipped file.
 gz_usage2(Config) ->
     case os:find_executable("gzip") of
 	Name when is_list(Name) ->
-	    ?line Z = zlib:open(),
-	    ?line Out = conf(data_dir,Config), 
-	    ?line  {ok,ORIG} = file:read_file(filename:join(Out,"zipdoc")),
-	    ?line Compressed = zlib:gzip(ORIG),
+	    Z = zlib:open(),
+	    Out = conf(data_dir,Config),
+	    {ok,ORIG} = file:read_file(filename:join(Out,"zipdoc")),
+	    Compressed = zlib:gzip(ORIG),
 	    GzOutFile = filename:join(Out,"out.gz"),
 	    OutFile = filename:join(Out,"out.txt"),
 	    ?m(ok, file:write_file(GzOutFile,Compressed)),
-	    ?line os:cmd("gzip -c -d " ++ GzOutFile ++ " > " ++ OutFile),
+	    os:cmd("gzip -c -d " ++ GzOutFile ++ " > " ++ OutFile),
 	    case file:read_file(OutFile) of
 		{ok,ExtDecompressed} ->
 		    ?m(true, 
@@ -731,83 +688,80 @@ gz_usage2(Config) ->
 		    io:format("Couldn't test external decompressor ~p\n", 
 			      [Error])
 	    end,
-	    ?line ok = zlib:close(Z),
+	    ok = zlib:close(Z),
 	    ok;
 	false ->
 	    {skipped,"No gzip in path"}
     end.
-    
 
 
-compress_usage(doc) -> 
-    "Test that (de)compress funcs work with" 
-	" standard tools, for example a chunk from a png file";
-compress_usage(suite) -> [];
+
+%% Test that (de)compress funcs work with standard tools, for example
+%% a chunk from a png file.
 compress_usage(Config) when is_list(Config) ->
     compress_usage(compress_usage({get_arg,Config}));
 compress_usage({get_arg,Config}) ->
-    ?line Out = conf(data_dir,Config), 
-    ?line {ok,C1} = file:read_file(filename:join(Out,"png-compressed.zlib")),
+    Out = conf(data_dir,Config),
+    {ok,C1} = file:read_file(filename:join(Out,"png-compressed.zlib")),
     {run,C1};
 compress_usage({run,C1}) ->
-    ?line Z = zlib:open(),
+    Z = zlib:open(),
     %% See that we can uncompress a file generated with external prog.
-    ?line UC1 = zlib:uncompress(C1),
+    UC1 = zlib:uncompress(C1),
     %% Check that the crc are correct.
     ?m(4125865008,zlib:crc32(Z,UC1)),
-    ?line C2 = zlib:compress(UC1),
-    ?line UC2 = zlib:uncompress(C2),
+    C2 = zlib:compress(UC1),
+    UC2 = zlib:uncompress(C2),
     %% Check that the crc are correct.
     ?m(4125865008,zlib:crc32(Z,UC2)),
-    
-    ?line ok = zlib:close(Z),
+
+    ok = zlib:close(Z),
 
     D = [<<"We tests some partial">>,
 	 <<"data, sent over">>,
 	 <<"the stream">>,
 	 <<"we check that we can unpack">>,
 	 <<"every message we get">>],
-    
-    ?line ZC = zlib:open(),
-    ?line ZU = zlib:open(),
+
+    ZC = zlib:open(),
+    ZU = zlib:open(),
     Test = fun(finish, {_,Tot}) ->
-		   ?line Compressed = zlib:deflate(ZC, <<>>, finish),
+		   Compressed = zlib:deflate(ZC, <<>>, finish),
 		   Data = zlib:inflate(ZU, Compressed),
 		   [Tot|Data];
 	      (Data, {Op,Tot}) ->
-		   ?line Compressed = zlib:deflate(ZC, Data, Op),
+		   Compressed = zlib:deflate(ZC, Data, Op),
 		   Res1 = ?m([Data],zlib:inflate(ZU, Compressed)),
 		   {Op, [Tot|Res1]}
 	   end,
-    ?line zlib:deflateInit(ZC),
-    ?line zlib:inflateInit(ZU),
-    ?line T1 = lists:foldl(Test,{sync,[]},D++[finish]),
+    zlib:deflateInit(ZC),
+    zlib:inflateInit(ZU),
+    T1 = lists:foldl(Test,{sync,[]},D++[finish]),
     ?m(true, list_to_binary(D) == list_to_binary(T1)),
-    ?line zlib:deflateEnd(ZC),
-    ?line zlib:inflateEnd(ZU),
-    
-    ?line zlib:deflateInit(ZC),
-    ?line zlib:inflateInit(ZU),
-    ?line T2 = lists:foldl(Test,{full,[]},D++[finish]),
+    zlib:deflateEnd(ZC),
+    zlib:inflateEnd(ZU),
+
+    zlib:deflateInit(ZC),
+    zlib:inflateInit(ZU),
+    T2 = lists:foldl(Test,{full,[]},D++[finish]),
     ?m(true, list_to_binary(D) == list_to_binary(T2)),
-    ?line zlib:deflateEnd(ZC),
-    ?line zlib:inflateEnd(ZU),
-    
-    ?line ok = zlib:close(ZC),
-    ?line ok = zlib:close(ZU).
+    zlib:deflateEnd(ZC),
+    zlib:inflateEnd(ZU),
 
+    ok = zlib:close(ZC),
+    ok = zlib:close(ZU).
 
-crc(doc) -> "Check that crc works as expected";
-crc(suite) -> [];
+
+%% Check that crc works as expected.
 crc(Config) when is_list(Config) ->
     crc(crc({get_arg,Config}));
 crc({get_arg,Config}) ->
-    ?line Out = conf(data_dir,Config), 
-    ?line {ok,C1} = file:read_file(filename:join(Out,"zipdoc")),
+    Out = conf(data_dir,Config),
+    {ok,C1} = file:read_file(filename:join(Out,"zipdoc")),
     {run,C1};
 crc({run,C1}) ->
-    ?line Z = zlib:open(),
-    ?line Crc = zlib:crc32(Z, C1),
+    Z = zlib:open(),
+    Crc = zlib:crc32(Z, C1),
     Bins = split_bin(C1,[]),
     %%io:format("Length ~p ~p ~n", [length(Bins), [size(Bin) || Bin <- Bins]]),
     Last = lists:last(Bins),
@@ -817,29 +771,28 @@ crc({run,C1}) ->
 			       Crc1
 		       end, 0, Bins),
     ?m(Crc,SCrc),
-    ?line [First|Rest] = Bins,
+    [First|Rest] = Bins,
     Combine = fun(Bin, CS1) ->
 		      CS2 = zlib:crc32(Z, Bin),
 		      S2 = byte_size(Bin),
 		      zlib:crc32_combine(Z,CS1,CS2,S2)
 	      end,
-    ?line Comb = lists:foldl(Combine, zlib:crc32(Z, First), Rest),
+    Comb = lists:foldl(Combine, zlib:crc32(Z, First), Rest),
     ?m(Crc,Comb),
-    ?line ok = zlib:close(Z).
+    ok = zlib:close(Z).
 
-adler(doc) -> "Check that adler works as expected";
-adler(suite) -> [];
+%% Check that adler works as expected.
 adler(Config) when is_list(Config) ->
     adler(adler({get_arg,Config}));
 adler({get_arg,Config}) ->
-    ?line Out = conf(data_dir,Config), 
+    Out = conf(data_dir,Config),
     File1 = filename:join(Out,"zipdoc"),
-    ?line {ok,C1} = file:read_file(File1),
+    {ok,C1} = file:read_file(File1),
     {run,C1};
 adler({run,C1}) ->
-    ?line Z = zlib:open(),
+    Z = zlib:open(),
     ?m(1, zlib:adler32(Z,<<>>)),
-    ?line Crc = zlib:adler32(Z, C1),    
+    Crc = zlib:adler32(Z, C1),
     Bins = split_bin(C1,[]),
     Last = lists:last(Bins),
     SCrc = lists:foldl(fun(Bin,Crc0) ->  
@@ -848,43 +801,42 @@ adler({run,C1}) ->
 			       Crc1
 		       end, zlib:adler32(Z,<<>>), Bins),
     ?m(Crc,SCrc),
-    ?line [First|Rest] = Bins,
+    [First|Rest] = Bins,
     Combine = fun(Bin, CS1) ->
 		      CS2 = zlib:adler32(Z, Bin),
 		      S2 = byte_size(Bin),
 		      zlib:adler32_combine(Z,CS1,CS2,S2)
 	      end,
-    ?line Comb = lists:foldl(Combine, zlib:adler32(Z, First), Rest),
+    Comb = lists:foldl(Combine, zlib:adler32(Z, First), Rest),
     ?m(Crc,Comb),
-    ?line ok = zlib:close(Z).
+    ok = zlib:close(Z).
 
-dictionary_usage(doc) -> "Test dictionary usage";
-dictionary_usage(suite) -> [];
+%% Test dictionary usage.
 dictionary_usage(Config) when is_list(Config) ->
     dictionary_usage(dictionary_usage({get_arg,Config}));
 dictionary_usage({get_arg,_Config}) ->
     {run}; % no args
 dictionary_usage({run}) ->
-    ?line Z1 = zlib:open(),
+    Z1 = zlib:open(),
     Dict = <<"Anka">>,
     Data = <<"Kalle Anka">>,
     ?m(ok, zlib:deflateInit(Z1)),
-    ?line DictID = zlib:deflateSetDictionary(Z1, Dict),
-    %% ?line io:format("DictID = ~p\n", [DictID]),
-    ?line B1 = zlib:deflate(Z1, Data),
-    ?line B2 = zlib:deflate(Z1, <<>>, finish),
+    DictID = zlib:deflateSetDictionary(Z1, Dict),
+    %% io:format("DictID = ~p\n", [DictID]),
+    B1 = zlib:deflate(Z1, Data),
+    B2 = zlib:deflate(Z1, <<>>, finish),
     ?m(ok, zlib:deflateEnd(Z1)),
     ?m(ok, zlib:close(Z1)),
     Compressed = list_to_binary([B1,B2]),
     %% io:format("~p\n", [Compressed]),
 
     %% Now uncompress.
-    ?line Z2 = zlib:open(),
+    Z2 = zlib:open(),
     ?m(ok, zlib:inflateInit(Z2)),
-    ?line {'EXIT',{{need_dictionary,DictID},_}} = (catch zlib:inflate(Z2, Compressed)),
+    {'EXIT',{{need_dictionary,DictID},_}} = (catch zlib:inflate(Z2, Compressed)),
     ?m(ok, zlib:inflateSetDictionary(Z2, Dict)),
     ?m(ok, zlib:inflateSetDictionary(Z2, binary_to_list(Dict))),
-    ?line Uncompressed = ?m(B when is_list(B), zlib:inflate(Z2, [])),
+    Uncompressed = ?m(B when is_list(B), zlib:inflate(Z2, [])),
     ?m(ok, zlib:inflateEnd(Z2)),
     ?m(ok, zlib:close(Z2)),    
     ?m(Data, list_to_binary(Uncompressed)).
@@ -895,8 +847,7 @@ split_bin(Last,Acc) ->
     lists:reverse([Last|Acc]).
 
 
-smp(doc) -> "Check concurrent access to zlib driver";
-smp(suite) -> [];
+%% Check concurrent access to zlib driver.
 smp(Config) ->
     case erlang:system_info(smp_support) of
 	true ->
@@ -912,7 +863,7 @@ smp(Config) ->
 	    FnAList = lists:map(fun(F) -> {F,?MODULE:F({get_arg,Config})}
 				end, Funcs),	    
 
-	    Pids = [spawn_link(?MODULE, worker, [random:uniform(9999),
+	    Pids = [spawn_link(?MODULE, worker, [rand:uniform(9999),
 						 list_to_tuple(FnAList),
 						 self()])
 		    || _ <- lists:seq(1,NumOfProcs)],
@@ -921,11 +872,11 @@ smp(Config) ->
 	false ->
 	    {skipped,"No smp support"}
     end.
-	    
+
 
 worker(Seed, FnATpl, Parent) ->
     io:format("smp worker ~p, seed=~p~n",[self(),Seed]),
-    random:seed(Seed,Seed,Seed),
+    rand:seed(exsplus, {Seed,Seed,Seed}),
     worker_loop(100, FnATpl),
     Parent ! self().
 
@@ -933,33 +884,32 @@ worker_loop(0, _FnATpl) ->
     large_deflate_do(), % the time consuming one as finale
     ok;
 worker_loop(N, FnATpl) ->
-    {F,A} = element(random:uniform(size(FnATpl)),FnATpl),
+    {F,A} = element(rand:uniform(tuple_size(FnATpl)), FnATpl),
     ?MODULE:F(A),
     worker_loop(N-1, FnATpl).
-    
+
 wait_pids([]) -> 
     ok;
 wait_pids(Pids) ->
     receive
 	Pid ->
-	    ?line true = lists:member(Pid,Pids),
+	    true = lists:member(Pid,Pids),
 	    Others = lists:delete(Pid,Pids),
 	    io:format("wait_pid got ~p, still waiting for ~p\n",[Pid,Others]),
 	    wait_pids(Others)
     end.
 
 
-otp_7359(doc) -> "Deflate/inflate data with size close to multiple of internal buffer size";
-otp_7359(suite) -> [];
+%% Deflate/inflate data with size close to multiple of internal buffer size.
 otp_7359(_Config) ->
     %% Find compressed size
     ZTry = zlib:open(),
     ok = zlib:deflateInit(ZTry),
     ISize = zlib:getBufSize(ZTry),
     IData = list_to_binary([Byte band 255 || Byte <- lists:seq(1,ISize)]),
-    ?line ISize = byte_size(IData),
+    ISize = byte_size(IData),
 
-    ?line DSize = iolist_size(zlib:deflate(ZTry, IData, sync)),
+    DSize = iolist_size(zlib:deflate(ZTry, IData, sync)),
     zlib:close(ZTry),
 
     io:format("Deflated try ~p -> ~p bytes~n", [ISize, DSize]),
@@ -981,19 +931,19 @@ otp_7359(_Config) ->
 
 otp_7359_def_inf(Data,{DefSize,InfSize}) ->    
     %%io:format("Try: DefSize=~p InfSize=~p~n", [DefSize,InfSize]),
-    ?line ZDef = zlib:open(),
-    ?line ok = zlib:deflateInit(ZDef),
-    ?line ok = zlib:setBufSize(ZDef,DefSize),
-    ?line DefData = iolist_to_binary(zlib:deflate(ZDef, Data, sync)),
+    ZDef = zlib:open(),
+    ok = zlib:deflateInit(ZDef),
+    ok = zlib:setBufSize(ZDef,DefSize),
+    DefData = iolist_to_binary(zlib:deflate(ZDef, Data, sync)),
     %%io:format("Deflated ~p(~p) -> ~p(~p) bytes~n", 
     %%          [byte_size(Data), InfSize, byte_size(DefData), DefSize]),
-    ?line ok = zlib:close(ZDef),
+    ok = zlib:close(ZDef),
 
-    ?line ZInf = zlib:open(),
-    ?line ok = zlib:inflateInit(ZInf),
-    ?line ok = zlib:setBufSize(ZInf,InfSize),
-    ?line Data = iolist_to_binary(zlib:inflate(ZInf, DefData)),
-    ?line ok = zlib:close(ZInf),
+    ZInf = zlib:open(),
+    ok = zlib:inflateInit(ZInf),
+    ok = zlib:setBufSize(ZInf,InfSize),
+    Data = iolist_to_binary(zlib:inflate(ZInf, DefData)),
+    ok = zlib:close(ZInf),
     ok.
 
 otp_9981(Config) when is_list(Config) ->
@@ -1013,13 +963,13 @@ otp_9981(Config) when is_list(Config) ->
     Ports = lists:sort(erlang:ports()),
     ok.
 
-    
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Helps with testing directly %%%%%%%%%%%%%
 
 conf(What,Config) ->
-    try ?config(What,Config) of
+    try proplists:get_value(What,Config) of
 	undefined ->
 	    "./zlib_SUITE_data";
 	Dir ->
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 703075634b..c8917ebc3c 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 4.1.1
+KERNEL_VSN = 4.2
diff --git a/lib/megaco/test/Makefile b/lib/megaco/test/Makefile
index 06ecc06d20..d621b0f16d 100644
--- a/lib/megaco/test/Makefile
+++ b/lib/megaco/test/Makefile
@@ -100,10 +100,7 @@ ifeq ($(USE_MEGACO_HIPE),true)
 ERL_COMPILE_FLAGS += +native -Dmegaco_hipe_special=true
 endif
 
-ERL_COMPILE_FLAGS += \
-	$(MEGACO_ERL_COMPILE_FLAGS)         \
-	-pa $(ERL_TOP)/lib/test_server/ebin \
-	-I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS += $(MEGACO_ERL_COMPILE_FLAGS)
 
 ERL_PATH = -pa ../../megaco/examples/simple \
            -pa ../../megaco/ebin \
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 8650e03a60..18bb110104 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,7 +39,39 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
 
-  <section><title>Mnesia 4.13.2</title>
+  <section><title>Mnesia 4.13.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Mnesia transactions could hang while waiting on a
+	    response from a node who had stopped.</p>
+          <p>
+	    Own Id: OTP-13423</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.13.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Avoid deadlock possibility in
+	    <c>mnesia:del_table_copy/2</c></p>
+          <p>
+	    Own Id: OTP-13284</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.13.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/mnesia/src/mnesia_bup.erl b/lib/mnesia/src/mnesia_bup.erl
index 1f150ae38b..8b1143a352 100644
--- a/lib/mnesia/src/mnesia_bup.erl
+++ b/lib/mnesia/src/mnesia_bup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -112,7 +112,7 @@ iter(R, Header, Schema, Fun, Acc, BupItems) ->
 safe_apply(R, write, [_, Items]) when Items =:= [] ->
     R;
 safe_apply(R, What, Args) ->
-    Abort = fun(Re) -> abort_restore(R, What, Args, Re) end,
+    Abort = abort_restore_fun(R, What, Args),
     Mod = R#restore.bup_module,
     try apply(Mod, What, Args) of
 	{ok, Opaque, Items} when What =:= read ->
@@ -127,6 +127,10 @@ safe_apply(R, What, Args) ->
 	    Abort(Re)
     end.
 
+-spec abort_restore_fun(_, _, _) -> fun((_) -> no_return()).
+abort_restore_fun(R, What, Args) ->
+    fun(Re) -> abort_restore(R, What, Args, Re) end.
+
 abort_restore(R = #restore{bup_module=Mod}, What, Args, Reason) ->
     dbg_out("Restore aborted. ~p:~p~p -> ~p~n",
             [Mod, What, Args, Reason]),
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl
index 02c175760e..69ccc1d2c9 100644
--- a/lib/mnesia/src/mnesia_controller.erl
+++ b/lib/mnesia/src/mnesia_controller.erl
@@ -78,7 +78,7 @@
 	 change_table_majority/1,
 	 del_active_replica/2,
 	 wait_for_tables/2,
-	 get_network_copy/2,
+	 get_network_copy/3,
 	 merge_schema/0,
 	 start_remote_sender/4,
 	 schedule_late_disc_load/2
@@ -329,14 +329,14 @@ release_schema_commit_lock() ->
     unlink(whereis(?SERVER_NAME)).
 
 %% Special for preparation of add table copy
-get_network_copy(Tab, Cs) ->
+get_network_copy(Tid, Tab, Cs) ->
 %   We can't let the controller queue this one
 %   because that may cause a deadlock between schema_operations
 %   and initial tableloadings which both takes schema locks.
 %   But we have to get copier_done msgs when the other side
 %   goes down.
     call({add_other, self()}),
-    Reason = {dumper,add_table_copy},
+    Reason = {dumper,{add_table_copy, Tid}},
     Work = #net_load{table = Tab,reason = Reason,cstruct = Cs},
     %% I'll need this cause it's linked trough the subscriber
     %% might be solved by using monitor in subscr instead.
@@ -775,7 +775,7 @@ handle_call({net_load, Tab, Cs}, From, State) ->
 	    true ->
 		Worker = #net_load{table = Tab,
 				   opt_reply_to = From,
-				   reason = {dumper,add_table_copy},
+				   reason = {dumper,{add_table_copy, unknown}},
 				   cstruct = Cs
 				  },
 		add_worker(Worker, State);
@@ -1180,11 +1180,11 @@ handle_info(Done = #loader_done{worker_pid=WPid, table_name=Tab}, State0) ->
 		    Done#loader_done.needs_announce == true,
 		    Done#loader_done.needs_reply == true ->
 			i_have_tab(Tab),
-			%% Should be {dumper,add_table_copy} only
+			%% Should be {dumper,{add_table_copy, _}} only
 			reply(Done#loader_done.reply_to,
 			      Done#loader_done.reply);
 		    Done#loader_done.needs_reply == true ->
-			%% Should be {dumper,add_table_copy} only
+			%% Should be {dumper,{add_table_copy,_}} only
 			reply(Done#loader_done.reply_to,
 			      Done#loader_done.reply);
 		    Done#loader_done.needs_announce == true, Tab == schema ->
@@ -2148,6 +2148,10 @@ load_table_fun(#net_load{cstruct=Cs, table=Tab, reason=Reason, opt_reply_to=Repl
 			reply_to = ReplyTo,
 			reply = {loaded, ok}
 		       },
+    AddTableCopy = case Reason of
+		       {dumper,{add_table_copy,_}} -> true;
+		       _ -> false
+		   end,
     if
 	ReadNode == node() ->
 	    %% Already loaded locally
@@ -2157,7 +2161,7 @@ load_table_fun(#net_load{cstruct=Cs, table=Tab, reason=Reason, opt_reply_to=Repl
 		    Res = mnesia_loader:disc_load_table(Tab, load_local_content),
 		    Done#loader_done{reply = Res, needs_announce = true, needs_sync = true}
 	    end;
-	AccessMode == read_only, Reason /= {dumper,add_table_copy} ->
+	AccessMode == read_only, not AddTableCopy ->
 	    fun() -> disc_load_table(Tab, Reason, ReplyTo) end;
 	true ->
 	    fun() ->
diff --git a/lib/mnesia/src/mnesia_lib.erl b/lib/mnesia/src/mnesia_lib.erl
index 77c7a7638d..a5eded4f0f 100644
--- a/lib/mnesia/src/mnesia_lib.erl
+++ b/lib/mnesia/src/mnesia_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -403,6 +403,7 @@ other_val_1(Var) ->
 	_ -> error
     end.
 
+-spec pr_other(_) -> no_return().
 pr_other(Var) ->
     Why =
 	case is_running() of
@@ -921,20 +922,7 @@ random_time(Retries, _Counter0) ->
     UpperLimit = 500,
     Dup = Retries * Retries,
     MaxIntv = trunc(UpperLimit * (1-(50/((Dup)+50)))),
-    
-    case get(random_seed) of
-	undefined ->
-	    _ = random:seed(erlang:unique_integer(),
-			    erlang:monotonic_time(),
-			    erlang:unique_integer()),
-	    Time = Dup + random:uniform(MaxIntv),
-	    %%	    dbg_out("---random_test rs ~w max ~w val ~w---~n", [Retries, MaxIntv, Time]),
-	    Time;
-	_ ->
-	    Time = Dup + random:uniform(MaxIntv),
-	    %%	    dbg_out("---random_test rs ~w max ~w val ~w---~n", [Retries, MaxIntv, Time]),
-	    Time	    
-    end.
+    Dup + rand:uniform(MaxIntv).
 
 report_system_event(Event0) ->
     Event = {mnesia_system_event, Event0},
diff --git a/lib/mnesia/src/mnesia_loader.erl b/lib/mnesia/src/mnesia_loader.erl
index da8549be50..41fcd76fcb 100644
--- a/lib/mnesia/src/mnesia_loader.erl
+++ b/lib/mnesia/src/mnesia_loader.erl
@@ -180,8 +180,7 @@ do_get_disc_copy2(Tab, Reason, Storage, Type) when Storage == disc_only_copies -
 -define(MAX_RAM_TRANSFERS, (?MAX_RAM_FILE_SIZE div ?MAX_TRANSFER_SIZE) + 1).
 -define(MAX_NOPACKETS, 20).
 
-net_load_table(Tab, Reason, Ns, Cs)
-        when Reason == {dumper,add_table_copy} ->
+net_load_table(Tab, {dumper,{add_table_copy, _}}=Reason, Ns, Cs) ->
     try_net_load_table(Tab, Reason, Ns, Cs);
 net_load_table(Tab, Reason, Ns, _Cs) ->
     try_net_load_table(Tab, Reason, Ns, val({Tab, cstruct})).
@@ -233,7 +232,8 @@ do_snmpify(Tab, Us, Storage) ->
     set({Tab, {index, snmp}}, Snmp).
 
 %% Start the recieiver
-init_receiver(Node, Tab, Storage, Cs, Reas={dumper,add_table_copy}) ->
+init_receiver(Node, Tab, Storage, Cs, Reas={dumper,{add_table_copy, Tid}}) ->
+    rpc:call(Node, mnesia_lib, set, [{?MODULE, active_trans}, Tid]),
     case start_remote_sender(Node, Tab, Storage) of
 	{SenderPid, TabSize, DetsData} ->
 	    start_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,Reas);
@@ -307,7 +307,7 @@ table_init_fun(SenderPid) ->
     end.
 
 %% Add_table_copy get's it's own locks.
-start_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,{dumper,add_table_copy}) ->
+start_receiver(Tab,Storage,Cs,SenderPid,TabSize,DetsData,{dumper,{add_table_copy,_}}) ->
     Init = table_init_fun(SenderPid),
     case do_init_table(Tab,Storage,Cs,SenderPid,TabSize,DetsData,self(), Init) of
 	Err = {error, _} ->
@@ -658,9 +658,10 @@ send_table(Pid, Tab, RemoteS) ->
 	    {Init, Chunk} = reader_funcs(UseDetsChunk, Tab, Storage, KeysPerTransfer),
 
 	    SendIt = fun() ->
-			     {atomic, ok} = prepare_copy(Pid, Tab, Storage),
+			     NeedLock = need_lock(Tab),
+			     {atomic, ok} = prepare_copy(Pid, Tab, Storage, NeedLock),
 			     send_more(Pid, 1, Chunk, Init(), Tab),
-			     finish_copy(Pid, Tab, Storage, RemoteS)
+			     finish_copy(Pid, Tab, Storage, RemoteS, NeedLock)
 		     end,
 
 	    try SendIt() of
@@ -678,10 +679,10 @@ send_table(Pid, Tab, RemoteS) ->
 	    end
     end.
 
-prepare_copy(Pid, Tab, Storage) ->
+prepare_copy(Pid, Tab, Storage, NeedLock) ->
     Trans =
 	fun() ->
-		mnesia:lock_table(Tab, load),
+		NeedLock andalso mnesia:lock_table(Tab, load),
 		mnesia_subscr:subscribe(Pid, {table, Tab}),
 		update_where_to_write(Tab, node(Pid)),
 		mnesia_lib:db_fixtable(Storage, Tab, true),
@@ -689,6 +690,21 @@ prepare_copy(Pid, Tab, Storage) ->
 	end,
     mnesia:transaction(Trans).
 
+
+need_lock(Tab) ->
+    case ?catch_val({?MODULE, active_trans}) of
+	#tid{} = Tid ->
+	    %% move_table_copy grabs it's own table-lock
+	    %% do not deadlock with it
+	    mnesia_lib:unset({?MODULE, active_trans}),
+	    case mnesia_locker:get_held_locks(Tab) of
+		[{write, Tid}|_] -> false;
+		_Locks -> true
+	    end;
+	_ ->
+	    true
+    end.
+
 update_where_to_write(Tab, Node) ->
     case val({Tab, access_mode}) of
 	read_only ->
@@ -783,12 +799,12 @@ send_packet(N, Pid, Chunk, {Recs, Cont}) when N < ?MAX_NOPACKETS ->
 send_packet(_N, _Pid, _Chunk, DataState) ->
     DataState.
 
-finish_copy(Pid, Tab, Storage, RemoteS) ->
+finish_copy(Pid, Tab, Storage, RemoteS, NeedLock) ->
     RecNode = node(Pid),
     DatBin = dat2bin(Tab, Storage, RemoteS),
     Trans =
 	fun() ->
-		mnesia:read_lock_table(Tab),
+		NeedLock andalso mnesia:read_lock_table(Tab),
 		A = val({Tab, access_mode}),
 		mnesia_controller:sync_and_block_table_whereabouts(Tab, RecNode, RemoteS, A),
 		cleanup_tab_copier(Pid, Storage, Tab),
diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl
index 89feeba2c3..5766f22e92 100644
--- a/lib/mnesia/src/mnesia_locker.erl
+++ b/lib/mnesia/src/mnesia_locker.erl
@@ -22,7 +22,7 @@
 -module(mnesia_locker).
 
 -export([
-	 get_held_locks/0,
+	 get_held_locks/0, get_held_locks/1,
 	 get_lock_queue/0,
 	 global_lock/5,
 	 ixrlock/5,
@@ -236,6 +236,11 @@ loop(State) ->
 	    From ! {Ref, ok},
 	    loop(State);
 
+	{From, {is_locked, Oid}} ->
+	    Held = ?ets_lookup(mnesia_held_locks, Oid),
+	    reply(From, Held),
+	    loop(State);
+
 	{'EXIT', Pid, _} when Pid == State#state.supervisor ->
 	    do_stop();
 
@@ -1151,6 +1156,19 @@ get_held_locks() ->
     Locks = receive {mnesia_held_locks, Ls} -> Ls after 5000 -> [] end,
     rewrite_locks(Locks, []).
 
+%% Mnesia internal usage only
+get_held_locks(Tab) when is_atom(Tab) ->
+    Oid = {Tab, ?ALL},
+    ?MODULE ! {self(), {is_locked, Oid}},
+    receive
+	{?MODULE, _Node, Locks} ->
+	    case Locks of
+		[] -> [];
+		[{Oid, _Prev, What}] -> What
+	    end
+    end.
+
+
 rewrite_locks([{Oid, _, Ls}|Locks], Acc0) ->
     Acc = rewrite_locks(Ls, Oid, Acc0),
     rewrite_locks(Locks, Acc);
diff --git a/lib/mnesia/src/mnesia_log.erl b/lib/mnesia/src/mnesia_log.erl
index 8b19e13ff6..36135418c8 100644
--- a/lib/mnesia/src/mnesia_log.erl
+++ b/lib/mnesia/src/mnesia_log.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -734,7 +734,7 @@ backup_schema(B, Tabs) ->
 safe_apply(B, write, [_, Items]) when Items == [] ->
     B;
 safe_apply(B, What, Args) ->
-    Abort = fun(R) -> abort_write(B, What, Args, R) end,
+    Abort = abort_write_fun(B, What, Args),
     receive
 	{'EXIT', Pid, R} -> Abort({'EXIT', Pid, R})
     after 0 ->
@@ -746,6 +746,10 @@ safe_apply(B, What, Args) ->
 	    end
     end.
 
+-spec abort_write_fun(_, _, _) -> fun((_) -> no_return()).
+abort_write_fun(B, What, Args) ->
+    fun(R) -> abort_write(B, What, Args, R) end.
+
 abort_write(B, What, Args, Reason) ->
     Mod = B#backup_args.module,
     Opaque = B#backup_args.opaque,
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl
index 8313c3bda5..081d746257 100644
--- a/lib/mnesia/src/mnesia_monitor.erl
+++ b/lib/mnesia/src/mnesia_monitor.erl
@@ -82,9 +82,9 @@
 		going_down = [], tm_started = false, early_connects = [],
 		connecting, mq = [], remote_node_status = []}).
 
--define(current_protocol_version,  {8,1}).
+-define(current_protocol_version,  {8,2}).
 
--define(previous_protocol_version, {8,0}).
+-define(previous_protocol_version, {8,1}).
 
 start() ->
     gen_server:start_link({local, ?MODULE}, ?MODULE,
@@ -193,7 +193,7 @@ protocol_version() ->
 %% A sorted list of acceptable protocols the
 %% preferred protocols are first in the list
 acceptable_protocol_versions() ->
-    [protocol_version(), ?previous_protocol_version, {7,6}].
+    [protocol_version(), ?previous_protocol_version].
 
 needs_protocol_conversion(Node) ->
     case {?catch_val({protocol, Node}), protocol_version()} of
@@ -424,8 +424,6 @@ handle_call({negotiate_protocol, Mon, Version, Protocols}, From, State)
 	    case hd(Protocols) of
 		?previous_protocol_version ->
 		    accept_protocol(Mon, MyVersion, ?previous_protocol_version, From, State);
-		{7,6} ->
-		    accept_protocol(Mon, MyVersion, {7,6}, From, State);
 		_ ->
 		    verbose("Connection with ~p rejected. "
 			    "version = ~p, protocols = ~p, "
diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl
index 593360415d..782493fb4f 100644
--- a/lib/mnesia/src/mnesia_schema.erl
+++ b/lib/mnesia/src/mnesia_schema.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -646,54 +646,18 @@ cs2list(Cs) when is_record(Cs, cstruct) ->
     rec2list(Tags, Tags, 2, Cs);
 cs2list(CreateList) when is_list(CreateList) ->
     CreateList;
-%% 4.6
+
+%% since 4.6
 cs2list(Cs) when element(1, Cs) == cstruct, tuple_size(Cs) == 19 ->
     Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
 	    load_order,access_mode,majority,index,snmp,local_content,
 	    record_name,attributes,
 	    user_properties,frag_properties,storage_properties,
 	    cookie,version],
-    rec2list(Tags, Tags, 2, Cs);
-%% 4.4.19
-cs2list(Cs) when element(1, Cs) == cstruct, tuple_size(Cs) == 18 ->
-    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
-	    load_order,access_mode,majority,index,snmp,local_content,
-	    record_name,attributes,user_properties,frag_properties,
-	    cookie,version],
-    rec2list(Tags, Tags, 2, Cs);
-%% 4.4.18 and earlier
-cs2list(Cs) when element(1, Cs) == cstruct, tuple_size(Cs) == 17 ->
-    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
-	    load_order,access_mode,index,snmp,local_content,
-	    record_name,attributes,user_properties,frag_properties,
-	    cookie,version],
     rec2list(Tags, Tags, 2, Cs).
 
 cs2list(false, Cs) ->
-    cs2list(Cs);
-cs2list(ver4_4_18, Cs) -> %% Or earlier
-    Orig = record_info(fields, cstruct),
-    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
-	    load_order,access_mode,index,snmp,local_content,
-	    record_name,attributes,user_properties,frag_properties,
-	    cookie,version],
-    rec2list(Tags, Orig, 2, Cs);
-cs2list(ver4_4_19, Cs) ->
-    Orig = record_info(fields, cstruct),
-    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
-	    load_order,access_mode,majority,index,snmp,local_content,
-	    record_name,attributes,user_properties,frag_properties,
-	    cookie,version],
-    rec2list(Tags, Orig, 2, Cs);
-cs2list(ver4_6, Cs) ->
-    Orig = record_info(fields, cstruct),
-    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
-	    load_order,access_mode,majority,index,snmp,local_content,
-	    record_name,attributes,
-	    user_properties,frag_properties,storage_properties,
-	    cookie,version],
-    rec2list(Tags, Orig, 2, Cs).
-
+    cs2list(Cs).
 
 rec2list([Tag | Tags], [Tag | Orig], Pos, Rec) ->
     Val = element(Pos, Rec),
@@ -703,19 +667,8 @@ rec2list([], _, _Pos, _Rec) ->
 rec2list(Tags, [_|Orig], Pos, Rec) ->
     rec2list(Tags, Orig, Pos+1, Rec).
 
-normalize_cs(Cstructs, Node) ->
-    %% backward-compatibility hack; normalize before returning
-    case need_old_cstructs([Node]) of
-	false ->
-	    Cstructs;
-	Version ->
-	    %% some other format
-	    [convert_cs(Version, Cs) || Cs <- Cstructs]
-    end.
-
-convert_cs(Version, Cs) ->
-    Fields = [Value || {_, Value} <- cs2list(Version, Cs)],
-    list_to_tuple([cstruct|Fields]).
+normalize_cs(Cstructs, _Node) ->
+    Cstructs.
 
 list2cs(List) when is_list(List) ->
     Name = pick(unknown, name, List, must),
@@ -1142,6 +1095,7 @@ do_delete_table(Tab) ->
     ensure_writable(schema),
     insert_schema_ops(TidTs, make_delete_table(Tab, whole_table)).
 
+-dialyzer({no_improper_lists, make_delete_table/2}).
 make_delete_table(Tab, Mode) ->
     case existed_before(Tab) of
 	false ->
@@ -1297,6 +1251,7 @@ make_del_table_copy(Tab, Node) ->
         _ ->
 	    ensure_active(Cs),
             verify_cstruct(Cs2),
+	    get_tid_ts_and_lock(Tab, write),
             [{op, del_table_copy, Storage, Node, vsn_cs2list(Cs2)}]
     end.
 
@@ -1324,6 +1279,7 @@ remove_node_from_tabs([Tab|Rest], Node) ->
 		     remove_node_from_tabs(Rest, Node)];
 		_Ns ->
 		    verify_cstruct(Cs2),
+		    get_tid_ts_and_lock(Tab, write),
 		    [{op, del_table_copy, ram_copies, Node, vsn_cs2list(Cs2)}|
 		     remove_node_from_tabs(Rest, Node)]
 	    end
@@ -1355,6 +1311,11 @@ do_move_table(schema, _FromNode, _ToNode) ->
     mnesia:abort({bad_type, schema});
 do_move_table(Tab, FromNode, ToNode) when is_atom(FromNode), is_atom(ToNode) ->
     TidTs = get_tid_ts_and_lock(schema, write),
+    AnyOld = lists:any(fun(Node) -> mnesia_monitor:needs_protocol_conversion(Node) end,
+		       [ToNode|val({Tab, where_to_write})]),
+    if AnyOld -> ignore;  %% Leads to deadlock on old nodes
+       true -> get_tid_ts_and_lock(Tab, write)
+    end,
     insert_schema_ops(TidTs, make_move_table(Tab, FromNode, ToNode));
 do_move_table(Tab, FromNode, ToNode) ->
     mnesia:abort({badarg, Tab, FromNode, ToNode}).
@@ -1962,7 +1923,7 @@ prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}, _WaitFor) ->
 	    end,
 	    %% Tables are created by mnesia_loader get_network code
 	    insert_cstruct(Tid, Cs, true),
-	    case mnesia_controller:get_network_copy(Tab, Cs) of
+	    case mnesia_controller:get_network_copy(Tid, Tab, Cs) of
 		{loaded, ok} ->
 		    {true, optional};
 		{not_loaded, ErrReason} ->
@@ -1993,28 +1954,11 @@ prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}, _WaitFor) ->
 	    {true, optional}
     end;
 
-prepare_op(Tid, {op, del_table_copy, _Storage, Node, TabDef}, _WaitFor) ->
+prepare_op(_Tid, {op, del_table_copy, _Storage, Node, TabDef}, _WaitFor) ->
     Cs = list2cs(TabDef),
     Tab = Cs#cstruct.name,
-
-    if
-	%% Schema table lock is always required to run a schema op.
-	%% No need to look it.
-	node(Tid#tid.pid) == node(), Tab /= schema ->
-	    Self = self(),
-	    Pid = spawn_link(fun() -> lock_del_table(Tab, Node, Cs, Self) end),
-	    put(mnesia_lock, Pid),
-	    receive
-		{Pid, updated} ->
-		    {true, optional};
-		{Pid, FailReason} ->
-		    mnesia:abort(FailReason);
-		{'EXIT', Pid, Reason} ->
-		    mnesia:abort(Reason)
-	    end;
-	true ->
-	    {true, optional}
-    end;
+    set_where_to_read(Tab, Node, Cs),
+    {true, optional};
 
 prepare_op(_Tid, {op, change_table_copy_type,  N, FromS, ToS, TabDef}, _WaitFor)
   when N == node() ->
@@ -2228,46 +2172,6 @@ receive_sync(Nodes, Pids) ->
 	    {abort, Else}
     end.
 
-lock_del_table(Tab, NewNode, Cs0, Father) ->
-    Ns = val({schema, active_replicas}),
-    process_flag(trap_exit,true),
-    Lock = fun() ->
-		   mnesia:write_lock_table(Tab),
-		   %% Sigh using cs record
-		   Set = fun(Node) ->
-				 [Cs] = normalize_cs([Cs0], Node),
-				 rpc:call(Node, ?MODULE, set_where_to_read, [Tab, NewNode, Cs])
-			 end,
-		   Res = [Set(Node) || Node <- Ns],
-		   Filter = fun(ok) ->
-				    false;
-			       ({badrpc, {'EXIT', {undef, _}}}) ->
-				    %% This will be the case we talks with elder nodes
-				    %% than 3.8.2, they will set where_to_read without
-				    %% getting a lock.
-				    false;
-			       (_) ->
-				    true
-			    end,
-		   case lists:filter(Filter, Res) of
-		       [] ->
-			   Father ! {self(), updated},
-			   %% When transaction is commited the process dies
-			   %% and the lock is released.
-			   receive _ -> ok end;
-		       Err ->
-			   Father ! {self(), {bad_commit, Err}}
-		   end,
-		   ok
-	   end,
-    case mnesia:transaction(Lock) of
-	{atomic, ok} ->  ok;
-	{aborted, R} ->  Father ! {self(), R}
-    end,
-    unlink(Father),
-    unlink(whereis(mnesia_tm)),
-    exit(normal).
-
 set_where_to_read(Tab, Node, Cs) ->
     case mnesia_lib:val({Tab, where_to_read}) of
 	Node ->
@@ -2418,13 +2322,19 @@ undo_prepare_op(Tid, {op, add_table_copy, Storage, Node, TabDef}) ->
 	    insert_cstruct(Tid, Cs2, true) % Don't care about the version
     end;
 
-undo_prepare_op(_Tid, {op, del_table_copy, _, Node, TabDef})
-  when Node == node() ->
-    WriteLocker = get(mnesia_lock),
-    WriteLocker =/= undefined andalso (WriteLocker ! die),
+undo_prepare_op(_Tid, {op, del_table_copy, _, Node, TabDef}) ->
     Cs = list2cs(TabDef),
     Tab = Cs#cstruct.name,
-    mnesia_lib:set({Tab, where_to_read}, Node);
+    if node() =:= Node ->
+	    mnesia_lib:set({Tab, where_to_read}, Node);
+       true ->
+	    case mnesia_lib:val({Tab, where_to_read}) of
+		nowhere ->
+		    mnesia_lib:set_remote_where_to_read(Tab);
+		_ ->
+		    ignore
+	    end
+    end;
 
 undo_prepare_op(_Tid, {op, change_table_copy_type, N, FromS, ToS, TabDef})
         when N == node() ->
@@ -2885,40 +2795,11 @@ do_merge_schema(LockTabs0) ->
     end.
 
 fetch_cstructs(Node) ->
-    case need_old_cstructs([Node]) of
-	false ->
-	    rpc:call(Node, mnesia_controller, get_remote_cstructs, []);
-	_Ver ->
-	    case rpc:call(Node, mnesia_controller, get_cstructs, []) of
-		{cstructs, Cs0, RR} ->
-		    {cstructs, [list2cs(cs2list(Cs)) || Cs <- Cs0], RR};
-		Err -> Err
-	    end
-    end.
+    rpc:call(Node, mnesia_controller, get_remote_cstructs, []).
 
-need_old_cstructs() ->
-    need_old_cstructs(val({schema, where_to_write})).
-
-need_old_cstructs(Nodes) ->
-    Filter = fun(Node) -> not mnesia_monitor:needs_protocol_conversion(Node) end,
-    case lists:dropwhile(Filter, Nodes) of
-	[] -> false;
-	[Node|_] ->
-	    case rpc:call(Node, mnesia_lib, val, [{schema,cstruct}]) of
-		#cstruct{} ->
-		    %% mnesia_lib:warning("Mnesia on ~p do not need to convert cstruct (~p)~n",
-		    %% 		       [node(), Node]),
-		    false;
-		{badrpc, _} ->
-		    need_old_cstructs(lists:delete(Node,Nodes));
-		Cs when element(1, Cs) == cstruct, tuple_size(Cs) == 17 ->
-		    ver4_4_18;			% Without majority
-		Cs when element(1, Cs) == cstruct, tuple_size(Cs) == 18 ->
-		    ver4_4_19;			% With majority
-		Cs when element(1, Cs) == cstruct, tuple_size(Cs) == 19 ->
-		    ver4_6			% With storage_properties
-	    end
-    end.
+need_old_cstructs() -> false.
+
+need_old_cstructs(_Nodes) -> false.
 
 tab_to_nodes(Tab) when is_atom(Tab) ->
     Cs = val({Tab, cstruct}),
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl
index e7ee938312..1d3eb87036 100644
--- a/lib/mnesia/src/mnesia_tm.erl
+++ b/lib/mnesia/src/mnesia_tm.erl
@@ -1692,13 +1692,10 @@ commit_participant(Coord, Tid, Bin, C0, DiscNs, _RamNs) ->
 			    ?eval_debug_fun({?MODULE, commit_participant, undo_prepare},
 					    [{tid, Tid}]);
 
-			{'EXIT', _, _} ->
+			{'EXIT', _MnesiaTM, Reason} ->
+			    reply(Coord, {do_abort, Tid, self(), {bad_commit,Reason}}),
 			    mnesia_recover:log_decision(D#decision{outcome = aborted}),
-			    ?eval_debug_fun({?MODULE, commit_participant, exit_log_abort},
-					    [{tid, Tid}]),
-			    mnesia_schema:undo_prepare_commit(Tid, C0),
-			    ?eval_debug_fun({?MODULE, commit_participant, exit_undo_prepare},
-					    [{tid, Tid}]);
+			    mnesia_schema:undo_prepare_commit(Tid, C0);
 
 			Msg ->
 			    verbose("** ERROR ** commit_participant ~p, got unexpected msg: ~p~n",
@@ -2210,8 +2207,6 @@ reconfigure_coordinators(N, [{Tid, [Store | _]} | Coordinators]) ->
 		true ->
 		    send_mnesia_down(Tid, Store, N)
 	    end;
-	aborted ->
-	    ignore; % avoid spurious mnesia_down messages
 	_ ->
 	    %% Tell the coordinator about the mnesia_down
 	    send_mnesia_down(Tid, Store, N)
diff --git a/lib/mnesia/test/mnesia_consistency_test.erl b/lib/mnesia/test/mnesia_consistency_test.erl
index 087aef86c9..279e7bc1ec 100644
--- a/lib/mnesia/test/mnesia_consistency_test.erl
+++ b/lib/mnesia/test/mnesia_consistency_test.erl
@@ -696,7 +696,7 @@ consistency_after_restore(ReplicaType, Op, Config) ->
     ?verify_mnesia(Nodes, []).
 
 change_tab(Father, Tab, Test) ->
-    Key = random:uniform(20),
+    Key = rand:uniform(20),
     Update = fun() ->
 		     case mnesia:read({Tab, Key}) of
 			 [{Tab, Key, 1}] -> 
diff --git a/lib/mnesia/test/mnesia_isolation_test.erl b/lib/mnesia/test/mnesia_isolation_test.erl
index b66da6e390..4dd0c01d05 100644
--- a/lib/mnesia/test/mnesia_isolation_test.erl
+++ b/lib/mnesia/test/mnesia_isolation_test.erl
@@ -39,7 +39,7 @@ groups() ->
     [{locking, [],
       [no_conflict, simple_queue_conflict,
        advanced_queue_conflict, simple_deadlock_conflict,
-       advanced_deadlock_conflict, lock_burst,
+       advanced_deadlock_conflict, schema_deadlock, lock_burst,
        {group, sticky_locks}, {group, unbound_locking},
        {group, admin_conflict}, nasty]},
      {sticky_locks, [], [basic_sticky_functionality]},
@@ -148,20 +148,32 @@ simple_queue_conflict(Config) when is_list(Config) ->
     fun_loop(Fun, AllSharedLocks, OneExclusiveLocks), 
     ok.
 
-wait_for_lock(Pid, _Nodes, 0) ->
+wait_for_lock(Pid, Nodes, Retry) ->
+    wait_for_lock(Pid, Nodes, Retry, queue).
+
+wait_for_lock(Pid, _Nodes, 0, queue) ->
     Queue = mnesia:system_info(lock_queue),
     ?error("Timeout while waiting for lock on Pid ~p in queue ~p~n", [Pid, Queue]);
-wait_for_lock(Pid, Nodes, N) ->
-    rpc:multicall(Nodes, sys, get_status, [mnesia_locker]), 
-    List = [rpc:call(Node, mnesia, system_info, [lock_queue]) || Node <- Nodes],
+wait_for_lock(Pid, _Nodes, 0, held) ->
+    Held = mnesia:system_info(held_locks),
+    ?error("Timeout while waiting for lock on Pid ~p (held) ~p~n", [Pid, Held]);
+wait_for_lock(Pid, Nodes, N, Where) ->
+    rpc:multicall(Nodes, sys, get_status, [mnesia_locker]),
+    List = case Where of
+	       queue ->
+		   [rpc:call(Node, mnesia, system_info, [lock_queue]) || Node <- Nodes];
+	       held ->
+		   [rpc:call(Node, mnesia, system_info, [held_locks]) || Node <- Nodes]
+           end,
     Q = lists:append(List),
-    check_q(Pid, Q, Nodes, N).
+    check_q(Pid, Q, Nodes, N, Where).
 
-check_q(Pid, [{_Oid, _Op, Pid, _Tid, _WFT} | _Tail], _N, _Count) -> ok;
-check_q(Pid, [_ | Tail], N, Count) -> check_q(Pid, Tail, N, Count);
-check_q(Pid, [], N, Count) ->
-    timer:sleep(500),
-    wait_for_lock(Pid, N, Count - 1).
+check_q(Pid, [{_Oid, _Op, Pid, _Tid, _WFT} | _Tail], _N, _Count, _Where) -> ok;
+check_q(Pid, [{_Oid, _Op, {tid,_,Pid}} | _Tail], _N, _Count, _Where) -> ok;
+check_q(Pid, [_ | Tail], N, Count, Where) -> check_q(Pid, Tail, N, Count, Where);
+check_q(Pid, [], N, Count, Where) ->
+    timer:sleep(200),
+    wait_for_lock(Pid, N, Count - 1, Where).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -270,6 +282,43 @@ advanced_deadlock_conflict(Config) when is_list(Config) ->
     ?match([], mnesia:system_info(lock_queue)), 
     ok.
 
+%%  Verify (and regression test) deadlock in del_table_copy(schema, Node)
+schema_deadlock(Config) when is_list(Config) ->
+    Ns = [Node1, Node2] = ?acquire_nodes(2, Config),
+    ?match({atomic, ok}, mnesia:create_table(a, [{disc_copies, Ns}])),
+    ?match({atomic, ok}, mnesia:create_table(b, [{disc_copies, Ns}])),
+
+    Tester = self(),
+
+    Deadlocker = fun() ->
+			 mnesia:write({a,1,1}),  %% grab write lock on A
+			 receive
+			     continue ->
+				 mnesia:write({b,1,1}), %% grab write lock on B
+				 end_trans
+			 end
+		 end,
+
+    ?match(stopped, rpc:call(Node2, mnesia, stop, [])),
+    timer:sleep(500), %% Let Node1 reconfigure
+    sys:get_status(mnesia_monitor),
+
+    DoingTrans = spawn_link(fun() ->  Tester ! {self(),mnesia:transaction(Deadlocker)} end),
+    wait_for_lock(DoingTrans, [Node1], 10, held),
+    %% Will grab write locks on schema, a, and b
+    DoingSchema = spawn_link(fun() -> Tester ! {self(), mnesia:del_table_copy(schema, Node2)} end),
+    timer:sleep(500), %% Let schema trans start, and try to grab locks
+    DoingTrans ! continue,
+
+    ?match(ok, receive {DoingTrans,  {atomic, end_trans}} -> ok after 5000 -> timeout end),
+    ?match(ok, receive {DoingSchema,  {atomic, ok}} -> ok after 5000 -> timeout end),
+
+    sys:get_status(whereis(mnesia_locker)), % Explicit sync, release locks is async
+    ?match([], mnesia:system_info(held_locks)),
+    ?match([], mnesia:system_info(lock_queue)),
+    ok.
+
+
 one_oid(Tab) -> {Tab, 1}.
 other_oid(Tab) -> {Tab, 2}.
     
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index 0fe5b5db8b..194bc439a0 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.13.2
+MNESIA_VSN = 4.13.4
diff --git a/lib/observer/doc/src/cdv.xml b/lib/observer/doc/src/cdv.xml
index ee629bbd3f..df1032780a 100644
--- a/lib/observer/doc/src/cdv.xml
+++ b/lib/observer/doc/src/cdv.xml
@@ -4,7 +4,7 @@
 <comref>
   <header>
     <copyright>
-      <year>2013</year>
+      <year>2003</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,16 +33,16 @@
     <file>cdv.xml</file>
   </header>
   <com>cdv</com>
-  <comsummary>Script used for starting the Crashdump Viewer from the
+  <comsummary>Script to start the Crashdump Viewer from the
   OS command line.
   </comsummary>
 
   <description>
-    <p>The <c>cdv</c> shell script can be found under the <c>priv</c>
-    directory of the <c>observer</c> application. The script is used
+    <p>The <c>cdv</c> shell script is located in directory <c>priv</c>
+     of the Observer application. The script is used
     for starting the Crashdump Viewer tool from the OS command
     line.</p>
-    <p>For Windows users, <c>cdv.bat</c> can be found in the same
+    <p>For Windows users, <c>cdv.bat</c> is found in the same
     location.</p>
   </description>
 
@@ -51,8 +51,8 @@
       <name>cdv [file]</name>
       <fsummary>Start the Crashdump Viewer and load the given file.</fsummary>
       <desc>
-	<p>The <c>file</c> arguments is optional. If not given, a file
-	dialog will pop up allowing the user to select a crashdump
+	<p>Argument <c>file</c> is optional. If not specified, a file
+	dialog is displayed, allowing you to select a crashdump
 	from the file system.</p>
       </desc>
     </func>
diff --git a/lib/observer/doc/src/crashdump.xml b/lib/observer/doc/src/crashdump.xml
index 76deee45f6..27e88d07e5 100644
--- a/lib/observer/doc/src/crashdump.xml
+++ b/lib/observer/doc/src/crashdump.xml
@@ -25,7 +25,7 @@
     </legalnotice>
 
     <title>crashdump_viewer</title>
-    <prepared>Siri hansen</prepared>
+    <prepared>Siri Hansen</prepared>
     <responsible></responsible>
     <docno>1</docno>
     <approved></approved>
@@ -41,32 +41,31 @@
     <p>The Crashdump Viewer is a WxWidgets based tool for browsing Erlang
       crashdumps.</p>
 
-    <p>See the <seealso marker="crashdump_ug">user's guide</seealso>
-    for more information about how to get started with the Crashdump
-    Viewer.</p>
+    <p>For details about how to get started with the Crashdump Viewer, see the
+    <seealso marker="crashdump_ug"><c>User's Guide</c></seealso>.</p>
   </description>
   <funcs>
     <func>
       <name>start() -> ok</name>
       <name>start(File) -> ok</name>
-      <fsummary>Start the crashdump_viewer</fsummary>
+      <fsummary>Start the Crashdump Viewer.</fsummary>
       <type>
         <v>File = string()</v>
-	<d>The file name of the crashdump.</d>
+	<d>The filename of the crashdump.</d>
       </type>
       <desc>
-        <p>This function starts the <c>crashdump_viewer</c> GUI and
-        loads the given crashdump.</p>
+        <p>Starts the Crashdump Viewer GUI and
+        loads the specified crashdump.</p>
 
-	<p>If <c>File</c> is not given, a file dialog will be opened
+	<p>If <c>File</c> is not specified, a file dialog is opened
 	where the crashdump can be selected.</p>
       </desc>
     </func>
     <func>
       <name>stop() -> ok</name>
-      <fsummary>Stop the crashdump_viewer</fsummary>
+      <fsummary>Terminate the Crashdump Viewer.</fsummary>
       <desc>
-        <p>This function stops the <c>crashdump_viewer</c> and closes
+        <p>Terminates the Crashdump Viewer and closes
         all GUI windows.</p>
       </desc>
     </func>
diff --git a/lib/observer/doc/src/crashdump_ug.xml b/lib/observer/doc/src/crashdump_ug.xml
index 4bb3628ab5..4ba057c3fb 100644
--- a/lib/observer/doc/src/crashdump_ug.xml
+++ b/lib/observer/doc/src/crashdump_ug.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2013</year>
+      <year>2003</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -39,371 +39,390 @@
   <section>
     <title>Getting Started</title>
 
-    <p>The easiest way to start Crashdump Viewer is to use the
-    provided shell script named <c>cdv</c> with the full path to the
-    erlang crashdump as an argument. The script can be found in the
-    priv directory of the <c>observer</c> application. This starts the
-    Crashdump Viewer GUI and loads the given file. If no file name is
-    given, a file dialog will be opened where the file can be
+    <p>The easiest way to start Crashdump Viewer is to use
+    shell script <c>cdv</c> with the full path to the
+    Erlang crashdump as argument. The script is located in
+    directory <c>priv</c> of the Observer application. This starts the
+    Crashdump Viewer GUI and loads the specified file. If no filename is
+    specified, a file dialog is opened where the file can be
     selected.</p>
 
-    <p>Under Windows the batch file <c>cdv.bat</c> can be used.</p>
+    <p>Under Windows, the batch file <c>cdv.bat</c> can be used.</p>
 
-    <p>It is also possible to start the Crashdump Viewer from within
-    an erlang node by calling <seealso
+    <p>Crashdump Viewer can also be started from
+    an Erlang node by calling <seealso
     marker="crashdump_viewer#start/0">crashdump_viewer:start/0</seealso>
     or <seealso
     marker="crashdump_viewer#start/1">crashdump_viewer:start/1</seealso>.</p>
   </section>
 
   <section>
-    <title>The graphical interface</title>
+    <title>GUI</title>
 
-    <p>The main window is opened when Crashdump Viewer has loaded a
-    crashdump. It contains a title bar, a menu bar, a number of
-    information panels and a status bar.</p>
+    <p>The GUI main window is opened when Crashdump Viewer has loaded a
+    crashdump. It contains a title bar, a menu bar,
+    information tabs, and a status bar.</p>
 
     <p>The title bar shows the name of the currently loaded
     crashdump.</p>
 
     <p>The menu bar contains a <em>File</em> menu and a <em>Help</em>
-    menu. From the File menu a new crashdump can be loaded or the tool
-    can be terminated. From the Help menu this user's guide and the
-    chapter "How to interpret the Erlang crash dumps" from the user's
-    guide for Erlang runtime system can be opened. "How to interpret
+    menu. From the <em>File</em> menu, a new crashdump can be loaded or 
+    the tool can be terminated. From the <em>Help</em> menu, this User's Guide 
+    and section "How to interpret the Erlang crash dumps" from the
+    ERTS application can be opened. "How to interpret
     the Erlang crash dumps" describes the raw crashdumps in
-    detail. Here you will also find information about each single
-    field in the different information pages. This document can also
-    be found directly in the OTP online documentation, via the Erlang
-    runtime system user's guide.</p>
+    detail and includes information about each
+    field in the information pages."How to interpret the Erlang crash dumps" 
+    is also available in the OTP online documentation.</p>
 
-    <p>The status bar at the bottom of the window will show a warning
+    <p>The status bar at the bottom of the window shows a warning
     if the currently loaded dump is truncated.</p>
 
-    <p>The centre area of the main window contains the information
-    panels. Each panel displays information about a specific item or a
-    list of items. A panel is selected by clicking the title of the
-    tab.</p>
+    <p>The center area of the main window contains the information
+    tabs. Each tab displays information about a specific item or a
+    list of items. Select a tab by clicking the tab title.</p>
 
-    <p>From panels that display lists of items, for example the
-    Processes- or the Ports panel, a new window with further
-    information can be opened by double clicking a row or by right
-    clicking the row and selecting an item from the drop down
+    <p>From tabs displaying lists of items, for example, the
+    <em>Processes</em> tab or the <em>Ports</em> tab, a new window with 
+    more information can be opened by double-clicking a row or by right-
+    clicking the row and selecting an item from the drop-down
     menu. The new window is called a detail window. Detail windows can
-    be opened for processes, ports, nodes and modules.</p>
+    be opened for processes, ports, nodes, and modules.</p>
 
-    <p>The various information shown in a detail window might contain
-    links to processes or ports. Clicking one of these links will open
+    <p>The information shown in a detail window can contain
+    links to processes or ports. Clicking one of these links opens
     the detail window for the process or port in question. If the
-    process or port resided on a remote node, there will be no
-    information available. Clicking the link will then pop up a dialog
-    where you can choose whether to open the detail window for the
-    remote node or not.
+    process or port resides on a remote node, no
+    information is available. Clicking the link then displays a dialog
+    where you can choose to open the detail window for the
+    remote node.
     </p>
 
-    <p>Some of the panels contain a left hand menu where sub items of
-    the panel's information area can be selected. Click on one of the
-    rows, and the information will be displayed in the right hand
+    <p>Some tabs contain a left-hand menu where subitems of
+    the information area can be selected. Click one of the
+    rows, and the information is displayed in the right-hand
     information area.</p>
   </section>
 
   <section>
-    <title>Data content</title>
-
-    <p>Each panel in the main window contains an information
-    page. If no information is found for an item, the page will be
-    empty. The reason for not finding any information about an item
-    can be that the dump is truncated, that it is a dump from an old
-    OTP release in which this item was not written or that the item
-    simply wasn't present in the system at the point of failure.</p>
-
-    <p>If the dump was truncated, a warning is displayed in the
-    status bar of the main window.</p>
-
-    <p>Even if some information about an item exists, there might be
+    <title>Tab Content</title>
+
+    <p>Each tab in the main window contains an information
+    page. If no information is found for an item, the page is
+    empty. The reason for not finding information about an item
+    can be the following:</p>
+    <list type="bulleted">
+       <item>It is a dump from an old OTP release in which this item was not written.</item>
+       <item>The item was not present in the system at the point of failure.</item>
+       <item>The dump is truncated. In this case, a warning is displayed in the
+       status bar of the main window.</item>
+     </list>
+
+    <p></p>
+
+    <p>Even if some information about an item exists, there can be
     empty fields if the dump originates from an old OTP release.</p>
 
-    <p>The value "-1" in any field means "unknown", and in most
+    <p>The value <c>-1</c> in any field means "unknown", and in most
     cases it means that the dump was truncated somewhere around this
     field.</p>
 
-    <p>The sections below describe some of the fields in the
-    different information panels. These are fields that do not exist
+    <p>The following sections describe some of the fields in the
+    information tabs. These are fields that do not exist
     in the raw crashdump, or in some way differ from the fields in
-    the raw crashdump. Details about other fields can be found in
-    the user's guide for the Erlang runtime system, in the chapter
-    "How to interpret the Erlang crash dumps". That chapter can also
-    be opened from the Help menu in the Crashdump Viewer's main
-    window, and there are also direct links from the specific
-    sections below to related information in "How to interpret the
-    Erlang crash dumps".</p>
+    the raw crashdump. For details about other fields, see
+    the 
+    <seealso marker="erts:users_guide">ERTS User's Guide</seealso>, section
+    "How to interpret the Erlang crash dumps". That section can also
+    be opened from the <em>Help</em> menu in the main window.
+    There are also links from the following sections to related information 
+    in "How to interpret the Erlang crash dumps".</p>
   </section>
 
   <section>
     <marker id="general_info"/>
-    <title>General information</title>
+    <title>General Tab</title>
 
-    <p>The <em>General information</em> panel shows a short overview
+    <p>Tab <em>General</em> shows a short overview
     of the dump.</p>
 
-    <p>The following fields are not described in the Erlang runtime
-    system user's guide:</p>
+    <p>The following fields are not described in the ERTS
+    User's Guide:</p>
 
     <taglist>
-      <tag><em>Crashdump created on</em></tag>
-      <item>Time of failure.</item>
-
-      <tag><em>Memory allocated</em></tag>
-      <item>The total number of bytes allocated, equivalent to
-      <c>c:memory(total)</c>.</item>
-
-      <tag><em>Memory maximum</em></tag>
-      <item>The maximum number of bytes that has been allocated during
-      the lifetime of the originating node. This will only be shown if
-      the Erlang runtime system was run instrumented.</item>
-
-      <tag><em>Atoms</em></tag>
-      <item>If available in the dump, this is the total number of
-      atoms in the atom table. If the size of the atom table is not
-      available, the number of atoms visible in the dump is
-      presented.</item>
-
-      <tag><em>Processes, ETS tables and Funs</em></tag>
-      <item>The number of processes, ETS tables and funs visible in
-      the dump.</item>
+      <tag><c>Crashdump created on</c></tag>
+      <item><p>Time of failure.</p></item>
+
+      <tag><c>Memory allocated</c></tag>
+      <item><p>The total number of bytes allocated, equivalent to
+      <c>c:memory(total)</c>.</p></item>
+
+      <tag><c>Memory maximum</c></tag>
+      <item><p>The maximum number of bytes that has been allocated during
+      the lifetime of the originating node. This is only shown if
+      the Erlang runtime system is run instrumented.</p></item>
+
+      <tag><c>Atoms</c></tag>
+      <item><p>If available in the dump, this is the total number of
+      atoms in the atom table. If the size of the atom table is
+      unavailable, the number of atoms visible in the dump is
+      displayed.</p></item>
+
+      <tag><c>Processes</c></tag>
+      <item><p>The number of processes visible in the dump.</p></item>
+
+      <tag><c>ETS tables</c></tag>
+      <item><p>The number of ETS tables visible in the dump.</p></item>
+
+      <tag><c>Funs</c></tag>
+      <item><p>The number of funs visible in the dump.</p></item>
     </taglist>
 
-    <p>
-      <seealso marker="erts:crash_dump#general_info">More...</seealso>
+    <p>For details, see
+      <seealso marker="erts:crash_dump#general_info">General Information</seealso>
+      in section "How to Interpret the Erlang Crash Dumps" in ERTS.
     </p>
   </section>
 
   <section>
     <marker id="processes"/>
-    <title>Processes</title>
+    <title>Processes Tab</title>
 
-    <p>The <em>Processes</em> panel shows a list of all processes
-    found in the crashdump, including some short information about
-    each process. By default the processes are sorted by their
-    pids. To sort by other topic, click the desired column
-    heading.</p>
+    <p>Tab <em>Processes</em> shows a list of all processes
+    found in the crashdump, including brief information about
+    each process. By default, the processes are sorted by their
+    pids. To sort by another topic, click the desired column heading.</p>
 
-    <p>The <em>Memory</em> column shows the 'Memory' field which was
-    added to crashdumps in R16B01. This is the total amount of memory
+    <p>Column <em>Memory</em> shows the 'Memory' field that was
+    added to crashdumps in Erlang/OTP R16B01. This is the total amount of memory
     used by the process. For crashdumps from earlier releases, this
-    column shows the 'Stack+heap' field. The value shown is always in
-    bytes.</p>
+    column shows the 'Stack+heap' field. The value is always in bytes.</p>
 
-    <p>To view detailed information about a specific process, double
-    click the row in the list or right click the row and select
-    "Properties for &lt;pid&gt;".</p>
+    <p>To view detailed information about a specific process, double-
+    click the row in the list, or right-click the row and select
+    <em>Properties for &lt;pid&gt;</em>.</p>
 
-    <p>
-      <seealso marker="erts:crash_dump#processes">More...</seealso>
+    <p>For details, see
+      <seealso marker="erts:crash_dump#processes">Process Information</seealso>
+      in section "How to Interpret the Erlang Crash Dumps" in ERTS.
     </p>
   </section>
 
   <section>
     <marker id="ports"/>
-    <title>Ports</title>
+    <title>Ports Tab</title>
 
-    <p>The <em>Ports</em> panel is similar to the <em>Processes</em>
-    panel, except it lists all ports found in the crashdump.</p>
+    <p>Tab <em>Ports</em> is similar to the <em>Processes</em>
+    tab, except it lists all ports found in the crashdump.</p>
 
-    <p>To see more details about a specific port, dobule click the row
-    or right click it and select "Properties for &lt;port&gt;". From
-    the right click menu you can also select "Properties for
-    &lt;pid&gt;", where &lt;pid&gt; is the process connected to the
+    <p>To view more details about a specific port, double-click the row
+    or right-click it and select <em>Properties for &lt;port&gt;</em>. From
+    the right-click menu, you can also select <em>Properties for
+    &lt;pid&gt;</em>, where <c>&lt;pid&gt;</c> is the process connected to the
     port.</p>
 
-    <p>
-      <seealso marker="erts:crash_dump#ports">
-      More...</seealso>
+    <p>For details, see
+      <seealso marker="erts:crash_dump#ports">Port Information</seealso>
+      in section "How to Interpret the Erlang Crash Dumps" in ERTS.
     </p>
   </section>
 
   <section>
     <marker id="ets_tables"/><marker id="internal_ets_tables"/>
-    <title>ETS tables</title>
+    <title>ETS Tables Tab</title>
 
-    <p>The <em>ETS Tables</em> panel shows all ETS table information
-    found in the dump. The 'Id' is the same as the 'Table' field found
-    in the raw crashdump, and 'Memory' is the 'Words' field from the
-    raw crashdump translated into bytes. For tree tables there will
-    be no value in the 'Objects' field.</p>
+    <p>Tab <em>ETS Tables</em> shows all ETS table information
+    found in the dump. <em>Id</em> is the same as the 'Table' field
+    in the raw crashdump. <em>Memory</em> is the 'Words' field from the
+    raw crashdump translated into bytes. For tree tables, there is
+    no value in the 'Objects' field.</p>
 
-    <p>To open the detailed information page about the table, double
-    click or right click the row and select "Properties for
-    'Identifier'".</p>
+    <p>To open the detailed information page about the table, double-
+    click, or right-click the row and select <em>Properties for
+    'Identifier'</em>.</p>
 
     <p>To open the detailed information page about the owner process
-    of an ETS table, right click the row and select "Properties for
-    &lt;pid&gt;".</p>
+    of an ETS table, right-click the row and select <em>Properties for
+    &lt;pid&gt;</em>.</p>
 
-    <p>
-      <seealso marker="erts:crash_dump#ets_tables">
-      More...</seealso>
+    <p>For details, see
+      <seealso marker="erts:crash_dump#ets_tables">ETS Tables</seealso>
+      in section "How to Interpret the Erlang Crash Dumps" in ERTS.
     </p>
   </section>
 
   <section>
     <marker id="timers"/>
-    <title>Timers</title>
+    <title>Timers Tab</title>
 
-    <p>The <em>Timers</em> panel shows all timer information found in
+    <p>Tab <em>Timers</em> shows all timer information found in
     the dump.</p>
 
     <p>To open the detailed information page about the owner process
-    of a timer, right click the row and select "Properties for
-    &lt;pid&gt;".</p>
+    of a timer, right-click the row and select <em>Properties for
+    &lt;pid&gt;</em>.</p>
 
-    <p>Double clicking a row in the Timers panel has no effect.</p>
+    <p>Double-clicking a row in the <em>Timers</em> tab has no effect.</p>
 
-    <p>
-      <seealso marker="erts:crash_dump#timers">More...</seealso>
+    <p>For details, see
+      <seealso marker="erts:crash_dump#timers">Timers</seealso>
+      in section "How to Interpret the Erlang Crash Dumps" in ERTS.
     </p>
   </section>
 
   <section>
     <marker id="schedulers"/>
-    <title>Schedulers</title>
+    <title>Schedulers Tab</title>
 
-    <p>The <em>Schedulers</em> panel shows all scheduler information
+    <p>Tab <em>Schedulers</em> shows all scheduler information
     found in the dump.</p>
 
     <p>To open the detailed information page about the scheduler,
-    double click or right click the row and select "Properties for
-    'Identifier'".</p>
+    double-click, or right-click the row and select <em>Properties for
+    'Identifier'</em>.</p>
 
-    <p>
-      <seealso marker="erts:crash_dump">More...</seealso>
+    <p>For details, see
+      <seealso marker="erts:crash_dump#scheduler">Scheduler Information</seealso>
+      in section "How to Interpret the Erlang Crash Dumps" in ERTS.
     </p>
   </section>
 
   <section>
     <marker id="funs"/>
-    <title>Funs</title>
+    <title>Funs Tab</title>
 
-    <p>The <em>Funs</em> panel shows all Fun information found in the
+    <p>Tab <em>Funs</em> shows all fun information found in the
     dump.</p>
 
     <p>To open the detailed information page about the module to which
-    the fun belongs, right click the row and select "Properties for
-    &lt;mod&gt;".</p>
+    the fun belongs, right-click the row and select <em>Properties for
+    &lt;mod&gt;</em>.</p>
 
-    <p>Double clicking a row in the Funs panel has no effect.</p>
+    <p>Double-clicking a row in the <em>Funs</em> tab has no effect.</p>
 
-    <p>
-      <seealso marker="erts:crash_dump#funs">More...</seealso>
+    <p>For details, see
+      <seealso marker="erts:crash_dump#funs">Fun Information</seealso>
+      in section "How to Interpret the Erlang Crash Dumps" in ERTS.
     </p>
   </section>
 
   <section>
     <marker id="atoms"/>
-    <title>Atoms</title>
+    <title>Atoms Tab</title>
 
-    <p>The <em>Atoms</em> panel lists all atoms found in the dump. By
+    <p>Tab <em>Atoms</em> lists all atoms found in the dump. By
     default the atoms are sorted in creation order from first to
     last. This is opposite of the raw crashdump where atoms are listed
     from last to first, meaning that if the dump was truncated in the
-    middle of the atom list only the last created atoms will be seen
-    in the <em>Atoms</em> panel.</p>
+    middle of the atom list, only the last created atoms are visible
+    in the <em>Atoms</em> tab.</p>
 
-    <p>
-      <seealso marker="erts:crash_dump#atoms">More...</seealso>
+    <p>For details, see
+      <seealso marker="erts:crash_dump#atoms">Atoms</seealso>
+      in section "How to Interpret the Erlang Crash Dumps" in ERTS.
     </p>
   </section>
 
   <section>
     <marker id="distribution_info"/>
-    <title>Nodes</title>
+    <title>Nodes Tab</title>
 
-    <p>The <em>Nodes</em> panel shows a list of all external erlang
-    nodes which are referenced from the crashdump.</p>
+    <p>Tab <em>Nodes</em> shows a list of all external Erlang
+    nodes that are referenced from the crashdump.</p>
 
-    <p>If the page is empty it either means that the crashed node was
-    not distributed, that it was distributed but had no references to
-    other nodes or that the dump was truncated.</p>
+    <p>If the page is empty, it means either of the following:</p>
+    <list type="bulleted">
+       <item>The crashed node is not distributed.</item>
+       <item>The crashed node is distributed but has no references to other nodes.</item>
+       <item>The dump is truncated.</item>
+     </list>
 
-    <p>If the node was distributed, all referenced nodes are
-    shown. The column named <em>Connection type</em> shows if the node
-    is visible, hidden or not connected. Visible nodes are alive nodes
+    <p>If the node is distributed, all referenced nodes are
+    visible. Column <em>Connection type</em> shows if the node
+    is visible, hidden, or not connected. Visible nodes are alive nodes
     with a living connection to the originating node. Hidden nodes are
-    the same as visible nodes, except they are started with the
-    <c>-hidden</c> flag. Not connected nodes are nodes that are not
+    the same as visible nodes, except they are started with flag
+    <c>-hidden</c>. Not connected nodes are nodes that are not
     connected to the originating node anymore, but references
-    (i.e. process or port identifiers) exist.</p>
+    (that is, process or port identifiers) exist.</p>
 
-    <p>To see more detailed information about a node, double click the
-    row or right click the row and select "Properties for node
-    &lt;node&gt;". From the right click menu you can also select
-    "Properties for &lt;port&gt;", to open the detailed information
+    <p>To see more detailed information about a node, double-click the
+    row, or right-click the row and select <em>Properties for node
+    &lt;node&gt;</em>. From the right-click menu, you can also select
+    <em>Properties for &lt;port&gt;</em>, to open the detailed information
     window for the controlling port.</p>
 
-    <p>In the detailed information window for a node, any exsisting
+    <p>In the detailed information window for a node, any existing
     links and monitors between processes on the originating node and
-    the connected node are shown. <em>Extra Info</em> may contain
-    debug information (i.e. special information written if the
-    emulator is debug compiled) or error information.</p>
+    the connected node are displayed. <em>Extra Info</em> can contain
+    debug information (that is, special information written if the
+    emulator is debug-compiled) or error information.</p>
 
-    <p>
-      <seealso marker="erts:crash_dump#distribution_info">
-      More...</seealso>
+    <p>For details, see
+      <seealso marker="erts:crash_dump#distribution_info">Distribution Information</seealso>
+      in section "How to Interpret the Erlang Crash Dumps" in ERTS.
     </p>
   </section>
 
   <section>
     <marker id="loaded_modules"/>
-    <title>Loaded modules</title>
+    <title>Modules Tab</title>
 
-    <p>The <em>Modules</em> panel lists all modules that were loaded
-    on the originating node, and the current size of the code. If old
-    code exsits, the old size is also shown.</p>
+    <p>Tab <em>Modules</em> lists all modules loaded
+    on the originating node, and the current code size. If old
+    code exists, the old size is also shown.</p>
 
-    <p>To see detailed information about a specific module, double
-    click the row or right click it and select "Properties for
-    &lt;mod&gt;".</p>
+    <p>To view detailed information about a specific module, double-
+    click the row, or right-click it and select <em>Properties for
+    &lt;mod&gt;</em>.</p>
 
-    <p>
-      <seealso marker="erts:crash_dump#loaded_modules">
-      More...</seealso>
+    <p>For details, see
+      <seealso marker="erts:crash_dump#loaded_modules">Loaded Module Information</seealso>
+      in section "How to Interpret the Erlang Crash Dumps" in ERTS.
     </p>
   </section>
 
   <section>
     <marker id="memory"/>
-    <title>Memory</title>
-
-    <p>The <em>Memory</em> panel shows memory and allocator
-    information. From the left hand menu you can select:</p>
+    <title>Memory Tab</title>
 
-      <list>
+    <p>Tab <em>Memory</em> shows memory and allocator
+    information. From the left-hand menu you can select the following:</p>
 
-	<item><em>Memory</em> <seealso
-	marker="erts:crash_dump#memory">More...</seealso></item>
+      <taglist>
+	<tag><em>Memory</em></tag>
+	<item><p>See
+	<seealso marker="erts:crash_dump#memory">Memory Information</seealso>
+	in section "How to Interpret the Erlang Crash Dumps" in ERTS.</p></item>
 
-	<item><em>Allocator Summary</em> - this page presents a
-	summary of values from all allocators below.</item>
+	<tag><em>Allocator Summary</em></tag>
+	<item><p>This page presents a summary of values from all allocators underneath it.</p></item>
 
-	<item><em>&lt;Allocator&gt;</em> - one entry per allocator
-	<seealso
-	marker="erts:crash_dump#allocator">More...</seealso></item>
+	<tag><em>&lt;Allocator&gt;</em></tag>
+	<item><p>One entry per allocator. See
+	<seealso marker="erts:crash_dump#allocator">Allocator</seealso>
+	in section "How to Interpret the Erlang Crash Dumps" in ERTS.</p></item>
 
-	<item><em>Allocated Areas</em> <seealso
-	marker="erts:crash_dump#allocated_areas">More...</seealso></item>
+	<tag><em>Allocated Areas</em></tag>
+	<item><p>See
+	<seealso marker="erts:crash_dump#allocated_areas">Allocated Areas</seealso>
+	in section "How to Interpret the Erlang Crash Dumps" in ERTS.</p></item>
 
-      </list>
+      </taglist>
   </section>
 
   <section>
     <marker id="internal_tables"/>
-    <title>Internal tables</title>
+    <title>Internal Tables Tab</title>
 
-    <p>On the <em>Internal Tables</em> panel you can choose from the
-    left hand menu to see hash tables or index tables.</p>
+    <p>On tab <em>Internal Tables</em> you can from the
+    left-hand menu select <em>Hash Tables</em>, <em>Index Tables</em>, 
+    or <em>Internal ETS Tables</em>.</p>
 
-    <p>
-      <seealso marker="erts:crash_dump#internal_tables">More...</seealso>
+    <p>For details, see
+      <seealso marker="erts:crash_dump#internal_tables">Internal Table Information</seealso>
+      in section "How to Interpret the Erlang Crash Dumps" in ERTS.
     </p>
   </section>
 </chapter>
diff --git a/lib/observer/doc/src/etop.xml b/lib/observer/doc/src/etop.xml
index c1e336177f..52f3b2a156 100644
--- a/lib/observer/doc/src/etop.xml
+++ b/lib/observer/doc/src/etop.xml
@@ -25,7 +25,7 @@
     </legalnotice>
 
     <title>etop</title>
-    <prepared>Siri hansen</prepared>
+    <prepared>Siri Hansen</prepared>
     <responsible></responsible>
     <docno></docno>
     <approved></approved>
@@ -35,89 +35,79 @@
     <file></file>
   </header>
   <module>etop</module>
-  <modulesummary>Erlang Top is a tool for presenting information about erlang processes similar to the information presented by "top" in UNIX.</modulesummary>
+  <modulesummary>Erlang Top is a tool for presenting information about Erlang 
+  processes similar to the information presented by "top" in UNIX.</modulesummary>
   <description>
 
-    <p><c>etop</c> should be started with the provided scripts
-      <c>etop</c>. This will start a hidden erlang node
-      which connects to the node to be measured. The measured node is
-      given with the <c>-node</c> option. If the measured node has a
+    <p>Start Erlang Top with the provided scripts
+      <c>etop</c>. This starts a hidden Erlang node
+      that connects to the node to be measured. The measured node is
+      specified with option <c>-node</c>. If the measured node has a
       different cookie than the default cookie for the user who
-      invokes the script, the cookie must be explicitly given witht
-      the <c>-setcookie</c> option.</p>
+      invokes the script, the cookie must be explicitly specified with
+      option <c>-setcookie</c>.</p>
 
-    <p>Under Windows the batch file <c>etop.bat</c> can be used.</p>
+    <p>Under Windows, batch file <c>etop.bat</c> can be used.</p>
 
-    <p>The following configuration parameters exist for the
-    <c>etop</c> tool. When executing the <c>etop</c> script,
-    these parameters can be given as command line options,
-    e.g. <c>etop -node testnode@myhost -setcookie MyCookie</c>.</p>
+    <p>When executing the <c>etop</c> script, configuration
+    parameters can be specified as command-line options,
+    for example, <c>etop -node testnode@myhost -setcookie MyCookie</c>.
+    The following configuration parameters exist for the
+    tool:</p>
     <taglist>
-      <tag>node</tag>
-      <item>The measured node.
-            <br></br>
-Value: atom()
-            <br></br>
-Mandatory</item>
-      <tag>setcookie</tag>
-      <item>Cookie to use for the etop node - must be the same
-       as the cookie on the measured node.
-            <br></br>
-Value: atom()</item>
-      <tag>lines</tag>
-      <item>Number of lines (processes) to display. 
-            <br></br>
-Value: integer()
-            <br></br>
-Default: 10</item>
-      <tag>interval</tag>
-      <item>The time interval (in seconds) between each update of
-       the display. 
-            <br></br>
-Value: integer()
-            <br></br>
-Default: 5</item>
-      <tag>accumulate</tag>
-      <item>If <c>true</c> the execution time and reductions are
-       accumulated. 
-            <br></br>
-Value: boolean()
-            <br></br>
-Default: <c>false</c></item>
-      <tag>sort</tag>
-      <item>Identifies what information to sort by. 
-            <br></br>
-Value: <c>runtime | reductions | memory | msg_q</c>      <br></br>
-Default: <c>runtime</c> (<c>reductions</c> if 
-      <c>tracing=off</c>)</item>
-      <tag>tracing</tag>
-      <item><c>etop</c> uses the erlang trace facility, and thus no
+      <tag><c>node</c></tag>
+      <item><p>The measured node.</p>
+	    <p>Value: <c>atom()</c></p>
+	    <p>Mandatory</p></item>
+      <tag><c>setcookie</c></tag>
+      <item><p>Cookie to use for the <c>etop</c> node. Must be same as the 
+      cookie on the measured node.</p>
+            <p>Value: <c>atom()</c></p></item>
+      <tag><c>lines</c></tag>
+      <item><p>Number of lines (processes) to display.</p> 
+            <p>Value: <c>integer()</c></p>
+	    <p>Default: <c>10</c></p></item>
+      <tag><c>interval</c></tag>
+      <item><p>Time interval (in seconds) between each update of
+       the display.</p>
+            <p>Value: <c>integer()</c></p>
+	    <p>Default: <c>5</c></p></item>
+      <tag><c>accumulate</c></tag>
+      <item><p>If <c>true</c>, the execution time and reductions are
+       accumulated.</p>
+            <p>Value: <c>boolean()</c></p>
+	    <p>Default: <c>false</c></p></item>
+      <tag><c>sort</c></tag>
+      <item><p>Identifies what information to sort by.</p>
+      <p>Value: <c>runtime | reductions | memory | msg_q</c></p>
+      <p>Default: <c>runtime</c> (<c>reductions</c> if <c>tracing=off</c>)</p></item>
+      <tag><c>tracing</c></tag>
+      <item><p><c>etop</c> uses the Erlang trace facility, and thus no
        other tracing is possible on the measured node while
       <c>etop</c> is running, unless this option is set to
       <c>off</c>. Also helpful if the <c>etop</c> tracing causes too
        high load on the measured node. With tracing off, runtime is
-       not measured.
-            <br></br>
-Value: <c>on | off</c>      <br></br>
-Default: <c>on</c></item>
+       not measured.</p>
+            <p>Value: <c>on | off</c></p>
+	    <p>Default: <c>on</c></p></item>
     </taglist>
 
-    <p>See the <seealso marker="etop_ug">user's guide</seealso> for
-    more information about the <c>etop</c> tool.</p>
+    <p>For detalis about Erlang Top, see the 
+    <seealso marker="etop_ug">User's Guide</seealso>.</p>
 
   </description>
   <funcs>
     <func>
       <name>start() -> ok</name>
-      <fsummary>Start etop</fsummary>
+      <fsummary>Start etop.</fsummary>
       <desc>
-        <p>This function starts <c>etop</c>.
-        Note that etop is preferably started with the etop script.</p>
+        <p>Starts <c>etop</c>.
+        Notice that <c>etop</c> is preferably started with the <c>etop</c> script.</p>
       </desc>
     </func>
     <func>
       <name>start(Options) -> ok</name>
-      <fsummary>Start etop</fsummary>
+      <fsummary>Start etop.</fsummary>
       <type>
         <v>Options = [Option]</v>
         <v>Option = {Key, Value}</v>
@@ -125,31 +115,30 @@ Default: <c>on</c></item>
         <v>Value = term()</v>
       </type>
       <desc>
-        <p>This function starts <c>etop</c>. Use
-          <seealso marker="#help/0">help/0</seealso> to see a
-          description of the possible options.</p>
+        <p>Starts <c>etop</c>. To view the possible options, use
+          <seealso marker="#help/0"><c>help/0</c></seealso>.</p>
       </desc>
     </func>
     <func>
       <name>help() -> ok</name>
-      <fsummary>Print etop's help</fsummary>
+      <fsummary>Display the etop help.</fsummary>
       <desc>
-        <p>This function prints the help of <c>etop</c> and
+        <p>Displays the help of <c>etop</c> and
           its options.</p>
       </desc>
     </func>
     <func>
       <name>config(Key,Value) -> Result</name>
-      <fsummary>Change tool's configuration</fsummary>
+      <fsummary>Change the configuration of the tool.</fsummary>
       <type>
         <v>Result = ok | {error,Reason}</v>
         <v>Key = lines | interval | accumulate | sort</v>
         <v>Value = term()</v>
       </type>
       <desc>
-        <p>This function is used to change the tool's configuration
-          parameters during runtime. The table above indicates the
-          allowed values for each parameter.</p>
+        <p>Changes the configuration parameters of the tool during runtime.
+	Allowed parameters are <c>lines</c>, <c>interval</c>, <c>accumulate</c>,
+	and <c>sort</c>.</p>
       </desc>
     </func>
     <func>
@@ -160,14 +149,14 @@ Default: <c>on</c></item>
         <v>File = string()</v>
       </type>
       <desc>
-        <p>This function dumps the current display to a text file.</p>
+        <p>Dumps the current display to a text file.</p>
       </desc>
     </func>
     <func>
       <name>stop() -> stop</name>
-      <fsummary>Terminate etop</fsummary>
+      <fsummary>Terminate etop.</fsummary>
       <desc>
-        <p>This function terminates <c>etop</c>.</p>
+        <p>Terminates <c>etop</c>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/observer/doc/src/etop_ug.xml b/lib/observer/doc/src/etop_ug.xml
index 7059f689d3..d663b089c2 100644
--- a/lib/observer/doc/src/etop_ug.xml
+++ b/lib/observer/doc/src/etop_ug.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2013</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,15 +32,25 @@
 
   <section>
     <title>Introduction</title>
-    <p>Erlang Top, <c>etop</c> is a tool for presenting information
-      about erlang processes similar to the information presented by
+    <p>Erlang Top, <c>etop</c>, is a tool for presenting information
+      about Erlang processes similar to the information presented by
       <c>top</c> in UNIX.
       </p>
   </section>
 
+ <section>
+    <title>Getting Started</title>
+    <p>Start Erlang Top in either of the following ways:</p>
+      <list type="bulleted">
+	<item>Use script <c>etop</c>.</item>
+	<item>Use batch file <c>etop.bat</c>, for example, 
+	<c>etop -node tiger@durin</c>.</item>
+      </list>
+  </section>
+
   <section>
     <title>Output</title>
-    <p>The output from <c>etop</c> looks like this:</p>
+    <p>The output from Erlang Top is as follows:</p>
     <code type="none"><![CDATA[
 ========================================================================================
  tiger@durin                                                               13:40:32
@@ -65,59 +75,60 @@ Pid            Name or Initial Func    Time    Reds  Memory    MsgQ Current Func
     <p>The header includes some system information:
       </p>
     <taglist>
-      <tag>Load</tag>
-      <item><c>cpu</c> is <c>Runtime/Wallclock</c>, i.e. the
-       percentage of time where the node has been
-       active, <c>procs</c> is the number of processes on the node,
-       and <c>runq</c> is the number of processes that are ready to
-       run.</item>
-      <tag>Memory</tag>
-      <item>This is the memory allocated by the node in kilo bytes.</item>
+      <tag><c>Load</c></tag>
+      <item>
+	<taglist>
+       <tag><c>cpu</c></tag>
+       <item><p><c>Runtime/Wallclock</c>, that is, the percentage of time 
+       where the node has been active.</p></item>
+       <tag><c>procs</c></tag>
+       <item><p>The number of processes on the node.</p></item>
+       <tag><c>runq</c></tag>
+       <item><p>The number of processes that are ready to run.</p></item>
+	</taglist>
+      </item>
+      <tag><c>Memory</c></tag>
+      <item><p>The memory allocated by the node in kilobytes.</p></item>
     </taglist>
     <p>For each process the following information is presented:
       </p>
     <taglist>
-      <tag>Time</tag>
-      <item>This is the runtime for the process, i.e. the actual
-       time the process has been scheduled in.</item>
-      <tag>Reds</tag>
-      <item>This is the number of reductions that has been executed
-       on the process</item>
-      <tag>Memory</tag>
-      <item>This is the size of the process in bytes, obtained by a
-       call to <c>process_info(Pid,memory)</c>.</item>
-      <tag>MsgQ</tag>
-      <item>This is the length of the message queue for the process.</item>
+      <tag><c>Time</c></tag>
+      <item><p>The runtime for the process, that is, the time that the process 
+      has been scheduled in.</p></item>
+      <tag><c>Reds</c></tag>
+      <item><p>The number of reductions executed on the process.</p></item>
+      <tag><c>Memory</c></tag>
+      <item><p>The size of the process in bytes, obtained by a
+       call to <c>process_info(Pid,memory)</c>.</p></item>
+      <tag><c>MsgQ</c></tag>
+      <item><p>The length of the message queue for the process.</p></item>
     </taglist>
     <note>
       <p><em>Time</em> and <em>Reds</em> can be presented as
-        accumulated values or as values since last update.</p>
+        accumulated values or as values since the last update.</p>
     </note>
   </section>
 
-  <section>
-    <title>Start</title>
-    <p>To start etop use the script
-      <c>etop</c> or the batch file <c>etop.bat</c>, e.g. <c>etop -node tiger@durin</c>,
-      </p>
-  </section>
-
-  <section>
+   <section>
     <title>Configuration</title>
     <p>All configuration parameters can be set at start by adding
-      <c>-OptName Value</c> to the command line, e.g. <c>etop -node tiger@durin -setcookie mycookie -lines 15</c>.
-      </p>
-    <p>The parameters <c>lines</c>, <c>interval</c>, <c>accumulate</c>
-      and <c>sort</c> can be changed during runtime by the
-      function <c>etop:config/2</c>.
-      </p>
-    <p>A list of all valid configuration parameters can be found in
-      the reference manual for <c>etop</c>.
+      <c>-OptName Value</c> to the command line, for example:</p> 
+      <pre>
+% <input>etop -node tiger@durin -setcookie mycookie -lines 15</input></pre>
+    
+    <p>A list of all valid Erlang Top configuration parameters is available in
+      module <seealso marker="etop"><c>etop</c></seealso>.
       </p>
 
-    <section>
-      <title>Example: Change configuration with text based presentation</title>
-      <code type="none"><![CDATA[
+      <p>The parameters <c>lines</c>, <c>interval</c>, <c>accumulate</c>,
+      and <c>sort</c> can be changed during runtime with function 
+      <seealso marker="etop#config/2"><c>etop:config/2</c></seealso>.
+      </p>
+      <p><em>Example:</em></p>
+      <p>Change configuration parameter <c>lines</c> with text-based presentation. 
+      Before the change, 10 lines are presented as follows:</p>
+         <code type="none"><![CDATA[
 ========================================================================================
  tiger@durin                                                               10:12:39
  Load:  cpu         0               Memory:  total        1858    binary         33
@@ -137,8 +148,14 @@ Pid            Name or Initial Func    Time    Reds  Memory    MsgQ Current Func
 <127.43.0>     ddll_server                0     582    3744       0 gen_server:loop/6   
 <127.5.0>      application_controll       0     569    6756       0 gen_server:loop/6   
 ========================================================================================      ]]></code>
-      <p><em><c>etop:config(lines,5).</c></em>        <br></br>
-<em><c>ok</c></em></p>
+      <p>Function <c>etop:config/2</c> is called to change the number of showed 
+      lines to 5:</p>
+
+	 <pre>
+> <input>etop:config(lines,5).</input>
+ok</pre>
+
+      <p>After the change, 5 lines are presented as follows:</p>
       <code type="none"><![CDATA[
 (etop@durin)2> 
 ========================================================================================
@@ -156,19 +173,20 @@ Pid            Name or Initial Func    Time    Reds  Memory    MsgQ Current Func
 <127.43.0>     ddll_server                0       0    3744       0 gen_server:loop/6   
 ========================================================================================
       ]]></code>
-    </section>
   </section>
 
   <section>
-    <title>Print to file</title>
-    <p>At any time, the current <c>etop</c> display can be dumped to a
-      text file with the function <c>etop:dump/1</c>.
+    <title>Print to File</title>
+    <p>At any time, the current Erlang Top display can be dumped to a
+      text file with function 
+      <seealso marker="etop#dump/1"><c>etop:dump/1</c></seealso>.
       </p>
   </section>
 
   <section>
     <title>Stop</title>
-    <p>Use the function <c>etop:stop/0</c> to stop <c>etop</c>.
+    <p>To stop Erlang Top, use function 
+    <seealso marker="etop#stop/0"><c>etop:stop/0</c></seealso>.
     </p>
   </section>
 </chapter>
diff --git a/lib/ose/doc/src/ose_app.xml b/lib/observer/doc/src/introduction_ug.xml
index d555f0ec4f..21f0dc709f 100644
--- a/lib/ose/doc/src/ose_app.xml
+++ b/lib/observer/doc/src/introduction_ug.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE appref SYSTEM "appref.dtd">
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
 
-<appref>
+<chapter>
   <header>
     <copyright>
-      <year>2014</year><year>2014</year>
+      <year>2016</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -22,17 +22,28 @@
 
     </legalnotice>
 
-    <title>Enea OSE</title>
+    <title>Introduction</title>
     <prepared></prepared>
     <docno></docno>
     <date></date>
     <rev></rev>
+    <file>introduction_ug.xml</file>
   </header>
-  <app>ose</app>
-  <appsummary>The OSE Application</appsummary>
-  <description>
-    <p>The OSE application contains modules and documentation that only
-    applies when running Erlang/OTP on Enea OSE.</p>
-  </description>
+<section>
+    <title>Scope</title>
+    <p>The Observer application is a container including the following
+    tools for tracing and investigation of distributed systems:</p>
+      <list type="bulleted">
+       <item>Observer</item>
+       <item>Trace Tool Builder</item>
+       <item>Erlang Top</item>
+       <item>Crashdump Viewer</item>
+     </list>
+  </section>
 
-</appref>
+  <section>
+    <title>Prerequisites</title>
+    <p>It is assumed that the reader is familiar with the Erlang
+      programming language.</p>
+  </section>
+</chapter>
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index e2eeffc667..dd99f45b19 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
+<section><title>Observer 2.1.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Documentation corrections.</p>
+          <p>
+	    Own Id: OTP-12994</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Observer 2.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/observer/doc/src/observer.xml b/lib/observer/doc/src/observer.xml
index bba5b1e33c..4d43ffe39f 100644
--- a/lib/observer/doc/src/observer.xml
+++ b/lib/observer/doc/src/observer.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2011</year><year>2013</year>
+      <year>2011</year><year>2016</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -34,24 +34,25 @@
     <file>observer.xml</file>
   </header>
   <module>observer</module>
-  <modulesummary>A GUI tool for observing an erlang system.</modulesummary>
+  <modulesummary>A GUI tool for observing an Erlang system.</modulesummary>
   <description>
-    <p>The observer is gui frontend containing various tools to
-    inspect a system.  It displays system information, application
-    structures, process information, ets or mnesia tables and a frontend
-    for tracing with <seealso marker="ttb">ttb</seealso>.
+    <p>Observer is a graphical tool for observing the characteristics of
+    Erlang systems. The tool Observer displays system information, application
+    supervisor trees, process information, ETS tables, Mnesia tables,
+    and contains a front end for Erlang tracing with module
+    <seealso marker="ttb"><c>ttb</c></seealso>.
     </p>
 
-    <p>See the <seealso marker="observer_ug">user's guide</seealso>
-    for more information about how to get started.</p>
+    <p>For detalis about how to get started, see the 
+    <seealso marker="observer_ug"><c>User's Guide</c></seealso>.</p>
   </description>
   <funcs>
     <func>
       <name>start() -> ok</name>
-      <fsummary>Start the observer gui</fsummary>
+      <fsummary>Start the Observer GUI.</fsummary>
       <desc>
-        <p>This function starts the <c>observer</c> gui.
-	Close the window to stop the application.
+        <p>Starts the Observer GUI.
+	To stop the tool, close the window.
 	</p>
       </desc>
     </func>
diff --git a/lib/observer/doc/src/observer_app.xml b/lib/observer/doc/src/observer_app.xml
index 543216cee9..a52d6cb4d9 100644
--- a/lib/observer/doc/src/observer_app.xml
+++ b/lib/observer/doc/src/observer_app.xml
@@ -4,8 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>2002</year>
-      <year>2013</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -24,7 +23,7 @@
   The Initial Developer of the Original Code is Ericsson AB.
     </legalnotice>
 
-    <title>observer</title>
+    <title>Observer</title>
     <prepared>Siri Hansen</prepared>
     <responsible>Siri Hansen</responsible>
     <docno></docno>
@@ -32,26 +31,21 @@
     <checked></checked>
     <date>2002-04-08</date>
     <rev>PA1</rev>
-    <file>observer_app.sgml</file>
+    <file>observer_app.xml</file>
   </header>
-  <app>observer</app>
+  <app>Observer</app>
   <appsummary>The Observer Application</appsummary>
   <description>
-    <p>This chapter describes the <em>OBSERVER</em> application in
-      OTP, which provides tools for tracing and investigation of
-      distributed systems.</p>
+    <p>The Observer application contains tools for tracing and
+    investigation of distributed systems.</p>
   </description>
 
   <section>
     <title>Configuration</title>
-    <p>There are currently no configuration parameters available for
+    <p>No configuration parameters are available for
       this application.
       </p>
   </section>
 
-  <section>
-    <title>SEE ALSO</title>
-    <p></p>
-  </section>
 </appref>
 
diff --git a/lib/observer/doc/src/observer_ug.xml b/lib/observer/doc/src/observer_ug.xml
index ff30d70913..ca354df864 100644
--- a/lib/observer/doc/src/observer_ug.xml
+++ b/lib/observer/doc/src/observer_ug.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2011</year><year>2014</year>
+      <year>2011</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,179 +32,253 @@
 
   <section>
     <title>Introduction</title>
-    <p>Observer, is a graphical tool for observing the characteristics of
-    erlang systems.  Observer displays system information, application
-    supervisor trees, process information, ets or mnesia tables and contains
-    a frontend for erlang tracing.
+    <p>Observer is a graphical tool for observing the characteristics of
+    Erlang systems. Observer displays system information, application
+    supervisor trees, process information, ETS tables, Mnesia tables
+    and contains a front end for Erlang tracing.
     </p>
   </section>
 
   <section>
-    <title>General</title>
-    <p>Normally observer should be run from a standalone node to minimize
-    the impact of the system being observed. Example:
+    <title>Getting Started</title>
+    <p>Run Observer from a standalone node to minimize the impact of the 
+    system being observed.
     </p>
-    <code>
- > erl -sname observer -hidden -setcookie MyCookie -run observer
-    </code>
+    <p><em>Example:</em></p>
+    <pre>
+% <input>erl -sname observer -hidden -setcookie MyCookie -run observer</input></pre>
     <p>
-      Choose which node to observe via <c>Nodes</c> menu. The <c>View/Refresh
-      Interval</c> controls how frequent the view should be updated.
+      Select the node to observe with menu <em>Nodes</em>. 
+      Menu <em>View &gt; Refresh interval</em> controls how often 
+      the view is to be updated.
       The refresh interval is set per viewer so you can
       have different settings for each viewer. To minimize the system
-      impact only the active viewer is updated and the other
-      views will be updated when activated.
+      impact, only the active viewer is updated. Other views are updated 
+      when activated.
     </p>
 
-    <p> In general the mouse buttons behaves as expected, use left click
-    to select objects, right click to pop up a menu with most used
-    choices and double click to bring up information about the
-    selected object. In most viewers with several columns you can change
-    sort order by left clicking on column header.
+    <p>The mouse buttons behave as expected. Use left-click
+    to select objects, right-click to get a menu with the most used
+    options, and double-click to display information about the
+    selected object. In most viewers with many columns, you can change
+    the sort order by left-clicking the column header.
     </p>
   </section>
 
   <section>
-    <title>Applications</title>
-    <p>The <c>Applications</c> view lists application information.
+    <title>System Tab</title>
+    <p>Tab <em>System</em> displays general information about the active Erlang node 
+    and its runtime system, such as build configuration, system capabilities, and 
+    overall use statistics.
+</p>
+  </section>
+
+  <section>
+    <title>Load Charts Tab</title>
+    <p>Tab <em>Load Charts</em> displays graphs of the current resource use on 
+    the active Erlang node.</p>
+    <p>Graph <c>Scheduler Utilization</c> shows scheduler use per scheduler, 
+    where each scheduler use has a unique color.</p>
+    <p>Graph <c>Memory Usage</c> shows the total memory use and per memory category
+    use, where each category has a unique color. The categories are as 
+    follows:</p>
+    <taglist>
+       <tag><c>Total</c></tag>
+       <item><p>The sum of all memory categories.</p></item>
+       <tag><c>Processes</c></tag>
+       <item><p>The sum of all process memory used.</p></item>
+       <tag><c>Atom</c></tag>
+       <item><p>The size used by the atom table.</p></item>
+       <tag><c>Binary</c></tag>
+       <item><p>The sum of all off-heap binaries allocated.</p></item>
+       <tag><c>Code</c></tag>
+       <item><p>The memory allocated for code storage.</p></item>
+       <tag><c>Ets</c></tag>
+       <item><p>The used memory for all ETS tables.</p></item>
+     </taglist>
+
+    <p>Graph <c>IO Usage</c> shows the current I/O load on the system.</p>
+  </section>
+
+  <section>
+    <title>Memory Allocators Tab</title>
+    <p>Tab <em>Memory Allocators</em> displays detailed information of the carrier 
+    size and current memory carriers. For details about memory carriers, 
+    see module
+    <seealso marker="erts:erts_alloc"><c>erts_alloc</c></seealso>
+    in application ERTS.</p>
+  </section>
+
+  <section>
+    <title>Applications Tab</title>
+    <p>Tab <em>Applications</em> presents application information.
     Select an application in the left list to display its supervisor
-    tree.
-    </p>
-    <p><c>Trace process</c> will add the selected process identifier
-    to <c>Trace Overview</c> view and the node the process resides on
-    will be added as well.
-    </p>
-    <p><c>Trace named process</c> will add the
-    registered name of the process. This can be useful when tracing on
-    several nodes, then processes with that name will be traced on all traced
-    nodes.
-    </p>
-    <p><c>Trace process tree</c> and <c>Trace named process
-    tree</c> will add the selected process and all processes below,
-    right of, it to  the <c>Trace Overview</c> view.
+    tree. The right-click options in the tree are as follows:
     </p>
+    <taglist>
+    <tag>Process info</tag>
+    <item><p>Opens a detailed information window on the selected process,
+    including the following:</p>
+    <taglist>
+      <tag>Process Information</tag>
+      <item><p>Shows the process information.</p></item>
+      <tag>Messages</tag>
+      <item><p>Shows the process messages.</p></item>
+      <tag>Dictionary</tag>
+      <item><p>Shows the process dictionary.</p></item>
+      <tag>Stack Trace</tag>
+      <item><p>Shows the process current stack trace.</p></item>
+      <tag>State</tag>
+      <item><p>Shows the process state.</p></item>
+      <tag>Log</tag>
+      <item><p>If enabled and available, shows the process SASL
+      log entries.</p></item>
+    </taglist>
+    </item>
+    <tag>Trace process</tag>
+    <item><p>Adds the selected process identifier to tab <em>Trace Overview</em> 
+    plus the node that the process resides on.</p></item>
+    <tag>Trace named process</tag>
+    <item><p>Adds the registered name of the process. This can be useful when tracing on
+    many nodes, as processes with that name are then traced on all traced nodes.</p></item>
+    <tag>Trace process tree</tag>
+    <item><p>Adds the selected process and all processes below,
+    right of it, to tab <em>Trace Overview</em>.</p></item>
+    <tag>Trace named process tree</tag>
+    <item><p>Adds the selected process and all processes below,
+    right of it, to tab <em>Trace Overview</em>.</p></item>
+    </taglist>
   </section>
 
   <section>
-    <title>Processes</title>
-    <p>The <c>Processes</c> view lists process information.
-    For each process the following information is presented:
+    <title>Processes Tab</title>
+    <p>Tab <em>Processes</em> lists process information in columns.
+    For each process the following information is displayed:
     </p>
     <taglist>
       <tag>Pid</tag>
-      <item>The process identifier.</item>
+      <item><p>The process identifier.</p></item>
       <tag>Reds</tag>
-      <item>This is the number of reductions that has been executed
-       on the process</item>
+      <item><p>The number of reductions executed on the process. 
+      This can be presented as accumulated values or as values since the last update.</p></item>
       <tag>Memory</tag>
-      <item>This is the size of the process in bytes, obtained by a
-       call to <c>process_info(Pid,memory)</c>.</item>
+      <item><p>The size of the process, in bytes, obtained by a
+       call to <c>process_info(Pid,memory)</c>.</p></item>
       <tag>MsgQ</tag>
-      <item>This is the length of the message queue for the process.</item>
+      <item><p>The length of the message queue for the process.</p></item>
     </taglist>
-    <note>
-      <p><em>Reds</em> can be presented as accumulated values or as values since last update.</p>
-    </note>
-    <p><c>Process info</c> open a detailed information window on the selected process.</p>
+
+    <p>Option <em>Process info</em> opens a detailed information window on the selected process, 
+      including the following:</p>
     <taglist>
       <tag>Process Information</tag>
-      <item>Shows the process information.</item>
+      <item><p>Shows the process information.</p></item>
       <tag>Messages</tag>
-      <item>Shows the process messages.</item>
+      <item><p>Shows the process messages.</p></item>
       <tag>Dictionary</tag>
-      <item>Shows the process dictionary.</item>
+      <item><p>Shows the process dictionary.</p></item>
       <tag>Stack Trace</tag>
-      <item>Shows the process current stack trace.</item>
+      <item><p>Shows the process current stack trace.</p></item>
       <tag>State</tag>
-      <item>Show the process state.</item>
+      <item><p>Shows the process state.</p></item>
       <tag>Log</tag>
-      <item>If enabled and available, show the process SASL log entries.</item>
+      <item><p>If enabled and available, shows the process SASL log entries.</p></item>
     </taglist>
+    
     <note>
-      <p><c>Log</c> needs SASL application to be started on the observed node, with log_mf_h as log handler.
-      The Observed node must be R16B02 or higher.
-      <c>rb</c> server must not be started on the observed node when clicking on menu 'Log/Toggle log view'.
-      <c>rb</c> server will be stopped on the observed node when exiting or changing observed node.
+      <p><em>Log</em> requires application SASL  to be started on the observed node,
+      with <c>log_mf_h</c> as log handler.
+      The Observed node must be Erlang/OTP R16B02 or higher.
+      The <c>rb</c> server must not be started on the observed node when clicking menu 
+      <em>Log &gt; Toggle log view</em>. The <c>rb</c> server is stopped on the observed node 
+      when exiting or changing the observed node.
       </p>
     </note>
-    <p><c>Trace Processes</c> will add the selected process identifiers to the <c>Trace Overview</c> view and the
-    node the processes reside on will be added as well.
-    <c>Trace Named Processes</c> will add the registered name of processes. This can be useful
-    when tracing is done on several nodes, then processes with that name will be traced on all traced nodes.
+
+    <p>Option <em>Trace Processes</em> adds the selected process identifiers to tab 
+    <em>Trace Overview</em> plus the node that the processes reside on.
     </p>
+    <p>Option <em>Trace Named Processes</em> adds the registered name of the processes. This can be 
+    useful when tracing is done on many nodes, as processes with that name are then traced on 
+    all traced nodes.</p>
+
   </section>
 
   <section>
-    <title>Table Viewer</title>
-    <p>The <c>Table Viewer</c> view lists tables. By default ets tables
-    are visible and unreadable, private ets, tables and tables created by the OTP
-    applications are not visible.  Use <c>View</c> menu to view "system"
-    ets tables, unreadable ets tables or mnesia tables.
+    <title>Table Viewer Tab</title>
+    <p>Tab <em>Table Viewer</em> lists tables. By default, ETS tables
+    are displayed whereas unreadable private ETS tables and tables created by OTP
+    applications are not diplayed. Use menu <em>View</em> to view "system"
+    ETS tables, unreadable ETS tables, or Mnesia tables.
     </p>
-    <p>Double click to view the content of the table. Select table and activate <c>View/Table Information</c>
-    menu to view table information.
-    </p>
-    <p>In the table viewer you can regexp search for objects, edit and delete objects.
+    <p>Double-click to view the table content. To view table information, select the table 
+    and activate menu <em>View &gt; Table information</em>.</p>
+    <p>You can use <seealso marker="stdlib:re">regular
+    expressions</seealso> and search for objects, and edit or delete them.
     </p>
   </section>
 
   <section>
-    <title>Trace Overview</title>
-    <p>The <c>Trace Overview</c> view handles tracing. Tracing is done
-    by selecting which processes to be traced and how to trace
-    them. You can trace messages, function calls and events, where
-    events are process related events such as <c>spawn</c>,
-    <c>exit</c> and several others.
-    </p>
-
-    <p>When you want to trace function calls, you also need to setup
-    <c>trace patterns</c>.  Trace patterns selects the function calls
-    that will be traced. The number of traced function calls can be
-    further reduced with <c>match specifications</c>.  Match
-    specifications can also be used to trigger additional information
+    <title>Trace Overview Tab</title>
+    <p>Tab <em>Trace Overview</em> handles tracing. Trace
+    by selecting the processes to be traced and how to trace
+    them. You can trace messages, function calls, and events, where
+    events are process-related events such as <c>spawn</c>,
+    <c>exit</c>, and many others.
+    </p>
+
+    <p>To trace function calls, you also need to set up
+    <em>trace patterns</em>. Trace patterns select the function calls
+    to be traced. The number of traced function calls can be
+    further reduced with <em>match specifications</em>. Match
+    specifications can also be used to trigger more information
     in the trace messages.
     </p>
-    <note><p>Trace patterns only applies to the traced processes.</p></note>
+    <note><p>Trace patterns only apply to the traced processes.</p></note>
 
     <p>
-      Processes are added from the <c>Applications</c> or <c>Processes</c> views.
-      A special <c>new</c> identifier, meaning all processes spawned after trace start,
-      can be added with the <c>Add 'new' Process</c> button.
+      Processes are added from the <em>Applications</em> or <em>Processes</em> tabs.
+      A special <em>new</em> identifier, meaning all processes spawned after trace 
+      start, can be added with button <em>Add 'new' Process</em>.
     </p>
     <p>
-      When adding processes, a window with trace options will pop up. The chosen options will
-      be set for the selected processes.
-      Process options can be changed by right clicking on a process.
+      When adding processes, a window with trace options is displayed. The chosen 
+      options are set for the selected processes.
+      Process options can be changed by right-clicking a process.
     </p>
     <p>
-      Processes added by process identifiers will add the nodes these
-      processes resides on in the node list. Additional nodes can be added by the <c>Add
-      Nodes</c> button.
+      Processes added by process identifiers add the nodes these
+      processes reside on in the node list. More nodes can be added by clicking 
+      button <em>Add Nodes</em>.
     </p>
     <p>
-      If function calls are traced, trace patterns must be added by <c>Add Trace Pattern</c> button.
-      Select a module, function(s) and a match specification.
-      If no functions are selected, all functions in the module will be traced.
+      If function calls are traced, trace patterns must be added by clicking button
+      <em>Add Trace Pattern</em>. Select a module, function(s), and a match specification.
+      If no functions are selected, all functions in the module are traced.
       A few basic match specifications are provided in the tool, and
       you can provide your own match specifications. The syntax of match
-      specifications are described in the <seealso
-      marker="erts:match_spec">ERTS User's Guide</seealso>.  To simplify
-      the writing of a match specification they can also be written as
-      <c>fun/1</c> see <seealso marker="stdlib:ms_transform">ms_transform manual page</seealso> for
-      further information.
-    </p>
-
-    <p>Use the <c>Start trace</c> button to start the trace.
-    By default trace output is written to a new window, tracing is stopped when the
-    window is closed, or with <c>Stop Trace</c> button.
-    Trace output can be changed via <c>Options/Output</c> menu.
-    The trace settings, including match specifications, can be saved to, or loaded from, a file.
-    </p>
-    <p>More information about tracing can be found in <seealso
-    marker="runtime_tools:dbg">dbg</seealso> and in the chapter "Match
-    specifications in Erlang" in <seealso marker="erts:match_spec">ERTS User's
-    Guide</seealso> and the
-    <seealso marker="stdlib:ms_transform">ms_transform manual page</seealso>.
+      specifications is described in the <seealso
+      marker="erts:match_spec"><c>ERTS User's Guide</c></seealso>. To simplify
+      the writing of a match specification, they can also be written as
+      <c>fun/1</c>. For details, see module
+      <seealso marker="stdlib:ms_transform">ms_transform</seealso>
+      in application STDLIB.
+    </p>
+
+    <p>Click button <em>Start Trace</em> to start the trace.
+    By default, trace output is written to a new window. Tracing is stopped 
+    when the window is closed, or when clicking button <em>Stop Trace</em>.
+    Trace output can be changed with menu <em>Options > Output</em>.
+    The trace settings, including match specifications, can be saved to, 
+    or loaded from, a file.
+    </p>
+    <p>For details about tracing, see module <seealso
+    marker="runtime_tools:dbg">dbg</seealso> in application Runtime_Tools
+    and in section "Match specifications in Erlang" in 
+    <seealso marker="erts:match_spec"><c>ERTS User's Guide</c></seealso>
+    and in module
+    <seealso marker="stdlib:ms_transform"><c>ms_transform</c></seealso>
+    in application STDLIB.
     </p>
   </section>
 </chapter>
diff --git a/lib/observer/doc/src/part.xml b/lib/observer/doc/src/part.xml
index 27b4e93d2d..d8ec7664d9 100644
--- a/lib/observer/doc/src/part.xml
+++ b/lib/observer/doc/src/part.xml
@@ -29,9 +29,8 @@
     <rev></rev>
   </header>
   <description>
-    <p>The <em>Observer</em> application contains tools for tracing
-      and investigation of distributed systems.</p>
   </description>
+  <xi:include href="introduction_ug.xml"/>
   <xi:include href="observer_ug.xml"/>
   <xi:include href="ttb_ug.xml"/>
   <xi:include href="etop_ug.xml"/>
diff --git a/lib/observer/doc/src/ref_man.xml b/lib/observer/doc/src/ref_man.xml
index 03d7dbe9df..37e20b2643 100644
--- a/lib/observer/doc/src/ref_man.xml
+++ b/lib/observer/doc/src/ref_man.xml
@@ -30,10 +30,7 @@
     <file>application.sgml</file>
   </header>
   <description>
-    <p>The <em>Observer</em> application contains tools for tracing
-      and investigation of distributed systems.</p>
-    <br></br>
-  </description>
+     </description>
   <xi:include href="observer_app.xml"/>
   <xi:include href="observer.xml"/>
   <xi:include href="ttb.xml"/>
diff --git a/lib/observer/doc/src/ttb.xml b/lib/observer/doc/src/ttb.xml
index 0a50a20716..2b637551db 100644
--- a/lib/observer/doc/src/ttb.xml
+++ b/lib/observer/doc/src/ttb.xml
@@ -4,8 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2002</year>
-      <year>2013</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -25,27 +24,28 @@
     </legalnotice>
 
     <title>ttb</title>
-    <prepared>Siri hansen, Bartlomiej Puzon</prepared>
+    <prepared>Siri Hansen, Bartlomiej Puzon</prepared>
     <responsible></responsible>
     <docno>1</docno>
     <approved></approved>
     <checked></checked>
     <date>2010-08-13</date>
     <rev>PA1</rev>
-    <file>ttb.sgml</file>
+    <file>ttb.xml</file>
   </header>
   <module>ttb</module>
   <modulesummary>A base for building trace tools for distributed systems.</modulesummary>
   <description>
-    <p>The Trace Tool Builder <c>ttb</c> is a base for building trace
+    <p>The Trace Tool Builder, <c>ttb</c>, is a base for building trace
       tools for distributed systems.
       </p>
-    <p>When using <c>ttb</c>, <c>dbg</c> shall not be used in parallel.</p>
+    <p>When using <c>ttb</c>, do not use module <c>dbg</c> in application
+      Runtime_Tools in parallel.</p>
   </description>
   <funcs>
     <func>
       <name>start_trace(Nodes, Patterns, FlagSpec, Opts) -> Result</name>
-      <fsummary>Start a trace port on each given node.</fsummary>
+      <fsummary>Start a trace port on each specified node.</fsummary>
       <type>
         <v>Result = see p/2</v>
         <v>Nodes = see tracer/2</v>
@@ -57,48 +57,56 @@
       </type>
       <desc>
         <p>This function is a shortcut allowing to start a trace with one command. Each
-          tuple in <c>Patterns</c> is converted to list which is in turn passed to
-          <c>ttb:tpl</c>.
-          The call:</p><code type="none">
-ttb:start_trace([Node, OtherNode],
-[{mod, foo, []}, {mod, bar, 2}],
-{all, call},
-[{file, File}, {handler,{fun myhandler/4, S}}])</code>
-          <p>is equivalent to</p> <code type="none">
-ttb:start_trace([Node, OtherNode], [{file, File}, {handler,{fun myhandler/4, S}}]),
+          tuple in <c>Patterns</c> is converted to a list, which in turn is passed to
+          <c>ttb:tpl/2,3,4</c>.</p>
+         <p>The call:</p>
+	 <pre>
+> <input>ttb:start_trace([Node, OtherNode],
+                  [{mod, foo, []}, {mod, bar, 2}],
+                  {all, call},
+                  [{file, File}, {handler,{fun myhandler/4, S}}]).</input></pre>
+         <p> is equivalent to:</p>
+	 <pre>
+> <input>ttb:start_trace([Node, OtherNode],
+                  [{file, File}, {handler,{fun myhandler/4, S}}]),
 ttb:tpl(mod, foo, []),
 ttb:tpl(mod, bar, 2, []),
-ttb:p(all, call)</code>
+ttb:p(all, call).</input></pre>
       </desc>
     </func>
+
     <func>
       <name>tracer() -> Result</name>
-      <fsummary>This is equivalent to tracer(node()).</fsummary>
+      <fsummary>Equivalent to tracer(node()).</fsummary>
       <desc>
-        <p>This is equivalent to <c>tracer(node())</c>.</p>
+        <p>Equivalent to <c>tracer(node())</c>.</p>
       </desc>
     </func>
+
     <func>
       <name>tracer(Shortcut) -> Result</name>
-      <fsummary>Handy shortcuts for common tracing settings</fsummary>
+      <fsummary>Handy shortcuts for common tracing settings.</fsummary>
       <type>
         <v>Shortcut = shell | dbg</v>
       </type>
       <desc>
+	<p>Handy shortcuts for common tracing settings.</p>
         <p><c>shell</c> is equivalent to <c>tracer(node(),[{file, {local, "ttb"}}, shell])</c>.</p>
         <p><c>dbg</c> is equivalent to <c>tracer(node(),[{shell, only}])</c>.</p>
       </desc>
     </func>
+
     <func>
       <name>tracer(Nodes) -> Result</name>
-      <fsummary>This is equivalent to tracer(Nodes,[]).</fsummary>
+      <fsummary>Equivalent to tracer(Nodes,[]).</fsummary>
       <desc>
-        <p>This is equivalent to <c>tracer(Nodes,[])</c>.</p>
+        <p>Equivalent to <c>tracer(Nodes,[])</c>.</p>
       </desc>
     </func>
+
     <func>
       <name>tracer(Nodes,Opts) -> Result</name>
-      <fsummary>Start a trace port on each given node.</fsummary>
+      <fsummary>Start a trace port on each specified node.</fsummary>
       <type>
         <v>Result = {ok, ActivatedNodes} | {error,Reason}</v>
         <v>Nodes   = atom() | [atom()] | all | existing | new</v>
@@ -120,98 +128,109 @@ ttb:p(all, call)</code>
         <v>ShellSpec = true | false | only</v>
       </type>
       <desc>
-        <p>This function starts a file trace port on all given nodes
-          and also points the system tracer for sequential tracing to
+        <p>Starts a file trace port on all specified nodes
+          and points the system tracer for sequential tracing to
           the same port.
           </p>
-        <p>The given <c>Filename</c> will be prefixed with the node
-          name. Default <c>Filename</c> is "ttb".
-          </p>
-        <p><c>File={wrap,Filename,Size,Count}</c> can be used if
-          the size of the trace logs must be limited. Default values are
-          <c>Size=128*1024</c> and <c>Count=8</c>.
-          </p>
-        <p>When tracing diskless nodes, <c>ttb</c> must be started
+	<p><em>Options:</em></p>
+	<taglist>
+       <tag><c>Filename</c></tag>
+       <item><p>The specified <c>Filename</c> is prefixed with the node name. 
+       Default <c>Filename</c> is <c>ttb</c>.</p></item>
+       <tag><c>File={wrap,Filename,Size,Count}</c></tag>
+       <item><p>Can be used if the size of the trace logs must be limited. 
+       Default values are
+       <c>Size=128*1024</c> and <c>Count=8</c>.</p></item>
+       <tag><c>Client</c></tag>
+       <item><p>When tracing diskless nodes, <c>ttb</c> must be started
           from an external "trace control node" with disk access, and
           <c>Client</c> must be <c>{local, File}</c>. All
           trace information is then sent to the trace control node where
-          it is written to file.
-          </p>
-        <p>The <c>process_info</c> option indicates if process
-          information should be collected. If <c>PI = true</c> (which is
+          it is written to file.</p></item>
+       <tag><c>process_info</c></tag>
+       <item><p>Indicates if process
+          information is to be collected. If <c>PI = true</c> (which is
           default), each process identifier <c>Pid</c> is replaced by a
           tuple <c>{Pid,ProcessInfo,Node}</c>, where <c>ProcessInfo</c>
-          is the process' registered name its globally registered name,
-          or its initial function. It is possible to turn off this
-          functionality by setting <c>PI = false</c>.
-        </p>
-        <p>The <c>{shell, ShellSpec}</c> option indicates that the trace messages should
-          be printed on the console as they are received by the tracing
-          process. This implies <c>{local, File}</c> trace client. If the ShellSpec
-          is <c>only</c> (instead of <c>true</c>), no trace logs are stored.
-        </p>
-        <p>The <c>shell</c> option is a shortcut for <c>{shell, true}</c>.</p>
-        <p>The <c>timer</c> option indicates that the trace should be
+          is the registered process name, its globally registered name,
+          or its initial function. To turn off this functionality, 
+          set <c>PI = false</c>.</p></item>
+       <tag><c>{shell, ShellSpec}</c></tag>
+       <item><p>Indicates that trace messages are to be printed on the 
+          console as they are received by the tracing process. This implies 
+	  trace client <c>{local, File}</c>. If <c>ShellSpec</c>
+          is <c>only</c> (instead of <c>true</c>), no trace logs are stored.</p></item>
+       <tag><c>shell</c></tag>
+       <item><p>Shortcut for <c>{shell, true}</c>.</p></item>
+       <tag><c>timer</c></tag>
+       <item><p>Indicates that the trace is to be
           automatically stopped after <c>MSec</c> milliseconds. <c>StopOpts</c>
-          are passed to <c>ttb:stop/2</c> command if specified (default is <c>[]</c>).
-          Note that the timing is approximate, as delays related to
+          are passed to command <c>ttb:stop/2</c> if specified (default is <c>[]</c>).
+          Notice that the timing is approximate, as delays related to
           network communication are always present. The timer starts after
-          <c>ttb:p/2</c> is issued, so you can set up your trace patterns before.
-        </p>
-        <p>The <c>overload_check</c> option allows to enable overload
+          <c>ttb:p/2</c> is issued, so you can set up your trace patterns before.</p></item>
+       <tag><c>overload_check</c></tag>
+       <item><p>Allows to enable overload
           checking on the nodes under trace. <c>Module:Function(check)</c>
-          is performed each <c>MSec</c> milliseconds. If the check returns
-          <c>true</c>, the tracing is disabled on a given node.<br/>
-          <c>Module:Function</c> should be able to handle at least three
-          atoms: <c>init</c>, <c>check</c> and <c>stop</c>. <c>init</c> and
-          <c>stop</c> give the user a possibility to initialize and clean
-          up the check environment.<br/>
-          When a node gets overloaded, it is not possible to issue <c>ttb:p</c>
-          nor any command from the <c>ttb:tp</c> family, as it would lead to
+          is performed each <c>MSec</c> millisecond. If the check returns
+          <c>true</c>, the tracing is disabled on a specified node.</p>
+          <p><c>Module:Function</c> must be able to handle at least three
+          atoms: <c>init</c>, <c>check</c>, and <c>stop</c>. <c>init</c> and
+          <c>stop</c> allows you to initialize and clean
+          up the check environment.</p>
+          <p>When a node gets overloaded, it is not possible to issue <c>ttb:p/2</c>
+          or any command from the <c>ttb:tp/2,3,4</c> family, as it would lead to
           inconsistent tracing state (different trace specifications on
-          different node).
-        </p>
-        <p>The <c>flush</c> option periodically flushes all file trace
-          port clients (see <c>dbg:flush_trace_port/1</c>). When enabled,
-          the buffers are freed each <c>MSec</c> milliseconds. This option is
-          not allowed with <c>{file, {local, File}}</c> tracing.
-        </p>
-        <p><c>{resume, FetchTimeout}</c> enables the autoresume feature.
-          Whenever enabled, remote nodes try to reconnect to the controlling node
-          in case they were restarted. The feature requires <c>runtime_tools</c>
-          application to be started (so it has to be present in the <c>.boot</c>
-          scripts if the traced nodes run with embedded erlang). If this is
-          not possible, resume may be performed manually by starting
-          <c>runtime_tools</c> remotely using <c>rpc:call/4</c>.<br/>
-          <c>ttb</c> tries to fetch all logs from a reconnecting node before
-          reinitializing the trace. This has to finish within FetchTimeout milliseconds
-          or is aborted<br/>
-          By default, autostart information is stored in a file called
+          different nodes).</p></item>
+       <tag><c>flush</c></tag>
+       <item><p>Periodically flushes all file trace
+          port clients (see
+	  <seealso marker="runtime_tools:dbg#flush_trace_port/1">
+	  <c>dbg:flush_trace_port/1</c></seealso>). When enabled,
+          the buffers are freed each <c>MSec</c> millisecond. This option is
+          not allowed with <c>{file, {local, File}}</c> tracing.</p></item>
+       <tag><c>{resume, FetchTimeout}</c></tag>
+       <item><p>Enables the autoresume feature.
+          When enabled, remote nodes try to reconnect to the controlling node
+          if they are restarted. The feature requires application Runtime_Tools
+          to be started (so it has to be present in the <c>.boot</c>
+          scripts if the traced nodes run with embedded Erlang). If this is
+          not possible, resume can be performed manually by starting
+          <c>Runtime_Tools</c> remotely using 
+	  <seealso marker="kernel:rpc#call/4"><c>rpc:call/4</c></seealso>.</p>
+          <p><c>ttb</c> tries to fetch all logs from a reconnecting node before
+          reinitializing the trace. This must finish within <c>FetchTimeout</c> 
+	  milliseconds or is aborted.</p>
+          <p>By default, autostart information is stored in a file named
           <c>ttb_autostart.bin</c> on each node. If this is not desired
-          (i.e. on diskless nodes), a custom module to handle autostart
+          (for example, on diskless nodes), a custom module handling autostart
           information storage and retrieval can be provided by specifying
-          <c>ttb_autostart_module</c> environment variable for the <c>runtime_tools</c>
-          application. The module has to respond to the following API:</p>
-          <taglist>
+          environment variable <c>ttb_autostart_module</c> for the application
+	  Runtime_Tools. The module must respond to the following API:</p>
+	  <taglist>
             <tag><c>write_config(Data) -> ok</c></tag>
-            <item>Store the provided data for further retrieval. It is
+            <item><p>Stores the provided data for further retrieval. It is
               important to realize that the data storage used must not
-              be affected by the node crash.</item>
+              be affected by the node crash.</p></item>
             <tag><c>read_config() -> {ok, Data} | {error, Error}</c></tag>
-            <item>Retrieve configuration stored with <c>write_config(Data)</c>.</item>
+            <item><p>Retrieves configuration stored with <c>write_config(Data)</c>.</p></item>
             <tag><c>delete_config() -> ok</c></tag>
-            <item>Delete configuration stored with <c>write_config(Data)</c>.
-              Note that after this call any subsequent calls to <c>read_config</c>
-              must return <c>{error, Error}</c>.
+            <item><p>Deletes configuration stored with <c>write_config(Data)</c>.
+              Notice that after this call any subsequent calls to <c>read_config</c>
+              must return <c>{error, Error}</c>.</p>
             </item>
-          </taglist>
-        <p>The <c>resume</c> option implies the default <c>FetchTimeout</c>, which is
+	  </taglist>
+	  <p><c>resume</c> implies the default <c>FetchTimeout</c>, which is
           10 seconds</p>
+       </item>
+     </taglist>
+          
       </desc>
     </func>
+
     <func>
       <name>p(Procs,Flags) -> Return</name>
-      <fsummary>Sets the given trace flags on the given processes.</fsummary>
+      <fsummary>Set the specified trace flags on the specified processes.</fsummary>
       <type>
         <v>Return = {ok,[{Procs,MatchDesc}]}</v>
         <v>Procs   = Process | [Process] | all | new | existing</v>
@@ -219,95 +238,101 @@ ttb:p(all, call)</code>
         <v>Flags   = Flag | [Flag]</v>
       </type>
       <desc>
-        <p>This function sets the given trace flags on the given
-          processes. The <c>timestamp</c> flag is always turned on.
+        <p>Sets the specified trace flags on the specified
+          processes. Flag <c>timestamp</c> is always turned on.
           </p>
-        <p>Please turn to the Reference manual for module <c>dbg</c>
-          for details about the possible trace flags. The parameter
-          <c>MatchDesc</c> is the same as returned from <c>dbg:p/2</c></p>
-        <p>Processes can be given as registered names, globally
-          registered names or process identifiers. If a registered name
-          is given, the flags are set on processes with this name on all
+        <p>See the Reference Manual for module 
+	<seealso marker="runtime_tools:dbg"><c>dbg</c></seealso>
+          and the possible trace flags. Parameter
+          <c>MatchDesc</c> is the same as returned from 
+	<c>dbg:p/2</c>.</p>
+        <p>Processes can be specified as registered names, globally
+          registered names, or process identifiers. If a registered name
+          is specified, the flags are set on processes with this name on all
           active nodes.</p>
-        <p>Issuing this command starts the timer for this trace if
-          <c>timer</c> option was specified with <c>tracer/2</c>.
+        <p>Issuing this command starts the timer for this trace if option
+          <c>timer</c> is specified with <c>tracer/2</c>.
         </p>
       </desc>
     </func>
+
     <func>
       <name>tp, tpl, ctp, ctpl, ctpg</name>
       <fsummary>Set and clear trace patterns.</fsummary>
       <desc>
-        <p>These functions should be used in combination with the
-          <c>call</c> trace flag for setting and clearing trace
-          patterns. When the <c>call</c> trace flag is set on a process,
-          function calls will be traced on that process if a trace
-          pattern has been set for the called function. Trace patterns
-          specifies how to trace a function by using match
+        <p>These functions are to be used with
+          trace flag <c>call</c> for setting and clearing trace
+          patterns. When trace flag <c>call</c> is set on a process,
+          function calls are traced on that process if a trace
+          pattern is set for the called function. Trace patterns
+          specify how to trace a function by using match
           specifications. Match specifications are described in the
-          User's Guide for the erlang runtime system <c>erts</c>.
+          <seealso marker="erts:users_guide"><c>ERTS User's Guide</c></seealso>.
           </p>
         <p>These functions are equivalent to the corresponding
-          functions in <c>dbg</c>, but all calls are stored in the
-          history. The history buffer makes it easy to create config
-          files so that the same trace environment can be setup several
-          times, e.g. if you want to compare two test runs. It also
+          functions in module
+	  <seealso marker="runtime_tools:dbg">dbg</seealso>,
+	  but all calls are stored in the
+          history. The history buffer makes it easy to create configuration
+          files; the same trace environment can be set up many
+          times, for example, to compare two test runs. It also
           reduces the amount of typing when using <c>ttb</c> from the
-          erlang shell.
+          Erlang shell.
           </p>
         <taglist>
           <tag><c>tp</c></tag>
-          <item>Set trace pattern on global function calls</item>
+          <item><p>Sets trace patterns on global function calls.</p></item>
           <tag><c>tpl</c></tag>
-          <item>Set trace pattern on local and global function calls</item>
+          <item><p>Sets trace patterns on local and global function calls.</p></item>
           <tag><c>ctp</c></tag>
-          <item>Clear trace pattern on local and global function
-           calls</item>
+          <item><p>Clears trace patterns on local and global function
+           calls.</p></item>
           <tag><c>ctpl</c></tag>
-          <item>Clear trace pattern on local function calls</item>
+          <item><p>Clears trace patterns on local function calls.</p></item>
           <tag><c>ctpg</c></tag>
-          <item>Clear trace pattern on global function calls</item>
+          <item><p>Clears trace patterns on global function calls.</p></item>
         </taglist>
-        <p>With <c>tp</c> and <c>tpl</c> one of match specification shortcuts
-          may be used (example: <c>ttb:tp(foo_module, caller)</c>). The shortcuts are:</p>
-          <taglist>
-	    <tag/>
+        <p>With <c>tp</c> and <c>tpl</c>, one of the match specification shortcuts
+          can be used (for example, <c>ttb:tp(foo_module, caller)</c>).</p>
+	  <p>The shortcuts are as follows:</p>
+          <list type="bulleted">
             <item><c>return</c> - for <c>[{'_',[],[{return_trace}]}]</c>
               (report the return value)</item>
-	    <tag/>
             <item><c>caller</c> - for <c>[{'_',[],[{message,{caller}}]}]</c>
               (report the calling function)</item>
-	    <tag/>
             <item><c>{codestr, Str}</c> - for <c>dbg:fun2ms/1</c> arguments
               passed as strings (example: <c>"fun(_) -> return_trace() end"</c>)
             </item>
-          </taglist>
+          </list>
       </desc>
     </func>
+
     <func>
       <name>list_history() -> History</name>
-      <fsummary>Returns all calls stored in history</fsummary>
+      <fsummary>Return all calls stored in history.</fsummary>
       <type>
         <v>History = [{N,Func,Args}]</v>
       </type>
       <desc>
         <p>All calls to <c>ttb</c> is stored in the history. This
           function returns the current content of the history. Any entry
-          can be re-executed with <c>run_history/1</c> or stored in a
-          config file with <c>write_config/2/3</c>.</p>
+          can be reexecuted with <c>run_history/1</c> or stored in a
+          configuration file with <c>write_config/2,3</c>.</p>
       </desc>
     </func>
+
     <func>
       <name>run_history(N) -> ok | {error, Reason}</name>
-      <fsummary>Executes one entry of the history</fsummary>
+      <fsummary>Execute one entry of the history.</fsummary>
       <type>
         <v>N = integer() | [integer()]</v>
       </type>
       <desc>
-        <p>Executes the given entry or entries from the history
-          list. History can be listed with <c>list_history/0</c>.</p>
+        <p>Executes the specified entry or entries from the history
+          list. To list history, use <c>list_history/0</c>.</p>
       </desc>
     </func>
+
     <func>
       <name>write_config(ConfigFile,Config)</name>
       <fsummary>Equivalent to write_config(ConfigFile,Config,[]).</fsummary>
@@ -315,9 +340,10 @@ ttb:p(all, call)</code>
         <p>Equivalent to <c>write_config(ConfigFile,Config,[])</c>.</p>
       </desc>
     </func>
+
     <func>
       <name>write_config(ConfigFile,Config,Opts) -> ok | {error,Reason}</name>
-      <fsummary>Creates a config file.</fsummary>
+      <fsummary>Create a configuration file.</fsummary>
       <type>
         <v>ConfigFile = string()</v>
         <v>Config = all | [integer()] | [{Mod,Func,Args}]</v>
@@ -328,92 +354,97 @@ ttb:p(all, call)</code>
         <v>Opt = append</v>
       </type>
       <desc>
-        <p>This function creates or extends a config file which can be
+        <p>Creates or extends a configuration file, which can be
           used for restoring a specific configuration later.
           </p>
-        <p>The content of the config file can either be fetched from
-          the history or given directly as a list of
+        <p>The contents of the configuration file can either be fetched from
+          the history or specified directly as a list of
           <c>{Mod,Func,Args}</c>.
           </p>
-        <p>If the complete history is to be stored in the config file
-          <c>Config</c> should be <c>all</c>. If only a selected number
-          of entries from the history should be stored, <c>Config</c>
-          should be a list of integers pointing out the entries to be
+        <p>If the complete history is to be stored in the configuration file,
+          <c>Config</c> must be <c>all</c>. If only a selected number
+          of entries from the history are to be stored, <c>Config</c>
+          must be a list of integers pointing out the entries to be
           stored.
           </p>
-        <p>If <c>Opts</c> is not given or if it is <c>[]</c>,
+        <p>If <c>Opts</c> is not specified or if it is <c>[]</c>,
           <c>ConfigFile</c> is deleted and a new file is created. If
-          <c>Opts = [append]</c>, <c>ConfigFile</c> will not be deleted.
-          The new information will be appended at the end of the file.</p>
+          <c>Opts = [append]</c>, <c>ConfigFile</c> is not deleted.
+          The new information is appended at the end of the file.</p>
       </desc>
     </func>
+
     <func>
       <name>run_config(ConfigFile) -> ok | {error,Reason}</name>
-      <fsummary>Executes all entries in a config file.</fsummary>
+      <fsummary>Execute all entries in a configuration file.</fsummary>
       <type>
         <v>ConfigFile = string()</v>
       </type>
       <desc>
-        <p>Executes all entries in the given config file. Note that the history
-          of the last trace is always available in the file named
-          <c>ttb_last_config</c>.</p>
+        <p>Executes all entries in the specified configuration file. 
+	Notice that the history of the last trace is always available 
+	in file <c>ttb_last_config</c>.</p>
       </desc>
     </func>
+
     <func>
       <name>run_config(ConfigFile,NumList) -> ok | {error,Reason}</name>
-      <fsummary>Executes selected entries from a config file.</fsummary>
+      <fsummary>Execute selected entries from a configuration file.</fsummary>
       <type>
         <v>ConfigFile = string()</v>
         <v>NumList = [integer()]</v>
       </type>
       <desc>
-        <p>Executes selected entries from the given config
+        <p>Executes selected entries from the specified configuration
           file. <c>NumList</c> is a list of integers pointing out the
           entries to be executed.
           </p>
-        <p>The content of a config file can be listed with
+        <p>To list the contents of a configuration file, use
           <c>list_config/1</c>.</p>
-        <p> Note that the history
-          of the last trace is always available in the file named
-          <c>ttb_last_config</c>.</p>
+        <p>Notice that the history of the last trace is always available 
+	   in file <c>ttb_last_config</c>.</p>
       </desc>
     </func>
+
     <func>
       <name>list_config(ConfigFile) -> Config | {error,Reason}</name>
-      <fsummary>Lists all entries in a config file.</fsummary>
+      <fsummary>List all entries in a configuration file.</fsummary>
       <type>
         <v>ConfigFile = string()</v>
         <v>Config = [{N,Func,Args}]</v>
       </type>
       <desc>
-        <p>Lists all entries in the given config file.</p>
+        <p>Lists all entries in the specified configuration file.</p>
       </desc>
     </func>
+
     <func>
       <name>write_trace_info(Key,Info) -> ok</name>
-      <fsummary>Writes any information to the <c>.ti</c>file.</fsummary>
+      <fsummary>Write any information to file <c>.ti</c>.</fsummary>
       <type>
         <v>Key = term()</v>
         <v>Info = Data | fun() -> Data</v>
         <v>Data = term()</v>
       </type>
       <desc>
-        <p>The <c>.ti</c> file contains <c>{Key,ValueList}</c>
-          tuples. This function adds <c>Data</c> to the ValueList
+        <p>File <c>.ti</c> contains <c>{Key,ValueList}</c>
+          tuples. This function adds <c>Data</c> to the <c>ValueList</c>
           associated with <c>Key</c>. All information written with this
-          function will be included in the call to the format handler.</p>
+          function is included in the call to the format handler.</p>
       </desc>
     </func>
+
     <func>
       <name>seq_trigger_ms() -> MatchSpec</name>
-      <fsummary>Equivalent to seq_trigger_ms(all)</fsummary>
+      <fsummary>Equivalent to seq_trigger_ms(all).</fsummary>
       <desc>
-        <p>Equivalent to <c>seq_trigger_ms(all)</c></p>
+        <p>Equivalent to <c>seq_trigger_ms(all)</c>.</p>
       </desc>
     </func>
+
     <func>
       <name>seq_trigger_ms(Flags) -> MatchSpec</name>
-      <fsummary>Returns a match_spec() which starts sequential tracing</fsummary>
+      <fsummary>Return a match_spec() which starts sequential tracing.</fsummary>
       <type>
         <v>MatchSpec = match_spec()</v>
         <v>Flags = all | SeqTraceFlag | [SeqTraceFlag]</v>
@@ -421,54 +452,55 @@ ttb:p(all, call)</code>
       </type>
       <desc>
         <p>A match specification can turn on or off sequential
-          tracing. This function returns a match specification which
-          turns on sequential tracing with the given <c>Flags</c>.
+          tracing. This function returns a match specification, which
+          turns on sequential tracing with the specified <c>Flags</c>.
           </p>
-        <p>This match specification can be given as the last argument
-          to <c>tp</c> or <c>tpl</c>. The activated <c>Item</c> will
-          then become a <em>trigger</em> for sequential tracing. This
-          means that if the item is called on a process with the
-          <c>call</c> trace flag set, the process will be "contaminated"
-          with the seq_trace token.
+        <p>This match specification can be specified as the last argument
+          to <c>tp</c> or <c>tpl</c>. The activated <c>Item</c>
+          then becomes a <em>trigger</em> for sequential tracing. This
+          means that if the item is called on a process with trace flag
+          <c>call</c> set, the process is "contaminated"
+          with token <c>seq_trace</c>.
           </p>
         <p>If <c>Flags = all</c>, all possible flags are set.
           </p>
-        <p>Please turn to the reference manual for the
-          <em><c>seq_trace</c></em> module in the <em><c>kernel</c></em>
-          application to see the possible values for
-          <c>SeqTraceFlag</c>.  For a description of the match_spec()
-          syntax, please turn to the <em>User's guide</em> for the
-          runtime system (<em>erts</em>). The chapter <em>Match Specification in Erlang</em> explains the general match
-          specification "language".
+        <p>The possible values for <c>SeqTraceFlag</c> are available in
+	<seealso marker="kernel:seq_trace"><c>seq_trace</c></seealso>.</p>
+	 <p>For a description of the <c>match_spec()</c> syntax, 
+	   see section
+	   <seealso marker="erts:match_spec"><c>Match Specifications in Erlang</c></seealso>
+	   in <c>ERTS</c>, which explains the general match specification "language".
           </p>
         <note>
           <p>The <em>system tracer</em> for sequential tracing is
             automatically initiated by <c>ttb</c> when a trace port is
-            started with <c>ttb:tracer/0/1/2</c>.</p>
+            started with <c>ttb:tracer/0,1,2</c>.</p>
         </note>
-        <p>Example of how to use the <c>seq_trigger_ms/0/1</c> function:</p>
-        <code type="none">
-(tiger@durin)5> ttb:tracer().
+        <p>An example of how to use function <c>seq_trigger_ms/0,1</c> follows:</p>
+        <pre>
+(tiger@durin)5> <input>ttb:tracer().</input>
 {ok,[tiger@durin]}
-(tiger@durin)6> ttb:p(all,call).
+(tiger@durin)6> <input>ttb:p(all,call).</input>
 {ok,{[all],[call]}}
-(tiger@durin)7> ttb:tp(mod,func,ttb:seq_trigger_ms()).
+(tiger@durin)7> <input>ttb:tp(mod,func,ttb:seq_trigger_ms()).</input>
 {ok,[{matched,1},{saved,1}]}
-(tiger@durin)8>         </code>
-        <p>Whenever <c>mod:func(...)</c> is called after this, the
-          seq_trace token will be set on the executing process.</p>
+(tiger@durin)8></pre>
+        <p>Whenever <c>mod:func(...)</c> is called after this,
+          token <c>seq_trace</c> is set on the executing process.</p>
       </desc>
     </func>
+
     <func>
       <name>stop()</name>
-      <fsummary>Equivalent to stop([])</fsummary>
+      <fsummary>Equivalent to stop([]).</fsummary>
       <desc>
         <p>Equivalent to <c>stop([])</c>.</p>
       </desc>
     </func>
+
     <func>
       <name>stop(Opts) -> stopped | {stopped, Dir}</name>
-      <fsummary>Stop tracing and fetch/format logs from all nodes</fsummary>
+      <fsummary>Stop tracing and fetch/format logs from all nodes.</fsummary>
       <type>
         <v>Opts = Opt | [Opt]</v>
         <v>Opt = nofetch | {fetch_dir, Dir} | format | {format, FormatOpts} | return_fetch_dir</v>
@@ -485,88 +517,103 @@ ttb:p(all, call)</code>
           form <c>yyyymmdd-hhmmss</c>. Even logs from nodes on the same
           machine as the trace control node are moved to this directory.
           The history list is saved to a file named <c>ttb_last_config</c>
-          for further reference (as it will be not longer accessible
-          through history and configuration management functions (like
+          for further reference (as it is no longer accessible
+          through history and configuration management functions, like
           <c>ttb:list_history/0</c>).
         </p>
-        <p>The <c>nofetch</c> option indicates that trace logs shall not be
-          collected after tracing is stopped.
-        </p>
-        <p>The <c>{fetch, Dir}</c> option allows to specify the directory
+	<p><em>Options:</em></p>
+	<taglist>
+       <tag><c>nofetch</c></tag>
+       <item><p>Indicates that trace logs are not to be
+          collected after tracing is stopped.</p></item>
+       <tag><c>{fetch, Dir}</c></tag>
+       <item><p>Allows specification of the directory
           to fetch the data to. If the directory already exists, an
-          error is thrown.
-        </p>
-        <p>The <c>format</c> option indicates that the trace logs
-          shall be formatted after tracing is stopped. All logs in the fetch directory will be merged.
-          You may use <c>{format, FormatOpts}</c> to pass additional
-          arguments to <c>format/2</c>.</p>
-        <p>The <c>return_fetch_dir</c> option indicates that the return value
-          should be <c>{stopped, Dir}</c> and not just <c>stopped</c>.
-          This implies <c>fetch</c>.
-        </p>
+          error is thrown.</p></item>
+       <tag><c>format</c></tag>
+       <item><p>Indicates the trace logs to be formatted after tracing 
+       is stopped. All logs in the fetch directory are merged.</p></item>
+       <tag><c>return_fetch_dir</c></tag>
+       <item><p>Indicates the return value
+          to be <c>{stopped, Dir}</c> and not just <c>stopped</c>.
+          This implies <c>fetch</c>.</p></item>
+     </taglist>
+
       </desc>
     </func>
+
     <func>
       <name>get_et_handler()</name>
-      <fsummary>Returns <c>et</c> handler.</fsummary>
+      <fsummary>Return the <c>et</c> handler.</fsummary>
       <desc>
-        <p>The <c>et</c> handler returned by the function may be used with <c>format/2</c>
-          or <c>tracer/2</c>. Example: <c>ttb:format(Dir, [{handler, ttb:get_et_handler()}])</c>.</p>
+        <p>Returns the <c>et</c> handler, which can be used with <c>format/2</c>
+          or <c>tracer/2</c>.</p>
+	  <p>Example: <c>ttb:format(Dir, [{handler, ttb:get_et_handler()}])</c>.</p>
       </desc>
     </func>
+
     <func>
       <name>format(File)</name>
-      <fsummary>Same as <c>format(File,[])</c>.</fsummary>
+      <fsummary>Equivalent to <c>format(File,[])</c>.</fsummary>
       <desc>
-        <p>Same as <c>format(File,[])</c>.</p>
+        <p>Equivalent to <c>format(File,[])</c>.</p>
       </desc>
     </func>
+
     <func>
       <name>format(File,Options) -> ok | {error, Reason}</name>
-      <fsummary>Format a binary trace log</fsummary>
+      <fsummary>Format a binary trace log.</fsummary>
       <type>
         <v>File = string() | [string()]</v>
-        <d>This can be the name of a binary log, a list of such logs or the name of a directory containing one or more binary logs.</d>
+        <d>This can be the name of a binary log, a list of such logs,
+	or the name of a directory containing one or more binary logs.</d>
         <v>Options = Opt | [Opt]</v>
         <v>Opt = {out,Out} | {handler,FormatHandler} | disable_sort</v>
         <v>Out = standard_io | string()</v>
         <v>FormatHandler = {Function, InitialState}</v>
         <v>Function = fun(Fd,Trace,TraceInfo,State) -> State</v>
         <v>Fd = standard_io | FileDescriptor</v>
-        <d>This is the file descriptor of the destination file <c>Out</c></d>
+        <d>File descriptor of the destination file <c>Out</c>.</d>
         <v>Trace = tuple()</v>
-        <d>This is the trace message. Please turn to the Reference manual for the <c>erlang</c>module for details.</d>
+        <d>The trace message. For details, see the Reference Manual for 
+	module <c>erlang</c>.</d>
         <v>TraceInfo = [{Key,ValueList}]</v>
-        <d>This includes the keys <c>flags</c>, <c>client</c> and <c>node</c>,  and if <c>handler</c> is given as option to the tracer function,  this is also included. In addition all information written with the <c>write_trace_info/2</c>function is included. </d>
+        <d>Includes the keys <c>flags</c>, <c>client</c>, and <c>node</c>.
+	If <c>handler</c> is specified as option to the tracer function, this 
+	is also included. Also, all information written with function
+	<c>write_trace_info/2</c> is included.</d>
       </type>
       <desc>
-        <p>Reads the given binary trace log(s). The logs are processed
-          in the order of their timestamp as long as <c>disable_sort</c>
-          option is not given.
+        <p>Reads the specified binary trace log(s). The logs are processed
+          in the order of their time stamps as long as option <c>disable_sort</c>
+          is not specified.
         </p>
         <p>If <c>FormatHandler = {Function,InitialState}</c>,
-          <c>Function</c> will be called for each trace message. If
-          <c>FormatHandler = get_et_handler()</c>, <c>et_viewer</c> in
-          the <em>Event Tracer</em> application (<c>et</c>) is used for presenting
+          <c>Function</c> is called for each trace message.</p>
+	  <p>If <c>FormatHandler = get_et_handler()</c>, <c>et_viewer</c> in
+          application ET is used for presenting
           the trace log graphically. <c>ttb</c> provides a few different
-          filters which can be selected from the Filter menu in the
-          <c>et_viewer</c>. If <c>FormatHandler</c> is not given, a
-          default handler is used which presents each trace message as a
-          line of text.
+          filters that can be selected from menu <em>Filters and scaling</em> 
+	  in the <c>et_viewer</c>.</p>
+	  <p>If <c>FormatHandler</c> is not specified, a
+          default handler is used presenting each trace message as a
+          text line.
           </p>
-        <p>The state returned from each call of <c>Function</c> is passed to the next call,
-          even if next call is to format a message from another log file.
+        <p>The state returned from each call of <c>Function</c> is passed to 
+	  the next call, even if the next call is to format a message from another 
+	  log file.
           </p>
-        <p>If <c>Out</c> is given, <c>FormatHandler</c> gets the
+        <p>If <c>Out</c> is specified, <c>FormatHandler</c> gets the
           file descriptor to <c>Out</c> as the first parameter.
           </p>
-        <p><c>Out</c> is ignored if <c>et</c> format handler is used.
+        <p><c>Out</c> is ignored if the <c>et</c> format handler is used.
           </p>
-        <p>Wrap logs can be formatted one by one or all in one go. To
-          format one of the wrap logs in a set, give the exact name of
-          the file. To format the whole set of wrap logs, give the name
-          with '*' instead of the wrap count. See examples in the
-          <c>ttb</c> User's Guide.</p>
+        <p>Wrap logs can be formatted one by one or all at once. To
+          format one of the wrap logs in a set, specify the exact file name.
+          To format the whole set of wrap logs, specify the name
+          with <c>*</c> instead of the wrap count. For examples, see the
+          <seealso marker="ttb_ug#format"><c>User's Guide</c></seealso>.
+	  </p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/observer/doc/src/ttb_ug.xml b/lib/observer/doc/src/ttb_ug.xml
index e2a28d67d0..34591ae8de 100644
--- a/lib/observer/doc/src/ttb_ug.xml
+++ b/lib/observer/doc/src/ttb_ug.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2013</year>
+      <year>2002</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,78 +32,85 @@
 
   <section>
     <title>Introduction</title>
-    <p>The Trace Tool Builder is a base for building trace tools for
-      single node or distributed erlang systems. It requires the
-      <c>runtime_tools</c> application to be available on the traced
+    <p>Trace Tool Builder is a base for building trace tools for
+      single node or distributed Erlang systems. It requires the
+      Runtime_Tools application to be available on the traced
       node.
       </p>
-    <p>The main features of the Trace Tool Builder are:</p>
+    <p>The following are the main features of Trace Tool Builder:</p>
     <list type="bulleted">
-      <item>Start tracing to file ports on several nodes with one
+      <item>Start tracing to file ports on many nodes with one
        function call.</item>
-      <item>Write additional information to a trace information file,
+      <item>Write more information to a trace information file,
        which is read during formatting.</item>
-      <item>Restoring of previous configuration by maintaining a
+      <item>Restore previous configuration by maintaining a
        history buffer and handling configuration files.</item>
-      <item>Some simple support for sequential tracing.</item>
-      <item>Formatting of binary trace logs and merging of logs from
+      <item>Provide some simple support for sequential tracing.</item>
+      <item>Format binary trace logs and merge logs from
        multiple nodes.</item>
     </list>
-    <p>The intention of the Trace Tool Builder is to serve
-      as a base for tailor made trace tools, but you may use it directly
-      from the erlang shell (it may mimic <c>dbg</c> behaviour while
-      still providing useful additions like match specification shortcuts).
-      The application only
-      allows the use of file port tracer, so if you would like
-      to use other types of trace clients you will be better off
-      using <c>dbg</c> directly instead.</p>
+    <p>The intention of Trace Tool Builder is to serve
+      as a base for tailor-made trace tools, but it can also be used directly
+      from the Erlang shell (it can mimic <c>dbg</c> behaviour while
+      still providing useful additions, such as match specification shortcuts).
+      Trace Tool Builder only allows the use of file port tracer, so to use 
+      other types of trace clients it is better to use <c>dbg</c> directly.</p>
   </section>
 
   <section>
     <title>Getting Started</title>
-    <p>The <c>ttb</c> module is the interface to all functions in the
-      Trace Tool Builder. To get started the least you need to do is to
-      start a tracer with <c>ttb:tracer/0/1/2</c>, and set the required
-      trace flags on the processes you want to trace with
-      <c>ttb:p/2</c>. Then, when the tracing is completed, you must stop
-      the tracer with <c>ttb:stop/0/1</c> and format the trace log with
-      <c>ttb:format/1/2</c> (as long as there is anything to format, of
-      course).
+    <p>Module <c>ttb</c> is the interface to all functions in
+      Trace Tool Builder.</p>
+      <p>To get started, the least you need to do is to
+      start a tracer with 
+      <seealso marker="ttb#tracer/0"><c>ttb:tracer/0,1,2</c></seealso>, 
+      and set the required
+      trace flags on the processes you want to trace with 
+      <seealso marker="ttb#p/2"><c>ttb:p/2</c></seealso>.</p>
+      <p>When the tracing is completed, stop the tracer with 
+      <seealso marker="ttb#stop/0"><c>ttb:stop/0,1</c></seealso> 
+      and format the trace log with 
+      <seealso marker="ttb#format/1"><c>ttb:format/1,2</c></seealso> 
+      (if there is anything to format).
       </p>
-    <p><c>ttb:tracer/0/1/2</c> opens a trace port on each node
-      that shall be traced. By default, trace messages are written
-      to binary files on remote nodes(the binary trace log).
-      </p>
-    <p><c>ttb:p/2</c> specifies which processes shall be
-      traced. Trace flags given in this call specify what to trace on
-      each process. You can call this function several times if you like
-      different trace flags to be set on different processes.
-      </p>
-    <p>If you want to trace function calls (i.e. if you have the
-      <c>call</c> trace flag set on any of your processes), you must
+      <p><em>Useful functions:</em></p>
+      <taglist>
+       <tag><c>ttb:tracer/0,1,2</c></tag>
+       <item><p>Opens a trace port on each node to be traced. By default, 
+       trace messages are written to binary files on remote nodes (the 
+       binary trace log).</p></item>
+       <tag><c>ttb:p/2</c></tag>
+       <item><p>Specifies the processes to be traced. Trace flags specified 
+       in this call specify what to trace on each process. This function can be 
+       called many times if you like different trace flags to be set on different 
+       processes.</p></item>
+       <tag><c>ttb:tp/2,3,4</c> or <c>ttb:tpl/2,3,4</c></tag>
+       <item><p>If you want to trace function calls (that is, if you have
+      trace flag <c>call</c> set on any process), you must
       also set trace patterns on the required function(s) with
-      <c>ttb:tp</c> or <c>ttb:tpl</c>. A function is only traced if it
-      has a trace pattern. The trace pattern specifies how to trace the
+      <seealso marker="ttb#/0"><c>ttb:tp/2,3,4</c></seealso> or 
+      <seealso marker="ttb#/0"><c>ttb:tpl/2,3,4</c></seealso>.
+      A function is only traced 
+      if it has a trace pattern. The trace pattern specifies how to trace the
       function by using match specifications. Match specifications are
-      described in the User's Guide for the erlang runtime system
-      <c>erts</c>.
-      </p>
-    <p><c>ttb:stop/0/1</c> stops tracing on all nodes, deletes all
-      trace patterns and flushes the trace port buffer.
-      </p>
-    <p><c>ttb:format/1/2</c> translates the binary trace logs into
-      something readable. By default <c>ttb</c> presents each trace
-      message as a line of text, but you can also write your own handler
-      to make more complex interpretations of the trace information. A
-      trace log can even be presented graphically via the Event Tracer
-      application. Note that if you give the <c>format</c> option to
-      <c>ttb:stop/1</c> the formatting is automatically done when
-      stopping <c>ttb</c>.
-      </p>
-
+      described in the 
+      <seealso marker="erts:users_guide">ERTS User's Guide</seealso>.</p></item>
+       <tag><c>ttb:stop/0,1</c></tag>
+       <item><p>Stops tracing on all nodes, deletes all trace patterns, and 
+       flushes the trace port buffer.</p></item>
+       <tag><c>ttb:format/1/2</c></tag>
+       <item><p>Translates the binary trace logs into something readable. 
+       By default, <c>ttb</c> presents each trace message as a line of text, 
+       but you can also write your own handler to make more complex interpretations 
+       of the trace information. A trace log can also be presented graphically 
+       with application Event Tracer (ET).</p>
+       <p>If option <c>format</c> is specified to <c>ttb:stop/1</c>, the formatting 
+       is automatically done when stopping <c>ttb</c>.</p></item>
+     </taglist>
+  
     <section>
-      <title>Example: Tracing the local node from the erlang shell</title>
-      <p>This small module is used in the example:</p>
+      <title>Tracing Local Node from Erlang Shell</title>
+      <p>The following small module is used in the subsequent example:</p>
       <code type="none">
 -module(m).
 -export([f/0]).
@@ -114,25 +121,25 @@ f() ->
          From ! {self(),Now}
    end.      </code>
       <p>The following example shows the basic use of <c>ttb</c> from
-        the erlang shell. Default options are used both for starting the
-        tracer and for formatting (the custom fetch dir is however provided).
-        This gives a trace log named <c>Node-ttb</c> in the newly-created
-        directory, where <c>Node</c> is the name of the node.  The
+        the Erlang shell. Default options are used both for starting the
+        tracer and for formatting (the custom fetch directory is however provided).
+        This gives a trace log named <c>Node-ttb</c> in the newly created
+        directory, where <c>Node</c> is the node name. The
         default handler prints the formatted trace messages in the
-        shell.</p>
-      <code type="none"><![CDATA[
+        shell:</p>
+      <pre>
 (tiger@durin)47> %% First I spawn a process running my test function
-(tiger@durin)47> Pid = spawn(m,f,[]).
-<0.125.0>
+(tiger@durin)47> <input>Pid = spawn(m,f,[]).</input>
+&lt;0.125.0>
 (tiger@durin)48> 
 (tiger@durin)48> %% Then I start a tracer...
-(tiger@durin)48> ttb:tracer().
+(tiger@durin)48> <input>ttb:tracer().</input>
 {ok,[tiger@durin]}
 (tiger@durin)49> 
 (tiger@durin)49> %% and activate the new process for tracing
 (tiger@durin)49> %% function calls and sent messages.
-(tiger@durin)49> ttb:p(Pid,[call,send]).
-{ok,[{<0.125.0>,[{matched,tiger@durin,1}]}]}
+(tiger@durin)49> <input>ttb:p(Pid,[call,send]).</input>
+{ok,[{&lt;0.125.0>,[{matched,tiger@durin,1}]}]}
 (tiger@durin)50> 
 (tiger@durin)50> %% Here I set a trace pattern on erlang:now/0
 (tiger@durin)50> %% The trace pattern is a simple match spec
@@ -140,33 +147,33 @@ f() ->
 (tiger@durin)50> %% traced. Refer to the reference_manual for
 (tiger@durin)50> %% the full list of match spec shortcuts
 (tiger@durin)50> %% available.
-(tiger@durin)51> ttb:tp(erlang,now,return).
+(tiger@durin)51> <input>ttb:tp(erlang,now,return).</input>
 {ok,[{matched,tiger@durin,1},{saved,1}]}
 (tiger@durin)52> 
 (tiger@durin)52> %% I run my test (i.e. send a message to
 (tiger@durin)52> %% my new process)
-(tiger@durin)52> Pid ! self().
-<0.72.0>
+(tiger@durin)52> <input>Pid ! self().</input>
+&lt;0.72.0>
 (tiger@durin)53> 
 (tiger@durin)53> %% And then I have to stop ttb in order to flush
 (tiger@durin)53> %% the trace port buffer
-(tiger@durin)53> ttb:stop([return, {fetch_dir, "fetch"}]).
+(tiger@durin)53> <input>ttb:stop([return, {fetch_dir, "fetch"}]).</input>
 {stopped, "fetch"}
 (tiger@durin)54> 
 (tiger@durin)54> %% Finally I format my trace log
-(tiger@durin)54> ttb:format("fetch").
-({<0.125.0>,{m,f,0},tiger@durin}) call erlang:now()
-({<0.125.0>,{m,f,0},tiger@durin}) returned from erlang:now/0 ->
+(tiger@durin)54> <input>ttb:format("fetch").</input>
+({&lt;0.125.0>,{m,f,0},tiger@durin}) call erlang:now()
+({&lt;0.125.0>,{m,f,0},tiger@durin}) returned from erlang:now/0 ->
 {1031,133451,667611}
-({<0.125.0>,{m,f,0},tiger@durin}) <0.72.0> ! 
-{<0.125.0>,{1031,133451,667611}}
-ok      ]]></code>
+({&lt;0.125.0>,{m,f,0},tiger@durin}) &lt;0.72.0> !
+{&lt;0.125.0>,{1031,133451,667611}}
+ok</pre>
     </section>
 
     <section>
-      <title>Example: Build your own tool</title>
-      <p>This small example shows a simple tool for "debug tracing",
-        i.e. tracing of function calls with return values.</p>
+      <title>Build Your Own Tool</title>
+      <p>The following example shows a simple tool for "debug tracing",
+        that is, tracing of function calls with return values:</p>
       <code type="none"><![CDATA[
 -module(mydebug).
 -export([start/0,trc/1,stop/0,format/1]).
@@ -228,124 +235,127 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
               "Return value :~p~n~n",
               [N,Ts,P,M,F,A,R]).      ]]></code>
       <p>To distinguish trace logs produced with this tool from other
-        logs, the <c>file</c> option is used in <c>tracer/2</c>. The
-        logs will therefore be fetched to a directory named
+        logs, option <c>file</c> is used in 
+	<seealso marker="ttb#tracer/2"><c>tracer/2</c></seealso>. The
+        logs are therefore fetched to a directory named
         <c>ttb_upload_debug_log-YYYYMMDD-HHMMSS</c>
       </p>
-      <p>By using the <c>handler</c> option when starting the tracer,
+      <p>By using option <c>handler</c> when starting the tracer,
         the information about how to format the file is stored in the
         trace information file (<c>.ti</c>). This is not necessary, as
-        it might be given at the time of formatting instead. It can
-        however be useful if you e.g. want to automatically format your
-        trace logs by using the <c>format</c> option in
-        <c>ttb:stop/1</c>. It also means that you don't need any
-        knowledge of the content of a binary log to be able to format it
-        the way it was intended. If the <c>handler</c> option is given
-        both when starting the tracer and when formatting, the one given
-        when formatting is used.
+        it can be specified when formatting instead. However, It can
+        be useful if you, for example, want to format trace logs automatically 
+	using option <c>format</c> in <c>ttb:stop/1</c>. Also, you do not need 
+	any knowledge of the content of a binary log to format it the way it 
+	is intended. If option <c>handler</c> is specified both when starting 
+	the tracer and when formatting, the one specified when formatting is used.
         </p>
-      <p>The <c>call</c> trace flag is set on all processes. This
-        means that any function activated with the <c>trc/1</c> command
-        will be traced on all existing and new processes.
+      <p>Trace flag <c>call</c> is set on all processes. This
+        means that any function activated with command <c>trc/1</c>
+        is traced on all existing and new processes.
         </p>
     </section>
   </section>
 
   <section>
-    <title>Running the Trace Tool Builder against a remote node</title>
+    <title>Running Trace Tool Builder against Remote Node</title>
     <p>The Observer application might not always be available on the
-      node that shall be traced (in the following called the "traced
-      node"). It is still possible to run the Trace Tool Builder from
+      node to be traced (in the following called the "traced
+      node"). However, Trace Tool Builder can still be run from
       another node (in the following called the "trace control node") as
-      long as
+      long as the following is fulfilled:
       </p>
     <list type="bulleted">
       <item>The Observer application is available on the trace control node.</item>
-      <item>The Runtime Tools application is available on both the
+      <item>The Runtime_Tools application is available on both the
        trace control node and the traced node.</item>
     </list>
-    <p>If the Trace Tool Builder shall be used against a remote node,
+    <p>If Trace Tool Builder is to be used against a remote node,
       it is highly recommended to start the trace control node as
       <em>hidden</em>. This way it can connect to the traced node
-      without the traced node "seeing" it, i.e. if the <c>nodes()</c>
-      BIF is called on the traced node, the trace control node will not
-      show. To start a hidden node, add the <c>-hidden</c> option to the
-      <c>erl</c> command, e.g.</p>
-    <code type="none">
-% erl -sname trace_control -hidden    </code>
+      without being "seen" by it, that is, if the <c>nodes()</c>
+      BIF is called on the traced node, the trace control node does not
+      show. To start a hidden node, add option <c>-hidden</c> to the
+      <c>erl</c> command, for example:</p>
+    <pre>
+% <input>erl -sname trace_control -hidden</input></pre>
 
     <section>
-      <title>Diskless node</title>
+      <title>Diskless Node</title>
       <p>If the traced node is diskless, <c>ttb</c> must be started from
-        a trace control node with disk access, and the <c>file</c> option
-        must be given to the <c>tracer/2</c> function with the value
-        <c>{local, File}</c>, e.g.</p>
-      <code type="none">
-(trace_control@durin)1> ttb:tracer(mynode@diskless,{file,{local,
-{wrap,"mytrace"}}}).
-{ok,[mynode@diskless]}      </code>
+        a trace control node with disk access, and option <c>file</c>
+        must be specified to function <c>tracer/2</c> with value
+        <c>{local, File}</c>, for example:</p>
+      <pre>
+(trace_control@durin)1> <input>ttb:tracer(mynode@diskless,
+                                   {file,{local,{wrap,"mytrace"}}}).</input>
+{ok,[mynode@diskless]}</pre>
     </section>
   </section>
 
   <section>
-    <title>Additional tracing options</title>
-    <p>When setting up a trace, several features may be turned on:</p>
+    <title>More Tracing Options</title>
+    <p>When setting up a trace, the following features can also be activated:</p>
       <list type="bulleted">
-        <item>time-constrained tracing,</item>
-        <item>overload protection,</item>
-        <item>autoresuming.</item>
+        <item>Time-constrained tracing</item>
+        <item>Overload protection</item>
+        <item>Autoresume</item>
+	<item><c>dbg</c> mode</item>
       </list>
       <section>
-        <title>Time-constrained tracing</title>
-        <p>Sometimes, it may be helpful to enable trace for a
-          given period of time (i.e. to monitor a system for 24 hours
-          or half of a second). This may be done by issuing additional
-          <c>{timer, TimerSpec}</c> option. If <c>TimerSpec</c> has the
+        <title>Time-Constrained Tracing</title>
+        <p>It can sometimes be helpful to enable trace for a
+          specified period of time (for example, to monitor a system for 24 hours
+          or half a second). This can be done with option
+          <c>{timer, TimerSpec}</c>. If <c>TimerSpec</c> has the
           form of <c>MSec</c>, the trace is stopped after <c>MSec</c>
-          milliseconds using <c>ttb:stop/0</c>. If any additional options
-          are provided (<c>TimerSpec = {MSec, Opts}</c>), <c>ttb:stop/1</c>
-          is called instead with <c>Opts</c> as the arguments. The timer
-          is started with <c>ttb:p/2</c>, so any trace patterns should
-          be set up before. <c>ttb:start_trace/4</c>
-          always sets up all pattern before invoking <c>ttb:p/2</c>.
-          Note that due to network and processing delays the the period
-          of tracing is approximate.
-          The example below shows how to set up a trace which will be
-          automatically stopped and formatted after 5 seconds
-        </p><code>
-(tiger@durin)1>ttb:start_trace([node()],
-                               [{erlang, now,[]}],
-                               {all, call},
-                               [{timer, {5000, format}}]).
-</code>
+          milliseconds using 
+	  <seealso marker="ttb#stop/0"><c>ttb:stop/0</c></seealso>. If more 
+	  options are provided (<c>TimerSpec = {MSec, Opts}</c>), 
+	  <seealso marker="ttb#stop/1"><c>ttb:stop/1</c></seealso>
+          is called instead with <c>Opts</c> as argument.</p>
+	  <p>The timer is started with 
+	  <seealso marker="ttb#p/2"><c>ttb:p/2</c></seealso>, so any trace patterns 
+	  must be set up in advance. 
+	  <seealso marker="ttb#start_trace/4"><c>ttb:start_trace/4</c></seealso>
+          always sets up all patterns before invoking <c>ttb:p/2</c>.</p>
+          <p>The following example shows how to set up a trace that is
+          automatically stopped and formatted after 5 seconds:
+        </p><pre>
+(tiger@durin)1> <input>ttb:start_trace([node()],
+                                [{erlang, now,[]}],
+                                {all, call},
+                                [{timer, {5000, format}}]).</input></pre>
+	<note><p>Because of network and processing delays, the period
+          of tracing is approximate.</p></note>
+
         </section>
         <section>
-          <title>Overload protection</title>
-          <p>When tracing live systems, special care needs to be always taken
-            not to overload a node with too heavy tracing. <c>ttb</c> provides
-            the <c>overload</c> option to help to address the problem.</p>
-          <p><c>{overload, MSec, Module, Function}</c> instructs the ttb backend
-            (called <c>observer_backend</c>, part of the <c>runtime_tools</c>
-            application) to perform overload check every <c>MSec</c> milliseconds.
-            If the check (namely <c>Module:Function(check)</c>) returns
+          <title>Overload Protection</title>
+          <p>When tracing live systems, always take special care to not
+            overload a node with too heavy tracing. <c>ttb</c> provides
+            option <c>overload</c> to address this problem.</p>
+          <p><c>{overload, MSec, Module, Function}</c> instructs the <c>ttb</c> back end
+            (a part of the <seealso marker="runtime_tools:index">Runtime_Tools</seealso>
+            application) to perform overload check every <c>MSec</c> millisecond.
+            If the check (named <c>Module:Function(check)</c>) returns
             <c>true</c>, tracing is disabled on the selected node.</p>
           <p>Overload protection activated on one node does not
             affect other nodes, where the tracing continues as normal.
-            <c>ttb:stop/0/1</c> fetches data from all clients, including everything
-            that has been collected before overload protection was activated.
-            Note that
-            changing trace details (with <c>ttb:p</c> and <c>ttb:tp/tpl...</c>)
-            once overload protection gets activated in one of the traced
-            nodes is not permitted in order not to allow trace setup
-            to be inconsistent between nodes.
-          </p>
-          <p><c>Module:Function</c> provided with the <c>overload</c> option must
-            handle three calls: <c>init</c>, <c>check</c> and <c>stop</c>. <c>init</c>
-            and <c>stop</c> allows to perform some setup and teardown required by
-            the check. An overload check module could look like this (note that
-            <c>check</c> is always called by the same process, so <c>put</c> and
-            <c>get</c> are possible).
-          </p><code>
+            <c>ttb:stop/0,1</c> fetches data from all clients, including everything
+            collected before the activation of overload protection.</p>
+
+	  <note><p>
+            It is not allowed to change trace details 
+	    (with <c>ttb:p</c> and <c>ttb:tp/tpl...</c>) once overload 
+	    protection is activated in one of the traced nodes. This is to 
+	    avoid trace setup being inconsistent between nodes.</p></note>
+
+          <p><c>Module:Function</c> provided with option <c>overload</c> must
+            handle three calls: <c>init</c>, <c>check</c>, and <c>stop</c>. <c>init</c>
+            and <c>stop</c> allow some setup and teardown required by
+            the check. An overload check module can look as follows:
+          </p><code type="none">
 -module(overload).
 -export([check/1]).
 
@@ -362,33 +372,37 @@ check(check) ->
     end;
 check(stop) ->
     get(pid) ! stop.</code>
+    <note><p>
+            <c>check</c> is always called by the same process, so <c>put</c> and
+            <c>get</c> are possible.</p></note>
         </section>
         <section>
           <title>Autoresume</title>
-          <p>It is possible that a node (probably a buggy one, hence traced)
-            crashes. In order to automatically resume tracing on the node
-            as soon as it gets back, <c>resume</c> has to be used. When
-            it is, the failing node tries to reconnect
-            to trace control node as soon as <c>runtime tools</c> is started.
-            This implies that <c>runtime_tools</c> must be included in
-            other node's startup chain (if it is not, one could still
-            resume tracing by starting <c>runtime_tools</c> manually,
-            i.e. by an RPC call).</p>
-          <p>In order not to loose the data that the failing node stored
-            up to the point of crash, the control node will try to fetch
-            it before restarting trace. This must happen within the allowed
-            time frame or is aborted (default is 10 seconds, can be customized with
-            <c>{resume, MSec}</c>). The data fetched this way is then
-            merged with all other traces.</p>
-          <p>Autostart feature requires additional data to be stored on
+          <p>A node can crash (probably a buggy one, hence traced).
+	    Use <c>resume</c> to resume tracing on the node automatically 
+	    when it gets back. The failing node then tries to reconnect
+            to trace control node when <c>Runtime_Tools</c> is started.
+            This implies that <c>Runtime_Tools</c> must be included in
+            the startup chain of other nodes (if not, you can still
+            resume tracing by starting <c>Runtime_Tools</c> manually,
+            that is, by an RPC call).</p>
+          <p>To not lose the data that the failing node stored
+            up to the point of crash, the control node tries to fetch
+            it before restarting trace. This must occur within the allowed
+            time frame, otherwise it is aborted (default is 10 seconds, but it
+	    can be changed with <c>{resume, MSec}</c>). The data fetched 
+	    this way is then merged with all other traces.</p>
+          <p>The autostart feature requires more data to be stored on
             traced nodes. By default, the data is stored automatically
-            to the file called "ttb_autostart.bin" in the traced node's cwd.
-            Users may decide to change this behaviour (i.e. on diskless
+            to the file named "ttb_autostart.bin" in the currect working directory
+	    (cwd) of the traced node.
+            Users can change this behaviour (that is, on diskless
             nodes) by specifying their own module to handle autostart data
             storage and retrieval (<c>ttb_autostart_module</c>
-            environment variable of <c>runtime_tools</c>). Please see the
-            ttb's reference manual to see the module's API. This example
-            shows the default handler</p>
+            environment variable of <c>runtime_tools</c>). For information 
+	    about the API, see module
+	    <seealso marker="ttb"><c>ttb</c></seealso>. 
+	    The following example shows the default handler:</p>
           <code>
 -module(ttb_autostart).
 -export([read_config/0,
@@ -407,54 +421,60 @@ read_config() ->
     end.
 
 write_config(Data) ->
-    file:write_file(?AUTOSTART_FILENAME, term_to_binary(Data)).
-          </code>
-          <p>Remember that file trace ports buffer the data
+    file:write_file(?AUTOSTART_FILENAME, term_to_binary(Data)).</code>
+
+         <note><p>Remember that file trace ports buffer the data
             by default. If the node crashes, trace messages are not
-            flushed to the binary log. If the chance of failure is
-            high, it might be a good idea to automatically flush
-            the buffers every now and then. Passing <c>{flush, MSec}</c>
-            as one of <c>ttb:tracer/2</c> option flushes all buffers
-            every <c>MSec</c> milliseconds.</p>
+            flushed to the binary log. If the risk of failure is
+            high, it can be a good idea to flush the buffers every 
+	    now and then automatically. Passing <c>{flush, MSec}</c>
+            as an option of <c>ttb:tracer/2</c> flushes all buffers
+            every <c>MSec</c> millisecond.</p></note>
         </section>
         <section>
-          <title>dbg mode</title>
-          <p>The <c>{shell, ShellType}</c> option allows to make <c>ttb</c>
-            operation similar to <c>dbg</c>. Using <c>{shell, true}</c>
+          <title>dbg Mode</title>
+          <p>Option <c>{shell, ShellType}</c> allows making <c>ttb</c>
+            operation similar to 
+            <seealso marker="runtime_tools:dbg"><c>dbg</c></seealso>.
+	    Using <c>{shell, true}</c>
             displays all trace messages in the shell before storing them.
             <c>{shell, only}</c> additionally disables message storage
-            (so that the tool behaves exactly like dbg). This is allowed
-            only with ip trace ports (<c>{trace, {local, File}}</c>).
+            (making the tool to behave exactly like <c>dbg</c>). This is 
+	    allowed only with IP trace ports (<c>{trace, {local, File}}</c>).
           </p>
-          <p>The command <c>ttb:tracer(dbg)</c> is a shortcut for the pure-dbg
-            mode (<c>{shell, only}</c>).</p>
+          <p>Command <c>ttb:tracer(dbg)</c> is a shortcut for the pure
+	  <c>dbg</c> mode (<c>{shell, only}</c>).</p>
         </section>
   </section>
 
   <section>
     <marker id="trace_info"></marker>
-    <title>Trace Information and the .ti File</title>
-    <p>In addition to the trace log file(s), a file with the extension
-      <c>.ti</c> is created when the Trace Tool Builder is started. This
-      is the trace information file. It is a binary file, and it
+    <title>Trace Information and File .ti</title>
+    <p>In addition to the trace log file(s), a file with extension
+      <c>.ti</c> is created when Trace Tool Builder is started. This
+      is the trace information file. It is a binary file, which
       contains the process information, trace flags used, the name of
-      the node to which it belongs and all information written with the
-      <c>write_trace_info/2</c> function. .ti files are always fetched
-      with other logs when the trace is stopped.
+      the node to which it belongs, and all information written with
+      function 
+      <seealso marker="ttb#write_trace_info/2"><c>ttb:write_trace_info/2</c></seealso>. 
+      <c>.ti</c> files are always fetched with other logs when the trace is stopped.
     </p>
     <p>Except for the process information, everything in the trace
       information file is passed on to the handler function when
-      formatting. The <c>TI</c> parameter is a list of
+      formatting. Parameter <c>TI</c> is a list of
       <c>{Key,ValueList}</c> tuples. The keys <c>flags</c>,
-      <c>handler</c>, <c>file</c> and <c>node</c> are used for
+      <c>handler</c>, <c>file</c>, and <c>node</c> are used for
       information written directly by <c>ttb</c>.
       </p>
-    <p>You can add information to the trace information file by
-      calling <c>write_trace_info/2</c>. Note that <c>ValueList</c>
-      always will be a list, and if you call <c>write_trace_info/2</c>
-      several times with the same <c>Key</c>, the <c>ValueList</c> will
-      be extended with a new value each time. Example:
+    <p>Information to the trace information file by
+      can be added by calling 
+      <seealso marker="ttb#write_trace_info/2"><c>ttb:write_trace_info/2</c></seealso>. 
+      Notice that <c>ValueList</c>
+      always is a list, and if you call <c>write_trace_info/2</c>
+      many times with the same <c>Key</c>, the <c>ValueList</c> is
+      extended with a new value each time.
       </p>
+      <p><em>Example:</em></p>
     <p><c>ttb:write_trace_info(mykey,1)</c> gives the entry
       <c>{mykey,[1]}</c> in <c>TI</c>. Another call,
       <c>ttb:write_trace_info(mykey,2)</c>, changes this entry to
@@ -467,15 +487,15 @@ write_config(Data) ->
     <p>If you want to limit the size of the trace logs, you can use
       wrap logs. This works almost like a circular buffer. You can
       specify the maximum number of binary logs and the maximum size of
-      each log. <c>ttb</c> will create a new binary log each time a log
-      reaches the maximum size. When the the maximum number of logs are
+      each log. <c>ttb</c> then creates a new binary log each time a log
+      reaches the maximum size. When the maximum number of logs are
       reached, the oldest log is deleted before a new one is created.
     </p>
-    <p>Note that the overall size of data generated by ttb may be greater
-      than the wrap specification would suggest - if a traced node restarts
-      and autoresume is enabled, old wrap log is always stored and
+    <note><p>The overall size of data generated by <c>ttb</c> can be greater
+      than the wrap specification suggests. If a traced node restarts
+      and autoresume is enabled, the old wrap log is always stored and
       a new one is created.
-    </p>
+    </p></note>
     <p>Wrap logs can be formatted one by one or all at once. See
       <seealso marker="#format">Formatting</seealso>.
       </p>
@@ -485,52 +505,61 @@ write_config(Data) ->
     <marker id="format"></marker>
     <title>Formatting</title>
     <p>Formatting can be done automatically when stopping <c>ttb</c>
-      (see <seealso marker="#fetch_format">Automatically collect and format logs from all nodes</seealso>), or explicitly by calling
-      the <c>ttb:format/1/2</c> function.
+      (see section
+      <seealso marker="#fetch_format">Automatically Collect and Format Logs from All Nodes</seealso>), or explicitly by calling function
+      <c>ttb:format/1,2</c>.
       </p>
     <p>Formatting means to read a binary log and present it in a
       readable format. You can use the default format handler in
       <c>ttb</c> to present each trace message as a line of text, or
       write your own handler to make more complex interpretations of the
-      trace information. You can even use the Event Tracer <c>et</c> to
-      present the trace log graphically (see <seealso marker="#et_viewer">Presenting trace logs with Event Tracer</seealso>).
+      trace information. You can also use application ET to
+      present the trace log graphically (see section
+      <seealso marker="#et_viewer">Presenting Trace Logs with Event Tracer</seealso>).
       </p>
-    <p>The first argument to <c>ttb:format/1/2</c> specifies which
+    <p>The first argument to <c>ttb:format/1,2</c> specifies which
       binary log(s) to format. This is usually the name of a directory
-      that ttb created during log fetch. Unless there is the <c>disable_sort</c>
-      option provided, the logs from different files are always sorted
-      according to timestamp in traces.
+      that <c>ttb</c> created during log fetch. Unless option 
+      <c>disable_sort</c> is provided, the logs from different files 
+      are always sorted according to time-stamp in traces.
       </p>
     <p>The second argument to <c>ttb:format/2</c> is a list of
-      options. The <c>out</c> option specifies the destination where the
-      formatted text shall be written. Default destination is
-      <c>standard_io</c>, but a filename can also be given. The
-      <c>handler</c> option specifies the format handler to use. If this
-      option is not given, the <c>handler</c> option given when starting
-      the tracer is used. If the <c>handler</c> option was not given
-      when starting the tracer either, a default handler is used, which
-      prints each trace message as a line of text. The <c>disable_sort</c>
-      option indicates that there logs should not be merged according to
-      timestamp, but processed one file after another (this might be
-      a bit faster).
+      options as follows:
       </p>
-    <p>A format handler is a fun taking four arguments. This fun will
-      be called for each trace message in the binary log(s). A simple
-      example which only prints each trace message could be like this:</p>
+      <taglist>
+       <tag><c>out</c></tag>
+       <item><p>Specifies the destination to write the formatted text. 
+       Default destination is <c>standard_io</c>, but a filename can 
+       also be specified.</p></item>
+       <tag><c>handler</c></tag>
+       <item><p>Specifies the format handler to use. If this option is 
+       not specified, option <c>handler</c> that is specified when starting
+      the tracer is used. If option <c>handler</c> is not specified
+      when starting the tracer either, a default handler is used, which
+      prints each trace message as a text line.</p></item>
+       <tag><c>disable_sort</c></tag>
+       <item><p>Indicates that the logs are not to be merged according to
+      time-stamp, but processed one file after another (this can be
+      a bit faster).</p></item>
+     </taglist>
+    <p>A format handler is a fun taking four arguments. This fun is
+      called for each trace message in the binary log(s). A simple
+      example that only prints each trace message can be as follows:</p>
     <code type="none">
 fun(Fd, Trace, _TraceInfo, State) ->
    io:format(Fd, "Trace: ~p~n", [Trace]),
    State
 end.    </code>
-    <p><c>Fd</c> is the file descriptor for the destination file, or
+    <p>Here, <c>Fd</c> is the file descriptor for the destination file, or
       the atom <c>standard_io</c>. <c>_TraceInfo</c> contains information
-      from the trace information file (see <seealso marker="#trace_info">Trace Information and the .ti File</seealso>). <c>State</c> is a state variable for the format
-      handler fun. The initial value of the <c>State</c> variable is
-      given with the handler option, e.g.</p>
+      from the trace information file (see section
+      <seealso marker="#trace_info">Trace Information and File .ti</seealso>). <c>State</c> is a state variable for the format
+      handler fun. The initial value of variable <c>State</c> is
+      specified with the handler option, for example:</p>
     <code type="none">
 ttb:format("tiger@durin-ttb", [{handler, {{Mod,Fun}, initial_state}}])
                                                      ^^^^^^^^^^^^^    </code>
-    <p>Another format handler could be used to calculate time spent by
+    <p>Another format handler can be used to calculate the time spent by
       the garbage collector:</p>
     <code type="none">
 fun(_Fd,{trace_ts,P,gc_start,_Info,StartTs},_TraceInfo,State) ->
@@ -541,111 +570,118 @@ fun(_Fd,{trace_ts,P,gc_start,_Info,StartTs},_TraceInfo,State) ->
       io:format("GC in process ~w: ~w milliseconds~n", [P,Time]),
       State -- [{P,StartTs}]
 end    </code>
-    <p>A more refined version of this format handler is the function
-      <c>handle_gc/4</c> in the module <c>multitrace.erl</c> which can
-      be found in the <c>src</c> directory of the Observer application.
+    <p>A more refined version of this format handler is function
+      <c>handle_gc/4</c> in module <c>multitrace.erl</c>
+      included in directory <c>src</c> of the Observer application.
       </p>
-    <p>The actual trace message is passed as the second argument (<c>Trace</c>).
-      The possible values of <c>Trace</c> are:</p>
+    <p>The trace message is passed as the second argument (<c>Trace</c>).
+      The possible values of <c>Trace</c> are the following:</p>
       <list type="bulleted">
-        <item>all trace messages described in <c>erlang:trace/3</c> documentation,
+        <item>All trace messages described in 
+	<seealso marker="erts:erlang#trace/3"><c>erlang:trace/3</c></seealso>
         </item>
-        <item><c>{drop, N}</c> if ip tracer is used (see <c>dbg:trace_port/2</c>),
+        <item><c>{drop, N}</c> if IP tracer is used (see 
+	<seealso marker="runtime_tools:dbg#trace_port/2"><c>dbg:trace_port/2</c></seealso>)
         </item>
-        <item><c>end_of_trace</c> received once when all trace messages have
-          been processed.</item>
+        <item><c>end_of_trace</c> received once when all trace messages are
+          processed</item>
       </list>
-    <p>By giving the format handler <c>ttb:get_et_handler()</c>, you can have the trace
-      log presented graphically with <c>et_viewer</c> in the Event
-      Tracer application (see <seealso marker="#et_viewer">Presenting trace logs with Event Tracer</seealso>).
+    <p>By giving the format handler 
+    <seealso marker="ttb#get_et_handler/0"><c>ttb:get_et_handler()</c></seealso>, 
+    you can have the trace
+      log presented graphically with <c>et_viewer</c> in the ET
+      application (see section
+      <seealso marker="#et_viewer">Presenting Trace Logs with Event Tracer</seealso>).
     </p>
-    <p>You may always decide not to format the whole trace data contained
-      in the fetch directory, but analyze single files instead. In order
-      to do so, a single file (or list of files) have to be passed as
-      the first argument to <c>format/1/2</c>.</p>
-    <p>Wrap logs can be formatted one by one or all in one go. To
-      format one of the wrap logs in a set, give the exact name of the
-      file. To format the whole set of wrap logs, give the name with '*'
-      instead of the wrap count. An example:
+    <p>You can always decide not to format the whole trace data contained
+      in the fetch directory, but analyze single files instead. To do so, 
+      a single file (or list of files) must be passed as the first argument 
+      to <c>format/1,2</c>.</p>
+    <p>Wrap logs can be formatted one by one or all at once. To
+      format one of the wrap logs in a set, specify the exact file name. 
+      To format the whole set of wrap logs, specify the name with <c>*</c>
+      instead of the wrap count.
       </p>
+      <p><em>Example:</em></p>
     <p>Start tracing:</p>
-    <code type="none">
-(tiger@durin)1> ttb:tracer(node(),{file,{wrap,"trace"}}).
+    <pre>
+(tiger@durin)1> <input>ttb:tracer(node(),{file,{wrap,"trace"}}).</input>
 {ok,[tiger@durin]}
-(tiger@durin)2> ttb:p(...)
-...    </code>
-    <p>This will give a set of binary logs, like:</p>
+(tiger@durin)2> <input>ttb:p(...)</input>
+...</pre>
+    <p>This gives a set of binary logs, for example:</p>
     <code type="none">
 [email protected]
 [email protected]
 [email protected]
 ...    </code>
     <p>Format the whole set of logs:</p>
-    <code type="none">
-1> ttb:format("tiger@durin-trace.*.wrp").
+    <pre>
+1> <input>ttb:format("tiger@durin-trace.*.wrp").</input>
 ....
 ok
-2>    </code>
+2>    </pre>
     <p>Format only the first log:</p>
-    <code type="none">
-1> ttb:format("[email protected]").
+    <pre>
+1> <input>ttb:format("[email protected]").</input>
 ....
 ok
-2>    </code>
+2>    </pre>
     <p>To merge all wrap logs from two nodes:</p>
-    <code type="none">
-1> ttb:format(["tiger@durin-trace.*.wrp","lion@durin-trace.*.wrp"]).
+    <pre>
+1> <input>ttb:format(["tiger@durin-trace.*.wrp","lion@durin-trace.*.wrp"]).</input>
 ....
 ok
-2>    </code>
+2>    </pre>
 
     <section>
       <marker id="et_viewer"></marker>
-      <title>Presenting trace logs with Event Tracer</title>
-      <p>For detailed information about the Event Tracer, please turn
-        to the User's Guide and Reference Manuals for the <c>et</c>
-        application.
+      <title>Presenting Trace Logs with Event Tracer</title>
+      <p>For detailed information about the Event Tracer, see the
+      <seealso marker="et:users_guide">ET</seealso> application.
         </p>
-      <p>By giving the format handler <c>ttb:get_et_handler()</c>, you can have the
-        trace log presented graphically with <c>et_viewer</c> in the
-        Event Tracer application. <c>ttb</c> provides a few different
-        filters which can be selected from the Filter menu in the
-        <c>et_viewer</c> window. The filters are names according to the
-        type of actors they present (i.e. what each vertical line in the
-        sequence diagram represent). Interaction between actors is shown
-        as red arrows between two vertical lines, and activities within
-        an actor are shown as blue text to the right of the actors line.
+      <p>By giving the format handler 
+        <seealso marker="ttb#get_et_handler/0"><c>ttb:get_et_handler()</c></seealso>, 
+        you can have the trace log presented graphically with 
+	<c>et_viewer</c> in the ET application.
+	<c>ttb</c> provides filters that can be selected from the 
+	menu <em>Filter</em> in the <c>et_viewer</c> window. The filters 
+	are names according to the type of actors they present 
+	(that is, what each vertical line in the sequence diagram represents). 
+	Interaction between actors is shown as red arrows between two 
+	vertical lines, and activities within an actor are shown as 
+	blue text to the right of the actors line.
         </p>
-      <p>The <c>processes</c> filter is the only filter which will
-        show all trace messages from a trace log. Each vertical line in
+      <p>The <c>processes</c> filter is the only filter showing all 
+        trace messages from a trace log. Each vertical line in
         the sequence diagram represents a process. Erlang messages,
-        spawn and link/unlink are typical interactions between
-        processes. Function calls, scheduling and garbage collection are
-        typical activities within a process. <c>processes</c> is the
-        default filter.
+        spawn, and link/unlink are typical interactions between
+        processes. Function calls, scheduling, and garbage collection, 
+	are typical activities within a process. <c>processes</c> is 
+	the default filter.
         </p>
-      <p>The rest of the filters will only show function calls and
+      <p>The remaining filters only show function calls and
         function returns. All other trace message are discarded. To get
-        the most out of these filters, <c>et_viewer</c> needs to known
+        the most out of these filters, <c>et_viewer</c> must know
         the caller of each function and the time of return. This can be
-        obtained by using both the <c>call</c> and <c>return_to</c>
-        flags when tracing. Note that the <c>return_to</c> flag only
-        works with local call trace, i.e. when trace patterns are set
+        obtained using both the <c>call</c> and <c>return_to</c>
+        flags when tracing. Notice that flag <c>return_to</c> only
+        works with local call trace, that is, when trace patterns are set
         with <c>ttb:tpl</c>.
         </p>
-      <p>The same result can be obtained by using the <c>call</c> flag
-        only and setting a match specification like this on local or
-        global function calls:</p>
-      <code type="none">
-1> dbg:fun2ms(fun(_) -> return_trace(),message(caller()) end).
-[{'_',[],[{return_trace},{message,{caller}}]}]      </code>
-      <p>This should however be done with care, since the
-        <c>{return_trace}</c> function in the match specification will
-        destroy tail recursiveness.
+      <p>The same result can be obtained by using the flag <c>call</c>
+        only and setting a match specification on local or
+        global function calls as follows:</p>
+      <pre>
+1> <input>dbg:fun2ms(fun(_) -> return_trace(),message(caller()) end).</input>
+[{'_',[],[{return_trace},{message,{caller}}]}]</pre>
+      <p>This must however be done with care, as function
+        <c>{return_trace}</c> in the match specification
+        destroys tail recursiveness.
         </p>
       <p>The <c>modules</c> filter shows each module as a vertical
         line in the sequence diagram. External function calls/returns
-        are shown as interactions between modules and internal function
+        are shown as interactions between modules, and internal function
         calls/returns are shown as activities within a module.
         </p>
       <p>The <c>functions</c> filter shows each function as a vertical
@@ -656,9 +692,9 @@ ok
       <p>The <c>mods_and_procs</c> and <c>funcs_and_procs</c> filters
         are equivalent to the <c>modules</c> and <c>functions</c>
         filters respectively, except that each module or function can
-        have several vertical lines, one for each process it resides on.
+        have many vertical lines, one for each process it resides on.
         </p>
-      <p>In the next example, modules <c>foo</c> and <c>bar</c> are used:</p>
+      <p>In the following example, modules <c>foo</c> and <c>bar</c> are used:</p>
       <code type="none">
 -module(foo).
 -export([start/0,go/0]).
@@ -673,8 +709,9 @@ go() ->
         go ->
             bar:f1(),
             go()
-    end.
-</code><code type="none">
+    end.</code>
+
+<code type="none">
 -module(bar).
 -export([f1/0,f3/0]).
 f1() ->
@@ -685,57 +722,56 @@ f2() ->
 f3() ->
     ok.</code>
 
-      <p>Now let's set up the trace.</p>
-<code>
-(tiger@durin)1>%%First we retrieve the Pid to limit traced processes set
-(tiger@durin)1>Pid = foo:start().
-(tiger@durin)2>%%Now we set up tracing
-(tiger@durin)2>ttb:tracer().
-(tiger@durin)3>ttb:p(Pid, [call, return_to, procs, set_on_spawn]).
-(tiger@durin)4>ttb:tpl(bar, []).
-(tiger@durin)5>%%Invoke our test function and see output with et viewer
-(tiger@durin)5>Pid ! go.
-(tiger@durin)6>ttb:stop({format, {handler, ttb:get_et_handler()}}).
-</code>
-
-      <p>This should render a result similar to the
-        following:
+      <p>Setting up the trace:</p>
+<pre>
+(tiger@durin)1> %%First we retrieve the Pid to limit traced processes set
+(tiger@durin)1> <input>Pid = foo:start().</input>
+(tiger@durin)2> %%Now we set up tracing
+(tiger@durin)2> <input>ttb:tracer().</input>
+(tiger@durin)3> <input>ttb:p(Pid, [call, return_to, procs, set_on_spawn]).</input>
+(tiger@durin)4> <input>ttb:tpl(bar, []).</input>
+(tiger@durin)5> %%Invoke our test function and see output with et viewer
+(tiger@durin)5> <input>Pid ! go.</input>
+(tiger@durin)6> <input>ttb:stop({format, {handler, ttb:get_et_handler()}}).</input></pre>
+
+      <p>This renders a result similar to the following:
         </p>
-      <p></p>
       <image file="et_processes.gif">
         <icaption>Filter: "processes"</icaption>
       </image>
+      <p></p>
       <image file="et_modsprocs.gif">
         <icaption>Filter: "mods_and_procs"</icaption>
       </image>
 
-      <p>Note, that we can use <c>ttb:start_trace/4</c> function to help
-        us here:</p>
-<code>
-(tiger@durin)1>Pid = foo:start().
-(tiger@durin)2>ttb:start_trace([node()],
-                               [{bar,[]}],
-                               {Pid, [call, return_to, procs, set_on_spawn]}
-                               {handler, ttb:get_et_handler()}).
-(tiger@durin)3>Pid ! go.
-(tiger@durin)4>ttb:stop(format).
-</code>
+      <p>Notice that function 
+      <seealso marker="ttb#start_trace/4"><c>ttb:start_trace/4</c></seealso> 
+      can be used as help as follows:</p>
+<pre>
+(tiger@durin)1> <input>Pid = foo:start().</input>
+(tiger@durin)2> <input>ttb:start_trace([node()],
+                                [{bar,[]}],
+                                {Pid, [call, return_to, procs, set_on_spawn]}
+                                {handler, ttb:get_et_handler()}).</input>
+(tiger@durin)3> <input>Pid ! go.</input>
+(tiger@durin)4> <input>ttb:stop(format).</input></pre>
 
     </section>
   </section>
 
   <section>
     <marker id="fetch_format"></marker>
-    <title>Automatically collect and format logs from all nodes</title>
-    <p>By default <c>ttb:stop/1</c> fetches  trace logs and
-      trace information files from all nodes. The logs are stored in a
-      new directory named <c>ttb_upload-Filename-Timestamp</c> under the working
-      directory of the trace control node. Fetching may be disabled by
-      providing the <c>nofetch</c> option to <c>ttb:stop/1</c>. User can
-      specify a fetch directory of his choice passing the
-      <c>{fetch_dir, Dir}</c> option.
+    <title>Automatically Collect and Format Logs from All Nodes</title>
+    <p>By default,
+
+    <seealso marker="ttb#stop/1"><c>ttb:stop/1</c></seealso> fetches trace logs 
+      and trace information files from all nodes. The logs are stored in a
+      new directory named <c>ttb_upload-Filename-Timestamp</c> under the 
+      working directory of the trace control node. Fetching can be disabled 
+      by providing option <c>nofetch</c> to <c>ttb:stop/1</c>. The user can
+      specify a fetch directory by passing option <c>{fetch_dir, Dir}</c>.
       </p>
-    <p>If the option <c>format</c> is given to <c>ttb:stop/1</c>, the
+    <p>If option <c>format</c> is specified to <c>ttb:stop/1</c>, the
       trace logs are automatically formatted after tracing is
       stopped.
     </p>
@@ -743,116 +779,122 @@ f3() ->
 
   <section>
     <title>History and Configuration Files</title>
-    <p>For the tracing functionality, <c>dbg</c> could be used instead
-      of the <c>ttb</c> for setting trace flags on processes and trace
-      patterns for call trace, i.e. the functions <c>p</c>, <c>tp</c>,
-      <c>tpl</c>, <c>ctp</c>, <c>ctpl</c> and <c>ctpg</c>. There are only
-      two things added by <c>ttb</c> for these functions:</p>
+    <p>For the tracing functionality,
+      <seealso marker="runtime_tools:dbg"><c>dbg</c></seealso>
+      can be used instead
+      of <c>ttb</c> for setting trace flags on processes and trace
+      patterns for call trace, that is, the functions 
+      <c>p</c>, <c>tp</c>, <c>tpl</c>, <c>ctp</c>, <c>ctpl</c>, and <c>ctpg</c>. Only the
+      following two things are added by <c>ttb</c> for these functions:</p>
       <list type="bulleted">
-        <item>all calls  are stored in the history buffer and can be
+        <item>All calls are stored in the history buffer and can be
           recalled and stored in a configuration file. This makes it
-          easy to setup the same trace environment e.g. if you want to
-          compare two test runs. It also reduces the amount of
-          typing when using <c>ttb</c> from the erlang shell;</item>
-        <item>shortcuts are provided for the most common match
-          specifications (in order not to force the user to use
-          <c>dbg:fun2ms</c> continually).</item>
+          easy to set up the same trace environment, for example, if you 
+	  want to compare two test runs. It also reduces the amount of
+          typing when using <c>ttb</c> from the Erlang shell.</item>
+        <item>Shortcuts are provided for the most common match
+          specifications (to not force you to use
+          <seealso marker="runtime_tools:dbg#fun2ms/1"><c>dbg:fun2ms</c></seealso> 
+	  continually).</item>
       </list>
-    <p>Use <c>list_history/0</c> to see the content of the history
-      buffer, and <c>run_history/1</c> to re-execute one of the entries.
+    <p>Use 
+      <seealso marker="ttb#list_history/0"><c>ttb:list_history/0</c></seealso> 
+      to see the content of the history buffer and 
+      <seealso marker="ttb#run_history/1"><c>ttb:run_history/1</c></seealso>
+      to re-execute one of the entries.
       </p>
     <p>The main purpose of the history buffer is the possibility to
       create configuration files. Any function stored in the history
       buffer can be written to a configuration file and used for
-      creating a specific configuration at any time with one single
+      creating a specific configuration at any time with a single
       function call.
       </p>
     <p>A configuration file is created or extended with
-      <c>write_config/2/3</c>. Configuration files are binary files
+      <seealso marker="ttb#write_config/2"><c>ttb:write_config/2,3</c></seealso>. 
+      Configuration files are binary files
       and can therefore only be read and written with functions provided
       by <c>ttb</c>.
       </p>
-    <p>You can write the complete content of the history buffer to a
-      config file by calling
-      <c>ttb:write_config(ConfigFile,all)</c>. And you can write
-      selected entries from the history by calling
+    <p>The complete content of the history buffer can be written to a
+      configuration file by calling
+      <c>ttb:write_config(ConfigFile,all)</c>. Selected entries from 
+      the history can be written by calling
       <c>ttb:write_config(ConfigFile,NumList)</c>, where
       <c>NumList</c> is a list of integers pointing out the history
       entries to write. Moreover, the history buffer is always dumped
-      to <c>ttb_last_config</c> when <c>ttb:stop/0/1</c> is called.
+      to <c>ttb_last_config</c> when <c>ttb:stop/0,1</c> is called.
       </p>
-    <p>User defined entries can also be written to a config file by
-      calling the function
-      <c>ttb:write_config(ConfigFile,ConfigList)</c> where
+    <p>User-defined entries can also be written to a configuration file 
+      by calling function
+      <c>ttb:write_config(ConfigFile,ConfigList)</c>, where
       <c>ConfigList</c> is a list of <c>{Module,Function,Args}</c>.
       </p>
     <p>Any existing file <c>ConfigFile</c> is deleted and a new file
-      is created when <c>write_config/2</c> is called. The option
-      <c>append</c> can be used if you wish to add something at the end
-      of an existing config file, e.g.
+      is created when <c>write_config/2</c> is called. Option
+      <c>append</c> can be used to add something at the end
+      of an existing configuration file, for example,
       <c>ttb:write_config(ConfigFile,What,[append])</c>.
       </p>
 
-    <section>
-      <title>Example: History and configuration files</title>
-      <p>See the content of the history buffer</p>
-      <code type="none"><![CDATA[
-(tiger@durin)191> ttb:tracer().                                    
+      <p><em>Example:</em></p>
+      <p>See the content of the history buffer:</p>
+      <pre>
+(tiger@durin)191> <input>ttb:tracer().</input>
 {ok,[tiger@durin]}
-(tiger@durin)192> ttb:p(self(),[garbage_collection,call]).               
-{ok,{[<0.1244.0>],[garbage_collection,call]}}
-(tiger@durin)193> ttb:tp(ets,new,2,[]).                                  
+(tiger@durin)192> <input>ttb:p(self(),[garbage_collection,call]).</input>
+{ok,{[&lt;0.1244.0>],[garbage_collection,call]}}
+(tiger@durin)193> <input>ttb:tp(ets,new,2,[]).</input>
 {ok,[{matched,1}]}
-(tiger@durin)194> ttb:list_history().
+(tiger@durin)194> <input>ttb:list_history().</input>
 [{1,{ttb,tracer,[tiger@durin,[]]}},
- {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}},
- {3,{ttb,tp,[ets,new,2,[]]}}]      ]]></code>
+ {2,{ttb,p,[&lt;0.1244.0>,[garbage_collection,call]]}},
+ {3,{ttb,tp,[ets,new,2,[]]}}]</pre>
       <p>Execute an entry from the history buffer:</p>
-      <code type="none"><![CDATA[
-(tiger@durin)195> ttb:ctp(ets,new,2).
+      <pre>
+(tiger@durin)195> <input>ttb:ctp(ets,new,2).</input>
 {ok,[{matched,1}]}
-(tiger@durin)196> ttb:list_history().
+(tiger@durin)196> <input>ttb:list_history().</input>
 [{1,{ttb,tracer,[tiger@durin,[]]}},
- {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}},
+ {2,{ttb,p,[&lt;0.1244.0>,[garbage_collection,call]]}},
  {3,{ttb,tp,[ets,new,2,[]]}},
  {4,{ttb,ctp,[ets,new,2]}}]
-(tiger@durin)197> ttb:run_history(3).
+(tiger@durin)197> <input>ttb:run_history(3).</input>
 ttb:tp(ets,new,2,[]) ->
-{ok,[{matched,1}]}      ]]></code>
+{ok,[{matched,1}]}</pre>
       <p>Write the content of the history buffer to a configuration
         file:</p>
-      <code type="none"><![CDATA[
-(tiger@durin)198> ttb:write_config("myconfig",all).
+      <pre>
+(tiger@durin)198> <input>ttb:write_config("myconfig",all).</input>
 ok
-(tiger@durin)199> ttb:list_config("myconfig").
+(tiger@durin)199> <input>ttb:list_config("myconfig").</input>
 [{1,{ttb,tracer,[tiger@durin,[]]}},
- {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}},
+ {2,{ttb,p,[&lt;0.1244.0>,[garbage_collection,call]]}},
  {3,{ttb,tp,[ets,new,2,[]]}},
  {4,{ttb,ctp,[ets,new,2]}},
- {5,{ttb,tp,[ets,new,2,[]]}}]      ]]></code>
+ {5,{ttb,tp,[ets,new,2,[]]}}]</pre>
       <p>Extend an existing configuration:</p>
-      <code type="none"><![CDATA[
-(tiger@durin)200> ttb:write_config("myconfig",[{ttb,tp,[ets,delete,1,[]]}],
-[append]).
+      <pre>
+(tiger@durin)200> <input>ttb:write_config("myconfig",[{ttb,tp,[ets,delete,1,[]]}],
+[append]).</input>
 ok
-(tiger@durin)201> ttb:list_config("myconfig").
+(tiger@durin)201> <input>ttb:list_config("myconfig").</input>
 [{1,{ttb,tracer,[tiger@durin,[]]}},
- {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}},
+ {2,{ttb,p,[&lt;0.1244.0>,[garbage_collection,call]]}},
  {3,{ttb,tp,[ets,new,2,[]]}},
  {4,{ttb,ctp,[ets,new,2]}},
  {5,{ttb,tp,[ets,new,2,[]]}},
- {6,{ttb,tp,[ets,delete,1,[]]}}]      ]]></code>
+ {6,{ttb,tp,[ets,delete,1,[]]}}]</pre>
       <p>Go back to a previous configuration after stopping Trace Tool
         Builder:</p>
-      <code type="none"><![CDATA[
-(tiger@durin)202> ttb:stop().
+      <pre>
+(tiger@durin)202> <input>ttb:stop().</input>
 ok
-(tiger@durin)203> ttb:run_config("myconfig").
+(tiger@durin)203> <input>ttb:run_config("myconfig").</input>
 ttb:tracer(tiger@durin,[]) ->
 {ok,[tiger@durin]}
 
-ttb:p(<0.1244.0>,[garbage_collection,call]) ->
-{ok,{[<0.1244.0>],[garbage_collection,call]}}
+ttb:p(&lt;0.1244.0>,[garbage_collection,call]) ->
+{ok,{[&lt;0.1244.0>],[garbage_collection,call]}}
 
 ttb:tp(ets,new,2,[]) ->
 {ok,[{matched,1}]}
@@ -866,133 +908,135 @@ ttb:tp(ets,new,2,[]) ->
 ttb:tp(ets,delete,1,[]) ->
 {ok,[{matched,1}]}
 
-ok      ]]></code>
+ok</pre>
       <p>Write selected entries from the history buffer to a
         configuration file:</p>
-      <code type="none"><![CDATA[
-(tiger@durin)204> ttb:list_history().          
+      <pre>
+(tiger@durin)204> <input>ttb:list_history().</input>
 [{1,{ttb,tracer,[tiger@durin,[]]}},
- {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}},
+ {2,{ttb,p,[&lt;0.1244.0>,[garbage_collection,call]]}},
  {3,{ttb,tp,[ets,new,2,[]]}},
  {4,{ttb,ctp,[ets,new,2]}},
  {5,{ttb,tp,[ets,new,2,[]]}},
  {6,{ttb,tp,[ets,delete,1,[]]}}]
-(tiger@durin)205> ttb:write_config("myconfig",[1,2,3,6]).
+(tiger@durin)205> <input>ttb:write_config("myconfig",[1,2,3,6]).</input>
 ok
-(tiger@durin)206> ttb:list_config("myconfig").
+(tiger@durin)206> <input>ttb:list_config("myconfig").</input>
 [{1,{ttb,tracer,[tiger@durin,[]]}},
- {2,{ttb,p,[<0.1244.0>,[garbage_collection,call]]}},
+ {2,{ttb,p,[&lt;0.1244.0>,[garbage_collection,call]]}},
  {3,{ttb,tp,[ets,new,2,[]]}},
  {4,{ttb,tp,[ets,delete,1,[]]}}]
-(tiger@durin)207>       ]]></code>
-    </section>
+(tiger@durin)207></pre>
   </section>
 
   <section>
     <title>Sequential Tracing</title>
     <p>To learn what sequential tracing is and how it can be used,
-      please turn to the reference manual for the
-      <em><c>seq_trace</c></em> module in the <em><c>kernel</c></em>
-      application.
+      see the Reference Manual for
+      <seealso marker="kernel:seq_trace"><c>seq_trace</c></seealso>.
       </p>
-    <p>The support for sequential tracing provided by the Trace Tool
-      Builder includes </p>
+    <p>The support for sequential tracing provided by Trace Tool
+      Builder includes the following:</p>
     <list type="bulleted">
       <item>Initiation of the system tracer. This is automatically
-       done when a trace port is started with <c>ttb:tracer/0/1/2</c></item>
-      <item>Creation of match specifications which activates
-       sequential tracing</item>
+       done when a trace port is started with 
+      <seealso marker="ttb#tracer/0"><c>ttb:tracer/0,1,2</c></seealso>.</item>
+      <item>Creation of match specifications that activates
+       sequential tracing.</item>
     </list>
-    <p>Starting sequential tracing requires that a tracer has been
-      started with the <c>ttb:tracer/0/1/2</c> function. Sequential
-      tracing can then either be started via a trigger function with a
-      match specification created with <c>ttb:seq_trigger_ms/0/1</c>,
-      or directly by using the <c>seq_trace</c> module in the
-      <c>kernel</c> application.
+    <p>Starting sequential tracing requires that a tracer is
+      started with function <c>ttb:tracer/0,1,2</c>. Sequential
+      tracing can then be started in either of the following ways:
       </p>
+      <list type="bulleted">
+	<item>Through a trigger function with a match specification 
+	created with 
+	<seealso marker="ttb#seq_trigger_ms/0"><c>ttb:seq_trigger_ms/0,1</c></seealso>.</item>
+	<item>Directly by using module
+	<seealso marker="kernel:seq_trace"><c>seq_trace</c></seealso>.</item>
+      </list>
 
-    <section>
-      <title>Example: Sequential tracing</title>
-      <p>In the following example, the function
+      <p><em>Example 1:</em></p>
+      <p>In the following example, function
         <c>dbg:get_tracer/0</c> is used as trigger for sequential
         tracing:</p>
-      <code type="none"><![CDATA[
-(tiger@durin)110> ttb:tracer().                               
+      <pre>
+(tiger@durin)110> <input>ttb:tracer().</input>
 {ok,[tiger@durin]}
-(tiger@durin)111> ttb:p(self(),call).                               
-{ok,{[<0.158.0>],[call]}}
-(tiger@durin)112> ttb:tp(dbg,get_tracer,0,ttb:seq_trigger_ms(send)).
+(tiger@durin)111> <input>ttb:p(self(),call).</input>
+{ok,{[&lt;0.158.0>],[call]}}
+(tiger@durin)112> <input>ttb:tp(dbg,get_tracer,0,ttb:seq_trigger_ms(send)).</input>
 {ok,[{matched,1},{saved,1}]}
-(tiger@durin)113> dbg:get_tracer(), seq_trace:reset_trace().         
+(tiger@durin)113> <input>dbg:get_tracer(), seq_trace:reset_trace().</input>
 true
-(tiger@durin)114> ttb:stop(format).
-({<0.158.0>,{shell,evaluator,3},tiger@durin}) call dbg:get_tracer()
-SeqTrace [0]: ({<0.158.0>,{shell,evaluator,3},tiger@durin}) 
-{<0.237.0>,dbg,tiger@durin} ! {<0.158.0>,{get_tracer,tiger@durin}} 
+(tiger@durin)114> <input>ttb:stop(format).</input>
+({&lt;0.158.0>,{shell,evaluator,3},tiger@durin}) call dbg:get_tracer()
+SeqTrace [0]: ({&lt;0.158.0>,{shell,evaluator,3},tiger@durin})
+{&lt;0.237.0>,dbg,tiger@durin} ! {&lt;0.158.0>,{get_tracer,tiger@durin}}
 [Serial: {0,1}]
-SeqTrace [0]: ({<0.237.0>,dbg,tiger@durin}) 
-{<0.158.0>,{shell,evaluator,3},tiger@durin} ! {dbg,{ok,#Port<0.222>}} 
+SeqTrace [0]: ({&lt;0.237.0>,dbg,tiger@durin})
+{&lt;0.158.0>,{shell,evaluator,3},tiger@durin} ! {dbg,{ok,#Port&lt;0.222>}}
 [Serial: {1,2}]
 ok
-(tiger@durin)116>       ]]></code>
-      <p>Starting sequential tracing with a trigger is actually more
+(tiger@durin)116></pre>
+      <p><em>Example 2:</em></p>
+      <p>Starting sequential tracing with a trigger is more
         useful if the trigger function is not called directly from the
         shell, but rather implicitly within a larger system. When
         calling a function from the shell, it is simpler to start
-        sequential tracing directly, e.g.</p>
-      <code type="none"><![CDATA[
-(tiger@durin)116> ttb:tracer().                               
+        sequential tracing directly, for example, as follows:</p>
+      <pre>
+(tiger@durin)116> <input>ttb:tracer().</input>
 {ok,[tiger@durin]}
-(tiger@durin)117> seq_trace:set_token(send,true), dbg:get_tracer(), 
-seq_trace:reset_trace().
+(tiger@durin)117> <input>seq_trace:set_token(send,true), dbg:get_tracer(),
+seq_trace:reset_trace().</input>
 true
-(tiger@durin)118> ttb:stop(format).
-SeqTrace [0]: ({<0.158.0>,{shell,evaluator,3},tiger@durin}) 
-{<0.246.0>,dbg,tiger@durin} ! {<0.158.0>,{get_tracer,tiger@durin}} 
+(tiger@durin)118> <input>ttb:stop(format).</input>
+SeqTrace [0]: ({&lt;0.158.0>,{shell,evaluator,3},tiger@durin})
+{&lt;0.246.0>,dbg,tiger@durin} ! {&lt;0.158.0>,{get_tracer,tiger@durin}}
 [Serial: {0,1}]
-SeqTrace [0]: ({<0.246.0>,dbg,tiger@durin}) 
-{<0.158.0>,{shell,evaluator,3},tiger@durin} ! {dbg,{ok,#Port<0.229>}} 
+SeqTrace [0]: ({&lt;0.246.0>,dbg,tiger@durin})
+{&lt;0.158.0>,{shell,evaluator,3},tiger@durin} ! {dbg,{ok,#Port&lt;0.229>}}
 [Serial: {1,2}]
 ok
-(tiger@durin)120>       ]]></code>
-      <p>In both examples above, the <c>seq_trace:reset_trace/0</c>
-        resets the trace token immediately after the traced function in
-        order to avoid lots of trace messages due to the printouts in
-        the erlang shell.
+(tiger@durin)120></pre>
+      <p>In both previous examples, <c>seq_trace:reset_trace/0</c>
+        resets the trace token immediately after the traced function
+        to avoid many trace messages because of the printouts in
+        the Erlang shell.
         </p>
-      <p>All functions in the <c>seq_trace</c> module, except
-        <c>set_system_tracer/1</c>, can be used after the trace port has
-        been started with <c>ttb:tracer/0/1/2</c>.
+      <p>All functions in module <c>seq_trace</c>, except
+        <c>set_system_tracer/1</c>, can be used after the trace port
+        is started with <c>ttb:tracer/0,1,2</c>.
         </p>
-    </section>
   </section>
 
   <section>
-    <title>Example: Multipurpose trace tool</title>
-    <p>The module <c>multitrace.erl</c> which can be found in the
-      <c>src</c> directory of the Observer application implements a
+    <title>Multipurpose Trace Tool</title>
+    <p>Module <c>multitrace</c> in
+      directory <c>src</c> of the Observer application provides a
       small tool with three possible trace settings. The trace messages
-      are written to binary files which can be formatted with the
-      function <em><c>multitrace:format/1/2</c></em>.
+      are written to binary files, which can be formatted with
+      function <c>multitrace:format/1,2</c>:
       </p>
     <taglist>
-      <tag><em><c>multitrace:debug(What)</c></em></tag>
-      <item>Start calltrace on all processes and trace the given
+      <tag><c>multitrace:debug(What)</c></tag>
+      <item><p>Start calltrace on all processes and trace the specified
        function(s). The format handler used is
-      <c>multitrace:handle_debug/4</c> which prints each call and
-       return. <c>What</c> must be an item or a list of items to trace,
-       given on the format <c>{Module,Function,Arity}</c>,
-      <c>{Module,Function}</c> or just <c>Module</c>.</item>
-      <tag><em><c>multitrace:gc(Procs)</c></em></tag>
-      <item>Trace garbage collection on the given process(es). The
-       format handler used is <c>multitrace:handle_gc/4</c> which
-       prints start and stop and the time spent for each GC.</item>
-      <tag><em><c>multitrace:schedule(Procs)</c></em></tag>
-      <item>Trace in- and out-scheduling on the given process(es). The
-       format handler used is <c>multitrace:handle_schedule/4</c> which
-       prints each in and out scheduling with process, timestamp and
+      <c>multitrace:handle_debug/4</c> that prints each call and
+       returns. <c>What</c> must be an item or a list of items to trace,
+       specified on the format <c>{Module,Function,Arity}</c>,
+      <c>{Module,Function}</c>, or only <c>Module</c>.</p></item>
+      <tag><c>multitrace:gc(Procs)</c></tag>
+      <item><p>Trace garbage collection on the specified process(es). The
+       format handler used is <c>multitrace:handle_gc/4</c> that
+       prints start, stop, and the time spent for each garbage collection.</p></item>
+      <tag><c>multitrace:schedule(Procs)</c></tag>
+      <item><p>Trace in-scheduling and out-scheduling on the specified process(es). 
+       The format handler used is <c>multitrace:handle_schedule/4</c> that
+       prints each in-scheduling and out-scheduling with process, time-stamp, and
        current function. It also prints the total time each traced
-       process was scheduled in.</item>
+       process was scheduled in.</p></item>
     </taglist>
   </section>
 </chapter>
diff --git a/lib/observer/src/observer_alloc_wx.erl b/lib/observer/src/observer_alloc_wx.erl
index 8d5c8a9037..d37623d1cc 100644
--- a/lib/observer/src/observer_alloc_wx.erl
+++ b/lib/observer/src/observer_alloc_wx.erl
@@ -30,19 +30,23 @@
 
 -record(state,
 	{
-	  offset = 0.0,
+	  time = #ti{},
 	  active = false,
 	  parent,
-	  windows,
-	  data = {0, queue:new()},
+	  wins,
+	  mem,
+	  samples,
 	  panel,
 	  paint,
 	  appmon,
 	  async
 	}).
 
--define(ALLOC_W,  1).
--define(UTIL_W,  2).
+-define(ID_REFRESH_INTERVAL, 102).
+
+-import(observer_perf_wx,
+	[make_win/4, setup_graph_drawing/1, refresh_panel/4, interval_dialog/2,
+	 add_data/5, precalc/4]).
 
 start_link(Notebook, Parent) ->
     wx_object:start_link(?MODULE, [Notebook, Parent], []).
@@ -51,34 +55,44 @@ init([Notebook, Parent]) ->
     try
 	Panel = wxPanel:new(Notebook),
 	Main  = wxBoxSizer:new(?wxVERTICAL),
-	Style = ?wxFULL_REPAINT_ON_RESIZE bor ?wxCLIP_CHILDREN,
-	Carrier = wxPanel:new(Panel, [{winid, ?ALLOC_W}, {style,Style}]),
-	Utilz = wxPanel:new(Panel, [{winid, ?UTIL_W}, {style,Style}]),
 	BorderFlags = ?wxLEFT bor ?wxRIGHT,
-	wxSizer:add(Main, Carrier, [{flag, ?wxEXPAND bor BorderFlags bor ?wxTOP},
-				    {proportion, 1}, {border, 5}]),
-
-	wxSizer:add(Main, Utilz, [{flag, ?wxEXPAND bor BorderFlags},
-				  {proportion, 1}, {border, 5}]),
+	Carrier = make_win(alloc, Panel, Main, BorderFlags bor ?wxTOP),
+	Utilz = make_win(utilz, Panel, Main, BorderFlags),
 
 	MemWin = {MemPanel,_} = create_mem_info(Panel),
 	wxSizer:add(Main, MemPanel, [{flag, ?wxEXPAND bor BorderFlags bor ?wxBOTTOM},
 				     {proportion, 1}, {border, 5}]),
 	wxWindow:setSizer(Panel, Main),
-
-	PaintInfo = observer_perf_wx:setup_graph_drawing([Carrier, Utilz]),
-	{Panel, #state{parent=Parent,
-		       panel =Panel,
-		       windows = {Carrier, Utilz, MemWin},
-		       paint=PaintInfo}
+	Windows = [Carrier, Utilz],
+	PaintInfo = setup_graph_drawing(Windows),
+	{Panel, #state{parent= Parent,
+		       panel = Panel,
+		       wins  = Windows,
+		       mem   = MemWin,
+		       paint = PaintInfo,
+		       time  = setup_time()
+		      }
 	}
     catch _:Err ->
 	    io:format("~p crashed ~p: ~p~n",[?MODULE, Err, erlang:get_stacktrace()]),
 	    {stop, Err}
     end.
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+setup_time() ->
+    Freq = 1,
+    #ti{fetch=Freq, disp=?DISP_FREQ/Freq}.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+handle_event(#wx{id=?ID_REFRESH_INTERVAL, event=#wxCommand{type=command_menu_selected}},
+	     #state{panel=Panel, appmon=Old, wins=Wins0, time=#ti{fetch=F0} = Ti0} = State) ->
+    case interval_dialog(Panel, Ti0) of
+	Ti0 -> {noreply, State};
+	#ti{fetch=F0} = Ti -> %% Same fetch interval force refresh
+	    Wins = [W#win{max=undefined} || W <- Wins0],
+	    {noreply, precalc(State#state{time=Ti, wins=Wins})};
+	Ti -> %% Changed fetch interval, drop all data
+	    {noreply, restart_fetcher(Old, State#state{time=Ti})}
+    end;
 handle_event(#wx{event=#wxCommand{type=command_menu_selected}},
 	     State = #state{}) ->
     {noreply, State};
@@ -88,13 +102,11 @@ handle_event(Event, _State) ->
 
 %%%%%%%%%%
 handle_sync_event(#wx{obj=Panel, event = #wxPaint{}},_,
-		  #state{active=Active, offset=Offset, paint=Paint,
-			 windows=Windows, data=Data}) ->
+		  #state{active=Active, time=Ti, paint=Paint,
+			 wins = Windows}) ->
     %% Sigh workaround bug on MacOSX (Id in paint event is always 0)
-    Id = if Panel =:= element(?ALLOC_W, Windows)  -> alloc;
-	    Panel =:= element(?UTIL_W, Windows)  -> utilz
-	 end,
-    observer_perf_wx:refresh_panel(Panel, Id, Offset, Data, Active, Paint),
+    Win = lists:keyfind(Panel, #win.panel, Windows),
+    refresh_panel(Active, Win, Ti, Paint),
     ok.
 %%%%%%%%%%
 handle_call(Event, From, _State) ->
@@ -107,24 +119,37 @@ handle_cast(Event, _State) ->
 handle_info({Key, {promise_reply, {badrpc, _}}}, #state{async=Key} = State) ->
     {noreply, State#state{active=false, appmon=undefined}};
 
-handle_info({Key, {promise_reply, SysInfo}}, #state{async=Key, data=Data} = State) ->
+handle_info({Key, {promise_reply, SysInfo}},
+	    #state{async=Key, panel=Panel, samples=Data, active=Active, wins=Wins0,
+		   time=#ti{tick=Tick, disp=Disp0}=Ti} = S0) ->
+    Disp = trunc(Disp0),
+    Next = max(Tick - Disp, 0),
+    erlang:send_after(1000 div ?DISP_FREQ, self(), {refresh, Next}),
     Info = alloc_info(SysInfo),
-    update_alloc(State, Info),
-    {noreply, State#state{offset=0.0, data = add_data(Info, Data), async=undefined}};
+    {Wins, Samples} = add_data(Info, Data, Wins0, Ti, Active),
+    S1 = S0#state{time=Ti#ti{tick=Next}, wins=Wins, samples=Samples, async=undefined},
+    if Active ->
+	    update_alloc(S0, Info),
+	    State = precalc(S1),
+	    catch wxWindow:refresh(Panel),
+	    {noreply, State};
+       true ->
+	    {noreply, S1}
+    end;
 
-handle_info({refresh, Seq, Freq, Node}, #state{panel=Panel, appmon=Node, async=Key} = State) ->
-    wxWindow:refresh(Panel),
+handle_info({refresh, Seq},
+	    State = #state{panel=Panel, appmon=Node, time=#ti{tick=Seq, disp=DispF}=Ti})
+  when (Seq+1) < (DispF*1.5) ->
     Next = Seq+1,
-    if
-	Next > Freq, Key =:= undefined ->
-	    erlang:send_after(trunc(1000 / Freq), self(), {refresh, 1, Freq, Node}),
+    State#state.active andalso (catch wxWindow:refresh(Panel)),
+    erlang:send_after(1000 div ?DISP_FREQ, self(), {refresh, Next}),
+    if Seq =:= (trunc(DispF)-1) ->
 	    Req = rpc:async_call(Node, observer_backend, sys_info, []),
-	    {noreply, State#state{offset=Seq/Freq, async=Req}};
+	    {noreply, State#state{time=Ti#ti{tick=Next}, async=Req}};
        true ->
-	    erlang:send_after(trunc(1000 / Freq), self(), {refresh, Next, Freq, Node}),
-	    {noreply, State#state{offset=Seq/Freq}}
+	    {noreply, State#state{time=Ti#ti{tick=Next}}}
     end;
-handle_info({refresh, _Seq, _Freq, _Node}, State) ->
+handle_info({refresh, _S}, #state{}=State) ->
     {noreply, State};
 
 handle_info({active, Node}, State = #state{parent=Parent, panel=Panel, appmon=Old}) ->
@@ -132,15 +157,9 @@ handle_info({active, Node}, State = #state{parent=Parent, panel=Panel, appmon=Ol
     try
 	Node = Old,
 	wxWindow:refresh(Panel),
-	{noreply, State#state{active=true}}
+	{noreply, precalc(State#state{active=true})}
     catch _:_ ->
-	    SysInfo = observer_wx:try_rpc(Node, observer_backend, sys_info, []),
-	    Info = alloc_info(SysInfo),
-	    Freq = 6,
-	    erlang:send_after(trunc(1000 / Freq), self(), {refresh, 1, Freq, Node}),
-	    wxWindow:refresh(Panel),
-	    {noreply, State#state{active=true, appmon=Node, offset=0.0,
-				  data = add_data(Info, {0, queue:new()})}}
+	    {noreply, restart_fetcher(Node, State)}
     end;
 
 handle_info(not_active, State = #state{appmon=_Pid}) ->
@@ -160,12 +179,21 @@ code_change(_, _, State) ->
 
 %%%%%%%%%%
 
-add_data(Stats, {N, Q}) when N > 60 ->
-    {N, queue:drop(queue:in(Stats, Q))};
-add_data(Stats, {N, Q}) ->
-    {N+1, queue:in(Stats, Q)}.
+restart_fetcher(Node, #state{panel=Panel, wins=Wins0, time=Ti} = State) ->
+    SysInfo = observer_wx:try_rpc(Node, observer_backend, sys_info, []),
+    Info = alloc_info(SysInfo),
+    {Wins, Samples} = add_data(Info, {0, queue:new()}, Wins0, Ti, true),
+    erlang:send_after(1000 div ?DISP_FREQ, self(), {refresh, 0}),
+    wxWindow:refresh(Panel),
+    precalc(State#state{active=true, appmon=Node, time=Ti#ti{tick=0},
+			wins=Wins, samples=Samples}).
+
+precalc(#state{samples=Data0, paint=Paint, time=Ti, wins=Wins0}=State) ->
+    Wins = [precalc(Ti, Data0, Paint, Win) || Win <- Wins0],
+    State#state{wins=Wins}.
+
 
-update_alloc(#state{windows={_, _, {_, Grid}}}, Fields) ->
+update_alloc(#state{mem={_, Grid}}, Fields) ->
     Max = wxListCtrl:getItemCount(Grid),
     Update = fun({Name, BS, CS}, Row) ->
 		     (Row >= Max) andalso wxListCtrl:insertItem(Grid, Row, ""),
@@ -174,7 +202,7 @@ update_alloc(#state{windows={_, _, {_, Grid}}}, Fields) ->
 		     wxListCtrl:setItem(Grid, Row, 2, observer_lib:to_str(CS div 1024)),
 		     Row + 1
 	     end,
-    lists:foldl(Update, 0, Fields),
+    wx:foldl(Update, 0, Fields),
     Fields.
 
 alloc_info(SysInfo) ->
@@ -247,11 +275,7 @@ create_mem_info(Parent) ->
 
 
 create_menus(Parent, _) ->
-    MenuEntries =
-	[{"File",
-	  [
-	  ]}
-	],
-    observer_wx:create_menus(Parent, MenuEntries).
+    View = {"View", [#create_menu{id = ?ID_REFRESH_INTERVAL, text = "Graph Settings"}]},
+    observer_wx:create_menus(Parent, [{"File", []}, View]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/observer/src/observer_app_wx.erl b/lib/observer/src/observer_app_wx.erl
index a2b7c21993..40e117357c 100644
--- a/lib/observer/src/observer_app_wx.erl
+++ b/lib/observer/src/observer_app_wx.erl
@@ -29,7 +29,7 @@
 -include("observer_defs.hrl").
 
 %% Import drawing wrappers
--import(observer_perf_wx, [haveGC/0,
+-import(observer_perf_wx, [haveGC/0, make_gc/2, destroy_gc/1,
 			   setPen/2, setFont/3, setBrush/2,
 			   strokeLine/5, strokeLines/2, drawRoundedRectangle/6,
 			   drawText/4, getTextExtent/2]).
@@ -244,28 +244,18 @@ handle_event(Event, _State) ->
 %%%%%%%%%%
 handle_sync_event(#wx{event = #wxPaint{}},_,
 		  #state{app_w=DA, app=App, sel=Sel, paint=Paint, usegc=UseGC}) ->
-    %% PaintDC must be created in a callback to work on windows.
-    IsWindows = element(1, os:type()) =:= win32,
-    %% Avoid Windows flickering hack
-    DC = if IsWindows -> wx:typeCast(wxBufferedPaintDC:new(DA), wxPaintDC); 
-	    true -> wxPaintDC:new(DA)
-	 end,
-    IsWindows andalso wxDC:clear(DC),
-    GC = case UseGC of
-	     true  ->
-		 GC0 = ?wxGC:create(DC),
-		 %% Argh must handle scrolling when using ?wxGC
-		 {Sx,Sy} = wxScrolledWindow:calcScrolledPosition(DA, {0,0}),
-		 ?wxGC:translate(GC0, Sx,Sy),
-		 GC0;
-	     false ->
-		 wxScrolledWindow:doPrepareDC(DA,DC),
-		 DC
-	 end,
+    GC = {GC0, DC} = make_gc(DA, UseGC),
+    case UseGC of
+	false ->
+	    wxScrolledWindow:doPrepareDC(DA,DC);
+	true ->
+	    %% Argh must handle scrolling when using ?wxGC
+	    {Sx,Sy} = wxScrolledWindow:calcScrolledPosition(DA, {0,0}),
+	    ?wxGC:translate(GC0, Sx,Sy)
+    end,
     %% Nothing is drawn until wxPaintDC is destroyed.
-    draw({UseGC, GC}, App, Sel, Paint),
-    UseGC andalso ?wxGC:destroy(GC),
-    wxPaintDC:destroy(DC),
+    draw(GC, App, Sel, Paint),
+    destroy_gc(GC),
     ok.
 %%%%%%%%%%
 handle_call(Event, From, _State) ->
@@ -312,15 +302,10 @@ handle_info({delivery, _Pid, app, _Curr, {[], [], [], []}},
 handle_info({delivery, Pid, app, Curr, AppData},
 	    State = #state{panel=Panel, appmon=Pid, current=Curr, usegc=UseGC,
 			   app_w=AppWin, paint=#paint{font=Font}}) ->
-    GC = if UseGC -> ?wxGC:create(AppWin);
-	    true -> wxWindowDC:new(AppWin)
-	 end,
-    FontW = {UseGC, GC},
-    setFont(FontW, Font, {0,0,0}),
-    App = build_tree(AppData, FontW),
-    if UseGC -> ?wxGC:destroy(GC);
-       true -> wxWindowDC:destroy(GC)
-    end,
+    GC = make_gc(AppWin, UseGC),
+    setFont(GC, Font, {0,0,0}),
+    App = build_tree(AppData, GC),
+    destroy_gc(GC),
     setup_scrollbar(AppWin, App),
     wxWindow:refresh(Panel),
     wxWindow:layout(Panel),
diff --git a/lib/observer/src/observer_defs.hrl b/lib/observer/src/observer_defs.hrl
index 1c2fe520b7..c4ba84a8c4 100644
--- a/lib/observer/src/observer_defs.hrl
+++ b/lib/observer/src/observer_defs.hrl
@@ -49,3 +49,14 @@
 -define(LCTRL_WDECR, 4). %% Remove some pixels in column width to avoid creating unnecessary scrollbar
 
 -define(SASH_STYLE, ?wxSP_LIVE_UPDATE bor ?wxSP_NOBORDER bor ?wxSP_3DSASH).
+
+-define(DISP_FREQ, 10). %% per second
+-define(FETCH_DATA, 2). %% per second
+-define(DISP_SECONDS, 60).
+
+-record(ti, {tick=0, disp=?DISP_FREQ/?FETCH_DATA, fetch=?FETCH_DATA, secs=?DISP_SECONDS}).
+
+-record(win, {name, panel, size, geom,
+	      graphs=[], no_samples=0,
+	      max, state,
+	      info=[]}).
diff --git a/lib/observer/src/observer_perf_wx.erl b/lib/observer/src/observer_perf_wx.erl
index ace0b62c1d..56da5a862a 100644
--- a/lib/observer/src/observer_perf_wx.erl
+++ b/lib/observer/src/observer_perf_wx.erl
@@ -25,8 +25,9 @@
 	 handle_event/2, handle_sync_event/3, handle_cast/2]).
 
 %% Drawing wrappers for DC and GC areas
--export([setup_graph_drawing/1, refresh_panel/6,
-	 haveGC/0,
+-export([make_win/4, setup_graph_drawing/1,
+	 refresh_panel/4, precalc/4, add_data/5, interval_dialog/2,
+	 haveGC/0, make_gc/2, destroy_gc/1,
 	 setPen/2, setFont/3, setBrush/2,
 	 strokeLine/5, strokeLines/2, drawRoundedRectangle/6,
 	 drawText/4, getTextExtent/2]).
@@ -35,13 +36,18 @@
 -include_lib("wx/include/wx.hrl").
 -include("observer_defs.hrl").
 
+-define(ID_REFRESH_INTERVAL, 102).
+
+-define(BW, 5).
+-define(BH, 5).
+
 -record(state,
 	{
-	  offset = 0.0,
+	  time = #ti{},
 	  active = false,
 	  parent,
-	  windows,
-	  data = {0, queue:new()},
+	  samples,        %% Orig data store
+	  wins=[],     %% per window content
 	  panel,
 	  paint,
 	  appmon
@@ -51,49 +57,49 @@
 
 -record(paint, {font, small, pen, pen2, pens, usegc = false}).
 
--define(RQ_W,  1).
--define(MEM_W, 2).
--define(IO_W,  3).
-
 start_link(Notebook, Parent) ->
     wx_object:start_link(?MODULE, [Notebook, Parent], []).
 
 init([Notebook, Parent]) ->
- try
-    Panel = wxPanel:new(Notebook),
-    Main  = wxBoxSizer:new(?wxVERTICAL),
+    try
+	Panel = wxPanel:new(Notebook),
+	Main  = wxBoxSizer:new(?wxVERTICAL),
+	MemIO = wxBoxSizer:new(?wxHORIZONTAL),
+
+	CPU = make_win(runq, Panel, Main, ?wxALL),
+	MEM = make_win(memory, Panel, MemIO, ?wxLEFT),
+	IO  = make_win(io, Panel, MemIO, ?wxLEFT bor ?wxRIGHT),
+
+	wxSizer:add(Main, MemIO, [{flag, ?wxEXPAND bor ?wxDOWN},
+				  {proportion, 1}, {border, 5}]),
+	wxWindow:setSizer(Panel, Main),
+	Windows = [CPU, MEM, IO],
+	PaintInfo = setup_graph_drawing(Windows),
+
+	process_flag(trap_exit, true),
+	State0 = #state{parent=Parent,
+			panel =Panel,
+			wins = Windows,
+			paint=PaintInfo,
+			samples=reset_data()
+		       },
+	{Panel, State0}
+    catch _:Err ->
+	    io:format("~p crashed ~p: ~p~n",[?MODULE, Err, erlang:get_stacktrace()]),
+	    {stop, Err}
+    end.
+
+make_win(Name, Parent, Sizer, Border) ->
     Style = ?wxFULL_REPAINT_ON_RESIZE bor ?wxCLIP_CHILDREN,
-    CPU = wxPanel:new(Panel, [{winid, ?RQ_W}, {style,Style}]),
-    wxSizer:add(Main, CPU, [{flag, ?wxEXPAND bor ?wxALL},
-				 {proportion, 1}, {border, 5}]),
-    MemIO = wxBoxSizer:new(?wxHORIZONTAL),
-    MEM = wxPanel:new(Panel, [{winid, ?MEM_W}, {style,Style}]),
-    IO  = wxPanel:new(Panel, [{winid, ?IO_W}, {style,Style}]),
-    wxSizer:add(MemIO, MEM, [{flag, ?wxEXPAND bor ?wxLEFT},
-			     {proportion, 1}, {border, 5}]),
-    wxSizer:add(MemIO, IO,  [{flag, ?wxEXPAND bor ?wxLEFT bor ?wxRIGHT},
-			     {proportion, 1}, {border, 5}]),
-    wxSizer:add(Main, MemIO, [{flag, ?wxEXPAND bor ?wxDOWN},
-			      {proportion, 1}, {border, 5}]),
-    wxWindow:setSizer(Panel, Main),
-
-    PaintInfo = setup_graph_drawing([CPU, MEM, IO]),
-
-    process_flag(trap_exit, true),
-    {Panel, #state{parent=Parent,
-		   panel =Panel,
-		   windows = {CPU, MEM, IO},
-		   paint=PaintInfo
-		  }}
-   catch _:Err ->
-	   io:format("~p crashed ~p: ~p~n",[?MODULE, Err, erlang:get_stacktrace()]),
-	   {stop, Err}
-   end.
+    Panel = wxPanel:new(Parent, [{style,Style}]),
+    Opts = [{flag, ?wxEXPAND bor Border}, {proportion, 1}, {border, 5}],
+    wxSizer:add(Sizer, Panel, Opts),
+    #win{name=Name, panel=Panel}.
 
 setup_graph_drawing(Panels) ->
     IsWindows = element(1, os:type()) =:= win32,
     IgnoreCB = {callback, fun(_,_) -> ok end},
-    Do = fun(Panel) ->
+    Do = fun(#win{panel=Panel}) ->
 		 wxWindow:setBackgroundColour(Panel, ?wxWHITE),
 		 wxPanel:connect(Panel, paint, [callback]),
 		 IsWindows andalso
@@ -117,8 +123,8 @@ setup_graph_drawing(Panels) ->
 		  SF = wxFont:new(DefSize-2, DefFamily, ?wxFONTSTYLE_NORMAL, ?wxFONTWEIGHT_NORMAL),
 		  {F, SF}
 	  end,
-    BlackPen = wxPen:new({0,0,0}, [{width, 2}]),
-    Pens = [wxPen:new(Col, [{width, 3}]) || Col <- tuple_to_list(colors())],
+    BlackPen = wxPen:new({0,0,0}, [{width, 1}]),
+    Pens = [wxPen:new(Col, [{width, 1}]) || Col <- tuple_to_list(colors())],
     #paint{usegc = UseGC,
 	   font  = Font,
 	   small = SmallFont,
@@ -129,7 +135,16 @@ setup_graph_drawing(Panels) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+handle_event(#wx{id=?ID_REFRESH_INTERVAL, event=#wxCommand{type=command_menu_selected}},
+	     #state{panel=Panel, appmon=Old, wins=Wins0, time=#ti{fetch=F0} = Ti0} = State) ->
+    case interval_dialog(Panel, Ti0) of
+	Ti0 -> {noreply, State};
+	#ti{fetch=F0} = Ti -> %% Same fetch interval force refresh
+	    Wins = [W#win{max=undefined} || W <- Wins0],
+	    {noreply, precalc(State#state{time=Ti, wins=Wins})};
+	Ti -> %% Changed fetch interval, drop all data
+	    {noreply, restart_fetcher(node(Old), State#state{time=Ti})}
+    end;
 handle_event(#wx{event=#wxCommand{type=command_menu_selected}},
 	     State = #state{}) ->
     {noreply, State};
@@ -139,41 +154,21 @@ handle_event(Event, _State) ->
 
 %%%%%%%%%%
 handle_sync_event(#wx{obj=Panel, event = #wxPaint{}},_,
-		  #state{active=Active, offset=Offset, paint=Paint,
-			 windows=Windows, data=Data}) ->
+		  #state{active=Active, time=Ti, paint=Paint, wins=Windows}) ->
     %% Sigh workaround bug on MacOSX (Id in paint event is always 0)
     %% Panel = element(Id, Windows),
-    Id = if Panel =:= element(?RQ_W, Windows)  -> runq;
-	    Panel =:= element(?MEM_W, Windows) -> memory;
-	    Panel =:= element(?IO_W, Windows)  -> io
-	 end,
-
-    refresh_panel(Panel, Id, Offset, Data, Active, Paint),
+    Win = lists:keyfind(Panel, #win.panel, Windows),
+    refresh_panel(Active, Win, Ti, Paint),
     ok.
 
-refresh_panel(Panel, Id, Offset, Data, Active, #paint{usegc=UseGC} = Paint) ->
+refresh_panel(Active, #win{name=_Id, panel=Panel}=Win, Ti, #paint{usegc=UseGC}=Paint) ->
     %% PaintDC must be created in a callback to work on windows.
-    IsWindows = element(1, os:type()) =:= win32,
-    DC = if IsWindows ->
-		 %% Ugly hack to aviod flickering on windows, works on windows only
-		 %% But the other platforms are doublebuffered by default
-		 wx:typeCast(wxBufferedPaintDC:new(Panel), wxPaintDC);
-	    true ->
-		 wxPaintDC:new(Panel)
-	 end,
-    IsWindows andalso wxDC:clear(DC),
-    GC = if UseGC -> ?wxGC:create(DC);
-	    true -> DC
-	 end,
     %% Nothing is drawn until wxPaintDC is destroyed.
-    try
-	draw(Offset, Id, {UseGC, GC}, Panel, Paint, Data, Active)
-    catch _:Err ->
-	    io:format("Internal error ~p ~p~n",[Err, erlang:get_stacktrace()])
+    GC = make_gc(Panel, UseGC),
+    if Active -> draw_win(GC, Win, Ti, Paint);
+       true ->   ignore
     end,
-    UseGC andalso ?wxGC:destroy(GC),
-    wxPaintDC:destroy(DC).
-
+    destroy_gc(GC).
 
 %%%%%%%%%%
 handle_call(Event, From, _State) ->
@@ -182,41 +177,42 @@ handle_call(Event, From, _State) ->
 handle_cast(Event, _State) ->
     error({unhandled_cast, Event}).
 %%%%%%%%%%
-handle_info(Stats = {stats, 1, _, _, _},
-	    State = #state{panel=Panel, data=Data, active=Active}) ->
+handle_info({stats, 1, _, _, _} = Stats,
+	    #state{panel=Panel, samples=Data, active=Active, wins=Wins0,
+		   time=#ti{tick=Tick, disp=Disp0}=Ti} = State0) ->
     if Active ->
+	    Disp = trunc(Disp0),
+	    Next = max(Tick - Disp, 0),
+	    erlang:send_after(1000 div ?DISP_FREQ, self(), {refresh, Next}),
+	    {Wins, Samples} = add_data(Stats, Data, Wins0, Ti, Active),
+	    State = precalc(State0#state{time=Ti#ti{tick=Next}, wins=Wins, samples=Samples}),
 	    wxWindow:refresh(Panel),
-	    Freq = 6,
-	    erlang:send_after(trunc(1000 / Freq), self(), {refresh, 1, Freq});
-       true -> ignore
-    end,
-    {noreply, State#state{offset=0.0, data = add_data(Stats, Data)}};
-
-handle_info({refresh, Seq, Freq}, State = #state{panel=Panel, offset=Prev}) ->
-    wxWindow:refresh(Panel),
-    Next = Seq+1,
-    if Seq > 1, Prev =:= 0.0 ->
-	    %% We didn't have time to handle the refresh
 	    {noreply, State};
-       Next < Freq ->
-	    erlang:send_after(trunc(1000 / Freq), self(), {refresh, Next, Freq}),
-	    {noreply, State#state{offset=Seq/Freq}};
        true ->
-	    {noreply, State#state{offset=Seq/Freq}}
+	    {Wins1, Samples} = add_data(Stats, Data, Wins0, Ti, Active),
+	    Wins = [W#win{max=undefined} || W <- Wins1],
+	    {noreply, State0#state{samples=Samples, wins=Wins, time=Ti#ti{tick=0}}}
     end;
 
-handle_info({active, Node}, State = #state{parent=Parent, panel=Panel, appmon=Old}) ->
+handle_info({refresh, Seq}, #state{panel=Panel, time=#ti{tick=Seq, disp=DispF}=Ti} = State0)
+  when (Seq+1) < (DispF*1.5) ->
+    Next = Seq+1,
+    erlang:send_after(1000 div ?DISP_FREQ, self(), {refresh, Next}),
+    State = precalc(State0#state{time=Ti#ti{tick=Next}}),
+    catch wxWindow:refresh(Panel),
+    {noreply, State};
+handle_info({refresh, _}, State) ->
+    {noreply, State};
+
+handle_info({active, Node}, #state{parent=Parent, panel=Panel, appmon=Old, time=_Ti} = State) ->
     create_menus(Parent, []),
     try
 	Node = node(Old),
 	wxWindow:refresh(Panel),
+	erlang:send_after(1000 div ?DISP_FREQ, self(), {refresh, 0}),
 	{noreply, State#state{active=true}}
     catch _:_ ->
-	    catch Old ! exit,
-	    Me = self(),
-	    Pid = spawn_link(Node, observer_backend, fetch_stats, [Me, 1000]),
-	    wxWindow:refresh(Panel),
-	    {noreply, State#state{active=true, appmon=Pid, data={0, queue:new()}}}
+	    {noreply,restart_fetcher(Node, State)}
     end;
 
 handle_info(not_active, State = #state{appmon=_Pid}) ->
@@ -237,173 +233,337 @@ terminate(_Event, #state{appmon=Pid}) ->
 code_change(_, _, State) ->
     State.
 
-add_data(Stats, {N, Q}) when N > 60 ->
-    {N, queue:drop(queue:in(Stats, Q))};
-add_data(Stats, {N, Q}) ->
-    {N+1, queue:in(Stats, Q)}.
+restart_fetcher(Node, #state{appmon=Old, panel=Panel, time=#ti{fetch=Freq}=Ti}=State) ->
+    catch Old ! exit,
+    Me = self(),
+    Pid = spawn_link(Node, observer_backend, fetch_stats, [Me, round(1000/Freq)]),
+    wxWindow:refresh(Panel),
+    precalc(State#state{active=true, appmon=Pid, samples=reset_data(), time=Ti#ti{tick=0}}).
+
+reset_data() ->
+    {0, queue:new()}.
+
+add_data(Stats, {N, Q0}, Wins, #ti{fetch=Fetch, secs=Secs}, Active) when N > (Secs*Fetch+1) ->
+    {{value, Drop}, Q} = queue:out(Q0),
+    add_data_1(Wins, Stats, N, {Drop,Q}, Active);
+add_data(Stats, {N, Q}, Wins, _, Active) ->
+    add_data_1(Wins, Stats, N+1, {empty, Q}, Active).
+
+add_data_1([#win{state={_,St}}|_]=Wins0, Last, N, {Drop, Q}, Active)
+  when St /= undefined ->
+    {Wins, Stat} =
+	lists:mapfoldl(fun(Win0, Entry) ->
+			       {Win1,Stat} = add_data_2(Win0, Last, Entry),
+			       case Active of
+				   true ->
+				       Win = add_data_3(Win1, N, Drop, Stat, Q),
+				       {Win, Stat};
+				   false ->
+				       {Win1, Stat}
+			       end
+		       end, #{}, Wins0),
+    {Wins, {N,queue:in(Stat#{}, Q)}};
+add_data_1(Wins, Stats, 1, {_, Q}, _) ->
+    {[Win#win{state=init_data(Id, Stats),
+	      info = info(Id, Stats)}
+      || #win{name=Id}=Win <- Wins], {0,Q}}.
+
+add_data_2(#win{name=Id, state=S0}=Win, Stats, Map) ->
+    {V1, S1} = collect_data(Id, Stats, S0),
+    {Win#win{state=S1}, Map#{Id=>V1}}.
+
+add_data_3(#win{name=Id, max={{OldMax, OldEntry},_,_,_},
+		geom=#{scale:={WS,HS}}, state={Max,_},
+		graphs=Graphs}=Win,
+	   N, Drop0, Last, Q1)
+  when N > 3 ->
+    Drop = case Drop0 of
+	       #{Id:=D} -> D;
+	       _ -> Drop0
+	   end,
+    case {max_value(Max), Drop =:= OldEntry} of
+	{OldMax, false} ->
+	    #{Id:=V4} = Last,
+	    {{value, #{Id:=V3}},Q2} = queue:out_r(Q1),
+	    {{value, #{Id:=V2}},Q3} = queue:out_r(Q2),
+	    {{value, #{Id:=V1}},_}  = queue:out_r(Q3),
+	    Vals = [V1,V2,V3,V4],
+	    Gs = tuple_size(V1),
+	    Info = lists:zip(lists:seq(Gs, 1, -1), Graphs),
+	    Lines = [add_lines(Vals, Drop, Prev, I, WS, HS) || {I, Prev} <- Info],
+	    Win#win{graphs=Lines, no_samples=N};
+	_W -> %% Max changed Trigger complete recalc
+	    Win#win{max=undefined}
+    end;
+add_data_3(Win, _, _, _,_) ->
+    %% Trigger complete recalc
+    Win#win{max=undefined}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 create_menus(Parent, _) ->
-    MenuEntries =
-	[{"File",
-	  [
-	  ]}
-	],
-    observer_wx:create_menus(Parent, MenuEntries).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-collect_data(runq, {N, Q}) ->
-    case queue:to_list(Q) of
-	[] ->  {0, 0, [], []};
-	[_] ->  {0, 0, [], []};
-	[{stats, _Ver, Init0, _IO, _Mem}|Data0] ->
-	    Init = lists:sort(Init0),
-	    [_|Data=[First|_]] = lists:foldl(fun({stats, _, T0, _, _}, [Prev|Acc]) ->
-					   TN = lists:sort(T0),
-					   Delta = calc_delta(TN, Prev),
-					   [TN, list_to_tuple(Delta)|Acc]
-				   end, [Init], Data0),
-	    NoGraphs = tuple_size(First),
-	    {N, lmax(Data), lists:reverse([First|Data]), lists:seq(1, NoGraphs)}
-    end;
-collect_data(memory, {N, Q}) ->
-    MemT = mem_types(),
-    Data = [list_to_tuple([Value || {Type,Value} <- MemInfo,
-				    lists:member(Type, MemT)])
-	    || {stats, _Ver, _RQ, _IO, MemInfo} <- queue:to_list(Q)],
-    {N, lmax(Data), Data,  MemT};
-collect_data(io, {N, Q}) ->
-    case queue:to_list(Q) of
-	[] ->  {0, 0, [], []};
-	[_] -> {0, 0, [], []};
-	[{stats, _Ver, _RQ, {{_,In0}, {_,Out0}}, _Mem}|Data0] ->
-	    [_,_|Data=[First|_]] =
-		lists:foldl(fun({stats, _, _, {{_,In}, {_,Out}}, _}, [PIn,Pout|Acc]) ->
-				    [In,Out,{In-PIn,Out-Pout}|Acc]
-			    end, [In0,Out0], Data0),
-	    {N, lmax(Data), lists:reverse([First|Data]), [input, output]}
-    end;
-collect_data(alloc, {N, Q}) ->
-    List = queue:to_list(Q),
-    Data = [list_to_tuple([Carrier || {_Type,_Block,Carrier} <- MemInfo])
-	    || MemInfo <- List],
-    Info = case List of  %% Varies depending on erlang build config/platform
-	       [MInfo|_] -> [Type || {Type, _, _} <- MInfo];
-	       _ -> []
-	   end,
-    {N, lmax(Data), Data, Info};
-
-collect_data(utilz, {N, Q}) ->
-    List = queue:to_list(Q),
-    Data = [list_to_tuple([round(100*Block/Carrier) || {_Type,Block,Carrier} <- MemInfo])
-	    || MemInfo <- List],
-    Info = case List of  %% Varies depending on erlang build config/platform
-	       [MInfo|_] -> [Type || {Type, _, _} <- MInfo];
-	       _ -> []
-	   end,
-    {N, lmax(Data), Data, Info}.
+    View = {"View", [#create_menu{id = ?ID_REFRESH_INTERVAL, text = "Graph Settings"}]},
+    observer_wx:create_menus(Parent, [{"File", []}, View]).
+
+interval_dialog(Parent0, #ti{fetch=Fetch0, secs=Secs0}=Ti) ->
+    Parent = observer_lib:get_wx_parent(Parent0),
+    Dialog = wxDialog:new(Parent, ?wxID_ANY, "Load Chart Settings",
+			  [{style, ?wxDEFAULT_DIALOG_STYLE bor
+				?wxRESIZE_BORDER}]),
+    {Sl1,FetchSl} = slider(Dialog, "Sample (ms)", trunc(1000 / Fetch0), 100, 10000),
+    {Sl2, SecsSl} = slider(Dialog, "Length (min)", Secs0 div 60, 1, 10),
+    TopSizer = wxBoxSizer:new(?wxVERTICAL),
+    Flags = [{flag, ?wxEXPAND bor ?wxTOP bor ?wxLEFT bor ?wxRIGHT},
+	     {border, 5}, {proportion, 1}],
+    wxSizer:add(TopSizer, Sl1, Flags),
+    wxSizer:add(TopSizer, Sl2, Flags),
+    wxSizer:add(TopSizer, wxDialog:createButtonSizer(Dialog, ?wxOK bor ?wxCANCEL), Flags),
+    wxWindow:setSizerAndFit(Dialog, TopSizer),
+    wxSizer:setSizeHints(TopSizer, Dialog),
+    Res = case wxDialog:showModal(Dialog) of
+	      ?wxID_OK ->
+		  Fetch = 1000 / wxSlider:getValue(FetchSl),
+		  Secs = wxSlider:getValue(SecsSl) * 60,
+		  Ti#ti{fetch=Fetch, secs=Secs, disp=?DISP_FREQ/Fetch};
+	      ?wxID_CANCEL ->
+		  Ti
+	  end,
+    wxDialog:destroy(Dialog),
+    Res.
+
+slider(Parent, Str, Value, Min, Max) ->
+    Sz = wxBoxSizer:new(?wxHORIZONTAL),
+    Center = [{flag, ?wxALIGN_CENTER_VERTICAL}],
+    wxSizer:add(Sz, wxStaticText:new(Parent, ?wxID_ANY, Str), [{proportion, 1}|Center]),
+    Opt = [{style, ?wxSL_HORIZONTAL bor ?wxSL_LABELS}],
+    Slider = wxSlider:new(Parent, ?wxID_ANY, Value, Min, Max, Opt),
+    wxSizer:add(Sz, Slider, [{proportion, 2}|Center]),
+    case Min > 1 of
+	false ->
+	    {Sz, Slider};
+	true ->
+	    CB = fun(#wx{event=Ev},_) -> step(Ev, Slider, Min) end,
+	    wxSlider:connect(Slider, scroll_thumbtrack, [{callback, CB}]),
+	    wxSlider:connect(Slider, scroll_changed, [{callback, CB}]),
+	    {Sz, Slider}
+    end.
 
+step(_Ev = #wxScroll{commandInt=Value}, Slider, Min) ->
+    Val = Min * round(Value / Min),
+    wxSlider:setValue(Slider, Val),
+    ok.
 
-mem_types() ->
-    [total, processes, atom, binary, code, ets].
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-lmax([]) -> 0;
-lmax(List) ->
-    Max = [lists:max(tuple_to_list(T)) || T <- List,
-					  tuple_size(T) > 0],
-    case Max of
-	[] -> 0;
-	_ -> lists:max(Max)
+mk_max() -> {0, undefined}.
+max_value({Max,_}) -> Max.
+%% max_data({_,Data}) -> Data. matched in function head
+
+lmax(MState, Tuple, Tuple) when is_tuple(Tuple) ->
+    lmax(MState, tuple_to_list(Tuple), Tuple);
+lmax(MState, Values, State) ->
+    Max = max_value(MState),
+    New = lists:max([Max|Values]),
+    case New >= Max of
+	false -> MState;
+	true -> {New, State}
     end.
 
+init_data(runq, {stats, _, T0, _, _}) -> {mk_max(),lists:sort(T0)};
+init_data(io,   {stats, _, _, {{_,In0}, {_,Out0}}, _}) -> {mk_max(), {In0,Out0}};
+init_data(memory, _) -> {mk_max(), info(memory, undefined)};
+init_data(alloc, _) -> {mk_max(), ok};
+init_data(utilz, _) -> {mk_max(), ok}.
+
+info(runq, {stats, _, T0, _, _}) -> lists:seq(1, length(T0));
+info(memory, _) -> [total, processes, atom, binary, code, ets];
+info(io, _) -> [input, output];
+info(alloc, First) -> [Type || {Type, _, _} <- First];
+info(utilz, First) -> [Type || {Type, _, _} <- First];
+info(_, []) -> [].
+
+collect_data(runq, {stats, _, T0, _, _}, {Max,S0}) ->
+    S1 = lists:sort(T0),
+    Delta = calc_delta(S1, S0),
+    Sample = list_to_tuple(Delta),
+    {Sample, {lmax(Max,Delta,Sample), S1}};
+collect_data(io, {stats, _, _, {{_,In0}, {_,Out0}}, _}, {Max,{PIn,POut}}) ->
+    In = In0-PIn,
+    Out = Out0-POut,
+    Sample = {In, Out},
+    {Sample, {lmax(Max, [In,Out], Sample), {In0, Out0}}};
+collect_data(memory, {stats, _, _, _, MemInfo}, {Max, MemTypes}) ->
+    Vs = [Value || {Type,Value} <- MemInfo, lists:member(Type, MemTypes)],
+    Sample = list_to_tuple(Vs),
+    {Sample, {lmax(Max, Vs, Sample),MemTypes}};
+collect_data(alloc, MemInfo, Max) ->
+    Vs = [Carrier || {_Type,_Block,Carrier} <- MemInfo],
+    Sample = list_to_tuple(Vs),
+    {Sample, lmax(Max, Vs, Sample)};
+collect_data(utilz, MemInfo, Max) ->
+    Vs = [round(100*Block/Carrier) || {_Type,Block,Carrier} <- MemInfo],
+    Sample = list_to_tuple(Vs),
+    {Sample, lmax(Max,Vs,Sample)}.
+
 calc_delta([{Id, WN, TN}|Ss], [{Id, WP, TP}|Ps]) ->
     [100*(WN-WP) div (TN-TP)|calc_delta(Ss, Ps)];
 calc_delta([], []) -> [].
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-draw(Offset, Id, DC, Panel, Paint=#paint{pens=Pens, small=Small}, Data, Active) ->
-    %% This can be optimized a lot by collecting data once
-    %% and draw to memory and then blit memory and only draw new entries in new memory
-    %% area.  Hmm now rewritten to use ?wxGC I don't now if it is feasable.
-    {Len, Max0, Hs, Info} = collect_data(Id, Data),
-    {Max,_,_} = MaxDisp = calc_max(Id, Max0),
+precalc(#state{samples=Data0, paint=Paint, time=Ti, wins=Wins0}=State) ->
+    Wins = [precalc(Ti, Data0, Paint, Win) || Win <- Wins0],
+    State#state{wins=Wins}.
+
+precalc(Ti, {NoSamples,Q}, Paint, #win{name=Id, panel=Panel}=Win) ->
     Size = wxWindow:getClientSize(Panel),
-    {X0,Y0,WS,HS, DrawBs} = draw_borders(Id, Info, DC, Size, MaxDisp, Paint),
-    Last = 60*WS+X0-1,
-    Start = max(61-Len, 0)*WS+X0 - Offset*WS,
-    Samples = length(Hs),
-    NoGraphs = try tuple_size(hd(Hs)) catch _:_ -> 0 end,
-    case Active andalso Samples > 1 andalso NoGraphs > 0 of
-	true ->
-	    Draw = fun(N) ->
-			   Lines = make_lines(Hs, Start, N, {X0,Max*HS,Last}, Y0, WS, HS),
-			   setPen(DC, element(1+ ((N-1) rem tuple_size(Pens)), Pens)),
-			   strokeLines(DC, Lines),
-			   N+1
-		   end,
-	    [Draw(I) || I <- lists:seq(NoGraphs, 1, -1)],
-	    DrawBs();
-	false ->
-	    DrawBs(),
-	    Text = case Active andalso Samples =< 1 of
+    case Win of
+	#win{max=Max, no_samples=NoSamples, size=Size} when is_tuple(Max) ->
+	    Win;
+	_SomeThingChanged ->
+	    Hs = [Vals || #{Id:=Vals} <- queue:to_list(Q)],
+	    Max = lists:foldl(fun(Vals,Max) -> lmax(Max, Vals, Vals) end,
+			      mk_max(), Hs),
+	    MaxDisp = calc_max(Id, Max),
+	    #{scale:={WS,HS}} = Props = window_geom(Size, MaxDisp, Ti, Panel, Paint),
+	    NoGraphs = try tuple_size(hd(Hs)) catch _:_ -> 0 end,
+	    Graphs = [make_lines(Hs, I, WS, HS) || I <- lists:seq(NoGraphs, 1, -1)],
+	    State = case Win#win.state of
+			undefined -> {Max, undefined};
+			{_, St} -> {Max, St}
+		    end,
+	    Win#win{geom=Props, size=Size,
+		    max=MaxDisp,
+		    graphs=Graphs,
+		    no_samples=NoSamples,
+		    state=State}
+    end.
+
+window_geom({W,H}, {_, Max, _Unit, MaxUnit},
+	    #ti{secs=Secs, fetch=FetchFreq},
+	    Panel, #paint{font=Font}) ->
+    Str1 = observer_lib:to_str(MaxUnit),
+    Str2 = observer_lib:to_str(MaxUnit div 2),
+    Str3 = observer_lib:to_str(0),
+    {TW,TH,_,_} = wxWindow:getTextExtent(Panel, Str1, [{theFont, Font}]),
+    {SpaceW, _,_,_} = wxWindow:getTextExtent(Panel, "W", [{theFont, Font}]),
+    X0 = ?BW+TW+?BW,
+    X1 = W-?BW*4,
+    MaxTextY = TH+?BH,
+    BottomTextY = H-?BH-TH,
+    Y0 = MaxTextY + (TH / 2),
+    Y1 = BottomTextY - TH - ?BH,
+
+    ScaleW = (X1-X0-1)/(Secs*FetchFreq),
+    ScaleH = (Y1-Y0-1) / Max,
+    #{p0=>{X0,Y0}, p1=>{X1,Y1}, scale=>{ScaleW, ScaleH},
+      txsz=>{TW,TH,SpaceW}, txt=>{BottomTextY, MaxTextY}, strs=>{Str1,Str2,Str3}}.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+draw_win(DC, #win{no_samples=Samples, geom=#{scale:={WS,HS}}, graphs=Graphs, max={_,Max,_,_}}=Win,
+	 #ti{tick=Tick, fetch=FetchFreq, secs=Secs, disp=DispFreq}=Ti,
+	 Paint=#paint{pens=Pens}) when Samples >= 2, Graphs =/= [] ->
+    %% Draw graphs
+    {X0,Y0,DrawBs} = draw_borders(DC, Ti, Win, Paint),
+    Offset = Tick / DispFreq,
+    Full = case Samples > (1+Secs*FetchFreq) of
+	       true -> 1;
+	       false -> 2
+	   end,
+    Start = X0 + (max(Secs*FetchFreq+Full-Samples, 0) - Offset)*WS,
+    Last = Secs*FetchFreq*WS+X0,
+    Draw = fun(Lines0, N) ->
+		   setPen(DC, element(1+ ((N-1) rem tuple_size(Pens)), Pens)),
+		   Order = lists:reverse(Lines0),
+		   [{_,Y}|Lines] = translate(Order, {Start, Y0}, 0, WS, {X0,Max*HS,Last}, []),
+		   strokeLines(DC, [{Last,Y}|Lines]),
+		   N-1
+	   end,
+    lists:foldl(Draw, length(Graphs), Graphs),
+    DrawBs(),
+    ok;
+
+draw_win(DC, #win{no_samples=Samples} = Win,Ti, #paint{small=Small}=Paint) ->
+    %% Draw Error Msg
+    try draw_borders(DC, Ti, Win, Paint) of
+	{X0,_Y0,DrawBs} ->
+	    Text = case Samples =< 1 of
 		       true  -> "Waiting for data";
 		       false -> "Information not available"
 		   end,
 	    setFont(DC, Small, {0,0,0}),
-	    drawText(DC, Text, X0 + 100, element(2,Size) div 2)
-    end,
-    ok.
+	    {_,WW} = getSize(DC),
+	    drawText(DC, Text, X0 + 100, WW div 2),
+	    DrawBs(),
+	    ok
+    catch _:_ -> %% Early redraws fail
+	    ok
+    end.
 
-make_lines(Ds = [Data|_], PX, N, Clip, ZeroY, WS, HS) ->
+translate([{X0,Y}|Rest], {Sx,Sy}=Start, N, WS, {Cx,Cy,Cw}=Clip, Acc) ->
+    X = min((N-X0)*WS+Sx,Cw),
+    Next = if X0 > 0 -> N; true -> N+1 end,
+    case X =< Cx of
+	true ->
+	    translate(Rest, Start, Next, WS, Clip, [{Cx,Sy-min(Cy,Y)}]);
+	false ->
+	    translate(Rest, Start, Next, WS, Clip, [{X,Sy-min(Cy,Y)}|Acc])
+    end;
+translate([], _, _, _, _, Acc) ->
+    Acc.
+
+add_lines(Vals, Drop, OldLines, I, WS, HS) ->
+    Lines = strip(OldLines, Drop, 2),
+    New = make_lines(Vals, I, WS, HS),
+    New ++ Lines.
+
+strip([{X,_}|Rest], Drop, N) when X > 0.0001, N > 0 ->
+    strip(Rest, Drop, N);
+strip([_|Rest], Drop, N) when N > 0 ->
+    strip(Rest, Drop, N-1);
+strip(List, empty, _) -> List;
+strip(List, _, _) ->
+    lists:reverse(strip(lists:reverse(List), empty, 1)).
+
+make_lines(Ds = [Data|_], N, WS, HS) ->
     Y = element(N,Data),
-    make_lines(Ds, PX, N, Clip, ZeroY, WS, HS, Y, []).
+    make_lines(Ds, N, WS, HS, Y, []).
 
-make_lines([D1 | Ds = [D2|Rest]], PX, N, Clip={Cx,Cy, _}, ZeroY, WS, HS, Y0, Acc0) ->
+make_lines([D1 | Ds = [D2|Rest]], N, WS, HS, Y0, Acc0) ->
     Y1 = element(N,D1),
     Y2 = element(N,D2),
     Y3 = case Rest of
 	     [D3|_] -> element(N,D3);
 	     [] -> Y2
 	 end,
-    This = {max(Cx, PX),ZeroY-min(Cy,Y1*HS)},
+    This = {0, Y1*HS},
     Acc = if (abs(Y1-Y2) * HS) < 3.0 -> [This|Acc0];
 	     WS < 3.0 -> [This|Acc0];
-	     PX < Cx ->
-		  make_splines(Y0,Y1,Y2,Y3,PX,Clip,ZeroY,WS,HS,Acc0);
-	     true ->
-		  make_splines(Y0,Y1,Y2,Y3,PX,Clip,ZeroY,WS,HS,[This|Acc0])
+	     true -> make_splines(Y0,Y1,Y2,Y3,WS,HS,[This|Acc0])
 	  end,
-    make_lines(Ds, PX+WS, N, Clip, ZeroY, WS, HS, Y1, Acc);
-make_lines([D1],  _PX, N, {_,Cy,Last}, ZeroY, _WS, HS, _Y0, Acc) ->
-    Y1 = element(N,D1),
-    [{Last,ZeroY-min(Cy, Y1*HS)}|Acc].
+    make_lines(Ds, N, WS, HS, Y1, Acc);
+make_lines([_D1], _N, _WS, _HS, _Y0, Acc) ->
+    Acc.
 
-make_splines(Y00,Y10,Y20,Y30,PX,Clip,ZeroY,WS,HS,Acc) ->
+make_splines(Y00,Y10,Y20,Y30,WS,HS,Acc) ->
     Y1 = Y10*HS,
     Y2 = Y20*HS,
-    Steps = min(abs(Y1-Y2), WS),
+    Steps = min(abs(Y1-Y2), WS/2),
     if Steps > 2 ->
 	    Y0 = Y00*HS,
 	    Y3 = Y30*HS,
 	    Tan = spline_tan(Y0,Y1,Y2,Y3),
 	    Delta = 1/Steps,
-	    splines(Steps-1, 0.0, Delta, Tan, Y1,Y2, PX, Clip,ZeroY, Delta*WS, Acc);
+	    splines(Steps-1, 0.0, Delta, Tan, Y1,Y2, Acc);
        true ->
 	    Acc
     end.
 
-splines(N, XD, XD0, Tan, Y1,Y2, PX0, Clip={Cx,Cy,_},ZeroY, WS, Acc) when N > 0 ->
-    PX = PX0+WS,
+splines(N, XD, XD0, Tan, Y1,Y2, Acc) when N > 0 ->
     Delta = XD+XD0,
-    if PX < Cx ->
-	    splines(N-1, Delta, XD0, Tan, Y1, Y2, PX, Clip,ZeroY, WS, Acc);
-       true ->
-	    Y = min(Cy, max(0,spline(Delta, Tan, Y1,Y2))),
-	    splines(N-1, Delta, XD0, Tan, Y1, Y2, PX, Clip,ZeroY, WS,
-		    [{PX, ZeroY-Y}|Acc])
-    end;
-splines(_N, _XD, _XD0, _Tan, _Y1,_Y2, _PX, _Clip,_ZeroY, _WS, Acc) -> Acc.
+    Y = max(0, spline(Delta, Tan, Y1,Y2)),
+    splines(N-1, Delta, XD0, Tan, Y1, Y2, [{1.0-Delta, Y}|Acc]);
+splines(_N, _XD, _XD0, _Tan, _Y1,_Y2, Acc) ->
+    Acc.
 
 spline(T, {M1, M2}, Y1, Y2) ->
     %% Hermite Basis Funcs
@@ -423,34 +583,19 @@ spline_tan(Y0, Y1, Y2, Y3) ->
     M2 = S*C*(Y3-Y1),
     {M1,M2}.
 
--define(BW, 5).
--define(BH, 5).
-
-draw_borders(Type, Info, DC, {W,H}, {Max, Unit, MaxUnit},
+draw_borders(DC, #ti{secs=Secs, fetch=FetchFreq},
+	     #win{name=Type, geom=Geom, info=Info, max={_,_,Unit,_}},
 	     #paint{pen=Pen, pen2=Pen2, font=Font, small=Small}) ->
-    Str1 = observer_lib:to_str(MaxUnit),
-    Str2 = observer_lib:to_str(MaxUnit div 2),
-    Str3 = observer_lib:to_str(0),
-
-    setFont(DC, Font, {0,0,0}),
-    {TW,TH} = getTextExtent(DC, Str1),
-    {SpaceW, _} = getTextExtent(DC, "W"),
+    #{p0:={GraphX0, GraphY0}, p1:={GraphX1,GraphY1}, scale:={ScaleW0,_},
+      txsz:={TW,TH,SpaceW}, txt:={BottomTextY, MaxTextY}, strs:={Str1,Str2,Str3}} = Geom,
 
-    GraphX0 = ?BW+TW+?BW,
-    GraphX1 = W-?BW*4,
+    ScaleW = ScaleW0*FetchFreq,
     TopTextX = ?BW*3+TW,
-    MaxTextY = TH+?BH,
-    BottomTextY = H-?BH-TH,
     SecondsY = BottomTextY - TH,
-    GraphY0 = MaxTextY + (TH / 2),
-    GraphY1 = SecondsY - ?BH,
-    GraphW = GraphX1-GraphX0-1,
-    GraphH = GraphY1-GraphY0-1,
+
     GraphY25 = GraphY0 + (GraphY1 - GraphY0) / 4,
     GraphY50 = GraphY0 + (GraphY1 - GraphY0) / 2,
     GraphY75 = GraphY0 + 3*(GraphY1 - GraphY0) / 4,
-    ScaleW = GraphW / 60,
-    ScaleH = GraphH / Max,
 
     setFont(DC, Small, {0,0,0}),
     Align = fun(Str, Y) ->
@@ -462,14 +607,21 @@ draw_borders(Type, Info, DC, {W,H}, {Max, Unit, MaxUnit},
     Align(Str3, GraphY1 - (TH / 2) + 1),
 
     setPen(DC, Pen),
-    DrawSecs = fun(Secs, Pos) ->
-		       Str = [observer_lib:to_str(Secs)|" s"],
+    DrawSecs = fun(Sec, {Pos, Prev}) ->
+		       Str = observer_lib:to_str(Sec) ++ "s",
 		       X = GraphX0+Pos,
-		       drawText(DC, Str,  X-SpaceW, SecondsY),
 		       strokeLine(DC, X, GraphY0, X, GraphY1+5),
-		       Pos + 10*ScaleW
+		       TxtX = X-SpaceW,
+		       case TxtX > Prev of
+			   true ->
+			       drawText(DC, Str,  TxtX, SecondsY),
+			       TxtW = SpaceW*length(Str),
+			       {Pos + 10*ScaleW, TxtX+TxtW};
+			   false ->
+			       {Pos + 10*ScaleW, Prev}
+		       end
 	       end,
-    lists:foldl(DrawSecs, 0, lists:seq(60,0, -10)),
+    lists:foldl(DrawSecs, {0, 0}, lists:seq(Secs,0, -10)),
 
     strokeLine(DC, GraphX0-3, GraphY25, GraphX1, GraphY25),
     strokeLine(DC, GraphX0-3, GraphY50, GraphX1, GraphY50),
@@ -526,7 +678,7 @@ draw_borders(Type, Info, DC, {W,H}, {Max, Unit, MaxUnit},
 					  {GraphX1, GraphY1+1}, {GraphX1, GraphY0-1},
 					  {GraphX0, GraphY0-1}])
 		 end,
-    {GraphX0+1, GraphY1, ScaleW, ScaleH, DrawBorder}.
+    {GraphX0+1, GraphY1, DrawBorder}.
 
 to_string(Atom) ->
     Name = atom_to_list(Atom),
@@ -543,43 +695,44 @@ uppercase([C|Rest]) ->
 calc_max(Type, Max) ->
     bytes(Type, Max).
 
-calc_max1(Max) when Max < 10 ->
-    10;
-calc_max1(Max) ->
-    case Max div 10 of
-	X when X < 10 ->
-	    case Max rem 10 of
-		0 -> Max;
-		_ ->
-		    (X+1)*10
-	    end;
-	X ->
-	    10*calc_max1(X)
-    end.
-
-bytes(runq, Val) ->
-    Upper = calc_max1(Val),
-    {Upper, "", Upper};
-bytes(utilz, Val) ->
-    Upper = calc_max1(Val),
-    {Upper, "", Upper};
-bytes(_, B) ->
+bytes(runq, Max) ->
+    Upper = calc_max1(max_value(Max)),
+    {Max, Upper, "", Upper};
+bytes(utilz, Max) ->
+    Upper = calc_max1(max_value(Max)),
+    {Max, Upper, "", Upper};
+bytes(_, Max) ->
+    B = max_value(Max),
     KB = B div 1024,
     MB = KB div 1024,
     GB = MB div 1024,
     if
 	GB > 10 ->
 	    Upper = calc_max1(GB),
-	    {Upper*1024*1024*1024, "(GB)", Upper};
+	    {Max, Upper*1024*1024*1024, "(GB)", Upper};
 	MB > 10 ->
 	    Upper = calc_max1(MB),
-	    {Upper*1024*1024, "(MB)", Upper};
+	    {Max, Upper*1024*1024, "(MB)", Upper};
 	KB >  0 ->
 	    Upper = calc_max1(KB),
-	    {Upper*1024, "(KB)", Upper};
+	    {Max, Upper*1024, "(KB)", Upper};
 	true  ->
 	    Upper = calc_max1(B),
-	    {Upper, "(B)", Upper}
+	    {Max, Upper, "(B)", Upper}
+    end.
+
+calc_max1(Max) when Max < 10 ->
+    10;
+calc_max1(Max) ->
+    case Max div 10 of
+	X when X < 10 ->
+	    case Max rem 10 of
+		0 -> Max;
+		_ ->
+		    (X+1)*10
+	    end;
+	X ->
+	    10*calc_max1(X)
     end.
 
 colors() ->
@@ -592,6 +745,25 @@ colors() ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% wxDC and ?wxGC wrappers
 
+make_gc(Panel,UseGC) ->
+    DC = case os:type() of
+	     {win32, _} ->
+		 %% Ugly hack to avoid flickering on windows, works on windows only
+		 %% But the other platforms are doublebuffered by default
+		 DC0 = wx:typeCast(wxBufferedPaintDC:new(Panel), wxPaintDC),
+		 wxDC:clear(DC0),
+		 DC0;
+	     _ ->
+		 wxPaintDC:new(Panel)
+	 end,
+    if UseGC -> {?wxGC:create(DC), DC};
+       true ->  {false, DC}
+    end.
+
+destroy_gc({GC, DC}) ->
+    (GC =/= false) andalso ?wxGC:destroy(GC),
+    wxPaintDC:destroy(DC).
+
 haveGC() ->
     try
 	wxGraphicsRenderer:getDefaultRenderer(),
@@ -599,44 +771,48 @@ haveGC() ->
     catch _:_  -> false
     end.
 
+getSize({_, DC}) ->
+    wxDC:getSize(DC).
+
 setPen({false, DC}, Pen) ->
     wxDC:setPen(DC, Pen);
-setPen({true, GC}, Pen) ->
+setPen({GC, _}, Pen) ->
     ?wxGC:setPen(GC, Pen).
 
 setFont({false, DC}, Font, Color) ->
     wxDC:setTextForeground(DC, Color),
     wxDC:setFont(DC, Font);
-setFont({true, GC}, Font, Color) ->
+setFont({GC, _}, Font, Color) ->
     ?wxGC:setFont(GC, Font, Color).
 
 setBrush({false, DC}, Brush) ->
     wxDC:setBrush(DC, Brush);
-setBrush({true, GC}, Brush) ->
+setBrush({GC, _}, Brush) ->
     ?wxGC:setBrush(GC, Brush).
 
 strokeLine({false, DC}, X0, Y0, X1, Y1) ->
     wxDC:drawLine(DC, {round(X0), round(Y0)}, {round(X1), round(Y1)});
-strokeLine({true, GC}, X0, Y0, X1, Y1) ->
+strokeLine({GC, _}, X0, Y0, X1, Y1) ->
     ?wxGC:strokeLine(GC, X0, Y0, X1, Y1).
 
+strokeLines(_, [_]) -> ok;
 strokeLines({false, DC}, Lines) ->
     wxDC:drawLines(DC, [{round(X), round(Y)} || {X,Y} <- Lines]);
-strokeLines({true, GC}, Lines) ->
+strokeLines({GC, _}, Lines) ->
     ?wxGC:strokeLines(GC, Lines).
 
 drawRoundedRectangle({false, DC}, X0, Y0, X1, Y1, R) ->
     wxDC:drawRoundedRectangle(DC, {round(X0), round(Y0)}, {round(X1), round(Y1)}, round(R));
-drawRoundedRectangle({true, GC}, X0, Y0, X1, Y1, R) ->
+drawRoundedRectangle({GC, _}, X0, Y0, X1, Y1, R) ->
     ?wxGC:drawRoundedRectangle(GC, X0, Y0, X1, Y1, R).
 
 drawText({false, DC}, Str, X, Y) ->
     wxDC:drawText(DC, Str, {round(X),round(Y)});
-drawText({true, GC}, Str, X, Y) ->
+drawText({GC, _}, Str, X, Y) ->
     ?wxGC:drawText(GC, Str, X, Y).
 
 getTextExtent({false, DC}, Str) ->
     wxDC:getTextExtent(DC, Str);
-getTextExtent({true, GC}, Str) ->
+getTextExtent({GC, _}, Str) ->
     {W,H,_,_} = ?wxGC:getTextExtent(GC, Str),
     {W,H}.
diff --git a/lib/observer/src/observer_traceoptions_wx.erl b/lib/observer/src/observer_traceoptions_wx.erl
index 56ac96a91f..9ba9b72b6f 100644
--- a/lib/observer/src/observer_traceoptions_wx.erl
+++ b/lib/observer/src/observer_traceoptions_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2011-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.
@@ -665,7 +665,7 @@ get_file(Text) ->
     Str = wxTextCtrl:getValue(Text),
     Dialog = wxFileDialog:new(Text,
 			      [{message, "Select a file"},
-			       {default_file, Str}]),
+			       {defaultFile, Str}]),
     case wxDialog:showModal(Dialog) of
 	?wxID_OK ->
 	    Dir = wxFileDialog:getDirectory(Dialog),
diff --git a/lib/observer/src/observer_tv_table.erl b/lib/observer/src/observer_tv_table.erl
index 88f606b3e4..75e6919642 100644
--- a/lib/observer/src/observer_tv_table.erl
+++ b/lib/observer/src/observer_tv_table.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2011-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.
@@ -669,6 +669,7 @@ merge([], New, _Key) ->
 merge(Old, New, Key) ->
     merge2(keysort(Key, Old), keysort(Key, New), Key).
 
+-dialyzer({no_improper_lists, merge2/3}).
 merge2([[Obj|_]|Old], [Obj|New], Key) ->
     [[Obj]|merge2(Old, New, Key)];
 merge2([[A|Op]|Old], [B|New], Key)
diff --git a/lib/observer/test/Makefile b/lib/observer/test/Makefile
index e8bb7d0a52..6100af5e17 100644
--- a/lib/observer/test/Makefile
+++ b/lib/observer/test/Makefile
@@ -45,8 +45,8 @@ RELSYSDIR = $(RELEASE_PATH)/observer_test
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_MAKE_FLAGS += -pa $(ERL_TOP)/lib/test_server/ebin
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_MAKE_FLAGS +=
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
@@ -60,8 +60,6 @@ make_emakefile:
 		$(MODULES) > $(EMAKEFILE)
 
 tests debug opt: make_emakefile
-	cd $(ERL_TOP)/lib/test_server/src && \
-		$(MAKE) ../ebin/test_server_line.beam
 	erl $(ERL_MAKE_FLAGS) -make
 
 clean:
diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl
index eea82d8c3c..e9a3ba0369 100644
--- a/lib/observer/test/crashdump_helper.erl
+++ b/lib/observer/test/crashdump_helper.erl
@@ -21,7 +21,7 @@
 -module(crashdump_helper).
 -export([n1_proc/2,remote_proc/2]).
 -compile(r13).
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 n1_proc(N2,Creator) ->
     spawn(fun() -> n1_proc(Creator,N2,x,y,[]) end).
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 84af440245..a2b96ecb88 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -30,7 +30,6 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -define(failed_file,"failed-cases.txt").
@@ -564,22 +563,11 @@ dump_with_strange_module_name(DataDir,Rel,DumpName) ->
     CD.
 
 dump(Node,DataDir,Rel,DumpName) ->
+    Crashdump = filename:join(DataDir, dump_prefix(Rel)++DumpName),
+    rpc:call(Node,os,putenv,["ERL_CRASH_DUMP",Crashdump]),
     rpc:call(Node,erlang,halt,[DumpName]),
-    Crashdump0 = filename:join(filename:dirname(code:which(?t)),
-			       "erl_crash_dump.n1"),
-    Crashdump1 = filename:join(DataDir, dump_prefix(Rel)++DumpName),
-    ok = rename(Crashdump0,Crashdump1),
-    Crashdump1.
-
-rename(From,To) ->
-    ok = check_complete(From),
-    case file:rename(From,To) of
-	{error,exdev} ->
-	    {ok,_} = file:copy(From,To),
-	    ok = file:delete(From);
-	ok ->
-	    ok
-    end.
+    ok = check_complete(Crashdump),
+    Crashdump.
 
 check_complete(File) ->
     check_complete1(File,10).
diff --git a/lib/observer/test/etop_SUITE.erl b/lib/observer/test/etop_SUITE.erl
index d4857c5e2f..4b05e4c2a0 100644
--- a/lib/observer/test/etop_SUITE.erl
+++ b/lib/observer/test/etop_SUITE.erl
@@ -26,7 +26,7 @@
 -export([text/1,text/2,text_tracing_off/1,text_tracing_off/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(default_timeout, ?t:minutes(1)).
 
diff --git a/lib/observer/test/observer_SUITE.erl b/lib/observer/test/observer_SUITE.erl
index 7f96d72e59..a33df61b98 100644
--- a/lib/observer/test/observer_SUITE.erl
+++ b/lib/observer/test/observer_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 
 -module(observer_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("wx/include/wx.hrl").
 -include_lib("observer/src/observer_tv.hrl").
 
diff --git a/lib/observer/test/ttb_SUITE.erl b/lib/observer/test/ttb_SUITE.erl
index bdf10f507d..f1649e6cb9 100644
--- a/lib/observer/test/ttb_SUITE.erl
+++ b/lib/observer/test/ttb_SUITE.erl
@@ -32,7 +32,7 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 -export([foo/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(default_timeout, ?t:minutes(1)).
 -define(OUTPUT, "handler_output").
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index bd89977e28..aede0858d6 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 2.1.1
+OBSERVER_VSN = 2.1.2
diff --git a/lib/odbc/test/Makefile b/lib/odbc/test/Makefile
index 114eb5373d..4fecea3aae 100644
--- a/lib/odbc/test/Makefile
+++ b/lib/odbc/test/Makefile
@@ -21,7 +21,7 @@ include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 
-INCLUDES= -I. -I$(ERL_TOP)/lib/test_server/include/  -I$(ERL_TOP)/lib/odbc/src
+INCLUDES= -I. -I$(ERL_TOP)/lib/odbc/src
 
 # ----------------------------------------------------
 # Target Specs
diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index 2d4173a008..41601a2750 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -26,7 +26,6 @@
 -compile(export_all).
 
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
 -include("odbc_test.hrl").
 
 -define(MAX_SEQ_TIMEOUTS, 10).
diff --git a/lib/odbc/test/odbc_data_type_SUITE.erl b/lib/odbc/test/odbc_data_type_SUITE.erl
index a56af650c2..25988bef2a 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -27,7 +27,6 @@
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
--include("test_server_line.hrl").
 -include("odbc_test.hrl").
 
 %%--------------------------------------------------------------------
diff --git a/lib/odbc/test/odbc_query_SUITE.erl b/lib/odbc/test/odbc_query_SUITE.erl
index e8c2df7c31..79c756e956 100644
--- a/lib/odbc/test/odbc_query_SUITE.erl
+++ b/lib/odbc/test/odbc_query_SUITE.erl
@@ -26,7 +26,6 @@
 -compile(export_all).
 
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
 -include("odbc_test.hrl").
 
 %%--------------------------------------------------------------------
diff --git a/lib/odbc/test/odbc_start_SUITE.erl b/lib/odbc/test/odbc_start_SUITE.erl
index 8fb564d1f9..e16b4cfb7f 100644
--- a/lib/odbc/test/odbc_start_SUITE.erl
+++ b/lib/odbc/test/odbc_start_SUITE.erl
@@ -26,7 +26,6 @@
 -compile(export_all).
 
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
 -include("odbc_test.hrl").
 
 %% Test server callback functions
diff --git a/lib/odbc/test/odbc_test_lib.erl b/lib/odbc/test/odbc_test_lib.erl
index 6f49c019e3..88d772467c 100644
--- a/lib/odbc/test/odbc_test_lib.erl
+++ b/lib/odbc/test/odbc_test_lib.erl
@@ -26,7 +26,7 @@
 -compile(export_all).
 
 -include("odbc_test.hrl").
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 unique_table_name() ->                              
     lists:reverse(lists:foldl(fun($@, Acc) -> [$t, $A |Acc] ;
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index 7b5d0f96ca..1da60ba486 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -34,7 +34,21 @@
   </header>
 
 
-  <section><title>Orber 3.8</title>
+  <section><title>Orber 3.8.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Suppress Dialyzer warnings. </p>
+          <p>
+	    Own Id: OTP-12862</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Orber 3.8</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/orber/src/orber_ifr.erl b/lib/orber/src/orber_ifr.erl
index cc23d9e242..70e0cb3fca 100644
--- a/lib/orber/src/orber_ifr.erl
+++ b/lib/orber/src/orber_ifr.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -780,6 +780,7 @@ find_repository() ->
 
 'Repository__get_def_kind'(Objref) ->
     orber_ifr_repository:'_get_def_kind'(Objref).
+-spec 'Repository_destroy'(_) -> no_return().
 'Repository_destroy'(Objref) ->
     orber_ifr_repository:destroy(Objref).
 'Repository_lookup'(Objref,Search_name) ->
@@ -1405,6 +1406,7 @@ find_repository() ->
     orber_ifr_orb:create_wstring_tc(Bound).
 'ORB_create_sequence_tc'(Bound,Element_type) ->
     orber_ifr_orb:create_sequence_tc(Bound,Element_type).
+-spec 'ORB_create_recursive_sequence_tc'(_,_) -> no_return().
 'ORB_create_recursive_sequence_tc'(Bound,Offset) ->
     orber_ifr_orb:create_recursive_sequence_tc(Bound,Offset).
 'ORB_create_array_tc'(Length,Element_type) ->
diff --git a/lib/orber/src/orber_ifr_orb.erl b/lib/orber/src/orber_ifr_orb.erl
index a408a9a749..3969bbf37a 100644
--- a/lib/orber/src/orber_ifr_orb.erl
+++ b/lib/orber/src/orber_ifr_orb.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -89,6 +89,7 @@ create_wstring_tc(Bound) ->
 create_sequence_tc(Bound, Element_type) ->
     {tk_sequence,Element_type,Bound}.
 
+-spec create_recursive_sequence_tc(_, _) -> no_return().
 create_recursive_sequence_tc(Bound, Offset) ->
     orber:dbg("[~p] ~p:create_recursive_sequence_tc(~p, ~p);~n"
 	      "Create_recursive_sequence is not implemented.~n", 
diff --git a/lib/orber/src/orber_ifr_repository.erl b/lib/orber/src/orber_ifr_repository.erl
index 898fba99f3..8d52573e53 100644
--- a/lib/orber/src/orber_ifr_repository.erl
+++ b/lib/orber/src/orber_ifr_repository.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -66,6 +66,7 @@
 '_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_Repository, ObjType) ->
     orber_ifr_irobject:'_get_def_kind'({ObjType, ObjID}).
 
+-spec destroy(_) -> no_return().
 destroy({ObjType, ObjID}) ?tcheck(ir_Repository, ObjType) ->
     orber:dbg("[~p] ~p:destroy(~p, ~p);~n"
 	      "Destroying a repository is an error.~n", 
diff --git a/lib/orber/src/orber_iiop.erl b/lib/orber/src/orber_iiop.erl
index d23cd74146..8cb39c7365 100644
--- a/lib/orber/src/orber_iiop.erl
+++ b/lib/orber/src/orber_iiop.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -176,7 +176,7 @@ request({Host, Port, InitObjkey, Index, TaggedProfile, HostData},
             corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
     end.
 
-
+-dialyzer({no_improper_lists, encode_request/1}).
 encode_request(#giop_env{interceptors = false} = Env) ->
     case catch cdr_encode:enc_request(Env) of
 	{'EXCEPTION', Exc} ->
diff --git a/lib/orber/src/orber_iiop_inrequest.erl b/lib/orber/src/orber_iiop_inrequest.erl
index 625bfd3e86..9d84b63398 100644
--- a/lib/orber/src/orber_iiop_inrequest.erl
+++ b/lib/orber/src/orber_iiop_inrequest.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-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.
@@ -240,6 +240,7 @@ check_context([_|Rest], Acc, Env) ->
 %%-----------------------------------------------------------------
 %% Func: call_interceptors
 %%-----------------------------------------------------------------
+-dialyzer({no_improper_lists, call_interceptors/7}).
 call_interceptors(SocketType, #giop_env{interceptors = {native, Ref, PIs},
 					ctx = Ctx} = Env, 
 		  ReqHdr, Rest, Len, ByteOrder, Msg) ->
@@ -276,6 +277,7 @@ call_interceptors(SocketType, #giop_env{interceptors = {portable, _PIs}} = Env,
 %%-----------------------------------------------------------------
 %% Func: call_interceptors_out
 %%-----------------------------------------------------------------
+-dialyzer({no_improper_lists, call_interceptors_out/7}).
 call_interceptors_out(#giop_env{interceptors = {native, Ref, PIs}, ctx = Ctx} = Env, 
 		      ReqId, Result, Obj, Type, Operation, TypeCodes) ->
     ReqHdr = #request_header{object_key = Obj,
diff --git a/lib/orber/src/orber_pi.erl b/lib/orber/src/orber_pi.erl
index 11c489bb17..19bb7af6c0 100644
--- a/lib/orber/src/orber_pi.erl
+++ b/lib/orber/src/orber_pi.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-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.
@@ -1030,6 +1030,7 @@ receive_exception(CRI, Mod) ->
 %%            SlotId - ulong()
 %% Returns  : {'EXCEPTION', #'PortableInterceptor_InvalidSlot'{}}
 %%------------------------------------------------------------
+-spec get_slot(_, _) -> no_return().
 get_slot(_XRI, _SlotId) ->
     corba:raise(#'PortableInterceptor_InvalidSlot'{}).
 
@@ -1185,6 +1186,7 @@ get_server_policy(#'ServerRequestInfo'{contexts = Ctxs}, _PolicyType) ->
 %%            Data - #any{}
 %% Returns  : {'EXCEPTION', #'PortableInterceptor_InvalidSlot'{}}
 %%------------------------------------------------------------
+-spec set_slot(_, _, _) -> no_return().
 set_slot(_SRI, _SlotId, _Data) ->
     corba:raise(#'PortableInterceptor_InvalidSlot'{}).
 
diff --git a/lib/orber/test/Makefile b/lib/orber/test/Makefile
index b9be48c790..1d4e3c70f0 100644
--- a/lib/orber/test/Makefile
+++ b/lib/orber/test/Makefile
@@ -162,12 +162,10 @@ TARGET_FILES = \
 ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin -pa $(ERL_TOP)/lib/ic/ebin
 
 ERL_COMPILE_FLAGS += $(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/test_server/ebin \
 	-pa $(ERL_TOP)/lib/ic/ebin \
 	-pa $(ERL_TOP)/lib/orber/ebin \
 	-I$(ERL_TOP)/lib/orber \
-	-I$(ERL_TOP)/lib/orber/test/$(IDLOUTDIR) \
-	-I$(ERL_TOP)/lib/test_server/include
+	-I$(ERL_TOP)/lib/orber/test/$(IDLOUTDIR)
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/orber/test/cdrcoding_10_SUITE.erl b/lib/orber/test/cdrcoding_10_SUITE.erl
index 1fec91dca3..dac6e78ddd 100644
--- a/lib/orber/test/cdrcoding_10_SUITE.erl
+++ b/lib/orber/test/cdrcoding_10_SUITE.erl
@@ -28,7 +28,7 @@
 
 
 -include("idl_output/Module.hrl").
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
diff --git a/lib/orber/test/cdrcoding_11_SUITE.erl b/lib/orber/test/cdrcoding_11_SUITE.erl
index 324b9b2b17..f4fe3d06e3 100644
--- a/lib/orber/test/cdrcoding_11_SUITE.erl
+++ b/lib/orber/test/cdrcoding_11_SUITE.erl
@@ -28,7 +28,7 @@
 
 
 -include("idl_output/Module.hrl").
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
diff --git a/lib/orber/test/cdrcoding_12_SUITE.erl b/lib/orber/test/cdrcoding_12_SUITE.erl
index f0a8fe4d7f..8843233d35 100644
--- a/lib/orber/test/cdrcoding_12_SUITE.erl
+++ b/lib/orber/test/cdrcoding_12_SUITE.erl
@@ -29,7 +29,7 @@
 -module(cdrcoding_12_SUITE).
 
 -include("idl_output/Module.hrl").
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
diff --git a/lib/orber/test/cdrlib_SUITE.erl b/lib/orber/test/cdrlib_SUITE.erl
index dd1f975d9e..8fc9c655ce 100644
--- a/lib/orber/test/cdrlib_SUITE.erl
+++ b/lib/orber/test/cdrlib_SUITE.erl
@@ -26,7 +26,7 @@
 %%-----------------------------------------------------------------
 -module(cdrlib_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
 
diff --git a/lib/orber/test/corba_SUITE.erl b/lib/orber/test/corba_SUITE.erl
index 914856f370..018d8b5f12 100644
--- a/lib/orber/test/corba_SUITE.erl
+++ b/lib/orber/test/corba_SUITE.erl
@@ -26,7 +26,7 @@
 %%-----------------------------------------------------------------
 -module(corba_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
diff --git a/lib/orber/test/csiv2_SUITE.erl b/lib/orber/test/csiv2_SUITE.erl
index 7f45f16ef7..cf4dbec073 100644
--- a/lib/orber/test/csiv2_SUITE.erl
+++ b/lib/orber/test/csiv2_SUITE.erl
@@ -21,7 +21,7 @@
 
 -module(csiv2_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
diff --git a/lib/orber/test/data_types_SUITE.erl b/lib/orber/test/data_types_SUITE.erl
index d0e0eacad1..f910eecae7 100644
--- a/lib/orber/test/data_types_SUITE.erl
+++ b/lib/orber/test/data_types_SUITE.erl
@@ -26,7 +26,7 @@
 
 -module(data_types_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
diff --git a/lib/orber/test/generated_SUITE.erl b/lib/orber/test/generated_SUITE.erl
index cc14b4ebc0..7af355620e 100644
--- a/lib/orber/test/generated_SUITE.erl
+++ b/lib/orber/test/generated_SUITE.erl
@@ -26,7 +26,7 @@
 
 -module(generated_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
diff --git a/lib/orber/test/interceptors_SUITE.erl b/lib/orber/test/interceptors_SUITE.erl
index 57d5a5f831..ec30187aca 100644
--- a/lib/orber/test/interceptors_SUITE.erl
+++ b/lib/orber/test/interceptors_SUITE.erl
@@ -26,7 +26,7 @@
 
 -module(interceptors_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
diff --git a/lib/orber/test/iop_ior_10_SUITE.erl b/lib/orber/test/iop_ior_10_SUITE.erl
index 5705a95710..edfe566dcd 100644
--- a/lib/orber/test/iop_ior_10_SUITE.erl
+++ b/lib/orber/test/iop_ior_10_SUITE.erl
@@ -26,7 +26,7 @@
 %%-----------------------------------------------------------------
 -module(iop_ior_10_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
diff --git a/lib/orber/test/iop_ior_11_SUITE.erl b/lib/orber/test/iop_ior_11_SUITE.erl
index b32da44c68..d24e3fb882 100644
--- a/lib/orber/test/iop_ior_11_SUITE.erl
+++ b/lib/orber/test/iop_ior_11_SUITE.erl
@@ -26,7 +26,7 @@
 %%-----------------------------------------------------------------
 -module(iop_ior_11_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
diff --git a/lib/orber/test/iop_ior_12_SUITE.erl b/lib/orber/test/iop_ior_12_SUITE.erl
index a12f341f04..725118b609 100644
--- a/lib/orber/test/iop_ior_12_SUITE.erl
+++ b/lib/orber/test/iop_ior_12_SUITE.erl
@@ -27,7 +27,7 @@
 -module(iop_ior_12_SUITE).
 
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
diff --git a/lib/orber/test/ip_v4v6_interop_SUITE.erl b/lib/orber/test/ip_v4v6_interop_SUITE.erl
index 995a11ae1e..4840501418 100644
--- a/lib/orber/test/ip_v4v6_interop_SUITE.erl
+++ b/lib/orber/test/ip_v4v6_interop_SUITE.erl
@@ -47,7 +47,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
diff --git a/lib/orber/test/lname_SUITE.erl b/lib/orber/test/lname_SUITE.erl
index 2200ff6ed1..1fb4d7bbb9 100644
--- a/lib/orber/test/lname_SUITE.erl
+++ b/lib/orber/test/lname_SUITE.erl
@@ -26,7 +26,7 @@
 %%-----------------------------------------------------------------
 -module(lname_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/COSS/CosNaming/lname.hrl").
 
diff --git a/lib/orber/test/multi_ORB_SUITE.erl b/lib/orber/test/multi_ORB_SUITE.erl
index 6b523229cc..abedcec407 100644
--- a/lib/orber/test/multi_ORB_SUITE.erl
+++ b/lib/orber/test/multi_ORB_SUITE.erl
@@ -21,7 +21,7 @@
 
 -module(multi_ORB_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
diff --git a/lib/orber/test/naming_context_SUITE.erl b/lib/orber/test/naming_context_SUITE.erl
index f99820fa24..626b9237b5 100644
--- a/lib/orber/test/naming_context_SUITE.erl
+++ b/lib/orber/test/naming_context_SUITE.erl
@@ -26,7 +26,7 @@
 %%-----------------------------------------------------------------
 -module(naming_context_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 -include_lib("orber/include/corba.hrl").
diff --git a/lib/orber/test/orber_SUITE.erl b/lib/orber/test/orber_SUITE.erl
index 914705adb9..1ca22cd60b 100644
--- a/lib/orber/test/orber_SUITE.erl
+++ b/lib/orber/test/orber_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 %%
 -module(orber_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(default_timeout, ?t:minutes(15)).
 -define(application, orber).
diff --git a/lib/orber/test/orber_acl_SUITE.erl b/lib/orber/test/orber_acl_SUITE.erl
index 8d1f9ebb6d..0d8f79de5c 100644
--- a/lib/orber/test/orber_acl_SUITE.erl
+++ b/lib/orber/test/orber_acl_SUITE.erl
@@ -26,7 +26,7 @@
 %%-----------------------------------------------------------------
 -module(orber_acl_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(default_timeout, ?t:minutes(5)).
 
diff --git a/lib/orber/test/orber_firewall_ipv4_in_SUITE.erl b/lib/orber/test/orber_firewall_ipv4_in_SUITE.erl
index 220029ec72..efa4f120c7 100644
--- a/lib/orber/test/orber_firewall_ipv4_in_SUITE.erl
+++ b/lib/orber/test/orber_firewall_ipv4_in_SUITE.erl
@@ -21,7 +21,7 @@
 
 -module(orber_firewall_ipv4_in_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
diff --git a/lib/orber/test/orber_firewall_ipv4_out_SUITE.erl b/lib/orber/test/orber_firewall_ipv4_out_SUITE.erl
index 270b166fe9..cfe1ab2d95 100644
--- a/lib/orber/test/orber_firewall_ipv4_out_SUITE.erl
+++ b/lib/orber/test/orber_firewall_ipv4_out_SUITE.erl
@@ -21,7 +21,7 @@
 
 -module(orber_firewall_ipv4_out_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
diff --git a/lib/orber/test/orber_firewall_ipv6_in_SUITE.erl b/lib/orber/test/orber_firewall_ipv6_in_SUITE.erl
index b0e28118f7..514504716f 100644
--- a/lib/orber/test/orber_firewall_ipv6_in_SUITE.erl
+++ b/lib/orber/test/orber_firewall_ipv6_in_SUITE.erl
@@ -21,7 +21,7 @@
 
 -module(orber_firewall_ipv6_in_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
diff --git a/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl b/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl
index 96884f3339..9ff57a0294 100644
--- a/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl
+++ b/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl
@@ -21,7 +21,7 @@
 
 -module(orber_firewall_ipv6_out_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
diff --git a/lib/orber/test/orber_nat_SUITE.erl b/lib/orber/test/orber_nat_SUITE.erl
index 1294f96681..0751cdf89c 100644
--- a/lib/orber/test/orber_nat_SUITE.erl
+++ b/lib/orber/test/orber_nat_SUITE.erl
@@ -21,7 +21,7 @@
 
 -module(orber_nat_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl
index 51025927ee..796ed21489 100644
--- a/lib/orber/test/orber_test_lib.erl
+++ b/lib/orber/test/orber_test_lib.erl
@@ -20,7 +20,7 @@
 %%
 
 -module(orber_test_lib).
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/include/ifr_types.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
diff --git a/lib/orber/test/orber_web_SUITE.erl b/lib/orber/test/orber_web_SUITE.erl
index a88e0373bd..31c67be9d8 100644
--- a/lib/orber/test/orber_web_SUITE.erl
+++ b/lib/orber/test/orber_web_SUITE.erl
@@ -26,7 +26,7 @@
 
 -module(orber_web_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/include/corba.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
diff --git a/lib/orber/test/tc_SUITE.erl b/lib/orber/test/tc_SUITE.erl
index a1a5c74ae3..c670ebdea2 100644
--- a/lib/orber/test/tc_SUITE.erl
+++ b/lib/orber/test/tc_SUITE.erl
@@ -26,7 +26,7 @@
 %%-----------------------------------------------------------------
 -module(tc_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("orber/src/orber_iiop.hrl").
 
 -define(default_timeout, ?t:minutes(3)).
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index 505c77de18..4947315ad0 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1 +1 @@
-ORBER_VSN = 3.8
+ORBER_VSN = 3.8.1
diff --git a/lib/os_mon/test/Makefile b/lib/os_mon/test/Makefile
index cdfc13a4c1..aace77a3f0 100644
--- a/lib/os_mon/test/Makefile
+++ b/lib/os_mon/test/Makefile
@@ -55,8 +55,7 @@ RELSYSDIR = $(RELEASE_PATH)/os_mon_test
 # FLAGS
 # ----------------------------------------------------
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include \
-	-I$(ERL_TOP)/lib/snmp/include
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/snmp/include
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/os_mon/test/cpu_sup_SUITE.erl b/lib/os_mon/test/cpu_sup_SUITE.erl
index e96b54d3fe..69c7414630 100644
--- a/lib/os_mon/test/cpu_sup_SUITE.erl
+++ b/lib/os_mon/test/cpu_sup_SUITE.erl
@@ -18,10 +18,10 @@
 %% %CopyrightEnd%
 %%
 -module(cpu_sup_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -31,186 +31,163 @@
 -export([port/1]).
 -export([terminate/1, unavailable/1, restart/1]).
 
-%% Default timetrap timeout (set in init_per_testcase)
--define(default_timeout, ?t:minutes(1)).
-
 init_per_suite(Config) when is_list(Config) ->
-    ?line ok = application:start(os_mon),
+    ok = application:start(os_mon),
     Config.
 
 end_per_suite(Config) when is_list(Config) ->
-    ?line ok = application:stop(os_mon),
+    ok = application:stop(os_mon),
     Config.
 
 init_per_testcase(unavailable, Config) ->
     terminate(Config),
     init_per_testcase(dummy, Config);
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
+    Config.
 
 end_per_testcase(unavailable, Config) ->
     restart(Config),
     end_per_testcase(dummy, Config);
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     case test_server:os_type() of
-	{unix, sunos} ->
-	    [load_api, util_api, util_values, port, unavailable];
-	{unix, linux} ->
-	    [load_api, util_api, util_values, port, unavailable];
-	{unix, freebsd} ->
-	    [load_api, util_api, util_values, port, unavailable];
-	{unix, _OSname} -> [load_api];
-	_OS -> [unavailable]
+        {unix, sunos} ->
+            [load_api, util_api, util_values, port, unavailable];
+        {unix, linux} ->
+            [load_api, util_api, util_values, port, unavailable];
+        {unix, freebsd} ->
+            [load_api, util_api, util_values, port, unavailable];
+        {unix, _OSname} -> [load_api];
+        _OS -> [unavailable]
     end.
 
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-load_api(suite) ->
-    [];
-load_api(doc) ->
-    ["Test of load API functions"];
+%% Test of load API functions
 load_api(Config) when is_list(Config) ->
 
     %% nprocs()
-    ?line N = cpu_sup:nprocs(),
-    ?line true = is_integer(N),
-    ?line true = N>0,
-    ?line true = N<1000000,
+    N = cpu_sup:nprocs(),
+    true = is_integer(N),
+    true = N>0,
+    true = N<1000000,
 
     %% avg1()
-    ?line Load1 = cpu_sup:avg1(),
-    ?line true = is_integer(Load1),
-    ?line true = Load1>0,
+    Load1 = cpu_sup:avg1(),
+    true = is_integer(Load1),
+    true = Load1>0,
 
     %% avg5()
-    ?line Load5 = cpu_sup:avg5(),
-    ?line true = is_integer(Load5),
-    ?line true = Load5>0,
+    Load5 = cpu_sup:avg5(),
+    true = is_integer(Load5),
+    true = Load5>0,
 
     %% avg15()
-    ?line Load15 = cpu_sup:avg15(),
-    ?line true = is_integer(Load15),
-    ?line true = Load15>0,
+    Load15 = cpu_sup:avg15(),
+    true = is_integer(Load15),
+    true = Load15>0,
 
     ok.
 
-util_api(suite) ->
-    [];
-util_api(doc) ->
-    ["Test of utilization API functions"];
+%% Test of utilization API functions
 util_api(Config) when is_list(Config) ->
     %% Some useful funs when testing util/1
     BusyP = fun({user, _Share}) -> true;
-	       ({nice_user, _Share}) -> true;
-	       ({kernel, _Share}) -> true;
-	       ({hard_irq, _Share}) -> true;
-	       ({soft_irq, _Share}) -> true;
-	       (_) -> false
-	    end,
+               ({nice_user, _Share}) -> true;
+               ({kernel, _Share}) -> true;
+               ({hard_irq, _Share}) -> true;
+               ({soft_irq, _Share}) -> true;
+               (_) -> false
+            end,
     NonBusyP = fun({wait, _Share}) -> true;
-		  ({idle, _Share}) -> true;
-		  ({steal, _Share}) -> true;
-		  (_) -> false
-	       end,
+                  ({idle, _Share}) -> true;
+                  ({steal, _Share}) -> true;
+                  (_) -> false
+               end,
     Sum = fun({_Tag, X}, Acc) -> Acc+X end,
 
     %% util()
-    ?line Util1 = cpu_sup:util(),
-    ?line true = is_number(Util1),
-    ?line true = Util1>0,
-    ?line Util2 = cpu_sup:util(),
-    ?line true = is_number(Util2),
-    ?line true = Util2>0,
+    Util1 = cpu_sup:util(),
+    true = is_number(Util1),
+    true = Util1>0,
+    Util2 = cpu_sup:util(),
+    true = is_number(Util2),
+    true = Util2>0,
 
     %% util([])
-    ?line {all, Busy1, NonBusy1, []} = cpu_sup:util([]),
-    ?line 100.00 = Busy1 + NonBusy1,
+    {all, Busy1, NonBusy1, []} = cpu_sup:util([]),
+    100.00 = Busy1 + NonBusy1,
 
     %% util([detailed])
-    ?line {Cpus2, Busy2, NonBusy2, []} = cpu_sup:util([detailed]),
-    ?line true = lists:all(fun(X) -> is_integer(X) end, Cpus2),
-    ?line true = lists:all(BusyP, Busy2),
-    ?line true = lists:all(NonBusyP, NonBusy2),
-    ?line 100.00 = lists:foldl(Sum,0,Busy2)+lists:foldl(Sum,0,NonBusy2),
+    {Cpus2, Busy2, NonBusy2, []} = cpu_sup:util([detailed]),
+    true = lists:all(fun(X) -> is_integer(X) end, Cpus2),
+    true = lists:all(BusyP, Busy2),
+    true = lists:all(NonBusyP, NonBusy2),
+    100.00 = lists:foldl(Sum,0,Busy2)+lists:foldl(Sum,0,NonBusy2),
 
     %% util([per_cpu])
-    ?line [{Cpu3, Busy3, NonBusy3, []}|_] = cpu_sup:util([per_cpu]),
-    ?line true = is_integer(Cpu3),
-    ?line 100.00 = Busy3 + NonBusy3,
+    [{Cpu3, Busy3, NonBusy3, []}|_] = cpu_sup:util([per_cpu]),
+    true = is_integer(Cpu3),
+    100.00 = Busy3 + NonBusy3,
 
     %% util([detailed, per_cpu])
-    ?line [{Cpu4, Busy4, NonBusy4, []}|_] =
-	cpu_sup:util([detailed, per_cpu]),
-    ?line true = is_integer(Cpu4),
-    ?line true = lists:all(BusyP, Busy2),
-    ?line true = lists:all(NonBusyP, NonBusy2),
-    ?line 100.00 = lists:foldl(Sum,0,Busy4)+lists:foldl(Sum,0,NonBusy4),
+    [{Cpu4, Busy4, NonBusy4, []}|_] =
+    cpu_sup:util([detailed, per_cpu]),
+    true = is_integer(Cpu4),
+    true = lists:all(BusyP, Busy2),
+    true = lists:all(NonBusyP, NonBusy2),
+    100.00 = lists:foldl(Sum,0,Busy4)+lists:foldl(Sum,0,NonBusy4),
 
     %% bad util/1 calls
-    ?line {'EXIT',{badarg,_}} = (catch cpu_sup:util(detailed)),
-    ?line {'EXIT',{badarg,_}} = (catch cpu_sup:util([detialed])),
+    {'EXIT',{badarg,_}} = (catch cpu_sup:util(detailed)),
+    {'EXIT',{badarg,_}} = (catch cpu_sup:util([detialed])),
 
     ok.
 
 -define(SPIN_TIME, 1000).
 
-util_values(suite) ->
-    [];
-util_values(doc) ->
-    ["Test utilization values"];
+%% Test utilization values
 util_values(Config) when is_list(Config) ->
 
     Tester = self(),
     Ref = make_ref(),
     Loop = fun (L) -> L(L) end,
     Spinner = fun () ->
-		      Looper = spawn_link(fun () -> Loop(Loop) end),
-		      receive after ?SPIN_TIME -> ok end,
-		      unlink(Looper),
-		      exit(Looper, kill),
-		      Tester ! Ref
-	      end,
+                      Looper = spawn_link(fun () -> Loop(Loop) end),
+                      receive after ?SPIN_TIME -> ok end,
+                      unlink(Looper),
+                      exit(Looper, kill),
+                      Tester ! Ref
+              end,
 
-    ?line cpu_sup:util(),
+    cpu_sup:util(),
 
-    ?line spawn_link(Spinner),
-    ?line receive Ref -> ok end,
-    ?line HighUtil1 = cpu_sup:util(),
+    spawn_link(Spinner),
+    receive Ref -> ok end,
+    HighUtil1 = cpu_sup:util(),
 
-    ?line receive after ?SPIN_TIME -> ok end,
-    ?line LowUtil1 = cpu_sup:util(),
+    receive after ?SPIN_TIME -> ok end,
+    LowUtil1 = cpu_sup:util(),
 
-    ?line spawn_link(Spinner),
-    ?line receive Ref -> ok end,
-    ?line HighUtil2 = cpu_sup:util(),
+    spawn_link(Spinner),
+    receive Ref -> ok end,
+    HighUtil2 = cpu_sup:util(),
 
-    ?line receive after ?SPIN_TIME -> ok end,
-    ?line LowUtil2 = cpu_sup:util(),
+    receive after ?SPIN_TIME -> ok end,
+    LowUtil2 = cpu_sup:util(),
 
     Utils = [{high1,HighUtil1}, {low1,LowUtil1},
-	     {high2,HighUtil2}, {low2,LowUtil2}],
-    ?t:format("Utils: ~p~n", [Utils]),
+             {high2,HighUtil2}, {low2,LowUtil2}],
+    io:format("Utils: ~p~n", [Utils]),
 
-    ?line false = LowUtil1 > HighUtil1,
-    ?line false = LowUtil1 > HighUtil2,
-    ?line false = LowUtil2 > HighUtil1,
-    ?line false = LowUtil2 > HighUtil2,
+    false = LowUtil1 > HighUtil1,
+    false = LowUtil1 > HighUtil2,
+    false = LowUtil2 > HighUtil1,
+    false = LowUtil2 > HighUtil2,
 
     ok.
 
@@ -218,76 +195,66 @@ util_values(Config) when is_list(Config) ->
 % Outdated
 % The portprogram is now restarted if killed, and not by os_mon...
 
-port(suite) ->
-    [];
-port(doc) ->
-    ["Test that cpu_sup handles a terminating port program"];
+%% Test that cpu_sup handles a terminating port program
 port(Config) when is_list(Config) ->
     case cpu_sup_os_pid() of
-	{ok, PidStr} ->
-	    %% Monitor cpu_sup
-	    ?line MonRef = erlang:monitor(process, cpu_sup),
-	    ?line N1 = cpu_sup:nprocs(),
-	    ?line true = N1>0,
-
-	    %% Kill the port program
-	    case os:cmd("kill -9 " ++ PidStr) of
-		[] ->
-		    %% cpu_sup should not terminate
-		    receive
-			{'DOWN', MonRef, _, _, Reason} ->
-			    ?line ?t:fail({unexpected_exit_reason, Reason})
-		    after 3000 ->
-			ok
-		    end,
-
-		    %% Give cpu_sup time to restart cpu_sup port
-		    ?t:sleep(?t:seconds(3)),
-		    ?line N2 = cpu_sup:nprocs(),
-		    ?line true = N2>0,
-
-		    erlang:demonitor(MonRef),
-		    ok;
-
-		Line ->
-		    erlang:demonitor(MonRef),
-		    {skip, {not_killed, Line}}
-	    end;
-	_ ->
-	    {skip, os_pid_not_found }
+        {ok, PidStr} ->
+            %% Monitor cpu_sup
+            MonRef = erlang:monitor(process, cpu_sup),
+            N1 = cpu_sup:nprocs(),
+            true = N1>0,
+
+            %% Kill the port program
+            case os:cmd("kill -9 " ++ PidStr) of
+                [] ->
+                    %% cpu_sup should not terminate
+                    receive
+                        {'DOWN', MonRef, _, _, Reason} ->
+                            ct:fail({unexpected_exit_reason, Reason})
+                    after 3000 ->
+                              ok
+                    end,
+
+                    %% Give cpu_sup time to restart cpu_sup port
+                    ct:sleep({seconds, 3}),
+                    N2 = cpu_sup:nprocs(),
+                    true = N2>0,
+
+                    erlang:demonitor(MonRef),
+                    ok;
+
+                Line ->
+                    erlang:demonitor(MonRef),
+                    {skip, {not_killed, Line}}
+            end;
+        _ ->
+            {skip, os_pid_not_found }
     end.
 
-terminate(suite) ->
-    [];
 terminate(Config) when is_list(Config) ->
     ok = application:set_env(os_mon, start_cpu_sup, false),
     _ = supervisor:terminate_child(os_mon_sup, cpu_sup),
     ok.
 
-unavailable(suite) ->
-    [];
-unavailable(doc) ->
-    ["Test correct behaviour when service is unavailable"];
+%% Test correct behaviour when service is unavailable
 unavailable(Config) when is_list(Config) ->
 
     %% Make sure all API functions return their dummy values
-    ?line 0 = cpu_sup:nprocs(),
-    ?line 0 = cpu_sup:avg1(),
-    ?line 0 = cpu_sup:avg5(),
-    ?line 0 = cpu_sup:avg15(),
-    ?line 0 = cpu_sup:util(),
-    ?line {all,0,0,[]} = cpu_sup:util([]),
-    ?line {all,0,0,[]} = cpu_sup:util([detailed]),
-    ?line {all,0,0,[]} = cpu_sup:util([per_cpu]),
-    ?line {all,0,0,[]} = cpu_sup:util([detailed,per_cpu]),
+    0 = cpu_sup:nprocs(),
+    0 = cpu_sup:avg1(),
+    0 = cpu_sup:avg5(),
+    0 = cpu_sup:avg15(),
+    0 = cpu_sup:util(),
+    {all,0,0,[]} = cpu_sup:util([]),
+    {all,0,0,[]} = cpu_sup:util([detailed]),
+    {all,0,0,[]} = cpu_sup:util([per_cpu]),
+    {all,0,0,[]} = cpu_sup:util([detailed,per_cpu]),
 
     ok.
 
-restart(suite) ->
-    [];
 restart(Config) when is_list(Config) ->
-    ?line ok = application:set_env(os_mon, start_cpu_sup, true),
-    ?line {ok, _Pid} = supervisor:restart_child(os_mon_sup, cpu_sup),
+    ok = application:set_env(os_mon, start_cpu_sup, true),
+    {ok, _Pid} = supervisor:restart_child(os_mon_sup, cpu_sup),
     ok.
 
 %% Aux
@@ -295,6 +262,6 @@ restart(Config) when is_list(Config) ->
 cpu_sup_os_pid() ->
     Str = os:cmd("ps -e | grep '[c]pu_sup'"),
     case io_lib:fread("~s", Str) of
-	{ok, [Pid], _Rest} -> {ok, Pid};
-	_ -> {error, pid_not_found}
+        {ok, [Pid], _Rest} -> {ok, Pid};
+        _ -> {error, pid_not_found}
     end.
diff --git a/lib/os_mon/test/disksup_SUITE.erl b/lib/os_mon/test/disksup_SUITE.erl
index e41fc73ab2..bd90093d29 100644
--- a/lib/os_mon/test/disksup_SUITE.erl
+++ b/lib/os_mon/test/disksup_SUITE.erl
@@ -18,10 +18,10 @@
 %% %CopyrightEnd%
 %%
 -module(disksup_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -32,9 +32,6 @@
 -export([otp_5910/1]).
 -export([posix_only/1]).
 
-%% Default timetrap timeout (set in init_per_testcase)
--define(default_timeout, ?t:minutes(1)).
-
 init_per_suite(Config) when is_list(Config) ->
     ok = application:start(os_mon),
     Config.
@@ -47,19 +44,18 @@ init_per_testcase(unavailable, Config) ->
     terminate(Config),
     init_per_testcase(dummy, Config);
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?default_timeout),
-    [{watchdog,Dog} | Config].
+    Config.
 
 end_per_testcase(TC, Config) when TC =:= unavailable;
                                   TC =:= posix_only ->
     restart(Config),
     end_per_testcase(dummy, Config);
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     Bugs = [otp_5910],
@@ -70,18 +66,7 @@ all() ->
 	_OS -> [unavailable]
     end.
 
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-api(suite) -> [];
-api(doc) -> ["Test of API functions"];
+%% Test of API functions
 api(Config) when is_list(Config) ->
 
     %% get_disk_data()
@@ -110,8 +95,7 @@ api(Config) when is_list(Config) ->
 
     ok.
 
-config(suite) -> [];
-config(doc) -> ["Test configuration"];
+%% Test configuration
 config(Config) when is_list(Config) ->
 
     %% Change configuration parameters and make sure change is reflected
@@ -147,8 +131,8 @@ config(Config) when is_list(Config) ->
 %% changes too much during its course, or if there are timing problems
 %% with the alarm_handler receiving the alarms too late
 %%----------------------------------------------------------------------
-alarm(suite) -> [];
-alarm(doc) -> ["Test that alarms are set and cleared"];
+
+%% Test that alarms are set and cleared
 alarm(Config) when is_list(Config) ->
 
     %% Find out how many disks exceed the threshold
@@ -162,7 +146,7 @@ alarm(Config) when is_list(Config) ->
 	    true;
 	true ->
 	    dump_info(),
-	    ?t:fail({bad_alarms, Threshold1, Data1, Alarms1})
+	    ct:fail({bad_alarms, Threshold1, Data1, Alarms1})
     end,
 
     %% Try to find a disk with space usage below Threshold1,
@@ -187,7 +171,7 @@ alarm(Config) when is_list(Config) ->
 			  true;
 		      true ->
 			  dump_info(),
-			  ?t:fail({bad_alarms, Threshold2, Data2, Alarms2})
+			  ct:fail({bad_alarms, Threshold2, Data2, Alarms2})
 		  end;
 	      false ->
 		  ignore
@@ -215,7 +199,7 @@ alarm(Config) when is_list(Config) ->
 			  ok;
 		      true ->
 			  dump_info(),
-			  ?t:fail({bad_alarms, Threshold3, Data3, Alarms3})
+			  ct:fail({bad_alarms, Threshold3, Data3, Alarms3})
 		  end;
 	      100 ->
 		  ignore
@@ -271,9 +255,7 @@ until(Fun, [H|T]) ->
     end;
 until(_Fun, []) -> false.
 
-port(suite) -> [];
-port(doc) ->
-    ["Test that disksup handles a terminating port program"];
+%% Test that disksup handles a terminating port program
 port(Config) when is_list(Config) ->
     Str = os:cmd("ps -ef | grep '[d]isksup'"),
     case io_lib:fread("~s ~s", Str) of
@@ -293,14 +275,14 @@ port(Config) when is_list(Config) ->
 			{'DOWN', MonRef, _, _, {port_died, _Reason}} ->
 			    ok;
 			{'DOWN', MonRef, _, _, Reason} ->
-			    ?t:fail({unexpected_exit_reason, Reason})
+			    ct:fail({unexpected_exit_reason, Reason})
 		    after
 			3000 ->
-			    ?t:fail({still_alive, Str})
+			    ct:fail({still_alive, Str})
 		    end,
 
 		    %% Give os_mon_sup time to restart disksup
-		    ?t:sleep(?t:seconds(3)),
+		    ct:sleep({seconds,3}),
 		    [{_Disk2,Kbyte2,_Cap2}|_] = disksup:get_disk_data(),
 		    true = Kbyte2>0,
 
@@ -314,15 +296,12 @@ port(Config) when is_list(Config) ->
 	    {skip, {os_pid_not_found, Str}}
     end.
 
-terminate(suite) -> [];
 terminate(Config) when is_list(Config) ->
     ok = application:set_env(os_mon, start_disksup, false),
     ok = supervisor:terminate_child(os_mon_sup, disksup),
     ok.
 
-unavailable(suite) -> [];
-unavailable(doc) ->
-    ["Test correct behaviour when service is unavailable"];
+%% Test correct behaviour when service is unavailable
 unavailable(Config) when is_list(Config) ->
 
     %% Make sure all API functions return their dummy values
@@ -333,18 +312,16 @@ unavailable(Config) when is_list(Config) ->
     ok = disksup:set_almost_full_threshold(0.9),
     ok.
 
-restart(suite) ->
-    [];
 restart(Config) when is_list(Config) ->
     ok = application:set_env(os_mon, start_disksup, true),
     ok = application:set_env(os_mon, disksup_posix_only, false),
-    {ok, _Pid} = supervisor:restart_child(os_mon_sup, disksup),
-    ok.
+    case supervisor:restart_child(os_mon_sup, disksup) of
+        {ok, _Pid} -> ok;
+        {error, running} -> ok
+    end.
 
-otp_5910(suite) -> [];
-otp_5910(doc) ->
-    ["Test that alarms are cleared if disksup crashes or "
-     "if OS_Mon is stopped"];
+%% Test that alarms are cleared if disksup crashes or
+%% if OS_Mon is stopped
 otp_5910(Config) when is_list(Config) ->
 
     %% Make sure disksup sets at least one alarm
@@ -365,12 +342,12 @@ otp_5910(Config) when is_list(Config) ->
     Alarms = get_alarms(),
     if
 	Over==0 ->
-	    ?t:fail({threshold_too_low, Data2, Threshold});
+	    ct:fail({threshold_too_low, Data2, Threshold});
 	Over==length(Alarms) ->
 	    ok;
 	true ->
 	    dump_info(),
-	    ?t:fail({bad_alarms, Threshold, Data2, Alarms})
+	    ct:fail({bad_alarms, Threshold, Data2, Alarms})
     end,
 
     %% Kill disksup
@@ -378,23 +355,23 @@ otp_5910(Config) when is_list(Config) ->
 
     %% Wait a little to make sure disksup has been restarted,
     %% then make sure the alarms are set once, but not twice
-    ?t:sleep(?t:seconds(1)),
+    ct:sleep({seconds,1}),
     Data3   = disksup:get_disk_data(),
     Alarms2 = get_alarms(),
     if
 	length(Alarms2)==length(Alarms) -> ok;
 	true ->
 	    dump_info(),
-	    ?t:fail({bad_alarms,Threshold,Data3,Alarms,Alarms2})
+	    ct:fail({bad_alarms,Threshold,Data3,Alarms,Alarms2})
     end,
 
     %% Stop OS_Mon and make sure all disksup alarms are cleared
     ok = application:stop(os_mon),
-    ?t:sleep(?t:seconds(1)),
+    ct:sleep({seconds,1}),
     Alarms3 = get_alarms(),
     case get_alarms() of
 	[] -> ok;
-	_  -> ?t:fail({alarms_not_cleared, Alarms3})
+	_  -> ct:fail({alarms_not_cleared, Alarms3})
     end,
 
     %% Reset threshold and restart OS_Mon
@@ -403,8 +380,7 @@ otp_5910(Config) when is_list(Config) ->
     ok = application:start(os_mon),
     ok.
 
-posix_only(suite) -> [];
-posix_only(doc) -> ["Test disksup_posix_only option"];
+%% Test disksup_posix_only option
 posix_only(Config) when is_list(Config) ->
     %% Set option and restart disksup
     ok = application:set_env(os_mon, disksup_posix_only, true),
diff --git a/lib/os_mon/test/memsup_SUITE.erl b/lib/os_mon/test/memsup_SUITE.erl
index 8ab61e9581..ed78b1ab1c 100644
--- a/lib/os_mon/test/memsup_SUITE.erl
+++ b/lib/os_mon/test/memsup_SUITE.erl
@@ -18,10 +18,10 @@
 %% %CopyrightEnd%
 %%
 -module(memsup_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -30,384 +30,362 @@
 -export([config/1, timeout/1, unavailable/1, port/1]).
 -export([otp_5910/1]).
 
-%% Default timetrap timeout (set in init_per_testcase)
--define(default_timeout, ?t:minutes(1)).
-
 init_per_suite(Config) when is_list(Config) ->
-    ?line ok = application:start(os_mon),
+    ok = application:start(os_mon),
     Config.
 
 end_per_suite(Config) when is_list(Config) ->
-    ?line ok = application:stop(os_mon),
+    ok = application:stop(os_mon),
     Config.
 
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?default_timeout),
-    [{watchdog,Dog} | Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
     Config.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+end_per_testcase(_Case, _Config) ->
+    ok.
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     All = case test_server:os_type() of
-	      {unix, sunos} ->
-		  [api, alarm1, alarm2, process, config, timeout,
-		   unavailable, port];
-	      {unix, linux} ->
-		  [api, alarm1, alarm2, process, timeout];
-	      _OS -> [api, alarm1, alarm2, process]
-	  end,
+              {unix, sunos} ->
+                  [api, alarm1, alarm2, process, config, timeout,
+                   unavailable, port];
+              {unix, linux} ->
+                  [api, alarm1, alarm2, process, timeout];
+              _OS -> [api, alarm1, alarm2, process]
+          end,
     Bugs = [otp_5910],
     All ++ Bugs.
 
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
 
-
-api(suite) ->
-    [];
-api(doc) ->
-    ["Test of API functions"];
+%% Test of API functions
 api(Config) when is_list(Config) ->
 
     %% get_memory_data()
-    ?line RegMemData = memsup:get_memory_data(),
+    RegMemData = memsup:get_memory_data(),
     case RegMemData of
-	{TotMem, AllBytes, {Pid, PidBytes}} when is_integer(TotMem),
-						 is_integer(AllBytes),
-						 is_pid(Pid),
-						 is_integer(PidBytes) ->
-	    ok;
-	{0, 0, _WorstPid} ->
-	    ?line ?t:fail(first_data_collection_failed);
-	_ ->
-	    ?line ?t:fail({bad_return, RegMemData})
+        {TotMem, AllBytes, {Pid, PidBytes}} when is_integer(TotMem),
+                                                 is_integer(AllBytes),
+                                                 is_pid(Pid),
+                                                 is_integer(PidBytes) ->
+            ok;
+        {0, 0, _WorstPid} ->
+            ct:fail(first_data_collection_failed);
+        _ ->
+            ct:fail({bad_return, RegMemData})
     end,
 
     %% get_system_memory_data()
-    ?line ExtMemData = memsup:get_system_memory_data(),
-    Tags = [	total_memory,
-		free_memory,
-		system_total_memory,
-		largest_free,
-		number_of_free,
-		free_swap,
-		total_swap,
-		cached_memory,
-		buffered_memory,
-		shared_memory],
-
-    ?line true = lists:all(fun({Tag,Value}) when is_atom(Tag),
-						 is_integer(Value) ->
-				   lists:member(Tag, Tags);
-			      (_) ->
-				   false
-			   end,
-			   ExtMemData),
+    ExtMemData = memsup:get_system_memory_data(),
+    Tags = [total_memory,
+            free_memory,
+            system_total_memory,
+            largest_free,
+            number_of_free,
+            free_swap,
+            total_swap,
+            cached_memory,
+            buffered_memory,
+            shared_memory],
+
+    true = lists:all(fun({Tag,Value}) when is_atom(Tag),
+                                           is_integer(Value) ->
+                             lists:member(Tag, Tags);
+                        (_) ->
+                             false
+                     end, ExtMemData),
 
     %% get_os_wordsize()
-    ?line ok = case memsup:get_os_wordsize() of
-	32             -> ok;
-	64             -> ok;
-	unsupported_os -> ok;
-	_ -> error
-    end,
+    ok = case memsup:get_os_wordsize() of
+             32             -> ok;
+             64             -> ok;
+             unsupported_os -> ok;
+             _ -> error
+         end,
 
     %% get_check_interval()
-    ?line 60000 = memsup:get_check_interval(),
+    60000 = memsup:get_check_interval(),
 
     %% set_check_interval(Minutes)
-    ?line ok = memsup:set_check_interval(2),
-    ?line 120000 = memsup:get_check_interval(),
-    ?line {'EXIT',{badarg,_}} =
-	(catch memsup:set_check_interval(0.2)),
-    ?line 120000 = memsup:get_check_interval(),
-    ?line ok = memsup:set_check_interval(1),
+    ok = memsup:set_check_interval(2),
+    120000 = memsup:get_check_interval(),
+    {'EXIT',{badarg,_}} =
+    (catch memsup:set_check_interval(0.2)),
+    120000 = memsup:get_check_interval(),
+    ok = memsup:set_check_interval(1),
 
     %% get_procmem_high_watermark()
-    ?line 5 = memsup:get_procmem_high_watermark(),
+    5 = memsup:get_procmem_high_watermark(),
 
     %% set_procmem_high_watermark()
-    ?line ok = memsup:set_procmem_high_watermark(0.1),
-    ?line 10 = memsup:get_procmem_high_watermark(),
-    ?line {'EXIT',{badarg,_}} =
-	(catch memsup:set_procmem_high_watermark(-0.1)),
-    ?line 10 = memsup:get_procmem_high_watermark(),
-    ?line ok = memsup:set_procmem_high_watermark(0.05),
+    ok = memsup:set_procmem_high_watermark(0.1),
+    10 = memsup:get_procmem_high_watermark(),
+    {'EXIT',{badarg,_}} =
+    (catch memsup:set_procmem_high_watermark(-0.1)),
+    10 = memsup:get_procmem_high_watermark(),
+    ok = memsup:set_procmem_high_watermark(0.05),
 
     %% get_sysmem_high_watermark()
-    ?line 80 = memsup:get_sysmem_high_watermark(),
+    80 = memsup:get_sysmem_high_watermark(),
 
     %% set_sysmem_high_watermark()
-    ?line ok = memsup:set_sysmem_high_watermark(0.9),
-    ?line 90 = memsup:get_sysmem_high_watermark(),
-    ?line {'EXIT',{badarg,_}} =
-	(catch memsup:set_sysmem_high_watermark(-0.9)),
-    ?line 90 = memsup:get_sysmem_high_watermark(),
-    ?line ok = memsup:set_sysmem_high_watermark(0.8),
+    ok = memsup:set_sysmem_high_watermark(0.9),
+    90 = memsup:get_sysmem_high_watermark(),
+    {'EXIT',{badarg,_}} =
+    (catch memsup:set_sysmem_high_watermark(-0.9)),
+    90 = memsup:get_sysmem_high_watermark(),
+    ok = memsup:set_sysmem_high_watermark(0.8),
 
     %% get|set_helper_timeout
-    ?line 30 = memsup:get_helper_timeout(),
-    ?line ok = memsup:set_helper_timeout(29),
-    ?line 29 = memsup:get_helper_timeout(),
-    ?line {'EXIT',{badarg,_}} = (catch memsup:set_helper_timeout(31.0)),
-    ?line 29 = memsup:get_helper_timeout(),
+    30 = memsup:get_helper_timeout(),
+    ok = memsup:set_helper_timeout(29),
+    29 = memsup:get_helper_timeout(),
+    {'EXIT',{badarg,_}} = (catch memsup:set_helper_timeout(31.0)),
+    29 = memsup:get_helper_timeout(),
     ok.
 
 %%----------------------------------------------------------------------
 %% NOTE: The test case is a bit weak as it will fail if the memory
 %% usage changes too much during its course.
 %%----------------------------------------------------------------------
-alarm1(suite) ->
-    [];
-alarm1(doc) ->
-    ["Test alarms when memsup_system_only==false"];
+
+%% Test alarms when memsup_system_only==false
 alarm1(Config) when is_list(Config) ->
 
     %% If system memory usage is too high, the testcase cannot
     %% be run correctly
-    ?line {Total, Alloc, {_Pid,_PidAlloc}} = memsup:get_memory_data(),
+    {Total, Alloc, {_Pid,_PidAlloc}} = memsup:get_memory_data(),
     io:format("alarm1: Total: ~p, Alloc: ~p~n", [Total, Alloc]),
-    ?line SysUsage = Alloc/Total,
+    SysUsage = Alloc/Total,
     if
-	SysUsage>0.99 ->
-	    {skip, sys_mem_too_high};
-	true ->
-	    alarm1(Config, SysUsage)
+        SysUsage > 0.99 ->
+            {skip, sys_mem_too_high};
+        true ->
+            alarm1(Config, SysUsage)
     end.
 
 alarm1(_Config, SysUsage) ->
     %% Set a long memory check interval, we will force memory checks
     %% instead
-    ?line ok = memsup:set_check_interval(60),
+    ok = memsup:set_check_interval(60),
 
     %% Check thresholds
-    ?line SysThreshold = (memsup:get_sysmem_high_watermark()/100),
-    ?line ProcThreshold = (memsup:get_procmem_high_watermark()/100),
+    SysThreshold = (memsup:get_sysmem_high_watermark()/100),
+    ProcThreshold = (memsup:get_procmem_high_watermark()/100),
 
     %% Check if a system alarm already should be set or not
     SysP = if
-	       SysUsage>SysThreshold -> true;
-	       SysUsage=<SysThreshold -> false
-	   end,
+               SysUsage>SysThreshold -> true;
+               SysUsage=<SysThreshold -> false
+           end,
 
     %% If system memory is higher than threshold, make sure the system
     %% alarm is set. Otherwise, make sure it is not set
     case alarm_set(system_memory_high_watermark) of
-	{true, []} when SysP ->
-	    ok;
-	false when not SysP ->
-	    ok;
-	_ ->
-	    ?line ?t:fail({sys_alarm, SysUsage, SysThreshold})
+        {true, []} when SysP ->
+            ok;
+        false when not SysP ->
+            ok;
+        _ ->
+            ct:fail({sys_alarm, SysUsage, SysThreshold})
     end,
 
     %% Lower/raise the threshold to clear/set the alarm
     NewSysThreshold = if
-        SysP ->
-            Value = 1.1*SysUsage,
-            if
-                Value > 0.99 -> 0.99;
-                true -> Value
-            end;
-        not SysP -> 0.9*SysUsage
-    end,
+                          SysP ->
+                              Value = 1.1*SysUsage,
+                              if
+                                  Value > 0.99 -> 0.99;
+                                  true -> Value
+                              end;
+                          not SysP -> 0.9*SysUsage
+                      end,
 
-    ?line ok = memsup:set_sysmem_high_watermark(NewSysThreshold),
+    ok = memsup:set_sysmem_high_watermark(NewSysThreshold),
 
     %% Initiate and wait for a new data collection
-    ?line ok = force_collection(),
+    ok = force_collection(),
 
     %% Make sure the alarm is cleared/set
-    ?t:sleep(?t:seconds(5)),
+    ct:sleep({seconds,5}),
     case alarm_set(system_memory_high_watermark) of
-	{true, []} when not SysP ->
-	    ok;
-	false when SysP ->
-	    ok;
-	_ ->
-	    ?line ?t:fail({sys_alarm, SysUsage, NewSysThreshold})
+        {true, []} when not SysP ->
+            ok;
+        false when SysP ->
+            ok;
+        _ ->
+            ct:fail({sys_alarm, SysUsage, NewSysThreshold})
     end,
 
     %% Reset the threshold to set/clear the alarm again
-    ?line ok = memsup:set_sysmem_high_watermark(SysThreshold),
-    ?line ok = force_collection(),
-    ?t:sleep(?t:seconds(1)),
+    ok = memsup:set_sysmem_high_watermark(SysThreshold),
+    ok = force_collection(),
+    ct:sleep({seconds,1}),
     case alarm_set(system_memory_high_watermark) of
-	{true, []} when SysP ->
-	    ok;
-	false when not SysP ->
-	    ok;
-	_ ->
-	    ?line ?t:fail({sys_alarm, SysUsage, SysThreshold})
+        {true, []} when SysP ->
+            ok;
+        false when not SysP ->
+            ok;
+        _ ->
+            ct:fail({sys_alarm, SysUsage, SysThreshold})
     end,
 
     %% Check memory usage
-    ?line {Total2, _, {WorstPid, PidAlloc}} = memsup:get_memory_data(),
+    {Total2, _, {WorstPid, PidAlloc}} = memsup:get_memory_data(),
 
     %% Check if a process alarm already should be set or not
     PidUsage = PidAlloc/Total2,
     ProcP = if
-		PidUsage>ProcThreshold -> true;
-		PidUsage=<ProcThreshold -> false
-	    end,
+                PidUsage>ProcThreshold -> true;
+                PidUsage=<ProcThreshold -> false
+            end,
 
     %% Make sure the process alarm is set/not set accordingly
     case alarm_set(process_memory_high_watermark) of
-	{true, WorstPid} when ProcP ->
-	    ok;
-	false when not ProcP ->
-	    ok;
-	{true, BadPid1} when ProcP ->
-	    ?line ?t:fail({proc_alarm, WorstPid, BadPid1});
-	_ ->
-	    ?line ?t:fail({proc_alarm, PidUsage, ProcThreshold})
+        {true, WorstPid} when ProcP ->
+            ok;
+        false when not ProcP ->
+            ok;
+        {true, BadPid1} when ProcP ->
+            ct:fail({proc_alarm, WorstPid, BadPid1});
+        _ ->
+            ct:fail({proc_alarm, PidUsage, ProcThreshold})
     end,
 
     %% Lower/raise the threshold to clear/set the alarm
     NewProcThreshold = if
-			   ProcP -> 1.1*PidUsage;
-			   not ProcP -> 0.9*PidUsage
-		       end,
-    ?line ok = memsup:set_procmem_high_watermark(NewProcThreshold),
-    ?line ok = force_collection(),
-    ?t:sleep(?t:seconds(1)),
+                           ProcP -> 1.1*PidUsage;
+                           not ProcP -> 0.9*PidUsage
+                       end,
+    ok = memsup:set_procmem_high_watermark(NewProcThreshold),
+    ok = force_collection(),
+    ct:sleep({seconds,1}),
     case alarm_set(process_memory_high_watermark) of
-	{true, WorstPid} when not ProcP ->
-	    ok;
-	false when ProcP ->
-	    ok;
-	{true, BadPid2} when not ProcP ->
-	    ?line test_server:fail({proc_alarm, WorstPid, BadPid2});
-	_ ->
-	    ?line ?t:fail({proc_alarm, PidUsage, ProcThreshold})
+        {true, WorstPid} when not ProcP ->
+            ok;
+        false when ProcP ->
+            ok;
+        {true, BadPid2} when not ProcP ->
+            ct:fail({proc_alarm, WorstPid, BadPid2});
+        _ ->
+            ct:fail({proc_alarm, PidUsage, ProcThreshold})
     end,
 
     %% Reset the threshold to clear/set the alarm
-    ?line ok = memsup:set_procmem_high_watermark(ProcThreshold),
-    ?line ok = force_collection(),
-    ?t:sleep(?t:seconds(1)),
+    ok = memsup:set_procmem_high_watermark(ProcThreshold),
+    ok = force_collection(),
+    ct:sleep({seconds,1}),
     case alarm_set(process_memory_high_watermark) of
-	{true, WorstPid} when ProcP ->
-	    ok;
-	false when not ProcP ->
-	    ok;
-	{true, BadPid3} when ProcP ->
-	    ?line test_server:fail({proc_alarm, WorstPid, BadPid3});
-	_ ->
-	    ?line ?t:fail({proc_alarm, PidUsage, ProcThreshold})
+        {true, WorstPid} when ProcP ->
+            ok;
+        false when not ProcP ->
+            ok;
+        {true, BadPid3} when ProcP ->
+            ct:fail({proc_alarm, WorstPid, BadPid3});
+        _ ->
+            ct:fail({proc_alarm, PidUsage, ProcThreshold})
     end,
 
     %% Reset memory check interval
-    ?line ok = memsup:set_check_interval(1),
+    ok = memsup:set_check_interval(1),
     ok.
 
-alarm2(suite) ->
-    [];
-alarm2(doc) ->
-    ["Test alarms when memsup_system_only==true"];
+%% Test alarms when memsup_system_only==true
 alarm2(Config) when is_list(Config) ->
 
     %% If system memory usage is too high, the testcase cannot
     %% be run correctly
-    ?line {Total, Alloc, {_Pid,_PidAlloc}} = memsup:get_memory_data(),
-    ?line SysUsage = Alloc/Total,
+    {Total, Alloc, {_Pid,_PidAlloc}} = memsup:get_memory_data(),
+    SysUsage = Alloc/Total,
     if
-	SysUsage>0.99 ->
-	    {skip, sys_mem_too_high};
-	true ->
-	    alarm2(Config, SysUsage)
+        SysUsage>0.99 ->
+            {skip, sys_mem_too_high};
+        true ->
+            alarm2(Config, SysUsage)
     end.
 
 alarm2(_Config, _SysUsage) ->
 
     %% Change memsup_system_only and restart memsup
-    ?line ok = application:set_env(os_mon, memsup_system_only, true),
-    ?line ok = supervisor:terminate_child(os_mon_sup, memsup),
-    ?line {ok, _Memsup1} = supervisor:restart_child(os_mon_sup, memsup),
+    ok = application:set_env(os_mon, memsup_system_only, true),
+    ok = supervisor:terminate_child(os_mon_sup, memsup),
+    {ok, _Memsup1} = supervisor:restart_child(os_mon_sup, memsup),
 
     %% Set a long memory check interval, we will force memory checks
     %% instead
-    ?line ok = memsup:set_check_interval(60),
+    ok = memsup:set_check_interval(60),
 
     %% Check data and thresholds
-    ?line {Total, Alloc, undefined} = memsup:get_memory_data(),
-    ?line SysThreshold = (memsup:get_sysmem_high_watermark()/100),
-    ?line true = is_integer(memsup:get_procmem_high_watermark()),
+    {Total, Alloc, undefined} = memsup:get_memory_data(),
+    SysThreshold = (memsup:get_sysmem_high_watermark()/100),
+    true = is_integer(memsup:get_procmem_high_watermark()),
 
     %% Check if a system alarm already should be set or not
-    ?line SysUsage = Alloc/Total,
+    SysUsage = Alloc/Total,
     SysP = if
-	       SysUsage>SysThreshold -> true;
-	       SysUsage=<SysThreshold -> false
-	   end,
+               SysUsage>SysThreshold -> true;
+               SysUsage=<SysThreshold -> false
+           end,
 
     %% If system memory is higher than threshold, make sure the system
     %% alarm is set. Otherwise, make sure it is not set
     case alarm_set(system_memory_high_watermark) of
-	{true, []} when SysP ->
-	    ok;
-	false when not SysP ->
-	    ok;
-	_ ->
-	    ?line ?t:fail({sys_alarm, SysUsage, SysThreshold})
+        {true, []} when SysP ->
+            ok;
+        false when not SysP ->
+            ok;
+        _ ->
+            ct:fail({sys_alarm, SysUsage, SysThreshold})
     end,
 
     %% Lower/raise the threshold to clear/set the alarm
     NewSysThreshold = if
-        SysP ->
-            Value = 1.1*SysUsage,
-            if
-                Value > 0.99 -> 0.99;
-                true -> Value
-            end;
-        not SysP -> 0.9*SysUsage
-    end,
+                          SysP ->
+                              Value = 1.1*SysUsage,
+                              if
+                                  Value > 0.99 -> 0.99;
+                                  true -> Value
+                              end;
+                          not SysP -> 0.9*SysUsage
+                      end,
 
-    ?line ok = memsup:set_sysmem_high_watermark(NewSysThreshold),
+    ok = memsup:set_sysmem_high_watermark(NewSysThreshold),
 
     %% Initiate and wait for a new data collection
-    ?line ok = force_collection(),
+    ok = force_collection(),
 
     %% Make sure the alarm is cleared/set
-    ?t:sleep(?t:seconds(1)),
+    ct:sleep({seconds,1}),
     case alarm_set(system_memory_high_watermark) of
-	{true, []} when not SysP ->
-	    ok;
-	false when SysP ->
-	    ok;
-	_ ->
-	    ?line ?t:fail({sys_alarm, SysUsage, NewSysThreshold})
+        {true, []} when not SysP ->
+            ok;
+        false when SysP ->
+            ok;
+        _ ->
+            ct:fail({sys_alarm, SysUsage, NewSysThreshold})
     end,
 
     %% Reset the threshold to set/clear the alarm again
-    ?line ok = memsup:set_sysmem_high_watermark(SysThreshold),
-    ?line ok = force_collection(),
-    ?t:sleep(?t:seconds(1)),
+    ok = memsup:set_sysmem_high_watermark(SysThreshold),
+    ok = force_collection(),
+    ct:sleep({seconds,1}),
     case alarm_set(system_memory_high_watermark) of
-	{true, []} when SysP ->
-	    ok;
-	false when not SysP ->
-	    ok;
-	_ ->
-	    ?line ?t:fail({sys_alarm, SysUsage, SysThreshold})
+        {true, []} when SysP ->
+            ok;
+        false when not SysP ->
+            ok;
+        _ ->
+            ct:fail({sys_alarm, SysUsage, SysThreshold})
     end,
 
     %% Reset memsup_system_only and restart memsup
     %% (memory check interval is then automatically reset)
-    ?line ok = application:set_env(os_mon, memsup_system_only, false),
-    ?line ok = supervisor:terminate_child(os_mon_sup, memsup),
-    ?line {ok, _Memsup2} = supervisor:restart_child(os_mon_sup, memsup),
+    ok = application:set_env(os_mon, memsup_system_only, false),
+    ok = supervisor:terminate_child(os_mon_sup, memsup),
+    {ok, _Memsup2} = supervisor:restart_child(os_mon_sup, memsup),
 
     ok.
 
@@ -420,39 +398,36 @@ alarm_set(Alarm, [_|T]) ->
 alarm_set(_Alarm, []) ->
     false.
 
-process(suite) ->
-    [];
-process(doc) ->
-    ["Make sure memsup discovers a process grown very large"];
+%% Make sure memsup discovers a process grown very large
 process(Config) when is_list(Config) ->
 
     %% Set a long memory check interval, we will force memory checks
     %% instead
-    ?line ok = memsup:set_check_interval(60),
+    ok = memsup:set_check_interval(60),
 
     %% Collect data
     MemData = memsup:get_memory_data(),
     io:format("process: memsup:get_memory_data() = ~p~n", [MemData]),
-    ?line {_Total,_Free,{_,Bytes}} = MemData,
+    {_Total,_Free,{_,Bytes}} = MemData,
 
     %% Start a new process larger than Worst
-    ?line WorsePid = spawn(fun() -> new_hog(Bytes) end),
-    ?t:sleep(?t:seconds(1)),
+    WorsePid = spawn(fun() -> new_hog(Bytes) end),
+    ct:sleep({seconds,1}),
 
     %% Initiate and wait for a new data collection
-    ?line ok = force_collection(),
+    ok = force_collection(),
 
     %% Check that get_memory_data() returns updated result
-    ?line case memsup:get_memory_data() of
-	      {_, _, {WorsePid, _MoreBytes}} ->
-		  ok;
-	      {_, _, BadWorst} ->
-		  ?line ?t:fail({worst_pid, BadWorst})
-	  end,
+    case memsup:get_memory_data() of
+        {_, _, {WorsePid, _MoreBytes}} ->
+            ok;
+        {_, _, BadWorst} ->
+            ct:fail({worst_pid, BadWorst})
+    end,
 
     %% Reset memory check interval
-    ?line exit(WorsePid, done),
-    ?line ok = memsup:set_check_interval(1),
+    exit(WorsePid, done),
+    ok = memsup:set_check_interval(1),
     ok.
 
 new_hog(Bytes) ->
@@ -463,110 +438,101 @@ new_hog(Bytes) ->
 
 new_hog_1(List) ->
     receive
-	_Any -> exit(List)
+        _Any -> exit(List)
     end.
 
-config(suite) ->
-    [];
-config(doc) ->
-    ["Test configuration"];
+%% Test configuration
 config(Config) when is_list(Config) ->
 
     %% Change configuration parameters and make sure change is reflected
     %% when memsup is restarted
-    ?line ok = application:set_env(os_mon, memory_check_interval, 2),
-    ?line ok =
-	application:set_env(os_mon, system_memory_high_watermark, 0.9),
-    ?line ok =
-	application:set_env(os_mon, process_memory_high_watermark, 0.1),
-    ?line ok = application:set_env(os_mon, memsup_helper_timeout, 35),
-    ?line ok = application:set_env(os_mon, memsup_system_only, true),
-
-    ?line ok = supervisor:terminate_child(os_mon_sup, memsup),
-    ?line {ok, _Child1} = supervisor:restart_child(os_mon_sup, memsup),
-
-    ?line 120000 = memsup:get_check_interval(),
-    ?line 90 = memsup:get_sysmem_high_watermark(),
-    ?line 10 = memsup:get_procmem_high_watermark(),
-    ?line 35 = memsup:get_helper_timeout(),
+    ok = application:set_env(os_mon, memory_check_interval, 2),
+    ok =
+    application:set_env(os_mon, system_memory_high_watermark, 0.9),
+    ok =
+    application:set_env(os_mon, process_memory_high_watermark, 0.1),
+    ok = application:set_env(os_mon, memsup_helper_timeout, 35),
+    ok = application:set_env(os_mon, memsup_system_only, true),
+
+    ok = supervisor:terminate_child(os_mon_sup, memsup),
+    {ok, _Child1} = supervisor:restart_child(os_mon_sup, memsup),
+
+    120000 = memsup:get_check_interval(),
+    90 = memsup:get_sysmem_high_watermark(),
+    10 = memsup:get_procmem_high_watermark(),
+    35 = memsup:get_helper_timeout(),
 
     %% Also try this with bad parameter values, should be ignored
-    ?line ok = application:set_env(os_mon, memory_check_interval, 0.2),
-    ?line ok =
-	application:set_env(os_mon, system_memory_high_watermark, -0.9),
-    ?line ok =
-	application:set_env(os_mon, process_memory_high_watermark,-0.1),
-    ?line ok = application:set_env(os_mon, memsup_helper_timeout, 0.35),
-    ?line ok = application:set_env(os_mon, memsup_system_only, arne),
-
-    ?line ok = supervisor:terminate_child(os_mon_sup, memsup),
-    ?line {ok, _Child2} = supervisor:restart_child(os_mon_sup, memsup),
-
-    ?line 60000 = memsup:get_check_interval(),
-    ?line 80 = memsup:get_sysmem_high_watermark(),
-    ?line 5 = memsup:get_procmem_high_watermark(),
-    ?line 30 = memsup:get_helper_timeout(),
+    ok = application:set_env(os_mon, memory_check_interval, 0.2),
+    ok =
+    application:set_env(os_mon, system_memory_high_watermark, -0.9),
+    ok =
+    application:set_env(os_mon, process_memory_high_watermark,-0.1),
+    ok = application:set_env(os_mon, memsup_helper_timeout, 0.35),
+    ok = application:set_env(os_mon, memsup_system_only, arne),
+
+    ok = supervisor:terminate_child(os_mon_sup, memsup),
+    {ok, _Child2} = supervisor:restart_child(os_mon_sup, memsup),
+
+    60000 = memsup:get_check_interval(),
+    80 = memsup:get_sysmem_high_watermark(),
+    5 = memsup:get_procmem_high_watermark(),
+    30 = memsup:get_helper_timeout(),
 
     %% Reset configuration parameters
-    ?line ok = application:set_env(os_mon, memory_check_interval, 1),
-    ?line ok =
-	application:set_env(os_mon, system_memory_high_watermark, 0.8),
-    ?line ok =
-	application:set_env(os_mon, process_memory_high_watermark,0.05),
-    ?line ok = application:set_env(os_mon, memsup_helper_timeout, 30),
-    ?line ok = application:set_env(os_mon, memsup_system_only, false),
+    ok = application:set_env(os_mon, memory_check_interval, 1),
+    ok =
+    application:set_env(os_mon, system_memory_high_watermark, 0.8),
+    ok =
+    application:set_env(os_mon, process_memory_high_watermark,0.05),
+    ok = application:set_env(os_mon, memsup_helper_timeout, 30),
+    ok = application:set_env(os_mon, memsup_system_only, false),
 
     ok.
 
-unavailable(suite) ->
-    [];
-unavailable(doc) ->
-    ["Test correct behaviour when service is unavailable"];
+%% Test correct behaviour when service is unavailable
 unavailable(Config) when is_list(Config) ->
 
     %% Close memsup
-    ?line ok = application:set_env(os_mon, start_memsup, false),
-    ?line ok = supervisor:terminate_child(os_mon_sup, memsup),
+    ok = application:set_env(os_mon, start_memsup, false),
+    ok = supervisor:terminate_child(os_mon_sup, memsup),
 
     %% Make sure all API functions return their dummy values
-    ?line {0,0,{_Pid,0}} = memsup:get_memory_data(),
-    ?line ok = application:set_env(os_mon, memsup_system_only, true),
-    ?line {0,0,undefined} = memsup:get_memory_data(),
-    ?line ok = application:set_env(os_mon, memsup_system_only, false),
-    ?line [] = memsup:get_system_memory_data(),
-    ?line 0  = memsup:get_os_wordsize(),
-    ?line 60000 = memsup:get_check_interval(),
-    ?line ok = memsup:set_check_interval(2),
-    ?line 5 = memsup:get_procmem_high_watermark(),
-    ?line ok = memsup:set_procmem_high_watermark(0.10),
-    ?line 80 = memsup:get_sysmem_high_watermark(),
-    ?line ok = memsup:set_sysmem_high_watermark(0.90),
-    ?line 30 = memsup:get_helper_timeout(),
-    ?line ok = memsup:set_helper_timeout(35),
+    {0,0,{_Pid,0}} = memsup:get_memory_data(),
+    ok = application:set_env(os_mon, memsup_system_only, true),
+    {0,0,undefined} = memsup:get_memory_data(),
+    ok = application:set_env(os_mon, memsup_system_only, false),
+    [] = memsup:get_system_memory_data(),
+    0  = memsup:get_os_wordsize(),
+    60000 = memsup:get_check_interval(),
+    ok = memsup:set_check_interval(2),
+    5 = memsup:get_procmem_high_watermark(),
+    ok = memsup:set_procmem_high_watermark(0.10),
+    80 = memsup:get_sysmem_high_watermark(),
+    ok = memsup:set_sysmem_high_watermark(0.90),
+    30 = memsup:get_helper_timeout(),
+    ok = memsup:set_helper_timeout(35),
 
     %% Start memsup again,
-    ?line ok = application:set_env(os_mon, start_memsup, true),
-    ?line {ok, _Child} = supervisor:restart_child(os_mon_sup, memsup),
+    ok = application:set_env(os_mon, start_memsup, true),
+    {ok, _Child} = supervisor:restart_child(os_mon_sup, memsup),
 
     ok.
 
-timeout(suite) ->
-    [];
-timeout(doc) ->
-    ["Test stability of memsup when data collection times out"];
+%% Test stability of memsup when data collection times out
 timeout(Config) when is_list(Config) ->
 
     %% Set a long memory check interval and memsup_helper timeout,
     %% we will force memory checks instead and fake timeouts
-    ?line ok = memsup:set_check_interval(60),
-    ?line ok = memsup:set_helper_timeout(3600),
+    ok = memsup:set_check_interval(60),
+    ok = memsup:set_helper_timeout(3600),
 
     %% Provoke a timeout during memory collection
-    ?line memsup ! time_to_collect,
-    ?line memsup ! reg_collection_timeout,
+    memsup ! time_to_collect,
+    memsup ! reg_collection_timeout,
 
     %% Not much we can check though, except that memsup is still running
-    ?line {_,_,_} = memsup:get_memory_data(),
+    {_,_,_} = memsup:get_memory_data(),
 
     %% Provoke a timeout during extensive memory collection
     %% We fake a gen_server:call/2 to be able to send a timeout message
@@ -574,140 +540,133 @@ timeout(Config) when is_list(Config) ->
 
     %% Linux should be handled the same way as solaris.
 
-%    TimeoutMsg = case ?t:os_type() of
-%		     {unix, sunos} -> ext_collection_timeout;
-%		     {unix, linux} -> reg_collection_timeout
-%		 end,
+    %    TimeoutMsg = case ?t:os_type() of
+    %		     {unix, sunos} -> ext_collection_timeout;
+    %		     {unix, linux} -> reg_collection_timeout
+    %		 end,
 
     TimeoutMsg = ext_collection_timeout,
 
-    ?line Pid = whereis(memsup),
-    ?line Mref = erlang:monitor(process, Pid),
-    ?line Pid ! {'$gen_call', {self(), Mref}, get_system_memory_data},
-    ?line Pid ! TimeoutMsg,
+    Pid = whereis(memsup),
+    Mref = erlang:monitor(process, Pid),
+    Pid ! {'$gen_call', {self(), Mref}, get_system_memory_data},
+    Pid ! TimeoutMsg,
     receive
-	{Mref, []} ->
-	    erlang:demonitor(Mref),
-	    ?line ok;
-	{Mref, Res} ->
-	    erlang:demonitor(Mref),
-	    ?line ?t:fail({unexpected_result, Res});
-	{'DOWN', Mref, _, _, _} ->
-	    ?line ?t:fail(no_result)
+        {Mref, []} ->
+            erlang:demonitor(Mref),
+            ok;
+        {Mref, Res} ->
+            erlang:demonitor(Mref),
+            ct:fail({unexpected_result, Res});
+        {'DOWN', Mref, _, _, _} ->
+            ct:fail(no_result)
     end,
 
     %% Reset memory check interval and memsup_helper timeout
-    ?line ok = memsup:set_check_interval(1),
-    ?line ok = memsup:set_helper_timeout(30),
-    ?line memsup ! time_to_collect,
+    ok = memsup:set_check_interval(1),
+    ok = memsup:set_helper_timeout(30),
+    memsup ! time_to_collect,
 
-    ?line [_|_] = memsup:get_system_memory_data(),
+    [_|_] = memsup:get_system_memory_data(),
 
     ok.
 
-port(suite) ->
-    [];
-port(doc) ->
-    ["Test that memsup handles a terminating port program"];
+%% Test that memsup handles a terminating port program
 port(Config) when is_list(Config) ->
-    ?line Str = os:cmd("ps -e | grep '[m]emsup'"),
+    Str = os:cmd("ps -e | grep '[m]emsup'"),
     case io_lib:fread("~s", Str) of
-	{ok, [Pid], _Rest} ->
-
-	    %% Monitor memsup
-	    ?line MonRef = erlang:monitor(process, memsup),
-	    ?line {Total1,_Alloc1,_Worst1} = memsup:get_memory_data(),
-	    ?line true = Total1>0,
-
-	    %% Kill the port program
-	    case os:cmd("kill -9 " ++ Pid) of
-		[] ->
-
-		    %% memsup should now terminate
-		    receive
-			{'DOWN', MonRef, _, _, {port_died, _Reason}} ->
-			    ok;
-			{'DOWN', MonRef, _, _, Reason} ->
-			    ?line ?t:fail({unexpected_exit_reason, Reason})
-		    after
-			3000 ->
-			    ?line ?t:fail(still_alive)
-		    end,
-
-		    %% Give os_mon_sup time to restart memsup
-		    ?t:sleep(?t:seconds(3)),
-		    ?line {Total2,_Alloc2,_Worst2} =
-			memsup:get_memory_data(),
-		    ?line true = Total2>0,
-
-		    ok;
-
-		Line ->
-		    erlang:demonitor(MonRef),
-		    {skip, {not_killed, Line}}
-	    end;
-	_ ->
-	    {skip, {os_pid_not_found, Str}}
+        {ok, [Pid], _Rest} ->
+
+            %% Monitor memsup
+            MonRef = erlang:monitor(process, memsup),
+            {Total1,_Alloc1,_Worst1} = memsup:get_memory_data(),
+            true = Total1>0,
+
+            %% Kill the port program
+            case os:cmd("kill -9 " ++ Pid) of
+                [] ->
+
+                    %% memsup should now terminate
+                    receive
+                        {'DOWN', MonRef, _, _, {port_died, _Reason}} ->
+                            ok;
+                        {'DOWN', MonRef, _, _, Reason} ->
+                            ct:fail({unexpected_exit_reason, Reason})
+                    after
+                        3000 ->
+                            ct:fail(still_alive)
+                    end,
+
+                    %% Give os_mon_sup time to restart memsup
+                    ct:sleep({seconds,3}),
+                    {Total2,_Alloc2,_Worst2} =
+                    memsup:get_memory_data(),
+                    true = Total2>0,
+
+                    ok;
+
+                Line ->
+                    erlang:demonitor(MonRef),
+                    {skip, {not_killed, Line}}
+            end;
+        _ ->
+            {skip, {os_pid_not_found, Str}}
     end.
 
-otp_5910(suite) ->
-    [];
-otp_5910(doc) ->
-    ["Test that alarms are cleared and not set twice"];
+%% Test that alarms are cleared and not set twice
 otp_5910(Config) when is_list(Config) ->
     Alarms =
-	[system_memory_high_watermark, process_memory_high_watermark],
+    [system_memory_high_watermark, process_memory_high_watermark],
 
     %% Make sure memsup sets both alarms
-    ?line ok = application:set_env(os_mon, memory_check_interval, 60),
-    ?line ok = memsup:set_check_interval(60),
-    ?line SysThreshold = (memsup:get_sysmem_high_watermark()/100),
-    ?line ProcThreshold = (memsup:get_procmem_high_watermark()/100),
+    ok = application:set_env(os_mon, memory_check_interval, 60),
+    ok = memsup:set_check_interval(60),
+    SysThreshold = (memsup:get_sysmem_high_watermark()/100),
+    ProcThreshold = (memsup:get_procmem_high_watermark()/100),
 
     MemData = memsup:get_memory_data(),
 
     io:format("otp_5910: memsup:get_memory_data() = ~p~n", [MemData]),
-    ?line {Total, Alloc, {_Pid, _Bytes}} = MemData,
-    ?line Pid = spawn_opt(fun() ->
-				  receive
-				      die -> ok
-				  end
-			  end, [{min_heap_size, 1000}]),
+    {Total, Alloc, {_Pid, _Bytes}} = MemData,
+    Pid = spawn_opt(fun() ->
+                            receive
+                                die -> ok
+                            end
+                    end, [{min_heap_size, 1000}]),
     %% Create a process guaranteed to live, be constant and
     %% break memsup process limit
-    ?line {memory, Bytes} = erlang:process_info(Pid,memory),
-    ?line SysUsage = Alloc/Total,
-    ?line ProcUsage = Bytes/Total,
+    {memory, Bytes} = erlang:process_info(Pid,memory),
+    SysUsage = Alloc/Total,
+    ProcUsage = Bytes/Total,
 
     if
-	SysUsage>SysThreshold ->
-	    ok;
-	SysUsage=<SysThreshold ->
-	    ?line ok = application:set_env(os_mon,
-					   sys_mem_high_watermark,
-					   0.5 * SysUsage),
-	    ?line ok = memsup:set_sysmem_high_watermark(0.5 * SysUsage)
+        SysUsage>SysThreshold ->
+            ok;
+        SysUsage=<SysThreshold ->
+            ok = application:set_env(os_mon,
+                                     sys_mem_high_watermark,
+                                     0.5 * SysUsage),
+            ok = memsup:set_sysmem_high_watermark(0.5 * SysUsage)
     end,
     if
-	ProcUsage>ProcThreshold ->
-	    ok;
-	ProcUsage=<ProcThreshold ->
-	    ?line ok = application:set_env(os_mon,
-					   proc_mem_high_watermark,
-					   0.5 * ProcUsage),
-	    ?line ok = memsup:set_procmem_high_watermark(0.5 *ProcUsage)
+        ProcUsage>ProcThreshold ->
+            ok;
+        ProcUsage=<ProcThreshold ->
+            ok = application:set_env(os_mon,
+                                     proc_mem_high_watermark,
+                                     0.5 * ProcUsage),
+            ok = memsup:set_procmem_high_watermark(0.5 *ProcUsage)
     end,
-    ?line ok = force_collection(),
-    ?t:sleep(?t:seconds(1)),
+    ok = force_collection(),
+    ct:sleep({seconds,1}),
     lists:foreach(fun(AlarmId) ->
-			  case alarm_set(AlarmId) of
-			      {true, _} -> ok;
-			      false ->
-				  ?line ?t:fail({alarm_not_set,
-						 AlarmId})
-			  end
-		  end,
-		  Alarms),
+                          case alarm_set(AlarmId) of
+                              {true, _} -> ok;
+                              false ->
+                                  ct:fail({alarm_not_set, AlarmId})
+                          end
+                  end,
+                  Alarms),
 
     %% Kill guaranteed process...
     Pid ! die,
@@ -715,42 +674,41 @@ otp_5910(Config) when is_list(Config) ->
     exit(whereis(memsup), faked_memsup_crash),
     %% Wait a little to make sure memsup has been restarted,
     %% then make sure the alarms are set once, but not twice
-    ?t:sleep(?t:seconds(1)),
-    ?line MemUsage = memsup:get_memory_data(),
+    ct:sleep({seconds,1}),
+    MemUsage = memsup:get_memory_data(),
     SetAlarms = alarm_handler:get_alarms(),
     case lists:foldl(fun(system_memory_high_watermark, {S, P}) ->
-			     {S+1, P};
-			(process_memory_high_watermark, {S, P}) ->
-			     {S, P+1};
-			(_AlarmId, Acc0) ->
-			     Acc0
-		     end,
-		     {0, 0},
-		     SetAlarms) of
-	{0, 0} ->
-	    ok;
-	_ ->
-	    ?line ?t:fail({bad_number_of_alarms, SetAlarms, MemUsage})
+                             {S+1, P};
+                        (process_memory_high_watermark, {S, P}) ->
+                             {S, P+1};
+                        (_AlarmId, Acc0) ->
+                             Acc0
+                     end,
+                     {0, 0},
+                     SetAlarms) of
+        {0, 0} ->
+            ok;
+        _ ->
+            ct:fail({bad_number_of_alarms, SetAlarms, MemUsage})
     end,
 
     %% Stop OS_Mon and make sure all memsup alarms are cleared
-    ?line ok = application:stop(os_mon),
-    ?t:sleep(?t:seconds(1)),
+    ok = application:stop(os_mon),
+    ct:sleep({seconds,1}),
     lists:foreach(fun(AlarmId) ->
-			  case alarm_set(AlarmId) of
-			      false -> ok;
-			      {true, _} ->
-				  ?line ?t:fail({alarm_is_set, AlarmId})
-			  end
-		  end,
-		  Alarms),
+                          case alarm_set(AlarmId) of
+                              false -> ok;
+                              {true, _} ->
+                                  ct:fail({alarm_is_set, AlarmId})
+                          end
+                  end,
+                  Alarms),
 
     %% Reset configuration and restart OS_Mon
-    ?line ok = application:set_env(os_mon,memory_check_interval,1),
-    ?line ok = application:set_env(os_mon,sys_mem_high_watermark,0.8),
-    ?line ok = application:set_env(os_mon,proc_mem_high_watermark,0.05),
-    ?line ok = application:start(os_mon),
-
+    ok = application:set_env(os_mon,memory_check_interval,1),
+    ok = application:set_env(os_mon,sys_mem_high_watermark,0.8),
+    ok = application:set_env(os_mon,proc_mem_high_watermark,0.05),
+    ok = application:start(os_mon),
     ok.
 
 %%----------------------------------------------------------------------
@@ -765,30 +723,30 @@ force_collection() ->
 
 force_collection(TimerRef) ->
     receive
-	{trace, _Pid, 'receive', {collected_sys, _Sys}} ->
-	    erlang:cancel_timer(TimerRef),
-	    erlang:trace(whereis(memsup), false, ['receive']),
-	    flush(),
-	    ok;
-	{trace, _Pid, 'receive', reg_collection_timeout} ->
-	    erlang:cancel_timer(TimerRef),
-	    erlang:trace(whereis(memsup), false, ['receive']),
-	    flush(),
-	    collection_timeout;
-	timout ->
-	    erlang:trace(whereis(memsup), false, ['receive']),
-	    flush(),
-	    timeout;
-	_Msg ->
-	    force_collection(TimerRef)
+        {trace, _Pid, 'receive', {collected_sys, _Sys}} ->
+            erlang:cancel_timer(TimerRef),
+            erlang:trace(whereis(memsup), false, ['receive']),
+            flush(),
+            ok;
+        {trace, _Pid, 'receive', reg_collection_timeout} ->
+            erlang:cancel_timer(TimerRef),
+            erlang:trace(whereis(memsup), false, ['receive']),
+            flush(),
+            collection_timeout;
+        timout ->
+            erlang:trace(whereis(memsup), false, ['receive']),
+            flush(),
+            timeout;
+        _Msg ->
+            force_collection(TimerRef)
     end.
 
 flush() ->
     receive
-	{trace, _, _, _} ->
-	    flush();
-	timeout ->
-	    flush()
+        {trace, _, _, _} ->
+            flush();
+        timeout ->
+            flush()
     after 0 ->
-	    ok
+              ok
     end.
diff --git a/lib/os_mon/test/os_mon_SUITE.erl b/lib/os_mon/test/os_mon_SUITE.erl
index 5c484ef2a6..ace06796d6 100644
--- a/lib/os_mon/test/os_mon_SUITE.erl
+++ b/lib/os_mon/test/os_mon_SUITE.erl
@@ -18,95 +18,61 @@
 %% %CopyrightEnd%
 %%
 -module(os_mon_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% 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([init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0]).
 
 %% Test cases
 -export([app_file/1, appup_file/1, config/1]).
 
-%% Default timetrap timeout (set in init_per_testcase)
--define(default_timeout, ?t:minutes(1)).
-
-init_per_testcase(_Case, Config) ->
-    Dog = test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     case test_server:os_type() of
-	{unix, sunos} -> [app_file, appup_file, config];
-	_OS -> [app_file, appup_file]
+        {unix, sunos} -> [app_file, appup_file, config];
+        _OS -> [app_file, appup_file]
     end.
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-app_file(suite) ->
-    [];
-app_file(doc) ->
-    ["Testing .app file"];
+%% Testing .app file
 app_file(Config) when is_list(Config) ->
-    ?line ok = test_server:app_test(os_mon),
+    ok = test_server:app_test(os_mon),
     ok.
 
 appup_file(Config) when is_list(Config) ->
     ok = test_server:appup_test(os_mon).
 
-config(suite) ->
-    [];
-config(doc) ->
-    ["Test OS_Mon configuration"];
+%% Test OS_Mon configuration
 config(Config) when is_list(Config) ->
 
     IsReg = fun(Name) -> is_pid(whereis(Name)) end,
     IsNotReg = fun(Name) -> undefined == whereis(Name) end,
 
-    ?line ok = application:start(os_mon),
-    ?line true = lists:all(IsReg, [cpu_sup, disksup, memsup]),
-    ?line ok = application:stop(os_mon),
-
-    ?line ok = application:set_env(os_mon, start_cpu_sup, false),
-    ?line ok = application:start(os_mon),
-    ?line true = lists:all(IsReg, [disksup, memsup]),
-    ?line true = IsNotReg(cpu_sup),
-    ?line ok = application:stop(os_mon),
-    ?line ok = application:set_env(os_mon, start_cpu_sup, true),
-
-    ?line ok = application:set_env(os_mon, start_disksup, false),
-    ?line ok = application:start(os_mon),
-    ?line true = lists:all(IsReg, [cpu_sup, memsup]),
-    ?line true = IsNotReg(disksup),
-    ?line ok = application:stop(os_mon),
-    ?line ok = application:set_env(os_mon, start_disksup, true),
-
-    ?line ok = application:set_env(os_mon, start_memsup, false),
-    ?line ok = application:start(os_mon),
-    ?line true = lists:all(IsReg, [cpu_sup, disksup]),
-    ?line true = IsNotReg(memsup),
-    ?line ok = application:stop(os_mon),
-    ?line ok = application:set_env(os_mon, start_memsup, true),
+    ok = application:start(os_mon),
+    true = lists:all(IsReg, [cpu_sup, disksup, memsup]),
+    ok = application:stop(os_mon),
+
+    ok = application:set_env(os_mon, start_cpu_sup, false),
+    ok = application:start(os_mon),
+    true = lists:all(IsReg, [disksup, memsup]),
+    true = IsNotReg(cpu_sup),
+    ok = application:stop(os_mon),
+    ok = application:set_env(os_mon, start_cpu_sup, true),
+
+    ok = application:set_env(os_mon, start_disksup, false),
+    ok = application:start(os_mon),
+    true = lists:all(IsReg, [cpu_sup, memsup]),
+    true = IsNotReg(disksup),
+    ok = application:stop(os_mon),
+    ok = application:set_env(os_mon, start_disksup, true),
+
+    ok = application:set_env(os_mon, start_memsup, false),
+    ok = application:start(os_mon),
+    true = lists:all(IsReg, [cpu_sup, disksup]),
+    true = IsNotReg(memsup),
+    ok = application:stop(os_mon),
+    ok = application:set_env(os_mon, start_memsup, true),
 
     ok.
diff --git a/lib/os_mon/test/os_mon_mib_SUITE.erl b/lib/os_mon/test/os_mon_mib_SUITE.erl
index e68a139a74..84487cd751 100644
--- a/lib/os_mon/test/os_mon_mib_SUITE.erl
+++ b/lib/os_mon/test/os_mon_mib_SUITE.erl
@@ -30,30 +30,28 @@
 %% > ct_run -suite os_mon_mib_SUITE -config os_mon_mib_SUITE.cfg
 %%-----------------------------------------------------------------
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("os_mon/include/OTP-OS-MON-MIB.hrl").
 -include_lib("snmp/include/snmp_types.hrl").
 
 % Test server specific exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 init_per_suite/1, end_per_suite/1,
-	 init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0, groups/0,
+         init_per_suite/1, end_per_suite/1]).
 
 
 % Test cases must be exported.
 -export([update_load_table/1]).
 
 -export([get_mem_sys_mark/1, get_mem_proc_mark/1, get_disk_threshold/1,
-	 get_load_table/1, get_disk_table/1,
-	 real_snmp_request/1, load_unload/1]).
+         get_load_table/1, get_disk_table/1,
+         real_snmp_request/1, load_unload/1]).
 
 -export([sys_tot_mem/1, sys_used_mem/1, large_erl_process/1,
-	 large_erl_process_mem/1, cpu_load/1, cpu_load5/1, cpu_load15/1,
-	 os_wordsize/1, sys_tot_mem64/1, sys_used_mem64/1,
-	 large_erl_process_mem64/1, disk_descr/1, disk_kbytes/1,
-	 disk_capacity/1]).
+         large_erl_process_mem/1, cpu_load/1, cpu_load5/1, cpu_load15/1,
+         os_wordsize/1, sys_tot_mem64/1, sys_used_mem64/1,
+         large_erl_process_mem64/1, disk_descr/1, disk_kbytes/1,
+         disk_capacity/1]).
 
--export([]).
 -export([otp_6351/1, otp_7441/1]).
 
 -define(TRAP_UDP, 5000).
@@ -65,17 +63,11 @@
 -define(MGR_PORT, 5001).
 
 %%---------------------------------------------------------------------
-init_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:minutes(6)),
-    [{watchdog, Dog}|Config].
 
-end_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    Config.
-
-suite() -> [{ct_hooks,[ts_install_cth]},
-	    {require, snmp_mgr_agent, snmp}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,6}},
+     {require, snmp_mgr_agent, snmp}].
 
 all() -> 
     [load_unload, get_mem_sys_mark, get_mem_proc_mark,
@@ -94,12 +86,6 @@ groups() ->
      {get_next_disk_table, [],
       [disk_descr, disk_kbytes, disk_capacity]}].
 
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 
 %%---------------------------------------------------------------------
 %%--------------------------------------------------------------------
@@ -112,9 +98,9 @@ end_per_group(_GroupName, Config) ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    ?line application:start(sasl),
-    ?line application:start(mnesia),
-    ?line application:start(os_mon),
+    application:start(sasl),
+    application:start(mnesia),
+    application:start(os_mon),
 
     ok = ct_snmp:start(Config,snmp_mgr_agent),
 
@@ -130,7 +116,7 @@ init_per_suite(Config) ->
 %% Description: Cleanup after the whole suite
 %%--------------------------------------------------------------------
 end_per_suite(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     ConfDir = filename:join(PrivDir,"conf"),
     DbDir = filename:join(PrivDir,"db"),
     MgrDir = filename:join(PrivDir, "mgr"),
@@ -152,92 +138,74 @@ end_per_suite(Config) ->
 %%---------------------------------------------------------------------
 %% Test cases
 %%---------------------------------------------------------------------
-load_unload(doc) ->
-    ["Test to unload and the reload the OTP.mib "];
-load_unload(suite) -> [];
+    
+%% Test to unload and the reload the OTP.mib
 load_unload(Config) when is_list(Config) ->
-    ?line os_mon_mib:unload(snmp_master_agent),
-    ?line os_mon_mib:load(snmp_master_agent),
+    os_mon_mib:unload(snmp_master_agent),
+    os_mon_mib:load(snmp_master_agent),
     ok.
 %%---------------------------------------------------------------------
 
-update_load_table(doc) ->
-    ["check os_mon_mib:update_load_table error handling"];
-update_load_table(suite) ->
-    [];
+%% check os_mon_mib:update_load_table error handling
 update_load_table(Config) when is_list(Config) ->
-    ?line Node = start_node(),
-    ?line ok = rpc:call(Node,application,start,[sasl]),
-    ?line ok = rpc:call(Node,application,start,[os_mon]),
-    ?line ok = os_mon_mib:update_load_table(),
-    ?line rpc:call(Node,application,stop,[os_mon]),
-    ?line ok = os_mon_mib:update_load_table(),
-    ?line stop_node(Node),
+    Node = start_node(),
+    ok = rpc:call(Node,application,start,[sasl]),
+    ok = rpc:call(Node,application,start,[os_mon]),
+    ok = os_mon_mib:update_load_table(),
+    rpc:call(Node,application,stop,[os_mon]),
+    ok = os_mon_mib:update_load_table(),
+    stop_node(Node),
     ok.
 
-otp_6351(doc) ->
-    ["like update_load_table, when memsup_system_only==true"];
-otp_6351(suite) ->
-    [];
+%% like update_load_table, when memsup_system_only==true
 otp_6351(Config) when is_list(Config) ->
-    ?line Node = start_node(),
-    ?line ok = rpc:call(Node,application,start,[sasl]),
-    ?line ok = rpc:call(Node,application,load,[os_mon]),
-    ?line ok = rpc:call(Node,application,set_env,
-			[os_mon,memsup_system_only,true]),
-    ?line ok = rpc:call(Node,application,start,[os_mon]),
-    ?line Res = rpc:call(Node,os_mon_mib,get_load,[Node]),
+    Node = start_node(),
+    ok = rpc:call(Node,application,start,[sasl]),
+    ok = rpc:call(Node,application,load,[os_mon]),
+    ok = rpc:call(Node,application,set_env,
+                  [os_mon,memsup_system_only,true]),
+    ok = rpc:call(Node,application,start,[os_mon]),
+    Res = rpc:call(Node,os_mon_mib,get_load,[Node]),
     if
-	is_tuple(Res), element(1, Res)==loadTable ->
-	    ?line ok;
-	true ->
-	    ?line ?t:fail(Res)
+        is_tuple(Res), element(1, Res)==loadTable ->
+            ok;
+        true ->
+            ct:fail(Res)
     end,
-    ?line rpc:call(Node,application,stop,[os_mon]),
-    ?line stop_node(Node),
+    rpc:call(Node,application,stop,[os_mon]),
+    stop_node(Node),
     ok.
 
 
-
-
 %%---------------------------------------------------------------------
-get_mem_sys_mark(doc) ->
-    ["Simulates a get call to test the instrumentation function "
-     "for the loadMemorySystemWatermark variable."];
-get_mem_sys_mark(suite) ->
-    [];
+%% Simulates a get call to test the instrumentation function
+%% for the loadMemorySystemWatermark variable.
 get_mem_sys_mark(Config) when is_list(Config) ->
     case  os_mon_mib:mem_sys_mark(get) of
-	{value, SysMark} when is_integer(SysMark) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(sys_mark_value_not_integer)
+        {value, SysMark} when is_integer(SysMark) ->
+            ok;
+        _ ->
+            ct:fail(sys_mark_value_not_integer)
     end.
 %%---------------------------------------------------------------------
-get_mem_proc_mark(doc) ->
-    ["Simulates a get call to test the instrumentation function "
-     "for the loadMemoryErlProcWatermark variable."];
-get_mem_proc_mark(suite) ->
-    [];
+%% Simulates a get call to test the instrumentation function
+%% for the loadMemoryErlProcWatermark variable.
 get_mem_proc_mark(Config) when is_list(Config) ->
     case os_mon_mib:mem_proc_mark(get) of
-	{value, ProcMark} when is_integer(ProcMark) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(proc_mark_value_not_integer)
+        {value, ProcMark} when is_integer(ProcMark) ->
+            ok;
+        _ ->
+            ct:fail(proc_mark_value_not_integer)
     end.
 %%---------------------------------------------------------------------
-get_disk_threshold(doc) ->
-    ["Simulates a get call to test the instrumentation function "
-     "for the diskAlmostFullThreshold variable."];
-get_disk_threshold(suite) ->
-    [];
+%% Simulates a get call to test the instrumentation function
+%% for the diskAlmostFullThreshold variable.
 get_disk_threshold(Config) when is_list(Config) ->
-     case os_mon_mib:disk_threshold(get) of
-	{value, ProcMark} when is_integer(ProcMark) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(disk_threshold_value_not_integer)
+    case os_mon_mib:disk_threshold(get) of
+        {value, ProcMark} when is_integer(ProcMark) ->
+            ok;
+        _ ->
+            ct:fail(disk_threshold_value_not_integer)
     end.
 %%---------------------------------------------------------------------
 
@@ -247,11 +215,8 @@ get_disk_threshold(Config) when is_list(Config) ->
 %%% instrumentation functions directly as done in most test cases in
 %%% this test suite
 
-get_load_table(doc) ->
-    ["Simulates get calls to test the instrumentation function "
-     "for the loadTable"];
-get_load_table(suite) ->
-    [];
+%% Simulates get calls to test the instrumentation function
+%% for the loadTable
 get_load_table(Config) when is_list(Config) ->
 
     NodeStr = atom_to_list(node()),
@@ -259,376 +224,316 @@ get_load_table(Config) when is_list(Config) ->
 
     {_, _, {Pid, _}} = memsup:get_memory_data(),
     PidStr = lists:flatten(io_lib:format("~w", [Pid])),
-    ?line [{value, NodeStr},{value, PidStr}] =
-	os_mon_mib:load_table(get, [NodeLen  | NodeStr],
-			      [?loadErlNodeName, ?loadLargestErlProcess]),
-
-    ?line Values = os_mon_mib:load_table(get, [NodeLen  | NodeStr] ,
-					 [?loadSystemTotalMemory,
-					  ?loadSystemUsedMemory,
-					  ?loadLargestErlProcessUsedMemory,
-					  ?loadCpuLoad,
-					  ?loadCpuLoad5,
-					  ?loadCpuLoad15,
-					  ?loadOsWordsize,
-					  ?loadSystemTotalMemory64,
-					  ?loadSystemUsedMemory64,
-					  ?loadLargestErlProcessUsedMemory64]),
+    [{value, NodeStr},{value, PidStr}] =
+    os_mon_mib:load_table(get, [NodeLen  | NodeStr],
+                          [?loadErlNodeName, ?loadLargestErlProcess]),
+
+    Values = os_mon_mib:load_table(get, [NodeLen  | NodeStr] ,
+                                   [?loadSystemTotalMemory,
+                                    ?loadSystemUsedMemory,
+                                    ?loadLargestErlProcessUsedMemory,
+                                    ?loadCpuLoad,
+                                    ?loadCpuLoad5,
+                                    ?loadCpuLoad15,
+                                    ?loadOsWordsize,
+                                    ?loadSystemTotalMemory64,
+                                    ?loadSystemUsedMemory64,
+                                    ?loadLargestErlProcessUsedMemory64]),
 
     IsInt = fun({value, Val}) when is_integer(Val) ->
-		    true;
-	       (_) ->
-		    false
-	    end,
+                    true;
+               (_) ->
+                    false
+            end,
 
     NewValues = lists:filter(IsInt, Values),
 
     case length(NewValues) of
-	10 ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(value_not_integer)
+        10 ->
+            ok;
+        _ ->
+            ct:fail(value_not_integer)
     end,
 
-    ?line [{noValue,noSuchInstance}, {noValue,noSuchInstance},
-	   {noValue,noSuchInstance}, {noValue,noSuchInstance},
-	   {noValue,noSuchInstance}, {noValue,noSuchInstance},
-	   {noValue,noSuchInstance}, {noValue,noSuchInstance},
-	   {noValue,noSuchInstance}, {noValue,noSuchInstance},
-	   {noValue,noSuchInstance}, {noValue,noSuchInstance}] =
-	os_mon_mib:load_table(get, [3, 102, 111, 111],
-			      [?loadErlNodeName,
-			       ?loadSystemTotalMemory,
-			       ?loadSystemUsedMemory,
-			       ?loadLargestErlProcess,
-			       ?loadLargestErlProcessUsedMemory,
-			       ?loadCpuLoad,
-			       ?loadCpuLoad5,
-			       ?loadCpuLoad15,
-			       ?loadOsWordsize,
-			       ?loadSystemTotalMemory64,
-			       ?loadSystemUsedMemory64,
-			       ?loadLargestErlProcessUsedMemory64]),
+    [{noValue,noSuchInstance}, {noValue,noSuchInstance},
+     {noValue,noSuchInstance}, {noValue,noSuchInstance},
+     {noValue,noSuchInstance}, {noValue,noSuchInstance},
+     {noValue,noSuchInstance}, {noValue,noSuchInstance},
+     {noValue,noSuchInstance}, {noValue,noSuchInstance},
+     {noValue,noSuchInstance}, {noValue,noSuchInstance}] =
+    os_mon_mib:load_table(get, [3, 102, 111, 111],
+                          [?loadErlNodeName,
+                           ?loadSystemTotalMemory,
+                           ?loadSystemUsedMemory,
+                           ?loadLargestErlProcess,
+                           ?loadLargestErlProcessUsedMemory,
+                           ?loadCpuLoad,
+                           ?loadCpuLoad5,
+                           ?loadCpuLoad15,
+                           ?loadOsWordsize,
+                           ?loadSystemTotalMemory64,
+                           ?loadSystemUsedMemory64,
+                           ?loadLargestErlProcessUsedMemory64]),
 
     ok.
 %%---------------------------------------------------------------------
 
-sys_tot_mem(doc) ->
-    [];
-sys_tot_mem(suite) ->
-    [];
 sys_tot_mem(Config) when is_list(Config) ->
-    ?line [{[?loadSystemTotalMemory, Len | NodeStr], Mem}] =
-	os_mon_mib:load_table(get_next, [], [?loadSystemTotalMemory]),
-    ?line Len = length(NodeStr),
-    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+    [{[?loadSystemTotalMemory, Len | NodeStr], Mem}] =
+    os_mon_mib:load_table(get_next, [], [?loadSystemTotalMemory]),
+    Len = length(NodeStr),
+    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
 
     case Mem of
-	Mem when is_integer(Mem) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(sys_tot_mem_value_not_integer)
+        Mem when is_integer(Mem) ->
+            ok;
+        _ ->
+            ct:fail(sys_tot_mem_value_not_integer)
     end.
 
-sys_used_mem(doc) ->
-    [];
-sys_used_mem(suite) -> [];
 sys_used_mem(Config) when is_list(Config) ->
-    ?line [{[?loadSystemUsedMemory, Len | NodeStr], Mem}] =
-	os_mon_mib:load_table(get_next,[], [?loadSystemUsedMemory]),
-    ?line Len = length(NodeStr),
-    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+    [{[?loadSystemUsedMemory, Len | NodeStr], Mem}] =
+    os_mon_mib:load_table(get_next,[], [?loadSystemUsedMemory]),
+    Len = length(NodeStr),
+    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
 
     case Mem of
-	Mem when is_integer(Mem) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(sys_used_mem_value_not_integer)
+        Mem when is_integer(Mem) ->
+            ok;
+        _ ->
+            ct:fail(sys_used_mem_value_not_integer)
     end.
 
-large_erl_process(doc) ->
-    [];
-large_erl_process(suite) ->
-    [];
 large_erl_process(Config) when is_list(Config) ->
     {_, _, {Pid, _}} = memsup:get_memory_data(),
     PidStr = lists:flatten(io_lib:format("~w", [Pid])),
-    ?line [{[?loadLargestErlProcess, Len | NodeStr], PidStr}] =
-	os_mon_mib:load_table(get_next,[], [?loadLargestErlProcess]),
-    ?line Len = length(NodeStr),
-    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+    [{[?loadLargestErlProcess, Len | NodeStr], PidStr}] =
+    os_mon_mib:load_table(get_next,[], [?loadLargestErlProcess]),
+    Len = length(NodeStr),
+    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
     ok.
 
-large_erl_process_mem(doc) ->
-    [];
-large_erl_process_mem(suite) ->
-    [];
 large_erl_process_mem(Config) when is_list(Config) ->
 
-    ?line [{[?loadLargestErlProcessUsedMemory, Len | NodeStr], Mem}] =
-	os_mon_mib:load_table(get_next,[],
-			      [?loadLargestErlProcessUsedMemory]),
-    ?line Len = length(NodeStr),
-    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-     case Mem of
-	Mem when is_integer(Mem) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(erl_pid_mem_value_not_integer)
+    [{[?loadLargestErlProcessUsedMemory, Len | NodeStr], Mem}] =
+    os_mon_mib:load_table(get_next,[],
+                          [?loadLargestErlProcessUsedMemory]),
+    Len = length(NodeStr),
+    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+    case Mem of
+        Mem when is_integer(Mem) ->
+            ok;
+        _ ->
+            ct:fail(erl_pid_mem_value_not_integer)
     end.
 
-cpu_load(doc) ->
-    [];
-cpu_load(suite) ->
-    [];
 cpu_load(Config) when is_list(Config) ->
-    ?line [{[?loadCpuLoad, Len | NodeStr], Load}] =
-	os_mon_mib:load_table(get_next,[], [?loadCpuLoad]),
-    ?line Len = length(NodeStr),
-    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+    [{[?loadCpuLoad, Len | NodeStr], Load}] =
+    os_mon_mib:load_table(get_next,[], [?loadCpuLoad]),
+    Len = length(NodeStr),
+    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
 
     case Load of
-	Load when is_integer(Load) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(cpu_load_value_not_integer)
+        Load when is_integer(Load) ->
+            ok;
+        _ ->
+            ct:fail(cpu_load_value_not_integer)
     end.
 
-cpu_load5(doc) ->
-    [];
-cpu_load5(suite) ->
-    [];
 cpu_load5(Config) when is_list(Config) ->
-    ?line [{[?loadCpuLoad5, Len | NodeStr], Load}] =
-	os_mon_mib:load_table(get_next,[], [?loadCpuLoad5]),
-    ?line Len = length(NodeStr),
-    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+    [{[?loadCpuLoad5, Len | NodeStr], Load}] =
+    os_mon_mib:load_table(get_next,[], [?loadCpuLoad5]),
+    Len = length(NodeStr),
+    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
 
     case Load of
-	Load when is_integer(Load) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(cpu_load5_value_not_integer)
+        Load when is_integer(Load) ->
+            ok;
+        _ ->
+            ct:fail(cpu_load5_value_not_integer)
     end.
 
-cpu_load15(doc) ->
-    [];
-cpu_load15(suite) ->
-    [];
 cpu_load15(Config) when is_list(Config) ->
-    ?line [{[?loadCpuLoad15, Len | NodeStr], Load}] =
-	os_mon_mib:load_table(get_next,[], [?loadCpuLoad15]),
-    ?line Len = length(NodeStr),
-    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-     case Load of
-	 Load when is_integer(Load) ->
-	     ok;
-	 _ ->
-	     ?line test_server:fail(cpu_load15_value_not_integer)
-     end.
-
-os_wordsize(doc) ->
-    [];
-os_wordsize(suite) ->
-    [];
+    [{[?loadCpuLoad15, Len | NodeStr], Load}] =
+    os_mon_mib:load_table(get_next,[], [?loadCpuLoad15]),
+    Len = length(NodeStr),
+    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+    case Load of
+        Load when is_integer(Load) ->
+            ok;
+        _ ->
+            ct:fail(cpu_load15_value_not_integer)
+    end.
+
 os_wordsize(Config) when is_list(Config) ->
-    ?line [{[?loadOsWordsize, Len | NodeStr], Wordsize}] =
-	os_mon_mib:load_table(get_next,[], [?loadOsWordsize]),
-    ?line Len = length(NodeStr),
-    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-     case Wordsize of
-	 Wordsize when is_integer(Wordsize) ->
-	     ok;
-	 _ ->
-	     ?line test_server:fail(os_wordsize_value_not_integer)
-     end.
-
-sys_tot_mem64(doc) ->
-    [];
-sys_tot_mem64(suite) ->
-    [];
+    [{[?loadOsWordsize, Len | NodeStr], Wordsize}] =
+    os_mon_mib:load_table(get_next,[], [?loadOsWordsize]),
+    Len = length(NodeStr),
+    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+    case Wordsize of
+        Wordsize when is_integer(Wordsize) ->
+            ok;
+        _ ->
+            ct:fail(os_wordsize_value_not_integer)
+    end.
+
 sys_tot_mem64(Config) when is_list(Config) ->
-    ?line [{[?loadSystemTotalMemory64, Len | NodeStr], Mem}] =
-	os_mon_mib:load_table(get_next, [], [?loadSystemTotalMemory64]),
-    ?line Len = length(NodeStr),
-    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+    [{[?loadSystemTotalMemory64, Len | NodeStr], Mem}] =
+    os_mon_mib:load_table(get_next, [], [?loadSystemTotalMemory64]),
+    Len = length(NodeStr),
+    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
 
     case Mem of
-	Mem when is_integer(Mem) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(sys_tot_mem_value_not_integer)
+        Mem when is_integer(Mem) ->
+            ok;
+        _ ->
+            ct:fail(sys_tot_mem_value_not_integer)
     end.
 
-sys_used_mem64(doc) ->
-    [];
-sys_used_mem64(suite) -> [];
 sys_used_mem64(Config) when is_list(Config) ->
-    ?line [{[?loadSystemUsedMemory64, Len | NodeStr], Mem}] =
-	os_mon_mib:load_table(get_next,[], [?loadSystemUsedMemory64]),
-    ?line Len = length(NodeStr),
-    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+    [{[?loadSystemUsedMemory64, Len | NodeStr], Mem}] =
+    os_mon_mib:load_table(get_next,[], [?loadSystemUsedMemory64]),
+    Len = length(NodeStr),
+    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
 
     case Mem of
-	Mem when is_integer(Mem) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(sys_used_mem_value_not_integer)
+        Mem when is_integer(Mem) ->
+            ok;
+        _ ->
+            ct:fail(sys_used_mem_value_not_integer)
     end.
 
-large_erl_process_mem64(doc) ->
-    [];
-large_erl_process_mem64(suite) ->
-    [];
 large_erl_process_mem64(Config) when is_list(Config) ->
 
-    ?line [{[?loadLargestErlProcessUsedMemory64, Len | NodeStr], Mem}] =
-	os_mon_mib:load_table(get_next,[],
-			      [?loadLargestErlProcessUsedMemory64]),
-    ?line Len = length(NodeStr),
-    ?line true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-     case Mem of
-	Mem when is_integer(Mem) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(erl_pid_mem_value_not_integer)
+    [{[?loadLargestErlProcessUsedMemory64, Len | NodeStr], Mem}] =
+    os_mon_mib:load_table(get_next,[],
+                          [?loadLargestErlProcessUsedMemory64]),
+    Len = length(NodeStr),
+    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
+
+    case Mem of
+        Mem when is_integer(Mem) ->
+            ok;
+        _ ->
+            ct:fail(erl_pid_mem_value_not_integer)
     end.
 %%---------------------------------------------------------------------
-get_disk_table(doc) ->
-    ["Simulates get calls to test the instrumentation function "
-     "for the diskTable."];
-get_disk_table(suite) ->
-    [];
+%% Simulates get calls to test the instrumentation function
+%% for the diskTable.
 get_disk_table(Config) when is_list(Config) ->
 
     DiskData = disksup:get_disk_data(),
     DiskDataLen = length(DiskData),
 
     if
-	DiskDataLen > 0 ->
-	    ?line [{value, Value}] =
-		os_mon_mib:disk_table(get, [1,1], [?diskDescr]),
-
-	    case is_list(Value) of
-		true ->
-		    ok;
-		false ->
-		    ?line test_server:fail(value_not_a_string)
-	    end,
-
-	    ?line Values = os_mon_mib:disk_table(get, [1,1],
-						 [?diskId,
-						  ?diskKBytes,
-						  ?diskCapacity]),
-
-	    IsInt = fun({value, Val}) when is_integer(Val) ->
-		    true;
-		       (_) ->
-			    false
-		    end,
-
-	    NewValues = lists:filter(IsInt, Values),
-
-	    case length(NewValues) of
-		3 ->
-		    ok;
-		_ ->
-		    ?line test_server:fail(value_not_integer)
-	    end
+        DiskDataLen > 0 ->
+            [{value, Value}] =
+            os_mon_mib:disk_table(get, [1,1], [?diskDescr]),
+
+            case is_list(Value) of
+                true ->
+                    ok;
+                false ->
+                    ct:fail(value_not_a_string)
+            end,
+
+            Values = os_mon_mib:disk_table(get, [1,1],
+                                           [?diskId,
+                                            ?diskKBytes,
+                                            ?diskCapacity]),
+
+            IsInt = fun({value, Val}) when is_integer(Val) ->
+                            true;
+                       (_) ->
+                            false
+                    end,
+
+            NewValues = lists:filter(IsInt, Values),
+
+            case length(NewValues) of
+                3 ->
+                    ok;
+                _ ->
+                    ct:fail(value_not_integer)
+            end
     end,
 
-    ?line [{noValue,noSuchInstance}, {noValue,noSuchInstance},
-	   {noValue,noSuchInstance}, {noValue,noSuchInstance}] =
-	os_mon_mib:disk_table(get, [1, DiskDataLen + 1], [?diskId,
-							  ?diskDescr,
-							  ?diskKBytes,
-							  ?diskCapacity]),
+    [{noValue,noSuchInstance}, {noValue,noSuchInstance},
+     {noValue,noSuchInstance}, {noValue,noSuchInstance}] =
+    os_mon_mib:disk_table(get, [1, DiskDataLen + 1], [?diskId,
+                                                      ?diskDescr,
+                                                      ?diskKBytes,
+                                                      ?diskCapacity]),
 
     ok.
 
 %%---------------------------------------------------------------------
 
-disk_descr(doc) ->
-    [];
-disk_descr(suite) ->
-    [];
 disk_descr(Config) when is_list(Config) ->
-    ?line [{[?diskDescr, 1,1], Descr}] =
-	os_mon_mib:disk_table(get_next, [], [?diskDescr]),
+    [{[?diskDescr, 1,1], Descr}] =
+    os_mon_mib:disk_table(get_next, [], [?diskDescr]),
 
     case Descr of
-	Descr when is_list(Descr) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(disk_descr_value_not_a_string)
+        Descr when is_list(Descr) ->
+            ok;
+        _ ->
+            ct:fail(disk_descr_value_not_a_string)
     end.
 
-disk_kbytes(doc) ->
-    [];
-disk_kbytes(suite) -> [];
 disk_kbytes(Config) when is_list(Config) ->
-    ?line [{[?diskKBytes, 1,1], Kbytes}] =
-	os_mon_mib:disk_table(get_next,[], [?diskKBytes]),
+    [{[?diskKBytes, 1,1], Kbytes}] =
+    os_mon_mib:disk_table(get_next,[], [?diskKBytes]),
 
     case Kbytes of
-	Kbytes when is_integer(Kbytes) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(disk_kbytes_value_not_integer)
+        Kbytes when is_integer(Kbytes) ->
+            ok;
+        _ ->
+            ct:fail(disk_kbytes_value_not_integer)
     end.
 
 
-disk_capacity(doc) ->
-    [];
-disk_capacity(suite) -> [];
 disk_capacity(Config) when is_list(Config) ->
-    ?line [{[?diskCapacity, 1,1], Capacity}] =
-	os_mon_mib:disk_table(get_next,[], [?diskCapacity]),
+    [{[?diskCapacity, 1,1], Capacity}] =
+    os_mon_mib:disk_table(get_next,[], [?diskCapacity]),
 
     case Capacity of
-	Capacity when is_integer(Capacity) ->
-	    ok;
-	_ ->
-	    ?line test_server:fail(disk_capacity_value_not_integer)
+        Capacity when is_integer(Capacity) ->
+            ok;
+        _ ->
+            ct:fail(disk_capacity_value_not_integer)
     end.
 
 %%---------------------------------------------------------------------
-real_snmp_request(doc) ->
-    ["Starts an snmp manager and sends a real snmp-request. i.e. "
-     "sends a udp message on the correct format."];
-real_snmp_request(suite) -> [];
+%% Starts an snmp manager and sends a real snmp-request. i.e.
+%% sends a udp message on the correct format.
 real_snmp_request(Config) when is_list(Config) ->
     NodStr = atom_to_list(node()),
     Len = length(NodStr),
     {_, _, {Pid, _}} = memsup:get_memory_data(),
     PidStr = lists:flatten(io_lib:format("~w", [Pid])),
     io:format("FOO: ~p~n", [PidStr]),
-    ?line ok = snmp_get([?loadEntry ++
-			 [?loadLargestErlProcess, Len | NodStr]],
-			PidStr),
-    ?line ok = snmp_get_next([?loadEntry ++
-			      [?loadSystemUsedMemory, Len | NodStr]],
-			     ?loadEntry ++ [?loadSystemUsedMemory + 1, Len
-					    | NodStr], PidStr),
-    ?line ok = snmp_set([?loadEntry ++ [?loadLargestErlProcess,  Len | NodStr]],
-			s, "<0.101.0>", Config),
+    ok = snmp_get([?loadEntry ++
+                   [?loadLargestErlProcess, Len | NodStr]],
+                  PidStr),
+    ok = snmp_get_next([?loadEntry ++
+                        [?loadSystemUsedMemory, Len | NodStr]],
+                       ?loadEntry ++ [?loadSystemUsedMemory + 1, Len
+                                      | NodStr], PidStr),
+    ok = snmp_set([?loadEntry ++ [?loadLargestErlProcess,  Len | NodStr]],
+                  s, "<0.101.0>", Config),
     ok.
 
-otp_7441(doc) ->
-    ["Starts an snmp manager and requests total memory. Was previously
-     integer32 which was errornous on 64 bit machines."];
-otp_7441(suite) ->
-    [];
+%% Starts an snmp manager and requests total memory. Was previously
+%% integer32 which was errornous on 64 bit machines.
 otp_7441(Config) when is_list(Config) ->
     NodStr = atom_to_list(node()),
     Len = length(NodStr),
     Oids = [Oid|_] = [?loadEntry ++ [?loadSystemTotalMemory, Len | NodStr]],
     {noError,0,[#varbind{oid = Oid, variabletype = 'Unsigned32'}]} =
-	ct_snmp:get_values(os_mon_mib_test, Oids, snmp_mgr_agent),
+    ct_snmp:get_values(os_mon_mib_test, Oids, snmp_mgr_agent),
 
     ok.
 
@@ -636,9 +541,8 @@ otp_7441(Config) when is_list(Config) ->
 %% Internal functions
 %%---------------------------------------------------------------------
 start_node() ->
-    ?line Pa = filename:dirname(code:which(?MODULE)),
-    ?line {ok,Node} = test_server:start_node(testnisse, slave,
-					     [{args, " -pa " ++ Pa}]),
+    Pa = filename:dirname(code:which(?MODULE)),
+    {ok,Node} = test_server:start_node(testnisse, slave, [{args, " -pa " ++ Pa}]),
     Node.
 
 stop_node(Node) ->
@@ -648,27 +552,27 @@ del_dir(Dir) ->
     io:format("Deleting: ~s~n",[Dir]),
     {ok, Files} = file:list_dir(Dir),
     FullPathFiles = lists:map(fun(File) -> filename:join(Dir, File) end,
-			      Files),
+                              Files),
     lists:foreach(fun file:delete/1, FullPathFiles),
     file:del_dir(Dir).
 
 %%---------------------------------------------------------------------
 snmp_get(Oids = [Oid |_], Result) ->
     {noError,0,[#varbind{oid = Oid,
-			 variabletype = 'OCTET STRING',
-			 value = Result}]} =
-	ct_snmp:get_values(os_mon_mib_test, Oids, snmp_mgr_agent),
+                         variabletype = 'OCTET STRING',
+                         value = Result}]} =
+    ct_snmp:get_values(os_mon_mib_test, Oids, snmp_mgr_agent),
     ok.
 
 snmp_get_next(Oids, NextOid, Result) ->
     {noError,0,[#varbind{oid = NextOid,
-			 variabletype = 'OCTET STRING',
-			 value = Result}]} =
-	ct_snmp:get_next_values(os_mon_mib_test, Oids, snmp_mgr_agent),
+                         variabletype = 'OCTET STRING',
+                         value = Result}]} =
+    ct_snmp:get_next_values(os_mon_mib_test, Oids, snmp_mgr_agent),
     ok.
 
 snmp_set(Oid, ValuType, Value, Config) ->
     {notWritable, _, _} =
-	ct_snmp:set_values(os_mon_mib_test, [{Oid, ValuType, Value}],
-			   snmp_mgr_agent, Config),
+    ct_snmp:set_values(os_mon_mib_test, [{Oid, ValuType, Value}],
+                       snmp_mgr_agent, Config),
     ok.
diff --git a/lib/os_mon/test/os_sup_SUITE.erl b/lib/os_mon/test/os_sup_SUITE.erl
index 768d95aebc..82c04ceaae 100644
--- a/lib/os_mon/test/os_sup_SUITE.erl
+++ b/lib/os_mon/test/os_sup_SUITE.erl
@@ -18,20 +18,16 @@
 %% %CopyrightEnd%
 %%
 -module(os_sup_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0]).
 -export([init_per_suite/1, end_per_suite/1]).
--export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases
 -export([message/1]).
 -export([config/1, port/1]).
 
-%% Default timetrap timeout (set in init_per_testcase)
--define(default_timeout, ?t:minutes(1)).
-
 -define(TAG, test_tag).
 -define(MFA, {?MODULE, test_mfa, [?TAG]}).
 
@@ -39,86 +35,64 @@
 
 init_per_suite(Config) when is_list(Config) ->
     spawn(fun() -> message_receptor() end),
-    ?line application:load(os_mon),
-    ?line ok = application:set_env(os_mon, start_os_sup, true),
-    ?line ok = application:set_env(os_mon, os_sup_mfa, ?MFA),
-    ?line ok = application:set_env(os_mon, os_sup_enable, false),
-    ?line ok = application:start(os_mon),
+    application:load(os_mon),
+    ok = application:set_env(os_mon, start_os_sup, true),
+    ok = application:set_env(os_mon, os_sup_mfa, ?MFA),
+    ok = application:set_env(os_mon, os_sup_enable, false),
+    ok = application:start(os_mon),
     Config.
 
 end_per_suite(Config) when is_list(Config) ->
-    ?line application:stop(os_mon),
-    ?line ok = application:set_env(os_mon, start_os_sup, false),
+    application:stop(os_mon),
+    ok = application:set_env(os_mon, start_os_sup, false),
     MFA = {os_sup, error_report, [std_error]},
-    ?line ok = application:set_env(os_mon, os_sup_mfa, MFA),
-    ?line ok = application:set_env(os_mon, os_sup_enable, true),
-    ?line exit(whereis(message_receptor), done),
+    ok = application:set_env(os_mon, os_sup_mfa, MFA),
+    ok = application:set_env(os_mon, os_sup_enable, true),
+    exit(whereis(message_receptor), done),
     Config.
 
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?default_timeout),
-    [{watchdog,Dog} | Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     case test_server:os_type() of
-	{unix, sunos} -> [message, config, port];
-	{win32, _OSname} -> [message];
-	OS ->
-	    Str = io_lib:format("os_sup not available for ~p",
-				[OS]),
-	    {skip, lists:flatten(Str)}
+        {unix, sunos} -> [message, config, port];
+        {win32, _OSname} -> [message];
+        OS ->
+            Str = io_lib:format("os_sup not available for ~p",
+                                [OS]),
+            {skip, lists:flatten(Str)}
     end.
 
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
 
-
-message(suite) ->
-    [];
-message(doc) ->
-    ["Test OS message handling"];
+%% Test OS message handling
 message(Config) when is_list(Config) ->
 
     %% Fake an OS message
     Data = "10H11386278426HSystem4HTest5HError5HTesto",
-    ?line os_sup_server ! {faked_port, {data, Data}},
+    os_sup_server ! {faked_port, {data, Data}},
 
     %% Check with message_receptor that it has been received
-    ?t:sleep(?t:seconds(1)),
+    ct:sleep({seconds,1}),
     Msg =
-	case ?t:os_type() of
-	    {unix, sunos} ->
-		{?TAG, Data};
-	    {win32, _} ->
-		{?TAG,{{1138,627842,0},"System","Test","Error","Testo"}}
-	end,
-    ?line message_receptor ! {check, self(), Msg},
+    case ?t:os_type() of
+        {unix, sunos} ->
+            {?TAG, Data};
+        {win32, _} ->
+            {?TAG,{{1138,627842,0},"System","Test","Error","Testo"}}
+    end,
+    message_receptor ! {check, self(), Msg},
     receive
-	{result, true} ->
-	    ok;
-	{result, Rec} ->
-	    ?t:fail({no_message, Rec})
+        {result, true} ->
+            ok;
+        {result, Rec} ->
+            ct:fail({no_message, Rec})
     end,
 
     ok.
 
-config(suite) ->
-    [];
-config(doc) ->
-    ["Test configuration"];
+%% Test configuration
 config(Config) when is_list(Config) ->
 
     %% os_sup_enable==true and os_sup_own/os_sup_syslogconf cannot
@@ -130,45 +104,42 @@ config(Config) when is_list(Config) ->
 
     ok.
 
-port(suite) ->
-    [];
-port(doc) ->
-    ["Test that os_sup handles a terminating port program"];
+%% Test that os_sup handles a terminating port program
 port(Config) when is_list(Config) ->
-    ?line Str = os:cmd("ps -e | grep '[f]errule'"),
+    Str = os:cmd("ps -e | grep '[f]errule'"),
     case io_lib:fread("~s", Str) of
-	 {ok, [Pid], _Rest} ->
-
-	    %% Monitor os_sup_server
-	    ?line MonRef = erlang:monitor(process, os_sup_server),
-
-	    %% Kill the port program
-	    case os:cmd("kill -9 " ++ Pid) of
-		[] ->
-
-		    %% os_sup_server should now terminate
-		    receive
-			{'DOWN', MonRef, _, _, {port_died, _Reason}} ->
-			    ok;
-			{'DOWN', MonRef, _, _, Reason} ->
-			    ?line ?t:fail({unexpected_exit_reason, Reason})
-		    after
-			3000 ->
-			    ?line ?t:fail(still_alive)
-		    end,
-
-		    %% Give os_mon_sup time to restart os_sup
-		    ?t:sleep(?t:seconds(3)),
-		    ?line true = is_pid(whereis(os_sup_server)),
-
-		    ok;
-
-		Line ->
-		    erlang:demonitor(MonRef),
-		    {skip, {not_killed, Line}}
-	    end;
-	_ ->
-	    {skip, {os_pid_not_found}}
+        {ok, [Pid], _Rest} ->
+
+            %% Monitor os_sup_server
+            MonRef = erlang:monitor(process, os_sup_server),
+
+            %% Kill the port program
+            case os:cmd("kill -9 " ++ Pid) of
+                [] ->
+
+                    %% os_sup_server should now terminate
+                    receive
+                        {'DOWN', MonRef, _, _, {port_died, _Reason}} ->
+                            ok;
+                        {'DOWN', MonRef, _, _, Reason} ->
+                            ct:fail({unexpected_exit_reason, Reason})
+                    after
+                        3000 ->
+                            ct:fail(still_alive)
+                    end,
+
+                    %% Give os_mon_sup time to restart os_sup
+                    ct:sleep({seconds,3}),
+                    true = is_pid(whereis(os_sup_server)),
+
+                    ok;
+
+                Line ->
+                    erlang:demonitor(MonRef),
+                    {skip, {not_killed, Line}}
+            end;
+        _ ->
+            {skip, {os_pid_not_found}}
     end.
 
 %%----------------------------------------------------------------------
@@ -184,18 +155,18 @@ message_receptor() ->
 
 message_receptor(Received) ->
     receive
-	%% Check if a certain message has been received
-	{check, From, Msg} ->
-	    case lists:member(Msg, Received) of
-		true ->
-		    From ! {result, true},
-		    message_receptor(lists:delete(Msg, Received));
-		false ->
-		    From ! {result, Received},
-		    message_receptor(Received)
-	    end;
-
-	%% Save all other messages
-	Msg ->
-	    message_receptor([Msg|Received])
+        %% Check if a certain message has been received
+        {check, From, Msg} ->
+            case lists:member(Msg, Received) of
+                true ->
+                    From ! {result, true},
+                    message_receptor(lists:delete(Msg, Received));
+                false ->
+                    From ! {result, Received},
+                    message_receptor(Received)
+            end;
+
+        %% Save all other messages
+        Msg ->
+            message_receptor([Msg|Received])
     end.
diff --git a/lib/ose/Makefile b/lib/ose/Makefile
deleted file mode 100644
index 6119b75c3f..0000000000
--- a/lib/ose/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1996-2009. 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%
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-#
-# Macros
-#
-
-SUB_DIRECTORIES = src doc/src
-
-include vsn.mk
-VSN = $(OSE_VSN)
-
-SPECIAL_TARGETS =
-
-#
-# Default Subdir Targets
-#
-include $(ERL_TOP)/make/otp_subdir.mk
diff --git a/lib/ose/doc/html/.gitignore b/lib/ose/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ose/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/ose/doc/man3/.gitignore b/lib/ose/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ose/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/ose/doc/man6/.gitignore b/lib/ose/doc/man6/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ose/doc/man6/.gitignore
+++ /dev/null
diff --git a/lib/ose/doc/pdf/.gitignore b/lib/ose/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ose/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/ose/doc/src/.gitignore b/lib/ose/doc/src/.gitignore
deleted file mode 100644
index 860e9e703e..0000000000
--- a/lib/ose/doc/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-ose.xml
diff --git a/lib/ose/doc/src/Makefile b/lib/ose/doc/src/Makefile
deleted file mode 100644
index 7ebd4125ba..0000000000
--- a/lib/ose/doc/src/Makefile
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2012. 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%
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(OSE_VSN)
-APPLICATION=ose
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Help application directory specification
-# ----------------------------------------------------
-EDOC_DIR = $(ERL_TOP)/lib/edoc
-SYNTAX_TOOLS_DIR = $(ERL_TOP)/lib/syntax_tools
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-
-XML_REF3_FILES = \
-	ose.xml \
-	ose_erl_driver.xml
-
-XML_REF6_FILES = ose_app.xml
-
-XML_PART_FILES = part.xml
-XML_CHAPTER_FILES = notes.xml ose_intro.xml ose_signals_chapter.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = \
-	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
-	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_REF6_FILES) \
-	$(XML_APPLICATION_FILES)
-
-# ----------------------------------------------------
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-SPECS_FILES =
-
-TOP_SPECS_FILE =
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-XML_FLAGS +=
-
-SPECS_FLAGS = -I../../include -I../../../kernel/include
-
-OSE_SRC_DIR = ../../src
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-docs: man pdf html
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: $(HTML_REF_MAN_FILE)
-
-man: $(MAN3_FILES) $(MAN6_FILES)
-
-ose.xml: $(OSE_SRC_DIR)/ose.erl
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript\
-	 $(OSE_SRC_DIR)/$(@:%.xml=%.erl)
-
-debug opt:
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(MAN6DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f $(SPECDIR)/*
-	rm -f errs core *~
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		"$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
-	$(INSTALL_DATA) $(MAN6_FILES) "$(RELEASE_PATH)/man/man6"
-
-release_spec:
diff --git a/lib/ose/doc/src/book.xml b/lib/ose/doc/src/book.xml
deleted file mode 100644
index d62e0d32f4..0000000000
--- a/lib/ose/doc/src/book.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>2014</year><year>2014</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-
-    </legalnotice>
-
-    <title>OSE</title>
-    <prepared>Lukas Larsson</prepared>
-    <docno></docno>
-    <date>2014-01-08</date>
-    <rev>1.0</rev>
-    <file>book.xml</file>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>OSE</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-  </preamble>
-  <parts>
-    <xi:include href="part.xml"/>
-  </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-  <listofterms></listofterms>
-  <index></index>
-</book>
diff --git a/lib/ose/doc/src/notes.xml b/lib/ose/doc/src/notes.xml
deleted file mode 100644
index 06881b6c99..0000000000
--- a/lib/ose/doc/src/notes.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2014</year><year>2014</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-
-    </legalnotice>
-
-    <title>OSE Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>notes.xml</file>
-  </header>
-  <p>This document describes the changes made to the OSE application.</p>
-
-<section><title>Ose 1.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Change license text from Erlang Public License to Apache
-	    Public License v2</p>
-          <p>
-	    Own Id: OTP-12845</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Ose 1.0.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Add missing release notes for the OSE application.</p>
-          <p>
-	    Own Id: OTP-12177</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Ose 1.0.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fix some spelling mistakes in documentation</p>
-          <p>
-	    Own Id: OTP-12152</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Ose 1.0</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Erlang/OTP has been ported to the realtime operating
-	    system OSE. The port supports both smp and non-smp
-	    emulator. For details around the port and how to started
-	    see the User's Guide in the <seealso
-	    marker="ose:ose_intro">ose</seealso> application. </p>
-          <p>
-	    Note that not all parts of Erlang/OTP has been ported. </p>
-          <p>
-	    Notable things that work are: non-smp and smp emulators,
-	    OSE signal interaction, crypto, asn1, run_erl/to_erl,
-	    tcp, epmd, distribution and most if not all non-os
-	    specific functionality of Erlang.</p>
-          <p>
-	    Notable things that does not work are: udp/sctp, os_mon,
-	    erl_interface, binding of schedulers.</p>
-          <p>
-	    Own Id: OTP-11334</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-</chapter>
diff --git a/lib/ose/doc/src/ose_erl_driver.xml b/lib/ose/doc/src/ose_erl_driver.xml
deleted file mode 100644
index b804c29d2d..0000000000
--- a/lib/ose/doc/src/ose_erl_driver.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE cref SYSTEM "cref.dtd">
-
-<cref>
-  <header>
-    <copyright>
-      <year>2013</year><year>2014</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-
-    </legalnotice>
-
-    <title>erl_driver for Enea OSE</title>
-    <prepared>Lukas Larsson</prepared>
-    <docno></docno>
-    <date>2014-01-08</date>
-    <rev>A</rev>
-    <file>ose_erl_driver.xml</file>
-  </header>
-  <lib>ose_erl_driver</lib>
-  <libsummary>Linked-in drivers in Enea OSE</libsummary>
-  <description>
-    <p>Writing Linked-in drivers that also work on Enea OSE is very similar for
-    how you would do it for Unix. The difference from Unix is that
-    driver_select, ready_input and ready_output all work with signals
-    instead of file descriptors. This means that the driver_select is
-    used to specify which type of signal should trigger calls to
-    ready_input/ready_output. The functions described below are available
-    to driver programmers on Enea OSE to facilitate this.
-    </p>
-  </description>
-  <section>
-    <title>DATA TYPES</title>
-
-    <taglist>
-      <tag><marker id="union_SIGNAL"/>union SIGNAL</tag>
-      <item>See the Enea OSE SPI documentation for a description.</item>
-      <tag><marker id="SIGSELECT"/>SIGSELECT</tag>
-      <item>See the Enea OSE SPI documentation for a description.</item>
-      <tag><marker id="ErlDrvEvent"/>ErlDrvEvent</tag>
-      <item>The <c>ErlDrvEvent</c> is a handle to a signal number and id combination. It is passed to <seealso marker="erts:erl_driver#driver_select">driver_select(3)</seealso>.</item>
-      <tag><marker id="ErlDrvOseEventId"/>ErlDrvOseEventId</tag>
-      <item>This is the id used to associate a specific signal to a
-      certain driver instance. </item>
-    </taglist>
-  </section>
-  <funcs>
-    <func>
-      <name><ret>union SIGNAL *</ret><nametext>erl_drv_ose_get_signal(ErlDrvEvent drv_event)</nametext></name>
-      <desc>
-        <marker id="erl_drv_ose_get_signal"></marker>
-        <p>Fetch the next signal associated with <c>drv_event</c>.
-	Signals will be returned in the order which they were received and
-	when no more signals are available <c>NULL</c> will be returned.
-	Use this function in the ready_input/ready_output callbacks
-	to get signals.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>ErlDrvEvent</ret><nametext>erl_drv_ose_event_alloc(SIGSELECT signo, ErlDrvOseEventId id, ErlDrvOseEventId (*resolve_signal)(union SIGNAL* sig), void *extra)</nametext></name>
-      <desc>
-        <marker id="erl_drv_ose_event_alloc"></marker>
-        <p>Create a new <c>ErlDrvEvent</c> associated with <c>signo</c>,
-	<c>id</c> and uses the <c>resolve_signal</c> function to extract
-	the <c>id</c> from a signal with <c>signo</c>. The <c>extra</c>
-	parameter can be used for additional data. See
-	<seealso marker="ose_signals_chapter#driver">
-	Signals in a Linked-in driver</seealso> in the OSE User's Guide.
-      </p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>void</ret><nametext>erl_drv_ose_event_free(ErlDrvEvent drv_event)</nametext></name>
-      <desc>
-        <marker id="erl_drv_ose_event_free"></marker>
-        <p>Free a <c>ErlDrvEvent</c>. This should always be done in the
-	<seealso marker="erts:driver_entry#stop_select">stop_select</seealso>
-	callback when the event is no longer being used.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>void</ret><nametext>erl_drv_ose_event_fetch(ErlDrvEvent drv_event, SIGSELECT *signo, ErlDrvOseEventId *id, void **extra)</nametext></name>
-      <desc>
-        <marker id="erl_drv_ose_event_fetch"></marker>
-        <p>Write the signal number, id and any extra data associated with <c>drv_event</c>
-	into <c>*signo</c> and <c>*id</c> respectively. <c>NULL</c> can be
-	also passed as <c>signo</c> or <c>id</c> in order to ignore that field.
-	</p>
-      </desc>
-    </func>
-  </funcs>
-  <section>
-    <title>SEE ALSO</title>
-    <p>
-      <seealso marker="erts:driver_entry">driver_entry(3)</seealso>,
-      <seealso marker="erts:erl_driver">erl_driver(3)</seealso>
-    </p>
-  </section>
-</cref>
diff --git a/lib/ose/doc/src/ose_intro.xml b/lib/ose/doc/src/ose_intro.xml
deleted file mode 100644
index 982516c8bd..0000000000
--- a/lib/ose/doc/src/ose_intro.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2013</year><year>2014</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-
-    </legalnotice>
-
-    <title>Introduction</title>
-    <prepared>Lukas Larsson</prepared>
-    <docno></docno>
-    <date>2014-01-08</date>
-    <rev>A</rev>
-    <file>ose_intro.xml</file>
-  </header>
-
-  <section>
-    <title>Features</title>
-  </section>
-
-  <section>
-    <title>Starting Erlang/OTP</title>
-    <p>
-      Starting Erlang/OTP on OSE is not as simple as on Unix/Windows (yet).
-      First of all you have to explicitly use the beam (or beam.smp) executables
-      found in erts-X.Y.Z/bin as the load module that you run. This in turn
-      means that you have to supply the raw beam arguments to the emulator
-      when starting. Fortunately <c>erl</c> on Unix/Windows has a
-      undocumented flag called <c>-emu_args_exit</c> that can be used to
-      figure out what the arguments to beam look like. For example:</p>
-      <code># erl +Mut false +A 10 +S 4:4 +Muycs256 +P 2096 +Q 2096 -emu_args_exit
--Mut
-false
--A
-10
--S
-4:4
--Muycs256
--P
-2096
--Q
-2096
---
--root
-/usr/local/lib/erlang
--progname
-erl
---
--home
-/home/erlang
---</code>
-    <p>
-      The arguments are printed on separate lines to make it possible to know
-      what has to be quoted with &quot;. Each line is one quotable unit.
-      So taking the arguments above you can supply them to pm_create or
-      just execute directly on the command line. For example:</p>
-      <code>rtose@acp3400> pm_install erlang /mst/erlang/erts-6.0/bin/beam.smp
-rtose@acp3400> pm_create -c ARGV="-Mut false -A 10 -S 4:4 -Muycs256 -P 2096 -Q 2099 -- -root /mst/erlang -progname erl -- -home /mst/erlang --" erlang
-pid: 0x110059
-rtose@acp3400> pm_start 0x110059</code>
-    <p>
-      Also note that since we are running erl to figure out the arguments on a
-      separate machine the paths have to be updated. In the example above
-      <c>/usr/local/lib/erlang</c> was replaced by <c>/mst/erlang/</c>. The
-      goal is to in future releases not have to do the special argument handling
-      but for now (OTP 17.0) you have to do it.
-    </p>
-    <note>
-      Because of a limitation in the way the OSE handles stdio when starting
-      load modules using pm_install/create the Erlang shell only reads every
-      other command from stdin. However if you start Erlang using run_erl
-      you do not have this problem. So it is highly recommended that you
-      start Erlang using run_erl.
-    </note>
-  </section>
-
-  <section>
-    <title>run_erl and to_erl</title>
-    <p>
-      In OSE run_erl and to_erl are combined into a single load module called
-      run_erl_lm. Installing and starting the load module will add two new
-      shell commands called run_erl and to_erl. They work in exactly the same
-      way as the unix variants of run_erl and to_erl, except that the read
-      and write pipes have to be placed under the /pipe vm. One additional
-      option also exists to run_erl on ose:
-      <taglist>
-	<tag><c>-block Name</c></tag>
-	<item>The name of the install handle and block that will be created/used by
-	installing and exectuting the first part of the command. If nothing
-	if given the basename of the load module will be used for this value.
-	Example:
-	<code>pm_install erlang /path/to/erlang/vm/beam.smp
-run_erl -daemon -block erlang /pipe/ /mst/erlang_logs/ "beam.smp -A 1 -- -root /mst/erlang -- -home /mst --"</code>
-	</item>
-      </taglist>
-      The same argument munching as when starting Erlang/OTP without run_erl
-      has to be done. If <c>-daemon</c> is given then all error printouts
-      are sent to the ramlog.
-      See also
-      <seealso marker="erts:run_erl">run_erl</seealso> for more details.
-    </p>
-    <p>
-      Below is an example of how to get started with <c>run_erl_lm</c>.
-      <code>rtose@acp3400> pm_install run_erl_lm /mst/erlang/erts-6.0/bin/run_erl_lm
-rtose@acp3400> pm_create run_erl_lm
-pid: 0x1c005d
-rtose@acp3400> pm_start 0x1c005d
-rtose@acp3400> mkdir /mst/erlang_log
-rtose@acp3400> run_erl -daemon /pipe/ /mst/erlang_log/ "/mst/erlang/erts-6.0/bin/beam.smp -A 1 -- -root /mst/erlang -- -home /mst --"
-rtose@acp3400> to_erl
-Attaching to /pipe/erlang.pipe.1 (^C to exit)
-os:type().
-{ose,release}
-2>
-'to_erl' terminated.</code>
-      Note that Ctrl-C is used instead of Ctrl-D to exit the to_erl shell.
-    </p>
-  </section>
-
-  <section>
-    <title>epmd</title>
-    <p>
-      In OSE epmd will not be started automatically so if you want to use
-      Erlang distribution you have to manually start epmd.
-    </p>
-  </section>
-
-  <section>
-    <title>VM Process Priorities</title>
-    <p>
-      It is possible to set the priorities you want for the OSE processes that
-      thr emulator creates in the lmconf. An example of how to do it can be
-      found in the default lmconf file in
-      $ERL_TOP/erts/emulator/sys/ose/beam.lmconf.
-    </p>
-  </section>
-
-</chapter>
diff --git a/lib/ose/doc/src/ose_signals_chapter.xml b/lib/ose/doc/src/ose_signals_chapter.xml
deleted file mode 100644
index bcf2259577..0000000000
--- a/lib/ose/doc/src/ose_signals_chapter.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2013</year><year>2014</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-
-    </legalnotice>
-
-    <title>Interacting with Enea OSE</title>
-    <prepared>Lukas Larsson</prepared>
-    <docno></docno>
-    <date>2014-01-08</date>
-    <rev>A</rev>
-    <file>ose_signals_chapter.xml</file>
-  </header>
-
-  <marker id="introduction"></marker>
-  <section>
-    <title>Introduction</title>
-    <p>The main way which programs on Enea OSE interact is through the
-    usage of message passing, much the same way as Erlang processes
-    communicate. There are two ways in which an Erlang programmer can
-    interact with the signals sent from other Enea OSE processes; either
-    through the provided <c>ose</c> module, or by writing a custom linked-in
-    driver. This User's Guide describes and provides examples for both
-    approaches.
-    </p>
-  </section>
-
-  <marker id="erlang"></marker>
-  <section>
-    <title>Signals in Erlang</title>
-    <p>Erlang/OTP on OSE provides a erlang module called
-    <seealso marker="ose:ose">ose</seealso> that can be used to interact
-    with other OSE processes using message passing. The api in the module
-    is very similar to the native OSE api, so for details of how the
-    functions work please refer to the official OSE documenation. Below
-    is an example usage of the API.
-    </p>
-    <code>1> P1 = ose:open("p1").
-#Port&gt;0.344>
-2> ose:hunt(P1,"p2").
-{#Port&gt;0.344>,1}
-3> P2 = ose:open("p2").
-#Port&gt;0.355>
-4> flush().
-Shell got {mailbox_up,#Port&gt;0.344>,{#Port&gt;0.344>,1},852189}
-ok
-5> ose:listen(P1,[1234]).
-ok
-6> ose:send(P2,ose:get_id(P1),1234,&gt;&gt;"hello">>).
-ok
-7> flush().
-Shell got {message,#Port&gt;0.344>,{852189,1245316,1234,&gt;&gt;"hello">>}}
-ok</code>
-  </section>
-
-  <marker id="driver"></marker>
-  <section>
-    <title>Signals in a Linked-in driver</title>
-    <p>
-      Writing Linked-in drivers for OSE is very similar to how it is done
-      for Unix/Windows. It is only the way in which the driver subscribes
-      and consumed external events that is different. In Unix (and Windows)
-      file descriptiors (and Event Objects) are used to select on. On OSE
-      we use signals to deliver the same functionality. There are two large
-      differences between a signal and an fd.
-    </p>
-    <p>
-      In OSE it is not possible for a signal number to be a unique identifier
-      for a resource in the same way as an fd is. For example; let's say we
-      implement a driver that does an asynchronous hunt that uses signal
-      number 1234 as the hunt_sig. If we want to be able to have multiple
-      hunt ports running at the same time we have to have someway of routing
-      the signal to the correct port. This is achieved by supplying a secondary
-      id that can be retrieved through the meta-data or payload of the signal,
-      e.g:
-      <code>ErlDrvEvent event = erl_drv_ose_event_alloc(1234,port,resolver);</code>
-      The event you get back from
-      <seealso marker="ose_erl_driver#erl_drv_ose_event_alloc">
-      erl_drv_ose_event_alloc</seealso> can then be used by
-      <seealso marker="erts:erl_driver#driver_select">driver_select</seealso>
-      to subscribe to signals. The first argument is just the signal number
-      that we are interested in. The second is the id that we choose to use,
-      in this case the port id that we got in the
-      <seealso marker="erts:driver_entry#start">start</seealso> callback is
-      used. The third argument is a function pointer to a function that can
-      be used to figure out the id from a given signal. The fourth argument can
-      point to any additional data you might want to associate with the event.
-      There is a complete. You can examine the data contained in the event with
-      <seealso marker="ose_erl_driver#erl_drv_ose_event_fetch">erl_drv_ose_event_fetch</seealso>
-      , eg:
-      <code>erl_drv_ose_event_fetch(event, &amp;signal, &amp;port, (void **)&amp;extra);</code>
-      example of what this could look like in
-      <seealso marker="#example">the next section</seealso>.
-      <note>It is very important to issue the driver_select call before
-      any of the signals you are interested in are sent. If driver_select
-      is called after the signal is sent, there is a high probability that it
-      will be lost.</note>
-    </p>
-    <p>
-      The other difference from unix is that in OSE the payload of the event
-      (i.e. the signal data) is already received when the ready_output/input
-      callbacks are called. This means that you access the data of a signal
-      by calling <seealso marker="ose_erl_driver#erl_drv_ose_get_signal">
-      erl_drv_ose_get_signal</seealso>. Additionally multiple signals might be
-      associated with the event, so you should call
-      <seealso marker="ose_erl_driver#erl_drv_ose_get_signal">
-      erl_drv_ose_get_signal</seealso> until <c>NULL</c> is returned.
-    </p>
-  </section>
-
-  <marker id="example"></marker>
-  <section>
-    <title>Example Linked-in driver</title>
-<code>#include "erl_driver.h"
-#include "ose.h"
-
-struct huntsig {
-  SIGSELECT signo;
-  ErlDrvPort port;
-};
-
-union SIGNAL {
-  SIGSELECT signo;
-  struct huntsig;
-}
-
-/* Here we have to get the id from the signal. In this case we use the
-   port id since we have control over the data structure of the signal.
-   It is however possible to use anything in here. The only restriction
-   is that the same id has to be used for all signals of the same number.*/
-ErlDrvOseEventId resolver(union SIGNAL *sig) {
-  return (ErlDrvOseEventId)sig->huntsig.port;
-}
-
-static int drv_init(void) { return 0; };
-
-static ErlDrvData drv_start(ErlDrvPort port, char *command) {
-  return (ErlDrvData)port;
-}
-
-static ErlDrvSSizeT control(ErlDrvData driver_data, unsigned int cmd,
-                            char *buf, ErlDrvSizeT len,
-                            char **rbuf, ErlDrvSizeT rlen) {
-  ErlDrvPort port = (ErlDrvPort)driver_data;
-
-  /* An example of extra data to associate with the event */
-  char *extra_data = driver_alloc(80);
-  snprintf("extra_data, "Event, sig_no: 1234, and port: %d", port);
-
-  /* Create a new event to select on */
-  ErlDrvOseEvent evt = erl_drv_ose_event_alloc(1234,port,resolver, extra_data);
-
-  /* Make sure to do the select call _BEFORE_ the signal arrives.
-     The signal might get lost if the hunt call is done before the
-     select. */
-  driver_select(port,evt,ERL_DRV_READ|ERL_DRV_USE,1);
-
-  union SIGNAL *sig = alloc(sizeof(union SIGNAL),1234);
-  sig->huntsig.port = port;
-  hunt("testprocess",0,NULL,&amp;sig);
-  return 0;
-}
-
-static void ready_input(ErlDrvData driver_data, ErlDrvEvent evt) {
-  char *extra_data;
-  /* Get the first signal payload from the event */
-  union SIGNAL *sig = erl_drv_ose_get_signal(evt);
-  ErlDrvPort port = (ErlDrvPort)driver_data;
-  while (sig != NULL) {
-    if (sig->signo == 1234) {
-      /* Print out the string we added as the extra parameter */
-      erl_drv_ose_event_fetch(evt, NULL, NULL, (void **)&amp;extra_data);
-      printf("We've received: %s\n", extra_data);
-
-      /* If it is our signal we send a message with the sender of the signal
-         to the controlling erlang process */
-      ErlDrvTermData reply[] = { ERL_DRV_UINT, (ErlDrvUInt)sender(&amp;sig) };
-      erl_drv_send_term(port,reply,sizeof(reply) / sizeof(reply[0]));
-    }
-
-    /* Cleanup the signal and deselect on the event.
-       Note that the event itself has to be free'd in the stop_select
-       callback. */
-    free_buf(&amp;sig);
-    driver_select(port,evt,ERL_DRV_READ|ERL_DRV_USE,0);
-
-    /* There could be more than one signal waiting in this event, so
-       we have to loop until sig == NULL */
-    sig = erl_drv_ose_get_signal(evt);
-  }
-}
-
-static void stop_select(ErlDrvEvent event, void *reserved)
-{
-  /* Free the extra_data */
-  erl_drv_ose_event_fetch(evt, NULL, NULL, (void **)&amp;extra_data);
-  driver_free(extra_data);
-
-  /* Free the event itself */
-  erl_drv_ose_event_free(event);
-}
-
-/**
- * Setup the driver entry for the Erlang runtime
- **/
-ErlDrvEntry ose_signal_driver_entry = {
-  .init                         = drv_init,
-  .start                        = drv_start,
-  .stop                         = drv_stop,
-  .ready_input                  = ready_input,
-  .driver_name                  = DRIVER_NAME,
-  .control                      = control,
-  .extended_marker              = ERL_DRV_EXTENDED_MARKER,
-  .major_version                = ERL_DRV_EXTENDED_MAJOR_VERSION,
-  .minor_version                = ERL_DRV_EXTENDED_MINOR_VERSION,
-  .driver_flags                 = ERL_DRV_FLAG_USE_PORT_LOCKING,
-  .stop_select                  = stop_select
-};
-</code>
-  </section>
-
-</chapter>
diff --git a/lib/ose/doc/src/part.xml b/lib/ose/doc/src/part.xml
deleted file mode 100644
index 0c9ebd16c0..0000000000
--- a/lib/ose/doc/src/part.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2014</year>
-      <year>2014</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>OSE User's Guide</title>
-    <prepared>Lukas Larsson</prepared>
-    <docno></docno>
-    <date>2014-01-08</date>
-    <rev>1.0</rev>
-    <file>part.xml</file>
-  </header>
-  <description>
-    <p><em>OSE</em>.</p>
-  </description>
-  <xi:include href="ose_intro.xml"/>
-  <xi:include href="ose_signals_chapter.xml"/>
-</part>
diff --git a/lib/ose/doc/src/ref_man.xml b/lib/ose/doc/src/ref_man.xml
deleted file mode 100644
index 964e5ab8ff..0000000000
--- a/lib/ose/doc/src/ref_man.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2014</year><year>2014</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-
-    </legalnotice>
-
-    <title>OSE Reference Manual</title>
-    <prepared>Lukas Larsson</prepared>
-    <docno></docno>
-    <date>2014-01-08</date>
-    <rev>1.0</rev>
-    <file>ref_man.xml</file>
-  </header>
-  <description>
-    <p>The Standard Erlang Libraries application, <em>STDLIB</em>,
-      contains modules for manipulating lists, strings and files etc.</p>
-    <br></br>
-  </description>
-  <xi:include href="ose_app.xml"/>
-  <xi:include href="ose.xml"/>
-  <xi:include href="ose_erl_driver.xml"/>
-</application>
diff --git a/lib/ose/ebin/.gitignore b/lib/ose/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ose/ebin/.gitignore
+++ /dev/null
diff --git a/lib/ose/include/.gitignore b/lib/ose/include/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ose/include/.gitignore
+++ /dev/null
diff --git a/lib/ose/info b/lib/ose/info
deleted file mode 100644
index 85c07dbe82..0000000000
--- a/lib/ose/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: misc Miscellaneous Applications
-short: Description of Enea OSE specific functionality
diff --git a/lib/ose/src/Makefile b/lib/ose/src/Makefile
deleted file mode 100644
index a89e9392e9..0000000000
--- a/lib/ose/src/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1996-2013. 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%
-#
-
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(OSE_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/ose-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-MODULES= \
-	ose
-
-HRL_FILES=
-
-INTERNAL_HRL_FILES=
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
-
-APP_FILE= ose.app
-
-APP_SRC= $(APP_FILE).src
-APP_TARGET= $(EBIN)/$(APP_FILE)
-
-APPUP_FILE= ose.appup
-
-APPUP_SRC= $(APPUP_FILE).src
-APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-ifeq ($(NATIVE_LIBS_ENABLED),yes)
-ERL_COMPILE_FLAGS += +native
-endif
-ERL_COMPILE_FLAGS += -I../include -I../../kernel/include -Werror
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f core
-	rm -f erl_parse.erl
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
-
-release_docs_spec:
-
-# ----------------------------------------------------
-# Dependencies -- alphabetically, please
-# ----------------------------------------------------
diff --git a/lib/ose/src/ose.app.src b/lib/ose/src/ose.app.src
deleted file mode 100644
index 036779eb16..0000000000
--- a/lib/ose/src/ose.app.src
+++ /dev/null
@@ -1,28 +0,0 @@
-%% This is an -*- erlang -*- file.
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1996-2011. 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%
-%%
-{application, ose,
- [{description, "Enea OSE specific modules"},
-  {vsn, "%VSN%"},
-  {modules, [ose]},
-  {registered,[]},
-  {applications, [stdlib,kernel]},
-  {env, []},
-  {runtime_dependencies, ["stdlib-2.0","erts-6.0"]}]}.
diff --git a/lib/ose/src/ose.appup.src b/lib/ose/src/ose.appup.src
deleted file mode 100644
index 28b6da3439..0000000000
--- a/lib/ose/src/ose.appup.src
+++ /dev/null
@@ -1,23 +0,0 @@
-%% -*- erlang -*-
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2013. 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%
-{"%VSN%",
- [
- ],
- [
- ]}.
diff --git a/lib/ose/src/ose.erl b/lib/ose/src/ose.erl
deleted file mode 100644
index 5534dba4d4..0000000000
--- a/lib/ose/src/ose.erl
+++ /dev/null
@@ -1,453 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2013. 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%
-%%
-%% @doc Interface module for OSE messaging and process monitoring from Erlang
-%%
-%% For each mailbox created through {@link open/1} a OSE phantom process with
-%% that name is started. Since phantom processes are used the memory footprint
-%% of each mailbox is quite small.
-%%
-%% To receive messages you first have to subscribe to the specific message
-%% numbers that you are interested in with {@link listen/2}. The messages
-%% will be sent to the Erlang process that created the mailbox.
-%%
-%% @end
-%%
--module(ose).
-
-%%==============================================================================
-%% Exported API
-%%==============================================================================
--export([open/1,
-         close/1,
-         get_id/1,
-         get_name/2,
-         hunt/2,
-         dehunt/2,
-         attach/2,
-         detach/2,
-         send/4,
-         send/5,
-	 listen/2
-	]).
-
-%%==============================================================================
-%% Types
-%%==============================================================================
--opaque mailbox() :: port().
-%% Mailbox handle.  Implemented as an erlang port.
-
--opaque mailbox_id() :: integer().
-%% Mailbox ID, this is the same as the process id of an OSE process.
-%% An integer.
-
--type message_number() :: 0..4294967295.
-%% OSE Signal number
-
--opaque hunt_ref() :: {mailbox(),integer()}.
-%% Reference from a hunt request.  This term will be included
-%% in a successful hunt response.
-
--opaque attach_ref() :: {mailbox(),integer()}.
-%% Reference from an attach request.  This term will be included
-%% in the term returned when the attached mailbox disappears.
-
--export_type([mailbox_id/0,
-	      message_number/0,
-	      mailbox/0,
-	      hunt_ref/0,
-	      attach_ref/0]).
-
-%%==============================================================================
-%% Defines
-%%==============================================================================
--define(DRIVER_NAME, "ose_signal_drv").
--define(GET_SPID, 1).
--define(GET_NAME, 2).
--define(HUNT, 100).
--define(DEHUNT, 101).
--define(ATTACH, 102).
--define(DETACH, 103).
--define(SEND, 104).
--define(SEND_W_S, 105).
--define(LISTEN, 106).
--define(OPEN, 200).
-
--define(INT_32BIT(Int),(is_integer(Int) andalso (Int >= 0) andalso (Int < (1 bsl 32)))).
-
-%%==============================================================================
-%% API functions
-%%==============================================================================
-
-%%------------------------------------------------------------------------------
-%% @doc Create a mailbox with the given name and return a port that handles
-%% the mailbox.
-%%
-%% An OSE phantom process with the given name will be created that will send any
-%% messages sent through this mailbox. Any messages sent to the new OSE process
-%% will automatically be converted to an Erlang message and sent to the Erlang
-%% process that calls this function. See {@link listen/2} for details about the
-%% format of the message sent.
-%%
-%% The caller gets linked to the created mailbox.
-%%
-%% raises: `badarg' | `system_limit'
-%%
-%% @see listen/2
-%% @end
-%%------------------------------------------------------------------------------
--spec open(Name) -> Port when
-      Name :: iodata(),
-      Port :: mailbox().
-open(Name) ->
-    try open_port({spawn_driver,?DRIVER_NAME}, [binary]) of
-	Port ->
-	    try port_command(Port,[?OPEN,Name]) of
-		true ->
-		    receive
-			{ose_drv_reply,Port,{error,Error}} ->
-			    close(Port),
-			    erlang:error(Error,[Name]);
-			{ose_drv_reply,Port,ok} ->
-			    Port
-		    end
-	    catch
-		error:badarg  -> close(Port),erlang:error(badarg,[Name])
-	    end
-    catch
-	error:badarg  -> erlang:error(badarg,[Name])
-    end.
-
-%%------------------------------------------------------------------------------
-%% @doc Close a mailbox
-%%
-%% This kills the OSE phantom process associated with this mailbox.
-%%
-%% Will also consume any ``{'EXIT',Port,_}'' message from the port that comes
-%% due to the port closing when the calling process traps exits.
-%%
-%% raises: `badarg'
-%% @end
-%%------------------------------------------------------------------------------
--spec close(Port) -> ok when
-      Port :: mailbox().
-close(Port) when is_port(Port) ->
-    %% Copied from prim_inet
-    case erlang:process_info(self(), trap_exit) of
-	{trap_exit,true} ->
-	    link(Port),
-	    catch erlang:port_close(Port),
-	    receive {'EXIT',Port,_} -> ok end;
-	{trap_exit,false} ->
-	    catch erlang:port_close(Port),
-	    ok
-    end;
-close(NotPort) ->
-    erlang:error(badarg,[NotPort]).
-
-%%------------------------------------------------------------------------------
-%% @doc Get the mailbox id for the given port.
-%%
-%% The mailbox id is the same as the OSE process id of the OSE phantom process
-%% that this mailbox represents.
-%%
-%% raises: `badarg'
-%% @end
-%%------------------------------------------------------------------------------
--spec get_id(Port) -> Pid when
-      Port :: mailbox(),
-      Pid :: mailbox_id().
-get_id(Port) ->
-    try port_control(Port, ?GET_SPID, <<>>) of
-	<<Spid:32>> -> Spid
-    catch error:_Error ->
-	    erlang:error(badarg,[Port])
-    end.
-
-%%------------------------------------------------------------------------------
-%% @doc Get the mailbox name for the given mailbox id.
-%%
-%% The mailbox name is the name of the OSE process with process id Pid.
-%%
-%% This call will fail with badarg if the underlying system does not support
-%% getting the name from a process id.
-%%
-%% raises: `badarg'
-%% @end
-%%------------------------------------------------------------------------------
--spec get_name(Port, Pid) -> Name | undefined when
-      Port :: mailbox(),
-      Pid :: mailbox_id(),
-      Name :: binary().
-get_name(Port, Pid) when ?INT_32BIT(Pid) ->
-    try port_control(Port, ?GET_NAME, <<Pid:32>>) of
-	[] -> undefined;
-	Res -> Res
-    catch error:_Error ->
-	    erlang:error(badarg,[Port,Pid])
-    end;
-get_name(Port, Pid) ->
-    erlang:error(badarg,[Port,Pid]).
-
-
-%%------------------------------------------------------------------------------
-%% @doc Hunt for OSE process by name.
-%%
-%% Will send `{mailbox_up, Port, Ref, MboxId}'
-%% to the calling process when the OSE process becomes available.
-%%
-%% Returns a reference term that can be used to cancel the hunt
-%% using {@link dehunt/2}.
-%%
-%% raises: `badarg'
-%%
-%% @end
-%%------------------------------------------------------------------------------
--spec hunt(Port, HuntPath) -> Ref when
-      Port :: mailbox(),
-      HuntPath :: iodata(),
-      Ref :: hunt_ref().
-hunt(Port, HuntPath) ->
-    try port_command(Port, [?HUNT,HuntPath]) of
-	true ->
-	    receive
-		{ose_drv_reply,Port,{error,Error}} ->
-		    erlang:error(Error,[Port,HuntPath]);
-		{ose_drv_reply,Port,Ref} ->
-		    Ref
-	    end
-    catch error:_Error ->
-	    erlang:error(badarg,[Port,HuntPath])
-    end.
-
-%%------------------------------------------------------------------------------
-%% @doc Stop hunting for OSE process.
-%%
-%% If a message for this hunt has been sent but not received
-%% by the calling process, it is removed from the message queue.
-%% Note that this only works if the same process that did
-%% the hunt does the dehunt.
-%%
-%% raises: `badarg'
-%%
-%% @see hunt/2
-%% @end
-%%------------------------------------------------------------------------------
--spec dehunt(Port, Ref) -> ok when
-      Port :: mailbox(),
-      Ref :: hunt_ref().
-dehunt(Port, {Port,Ref}) when ?INT_32BIT(Ref) ->
-    try port_command(Port, <<?DEHUNT:8, Ref:32>>) of
-	true ->
-	    receive
-		{ose_drv_reply,Port,{error,enoent}} ->
-		    %% enoent could mean that it is in the message queue
-		    receive
-			{mailbox_up, Port, {Port,Ref}, _} ->
-			    ok
-		    after 0 ->
-			    ok
-		    end;
-		{ose_drv_reply,Port,ok} ->
-		    ok
-	    end
-    catch error:_Error ->
-	    erlang:error(badarg,[Port,{Port,Ref}])
-    end;
-dehunt(Port,Ref) ->
-    erlang:error(badarg,[Port,Ref]).
-
-%%------------------------------------------------------------------------------
-%% @doc Attach to an OSE process.
-%%
-%% Will send `{mailbox_down, Port, Ref, MboxId}'
-%% to the calling process if the OSE process exits.
-%%
-%% Returns a reference that can be used to cancel the attachment
-%% using {@link detach/2}.
-%%
-%% raises: `badarg' | `enomem'
-%%
-%% @end
-%%------------------------------------------------------------------------------
--spec attach(Port,Pid) -> Ref when
-      Port :: mailbox(),
-      Pid :: mailbox_id(),
-      Ref :: attach_ref().
-attach(Port, Spid) when ?INT_32BIT(Spid) ->
-    try port_command(Port, <<?ATTACH:8, Spid:32>>) of
-	true ->
-	    receive
-		{ose_drv_reply,Port,{error,Error}} ->
-		    erlang:error(Error,[Port,Spid]);
-		{ose_drv_reply,Port,Ref} ->
-		    Ref
-	    end
-    catch error:_Error ->
-	    erlang:error(badarg,[Port,Spid])
-    end;
-attach(Port,Spid) ->
-    erlang:error(badarg,[Port,Spid]).
-
-
-%%------------------------------------------------------------------------------
-%% @doc Remove attachment to an OSE process.
-%%
-%% If a message for this monitor has been sent but not received
-%% by the calling process, it is removed from the message queue.
-%% Note that this only works of the same process
-%% that did the attach does the detach.
-%%
-%% raises: `badarg'
-%%
-%% @see attach/2
-%% @end
-%%------------------------------------------------------------------------------
--spec detach(Port,Ref) -> ok when
-      Port :: mailbox(),
-      Ref :: attach_ref().
-detach(Port, {Port,Ref} ) when ?INT_32BIT(Ref) ->
-    try port_command(Port, <<?DETACH:8, Ref:32>>) of
-	true ->
-	    receive
-		{ose_drv_reply,Port,{error,enoent}} ->
-		    %% enoent could mean that it is in the message queue
-		    receive
-			{mailbox_down,Port,{Port,Ref},_} ->
-			    ok
-		    after 0 ->
-			    ok
-		    end;
-		{ose_drv_reply,Port,ok} ->
-		    ok
-	    end
-    catch error:_Error ->
-	    erlang:error(badarg,[Port,{Port,Ref}])
-    end;
-detach(Port,Ref) ->
-    erlang:error(badarg,[Port,Ref]).
-
-%%------------------------------------------------------------------------------
-%% @doc Send an OSE message.
-%%
-%% The message is sent from the OSE process' own ID that is: `get_id(Port)'.
-%%
-%% raises: `badarg'
-%%
-%% @see send/5
-%% @end
-%%------------------------------------------------------------------------------
--spec send(Port,Pid,SigNo,SigData) -> ok when
-      Port :: mailbox(),
-      Pid :: mailbox_id(),
-      SigNo :: message_number(),
-      SigData :: iodata().
-send(Port, Spid, SigNo, SigData) when ?INT_32BIT(Spid), ?INT_32BIT(SigNo) ->
-    try erlang:port_command(Port, [<<?SEND:8, Spid:32, SigNo:32>>, SigData]) of
-	true -> ok
-    catch error:_Error ->
-	    erlang:error(badarg,[Port,Spid,SigNo,SigData])
-    end;
-send(Port,Spid,SigNo,SigData) ->
-    erlang:error(badarg,[Port,Spid,SigNo,SigData]).
-
-
-%%------------------------------------------------------------------------------
-%% @doc Send an OSE message with different sender.
-%%
-%% As {@link send/4} but the sender will be `SenderPid'.
-%%
-%% raises: `badarg'
-%%
-%% @see send/4
-%% @end
-%%------------------------------------------------------------------------------
--spec send(Port,Pid,SenderPid,SigNo,SigData) -> ok when
-      Port :: mailbox(),
-      Pid :: mailbox_id(),
-      SenderPid :: mailbox_id(),
-      SigNo :: message_number(),
-      SigData :: iodata().
-send(Port, Spid, SenderPid, SigNo, SigData)
-  when ?INT_32BIT(Spid), ?INT_32BIT(SenderPid), ?INT_32BIT(SigNo) ->
-    try erlang:port_command(Port, [<<?SEND_W_S:8, Spid:32, SenderPid:32,
-				     SigNo:32>>, SigData]) of
-	true -> ok
-    catch error:_Error ->
-	    erlang:error(badarg,[Port,Spid,SenderPid,SigNo,SigData])
-    end;
-send(Port,Spid,SenderPid,SigNo,SigData) ->
-    erlang:error(badarg,[Port,Spid,SenderPid,SigNo,SigData]).
-
-%%------------------------------------------------------------------------------
-%% @doc Start listening for specified OSE signal numbers.
-%%
-%% The mailbox will send `{message,Port,{FromMboxId,ToMboxId,MsgNo,MsgData}}'
-%% to the process that created the mailbox when an OSE message with any
-%% of the specified `SigNos' arrives.
-%%
-%% Repeated calls to listen will replace the current set of signal numbers to
-%% listen to. i.e
-%%
-%% ```1>ose:listen(MsgB,[1234,12345]).
-%%  ok
-%%  2> ose:listen(MsgB,[1234,123456]).
-%%  ok.'''
-%%
-%% The above will first listen for signals with numbers 1234 and 12345, and then
-%% replace that with only listening to 1234 and 123456.
-%%
-%% With the current implementation it is not possible to listen to all signal
-%% numbers.
-%%
-%% raises: `badarg' | `enomem'
-%%
-%% @end
-%%------------------------------------------------------------------------------
--spec listen(Port, SigNos) -> ok when
-      Port :: mailbox(),
-      SigNos :: list(message_number()).
-listen(Port, SigNos) when is_list(SigNos) ->
-    USSigNos = lists:usort(SigNos),
-    BinSigNos = try
-		    << <<SigNo:32>> ||
-			SigNo <- USSigNos,
-			?INT_32BIT(SigNo) orelse erlang:error(badarg)
-		    >>
-		catch _:_ ->
-			erlang:error(badarg,[Port,SigNos])
-		end,
-    try port_command(Port, [?LISTEN, BinSigNos]) of
-	true ->
-	    receive
-		{ose_drv_reply,Port,{error,Error}} ->
-		    erlang:error(Error,[Port,SigNos]);
-		{ose_drv_reply,Port,Else} ->
-		    Else
-	    end
-    catch error:_Error ->
-	    erlang:error(badarg,[Port,SigNos])
-    end;
-listen(Port, SigNos) ->
-    erlang:error(badarg,[Port,SigNos]).
-
-
-%%%=============================================================================
-%%% Internal functions
-%%%=============================================================================
diff --git a/lib/ose/test/Makefile b/lib/ose/test/Makefile
deleted file mode 100644
index 7e2080ba38..0000000000
--- a/lib/ose/test/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES= \
-	ose_SUITE
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-INSTALL_PROGS= $(TARGET_FILES)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/ose_test
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include \
-		-I$(ERL_TOP)/lib/kernel/include
-
-EBIN = .
-
-EMAKEFILE=Emakefile
-COVERFILE=ose.cover
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-make_emakefile:
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) \
-	> $(EMAKEFILE)
-
-tests debug opt: make_emakefile
-	erl $(ERL_MAKE_FLAGS) -make
-
-clean:
-	rm -f $(EMAKEFILE)
-	rm -f $(TARGET_FILES)
-	rm -f core
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-
-release_tests_spec: make_emakefile
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) ose.spec $(EMAKEFILE) \
-		$(ERL_FILES) $(COVERFILE) "$(RELSYSDIR)"
-	chmod -R u+w "$(RELSYSDIR)"
-	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
-
-release_docs_spec:
diff --git a/lib/ose/test/ose.cover b/lib/ose/test/ose.cover
deleted file mode 100644
index 7b846cfaf6..0000000000
--- a/lib/ose/test/ose.cover
+++ /dev/null
@@ -1,2 +0,0 @@
-%% -*- erlang -*-
-{incl_app,ose,details}.
diff --git a/lib/ose/test/ose.spec b/lib/ose/test/ose.spec
deleted file mode 100644
index c897e8cd16..0000000000
--- a/lib/ose/test/ose.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../ose_test",all}.
diff --git a/lib/ose/test/ose_SUITE.erl b/lib/ose/test/ose_SUITE.erl
deleted file mode 100644
index 31d950bd03..0000000000
--- a/lib/ose/test/ose_SUITE.erl
+++ /dev/null
@@ -1,766 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1998-2013. 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%
-%%
--module(ose_SUITE).
-
-%-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([
-	 basic/1,stress/1,multi_msg_numbers/1,multi_mailboxes/1,
-	 hunt/1,multi_hunt/1,dehunt/1,multi_dehunt/1,
-	 attach/1,multi_attach/1,detach/1,multi_detach/1,
-	 open_errors/1,close_errors/1,get_id_errors/1,get_name_errors/1,
-	 hunt_errors/1,dehunt_errors/1,attach_errors/1,detach_errors/1,
-	 send_errors/1,send_w_s_errors/1,listen_errors/1
-	]).
-
--define(INTERFACE,ose).
-
-
-init_per_testcase(_Func, Config) ->
-    Config.
-end_per_testcase(_Func, _Config) ->
-    ok.
-
-suite() -> [{timeout,{30,seconds}}].
-
-all() ->
-    [
-     basic,stress,multi_msg_numbers,multi_mailboxes,
-     hunt,multi_hunt,dehunt,multi_dehunt,
-     attach,multi_attach,detach,multi_detach,
-
-     open_errors,close_errors,get_id_errors,get_name_errors,
-     hunt_errors,dehunt_errors,attach_errors,detach_errors,
-     send_errors,send_w_s_errors,listen_errors
-    ].
-
-groups() ->
-    [].
-
-init_per_suite(Config) ->
-    case os:type() of
-	{ose,_} ->
-	    Config;
-	_Else ->
-	    {skip,"Only run on OSE"}
-    end.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-basic(_Config) ->
-
-    [P1,P2] = multi_open(2,[42]),
-    P1Id = ?INTERFACE:get_id(P1),
-    P2Id = ?INTERFACE:get_id(P2),
-
-    ok = ?INTERFACE:send(P2,P1Id,42,<<"ping">>),
-    receive
-	{message,P1,V1} ->
-	    {P2Id,P1Id,42,<<"ping">>} = V1,
-	    ?INTERFACE:send(P1,P2Id,42,<<"pong">>);
-	Else1 ->
-	    ct:fail({got_wrong_message,Else1})
-    end,
-
-    receive
-	{message,P2,V2} ->
-	    {P1Id,P2Id,42,<<"pong">>} = V2;
-	Else2 ->
-	    ct:fail({got_wrong_message,Else2})
-    end,
-
-    ?INTERFACE:close(P1),
-    ?INTERFACE:close(P2).
-
-%% Send 1000 messages and see if we can cope and that msg order is preserved
-stress(_Config) ->
-
-    Iterations = 1000,
-
-    [P1,P2] = multi_open(2,[42]),
-    P1Id = ?INTERFACE:get_id(P1),
-    P2Id = ?INTERFACE:get_id(P2),
-
-    spawn(fun() ->
-		  n(fun(N) ->
-			    Msg = [<<"ping">>|integer_to_list(N)],
-			    ?INTERFACE:send(P2,P1Id,42,Msg)
-		    end,Iterations)
-	  end),
-    timer:sleep(100),
-    n(fun(N) ->
-	      receive
-		  {message,P1,Value} ->
-		      Int = integer_to_binary(N),
-		      {P2Id,P1Id,42,<<"ping",Int/binary>>} = Value,
-		      ok;
-		  Else ->
-		      ct:fail({got_wrong_message,Else})
-	      end
-      end,Iterations),
-
-    ?INTERFACE:close(P1),
-    ?INTERFACE:close(P2).
-
-%% Listen to 1000 different message numbers and send some random messages
-multi_msg_numbers(_Config) ->
-
-    Iterations = 100,
-
-    [P1,P2] = multi_open(2,lists:seq(2000,3000)),
-    P1Id = ?INTERFACE:get_id(P1),
-
-    n(fun(_) ->
-	      Num = random:uniform(1000)+2000,
-	      ?INTERFACE:send(P2,P1Id,Num,<<"ping",(integer_to_binary(Num))/binary>>)
-      end,Iterations),
-
-    n(fun(_) ->
-	      receive
-		  {message,P1,{_,_,Id,<<"ping",Num/binary>>}} when Id > 2000;
-								   Id =< 3000 ->
-		      Id = binary_to_integer(Num),
-		      ok;
-		  Else ->
-		      ct:fail({got_wrong_message,Else})
-	      end
-      end,Iterations),
-
-    ?INTERFACE:close(P1),
-    ?INTERFACE:close(P2).
-
-
-%% Create 100 mailboxes and send messages to them
-multi_mailboxes(_Config) ->
-
-    Mailboxes = 100,
-
-    [P1|MBs] = multi_open(Mailboxes,[42]),
-
-    [?INTERFACE:send(P1,?INTERFACE:get_id(P),42,[<<"ping">>,?INTERFACE:get_name(P,?INTERFACE:get_id(P))]) || P <- MBs],
-
-    [receive
-	 {message,P,Value} ->
-	     Name = ?INTERFACE:get_name(P,?INTERFACE:get_id(P)),
-	     {_,_,42,<<"ping",Name/binary>>} = Value,
-	     ok
-     end || P <- MBs],
-
-    [?INTERFACE:close(P) || P <- [P1|MBs]],
-    ok.
-
-hunt(_Config) ->
-    [P1,P2] = multi_open(2,[]),
-
-    Ref = ?INTERFACE:hunt(P1,"p2"),
-    receive
-	{mailbox_up,P1,Ref,Pid} ->
-	    Pid = ?INTERFACE:get_id(P2),
-	    ?INTERFACE:close(P1),
-	    ?INTERFACE:close(P2);
-	Else ->
-	    ct:fail({got_wrong_message,Else,Ref})
-    end.
-
-multi_hunt(_Config) ->
-
-    Iterations = 100,
-
-    P = ?INTERFACE:open("p"),
-
-    Refs = [?INTERFACE:hunt(P,"p"++integer_to_list(N))|| N <- lists:seq(1,Iterations)],
-
-    Pids = [begin
-		Prt = ?INTERFACE:open("p"++integer_to_list(N)),
-		Pid = ?INTERFACE:get_id(Prt),
-		?INTERFACE:close(Prt),
-		Pid
-	    end || N <- lists:seq(1,Iterations)],
-
-    [receive
-	 {mailbox_up,P,Ref,Pid} ->
-	     ok
-     after 10 ->
-	     ct:fail({did_not_get,Pid,Ref})
-     end || {Pid,Ref} <- lists:zip(Pids,Refs)],
-    ?INTERFACE:close(P).
-
-
-dehunt(_Config)  ->
-    [P1] = multi_open(1,[]),
-    Ref = ?INTERFACE:hunt(P1,"p2"),
-    receive
-	_Else -> ct:fail({got,_Else})
-    after 1000 ->
-	    ok
-    end,
-    P2 = ?INTERFACE:open("p2"),
-
-    % Make sure any messages are sent
-    receive after 10 -> ok end,
-
-    ok = ?INTERFACE:dehunt(P1,Ref),
-
-    % Make sure no messages are received
-    receive
-	_Else2 -> ct:fail({got,_Else2})
-    after 1000 ->
-	    ?INTERFACE:close(P1),
-	    ?INTERFACE:close(P2)
-    end.
-
-%%%
-%%% This testcase basically:
-%%%  spawn 10 processes that in parallel
-%%%        adds some hunts for different OSE processes
-%%%        maybe create hunted OSE process
-%%%        dehunt half of the hunts
-%%%        create more hunts
-%%%        if not created create hunted OSE process
-%%%        veryify that all expected hunt messages are received
-%%%  verify that all processes exited correctly
-%%%
-%%% This complex test is done to make sure that the internal handling
-%%% of dehunt works as expected.
-%%%
-multi_dehunt(_Config) ->
-    [P1] = multi_open(1,[]),
-
-    Scenario =
-	fun(Iterations) ->
-
-	      Hunted = "p"++integer_to_list(Iterations),
-	      %% Start a couple of hunts
-	      Refs = [?INTERFACE:hunt(P1,Hunted) || _ <- lists:seq(1,Iterations)],
-
-	      %% We alternate if the process is opened before or after the dehunt
-	      P2O = if Iterations rem 2 == 0 ->
-			    ?INTERFACE:open(Hunted);
-		       true ->
-			    undefined
-		    end,
-
-	      %% Remove half of them
-	      {RemRefs,_} = lists:mapfoldl(fun(Ref,Acc) when Acc rem 2 == 0 ->
-						   ok = ?INTERFACE:dehunt(P1,Ref),
-						   {[],Acc+1};
-					      (Ref,Acc) ->
-						   {Ref,Acc+1}
-					   end,0,Refs),
-
-	      %% Add some new ones
-	      NewRefs = [?INTERFACE:hunt(P1,Hunted)
-			 || _ <- lists:seq(1,Iterations div 4)]
-		    ++ lists:flatten(RemRefs),
-
-	      P2 = if P2O == undefined ->
-			   ?INTERFACE:open(Hunted);
-		      true ->
-			   P2O
-		   end,
-	      P2Id = ?INTERFACE:get_id(P2),
-
-	      %% Receive all the expected ones
-	      lists:foreach(fun(Ref) ->
-				    receive
-					{mailbox_up,P1,Ref,P2Id} ->
-					    ok
-				    after 1000 ->
-					    io:format("Flush: ~p~n",[flush()]),
-					    io:format("~p~n",[{Iterations,{did_not_get, Ref}}]),
-					    ok = Ref
-				    end
-			    end,NewRefs),
-
-	      %% Check that no other have arrived
-	      receive
-		  _Else ->
-		      io:format("Flush: ~p~n",[flush()]),
-		      io:format("~p~n",[{Iterations,{got, _Else}}]),
-		      ok = _Else
-	      after 100 ->
-		      ok
-	      end,
-	      ?INTERFACE:close(P2)
-      end,
-
-    Self = self(),
-
-    n(fun(N) ->
-	      spawn(fun() -> Self !
-				 Scenario(N*25)
-		    end),
-	      ok
-      end,10),
-
-    n(fun(_N) ->
-	      receive ok -> ok
-	      after 60000 -> ct:fail(failed)
-	      end
-      end,10),
-    ?INTERFACE:close(P1).
-
-attach(_Config) ->
-    [P1,P2] = multi_open(2,[]),
-
-    P2Id = ?INTERFACE:get_id(P2),
-    Ref = ?INTERFACE:attach(P1,P2Id),
-    ?INTERFACE:close(P2),
-    receive
-	{mailbox_down,P1,Ref,P2Id} ->
-	    ?INTERFACE:close(P1);
-	_Else ->
-	    ct:fail({got,_Else, {P1,Ref,P2Id}})
-    after 1000 ->
-	    ct:fail({did_not_get,P1,Ref,P2Id})
-    end.
-
-multi_attach(_Config) ->
-
-    Iterations = 100,
-
-    [P1|Pids] = multi_open(Iterations,[]),
-
-    Refs = [{?INTERFACE:get_id(Pid),?INTERFACE:attach(P1,?INTERFACE:get_id(Pid))} || Pid <- Pids],
-
-    [?INTERFACE:close(Pid) || Pid <- Pids],
-
-    [receive
-	 {mailbox_down,P1,Ref,Pid} ->
-	     ok
-     after 10000 ->
-	     ct:fail({did_not_get,Pid,Ref})
-     end || {Pid,Ref} <- Refs],
-    ?INTERFACE:close(P1).
-
-detach(_Config)  ->
-    [P1,P2] = multi_open(2,[]),
-    P2Id = ?INTERFACE:get_id(P2),
-    Ref = ?INTERFACE:attach(P1,P2Id),
-    receive
-	_Else -> ct:fail({got,_Else})
-    after 100 ->
-	    ok
-    end,
-
-    ?INTERFACE:close(P2),
-
-    % Make sure any messages are sent
-    receive after 10 -> ok end,
-
-    ?INTERFACE:detach(P1,Ref),
-
-    % Make sure no messages are received
-    receive
-	_Else2 -> ct:fail({got,_Else2})
-    after 1000 ->
-	    ?INTERFACE:close(P1)
-    end.
-
-%%%
-%%% This testcase basically:
-%%%  spawn 10 processes that in parallel
-%%%        adds some attach for different OSE processes
-%%%        maybe close OSE process
-%%%        dehunt half of the hunts
-%%%        create more hunts
-%%%        if not closed close attached OSE process
-%%%        veryify that all expected attach messages are received
-%%%  verify that all processes exited correctly
-%%%
-%%% This complex test is done to make sure that the internal handling
-%%% of dehunt works as expected.
-%%%
-multi_detach(_Config) ->
-    [P1] = multi_open(1,[]),
-
-    Scenario =
-	fun(Iterations) ->
-
-	      Attached = ?INTERFACE:open("p"++integer_to_list(Iterations)),
-	      AttachedId = ?INTERFACE:get_id(Attached),
-	      %% Start a couple of attachs
-	      Refs = [?INTERFACE:attach(P1,AttachedId) || _ <- lists:seq(1,Iterations)],
-
-	      %% We alternate if the process is closed before or after the detach
-	      P2O = if Iterations rem 2 == 0 ->
-			    ?INTERFACE:close(Attached);
-		       true ->
-			    undefined
-		    end,
-
-	      %% Remove half of them
-	      {RemRefs,_} = lists:mapfoldl(fun(Ref,Acc) when Acc rem 2 == 0 ->
-						   ok = ?INTERFACE:detach(P1,Ref),
-						   {[],Acc+1};
-					      (Ref,Acc) ->
-						   {Ref,Acc+1}
-					   end,0,Refs),
-
-	      %% Add some new ones
-	      NewRefs = [?INTERFACE:attach(P1,AttachedId)
-			 || _ <- lists:seq(1,Iterations div 4)]
-		    ++ lists:flatten(RemRefs),
-
-	      if P2O == undefined ->
-		      ?INTERFACE:close(Attached);
-		 true ->
-		      P2O
-	      end,
-
-	      %% Receive all the expected ones
-	      lists:foreach(fun(Ref) ->
-				    receive
-					{mailbox_down,P1,Ref,AttachedId} ->
-					    ok
-				    after 1000 ->
-					    io:format("Flush: ~p~n",[flush()]),
-					    io:format("~p~n",[{Iterations,{did_not_get, Ref}}]),
-					    ok = Ref
-				    end
-			    end,NewRefs),
-
-	      %% Check that no other have arrived
-	      receive
-		  _Else ->
-		      io:format("Flush: ~p~n",[flush()]),
-		      io:format("~p~n",[{Iterations,{got, _Else}}]),
-		      ok = _Else
-	      after 100 ->
-		      ok
-	      end
-      end,
-
-    Self = self(),
-
-    n(fun(N) ->
-	      spawn(fun() -> Self !
-				 Scenario(N*5)
-		    end),
-	      ok
-      end,10),
-
-    n(fun(_N) ->
-	      receive ok -> ok
-	      after 60000 -> ct:fail(failed)
-	      end
-      end,10),
-    ?INTERFACE:close(P1).
-
-
-open_errors(_Config) ->
-    {'EXIT',{badarg,[{?INTERFACE,open,[inval],_}|_]}} =
-	(catch ?INTERFACE:open(inval)),
-    {'EXIT',{badarg,[{?INTERFACE,open,[["p"|1]],_}|_]}} =
-	(catch ?INTERFACE:open(["p"|1])),
-    {'EXIT',{badarg,[{?INTERFACE,open,[["p",1234]],_}|_]}} =
-	(catch ?INTERFACE:open(["p",1234])),
-
-    ok.
-
-close_errors(_Config) ->
-    {'EXIT',{badarg,[{?INTERFACE,close,[inval],_}|_]}} =
-	(catch ?INTERFACE:close(inval)),
-
-    P1 = ?INTERFACE:open("p1"),
-    ok = ?INTERFACE:close(P1),
-    ok = ?INTERFACE:close(P1).
-
-
-get_id_errors(_Config) ->
-    {'EXIT',{badarg,[{?INTERFACE,get_id,[inval],_}|_]}} =
-	(catch ?INTERFACE:get_id(inval)),
-
-    P1 = ?INTERFACE:open("p1"),
-    ok = ?INTERFACE:close(P1),
-    {'EXIT',{badarg,[{?INTERFACE,get_id,[P1],_}|_]}} =
-	(catch ?INTERFACE:get_id(P1)),
-
-    ok.
-
-get_name_errors(_Config) ->
-    P1 = ?INTERFACE:open("p1"),
-    {'EXIT',{badarg,[{?INTERFACE,get_name,[P1,inval],_}|_]}} =
-	(catch ?INTERFACE:get_name(P1,inval)),
-
-    undefined = ?INTERFACE:get_name(P1,1234),
-
-    P2 = ?INTERFACE:open("p2"),
-    P2Id = ?INTERFACE:get_id(P2),
-    ok = ?INTERFACE:close(P1),
-    {'EXIT',{badarg,[{?INTERFACE,get_name,[P1,P2Id],_}|_]}} =
-	(catch ?INTERFACE:get_name(P1,P2Id)),
-    ?INTERFACE:close(P2),
-
-    P3 = ?INTERFACE:open([255]),
-    <<255>> = ?INTERFACE:get_name(P3, ?INTERFACE:get_id(P3)),
-    ?INTERFACE:close(P3),
-
-    ok.
-
-hunt_errors(_Config) ->
-
-    {'EXIT',{badarg,[{?INTERFACE,hunt,[inval,"hello"],_}|_]}} =
-	(catch ?INTERFACE:hunt(inval,"hello")),
-
-    P1 = ?INTERFACE:open("p1"),
-    {'EXIT',{badarg,[{?INTERFACE,hunt,[P1,["hello",12345]],_}|_]}} =
-	(catch ?INTERFACE:hunt(P1,["hello",12345])),
-
-    P2 = ?INTERFACE:open(<<255>>),
-    P2Pid = ?INTERFACE:get_id(P2),
-    Ref = ?INTERFACE:hunt(P1,[255]),
-    receive
-	{mailbox_up,P1,Ref,P2Pid} ->
-	    ok;
-	Else ->
-	    ct:fail({got,Else,{mailbox_up,P1,Ref,P2Pid}})
-    after 150 ->
-	    ct:fail({did_not_get,{mailbox_up,P1,Ref,P2Pid}})
-    end,
-
-    ok = ?INTERFACE:close(P1),
-    ok = ?INTERFACE:close(P2),
-    {'EXIT',{badarg,[{?INTERFACE,hunt,[P1,["hello"]],_}|_]}} =
-	(catch ?INTERFACE:hunt(P1,["hello"])),
-
-    ok.
-
-dehunt_errors(_Config) ->
-    P1 = ?INTERFACE:open("p1"),
-    Ref = ?INTERFACE:hunt(P1,"p2"),
-
-    {'EXIT',{badarg,[{?INTERFACE,dehunt,[inval,Ref],_}|_]}} =
-	(catch ?INTERFACE:dehunt(inval,Ref)),
-
-    {'EXIT',{badarg,[{?INTERFACE,dehunt,[P1,inval],_}|_]}} =
-	(catch ?INTERFACE:dehunt(P1,inval)),
-
-    ok = ?INTERFACE:dehunt(P1,Ref),
-    ok = ?INTERFACE:dehunt(P1,Ref),
-
-    ok = ?INTERFACE:close(P1),
-
-    {'EXIT',{badarg,[{?INTERFACE,dehunt,[P1,Ref],_}|_]}} =
-	(catch ?INTERFACE:dehunt(P1,Ref)),
-
-    case ?INTERFACE of
-	ose -> ok;
-	_ ->
-	    P2 = ?INTERFACE:open("p2"),
-	    ok = ?INTERFACE:close(P2)
-    end,
-
-    receive
-	Else -> ct:fail({got,Else})
-    after 100 ->
-	    ok
-    end.
-
-attach_errors(_Config) ->
-    P1 = ?INTERFACE:open("p1"),
-    P2 = ?INTERFACE:open("p2"),
-    P2Id = ?INTERFACE:get_id(P2),
-
-    {'EXIT',{badarg,[{?INTERFACE,attach,[inval,P2Id],_}|_]}} =
-	(catch ?INTERFACE:attach(inval,P2Id)),
-
-    {'EXIT',{badarg,[{?INTERFACE,attach,[P1,[12345]],_}|_]}} =
-	(catch ?INTERFACE:attach(P1,[12345])),
-
-    ok = ?INTERFACE:close(P1),
-    ok = ?INTERFACE:close(P2),
-    {'EXIT',{badarg,[{?INTERFACE,attach,[P1,P2Id],_}|_]}} =
-	(catch ?INTERFACE:attach(P1,P2Id)),
-
-    ok.
-
-detach_errors(_Config) ->
-    P1 = ?INTERFACE:open("p1"),
-    P2 = ?INTERFACE:open("p2"),
-    P2Id = ?INTERFACE:get_id(P2),
-
-    Ref = ?INTERFACE:attach(P1,P2Id),
-
-    {'EXIT',{badarg,[{?INTERFACE,detach,[inval,Ref],_}|_]}} =
-	(catch ?INTERFACE:detach(inval,Ref)),
-
-    {'EXIT',{badarg,[{?INTERFACE,detach,[P1,inval],_}|_]}} =
-	(catch ?INTERFACE:detach(P1,inval)),
-
-    ok = ?INTERFACE:detach(P1,Ref),
-    ok = ?INTERFACE:detach(P1,Ref),
-
-    case ?INTERFACE of
-	ose -> ok;
-	_ ->
-	    ok = ?INTERFACE:close(P1)
-    end,
-
-    ok = ?INTERFACE:close(P2),
-    ok = ?INTERFACE:close(P1),
-
-    {'EXIT',{badarg,[{?INTERFACE,detach,[P1,Ref],_}|_]}} =
-	(catch ?INTERFACE:detach(P1,Ref)),
-
-    receive
-	Else -> ct:fail({got,Else})
-    after 100 ->
-	    ok
-    end.
-
-send_errors(_Config) ->
-    P1 = ?INTERFACE:open("p1"),
-    P2 = ?INTERFACE:open("p2"),
-    P2Id = ?INTERFACE:get_id(P2),
-
-    {'EXIT',{badarg,[{?INTERFACE,send,[inval,P2Id,42,"hello"],_}|_]}} =
-	(catch ?INTERFACE:send(inval,P2Id,42,"hello")),
-    {'EXIT',{badarg,[{?INTERFACE,send,[P1,inval,42,"hello"],_}|_]}} =
-	(catch ?INTERFACE:send(P1,inval,42,"hello")),
-    {'EXIT',{badarg,[{?INTERFACE,send,[P1,P2Id,inval,"hello"],_}|_]}} =
-	(catch ?INTERFACE:send(P1,P2Id,inval,"hello")),
-    {'EXIT',{badarg,[{?INTERFACE,send,[P1,P2Id,42,inval],_}|_]}} =
-	(catch ?INTERFACE:send(P1,P2Id,42,inval)),
-
-    ok = ?INTERFACE:close(P2),
-    ok = ?INTERFACE:send(P1,P2Id,42,"hello"),
-    ok = ?INTERFACE:close(P1),
-
-    {'EXIT',{badarg,[{?INTERFACE,send,[P1,P2Id,42,"hello"],_}|_]}} =
-	(catch ?INTERFACE:send(P1,P2Id,42,"hello")),
-
-    receive
-	Else -> ct:fail({got,Else})
-    after 100 ->
-	    ok
-    end.
-
-send_w_s_errors(_Config) ->
-    P1 = ?INTERFACE:open("p1"),
-    P1Id = ?INTERFACE:get_id(P1),
-    P2 = ?INTERFACE:open("p2"),
-    P2Id = ?INTERFACE:get_id(P2),
-    P3 = ?INTERFACE:open("p3"),
-    P3Id = ?INTERFACE:get_id(P3),
-
-    {'EXIT',{badarg,[{?INTERFACE,send,[inval,P2Id,P1Id,42,"hello"],_}|_]}} =
-	(catch ?INTERFACE:send(inval,P2Id,P1Id,42,"hello")),
-    {'EXIT',{badarg,[{?INTERFACE,send,[P2,-1,P1Id,42,"hello"],_}|_]}} =
-	(catch ?INTERFACE:send(P2,-1,P1Id,42,"hello")),
-    {'EXIT',{badarg,[{?INTERFACE,send,[P2,P2Id,1 bsl 32,42,"hello"],_}|_]}} =
-	(catch ?INTERFACE:send(P2,P2Id,1 bsl 32,42,"hello")),
-    {'EXIT',{badarg,[{?INTERFACE,send,[P2,P2Id,P1Id,inval,"hello"],_}|_]}} =
-	(catch ?INTERFACE:send(P2,P2Id,P1Id,inval,"hello")),
-    {'EXIT',{badarg,[{?INTERFACE,send,[P2,P2Id,P1Id,42,inval],_}|_]}} =
-	(catch ?INTERFACE:send(P2,P2Id,P1Id,42,inval)),
-
-    ok = ?INTERFACE:close(P3),
-    ok = ?INTERFACE:send(P2,P3Id,P1Id,42,"hello"),
-
-    ok = ?INTERFACE:close(P1),
-    ok = ?INTERFACE:send(P2,P2Id,P1Id,42,"hello"),
-    ok = ?INTERFACE:close(P2),
-
-    {'EXIT',{badarg,[{?INTERFACE,send,[P1,P2Id,P1Id,42,"hello"],_}|_]}} =
-	(catch ?INTERFACE:send(P1,P2Id,P1Id,42,"hello")),
-
-    receive
-	Else -> ct:fail({got,Else})
-    after 100 ->
-	    ok
-    end.
-
-listen_errors(_Config) ->
-
-    P1 = ?INTERFACE:open("p1"),
-    P1Id = ?INTERFACE:get_id(P1),
-
-    {'EXIT',{badarg,[{?INTERFACE,listen,[inval,[42]],_}|_]}} =
-	(catch ?INTERFACE:listen(inval,[42])),
-    {'EXIT',{badarg,[{?INTERFACE,listen,[P1,inval],_}|_]}} =
-	(catch ?INTERFACE:listen(P1,inval)),
-    {'EXIT',{badarg,[{?INTERFACE,listen,[P1,[1 bsl 33]],_}|_]}} =
-	(catch ?INTERFACE:listen(P1,[1 bsl 33])),
-
-    ok = ?INTERFACE:listen(P1,[42,42,42,42,42,42,42,42,42,42,42,42,42]),
-
-    case ?INTERFACE of
-	ose -> ok;
-	_ ->
-	    ?INTERFACE:send(P1,P1Id,42,"hello"),
-	    timer:sleep(50),
-	    ?INTERFACE:listen(P1,[]),
-	    ?INTERFACE:send(P1,P1Id,42,"hello2"),
-
-	    receive
-		{message,P1,42,"hello"} -> ok
-	    end,
-
-	    receive
-		Else -> ct:fail({got,Else})
-	    after 100 ->
-		    ok
-	    end
-    end,
-
-    ok = ?INTERFACE:close(P1),
-    {'EXIT',{badarg,[{?INTERFACE,listen,[P1,[42]],_}|_]}} =
-	(catch ?INTERFACE:listen(P1,[42])),
-
-    ok.
-
-%%
-%% Internal functions
-%%
-multi_open(N,ListenNums) ->
-    multi_open(N,ListenNums,[]).
-
-multi_open(0,_,Acc) ->
-    Acc;
-multi_open(N,ListenNums,Acc) ->
-    P = ?INTERFACE:open("p"++integer_to_list(N)),
-    ok = ?INTERFACE:listen(P,ListenNums),
-    multi_open(N-1,ListenNums,[P|Acc]).
-
-n(_F,0) ->
-    ok;
-n(F,N) ->
-    ok = F(N),
-    n(F,N-1).
-
-
-flush() ->
-    receive
-	Msg ->
-	    [Msg|flush()]
-    after 0 ->
-	    []
-    end.
diff --git a/lib/ose/vsn.mk b/lib/ose/vsn.mk
deleted file mode 100644
index fb1cf8219f..0000000000
--- a/lib/ose/vsn.mk
+++ /dev/null
@@ -1 +0,0 @@
-OSE_VSN = 1.1
diff --git a/lib/otp_mibs/test/Makefile b/lib/otp_mibs/test/Makefile
index e1cfbb347d..18d7e915db 100644
--- a/lib/otp_mibs/test/Makefile
+++ b/lib/otp_mibs/test/Makefile
@@ -49,7 +49,6 @@ RELSYSDIR = $(RELEASE_PATH)/otp_mibs_test
 # ----------------------------------------------------
 ERL_MAKE_FLAGS +=
 ERL_COMPILE_FLAGS += \
-	-I$(ERL_TOP)/lib/test_server/include \
 	-I$(ERL_TOP)/lib/snmp/include
 
 # ----------------------------------------------------
diff --git a/lib/otp_mibs/test/otp_mibs_SUITE.erl b/lib/otp_mibs/test/otp_mibs_SUITE.erl
index abb5aa8194..4d1eb155cd 100644
--- a/lib/otp_mibs/test/otp_mibs_SUITE.erl
+++ b/lib/otp_mibs/test/otp_mibs_SUITE.erl
@@ -30,7 +30,7 @@
 %% > ct_run -suite otp_mibs_SUITE -config otp_mibs_SUITE.cfg
 %%-----------------------------------------------------------------
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("otp_mibs/include/OTP-MIB.hrl").
 -include_lib("snmp/include/snmp_types.hrl").
 
diff --git a/lib/parsetools/test/Makefile b/lib/parsetools/test/Makefile
index f84bb0e75e..75f9624fd5 100644
--- a/lib/parsetools/test/Makefile
+++ b/lib/parsetools/test/Makefile
@@ -41,7 +41,7 @@ RELSYSDIR = $(RELEASE_PATH)/parsetools_test
 # FLAGS
 # ----------------------------------------------------
 ERL_MAKE_FLAGS += 
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
diff --git a/lib/parsetools/test/leex_SUITE.erl b/lib/parsetools/test/leex_SUITE.erl
index 1e3738de85..f5ff32c358 100644
--- a/lib/parsetools/test/leex_SUITE.erl
+++ b/lib/parsetools/test/leex_SUITE.erl
@@ -31,7 +31,7 @@
 -define(privdir, "leex_SUITE_priv").
 -define(t, test_server).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(datadir, ?config(data_dir, Config)).
 -define(privdir, ?config(priv_dir, Config)).
 -endif.
diff --git a/lib/parsetools/test/yecc_SUITE.erl b/lib/parsetools/test/yecc_SUITE.erl
index 6603a5a07d..a1bb5eb16c 100644
--- a/lib/parsetools/test/yecc_SUITE.erl
+++ b/lib/parsetools/test/yecc_SUITE.erl
@@ -30,7 +30,7 @@
 -define(privdir, "yecc_SUITE_priv").
 -define(t, test_server).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(datadir, ?config(data_dir, Config)).
 -define(privdir, ?config(priv_dir, Config)).
 -endif.
diff --git a/lib/percept/src/percept.erl b/lib/percept/src/percept.erl
index badb3f3d66..f1a2002c9d 100644
--- a/lib/percept/src/percept.erl
+++ b/lib/percept/src/percept.erl
@@ -226,7 +226,7 @@ stop_webserver(Port) ->
 
 parse_and_insert(Filename, DB) ->
     io:format("Parsing: ~p ~n", [Filename]),
-    T0 = erlang:now(),
+    T0 = erlang:monotonic_time(milli_seconds),
     Pid = dbg:trace_client(file, Filename, mk_trace_parser(self())),
     Ref = erlang:monitor(process, Pid), 
     parse_and_insert_loop(Filename, Pid, Ref, DB, T0).
@@ -239,8 +239,8 @@ parse_and_insert_loop(Filename, Pid, Ref, DB, T0) ->
     	{parse_complete, {Pid, Count}} ->
 	    receive {'DOWN', Ref, process, Pid, normal} -> ok after 0 -> ok end,
 	    DB ! {action, consolidate},
-	    T1 = erlang:now(),
-	    io:format("Parsed ~p entries in ~p s.~n", [Count, ?seconds(T1, T0)]),
+            T1 = erlang:monotonic_time(milli_seconds),
+	    io:format("Parsed ~w entries in ~w ms.~n", [Count, T1 - T0]),
     	    io:format("    ~p created processes.~n", [length(percept_db:select({information, procs}))]),
      	    io:format("    ~p opened ports.~n", [length(percept_db:select({information, ports}))]),
 	    ok;
diff --git a/lib/percept/test/Makefile b/lib/percept/test/Makefile
index 4ba0b80fc8..6891de832d 100644
--- a/lib/percept/test/Makefile
+++ b/lib/percept/test/Makefile
@@ -52,8 +52,7 @@ RELSYSDIR = $(RELEASE_PATH)/percept_test
 # FLAGS
 # ----------------------------------------------------
 ERL_MAKE_FLAGS += 
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include \
-	-I$(ERL_TOP)/lib/percept/include 
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/percept/include
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/percept/test/egd_SUITE.erl b/lib/percept/test/egd_SUITE.erl
index 41e8999e17..6df7ed74c0 100644
--- a/lib/percept/test/egd_SUITE.erl
+++ b/lib/percept/test/egd_SUITE.erl
@@ -19,198 +19,163 @@
 %%
 
 -module(egd_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases
--export([
-	image_create_and_destroy/1, 
-	image_shape/1, 
-	image_primitives/1,
-	image_colors/1, 
-	image_font/1,
-	image_png_compliant/1
-	]).
-
-%% Default timetrap timeout (set in init_per_testcase)
--define(default_timeout, ?t:minutes(1)).
+-export([image_create_and_destroy/1,
+         image_shape/1,
+         image_primitives/1,
+         image_colors/1,
+         image_font/1,
+         image_png_compliant/1]).
 
-init_per_suite(Config) when is_list(Config) ->
-    random:seed(now()),
-    Config.
-
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?default_timeout),
-    [{max_size, 800}, {watchdog,Dog} | Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() -> 
     [image_create_and_destroy, image_shape,
      image_primitives, image_colors, image_font,
      image_png_compliant].
 
-groups() -> 
-    [].
 
-init_per_group(_GroupName, Config) ->
+init_per_suite(Config) when is_list(Config) ->
+    rand:seed(exsplus),
     Config.
 
-end_per_group(_GroupName, Config) ->
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
+init_per_testcase(_Case, Config) ->
+    [{max_size, 800}|Config].
+
+end_per_testcase(_Case, _Config) ->
+    ok.
 
 %%----------------------------------------------------------------------
 %% Tests
 %%----------------------------------------------------------------------
 
-image_create_and_destroy(suite) ->
-    [];
-image_create_and_destroy(doc) ->
-    ["Image creation and destroy test."];
+%% Image creation and destroy test.
 image_create_and_destroy(Config) when is_list(Config) ->
-    {W,H} = get_size(?config(max_size, Config)),
-    ?line Image = egd:create(W, H),
-    ?line ok = egd:destroy(Image),
+    {W,H} = get_size(proplists:get_value(max_size, Config)),
+    Image = egd:create(W, H),
+    ok = egd:destroy(Image),
     ok.
 
-image_colors(suite) ->
-    [];
-image_colors(doc) ->
-    ["Image color test."];
+%% Image color test.
 image_colors(Config) when is_list(Config) ->
-    {W,H} = get_size(?config(max_size, Config)),
-    ?line Image = egd:create(W, H),
+    {W,H} = get_size(proplists:get_value(max_size, Config)),
+    Image = egd:create(W, H),
     put(image_size, {W,H}),
 
     RGB = get_rgb(),
-    ?line Black = egd:color({0,0,0}),
-    ?line Red = egd:color({255,0,0}),
-    ?line Green = egd:color({0,255,0}),
-    ?line Blue = egd:color({0,0,255}),
-    ?line Random = egd:color(Image, RGB),  
-
-    ?line ok = egd:line(Image, get_point(), get_point(), Random),
-    ?line ok = egd:line(Image, get_point(), get_point(), Red),
-    ?line ok = egd:line(Image, get_point(), get_point(), Green),
-    ?line ok = egd:line(Image, get_point(), get_point(), Black),
-    ?line ok = egd:line(Image, get_point(), get_point(), Blue),
+    Black = egd:color({0,0,0}),
+    Red = egd:color({255,0,0}),
+    Green = egd:color({0,255,0}),
+    Blue = egd:color({0,0,255}),
+    Random = egd:color(Image, RGB),
+
+    ok = egd:line(Image, get_point(), get_point(), Random),
+    ok = egd:line(Image, get_point(), get_point(), Red),
+    ok = egd:line(Image, get_point(), get_point(), Green),
+    ok = egd:line(Image, get_point(), get_point(), Black),
+    ok = egd:line(Image, get_point(), get_point(), Blue),
 
     HtmlDefaultNames = [black,silver,gray,white,maroon,red,
-    	purple,fuchia,green,lime,olive,yellow,navy,blue,teal,
-      	aqua],
-    
-    lists:foreach(fun
-    	(ColorName) ->
-	    ?line Color = egd:color(ColorName),
-	    ?line ok    = egd:line(Image, get_point(), get_point(), Color)
-	end, HtmlDefaultNames),
- 
-    ?line <<_/binary>>  = egd:render(Image),
-    ?line ok = egd:destroy(Image),
+                        purple,fuchia,green,lime,olive,yellow,navy,blue,teal,
+                        aqua],
+
+    lists:foreach(fun (ColorName) ->
+                          Color = egd:color(ColorName),
+                          ok    = egd:line(Image, get_point(), get_point(), Color)
+                  end, HtmlDefaultNames),
+
+    <<_/binary>>  = egd:render(Image),
+    ok = egd:destroy(Image),
     erase(image_size),
     ok.
 
-image_shape(suite) ->
-    [];
-image_shape(doc) ->
-    ["Image shape api test."];
+%% Image shape API test.
 image_shape(Config) when is_list(Config) ->
-    {W,H} = get_size(?config(max_size, Config)),
+    {W,H} = get_size(proplists:get_value(max_size, Config)),
     put(image_size, {W,H}),
-    ?line Im = egd:create(W, H),
-    
-    ?line Fgc = egd:color({255,0,0}),
-
-    ?line ok = egd:line(Im, get_point(), get_point(), Fgc), 
-    ?line ok = egd:rectangle(Im, get_point(), get_point(), Fgc),
-    ?line ok = egd:filledEllipse(Im, get_point(), get_point(), Fgc),
-    ?line ok = egd:arc(Im, get_point(), get_point(), Fgc),
-    ?line ok = egd:arc(Im, get_point(), get_point(), 100, Fgc),
-    
+    Im = egd:create(W, H),
+
+    Fgc = egd:color({255,0,0}),
+
+    ok = egd:line(Im, get_point(), get_point(), Fgc),
+    ok = egd:rectangle(Im, get_point(), get_point(), Fgc),
+    ok = egd:filledEllipse(Im, get_point(), get_point(), Fgc),
+    ok = egd:arc(Im, get_point(), get_point(), Fgc),
+    ok = egd:arc(Im, get_point(), get_point(), 100, Fgc),
+
     Pt1 = get_point(),
     Pt2 = get_point(), 
 
-    ?line ok = egd:filledRectangle(Im, Pt1, Pt2, Fgc),
+    ok = egd:filledRectangle(Im, Pt1, Pt2, Fgc),
 
-    ?line Bitmap = egd:render(Im, raw_bitmap),
+    Bitmap = egd:render(Im, raw_bitmap),
 
-    ?line ok = bitmap_point_has_color(Bitmap, {W,H}, Pt2, Fgc),
-    ?line ok = bitmap_point_has_color(Bitmap, {W,H}, Pt1, Fgc),
+    ok = bitmap_point_has_color(Bitmap, {W,H}, Pt2, Fgc),
+    ok = bitmap_point_has_color(Bitmap, {W,H}, Pt1, Fgc),
 
-    ?line <<_/binary>> = egd:render(Im, raw_bitmap, [{render_engine, alpha}]),
+    <<_/binary>> = egd:render(Im, raw_bitmap, [{render_engine, alpha}]),
 
-    ?line ok = egd:destroy(Im),
+    ok = egd:destroy(Im),
     erase(image_size),
     ok.
 
-image_primitives(suite) ->
-    [];
-image_primitives(doc) ->
-    ["Image shape api test."];
+%% Image shape API test.
 image_primitives(Config) when is_list(Config) ->
-    {W,H} = get_size(?config(max_size, Config)),
+    {W,H} = get_size(proplists:get_value(max_size, Config)),
     put(image_size, {W,H}),
 
-    ?line Im0 = egd_primitives:create(W, H),
-    ?line Fgc = egd:color({25,25,255}),
-    ?line Bgc = egd:color({0,250,25}),
+    Im0 = egd_primitives:create(W, H),
+    Fgc = egd:color({25,25,255}),
+    Bgc = egd:color({0,250,25}),
 
-    ?line Im1 = lists:foldl(fun
-    	({Function, Arguments}, Im) ->
-	    ?line erlang:apply(egd_primitives, Function, [Im|Arguments])
-	end, Im0, 
-	[{Fs, [get_point(), get_point(), Bgc]} || Fs <- [line, rectangle, filledEllipse, arc]] ++
-	[{pixel,          [get_point(), Bgc]},
-	 {filledTriangle, [get_point(), get_point(), get_point(), Bgc]}]),
+    Im1 = lists:foldl(fun ({Function, Arguments}, Im) ->
+                              erlang:apply(egd_primitives, Function, [Im|Arguments])
+                      end, Im0,
+                      [{Fs, [get_point(), get_point(), Bgc]} || Fs <- [line, rectangle, filledEllipse, arc]] ++
+                      [{pixel,          [get_point(), Bgc]},
+                       {filledTriangle, [get_point(), get_point(), get_point(), Bgc]}]),
 
     Pt1 = get_point(),
     Pt2 = get_point(), 
 
-    ?line Im2 = egd_primitives:filledRectangle(Im1, Pt1, Pt2, Fgc),
+    Im2 = egd_primitives:filledRectangle(Im1, Pt1, Pt2, Fgc),
 
-    ?line Bitmap = egd_render:binary(Im2, opaque),
+    Bitmap = egd_render:binary(Im2, opaque),
 
-    ?line ok = bitmap_point_has_color(Bitmap, {W,H}, Pt2, Fgc),
-    ?line ok = bitmap_point_has_color(Bitmap, {W,H}, Pt1, Fgc),
+    ok = bitmap_point_has_color(Bitmap, {W,H}, Pt2, Fgc),
+    ok = bitmap_point_has_color(Bitmap, {W,H}, Pt1, Fgc),
 
-    ?line <<_/binary>> = egd_render:binary(Im2, alpha),
+    <<_/binary>> = egd_render:binary(Im2, alpha),
 
     erase(image_size),
     ok.
- 
 
-
-
-image_font(suite) ->
-    [];
-image_font(doc) ->
-    ["Image font test."];
+%% Image font test.
 image_font(Config) when is_list(Config) ->
-    {W,H} = get_size(?config(max_size, Config)),
+    {W,H} = get_size(proplists:get_value(max_size, Config)),
     put(image_size, {W,H}),
-    ?line Im = egd:create(W, H),
-    ?line Fgc = egd:color({0,130,0}),
-  
-    ?line Filename = filename:join([code:priv_dir(percept),"fonts","6x11_latin1.wingsfont"]),
-    ?line Font = egd_font:load(Filename),
-   
+    Im = egd:create(W, H),
+    Fgc = egd:color({0,130,0}),
+
+    Filename = filename:join([code:priv_dir(percept),"fonts","6x11_latin1.wingsfont"]),
+    Font = egd_font:load(Filename),
+
     % simple text
-    ?line ok = egd:text(Im, get_point(), Font, "Hello World", Fgc),
-    ?line <<_/binary>> = egd:render(Im, png),
-    
+    ok = egd:text(Im, get_point(), Font, "Hello World", Fgc),
+    <<_/binary>> = egd:render(Im, png),
+
     GlyphStr1   = " !\"#$%&'()*+,-./",            % Codes  32 ->  47
     NumericStr  = "0123456789",                   % Codes  48 ->  57
     GlyphStr2   = ":;<=>?@",                      % Codes  58 ->  64
@@ -219,62 +184,59 @@ image_font(Config) when is_list(Config) ->
     AlphaSmStr  = "abcdefghijklmnopqrstuvwxyz",   % Codes  97 -> 122
     GlyphStr4   = "{|}~",                         % Codes 123 -> 126
 
-    ?line ok = egd:text(Im, get_point(), Font, GlyphStr1, Fgc),
-    ?line <<_/binary>> = egd:render(Im, png),
+    ok = egd:text(Im, get_point(), Font, GlyphStr1, Fgc),
+    <<_/binary>> = egd:render(Im, png),
+
+    ok = egd:text(Im, get_point(), Font, NumericStr, Fgc),
+    <<_/binary>> = egd:render(Im, png),
+
+    ok = egd:text(Im, get_point(), Font, GlyphStr2, Fgc),
+    <<_/binary>> = egd:render(Im, png),
+
+    ok = egd:text(Im, get_point(), Font, AlphaBigStr, Fgc),
+    <<_/binary>> = egd:render(Im, png),
 
-    ?line ok = egd:text(Im, get_point(), Font, NumericStr, Fgc),
-    ?line <<_/binary>> = egd:render(Im, png),
- 
-    ?line ok = egd:text(Im, get_point(), Font, GlyphStr2, Fgc),
-    ?line <<_/binary>> = egd:render(Im, png),
+    ok = egd:text(Im, get_point(), Font, GlyphStr3, Fgc),
+    <<_/binary>> = egd:render(Im, png),
 
-    ?line ok = egd:text(Im, get_point(), Font, AlphaBigStr, Fgc),
-    ?line <<_/binary>> = egd:render(Im, png),
-    
-    ?line ok = egd:text(Im, get_point(), Font, GlyphStr3, Fgc),
-    ?line <<_/binary>> = egd:render(Im, png),
+    ok = egd:text(Im, get_point(), Font, AlphaSmStr, Fgc),
+    <<_/binary>> = egd:render(Im, png),
 
-    ?line ok = egd:text(Im, get_point(), Font, AlphaSmStr, Fgc),
-    ?line <<_/binary>> = egd:render(Im, png),
-    
-    ?line ok = egd:text(Im, get_point(), Font, GlyphStr4, Fgc),
-    ?line <<_/binary>> = egd:render(Im, png),
+    ok = egd:text(Im, get_point(), Font, GlyphStr4, Fgc),
+    <<_/binary>> = egd:render(Im, png),
 
-    ?line ok = egd:destroy(Im),
+    ok = egd:destroy(Im),
     erase(image_size),
     ok.
 
-image_png_compliant(suite) ->
-    [];
-image_png_compliant(doc) ->
-    ["Image png compliant test."];
+%% Image png compliant test.
 image_png_compliant(Config) when is_list(Config) ->
-    {W,H} = get_size(?config(max_size, Config)),
+    {W,H} = get_size(proplists:get_value(max_size, Config)),
     put(image_size, {W,H}),
-    ?line Im = egd:create(W, H),
-    ?line Fgc = egd:color({0,0,0}),
-    ?line ok = egd:filledRectangle(Im, get_point(), get_point(), Fgc),
-    
-    ?line Bin = egd:render(Im, png),
-    ?line true = binary_is_png_compliant(Bin),
-    
-    ?line ok = egd:destroy(Im),
+    Im = egd:create(W, H),
+    Fgc = egd:color({0,0,0}),
+    ok = egd:filledRectangle(Im, get_point(), get_point(), Fgc),
+
+    Bin = egd:render(Im, png),
+    true = binary_is_png_compliant(Bin),
+
+    ok = egd:destroy(Im),
     erase(image_size),
     ok.
 
 %%----------------------------------------------------------------------
 %% Auxiliary tests
 %%----------------------------------------------------------------------
-    
+
 bitmap_point_has_color(Bitmap, {W,_}, {X,Y}, C) ->
     {CR,CG,CB,_} = egd_primitives:rgb_float2byte(C),
     N = W*Y*3 + X*3,
     << _:N/binary, R,G,B, _/binary>> = Bitmap,
     case {R,G,B} of
-	{CR,CG,CB} -> ok;
-	Other ->
-	    io:format("bitmap_point_has_color: error color was ~p, should be ~p~n", [Other, {CR,CG,CB}]),
-	    {error, {Other,{CR,CG,CB}}}
+        {CR,CG,CB} -> ok;
+        Other ->
+            io:format("bitmap_point_has_color: error color was ~p, should be ~p~n", [Other, {CR,CG,CB}]),
+            {error, {Other,{CR,CG,CB}}}
     end.
 
 %% jfif header by specification
@@ -283,35 +245,35 @@ bitmap_point_has_color(Bitmap, {W,_}, {X,Y}, C) ->
 %% 2 bytes, version, (major, minor)
 %% 1 byte , units
 %% However, JFIF seems to start at 6 (7 with 1-index)?
-   
+
 binary_is_jfif_compliant(JpegBin) ->
-    ?line {Bin, _} = split_binary(JpegBin, 11),
+    {Bin, _} = split_binary(JpegBin, 11),
     List = binary_to_list(Bin),
     case lists:sublist(List, 7, 4) of 
-	"JFIF" -> true;
-	Other ->
-	   io:format("img -> ~p~n", [Other]),
-	   false
+        "JFIF" -> true;
+        Other ->
+            io:format("img -> ~p~n", [Other]),
+            false
     end.
 
 binary_is_gif_compliant(GifBin) ->
-    ?line {Bin, _} = split_binary(GifBin, 10),
+    {Bin, _} = split_binary(GifBin, 10),
     List = binary_to_list(Bin),
     case lists:sublist(List, 1,5) of
-	"GIF87" -> true;
-	Other -> 
-	   io:format("img -> ~p~n", [Other]),
-	   false
+        "GIF87" -> true;
+        Other ->
+            io:format("img -> ~p~n", [Other]),
+            false
     end.
 
 binary_is_png_compliant(PngBin) ->
-    ?line {Bin, _} = split_binary(PngBin, 10),
+    {Bin, _} = split_binary(PngBin, 10),
     List = binary_to_list(Bin),
     case lists:sublist(List, 2,3) of
-	"PNG" -> true;
-	Other ->
-	   io:format("img -> ~p~n", [Other]),
-	   false
+        "PNG" -> true;
+        Other ->
+            io:format("img -> ~p~n", [Other]),
+            false
     end.
 
 %%----------------------------------------------------------------------
@@ -320,20 +282,20 @@ binary_is_png_compliant(PngBin) ->
 
 
 get_rgb() ->
-   R = random(255), 
-   G = random(255),   
-   B = random(255),
-   {R,G,B}.
+    R = random(255),
+    G = random(255),
+    B = random(255),
+    {R,G,B}.
 
 get_angle() ->
-   random(359).
+    random(359).
 
 get_point() ->
     get_point(get(image_size)).
 get_point({W,H}) ->
-   X = random(W - 1),
-   Y = random(H - 1),
-   {X,Y}.
+    X = random(W - 1),
+    Y = random(H - 1),
+    {X,Y}.
 
 get_size(Max) ->
     W = trunc(random(Max/2) + Max/2 + 1),
@@ -344,8 +306,8 @@ get_size(Max) ->
 get_points(N) ->
     get_points(N, []).
 get_points(0, Out) ->
-   Out;
+    Out;
 get_points(N, Out) ->
     get_points(N - 1, [get_point() | Out]).
 
-random(N) -> trunc(random:uniform(trunc(N + 1)) - 1).
+random(N) -> trunc(rand:uniform(trunc(N + 1)) - 1).
diff --git a/lib/percept/test/ipc_tree.erl b/lib/percept/test/ipc_tree.erl
index ff1c8d49c1..29da20e83f 100644
--- a/lib/percept/test/ipc_tree.erl
+++ b/lib/percept/test/ipc_tree.erl
@@ -46,4 +46,4 @@ gather([]) -> ok;
 gather([_|Pids]) -> receive _ -> gather(Pids) end.
 
 workload(0) -> ok;
-workload(N) -> math:sin(2), workload(N - 1).
+workload(N) -> _ = math:sin(2), workload(N - 1).
diff --git a/lib/percept/test/percept_SUITE.erl b/lib/percept/test/percept_SUITE.erl
index fd96c2b97a..141035c631 100644
--- a/lib/percept/test/percept_SUITE.erl
+++ b/lib/percept/test/percept_SUITE.erl
@@ -19,54 +19,26 @@
 %%
 
 -module(percept_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
--export([init_per_suite/1, end_per_suite/1]).
--export([init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0]).
 
 %% Test cases
--export([
-	app/1,
-	appup/1,
-	profile/1,
-	analyze/1,
-	analyze_dist/1,
-	webserver/1
-	]).
-
-%% Default timetrap timeout (set in init_per_testcase)
--define(default_timeout, ?t:minutes(2)).
-
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?default_timeout),
-    [{max_size, 300}, {watchdog,Dog} | Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
+-export([app/1,
+         appup/1,
+         profile/1,
+         analyze/1,
+         analyze_dist/1,
+         webserver/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 2}}].
 
 all() -> 
-    [app, appup, webserver, profile, analyze, analyze_dist].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
+    [app, appup, webserver, profile,
+     analyze, analyze_dist].
 
 
 %%----------------------------------------------------------------------
@@ -75,70 +47,56 @@ end_per_group(_GroupName, Config) ->
 
 %% Test that the percept app file is ok
 app(Config) when is_list(Config) ->
-    ok = ?t:app_test(percept).
+    ok = test_server:app_test(percept).
 
 %% Test that the percept appup file is ok
 appup(Config) when is_list(Config) ->
-    ok = ?t:appup_test(percept).
+    ok = test_server:appup_test(percept).
 
-webserver(suite) ->
-    [];
-webserver(doc) ->
-    ["Percept webserver test."];
+%% Percept webserver test.
 webserver(Config) when is_list(Config) ->
     % Explicit start inets?
-    ?line {started, _, Port} = percept:start_webserver(),
-    ?line ok = percept:stop_webserver(Port), 
-    ?line {started, _, _} = percept:start_webserver(),
-    ?line ok = percept:stop_webserver(),
-    ?line {started, _, NewPort} = percept:start_webserver(),
-    ?line ok = percept:stop_webserver(NewPort),
-    ?line application:stop(inets),
+    {started, _, Port} = percept:start_webserver(),
+    ok = percept:stop_webserver(Port), 
+    {started, _, _} = percept:start_webserver(),
+    ok = percept:stop_webserver(),
+    {started, _, NewPort} = percept:start_webserver(),
+    ok = percept:stop_webserver(NewPort),
+    application:stop(inets),
     ok.
 
-profile(suite) ->
-    [];
-profile(doc) ->
-    ["Percept profile test."];
+%% Percept profile test.
 profile(Config) when is_list(Config) ->
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     File = filename:join([Path,"profile_test.dat"]),
-    ?line {ok, _} = percept:profile(File, [procs]),
+    {ok, _} = percept:profile(File, [procs]),
     ipc_tree:go(7),
-    ?line ok = percept:stop_profile(),
+    ok = percept:stop_profile(),
     ok.
 
-analyze(suite) ->
-    [];
-analyze(doc) ->
-    ["Percept analyze test."];
+%% Percept analyze test.
 analyze(Config) when is_list(Config) ->
     Begin = processes(),
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     File = filename:join([Path,"profile_test.dat"]),
-    T0 = erlang:now(),
-    ?line ok = percept:analyze(File),
-    T1 = erlang:now(),
-    Secs = timer:now_diff(T1,T0)/1000000,
-    io:format("percept:analyze/1 took ~.2f s.~n", [Secs]),
-    ?line {stopped, _} = percept_db:stop(),
+    T0 = erlang:monotonic_time(milli_seconds),
+    ok = percept:analyze(File),
+    T1 = erlang:monotonic_time(milli_seconds),
+    io:format("percept:analyze/1 took ~w ms.~n", [T1 - T0]),
+    {stopped, _} = percept_db:stop(),
     print_remainers(remainers(Begin, processes())),
     ok.
 
-analyze_dist(suite) ->
-    [];
-analyze_dist(doc) ->
-    ["Percept analyze distribution test."];
+%% Percept analyze distribution test.
 analyze_dist(Config) when is_list(Config) ->
     Begin = processes(),
-    Path = ?config(data_dir, Config),
+    Path = proplists:get_value(data_dir, Config),
     File = filename:join([Path,"ipc-dist.dat"]),
-    T0 = erlang:now(),
-    ?line ok = percept:analyze(File),
-    T1 = erlang:now(),
-    Secs = timer:now_diff(T1,T0)/1000000,
-    io:format("percept:analyze/1 took ~.2f s.~n", [Secs]),
-    ?line {stopped, _} = percept_db:stop(),
+    T0 = erlang:monotonic_time(milli_seconds),
+    ok = percept:analyze(File),
+    T1 = erlang:monotonic_time(milli_seconds),
+    io:format("percept:analyze/1 took ~w ms.~n", [T1 - T0]),
+    {stopped, _} = percept_db:stop(),
     print_remainers(remainers(Begin, processes())),
     ok.
 
@@ -166,9 +124,3 @@ remainers(Begin, [Pid|End], Out) ->
 	true  -> remainers(Begin, End, Out);
 	false -> remainers(Begin, End, [Pid|Out])
     end.
-
-
-
-    
-
-
diff --git a/lib/percept/test/percept_db_SUITE.erl b/lib/percept/test/percept_db_SUITE.erl
index e2775aabc0..c1d711060c 100644
--- a/lib/percept/test/percept_db_SUITE.erl
+++ b/lib/percept/test/percept_db_SUITE.erl
@@ -19,57 +19,35 @@
 %%
 
 -module(percept_db_SUITE).
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
--export([all/1]).
--export([init_per_suite/1, end_per_suite/1]).
--export([init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0]).
 
 %% Test cases
--export([
-	start/1
-	]).
+-export([start/1]).
 
 %% Default timetrap timeout (set in init_per_testcase)
--define(default_timeout, ?t:minutes(2)).
 -define(restarts, 10).
 -define(alive_timeout, 500).
 
-init_per_suite(Config) when is_list(Config) ->
-    Config.
+suite() ->
+    [{timetrap, {minutes, 2}}].
 
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?default_timeout),
-    [{max_size, 300}, {watchdog,Dog} | Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
-all(suite) ->
-    % Test cases
+all() ->
     [start].
 
 %%----------------------------------------------------------------------
 %% Tests
 %%----------------------------------------------------------------------
 
-start(suite) ->
-    [];
-start(doc) ->
-    ["Percept_db start and restart test."];
+%% Percept_db start and restart test.
 start(Config) when is_list(Config) ->
     ok = restart(?restarts),
     {stopped, _DB} = percept_db:stop(),
     ok.
 
-restart(0)->
-    ok;
+restart(0)-> ok;
 restart(N)->
     {_, DB} = percept_db:start(),
     timer:sleep(?alive_timeout),
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 8eb56f7354..da8f62e2f8 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,6 +35,22 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Public_Key 1.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    An encapsulated PEM header shall be followed by a blank
+	    line</p>
+          <p>
+	    Own Id: OTP-13381 Aux Id: seq13070 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Public_Key 1.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 258e7cd1b9..6923066da7 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -114,8 +114,8 @@
       </item>
 
       <tag><c>pem_entry () =</c></tag>
-      <item><p><c>{pki_asn1_type(), binary(), %% DER or encrypted DER not_encrypted</c></p>
-      <p><c>| cipher_info()}</c></p></item>
+      <item><p><c>{pki_asn1_type(), binary(), %% DER or encrypted DER</c></p>
+      <p><c> not_encrypted | cipher_info()}</c></p></item>
       
       <tag><c>cipher_info() = </c></tag>
       <item><p><c>{"RC2-CBC" | "DES-CBC" | "DES-EDE3-CBC", crypto:rand_bytes(8)</c></p>
@@ -141,7 +141,7 @@
       <item><p><c>#'DSAPrivateKey'{}</c></p></item>
 
       <tag><c>ec_public_key()</c></tag>
-      <item><p>= <c>{#'ECPoint'{}, #'EcpkParameters'{} | {namedCurve, oid()}}</c></p></item>
+      <item><p>= <c>{#'ECPoint'{}, #'ECParameters'{} | {namedCurve, oid()}}</c></p></item>
 
       <tag><c>ec_private_key() =</c></tag>
       <item><p><c>#'ECPrivateKey'{}</c></p></item>
@@ -418,13 +418,14 @@
       <v>Entity = term()</v>
       <d>Erlang representation of
       <c>Asn1Type</c>.  If <c>Asn1Type</c> is 'SubjectPublicKeyInfo',
-      <c>Entity</c> must be either an <c>rsa_public_key()</c> or a
-      <c>dsa_public_key()</c> and this function creates the appropriate
+      <c>Entity</c> must be either an <c>rsa_public_key()</c>, 
+      <c>dsa_public_key()</c> or an <c>ec_public_key()</c>
+      and this function creates the appropriate
       'SubjectPublicKeyInfo' entry.
       </d>
       <v>CipherInfo = cipher_info()</v>
       <v>Password = string()</v> 
-  </type> 
+    </type> 
   <desc> 
     <p>Creates a PEM entry that can be feed to <c>pem_encode/1</c>.</p>
   </desc> 
@@ -786,13 +787,13 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
     <fsummary>Decodes an SSH file-binary.</fsummary>
     <type>
       <v>SshBin = binary()</v>
-      <d>Example {ok, SshBin} = file:read_file("known_hosts").</d>
+      <d>Example <c>{ok, SshBin} = file:read_file("known_hosts")</c>.</d>
       <v>Type = public_key | ssh_file()</v>
       <d>If <c>Type</c> is <c>public_key</c> the binary can be either
       an RFC4716 public key or an OpenSSH public key.</d>
     </type>
   <desc>
-    <p>Decodes an SSH file-binary. In the case of <c>know_hosts</c> or
+    <p>Decodes an SSH file-binary. In the case of <c>known_hosts</c> or
     <c>auth_keys</c>, the binary can include one or more lines of the
     file. Returns a list of public keys and their attributes, possible
     attribute values depends on the file type represented by the
@@ -842,7 +843,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
       <v>Key = rsa_public_key() | dsa_public_key() | ec_public_key()</v>
   </type>
   <desc>
-    <p>Veryfies a digital signature.</p>
+    <p>Verifies a digital signature.</p>
   </desc> 
   </func>
   
diff --git a/lib/public_key/doc/src/public_key_records.xml b/lib/public_key/doc/src/public_key_records.xml
index fb03da3150..d34f3ed9a3 100644
--- a/lib/public_key/doc/src/public_key_records.xml
+++ b/lib/public_key/doc/src/public_key_records.xml
@@ -57,9 +57,9 @@
     
     <taglist>
       <tag><c>time() =</c></tag>
-      <item><p><c>uct_time() | general_time()</c></p></item>
+      <item><p><c>utc_time() | general_time()</c></p></item>
 
-      <tag><c>uct_time() =</c></tag>
+      <tag><c>utc_time() =</c></tag>
       <item><p><c>{utcTime, "YYMMDDHHMMSSZ"}</c></p></item>
 
       <tag><c>general_time() =</c></tag>
@@ -144,7 +144,7 @@
 
   <section>
     <title>DSA</title>
-     <p>Erlang representation of <url href="http://www.ietf.org/rfc/rfc6979.txt">Digigital Signature Algorithm (DSA)</url> keys</p>
+     <p>Erlang representation of <url href="http://www.ietf.org/rfc/rfc6979.txt">Digital Signature Algorithm (DSA)</url> keys</p>
     <code>	 
 #'DSAPrivateKey',{
 	  version,      % integer()
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl
index 6a722b0525..d163004c7c 100644
--- a/lib/public_key/src/pubkey_pem.erl
+++ b/lib/public_key/src/pubkey_pem.erl
@@ -103,7 +103,7 @@ encode_pem_entry({'PrivateKeyInfo', Der, EncParams}) ->
     [StartStr, "\n", b64encode_and_split(EncDer), "\n", pem_end(StartStr) ,"\n\n"];
 encode_pem_entry({Type, Der, {Cipher, Salt}}) ->
     StartStr = pem_start(Type),
-    [StartStr,"\n", pem_decrypt(),"\n", pem_decrypt_info(Cipher, Salt),"\n",
+    [StartStr,"\n", pem_decrypt(),"\n", pem_decrypt_info(Cipher, Salt),"\n\n",
      b64encode_and_split(Der), "\n", pem_end(StartStr) ,"\n\n"].
 
 decode_pem_entries([], Entries) ->
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index a79badef24..a5944bd604 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -134,7 +134,8 @@ pem_entry_decode({'SubjectPublicKeyInfo', Der, _}) ->
             {params, DssParams} = der_decode('DSAParams', Params),
             {der_decode(KeyType, Key0), DssParams};
         'ECPoint' ->
-            der_decode(KeyType, Key0)
+	    ECCParams = der_decode('EcpkParameters', Params),
+            {#'ECPoint'{point = Key0}, ECCParams}
     end;
 pem_entry_decode({Asn1Type, Der, not_encrypted}) when is_atom(Asn1Type),
 						      is_binary(Der) ->
@@ -181,6 +182,13 @@ pem_entry_encode('SubjectPublicKeyInfo',
     Spki = {'SubjectPublicKeyInfo',
             {'AlgorithmIdentifier', ?'id-dsa', ParamDer}, KeyDer},
     pem_entry_encode('SubjectPublicKeyInfo', Spki);
+pem_entry_encode('SubjectPublicKeyInfo',
+		 {#'ECPoint'{point = Key}, ECParam}) when is_binary(Key)->
+    Params = der_encode('EcpkParameters',ECParam),
+    Spki = {'SubjectPublicKeyInfo',
+	    {'AlgorithmIdentifier', ?'id-ecPublicKey', Params},
+	    Key},
+    pem_entry_encode('SubjectPublicKeyInfo', Spki);
 pem_entry_encode(Asn1Type, Entity)  when is_atom(Asn1Type) ->
     Der = der_encode(Asn1Type, Entity),
     {Asn1Type, Der, not_encrypted}.
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index 5e677f31d6..2fbccbfaa7 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -46,7 +46,7 @@ all() ->
      pkix_iso_rsa_oid, pkix_iso_dsa_oid, pkix_crl].
 
 groups() -> 
-    [{pem_decode_encode, [], [dsa_pem, rsa_pem, encrypted_pem,
+    [{pem_decode_encode, [], [dsa_pem, rsa_pem, ec_pem, encrypted_pem,
 			      dh_pem, cert_pem, pkcs7_pem, pkcs10_pem]},
      {ssh_public_key_decode_encode, [],
       [ssh_rsa_public_key, ssh_dsa_public_key, ssh_ecdsa_public_key,
@@ -123,8 +123,8 @@ dsa_pem(Config) when is_list(Config) ->
     DSAPubKey = public_key:pem_entry_decode(PubEntry0),
     true = check_entry_type(DSAPubKey, 'DSAPublicKey'),
     PubEntry0 = public_key:pem_entry_encode('SubjectPublicKeyInfo', DSAPubKey),
-    DSAPubPemNoEndNewLines = strip_ending_newlines(DSAPubPem),
-    DSAPubPemNoEndNewLines = strip_ending_newlines(public_key:pem_encode([PubEntry0])).
+    DSAPubPemNoEndNewLines = strip_superfluous_newlines(DSAPubPem),
+    DSAPubPemNoEndNewLines = strip_superfluous_newlines(public_key:pem_encode([PubEntry0])).
 
 %%--------------------------------------------------------------------
 
@@ -151,18 +151,44 @@ rsa_pem(Config) when is_list(Config) ->
     RSAPubKey = public_key:pem_entry_decode(PubEntry0),
     true = check_entry_type(RSAPubKey, 'RSAPublicKey'),
     PubEntry0 = public_key:pem_entry_encode('SubjectPublicKeyInfo', RSAPubKey),
-    RSAPubPemNoEndNewLines = strip_ending_newlines(RSAPubPem),
-    RSAPubPemNoEndNewLines = strip_ending_newlines(public_key:pem_encode([PubEntry0])),
+    RSAPubPemNoEndNewLines = strip_superfluous_newlines(RSAPubPem),
+    RSAPubPemNoEndNewLines = strip_superfluous_newlines(public_key:pem_encode([PubEntry0])),
 
     {ok, RSARawPem} = file:read_file(filename:join(Datadir, "rsa_pub_key.pem")),
     [{'RSAPublicKey', _, _} = PubEntry1] =
         public_key:pem_decode(RSARawPem),
     RSAPubKey = public_key:pem_entry_decode(PubEntry1),
-    RSARawPemNoEndNewLines = strip_ending_newlines(RSARawPem),
-    RSARawPemNoEndNewLines = strip_ending_newlines(public_key:pem_encode([PubEntry1])).
+    RSARawPemNoEndNewLines = strip_superfluous_newlines(RSARawPem),
+    RSARawPemNoEndNewLines = strip_superfluous_newlines(public_key:pem_encode([PubEntry1])).
 
 %%--------------------------------------------------------------------
 
+ec_pem() ->
+    [{doc, "EC key PEM-file decode/encode"}].
+ec_pem(Config) when is_list(Config) ->
+    Datadir = ?config(data_dir, Config),
+    {ok, ECPubPem} = file:read_file(filename:join(Datadir, "ec_pubkey.pem")),
+    [{'SubjectPublicKeyInfo', _, _} = PubEntry0] =
+        public_key:pem_decode(ECPubPem),
+    ECPubKey = public_key:pem_entry_decode(PubEntry0),
+    true = check_entry_type(ECPubKey, 'ECPoint'),
+    PubEntry0 = public_key:pem_entry_encode('SubjectPublicKeyInfo', ECPubKey),
+    ECPubPemNoEndNewLines = strip_superfluous_newlines(ECPubPem),
+    ECPubPemNoEndNewLines = strip_superfluous_newlines(public_key:pem_encode([PubEntry0])),
+    
+    {ok, ECPrivPem} = file:read_file(filename:join(Datadir, "ec_key.pem")),
+    [{'EcpkParameters', _, not_encrypted} = Entry1,
+     {'ECPrivateKey', _, not_encrypted} = Entry2] = public_key:pem_decode(ECPrivPem),
+    
+    ECParams = public_key:pem_entry_decode(Entry1),
+    true = check_entry_type(ECParams, 'EcpkParameters'),
+    ECPrivKey = public_key:pem_entry_decode(Entry2),
+    true = check_entry_type(ECPrivKey, 'ECPrivateKey'),
+    ECPemNoEndNewLines = strip_superfluous_newlines(ECPrivPem),
+    ECPemNoEndNewLines = strip_superfluous_newlines(public_key:pem_encode([Entry1, Entry2])).
+    
+%%--------------------------------------------------------------------
+
 encrypted_pem() ->
     [{doc, "Encrypted PEM-file decode/encode"}].
 encrypted_pem(Config) when is_list(Config) ->
@@ -189,6 +215,8 @@ encrypted_pem(Config) when is_list(Config) ->
     erl_make_certs:der_to_pem(DesKeyFile, [Entry1]),
     [{'RSAPrivateKey', _, {"DES-CBC", Salt1}} =Entry2] =
 	erl_make_certs:pem_to_der(DesKeyFile),
+    {ok, Pem} = file:read_file(DesKeyFile),
+    check_encapsulated_header(Pem),
     true = check_entry_type(public_key:pem_entry_decode(Entry2, "4567efgh"),
 			     'RSAPrivateKey').
     
@@ -823,11 +851,29 @@ check_entry_type(#'DHParameter'{}, 'DHParameter') ->
     true;
 check_entry_type(#'Certificate'{}, 'Certificate') ->
     true;
+check_entry_type({#'ECPoint'{}, _}, 'ECPoint') ->
+    true;
+check_entry_type(#'ECPrivateKey'{}, 'ECPrivateKey') ->
+    true;
+check_entry_type({namedCurve, _}, 'EcpkParameters') ->
+    true;
+check_entry_type(#'ECParameters'{}, 'EcpkParameters') ->
+    true;
 check_entry_type(_,_) ->
     false.
 
-strip_ending_newlines(Bin) ->
-    string:strip(binary_to_list(Bin), right, 10).
+check_encapsulated_header(Pem) when is_binary(Pem)->
+    check_encapsulated_header( binary:split(Pem, <<"\n">>, [global]));
+check_encapsulated_header([<<"DEK-Info: DES-CBC,FB7577791A9056A1">>, <<>> | _]) ->
+    true;
+check_encapsulated_header([ _ | Rest]) ->
+    check_encapsulated_header(Rest);
+check_encapsulated_header([]) ->
+    false.
+
+strip_superfluous_newlines(Bin) ->
+    Str = string:strip(binary_to_list(Bin), right, 10),
+    re:replace(Str,"\n\n","\n", [{return,list}, global]).
 
 incorrect_countryname_pkix_cert() ->
     <<48,130,5,186,48,130,4,162,160,3,2,1,2,2,7,7,250,61,63,6,140,137,48,13,6,9,42, 134,72,134,247,13,1,1,5,5,0,48,129,220,49,11,48,9,6,3,85,4,6,19,2,85,83,49, 16,48,14,6,3,85,4,8,19,7,65,114,105,122,111,110,97,49,19,48,17,6,3,85,4,7,19, 10,83,99,111,116,116,115,100,97,108,101,49,37,48,35,6,3,85,4,10,19,28,83,116, 97,114,102,105,101,108,100,32,84,101,99,104,110,111,108,111,103,105,101,115, 44,32,73,110,99,46,49,57,48,55,6,3,85,4,11,19,48,104,116,116,112,58,47,47,99, 101,114,116,105,102,105,99,97,116,101,115,46,115,116,97,114,102,105,101,108, 100,116,101,99,104,46,99,111,109,47,114,101,112,111,115,105,116,111,114,121, 49,49,48,47,6,3,85,4,3,19,40,83,116,97,114,102,105,101,108,100,32,83,101,99, 117,114,101,32,67,101,114,116,105,102,105,99,97,116,105,111,110,32,65,117, 116,104,111,114,105,116,121,49,17,48,15,6,3,85,4,5,19,8,49,48,54,56,56,52,51, 53,48,30,23,13,49,48,49,48,50,51,48,49,51,50,48,53,90,23,13,49,50,49,48,50, 51,48,49,51,50,48,53,90,48,122,49,11,48,9,6,3,85,4,6,12,2,85,83,49,11,48,9,6, 3,85,4,8,12,2,65,90,49,19,48,17,6,3,85,4,7,12,10,83,99,111,116,116,115,100, 97,108,101,49,38,48,36,6,3,85,4,10,12,29,83,112,101,99,105,97,108,32,68,111, 109,97,105,110,32,83,101,114,118,105,99,101,115,44,32,73,110,99,46,49,33,48, 31,6,3,85,4,3,12,24,42,46,108,111,103,105,110,46,115,101,99,117,114,101,115, 101,114,118,101,114,46,110,101,116,48,130,1,34,48,13,6,9,42,134,72,134,247, 13,1,1,1,5,0,3,130,1,15,0,48,130,1,10,2,130,1,1,0,185,136,240,80,141,36,124, 245,182,130,73,19,188,74,166,117,72,228,185,209,43,129,244,40,44,193,231,11, 209,12,234,88,43,142,1,162,48,122,17,95,230,105,171,131,12,147,46,204,36,80, 250,171,33,253,35,62,83,22,71,212,186,141,14,198,89,89,121,204,224,122,246, 127,110,188,229,162,67,95,6,74,231,127,99,131,7,240,85,102,203,251,50,58,58, 104,245,103,181,183,134,32,203,121,232,54,32,188,139,136,112,166,126,14,91, 223,153,172,164,14,61,38,163,208,215,186,210,136,213,143,70,147,173,109,217, 250,169,108,31,211,104,238,103,93,182,59,165,43,196,189,218,241,30,148,240, 109,90,69,176,194,52,116,173,151,135,239,10,209,179,129,192,102,75,11,25,168, 223,32,174,84,223,134,70,167,55,172,143,27,130,123,226,226,7,34,142,166,39, 48,246,96,231,150,84,220,106,133,193,55,95,159,227,24,249,64,36,1,142,171,16, 202,55,126,7,156,15,194,22,116,53,113,174,104,239,203,120,45,131,57,87,84, 163,184,27,83,57,199,91,200,34,43,98,61,180,144,76,65,170,177,2,3,1,0,1,163, 130,1,224,48,130,1,220,48,15,6,3,85,29,19,1,1,255,4,5,48,3,1,1,0,48,29,6,3, 85,29,37,4,22,48,20,6,8,43,6,1,5,5,7,3,1,6,8,43,6,1,5,5,7,3,2,48,14,6,3,85, 29,15,1,1,255,4,4,3,2,5,160,48,56,6,3,85,29,31,4,49,48,47,48,45,160,43,160, 41,134,39,104,116,116,112,58,47,47,99,114,108,46,115,116,97,114,102,105,101, 108,100,116,101,99,104,46,99,111,109,47,115,102,115,50,45,48,46,99,114,108, 48,83,6,3,85,29,32,4,76,48,74,48,72,6,11,96,134,72,1,134,253,110,1,7,23,2,48, 57,48,55,6,8,43,6,1,5,5,7,2,1,22,43,104,116,116,112,115,58,47,47,99,101,114, 116,115,46,115,116,97,114,102,105,101,108,100,116,101,99,104,46,99,111,109, 47,114,101,112,111,115,105,116,111,114,121,47,48,129,141,6,8,43,6,1,5,5,7,1, 1,4,129,128,48,126,48,42,6,8,43,6,1,5,5,7,48,1,134,30,104,116,116,112,58,47, 47,111,99,115,112,46,115,116,97,114,102,105,101,108,100,116,101,99,104,46,99, 111,109,47,48,80,6,8,43,6,1,5,5,7,48,2,134,68,104,116,116,112,58,47,47,99, 101,114,116,105,102,105,99,97,116,101,115,46,115,116,97,114,102,105,101,108, 100,116,101,99,104,46,99,111,109,47,114,101,112,111,115,105,116,111,114,121, 47,115,102,95,105,110,116,101,114,109,101,100,105,97,116,101,46,99,114,116, 48,31,6,3,85,29,35,4,24,48,22,128,20,73,75,82,39,209,27,188,242,161,33,106, 98,123,81,66,122,138,215,213,86,48,59,6,3,85,29,17,4,52,48,50,130,24,42,46, 108,111,103,105,110,46,115,101,99,117,114,101,115,101,114,118,101,114,46,110, 101,116,130,22,108,111,103,105,110,46,115,101,99,117,114,101,115,101,114,118, 101,114,46,110,101,116,48,29,6,3,85,29,14,4,22,4,20,138,233,191,208,157,203, 249,85,242,239,20,195,48,10,148,49,144,101,255,116,48,13,6,9,42,134,72,134, 247,13,1,1,5,5,0,3,130,1,1,0,82,31,121,162,49,50,143,26,167,202,143,61,71, 189,201,199,57,81,122,116,90,192,88,24,102,194,174,48,157,74,27,87,210,223, 253,93,3,91,150,109,120,1,110,27,11,200,198,141,222,246,14,200,71,105,41,138, 13,114,122,106,63,17,197,181,234,121,61,89,74,65,41,231,248,219,129,83,176, 219,55,107,55,211,112,98,38,49,69,77,96,221,108,123,152,12,210,159,157,141, 43,226,55,187,129,3,82,49,136,66,81,196,91,234,196,10,82,48,6,80,163,83,71, 127,102,177,93,209,129,26,104,2,84,24,255,248,161,3,244,169,234,92,122,110, 43,4,17,113,185,235,108,219,210,236,132,216,177,227,17,169,58,162,159,182, 162,93,160,229,200,9,163,229,110,121,240,168,232,14,91,214,188,196,109,210, 164,222,0,109,139,132,113,91,16,118,173,178,176,80,132,34,41,199,51,206,250, 224,132,60,115,192,94,107,163,219,212,226,225,65,169,148,108,213,46,174,173, 103,110,189,229,166,149,254,31,51,44,144,108,187,182,11,251,201,206,86,138, 208,59,51,86,132,235,81,225,88,34,190,8,184>>.
diff --git a/lib/public_key/test/public_key_SUITE_data/ec_key.pem b/lib/public_key/test/public_key_SUITE_data/ec_key.pem
new file mode 100644
index 0000000000..1bb375d22f
--- /dev/null
+++ b/lib/public_key/test/public_key_SUITE_data/ec_key.pem
@@ -0,0 +1,8 @@
+-----BEGIN EC PARAMETERS-----
+BgUrgQQACg==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHQCAQEEIAd+PV10pm2uQWyU+VLgijqMqDx7MoMup/lsz9SfvHmEoAcGBSuBBAAK
+oUQDQgAE0yXQ7YqlfR7O6vmP8mpNc97iabpBUBmJq5Sdos7cX7+289dHiecjPxja
+hvJCtMO0iM43nbCJH40Su21+pj+4eA==
+-----END EC PRIVATE KEY-----
diff --git a/lib/public_key/test/public_key_SUITE_data/ec_pubkey.pem b/lib/public_key/test/public_key_SUITE_data/ec_pubkey.pem
new file mode 100644
index 0000000000..186c32bc01
--- /dev/null
+++ b/lib/public_key/test/public_key_SUITE_data/ec_pubkey.pem
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE0yXQ7YqlfR7O6vmP8mpNc97iabpBUBmJ
+q5Sdos7cX7+289dHiecjPxjahvJCtMO0iM43nbCJH40Su21+pj+4eA==
+-----END PUBLIC KEY-----
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index d5ffe6ca35..f801f55073 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.1
+PUBLIC_KEY_VSN = 1.1.1
diff --git a/lib/reltool/src/reltool.hrl b/lib/reltool/src/reltool.hrl
index 4c3f76bdc6..9ac22b9450 100644
--- a/lib/reltool/src/reltool.hrl
+++ b/lib/reltool/src/reltool.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2015. 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.
@@ -141,15 +141,15 @@
           app_name    :: '_'  | app_name(),
           incl_cond   :: '_'  | incl_cond() | undefined,
           debug_info  :: '_'  | debug_info() | undefined,
-          is_app_mod  :: '_'  | boolean(),
-          is_ebin_mod :: '_'  | boolean(),
-          uses_mods   :: '$2' | [mod_name()],
-          exists      :: '_'  | boolean(),
+          is_app_mod  :: '_'  | boolean() | undefined,
+          is_ebin_mod :: '_'  | boolean() | undefined,
+          uses_mods   :: '$2' | [mod_name()] | undefined,
+          exists      :: '_'  | boolean() | undefined,
           %% Dynamic
-          status          :: '_' | status(),
-          used_by_mods    :: '_' | [mod_name()],
-          is_pre_included :: '_' | boolean() | undefined,
-          is_included     :: '_' | boolean() | undefined
+          status = ok       :: '_' | status(),
+          used_by_mods = [] :: '_' | [mod_name()],
+          is_pre_included   :: '_' | boolean() | undefined,
+          is_included       :: '_' | boolean() | undefined
 	}).
 
 -record(app_info,
@@ -177,10 +177,10 @@
           name             :: '_' | app_name(),
           is_escript       :: '_' | boolean() | {inlined, escript_app_name()},
           use_selected_vsn :: '_' | vsn | dir | undefined,
-          active_dir       :: '_' | dir(),
+          active_dir       :: '_' | dir() | undefined,
           sorted_dirs      :: '_' | [dir()],
-          vsn              :: '_' | app_vsn(),
-          label            :: '_' | app_label(),
+          vsn              :: '_' | app_vsn() | undefined,
+          label            :: '_' | app_label() | undefined,
           info             :: '_' | #app_info{} | undefined,
           mods             :: '_' | [#mod{}],
 
@@ -192,21 +192,21 @@
           debug_info            :: '_' | debug_info() | undefined,
           app_file              :: '_' | app_file() | undefined,
           app_type              :: '_' | app_type() | undefined,
-          incl_app_filters      :: '_' | [#regexp{}],
-          excl_app_filters      :: '_' | [#regexp{}],
-          incl_archive_filters  :: '_' | [#regexp{}],
-          excl_archive_filters  :: '_' | [#regexp{}],
-          archive_opts          :: '_' | [archive_opt()],
+          incl_app_filters      :: '_' | [#regexp{}] | undefined,
+          excl_app_filters      :: '_' | [#regexp{}] | undefined,
+          incl_archive_filters  :: '_' | [#regexp{}] | undefined,
+          excl_archive_filters  :: '_' | [#regexp{}] | undefined,
+          archive_opts          :: '_' | [archive_opt()] | undefined,
 
           %% Dynamic
           status          :: '_' | status(),
-          uses_mods       :: '_' | [mod_name()],
-          used_by_mods    :: '_' | [mod_name()],
-          uses_apps       :: '_' | [app_name()],
-          used_by_apps    :: '_' | [app_name()],
+          uses_mods       :: '_' | [mod_name()] | undefined,
+          used_by_mods    :: '_' | [mod_name()] | undefined,
+          uses_apps       :: '_' | [app_name()] | undefined,
+          used_by_apps    :: '_' | [app_name()] | undefined,
           is_pre_included :: '_' | '$2' | boolean() | undefined,
           is_included     :: '_' | '$1' | boolean() | undefined,
-          rels            :: '_' | [rel_name()]
+          rels            :: '_' | [rel_name()] | undefined
 	}).
 
 -record(rel_app,
@@ -237,7 +237,7 @@
           rels     	       :: [#rel{}],
           emu_name 	       :: emu_name(),
           profile  	       :: profile(),
-	  excl_lib             :: excl_lib(),
+	  excl_lib             :: excl_lib() | undefined,
           incl_sys_filters     :: [#regexp{}],
           excl_sys_filters     :: [#regexp{}],
           incl_app_filters     :: [#regexp{}],
diff --git a/lib/reltool/src/reltool_fgraph_win.erl b/lib/reltool/src/reltool_fgraph_win.erl
index 6b58cae187..deab502bfe 100644
--- a/lib/reltool/src/reltool_fgraph_win.erl
+++ b/lib/reltool/src/reltool_fgraph_win.erl
@@ -220,8 +220,8 @@ graph_add_node_unsure(Key, State, G = #graph{ vs = Vs }) ->
 graph_add_node(Key, Color, G = #graph{ vs = Vs}) ->
     Q  = 20.0,   % repulsive force
     M  = 0.5,    % mass
-    P  = {float(450 + random:uniform(100)),
-	  float(450 + random:uniform(100))},
+    P  = {float(450 + rand:uniform(100)),
+	  float(450 + rand:uniform(100))},
     G#graph{ vs = reltool_fgraph:add(Key,
 				     #fg_v{ p = P, m = M, q = Q, color = Color},
 				     Vs)}.
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index 6a487a1ddb..624a3536c0 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -2530,13 +2530,54 @@ latest(App) ->
 rm_missing_app(Apps) ->
     lists:keydelete(?MISSING_APP_NAME,#app.name,Apps).
 
+%% We will compare the script generated by systools with
+%% the script generated by Reltool.
+%%
+%% The systools script may include additional modules in
+%% the first primLoad command (as a pure optimization).
+%% Therefore, we cannot compare the primLoad commands
+%% directly. Instead we will collect all modules from
+%% all primLoad commands in each script. The same
+%% modules must be loaded by both scripts. In addition,
+%% the error_handler module must be included in the
+%% first primLoad in each script.
+
 diff_script(Script, Script) ->
     equal;
 diff_script({script, Rel, Commands1}, {script, Rel, Commands2}) ->
-    diff_cmds(Commands1, Commands2);
+    case diff_cmds(Commands1, Commands2) of
+	equal ->
+	    Loaded = diff_get_prim_load(Commands1),
+	    case diff_get_prim_load(Commands2) of
+		Loaded ->
+		    equal;
+		Other ->
+		    io:format("Only loaded by systools: ~p",
+			      [Loaded--Other]),
+		    io:format("Only loaded by reltool: ~p",
+			      [Other--Loaded]),
+		    ct:fail(different_prim_loads)
+	    end;
+	Error ->
+	    Error
+    end;
 diff_script({script, Rel1, _}, {script, Rel2, _}) ->
     {error, {Rel1, Rel2}}.
 
+diff_cmds([{primLoad, Ms1}=Cmd1 | Commands1],
+	  [{primLoad, Ms2}=Cmd2 | Commands2]) ->
+    case lists:member(error_handler, Ms1) xor
+	lists:member(error_handler, Ms2) of
+	false ->
+	    %% error_handler either present in both or
+	    %% absent in both.
+	    diff_cmds(Commands1, Commands2);
+	true ->
+	    %% error_handler only present in one primLoad.
+	    %% Not OK.
+	    {diff, missing_error_handler,
+	     {expected, Cmd1}, {actual, Cmd2}}
+    end;
 diff_cmds([Cmd | Commands1], [Cmd | Commands2]) ->
     diff_cmds(Commands1, Commands2);
 diff_cmds([Cmd1 | _Commands1], [Cmd2 | _Commands2]) ->
@@ -2544,6 +2585,10 @@ diff_cmds([Cmd1 | _Commands1], [Cmd2 | _Commands2]) ->
 diff_cmds([], []) ->
     equal.
 
+diff_get_prim_load(Cmds) ->
+    L = [Ms || {primLoad, Ms} <- Cmds],
+    lists:sort(lists:flatten(L)).
+
 os_cmd(Cmd) when is_list(Cmd) ->
     %% Call the plain os:cmd with an echo command appended to print command status
     %% io:format("os:cmd(~p).\n", [Cmd]),
diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
index 448b8c62c2..aeacee0655 100644
--- a/lib/runtime_tools/c_src/Makefile.in
+++ b/lib/runtime_tools/c_src/Makefile.in
@@ -102,12 +102,7 @@ endif
 
 _create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
-ifneq ($(findstring ose,$(TARGET)),ose)
 debug opt valgrind: $(SOLIBS) $(OBJDIR) $(LIBDIR) $(NIF_LIB)
-else
-# We do not build this on OSE
-debug opt valgrind:
-endif
 
 DYNTRACE_OBJS = $(before_DTrace_OBJS)
 
@@ -159,10 +154,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
-ifneq ($(findstring ose,$(TARGET)),ose)
 	$(INSTALL_PROGRAM) $(DYNTRACE_OBJS) "$(RELSYSDIR)/priv/obj"
 	$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
-endif
 
 release_docs_spec:
 
diff --git a/lib/runtime_tools/c_src/trace_file_drv.c b/lib/runtime_tools/c_src/trace_file_drv.c
index a63a7d3ad9..8863b0d6ac 100644
--- a/lib/runtime_tools/c_src/trace_file_drv.c
+++ b/lib/runtime_tools/c_src/trace_file_drv.c
@@ -75,12 +75,8 @@
 
 
 #ifdef DEBUG
-#ifndef __WIN32__
-#define ASSERT(X) do {if (!(X)) {erl_exit(1,"%s",#X);} } while(0)
-#else
 #include <assert.h>
 #define ASSERT(X) assert(X)
-#endif
 #else
 #define ASSERT(X)
 #endif
diff --git a/lib/runtime_tools/c_src/trace_ip_drv.c b/lib/runtime_tools/c_src/trace_ip_drv.c
index f7b5ea65cb..5b43f8179e 100644
--- a/lib/runtime_tools/c_src/trace_ip_drv.c
+++ b/lib/runtime_tools/c_src/trace_ip_drv.c
@@ -44,19 +44,8 @@
 #endif
 
 #ifdef DEBUG
-#    ifndef __WIN32__
-         /* erl_exit is not available to dll_drivers on windows. */
-         void erl_exit(int, char *, ...);
-#        define ASSERT(X)                               \
-                    do {				\
-                        if (!(X)) {			\
-                            erl_exit(1,"%s",#X);	\
-                        } 				\
-                    } while(0) 
-#    else 
-#        include <assert.h>
-#        define ASSERT(X) assert(X)
-#    endif
+#    include <assert.h>
+#    define ASSERT(X) assert(X)
 #else 
 #    define ASSERT(X)
 #endif 
diff --git a/lib/runtime_tools/doc/src/Makefile b/lib/runtime_tools/doc/src/Makefile
index 0292333f0a..38725807ae 100644
--- a/lib/runtime_tools/doc/src/Makefile
+++ b/lib/runtime_tools/doc/src/Makefile
@@ -41,7 +41,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = dbg.xml dyntrace.xml erts_alloc_config.xml system_information.xml
+XML_REF3_FILES = dbg.xml dyntrace.xml erts_alloc_config.xml system_information.xml msacc.xml
 XML_REF6_FILES = runtime_tools_app.xml
 
 XML_PART_FILES = part_notes.xml part_notes_history.xml part.xml
diff --git a/lib/runtime_tools/doc/src/msacc.xml b/lib/runtime_tools/doc/src/msacc.xml
new file mode 100644
index 0000000000..129da3d230
--- /dev/null
+++ b/lib/runtime_tools/doc/src/msacc.xml
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2014</year><year>2014</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      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.
+    </legalnotice>
+
+    <title>Microstate Accounting</title>
+    <prepared>Lukas Larsson</prepared>
+    <responsible></responsible>
+    <docno>1</docno>
+    <approved></approved>
+    <checked></checked>
+    <date>14-09-30</date>
+    <rev>A</rev>
+    <file>msacc.xml</file>
+  </header>
+  <module>msacc</module>
+  <modulesummary>Convenience functions for microstate accounting</modulesummary>
+  <description>
+    <p>This module implements some convenience functions for analyzing
+    microstate accounting data. For details about how to use the basic api and
+    what the different states represent see
+    <seealso marker="erts:erlang#statistics_microstate_accounting"><c>
+    erlang:statistics(microstate_accounting)</c></seealso>.</p>
+    <marker id="msacc_print_example"></marker>
+    <p><em>Basic Scenario</em></p>
+    <pre>1> <input>msacc:start(1000).</input>
+ok
+2> <input>msacc:print().</input>
+Average thread real-time    : 1000513 us
+Accumulated system run-time :    2213 us
+Average scheduler run-time  :    1076 us
+
+        Thread      aux check_io emulator       gc    other     port    sleep
+
+Stats per thread:
+     async( 0)    0.00%    0.00%    0.00%    0.00%    0.00%    0.00%  100.00%
+     async( 1)    0.00%    0.00%    0.00%    0.00%    0.00%    0.00%  100.00%
+       aux( 1)    0.00%    0.00%    0.00%    0.00%    0.00%    0.00%   99.99%
+ scheduler( 1)    0.00%    0.03%    0.13%    0.00%    0.01%    0.00%   99.82%
+ scheduler( 2)    0.00%    0.00%    0.00%    0.00%    0.03%    0.00%   99.97%
+
+Stats per type:
+         async    0.00%    0.00%    0.00%    0.00%    0.00%    0.00%  100.00%
+           aux    0.00%    0.00%    0.00%    0.00%    0.00%    0.00%   99.99%
+     scheduler    0.00%    0.02%    0.06%    0.00%    0.02%    0.00%   99.89%
+ok
+</pre>
+    <p>This first command enables microstate accounting for 1000 milliseconds.
+    See <seealso marker="#start-0"><c>start/0</c></seealso>,
+    <seealso marker="#stop-0"><c>stop/0</c></seealso>,
+    <seealso marker="#reset-0"><c>reset/0</c></seealso> and
+    <seealso marker="#start-1"><c>start/1</c></seealso> for more details.
+    The second command prints the statistics gathered during that time.
+    First three general statistics are printed.</p>
+    <taglist>
+      <tag>Average real-time</tag>
+      <item>The average time spent collecting data in the threads.
+      This should be close to the time which data was collected.
+      </item>
+      <tag>System run-time</tag>
+      <item>The total run-time of all threads in the system.
+      This is what you get if you call <c>msacc:stats(total_runtime,Stats).</c>
+      </item>
+      <tag>Average scheduler run-time</tag>
+      <item>The average run-time for the schedulers.
+      This is the average amount of time the schedulers did not sleep.</item>
+    </taglist>
+    <p>Then one column per state is printed with a the percentage of time this
+    thread spent in the state out of it's own real-time. After the thread
+    specific time, the accumulated time for each type of thread is printed in
+    a similar format.</p>
+    <p>Since we have the average real-time and the percentage spent in each
+    state we can easily calculate the time spent in each state by multiplying
+    <c>Average thread real-time</c> with <c>Thread state %</c>, i.e. to
+    get the time Scheduler 1 spent in the emulator state we do
+    <c>1000513us * 0.13% = 1300us</c>.</p>
+  </description>
+  <datatypes>
+    <datatype>
+      <name name="msacc_data"/>
+    </datatype>
+    <datatype>
+      <name name="msacc_data_thread"/>
+    </datatype>
+    <datatype>
+      <name name="msacc_data_counters"/>
+      <desc><p>A map containing the different microstate accounting states and
+      the number of microseconds spent in it.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="msacc_stats"/>
+    </datatype>
+    <datatype>
+      <name name="msacc_stats_thread"/>
+      <desc><p>A map containing information about a specific thread. The
+      percentages in the map can be either run-time or real-time depending
+      on if <c>runtime</c> or <c>realtime</c> was requested from
+      <seealso marker="#stats-2">stats/2</seealso>. <c>system</c> is the
+      percentage of total system time for this specific thread.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="msacc_stats_counters"/>
+      <desc><p>A map containing the different microstate accounting states. Each
+      value in the map contains another map with the percentage of time that
+      this thread has spent in the specific state. Both the percentage of
+      <c>system</c> time and the time for that specific <c>thread</c> is part of
+      the map.</p></desc>
+    </datatype>
+    <datatype>
+      <name name="msacc_type"/>
+    </datatype>
+    <datatype>
+      <name name="msacc_id"/>
+    </datatype>
+    <datatype>
+      <name name="msacc_state"/>
+      <desc><p>The different states that a thread can be in. See
+      <seealso marker="erts:erlang#statistics_microstate_accounting">
+        erlang:statistics(microstate_accounting)</seealso> for details.
+      </p></desc>
+    </datatype>
+    <datatype>
+      <name name="msacc_print_options"/>
+      <desc><p>The different options that can be given to
+      <seealso marker="#print-2"><c>print/2</c></seealso>.
+      </p></desc>
+    </datatype>
+  </datatypes>
+  <funcs>
+    <func>
+      <name name="available" arity="0"/>
+      <fsummary>Check if microstate accounting is available</fsummary>
+      <desc>
+	<p>This function checks whether microstate accounting
+        is available or not.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="start" arity="0"/>
+      <fsummary>Start microstate accounting.</fsummary>
+      <desc>
+        <p>Start microstate accounting. Returns whether it was
+        previously enabled or disabled.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="start" arity="1"/>
+      <fsummary>Start microstate accounting for a time.</fsummary>
+      <desc>
+        <p>Resets all counters and then starts microstate accounting
+        for the given milliseconds.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="stop" arity="0"/>
+      <fsummary>Stop microstate accounting.</fsummary>
+      <desc>
+        <p>Stop microstate accounting.
+        Returns whether is was previously enabled or disabled.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="reset" arity="0"/>
+      <fsummary>Reset microstate accounting counters</fsummary>
+      <desc>
+        <p>Reset microstate accounting counters.
+        Returns whether is was enabled or disabled.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="print" arity="0"/>
+      <fsummary>Print microstate statistics</fsummary>
+      <desc>
+        <p>
+          Prints the current microstate accounting to standard out.
+          Same as
+          <seealso marker="#print-1">
+            <c>msacc:print(msacc:stats(),#{}).</c>
+          </seealso>
+        </p>
+      </desc>
+    </func>
+    <func>
+      <name name="print" arity="1"/>
+      <fsummary>Print microstate statistics</fsummary>
+      <desc>
+        <p>Print the given microstate statistics values to stdout.
+        Same as
+        <seealso marker="#print-1">
+          <c>msacc:print(DataOrStats,#{}).</c>
+        </seealso>
+        </p>
+      </desc>
+    </func>
+    <func>
+      <name name="print" arity="2"/>
+      <fsummary>Print microstate statistics</fsummary>
+      <desc>
+        <p>Print the given microstate statistics values to standard out.
+        With many states this can be quite verbose. See the top of this
+        reference manual for a brief description of what the fields mean.</p>
+        <p>It is possible to print more specific types of statistics by
+        first manipulating the <c>DataOrStats</c> using
+        <seealso marker="#stats-2"><c>stats/2</c></seealso>.
+        For instance if you want to print the percentage of run-time for each
+        thread you can do:</p>
+        <pre><input>msacc:print(msacc:stats(runtime,msacc:stats())).</input></pre>
+        <p>If you want to only print run-time per thread type you can do:</p>
+        <pre><input>msacc:print(msacc:stats(type,msacc:stats(runtime,msacc:stats()))).</input></pre>
+        <p><em>Options</em></p>
+        <taglist>
+          <tag><c>system</c></tag><item>Print percentage of time spent in each
+          state out of system time as well as thread time.
+          Default: false.</item>
+        </taglist>
+      </desc>
+    </func>
+    <func>
+      <name name="print" arity="3"/>
+      <fsummary>Print microstate statistics</fsummary>
+      <desc>
+        <p>Print the given microstate statistics values to the given file
+        or device. The other arguments behave the same way as for
+        <seealso marker="#print-2"><c>print/2</c></seealso>.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="stats" arity="0"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Returns a runtime system independent version of the microstate
+        statistics data presented by
+        <seealso marker="erts:erlang#statistics_microstate_accounting">
+        <c>erlang:statistics(microstate_accounting)</c></seealso>.
+        All counters have been normalized to be in microsecond resolution.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="stats" arity="2" clause_i="1"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Returns the system time for the given microstate statistics values.
+        System time is the accumulated time of all threads.</p>
+        <taglist>
+          <tag><c>realtime</c></tag>
+          <item>Returns all time recorded for all threads.</item>
+          <tag><c>runtime</c></tag>
+          <item>Returns all time spent doing work for all threads, i.e.
+          all time not spent in the <c>sleep</c> state.</item>
+        </taglist>
+      </desc>
+    </func>
+    <func>
+      <name name="stats" arity="2" clause_i="2"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Returns fractions of real-time or run-time spent in the various
+        threads from the given microstate statistics values.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="stats" arity="2" clause_i="3"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Returns a list of microstate statistics values where the values
+        for all threads of the same type has been merged.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="to_file" arity="1"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Dumps the current microstate statistics counters to a file that can
+        be parsed with <seealso marker="kernel:file#consult/1">
+        file:consult/1</seealso>.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="from_file" arity="1"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Read a file dump produced by <seealso marker="#to_file/1">
+        to_file(Filename)</seealso>.</p>
+      </desc>
+    </func>
+  </funcs>
+</erlref>
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index e92f0e02ad..24b589b928 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Runtime_Tools
     application.</p>
 
+<section><title>Runtime_Tools 1.9.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p><c>dbg:trace_client()</c> now uses a read buffer to
+	    speed up reading of trace files.</p>
+          <p>
+	    Own Id: OTP-13279</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Runtime_Tools 1.9.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/runtime_tools/doc/src/ref_man.xml b/lib/runtime_tools/doc/src/ref_man.xml
index ea0c0832a4..8657a07a30 100644
--- a/lib/runtime_tools/doc/src/ref_man.xml
+++ b/lib/runtime_tools/doc/src/ref_man.xml
@@ -36,6 +36,7 @@
   <xi:include href="dbg.xml"/>
   <xi:include href="dyntrace.xml"/>
   <xi:include href="erts_alloc_config.xml"/>
+  <xi:include href="msacc.xml"/>
   <xi:include href="system_information.xml"/>
 </application>
 
diff --git a/lib/runtime_tools/doc/src/specs.xml b/lib/runtime_tools/doc/src/specs.xml
index d4c3c9dfe6..978bd39e55 100644
--- a/lib/runtime_tools/doc/src/specs.xml
+++ b/lib/runtime_tools/doc/src/specs.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <specs xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="../specs/specs_system_information.xml"/>
+  <xi:include href="../specs/specs_msacc.xml"/>
 </specs>
diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
index 99b90f9ec5..3b41184f4e 100644
--- a/lib/runtime_tools/src/Makefile
+++ b/lib/runtime_tools/src/Makefile
@@ -45,7 +45,9 @@ MODULES= \
 	percept_profile \
 	system_information \
 	observer_backend \
-	ttb_autostart
+	ttb_autostart\
+	msacc
+
 HRL_FILES= ../include/observer_backend.hrl
 
 ERL_FILES= $(MODULES:%=%.erl)
diff --git a/lib/runtime_tools/src/dbg.erl b/lib/runtime_tools/src/dbg.erl
index d2a7d734c1..6eea1a0917 100644
--- a/lib/runtime_tools/src/dbg.erl
+++ b/lib/runtime_tools/src/dbg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -1269,13 +1269,15 @@ gen_reader(follow_file, Filename) ->
 
 %% Opens a file and returns a reader (lazy list).
 gen_reader_file(ReadFun, Filename) ->
-    case file:open(Filename, [read, raw, binary]) of
+    case file:open(Filename, [read, raw, binary, read_ahead]) of
 	{ok, File} ->
 	    mk_reader(ReadFun, File);
 	Error ->
 	    exit({client_cannot_open, Error})
     end.
 
+-dialyzer({no_improper_lists, mk_reader/2}).
+
 %% Creates and returns a reader (lazy list).
 mk_reader(ReadFun, Source) ->
     fun() ->
@@ -1294,13 +1296,15 @@ mk_reader(ReadFun, Source) ->
 mk_reader_wrap([]) ->
     [];
 mk_reader_wrap([Hd | _] = WrapFiles) ->
-    case file:open(wrap_name(Hd), [read, raw, binary]) of
+    case file:open(wrap_name(Hd), [read, raw, binary, read_ahead]) of
 	{ok, File} ->
 	    mk_reader_wrap(WrapFiles, File);
 	Error ->
 	    exit({client_cannot_open, Error})
     end.
 
+-dialyzer({no_improper_lists, mk_reader_wrap/2}).
+
 mk_reader_wrap([_Hd | Tail] = WrapFiles, File) ->
     fun() ->
 	    case read_term(fun file_read/2, File) of
diff --git a/lib/runtime_tools/src/msacc.erl b/lib/runtime_tools/src/msacc.erl
new file mode 100644
index 0000000000..612effa5aa
--- /dev/null
+++ b/lib/runtime_tools/src/msacc.erl
@@ -0,0 +1,355 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014-2015. 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%
+%%
+
+%%
+%% @doc Microstate accounting utility function
+%%
+%%	This module provides a user interface for analysing
+%%      erlang:statistics(microstate_accounting) data.
+%%
+
+-module(msacc).
+-export([available/0, start/0, start/1, stop/0, reset/0, to_file/1,
+         from_file/1, stats/0, stats/2, print/0, print/1, print/2,
+         print/3]).
+
+-type msacc_data() :: [msacc_data_thread()].
+
+-type msacc_data_thread() :: #{ '$type' => msacc_data,
+                                type => msacc_type(), id => msacc_id(),
+                                counters => msacc_data_counters() }.
+-type msacc_data_counters() :: #{ msacc_state() => non_neg_integer()}.
+
+-type msacc_stats() :: [msacc_stats_thread()].
+-type msacc_stats_thread() :: #{ '$type' => msacc_stats,
+                                 type => msacc_type(), id => msacc_id(),
+                                 system => float(),
+                                 counters => msacc_stats_counters()}.
+-type msacc_stats_counters() :: #{ msacc_state() => #{ thread => float(),
+                                                       system => float()}}.
+
+
+-type msacc_type() :: scheduler | aux | async.
+-type msacc_id() :: non_neg_integer().
+-type msacc_state() :: alloc | aux | bif | busy_wait | check_io |
+                       emulator | ets | gc | gc_fullsweep | nif |
+                       other | port | send | sleep | timers.
+
+-type msacc_print_options() :: #{ system => boolean() }.
+
+-spec available() -> boolean().
+available() ->
+    try
+        [_|_] = erlang:statistics(microstate_accounting),
+        true
+    catch _:_ ->
+            false
+    end.
+
+-spec start() -> boolean().
+start() ->
+    erlang:system_flag(microstate_accounting, true).
+
+-spec stop() -> boolean().
+stop() ->
+    erlang:system_flag(microstate_accounting, false).
+
+-spec reset() -> boolean().
+reset() ->
+    erlang:system_flag(microstate_accounting, reset).
+
+-spec start(Time) -> true when
+      Time :: timeout().
+start(Tmo) ->
+    stop(), reset(), start(),
+    timer:sleep(Tmo),
+    stop().
+
+-spec to_file(Filename) -> ok | {error, file:posix()} when
+      Filename :: file:name_all().
+to_file(Filename) ->
+    file:write_file(Filename, io_lib:format("~p.~n",[stats()])).
+
+-spec from_file(Filename) -> msacc_data() when
+      Filename :: file:name_all().
+from_file(Filename) ->
+    {ok, [Stats]} = file:consult(Filename),
+    Stats.
+
+-spec print() -> ok.
+print() ->
+    print(stats()).
+
+-spec print(DataOrStats) -> ok when
+      DataOrStats :: msacc_data() | msacc_stats().
+print(Stats) ->
+    print(Stats, #{}).
+
+-spec print(DataOrStats, Options) -> ok when
+      DataOrStats :: msacc_data() | msacc_stats(),
+      Options :: msacc_print_options().
+print(Stats, Options) ->
+    print(group_leader(), Stats, Options).
+
+-spec print(FileOrDevice, DataOrStats, Options) -> ok when
+      FileOrDevice :: file:filename() | io:device(),
+      DataOrStats :: msacc_data() | msacc_stats(),
+      Options :: msacc_print_options().
+print(Filename, Stats, Options) when is_list(Filename) ->
+    case file:open(Filename,[write]) of
+        {ok, D} -> print(D, Stats, Options),file:close(D);
+        Error -> Error
+    end;
+print(Device, Stats, Options) ->
+    DefaultOpts = #{ system => false },
+    print_int(Device, Stats, maps:merge(DefaultOpts, Options)).
+print_int(Device, [#{ '$type' := msacc_data, id := _Id }|_] = Stats, Options) ->
+    TypeStats = stats(type, Stats),
+    io:format(Device, "~s", [print_stats_overview(Stats, Options)]),
+    io:format(Device, "~s", [print_stats_header(Stats, Options)]),
+    io:format(Device, "~s", [print_stats_threads(
+                               stats(realtime, Stats), Options)]),
+    io:format(Device, "~s", [print_stats_type(
+                               stats(realtime, TypeStats), Options)]);
+print_int(Device, [#{ '$type' := msacc_data }|_] = Stats, Options) ->
+    io:format(Device, "~s", [print_stats_header(Stats, Options)]),
+    io:format(Device, "~s", [print_stats_type(
+                               stats(realtime, Stats), Options)]);
+print_int(Device, [#{ '$type' := msacc_stats, id := _Id }|_] = Stats,Options) ->
+    io:format(Device, "~s", [print_stats_header(Stats, Options)]),
+    io:format(Device, "~s", [print_stats_threads(Stats, Options)]),
+    io:format(Device, "~s", [print_stats_type(
+                               msacc:stats(type, Stats), Options)]);
+print_int(Device, [#{ '$type' := msacc_stats }|_] = Stats, Options) ->
+    io:format(Device, "~s", [print_stats_header(Stats, Options)]),
+    io:format(Device, "~s", [print_stats_type(Stats, Options)]).
+
+
+-spec stats() -> msacc_data().
+stats() ->
+    Fun = fun F(K,{PerfCount,StateCount}) ->
+                %% Need to handle ERTS_MSACC_STATE_COUNTERS
+                {F(K,PerfCount),StateCount};
+              F(_K,PerfCount) ->
+                erlang:convert_time_unit(PerfCount, perf_counter, 1000000)
+        end,
+    UsStats = lists:map(
+                fun(#{ counters := Cnt } = M) ->
+                        UsCnt = maps:map(Fun,Cnt),
+                        M#{ '$type' => msacc_data, counters := UsCnt }
+                end, erlang:statistics(microstate_accounting)),
+    statssort(UsStats).
+
+-spec stats(Analysis, Stats) -> non_neg_integer() when
+      Analysis :: system_realtime | system_runtime,
+      Stats :: msacc_data();
+           (Analysis, Stats) -> msacc_stats() when
+      Analysis :: realtime | runtime,
+      Stats :: msacc_data();
+           (Analysis, StatsOrData) -> msacc_data() | msacc_stats() when
+      Analysis :: type,
+      StatsOrData :: msacc_data() | msacc_stats().
+stats(system_realtime, Stats) ->
+    lists:foldl(fun(#{ counters := Cnt }, Acc) ->
+                        get_total(Cnt, Acc)
+                end, 0, Stats);
+stats(system_runtime, Stats) ->
+    lists:foldl(fun(#{ counters := Cnt }, Acc) ->
+                        get_total(maps:remove(sleep, Cnt), Acc)
+                end, 0, Stats);
+stats(realtime, Stats) ->
+    RealTime = stats(system_realtime, Stats),
+    statssort([get_thread_perc(Thread, RealTime) || Thread <- Stats]);
+stats(runtime, Stats) ->
+    RunTime = stats(system_runtime, Stats),
+    statssort([get_thread_perc(T#{ counters := maps:remove(sleep,Cnt)}, RunTime)
+                               || T = #{ counters := Cnt } <- Stats]);
+stats(type, Stats) ->
+    statssort(merge_threads(Stats, [])).
+
+print_stats_overview(Stats, _Options) ->
+    RunTime = stats(system_runtime, Stats),
+    RealTime = stats(system_realtime, Stats) div length(Stats),
+    SchedStats = [S || #{ type := scheduler } = S <- Stats],
+    AvgSchedRunTime = stats(system_runtime, SchedStats) div length(SchedStats),
+    NumSize = if
+                  RealTime > RunTime -> length(integer_to_list(RealTime));
+                  true -> length(integer_to_list(RunTime))
+              end,
+    [io_lib:format("Average thread real-time    : ~*B us~n",
+                   [NumSize, RealTime]),
+     io_lib:format("Accumulated system run-time : ~*B us~n",
+                   [NumSize, RunTime]),
+     io_lib:format("Average scheduler run-time  : ~*B us~n",
+                   [NumSize, AvgSchedRunTime]),
+     io_lib:format("~n",[])].
+
+print_stats_threads(Stats, Options) ->
+    [io_lib:format("~nStats per thread:~n", []),
+     [print_thread_info(Thread, Options) || Thread <- Stats]].
+
+print_stats_type(Stats, Options) ->
+    [io_lib:format("~nStats per type:~n", []),
+     [print_thread_info(Thread, Options) || Thread <- Stats]].
+
+
+print_stats_header([#{ counters := Cnt }|_], #{ system := PrintSys }) ->
+    [io_lib:format("~14s", ["Thread"]),
+     map(fun(Counter, _) when PrintSys->
+                 io_lib:format("~9s     ", [atom_to_list(Counter)]);
+            (Counter, _) ->
+                 io_lib:format("~9s", [atom_to_list(Counter)])
+         end, Cnt),
+     io_lib:format("~n",[])].
+
+print_thread_info(#{ '$type' := msacc_stats,
+                     counters := Cnt } = Thread, #{ system := PrintSys }) ->
+    [case maps:find(id, Thread) of
+        error ->
+            io_lib:format("~14s", [atom_to_list(maps:get(type, Thread))]);
+        {ok, Id} ->
+            io_lib:format("~10s(~2B)", [atom_to_list(maps:get(type,Thread)),Id])
+    end,
+    map(fun(_Key, #{ thread := ThreadPerc, system := SystemPerc }) when PrintSys ->
+                io_lib:format("~6.2f%(~4.1f%)", [ThreadPerc, SystemPerc]);
+           (_Key, #{ thread := ThreadPerc }) ->
+                io_lib:format("~8.2f%", [ThreadPerc])
+             end, Cnt),
+    io_lib:format("~n",[])].
+
+get_total(Cnt, Base) ->
+    maps:fold(fun(_, {Val,_}, Time) ->
+                      %% Have to handle ERTS_MSACC_STATE_COUNTERS
+                      Time + Val;
+                 (_, Val, Time) -> Time + Val
+              end, Base, Cnt).
+
+get_thread_perc(#{ '$type' := msacc_data, counters := Cnt } = Thread,
+                SystemTime) ->
+    ThreadTime = get_total(Cnt, 0),
+    Thread#{ '$type' := msacc_stats,
+             system => percentage(ThreadTime,SystemTime),
+             counters => get_thread_perc(Cnt, ThreadTime, SystemTime)}.
+get_thread_perc(Cnt, ThreadTime, SystemTime) ->
+    maps:map(fun F(Key, {Val, C}) ->
+                    M = F(Key, Val),
+                    M#{ cnt => C };
+                 F(_Key, Val) ->
+                    #{ thread => percentage(Val, ThreadTime),
+                       system => percentage(Val, SystemTime) }
+            end, Cnt).
+
+%% This code is a little bit messy as it has to be able to deal with
+%% both [msacc_data()] and [msacc_stats()].
+merge_threads([#{ '$type' := msacc_stats,
+                  type := Type,
+                  counters := Cnt } = M0|R], Acc) ->
+    case keyfind(type, Type, Acc) of
+        false ->
+            merge_threads(R, [maps:remove(id,M0#{ threads => 1 })|Acc]);
+        #{ '$type' := msacc_stats, counters := Cnt0,
+           threads := Threads, system := System } = M ->
+            NewMap = M#{ counters := add_counters(Cnt, Cnt0),
+                         system := System + maps:get(system, M0),
+                         threads := Threads + 1},
+            NewAcc = keyreplace(type, Type, NewMap, Acc),
+            merge_threads(R, NewAcc)
+    end;
+merge_threads([], [#{ '$type' := msacc_stats,
+                      system := System,
+                      threads := Threads,
+                      counters := Cnt} = M0|R]) ->
+    Counters = maps:map(fun(_,#{ thread := Thr } = Map) ->
+                                Map#{ thread := Thr / Threads }
+                        end, Cnt),
+    M = maps:remove(threads, M0),
+    [M#{ system := System, counters := Counters} | merge_threads([],R)];
+merge_threads([], []) ->
+    [];
+%% The clauses below deal with msacc_data()
+merge_threads([#{ '$type' := msacc_data,
+                  type := Type,
+                  counters := Cnt } = M0|R], Acc) ->
+    case keyfind(type, Type, Acc) of
+        false ->
+            merge_threads(R, [maps:remove(id,M0)|Acc]);
+        #{ '$type' := msacc_data, counters := Cnt0 } = M ->
+            NewMap = M#{ counters := add_counters(Cnt, Cnt0) },
+            NewAcc = keyreplace(type, Type, NewMap, Acc),
+            merge_threads(R, NewAcc)
+    end;
+merge_threads([], Acc) ->
+    Acc.
+
+add_counters(M1, M2) ->
+    maps:map(
+      fun(Key, #{ thread := Thr1, system := Sys1, cnt := Cnt1}) ->
+              %% Have to handle ERTS_MSACC_STATE_COUNTERS
+              #{ thread := Thr2, system := Sys2, cnt := Cnt2} = maps:get(Key, M2),
+              #{ thread => Thr1 + Thr2, system => Sys1 + Sys2,
+                 cnt => Cnt1 + Cnt2 };
+         (Key, #{ thread := Thr1, system := Sys1}) ->
+              #{ thread := Thr2, system := Sys2} = maps:get(Key, M2),
+              #{ thread => Thr1 + Thr2, system => Sys1 + Sys2};
+         (Key, {V1,C1}) ->
+              %% Have to handle ERTS_MSACC_STATE_COUNTERS
+              {V2,C2} = maps:get(Key, M2),{V1+V2,C1+C2};
+         (Key, V1) -> maps:get(Key, M2) + V1
+      end, M1).
+
+percentage(Divident, Divisor) ->
+    if Divisor == 0 andalso Divident /= 0 ->
+            100.0;
+        Divisor == 0 ->
+            0.0;
+       true ->
+            Divident / Divisor * 100
+    end.
+
+keyfind(Key, Value, [H|T]) ->
+    case maps:find(Key, H) of
+        {ok, Value} ->
+            H;
+        _ ->
+            keyfind(Key, Value, T)
+    end;
+keyfind(_, _, []) ->
+    false.
+
+keyreplace(Key, Value, NewMap, [H|T]) ->
+    case maps:find(Key, H) of
+        {ok, Value} ->
+            [NewMap|T];
+        _ ->
+            [H|keyreplace(Key, Value, NewMap, T)]
+    end;
+keyreplace(_, _, _, []) ->
+    [].
+
+statssort(Stats) ->
+    lists:sort(fun(#{ type := Type1, id := Id1},
+                   #{ type := Type2, id := Id2}) ->
+                       {Type1, Id1} < {Type2, Id2};
+                  (#{ type := Type1}, #{ type := Type2}) ->
+                       Type1 < Type2
+               end, Stats).
+
+map(Fun,Map) ->
+    [ Fun(K,V) || {K,V} <- maps:to_list(Map) ].
diff --git a/lib/runtime_tools/src/runtime_tools.app.src b/lib/runtime_tools/src/runtime_tools.app.src
index ad10655aa0..aeda103e72 100644
--- a/lib/runtime_tools/src/runtime_tools.app.src
+++ b/lib/runtime_tools/src/runtime_tools.app.src
@@ -22,7 +22,8 @@
     {vsn,          "%VSN%"},
     {modules,      [appmon_info, dbg,observer_backend,percept_profile,
 		    runtime_tools,runtime_tools_sup,erts_alloc_config,
-		    ttb_autostart,dyntrace,system_information]},
+		    ttb_autostart,dyntrace,system_information,
+                    msacc]},
     {registered,   [runtime_tools_sup]},
     {applications, [kernel, stdlib]},
     {env,          []},
diff --git a/lib/runtime_tools/test/Makefile b/lib/runtime_tools/test/Makefile
index dcb9082231..432a361468 100644
--- a/lib/runtime_tools/test/Makefile
+++ b/lib/runtime_tools/test/Makefile
@@ -7,7 +7,8 @@ MODULES =  \
 	runtime_tools_SUITE \
 	system_information_SUITE \
 	dbg_SUITE \
-	erts_alloc_config_SUITE
+	erts_alloc_config_SUITE \
+	msacc_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -26,7 +27,7 @@ RELSYSDIR = $(RELEASE_PATH)/runtime_tools_test
 # ----------------------------------------------------
 
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
diff --git a/lib/runtime_tools/test/dbg_SUITE.erl b/lib/runtime_tools/test/dbg_SUITE.erl
index 11dd753eed..fd9b8f23bd 100644
--- a/lib/runtime_tools/test/dbg_SUITE.erl
+++ b/lib/runtime_tools/test/dbg_SUITE.erl
@@ -31,7 +31,7 @@
 -export([tracee1/1, tracee2/1]).
 -export([dummy/0, exported/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(default_timeout, ?t:minutes(1)).
 
 init_per_testcase(_Case, Config) ->
diff --git a/lib/runtime_tools/test/dyntrace_SUITE.erl b/lib/runtime_tools/test/dyntrace_SUITE.erl
index 03242784dd..6d39bc54f4 100644
--- a/lib/runtime_tools/test/dyntrace_SUITE.erl
+++ b/lib/runtime_tools/test/dyntrace_SUITE.erl
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 %%
 -module(dyntrace_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
 	 init_per_group/2,end_per_group/2]).
diff --git a/lib/runtime_tools/test/erts_alloc_config_SUITE.erl b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
index 9c0a643e91..a5c4801af9 100644
--- a/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
+++ b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
@@ -22,7 +22,7 @@
 
 %-define(line_trace, 1).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %-compile(export_all).
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
diff --git a/lib/runtime_tools/test/msacc_SUITE.erl b/lib/runtime_tools/test/msacc_SUITE.erl
new file mode 100644
index 0000000000..145a6d07fb
--- /dev/null
+++ b/lib/runtime_tools/test/msacc_SUITE.erl
@@ -0,0 +1,132 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014-2015. 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%
+%%
+-module(msacc_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+
+%% Test server callbacks
+-export([suite/0, all/0]).
+
+%% Test cases
+-export([
+	%% API-test
+	api_file/1,
+        api_start_stop/1,
+	api_timer/1,
+        api_print/1
+    ]).
+
+%%--------------------------------------------------------------------
+%% COMMON TEST CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+all() ->
+    [
+     api_start_stop,
+     api_file,
+     api_timer,
+     api_print
+    ].
+
+suite() -> [
+	{timetrap,{minutes,1}},
+	{ct_hooks,[ts_install_cth]}
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+api_timer(_Config) ->
+
+    %% Run msacc for about 100ms
+    msacc:start(100),
+
+    %% Verify that scheduler 1 executed+slept for about 100ms
+    [Sched1] = [S || S = #{ type := scheduler, id := 1 } <- msacc:stats()],
+
+    #{ counters := Cnt } = Sched1,
+
+    %% Time should be in us
+    Time = maps:fold(fun(_,V,Acc) -> V + Acc end, 0, Cnt),
+
+    if Time < 120000 andalso Time > 80000 -> ok;
+       true -> ct:fail({inaccurate_time, Time, msacc:stats()})
+    end.
+
+%% We just do a basic check that none of the apis crash
+api_start_stop(_Config) ->
+    msacc:start(),
+    timer:sleep(100),
+    msacc:stop(),
+    Runtime = msacc:stats(system_runtime, msacc:stats()),
+    Realtime = msacc:stats(system_realtime, msacc:stats()),
+    true = Runtime < Realtime,
+
+    RuntimeCnt = msacc:stats(runtime, msacc:stats()),
+    RealtimeCnt = msacc:stats(realtime, msacc:stats()),
+    TypeCnt = msacc:stats(type, msacc:stats()),
+
+    %% These should be very similar
+    RuntimeTypeCnt = msacc:stats(type, RuntimeCnt),
+    TypeRuntimeCnt = msacc:stats(runtime, TypeCnt),
+    lists:map(fun({#{ system := T1 },#{ system := T2}}) ->
+                      if T1-0.5 < T2 orelse T1+0.5 > T2 -> ok;
+                         true -> ct:fail({inaccurate_stats, RuntimeTypeCnt,
+                                          TypeRuntimeCnt})
+                      end
+              end, lists:zip(RuntimeTypeCnt, TypeRuntimeCnt)),
+
+    %% These should be very similar
+    RealtimeTypeCnt = msacc:stats(type, RealtimeCnt),
+    TypeRealtimeCnt = msacc:stats(realtime, TypeCnt),
+    lists:map(fun({#{ system := T1 },#{ system := T2}}) ->
+                      if T1-0.5 < T2 orelse T1+0.5 > T2 -> ok;
+                         true -> ct:fail({inaccurate_stats, RealtimeTypeCnt,
+                                          TypeRealtimeCnt})
+                      end
+              end,lists:zip(RealtimeTypeCnt, TypeRealtimeCnt)),
+
+    msacc:reset().
+
+api_file(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    File = filename:join(PrivDir, "msacc.stats"),
+    Stats = msacc:stats(),
+    ok = msacc:to_file(File),
+    Stats = msacc:from_file(File),
+
+    PrintFile = filename:join(PrivDir, "msacc.txt"),
+    msacc:print(PrintFile, Stats, #{}).
+
+%% We just check that it is possible to print in a couple of different ways
+api_print(_Config) ->
+    msacc:start(100),
+    io:format("msacc:print(msacc:stats()).~n"),
+    msacc:print(msacc:stats()),
+    io:format("msacc:print(msacc:stats(),#{ system => true }).~n"),
+    msacc:print(msacc:stats(), #{ system => true }),
+    io:format("msacc:print(msacc:stats(runtime,msacc:stats())).~n"),
+    msacc:print(msacc:stats(runtime, msacc:stats())),
+    io:format("msacc:print(msacc:stats(type,msacc:stats())).~n"),
+    msacc:print(msacc:stats(type, msacc:stats())),
+    io:format("msacc:print(msacc:stats(realtime,msacc:stats())).~n"),
+    msacc:print(msacc:stats(realtime, msacc:stats())),
+    io:format("msacc:stats(type,msacc:stats(runtime,msacc:stats())).~n"),
+    msacc:print(msacc:stats(type, msacc:stats(runtime, msacc:stats()))).
diff --git a/lib/runtime_tools/test/runtime_tools_SUITE.erl b/lib/runtime_tools/test/runtime_tools_SUITE.erl
index 7599026e7e..2a79f0a8f9 100644
--- a/lib/runtime_tools/test/runtime_tools_SUITE.erl
+++ b/lib/runtime_tools/test/runtime_tools_SUITE.erl
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 %%
 -module(runtime_tools_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index 3dd7df9f2e..bfc8b84b91 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.9.2
+RUNTIME_TOOLS_VSN = 1.9.3
diff --git a/lib/sasl/doc/src/Makefile b/lib/sasl/doc/src/Makefile
index 1ee48af338..a66b1f8bcb 100644
--- a/lib/sasl/doc/src/Makefile
+++ b/lib/sasl/doc/src/Makefile
@@ -36,7 +36,6 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # ----------------------------------------------------
 XML_APPLICATION_FILES = ref_man.xml
 XML_REF3_FILES = alarm_handler.xml \
-	overload.xml \
 	rb.xml \
 	release_handler.xml \
 	systools.xml
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index 537511a865..da5bc6be96 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -31,6 +31,48 @@
   </header>
   <p>This document describes the changes made to the SASL application.</p>
 
+<section><title>SASL 2.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    During upgrade, the release_handler collects a list of
+	    supervisor pids in order to list all processes in the
+	    supervisor tree. If one of the supervisors (legitimately)
+	    exits before release_handler can examine it, then
+	    <c>sys:get_status/1</c> would earlier be called with a
+	    dead pid, causing a <c>'noproc'</c> error. This has been
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-13291</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The module <c>overload</c> is deprecated and will be
+	    removed in OTP 19.</p>
+          <p>
+	    Own Id: OTP-13057</p>
+        </item>
+        <item>
+          <p>
+	    Improve implementation of supervisor child count, making
+	    it faster and more accurate for dynamic processes of a
+	    <c>simple_one_for_one</c> supervisor.</p>
+          <p>
+	    Own Id: OTP-13290</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SASL 2.6.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/sasl/doc/src/overload.xml b/lib/sasl/doc/src/overload.xml
deleted file mode 100644
index 5c3d00afeb..0000000000
--- a/lib/sasl/doc/src/overload.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1996</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>overload</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <responsible>Peter H&ouml;gfeldt</responsible>
-    <docno></docno>
-    <approved>(Joe Armstrong)</approved>
-    <checked></checked>
-    <date>1996-10-29</date>
-    <rev>A</rev>
-    <file>overload.sgml</file>
-  </header>
-  <module>overload</module>
-  <modulesummary>An Overload Regulation Process</modulesummary>
-  <description>
-    <p><c>overload</c> is a process that indirectly regulates the CPU
-      usage in the system. The idea is that a main application calls
-      function 
-      <seealso marker="#request/0"><c>request/0</c></seealso> 
-      before starting a major job and
-      proceeds with the job if the return value is positive; otherwise
-      the job must not be started.</p>
-    <p><c>overload</c> is part of the <c>SASL</c> application and all
-      configuration parameters are defined there.</p>
-    <p>A set of two intensities are maintained, the <c>total intensity</c>
-      and the <c>accept intensity</c>. For that purpose,
-      there are two configuration parameters, <c>MaxIntensity</c>
-      and <c>Weight</c>; both are measured in 1/second.</p>
-    <p>Then total and accept intensities are calculated as
-      follows. Assume that the time of the current call to
-      <c>request/0</c> is <c>T(n)</c> and that the time of the
-      previous call was <c>T(n-1)</c>.</p>
-    <list type="bulleted">
-      <item>
-        <p>The current <c>total intensity</c>, denoted
-          <c>TI(n)</c>, is calculated according to the formula</p>
-        <p><c>TI(n) = exp(-Weight*(T(n) - T(n-1)) * TI(n-1) +  Weight</c>,</p>
-        <p>where <c>TI(n-1)</c> is the previous <c>total intensity</c>.</p>
-      </item>
-      <item>
-        <p>The current <c>accept intensity</c>, denoted
-          <c>AI(n)</c>, is determined by the formula</p>
-        <p><c>AI(n) = exp(-Weight*(T(n) - T(n-1)) * AI(n-1) + Weight</c>,</p>
-        <p>where <c>AI(n-1)</c> is the previous <c>accept intensity</c>,
-          if the value of <c>exp(-Weight*(T(n) - T(n-1)) * AI(n-1)</c>
-          is less than <c>MaxIntensity</c>. Otherwise the value is</p>
-        <p><c>AI(n) = exp(-Weight*(T(n) - T(n-1)) * AI(n-1)</c></p>
-      </item>
-    </list>
-    <p>The value of configuration parameter <c>Weight</c> controls the
-      speed with which the calculations of intensities react to
-      changes in the underlying input intensity. The inverted value of
-      <c>Weight</c>, <c>T = 1/Weight</c>, can be thought of as the
-      "time constant" of the intensity calculation formulas. For example,
-      if <c>Weight = 0.1</c>, a change in the underlying input intensity is
-      reflected in <c>total intensity</c> and <c>accept intensity</c> within
-      about 10 seconds.</p>
-    <p>The overload process defines one alarm, which it sets using
-      <c>alarm_handler:set_alarm(Alarm)</c>. <c>Alarm</c> is defined
-      as follows:</p>
-    <taglist>
-      <tag><c>{overload, []}</c></tag>
-      <item>
-        <p>This alarm is set when the current <c>accept intensity</c> exceeds
-          <c>MaxIntensity</c>.</p>
-      </item>
-    </taglist>
-    <p>A new request is not accepted until the current <c>accept
-      intensity</c> has fallen below <c>MaxIntensity</c>. To prevent the
-      overload process from generating many set/reset alarms, the
-      alarm is not reset until the current <c>accept intensity</c> has fallen
-      below 75% of <c>MaxIntensity</c>; it is not until then that
-      the alarm can be set again.</p>
-  </description>
-
-  <funcs>
-    <func>
-      <name>request() -> accept | reject</name>
-      <fsummary>Requests to proceed with current job.</fsummary>
-      <desc>
-        <p>Returns <c>accept</c> or <c>reject</c> depending on the
-          current value of the <c>accept intensity</c>.</p>
-        <p>The application
-          calling this function is to proceed with the job in
-          question if the return value is <c>accept</c>; otherwise it
-          is not to continue with that job.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>get_overload_info() -> OverloadInfo</name>
-      <fsummary>Returns current overload information data.</fsummary>
-      <type>
-        <v>OverloadInfo = [{total_intensity, TotalIntensity},
-          {accept_intensity, AcceptIntensity}, {max_intensity,
-          MaxIntensity}, {weight, Weight}, {total_requests,
-          TotalRequests}, {accepted_requests, AcceptedRequests}].</v>
-        <v>TotalIntensity = float() > 0</v>
-        <v>AcceptIntensity = float() > 0</v>
-        <v>MaxIntensity = float() > 0</v>
-        <v>Weight = float() > 0</v>
-        <v>TotalRequests = integer()</v>
-        <v>AcceptedRequests = integer()</v>
-      </type>
-      <desc>
-        <p>Returns:</p>
-        <list type="bulleted">
-          <item>Current total and accept intensities</item>
-          <item>Configuration parameters</item>
-          <item>Absolute counts of the total number of requests</item>
-          <item>Accepted number of requests (since the overload
-            process was started)</item>
-        </list>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>See Also</title>
-    <p><seealso marker="alarm_handler"><c>alarm_handler(3)</c></seealso>,
-      <seealso marker="sasl_app"><c>sasl(6)</c></seealso></p>
-  </section>
-</erlref>
-
diff --git a/lib/sasl/doc/src/ref_man.xml b/lib/sasl/doc/src/ref_man.xml
index a80e5a2a00..74cd92a9b0 100644
--- a/lib/sasl/doc/src/ref_man.xml
+++ b/lib/sasl/doc/src/ref_man.xml
@@ -35,7 +35,6 @@
   </description>
   <xi:include href="sasl_app.xml"/>
   <xi:include href="alarm_handler.xml"/>
-  <xi:include href="overload.xml"/>
   <xi:include href="rb.xml"/>
   <xi:include href="release_handler.xml"/>
   <xi:include href="systools.xml"/>
diff --git a/lib/sasl/doc/src/sasl_app.xml b/lib/sasl/doc/src/sasl_app.xml
index 8d79251c7e..044c016302 100644
--- a/lib/sasl/doc/src/sasl_app.xml
+++ b/lib/sasl/doc/src/sasl_app.xml
@@ -34,7 +34,6 @@
     <p>The <c>SASL</c> application provides the following services:</p>
     <list type="bulleted">
       <item><c>alarm_handler</c></item>
-      <item><c>overload</c></item>
       <item><c>rb</c></item>
       <item><c>release_handler</c></item>
       <item><c>systools</c></item>
@@ -140,17 +139,6 @@
           this parameter is undefined, the <c>log_mf_h</c> handler is
           not installed.</p>
       </item>
-      <tag><c><![CDATA[overload_max_intensity = float() > 0 ]]></c></tag>
-      <item>
-        <p>Specifies the maximum intensity
-          for <seealso marker="overload"><c>overload</c></seealso>. Default
-          is <c>0.8</c>.</p>
-      </item>
-      <tag><c><![CDATA[overload_weight = float() > 0 ]]></c></tag>
-      <item>
-        <p>Specifies the <seealso marker="overload"><c>overload</c></seealso>
-        weight. Default is <c>0.1</c>.</p>
-      </item>
       <tag><c><![CDATA[start_prg = string() ]]></c></tag>
       <item>
         <p>Specifies the program to be used when restarting the system
@@ -201,7 +189,6 @@
     <p><seealso marker="alarm_handler"><c>alarm_handler(3)</c></seealso>,
       <seealso marker="kernel:error_logger"><c>error_logger(3)</c></seealso>,
       <seealso marker="stdlib:log_mf_h"><c>log_mf_h(3)</c></seealso>,
-      <seealso marker="overload"><c>overload(3)</c></seealso>,
       <seealso marker="rb"><c>rb(3)</c></seealso>,
       <seealso marker="release_handler"><c>release_handler(3)</c></seealso>,
       <seealso marker="systools"><c>systools(3)</c></seealso></p>
diff --git a/lib/sasl/doc/src/sasl_intro.xml b/lib/sasl/doc/src/sasl_intro.xml
index bbc9457103..237580977c 100644
--- a/lib/sasl/doc/src/sasl_intro.xml
+++ b/lib/sasl/doc/src/sasl_intro.xml
@@ -36,7 +36,6 @@
     <list type="bulleted">
       <item>Error logging</item>
       <item>Alarm handling</item>
-      <item>Overload regulation</item>
       <item>Release handling</item>
       <item>Report browsing</item>
     </list>
diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
index 7ff6a03a50..92d4818f2e 100644
--- a/lib/sasl/src/Makefile
+++ b/lib/sasl/src/Makefile
@@ -36,7 +36,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/sasl-$(VSN)
 # ----------------------------------------------------
 MODULES= alarm_handler sasl sasl_report \
 	sasl_report_file_h sasl_report_tty_h format_lib_supp \
-	misc_supp overload rb rb_format_supp release_handler \
+	misc_supp rb rb_format_supp release_handler \
 	release_handler_1 si si_sasl_supp systools \
 	systools_make systools_rc systools_relup systools_lib \
 	erlsrv
diff --git a/lib/sasl/src/misc_supp.erl b/lib/sasl/src/misc_supp.erl
index 42de7eedec..39656f6e65 100644
--- a/lib/sasl/src/misc_supp.erl
+++ b/lib/sasl/src/misc_supp.erl
@@ -27,7 +27,7 @@
 %%% 2) Very generic functions such as, multi_map, is_string...
 %%%
 %%% This module is a part of the BOS.  (format_pdict is called from
-%%% init, memsup, disksup, overload (but not the fileserver since it
+%%% init, memsup, disksup (but not the fileserver since it
 %%% formats its pdict its own way).)
 %%%---------------------------------------------------------------------
 
diff --git a/lib/sasl/src/overload.erl b/lib/sasl/src/overload.erl
deleted file mode 100644
index 61b925d219..0000000000
--- a/lib/sasl/src/overload.erl
+++ /dev/null
@@ -1,231 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1996-2013. 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%
-%%
--module(overload). 
-
--export([start_link/0, request/0, set_config_data/2,
-	 get_overload_info/0]).
-
--export([init/1, handle_call/3, handle_info/2, terminate/2,
-	 format_status/2]).
-
-%%%-----------------------------------------------------------------
-%%% This is a rewrite of overload from BS.3, by Peter Högfeldt.
-%%%
-%%% DESCRIPTION
-%%%
-%%% This module implements a server process that keeps record of the
-%%% intensity of calls of the request/0 function, and answers accept or
-%%% reject depending on if the current average intensity is not greater 
-%%% than a specified maximum intensity.
-%%%
-%%% The intensity i is calculated according to the formula:
-%%%    i(n) = exp(-K*(T(n) - T(n-1)))*i(n-1) + Kappa
-%%% where i(n) is the intensity at event n, Kappa is a constant, and
-%%% T(n) is the time at event n.
-%%%
-%%% The constant Kappa can be thought of as 1 / T, where T is the time 
-%%% constant. Kappa is externally referred to as Weight.
-%%%  
-%%% We keep track of two intensities: the total call intensity and the 
-%%% intensity of accepted calls.
-%%%-----------------------------------------------------------------
-%%% TODO
-%%%
-%%% 3. Hysteresis.
-%%%
-%%%-----------------------------------------------------------------
-
--record(state, {total = 0, accept = 0, max, prev_t = get_now(),
-		kappa, call_counts = {0, 0}, alarm = clear}).
-
--define(clear_timeout, 30000).
-  
-start_link() ->
-    gen_server:start_link({local, overload}, overload, [], []).
-
-init([]) ->
-    process_flag(priority, high),
-    MaxIntensity = fetch_config_data(overload_max_intensity),
-    Kappa = fetch_config_data(overload_weight),
-    {ok, #state{max = MaxIntensity, kappa = Kappa}}.
-  
-%%-----------------------------------------------------------------
-%% Func: request/0
-%% Purpose: This is a request to proceed, e.g. a request to
-%%          establish a call.
-%% Returns: accept | reject
-%%-----------------------------------------------------------------
-request() -> call(request).
-  
-%%-----------------------------------------------------------------
-%% Func: set_config_data/2
-%% Purpose: Set configuration data, and reset intensities.
-%% Arguments: MaxIntensity (real > 0), Weight (real > 0).
-%% Returns: ok | {error, What}
-%% This function is for debugging purposes and is therefore not
-%% documented at all.
-%%-----------------------------------------------------------------
-set_config_data(MaxIntensity, Weight) ->
-    call({set_config_data, MaxIntensity, Weight}).
-%%-----------------------------------------------------------------
-%% Func: get_overload_info/0
-%% Returns: A list of tagged items: TotalIntensity, AcceptIntensity,
-%%          MaxIntensity, Weight, TotalRequests, AcceptedRequests.
-%%-----------------------------------------------------------------
-get_overload_info() -> call(get_overload_info).
-
-%%-----------------------------------------------------------------
-%% call(Request) -> Term
-%%-----------------------------------------------------------------
-call(Req) ->
-    gen_server:call(overload, Req, infinity).
-
-%%%-----------------------------------------------------------------
-%%% Callback functions from gen_server
-%%%-----------------------------------------------------------------
-handle_call(request, _From, State) ->
-    #state{total = TI, accept = AI, kappa = Kappa, prev_t = PrevT,
-	  alarm = Alarm} = State,
-    {TR, AR} = State#state.call_counts,
-    T = get_now(),
-    CurI = new_intensity(AI, T, PrevT, Kappa),
-    NewTI  = new_intensity(TI, T, PrevT, Kappa) + Kappa,
-    if 
-	CurI =< State#state.max ->
-	    %% Hysteresis: If alarm is set, and current intensity has
-	    %% fallen below 75% of max intensity, clear alarm.
-	    NewAlarm = if
-			   CurI =< 0.75*State#state.max ->
-			       clear_alarm(Alarm);
-			   true ->
-			       Alarm
-		       end,
-	    {reply, accept, State#state{call_counts = {TR+1, AR+1}, 
-					prev_t = T, total = NewTI, 
-					accept = CurI + Kappa, 
-				        alarm = NewAlarm},
-	     ?clear_timeout};
-        true ->
-	    %% Set alarm if not already set.
-	    NewAlarm = set_alarm(Alarm),
-	    {reply, reject,
-	     State#state{call_counts = {TR+1, AR}, prev_t = T,
-			 total = NewTI, accept = CurI,
-				       alarm = NewAlarm},
-	    ?clear_timeout}
-    end;
-handle_call({set_config_data, MaxIntensity, Weight}, _From, _State) ->
-    {reply, ok, #state{max = MaxIntensity, kappa = Weight},
-     ?clear_timeout};
-handle_call(get_overload_info, _From, State) ->
-    #state{max = MI, total = TI, accept = AI, kappa = Kappa,
-	   prev_t = PrevT, call_counts = {TR, AR}} = State,
-    T = get_now(),
-    CurI = new_intensity(AI, T, PrevT, Kappa),
-    NewTI  = new_intensity(TI, T, PrevT, Kappa),
-    Reply = [{total_intensity, NewTI}, {accept_intensity, CurI}, 
-	     {max_intensity, MI}, {weight, Kappa},
-	     {total_requests, TR}, {accepted_requests, AR}],
-    {reply, Reply, State#state{total = NewTI, accept = CurI},
-     ?clear_timeout}.
-
-handle_info(timeout, State) ->
-    #state{total = TI, accept = AI, kappa = Kappa, prev_t = PrevT,
-	  alarm = Alarm} = State,
-    T = get_now(),
-    CurI = new_intensity(AI, T, PrevT, Kappa),
-    NewTI  = new_intensity(TI, T, PrevT, Kappa),
-    if 
-	CurI < 0.75* State#state.max ->
-	    NewAlarm = clear_alarm(Alarm),
-	    {noreply, State#state{total = NewTI, accept = CurI, 
-				  alarm = NewAlarm}};
-	    
-	true ->
-	    {noreply, State#state{total = NewTI, accept = CurI},
-	     ?clear_timeout}
-    end;
-
-handle_info(_, State) ->
-    {noreply, State, ?clear_timeout}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-fetch_config_data(Tag) ->
-    case application:get_env(sasl, Tag) of
-	{ok, Value} -> Value;
-	_ -> fetch_default_data(Tag)
-    end.
-  
-fetch_default_data(overload_max_intensity) -> 0.8;
-fetch_default_data(overload_weight) -> 0.1.
-
-set_alarm(clear) ->
-    alarm_handler:set_alarm({overload, []}),
-    set;
-set_alarm(Alarm) ->
-    Alarm.
-
-clear_alarm(set) ->
-    alarm_handler:clear_alarm(overload),
-    clear;
-clear_alarm(Alarm) ->
-    Alarm.
-
-%%-----------------------------------------------------------------
-%% The catch protects against floating-point exception.
-%%
-new_intensity(I, T, PrevT, K) ->
-    Diff = sub(T, PrevT)/1000,
-    case catch (I*math:exp(-K*Diff)) of
-	{'EXIT', _} ->				% Assume zero.
-	    0.0;
-	Res ->
-	    Res
-    end.
-
-%% Mask equal to 2^27 - 1, used below.
--define(mask27, 16#7ffffff).
-
-%% Returns number of milliseconds in the range [0, 2^27 - 1]. Must have
-%% this since statistics(wall_clock) wraps. Having 2^27 -1 as the max
-%% assures that we always get non-negative integers. 2^27 milliseconds 
-%% are approx. 37.28 hours.
-get_now() -> 
-    element(1, statistics(wall_clock)) band ?mask27.
-
-%% Returns (X - Y) mod 2^27 (which is in the range [0, 2^27 - 1]).
-sub(X, Y) ->
-    (X + (bnot Y) + 1) band ?mask27.
-
-format_status(Opt, [PDict, #state{max = MI, total = TI, accept = AI,
-				  kappa = K,
-				  call_counts = {TR, AR}}]) ->
-    [{data, [{"Total Intensity", TI},
-	     {"Accept Intensity", AI}, 
-	     {"Max Intensity", MI},
-	     {"Weight", K},
-	     {"Total requests", TR},
-	     {"Accepted requests", AR}]} |
-     misc_supp:format_pdict(Opt, PDict, [])].     
diff --git a/lib/sasl/src/release_handler_1.erl b/lib/sasl/src/release_handler_1.erl
index 536ac924d4..a6325270a5 100644
--- a/lib/sasl/src/release_handler_1.erl
+++ b/lib/sasl/src/release_handler_1.erl
@@ -587,12 +587,12 @@ get_supervised_procs() ->
       get_application_names()).
 
 get_supervised_procs(_, Root, Procs, {ok, SupMod}) ->
-    get_procs(maybe_supervisor_which_children(get_proc_state(Root), SupMod, Root), Root) ++
+    get_procs(maybe_supervisor_which_children(Root, SupMod, Root), Root) ++
         [{undefined, undefined, Root, [SupMod]} |  Procs];
 get_supervised_procs(Application, Root, Procs, {error, _}) ->
     error_logger:error_msg("release_handler: cannot find top supervisor for "
                            "application ~w~n", [Application]),
-    get_procs(maybe_supervisor_which_children(get_proc_state(Root), Application, Root), Root) ++ Procs.
+    get_procs(maybe_supervisor_which_children(Root, Application, Root), Root) ++ Procs.
 
 get_application_names() ->
     lists:map(fun({Application, _Name, _Vsn}) ->
@@ -613,33 +613,54 @@ get_procs([{Name, Pid, worker, Mods} | T], Sup) when is_pid(Pid), is_list(Mods)
     [{Sup, Name, Pid, Mods} | get_procs(T, Sup)];
 get_procs([{Name, Pid, supervisor, Mods} | T], Sup) when is_pid(Pid) ->
     [{Sup, Name, Pid, Mods} | get_procs(T, Sup)] ++
-        get_procs(maybe_supervisor_which_children(get_proc_state(Pid), Name, Pid), Pid);
+        get_procs(maybe_supervisor_which_children(Pid, Name, Pid), Pid);
 get_procs([_H | T], Sup) ->
     get_procs(T, Sup);
 get_procs(_, _Sup) ->
     [].
 
+maybe_supervisor_which_children(Proc, Name, Pid) ->
+    case get_proc_state(Proc) of
+        noproc ->
+            %% process exited before we could interrogate it.
+            %% not necessarily a bug, but reporting a warning as a curiosity.
+            error_logger:warning_msg("release_handler: a process (~p) exited"
+                                     " during supervision tree interrogation."
+                                     " Continuing ...~n", [Proc]),
+            [];
+
+        suspended ->
+            error_logger:error_msg("release_handler: a which_children call"
+                                   " to ~p (~w) was avoided. This supervisor"
+                                   " is suspended and should likely be upgraded"
+                                   " differently. Exiting ...~n", [Name, Pid]),
+            error(suspended_supervisor);
+
+        running ->
+            case catch supervisor:which_children(Pid) of
+                Res when is_list(Res) ->
+                    Res;
+                Other ->
+                    error_logger:error_msg("release_handler: ~p~nerror during"
+                                           " a which_children call to ~p (~w)."
+                                           " [State: running] Exiting ... ~n",
+                                           [Other, Name, Pid]),
+                    error(which_children_failed)
+            end
+    end.
+
 get_proc_state(Proc) ->
-    {status, _, {module, _}, [_, State, _, _, _]} = sys:get_status(Proc),
-    State.
-
-maybe_supervisor_which_children(suspended, Name, Pid) ->
-    error_logger:error_msg("release_handler: a which_children call"
-                           " to ~p (~w) was avoided. This supervisor"
-                           " is suspended and should likely be upgraded"
-                           " differently. Exiting ...~n", [Name, Pid]),
-    error(suspended_supervisor);
-
-maybe_supervisor_which_children(State, Name, Pid) ->
-    case catch supervisor:which_children(Pid) of
-        Res when is_list(Res) ->
-            Res;
-        Other ->
-            error_logger:error_msg("release_handler: ~p~nerror during"
-                                   " a which_children call to ~p (~w)."
-                                   " [State: ~p] Exiting ... ~n",
-                                   [Other, Name, Pid, State]),
-            error(which_children_failed)
+    %% sys:send_system_msg can exit with {noproc, {m,f,a}}.
+    %% This happens if a supervisor exits after which_children has provided
+    %% its pid for interrogation.
+    %% ie. Proc may no longer be running at this point.
+    try sys:get_status(Proc) of
+        %% as per sys:get_status/1, SysState can only be running | suspended.
+        {status, _, {module, _}, [_, State, _, _, _]} when State == running ;
+                                                           State == suspended ->
+            State
+    catch exit:{noproc, {sys, get_status, [Proc]}} ->
+        noproc
     end.
 
 maybe_get_dynamic_mods(Name, Pid) ->
@@ -655,48 +676,19 @@ maybe_get_dynamic_mods(Name, Pid) ->
             error(get_modules_failed)
     end.
 
-%% XXXX
-%% Note: The following is a terrible hack done in order to resolve the
-%% problem stated in ticket OTP-3452.
-
-%% XXXX NOTE WELL: This record is from supervisor.erl. Also the record
-%% name is really `state'. 
--record(supervisor_state, {name,
-                strategy,
-                children = [],
-                dynamics = [],
-                intensity,
-                period,
-                restarts = [],
-                module,
-                args}).
-
 %% Return the name of the call-back module that implements the
 %% (top) supervisor SupPid.
 %% Returns: {ok, Module} | {error,undefined}
 %%
 get_supervisor_module(SupPid) ->
-    case catch get_supervisor_module1(SupPid) of
-	{ok, Module} when is_atom(Module) ->
+    case catch supervisor:get_callback_module(SupPid) of
+	Module when is_atom(Module) ->
 	    {ok, Module};
 	_Other ->
 	    io:format("~w: reason: ~w~n", [SupPid, _Other]),
 	    {error, undefined}
     end.
 
-get_supervisor_module1(SupPid) ->
-    {status, _Pid, {module, _Mod}, 
-     [_PDict, _SysState, _Parent, _Dbg, Misc]} = sys:get_status(SupPid),
-    %% supervisor Misc field changed at R13B04, handle old and new variants here
-    State = case Misc of
-                [_Name, State1, _Type, _Time] ->
-                    State1;
-                [_Header, _Data, {data, [{"State", State2}]}] ->
-                    State2
-            end,
-    %% Cannot use #supervisor_state{module = Module} = State.
-    {ok, element(#supervisor_state.module, State)}.
-
 %%-----------------------------------------------------------------
 %% Func: do_soft_purge/3
 %% Args: Mod = atom()
diff --git a/lib/sasl/src/sasl.app.src b/lib/sasl/src/sasl.app.src
index 705bb73fc5..16e8e44ba2 100644
--- a/lib/sasl/src/sasl.app.src
+++ b/lib/sasl/src/sasl.app.src
@@ -24,7 +24,6 @@
 	       alarm_handler, 
                format_lib_supp, 
                misc_supp, 
-               overload, 
                rb, 
                rb_format_supp, 
 	       release_handler, 
@@ -41,11 +40,11 @@
 	       systools_relup, 
 	       systools_lib
 	      ]},
-    {registered, [sasl_sup, alarm_handler, overload, release_handler]},
+    {registered, [sasl_sup, alarm_handler, release_handler]},
     {applications, [kernel, stdlib]},
     {env, [{sasl_error_logger, tty},
            {errlog_type, all}]},
     {mod, {sasl, []}},
-    {runtime_dependencies, ["tools-2.6.14","stdlib-2.6","kernel-4.1",
+    {runtime_dependencies, ["tools-2.6.14","stdlib-2.8","kernel-4.1",
 			    "erts-6.0"]}]}.
 
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index 8faa0afbd4..ca5122dab4 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -18,9 +18,9 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max one major revision back
- [{<<"2\\.[5-6](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.*
-  {<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}],    % OTP-17
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]},      % OTP-19.*
+  {<<"2\\.[5-7](\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-18.*
  %% Down to - max one major revision back
- [{<<"2\\.[5-6](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.*
-  {<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}]     % OTP-17
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]},     % OTP-19.*
+  {<<"2\\.[5-7](\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-18.*
 }.
diff --git a/lib/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl
index fc49fc2465..0fb85682c6 100644
--- a/lib/sasl/src/sasl.erl
+++ b/lib/sasl/src/sasl.erl
@@ -170,7 +170,4 @@ init(safe) ->
     AlarmH = {alarm_handler,
 	      {alarm_handler, start_link, []},
 	      permanent, 2000, worker, dynamic},	      
-    Overload = {overload,
-		{overload, start_link, []},
-		permanent, 2000, worker, [overload]},	      
-    {ok, {SupFlags, [AlarmH, Overload]}}.
+    {ok, {SupFlags, [AlarmH]}}.
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index 8132034172..154374cd8c 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -1453,23 +1453,46 @@ behave([H|T]) ->
 behave([]) ->
     [].
 
-%%______________________________________________________________________
-%% mandatory modules; this modules must be loaded before processes
-%% can be started. These are a collection of modules from the kernel
-%% and stdlib applications.
-%% Nowadays, error_handler dynamically loads almost every module.
-%% The error_handler self must still be there though.
-
 mandatory_modules() ->
-    %% Sorted
-    [error_handler].
+    [error_handler,				%Truly mandatory.
+
+     %% Modules that are almost always needed. Listing them here
+     %% helps the init module to load them faster. Modules not
+     %% listed here will be loaded by the error_handler module.
+     %%
+     %% Keep this list sorted.
+     application,
+     application_controller,
+     application_master,
+     code,
+     code_server,
+     erl_eval,
+     erl_lint,
+     erl_parse,
+     error_logger,
+     ets,
+     file,
+     filename,
+     file_server,
+     file_io_server,
+     gen,
+     gen_event,
+     gen_server,
+     heart,
+     kernel,
+     lists,
+     proc_lib,
+     supervisor
+    ].
 
 %%______________________________________________________________________
 %% This is the modules that are preloaded into the Erlang system.
 
 preloaded() ->
     %% Sorted
-    [erl_prim_loader,erlang,erts_internal,init,otp_ring0,prim_eval,prim_file,
+    [erl_prim_loader,erlang,
+     erts_code_purger,
+     erts_internal,init,otp_ring0,prim_eval,prim_file,
      prim_inet,prim_zip,zlib].
 
 %%______________________________________________________________________
diff --git a/lib/sasl/test/Makefile b/lib/sasl/test/Makefile
index 86976def6a..2e9e107efd 100644
--- a/lib/sasl/test/Makefile
+++ b/lib/sasl/test/Makefile
@@ -33,7 +33,6 @@ MODULES= \
 	sasl_report_suite_supervisor \
 	systools_SUITE \
 	systools_rc_SUITE \
-	overload_SUITE \
 	rb_SUITE \
 	rh_test_lib \
 
@@ -55,8 +54,7 @@ RELSYSDIR = $(RELEASE_PATH)/sasl_test
 # FLAGS
 # ----------------------------------------------------
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include \
-		-I$(ERL_TOP)/lib/sasl/src
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/sasl/src
 
 EBIN = .
 
diff --git a/lib/sasl/test/overload_SUITE.erl b/lib/sasl/test/overload_SUITE.erl
deleted file mode 100644
index 02d1056698..0000000000
--- a/lib/sasl/test/overload_SUITE.erl
+++ /dev/null
@@ -1,168 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2011. 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%
-%%
-
--module(overload_SUITE).
--include_lib("common_test/include/ct.hrl").
-
--compile(export_all).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() -> [info, set_config_data, set_env_vars, request, timeout].
-
-init_per_testcase(_Case,Config) ->
-    restart_sasl(),
-    Config.
-
-end_per_testcase(Case,Config) ->
-    try apply(?MODULE,Case,[cleanup,Config])
-    catch error:undef -> ok
-    end,
-    ok.
-
-%%%-----------------------------------------------------------------
-info(_Config) ->
-    Info = overload:get_overload_info(),
-    [{total_intensity,0.0},
-     {accept_intensity,0.0},
-     {max_intensity,0.8},
-     {weight,0.1},
-     {total_requests,0},
-     {accepted_requests,0}] = Info.
-
-%%%-----------------------------------------------------------------
-set_config_data(_Config) ->
-    InfoDefault = overload:get_overload_info(),
-    ok = check_info(0.8,0.1,InfoDefault),
-    ok = overload:set_config_data(0.5,0.4),
-    Info1 = overload:get_overload_info(),
-    ok = check_info(0.5,0.4,Info1),
-    ok.
-
-%%%-----------------------------------------------------------------
-set_env_vars(_Config) ->
-    InfoDefault = overload:get_overload_info(),
-    ok = check_info(0.8,0.1,InfoDefault),
-    ok = application:set_env(sasl,overload_max_intensity,0.5),
-    ok = application:set_env(sasl,overload_weight,0.4),
-    ok = application:stop(sasl),
-    ok = application:start(sasl),
-    Info1 = overload:get_overload_info(),
-    ok = check_info(0.5,0.4,Info1),
-    ok.
-set_env_vars(cleanup,_Config) ->
-    application:unset_env(sasl,overload_max_intensity),
-    application:unset_env(sasl,overload_weight),
-    ok.
-
-%%%-----------------------------------------------------------------
-request(_Config) ->
-    %% Find number of request that can be done with default settings
-    %% and no delay
-    overload:set_config_data(0.8, 0.1),
-    NDefault = do_many_requests(0),
-    restart_sasl(),
-    ?t:format("NDefault: ~p",[NDefault]),
-
-    %% Check that the number of requests increases when max_intensity
-    %% increases
-    overload:set_config_data(2, 0.1),
-    NLargeMI = do_many_requests(0),
-    restart_sasl(),
-    ?t:format("NLargeMI: ~p",[NLargeMI]),
-    true = NLargeMI > NDefault,
-
-    %% Check that the number of requests decreases when weight
-    %% increases
-    overload:set_config_data(0.8, 1),
-    NLargeWeight = do_many_requests(0),
-    restart_sasl(),
-    ?t:format("NLargeWeight: ~p",[NLargeWeight]),
-    true = NLargeWeight < NDefault,
-
-    %% Check that number of requests increases when delay between
-    %% requests increases.
-    %% (Keeping same config and comparing to large weight in order to
-    %% minimize the time needed for this case.)
-    overload:set_config_data(0.8, 1),
-    NLargeTime = do_many_requests(500),
-    restart_sasl(),
-    ?t:format("NLargeTime: ~p",[NLargeTime]),
-    true = NLargeTime > NLargeWeight,
-    ok.
-
-%%%-----------------------------------------------------------------
-timeout(_Config) ->
-    overload:set_config_data(0.8, 1),
-    _N = do_many_requests(0),
-
-    %% Check that the overload alarm is raised
-    [{overload,_}] = alarm_handler:get_alarms(),
-
-    %% Fake a clear timeout in overload.erl and check that, since it
-    %% came very soon after the overload situation, the alarm is not
-    %% cleared
-    overload ! timeout,
-    timer:sleep(1000),
-    [{overload,_}] = alarm_handler:get_alarms(),
-
-    %% A bit later, try again and check that this time the alarm is
-    %% cleared
-    overload ! timeout,
-    timer:sleep(1000),
-    [] = alarm_handler:get_alarms(),
-
-    ok.
-
-
-%%%-----------------------------------------------------------------
-%%% INTERNAL FUNCTIONS
-
-%%%-----------------------------------------------------------------
-%%% Call overload:request/0 up to 30 times with the given time delay
-%%% between. Stop when 'reject' is returned.
-do_many_requests(T) ->
-    30 - do_requests(30,T).
-
-do_requests(0,_) ->
-    ?t:fail(never_rejected);
-do_requests(N,T) ->
-    case overload:request() of
-	accept ->
-	    timer:sleep(T),
-	    do_requests(N-1,T);
-	reject ->
-	    N
-    end.
-
-%%%-----------------------------------------------------------------
-%%% Restart the sasl application
-restart_sasl() ->
-    application:stop(sasl),
-    application:start(sasl),
-    ok.
-
-%%%-----------------------------------------------------------------
-%%% Check that max_intensity and weight is set as expected
-check_info(MI,W,Info) -> 
-    case {lists:keyfind(max_intensity,1,Info), lists:keyfind(weight,1,Info)} of
-	{{_,MI},{_,W}} -> ok;
-	_ -> ?t:fail({unexpected_info,MI,W,Info})
-    end.
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index d57de2593a..ee620dcdb4 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -1363,7 +1363,7 @@ upgrade_supervisor(Conf) when is_list(Conf) ->
     %% Check that the restart strategy and child spec is updated
     {status, _, {module, _}, [_, _, _, _, [_,_,{data,[{"State",State}]}]]} =
 	rpc:call(Node,sys,get_status,[a_sup]),
-    {state,_,RestartStrategy,[Child],_,_,_,_,_,_} = State,
+    {state,_,RestartStrategy,[Child],_,_,_,_,_,_,_} = State,
     one_for_all = RestartStrategy, % changed from one_for_one
     {child,_,_,_,_,brutal_kill,_,_} = Child, % changed from timeout 2000
 
diff --git a/lib/sasl/test/sasl_report_SUITE.erl b/lib/sasl/test/sasl_report_SUITE.erl
index 940234f152..7469ec4d46 100644
--- a/lib/sasl/test/sasl_report_SUITE.erl
+++ b/lib/sasl/test/sasl_report_SUITE.erl
@@ -24,7 +24,7 @@
 
 -export([crash_me/0,start_link/0,init/1,handle_cast/2,terminate/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl
index cf0ed5fcfc..825a7f6e86 100644
--- a/lib/sasl/test/systools_SUITE.erl
+++ b/lib/sasl/test/systools_SUITE.erl
@@ -1640,25 +1640,21 @@ app_start_type_relup(Dir2,Name2,Config) ->
     %% ?t:format("Dn: ~p",[DownInstructions]),
     [{load_object_code, {mnesia, _, _}},
      {load_object_code, {runtime_tools, _, _}},
-     {load_object_code, {webtool, _, _}},
      {load_object_code, {snmp, _, _}},
      {load_object_code, {xmerl, _, _}},
      point_of_no_return
      | UpInstructionsT] = UpInstructions,
     true = lists:member({apply,{application,start,[mnesia,permanent]}}, UpInstructionsT),
     true = lists:member({apply,{application,start,[runtime_tools,transient]}}, UpInstructionsT),
-    true = lists:member({apply,{application,start,[webtool,temporary]}}, UpInstructionsT),
     true = lists:member({apply,{application,load,[snmp]}}, UpInstructionsT),
     false = lists:any(fun({apply,{application,_,[xmerl|_]}}) -> true; (_) -> false end, UpInstructionsT),
     [point_of_no_return | DownInstructionsT] = DownInstructions,
     true = lists:member({apply,{application,stop,[mnesia]}}, DownInstructionsT),
     true = lists:member({apply,{application,stop,[runtime_tools]}}, DownInstructionsT),
-    true = lists:member({apply,{application,stop,[webtool]}}, DownInstructionsT),
     true = lists:member({apply,{application,stop,[snmp]}}, DownInstructionsT),
     true = lists:member({apply,{application,stop,[xmerl]}}, DownInstructionsT),
     true = lists:member({apply,{application,unload,[mnesia]}}, DownInstructionsT),
     true = lists:member({apply,{application,unload,[runtime_tools]}}, DownInstructionsT),
-    true = lists:member({apply,{application,unload,[webtool]}}, DownInstructionsT),
     true = lists:member({apply,{application,unload,[snmp]}}, DownInstructionsT),
     true = lists:member({apply,{application,unload,[xmerl]}}, DownInstructionsT),
     ok.
@@ -2207,7 +2203,6 @@ create_script(latest_app_start_type1,Config) ->
 create_script(latest_app_start_type2,Config) ->
     OtherApps = [{mnesia,current,permanent},
 		 {runtime_tools,current,transient},
-		 {webtool,current,temporary},
 		 {snmp,current,load},
 		 {xmerl,current,none}],
     Apps = core_apps(current) ++ OtherApps,
diff --git a/lib/sasl/test/systools_rc_SUITE.erl b/lib/sasl/test/systools_rc_SUITE.erl
index 3754ed99f2..2ecb6f107a 100644
--- a/lib/sasl/test/systools_rc_SUITE.erl
+++ b/lib/sasl/test/systools_rc_SUITE.erl
@@ -26,10 +26,6 @@
 	 translate_emulator_restarts/1,
 	 translate_add_delete_module/1]).
 
-%%-----------------------------------------------------------------
-%% erl -compile systools_rc_SUITE @i ../src/ @i ../../test_server/include/
-%% c(systools_rc_SUITE, [{i, "../src"}, {i, "../../test_server/include"}]).
-%%-----------------------------------------------------------------
 all() -> 
     [syntax_check, translate, translate_app, translate_emulator_restarts,
      translate_add_delete_module].
diff --git a/lib/sasl/test/test_lib.hrl b/lib/sasl/test/test_lib.hrl
index b16c4ac34c..2d897e9903 100644
--- a/lib/sasl/test/test_lib.hrl
+++ b/lib/sasl/test/test_lib.hrl
@@ -1,3 +1,3 @@
 -define(ertsvsn,"4.4").
--define(kernelvsn,"3.0").
--define(stdlibvsn,"2.0").
+-define(kernelvsn,"4.0").
+-define(stdlibvsn,"2.5").
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index cb454d5331..accb58a199 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 2.6.1
+SASL_VSN = 2.7
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 9e7f13e126..4693a744f5 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,7 +34,23 @@
   </header>
 
 
-  <section><title>SNMP 5.2.1</title>
+  <section><title>SNMP 5.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Snmp agent now properly handles <c>vacmViewTreeFamily</c>
+	    masks.</p>
+          <p>
+	    Own Id: OTP-13264</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.2.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
index 586b7c7171..9e6aa74d45 100644
--- a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
+++ b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
@@ -34,6 +34,8 @@
 
 %% Internal exports
 -export([check_vacm/1]).
+%%
+-export([emask2imask/1]).
 
 
 -include("snmp_types.hrl").
diff --git a/lib/snmp/src/agent/snmpa_acm.erl b/lib/snmp/src/agent/snmpa_acm.erl
index 7327575846..0264c6a992 100644
--- a/lib/snmp/src/agent/snmpa_acm.erl
+++ b/lib/snmp/src/agent/snmpa_acm.erl
@@ -280,7 +280,7 @@ validate_mib_view(Oid, MibView) ->
     end.
 
 get_largest_family([{SubTree, Mask, Type} | T], Oid, Res) ->
-    case check_mask(Oid, SubTree, Mask) of
+    case check_mask(Oid, SubTree, snmp_view_based_acm_mib:emask2imask(Mask)) of
 	true -> get_largest_family(T, Oid, add_res(length(SubTree), SubTree,
 						   Type, Res));
 	false -> get_largest_family(T, Oid, Res)
@@ -345,7 +345,7 @@ validate_all_mib_view([], _MibView) ->
 %% intelligent.
 %%-----------------------------------------------------------------
 is_definitely_not_in_mib_view(Oid, [{SubTree, Mask,?view_included}|T]) ->
-    case check_maybe_mask(Oid, SubTree, Mask) of
+    case check_maybe_mask(Oid, SubTree, snmp_view_based_acm_mib:emask2imask(Mask)) of
 	true -> false;
 	false -> is_definitely_not_in_mib_view(Oid, T)
     end;
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 77418f920f..ca61782639 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -1,71 +1,24 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2015. 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%
-%%
-
-
+%% -*- erlang -*-
 {"%VSN%",
 
 %% ----- U p g r a d e -------------------------------------------------------
-
 %% Instruction examples: 
 %% {restart_application, snmp}
 %% {load_module, snmp_pdus, soft_purge, soft_purge, []}
 %% {update, snmpa_local_db, soft, soft_purge, soft_purge, []}
 %% {add_module,  snmpm_net_if_mt}
  [
-  {"5.2", [{load_module, snmp_conf, soft_purge, soft_purge, []}]},
-  {"5.1.2", [ % Only runtime dependencies change
-  ]},
-  {"5.1.1", [{restart_application, snmp}]},
-  {"5.1", [ % Only compiler changes
-  ]},
-  {"5.0", [{restart_application, snmp}]},
-  {"4.25.1", [{restart_application, snmp}]},
-  {"4.25.0.1", [{restart_application, snmp}]},
-  {"4.25.0.0.1", [{restart_application, snmp}]},
-  {"4.25",   [{restart_application, snmp}]}, 
-  {"4.24.2", [{restart_application, snmp}]}, 
-  {"4.24.1", [{restart_application, snmp}]}, 
-  {"4.24",   [{restart_application, snmp}]}
- ], 
-
+  {<<"5\\..*">>, [{restart_application, snmp}]},	
+  {<<"4\\..*">>, [{restart_application, snmp}]}
+ ],
+ 
 %% ------D o w n g r a d e ---------------------------------------------------
-
 %% Instruction examples: 
 %% {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
-
+ 
  [
-  {"5.2", [{load_module, snmp_conf, soft_purge, soft_purge, []}]},
-  {"5.1.2", [ % Only runtime dependencies change
-  ]},
-  {"5.1.1", [{restart_application, snmp}]},
-  {"5.1", [ % Only compiler changes
-  ]},
-  {"5.0", [{restart_application, snmp}]},
-  {"4.25.1", [{restart_application, snmp}]},
-  {"4.25.0.1", [{restart_application, snmp}]},
-  {"4.25.0.0.1", [{restart_application, snmp}]},
-  {"4.25",   [{restart_application, snmp}]}, 
-  {"4.24.2", [{restart_application, snmp}]}, 
-  {"4.24.1", [{restart_application, snmp}]}, 
-  {"4.24",   [{restart_application, snmp}]}
- ]
-
-}.
+  {<<"5\\..*">>, [{restart_application, snmp}]},	
+  {<<"4\\..*">>, [{restart_application, snmp}]}
+ ]  	       
+}.	 
 
diff --git a/lib/snmp/test/Makefile b/lib/snmp/test/Makefile
index 3261982a32..8e895bc5b1 100644
--- a/lib/snmp/test/Makefile
+++ b/lib/snmp/test/Makefile
@@ -150,7 +150,6 @@ ERL_COMPILE_FLAGS += -I../../snmp/src/app \
                      -I../../snmp/src/misc \
                      -I../../snmp/src/agent \
                      -I../../snmp/src/manager \
-                     -I$(ERL_TOP)/lib/test_server/include \
                      -I../../snmp/include \
                      -Dsnmp_test_data=snmp_test_data \
                      -Dversion=\"$(VSN)$(PRE_VSN)\" \
diff --git a/lib/snmp/test/exp/snmp_agent_ms_test.erl b/lib/snmp/test/exp/snmp_agent_ms_test.erl
index 3415fcc8e6..3010de0619 100644
--- a/lib/snmp/test/exp/snmp_agent_ms_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_ms_test.erl
@@ -29,7 +29,7 @@
 -define(application, snmp).
 
 -include_lib("kernel/include/file.hrl").
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
diff --git a/lib/snmp/test/exp/snmp_agent_mt_test.erl b/lib/snmp/test/exp/snmp_agent_mt_test.erl
index 89815e1044..71ae58baca 100644
--- a/lib/snmp/test/exp/snmp_agent_mt_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_mt_test.erl
@@ -29,7 +29,7 @@
 -define(application, snmp).
 
 -include_lib("kernel/include/file.hrl").
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
diff --git a/lib/snmp/test/exp/snmp_agent_v1_test.erl b/lib/snmp/test/exp/snmp_agent_v1_test.erl
index ec243747df..55045d536e 100644
--- a/lib/snmp/test/exp/snmp_agent_v1_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_v1_test.erl
@@ -29,7 +29,7 @@
 -define(application, snmp).
 
 -include_lib("kernel/include/file.hrl").
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
diff --git a/lib/snmp/test/exp/snmp_agent_v2_test.erl b/lib/snmp/test/exp/snmp_agent_v2_test.erl
index ce95d0b5cd..6238a6c4bd 100644
--- a/lib/snmp/test/exp/snmp_agent_v2_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_v2_test.erl
@@ -29,7 +29,7 @@
 -define(application, snmp).
 
 -include_lib("kernel/include/file.hrl").
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
diff --git a/lib/snmp/test/exp/snmp_agent_v3_test.erl b/lib/snmp/test/exp/snmp_agent_v3_test.erl
index 1ba06209b2..af7cee9b96 100644
--- a/lib/snmp/test/exp/snmp_agent_v3_test.erl
+++ b/lib/snmp/test/exp/snmp_agent_v3_test.erl
@@ -29,7 +29,7 @@
 -define(application, snmp).
 
 -include_lib("kernel/include/file.hrl").
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
diff --git a/lib/snmp/test/snmp_agent_mibs_test.erl b/lib/snmp/test/snmp_agent_mibs_test.erl
index a03c2b8534..2cbba14c74 100644
--- a/lib/snmp/test/snmp_agent_mibs_test.erl
+++ b/lib/snmp/test/snmp_agent_mibs_test.erl
@@ -31,7 +31,7 @@
 %% Include files
 %%----------------------------------------------------------------------
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -include_lib("snmp/include/snmp_types.hrl").
 -include_lib("snmp/include/SNMP-COMMUNITY-MIB.hrl").
diff --git a/lib/snmp/test/snmp_agent_nfilter_test.erl b/lib/snmp/test/snmp_agent_nfilter_test.erl
index 16a9903198..8aeef81333 100644
--- a/lib/snmp/test/snmp_agent_nfilter_test.erl
+++ b/lib/snmp/test/snmp_agent_nfilter_test.erl
@@ -26,7 +26,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 
 
diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index 412d62c6a1..93968ede2e 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -421,7 +421,7 @@
 -define(application, snmp).
 
 -include_lib("kernel/include/file.hrl").
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
diff --git a/lib/snmp/test/snmp_agent_test_lib.erl b/lib/snmp/test/snmp_agent_test_lib.erl
index 8ea7b2e081..6f20254fcb 100644
--- a/lib/snmp/test/snmp_agent_test_lib.erl
+++ b/lib/snmp/test/snmp_agent_test_lib.erl
@@ -69,7 +69,7 @@
 -export([wait/5, run/4]).
 
 -include_lib("kernel/include/file.hrl").
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
diff --git a/lib/snmp/test/snmp_app_test.erl b/lib/snmp/test/snmp_app_test.erl
index 3b5b196ad6..6892d4aa93 100644
--- a/lib/snmp/test/snmp_app_test.erl
+++ b/lib/snmp/test/snmp_app_test.erl
@@ -45,7 +45,7 @@
 
 
 -include_lib("kernel/include/file.hrl").
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 
 
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index c83c4e0fed..b08181191f 100644
--- a/lib/snmp/test/snmp_compiler_test.erl
+++ b/lib/snmp/test/snmp_compiler_test.erl
@@ -29,7 +29,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -include_lib("snmp/include/snmp_types.hrl").
 
diff --git a/lib/snmp/test/snmp_conf_test.erl b/lib/snmp/test/snmp_conf_test.erl
index 1d514cd1d2..73b471b107 100644
--- a/lib/snmp/test/snmp_conf_test.erl
+++ b/lib/snmp/test/snmp_conf_test.erl
@@ -27,7 +27,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 
 -include_lib("snmp/include/STANDARD-MIB.hrl").
diff --git a/lib/snmp/test/snmp_log_test.erl b/lib/snmp/test/snmp_log_test.erl
index b204522ee0..ae2581fb69 100644
--- a/lib/snmp/test/snmp_log_test.erl
+++ b/lib/snmp/test/snmp_log_test.erl
@@ -30,7 +30,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
diff --git a/lib/snmp/test/snmp_manager_config_test.erl b/lib/snmp/test/snmp_manager_config_test.erl
index 47e150e8e8..8428b61e8a 100644
--- a/lib/snmp/test/snmp_manager_config_test.erl
+++ b/lib/snmp/test/snmp_manager_config_test.erl
@@ -32,7 +32,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -include_lib("snmp/src/manager/snmpm_usm.hrl").
 
diff --git a/lib/snmp/test/snmp_manager_test.erl b/lib/snmp/test/snmp_manager_test.erl
index 3d05e5791f..a343dfdca7 100644
--- a/lib/snmp/test/snmp_manager_test.erl
+++ b/lib/snmp/test/snmp_manager_test.erl
@@ -32,7 +32,7 @@
 %% Include files
 %%----------------------------------------------------------------------
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -include("snmp_test_data/Test2.hrl").
 
diff --git a/lib/snmp/test/snmp_manager_user.erl b/lib/snmp/test/snmp_manager_user.erl
index 256ea6a834..55b1e23b2e 100644
--- a/lib/snmp/test/snmp_manager_user.erl
+++ b/lib/snmp/test/snmp_manager_user.erl
@@ -31,7 +31,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 
 
diff --git a/lib/snmp/test/snmp_manager_user_old.erl b/lib/snmp/test/snmp_manager_user_old.erl
index 0f0f026eca..f317fa831c 100644
--- a/lib/snmp/test/snmp_manager_user_old.erl
+++ b/lib/snmp/test/snmp_manager_user_old.erl
@@ -30,7 +30,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 
 
diff --git a/lib/snmp/test/snmp_manager_user_test.erl b/lib/snmp/test/snmp_manager_user_test.erl
index a0cdcdef4d..64edfef4d5 100644
--- a/lib/snmp/test/snmp_manager_user_test.erl
+++ b/lib/snmp/test/snmp_manager_user_test.erl
@@ -27,7 +27,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
  
 
diff --git a/lib/snmp/test/snmp_manager_user_test_lib.erl b/lib/snmp/test/snmp_manager_user_test_lib.erl
index a547f78efb..ea2c83a0da 100644
--- a/lib/snmp/test/snmp_manager_user_test_lib.erl
+++ b/lib/snmp/test/snmp_manager_user_test_lib.erl
@@ -30,7 +30,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 
 
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 61a7d2207a..f60cbbfaa7 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.2.1
+SNMP_VSN    = 5.2.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 75e1615c09..5f2cd19cda 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,23 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Documentation correction of <c>ssh_sftp:position/4</c></p>
+          <p>
+	    Thanks to Rabbe Fogelholm.</p>
+          <p>
+	    Own Id: OTP-13305 Aux Id: ERL-87 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.2.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/doc/src/ssh_sftp.xml b/lib/ssh/doc/src/ssh_sftp.xml
index c6ca0f161a..f4b41b74f3 100644
--- a/lib/ssh/doc/src/ssh_sftp.xml
+++ b/lib/ssh/doc/src/ssh_sftp.xml
@@ -333,7 +333,7 @@
 
     <func>
       <name>position(ChannelPid, Handle, Location) -></name>
-      <name>position(ChannelPid, Handle, Location, Timeout) -> {ok, NewPosition | {error, Error}</name>
+      <name>position(ChannelPid, Handle, Location, Timeout) -> {ok, NewPosition} | {error, Reason}</name>
       <fsummary>Sets the file position of a file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -399,7 +399,7 @@
 
     <func>
       <name>pwrite(ChannelPid, Handle, Position, Data) -> ok</name>
-      <name>pwrite(ChannelPid, Handle, Position, Data, Timeout) -> ok | {error, Error}</name>
+      <name>pwrite(ChannelPid, Handle, Position, Data, Timeout) -> ok | {error, Reason}</name>
       <fsummary>Writes to an open file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -592,7 +592,7 @@
 
     <func>
       <name>write(ChannelPid, Handle, Data) -></name>
-      <name>write(ChannelPid, Handle, Data, Timeout) -> ok | {error, Error}</name>
+      <name>write(ChannelPid, Handle, Data, Timeout) -> ok | {error, Reason}</name>
       <fsummary>Writes to an open file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index b44c8eef35..d8e4bfd50c 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -54,6 +54,7 @@ MODULES= \
 	ssh_connection_sup \
 	ssh_connection \
 	ssh_connection_handler \
+	ssh_dbg \
 	ssh_shell \
 	ssh_system_sup \
 	ssh_subsystem_sup \
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 4a76fd9cd3..c67350bf72 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -18,6 +18,7 @@
 	     ssh_connection_handler,
 	     ssh_connection_sup,
 	     ssh_daemon_channel,
+	     ssh_dbg,
 	     ssh_shell,
 	     sshc_sup,
 	     sshd_sup,
diff --git a/lib/ssh/src/ssh_bits.erl b/lib/ssh/src/ssh_bits.erl
index 4da3a6018b..101bf76cd3 100644
--- a/lib/ssh/src/ssh_bits.erl
+++ b/lib/ssh/src/ssh_bits.erl
@@ -26,52 +26,30 @@
 
 -include("ssh.hrl").
 
--export([encode/2]).
--export([mpint/1, string/1, name_list/1]).
+-export([mpint/1, name_list/1]).
 -export([random/1]).
 
--define(name_list(X), 
-	(fun(B) -> ?binary(B) end)(list_to_binary(name_concat(X)))).
-
-
-name_concat([Name]) when is_atom(Name) -> atom_to_list(Name);
-name_concat([Name]) when is_list(Name) -> Name;
-name_concat([Name|Ns]) -> 
-    if is_atom(Name) ->
-	    [atom_to_list(Name),"," | name_concat(Ns)];
-       is_list(Name) ->
-	    [Name,"," | name_concat(Ns)]
-    end;
-name_concat([]) -> [].
-
-
-name_list(Ns) ->
-    ?name_list(Ns).
+%%%----------------------------------------------------------------
+name_list([Name]) -> to_bin(Name);
+name_list([Name|Ns]) -> <<(to_bin(Name))/binary, ",", (name_list(Ns))/binary>>;
+name_list([]) -> <<>>.
+
+to_bin(A) when is_atom(A) -> list_to_binary(atom_to_list(A));
+to_bin(S) when is_list(S) -> list_to_binary(S);
+to_bin(B) when is_binary(B) -> B.
+
+%%%----------------------------------------------------------------
+%%% Multi Precision Integer encoding
+mpint(-1) -> <<0,0,0,1,16#ff>>;
+mpint(0) -> <<0,0,0,0>>;
+mpint(X) when X < 0 -> mpint_neg(X,0,[]);
+mpint(X) -> mpint_pos(X,0,[]).
     
-
-string(Str) ->
-    ?string(Str).
-
-
-%% MP representaion  (SSH2)
-mpint(X) when X < 0 ->
-    if X == -1 ->
-	    <<0,0,0,1,16#ff>>;	    
-       true ->
-	    mpint_neg(X,0,[])
-    end;
-mpint(X) ->
-    if X == 0 ->
-	    <<0,0,0,0>>;
-       true ->
-	    mpint_pos(X,0,[])
-    end.
-
 mpint_neg(-1,I,Ds=[MSB|_]) ->
     if MSB band 16#80 =/= 16#80 ->
 	    <<?UINT32((I+1)), (list_to_binary([255|Ds]))/binary>>;
        true ->
-	    (<<?UINT32(I), (list_to_binary(Ds))/binary>>)
+	    <<?UINT32(I), (list_to_binary(Ds))/binary>>
     end;
 mpint_neg(X,I,Ds)  ->
     mpint_neg(X bsr 8,I+1,[(X band 255)|Ds]).
@@ -80,96 +58,17 @@ mpint_pos(0,I,Ds=[MSB|_]) ->
     if MSB band 16#80 == 16#80 ->
 	    <<?UINT32((I+1)), (list_to_binary([0|Ds]))/binary>>;
        true ->
-	    (<<?UINT32(I), (list_to_binary(Ds))/binary>>)
+	    <<?UINT32(I), (list_to_binary(Ds))/binary>>
     end;
 mpint_pos(X,I,Ds) ->
     mpint_pos(X bsr 8,I+1,[(X band 255)|Ds]).
 
 
-encode(List, Types) ->
-    list_to_binary(enc(List, Types)).
-
-%%
-%% Encode record element
-%%
-enc(Xs, Ts) ->
-    enc(Xs, Ts, 0).
-
-enc(Xs, [boolean|Ts], Offset) ->
-    X = hd(Xs),
-    [?boolean(X) | enc(tl(Xs), Ts, Offset+1)];
-enc(Xs, [byte|Ts], Offset) ->
-    X = hd(Xs),
-    [?byte(X) | enc(tl(Xs), Ts,Offset+1)];
-enc(Xs, [uint16|Ts], Offset) ->
-    X = hd(Xs),
-    [?uint16(X) | enc(tl(Xs), Ts,Offset+2)];
-enc(Xs, [uint32 |Ts], Offset) ->
-    X = hd(Xs),
-    [?uint32(X) | enc(tl(Xs), Ts,Offset+4)];
-enc(Xs, [uint64|Ts], Offset) ->
-    X = hd(Xs),
-    [?uint64(X) | enc(tl(Xs), Ts,Offset+8)];
-enc(Xs, [mpint|Ts], Offset) ->
-    Y = mpint(hd(Xs)),
-    [Y | enc(tl(Xs), Ts,Offset+size(Y))];
-enc(Xs, [string|Ts], Offset) ->
-    X0 = hd(Xs),
-    Y = ?string(X0),
-    [Y | enc(tl(Xs),Ts,Offset+size(Y))];
-enc(Xs, [string_utf8|Ts], Offset) ->
-    X0 = hd(Xs),
-    Y = ?string_utf8(X0),
-    [Y | enc(tl(Xs),Ts,Offset+size(Y))];
-enc(Xs, [binary|Ts], Offset) ->
-     X0 = hd(Xs),
-    Y = ?binary(X0),
-    [Y | enc(tl(Xs), Ts,Offset+size(Y))];
-enc(Xs, [name_list|Ts], Offset) ->
-    X0 = hd(Xs),
-    Y = ?name_list(X0),
-    [Y | enc(tl(Xs), Ts, Offset+size(Y))];
-enc(Xs, [cookie|Ts], Offset) ->
-    [random(16) | enc(tl(Xs), Ts, Offset+16)];
-enc(Xs, [{pad,N}|Ts], Offset) ->
-    K = (N - (Offset rem N)) rem N,
-    [fill_bits(K,0) | enc(Xs, Ts, Offset+K)];
-enc(Xs, ['...'| []], _Offset) ->
-    X = hd(Xs),
-    if is_binary(X) ->
-	    [X];
-       is_list(X) ->
-	    [list_to_binary(X)];
-       X==undefined ->
-	    []
-    end;
-enc([], [],_) ->
-    [].
-
-
-%%
-%% Create a binary with constant bytes 
-%%
-fill_bits(N,C) ->
-    list_to_binary(fill(N,C)).
-
-fill(0,_C) -> [];
-fill(1,C) -> [C];
-fill(N,C) ->
-    Cs = fill(N div 2, C),
-    Cs1 = [Cs,Cs],
-    if N band 1 == 0 ->
-	    Cs1;
-       true ->
-	    [C,Cs,Cs]
-    end.
-
-
+%%%----------------------------------------------------------------
 %% random/1
 %%   Generate N random bytes
 %%
-random(N) ->
-    crypto:strong_rand_bytes(N).
+random(N) -> crypto:strong_rand_bytes(N).
 
 
 
diff --git a/lib/ssh/src/ssh_connect.hrl b/lib/ssh/src/ssh_connect.hrl
index 9f9f3de8fa..0c9ddad641 100644
--- a/lib/ssh/src/ssh_connect.hrl
+++ b/lib/ssh/src/ssh_connect.hrl
@@ -24,8 +24,9 @@
 
 -type channel_id()           :: integer().
 
--define(DEFAULT_PACKET_SIZE, 32768).
--define(DEFAULT_WINDOW_SIZE, 2*?DEFAULT_PACKET_SIZE).
+-define(DEFAULT_PACKET_SIZE, 65536).
+-define(DEFAULT_WINDOW_SIZE, 10*?DEFAULT_PACKET_SIZE).
+
 -define(DEFAULT_TIMEOUT, 5000).
 -define(MAX_PROTO_VERSION, 255).
 
diff --git a/lib/ssh/src/ssh_dbg.erl b/lib/ssh/src/ssh_dbg.erl
new file mode 100644
index 0000000000..fbf85cfcfc
--- /dev/null
+++ b/lib/ssh/src/ssh_dbg.erl
@@ -0,0 +1,140 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-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%
+%%
+
+%%
+
+-module(ssh_dbg).
+
+-export([messages/0,
+	 messages/1
+	]).
+
+-include("ssh.hrl").
+-include("ssh_transport.hrl").
+-include("ssh_connect.hrl").
+-include("ssh_auth.hrl").
+
+-record(data, {
+	  writer,
+	  acc = []}).
+%%%================================================================
+messages() -> messages(fun(String,_D) -> io:format(String) end).
+%% messages() -> messages(fun(String,Acc) -> [String|Acc] end)
+
+messages(Write) when is_function(Write,2) ->
+    catch dbg:start(),
+
+    Handler = fun msg_formater/2,
+    InitialData = #data{writer = Write},
+    {ok,_} = dbg:tracer(process, {Handler, InitialData}),
+
+    dbg:p(new,c),
+    dbg:tp(ssh_message,encode,1, x),
+    dbg:tp(ssh_message,decode,1, x),
+    dbg:tpl(ssh_transport,select_algorithm,3, x).
+
+%%%================================================================
+msg_formater({trace,Pid,call,{ssh_message,encode,[Msg]}}, D) ->
+    fmt("~nSEND ~p ~s~n", [Pid,wr_record(shrink_bin(Msg))], D);
+
+msg_formater({trace,Pid,return_from,{ssh_message,decode,1},Msg}, D) -> 
+    fmt("~nRECV ~p ~s~n", [Pid,wr_record(shrink_bin(Msg))], D);
+	
+msg_formater({trace,Pid,return_from,{ssh_transport,select_algorithm,3},{ok,Alg}}, D) ->
+    fmt("~nALGORITHMS ~p~n~s~n", [Pid, wr_record(Alg)], D);
+
+msg_formater(_, D) -> 
+    D.
+
+
+fmt(Fmt, Args,  D=#data{writer=Write,acc=Acc}) ->
+    D#data{acc = Write(io_lib:format(Fmt, Args), Acc)}.
+
+%%%----------------------------------------------------------------
+shrink_bin(B) when is_binary(B), size(B)>100 -> {'*** SHRINKED BIN',size(B),element(1,split_binary(B,20)),'***'};
+shrink_bin(L) when is_list(L) -> lists:map(fun shrink_bin/1, L);
+shrink_bin(T) when is_tuple(T) -> list_to_tuple(shrink_bin(tuple_to_list(T)));
+shrink_bin(X) -> X.
+
+%%%----------------------------------------------------------------
+-define(wr_record(N,BlackList), wr_record(R=#N{}) -> wr_record(R, record_info(fields,N), BlackList)).
+
+-define(wr_record(N), ?wr_record(N, [])).
+
+
+?wr_record(alg);
+
+?wr_record(ssh_msg_disconnect);
+?wr_record(ssh_msg_ignore);
+?wr_record(ssh_msg_unimplemented);
+?wr_record(ssh_msg_debug);
+?wr_record(ssh_msg_service_request);
+?wr_record(ssh_msg_service_accept);
+?wr_record(ssh_msg_kexinit);
+?wr_record(ssh_msg_kexdh_init);
+?wr_record(ssh_msg_kexdh_reply);
+?wr_record(ssh_msg_newkeys);
+?wr_record(ssh_msg_kex_dh_gex_request);
+?wr_record(ssh_msg_kex_dh_gex_request_old);
+?wr_record(ssh_msg_kex_dh_gex_group);
+?wr_record(ssh_msg_kex_dh_gex_init);
+?wr_record(ssh_msg_kex_dh_gex_reply);
+?wr_record(ssh_msg_kex_ecdh_init);
+?wr_record(ssh_msg_kex_ecdh_reply);
+
+?wr_record(ssh_msg_userauth_request);
+?wr_record(ssh_msg_userauth_failure);
+?wr_record(ssh_msg_userauth_success);
+?wr_record(ssh_msg_userauth_banner);
+?wr_record(ssh_msg_userauth_passwd_changereq);
+?wr_record(ssh_msg_userauth_pk_ok);
+?wr_record(ssh_msg_userauth_info_request);
+?wr_record(ssh_msg_userauth_info_response);
+
+?wr_record(ssh_msg_global_request);
+?wr_record(ssh_msg_request_success);
+?wr_record(ssh_msg_request_failure);
+?wr_record(ssh_msg_channel_open);
+?wr_record(ssh_msg_channel_open_confirmation);
+?wr_record(ssh_msg_channel_open_failure);
+?wr_record(ssh_msg_channel_window_adjust);
+?wr_record(ssh_msg_channel_data);
+?wr_record(ssh_msg_channel_extended_data);
+?wr_record(ssh_msg_channel_eof);
+?wr_record(ssh_msg_channel_close);
+?wr_record(ssh_msg_channel_request);
+?wr_record(ssh_msg_channel_success);
+?wr_record(ssh_msg_channel_failure);
+
+wr_record(R) -> io_lib:format('~p~n',[R]).
+
+
+wr_record(T, Fs, BL) when is_tuple(T) ->
+    wr_record(tuple_to_list(T), Fs, BL);
+wr_record([Name|Values], Fields, BlackL) ->
+    W = case Fields of
+	    [] -> 0;
+	    _ -> lists:max([length(atom_to_list(F)) || F<-Fields])
+	end,
+    [io_lib:format("~p:~n",[string:to_upper(atom_to_list(Name))])
+     | [io_lib:format("  ~*p: ~p~n",[W,Tag,Value]) || {Tag,Value} <- lists:zip(Fields,Values),
+						      not lists:member(Tag,BlackL)
+       ]
+    ].
diff --git a/lib/ssh/src/ssh_info.erl b/lib/ssh/src/ssh_info.erl
index 4e6e25bc70..67130d5eac 100644
--- a/lib/ssh/src/ssh_info.erl
+++ b/lib/ssh/src/ssh_info.erl
@@ -25,132 +25,174 @@
 
 -module(ssh_info).
 
--compile(export_all).
+-export([print/0,
+	 print/1,
+	 string/0,
+	 collect_pids/0
+	]).
+
+-include("ssh_connect.hrl").
 
 print() ->
-    print(user).
+    io:format("~s", [string()]).
 
+print(File) when is_list(File) ->
+    {ok,D} = file:open(File, write),
+    print(D),
+    file:close(D);
 print(D) ->
+    io:format(D, "~s", [string()]).
+
+string() ->
     try supervisor:which_children(ssh_sup)
     of
 	_ ->
-	    io:nl(D),
-	    print_general(D),
-	    io:nl(D),
-	    underline(D, "Client part", $=),
-	    print_clients(D),
-	    io:nl(D),
-	    underline(D, "Server part", $=),
-	    print_servers(D),
-	    io:nl(D),
-	    %% case os:type() of
-	    %% 	{unix,_} ->
-	    %% 	    io:nl(),
-	    %% 	    underline("Linux part", $=),
-	    %% 	    underline("Listening"),
-	    %% 	    catch io:format(os:cmd("netstat -tpln")),
-	    %% 	    io:nl(),
-	    %% 	    underline("Other"),
-	    %% 	    catch io:format(os:cmd("netstat -tpn"));
-	    %% 	_ -> ok
-	    %% end,
-	    underline(D, "Supervisors", $=),
-	    walk_sups(D, ssh_sup),
-	    io:nl(D)
+	    [io_lib:nl(),
+	     print_general(),
+	     io_lib:nl(),
+	     underline("Client part", $=),
+	     print_clients(),
+	     io_lib:nl(),
+	     underline("Server part", $=),
+	     print_servers(),
+	     io_lib:nl(),
+	     underline("Supervisors", $=),
+	     walk_sups(ssh_sup),
+	     io_lib:nl()]
     catch
 	_:_ ->
-	    io:format(D,"Ssh not found~n",[])
+	    io_lib:format("Ssh not found~n",[])
     end.
 
+
 %%%================================================================
-print_general(D) ->
+-define(INDENT, "    ").
+
+print_general() ->
     {_Name, Slogan, Ver} = lists:keyfind(ssh,1,application:which_applications()),
-    underline(D, io_lib:format("~s  ~s", [Slogan, Ver]), $=),
-    io:format(D, 'This printout is generated ~s. ~n',[datetime()]).
+    [underline(io_lib:format("~s  ~s", [Slogan, Ver]), $=),
+     io_lib:format('This printout is generated ~s. ~n',[datetime()])
+    ].
 
-%%%================================================================
-print_clients(D) ->
-    PrintClient = fun(X) -> print_client(D,X) end,
+print_clients() ->
     try
-	lists:foreach(PrintClient, supervisor:which_children(sshc_sup))
+	lists:map(fun print_client/1,
+		  supervisor:which_children(sshc_sup))
     catch
 	C:E ->
-	    io:format(D, '***FAILED: ~p:~p~n',[C,E])
+	    io_lib:format('***print_clients FAILED: ~p:~p~n',[C,E])
     end.
 
-print_client(D, {undefined,Pid,supervisor,[ssh_connection_handler]}) ->
+print_client({undefined,Pid,supervisor,[ssh_connection_handler]}) ->
     {{Local,Remote},_Str} = ssh_connection_handler:get_print_info(Pid),
-    io:format(D, "    Local=~s  Remote=~s  ConnectionRef=~p~n",[fmt_host_port(Local),fmt_host_port(Remote),Pid]);
-print_client(D, Other) ->
-    io:format(D, "    [[Other 1: ~p]]~n",[Other]).
+    [io_lib:format(?INDENT"Local: ~s  Remote: ~s  ConnectionRef = ~p~n",
+		   [fmt_host_port(Local), fmt_host_port(Remote), Pid]),
+     case channels(Pid) of
+	 {ok,Channels=[_|_]} ->
+	     [print_ch(ChPid) || #channel{user=ChPid} <- Channels];
+	_ ->
+	    io_lib:format(?INDENT?INDENT?INDENT"No channels~n",[])
+     end];
+
+print_client(Other) ->
+    io_lib:format("    [[Other 1: ~p]]~n",[Other]).
 
 
 %%%================================================================
-print_servers(D) ->
-    PrintServer = fun(X) -> print_server(D,X) end,
+print_servers() ->
     try
-	lists:foreach(PrintServer, supervisor:which_children(sshd_sup))
+	lists:map(fun print_server/1,
+		  supervisor:which_children(sshd_sup))
     catch
 	C:E ->
-	    io:format(D, '***FAILED: ~p:~p~n',[C,E])
+	    io_lib:format('***print_servers FAILED: ~p:~p~n',[C,E])
     end.
 
-print_server(D, {{server,ssh_system_sup,LocalHost,LocalPort},Pid,supervisor,[ssh_system_sup]}) when is_pid(Pid) ->
-    io:format(D, 'Local=~s (~p children)~n',[fmt_host_port({LocalHost,LocalPort}),
-					     ssh_acceptor:number_of_connections(Pid)]),
-    PrintSystemSup = fun(X) -> print_system_sup(D,X) end,
-    lists:foreach(PrintSystemSup, supervisor:which_children(Pid));
-print_server(D, Other) ->
-    io:format(D, "    [[Other 2: ~p]]~n",[Other]).
-    
-print_system_sup(D, {Ref,Pid,supervisor,[ssh_subsystem_sup]}) when is_reference(Ref),
+
+print_server({{server,ssh_system_sup,LocalHost,LocalPort,Profile},Pid,supervisor,[ssh_system_sup]}) when is_pid(Pid) ->
+    Children = supervisor:which_children(Pid),
+    [io_lib:format(?INDENT"Listen: ~s (~p children) Profile ~p",[fmt_host_port({LocalHost,LocalPort}),
+								 ssh_acceptor:number_of_connections(Pid),
+								 Profile]),
+     case [AccPid 
+	   || {{ssh_acceptor_sup,_LocalHost,_LocalPort,_Profile}, AccPid, supervisor, [ssh_acceptor_sup]} 
+		  <- Children] of
+	 AcceptorPids = [_|_] ->
+	     [io_lib:format("  [Acceptor Pid", []),
+	      [io_lib:format(" ~p",[AccPid]) || AccPid <- AcceptorPids],
+	      io_lib:format("]~n", [])
+	     ];
+	 [] ->
+	     io_lib:nl()
+     end,
+     lists:map(fun print_system_sup/1,
+	       supervisor:which_children(Pid))
+    ].
+
+
+print_system_sup({Ref,Pid,supervisor,[ssh_subsystem_sup]}) when is_reference(Ref),
 								is_pid(Pid) ->
-    PrintChannels =  fun(X) -> print_channels(D,X) end,
-    lists:foreach(PrintChannels, supervisor:which_children(Pid));
-print_system_sup(D, {{ssh_acceptor_sup,LocalHost,LocalPort}, Pid,supervisor, [ssh_acceptor_sup]}) when is_pid(Pid) ->
-    io:format(D, "    [Acceptor for ~s]~n",[fmt_host_port({LocalHost,LocalPort})]);
-print_system_sup(D, Other) -> 
-    io:format(D, "    [[Other 3: ~p]]~n",[Other]).
-
-print_channels(D, {{server,ssh_channel_sup,_,_},Pid,supervisor,[ssh_channel_sup]}) when is_pid(Pid) ->
-    PrintChannel =  fun(X) -> print_channel(D,X) end,
-    lists:foreach(PrintChannel, supervisor:which_children(Pid));
-print_channels(D, Other) -> 
-    io:format(D, "    [[Other 4: ~p]]~n",[Other]).
-
-
-print_channel(D, {Ref,Pid,worker,[ssh_channel]}) when is_reference(Ref), 
-						      is_pid(Pid)  ->
-    {{ConnManager,ChannelID}, Str} = ssh_channel:get_print_info(Pid),
-    {{Local,Remote},StrM} = ssh_connection_handler:get_print_info(ConnManager),
-    io:format(D, '    ch ~p: ~s ~s',[ChannelID, StrM, Str]),
-    io:format(D, "    Local=~s Remote=~s~n",[fmt_host_port(Local),fmt_host_port(Remote)]);
-print_channel(D, Other) -> 
-    io:format(D, "    [[Other 5: ~p]]~n",[Other]).
-	      
+    lists:map(fun print_channels/1,
+		  supervisor:which_children(Pid));
+
+print_system_sup({{ssh_acceptor_sup,_LocalHost,_LocalPort,_Profile}, Pid, supervisor, [ssh_acceptor_sup]}) when is_pid(Pid) ->
+    [].
+
+
+
+print_channels({{server,ssh_channel_sup,_,_},Pid,supervisor,[ssh_channel_sup]}) when is_pid(Pid) ->
+    Children =  supervisor:which_children(Pid),
+    ChannelPids = [P || {R,P,worker,[ssh_channel]} <- Children,
+			is_pid(P),
+			is_reference(R)],
+    case ChannelPids of
+	[] -> io_lib:format(?INDENT?INDENT"No channels~n",[]);
+	[Ch1Pid|_] ->
+	    {{ConnManager,_}, _Str} = ssh_channel:get_print_info(Ch1Pid),
+	    {{_,Remote},_} = ssh_connection_handler:get_print_info(ConnManager),
+	    [io_lib:format(?INDENT?INDENT"Remote: ~s ConnectionRef = ~p~n",[fmt_host_port(Remote),ConnManager]),
+	     lists:map(fun print_ch/1, ChannelPids)
+	    ]
+    end;
+print_channels({{server,ssh_connection_sup,_,_},Pid,supervisor,[ssh_connection_sup]}) when is_pid(Pid) ->
+    []. % The supervisor of the connections socket owning process
+
+print_ch(Pid) ->
+    try
+	{{ConnManager,ChannelID}, Str} = ssh_channel:get_print_info(Pid),
+	{_LocalRemote,StrM} = ssh_connection_handler:get_print_info(ConnManager),
+	io_lib:format(?INDENT?INDENT?INDENT"ch ~p ~p: ~s ~s~n",[ChannelID, Pid, StrM, Str])
+    catch
+	C:E ->
+	    io_lib:format('****print_ch FAILED for ChanPid ~p: ~p:~p~n',[Pid, C, E])
+    end.
+
+
 %%%================================================================
 -define(inc(N), (N+4)).
 
-walk_sups(D, StartPid) ->
-    io:format(D, "Start at ~p, ~s.~n",[StartPid,dead_or_alive(StartPid)]),
-    walk_sups(D, children(StartPid), _Indent=?inc(0)).
+walk_sups(StartPid) ->
+    io_lib:format("Start at ~p, ~s.~n",[StartPid,dead_or_alive(StartPid)]),
+    walk_sups(children(StartPid), _Indent=?inc(0)).
 
-walk_sups(D, [H={_,Pid,_,_}|T], Indent) ->
-    indent(D, Indent), io:format(D, '~200p  ~p is ~s~n',[H,Pid,dead_or_alive(Pid)]),
-    case H of
-	{_,_,supervisor,[ssh_connection_handler]} -> ok;
-	{_,Pid,supervisor,_} -> walk_sups(D, children(Pid), ?inc(Indent));
-	_ -> ok
-    end,
-    walk_sups(D, T, Indent);
-walk_sups(_D, [], _) ->
-    ok.
+walk_sups([H={_,Pid,_,_}|T], Indent) ->
+    [indent(Indent),
+     io_lib:format('~200p  ~p is ~s~n',[H,Pid,dead_or_alive(Pid)]),
+     case H of
+	 {_,_,supervisor,[ssh_connection_handler]} -> "";
+	 {_,Pid,supervisor,_} -> walk_sups(children(Pid), ?inc(Indent));
+	 _ -> ""
+     end,
+     walk_sups(T, Indent)
+    ];
+walk_sups([], _) ->
+    "".
 
 dead_or_alive(Name) when is_atom(Name) ->
     case whereis(Name) of
-	undefined -> 
+	undefined ->
 	    "**UNDEFINED**";
-	Pid -> 
+	Pid ->
 	    dead_or_alive(Pid)
     end;
 dead_or_alive(Pid) when is_pid(Pid) ->
@@ -159,7 +201,8 @@ dead_or_alive(Pid) when is_pid(Pid) ->
 	_ -> "alive"
     end.
 
-indent(D, I) -> io:format(D,'~*c',[I,$ ]). 
+indent(I) -> io_lib:format('~*c',[I,$ ]).
+
 
 children(Pid) ->
     Parent = self(),
@@ -170,23 +213,39 @@ children(Pid) ->
 	{Helper,L} when is_list(L) ->
 	    L
     after
-	2000 -> 
+	2000 ->
 	    catch exit(Helper, kill),
 	    []
     end.
 
-%%%================================================================
-underline(D, Str) ->
-    underline(D, Str, $-).
+is_connection_handler(Pid) ->
+    try
+	{ssh_connection_handler,init,_} =
+	    proplists:get_value(
+	      '$initial_call',
+	      proplists:get_value(
+		dictionary,
+		process_info(Pid, [dictionary])))
+    of
+	_ -> true
 
-underline(D, Str, LineChar) ->
-    Len = lists:flatlength(Str),
-    io:format(D, '~s~n',[Str]),
-    line(D,Len,LineChar).
+    catch
+	_:_ ->
+	    false
+    end.
+
+channels(Pid) ->
+    case is_connection_handler(Pid) of
+	true ->
+	    ssh_connection_handler:info(Pid,all);
+	false ->
+	    false
+    end.
+
+%%%================================================================
+underline(Str, LineChar) ->
+    io_lib:format('~s~n~*c~n',[Str, lists:flatlength(Str), LineChar]).
 
-line(D, Len, Char) ->
-    io:format(D, '~*c~n', [Len,Char]).
-	    
 
 datetime() ->
     {{YYYY,MM,DD}, {H,M,S}} = calendar:now_to_universal_time(erlang:timestamp()),
@@ -196,8 +255,82 @@ datetime() ->
 fmt_host_port({{A,B,C,D},Port}) -> io_lib:format('~p.~p.~p.~p:~p',[A,B,C,D,Port]);
 fmt_host_port({Host,Port}) -> io_lib:format('~s:~p',[Host,Port]).
 
+%%%################################################################
+collect_pids() -> collect_pids(ssh_sup).
+
+collect_pids(P) ->
+    Collector = pcollect_pids(P, spawn(fun init_collector/0)),
+    Collector ! {get_values,self()},
+    receive
+	{values,Values} ->
+	    Values
+    end.
+
+%%%----------------
+pcollect_pids(undefined, Collector) ->
+    Collector;
+
+pcollect_pids(A, Collector) when is_atom(A) ->
+    pcollect_pids(whereis(A), Collector);
+
+pcollect_pids(Pid, Collector) when is_pid(Pid) ->
+    Collector ! {expect,Pid},
+    spawn(fun() ->
+		  lists:foreach(
+		    fun(P2) ->
+			    pcollect_pids(P2,Collector)
+		    end, children(Pid)),
+		  Collector ! {value,Pid,Pid}
+	  end),
+    Collector;
 
+pcollect_pids({Ref,Pid,supervisor,_}, Collector) when is_pid(Pid),
+						      is_reference(Ref) ->
+    pcollect_pids(Pid, Collector);
 
-nyi(D) ->
-    io:format(D,'Not yet implemented~n',[]),
-    nyi.
+pcollect_pids({sshc_sup,Pid,supervisor,_}, Collector) when is_pid(Pid) ->
+    pcollect_pids(Pid, Collector);
+
+pcollect_pids({sshd_sup,Pid,supervisor,_}, Collector) when is_pid(Pid) ->
+    pcollect_pids(Pid, Collector);
+
+pcollect_pids({{ssh_acceptor_sup,_,_,_},Pid,supervisor,_}, Collector) when is_pid(Pid) ->
+    pcollect_pids(Pid, Collector);
+
+pcollect_pids({{server,_,_,_},Pid,supervisor,_}, Collector) when is_pid(Pid) ->
+    pcollect_pids(Pid, Collector);
+
+pcollect_pids({{server,_,_,_,_},Pid,supervisor,_}, Collector) when is_pid(Pid) ->
+    pcollect_pids(Pid, Collector);
+
+pcollect_pids({undefined,Pid,supervisor,[ssh_connection_handler]}, Collector) ->
+    Collector ! {value,Pid,Pid},
+    case channels(Pid) of
+	{ok,L} ->
+	    [Collector!{value,P,P} || #channel{user=P} <- L];
+	_ ->
+	    ok
+    end,
+    Collector;
+
+pcollect_pids({_,Pid,_,_}, Collector) when is_pid(Pid) ->
+    Collector ! {value,Pid,Pid},
+    Collector;
+
+pcollect_pids(_, Collector) ->
+    Collector.
+
+%%%----------------
+init_collector() ->
+    loop_collector([],[]).
+
+loop_collector(Expects, Values) ->
+    receive
+	{expect, Ref} ->
+	    loop_collector([Ref|Expects], Values);
+	{value, Ref, Val} ->
+	    loop_collector(Expects--[Ref], [Val|Values]);
+	{get_values, From} when Expects==[] ->
+%%				Values=/=[] ->
+	    From ! {values,Values}
+    end.
diff --git a/lib/ssh/src/ssh_message.erl b/lib/ssh/src/ssh_message.erl
index b6c4496be2..a0e9a4961c 100644
--- a/lib/ssh/src/ssh_message.erl
+++ b/lib/ssh/src/ssh_message.erl
@@ -32,16 +32,44 @@
 
 -export([encode/1, decode/1, decode_keyboard_interactive_prompts/2]).
 
+-define('2bin'(X), (if is_binary(X) -> X;
+		       is_list(X) -> list_to_binary(X);
+		       X==undefined -> <<>>
+		    end) ).
+
+-define('E...'(X),    ?'2bin'(X)/binary ).
+-define(Eboolean(X),  ?BOOLEAN(case X of
+				   true -> ?TRUE;
+				   false -> ?FALSE
+			       end) ).
+-define(Ebyte(X),        ?BYTE(X) ).
+-define(Euint32(X),      ?UINT32(X) ).
+-define(Estring(X),      ?STRING(?'2bin'(X)) ).
+-define(Estring_utf8(X), ?string_utf8(X)/binary ).
+-define(Ename_list(X),   ?STRING(ssh_bits:name_list(X)) ).
+-define(Empint(X),       (ssh_bits:mpint(X))/binary ).
+-define(Ebinary(X),      ?STRING(X) ).
+
+%% encode(Msg) ->
+%%     try encode1(Msg)
+%%     catch
+%% 	C:E ->
+%% 	    io:format('***********************~n~p:~p  ~p~n',[C,E,Msg]),
+%% 	    error(E)
+%%     end.
+
 encode(#ssh_msg_global_request{
 	  name = Name,
 	  want_reply = Bool,
 	  data = Data}) ->
-    ssh_bits:encode([?SSH_MSG_GLOBAL_REQUEST,
-		     Name, Bool, Data], [byte, string, boolean, '...']);
+    <<?Ebyte(?SSH_MSG_GLOBAL_REQUEST), ?Estring(Name), ?Eboolean(Bool), ?'E...'(Data)>>;
+
 encode(#ssh_msg_request_success{data = Data}) ->
-    <<?BYTE(?SSH_MSG_REQUEST_SUCCESS), Data/binary>>;
+    <<?Ebyte(?SSH_MSG_REQUEST_SUCCESS), Data/binary>>;
+
 encode(#ssh_msg_request_failure{}) ->
-    <<?BYTE(?SSH_MSG_REQUEST_FAILURE)>>;
+    <<?Ebyte(?SSH_MSG_REQUEST_FAILURE)>>;
+
 encode(#ssh_msg_channel_open{
 	  channel_type = Type,
 	  sender_channel = Sender,
@@ -49,9 +77,8 @@ encode(#ssh_msg_channel_open{
 	  maximum_packet_size = Max,
 	  data = Data
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_CHANNEL_OPEN,
-		     Type, Sender, Window, Max, Data], [byte, string, uint32,
-							uint32, uint32, '...']);
+    <<?Ebyte(?SSH_MSG_CHANNEL_OPEN), ?Estring(Type), ?Euint32(Sender), ?Euint32(Window), ?Euint32(Max), ?'E...'(Data)>>;
+
 encode(#ssh_msg_channel_open_confirmation{
 	  recipient_channel = Recipient,
 	  sender_channel = Sender,
@@ -59,60 +86,63 @@ encode(#ssh_msg_channel_open_confirmation{
 	  maximum_packet_size = MaxPacketSize,
 	  data = Data
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_CHANNEL_OPEN_CONFIRMATION, Recipient,
-		     Sender, InitWindowSize, MaxPacketSize, Data],
-		    [byte, uint32, uint32, uint32, uint32, '...']);
+    <<?Ebyte(?SSH_MSG_CHANNEL_OPEN_CONFIRMATION),
+      ?Euint32(Recipient), ?Euint32(Sender), ?Euint32(InitWindowSize), ?Euint32(MaxPacketSize),
+      ?'E...'(Data)>>;
+
 encode(#ssh_msg_channel_open_failure{
 	  recipient_channel = Recipient,
 	  reason = Reason,
 	  description = Desc,
 	  lang = Lang
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_CHANNEL_OPEN_FAILURE, Recipient,
-		     Reason, Desc, Lang], [byte, uint32, uint32, string, string]);
+    <<?Ebyte(?SSH_MSG_CHANNEL_OPEN_FAILURE), ?Euint32(Recipient),?Euint32(Reason), ?Estring(Desc), ?Estring(Lang)>>;
+
 encode(#ssh_msg_channel_window_adjust{
 	  recipient_channel = Recipient,
 	  bytes_to_add = Bytes
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_CHANNEL_WINDOW_ADJUST, Recipient, Bytes],
-		    [byte, uint32, uint32]);
+    <<?Ebyte(?SSH_MSG_CHANNEL_WINDOW_ADJUST), ?Euint32(Recipient), ?Euint32(Bytes)>>;
+
 encode(#ssh_msg_channel_data{
 	  recipient_channel = Recipient,
 	  data = Data
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_CHANNEL_DATA, Recipient, Data], [byte, uint32, binary]);
+   <<?Ebyte(?SSH_MSG_CHANNEL_DATA), ?Euint32(Recipient), ?Ebinary(Data)>>;
 
 encode(#ssh_msg_channel_extended_data{
 	  recipient_channel = Recipient,
 	  data_type_code = DataType,
 	  data = Data
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_CHANNEL_EXTENDED_DATA, Recipient,
-		     DataType, Data], [byte, uint32, uint32, binary]);
+    <<?Ebyte(?SSH_MSG_CHANNEL_EXTENDED_DATA), ?Euint32(Recipient), ?Euint32(DataType), ?Ebinary(Data)>>;
 
 encode(#ssh_msg_channel_eof{recipient_channel = Recipient
 			   }) ->
-    <<?BYTE(?SSH_MSG_CHANNEL_EOF), ?UINT32(Recipient)>>;
+    <<?Ebyte(?SSH_MSG_CHANNEL_EOF), ?Euint32(Recipient)>>;
+
 encode(#ssh_msg_channel_close{
 	   recipient_channel = Recipient
 	  }) ->
-    <<?BYTE(?SSH_MSG_CHANNEL_CLOSE),  ?UINT32(Recipient)>>;
+    <<?Ebyte(?SSH_MSG_CHANNEL_CLOSE), ?Euint32(Recipient)>>;
+
 encode(#ssh_msg_channel_request{
 	  recipient_channel = Recipient,
 	  request_type = Type,
 	  want_reply = Bool,
 	  data  = Data
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_CHANNEL_REQUEST, Recipient, Type, Bool, Data],
-		    [byte, uint32, string, boolean, '...']);
+    <<?Ebyte(?SSH_MSG_CHANNEL_REQUEST), ?Euint32(Recipient), ?Estring(Type), ?Eboolean(Bool), ?'E...'(Data)>>;
+
 encode(#ssh_msg_channel_success{
 	  recipient_channel = Recipient
 	 }) ->
-    <<?BYTE(?SSH_MSG_CHANNEL_SUCCESS), ?UINT32(Recipient)>>;
+    <<?Ebyte(?SSH_MSG_CHANNEL_SUCCESS), ?Euint32(Recipient)>>;
+
 encode(#ssh_msg_channel_failure{
 	  recipient_channel = Recipient
 	 }) ->
-    <<?BYTE(?SSH_MSG_CHANNEL_FAILURE), ?UINT32(Recipient)>>;
+    <<?Ebyte(?SSH_MSG_CHANNEL_FAILURE), ?Euint32(Recipient)>>;
 
 encode(#ssh_msg_userauth_request{
 	  user = User,
@@ -120,36 +150,33 @@ encode(#ssh_msg_userauth_request{
 	  method = Method,
 	  data = Data
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_USERAUTH_REQUEST, User, Service, Method, Data],
-		    [byte, string_utf8, string, string, '...']);
+    <<?Ebyte(?SSH_MSG_USERAUTH_REQUEST), ?Estring_utf8(User), ?Estring(Service), ?Estring(Method), ?'E...'(Data)>>;
+
 encode(#ssh_msg_userauth_failure{
 	  authentications = Auths,
 	  partial_success = Bool
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_USERAUTH_FAILURE, Auths, Bool],
-		    [byte, string, boolean]);
+    <<?Ebyte(?SSH_MSG_USERAUTH_FAILURE), ?Estring(Auths), ?Eboolean(Bool)>>;
+
 encode(#ssh_msg_userauth_success{}) ->
-    <<?BYTE(?SSH_MSG_USERAUTH_SUCCESS)>>;
+    <<?Ebyte(?SSH_MSG_USERAUTH_SUCCESS)>>;
 
 encode(#ssh_msg_userauth_banner{
        message = Banner,
        language = Lang
       }) ->
-    ssh_bits:encode([?SSH_MSG_USERAUTH_BANNER, Banner, Lang],
-		    [byte, string_utf8, string]);
+    <<?Ebyte(?SSH_MSG_USERAUTH_BANNER), ?Estring_utf8(Banner), ?Estring(Lang)>>;
 
 encode(#ssh_msg_userauth_pk_ok{
 	  algorithm_name = Alg,
 	  key_blob = KeyBlob
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_USERAUTH_PK_OK, Alg, KeyBlob],
-		    [byte, string, binary]);
+    <<?Ebyte(?SSH_MSG_USERAUTH_PK_OK), ?Estring(Alg), ?Ebinary(KeyBlob)>>;
 
 encode(#ssh_msg_userauth_passwd_changereq{prompt = Prompt,
 					  languge = Lang
 					 })->
-    ssh_bits:encode([?SSH_MSG_USERAUTH_PASSWD_CHANGEREQ, Prompt, Lang],
-		    [byte, string, string]);
+    <<?Ebyte(?SSH_MSG_USERAUTH_PASSWD_CHANGEREQ), ?Estring(Prompt), ?Estring(Lang)>>;
 
 encode(#ssh_msg_userauth_info_request{
 	  name = Name,
@@ -157,41 +184,37 @@ encode(#ssh_msg_userauth_info_request{
 	  language_tag = Lang,
 	  num_prompts = NumPromtps,
 	  data = Data}) ->
-    ssh_bits:encode([?SSH_MSG_USERAUTH_INFO_REQUEST, Name, Inst, Lang, NumPromtps, Data],
-		    [byte, string, string, string, uint32, '...']);
+    <<?Ebyte(?SSH_MSG_USERAUTH_INFO_REQUEST), ?Estring(Name), ?Estring(Inst), ?Estring(Lang),
+      ?Euint32(NumPromtps), ?'E...'(Data)>>;
 
 encode(#ssh_msg_userauth_info_response{
 	  num_responses = Num,
 	  data = Data}) ->
-    Responses = lists:map(fun("") ->
-				  <<>>;
-			     (Response) ->
-				  ssh_bits:encode([Response], [string])
-			  end, Data),
-    Start = ssh_bits:encode([?SSH_MSG_USERAUTH_INFO_RESPONSE, Num],
-			    [byte, uint32]),
-    iolist_to_binary([Start, Responses]);
+    lists:foldl(fun %%("", Acc) -> Acc;  % commented out since it seem wrong
+		    (Response, Acc) -> <<Acc/binary, ?Estring(Response)>>
+		end,
+		<<?Ebyte(?SSH_MSG_USERAUTH_INFO_RESPONSE), ?Euint32(Num)>>,
+		Data);
 
 encode(#ssh_msg_disconnect{
 	  code = Code,
 	  description = Desc,
 	  language = Lang
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_DISCONNECT, Code, Desc, Lang],
-		    [byte, uint32, string, string]);
+    <<?Ebyte(?SSH_MSG_DISCONNECT), ?Euint32(Code), ?Estring(Desc), ?Estring(Lang)>>;
 
 encode(#ssh_msg_service_request{
 	  name = Service
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_SERVICE_REQUEST, Service], [byte, string]);
+    <<?Ebyte(?SSH_MSG_SERVICE_REQUEST), ?Estring(Service)>>;
 
 encode(#ssh_msg_service_accept{
 	  name = Service
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_SERVICE_ACCEPT, Service], [byte, string]);
+    <<?Ebyte(?SSH_MSG_SERVICE_ACCEPT), ?Estring(Service)>>;
 
 encode(#ssh_msg_newkeys{}) ->
-    <<?BYTE(?SSH_MSG_NEWKEYS)>>;
+    <<?Ebyte(?SSH_MSG_NEWKEYS)>>;
 
 encode(#ssh_msg_kexinit{
 	  cookie = Cookie,
@@ -208,19 +231,13 @@ encode(#ssh_msg_kexinit{
 	  first_kex_packet_follows = Bool,
 	  reserved = Reserved
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_KEXINIT, Cookie, KeyAlgs, HostKeyAlgs, EncAlgC2S, EncAlgS2C,
-		     MacAlgC2S, MacAlgS2C, CompAlgS2C, CompAlgC2S, LangC2S, LangS2C, Bool,
-		     Reserved],
-		    [byte, cookie,
-		     name_list, name_list,
-		     name_list, name_list,
-		     name_list, name_list,
-		     name_list, name_list,
-		     name_list, name_list,
-		     boolean, uint32]);
+    <<?Ebyte(?SSH_MSG_KEXINIT), Cookie/binary,
+      ?Ename_list(KeyAlgs), ?Ename_list(HostKeyAlgs), ?Ename_list(EncAlgC2S), ?Ename_list(EncAlgS2C), ?Ename_list(MacAlgC2S),
+      ?Ename_list(MacAlgS2C), ?Ename_list(CompAlgS2C), ?Ename_list(CompAlgC2S), ?Ename_list(LangC2S), ?Ename_list(LangS2C),
+      ?Eboolean(Bool), ?Euint32(Reserved)>>;
 
 encode(#ssh_msg_kexdh_init{e = E}) ->
-    ssh_bits:encode([?SSH_MSG_KEXDH_INIT, E], [byte, mpint]);
+    <<?Ebyte(?SSH_MSG_KEXDH_INIT), ?Empint(E)>>;
 
 encode(#ssh_msg_kexdh_reply{
 	  public_host_key = Key,
@@ -229,25 +246,23 @@ encode(#ssh_msg_kexdh_reply{
 	 }) ->
     EncKey = public_key:ssh_encode(Key, ssh2_pubkey),
     EncSign = encode_signature(Key, Signature),
-    ssh_bits:encode([?SSH_MSG_KEXDH_REPLY, EncKey, F, EncSign], [byte, binary, mpint, binary]);
+    <<?Ebyte(?SSH_MSG_KEXDH_REPLY), ?Ebinary(EncKey), ?Empint(F), ?Ebinary(EncSign)>>;
 
 encode(#ssh_msg_kex_dh_gex_request{
 	  min = Min,
 	  n = N,
 	  max = Max
 	 }) ->
-    ssh_bits:encode([?SSH_MSG_KEX_DH_GEX_REQUEST, Min, N, Max],
-		    [byte, uint32, uint32, uint32]);
+    <<?Ebyte(?SSH_MSG_KEX_DH_GEX_REQUEST), ?Euint32(Min), ?Euint32(N), ?Euint32(Max)>>;
+
 encode(#ssh_msg_kex_dh_gex_request_old{n = N}) ->
-    ssh_bits:encode([?SSH_MSG_KEX_DH_GEX_REQUEST_OLD, N],
-		    [byte, uint32]);
+    <<?Ebyte(?SSH_MSG_KEX_DH_GEX_REQUEST_OLD), ?Euint32(N)>>;
 
 encode(#ssh_msg_kex_dh_gex_group{p = Prime, g = Generator}) ->
-    ssh_bits:encode([?SSH_MSG_KEX_DH_GEX_GROUP, Prime, Generator],
-		    [byte, mpint, mpint]);
+    <<?Ebyte(?SSH_MSG_KEX_DH_GEX_GROUP), ?Empint(Prime), ?Empint(Generator)>>;
 
 encode(#ssh_msg_kex_dh_gex_init{e = Public}) ->
-    ssh_bits:encode([?SSH_MSG_KEX_DH_GEX_INIT, Public], [byte, mpint]);
+    <<?Ebyte(?SSH_MSG_KEX_DH_GEX_INIT), ?Empint(Public)>>;
 
 encode(#ssh_msg_kex_dh_gex_reply{
 	  %% Will be private key encode_host_key extracts only the public part!
@@ -257,26 +272,26 @@ encode(#ssh_msg_kex_dh_gex_reply{
 	 }) ->
     EncKey = public_key:ssh_encode(Key, ssh2_pubkey),
     EncSign = encode_signature(Key, Signature),
-    ssh_bits:encode([?SSH_MSG_KEX_DH_GEX_REPLY, EncKey, F, EncSign], [byte, binary, mpint, binary]);
+    <<?Ebyte(?SSH_MSG_KEX_DH_GEX_REPLY), ?Ebinary(EncKey), ?Empint(F), ?Ebinary(EncSign)>>;
 
 encode(#ssh_msg_kex_ecdh_init{q_c = Q_c}) ->
-    ssh_bits:encode([?SSH_MSG_KEX_ECDH_INIT, Q_c], [byte, mpint]);
+    <<?Ebyte(?SSH_MSG_KEX_ECDH_INIT), ?Empint(Q_c)>>;
 
 encode(#ssh_msg_kex_ecdh_reply{public_host_key = Key, q_s = Q_s, h_sig = Sign}) ->
     EncKey = public_key:ssh_encode(Key, ssh2_pubkey),
     EncSign = encode_signature(Key, Sign),
-    ssh_bits:encode([?SSH_MSG_KEX_ECDH_REPLY, EncKey, Q_s, EncSign], [byte, binary, mpint, binary]);
+    <<?Ebyte(?SSH_MSG_KEX_ECDH_REPLY), ?Ebinary(EncKey), ?Empint(Q_s), ?Ebinary(EncSign)>>;
 
 encode(#ssh_msg_ignore{data = Data}) ->
-    ssh_bits:encode([?SSH_MSG_IGNORE, Data], [byte, string]);
+    <<?Ebyte(?SSH_MSG_IGNORE), ?Estring(Data)>>;
 
 encode(#ssh_msg_unimplemented{sequence = Seq}) ->
-    ssh_bits:encode([?SSH_MSG_UNIMPLEMENTED, Seq], [byte, uint32]);
+    <<?Ebyte(?SSH_MSG_UNIMPLEMENTED), ?Euint32(Seq)>>;
 
 encode(#ssh_msg_debug{always_display = Bool,
 		      message = Msg,
 		      language = Lang}) ->
-    ssh_bits:encode([?SSH_MSG_DEBUG, Bool, Msg, Lang], [byte, boolean, string, string]).
+    <<?Ebyte(?SSH_MSG_DEBUG), ?Eboolean(Bool), ?Estring(Msg), ?Estring(Lang)>>.
 
 
 %% Connection Messages
@@ -553,10 +568,10 @@ decode_signature(<<?DEC_BIN(_Alg,__0), ?UINT32(_), Signature/binary>>) ->
 
 
 encode_signature(#'RSAPublicKey'{}, Signature) ->
-    ssh_bits:encode(["ssh-rsa", Signature],[string, binary]);
+    <<?Ebinary(<<"ssh-rsa">>), ?Ebinary(Signature)>>;
 encode_signature({_, #'Dss-Parms'{}}, Signature) ->
-    ssh_bits:encode(["ssh-dss", Signature],[string, binary]);
+    <<?Ebinary(<<"ssh-dss">>), ?Ebinary(Signature)>>;
 encode_signature({#'ECPoint'{}, {namedCurve,OID}}, Signature) ->
     CurveName = public_key:oid2ssh_curvename(OID),
-    ssh_bits:encode([<<"ecdsa-sha2-",CurveName/binary>>, Signature], [binary,binary]).
+    <<?Ebinary(<<"ecdsa-sha2-",CurveName/binary>>), ?Ebinary(Signature)>>.
 
diff --git a/lib/ssh/src/ssh_sftp.erl b/lib/ssh/src/ssh_sftp.erl
index dbacf730cc..eb99406626 100644
--- a/lib/ssh/src/ssh_sftp.erl
+++ b/lib/ssh/src/ssh_sftp.erl
@@ -99,8 +99,8 @@ start_channel(Host) when is_list(Host) ->
     start_channel(Host, []).					 
 start_channel(Cm, Opts) when is_pid(Cm) ->
     Timeout = proplists:get_value(timeout, Opts, infinity),
-    {_, SftpOpts} = handle_options(Opts, [], []),
-    case ssh_xfer:attach(Cm, []) of
+    {_, ChanOpts, SftpOpts} = handle_options(Opts, [], [], []),
+    case ssh_xfer:attach(Cm, [], ChanOpts) of
 	{ok, ChannelId, Cm} -> 
 	    case ssh_channel:start(Cm, ChannelId, 
 				   ?MODULE, [Cm, ChannelId, SftpOpts]) of
@@ -123,9 +123,9 @@ start_channel(Cm, Opts) when is_pid(Cm) ->
 start_channel(Host, Opts) ->
     start_channel(Host, 22, Opts).
 start_channel(Host, Port, Opts) ->
-    {SshOpts, SftpOpts} = handle_options(Opts, [], []),
+    {SshOpts, ChanOpts, SftpOpts} = handle_options(Opts, [], [], []),
     Timeout = proplists:get_value(timeout, SftpOpts, infinity),
-    case ssh_xfer:connect(Host, Port, SshOpts, Timeout) of
+    case ssh_xfer:connect(Host, Port, SshOpts, ChanOpts, Timeout) of
 	{ok, ChannelId, Cm} ->
 	    case ssh_channel:start(Cm, ChannelId, ?MODULE, [Cm, 
 							    ChannelId, SftpOpts]) of
@@ -842,14 +842,18 @@ terminate(_Reason, State) ->
 %%====================================================================
 %% Internal functions
 %%====================================================================
-handle_options([], Sftp, Ssh) ->
-    {Ssh, Sftp};
-handle_options([{timeout, _} = Opt | Rest], Sftp, Ssh) ->
-    handle_options(Rest, [Opt | Sftp], Ssh);
-handle_options([{sftp_vsn, _} = Opt| Rest], Sftp, Ssh) ->
-    handle_options(Rest, [Opt | Sftp], Ssh);
-handle_options([Opt | Rest], Sftp, Ssh) ->
-    handle_options(Rest, Sftp, [Opt | Ssh]).
+handle_options([], Sftp, Chan, Ssh) ->
+    {Ssh, Chan, Sftp};
+handle_options([{timeout, _} = Opt | Rest], Sftp, Chan, Ssh) ->
+    handle_options(Rest, [Opt|Sftp], Chan, Ssh);
+handle_options([{sftp_vsn, _} = Opt| Rest], Sftp, Chan, Ssh) ->
+    handle_options(Rest, [Opt|Sftp], Chan, Ssh);
+handle_options([{window_size, _} = Opt| Rest], Sftp, Chan, Ssh) ->
+    handle_options(Rest, Sftp, [Opt|Chan], Ssh);
+handle_options([{packet_size, _} = Opt| Rest], Sftp, Chan, Ssh) ->
+    handle_options(Rest, Sftp, [Opt|Chan], Ssh);
+handle_options([Opt|Rest], Sftp, Chan, Ssh) ->
+    handle_options(Rest, Sftp, Chan, [Opt|Ssh]).
 
 call(Pid, Msg, TimeOut) ->
     ssh_channel:call(Pid, {{timeout, TimeOut}, Msg}, infinity).
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index 18037b8461..a648c7af3d 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -52,6 +52,14 @@
 -export([pack/3]).
 -export([decompress/2,  decrypt_blocks/3, is_valid_mac/3 ]). % FIXME: remove
 
+-define(Estring(X), ?STRING((if is_binary(X) -> X;
+				is_list(X) -> list_to_binary(X);
+				X==undefined -> <<>>
+			     end))).
+-define(Empint(X),     (ssh_bits:mpint(X))/binary ).
+-define(Ebinary(X),    ?STRING(X) ).
+-define(Euint32(X),   ?UINT32(X) ).
+
 %%%----------------------------------------------------------------------------
 %%%
 %%% There is a difference between supported and default algorithms. The
@@ -1084,7 +1092,7 @@ sign(SigData, Hash,  #'DSAPrivateKey'{} = Key) ->
 sign(SigData, Hash, Key = #'ECPrivateKey'{}) ->
     DerEncodedSign =  public_key:sign(SigData, Hash, Key),
     #'ECDSA-Sig-Value'{r=R, s=S} = public_key:der_decode('ECDSA-Sig-Value', DerEncodedSign),
-    ssh_bits:encode([R,S], [mpint,mpint]);
+    <<?Empint(R),?Empint(S)>>;
 sign(SigData, Hash, Key) ->
     public_key:sign(SigData, Hash, Key).
 
@@ -1584,21 +1592,16 @@ hash(K, H, Ki, N, HASH) ->
 
 kex_h(SSH, Key, E, F, K) ->
     KeyBin = public_key:ssh_encode(Key, ssh2_pubkey),
-    L = ssh_bits:encode([SSH#ssh.c_version, SSH#ssh.s_version,
-			 SSH#ssh.c_keyinit, SSH#ssh.s_keyinit,
-			 KeyBin, E,F,K],
-			[string,string,binary,binary,binary,
-			 mpint,mpint,mpint]),
+    L = <<?Estring(SSH#ssh.c_version), ?Estring(SSH#ssh.s_version),
+	  ?Ebinary(SSH#ssh.c_keyinit), ?Ebinary(SSH#ssh.s_keyinit), ?Ebinary(KeyBin),
+	  ?Empint(E), ?Empint(F), ?Empint(K)>>,
     crypto:hash(sha((SSH#ssh.algorithms)#alg.kex), L).
-%%  crypto:hash(sha,L).
 
 kex_h(SSH, Curve, Key, Q_c, Q_s, K) ->
     KeyBin = public_key:ssh_encode(Key, ssh2_pubkey),
-    L = ssh_bits:encode([SSH#ssh.c_version, SSH#ssh.s_version,
-			 SSH#ssh.c_keyinit, SSH#ssh.s_keyinit,
-			 KeyBin, Q_c, Q_s, K],
-			[string,string,binary,binary,binary,
-			 mpint,mpint,mpint]),
+    L = <<?Estring(SSH#ssh.c_version), ?Estring(SSH#ssh.s_version),
+	  ?Ebinary(SSH#ssh.c_keyinit), ?Ebinary(SSH#ssh.s_keyinit), ?Ebinary(KeyBin),
+	  ?Empint(Q_c), ?Empint(Q_s), ?Empint(K)>>,
     crypto:hash(sha(Curve), L).
 
 kex_h(SSH, Key, Min, NBits, Max, Prime, Gen, E, F, K) ->
@@ -1607,21 +1610,14 @@ kex_h(SSH, Key, Min, NBits, Max, Prime, Gen, E, F, K) ->
 		%% flag from 'ssh_msg_kex_dh_gex_request_old'
 		%% It was like this before that message was supported,
 		%% why?
-		Ts = [string,string,binary,binary,binary,
-		      uint32,
-		      mpint,mpint,mpint,mpint,mpint],
-		ssh_bits:encode([SSH#ssh.c_version,SSH#ssh.s_version,
-				 SSH#ssh.c_keyinit,SSH#ssh.s_keyinit,
-				 KeyBin, NBits, Prime, Gen, E,F,K],
-				Ts);
+		<<?Estring(SSH#ssh.c_version), ?Estring(SSH#ssh.s_version),
+		  ?Ebinary(SSH#ssh.c_keyinit), ?Ebinary(SSH#ssh.s_keyinit), ?Ebinary(KeyBin),
+		  ?Empint(E), ?Empint(F), ?Empint(K)>>;
 	   true ->
-		Ts = [string,string,binary,binary,binary,
-		      uint32,uint32,uint32,
-		      mpint,mpint,mpint,mpint,mpint],
-		ssh_bits:encode([SSH#ssh.c_version,SSH#ssh.s_version,
-				 SSH#ssh.c_keyinit,SSH#ssh.s_keyinit,
-				 KeyBin, Min, NBits, Max,
-				 Prime, Gen, E,F,K], Ts)
+		<<?Estring(SSH#ssh.c_version), ?Estring(SSH#ssh.s_version),
+		  ?Ebinary(SSH#ssh.c_keyinit), ?Ebinary(SSH#ssh.s_keyinit), ?Ebinary(KeyBin),
+		  ?Euint32(Min), ?Euint32(NBits), ?Euint32(Max),
+		  ?Empint(Prime), ?Empint(Gen), ?Empint(E), ?Empint(F), ?Empint(K)>>
 	end,
     crypto:hash(sha((SSH#ssh.algorithms)#alg.kex), L).
   
diff --git a/lib/ssh/src/ssh_xfer.erl b/lib/ssh/src/ssh_xfer.erl
index b8dff1c533..259dc71aa5 100644
--- a/lib/ssh/src/ssh_xfer.erl
+++ b/lib/ssh/src/ssh_xfer.erl
@@ -24,7 +24,7 @@
 
 -module(ssh_xfer).
 
--export([attach/2, connect/3, connect/4]).
+-export([attach/2, attach/3, connect/3, connect/4, connect/5]).
 -export([open/6, opendir/3, readdir/3, close/3, read/5, write/5,
 	 rename/5, remove/3, mkdir/4, rmdir/3, realpath/3, extended/4,
 	 stat/4, fstat/4, lstat/4, setstat/4,
@@ -47,28 +47,38 @@
 -define(is_set(F, Bits),
 	((F) band (Bits)) == (F)).
 
--define(XFER_PACKET_SIZE, 32768).
--define(XFER_WINDOW_SIZE, 4*?XFER_PACKET_SIZE).
+-define(XFER_PACKET_SIZE, 65536).
+-define(XFER_WINDOW_SIZE, 20*?XFER_PACKET_SIZE).
 
 attach(CM, Opts) ->
-    open_xfer(CM, Opts).
+    open_xfer(CM, Opts, []).
+
+attach(CM, Opts, ChanOpts) ->
+    open_xfer(CM, Opts, ChanOpts).
+
 
 connect(Host, Port, Opts) ->
     case ssh:connect(Host, Port, Opts) of
-	{ok, CM} -> open_xfer(CM, Opts);
+	{ok, CM} -> open_xfer(CM, Opts, []);
 	Error -> Error
     end.
 
 connect(Host, Port, Opts, Timeout) ->
+    connect(Host, Port, Opts, [], Timeout).
+
+connect(Host, Port, Opts, ChanOpts, Timeout) ->
     case ssh:connect(Host, Port, Opts, Timeout) of
-	{ok, CM} -> open_xfer(CM, [{timeout, Timeout}|Opts]);
+	{ok, CM} -> open_xfer(CM, [{timeout, Timeout}|Opts], ChanOpts);
 	{error, Timeout} -> {error, timeout};
 	Error -> Error
     end.
 
-open_xfer(CM, Opts) ->
+
+open_xfer(CM, Opts, ChanOpts) ->
     TMO = proplists:get_value(timeout, Opts, infinity),
-    case ssh_connection:session_channel(CM, ?XFER_WINDOW_SIZE, ?XFER_PACKET_SIZE, TMO) of
+    WindowSize = proplists:get_value(window_size, ChanOpts,  ?XFER_WINDOW_SIZE),
+    PacketSize = proplists:get_value(packet_size, ChanOpts,  ?XFER_PACKET_SIZE),
+    case ssh_connection:session_channel(CM, WindowSize, PacketSize, TMO) of
 	{ok, ChannelId} ->
 	    {ok, ChannelId, CM};
 	Error -> 
diff --git a/lib/ssh/test/Makefile b/lib/ssh/test/Makefile
index 9cd98f069f..fb539f98fa 100644
--- a/lib/ssh/test/Makefile
+++ b/lib/ssh/test/Makefile
@@ -64,8 +64,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 DATA_DIRS = $(MODULES:%=%_data)
 
-INCLUDES = -I$(ERL_TOP)/lib/test_server/include \
-	   -I$(ERL_TOP)/lib/ssh/src \
+INCLUDES = -I$(ERL_TOP)/lib/ssh/src
 
 EMAKEFILE=Emakefile
 MAKE_EMAKE = $(wildcard $(ERL_TOP)/make/make_emakefile)
@@ -88,8 +87,7 @@ RELSYSDIR = $(RELEASE_PATH)/ssh_test
 # The path to the test_server ebin dir is needed when
 # running the target "targets".
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS += -pa ../../../internal_tools/test_server/ebin \
-	$(INCLUDES)
+ERL_COMPILE_FLAGS += $(INCLUDES)
 
 EBIN = .
 
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index f0ac92fef6..2dc228a3cf 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -28,14 +28,15 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--define(TIMEOUT, 50000).
+-define(TIMEOUT, 10000).
 
 %%--------------------------------------------------------------------
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 
 suite() ->
-    [{ct_hooks,[ts_install_cth]}].
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,40}}].
 
 all() -> 
     %% [{group,kex},{group,cipher}... etc
@@ -90,18 +91,12 @@ init_per_suite(Config) ->
 	    ?MAX_NUM_ALGORITHMS
 	    ]),
     ct:log("all() ->~n    ~p.~n~ngroups()->~n    ~p.~n",[all(),groups()]),
-    catch crypto:stop(),
-    case catch crypto:start() of
-	ok ->
-	    ssh:start(),
-	    [{std_simple_sftp_size,25000} % Sftp transferred data size
-	     | setup_pubkey(Config)];
-	_Else ->
-	    {skip, "Crypto could not be started!"}
-    end.
+    ssh:start(),
+    [{std_simple_sftp_size,25000} % Sftp transferred data size
+     | setup_pubkey(Config)].
+
 end_per_suite(_Config) ->
-    ssh:stop(),
-    crypto:stop().
+    ssh:stop().
 
 
 init_per_group(Group, Config) ->
@@ -196,6 +191,9 @@ simple_exec_groups_no_match_too_large(Config) ->
 
 %%--------------------------------------------------------------------
 %% Testing all default groups
+
+simple_exec_groups() -> [{timetrap,{seconds,180}}].
+
 simple_exec_groups(Config) ->
     Sizes = interpolate( public_key:dh_gex_group_sizes() ),
     lists:foreach(
@@ -222,6 +220,7 @@ interpolate(Is) ->
 
 %%--------------------------------------------------------------------
 %% Use the ssh client of the OS to connect
+
 sshc_simple_exec(Config) ->
     PrivDir = ?config(priv_dir, Config),
     KnownHosts = filename:join(PrivDir, "known_hosts"),
@@ -231,10 +230,22 @@ sshc_simple_exec(Config) ->
 			" ",Host," 1+1."]),
     ct:log("~p",[Cmd]),
     SshPort = open_port({spawn, Cmd}, [binary]),
+    Expect = <<"2\n">>,
+    rcv_expected(SshPort, Expect).
+
+
+rcv_expected(SshPort, Expect) ->
     receive
-        {SshPort,{data, <<"2\n">>}} ->
-	    ok
+	{SshPort, {data,Expect}} ->
+	    ct:log("Got expected ~p from ~p",[Expect,SshPort]),
+	    catch port_close(SshPort),
+	    ok;
+	Other ->
+	    ct:log("Got UNEXPECTED ~p",[Other]),
+	    rcv_expected(SshPort, Expect)
+
     after ?TIMEOUT ->
+	    catch port_close(SshPort),
 	    ct:fail("Did not receive answer")
     end.
 
@@ -273,7 +284,9 @@ sshd_simple_exec(_Config) ->
 					     ConnectionRef, ChannelId1);
 	Other1 ->
 	    ct:fail(Other1)
-    end.
+    end,
+    ssh:close(ConnectionRef).
+
 
 %%%================================================================
 %%%
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 6c4c215b3d..18a05c0fb8 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -78,7 +78,8 @@
 %%--------------------------------------------------------------------
 
 suite() ->
-    [{ct_hooks,[ts_install_cth]}].
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,40}}].
 
 all() -> 
     [app_test,
@@ -129,16 +130,11 @@ basic_tests() ->
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    catch crypto:stop(),
-    case catch crypto:start() of
-	ok ->
-	    Config;
-	_Else ->
-	    {skip, "Crypto could not be started!"}
-    end.
+    Config.
+
 end_per_suite(_Config) ->
-    ssh:stop(),
-    crypto:stop().
+    ssh:stop().
+
 %%--------------------------------------------------------------------
 init_per_group(dsa_key, Config) ->
     DataDir = ?config(data_dir, Config),
@@ -441,6 +437,7 @@ exec(Config) when is_list(Config) ->
 	    ct:fail(Other1)
     end,
     ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId1),
+    ssh:close(ConnectionRef),
     ssh:stop_daemon(Pid).
 
 %%--------------------------------------------------------------------
@@ -474,6 +471,7 @@ exec_compressed(Config) when is_list(Config) ->
 		    ct:fail(Other)
 	    end,
 	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId),
+	    ssh:close(ConnectionRef),
 	    ssh:stop_daemon(Pid)
     end.
 
@@ -601,10 +599,14 @@ cli(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     SystemDir = filename:join(?config(priv_dir, Config), system),
     UserDir = ?config(priv_dir, Config),
-   
+    
+    TmpDir = filename:join(?config(priv_dir,Config), "tmp"),
+    ok = ssh_test_lib:del_dirs(TmpDir),
+    ok = file:make_dir(TmpDir),
+
     {_Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},{user_dir, UserDir},
 					       {password, "morot"},
-					       {ssh_cli, {ssh_test_cli, [cli]}}, 
+					       {ssh_cli, {ssh_test_cli, [cli,TmpDir]}}, 
 					       {subsystems, []},
 					       {failfun, fun ssh_test_lib:failfun/2}]),
     ct:sleep(500),
@@ -975,7 +977,10 @@ shell_no_unicode(Config) ->
     new_do_shell(?config(io,Config),
 		 [new_prompt,
 		  {type,"io:format(\"hej ~p~n\",[42])."},
-		  {expect,"hej 42"}
+		  {expect,"hej 42"},
+		  {expect,"ok"},
+		  new_prompt,
+		  {type,"exit()."}
 		 ]).
 	      
 %%--------------------------------------------------------------------
@@ -984,7 +989,9 @@ shell_unicode_string(Config) ->
 		 [new_prompt,
 		  {type,"io:format(\"こにちわ~ts~n\",[\"四二\"])."},
 		  {expect,"こにちわ四二"},
-		  {expect,"ok"}
+		  {expect,"ok"},
+		  new_prompt,
+		  {type,"exit()."}
 		 ]).
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_benchmark_SUITE.erl b/lib/ssh/test/ssh_benchmark_SUITE.erl
index e90bfa3d16..fe90da3028 100644
--- a/lib/ssh/test/ssh_benchmark_SUITE.erl
+++ b/lib/ssh/test/ssh_benchmark_SUITE.erl
@@ -44,9 +44,7 @@ groups() ->
 
 init_per_suite(Config) ->
     catch ssh:stop(),
-    catch crypto:stop(),
     try 
-	ok = crypto:start(),
 	report_client_algorithms(),
 	ok = ssh:start(),
 	{ok,TracerPid} = erlang_trace(),
@@ -58,7 +56,6 @@ init_per_suite(Config) ->
     
 end_per_suite(_Config) ->
     catch ssh:stop(),
-    catch crypto:stop(),
     ok.
 
 
@@ -406,7 +403,7 @@ function_algs_times_sizes(EncDecs, L) ->
 	   end
 	   || EncDec <- EncDecs,
 	      C = #call{mfa = ED,
-			args = Args,  %%[S,Data],
+			% args = Args,  %%[S,Data],
 			t_call = T0,
 			t_return = T1} <- L,
 	      ED == EncDec
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index 1b93cc9c32..a1fbe28a83 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -36,6 +36,9 @@
 %% suite() ->
 %%     [{ct_hooks,[ts_install_cth]}].
 
+suite() ->
+    [{timetrap,{seconds,40}}].
+
 all() ->
     [
      {group, openssh},
@@ -67,16 +70,10 @@ ptty() ->
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    catch crypto:stop(),
-    case catch crypto:start() of
-	ok ->
-	    Config;
-	_Else ->
-	    {skip, "Crypto could not be started!"}
-    end.
+    Config.
 
-end_per_suite(_Config) ->
-    crypto:stop().
+end_per_suite(Config) ->
+    Config.
 
 %%--------------------------------------------------------------------
 init_per_group(openssh, Config) ->
@@ -317,11 +314,7 @@ ptty_alloc_pixel(Config) when is_list(Config) ->
     ssh:close(ConnectionRef).
 
 %%--------------------------------------------------------------------
-
-interrupted_send() ->
-    [{doc, "Use a subsystem that echos n char and then sends eof to cause a channel exit partway through a large send."}].
-
-interrupted_send(Config) when is_list(Config) ->
+interrupted_send(Config) ->
     PrivDir = ?config(priv_dir, Config),
     UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
     file:make_dir(UserDir),
diff --git a/lib/ssh/test/ssh_echo_server.erl b/lib/ssh/test/ssh_echo_server.erl
index 96c9aad135..8b6273c3fe 100644
--- a/lib/ssh/test/ssh_echo_server.erl
+++ b/lib/ssh/test/ssh_echo_server.erl
@@ -31,6 +31,7 @@
 -export([init/1, handle_msg/2, handle_ssh_msg/2, terminate/2]).
 
 init([N]) ->
+    ct:pal("Echo server: ~p",[self()]),
     {ok, #state{n = N}}.
 
 handle_msg({ssh_channel_up, ChannelId, ConnectionManager}, State) ->
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index 6a201d401f..22a311df3c 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -51,8 +51,10 @@
 	 ssh_connect_arg4_timeout/1, 
 	 ssh_connect_negtimeout_parallel/1, 
 	 ssh_connect_negtimeout_sequential/1, 
-	 ssh_connect_nonegtimeout_connected_parallel/1, 
-	 ssh_connect_nonegtimeout_connected_sequential/1, 
+	 ssh_connect_nonegtimeout_connected_parallel/0, 
+	 ssh_connect_nonegtimeout_connected_parallel/1,
+	 ssh_connect_nonegtimeout_connected_sequential/0,
+	 ssh_connect_nonegtimeout_connected_sequential/1,
 	 ssh_connect_timeout/1, connect/4,
 	 ssh_daemon_minimal_remote_max_packet_size_option/1, 
 	 ssh_msg_debug_fun_option_client/1, 
@@ -79,7 +81,8 @@
 %%--------------------------------------------------------------------
 
 suite() ->
-    [{ct_hooks,[ts_install_cth]}].
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,40}}].
 
 all() -> 
     [connectfun_disconnectfun_server,
@@ -125,16 +128,11 @@ groups() ->
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    catch crypto:stop(),
-    case catch crypto:start() of
-	ok ->
-	    Config;
-	_Else ->
-	    {skip, "Crypto could not be started!"}
-    end.
+    Config.
+
 end_per_suite(_Config) ->
-    ssh:stop(),
-    crypto:stop().
+    ssh:stop().
+
 %%--------------------------------------------------------------------
 init_per_group(hardening_tests, Config) ->
     DataDir = ?config(data_dir, Config),
@@ -984,10 +982,16 @@ ssh_connect_negtimeout(Config, Parallel) ->
 
 %%--------------------------------------------------------------------
 %%% Test that ssh connection does not timeout if the connection is established (parallel)
+
+ssh_connect_nonegtimeout_connected_parallel() -> [{timetrap,{seconds,90}}].
+
 ssh_connect_nonegtimeout_connected_parallel(Config) ->
     ssh_connect_nonegtimeout_connected(Config, true).
 
 %%% Test that ssh connection does not timeout if the connection is established (non-parallel)
+
+ssh_connect_nonegtimeout_connected_sequential() -> [{timetrap,{seconds,90}}].
+
 ssh_connect_nonegtimeout_connected_sequential(Config) ->
     ssh_connect_nonegtimeout_connected(Config, false).
 
diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl
index fe197f8672..eea71038aa 100644
--- a/lib/ssh/test/ssh_protocol_SUITE.erl
+++ b/lib/ssh/test/ssh_protocol_SUITE.erl
@@ -42,7 +42,8 @@
 %%--------------------------------------------------------------------
 
 suite() ->
-    [{ct_hooks,[ts_install_cth]}].
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,40}}].
 
 all() -> 
     [{group,tool_tests},
@@ -307,7 +308,7 @@ no_common_alg_client_disconnects(Config) ->
 			  {send, hello},
 			  {match, #ssh_msg_kexinit{_='_'}, receive_msg},
 			  {send,  #ssh_msg_kexinit{ % with unsupported "SOME-UNSUPPORTED"
-				     cookie = 247381486335508958743193106082599558706,
+				     cookie = <<80,158,95,51,174,35,73,130,246,141,200,49,180,190,82,234>>,
 				     kex_algorithms = ["diffie-hellman-group1-sha1"],
 				     server_host_key_algorithms = ["SOME-UNSUPPORTED"],  % SIC!
 				     encryption_algorithms_client_to_server = ["aes128-ctr"],
@@ -579,23 +580,11 @@ client_handles_keyboard_interactive_0_pwds(Config) ->
 
 %%%---- init_suite and end_suite ---------------------------------------	
 start_apps(Config) ->
-    catch crypto:stop(),
-    case catch crypto:start() of
-	ok ->
-	    catch ssh:stop(),
-	    ok = ssh:start(),
-	    [{stop_apps, 
-	      fun() ->
-		      ssh:stop(),
-		      crypto:stop()
-	      end} | Config];
-	_Else ->
-	    {skip, "Crypto could not be started!"}
-    end.
-    
+    catch ssh:stop(),
+    ok = ssh:start(),
+    Config.
 
-stop_apps(Config) ->
-    (?v(stop_apps, Config, fun()-> ok end))(),
+stop_apps(_Config) ->
     ssh:stop().
 
 
diff --git a/lib/ssh/test/ssh_renegotiate_SUITE.erl b/lib/ssh/test/ssh_renegotiate_SUITE.erl
index e5cfa58bad..abbe57796f 100644
--- a/lib/ssh/test/ssh_renegotiate_SUITE.erl
+++ b/lib/ssh/test/ssh_renegotiate_SUITE.erl
@@ -30,7 +30,9 @@
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() -> [{ct_hooks,[ts_install_cth]},
+	    {timetrap,{seconds,40}}].
+
 
 all() -> [{group,default_algs},
 	  {group,aes_gcm}
@@ -44,16 +46,10 @@ tests() -> [rekey, rekey_limit, renegotiate1, renegotiate2].
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    catch crypto:stop(),
-    case catch crypto:start() of
-	ok ->
-	    Config;
-	_Else ->
-	    {skip, "Crypto could not be started!"}
-    end.
+    Config.
+
 end_per_suite(_Config) ->
-    ssh:stop(),
-    crypto:stop().
+    ssh:stop().
 
 %%--------------------------------------------------------------------
 init_per_group(aes_gcm, Config) ->
@@ -87,7 +83,8 @@ end_per_testcase(_TestCase, _Config) ->
 %%--------------------------------------------------------------------
 
 %%% Idle timeout test
-
+rekey() -> [{timetrap,{seconds,90}}].
+    
 rekey(Config) ->
     {Pid, Host, Port} = 
 	ssh_test_lib:std_daemon(Config,
@@ -109,6 +106,8 @@ rekey(Config) ->
 
 %%% Test rekeying by data volume
 
+rekey_limit() -> [{timetrap,{seconds,400}}].
+
 rekey_limit(Config) ->
     UserDir = ?config(priv_dir, Config),
     DataFile = filename:join(UserDir, "rekey.data"),
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
index 698af259c8..76ba78b728 100644
--- a/lib/ssh/test/ssh_sftp_SUITE.erl
+++ b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -35,7 +35,9 @@
 %%--------------------------------------------------------------------
 
 suite() ->
-    [{ct_hooks,[ts_install_cth]}].
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,40}}].
+
 
 all() -> 
     [{group, not_unicode},
@@ -44,22 +46,14 @@ all() ->
 
 
 init_per_suite(Config) ->
-    catch crypto:stop(),
-    case (catch crypto:start()) of
-	ok ->
-	    ct:log("file:native_name_encoding() = ~p,~nio:getopts() = ~p",
-		   [file:native_name_encoding(),io:getopts()]),
-	    ssh:start(),
-	    Config;
-	_ ->
-	    {skip,"Could not start crypto!"}
-    end.
-
-end_per_suite(Config) ->
-    ssh:stop(),
-    crypto:stop(),
+    ct:log("file:native_name_encoding() = ~p,~nio:getopts() = ~p",
+	   [file:native_name_encoding(),io:getopts()]),
+    ssh:start(),
     Config.
 
+end_per_suite(_onfig) ->
+    ssh:stop().
+
 %%--------------------------------------------------------------------
 groups() -> 
     [{not_unicode, [], [{group,erlang_server},
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index 6b03a2b763..57b93a5f36 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -44,6 +44,9 @@
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 
+suite() ->
+    [{timetrap,{seconds,40}}].
+
 all() -> 
     [open_close_file, 
      open_close_dir, 
@@ -69,28 +72,21 @@ groups() ->
 %%--------------------------------------------------------------------
 
 init_per_suite(Config) ->
-    catch crypto:stop(),
-    case (catch crypto:start()) of
-	ok ->
-	    DataDir = ?config(data_dir, Config),	    
-	    PrivDir = ?config(priv_dir, Config),
-	    ssh_test_lib:setup_dsa(DataDir, PrivDir),
-	    %% to make sure we don't use public-key-auth
-	    %% this should be tested by other test suites
-	    UserDir = filename:join(?config(priv_dir, Config), nopubkey), 
-	    file:make_dir(UserDir),  
-	    Config;
-	_ ->
-	    {skip,"Could not start crypto!"}
-    end.
+    DataDir = ?config(data_dir, Config),	    
+    PrivDir = ?config(priv_dir, Config),
+    ssh_test_lib:setup_dsa(DataDir, PrivDir),
+    %% to make sure we don't use public-key-auth
+    %% this should be tested by other test suites
+    UserDir = filename:join(?config(priv_dir, Config), nopubkey), 
+    file:make_dir(UserDir),  
+    Config.
 
 end_per_suite(Config) ->
     SysDir = ?config(priv_dir, Config),
     ssh_test_lib:clean_dsa(SysDir),
     UserDir = filename:join(?config(priv_dir, Config), nopubkey),
     file:del_dir(UserDir),
-    ssh:stop(),
-    crypto:stop().
+    ssh:stop().
 
 %%--------------------------------------------------------------------
 
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
index 7a025a6518..4c3c2dcd5a 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
@@ -36,7 +36,9 @@
 %%--------------------------------------------------------------------
 
 suite() ->
-    [{ct_hooks,[ts_install_cth]}].
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,40}}].
+
 
 all() -> 
     [close_file, 
@@ -53,29 +55,22 @@ groups() ->
 
 init_per_suite(Config) ->
     catch ssh:stop(),
-    catch crypto:stop(),
-    case catch crypto:start() of
-	ok ->
-	    DataDir = ?config(data_dir, Config),
-	    PrivDir = ?config(priv_dir, Config),
-	    FileAlt = filename:join(DataDir, "ssh_sftpd_file_alt.erl"),
-	    c:c(FileAlt),
-	    FileName = filename:join(DataDir, "test.txt"),
-	    {ok, FileInfo} = file:read_file_info(FileName),
-	    ok = file:write_file_info(FileName,
-				      FileInfo#file_info{mode = 8#400}),
-	    ssh_test_lib:setup_dsa(DataDir, PrivDir),
-	    Config;
-	_Else ->
-	    {skip,"Could not start ssh!"}
-    end.
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
+    FileAlt = filename:join(DataDir, "ssh_sftpd_file_alt.erl"),
+    c:c(FileAlt),
+    FileName = filename:join(DataDir, "test.txt"),
+    {ok, FileInfo} = file:read_file_info(FileName),
+    ok = file:write_file_info(FileName,
+			      FileInfo#file_info{mode = 8#400}),
+    ssh_test_lib:setup_dsa(DataDir, PrivDir),
+    Config.
 
 end_per_suite(Config) -> 
     UserDir = filename:join(?config(priv_dir, Config), nopubkey),
     file:del_dir(UserDir),
     SysDir = ?config(priv_dir, Config),
     ssh_test_lib:clean_dsa(SysDir),
-    crypto:stop(),
     ok.
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl
index 5c77fcf1ef..cbbd7d4d76 100644
--- a/lib/ssh/test/ssh_sup_SUITE.erl
+++ b/lib/ssh/test/ssh_sup_SUITE.erl
@@ -34,6 +34,10 @@
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,40}}].
+
 all() -> 
     [default_tree, sshc_subtree, sshd_subtree, sshd_subtree_profile].
 
diff --git a/lib/ssh/test/ssh_test_cli.erl b/lib/ssh/test/ssh_test_cli.erl
index cd9ad5f2ff..697ddb730d 100644
--- a/lib/ssh/test/ssh_test_cli.erl
+++ b/lib/ssh/test/ssh_test_cli.erl
@@ -4,20 +4,25 @@
 
 -record(state, {
 	  type,
+	  tmpdir,
 	  id, 
 	  ref,
 	  port
 	 }).
 
-init([Type]) ->
-    {ok, #state{type = Type}}.
+
+init([Type]) -> init([Type,"/tmp"]);
+
+init([Type,TmpDir]) ->
+    {ok, #state{type = Type,
+		tmpdir = TmpDir}}.
 
 handle_msg({ssh_channel_up, Id, Ref}, S) ->
     User = get_ssh_user(Ref), 
     ok = ssh_connection:send(Ref,
 			     Id,
 			     << "\r\nYou are accessing a dummy, type \"q\" to exit\r\n\n" >>),
-    Port = run_portprog(User, S#state.type),
+    Port = run_portprog(User, S#state.type, S#state.tmpdir),
     {ok, S#state{port = Port, id = Id, ref = Ref}};
 
 handle_msg({Port, {data, Data}}, S = #state{port = Port}) ->
@@ -68,10 +73,10 @@ handle_ssh_msg({ssh_cm, _, {exit_signal, Id, _, _, _}},
 terminate(_Why, _S) ->
     nop.
 
-run_portprog(User, cli) ->
+run_portprog(User, cli, TmpDir) ->
     Pty_bin = os:find_executable("cat"), 
     open_port({spawn_executable, Pty_bin},
-	      [stream, {cd, "/tmp"}, {env, [{"USER", User}]},
+	      [stream, {cd, TmpDir}, {env, [{"USER", User}]},
 	       {args, []}, binary,
 	       exit_status, use_stdio, stderr_to_stdout]).
 
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 2db55b97b4..5f91fb627a 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -120,7 +120,8 @@ std_simple_exec(Host, Port, Config, Opts) ->
 	Other ->
 	    ct:fail(Other)
     end,
-    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId).
+    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId),
+    ssh:close(ConnectionRef).
 
 
 start_shell(Port, IOServer, UserDir) ->
@@ -154,14 +155,12 @@ loop_io_server(TestCase, Buff0) ->
 	 {input, TestCase, Line} ->
 	     loop_io_server(TestCase, Buff0 ++ [Line]);
 	 {io_request, From, ReplyAs, Request} ->
-%%ct:log("~p",[{io_request, From, ReplyAs, Request}]),
 	     {ok, Reply, Buff} = io_request(Request, TestCase, From,
 					    ReplyAs, Buff0),
-%%ct:log("io_request(~p)-->~p",[Request,{ok, Reply, Buff}]),
 	     io_reply(From, ReplyAs, Reply),
 	     loop_io_server(TestCase, Buff);
-	 {'EXIT',_, _} ->
-	     erlang:display('ssh_test_lib:loop_io_server/2 EXIT'),
+	 {'EXIT',_, _} = _Exit ->
+%%	     ct:log("ssh_test_lib:loop_io_server/2 got ~p",[_Exit]),
 	     ok
     after 
 	30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE])
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 67a61d3c11..80f8607f65 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -33,6 +33,9 @@
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 
+suite() ->
+    [{timetrap,{seconds,40}}].
+
 all() -> 
     case os:find_executable("ssh") of
 	false -> 
@@ -57,21 +60,14 @@ groups() ->
     ].
 
 init_per_suite(Config) ->
-    catch crypto:stop(),
-    case catch crypto:start() of
-	ok ->
-	    case gen_tcp:connect("localhost", 22, []) of
-		{error,econnrefused} ->
-		    {skip,"No openssh deamon"};
-		_ ->
-		    ssh_test_lib:openssh_sanity_check(Config)
-	    end;
-	_Else ->
-	    {skip,"Could not start crypto!"}
+    case gen_tcp:connect("localhost", 22, []) of
+	{error,econnrefused} ->
+	    {skip,"No openssh deamon"};
+	_ ->
+	    ssh_test_lib:openssh_sanity_check(Config)
     end.
 
 end_per_suite(_Config) ->
-    crypto:stop(),
     ok.
 
 init_per_group(erlang_server, Config) ->
diff --git a/lib/ssh/test/ssh_upgrade_SUITE.erl b/lib/ssh/test/ssh_upgrade_SUITE.erl
index 85f4d36258..20df865b55 100644
--- a/lib/ssh/test/ssh_upgrade_SUITE.erl
+++ b/lib/ssh/test/ssh_upgrade_SUITE.erl
@@ -38,6 +38,9 @@
 %%%
 %%% CommonTest callbacks
 %%% 
+suite() ->
+    [{timetrap,{seconds,180}}].
+
 all() -> 
     [
      minor_upgrade,
@@ -45,27 +48,17 @@ all() ->
     ].
 
 init_per_suite(Config0) ->
-    catch crypto:stop(),
-    try {crypto:start(), erlang:system_info({wordsize, internal}) == 
-                 	     erlang:system_info({wordsize, external})} of
-	{ok, true} ->
-	    case ct_release_test:init(Config0) of
-		{skip, Reason} ->
-		    {skip, Reason};
-		Config ->
-		    ssh:start(),
-		    Config
-	    end;
-	{ok, false} ->
-	    {skip, "Test server will not handle halfwordemulator correctly. Skip as halfwordemulator is deprecated"} 
-    catch _:_ ->
-	    {skip, "Crypto did not start"}
+    case ct_release_test:init(Config0) of
+	{skip, Reason} ->
+	    {skip, Reason};
+	Config ->
+	    ssh:start(),
+	    Config
     end.
 
 end_per_suite(Config) ->
     ct_release_test:cleanup(Config),
     ssh:stop(),
-    crypto:stop(),
     UserDir = ?config(priv_dir, Config),
     ssh_test_lib:clean_rsa(UserDir).
 
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 55d12abffe..41b42d454b 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.2.1
+SSH_VSN = 4.2.2
 
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 61d1c8355a..e5070bc247 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -28,6 +28,124 @@
   <p>This document describes the changes made to the SSL application.</p>
 
 
+<section><title>SSL 7.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Make sure there is only one poller validator at a time
+	    for validating the session cache.</p>
+          <p>
+	    Own Id: OTP-13185</p>
+        </item>
+        <item>
+          <p>
+	    A timing related issue could cause ssl to hang,
+	    especially happened with newer versions of OpenSSL in
+	    combination with ECC ciphers.</p>
+          <p>
+	    Own Id: OTP-13253</p>
+        </item>
+        <item>
+          <p>
+	    Work around a race condition in the TLS distribution
+	    start.</p>
+          <p>
+	    Own Id: OTP-13268</p>
+        </item>
+        <item>
+          <p>
+	    Big handshake messages are now correctly fragmented in
+	    the TLS record layer.</p>
+          <p>
+	    Own Id: OTP-13306</p>
+        </item>
+        <item>
+          <p>
+	    Improve portability of ECC tests in Crypto and SSL for
+	    "exotic" OpenSSL versions.</p>
+          <p>
+	    Own Id: OTP-13311</p>
+        </item>
+        <item>
+          <p>
+	    Certificate extensions marked as critical are ignored
+	    when using verify_none</p>
+          <p>
+	    Own Id: OTP-13377</p>
+        </item>
+        <item>
+          <p>
+	    If a certificate doesn't contain a CRL Distribution
+	    Points extension, and the relevant CRL is not in the
+	    cache, and the <c>crl_check</c> option is not set to
+	    <c>best_effort</c> , the revocation check should fail.</p>
+          <p>
+	    Own Id: OTP-13378</p>
+        </item>
+        <item>
+          <p>
+	    Enable TLS distribution over IPv6</p>
+          <p>
+	    Own Id: OTP-13391</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Improve error reporting for TLS distribution</p>
+          <p>
+	    Own Id: OTP-13219</p>
+        </item>
+        <item>
+          <p>
+	    Include options from connect, listen and accept in
+	    <c>connection_information/1,2</c></p>
+          <p>
+	    Own Id: OTP-13232</p>
+        </item>
+        <item>
+          <p>
+	    Allow adding extra options for outgoing TLS distribution
+	    connections, as supported for plain TCP connections.</p>
+          <p>
+	    Own Id: OTP-13285</p>
+        </item>
+        <item>
+          <p>
+	    Use loopback as server option in TLS-distribution module</p>
+          <p>
+	    Own Id: OTP-13300</p>
+        </item>
+        <item>
+          <p>
+	    Verify certificate signature against original certificate
+	    binary.</p>
+          <p>
+	    This avoids bugs due to encoding errors when re-encoding
+	    a decode certificate. As there exists several decode step
+	    and using of different ASN.1 specification this is a risk
+	    worth avoiding.</p>
+          <p>
+	    Own Id: OTP-13334</p>
+        </item>
+        <item>
+          <p>
+	    Use <c>application:ensure_all_started/2</c> instead of
+	    hard-coding dependencies</p>
+          <p>
+	    Own Id: OTP-13363</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 7.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index bf87644116..53d534ef19 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -48,7 +48,7 @@
       <item><p><c>true | false</c></p></item>
 
       <tag><c>option() =</c></tag>
-      <item><p><c>socketoption() | ssloption() | transportoption()</c></p>
+      <item><p><c>socketoption() | ssl_option() | transport_option()</c></p>
       </item>
 
       <tag><c>socketoption() =</c></tag>
@@ -60,7 +60,7 @@
       <seealso marker="kernel:gen_tcp">gen_tcp(3)</seealso> manual pages
       in Kernel.</p></item>
 
-      <tag><marker id="type-ssloption"/><c>ssloption() =</c></tag>
+      <tag><marker id="type-ssloption"/><c>ssl_option() =</c></tag>
       <item>
 	<p><c>{verify, verify_type()}</c></p>
 	<p><c>| {verify_fun, {fun(), term()}}</c></p>
@@ -85,11 +85,11 @@
 	[binary()]} | {client | server, [binary()], binary()}}</c></p>
 	<p><c>| {log_alert, boolean()}</c></p>
 	<p><c>| {server_name_indication, hostname() | disable}</c></p>
-	<p><c>| {sni_hosts, [{hostname(), ssloptions()}]}</c></p>
+	<p><c>| {sni_hosts, [{hostname(), [ssl_option()]}]}</c></p>
 	<p><c>| {sni_fun, SNIfun::fun()}</c></p>
       </item>
       
-      <tag><c>transportoption() =</c></tag>
+      <tag><c>transport_option() =</c></tag>
       <item><p><c>{cb_info, {CallbackModule::atom(), DataTag::atom(),
 
       ClosedTag::atom(), ErrTag:atom()}}</c></p>
@@ -144,7 +144,9 @@
       <p>According to old API.</p></item>
 
       <tag><c>ciphersuite() =</c></tag>
-      <item><p><c>{key_exchange(), cipher(), hash()}</c></p></item>
+
+      <item><p><c>{key_exchange(), cipher(), MAC::hash()} |
+      {key_exchange(), cipher(), MAC::hash(), PRF::hash()}</c></p></item>
 
       <tag><c>key_exchange()=</c></tag>
       <item><p><c>rsa | dhe_dss | dhe_rsa | dh_anon | psk | dhe_psk
@@ -156,7 +158,7 @@
       | aes_128_cbc | aes_256_cbc | aes_128_gcm | aes_256_gcm</c></p></item>
 
       <tag><c>hash() =</c></tag>
-      <item><p><c>md5 | sha</c></p></item>
+      <item><p><c>md5 | sha | sha224 | sha256 | sha348 | sha512</c></p></item>
 
       <tag><c>prf_random() =</c></tag>
       <item><p><c>client_random | server_random</c></p></item>
@@ -166,7 +168,7 @@
       | srp_4096 | srp_6144 | srp_8192</c></p></item>
 
       <tag><c>SNIfun::fun()</c></tag>
-      <item><p><c>= fun(ServerName :: string()) -> ssloptions()</c></p></item>
+      <item><p><c>= fun(ServerName :: string()) -> [ssl_option()]</c></p></item>
 
     </taglist>
   </section>
@@ -221,7 +223,7 @@
       <url href="http://www.ietf.org/rfc/rfc5746.txt">RFC 5746</url>. 
       By default <c>secure_renegotiate</c> is set to <c>false</c>, 
       that is, secure renegotiation is used if possible,
-      but it fallback to unsecure renegotiation if the peer
+      but it falls back to insecure renegotiation if the peer
       does not support 
       <url href="http://www.ietf.org/rfc/rfc5746.txt">RFC 5746</url>.</p>
       </item>
@@ -269,7 +271,11 @@ atom()}} |
 	  terminate regarding verification failures and the connection is
 	  established.</p></item>
 	  <item><p>If called with an extension unknown to the user application,
-	  return value <c>{unknown, UserState}</c> is to be used.</p></item>
+	  return value <c>{unknown, UserState}</c> is to be used.</p>
+
+	  <p>Note that if the fun returns <c>unknown</c> for an extension marked
+	  as critical, validation will fail.</p>
+	  </item>
 	</list>
 
 	<p>Default option <c>verify_fun</c> in <c>verify_peer mode</c>:</p>
@@ -291,6 +297,8 @@ atom()}} |
        <code>
 {fun(_,{bad_cert, _}, UserState) ->
 	 {valid, UserState};
+    (_,{extension, #'Extension'{critical = true}}, UserState) ->
+	 {valid, UserState};
     (_,{extension, _}, UserState) ->
 	 {unknown, UserState};
     (_, valid, UserState) ->
@@ -307,7 +315,7 @@ atom()}} |
 	<tag><c>unknown_ca</c></tag>
 	<item><p>No trusted CA was found in the trusted store. The trusted CA is
 	normally a so called ROOT CA, which is a self-signed certificate. Trust can
-	be claimed for an intermediat CA (trusted anchor does not have to be
+	be claimed for an intermediate CA (trusted anchor does not have to be
 	self-signed according to X-509) by using option <c>partial_chain</c>.</p>
 	</item>
 
@@ -352,7 +360,7 @@ marker="public_key:public_key#pkix_path_validation-3">public_key:pkix_path_valid
 	  <tag><c>{http, timeout()}</c></tag>
 	  <item><p>
 	    Enables fetching of CRLs specified as http URIs in<seealso 
-	    marker="public_key:public_key_records"> X509 cerificate extensions.</seealso>
+	    marker="public_key:public_key_records"> X509 certificate extensions.</seealso>
 	    Requires the OTP inets application.</p>
 	  </item>	    
 	</taglist>    
@@ -413,7 +421,6 @@ fun(srp, Username :: string(), UserState :: term()) ->
 
         <warning><p>Using <c>{padding_check, boolean()}</c> makes TLS
 	vulnerable to the Poodle attack.</p></warning>
-
   </section>
   
   <section>
@@ -514,9 +521,43 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	 be supported by the server for the prevention to work.
 	</p></warning>
       </item>
-    </taglist>
+      <tag><marker id="client_signature_algs"/><c>{signature_algs, [{hash(), ecdsa | rsa | dsa}]}</c></tag>
+	<item>
+	<p>In addition to the algorithms negotiated by the cipher
+	suite used for key exchange, payload encryption, message
+	authentication and pseudo random calculation, the TLS signature
+	algorithm extension <url
+	href="http://www.ietf.org/rfc/rfc5246.txt">Section 7.4.1.4.1 in RFC 5246</url> may be
+	used, from TLS 1.2, to negotiate which signature algorithm to use during the
+	TLS handshake. If no lower TLS versions than 1.2 are supported,
+	the client will send a TLS signature algorithm extension
+	with the algorithms specified by this option.
+	Defaults to
+	
+	<code>[
+%% SHA2
+{sha512, ecdsa},
+{sha512, rsa},
+{sha384, ecdsa},
+{sha384, rsa},
+{sha256, ecdsa},
+{sha256, rsa},
+{sha224, ecdsa},
+{sha224, rsa},
+%% SHA
+{sha, ecdsa},
+{sha, rsa},
+{sha, dsa},
+]</code>
+	
+	The algorithms should be in the preferred order.
+	Selected signature algorithm can restrict which hash functions
+	that may be selected. Default support for {md5, rsa} removed in ssl-8.0
+	</p>
+	</item>
+      </taglist>
    </section>
-
+   
   <section>
     <title>SSL OPTION DESCRIPTIONS - SERVER SIDE</title>
 
@@ -609,20 +650,20 @@ fun(srp, Username :: string(), UserState :: term()) ->
       selection. If set to <c>false</c> (the default), use the client
       preference.</p></item>
 
-      <tag><c>{sni_hosts, [{hostname(), ssloptions()}]}</c></tag>
+      <tag><c>{sni_hosts, [{hostname(), [ssl_option()]}]}</c></tag>
       <item><p>If the server receives a SNI (Server Name Indication) from the client
-      matching a host listed in the <c>sni_hosts</c> option, the speicific options for
+      matching a host listed in the <c>sni_hosts</c> option, the specific options for
       that host will override previously specified options.
 
       The option <c>sni_fun</c>, and <c>sni_hosts</c> are mutually exclusive.</p></item>
 
       <tag><c>{sni_fun, SNIfun::fun()}</c></tag>
       <item><p>If the server receives a SNI (Server Name Indication) from the client,
-      the given function will be called to retrive <c>ssloptions()</c> for indicated server.
-      These options will be merged into predefined <c>ssloptions()</c>.
+      the given function will be called to retrieve <c>[ssl_option()]</c> for the indicated server.
+      These options will be merged into predefined <c>[ssl_option()]</c>.
 
       The function should be defined as:
-        <c>fun(ServerName :: string()) -> ssloptions()</c>
+        <c>fun(ServerName :: string()) -> [ssl_option()]</c>
       and can be specified as a fun or as named <c>fun module:function/1</c>
 
       The option <c>sni_fun</c>, and <c>sni_hosts</c> are mutually exclusive.</p></item>
@@ -632,7 +673,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
       of resources of such an operation is higher for the server than the
       client. This can act as a vector for denial of service attacks. The SSL
       application already takes measures to counter-act such attempts,
-      but client-initiated renegotiation can be stricly disabled by setting
+      but client-initiated renegotiation can be strictly disabled by setting
       this option to <c>false</c>. The default value is <c>true</c>.
       Note that disabling renegotiation can result in long-lived connections
       becoming unusable due to limits on the number of messages the underlying
@@ -643,6 +684,14 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <item>If true, use the server's preference for cipher selection. If false
       (the default), use the client's preference.
       </item>
+      
+      <tag><c>{signature_algs, [{hash(), ecdsa | rsa | dsa}]}</c></tag>
+      <item><p> The algorithms specified by
+      this option will be the ones accepted by the server in a signature algorithm
+      negotiation, introduced in TLS-1.2. The algorithms will also be offered to the client if a
+      client certificate is requested. For more details see the <seealso marker="#client_signature_algs">corresponding client option</seealso>.
+      </p> </item>
+
     </taglist>
   </section>
   
@@ -702,7 +751,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	equivalent, connected socket to an SSL socket.</fsummary>
       <type>
 	<v>Socket = socket()</v>
-	<v>SslOptions = [ssloption()]</v>
+	<v>SslOptions = [ssl_option()]</v>
 	<v>Timeout = integer() | infinity</v>
 	<v>SslSocket = sslsocket()</v>
 	<v>Reason = term()</v>
@@ -748,26 +797,13 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	  <v>How =  timeout() | {NewController::pid(), timeout()} </v>
 	  <v>Reason = term()</v>
       </type>
-      <desc><p>Closes or downgrades an SSL connection, in the later case the transport
-      connection will be handed over to the <c>NewController</c> process after reciving
-      the TLS close alert from the peer. The retuned transport socket will have
-      the following options set [{active, false}, {packet, 0}, {mode, binary}].</p>
+      <desc><p>Closes or downgrades an SSL connection. In the latter case the transport
+      connection will be handed over to the <c>NewController</c> process after receiving
+      the TLS close alert from the peer. The returned transport socket will have
+      the following options set: <c>[{active, false}, {packet, 0}, {mode, binary}]</c></p>
       </desc>
     </func>
-
-    <func>
-	<name>connection_info(SslSocket) ->
-	  {ok, {ProtocolVersion, CipherSuite}} | {error, Reason}</name>
-      <fsummary>Returns the Negotiated Protocol version and cipher suite.
-      </fsummary>
-      <type>
-        <v>CipherSuite = ciphersuite()</v>
-        <v>ProtocolVersion = protocol()</v>
-      </type>
-      <desc><p>Returns the Negotiated Protocol version and cipher suite.</p> 
-      </desc>
-    </func>
-
+    
     <func>
       <name>controlling_process(SslSocket, NewOwner) ->
 	ok | {error, Reason}</name>
@@ -786,40 +822,36 @@ fun(srp, Username :: string(), UserState :: term()) ->
 
     <func>
       <name>connection_information(SslSocket) ->
-        {ok, Info} |  {error, Reason} </name>
+        {ok, Result} |  {error, Reason} </name>
       <fsummary>Returns all the connection information.
       </fsummary>
       <type>
-        <v>Info = [InfoTuple]</v>
-        <v>InfoTuple = {protocol, Protocol} | {cipher_suite, CipherSuite} | {sni_hostname, SNIHostname}</v>
-        <v>CipherSuite = ciphersuite()</v>
-        <v>ProtocolVersion = protocol()</v>
-        <v>SNIHostname = string()</v>
+        <v>Item = protocol | cipher_suite | sni_hostname | atom()</v>
+	<d>Meaningful atoms, not specified above, are the ssl option names.</d>
+	<v>Result = [{Item::atom(), Value::term()}]</v>
         <v>Reason = term()</v>
       </type>
-      <desc><p>Return all the connection information containing negotiated protocol version, cipher suite, and the hostname of SNI extension.
-      Info will be a proplists containing all the connection information on success, otherwise <c>{error, Reason}</c> will be returned.</p> 
+      <desc><p>Returns all relevant information about the connection, ssl options that
+      are undefined will be filtered out.</p>
       </desc>
     </func>
 
     <func>
       <name>connection_information(SslSocket, Items) ->
-        {ok, Info} |  {error, Reason} </name>
+        {ok, Result} |  {error, Reason} </name>
       <fsummary>Returns the requested connection information.
       </fsummary>
       <type>
-        <v>Items = [Item]</v>
-        <v>Item = protocol | cipher_suite | sni_hostname</v>
-        <v>Info = [InfoTuple]</v>
-        <v>InfoTuple = {protocol, Protocol} | {cipher_suite, CipherSuite} | {sni_hostname, SNIHostname}</v>
-        <v>CipherSuite = ciphersuite()</v>
-        <v>ProtocolVersion = protocol()</v>
-        <v>SNIHostname = string()</v>
+	<v>Items = [Item]</v>
+	<v>Item = protocol | cipher_suite | sni_hostname | atom()</v>
+	<d>Meaningful atoms, not specified above, are the ssl option names.</d>
+	<v>Result = [{Item::atom(), Value::term()}]</v>
         <v>Reason = term()</v>
       </type>
-      <desc><p>Returns the connection information you requested. The connection information you can request contains protocol, cipher_suite, and sni_hostname.
-      <c>{ok, Info}</c> will be returned if it executes sucessfully. The Info is a proplists containing the information you requested.
-      Otherwise, <c>{error, Reason}</c> will be returned.</p>
+      <desc><p>Returns the requested information items about the connection,
+      if they are defined.</p>
+      <note><p>If only undefined options are requested the
+      resulting list can be empty.</p></note>
       </desc>
     </func>
 
@@ -1032,7 +1064,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <fsummary>Performs server-side SSL/TLS handshake.</fsummary>
       <type>
         <v>Socket = socket() | sslsocket() </v>
-	<v>SslOptions = ssloptions()</v>
+	<v>SslOptions = [ssl_option()]</v>
         <v>Timeout = integer()</v>
         <v>Reason = term()</v>
       </type>
@@ -1146,7 +1178,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	  <seealso marker="#listen-2"> listen/2</seealso>, and <seealso
 	  marker="#ssl_accept-2">ssl_accept/[1,2,3]</seealso>.
 	  For the negotiated TLS/SSL version, see <seealso
-	  marker="#connection_info-1">ssl:connection_info/1
+	  marker="#connection_information-1">ssl:connection_information/1
 	  </seealso>.</item>
   
 	  <tag><c>available</c></tag>
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index 6c82e32a74..d05ece3971 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -43,6 +43,8 @@
       <item>For security reasons SSL-2.0 is not supported.</item>
       <item>For security reasons SSL-3.0 is no longer supported by default,
       but can be configured.</item>
+      <item>For security reasons DES cipher suites are no longer supported by default,
+      but can be configured.</item>
       <item>Ephemeral Diffie-Hellman cipher suites are supported,
       but not Diffie Hellman Certificates cipher suites.</item>
       <item>Elliptic Curve cipher suites are supported if the Crypto 
@@ -55,8 +57,8 @@
       motivated to implement them.</item>
       <item>CRL validation is supported.</item>
       <item>Policy certificate extensions are not supported.</item>
-      <item>'Server Name Indication' extension client side
-      (RFC 6066, Section 3) is supported.</item>
+      <item>'Server Name Indication' extension
+      (<url href="http://www.ietf.org/rfc/rfc6066.txt">RFC 6066</url>) is supported.</item>
     </list>
    </description>
 
diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml
index a347ce5ae6..dc04d446b0 100644
--- a/lib/ssl/doc/src/ssl_distribution.xml
+++ b/lib/ssl/doc/src/ssl_distribution.xml
@@ -271,4 +271,27 @@ Eshell V5.0  (abort with ^G)
     <p>The <c>init:get_arguments()</c> call verifies that the correct
       arguments are supplied to the emulator.</p>
   </section>
+
+  <section>
+    <title>Using SSL distribution over IPv6</title>
+    <p>It is possible to use SSL distribution over IPv6 instead of
+    IPv4. To do this, pass the option <c>-proto_dist inet6_tls</c>
+    instead of <c>-proto_dist inet_tls</c> when starting Erlang,
+    either on the command line or in the <c>ERL_FLAGS</c> environment
+    variable.</p>
+
+    <p>An example command line with this option would look like this:</p>
+    <code type="none">
+$ erl -boot /home/me/ssl/start_ssl -proto_dist inet6_tls
+  -ssl_dist_opt server_certfile "/home/me/ssl/erlserver.pem"
+  -ssl_dist_opt server_secure_renegotiate true client_secure_renegotiate true
+  -sname ssl_test
+Erlang (BEAM) emulator version 5.0 [source]
+
+Eshell V5.0  (abort with ^G)
+(ssl_test@myhost)1>     </code>
+
+    <p>A node started in this way will only be able to communicate with
+    other nodes using SSL distribution over IPv6.</p>
+  </section>
 </chapter>
diff --git a/lib/ssl/examples/src/client_server.erl b/lib/ssl/examples/src/client_server.erl
index 799027123f..019b5130d2 100644
--- a/lib/ssl/examples/src/client_server.erl
+++ b/lib/ssl/examples/src/client_server.erl
@@ -26,9 +26,7 @@
 
 start() ->
     %% Start ssl application
-    application:start(crypto),
-    application:start(public_key),
-    application:start(ssl),
+    {ok, StartedApps} = application:ensure_all_started(ssl),
 
     %% Let the current process be the server that listens and accepts
     %% Listen
@@ -52,7 +50,8 @@ start() ->
     ssl:close(ASock),
     io:fwrite("Listen: closing and terminating.~n"),
     ssl:close(LSock),
-    application:stop(ssl).
+
+    lists:foreach(fun application:stop/1, lists:reverse(StartedApps)).
 
 
 %% Client connect
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index 790328dc45..7a7a373487 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -51,6 +51,7 @@ MODULES= \
 	ssl_dist_sup\
 	ssl_sup \
 	inet_tls_dist \
+	inet6_tls_dist \
 	ssl_certificate\
 	ssl_pkix_db\
 	ssl_cipher \
diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl
index 153d3fef48..e490de7eeb 100644
--- a/lib/ssl/src/dtls_connection.erl
+++ b/lib/ssl/src/dtls_connection.erl
@@ -196,8 +196,7 @@ hello(start, #state{host = Host, port = Port, role = client,
     {Record, State} = next_record(State1),
     next_state(hello, hello, Record, State);
 
-hello(Hello = #client_hello{client_version = ClientVersion,
-			    extensions = #hello_extensions{hash_signs = HashSigns}},
+hello(Hello = #client_hello{client_version = ClientVersion},
       State = #state{connection_states = ConnectionStates0,
 		     port = Port, session = #session{own_certificate = Cert} = Session0,
 		     renegotiation = {Renegotiation, _},
@@ -209,9 +208,7 @@ hello(Hello = #client_hello{client_version = ClientVersion,
         {Version, {Type, Session},
 	 ConnectionStates,
 	 #hello_extensions{ec_point_formats = EcPointFormats,
-			   elliptic_curves = EllipticCurves} = ServerHelloExt} ->
-            HashSign = ssl_handshake:select_hashsign(HashSigns, Cert, 
-						     dtls_v1:corresponding_tls_version(Version)),
+			   elliptic_curves = EllipticCurves} = ServerHelloExt, HashSign} ->
             ssl_connection:hello({common_client_hello, Type, ServerHelloExt, HashSign},
 				 State#state{connection_states  = ConnectionStates,
 					     negotiated_version = Version,
diff --git a/lib/ssl/src/dtls_handshake.erl b/lib/ssl/src/dtls_handshake.erl
index 22c0ce7a13..50c84b712f 100644
--- a/lib/ssl/src/dtls_handshake.erl
+++ b/lib/ssl/src/dtls_handshake.erl
@@ -94,7 +94,10 @@ hello(#server_hello{server_version = Version, random = Random,
 
 hello(#client_hello{client_version = ClientVersion}, _Options, {_,_,_,_,ConnectionStates,_}, _Renegotiation) ->      
     %% Return correct typ to make dialyzer happy until we have time to make the real imp.
-    {ClientVersion, {new, #session{}}, ConnectionStates, #hello_extensions{}}.
+    HashSigns = tls_v1:default_signature_algs(dtls_v1:corresponding_tls_version(ClientVersion)),
+    {ClientVersion, {new, #session{}}, ConnectionStates, #hello_extensions{}, 
+     %% Placeholder for real hasign handling
+     hd(HashSigns)}.
 
 %% hello(Address, Port,
 %%       #ssl_tls{epoch = _Epoch, sequence_number = _Seq,
diff --git a/lib/ssl/src/inet6_tls_dist.erl b/lib/ssl/src/inet6_tls_dist.erl
new file mode 100644
index 0000000000..ffd7296f93
--- /dev/null
+++ b/lib/ssl/src/inet6_tls_dist.erl
@@ -0,0 +1,46 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2015. 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%
+%%
+
+%%
+-module(inet6_tls_dist).
+
+-export([childspecs/0, listen/1, accept/1, accept_connection/5,
+	 setup/5, close/1, select/1]).
+
+childspecs() ->
+    inet_tls_dist:childspecs().
+
+select(Node) ->
+    inet_tls_dist:gen_select(inet6_tcp, Node).
+
+listen(Name) ->
+    inet_tls_dist:gen_listen(inet6_tcp, Name).
+
+accept(Listen) ->
+    inet_tls_dist:gen_accept(inet6_tcp, Listen).
+
+accept_connection(AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
+    inet_tls_dist:gen_accept_connection(inet6_tcp, AcceptPid, Socket, MyNode, Allowed, SetupTime).
+
+setup(Node, Type, MyNode, LongOrShortNames,SetupTime) ->
+    inet_tls_dist:gen_setup(inet6_tcp, Node, Type, MyNode, LongOrShortNames,SetupTime).
+
+close(Socket) ->
+    inet_tls_dist:close(Socket).
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl
index 6fe99a81c5..ec26142a75 100644
--- a/lib/ssl/src/inet_tls_dist.erl
+++ b/lib/ssl/src/inet_tls_dist.erl
@@ -24,6 +24,10 @@
 -export([childspecs/0, listen/1, accept/1, accept_connection/5,
 	 setup/5, close/1, select/1, is_node_name/1]).
 
+%% Generalized dist API
+-export([gen_listen/2, gen_accept/2, gen_accept_connection/6,
+	 gen_setup/6, gen_select/2]).
+
 -include_lib("kernel/include/net_address.hrl").
 -include_lib("kernel/include/dist.hrl").
 -include_lib("kernel/include/dist_util.hrl").
@@ -33,9 +37,15 @@ childspecs() ->
 	   permanent, infinity, supervisor, [ssl_dist_sup]}]}.
 
 select(Node) ->
+    gen_select(inet_tcp, Node).
+
+gen_select(Driver, Node) ->
     case split_node(atom_to_list(Node), $@, []) of
-	[_,_Host] -> 
-	    true;
+	[_, Host] ->
+	    case inet:getaddr(Host, Driver:family()) of
+		{ok, _} -> true;
+		_ -> false
+	    end;
 	_ -> 
 	    false
     end.
@@ -46,23 +56,35 @@ is_node_name(_) ->
     false.
 
 listen(Name) ->
-    ssl_tls_dist_proxy:listen(Name).
+    gen_listen(inet_tcp, Name).
+
+gen_listen(Driver, Name) ->
+    ssl_tls_dist_proxy:listen(Driver, Name).
 
 accept(Listen) ->
-    ssl_tls_dist_proxy:accept(Listen).
+    gen_accept(inet_tcp, Listen).
+
+gen_accept(Driver, Listen) ->
+    ssl_tls_dist_proxy:accept(Driver, Listen).
 
 accept_connection(AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
+    gen_accept_connection(inet_tcp, AcceptPid, Socket, MyNode, Allowed, SetupTime).
+
+gen_accept_connection(Driver, AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
     Kernel = self(),
-    spawn_link(fun() -> do_accept(Kernel, AcceptPid, Socket, 
+    spawn_link(fun() -> do_accept(Driver, Kernel, AcceptPid, Socket,
 				  MyNode, Allowed, SetupTime) end).
 
 setup(Node, Type, MyNode, LongOrShortNames,SetupTime) ->
+    gen_setup(inet_tcp, Node, Type, MyNode, LongOrShortNames,SetupTime).
+
+gen_setup(Driver, Node, Type, MyNode, LongOrShortNames,SetupTime) ->
     Kernel = self(),
-    spawn_opt(fun() -> do_setup(Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) end, [link, {priority, max}]).
+    spawn_opt(fun() -> do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) end, [link, {priority, max}]).
 		   
-do_setup(Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
-    [Name, Address] = splitnode(Node, LongOrShortNames),
-    case inet:getaddr(Address, inet) of
+do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
+    [Name, Address] = splitnode(Driver, Node, LongOrShortNames),
+    case inet:getaddr(Address, Driver:family()) of
 	{ok, Ip} ->
 	    Timer = dist_util:start_timer(SetupTime),
 	    case erl_epmd:port_please(Name, Ip) of
@@ -70,7 +92,7 @@ do_setup(Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
 		    ?trace("port_please(~p) -> version ~p~n", 
 			   [Node,Version]),
 		    dist_util:reset_timer(Timer),
-		    case ssl_tls_dist_proxy:connect(Ip, TcpPort) of
+		    case ssl_tls_dist_proxy:connect(Driver, Ip, TcpPort) of
 			{ok, Socket} ->
 			    HSData = connect_hs_data(Kernel, Node, MyNode, Socket, 
 						     Timer, Version, Ip, TcpPort, Address,
@@ -99,12 +121,12 @@ close(Socket) ->
     gen_tcp:close(Socket),
     ok.
 
-do_accept(Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
+do_accept(Driver, Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
     process_flag(priority, max),
     receive
 	{AcceptPid, controller} ->
 	    Timer = dist_util:start_timer(SetupTime),
-	    case check_ip(Socket) of
+	    case check_ip(Driver, Socket) of
 		true ->
 		    HSData = accept_hs_data(Kernel, MyNode, Socket, Timer, Allowed),
 		    dist_util:handshake_other_started(HSData);
@@ -118,12 +140,12 @@ do_accept(Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
 %% Do only accept new connection attempts from nodes at our
 %% own LAN, if the check_ip environment parameter is true.
 %% ------------------------------------------------------------
-check_ip(Socket) ->
+check_ip(Driver, Socket) ->
     case application:get_env(check_ip) of
 	{ok, true} ->
 	    case get_ifs(Socket) of
 		{ok, IFs, IP} ->
-		    check_ip(IFs, IP);
+		    check_ip(Driver, IFs, IP);
 		_ ->
 		    ?shutdown(no_node)
 	    end;
@@ -142,37 +164,21 @@ get_ifs(Socket) ->
 	    Error
     end.
 
-check_ip([{OwnIP, _, Netmask}|IFs], PeerIP) ->
-    case {mask(Netmask, PeerIP), mask(Netmask, OwnIP)} of
+check_ip(Driver, [{OwnIP, _, Netmask}|IFs], PeerIP) ->
+    case {Driver:mask(Netmask, PeerIP), Driver:mask(Netmask, OwnIP)} of
 	{M, M} -> true;
 	_      -> check_ip(IFs, PeerIP)
     end;
-check_ip([], PeerIP) ->
+check_ip(_Driver, [], PeerIP) ->
     {false, PeerIP}.
 
-mask({M1,M2,M3,M4}, {IP1,IP2,IP3,IP4}) ->
-    {M1 band IP1,
-     M2 band IP2,
-     M3 band IP3,
-     M4 band IP4};
-
-mask({M1,M2,M3,M4, M5, M6, M7, M8}, {IP1,IP2,IP3,IP4, IP5, IP6, IP7, IP8}) ->
-    {M1 band IP1,
-     M2 band IP2,
-     M3 band IP3,
-     M4 band IP4,
-     M5 band IP5,
-     M6 band IP6,
-     M7 band IP7,
-     M8 band IP8}.
-
 
 %% If Node is illegal terminate the connection setup!!
-splitnode(Node, LongOrShortNames) ->
+splitnode(Driver, Node, LongOrShortNames) ->
     case split_node(atom_to_list(Node), $@, []) of
 	[Name|Tail] when Tail =/= [] ->
 	    Host = lists:append(Tail),
-	    check_node(Name, Node, Host, LongOrShortNames);
+	    check_node(Driver, Name, Node, Host, LongOrShortNames);
 	[_] ->
 	    error_logger:error_msg("** Nodename ~p illegal, no '@' character **~n",
 		      [Node]),
@@ -182,15 +188,20 @@ splitnode(Node, LongOrShortNames) ->
 	    ?shutdown(Node)
     end.
 
-check_node(Name, Node, Host, LongOrShortNames) ->
+check_node(Driver, Name, Node, Host, LongOrShortNames) ->
     case split_node(Host, $., []) of
 	[_] when LongOrShortNames == longnames ->
-	    error_logger:error_msg("** System running to use "
-		      "fully qualified "
-		      "hostnames **~n"
-		      "** Hostname ~s is illegal **~n",
-		      [Host]),
-	    ?shutdown(Node);
+	    case Driver:parse_address(Host) of
+		{ok, _} ->
+		    [Name, Host];
+		_ ->
+		    error_logger:error_msg("** System running to use "
+					   "fully qualified "
+					   "hostnames **~n"
+					   "** Hostname ~s is illegal **~n",
+					   [Host]),
+		    ?shutdown(Node)
+	    end;
 	[_, _ | _] when LongOrShortNames == shortnames ->
 	    error_logger:error_msg("** System NOT running to use fully qualified "
 			      "hostnames **~n"
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index 619ab7b610..1a2bf90ccf 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -31,6 +31,7 @@
 	       ssl_listen_tracker_sup,	
 	       %% Erlang Distribution over SSL/TLS
 	       inet_tls_dist,
+	       inet6_tls_dist,
 	       ssl_tls_dist_proxy,
 	       ssl_dist_sup,
 	       %% SSL/TLS session handling
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 11728128c4..057906bcb3 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,6 +1,9 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
+  {<<"7\\.2">>, [{load_module, tls_connection, soft_purge, soft_purge, []},
+		 {load_module, ssl_tls_dist_proxy, soft_purge, soft_purge, []}
+		]},
   {<<"7\\..*">>, [{restart_application, ssl}]},
   {<<"6\\..*">>, [{restart_application, ssl}]},
   {<<"5\\..*">>, [{restart_application, ssl}]},
@@ -8,6 +11,9 @@
   {<<"3\\..*">>, [{restart_application, ssl}]}
  ], 
  [
+  {<<"7\\.2">>, [{load_module, tls_connection, soft_purge, soft_purge, []},
+		 {load_module, ssl_tls_dist_proxy, soft_purge, soft_purge, []}
+		]},
   {<<"7\\..*">>, [{restart_application, ssl}]},
   {<<"6\\..*">>, [{restart_application, ssl}]},
   {<<"5\\..*">>, [{restart_application, ssl}]},
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 6551308935..9045f8fef9 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -37,7 +37,7 @@
 	 close/1, close/2, shutdown/2, recv/2, recv/3, send/2, getopts/2, setopts/2
 	]).
 %% SSL/TLS protocol handling
--export([cipher_suites/0, cipher_suites/1, suite_definition/1,
+-export([cipher_suites/0, cipher_suites/1,
 	 connection_info/1, versions/0, session_info/1, format_error/1,
      renegotiate/1, prf/5, negotiated_protocol/1, negotiated_next_protocol/1,
 	 connection_information/1, connection_information/2]).
@@ -60,22 +60,19 @@
 -spec start() -> ok  | {error, reason()}.
 -spec start(permanent | transient | temporary) -> ok | {error, reason()}.
 %%
-%% Description: Utility function that starts the ssl, 
-%% crypto and public_key applications. Default type
-%% is temporary. see application(3)
+%% Description: Utility function that starts the ssl and applications
+%% that it depends on.
+%% see application(3)
 %%--------------------------------------------------------------------
 start() ->
-    application:start(crypto),
-    application:start(asn1),
-    application:start(public_key),
-    application:start(ssl).
-
+    start(temporary).
 start(Type) ->
-    application:start(crypto, Type),
-    application:start(asn1),
-    application:start(public_key, Type),
-    application:start(ssl, Type).
-
+    case application:ensure_all_started(ssl, Type) of
+	{ok, _} ->
+	    ok;
+	Other ->
+	    Other
+    end.
 %%--------------------------------------------------------------------
 -spec stop() -> ok.
 %%
@@ -105,7 +102,7 @@ connect(Socket, SslOptions0, Timeout) when is_port(Socket),
 					      {gen_tcp, tcp, tcp_closed, tcp_error}),
     EmulatedOptions = ssl_socket:emulated_options(),
     {ok, SocketValues} = ssl_socket:getopts(Transport, Socket, EmulatedOptions),
-    try handle_options(SslOptions0 ++ SocketValues) of
+    try handle_options(SslOptions0 ++ SocketValues, client) of
 	{ok, #config{transport_info = CbInfo, ssl = SslOptions, emulated = EmOpts,
 		     connection_cb = ConnectionCb}} ->
 
@@ -127,7 +124,7 @@ connect(Host, Port, Options) ->
     connect(Host, Port, Options, infinity).
 
 connect(Host, Port, Options, Timeout) when (is_integer(Timeout) andalso Timeout > 0) or (Timeout == infinity) ->
-    try handle_options(Options) of
+    try handle_options(Options, client) of
 	{ok, Config} ->
 	    do_connect(Host,Port,Config,Timeout)
     catch
@@ -145,7 +142,7 @@ listen(_Port, []) ->
     {error, nooptions};
 listen(Port, Options0) ->
     try
-	{ok, Config} = handle_options(Options0),
+	{ok, Config} = handle_options(Options0, server),
 	ConnectionCb = connection_cb(Options0),
 	#config{transport_info = {Transport, _, _, _}, inet_user = Options, connection_cb = ConnectionCb,
 		ssl = SslOpts, emulated = EmOpts} = Config,
@@ -233,7 +230,7 @@ ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket),
     EmulatedOptions = ssl_socket:emulated_options(),
     {ok, SocketValues} = ssl_socket:getopts(Transport, Socket, EmulatedOptions),
     ConnetionCb = connection_cb(SslOptions),
-    try handle_options(SslOptions ++ SocketValues) of
+    try handle_options(SslOptions ++ SocketValues, server) of
 	{ok, #config{transport_info = CbInfo, ssl = SslOpts, emulated = EmOpts}} ->
 	    ok = ssl_socket:setopts(Transport, Socket, ssl_socket:internal_inet_values()),
 	    {ok, Port} = ssl_socket:port(Transport, Socket),
@@ -315,24 +312,32 @@ controlling_process(#sslsocket{pid = {Listen,
 %%
 %% Description: Return SSL information for the connection
 %%--------------------------------------------------------------------
-connection_information(#sslsocket{pid = Pid}) when is_pid(Pid) -> ssl_connection:connection_information(Pid);
-connection_information(#sslsocket{pid = {Listen, _}}) when is_port(Listen) -> {error, enotconn}.
-
+connection_information(#sslsocket{pid = Pid}) when is_pid(Pid) -> 
+    case ssl_connection:connection_information(Pid) of
+	{ok, Info} ->
+	    {ok, [Item || Item = {_Key, Value} <- Info,  Value =/= undefined]};
+	Error ->
+            Error
+    end;
+connection_information(#sslsocket{pid = {Listen, _}}) when is_port(Listen) -> 
+    {error, enotconn}.
 
 %%--------------------------------------------------------------------
--spec connection_information(#sslsocket{}, [atom]) -> {ok, list()} | {error, reason()}.
+-spec connection_information(#sslsocket{}, [atom()]) -> {ok, list()} | {error, reason()}.
 %%
 %% Description: Return SSL information for the connection
 %%--------------------------------------------------------------------
 connection_information(#sslsocket{} = SSLSocket, Items) -> 
     case connection_information(SSLSocket) of
-        {ok, I} ->
-            {ok, lists:filter(fun({K, _}) -> lists:foldl(fun(K1, Acc) when K1 =:= K -> Acc +  1; (_, Acc) -> Acc end, 0, Items) > 0 end, I)};
-        E ->
-            E
+        {ok, Info} ->
+            {ok, [Item || Item = {Key, Value} <- Info,  lists:member(Key, Items),
+			  Value =/= undefined]};
+	Error ->
+            Error
     end.
 
 %%--------------------------------------------------------------------
+%% Deprecated
 -spec connection_info(#sslsocket{}) -> 	{ok, {tls_record:tls_atom_version(), ssl_cipher:erl_cipher_suite()}} |
 					{error, reason()}.
 %%
@@ -372,15 +377,6 @@ peercert(#sslsocket{pid = {Listen, _}}) when is_port(Listen) ->
     {error, enotconn}.
 
 %%--------------------------------------------------------------------
--spec suite_definition(ssl_cipher:cipher_suite()) -> ssl_cipher:erl_cipher_suite().
-%%
-%% Description: Return erlang cipher suite definition.
-%%--------------------------------------------------------------------
-suite_definition(S) ->
-    {KeyExchange, Cipher, Hash, _} = ssl_cipher:suite_definition(S),
-    {KeyExchange, Cipher, Hash}.
-
-%%--------------------------------------------------------------------
 -spec negotiated_protocol(#sslsocket{}) -> {ok, binary()} | {error, reason()}.
 %%
 %% Description: Returns the protocol that has been negotiated. If no
@@ -410,7 +406,7 @@ negotiated_next_protocol(Socket) ->
 %%--------------------------------------------------------------------
 cipher_suites(erlang) ->
     Version = tls_record:highest_protocol_version([]),
-    ssl_cipher:filter_suites([suite_definition(S)
+    ssl_cipher:filter_suites([ssl_cipher:erl_suite_definition(S)
                               || S <- ssl_cipher:suites(Version)]);
 cipher_suites(openssl) ->
     Version = tls_record:highest_protocol_version([]),
@@ -418,7 +414,7 @@ cipher_suites(openssl) ->
      || S <- ssl_cipher:filter_suites(ssl_cipher:suites(Version))];
 cipher_suites(all) ->
     Version = tls_record:highest_protocol_version([]),
-    ssl_cipher:filter_suites([suite_definition(S)
+    ssl_cipher:filter_suites([ssl_cipher:erl_suite_definition(S)
 			      || S <-ssl_cipher:all_suites(Version)]).
 cipher_suites() ->
     cipher_suites(erlang).
@@ -630,7 +626,8 @@ handle_options(Opts0, #ssl_options{protocol = Protocol, cacerts = CaCerts0,
 				   cacertfile = CaCertFile0} = InheritedSslOpts) ->
     RecordCB = record_cb(Protocol),
     CaCerts = handle_option(cacerts, Opts0, CaCerts0),
-    {Verify, FailIfNoPeerCert, CaCertDefault, VerifyFun, PartialChainHanlder} = handle_verify_options(Opts0, CaCerts),
+    {Verify, FailIfNoPeerCert, CaCertDefault, VerifyFun, PartialChainHanlder,
+     VerifyClientOnce} = handle_verify_options(Opts0, CaCerts),
     CaCertFile = case proplists:get_value(cacertfile, Opts0, CaCertFile0) of
 		     undefined ->
 			 CaCertDefault;
@@ -643,11 +640,12 @@ handle_options(Opts0, #ssl_options{protocol = Protocol, cacerts = CaCerts0,
 						 verify = Verify,
 						 verify_fun = VerifyFun,
 						 partial_chain = PartialChainHanlder,
-						 fail_if_no_peer_cert = FailIfNoPeerCert},
+						 fail_if_no_peer_cert = FailIfNoPeerCert,
+						 verify_client_once = VerifyClientOnce},
     SslOpts1 = lists:foldl(fun(Key, PropList) ->
 				   proplists:delete(Key, PropList)
 			   end, Opts0, [cacerts, cacertfile, verify, verify_fun, partial_chain,
-					fail_if_no_peer_cert]),
+					fail_if_no_peer_cert, verify_client_once]),
     case handle_option(versions, SslOpts1, []) of
 	[] ->
 	    new_ssl_options(SslOpts1, NewVerifyOpts, RecordCB);
@@ -655,10 +653,10 @@ handle_options(Opts0, #ssl_options{protocol = Protocol, cacerts = CaCerts0,
 	    Versions = [RecordCB:protocol_version(Vsn) || Vsn <- Value],
 	    new_ssl_options(proplists:delete(versions, SslOpts1), 
 			    NewVerifyOpts#ssl_options{versions = Versions}, record_cb(Protocol))
-    end.
+    end;
 
 %% Handle all options in listen and connect
-handle_options(Opts0) ->
+handle_options(Opts0, Role) ->
     Opts = proplists:expand([{binary, [{mode, binary}]},
 			     {list, [{mode, list}]}], Opts0),
     assert_proplist(Opts),
@@ -667,7 +665,7 @@ handle_options(Opts0) ->
     ReuseSessionFun = fun(_, _, _, _) -> true end,
     CaCerts = handle_option(cacerts, Opts, undefined),
 
-    {Verify, FailIfNoPeerCert, CaCertDefault, VerifyFun, PartialChainHanlder} =
+    {Verify, FailIfNoPeerCert, CaCertDefault, VerifyFun, PartialChainHanlder, VerifyClientOnce} =
 	handle_verify_options(Opts, CaCerts),
     
     CertFile = handle_option(certfile, Opts, <<>>),
@@ -686,7 +684,7 @@ handle_options(Opts0) ->
 		    verify_fun = VerifyFun,
 		    partial_chain = PartialChainHanlder,
 		    fail_if_no_peer_cert = FailIfNoPeerCert,
-		    verify_client_once =  handle_option(verify_client_once, Opts, false),
+		    verify_client_once = VerifyClientOnce,
 		    depth      = handle_option(depth,  Opts, 1),
 		    cert       = handle_option(cert, Opts, undefined),
 		    certfile   = CertFile,
@@ -702,11 +700,17 @@ handle_options(Opts0) ->
 		    srp_identity = handle_option(srp_identity, Opts, undefined),
 		    ciphers    = handle_cipher_option(proplists:get_value(ciphers, Opts, []), 
 						      RecordCb:highest_protocol_version(Versions)),
+		    signature_algs = handle_hashsigns_option(proplists:get_value(signature_algs, Opts, 
+									     default_option_role(server, 
+												 tls_v1:default_signature_algs(Versions), Role)),
+							 RecordCb:highest_protocol_version(Versions)), 
 		    %% Server side option
 		    reuse_session = handle_option(reuse_session, Opts, ReuseSessionFun),
 		    reuse_sessions = handle_option(reuse_sessions, Opts, true),
 		    secure_renegotiate = handle_option(secure_renegotiate, Opts, false),
-		    client_renegotiation = handle_option(client_renegotiation, Opts, true),
+		    client_renegotiation = handle_option(client_renegotiation, Opts, 
+							 default_option_role(server, true, Role), 
+							 server, Role),
 		    renegotiate_at = handle_option(renegotiate_at, Opts, ?DEFAULT_RENEGOTIATE_AT),
 		    hibernate_after = handle_option(hibernate_after, Opts, undefined),
 		    erl_dist = handle_option(erl_dist, Opts, false),
@@ -723,10 +727,16 @@ handle_options(Opts0) ->
 		    server_name_indication = handle_option(server_name_indication, Opts, undefined),
 		    sni_hosts = handle_option(sni_hosts, Opts, []),
 		    sni_fun = handle_option(sni_fun, Opts, undefined),
-		    honor_cipher_order = handle_option(honor_cipher_order, Opts, false),
+		    honor_cipher_order = handle_option(honor_cipher_order, Opts, 
+						       default_option_role(server, false, Role), 
+						       server, Role),
 		    protocol = proplists:get_value(protocol, Opts, tls),
 		    padding_check =  proplists:get_value(padding_check, Opts, true),
-		    fallback =  proplists:get_value(fallback, Opts, false),
+		    fallback = handle_option(fallback, Opts,
+					     proplists:get_value(fallback, Opts,    
+								 default_option_role(client, 
+										     false, Role)),
+					     client, Role),
 		    crl_check = handle_option(crl_check, Opts, false),
 		    crl_cache = handle_option(crl_cache, Opts, {ssl_crl_cache, {internal, []}})
 		   },
@@ -743,7 +753,7 @@ handle_options(Opts0) ->
 		  alpn_preferred_protocols, next_protocols_advertised,
 		  client_preferred_next_protocols, log_alert,
 		  server_name_indication, honor_cipher_order, padding_check, crl_check, crl_cache,
-		  fallback],
+		  fallback, signature_algs],
 
     SockOpts = lists:foldl(fun(Key, PropList) ->
 				   proplists:delete(Key, PropList)
@@ -756,6 +766,13 @@ handle_options(Opts0) ->
 		 inet_user = SockOpts, transport_info = CbInfo, connection_cb = ConnetionCb
 		}}.
 
+
+
+handle_option(OptionName, Opts, Default, Role, Role) ->
+    handle_option(OptionName, Opts, Default);
+handle_option(_, _, undefined = Value, _, _) ->
+    Value.
+
 handle_option(sni_fun, Opts, Default) ->
     OptFun = validate_option(sni_fun,
                              proplists:get_value(sni_fun, Opts, Default)),
@@ -772,7 +789,6 @@ handle_option(OptionName, Opts, Default) ->
     validate_option(OptionName,
 		    proplists:get_value(OptionName, Opts, Default)).
 
-
 validate_option(versions, Versions)  ->
     validate_versions(Versions, Versions);
 validate_option(verify, Value)
@@ -977,6 +993,18 @@ validate_option(crl_cache, {Cb, {_Handle, Options}} = Value) when is_atom(Cb) an
 validate_option(Opt, Value) ->
     throw({error, {options, {Opt, Value}}}).
 
+handle_hashsigns_option(Value, {Major, Minor} = Version) when is_list(Value) 
+							      andalso Major >= 3 andalso Minor >= 3->
+    case tls_v1:signature_algs(Version, Value) of
+	[] ->
+	    throw({error, {options, no_supported_algorithms, {signature_algs, Value}}});
+	_ ->	
+	    Value
+    end;
+handle_hashsigns_option(_, {Major, Minor} = Version) when Major >= 3 andalso Minor >= 3->
+    handle_hashsigns_option(tls_v1:default_signature_algs(Version), Version);
+handle_hashsigns_option(_, _Version) ->
+    undefined.
 
 validate_options([]) ->
 	[];
@@ -1216,7 +1244,8 @@ emulated_socket_options(InetValues, #socket_options{
 new_ssl_options([], #ssl_options{} = Opts, _) -> 
     Opts;
 new_ssl_options([{verify_client_once, Value} | Rest], #ssl_options{} = Opts, RecordCB) -> 
-    new_ssl_options(Rest, Opts#ssl_options{verify_client_once = validate_option(verify_client_once, Value)}, RecordCB); 
+    new_ssl_options(Rest, Opts#ssl_options{verify_client_once = 
+					       validate_option(verify_client_once, Value)}, RecordCB); 
 new_ssl_options([{depth, Value} | Rest], #ssl_options{} = Opts, RecordCB) -> 
     new_ssl_options(Rest, Opts#ssl_options{depth = validate_option(depth, Value)}, RecordCB);
 new_ssl_options([{cert, Value} | Rest], #ssl_options{} = Opts, RecordCB) -> 
@@ -1272,6 +1301,13 @@ new_ssl_options([{server_name_indication, Value} | Rest], #ssl_options{} = Opts,
     new_ssl_options(Rest, Opts#ssl_options{server_name_indication = validate_option(server_name_indication, Value)}, RecordCB);
 new_ssl_options([{honor_cipher_order, Value} | Rest], #ssl_options{} = Opts, RecordCB) -> 
     new_ssl_options(Rest, Opts#ssl_options{honor_cipher_order = validate_option(honor_cipher_order, Value)}, RecordCB);
+new_ssl_options([{signature_algs, Value} | Rest], #ssl_options{} = Opts, RecordCB) -> 
+    new_ssl_options(Rest, 
+		    Opts#ssl_options{signature_algs = 
+					 handle_hashsigns_option(Value, 
+								 RecordCB:highest_protocol_version())}, 
+		    RecordCB);
+
 new_ssl_options([{Key, Value} | _Rest], #ssl_options{}, _) -> 
     throw({error, {options, {Key, Value}}}).
 
@@ -1280,6 +1316,12 @@ handle_verify_options(Opts, CaCerts) ->
     DefaultVerifyNoneFun =
 	{fun(_,{bad_cert, _}, UserState) ->
 		 {valid, UserState};
+	    (_,{extension, #'Extension'{critical = true}}, UserState) ->
+		 %% This extension is marked as critical, so
+		 %% certificate verification should fail if we don't
+		 %% understand the extension.  However, this is
+		 %% `verify_none', so let's accept it anyway.
+		 {valid, UserState};
 	    (_,{extension, _}, UserState) ->
 		 {unknown, UserState};
 	    (_, valid, UserState) ->
@@ -1295,29 +1337,35 @@ handle_verify_options(Opts, CaCerts) ->
     PartialChainHanlder = handle_option(partial_chain, Opts,
 					fun(_) -> unknown_ca end),
 
+    VerifyClientOnce = handle_option(verify_client_once, Opts, false),
+
     %% Handle 0, 1, 2 for backwards compatibility
     case proplists:get_value(verify, Opts, verify_none) of
 	0 ->
 	    {verify_none, false,
 		 ca_cert_default(verify_none, VerifyNoneFun, CaCerts),
-	     VerifyNoneFun, PartialChainHanlder};
+	     VerifyNoneFun, PartialChainHanlder, VerifyClientOnce};
 	1  ->
 	    {verify_peer, false,
 	     ca_cert_default(verify_peer, UserVerifyFun, CaCerts),
-	     UserVerifyFun, PartialChainHanlder};
+	     UserVerifyFun, PartialChainHanlder, VerifyClientOnce};
 	2 ->
 	    {verify_peer, true,
 	     ca_cert_default(verify_peer, UserVerifyFun, CaCerts),
-	     UserVerifyFun, PartialChainHanlder};
+	     UserVerifyFun, PartialChainHanlder, VerifyClientOnce};
 	verify_none ->
 	    {verify_none, false,
 	     ca_cert_default(verify_none, VerifyNoneFun, CaCerts),
-	     VerifyNoneFun, PartialChainHanlder};
+	     VerifyNoneFun, PartialChainHanlder, VerifyClientOnce};
 	verify_peer ->
 	    {verify_peer, UserFailIfNoPeerCert,
 	     ca_cert_default(verify_peer, UserVerifyFun, CaCerts),
-	     UserVerifyFun, PartialChainHanlder};
+	     UserVerifyFun, PartialChainHanlder, VerifyClientOnce};
 	Value ->
 	    throw({error, {options, {verify, Value}}})
     end.
 
+default_option_role(Role, Value, Role) ->
+    Value;
+default_option_role(_,_,_) ->
+    undefined.
diff --git a/lib/ssl/src/ssl_certificate.erl b/lib/ssl/src/ssl_certificate.erl
index 4658e76ab1..e9dc5764a3 100644
--- a/lib/ssl/src/ssl_certificate.erl
+++ b/lib/ssl/src/ssl_certificate.erl
@@ -56,15 +56,15 @@
 %% errors. Returns {RootCert, Path, VerifyErrors}
 %%--------------------------------------------------------------------
 trusted_cert_and_path(CertChain, CertDbHandle, CertDbRef, PartialChainHandler) ->
-    Path = [Cert | _] = lists:reverse(CertChain),
-    OtpCert = public_key:pkix_decode_cert(Cert, otp),
+    Path = [BinCert | _] = lists:reverse(CertChain),
+    OtpCert = public_key:pkix_decode_cert(BinCert, otp),
     SignedAndIssuerID =
 	case public_key:pkix_is_self_signed(OtpCert) of
 	    true ->
 		{ok, IssuerId} = public_key:pkix_issuer_id(OtpCert, self),
 		{self, IssuerId};
 	    false ->
-		other_issuer(OtpCert, CertDbHandle)
+		other_issuer(OtpCert, BinCert, CertDbHandle)
 	end,
     
     case SignedAndIssuerID of
@@ -187,7 +187,7 @@ public_key_type(?'id-ecPublicKey') ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-certificate_chain(OtpCert, _Cert, CertDbHandle, CertsDbRef, Chain) ->
+certificate_chain(OtpCert, BinCert, CertDbHandle, CertsDbRef, Chain) ->
     IssuerAndSelfSigned = 
 	case public_key:pkix_is_self_signed(OtpCert) of
 	    true ->
@@ -200,7 +200,7 @@ certificate_chain(OtpCert, _Cert, CertDbHandle, CertsDbRef, Chain) ->
 	{_, true = SelfSigned} ->
 	    certificate_chain(CertDbHandle, CertsDbRef, Chain, ignore, ignore, SelfSigned);
 	{{error, issuer_not_found}, SelfSigned} ->
-	    case find_issuer(OtpCert, CertDbHandle) of
+	    case find_issuer(OtpCert, BinCert, CertDbHandle) of
 		{ok, {SerialNr, Issuer}} ->
 		    certificate_chain(CertDbHandle, CertsDbRef, Chain,
 				      SerialNr, Issuer, SelfSigned);
@@ -232,12 +232,12 @@ certificate_chain(CertDbHandle, CertsDbRef, Chain, SerialNr, Issuer, _SelfSigned
 	    {ok, undefined, lists:reverse(Chain)}		      
     end.
 
-find_issuer(OtpCert, CertDbHandle) ->
+find_issuer(OtpCert, BinCert, CertDbHandle) ->
     IsIssuerFun =
 	fun({_Key, {_Der, #'OTPCertificate'{} = ErlCertCandidate}}, Acc) ->
 		case public_key:pkix_is_issuer(OtpCert, ErlCertCandidate) of
 		    true ->
-			case verify_cert_signer(OtpCert, ErlCertCandidate#'OTPCertificate'.tbsCertificate) of
+			case verify_cert_signer(BinCert, ErlCertCandidate#'OTPCertificate'.tbsCertificate) of
 			    true ->
 				throw(public_key:pkix_issuer_id(ErlCertCandidate, self));
 			    false ->
@@ -265,9 +265,9 @@ is_valid_extkey_usage(KeyUse, server) ->
     %% Server wants to verify client
     is_valid_key_usage(KeyUse, ?'id-kp-clientAuth').
 
-verify_cert_signer(OtpCert, SignerTBSCert) -> 
+verify_cert_signer(BinCert, SignerTBSCert) ->
     PublicKey = public_key(SignerTBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo),
-    public_key:pkix_verify(public_key:pkix_encode('OTPCertificate', OtpCert, otp),  PublicKey).
+    public_key:pkix_verify(BinCert, PublicKey).
 
 public_key(#'OTPSubjectPublicKeyInfo'{algorithm = #'PublicKeyAlgorithm'{algorithm = ?'id-ecPublicKey',
 									parameters = Params},
@@ -281,12 +281,12 @@ public_key(#'OTPSubjectPublicKeyInfo'{algorithm = #'PublicKeyAlgorithm'{algorith
 				      subjectPublicKey = Key}) ->
     {Key, Params}.
 
-other_issuer(OtpCert, CertDbHandle) ->
+other_issuer(OtpCert, BinCert, CertDbHandle) ->
     case public_key:pkix_issuer_id(OtpCert, other) of
 	{ok, IssuerId} ->
 	    {other, IssuerId};
 	{error, issuer_not_found} ->
-	    case find_issuer(OtpCert, CertDbHandle) of
+	    case find_issuer(OtpCert, BinCert, CertDbHandle) of
 		{ok, IssuerId} ->
 		    {other, IssuerId};
 		Other ->
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index 8c2a16ba96..cbe3a2a056 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -34,22 +34,27 @@
 -include_lib("public_key/include/public_key.hrl").
 
 -export([security_parameters/2, security_parameters/3, suite_definition/1,
+	 erl_suite_definition/1,
 	 cipher_init/3, decipher/6, cipher/5, decipher_aead/6, cipher_aead/6,
 	 suite/1, suites/1, all_suites/1, 
 	 ec_keyed_suites/0, anonymous_suites/1, psk_suites/1, srp_suites/0,
-	 rc4_suites/1, openssl_suite/1, openssl_suite_name/1, filter/2, filter_suites/1,
+	 rc4_suites/1, des_suites/1, openssl_suite/1, openssl_suite_name/1, filter/2, filter_suites/1,
 	 hash_algorithm/1, sign_algorithm/1, is_acceptable_hash/2, is_fallback/1]).
 
 -export_type([cipher_suite/0,
 	      erl_cipher_suite/0, openssl_cipher_suite/0,
-	      key_algo/0]).
+	      hash/0, key_algo/0, sign_algo/0]).
 
 -type cipher()            :: null |rc4_128 | idea_cbc | des40_cbc | des_cbc | '3des_ede_cbc' 
 			   | aes_128_cbc |  aes_256_cbc | aes_128_gcm | aes_256_gcm | chacha20_poly1305.
 -type hash()              :: null | sha | md5 | sha224 | sha256 | sha384 | sha512.
+-type sign_algo()         :: rsa | dsa | ecdsa.
 -type key_algo()          :: null | rsa | dhe_rsa | dhe_dss | ecdhe_ecdsa| ecdh_ecdsa | ecdh_rsa| srp_rsa| srp_dss | psk | dhe_psk | rsa_psk | dh_anon | ecdh_anon | srp_anon.
--type erl_cipher_suite()  :: {key_algo(), cipher(), hash()}.
--type int_cipher_suite()  :: {key_algo(), cipher(), hash(), hash() | default_prf}.
+-type erl_cipher_suite()  :: {key_algo(), cipher(), hash()} % Pre TLS 1.2 
+			     %% TLS 1.2, internally PRE TLS 1.2 will use default_prf
+			   | {key_algo(), cipher(), hash(), hash() | default_prf}. 
+
+ 
 -type cipher_suite()      :: binary().
 -type cipher_enum()        :: integer().
 -type openssl_cipher_suite()  :: string().
@@ -311,7 +316,8 @@ all_suites(Version) ->
 	++ anonymous_suites(Version)
 	++ psk_suites(Version)
 	++ srp_suites()
-        ++ rc4_suites(Version).
+        ++ rc4_suites(Version)
+        ++ des_suites(Version).
 %%--------------------------------------------------------------------
 -spec anonymous_suites(ssl_record:ssl_version() | integer()) -> [cipher_suite()].
 %%
@@ -415,9 +421,19 @@ rc4_suites({3, N}) when N =< 3 ->
      ?TLS_RSA_WITH_RC4_128_MD5,
      ?TLS_ECDH_ECDSA_WITH_RC4_128_SHA,
      ?TLS_ECDH_RSA_WITH_RC4_128_SHA].
+%%--------------------------------------------------------------------
+-spec des_suites(Version::ssl_record:ssl_version()) -> [cipher_suite()].
+%%
+%% Description: Returns a list of the cipher suites
+%% with DES cipher, only supported if explicitly set by user. 
+%% Are not considered secure any more. 
+%%--------------------------------------------------------------------
+des_suites(_)->
+    [?TLS_DHE_RSA_WITH_DES_CBC_SHA,
+     ?TLS_RSA_WITH_DES_CBC_SHA].
 
 %%--------------------------------------------------------------------
--spec suite_definition(cipher_suite()) -> int_cipher_suite().
+-spec suite_definition(cipher_suite()) -> erl_cipher_suite().
 %%
 %% Description: Return erlang cipher suite definition.
 %% Note: Currently not supported suites are commented away.
@@ -722,6 +738,20 @@ suite_definition(?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256) ->
     {dhe_rsa, chacha20_poly1305, null, sha256}.
 
 %%--------------------------------------------------------------------
+-spec erl_suite_definition(cipher_suite()) -> erl_cipher_suite().
+%%
+%% Description: Return erlang cipher suite definition. Filters last value
+%% for now (compatibility reasons).
+%%--------------------------------------------------------------------
+erl_suite_definition(S) ->
+    case suite_definition(S) of
+	{KeyExchange, Cipher, Hash, default_prf} ->
+	    {KeyExchange, Cipher, Hash};
+	Suite ->
+	    Suite
+    end.
+
+%%--------------------------------------------------------------------
 -spec suite(erl_cipher_suite()) -> cipher_suite().
 %%
 %% Description: Return TLS cipher suite definition.
@@ -1384,18 +1414,14 @@ filter(DerCert, Ciphers) ->
 %%
 %% Description: Filter suites for algorithms supported by crypto.
 %%-------------------------------------------------------------------
-filter_suites(Suites = [{_,_,_}|_]) ->
+filter_suites(Suites = [Value|_]) when is_tuple(Value) ->
     Algos = crypto:supports(),
+    Hashs =  proplists:get_value(hashs, Algos),
     lists:filter(fun({KeyExchange, Cipher, Hash}) ->
 			 is_acceptable_keyexchange(KeyExchange,  proplists:get_value(public_keys, Algos)) andalso
 			     is_acceptable_cipher(Cipher,  proplists:get_value(ciphers, Algos)) andalso
-			     is_acceptable_hash(Hash,  proplists:get_value(hashs, Algos))
-		 end, Suites);
-
-filter_suites(Suites = [{_,_,_,_}|_]) ->
-    Algos = crypto:supports(),
-    Hashs =  proplists:get_value(hashs, Algos),
-    lists:filter(fun({KeyExchange, Cipher, Hash, Prf}) ->
+			     is_acceptable_hash(Hash,  proplists:get_value(hashs, Algos));
+		    ({KeyExchange, Cipher, Hash, Prf}) ->
 			 is_acceptable_keyexchange(KeyExchange, proplists:get_value(public_keys, Algos)) andalso
 			     is_acceptable_cipher(Cipher, proplists:get_value(ciphers, Algos)) andalso
 			     is_acceptable_hash(Hash, Hashs) andalso
@@ -1714,7 +1740,8 @@ dhe_rsa_suites() ->
      ?TLS_DHE_RSA_WITH_DES_CBC_SHA,
      ?TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
      ?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
-     ?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256].
+     ?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+    ].
 
 psk_rsa_suites() ->
     [?TLS_RSA_PSK_WITH_AES_256_GCM_SHA384,
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 241871dc38..f774873269 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -304,13 +304,9 @@ hello(#hello_request{}, #state{role = client} = State0, Connection) ->
     {Record, State} = Connection:next_record(State0),
     Connection:next_state(hello, hello, Record, State);
 
-hello({common_client_hello, Type, ServerHelloExt, NegotiatedHashSign},
+hello({common_client_hello, Type, ServerHelloExt},
       State, Connection) ->
-    do_server_hello(Type, ServerHelloExt,
-		    %% Note NegotiatedHashSign is only negotiated for real if
-		    %% if TLS version is at least TLS-1.2 
-		    State#state{hashsign_algorithm = NegotiatedHashSign}, Connection);
-
+    do_server_hello(Type, ServerHelloExt, State, Connection);
 hello(timeout, State, _) ->
     {next_state, hello, State, hibernate};
 
@@ -442,7 +438,8 @@ certify(#server_key_exchange{exchange_keys = Keys},
        Alg == srp_dss; Alg == srp_rsa; Alg == srp_anon ->
 
     Params = ssl_handshake:decode_server_key(Keys, Alg, Version),
-    HashSign = negotiated_hashsign(Params#server_key_params.hashsign, Alg, Version),
+    %% Use negotiated value if TLS-1.2 otherwhise return default
+    HashSign = negotiated_hashsign(Params#server_key_params.hashsign, Alg, PubKeyInfo, Version),
     case is_anonymous(Alg) of
 	true ->
 	    calculate_secret(Params#server_key_params.params,
@@ -464,11 +461,18 @@ certify(#server_key_exchange{} = Msg,
 
 certify(#certificate_request{hashsign_algorithms = HashSigns},
 	#state{session = #session{own_certificate = Cert},
-        negotiated_version = Version} = State0, Connection) ->
-    HashSign = ssl_handshake:select_hashsign(HashSigns, Cert, Version),
-    {Record, State} = Connection:next_record(State0#state{client_certificate_requested = true}),
-    Connection:next_state(certify, certify, Record,
-			  State#state{cert_hashsign_algorithm = HashSign});
+	       key_algorithm = KeyExAlg,
+	       ssl_options = #ssl_options{signature_algs = SupportedHashSigns},
+	       negotiated_version = Version} = State0, Connection) ->
+
+    case ssl_handshake:select_hashsign(HashSigns, Cert, KeyExAlg, SupportedHashSigns, Version) of
+	#alert {} = Alert ->
+	    Connection:handle_own_alert(Alert, Version, certify, State0);
+	NegotiatedHashSign -> 
+	    {Record, State} = Connection:next_record(State0#state{client_certificate_requested = true}),
+	    Connection:next_state(certify, certify, Record,
+				  State#state{cert_hashsign_algorithm = NegotiatedHashSign})
+    end;
 
 %% PSK and RSA_PSK might bypass the Server-Key-Exchange
 certify(#server_hello_done{},
@@ -576,13 +580,15 @@ cipher(#hello_request{}, State0, Connection) ->
 
 cipher(#certificate_verify{signature = Signature, hashsign_algorithm = CertHashSign},
        #state{role = server,
-	      public_key_info = {Algo, _, _} =PublicKeyInfo,
+	      key_algorithm = KexAlg,
+	      public_key_info = PublicKeyInfo,
 	      negotiated_version = Version,
 	      session = #session{master_secret = MasterSecret},
 	      tls_handshake_history = Handshake
 	     } = State0, Connection) ->
-
-    HashSign = ssl_handshake:select_hashsign_algs(CertHashSign, Algo, Version),
+    
+    %% Use negotiated value if TLS-1.2 otherwhise return default
+    HashSign = negotiated_hashsign(CertHashSign, KexAlg, PublicKeyInfo, Version),
     case ssl_handshake:certificate_verify(Signature, PublicKeyInfo,
 					  Version, HashSign, MasterSecret, Handshake) of
 	valid ->
@@ -836,15 +842,22 @@ handle_sync_event(session_info, _, StateName,
 		  #state{session = #session{session_id = Id,
 					    cipher_suite = Suite}} = State) ->
     {reply, [{session_id, Id}, 
-	     {cipher_suite, ssl:suite_definition(Suite)}],
+	     {cipher_suite, ssl_cipher:erl_suite_definition(Suite)}],
      StateName, State, get_timeout(State)};
 handle_sync_event(peer_certificate, _, StateName, 
 		  #state{session = #session{peer_certificate = Cert}} 
 		  = State) ->
     {reply, {ok, Cert}, StateName, State, get_timeout(State)};
-handle_sync_event(connection_information, _, StateName, #state{sni_hostname = SNIHostname, session = #session{cipher_suite = CipherSuite}, negotiated_version = Version} = State) ->
-    {reply, {ok, [{protocol, tls_record:protocol_version(Version)}, {cipher_suite, ssl:suite_definition(CipherSuite)}, {sni_hostname, SNIHostname}]}, StateName, State, get_timeout(State)}.
+handle_sync_event(connection_information, _, StateName, State) ->
+    Info = connection_info(State),
+    {reply, {ok, Info}, StateName, State, get_timeout(State)}.
 
+connection_info(#state{sni_hostname = SNIHostname, 
+		       session = #session{cipher_suite = CipherSuite}, 
+		       negotiated_version = Version, ssl_options = Opts}) ->
+    [{protocol, tls_record:protocol_version(Version)}, 
+     {cipher_suite, ssl_cipher:erl_suite_definition(CipherSuite)}, 
+     {sni_hostname, SNIHostname}] ++ ssl_options_list(Opts).
 
 handle_info({ErrorTag, Socket, econnaborted}, StateName,  
 	    #state{socket = Socket, transport_cb = Transport,
@@ -1441,7 +1454,8 @@ rsa_psk_key_exchange(Version, PskIdentity, PremasterSecret, PublicKeyInfo = {Alg
 rsa_psk_key_exchange(_, _, _, _) ->
     throw (?ALERT_REC(?FATAL,?HANDSHAKE_FAILURE)).
 
-request_client_cert(#state{ssl_options = #ssl_options{verify = verify_peer},
+request_client_cert(#state{ssl_options = #ssl_options{verify = verify_peer, 
+						      signature_algs = SupportedHashSigns},
 			   connection_states = ConnectionStates0,
 			   cert_db = CertDbHandle,
 			   cert_db_ref = CertDbRef,
@@ -1449,7 +1463,9 @@ request_client_cert(#state{ssl_options = #ssl_options{verify = verify_peer},
     #connection_state{security_parameters =
 			  #security_parameters{cipher_suite = CipherSuite}} =
 	ssl_record:pending_connection_state(ConnectionStates0, read),
-    Msg = ssl_handshake:certificate_request(CipherSuite, CertDbHandle, CertDbRef, Version),
+    HashSigns = ssl_handshake:available_signature_algs(SupportedHashSigns, Version, [Version]),
+    Msg = ssl_handshake:certificate_request(CipherSuite, CertDbHandle, CertDbRef, 
+					    HashSigns, Version),
     State = Connection:send_handshake(Msg, State0),
     State#state{client_certificate_requested = true};
 
@@ -1874,14 +1890,40 @@ make_premaster_secret({MajVer, MinVer}, rsa) ->
 make_premaster_secret(_, _) ->
     undefined.
 
-negotiated_hashsign(undefined, Alg, Version) ->
+negotiated_hashsign(undefined, KexAlg, PubKeyInfo, Version) ->
     %% Not negotiated choose default 
-    case is_anonymous(Alg) of
+    case is_anonymous(KexAlg) of
 	true ->
 	    {null, anon};
 	false ->
-	    ssl_handshake:select_hashsign_algs(Alg, Version)
+	    {PubAlg, _, _} = PubKeyInfo,
+	    ssl_handshake:select_hashsign_algs(undefined, PubAlg, Version)
     end;
-negotiated_hashsign(HashSign = {_, _}, _, _) ->
+negotiated_hashsign(HashSign = {_, _}, _, _, _) ->
     HashSign.
 
+ssl_options_list(SslOptions) ->
+    Fileds = record_info(fields, ssl_options),
+    Values = tl(tuple_to_list(SslOptions)),
+    ssl_options_list(Fileds, Values, []).
+
+ssl_options_list([],[], Acc) ->
+    lists:reverse(Acc);
+%% Skip internal options, only return user options
+ssl_options_list([protocol | Keys], [_ | Values], Acc) ->
+    ssl_options_list(Keys, Values, Acc);
+ssl_options_list([erl_dist | Keys], [_ | Values], Acc) ->
+    ssl_options_list(Keys, Values, Acc);
+ssl_options_list([renegotiate_at | Keys], [_ | Values], Acc) ->
+    ssl_options_list(Keys, Values, Acc);
+ssl_options_list([ciphers = Key | Keys], [Value | Values], Acc) ->
+   ssl_options_list(Keys, Values, 
+		    [{Key, lists:map(
+			     fun(Suite) -> 
+				     ssl_cipher:erl_suite_definition(Suite) 
+			     end, Value)} 
+		     | Acc]);
+ssl_options_list([Key | Keys], [Value | Values], Acc) ->
+   ssl_options_list(Keys, Values, [{Key, Value} | Acc]).
+
+
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl
index 9a58f2b8f7..bb41ef2b62 100644
--- a/lib/ssl/src/ssl_connection.hrl
+++ b/lib/ssl/src/ssl_connection.hrl
@@ -48,27 +48,28 @@
           socket_options        :: #socket_options{},
           connection_states     :: #connection_states{} | secret_printout(),
 	  protocol_buffers      :: term() | secret_printout() , %% #protocol_buffers{} from tls_record.hrl or dtls_recor.hrl
-          tls_handshake_history :: ssl_handshake:ssl_handshake_history() | secret_printout(),
-	  cert_db               :: reference(),
+          tls_handshake_history :: ssl_handshake:ssl_handshake_history() | secret_printout()
+                                 | 'undefined',
+	  cert_db               :: reference() | 'undefined',
           session               :: #session{} | secret_printout(),
 	  session_cache         :: db_handle(),
 	  session_cache_cb      :: atom(),
 	  crl_db                :: term(), 
-          negotiated_version    :: ssl_record:ssl_version(),
+          negotiated_version    :: ssl_record:ssl_version() | 'undefined',
           client_certificate_requested = false :: boolean(),
 	  key_algorithm         :: ssl_cipher:key_algo(),
 	  hashsign_algorithm = {undefined, undefined},
 	  cert_hashsign_algorithm,
-          public_key_info      :: ssl_handshake:public_key_info(),
-          private_key          :: public_key:private_key() | secret_printout(),
+          public_key_info      :: ssl_handshake:public_key_info() | 'undefined',
+          private_key          :: public_key:private_key() | secret_printout() | 'undefined',
 	  diffie_hellman_params:: #'DHParameter'{} | undefined | secret_printout(),
 	  diffie_hellman_keys  :: {PublicKey :: binary(), PrivateKey :: binary()} | #'ECPrivateKey'{} |  undefined |  secret_printout(),  
-	  psk_identity         :: binary(), % server psk identity hint
-	  srp_params           :: #srp_user{} | secret_printout(), 
-	  srp_keys             ::{PublicKey :: binary(), PrivateKey :: binary()} | secret_printout(),
-          premaster_secret     :: binary() | secret_printout() ,
+	  psk_identity         :: binary() | 'undefined', % server psk identity hint
+	  srp_params           :: #srp_user{} | secret_printout() | 'undefined',
+	  srp_keys             ::{PublicKey :: binary(), PrivateKey :: binary()} | secret_printout() | 'undefined',
+          premaster_secret     :: binary() | secret_printout() | 'undefined',
 	  file_ref_db          :: db_handle(),
-          cert_db_ref          :: certdb_ref(),
+          cert_db_ref          :: certdb_ref() | 'undefined',
           bytes_to_read        :: undefined | integer(), %% bytes to read in passive mode
           user_data_buffer     :: undefined | binary() | secret_printout(), 
 	  renegotiation        :: undefined | {boolean(), From::term() | internal | peer},
@@ -81,7 +82,7 @@
 	  expecting_finished =                  false ::boolean(),
           negotiated_protocol = undefined             :: undefined | binary(),
 	  client_ecc,          % {Curves, PointFmt}
-	  tracker              :: pid(), %% Tracker process for listen socket
+	  tracker              :: pid() | 'undefined', %% Tracker process for listen socket
 	  sni_hostname = undefined
 	 }).
 
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index e9e140836b..644903cf4b 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -46,7 +46,7 @@
 
 %% Handshake messages
 -export([hello_request/0, server_hello/4, server_hello_done/0,
-	 certificate/4, certificate_request/4, key_exchange/3,
+	 certificate/4, certificate_request/5, key_exchange/3,
 	 finished/5,  next_protocol/1]).
 
 %% Handle handshake messages
@@ -64,8 +64,8 @@
 	]).
 
 %% Cipher suites handling
--export([available_suites/2, cipher_suites/2,
-	 select_session/10, supported_ecc/1]).
+-export([available_suites/2, available_signature_algs/3, cipher_suites/2,
+	 select_session/11, supported_ecc/1]).
 
 %% Extensions handling
 -export([client_hello_extensions/6,
@@ -74,8 +74,8 @@
 	]).
 
 %% MISC
--export([select_version/3, prf/5, select_hashsign/3, 
-	 select_hashsign_algs/2, select_hashsign_algs/3,
+-export([select_version/3, prf/5, select_hashsign/5, 
+	 select_hashsign_algs/3,
 	 premaster_secret/2, premaster_secret/3, premaster_secret/4]).
 
 %%====================================================================
@@ -120,7 +120,8 @@ server_hello(SessionId, Version, ConnectionStates, Extensions) ->
 server_hello_done() ->
     #server_hello_done{}.
 
-client_hello_extensions(Host, Version, CipherSuites, SslOpts, ConnectionStates, Renegotiation) ->
+client_hello_extensions(Host, Version, CipherSuites, 
+			#ssl_options{signature_algs = SupportedHashSigns, versions = AllVersions} = SslOpts, ConnectionStates, Renegotiation) ->
     {EcPointFormats, EllipticCurves} =
 	case advertises_ec_ciphers(lists:map(fun ssl_cipher:suite_definition/1, CipherSuites)) of
 	    true ->
@@ -134,7 +135,7 @@ client_hello_extensions(Host, Version, CipherSuites, SslOpts, ConnectionStates,
        renegotiation_info = renegotiation_info(tls_record, client,
 					       ConnectionStates, Renegotiation),
        srp = SRP,
-       hash_signs = advertised_hash_signs(Version),
+       signature_algs = available_signature_algs(SupportedHashSigns, Version, AllVersions),
        ec_point_formats = EcPointFormats,
        elliptic_curves = EllipticCurves,
        alpn = encode_alpn(SslOpts#ssl_options.alpn_advertised_protocols, Renegotiation),
@@ -203,14 +204,14 @@ client_certificate_verify(OwnCert, MasterSecret, Version,
     end.
 
 %%--------------------------------------------------------------------
--spec certificate_request(ssl_cipher:cipher_suite(), db_handle(), certdb_ref(), ssl_record:ssl_version()) ->
-    #certificate_request{}.
+-spec certificate_request(ssl_cipher:cipher_suite(), db_handle(), 
+			  certdb_ref(),  #hash_sign_algos{}, ssl_record:ssl_version()) ->
+				 #certificate_request{}.
 %%
 %% Description: Creates a certificate_request message, called by the server.
 %%--------------------------------------------------------------------
-certificate_request(CipherSuite, CertDbHandle, CertDbRef, Version) ->
+certificate_request(CipherSuite, CertDbHandle, CertDbRef, HashSigns, Version) ->
     Types = certificate_types(ssl_cipher:suite_definition(CipherSuite), Version),
-    HashSigns = advertised_hash_signs(Version),
     Authorities = certificate_authorities(CertDbHandle, CertDbRef),
     #certificate_request{
 		    certificate_types = Types,
@@ -351,6 +352,9 @@ verify_server_key(#server_key_params{params_bin = EncParams,
 %%
 %% Description: Checks that the certificate_verify message is valid.
 %%--------------------------------------------------------------------
+certificate_verify(_, _, _, undefined, _, _) ->
+    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE);
+
 certificate_verify(Signature, PublicKeyInfo, Version,
 		   HashSign = {HashAlgo, _}, MasterSecret, {_, Handshake}) ->
     Hash = calc_certificate_verify(Version, HashAlgo, MasterSecret, Handshake),
@@ -379,10 +383,11 @@ verify_signature(_Version, Hash, _HashAlgo, Signature, {?rsaEncryption, PubKey,
     end;
 verify_signature(_Version, Hash, {HashAlgo, dsa}, Signature, {?'id-dsa', PublicKey, PublicKeyParams}) ->
     public_key:verify({digest, Hash}, HashAlgo, Signature, {PublicKey, PublicKeyParams});
-verify_signature(_Version, Hash, {HashAlgo, ecdsa}, Signature,
+verify_signature(_, Hash, {HashAlgo, _SignAlg}, Signature,
 		 {?'id-ecPublicKey', PublicKey, PublicKeyParams}) ->
     public_key:verify({digest, Hash}, HashAlgo, Signature, {PublicKey, PublicKeyParams}).
 
+
 %%--------------------------------------------------------------------
 -spec certify(#certificate{}, db_handle(), certdb_ref(), integer() | nolimit,
 	      verify_peer | verify_none, {fun(), term}, fun(), term(), term(),
@@ -573,43 +578,46 @@ prf({3,_N}, Secret, Label, Seed, WantedLength) ->
 
 
 %%--------------------------------------------------------------------
--spec select_hashsign(#hash_sign_algos{}| undefined,  undefined | binary(), ssl_record:ssl_version()) ->
-			      {atom(), atom()} | undefined.
+-spec select_hashsign(#hash_sign_algos{} | undefined,  undefined | binary(), 
+		      atom(), [atom()], ssl_record:ssl_version()) ->
+			     {atom(), atom()} | undefined  | #alert{}.
 
 %%
-%% Description:
+%% Description: Handles signature_algorithms extension
 %%--------------------------------------------------------------------
-select_hashsign(_, undefined, _Version) ->
+select_hashsign(_, undefined, _,  _, _Version) ->
     {null, anon};
 %% The signature_algorithms extension was introduced with TLS 1.2. Ignore it if we have
 %% negotiated a lower version.
-select_hashsign(#hash_sign_algos{hash_sign_algos = HashSigns}, Cert, {Major, Minor} = Version)
-  when Major >= 3 andalso Minor >= 3 ->
-    #'OTPCertificate'{tbsCertificate = TBSCert} =public_key:pkix_decode_cert(Cert, otp),
+select_hashsign(HashSigns, Cert, KeyExAlgo, 
+		undefined, {Major, Minor} = Version)  when Major >= 3 andalso Minor >= 3->
+    select_hashsign(HashSigns, Cert, KeyExAlgo, tls_v1:default_signature_algs(Version), Version);
+select_hashsign(#hash_sign_algos{hash_sign_algos = HashSigns}, Cert, KeyExAlgo, SupportedHashSigns,
+		{Major, Minor}) when Major >= 3 andalso Minor >= 3 ->
+    #'OTPCertificate'{tbsCertificate = TBSCert} = public_key:pkix_decode_cert(Cert, otp),
     #'OTPSubjectPublicKeyInfo'{algorithm = {_,Algo, _}} = TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
-    DefaultHashSign = {_, Sign} = select_hashsign_algs(undefined, Algo, Version),
-    case lists:filter(fun({sha, dsa}) ->
+    Sign = cert_sign(Algo),
+    case lists:filter(fun({sha, dsa = S}) when S == Sign ->
 			      true;
 			 ({_, dsa}) ->
 			      false;
-			 ({Hash, S}) when  S == Sign ->
-			      ssl_cipher:is_acceptable_hash(Hash,
-							    proplists:get_value(hashs, crypto:supports()));
+			 ({_, _} = Algos) ->
+			      is_acceptable_hash_sign(Algos, Sign, KeyExAlgo, SupportedHashSigns);
 			 (_)  ->
 			      false
 		      end, HashSigns) of
 	[] ->
-	    DefaultHashSign;
-	[HashSign| _] ->
+	    ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY);
+	[HashSign | _] ->
 	    HashSign
     end;
-select_hashsign(_, Cert, Version) ->
+select_hashsign(_, Cert, _, _, Version) ->
     #'OTPCertificate'{tbsCertificate = TBSCert} = public_key:pkix_decode_cert(Cert, otp),
     #'OTPSubjectPublicKeyInfo'{algorithm = {_,Algo, _}} = TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
     select_hashsign_algs(undefined, Algo, Version).
 
 %%--------------------------------------------------------------------
--spec select_hashsign_algs(#hash_sign_algos{}| undefined, oid(), ssl_record:ssl_version()) ->
+-spec select_hashsign_algs({atom(), atom()}| undefined, oid(), ssl_record:ssl_version()) ->
 				  {atom(), atom()}.
 
 %% Description: For TLS 1.2 hash function and signature algorithm pairs can be
@@ -642,24 +650,6 @@ select_hashsign_algs(undefined, ?rsaEncryption, _) ->
 select_hashsign_algs(undefined, ?'id-dsa', _) ->
     {sha, dsa}.
 
--spec select_hashsign_algs(atom(),  ssl_record:ssl_version()) -> {atom(), atom()}.
-%% Wrap function to keep the knowledge of the default values in
-%% one place only 
-select_hashsign_algs(Alg, Version) when (Alg == rsa orelse
-				    Alg == dhe_rsa orelse
-				    Alg == dh_rsa orelse
-				    Alg == ecdhe_rsa orelse
-				    Alg == ecdh_rsa orelse
-				    Alg == srp_rsa) ->    
-    select_hashsign_algs(undefined, ?rsaEncryption, Version);
-select_hashsign_algs(Alg, Version) when (Alg == dhe_dss orelse
-				    Alg == dh_dss orelse
-				    Alg == srp_dss) ->
-    select_hashsign_algs(undefined, ?'id-dsa', Version);
-select_hashsign_algs(Alg, Version) when (Alg == ecdhe_ecdsa orelse
-					 Alg == ecdh_ecdsa) ->
-    select_hashsign_algs(undefined, ?'id-ecPublicKey', Version).
-
 %%--------------------------------------------------------------------
 -spec master_secret(atom(), ssl_record:ssl_version(), #session{} | binary(), #connection_states{},
 		   client | server) -> {binary(), #connection_states{}} | #alert{}.
@@ -1063,9 +1053,56 @@ available_suites(UserSuites, Version) ->
 			    lists:member(Suite, ssl_cipher:all_suites(Version))
 		    end, UserSuites).
 
-available_suites(ServerCert, UserSuites, Version, Curve) ->
+available_suites(ServerCert, UserSuites, Version, undefined, Curve) ->
     ssl_cipher:filter(ServerCert, available_suites(UserSuites, Version))
-	-- unavailable_ecc_suites(Curve).
+	-- unavailable_ecc_suites(Curve);
+available_suites(ServerCert, UserSuites, Version, HashSigns, Curve) ->
+    Suites = available_suites(ServerCert, UserSuites, Version, undefined, Curve),
+    filter_hashsigns(Suites, [ssl_cipher:suite_definition(Suite) || Suite <- Suites], HashSigns, []).
+filter_hashsigns([], [], _, Acc) ->
+    lists:reverse(Acc);
+filter_hashsigns([Suite | Suites], [{KeyExchange,_,_,_} | Algos], HashSigns,
+		 Acc) when KeyExchange == dhe_ecdsa;
+			   KeyExchange == ecdhe_ecdsa ->
+    do_filter_hashsigns(ecdsa, Suite, Suites, Algos, HashSigns, Acc);
+
+filter_hashsigns([Suite | Suites], [{KeyExchange,_,_,_} | Algos], HashSigns,
+		 Acc) when KeyExchange == rsa;
+			   KeyExchange == dhe_rsa;
+			   KeyExchange == ecdhe_rsa;
+			   KeyExchange == srp_rsa;
+			   KeyExchange == rsa_psk ->
+    do_filter_hashsigns(rsa, Suite, Suites, Algos, HashSigns, Acc);
+filter_hashsigns([Suite | Suites], [{KeyExchange,_,_,_} | Algos], HashSigns, Acc) when 
+      KeyExchange == dhe_dss;
+      KeyExchange == srp_dss ->							       
+    do_filter_hashsigns(dsa, Suite, Suites, Algos, HashSigns, Acc);
+filter_hashsigns([Suite | Suites], [{KeyExchange,_,_,_} | Algos], HashSigns, Acc) when 
+      KeyExchange == dh_dss; 
+      KeyExchange == dh_rsa; 
+      KeyExchange == dh_ecdsa;
+      KeyExchange == ecdh_rsa;    
+      KeyExchange == ecdh_ecdsa ->
+      %%  Fixed DH certificates MAY be signed with any hash/signature
+      %%  algorithm pair appearing in the hash_sign extension.  The names
+    %%  DH_DSS, DH_RSA, ECDH_ECDSA, and ECDH_RSA are historical.
+    filter_hashsigns(Suites, Algos, HashSigns, [Suite| Acc]);
+filter_hashsigns([Suite | Suites], [{KeyExchange,_,_,_} | Algos], HashSigns, Acc) when 
+      KeyExchange == dh_anon;
+      KeyExchange == ecdh_anon;
+      KeyExchange == srp_anon;
+      KeyExchange == psk;
+      KeyExchange == dhe_psk ->
+    %% In this case hashsigns is not used as the kexchange is anonaymous
+    filter_hashsigns(Suites, Algos, HashSigns, [Suite| Acc]).
+
+do_filter_hashsigns(SignAlgo, Suite, Suites, Algos, HashSigns, Acc) ->
+    case lists:keymember(SignAlgo, 2, HashSigns) of
+	true ->
+	    filter_hashsigns(Suites, Algos, HashSigns, [Suite| Acc]);
+	false ->
+	    filter_hashsigns(Suites, Algos, HashSigns, Acc)
+    end.
 
 unavailable_ecc_suites(no_curve) ->
     ssl_cipher:ec_keyed_suites();
@@ -1077,17 +1114,17 @@ cipher_suites(Suites, false) ->
 cipher_suites(Suites, true) ->
     Suites.
 
-select_session(SuggestedSessionId, CipherSuites, Compressions, Port, #session{ecc = ECCCurve} = 
+select_session(SuggestedSessionId, CipherSuites, HashSigns, Compressions, Port, #session{ecc = ECCCurve} = 
 		   Session, Version,
-	       #ssl_options{ciphers = UserSuites, honor_cipher_order = HCO} = SslOpts,
+	       #ssl_options{ciphers = UserSuites, honor_cipher_order = HonorCipherOrder} = SslOpts,
 	       Cache, CacheCb, Cert) ->
     {SessionId, Resumed} = ssl_session:server_id(Port, SuggestedSessionId,
 						 SslOpts, Cert,
 						 Cache, CacheCb),
     case Resumed of
         undefined ->
-	    Suites = available_suites(Cert, UserSuites, Version, ECCCurve),
-	    CipherSuite = select_cipher_suite(CipherSuites, Suites, HCO),
+	    Suites = available_suites(Cert, UserSuites, Version, HashSigns, ECCCurve),
+	    CipherSuite = select_cipher_suite(CipherSuites, Suites, HonorCipherOrder),
 	    Compression = select_compression(Compressions),
 	    {new, Session#session{session_id = SessionId,
 				  cipher_suite = CipherSuite,
@@ -1155,7 +1192,7 @@ handle_client_hello_extensions(RecordCB, Random, ClientCipherSuites,
 			       #hello_extensions{renegotiation_info = Info,
 						 srp = SRP,
 						 ec_point_formats = ECCFormat,
-                         alpn = ALPN,
+						 alpn = ALPN,
 						 next_protocol_negotiation = NextProtocolNegotiation}, Version,
 			       #ssl_options{secure_renegotiate = SecureRenegotation,
                                             alpn_preferred_protocols = ALPNPreferredProtocols} = Opts,
@@ -1324,7 +1361,7 @@ handle_renegotiation_info(_RecordCB, ConnectionStates, SecureRenegotation) ->
 
 hello_extensions_list(#hello_extensions{renegotiation_info = RenegotiationInfo,
 					srp = SRP,
-					hash_signs = HashSigns,
+					signature_algs = HashSigns,
 					ec_point_formats = EcPointFormats,
 					elliptic_curves = EllipticCurves,
                                         alpn = ALPN,
@@ -1799,7 +1836,7 @@ dec_hello_extensions(<<?UINT16(?SIGNATURE_ALGORITHMS_EXT), ?UINT16(Len),
     <<?UINT16(SignAlgoListLen), SignAlgoList/binary>> = ExtData,
     HashSignAlgos = [{ssl_cipher:hash_algorithm(Hash), ssl_cipher:sign_algorithm(Sign)} ||
 			<<?BYTE(Hash), ?BYTE(Sign)>> <= SignAlgoList],
-    dec_hello_extensions(Rest, Acc#hello_extensions{hash_signs =
+    dec_hello_extensions(Rest, Acc#hello_extensions{signature_algs =
 						    #hash_sign_algos{hash_sign_algos = HashSignAlgos}});
 
 dec_hello_extensions(<<?UINT16(?ELLIPTIC_CURVES_EXT), ?UINT16(Len),
@@ -1899,7 +1936,7 @@ from_2bytes(<<?UINT16(N), Rest/binary>>, Acc) ->
 key_exchange_alg(rsa) ->
     ?KEY_EXCHANGE_RSA;
 key_exchange_alg(Alg) when Alg == dhe_rsa; Alg == dhe_dss;
-			    Alg == dh_dss; Alg == dh_rsa; Alg == dh_anon ->
+			   Alg == dh_dss; Alg == dh_rsa; Alg == dh_anon ->
     ?KEY_EXCHANGE_DIFFIE_HELLMAN;
 key_exchange_alg(Alg) when Alg == ecdhe_rsa; Alg == ecdh_rsa;
 			   Alg == ecdhe_ecdsa; Alg == ecdh_ecdsa;
@@ -2008,27 +2045,16 @@ is_member(Suite, SupportedSuites) ->
 select_compression(_CompressionMetodes) ->
     ?NULL.
 
--define(TLSEXT_SIGALG_RSA(MD), {MD, rsa}).
--define(TLSEXT_SIGALG_DSA(MD), {MD, dsa}).
--define(TLSEXT_SIGALG_ECDSA(MD), {MD, ecdsa}).
-
--define(TLSEXT_SIGALG(MD), ?TLSEXT_SIGALG_ECDSA(MD), ?TLSEXT_SIGALG_RSA(MD)).
-
-advertised_hash_signs({Major, Minor}) when Major >= 3 andalso Minor >= 3 ->
-    HashSigns = [?TLSEXT_SIGALG(sha512),
-		 ?TLSEXT_SIGALG(sha384),
-		 ?TLSEXT_SIGALG(sha256),
-		 ?TLSEXT_SIGALG(sha224),
-		 ?TLSEXT_SIGALG(sha),
-		 ?TLSEXT_SIGALG_DSA(sha),
-		 ?TLSEXT_SIGALG_RSA(md5)],
-    CryptoSupport = crypto:supports(),
-    HasECC = proplists:get_bool(ecdsa,  proplists:get_value(public_keys, CryptoSupport)),
-    Hashs = proplists:get_value(hashs, CryptoSupport),
-    #hash_sign_algos{hash_sign_algos =
-			 lists:filter(fun({Hash, ecdsa}) -> HasECC andalso proplists:get_bool(Hash, Hashs);
-					 ({Hash, _}) -> proplists:get_bool(Hash, Hashs) end, HashSigns)};
-advertised_hash_signs(_) ->
+available_signature_algs(undefined, _, _)  ->
+    undefined;
+available_signature_algs(SupportedHashSigns, {Major, Minor}, AllVersions) when Major >= 3 andalso Minor >= 3 ->
+    case tls_record:lowest_protocol_version(AllVersions) of
+	{3, 3} ->
+	    #hash_sign_algos{hash_sign_algos = SupportedHashSigns};
+	_ ->
+	    undefined
+    end;	
+available_signature_algs(_, _, _) ->
     undefined.
 
 psk_secret(PSKIdentity, PSKLookup) ->
@@ -2072,12 +2098,9 @@ crl_check(OtpCert, Check, CertDbHandle, CertDbRef, {Callback, CRLDbHandle}, _) -
 	      ],
     case dps_and_crls(OtpCert, Callback, CRLDbHandle, ext) of
 	no_dps ->
-	    case dps_and_crls(OtpCert, Callback, CRLDbHandle, same_issuer) of
-		[] ->
-		    valid; %% No relevant CRL existed
-		DpsAndCRls ->
-		    crl_check_same_issuer(OtpCert, Check, DpsAndCRls, Options)		
-	    end;
+	    crl_check_same_issuer(OtpCert, Check,
+				  dps_and_crls(OtpCert, Callback, CRLDbHandle, same_issuer),
+				  Options);
 	DpsAndCRLs ->  %% This DP list may be empty if relevant CRLs existed 
 	    %% but could not be retrived, will result in {bad_cert, revocation_status_undetermined}
 	    case public_key:pkix_crls_validate(OtpCert, DpsAndCRLs, Options) of
@@ -2126,3 +2149,25 @@ distpoints_lookup([DistPoint | Rest], Callback, CRLDbHandle) ->
 	CRLs ->
 	    [{DistPoint, {CRL, public_key:der_decode('CertificateList', CRL)}} ||  CRL <- CRLs]
     end.	
+
+cert_sign(?rsaEncryption) ->
+    rsa;
+cert_sign(?'id-ecPublicKey') ->
+    ecdsa;
+cert_sign(?'id-dsa') ->
+    dsa;
+cert_sign(Alg) ->
+    {_, Sign} =public_key:pkix_sign_types(Alg),
+    Sign.
+
+is_acceptable_hash_sign({_, Sign} = Algos, Sign, _, SupportedHashSigns) ->
+    is_acceptable_hash_sign(Algos, SupportedHashSigns);
+is_acceptable_hash_sign(Algos,_, KeyExAlgo, SupportedHashSigns) when KeyExAlgo == dh_ecdsa;
+								     KeyExAlgo == ecdh_rsa;    
+								     KeyExAlgo == ecdh_ecdsa ->
+    is_acceptable_hash_sign(Algos, SupportedHashSigns); 
+is_acceptable_hash_sign(_,_,_,_) ->
+    false.
+is_acceptable_hash_sign(Algos, SupportedHashSigns) ->
+    lists:member(Algos, SupportedHashSigns).
+
diff --git a/lib/ssl/src/ssl_handshake.hrl b/lib/ssl/src/ssl_handshake.hrl
index 58b4d5a23d..b74a65939b 100644
--- a/lib/ssl/src/ssl_handshake.hrl
+++ b/lib/ssl/src/ssl_handshake.hrl
@@ -95,7 +95,7 @@
 
 -record(hello_extensions, {
 	  renegotiation_info,
-	  hash_signs,          % supported combinations of hashes/signature algos
+	  signature_algs,          % supported combinations of hashes/signature algos
           alpn,
 	  next_protocol_negotiation = undefined, % [binary()]
 	  srp,
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
index 8c7ed9c0d1..9c52f5a315 100644
--- a/lib/ssl/src/ssl_internal.hrl
+++ b/lib/ssl/src/ssl_internal.hrl
@@ -93,16 +93,16 @@
 	  validate_extensions_fun, 
 	  depth                :: integer(),
 	  certfile             :: binary(),
-	  cert                 :: public_key:der_encoded() | secret_printout(),
+	  cert                 :: public_key:der_encoded() | secret_printout() | 'undefined',
 	  keyfile              :: binary(),
-	  key	               :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', public_key:der_encoded()} | secret_printout(),
-	  password	       :: string() | secret_printout(),
-	  cacerts              :: [public_key:der_encoded()] | secret_printout(),
+	  key	               :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', public_key:der_encoded()} | secret_printout() | 'undefined',
+	  password	       :: string() | secret_printout() | 'undefined',
+	  cacerts              :: [public_key:der_encoded()] | secret_printout() | 'undefined',
 	  cacertfile           :: binary(),
 	  dh                   :: public_key:der_encoded() | secret_printout(),
-	  dhfile               :: binary() | secret_printout(),
+	  dhfile               :: binary() | secret_printout() | 'undefined',
 	  user_lookup_fun,  % server option, fun to lookup the user
-	  psk_identity         :: binary() | secret_printout() ,
+	  psk_identity         :: binary() | secret_printout() | 'undefined',
 	  srp_identity,  % client option {User, Password}
 	  ciphers,    % 
 	  %% Local policy for the server if it want's to reuse the session
@@ -118,7 +118,7 @@
 	  %% undefined if not hibernating, or number of ms of
 	  %% inactivity after which ssl_connection will go into
 	  %% hibernation
-	  hibernate_after      :: boolean(),
+	  hibernate_after      :: boolean() | 'undefined',
 	  %% This option should only be set to true by inet_tls_dist
 	  erl_dist = false     :: boolean(),
           alpn_advertised_protocols = undefined :: [binary()] | undefined ,
@@ -135,7 +135,8 @@
 	  padding_check = true       :: boolean(),
 	  fallback = false           :: boolean(),
 	  crl_check                  :: boolean() | peer | best_effort, 
-	  crl_cache
+	  crl_cache,
+	  signature_algs
 	  }).
 
 -record(socket_options,
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index 00e95f5c5b..311dac4619 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -263,7 +263,9 @@ init([Name, Opts]) ->
 		session_cache_client_max = 
 		    max_session_cache_size(session_cache_client_max),
 		session_cache_server_max = 
-		    max_session_cache_size(session_cache_server_max)
+		    max_session_cache_size(session_cache_server_max),
+		session_client_invalidator = undefined,
+		session_server_invalidator = undefined
 	       }}.
 
 %%--------------------------------------------------------------------
@@ -378,13 +380,17 @@ handle_cast({invalidate_pem, File},
 handle_info(validate_sessions, #state{session_cache_cb = CacheCb,
 				      session_cache_client = ClientCache,
 				      session_cache_server = ServerCache,
-				      session_lifetime = LifeTime
+				      session_lifetime = LifeTime,
+				      session_client_invalidator = Client,
+				      session_server_invalidator = Server				      
 				     } = State) ->
     Timer = erlang:send_after(?SESSION_VALIDATION_INTERVAL, 
 			      self(), validate_sessions),
-    start_session_validator(ClientCache, CacheCb, LifeTime),
-    start_session_validator(ServerCache, CacheCb, LifeTime),
-    {noreply, State#state{session_validation_timer = Timer}};
+    CPid = start_session_validator(ClientCache, CacheCb, LifeTime, Client),
+    SPid = start_session_validator(ServerCache, CacheCb, LifeTime, Server),
+    {noreply, State#state{session_validation_timer = Timer, 
+			  session_client_invalidator = CPid,
+			  session_server_invalidator = SPid}};
 
 
 handle_info({delayed_clean_session, Key, Cache}, #state{session_cache_cb = CacheCb
@@ -471,9 +477,11 @@ validate_session(Port, Session, LifeTime) ->
 	    invalidate_session(Port, Session)
     end.
 		    
-start_session_validator(Cache, CacheCb, LifeTime) ->
+start_session_validator(Cache, CacheCb, LifeTime, undefined) ->
     spawn_link(?MODULE, init_session_validator, 
-	       [[get(ssl_manager), Cache, CacheCb, LifeTime]]).
+	       [[get(ssl_manager), Cache, CacheCb, LifeTime]]);
+start_session_validator(_,_,_, Pid) ->
+    Pid.
 
 init_session_validator([SslManagerName, Cache, CacheCb, LifeTime]) ->
     put(ssl_manager, SslManagerName),
@@ -708,6 +716,6 @@ crl_db_info(_, UserCRLDb) ->
 %% Only start a session invalidator if there is not
 %% one already active
 invalidate_session_cache(undefined, CacheCb, Cache) ->
-    start_session_validator(Cache, CacheCb, {invalidate_before, erlang:monotonic_time()});
+    start_session_validator(Cache, CacheCb, {invalidate_before, erlang:monotonic_time()}, undefined);
 invalidate_session_cache(Pid, _CacheCb, _Cache) ->
     Pid.
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index 75cfecdf5e..ce6b8fb84f 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -311,9 +311,19 @@ set_pending_cipher_state(#connection_states{pending_read = Read,
 %%
 %% Description: Encodes a handshake message to send on the ssl-socket.
 %%--------------------------------------------------------------------
-encode_handshake(Frag, Version, ConnectionStates) ->
-    encode_plain_text(?HANDSHAKE, Version, Frag, ConnectionStates).
-
+encode_handshake(Frag, Version, 
+		 #connection_states{current_write = 
+					#connection_state{
+					   security_parameters =
+					       #security_parameters{bulk_cipher_algorithm = BCA}}} = 
+		     ConnectionStates) ->
+    case iolist_size(Frag) of
+	N  when N > ?MAX_PLAIN_TEXT_LENGTH ->
+	    Data = split_bin(iolist_to_binary(Frag), ?MAX_PLAIN_TEXT_LENGTH, Version, BCA),
+	    encode_iolist(?HANDSHAKE, Data, Version, ConnectionStates);
+	_  ->
+	    encode_plain_text(?HANDSHAKE, Version, Frag, ConnectionStates)
+    end.
 %%--------------------------------------------------------------------
 -spec encode_alert_record(#alert{}, ssl_version(), #connection_states{}) ->
 				 {iolist(), #connection_states{}}.
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl
index 3edd352891..8a39bde255 100644
--- a/lib/ssl/src/ssl_tls_dist_proxy.erl
+++ b/lib/ssl/src/ssl_tls_dist_proxy.erl
@@ -20,7 +20,7 @@
 -module(ssl_tls_dist_proxy).
 
 
--export([listen/1, accept/1, connect/2, get_tcp_address/1]).
+-export([listen/2, accept/2, connect/3, get_tcp_address/1]).
 -export([init/1, start_link/0, handle_call/3, handle_cast/2, handle_info/2, 
 	 terminate/2, code_change/3, ssl_options/2]).
 
@@ -39,14 +39,14 @@
 %% Internal application API
 %%====================================================================
 
-listen(Name) ->
-    gen_server:call(?MODULE, {listen, Name}, infinity). 
+listen(Driver, Name) ->
+    gen_server:call(?MODULE, {listen, Driver, Name}, infinity).
 
-accept(Listen) ->
-    gen_server:call(?MODULE, {accept, Listen}, infinity).
+accept(Driver, Listen) ->
+    gen_server:call(?MODULE, {accept, Driver, Listen}, infinity).
 
-connect(Ip, Port) ->
-    gen_server:call(?MODULE, {connect, Ip, Port}, infinity).
+connect(Driver, Ip, Port) ->
+    gen_server:call(?MODULE, {connect, Driver, Ip, Port}, infinity).
 
 
 do_listen(Options) ->
@@ -89,6 +89,14 @@ listen_options(Opts0) ->
             Opts1
     end.
 
+connect_options(Opts) ->
+    case application:get_env(kernel, inet_dist_connect_options) of
+	{ok,ConnectOpts} ->
+	    lists:ukeysort(1, ConnectOpts ++ Opts);
+	_ ->
+	    Opts
+    end.
+
 %%====================================================================
 %% gen_server callbacks
 %%====================================================================
@@ -100,10 +108,11 @@ init([]) ->
     process_flag(priority, max),
     {ok, #state{}}.
 
-handle_call({listen, Name}, _From, State) ->
-    case gen_tcp:listen(0, [{active, false}, {packet,?PPRE}]) of
+handle_call({listen, Driver, Name}, _From, State) ->
+    case gen_tcp:listen(0, [{active, false}, {packet,?PPRE}, {ip, loopback}]) of
 	{ok, Socket} ->
-	    {ok, World} = do_listen([{active, false}, binary, {packet,?PPRE}, {reuseaddr, true}]),
+	    {ok, World} = do_listen([{active, false}, binary, {packet,?PPRE}, {reuseaddr, true},
+                                     Driver:family()]),
 	    {ok, TcpAddress} = get_tcp_address(Socket),
 	    {ok, WorldTcpAddress} = get_tcp_address(World),
 	    {_,Port} = WorldTcpAddress#net_address.address,
@@ -118,15 +127,15 @@ handle_call({listen, Name}, _From, State) ->
 	    {reply, Error, State}
     end;
 
-handle_call({accept, Listen}, {From, _}, State = #state{listen={_, World}}) ->
+handle_call({accept, _Driver, Listen}, {From, _}, State = #state{listen={_, World}}) ->
     Self = self(),
     ErtsPid = spawn_link(fun() -> accept_loop(Self, erts, Listen, From) end),
     WorldPid = spawn_link(fun() -> accept_loop(Self, world, World, Listen) end),
     {reply, ErtsPid, State#state{accept_loop={ErtsPid, WorldPid}}};
 
-handle_call({connect, Ip, Port}, {From, _}, State) ->
+handle_call({connect, Driver, Ip, Port}, {From, _}, State) ->
     Me = self(),
-    Pid = spawn_link(fun() -> setup_proxy(Ip, Port, Me) end),
+    Pid = spawn_link(fun() -> setup_proxy(Driver, Ip, Port, Me) end),
     receive 
 	{Pid, go_ahead, LPort} -> 
 	    Res = {ok, Socket} = try_connect(LPort),
@@ -186,6 +195,11 @@ accept_loop(Proxy, erts = Type, Listen, Extra) ->
 		{_Kernel, unsupported_protocol} ->
 		    exit(unsupported_protocol)
 	    end;
+	{error, closed} ->
+	    %% The listening socket is closed: the proxy process is
+	    %% shutting down.  Exit normally, to avoid generating a
+	    %% spurious error report.
+	    exit(normal);
 	Error ->
 	    exit(Error)
     end,
@@ -196,6 +210,7 @@ accept_loop(Proxy, world = Type, Listen, Extra) ->
     case gen_tcp:accept(Listen) of
 	{ok, Socket} ->
 	    Opts = get_ssl_options(server),
+	    wait_for_code_server(),
 	    case ssl:ssl_accept(Socket, Opts) of
 		{ok, SslSocket} ->
 		    PairHandler =
@@ -217,6 +232,35 @@ accept_loop(Proxy, world = Type, Listen, Extra) ->
     end,
     accept_loop(Proxy, Type, Listen, Extra).
 
+wait_for_code_server() ->
+    %% This is an ugly hack.  Upgrading a socket to TLS requires the
+    %% crypto module to be loaded.  Loading the crypto module triggers
+    %% its on_load function, which calls code:priv_dir/1 to find the
+    %% directory where its NIF library is.  However, distribution is
+    %% started earlier than the code server, so the code server is not
+    %% necessarily started yet, and code:priv_dir/1 might fail because
+    %% of that, if we receive an incoming connection on the
+    %% distribution port early enough.
+    %%
+    %% If the on_load function of a module fails, the module is
+    %% unloaded, and the function call that triggered loading it fails
+    %% with 'undef', which is rather confusing.
+    %%
+    %% Thus, the ssl_tls_dist_proxy process will terminate, and be
+    %% restarted by ssl_dist_sup.  However, it won't have any memory
+    %% of being asked by net_kernel to listen for incoming
+    %% connections.  Hence, the node will believe that it's open for
+    %% distribution, but it actually isn't.
+    %%
+    %% So let's avoid that by waiting for the code server to start.
+    case whereis(code_server) of
+	undefined ->
+	    timer:sleep(10),
+	    wait_for_code_server();
+	Pid when is_pid(Pid) ->
+	    ok
+    end.
+
 try_connect(Port) ->
     case gen_tcp:connect({127,0,0,1}, Port, [{active, false}, {packet,?PPRE}, nodelay()]) of
 	R = {ok, _S} ->
@@ -225,12 +269,13 @@ try_connect(Port) ->
 	    try_connect(Port)
     end.
 
-setup_proxy(Ip, Port, Parent) ->
+setup_proxy(Driver, Ip, Port, Parent) ->
     process_flag(trap_exit, true),
-    Opts = get_ssl_options(client),
-    case ssl:connect(Ip, Port, [{active, true}, binary, {packet,?PPRE}, nodelay()] ++ Opts) of
+    Opts = connect_options(get_ssl_options(client)),
+    case ssl:connect(Ip, Port, [{active, true}, binary, {packet,?PPRE}, nodelay(),
+                                Driver:family()] ++ Opts) of
 	{ok, World} ->
-	    {ok, ErtsL} = gen_tcp:listen(0, [{active, true}, {ip, {127,0,0,1}}, binary, {packet,?PPRE}]),
+	    {ok, ErtsL} = gen_tcp:listen(0, [{active, true}, {ip, loopback}, binary, {packet,?PPRE}]),
 	    {ok, #net_address{address={_,LPort}}} = get_tcp_address(ErtsL),
 	    Parent ! {self(), go_ahead, LPort},
 	    case gen_tcp:accept(ErtsL) of
diff --git a/lib/ssl/src/ssl_v3.erl b/lib/ssl/src/ssl_v3.erl
index f169059a75..f98ea83771 100644
--- a/lib/ssl/src/ssl_v3.erl
+++ b/lib/ssl/src/ssl_v3.erl
@@ -143,9 +143,7 @@ suites() ->
       ?TLS_RSA_WITH_3DES_EDE_CBC_SHA,
       ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
       ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
-      ?TLS_RSA_WITH_AES_128_CBC_SHA,
-      ?TLS_DHE_RSA_WITH_DES_CBC_SHA,
-      ?TLS_RSA_WITH_DES_CBC_SHA
+      ?TLS_RSA_WITH_AES_128_CBC_SHA
      ].
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index b2b85eaf8d..93716d31b8 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -182,8 +182,7 @@ hello(start, #state{host = Host, port = Port, role = client,
     next_state(hello, hello, Record, State);
 
 hello(Hello = #client_hello{client_version = ClientVersion,
-			    extensions = #hello_extensions{hash_signs = HashSigns,
-							   ec_point_formats = EcPointFormats,
+			    extensions = #hello_extensions{ec_point_formats = EcPointFormats,
 							   elliptic_curves = EllipticCurves}},
       State = #state{connection_states = ConnectionStates0,
 		     port = Port, session = #session{own_certificate = Cert} = Session0,
@@ -191,27 +190,28 @@ hello(Hello = #client_hello{client_version = ClientVersion,
 		     session_cache = Cache,
 		     session_cache_cb = CacheCb,
 		     negotiated_protocol = CurrentProtocol,
+		     key_algorithm = KeyExAlg,
 		     ssl_options = SslOpts}) ->
+
     case tls_handshake:hello(Hello, SslOpts, {Port, Session0, Cache, CacheCb,
-					      ConnectionStates0, Cert}, Renegotiation) of
+					      ConnectionStates0, Cert, KeyExAlg}, Renegotiation) of
         #alert{} = Alert ->
             handle_own_alert(Alert, ClientVersion, hello, State);
         {Version, {Type, Session},
-	 ConnectionStates, Protocol0, ServerHelloExt} ->
-
+	 ConnectionStates, Protocol0, ServerHelloExt, HashSign} ->
 	    Protocol = case Protocol0 of
-		undefined -> CurrentProtocol;
-		_ -> Protocol0
-	    end,
-
-            HashSign = ssl_handshake:select_hashsign(HashSigns, Cert, Version),
-            ssl_connection:hello({common_client_hello, Type, ServerHelloExt, HashSign},
+			   undefined -> CurrentProtocol;
+			   _ -> Protocol0
+		       end,
+	    ssl_connection:hello({common_client_hello, Type, ServerHelloExt},
 				 State#state{connection_states  = ConnectionStates,
 					     negotiated_version = Version,
+					     hashsign_algorithm = HashSign,
 					     session = Session,
 					     client_ecc = {EllipticCurves, EcPointFormats},
 					     negotiated_protocol = Protocol}, ?MODULE)
     end;
+
 hello(Hello = #server_hello{},
       #state{connection_states = ConnectionStates0,
 	     negotiated_version = ReqVersion,
@@ -764,6 +764,8 @@ handle_tls_handshake(Handle, StateName,
     case Handle(Packet, FsmReturn) of
 	{next_state, NextStateName, State, _Timeout} ->
 	    handle_tls_handshake(Handle, NextStateName, State);
+	{next_state, NextStateName, State} ->
+	    handle_tls_handshake(Handle, NextStateName, State);
 	{stop, _,_} = Stop ->
 	    Stop
     end;
@@ -1067,3 +1069,4 @@ handle_sni_extension(#client_hello{extensions = HelloExtensions}, State0) ->
     end;
 handle_sni_extension(_, State0) ->
     State0.
+
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl
index 0a6cb9f92d..ef718c13df 100644
--- a/lib/ssl/src/tls_handshake.erl
+++ b/lib/ssl/src/tls_handshake.erl
@@ -56,7 +56,7 @@ client_hello(Host, Port, ConnectionStates,
     Version = tls_record:highest_protocol_version(Versions),
     Pending = ssl_record:pending_connection_state(ConnectionStates, read),
     SecParams = Pending#connection_state.security_parameters,
-    AvailableCipherSuites = ssl_handshake:available_suites(UserSuites, Version), 
+    AvailableCipherSuites = ssl_handshake:available_suites(UserSuites, Version),     
     Extensions = ssl_handshake:client_hello_extensions(Host, Version, 
 						       AvailableCipherSuites,
 						       SslOpts, ConnectionStates, Renegotiation),
@@ -80,13 +80,13 @@ client_hello(Host, Port, ConnectionStates,
 -spec hello(#server_hello{} | #client_hello{}, #ssl_options{},
 	    #connection_states{} | {inet:port_number(), #session{}, db_handle(),
 				    atom(), #connection_states{}, 
-				    binary() | undefined},
+				    binary() | undefined, ssl_cipher:key_algo()},
 	    boolean()) ->
 		   {tls_record:tls_version(), session_id(), 
 		    #connection_states{}, alpn | npn, binary() | undefined}|
 		   {tls_record:tls_version(), {resumed | new, #session{}}, 
 		    #connection_states{}, binary() | undefined, 
-		    #hello_extensions{}} |
+		    #hello_extensions{}, {ssl_cipher:hash(), ssl_cipher:sign_algo()} | undefined} |
 		   #alert{}.
 %%
 %% Description: Handles a recieved hello message
@@ -149,26 +149,35 @@ get_tls_handshake(Version, Data, Buffer) ->
 %%% Internal functions
 %%--------------------------------------------------------------------
 handle_client_hello(Version, #client_hello{session_id = SugesstedId,
-				       cipher_suites = CipherSuites,
-				       compression_methods = Compressions,
-				       random = Random,
-				       extensions = #hello_extensions{elliptic_curves = Curves} = HelloExt},
-		#ssl_options{versions = Versions} = SslOpts,
-	 {Port, Session0, Cache, CacheCb, ConnectionStates0, Cert}, Renegotiation) ->
+					   cipher_suites = CipherSuites,
+					   compression_methods = Compressions,
+					   random = Random,
+					   extensions = #hello_extensions{elliptic_curves = Curves,
+									  signature_algs = ClientHashSigns} = HelloExt},
+		    #ssl_options{versions = Versions,
+				 signature_algs = SupportedHashSigns} = SslOpts,
+		    {Port, Session0, Cache, CacheCb, ConnectionStates0, Cert, _}, Renegotiation) ->
     case tls_record:is_acceptable_version(Version, Versions) of
 	true ->
+	    AvailableHashSigns = available_signature_algs(ClientHashSigns, SupportedHashSigns, Cert, Version),
 	    ECCCurve = ssl_handshake:select_curve(Curves, ssl_handshake:supported_ecc(Version)),
 	    {Type, #session{cipher_suite = CipherSuite} = Session1}
-		= ssl_handshake:select_session(SugesstedId, CipherSuites, Compressions,
+		= ssl_handshake:select_session(SugesstedId, CipherSuites, AvailableHashSigns, Compressions,
 					       Port, Session0#session{ecc = ECCCurve}, Version,
 					       SslOpts, Cache, CacheCb, Cert),
 	    case CipherSuite of 
 		no_suite ->
 		    ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY);
 		_ ->
-		    handle_client_hello_extensions(Version, Type, Random, CipherSuites, HelloExt,
-						   SslOpts, Session1, ConnectionStates0,
-						   Renegotiation)
+		    {KeyExAlg,_,_,_} = ssl_cipher:suite_definition(CipherSuite),
+		    case ssl_handshake:select_hashsign(ClientHashSigns, Cert, KeyExAlg, SupportedHashSigns, Version) of
+			#alert{} = Alert ->
+			    Alert;
+			HashSign ->
+			    handle_client_hello_extensions(Version, Type, Random, CipherSuites, HelloExt,
+							   SslOpts, Session1, ConnectionStates0,
+							   Renegotiation, HashSign)
+		    end
 	    end;
 	false ->
 	    ?ALERT_REC(?FATAL, ?PROTOCOL_VERSION)
@@ -245,14 +254,14 @@ enc_handshake(HandshakeMsg, Version) ->
 
 
 handle_client_hello_extensions(Version, Type, Random, CipherSuites,
-			HelloExt, SslOpts, Session0, ConnectionStates0, Renegotiation) ->
+			HelloExt, SslOpts, Session0, ConnectionStates0, Renegotiation, HashSign) ->
     try ssl_handshake:handle_client_hello_extensions(tls_record, Random, CipherSuites,
 						     HelloExt, Version, SslOpts,
 						     Session0, ConnectionStates0, Renegotiation) of
 	#alert{} = Alert ->
 	    Alert;
 	{Session, ConnectionStates, Protocol, ServerHelloExt} ->
-	    {Version, {Type, Session}, ConnectionStates, Protocol, ServerHelloExt}
+	    {Version, {Type, Session}, ConnectionStates, Protocol, ServerHelloExt, HashSign}
     catch throw:Alert ->
 	    Alert
     end.
@@ -269,3 +278,12 @@ handle_server_hello_extensions(Version, SessionId, Random, CipherSuite,
 	    {Version, SessionId, ConnectionStates, ProtoExt, Protocol}
     end.
 
+available_signature_algs(undefined, SupportedHashSigns, _, {Major, Minor}) when (Major < 3) andalso (Minor < 3) ->
+    SupportedHashSigns;
+available_signature_algs(#hash_sign_algos{hash_sign_algos = ClientHashSigns}, SupportedHashSigns, 
+		     _, {Major, Minor}) when (Major < 3) andalso (Minor < 3) ->
+    ordsets:intersection(ClientHashSigns, SupportedHashSigns);
+available_signature_algs(_, _, _, _) -> 
+    undefined.
+
+
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl
index 71e5f349dd..03cef633d5 100644
--- a/lib/ssl/src/tls_v1.erl
+++ b/lib/ssl/src/tls_v1.erl
@@ -31,7 +31,8 @@
 
 -export([master_secret/4, finished/5, certificate_verify/3, mac_hash/7,
 	 setup_keys/8, suites/1, prf/5,
-	 ecc_curves/1, oid_to_enum/1, enum_to_oid/1]).
+	 ecc_curves/1, oid_to_enum/1, enum_to_oid/1, 
+	 default_signature_algs/1, signature_algs/2]).
 
 %%====================================================================
 %% Internal application API
@@ -208,9 +209,7 @@ suites(Minor) when Minor == 1; Minor == 2 ->
       ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
       ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
       ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA,
-      ?TLS_RSA_WITH_AES_128_CBC_SHA,
-      ?TLS_DHE_RSA_WITH_DES_CBC_SHA,
-      ?TLS_RSA_WITH_DES_CBC_SHA
+      ?TLS_RSA_WITH_AES_128_CBC_SHA
     ];
 suites(3) ->
     [
@@ -258,6 +257,52 @@ suites(3) ->
     ] ++ suites(2).
 
 
+
+signature_algs({3, 3}, HashSigns) ->
+    CryptoSupports =  crypto:supports(),
+    Hashes = proplists:get_value(hashs, CryptoSupports),
+    PubKeys = proplists:get_value(public_keys, CryptoSupports),
+    Supported = lists:foldl(fun({Hash, dsa = Sign} = Alg, Acc) ->
+				    case proplists:get_bool(dss, PubKeys) 
+					andalso proplists:get_bool(Hash, Hashes)
+					andalso is_pair(Hash, Sign, Hashes)
+				    of
+					true ->
+					    [Alg | Acc];
+					false ->
+					    Acc
+				    end;
+			       ({Hash, Sign} = Alg, Acc) -> 
+				    case proplists:get_bool(Sign, PubKeys) 
+					andalso proplists:get_bool(Hash, Hashes) 
+					andalso is_pair(Hash, Sign, Hashes)
+				    of
+					true ->
+					    [Alg | Acc];
+					false ->
+					    Acc
+				    end
+			    end, [], HashSigns),
+    lists:reverse(Supported).
+
+default_signature_algs({3, 3} = Version) ->
+    Default = [%% SHA2
+	       {sha512, ecdsa},
+	       {sha512, rsa},
+	       {sha384, ecdsa},
+	       {sha384, rsa},
+	       {sha256, ecdsa},
+	       {sha256, rsa},
+	       {sha224, ecdsa},
+	       {sha224, rsa},
+	       %% SHA
+	       {sha, ecdsa},
+	       {sha, rsa},
+	       {sha, dsa}],
+    signature_algs(Version, Default);
+default_signature_algs(_) ->
+    undefined.
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
@@ -342,6 +387,17 @@ finished_label(client) ->
 finished_label(server) ->
     <<"server finished">>.
 
+is_pair(sha, dsa, _) ->
+    true;
+is_pair(_, dsa, _) ->
+    false;
+is_pair(Hash, ecdsa, Hashs) ->
+    AtLeastSha = Hashs -- [md2,md4,md5],
+    lists:member(Hash, AtLeastSha);
+is_pair(Hash, rsa, Hashs) ->
+    AtLeastMd5 = Hashs -- [md2,md4],
+    lists:member(Hash, AtLeastMd5).
+
 %% list ECC curves in prefered order
 ecc_curves(_Minor) ->
     TLSCurves = [sect571r1,sect571k1,secp521r1,brainpoolP512r1,
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile
index 999df320a3..89a62c3a4b 100644
--- a/lib/ssl/test/Makefile
+++ b/lib/ssl/test/Makefile
@@ -81,7 +81,7 @@ HRL_FILES_NEEDED_IN_TEST = \
 
 TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
-INCLUDES = -I. -I$(ERL_TOP)/lib/test_server/include/
+INCLUDES = -I.
 
 DATADIRS = ssl_basic_SUITE_data
 
@@ -100,8 +100,7 @@ RELSYSDIR = $(RELEASE_PATH)/ssl_test
 # The path to the test_server ebin dir is needed when 
 # running the target "targets".
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS += -pa ../../../internal_tools/test_server/ebin \
-	             $(INCLUDES) 
+ERL_COMPILE_FLAGS += $(INCLUDES)
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/ssl/test/erl_make_certs.erl b/lib/ssl/test/erl_make_certs.erl
index 8e909a5b74..f5cada9021 100644
--- a/lib/ssl/test/erl_make_certs.erl
+++ b/lib/ssl/test/erl_make_certs.erl
@@ -334,7 +334,9 @@ make_key(dsa, _Opts) ->
     gen_dsa2(128, 20);  %% Bytes i.e. {1024, 160}
 make_key(ec, _Opts) ->
     %% (OBS: for testing only)
-    gen_ec2(secp256k1).
+    CurveOid = hd(tls_v1:ecc_curves(0)),
+    NamedCurve = pubkey_cert_records:namedCurves(CurveOid),
+    gen_ec2(NamedCurve).
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% RSA key generation  (OBS: for testing only)
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 05b040a2ab..f045d50cce 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -58,7 +58,7 @@ all() ->
 groups() ->
     [{basic, [], basic_tests()},
      {options, [], options_tests()},
-     {'tlsv1.2', [], all_versions_groups()},
+     {'tlsv1.2', [], all_versions_groups() ++ [conf_signature_algs, no_common_signature_algs]},
      {'tlsv1.1', [], all_versions_groups()},
      {'tlsv1', [], all_versions_groups() ++ rizzo_tests()},
      {'sslv3', [], all_versions_groups() ++ rizzo_tests() ++ [ciphersuite_vs_version]},
@@ -121,6 +121,7 @@ options_tests() ->
 
 api_tests() ->
     [connection_info,
+     connection_information,
      peername,
      peercert,
      peercert_with_client_cert,
@@ -182,6 +183,8 @@ cipher_tests() ->
      rc4_rsa_cipher_suites,
      rc4_ecdh_rsa_cipher_suites,
      rc4_ecdsa_cipher_suites,
+     des_rsa_cipher_suites,
+     des_ecdh_rsa_cipher_suites,
      default_reject_anonymous].
 
 cipher_tests_ec() ->
@@ -444,7 +447,7 @@ connection_info(Config) when is_list(Config) ->
 			   {from, self()}, 
 			   {mfa, {?MODULE, connection_info_result, []}},
 			   {options, 
-			    [{ciphers,[{rsa,des_cbc,sha,no_export}]} | 
+			    [{ciphers,[{rsa, aes_128_cbc, sha}]} | 
 			     ClientOpts]}]),
     
     ct:log("Testcase ~p, Client ~p  Server ~p ~n",
@@ -453,7 +456,7 @@ connection_info(Config) when is_list(Config) ->
     Version = 
 	tls_record:protocol_version(tls_record:highest_protocol_version([])),
     
-    ServerMsg = ClientMsg = {ok, {Version, {rsa, des_cbc, sha}}},
+    ServerMsg = ClientMsg = {ok, {Version, {rsa, aes_128_cbc, sha}}},
 			   
     ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
     
@@ -461,6 +464,37 @@ connection_info(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
+
+connection_information() ->
+    [{doc,"Test the API function ssl:connection_information/1"}].
+connection_information(Config) when is_list(Config) -> 
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+					{mfa, {?MODULE, connection_information_result, []}},
+					{options, ServerOpts}]),
+    
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()}, 
+			   {mfa, {?MODULE, connection_information_result, []}},
+			   {options, ClientOpts}]),
+    
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+    
+    ServerMsg = ClientMsg = ok,
+			   
+    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
+%%--------------------------------------------------------------------
 protocol_versions() ->
     [{doc,"Test to set a list of protocol versions in app environment."}].
 
@@ -1950,6 +1984,23 @@ rc4_ecdsa_cipher_suites(Config) when is_list(Config) ->
     Ciphers = ssl_test_lib:rc4_suites(NVersion),
     run_suites(Ciphers, Version, Config, rc4_ecdsa).
 
+%%-------------------------------------------------------------------
+des_rsa_cipher_suites()->
+    [{doc, "Test the RC4 ciphersuites"}].
+des_rsa_cipher_suites(Config) when is_list(Config) ->
+    NVersion = tls_record:highest_protocol_version([]),
+    Version = tls_record:protocol_version(NVersion),
+    Ciphers = ssl_test_lib:des_suites(NVersion),
+    run_suites(Ciphers, Version, Config, des_rsa).
+%-------------------------------------------------------------------
+des_ecdh_rsa_cipher_suites()->
+    [{doc, "Test the RC4 ciphersuites"}].
+des_ecdh_rsa_cipher_suites(Config) when is_list(Config) ->
+    NVersion = tls_record:highest_protocol_version([]),
+    Version = tls_record:protocol_version(NVersion),
+    Ciphers = ssl_test_lib:des_suites(NVersion),
+    run_suites(Ciphers, Version, Config, des_dhe_rsa).
+
 %%--------------------------------------------------------------------
 default_reject_anonymous()->
     [{doc,"Test that by default anonymous cipher suites are rejected "}].
@@ -2686,7 +2737,12 @@ defaults(Config) when is_list(Config)->
     true = lists:member(sslv3, Available),
     false = lists:member(sslv3, Supported),
     false = lists:member({rsa,rc4_128,sha}, ssl:cipher_suites()),
-    true = lists:member({rsa,rc4_128,sha}, ssl:cipher_suites(all)).
+    true = lists:member({rsa,rc4_128,sha}, ssl:cipher_suites(all)),
+    false = lists:member({rsa,des_cbc,sha}, ssl:cipher_suites()),
+    true = lists:member({rsa,des_cbc,sha}, ssl:cipher_suites(all)),
+    false = lists:member({dhe_rsa,des_cbc,sha}, ssl:cipher_suites()),
+    true = lists:member({dhe_rsa,des_cbc,sha}, ssl:cipher_suites(all)).
+
 %%--------------------------------------------------------------------
 reuseaddr() ->
     [{doc,"Test reuseaddr option"}].
@@ -2844,7 +2900,61 @@ ciphersuite_vs_version(Config) when is_list(Config) ->
 	_ ->
 	    ct:fail({unexpected_server_hello, ServerHello})
     end.
-										
+			
+%%--------------------------------------------------------------------
+conf_signature_algs() ->
+    [{doc,"Test to set the signature_algs option on both client and server"}].
+conf_signature_algs(Config) when is_list(Config) -> 
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = 
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+				   {from, self()}, 
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
+				   {options,  [{active, false}, {signature_algs, [{sha256, rsa}]} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = 
+	ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+				   {host, Hostname},
+				   {from, self()}, 
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
+				   {options, [{active, false}, {signature_algs, [{sha256, rsa}]} | ClientOpts]}]),
+    
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+			 [self(), Client, Server]),
+    
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
+%%--------------------------------------------------------------------
+no_common_signature_algs()  ->
+    [{doc,"Set the signature_algs option so that there client and server does not share any hash sign algorithms"}].
+no_common_signature_algs(Config) when is_list(Config) ->
+    
+    ClientOpts = ?config(client_opts, Config),
+    ServerOpts = ?config(server_opts, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+					      {options, [{signature_algs, [{sha256, rsa}]}
+							 | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+					      {host, Hostname},
+					      {from, self()}, 
+					      {options, [{signature_algs, [{sha384, rsa}]}
+							 | ClientOpts]}]),
+    
+    ssl_test_lib:check_result(Server, {error, {tls_alert, "insufficient security"}},
+			      Client, {error, {tls_alert, "insufficient security"}}).
+    						
 %%--------------------------------------------------------------------
 
 dont_crash_on_handshake_garbage() ->
@@ -3974,7 +4084,15 @@ run_suites(Ciphers, Version, Config, Type) ->
 	    rc4_ecdsa ->
 		{?config(client_opts, Config),
 		 [{ciphers, Ciphers} |
-		  ?config(server_ecdsa_opts, Config)]}
+		  ?config(server_ecdsa_opts, Config)]};
+	    des_dhe_rsa ->
+		{?config(client_opts, Config),
+		 [{ciphers, Ciphers} |
+		  ?config(server_rsa_opts, Config)]};
+	    des_rsa ->
+		{?config(client_opts, Config),
+		 [{ciphers, Ciphers} |
+		  ?config(server_opts, Config)]}
 	end,
 
     Result =  lists:map(fun(Cipher) ->
@@ -3989,7 +4107,7 @@ run_suites(Ciphers, Version, Config, Type) ->
     end.
 
 erlang_cipher_suite(Suite) when is_list(Suite)->
-    ssl:suite_definition(ssl_cipher:openssl_suite(Suite));
+    ssl_cipher:erl_suite_definition(ssl_cipher:openssl_suite(Suite));
 erlang_cipher_suite(Suite) ->
     Suite.
 
@@ -4010,11 +4128,11 @@ cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->
     Port = ssl_test_lib:inet_port(Server),
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
 					{host, Hostname},
-			   {from, self()},
-			   {mfa, {ssl_test_lib, cipher_result, [ConnectionInfo]}},
-			   {options,
-			    [{ciphers,[CipherSuite]} |
-			     ClientOpts]}]),
+					{from, self()},
+					{mfa, {ssl_test_lib, cipher_result, [ConnectionInfo]}},
+					{options,
+					 [{ciphers,[CipherSuite]} |
+					  ClientOpts]}]),
 
     Result = ssl_test_lib:wait_for_result(Server, ok, Client, ok),
 
@@ -4028,6 +4146,17 @@ cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->
 	    [{ErlangCipherSuite, Error}]
     end.
 
+connection_information_result(Socket) ->
+    {ok, Info = [_ | _]} = ssl:connection_information(Socket),
+    case  length(Info) > 3 of
+	true -> 
+	    %% Atleast one ssl_option() is set
+	    ct:log("Info ~p", [Info]),
+	    ok;
+	false ->
+	    ct:fail(no_ssl_options_returned)
+    end.
+
 connection_info_result(Socket) ->
     {ok, Info} = ssl:connection_information(Socket, [protocol, cipher_suite]),
     {ok, {proplists:get_value(protocol, Info), proplists:get_value(cipher_suite, Info)}}.
@@ -4154,6 +4283,12 @@ first_rsa_suite([{dhe_rsa, _, _} = Suite| _]) ->
     Suite;
 first_rsa_suite([{rsa, _, _} = Suite| _]) ->
     Suite;
+first_rsa_suite([{ecdhe_rsa, _, _, _} = Suite | _]) ->
+    Suite;
+first_rsa_suite([{dhe_rsa, _, _, _} = Suite| _]) ->
+    Suite;
+first_rsa_suite([{rsa, _, _, _} = Suite| _]) ->
+    Suite;
 first_rsa_suite([_ | Rest]) ->
     first_rsa_suite(Rest).
     
diff --git a/lib/ssl/test/ssl_certificate_verify_SUITE.erl b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
index 5940a86a7f..d10506cb69 100644
--- a/lib/ssl/test/ssl_certificate_verify_SUITE.erl
+++ b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
@@ -66,7 +66,9 @@ tests() ->
      invalid_signature_client,
      invalid_signature_server,
      extended_key_usage_verify_peer,
-     extended_key_usage_verify_none].
+     extended_key_usage_verify_none,
+     critical_extension_verify_peer,
+     critical_extension_verify_none].
 
 error_handling_tests()->
     [client_with_cert_cipher_suites_handshake,
@@ -75,7 +77,8 @@ error_handling_tests()->
      unknown_server_ca_accept_verify_none,
      unknown_server_ca_accept_verify_peer,
      unknown_server_ca_accept_backwardscompatibility,
-     no_authority_key_identifier].
+     no_authority_key_identifier,
+     no_authority_key_identifier_and_nonstandard_encoding].
 
 init_per_suite(Config0) ->
     catch crypto:stop(),
@@ -794,6 +797,121 @@ extended_key_usage_verify_none(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
+critical_extension_verify_peer() ->
+    [{doc,"Test cert that has a critical unknown extension in verify_peer mode"}].
+
+critical_extension_verify_peer(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_verification_opts, Config),
+    ServerOpts = ?config(server_verification_opts, Config),
+    PrivDir = ?config(priv_dir, Config),
+    Active = ?config(active, Config),
+    ReceiveFunction =  ?config(receive_function, Config),
+
+    KeyFile = filename:join(PrivDir, "otpCA/private/key.pem"),
+    NewCertName = integer_to_list(erlang:unique_integer()) ++ ".pem",
+
+    ServerCertFile = proplists:get_value(certfile, ServerOpts),
+    NewServerCertFile = filename:join([PrivDir, "server", NewCertName]),
+    add_critical_netscape_cert_type(ServerCertFile, NewServerCertFile, KeyFile),
+    NewServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts)],
+
+    ClientCertFile = proplists:get_value(certfile, ClientOpts),
+    NewClientCertFile = filename:join([PrivDir, "client", NewCertName]),
+    add_critical_netscape_cert_type(ClientCertFile, NewClientCertFile, KeyFile),
+    NewClientOpts = [{certfile, NewClientCertFile} | proplists:delete(certfile, ClientOpts)],
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server_error(
+               [{node, ServerNode}, {port, 0},
+                {from, self()},
+                {mfa, {ssl_test_lib,  ReceiveFunction, []}},
+                {options, [{verify, verify_peer}, {active, Active} | NewServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client_error(
+               [{node, ClientNode}, {port, Port},
+                {host, Hostname},
+                {from, self()},
+                {mfa, {ssl_test_lib, ReceiveFunction, []}},
+                {options, [{verify, verify_peer}, {active, Active} | NewClientOpts]}]),
+
+    %% This certificate has a critical extension that we don't
+    %% understand.  Therefore, verification should fail.
+    tcp_delivery_workaround(Server, {error, {tls_alert, "unsupported certificate"}},
+                            Client, {error, {tls_alert, "unsupported certificate"}}),
+
+    ssl_test_lib:close(Server),
+    ok.
+
+%%--------------------------------------------------------------------
+critical_extension_verify_none() ->
+    [{doc,"Test cert that has a critical unknown extension in verify_none mode"}].
+
+critical_extension_verify_none(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_verification_opts, Config),
+    ServerOpts = ?config(server_verification_opts, Config),
+    PrivDir = ?config(priv_dir, Config),
+    Active = ?config(active, Config),
+    ReceiveFunction =  ?config(receive_function, Config),
+
+    KeyFile = filename:join(PrivDir, "otpCA/private/key.pem"),
+    NewCertName = integer_to_list(erlang:unique_integer()) ++ ".pem",
+
+    ServerCertFile = proplists:get_value(certfile, ServerOpts),
+    NewServerCertFile = filename:join([PrivDir, "server", NewCertName]),
+    add_critical_netscape_cert_type(ServerCertFile, NewServerCertFile, KeyFile),
+    NewServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts)],
+
+    ClientCertFile = proplists:get_value(certfile, ClientOpts),
+    NewClientCertFile = filename:join([PrivDir, "client", NewCertName]),
+    add_critical_netscape_cert_type(ClientCertFile, NewClientCertFile, KeyFile),
+    NewClientOpts = [{certfile, NewClientCertFile} | proplists:delete(certfile, ClientOpts)],
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server(
+               [{node, ServerNode}, {port, 0},
+                {from, self()},
+                {mfa, {ssl_test_lib, ReceiveFunction, []}},
+                {options, [{verify, verify_none}, {active, Active} | NewServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client(
+               [{node, ClientNode}, {port, Port},
+                {host, Hostname},
+                {from, self()},
+                {mfa, {ssl_test_lib, ReceiveFunction, []}},
+                {options, [{verify, verify_none}, {active, Active} | NewClientOpts]}]),
+
+    %% This certificate has a critical extension that we don't
+    %% understand.  But we're using `verify_none', so verification
+    %% shouldn't fail.
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client),
+    ok.
+
+add_critical_netscape_cert_type(CertFile, NewCertFile, KeyFile) ->
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
+
+    [{'Certificate', DerCert, _}] = ssl_test_lib:pem_to_der(CertFile),
+    OTPCert = public_key:pkix_decode_cert(DerCert, otp),
+    %% This is the "Netscape Cert Type" extension, telling us that the
+    %% certificate can be used for SSL clients and SSL servers.
+    NetscapeCertTypeExt = #'Extension'{
+                             extnID = {2,16,840,1,113730,1,1},
+                             critical = true,
+                             extnValue = <<3,2,6,192>>},
+    OTPTbsCert = OTPCert#'OTPCertificate'.tbsCertificate,
+    Extensions =  OTPTbsCert#'OTPTBSCertificate'.extensions,
+    NewOTPTbsCert = OTPTbsCert#'OTPTBSCertificate'{
+                      extensions = [NetscapeCertTypeExt] ++ Extensions},
+    NewDerCert = public_key:pkix_sign(NewOTPTbsCert, Key),
+    ssl_test_lib:der_to_pem(NewCertFile, [{'Certificate', NewDerCert, not_encrypted}]),
+    ok.
+
+%%--------------------------------------------------------------------
 no_authority_key_identifier() ->
     [{doc, "Test cert that does not have authorityKeyIdentifier extension"
       " but are present in trusted certs db."}].
@@ -850,6 +968,68 @@ delete_authority_key_extension([Head | Rest], Acc) ->
 
 %%--------------------------------------------------------------------
 
+no_authority_key_identifier_and_nonstandard_encoding() ->
+    [{doc, "Test cert with nonstandard encoding that does not have"
+      " authorityKeyIdentifier extension but are present in trusted certs db."}].
+
+no_authority_key_identifier_and_nonstandard_encoding(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_verification_opts, Config),
+    ServerOpts = ?config(server_verification_opts, Config),
+    PrivDir = ?config(priv_dir, Config),
+
+    KeyFile = filename:join(PrivDir, "otpCA/private/key.pem"),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
+
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    NewCertFile = filename:join(PrivDir, "server/new_cert.pem"),
+    [{'Certificate', DerCert, _}] = ssl_test_lib:pem_to_der(CertFile),
+    ServerCert = public_key:pkix_decode_cert(DerCert, plain),
+    ServerTbsCert = ServerCert#'Certificate'.tbsCertificate,
+    Extensions0 =  ServerTbsCert#'TBSCertificate'.extensions,
+    %% need to remove authorityKeyIdentifier extension to cause DB lookup by signature
+    Extensions = delete_authority_key_extension(Extensions0, []),
+    NewExtensions = replace_key_usage_extension(Extensions, []),
+    NewServerTbsCert = ServerTbsCert#'TBSCertificate'{extensions = NewExtensions},
+
+    ct:log("Extensions ~p~n, NewExtensions: ~p~n", [Extensions, NewExtensions]),
+
+    TbsDer = public_key:pkix_encode('TBSCertificate', NewServerTbsCert, plain),
+    Sig = public_key:sign(TbsDer, md5, Key),
+    NewServerCert = ServerCert#'Certificate'{tbsCertificate = NewServerTbsCert, signature = Sig},
+    NewDerCert = public_key:pkix_encode('Certificate', NewServerCert, plain),
+    ssl_test_lib:der_to_pem(NewCertFile, [{'Certificate', NewDerCert, not_encrypted}]),
+    NewServerOpts = [{certfile, NewCertFile} | proplists:delete(certfile, ServerOpts)],
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+					{mfa, {ssl_test_lib,
+					       send_recv_result_active, []}},
+					{options, [{active, true} | NewServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {ssl_test_lib,
+					       send_recv_result_active, []}},
+					{options, [{verify, verify_peer} | ClientOpts]}]),
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+replace_key_usage_extension([], Acc) ->
+    lists:reverse(Acc);
+replace_key_usage_extension([#'Extension'{extnID = ?'id-ce-keyUsage'} = E | Rest], Acc) ->
+    %% A nonstandard DER encoding of [digitalSignature, keyEncipherment]
+    Val = <<3, 2, 0, 16#A0>>,
+    replace_key_usage_extension(Rest, [E#'Extension'{extnValue = Val} | Acc]);
+replace_key_usage_extension([Head | Rest], Acc) ->
+    replace_key_usage_extension(Rest, [Head | Acc]).
+
+%%--------------------------------------------------------------------
+
 invalid_signature_server() ->
     [{doc,"Test client with invalid signature"}].
 
diff --git a/lib/ssl/test/ssl_crl_SUITE.erl b/lib/ssl/test/ssl_crl_SUITE.erl
index 44580be1ff..5b86027210 100644
--- a/lib/ssl/test/ssl_crl_SUITE.erl
+++ b/lib/ssl/test/ssl_crl_SUITE.erl
@@ -53,7 +53,7 @@ groups() ->
      {idp_crl, [], basic_tests()}].
 
 basic_tests() ->
-    [crl_verify_valid, crl_verify_revoked].
+    [crl_verify_valid, crl_verify_revoked, crl_verify_no_crl].
 
 
 init_per_suite(Config) ->
@@ -186,11 +186,6 @@ crl_verify_revoked(Config)  when is_list(Config) ->
 
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
 
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
-					      {from, self()}, 
-					      {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    
     ssl_crl_cache:insert({file, filename:join([PrivDir, "erlangCA", "crl.pem"])}),
     ssl_crl_cache:insert({file, filename:join([PrivDir, "otpCA", "crl.pem"])}),
     
@@ -206,16 +201,55 @@ crl_verify_revoked(Config)  when is_list(Config) ->
 			   {verify, verify_peer}]
 		  end,	
     
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port}, 
-     					      {host, Hostname},
-   					      {from, self()}, 
-     					      {options, ClientOpts}]),
-    receive
-	{Server, AlertOrColse} ->
-	    ct:pal("Server Alert or Close ~p", [AlertOrColse])
-    end,	    
-    ssl_test_lib:check_result(Client, {error, {tls_alert, "certificate revoked"}}).
+    crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts,
+                     "certificate revoked").
 
+crl_verify_no_crl() ->
+    [{doc,"Verify a simple CRL chain when the CRL is missing"}].
+crl_verify_no_crl(Config) when is_list(Config) ->
+    PrivDir = ?config(cert_dir, Config),
+    Check = ?config(crl_check, Config),
+    ServerOpts =  [{keyfile, filename:join([PrivDir, "server", "key.pem"])},
+      		  {certfile, filename:join([PrivDir, "server", "cert.pem"])},
+		   {cacertfile, filename:join([PrivDir, "server", "cacerts.pem"])}],
+    ClientOpts =  case ?config(idp_crl, Config) of 
+		      true ->	       
+			  [{cacertfile, filename:join([PrivDir, "server", "cacerts.pem"])},
+			   {crl_check, Check},
+			   {crl_cache, {ssl_crl_cache, {internal, [{http, 5000}]}}},
+			   {verify, verify_peer}];
+		      false ->
+			  [{cacertfile, filename:join([PrivDir, "server", "cacerts.pem"])},
+			   {crl_check, Check},
+			   {verify, verify_peer}]
+		  end,			  
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    %% In case we're running an HTTP server that serves CRLs, let's
+    %% rename those files, so the CRL is absent when we try to verify
+    %% it.
+    %%
+    %% If we're not using an HTTP server, we just need to refrain from
+    %% adding the CRLs to the cache manually.
+    rename_crl(filename:join([PrivDir, "erlangCA", "crl.pem"])),
+    rename_crl(filename:join([PrivDir, "otpCA", "crl.pem"])),
+
+    %% The expected outcome when the CRL is missing depends on the
+    %% crl_check setting.
+    case Check of
+        true ->
+            %% The error "revocation status undetermined" gets turned
+            %% into "bad certificate".
+            crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts,
+                             "bad certificate");
+        peer ->
+            crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts,
+                             "bad certificate");
+        best_effort ->
+            %% In "best effort" mode, we consider the certificate not
+            %% to be revoked if we can't find the appropriate CRL.
+            crl_verify_valid(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts)
+    end.
 
 crl_verify_valid(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts) ->
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
@@ -236,6 +270,22 @@ crl_verify_valid(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
+crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts, ExpectedAlert) ->
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+					      {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+					      {host, Hostname},
+					      {from, self()},
+					      {options, ClientOpts}]),
+    receive
+	{Server, AlertOrClose} ->
+	    ct:pal("Server Alert or Close ~p", [AlertOrClose])
+    end,
+    ssl_test_lib:check_result(Client, {error, {tls_alert, ExpectedAlert}}).
+
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
@@ -259,3 +309,5 @@ make_dir_path(PathComponents) ->
 		"",
 		PathComponents).
 
+rename_crl(Filename) ->
+    file:rename(Filename, Filename ++ ".notfound").
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl
index 092015d3d8..00f9ee8e3c 100644
--- a/lib/ssl/test/ssl_dist_SUITE.erl
+++ b/lib/ssl/test/ssl_dist_SUITE.erl
@@ -41,7 +41,7 @@
 %%--------------------------------------------------------------------
 all() ->
     [basic, payload, plain_options, plain_verify_options, nodelay_option, 
-     listen_port_options, listen_options, use_interface].
+     listen_port_options, listen_options, connect_options, use_interface].
 
 groups() ->
     [].
@@ -312,22 +312,7 @@ listen_port_options(Config) when is_list(Config) ->
 listen_options() ->
     [{doc, "Test inet_dist_listen_options"}].
 listen_options(Config) when is_list(Config) ->
-    Prio = 1,
-    case gen_udp:open(0, [{priority,Prio}]) of
-	{ok,Socket} ->
-	    case inet:getopts(Socket, [priority]) of
-		{ok,[{priority,Prio}]} ->
-		    ok = gen_udp:close(Socket),
-		    do_listen_options(Prio, Config);
-		_ ->
-		    ok = gen_udp:close(Socket),
-		    {skip,
-		     "Can not set priority "++integer_to_list(Prio)++
-			 " on socket"}
-	    end;
-	{error,_} ->
-	    {skip, "Can not set priority on socket"}
-    end.
+    try_setting_priority(fun do_listen_options/2, Config).
 
 do_listen_options(Prio, Config) ->
     PriorityString0 = "[{priority,"++integer_to_list(Prio)++"}]",
@@ -364,6 +349,48 @@ do_listen_options(Prio, Config) ->
     stop_ssl_node(NH2),
     success(Config).
 %%--------------------------------------------------------------------
+connect_options() ->
+    [{doc, "Test inet_dist_connect_options"}].
+connect_options(Config) when is_list(Config) ->
+    try_setting_priority(fun do_connect_options/2, Config).
+
+do_connect_options(Prio, Config) ->
+    PriorityString0 = "[{priority,"++integer_to_list(Prio)++"}]",
+    PriorityString =
+	case os:cmd("echo [{a,1}]") of
+	    "[{a,1}]"++_ ->
+		PriorityString0;
+	    _ ->
+		%% Some shells need quoting of [{}]
+		"'"++PriorityString0++"'"
+	end,
+
+    Options = "-kernel inet_dist_connect_options " ++ PriorityString,
+
+    NH1 = start_ssl_node([{additional_dist_opts, Options} | Config]),
+    NH2 = start_ssl_node([{additional_dist_opts, Options} | Config]),
+    Node2 = NH2#node_handle.nodename,
+    
+    pong = apply_on_ssl_node(NH1, fun () -> net_adm:ping(Node2) end),
+
+    PrioritiesNode1 =
+	apply_on_ssl_node(NH1, fun get_socket_priorities/0),
+    PrioritiesNode2 =
+	apply_on_ssl_node(NH2, fun get_socket_priorities/0),
+
+    Elevated1 = [P || P <- PrioritiesNode1, P =:= Prio],
+    ?t:format("Elevated1: ~p~n", [Elevated1]),
+    Elevated2 = [P || P <- PrioritiesNode2, P =:= Prio],
+    ?t:format("Elevated2: ~p~n", [Elevated2]),
+    %% Node 1 will have a socket with elevated priority.
+    [_|_] = Elevated1,
+    %% Node 2 will not, since it only applies to outbound connections.
+    [] = Elevated2,
+
+    stop_ssl_node(NH1),
+    stop_ssl_node(NH2),
+    success(Config).
+%%--------------------------------------------------------------------
 use_interface() ->
     [{doc, "Test inet_dist_use_interface"}].
 use_interface(Config) when is_list(Config) ->
@@ -405,6 +432,24 @@ tstsrvr_format(Fmt, ArgList) ->
 send_to_tstcntrl(Message) ->
     send_to_tstsrvr({message, Message}).
 
+try_setting_priority(TestFun, Config) ->
+    Prio = 1,
+    case gen_udp:open(0, [{priority,Prio}]) of
+	{ok,Socket} ->
+	    case inet:getopts(Socket, [priority]) of
+		{ok,[{priority,Prio}]} ->
+		    ok = gen_udp:close(Socket),
+		    TestFun(Prio, Config);
+		_ ->
+		    ok = gen_udp:close(Socket),
+		    {skip,
+		     "Can not set priority "++integer_to_list(Prio)++
+			 " on socket"}
+	    end;
+	{error,_} ->
+	    {skip, "Can not set priority on socket"}
+    end.
+
 get_socket_priorities() ->
     [Priority ||
 	{ok,[{priority,Priority}]} <-
@@ -493,17 +538,13 @@ host_name() ->
     Host.
 
 mk_node_name(Config) ->
-    {A, B, C} = erlang:now(),
+    N = erlang:unique_integer([positive]),
     Case = ?config(testcase, Config),
     atom_to_list(?MODULE)
 	++ "_"
 	++ atom_to_list(Case)
 	++ "_"
-	++ integer_to_list(A)
-	++ "-"
-	++ integer_to_list(B)
-	++ "-"
-	++ integer_to_list(C).
+	++ integer_to_list(N).
 
 mk_node_cmdline(ListenPort, Name, Args) ->
     Static = "-detached -noinput",
@@ -732,12 +773,10 @@ rand_bin(N) ->
 rand_bin(0, Acc) ->
     Acc;
 rand_bin(N, Acc) ->
-    rand_bin(N-1, [random:uniform(256)-1|Acc]).
+    rand_bin(N-1, [rand:uniform(256)-1|Acc]).
 
 make_randfile(Dir) ->
     {ok, IoDev} = file:open(filename:join([Dir, "RAND"]), [write]),
-    {A, B, C} = erlang:now(),
-    random:seed(A, B, C),
     ok = file:write(IoDev, rand_bin(1024)),
     file:close(IoDev).
 
diff --git a/lib/ssl/test/ssl_handshake_SUITE.erl b/lib/ssl/test/ssl_handshake_SUITE.erl
index b0bb77c598..d050812208 100644
--- a/lib/ssl/test/ssl_handshake_SUITE.erl
+++ b/lib/ssl/test/ssl_handshake_SUITE.erl
@@ -166,10 +166,10 @@ ignore_hassign_extension_pre_tls_1_2(Config) ->
     CertFile = proplists:get_value(certfile, Opts),
     [{_, Cert, _}] = ssl_test_lib:pem_to_der(CertFile),
     HashSigns = #hash_sign_algos{hash_sign_algos = [{sha512, rsa}, {sha, dsa}]},
-    {sha512, rsa} = ssl_handshake:select_hashsign(HashSigns, Cert, {3,3}),
+    {sha512, rsa} = ssl_handshake:select_hashsign(HashSigns, Cert, ecdhe_rsa, tls_v1:default_signature_algs({3,3}), {3,3}),
     %%% Ignore
-    {md5sha, rsa} = ssl_handshake:select_hashsign(HashSigns, Cert, {3,2}),
-    {md5sha, rsa} = ssl_handshake:select_hashsign(HashSigns, Cert, {3,0}).
+    {md5sha, rsa} = ssl_handshake:select_hashsign(HashSigns, Cert, ecdhe_rsa, tls_v1:default_signature_algs({3,2}), {3,2}),
+    {md5sha, rsa} = ssl_handshake:select_hashsign(HashSigns, Cert, ecdhe_rsa, tls_v1:default_signature_algs({3,0}), {3,0}).
 
 is_supported(Hash) ->
     Algos = crypto:supports(),
diff --git a/lib/ssl/test/ssl_sni_SUITE.erl b/lib/ssl/test/ssl_sni_SUITE.erl
index f6ffe91027..90c2a49e61 100644
--- a/lib/ssl/test/ssl_sni_SUITE.erl
+++ b/lib/ssl/test/ssl_sni_SUITE.erl
@@ -108,8 +108,12 @@ ssl_recv(SSLSocket, CurrentData, ExpectedData) ->
 
 send_and_hostname(SSLSocket) ->
     ssl:send(SSLSocket, "OK"),
-    {ok, [{sni_hostname, Hostname}]} = ssl:connection_information(SSLSocket, [sni_hostname]),
-    Hostname.
+    case  ssl:connection_information(SSLSocket, [sni_hostname]) of
+	{ok, [{sni_hostname, Hostname}]} ->
+	    Hostname;
+	{ok, []} ->
+	    undefined
+    end.
 
 rdnPart([[#'AttributeTypeAndValue'{type=Type, value=Value} | _] | _], Type) -> 
     Value;
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 77c29668b5..b0495cb5ac 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -818,7 +818,17 @@ rsa_suites(CounterPart) ->
 		    (_) ->
 			 false
 		 end,
-		 ssl:cipher_suites()).
+                 common_ciphers(CounterPart)).
+
+common_ciphers(crypto) ->
+    ssl:cipher_suites();
+common_ciphers(openssl) ->
+    OpenSslSuites =
+        string:tokens(string:strip(os:cmd("openssl ciphers"), right, $\n), ":"),
+    [ssl_cipher:erl_suite_definition(S)
+     || S <- ssl_cipher:suites(tls_record:highest_protocol_version([])),
+        lists:member(ssl_cipher:openssl_suite_name(S), OpenSslSuites)
+    ].
 
 rsa_non_signed_suites() ->
     lists:filter(fun({rsa, _, _}) ->
@@ -971,6 +981,10 @@ rc4_suites(Version) ->
     Suites = ssl_cipher:rc4_suites(Version),
     ssl_cipher:filter_suites(Suites).
 
+des_suites(Version) ->
+    Suites = ssl_cipher:des_suites(Version),
+    ssl_cipher:filter_suites(Suites).
+
 pem_to_der(File) ->
     {ok, PemBin} = file:read_file(File),
     public_key:pem_decode(PemBin).
@@ -1214,7 +1228,7 @@ filter_suites(Ciphers0) ->
 	++ ssl_cipher:srp_suites() 
 	++ ssl_cipher:rc4_suites(Version),
     Supported1 = ssl_cipher:filter_suites(Supported0),
-    Supported2 = [ssl:suite_definition(S) || S <- Supported1],
+    Supported2 = [ssl_cipher:erl_suite_definition(S) || S <- Supported1],
     [Cipher || Cipher <- Ciphers0, lists:member(Cipher, Supported2)].
 
 -define(OPENSSL_QUIT, "Q\n").
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index bcdefb5fca..6934d7f851 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -1268,8 +1268,12 @@ client_check_result(Port, DataExpected) ->
 
 send_and_hostname(SSLSocket) ->
     ssl:send(SSLSocket, "OK"),
-    {ok, [{sni_hostname, Hostname}]} = ssl:connection_information(SSLSocket, [sni_hostname]),
-    Hostname.
+    case ssl:connection_information(SSLSocket, [sni_hostname]) of
+	{ok, []} ->
+	    undefined;
+	{ok, [{sni_hostname, Hostname}]} ->
+	    Hostname
+    end.
 
 erlang_server_openssl_client_sni_test(Config, SNIHostname, ExpectedSNIHostname, ExpectedCN) ->
     ct:log("Start running handshake, Config: ~p, SNIHostname: ~p, ExpectedSNIHostname: ~p, ExpectedCN: ~p", [Config, SNIHostname, ExpectedSNIHostname, ExpectedCN]),
@@ -1445,7 +1449,7 @@ start_erlang_client_and_openssl_server_for_alpn_negotiation(Config, Data, Callba
 
     Exe = "openssl",
     Args = ["s_server", "-msg", "-alpn", "http/1.1,spdy/2", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version),
-	    "-cert", CertFile, "-key" ++ KeyFile],
+	    "-cert", CertFile, "-key", KeyFile],
     OpensslPort = ssl_test_lib:portable_open_port(Exe, Args),  
     ssl_test_lib:wait_for_openssl_server(Port),
 
@@ -1480,7 +1484,7 @@ start_erlang_server_and_openssl_client_for_alpn_negotiation(Config, Data, Callba
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
 
     Exe = "openssl",
-    Args = ["s_client", "-alpn", "http/1.0,spdy/2" "-msg" "-port", 
+    Args = ["s_client", "-alpn", "http/1.0,spdy/2", "-msg", "-port", 
 	    integer_to_list(Port), ssl_test_lib:version_flag(Version),
 	    "-host", "localhost"],
 
@@ -1512,7 +1516,7 @@ start_erlang_client_and_openssl_server_for_alpn_npn_negotiation(Config, Data, Ca
     Exe = "openssl",
     Args = ["s_server", "-msg", "-alpn", "http/1.1,spdy/2", "-nextprotoneg", 
 	    "spdy/3", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version),
-	    "-cert" ++ CertFile  ++ "-key" ++ KeyFile],
+	    "-cert", CertFile, "-key",  KeyFile],
 
     OpensslPort = ssl_test_lib:portable_open_port(Exe, Args),  
 
diff --git a/lib/ssl/test/ssl_upgrade_SUITE.erl b/lib/ssl/test/ssl_upgrade_SUITE.erl
index d65bdf6983..f5f4b25b23 100644
--- a/lib/ssl/test/ssl_upgrade_SUITE.erl
+++ b/lib/ssl/test/ssl_upgrade_SUITE.erl
@@ -40,20 +40,19 @@ all() ->
 
 init_per_suite(Config0) ->
     catch crypto:stop(),
-    try {crypto:start(), erlang:system_info({wordsize, internal}) == erlang:system_info({wordsize, external})} of
-	{ok, true} ->
-	    case ct_release_test:init(Config0) of
-		{skip, Reason} ->
-		    {skip, Reason};
-		Config ->
-		    {ok, _} = make_certs:all(?config(data_dir, Config),
-					      ?config(priv_dir, Config)),
-		    ssl_test_lib:cert_options(Config)
-	    end;
-	{ok, false} ->
-	    {skip, "Test server will not handle halfwordemulator correctly. Skip as halfwordemulator is deprecated"} 
+    try crypto:start() of
+        ok ->
+            case ct_release_test:init(Config0) of
+                {skip, Reason} ->
+                    {skip, Reason};
+                Config ->
+                    Result =
+                    {ok, _} = make_certs:all(?config(data_dir, Config),
+                                             ?config(priv_dir, Config)),
+                    ssl_test_lib:cert_options(Config)
+            end
     catch _:_ ->
-	    {skip, "Crypto did not start"}
+              {skip, "Crypto did not start"}
     end.
 
 end_per_suite(Config) ->
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index aa1af21990..47cb2909fb 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 7.2
+SSL_VSN = 7.3
diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml
index a0d3f95b6a..48400733d1 100644
--- a/lib/stdlib/doc/src/dets.xml
+++ b/lib/stdlib/doc/src/dets.xml
@@ -399,15 +399,40 @@
               kept in RAM.</p>
           </item>
           <item>
-            <p><c>{safe_fixed,</c> SafeFixed<c>}</c>. If the table
-              is fixed, SafeFixed is a tuple <c>{FixedAtTime, [{Pid,RefCount}]}</c>. <c>FixedAtTime</c> is the time when
+            <p><c>{safe_fixed_monotonic_time, SafeFixed}</c>. If the table
+              is fixed, <c>SafeFixed</c> is a tuple <c>{FixedAtTime, [{Pid,RefCount}]}</c>.
+	      <c>FixedAtTime</c> is the time when
               the table was first fixed, and <c>Pid</c> is the pid of
               the process that fixes the table <c>RefCount</c> times.
               There may be any number of processes in the list. If the
               table is not fixed, SafeFixed is the atom <c>false</c>.</p>
+	      <p><c>FixedAtTime</c> will correspond to the result
+	      returned by
+	      <seealso marker="erts:erlang#monotonic_time/0">erlang:monotonic_time/0</seealso>
+	      at the time of fixation. The usage of <c>safe_fixed_monotonic_time</c> is
+	      <seealso marker="erts:time_correction#Time_Warp_Safe_Code">time warp
+	      safe</seealso>.</p>
           </item>
           <item>
-            <p><c>{version, integer()</c>, the version of the format of
+            <p>
+	      <c>{safe_fixed, SafeFixed}</c>. The same as
+	      <c>{safe_fixed_monotonic_time, SafeFixed}</c> with the exception
+	      of the format and value of <c>FixedAtTime</c>.
+	    </p>
+	    <p>
+	      <c>FixedAtTime</c> will correspond to the result returned by
+	      <seealso marker="erts:erlang#timestamp/0">erlang:timestamp/0</seealso>
+	      at the time of fixation. Note that when the system is using
+	      single or multi
+	      <seealso marker="erts:time_correction#Time_Warp_Modes">time warp
+	      modes</seealso> this might produce strange results. This
+	      since the usage of <c>safe_fixed</c> is not
+	      <seealso marker="erts:time_correction#Time_Warp_Safe_Code">time warp
+	      safe</seealso>. Time warp safe code need to use
+	      <c>safe_fixed_monotonic_time</c> instead.</p>
+          </item>
+          <item>
+            <p><c>{version, integer()}</c>, the version of the format of
               the table.</p>
           </item>
         </list>
diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml
index 0938b5dec3..13be488c33 100644
--- a/lib/stdlib/doc/src/erl_parse.xml
+++ b/lib/stdlib/doc/src/erl_parse.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2015</year>
+      <year>1996</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -44,21 +44,33 @@
   </description>
   <datatypes>
     <datatype>
-      <name name="abstract_clause"></name>
-      <desc><p>Parse tree for Erlang clause.</p>
+      <name>abstract_clause()</name>
+      <desc><p><marker id="type-abstract_clause"/>
+        Abstract form of an Erlang clause.</p>
       </desc>
     </datatype>
     <datatype>
-      <name name="abstract_expr"></name>
-      <desc><p>Parse tree for Erlang expression.</p>
+      <name>abstract_expr()</name>
+      <desc><p><marker id="type-abstract_expr"/>
+        Abstract form of an Erlang expression.</p>
       </desc>
     </datatype>
     <datatype>
-      <name name="abstract_form"></name>
-      <desc><p>Parse tree for Erlang form.</p>
+      <name>abstract_form()</name>
+      <desc><p><marker id="type-abstract_form"/>
+        Abstract form of an Erlang form.</p>
       </desc>
     </datatype>
     <datatype>
+      <name>abstract_type()</name>
+      <desc><p><marker id="type-abstract_type"/>
+        Abstract form of an Erlang type.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="erl_parse_tree"></name>
+    </datatype>
+    <datatype>
       <name name="error_description"></name>
     </datatype>
     <datatype>
@@ -180,7 +192,7 @@
         <p>Converts the Erlang data structure <c><anno>Data</anno></c> into an
           abstract form of type <c><anno>AbsTerm</anno></c>.</p>
         <p>The <c><anno>Line</anno></c> option is the line that will
-          be assigned to each node of the abstract form.</p>
+          be assigned to each node of <c><anno>AbsTerm</anno></c>.</p>
         <p>The <c><anno>Encoding</anno></c> option is used for
           selecting which integer lists will be considered
           as strings. The default is to use the encoding returned by
@@ -196,47 +208,53 @@
     <func>
       <name name="map_anno" arity="2"/>
       <fsummary>
-        Map a function over the annotations of an abstract form
+        Map a function over the annotations of a <c>erl_parse</c> tree
       </fsummary>
       <desc>
-        <p>Modifies the abstract form <anno>Abstr</anno> by applying
-          <anno>Fun</anno> on every collection of annotations of the
-          abstract form. The abstract form is traversed in a
-          depth-first, left-to-right, fashion.
+        <p>Modifies the <c>erl_parse</c> tree <c><anno>Abstr</anno></c>
+	  by applying <c><anno>Fun</anno></c> on each collection of
+	  annotations of the nodes of the <c>erl_parse</c> tree. The
+	  <c>erl_parse</c> tree is traversed in a depth-first,
+	  left-to-right, fashion.
         </p>
       </desc>
     </func>
     <func>
       <name name="fold_anno" arity="3"/>
       <fsummary>
-        Fold a function over the annotations of an abstract form
+        Fold a function over the annotations of a <c>erl_parse</c> tree
       </fsummary>
       <desc>
-        <p>Updates an accumulator by applying <anno>Fun</anno> on
-          every collection of annotations of the abstract form
-          <anno>Abstr</anno>. The first call to <anno>Fun</anno> has
-          <anno>AccIn</anno> as argument, and the returned accumulator
-          <anno>AccOut</anno> is passed to the next call, and so on.
-          The final value of the accumulator is returned. The abstract
-          form is traversed in a depth-first, left-to-right, fashion.
+        <p>Updates an accumulator by applying <c><anno>Fun</anno></c> on
+          each collection of annotations of the <c>erl_parse</c> tree
+          <c><anno>Abstr</anno></c>. The first call to
+          <c><anno>Fun</anno></c> has <c><anno>AccIn</anno></c> as
+          argument, and the returned accumulator
+          <c><anno>AccOut</anno></c> is passed to the next call, and
+          so on. The final value of the accumulator is returned. The
+          <c>erl_parse</c> tree is traversed in a depth-first, left-to-right,
+          fashion.
         </p>
       </desc>
     </func>
     <func>
       <name name="mapfold_anno" arity="3"/>
       <fsummary>
-        Map and fold a function over the annotations of an abstract form
+        Map and fold a function over the annotations of a
+        <c>erl_parse</c> tree
       </fsummary>
       <desc>
-        <p>Modifies the abstract form <anno>Abstr</anno> by applying
-          <anno>Fun</anno> on every collection of annotations of the
-          abstract form, while at the same time updating an
-          accumulator. The first call to <anno>Fun</anno> has
-          <anno>AccIn</anno> as second argument, and the returned
-          accumulator <anno>AccOut</anno> is passed to the next call,
-          and so on. The modified abstract form as well as the the
-          final value of the accumulator is returned. The abstract
-          form is traversed in a depth-first, left-to-right, fashion.
+        <p>Modifies the <c>erl_parse</c> tree <c><anno>Abstr</anno></c>
+	  by applying <c><anno>Fun</anno></c> on each collection of
+	  annotations of the nodes of the <c>erl_parse</c> tree, while
+	  at the same time updating an accumulator. The first call to
+	  <c><anno>Fun</anno></c> has <c><anno>AccIn</anno></c> as
+	  second argument, and the returned accumulator
+	  <c><anno>AccOut</anno></c> is passed to the next call, and
+	  so on. The modified <c>erl_parse</c> tree as well as the the
+	  final value of the accumulator are returned. The
+	  <c>erl_parse</c> tree is traversed in a depth-first,
+	  left-to-right, fashion.
         </p>
       </desc>
     </func>
@@ -246,12 +264,15 @@
         Create new annotations
       </fsummary>
       <desc>
-        <p>Creates an abstract form from a term which has the same
-          structure as an abstract form, but <seealso
-          marker="erl_anno#type-location">locations</seealso> where the
-          abstract form has annotations. For each location, <seealso
-          marker="erl_anno#new/1"><c>erl_anno:new/1</c></seealso> is
-          called, and the annotations replace the location.
+        <p>Assumes that <c><anno>Term</anno></c> is a term with the same
+          structure as a <c>erl_parse</c> tree, but with <seealso
+          marker="erl_anno#type-location">locations</seealso> where a
+          <c>erl_parse</c> tree has collections of annotations.
+          Returns a <c>erl_parse</c> tree where each location <c>L</c>
+          has been replaced by the value returned by <seealso
+          marker="erl_anno#new/1"><c>erl_anno:new(L)</c></seealso>.
+          The term <c><anno>Term</anno></c> is traversed in a
+          depth-first, left-to-right, fashion.
         </p>
       </desc>
     </func>
@@ -261,12 +282,14 @@
         Return annotations as terms
       </fsummary>
       <desc>
-        <p>Assumes that <anno>Term</anno> is a term with the same
-          structure as an abstract form, but with terms, T say, on
-          those places where an abstract form has annotations. Returns
-          an abstract form where every term T has been replaced by the
-          value returned by calling <c>erl_anno:from_term(T)</c>. The
-          term <anno>Term</anno> is traversed in a depth-first,
+        <p>Assumes that <c><anno>Term</anno></c> is a term with the same
+          structure as a <c>erl_parse</c> tree, but with terms,
+          <c>T</c> say, where a <c>erl_parse</c> tree has collections
+          of annotations. Returns a <c>erl_parse</c> tree where each
+          term <c>T</c> has been replaced by the value returned by
+          <seealso marker="erl_anno#from_term/1">
+          <c>erl_anno:from_term(T)</c></seealso>. The term
+          <c><anno>Term</anno></c> is traversed in a depth-first,
           left-to-right, fashion.
         </p>
       </desc>
@@ -277,10 +300,13 @@
         Return the representation of annotations
       </fsummary>
       <desc>
-        <p>Returns a term where every collection of annotations Anno of
-          <anno>Abstr</anno> has been replaced by the term returned by
-          calling <c>erl_anno:to_term(Anno)</c>. The abstract form is
-          traversed in a depth-first, left-to-right, fashion.
+        <p>Returns a term where each collection of annotations
+          <c>Anno</c> of the nodes of the <c>erl_parse</c> tree
+          <c><anno>Abstr</anno></c> has been replaced by the term
+          returned by <seealso marker="erl_anno#to_term/1">
+          <c>erl_anno:to_term(Anno)</c></seealso>. The
+          <c>erl_parse</c> tree is traversed in a depth-first,
+          left-to-right, fashion.
         </p>
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/erl_scan.xml b/lib/stdlib/doc/src/erl_scan.xml
index 342f491dd0..ee0d6b6033 100644
--- a/lib/stdlib/doc/src/erl_scan.xml
+++ b/lib/stdlib/doc/src/erl_scan.xml
@@ -40,39 +40,15 @@
   </description>
   <datatypes>
     <datatype>
-      <name name="attribute_info"></name>
-    </datatype>
-    <datatype>
-      <name name="attributes"></name>
-    </datatype>
-    <datatype>
-      <name name="attributes_data"></name>
-    </datatype>
-    <datatype>
       <name name="category"></name>
     </datatype>
     <datatype>
-      <name name="column"></name>
-    </datatype>
-    <datatype>
       <name name="error_description"></name>
     </datatype>
     <datatype>
       <name name="error_info"></name>
     </datatype>
     <datatype>
-      <name name="info_line"></name>
-    </datatype>
-    <datatype>
-      <name name="info_location"></name>
-    </datatype>
-    <datatype>
-      <name name="line"></name>
-    </datatype>
-    <datatype>
-      <name name="location"></name>
-    </datatype>
-    <datatype>
       <name name="option"></name>
     </datatype>
     <datatype>
@@ -88,9 +64,6 @@
       <name name="token"></name>
     </datatype>
     <datatype>
-      <name name="token_info"></name>
-    </datatype>
-    <datatype>
       <name name="tokens"></name>
     </datatype>
     <datatype>
@@ -122,25 +95,23 @@
           <anno>StartLocation</anno>, [])</c>.</p>
         <p><c><anno>StartLocation</anno></c> indicates the initial location
           when scanning starts. If <c><anno>StartLocation</anno></c> is a line,
-          <c>attributes()</c> as well as <c><anno>EndLocation</anno></c> and
+          <c>Anno</c> as well as <c><anno>EndLocation</anno></c> and
           <c><anno>ErrorLocation</anno></c> will be lines. If
           <c><anno>StartLocation</anno></c> is a pair of a line and a column
-          <c>attributes()</c> takes the form of an opaque compound
+          <c>Anno</c> takes the form of an opaque compound
           data type, and <c><anno>EndLocation</anno></c> and
           <c><anno>ErrorLocation</anno></c>
           will be pairs of a line and a column. The <em>token
-          attributes</em> contain information about the column and the
+          annotations</em> contain information about the column and the
           line where the token begins, as well as the text of the
           token (if the <c>text</c> option is given), all of which can
-          be accessed by calling <seealso
-          marker="#token_info/1">token_info/1,2</seealso>, <seealso
-          marker="#attributes_info/1">attributes_info/1,2</seealso>,
+          be accessed by calling
           <seealso marker="#column/1">column/1</seealso>,
           <seealso marker="#line/1">line/1</seealso>,
           <seealso marker="#location/1">location/1</seealso>, and
           <seealso marker="#text/1">text/1</seealso>.</p>
         <p>A <em>token</em> is a tuple containing information about
-          syntactic category, the token attributes, and the actual
+          syntactic category, the token annotations, and the actual
           terminal symbol. For punctuation characters (e.g. <c>;</c>,
           <c>|</c>) and reserved words, the category and the symbol
           coincide, and the token is represented by a two-tuple.
@@ -172,7 +143,7 @@
         <item><p>Short for <c>[return_comments, return_white_spaces]</c>.</p>
         </item>
         <tag><c>text</c></tag>
-        <item><p>Include the token's text in the token attributes. The
+        <item><p>Include the token's text in the token annotation. The
           text is the part of the input corresponding to the token.</p>
         </item>
         </taglist>
@@ -306,150 +277,6 @@
       </desc>
     </func>
     <func>
-      <name name="token_info" arity="1"/>
-      <fsummary>Return information about a token</fsummary>
-      <desc>
-        <p>Returns a list containing information about the token
-          <c><anno>Token</anno></c>. The order of the
-          <c><anno>TokenInfoTuple</anno></c>s is not
-          defined. See <seealso
-          marker="#token_info/2">token_info/2</seealso> for
-          information about specific
-          <c><anno>TokenInfoTuple</anno></c>s.</p>
-        <p>Note that if <c>token_info(Token, TokenItem)</c> returns
-          <c>undefined</c> for some <c>TokenItem</c>, the
-          item is not included in <c><anno>TokenInfo</anno></c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="token_info" arity="2" clause_i="1"/>
-      <name name="token_info" arity="2" clause_i="2"/>
-      <fsummary>Return information about a token</fsummary>
-      <type name="token_item"/>
-      <type name="attribute_item"/>
-      <desc>
-        <p>Returns a list containing information about the token
-          <c><anno>Token</anno></c>. If one single
-          <c><anno>TokenItem</anno></c> is given the returned value is
-          the corresponding
-          <c>TokenInfoTuple</c>, or <c>undefined</c> if the
-          <c>TokenItem</c> has no value. If a list of
-          <c><anno>TokenItem</anno></c>s is given the result is a list of
-          <c><anno>TokenInfoTuple</anno></c>. The
-          <c><anno>TokenInfoTuple</anno></c>s will
-          appear with the corresponding <c><anno>TokenItem</anno></c>s in
-          the same order as the <c><anno>TokenItem</anno></c>s
-	  appear in the list of <c>TokenItem</c>s.
-          <c><anno>TokenItem</anno></c>s with no value are not included
-          in the list of <c><anno>TokenInfoTuple</anno></c>.</p>
-	<p>The following <c><anno>TokenInfoTuple</anno></c>s with corresponding
-	   <c><anno>TokenItem</anno></c>s are valid:</p>
-        <taglist>
-          <tag><c>{category, </c><seealso marker="#type-category">
-            category()</seealso><c>}</c></tag>
-          <item><p>The category of the token.</p>
-          </item>
-          <tag><c>{column, </c><seealso marker="#type-column">
-            column()</seealso><c>}</c></tag>
-          <item><p>The column where the token begins.</p>
-          </item>
-          <tag><c>{length, integer() > 0}</c></tag>
-          <item><p>The length of the token's text.</p>
-          </item>
-          <tag><c>{line, </c><seealso marker="#type-line">
-            line()</seealso><c>}</c></tag>
-          <item><p>The line where the token begins.</p>
-          </item>
-          <tag><c>{location, </c><seealso marker="#type-location">
-            location()</seealso><c>}</c></tag>
-          <item><p>The line and column where the token begins, or
-            just the line if the column unknown.</p>
-          </item>
-          <tag><c>{symbol, </c><seealso marker="#type-symbol">
-            symbol()</seealso><c>}</c></tag>
-          <item><p>The token's symbol.</p>
-          </item>
-          <tag><c>{text, string()}</c></tag>
-          <item><p>The token's text.</p>
-          </item>
-        </taglist>
-      </desc>
-    </func>
-    <func>
-      <name name="attributes_info" arity="1"/>
-      <fsummary>Return information about token attributes</fsummary>
-      <desc>
-        <p>Returns a list containing information about the token
-          attributes <c><anno>Attributes</anno></c>. The order of the
-          <c><anno>AttributeInfoTuple</anno></c>s is not defined.
-          See <seealso
-          marker="#attributes_info/2">attributes_info/2</seealso> for
-          information about specific
-          <c><anno>AttributeInfoTuple</anno></c>s.</p>
-        <p>Note that if <c>attributes_info(Token, AttributeItem)</c>
-          returns <c>undefined</c> for some <c>AttributeItem</c> in
-          the list above, the item is not included in
-          <c><anno>AttributesInfo</anno></c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name name="attributes_info" arity="2" clause_i="1"/>
-      <name name="attributes_info" arity="2" clause_i="2"/>
-      <fsummary>Return information about a token attributes</fsummary>
-      <type name="attribute_item"/>
-      <desc>
-        <p>Returns a list containing information about the token
-          attributes <c><anno>Attributes</anno></c>. If one single
-          <c><anno>AttributeItem</anno></c> is given the returned value is the
-          corresponding <c><anno>AttributeInfoTuple</anno></c>,
-          or <c>undefined</c> if the <c><anno>AttributeItem</anno></c>
-          has no value. If a list of <c><anno>AttributeItem</anno></c>
-          is given the result is a list of
-          <c><anno>AttributeInfoTuple</anno></c>.
-          The <c><anno>AttributeInfoTuple</anno></c>s
-          will appear with the corresponding <c><anno>AttributeItem</anno></c>s
-          in the same order as the <c><anno>AttributeItem</anno></c>s
-          appear in the list of <c><anno>AttributeItem</anno></c>s.
-          <c><anno>AttributeItem</anno></c>s with no
-          value are not included in the list of
-	  <c><anno>AttributeInfoTuple</anno></c>.</p>
-	<p>The following <c><anno>AttributeInfoTuple</anno></c>s with
-          corresponding <c><anno>AttributeItem</anno></c>s are valid:</p>
-        <taglist>
-          <tag><c>{column, </c><seealso marker="#type-column">
-            column()</seealso><c>}</c></tag>
-          <item><p>The column where the token begins.</p>
-          </item>
-          <tag><c>{length, integer() > 0}</c></tag>
-          <item><p>The length of the token's text.</p>
-          </item>
-          <tag><c>{line, </c><seealso marker="#type-line">
-            line()</seealso><c>}</c></tag>
-          <item><p>The line where the token begins.</p>
-          </item>
-          <tag><c>{location, </c><seealso marker="#type-location">
-            location()</seealso><c>}</c></tag>
-          <item><p>The line and column where the token begins, or
-            just the line if the column unknown.</p>
-          </item>
-          <tag><c>{text, string()}</c></tag>
-          <item><p>The token's text.</p>
-          </item>
-        </taglist>
-      </desc>
-    </func>
-    <func>
-      <name name="set_attribute" arity="3"/>
-      <fsummary>Set a token attribute value</fsummary>
-      <desc>
-        <p>Sets the value of the <c>line</c> attribute of the token
-          attributes <c><anno>Attributes</anno></c>.</p>
-        <p>The <c><anno>SetAttributeFun</anno></c> is called with the value of
-          the <c>line</c> attribute, and is to return the new value of
-          the <c>line</c> attribute.</p>
-      </desc>
-    </func>
-    <func>
       <name name="format_error" arity="1"/>
       <fsummary>Format an error descriptor</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 7b01109ff8..447fe51130 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -488,14 +488,39 @@ Error: fun containing local Erlang function calls
           <item><c>Item=fixed, Value=boolean()</c>          <br></br>
 
            Indicates if the table is fixed by any process or not.</item>
-          <item>
-            <p><c>Item=safe_fixed, Value={FirstFixed,Info}|false</c>              <br></br>
+          <item><marker id="info_2_safe_fixed_monotonic_time"/>
+            <p><c>Item=safe_fixed|safe_fixed_monotonic_time, Value={FixationTime,Info}|false</c>              <br></br>
 </p>
-            <p>If the table has been fixed using <c>safe_fixtable/2</c>,
-              the call returns a tuple where <c>FirstFixed</c> is the
+            <p>If the table has been fixed using
+	    <seealso marker="#safe_fixtable/2"><c>safe_fixtable/2</c></seealso>,
+              the call returns a tuple where <c>FixationTime</c> is the
               time when the table was first fixed by a process, which
               may or may not be one of the processes it is fixed by
               right now.</p>
+	    <p>The format and value of <c>FixationTime</c> depends on
+	    <c>Item</c>:</p>
+	    <taglist>
+	      <tag><c>safe_fixed</c></tag>
+	      <item><p><c>FixationTime</c> will correspond to the result
+	      returned by
+	      <seealso marker="erts:erlang#timestamp/0">erlang:timestamp/0</seealso>
+	      at the time of fixation. Note that when the system is using
+	      single or multi
+	      <seealso marker="erts:time_correction#Time_Warp_Modes">time warp
+	      modes</seealso> this might produce strange results. This
+	      since the usage of <c>safe_fixed</c> is not
+	      <seealso marker="erts:time_correction#Time_Warp_Safe_Code">time warp
+	      safe</seealso>. Time warp safe code need to use
+	      <c>safe_fixed_monotonic_time</c> instead.</p></item>
+
+	      <tag><c>safe_fixed_monotonic_time</c></tag>
+	      <item><p><c>FixationTime</c> will correspond to the result
+	      returned by
+	      <seealso marker="erts:erlang#monotonic_time/0">erlang:monotonic_time/0</seealso>
+	      at the time of fixation. The usage of <c>safe_fixed_monotonic_time</c> is
+	      <seealso marker="erts:time_correction#Time_Warp_Safe_Code">time warp
+	      safe</seealso>.</p></item>
+	    </taglist>
             <p><c>Info</c> is a possibly empty lists of tuples
               <c>{Pid,RefCount}</c>, one tuple for every process the
               table is fixed by right now. <c>RefCount</c> is the value
@@ -1135,9 +1160,11 @@ clean_all_with_value(Tab,X,Key) ->
           table but never releases it, the memory used by the deleted
           objects will never be freed. The performance of operations on
           the table will also degrade significantly.</p>
-        <p>Use <c>info/2</c> to retrieve information about which
-          processes have fixed which tables. A system with a lot of
-          processes fixing tables may need a monitor which sends alarms
+        <p>Use
+	<seealso marker="#info_2_safe_fixed_monotonic_time"><c>info(Tab,
+	safe_fixed_monotonic_time)</c></seealso> to retrieve information
+	about which processes have fixed which tables. A system with a lot
+	of processes fixing tables may need a monitor which sends alarms
           when tables have been fixed for too long.</p>
         <p>Note that for tables of the <c>ordered_set</c> type,
           <c>safe_fixtable/2</c> is not necessary as calls to
diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml
index 77e262dbe6..ce6aba3657 100644
--- a/lib/stdlib/doc/src/filename.xml
+++ b/lib/stdlib/doc/src/filename.xml
@@ -47,7 +47,12 @@
     <p>The module supports raw file names in the way that if a binary is present, or the file name cannot be interpreted according to the return value of 
     <seealso marker="kernel:file#native_name_encoding/0">file:native_name_encoding/0</seealso>, a raw file name will also be returned. For example filename:join/1 provided with a path component being a binary (and also not being possible to interpret under the current native file name encoding) will result in a raw file name being returned (the join operation will have been performed of course). For more information about raw file names, see the <seealso marker="kernel:file">file</seealso> module.</p>
   </description>
-
+  <datatypes>
+      <datatype>
+          <name name="basedir_type"/>
+      </datatype>
+  </datatypes>
+ 
   <funcs>
     <func>
       <name name="absname" arity="1"/>
@@ -102,6 +107,155 @@
       </desc>
     </func>
     <func>
+      <name name="basedir" arity="2"/>
+      <fsummary>Equivalent to <c>basedir(<anno>Type</anno>,<anno>Application</anno>,#{})</c>.</fsummary>
+      <desc>
+          <p>
+              Equivalent to <seealso marker="#basedir-3">
+                  basedir(<anno>Type</anno>, <anno>Application</anno>, #{})</seealso>.
+          </p>
+      </desc>
+    </func>
+    <func>
+      <name name="basedir" arity="3"/>
+      <fsummary></fsummary>
+      <desc><marker id="basedir-3"/>
+          <p>
+              Returns a suitable path, or paths, for a given type.
+              If <c>os</c> is not set in <c><anno>Opts</anno></c> the function will default to
+              the native option, i.e. <c>'linux'</c>, <c>'darwin'</c> or <c>'windows'</c>, as understood
+              by <c>os:type/0</c>. Anything not recognized as <c>'darwin'</c> or <c>'windows'</c> is
+              interpreted as <c>'linux'</c>.</p>
+          <p>
+              The options <c>'author'</c> and <c>'version'</c> are only used with <c>'windows'</c> option mode.
+          </p>
+        <list type="bulleted">
+            <item><c>user_cache</c>
+                <p>The path location is intended for transient data files on a local machine.</p>
+                <p>
+                    On Linux:
+                    Respects the os environment variable <c>XDG_CACHE_HOME</c>.
+                </p>
+                <pre>
+1> <input>filename:basedir(user_cache, "my_application", #{os=>linux}).</input>
+"/home/otptest/.cache/my_application"</pre>
+                On Darwin: <pre>
+1> <input>filename:basedir(user_cache, "my_application", #{os=>darwin}).</input>
+"/home/otptest/Library/Caches/my_application"</pre>
+                On Windows: <pre>
+1> <input>filename:basedir(user_cache, "My App").</input>
+"c:/Users/otptest/AppData/Local/My App/Cache"
+2> <input>filename:basedir(user_cache, "My App").</input>
+"c:/Users/otptest/AppData/Local/My App/Cache"
+3> <input>filename:basedir(user_cache, "My App", #{author=>"Erlang"}).</input>
+"c:/Users/otptest/AppData/Local/Erlang/My App/Cache"
+4> <input>filename:basedir(user_cache, "My App", #{version=>"1.2"}).</input>
+"c:/Users/otptest/AppData/Local/My App/1.2/Cache"
+5> <input>filename:basedir(user_cache, "My App", #{author=>"Erlang",version=>"1.2"}).</input>
+"c:/Users/otptest/AppData/Local/Erlang/My App/1.2/Cache"</pre>
+            </item>
+            <item><c>user_config</c>
+                <p>
+                    The path location is intended for persistent configuration files.
+                </p>
+                <p>
+                    On Linux:
+                    Respects the os environment variable <c>XDG_CONFIG_HOME</c>.
+                </p>
+                <pre>
+2> <input>filename:basedir(user_config, "my_application", #{os=>linux}).</input>
+"/home/otptest/.config/my_application"</pre>
+                On Darwin:<pre>
+2> <input>filename:basedir(user_config, "my_application", #{os=>darwin}).</input>
+"/home/otptest/Library/Application Support/my_application"</pre>
+                On Windows:<pre>
+1> <input>filename:basedir(user_config, "My App").</input>
+"c:/Users/otptest/AppData/Roaming/My App"
+2> <input>filename:basedir(user_config, "My App", #{author=>"Erlang", version=>"1.2"}).</input>
+"c:/Users/otptest/AppData/Roaming/Erlang/My App/1.2"</pre>
+            </item>
+            <item><c>user_data</c>
+                <p>
+                    The path location is intended for persistent data files.
+                </p>
+                <p>
+                    On Linux:
+                    Respects the os environment variable <c>XDG_DATA_HOME</c>.
+                </p>
+                <pre>
+3> <input>filename:basedir(user_data, "my_application", #{os=>linux}).</input>
+"/home/otptest/.local/my_application"</pre>
+                On Darwin:<pre>
+3> <input>filename:basedir(user_data, "my_application", #{os=>darwin}).</input>
+"/home/otptest/Library/Application Support/my_application"</pre>
+                On Windows:<pre>
+8> <input>filename:basedir(user_data, "My App").</input>
+"c:/Users/otptest/AppData/Local/My App"
+9> <input>filename:basedir(user_data, "My App",#{author=>"Erlang",version=>"1.2"}).</input>
+"c:/Users/otptest/AppData/Local/Erlang/My App/1.2"</pre>
+            </item>
+            <item><c>user_log</c>
+                <p>The path location is intended for transient log files on a local machine.</p>
+                <p>
+                On Linux:
+                Respects the os environment variable <c>XDG_CACHE_HOME</c>.</p>
+                <pre>
+4> <input>filename:basedir(user_log, "my_application", #{os=>linux}).</input>
+"/home/otptest/.cache/my_application/log"</pre>
+                On Darwin:<pre>
+4> <input>filename:basedir(user_log, "my_application", #{os=>darwin}).</input>
+"/home/otptest/Library/Caches/my_application"</pre>
+                On Windows:<pre>
+12> <input>filename:basedir(user_log, "My App").</input>
+"c:/Users/otptest/AppData/Local/My App/Logs"
+13> <input>filename:basedir(user_log, "My App",#{author=>"Erlang",version=>"1.2"}).</input>
+"c:/Users/otptest/AppData/Local/Erlang/My App/1.2/Logs"</pre>
+            </item>
+            <item><c>site_config</c><p>
+                On Linux:
+                Respects the os environment variable <c>XDG_CONFIG_DIRS</c>.</p>
+<pre>
+5> <input>filename:basedir(site_data, "my_application", #{os=>linux}).</input>
+["/usr/local/share/my_application",
+ "/usr/share/my_application"]
+6> <input>os:getenv("XDG_CONFIG_DIRS").</input>
+"/etc/xdg/xdg-ubuntu:/usr/share/upstart/xdg:/etc/xdg"
+7> <input>filename:basedir(site_config, "my_application", #{os=>linux}).</input>
+["/etc/xdg/xdg-ubuntu/my_application",
+ "/usr/share/upstart/xdg/my_application",
+ "/etc/xdg/my_application"]
+8> <input>os:unsetenv("XDG_CONFIG_DIRS").</input>
+true
+9> <input>filename:basedir(site_config, "my_application", #{os=>linux}).</input>
+["/etc/xdg/my_application"]</pre>
+                On Darwin:<pre>
+5> <input>filename:basedir(site_config, "my_application", #{os=>darwin}).</input>
+["/Library/Application Support/my_application"]</pre>
+            </item>
+            <item><c>site_data</c><p>
+                    On Linux:
+                    Respects the os environment variable <c>XDG_DATA_DIRS</c>.</p>
+                <pre>
+10> <input>os:getenv("XDG_DATA_DIRS").</input>
+"/usr/share/ubuntu:/usr/share/gnome:/usr/local/share/:/usr/share/"
+11> <input>filename:basedir(site_data, "my_application", #{os=>linux}).</input>
+["/usr/share/ubuntu/my_application",
+ "/usr/share/gnome/my_application",
+ "/usr/local/share/my_application",
+ "/usr/share/my_application"]
+12> <input>os:unsetenv("XDG_DATA_DIRS").</input>
+true
+13> <input>filename:basedir(site_data, "my_application", #{os=>linux}).</input>
+["/usr/local/share/my_application",
+ "/usr/share/my_application"]</pre>
+                On Darwin:<pre>
+5> <input>filename:basedir(site_data, "my_application", #{os=>darwin}).</input>
+["/Library/Application Support/my_application"]</pre>
+            </item>
+        </list>
+      </desc>
+    </func>
+    <func>
       <name name="basename" arity="1"/>
       <fsummary>Return the last component of a filename</fsummary>
       <desc>
@@ -214,7 +368,7 @@
       <desc>
         <p>Converts <c><anno>Path</anno></c> to a form accepted by the command shell
           and native applications on the current platform. On Windows,
-          forward slashes is converted to backward slashes. On all
+          forward slashes are converted to backward slashes. On all
           platforms, the name is normalized as done by <c>join/1</c>.</p>
         <pre>
 19> <input>filename:nativename("/usr/local/bin/").</input> % Unix
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 267a993a1b..5d4f9d912f 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,93 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 2.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix evaluation in matching of bound map key variables in
+	    the interpreter.</p>
+          <p>
+	    Prior to this patch, the following code would not
+	    evaluate: <c>X = key,(fun(#{X := value}) -&gt; true
+	    end)(#{X => value})</c></p>
+          <p>
+	    Own Id: OTP-13218</p>
+        </item>
+        <item>
+	    <p> Fix <c>erl_eval</c> not using non-local function
+	    handler. </p>
+          <p>
+	    Own Id: OTP-13228 Aux Id: ERL-32 </p>
+        </item>
+        <item>
+	    <p> The Erlang Code Linter no longer crashes if there is
+	    a <c>-deprecated()</c> attribute but no <c>-module()</c>
+	    declaration. </p>
+          <p>
+	    Own Id: OTP-13230 Aux Id: ERL-62 </p>
+        </item>
+        <item>
+          <p>
+	    The timestamp in the result returned by <c>dets:info(Tab,
+	    safe_fixed)</c> was unintentionally broken as a result of
+	    the time API rewrites in OTP 18.0. This has now been
+	    fixed.</p>
+          <p>
+	    Own Id: OTP-13239 Aux Id: OTP-11997 </p>
+        </item>
+        <item>
+	    <p>A rare race condition in <c>beam_lib</c> when using
+	    encrypted abstract format has been eliminated.</p>
+          <p>
+	    Own Id: OTP-13278</p>
+        </item>
+        <item>
+          <p>
+	    Improved maps:with/2 and maps:without/2 algorithms</p>
+          <p>
+	    The new implementation speeds up the execution
+	    significantly for all sizes of input.</p>
+          <p>
+	    Own Id: OTP-13376</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Time warp safety improvements.</p>
+          <p>
+	    Introduced the options <c>monotonic_timestamp</c>, and
+	    <c>strict_monotonic_timestamp</c> to the trace,
+	    sequential trace, and system profile functionality. This
+	    since the already existing <c>timestamp</c> option is not
+	    time warp safe.</p>
+          <p>
+	    Introduced the option <c>safe_fixed_monotonic_time</c> to
+	    <c>ets:info/2</c> and <c>dets:info/2</c>. This since the
+	    already existing <c>safe_fixed</c> option is not time
+	    warp safe.</p>
+          <p>
+	    Own Id: OTP-13222 Aux Id: OTP-11997 </p>
+        </item>
+        <item>
+          <p>
+	    In the shell Ctrl+W (delete word) will no longer consider
+	    "." as being part of a word.</p>
+          <p>
+	    Own Id: OTP-13281</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 2.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index 24ff251ce3..815bf4a489 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -543,7 +543,10 @@
           </item>
           <item>
             <p><c>active</c> - the count of all actively running child processes
-              managed by this supervisor.</p>
+              managed by this supervisor. In the case of <c>simple_one_for_one</c>
+              supervisors, no check is carried out to ensure that each child process
+              is still alive, though the result provided here is likely to be very
+              accurate unless the supervisor is heavily overloaded.</p>
           </item>
           <item>
             <p><c>supervisors</c> - the count of all children marked as
diff --git a/lib/stdlib/examples/erl_id_trans.erl b/lib/stdlib/examples/erl_id_trans.erl
index 529ae30862..c2e345763a 100644
--- a/lib/stdlib/examples/erl_id_trans.erl
+++ b/lib/stdlib/examples/erl_id_trans.erl
@@ -18,11 +18,11 @@
 %%
 -module(erl_id_trans).
 
-%% A identity transformer of Erlang abstract syntax.
+%% An identity transformer of Erlang abstract syntax.
 
 %% This module only traverses legal Erlang code. This is most noticeable
 %% in guards where only a limited number of expressions are allowed.
-%% N.B. if this module is to be used as a basis for tranforms then
+%% N.B. if this module is to be used as a basis for transforms then
 %% all the error cases must be handled otherwise this module just crashes!
 
 -export([parse_transform/2]).
@@ -53,6 +53,17 @@ form({attribute,Line,export,Es0}) ->
 form({attribute,Line,import,{Mod,Is0}}) ->
     Is1 = farity_list(Is0),
     {attribute,Line,import,{Mod,Is1}};
+form({attribute,Line,export_type,Es0}) ->
+    Es1 = farity_list(Es0),
+    {attribute,Line,export_type,Es1};
+form({attribute,Line,optional_callbacks,Es0}) ->
+    try farity_list(Es0) of
+        Es1 ->
+            {attribute,Line,optional_callbacks,Es1}
+    catch
+        _:_ ->
+            {attribute,Line,optional_callbacks,Es0}
+    end;
 form({attribute,Line,compile,C}) ->
     {attribute,Line,compile,C};
 form({attribute,Line,record,{Name,Defs0}}) ->
@@ -60,14 +71,28 @@ form({attribute,Line,record,{Name,Defs0}}) ->
     {attribute,Line,record,{Name,Defs1}};
 form({attribute,Line,asm,{function,N,A,Code}}) ->
     {attribute,Line,asm,{function,N,A,Code}};
+form({attribute,Line,type,{N,T,Vs}}) ->
+    T1 = type(T),
+    Vs1 = variable_list(Vs),
+    {attribute,Line,type,{N,T1,Vs1}};
+form({attribute,Line,opaque,{N,T,Vs}}) ->
+    T1 = type(T),
+    Vs1 = variable_list(Vs),
+    {attribute,Line,opaque,{N,T1,Vs1}};
+form({attribute,Line,spec,{{N,A},FTs}}) ->
+    FTs1 = function_type_list(FTs),
+    {attribute,Line,spec,{{N,A},FTs1}};
+form({attribute,Line,spec,{{M,N,A},FTs}}) ->
+    FTs1 = function_type_list(FTs),
+    {attribute,Line,spec,{{M,N,A},FTs1}};
+form({attribute,Line,callback,{{N,A},FTs}}) ->
+    FTs1 = function_type_list(FTs),
+    {attribute,Line,callback,{{N,A},FTs1}};
 form({attribute,Line,Attr,Val}) ->		%The general attribute.
     {attribute,Line,Attr,Val};
 form({function,Line,Name0,Arity0,Clauses0}) ->
     {Name,Arity,Clauses} = function(Name0, Arity0, Clauses0),
     {function,Line,Name,Arity,Clauses};
-% Mnemosyne, ignore...
-form({rule,Line,Name,Arity,Body}) ->
-    {rule,Line,Name,Arity,Body}; % Dont dig into this
 %% Extra forms from the parser.
 form({error,E}) -> {error,E};
 form({warning,W}) -> {warning,W};
@@ -79,6 +104,12 @@ farity_list([{Name,Arity}|Fas]) ->
     [{Name,Arity}|farity_list(Fas)];
 farity_list([]) -> [].
 
+%% -type variable_list([Var]) -> [Var]
+
+variable_list([{var,Line,Var}|Vs]) ->
+    [{var,Line,Var}|variable_list(Vs)];
+variable_list([]) -> [].
+
 %% -type record_defs([RecDef]) -> [RecDef].
 %%  N.B. Field names are full expressions here but only atoms are allowed
 %%  by the *parser*!
@@ -88,6 +119,16 @@ record_defs([{record_field,Line,{atom,La,A},Val0}|Is]) ->
     [{record_field,Line,{atom,La,A},Val1}|record_defs(Is)];
 record_defs([{record_field,Line,{atom,La,A}}|Is]) ->
     [{record_field,Line,{atom,La,A}}|record_defs(Is)];
+record_defs([{typed_record_field,{record_field,Line,{atom,La,A},Val0},Type}|
+             Is]) ->
+    Val1 = expr(Val0),
+    Type1 = type(Type),
+    [{typed_record_field,{record_field,Line,{atom,La,A},Val1},Type1}|
+     record_defs(Is)];
+record_defs([{typed_record_field,{record_field,Line,{atom,La,A}},Type}|Is]) ->
+    Type1 = type(Type),
+    [{typed_record_field,{record_field,Line,{atom,La,A}},Type1}|
+     record_defs(Is)];
 record_defs([]) -> [].
 
 %% -type function(atom(), integer(), [Clause]) -> {atom(),integer(),[Clause]}.
@@ -196,9 +237,9 @@ pattern_grp([]) ->
 
 bit_types([]) ->
     [];
-bit_types([Atom | Rest]) when atom(Atom) ->
+bit_types([Atom | Rest]) when is_atom(Atom) ->
     [Atom | bit_types(Rest)];
-bit_types([{Atom, Integer} | Rest]) when atom(Atom), integer(Integer) ->
+bit_types([{Atom, Integer} | Rest]) when is_atom(Atom), is_integer(Integer) ->
     [{Atom, Integer} | bit_types(Rest)].
 
 
@@ -226,7 +267,7 @@ pattern_fields([]) -> [].
 
 %% -type guard([GuardTest]) -> [GuardTest].
 
-guard([G0|Gs]) when list(G0) ->
+guard([G0|Gs]) when is_list(G0) ->
     [guard0(G0) | guard(Gs)];
 guard(L) ->
     guard0(L).
@@ -547,3 +588,97 @@ fun_clauses([C0|Cs]) ->
     C1 = clause(C0),
     [C1|fun_clauses(Cs)];
 fun_clauses([]) -> [].
+
+function_type_list([{type,Line,bounded_fun,[Ft,Fc]}|Fts]) ->
+    Ft1 = function_type(Ft),
+    Fc1 = function_constraint(Fc),
+    [{type,Line,bounded_fun,[Ft1,Fc1]}|function_type_list(Fts)];
+function_type_list([Ft|Fts]) ->
+    [function_type(Ft)|function_type_list(Fts)];
+function_type_list([]) -> [].
+
+function_type({type,Line,'fun',[{type,Lt,product,As},B]}) ->
+    As1 = type_list(As),
+    B1 = type(B),
+    {type,Line,'fun',[{type,Lt,product,As1},B1]}.
+
+function_constraint([C|Cs]) ->
+    C1 = constraint(C),
+    [C1|function_constraint(Cs)];
+function_constraint([]) -> [].
+
+constraint({type,Line,constraint,[{atom,L,A},[V,T]]}) ->
+    V1 = type(V),
+    T1 = type(T),
+    {type,Line,constraint,[{atom,L,A},[V1,T1]]}.
+
+type({ann_type,Line,[{var,Lv,V},T]}) ->
+    T1 = type(T),
+    {ann_type,Line,[{var,Lv,V},T1]};
+type({atom,Line,A}) ->
+    {atom,Line,A};
+type({integer,Line,I}) ->
+    {integer,Line,I};
+type({op,Line,Op,T}) ->
+    T1 = type(T),
+    {op,Line,Op,T1};
+type({op,Line,Op,L,R}) ->
+    L1 = type(L),
+    R1 = type(R),
+    {op,Line,Op,L1,R1};
+type({type,Line,binary,[M,N]}) ->
+    M1 = type(M),
+    N1 = type(N),
+    {type,Line,binary,[M1,N1]};
+type({type,Line,'fun',[]}) ->
+    {type,Line,'fun',[]};
+type({type,Line,'fun',[{type,Lt,any},B]}) ->
+    B1 = type(B),
+    {type,Line,'fun',[{type,Lt,any},B1]};
+type({type,Line,range,[L,H]}) ->
+    L1 = type(L),
+    H1 = type(H),
+    {type,Line,range,[L1,H1]};
+type({type,Line,map,any}) ->
+    {type,Line,map,any};
+type({type,Line,map,Ps}) ->
+    Ps1 = map_pair_types(Ps),
+    {type,Line,map,Ps1};
+type({type,Line,record,[{atom,La,N}|Fs]}) ->
+    Fs1 = field_types(Fs),
+    {type,Line,record,[{atom,La,N}|Fs1]};
+type({remote_type,Line,[{atom,Lm,M},{atom,Ln,N},As]}) ->
+    As1 = type_list(As),
+    {remote_type,Line,[{atom,Lm,M},{atom,Ln,N},As1]};
+type({type,Line,tuple,any}) ->
+    {type,Line,tuple,any};
+type({type,Line,tuple,Ts}) ->
+    Ts1 = type_list(Ts),
+    {type,Line,tuple,Ts1};
+type({type,Line,union,Ts}) ->
+    Ts1 = type_list(Ts),
+    {type,Line,union,Ts1};
+type({var,Line,V}) ->
+    {var,Line,V};
+type({user_type,Line,N,As}) ->
+    As1 = type_list(As),
+    {user_type,Line,N,As1};
+type({type,Line,N,As}) ->
+    As1 = type_list(As),
+    {type,Line,N,As1}.
+
+map_pair_types([{type,Line,map_field_assoc,[K,V]}|Ps]) ->
+    K1 = type(K),
+    V1 = type(V),
+    [{type,Line,map_field_assoc,[K1,V1]}|map_pair_types(Ps)];
+map_pair_types([]) -> [].
+
+field_types([{type,Line,field_type,[{atom,La,A},T]}|Fs]) ->
+    T1 = type(T),
+    [{type,Line,field_type,[{atom,La,A},T1]}|field_types(Fs)];
+field_types([]) -> [].
+
+type_list([T|Ts]) ->
+    T1 = type(T),
+    [T1|type_list(Ts)];
+type_list([]) -> [].
diff --git a/lib/stdlib/include/erl_bits.hrl b/lib/stdlib/include/erl_bits.hrl
index 8405a55d55..2a54587a17 100644
--- a/lib/stdlib/include/erl_bits.hrl
+++ b/lib/stdlib/include/erl_bits.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2015. 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.
@@ -26,10 +26,10 @@
 -type bt_unit()  :: 1..256.
 
 -record(bittype, {
-          type   :: bt_type(),
-	  unit   :: bt_unit(),       %% element unit
-          sign   :: bt_sign(),
-          endian :: bt_endian()
+          type   :: bt_type() | 'undefined',
+	  unit   :: bt_unit() | 'undefined',       %% element unit
+          sign   :: bt_sign() | 'undefined',
+          endian :: bt_endian() | 'undefined'
          }).
 
 -record(bitdefault, {
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl
index cbbab088f4..7a17226e46 100644
--- a/lib/stdlib/src/beam_lib.erl
+++ b/lib/stdlib/src/beam_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2000-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.
@@ -872,7 +872,7 @@ mandatory_chunks() ->
 %%% can use it.
 %%% ====================================================================
 
--record(state, {crypto_key_f :: crypto_fun()}).
+-record(state, {crypto_key_f :: crypto_fun() | 'undefined'}).
 
 -define(CRYPTO_KEY_SERVER, beam_lib__crypto_key_server).
 
@@ -904,7 +904,11 @@ anno_from_term({Tag, Forms}) when Tag =:= abstract_v1; Tag =:= abstract_v2 ->
 anno_from_term(T) ->
     T.
 
-anno_from_forms(Forms) ->
+anno_from_forms(Forms0) ->
+    %% Forms with record field types created before OTP 19.0 are
+    %% replaced by well-formed record forms holding the type
+    %% information.
+    Forms = epp:restore_typed_record_fields(Forms0),
     [erl_parse:anno_from_term(Form) || Form <- Forms].
 
 start_crypto() ->
@@ -931,7 +935,10 @@ call_crypto_server(Req) ->
     end.
 
 call_crypto_server_1(Req) ->
-    {ok, _} = gen_server:start({local,?CRYPTO_KEY_SERVER}, ?MODULE, [], []),
+    case gen_server:start({local,?CRYPTO_KEY_SERVER}, ?MODULE, [], []) of
+	{ok, _} -> ok;
+	{error, {already_started, _}} -> ok
+    end,
     erlang:yield(),
     call_crypto_server(Req).
 
@@ -972,9 +979,7 @@ handle_call({get_crypto_key, What}, From, #state{crypto_key_f=F}=S) ->
 handle_call({crypto_key_fun, F}, {_,_} = From, S) ->
     case S#state.crypto_key_f of
 	undefined ->
-	    %% Don't allow tuple funs here. (They weren't allowed before,
-	    %% so there is no reason to allow them now.)
-	    if is_function(F), is_function(F, 1) ->
+	    if is_function(F, 1) ->
 		    {Result, Fun, Reply} = 
 			case catch F(init) of
 			    ok ->
diff --git a/lib/stdlib/src/binary.erl b/lib/stdlib/src/binary.erl
index af00410572..fb0c395d70 100644
--- a/lib/stdlib/src/binary.erl
+++ b/lib/stdlib/src/binary.erl
@@ -20,7 +20,7 @@
 -module(binary).
 %%
 %% Implemented in this module:
--export([split/2,split/3,replace/3,replace/4]).
+-export([replace/3,replace/4]).
 
 -export_type([cp/0]).
 
@@ -34,7 +34,8 @@
          decode_unsigned/2, encode_unsigned/1, encode_unsigned/2,
          first/1, last/1, list_to_bin/1, longest_common_prefix/1,
          longest_common_suffix/1, match/2, match/3, matches/2,
-         matches/3, part/2, part/3, referenced_byte_size/1]).
+         matches/3, part/2, part/3, referenced_byte_size/1,
+         split/2, split/3]).
 
 -spec at(Subject, Pos) -> byte() when
       Subject :: binary(),
@@ -198,19 +199,13 @@ part(_, _, _) ->
 referenced_byte_size(_) ->
     erlang:nif_error(undef).
 
-%%% End of BIFs.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% split
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 -spec split(Subject, Pattern) -> Parts when
       Subject :: binary(),
       Pattern :: binary() | [binary()] | cp(),
       Parts :: [binary()].
 
-split(H,N) ->
-    split(H,N,[]).
+split(_, _) ->
+    erlang:nif_error(undef).
 
 -spec split(Subject, Pattern, Options) -> Parts when
       Subject :: binary(),
@@ -219,53 +214,10 @@ split(H,N) ->
       Option :: {scope, part()} | trim | global | trim_all,
       Parts :: [binary()].
 
-split(Haystack,Needles,Options) ->
-    try
-	{Part,Global,Trim,TrimAll} =
-        get_opts_split(Options,{no,false,false,false}),
-	Moptlist = case Part of
-		       no ->
-			   [];
-		       {A,B} ->
-			   [{scope,{A,B}}]
-		   end,
-	MList = if
-		    Global ->
-			binary:matches(Haystack,Needles,Moptlist);
-		    true ->
-			case binary:match(Haystack,Needles,Moptlist) of
-			    nomatch -> [];
-			    Match -> [Match]
-			end
-		end,
-	do_split(Haystack,MList,0,Trim,TrimAll)
-    catch
-	_:_ ->
-	    erlang:error(badarg)
-    end.
-
-do_split(H,[],N,true,_) when N >= byte_size(H) ->
-    [];
-do_split(H,[],N,_,true) when N >= byte_size(H) ->
-    [];
-do_split(H,[],N,_,_) ->
-    [binary:part(H,{N,byte_size(H)-N})];
-do_split(H,[{A,B}|T],N,Trim,TrimAll) ->
-    case binary:part(H,{N,A-N}) of
-	<<>> when TrimAll == true ->
-	    do_split(H,T,A+B,Trim,TrimAll);
-	<<>> ->
-	    Rest =  do_split(H,T,A+B,Trim,TrimAll),
-	    case {Trim, Rest} of
-		{true,[]} ->
-		    [];
-		_ ->
-		    [<<>> | Rest]
-	    end;
-	Oth ->
-	    [Oth | do_split(H,T,A+B,Trim,TrimAll)]
-    end.
+split(_, _, _) ->
+    erlang:nif_error(undef).
 
+%%% End of BIFs.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% replace
@@ -352,19 +304,6 @@ splitat(H,N,[I|T]) ->
 %% Simple helper functions
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-get_opts_split([],{Part,Global,Trim,TrimAll}) ->
-    {Part,Global,Trim,TrimAll};
-get_opts_split([{scope,{A,B}} | T],{_Part,Global,Trim,TrimAll}) ->
-    get_opts_split(T,{{A,B},Global,Trim,TrimAll});
-get_opts_split([global | T],{Part,_Global,Trim,TrimAll}) ->
-    get_opts_split(T,{Part,true,Trim,TrimAll});
-get_opts_split([trim | T],{Part,Global,_Trim,TrimAll}) ->
-    get_opts_split(T,{Part,Global,true,TrimAll});
-get_opts_split([trim_all | T],{Part,Global,Trim,_TrimAll}) ->
-    get_opts_split(T,{Part,Global,Trim,true});
-get_opts_split(_,_) ->
-    throw(badopt).
-
 get_opts_replace([],{Part,Global,Insert}) ->
     {Part,Global,Insert};
 get_opts_replace([{scope,{A,B}} | T],{_Part,Global,Insert}) ->
diff --git a/lib/stdlib/src/dets.erl b/lib/stdlib/src/dets.erl
index 6d07f4018a..bf22949870 100644
--- a/lib/stdlib/src/dets.erl
+++ b/lib/stdlib/src/dets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -372,7 +372,7 @@ info(Tab) ->
       Item :: 'access' | 'auto_save' | 'bchunk_format'
             | 'hash' | 'file_size' | 'filename' | 'keypos' | 'memory'
             | 'no_keys' | 'no_objects' | 'no_slots' | 'owner' | 'ram_file'
-            | 'safe_fixed' | 'size' | 'type' | 'version',
+            | 'safe_fixed' | 'safe_fixed_monotonic_time' | 'size' | 'type' | 'version',
       Value :: term().
 
 info(Tab, owner) ->
@@ -1124,7 +1124,9 @@ repl({delayed_write, {Delay,Size} = C}, Defs)
     Defs#open_args{delayed_write = C};
 repl({estimated_no_objects, I}, Defs)  ->
     repl({min_no_slots, I}, Defs);
-repl({file, File}, Defs) ->
+repl({file, File}, Defs) when is_list(File) ->
+    Defs#open_args{file = File};
+repl({file, File}, Defs) when is_atom(File) ->
     Defs#open_args{file = to_list(File)};
 repl({keypos, P}, Defs) when is_integer(P), P > 0 ->
     Defs#open_args{keypos =P};
@@ -1289,7 +1291,15 @@ init(Parent, Server) ->
     open_file_loop(#head{parent = Parent, server = Server}).
 
 open_file_loop(Head) ->
-    open_file_loop(Head, 0).
+    %% The Dets server pretends the file is open before
+    %% internal_open() has been called, which means that unless the
+    %% internal_open message is applied first, other processes can
+    %% find the pid by calling dets_server:get_pid() and do things
+    %% before Head has been initialized properly.
+    receive
+        ?DETS_CALL(From, {internal_open, _Ref, _Args}=Op) ->
+            do_apply_op(Op, From, Head, 0)
+    end.
 
 open_file_loop(Head, N) when element(1, Head#head.update_mode) =:= error ->
     open_file_loop2(Head, N);
@@ -1964,7 +1974,9 @@ do_safe_fixtable(Head, Pid, true) ->
     case Head#head.fixed of 
 	false -> 
 	    link(Pid),
-	    Fixed = {utime_now(), [{Pid, 1}]},
+	    MonTime = erlang:monotonic_time(),
+	    TimeOffset = erlang:time_offset(),
+	    Fixed = {{MonTime, TimeOffset}, [{Pid, 1}]},
 	    Ftab = dets_utils:get_freelists(Head),
 	    Head#head{fixed = Fixed, freelists = {Ftab, Ftab}};
 	{TimeStamp, Counters} ->
@@ -2091,7 +2103,22 @@ finfo(H, no_keys) ->
 finfo(H, no_slots) -> {H, (H#head.mod):no_slots(H)};
 finfo(H, pid) -> {H, self()};
 finfo(H, ram_file) -> {H, H#head.ram_file};
-finfo(H, safe_fixed) -> {H, H#head.fixed};
+finfo(H, safe_fixed) ->
+    {H,
+     case H#head.fixed of
+	 false ->
+	     false;
+	 {{FixMonTime, TimeOffset}, RefList} ->
+	     {make_timestamp(FixMonTime, TimeOffset), RefList}
+     end};
+finfo(H, safe_fixed_monotonic_time) ->
+    {H,
+     case H#head.fixed of
+	 false ->
+	     false;
+	 {{FixMonTime, _TimeOffset}, RefList} ->
+	     {FixMonTime, RefList}
+     end};
 finfo(H, size) -> 
     case catch write_cache(H) of
 	{H2, []} ->
@@ -3275,11 +3302,14 @@ err(Error) ->
 time_now() ->
     erlang:monotonic_time(1000000).
 
--compile({inline, [utime_now/0]}).
-utime_now() ->
-    Time = time_now(),
-    UniqueCounter = erlang:unique_integer([monotonic]),
-    {Time, UniqueCounter}.
+make_timestamp(MonTime, TimeOffset) ->
+    ErlangSystemTime = erlang:convert_time_unit(MonTime+TimeOffset,
+						native,
+						micro_seconds),
+    MegaSecs = ErlangSystemTime div 1000000000000,
+    Secs = ErlangSystemTime div 1000000 - MegaSecs*1000000,
+    MicroSecs = ErlangSystemTime rem 1000000,
+    {MegaSecs, Secs, MicroSecs}.
 
 %%%%%%%%%%%%%%%%%  DEBUG functions %%%%%%%%%%%%%%%%
 
diff --git a/lib/stdlib/src/dets_utils.erl b/lib/stdlib/src/dets_utils.erl
index 196158cd48..34a8ddddaa 100644
--- a/lib/stdlib/src/dets_utils.erl
+++ b/lib/stdlib/src/dets_utils.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2001-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.
@@ -747,6 +747,8 @@ all_allocated([{X,Y} | L], _X0, Y0, A) when Y0 < X ->
 all_allocated_as_list(Head) ->
     all_allocated_as_list(all(get_freelists(Head)), 0, Head#head.base, []).
 
+-dialyzer({no_improper_lists, all_allocated_as_list/4}).
+
 all_allocated_as_list([], _X0, _Y0, []) ->
     [];
 all_allocated_as_list([], _X0, _Y0, A) ->
diff --git a/lib/stdlib/src/dets_v8.erl b/lib/stdlib/src/dets_v8.erl
index 49126193b8..1bf53d91b1 100644
--- a/lib/stdlib/src/dets_v8.erl
+++ b/lib/stdlib/src/dets_v8.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2001-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.
@@ -36,6 +36,8 @@
 %% For backward compatibility.
 -export([sz2pos/1]).
 
+-dialyzer(no_improper_lists).
+
 -compile({inline, [{sz2pos,1},{scan_skip,7}]}).
 -compile({inline, [{skip_bytes,5}, {get_segp,1}]}).
 -compile({inline, [{wl_lookup,5}]}).
diff --git a/lib/stdlib/src/dets_v9.erl b/lib/stdlib/src/dets_v9.erl
index 361780c776..6c406fc03a 100644
--- a/lib/stdlib/src/dets_v9.erl
+++ b/lib/stdlib/src/dets_v9.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2001-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.
@@ -34,6 +34,8 @@
 
 -export([cache_segps/3]).
 
+-dialyzer(no_improper_lists).
+
 -compile({inline, [{max_objsize,1},{maxobjsize,1}]}).
 -compile({inline, [{write_segment_file,6}]}). 
 -compile({inline, [{sz2pos,1},{adjsz,1}]}).
diff --git a/lib/stdlib/src/dict.erl b/lib/stdlib/src/dict.erl
index 6ce3710f87..f921e28ef6 100644
--- a/lib/stdlib/src/dict.erl
+++ b/lib/stdlib/src/dict.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2000-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.
@@ -333,6 +333,8 @@ update_counter(Key, Incr, D0) when is_number(Incr) ->
 			D0, Slot),
     maybe_expand(D1, Ic).
 
+-dialyzer({no_improper_lists, counter_bkt/3}).
+
 counter_bkt(Key, I, [?kv(Key,Val)|Bkt]) ->
     {[?kv(Key,Val+I)|Bkt],0};
 counter_bkt(Key, I, [Other|Bkt0]) ->
diff --git a/lib/stdlib/src/digraph.erl b/lib/stdlib/src/digraph.erl
index e51e560542..8a4df95027 100644
--- a/lib/stdlib/src/digraph.erl
+++ b/lib/stdlib/src/digraph.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -338,6 +338,8 @@ edge(G, E) ->
 %%
 -spec new_edge_id(graph()) -> edge().
 
+-dialyzer({no_improper_lists, new_edge_id/1}).
+
 new_edge_id(G) ->
     NT = G#digraph.ntab,
     [{'$eid', K}] = ets:lookup(NT, '$eid'),
@@ -350,6 +352,8 @@ new_edge_id(G) ->
 %%
 -spec new_vertex_id(graph()) -> vertex().
 
+-dialyzer({no_improper_lists, new_vertex_id/1}).
+
 new_vertex_id(G) ->
     NT = G#digraph.ntab,
     [{'$vid', K}] = ets:lookup(NT, '$vid'),
diff --git a/lib/stdlib/src/edlin.erl b/lib/stdlib/src/edlin.erl
index 19444c0502..0e9c457de2 100644
--- a/lib/stdlib/src/edlin.erl
+++ b/lib/stdlib/src/edlin.erl
@@ -465,7 +465,6 @@ word_char(C) when C >= $a, C =< $z -> true;
 word_char(C) when C >= $ß, C =< $ÿ, C =/= $÷ -> true;
 word_char(C) when C >= $0, C =< $9 -> true;
 word_char(C) when C =:= $_ -> true;
-word_char(C) when C =:= $. -> true;    % accept dot-separated names
 word_char(_) -> false.
 
 %% over_white(Chars, InitialStack, InitialCount) ->
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index d3124ac593..936c095aef 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -40,16 +40,21 @@
 
 -type ifdef() :: 'ifdef' | 'ifndef' | 'else'.
 
--type name() :: {'atom', atom()}.
+-type name() :: atom().
 -type argspec() :: 'none'                       %No arguments
                  | non_neg_integer().           %Number of arguments
 -type tokens() :: [erl_scan:token()].
 -type used() :: {name(), argspec()}.
 
+-type function_name_type() :: 'undefined'
+			    | {atom(),non_neg_integer()}
+			    | tokens().
+
 -define(DEFAULT_ENCODING, utf8).
 
 %% Epp state record.
--record(epp, {file :: file:io_device(),         %Current file
+-record(epp, {file :: file:io_device()
+                    | 'undefined',              %Current file
 	      location=1,         		%Current location
               delta=0 :: non_neg_integer(),     %Offset from Location (-file)
               name="" :: file:name(),           %Current file name
@@ -57,21 +62,15 @@
               istk=[] :: [ifdef()],             %Ifdef stack
               sstk=[] :: [#epp{}],              %State stack
               path=[] :: [file:name()],         %Include-path
-              macs = dict:new()                 %Macros (don't care locations)
-                  :: dict:dict(name(), {argspec(), tokens()}),
-              uses = dict:new()                 %Macro use structure
-                  :: dict:dict(name(), [{argspec(), [used()]}]),
+              macs = #{}		        %Macros (don't care locations)
+	            :: #{name() => {argspec(), tokens()}},
+              uses = #{}			%Macro use structure
+	            :: #{name() => [{argspec(), [used()]}]},
               default_encoding = ?DEFAULT_ENCODING :: source_encoding(),
-	      pre_opened = false :: boolean()
+	      pre_opened = false :: boolean(),
+	      fname = [] :: function_name_type()
 	     }).
 
-%%% Note on representation: as tokens, both {var, Location, Name} and
-%%% {atom, Location, Name} can occur as macro identifiers. However, keeping
-%%% this distinction here is done for historical reasons only: previously,
-%%% ?FOO and ?'FOO' were not the same, but now they are. Removing the
-%%% distinction in the internal representation would simplify the code
-%%% a little.
-
 %% open(Options)
 %% open(FileName, IncludePath)
 %% open(FileName, IncludePath, PreDefMacros)
@@ -211,6 +210,10 @@ format_error({include,W,F}) ->
     io_lib:format("can't find include ~s \"~s\"", [W,F]);
 format_error({illegal,How,What}) ->
     io_lib:format("~s '-~s'", [How,What]);
+format_error({illegal_function,Macro}) ->
+    io_lib:format("?~s can only be used within a function", [Macro]);
+format_error({illegal_function_usage,Macro}) ->
+    io_lib:format("?~s must not begin a form", [Macro]);
 format_error({'NYI',What}) ->
     io_lib:format("not yet implemented '~s'", [What]);
 format_error(E) -> file:format_error(E).
@@ -264,20 +267,7 @@ parse_file(Ifile, Options) ->
 parse_file(Epp) ->
     case parse_erl_form(Epp) of
 	{ok,Form} ->
-	    case Form of
-		{attribute,La,record,{Record, Fields}} ->
-		    case normalize_typed_record_fields(Fields) of
-			{typed, NewFields} ->
-			    [{attribute, La, record, {Record, NewFields}},
-			     {attribute, La, type,
-			      {{record, Record}, Fields, []}}
-			     |parse_file(Epp)];
-			not_typed ->
-			    [Form|parse_file(Epp)]
-		    end;
-		_ ->
-		    [Form|parse_file(Epp)]
-	    end;
+            [Form|parse_file(Epp)];
 	{error,E} ->
 	    [{error,E}|parse_file(Epp)];
 	{eof,Location} ->
@@ -549,7 +539,8 @@ init_server(Pid, Name, Options, St0) ->
 			 default_encoding=DefEncoding},
             From = wait_request(St),
             Anno = erl_anno:new(AtLocation),
-            enter_file_reply(From, Name, Anno, AtLocation, code),
+            enter_file_reply(From, file_name(Name), Anno,
+			     AtLocation, code),
             wait_req_scan(St);
 	{error,E} ->
 	    epp_reply(Pid, {error,E})
@@ -560,18 +551,20 @@ init_server(Pid, Name, Options, St0) ->
 %%  FILE, LINE, MODULE as undefined, MACHINE and MACHINE value.
 
 predef_macros(File) ->
-     Machine = list_to_atom(erlang:system_info(machine)),
-     Anno = line1(),
-     dict:from_list([
-	{{atom,'FILE'}, 	      {none,[{string,Anno,File}]}},
-	{{atom,'LINE'},		      {none,[{integer,Anno,1}]}},
-	{{atom,'MODULE'},	      undefined},
-	{{atom,'MODULE_STRING'},      undefined},
-	{{atom,'BASE_MODULE'},	      undefined},
-	{{atom,'BASE_MODULE_STRING'}, undefined},
-	{{atom,'MACHINE'},	      {none,[{atom,Anno,Machine}]}},
-	{{atom,Machine},	      {none,[{atom,Anno,true}]}}
-     ]).
+    Machine = list_to_atom(erlang:system_info(machine)),
+    Anno = line1(),
+    Defs = [{'FILE', 	           {none,[{string,Anno,File}]}},
+	    {'FUNCTION_NAME',      undefined},
+	    {'FUNCTION_ARITY',     undefined},
+	    {'LINE',		   {none,[{integer,Anno,1}]}},
+	    {'MODULE',	           undefined},
+	    {'MODULE_STRING',      undefined},
+	    {'BASE_MODULE',	   undefined},
+	    {'BASE_MODULE_STRING', undefined},
+	    {'MACHINE',	           {none,[{atom,Anno,Machine}]}},
+	    {Machine,	           {none,[{atom,Anno,true}]}}
+	   ],
+    maps:from_list(Defs).
 
 %% user_predef(PreDefMacros, Macros) ->
 %%	{ok,MacroDict} | {error,E}
@@ -580,28 +573,21 @@ predef_macros(File) ->
 
 user_predef([{M,Val,redefine}|Pdm], Ms) when is_atom(M) ->
     Exp = erl_parse:tokens(erl_parse:abstract(Val)),
-    user_predef(Pdm, dict:store({atom,M}, {none,Exp}, Ms));
+    user_predef(Pdm, Ms#{M=>{none,Exp}});
 user_predef([{M,Val}|Pdm], Ms) when is_atom(M) ->
-    case dict:find({atom,M}, Ms) of
-	{ok,_Defs} when is_list(_Defs) -> %% User defined macros
+    case Ms of
+	#{M:=Defs} when is_list(Defs) ->
+	     %% User defined macros.
 	    {error,{redefine,M}};
-	{ok,_Def} -> %% Predefined macros
+	#{M:=_Defs} ->
+	    %% Predefined macros.
 	    {error,{redefine_predef,M}};
-	error ->
+	_ ->
 	    Exp = erl_parse:tokens(erl_parse:abstract(Val)),
-	    user_predef(Pdm, dict:store({atom,M}, [{none, {none,Exp}}], Ms))
+	    user_predef(Pdm, Ms#{M=>[{none,{none,Exp}}]})
     end;
 user_predef([M|Pdm], Ms) when is_atom(M) ->
-    case dict:find({atom,M}, Ms) of
-	{ok,_Defs} when is_list(_Defs) -> %% User defined macros
-	    {error,{redefine,M}};
-	{ok,_Def} -> %% Predefined macros
-	    {error,{redefine_predef,M}};
-	error ->
-            A = line1(),
-	    user_predef(Pdm,
-	                dict:store({atom,M}, [{none, {none,[{atom,A,true}]}}], Ms))
-    end;
+    user_predef([{M,true}|Pdm], Ms);
 user_predef([Md|_Pdm], _Ms) -> {error,{bad,Md}};
 user_predef([], Ms) -> {ok,Ms}.
 
@@ -615,7 +601,9 @@ wait_request(St) ->
     receive
 	{epp_request,From,scan_erl_form} -> From;
 	{epp_request,From,macro_defs} ->
-	    epp_reply(From, dict:to_list(St#epp.macs)),
+	    %% Return the old format to avoid any incompability issues.
+	    Defs = [{{atom,K},V} || {K,V} <- maps:to_list(St#epp.macs)],
+	    epp_reply(From, Defs),
 	    wait_request(St);
 	{epp_request,From,close} ->
 	    close_file(St),
@@ -667,7 +655,8 @@ enter_file(NewName, Inc, From, St) ->
 enter_file2(NewF, Pname, From, St0, AtLocation) ->
     Anno = erl_anno:new(AtLocation),
     enter_file_reply(From, Pname, Anno, AtLocation, code),
-    Ms = dict:store({atom,'FILE'}, {none,[{string,Anno,Pname}]}, St0#epp.macs),
+    Ms0 = St0#epp.macs,
+    Ms = Ms0#{'FILE':={none,[{string,Anno,Pname}]}},
     %% update the head of the include path to be the directory of the new
     %% source file, so that an included file can always include other files
     %% relative to its current location (this is also how C does it); note
@@ -688,7 +677,7 @@ enter_file_reply(From, Name, LocationAnno, AtLocation, Where) ->
                generated -> erl_anno:set_generated(true, Anno0)
            end,
     Rep = {ok, [{'-',Anno},{atom,Anno,file},{'(',Anno},
-		{string,Anno,file_name(Name)},{',',Anno},
+		{string,Anno,Name},{',',Anno},
 		{integer,Anno,get_line(LocationAnno)},{')',LocationAnno},
                 {dot,Anno}]},
     epp_reply(From, Rep).
@@ -719,9 +708,8 @@ leave_file(From, St) ->
                          name2=OldName2} = OldSt,
                     CurrLoc = add_line(OldLoc, Delta),
                     Anno = erl_anno:new(CurrLoc),
-		    Ms = dict:store({atom,'FILE'},
-				    {none,[{string,Anno,OldName2}]},
-				    St#epp.macs),
+		    Ms0 = St#epp.macs,
+		    Ms = Ms0#{'FILE':={none,[{string,Anno,OldName2}]}},
                     NextSt = OldSt#epp{sstk=Sts,macs=Ms,uses=St#epp.uses},
 		    enter_file_reply(From, OldName, Anno, CurrLoc, code),
                     case OldName2 =:= OldName of
@@ -778,7 +766,7 @@ scan_toks([{'-',_Lh},{atom,_Le,elif}=Elif|Toks], From, St) ->
 scan_toks([{'-',_Lh},{atom,_Le,endif}=Endif|Toks], From, St) ->
     scan_endif(Toks, Endif, From, St);
 scan_toks([{'-',_Lh},{atom,_Lf,file}=FileToken|Toks0], From, St) ->
-    case catch expand_macros(Toks0, {St#epp.macs, St#epp.uses}) of
+    case catch expand_macros(Toks0, St) of
 	Toks1 when is_list(Toks1) ->
             scan_file(Toks1, FileToken, From, St);
 	{error,ErrL,What} ->
@@ -786,7 +774,7 @@ scan_toks([{'-',_Lh},{atom,_Lf,file}=FileToken|Toks0], From, St) ->
 	    wait_req_scan(St)
     end;
 scan_toks(Toks0, From, St) ->
-    case catch expand_macros(Toks0, {St#epp.macs, St#epp.uses}) of
+    case catch expand_macros(Toks0, St#epp{fname=Toks0}) of
 	Toks1 when is_list(Toks1) ->
 	    epp_reply(From, {ok,Toks1}),
 	    wait_req_scan(St#epp{macs=scan_module(Toks1, St#epp.macs)});
@@ -796,91 +784,48 @@ scan_toks(Toks0, From, St) ->
     end.
 
 scan_module([{'-',_Lh},{atom,_Lm,module},{'(',_Ll}|Ts], Ms) ->
-    scan_module_1(Ts, [], Ms);
+    scan_module_1(Ts, Ms);
 scan_module([{'-',_Lh},{atom,_Lm,extends},{'(',_Ll}|Ts], Ms) ->
-    scan_extends(Ts, [], Ms);
+    scan_extends(Ts, Ms);
 scan_module(_Ts, Ms) -> Ms.
 
-scan_module_1([{atom,_,_}=A,{',',L}|Ts], As, Ms) ->
+scan_module_1([{atom,_,_}=A,{',',L}|Ts], Ms) ->
     %% Parameterized modules.
-    scan_module_1([A,{')',L}|Ts], As, Ms);
-scan_module_1([{atom,Ln,A},{')',_Lr}|_Ts], As, Ms0) ->
-    Mod = lists:concat(lists:reverse([A|As])),
-    Ms = dict:store({atom,'MODULE'},
-		     {none,[{atom,Ln,list_to_atom(Mod)}]}, Ms0),
-    dict:store({atom,'MODULE_STRING'}, {none,[{string,Ln,Mod}]}, Ms);
-scan_module_1([{atom,_Ln,A},{'.',_Lr}|Ts], As, Ms) ->
-    scan_module_1(Ts, [".",A|As], Ms);
-scan_module_1([{'.',_Lr}|Ts], As, Ms) ->
-    scan_module_1(Ts, As, Ms);
-scan_module_1(_Ts, _As, Ms) -> Ms.
-
-scan_extends([{atom,Ln,A},{')',_Lr}|_Ts], As, Ms0) ->
-    Mod = lists:concat(lists:reverse([A|As])),
-    Ms = dict:store({atom,'BASE_MODULE'},
-		     {none,[{atom,Ln,list_to_atom(Mod)}]}, Ms0),
-    dict:store({atom,'BASE_MODULE_STRING'}, {none,[{string,Ln,Mod}]}, Ms);
-scan_extends([{atom,_Ln,A},{'.',_Lr}|Ts], As, Ms) ->
-    scan_extends(Ts, [".",A|As], Ms);
-scan_extends([{'.',_Lr}|Ts], As, Ms) ->
-    scan_extends(Ts, As, Ms);
-scan_extends(_Ts, _As, Ms) -> Ms.
+    scan_module_1([A,{')',L}|Ts], Ms);
+scan_module_1([{atom,Ln,A}=ModAtom,{')',_Lr}|_Ts], Ms0) ->
+    ModString = atom_to_list(A),
+    Ms = Ms0#{'MODULE':={none,[ModAtom]}},
+    Ms#{'MODULE_STRING':={none,[{string,Ln,ModString}]}};
+scan_module_1(_Ts, Ms) -> Ms.
+
+scan_extends([{atom,Ln,A}=ModAtom,{')',_Lr}|_Ts], Ms0) ->
+    ModString = atom_to_list(A),
+    Ms = Ms0#{'BASE_MODULE':={none,[ModAtom]}},
+    Ms#{'BASE_MODULE_STRING':={none,[{string,Ln,ModString}]}};
+scan_extends(_Ts, Ms) -> Ms.
 
 %% scan_define(Tokens, DefineToken, From, EppState)
 
-scan_define([{'(',_Lp},{Type,_Lm,M}=Mac,{',',_}=Comma|Toks], _Def, From, St)
+scan_define([{'(',_Lp},{Type,_Lm,_}=Mac|Toks], Def, From, St)
   when Type =:= atom; Type =:= var ->
+    scan_define_1(Toks, Mac, Def, From, St);
+scan_define(_Toks, Def, From, St) ->
+    epp_reply(From, {error,{loc(Def),epp,{bad,define}}}),
+    wait_req_scan(St).
+
+scan_define_1([{',',_}=Comma|Toks], Mac,_Def, From, St) ->
     case catch macro_expansion(Toks, Comma) of
         Expansion when is_list(Expansion) ->
-            case dict:find({atom,M}, St#epp.macs) of
-                {ok, Defs} when is_list(Defs) ->
-                    %% User defined macros: can be overloaded
-                    case proplists:is_defined(none, Defs) of
-                        true ->
-                            epp_reply(From, {error,{loc(Mac),epp,{redefine,M}}}),
-                            wait_req_scan(St);
-                        false ->
-                            scan_define_cont(From, St,
-                                             {atom, M},
-                                             {none, {none,Expansion}})
-                    end;
-                {ok, _PreDef} ->
-                    %% Predefined macros: cannot be overloaded
-                    epp_reply(From, {error,{loc(Mac),epp,{redefine_predef,M}}}),
-                    wait_req_scan(St);
-                error ->
-                    scan_define_cont(From, St,
-                                     {atom, M},
-                                     {none, {none,Expansion}})
-            end;
+	    scan_define_2(none, {none,Expansion}, Mac, From, St);
         {error,ErrL,What} ->
             epp_reply(From, {error,{ErrL,epp,What}}),
             wait_req_scan(St)
     end;
-scan_define([{'(',_Lp},{Type,_Lm,M}=Mac,{'(',_Lc}|Toks], Def, From, St)
-  when Type =:= atom; Type =:= var ->
+scan_define_1([{'(',_Lc}|Toks], Mac, Def, From, St) ->
     case catch macro_pars(Toks, []) of
-        {ok, {As,Me}} ->
+        {ok,{As,_}=MacroDef} ->
             Len = length(As),
-            case dict:find({atom,M}, St#epp.macs) of
-                {ok, Defs} when is_list(Defs) ->
-                    %% User defined macros: can be overloaded
-                    case proplists:is_defined(Len, Defs) of
-                        true ->
-                            epp_reply(From,{error,{loc(Mac),epp,{redefine,M}}}),
-                            wait_req_scan(St);
-                        false ->
-                            scan_define_cont(From, St, {atom, M},
-                                             {Len, {As, Me}})
-                    end;
-                {ok, _PreDef} ->
-                    %% Predefined macros: cannot be overloaded
-                    %% (There are currently no predefined F(...) macros.)
-                    epp_reply(From, {error,{loc(Mac),epp,{redefine_predef,M}}}),
-                    wait_req_scan(St);
-                error ->
-                    scan_define_cont(From, St, {atom, M}, {Len, {As, Me}})
-            end;
+	    scan_define_2(Len, MacroDef, Mac, From, St);
 	{error,ErrL,What} ->
             epp_reply(From, {error,{ErrL,epp,What}}),
             wait_req_scan(St);
@@ -888,10 +833,29 @@ scan_define([{'(',_Lp},{Type,_Lm,M}=Mac,{'(',_Lc}|Toks], Def, From, St)
             epp_reply(From, {error,{loc(Def),epp,{bad,define}}}),
             wait_req_scan(St)
     end;
-scan_define(_Toks, Def, From, St) ->
+scan_define_1(_Toks, _Mac, Def, From, St) ->
     epp_reply(From, {error,{loc(Def),epp,{bad,define}}}),
     wait_req_scan(St).
 
+scan_define_2(Arity, Def, {_,_,Key}=Mac, From, #epp{macs=Ms}=St) ->
+    case Ms of
+	#{Key:=Defs} when is_list(Defs) ->
+	    %% User defined macros: can be overloaded
+	    case proplists:is_defined(Arity, Defs) of
+		true ->
+		    epp_reply(From, {error,{loc(Mac),epp,{redefine,Key}}}),
+		    wait_req_scan(St);
+		false ->
+		    scan_define_cont(From, St, Key, Defs, Arity, Def)
+	    end;
+	#{Key:=_} ->
+	    %% Predefined macros: cannot be overloaded
+	    epp_reply(From, {error,{loc(Mac),epp,{redefine_predef,Key}}}),
+	    wait_req_scan(St);
+	_ ->
+	    scan_define_cont(From, St, Key, [], Arity, Def)
+    end.
+
 %%% Detection of circular macro expansions (which would either keep
 %%% the compiler looping forever, or run out of memory):
 %%% When a macro is defined, we store the names of other macros it
@@ -901,11 +865,17 @@ scan_define(_Toks, Def, From, St) ->
 %%% the information from St#epp.uses is traversed, and if a circularity
 %%% is detected, an error message is thrown.
 
-scan_define_cont(F, St, M, {Arity, Def}) ->
-    Ms = dict:append_list(M, [{Arity, Def}], St#epp.macs),
-    try dict:append_list(M, [{Arity, macro_uses(Def)}], St#epp.uses) of
+scan_define_cont(F, #epp{macs=Ms0}=St, M, Defs, Arity, Def) ->
+    Ms = Ms0#{M=>[{Arity,Def}|Defs]},
+    try macro_uses(Def) of
         U ->
-            scan_toks(F, St#epp{uses=U, macs=Ms})
+	    Uses0 = St#epp.uses,
+	    Val = [{Arity,U}|case Uses0 of
+				 #{M:=UseList} -> UseList;
+				 _ -> []
+			     end],
+	    Uses = Uses0#{M=>Val},
+            scan_toks(F, St#epp{uses=Uses,macs=Ms})
     catch
         {error, Line, Reason} ->
             epp_reply(F, {error,{Line,epp,Reason}}),
@@ -923,23 +893,23 @@ macro_ref([{'?', _}, {'?', _} | Rest]) ->
 macro_ref([{'?', _}, {atom, _, A}=Atom | Rest]) ->
     Lm = loc(Atom),
     Arity = count_args(Rest, Lm, A),
-    [{{atom, A}, Arity} | macro_ref(Rest)];
+    [{A,Arity} | macro_ref(Rest)];
 macro_ref([{'?', _}, {var, _, A}=Var | Rest]) ->
     Lm = loc(Var),
     Arity = count_args(Rest, Lm, A),
-    [{{atom, A}, Arity} | macro_ref(Rest)];
+    [{A,Arity} | macro_ref(Rest)];
 macro_ref([_Token | Rest]) ->
     macro_ref(Rest).
 
 %% scan_undef(Tokens, UndefToken, From, EppState)
 
 scan_undef([{'(',_Llp},{atom,_Lm,M},{')',_Lrp},{dot,_Ld}], _Undef, From, St) ->
-    Macs = dict:erase({atom,M}, St#epp.macs),
-    Uses = dict:erase({atom,M}, St#epp.uses),
+    Macs = maps:remove(M, St#epp.macs),
+    Uses = maps:remove(M, St#epp.uses),
     scan_toks(From, St#epp{macs=Macs, uses=Uses});
 scan_undef([{'(',_Llp},{var,_Lm,M},{')',_Lrp},{dot,_Ld}], _Undef, From,St) ->
-    Macs = dict:erase({atom,M}, St#epp.macs),
-    Uses = dict:erase({atom,M}, St#epp.uses),
+    Macs = maps:remove(M, St#epp.macs),
+    Uses = maps:remove(M, St#epp.uses),
     scan_toks(From, St#epp{macs=Macs, uses=Uses});
 scan_undef(_Toks, Undef, From, St) ->
     epp_reply(From, {error,{loc(Undef),epp,{bad,undef}}}),
@@ -1006,17 +976,17 @@ scan_include_lib(_Toks, Inc, From, St) ->
 %%  Report a badly formed if[n]def test and then treat as undefined macro.
 
 scan_ifdef([{'(',_Llp},{atom,_Lm,M},{')',_Lrp},{dot,_Ld}], _IfD, From, St) ->
-    case dict:find({atom,M}, St#epp.macs) of
-	{ok,_Def} ->
+    case St#epp.macs of
+	#{M:=_Def} ->
 	    scan_toks(From, St#epp{istk=[ifdef|St#epp.istk]});
-	error ->
+	_ ->
 	    skip_toks(From, St, [ifdef])
     end;
 scan_ifdef([{'(',_Llp},{var,_Lm,M},{')',_Lrp},{dot,_Ld}], _IfD, From, St) ->
-    case dict:find({atom,M}, St#epp.macs) of
-	{ok,_Def} ->
+    case St#epp.macs of
+	#{M:=_Def} ->
 	    scan_toks(From, St#epp{istk=[ifdef|St#epp.istk]});
-	error ->
+	_ ->
 	    skip_toks(From, St, [ifdef])
     end;
 scan_ifdef(_Toks, IfDef, From, St) ->
@@ -1024,17 +994,17 @@ scan_ifdef(_Toks, IfDef, From, St) ->
     wait_req_skip(St, [ifdef]).
 
 scan_ifndef([{'(',_Llp},{atom,_Lm,M},{')',_Lrp},{dot,_Ld}], _IfnD, From, St) ->
-    case dict:find({atom,M}, St#epp.macs) of
-	{ok,_Def} ->
+    case St#epp.macs of
+	#{M:=_Def} ->
 	    skip_toks(From, St, [ifndef]);
-	error ->
+	_ ->
 	    scan_toks(From, St#epp{istk=[ifndef|St#epp.istk]})
     end;
 scan_ifndef([{'(',_Llp},{var,_Lm,M},{')',_Lrp},{dot,_Ld}], _IfnD, From, St) ->
-    case dict:find({atom,M}, St#epp.macs) of
-	{ok,_Def} ->
+    case St#epp.macs of
+	#{M:=_Def} ->
 	    skip_toks(From, St, [ifndef]);
-	error ->
+	_ ->
 	    scan_toks(From, St#epp{istk=[ifndef|St#epp.istk]})
     end;
 scan_ifndef(_Toks, IfnDef, From, St) ->
@@ -1102,7 +1072,8 @@ scan_file([{'(',_Llp},{string,_Ls,Name},{',',_Lc},{integer,_Li,Ln},{')',_Lrp},
            {dot,_Ld}], Tf, From, St) ->
     Anno = erl_anno:new(Ln),
     enter_file_reply(From, Name, Anno, loc(Tf), generated),
-    Ms = dict:store({atom,'FILE'}, {none,[{string,line1(),Name}]}, St#epp.macs),
+    Ms0 = St#epp.macs,
+    Ms = Ms0#{'FILE':={none,[{string,line1(),Name}]}},
     Locf = loc(Tf),
     NewLoc = new_location(Ln, St#epp.location, Locf),
     Delta = get_line(element(2, Tf))-Ln + St#epp.delta,
@@ -1185,45 +1156,47 @@ macro_expansion([T|Ts], _Anno0) ->
     [T|macro_expansion(Ts, T)];
 macro_expansion([], Anno0) -> throw({error,loc(Anno0),premature_end}).
 
-%% expand_macros(Tokens, Macros)
+%% expand_macros(Tokens, St)
 %% expand_macro(Tokens, MacroToken, RestTokens)
 %%  Expand the macros in a list of tokens, making sure that an expansion
 %%  gets the same location as the macro call.
 
-expand_macros(Type, MacT, M, Toks, Ms0) ->
-    %% (Type will always be 'atom')
-    {Ms, U} = Ms0,
+expand_macros(MacT, M, Toks, St) ->
+    #epp{macs=Ms,uses=U} = St,
     Lm = loc(MacT),
     Tinfo = element(2, MacT),
-    case expand_macro1(Type, Lm, M, Toks, Ms) of
+    case expand_macro1(Lm, M, Toks, Ms) of
 	{ok,{none,Exp}} ->
-	    check_uses([{{Type,M}, none}], [], U, Lm),
-	    Toks1 = expand_macros(expand_macro(Exp, Tinfo, [], dict:new()), Ms0),
-	    expand_macros(Toks1++Toks, Ms0);
+	    check_uses([{M,none}], [], U, Lm),
+	    Toks1 = expand_macros(expand_macro(Exp, Tinfo, [], #{}), St),
+	    expand_macros(Toks1++Toks, St);
 	{ok,{As,Exp}} ->
-	    check_uses([{{Type,M}, length(As)}], [], U, Lm),
-	    {Bs,Toks1} = bind_args(Toks, Lm, M, As, dict:new()),
-	    expand_macros(expand_macro(Exp, Tinfo, Toks1, Bs), Ms0)
+	    check_uses([{M,length(As)}], [], U, Lm),
+	    {Bs,Toks1} = bind_args(Toks, Lm, M, As, #{}),
+	    expand_macros(expand_macro(Exp, Tinfo, Toks1, Bs), St)
     end.
 
-expand_macro1(Type, Lm, M, Toks, Ms) ->
+expand_macro1(Lm, M, Toks, Ms) ->
     Arity = count_args(Toks, Lm, M),
-    case dict:find({Type,M}, Ms) of
-        error -> %% macro not found
+    case Ms of
+	#{M:=undefined} ->
+	    %% Predefined macro without definition.
             throw({error,Lm,{undefined,M,Arity}});
-        {ok, undefined} -> %% Predefined macro without definition
-            throw({error,Lm,{undefined,M,Arity}});
-        {ok, [{none, Def}]} ->
-            {ok, Def};
-        {ok, Defs} when is_list(Defs) ->
-            case proplists:get_value(Arity, Defs) of
+	#{M:=[{none,Def}]} ->
+            {ok,Def};
+	#{M:=Defs} when is_list(Defs) ->
+	    case proplists:get_value(Arity, Defs) of
                 undefined ->
                     throw({error,Lm,{mismatch,M}});
                 Def ->
-                    {ok, Def}
+                    {ok,Def}
             end;
-        {ok, PreDef} -> %% Predefined macro
-            {ok, PreDef}
+        #{M:=PreDef} ->
+	    %% Predefined macro.
+            {ok,PreDef};
+        _ ->
+	    %% Macro not found.
+            throw({error,Lm,{undefined,M,Arity}})
     end.
 
 check_uses([], _Anc, _U, _Lm) ->
@@ -1231,7 +1204,7 @@ check_uses([], _Anc, _U, _Lm) ->
 check_uses([M|Rest], Anc, U, Lm) ->
     case lists:member(M, Anc) of
 	true ->
-	    {{_, Name},Arity} = M,
+	    {Name,Arity} = M,
 	    throw({error,Lm,{circular,Name,Arity}});
 	false ->
 	    L = get_macro_uses(M, U),
@@ -1240,25 +1213,41 @@ check_uses([M|Rest], Anc, U, Lm) ->
     end.
 
 get_macro_uses({M,Arity}, U) ->
-    case dict:find(M, U) of
-	error ->
-	    [];
-	{ok, L} ->
-	    proplists:get_value(Arity, L, proplists:get_value(none, L, []))
+    case U of
+	#{M:=L} ->
+	    proplists:get_value(Arity, L, proplists:get_value(none, L, []));
+	_ ->
+	    []
     end.
 
 %% Macro expansion
 %% Note: io:scan_erl_form() does not return comments or white spaces.
-expand_macros([{'?',_Lq},{atom,_Lm,M}=MacT|Toks], Ms) ->
-    expand_macros(atom, MacT, M, Toks, Ms);
+expand_macros([{'?',_Lq},{atom,_Lm,M}=MacT|Toks], St) ->
+    expand_macros(MacT, M, Toks, St);
 %% Special macros
-expand_macros([{'?',_Lq},{var,Lm,'LINE'}=Tok|Toks], Ms) ->
+expand_macros([{'?',_Lq},{var,Lm,'FUNCTION_NAME'}=Token|Toks], St0) ->
+    St = update_fun_name(Token, St0),
+    case St#epp.fname of
+	undefined ->
+	    [{'?',_Lq},Token];
+	{Name,_} ->
+	    [{atom,Lm,Name}]
+    end ++ expand_macros(Toks, St);
+expand_macros([{'?',_Lq},{var,Lm,'FUNCTION_ARITY'}=Token|Toks], St0) ->
+    St = update_fun_name(Token, St0),
+    case St#epp.fname of
+	undefined ->
+	    [{'?',_Lq},Token];
+	{_,Arity} ->
+	    [{integer,Lm,Arity}]
+    end ++ expand_macros(Toks, St);
+expand_macros([{'?',_Lq},{var,Lm,'LINE'}=Tok|Toks], St) ->
     Line = erl_scan:line(Tok),
-    [{integer,Lm,Line}|expand_macros(Toks, Ms)];
-expand_macros([{'?',_Lq},{var,_Lm,M}=MacT|Toks], Ms) ->
-    expand_macros(atom, MacT, M, Toks, Ms);
+    [{integer,Lm,Line}|expand_macros(Toks, St)];
+expand_macros([{'?',_Lq},{var,_Lm,M}=MacT|Toks], St) ->
+    expand_macros(MacT, M, Toks, St);
 %% Illegal macros
-expand_macros([{'?',_Lq},Token|_Toks], _Ms) ->
+expand_macros([{'?',_Lq},Token|_Toks], _St) ->
     T = case erl_scan:text(Token) of
             Text when is_list(Text) ->
                 Text;
@@ -1267,9 +1256,9 @@ expand_macros([{'?',_Lq},Token|_Toks], _Ms) ->
                 io_lib:write(Symbol)
         end,
     throw({error,loc(Token),{call,[$?|T]}});
-expand_macros([T|Ts], Ms) ->
-    [T|expand_macros(Ts, Ms)];
-expand_macros([], _Ms) -> [].
+expand_macros([T|Ts], St) ->
+    [T|expand_macros(Ts, St)];
+expand_macros([], _St) -> [].
 
 %% bind_args(Tokens, MacroLocation, MacroName, ArgumentVars, Bindings)
 %%  Collect the arguments to a macro call.
@@ -1295,7 +1284,7 @@ macro_args(_Toks, Lm, M, _As, _Bs) ->
 store_arg(L, M, _A, [], _Bs) ->
     throw({error,L,{mismatch,M}});
 store_arg(_L, _M, A, Arg, Bs) ->
-    dict:store(A, Arg, Bs).
+    Bs#{A=>Arg}.
 
 %% count_args(Tokens, MacroLine, MacroName)
 %%  Count the number of arguments in a macro call.
@@ -1368,19 +1357,17 @@ macro_arg([], _E, Arg) ->
 %%  and then the macro arguments, i.e. simulate textual expansion.
 
 expand_macro([{var,_Lv,V}|Ts], L, Rest, Bs) ->
-    case dict:find(V, Bs) of
-	{ok,Val} ->
-	    %% lists:append(Val, expand_macro(Ts, L, Rest, Bs));
+    case Bs of
+	#{V:=Val} ->
 	    expand_arg(Val, Ts, L, Rest, Bs);
-	error ->
+	_ ->
 	    [{var,L,V}|expand_macro(Ts, L, Rest, Bs)]
     end;
 expand_macro([{'?', _}, {'?', _}, {var,_Lv,V}|Ts], L, Rest, Bs) ->
-    case dict:find(V, Bs) of
-	{ok,Val} ->
-	    %% lists:append(Val, expand_macro(Ts, L, Rest, Bs));
+    case Bs of
+	#{V:=Val} ->
             expand_arg(stringify(Val, L), Ts, L, Rest, Bs);
-	error ->
+	_ ->
 	    [{var,L,V}|expand_macro(Ts, L, Rest, Bs)]
     end;
 expand_macro([T|Ts], L, Rest, Bs) ->
@@ -1394,6 +1381,93 @@ expand_arg([A|As], Ts, _L, Rest, Bs) ->
 expand_arg([], Ts, L, Rest, Bs) ->
     expand_macro(Ts, L, Rest, Bs).
 
+%%%
+%%% Here follows support for the ?FUNCTION_NAME and ?FUNCTION_ARITY
+%%% macros. Since the parser has not been run yet, we don't know the
+%%% name and arity of the current function. Therefore, we will need to
+%%% scan the beginning of the current form to extract the name and
+%%% arity of the function.
+%%%
+
+update_fun_name(Token, #epp{fname=Toks0}=St) when is_list(Toks0) ->
+    %% ?FUNCTION_NAME or ?FUNCTION_ARITY is used for the first time in
+    %% a function.  First expand macros (except ?FUNCTION_NAME and
+    %% ?FUNCTION_ARITY) in the form.
+
+    Toks1 = (catch expand_macros(Toks0, St#epp{fname=undefined})),
+
+    %% Now extract the name and arity from the stream of tokens, and store
+    %% the result in the #epp{} record so we don't have to do it
+    %% again.
+
+    case Toks1 of
+	[{atom,_,Name},{'(',_}|Toks] ->
+	    %% This is the beginning of a function definition.
+	    %% Scan the token stream up to the matching right
+	    %% parenthesis and count the number of arguments.
+	    FA = update_fun_name_1(Toks, 1, {Name,0}, St),
+	    St#epp{fname=FA};
+	[{'?',_}|_] ->
+	    %% ?FUNCTION_NAME/?FUNCTION_ARITY used at the beginning
+	    %% of a form. Does not make sense.
+	    {var,_,Macro} = Token,
+	    throw({error,loc(Token),{illegal_function_usage,Macro}});
+	_ when is_list(Toks1) ->
+	    %% Not the beginning of a function (an attribute or a
+	    %% syntax error).
+	    {var,_,Macro} = Token,
+	    throw({error,loc(Token),{illegal_function,Macro}});
+	_ ->
+	    %% A macro expansion error. Return a dummy value and
+	    %% let the caller notice and handle the error.
+	    St#epp{fname={'_',0}}
+    end;
+update_fun_name(_Token, St) ->
+    St.
+
+update_fun_name_1([Tok|Toks], L, FA, St) ->
+    case classify_token(Tok) of
+	comma ->
+	    if
+		L =:= 1 ->
+		    {Name,Arity} = FA,
+		    update_fun_name_1(Toks, L, {Name,Arity+1}, St);
+		true ->
+		    update_fun_name_1(Toks, L, FA, St)
+	    end;
+	left ->
+	    update_fun_name_1(Toks, L+1, FA, St);
+	right when L =:= 1 ->
+	    FA;
+	right ->
+	    update_fun_name_1(Toks, L-1, FA, St);
+	other ->
+	    case FA of
+		{Name,0} ->
+		    update_fun_name_1(Toks, L, {Name,1}, St);
+		{_,_} ->
+		    update_fun_name_1(Toks, L, FA, St)
+	    end
+    end;
+update_fun_name_1([], _, FA, _) ->
+    %% Syntax error, but never mind.
+    FA.
+
+classify_token({C,_}) -> classify_token_1(C);
+classify_token(_) -> other.
+
+classify_token_1(',') -> comma;
+classify_token_1('(') -> left;
+classify_token_1('{') -> left;
+classify_token_1('[') -> left;
+classify_token_1('<<') -> left;
+classify_token_1(')') -> right;
+classify_token_1('}') -> right;
+classify_token_1(']') -> right;
+classify_token_1('>>') -> right;
+classify_token_1(_) -> other.
+
+
 %%% stringify(Ts, L) returns a list of one token: a string which when
 %%% tokenized would yield the token list Ts.
 
diff --git a/lib/stdlib/src/erl_anno.erl b/lib/stdlib/src/erl_anno.erl
index 143318aa55..d32c34dabd 100644
--- a/lib/stdlib/src/erl_anno.erl
+++ b/lib/stdlib/src/erl_anno.erl
@@ -33,7 +33,7 @@
 
 -export_type([anno_term/0]).
 
--define(LN(L), is_integer(L)).
+-define(LN(L), is_integer(L), L >= 0).
 -define(COL(C), (is_integer(C) andalso C >= 1)).
 
 %% Location.
@@ -52,13 +52,13 @@
                     | {'record', record()}
                     | {'text', string()}.
 
--type anno() :: location() | [annotation(), ...].
+-opaque anno() :: location() | [annotation(), ...].
 -type anno_term() :: term().
 
 -type column() :: pos_integer().
 -type generated() :: boolean().
 -type filename() :: file:filename_all().
--type line() :: integer().
+-type line() :: non_neg_integer().
 -type location() :: line() | {line(), column()}.
 -type record() :: boolean().
 -type text() :: string().
@@ -90,9 +90,13 @@ to_term(Anno) ->
 -ifdef(DEBUG).
 from_term(Term) when is_list(Term) ->
     Term;
+from_term(Line) when is_integer(Line), Line < 0 -> % Before OTP 19
+    set_generated(true, new(-Line));
 from_term(Term) ->
     [{location, Term}].
 -else.
+from_term(Line) when is_integer(Line), Line < 0 -> % Before OTP 19
+    set_generated(true, new(-Line));
 from_term(Term) ->
     Term.
 -endif.
@@ -198,18 +202,11 @@ file(Anno) ->
       Anno :: anno().
 
 generated(Line) when ?ALINE(Line) ->
-    Line =< 0;
+    false;
 generated({Line, Column}) when ?ALINE(Line), ?ACOLUMN(Column) ->
-    Line =< 0;
+    false;
 generated(Anno) ->
-    _ = anno_info(Anno, generated, false),
-    {location, Location} = lists:keyfind(location, 1, Anno),
-    case Location of
-        {Line, _Column} ->
-            Line =< 0;
-        Line ->
-            Line =< 0
-    end.
+    anno_info(Anno, generated, false).
 
 -spec line(Anno) -> line() when
       Anno :: anno().
@@ -226,18 +223,11 @@ line(Anno) ->
       Anno :: anno().
 
 location(Line) when ?ALINE(Line) ->
-    abs(Line);
-location({Line, Column}) when ?ALINE(Line), ?ACOLUMN(Column) ->
-    {abs(Line), Column};
+    Line;
+location({Line, Column}=Location) when ?ALINE(Line), ?ACOLUMN(Column) ->
+    Location;
 location(Anno) ->
-    case anno_info(Anno, location) of
-        Line when Line < 0 ->
-            -Line;
-        {Line, Column} when Line < 0 ->
-            {-Line, Column};
-        Location ->
-            Location
-    end.
+    anno_info(Anno, location).
 
 -spec record(Anno) -> record() when
       Anno :: anno().
@@ -270,31 +260,8 @@ set_file(File, Anno) ->
       Generated :: generated(),
       Anno :: anno().
 
-set_generated(true, Line) when ?ALINE(Line) ->
-    -abs(Line);
-set_generated(false, Line) when ?ALINE(Line) ->
-    abs(Line);
-set_generated(true, {Line, Column}) when ?ALINE(Line),
-                                         ?ACOLUMN(Column) ->
-    {-abs(Line),Column};
-set_generated(false, {Line, Column}) when ?ALINE(Line),
-                                          ?ACOLUMN(Column) ->
-    {abs(Line),Column};
 set_generated(Generated, Anno) ->
-    _ = set(generated, Generated, Anno),
-    {location, Location} = lists:keyfind(location, 1, Anno),
-    NewLocation =
-        case Location of
-            {Line, Column} when Generated ->
-                {-abs(Line), Column};
-            {Line, Column} when not Generated ->
-                {abs(Line), Column};
-            Line when Generated ->
-                -abs(Line);
-            Line when not Generated ->
-                abs(Line)
-        end,
-    lists:keyreplace(location, 1, Anno, {location, NewLocation}).
+    set(generated, Generated, Anno).
 
 -spec set_line(Line, Anno) -> Anno when
       Line :: line(),
@@ -313,38 +280,17 @@ set_line(Line, Anno) ->
       Anno :: anno().
 
 set_location(Line, L) when ?ALINE(L), ?LLINE(Line) ->
-    new_location(fix_line(Line, L));
+    new_location(Line);
 set_location(Line, {L, Column}) when ?ALINE(L), ?ACOLUMN(Column),
                                      ?LLINE(Line) ->
-    new_location(fix_line(Line, L));
+    new_location(Line);
 set_location({L, C}=Loc, Line) when ?ALINE(Line), ?LLINE(L), ?LCOLUMN(C) ->
-    new_location(fix_location(Loc, Line));
+    new_location(Loc);
 set_location({L, C}=Loc, {Line, Column}) when ?ALINE(Line), ?ACOLUMN(Column),
                                               ?LLINE(L), ?LCOLUMN(C) ->
-    new_location(fix_location(Loc, Line));
+    new_location(Loc);
 set_location(Location, Anno) ->
-    _ = set(location, Location, Anno),
-    {location, OldLocation} = lists:keyfind(location, 1, Anno),
-    NewLocation =
-        case {Location, OldLocation} of
-            {{_Line, _Column}=Loc, {L, _C}} ->
-                fix_location(Loc, L);
-            {Line, {L, _C}} ->
-                fix_line(Line, L);
-            {{_Line, _Column}=Loc, L} ->
-                fix_location(Loc, L);
-            {Line, L} ->
-                fix_line(Line, L)
-        end,
-    lists:keyreplace(location, 1, Anno, {location, NewLocation}).
-
-fix_location({Line, Column}, OldLine) ->
-    {fix_line(Line, OldLine), Column}.
-
-fix_line(Line, OldLine) when OldLine < 0, Line > 0 ->
-    -Line;
-fix_line(Line, _OldLine) ->
-    Line.
+    set(location, Location, Anno).
 
 -spec set_record(Record, Anno) -> Anno when
       Record :: record(),
@@ -383,7 +329,7 @@ set_anno(Item, Value, Anno) ->
                     _ ->
                         lists:keyreplace(Item, 1, Anno, {Item, Value})
                 end,
-            simplify(R)
+            reset_simplify(R)
     end.
 
 reset(Anno, Item) ->
diff --git a/lib/stdlib/src/erl_expand_records.erl b/lib/stdlib/src/erl_expand_records.erl
index bcfeef7321..9c0a7fb7d5 100644
--- a/lib/stdlib/src/erl_expand_records.erl
+++ b/lib/stdlib/src/erl_expand_records.erl
@@ -33,8 +33,6 @@
                  vcount=0,            % Variable counter
                  imports=[],          % Imports
                  records=dict:new(),  % Record definitions
-		 trecords=sets:new(), % Typed records
-		 uses_types=false,    % Are there -spec or -type in the module
                  strict_ra=[],        % strict record accesses
                  checked_ra=[]        % successfully accessed records
                 }).
@@ -47,45 +45,18 @@
 %% erl_lint without errors.
 module(Fs0, Opts0) ->
     Opts = compiler_options(Fs0) ++ Opts0,
-    TRecs = typed_records(Fs0),
-    UsesTypes = uses_types(Fs0),
-    St0 = #exprec{compile = Opts, trecords = TRecs, uses_types = UsesTypes},
+    St0 = #exprec{compile = Opts},
     {Fs,_St} = forms(Fs0, St0),
     Fs.
 
 compiler_options(Forms) ->
     lists:flatten([C || {attribute,_,compile,C} <- Forms]).
 
-typed_records(Fs) ->
-    typed_records(Fs, sets:new()).
-
-typed_records([{attribute,_L,type,{{record, Name},_Defs,[]}} | Fs], Trecs) ->
-    typed_records(Fs, sets:add_element(Name, Trecs));
-typed_records([_|Fs], Trecs) ->
-    typed_records(Fs, Trecs);
-typed_records([], Trecs) ->
-    Trecs.
-
-uses_types([{attribute,_L,spec,_}|_]) -> true;
-uses_types([{attribute,_L,type,_}|_]) -> true;
-uses_types([{attribute,_L,opaque,_}|_]) -> true;
-uses_types([_|Fs]) -> uses_types(Fs);
-uses_types([]) -> false.
-    
-forms([{attribute,L,record,{Name,Defs}} | Fs], St0) ->
+forms([{attribute,_,record,{Name,Defs}}=Attr | Fs], St0) ->
     NDefs = normalise_fields(Defs),
     St = St0#exprec{records=dict:store(Name, NDefs, St0#exprec.records)},
     {Fs1, St1} = forms(Fs, St),
-    %% Check if we need to keep the record information for usage in types.
-    case St#exprec.uses_types of
-	true ->
-	    case sets:is_element(Name, St#exprec.trecords) of
-		true -> {Fs1, St1};
-		false -> {[{attribute,L,type,{{record,Name},Defs,[]}}|Fs1], St1}
-	    end;
-	false ->
-	    {Fs1, St1}
-    end;
+    {[Attr | Fs1], St1};
 forms([{attribute,L,import,Is} | Fs0], St0) ->
     St1 = import(Is, St0),
     {Fs,St2} = forms(Fs0, St1),
@@ -513,7 +484,6 @@ lc_tq(Line, [F0 | Qs0], St0) ->
 lc_tq(_Line, [], St0) ->
     {[],St0#exprec{checked_ra = []}}.
 
-
 %% normalise_fields([RecDef]) -> [Field].
 %%  Normalise the field definitions to always have a default value. If
 %%  none has been given then use 'undefined'.
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index e940ad6956..4ca9a609a8 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -31,12 +31,8 @@
 -export([is_guard_expr/1]).
 -export([bool_option/4,value_option/3,value_option/7]).
 
--export([modify_line/2]).
-
 -import(lists, [member/2,map/2,foldl/3,foldr/3,mapfoldl/3,all/2,reverse/1]).
 
--deprecated([{modify_line, 2, next_major_release}]).
-
 %% bool_option(OnOpt, OffOpt, Default, Options) -> boolean().
 %% value_option(Flag, Default, Options) -> Value.
 %% value_option(Flag, Default, OnOpt, OnVal, OffOpt, OffVal, Options) ->
@@ -79,7 +75,7 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
 %%-define(DEBUGF(X,Y), io:format(X, Y)).
 -define(DEBUGF(X,Y), void).
 
--type line() :: erl_anno:line().     % a convenient alias
+-type line() :: erl_anno:anno().     % a convenient alias
 -type fa()   :: {atom(), arity()}.   % function+arity
 -type ta()   :: {atom(), arity()}.   % type+arity
 
@@ -238,6 +234,9 @@ format_error({removed, MFA, ReplacementMFA, Rel}) ->
 		  "use ~s", [format_mfa(MFA), Rel, format_mfa(ReplacementMFA)]);
 format_error({removed, MFA, String}) when is_list(String) ->
     io_lib:format("~s: ~s", [format_mfa(MFA), String]);
+format_error({removed_type, MNA, ReplacementMNA, Rel}) ->
+    io_lib:format("the type ~s was removed in ~s; use ~s instead",
+                  [format_mna(MNA), Rel, format_mna(ReplacementMNA)]);
 format_error({obsolete_guard, {F, A}}) ->
     io_lib:format("~p/~p obsolete", [F, A]);
 format_error({too_many_arguments,Arity}) ->
@@ -361,6 +360,9 @@ format_error({redefine_type, {TypeName, Arity}}) ->
 		  [TypeName, gen_type_paren(Arity)]);
 format_error({type_syntax, Constr}) ->
     io_lib:format("bad ~w type", [Constr]);
+format_error(old_abstract_code) ->
+    io_lib:format("abstract code generated before Erlang/OTP 19.0 and "
+                  "having typed record fields cannot be compiled", []);
 format_error({redefine_spec, {M, F, A}}) ->
     io_lib:format("spec for ~w:~w/~w already defined", [M, F, A]);
 format_error({redefine_spec, {F, A}}) ->
@@ -374,9 +376,9 @@ format_error({spec_fun_undefined, {F, A}}) ->
 format_error({missing_spec, {F,A}}) ->
     io_lib:format("missing specification for function ~w/~w", [F, A]);
 format_error(spec_wrong_arity) ->
-    "spec has the wrong arity";
+    "spec has wrong arity";
 format_error(callback_wrong_arity) ->
-    "callback has the wrong arity";
+    "callback has wrong arity";
 format_error({deprecated_builtin_type, {Name, Arity},
               Replacement, Rel}) ->
     UseS = case Replacement of
@@ -416,6 +418,9 @@ format_mfa({M, F, A}) when is_integer(A) ->
 format_mf(M, F, ArityString) when is_atom(M), is_atom(F) ->
     atom_to_list(M) ++ ":" ++ atom_to_list(F) ++ "/" ++ ArityString.
 
+format_mna({M, N, A}) when is_integer(A) ->
+    atom_to_list(M) ++ ":" ++ atom_to_list(N) ++ gen_type_paren(A).
+
 format_where(L) when is_integer(L) ->
     io_lib:format("(line ~p)", [L]);
 format_where({L,C}) when is_integer(L), is_integer(C) ->
@@ -694,7 +699,12 @@ set_form_file({function,L,N,A,C}, File) ->
 set_form_file(Form, _File) ->
     Form.
 
+set_file(Ts, File) when is_list(Ts) ->
+    [anno_set_file(T, File) || T <- Ts];
 set_file(T, File) ->
+    anno_set_file(T, File).
+
+anno_set_file(T, File) ->
     F = fun(Anno) -> erl_anno:set_file(File, Anno) end,
     erl_parse:map_anno(F, T).
 
@@ -1136,7 +1146,7 @@ check_untyped_records(Forms, St0) ->
 	    RecNames = dict:fetch_keys(St0#lint.records),
 	    %% these are the records with field(s) containing type info
 	    TRecNames = [Name ||
-			    {attribute,_,type,{{record,Name},Fields,_}} <- Forms,
+			    {attribute,_,record,{Name,Fields}} <- Forms,
 			    lists:all(fun ({typed_record_field,_,_}) -> true;
 					  (_) -> false
 				      end, Fields)],
@@ -1146,7 +1156,8 @@ check_untyped_records(Forms, St0) ->
 			      [] -> St; % exclude records with no fields
 			      [_|_] -> add_warning(L, {untyped_record, N}, St)
 			  end
-		  end, St0, RecNames -- TRecNames);
+		  end, St0, ordsets:subtract(ordsets:from_list(RecNames),
+                                             ordsets:from_list(TRecNames)));
 	false ->
 	    St0
     end.
@@ -2436,7 +2447,10 @@ record_def(Line, Name, Fs0, St0) ->
         true -> add_error(Line, {redefine_record,Name}, St0);
         false ->
             {Fs1,St1} = def_fields(normalise_fields(Fs0), Name, St0),
-            St1#lint{records=dict:store(Name, {Line,Fs1}, St1#lint.records)}
+            St2 = St1#lint{records=dict:store(Name, {Line,Fs1},
+                                              St1#lint.records)},
+            Types = [T || {typed_record_field, _, T} <- Fs0],
+            check_type({type, nowarn(), product, Types}, St2)
     end.
 
 %% def_fields([RecDef], RecordName, State) -> {[DefField],State}.
@@ -2639,11 +2653,6 @@ find_field(_F, []) -> error.
 %%    Attr :: 'type' | 'opaque'
 %% Checks that a type definition is valid.
 
-type_def(_Attr, _Line, {record, _RecName}, Fields, [], St0) ->
-    %% The record field names and such are checked in the record format.
-    %% We only need to check the types.
-    Types = [T || {typed_record_field, _, T} <- Fields],
-    check_type({type, nowarn(), product, Types}, St0);
 type_def(Attr, Line, TypeName, ProtoType, Args, St0) ->
     TypeDefs = St0#lint.types,
     Arity = length(Args),
@@ -2806,6 +2815,8 @@ check_type({user_type, L, TypeName, Args}, SeenVars, St) ->
     lists:foldl(fun(T, {AccSeenVars, AccSt}) ->
 			check_type(T, AccSeenVars, AccSt)
 		end, {SeenVars, St1}, Args);
+check_type([{typed_record_field,Field,_T}|_], SeenVars, St) ->
+    {SeenVars, add_error(element(2, Field), old_abstract_code, St)};
 check_type(I, SeenVars, St) ->
     case erl_eval:partial_eval(I) of
         {integer,_ILn,_Integer} -> {SeenVars, St};
@@ -2876,7 +2887,7 @@ spec_decl(Line, MFA0, TypeSpecs, St0 = #lint{specs = Specs, module = Mod}) ->
     St1 = St0#lint{specs = dict:store(MFA, Line, Specs)},
     case dict:is_key(MFA, Specs) of
 	true -> add_error(Line, {redefine_spec, MFA0}, St1);
-	false -> check_specs(TypeSpecs, Arity, St1)
+	false -> check_specs(TypeSpecs, spec_wrong_arity, Arity, St1)
     end.
 
 %% callback_decl(Line, Fun, Types, State) -> State.
@@ -2890,7 +2901,8 @@ callback_decl(Line, MFA0, TypeSpecs,
             St1 = St0#lint{callbacks = dict:store(MFA, Line, Callbacks)},
             case dict:is_key(MFA, Callbacks) of
                 true -> add_error(Line, {redefine_callback, MFA0}, St1);
-                false -> check_specs(TypeSpecs, Arity, St1)
+                false -> check_specs(TypeSpecs, callback_wrong_arity,
+                                     Arity, St1)
             end
     end.
 
@@ -2927,7 +2939,7 @@ is_fa({FuncName, Arity})
   when is_atom(FuncName), is_integer(Arity), Arity >= 0 -> true;
 is_fa(_) -> false.
 
-check_specs([FunType|Left], Arity, St0) ->
+check_specs([FunType|Left], ETag, Arity, St0) ->
     {FunType1, CTypes} =
 	case FunType of
 	    {type, _, bounded_fun, [FT = {type, _, 'fun', _}, Cs]} ->
@@ -2935,18 +2947,16 @@ check_specs([FunType|Left], Arity, St0) ->
 		{FT, lists:append(Types0)};
 	    {type, _, 'fun', _} = FT -> {FT, []}
 	end,
-    SpecArity =
-	case FunType1 of
-	    {type, L, 'fun', [any, _]} -> any;
-	    {type, L, 'fun', [{type, _, product, D}, _]} -> length(D)
-	end,
+    {type, L, 'fun', [{type, _, product, D}, _]} = FunType1,
+    SpecArity = length(D),
     St1 = case Arity =:= SpecArity of
 	      true -> St0;
-	      false -> add_error(L, spec_wrong_arity, St0)
+	      false -> %% Cannot happen if called from the compiler.
+                  add_error(L, ETag, St0)
 	  end,
     St2 = check_type({type, nowarn(), product, [FunType1|CTypes]}, St1),
-    check_specs(Left, Arity, St2);
-check_specs([], _Arity, St) ->
+    check_specs(Left, ETag, Arity, St2);
+check_specs([], _ETag, _Arity, St) ->
     St.
 
 nowarn() ->
@@ -2988,9 +2998,10 @@ add_missing_spec_warnings(Forms, St0, Type) ->
 		[{FA,L} || {function,L,F,A,_} <- Forms,
 			   not lists:member(FA = {F,A}, Specs)];
 	    exported ->
-		Exps = gb_sets:to_list(St0#lint.exports) -- pseudolocals(),
+		Exps0 = gb_sets:to_list(St0#lint.exports) -- pseudolocals(),
+                Exps = Exps0 -- Specs,
 		[{FA,L} || {function,L,F,A,_} <- Forms,
-			   member(FA = {F,A}, Exps -- Specs)]
+			   member(FA = {F,A}, Exps)]
 	end,
     foldl(fun ({FA,L}, St) ->
 		  add_warning(L, {missing_spec,FA}, St)
@@ -3003,7 +3014,9 @@ check_unused_types(Forms, #lint{usage=Usage, types=Ts, exp_types=ExpTs}=St) ->
 	    L = gb_sets:to_list(ExpTs) ++ dict:fetch_keys(D),
 	    UsedTypes = gb_sets:from_list(L),
 	    FoldFun =
-		fun(Type, #typeinfo{line = FileLine}, AccSt) ->
+                fun({{record, _}=_Type, 0}, _, AccSt) ->
+                        AccSt; % Before Erlang/OTP 19.0
+                   (Type, #typeinfo{line = FileLine}, AccSt) ->
                         case loc(FileLine, AccSt) of
 			    {FirstFile, _} ->
 				case gb_sets:is_member(Type, UsedTypes) of
@@ -3190,8 +3203,8 @@ handle_generator(P,E,Vt,Uvt,St0) ->
 handle_bitstring_gen_pat({bin,_,Segments=[_|_]},St) ->
     case lists:last(Segments) of
         {bin_element,Line,{var,_,_},default,Flags} when is_list(Flags) ->
-            case member(binary, Flags) orelse member(bits, Flags)
-                                       orelse member(bitstring, Flags) of
+            case member(binary, Flags) orelse member(bytes, Flags)
+              orelse member(bits, Flags) orelse member(bitstring, Flags) of
                 true ->
                     add_error(Line, unsized_binary_in_bin_gen_pattern, St);
                 false ->
@@ -3485,13 +3498,6 @@ vt_no_unused(Vt) -> [V || {_,{_,U,_L}}=V <- Vt, U =/= unused].
 copy_expr(Expr, Anno) ->
     erl_parse:map_anno(fun(_A) -> Anno end, Expr).
 
-%% modify_line(Form, Fun) -> Form
-%% modify_line(Expression, Fun) -> Expression
-%%  Applies Fun to each line number occurrence.
-
-modify_line(T, F0) ->
-    erl_parse:map_anno(F0, T).
-
 %% Check a record_info call. We have already checked that it is not
 %% shadowed by an import.
 
@@ -3532,6 +3538,8 @@ check_qlc_hrl(Line, M, F, As, St) ->
 %% deprecated_function(Line, ModName, FuncName, [Arg], State) -> State.
 %%  Add warning for calls to deprecated functions.
 
+-dialyzer({no_match, deprecated_function/5}).
+
 deprecated_function(Line, M, F, As, St) ->
     Arity = length(As),
     MFA = {M, F, Arity},
@@ -3560,6 +3568,8 @@ deprecated_function(Line, M, F, As, St) ->
 	    St
     end.
 
+-dialyzer({no_match, deprecated_type/5}).
+
 deprecated_type(L, M, N, As, St) ->
     NAs = length(As),
     case otp_internal:obsolete_type(M, N, NAs) of
@@ -3570,6 +3580,8 @@ deprecated_type(L, M, N, As, St) ->
                 false ->
                     St
             end;
+        {removed, Replacement, Rel} ->
+            add_warning(L, {removed_type, {M,N,NAs}, Replacement, Rel}, St);
         no ->
             St
     end.
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index e82282421e..6f8e5e8449 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -85,10 +85,6 @@ type_spec -> '(' spec_fun type_sigs ')' : {'$2', '$3'}.
 
 spec_fun ->                           atom : '$1'.
 spec_fun ->                  atom ':' atom : {'$1', '$3'}.
-%% The following two are retained only for backwards compatibility;
-%% they are not part of the EEP syntax and should be removed.
-spec_fun ->          atom '/' integer '::' : {'$1', '$3'}.
-spec_fun -> atom ':' atom '/' integer '::' : {'$1', '$3', '$5'}.
 
 typed_attr_val -> expr ',' typed_record_fields : {typed_record, '$1', '$3'}.
 typed_attr_val -> expr '::' top_type           : {type_def, '$1', '$3'}.
@@ -315,7 +311,7 @@ bit_size_expr -> expr_max : '$1'.
 
 list_comprehension -> '[' expr '||' lc_exprs ']' :
 	{lc,?anno('$1'),'$2','$4'}.
-binary_comprehension -> '<<' binary '||' lc_exprs '>>' :
+binary_comprehension -> '<<' expr_max '||' lc_exprs '>>' :
 	{bc,?anno('$1'),'$2','$4'}.
 lc_exprs -> lc_expr : ['$1'].
 lc_exprs -> lc_expr ',' lc_exprs : ['$1'|'$3'].
@@ -525,23 +521,424 @@ Erlang code.
 -export([type_inop_prec/1,type_preop_prec/1]).
 -export([map_anno/2, fold_anno/3, mapfold_anno/3,
          new_anno/1, anno_to_term/1, anno_from_term/1]).
--export([set_line/2,get_attribute/2,get_attributes/1]).
-
--deprecated([{set_line, 2, next_major_release},
-             {get_attribute, 2, next_major_release},
-             {get_attributes, 1, next_major_release}]).
 
 %% The following directive is needed for (significantly) faster compilation
 %% of the generated .erl file by the HiPE compiler.  Please do not remove.
 -compile([{hipe,[{regalloc,linear_scan}]}]).
 
 -export_type([abstract_clause/0, abstract_expr/0, abstract_form/0,
-              error_info/0]).
+              abstract_type/0, error_info/0]).
+
+%% Start of Abstract Format
+
+-type anno() :: erl_anno:anno().
+
+-type abstract_form() :: af_module()
+                       | af_behavior()
+                       | af_behaviour()
+                       | af_export()
+                       | af_import()
+                       | af_export_type()
+                       | af_optional_callbacks()
+                       | af_compile()
+                       | af_file()
+                       | af_record_decl()
+                       | af_type_decl()
+                       | af_function_spec()
+                       | af_wild_attribute()
+                       | af_function_decl().
+
+-type af_module() :: {'attribute', anno(), 'module', module()}.
+
+-type af_behavior() :: {'attribute', anno(), 'behavior', behaviour()}.
+
+-type af_behaviour() :: {'attribute', anno(), 'behaviour', behaviour()}.
+
+-type behaviour() :: atom().
+
+-type af_export() :: {'attribute', anno(), 'export', af_fa_list()}.
+
+-type af_import() :: {'attribute', anno(), 'import', af_fa_list()}.
+
+-type af_fa_list() :: [{function_name(), arity()}].
+
+-type af_export_type() :: {'attribute', anno(), 'export_type', af_ta_list()}.
+
+-type af_ta_list() :: [{type_name(), arity()}].
+
+-type af_optional_callbacks() ::
+        {'attribute', anno(), 'optional_callbacks', af_fa_list()}.
+
+-type af_compile() :: {'attribute', anno(), 'compile', any()}.
+
+-type af_file() :: {'attribute', anno(), 'file', {string(), anno()}}.
+
+-type af_record_decl() ::
+        {'attribute', anno(), 'record', {record_name(), [af_field_decl()]}}.
+
+-type af_field_decl() :: af_typed_field() | af_field().
+
+-type af_typed_field() ::
+        {'typed_record_field', af_field(), abstract_type()}.
+
+-type af_field() :: {'record_field', anno(), af_field_name()}
+                  | {'record_field', anno(), af_field_name(), abstract_expr()}.
+
+-type af_type_decl() :: {'attribute', anno(), type_attr(),
+                         {type_name(), abstract_type(), [af_variable()]}}.
+
+-type type_attr() :: 'opaque' | 'type'.
+
+-type af_function_spec() :: {'attribute', anno(), spec_attr(),
+                             {{function_name(), arity()},
+                              af_function_type_list()}}
+                          | {'attribute', anno(), 'spec',
+                             {{module(), function_name(), arity()},
+                              af_function_type_list()}}.
+
+-type spec_attr() :: 'callback' | 'spec'.
+
+-type af_wild_attribute() :: {'attribute', anno(), atom(), any()}.
+
+-type af_function_decl() ::
+        {'function', anno(), function_name(), arity(), af_clause_seq()}.
+
+-type abstract_expr() :: af_literal()
+                       | af_match(abstract_expr())
+                       | af_variable()
+                       | af_tuple(abstract_expr())
+                       | af_nil()
+                       | af_cons(abstract_expr())
+                       | af_bin(abstract_expr())
+                       | af_binary_op(abstract_expr())
+                       | af_unary_op(abstract_expr())
+                       | af_record_access(abstract_expr())
+                       | af_record_update(abstract_expr())
+                       | af_record_index()
+                       | af_record_field_access(abstract_expr())
+                       | af_map_access(abstract_expr())
+                       | af_map_update(abstract_expr())
+                       | af_catch()
+                       | af_local_call()
+                       | af_remote_call()
+                       | af_list_comprehension()
+                       | af_binary_comprehension()
+                       | af_block()
+                       | af_if()
+                       | af_case()
+                       | af_try()
+                       | af_receive()
+                       | af_local_fun()
+                       | af_remote_fun()
+                       | af_fun()
+                       | af_named_fun().
+
+-type af_record_update(T) :: {'record',
+                              anno(),
+                              abstract_expr(),
+                              record_name(),
+                              [af_record_field(T)]}.
+
+-type af_catch() :: {'catch', anno(), abstract_expr()}.
+
+-type af_local_call() :: {'call', anno(), af_local_function(), af_args()}.
+
+-type af_remote_call() :: {'call', anno(), af_remote_function(), af_args()}.
+
+-type af_args() :: [abstract_expr()].
+
+-type af_local_function() :: abstract_expr().
+
+-type af_remote_function() ::
+        {'remote', anno(), abstract_expr(), abstract_expr()}.
+
+-type af_list_comprehension() ::
+        {'lc', anno(), af_template(), af_qualifier_seq()}.
+
+-type af_binary_comprehension() ::
+        {'bc', anno(), af_template(), af_qualifier_seq()}.
+
+-type af_template() :: abstract_expr().
+
+-type af_qualifier_seq() :: [af_qualifier()].
+
+-type af_qualifier() :: af_generator() | af_filter().
+
+-type af_generator() :: {'generate', anno(), af_pattern(), abstract_expr()}
+                      | {'b_generate', anno(), af_pattern(), abstract_expr()}.
+
+-type af_filter() :: abstract_expr().
+
+-type af_block() :: {'block', anno(), af_body()}.
+
+-type af_if() :: {'if', anno(), af_clause_seq()}.
+
+-type af_case() :: {'case', anno(), abstract_expr(), af_clause_seq()}.
+
+-type af_try() :: {'try',
+                   anno(),
+                   af_body() | [],
+                   af_clause_seq() | [],
+                   af_clause_seq() | [],
+                   af_body() | []}.
+
+-type af_clause_seq() :: [af_clause(), ...].
+
+-type af_receive() ::
+        {'receive', anno(), af_clause_seq()}
+      | {'receive', anno(), af_clause_seq(), abstract_expr(), af_body()}.
+
+-type af_local_fun() ::
+        {'fun', anno(), {'function', function_name(), arity()}}.
+
+-type af_remote_fun() ::
+        {'fun', anno(), {'function', module(), function_name(), arity()}}
+      | {'fun', anno(), {'function', af_atom(), af_atom(), af_integer()}}.
+
+-type af_fun() :: {'fun', anno(), {'clauses', af_clause_seq()}}.
+
+-type af_named_fun() :: {'named_fun', anno(), fun_name(), af_clause_seq()}.
+
+-type fun_name() :: atom().
+
+-type abstract_clause() :: af_clause().
+
+-type af_clause() ::
+        {'clause', anno(), [af_pattern()], af_guard_seq(), af_body()}.
+
+-type af_body() :: [abstract_expr(), ...].
+
+-type af_guard_seq() :: [af_guard()].
+
+-type af_guard() :: [af_guard_test(), ...].
+
+-type af_guard_test() :: af_literal()
+                       | af_variable()
+                       | af_tuple(af_guard_test())
+                       | af_nil()
+                       | af_cons(af_guard_test())
+                       | af_bin(af_guard_test())
+                       | af_binary_op(af_guard_test())
+                       | af_unary_op(af_guard_test())
+                       | af_record_access(af_guard_test())
+                       | af_record_index()
+                       | af_record_field_access(af_guard_test())
+                       | af_map_access(abstract_expr()) % FIXME
+                       | af_map_update(abstract_expr()) % FIXME
+                       | af_guard_call()
+                       | af_remote_guard_call().
+
+-type af_record_field_access(T) ::
+        {'record_field', anno(), T, record_name(), af_field_name()}.
+
+-type af_map_access(T) :: {'map', anno(), [af_map_field(T)]}.
+
+-type af_map_update(T) :: {'map', anno(), T, [af_map_field(T)]}.
+
+-type af_map_field(T) :: af_map_field_assoc(T) | af_map_field_exact(T).
+
+-type af_map_field_assoc(T) :: {'map_field_assoc', anno(), T, T}.
+
+-type af_map_field_exact(T) :: {'map_field_exact', anno(), T, T}.
+
+-type af_guard_call() :: {'call', anno(), function_name(), [af_guard_test()]}.
+
+-type af_remote_guard_call() ::
+        {'call', anno(),
+         {'remote', anno(), af_lit_atom('erlang'), af_atom()},
+         [af_guard_test()]}.
+
+-type af_pattern() :: af_literal()
+                    | af_match(af_pattern())
+                    | af_variable()
+                    | af_tuple(af_pattern())
+                    | af_nil()
+                    | af_cons(af_pattern())
+                    | af_bin(af_pattern())
+                    | af_binary_op(af_pattern())
+                    | af_unary_op(af_pattern())
+                    | af_record_access(af_pattern())
+                    | af_record_index()
+                    | af_map_pattern().
+
+-type af_record_index() ::
+        {'record_index', anno(), record_name(), af_field_name()}.
+
+-type af_record_access(T) ::
+        {'record', anno(), record_name(), [af_record_field(T)]}.
+
+-type af_record_field(T) :: {'record_field', anno(), af_field_name(), T}.
+
+-type af_map_pattern() ::
+        {'map', anno(), [af_map_field_exact(abstract_expr)]}. % FIXME?
+
+-type abstract_type() :: af_annotated_type()
+                       | af_atom()
+                       | af_bitstring_type()
+                       | af_empty_list_type()
+                       | af_fun_type()
+                       | af_integer_range_type()
+                       | af_map_type()
+                       | af_predefined_type()
+                       | af_record_type()
+                       | af_remote_type()
+                       | af_singleton_integer_type()
+                       | af_tuple_type()
+                       | af_type_union()
+                       | af_type_variable()
+                       | af_user_defined_type().
+
+-type af_annotated_type() ::
+        {'ann_type', anno(), [af_anno() | abstract_type()]}. % [Var, Type]
+
+-type af_anno() :: af_variable().
+
+-type af_bitstring_type() ::
+        {'type', anno(), 'binary', [af_singleton_integer_type()]}.
+
+-type af_empty_list_type() :: {'type', anno(), 'nil', []}.
+
+-type af_fun_type() :: {'type', anno(), 'fun', []}
+                     | {'type', anno(), 'fun', [{'type', anno(), 'any'} |
+                                                abstract_type()]}
+                     | {'type', anno(), 'fun', af_function_type()}.
+
+-type af_integer_range_type() ::
+        {'type', anno(), 'range', [af_singleton_integer_type()]}.
+
+-type af_map_type() :: {'type', anno(), 'map', 'any'}
+                     | {'type', anno(), 'map', [af_map_pair_type()]}.
+
+-type af_map_pair_type() ::
+        {'type', anno(), 'map_field_assoc', [abstract_type()]}.
+
+-type af_predefined_type() ::
+        {'type', anno(), type_name(),  [abstract_type()]}.
+
+-type af_record_type() ::
+        {'type', anno(), 'record', [(Name :: af_atom()) % [Name, T1, ... Tk]
+                                    | af_record_field_type()]}.
+
+-type af_record_field_type() ::
+        {'type', anno(), 'field_type', [(Name :: af_atom()) |
+                                        abstract_type()]}. % [Name, Type]
+
+-type af_remote_type() ::
+        {'remote_type', anno(), [(Module :: af_atom()) |
+                                 (TypeName :: af_atom()) |
+                                 [abstract_type()]]}. % [Module, Name, [T]]
+
+-type af_tuple_type() :: {'type', anno(), 'tuple', 'any'}
+                       | {'type', anno(), 'tuple', [abstract_type()]}.
+
+-type af_type_union() :: {'type', anno(), 'union', [abstract_type()]}.
+
+-type af_type_variable() :: {'var', anno(), atom()}. % except '_'
+
+-type af_user_defined_type() ::
+        {'user_type', anno(), type_name(),  [abstract_type()]}.
+
+-type af_function_type_list() :: [af_constrained_function_type() |
+                                  af_function_type()].
+
+-type af_constrained_function_type() ::
+        {'type', anno(), 'bounded_fun', [af_function_type() | % [Ft, Fc]
+                                         af_function_constraint()]}.
+
+-type af_function_type() ::
+        {'type', anno(), 'fun',
+         [{'type', anno(), 'product', [abstract_type()]} | abstract_type()]}.
+
+-type af_function_constraint() :: [af_constraint()].
+
+-type af_constraint() :: {'type', anno(), 'constraint',
+                          af_lit_atom('is_subtype'),
+                          [af_type_variable() | abstract_type()]}. % [V, T]
+
+-type af_singleton_integer_type() :: af_integer()
+                                   | af_unary_op(af_singleton_integer_type())
+                                   | af_binary_op(af_singleton_integer_type()).
+
+-type af_literal() :: af_atom() | af_integer() | af_float() | af_string().
+
+-type af_atom() :: af_lit_atom(atom()).
+
+-type af_lit_atom(A) :: {'atom', anno(), A}.
+
+-type af_integer() :: {'integer', anno(), non_neg_integer()}.
+
+-type af_float() :: {'float', anno(), float()}.
+
+-type af_string() :: {'string', anno(), string()}.
+
+-type af_match(T) :: {'match', anno(), af_pattern(), T}.
+
+-type af_variable() :: {'var', anno(), atom()}. % | af_anon_variable()
+
+%-type af_anon_variable() :: {'var', anno(), '_'}.
+
+-type af_tuple(T) :: {'tuple', anno(), [T]}.
+
+-type af_nil() :: {'nil', anno()}.
+
+-type af_cons(T) :: {'cons', anno(), T, T}.
+
+-type af_bin(T) :: {'bin', anno(), [af_binelement(T)]}.
+
+-type af_binelement(T) :: {'bin_element',
+                           anno(),
+                           T,
+                           af_binelement_size(),
+                           type_specifier_list()}.
+
+-type af_binelement_size() :: 'default' | abstract_expr().
+
+-type af_binary_op(T) :: {'op', anno(), binary_op(), T, T}.
+
+-type binary_op() :: '/' | '*' | 'div' | 'rem' | 'band' | 'and' | '+' | '-'
+                   | 'bor' | 'bxor' | 'bsl' | 'bsr' | 'or' | 'xor' | '++'
+                   | '--' | '==' | '/=' | '=<' | '<'  | '>=' | '>' | '=:='
+                   | '=/='.
+
+-type af_unary_op(T) :: {'op', anno(), unary_op(), T}.
+
+-type unary_op() :: '+' | '*' | 'bnot' | 'not'.
+
+%% See also lib/stdlib/{src/erl_bits.erl,include/erl_bits.hrl}.
+-type type_specifier_list() :: 'default' | [type_specifier(), ...].
+
+-type type_specifier() :: type()
+                        | signedness()
+                        | endianness()
+                        | unit().
+
+-type type() :: 'integer'
+              | 'float'
+              | 'binary'
+              | 'bytes'
+              | 'bitstring'
+              | 'bits'
+              | 'utf8'
+              | 'utf16'
+              | 'utf32'.
+
+-type signedness() :: 'signed' | 'unsigned'.
+
+-type endianness() :: 'big' | 'little' | 'native'.
+
+-type unit() :: {'unit', 1..256}.
+
+-type record_name() :: atom().
+
+-type af_field_name() :: af_atom().
+
+-type function_name() :: atom().
+
+-type type_name() :: atom().
+
+%% End of Abstract Format
 
 %% XXX. To be refined.
--type abstract_clause() :: term().
--type abstract_expr() :: term().
--type abstract_form() :: term().
 -type error_description() :: term().
 -type error_info() :: {erl_anno:line(), module(), error_description()}.
 -type token() :: erl_scan:token().
@@ -639,14 +1036,8 @@ build_type_spec({Kind,Aa}, {SpecFun, TypeSpecs})
 	    {atom, _, Fun} ->
 		{Fun, find_arity_from_specs(TypeSpecs)};
 	    {{atom,_, Mod}, {atom,_, Fun}} ->
-		{Mod,Fun,find_arity_from_specs(TypeSpecs)};
-	    {{atom, _, Fun}, {integer, _, Arity}} ->
-		%% Old style spec. Allow this for now.
-		{Fun,Arity};
-	    {{atom,_, Mod}, {atom, _, Fun}, {integer, _, Arity}} ->
-		%% Old style spec. Allow this for now.
-		{Mod,Fun,Arity}
-	    end,
+		{Mod,Fun,find_arity_from_specs(TypeSpecs)}
+        end,
     {attribute,Aa,Kind,{NewSpecFun, TypeSpecs}}.
 
 find_arity_from_specs([Spec|_]) ->
@@ -795,31 +1186,11 @@ record_fields([{match,_Am,{atom,Aa,A},Expr}|Fields]) ->
     [{record_field,Aa,{atom,Aa,A},Expr}|record_fields(Fields)];
 record_fields([{typed,Expr,TypeInfo}|Fields]) ->
     [Field] = record_fields([Expr]),
-    TypeInfo1 =
-	case Expr of
-	    {match, _, _, _} -> TypeInfo; %% If we have an initializer.
-	    {atom, Aa, _} ->
-                case has_undefined(TypeInfo) of
-                    false ->
-                        lift_unions(abstract2(undefined, Aa), TypeInfo);
-                    true ->
-                        TypeInfo
-                end
-	end,
-    [{typed_record_field,Field,TypeInfo1}|record_fields(Fields)];
+    [{typed_record_field,Field,TypeInfo}|record_fields(Fields)];
 record_fields([Other|_Fields]) ->
     ret_err(?anno(Other), "bad record field");
 record_fields([]) -> [].
 
-has_undefined({atom,_,undefined}) ->
-    true;
-has_undefined({ann_type,_,[_,T]}) ->
-    has_undefined(T);
-has_undefined({type,_,union,Ts}) ->
-    lists:any(fun has_undefined/1, Ts);
-has_undefined(_) ->
-    false.
-
 term(Expr) ->
     try normalise(Expr)
     catch _:_R -> ret_err(?anno(Expr), "bad attribute")
@@ -1118,33 +1489,16 @@ type_preop_prec('-') -> {600,700};
 type_preop_prec('bnot') -> {600,700};
 type_preop_prec('#') -> {700,800}.
 
-%%% [Experimental]. The parser just copies the attributes of the
-%%% scanner tokens to the abstract format. This design decision has
-%%% been hidden to some extent: use set_line() and get_attribute() to
-%%% access the second element of (almost all) of the abstract format
-%%% tuples. A typical use is to negate line numbers to prevent the
-%%% compiler from emitting warnings and errors. The second element can
-%%% (of course) be set to any value, but then these functions no
-%%% longer apply. To get all present attributes as a property list
-%%% get_attributes() should be used.
-
--compile({nowarn_deprecated_function,{erl_scan,set_attribute,3}}).
-set_line(L, F) ->
-    erl_scan:set_attribute(line, L, F).
-
--compile({nowarn_deprecated_function,{erl_scan,attributes_info,2}}).
-get_attribute(L, Name) ->
-    erl_scan:attributes_info(L, Name).
-
--compile({nowarn_deprecated_function,{erl_scan,attributes_info,1}}).
-get_attributes(L) ->
-    erl_scan:attributes_info(L).
+-type erl_parse_tree() :: abstract_clause()
+                        | abstract_expr()
+                        | abstract_form()
+                        | abstract_type().
 
 -spec map_anno(Fun, Abstr) -> NewAbstr when
       Fun :: fun((Anno) -> Anno),
       Anno :: erl_anno:anno(),
-      Abstr :: abstract_form() | abstract_expr(),
-      NewAbstr :: abstract_form() | abstract_expr().
+      Abstr :: erl_parse_tree(),
+      NewAbstr :: erl_parse_tree().
 
 map_anno(F0, Abstr) ->
     F = fun(A, Acc) -> {F0(A), Acc} end,
@@ -1157,8 +1511,8 @@ map_anno(F0, Abstr) ->
       Acc0 :: term(),
       AccIn :: term(),
       AccOut :: term(),
-      Abstr :: abstract_form() | abstract_expr(),
-      NewAbstr :: abstract_form() | abstract_expr().
+      Abstr :: erl_parse_tree(),
+      NewAbstr :: erl_parse_tree().
 
 fold_anno(F0, Acc0, Abstr) ->
     F = fun(A, Acc) -> {A, F0(A, Acc)} end,
@@ -1172,26 +1526,26 @@ fold_anno(F0, Acc0, Abstr) ->
       Acc1 :: term(),
       AccIn :: term(),
       AccOut :: term(),
-      Abstr :: abstract_form() | abstract_expr(),
-      NewAbstr :: abstract_form() | abstract_expr().
+      Abstr :: erl_parse_tree(),
+      NewAbstr :: erl_parse_tree().
 
 mapfold_anno(F, Acc0, Abstr) ->
     modify_anno1(Abstr, Acc0, F).
 
 -spec new_anno(Term) -> Abstr when
       Term :: term(),
-      Abstr :: abstract_form() | abstract_expr().
+      Abstr :: erl_parse_tree().
 
 new_anno(Term) ->
     map_anno(fun erl_anno:new/1, Term).
 
 -spec anno_to_term(Abstr) -> term() when
-      Abstr :: abstract_form() | abstract_expr().
+      Abstr :: erl_parse_tree().
 
 anno_to_term(Abstract) ->
     map_anno(fun erl_anno:to_term/1, Abstract).
 
--spec anno_from_term(Term) -> abstract_form() | abstract_expr() when
+-spec anno_from_term(Term) -> erl_parse_tree() when
       Term :: term().
 
 anno_from_term(Term) ->
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl
index d2f53816b8..47223b129c 100644
--- a/lib/stdlib/src/erl_scan.erl
+++ b/lib/stdlib/src/erl_scan.erl
@@ -52,25 +52,15 @@
 %%% External exports
 
 -export([string/1,string/2,string/3,tokens/3,tokens/4,
-         format_error/1,reserved_word/1,
-         token_info/1,token_info/2,
-         attributes_info/1,attributes_info/2,set_attribute/3]).
+         format_error/1,reserved_word/1]).
 
 -export([column/1,end_location/1,line/1,location/1,text/1,
          category/1,symbol/1]).
 
--deprecated([{attributes_info, 1, next_major_release},
-             {attributes_info, 2, next_major_release},
-             {set_attribute, 3, next_major_release},
-             {token_info, 1, next_major_release},
-             {token_info, 2, next_major_release}]).
-
 %%% Private
 -export([continuation_location/1]).
 
 -export_type([error_info/0,
-              line/0,
-              location/0,
               options/0,
               return_cont/0,
               token/0,
@@ -85,29 +75,18 @@
 -define(ALINE(L), is_integer(L)).
 -define(STRING(S), is_list(S)).
 -define(RESWORDFUN(F), is_function(F, 1)).
--define(SETATTRFUN(F), is_function(F, 1)).
 
 -type category() :: atom().
--type column() :: pos_integer().                % Deprecated
--type line() :: integer().                      % Deprecated
--type location() :: line() | {line(),column()}. % Deprecated
 -type resword_fun() :: fun((atom()) -> boolean()).
 -type option() :: 'return' | 'return_white_spaces' | 'return_comments'
                 | 'text' | {'reserved_word_fun', resword_fun()}.
 -type options() :: option() | [option()].
 -type symbol() :: atom() | float() | integer() | string().
--type info_line() :: integer() | term().
--type attributes_data()
-       :: [{'column', column()} | {'line', info_line()} | {'text', string()}]
-        |  {line(), column()}.
-%% The fact that {line(),column()} is a possible attributes() type
-%% is hidden.
--type attributes() :: line() | attributes_data().
--type token() :: {category(), attributes(), symbol()}
-               | {category(), attributes()}.
+-type token() :: {category(), Anno :: erl_anno:anno(), symbol()}
+               | {category(), Anno :: erl_anno:anno()}.
 -type tokens() :: [token()].
 -type error_description() :: term().
--type error_info() :: {location(), module(), error_description()}.
+-type error_info() :: {erl_anno:location(), module(), error_description()}.
 
 %%% Local record.
 -record(erl_scan,
@@ -136,8 +115,8 @@ format_error(Other) ->
       String :: string(),
       Return :: {'ok', Tokens :: tokens(), EndLocation}
               | {'error', ErrorInfo :: error_info(), ErrorLocation},
-      EndLocation :: location(),
-      ErrorLocation :: location().
+      EndLocation :: erl_anno:location(),
+      ErrorLocation :: erl_anno:location().
 string(String) ->
     string(String, 1, []).
 
@@ -145,9 +124,9 @@ string(String) ->
       String :: string(),
       Return :: {'ok', Tokens :: tokens(), EndLocation}
               | {'error', ErrorInfo :: error_info(), ErrorLocation},
-      StartLocation :: location(),
-      EndLocation :: location(),
-      ErrorLocation :: location().
+      StartLocation :: erl_anno:location(),
+      EndLocation :: erl_anno:location(),
+      ErrorLocation :: erl_anno:location().
 string(String, StartLocation) ->
     string(String, StartLocation, []).
 
@@ -156,9 +135,9 @@ string(String, StartLocation) ->
       Options :: options(),
       Return :: {'ok', Tokens :: tokens(), EndLocation}
               | {'error', ErrorInfo :: error_info(), ErrorLocation},
-      StartLocation :: location(),
-      EndLocation :: location(),
-      ErrorLocation :: location().
+      StartLocation :: erl_anno:location(),
+      EndLocation :: erl_anno:location(),
+      ErrorLocation :: erl_anno:location().
 string(String, Line, Options) when ?STRING(String), ?ALINE(Line) ->
     string1(String, options(Options), Line, no_col, []);
 string(String, {Line,Column}, Options) when ?STRING(String),
@@ -167,20 +146,23 @@ string(String, {Line,Column}, Options) when ?STRING(String),
     string1(String, options(Options), Line, Column, []).
 
 -type char_spec() :: string() | 'eof'.
--type cont_fun() :: fun((char_spec(), #erl_scan{}, line(), column(),
+-type cont_fun() :: fun((char_spec(), #erl_scan{},
+                         erl_anno:line(), erl_anno:column(),
                          tokens(), any()) -> any()).
 -opaque return_cont() :: {erl_scan_continuation,
-                          string(), column(), tokens(), line(),
+                          string(), erl_anno:column(), tokens(),
+                          erl_anno:line(),
                           #erl_scan{}, any(), cont_fun()}.
--type tokens_result() :: {'ok', Tokens :: tokens(), EndLocation :: location()}
-                       | {'eof', EndLocation :: location()}
+-type tokens_result() :: {'ok', Tokens :: tokens(),
+                          EndLocation :: erl_anno:location()}
+                       | {'eof', EndLocation :: erl_anno:location()}
                        | {'error', ErrorInfo :: error_info(),
-                          EndLocation :: location()}.
+                          EndLocation :: erl_anno:location()}.
 
 -spec tokens(Continuation, CharSpec, StartLocation) -> Return when
       Continuation :: return_cont() | [],
       CharSpec :: char_spec(),
-      StartLocation :: location(),
+      StartLocation :: erl_anno:location(),
       Return :: {'done',Result :: tokens_result(),LeftOverChars :: char_spec()}
               | {'more', Continuation1 :: return_cont()}.
 tokens(Cont, CharSpec, StartLocation) ->
@@ -189,7 +171,7 @@ tokens(Cont, CharSpec, StartLocation) ->
 -spec tokens(Continuation, CharSpec, StartLocation, Options) -> Return when
       Continuation :: return_cont() | [],
       CharSpec :: char_spec(),
-      StartLocation :: location(),
+      StartLocation :: erl_anno:location(),
       Options :: options(),
       Return :: {'done',Result :: tokens_result(),LeftOverChars :: char_spec()}
               | {'more', Continuation1 :: return_cont()}.
@@ -257,155 +239,6 @@ symbol({_Category,_Anno,Symbol}) ->
 symbol(T) ->
     erlang:error(badarg, [T]).
 
--type attribute_item() :: 'column' | 'length' | 'line'
-                        | 'location' | 'text'.
--type info_location() :: location() | term().
--type attribute_info() :: {'column', column()}| {'length', pos_integer()}
-                        | {'line', info_line()}
-                        | {'location', info_location()}
-                        | {'text', string()}.
--type token_item() :: 'category' | 'symbol' | attribute_item().
--type token_info() :: {'category', category()} | {'symbol', symbol()}
-                    | attribute_info().
-
--spec token_info(Token) -> TokenInfo when
-      Token :: token(),
-      TokenInfo :: [TokenInfoTuple :: token_info()].
-token_info(Token) ->
-    Items = [category,column,length,line,symbol,text], % undefined order
-    token_info(Token, Items).
-
--spec token_info(Token, TokenItem) -> TokenInfoTuple | 'undefined' when
-                     Token :: token(),
-                     TokenItem :: token_item(),
-                     TokenInfoTuple :: token_info();
-                (Token, TokenItems) -> TokenInfo when
-                     Token :: token(),
-                     TokenItems :: [TokenItem :: token_item()],
-                     TokenInfo :: [TokenInfoTuple :: token_info()].
-token_info(_Token, []) ->
-    [];
-token_info(Token, [Item|Items]) when is_atom(Item) ->
-    case token_info(Token, Item) of
-        undefined ->
-            token_info(Token, Items);
-        TokenInfo when is_tuple(TokenInfo) ->
-            [TokenInfo|token_info(Token, Items)]
-    end;
-token_info({Category,_Attrs}, category=Item) ->
-    {Item,Category};
-token_info({Category,_Attrs,_Symbol}, category=Item) ->
-    {Item,Category};
-token_info({Category,_Attrs}, symbol=Item) ->
-    {Item,Category};
-token_info({_Category,_Attrs,Symbol}, symbol=Item) ->
-    {Item,Symbol};
-token_info({_Category,Attrs}, Item) ->
-    attributes_info(Attrs, Item);
-token_info({_Category,Attrs,_Symbol}, Item) ->
-    attributes_info(Attrs, Item).
-
--spec attributes_info(Attributes) -> AttributesInfo when
-      Attributes :: attributes(),
-      AttributesInfo :: [AttributeInfoTuple :: attribute_info()].
-attributes_info(Attributes) ->
-    Items = [column,length,line,text], % undefined order
-    attributes_info(Attributes, Items).
-
--spec attributes_info
-        (Attributes, AttributeItem) -> AttributeInfoTuple | 'undefined' when
-             Attributes :: attributes(),
-             AttributeItem :: attribute_item(),
-             AttributeInfoTuple :: attribute_info();
-        (Attributes, AttributeItems) -> AttributeInfo when
-             Attributes :: attributes(),
-             AttributeItems :: [AttributeItem :: attribute_item()],
-             AttributeInfo :: [AttributeInfoTuple :: attribute_info()].
-attributes_info(_Attrs, []) ->
-    [];
-attributes_info(Attrs, [A|As]) when is_atom(A) ->
-    case attributes_info(Attrs, A) of
-        undefined ->
-            attributes_info(Attrs, As);
-        AttributeInfo when is_tuple(AttributeInfo) ->
-            [AttributeInfo|attributes_info(Attrs, As)]
-    end;
-attributes_info({Line,Column}, column=Item) when ?ALINE(Line),
-                                                 ?COLUMN(Column) ->
-    {Item,Column};
-attributes_info(Line, column) when ?ALINE(Line) ->
-    undefined;
-attributes_info(Attrs, column=Item) ->
-    case attr_info(Attrs, Item) of
-        undefined ->
-            case erl_anno:column(Attrs) of
-                undefined ->
-                    undefined;
-                Column ->
-                    {Item,Column}
-            end;
-        T ->
-            T
-    end;
-attributes_info(Attrs, length=Item) ->
-    case attributes_info(Attrs, text) of
-        undefined ->
-            undefined;
-        {text,Text} ->
-            {Item,length(Text)}
-    end;
-attributes_info(Line, line=Item) when ?ALINE(Line) ->
-    {Item,Line};
-attributes_info({Line,Column}, line=Item) when ?ALINE(Line),
-                                               ?COLUMN(Column) ->
-    {Item,Line};
-attributes_info(Attrs, line=Item) ->
-    case attr_info(Attrs, Item) of
-        undefined ->
-            case attr_info(Attrs, location) of
-                {location,{Line,_Column}} ->
-                    {Item,Line};
-                {location,Line} ->
-                    {Item,Line};
-                undefined ->
-                    undefined
-            end;
-        T ->
-            T
-    end;
-attributes_info({Line,Column}=Location, location=Item) when ?ALINE(Line),
-                                                            ?COLUMN(Column) ->
-    {Item,Location};
-attributes_info(Line, location=Item) when ?ALINE(Line) ->
-    {Item,Line};
-attributes_info(Attrs, location=Item) ->
-    {line,Line} = attributes_info(Attrs, line),
-    case attributes_info(Attrs, column) of
-        undefined ->
-            %% If set_attribute() has assigned a term such as {17,42}
-            %% to 'line', then Line will look like {Line,Column}. One
-            %% should not use 'location' but 'line' and 'column' in
-            %% such special cases.
-            {Item,Line};
-        {column,Column} ->
-            {Item,{Line,Column}}
-    end;
-attributes_info({Line,Column}, text) when ?ALINE(Line), ?COLUMN(Column) ->
-    undefined;
-attributes_info(Line, text) when ?ALINE(Line) ->
-    undefined;
-attributes_info(Attrs, text=Item) ->
-    attr_info(Attrs, Item);
-attributes_info(T1, T2) ->
-    erlang:error(badarg, [T1,T2]).
-
--spec set_attribute(AttributeItem, Attributes, SetAttributeFun) -> Attributes when
-      AttributeItem :: 'line',
-      Attributes :: attributes(),
-      SetAttributeFun :: fun((info_line()) -> info_line()).
-set_attribute(Tag, Attributes, Fun) when ?SETATTRFUN(Fun) ->
-    set_attr(Tag, Attributes, Fun).
-
 %%%
 %%% Local functions
 %%%
@@ -471,62 +304,6 @@ expand_opt(return, Os) ->
 expand_opt(O, Os) ->
     [O|Os].
 
-attr_info(Attrs, Item) ->
-    try lists:keyfind(Item, 1, Attrs) of
-        {_Item, _Value} = T ->
-            T;
-        false ->
-            undefined
-    catch
-	_:_ ->
-            erlang:error(badarg, [Attrs, Item])
-    end.
-
--spec set_attr('line', attributes(), fun((line()) -> line())) -> attributes().
-
-set_attr(line, Line, Fun) when ?ALINE(Line) ->
-    Ln = Fun(Line),
-    if
-        ?ALINE(Ln) ->
-            Ln;
-        true ->
-            [{line,Ln}]
-    end;
-set_attr(line, {Line,Column}, Fun) when ?ALINE(Line), ?COLUMN(Column) ->
-    Ln = Fun(Line),
-    if
-        ?ALINE(Ln) ->
-            {Ln,Column};
-        true ->
-            [{line,Ln},{column,Column}]
-    end;
-set_attr(line=Tag, Attrs, Fun) when is_list(Attrs) ->
-    case lists:keyfind(Tag, 1, Attrs) of
-        {line,Line} ->
-            case lists:keyreplace(Tag, 1, Attrs, {line,Fun(Line)}) of
-                [{line,Ln}] when ?ALINE(Ln) ->
-                    Ln;
-                As ->
-                    As
-            end;
-        false ->
-            {location, Location} = lists:keyfind(location, 1, Attrs),
-            Ln = case Location of
-                     {Line,Column} when ?ALINE(Line), ?COLUMN(Column) ->
-                         {Fun(Line),Column};
-                     _ ->
-                         Fun(Location)
-                 end,
-            case lists:keyreplace(location, 1, Attrs, {location,Ln}) of
-                [{location,Ln}] when ?ALINE(Ln) ->
-                    Ln;
-                As ->
-                    As
-            end
-    end;
-set_attr(T1, T2, T3) ->
-    erlang:error(badarg, [T1,T2,T3]).
-
 tokens1(Cs, St, Line, Col, Toks, Fun, Any) when ?STRING(Cs); Cs =:= eof ->
     case Fun(Cs, St, Line, Col, Toks, Any) of
         {more,{Cs0,Ncol,Ntoks,Nline,Nany,Nfun}} ->
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index 41b49f4a86..b8ce311c35 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -38,7 +38,7 @@
 -record(state, {file         :: file:filename(),
                 module       :: module(),
                 forms_or_bin,
-                source       :: source(),
+                source       :: source() | 'undefined',
                 n_errors     :: non_neg_integer(),
                 mode         :: mode(),
                 exports_main :: boolean(),
@@ -49,9 +49,9 @@
 -type emu_args() :: string().
 
 -record(sections, {type,
-		   shebang  :: shebang(),
-		   comment  :: comment(),
-		   emu_args :: emu_args(),
+		   shebang  :: shebang() | 'undefined',
+		   comment  :: comment() | 'undefined',
+		   emu_args :: emu_args() | 'undefined',
 		   body}).
 
 -record(extract_options, {compile_source}).
diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl
index 847def2fd8..1fca3624dc 100644
--- a/lib/stdlib/src/ets.erl
+++ b/lib/stdlib/src/ets.erl
@@ -146,7 +146,7 @@ info(_) ->
       Tab :: tab(),
       Item :: compressed | fixed | heir | keypos | memory
             | name | named_table | node | owner | protection
-            | safe_fixed | size | stats | type
+            | safe_fixed | safe_fixed_monotonic_time | size | stats | type
 	    | write_concurrency | read_concurrency,
       Value :: term().
 
diff --git a/lib/stdlib/src/file_sorter.erl b/lib/stdlib/src/file_sorter.erl
index 47adb133b0..3aeaff8dc4 100644
--- a/lib/stdlib/src/file_sorter.erl
+++ b/lib/stdlib/src/file_sorter.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2001-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.
@@ -28,6 +28,8 @@
          check/1, check/2, 
          keycheck/2, keycheck/3]).
 
+-dialyzer(no_improper_lists).
+
 -include_lib("kernel/include/file.hrl").
 
 -define(CHUNKSIZE, 16384).
@@ -305,7 +307,6 @@ options(Option) ->
 
 options([{format, Format} | L], Opts) when Format =:= binary; 
                                            Format =:= term;
-                                           is_function(Format),
                                            is_function(Format, 1) ->
     options(L, Opts#opts{format = Format});
 options([{format, binary_term} | L], Opts) ->
@@ -324,7 +325,7 @@ options([{tmpdir, Dir} | L],  Opts) ->
         FileName -> 
             options(L, Opts#opts{tmpdir = {dir, FileName}})
     end;
-options([{order, Fun} | L], Opts) when is_function(Fun), is_function(Fun, 2) ->
+options([{order, Fun} | L], Opts) when is_function(Fun, 2) ->
     options(L, Opts#opts{order = Fun});
 options([{order, Order} | L], Opts) when Order =:= ascending; 
                                          Order =:= descending ->
@@ -409,7 +410,7 @@ merge_terms_fun(RFun) ->
             case RFun(read) of
                 end_of_input ->
                     eof;
-                {Objs, NRFun} when is_function(NRFun), is_function(NRFun, 1) ->
+                {Objs, NRFun} when is_function(NRFun, 1) ->
                     {_, [], Ts, _} = fun_objs(Objs, [], 0, ?MAXSIZE, I, W),
                     {{I, Ts, ?CHUNKSIZE}, merge_terms_fun(NRFun)};
                 Error ->
@@ -425,13 +426,12 @@ merge_bins_fun(FileName) ->
             Fun(A)
     end.
 
-wrap_output_terms(term, OutFun, _Z) when is_function(OutFun),
-                                         is_function(OutFun, 1) ->
+wrap_output_terms(term, OutFun, _Z) when is_function(OutFun, 1) ->
     {fun_wterms(OutFun), true};
 wrap_output_terms(term, File, Z) when File =/= undefined ->
     {file_wterms(name, File, Z++[write]), false};
 wrap_output_terms(_Format, Output, _Z) ->
-    {Output, is_function(Output) and is_function(Output, 1)}.
+    {Output, is_function(Output, 1)}.
 
 binary_term_fun() ->
     fun binary_to_term/1.
@@ -1309,8 +1309,7 @@ infun(W) ->
             {end_of_input, W1};
         {end_of_input, Value} ->
             {end_of_input, W1#w{inout_value = {value, Value}}};
-        {Objs, NFun} when is_function(NFun), 
-                          is_function(NFun, 1), 
+        {Objs, NFun} when is_function(NFun, 1),
                           is_list(Objs) ->
             {cont, W#w{in = NFun}, Objs};
         Error ->
@@ -1333,7 +1332,7 @@ outfun(A, W) ->
     try (W#w.out)(A) of
         Reply when A =:= close ->
             Reply;
-        NF when is_function(NF), is_function(NF, 1) ->
+        NF when is_function(NF, 1) ->
             W#w{out = NF};
         Error ->
             error(Error, W1)
@@ -1358,7 +1357,7 @@ is_keyposs([Bad | _]) ->
 is_keyposs(Bad) ->
     {badarg, Bad}.
 
-is_input(Fun) when is_function(Fun), is_function(Fun, 1) ->
+is_input(Fun) when is_function(Fun, 1) ->
     {true, Fun};
 is_input(Files) ->
     is_files(Files).
@@ -1378,7 +1377,7 @@ is_files([], L) ->
 is_files(Bad, _L) ->
     {badarg, Bad}.
 
-maybe_output(Fun) when is_function(Fun), is_function(Fun, 1) ->
+maybe_output(Fun) when is_function(Fun, 1) ->
     {true, Fun};
 maybe_output(File) ->
     case read_file_info(File) of
@@ -1587,7 +1586,6 @@ fun_rterms(InFun) ->
        (read) ->
             case InFun(read) of
                 {Ts, NInFun} when is_list(Ts), 
-                                  is_function(NInFun),
                                   is_function(NInFun, 1) ->
                     {to_bin(Ts, []), fun_rterms(NInFun)};
                 Else ->
@@ -1600,7 +1598,7 @@ fun_wterms(OutFun) ->
             OutFun(close);
        (L) ->
             case OutFun(wterms_arg(L)) of
-                NOutFun when is_function(NOutFun), is_function(NOutFun, 1) ->
+                NOutFun when is_function(NOutFun, 1) ->
                     fun_wterms(NOutFun);
                 Else ->
                     Else
diff --git a/lib/stdlib/src/filename.erl b/lib/stdlib/src/filename.erl
index 008beb8b67..37f87b1ff9 100644
--- a/lib/stdlib/src/filename.erl
+++ b/lib/stdlib/src/filename.erl
@@ -36,6 +36,7 @@
 	 extension/1, join/1, join/2, pathtype/1,
 	 rootname/1, rootname/2, split/1, nativename/1]).
 -export([find_src/1, find_src/2, flatten/1]).
+-export([basedir/2, basedir/3]).
 
 %% Undocumented and unsupported exports.
 -export([append/2]).
@@ -139,6 +140,7 @@ absname_join(AbsBase, Name) ->
 
 -spec basename(Filename) -> file:filename_all() when
       Filename :: file:name_all().
+
 basename(Name) when is_binary(Name) ->
     case os:type() of
 	{win32,_} ->
@@ -954,3 +956,180 @@ filename_string_to_binary(List) ->
 	    Bin
     end.
 
+%% Application Base Directories
+%% basedir
+%% http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+
+-type basedir_type() :: 'user_cache' | 'user_config' | 'user_data'
+                      | 'user_log'
+                      | 'site_config' | 'site_data'.
+
+-spec basedir(Type,Application) -> file:filename_all() when
+      Type :: basedir_type(),
+      Application :: string() | binary().
+
+basedir(Type,Application) when is_atom(Type), is_list(Application) orelse
+                                              is_binary(Application) ->
+    basedir(Type, Application, #{}).
+
+-spec basedir(Type,Application,Opts) -> file:filename_all() when
+      Type :: basedir_type(),
+      Application :: string() | binary(),
+      Opts :: #{author => string() | binary(),
+                os => 'windows' | 'darwin' | 'linux',
+                version => string() | binary()}.
+
+basedir(Type,Application,Opts) when is_atom(Type), is_map(Opts),
+                                    is_list(Application) orelse
+                                    is_binary(Application) ->
+    Os   = basedir_os_from_opts(Opts),
+    Name = basedir_name_from_opts(Os,Application,Opts),
+    Base = basedir_from_os(Type,Os),
+    case {Type,Os} of
+        {user_log,linux} ->
+            filename:join([Base,Name,"log"]);
+        {user_log,windows} ->
+            filename:join([Base,Name,"Logs"]);
+        {user_cache,windows} ->
+            filename:join([Base,Name,"Cache"]);
+        {Type,_} when Type =:= site_config orelse Type =:= site_data ->
+            [filename:join([B,Name]) || B <- Base];
+        _ ->
+            filename:join([Base,Name])
+    end.
+
+basedir_os_from_opts(#{os := linux}) -> linux;
+basedir_os_from_opts(#{os := windows}) -> windows;
+basedir_os_from_opts(#{os := darwin}) -> darwin;
+basedir_os_from_opts(#{}) -> basedir_os_type().
+
+basedir_name_from_opts(windows,App,#{author:=Author,version:=Vsn}) ->
+    filename:join([Author,App,Vsn]);
+basedir_name_from_opts(windows,App,#{author:=Author}) ->
+    filename:join([Author,App]);
+basedir_name_from_opts(_,App,#{version:=Vsn}) ->
+    filename:join([App,Vsn]);
+basedir_name_from_opts(_,App,_) ->
+    App.
+
+basedir_from_os(Type,Os) ->
+    case Os of
+        linux   -> basedir_linux(Type);
+        darwin  -> basedir_darwin(Type);
+        windows -> basedir_windows(Type)
+    end.
+
+-define(basedir_linux_user_data,   ".local/share").
+-define(basedir_linux_user_config, ".config").
+-define(basedir_linux_user_cache,  ".cache").
+-define(basedir_linux_user_log,    ".cache"). %% .cache/App/log
+-define(basedir_linux_site_data,   "/usr/local/share/:/usr/share/").
+-define(basedir_linux_site_config, "/etc/xdg").
+
+basedir_linux(Type) ->
+    case Type of
+        user_data   -> getenv("XDG_DATA_HOME",  ?basedir_linux_user_data,  true);
+        user_config -> getenv("XDG_CONFIG_HOME",?basedir_linux_user_config,true);
+        user_cache  -> getenv("XDG_CACHE_HOME", ?basedir_linux_user_cache, true);
+        user_log    -> getenv("XDG_CACHE_HOME", ?basedir_linux_user_log,   true);
+        site_data   ->
+            Base = getenv("XDG_DATA_DIRS",?basedir_linux_site_data,false),
+            string:tokens(Base,":");
+        site_config ->
+            Base = getenv("XDG_CONFIG_DIRS",?basedir_linux_site_config,false),
+            string:tokens(Base,":")
+    end.
+
+-define(basedir_darwin_user_data,   "Library/Application Support").
+-define(basedir_darwin_user_config, "Library/Application Support").
+-define(basedir_darwin_user_cache,  "Library/Caches").
+-define(basedir_darwin_user_log,    "Library/Logs").
+-define(basedir_darwin_site_data,   "/Library/Application Support").
+-define(basedir_darwin_site_config, "/Library/Application Support").
+
+basedir_darwin(Type) ->
+    case Type of
+        user_data   -> basedir_join_home(?basedir_darwin_user_data);
+        user_config -> basedir_join_home(?basedir_darwin_user_config);
+        user_cache  -> basedir_join_home(?basedir_darwin_user_cache);
+        user_log    -> basedir_join_home(?basedir_darwin_user_log);
+        site_data   -> [?basedir_darwin_site_data];
+        site_config -> [?basedir_darwin_site_config]
+    end.
+
+%% On Windows:
+%% ex. C:\Users\egil\AppData\Local\Ericsson\Erlang
+%% %LOCALAPPDATA% is defined on Windows 7 and onwards
+%% %APPDATA% is used instead of %LOCALAPPDATA% if it's not defined.
+%% %APPDATA% is used for roaming, i.e. for user_config on Windows 7 and beyond.
+%%
+%% user_data    %LOCALAPPDATA%[/$author]/$appname[/$version]
+%% user_config  %APPDATA%[/$author]/$appname[/$version]
+%% user_cache   %LOCALAPPDATA%[/$author]/$appname[/$version]/Cache
+%% user_log     %LOCALAPPDATA%[/$author]/$appname[/$version]/Logs
+
+-define(basedir_windows_user_data,   "Local").
+-define(basedir_windows_user_config, "Roaming").
+-define(basedir_windows_user_cache,  "Local").    %% Cache is added later
+-define(basedir_windows_user_log,    "Local").    %% Logs is added later
+
+basedir_windows(Type) ->
+    %% If LOCALAPPDATA is not defined we are likely on an
+    %% XP machine. Use APPDATA instead.
+    case basedir_windows_appdata() of
+        noappdata ->
+            %% No AppData is set
+            %% Probably running MSYS
+            case Type of
+                user_data   -> basedir_join_home(?basedir_windows_user_data);
+                user_config -> basedir_join_home(?basedir_windows_user_config);
+                user_cache  -> basedir_join_home(?basedir_windows_user_cache);
+                user_log    -> basedir_join_home(?basedir_windows_user_log);
+                site_data   -> [];
+                site_config -> []
+            end;
+        {ok, AppData} ->
+            case Type of
+                user_data   -> getenv("LOCALAPPDATA", AppData);
+                user_config -> AppData;
+                user_cache  -> getenv("LOCALAPPDATA", AppData);
+                user_log    -> getenv("LOCALAPPDATA", AppData);
+                site_data   -> [];
+                site_config -> []
+            end
+    end.
+
+basedir_windows_appdata() ->
+    case os:getenv("APPDATA") of
+        Invalid when Invalid =:= false orelse Invalid =:= [] ->
+            noappdata;
+        Val ->
+            {ok, Val}
+    end.
+
+%% basedir aux
+
+getenv(K,Def,false) -> getenv(K,Def);
+getenv(K,Def,true)  -> getenv(K,basedir_join_home(Def)).
+
+getenv(K,Def) ->
+    case os:getenv(K) of
+        []    -> Def;
+        false -> Def;
+        Val   -> Val
+    end.
+
+basedir_join_home(Dir) ->
+    case os:getenv("HOME") of
+        false ->
+            {ok,[[Home]]} = init:get_argument(home),
+            filename:join(Home,Dir);
+        Home  -> filename:join(Home,Dir)
+    end.
+
+basedir_os_type() ->
+    case os:type() of
+        {unix,darwin} -> darwin;
+        {win32,_}     -> windows;
+        _             -> linux
+    end.
diff --git a/lib/stdlib/src/io.erl b/lib/stdlib/src/io.erl
index 284f2e5a2b..f510f61e9f 100644
--- a/lib/stdlib/src/io.erl
+++ b/lib/stdlib/src/io.erl
@@ -444,7 +444,7 @@ scan_erl_form(Io, Prompt, Pos0, Options) ->
 %% Parsing Erlang code.
 
 -type parse_ret() :: {'ok',
-                      ExprList :: erl_parse:abstract_expr(),
+                      ExprList :: [erl_parse:abstract_expr()],
                       EndLocation :: location()}
                    | {'eof', EndLocation :: location()}
                    | {'error',
@@ -631,41 +631,20 @@ io_requests(Pid, [], [Rs|Cont], Tail) ->
 io_requests(_Pid, [], [], _Tail) -> 
     {false,[]}.
 
-
-bc_req(Pid,{Op,Enc,Param},MaybeConvert) ->
-    case net_kernel:dflag_unicode_io(Pid) of
-	true ->
-	    {false,{Op,Enc,Param}};
-	false ->
-	    {MaybeConvert,{Op,Param}}
-    end;
-bc_req(Pid,{Op,Enc,P,F},MaybeConvert) ->
-    case net_kernel:dflag_unicode_io(Pid) of
-	true ->
-	    {false,{Op,Enc,P,F}};
-	false ->
-	    {MaybeConvert,{Op,P,F}}
-    end;
-bc_req(Pid, {Op,Enc,M,F,A},MaybeConvert) ->
+bc_req(Pid, Req0, MaybeConvert) ->
     case net_kernel:dflag_unicode_io(Pid) of
 	true ->
-	    {false,{Op,Enc,M,F,A}};
+	    %% The most common case. A modern i/o server.
+	    {false,Req0};
 	false ->
-	    {MaybeConvert,{Op,M,F,A}}
-    end;
-bc_req(Pid, {Op,Enc,P,M,F,A},MaybeConvert) ->
-    case net_kernel:dflag_unicode_io(Pid) of
-	true ->
-	    {false,{Op,Enc,P,M,F,A}};
-	false ->
-	    {MaybeConvert,{Op,P,M,F,A}}
-    end;
-bc_req(Pid,{Op,Enc},MaybeConvert) ->
-    case net_kernel:dflag_unicode_io(Pid) of
-	true ->
-	    {false,{Op, Enc}};
-	false ->
-	    {MaybeConvert,Op}
+	    %% Backward compatibility only. Unlikely to ever happen.
+	    case tuple_to_list(Req0) of
+		[Op,_Enc] ->
+		    {MaybeConvert,Op};
+		[Op,_Enc|T] ->
+		    Req = list_to_tuple([Op|T]),
+		    {MaybeConvert,Req}
+	    end
     end.
 
 io_request(Pid, {write,Term}) ->
diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl
index 62b6ca8a21..2b4472cdf7 100644
--- a/lib/stdlib/src/lists.erl
+++ b/lib/stdlib/src/lists.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -2267,6 +2267,8 @@ ukeysplit_2(I, Y, EY, [Z | L], R) ->
 ukeysplit_2(_I, Y, _EY, [], R) ->
     [Y | R].
 
+-dialyzer({no_improper_lists, ukeymergel/3}).
+
 ukeymergel(I, [T1, [H2 | T2], [H3 | T3] | L], Acc) ->
     %% The fourth argument, [H2 | H3] (=HdM), may confuse type
     %% checkers. Its purpose is to ensure that the tests H2 == HdM
diff --git a/lib/stdlib/src/maps.erl b/lib/stdlib/src/maps.erl
index 3c798b7a04..43d10f4800 100644
--- a/lib/stdlib/src/maps.erl
+++ b/lib/stdlib/src/maps.erl
@@ -205,7 +205,7 @@ size(Val) ->
     K :: term().
 
 without(Ks,M) when is_list(Ks), is_map(M) ->
-    maps:from_list([{K,V}||{K,V} <- maps:to_list(M), not lists:member(K, Ks)]);
+    lists:foldl(fun(K, M1) -> ?MODULE:remove(K, M1) end, M, Ks);
 without(Ks,M) ->
     erlang:error(error_type(M),[Ks,M]).
 
@@ -216,8 +216,16 @@ without(Ks,M) ->
     Map2 :: map(),
     K :: term().
 
-with(Ks,M) when is_list(Ks), is_map(M) ->
-    maps:from_list([{K,V}||{K,V} <- maps:to_list(M), lists:member(K, Ks)]);
+with(Ks,Map1) when is_list(Ks), is_map(Map1) ->
+    Fun = fun(K, List) ->
+      case ?MODULE:find(K, Map1) of
+          {ok, V} ->
+              [{K, V} | List];
+          error ->
+              List
+      end
+    end,
+    ?MODULE:from_list(lists:foldl(Fun, [], Ks));
 with(Ks,M) ->
     erlang:error(error_type(M),[Ks,M]).
 
diff --git a/lib/stdlib/src/ms_transform.erl b/lib/stdlib/src/ms_transform.erl
index b67b6f75d7..24b5fde1db 100644
--- a/lib/stdlib/src/ms_transform.erl
+++ b/lib/stdlib/src/ms_transform.erl
@@ -307,15 +307,18 @@ cleanup_filename({Old,OldRec,OldWarnings}) ->
 
 add_record_definition({Name,FieldList}) ->
     {KeyList,_} = lists:foldl(
-		    fun({record_field,_,{atom,Line0,FieldName}},{L,C}) ->
-			    {[{FieldName,C,{atom,Line0,undefined}}|L],C+1};
-		       ({record_field,_,{atom,_,FieldName},Def},{L,C}) ->
-			    {[{FieldName,C,Def}|L],C+1}
-		    end,
+                    fun(F, {L,C}) -> {[record_field(F, C)|L],C+1} end,
 		    {[],2},
 		    FieldList),
     put_records([{Name,KeyList}|get_records()]).
 
+record_field({record_field,_,{atom,Line0,FieldName}}, C) ->
+    {FieldName,C,{atom,Line0,undefined}};
+record_field({record_field,_,{atom,_,FieldName},Def}, C) ->
+    {FieldName,C,Def};
+record_field({typed_record_field,Field,_Type}, C) ->
+    record_field(Field, C).
+
 forms([F0|Fs0]) ->
     F1 = form(F0),
     Fs1 = forms(Fs0),
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 2d77888512..052dffdbfd 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1999-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.
@@ -23,6 +23,8 @@
 
 %%----------------------------------------------------------------------
 
+-dialyzer({no_match, obsolete/3}).
+
 -type tag()     :: 'deprecated' | 'removed'. %% | 'experimental'.
 -type mfas()    :: mfa() | {atom(), atom(), [byte()]}.
 -type release() :: string().
@@ -45,18 +47,6 @@ obsolete(Module, Name, Arity) ->
 obsolete_1(net, _, _) ->
     {deprecated, "module 'net' obsolete; use 'net_adm'"};
 
-obsolete_1(erl_internal, builtins, 0) ->
-    {deprecated, {erl_internal, bif, 2}};
-
-obsolete_1(erl_eval, seq, 2) ->
-    {deprecated, {erl_eval, exprs, 2}};
-obsolete_1(erl_eval, seq, 3) ->
-    {deprecated, {erl_eval, exprs, 3}};
-obsolete_1(erl_eval, arg_list, 2) ->
-    {deprecated, {erl_eval, expr_list, 2}};
-obsolete_1(erl_eval, arg_list, 3) ->
-    {deprecated, {erl_eval, expr_list, 3}};
-
 obsolete_1(erlang, hash, 2) ->
     {deprecated, {erlang, phash2, 2}};
 
@@ -68,10 +58,6 @@ obsolete_1(erlang, now, 0) ->
 obsolete_1(calendar, local_time_to_universal_time, 1) ->
     {deprecated, {calendar, local_time_to_universal_time_dst, 1}};
 
-obsolete_1(rpc, safe_multi_server_call, A) when A =:= 2; A =:= 3 ->
-    {deprecated, {rpc, multi_server_call, A}};
-
-
 %% *** CRYPTO add in R16B01 ***
 
 obsolete_1(crypto, md4, 1) ->
@@ -389,106 +375,10 @@ obsolete_1(http, cookie_header, 2)    -> {removed,{httpc,cookie_header,2},"R15B"
 obsolete_1(http, stream_next, 1)      -> {removed,{httpc,stream_next,1},"R15B"};
 obsolete_1(http, default_profile, 0)  -> {removed,{httpc,default_profile,0},"R15B"};
 
-obsolete_1(httpd, start, 0) 	      -> {removed,{inets,start,[2,3]},"R14B"};
-obsolete_1(httpd, start, 1) 	      -> {removed,{inets,start,[2,3]},"R14B"};
-obsolete_1(httpd, start_link, 0)      -> {removed,{inets,start,[2,3]},"R14B"};
-obsolete_1(httpd, start_link, 1)      -> {removed,{inets,start,[2,3]},"R14B"};
-obsolete_1(httpd, start_child, 0)     -> {removed,{inets,start,[2,3]},"R14B"};
-obsolete_1(httpd, start_child, 1)     -> {removed,{inets,start,[2,3]},"R14B"};
-obsolete_1(httpd, stop, 0) 	      -> {removed,{inets,stop,2},"R14B"};
-obsolete_1(httpd, stop, 1)            -> {removed,{inets,stop,2},"R14B"};
-obsolete_1(httpd, stop, 2)            -> {removed,{inets,stop,2},"R14B"};
-obsolete_1(httpd, stop_child, 0)      -> {removed,{inets,stop,2},"R14B"};
-obsolete_1(httpd, stop_child, 1)      -> {removed,{inets,stop,2},"R14B"};
-obsolete_1(httpd, stop_child, 2)      -> {removed,{inets,stop,2},"R14B"};
-obsolete_1(httpd, restart, 0) 	      -> {removed,{httpd,reload_config,2},"R14B"};
-obsolete_1(httpd, restart, 1) 	      -> {removed,{httpd,reload_config,2},"R14B"};
-obsolete_1(httpd, restart, 2) 	      -> {removed,{httpd,reload_config,2},"R14B"};
-obsolete_1(httpd, block, 0) 	      -> {removed,{httpd,reload_config,2},"R14B"};
-obsolete_1(httpd, block, 1) 	      -> {removed,{httpd,reload_config,2},"R14B"};
-obsolete_1(httpd, block, 2) 	      -> {removed,{httpd,reload_config,2},"R14B"};
-obsolete_1(httpd, block, 3) 	      -> {removed,{httpd,reload_config,2},"R14B"};
-obsolete_1(httpd, block, 4)	      -> {removed,{httpd,reload_config,2},"R14B"};
-obsolete_1(httpd, unblock, 0) 	      -> {removed,{httpd,reload_config,2},"R14B"};
-obsolete_1(httpd, unblock, 1)         -> {removed,{httpd,reload_config,2},"R14B"};
-obsolete_1(httpd, unblock, 2)         -> {removed,{httpd,reload_config,2},"R14B"};
-obsolete_1(httpd_util, key1search, 2) -> {removed,{proplists,get_value,2},"R13B"};
-obsolete_1(httpd_util, key1search, 3) -> {removed,{proplists,get_value,3},"R13B"};
-obsolete_1(ftp, open, 3)              -> {removed,{inets,start,[2,3]},"R14B"};
-obsolete_1(ftp, force_active, 1)      -> {removed,{inets,start,[2,3]},"R14B"};
-
-%% Added in R12B-4.
-obsolete_1(ssh_cm, connect, A) when 1 =< A, A =< 3 ->
-    {removed,{ssh,connect,A},"R14B"};
-obsolete_1(ssh_cm, listen, A) when 2 =< A, A =< 4 ->
-    {removed,{ssh,daemon,A},"R14B"};
-obsolete_1(ssh_cm, stop_listener, 1) ->
-    {removed,{ssh,stop_listener,[1,2]},"R14B"};
-obsolete_1(ssh_cm, session_open, A) when A =:= 2; A =:= 4 ->
-    {removed,{ssh_connection,session_channel,A},"R14B"};
-obsolete_1(ssh_cm, direct_tcpip, A) when A =:= 6; A =:= 8 ->
-    {removed,{ssh_connection,direct_tcpip,A},"R14B"};
-obsolete_1(ssh_cm, tcpip_forward, 3) ->
-    {removed,{ssh_connection,tcpip_forward,3},"R14B"};
-obsolete_1(ssh_cm, cancel_tcpip_forward, 3) ->
-    {removed,{ssh_connection,cancel_tcpip_forward,3},"R14B"};
-obsolete_1(ssh_cm, open_pty, A) when A =:= 3; A =:= 7; A =:= 9 ->
-    {removed,{ssh_connection,open_pty,A},"R14B"};
-obsolete_1(ssh_cm, setenv, 5) ->
-    {removed,{ssh_connection,setenv,5},"R14B"};
-obsolete_1(ssh_cm, shell, 2) ->
-    {removed,{ssh_connection,shell,2},"R14B"};
-obsolete_1(ssh_cm, exec, 4) ->
-    {removed,{ssh_connection,exec,4},"R14B"};
-obsolete_1(ssh_cm, subsystem, 4) ->
-    {removed,{ssh_connection,subsystem,4},"R14B"};
-obsolete_1(ssh_cm, winch, A) when A =:= 4; A =:= 6 ->
-    {removed,{ssh_connection,window_change,A},"R14B"};
-obsolete_1(ssh_cm, signal, 3) ->
-    {removed,{ssh_connection,signal,3},"R14B"};
-obsolete_1(ssh_cm, attach, A) when A =:= 2; A =:= 3 ->
-    {removed,"no longer useful; removed in R14B"};
-obsolete_1(ssh_cm, detach, 2) ->
-    {removed,"no longer useful; removed in R14B"};
-obsolete_1(ssh_cm, set_user_ack, 4) ->
-    {removed,"no longer useful; removed in R14B"};
-obsolete_1(ssh_cm, adjust_window, 3) ->
-    {removed,{ssh_connection,adjust_window,3},"R14B"};
-obsolete_1(ssh_cm, close, 2) ->
-    {removed,{ssh_connection,close,2},"R14B"};
-obsolete_1(ssh_cm, stop, 1) ->
-    {removed,{ssh,close,1},"R14B"};
-obsolete_1(ssh_cm, send_eof, 2) ->
-    {removed,{ssh_connection,send_eof,2},"R14B"};
-obsolete_1(ssh_cm, send, A) when A =:= 3; A =:= 4 ->
-    {removed,{ssh_connection,send,A},"R14B"};
-obsolete_1(ssh_cm, send_ack, A) when 3 =< A, A =< 5 ->
-    {removed,{ssh_connection,send,[3,4]},"R14B"};
-obsolete_1(ssh_ssh, connect, A) when 1 =< A, A =< 3 ->
-    {removed,{ssh,shell,A},"R14B"};
-obsolete_1(ssh_sshd, listen, A) when 0 =< A, A =< 3 ->
-    {removed,{ssh,daemon,[1,2,3]},"R14B"};
-obsolete_1(ssh_sshd, stop, 1) ->
-    {removed,{ssh,stop_listener,1},"R14B"};
-
 %% Added in R13A.
 obsolete_1(regexp, _, _) ->
     {removed, "removed in R15; use the re module instead"};
 
-obsolete_1(lists, flat_length, 1) ->
-    {removed,{lists,flatlength,1},"R14"};
-
-obsolete_1(ssh_sftp, connect, A) when 1 =< A, A =< 3 ->
-    {removed,{ssh_sftp,start_channel,A},"R14B"};
-obsolete_1(ssh_sftp, stop, 1) ->
-    {removed,{ssh_sftp,stop_channel,1},"R14B"};
-
-%% Added in R13B01.
-obsolete_1(ssl_pkix, decode_cert_file, A) when A =:= 1; A =:= 2 ->
-    {removed,"removed in R14A; use public_key:pem_to_der/1 and public_key:pkix_decode_cert/2 instead"};
-obsolete_1(ssl_pkix, decode_cert, A) when A =:= 1; A =:= 2 ->
-    {removed,{public_key,pkix_decode_cert,2},"R14A"};
-
 %% Added in R13B04.
 obsolete_1(erlang, concat_binary, 1) ->
     {removed,{erlang,list_to_binary,1},"R15B"};
@@ -586,49 +476,40 @@ obsolete_1(asn1rt, utf8_list_to_binary, 1) ->
 
 %% Added in OTP 18.
 obsolete_1(core_lib, get_anno, 1) ->
-    {deprecated,{cerl,get_ann,1}};
+    {removed,{cerl,get_ann,1},"19"};
 obsolete_1(core_lib, set_anno, 2) ->
-    {deprecated,{cerl,set_ann,2}};
+    {removed,{cerl,set_ann,2},"19"};
 obsolete_1(core_lib, is_literal, 1) ->
-    {deprecated,{cerl,is_literal,1}};
+    {removed,{cerl,is_literal,1},"19"};
 obsolete_1(core_lib, is_literal_list, 1) ->
-    {deprecated,"deprecated; use lists:all(fun cerl:is_literal/1, L)"
+    {removed,"removed; use lists:all(fun cerl:is_literal/1, L)"
      " instead"};
 obsolete_1(core_lib, literal_value, 1) ->
-    {deprecated,{core_lib,concrete,1}};
+    {removed,{core_lib,concrete,1},"19"};
 obsolete_1(erl_scan, set_attribute, 3) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use erl_anno:set_line/2 instead"};
+    {removed,{erl_anno,set_line,2},"19.0"};
 obsolete_1(erl_scan, attributes_info, 1) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use "
+    {removed,"removed in 19.0; use "
      "erl_anno:{column,line,location,text}/1 instead"};
 obsolete_1(erl_scan, attributes_info, 2) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use "
+    {removed,"removed in 19.0; use "
      "erl_anno:{column,line,location,text}/1 instead"};
 obsolete_1(erl_scan, token_info, 1) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use "
+    {removed,"removed in 19.0; use "
      "erl_scan:{category,column,line,location,symbol,text}/1 instead"};
 obsolete_1(erl_scan, token_info, 2) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use "
+    {removed,"removed in 19.0; use "
      "erl_scan:{category,column,line,location,symbol,text}/1 instead"};
 obsolete_1(erl_parse, set_line, 2) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use erl_anno:set_line/2 instead"};
+    {removed,{erl_anno,set_line,2},"19.0"};
 obsolete_1(erl_parse, get_attributes, 1) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use "
+    {removed,"removed in 19.0; use "
      "erl_anno:{column,line,location,text}/1 instead"};
 obsolete_1(erl_parse, get_attribute, 2) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use "
+    {removed,"removed in 19.0; use "
      "erl_anno:{column,line,location,text}/1 instead"};
 obsolete_1(erl_lint, modify_line, 2) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use erl_parse:map_anno/2 instead"};
+    {removed,{erl_parse,map_anno,2},"19.0"};
 obsolete_1(ssl, negotiated_next_protocol, 1) ->
     {deprecated,{ssl,negotiated_protocol,1}};
 
@@ -648,6 +529,21 @@ obsolete_1(httpd_conf, is_file, 1) ->
 obsolete_1(httpd_conf, make_integer, 1) ->
     {deprecated, "deprecated; use erlang:list_to_integer/1 instead"};
 
+%% Added in OTP 19.
+
+obsolete_1(random, _, _) ->
+    {deprecated, "the 'random' module is deprecated; "
+     "use the 'rand' module instead"};
+obsolete_1(code, rehash, 0) ->
+    {deprecated, "deprecated because the code path cache feature has been removed"};
+
+%% Removed in OTP 19.
+
+obsolete_1(overload, _, _) ->
+    {removed, "removed in OTP 19"};
+obsolete_1(rpc, safe_multi_server_call, A) when A =:= 2; A =:= 3 ->
+    {removed, {rpc, multi_server_call, A}};
+
 obsolete_1(_, _, _) ->
     no.
 
@@ -695,29 +591,29 @@ is_snmp_agent_function(del_agent_caps,        1) -> true;
 is_snmp_agent_function(get_agent_caps,        0) -> true;
 is_snmp_agent_function(_,		      _) -> false.
 
+-dialyzer({no_match, obsolete_type/3}).
+
 -spec obsolete_type(module(), atom(), arity()) ->
 	'no' | {tag(), string()} | {tag(), mfas(), release()}.
 
+-dialyzer({no_match, obsolete_type/3}).
 obsolete_type(Module, Name, NumberOfVariables) ->
     case obsolete_type_1(Module, Name, NumberOfVariables) of
-%% 	{deprecated=Tag,{_,_,_}=Replacement} ->
-%% 	    {Tag,Replacement,"in a future release"};
+        {deprecated=Tag,{_,_,_}=Replacement} ->
+            {Tag,Replacement,"in a future release"};
 	{_,String}=Ret when is_list(String) ->
 	    Ret;
-%% 	{_,_,_}=Ret ->
-%% 	    Ret;
+        {_,_,_}=Ret ->
+            Ret;
 	no ->
 	    no
     end.
 
 obsolete_type_1(erl_scan,column,0) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use erl_anno:column() instead"};
+    {removed,{erl_anno,column,0},"19.0"};
 obsolete_type_1(erl_scan,line,0) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use erl_anno:line() instead"};
+    {removed,{erl_anno,line,0},"19.0"};
 obsolete_type_1(erl_scan,location,0) ->
-    {deprecated,
-     "deprecated (will be removed in OTP 19); use erl_anno:location() instead"};
+    {removed,{erl_anno,location,0},"19.0"};
 obsolete_type_1(_,_,_) ->
     no.
diff --git a/lib/stdlib/src/qlc.erl b/lib/stdlib/src/qlc.erl
index 3ba3a88038..b396ba7057 100644
--- a/lib/stdlib/src/qlc.erl
+++ b/lib/stdlib/src/qlc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2004-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.
@@ -51,6 +51,8 @@
 -export([template_state/0, aux_name/3, name_suffix/2, vars/1,
          var_ufold/2, var_fold/3, all_selections/1]).
 
+-dialyzer(no_improper_lists).
+
 %% When cache=list lists bigger than ?MAX_LIST_SIZE bytes are put on
 %% file. Also used when merge join finds big equivalence classes.
 -define(MAX_LIST_SIZE, 512*1024).
@@ -808,21 +810,21 @@ options(Options0, [Key | Keys], L) when is_list(Options0) ->
                 {ok, U};
             {pre_fun, U=undefined} ->
                 {ok, U};
-            {info_fun, Fun} when is_function(Fun), is_function(Fun, 1) ->
+            {info_fun, Fun} when is_function(Fun, 1) ->
                 {ok, Fun};
-            {pre_fun, Fun} when is_function(Fun), is_function(Fun, 1) ->
+            {pre_fun, Fun} when is_function(Fun, 1) ->
                 {ok, Fun};
-            {post_fun, Fun} when is_function(Fun), is_function(Fun, 0) ->
+            {post_fun, Fun} when is_function(Fun, 0) ->
                 {ok, Fun};
-            {lookup_fun, Fun} when is_function(Fun), is_function(Fun, 2) ->
+            {lookup_fun, Fun} when is_function(Fun, 2) ->
                 {ok, Fun};
             {max_lookup, Max} when is_integer(Max), Max >= 0 ->
                 {ok, Max};
             {max_lookup, infinity} ->
                 {ok, -1};
-            {format_fun, Fun} when is_function(Fun), is_function(Fun, 1) ->
+            {format_fun, Fun} when is_function(Fun, 1) ->
                 {ok, Fun};
-            {parent_fun, Fun} when is_function(Fun), is_function(Fun, 0) ->
+            {parent_fun, Fun} when is_function(Fun, 0) ->
                 {ok, Fun};
             {key_equality, KE='=='} ->
                 {ok, KE};
@@ -885,7 +887,7 @@ options(Options0, [Key | Keys], L) when is_list(Options0) ->
             {depth, Depth} when Depth =:= infinity;
                                 is_integer(Depth), Depth >= 0 ->
                 {ok, Depth};
-            {order, Order} when is_function(Order), is_function(Order, 2);
+            {order, Order} when is_function(Order, 2);
                                 (Order =:= ascending);
                                 (Order =:= descending) ->
                 {ok, Order};
diff --git a/lib/stdlib/src/qlc_pt.erl b/lib/stdlib/src/qlc_pt.erl
index 9577d17a85..e4b9768b12 100644
--- a/lib/stdlib/src/qlc_pt.erl
+++ b/lib/stdlib/src/qlc_pt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2004-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.
@@ -200,7 +200,7 @@ exclude_integers_from_unique_line_numbers(Forms, NodeInfo) ->
 
 find_integers(Forms) ->
     F = fun(A) ->
-                Fs1 = erl_parse:map_anno(fun(_) -> A end, Forms),
+                Fs1 = map_anno(fun(_) -> A end, Forms),
                 ordsets:from_list(integers(Fs1, []))
         end,
     ordsets:to_list(ordsets:intersection(F(anno0()), F(anno1()))).
@@ -319,13 +319,13 @@ badarg(Forms, State) ->
     E0.
 
 lc_nodes(E, NodeInfo) ->
-    erl_parse:map_anno(fun(Anno) ->
-                               N = erl_anno:line(Anno),
-                               [{N, Data}] = ets:lookup(NodeInfo, N),
-                               NData = Data#{inside_lc => true},
-                               true = ets:insert(NodeInfo, {N, NData}),
-                               Anno
-                       end, E).
+    map_anno(fun(Anno) ->
+                     N = erl_anno:line(Anno),
+                     [{N, Data}] = ets:lookup(NodeInfo, N),
+                     NData = Data#{inside_lc => true},
+                     true = ets:insert(NodeInfo, {N, NData}),
+                     Anno
+             end, E).
 
 used_genvar_messages(MsL, S) ->
     [{File,[{Loc,?APIMOD,{used_generator_variable,V}}]}
@@ -416,7 +416,7 @@ intro_anno(LC, Where, QId, NodeInfo) ->
                   true = ets:insert(NodeInfo, {Location,Data}),
                   Anno
           end,
-    erl_parse:map_anno(Fun, save_anno(LC, NodeInfo)).
+    map_anno(Fun, save_anno(LC, NodeInfo)).
 
 compile_errors(FormsNoShadows) ->
     case compile_forms(FormsNoShadows, []) of
@@ -1650,7 +1650,7 @@ reset_anno(T) ->
     set_anno(T, anno0()).
 
 set_anno(T, A) ->
-    erl_parse:map_anno(fun(_L) -> A end, T).
+    map_anno(fun(_L) -> A end, T).
 
 -record(fstate, {state, bind_fun, imported}).
 
@@ -1914,9 +1914,9 @@ expand_pattern_records(P, State) ->
 expand_expr_records(E, State) ->
     RecordDefs = State#state.records,
     A = anno1(),
-    Forms = RecordDefs ++ [{function,A,foo,0,[{clause,A,[],[],[pe(E)]}]}],
-    [{function,_,foo,0,[{clause,_,[],[],[NE]}]}] = 
-        erl_expand_records:module(Forms, [no_strict_record_tests]),
+    Forms0 = RecordDefs ++ [{function,A,foo,0,[{clause,A,[],[],[pe(E)]}]}],
+    Forms = erl_expand_records:module(Forms0, [no_strict_record_tests]),
+    {function,_,foo,0,[{clause,_,[],[],[NE]}]} = lists:last(Forms),
     NE.
 
 %% Partial evaluation.
@@ -2609,7 +2609,7 @@ save_anno(Abstr, NodeInfo) ->
                 true = ets:insert(NodeInfo, Data),
                 erl_anno:new(N)
         end,
-    erl_parse:map_anno(F, Abstr).
+    map_anno(F, Abstr).
 
 next_slot(T) ->
     I = ets:update_counter(T, var_n, 1),
@@ -2633,7 +2633,7 @@ restore_anno(Abstr, NodeInfo) ->
                         Anno
                 end
         end,
-    erl_parse:map_anno(F, Abstr).
+    map_anno(F, Abstr).
 
 restore_loc(Location, #state{node_info = NodeInfo}) ->
   case ets:lookup(NodeInfo, Location) of
@@ -2872,6 +2872,14 @@ var_mapfold(F, A0, [E0 | Es0]) ->
 var_mapfold(_F, A, E) ->
     {E, A}.
 
+map_anno(F, AbstrList) when is_list(AbstrList) ->
+    [map_anno1(F, Abstr) || Abstr <- AbstrList];
+map_anno(F, Abstr) ->
+    map_anno1(F, Abstr).
+
+map_anno1(F, Abstr) ->
+    erl_parse:map_anno(F, Abstr).
+
 family_list(L) ->
     sofs:to_external(family(L)).
 
diff --git a/lib/stdlib/src/rand.erl b/lib/stdlib/src/rand.erl
index dc060e82d9..d455abf7b0 100644
--- a/lib/stdlib/src/rand.erl
+++ b/lib/stdlib/src/rand.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015. All Rights Reserved.
+%% Copyright Ericsson AB 2015-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.
@@ -256,6 +256,8 @@ exs64_uniform(Max, {Alg, R}) ->
 %% =====================================================================
 -type exsplus_state() :: nonempty_improper_list(uint58(), uint58()).
 
+-dialyzer({no_improper_lists, exsplus_seed/1}).
+
 exsplus_seed({A1, A2, A3}) ->
     {_, R1} = exsplus_next([(((A1 * 4294967197) + 1) band ?UINT58MASK)|
 			    (((A2 * 4294967231) + 1) band ?UINT58MASK)]),
@@ -263,6 +265,8 @@ exsplus_seed({A1, A2, A3}) ->
 			    tl(R1)]),
     R2.
 
+-dialyzer({no_improper_lists, exsplus_next/1}).
+
 %% Advance xorshift116+ state for one step and generate 58bit unsigned integer
 -spec exsplus_next(exsplus_state()) -> {uint58(), exsplus_state()}.
 exsplus_next([S1|S0]) ->
diff --git a/lib/stdlib/src/random.erl b/lib/stdlib/src/random.erl
index 8b67cde56c..8b639dd0a7 100644
--- a/lib/stdlib/src/random.erl
+++ b/lib/stdlib/src/random.erl
@@ -18,6 +18,7 @@
 %% %CopyrightEnd%
 %%
 -module(random).
+-deprecated(module).
 
 %% Reasonable random number generator.
 %%  The method is attributed to B. A. Wichmann and I. D. Hill
diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl
index ce1d9eb0ff..82a3a2be4f 100644
--- a/lib/stdlib/src/shell.erl
+++ b/lib/stdlib/src/shell.erl
@@ -917,9 +917,9 @@ expand_records(UsedRecords, E0) ->
     RecordDefs = [Def || {_Name,Def} <- UsedRecords],
     L = erl_anno:new(1),
     E = prep_rec(E0),
-    Forms = RecordDefs ++ [{function,L,foo,0,[{clause,L,[],[],[E]}]}],
-    [{function,L,foo,0,[{clause,L,[],[],[NE]}]}] = 
-        erl_expand_records:module(Forms, [strict_record_tests]), 
+    Forms0 = RecordDefs ++ [{function,L,foo,0,[{clause,L,[],[],[E]}]}],
+    Forms = erl_expand_records:module(Forms0, [strict_record_tests]),
+    {function,L,foo,0,[{clause,L,[],[],[NE]}]} = lists:last(Forms),
     prep_rec(NE).
 
 prep_rec({value,_CommandN,_V}=Value) ->
@@ -1081,6 +1081,8 @@ record_fields([{record_field,_,{atom,_,Field}} | Fs]) ->
     [Field | record_fields(Fs)];
 record_fields([{record_field,_,{atom,_,Field},_} | Fs]) ->
     [Field | record_fields(Fs)];
+record_fields([{typed_record_field,Field,_Type} | Fs]) ->
+    record_fields([Field | Fs]);
 record_fields([]) ->
     [].
 
diff --git a/lib/stdlib/src/slave.erl b/lib/stdlib/src/slave.erl
index 24fc8ce204..4e629a5e56 100644
--- a/lib/stdlib/src/slave.erl
+++ b/lib/stdlib/src/slave.erl
@@ -289,10 +289,7 @@ register_unique_name(Number) ->
 %% no need to use rsh.
 
 mk_cmd(Host, Name, Args, Waiter, Prog0) ->
-    Prog = case os:type() of
-	       {ose,_} -> mk_ose_prog(Prog0);
-	       _ -> quote_progname(Prog0)
-	   end,
+    Prog = quote_progname(Prog0),
     BasicCmd = lists:concat([Prog,
 			     " -detached -noinput -master ", node(),
 			     " ", long_or_short(), Name, "@", Host,
@@ -312,24 +309,6 @@ mk_cmd(Host, Name, Args, Waiter, Prog0) ->
 	    end
     end.
 
-%% On OSE we have to pass the beam arguments directory to the slave
-%% process. To find out what arguments that should be passed on we
-%% make an assumption. All arguments after the last "--" should be
-%% skipped. So given these arguments:
-%%     -Muycs256 -A 1 -- -root /mst/ -progname beam.debug.smp -- -home /mst/ -- -kernel inetrc '"/mst/inetrc.conf"' -- -name test@localhost
-%% we send
-%%     -Muycs256 -A 1 -- -root /mst/ -progname beam.debug.smp -- -home /mst/ -- -kernel inetrc '"/mst/inetrc.conf"' --
-%% to the slave with whatever other args that are added in mk_cmd.
-mk_ose_prog(Prog) ->
-    SkipTail = fun("--",[]) ->
-		       ["--"];
-		  (_,[]) ->
-		       [];
-		  (Arg,Args) ->
-		       [Arg," "|Args]
-	       end,
-    [Prog,tl(lists:foldr(SkipTail,[],erlang:system_info(emu_args)))].
-
 %% This is an attempt to distinguish between spaces in the program
 %% path and spaces that separate arguments. The program is quoted to
 %% allow spaces in the path.
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index 7f9bbbf649..b8a7973cf2 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -105,7 +105,7 @@
                dets]},
   {applications, [kernel]},
   {env, []},
-  {runtime_dependencies, ["sasl-2.6","kernel-4.1","erts-7.0","crypto-3.3",
+  {runtime_dependencies, ["sasl-2.6","kernel-4.1","erts-7.3","crypto-3.3",
 			  "compiler-5.0"]}
 ]}.
 
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 04cdf31ada..15d8857656 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -18,9 +18,9 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max one major revision back
- [{<<"2\\.[5-7](\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-18.*
-  {<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}], % 17.0-17.5
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]},       % OTP-19.*
+  {<<"2\\.[5-8](\\.[0-9]+)*">>,[restart_new_emulator]}],  % OTP-18.*
  %% Down to - max one major revision back
- [{<<"2\\.[5-7](\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-18.*
-  {<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}]  % 17.0-17.5
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]},      % OTP-19.*
+  {<<"2\\.[5-8](\\.[0-9]+)*">>,[restart_new_emulator]}]  % OTP-18.*
 }.
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl
index 92a0c29011..0400c845ab 100644
--- a/lib/stdlib/src/supervisor.erl
+++ b/lib/stdlib/src/supervisor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2015. 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.
@@ -33,6 +33,9 @@
 	 terminate/2, code_change/3]).
 -export([try_again_restart/2]).
 
+%% For release_handler only
+-export([get_callback_module/1]).
+
 %%--------------------------------------------------------------------------
 
 -export_type([sup_flags/0, child_spec/0, startchild_ret/0, strategy/0]).
@@ -107,12 +110,15 @@
 -define(SET, sets:set).
 
 -record(state, {name,
-		strategy               :: strategy(),
+		strategy               :: strategy() | 'undefined',
 		children = []          :: [child_rec()],
-		dynamics               :: ?DICT(pid(), list()) | ?SET(pid()),
-		intensity              :: non_neg_integer(),
-		period                 :: pos_integer(),
+                dynamics               :: {'dict', ?DICT(pid(), list())}
+                                        | {'set', ?SET(pid())}
+                                        | 'undefined',
+		intensity              :: non_neg_integer() | 'undefined',
+		period                 :: pos_integer() | 'undefined',
 		restarts = [],
+		dynamic_restarts = 0   :: non_neg_integer(),
 	        module,
 	        args}).
 -type state() :: #state{}.
@@ -250,6 +256,17 @@ try_again_restart(Supervisor, Child) ->
 cast(Supervisor, Req) ->
     gen_server:cast(Supervisor, Req).
 
+%%%-----------------------------------------------------------------
+%%% Called by release_handler during upgrade
+-spec get_callback_module(Pid) -> Module when
+      Pid :: pid(),
+      Module :: atom().
+get_callback_module(Pid) ->
+    {status, _Pid, {module, _Mod},
+     [_PDict, _SysState, _Parent, _Dbg, Misc]} = sys:get_status(Pid),
+    [_Header, _Data, {data, [{"State", State}]}] = Misc,
+    State#state.module.
+
 %%% ---------------------------------------------------
 %%% 
 %%% Initialize the supervisor.
@@ -504,39 +521,26 @@ handle_call(which_children, _From, State) ->
 handle_call(count_children, _From, #state{children = [#child{restart_type = temporary,
 							     child_type = CT}]} = State)
   when ?is_simple(State) ->
-    {Active, Count} =
-	?SETS:fold(fun(Pid, {Alive, Tot}) ->
-			   case is_pid(Pid) andalso is_process_alive(Pid) of
-			       true ->{Alive+1, Tot +1};
-			       false ->
-				   {Alive, Tot + 1}
-			   end
-		   end, {0, 0}, dynamics_db(temporary, State#state.dynamics)),
+    Sz = ?SETS:size(dynamics_db(temporary, State#state.dynamics)),
     Reply = case CT of
-		supervisor -> [{specs, 1}, {active, Active},
-			       {supervisors, Count}, {workers, 0}];
-		worker -> [{specs, 1}, {active, Active},
-			   {supervisors, 0}, {workers, Count}]
+		supervisor -> [{specs, 1}, {active, Sz},
+			       {supervisors, Sz}, {workers, 0}];
+		worker -> [{specs, 1}, {active, Sz},
+			   {supervisors, 0}, {workers, Sz}]
 	    end,
     {reply, Reply, State};
 
-handle_call(count_children, _From,  #state{children = [#child{restart_type = RType,
+handle_call(count_children, _From,  #state{dynamic_restarts = Restarts,
+					   children = [#child{restart_type = RType,
 							      child_type = CT}]} = State)
   when ?is_simple(State) ->
-    {Active, Count} =
-	?DICTS:fold(fun(Pid, _Val, {Alive, Tot}) ->
-			   case is_pid(Pid) andalso is_process_alive(Pid) of
-			       true ->
-				   {Alive+1, Tot +1};
-			       false ->
-				   {Alive, Tot + 1}
-			   end
-		   end, {0, 0}, dynamics_db(RType, State#state.dynamics)),
+    Sz = ?DICTS:size(dynamics_db(RType, State#state.dynamics)),
+    Active = Sz - Restarts,
     Reply = case CT of
 		supervisor -> [{specs, 1}, {active, Active},
-			       {supervisors, Count}, {workers, 0}];
+			       {supervisors, Sz}, {workers, 0}];
 		worker -> [{specs, 1}, {active, Active},
-			   {supervisors, 0}, {workers, Count}]
+			   {supervisors, 0}, {workers, Sz}]
 	    end,
     {reply, Reply, State};
 
@@ -577,7 +581,7 @@ handle_cast({try_again_restart,Pid}, #state{children=[Child]}=State)
   when ?is_simple(State) ->
     RT = Child#child.restart_type,
     RPid = restarting(Pid),
-    case dynamic_child_args(RPid, dynamics_db(RT, State#state.dynamics)) of
+    case dynamic_child_args(RPid, RT, State#state.dynamics) of
 	{ok, Args} ->
 	    {M, F, _} = Child#child.mfargs,
 	    NChild = Child#child{pid = RPid, mfargs = {M, F, Args}},
@@ -735,7 +739,7 @@ handle_start_child(Child, State) ->
 
 restart_child(Pid, Reason, #state{children = [Child]} = State) when ?is_simple(State) ->
     RestartType = Child#child.restart_type,
-    case dynamic_child_args(Pid, dynamics_db(RestartType, State#state.dynamics)) of
+    case dynamic_child_args(Pid, RestartType, State#state.dynamics) of
 	{ok, Args} ->
 	    {M, F, _} = Child#child.mfargs,
 	    NChild = Child#child{pid = Pid, mfargs = {M, F, Args}},
@@ -806,20 +810,31 @@ restart(Child, State) ->
 	    {shutdown, remove_child(Child, NState)}
     end.
 
-restart(simple_one_for_one, Child, State) ->
+restart(simple_one_for_one, Child, State0) ->
     #child{pid = OldPid, mfargs = {M, F, A}} = Child,
+    State = case OldPid of
+		?restarting(_) ->
+		    NRes = State0#state.dynamic_restarts - 1,
+		    State0#state{dynamic_restarts = NRes};
+		_ ->
+		    State0
+	    end,
     Dynamics = ?DICTS:erase(OldPid, dynamics_db(Child#child.restart_type,
 					       State#state.dynamics)),
     case do_start_child_i(M, F, A) of
 	{ok, Pid} ->
-	    NState = State#state{dynamics = ?DICTS:store(Pid, A, Dynamics)},
+            DynamicsDb = {dict, ?DICTS:store(Pid, A, Dynamics)},
+	    NState = State#state{dynamics = DynamicsDb},
 	    {ok, NState};
 	{ok, Pid, _Extra} ->
-	    NState = State#state{dynamics = ?DICTS:store(Pid, A, Dynamics)},
+            DynamicsDb = {dict, ?DICTS:store(Pid, A, Dynamics)},
+	    NState = State#state{dynamics = DynamicsDb},
 	    {ok, NState};
 	{error, Error} ->
-	    NState = State#state{dynamics = ?DICTS:store(restarting(OldPid), A,
-							Dynamics)},
+	    NRestarts = State#state.dynamic_restarts + 1,
+            DynamicsDb = {dict, ?DICTS:store(restarting(OldPid), A, Dynamics)},
+	    NState = State#state{dynamic_restarts = NRestarts,
+				 dynamics = DynamicsDb},
 	    report_error(start_error, Error, Child, State#state.name),
 	    {try_again, NState}
     end;
@@ -1102,31 +1117,32 @@ save_child(Child, #state{children = Children} = State) ->
     State#state{children = [Child |Children]}.
 
 save_dynamic_child(temporary, Pid, _, #state{dynamics = Dynamics} = State) ->
-    State#state{dynamics = ?SETS:add_element(Pid, dynamics_db(temporary, Dynamics))};
+    DynamicsDb = dynamics_db(temporary, Dynamics),
+    State#state{dynamics = {set, ?SETS:add_element(Pid, DynamicsDb)}};
 save_dynamic_child(RestartType, Pid, Args, #state{dynamics = Dynamics} = State) ->
-    State#state{dynamics = ?DICTS:store(Pid, Args, dynamics_db(RestartType, Dynamics))}.
+    DynamicsDb = dynamics_db(RestartType, Dynamics),
+    State#state{dynamics = {dict, ?DICTS:store(Pid, Args, DynamicsDb)}}.
 
 dynamics_db(temporary, undefined) ->
     ?SETS:new();
 dynamics_db(_, undefined) ->
     ?DICTS:new();
-dynamics_db(_,Dynamics) ->
-    Dynamics.
-
-dynamic_child_args(Pid, Dynamics) ->
-    case ?SETS:is_set(Dynamics) of
-        true ->
-            {ok, undefined};
-        false ->
-            ?DICTS:find(Pid, Dynamics)
-    end.
+dynamics_db(_, {_Tag, DynamicsDb}) ->
+    DynamicsDb.
+
+dynamic_child_args(_Pid, temporary, _DynamicsDb) ->
+    {ok, undefined};
+dynamic_child_args(Pid, _RT, {dict, DynamicsDb}) ->
+    ?DICTS:find(Pid, DynamicsDb);
+dynamic_child_args(_Pid, _RT, undefined) ->
+    error.
 
 state_del_child(#child{pid = Pid, restart_type = temporary}, State) when ?is_simple(State) ->
     NDynamics = ?SETS:del_element(Pid, dynamics_db(temporary, State#state.dynamics)),
-    State#state{dynamics = NDynamics};
+    State#state{dynamics = {set, NDynamics}};
 state_del_child(#child{pid = Pid, restart_type = RType}, State) when ?is_simple(State) ->
     NDynamics = ?DICTS:erase(Pid, dynamics_db(RType, State#state.dynamics)),
-    State#state{dynamics = NDynamics};
+    State#state{dynamics = {dict, NDynamics}};
 state_del_child(Child, State) ->
     NChildren = del_child(Child#child.name, State#state.children),
     State#state{children = NChildren}.
@@ -1160,19 +1176,19 @@ split_child(_, [], After) ->
 
 get_child(Name, State) ->
     get_child(Name, State, false).
+
 get_child(Pid, State, AllowPid) when AllowPid, is_pid(Pid) ->
     get_dynamic_child(Pid, State);
 get_child(Name, State, _) ->
     lists:keysearch(Name, #child.name, State#state.children).
 
 get_dynamic_child(Pid, #state{children=[Child], dynamics=Dynamics}) ->
-    DynamicsDb = dynamics_db(Child#child.restart_type, Dynamics),
-    case is_dynamic_pid(Pid, DynamicsDb) of
+    case is_dynamic_pid(Pid, Dynamics) of
 	true ->
 	    {value, Child#child{pid=Pid}};
 	false ->
 	    RPid = restarting(Pid),
-	    case is_dynamic_pid(RPid, DynamicsDb) of
+	    case is_dynamic_pid(RPid, Dynamics) of
 		true ->
 		    {value, Child#child{pid=RPid}};
 		false ->
@@ -1183,13 +1199,12 @@ get_dynamic_child(Pid, #state{children=[Child], dynamics=Dynamics}) ->
 	    end
     end.
 
-is_dynamic_pid(Pid, Dynamics) ->
-    case ?SETS:is_set(Dynamics) of
-	true ->
-	    ?SETS:is_element(Pid, Dynamics);
-	false ->
-	    ?DICTS:is_key(Pid, Dynamics)
-    end.
+is_dynamic_pid(Pid, {dict, Dynamics}) ->
+    ?DICTS:is_key(Pid, Dynamics);
+is_dynamic_pid(Pid, {set, Dynamics}) ->
+    ?SETS:is_element(Pid, Dynamics);
+is_dynamic_pid(_Pid, undefined) ->
+    false.
 
 replace_child(Child, State) ->
     Chs = do_replace_child(Child, State#state.children),
diff --git a/lib/stdlib/src/unicode.erl b/lib/stdlib/src/unicode.erl
index 3e8e6f5101..617da11ba8 100644
--- a/lib/stdlib/src/unicode.erl
+++ b/lib/stdlib/src/unicode.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -561,6 +561,8 @@ do_o_binary(F,L) ->
 	    erlang:iolist_to_binary(List)
     end.
 
+-dialyzer({no_improper_lists, do_o_binary2/2}).
+
 do_o_binary2(_F,[]) ->
     <<>>;
 do_o_binary2(F,[H|T]) ->
diff --git a/lib/stdlib/src/zip.erl b/lib/stdlib/src/zip.erl
index bec0bd3f6d..f8ba6f18e9 100644
--- a/lib/stdlib/src/zip.erl
+++ b/lib/stdlib/src/zip.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2006-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.
@@ -1566,6 +1566,8 @@ append_bins([_|_]=List, B) ->
 append_bins([], B) ->
     B.
 
+-dialyzer({no_improper_lists, pwrite_iolist/3}).
+
 pwrite_iolist(B, Pos, Bin) ->
     {Left, Right} = split_binary(B, Pos),
     Sz = erlang:iolist_size(Bin),
diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile
index e366c2b755..287f63b2be 100644
--- a/lib/stdlib/test/Makefile
+++ b/lib/stdlib/test/Makefile
@@ -107,8 +107,7 @@ RELSYSDIR = $(RELEASE_PATH)/stdlib_test
 # ----------------------------------------------------
 
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include \
-		-I$(ERL_TOP)/lib/kernel/include \
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/include \
 		-I$(ERL_TOP)/lib/stdlib/include
 
 EBIN = .
diff --git a/lib/stdlib/test/array_SUITE.erl b/lib/stdlib/test/array_SUITE.erl
index ab4ca91f76..8d031ed490 100644
--- a/lib/stdlib/test/array_SUITE.erl
+++ b/lib/stdlib/test/array_SUITE.erl
@@ -20,12 +20,7 @@
 
 -module(array_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
-
-%% Default timetrap timeout (set in init_per_testcase).
-%% This should be set relatively high (10-15 times the expected
-%% max testcasetime).
--define(default_timeout, ?t:seconds(60)).
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -66,7 +61,9 @@
 %%
 %% all/1
 %%
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [new_test, fix_test, relax_test, resize_test,
@@ -93,12 +90,9 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
 -define(LEAFSIZE,10).
@@ -111,19 +105,19 @@ end_per_testcase(_Case, Config) ->
 		}).
 
 -define(_assert(What), 
-	begin ?line true = What end
+	begin true = What end
        ).
 -define(_assertNot(What), 
-	begin ?line false = What end
+	begin false = What end
        ).
 
 -define(_assertMatch(Res,What), 
 	begin 
-	    ?line case What of Res -> ok end
+	    case What of Res -> ok end
 	end
        ).
 -define(_assertError(Reas,What), 
-	begin ?line fun() ->
+	begin fun() ->
 			    try What of
 				A_Success -> exit({test_error, A_Success})
 			    catch error:Reas -> ok end
@@ -131,9 +125,9 @@ end_per_testcase(_Case, Config) ->
 	end
        ).
 
--define(LET(Var,Expr, Test), begin ?line fun() -> Var = Expr, Test end() end).
+-define(LET(Var,Expr, Test), begin fun() -> Var = Expr, Test end() end).
 
--define(_test(Expr), begin ?line Expr end).
+-define(_test(Expr), begin Expr end).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Some helpers to be able to run the tests without testserver
@@ -152,18 +146,7 @@ t(What) ->
 				  io:format("Failed ~p:~p ~p ~p~n   ~p~n", 
 					    [T,Line,_E,_R, erlang:get_stacktrace()])
 			  end
-		  end, expand(What)).
-
-expand(All) ->
-    lists:reverse(expand(All,[])).
-expand([H|T], Acc)  -> 
-    case ?MODULE:H(suite) of
-	[] -> expand(T,[H|Acc]);
-	Cs -> 
-	    R = expand(Cs, Acc),
-	    expand(T, R)
-    end;
-expand([], Acc) -> Acc.
+		  end, What).
 
 %%%%% extract tests 
 
@@ -173,8 +156,6 @@ extract_tests() ->
     try 
 	Tests = extract_tests(In,Out,[]),
 	Call = fun(Test) ->
-		       io:format(Out, "~s(doc) -> [];~n", [Test]),
-		       io:format(Out, "~s(suite) -> [];~n", [Test]),
 		       io:format(Out, "~s(Config) when is_list(Config) -> ~s_(), ok.~n",
 				 [Test, Test])
 	       end,
@@ -775,54 +756,20 @@ sparse_foldr_test_() ->
 				   set(0,0,new())))))     
     ].
 
-new_test(doc) -> [];
-new_test(suite) -> [];
 new_test(Config) when is_list(Config) -> new_test_(), ok.
-fix_test(doc) -> [];
-fix_test(suite) -> [];
 fix_test(Config) when is_list(Config) -> fix_test_(), ok.
-relax_test(doc) -> [];
-relax_test(suite) -> [];
 relax_test(Config) when is_list(Config) -> relax_test_(), ok.
-resize_test(doc) -> [];
-resize_test(suite) -> [];
 resize_test(Config) when is_list(Config) -> resize_test_(), ok.
-set_get_test(doc) -> [];
-set_get_test(suite) -> [];
 set_get_test(Config) when is_list(Config) -> set_get_test_(), ok.
-to_list_test(doc) -> [];
-to_list_test(suite) -> [];
 to_list_test(Config) when is_list(Config) -> to_list_test_(), ok.
-sparse_to_list_test(doc) -> [];
-sparse_to_list_test(suite) -> [];
 sparse_to_list_test(Config) when is_list(Config) -> sparse_to_list_test_(), ok.
-from_list_test(doc) -> [];
-from_list_test(suite) -> [];
 from_list_test(Config) when is_list(Config) -> from_list_test_(), ok.
-to_orddict_test(doc) -> [];
-to_orddict_test(suite) -> [];
 to_orddict_test(Config) when is_list(Config) -> to_orddict_test_(), ok.
-sparse_to_orddict_test(doc) -> [];
-sparse_to_orddict_test(suite) -> [];
 sparse_to_orddict_test(Config) when is_list(Config) -> sparse_to_orddict_test_(), ok.
-from_orddict_test(doc) -> [];
-from_orddict_test(suite) -> [];
 from_orddict_test(Config) when is_list(Config) -> from_orddict_test_(), ok.
-map_test(doc) -> [];
-map_test(suite) -> [];
 map_test(Config) when is_list(Config) -> map_test_(), ok.
-sparse_map_test(doc) -> [];
-sparse_map_test(suite) -> [];
 sparse_map_test(Config) when is_list(Config) -> sparse_map_test_(), ok.
-foldl_test(doc) -> [];
-foldl_test(suite) -> [];
 foldl_test(Config) when is_list(Config) -> foldl_test_(), ok.
-sparse_foldl_test(doc) -> [];
-sparse_foldl_test(suite) -> [];
 sparse_foldl_test(Config) when is_list(Config) -> sparse_foldl_test_(), ok.
-foldr_test(doc) -> [];
-foldr_test(suite) -> [];
 foldr_test(Config) when is_list(Config) -> foldr_test_(), ok.
-sparse_foldr_test(doc) -> [];
-sparse_foldr_test(suite) -> [];
 sparse_foldr_test(Config) when is_list(Config) -> sparse_foldr_test_(), ok.
diff --git a/lib/stdlib/test/base64_SUITE.erl b/lib/stdlib/test/base64_SUITE.erl
index 75eebba6c6..074047c7c5 100644
--- a/lib/stdlib/test/base64_SUITE.erl
+++ b/lib/stdlib/test/base64_SUITE.erl
@@ -34,19 +34,17 @@
 	 roundtrip_1/1, roundtrip_2/1, roundtrip_3/1, roundtrip_4/1]).
 
 init_per_testcase(_, Config) ->
-    Dog = test_server:timetrap(?t:minutes(4)),
-    NewConfig = lists:keydelete(watchdog, 1, Config),
-    [{watchdog, Dog} | NewConfig].
+    Config.
 
-end_per_testcase(_, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_, _Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,4}}].
 
 all() -> 
     [base64_encode, base64_decode, base64_otp_5635,
@@ -72,10 +70,7 @@ end_per_group(_GroupName, Config) ->
 
 
 %%-------------------------------------------------------------------------
-base64_encode(doc) ->
-    ["Test base64:encode/1."];
-base64_encode(suite) ->
-    [];
+%% Test base64:encode/1.
 base64_encode(Config) when is_list(Config) ->
     %% Two pads
     <<"QWxhZGRpbjpvcGVuIHNlc2FtZQ==">> =
@@ -90,10 +85,7 @@ base64_encode(Config) when is_list(Config) ->
 	base64:encode_to_string(<<"0123456789!@#0^&*();:<>,. []{}">>),
     ok.
 %%-------------------------------------------------------------------------
-base64_decode(doc) ->
-    ["Test base64:decode/1."];
-base64_decode(suite) ->
-    [];
+%% Test base64:decode/1.
 base64_decode(Config) when is_list(Config) ->
     %% Two pads
     <<"Aladdin:open sesame">> =
@@ -117,28 +109,18 @@ base64_decode(Config) when is_list(Config) ->
 	  <<"MDEy MzQ1Njc4 \tOSFAIzBeJ \niooKTs6 PD4sLi \r\nBbXXt9">>),
     ok.
 %%-------------------------------------------------------------------------
-base64_otp_5635(doc) ->
-    ["OTP-5635: Some data doesn't pass through base64:decode/1 "
-     "correctly"];
-base64_otp_5635(suite) ->
-    [];
+%% OTP-5635: Some data doesn't pass through base64:decode/1 correctly.
 base64_otp_5635(Config) when is_list(Config) ->
     <<"===">> = base64:decode(base64:encode("===")),
     ok.
 %%-------------------------------------------------------------------------
-base64_otp_6279(doc) ->
-    ["OTP-6279: Guard needed so that function fails in a correct"
-     "way for faulty input i.e. function_clause"];
-base64_otp_6279(suite) ->
-    [];
+%% OTP-6279: Guard needed so that function fails in a correct
+%% way for faulty input, i.e. function_clause.
 base64_otp_6279(Config) when is_list(Config) ->
     {'EXIT',{function_clause, _}} = (catch base64:decode("dGVzda==a")),
     ok.
 %%-------------------------------------------------------------------------
-big(doc) ->
-    ["Encode and decode big binaries."];
-big(suite) ->
-    [];
+%% Encode and decode big binaries.
 big(Config) when is_list(Config) ->
     Big = make_big_binary(300000),
     B = base64:encode(Big),
@@ -148,10 +130,7 @@ big(Config) when is_list(Config) ->
     Big = base64:mime_decode(B),
     ok.
 %%-------------------------------------------------------------------------
-illegal(doc) ->
-    ["Make sure illegal characters are rejected when decoding."];
-illegal(suite) ->
-    [];
+%% Make sure illegal characters are rejected when decoding.
 illegal(Config) when is_list(Config) ->
     {'EXIT',{function_clause, _}} = (catch base64:decode("()")),
     ok.
@@ -159,10 +138,8 @@ illegal(Config) when is_list(Config) ->
 %% mime_decode and mime_decode_to_string have different implementations
 %% so test both with the same input separately. Both functions have
 %% the same implementation for binary/string arguments.
-mime_decode(doc) ->
-    ["Test base64:mime_decode/1."];
-mime_decode(suite) ->
-    [];
+%%
+%% Test base64:mime_decode/1.
 mime_decode(Config) when is_list(Config) ->
     %% Test correct padding
     <<"one">> = base64:mime_decode(<<"b25l">>),
@@ -202,10 +179,8 @@ mime_decode(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 
 %% Repeat of mime_decode() tests
-mime_decode_to_string(doc) ->
-    ["Test base64:mime_decode_to_string/1."];
-mime_decode_to_string(suite) ->
-    [];
+
+%% Test base64:mime_decode_to_string/1.
 mime_decode_to_string(Config) when is_list(Config) ->
     %% Test correct padding
     "one" = base64:mime_decode_to_string(<<"b25l">>),
@@ -340,7 +315,7 @@ interleaved_ws_roundtrip_1([], Base64List, Bin, List) ->
 random_byte_list(0, Acc) ->
     Acc;
 random_byte_list(N, Acc) -> 
-    random_byte_list(N-1, [random:uniform(255)|Acc]).
+    random_byte_list(N-1, [rand:uniform(255)|Acc]).
 
 make_big_binary(N) ->
     list_to_binary(mbb(N, [])).
diff --git a/lib/stdlib/test/beam_lib_SUITE.erl b/lib/stdlib/test/beam_lib_SUITE.erl
index c102f6e929..bf6e30ec83 100644
--- a/lib/stdlib/test/beam_lib_SUITE.erl
+++ b/lib/stdlib/test/beam_lib_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(beam_lib_SUITE).
 
-%-define(debug, true).
+%%-define(debug, true).
 
 -ifdef(debug).
 -define(format(S, A), io:format(S, A)).
@@ -28,9 +28,9 @@
 -define(t,test_server).
 -define(privdir, "beam_lib_SUITE_priv").
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(format(S, A), ok).
--define(privdir, ?config(priv_dir, Conf)).
+-define(privdir, proplists:get_value(priv_dir, Conf)).
 -endif.
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -40,7 +40,9 @@
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     [error, normal, cmp, cmp_literals, strip, otp_6711,
@@ -63,78 +65,74 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    Dog=?t:timetrap(?t:minutes(2)),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-normal(suite) -> [];
-normal(doc) -> ["Read correct beam file"];
+%% Read correct beam file.
 normal(Conf) when is_list(Conf) ->
-    ?line PrivDir = ?privdir,
-    ?line Simple = filename:join(PrivDir, "simple"),
-    ?line Source = Simple ++ ".erl",
-    ?line BeamFile = Simple ++ ".beam",
-    ?line simple_file(Source),
+    PrivDir = ?privdir,
+    Simple = filename:join(PrivDir, "simple"),
+    Source = Simple ++ ".erl",
+    BeamFile = Simple ++ ".beam",
+    simple_file(Source),
 
-    ?line NoOfTables = length(ets:all()),
-    ?line P0 = pps(),
+    NoOfTables = length(ets:all()),
+    P0 = pps(),
 
     CompileFlags = [{outdir,PrivDir}, debug_info],
-    ?line {ok,_} = compile:file(Source, CompileFlags),
-    ?line {ok, Binary} = file:read_file(BeamFile),
+    {ok,_} = compile:file(Source, CompileFlags),
+    {ok, Binary} = file:read_file(BeamFile),
 
-    ?line do_normal(BeamFile),
-    ?line do_normal(Binary),
+    do_normal(BeamFile),
+    do_normal(Binary),
 
-    ?line {ok,_} = compile:file(Source, [{outdir,PrivDir}, no_debug_info]),
-    ?line {ok, {simple, [{abstract_code, no_abstract_code}]}} = 
+    {ok,_} = compile:file(Source, [{outdir,PrivDir}, no_debug_info]),
+    {ok, {simple, [{abstract_code, no_abstract_code}]}} =
 	beam_lib:chunks(BeamFile, [abstract_code]),
 
-    %% ?line {ok,_} = compile:file(Source, [compressed | CompileFlags]),
-    %% ?line do_normal(BeamFile),
+    %% {ok,_} = compile:file(Source, [compressed | CompileFlags]),
+    %% do_normal(BeamFile),
 
-    ?line file:delete(BeamFile),
-    ?line file:delete(Source),
-    ?line NoOfTables = length(ets:all()),
-    ?line true = (P0 == pps()),    
+    file:delete(BeamFile),
+    file:delete(Source),
+    NoOfTables = length(ets:all()),
+    true = (P0 == pps()),
     ok.
 
 do_normal(BeamFile) ->
-    ?line Imports = {imports, [{erlang, get_module_info, 1},
-			       {erlang, get_module_info, 2},
-			       {lists, member, 2}]},
-    ?line Exports = {exports, [{module_info, 0}, {module_info, 1}, {t, 0}]},
-    ?line Local = {locals, [{t, 1}]},
-    ?line {ok, {simple, [Imports]}} = beam_lib:chunks(BeamFile, [imports]),
-    ?line {ok, {simple, [{"ImpT",_Bin}]}} = 
+    Imports = {imports, [{erlang, get_module_info, 1},
+			 {erlang, get_module_info, 2},
+			 {lists, member, 2}]},
+    Exports = {exports, [{module_info, 0}, {module_info, 1}, {t, 0}]},
+    Local = {locals, [{t, 1}]},
+    {ok, {simple, [Imports]}} = beam_lib:chunks(BeamFile, [imports]),
+    {ok, {simple, [{"ImpT",_Bin}]}} =
 	beam_lib:chunks(BeamFile, ["ImpT"]),
-    ?line {ok, {simple, [Exports]}} = beam_lib:chunks(BeamFile, [exports]),
-    ?line {ok, {simple, [{attributes, [{vsn, [_]}]}]}} = 
+    {ok, {simple, [Exports]}} = beam_lib:chunks(BeamFile, [exports]),
+    {ok, {simple, [{attributes, [{vsn, [_]}]}]}} =
 	beam_lib:chunks(BeamFile, [attributes]),
-    ?line {ok, {simple, [{compile_info, _}=CompileInfo]}} = 
+    {ok, {simple, [{compile_info, _}=CompileInfo]}} =
 	beam_lib:chunks(BeamFile, [compile_info]),
-    ?line {ok, {simple, [Local]}} = beam_lib:chunks(BeamFile, [locals]),
-    ?line {ok, {simple, [{attributes, [{vsn, [_]}]}, CompileInfo,
-			 Exports, Imports, Local]}} =
+    {ok, {simple, [Local]}} = beam_lib:chunks(BeamFile, [locals]),
+    {ok, {simple, [{attributes, [{vsn, [_]}]}, CompileInfo,
+		   Exports, Imports, Local]}} =
 	beam_lib:chunks(BeamFile, [attributes, compile_info, exports, imports, locals]),
-    ?line {ok, {simple, [{atoms, _Atoms}]}} = 
+    {ok, {simple, [{atoms, _Atoms}]}} =
 	beam_lib:chunks(BeamFile, [atoms]),
-    ?line {ok, {simple, [{labeled_exports, _LExports}]}} =
+    {ok, {simple, [{labeled_exports, _LExports}]}} =
 	beam_lib:chunks(BeamFile, [labeled_exports]),
-    ?line {ok, {simple, [{labeled_locals, _LLocals}]}} =
+    {ok, {simple, [{labeled_locals, _LLocals}]}} =
 	beam_lib:chunks(BeamFile, [labeled_locals]),
-    ?line {ok, {simple, [_Vsn]}} = beam_lib:version(BeamFile),
-    ?line {ok, {simple, [{abstract_code, _}]}} = 
+    {ok, {simple, [_Vsn]}} = beam_lib:version(BeamFile),
+    {ok, {simple, [{abstract_code, _}]}} =
 	beam_lib:chunks(BeamFile, [abstract_code]),
-    
+
     %% Test reading optional chunks.
     All = ["Atom", "Code", "StrT", "ImpT", "ExpT", "FunT", "LitT"],
-    ?line {ok,{simple,Chunks}} = beam_lib:chunks(BeamFile, All, [allow_missing_chunks]),
-    ?line verify_simple(Chunks).
+    {ok,{simple,Chunks}} = beam_lib:chunks(BeamFile, All, [allow_missing_chunks]),
+    verify_simple(Chunks).
 
 verify_simple([{"Atom", AtomBin},
 	       {"Code", CodeBin},
@@ -147,64 +145,61 @@ verify_simple([{"Atom", AtomBin},
        is_binary(ImpBin), is_binary(ExpBin) ->
     ok.
 
-error(suite) -> [];
-error(doc) -> ["Read invalid beam files"];
+%% Read invalid beam files.
 error(Conf) when is_list(Conf) ->
-    ?line PrivDir = ?privdir,
-    ?line Simple = filename:join(PrivDir, "simple"),
-    ?line Source = Simple ++ ".erl",
-    ?line BeamFile = Simple ++ ".beam",
-    ?line WrongFile = Simple ++ "foo.beam",
-    ?line simple_file(Source),
-
-    ?line NoOfTables = length(ets:all()),
-    ?line P0 = pps(),
-    ?line {ok,_} = compile:file(Source, [{outdir,PrivDir},debug_info]),
-    ?line ACopy = filename:join(PrivDir, "a_copy.beam"),
-    ?line copy_file(BeamFile, ACopy),
-
-    ?line {ok, Binary} = file:read_file(BeamFile),
-
-    ?line copy_file(ACopy, WrongFile),
-    ?line verify(file_error, beam_lib:info("./does_simply_not_exist")),
-
-    ?line do_error(BeamFile, ACopy),
-    ?line do_error(Binary, ACopy),
-
-    ?line copy_file(ACopy, BeamFile),
-    ?line verify(unknown_chunk, beam_lib:chunks(BeamFile, [not_a_chunk])),
-
-    ?line ok = file:write_file(BeamFile, <<>>),
-    ?line verify(not_a_beam_file, beam_lib:info(BeamFile)),
-    ?line verify(not_a_beam_file, beam_lib:info(<<>>)),
-    ?line ok = file:write_file(BeamFile, <<"short">>),
-    ?line verify(not_a_beam_file, beam_lib:info(BeamFile)),
-    ?line verify(not_a_beam_file, beam_lib:info(<<"short">>)),
-
-    ?line {Binary1, _} = split_binary(Binary, byte_size(Binary)-10),
+    PrivDir = ?privdir,
+    Simple = filename:join(PrivDir, "simple"),
+    Source = Simple ++ ".erl",
+    BeamFile = Simple ++ ".beam",
+    WrongFile = Simple ++ "foo.beam",
+    simple_file(Source),
+
+    NoOfTables = length(ets:all()),
+    P0 = pps(),
+    {ok,_} = compile:file(Source, [{outdir,PrivDir},debug_info]),
+    ACopy = filename:join(PrivDir, "a_copy.beam"),
+    copy_file(BeamFile, ACopy),
+
+    {ok, Binary} = file:read_file(BeamFile),
+
+    copy_file(ACopy, WrongFile),
+    verify(file_error, beam_lib:info("./does_simply_not_exist")),
+
+    do_error(BeamFile, ACopy),
+    do_error(Binary, ACopy),
+
+    copy_file(ACopy, BeamFile),
+    verify(unknown_chunk, beam_lib:chunks(BeamFile, [not_a_chunk])),
+
+    ok = file:write_file(BeamFile, <<>>),
+    verify(not_a_beam_file, beam_lib:info(BeamFile)),
+    verify(not_a_beam_file, beam_lib:info(<<>>)),
+    ok = file:write_file(BeamFile, <<"short">>),
+    verify(not_a_beam_file, beam_lib:info(BeamFile)),
+    verify(not_a_beam_file, beam_lib:info(<<"short">>)),
+
+    {Binary1, _} = split_binary(Binary, byte_size(Binary)-10),
     LastChunk = last_chunk(Binary),
-    ?line verify(chunk_too_big, beam_lib:chunks(Binary1, [LastChunk])),
-    ?line Chunks = chunk_info(Binary),
-    ?line {value, {_, AbstractStart, _}} = lists:keysearch("Abst", 1, Chunks),
-    ?line {Binary2, _} = split_binary(Binary, AbstractStart),
-    ?line verify(chunk_too_big, beam_lib:chunks(Binary2, ["Abst"])),
-    ?line {Binary3, _} = split_binary(Binary, AbstractStart-4),
-    ?line verify(invalid_beam_file, beam_lib:chunks(Binary3, ["Abst"])),
+    verify(chunk_too_big, beam_lib:chunks(Binary1, [LastChunk])),
+    Chunks = chunk_info(Binary),
+    {value, {_, AbstractStart, _}} = lists:keysearch("Abst", 1, Chunks),
+    {Binary2, _} = split_binary(Binary, AbstractStart),
+    verify(chunk_too_big, beam_lib:chunks(Binary2, ["Abst"])),
+    {Binary3, _} = split_binary(Binary, AbstractStart-4),
+    verify(invalid_beam_file, beam_lib:chunks(Binary3, ["Abst"])),
 
     %% Instead of the 5:32 field below, there used to be control characters
     %% (including zero bytes) directly in the string. Because inferior programs
     %% such as sed and clearcasediff don't like zero bytes in text files,
     %% we have eliminated them.
-    ?line ok = file:write_file(BeamFile, <<"FOR1",5:32,"BEAMfel">>),
-%   ?line verify(invalid_beam_file, beam_lib:info(BeamFile)),
-%   ?line verify(invalid_beam_file, beam_lib:info(<<"FOR1",5:32,"BEAMfel">>)),
-
-    ?line NoOfTables = length(ets:all()),
-    ?line true = (P0 == pps()),    
-    ?line file:delete(Source),
-    ?line file:delete(WrongFile),
-    ?line file:delete(BeamFile),
-    ?line file:delete(ACopy),
+    ok = file:write_file(BeamFile, <<"FOR1",5:32,"BEAMfel">>),
+
+    NoOfTables = length(ets:all()),
+    true = (P0 == pps()),
+    file:delete(Source),
+    file:delete(WrongFile),
+    file:delete(BeamFile),
+    file:delete(ACopy),
     ok.
 
 last_chunk(Bin) ->
@@ -214,213 +209,210 @@ last_chunk(Bin) ->
     Last.
 
 do_error(BeamFile, ACopy) ->
-    % evil tests
-    ?line Chunks = chunk_info(BeamFile),
-    ?line {value, {_, AtomStart, _}} = lists:keysearch("Atom", 1, Chunks),
-    ?line {value, {_, ImportStart, _}} = lists:keysearch("ImpT", 1, Chunks),
-    ?line {value, {_, AbstractStart, _}} = lists:keysearch("Abst", 1, Chunks),
-    ?line {value, {_, AttributesStart, _}} = 
+    %% evil tests
+    Chunks = chunk_info(BeamFile),
+    {value, {_, AtomStart, _}} = lists:keysearch("Atom", 1, Chunks),
+    {value, {_, ImportStart, _}} = lists:keysearch("ImpT", 1, Chunks),
+    {value, {_, AbstractStart, _}} = lists:keysearch("Abst", 1, Chunks),
+    {value, {_, AttributesStart, _}} =
 	lists:keysearch("Attr", 1, Chunks),
-    ?line {value, {_, CompileInfoStart, _}} = 
+    {value, {_, CompileInfoStart, _}} =
 	lists:keysearch("CInf", 1, Chunks),
-    ?line verify(missing_chunk, beam_lib:chunks(BeamFile, ["__"])),
-    ?line BF2 = set_byte(ACopy, BeamFile, ImportStart+4, 17),
-    ?line verify(invalid_chunk, beam_lib:chunks(BF2, [imports])),
-    ?line BF3 = set_byte(ACopy, BeamFile, AtomStart-6, 17),
-    ?line verify(missing_chunk, beam_lib:chunks(BF3, [imports])),
-    ?line BF4 = set_byte(ACopy, BeamFile, AbstractStart+10, 17),
-    ?line verify(invalid_chunk, beam_lib:chunks(BF4, [abstract_code])),
-    ?line BF5 = set_byte(ACopy, BeamFile, AttributesStart+10, 17),
-    ?line verify(invalid_chunk, beam_lib:chunks(BF5, [attributes])),
-
-    ?line BF6 = set_byte(ACopy, BeamFile, 1, 17),
-    ?line verify(not_a_beam_file, beam_lib:info(BF6)),
-    ?line BF7 = set_byte(ACopy, BeamFile, 9, 17),
-    ?line verify(not_a_beam_file, beam_lib:info(BF7)),
-
-    ?line BF8 = set_byte(ACopy, BeamFile, 13, 17),
-    ?line verify(missing_chunk, beam_lib:chunks(BF8, ["Atom"])),
-    
-    ?line BF9 = set_byte(ACopy, BeamFile, CompileInfoStart+10, 17),
-    ?line verify(invalid_chunk, beam_lib:chunks(BF9, [compile_info])).
-    
-
-cmp(suite) -> [];
-cmp(doc) -> ["Compare contents of BEAM files and directories"];
+    verify(missing_chunk, beam_lib:chunks(BeamFile, ["__"])),
+    BF2 = set_byte(ACopy, BeamFile, ImportStart+4, 17),
+    verify(invalid_chunk, beam_lib:chunks(BF2, [imports])),
+    BF3 = set_byte(ACopy, BeamFile, AtomStart-6, 17),
+    verify(missing_chunk, beam_lib:chunks(BF3, [imports])),
+    BF4 = set_byte(ACopy, BeamFile, AbstractStart+10, 17),
+    verify(invalid_chunk, beam_lib:chunks(BF4, [abstract_code])),
+    BF5 = set_byte(ACopy, BeamFile, AttributesStart+10, 17),
+    verify(invalid_chunk, beam_lib:chunks(BF5, [attributes])),
+
+    BF6 = set_byte(ACopy, BeamFile, 1, 17),
+    verify(not_a_beam_file, beam_lib:info(BF6)),
+    BF7 = set_byte(ACopy, BeamFile, 9, 17),
+    verify(not_a_beam_file, beam_lib:info(BF7)),
+
+    BF8 = set_byte(ACopy, BeamFile, 13, 17),
+    verify(missing_chunk, beam_lib:chunks(BF8, ["Atom"])),
+
+    BF9 = set_byte(ACopy, BeamFile, CompileInfoStart+10, 17),
+    verify(invalid_chunk, beam_lib:chunks(BF9, [compile_info])).
+
+
+%% Compare contents of BEAM files and directories.
 cmp(Conf) when is_list(Conf) ->
-    ?line PrivDir = ?privdir,
+    PrivDir = ?privdir,
 
-    ?line Dir1 = filename:join(PrivDir, "dir1"),
-    ?line Dir2 = filename:join(PrivDir, "dir2"),
+    Dir1 = filename:join(PrivDir, "dir1"),
+    Dir2 = filename:join(PrivDir, "dir2"),
 
     ok = file:make_dir(Dir1),
     ok = file:make_dir(Dir2),
 
-    ?line {SourceD1, BeamFileD1} = make_beam(Dir1, simple, member),
-    ?line {Source2D1, BeamFile2D1} = make_beam(Dir1, simple2, concat),
-    ?line {SourceD2, BeamFileD2} = make_beam(Dir2, simple, concat),
+    {SourceD1, BeamFileD1} = make_beam(Dir1, simple, member),
+    {Source2D1, BeamFile2D1} = make_beam(Dir1, simple2, concat),
+    {SourceD2, BeamFileD2} = make_beam(Dir2, simple, concat),
 
-    ?line NoOfTables = length(ets:all()),
-    ?line P0 = pps(),
+    NoOfTables = length(ets:all()),
+    P0 = pps(),
 
     %% cmp
-    ?line ok = beam_lib:cmp(BeamFileD1, BeamFileD1),
-    ?line ver(modules_different, beam_lib:cmp(BeamFileD1, BeamFile2D1)),
-    ?line ver(chunks_different, beam_lib:cmp(BeamFileD1, BeamFileD2)),
-    ?line verify(file_error, beam_lib:cmp(foo, bar)),
-    
-    ?line {ok, B1} = file:read_file(BeamFileD1),
-    ?line ok = beam_lib:cmp(B1, BeamFileD1),
-    ?line {ok, B2} = file:read_file(BeamFileD2),
-    ?line ver(chunks_different, beam_lib:cmp(B1, B2)),
+    ok = beam_lib:cmp(BeamFileD1, BeamFileD1),
+    ver(modules_different, beam_lib:cmp(BeamFileD1, BeamFile2D1)),
+    ver(chunks_different, beam_lib:cmp(BeamFileD1, BeamFileD2)),
+    verify(file_error, beam_lib:cmp(foo, bar)),
+
+    {ok, B1} = file:read_file(BeamFileD1),
+    ok = beam_lib:cmp(B1, BeamFileD1),
+    {ok, B2} = file:read_file(BeamFileD2),
+    ver(chunks_different, beam_lib:cmp(B1, B2)),
 
     %% cmp_dirs
-    ?line {[],[],[]} = beam_lib:cmp_dirs(Dir1, Dir1),
-    ?line true = {[BeamFile2D1], [], [{BeamFileD1,BeamFileD2}]} ==
-	         beam_lib:cmp_dirs(Dir1, Dir2),
-    ?line true = {[], [BeamFile2D1], [{BeamFileD2,BeamFileD1}]} ==
-                 beam_lib:cmp_dirs(Dir2, Dir1),
-    ?line ver(not_a_directory, beam_lib:cmp_dirs(foo, bar)),
-    
+    {[],[],[]} = beam_lib:cmp_dirs(Dir1, Dir1),
+    true = {[BeamFile2D1], [], [{BeamFileD1,BeamFileD2}]} ==
+	beam_lib:cmp_dirs(Dir1, Dir2),
+    true = {[], [BeamFile2D1], [{BeamFileD2,BeamFileD1}]} ==
+	beam_lib:cmp_dirs(Dir2, Dir1),
+    ver(not_a_directory, beam_lib:cmp_dirs(foo, bar)),
+
     %% diff_dirs
-    ?line ok = beam_lib:diff_dirs(Dir1, Dir1),
-    ?line ver(not_a_directory, beam_lib:diff_dirs(foo, bar)),
+    ok = beam_lib:diff_dirs(Dir1, Dir1),
+    ver(not_a_directory, beam_lib:diff_dirs(foo, bar)),
 
-    ?line true = (P0 == pps()),
-    ?line NoOfTables = length(ets:all()),
-    ?line delete_files([SourceD1, BeamFileD1, Source2D1, 
-			BeamFile2D1, SourceD2, BeamFileD2]),
+    true = (P0 == pps()),
+    NoOfTables = length(ets:all()),
+    delete_files([SourceD1, BeamFileD1, Source2D1,
+		  BeamFile2D1, SourceD2, BeamFileD2]),
 
     file:del_dir(Dir1),
     file:del_dir(Dir2),
     ok.
 
-cmp_literals(suite) -> [];
-cmp_literals(doc) -> ["Compare contents of BEAM files having literals"];
+%% Compare contents of BEAM files having literals.
 cmp_literals(Conf) when is_list(Conf) ->
-    ?line PrivDir = ?privdir,
+    PrivDir = ?privdir,
 
-    ?line Dir1 = filename:join(PrivDir, "dir1"),
-    ?line Dir2 = filename:join(PrivDir, "dir2"),
+    Dir1 = filename:join(PrivDir, "dir1"),
+    Dir2 = filename:join(PrivDir, "dir2"),
 
     ok = file:make_dir(Dir1),
     ok = file:make_dir(Dir2),
 
-    ?line {SourceD1, BeamFileD1} = make_beam(Dir1, simple, constant),
-    ?line {SourceD2, BeamFileD2} = make_beam(Dir2, simple, constant2),
+    {SourceD1, BeamFileD1} = make_beam(Dir1, simple, constant),
+    {SourceD2, BeamFileD2} = make_beam(Dir2, simple, constant2),
 
-    ?line NoOfTables = length(ets:all()),
-    ?line P0 = pps(),
+    NoOfTables = length(ets:all()),
+    P0 = pps(),
 
     %% cmp
-    ?line ok = beam_lib:cmp(BeamFileD1, BeamFileD1),
-    ?line ver(chunks_different, beam_lib:cmp(BeamFileD1, BeamFileD2)),
-    
-    ?line {ok, B1} = file:read_file(BeamFileD1),
-    ?line ok = beam_lib:cmp(B1, BeamFileD1),
-    ?line {ok, B2} = file:read_file(BeamFileD2),
-    ?line ver(chunks_different, beam_lib:cmp(B1, B2)),
+    ok = beam_lib:cmp(BeamFileD1, BeamFileD1),
+    ver(chunks_different, beam_lib:cmp(BeamFileD1, BeamFileD2)),
+
+    {ok, B1} = file:read_file(BeamFileD1),
+    ok = beam_lib:cmp(B1, BeamFileD1),
+    {ok, B2} = file:read_file(BeamFileD2),
+    ver(chunks_different, beam_lib:cmp(B1, B2)),
 
-    ?line true = (P0 == pps()),
-    ?line NoOfTables = length(ets:all()),
+    true = (P0 == pps()),
+    NoOfTables = length(ets:all()),
 
-    ?line delete_files([SourceD1, BeamFileD1, SourceD2, BeamFileD2]),
+    delete_files([SourceD1, BeamFileD1, SourceD2, BeamFileD2]),
 
     file:del_dir(Dir1),
     file:del_dir(Dir2),
     ok.
 
-strip(suite) -> [];
-strip(doc) -> ["Strip BEAM files"];
+%% Strip BEAM files.
 strip(Conf) when is_list(Conf) ->
-    ?line PrivDir = ?privdir,
-    ?line {SourceD1, BeamFileD1} = make_beam(PrivDir, simple, member),
-    ?line {Source2D1, BeamFile2D1} = make_beam(PrivDir, simple2, concat),
-    ?line {Source3D1, BeamFile3D1} = make_beam(PrivDir, make_fun, make_fun),
-    ?line {Source4D1, BeamFile4D1} = make_beam(PrivDir, constant, constant),
-    ?line {Source5D1, BeamFile5D1} = make_beam(PrivDir, lines, lines),
+    PrivDir = ?privdir,
+    {SourceD1, BeamFileD1} = make_beam(PrivDir, simple, member),
+    {Source2D1, BeamFile2D1} = make_beam(PrivDir, simple2, concat),
+    {Source3D1, BeamFile3D1} = make_beam(PrivDir, make_fun, make_fun),
+    {Source4D1, BeamFile4D1} = make_beam(PrivDir, constant, constant),
+    {Source5D1, BeamFile5D1} = make_beam(PrivDir, lines, lines),
 
-    ?line NoOfTables = length(ets:all()),
-    ?line P0 = pps(),
+    NoOfTables = length(ets:all()),
+    P0 = pps(),
 
     %% strip binary
-    ?line verify(not_a_beam_file, beam_lib:strip(<<>>)),
-    ?line {ok, B1} = file:read_file(BeamFileD1),
-    ?line {ok, {simple, NB1}} = beam_lib:strip(B1),
-    ?line BId1 = chunk_ids(B1),
-    ?line NBId1 = chunk_ids(NB1),
-    ?line true = length(BId1) > length(NBId1),
-    ?line compare_chunks(B1, NB1, NBId1),
+    verify(not_a_beam_file, beam_lib:strip(<<>>)),
+    {ok, B1} = file:read_file(BeamFileD1),
+    {ok, {simple, NB1}} = beam_lib:strip(B1),
+    BId1 = chunk_ids(B1),
+    NBId1 = chunk_ids(NB1),
+    true = length(BId1) > length(NBId1),
+    compare_chunks(B1, NB1, NBId1),
 
     %% strip file
-    ?line verify(file_error, beam_lib:strip(foo)),
-    ?line {ok, {simple, _}} = beam_lib:strip(BeamFileD1),
-    ?line compare_chunks(NB1, BeamFileD1, NBId1),
+    verify(file_error, beam_lib:strip(foo)),
+    {ok, {simple, _}} = beam_lib:strip(BeamFileD1),
+    compare_chunks(NB1, BeamFileD1, NBId1),
 
     %% strip_files
-    ?line {ok, B2} = file:read_file(BeamFile2D1),
-    ?line {ok, [{simple,_},{simple2,_}]} = beam_lib:strip_files([B1, B2]),
-    ?line {ok, [{simple,_},{simple2,_},{make_fun,_},{constant,_}]} = 
+    {ok, B2} = file:read_file(BeamFile2D1),
+    {ok, [{simple,_},{simple2,_}]} = beam_lib:strip_files([B1, B2]),
+    {ok, [{simple,_},{simple2,_},{make_fun,_},{constant,_}]} =
 	beam_lib:strip_files([BeamFileD1, BeamFile2D1, BeamFile3D1, BeamFile4D1]),
 
     %% check that each module can be loaded.
-    ?line {module, simple} = code:load_abs(filename:rootname(BeamFileD1)),
-    ?line {module, simple2} = code:load_abs(filename:rootname(BeamFile2D1)),
-    ?line {module, make_fun} = code:load_abs(filename:rootname(BeamFile3D1)),
-    ?line {module, constant} = code:load_abs(filename:rootname(BeamFile4D1)),
+    {module, simple} = code:load_abs(filename:rootname(BeamFileD1)),
+    {module, simple2} = code:load_abs(filename:rootname(BeamFile2D1)),
+    {module, make_fun} = code:load_abs(filename:rootname(BeamFile3D1)),
+    {module, constant} = code:load_abs(filename:rootname(BeamFile4D1)),
 
     %% check that line number information is still present after stripping
-    ?line {module, lines} = code:load_abs(filename:rootname(BeamFile5D1)),
-    ?line {'EXIT',{badarith,[{lines,t,1,Info}|_]}} =
+    {module, lines} = code:load_abs(filename:rootname(BeamFile5D1)),
+    {'EXIT',{badarith,[{lines,t,1,Info}|_]}} =
 	(catch lines:t(atom)),
-    ?line true = code:delete(lines),
-    ?line false = code:purge(lines),
-    ?line {ok, {lines,BeamFile5D1}} = beam_lib:strip(BeamFile5D1),
-    ?line {module, lines} = code:load_abs(filename:rootname(BeamFile5D1)),
-    ?line {'EXIT',{badarith,[{lines,t,1,Info}|_]}} =
+    true = code:delete(lines),
+    false = code:purge(lines),
+    {ok, {lines,BeamFile5D1}} = beam_lib:strip(BeamFile5D1),
+    {module, lines} = code:load_abs(filename:rootname(BeamFile5D1)),
+    {'EXIT',{badarith,[{lines,t,1,Info}|_]}} =
 	(catch lines:t(atom)),
 
-    ?line true = (P0 == pps()),
-    ?line NoOfTables = length(ets:all()),
+    true = (P0 == pps()),
+    NoOfTables = length(ets:all()),
 
-    ?line delete_files([SourceD1, BeamFileD1, 
-			Source2D1, BeamFile2D1, 
-			Source3D1, BeamFile3D1,
-			Source4D1, BeamFile4D1,
-			Source5D1, BeamFile5D1]),
+    delete_files([SourceD1, BeamFileD1,
+		  Source2D1, BeamFile2D1,
+		  Source3D1, BeamFile3D1,
+		  Source4D1, BeamFile4D1,
+		  Source5D1, BeamFile5D1]),
     ok.
 
 
 otp_6711(Conf) when is_list(Conf) ->
-    ?line {'EXIT',{function_clause,_}} = (catch {a, beam_lib:info(3)}),
-    ?line {'EXIT',{function_clause,_}} = (catch {a, beam_lib:chunks(a, b)}),
-    ?line {'EXIT',{function_clause,_}} = (catch {a, beam_lib:chunks(a,b,c)}),
-    ?line {'EXIT',{function_clause,_}} = (catch {a, beam_lib:all_chunks(3)}),
-    ?line {'EXIT',{function_clause,_}} = (catch {a, beam_lib:cmp(3,4)}),
-    ?line {'EXIT',{function_clause,_}} = (catch {a, beam_lib:strip(3)}),
-    ?line {'EXIT',{function_clause,_}} = 
+    {'EXIT',{function_clause,_}} = (catch {a, beam_lib:info(3)}),
+    {'EXIT',{function_clause,_}} = (catch {a, beam_lib:chunks(a, b)}),
+    {'EXIT',{function_clause,_}} = (catch {a, beam_lib:chunks(a,b,c)}),
+    {'EXIT',{function_clause,_}} = (catch {a, beam_lib:all_chunks(3)}),
+    {'EXIT',{function_clause,_}} = (catch {a, beam_lib:cmp(3,4)}),
+    {'EXIT',{function_clause,_}} = (catch {a, beam_lib:strip(3)}),
+    {'EXIT',{function_clause,_}} =
         (catch {a, beam_lib:strip_files([3])}),
 
-    ?line PrivDir = ?privdir,
-    ?line Dir = filename:join(PrivDir, "dir"),
-    ?line Lib = filename:join(Dir, "lib"),
-    ?line App = filename:join(Lib, "app"),
-    ?line EBin = filename:join(App, "ebin"),
+    PrivDir = ?privdir,
+    Dir = filename:join(PrivDir, "dir"),
+    Lib = filename:join(Dir, "lib"),
+    App = filename:join(Lib, "app"),
+    EBin = filename:join(App, "ebin"),
 
     ok = file:make_dir(Dir),
     ok = file:make_dir(Lib),
     ok = file:make_dir(App),
     ok = file:make_dir(EBin),
-    
-    ?line {SourceD, BeamFileD} = make_beam(EBin, simple, member),
+
+    {SourceD, BeamFileD} = make_beam(EBin, simple, member),
 
     unwritable(BeamFileD),
 
     %% There is no way that strip_release can fail with
     %% function_clause or something like that...
-    ?line {error,_,{file_error,_,_}} = beam_lib:strip_release(Dir),
+    {error,_,{file_error,_,_}} = beam_lib:strip_release(Dir),
 
-    ?line delete_files([SourceD, BeamFileD]),
+    delete_files([SourceD, BeamFileD]),
     file:del_dir(EBin),
     file:del_dir(App),
     file:del_dir(Lib),
@@ -434,59 +426,58 @@ unwritable(Fname) ->
     Mode = Info#file_info.mode - 8#00200,
     file:write_file_info(Fname, Info#file_info{mode = Mode}).
 
-building(doc) -> "Testing building of BEAM files.";
+%% Testing building of BEAM files.
 building(Conf) when is_list(Conf) ->
-    ?line PrivDir = ?privdir,
+    PrivDir = ?privdir,
 
-    ?line Dir1 = filename:join(PrivDir, "b_dir1"),
-    ?line Dir2 = filename:join(PrivDir, "b_dir2"),
+    Dir1 = filename:join(PrivDir, "b_dir1"),
+    Dir2 = filename:join(PrivDir, "b_dir2"),
 
     ok = file:make_dir(Dir1),
     ok = file:make_dir(Dir2),
 
-    ?line {SourceD1, BeamFileD1} = make_beam(Dir1, building, member),
+    {SourceD1, BeamFileD1} = make_beam(Dir1, building, member),
 
-    ?line NoOfTables = length(ets:all()),
-    ?line P0 = pps(),
+    NoOfTables = length(ets:all()),
+    P0 = pps(),
 
     %% read all chunks
-    ?line ChunkIds = chunk_ids(BeamFileD1),
-    ?line {ok, _Mod, Chunks} = beam_lib:all_chunks(BeamFileD1),
-    ?line ChunkIds = lists:map(fun ({Id, Data}) when is_binary(Data) -> Id 
-                               end, Chunks),
+    ChunkIds = chunk_ids(BeamFileD1),
+    {ok, _Mod, Chunks} = beam_lib:all_chunks(BeamFileD1),
+    ChunkIds = lists:map(fun ({Id, Data}) when is_binary(Data) -> Id
+			 end, Chunks),
 
     %% write a new beam file, with reversed chunk order
-    ?line BeamFileD2 = filename:join(Dir2, "building.beam"),
-    ?line {ok,RevBeam} = beam_lib:build_module(lists:reverse(Chunks)),
-    ?line file:write_file(BeamFileD2, RevBeam),
+    BeamFileD2 = filename:join(Dir2, "building.beam"),
+    {ok,RevBeam} = beam_lib:build_module(lists:reverse(Chunks)),
+    file:write_file(BeamFileD2, RevBeam),
 
     %% compare files
-    ?line compare_chunks(BeamFileD1, BeamFileD2, ChunkIds),
+    compare_chunks(BeamFileD1, BeamFileD2, ChunkIds),
 
     %% test that we can retrieve a chunk before the atom table
     %% (actually, try to retrieve all chunks)
 
-    ?line lists:foreach(fun(Id) ->
-				{ok, {building, [{Id, _Data}]}} =
-				    beam_lib:chunks(BeamFileD1, [Id])
-			end, ChunkIds),
-    ?line lists:foreach(fun(Id) ->
-				{ok, {building, [{Id, _Data}]}} =
-				    beam_lib:chunks(BeamFileD2, [Id])
-			end, ChunkIds),
+    lists:foreach(fun(Id) ->
+			  {ok, {building, [{Id, _Data}]}} =
+			      beam_lib:chunks(BeamFileD1, [Id])
+		  end, ChunkIds),
+    lists:foreach(fun(Id) ->
+			  {ok, {building, [{Id, _Data}]}} =
+			      beam_lib:chunks(BeamFileD2, [Id])
+		  end, ChunkIds),
 
-    ?line true = (P0 == pps()),
-    ?line NoOfTables = length(ets:all()),
+    true = (P0 == pps()),
+    NoOfTables = length(ets:all()),
 
-    ?line delete_files([SourceD1, BeamFileD1, BeamFileD2]),
+    delete_files([SourceD1, BeamFileD1, BeamFileD2]),
     file:del_dir(Dir1),
     file:del_dir(Dir2),
     ok.
 
-md5(suite) -> [];
-md5(doc) -> ["Compare beam_lib:md5/1 and code:module_md5/1."];
+%% Compare beam_lib:md5/1 and code:module_md5/1.
 md5(Conf) when is_list(Conf) ->
-    ?line Beams = collect_beams(),
+    Beams = collect_beams(),
     io:format("Found ~w beam files", [length(Beams)]),
     md5_1(Beams).
 
@@ -497,7 +488,7 @@ md5_1([N|Ns]) ->
     {Mod,MD5} = {Mod,code:module_md5(Beam)},
     md5_1(Ns);
 md5_1([]) -> ok.
-     
+
 collect_beams() ->
     SuperDir = filename:dirname(filename:dirname(code:which(?MODULE))),
     TestDirs = filelib:wildcard(filename:join([SuperDir,"*_test"])),
@@ -511,90 +502,89 @@ collect_beams_1([]) -> [].
 maybe_uncompress(<<"FOR1",_/binary>>=Beam) -> Beam;
 maybe_uncompress(Beam) -> zlib:gunzip(Beam).
 
-encrypted_abstr(suite) -> [];
-encrypted_abstr(doc) -> ["Test encrypted abstract format"];
+%% Test encrypted abstract format.
 encrypted_abstr(Conf) when is_list(Conf) ->
     run_if_crypto_works(fun() -> encrypted_abstr_1(Conf) end).
 
 encrypted_abstr_1(Conf) ->
-    ?line PrivDir = ?privdir,
-    ?line Simple = filename:join(PrivDir, "simple"),
-    ?line Source = Simple ++ ".erl",
-    ?line BeamFile = Simple ++ ".beam",
-    ?line simple_file(Source),
+    PrivDir = ?privdir,
+    Simple = filename:join(PrivDir, "simple"),
+    Source = Simple ++ ".erl",
+    BeamFile = Simple ++ ".beam",
+    simple_file(Source),
 
     %% Avoid getting an extra port when crypto starts erl_ddll.
-    ?line erl_ddll:start(),
+    erl_ddll:start(),
 
-    ?line NoOfTables = length(ets:all()),
-    ?line P0 = pps(),
+    NoOfTables = length(ets:all()),
+    P0 = pps(),
 
     Key = "#a_crypto_key",
     CompileFlags = [{outdir,PrivDir}, debug_info, {debug_info_key,Key}],
-    ?line {ok,_} = compile:file(Source, CompileFlags),
-    ?line {ok, Binary} = file:read_file(BeamFile),
+    {ok,_} = compile:file(Source, CompileFlags),
+    {ok, Binary} = file:read_file(BeamFile),
 
-    ?line do_encrypted_abstr(BeamFile, Key),
-    ?line do_encrypted_abstr(Binary, Key),
+    do_encrypted_abstr(BeamFile, Key),
+    do_encrypted_abstr(Binary, Key),
 
-    ?line ok = crypto:stop(),			%To get rid of extra ets tables.
-    ?line file:delete(BeamFile),
-    ?line file:delete(Source),
-    ?line NoOfTables = length(ets:all()),
-    ?line true = (P0 == pps()),    
+    ok = crypto:stop(),			%To get rid of extra ets tables.
+    file:delete(BeamFile),
+    file:delete(Source),
+    NoOfTables = length(ets:all()),
+    true = (P0 == pps()),
     ok.
 
 do_encrypted_abstr(Beam, Key) ->
-    ?line verify(key_missing_or_invalid, beam_lib:chunks(Beam, [abstract_code])),
+    verify(key_missing_or_invalid, beam_lib:chunks(Beam, [abstract_code])),
 
     %% The raw chunk "Abst" can still be read even without a key.
-    ?line {ok,{simple,[{"Abst",Abst}]}} = beam_lib:chunks(Beam, ["Abst"]),
-    ?line <<0:8,8:8,"des3_cbc",_/binary>> = Abst,
+    {ok,{simple,[{"Abst",Abst}]}} = beam_lib:chunks(Beam, ["Abst"]),
+    <<0:8,8:8,"des3_cbc",_/binary>> = Abst,
 
     %% Try som invalid funs.
-    ?line bad_fun(badfun, fun() -> ok end),
-    ?line bad_fun(badfun, {a,b}),
-    ?line bad_fun(blurf),
-    ?line {function_clause,_} = bad_fun(fun(glurf) -> ok end),
+    bad_fun(badfun, fun() -> ok end),
+    bad_fun(badfun, {a,b}),
+    bad_fun(blurf),
+    {function_clause,_} = bad_fun(fun(glurf) -> ok end),
 
     %% Funs that return something strange.
-    ?line bad_fun(badfun, fun(init) -> {ok,fun() -> ok end} end),
-    ?line glurf = bad_fun(fun(init) -> {error,glurf} end),
+    bad_fun(badfun, fun(init) -> {ok,fun() -> ok end} end),
+    glurf = bad_fun(fun(init) -> {error,glurf} end),
 
     %% Try clearing (non-existing fun).
-    ?line undefined = beam_lib:clear_crypto_key_fun(),
+    undefined = beam_lib:clear_crypto_key_fun(),
 
     %% Install a fun which cannot retrieve a key.
-    ?line ok = beam_lib:crypto_key_fun(fun(init) -> ok end),
-    ?line {error,beam_lib,Error} = beam_lib:chunks(Beam, [abstract_code]),
+    ok = beam_lib:crypto_key_fun(fun(init) -> ok end),
+    {error,beam_lib,Error} = beam_lib:chunks(Beam, [abstract_code]),
 
     %% Install a fun which returns an incorrect key.
-    ?line {ok,_} = beam_lib:clear_crypto_key_fun(),
-    ?line ok = beam_lib:crypto_key_fun(simple_crypto_fun("wrong key...")),
-    ?line {error,beam_lib,Error} = beam_lib:chunks(Beam, [abstract_code]),
-    
+    {ok,_} = beam_lib:clear_crypto_key_fun(),
+    ok = beam_lib:crypto_key_fun(simple_crypto_fun("wrong key...")),
+    {error,beam_lib,Error} = beam_lib:chunks(Beam, [abstract_code]),
+
     %% Installing a new key fun is not possible without clearing the old.
-    ?line verify(exists, beam_lib:crypto_key_fun(simple_crypto_fun(Key))),
+    verify(exists, beam_lib:crypto_key_fun(simple_crypto_fun(Key))),
 
     %% Install the simplest possible working key fun.
-    ?line {ok,_} = beam_lib:clear_crypto_key_fun(),
-    ?line ok = beam_lib:crypto_key_fun(simple_crypto_fun(Key)),
-    ?line verify_abstract(Beam),
-    ?line {ok,{simple,[{"Abst",Abst}]}} = beam_lib:chunks(Beam, ["Abst"]),
+    {ok,_} = beam_lib:clear_crypto_key_fun(),
+    ok = beam_lib:crypto_key_fun(simple_crypto_fun(Key)),
+    verify_abstract(Beam),
+    {ok,{simple,[{"Abst",Abst}]}} = beam_lib:chunks(Beam, ["Abst"]),
 
     %% Installing a new key fun is not possible without clearing the old.
     verify(exists, beam_lib:crypto_key_fun(ets_crypto_fun(Key))),
 
     %% Install a key using an ets table.
-    ?line {ok,_} = beam_lib:clear_crypto_key_fun(),
-    ?line ok = beam_lib:crypto_key_fun(ets_crypto_fun(Key)),
-    ?line verify_abstract(Beam),
-    ?line {ok,{simple,[{"Abst",Abst}]}} = beam_lib:chunks(Beam, ["Abst"]),
+    {ok,_} = beam_lib:clear_crypto_key_fun(),
+    ok = beam_lib:crypto_key_fun(ets_crypto_fun(Key)),
+    verify_abstract(Beam),
+    {ok,{simple,[{"Abst",Abst}]}} = beam_lib:chunks(Beam, ["Abst"]),
 
-    ?line {ok,cleared} = beam_lib:clear_crypto_key_fun(),
+    {ok,cleared} = beam_lib:clear_crypto_key_fun(),
 
     %% Try to force a stop/start race.
-    ?line start_stop_race(10000),
+    start_stop_race(10000),
 
     ok.
 
@@ -635,69 +625,67 @@ ets_crypto_fun(Key) ->
 		end}
     end.
 
-encrypted_abstr_file(suite) -> [];
-encrypted_abstr_file(doc) ->
-    ["Test encrypted abstract format with the key in .erlang.crypt"];
+%% Test encrypted abstract format with the key in .erlang.crypt.
 encrypted_abstr_file(Conf) when is_list(Conf) ->
     run_if_crypto_works(fun() -> encrypted_abstr_file_1(Conf) end).
 
 encrypted_abstr_file_1(Conf) ->
-    ?line PrivDir = ?privdir,
-    ?line Simple = filename:join(PrivDir, "simple"),
-    ?line Source = Simple ++ ".erl",
-    ?line BeamFile = Simple ++ ".beam",
-    ?line simple_file(Source),
+    PrivDir = ?privdir,
+    Simple = filename:join(PrivDir, "simple"),
+    Source = Simple ++ ".erl",
+    BeamFile = Simple ++ ".beam",
+    simple_file(Source),
 
     %% Avoid getting an extra port when crypto starts erl_ddll.
-    ?line erl_ddll:start(),
+    erl_ddll:start(),
 
-    ?line NoOfTables = length(ets:all()),
-    ?line P0 = pps(),
+    NoOfTables = length(ets:all()),
+    P0 = pps(),
 
     Key = "Long And niCe 99Krypto Key",
     CompileFlags = [{outdir,PrivDir}, debug_info, {debug_info_key,Key}],
-    ?line {ok,_} = compile:file(Source, CompileFlags),
-    ?line {ok, Binary} = file:read_file(BeamFile),
-
-    ?line {ok,OldCwd} = file:get_cwd(),
-    ?line ok = file:set_cwd(PrivDir),
-    ?line do_encrypted_abstr_file(BeamFile, Key),
-    ?line do_encrypted_abstr_file(Binary, Key),
-    ?line ok = file:set_cwd(OldCwd),
-
-    ?line ok = crypto:stop(),			%To get rid of extra ets tables.
-    ?line file:delete(filename:join(PrivDir, ".erlang.crypt")),
-    ?line file:delete(BeamFile),
-    ?line file:delete(Source),
-    ?line NoOfTables = length(ets:all()),
-    ?line true = (P0 == pps()),    
+    {ok,_} = compile:file(Source, CompileFlags),
+    {ok, Binary} = file:read_file(BeamFile),
+
+    {ok,OldCwd} = file:get_cwd(),
+    ok = file:set_cwd(PrivDir),
+    do_encrypted_abstr_file(BeamFile, Key),
+    do_encrypted_abstr_file(Binary, Key),
+    ok = file:set_cwd(OldCwd),
+
+    ok = crypto:stop(),			%To get rid of extra ets tables.
+    file:delete(filename:join(PrivDir, ".erlang.crypt")),
+    file:delete(BeamFile),
+    file:delete(Source),
+    NoOfTables = length(ets:all()),
+    true = (P0 == pps()),
     ok.
 
 do_encrypted_abstr_file(Beam, Key) ->
     %% No key.
-    ?line write_crypt_file(""),
-    ?line {error,beam_lib,Error} = beam_lib:chunks(Beam, [abstract_code]),
+    write_crypt_file(""),
+    {error,beam_lib,Error} = beam_lib:chunks(Beam, [abstract_code]),
 
     %% A wrong key.
-    ?line write_crypt_file(["[{debug_info,des3_cbc,simple,\"A Wrong Key\"}].\n"]),
-    ?line {error,beam_lib,Error} = beam_lib:chunks(Beam, [abstract_code]),
+    write_crypt_file(["[{debug_info,des3_cbc,simple,\"A Wrong Key\"}].\n"]),
+    {error,beam_lib,Error} = beam_lib:chunks(Beam, [abstract_code]),
 
     %% Write correct key...
-    ?line write_crypt_file(["[{debug_info,des3_cbc,simple,\"",Key,"\"}].\n"]),
+    write_crypt_file(["[{debug_info,des3_cbc,simple,\"",Key,"\"}].\n"]),
 
     %% ... but the fun with the wrong key is still there.
-    ?line {error,beam_lib,Error} = beam_lib:chunks(Beam, [abstract_code]),
+    {error,beam_lib,Error} = beam_lib:chunks(Beam, [abstract_code]),
 
     %% Clear the fun. Now it should work.
-    ?line {ok,_} = beam_lib:clear_crypto_key_fun(),
-    ?line verify_abstract(Beam),
-    ?line verify_abstract(Beam),
-    ?line ok = file:delete(".erlang.crypt"),
-    ?line verify_abstract(Beam),
+    {ok,_} = beam_lib:clear_crypto_key_fun(),
+    verify_abstract(Beam),
+    verify_abstract(Beam),
+    ok = file:delete(".erlang.crypt"),
+    verify_abstract(Beam),
 
     %% Clear, otherwise the second pass will fail.
-    ?line {ok,_} = beam_lib:clear_crypto_key_fun(),
-    ?line {error,beam_lib,Error} = beam_lib:chunks(Beam, [abstract_code]),
+    {ok,_} = beam_lib:clear_crypto_key_fun(),
+    {error,beam_lib,Error} = beam_lib:chunks(Beam, [abstract_code]),
     ok.
 
 write_crypt_file(Contents0) ->
@@ -706,45 +694,44 @@ write_crypt_file(Contents0) ->
     ok = file:write_file(".erlang.crypt", Contents).
 
 compare_chunks(File1, File2, ChunkIds) ->
-    ?line {ok, {_, Chunks1}} = beam_lib:chunks(File1, ChunkIds),
-    ?line {ok, {_, Chunks2}} = beam_lib:chunks(File2, ChunkIds),
-    ?line true = Chunks1 == Chunks2.
+    {ok, {_, Chunks1}} = beam_lib:chunks(File1, ChunkIds),
+    {ok, {_, Chunks2}} = beam_lib:chunks(File2, ChunkIds),
+    true = Chunks1 == Chunks2.
 
 chunk_ids(File) ->
-    ?line lists:map(fun({Id,_Start,_Size}) -> Id end, chunk_info(File)).
-    
+    lists:map(fun({Id,_Start,_Size}) -> Id end, chunk_info(File)).
+
 chunk_info(File) ->
-    ?line {value, {chunks, Chunks}} = 
+    {value, {chunks, Chunks}} =
 	lists:keysearch(chunks, 1, beam_lib:info(File)),
     Chunks.
-    
+
 make_beam(Dir, Module, F) ->
-    ?line FileBase = filename:join(Dir, atom_to_list(Module)),
-    ?line Source = FileBase ++ ".erl",
-    ?line BeamFile = FileBase ++ ".beam",
-    ?line simple_file(Source, Module, F),
-    ?line {ok, _} = compile:file(Source, [{outdir,Dir}, debug_info, report]),
+    FileBase = filename:join(Dir, atom_to_list(Module)),
+    Source = FileBase ++ ".erl",
+    BeamFile = FileBase ++ ".beam",
+    simple_file(Source, Module, F),
+    {ok, _} = compile:file(Source, [{outdir,Dir}, debug_info, report]),
     {Source, BeamFile}.
 
 set_byte(_Backup, Binary, Pos, Byte) when is_binary(Binary) ->
-    ?line <<B1:Pos/binary, _:1/binary, B2/binary>> = Binary,
+    <<B1:Pos/binary, _:1/binary, B2/binary>> = Binary,
     NB = <<B1/binary, Byte:8, B2/binary>>,
     NB;
 set_byte(Backup, File, Pos, Byte) ->
-    ?line copy_file(Backup, File),
-    ?line set_byte(File, Pos, Byte),
+    copy_file(Backup, File),
+    set_byte(File, Pos, Byte),
     File.
 
 set_byte(File, Pos, Byte) ->
-    ?line {ok, Fd} = file:open(File, [read, write]),
-    ?line {ok, _} = file:position(Fd, Pos),
-    ?line ok = file:write(Fd, [Byte]),
-    ?line file:close(Fd).
+    {ok, Fd} = file:open(File, [read, write]),
+    {ok, _} = file:position(Fd, Pos),
+    ok = file:write(Fd, [Byte]),
+    file:close(Fd).
 
 copy_file(Src, Dest) ->
-    % ?t:format("copying from ~p to ~p~n", [Src, Dest]),
-    ?line {ok, _} = file:copy(Src, Dest),
-    ?line ok = file:change_mode(Dest, 8#0666).
+    {ok, _} = file:copy(Src, Dest),
+    ok = file:change_mode(Dest, 8#0666).
 
 delete_files(Files) ->
     lists:foreach(fun(F) -> file:delete(F) end, Files).
@@ -772,7 +759,7 @@ ver(S, {error, beam_lib, R}) ->
     [S|_] = tuple_to_list(R),
     case lists:flatten(beam_lib:format_error(R)) of
 	[${ | _] ->
-	    test_server:fail({bad_format_error, R});
+	    ct:fail({bad_format_error, R});
 	_ ->
 	    ok
     end.
diff --git a/lib/stdlib/test/binary_module_SUITE.erl b/lib/stdlib/test/binary_module_SUITE.erl
index 70c946bdb9..285740d3e0 100644
--- a/lib/stdlib/test/binary_module_SUITE.erl
+++ b/lib/stdlib/test/binary_module_SUITE.erl
@@ -20,6 +20,7 @@
 -module(binary_module_SUITE).
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2,
 	 init_per_group/2,end_per_group/2, 
 	 interesting/1,scope_return/1,random_ref_comp/1,random_ref_sr_comp/1,
 	 random_ref_fla_comp/1,parts/1, bin_to_list/1, list_to_bin/1,
@@ -27,45 +28,17 @@
 
 -export([random_number/1, make_unaligned/1]).
 
-
-
-%%-define(STANDALONE,1).
-
--ifdef(STANDALONE).
-
--define(line,erlang:display({?MODULE,?LINE}),).
-
--else.
-
--include_lib("test_server/include/test_server.hrl").
--export([init_per_testcase/2, end_per_testcase/2]).
-% Default timetrap timeout (set in init_per_testcase).
-% Some of these testcases are really heavy...
--define(default_timeout, ?t:minutes(30)).
-
--endif.
-
-
-
--ifdef(STANDALONE).
--export([run/0]).
-
-run() ->
-    [ apply(?MODULE,X,[[]]) || X <- all(suite) ].
-
--else.
+-include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    ?line Dog = ?config(watchdog, Config),
-    ?line test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
--endif.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,30}}].
 
 all() -> 
     [scope_return,interesting, random_ref_fla_comp, random_ref_sr_comp,
@@ -92,300 +65,297 @@ end_per_group(_GroupName, Config) ->
 -define(MASK_ERROR(EXPR),mask_error((catch (EXPR)))).
 
 
-badargs(doc) ->
-    ["Tests various badarg exceptions in the module"];
+%% Test various badarg exceptions in the module.
 badargs(Config) when is_list(Config) ->
-    ?line badarg = ?MASK_ERROR(binary:compile_pattern([<<1,2,3:3>>])),
-    ?line badarg = ?MASK_ERROR(binary:compile_pattern([<<1,2,3>>|<<1,2>>])),
-    ?line badarg = ?MASK_ERROR(binary:compile_pattern(<<1,2,3:3>>)),
-    ?line badarg = ?MASK_ERROR(binary:compile_pattern(<<>>)),
-    ?line badarg = ?MASK_ERROR(binary:match(<<1,2,3:3>>,<<1>>)),
-    ?line badarg = ?MASK_ERROR(binary:matches(<<1,2,3:3>>,<<1>>)),
-    ?line badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,
-					    [{scope,{0,1},1}])),
-    ?line badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,
-					    [{scape,{0,1}}])),
-    ?line badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,
-					    [{scope,{0,1,1}}])),
-    ?line badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,[{scope,0,1}])),
-    ?line badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,[{scope,[0,1]}])),
-    ?line badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,
-					    [{scope,{0.1,1}}])),
-    ?line badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,
-					    [{scope,{1,1.1}}])),
-    ?line badarg =
+    badarg = ?MASK_ERROR(binary:compile_pattern([<<1,2,3:3>>])),
+    badarg = ?MASK_ERROR(binary:compile_pattern([<<1,2,3>>|<<1,2>>])),
+    badarg = ?MASK_ERROR(binary:compile_pattern(<<1,2,3:3>>)),
+    badarg = ?MASK_ERROR(binary:compile_pattern(<<>>)),
+    badarg = ?MASK_ERROR(binary:match(<<1,2,3:3>>,<<1>>)),
+    badarg = ?MASK_ERROR(binary:matches(<<1,2,3:3>>,<<1>>)),
+    badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,
+				      [{scope,{0,1},1}])),
+    badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,
+				      [{scape,{0,1}}])),
+    badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,
+				      [{scope,{0,1,1}}])),
+    badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,[{scope,0,1}])),
+    badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,[{scope,[0,1]}])),
+    badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,
+				      [{scope,{0.1,1}}])),
+    badarg = ?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,
+				      [{scope,{1,1.1}}])),
+    badarg =
 	?MASK_ERROR(
 	   binary:match(<<1,2,3>>,<<1>>,
 			[{scope,{16#FF,
 				 16#FFFFFFFFFFFFFFFF}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:match(<<1,2,3>>,<<1>>,
 			[{scope,{16#FFFFFFFFFFFFFFFF,
 				 -16#7FFFFFFFFFFFFFFF-1}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:match(<<1,2,3>>,<<1>>,
 			[{scope,{16#FFFFFFFFFFFFFFFF,
 				 16#7FFFFFFFFFFFFFFF}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:part(<<1,2,3>>,{16#FF,
-				 16#FFFFFFFFFFFFFFFF})),
-    ?line badarg =
+				  16#FFFFFFFFFFFFFFFF})),
+    badarg =
 	?MASK_ERROR(
 	   binary:part(<<1,2,3>>,{16#FFFFFFFFFFFFFFFF,
-				 -16#7FFFFFFFFFFFFFFF-1})),
-    ?line badarg =
+				  -16#7FFFFFFFFFFFFFFF-1})),
+    badarg =
 	?MASK_ERROR(
 	   binary:part(<<1,2,3>>,{16#FFFFFFFFFFFFFFFF,
-				 16#7FFFFFFFFFFFFFFF})),
-    ?line badarg =
+				  16#7FFFFFFFFFFFFFFF})),
+    badarg =
 	?MASK_ERROR(
 	   binary:part(make_unaligned(<<1,2,3>>),{1,1,1})),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary_part(make_unaligned(<<1,2,3>>),{1,1,1})),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary_part(make_unaligned(<<1,2,3>>),{16#FFFFFFFFFFFFFFFF,
-				 -16#7FFFFFFFFFFFFFFF-1})),
-    ?line badarg =
+						  -16#7FFFFFFFFFFFFFFF-1})),
+    badarg =
 	?MASK_ERROR(
 	   binary_part(make_unaligned(<<1,2,3>>),{16#FF,
-				 16#FFFFFFFFFFFFFFFF})),
-    ?line badarg =
+						  16#FFFFFFFFFFFFFFFF})),
+    badarg =
 	?MASK_ERROR(
 	   binary_part(make_unaligned(<<1,2,3>>),{16#FFFFFFFFFFFFFFFF,
-				 16#7FFFFFFFFFFFFFFF})),
-    ?line badarg =
+						  16#7FFFFFFFFFFFFFFF})),
+    badarg =
 	?MASK_ERROR(
 	   binary_part(make_unaligned(<<1,2,3>>),{16#FFFFFFFFFFFFFFFFFF,
-				 -16#7FFF})),
-    ?line badarg =
+						  -16#7FFF})),
+    badarg =
 	?MASK_ERROR(
 	   binary_part(make_unaligned(<<1,2,3>>),{16#FF,
-				 -16#7FFF})),
-    ?line badarg =
+						  -16#7FFF})),
+    badarg =
 	?MASK_ERROR(
 	   binary:bin_to_list(<<1,2,3>>,{16#FF,
-				 16#FFFFFFFFFFFFFFFF})),
-    ?line badarg =
+					 16#FFFFFFFFFFFFFFFF})),
+    badarg =
 	?MASK_ERROR(
 	   binary:bin_to_list(<<1,2,3>>,{16#FFFFFFFFFFFFFFFF,
-				 -16#7FFFFFFFFFFFFFFF-1})),
-    ?line badarg =
+					 -16#7FFFFFFFFFFFFFFF-1})),
+    badarg =
 	?MASK_ERROR(
 	   binary:bin_to_list(<<1,2,3>>,{16#FFFFFFFFFFFFFFFF,
-				 16#7FFFFFFFFFFFFFFF})),
-    ?line [1,2,3] =
+					 16#7FFFFFFFFFFFFFFF})),
+    [1,2,3] =
 	?MASK_ERROR(
 	   binary:bin_to_list(<<1,2,3>>)),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:bin_to_list(<<1,2,3>>,[])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:bin_to_list(<<1,2,3>>,{1,2,3})),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:bin_to_list(<<1,2,3>>,{1.0,1})),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:bin_to_list(<<1,2,3>>,{1,1.0})),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:bin_to_list(<<1,2,3:3>>,{1,1})),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:bin_to_list(<<1,2,3:3>>)),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:bin_to_list([1,2,3])),
 
-    ?line nomatch =
+    nomatch =
 	?MASK_ERROR(binary:match(<<1,2,3>>,<<1>>,[{scope,{0,0}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(binary:match(<<1,2,3>>,{bm,<<>>},[{scope,{0,1}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(binary:match(<<1,2,3>>,[],[{scope,{0,1}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(binary:match(<<1,2,3>>,{ac,<<>>},[{scope,{0,1}}])),
-    ?line {bm,BMMagic} = binary:compile_pattern([<<1,2,3>>]),
-    ?line {ac,ACMagic} = binary:compile_pattern([<<1,2,3>>,<<4,5>>]),
-    ?line badarg =
+    {bm,BMMagic} = binary:compile_pattern([<<1,2,3>>]),
+    {ac,ACMagic} = binary:compile_pattern([<<1,2,3>>,<<4,5>>]),
+    badarg =
 	?MASK_ERROR(binary:match(<<1,2,3>>,{bm,ACMagic},[{scope,{0,1}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(binary:match(<<1,2,3>>,{ac,BMMagic},[{scope,{0,1}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:match(<<1,2,3>>,
 			{bm,ets:match_spec_compile([{'_',[],['$_']}])},
 			[{scope,{0,1}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:match(<<1,2,3>>,
 			{ac,ets:match_spec_compile([{'_',[],['$_']}])},
 			[{scope,{0,1}}])),
-     ?line [] =
+    [] =
 	?MASK_ERROR(binary:matches(<<1,2,3>>,<<1>>,[{scope,{0,0}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(binary:matches(<<1,2,3>>,{bm,<<>>},[{scope,{0,1}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(binary:matches(<<1,2,3>>,[],[{scope,{0,1}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(binary:matches(<<1,2,3>>,{ac,<<>>},[{scope,{0,1}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(binary:matches(<<1,2,3>>,{bm,ACMagic},[{scope,{0,1}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(binary:matches(<<1,2,3>>,{ac,BMMagic},[{scope,{0,1}}])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:matches(<<1,2,3>>,
-			{bm,ets:match_spec_compile([{'_',[],['$_']}])},
-			[{scope,{0,1}}])),
-    ?line badarg =
+			  {bm,ets:match_spec_compile([{'_',[],['$_']}])},
+			  [{scope,{0,1}}])),
+    badarg =
 	?MASK_ERROR(
 	   binary:matches(<<1,2,3>>,
-			{ac,ets:match_spec_compile([{'_',[],['$_']}])},
-			[{scope,{0,1}}])),
+			  {ac,ets:match_spec_compile([{'_',[],['$_']}])},
+			  [{scope,{0,1}}])),
     %% OTP-11350
     badarg = ?MASK_ERROR(
 		binary:matches(<<"foo">>, 
 			       [<<>>, <<"f">>])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(binary:longest_common_prefix(
 		      [<<0:10000,1,2,4,1:3>>,
 		       <<0:10000,1,2,3>>])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(binary:longest_common_suffix(
 		      [<<0:10000,1,2,4,1:3>>,
 		       <<0:10000,1,2,3>>])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(binary:encode_unsigned(-1)),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:encode_unsigned(-16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:first(<<1,2,4,1:3>>)),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:first([1,2,4])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:last(<<1,2,4,1:3>>)),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:last([1,2,4])),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:at(<<1,2,4,1:3>>,2)),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:at(<<>>,2)),
-    ?line badarg =
+    badarg =
 	?MASK_ERROR(
 	   binary:at([1,2,4],2)),
     ok.
 
-longest_common_trap(doc) ->
-    ["Whitebox test to force special trap conditions in longest_common_{prefix,suffix}"];
+%% Whitebox test to force special trap conditions in
+%% longest_common_{prefix,suffix}.
 longest_common_trap(Config) when is_list(Config) ->
-    ?line erts_debug:set_internal_state(available_internal_state,true),
-    ?line io:format("oldlimit: ~p~n",
-		    [erts_debug:set_internal_state(binary_loop_limit,10)]),
+    erts_debug:set_internal_state(available_internal_state,true),
+    io:format("oldlimit: ~p~n",
+	      [erts_debug:set_internal_state(binary_loop_limit,10)]),
     erlang:bump_reductions(10000000),
-    ?line _ = binary:longest_common_prefix(
-		[<<0:10000,1,2,4>>,
-		 <<0:10000,1,2,3>>,
-		 <<0:10000,1,3,3>>,
-		 <<0:10000,1,2,4>>,
-		 <<0:10000,1,2,4>>,
-		 <<0:10000,1,2,3>>,
-		 <<0:10000,1,3,3>>,
-		 <<0:10000,1,2,3>>,
-		 <<0:10000,1,3,3>>,
-		 <<0:10000,1,2,4>>,
-		 <<0:10000,1,2,4>>,
-		 <<0:10000,1,2,3>>,
-		 <<0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0:10000,1,3,3>>,
-		 <<0:10000,1,2,4>>]),
-    ?line _ = binary:longest_common_prefix(
-		[<<0:10000,1,2,4>>,
-		 <<0:10000,1,2,3>>,
-		 <<0:10000,1,3,3>>,
-		 <<0:10000,1,2,4>>,
-		 <<0:10000,1,2,4>>,
-		 <<0:10000,1,2,3>>,
-		 <<0:10000,1,3,3>>,
-		 <<0:10000,1,2,3>>,
-		 <<0:10000,1,3,3>>,
-		 <<0:10000,1,2,4>>,
-		 <<0:10000,1,2,4>>,
-		 <<0:10000,1,2,3>>,
-		 <<0,0,0,0,0,0,0,0,0,0,0,0,0,0>>,
-		 <<0:10000,1,2,4>>]),
+    _ = binary:longest_common_prefix(
+	  [<<0:10000,1,2,4>>,
+	   <<0:10000,1,2,3>>,
+	   <<0:10000,1,3,3>>,
+	   <<0:10000,1,2,4>>,
+	   <<0:10000,1,2,4>>,
+	   <<0:10000,1,2,3>>,
+	   <<0:10000,1,3,3>>,
+	   <<0:10000,1,2,3>>,
+	   <<0:10000,1,3,3>>,
+	   <<0:10000,1,2,4>>,
+	   <<0:10000,1,2,4>>,
+	   <<0:10000,1,2,3>>,
+	   <<0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0:10000,1,3,3>>,
+	   <<0:10000,1,2,4>>]),
+    _ = binary:longest_common_prefix(
+	  [<<0:10000,1,2,4>>,
+	   <<0:10000,1,2,3>>,
+	   <<0:10000,1,3,3>>,
+	   <<0:10000,1,2,4>>,
+	   <<0:10000,1,2,4>>,
+	   <<0:10000,1,2,3>>,
+	   <<0:10000,1,3,3>>,
+	   <<0:10000,1,2,3>>,
+	   <<0:10000,1,3,3>>,
+	   <<0:10000,1,2,4>>,
+	   <<0:10000,1,2,4>>,
+	   <<0:10000,1,2,3>>,
+	   <<0,0,0,0,0,0,0,0,0,0,0,0,0,0>>,
+	   <<0:10000,1,2,4>>]),
     erlang:bump_reductions(10000000),
-    ?line _ = binary:longest_common_suffix(
-		[<<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,3,3,0:10000,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0>>,
-		 <<1,2,4,0:10000>>]),
-    ?line _ = binary:longest_common_suffix(
-		[<<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<1,2,4,0:10000>>,
-		 <<0,0,0,0,0,0,0,0,0,0,0,0,0,0>>,
-		 <<1,2,4,0:10000>>]),
+    _ = binary:longest_common_suffix(
+	  [<<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,3,3,0:10000,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0>>,
+	   <<1,2,4,0:10000>>]),
+    _ = binary:longest_common_suffix(
+	  [<<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<1,2,4,0:10000>>,
+	   <<0,0,0,0,0,0,0,0,0,0,0,0,0,0>>,
+	   <<1,2,4,0:10000>>]),
     Subj = subj(),
     Len = byte_size(Subj),
-    ?line Len = binary:longest_common_suffix(
-		  [Subj,Subj,Subj]),
-    ?line io:format("limit was: ~p~n",
-		    [erts_debug:set_internal_state(binary_loop_limit,
-						   default)]),
-    ?line erts_debug:set_internal_state(available_internal_state,false),
+    Len = binary:longest_common_suffix(
+	    [Subj,Subj,Subj]),
+    io:format("limit was: ~p~n",
+	      [erts_debug:set_internal_state(binary_loop_limit,
+					     default)]),
+    erts_debug:set_internal_state(available_internal_state,false),
     ok.
 
 subj() ->
-  Me = self(),
-  spawn(fun() ->
-    X0 = iolist_to_binary([
-      "1234567890",
-      %lists:seq(16#21, 16#7e),
-      lists:duplicate(100, $x)
-    ]),
-    Me ! X0,
-    receive X -> X end
-  end),
-  X0 = receive A -> A end,
-  <<X1:32/binary,_/binary>> = X0,
-  Subject= <<X1/binary>>,
-  Subject.
-
-
-scope_return(doc) ->
-    ["Test correct return values for scopes (OTP-9701)."];
+    Me = self(),
+    spawn(fun() ->
+		  X0 = iolist_to_binary([
+					 "1234567890",
+					 lists:duplicate(100, $x)
+					]),
+		  Me ! X0,
+		  receive X -> X end
+	  end),
+    X0 = receive A -> A end,
+    <<X1:32/binary,_/binary>> = X0,
+    Subject= <<X1/binary>>,
+    Subject.
+
+
+%% Test correct return values for scopes (OTP-9701).
 scope_return(Config) when is_list(Config) ->
     N=10000,
     Bin=binary:copy(<<"a">>,N),
@@ -394,358 +364,362 @@ scope_return(Config) when is_list(Config) ->
 scope_loop(_,N,N) ->
     ok;
 scope_loop(Bin,N,M) ->
-    ?line {N,1} = binary:match(Bin,<<"a">>,[{scope,{N,1}}]),
-    ?line {N,1} = binary:match(Bin,[<<"a">>,<<"b">>],[{scope,{N,1}}]),
+    {N,1} = binary:match(Bin,<<"a">>,[{scope,{N,1}}]),
+    {N,1} = binary:match(Bin,[<<"a">>,<<"b">>],[{scope,{N,1}}]),
     scope_loop(Bin,N+1,M).
 
-interesting(doc) ->
-    ["Try some interesting patterns"];
+%% Try some interesting patterns.
 interesting(Config) when is_list(Config) ->
     X = do_interesting(binary),
     X = do_interesting(binref).
 
 do_interesting(Module) ->
-    ?line {0,4} = Module:match(<<"123456">>,
+    {0,4} = Module:match(<<"123456">>,
 			 Module:compile_pattern([<<"12">>,<<"1234">>,
 						 <<"23">>,<<"3">>,
 						 <<"34">>,<<"456">>,
 						 <<"45">>,<<"6">>])),
-    ?line [{0,4},{5,1}] = Module:matches(<<"123456">>,
+    [{0,4},{5,1}] = Module:matches(<<"123456">>,
 				   Module:compile_pattern([<<"12">>,<<"1234">>,
 							   <<"23">>,<<"3">>,
 							   <<"34">>,<<"456">>,
 							   <<"45">>,<<"6">>])),
-    ?line [{0,4}] = Module:matches(<<"123456">>,
+    [{0,4}] = Module:matches(<<"123456">>,
 			     Module:compile_pattern([<<"12">>,<<"1234">>,
 						     <<"23">>,<<"3">>,
 						     <<"34">>,<<"456">>,
 						     <<"45">>])),
-    ?line [{0,2},{2,2}] = Module:matches(<<"123456">>,
-			     Module:compile_pattern([<<"12">>,
-						     <<"23">>,<<"3">>,
-						     <<"34">>,<<"456">>,
-						     <<"45">>])),
-    ?line {1,4} = Module:match(<<"123456">>,
+    [{0,2},{2,2}] = Module:matches(<<"123456">>,
+				   Module:compile_pattern([<<"12">>,
+							   <<"23">>,<<"3">>,
+							   <<"34">>,<<"456">>,
+							   <<"45">>])),
+    {1,4} = Module:match(<<"123456">>,
 			 Module:compile_pattern([<<"34">>,<<"34">>,
 						 <<"12347">>,<<"2345">>])),
-    ?line [{1,4}] = Module:matches(<<"123456">>,
+    [{1,4}] = Module:matches(<<"123456">>,
 			     Module:compile_pattern([<<"34">>,<<"34">>,
 						     <<"12347">>,<<"2345">>])),
-    ?line [{2,2}] = Module:matches(<<"123456">>,
+    [{2,2}] = Module:matches(<<"123456">>,
 			     Module:compile_pattern([<<"34">>,<<"34">>,
 						     <<"12347">>,<<"2346">>])),
 
-    ?line {0,4} = Module:match(<<"123456">>,
+    {0,4} = Module:match(<<"123456">>,
 			 [<<"12">>,<<"1234">>,
 			  <<"23">>,<<"3">>,
 			  <<"34">>,<<"456">>,
 			  <<"45">>,<<"6">>]),
-    ?line [{0,4},{5,1}] = Module:matches(<<"123456">>,
+    [{0,4},{5,1}] = Module:matches(<<"123456">>,
 				   [<<"12">>,<<"1234">>,
 				    <<"23">>,<<"3">>,
 				    <<"34">>,<<"456">>,
 				    <<"45">>,<<"6">>]),
-    ?line [{0,4}] = Module:matches(<<"123456">>,
+    [{0,4}] = Module:matches(<<"123456">>,
 			     [<<"12">>,<<"1234">>,
 			      <<"23">>,<<"3">>,
 			      <<"34">>,<<"456">>,
 			      <<"45">>]),
-    ?line [{0,2},{2,2}] = Module:matches(<<"123456">>,
-					 [<<"12">>,
-					  <<"23">>,<<"3">>,
-					  <<"34">>,<<"456">>,
-					  <<"45">>]),
-    ?line {1,4} = Module:match(<<"123456">>,
-			       [<<"34">>,<<"34">>,
-				<<"12347">>,<<"2345">>]),
-    ?line [{1,4}] = Module:matches(<<"123456">>,
-				   [<<"34">>,<<"34">>,
-				    <<"12347">>,<<"2345">>]),
-    ?line [{2,2}] = Module:matches(<<"123456">>,
-				   [<<"34">>,<<"34">>,
-				    <<"12347">>,<<"2346">>]),
-    ?line nomatch = Module:match(<<1,2,3,4>>,<<2>>,[{scope,{0,1}}]),
-    ?line {1,1} = Module:match(<<1,2,3,4>>,<<2>>,[{scope,{0,2}}]),
-    ?line nomatch = Module:match(<<1,2,3,4>>,<<2,3>>,[{scope,{0,2}}]),
-    ?line {1,2} = Module:match(<<1,2,3,4>>,<<2,3>>,[{scope,{0,3}}]),
-    ?line {1,2} = Module:match(<<1,2,3,4>>,<<2,3>>,[{scope,{0,4}}]),
-    ?line badarg = ?MASK_ERROR(Module:match(<<1,2,3,4>>,<<2,3>>,
-					    [{scope,{0,5}}])),
-    ?line {1,2} = Module:match(<<1,2,3,4>>,<<2,3>>,[{scope,{4,-4}}]),
-    ?line {0,3} = Module:match(<<1,2,3,4>>,<<1,2,3>>,[{scope,{4,-4}}]),
-    ?line {0,4} = Module:match(<<1,2,3,4>>,<<1,2,3,4>>,[{scope,{4,-4}}]),
-    ?line badarg = ?MASK_ERROR(Module:match(<<1,2,3,4>>,<<1,2,3,4>>,
-					    [{scope,{3,-4}}])),
-    ?line [] = Module:matches(<<1,2,3,4>>,<<2>>,[{scope,{0,1}}]),
-    ?line [{1,1}] = Module:matches(<<1,2,3,4>>,[<<2>>,<<3>>],[{scope,{0,2}}]),
-    ?line [] = Module:matches(<<1,2,3,4>>,<<2,3>>,[{scope,{0,2}}]),
-    ?line [{1,2}] = Module:matches(<<1,2,3,4>>,<<2,3>>,[{scope,{0,3}}]),
-    ?line [{1,2}] = Module:matches(<<1,2,3,4>>,<<2,3>>,[{scope,{0,4}}]),
-    ?line [{1,2}] = Module:matches(<<1,2,3,4>>,[<<2,3>>,<<4>>],
-				   [{scope,{0,3}}]),
-    ?line [{1,2},{3,1}] = Module:matches(<<1,2,3,4>>,[<<2,3>>,<<4>>],
-					 [{scope,{0,4}}]),
-    ?line badarg = ?MASK_ERROR(Module:matches(<<1,2,3,4>>,<<2,3>>,
-					      [{scope,{0,5}}])),
-    ?line [{1,2}] = Module:matches(<<1,2,3,4>>,<<2,3>>,[{scope,{4,-4}}]),
-    ?line [{1,2},{3,1}] = Module:matches(<<1,2,3,4>>,[<<2,3>>,<<4>>],
-					 [{scope,{4,-4}}]),
-    ?line [{0,3}] = Module:matches(<<1,2,3,4>>,<<1,2,3>>,[{scope,{4,-4}}]),
-    ?line [{0,4}] = Module:matches(<<1,2,3,4>>,<<1,2,3,4>>,[{scope,{4,-4}}]),
-    ?line badarg = ?MASK_ERROR(Module:matches(<<1,2,3,4>>,<<1,2,3,4>>,
-					      [{scope,{3,-4}}])),
-    ?line badarg = ?MASK_ERROR(Module:matches(<<1,2,3,4>>,[<<1,2,3,4>>],
-					      [{scope,{3,-4}}])),
-    ?line [<<1,2,3>>,<<6,7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,<<4,5>>),
-    ?line [<<1,2,3>>,<<6,7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
-					       [<<4,5>>,<<7>>]),
-    ?line [<<1,2,3>>,<<6>>,<<8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
-						 [<<4,5>>,<<7>>],[global]),
-    ?line [<<1,2,3>>,<<6>>,<<>>,<<>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
-						     [<<4,5>>,<<7>>,<<8>>],
-						     [global]),
-    ?line [<<1,2,3>>,<<6>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
-					   [<<4,5>>,<<7>>,<<8>>],
-					   [global,trim]),
-    ?line [<<1,2,3>>,<<6>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
-					   [<<4,5>>,<<7>>,<<8>>],
-					   [global,trim_all]),
-    ?line [<<1,2,3,4,5,6,7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
-					       [<<4,5>>,<<7>>,<<8>>],
-					       [global,trim,{scope,{0,4}}]),
-    ?line [<<1,2,3>>,<<6,7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
+    [{0,2},{2,2}] = Module:matches(<<"123456">>,
+				   [<<"12">>,
+				    <<"23">>,<<"3">>,
+				    <<"34">>,<<"456">>,
+				    <<"45">>]),
+    {1,4} = Module:match(<<"123456">>,
+			 [<<"34">>,<<"34">>,
+			  <<"12347">>,<<"2345">>]),
+    [{1,4}] = Module:matches(<<"123456">>,
+			     [<<"34">>,<<"34">>,
+			      <<"12347">>,<<"2345">>]),
+    [{2,2}] = Module:matches(<<"123456">>,
+			     [<<"34">>,<<"34">>,
+			      <<"12347">>,<<"2346">>]),
+    nomatch = Module:match(<<1,2,3,4>>,<<2>>,[{scope,{0,1}}]),
+    {1,1} = Module:match(<<1,2,3,4>>,<<2>>,[{scope,{0,2}}]),
+    nomatch = Module:match(<<1,2,3,4>>,<<2,3>>,[{scope,{0,2}}]),
+    {1,2} = Module:match(<<1,2,3,4>>,<<2,3>>,[{scope,{0,3}}]),
+    {1,2} = Module:match(<<1,2,3,4>>,<<2,3>>,[{scope,{0,4}}]),
+    badarg = ?MASK_ERROR(Module:match(<<1,2,3,4>>,<<2,3>>,
+				      [{scope,{0,5}}])),
+    {1,2} = Module:match(<<1,2,3,4>>,<<2,3>>,[{scope,{4,-4}}]),
+    {0,3} = Module:match(<<1,2,3,4>>,<<1,2,3>>,[{scope,{4,-4}}]),
+    {0,4} = Module:match(<<1,2,3,4>>,<<1,2,3,4>>,[{scope,{4,-4}}]),
+    badarg = ?MASK_ERROR(Module:match(<<1,2,3,4>>,<<1,2,3,4>>,
+				      [{scope,{3,-4}}])),
+    [] = Module:matches(<<1,2,3,4>>,<<2>>,[{scope,{0,1}}]),
+    [{1,1}] = Module:matches(<<1,2,3,4>>,[<<2>>,<<3>>],[{scope,{0,2}}]),
+    [] = Module:matches(<<1,2,3,4>>,<<2,3>>,[{scope,{0,2}}]),
+    [{1,2}] = Module:matches(<<1,2,3,4>>,<<2,3>>,[{scope,{0,3}}]),
+    [{1,2}] = Module:matches(<<1,2,3,4>>,<<2,3>>,[{scope,{0,4}}]),
+    [{1,2}] = Module:matches(<<1,2,3,4>>,[<<2,3>>,<<4>>],
+			     [{scope,{0,3}}]),
+    [{1,2},{3,1}] = Module:matches(<<1,2,3,4>>,[<<2,3>>,<<4>>],
+				   [{scope,{0,4}}]),
+    badarg = ?MASK_ERROR(Module:matches(<<1,2,3,4>>,<<2,3>>,
+					[{scope,{0,5}}])),
+    [{1,2}] = Module:matches(<<1,2,3,4>>,<<2,3>>,[{scope,{4,-4}}]),
+    [{1,2},{3,1}] = Module:matches(<<1,2,3,4>>,[<<2,3>>,<<4>>],
+				   [{scope,{4,-4}}]),
+    [{0,3}] = Module:matches(<<1,2,3,4>>,<<1,2,3>>,[{scope,{4,-4}}]),
+    [{0,4}] = Module:matches(<<1,2,3,4>>,<<1,2,3,4>>,[{scope,{4,-4}}]),
+    badarg = ?MASK_ERROR(Module:matches(<<1,2,3,4>>,<<1,2,3,4>>,
+					[{scope,{3,-4}}])),
+    badarg = ?MASK_ERROR(Module:matches(<<1,2,3,4>>,[<<1,2,3,4>>],
+					[{scope,{3,-4}}])),
+    [<<1,2,3>>,<<6,7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,<<4,5>>),
+    [<<1,2,3>>,<<6,7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
+					 [<<4,5>>,<<7>>]),
+    [<<1,2,3>>,<<6>>,<<8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
+					   [<<4,5>>,<<7>>],[global]),
+    [<<1,2,3>>,<<6>>,<<>>,<<>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
 					       [<<4,5>>,<<7>>,<<8>>],
-					       [global,trim,{scope,{0,5}}]),
-
-    ?line [<<>>,<<>>,<<3>>,<<6,7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
-					   [<<1>>,<<2>>,<<4,5>>],
-					   [global,trim]),
-    ?line [<<3>>,<<6,7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
-					   [<<1>>,<<2>>,<<4,5>>],
-					   [global,trim_all]),
-
-    ?line [<<1,2,3>>,<<>>,<<7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
-					   [<<4,5>>,<<6>>],
-					   [global,trim]),
-    ?line [<<1,2,3>>,<<7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
-					   [<<4,5>>,<<6>>],
-					   [global,trim_all]),
-    ?line [<<>>,<<>>,<<3>>,<<>>,<<6>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
-					   [<<1>>,<<2>>,<<4>>,<<5>>,<<7>>,<<8>>],
-					   [global,trim]),
-    ?line [<<3>>,<<6>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
-					   [<<1>>,<<2>>,<<4>>,<<5>>,<<7>>,<<8>>],
-					   [global,trim_all]),
-    ?line badarg = ?MASK_ERROR(
-		      Module:replace(<<1,2,3,4,5,6,7,8>>,
-				     [<<4,5>>,<<7>>,<<8>>],<<99>>,
-				     [global,trim,{scope,{0,5}}])),
-    ?line <<1,2,3,99,6,7,8>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
-					      [<<4,5>>,<<7>>,<<8>>],<<99>>,[]),
-    ?line <<1,2,3,99,6,99,99>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
-						[<<4,5>>,<<7>>,<<8>>],<<99>>,
-						[global]),
-    ?line <<1,2,3,99,6,7,8>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
-					      [<<4,5>>,<<7>>,<<8>>],<<99>>,
-					      [global,{scope,{0,5}}]),
-    ?line <<1,2,3,99,6,7,8>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
-					      [<<4,5>>,<<7>>,<<8>>],<<99>>,
-					      [global,{scope,{0,5}}]),
-    ?line <<1,2,3,99,6,7,8>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
-					      [<<4,5>>,<<7>>,<<8>>],<<99>>,
-					      [global,{scope,{0,5}}]),
-    ?line badarg = ?MASK_ERROR(Module:replace(<<1,2,3,4,5,6,7,8>>,
-					      [<<4,5>>,<<7>>,<<8>>],<<99>>,
-					      [global,{scope,{0,5}},
-					       {insert,1}])),
-    ?line <<1,2,3,99,4,5,6,7,8>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
-						  [<<4,5>>,<<7>>,<<8>>],<<99>>,
-						  [global,{scope,{0,5}},
-						   {insert_replaced,1}]),
-    ?line <<1,2,3,9,4,5,9,6,7,8>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
-						   [<<4,5>>,<<7>>,<<8>>],
-						   <<9,9>>,
-						   [global,{scope,{0,5}},
-						    {insert_replaced,1}]),
-    ?line badarg = ?MASK_ERROR(Module:replace(<<1,2,3,4,5,6,7,8>>,
-					      [<<4,5>>,<<7>>,<<8>>],<<>>,
-					      [global,{scope,{0,5}},
-					       {insert_replaced,1}])),
-    ?line 2 = Module:longest_common_prefix([<<1,2,4>>,<<1,2,3>>]),
-    ?line 2 = Module:longest_common_prefix([<<1,2,4>>,<<1,2>>]),
-    ?line 1 = Module:longest_common_prefix([<<1,2,4>>,<<1>>]),
-    ?line 0 = Module:longest_common_prefix([<<1,2,4>>,<<>>]),
-    ?line 1 = Module:longest_common_prefix([<<1,2,4>>,<<1,2,3>>,<<1,3,3>>]),
-    ?line 1 = Module:longest_common_prefix([<<1,2,4>>,<<1,2,3>>,<<1,3,3>>,<<1,2,4>>]),
-    ?line 1251 = Module:longest_common_prefix([<<0:10000,1,2,4>>,
-					       <<0:10000,1,2,3>>,
-					       <<0:10000,1,3,3>>,
-					       <<0:10000,1,2,4>>]),
-    ?line 12501 = Module:longest_common_prefix([<<0:100000,1,2,4>>,
-						<<0:100000,1,2,3>>,
-						<<0:100000,1,3,3>>,
-						<<0:100000,1,2,4>>]),
-    ?line 1251 = Module:longest_common_prefix(
-		   [make_unaligned(<<0:10000,1,2,4>>),
-		    <<0:10000,1,2,3>>,
-		    make_unaligned(<<0:10000,1,3,3>>),
-		    <<0:10000,1,2,4>>]),
-    ?line 12501 = Module:longest_common_prefix(
-		    [<<0:100000,1,2,4>>,
-		     make_unaligned(<<0:100000,1,2,3>>),
-		     <<0:100000,1,3,3>>,
-		     make_unaligned(<<0:100000,1,2,4>>)]),
-    ?line 1250001 = Module:longest_common_prefix([<<0:10000000,1,2,4>>,
-						  <<0:10000000,1,2,3>>,
-						  <<0:10000000,1,3,3>>,
-						  <<0:10000000,1,2,4>>]),
+					       [global]),
+    [<<1,2,3>>,<<6>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
+				     [<<4,5>>,<<7>>,<<8>>],
+				     [global,trim]),
+    [<<1,2,3>>,<<6>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
+				     [<<4,5>>,<<7>>,<<8>>],
+				     [global,trim_all]),
+    [<<1,2,3,4,5,6,7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
+					 [<<4,5>>,<<7>>,<<8>>],
+					 [global,trim,{scope,{0,4}}]),
+    [<<1,2,3>>,<<6,7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
+					 [<<4,5>>,<<7>>,<<8>>],
+					 [global,trim,{scope,{0,5}}]),
+
+    [<<>>,<<>>,<<3>>,<<6,7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
+					       [<<1>>,<<2>>,<<4,5>>],
+					       [global,trim]),
+    [<<3>>,<<6,7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
+				     [<<1>>,<<2>>,<<4,5>>],
+				     [global,trim_all]),
+
+    [<<1,2,3>>,<<>>,<<7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
+					    [<<4,5>>,<<6>>],
+					    [global,trim]),
+    [<<1,2,3>>,<<7,8>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
+				       [<<4,5>>,<<6>>],
+				       [global,trim_all]),
+    [<<>>,<<>>,<<3>>,<<>>,<<6>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
+						[<<1>>,<<2>>,<<4>>,<<5>>,<<7>>,<<8>>],
+						[global,trim]),
+    [<<3>>,<<6>>] = Module:split(<<1,2,3,4,5,6,7,8>>,
+				 [<<1>>,<<2>>,<<4>>,<<5>>,<<7>>,<<8>>],
+				 [global,trim_all]),
+    [<<>>] = binary:split(<<>>, <<",">>, []),
+    [] = binary:split(<<>>, <<",">>, [trim]),
+    [] = binary:split(<<>>, <<",">>, [trim_all]),
+    [] = binary:split(<<>>, <<",">>, [global,trim]),
+    [] = binary:split(<<>>, <<",">>, [global,trim_all]),
+
+    badarg = ?MASK_ERROR(
+		Module:replace(<<1,2,3,4,5,6,7,8>>,
+			       [<<4,5>>,<<7>>,<<8>>],<<99>>,
+			       [global,trim,{scope,{0,5}}])),
+    <<1,2,3,99,6,7,8>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
+					[<<4,5>>,<<7>>,<<8>>],<<99>>,[]),
+    <<1,2,3,99,6,99,99>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
+					  [<<4,5>>,<<7>>,<<8>>],<<99>>,
+					  [global]),
+    <<1,2,3,99,6,7,8>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
+					[<<4,5>>,<<7>>,<<8>>],<<99>>,
+					[global,{scope,{0,5}}]),
+    <<1,2,3,99,6,7,8>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
+					[<<4,5>>,<<7>>,<<8>>],<<99>>,
+					[global,{scope,{0,5}}]),
+    <<1,2,3,99,6,7,8>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
+					[<<4,5>>,<<7>>,<<8>>],<<99>>,
+					[global,{scope,{0,5}}]),
+    badarg = ?MASK_ERROR(Module:replace(<<1,2,3,4,5,6,7,8>>,
+					[<<4,5>>,<<7>>,<<8>>],<<99>>,
+					[global,{scope,{0,5}},
+					 {insert,1}])),
+    <<1,2,3,99,4,5,6,7,8>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
+					    [<<4,5>>,<<7>>,<<8>>],<<99>>,
+					    [global,{scope,{0,5}},
+					     {insert_replaced,1}]),
+    <<1,2,3,9,4,5,9,6,7,8>> = Module:replace(<<1,2,3,4,5,6,7,8>>,
+					     [<<4,5>>,<<7>>,<<8>>],
+					     <<9,9>>,
+					     [global,{scope,{0,5}},
+					      {insert_replaced,1}]),
+    badarg = ?MASK_ERROR(Module:replace(<<1,2,3,4,5,6,7,8>>,
+					[<<4,5>>,<<7>>,<<8>>],<<>>,
+					[global,{scope,{0,5}},
+					 {insert_replaced,1}])),
+    2 = Module:longest_common_prefix([<<1,2,4>>,<<1,2,3>>]),
+    2 = Module:longest_common_prefix([<<1,2,4>>,<<1,2>>]),
+    1 = Module:longest_common_prefix([<<1,2,4>>,<<1>>]),
+    0 = Module:longest_common_prefix([<<1,2,4>>,<<>>]),
+    1 = Module:longest_common_prefix([<<1,2,4>>,<<1,2,3>>,<<1,3,3>>]),
+    1 = Module:longest_common_prefix([<<1,2,4>>,<<1,2,3>>,<<1,3,3>>,<<1,2,4>>]),
+    1251 = Module:longest_common_prefix([<<0:10000,1,2,4>>,
+					 <<0:10000,1,2,3>>,
+					 <<0:10000,1,3,3>>,
+					 <<0:10000,1,2,4>>]),
+    12501 = Module:longest_common_prefix([<<0:100000,1,2,4>>,
+					  <<0:100000,1,2,3>>,
+					  <<0:100000,1,3,3>>,
+					  <<0:100000,1,2,4>>]),
+    1251 = Module:longest_common_prefix(
+	     [make_unaligned(<<0:10000,1,2,4>>),
+	      <<0:10000,1,2,3>>,
+	      make_unaligned(<<0:10000,1,3,3>>),
+	      <<0:10000,1,2,4>>]),
+    12501 = Module:longest_common_prefix(
+	      [<<0:100000,1,2,4>>,
+	       make_unaligned(<<0:100000,1,2,3>>),
+	       <<0:100000,1,3,3>>,
+	       make_unaligned(<<0:100000,1,2,4>>)]),
+    1250001 = Module:longest_common_prefix([<<0:10000000,1,2,4>>,
+					    <<0:10000000,1,2,3>>,
+					    <<0:10000000,1,3,3>>,
+					    <<0:10000000,1,2,4>>]),
     if % Too cruel for the reference implementation
 	Module =:= binary ->
-	    ?line erts_debug:set_internal_state(available_internal_state,true),
-	    ?line io:format("oldlimit: ~p~n",
-			    [erts_debug:set_internal_state(
-			       binary_loop_limit,100)]),
-	    ?line 1250001 = Module:longest_common_prefix(
-				[<<0:10000000,1,2,4>>,
-				 <<0:10000000,1,2,3>>,
-				 <<0:10000000,1,3,3>>,
-				 <<0:10000000,1,2,4>>]),
-	    ?line io:format("limit was: ~p~n",
-			    [erts_debug:set_internal_state(binary_loop_limit,
-							   default)]),
-	    ?line erts_debug:set_internal_state(available_internal_state,
-						false);
+	    erts_debug:set_internal_state(available_internal_state,true),
+	    io:format("oldlimit: ~p~n",
+		      [erts_debug:set_internal_state(
+			 binary_loop_limit,100)]),
+	    1250001 = Module:longest_common_prefix(
+			[<<0:10000000,1,2,4>>,
+			 <<0:10000000,1,2,3>>,
+			 <<0:10000000,1,3,3>>,
+			 <<0:10000000,1,2,4>>]),
+	    io:format("limit was: ~p~n",
+		      [erts_debug:set_internal_state(binary_loop_limit,
+						     default)]),
+	    erts_debug:set_internal_state(available_internal_state,
+					  false);
 	true ->
 	    ok
     end,
-    ?line 1 = Module:longest_common_suffix([<<0:100000000,1,2,4,5>>,
-					    <<0:100000000,1,2,3,5>>,
-					    <<0:100000000,1,3,3,5>>,
-					    <<0:100000000,1,2,4,5>>]),
-    ?line 1 = Module:longest_common_suffix([<<1,2,4,5>>,
-					    <<0:100000000,1,2,3,5>>,
-					    <<0:100000000,1,3,3,5>>,
-					    <<0:100000000,1,2,4,5>>]),
-    ?line 1 = Module:longest_common_suffix([<<1,2,4,5,5>>,<<5,5>>,
-					    <<0:100000000,1,3,3,5,5>>,
-					    <<0:100000000,1,2,4,5>>]),
-    ?line 0 = Module:longest_common_suffix([<<1,2,4,5,5>>,<<5,5>>,
-					    <<0:100000000,1,3,3,5,5>>,
-					    <<0:100000000,1,2,4>>]),
-    ?line 2 = Module:longest_common_suffix([<<1,2,4,5,5>>,<<5,5>>,
-					    <<0:100000000,1,3,3,5,5>>,
-					    <<0:100000000,1,2,4,5,5>>]),
-    ?line 1 = Module:longest_common_suffix([<<1,2,4,5,5>>,<<5>>,
-					    <<0:100000000,1,3,3,5,5>>,
-					    <<0:100000000,1,2,4,5,5>>]),
-    ?line 0 = Module:longest_common_suffix([<<1,2,4,5,5>>,<<>>,
-					    <<0:100000000,1,3,3,5,5>>,
-					    <<0:100000000,1,2,4,5,5>>]),
-    ?line 0 = Module:longest_common_suffix([<<>>,<<0:100000000,1,3,3,5,5>>,
-					    <<0:100000000,1,2,4,5,5>>]),
-    ?line 0 = Module:longest_common_suffix([<<>>,<<0:100000000,1,3,3,5,5>>,
-					    <<0:100000000,1,2,4,5,5>>]),
-    ?line 2 = Module:longest_common_suffix([<<5,5>>,<<0:100000000,1,3,3,5,5>>,
-					    <<0:100000000,1,2,4,5,5>>]),
-    ?line 2 = Module:longest_common_suffix([<<5,5>>,<<5,5>>,<<4,5,5>>]),
-    ?line 2 = Module:longest_common_suffix([<<5,5>>,<<5,5>>,<<5,5>>]),
-    ?line 3 = Module:longest_common_suffix([<<4,5,5>>,<<4,5,5>>,<<4,5,5>>]),
-    ?line 0 = Module:longest_common_suffix([<<>>]),
-    ?line badarg = ?MASK_ERROR(Module:longest_common_suffix([])),
-    ?line badarg = ?MASK_ERROR(Module:longest_common_suffix([apa])),
-    ?line badarg = ?MASK_ERROR(Module:longest_common_suffix([[<<>>]])),
-    ?line badarg = ?MASK_ERROR(Module:longest_common_suffix([[<<0>>,
-							      <<1:9>>]])),
-    ?line 0 = Module:longest_common_prefix([<<>>]),
-    ?line badarg = ?MASK_ERROR(Module:longest_common_prefix([])),
-    ?line badarg = ?MASK_ERROR(Module:longest_common_prefix([apa])),
-    ?line badarg = ?MASK_ERROR(Module:longest_common_prefix([[<<>>]])),
-    ?line badarg = ?MASK_ERROR(Module:longest_common_prefix([[<<0>>,
-							      <<1:9>>]])),
-
-    ?line <<1:6,Bin:3/binary,_:2>> = <<1:6,1,2,3,1:2>>,
-    ?line <<1,2,3>> = Bin,
-    ?line 1 = Module:first(Bin),
-    ?line 1 = Module:first(<<1>>),
-    ?line 1 = Module:first(<<1,2,3>>),
-    ?line badarg = ?MASK_ERROR(Module:first(<<>>)),
-    ?line badarg = ?MASK_ERROR(Module:first(apa)),
-    ?line 3 = Module:last(Bin),
-    ?line 1 = Module:last(<<1>>),
-    ?line 3 = Module:last(<<1,2,3>>),
-    ?line badarg = ?MASK_ERROR(Module:last(<<>>)),
-    ?line badarg = ?MASK_ERROR(Module:last(apa)),
-    ?line 1 = Module:at(Bin,0),
-    ?line 1 = Module:at(<<1>>,0),
-    ?line 1 = Module:at(<<1,2,3>>,0),
-    ?line 2 = Module:at(<<1,2,3>>,1),
-    ?line 3 = Module:at(<<1,2,3>>,2),
-    ?line badarg = ?MASK_ERROR(Module:at(<<1,2,3>>,3)),
-    ?line badarg = ?MASK_ERROR(Module:at(<<1,2,3>>,-1)),
-    ?line badarg = ?MASK_ERROR(Module:at(<<1,2,3>>,apa)),
-    ?line "hejsan" = [ Module:at(<<"hejsan">>,I) || I <- lists:seq(0,5) ],
-
-    ?line badarg = ?MASK_ERROR(Module:bin_to_list(<<1,2,3>>,3,-4)),
-    ?line [1,2,3] = ?MASK_ERROR(Module:bin_to_list(<<1,2,3>>,3,-3)),
-
-    ?line badarg = ?MASK_ERROR(Module:decode_unsigned(<<1,2,1:2>>,big)),
-    ?line badarg = ?MASK_ERROR(Module:decode_unsigned(<<1,2,1:2>>,little)),
-    ?line badarg = ?MASK_ERROR(Module:decode_unsigned(apa)),
-    ?line badarg = ?MASK_ERROR(Module:decode_unsigned(125,little)),
-    ?line 0 = ?MASK_ERROR(Module:decode_unsigned(<<>>,little)),
-    ?line 0 = ?MASK_ERROR(Module:decode_unsigned(<<>>,big)),
-    ?line 0 = ?MASK_ERROR(Module:decode_unsigned(<<0>>,little)),
-    ?line 0 = ?MASK_ERROR(Module:decode_unsigned(<<0>>,big)),
-    ?line 0 = ?MASK_ERROR(Module:decode_unsigned(make_unaligned(<<0>>),
-						 little)),
-    ?line 0 = ?MASK_ERROR(Module:decode_unsigned(make_unaligned(<<0>>),big)),
-    ?line badarg = ?MASK_ERROR(Module:encode_unsigned(apa)),
-    ?line badarg = ?MASK_ERROR(Module:encode_unsigned(125.3,little)),
-    ?line badarg = ?MASK_ERROR(Module:encode_unsigned({1},little)),
-    ?line badarg = ?MASK_ERROR(Module:encode_unsigned([1],little)),
-    ?line <<0>> = ?MASK_ERROR(Module:encode_unsigned(0,little)),
-    ?line <<0>> = ?MASK_ERROR(Module:encode_unsigned(0,big)),
+    1 = Module:longest_common_suffix([<<0:100000000,1,2,4,5>>,
+				      <<0:100000000,1,2,3,5>>,
+				      <<0:100000000,1,3,3,5>>,
+				      <<0:100000000,1,2,4,5>>]),
+    1 = Module:longest_common_suffix([<<1,2,4,5>>,
+				      <<0:100000000,1,2,3,5>>,
+				      <<0:100000000,1,3,3,5>>,
+				      <<0:100000000,1,2,4,5>>]),
+    1 = Module:longest_common_suffix([<<1,2,4,5,5>>,<<5,5>>,
+				      <<0:100000000,1,3,3,5,5>>,
+				      <<0:100000000,1,2,4,5>>]),
+    0 = Module:longest_common_suffix([<<1,2,4,5,5>>,<<5,5>>,
+				      <<0:100000000,1,3,3,5,5>>,
+				      <<0:100000000,1,2,4>>]),
+    2 = Module:longest_common_suffix([<<1,2,4,5,5>>,<<5,5>>,
+				      <<0:100000000,1,3,3,5,5>>,
+				      <<0:100000000,1,2,4,5,5>>]),
+    1 = Module:longest_common_suffix([<<1,2,4,5,5>>,<<5>>,
+				      <<0:100000000,1,3,3,5,5>>,
+				      <<0:100000000,1,2,4,5,5>>]),
+    0 = Module:longest_common_suffix([<<1,2,4,5,5>>,<<>>,
+				      <<0:100000000,1,3,3,5,5>>,
+				      <<0:100000000,1,2,4,5,5>>]),
+    0 = Module:longest_common_suffix([<<>>,<<0:100000000,1,3,3,5,5>>,
+				      <<0:100000000,1,2,4,5,5>>]),
+    0 = Module:longest_common_suffix([<<>>,<<0:100000000,1,3,3,5,5>>,
+				      <<0:100000000,1,2,4,5,5>>]),
+    2 = Module:longest_common_suffix([<<5,5>>,<<0:100000000,1,3,3,5,5>>,
+				      <<0:100000000,1,2,4,5,5>>]),
+    2 = Module:longest_common_suffix([<<5,5>>,<<5,5>>,<<4,5,5>>]),
+    2 = Module:longest_common_suffix([<<5,5>>,<<5,5>>,<<5,5>>]),
+    3 = Module:longest_common_suffix([<<4,5,5>>,<<4,5,5>>,<<4,5,5>>]),
+    0 = Module:longest_common_suffix([<<>>]),
+    badarg = ?MASK_ERROR(Module:longest_common_suffix([])),
+    badarg = ?MASK_ERROR(Module:longest_common_suffix([apa])),
+    badarg = ?MASK_ERROR(Module:longest_common_suffix([[<<>>]])),
+    badarg = ?MASK_ERROR(Module:longest_common_suffix([[<<0>>,
+							<<1:9>>]])),
+    0 = Module:longest_common_prefix([<<>>]),
+    badarg = ?MASK_ERROR(Module:longest_common_prefix([])),
+    badarg = ?MASK_ERROR(Module:longest_common_prefix([apa])),
+    badarg = ?MASK_ERROR(Module:longest_common_prefix([[<<>>]])),
+    badarg = ?MASK_ERROR(Module:longest_common_prefix([[<<0>>,
+							<<1:9>>]])),
+
+    <<1:6,Bin:3/binary,_:2>> = <<1:6,1,2,3,1:2>>,
+    <<1,2,3>> = Bin,
+    1 = Module:first(Bin),
+    1 = Module:first(<<1>>),
+    1 = Module:first(<<1,2,3>>),
+    badarg = ?MASK_ERROR(Module:first(<<>>)),
+    badarg = ?MASK_ERROR(Module:first(apa)),
+    3 = Module:last(Bin),
+    1 = Module:last(<<1>>),
+    3 = Module:last(<<1,2,3>>),
+    badarg = ?MASK_ERROR(Module:last(<<>>)),
+    badarg = ?MASK_ERROR(Module:last(apa)),
+    1 = Module:at(Bin,0),
+    1 = Module:at(<<1>>,0),
+    1 = Module:at(<<1,2,3>>,0),
+    2 = Module:at(<<1,2,3>>,1),
+    3 = Module:at(<<1,2,3>>,2),
+    badarg = ?MASK_ERROR(Module:at(<<1,2,3>>,3)),
+    badarg = ?MASK_ERROR(Module:at(<<1,2,3>>,-1)),
+    badarg = ?MASK_ERROR(Module:at(<<1,2,3>>,apa)),
+    "hejsan" = [ Module:at(<<"hejsan">>,I) || I <- lists:seq(0,5) ],
+
+    badarg = ?MASK_ERROR(Module:bin_to_list(<<1,2,3>>,3,-4)),
+    [1,2,3] = ?MASK_ERROR(Module:bin_to_list(<<1,2,3>>,3,-3)),
+
+    badarg = ?MASK_ERROR(Module:decode_unsigned(<<1,2,1:2>>,big)),
+    badarg = ?MASK_ERROR(Module:decode_unsigned(<<1,2,1:2>>,little)),
+    badarg = ?MASK_ERROR(Module:decode_unsigned(apa)),
+    badarg = ?MASK_ERROR(Module:decode_unsigned(125,little)),
+    0 = ?MASK_ERROR(Module:decode_unsigned(<<>>,little)),
+    0 = ?MASK_ERROR(Module:decode_unsigned(<<>>,big)),
+    0 = ?MASK_ERROR(Module:decode_unsigned(<<0>>,little)),
+    0 = ?MASK_ERROR(Module:decode_unsigned(<<0>>,big)),
+    0 = ?MASK_ERROR(Module:decode_unsigned(make_unaligned(<<0>>),
+					   little)),
+    0 = ?MASK_ERROR(Module:decode_unsigned(make_unaligned(<<0>>),big)),
+    badarg = ?MASK_ERROR(Module:encode_unsigned(apa)),
+    badarg = ?MASK_ERROR(Module:encode_unsigned(125.3,little)),
+    badarg = ?MASK_ERROR(Module:encode_unsigned({1},little)),
+    badarg = ?MASK_ERROR(Module:encode_unsigned([1],little)),
+    <<0>> = ?MASK_ERROR(Module:encode_unsigned(0,little)),
+    <<0>> = ?MASK_ERROR(Module:encode_unsigned(0,big)),
     ok.
 
-encode_decode(doc) ->
-    ["test binary:encode_unsigned/1,2 and binary:decode_unsigned/1,2"];
+%% Test binary:encode_unsigned/1,2 and binary:decode_unsigned/1,2.
 encode_decode(Config) when is_list(Config) ->
-    ?line random:seed({1271,769940,559934}),
-    ?line ok = encode_decode_loop({1,200},1000), % Need to be long enough
-						 % to create offheap binaries
+    rand:seed(exsplus, {1271,769940,559934}),
+    ok = encode_decode_loop({1,200},1000), % Need to be long enough
+						% to create offheap binaries
     ok.
 
 encode_decode_loop(_Range,0) ->
     ok;
 encode_decode_loop(Range, X) ->
-    ?line N = random_number(Range),
-    ?line A = binary:encode_unsigned(N),
-    ?line B = binary:encode_unsigned(N,big),
-    ?line C = binref:encode_unsigned(N),
-    ?line D = binref:encode_unsigned(N,big),
-    ?line E = binary:encode_unsigned(N,little),
-    ?line F = binref:encode_unsigned(N,little),
-    ?line G = binary:decode_unsigned(A),
-    ?line H = binary:decode_unsigned(A,big),
-    ?line I = binref:decode_unsigned(A),
-    ?line J = binary:decode_unsigned(E,little),
-    ?line K = binref:decode_unsigned(E,little),
-    ?line L = binary:decode_unsigned(make_unaligned(A)),
-    ?line M = binary:decode_unsigned(make_unaligned(E),little),
-    ?line PaddedBig = <<0:48,A/binary>>,
-    ?line PaddedLittle = <<E/binary,0:48>>,
-    ?line O = binary:decode_unsigned(PaddedBig),
-    ?line P = binary:decode_unsigned(make_unaligned(PaddedBig)),
-    ?line Q = binary:decode_unsigned(PaddedLittle,little),
-    ?line R = binary:decode_unsigned(make_unaligned(PaddedLittle),little),
-    ?line S = binref:decode_unsigned(PaddedLittle,little),
-    ?line T = binref:decode_unsigned(PaddedBig),
+    N = random_number(Range),
+    A = binary:encode_unsigned(N),
+    B = binary:encode_unsigned(N,big),
+    C = binref:encode_unsigned(N),
+    D = binref:encode_unsigned(N,big),
+    E = binary:encode_unsigned(N,little),
+    F = binref:encode_unsigned(N,little),
+    G = binary:decode_unsigned(A),
+    H = binary:decode_unsigned(A,big),
+    I = binref:decode_unsigned(A),
+    J = binary:decode_unsigned(E,little),
+    K = binref:decode_unsigned(E,little),
+    L = binary:decode_unsigned(make_unaligned(A)),
+    M = binary:decode_unsigned(make_unaligned(E),little),
+    PaddedBig = <<0:48,A/binary>>,
+    PaddedLittle = <<E/binary,0:48>>,
+    O = binary:decode_unsigned(PaddedBig),
+    P = binary:decode_unsigned(make_unaligned(PaddedBig)),
+    Q = binary:decode_unsigned(PaddedLittle,little),
+    R = binary:decode_unsigned(make_unaligned(PaddedLittle),little),
+    S = binref:decode_unsigned(PaddedLittle,little),
+    T = binref:decode_unsigned(PaddedBig),
     case (((A =:= B) and (B =:= C) and (C =:= D)) and
-	  ((E =:= F)) and
-	  ((N =:= G) and (G =:= H) and (H =:= I) and
-	   (I =:= J) and (J =:= K) and (K =:= L) and (L =:= M)) and
-	  ((M =:= O) and (O =:= P) and (P =:= Q) and (Q =:= R) and
-	   (R =:= S) and (S =:= T)))of
+						    ((E =:= F)) and
+								  ((N =:= G) and (G =:= H) and (H =:= I) and
+													   (I =:= J) and (J =:= K) and (K =:= L) and (L =:= M)) and
+																				  ((M =:= O) and (O =:= P) and (P =:= Q) and (Q =:= R) and
+																											 (R =:= S) and (S =:= T)))of
 	true ->
 	    encode_decode_loop(Range,X-1);
 	_ ->
@@ -754,90 +728,86 @@ encode_decode_loop(Range, X) ->
 	    exit(mismatch)
     end.
 
-guard(doc) ->
-    ["Smoke test of the guard BIFs binary_part/2,3"];
+%% Smoke test of the guard BIFs binary_part/2,3.
 guard(Config) when is_list(Config) ->
     {comment, "Guard tests are run in emulator test suite"}.
 
-referenced(doc) ->
-    ["Test refernced_byte_size/1 bif."];
+%% Test referenced_byte_size/1 bif.
 referenced(Config) when is_list(Config) ->
-    ?line badarg = ?MASK_ERROR(binary:referenced_byte_size([])),
-    ?line badarg = ?MASK_ERROR(binary:referenced_byte_size(apa)),
-    ?line badarg = ?MASK_ERROR(binary:referenced_byte_size({})),
-    ?line badarg = ?MASK_ERROR(binary:referenced_byte_size(1)),
-    ?line A = <<1,2,3>>,
-    ?line B = binary:copy(A,1000),
-    ?line 3 = binary:referenced_byte_size(A),
-    ?line 3000 = binary:referenced_byte_size(B),
-    ?line <<_:8,C:2/binary>> = A,
-    ?line 3 = binary:referenced_byte_size(C),
-    ?line 2 = binary:referenced_byte_size(binary:copy(C)),
-    ?line <<_:7,D:2/binary,_:1>> = A,
-    ?line 2 = binary:referenced_byte_size(binary:copy(D)),
-    ?line 3 = binary:referenced_byte_size(D),
-    ?line <<_:8,E:2/binary,_/binary>> = B,
-    ?line 3000 = binary:referenced_byte_size(E),
-    ?line 2 = binary:referenced_byte_size(binary:copy(E)),
-    ?line <<_:7,F:2/binary,_:1,_/binary>> = B,
-    ?line 2 = binary:referenced_byte_size(binary:copy(F)),
-    ?line 3000 = binary:referenced_byte_size(F),
+    badarg = ?MASK_ERROR(binary:referenced_byte_size([])),
+    badarg = ?MASK_ERROR(binary:referenced_byte_size(apa)),
+    badarg = ?MASK_ERROR(binary:referenced_byte_size({})),
+    badarg = ?MASK_ERROR(binary:referenced_byte_size(1)),
+    A = <<1,2,3>>,
+    B = binary:copy(A,1000),
+    3 = binary:referenced_byte_size(A),
+    3000 = binary:referenced_byte_size(B),
+    <<_:8,C:2/binary>> = A,
+    3 = binary:referenced_byte_size(C),
+    2 = binary:referenced_byte_size(binary:copy(C)),
+    <<_:7,D:2/binary,_:1>> = A,
+    2 = binary:referenced_byte_size(binary:copy(D)),
+    3 = binary:referenced_byte_size(D),
+    <<_:8,E:2/binary,_/binary>> = B,
+    3000 = binary:referenced_byte_size(E),
+    2 = binary:referenced_byte_size(binary:copy(E)),
+    <<_:7,F:2/binary,_:1,_/binary>> = B,
+    2 = binary:referenced_byte_size(binary:copy(F)),
+    3000 = binary:referenced_byte_size(F),
     ok.
 
 
 
-list_to_bin(doc) ->
-    ["Test list_to_bin/1 bif"];
+%% Test list_to_bin/1 BIF.
 list_to_bin(Config) when is_list(Config) ->
     %% Just some smoke_tests first, then go nuts with random cases
-    ?line badarg = ?MASK_ERROR(binary:list_to_bin({})),
-    ?line badarg = ?MASK_ERROR(binary:list_to_bin(apa)),
-    ?line badarg = ?MASK_ERROR(binary:list_to_bin(<<"apa">>)),
+    badarg = ?MASK_ERROR(binary:list_to_bin({})),
+    badarg = ?MASK_ERROR(binary:list_to_bin(apa)),
+    badarg = ?MASK_ERROR(binary:list_to_bin(<<"apa">>)),
     F1 = fun(L) ->
 		 ?MASK_ERROR(binref:list_to_bin(L))
 	 end,
     F2 = fun(L) ->
 		 ?MASK_ERROR(binary:list_to_bin(L))
 	 end,
-    ?line random_iolist:run(1000,F1,F2),
+    random_iolist:run(1000,F1,F2),
     ok.
 
-copy(doc) ->
-    ["Test copy/1,2 bif's"];
+%% Test copy/1,2 BIFs.
 copy(Config) when is_list(Config) ->
-    ?line <<1,2,3>> = binary:copy(<<1,2,3>>),
-    ?line RS = random_string({1,10000}),
-    ?line RS = RS2 = binary:copy(RS),
-    ?line false = erts_debug:same(RS,RS2),
-    ?line <<>> = ?MASK_ERROR(binary:copy(<<1,2,3>>,0)),
-    ?line badarg = ?MASK_ERROR(binary:copy(<<1,2,3:3>>,2)),
-    ?line badarg = ?MASK_ERROR(binary:copy([],0)),
-    ?line <<>> = ?MASK_ERROR(binary:copy(<<>>,0)),
-    ?line badarg = ?MASK_ERROR(binary:copy(<<1,2,3>>,1.0)),
-    ?line badarg = ?MASK_ERROR(binary:copy(<<1,2,3>>,
-					   16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)),
-    ?line <<>> = binary:copy(<<>>,10000),
-    ?line random:seed({1271,769940,559934}),
-    ?line ok = random_copy(3000),
-    ?line erts_debug:set_internal_state(available_internal_state,true),
-    ?line io:format("oldlimit: ~p~n",
-		    [erts_debug:set_internal_state(binary_loop_limit,10)]),
-    ?line Subj = subj(),
-    ?line XX = binary:copy(Subj,1000),
-    ?line XX = binref:copy(Subj,1000),
-    ?line ok = random_copy(1000),
-    ?line kill_copy_loop(1000),
-    ?line io:format("limit was: ~p~n",
-		    [erts_debug:set_internal_state(binary_loop_limit,
-						   default)]),
-    ?line erts_debug:set_internal_state(available_internal_state,false),
+    <<1,2,3>> = binary:copy(<<1,2,3>>),
+    RS = random_string({1,10000}),
+    RS = RS2 = binary:copy(RS),
+    false = erts_debug:same(RS,RS2),
+    <<>> = ?MASK_ERROR(binary:copy(<<1,2,3>>,0)),
+    badarg = ?MASK_ERROR(binary:copy(<<1,2,3:3>>,2)),
+    badarg = ?MASK_ERROR(binary:copy([],0)),
+    <<>> = ?MASK_ERROR(binary:copy(<<>>,0)),
+    badarg = ?MASK_ERROR(binary:copy(<<1,2,3>>,1.0)),
+    badarg = ?MASK_ERROR(binary:copy(<<1,2,3>>,
+				     16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)),
+    <<>> = binary:copy(<<>>,10000),
+    rand:seed(exsplus, {1271,769940,559934}),
+    ok = random_copy(3000),
+    erts_debug:set_internal_state(available_internal_state,true),
+    io:format("oldlimit: ~p~n",
+	      [erts_debug:set_internal_state(binary_loop_limit,10)]),
+    Subj = subj(),
+    XX = binary:copy(Subj,1000),
+    XX = binref:copy(Subj,1000),
+    ok = random_copy(1000),
+    kill_copy_loop(1000),
+    io:format("limit was: ~p~n",
+	      [erts_debug:set_internal_state(binary_loop_limit,
+					     default)]),
+    erts_debug:set_internal_state(available_internal_state,false),
     ok.
 
 kill_copy_loop(0) ->
     ok;
 kill_copy_loop(N) ->
     {Pid,Ref} = spawn_monitor(fun() ->
-				    ok = random_copy(1000)
+				      ok = random_copy(1000)
 			      end),
     receive
     after 10 ->
@@ -855,7 +825,7 @@ random_copy(0) ->
     ok;
 random_copy(N) ->
     Str = random_string({0,N}),
-    Num = random:uniform(N div 10+1),
+    Num = rand:uniform(N div 10+1),
     A = ?MASK_ERROR(binary:copy(Str,Num)),
     B = ?MASK_ERROR(binref:copy(Str,Num)),
     C = ?MASK_ERROR(binary:copy(make_unaligned(Str),Num)),
@@ -870,34 +840,33 @@ random_copy(N) ->
 	    exit(mismatch)
     end.
 
-bin_to_list(doc) ->
-    ["Test bin_to_list/1,2,3 bif's"];
+%% Test bin_to_list/1,2,3 BIFs.
 bin_to_list(Config) when is_list(Config) ->
     %% Just some smoke_tests first, then go nuts with random cases
-    ?line X = <<1,2,3,4,0:1000000,5>>,
-    ?line Y = make_unaligned(X),
-    ?line LX = binary:bin_to_list(X),
-    ?line LX = binary:bin_to_list(X,0,byte_size(X)),
-    ?line LX = binary:bin_to_list(X,byte_size(X),-byte_size(X)),
-    ?line LX = binary:bin_to_list(X,{0,byte_size(X)}),
-    ?line LX = binary:bin_to_list(X,{byte_size(X),-byte_size(X)}),
-    ?line LY = binary:bin_to_list(Y),
-    ?line LY = binary:bin_to_list(Y,0,byte_size(Y)),
-    ?line LY = binary:bin_to_list(Y,byte_size(Y),-byte_size(Y)),
-    ?line LY = binary:bin_to_list(Y,{0,byte_size(Y)}),
-    ?line LY = binary:bin_to_list(Y,{byte_size(Y),-byte_size(Y)}),
-    ?line 1 = hd(LX),
-    ?line 5 = lists:last(LX),
-    ?line 1 = hd(LY),
-    ?line 5 = lists:last(LY),
-    ?line X = list_to_binary(LY),
-    ?line Y = list_to_binary(LY),
-    ?line X = list_to_binary(LY),
-    ?line [5] = lists:nthtail(byte_size(X)-1,LX),
-    ?line [0,5] = lists:nthtail(byte_size(X)-2,LX),
-    ?line [0,5] = lists:nthtail(byte_size(Y)-2,LY),
-    ?line random:seed({1271,769940,559934}),
-    ?line ok = random_bin_to_list(5000),
+    X = <<1,2,3,4,0:1000000,5>>,
+    Y = make_unaligned(X),
+    LX = binary:bin_to_list(X),
+    LX = binary:bin_to_list(X,0,byte_size(X)),
+    LX = binary:bin_to_list(X,byte_size(X),-byte_size(X)),
+    LX = binary:bin_to_list(X,{0,byte_size(X)}),
+    LX = binary:bin_to_list(X,{byte_size(X),-byte_size(X)}),
+    LY = binary:bin_to_list(Y),
+    LY = binary:bin_to_list(Y,0,byte_size(Y)),
+    LY = binary:bin_to_list(Y,byte_size(Y),-byte_size(Y)),
+    LY = binary:bin_to_list(Y,{0,byte_size(Y)}),
+    LY = binary:bin_to_list(Y,{byte_size(Y),-byte_size(Y)}),
+    1 = hd(LX),
+    5 = lists:last(LX),
+    1 = hd(LY),
+    5 = lists:last(LY),
+    X = list_to_binary(LY),
+    Y = list_to_binary(LY),
+    X = list_to_binary(LY),
+    [5] = lists:nthtail(byte_size(X)-1,LX),
+    [0,5] = lists:nthtail(byte_size(X)-2,LX),
+    [0,5] = lists:nthtail(byte_size(Y)-2,LY),
+    rand:seed(exsplus, {1271,769940,559934}),
+    ok = random_bin_to_list(5000),
     ok.
 
 random_bin_to_list(0) ->
@@ -908,10 +877,10 @@ random_bin_to_list(N) ->
     Parts1 = Parts0 ++ [ {X+Y,-Y} || {X,Y} <- Parts0 ],
     [ begin
 	  try
-	  true = ?MASK_ERROR(binary:bin_to_list(Str,Z)) =:=
-	      ?MASK_ERROR(binref:bin_to_list(Str,Z)),
-	  true = ?MASK_ERROR(binary:bin_to_list(Str,Z)) =:=
-	      ?MASK_ERROR(binary:bin_to_list(make_unaligned(Str),Z))
+	      true = ?MASK_ERROR(binary:bin_to_list(Str,Z)) =:=
+		  ?MASK_ERROR(binref:bin_to_list(Str,Z)),
+	      true = ?MASK_ERROR(binary:bin_to_list(Str,Z)) =:=
+		  ?MASK_ERROR(binary:bin_to_list(make_unaligned(Str),Z))
 	  catch
 	      _:_ ->
 		  io:format("Error, Str = <<\"~s\">>.~nZ = ~p.~n",
@@ -921,10 +890,10 @@ random_bin_to_list(N) ->
       end || Z <- Parts1 ],
     [ begin
 	  try
-	  true = ?MASK_ERROR(binary:bin_to_list(Str,A,B)) =:=
-	      ?MASK_ERROR(binref:bin_to_list(Str,A,B)),
-	  true = ?MASK_ERROR(binary:bin_to_list(Str,A,B)) =:=
-	      ?MASK_ERROR(binary:bin_to_list(make_unaligned(Str),A,B))
+	      true = ?MASK_ERROR(binary:bin_to_list(Str,A,B)) =:=
+		  ?MASK_ERROR(binref:bin_to_list(Str,A,B)),
+	      true = ?MASK_ERROR(binary:bin_to_list(Str,A,B)) =:=
+		  ?MASK_ERROR(binary:bin_to_list(make_unaligned(Str),A,B))
 	  catch
 	      _:_ ->
 		  io:format("Error, Str = <<\"~s\">>.~nA = ~p.~nB = ~p.~n",
@@ -934,37 +903,36 @@ random_bin_to_list(N) ->
       end || {A,B} <- Parts1 ],
     random_bin_to_list(N-1).
 
-parts(doc) ->
-    ["Test the part/2,3 bif's"];
+%% Test the part/2,3 BIFs.
 parts(Config) when is_list(Config) ->
     %% Some simple smoke tests to begin with
-    ?line Simple = <<1,2,3,4,5,6,7,8>>,
-    ?line <<1,2>> = binary:part(Simple,0,2),
-    ?line <<1,2>> = binary:part(Simple,{0,2}),
-    ?line Simple = binary:part(Simple,0,8),
-    ?line Simple = binary:part(Simple,{0,8}),
-    ?line badarg = ?MASK_ERROR(binary:part(Simple,0,9)),
-    ?line badarg = ?MASK_ERROR(binary:part(Simple,{0,9})),
-    ?line badarg = ?MASK_ERROR(binary:part(Simple,1,8)),
-    ?line badarg = ?MASK_ERROR(binary:part(Simple,{1,8})),
-    ?line badarg = ?MASK_ERROR(binary:part(Simple,{3,-4})),
-    ?line badarg = ?MASK_ERROR(binary:part(Simple,{3.0,1})),
-    ?line badarg = ?MASK_ERROR(
-		      binary:part(Simple,{16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-					  ,1})),
-    ?line <<2,3,4,5,6,7,8>> = binary:part(Simple,{1,7}),
-    ?line <<2,3,4,5,6,7,8>> = binary:part(Simple,{8,-7}),
-    ?line Simple = binary:part(Simple,{8,-8}),
-    ?line badarg = ?MASK_ERROR(binary:part(Simple,{1,-8})),
-    ?line badarg = ?MASK_ERROR(binary:part(Simple,{8,-9})),
-    ?line badarg = ?MASK_ERROR(binary:part(Simple,{0,-1})),
-    ?line <<>> = binary:part(Simple,{8,0}),
-    ?line badarg = ?MASK_ERROR(binary:part(Simple,{9,0})),
-    ?line badarg = ?MASK_ERROR(binary:part(Simple,{-1,0})),
-    ?line badarg = ?MASK_ERROR(binary:part(Simple,{7,2})),
-    ?line <<8>> = binary:part(Simple,{7,1}),
-    ?line random:seed({1271,769940,559934}),
-    ?line random_parts(5000),
+    Simple = <<1,2,3,4,5,6,7,8>>,
+    <<1,2>> = binary:part(Simple,0,2),
+    <<1,2>> = binary:part(Simple,{0,2}),
+    Simple = binary:part(Simple,0,8),
+    Simple = binary:part(Simple,{0,8}),
+    badarg = ?MASK_ERROR(binary:part(Simple,0,9)),
+    badarg = ?MASK_ERROR(binary:part(Simple,{0,9})),
+    badarg = ?MASK_ERROR(binary:part(Simple,1,8)),
+    badarg = ?MASK_ERROR(binary:part(Simple,{1,8})),
+    badarg = ?MASK_ERROR(binary:part(Simple,{3,-4})),
+    badarg = ?MASK_ERROR(binary:part(Simple,{3.0,1})),
+    badarg = ?MASK_ERROR(
+		binary:part(Simple,{16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+				    ,1})),
+    <<2,3,4,5,6,7,8>> = binary:part(Simple,{1,7}),
+    <<2,3,4,5,6,7,8>> = binary:part(Simple,{8,-7}),
+    Simple = binary:part(Simple,{8,-8}),
+    badarg = ?MASK_ERROR(binary:part(Simple,{1,-8})),
+    badarg = ?MASK_ERROR(binary:part(Simple,{8,-9})),
+    badarg = ?MASK_ERROR(binary:part(Simple,{0,-1})),
+    <<>> = binary:part(Simple,{8,0}),
+    badarg = ?MASK_ERROR(binary:part(Simple,{9,0})),
+    badarg = ?MASK_ERROR(binary:part(Simple,{-1,0})),
+    badarg = ?MASK_ERROR(binary:part(Simple,{7,2})),
+    <<8>> = binary:part(Simple,{7,1}),
+    rand:seed(exsplus, {1271,769940,559934}),
+    random_parts(5000),
     ok.
 
 
@@ -987,15 +955,14 @@ random_parts(N) ->
 random_parts(0,_) ->
     [];
 random_parts(X,N) ->
-    Pos = random:uniform(N),
-    Len = random:uniform((Pos * 12) div 10),
+    Pos = rand:uniform(N),
+    Len = rand:uniform((Pos * 12) div 10),
     [{Pos,Len} | random_parts(X-1,N)].
 
-random_ref_comp(doc) ->
-    ["Test pseudorandomly generated cases against reference imlementation"];
+%% Test pseudorandomly generated cases against reference implementation.
 random_ref_comp(Config) when is_list(Config) ->
     put(success_counter,0),
-    random:seed({1271,769940,559934}),
+    rand:seed(exsplus, {1271,769940,559934}),
     Nr = {1,40},
     Hr = {30,1000},
     I1 = 1500,
@@ -1021,11 +988,11 @@ random_ref_comp(Config) when is_list(Config) ->
     erts_debug:set_internal_state(available_internal_state,false),
     ok.
 
-random_ref_sr_comp(doc) ->
-    ["Test pseudorandomly generated cases against reference imlementation of split and replace"];
+%% Test pseudorandomly generated cases against reference implementation
+%% of split and replace.
 random_ref_sr_comp(Config) when is_list(Config) ->
     put(success_counter,0),
-    random:seed({1271,769940,559934}),
+    rand:seed(exsplus, {1271,769940,559934}),
     Nr = {1,40},
     Hr = {30,1000},
     I1 = 1500,
@@ -1039,14 +1006,14 @@ random_ref_sr_comp(Config) when is_list(Config) ->
     io:format("Number of successes: ~p~n",[get(success_counter)]),
     ok.
 
-random_ref_fla_comp(doc) ->
-    ["Test pseudorandomly generated cases against reference imlementation of split and replace"];
+%% Test pseudorandomly generated cases against reference implementation
+%% of split and replace.
 random_ref_fla_comp(Config) when is_list(Config) ->
-    ?line put(success_counter,0),
-    ?line random:seed({1271,769940,559934}),
-    ?line do_random_first_comp(5000,{1,1000}),
-    ?line do_random_last_comp(5000,{1,1000}),
-    ?line do_random_at_comp(5000,{1,1000}),
+    put(success_counter,0),
+    rand:seed(exsplus, {1271,769940,559934}),
+    do_random_first_comp(5000,{1,1000}),
+    do_random_last_comp(5000,{1,1000}),
+    do_random_at_comp(5000,{1,1000}),
     io:format("Number of successes: ~p~n",[get(success_counter)]),
     ok.
 
@@ -1326,7 +1293,7 @@ do_random_replace_comp(N,NeedleRange,HaystackRange) ->
     true = do_replace_comp(Needle,Haystack,Repl,[]),
     true = do_replace_comp(Needle,Haystack,Repl,[global]),
     true = do_replace_comp(Needle,Haystack,Repl,
-			 [global,{insert_replaced,Insertat}]),
+			   [global,{insert_replaced,Insertat}]),
     do_random_replace_comp(N-1,NeedleRange,HaystackRange).
 do_random_replace_comp2(0,_,_) ->
     ok;
@@ -1340,7 +1307,7 @@ do_random_replace_comp2(N,NeedleRange,HaystackRange) ->
     true = do_replace_comp(Needles,Haystack,Repl,[]),
     true = do_replace_comp(Needles,Haystack,Repl,[global]),
     true = do_replace_comp(Needles,Haystack,Repl,
-			 [global,{insert_replaced,Insertat}]),
+			   [global,{insert_replaced,Insertat}]),
     do_random_replace_comp2(N-1,NeedleRange,HaystackRange).
 
 do_replace_comp(N,H,R,Opts) ->
@@ -1376,25 +1343,25 @@ one_random(N) ->
 	       $Ä,$Ö,$0,$1,$2,$3,$4,$5,$6,$7,$8,$9}).
 
 random_number({Min,Max}) -> % Min and Max are *length* of number in
-                            % decimal positions
-    X = random:uniform(Max - Min + 1) + Min - 1,
-    list_to_integer([one_random_number(random:uniform(10)) || _ <- lists:seq(1,X)]).
+						% decimal positions
+    X = rand:uniform(Max - Min + 1) + Min - 1,
+    list_to_integer([one_random_number(rand:uniform(10)) || _ <- lists:seq(1,X)]).
 
 
 random_length({Min,Max}) ->
-    random:uniform(Max - Min + 1) + Min - 1.
+    rand:uniform(Max - Min + 1) + Min - 1.
 random_string({Min,Max}) ->
-    X = random:uniform(Max - Min + 1) + Min - 1,
-    list_to_binary([one_random(random:uniform(68)) || _ <- lists:seq(1,X)]).
+    X = rand:uniform(Max - Min + 1) + Min - 1,
+    list_to_binary([one_random(rand:uniform(68)) || _ <- lists:seq(1,X)]).
 random_substring({Min,Max},Hay) ->
-    X = random:uniform(Max - Min + 1) + Min - 1,
+    X = rand:uniform(Max - Min + 1) + Min - 1,
     Y = byte_size(Hay),
     Z = if
 	    X > Y -> Y;
 	    true -> X
 	end,
     PMax = Y - Z,
-    Pos = random:uniform(PMax + 1) - 1,
+    Pos = rand:uniform(PMax + 1) - 1,
     <<_:Pos/binary,Res:Z/binary,_/binary>> = Hay,
     Res.
 
diff --git a/lib/stdlib/test/binref.erl b/lib/stdlib/test/binref.erl
index a52ea98e5a..deb1ede4df 100644
--- a/lib/stdlib/test/binref.erl
+++ b/lib/stdlib/test/binref.erl
@@ -89,7 +89,7 @@ mloop(_Haystack,_Needles,N,M) when N >= M ->
 mloop(Haystack,Needles,N,M) ->
     case mloop2(Haystack,Needles,N,nomatch) of
 	nomatch ->
-	    % Not found
+	    %% Not found
 	    <<_:8,NewStack/binary>> = Haystack,
 	    mloop(NewStack,Needles,N+1,M);
 	{N,Len} ->
@@ -104,7 +104,7 @@ msloop(_Haystack,_Needles,N,M) when N >= M ->
 msloop(Haystack,Needles,N,M) ->
     case mloop2(Haystack,Needles,N,nomatch) of
 	nomatch ->
-	    % Not found
+	    %% Not found
 	    <<_:8,NewStack/binary>> = Haystack,
 	    msloop(NewStack,Needles,N+1,M);
 	{N,Len} ->
@@ -325,7 +325,7 @@ at(Subject,X) ->
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% bin_to_list
+%% bin_to_list
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 bin_to_list(Subject) ->
     try
@@ -358,7 +358,7 @@ bin_to_list(Subject,A,B) ->
 	    erlang:error(badarg)
     end.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% list_to_bin
+%% list_to_bin
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 list_to_bin(List) ->
     try
diff --git a/lib/stdlib/test/c_SUITE.erl b/lib/stdlib/test/c_SUITE.erl
index f3a713abfd..266918581b 100644
--- a/lib/stdlib/test/c_SUITE.erl
+++ b/lib/stdlib/test/c_SUITE.erl
@@ -23,7 +23,7 @@
 -export([c_1/1, c_2/1, c_3/1, c_4/1, nc_1/1, nc_2/1, nc_3/1, nc_4/1,
 	 ls/1, memory/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -import(c, [c/2, nc/2]).
 
@@ -50,144 +50,117 @@ end_per_group(_GroupName, Config) ->
 
 %%% Write output to a directory other than current directory:
 
-c_1(doc) ->
-    ["Checks that c:c works also with option 'outdir' [ticket OTP-1209]."];
-c_1(suite) ->
-    [];
+%% OTP-1209: Check that c:c/2 works also with option 'outdir'.
 c_1(Config) when is_list(Config) ->
-    ?line R = filename:join(?config(data_dir, Config), "m.erl"),
-    ?line W = ?config(priv_dir, Config),
-    ?line Result = c(R,[{outdir,W}]),
-    ?line {ok, m} = Result.
-
-c_2(doc) ->
-    ["Checks that c:c works also with option 'outdir' [ticket OTP-1209]."];
-c_2(suite) ->
-    [];
+    R = filename:join(proplists:get_value(data_dir, Config), "m.erl"),
+    W = proplists:get_value(priv_dir, Config),
+    Result = c(R,[{outdir,W}]),
+    {ok, m} = Result.
+
+%% OTP-1209: Check that c:c/2 works also with option 'outdir'.
 c_2(Config) when is_list(Config) ->
-    ?line R = filename:join(?config(data_dir, Config), "m"),
-    ?line W = ?config(priv_dir, Config),
-    ?line Result = c(R,[{outdir,W}]),
-    ?line {ok, m} = Result.
+    R = filename:join(proplists:get_value(data_dir, Config), "m"),
+    W = proplists:get_value(priv_dir, Config),
+    Result = c(R,[{outdir,W}]),
+    {ok, m} = Result.
 
 
 %%% Put results in current directory (or rather, change current dir
 %%% to the output dir):
 
-c_3(doc) ->
-    ["Checks that c:c works also with option 'outdir' (same as current"
-     "directory). [ticket OTP-1209]."];
-c_3(suite) ->
-    [];
+%% OTP-1209: Check that c:c/2 works also with option 'outdir'
+%% (same as current directory).
 c_3(Config) when is_list(Config) ->
-    ?line R = filename:join(?config(data_dir, Config), "m.erl"),
-    ?line W = ?config(priv_dir, Config),
-    ?line file:set_cwd(W),
-    ?line Result = c(R,[{outdir,W}]),
-    ?line {ok, m} = Result.
-
-c_4(doc) ->
-    ["Checks that c:c works also with option 'outdir' (same as current"
-     "directory). [ticket OTP-1209]."];
-c_4(suite) ->
-    [];
+    R = filename:join(proplists:get_value(data_dir, Config), "m.erl"),
+    W = proplists:get_value(priv_dir, Config),
+    file:set_cwd(W),
+    Result = c(R,[{outdir,W}]),
+    {ok, m} = Result.
+
+%% OTP-1209: Check that c:c/2 works also with option 'outdir'
+%% (same as current directory).
 c_4(Config) when is_list(Config) ->
-    ?line R = filename:join(?config(data_dir, Config), "m"),
-    ?line W = ?config(priv_dir, Config),
-    ?line file:set_cwd(W),
-    ?line Result = c(R,[{outdir,W}]),
-    ?line {ok, m} = Result.
+    R = filename:join(proplists:get_value(data_dir, Config), "m"),
+    W = proplists:get_value(priv_dir, Config),
+    file:set_cwd(W),
+    Result = c(R,[{outdir,W}]),
+    {ok, m} = Result.
 
 %%% Write output to a directory other than current directory:
 
-nc_1(doc) ->
-    ["Checks that c:nc works also with option 'outdir'."];
-nc_1(suite) ->
-    [];
+%% Check that c:nc/2 works also with option 'outdir'.
 nc_1(Config) when is_list(Config) ->
-    ?line R = filename:join(?config(data_dir, Config), "m.erl"),
-    ?line W = ?config(priv_dir, Config),
-    ?line Result = nc(R,[{outdir,W}]),
-    ?line {ok, m} = Result.
-
-nc_2(doc) ->
-    ["Checks that c:nc works also with option 'outdir'."];
-nc_2(suite) ->
-    [];
+    R = filename:join(proplists:get_value(data_dir, Config), "m.erl"),
+    W = proplists:get_value(priv_dir, Config),
+    Result = nc(R,[{outdir,W}]),
+    {ok, m} = Result.
+
+%% Check that c:nc/2 works also with option 'outdir'.
 nc_2(Config) when is_list(Config) ->
-    ?line R = filename:join(?config(data_dir, Config), "m"),
-    ?line W = ?config(priv_dir, Config),
-    ?line Result = nc(R,[{outdir,W}]),
-    ?line {ok, m} = Result.
+    R = filename:join(proplists:get_value(data_dir, Config), "m"),
+    W = proplists:get_value(priv_dir, Config),
+    Result = nc(R,[{outdir,W}]),
+    {ok, m} = Result.
 
 
 %%% Put results in current directory (or rather, change current dir
 %%% to the output dir):
 
-nc_3(doc) ->
-    ["Checks that c:nc works also with option 'outdir' (same as current"
-     "directory)."];
-nc_3(suite) ->
-    [];
+%% Check that c:nc/2 works also with option 'outdir'
+%% (same as current directory).
 nc_3(Config) when is_list(Config) ->
-    ?line R = filename:join(?config(data_dir, Config), "m.erl"),
-    ?line W = ?config(priv_dir, Config),
-    ?line file:set_cwd(W),
-    ?line Result = nc(R,[{outdir,W}]),
-    ?line {ok, m} = Result.
-
-nc_4(doc) ->
-    ["Checks that c:nc works also with option 'outdir' (same as current"
-     "directory)."];
-nc_4(suite) ->
-    [];
+    R = filename:join(proplists:get_value(data_dir, Config), "m.erl"),
+    W = proplists:get_value(priv_dir, Config),
+    file:set_cwd(W),
+    Result = nc(R,[{outdir,W}]),
+    {ok, m} = Result.
+
+%% Check that c:nc/2 works also with option 'outdir'
+%% (same as current directory).
 nc_4(Config) when is_list(Config) ->
-    ?line R = filename:join(?config(data_dir, Config), "m"),
-    ?line W = ?config(priv_dir, Config),
-    ?line file:set_cwd(W),
-    ?line Result = nc(R,[{outdir,W}]),
-    ?line {ok, m} = Result.
+    R = filename:join(proplists:get_value(data_dir, Config), "m"),
+    W = proplists:get_value(priv_dir, Config),
+    file:set_cwd(W),
+    Result = nc(R,[{outdir,W}]),
+    {ok, m} = Result.
 
 ls(Config) when is_list(Config) ->
-    Directory = ?config(data_dir, Config),
+    Directory = proplists:get_value(data_dir, Config),
     ok = c:ls(Directory),
     File = filename:join(Directory, "m.erl"),
     ok = c:ls(File),
     ok = c:ls("no_such_file").
 
-memory(doc) ->
-    ["Checks that c:memory/[0,1] returns consistent results."];
-memory(suite) ->
-    [];
+%% Check that c:memory/[0,1] returns consistent results.
 memory(Config) when is_list(Config) ->
     try
-	?line ML = c:memory(),
-	?line T =  mget(total, ML),
-	?line P =  mget(processes, ML),
-	?line S =  mget(system, ML),
-	?line A =  mget(atom, ML),
-	?line AU = mget(atom_used, ML),
-	?line B =  mget(binary, ML),
-	?line C =  mget(code, ML),
-	?line E =  mget(ets, ML),
-	?line T = P + S,
-	?line if S >= A + B + C + E -> ok end,
-	?line if A >= AU -> ok end,
-	?line ok
+	ML = c:memory(),
+	T =  mget(total, ML),
+	P =  mget(processes, ML),
+	S =  mget(system, ML),
+	A =  mget(atom, ML),
+	AU = mget(atom_used, ML),
+	B =  mget(binary, ML),
+	C =  mget(code, ML),
+	E =  mget(ets, ML),
+	T = P + S,
+	if S >= A + B + C + E -> ok end,
+	if A >= AU -> ok end,
+	ok
     catch
 	error:notsup ->
-	    ?line {skipped,
-		   "erlang:memory/[0,1] and c:memory/[0,1] not supported"}
+	    {skipped,
+	     "erlang:memory/[0,1] and c:memory/[0,1] not supported"}
     end.
 
-% Help function for c_SUITE:memory/1    
+%% Help function for c_SUITE:memory/1
 mget(K, L) ->
-    ?line {value,{K,V}} = lists:keysearch(K, 1, L),
-    ?line test_v(c:memory(K)), % Check that c:memory/1 also accept this
-                               % argument and returns an integer (usally
-                               % *not* the same as V).
-    ?line test_v(V).
+    {value,{K,V}} = lists:keysearch(K, 1, L),
+    test_v(c:memory(K)), % Check that c:memory/1 also accept this
+						% argument and returns an integer (usally
+						% *not* the same as V).
+    test_v(V).
 
-% Help function for c_SUITE:memory/1    
+%% Help function for c_SUITE:memory/1
 test_v(V) when is_integer(V) ->
-    ?line V.
+    V.
diff --git a/lib/stdlib/test/calendar_SUITE.erl b/lib/stdlib/test/calendar_SUITE.erl
index 498b1f459c..7372288492 100644
--- a/lib/stdlib/test/calendar_SUITE.erl
+++ b/lib/stdlib/test/calendar_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(calendar_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, 
@@ -57,69 +57,48 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-gregorian_days(doc) ->
-    "Tests that date_to_gregorian_days and gregorian_days_to_date "
-    "are each others inverses from ?START_YEAR-01-01 up to ?END_YEAR-01-01. "
-    "At the same time valid_date is tested.";
-gregorian_days(suite) ->
-    [];
+%% Tests that date_to_gregorian_days and gregorian_days_to_date
+%% are each others inverses from ?START_YEAR-01-01 up to ?END_YEAR-01-01.
+%% At the same time valid_date is tested.
 gregorian_days(Config) when is_list(Config) ->
-    ?line Days = calendar:date_to_gregorian_days({?START_YEAR, 1, 1}),
-    ?line MaxDays = calendar:date_to_gregorian_days({?END_YEAR, 1, 1}),
-    ?line check_gregorian_days(Days, MaxDays).
-
-gregorian_seconds(doc) ->
-    "Tests that datetime_to_gregorian_seconds and "
-    "gregorian_seconds_to_date are each others inverses for a sampled "
-    "number of seconds from ?START_YEAR-01-01 up to ?END_YEAR-01-01: We check "
-    "every 2 days + 1 second.";
-gregorian_seconds(suite) ->
-    [];
+    Days = calendar:date_to_gregorian_days({?START_YEAR, 1, 1}),
+    MaxDays = calendar:date_to_gregorian_days({?END_YEAR, 1, 1}),
+    check_gregorian_days(Days, MaxDays).
+
+%% Tests that datetime_to_gregorian_seconds and
+%% gregorian_seconds_to_date are each others inverses for a sampled
+%% number of seconds from ?START_YEAR-01-01 up to ?END_YEAR-01-01: We check
+%% every 2 days + 1 second.
 gregorian_seconds(Config) when is_list(Config) ->
-    ?line Secs = calendar:datetime_to_gregorian_seconds({{?START_YEAR, 1, 1},
-							 {0, 0, 0}}),
-    ?line MaxSecs = calendar:datetime_to_gregorian_seconds({{?END_YEAR, 1, 1},
-							    {0, 0, 0}}),
-    ?line check_gregorian_seconds(Secs, MaxSecs).
-
-day_of_the_week(doc) ->
-    "Tests that day_of_the_week reports correctly the day of the week from "
-    "year ?START_YEAR up to ?END_YEAR.";
-day_of_the_week(suite) ->
-    [];
+    Secs = calendar:datetime_to_gregorian_seconds({{?START_YEAR, 1, 1},
+						   {0, 0, 0}}),
+    MaxSecs = calendar:datetime_to_gregorian_seconds({{?END_YEAR, 1, 1},
+						      {0, 0, 0}}),
+    check_gregorian_seconds(Secs, MaxSecs).
+
+%% Tests that day_of_the_week reports correctly the day of the week from
+%% year ?START_YEAR up to ?END_YEAR.
 day_of_the_week(Config) when is_list(Config) ->
-    ?line Days = calendar:date_to_gregorian_days({?START_YEAR, 1, 1}),
-    ?line MaxDays = calendar:date_to_gregorian_days({?END_YEAR, 1, 1}),
-    ?line DayNumber = calendar:day_of_the_week({?START_YEAR, 1, 1}),
-    ?line check_day_of_the_week(Days, MaxDays, DayNumber).
+    Days = calendar:date_to_gregorian_days({?START_YEAR, 1, 1}),
+    MaxDays = calendar:date_to_gregorian_days({?END_YEAR, 1, 1}),
+    DayNumber = calendar:day_of_the_week({?START_YEAR, 1, 1}),
+    check_day_of_the_week(Days, MaxDays, DayNumber).
 
-day_of_the_week_calibrate(doc) ->
-    "Tests that day_of_the_week for 1997-11-11 is Tuesday (2)";
-day_of_the_week_calibrate(suite) ->
-    [];
+%% Tests that day_of_the_week for 1997-11-11 is Tuesday (2).
 day_of_the_week_calibrate(Config) when is_list(Config) ->
-    ?line 2 = calendar:day_of_the_week({1997, 11, 11}).
+    2 = calendar:day_of_the_week({1997, 11, 11}).
 
-leap_years(doc) ->
-    "Tests that is_leap_year reports correctly the leap years from "
-    "year ?START_YEAR up to ?END_YEAR.";
-leap_years(suite) ->
-    [];
+%% Tests that is_leap_year reports correctly the leap years from
+%% year ?START_YEAR up to ?END_YEAR.
 leap_years(Config) when is_list(Config) ->
-    ?line check_leap_years(?START_YEAR, ?END_YEAR).
+    check_leap_years(?START_YEAR, ?END_YEAR).
 
-last_day_of_the_month(doc) ->
-    "Tests that last_day_of_the_month reports correctly from "
-    "year ?START_YEAR up to ?END_YEAR.";
-last_day_of_the_month(suite) ->
-    [];
+%% Tests that last_day_of_the_month reports correctly from
+%% year ?START_YEAR up to ?END_YEAR.
 last_day_of_the_month(Config) when is_list(Config) ->
-    ?line check_last_day_of_the_month({?START_YEAR, 1}, {?END_YEAR, 1}).
+    check_last_day_of_the_month({?START_YEAR, 1}, {?END_YEAR, 1}).
 
-local_time_to_universal_time_dst(doc) ->
-    "Tests local_time_to_universal_time_dst for MET";
-local_time_to_universal_time_dst(suite) ->
-    [];
+%% Tests local_time_to_universal_time_dst for MET.
 local_time_to_universal_time_dst(Config) when is_list(Config) ->
     case os:type() of
 	{unix,_} ->
@@ -134,35 +113,35 @@ local_time_to_universal_time_dst(Config) when is_list(Config) ->
     end.
 local_time_to_universal_time_dst_x(Config) when is_list(Config) ->
     %% Assumes MET (UTC+1 / UTC+2(dst)
-    ?line LtW   = {{2003,01,15},{14,00,00}}, % Winter
-    ?line UtW   = {{2003,01,15},{13,00,00}}, % 
-    ?line UtWd  = {{2003,01,15},{12,00,00}}, % dst
-    ?line LtS   = {{2003,07,15},{14,00,00}}, % Summer
-    ?line UtS   = {{2003,07,15},{13,00,00}}, % 
-    ?line UtSd  = {{2003,07,15},{12,00,00}}, % dst
-    ?line LtWS  = {{2003,03,30},{02,30,00}}, % Winter->Summer
-    ?line UtWS  = {{2003,03,30},{01,30,00}}, % 
-    ?line UtWSd = {{2003,03,30},{00,30,00}}, % dst
-    ?line LtSW  = {{2003,10,26},{02,30,00}}, % Summer->Winter
-    ?line UtSW  = {{2003,10,26},{01,30,00}}, % 
-    ?line UtSWd = {{2003,10,26},{00,30,00}}, % dst
+    LtW   = {{2003,01,15},{14,00,00}}, % Winter
+    UtW   = {{2003,01,15},{13,00,00}}, %
+    UtWd  = {{2003,01,15},{12,00,00}}, % dst
+    LtS   = {{2003,07,15},{14,00,00}}, % Summer
+    UtS   = {{2003,07,15},{13,00,00}}, %
+    UtSd  = {{2003,07,15},{12,00,00}}, % dst
+    LtWS  = {{2003,03,30},{02,30,00}}, % Winter->Summer
+    UtWS  = {{2003,03,30},{01,30,00}}, %
+    UtWSd = {{2003,03,30},{00,30,00}}, % dst
+    LtSW  = {{2003,10,26},{02,30,00}}, % Summer->Winter
+    UtSW  = {{2003,10,26},{01,30,00}}, %
+    UtSWd = {{2003,10,26},{00,30,00}}, % dst
     %%
-    ?line UtW   = calendar:local_time_to_universal_time(LtW, false),
-    ?line UtWd  = calendar:local_time_to_universal_time(LtW, true),
-    ?line UtW   = calendar:local_time_to_universal_time(LtW, undefined),
+    UtW   = calendar:local_time_to_universal_time(LtW, false),
+    UtWd  = calendar:local_time_to_universal_time(LtW, true),
+    UtW   = calendar:local_time_to_universal_time(LtW, undefined),
     %%
-    ?line UtS   = calendar:local_time_to_universal_time(LtS, false),
-    ?line UtSd  = calendar:local_time_to_universal_time(LtS, true),
-    ?line UtSd  = calendar:local_time_to_universal_time(LtS, undefined),
+    UtS   = calendar:local_time_to_universal_time(LtS, false),
+    UtSd  = calendar:local_time_to_universal_time(LtS, true),
+    UtSd  = calendar:local_time_to_universal_time(LtS, undefined),
     %%
     case calendar:local_time_to_universal_time(LtWS, false) of
 	UtWS ->
-	    ?line UtWSd = calendar:local_time_to_universal_time(LtWS, true),
-	    ?line []    = calendar:local_time_to_universal_time_dst(LtWS),
+	    UtWSd = calendar:local_time_to_universal_time(LtWS, true),
+	    []    = calendar:local_time_to_universal_time_dst(LtWS),
 	    %%
-	    ?line UtSW  = calendar:local_time_to_universal_time(LtSW, false),
-	    ?line UtSWd = calendar:local_time_to_universal_time(LtSW, true),
-	    ?line [UtSWd, UtSW] = calendar:local_time_to_universal_time_dst(LtSW),
+	    UtSW  = calendar:local_time_to_universal_time(LtSW, false),
+	    UtSWd = calendar:local_time_to_universal_time(LtSW, true),
+	    [UtSWd, UtSW] = calendar:local_time_to_universal_time_dst(LtSW),
 	    ok;
 	{{1969,12,31},{23,59,59}} ->
 	    %% It seems that Apple has no intention of fixing this bug in
@@ -171,15 +150,12 @@ local_time_to_universal_time_dst_x(Config) when is_list(Config) ->
 	    {comment,"Bug in mktime() in this OS"}
     end.
 
-iso_week_number(doc) ->
-	"Test the iso week number calculation for all three possibilities."
-	" When the date falls on the last week of the previous year,"
-	" when the date falls on a week within the given year and finally,"
-	" when the date falls on the first week of the next year.";
-iso_week_number(suite) ->
-	[];
+%% Test the iso week number calculation for all three possibilities:
+%%  When the date falls on the last week of the previous year,
+%%  when the date falls on a week within the given year and finally,
+%%  when the date falls on the first week of the next year.
 iso_week_number(Config) when is_list(Config) ->
-	?line check_iso_week_number().
+    check_iso_week_number().
 
 %%
 %% LOCAL FUNCTIONS
@@ -188,10 +164,10 @@ iso_week_number(Config) when is_list(Config) ->
 %% check_gregorian_days
 %% 
 check_gregorian_days(Days, MaxDays) when Days < MaxDays ->
-    ?line Date = calendar:gregorian_days_to_date(Days), 
-    ?line true = calendar:valid_date(Date),
-    ?line Days = calendar:date_to_gregorian_days(Date),
-    ?line check_gregorian_days(Days + 1, MaxDays);
+    Date = calendar:gregorian_days_to_date(Days),
+    true = calendar:valid_date(Date),
+    Days = calendar:date_to_gregorian_days(Date),
+    check_gregorian_days(Days + 1, MaxDays);
 check_gregorian_days(_Days, _MaxDays) ->
     ok.
 
@@ -200,9 +176,9 @@ check_gregorian_days(_Days, _MaxDays) ->
 %% We increment with something prime (172801 = 2 days + 1 second).
 %%
 check_gregorian_seconds(Secs, MaxSecs) when Secs < MaxSecs ->
-    ?line DateTime = calendar:gregorian_seconds_to_datetime(Secs), 
-    ?line Secs = calendar:datetime_to_gregorian_seconds(DateTime),
-    ?line check_gregorian_seconds(Secs + 172801, MaxSecs);
+    DateTime = calendar:gregorian_seconds_to_datetime(Secs),
+    Secs = calendar:datetime_to_gregorian_seconds(DateTime),
+    check_gregorian_seconds(Secs + 172801, MaxSecs);
 check_gregorian_seconds(_Secs, _MaxSecs) ->
     ok.
 
@@ -210,10 +186,10 @@ check_gregorian_seconds(_Secs, _MaxSecs) ->
 %% check_day_of_the_week
 %%
 check_day_of_the_week(Days, MaxDays, DayNumber) when Days < MaxDays ->
-    ?line Date = calendar:gregorian_days_to_date(Days),
-    ?line DayNumber = calendar:day_of_the_week(Date),
-    ?line check_day_of_the_week(Days + 1, MaxDays, 
-				((DayNumber rem 7) + 1));
+    Date = calendar:gregorian_days_to_date(Days),
+    DayNumber = calendar:day_of_the_week(Date),
+    check_day_of_the_week(Days + 1, MaxDays,
+			  ((DayNumber rem 7) + 1));
 check_day_of_the_week(_Days, _MaxDays, _DayNumber) ->
     ok.
 
@@ -222,59 +198,56 @@ check_day_of_the_week(_Days, _MaxDays, _DayNumber) ->
 %% SYr must be larger than 1800, and EYr must be less than ?END_YEAR.
 %%
 check_leap_years(SYr, EYr) when SYr < EYr ->
-    ?line Rem = SYr rem 4,
+    Rem = SYr rem 4,
     case Rem of
 	0 ->
 	    case SYr of
 		1900 ->
-		    ?line false = calendar:is_leap_year(SYr);
+		    false = calendar:is_leap_year(SYr);
 		2000 ->
-		    ?line true = calendar:is_leap_year(SYr);
+		    true = calendar:is_leap_year(SYr);
 		_  ->
-		    ?line true = calendar:is_leap_year(SYr)
+		    true = calendar:is_leap_year(SYr)
 	    end;
 	_ ->
-	    ?line false = calendar:is_leap_year(SYr)
+	    false = calendar:is_leap_year(SYr)
     end,
     check_leap_years(SYr + 1, EYr);
 check_leap_years(_SYr, _EYr) ->
     ok.
 
 check_last_day_of_the_month({SYr, SMon}, {EYr, EMon}) when SYr < EYr ->
-    ?line LastDay = calendar:last_day_of_the_month(SYr, SMon),
-    ?line LastDay = case SMon of
-			 1 -> 31;
-			 2 ->
-			     case calendar:is_leap_year(SYr) of
-				 true -> 29;
-				 false  -> 28
-			     end;
-			 3 -> 31;
-			 4 -> 30;
-			 5 -> 31;
-			 6 -> 30;
-			 7 -> 31;
-			 8 -> 31;
-			 9 -> 30;
-			 10 -> 31;
-			 11 -> 30;
-			 12 -> 31
-		     end,
-    ?line NYr = case SMon of
-		    12 -> SYr + 1;
-		    _ -> SYr
-		end,
-    ?line check_last_day_of_the_month({NYr, (SMon rem 12) + 1}, 
-				      {EYr, EMon});
+    LastDay = calendar:last_day_of_the_month(SYr, SMon),
+    LastDay = case SMon of
+		  1 -> 31;
+		  2 ->
+		      case calendar:is_leap_year(SYr) of
+			  true -> 29;
+			  false  -> 28
+		      end;
+		  3 -> 31;
+		  4 -> 30;
+		  5 -> 31;
+		  6 -> 30;
+		  7 -> 31;
+		  8 -> 31;
+		  9 -> 30;
+		  10 -> 31;
+		  11 -> 30;
+		  12 -> 31
+	      end,
+    NYr = case SMon of
+	      12 -> SYr + 1;
+	      _ -> SYr
+	  end,
+    check_last_day_of_the_month({NYr, (SMon rem 12) + 1},
+				{EYr, EMon});
 check_last_day_of_the_month(_, _) ->
     ok.
 
 %% check_iso_week_number
 %%
 check_iso_week_number() ->
-    ?line {2004, 53} = calendar:iso_week_number({2005, 1, 1}),
-    ?line {2007, 1} = calendar:iso_week_number({2007, 1, 1}),
-    ?line {2009, 1} = calendar:iso_week_number({2008, 12, 29}).
-    
-
-
+    {2004, 53} = calendar:iso_week_number({2005, 1, 1}),
+    {2007, 1} = calendar:iso_week_number({2007, 1, 1}),
+    {2009, 1} = calendar:iso_week_number({2008, 12, 29}).
diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index 7f5e06524a..8948f496c4 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -19,7 +19,7 @@
 %%
 -module(dets_SUITE).
 
-%-define(debug, true).
+%%-define(debug, true).
 
 -ifdef(debug).
 -define(format(S, A), io:format(S, A)).
@@ -28,10 +28,10 @@
 -define(privdir(_), "./dets_SUITE_priv").
 -define(datadir(_), "./dets_SUITE_data").
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(format(S, A), ok).
--define(privdir(Conf), ?config(priv_dir, Conf)).
--define(datadir(Conf), ?config(data_dir, Conf)).
+-define(privdir(Conf), proplists:get_value(priv_dir, Conf)).
+-define(datadir(Conf), proplists:get_value(data_dir, Conf)).
 -endif.
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -53,7 +53,8 @@
          simultaneous_open/1, insert_new/1, repair_continuation/1,
          otp_5487/1, otp_6206/1, otp_6359/1, otp_4738/1, otp_7146/1,
          otp_8070/1, otp_8856/1, otp_8898/1, otp_8899/1, otp_8903/1,
-         otp_8923/1, otp_9282/1, otp_11245/1, otp_11709/1]).
+         otp_8923/1, otp_9282/1, otp_11245/1, otp_11709/1, otp_13229/1,
+         otp_13260/1]).
 
 -export([dets_dirty_loop/0]).
 
@@ -82,15 +83,14 @@
 -define(CLOSED_PROPERLY,1).
 
 init_per_testcase(_Case, Config) ->
-    Dog=?t:timetrap(?t:minutes(15)),
-    [{watchdog, Dog}|Config].
+    Config.
 
 end_per_testcase(_Case, _Config) ->
-    Dog=?config(watchdog, _Config),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,15}}].
 
 all() -> 
     [
@@ -110,7 +110,8 @@ all() ->
 	many_clients, otp_4906, otp_5402, simultaneous_open,
 	insert_new, repair_continuation, otp_5487, otp_6206,
 	otp_6359, otp_4738, otp_7146, otp_8070, otp_8856, otp_8898,
-	otp_8899, otp_8903, otp_8923, otp_9282, otp_11245, otp_11709
+	otp_8899, otp_8903, otp_8923, otp_9282, otp_11245, otp_11709,
+        otp_13229, otp_13260
     ].
 
 groups() -> 
@@ -128,10 +129,7 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-newly_started(doc) ->
-    ["OTP-3621"];
-newly_started(suite) -> 
-    [];
+%% OTP-3621
 newly_started(Config) when is_list(Config) ->
     true = is_alive(),
     {ok, Node} = test_server:start_node(slave1, slave, []),
@@ -139,17 +137,11 @@ newly_started(Config) when is_list(Config) ->
     test_server:stop_node(Node),
     ok.
 
-basic_v8(doc) ->
-    ["Basic test case."];
-basic_v8(suite) -> 
-    [];
+%% Basic test case.
 basic_v8(Config) when is_list(Config) ->
     basic(Config, 8).
 
-basic_v9(doc) ->
-    ["Basic test case."];
-basic_v9(suite) -> 
-    [];
+%% Basic test case.
 basic_v9(Config) when is_list(Config) ->
     basic(Config, 9).
 
@@ -182,17 +174,9 @@ basic(Config, Version) ->
     ok.
     
 
-open_v8(doc) ->
-    [];
-open_v8(suite) -> 
-    [];
 open_v8(Config) when is_list(Config) ->
     open(Config, 8).
 
-open_v9(doc) ->
-    [];
-open_v9(suite) -> 
-    [];
 open_v9(Config) when is_list(Config) ->
     open(Config, 9).
 
@@ -281,17 +265,11 @@ bad(_Tab, _Item) ->
     ?format("Can't find item ~p in ~p ~n", [_Item, _Tab]),
     exit(badtab).
 
-sets_v8(doc) ->
-    ["Performs traversal and match testing on set type dets tables."];
-sets_v8(suite) ->
-    [];
+%% Perform traversal and match testing on set type dets tables.
 sets_v8(Config) when is_list(Config) ->
     sets(Config, 8).
 
-sets_v9(doc) ->
-    ["Performs traversal and match testing on set type dets tables."];
-sets_v9(suite) ->
-    [];
+%% Perform traversal and match testing on set type dets tables.
 sets_v9(Config) when is_list(Config) ->
     sets(Config, 9).
 
@@ -323,17 +301,11 @@ sets(Config, Version) ->
     check_pps(P0),
     ok.
 
-bags_v8(doc) ->
-    ["Performs traversal and match testing on bag type dets tables."];
-bags_v8(suite) ->
-    [];
+%% Perform traversal and match testing on bag type dets tables.
 bags_v8(Config) when is_list(Config) ->
     bags(Config, 8).
 
-bags_v9(doc) ->
-    ["Performs traversal and match testing on bag type dets tables."];
-bags_v9(suite) ->
-    [];
+%% Perform traversal and match testing on bag type dets tables.
 bags_v9(Config) when is_list(Config) ->
     bags(Config, 9).
 
@@ -363,17 +335,11 @@ bags(Config, Version) ->
     ok.
 
 
-duplicate_bags_v8(doc) ->
-   ["Performs traversal and match testing on duplicate_bag type dets tables."];
-duplicate_bags_v8(suite) ->
-    [];
+%% Perform traversal and match testing on duplicate_bag type dets tables.
 duplicate_bags_v8(Config) when is_list(Config) ->
     duplicate_bags(Config, 8).
 
-duplicate_bags_v9(doc) ->
-   ["Performs traversal and match testing on duplicate_bag type dets tables."];
-duplicate_bags_v9(suite) ->
-    [];
+%% Perform traversal and match testing on duplicate_bag type dets tables.
 duplicate_bags_v9(Config) when is_list(Config) ->
     duplicate_bags(Config, 9).
 
@@ -403,17 +369,9 @@ duplicate_bags(Config, Version) when is_list(Config) ->
     ok.
 
 
-access_v8(doc) ->
-    [];
-access_v8(suite) ->
-    [];
 access_v8(Config) when is_list(Config) ->
     access(Config, 8).
 
-access_v9(doc) ->
-    [];
-access_v9(suite) ->
-    [];
 access_v9(Config) when is_list(Config) ->
     access(Config, 9).
 
@@ -446,10 +404,7 @@ access(Config, Version) ->
     ok.
 
 
-dirty_mark(doc) ->
-    ["Test that the table is not marked dirty if not written"];
-dirty_mark(suite) ->
-    [];
+%% Test that the table is not marked dirty if not written.
 dirty_mark(Config) when is_list(Config) ->
     true = is_alive(),
     Tab = dets_dirty_mark_test,
@@ -498,10 +453,7 @@ dirty_mark(Config) when is_list(Config) ->
     check_pps(P0),
     ok.
 
-dirty_mark2(doc) ->
-    ["Test that the table is flushed when auto_save is in effect"];
-dirty_mark2(suite) ->
-    [];
+%% Test that the table is flushed when auto_save is in effect.
 dirty_mark2(Config) when is_list(Config) ->
     true = is_alive(),
     Tab = dets_dirty_mark2_test,
@@ -569,17 +521,11 @@ dets_dirty_loop() ->
     end.
 
 
-bag_next_v8(suite) ->
-    [];
-bag_next_v8(doc) ->
-    ["Check that bags and next work as expected."];
+%% Check that bags and next work as expected.
 bag_next_v8(Config) when is_list(Config) ->
     bag_next(Config, 8).
 
-bag_next_v9(suite) ->
-    [];
-bag_next_v9(doc) ->
-    ["Check that bags and next work as expected."];
+%% Check that bags and next work as expected.
 bag_next_v9(Config) when is_list(Config) ->
     Tab = dets_bag_next_test,
     FName = filename(Tab, Config),
@@ -632,17 +578,9 @@ bag_next(Config, Version) ->
     check_pps(P0),
     ok.
 
-oldbugs_v8(doc) ->
-    [];
-oldbugs_v8(suite) ->
-    [];
 oldbugs_v8(Config) when is_list(Config) ->
     oldbugs(Config, 8).
 
-oldbugs_v9(doc) ->
-    [];
-oldbugs_v9(suite) ->
-    [];
 oldbugs_v9(Config) when is_list(Config) ->
     oldbugs(Config, 9).
 
@@ -660,9 +598,7 @@ oldbugs(Config, Version) ->
     check_pps(P0),
     ok.
 
-unsafe_assumptions(suite) -> [];
-unsafe_assumptions(doc) ->
-    "Tests that shrinking an object and then expanding it works.";
+%% Test that shrinking an object and then expanding it works.
 unsafe_assumptions(Config) when is_list(Config) ->
     FName = filename(dets_suite_unsafe_assumptions_test, Config),
     file:delete(FName),
@@ -691,17 +627,13 @@ unsafe_assumptions(Config) when is_list(Config) ->
     check_pps(P0),
     ok.
 
-truncated_segment_array_v8(suite) -> [];
-truncated_segment_array_v8(doc) ->
-    "Tests that a file where the segment array has been truncated "
-    "is possible to repair.";
+%% Test that a file where the segment array has been truncated
+%% is possible to repair.
 truncated_segment_array_v8(Config) when is_list(Config) ->
     trunc_seg_array(Config, 8).
 
-truncated_segment_array_v9(suite) -> [];
-truncated_segment_array_v9(doc) ->
-    "Tests that a file where the segment array has been truncated "
-    "is possible to repair.";
+%% Test that a file where the segment array has been truncated
+%% is possible to repair.
 truncated_segment_array_v9(Config) when is_list(Config) ->
     trunc_seg_array(Config, 9).
 
@@ -727,17 +659,11 @@ trunc_seg_array(Config, V) ->
     check_pps(P0),
     ok.
 
-open_file_v8(doc) ->
-    ["open_file/1 test case."];
-open_file_v8(suite) -> 
-    [];
+%% Test open_file/1.
 open_file_v8(Config) when is_list(Config) ->
     open_1(Config, 8).
 
-open_file_v9(doc) ->
-    ["open_file/1 test case."];
-open_file_v9(suite) -> 
-    [];
+%% Test open_file/1.
 open_file_v9(Config) when is_list(Config) ->
     T = open_v9,
     Fname = filename(T, Config),
@@ -795,17 +721,11 @@ open_1(Config, V) ->
     check_pps(P0),
     ok.
 
-init_table_v8(doc) ->
-    ["initialize_table/2 and from_ets/2 test case."];
-init_table_v8(suite) -> 
-    [];
+%% Test initialize_table/2 and from_ets/2.
 init_table_v8(Config) when is_list(Config) ->
     init_table(Config, 8).
 
-init_table_v9(doc) ->
-    ["initialize_table/2 and from_ets/2 test case."];
-init_table_v9(suite) -> 
-    [];
+%% Test initialize_table/2 and from_ets/2.
 init_table_v9(Config) when is_list(Config) ->
     %% Objects are returned in "time order".
     T = init_table_v9,
@@ -1268,17 +1188,11 @@ items(I, N, C, L) when I =:= N; C =:= 0 ->
 items(I, N, C, L) ->
     items(I+1, N, C-1, [{I, item(I)} | L]).
 
-repair_v8(doc) ->
-    ["open_file and repair."];
-repair_v8(suite) -> 
-    [];
+%% Test open_file and repair.
 repair_v8(Config) when is_list(Config) ->
     repair(Config, 8).
 
-repair_v9(doc) ->
-    ["open_file and repair."];
-repair_v9(suite) -> 
-    [];
+%% Test open_file and repair.
 repair_v9(Config) when is_list(Config) ->
     %% Convert from format 9 to format 8.
     T = convert_98,
@@ -1615,11 +1529,9 @@ repair(Config, V) ->
     check_pps(P0),
     ok.
 
-hash_v8b_v8c(doc) ->
-    ["Test the use of different hashing algorithms in v8b and v8c of the "
-     "Dets file format."];
-hash_v8b_v8c(suite) ->
-    [];
+
+%% Test the use of different hashing algorithms in v8b and v8c of the
+%% Dets file format.
 hash_v8b_v8c(Config) when is_list(Config) ->
     Source =
 	filename:join(?datadir(Config), "dets_test_v8b.dets"),
@@ -1694,10 +1606,7 @@ hash_v8b_v8c(Config) when is_list(Config) ->
     check_pps(P0),
     {comment, Mess}.
 
-phash(doc) ->
-    ["Test version 9(b) with erlang:phash/2 as hash function."];
-phash(suite) ->
-    [];
+%% Test version 9(b) with erlang:phash/2 as hash function.
 phash(Config) when is_list(Config) ->
     T = phash,
     Phash_v9bS = filename:join(?datadir(Config), "version_9b_phash.dat"),
@@ -1755,17 +1664,11 @@ phash(Config) when is_list(Config) ->
     file:delete(Fname),
     ok.
 
-fold_v8(doc) ->
-    ["foldl, foldr, to_ets"];
-fold_v8(suite) ->
-    [];
+%% Test foldl, foldr, to_ets.
 fold_v8(Config) when is_list(Config) ->
     fold(Config, 8).
 
-fold_v9(doc) ->
-    ["foldl, foldr, to_ets"];
-fold_v9(suite) ->
-    [];
+%% Test foldl, foldr, to_ets.
 fold_v9(Config) when is_list(Config) ->
     fold(Config, 9).
 
@@ -1834,17 +1737,11 @@ fold(Config, Version) ->
     check_pps(P0),
     ok.
 
-fixtable_v8(doc) ->
-    ["Add objects to a fixed table."];
-fixtable_v8(suite) ->
-    [];
+%% Add objects to a fixed table.
 fixtable_v8(Config) when is_list(Config) ->
     fixtable(Config, 8).
 
-fixtable_v9(doc) ->
-    ["Add objects to a fixed table."];
-fixtable_v9(suite) ->
-    [];
+%% Add objects to a fixed table.
 fixtable_v9(Config) when is_list(Config) ->
     fixtable(Config, 9).
 
@@ -1876,9 +1773,33 @@ fixtable(Config, Version) when is_list(Config) ->
     {ok, _} = dets:open_file(T, [{type, duplicate_bag} | Args]),
     %% In a fixed table, delete and re-insert an object.
     ok = dets:insert(T, {1, a, b}),
+    SysBefore = erlang:timestamp(),
+    MonBefore = erlang:monotonic_time(),
     dets:safe_fixtable(T, true),
+    MonAfter = erlang:monotonic_time(),
+    SysAfter = erlang:timestamp(),
+    Self = self(),
+    {FixMonTime,[{Self,1}]} = dets:info(T,safe_fixed_monotonic_time),
+    {FixSysTime,[{Self,1}]} = dets:info(T,safe_fixed),
+    true = is_integer(FixMonTime),
+    true = MonBefore =< FixMonTime,
+    true = FixMonTime =< MonAfter,
+    {FstMs,FstS,FstUs} = FixSysTime,
+    true = is_integer(FstMs),
+    true = is_integer(FstS),
+    true = is_integer(FstUs),
+    case erlang:system_info(time_warp_mode) of
+	no_time_warp ->
+	    true = timer:now_diff(FixSysTime, SysBefore) >= 0,
+	    true = timer:now_diff(SysAfter, FixSysTime) >= 0;
+	_ ->
+	    %% ets:info(Tab,safe_fixed) not timewarp safe...
+	    ignore
+    end,
     ok = dets:match_delete(T, {1, a, b}),
     ok = dets:insert(T, {1, a, b}),
+    {FixMonTime,[{Self,1}]} = dets:info(T,safe_fixed_monotonic_time),
+    {FixSysTime,[{Self,1}]} = dets:info(T,safe_fixed),
     dets:safe_fixtable(T, false),
     1 = length(dets:match_object(T, '_')),
 
@@ -1910,17 +1831,11 @@ fixtable(Config, Version) when is_list(Config) ->
     check_pps(P0),
     ok.
 
-match_v8(doc) ->
-    ["Matching objects of a fixed table."];
-match_v8(suite) ->
-    [];
+%% Matching objects of a fixed table.
 match_v8(Config) when is_list(Config) ->
     match(Config, 8).
 
-match_v9(doc) ->
-    ["Matching objects of a fixed table."];
-match_v9(suite) ->
-    [];
+%% Matching objects of a fixed table.
 match_v9(Config) when is_list(Config) ->
     match(Config, 9).
 
@@ -2092,17 +2007,11 @@ match(Config, Version) ->
     check_pps(P0),
     ok.
 
-select_v8(doc) ->
-    ["Selecting objects of a fixed table."];
-select_v8(suite) ->
-    [];
+%% Selecting objects of a fixed table.
 select_v8(Config) when is_list(Config) ->
     select(Config, 8).
 
-select_v9(doc) ->
-    ["Selecting objects of a fixed table."];
-select_v9(suite) ->
-    [];
+%% Selecting objects of a fixed table.
 select_v9(Config) when is_list(Config) ->
     select(Config, 9).
 
@@ -2206,10 +2115,7 @@ select(Config, Version) ->
     check_pps(P0),
     ok.
 
-update_counter(doc) ->
-    ["Test update_counter/1."];
-update_counter(suite) ->
-    [];
+%% Test update_counter/1.
 update_counter(Config) when is_list(Config) ->
     T = update_counter,
     Fname = filename(select, Config),
@@ -2243,10 +2149,7 @@ update_counter(Config) when is_list(Config) ->
 
     ok.
 
-badarg(doc) ->
-    ["Call some functions with bad arguments."];
-badarg(suite) ->
-    [];
+%% Call some functions with bad arguments.
 badarg(Config) when is_list(Config) ->
     T = badarg,
     Fname = filename(select, Config),
@@ -2255,7 +2158,6 @@ badarg(Config) when is_list(Config) ->
 
     Args = [{file,Fname},{keypos,3}],
     {ok, _} = dets:open_file(T, [{type,set} | Args]),
-    % dets:verbose(),
 
     %% badargs are tested in match, select and fixtable too.
 
@@ -2378,17 +2280,11 @@ badarg(Config) when is_list(Config) ->
     check_pps(P0),
     ok.
 
-cache_sets_v8(doc) ->
-    ["Test the write cache for sets."];
-cache_sets_v8(suite) ->
-    [];
+%% Test the write cache for sets.
 cache_sets_v8(Config) when is_list(Config) ->
     cache_sets(Config, 8).
 
-cache_sets_v9(doc) ->
-    ["Test the write cache for sets."];
-cache_sets_v9(suite) ->
-    [];
+%% Test the write cache for sets.
 cache_sets_v9(Config) when is_list(Config) ->
     cache_sets(Config, 9).
 
@@ -2522,7 +2418,7 @@ cache_sets(Config, DelayedWrite, Extra, Sz, Version) ->
 		{[],[]} ->  ok;
 		{X,Y} ->
 		    NoBad = length(X) + length(Y),
-		    test_server:fail({sets,DelayedWrite,Extra,Sz,NoBad})
+		    ct:fail({sets,DelayedWrite,Extra,Sz,NoBad})
 	    end;
 	true ->
 	    ok
@@ -2533,17 +2429,11 @@ cache_sets(Config, DelayedWrite, Extra, Sz, Version) ->
     check_pps(P0),
     ok.
     
-cache_bags_v8(doc) ->
-    ["Test the write cache for bags."];
-cache_bags_v8(suite) ->
-    [];
+%% Test the write cache for bags.
 cache_bags_v8(Config) when is_list(Config) ->
     cache_bags(Config, 8).
 
-cache_bags_v9(doc) ->
-    ["Test the write cache for bags."];
-cache_bags_v9(suite) ->
-    [];
+%% Test the write cache for bags.
 cache_bags_v9(Config) when is_list(Config) ->
     cache_bags(Config, 9).
 
@@ -2686,7 +2576,7 @@ cache_bags(Config, DelayedWrite, Extra, Sz, Version) ->
 		{[],[]} ->  ok;
 		{X,Y} ->
 		    NoBad = length(X) + length(Y),
-		    test_server:fail({bags,DelayedWrite,Extra,Sz,NoBad})
+		    ct:fail({bags,DelayedWrite,Extra,Sz,NoBad})
 	    end;
 	true ->
 	    ok
@@ -2715,17 +2605,11 @@ cache_bags(Config, DelayedWrite, Extra, Sz, Version) ->
     check_pps(P0),
     ok.
     
-cache_duplicate_bags_v8(doc) ->
-    ["Test the write cache for duplicate bags."];
-cache_duplicate_bags_v8(suite) ->
-    [];
+%% Test the write cache for duplicate bags.
 cache_duplicate_bags_v8(Config) when is_list(Config) ->
     cache_duplicate_bags(Config, 8).
 
-cache_duplicate_bags_v9(doc) ->
-    ["Test the write cache for duplicate bags."];
-cache_duplicate_bags_v9(suite) ->
-    [];
+%% Test the write cache for duplicate bags.
 cache_duplicate_bags_v9(Config) when is_list(Config) ->
     cache_duplicate_bags(Config, 9).
 
@@ -2844,7 +2728,7 @@ cache_dup_bags(Config, DelayedWrite, Extra, Sz, Version) ->
 		{[],[]} ->  ok;
 		{X,Y} ->
 		    NoBad = length(X) + length(Y),
-		    test_server:fail({dup_bags,DelayedWrite,Extra,Sz,NoBad})
+		    ct:fail({dup_bags,DelayedWrite,Extra,Sz,NoBad})
 	    end;
 	true ->
 	    ok
@@ -2910,10 +2794,7 @@ symdiff(L1, L2) ->
 	sofs:symmetric_partition(sofs:set(L1), sofs:set(L2)),
     {sofs:to_external(X), sofs:to_external(Y)}.
 
-otp_4208(doc) ->
-    ["Read only table and traversal caused crash."];
-otp_4208(suite) ->
-    [];
+%% Test read-only tables and traversal caused crashes.
 otp_4208(Config) when is_list(Config) ->
     Tab = otp_4208,
     FName = filename(Tab, Config),
@@ -2932,10 +2813,7 @@ otp_4208(Config) when is_list(Config) ->
     
     ok.
 
-otp_4989(doc) ->
-    ["Read only table and growth."];
-otp_4989(suite) ->
-    [];
+%% Test read-only tables and growth.
 otp_4989(Config) when is_list(Config) ->
     Tab = otp_4989,
     FName = filename(Tab, Config),
@@ -2963,10 +2841,7 @@ ets_init(Tab, N) ->
     ets:insert(Tab, {N,N}),
     ets_init(Tab, N - 1).
 
-otp_8898(doc) ->
-    ["OTP-8898. Truncated Dets file."];
-otp_8898(suite) ->
-    [];
+%% OTP-8898. Truncated Dets file.
 otp_8898(Config) when is_list(Config) ->
     Tab = otp_8898,
     FName = filename(Tab, Config),
@@ -2986,10 +2861,7 @@ otp_8898(Config) when is_list(Config) ->
 
     ok.
 
-otp_8899(doc) ->
-    ["OTP-8899. Several clients. Updated Head was ignored."];
-otp_8899(suite) ->
-    [];
+%% OTP-8899. Several clients. Updated Head was ignored.
 otp_8899(Config) when is_list(Config) ->
     Tab = many_clients,
     FName = filename(Tab, Config),
@@ -3014,10 +2886,7 @@ otp_8899(Config) when is_list(Config) ->
 
     ok.
 
-many_clients(doc) ->
-    ["Several clients accessing a table simultaneously."];
-many_clients(suite) ->
-    [];
+%% Test several clients accessing a table simultaneously.
 many_clients(Config) when is_list(Config) ->
     Tab = many_clients,
     FName = filename(Tab, Config),
@@ -3203,10 +3072,7 @@ eval([{info,Tag,Expected} | L], Tab) ->
 eval(Else, _Tab) ->
     {error, {bad_request,Else}}.
 
-otp_4906(doc) ->
-    ["More than 128k keys caused crash."];
-otp_4906(suite) ->
-    [];
+%% More than 128k keys caused crash.
 otp_4906(Config) when is_list(Config) ->
     N = 256*512 + 400,
     Tab = otp_4906,
@@ -3250,10 +3116,7 @@ ins_small(T, I, N) ->
     ok = dets:insert(T, {I}),
     ins_small(T, I+1, N).
 
-otp_5402(doc) ->
-    ["Unwritable ramfile caused krasch."];
-otp_5402(suite) ->
-    [];
+%% Unwritable ramfile caused crash.
 otp_5402(Config) when is_list(Config) ->
     Tab = otp_5402,
     File = filename:join(["cannot", "write", "this", "file"]),
@@ -3280,10 +3143,7 @@ otp_5402(Config) when is_list(Config) ->
     {error,{file_error,_,_}} = dets:close(T),
     ok.
 
-simultaneous_open(doc) ->
-    ["Several clients open and close tables simultaneously."];
-simultaneous_open(suite) ->
-    [];
+%% Several clients open and close tables simultaneously.
 simultaneous_open(Config) ->
     Tab = sim_open,
     File = filename(Tab, Config),
@@ -3502,10 +3362,7 @@ create_opened_log(File) ->
     crash(File, ?CLOSED_PROPERLY_POS+3, ?NOT_PROPERLY_CLOSED),
     ok.
 
-insert_new(doc) ->
-    ["OTP-5075. insert_new/2"];
-insert_new(suite) ->
-    [];
+%% OTP-5075. insert_new/2
 insert_new(Config) ->
     Tab = insert_new,
     File = filename(Tab, Config),
@@ -3533,10 +3390,7 @@ insert_new(Config) ->
     file:delete(File),
     ok.
     
-repair_continuation(doc) ->
-    ["OTP-5126. repair_continuation/2"];
-repair_continuation(suite) ->
-    [];
+%% OTP-5126. repair_continuation/2
 repair_continuation(Config) ->
     Tab = repair_continuation_table,
     Fname = filename(repair_cont, Config),
@@ -3559,10 +3413,7 @@ repair_continuation(Config) ->
     file:delete(Fname),
     ok.
 
-otp_5487(doc) ->
-    ["OTP-5487. Growth of read-only table (again)."];
-otp_5487(suite) ->
-    [];
+%% OTP-5487. Growth of read-only table (again).
 otp_5487(Config) ->
     otp_5487(Config, 9),
     otp_5487(Config, 8),
@@ -3585,10 +3436,7 @@ otp_5487(Config, Version) ->
     ets:delete(Ets),
     file:delete(Fname).
 
-otp_6206(doc) ->
-    ["OTP-6206. Badly formed free lists."];
-otp_6206(suite) ->
-    [];
+%% OTP-6206. Badly formed free lists.
 otp_6206(Config) ->
     Tab = otp_6206,
     File = filename(Tab, Config),
@@ -3607,10 +3455,7 @@ otp_6206(Config) ->
     file:delete(File),
     ok.
 
-otp_6359(doc) ->
-    ["OTP-6359. select and match never return the empty list."];
-otp_6359(suite) ->
-    [];
+%% OTP-6359. select and match never return the empty list.
 otp_6359(Config) ->
     Tab = otp_6359,
     File = filename(Tab, Config),
@@ -3623,10 +3468,7 @@ otp_6359(Config) ->
     file:delete(File),
     ok.
 
-otp_4738(doc) ->
-    ["OTP-4738. ==/2 and =:=/2."];
-otp_4738(suite) ->
-    [];
+%% OTP-4738. ==/2 and =:=/2.
 otp_4738(Config) ->
     %% Version 8 has not been corrected.
     %% (The constant -12857447 is for version 9 only.)
@@ -3778,10 +3620,7 @@ otp_4738_set(Version, Config) ->
     file:delete(File),
     ok.
 
-otp_7146(doc) ->
-    ["OTP-7146. Bugfix: missing test when re-hashing."];
-otp_7146(suite) ->
-    [];
+%% OTP-7146. Bugfix: missing test when re-hashing.
 otp_7146(Config) ->
     Tab = otp_7146,
     File = filename(Tab, Config),
@@ -3804,10 +3643,7 @@ write_dets(Tab, N, Max) ->
     ok = dets:insert(Tab,{ N, {entry,N}}),
     write_dets(Tab, N+1, Max).
 
-otp_8070(doc) ->
-    ["OTP-8070. Duplicated objects with insert_new() and duplicate_bag."];
-otp_8070(suite) ->
-    [];
+%% OTP-8070. Duplicated objects with insert_new() and duplicate_bag.
 otp_8070(Config) when is_list(Config) ->
     Tab = otp_8070,
     File = filename(Tab, Config),
@@ -3820,10 +3656,7 @@ otp_8070(Config) when is_list(Config) ->
     file:delete(File),
     ok.
 
-otp_8856(doc) ->
-    ["OTP-8856. insert_new() bug."];
-otp_8856(suite) ->
-    [];
+%% OTP-8856. insert_new() bug.
 otp_8856(Config) when is_list(Config) ->
     Tab = otp_8856,
     File = filename(Tab, Config),
@@ -3845,10 +3678,7 @@ otp_8856(Config) when is_list(Config) ->
     file:delete(File),
     ok.
 
-otp_8903(doc) ->
-    ["OTP-8903. bchunk/match/select bug."];
-otp_8903(suite) ->
-    [];
+%% OTP-8903. bchunk/match/select bug.
 otp_8903(Config) when is_list(Config) ->
     Tab = otp_8903,
     File = filename(Tab, Config),
@@ -3868,10 +3698,7 @@ otp_8903(Config) when is_list(Config) ->
     file:delete(File),
     ok.
 
-otp_8923(doc) ->
-    ["OTP-8923. rehash due to lookup after initialization."];
-otp_8923(suite) ->
-    [];
+%% OTP-8923. rehash due to lookup after initialization.
 otp_8923(Config) when is_list(Config) ->
     Tab = otp_8923,
     File = filename(Tab, Config),
@@ -3901,10 +3728,7 @@ otp_8923(Config) when is_list(Config) ->
     file:delete(File),
     ok.
 
-otp_9282(doc) ->
-    ["OTP-9282. The name of a table can be an arbitrary term"];
-otp_9282(suite) ->
-    [];
+%% OTP-9282. The name of a table can be an arbitrary term.
 otp_9282(Config) when is_list(Config) ->
     some_calls(make_ref(), Config),
     some_calls({a,typical,name}, Config),
@@ -3924,10 +3748,7 @@ some_calls(Tab, Config) ->
     file:delete(File).
 
 
-otp_11245(doc) ->
-    ["OTP-11245. Tables remained fixed after traversal"];
-otp_11245(suite) ->
-    [];
+%% OTP-11245. Tables remained fixed after traversal.
 otp_11245(Config) when is_list(Config) ->
     Tab = otp_11245,
     File = filename(Tab, Config),
@@ -3946,10 +3767,7 @@ otp_11245(Config) when is_list(Config) ->
     file:delete(File),
     ok.
 
-otp_11709(doc) ->
-    ["OTP-11709. Bugfixes."];
-otp_11709(suite) ->
-    [];
+%% OTP-11709. Bugfixes.
 otp_11709(Config) when is_list(Config) ->
     Short = <<"foo">>,
     Long = <<"a sufficiently long text">>,
@@ -3988,6 +3806,64 @@ otp_11709(Config) when is_list(Config) ->
     _ = file:delete(File),
     ok.
 
+%% OTP-13229. open_file() exits with badarg when given binary file name.
+otp_13229(_Config) ->
+    F = <<"binfile.tab">>,
+    try dets:open_file(name, [{file, F}]) of
+        R ->
+            exit({open_succeeded, R})
+    catch
+        error:badarg ->
+            ok
+    end.
+
+%% OTP-13260. Race when opening a table.
+otp_13260(Config) ->
+    [ok] = lists:usort([otp_13260_1(Config) || _ <- lists:seq(1, 3)]),
+    ok.
+
+otp_13260_1(Config) ->
+    Tab = otp_13260,
+    File = filename(Tab, Config),
+    N = 20,
+    P = self(),
+    Pids = [spawn_link(fun() -> counter(P, Tab, File) end) ||
+               _ <- lists:seq(1, N)],
+    Rs = rec(Pids),
+    true = lists:all(fun(R) -> is_integer(R) end, Rs),
+    wait_for_close(Tab).
+
+rec([]) ->
+    [];
+rec([Pid | Pids]) ->
+    receive {Pid, R} ->
+            [R | rec(Pids)]
+    end.
+
+%% One may have to run the test several times to trigger the bug.
+counter(P, Tab, File) ->
+    Key = key,
+    N = case catch dets:update_counter(Tab, Key, 1) of
+            {'EXIT', _} ->
+                {ok, Tab} = dets:open_file(Tab, [{file, File}]),
+                ok = dets:insert(Tab, {Key, 1}),
+                dets:update_counter(Tab, Key, 1);
+            N1 when is_integer(N1) ->
+                N1;
+            DetsBug ->
+                DetsBug
+        end,
+    P ! {self(), N}.
+
+wait_for_close(Tab) ->
+    case dets:info(Tab, owner) of
+        undefined ->
+            ok;
+        _ ->
+            timer:sleep(100),
+            wait_for_close(Tab)
+    end.
+
 %%
 %% Parts common to several test cases
 %% 
@@ -4404,7 +4280,7 @@ check_pps({Ports0,Procs0} = P0) ->
 			    show("New port", PortsDiff),
 			    show("Old proc", Procs0 -- Procs1),
 			    show("New proc", ProcsDiff),
-			    ?t:fail()
+			    ct:fail(failed)
 		    end
 	    end
     end.
diff --git a/lib/stdlib/test/dict_SUITE.erl b/lib/stdlib/test/dict_SUITE.erl
index 648154ebbe..d315e6f673 100644
--- a/lib/stdlib/test/dict_SUITE.erl
+++ b/lib/stdlib/test/dict_SUITE.erl
@@ -28,11 +28,13 @@
 	 init_per_testcase/2,end_per_testcase/2,
          create/1,store/1,iterate/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -import(lists, [foldl/3]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,5}}].
 
 all() -> 
     [create, store, iterate].
@@ -54,12 +56,9 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(5)),
-    [{watchdog,Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
 create(Config) when is_list(Config) ->
@@ -108,7 +107,7 @@ iterate_1(M) ->
     M(empty, []).
 
 iterate_2(M) ->
-    random:seed(1, 2, 42),
+    rand:seed(exsplus, {1,2,42}),
     iter_tree(M, 1000).
 
 iter_tree(_M, 0) ->
@@ -117,7 +116,7 @@ iter_tree(M, N) ->
     L = [{I, I} || I <- lists:seq(1, N)],
     T = M(from_list, L),
     L = lists:reverse(iterate_tree(M, T)),
-    R = random:uniform(N),
+    R = rand:uniform(N),
     KV = lists:reverse(iterate_tree_from(M, R, T)),
     KV = [P || P={K,_} <- L, K >= R],
     iter_tree(M, N-1).
@@ -156,7 +155,7 @@ test_all(Tester) ->
 spawn_tester(M, Tester) ->
     Parent = self(),
     spawn_link(fun() ->
-		       random:seed(1, 2, 42),
+		       rand:seed(exsplus, {1,2,42}),
 		       S = Tester(M),
 		       Res = {M(size, S),lists:sort(M(to_list, S))},
 		       Parent ! {result,self(),Res}
@@ -194,12 +193,12 @@ rnd_list_1(0, Acc) ->
     Acc;
 rnd_list_1(N, Acc) ->
     Key = atomic_rnd_term(),
-    Value = random:uniform(100),
+    Value = rand:uniform(100),
     rnd_list_1(N-1, [{Key,Value}|Acc]).
 
 atomic_rnd_term() ->
-    case random:uniform(3) of
-	 1 -> list_to_atom(integer_to_list($\s+random:uniform(94))++"rnd");
-	 2 -> random:uniform();
-	 3 -> random:uniform(50)-37
+    case rand:uniform(3) of
+	 1 -> list_to_atom(integer_to_list($\s+rand:uniform(94))++"rnd");
+	 2 -> rand:uniform();
+	 3 -> rand:uniform(50)-37
     end.
diff --git a/lib/stdlib/test/digraph_SUITE.erl b/lib/stdlib/test/digraph_SUITE.erl
index 9e007fe17d..8825d3fc15 100644
--- a/lib/stdlib/test/digraph_SUITE.erl
+++ b/lib/stdlib/test/digraph_SUITE.erl
@@ -19,12 +19,12 @@
 %%
 -module(digraph_SUITE).
 
-%-define(STANDALONE,1).
+%%-define(STANDALONE,1).
 
 -ifdef(STANDALONE).
 -define(line, put(line, ?LINE), ).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -endif.
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -62,108 +62,100 @@ end_per_group(_GroupName, Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-opts(doc) -> [];
-opts(suite) -> [];
 opts(Config) when is_list(Config) ->
     %% OTP-5985: the 'public' option has been removed
-    ?line {'EXIT',{badarg,_}} = (catch digraph:new([public])),
-    ?line {P2,G2} = spawn_graph([private]),
-    ?line {'EXIT',{badarg,_}} = (catch digraph:add_vertex(G2, x)),
-    ?line kill_graph(P2),
-    ?line {P3,G3} = spawn_graph([protected]),
-    ?line {'EXIT',{badarg,_}} = (catch digraph:add_vertex(G3, x)),
-    ?line kill_graph(P3),
-    ?line Template = [{v1,[v2]}, {v2,[v3]}, {v3,[v4]}, {v4,[]}],
-    ?line G4 = build_graph([], Template),
-    ?line e = digraph:add_edge(G4, e, v4, v1, []),
-    ?line digraph:delete(G4),
-    ?line G5 = build_graph([cyclic], Template),
-    ?line e = digraph:add_edge(G5, e, v4, v1, []),
-    ?line digraph:delete(G5),
-    ?line G6 = build_graph([acyclic], Template),
-    ?line acyclic = info(G6, cyclicity),
-    ?line {error, {bad_edge,_}} = digraph:add_edge(G6, v4, v1),
-    ?line digraph:delete(G6),
+    {'EXIT',{badarg,_}} = (catch digraph:new([public])),
+    {P2,G2} = spawn_graph([private]),
+    {'EXIT',{badarg,_}} = (catch digraph:add_vertex(G2, x)),
+    kill_graph(P2),
+    {P3,G3} = spawn_graph([protected]),
+    {'EXIT',{badarg,_}} = (catch digraph:add_vertex(G3, x)),
+    kill_graph(P3),
+    Template = [{v1,[v2]}, {v2,[v3]}, {v3,[v4]}, {v4,[]}],
+    G4 = build_graph([], Template),
+    e = digraph:add_edge(G4, e, v4, v1, []),
+    digraph:delete(G4),
+    G5 = build_graph([cyclic], Template),
+    e = digraph:add_edge(G5, e, v4, v1, []),
+    digraph:delete(G5),
+    G6 = build_graph([acyclic], Template),
+    acyclic = info(G6, cyclicity),
+    {error, {bad_edge,_}} = digraph:add_edge(G6, v4, v1),
+    digraph:delete(G6),
     ok.
-    
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-degree(doc) -> [];
-degree(suite) -> [];
 degree(Config) when is_list(Config) ->
-    ?line G = build_graph([], [{x1,[]}, {x2,[x1]}, {x3,[x1,x2]},
-			       {x4,[x1,x2,x3]}, {x5,[x1,x2,x3,x4]}]),
+    G = build_graph([], [{x1,[]}, {x2,[x1]}, {x3,[x1,x2]},
+			 {x4,[x1,x2,x3]}, {x5,[x1,x2,x3,x4]}]),
     %% out degree
-    ?line 0 = digraph:out_degree(G, x1),
-    ?line 1 = digraph:out_degree(G, x2),
-    ?line 2 = digraph:out_degree(G, x3),
-    ?line 3 = digraph:out_degree(G, x4),
-    ?line 4 = digraph:out_degree(G, x5),
+    0 = digraph:out_degree(G, x1),
+    1 = digraph:out_degree(G, x2),
+    2 = digraph:out_degree(G, x3),
+    3 = digraph:out_degree(G, x4),
+    4 = digraph:out_degree(G, x5),
     %% out neighbours
-    ?line [] = check(digraph:out_neighbours(G, x1), []),
-    ?line [] = check(digraph:out_neighbours(G, x2), [x1]),
-    ?line [] = check(digraph:out_neighbours(G, x3), [x1,x2]),
-    ?line [] = check(digraph:out_neighbours(G, x4), [x1,x2,x3]),
-    ?line [] = check(digraph:out_neighbours(G, x5), [x1,x2,x3,x4]),
+    [] = check(digraph:out_neighbours(G, x1), []),
+    [] = check(digraph:out_neighbours(G, x2), [x1]),
+    [] = check(digraph:out_neighbours(G, x3), [x1,x2]),
+    [] = check(digraph:out_neighbours(G, x4), [x1,x2,x3]),
+    [] = check(digraph:out_neighbours(G, x5), [x1,x2,x3,x4]),
 
     %% in degree
-    ?line 4 = digraph:in_degree(G, x1),
-    ?line 3 = digraph:in_degree(G, x2),
-    ?line 2 = digraph:in_degree(G, x3),
-    ?line 1 = digraph:in_degree(G, x4),
-    ?line 0 = digraph:in_degree(G, x5),
+    4 = digraph:in_degree(G, x1),
+    3 = digraph:in_degree(G, x2),
+    2 = digraph:in_degree(G, x3),
+    1 = digraph:in_degree(G, x4),
+    0 = digraph:in_degree(G, x5),
     %% in neighbours
-    ?line [] = check(digraph:in_neighbours(G, x1), [x2,x3,x4,x5]),
-    ?line [] = check(digraph:in_neighbours(G, x2), [x3,x4,x5]),
-    ?line [] = check(digraph:in_neighbours(G, x3), [x4,x5]),
-    ?line [] = check(digraph:in_neighbours(G, x4), [x5]),
-    ?line [] = check(digraph:in_neighbours(G, x5), []),
+    [] = check(digraph:in_neighbours(G, x1), [x2,x3,x4,x5]),
+    [] = check(digraph:in_neighbours(G, x2), [x3,x4,x5]),
+    [] = check(digraph:in_neighbours(G, x3), [x4,x5]),
+    [] = check(digraph:in_neighbours(G, x4), [x5]),
+    [] = check(digraph:in_neighbours(G, x5), []),
     digraph:delete(G),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-path(doc) -> [];
-path(suite) -> [];
 path(Config) when is_list(Config) ->
-    ?line G = build_graph([], [{x1,[x2,x3]}, {x2,[x4]}, {x3,[x4]},
-			       {x4,[x5,x6]}, {x5,[x7]}, {x6,[x7]}]),
-    ?line Vi = case digraph:get_path(G, x1, x7) of
-		   [x1,x2,x4,x5,x7] -> digraph:del_vertex(G, x5), x6;
-		   [x1,x2,x4,x6,x7] -> digraph:del_vertex(G, x6), x5;
-		   [x1,x3,x4,x5,x7] -> digraph:del_vertex(G, x5), x6;
-		   [x1,x3,x4,x6,x7] -> digraph:del_vertex(G, x6), x5
-	       end,
-    ?line Vj = case digraph:get_path(G, x1, x7) of
-		   [x1,x2,x4,Vi,x7] -> digraph:del_vertex(G,x2), x3;
-		   [x1,x3,x4,Vi,x7] -> digraph:del_vertex(G,x3), x2
-	       end,
-    ?line [x1,Vj,x4,Vi,x7] = digraph:get_path(G, x1, x7),
-    ?line digraph:del_vertex(G, Vj),
-    ?line false = digraph:get_path(G, x1, x7),
-    ?line [] = check(digraph:vertices(G), [x1,x4,Vi,x7]),
+    G = build_graph([], [{x1,[x2,x3]}, {x2,[x4]}, {x3,[x4]},
+			 {x4,[x5,x6]}, {x5,[x7]}, {x6,[x7]}]),
+    Vi = case digraph:get_path(G, x1, x7) of
+	     [x1,x2,x4,x5,x7] -> digraph:del_vertex(G, x5), x6;
+	     [x1,x2,x4,x6,x7] -> digraph:del_vertex(G, x6), x5;
+	     [x1,x3,x4,x5,x7] -> digraph:del_vertex(G, x5), x6;
+	     [x1,x3,x4,x6,x7] -> digraph:del_vertex(G, x6), x5
+	 end,
+    Vj = case digraph:get_path(G, x1, x7) of
+	     [x1,x2,x4,Vi,x7] -> digraph:del_vertex(G,x2), x3;
+	     [x1,x3,x4,Vi,x7] -> digraph:del_vertex(G,x3), x2
+	 end,
+    [x1,Vj,x4,Vi,x7] = digraph:get_path(G, x1, x7),
+    digraph:del_vertex(G, Vj),
+    false = digraph:get_path(G, x1, x7),
+    [] = check(digraph:vertices(G), [x1,x4,Vi,x7]),
     digraph:delete(G),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-cycle(doc) -> [];
-cycle(suite) -> [];
 cycle(Config) when is_list(Config) ->
-    ?line G = build_graph([], [{x1,[x2,x3]}, {x2,[x4]}, {x3,[x4]},
-			       {x4,[x5,x6]}, {x5,[x7]}, {x6,[x7,x8]},
-			       {x8,[x3,x8]}]), 
-    ?line false = digraph:get_cycle(G, x1),
-    ?line false = digraph:get_cycle(G, x2),
-    ?line false = digraph:get_cycle(G, x5),
-    ?line false = digraph:get_cycle(G, x7),
-    ?line [x3,x4,x6,x8,x3] = digraph:get_cycle(G, x3),
-    ?line [x4,x6,x8,x3,x4] = digraph:get_cycle(G, x4),
-    ?line [x6,x8,x3,x4,x6] = digraph:get_cycle(G, x6),
-    ?line [x8,x3,x4,x6,x8] = digraph:get_cycle(G, x8),
-    ?line digraph:del_vertex(G, x4),
-    ?line [x8] = digraph:get_cycle(G, x8),
+    G = build_graph([], [{x1,[x2,x3]}, {x2,[x4]}, {x3,[x4]},
+			 {x4,[x5,x6]}, {x5,[x7]}, {x6,[x7,x8]},
+			 {x8,[x3,x8]}]),
+    false = digraph:get_cycle(G, x1),
+    false = digraph:get_cycle(G, x2),
+    false = digraph:get_cycle(G, x5),
+    false = digraph:get_cycle(G, x7),
+    [x3,x4,x6,x8,x3] = digraph:get_cycle(G, x3),
+    [x4,x6,x8,x3,x4] = digraph:get_cycle(G, x4),
+    [x6,x8,x3,x4,x6] = digraph:get_cycle(G, x6),
+    [x8,x3,x4,x6,x8] = digraph:get_cycle(G, x8),
+    digraph:del_vertex(G, x4),
+    [x8] = digraph:get_cycle(G, x8),
     digraph:delete(G),
     ok.
 
@@ -171,61 +163,55 @@ cycle(Config) when is_list(Config) ->
 
 
 
-vertices(doc) -> [];
-vertices(suite) -> [];
 vertices(Config) when is_list(Config) ->
-    ?line G = build_graph([], [{x,[]}, {y,[]}]),
-    ?line [] = check(digraph:vertices(G), [x,y]),
-    ?line digraph:del_vertices(G, [x,y]),
-    ?line [] = digraph:vertices(G),
-    ?line digraph:delete(G),
+    G = build_graph([], [{x,[]}, {y,[]}]),
+    [] = check(digraph:vertices(G), [x,y]),
+    digraph:del_vertices(G, [x,y]),
+    [] = digraph:vertices(G),
+    digraph:delete(G),
     ok.
 
-edges(doc) -> [];
-edges(suite) -> [];
 edges(Config) when is_list(Config) ->
-    ?line G = build_graph([], [{x, [{exy,y},{exx,x}]},
-			       {y, [{eyx,x}]}
-			      ]),
-    ?line [] = check(digraph:edges(G), [exy, eyx, exx]),
-    ?line [] = check(digraph:out_edges(G, x), [exy,exx]),
-    ?line [] = check(digraph:in_edges(G, x), [eyx,exx]),
-    ?line [] = check(digraph:out_edges(G, y), [eyx]),
-    ?line [] = check(digraph:in_edges(G, y), [exy]),
-    ?line true = digraph:del_edges(G, [exy, eyx, does_not_exist]),
-    ?line [exx] = digraph:edges(G),
-    ?line [] = check(digraph:out_edges(G, x), [exx]),
-    ?line [] = check(digraph:in_edges(G, x), [exx]),
-    ?line [] = check(digraph:out_edges(G, y), []),
-    ?line [] = check(digraph:in_edges(G, y), []),
-    ?line digraph:del_vertices(G, [x,y]),
-    ?line [] = digraph:edges(G),
-    ?line [] = digraph:vertices(G),
-    ?line digraph:delete(G),
+    G = build_graph([], [{x, [{exy,y},{exx,x}]},
+			 {y, [{eyx,x}]}
+			]),
+    [] = check(digraph:edges(G), [exy, eyx, exx]),
+    [] = check(digraph:out_edges(G, x), [exy,exx]),
+    [] = check(digraph:in_edges(G, x), [eyx,exx]),
+    [] = check(digraph:out_edges(G, y), [eyx]),
+    [] = check(digraph:in_edges(G, y), [exy]),
+    true = digraph:del_edges(G, [exy, eyx, does_not_exist]),
+    [exx] = digraph:edges(G),
+    [] = check(digraph:out_edges(G, x), [exx]),
+    [] = check(digraph:in_edges(G, x), [exx]),
+    [] = check(digraph:out_edges(G, y), []),
+    [] = check(digraph:in_edges(G, y), []),
+    digraph:del_vertices(G, [x,y]),
+    [] = digraph:edges(G),
+    [] = digraph:vertices(G),
+    digraph:delete(G),
     ok.
 
-data(doc) -> [];
-data(suite) -> [];
 data(Config) when is_list(Config) ->
-    ?line G = build_graph([], [{x, [{exy, y}]}, {y, []}]),
-    
-    ?line {x,[]} = digraph:vertex(G, x),
-    ?line {y,[]} = digraph:vertex(G, y),
-    ?line {exy,x,y,[]} = digraph:edge(G, exy),
-
-    ?line digraph:add_edge(G, exy, x, y, {data,x,y}),
-    ?line E = digraph:add_edge(G, x, y, {data,y,x}),
-    ?line digraph:add_vertex(G, x, {any}),
-    ?line digraph:add_vertex(G, y, '_'),
-
-    ?line {x,{any}} = digraph:vertex(G, x),
-    ?line {y,'_'} = digraph:vertex(G, y),
-    ?line {exy,x,y,{data,x,y}} = digraph:edge(G, exy),
-    ?line {E,x,y,{data,y,x}} = digraph:edge(G, E),
-    ?line true = digraph:del_edge(G, E),
-    ?line false = digraph:edge(G, E),
-    ?line true = sane(G),
-    ?line digraph:delete(G),
+    G = build_graph([], [{x, [{exy, y}]}, {y, []}]),
+
+    {x,[]} = digraph:vertex(G, x),
+    {y,[]} = digraph:vertex(G, y),
+    {exy,x,y,[]} = digraph:edge(G, exy),
+
+    digraph:add_edge(G, exy, x, y, {data,x,y}),
+    E = digraph:add_edge(G, x, y, {data,y,x}),
+    digraph:add_vertex(G, x, {any}),
+    digraph:add_vertex(G, y, '_'),
+
+    {x,{any}} = digraph:vertex(G, x),
+    {y,'_'} = digraph:vertex(G, y),
+    {exy,x,y,{data,x,y}} = digraph:edge(G, exy),
+    {E,x,y,{data,y,x}} = digraph:edge(G, E),
+    true = digraph:del_edge(G, E),
+    false = digraph:edge(G, E),
+    true = sane(G),
+    digraph:delete(G),
     ok.
 
 
@@ -233,87 +219,81 @@ data(Config) when is_list(Config) ->
 
 
 
-otp_3522(doc) -> [];
-otp_3522(suite) -> [];
 otp_3522(Config) when is_list(Config) ->
-    ?line G1 = build_graph([acyclic], [{x, []}]),
-    ?line {error, {bad_edge,_}} = digraph:add_edge(G1, x, x),
-    ?line true = digraph:delete(G1),
-
-    ?line G = digraph:new(),
-    ?line 0 = digraph:no_vertices(G),
-    ?line 0 = digraph:no_edges(G),
-    ?line V1 = digraph:add_vertex(G),
-    ?line '$vid' = digraph:add_vertex(G, '$vid'),
-    ?line V2 = digraph:add_vertex(G),
-    ?line '$eid' = digraph:add_edge(G, '$eid', V1, V2, []),
-    ?line E = digraph:add_edge(G, V1, V2),
-    ?line 3 = digraph:no_vertices(G),
-    ?line 2 = digraph:no_edges(G),
-    ?line cyclic = info(G, cyclicity),
-    ?line protected = info(G, protection),
-
-    ?line [] = check(digraph:in_edges(G, V2), ['$eid', E]),
-    ?line [] = check(digraph:out_edges(G, V1), ['$eid', E]),
-    ?line [] = check(digraph:vertices(G), [V1,V2,'$vid']),
-    ?line [] = check(digraph:edges(G), [E, '$eid']),
-    ?line true = sane(G),
-    ?line true = digraph:delete(G),
+    G1 = build_graph([acyclic], [{x, []}]),
+    {error, {bad_edge,_}} = digraph:add_edge(G1, x, x),
+    true = digraph:delete(G1),
+
+    G = digraph:new(),
+    0 = digraph:no_vertices(G),
+    0 = digraph:no_edges(G),
+    V1 = digraph:add_vertex(G),
+    '$vid' = digraph:add_vertex(G, '$vid'),
+    V2 = digraph:add_vertex(G),
+    '$eid' = digraph:add_edge(G, '$eid', V1, V2, []),
+    E = digraph:add_edge(G, V1, V2),
+    3 = digraph:no_vertices(G),
+    2 = digraph:no_edges(G),
+    cyclic = info(G, cyclicity),
+    protected = info(G, protection),
+
+    [] = check(digraph:in_edges(G, V2), ['$eid', E]),
+    [] = check(digraph:out_edges(G, V1), ['$eid', E]),
+    [] = check(digraph:vertices(G), [V1,V2,'$vid']),
+    [] = check(digraph:edges(G), [E, '$eid']),
+    true = sane(G),
+    true = digraph:delete(G),
     ok.
 
-otp_3630(doc) -> [];
-otp_3630(suite) -> [];
 otp_3630(Config) when is_list(Config) ->
-    ?line G = build_graph([], [{x, [{exy,y},{exx,x}]},
-			       {y, [{eyy,y},{eyx,x}]}
-			      ]),
-    ?line [x,y] = digraph:get_path(G, x, y),
-    ?line [y,x] = digraph:get_path(G, y, x),
-
-    ?line [x,x] = digraph:get_short_path(G, x, x),
-    ?line [y,y] = digraph:get_short_path(G, y, y),
-    ?line true = digraph:delete(G),
-
-    ?line G1 = build_graph([], [{1, [{12,2},{13,3},{11,1}]},
-				{2, [{23,3}]},
-				{3, [{34,4},{35,5}]},
-				{4, [{45,5}]},
-				{5, [{56,6},{57,7}]},
-				{6, [{67,7}]},
-				{7, [{71,1}]}
-			       ]),
-    
-    ?line [1,3,5,7] = digraph:get_short_path(G1, 1, 7),
-    ?line [3,5,7,1,3] = digraph:get_short_cycle(G1, 3),
-    ?line [1,1] = digraph:get_short_cycle(G1, 1),
-    ?line true = digraph:delete(G1),
+    G = build_graph([], [{x, [{exy,y},{exx,x}]},
+			 {y, [{eyy,y},{eyx,x}]}
+			]),
+    [x,y] = digraph:get_path(G, x, y),
+    [y,x] = digraph:get_path(G, y, x),
+
+    [x,x] = digraph:get_short_path(G, x, x),
+    [y,y] = digraph:get_short_path(G, y, y),
+    true = digraph:delete(G),
+
+    G1 = build_graph([], [{1, [{12,2},{13,3},{11,1}]},
+			  {2, [{23,3}]},
+			  {3, [{34,4},{35,5}]},
+			  {4, [{45,5}]},
+			  {5, [{56,6},{57,7}]},
+			  {6, [{67,7}]},
+			  {7, [{71,1}]}
+			 ]),
+
+    [1,3,5,7] = digraph:get_short_path(G1, 1, 7),
+    [3,5,7,1,3] = digraph:get_short_cycle(G1, 3),
+    [1,1] = digraph:get_short_cycle(G1, 1),
+    true = digraph:delete(G1),
 
     F = 0.0, I = round(F),
-    ?line G2 = digraph:new([acyclic]),
-    ?line digraph:add_vertex(G2, F),
-    ?line digraph:add_vertex(G2, I),
-    ?line E = digraph:add_edge(G2, F, I),
-    ?line true = not is_tuple(E),
-    ?line true = sane(G2),
-    ?line true = digraph:delete(G2),
+    G2 = digraph:new([acyclic]),
+    digraph:add_vertex(G2, F),
+    digraph:add_vertex(G2, I),
+    E = digraph:add_edge(G2, F, I),
+    true = not is_tuple(E),
+    true = sane(G2),
+    true = digraph:delete(G2),
 
     ok.
 
-otp_8066(doc) -> [];
-otp_8066(suite) -> [];
 otp_8066(Config) when is_list(Config) ->
     fun() ->
             D = digraph:new(),
             V1 = digraph:add_vertex(D),
             V2 = digraph:add_vertex(D),
             _ = digraph:add_edge(D, V1, V2),
-            ?line [V1, V2] = digraph:get_path(D, V1, V2),
-            ?line true = sane(D),
-            ?line true = digraph:del_path(D, V1, V2),
-            ?line true = sane(D),
-            ?line false = digraph:get_path(D, V1, V2),
-            ?line true = digraph:del_path(D, V1, V2),
-            ?line true = digraph:delete(D)
+            [V1, V2] = digraph:get_path(D, V1, V2),
+            true = sane(D),
+            true = digraph:del_path(D, V1, V2),
+            true = sane(D),
+            false = digraph:get_path(D, V1, V2),
+            true = digraph:del_path(D, V1, V2),
+            true = digraph:delete(D)
     end(),
 
     fun() ->
@@ -324,15 +304,15 @@ otp_8066(Config) when is_list(Config) ->
             _ = digraph:add_edge(D, V1, V2),
             _ = digraph:add_edge(D, V1, V1),
             _ = digraph:add_edge(D, V2, V2),
-            ?line [V1, V2] = digraph:get_path(D, V1, V2),
-            ?line true = sane(D),
-            ?line true = digraph:del_path(D, V1, V2),
-            ?line false = digraph:get_short_path(D, V2, V1),
-
-            ?line true = sane(D),
-            ?line false = digraph:get_path(D, V1, V2),
-            ?line true = digraph:del_path(D, V1, V2),
-            ?line true = digraph:delete(D)
+            [V1, V2] = digraph:get_path(D, V1, V2),
+            true = sane(D),
+            true = digraph:del_path(D, V1, V2),
+            false = digraph:get_short_path(D, V2, V1),
+
+            true = sane(D),
+            false = digraph:get_path(D, V1, V2),
+            true = digraph:del_path(D, V1, V2),
+            true = digraph:delete(D)
     end(),
 
     fun() ->
@@ -342,18 +322,18 @@ otp_8066(Config) when is_list(Config) ->
             W3 = digraph:add_vertex(G),
             W4 = digraph:add_vertex(G),
             _ = digraph:add_edge(G,['$e'|0], W1, W2, {}),
-            ?line {error,{bad_vertex, bv}} =
+            {error,{bad_vertex, bv}} =
                 digraph:add_edge(G, edge, bv, W1, {}),
-            ?line {error,{bad_vertex, bv}} =
+            {error,{bad_vertex, bv}} =
                 digraph:add_edge(G, edge, W1, bv, {}),
-            ?line false = digraph:get_short_cycle(G, W1),
-            ?line {error, {bad_edge,_}} =
+            false = digraph:get_short_cycle(G, W1),
+            {error, {bad_edge,_}} =
                 digraph:add_edge(G,['$e'|0], W3, W4, {}),
-            ?line true = sane(G),
-            ?line true = digraph:delete(G)
+            true = sane(G),
+            true = digraph:delete(G)
     end(),
     ok.
-    
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -422,7 +402,7 @@ sane1(G) ->
                         end
                 end, OutEs)
       end, Vs),
-    
+
     InEs = lists:flatmap(fun(V) -> digraph:in_edges(G, V) end, Vs),
     OutEs = lists:flatmap(fun(V) -> digraph:out_edges(G, V) end, Vs),
     lists:foreach(
@@ -450,7 +430,7 @@ sane1(G) ->
     end,
     Edges = [digraph:edge(G, E) || E <- Es],
     EVs = lists:usort([V || {_, V, _, _} <- Edges] ++
-                      [V || {_, _, V, _} <- Edges]),
+			  [V || {_, _, V, _} <- Edges]),
     lists:foreach(
       fun(V) ->
               case digraph:vertex(G, V) of
diff --git a/lib/stdlib/test/digraph_utils_SUITE.erl b/lib/stdlib/test/digraph_utils_SUITE.erl
index 747ccf322c..23520072f8 100644
--- a/lib/stdlib/test/digraph_utils_SUITE.erl
+++ b/lib/stdlib/test/digraph_utils_SUITE.erl
@@ -19,11 +19,11 @@
 %%
 -module(digraph_utils_SUITE).
 
-%-define(debug, true).
+%%-define(debug, true).
 -ifdef(debug).
 -define(line, put(line, ?LINE), ).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -endif.
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -59,205 +59,192 @@ end_per_group(_GroupName, Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-simple(doc) -> [];
-simple(suite) -> [];
 simple(Config) when is_list(Config) ->
-    ?line G = digraph:new(),
-    ?line add_vertices(G, [a]),
-    ?line add_edges(G, [{b,c},{b,d},{e,f},{f,g},{g,e},{h,h},{i,i},{i,j}]),
-    ?line 10 = length(digraph_utils:postorder(G)),
-    ?line 10 = length(digraph_utils:preorder(G)),
-    ?line ok = evall(digraph_utils:components(G), 
-		     [[a],[b,c,d],[e,f,g],[h],[i,j]]),
-    ?line ok = evall(digraph_utils:strong_components(G), 
+    G = digraph:new(),
+    add_vertices(G, [a]),
+    add_edges(G, [{b,c},{b,d},{e,f},{f,g},{g,e},{h,h},{i,i},{i,j}]),
+    10 = length(digraph_utils:postorder(G)),
+    10 = length(digraph_utils:preorder(G)),
+    ok = evall(digraph_utils:components(G),
+	       [[a],[b,c,d],[e,f,g],[h],[i,j]]),
+    ok = evall(digraph_utils:strong_components(G),
 	       [[a],[b],[c],[d],[e,f,g],[h],[i],[j]]),
-    ?line ok = evall(digraph_utils:cyclic_strong_components(G), 
-		     [[e,f,g],[h],[i]]),
-    ?line true = path(G, e, e),
-    ?line false = path(G, e, j),
-    ?line false = path(G, a, a),
-    ?line false = digraph_utils:topsort(G),
-    ?line false = digraph_utils:is_acyclic(G),
-    ?line ok = eval(digraph_utils:loop_vertices(G), [h,i]),
-    ?line ok = eval(digraph_utils:reaching([e], G), [e,f,g]),
-    ?line ok = eval(digraph_utils:reaching_neighbours([e], G), [e,f,g]),
-    ?line ok = eval(digraph_utils:reachable([e], G), [e,f,g]),
-    ?line ok = eval(digraph_utils:reachable_neighbours([e], G), [e,f,g]),
-    ?line ok = eval(digraph_utils:reaching([b], G), [b]),
-    ?line ok = eval(digraph_utils:reaching_neighbours([b], G), []),
-    ?line ok = eval(digraph_utils:reachable([b], G), [b,c,d]),
-    ?line ok = eval(digraph_utils:reachable_neighbours([b], G), [c,d]),
-    ?line ok = eval(digraph_utils:reaching([h], G), [h]),
-    ?line ok = eval(digraph_utils:reaching_neighbours([h], G), [h]),
-    ?line ok = eval(digraph_utils:reachable([h], G), [h]),
-    ?line ok = eval(digraph_utils:reachable_neighbours([h], G), [h]),
-    ?line ok = eval(digraph_utils:reachable([e,f], G), [e,f,g]),
-    ?line ok = eval(digraph_utils:reachable_neighbours([e,f], G), [e,f,g]),
-    ?line ok = eval(digraph_utils:reachable([h,h,h], G), [h]),
-    ?line true = digraph:delete(G),
+    ok = evall(digraph_utils:cyclic_strong_components(G),
+	       [[e,f,g],[h],[i]]),
+    true = path(G, e, e),
+    false = path(G, e, j),
+    false = path(G, a, a),
+    false = digraph_utils:topsort(G),
+    false = digraph_utils:is_acyclic(G),
+    ok = eval(digraph_utils:loop_vertices(G), [h,i]),
+    ok = eval(digraph_utils:reaching([e], G), [e,f,g]),
+    ok = eval(digraph_utils:reaching_neighbours([e], G), [e,f,g]),
+    ok = eval(digraph_utils:reachable([e], G), [e,f,g]),
+    ok = eval(digraph_utils:reachable_neighbours([e], G), [e,f,g]),
+    ok = eval(digraph_utils:reaching([b], G), [b]),
+    ok = eval(digraph_utils:reaching_neighbours([b], G), []),
+    ok = eval(digraph_utils:reachable([b], G), [b,c,d]),
+    ok = eval(digraph_utils:reachable_neighbours([b], G), [c,d]),
+    ok = eval(digraph_utils:reaching([h], G), [h]),
+    ok = eval(digraph_utils:reaching_neighbours([h], G), [h]),
+    ok = eval(digraph_utils:reachable([h], G), [h]),
+    ok = eval(digraph_utils:reachable_neighbours([h], G), [h]),
+    ok = eval(digraph_utils:reachable([e,f], G), [e,f,g]),
+    ok = eval(digraph_utils:reachable_neighbours([e,f], G), [e,f,g]),
+    ok = eval(digraph_utils:reachable([h,h,h], G), [h]),
+    true = digraph:delete(G),
     ok.
 
-loop(doc) -> [];
-loop(suite) -> [];
 loop(Config) when is_list(Config) ->
-    ?line G = digraph:new(),
-    ?line add_vertices(G, [a,b]),
-    ?line add_edges(G, [{a,a},{b,b}]),
-    ?line ok = evall(digraph_utils:components(G), [[a],[b]]),
-    ?line ok = evall(digraph_utils:strong_components(G), [[a],[b]]),
-    ?line ok = evall(digraph_utils:cyclic_strong_components(G), [[a],[b]]),
-    ?line [_,_] = digraph_utils:topsort(G),
-    ?line false = digraph_utils:is_acyclic(G),	
-    ?line ok = eval(digraph_utils:loop_vertices(G), [a,b]),
-    ?line [_,_] = digraph_utils:preorder(G),
-    ?line [_,_] = digraph_utils:postorder(G),
-    ?line ok = eval(digraph_utils:reaching([b], G), [b]),
-    ?line ok = eval(digraph_utils:reaching_neighbours([b], G), [b]),
-    ?line ok = eval(digraph_utils:reachable([b], G), [b]),
-    ?line ok = eval(digraph_utils:reachable_neighbours([b], G), [b]),
-    ?line true = path(G, a, a),
-    ?line true = digraph:delete(G),
+    G = digraph:new(),
+    add_vertices(G, [a,b]),
+    add_edges(G, [{a,a},{b,b}]),
+    ok = evall(digraph_utils:components(G), [[a],[b]]),
+    ok = evall(digraph_utils:strong_components(G), [[a],[b]]),
+    ok = evall(digraph_utils:cyclic_strong_components(G), [[a],[b]]),
+    [_,_] = digraph_utils:topsort(G),
+    false = digraph_utils:is_acyclic(G),
+    ok = eval(digraph_utils:loop_vertices(G), [a,b]),
+    [_,_] = digraph_utils:preorder(G),
+    [_,_] = digraph_utils:postorder(G),
+    ok = eval(digraph_utils:reaching([b], G), [b]),
+    ok = eval(digraph_utils:reaching_neighbours([b], G), [b]),
+    ok = eval(digraph_utils:reachable([b], G), [b]),
+    ok = eval(digraph_utils:reachable_neighbours([b], G), [b]),
+    true = path(G, a, a),
+    true = digraph:delete(G),
     ok.
 
-isolated(doc) -> [];
-isolated(suite) -> [];
 isolated(Config) when is_list(Config) ->
-    ?line G = digraph:new(),
-    ?line add_vertices(G, [a,b]),
-    ?line ok = evall(digraph_utils:components(G), [[a],[b]]),
-    ?line ok = evall(digraph_utils:strong_components(G), [[a],[b]]),
-    ?line ok = evall(digraph_utils:cyclic_strong_components(G), []),
-    ?line [_,_] = digraph_utils:topsort(G),
-    ?line true = digraph_utils:is_acyclic(G),	
-    ?line ok = eval(digraph_utils:loop_vertices(G), []),
-    ?line [_,_] = digraph_utils:preorder(G),
-    ?line [_,_] = digraph_utils:postorder(G),
-    ?line ok = eval(digraph_utils:reaching([b], G), [b]),
-    ?line ok = eval(digraph_utils:reaching_neighbours([b], G), []),
-    ?line ok = eval(digraph_utils:reachable([b], G), [b]),
-    ?line ok = eval(digraph_utils:reachable_neighbours([b], G), []),
-    ?line false = path(G, a, a),
-    ?line true = digraph:delete(G),
+    G = digraph:new(),
+    add_vertices(G, [a,b]),
+    ok = evall(digraph_utils:components(G), [[a],[b]]),
+    ok = evall(digraph_utils:strong_components(G), [[a],[b]]),
+    ok = evall(digraph_utils:cyclic_strong_components(G), []),
+    [_,_] = digraph_utils:topsort(G),
+    true = digraph_utils:is_acyclic(G),
+    ok = eval(digraph_utils:loop_vertices(G), []),
+    [_,_] = digraph_utils:preorder(G),
+    [_,_] = digraph_utils:postorder(G),
+    ok = eval(digraph_utils:reaching([b], G), [b]),
+    ok = eval(digraph_utils:reaching_neighbours([b], G), []),
+    ok = eval(digraph_utils:reachable([b], G), [b]),
+    ok = eval(digraph_utils:reachable_neighbours([b], G), []),
+    false = path(G, a, a),
+    true = digraph:delete(G),
     ok.
 
-topsort(doc) -> [];
-topsort(suite) -> [];
 topsort(Config) when is_list(Config) ->
-    ?line G = digraph:new(),
-    ?line add_edges(G, [{a,b},{b,c},{c,d},{d,e},{e,f}]),
-    ?line ok = eval(digraph_utils:topsort(G), [a,b,c,d,e,f]),
-    ?line true = digraph:delete(G),
+    G = digraph:new(),
+    add_edges(G, [{a,b},{b,c},{c,d},{d,e},{e,f}]),
+    ok = eval(digraph_utils:topsort(G), [a,b,c,d,e,f]),
+    true = digraph:delete(G),
     ok.
 
-subgraph(doc) -> [];
-subgraph(suite) -> [];
 subgraph(Config) when is_list(Config) ->
-    ?line G = digraph:new([acyclic]),
-    ?line add_edges(G, [{b,c},{b,d},{e,f},{f,fg,fgl,g},{f,fg2,fgl2,g},{g,e},
-			{h,h},{i,i},{i,j}]),
-    ?line add_vertices(G, [{b,bl},{f,fl}]),
-    ?line SG = digraph_utils:subgraph(G, [u1,b,c,u2,f,g,i,u3]),
-    ?line [b,c,f,g,i] = lists:sort(digraph:vertices(SG)),
-    ?line {b,bl} = digraph:vertex(SG, b),
-    ?line {c,[]} = digraph:vertex(SG, c),
-    ?line {fg,f,g,fgl} = digraph:edge(SG, fg),
-    ?line {fg2,f,g,fgl2} = digraph:edge(SG, fg2),
-    ?line {_, {_, acyclic}} = lists:keysearch(cyclicity, 1, digraph:info(SG)),
-    ?line true = digraph:delete(SG),
-
-    ?line SG1 = digraph_utils:subgraph(G, [f, g, h], 
-				       [{type, []}, {keep_labels, false}]),
-    ?line [f,g,h] = lists:sort(digraph:vertices(SG1)),
-    ?line {f,[]} = digraph:vertex(SG1, f),
-    ?line {fg,f,g,[]} = digraph:edge(SG1, fg),
-    ?line {_, {_, cyclic}} = lists:keysearch(cyclicity, 1, digraph:info(SG1)),
-    ?line true = digraph:delete(SG1),
-    
-    ?line SG2 = digraph_utils:subgraph(G, [f, g, h], 
-				       [{type, [acyclic]}, 
-					{keep_labels, true}]),
-    ?line [f,g,h] = lists:sort(digraph:vertices(SG2)),
-    ?line {f,fl} = digraph:vertex(SG2, f),
-    ?line {fg,f,g,fgl} = digraph:edge(SG2, fg),
-    ?line {_, {_, acyclic}} = lists:keysearch(cyclicity, 1, digraph:info(SG2)),
-    ?line true = digraph:delete(SG2),
-    
-    ?line {'EXIT',{badarg,_}} =
+    G = digraph:new([acyclic]),
+    add_edges(G, [{b,c},{b,d},{e,f},{f,fg,fgl,g},{f,fg2,fgl2,g},{g,e},
+		  {h,h},{i,i},{i,j}]),
+    add_vertices(G, [{b,bl},{f,fl}]),
+    SG = digraph_utils:subgraph(G, [u1,b,c,u2,f,g,i,u3]),
+    [b,c,f,g,i] = lists:sort(digraph:vertices(SG)),
+    {b,bl} = digraph:vertex(SG, b),
+    {c,[]} = digraph:vertex(SG, c),
+    {fg,f,g,fgl} = digraph:edge(SG, fg),
+    {fg2,f,g,fgl2} = digraph:edge(SG, fg2),
+    {_, {_, acyclic}} = lists:keysearch(cyclicity, 1, digraph:info(SG)),
+    true = digraph:delete(SG),
+
+    SG1 = digraph_utils:subgraph(G, [f, g, h],
+				 [{type, []}, {keep_labels, false}]),
+    [f,g,h] = lists:sort(digraph:vertices(SG1)),
+    {f,[]} = digraph:vertex(SG1, f),
+    {fg,f,g,[]} = digraph:edge(SG1, fg),
+    {_, {_, cyclic}} = lists:keysearch(cyclicity, 1, digraph:info(SG1)),
+    true = digraph:delete(SG1),
+
+    SG2 = digraph_utils:subgraph(G, [f, g, h],
+				 [{type, [acyclic]},
+				  {keep_labels, true}]),
+    [f,g,h] = lists:sort(digraph:vertices(SG2)),
+    {f,fl} = digraph:vertex(SG2, f),
+    {fg,f,g,fgl} = digraph:edge(SG2, fg),
+    {_, {_, acyclic}} = lists:keysearch(cyclicity, 1, digraph:info(SG2)),
+    true = digraph:delete(SG2),
+
+    {'EXIT',{badarg,_}} =
 	(catch digraph_utils:subgraph(G, [f], [{invalid, opt}])),
-    ?line {'EXIT',{badarg,_}} =
+    {'EXIT',{badarg,_}} =
 	(catch digraph_utils:subgraph(G, [f], [{keep_labels, not_Bool}])),
-    ?line {'EXIT',{badarg,_}} =
+    {'EXIT',{badarg,_}} =
 	(catch digraph_utils:subgraph(G, [f], [{type, not_type}])),
-    ?line {'EXIT',{badarg,_}} =
+    {'EXIT',{badarg,_}} =
 	(catch digraph_utils:subgraph(G, [f], [{type, [not_type]}])),
-    ?line {'EXIT',{badarg,_}} =
+    {'EXIT',{badarg,_}} =
 	(catch digraph_utils:subgraph(G, [f], not_a_list)),
 
-    ?line true = digraph:delete(G),
+    true = digraph:delete(G),
 
     ok.
 
-condensation(doc) -> [];
-condensation(suite) -> [];
 condensation(Config) when is_list(Config) ->
-    ?line G = digraph:new([]),
-    ?line add_edges(G, [{b,c},{b,d},{e,f},{f,fg,fgl,g},{f,fg2,fgl2,g},{g,e},
-			{h,h},{j,i},{i,j}]),
-    ?line add_vertices(G, [q]),
-    ?line CG = digraph_utils:condensation(G),
-    ?line Vs = sort_2(digraph:vertices(CG)),
-    ?line [[b],[c],[d],[e,f,g],[h],[i,j],[q]] = Vs,
-    ?line Fun = fun(E) -> 
-			{_E, V1, V2, _L} = digraph:edge(CG, E), 
-			{lists:sort(V1), lists:sort(V2)} 
-		end,
-    ?line Es = lists:map(Fun, digraph:edges(CG)),
-    ?line [{[b],[c]},{[b],[d]}] = lists:sort(Es),
-    ?line true = digraph:delete(CG),
-    ?line true = digraph:delete(G),
+    G = digraph:new([]),
+    add_edges(G, [{b,c},{b,d},{e,f},{f,fg,fgl,g},{f,fg2,fgl2,g},{g,e},
+		  {h,h},{j,i},{i,j}]),
+    add_vertices(G, [q]),
+    CG = digraph_utils:condensation(G),
+    Vs = sort_2(digraph:vertices(CG)),
+    [[b],[c],[d],[e,f,g],[h],[i,j],[q]] = Vs,
+    Fun = fun(E) ->
+		  {_E, V1, V2, _L} = digraph:edge(CG, E),
+		  {lists:sort(V1), lists:sort(V2)}
+	  end,
+    Es = lists:map(Fun, digraph:edges(CG)),
+    [{[b],[c]},{[b],[d]}] = lists:sort(Es),
+    true = digraph:delete(CG),
+    true = digraph:delete(G),
     ok.
 
-tree(doc) -> ["OTP-7081"];
-tree(suite) -> [];
+%% OTP-7081
 tree(Config) when is_list(Config) ->
-    ?line false = is_tree([], []),
-    ?line true = is_tree([a], []),
-    ?line false = is_tree([a,b], []),
-    ?line true = is_tree([{a,b}]),
-    ?line false = is_tree([{a,b},{b,a}]),
-    ?line true = is_tree([{a,b},{a,c},{b,d},{b,e}]),
-    ?line false = is_tree([{a,b},{a,c},{b,d},{b,e}, {d,e}]),
-    ?line false = is_tree([{a,b},{a,c},{b,d},{b,e}, {b,e}]),
-    ?line true = is_tree([{a,c},{c,b}]),
-    ?line true = is_tree([{b,a},{c,a}]),
+    false = is_tree([], []),
+    true = is_tree([a], []),
+    false = is_tree([a,b], []),
+    true = is_tree([{a,b}]),
+    false = is_tree([{a,b},{b,a}]),
+    true = is_tree([{a,b},{a,c},{b,d},{b,e}]),
+    false = is_tree([{a,b},{a,c},{b,d},{b,e}, {d,e}]),
+    false = is_tree([{a,b},{a,c},{b,d},{b,e}, {b,e}]),
+    true = is_tree([{a,c},{c,b}]),
+    true = is_tree([{b,a},{c,a}]),
     %% Parallel edges. Acyclic and with one componets
     %% (according to the digraph module).
-    ?line false = is_tree([{a,b},{a,b}]),
-
-    ?line no = arborescence_root([], []),
-    ?line {yes, a} = arborescence_root([a], []),
-    ?line no = arborescence_root([a,b], []),
-    ?line {yes, a} = arborescence_root([{a,b}]),
-    ?line no = arborescence_root([{a,b},{b,a}]),
-    ?line {yes, a} = arborescence_root([{a,b},{a,c},{b,d},{b,e}]),
-    ?line no = arborescence_root([{a,b},{a,c},{b,d},{b,e}, {d,e}]),
-    ?line no = arborescence_root([{a,b},{a,c},{b,d},{b,e}, {b,e}]),
-    ?line {yes, a} = arborescence_root([{a,c},{c,b}]),
-    ?line no = arborescence_root([{b,a},{c,a}]),
-
-    ?line false = is_arborescence([], []),
-    ?line true = is_arborescence([a], []),
-    ?line false = is_arborescence([a,b], []),
-    ?line true = is_arborescence([{a,b}]),
-    ?line false = is_arborescence([{a,b},{b,a}]),
-    ?line true = is_arborescence([{a,b},{a,c},{b,d},{b,e}]),
-    ?line false = is_arborescence([{a,b},{a,c},{b,d},{b,e}, {d,e}]),
-    ?line false = is_arborescence([{a,b},{a,c},{b,d},{b,e}, {b,e}]),
-    ?line true = is_arborescence([{a,c},{c,b}]),
-    ?line false = is_arborescence([{b,a},{c,a}]),
+    false = is_tree([{a,b},{a,b}]),
+
+    no = arborescence_root([], []),
+    {yes, a} = arborescence_root([a], []),
+    no = arborescence_root([a,b], []),
+    {yes, a} = arborescence_root([{a,b}]),
+    no = arborescence_root([{a,b},{b,a}]),
+    {yes, a} = arborescence_root([{a,b},{a,c},{b,d},{b,e}]),
+    no = arborescence_root([{a,b},{a,c},{b,d},{b,e}, {d,e}]),
+    no = arborescence_root([{a,b},{a,c},{b,d},{b,e}, {b,e}]),
+    {yes, a} = arborescence_root([{a,c},{c,b}]),
+    no = arborescence_root([{b,a},{c,a}]),
+
+    false = is_arborescence([], []),
+    true = is_arborescence([a], []),
+    false = is_arborescence([a,b], []),
+    true = is_arborescence([{a,b}]),
+    false = is_arborescence([{a,b},{b,a}]),
+    true = is_arborescence([{a,b},{a,c},{b,d},{b,e}]),
+    false = is_arborescence([{a,b},{a,c},{b,d},{b,e}, {d,e}]),
+    false = is_arborescence([{a,b},{a,c},{b,d},{b,e}, {b,e}]),
+    true = is_arborescence([{a,c},{c,b}]),
+    false = is_arborescence([{b,a},{c,a}]),
 
     %% Parallel edges.
-    ?line false = is_arborescence([{a,b},{a,b}]),
+    false = is_arborescence([{a,b},{a,b}]),
 
     ok.
 
@@ -325,7 +312,7 @@ eval(L, E) ->
 evall(L, E) ->
     F = fun(L1) -> lists:sort(L1) end,
     Fun = fun(LL) -> F(lists:map(F, LL)) end,
-    
+
     Expected = Fun(E),
     Got = Fun(L),
     if 
diff --git a/lib/stdlib/test/dummy1_h.erl b/lib/stdlib/test/dummy1_h.erl
index 5db23872c4..cdf9a305e1 100644
--- a/lib/stdlib/test/dummy1_h.erl
+++ b/lib/stdlib/test/dummy1_h.erl
@@ -37,7 +37,7 @@ handle_event(delete_event, _Parent) ->
     remove_handler;
 handle_event(do_crash, _State) ->
     erlang:error({badmatch,4});
-%Inverse of dummy_h
+%%Inverse of dummy_h
 handle_event(hibernate, Parent) ->
     {ok,Parent};
 handle_event(wakeup, Parent) ->
diff --git a/lib/stdlib/test/dummy_via.erl b/lib/stdlib/test/dummy_via.erl
index e405811cbe..026b329688 100644
--- a/lib/stdlib/test/dummy_via.erl
+++ b/lib/stdlib/test/dummy_via.erl
@@ -50,8 +50,10 @@ call(Req) ->
 	{'DOWN', MRef, _, _, _} ->
 	    erlang:error(badarg);
 	{MRef, badarg} ->
+	    erlang:demonitor(MRef),
 	    erlang:error(badarg);
 	{MRef, Reply} ->
+	    erlang:demonitor(MRef),
 	    Reply
     after 5000 ->
 	    erlang:error(timeout)
diff --git a/lib/stdlib/test/edlin_expand_SUITE.erl b/lib/stdlib/test/edlin_expand_SUITE.erl
index 6fdc4c35df..a53c5333d8 100644
--- a/lib/stdlib/test/edlin_expand_SUITE.erl
+++ b/lib/stdlib/test/edlin_expand_SUITE.erl
@@ -19,26 +19,21 @@
 %%
 -module(edlin_expand_SUITE).
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2,
 	 init_per_group/2,end_per_group/2]).
-
 -export([normal/1, quoted_fun/1, quoted_module/1, quoted_both/1]).
 
--export([init_per_testcase/2, end_per_testcase/2]).
-
--include_lib("test_server/include/test_server.hrl").
-
-%% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
+-include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [normal, quoted_fun, quoted_module, quoted_both].
@@ -63,10 +58,6 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-normal(doc) ->
-    [""];
-normal(suite) ->
-    [];
 normal(Config) when is_list(Config) ->
     {module,expand_test} = c:l(expand_test),
     %% These tests might fail if another module with the prefix
@@ -85,10 +76,7 @@ normal(Config) when is_list(Config) ->
     {yes,"arity_entirely()",[]} = do_expand("expand_test:expand0"),
     ok.
 
-quoted_fun(doc) ->
-    ["Normal module name, some function names using quoted atoms"];
-quoted_fun(suite) ->
-    [];
+%% Normal module name, some function names using quoted atoms.
 quoted_fun(Config) when is_list(Config) ->
     {module,expand_test} = c:l(expand_test),
     {module,expand_test1} = c:l(expand_test1),
@@ -121,10 +109,6 @@ quoted_fun(Config) when is_list(Config) ->
     {yes,"(",[]} = do_expand("expand_test:module_info"),
     ok.
 
-quoted_module(doc) ->
-    [""];
-quoted_module(suite) ->
-    [];
 quoted_module(Config) when is_list(Config) ->
     {module,'ExpandTestCaps'} = c:l('ExpandTestCaps'),
     {yes, "Caps':", []} = do_expand("'ExpandTest"),
@@ -138,8 +122,6 @@ quoted_module(Config) when is_list(Config) ->
 	     {"a_less_fun_name",1}]} = do_expand("'ExpandTestCaps':a_"),
     ok.
 
-quoted_both(suite) ->
-    [];
 quoted_both(Config) when is_list(Config) ->
     {module,'ExpandTestCaps'} = c:l('ExpandTestCaps'),
     {module,'ExpandTestCaps1'} = c:l('ExpandTestCaps1'),
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index 4e5df661b3..3e1aaef378 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -25,16 +25,16 @@
 	 upcase_mac_1/1, upcase_mac_2/1,
 	 variable_1/1, otp_4870/1, otp_4871/1, otp_5362/1,
          pmod/1, not_circular/1, skip_header/1, otp_6277/1, otp_7702/1,
-         otp_8130/1, overload_mac/1, otp_8388/1, otp_8470/1, otp_8503/1,
+         otp_8130/1, overload_mac/1, otp_8388/1, otp_8470/1,
          otp_8562/1, otp_8665/1, otp_8911/1, otp_10302/1, otp_10820/1,
-         otp_11728/1, encoding/1]).
+         otp_11728/1, encoding/1, extends/1, function_macro/1]).
 
 -export([epp_parse_erl_form/2]).
 
 %%
 %% Define to run outside of test server
 %%
-%-define(STANDALONE,1).
+%%-define(STANDALONE,1).
 
 -ifdef(STANDALONE).
 -compile(export_all).
@@ -47,30 +47,27 @@ config(priv_dir, _) ->
 config(data_dir, _) ->
     filename:absname("./epp_SUITE_data").
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -export([init_per_testcase/2, end_per_testcase/2]).
 
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
-
 init_per_testcase(_, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
-end_per_testcase(_, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+
+end_per_testcase(_, _Config) ->
     ok.
 -endif.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [rec_1, {group, upcase_mac}, include_local, predef_mac,
      {group, variable}, otp_4870, otp_4871, otp_5362, pmod,
      not_circular, skip_header, otp_6277, otp_7702, otp_8130,
-     overload_mac, otp_8388, otp_8470, otp_8503, otp_8562,
+     overload_mac, otp_8388, otp_8470, otp_8562,
      otp_8665, otp_8911, otp_10302, otp_10820, otp_11728,
-     encoding].
+     encoding, extends, function_macro].
 
 groups() -> 
     [{upcase_mac, [], [upcase_mac_1, upcase_mac_2]},
@@ -88,33 +85,26 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-rec_1(doc) ->
-    ["Recursive macros hang or crash epp (OTP-1398)."];
-rec_1(suite) ->
-    [];
+%% Recursive macros hang or crash epp (OTP-1398).
 rec_1(Config) when is_list(Config) ->
-    ?line File = filename:join(?config(data_dir, Config), "mac.erl"),
-    ?line {ok, List} = epp_parse_file(File, [], []),
+    File = filename:join(proplists:get_value(data_dir, Config), "mac.erl"),
+    {ok, List} = epp_parse_file(File, [], []),
     %% we should encounter errors
-    ?line {value, _} = lists:keysearch(error, 1, List),
-    ?line check_errors(List),
+    {value, _} = lists:keysearch(error, 1, List),
+    check_errors(List),
     ok.
 
-include_local(doc) ->
-    [];
-include_local(suite) ->
-    [];
 include_local(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line File = filename:join(DataDir, "include_local.erl"),
+    DataDir = proplists:get_value(data_dir, Config),
+    File = filename:join(DataDir, "include_local.erl"),
     FooHrl = filename:join([DataDir,"include","foo.hrl"]),
     BarHrl = filename:join([DataDir,"include","bar.hrl"]),
     %% include_local.erl includes include/foo.hrl which
     %% includes bar.hrl (also in include/) without requiring
     %% any additional include path, and overriding any file
     %% of the same name that the path points to
-    ?line {ok, List} = epp:parse_file(File, [DataDir], []),
-    ?line {value, {attribute,_,a,{true,true}}} =
+    {ok, List} = epp:parse_file(File, [DataDir], []),
+    {value, {attribute,_,a,{true,true}}} =
 	lists:keysearch(a,3,List),
     [{File,1},{FooHrl,1},{BarHrl,1},{FooHrl,5},{File,5}] =
         [ FileLine || {attribute,_,file,FileLine} <- List ],
@@ -170,108 +160,86 @@ epp_parse_erl_form(Epp, Parent) ->
 check_errors([]) ->
     ok;
 check_errors([{error, Info} | Rest]) ->
-    ?line {Line, Mod, Desc} = Info,
-    ?line case Line of
-              I when is_integer(I) -> ok;
-              {L,C} when is_integer(L), is_integer(C), C >= 1 -> ok
-          end,
-    ?line Str = lists:flatten(Mod:format_error(Desc)),
-    ?line [Str] = io_lib:format("~s", [Str]),
+    {Line, Mod, Desc} = Info,
+    case Line of
+	I when is_integer(I) -> ok;
+	{L,C} when is_integer(L), is_integer(C), C >= 1 -> ok
+    end,
+    Str = lists:flatten(Mod:format_error(Desc)),
+    [Str] = io_lib:format("~s", [Str]),
     check_errors(Rest);
 check_errors([_ | Rest]) ->
     check_errors(Rest).
 
 
-upcase_mac_1(doc) ->
-    [];
-upcase_mac_1(suite) ->
-    [];
 upcase_mac_1(Config) when is_list(Config) ->
-    ?line File = filename:join(?config(data_dir, Config), "mac2.erl"),
-    ?line {ok, List} = epp:parse_file(File, [], []),
-    ?line [_, {attribute, _, plupp, Tuple} | _] = List,
-    ?line Tuple = {1, 1, 3, 3},
+    File = filename:join(proplists:get_value(data_dir, Config), "mac2.erl"),
+    {ok, List} = epp:parse_file(File, [], []),
+    [_, {attribute, _, plupp, Tuple} | _] = List,
+    Tuple = {1, 1, 3, 3},
     ok.
 
-upcase_mac_2(doc) ->
-    [];
-upcase_mac_2(suite) ->
-    [];
 upcase_mac_2(Config) when is_list(Config) ->
-    ?line File = filename:join(?config(data_dir, Config), "mac2.erl"),
-    ?line {ok, List} = epp:parse_file(File, [], [{p, 5}, {'P', 6}]),
-    ?line [_, {attribute, _, plupp, Tuple} | _] = List,
-    ?line Tuple = {5, 5, 6, 6},
+    File = filename:join(proplists:get_value(data_dir, Config), "mac2.erl"),
+    {ok, List} = epp:parse_file(File, [], [{p, 5}, {'P', 6}]),
+    [_, {attribute, _, plupp, Tuple} | _] = List,
+    Tuple = {5, 5, 6, 6},
     ok.
 
-predef_mac(doc) ->
-    [];
-predef_mac(suite) ->
-    [];
 predef_mac(Config) when is_list(Config) ->
-    ?line File = filename:join(?config(data_dir, Config), "mac3.erl"),
-    ?line {ok, List} = epp:parse_file(File, [], []),
-    ?line [_,
-	   {attribute, Anno, l, Line1},
-	   {attribute, _, f, File},
-	   {attribute, _, machine1, _},
-	   {attribute, _, module, mac3},
-	   {attribute, _, m, mac3},
-	   {attribute, _, ms, "mac3"},
-	   {attribute, _, machine2, _}
-	   | _] = List,
+    File = filename:join(proplists:get_value(data_dir, Config), "mac3.erl"),
+    {ok, List} = epp:parse_file(File, [], []),
+    [_,
+     {attribute, Anno, l, Line1},
+     {attribute, _, f, File},
+     {attribute, _, machine1, _},
+     {attribute, _, module, mac3},
+     {attribute, _, m, mac3},
+     {attribute, _, ms, "mac3"},
+     {attribute, _, machine2, _}
+     | _] = List,
     Line1 = erl_anno:line(Anno),
     ok.
 
-variable_1(doc) ->
-    [];
-variable_1(suite) ->
-    [];
 variable_1(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line File = filename:join(DataDir, "variable_1.erl"),
-    ?line true = os:putenv("VAR", DataDir),
+    DataDir = proplists:get_value(data_dir, Config),
+    File = filename:join(DataDir, "variable_1.erl"),
+    true = os:putenv("VAR", DataDir),
     %% variable_1.erl includes variable_1_include.hrl and
     %% variable_1_include_dir.hrl.
-    ?line {ok, List} = epp:parse_file(File, [], []),
-    ?line {value, {attribute,_,a,{value1,value2}}} =
+    {ok, List} = epp:parse_file(File, [], []),
+    {value, {attribute,_,a,{value1,value2}}} =
 	lists:keysearch(a,3,List),
     ok.
 
-otp_4870(doc) ->
-    ["undef without module declaration"];
-otp_4870(suite) ->
-    [];
+%% undef without module declaration.
 otp_4870(Config) when is_list(Config) ->
     Ts = [{otp_4870,
            <<"-undef(foo).
            ">>,
            []}],
-    ?line [] = check(Config, Ts),
+    [] = check(Config, Ts),
     ok.
 
-otp_4871(doc) ->
-    ["crashing erl_scan"];
-otp_4871(suite) ->
-    [];
+%% crashing erl_scan
 otp_4871(Config) when is_list(Config) ->
-    ?line Dir = ?config(priv_dir, Config),
-    ?line File = filename:join(Dir, "otp_4871.erl"),
-    ?line ok = file:write_file(File, "-module(otp_4871)."),
+    Dir = proplists:get_value(priv_dir, Config),
+    File = filename:join(Dir, "otp_4871.erl"),
+    ok = file:write_file(File, "-module(otp_4871)."),
     %% Testing crash in erl_scan. Unfortunately there currently is
     %% no known way to crash erl_scan so it is emulated by killing the
     %% file io server. This assumes lots of things about how
     %% the processes are started and how monitors are set up,
     %% so there are some sanity checks before killing.
-    ?line {ok,Epp} = epp:open(File, []),
+    {ok,Epp} = epp:open(File, []),
     timer:sleep(1),
-    ?line true = current_module(Epp, epp),
-    ?line {monitored_by,[Io]} = process_info(Epp, monitored_by),
-    ?line true = current_module(Io, file_io_server),
-    ?line exit(Io, emulate_crash),
+    true = current_module(Epp, epp),
+    {monitored_by,[Io]} = process_info(Epp, monitored_by),
+    true = current_module(Io, file_io_server),
+    exit(Io, emulate_crash),
     timer:sleep(1),
-    ?line {error,{_Line,epp,cannot_parse}} = otp_4871_parse_file(Epp),
-    ?line epp:close(Epp),
+    {error,{_Line,epp,cannot_parse}} = otp_4871_parse_file(Epp),
+    epp:close(Epp),
     ok.
 
 current_module(Pid, Mod) ->
@@ -288,12 +256,9 @@ otp_4871_parse_file(Epp) ->
 	Other -> Other
     end.
 
-otp_5362(doc) ->
-    ["OTP-5362. The -file attribute is recognized."];
-otp_5362(suite) ->
-    [];
+%% OTP-5362. The -file attribute is recognized.
 otp_5362(Config) when is_list(Config) ->
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
 
     Copts = [return, strong_validation,{i,Dir}],
 
@@ -317,12 +282,12 @@ otp_5362(Config) when is_list(Config) ->
     Incl3 = <<"glurk(Foo) -> % line 1
                   bar.
             ">>,
-    ?line ok = file:write_file(File_Incl, Incl),
-    ?line ok = file:write_file(File_Incl2, Incl2),
-    ?line ok = file:write_file(File_Incl3, Incl3),
+    ok = file:write_file(File_Incl, Incl),
+    ok = file:write_file(File_Incl2, Incl2),
+    ok = file:write_file(File_Incl3, Incl3),
 
-    ?line {ok, incl_5362, InclWarnings} = compile:file(File_Incl, Copts),
-    ?line true = message_compare(
+    {ok, incl_5362, InclWarnings} = compile:file(File_Incl, Copts),
+    true = message_compare(
                    [{File_Incl3,[{{1,1},erl_lint,{unused_function,{glurk,1}}},
                                  {{1,7},erl_lint,{unused_var,'Foo'}}]},
                     {File_Incl,[{{7,15},erl_lint,{unused_function,{hi,1}}},
@@ -352,11 +317,11 @@ otp_5362(Config) when is_list(Config) ->
                   -file(\"">>,File_Back,<<"\", 2).
                  ">>],
 
-    ?line ok = file:write_file(File_Back, Back),
-    ?line ok = file:write_file(File_Back_hrl, list_to_binary(Back_hrl)),
+    ok = file:write_file(File_Back, Back),
+    ok = file:write_file(File_Back_hrl, list_to_binary(Back_hrl)),
 
-    ?line {ok, back_5362, BackWarnings} = compile:file(File_Back, Copts),
-    ?line true = message_compare(
+    {ok, back_5362, BackWarnings} = compile:file(File_Back, Copts),
+    true = message_compare(
                    [{File_Back,[{{4,19},erl_lint,{unused_var,'V'}}]}],
                    BackWarnings),
     file:delete(File_Back),
@@ -380,11 +345,11 @@ otp_5362(Config) when is_list(Config) ->
                     foo.
               ">>],
 
-    ?line ok = file:write_file(File_Change, list_to_binary(Change)),
+    ok = file:write_file(File_Change, list_to_binary(Change)),
 
-    ?line {ok, change_5362, ChangeWarnings} =
+    {ok, change_5362, ChangeWarnings} =
         compile:file(File_Change, Copts),
-    ?line true = message_compare(
+    true = message_compare(
                    [{File_Change,[{{1002,21},erl_lint,{unused_var,'B'}}]},
                     {"other.file",[{{105,21},erl_lint,{unused_var,'A'}}]}],
                    lists:usort(ChangeWarnings)),
@@ -412,9 +377,9 @@ otp_5362(Config) when is_list(Config) ->
                -file(?FILE, ?LINE). c(C) -> % line 47
                    3.
             ">>,
-    ?line ok = file:write_file(File_Blank, Blank),
-    ?line {ok, blank_5362, BlankWarnings} = compile:file(File_Blank, Copts),
-    ?line true = message_compare(
+    ok = file:write_file(File_Blank, Blank),
+    {ok, blank_5362, BlankWarnings} = compile:file(File_Blank, Copts),
+    true = message_compare(
              [{File_Blank,[{{18,3},erl_lint,{unused_var,'Q'}},
                            {{20,18},erl_lint,{unused_var,'A'}},
                            {{44,18},erl_lint,{unused_var,'B'}},
@@ -438,16 +403,16 @@ otp_5362(Config) when is_list(Config) ->
     FILE1 = <<"ii() -> ?FILE.
               ">>,
     FILE_Mod = file_5362,
-    ?line ok = file:write_file(FILE_incl, FILE),
-    ?line ok = file:write_file(FILE_incl1, FILE1),
+    ok = file:write_file(FILE_incl, FILE),
+    ok = file:write_file(FILE_incl1, FILE1),
     FILE_Copts = [return, {i,Dir},{outdir,Dir}],
-    ?line {ok, file_5362, []} = compile:file(FILE_incl, FILE_Copts),
+    {ok, file_5362, []} = compile:file(FILE_incl, FILE_Copts),
     AbsFile = filename:rootname(FILE_incl, ".erl"),
-    ?line {module, FILE_Mod} = code:load_abs(AbsFile, FILE_Mod),
-    ?line II = FILE_Mod:ii(),
-    ?line "file_incl_5362.erl" = filename:basename(II),
-    ?line FF = FILE_Mod:ff(),
-    ?line "other_file" = filename:basename(FF),
+    {module, FILE_Mod} = code:load_abs(AbsFile, FILE_Mod),
+    II = FILE_Mod:ii(),
+    "file_incl_5362.erl" = filename:basename(II),
+    FF = FILE_Mod:ff(),
+    "other_file" = filename:basename(FF),
     code:purge(file_5362),
 
     file:delete(FILE_incl),
@@ -456,12 +421,12 @@ otp_5362(Config) when is_list(Config) ->
     ok.
 
 pmod(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line Pmod = filename:join(DataDir, "pmod.erl"),
-    ?line case epp:parse_file([Pmod], [], []) of
+    DataDir = proplists:get_value(data_dir, Config),
+    Pmod = filename:join(DataDir, "pmod.erl"),
+    case epp:parse_file([Pmod], [], []) of
 	      {ok,Forms} ->
-		  %% ?line io:format("~p\n", [Forms]),
-		  ?line [] = [F || {error,_}=F <- Forms],
+		  %% io:format("~p\n", [Forms]),
+		  [] = [F || {error,_}=F <- Forms],
 		  ok
 	  end,
     ok.
@@ -474,17 +439,14 @@ not_circular(Config) when is_list(Config) ->
            <<"-define(S(S), ??S).\n"
              "t() -> \"string\" = ?S(string), ok.\n">>,
            ok}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-skip_header(doc) ->
-    ["Skip some bytes in the beginning of the file."];
-skip_header(suite) ->
-    [];
+%% Skip some bytes in the beginning of the file.
 skip_header(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line File = filename:join([PrivDir, "epp_test_skip_header.erl"]),
-    ?line ok = file:write_file(File,
+    PrivDir = proplists:get_value(priv_dir, Config),
+    File = filename:join([PrivDir, "epp_test_skip_header.erl"]),
+    ok = file:write_file(File,
 			       <<"some bytes
                                   in the beginning of the file
                                   that should be skipped
@@ -494,23 +456,20 @@ skip_header(Config) when is_list(Config) ->
                                   main(_) -> ?MODULE.
 
                                   ">>),
-    ?line {ok, Fd} = file:open(File, [read]),
-    ?line io:get_line(Fd, ''),
-    ?line io:get_line(Fd, ''),
-    ?line io:get_line(Fd, ''),
-    ?line {ok, Epp} = epp:open(list_to_atom(File), Fd, 4, [], []),
-
-    ?line Forms = epp:parse_file(Epp),
-    ?line [] = [Reason || {error, Reason} <- Forms],
-    ?line ok = epp:close(Epp),
-    ?line ok = file:close(Fd),
+    {ok, Fd} = file:open(File, [read]),
+    io:get_line(Fd, ''),
+    io:get_line(Fd, ''),
+    io:get_line(Fd, ''),
+    {ok, Epp} = epp:open(list_to_atom(File), Fd, 4, [], []),
+
+    Forms = epp:parse_file(Epp),
+    [] = [Reason || {error, Reason} <- Forms],
+    ok = epp:close(Epp),
+    ok = file:close(Fd),
 
     ok.
 
-otp_6277(doc) ->
-    ["?MODULE before module declaration."];
-otp_6277(suite) ->
-    [];
+%% ?MODULE before module declaration.
 otp_6277(Config) when is_list(Config) ->
     Ts = [{otp_6277,
            <<"-undef(ASSERT).
@@ -518,15 +477,12 @@ otp_6277(Config) when is_list(Config) ->
 
               ?ASSERT().">>,
            [{error,{{4,16},epp,{undefined,'MODULE', none}}}]}],
-    ?line [] = check(Config, Ts),
+    [] = check(Config, Ts),
     ok.
 
-otp_7702(doc) ->
-    ["OTP-7702. Wrong line number in stringifying macro expansion."];
-otp_7702(suite) ->
-    [];
+%% OTP-7702. Wrong line number in stringifying macro expansion.
 otp_7702(Config) when is_list(Config) ->
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     File = filename:join(Dir, "file_7702.erl"),
     Contents = <<"-module(file_7702).
 
@@ -542,8 +498,8 @@ otp_7702(Config) when is_list(Config) ->
                        end).
                    t() ->
                        ?RECEIVE(foo, bar).">>,
-    ?line ok = file:write_file(File, Contents),
-    ?line {ok, file_7702, []} =
+    ok = file:write_file(File, Contents),
+    {ok, file_7702, []} =
         compile:file(File, [debug_info,return,{outdir,Dir}]),
 
     BeamFile = filename:join(Dir, "file_7702.beam"),
@@ -551,8 +507,7 @@ otp_7702(Config) when is_list(Config) ->
 
     {file_7702,[{abstract_code,{_,Forms}}]} = AC,
     Forms2 = unopaque_forms(Forms),
-    ?line
-        [{attribute,1,file,_},
+            [{attribute,1,file,_},
          _,
          _,
          {function,_,t,0,
@@ -586,10 +541,7 @@ otp_7702(Config) when is_list(Config) ->
 
     ok.
 
-otp_8130(doc) ->
-    ["OTP-8130. Misc tests."];
-otp_8130(suite) ->
-    [];
+%% OTP-8130. Misc tests.
 otp_8130(Config) when is_list(Config) ->
     true = os:putenv("epp_inc1", "stdlib"),
     Ts = [{otp_8130_1,
@@ -621,6 +573,10 @@ otp_8130(Config) when is_list(Config) ->
              "                2 end,\n"
              "          7),\n"
              "   {2,7} =\n"
+             "      ?M1(begin 1 = fun _Name () -> 1 end(),\n"
+             "                2 end,\n"
+             "          7),\n"
+             "   {2,7} =\n"
              "      ?M1(begin 1 = fun t0/0(),\n"
              "                2 end,\n"
              "          7),\n"
@@ -645,6 +601,9 @@ otp_8130(Config) when is_list(Config) ->
              "      ?M1(begin yes = try 1 of 1 -> yes after foo end,\n"
              "                2 end,\n"
              "          7),\n"
+             "   {[42],7} =\n"
+             "      ?M1([42],\n"
+             "          7),\n"
              "ok.\n">>,
            ok},
 
@@ -682,7 +641,7 @@ otp_8130(Config) when is_list(Config) ->
            {1,1}}
 
          ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
 
     Cs = [{otp_8130_c1,
            <<"-define(M1(A), if\n"
@@ -728,11 +687,16 @@ otp_8130(Config) when is_list(Config) ->
            {errors,[{{2,2},epp,{include,lib,"$apa/foo.hrl"}}],[]}},
 
 
-          {otp_8130_c9,
+          {otp_8130_c9a,
            <<"-define(S, ?S).\n"
              "t() -> ?S.\n">>,
            {errors,[{{2,9},epp,{circular,'S', none}}],[]}},
 
+          {otp_8130_c9b,
+           <<"-define(S(), ?S()).\n"
+             "t() -> ?S().\n">>,
+           {errors,[{{2,9},epp,{circular,'S', 0}}],[]}},
+
           {otp_8130_c10,
            <<"\n-file.">>,
            {errors,[{{2,2},epp,{bad,file}}],[]}},
@@ -799,6 +763,10 @@ otp_8130(Config) when is_list(Config) ->
            <<"\n-include(\"no such file.erl\").\n">>,
            {errors,[{{2,2},epp,{include,file,"no such file.erl"}}],[]}},
 
+          {otp_8130_c25,
+           <<"\n-define(A.\n">>,
+           {errors,[{{2,2},epp,{bad,define}}],[]}},
+
           {otp_8130_7,
            <<"-record(b, {b}).\n"
              "-define(A, {{a,#b.b.\n"
@@ -807,7 +775,7 @@ otp_8130(Config) when is_list(Config) ->
                     {{3,19},epp,{undefined,'A',none}}],[]}}
 
           ],
-    ?line [] = compile(Config, Cs),
+    [] = compile(Config, Cs),
 
     Cks = [{otp_check_1,
             <<"\n-include_lib(\"epp_test.erl\").\n">>,
@@ -817,24 +785,25 @@ otp_8130(Config) when is_list(Config) ->
             <<"\n-include(\"epp_test.erl\").\n">>,
             [{error,{{2,2},epp,{depth,"include"}}}]}
            ],
-    ?line [] = check(Config, Cks),
+    [] = check(Config, Cks),
 
-    ?line Dir = ?config(priv_dir, Config),
-    ?line File = filename:join(Dir, "otp_8130.erl"),
-    ?line ok = file:write_file(File,
+    Dir = proplists:get_value(priv_dir, Config),
+    File = filename:join(Dir, "otp_8130.erl"),
+    ok = file:write_file(File,
                                "-module(otp_8130).\n"
                                "-define(a, 3.14).\n"
                                "t() -> ?a.\n"),
-    ?line {ok,Epp} = epp:open(File, []),
-    ?line ['BASE_MODULE','BASE_MODULE_STRING','BEAM','FILE','LINE',
-           'MACHINE','MODULE','MODULE_STRING'] = macs(Epp),
-    ?line {ok,[{'-',_},{atom,_,file}|_]} = epp:scan_erl_form(Epp),
-    ?line {ok,[{'-',_},{atom,_,module}|_]} = epp:scan_erl_form(Epp),
-    ?line {ok,[{atom,_,t}|_]} = epp:scan_erl_form(Epp),
-    ?line {eof,_} = epp:scan_erl_form(Epp),
-    ?line ['BASE_MODULE','BASE_MODULE_STRING','BEAM','FILE','LINE',
-           'MACHINE','MODULE','MODULE_STRING',a] = macs(Epp),
-    ?line epp:close(Epp),
+    {ok,Epp} = epp:open(File, []),
+    PreDefMacs = macs(Epp),
+    ['BASE_MODULE','BASE_MODULE_STRING','BEAM','FILE',
+     'FUNCTION_ARITY','FUNCTION_NAME',
+     'LINE','MACHINE','MODULE','MODULE_STRING'] = PreDefMacs,
+    {ok,[{'-',_},{atom,_,file}|_]} = epp:scan_erl_form(Epp),
+    {ok,[{'-',_},{atom,_,module}|_]} = epp:scan_erl_form(Epp),
+    {ok,[{atom,_,t}|_]} = epp:scan_erl_form(Epp),
+    {eof,_} = epp:scan_erl_form(Epp),
+    [a] = macs(Epp) -- PreDefMacs,
+    epp:close(Epp),
 
     %% escript
     ModuleStr = "any_name",
@@ -843,27 +812,27 @@ otp_8130(Config) when is_list(Config) ->
             PreDefMacros = [{'MODULE', Module, redefine},
                             {'MODULE_STRING', ModuleStr, redefine},
                             a, {b,2}],
-            ?line {ok,Epp2} = epp:open(File, [], PreDefMacros),
-            ?line [{atom,_,true}] = macro(Epp2, a),
-            ?line [{integer,_,2}] = macro(Epp2, b),
-            ?line false = macro(Epp2, c),
-            ?line epp:close(Epp2)
+            {ok,Epp2} = epp:open(File, [], PreDefMacros),
+            [{atom,_,true}] = macro(Epp2, a),
+            [{integer,_,2}] = macro(Epp2, b),
+            false = macro(Epp2, c),
+            epp:close(Epp2)
     end(),
     fun() ->
             PreDefMacros = [{a,b,c}],
-            ?line {error,{bad,{a,b,c}}} = epp:open(File, [], PreDefMacros)
+            {error,{bad,{a,b,c}}} = epp:open(File, [], PreDefMacros)
     end(),
     fun() ->
             PreDefMacros = [a, {a,1}],
-            ?line {error,{redefine,a}} = epp:open(File, [], PreDefMacros)
+            {error,{redefine,a}} = epp:open(File, [], PreDefMacros)
     end(),
     fun() ->
             PreDefMacros = [{a,1},a],
-            ?line {error,{redefine,a}} = epp:open(File, [], PreDefMacros)
+            {error,{redefine,a}} = epp:open(File, [], PreDefMacros)
     end(),
 
-    ?line {error,enoent} = epp:open("no such file", []),
-    ?line {error,enoent} = epp:parse_file("no such file", [], []),
+    {error,enoent} = epp:open("no such file", []),
+    {error,enoent} = epp:parse_file("no such file", [], []),
 
     _ = ifdef(Config),
 
@@ -1003,7 +972,7 @@ ifdef(Config) ->
              "t() -> a.\n">>,
            {errors,[{{2,2},epp,{'NYI','if'}}],[]}}
           ],
-    ?line [] = compile(Config, Cs),
+    [] = compile(Config, Cs),
 
     Ts =  [{ifdef_1,
             <<"-ifdef(a).\n"
@@ -1084,14 +1053,11 @@ ifdef(Config) ->
             ok}
 
            ],
-    ?line [] = run(Config, Ts).
+    [] = run(Config, Ts).
 
 
 
-overload_mac(doc) ->
-    ["Advanced test on overloading macros."];
-overload_mac(suite) ->
-    [];
+%% Advanced test on overloading macros.
 overload_mac(Config) when is_list(Config) ->
     Cs = [
           %% '-undef' removes all definitions of a macro
@@ -1122,7 +1088,7 @@ overload_mac(Config) when is_list(Config) ->
             "t() -> ?A(1).">>,
            {errors,[{{4,9},epp,{mismatch,'A'}}],[]}}
          ],
-    ?line [] = compile(Config, Cs),
+    [] = compile(Config, Cs),
 
     Ts = [
           {overload_mac_r1,
@@ -1146,27 +1112,24 @@ overload_mac(Config) when is_list(Config) ->
             "t() -> ?A(1).">>,
            1}
           ],
-    ?line [] = run(Config, Ts).
+    [] = run(Config, Ts).
 
 
-otp_8388(doc) ->
-    ["OTP-8388. More tests on overloaded macros."];
-otp_8388(suite) ->
-    [];
+%% OTP-8388. More tests on overloaded macros.
 otp_8388(Config) when is_list(Config) ->
-    Dir = ?config(priv_dir, Config),
-    ?line File = filename:join(Dir, "otp_8388.erl"),
-    ?line ok = file:write_file(File, <<"-module(otp_8388)."
+    Dir = proplists:get_value(priv_dir, Config),
+    File = filename:join(Dir, "otp_8388.erl"),
+    ok = file:write_file(File, <<"-module(otp_8388)."
                                        "-define(LINE, a).">>),
     fun() ->
             PreDefMacros = [{'LINE', a}],
-            ?line {error,{redefine_predef,'LINE'}} =
+            {error,{redefine_predef,'LINE'}} =
                 epp:open(File, [], PreDefMacros)
     end(),
 
     fun() ->
             PreDefMacros = ['LINE'],
-            ?line {error,{redefine_predef,'LINE'}} =
+            {error,{redefine_predef,'LINE'}} =
                 epp:open(File, [], PreDefMacros)
     end(),
 
@@ -1196,43 +1159,22 @@ otp_8388(Config) when is_list(Config) ->
              "test() -> ?BAR(1).\n">>,
            {errors,[{{4,12},epp,{undefined,'FOO',1}}],[]}}
          ],
-    ?line [] = compile(Config, Ts),
+    [] = compile(Config, Ts),
     ok.
 
-otp_8470(doc) ->
-    ["OTP-8470. Bugfix (one request - two replies)."];
-otp_8470(suite) ->
-    [];
+%% OTP-8470. Bugfix (one request - two replies).
 otp_8470(Config) when is_list(Config) ->
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     C = <<"-file(\"erl_parse.yrl\", 486).\n"
           "-file(\"erl_parse.yrl\", 488).\n">>,
-    ?line File = filename:join(Dir, "otp_8470.erl"),
-    ?line ok = file:write_file(File, C),
-    ?line {ok, _List} = epp:parse_file(File, [], []),
-    file:delete(File),
-    ?line receive _ -> fail() after 0 -> ok end,
-    ok.
-
-otp_8503(doc) ->
-    ["OTP-8503. Record with no fields is considered typed."];
-otp_8503(suite) ->
-    [];
-otp_8503(Config) when is_list(Config) ->
-    Dir = ?config(priv_dir, Config),
-    C = <<"-record(r, {}).">>,
-    ?line File = filename:join(Dir, "otp_8503.erl"),
-    ?line ok = file:write_file(File, C),
-    ?line {ok, List} = epp:parse_file(File, [], []),
-    ?line [_] = [F || {attribute,_,type,{{record,r},[],[]}}=F <- List],
+    File = filename:join(Dir, "otp_8470.erl"),
+    ok = file:write_file(File, C),
+    {ok, _List} = epp:parse_file(File, [], []),
     file:delete(File),
-    ?line receive _ -> fail() after 0 -> ok end,
+    receive _ -> fail() after 0 -> ok end,
     ok.
 
-otp_8562(doc) ->
-    ["OTP-8503. Record with no fields is considered typed."];
-otp_8562(suite) ->
-    [];
+%% OTP-8562. Record with no fields is considered typed.
 otp_8562(Config) when is_list(Config) ->
     Cs = [{otp_8562,
            <<"-define(P(), {a,b}.\n"
@@ -1240,13 +1182,10 @@ otp_8562(Config) when is_list(Config) ->
            {errors,[{{1,60},epp,missing_parenthesis},
                     {{2,13},epp,missing_parenthesis}], []}}
          ],
-    ?line [] = compile(Config, Cs),
+    [] = compile(Config, Cs),
     ok.
 
-otp_8911(doc) ->
-    ["OTP-8911. -file and file inclusion bug"];
-otp_8911(suite) ->
-    [];
+%% OTP-8911. -file and file inclusion bug.
 otp_8911(Config) when is_list(Config) ->
     case test_server:is_cover() of
 	true ->
@@ -1255,8 +1194,8 @@ otp_8911(Config) when is_list(Config) ->
 	    do_otp_8911(Config)
     end.
 do_otp_8911(Config) ->
-    ?line {ok, CWD} = file:get_cwd(),
-    ?line ok = file:set_cwd(?config(priv_dir, Config)),
+    {ok, CWD} = file:get_cwd(),
+    ok = file:set_cwd(proplists:get_value(priv_dir, Config)),
 
     File = "i.erl",
     Cont = <<"-module(i).
@@ -1266,40 +1205,34 @@ do_otp_8911(Config) ->
               t() ->
                   a.
            ">>,
-    ?line ok = file:write_file(File, Cont),
+    ok = file:write_file(File, Cont),
     Incl = <<"-file(\"fil2\", 35).
               t1() ->
                   b.
            ">>,
     File1 = "i1.erl",
-    ?line ok = file:write_file(File1, Incl),
+    ok = file:write_file(File1, Incl),
 
-    ?line {ok, i} = cover:compile(File),
-    ?line a = i:t(),
-    ?line {ok,[{{i,6},1}]} = cover:analyse(i, calls, line),
-    ?line cover:stop(),
+    {ok, i} = cover:compile(File),
+    a = i:t(),
+    {ok,[{{i,6},1}]} = cover:analyse(i, calls, line),
+    cover:stop(),
 
     file:delete(File),
     file:delete(File1),
-    ?line file:set_cwd(CWD),
+    file:set_cwd(CWD),
     ok.
 
-otp_8665(doc) ->
-    ["OTP-8665. Bugfix premature end."];
-otp_8665(suite) ->
-    [];
+%% OTP-8665. Bugfix premature end.
 otp_8665(Config) when is_list(Config) ->
     Cs = [{otp_8562,
            <<"-define(A, a)\n">>,
            {errors,[{{1,54},epp,premature_end}],[]}}
          ],
-    ?line [] = compile(Config, Cs),
+    [] = compile(Config, Cs),
     ok.
 
-otp_10302(doc) ->
-    "OTP-10302. Unicode characters scanner/parser.";
-otp_10302(suite) ->
-    [];
+%% OTP-10302. Unicode characters scanner/parser.
 otp_10302(Config) when is_list(Config) ->
     %% Two messages (one too many). Keeps otp_4871 happy.
     Cs = [{otp_8562,
@@ -1308,7 +1241,7 @@ otp_10302(Config) when is_list(Config) ->
                     {3,file_io_server,invalid_unicode}],[]}}
          ],
     [] = compile(Config, Cs),
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     File = filename:join(Dir, "otp_10302.erl"),
     utf8 = encoding("coding: utf-8", File),
     utf8 = encoding("coding: UTF-8", File),
@@ -1370,13 +1303,10 @@ encoding_nocom(Enc, File) ->
     ok = file:close(Fd),
     E = epp:read_encoding(File, Options).
 
-otp_10820(doc) ->
-    "OTP-10820. Unicode filenames.";
-otp_10820(suite) ->
-    [];
+%% OTP-10820. Unicode filenames.
 otp_10820(Config) when is_list(Config) ->
     L = [915,953,959,973,957,953,954,959,957,964],
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     File = filename:join(Dir, L++".erl"),
     C1 = <<"%% coding: utf-8\n -module(any).">>,
     ok = do_otp_10820(File, C1, "+pc latin1"),
@@ -1395,12 +1325,9 @@ do_otp_10820(File, C, PC) ->
     true = test_server:stop_node(Node),
     ok.
 
-otp_11728(doc) ->
-    ["OTP-11728. Bugfix circular macro."];
-otp_11728(suite) ->
-    [];
+%% OTP-11728. Bugfix circular macro.
 otp_11728(Config) when is_list(Config) ->
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     H = <<"-define(MACRO,[[]++?MACRO]).">>,
     HrlFile = filename:join(Dir, "otp_11728.hrl"),
     ok = file:write_file(HrlFile, H),
@@ -1422,7 +1349,7 @@ otp_11728(Config) when is_list(Config) ->
 
 %% Check the new API for setting the default encoding.
 encoding(Config) when is_list(Config) ->
-    Dir = ?config(priv_dir, Config),
+    Dir = proplists:get_value(priv_dir, Config),
     ErlFile = filename:join(Dir, "encoding.erl"),
 
     %% Try a latin-1 file with no encoding given.
@@ -1476,6 +1403,102 @@ encoding(Config) when is_list(Config) ->
 	epp_parse_file(ErlFile, [{default_encoding,utf8},extra]),
     ok.
 
+extends(Config) ->
+    Cs = [{extends_c1,
+	   <<"-extends(some.other.module).\n">>,
+	   {errors,[{1,erl_parse,["syntax error before: ","'.'"]}],[]}}],
+    [] = compile(Config, Cs),
+
+    Ts = [{extends_1,
+	   <<"-extends(some_other_module).\n"
+	     "t() -> {?BASE_MODULE,?BASE_MODULE_STRING}.\n">>,
+	   {some_other_module,"some_other_module"}}],
+
+    [] = run(Config, Ts),
+    ok.
+
+function_macro(Config) ->
+    Cs = [{f_c1,
+	   <<"-define(FUNCTION_NAME, a).\n"
+	     "-define(FUNCTION_ARITY, a).\n"
+	     "-define(FS,\n"
+	     " atom_to_list(?FUNCTION_NAME) ++ \"/\" ++\n"
+	     " integer_to_list(?FUNCTION_ARITY)).\n"
+	     "-attr({f,?FUNCTION_NAME}).\n"
+	     "-attr2(?FS).\n"
+	     "-file(?FUNCTION_ARITY, 1).\n"
+	     "f1() ?FUNCTION_NAME/?FUNCTION_ARITY.\n"
+	     "f2(?FUNCTION_NAME.\n">>,
+	   {errors,[{1,epp,{redefine_predef,'FUNCTION_NAME'}},
+		    {2,epp,{redefine_predef,'FUNCTION_ARITY'}},
+		    {6,epp,{illegal_function,'FUNCTION_NAME'}},
+		    {7,epp,{illegal_function,'FUNCTION_NAME'}},
+		    {8,epp,{illegal_function,'FUNCTION_ARITY'}},
+		    {9,erl_parse,["syntax error before: ","f1"]},
+		    {10,erl_parse,["syntax error before: ","'.'"]}],
+	    []}},
+
+	  {f_c2,
+	   <<"a({a) -> ?FUNCTION_NAME.\n"
+	     "b(}{) -> ?FUNCTION_ARITY.\n"
+	     "c(?FUNCTION_NAME, ?not_defined) -> ok.\n">>,
+	   {errors,[{1,erl_parse,["syntax error before: ","')'"]},
+		    {2,erl_parse,["syntax error before: ","'}'"]},
+		    {3,epp,{undefined,not_defined,none}}],
+	    []}},
+
+	  {f_c3,
+	   <<"?FUNCTION_NAME() -> ok.\n"
+	     "?FUNCTION_ARITY() -> ok.\n">>,
+	   {errors,[{1,epp,{illegal_function_usage,'FUNCTION_NAME'}},
+		    {2,epp,{illegal_function_usage,'FUNCTION_ARITY'}}],
+	    []}}
+	 ],
+
+    [] = compile(Config, Cs),
+
+    Ts = [{f_1,
+	   <<"t() -> {a,0} = a(), {b,1} = b(1), {c,2} = c(1, 2),\n"
+	     "  {d,1} = d({d,1}), {foo,1} = foo(foo), ok.\n"
+	     "a() -> {?FUNCTION_NAME,?FUNCTION_ARITY}.\n"
+	     "b(_) -> {?FUNCTION_NAME,?FUNCTION_ARITY}.\n"
+	     "c(_, (_)) -> {?FUNCTION_NAME,?FUNCTION_ARITY}.\n"
+	     "d({?FUNCTION_NAME,?FUNCTION_ARITY}=F) -> F.\n"
+	     "-define(FOO, foo).\n"
+	     "?FOO(?FOO) -> {?FUNCTION_NAME,?FUNCTION_ARITY}.\n">>,
+	   ok},
+
+	  {f_2,
+	   <<"t() ->\n"
+             "  A = {a,[<<0:24>>,#{a=>1,b=>2}]},\n"
+	     "  1 = a(A),\n"
+	     "  ok.\n"
+	     "a({a,[<<_,_,_>>,#{a:=1,b:=2}]}) -> ?FUNCTION_ARITY.\n">>,
+	   ok},
+
+	  {f_3,
+	   <<"-define(FS,\n"
+	     " atom_to_list(?FUNCTION_NAME) ++ \"/\" ++\n"
+	     " integer_to_list(?FUNCTION_ARITY)).\n"
+	     "t() ->\n"
+	     "  {t,0} = {?FUNCTION_NAME,?FUNCTION_ARITY},\n"
+	     "  \"t/0\" = ?FS,\n"
+	     "  ok.\n">>,
+	   ok},
+
+	  {f_4,
+	   <<"-define(__, _, _).\n"
+	     "-define(FF, ?FUNCTION_NAME, ?FUNCTION_ARITY).\n"
+	     "a(?__) -> 2 = ?FUNCTION_ARITY.\n"
+	     "b(?FUNCTION_ARITY, ?__) -> ok.\n"
+	     "c(?FF) -> ok.\n"
+	     "t() -> a(1, 2), b(3, 1, 2), c(c, 2), ok.\n">>,
+	   ok}
+	 ],
+    [] = run(Config, Ts),
+
+    ok.
+
 
 check(Config, Tests) ->
     eval_tests(Config, fun check_test/2, Tests).
@@ -1494,7 +1517,7 @@ eval_tests(Config, Fun, Tests) ->
                     true ->
                         BadL;
                     false ->
-                        ?t:format("~nTest ~p failed. Expected~n  ~p~n"
+                        io:format("~nTest ~p failed. Expected~n  ~p~n"
                                   "but got~n  ~p~n", [N, E, Return]),
 			fail()
                 end
@@ -1504,22 +1527,24 @@ eval_tests(Config, Fun, Tests) ->
 
 check_test(Config, Test) ->
     Filename = "epp_test.erl",
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line File = filename:join(PrivDir, Filename),
-    ?line ok = file:write_file(File, Test),
-    ?line case epp:parse_file(File, [PrivDir], []) of
-              {ok,Forms} ->
-                  [E || E={error,_} <- Forms];
-              {error,Error} ->
-                  Error
-          end.
+    PrivDir = proplists:get_value(priv_dir, Config),
+    File = filename:join(PrivDir, Filename),
+    ok = file:write_file(File, Test),
+    case epp:parse_file(File, [PrivDir], []) of
+	{ok,Forms} ->
+	    Errors = [E || E={error,_} <- Forms],
+	    call_format_error([E || {error,E} <- Errors]),
+	    Errors;
+	{error,Error} ->
+	    Error
+    end.
 
 compile_test(Config, Test0) ->
     Test = [<<"-module(epp_test). -compile(export_all). ">>, Test0],
     Filename = "epp_test.erl",
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line File = filename:join(PrivDir, Filename),
-    ?line ok = file:write_file(File, Test),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    File = filename:join(PrivDir, Filename),
+    ok = file:write_file(File, Test),
     Opts = [export_all,return,nowarn_unused_record,{outdir,PrivDir}],
     case compile_file(File, Opts) of
         {ok, Ws} -> warnings(File, Ws);
@@ -1528,8 +1553,11 @@ compile_test(Config, Test0) ->
 
 warnings(File, Ws) ->
     case lists:append([W || {F, W} <- Ws, F =:= File]) of
-        [] -> [];
-        L -> {warnings, L}
+        [] ->
+	    [];
+        L ->
+	    call_format_error(L),
+	    {warnings, L}
     end.
 
 compile_file(File, Opts) ->
@@ -1540,12 +1568,20 @@ compile_file(File, Opts) ->
     end.
 
 errs([{File,Es}|L], File) ->
+    call_format_error(Es),
     Es ++ errs(L, File);
 errs([_|L], File) ->
     errs(L, File);
 errs([], _File) ->
     [].
 
+%% Smoke test and coverage of format_error/1.
+call_format_error([{_,M,E}|T]) ->
+    _ = M:format_error(E),
+    call_format_error(T);
+call_format_error([]) ->
+    ok.
+
 epp_parse_file(File, Opts) ->
     case epp:parse_file(File, Opts) of
         {ok, Forms} ->
@@ -1560,20 +1596,19 @@ unopaque_forms(Forms) ->
 run_test(Config, Test0) ->
     Test = [<<"-module(epp_test). -compile(export_all). ">>, Test0],
     Filename = "epp_test.erl",
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line File = filename:join(PrivDir, Filename),
-    ?line ok = file:write_file(File, Test),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    File = filename:join(PrivDir, Filename),
+    ok = file:write_file(File, Test),
     Opts = [return, {i,PrivDir},{outdir,PrivDir}],
-    ?line {ok, epp_test, []} = compile:file(File, Opts),
+    {ok, epp_test, []} = compile:file(File, Opts),
     AbsFile = filename:rootname(File, ".erl"),
-    ?line {module, epp_test} = code:load_abs(AbsFile, epp_test),
-    ?line Reply = epp_test:t(),
+    {module, epp_test} = code:load_abs(AbsFile, epp_test),
+    Reply = epp_test:t(),
     code:purge(epp_test),
     Reply.
 
 fail() ->
-    io:format("failed~n"),
-    test_server:fail().
+    ct:fail(failed).
 
 message_compare(T, T) ->
     true;
@@ -1607,5 +1642,5 @@ ln2(M) ->
 
 %% +fnu means a peer node has to be started; slave will not do
 start_node(Name, Xargs) ->
-    ?line PA = filename:dirname(code:which(?MODULE)),
+    PA = filename:dirname(code:which(?MODULE)),
     test_server:start_node(Name, peer, [{args, "-pa " ++ PA ++ " " ++ Xargs}]).
diff --git a/lib/stdlib/test/erl_anno_SUITE.erl b/lib/stdlib/test/erl_anno_SUITE.erl
index 66b02151a0..637a390c70 100644
--- a/lib/stdlib/test/erl_anno_SUITE.erl
+++ b/lib/stdlib/test/erl_anno_SUITE.erl
@@ -19,13 +19,13 @@
 %%
 -module(erl_anno_SUITE).
 
-%-define(debug, true).
+%%-define(debug, true).
 
 -ifdef(debug).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(format(S, A), io:format(S, A)).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(format(S, A), ok).
 -endif.
 
@@ -34,7 +34,7 @@
          init_per_testcase/2, end_per_testcase/2]).
 
 -export([new/1, is_anno/1, generated/1, end_location/1, file/1,
-         line/1, location/1, record/1, text/1, bad/1, neg_line/1]).
+         line/1, location/1, record/1, text/1, bad/1]).
 
 -export([parse_abstract/1, mapfold_anno/1]).
 
@@ -43,10 +43,12 @@ all() ->
 
 groups() ->
     [{anno, [], [new, is_anno, generated, end_location, file,
-                 line, location, record, text, bad, neg_line]},
+                 line, location, record, text, bad]},
      {parse, [], [parse_abstract, mapfold_anno]}].
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 init_per_suite(Config) ->
     Config.
@@ -61,26 +63,21 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 init_per_testcase(_Case, Config) ->
-    Dog=?t:timetrap(?t:minutes(1)),
-    [{watchdog, Dog}|Config].
+    Config.
 
 end_per_testcase(_Case, _Config) ->
-    Dog=?config(watchdog, _Config),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 -define(INFO(T, V), {T, V}).
 
 -dialyzer({no_fail_call, new/1}).
-new(doc) ->
-    ["Test erl_anno:new/1"];
+%% Test erl_anno:new/1.
 new(_Config) ->
     {'EXIT', {badarg, _}} =
         (catch erl_anno:new([{location,1},{text, "text"}])), % badarg
     ok.
 
-is_anno(doc) ->
-    ["Test erl_anno:is_anno/1"];
+%% Test erl_anno:is_anno/1.
 is_anno(_Config) ->
     false = erl_anno:is_anno(a),
     false = erl_anno:is_anno({a}),
@@ -106,8 +103,7 @@ is_anno(_Config) ->
     true = erl_anno:is_anno(A5),
     ok.
 
-generated(doc) ->
-    ["Test 'generated'"];
+%% Test 'generated'.
 generated(_Config) ->
     test(1, [{generated, true}, {generated, false}]),
     test(1, [{generated, false}, {generated, true}, {generated, false}]),
@@ -127,8 +123,7 @@ generated(_Config) ->
              {generated, false}]),
     ok.
 
-end_location(doc) ->
-    ["Test 'end_location'"];
+%% Test 'end_location'.
 end_location(_Config) ->
     test({1, 17}, [{text, "TEXT", [{end_location, {1, 21}}, {length, 4}]},
                    {text, "TEXT\n", [{end_location, {2, 1}}, {length, 5}]},
@@ -138,23 +133,20 @@ end_location(_Config) ->
              {text, "TEXT\ntxt", [{end_location, 2}, {length, 8}]}]),
     ok.
 
-file(doc) ->
-    ["Test 'file'"];
+%% Test 'file'.
 file(_Config) ->
     test(1, [{file, "name"}, {file, ""}]),
     test({1, 17}, [{file, "name"}, {file, ""}]),
     ok.
 
-line(doc) ->
-    ["Test 'line'"];
+%% Test 'line'.
 line(_Config) ->
     test(1, [{line, 17, [{location, 17}]},
              {location, {9, 8}, [{line, 9}, {column, 8}]},
              {line, 14, [{location, {14, 8}}]}]),
     ok.
 
-location(doc) ->
-    ["Test 'location'"];
+%% Test 'location'.
 location(_Config) ->
     test(1, [{location, 2, [{line,2}]},
              {location, {1, 17}, [{line, 1}, {column, 17}]},
@@ -172,8 +164,7 @@ location(_Config) ->
              {location, 9, [{column, undefined}]}]),
     ok.
 
-record(doc) ->
-    ["Test 'record'"];
+%% Test 'record'.
 record(_Config) ->
     test({1, 17}, [{record, true}, {record, false}]),
     test(1, [{record, true}, {record, false}]),
@@ -193,8 +184,7 @@ record(_Config) ->
              {generated, false}]),
     ok.
 
-text(doc) ->
-    ["Test 'text'"];
+%% Test 'text'.
 text(_Config) ->
     test(1, [{text, "text", [{end_location, 1}, {length, 4}]},
              {text, "", [{end_location, 1}, {length, 0}]}]),
@@ -203,8 +193,7 @@ text(_Config) ->
     ok.
 
 -dialyzer({[no_opaque, no_fail_call], bad/1}).
-bad(doc) ->
-    ["Test bad annotations"];
+%% Test bad annotations.
 bad(_Config) ->
     Line = erl_anno:new(1),
     LineColumn = erl_anno:new({1, 17}),
@@ -229,77 +218,8 @@ bad(_Config) ->
         (catch erl_anno:record(bad)), % 1st arg not opaque
     ok.
 
-neg_line(doc) ->
-    ["Test negative line numbers (OTP 18)"];
-neg_line(_Config) ->
-    neg_line1(false),
-    neg_line1(true),
-    ok.
-
-neg_line1(TextToo) ->
-    Minus8_0 = erl_anno:new(-8),
-    Plus8_0 = erl_anno:new(8),
-    Minus8C_0 = erl_anno:new({-8, 17}),
-    Plus8C_0 = erl_anno:new({8, 17}),
-
-    [Minus8, Plus8, Minus8C, Plus8C] =
-        [case TextToo of
-             true ->
-                 erl_anno:set_text("foo", A);
-             false ->
-                 A
-         end || A <- [Minus8_0, Plus8_0, Minus8C_0, Plus8C_0]],
-
-    tst(-3, erl_anno:set_location(3, Minus8)),
-    tst(-3, erl_anno:set_location(-3, Plus8)),
-    tst(-3, erl_anno:set_location(-3, Minus8)),
-    tst({-3,9}, erl_anno:set_location({3, 9}, Minus8)),
-    tst({-3,9}, erl_anno:set_location({-3, 9}, Plus8)),
-    tst({-3,9}, erl_anno:set_location({-3, 9}, Minus8)),
-    tst(-3, erl_anno:set_location(3, Minus8C)),
-    tst(-3, erl_anno:set_location(-3, Plus8C)),
-    tst(-3, erl_anno:set_location(-3, Minus8C)),
-    tst({-3,9}, erl_anno:set_location({3, 9}, Minus8C)),
-    tst({-3,9}, erl_anno:set_location({-3, 9}, Plus8C)),
-    tst({-3,9}, erl_anno:set_location({-3, 9}, Minus8C)),
-
-    tst(-8, erl_anno:set_generated(true, Plus8)),
-    tst(-8, erl_anno:set_generated(true, Minus8)),
-    tst({-8,17}, erl_anno:set_generated(true, Plus8C)),
-    tst({-8,17}, erl_anno:set_generated(true, Minus8C)),
-    tst(8, erl_anno:set_generated(false, Plus8)),
-    tst(8, erl_anno:set_generated(false, Minus8)),
-    tst({8,17}, erl_anno:set_generated(false, Plus8C)),
-    tst({8,17}, erl_anno:set_generated(false, Minus8C)),
-
-    tst(-3, erl_anno:set_line(3, Minus8)),
-    tst(-3, erl_anno:set_line(-3, Plus8)),
-    tst(-3, erl_anno:set_line(-3, Minus8)),
-    tst({-3,17}, erl_anno:set_line(3, Minus8C)),
-    tst({-3,17}, erl_anno:set_line(-3, Plus8C)),
-    tst({-3,17}, erl_anno:set_line(-3, Minus8C)),
-    ok.
-
-tst(Term, Anno) ->
-    ?format("Term: ~p\n", [Term]),
-    ?format("Anno: ~p\n", [Anno]),
-    case anno_to_term(Anno) of
-        Term ->
-            ok;
-        Else ->
-            case lists:keyfind(location, 1, Else) of
-                {location, Term} ->
-                    ok;
-                _Else2 ->
-                    ?format("Else2 ~p\n", [_Else2]),
-                    io:format("expected ~p\n got     ~p\n", [Term, Else]),
-                    exit({Term, Else})
-            end
-    end.
-
-parse_abstract(doc) ->
-    ["Test erl_parse:new_anno/1, erl_parse:anno_to_term/1"
-     ", and erl_parse:anno_from_term/1"];
+%% Test erl_parse:new_anno/1, erl_parse:anno_to_term/1,
+%% and erl_parse:anno_from_term/1.
 parse_abstract(_Config) ->
     T = sample_term(),
     A = erl_parse:abstract(T, [{line,17}]),
@@ -310,8 +230,7 @@ parse_abstract(_Config) ->
     T = erl_parse:normalise(Abstr2),
     ok.
 
-mapfold_anno(doc) ->
-    ["Test erl_parse:{map_anno/2,fold_anno/3, and mapfold_anno/3}"];
+%% Test erl_parse:{map_anno/2,fold_anno/3, and mapfold_anno/3}.
 mapfold_anno(_Config) ->
     T = sample_term(),
     Abstr = erl_parse:abstract(T),
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index c21c4e61ee..c3ef4eb051 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -19,6 +19,7 @@
 
 -module(erl_eval_SUITE).
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2,
 	 init_per_group/2,end_per_group/2]).
 
 -export([guard_1/1, guard_2/1,
@@ -64,20 +65,18 @@
 config(priv_dir,_) ->
     ".".
 -else.
--include_lib("test_server/include/test_server.hrl").
--export([init_per_testcase/2, end_per_testcase/2]).
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
+-include_lib("common_test/include/ct.hrl").
+-endif.
+
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+
+end_per_testcase(_Case, _Config) ->
     ok.
--endif.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [guard_1, guard_2, match_pattern, string_plusplus,
@@ -103,125 +102,101 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-guard_1(doc) ->
-    ["(OTP-2405)"];
-guard_1(suite) ->
-    [];
+%% OTP-2405
 guard_1(Config) when is_list(Config) ->
-    ?line {ok,Tokens ,_} =
+    {ok,Tokens ,_} =
 	erl_scan:string("if a+4 == 4 -> yes; true -> no end. "),
-    ?line {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
-    ?line no = guard_1_compiled(),
-    ?line {value, no, []} = erl_eval:expr(Expr, []),
+    {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
+    no = guard_1_compiled(),
+    {value, no, []} = erl_eval:expr(Expr, []),
     ok.
 
 guard_1_compiled() ->
     if a+4 == 4 -> yes; true -> no end.
 
-guard_2(doc) ->
-    ["Similar to guard_1, but type-correct"];
-guard_2(suite) ->
-    [];
+%% Similar to guard_1, but type-correct.
 guard_2(Config) when is_list(Config) ->
-    ?line {ok,Tokens ,_} =
+    {ok,Tokens ,_} =
 	erl_scan:string("if 6+4 == 4 -> yes; true -> no end. "),
-    ?line {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
-    ?line no = guard_2_compiled(),
-    ?line {value, no, []} = erl_eval:expr(Expr, []),
+    {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
+    no = guard_2_compiled(),
+    {value, no, []} = erl_eval:expr(Expr, []),
     ok.
 
 guard_2_compiled() ->
     if 6+4 == 4 -> yes; true -> no end.
 
-string_plusplus(doc) ->
-    ["OTP-3069: syntactic sugar string ++ ..."];
-string_plusplus(suite) ->
-    [];
+%% OTP-3069: syntactic sugar string ++ ...
 string_plusplus(Config) when is_list(Config) ->
-    ?line check(fun() -> case "abc" of "ab" ++ L -> L end end,
-		"case \"abc\" of \"ab\" ++ L -> L end. ",
-		"c"),
-    ?line check(fun() -> case "abcde" of "ab" ++ "cd" ++ L -> L end end,
-		"case \"abcde\" of \"ab\" ++ \"cd\" ++ L -> L end. ",
-		"e"),
-    ?line check(fun() -> case "abc" of [97, 98] ++ L -> L end end,
-		"case \"abc\" of [97, 98] ++ L -> L end. ",
-		"c"),
+    check(fun() -> case "abc" of "ab" ++ L -> L end end,
+	  "case \"abc\" of \"ab\" ++ L -> L end. ",
+	  "c"),
+    check(fun() -> case "abcde" of "ab" ++ "cd" ++ L -> L end end,
+	  "case \"abcde\" of \"ab\" ++ \"cd\" ++ L -> L end. ",
+	  "e"),
+    check(fun() -> case "abc" of [97, 98] ++ L -> L end end,
+	  "case \"abc\" of [97, 98] ++ L -> L end. ",
+	  "c"),
     ok.
 
-match_pattern(doc) ->
-    ["OTP-2983: match operator in pattern"];
-match_pattern(suite) ->
-    [];
+%% OTP-2983: match operator in pattern.
 match_pattern(Config) when is_list(Config) ->
-    ?line check(fun() -> case {a, b} of {a, _X}=Y -> {x,Y} end end,
-		"case {a, b} of {a, X}=Y -> {x,Y} end. ",
-		{x, {a, b}}),
-    ?line check(fun() -> case {a, b} of Y={a, _X} -> {x,Y} end end,
-		"case {a, b} of Y={a, X} -> {x,Y} end. ",
-		{x, {a, b}}),
-    ?line check(fun() -> case {a, b} of Y={a, _X}=Z -> {Z,Y} end end,
-		"case {a, b} of Y={a, X}=Z -> {Z,Y} end. ",
-		{{a, b}, {a, b}}),
-    ?line check(fun() -> A = 4, B = 28, <<13:(A+(X=B))>>, X end,
-                "begin A = 4, B = 28, <<13:(A+(X=B))>>, X end.",
-                28),
+    check(fun() -> case {a, b} of {a, _X}=Y -> {x,Y} end end,
+	  "case {a, b} of {a, X}=Y -> {x,Y} end. ",
+	  {x, {a, b}}),
+    check(fun() -> case {a, b} of Y={a, _X} -> {x,Y} end end,
+	  "case {a, b} of Y={a, X} -> {x,Y} end. ",
+	  {x, {a, b}}),
+    check(fun() -> case {a, b} of Y={a, _X}=Z -> {Z,Y} end end,
+	  "case {a, b} of Y={a, X}=Z -> {Z,Y} end. ",
+	  {{a, b}, {a, b}}),
+    check(fun() -> A = 4, B = 28, <<13:(A+(X=B))>>, X end,
+	  "begin A = 4, B = 28, <<13:(A+(X=B))>>, X end.",
+	  28),
     ok.
 
-match_bin(doc) ->
-    ["binary match problems"];
-match_bin(suite) ->
-    [];
+%% Binary match problems.
 match_bin(Config) when is_list(Config) ->
-    ?line check(fun() -> <<"abc">> = <<"abc">> end,
-		"<<\"abc\">> = <<\"abc\">>. ",
-		<<"abc">>),
-    ?line check(fun() ->
-			<<Size,B:Size/binary,Rest/binary>> = <<2,"AB","CD">>,
-			{Size,B,Rest}
-		end,
-		"begin <<Size,B:Size/binary,Rest/binary>> = <<2,\"AB\",\"CD\">>, "
-		"{Size,B,Rest} end. ",
-		{2,<<"AB">>,<<"CD">>}),
+    check(fun() -> <<"abc">> = <<"abc">> end,
+	  "<<\"abc\">> = <<\"abc\">>. ",
+	  <<"abc">>),
+    check(fun() ->
+		  <<Size,B:Size/binary,Rest/binary>> = <<2,"AB","CD">>,
+		  {Size,B,Rest}
+	  end,
+	  "begin <<Size,B:Size/binary,Rest/binary>> = <<2,\"AB\",\"CD\">>, "
+	  "{Size,B,Rest} end. ",
+	  {2,<<"AB">>,<<"CD">>}),
     ok.
 
-pattern_expr(doc) ->
-    ["OTP-3144: compile-time expressions in pattern"];
-pattern_expr(suite) ->
-    [];
+%% OTP-3144: compile-time expressions in pattern.
 pattern_expr(Config) when is_list(Config) ->
-    ?line check(fun() -> case 4 of 2+2 -> ok end end,
-		"case 4 of 2+2 -> ok end. ",
-		ok),
-    ?line check(fun() -> case 2 of +2 -> ok end end,
-		"case 2 of +2 -> ok end. ",
-		ok),
+    check(fun() -> case 4 of 2+2 -> ok end end,
+	  "case 4 of 2+2 -> ok end. ",
+	  ok),
+    check(fun() -> case 2 of +2 -> ok end end,
+	  "case 2 of +2 -> ok end. ",
+	  ok),
     ok.
 
-guard_3(doc) ->
-    ["OTP-4518."];
-guard_3(suite) ->
-    [];
+%% OTP-4518.
 guard_3(Config) when is_list(Config) ->
-    ?line check(fun() -> if false -> false; true -> true end end,
-                "if false -> false; true -> true end.",
-                true),
-    ?line check(fun() -> if <<"hej">> == <<"hopp">> -> true; 
-                            true -> false end end,
-                "begin if <<\"hej\">> == <<\"hopp\">> -> true; 
+    check(fun() -> if false -> false; true -> true end end,
+	  "if false -> false; true -> true end.",
+	  true),
+    check(fun() -> if <<"hej">> == <<"hopp">> -> true;
+		      true -> false end end,
+	  "begin if <<\"hej\">> == <<\"hopp\">> -> true;
                           true -> false end end.",
                 false),
-    ?line check(fun() -> if <<"hej">> == <<"hej">> -> true; 
-                            true -> false end end,
-                "begin if <<\"hej\">> == <<\"hej\">> -> true; 
+    check(fun() -> if <<"hej">> == <<"hej">> -> true;
+		      true -> false end end,
+	  "begin if <<\"hej\">> == <<\"hej\">> -> true;
                           true -> false end end.",
                 true),
     ok.
 
-guard_4(doc) ->
-    ["OTP-4885."];
-guard_4(suite) ->
-    [];
+%% OTP-4885.
 guard_4(Config) when is_list(Config) ->
     check(fun() -> if erlang:'+'(3,a) -> true ; true -> false end end,
 	  "if erlang:'+'(3,a) -> true ; true -> false end.",
@@ -230,31 +205,28 @@ guard_4(Config) when is_list(Config) ->
 	  end,
 	  "if erlang:is_integer(3) -> true ; true -> false end.",
 	  true),
-    ?line check(fun() -> [X || X <- [1,2,3], erlang:is_integer(X)] end,
-                "[X || X <- [1,2,3], erlang:is_integer(X)].",
-                [1,2,3]),
-    ?line check(fun() -> if is_atom(is_integer(a)) -> true ; true -> false end
-                end,
-                "if is_atom(is_integer(a)) -> true ; true -> false end.",
-                true),
+    check(fun() -> [X || X <- [1,2,3], erlang:is_integer(X)] end,
+	  "[X || X <- [1,2,3], erlang:is_integer(X)].",
+	  [1,2,3]),
+    check(fun() -> if is_atom(is_integer(a)) -> true ; true -> false end
+	  end,
+	  "if is_atom(is_integer(a)) -> true ; true -> false end.",
+	  true),
     check(fun() -> if erlang:is_atom(erlang:is_integer(a)) -> true;
 		      true -> false end end,
 	  "if erlang:is_atom(erlang:is_integer(a)) -> true; "
 	  "true -> false end.",
 	  true),
-    ?line check(fun() -> if is_atom(3+a) -> true ; true -> false end end,
-                "if is_atom(3+a) -> true ; true -> false end.",
-                false),
-    ?line check(fun() -> if erlang:is_atom(3+a) -> true ; true -> false end 
-                end,
-                "if erlang:is_atom(3+a) -> true ; true -> false end.",
-                false),
+    check(fun() -> if is_atom(3+a) -> true ; true -> false end end,
+	  "if is_atom(3+a) -> true ; true -> false end.",
+	  false),
+    check(fun() -> if erlang:is_atom(3+a) -> true ; true -> false end
+	  end,
+	  "if erlang:is_atom(3+a) -> true ; true -> false end.",
+	  false),
     ok.
 
-guard_5(doc) ->
-    ["Guards with erlang:'=='/2"];
-guard_5(suite) ->
-    [];
+%% Guards with erlang:'=='/2.
 guard_5(Config) when is_list(Config) ->
     {ok,Tokens ,_} =
 	erl_scan:string("case 1 of A when erlang:'=='(A, 1) -> true end."),
@@ -266,293 +238,278 @@ guard_5(Config) when is_list(Config) ->
 guard_5_compiled() ->
     case 1 of A when erlang:'=='(A, 1) -> true end.
 
-lc(doc) ->
-    ["OTP-4518."];
-lc(suite) ->
-    [];
+%% OTP-4518.
 lc(Config) when is_list(Config) ->
-    ?line check(fun() -> X = 32, [X || X <- [1,2,3]] end,
-                "begin X = 32, [X || X <- [1,2,3]] end.",
-                [1,2,3]),
-    ?line check(fun() -> X = 32, 
-                         [X || <<X:X>> <- [<<1:32>>,<<2:32>>,<<3:8>>]] end,
-    %% "binsize variable"          ^
-                "begin X = 32, 
+    check(fun() -> X = 32, [X || X <- [1,2,3]] end,
+	  "begin X = 32, [X || X <- [1,2,3]] end.",
+	  [1,2,3]),
+    check(fun() -> X = 32,
+		   [X || <<X:X>> <- [<<1:32>>,<<2:32>>,<<3:8>>]] end,
+	  %% "binsize variable"          ^
+	  "begin X = 32,
                  [X || <<X:X>> <- [<<1:32>>,<<2:32>>,<<3:8>>]] end.",
                 [1,2]),
-    ?line check(fun() -> Y = 13,[X || {X,Y} <- [{1,2}]] end,
-                "begin Y = 13,[X || {X,Y} <- [{1,2}]] end.",
-                [1]),
-    ?line error_check("begin [A || X <- [{1,2}], 1 == A] end.",
-                      {unbound_var,'A'}),
-    ?line error_check("begin X = 32, 
+    check(fun() -> Y = 13,[X || {X,Y} <- [{1,2}]] end,
+	  "begin Y = 13,[X || {X,Y} <- [{1,2}]] end.",
+	  [1]),
+    error_check("begin [A || X <- [{1,2}], 1 == A] end.",
+		{unbound_var,'A'}),
+    error_check("begin X = 32,
                         [{Y,W} || X <- [1,2,32,Y=4], Z <- [1,2,W=3]] end.",
                       {unbound_var,'Y'}),
-    ?line error_check("begin X = 32,<<A:B>> = <<100:X>> end.",
-                      {unbound_var,'B'}),
-    ?line check(fun() -> [X || X <- [1,2,3,4], not (X < 2)] end,
-                "begin [X || X <- [1,2,3,4], not (X < 2)] end.",
-                [2,3,4]),
-    ?line check(fun() -> [X || X <- [true,false], X] end,
-                "[X || X <- [true,false], X].", [true]),
+    error_check("begin X = 32,<<A:B>> = <<100:X>> end.",
+		{unbound_var,'B'}),
+    check(fun() -> [X || X <- [1,2,3,4], not (X < 2)] end,
+	  "begin [X || X <- [1,2,3,4], not (X < 2)] end.",
+	  [2,3,4]),
+    check(fun() -> [X || X <- [true,false], X] end,
+	  "[X || X <- [true,false], X].", [true]),
     ok.
 
-simple_cases(doc) ->
-    ["Simple cases, just to cover some code."];
-simple_cases(suite) ->
-    [];
+%% Simple cases, just to cover some code.
 simple_cases(Config) when is_list(Config) ->
-    ?line check(fun() -> A = $C end, "A = $C.", $C),
-    %% ?line check(fun() -> A = 3.14 end, "A = 3.14.", 3.14),
-    ?line check(fun() -> self() ! a, A = receive a -> true end end,
-                "begin self() ! a, A = receive a -> true end end.",
-                true),
-    ?line check(fun() -> c:flush(), self() ! a, self() ! b, self() ! c,
-                         receive b -> b end, 
-                         {messages, [a,c]} =
-                             erlang:process_info(self(), messages),
-                         c:flush() end,
-                "begin c:flush(), self() ! a, self() ! b, self() ! c,"
-                "receive b -> b end,"
-                "{messages, [a,c]} ="
-                "     erlang:process_info(self(), messages), c:flush() end.",
-                ok),
-    ?line check(fun() -> self() ! a, A = receive a -> true 
-                                         after 0 -> false end end,
-                "begin self() ! a, A = receive a -> true"
-                "                      after 0 -> false end end.",
-                true),
-    ?line check(fun() -> c:flush(), self() ! a, self() ! b, self() ! c,
-                         receive b -> b after 0 -> true end, 
-                         {messages, [a,c]} =
-                             erlang:process_info(self(), messages),
-                         c:flush() end,
-                "begin c:flush(), self() ! a, self() ! b, self() ! c,"
-                "receive b -> b after 0 -> true end,"
-                "{messages, [a,c]} ="
-                "     erlang:process_info(self(), messages), c:flush() end.",
-                ok),
-    ?line check(fun() -> receive _ -> true after 10 -> false end end,
-                "receive _ -> true after 10 -> false end.",
-                false),
-    ?line check(fun() -> F = fun(A) -> A end, true = 3 == F(3) end,
-                "begin F = fun(A) -> A end, true = 3 == F(3) end.",
-                true),
-    ?line check(fun() -> F = fun(A) -> A end, true = 3 == apply(F, [3]) end,
-                "begin F = fun(A) -> A end, true = 3 == apply(F,[3]) end.",
-                true),
-    ?line check(fun() -> catch throw(a) end, "catch throw(a).", a),
-    ?line check(fun() -> catch a end, "catch a.", a),
-    ?line check(fun() -> 4 == 3 end, "4 == 3.", false),
-    ?line check(fun() -> not true end, "not true.", false),
-    ?line check(fun() -> -3 end, "-3.", -3),
-
-    ?line error_check("3.0 = 4.0.", {badmatch,4.0}),
-    ?line check(fun() -> <<(3.0+2.0):32/float>> = <<5.0:32/float>> end,
-                "<<(3.0+2.0):32/float>> = <<5.0:32/float>>.",
-                <<5.0:32/float>>),
-
-    ?line check(fun() -> false andalso kludd end, "false andalso kludd.",
-                false),
-    ?line check(fun() -> true andalso true end, "true andalso true.",
-                true),
-    ?line check(fun() -> true andalso false end, "true andalso false.",
-                false),
-    ?line check(fun() -> true andalso kludd end, "true andalso kludd.",
-                kludd),
-    ?line error_check("kladd andalso kludd.", {badarg,kladd}),
-
-    ?line check(fun() -> if false andalso kludd -> a; true -> b end end,
-                "if false andalso kludd -> a; true -> b end.",
-                b),
-    ?line check(fun() -> if true andalso true -> a; true -> b end end, 
-                "if true andalso true -> a; true -> b end.",
-                a),
-    ?line check(fun() -> if true andalso false -> a; true -> b end end, 
-                "if true andalso false -> a; true -> b end.",
-                b),
-
-    ?line check(fun() -> true orelse kludd end, 
-                "true orelse kludd.", true),
-    ?line check(fun() -> false orelse false end, 
-                "false orelse false.", false),
-    ?line check(fun() -> false orelse true end, 
-                "false orelse true.", true),
-    ?line check(fun() -> false orelse kludd end, 
-                "false orelse kludd.", kludd),
-    ?line error_check("kladd orelse kludd.", {badarg,kladd}),
-    ?line error_check("[X || X <- [1,2,3], begin 1 end].",{bad_filter,1}),
-    ?line error_check("[X || X <- a].",{bad_generator,a}),
-
-    ?line check(fun() -> if true orelse kludd -> a; true -> b end end, 
-                "if true orelse kludd -> a; true -> b end.", a),
-    ?line check(fun() -> if false orelse false -> a; true -> b end end, 
-                "if false orelse false -> a; true -> b end.", b),
-    ?line check(fun() -> if false orelse true -> a; true -> b end end, 
-                "if false orelse true -> a; true -> b end.", a),
-
-    ?line check(fun() -> [X || X <- [1,2,3], X+2] end,
-                "[X || X <- [1,2,3], X+2].", []),
-
-    ?line check(fun() -> [X || X <- [1,2,3], [X] == [X || X <- [2]]] end,
-                "[X || X <- [1,2,3], [X] == [X || X <- [2]]].",
-                [2]),
-    ?line check(fun() -> F = fun(1) -> ett; (2) -> zwei end, 
-                         ett = F(1), zwei = F(2) end,
-                "begin F = fun(1) -> ett; (2) -> zwei end, 
+    check(fun() -> A = $C end, "A = $C.", $C),
+    %% check(fun() -> A = 3.14 end, "A = 3.14.", 3.14),
+    check(fun() -> self() ! a, A = receive a -> true end end,
+	  "begin self() ! a, A = receive a -> true end end.",
+	  true),
+    check(fun() -> c:flush(), self() ! a, self() ! b, self() ! c,
+		   receive b -> b end,
+		   {messages, [a,c]} =
+		       erlang:process_info(self(), messages),
+		   c:flush() end,
+	  "begin c:flush(), self() ! a, self() ! b, self() ! c,"
+	  "receive b -> b end,"
+	  "{messages, [a,c]} ="
+	  "     erlang:process_info(self(), messages), c:flush() end.",
+	  ok),
+    check(fun() -> self() ! a, A = receive a -> true
+				   after 0 -> false end end,
+	  "begin self() ! a, A = receive a -> true"
+	  "                      after 0 -> false end end.",
+	  true),
+    check(fun() -> c:flush(), self() ! a, self() ! b, self() ! c,
+		   receive b -> b after 0 -> true end,
+		   {messages, [a,c]} =
+		       erlang:process_info(self(), messages),
+		   c:flush() end,
+	  "begin c:flush(), self() ! a, self() ! b, self() ! c,"
+	  "receive b -> b after 0 -> true end,"
+	  "{messages, [a,c]} ="
+	  "     erlang:process_info(self(), messages), c:flush() end.",
+	  ok),
+    check(fun() -> receive _ -> true after 10 -> false end end,
+	  "receive _ -> true after 10 -> false end.",
+	  false),
+    check(fun() -> F = fun(A) -> A end, true = 3 == F(3) end,
+	  "begin F = fun(A) -> A end, true = 3 == F(3) end.",
+	  true),
+    check(fun() -> F = fun(A) -> A end, true = 3 == apply(F, [3]) end,
+	  "begin F = fun(A) -> A end, true = 3 == apply(F,[3]) end.",
+	  true),
+    check(fun() -> catch throw(a) end, "catch throw(a).", a),
+    check(fun() -> catch a end, "catch a.", a),
+    check(fun() -> 4 == 3 end, "4 == 3.", false),
+    check(fun() -> not true end, "not true.", false),
+    check(fun() -> -3 end, "-3.", -3),
+
+    error_check("3.0 = 4.0.", {badmatch,4.0}),
+    check(fun() -> <<(3.0+2.0):32/float>> = <<5.0:32/float>> end,
+	  "<<(3.0+2.0):32/float>> = <<5.0:32/float>>.",
+	  <<5.0:32/float>>),
+
+    check(fun() -> false andalso kludd end, "false andalso kludd.",
+	  false),
+    check(fun() -> true andalso true end, "true andalso true.",
+	  true),
+    check(fun() -> true andalso false end, "true andalso false.",
+	  false),
+    check(fun() -> true andalso kludd end, "true andalso kludd.",
+	  kludd),
+    error_check("kladd andalso kludd.", {badarg,kladd}),
+
+    check(fun() -> if false andalso kludd -> a; true -> b end end,
+	  "if false andalso kludd -> a; true -> b end.",
+	  b),
+    check(fun() -> if true andalso true -> a; true -> b end end,
+	  "if true andalso true -> a; true -> b end.",
+	  a),
+    check(fun() -> if true andalso false -> a; true -> b end end,
+	  "if true andalso false -> a; true -> b end.",
+	  b),
+
+    check(fun() -> true orelse kludd end,
+	  "true orelse kludd.", true),
+    check(fun() -> false orelse false end,
+	  "false orelse false.", false),
+    check(fun() -> false orelse true end,
+	  "false orelse true.", true),
+    check(fun() -> false orelse kludd end,
+	  "false orelse kludd.", kludd),
+    error_check("kladd orelse kludd.", {badarg,kladd}),
+    error_check("[X || X <- [1,2,3], begin 1 end].",{bad_filter,1}),
+    error_check("[X || X <- a].",{bad_generator,a}),
+
+    check(fun() -> if true orelse kludd -> a; true -> b end end,
+	  "if true orelse kludd -> a; true -> b end.", a),
+    check(fun() -> if false orelse false -> a; true -> b end end,
+	  "if false orelse false -> a; true -> b end.", b),
+    check(fun() -> if false orelse true -> a; true -> b end end,
+	  "if false orelse true -> a; true -> b end.", a),
+
+    check(fun() -> [X || X <- [1,2,3], X+2] end,
+	  "[X || X <- [1,2,3], X+2].", []),
+
+    check(fun() -> [X || X <- [1,2,3], [X] == [X || X <- [2]]] end,
+	  "[X || X <- [1,2,3], [X] == [X || X <- [2]]].",
+	  [2]),
+    check(fun() -> F = fun(1) -> ett; (2) -> zwei end,
+		   ett = F(1), zwei = F(2) end,
+	  "begin F = fun(1) -> ett; (2) -> zwei end,
                          ett = F(1), zwei = F(2) end.",
                 zwei),
-    ?line check(fun() -> F = fun(X) when X == 1 -> ett; 
-                                (X) when X == 2 -> zwei end, 
-                         ett = F(1), zwei = F(2) end,
-                "begin F = fun(X) when X == 1 -> ett; 
+    check(fun() -> F = fun(X) when X == 1 -> ett;
+			  (X) when X == 2 -> zwei end,
+		   ett = F(1), zwei = F(2) end,
+	  "begin F = fun(X) when X == 1 -> ett;
                               (X) when X == 2 -> zwei end, 
-                         ett = F(1), zwei = F(2) end.",
+	  ett = F(1), zwei = F(2) end.",
                 zwei),
-    ?line error_check("begin F = fun(1) -> ett end, zwei = F(2) end.",
-                      function_clause),
-    ?line check(fun() -> if length([1]) == 1 -> yes; 
-                            true -> no end end,
-                "if length([1]) == 1 -> yes; 
+    error_check("begin F = fun(1) -> ett end, zwei = F(2) end.",
+		function_clause),
+    check(fun() -> if length([1]) == 1 -> yes;
+		      true -> no end end,
+	  "if length([1]) == 1 -> yes;
                             true -> no end.",
                 yes),
-    ?line check(fun() -> if is_integer(3) -> true; true -> false end end,
-                "if is_integer(3) -> true; true -> false end.", true),
-    ?line check(fun() -> if integer(3) -> true; true -> false end end,
-                "if integer(3) -> true; true -> false end.", true),
-    ?line check(fun() -> if is_float(3) -> true; true -> false end end,
-                "if is_float(3) -> true; true -> false end.", false),
-    ?line check(fun() -> if float(3) -> true; true -> false end end,
-                "if float(3) -> true; true -> false end.", false),
-    ?line check(fun() -> if is_number(3) -> true; true -> false end end,
-                "if is_number(3) -> true; true -> false end.", true),
-    ?line check(fun() -> if number(3) -> true; true -> false end end,
-                "if number(3) -> true; true -> false end.", true),
-    ?line check(fun() -> if is_atom(a) -> true; true -> false end end,
-                "if is_atom(a) -> true; true -> false end.", true),
-    ?line check(fun() -> if atom(a) -> true; true -> false end end,
-                "if atom(a) -> true; true -> false end.", true),
-    ?line check(fun() -> if is_list([]) -> true; true -> false end end,
-                "if is_list([]) -> true; true -> false end.", true),
-    ?line check(fun() -> if list([]) -> true; true -> false end end,
-                "if list([]) -> true; true -> false end.", true),
-    ?line check(fun() -> if is_tuple({}) -> true; true -> false end end,
-                "if is_tuple({}) -> true; true -> false end.", true),
-    ?line check(fun() -> if tuple({}) -> true; true -> false end end,
-                "if tuple({}) -> true; true -> false end.", true),
-    ?line check(fun() -> if is_pid(self()) -> true; true -> false end end,
-                "if is_pid(self()) -> true; true -> false end.", true),
-    ?line check(fun() -> if pid(self()) -> true; true -> false end end,
-                "if pid(self()) -> true; true -> false end.", true),
-    ?line check(fun() -> R = make_ref(), if is_reference(R) -> true; 
-                                            true -> false end end,
-                "begin R = make_ref(), if is_reference(R) -> true;"
-                "true -> false end end.", true),
-    ?line check(fun() -> R = make_ref(), if reference(R) -> true; 
-                                            true -> false end end,
-                "begin R = make_ref(), if reference(R) -> true;"
-                "true -> false end end.", true),
-    ?line check(fun() -> if is_port(a) -> true; true -> false end end,
-                "if is_port(a) -> true; true -> false end.", false),
-    ?line check(fun() -> if port(a) -> true; true -> false end end,
-                "if port(a) -> true; true -> false end.", false),
-    ?line check(fun() -> if is_function(a) -> true; true -> false end end,
-                "if is_function(a) -> true; true -> false end.", false),
-    ?line check(fun() -> if function(a) -> true; true -> false end end,
-                "if function(a) -> true; true -> false end.", false),
-    ?line check(fun() -> if is_binary(<<>>) -> true; true -> false end end,
-                "if is_binary(<<>>) -> true; true -> false end.", true),
-    ?line check(fun() -> if binary(<<>>) -> true; true -> false end end,
-                "if binary(<<>>) -> true; true -> false end.", true),
-    ?line check(fun() -> if is_integer(a) == true -> yes; 
-                            true -> no end end,
-                "if is_integer(a) == true -> yes; 
+    check(fun() -> if is_integer(3) -> true; true -> false end end,
+	  "if is_integer(3) -> true; true -> false end.", true),
+    check(fun() -> if integer(3) -> true; true -> false end end,
+	  "if integer(3) -> true; true -> false end.", true),
+    check(fun() -> if is_float(3) -> true; true -> false end end,
+	  "if is_float(3) -> true; true -> false end.", false),
+    check(fun() -> if float(3) -> true; true -> false end end,
+	  "if float(3) -> true; true -> false end.", false),
+    check(fun() -> if is_number(3) -> true; true -> false end end,
+	  "if is_number(3) -> true; true -> false end.", true),
+    check(fun() -> if number(3) -> true; true -> false end end,
+	  "if number(3) -> true; true -> false end.", true),
+    check(fun() -> if is_atom(a) -> true; true -> false end end,
+	  "if is_atom(a) -> true; true -> false end.", true),
+    check(fun() -> if atom(a) -> true; true -> false end end,
+	  "if atom(a) -> true; true -> false end.", true),
+    check(fun() -> if is_list([]) -> true; true -> false end end,
+	  "if is_list([]) -> true; true -> false end.", true),
+    check(fun() -> if list([]) -> true; true -> false end end,
+	  "if list([]) -> true; true -> false end.", true),
+    check(fun() -> if is_tuple({}) -> true; true -> false end end,
+	  "if is_tuple({}) -> true; true -> false end.", true),
+    check(fun() -> if tuple({}) -> true; true -> false end end,
+	  "if tuple({}) -> true; true -> false end.", true),
+    check(fun() -> if is_pid(self()) -> true; true -> false end end,
+	  "if is_pid(self()) -> true; true -> false end.", true),
+    check(fun() -> if pid(self()) -> true; true -> false end end,
+	  "if pid(self()) -> true; true -> false end.", true),
+    check(fun() -> R = make_ref(), if is_reference(R) -> true;
+				      true -> false end end,
+	  "begin R = make_ref(), if is_reference(R) -> true;"
+	  "true -> false end end.", true),
+    check(fun() -> R = make_ref(), if reference(R) -> true;
+				      true -> false end end,
+	  "begin R = make_ref(), if reference(R) -> true;"
+	  "true -> false end end.", true),
+    check(fun() -> if is_port(a) -> true; true -> false end end,
+	  "if is_port(a) -> true; true -> false end.", false),
+    check(fun() -> if port(a) -> true; true -> false end end,
+	  "if port(a) -> true; true -> false end.", false),
+    check(fun() -> if is_function(a) -> true; true -> false end end,
+	  "if is_function(a) -> true; true -> false end.", false),
+    check(fun() -> if function(a) -> true; true -> false end end,
+	  "if function(a) -> true; true -> false end.", false),
+    check(fun() -> if is_binary(<<>>) -> true; true -> false end end,
+	  "if is_binary(<<>>) -> true; true -> false end.", true),
+    check(fun() -> if binary(<<>>) -> true; true -> false end end,
+	  "if binary(<<>>) -> true; true -> false end.", true),
+    check(fun() -> if is_integer(a) == true -> yes;
+		      true -> no end end,
+	  "if is_integer(a) == true -> yes;
                             true -> no end.",
                 no),
-    ?line check(fun() -> if [] -> true; true -> false end end,
-                "if [] -> true; true -> false end.", false),
-    ?line error_check("if lists:member(1,[1]) -> true; true -> false end.",
-                      illegal_guard_expr),
-    ?line error_check("if false -> true end.", if_clause),
-    ?line check(fun() -> if a+b -> true; true -> false end end,
-                "if a + b -> true; true -> false end.", false),
-    ?line check(fun() -> if + b -> true; true -> false end end,
-                "if + b -> true; true -> false end.", false),
-    ?line error_check("case foo of bar -> true end.", {case_clause,foo}),
-    ?line error_check("case 4 of 2+a -> true; _ -> false end.", 
-                      illegal_pattern),
-    ?line error_check("case 4 of +a -> true; _ -> false end.", 
-                      illegal_pattern),
-    ?line check(fun() -> case a of 
-                             X when X == b -> one;
-                             X when X == a -> two
-                         end end,
-                "begin case a of 
+    check(fun() -> if [] -> true; true -> false end end,
+	  "if [] -> true; true -> false end.", false),
+    error_check("if lists:member(1,[1]) -> true; true -> false end.",
+		illegal_guard_expr),
+    error_check("if false -> true end.", if_clause),
+    check(fun() -> if a+b -> true; true -> false end end,
+	  "if a + b -> true; true -> false end.", false),
+    check(fun() -> if + b -> true; true -> false end end,
+	  "if + b -> true; true -> false end.", false),
+    error_check("case foo of bar -> true end.", {case_clause,foo}),
+    error_check("case 4 of 2+a -> true; _ -> false end.",
+		illegal_pattern),
+    error_check("case 4 of +a -> true; _ -> false end.",
+		illegal_pattern),
+    check(fun() -> case a of
+		       X when X == b -> one;
+		       X when X == a -> two
+		   end end,
+	  "begin case a of
                              X when X == b -> one;
-                             X when X == a -> two
-                         end end.", two),
-    ?line error_check("3 = 4.", {badmatch,4}),
-    ?line error_check("a = 3.", {badmatch,3}),
-    %% ?line error_check("3.1 = 2.7.",{badmatch,2.7}),
-    ?line error_check("$c = 4.", {badmatch,4}),
-    ?line check(fun() -> $c = $c end, "$c = $c.", $c),
-    ?line check(fun() -> _ = bar end, "_ = bar.", bar),
-    ?line check(fun() -> A = 14, A = 14 end, 
+	      X when X == a -> two
+	 end end.", two),
+    error_check("3 = 4.", {badmatch,4}),
+	  error_check("a = 3.", {badmatch,3}),
+    %% error_check("3.1 = 2.7.",{badmatch,2.7}),
+	  error_check("$c = 4.", {badmatch,4}),
+	  check(fun() -> $c = $c end, "$c = $c.", $c),
+	  check(fun() -> _ = bar end, "_ = bar.", bar),
+	  check(fun() -> A = 14, A = 14 end,
                 "begin A = 14, A = 14 end.", 14),
-    ?line error_check("begin A = 14, A = 16 end.", {badmatch,16}),
-    ?line error_check("\"hej\" = \"san\".", {badmatch,"san"}),
-    ?line check(fun() -> "hej" = "hej" end,
+	  error_check("begin A = 14, A = 16 end.", {badmatch,16}),
+	  error_check("\"hej\" = \"san\".", {badmatch,"san"}),
+	  check(fun() -> "hej" = "hej" end,
                 "\"hej\" = \"hej\".", "hej"),
-    ?line error_check("[] = [a].", {badmatch,[a]}),
-    ?line check(fun() -> [] = [] end, "[] = [].", []),
-    ?line error_check("[a] = [].", {badmatch,[]}),
-    ?line error_check("{a,b} = 34.", {badmatch,34}),
-    ?line check(fun() -> <<X:7>> = <<8:7>>, X end,
+	  error_check("[] = [a].", {badmatch,[a]}),
+	  check(fun() -> [] = [] end, "[] = [].", []),
+	  error_check("[a] = [].", {badmatch,[]}),
+	  error_check("{a,b} = 34.", {badmatch,34}),
+	  check(fun() -> <<X:7>> = <<8:7>>, X end,
 		"begin <<X:7>> = <<8:7>>, X end.", 8),
-    ?line error_check("<<34:32>> = \"hej\".", {badmatch,"hej"}),
-    ?line check(fun() -> trunc((1 * 3 div 3 + 4 - 3) / 1) rem 2 end,
+	  error_check("<<34:32>> = \"hej\".", {badmatch,"hej"}),
+	  check(fun() -> trunc((1 * 3 div 3 + 4 - 3) / 1) rem 2 end,
                 "begin trunc((1 * 3 div 3 + 4 - 3) / 1) rem 2 end.", 0),
-    ?line check(fun() -> (2#101 band 2#10101) bor (2#110 bxor 2#010) end,
+	  check(fun() -> (2#101 band 2#10101) bor (2#110 bxor 2#010) end,
                 "(2#101 band 2#10101) bor (2#110 bxor 2#010).", 5),
-    ?line check(fun() -> (2#1 bsl 4) + (2#10000 bsr 3) end,
+	  check(fun() -> (2#1 bsl 4) + (2#10000 bsr 3) end,
                 "(2#1 bsl 4) + (2#10000 bsr 3).", 18),
-    ?line check(fun() -> ((1<3) and ((1 =:= 2) or (1 =/= 2))) xor (1=<2) end,
+	  check(fun() -> ((1<3) and ((1 =:= 2) or (1 =/= 2))) xor (1=<2) end,
                 "((1<3) and ((1 =:= 2) or (1 =/= 2))) xor (1=<2).", false),
-    ?line check(fun() -> (a /= b) or (2 > 4) or (3 >= 3) end,
+	  check(fun() -> (a /= b) or (2 > 4) or (3 >= 3) end,
                 "(a /= b) or (2 > 4) or (3 >= 3).", true),
-    ?line check(fun() -> "hej" ++ "san" =/= "hejsan" -- "san" end,
+	  check(fun() -> "hej" ++ "san" =/= "hejsan" -- "san" end,
                 "\"hej\" ++ \"san\" =/= \"hejsan\" -- \"san\".", true),
-    ?line check(fun() -> (bnot 1) < -0 end, "(bnot (+1)) < -0.", true),
-    ok.
+	  check(fun() -> (bnot 1) < -0 end, "(bnot (+1)) < -0.", true),
+	  ok.
 
-unary_plus(doc) ->
-    ["OTP-4929. Unary plus rejects non-numbers."];
-unary_plus(suite) ->
-    [];
+%% OTP-4929. Unary plus rejects non-numbers.
 unary_plus(Config) when is_list(Config) ->
-    ?line check(fun() -> F = fun(X) -> + X end, 
-                         true = -1 == F(-1) end,
-                "begin F = fun(X) -> + X end," 
-                "      true = -1 == F(-1) end.", true, ['F'], none, none),
-    ?line error_check("+a.", badarith),
+    check(fun() -> F = fun(X) -> + X end,
+		   true = -1 == F(-1) end,
+	  "begin F = fun(X) -> + X end,"
+	  "      true = -1 == F(-1) end.", true, ['F'], none, none),
+    error_check("+a.", badarith),
     ok.
 
-apply_atom(doc) ->
-    ["OTP-5064. Can no longer apply atoms."];
-apply_atom(suite) ->
-    [];
+%% OTP-5064. Can no longer apply atoms.
 apply_atom(Config) when is_list(Config) ->
-    ?line error_check("[X || X <- [[1],[2]], 
+    error_check("[X || X <- [[1],[2]],
                              begin L = length, L(X) =:= 1 end].", 
                       {badfun,length}),
     ok.
 
-otp_5269(doc) ->
-    ["OTP-5269. Bugs in the bit syntax."];
-otp_5269(suite) ->
-    [];
+%% OTP-5269. Bugs in the bit syntax.
 otp_5269(Config) when is_list(Config) ->
-    ?line check(fun() -> L = 8,
+    check(fun() -> L = 8,
                          F = fun(<<A:L,B:A>>) -> B end,
                          F(<<16:8, 7:16>>)
                 end,
@@ -560,7 +517,7 @@ otp_5269(Config) when is_list(Config) ->
                    L = 8, F = fun(<<A:L,B:A>>) -> B end, F(<<16:8, 7:16>>)
                  end.",
                 7),
-    ?line check(fun() -> L = 8,
+    check(fun() -> L = 8,
                          F = fun(<<L:L,B:L>>) -> B end,
                          F(<<16:8, 7:16>>)
                 end,
@@ -568,31 +525,31 @@ otp_5269(Config) when is_list(Config) ->
                    L = 8, F = fun(<<L:L,B:L>>) -> B end, F(<<16:8, 7:16>>)
                  end.",
                 7),
-    ?line check(fun() -> L = 8, <<A:L,B:A>> = <<16:8, 7:16>>, B end,
+    check(fun() -> L = 8, <<A:L,B:A>> = <<16:8, 7:16>>, B end,
                 "begin L = 8, <<A:L,B:A>> = <<16:8, 7:16>>, B end.",
                 7),
-    ?line error_check("begin L = 8, <<L:L,B:L>> = <<16:8, 7:16>> end.",
+    error_check("begin L = 8, <<L:L,B:L>> = <<16:8, 7:16>> end.",
                       {badmatch,<<16:8,7:16>>}),
     
-    ?line error_check("begin <<L:16,L:L>> = <<16:16,8:16>>, L end.",
+    error_check("begin <<L:16,L:L>> = <<16:16,8:16>>, L end.",
                       {badmatch, <<16:16,8:16>>}),
-    ?line check(fun() -> U = 8, (fun(<<U:U>>) -> U end)(<<32:8>>) end,
+    check(fun() -> U = 8, (fun(<<U:U>>) -> U end)(<<32:8>>) end,
                 "begin U = 8, (fun(<<U:U>>) -> U end)(<<32:8>>) end.",
                 32),
-    ?line check(fun() -> U = 8, [U || <<U:U>> <- [<<32:8>>]] end,
+    check(fun() -> U = 8, [U || <<U:U>> <- [<<32:8>>]] end,
                 "begin U = 8, [U || <<U:U>> <- [<<32:8>>]] end.",
                 [32]),
-    ?line error_check("(fun({3,<<A:32,A:32>>}) -> a end)
+    error_check("(fun({3,<<A:32,A:32>>}) -> a end)
                           ({3,<<17:32,19:32>>}).",
                       function_clause),
-    ?line check(fun() -> [X || <<A:8,
+    check(fun() -> [X || <<A:8,
                                  B:A>> <- [<<16:8,19:16>>],
                                <<X:8>> <- [<<B:8>>]] end,
                 "[X || <<A:8,
                                  B:A>> <- [<<16:8,19:16>>],
                                <<X:8>> <- [<<B:8>>]].",
                 [19]),
-    ?line check(fun() ->
+    check(fun() ->
 		(fun (<<A:1/binary, B:8/integer, _C:B/binary>>) ->
 			    case A of
 				B -> wrong;
@@ -605,12 +562,9 @@ otp_5269(Config) when is_list(Config) ->
 		ok),
     ok.
 
-otp_6539(doc) ->
-    ["OTP-6539. try/catch bugs."];
-otp_6539(suite) ->
-    [];
+%% OTP-6539. try/catch bugs.
 otp_6539(Config) when is_list(Config) ->
-    ?line check(fun() -> 
+    check(fun() ->
                         F = fun(A,B) -> 
                                     try A+B 
                                     catch _:_ -> dontthinkso 
@@ -629,152 +583,149 @@ otp_6539(Config) when is_list(Config) ->
                 [3, 5]),
     ok.
 
-otp_6543(doc) ->
-    ["OTP-6543. bitlevel binaries."];
-otp_6543(suite) ->
-    [];
+%% OTP-6543. bitlevel binaries.
 otp_6543(Config) when is_list(Config) ->
-    ?line check(fun() ->
+    check(fun() ->
                         << <<X>> || <<X>> <- [1,2,3] >>
                 end,
                 "<< <<X>> || <<X>> <- [1,2,3] >>.",
                 <<>>),
-    ?line check(fun() -> 
+    check(fun() ->
                         << <<X>> || X <- [1,2,3] >>
                 end,
                 "<< <<X>> || X <- [1,2,3] >>.",
                 <<1,2,3>>),
-    ?line check(fun() -> 
+    check(fun() ->
                         << <<X:8>> || <<X:2>> <= <<"hej">> >>
                 end,
                 "<< <<X:8>> || <<X:2>> <= <<\"hej\">> >>.",
                 <<1,2,2,0,1,2,1,1,1,2,2,2>>),
-    ?line check(fun() ->
+    check(fun() ->
                         << <<X:8>> || 
                             <<65,X:4>> <= <<65,7:4,65,3:4,66,8:4>> >>
                 end,
                 "<< <<X:8>> || 
                             <<65,X:4>> <= <<65,7:4,65,3:4,66,8:4>> >>.",
                 <<7,3>>),
-    ?line check(fun() -> <<34:18/big>> end,
+    check(fun() -> <<34:18/big>> end,
                 "<<34:18/big>>.",
                 <<0,8,2:2>>),
-    ?line check(fun() -> <<34:18/big-unit:2>> end,
+    check(fun() -> <<34:18/big-unit:2>> end,
                 "<<34:18/big-unit:2>>.",
                 <<0,0,0,2,2:4>>),
-    ?line check(fun() -> <<34:18/little>> end,
+    check(fun() -> <<34:18/little>> end,
                 "<<34:18/little>>.",
                 <<34,0,0:2>>),
-    ?line case eval_string("<<34:18/native>>.") of
+    case eval_string("<<34:18/native>>.") of
               <<0,8,2:2>> -> ok;
               <<34,0,0:2>> -> ok
           end,
-    ?line check(fun() -> <<34:18/big-signed>> end,
+    check(fun() -> <<34:18/big-signed>> end,
                 "<<34:18/big-signed>>.",
                 <<0,8,2:2>>),
-    ?line check(fun() -> <<34:18/little-signed>> end,
+    check(fun() -> <<34:18/little-signed>> end,
                 "<<34:18/little-signed>>.",
                 <<34,0,0:2>>),
-    ?line case eval_string("<<34:18/native-signed>>.") of
+    case eval_string("<<34:18/native-signed>>.") of
               <<0,8,2:2>> -> ok;
               <<34,0,0:2>> -> ok
           end,
-    ?line check(fun() -> <<34:18/big-unsigned>> end,
+    check(fun() -> <<34:18/big-unsigned>> end,
                 "<<34:18/big-unsigned>>.",
                 <<0,8,2:2>>),
-    ?line check(fun() -> <<34:18/little-unsigned>> end,
+    check(fun() -> <<34:18/little-unsigned>> end,
                 "<<34:18/little-unsigned>>.",
                 <<34,0,0:2>>),
-    ?line case eval_string("<<34:18/native-unsigned>>.") of
+    case eval_string("<<34:18/native-unsigned>>.") of
               <<0,8,2:2>> -> ok;
               <<34,0,0:2>> -> ok
           end,
-    ?line check(fun() -> <<3.14:32/float-big>> end,
+    check(fun() -> <<3.14:32/float-big>> end,
                 "<<3.14:32/float-big>>.",
                 <<64,72,245,195>>),
-    ?line check(fun() -> <<3.14:32/float-little>> end,
+    check(fun() -> <<3.14:32/float-little>> end,
                 "<<3.14:32/float-little>>.",
                 <<195,245,72,64>>),
-    ?line case eval_string("<<3.14:32/float-native>>.") of
+    case eval_string("<<3.14:32/float-native>>.") of
               <<64,72,245,195>> -> ok;
               <<195,245,72,64>> -> ok
           end,
-    ?line error_check("<<(<<17,3:2>>)/binary>>.", badarg),
-    ?line check(fun() -> <<(<<17,3:2>>)/bitstring>> end,
+    error_check("<<(<<17,3:2>>)/binary>>.", badarg),
+    check(fun() -> <<(<<17,3:2>>)/bitstring>> end,
                 "<<(<<17,3:2>>)/bitstring>>.",
                 <<17,3:2>>),
-    ?line check(fun() -> <<(<<17,3:2>>):10/bitstring>> end,
+    check(fun() -> <<(<<17,3:2>>):10/bitstring>> end,
                 "<<(<<17,3:2>>):10/bitstring>>.",
                 <<17,3:2>>),
-    ?line check(fun() -> <<<<344:17>>/binary-unit:17>> end,
+    check(fun() -> <<<<344:17>>/binary-unit:17>> end,
 		"<<<<344:17>>/binary-unit:17>>.",
 		<<344:17>>),
 
-    ?line check(fun() -> <<X:18/big>> = <<34:18/big>>, X end,
+    check(fun() -> <<X:18/big>> = <<34:18/big>>, X end,
                 "begin <<X:18/big>> = <<34:18/big>>, X end.",
                 34),
-    ?line check(fun() -> <<X:18/big-unit:2>> = <<34:18/big-unit:2>>, X end,
+    check(fun() -> <<X:18/big-unit:2>> = <<34:18/big-unit:2>>, X end,
                 "begin <<X:18/big-unit:2>> = <<34:18/big-unit:2>>, X end.",
                 34),
-    ?line check(fun() -> <<X:18/little>> = <<34:18/little>>, X end,
+    check(fun() -> <<X:18/little>> = <<34:18/little>>, X end,
                 "begin <<X:18/little>> = <<34:18/little>>, X end.",
                 34),
-    ?line check(fun() -> <<X:18/native>> = <<34:18/native>>, X end,
+    check(fun() -> <<X:18/native>> = <<34:18/native>>, X end,
                 "begin <<X:18/native>> = <<34:18/native>>, X end.",
                 34),
-    ?line check(fun() -> <<X:18/big-signed>> = <<34:18/big-signed>>, X end,
+    check(fun() -> <<X:18/big-signed>> = <<34:18/big-signed>>, X end,
                 "begin <<X:18/big-signed>> = <<34:18/big-signed>>, X end.",
                 34),
-    ?line check(fun() -> <<X:18/little-signed>> = <<34:18/little-signed>>, 
+    check(fun() -> <<X:18/little-signed>> = <<34:18/little-signed>>,
                          X end,
                 "begin <<X:18/little-signed>> = <<34:18/little-signed>>, 
                        X end.",
                 34),
-    ?line check(fun() -> <<X:18/native-signed>> = <<34:18/native-signed>>, 
+    check(fun() -> <<X:18/native-signed>> = <<34:18/native-signed>>,
                          X end,
                 "begin <<X:18/native-signed>> = <<34:18/native-signed>>, 
                        X end.",
                 34),
-    ?line check(fun() -> <<X:18/big-unsigned>> = <<34:18/big-unsigned>>, 
+    check(fun() -> <<X:18/big-unsigned>> = <<34:18/big-unsigned>>,
                          X end,
                 "begin <<X:18/big-unsigned>> = <<34:18/big-unsigned>>, 
                        X end.",
                 34),
-    ?line check(fun() -> 
+    check(fun() ->
                         <<X:18/little-unsigned>> = <<34:18/little-unsigned>>, 
                         X end,
                 "begin <<X:18/little-unsigned>> = <<34:18/little-unsigned>>, 
                        X end.",
                 34),
-    ?line check(fun() -> 
+    check(fun() ->
                         <<X:18/native-unsigned>> = <<34:18/native-unsigned>>, 
                         X end,
                 "begin <<X:18/native-unsigned>> = <<34:18/native-unsigned>>, 
                        X end.",
                 34),
-    ?line check(fun() -> <<X:32/float-big>> = <<2.0:32/float-big>>, X end,
+    check(fun() -> <<X:32/float-big>> = <<2.0:32/float-big>>, X end,
                 "begin <<X:32/float-big>> = <<2.0:32/float-big>>, 
                         X end.",
                 2.0),
-    ?line check(fun() -> <<X:32/float-little>> = <<2.0:32/float-little>>, 
+    check(fun() -> <<X:32/float-little>> = <<2.0:32/float-little>>,
                          X end,
                 "begin <<X:32/float-little>> = <<2.0:32/float-little>>, 
                         X end.",
                 2.0),
-    ?line check(fun() -> <<X:32/float-native>> = <<2.0:32/float-native>>, 
+    check(fun() -> <<X:32/float-native>> = <<2.0:32/float-native>>,
                          X end,
                 "begin <<X:32/float-native>> = <<2.0:32/float-native>>, 
                         X end.",
                 2.0),
 
-    ?line check(
+    check(
             fun() -> 
                     [X || <<"hej",X:8>> <= <<"hej",8,"san",9,"hej",17,"hej">>]
             end,
             "[X || <<\"hej\",X:8>> <= 
                         <<\"hej\",8,\"san\",9,\"hej\",17,\"hej\">>].",
             [8,17]),
-    ?line check(
+    check(
             fun() ->
                     L = 8, << <<B:32>> || <<L:L,B:L>> <= <<16:8, 7:16>> >>
             end,
@@ -783,41 +734,41 @@ otp_6543(Config) when is_list(Config) ->
             <<0,0,0,7>>),
     %% Test the Value part of a binary segment. 
     %% "Old" bugs have been fixed (partial_eval is called on Value).
-    ?line check(fun() -> [ 3 || <<17/float>> <= <<17.0/float>>] end,
+    check(fun() -> [ 3 || <<17/float>> <= <<17.0/float>>] end,
                 "[ 3 || <<17/float>> <= <<17.0/float>>].",
                 [3]),
-    ?line check(fun() -> [ 3 || <<17/float>> <- [<<17.0/float>>]] end,
+    check(fun() -> [ 3 || <<17/float>> <- [<<17.0/float>>]] end,
                 "[ 3 || <<17/float>> <- [<<17.0/float>>]].",
                 [3]),
-    ?line check(fun() -> [ X || <<17/float,X:3>> <= <<17.0/float,2:3>>] end,
+    check(fun() -> [ X || <<17/float,X:3>> <= <<17.0/float,2:3>>] end,
                 "[ X || <<17/float,X:3>> <= <<17.0/float,2:3>>].",
                 [2]),
-    ?line check(fun() -> 
+    check(fun() ->
                  [ foo || <<(1 bsl 1023)/float>> <= <<(1 bsl 1023)/float>>]
                 end,
                 "[ foo || <<(1 bsl 1023)/float>> <= <<(1 bsl 1023)/float>>].",
                 [foo]),
-    ?line check(fun() -> 
+    check(fun() ->
                  [ foo || <<(1 bsl 1023)/float>> <- [<<(1 bsl 1023)/float>>]]
                 end,
                "[ foo || <<(1 bsl 1023)/float>> <- [<<(1 bsl 1023)/float>>]].",
                 [foo]),
-    ?line error_check("[ foo || <<(1 bsl 1024)/float>> <- 
+    error_check("[ foo || <<(1 bsl 1024)/float>> <-
                             [<<(1 bsl 1024)/float>>]].",
                       badarg),
-    ?line check(fun() -> 
+    check(fun() ->
                  [ foo || <<(1 bsl 1024)/float>> <- [<<(1 bsl 1023)/float>>]]
                 end,
                 "[ foo || <<(1 bsl 1024)/float>> <- 
                             [<<(1 bsl 1023)/float>>]].",
                 []),
-    ?line check(fun() -> 
+    check(fun() ->
                  [ foo || <<(1 bsl 1024)/float>> <= <<(1 bsl 1023)/float>>]
                 end,
                 "[ foo || <<(1 bsl 1024)/float>> <= 
                             <<(1 bsl 1023)/float>>].",
                 []),
-    ?line check(fun() ->
+    check(fun() ->
                         L = 8, 
                         [{L,B} || <<L:L,B:L/float>> <= <<32:8,7:32/float>>]
                 end,
@@ -825,7 +776,7 @@ otp_6543(Config) when is_list(Config) ->
                        [{L,B} || <<L:L,B:L/float>> <= <<32:8,7:32/float>>]
                  end.",
                 [{32,7.0}]),
-    ?line check(fun() ->
+    check(fun() ->
                         L = 8, 
                         [{L,B} || <<L:L,B:L/float>> <- [<<32:8,7:32/float>>]]
                 end,
@@ -833,127 +784,117 @@ otp_6543(Config) when is_list(Config) ->
                        [{L,B} || <<L:L,B:L/float>> <- [<<32:8,7:32/float>>]]
                  end.",
                 [{32,7.0}]),
-    ?line check(fun() ->
+    check(fun() ->
                         [foo || <<"s">> <= <<"st">>]
                 end,
                 "[foo || <<\"s\">> <= <<\"st\">>].",
                 [foo]),
-    ?line check(fun() -> <<_:32>> = <<17:32>> end,
+    check(fun() -> <<_:32>> = <<17:32>> end,
                 "<<_:32>> = <<17:32>>.",
                 <<17:32>>),
-    ?line check(fun() -> [foo || <<_:32>> <= <<17:32,20:32>>] end,
+    check(fun() -> [foo || <<_:32>> <= <<17:32,20:32>>] end,
                 "[foo || <<_:32>> <= <<17:32,20:32>>].",
                 [foo,foo]),
 
-    ?line check(fun() -> << <<X:32>> || X <- [1,2,3], X > 1 >> end,
+    check(fun() -> << <<X:32>> || X <- [1,2,3], X > 1 >> end,
                 "<< <<X:32>> || X <- [1,2,3], X > 1 >>.",
                 <<0,0,0,2,0,0,0,3>>),
-    ?line error_check("[X || <<X>> <= [a,b]].",{bad_generator,[a,b]}),
+    error_check("[X || <<X>> <= [a,b]].",{bad_generator,[a,b]}),
     ok.
 
-otp_6787(doc) ->
-    ["OTP-6787. bitlevel binaries."];
-otp_6787(suite) ->
-    [];
+%% OTP-6787. bitlevel binaries.
 otp_6787(Config) when is_list(Config) ->
-    ?line check(
+    check(
             fun() -> <<16:(1024*1024)>> = <<16:(1024*1024)>> end,
             "<<16:(1024*1024)>> = <<16:(1024*1024)>>.",
             <<16:1048576>>),
     ok.
 
-otp_6977(doc) ->
-    ["OTP-6977. ++ bug."];
-otp_6977(suite) ->
-    [];
+%% OTP-6977. ++ bug.
 otp_6977(Config) when is_list(Config) ->
-    ?line check(
+    check(
             fun() -> (fun([$X] ++ _) -> ok end)("X") end,
             "(fun([$X] ++ _) -> ok end)(\"X\").",
             ok),
     ok.
 
-otp_7550(doc) ->
-    ["OTP-7550. Support for UTF-8, UTF-16, UTF-32."];
+%% OTP-7550. Support for UTF-8, UTF-16, UTF-32.
 otp_7550(Config) when is_list(Config) ->
 
     %% UTF-8.
-    ?line check(
+    check(
 	    fun() -> <<65>> = <<65/utf8>> end,
 	    "<<65>> = <<65/utf8>>.",
 	    <<65>>),
-    ?line check(
+    check(
 	    fun() -> <<350/utf8>> = <<197,158>> end,
 	    "<<350/utf8>> = <<197,158>>.",
 	    <<197,158>>),
-    ?line check(
+    check(
 	    fun() -> <<$b,$j,$\303,$\266,$r,$n>> = <<"bj\366rn"/utf8>> end,
 	    "<<$b,$j,$\303,$\266,$r,$n>> = <<\"bj\366rn\"/utf8>>.",
 	    <<$b,$j,$\303,$\266,$r,$n>>),
 
     %% UTF-16.
-    ?line check(
+    check(
 	    fun() -> <<0,65>> = <<65/utf16>> end,
 	    "<<0,65>> = <<65/utf16>>.",
 	    <<0,65>>),
-    ?line check(
+    check(
 	    fun() -> <<16#D8,16#08,16#DF,16#45>> = <<16#12345/utf16>> end,
 	    "<<16#D8,16#08,16#DF,16#45>> = <<16#12345/utf16>>.",
 	    <<16#D8,16#08,16#DF,16#45>>),
-    ?line check(
+    check(
 	    fun() -> <<16#08,16#D8,16#45,16#DF>> = <<16#12345/little-utf16>> end,
 	    "<<16#08,16#D8,16#45,16#DF>> = <<16#12345/little-utf16>>.",
 	    <<16#08,16#D8,16#45,16#DF>>),
 
-    ?line check(
+    check(
 	    fun() -> <<350/utf16>> = <<1,94>> end,
 	    "<<350/utf16>> = <<1,94>>.",
 	    <<1,94>>),
-    ?line check(
+    check(
 	    fun() -> <<350/little-utf16>> = <<94,1>> end,
 	    "<<350/little-utf16>> = <<94,1>>.",
 	    <<94,1>>),
-    ?line check(
+    check(
 	    fun() -> <<16#12345/utf16>> = <<16#D8,16#08,16#DF,16#45>> end,
 	    "<<16#12345/utf16>> = <<16#D8,16#08,16#DF,16#45>>.",
 	    <<16#D8,16#08,16#DF,16#45>>),
-    ?line check(
+    check(
 	    fun() -> <<16#12345/little-utf16>> = <<16#08,16#D8,16#45,16#DF>> end,
 	    "<<16#12345/little-utf16>> = <<16#08,16#D8,16#45,16#DF>>.",
 	    <<16#08,16#D8,16#45,16#DF>>),
 
     %% UTF-32.
-    ?line check(
+    check(
 	    fun() -> <<16#12345/utf32>> = <<16#0,16#01,16#23,16#45>> end,
 	    "<<16#12345/utf32>> = <<16#0,16#01,16#23,16#45>>.",
 	    <<16#0,16#01,16#23,16#45>>),
-    ?line check(
+    check(
 	    fun() -> <<16#0,16#01,16#23,16#45>> = <<16#12345/utf32>> end,
 	    "<<16#0,16#01,16#23,16#45>> = <<16#12345/utf32>>.",
 	    <<16#0,16#01,16#23,16#45>>),
-    ?line check(
+    check(
 	    fun() -> <<16#12345/little-utf32>> = <<16#45,16#23,16#01,16#00>> end,
 	    "<<16#12345/little-utf32>> = <<16#45,16#23,16#01,16#00>>.",
 	    <<16#45,16#23,16#01,16#00>>),
-    ?line check(
+    check(
 	    fun() -> <<16#12345/little-utf32>> end,
 	    "<<16#12345/little-utf32>>.",
 	    <<16#45,16#23,16#01,16#00>>),
 
     %% Mixed.
-    ?line check(
+    check(
 	    fun() -> <<16#41,16#12345/utf32,16#0391:16,16#2E:8>> end,
 	    "<<16#41,16#12345/utf32,16#0391:16,16#2E:8>>.",
 	    <<16#41,16#00,16#01,16#23,16#45,16#03,16#91,16#2E>>),
     ok.
 
 
-otp_8133(doc) ->
-    ["OTP-8133. Bit comprehension bug."];
-otp_8133(suite) ->
-    [];
+%% OTP-8133. Bit comprehension bug.
 otp_8133(Config) when is_list(Config) ->
-    ?line check(
+    check(
             fun() ->
                   E = fun(N) -> 
                               if 
@@ -976,7 +917,7 @@ otp_8133(Config) when is_list(Config) ->
                  end
              end.",
             ok),
-    ?line check(
+    check(
             fun() ->
                   E = fun(N) -> 
                               if 
@@ -1002,10 +943,7 @@ otp_8133(Config) when is_list(Config) ->
             ok),
     ok.
 
-otp_10622(doc) ->
-    ["OTP-10622. Bugs."];
-otp_10622(suite) ->
-    [];
+%% OTP-10622. Bugs.
 otp_10622(Config) when is_list(Config) ->
     check(fun() -> <<0>> = <<"\x{400}">> end,
           "<<0>> = <<\"\\x{400}\">>. ",
@@ -1044,51 +982,47 @@ otp_10622(Config) when is_list(Config) ->
 
     ok.
 
-otp_13228(doc) ->
-    ["OTP-13228. ERL-32: non-local function handler bug."];
+%% OTP-13228. ERL-32: non-local function handler bug.
 otp_13228(_Config) ->
     LFH = {value, fun(foo, [io_fwrite]) -> worked end},
     EFH = {value, fun({io, fwrite}, [atom]) -> io_fwrite end},
     {value, worked, []} = parse_and_run("foo(io:fwrite(atom)).", LFH, EFH).
 
-funs(doc) ->
-    ["Simple cases, just to cover some code."];
-funs(suite) ->
-    [];
+%% Simple cases, just to cover some code.
 funs(Config) when is_list(Config) ->
     do_funs(none, none),
     do_funs(lfh(), none),
     do_funs(lfh(), efh()),
 
-    ?line error_check("nix:foo().", {access_not_allowed,nix}, lfh(), efh()),
-    ?line error_check("bar().", undef, none, none),
+    error_check("nix:foo().", {access_not_allowed,nix}, lfh(), efh()),
+    error_check("bar().", undef, none, none),
 
-    ?line check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
+    check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
                          F1(F1, 1000) end,
                 "begin F1 = fun(F,N) -> count_down(F, N) end,"
                 "F1(F1,1000) end.",
 		0, ['F1'], lfh(), none),
 
-    ?line check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
+    check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
                          F1(F1, 1000) end,
                 "begin F1 = fun(F,N) -> count_down(F, N) end,"
                 "F1(F1,1000) end.",
 		0, ['F1'], lfh_value(), none),
 
-    ?line check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
+    check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
                          F1(F1, 1000) end,
                 "begin F1 = fun(F,N) -> count_down(F, N) end,"
                 "F1(F1,1000) end.",
 		0, ['F1'], lfh_value_extra(), none),
 
-    ?line check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
+    check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
                          F1(F1, 1000) end,
                 "begin F1 = fun(F,N) -> count_down(F, N) end,"
                 "F1(F1,1000) end.",
 		0, ['F1'], {?MODULE,local_func_value}, none),
     %% This is not documented, and only for backward compatibility (good!).
     B0 = erl_eval:new_bindings(),
-    ?line check(fun() -> is_function(?MODULE:count_down_fun()) end,
+    check(fun() -> is_function(?MODULE:count_down_fun()) end,
                 "begin is_function(count_down_fun()) end.",
                 true, [], {?MODULE,local_func,[B0]},none),
 
@@ -1096,19 +1030,19 @@ funs(Config) when is_list(Config) ->
             ({M,F}, As) -> apply(M, F, As)
          end,
     EFH = {value, EF},
-    ?line error_check("apply(timer, sleep, [1]).", got_it, none, EFH),
-    ?line error_check("begin F = fun(T) -> timer:sleep(T) end,F(1) end.",
+    error_check("apply(timer, sleep, [1]).", got_it, none, EFH),
+    error_check("begin F = fun(T) -> timer:sleep(T) end,F(1) end.",
                       got_it, none, EFH),
-    ?line error_check("fun c/1.", undef),
-    ?line error_check("fun a:b/0().", undef),
+    error_check("fun c/1.", undef),
+    error_check("fun a:b/0().", undef),
 
     MaxArgs = 20,
-    ?line [true] = 
+    [true] =
         lists:usort([run_many_args(SAs) || SAs <- many_args(MaxArgs)]),
-    ?line {'EXIT',{{argument_limit,_},_}} = 
+    {'EXIT',{{argument_limit,_},_}} =
         (catch run_many_args(many_args1(MaxArgs+1))),
 
-    ?line check(fun() -> M = lists, F = fun M:reverse/1,
+    check(fun() -> M = lists, F = fun M:reverse/1,
 			 [1,2] = F([2,1]), ok end,
 		"begin M = lists, F = fun M:reverse/1,"
 		" [1,2] = F([2,1]), ok end.",
@@ -1142,17 +1076,17 @@ do_funs(LFH, EFH) ->
     %% manually with 1000 replaced by 1000000.
 
     M = atom_to_list(?MODULE),
-    ?line check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
+    check(fun() -> F1 = fun(F,N) -> ?MODULE:count_down(F, N) end,
                          F1(F1, 1000) end,
                 concat(["begin F1 = fun(F,N) -> ", M, 
                         ":count_down(F, N) end, F1(F1,1000) end."]),
 		0, ['F1'], LFH, EFH),
-    ?line check(fun() -> F1 = fun(F,N) -> apply(?MODULE,count_down,[F,N]) 
+    check(fun() -> F1 = fun(F,N) -> apply(?MODULE,count_down,[F,N])
                               end, F1(F1, 1000) end,
                 concat(["begin F1 = fun(F,N) -> apply(", M, 
                         ",count_down,[F, N]) end, F1(F1,1000) end."]),
 		0, ['F1'], LFH, EFH),
-    ?line check(fun() -> F = fun(F,N) when N > 0 -> apply(F,[F,N-1]); 
+    check(fun() -> F = fun(F,N) when N > 0 -> apply(F,[F,N-1]);
                                 (_F,0) -> ok end, 
                          F(F, 1000)
                 end,
@@ -1160,7 +1094,7 @@ do_funs(LFH, EFH) ->
                              "(_F,0) -> ok end,"
                        "F(F, 1000) end.",
                 ok, ['F'], LFH, EFH),
-    ?line check(fun() -> F = fun(F,N) when N > 0 -> 
+    check(fun() -> F = fun(F,N) when N > 0 ->
                                      apply(erlang,apply,[F,[F,N-1]]);
                                 (_F,0) -> ok end, 
                          F(F, 1000)
@@ -1170,7 +1104,7 @@ do_funs(LFH, EFH) ->
                              "(_F,0) -> ok end,"
                        "F(F, 1000) end.",
                 ok, ['F'], LFH, EFH),
-    ?line check(fun() -> F = count_down_fun(), 
+    check(fun() -> F = count_down_fun(),
                          SF = fun(SF, F1, N) -> F(SF, F1, N) end,
                          SF(SF, F, 1000) end,
                 concat(["begin F = ", M, ":count_down_fun(),"
@@ -1179,7 +1113,7 @@ do_funs(LFH, EFH) ->
                 ok, ['F','SF'], LFH, EFH),
 
 
-    ?line check(fun() -> F = fun(X) -> A = 1+X, {X,A} end, 
+    check(fun() -> F = fun(X) -> A = 1+X, {X,A} end,
                          true = {2,3} == F(2) end,
                 "begin F = fun(X) -> A = 1+X, {X,A} end, 
                        true = {2,3} == F(2) end.", true, ['F'], LFH, EFH),
@@ -1188,13 +1122,13 @@ do_funs(LFH, EFH) ->
 	  "begin F = fun(X) -> erlang:'+'(X,2) end,"
 	  "      true = 3 == F(1) end.", true, ['F'],
 	  LFH, EFH),
-    ?line check(fun() -> F = fun(X) -> byte_size(X) end,
+    check(fun() -> F = fun(X) -> byte_size(X) end,
                          ?MODULE:do_apply(F,<<"hej">>) end, 
                 concat(["begin F = fun(X) -> size(X) end,",
                         M,":do_apply(F,<<\"hej\">>) end."]),
                 3, ['F'], LFH, EFH),
 
-    ?line check(fun() -> F1 = fun(X, Z) -> {X,Z} end,
+    check(fun() -> F1 = fun(X, Z) -> {X,Z} end,
                          Z = 5,
                          F2 = fun(X, Y) -> F1(Z,{X,Y}) end,
                          F3 = fun(X, Y) -> {a,F1(Z,{X,Y})} end,
@@ -1211,26 +1145,26 @@ do_funs(LFH, EFH) ->
                        {5,{5,y}} = F2(Z,y), 
                        true = {5,{x,5}} == F2(x,Z) end.",
                 true, ['F1','Z','F2','F3'], LFH, EFH),
-    ?line check(fun() -> F = fun(X) -> byte_size(X) end,
+    check(fun() -> F = fun(X) -> byte_size(X) end,
                          F2 = fun(Y) -> F(Y) end,
                          ?MODULE:do_apply(F2,<<"hej">>) end, 
                 concat(["begin F = fun(X) -> size(X) end,",
                         "F2 = fun(Y) -> F(Y) end,",
                         M,":do_apply(F2,<<\"hej\">>) end."]),
                 3, ['F','F2'], LFH, EFH),
-    ?line check(fun() -> Z = 5, F = fun(X) -> {Z,X} end,
+    check(fun() -> Z = 5, F = fun(X) -> {Z,X} end,
                          F2 = fun(Z) -> F(Z) end, F2(3) end,
                 "begin Z = 5, F = fun(X) -> {Z,X} end,
                        F2 = fun(Z) -> F(Z) end, F2(3) end.",
                 {5,3},['F','F2','Z'], LFH, EFH),
-    ?line check(fun() -> F = fun(Z) -> Z end,
+    check(fun() -> F = fun(Z) -> Z end,
                          F2 = fun(X) -> F(X), Z = {X,X}, Z end,
                          {1,1} = F2(1), Z = 7, Z end,
                 "begin F = fun(Z) -> Z end,
                        F2 = fun(X) -> F(X), Z = {X,X}, Z end,
                        {1,1} = F2(1), Z = 7, Z end.", 7, ['F','F2','Z'], 
                 LFH, EFH),
-    ?line check(fun() -> F = fun(F, N) -> [?MODULE:count_down(F,N) || X <-[1]]
+    check(fun() -> F = fun(F, N) -> [?MODULE:count_down(F,N) || X <-[1]]
                              end, F(F,2) end,
                 concat(["begin F = fun(F, N) -> [", M, 
                        ":count_down(F,N) || X <-[1]] end, F(F,2) end."]),
@@ -1289,45 +1223,42 @@ external_func({M,F}, As) ->
 
 
 
-try_catch(doc) ->
-    ["Test try-of-catch-after-end statement"];
-try_catch(suite) -> 
-    [];
+%% Test try-of-catch-after-end statement.
 try_catch(Config) when is_list(Config) ->
     %% Match in of with catch
-    ?line check(fun() -> try 1 of 1 -> 2 catch _:_ -> 3 end end,
+    check(fun() -> try 1 of 1 -> 2 catch _:_ -> 3 end end,
 		"try 1 of 1 -> 2 catch _:_ -> 3 end.", 2),
-    ?line check(fun() -> try 1 of 1 -> 2; 3 -> 4 catch _:_ -> 5 end end,
+    check(fun() -> try 1 of 1 -> 2; 3 -> 4 catch _:_ -> 5 end end,
 		"try 1 of 1 -> 2; 3 -> 4 catch _:_ -> 5 end.", 2),
-    ?line check(fun() -> try 3 of 1 -> 2; 3 -> 4 catch _:_ -> 5 end end,
+    check(fun() -> try 3 of 1 -> 2; 3 -> 4 catch _:_ -> 5 end end,
 		"try 3 of 1 -> 2; 3 -> 4 catch _:_ -> 5 end.", 4),
     %% Just after
-    ?line check(fun () -> X = try 1 after put(try_catch, 2) end,
+    check(fun () -> X = try 1 after put(try_catch, 2) end,
 			  {X,get(try_catch)} end,
 		"begin X = try 1 after put(try_catch, 2) end, "
 		"{X,get(try_catch)} end.", {1,2}),
     %% Match in of with after
-    ?line check(fun() -> X = try 1 of 1 -> 2 after put(try_catch, 3) end,
+    check(fun() -> X = try 1 of 1 -> 2 after put(try_catch, 3) end,
 			 {X,get(try_catch)} end,
 		"begin X = try 1 of 1 -> 2 after put(try_catch, 3) end, "
 		"{X,get(try_catch)} end.", {2,3}),
-    ?line check(fun() -> X = try 1 of 1 -> 2; 3 -> 4 
+    check(fun() -> X = try 1 of 1 -> 2; 3 -> 4
 			     after put(try_catch, 5) end,
 			 {X,get(try_catch)} end,
 		"begin X = try 1 of 1 -> 2; 3 -> 4 "
 		"          after put(try_catch, 5) end, "
 		"      {X,get(try_catch)} end.", {2,5}),
-    ?line check(fun() -> X = try 3 of 1 -> 2; 3 -> 4 
+    check(fun() -> X = try 3 of 1 -> 2; 3 -> 4
 			     after put(try_catch, 5) end,
 			 {X,get(try_catch)} end,
 		"begin X = try 3 of 1 -> 2; 3 -> 4 "
 		"          after put(try_catch, 5) end, "
 		"      {X,get(try_catch)} end.", {4,5}),
     %% Nomatch in of
-    ?line error_check("try 1 of 2 -> 3 catch _:_ -> 4 end.",
+    error_check("try 1 of 2 -> 3 catch _:_ -> 4 end.",
 		      {try_clause,1}),
     %% Nomatch in of with after
-    ?line check(fun () -> {'EXIT',{{try_clause,1},_}} = 
+    check(fun () -> {'EXIT',{{try_clause,1},_}} =
 			      begin catch try 1 of 2 -> 3
 				          after put(try_catch, 4) end end,
 			  get(try_catch) end,
@@ -1336,14 +1267,14 @@ try_catch(Config) when is_list(Config) ->
 		"                      after put(try_catch, 4) end end, "
 		"      get(try_catch) end. ", 4),
     %% Exception in try
-    ?line check(fun () -> try 1=2 catch error:{badmatch,2} -> 3 end end,
+    check(fun () -> try 1=2 catch error:{badmatch,2} -> 3 end end,
 		"try 1=2 catch error:{badmatch,2} -> 3 end.", 3),
-    ?line check(fun () -> try 1=2 of 3 -> 4 
+    check(fun () -> try 1=2 of 3 -> 4
 			  catch error:{badmatch,2} -> 5 end end,
 		"try 1=2 of 3 -> 4 "
 		"catch error:{badmatch,2} -> 5 end.", 5),
     %% Exception in try with after
-    ?line check(fun () -> X = try 1=2 
+    check(fun () -> X = try 1=2
 			      catch error:{badmatch,2} -> 3
 			      after put(try_catch, 4) end,
 			  {X,get(try_catch)} end,
@@ -1351,7 +1282,7 @@ try_catch(Config) when is_list(Config) ->
 		"          catch error:{badmatch,2} -> 3 "
 		"          after put(try_catch, 4) end, "
 		"      {X,get(try_catch)} end. ", {3,4}),
-    ?line check(fun () -> X = try 1=2 of 3 -> 4
+    check(fun () -> X = try 1=2 of 3 -> 4
 			      catch error:{badmatch,2} -> 5
 			      after put(try_catch, 6) end,
 			  {X,get(try_catch)} end,
@@ -1360,12 +1291,12 @@ try_catch(Config) when is_list(Config) ->
 		"          after put(try_catch, 6) end, "
 		"      {X,get(try_catch)} end. ", {5,6}),
     %% Uncaught exception
-    ?line error_check("try 1=2 catch error:undefined -> 3 end. ",
+    error_check("try 1=2 catch error:undefined -> 3 end. ",
 		      {badmatch,2}),
-    ?line error_check("try 1=2 of 3 -> 4 catch error:undefined -> 5 end. ",
+    error_check("try 1=2 of 3 -> 4 catch error:undefined -> 5 end. ",
 		      {badmatch,2}),
     %% Uncaught exception with after
-    ?line check(fun () -> {'EXIT',{{badmatch,2},_}} =
+    check(fun () -> {'EXIT',{{badmatch,2},_}} =
 			      begin catch try 1=2 
 					  after put(try_catch, 3) end end,
 			  get(try_catch) end,
@@ -1373,7 +1304,7 @@ try_catch(Config) when is_list(Config) ->
 		"          begin catch try 1=2 "
 		"                      after put(try_catch, 3) end end, "
 		"      get(try_catch) end. ", 3),
-    ?line check(fun () -> {'EXIT',{{badmatch,2},_}} =
+    check(fun () -> {'EXIT',{{badmatch,2},_}} =
 			      begin catch try 1=2 of 3 -> 4
 					  after put(try_catch, 5) end end,
 			  get(try_catch) end,
@@ -1381,7 +1312,7 @@ try_catch(Config) when is_list(Config) ->
 		"          begin catch try 1=2 of 3 -> 4"
 		"                      after put(try_catch, 5) end end, "
 		"      get(try_catch) end. ", 5),
-    ?line check(fun () -> {'EXIT',{{badmatch,2},_}} =
+    check(fun () -> {'EXIT',{{badmatch,2},_}} =
 			      begin catch try 1=2 catch error:undefined -> 3
 					  after put(try_catch, 4) end end,
 			  get(try_catch) end,
@@ -1389,7 +1320,7 @@ try_catch(Config) when is_list(Config) ->
 		"          begin catch try 1=2 catch error:undefined -> 3 "
 		"                      after put(try_catch, 4) end end, "
 		"      get(try_catch) end. ", 4),
-    ?line check(fun () -> {'EXIT',{{badmatch,2},_}} =
+    check(fun () -> {'EXIT',{{badmatch,2},_}} =
 			      begin catch try 1=2 of 3 -> 4
 					  catch error:undefined -> 5
 					  after put(try_catch, 6) end end,
@@ -1402,26 +1333,23 @@ try_catch(Config) when is_list(Config) ->
     ok.
 
 
-eval_expr_5(doc) ->
-    ["(OTP-7933)"];
-eval_expr_5(suite) ->
-    [];
+%% OTP-7933.
 eval_expr_5(Config) when is_list(Config) ->
-    ?line {ok,Tokens ,_} =
+    {ok,Tokens ,_} =
 	erl_scan:string("if a+4 == 4 -> yes; true -> no end. "),
-    ?line {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
-    ?line {value, no, []} = erl_eval:expr(Expr, [], none, none, none),
-    ?line no = erl_eval:expr(Expr, [], none, none, value),
+    {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
+    {value, no, []} = erl_eval:expr(Expr, [], none, none, none),
+    no = erl_eval:expr(Expr, [], none, none, value),
     try
 	erl_eval:expr(Expr, [], none, none, 4711),
-	?line function_clause = should_never_reach_here
+	function_clause = should_never_reach_here
     catch
 	error:function_clause ->
 	    ok
     end.
 
 zero_width(Config) when is_list(Config) ->
-    ?line check(fun() ->
+    check(fun() ->
 			{'EXIT',{badarg,_}} = (catch <<not_a_number:0>>),
 			ok
 		end, "begin {'EXIT',{badarg,_}} = (catch <<not_a_number:0>>), "
@@ -1524,7 +1452,7 @@ check1(F, String, Result) ->
         {value, Result, _} ->
             ok;
         Other ->
-            test_server:fail({eval, Other, Result})
+            ct:fail({eval, Other, Result})
     end.
 
 check(F, String, Result, BoundVars, LFH, EFH) ->
@@ -1537,11 +1465,11 @@ check(F, String, Result, BoundVars, LFH, EFH) ->
                 true -> 
                     ok;
                 false -> 
-                    test_server:fail({check, BoundVars, Keys})
+                    ct:fail({check, BoundVars, Keys})
             end,
             ok;
         Other ->
-            test_server:fail({check, Other, Result})
+            ct:fail({check, Other, Result})
     end.
 
 error_check(String, Result) ->
@@ -1549,7 +1477,7 @@ error_check(String, Result) ->
         {'EXIT', {Result,_}} ->
             ok;
         Other ->
-            test_server:fail({eval, Other, Result})
+            ct:fail({eval, Other, Result})
     end.
 
 error_check(String, Result, LFH, EFH) ->
@@ -1557,7 +1485,7 @@ error_check(String, Result, LFH, EFH) ->
         {'EXIT', {Result,_}} ->
             ok;
         Other ->
-            test_server:fail({eval, Other, Result})
+            ct:fail({eval, Other, Result})
     end.
 
 eval_string(String) ->
diff --git a/lib/stdlib/test/erl_expand_records_SUITE.erl b/lib/stdlib/test/erl_expand_records_SUITE.erl
index 8cec445cb4..7fed7fce56 100644
--- a/lib/stdlib/test/erl_expand_records_SUITE.erl
+++ b/lib/stdlib/test/erl_expand_records_SUITE.erl
@@ -20,7 +20,7 @@
 
 -module(erl_expand_records_SUITE).
 
-%-define(debug, true).
+%%-define(debug, true).
 
 -ifdef(debug).
 -define(line, put(line, ?LINE), ).
@@ -28,8 +28,8 @@
 -define(privdir, "erl_expand_records_SUITE_priv").
 -define(t, test_server).
 -else.
--include_lib("test_server/include/test_server.hrl").
--define(privdir, ?config(priv_dir, Config)).
+-include_lib("common_test/include/ct.hrl").
+-define(privdir, proplists:get_value(priv_dir, Config)).
 -endif.
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -41,19 +41,15 @@
 	 otp_5915/1, otp_7931/1, otp_5990/1,
 	 otp_7078/1, otp_7101/1, maps/1]).
 
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
-
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
+    Config.
 
 end_per_testcase(_Case, _Config) ->
-    Dog = ?config(watchdog, _Config),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [attributes, expr, guard, init,
@@ -76,30 +72,26 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-attributes(doc) ->
-    "Import module and functions.";
-attributes(suite) -> [];
+%% Import module and functions.
 attributes(Config) when is_list(Config) ->
     Ts = [
-      <<"-import(lists, [append/2, reverse/1]).
+	  <<"-import(lists, [append/2, reverse/1]).
 
          -record(r, {a,b}).
 
-         t() ->
-             [2,1] = reverse(append([1],[2])),
-             3 = length([1,2,3]),
-             3 = record_info(size, r),
-             [a, b] = record_info(fields, r),
-             [] = erl_expand_records_SUITE:attributes(suite),
-             ok.
-      ">>
+t() ->
+    [2,1] = reverse(append([1],[2])),
+    3 = length([1,2,3]),
+    3 = record_info(size, r),
+    [a, b] = record_info(fields, r),
+    [_|_] = erl_expand_records_SUITE:all(),
+    ok.
+">>
       ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
     
-expr(doc) ->
-    "Some expressions.";
-expr(suite) -> [];
+%% Some expressions.
 expr(Config) when is_list(Config) ->
     Ts = [
       <<"
@@ -159,14 +151,12 @@ expr(Config) when is_list(Config) ->
 
     %% The code above should run equally well with and without
     %% strict record tests.
-    ?line run(Config, Ts, [no_strict_record_tests]),
-    ?line run(Config, Ts, [strict_record_tests]),
+    run(Config, Ts, [no_strict_record_tests]),
+    run(Config, Ts, [strict_record_tests]),
     
     ok.
     
-guard(doc) ->
-    "is_record in guards.";
-guard(suite) -> [];
+%% is_record in guards.
 guard(Config) when is_list(Config) ->
     File = filename("guard.erl", Config),
     Beam = filename("guard.beam", Config),
@@ -202,18 +192,16 @@ guard(Config) when is_list(Config) ->
                   12.
              ">>,
 
-    ?line ok = file:write_file(File, Test),
-    ?line {ok, guard, Ws} = compile:file(File, [return,{outdir,?privdir}]),
-    ?line Warnings = [L || {_File,WL} <- Ws, {L,_M,nomatch_guard} <- WL],
-    ?line [7,9,11,13,15,17,19,21,23,25,27] = Warnings,
+    ok = file:write_file(File, Test),
+    {ok, guard, Ws} = compile:file(File, [return,{outdir,?privdir}]),
+    Warnings = [L || {_File,WL} <- Ws, {L,_M,nomatch_guard} <- WL],
+    [7,9,11,13,15,17,19,21,23,25,27] = Warnings,
 
-    ?line ok = file:delete(File),
-    ?line ok = file:delete(Beam),
+    ok = file:delete(File),
+    ok = file:delete(Beam),
     ok.
 
-init(doc) ->
-    "Wildcard initialisation.";
-init(suite) -> [];
+%% Wildcard initialisation.
 init(Config) when is_list(Config) ->
     Ts = [
       <<"
@@ -228,12 +216,10 @@ init(Config) when is_list(Config) ->
              end.
       ">>
       ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
     
-pattern(doc) ->
-    "Some patterns.";
-pattern(suite) -> [];
+%% Some patterns.
 pattern(Config) when is_list(Config) ->
     Ts = [
       <<"-import(lists, [append/2, reverse/1]).
@@ -317,12 +303,9 @@ pattern(Config) when is_list(Config) ->
              16.
       ">>
       ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
     
-strict(doc) ->
-    "";
-strict(suite) -> [];
 strict(Config) when is_list(Config) ->
     Ts1 = [
       <<"-record(r1, {a,b}).
@@ -345,7 +328,7 @@ strict(Config) when is_list(Config) ->
              error(wrong_element).
       ">>
       ],
-    ?line run(Config, Ts1, [strict_record_tests]),
+    run(Config, Ts1, [strict_record_tests]),
 
     Ts2 = [
       <<"-record(r1, {a,b}).
@@ -361,12 +344,10 @@ strict(Config) when is_list(Config) ->
              error(wrong_element).
       ">>
       ],
-    ?line run(Config, Ts2, [no_strict_record_tests]),
+    run(Config, Ts2, [no_strict_record_tests]),
     ok.
     
-update(doc) ->
-    "Record updates.";
-update(suite) -> [];
+%% Record updates.
 update(Config) when is_list(Config) ->
     Ts = [
       <<"-record(r, {a,b,c,d,e,f}).
@@ -401,7 +382,7 @@ update(Config) when is_list(Config) ->
              erlang:error(wrong_setelement_called).
       ">>
       ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
 maps(Config) when is_list(Config) ->
@@ -420,9 +401,7 @@ maps(Config) when is_list(Config) ->
     run(Config, Ts, [strict_record_tests]),
     ok.
 
-otp_5915(doc) ->
-    "Strict record tests in guards.";
-otp_5915(suite) -> [];
+%% Strict record tests in guards.
 otp_5915(Config) when is_list(Config) ->
     %% These tests are also run by the compiler's record_SUITE.
     Ts = [
@@ -565,12 +544,10 @@ otp_5915(Config) when is_list(Config) ->
              ok.
       ">>
       ],
-    ?line run(Config, Ts, [strict_record_tests]),
+    run(Config, Ts, [strict_record_tests]),
     ok.
 
-otp_7931(doc) ->
-    "Test optimization of record accesses and is_record/3 tests in guards";
-otp_7931(suite) -> [];
+%% Test optimization of record accesses and is_record/3 tests in guards.
 otp_7931(Config) when is_list(Config) ->
     Ts = [
       <<"-record(r, {a = 4,b}).
@@ -654,12 +631,10 @@ otp_7931(Config) when is_list(Config) ->
              ok.
       ">>
       ],
-    ?line run(Config, Ts, [strict_record_tests]),
+    run(Config, Ts, [strict_record_tests]),
     ok.
 
-otp_5990(doc) ->
-    "OTP-5990. {erlang,is_record}.";
-otp_5990(suite) -> [];
+%% OTP-5990. {erlang,is_record}.
 otp_5990(Config) when is_list(Config) ->
     Ts = [
       <<"
@@ -690,13 +665,11 @@ otp_5990(Config) when is_list(Config) ->
              ok.
       ">>
       ],
-    ?line run(Config, Ts, [strict_record_tests]),
+    run(Config, Ts, [strict_record_tests]),
     ok.
         
 
-otp_7078(doc) ->
-    "OTP-7078. Record update: missing test.";
-otp_7078(suite) -> [];
+%% OTP-7078. Record update: missing test.
 otp_7078(Config) when is_list(Config) ->
     Ts = [
       <<"
@@ -724,14 +697,12 @@ otp_7078(Config) when is_list(Config) ->
       ">>
 
       ],
-    ?line run(Config, Ts, [strict_record_tests]),
+    run(Config, Ts, [strict_record_tests]),
     ok.
 
 -record(otp_7101, {a,b,c=[],d=[],e=[]}).
 
-otp_7101(doc) ->
-    "OTP-7101. Record update: more than one call to setelement/3.";
-otp_7101(suite) -> [];
+%% OTP-7101. Record update: more than one call to setelement/3.
 otp_7101(Config) when is_list(Config) ->
     Rec = #otp_7101{},
 
@@ -739,28 +710,28 @@ otp_7101(Config) when is_list(Config) ->
     %% The tracer will forward all trace messages to us.
     Self = self(),
     Tracer = spawn_link(fun() -> otp_7101_tracer(Self, 0) end),
-    ?line 1 = erlang:trace_pattern({erlang,setelement,3}, true),
-    ?line erlang:trace(self(), true, [{tracer,Tracer},call]),
+    1 = erlang:trace_pattern({erlang,setelement,3}, true),
+    erlang:trace(self(), true, [{tracer,Tracer},call]),
     
     %% Update the record.
-    ?line #otp_7101{a=2,b=1,c=[],d=[],e=[]} = otp_7101_update1(Rec),
-    ?line #otp_7101{a=1,b=2,c=[],d=[],e=[]} = otp_7101_update2(Rec),
-    ?line #otp_7101{a=2,b=1,c=[],d=[],e=[]} = otp_7101_update3(Rec),
-    ?line #otp_7101{a=1,b=2,c=[],d=[],e=[]} = otp_7101_update4(Rec),
+    #otp_7101{a=2,b=1,c=[],d=[],e=[]} = otp_7101_update1(Rec),
+    #otp_7101{a=1,b=2,c=[],d=[],e=[]} = otp_7101_update2(Rec),
+    #otp_7101{a=2,b=1,c=[],d=[],e=[]} = otp_7101_update3(Rec),
+    #otp_7101{a=1,b=2,c=[],d=[],e=[]} = otp_7101_update4(Rec),
 
     %% Verify that setelement/3 was called the same number of times as
     %% the number of record updates.
-    ?line Ref = erlang:trace_delivered(Self),
+    Ref = erlang:trace_delivered(Self),
     receive
 	{trace_delivered, Self, Ref} ->
 	    Tracer ! done
     end,
-    ?line 1 = erlang:trace_pattern({erlang,setelement,3}, false),
+    1 = erlang:trace_pattern({erlang,setelement,3}, false),
     receive
 	4 ->
 	    ok;
 	Other ->
-	    ?line ?t:fail({unexpected,Other})
+	    ct:fail({unexpected,Other})
     end.
 
 otp_7101_tracer(Parent, N) ->
@@ -797,10 +768,9 @@ run(Config, Tests, Opts) ->
                 AbsFile = filename:rootname(SourceFile, ".erl"),
                 code:purge(Mod),
                 code:load_abs(AbsFile, Mod),
-%io:format("run~n"),
                 case catch Mod:t() of
                     {'EXIT', _Reason} = Error ->
-                        ?t:format("failed, got ~p~n", [Error]),
+                        io:format("failed, got ~p~n", [Error]),
                         fail();
                     ok ->
                         ok
@@ -837,5 +807,4 @@ warnings(File, Ws) ->
     end.
 
 fail() ->
-    io:format("failed~n"),
-    ?t:fail().
+    ct:fail(failed).
diff --git a/lib/stdlib/test/erl_internal_SUITE.erl b/lib/stdlib/test/erl_internal_SUITE.erl
index 0d2f535040..45e67226b7 100644
--- a/lib/stdlib/test/erl_internal_SUITE.erl
+++ b/lib/stdlib/test/erl_internal_SUITE.erl
@@ -26,9 +26,11 @@
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     [behav].
@@ -49,20 +51,13 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
--define(default_timeout, ?t:minutes(2)).
-
 init_per_testcase(_Case, Config) ->
-    Dog = test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-behav(suite) -> [];
-behav(doc) ->
-    ["Check that the behaviour callbacks are correctly defined"];
+%% Check that the behaviour callbacks are correctly defined.
 behav(_) ->
     Modules = [application, gen_server, gen_fsm, gen_event,
                supervisor_bridge, supervisor],
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index 375fb6bc93..29a389d4b8 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(erl_lint_SUITE).
 
-%-define(debug, true).
+%%-define(debug, true).
 
 -ifdef(debug).
 -define(line, put(line, ?LINE), ).
@@ -28,9 +28,9 @@
 -define(privdir, "erl_lint_SUITE_priv").
 -define(t, test_server).
 -else.
--include_lib("test_server/include/test_server.hrl").
--define(datadir, ?config(data_dir, Conf)).
--define(privdir, ?config(priv_dir, Conf)).
+-include_lib("common_test/include/ct.hrl").
+-define(datadir, proplists:get_value(data_dir, Conf)).
+-define(privdir, proplists:get_value(priv_dir, Conf)).
 -endif.
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -65,22 +65,19 @@
 	  too_many_arguments/1,
 	  basic_errors/1,bin_syntax_errors/1,
           predef/1,
-          maps/1,maps_type/1,otp_11851/1,otp_12195/1, otp_13230/1
+          maps/1,maps_type/1,otp_11851/1,otp_11879/1,otp_13230/1,
+	  record_errors/1
         ]).
 
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
-
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
+    Config.
 
 end_per_testcase(_Case, _Config) ->
-    Dog = ?config(watchdog, _Config),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [{group, unused_vars_warn}, export_vars_warn,
@@ -94,7 +91,8 @@ all() ->
      bif_clash, behaviour_basic, behaviour_multiple, otp_11861,
      otp_7550, otp_8051, format_warn, {group, on_load},
      too_many_arguments, basic_errors, bin_syntax_errors, predef,
-     maps, maps_type, otp_11851, otp_12195, otp_13230].
+     maps, maps_type, otp_11851, otp_11879, otp_13230,
+     record_errors].
 
 groups() -> 
     [{unused_vars_warn, [],
@@ -117,50 +115,48 @@ end_per_group(_GroupName, Config) ->
 
 
 
-unused_vars_warn_basic(doc) ->
-    "Warnings for unused variables in some simple cases.";
-unused_vars_warn_basic(suite) -> [];
+%% Warnings for unused variables in some simple cases.
 unused_vars_warn_basic(Config) when is_list(Config) ->
     Ts = [{basic1,
            <<"f(F) -> % F unused.
                 ok.
 
-            f(F, F) ->
-                ok.
+f(F, F) ->
+    ok.
 
-            g(_X) ->
-                y.
+g(_X) ->
+    y.
 
-            h(P) ->
-                P.
+h(P) ->
+    P.
 
-            x(N) ->
-                case a:b() of
-                    [N|Y] -> % Y unused.
-                        ok
-                end.
+x(N) ->
+    case a:b() of
+	[N|Y] -> % Y unused.
+	    ok
+    end.
 
-            y(N, L) ->
-                lists:map(fun(T) -> T*N end, L).
+y(N, L) ->
+    lists:map(fun(T) -> T*N end, L).
 
-            z(N, L) -> % N unused
-                lists:map(fun(N, T) -> T*N end, L).  % N shadowed.
+z(N, L) -> % N unused
+    lists:map(fun(N, T) -> T*N end, L).  % N shadowed.
 
 
-            c(A) ->
-                case A of
-                    1 -> B = []; % B unused.
-                    2 -> B = []; % B unused.
-                    3 -> B = f, B
-                end.
-           ">>,
+c(A) ->
+    case A of
+	1 -> B = []; % B unused.
+	2 -> B = []; % B unused.
+	3 -> B = f, B
+    end.
+">>,
 	   [warn_unused_vars],
-	   {warnings,[{1,erl_lint,{unused_var,'F'}},
-             {15,erl_lint,{unused_var,'Y'}},
-             {22,erl_lint,{unused_var,'N'}},
-             {23,erl_lint,{shadowed_var,'N','fun'}},
-             {28,erl_lint,{unused_var,'B'}},
-             {29,erl_lint,{unused_var,'B'}}]}},
+{warnings,[{1,erl_lint,{unused_var,'F'}},
+	   {15,erl_lint,{unused_var,'Y'}},
+	   {22,erl_lint,{unused_var,'N'}},
+	   {23,erl_lint,{shadowed_var,'N','fun'}},
+	   {28,erl_lint,{unused_var,'B'}},
+	   {29,erl_lint,{unused_var,'B'}}]}},
           {basic2,
            <<"-record(r, {x,y}).
               f({X,Y}) -> {Z=X,Z=Y};
@@ -170,12 +166,10 @@ unused_vars_warn_basic(Config) when is_list(Config) ->
               g({M, F, Arg}) -> (Z=M):F(Z=Arg).
               h(X, Y) -> (Z=X) + (Z=Y).">>,
            [warn_unused_vars], []}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-unused_vars_warn_lc(doc) ->
-    "Warnings for unused variables in list comprehensions.";
-unused_vars_warn_lc(suite) -> [];
+%% Warnings for unused variables in list comprehensions.
 unused_vars_warn_lc(Config) when is_list(Config) ->
     Ts = [{lc1, 
            <<"bin([X]) ->
@@ -402,9 +396,7 @@ unused_vars_warn_lc(Config) when is_list(Config) ->
            {error,[{22,erl_lint,{unsafe_var,'U',{'case',2}}},
                    {27,erl_lint,{unsafe_var,'U',{'case',2}}}],
             [{16,erl_lint,{unused_var,'Y'}},
-     %  {24,erl_lint,{exported_var,'X',{'case',8}}},
              {24,erl_lint,{unused_var,'U'}},
-     %  {26,erl_lint,{exported_var,'X',{'case',8}}},
              {26,erl_lint,{unused_var,'U'}}]}},
 
           {lc17,
@@ -434,7 +426,6 @@ unused_vars_warn_lc(Config) when is_list(Config) ->
            [warn_unused_vars],
            {error,[{22,erl_lint,{unsafe_var,'U',{'case',3}}}],
             [{17,erl_lint,{unused_var,'Y'}},
-     %  {21,erl_lint,{exported_var,'X',{'case',9}}},
              {21,erl_lint,{unused_var,'U'}}]}},
 
           {lc18,
@@ -459,14 +450,12 @@ unused_vars_warn_lc(Config) when is_list(Config) ->
                   end,
                   [B || <<U: % U unused
                           U>> <- X, <<B:Y>> <- Z]. % U unsafe. Y unsafe. 
-                                                   % U shadowed. (X exported.)
+						% U shadowed. (X exported.)
            ">>,
            [warn_unused_vars],
            {error,[{21,erl_lint,{unsafe_var,'U',{'case',2}}},
                    {21,erl_lint,{unsafe_var,'Y',{'case',14}}}],
             [{20,erl_lint,{unused_var,'U'}}
-     %       ,{21,erl_lint,{exported_var,'X',{'case',8}}}
-     %       ,{21,erl_lint,{shadowed_var,'U',generate}}
             ]}},
 
           {lc19,
@@ -520,13 +509,11 @@ unused_vars_warn_lc(Config) when is_list(Config) ->
                   [{14,erl_lint,{unused_var,'Q'}}]}}
 
           ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
 
-unused_vars_warn_rec(doc) ->
-    "Warnings for unused variables in records.";
-unused_vars_warn_rec(suite) -> [];
+%% Warnings for unused variables in records.
 unused_vars_warn_rec(Config) when is_list(Config) ->
     Ts = [{rec1, % An example provided by Bjorn.
            <<"-record(edge,
@@ -578,12 +565,10 @@ unused_vars_warn_rec(Config) when is_list(Config) ->
            {error,[{2,erl_lint,{redefine_field,r,a}},
                    {2,erl_lint,{redefine_field,r,a}}],
                   [{2,erl_lint,{unused_var,'X'}}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-unused_vars_warn_fun(doc) ->
-    "Warnings for unused variables in funs.";
-unused_vars_warn_fun(suite) -> [];
+%% Warnings for unused variables in funs.
 unused_vars_warn_fun(Config) when is_list(Config) ->
     Ts = [{fun1,
            <<"a({A,B}) -> % A unused.
@@ -705,12 +690,10 @@ unused_vars_warn_fun(Config) when is_list(Config) ->
                    {33,erl_lint,{unused_var,'U'}},
                    {33,erl_lint,{shadowed_var,'U','fun'}}]}}
           ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-unused_vars_OTP_4858(doc) ->
-    "Bit syntax, binsize variable used in the same matching.";
-unused_vars_OTP_4858(suite) -> [];
+%% Bit syntax, binsize variable used in the same matching.
 unused_vars_OTP_4858(Config) when is_list(Config) ->
     Ts = [{otp_4858,
            <<"objs(<<Size:4/unit:8, B:Size/binary>>) ->
@@ -729,7 +712,7 @@ unused_vars_OTP_4858(Config) when is_list(Config) ->
                {8,erl_lint,{unused_var,'B'}},
                {8,erl_lint,{unused_var,'Rest'}}]}}
          ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
 unused_unsafe_vars_warn(Config) when is_list(Config) ->
@@ -774,9 +757,7 @@ unused_unsafe_vars_warn(Config) when is_list(Config) ->
     run(Config, Ts),
     ok.
 
-export_vars_warn(doc) ->
-    "Warnings for exported variables";
-export_vars_warn(suite) -> [];
+%% Warnings for exported variables.
 export_vars_warn(Config) when is_list(Config) ->
     Ts = [{exp1,
            <<"u() ->
@@ -866,13 +847,11 @@ export_vars_warn(Config) when is_list(Config) ->
            [],
            {warnings,[{7,erl_lint,{exported_var,'Z',{'if',2}}}]}}
          ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-shadow_vars(doc) ->
-    "Shadowed variables are tested in other places, but here we test "
-	"that the warning can be turned off.";
-shadow_vars(suite) -> [];
+%% Shadowed variables are tested in other places, but here we test
+%% that the warning can be turned off.
 shadow_vars(Config) when is_list(Config) ->
     Ts = [{shadow1,
 	   <<"bin(A) ->
@@ -897,12 +876,10 @@ shadow_vars(Config) when is_list(Config) ->
            ">>,
            [],
            []}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-unused_import(doc) ->
-    "Test that the 'warn_unused_import' option works.";
-unused_import(suite) -> [];
+%% Test that the 'warn_unused_import' option works.
 unused_import(Config) when is_list(Config) ->
     Ts = [{imp1,
 	   <<"-import(lists, [map/2,foldl/3]).
@@ -911,12 +888,10 @@ unused_import(Config) when is_list(Config) ->
            ">>,
 	   [warn_unused_import],
 	   {warnings,[{1,erl_lint,{unused_import,{{foldl,3},lists}}}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-unused_function(doc) ->
-    "Test warnings for unused functions.";
-unused_function(suite) -> [];
+%% Test warnings for unused functions.
 unused_function(Config) when is_list(Config) ->
     Ts = [{func1,
 	   <<"-export([t/1]).
@@ -959,12 +934,10 @@ unused_function(Config) when is_list(Config) ->
 	   {[]},		     %Tuple indicates no 'export_all'.
 	   []}],
 
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
     
-unsafe_vars(doc) ->
-    "OTP-4671. Errors for unsafe variables";
-unsafe_vars(suite) -> [];
+%% OTP-4671. Errors for unsafe variables.
 unsafe_vars(Config) when is_list(Config) ->
     Ts = [{unsafe1,
            <<"t() ->
@@ -1040,7 +1013,7 @@ unsafe_vars(Config) when is_list(Config) ->
                           D = 1;
                       2 ->
                           A = 2,
-                          % B not bound here
+                          %% B not bound here
                           C = 2,
                           catch D = 2; % unsafe in two clauses
                       3 ->
@@ -1062,12 +1035,10 @@ unsafe_vars(Config) when is_list(Config) ->
                     {24,erl_lint,{unsafe_var,'D',{'case',2}}}],
             []}}
          ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-unsafe_vars2(doc) ->
-    "OTP-4831, seq8202. No warn_unused_vars and unsafe variables";
-unsafe_vars2(suite) -> [];
+%% OTP-4831, seq8202. No warn_unused_vars and unsafe variables.
 unsafe_vars2(Config) when is_list(Config) ->
     Ts = [{unsafe2_1,
            <<"foo(State) ->
@@ -1096,12 +1067,10 @@ unsafe_vars2(Config) when is_list(Config) ->
            [],
            {errors,[{9,erl_lint,{unsafe_var,'State1',{'if',4}}}],[]}}
          ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-unsafe_vars_try(doc) ->
-    "Errors for unsafe variables in try/catch constructs.";
-unsafe_vars_try(suite) -> [];
+%% Errors for unsafe variables in try/catch constructs.
 unsafe_vars_try(Config) when is_list(Config) ->
     Ts = [{unsafe_try1,
 	   <<"foo2() ->
@@ -1286,22 +1255,24 @@ unsafe_vars_try(Config) when is_list(Config) ->
            ">>,
            [],
            {errors,[{13,erl_lint,{unsafe_var,'Acc',{'try',6}}}],[]}}],
-        ?line [] = run(Config, Ts),
+        [] = run(Config, Ts),
     ok.
 
-unsized_binary_in_bin_gen_pattern(doc) ->
-    "Unsized binary fields are forbidden in patterns of bit string generators";
-unsized_binary_in_bin_gen_pattern(suite) -> [];
+%% Unsized binary fields are forbidden in patterns of bit string generators.
 unsized_binary_in_bin_gen_pattern(Config) when is_list(Config) ->
     Ts = [{unsized_binary_in_bin_gen_pattern,
 	   <<"t({bc,binary,Bin}) ->
 		  << <<X,Tail/binary>> || <<X,Tail/binary>> <= Bin >>;
+	      t({bc,bytes,Bin}) ->
+		  << <<X,Tail/binary>> || <<X,Tail/bytes>> <= Bin >>;
 	      t({bc,bits,Bin}) ->
 		  << <<X,Tail/bits>> || <<X,Tail/bits>> <= Bin >>;
 	      t({bc,bitstring,Bin}) ->
 		  << <<X,Tail/bits>> || <<X,Tail/bitstring>> <= Bin >>;
 	      t({lc,binary,Bin}) ->
 		  [ {X,Tail} || <<X,Tail/binary>> <= Bin ];
+	      t({lc,bytes,Bin}) ->
+		  [ {X,Tail} || <<X,Tail/bytes>> <= Bin ];
 	      t({lc,bits,Bin}) ->
 		  [ {X,Tail} || <<X,Tail/bits>> <= Bin ];
 	      t({lc,bitstring,Bin}) ->
@@ -1313,14 +1284,14 @@ unsized_binary_in_bin_gen_pattern(Config) when is_list(Config) ->
 	     {6,erl_lint,unsized_binary_in_bin_gen_pattern},
 	     {8,erl_lint,unsized_binary_in_bin_gen_pattern},
 	     {10,erl_lint,unsized_binary_in_bin_gen_pattern},
-	     {12,erl_lint,unsized_binary_in_bin_gen_pattern}],
+	     {12,erl_lint,unsized_binary_in_bin_gen_pattern},
+	     {14,erl_lint,unsized_binary_in_bin_gen_pattern},
+	     {16,erl_lint,unsized_binary_in_bin_gen_pattern}],
 	     []}}],
     [] = run(Config, Ts),
     ok.
 
-guard(doc) ->
-    "OTP-4670. Guards, is_record in particular.";
-guard(suite) -> [];
+%% OTP-4670. Guards, is_record in particular.
 guard(Config) when is_list(Config) ->
     %% Well, these could be plain code...
     Ts = [{guard1,
@@ -1535,7 +1506,7 @@ guard(Config) when is_list(Config) ->
            ">>,
            [nowarn_obsolete_guard],
            []}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     Ts1 = [{guard5,
             <<"-record(apa, {}).
                t3(A) when record(A, {apa}) ->
@@ -1606,12 +1577,10 @@ guard(Config) when is_list(Config) ->
                      {2,erl_lint,illegal_guard_expr}],
              []}}
 	  ],
-    ?line [] = run(Config, Ts1),
+    [] = run(Config, Ts1),
     ok.
 
-otp_4886(doc) ->
-    "OTP-4886. Calling is_record with given record name.";
-otp_4886(suite) -> [];
+%% OTP-4886. Calling is_record with given record name.
 otp_4886(Config) when is_list(Config) ->
     Ts = [{otp_4886,
            <<"t() ->
@@ -1630,12 +1599,10 @@ otp_4886(Config) when is_list(Config) ->
                     {4,erl_lint,{undefined_record,foo}},
                     {5,erl_lint,{undefined_record,foo}}],
             []}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-otp_4988(doc) ->
-    "OTP-4988. Error when in-lining non-existent functions.";
-otp_4988(suite) -> [];
+%% OTP-4988. Error when in-lining non-existent functions.
 otp_4988(Config) when is_list(Config) ->
     Ts = [{otp_4988,
            <<"-compile({inline, [{f,3},{f,4},{f,2},{f,a},{1,foo}]}).
@@ -1657,12 +1624,10 @@ otp_4988(Config) when is_list(Config) ->
                     {1,erl_lint,{bad_inline,{f,a}}},
                     {3,erl_lint,{bad_inline,{g,12}}}],
             []}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-otp_5091(doc) ->
-    "OTP-5091. Patterns and the bit syntax: invalid warnings.";
-otp_5091(suite) -> [];
+%% OTP-5091. Patterns and the bit syntax: invalid warnings.
 otp_5091(Config) when is_list(Config) ->
     Ts = [{otp_5091_1,
            <<"t() ->
@@ -1875,12 +1840,10 @@ otp_5091(Config) when is_list(Config) ->
            <<"-record(r, {f1,f2}).
               t(#r{f1 = A, f2 = A}) -> a.">>, [], []}],
 
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-otp_5276(doc) ->
-    "OTP-5276. Check the 'deprecated' attributed.";
-otp_5276(suite) -> [];
+%% OTP-5276. Check the 'deprecated' attributed.
 otp_5276(Config) when is_list(Config) ->
     Ts = [{otp_5276_1,
           <<"-deprecated([{frutt,0,next_version}]).
@@ -1907,12 +1870,10 @@ otp_5276(Config) when is_list(Config) ->
                    {9,erl_lint,{invalid_deprecated,{{badly,formed},1}}},
 		   {11,erl_lint,{bad_deprecated,{atom_to_list,1}}}],
             [{13,erl_lint,{unused_function,{frutt,0}}}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-otp_5917(doc) ->
-    "OTP-5917. Check the 'deprecated' attributed.";
-otp_5917(suite) -> [];
+%% OTP-5917. Check the 'deprecated' attributed.
 otp_5917(Config) when is_list(Config) ->
     Ts = [{otp_5917_1,
           <<"-compile(export_all).
@@ -1924,12 +1885,10 @@ otp_5917(Config) when is_list(Config) ->
             ">>,
            {[]},
            []}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-otp_6585(doc) ->
-    "OTP-6585. Check the deprecated guards list/1, pid/1, ....";
-otp_6585(suite) -> [];
+%% OTP-6585. Check the deprecated guards list/1, pid/1, ....
 otp_6585(Config) when is_list(Config) ->
     Ts = [{otp_6585_1,
           <<"-compile(export_all).
@@ -1947,12 +1906,10 @@ otp_6585(Config) when is_list(Config) ->
            {warnings,[{5,erl_lint,{obsolete_guard,{list,1}}},
                       {6,erl_lint,{obsolete_guard,{record,2}}},
                       {7,erl_lint,{obsolete_guard,{pid,1}}}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-otp_5338(doc) ->
-    "OTP-5338. Bad warning in record initialization.";
-otp_5338(suite) -> [];
+%% OTP-5338. Bad warning in record initialization.
 otp_5338(Config) when is_list(Config) ->
     %% OTP-5878: variables like X are no longer allowed in initialisations
     Ts = [{otp_5338,
@@ -1964,13 +1921,11 @@ otp_5338(Config) when is_list(Config) ->
            [],
            {error,[{1,erl_lint,{unbound_var,'X'}}],
                   [{3,erl_lint,{unused_var,'X'}}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-otp_5362(doc) ->
-    "OTP-5362. deprecated_function, "
-    "{nowarn_unused_funtion,FAs}, 'better' line numbers.";
-otp_5362(suite) -> [];
+%% OTP-5362. deprecated_function,
+%% {nowarn_unused_funtion,FAs}, 'better' line numbers.
 otp_5362(Config) when is_list(Config) ->
     Ts = [{otp_5362_1,
           <<"-include_lib(\"stdlib/include/qlc.hrl\").
@@ -2170,12 +2125,10 @@ otp_5362(Config) when is_list(Config) ->
 
 	 ],
 
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-otp_5371(doc) ->
-    "OTP-5371. Aliases for bit syntax expressions are no longer allowed.";
-otp_5371(suite) -> [];
+%% OTP-5371. Aliases for bit syntax expressions are no longer allowed.
 otp_5371(Config) when is_list(Config) ->
     Ts = [{otp_5371_1,
            <<"t(<<A:8>> = <<B:8>>) ->
@@ -2229,10 +2182,10 @@ otp_5371(Config) when is_list(Config) ->
 		      {6,v3_core,nomatch},
 		      {8,v3_core,nomatch}]}}
 	 ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-otp_7227(doc) -> "OTP_7227. Some aliases for bit syntax expressions were still allowed.";
+%% OTP_7227. Some aliases for bit syntax expressions were still allowed.
 otp_7227(Config) when is_list(Config) ->
     Ts = [{otp_7227_1,
            <<"t([<<A:8>> = {C,D} = <<B:8>>]) ->
@@ -2299,12 +2252,10 @@ otp_7227(Config) when is_list(Config) ->
 	   [],
 	   {errors,[{2,erl_lint,illegal_bin_pattern}],[]}}
 	 ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-otp_5494(doc) ->
-    "OTP-5494. Warnings for functions exported more than once.";
-otp_5494(suite) -> [];
+%% OTP-5494. Warnings for functions exported more than once.
 otp_5494(Config) when is_list(Config) ->
     Ts = [{otp_5494_1,
            <<"-export([t/0]).
@@ -2313,12 +2264,10 @@ otp_5494(Config) when is_list(Config) ->
              ">>,
            [],
            {warnings,[{2,erl_lint,{duplicated_export,{t,0}}}]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-otp_5644(doc) ->
-    "OTP-5644. M:F/A in record initialization.";
-otp_5644(suite) -> [];
+%% OTP-5644. M:F/A in record initialization.
 otp_5644(Config) when is_list(Config) ->
     %% This test is a no-op. Although {function,mfa,i,1} was
     %% transformed into {function,Line,i,1} by copy_expr, the module
@@ -2334,12 +2283,10 @@ otp_5644(Config) when is_list(Config) ->
             ">>,
            [],
            []}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-otp_5878(doc) ->
-    "OTP-5878. Record declaration: forward references, introduced variables.";
-otp_5878(suite) -> [];
+%% OTP-5878. Record declaration: forward references, introduced variables.
 otp_5878(Config) when is_list(Config) ->
     Ts = [{otp_5878_10,
           <<"-record(rec1, {a = #rec2{}}).
@@ -2455,7 +2402,7 @@ otp_5878(Config) when is_list(Config) ->
             [{1,erl_lint,{unused_record,r}}]}}
 
          ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
 
     Abstr = <<"-module(lint_test, [A, B]).
             ">>,
@@ -2472,7 +2419,7 @@ otp_5878(Config) when is_list(Config) ->
                                            X <- Z ++ [A,Y]])}).
               t() -> {#r1{},#r2{},#r3{}}.
              ">>,
-    ?line {error,[{8,qlc,{used_generator_variable,'A'}},
+    {error,[{8,qlc,{used_generator_variable,'A'}},
                   {8,qlc,{used_generator_variable,'Y'}},
                   {8,qlc,{used_generator_variable,'Z'}}],
            [{6,erl_lint,{unused_var,'V'}}]} = 
@@ -2513,7 +2460,7 @@ otp_5878(Config) when is_list(Config) ->
                   bar.
               ">>,
    
-    ?line {errors,[{6,erl_lint,{unbound_var,'A'}},
+    {errors,[{6,erl_lint,{unbound_var,'A'}},
                    {13,erl_lint,illegal_guard_expr},
                    {15,erl_lint,{undefined_field,r3,q}},
                    {17,erl_lint,{undefined_field,r,q}},
@@ -2532,14 +2479,14 @@ otp_5878(Config) when is_list(Config) ->
                           foo
                   end.
              ">>,
-    ?line {errors,[{4,erl_lint,{undefined_function,{x,0}}},
+    {errors,[{4,erl_lint,{undefined_function,{x,0}}},
                    {5,erl_lint,illegal_guard_expr},
                    {7,erl_lint,illegal_guard_expr}],
            []} = 
         run_test2(Config, Ill2, [warn_unused_record]),
     
     Ill3 = <<"t() -> ok.">>,
-    ?line {errors,[{1,erl_lint,undefined_module}],[]} = 
+    {errors,[{1,erl_lint,undefined_module}],[]} =
         run_test2(Config, Ill3, [warn_unused_record]),
 
     Usage1 = <<"-module(lint_test).
@@ -2552,7 +2499,7 @@ otp_5878(Config) when is_list(Config) ->
                 t() ->
                     {#u2{}}.
                ">>,
-    ?line {warnings,[{5,erl_lint,{unused_record,u3}},
+    {warnings,[{5,erl_lint,{unused_record,u3}},
                      {6,erl_lint,{unused_record,u4}}]} = 
         run_test2(Config, Usage1, [warn_unused_record]),
 
@@ -2567,7 +2514,7 @@ otp_5878(Config) when is_list(Config) ->
                 t() ->
                     {#u2{}}.
                ">>,
-    ?line [] = run_test2(Config, Usage2, [warn_unused_record]),
+    [] = run_test2(Config, Usage2, [warn_unused_record]),
 
     %% This a completely different story...
     %% The linter checks if qlc.hrl hasn't been included
@@ -2581,7 +2528,7 @@ otp_5878(Config) when is_list(Config) ->
                   H3 = q([X || X <- [1,2]], []),
                   {H1,H2,H3}.
              ">>,
-    ?line {warnings,[{6,erl_lint,{missing_qlc_hrl,1}},
+    {warnings,[{6,erl_lint,{missing_qlc_hrl,1}},
                      {7,erl_lint,{missing_qlc_hrl,2}},
                      {8,erl_lint,{missing_qlc_hrl,2}}]} = 
         run_test2(Config, QLC2, [warn_unused_record]),
@@ -2597,13 +2544,29 @@ otp_5878(Config) when is_list(Config) ->
 
                     foo(#request{}) -> ok.
                   ">>,
-    ?line [] = run_test2(Config, UsedByType, [warn_unused_record]),
+    [] = run_test2(Config, UsedByType, [warn_unused_record]),
+
+    %% Abstract code generated by OTP 18. Note that the type info for
+    %% record fields has been put in a separate form.
+    OldAbstract = [{attribute,1,file,{"rec.erl",1}},
+                   {attribute,1,module,rec},
+                   {attribute,3,export,[{t,0}]},
+                   {attribute,7,record,{r,[{record_field,7,{atom,7,f}}]}},
+                   {attribute,7,type,
+                    {{record,r},
+                     [{typed_record_field,
+                       {record_field,7,{atom,7,f}},
+                       {type,7,union,[{atom,7,undefined},{type,7,atom,[]}]}}],
+                     []}},
+                   {function,9,t,0,[{clause,9,[],[],[{record,10,r,[]}]}]},
+                   {eof,11}],
+    {error,[{"rec.erl",[{7,erl_lint,old_abstract_code}]}],[]} =
+        compile:forms(OldAbstract, [return, report]),
 
     ok.
 
-otp_6885(doc) ->
-    "OTP-6885. Binary fields in bit syntax matching is now only allowed at the end.";
-otp_6885(suite) -> [];
+%% OTP-6885. Binary fields in bit syntax matching is now only
+%% allowed at the end.
 otp_6885(Config) when is_list(Config) ->
     Ts = <<"-module(otp_6885).
             -export([t/1]).
@@ -2630,7 +2593,7 @@ otp_6885(Config) when is_list(Config) ->
                ok.
 
            ">>,
-    ?line {errors,[{3,erl_lint,unsized_binary_not_at_end},
+    {errors,[{3,erl_lint,unsized_binary_not_at_end},
 		   {4,erl_lint,unsized_binary_not_at_end},
 		   {5,erl_lint,unsized_binary_not_at_end},
 		   {10,erl_lint,typed_literal_string},
@@ -2640,9 +2603,7 @@ otp_6885(Config) when is_list(Config) ->
 	   []} = run_test2(Config, Ts, []),
     ok.
 
-otp_10436(doc) ->
-    "OTP-6885. Warnings for opaque types.";
-otp_10436(suite) -> [];
+%% OTP-6885. Warnings for opaque types.
 otp_10436(Config) when is_list(Config) ->
     Ts = <<"-module(otp_10436).
             -export_type([t1/0]).
@@ -2662,9 +2623,7 @@ otp_10436(Config) when is_list(Config) ->
         run_test2(Config, Ts2, []),
     ok.
 
-otp_11254(doc) ->
-    "OTP-11254. M:F/A could crash the linter.";
-otp_11254(suite) -> [];
+%% OTP-11254. M:F/A could crash the linter.
 otp_11254(Config) when is_list(Config) ->
     Ts = <<"-module(p2).
             -export([manifest/2]).
@@ -2676,9 +2635,7 @@ otp_11254(Config) when is_list(Config) ->
         run_test2(Config, Ts, []),
     ok.
 
-otp_11772(doc) ->
-    "OTP-11772. Reintroduce errors for redefined builtin types.";
-otp_11772(suite) -> [];
+%% OTP-11772. Reintroduce errors for redefined builtin types.
 otp_11772(Config) when is_list(Config) ->
     Ts = <<"
             -module(newly).
@@ -2703,9 +2660,7 @@ otp_11772(Config) when is_list(Config) ->
      []} = run_test2(Config, Ts, []),
     ok.
 
-otp_11771(doc) ->
-    "OTP-11771. Do not allow redefinition of the types arity(_) &c..";
-otp_11771(suite) -> [];
+%% OTP-11771. Do not allow redefinition of the types arity(_) &c..
 otp_11771(Config) when is_list(Config) ->
     Ts = <<"
             -module(newly).
@@ -2732,9 +2687,7 @@ otp_11771(Config) when is_list(Config) ->
      []} = run_test2(Config, Ts, []),
     ok.
 
-otp_11872(doc) ->
-    "OTP-11872. The type map() undefined when exported.";
-otp_11872(suite) -> [];
+%% OTP-11872. The type map() undefined when exported.
 otp_11872(Config) when is_list(Config) ->
     Ts = <<"
             -module(map).
@@ -2756,22 +2709,19 @@ otp_11872(Config) when is_list(Config) ->
         run_test2(Config, Ts, []),
     ok.
 
-export_all(doc) ->
-    "OTP-7392. Warning for export_all.";
+%% OTP-7392. Warning for export_all.
 export_all(Config) when is_list(Config) ->
     Ts = <<"-module(export_all_module).
             -compile([export_all]).
 
             id(I) -> I.
            ">>,
-    ?line [] = run_test2(Config, Ts, []),
-    ?line {warnings,[{2,erl_lint,export_all}]} =
+    [] = run_test2(Config, Ts, []),
+    {warnings,[{2,erl_lint,export_all}]} =
 	run_test2(Config, Ts, [warn_export_all]),
     ok.
 
-bif_clash(doc) ->
-    "Test warnings for functions that clash with BIFs.";
-bif_clash(suite) -> [];
+%% Test warnings for functions that clash with BIFs.
 bif_clash(Config) when is_list(Config) ->
     Ts = [{clash1,
            <<"t(X) ->
@@ -3038,12 +2988,10 @@ bif_clash(Config) when is_list(Config) ->
 	   []}
 	 ],
 
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-behaviour_basic(doc) ->
-    "Basic tests with one behaviour.";
-behaviour_basic(suite) -> [];
+%% Basic tests with one behaviour.
 behaviour_basic(Config) when is_list(Config) ->
     Ts = [{behaviour1,
            <<"-behaviour(application).
@@ -3077,12 +3025,10 @@ behaviour_basic(Config) when is_list(Config) ->
            [],
            {warnings,[{1,erl_lint,{undefined_behaviour_func,{start,2},application}}]}}
 	 ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-behaviour_multiple(doc) ->
-    "Basic tests with multiple behaviours.";
-behaviour_multiple(suite) -> [];
+%% Basic tests with multiple behaviours.
 behaviour_multiple(Config) when is_list(Config) ->
     Ts = [{behaviour1,
            <<"-behaviour(application).
@@ -3180,12 +3126,10 @@ behaviour_multiple(Config) when is_list(Config) ->
 		       erl_lint,
 		       {conflicting_behaviours,{init,1},supervisor,1,gen_server}}]}}
 	 ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-otp_11861(doc) ->
-    "OTP-11861. behaviour_info() and -callback.";
-otp_11861(suite) -> [];
+%% OTP-11861. behaviour_info() and -callback.
 otp_11861(Conf) when is_list(Conf) ->
     CallbackFiles = [callback1, callback2, callback3,
                      bad_behaviour1, bad_behaviour2],
@@ -3366,12 +3310,12 @@ otp_11861(Conf) when is_list(Conf) ->
            [],
            []}
 	 ],
-    ?line [] = run(Conf, Ts),
+    [] = run(Conf, Ts),
     true = code:set_path(CodePath),
     ok.
 
-otp_7550(doc) ->
-    "Test that the new utf8/utf16/utf32 types do not allow size or unit specifiers.";
+%% Test that the new utf8/utf16/utf32 types do not allow size or
+%% unit specifiers.
 otp_7550(Config) when is_list(Config) ->
     Ts = [{otp_7550,
            <<"f8(A) ->
@@ -3407,12 +3351,11 @@ otp_7550(Config) when is_list(Config) ->
 		    {20,erl_lint,utf_bittype_size_or_unit}
 		   ],
             []}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
     
 
-otp_8051(doc) ->
-    "Bugfix: -opaque with invalid type.";
+%% Bugfix: -opaque with invalid type.
 otp_8051(Config) when is_list(Config) ->
     Ts = [{otp_8051,
            <<"-opaque foo() :: bar().
@@ -3420,12 +3363,10 @@ otp_8051(Config) when is_list(Config) ->
              ">>,
            [],
            {errors,[{1,erl_lint,{undefined_type,{bar,0}}}],[]}}],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-format_warn(doc) ->
-    "Check that format warnings are generated.";
-format_warn(suite) -> [];
+%% Check that format warnings are generated.
 format_warn(Config) when is_list(Config) ->
     L1 = 14,
     L2 = 4,
@@ -3435,18 +3376,18 @@ format_warn(Config) when is_list(Config) ->
     ok.
 
 format_level(Level, Count, Config) ->
-    ?line W = get_compilation_result(Config, "format",
+    W = get_compilation_result(Config, "format",
                                      [{warn_format, Level}]),
     %% Pick out the 'format' warnings.
-    ?line FW = lists:filter(fun({_Line, erl_lint, {format_error, _}}) -> true;
+    FW = lists:filter(fun({_Line, erl_lint, {format_error, _}}) -> true;
                                (_) -> false
                             end,
                             W),
-    ?line case length(FW) of
+    case length(FW) of
               Count ->
                   ok;
               Other ->
-                  ?t:format("Expected ~w warning(s); got ~w", [Count,Other]),
+                  io:format("Expected ~w warning(s); got ~w", [Count,Other]),
                   fail()
           end,
     ok.
@@ -3482,7 +3423,7 @@ on_load_successful(Config) when is_list(Config) ->
 	   {[]},				%Tuple indicates no 'export_all'.
 	   []}
 	 ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
 on_load_failing(Config) when is_list(Config) ->
@@ -3530,12 +3471,10 @@ on_load_failing(Config) when is_list(Config) ->
 	   {errors,
 	    [{1,erl_lint,{undefined_on_load,{non_existing,0}}}],[]}}
 	 ],
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
-too_many_arguments(doc) ->
-    "Test that too many arguments is not accepted.";
-too_many_arguments(suite) -> [];
+%% Test that too many arguments is not accepted.
 too_many_arguments(Config) when is_list(Config) ->
     Ts = [{too_many_1,
 	   <<"f(_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_) -> ok.">>,
@@ -3544,7 +3483,7 @@ too_many_arguments(Config) when is_list(Config) ->
 	    [{1,erl_lint,{too_many_arguments,256}}],[]}}
 	 ],
 	  
-    ?line [] = run(Config, Ts),
+    [] = run(Config, Ts),
     ok.
 
 
@@ -3627,9 +3566,7 @@ bin_syntax_errors(Config) ->
     [] = run(Config, Ts),
     ok.
 
-predef(doc) ->
-    "OTP-10342: No longer predefined types: array(), digraph(), and so on";
-predef(suite) -> [];
+%% OTP-10342: No longer predefined types: array(), digraph(), and so on.
 predef(Config) when is_list(Config) ->
     W = get_compilation_result(Config, "predef", []),
     [] = W,
@@ -3756,8 +3693,7 @@ maps_type(Config) when is_list(Config) ->
     [] = run(Config, Ts),
     ok.
 
-otp_11851(doc) ->
-    "OTP-11851: More atoms can be used as type names + bug fixes.";
+%% OTP-11851: More atoms can be used as type names + bug fixes.
 otp_11851(Config) when is_list(Config) ->
     Ts = [
 	{otp_11851_1,
@@ -3843,42 +3779,29 @@ otp_11851(Config) when is_list(Config) ->
     [] = run(Config, Ts),
     ok.
 
-otp_12195(doc) ->
-    "OTP-12195: Check obsolete types (tailor made for OTP 18).";
-otp_12195(Config) when is_list(Config) ->
-    Ts = [{otp_12195_1,
-           <<"-export_type([r1/0]).
-              -type r1() :: erl_scan:line()
-                          | erl_scan:column()
-                          | erl_scan:location()
-                          | erl_anno:line().">>,
-           [],
-           {warnings,[{2,erl_lint,
-                       {deprecated_type,{erl_scan,line,0},
-                        "deprecated (will be removed in OTP 19); "
-                        "use erl_anno:line() instead"}},
-                      {3,erl_lint,
-                       {deprecated_type,{erl_scan,column,0},
-                        "deprecated (will be removed in OTP 19); use "
-                        "erl_anno:column() instead"}},
-                      {4,erl_lint,
-                       {deprecated_type,{erl_scan,location,0},
-                        "deprecated (will be removed in OTP 19); "
-                        "use erl_anno:location() instead"}}]}},
-          {otp_12195_2,
-           <<"-export_type([r1/0]).
-              -compile(nowarn_deprecated_type).
-              -type r1() :: erl_scan:line()
-                          | erl_scan:column()
-                          | erl_scan:location()
-                          | erl_anno:line().">>,
-           [],
-           []}],
-    [] = run(Config, Ts),
+%% OTP-11879: The -spec f/a :: (As) -> B; syntax removed,
+%% and is_subtype/2 deprecated.
+otp_11879(_Config) ->
+    Fs = [{attribute,0,file,{"file.erl",0}},
+          {attribute,0,module,m},
+          {attribute,1,spec,
+           {{f,1},
+            [{type,2,'fun',[{type,3,product,[{var,4,'V1'},
+                                             {var,5,'V1'}]},
+                            {type,6,integer,[]}]}]}},
+          {attribute,20,callback,
+           {{cb,21},
+            [{type,22,'fun',[{type,23,product,[{var,24,'V1'},
+                                               {var,25,'V1'}]},
+                             {type,6,integer,[]}]}]}}],
+    {error,[{"file.erl",
+             [{1,erl_lint,{spec_fun_undefined,{f,1}}},
+              {2,erl_lint,spec_wrong_arity},
+              {22,erl_lint,callback_wrong_arity}]}],
+     []} = compile:forms(Fs, [return,report]),
     ok.
 
-otp_13230(doc) ->
-    "OTP-13230: -deprecated without -module";
+%% OTP-13230: -deprecated without -module.
 otp_13230(Config) when is_list(Config) ->
     Abstr = <<"-deprecated([{frutt,0,next_version}]).">>,
     {errors,[{1,erl_lint,undefined_module},
@@ -3886,13 +3809,24 @@ otp_13230(Config) when is_list(Config) ->
      []} = run_test2(Config, Abstr, []),
     ok.
 
+record_errors(Config) when is_list(Config) ->
+    Ts = [{rec1,
+           <<"-record(r, {a,b}).
+              b() -> #r{a=foo,b=42,a=bar}.
+              u(R) -> R#r{a=1,b=2,a=2}.
+             ">>,
+           [],
+           {errors,[{2,erl_lint,{redefine_field,r,a}},
+		    {3,erl_lint,{redefine_field,r,a}}],[]}}],
+    run(Config, Ts).
+
 run(Config, Tests) ->
     F = fun({N,P,Ws,E}, BadL) ->
                 case catch run_test(Config, P, Ws) of
                     E -> 
                         BadL;
                     Bad -> 
-                        ?t:format("~nTest ~p failed. Expected~n  ~p~n"
+                        io:format("~nTest ~p failed. Expected~n  ~p~n"
                                   "but got~n  ~p~n", [N, E, Bad]),
 			fail()
                 end
@@ -3902,8 +3836,8 @@ run(Config, Tests) ->
 %% Compiles a test file and returns the list of warnings/errors.
 
 get_compilation_result(Conf, Filename, Warnings) ->
-    ?line DataDir = ?datadir,
-    ?line File = filename:join(DataDir, Filename),
+    DataDir = ?datadir,
+    File = filename:join(DataDir, Filename),
     {ok,Bin} = file:read_file(File++".erl"),
     FileS = binary_to_list(Bin),
     {match,[{Start,Length}|_]} = re:run(FileS, "-module.*\\n"),
@@ -3967,5 +3901,4 @@ call_format_error(L) ->
     L.
 
 fail() ->
-    io:format("failed~n"),
-    ?t:fail().
+    ct:fail(failed).
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index 92e2764c65..4d44f7686a 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -22,7 +22,7 @@
 %%%-----------------------------------------------------------------
 -module(erl_pp_SUITE).
 
-%-define(debug, true).
+%%-define(debug, true).
 
 -ifdef(debug).
 -define(line, put(line, ?LINE), ).
@@ -31,9 +31,9 @@
 -define(privdir, "erl_pp_SUITE_priv").
 -define(t, test_server).
 -else.
--include_lib("test_server/include/test_server.hrl").
--define(datadir, ?config(data_dir, Config)).
--define(privdir, ?config(priv_dir, Config)).
+-include_lib("common_test/include/ct.hrl").
+-define(datadir, proplists:get_value(data_dir, Config)).
+-define(privdir, proplists:get_value(priv_dir, Config)).
 -endif.
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -55,19 +55,15 @@
 %% Internal export.
 -export([ehook/6]).
 
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(2)).
-
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
+    Config.
 
 end_per_testcase(_Case, _Config) ->
-    Dog = ?config(watchdog, _Config),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     [{group, expr}, {group, attributes}, hook, neg_indent,
@@ -99,8 +95,6 @@ end_per_group(_GroupName, Config) ->
 
 
 
-func(suite) ->
-    [];
 func(Config) when is_list(Config) ->
     Ts = [{func_1,
            <<"-record(r1, {a,b}).
@@ -154,11 +148,9 @@ func(Config) when is_list(Config) ->
                            true
                    end)().">>}
           ],
-    ?line compile(Config, Ts),
+    compile(Config, Ts),
     ok.
 
-call(suite) ->
-    [];
 call(Config) when is_list(Config) ->
     Ts = [{call_1,
            <<"t() ->
@@ -167,11 +159,9 @@ call(Config) when is_list(Config) ->
                       sfds,sdfsdf,sfds).
              ">>}
           ],
-    ?line compile(Config, Ts),
+    compile(Config, Ts),
     ok.
 
-recs(suite) ->
-    [];
 recs(Config) when is_list(Config) ->
     %% Evolved while testing strict record tests in guards...
     Ts = [{recs_1,
@@ -328,18 +318,16 @@ recs(Config) when is_list(Config) ->
                   R = #r2{},
                   R#r2{c = R, d = #r1{}}.">>}
           ],
-    ?line compile(Config, Ts),
+    compile(Config, Ts),
 
-    ?line ok = pp_expr(<<"case #r{a={1,2},b=#r{}} of
+    ok = pp_expr(<<"case #r{a={1,2},b=#r{}} of
                               X=Y=#r{a=foo,b=bar} ->
                                   {(foooo:baaaar(X))#r{a = rep},Y,#r.b}
                           end">>),
-    ?line ok = pp_expr(<<"R#r{a = {kljasdklf,sdkfjsdl,sdafjkllsdf,sdfkjsd,
+    ok = pp_expr(<<"R#r{a = {kljasdklf,sdkfjsdl,sdafjkllsdf,sdfkjsd,
                           sdafjsd,sdf,sdafsd,sdfdsf,sdfdsf,dsfds}}">>),
     ok.
 
-try_catch(suite) ->
-    [];
 try_catch(Config) when is_list(Config) ->
     Ts = [{try_1, % copied from erl_eval_SUITE
            <<"t() -> try 1 of 1 -> 2 catch _:_ -> 3 end.">>},
@@ -381,8 +369,8 @@ try_catch(Config) when is_list(Config) ->
            <<"t() -> catch begin begin foo, bar, foo:bar(kljsldkfjdls,kljsdl),
                            (catch bar:foo(foo)) end end.">>}
           ],
-    ?line compile(Config, Ts),
-    ?line ok = pp_expr(<<"try
+    compile(Config, Ts),
+    ok = pp_expr(<<"try
                               erl_internal:bif(M,F,length(Args))
                           of
                               true ->
@@ -392,8 +380,6 @@ try_catch(Config) when is_list(Config) ->
                           after foo end">>),
     ok.
 
-if_then(suite) ->
-    [];
 if_then(Config) when is_list(Config) ->
     Ts = [{if_1,
            <<"t() -> if 1 > 2 -> 1; true -> b end.">>},
@@ -402,11 +388,9 @@ if_then(Config) when is_list(Config) ->
           {if_3,
            <<"t() -> if 1 == 2 -> a; 1 > 2 -> b; 1 < 2 -> c end.">>}
           ],
-    ?line compile(Config, Ts),
+    compile(Config, Ts),
     ok.
 
-receive_after(suite) ->
-    [];
 receive_after(Config) when is_list(Config) ->
     Ts = [{rec_1,
            <<"t() -> receive foo -> bar; bar -> foo end.">>},
@@ -427,11 +411,9 @@ receive_after(Config) when is_list(Config) ->
                              {3,4}
                      end.">>}
           ],
-    ?line compile(Config, Ts),
+    compile(Config, Ts),
     ok.
 
-bits(suite) ->
-    [];
 bits(Config) when is_list(Config) ->
     Ts = [{bit_1, % copied from shell_SUITE
            <<"t() -> <<(<<\"abc\">>):3/binary>>.">>},
@@ -452,21 +434,19 @@ bits(Config) when is_list(Config) ->
           {bit_9,
            <<"">>}
           ],
-    ?line compile(Config, Ts),
-    ?line ok = pp_expr(<<"<<(list_to_binary([1,2]))/binary>>">>),
-    ?line ok = pp_expr(
+    compile(Config, Ts),
+    ok = pp_expr(<<"<<(list_to_binary([1,2]))/binary>>">>),
+    ok = pp_expr(
           <<"<<(list_to_binary([1,2])):all/binary-unit:8-unsigned-big>>">>),
-    ?line ok = pp_expr(<<"<<<<\"hej\">>/binary>>">>),
-    ?line ok = pp_expr(<<"<<(foo:bar())/binary>>">>),
-    ?line ok = pp_expr(<<"<<(a)/binary>>">>),
-    ?line ok = pp_expr(<<"<<a/binary>>">>),
-    ?line ok = pp_expr(<<"<<{a,b}/binary>>">>),
-    ?line ok = pp_expr(<<"<<{foo:bar(),b}/binary>>">>),
-    ?line ok = pp_expr(<<"<<(foo:bar()):(foo:bar())/binary>>">>),
+    ok = pp_expr(<<"<<<<\"hej\">>/binary>>">>),
+    ok = pp_expr(<<"<<(foo:bar())/binary>>">>),
+    ok = pp_expr(<<"<<(a)/binary>>">>),
+    ok = pp_expr(<<"<<a/binary>>">>),
+    ok = pp_expr(<<"<<{a,b}/binary>>">>),
+    ok = pp_expr(<<"<<{foo:bar(),b}/binary>>">>),
+    ok = pp_expr(<<"<<(foo:bar()):(foo:bar())/binary>>">>),
     ok.
 
-head_tail(suite) ->
-    [];
 head_tail(Config) when is_list(Config) ->
     Ts = [{list_1,
            <<"t() -> [a | b].">>},
@@ -481,43 +461,30 @@ head_tail(Config) when is_list(Config) ->
                [foo:bar(lkjljlskdfj, klsdajflds, sdafkljsdlfkjdas, kjlsdadjl),
                bar:foo(kljlkjsdf, lkjsdlfj, [kljsfj, sdfdsfsad])].">>}
           ],
-    ?line compile(Config, Ts),
+    compile(Config, Ts),
     ok.
 
-cond1(suite) ->
-    [];
 cond1(Config) when is_list(Config) ->
     C = {'cond',1,[{clause,2,[],[[{tuple,2,[{atom,2,foo},{atom,2,bar}]}]],
                     [{cons,3,{atom,3,a},{cons,3,{atom,3,b},{nil,3}}}]},
                    {clause,4,[],[[{atom,4,true}]],
                     [{tuple,5,[{atom,5,x},{atom,5,y}]}]}]},
     CChars = flat_expr1(C),
-%    ?line "cond {foo,bar} -> [a,b]; true -> {x,y} end" = CChars,
-    ?line "cond\n"
+    "cond\n"
           "    {foo,bar} ->\n"
           "        [a,b];\n"
           "    true ->\n"
           "        {x,y}\n"
           "end" = CChars,
-%     ?line ok = pp_expr(<<"cond
-%                               {foo,bar} ->
-%                                   [a,b];
-%                               true ->
-%                                   {x,y}
-%                           end">>),
     ok.
 
-block(suite) ->
-    [];
 block(Config) when is_list(Config) ->
     Ts = [{block_1,
            <<"t() -> begin a,{c,d} end.">>}
           ],
-    ?line compile(Config, Ts),
+    compile(Config, Ts),
     ok.
 
-case1(suite) ->
-    [];
 case1(Config) when is_list(Config) ->
     Ts = [{case_1,
            <<"t() -> case {foo,bar} of
@@ -527,8 +494,8 @@ case1(Config) when is_list(Config) ->
                              foo
                      end.">>}
           ],
-    ?line compile(Config, Ts),
-    ?line ok = pp_expr(<<"case
+    compile(Config, Ts),
+    ok = pp_expr(<<"case
                               erl_internal:bif(M,F,length(Args))
                           of
                               true ->
@@ -538,8 +505,6 @@ case1(Config) when is_list(Config) ->
                           end">>),
     ok.
 
-ops(suite) ->
-    [];
 ops(Config) when is_list(Config) ->
     Ts = [{ops_1,
            <<"t() -> {a,b} + (3 - 2) + 4.">>},
@@ -548,21 +513,17 @@ ops(Config) when is_list(Config) ->
           {ops_3,
            <<"t() -> - (- (- (- (- 3)))).">>}
           ],
-    ?line compile(Config, Ts),
+    compile(Config, Ts),
     ok.
 
-messages(suite) ->
-    [];
 messages(Config) when is_list(Config) ->
-    ?line true = "{error,{some,\"error\"}}\n" =:=
+    true = "{error,{some,\"error\"}}\n" =:=
         lists:flatten(erl_pp:form({error,{some,"error"}})),
-    ?line true = "{warning,{some,\"warning\"}}\n" =:=
+    true = "{warning,{some,\"warning\"}}\n" =:=
         lists:flatten(erl_pp:form({warning,{some,"warning"}})),
     "\n" = flat_form({eof,0}),
     ok.
 
-import_export(suite) ->
-    [];
 import_export(Config) when is_list(Config) ->
     Ts = [{import_1,
            <<"-import(lists, [max/1, reverse/1]).
@@ -577,11 +538,9 @@ import_export(Config) when is_list(Config) ->
            <<"-include_lib(\"stdlib/include/qlc.hrl\").
               t() -> qlc:q([X || X <- []]).">>}
           ],
-    ?line compile(Config, Ts),
+    compile(Config, Ts),
     ok.
 
-misc_attrs(suite) ->
-    [];
 misc_attrs(Config) when is_list(Config) ->
     ok = pp_forms(<<"-module(m). ">>),
     ok = pp_forms(<<"-module(m, [Aafjlksfjdlsjflsdfjlsdjflkdsfjlk,"
@@ -599,8 +558,6 @@ misc_attrs(Config) when is_list(Config) ->
     ok = pp_forms(<<"-custom1(#{test1 => init/2, test2 => [val/1, val/2]}). ">>),
     ok.
 
-dialyzer_attrs(suite) ->
-    [];
 dialyzer_attrs(Config) when is_list(Config) ->
     ok = pp_forms(<<"-type foo() :: #bar{}. ">>),
     ok = pp_forms(<<"-opaque foo() :: {bar, fun((X, [42,...]) -> X)}. ">>),
@@ -608,8 +565,6 @@ dialyzer_attrs(Config) when is_list(Config) ->
     ok = pp_forms(<<"-callback foo(<<_:32,_:_*4>>, T) -> T. ">>),
     ok.
 
-hook(suite) ->
-    [];
 hook(Config) when is_list(Config) ->
     F = fun(H) -> H end,
     do_hook(F).
@@ -623,29 +578,29 @@ do_hook(HookFun) ->
     Call = {call,A0,{atom,A0,foo},[Lc]},
     Expr2 = {call,A0,{atom,A0,fff},[Call,Call,Call]},
     EChars2 = erl_pp:exprs([Expr2]),
-    ?line true = EChars =:= lists:flatten(EChars2),
+    true = EChars =:= lists:flatten(EChars2),
 
     EsChars = erl_pp:exprs([Expr], H),
-    ?line true = EChars =:= lists:flatten(EsChars),
+    true = EChars =:= lists:flatten(EsChars),
 
     A1 = erl_anno:new(1),
     F = {function,A1,ffff,0,[{clause,A1,[],[],[Expr]}]},
     FuncChars = lists:flatten(erl_pp:function(F, H)),
     F2 = {function,A1,ffff,0,[{clause,A1,[],[],[Expr2]}]},
     FuncChars2 = erl_pp:function(F2),
-    ?line true = FuncChars =:= lists:flatten(FuncChars2),
+    true = FuncChars =:= lists:flatten(FuncChars2),
     FFormChars = erl_pp:form(F, H),
-    ?line true = FuncChars =:= lists:flatten(FFormChars),
+    true = FuncChars =:= lists:flatten(FFormChars),
 
     A = {attribute,A1,record,{r,[{record_field,A1,{atom,A1,a},Expr}]}},
     AChars = lists:flatten(erl_pp:attribute(A, H)),
     A2 = {attribute,A1,record,{r,[{record_field,A1,{atom,A1,a},Expr2}]}},
     AChars2 = erl_pp:attribute(A2),
-    ?line true = AChars =:= lists:flatten(AChars2),
+    true = AChars =:= lists:flatten(AChars2),
     AFormChars = erl_pp:form(A, H),
-    ?line true = AChars =:= lists:flatten(AFormChars),
+    true = AChars =:= lists:flatten(AFormChars),
 
-    ?line "INVALID-FORM:{foo,bar}:" = lists:flatten(erl_pp:expr({foo,bar})),
+    "INVALID-FORM:{foo,bar}:" = lists:flatten(erl_pp:expr({foo,bar})),
 
     %% A list (as before R6), not a list of lists.
     G = [{op,A1,'>',{atom,A1,a},{foo,{atom,A1,b}}}], % not a proper guard
@@ -653,26 +608,26 @@ do_hook(HookFun) ->
     G2 = [{op,A1,'>',{atom,A1,a},
            {call,A0,{atom,A0,foo},[{atom,A1,b}]}}], % not a proper guard
     GChars2 = erl_pp:guard(G2),
-    ?line true = GChars =:= lists:flatten(GChars2),
+    true = GChars =:= lists:flatten(GChars2),
 
     EH = HookFun({?MODULE, ehook, [foo,bar]}),
     XEChars = erl_pp:expr(Expr, -1, EH),
-    ?line true = remove_indentation(EChars) =:= lists:flatten(XEChars),
+    true = remove_indentation(EChars) =:= lists:flatten(XEChars),
     XEChars2 = erl_pp:expr(Expr, EH),
-    ?line true = EChars =:= lists:flatten(XEChars2),
+    true = EChars =:= lists:flatten(XEChars2),
 
     %% Note: no leading spaces before "begin".
     Block = {block,A0,[{match,A0,{var,A0,'A'},{integer,A0,3}},
                       {atom,A0,true}]},
-    ?line "begin\n                     A =" ++ _ =
+    "begin\n                     A =" ++ _ =
                lists:flatten(erl_pp:expr(Block, 17, none)),
 
     %% Special...
-    ?line true =
+    true =
         "{some,value}" =:= lists:flatten(erl_pp:expr({value,A0,{some,value}})),
 
     %% Silly...
-    ?line true =
+    true =
         "if true -> 0 end" =:=
               flat_expr({'if',0,[{clause,0,[],[],[{atom,0,0}]}]}),
 
@@ -681,7 +636,7 @@ do_hook(HookFun) ->
     NewIf = {'if',A0,[{clause,A0,[],[[{atom,A0,true}]],[{atom,A0,b}]}]},
     OldIfChars = lists:flatten(erl_pp:expr(OldIf)),
     NewIfChars = lists:flatten(erl_pp:expr(NewIf)),
-    ?line true = OldIfChars =:= NewIfChars,
+    true = OldIfChars =:= NewIfChars,
 
     ok.
 
@@ -697,18 +652,16 @@ hook({foo,E}, I, P, H) ->
     A = erl_anno:new(0),
     erl_pp:expr({call,A,{atom,A,foo},[E]}, I, P, H).
 
-neg_indent(suite) ->
-    [];
 neg_indent(Config) when is_list(Config) ->
-    ?line ok = pp_expr(<<"begin a end">>),
-    ?line ok = pp_expr(<<"begin a,b end">>),
-    ?line ok = pp_expr(<<"try a,b,c
+    ok = pp_expr(<<"begin a end">>),
+    ok = pp_expr(<<"begin a,b end">>),
+    ok = pp_expr(<<"try a,b,c
                               catch exit:_ -> d;
                                     throw:_ -> t;
                                     error:{foo,bar} -> foo,
                                                        bar
                               end">>),
-    ?line ok = pp_expr(
+    ok = pp_expr(
             <<"fun() ->
                   F = fun(A, B) when ((A#r1.a) orelse (B#r2.a))
                                      or (B#r2.b) or (A#r1.b) ->
@@ -722,43 +675,41 @@ neg_indent(Config) when is_list(Config) ->
                   ok
                        end()">>),
 
-    ?line ok = pp_expr(<<"[X || X <- a, true]">>),
-    ?line ok = pp_expr(<<"{[a,b,c],[d,e|f]}">>),
-    ?line ok = pp_expr(<<"f(a,b,c)">>),
-    ?line ok = pp_expr(<<"fun() when a,b;c,d -> a end">>),
-    ?line ok = pp_expr(<<"fun A() when a,b;c,d -> a end">>),
-    ?line ok = pp_expr(<<"<<34:32,17:32>>">>),
-    ?line ok = pp_expr(<<"if a,b,c -> d; e,f,g -> h,i end">>),
-    ?line ok = pp_expr(<<"if a -> d; c -> d end">>),
-    ?line ok = pp_expr(<<"receive after 1 -> 2 end">>),
-    ?line ok = pp_expr(<<"begin a,b,c end">>),
-
-    ?line "\"\"" = flat_expr({string,0,""}),
-    ?line ok = pp_expr(<<"\"abc\"">>),
-    ?line ok = pp_expr(<<"\"abc\n\n\n\n\nkjsd\n\n\n\n\nkljsddf\n\n\n\n\n"
-                         "klafd\n\n\n\n\nkljsdf\n\n\n\n\nsdf\n\n\n\n\n\"">>),
-    ?line ok = pp_expr(<<"fkjlskljklkkljlkjlkjkljlkjsljklf"
-                          "lsdjlfdsjlfjsdlfjdslfjdlsjfsdjfklsdkfjsdf("
-                          "\"abc\n\n\n\n\nkjsd\n\n\n\n\nkljsddf\n\n\n\n\n"
-                          "kljsafd\n\n\n\n\nkljsdf\n\n\n\n\nkjsdf"
-                          "\n\n\n\n\n\")">>),
+    ok = pp_expr(<<"[X || X <- a, true]">>),
+    ok = pp_expr(<<"{[a,b,c],[d,e|f]}">>),
+    ok = pp_expr(<<"f(a,b,c)">>),
+    ok = pp_expr(<<"fun() when a,b;c,d -> a end">>),
+    ok = pp_expr(<<"fun A() when a,b;c,d -> a end">>),
+    ok = pp_expr(<<"<<34:32,17:32>>">>),
+    ok = pp_expr(<<"if a,b,c -> d; e,f,g -> h,i end">>),
+    ok = pp_expr(<<"if a -> d; c -> d end">>),
+    ok = pp_expr(<<"receive after 1 -> 2 end">>),
+    ok = pp_expr(<<"begin a,b,c end">>),
+
+    "\"\"" = flat_expr({string,0,""}),
+    ok = pp_expr(<<"\"abc\"">>),
+    ok = pp_expr(<<"\"abc\n\n\n\n\nkjsd\n\n\n\n\nkljsddf\n\n\n\n\n"
+		   "klafd\n\n\n\n\nkljsdf\n\n\n\n\nsdf\n\n\n\n\n\"">>),
+    ok = pp_expr(<<"fkjlskljklkkljlkjlkjkljlkjsljklf"
+		   "lsdjlfdsjlfjsdlfjdslfjdlsjfsdjfklsdkfjsdf("
+		   "\"abc\n\n\n\n\nkjsd\n\n\n\n\nkljsddf\n\n\n\n\n"
+		   "kljsafd\n\n\n\n\nkljsdf\n\n\n\n\nkjsdf"
+		   "\n\n\n\n\n\")">>),
 
     %% fun-info is skipped when everything is to fit on one single line
     Fun1 = {'fun',1,{function,t,0},{0,45353021,'-t/0-fun-0-'}},
-    ?line "fun t/0" = flat_expr(Fun1),
+    "fun t/0" = flat_expr(Fun1),
     Fun2 = {'fun',2,{clauses,[{clause,2,[],[],[{atom,3,true}]}]},
             {0,108059557,'-t/0-fun-0-'}},
-    ?line "fun() -> true end" = flat_expr(Fun2),
+    "fun() -> true end" = flat_expr(Fun2),
     Fun3 = {named_fun,3,'True',[{clause,3,[],[],[{atom,3,true}]}],
             {0,424242424,'-t/0-True-0-'}},
-    ?line "fun True() -> true end" = flat_expr(Fun3),
+    "fun True() -> true end" = flat_expr(Fun3),
 
     ok.
 
 
-otp_6321(doc) ->
-    "OTP_6321. Bug fix of exprs().";
-otp_6321(suite) -> [];
+%% OTP_6321. Bug fix of exprs().
 otp_6321(Config) when is_list(Config) ->
     Str = "S = hopp, {hej, S}. ",
     {done, {ok, Tokens, _EndLine}, ""} = erl_scan:tokens("", Str, _L=1),
@@ -766,9 +717,7 @@ otp_6321(Config) when is_list(Config) ->
     "S = hopp, {hej,S}" = lists:flatten(erl_pp:exprs(Exprs)),
     ok.
 
-otp_6911(doc) ->
-    "OTP_6911. More newlines.";
-otp_6911(suite) -> [];
+%% OTP_6911. More newlines.
 otp_6911(Config) when is_list(Config) ->
     F = {function,5,thomas,1,
          [{clause,5,
@@ -779,38 +728,32 @@ otp_6911(Config) when is_list(Config) ->
              [{clause,7,[{atom,7,true}],[],[{integer,7,12}]},
               {clause,8,[{atom,8,false}],[],[{integer,8,14}]}]}]}]},
     Chars = flat_form(F),
-    ?line "thomas(X) ->\n"
+    "thomas(X) ->\n"
           "    case X of\n"
           "        true ->\n"
           "            12;\n"
           "        false ->\n"
           "            14\n"
           "    end.\n" = Chars,
-    ?line ok = pp_expr(<<"case X of true -> 12; false -> 14 end">>),
-    ?line ok = pp_expr(<<"receive after 1 -> ok end">>),
+    ok = pp_expr(<<"case X of true -> 12; false -> 14 end">>),
+    ok = pp_expr(<<"receive after 1 -> ok end">>),
     ok.
 
-otp_6914(doc) ->
-    "OTP_6914. Binary comprehensions.";
-otp_6914(suite) -> [];
+%% OTP_6914. Binary comprehensions.
 otp_6914(Config) when is_list(Config) ->
-    ?line ok = pp_expr(<<"<< <<B:1>> || B <- [0,1,1] >>">>),
-    ?line ok = pp_expr(<<"[ B || <<B:1>> <= <<\"hi\">>]">>),
-    ?line ok = pp_expr(<<"<< <<1:1>> || true >>">>),
+    ok = pp_expr(<<"<< <<B:1>> || B <- [0,1,1] >>">>),
+    ok = pp_expr(<<"[ B || <<B:1>> <= <<\"hi\">>]">>),
+    ok = pp_expr(<<"<< <<1:1>> || true >>">>),
     ok.
 
-otp_8150(doc) ->
-    "OTP_8150. Types.";
-otp_8150(suite) -> [];
+%% OTP_8150. Types.
 otp_8150(Config) when is_list(Config) ->
-    ?line _ = [{N,ok} = {N,pp_forms(B)} ||
+    _ = [{N,ok} = {N,pp_forms(B)} ||
                   {N,B} <- type_examples()
                      ],
     ok.
 
-otp_8238(doc) ->
-    "OTP_8238. Bugfix 'E'.";
-otp_8238(suite) -> [];
+%% OTP_8238. Bugfix 'E'.
 otp_8238(Config) when is_list(Config) ->
     Ex = [<<"-record(rec1, {}).\n"
             "-record(rec2, {a, b}).\n"
@@ -825,7 +768,7 @@ otp_8238(Config) when is_list(Config) ->
             "t2() ->\n"
             "    #r{}.\n">>
          ],
-    ?line compile(Config, [{otp_8238,iolist_to_binary(Ex)}]),
+    compile(Config, [{otp_8238,iolist_to_binary(Ex)}]),
     ok.
 
 type_examples() ->
@@ -876,14 +819,17 @@ type_examples() ->
      {ex30,<<"-type t99() ::"
        "{t2(),'\\'t::4'(),t5(),t6(),t7(),t8(),t10(),t14(),"
        "t15(),t20(),t21(), t22(),t25()}. ">>},
+     %% Writing constraints as is_subtype(V, T) is not supported since
+     %% Erlang/OTP 19.0, but as long as the parser recognizes the
+     %% is_subtype(V, T) syntax, we need a few examples of the syntax.
      {ex31,<<"-spec t1(FooBar :: t99()) -> t99();"
-                          "(t2()) -> t2();"
-                          "('\\'t::4'()) -> '\\'t::4'() when is_subtype('\\'t::4'(), t24);"
-                          "(t23()) -> t23() when is_subtype(t23(), atom()),"
-                          "                      is_subtype(t23(), t14());"
-                          "(t24()) -> t24() when is_subtype(t24(), atom()),"
-                          "                      is_subtype(t24(), t14()),"
-                          "                      is_subtype(t24(), '\\'t::4'()).">>},
+	     "(t2()) -> t2();"
+	     "('\\'t::4'()) -> '\\'t::4'() when is_subtype('\\'t::4'(), t24);"
+	     "(t23()) -> t23() when is_subtype(t23(), atom()),"
+	     "                      is_subtype(t23(), t14());"
+	     "(t24()) -> t24() when is_subtype(t24(), atom()),"
+	     "                      is_subtype(t24(), t14()),"
+	     "                      is_subtype(t24(), '\\'t::4'()).">>},
      {ex32,<<"-spec mod:t2() -> any(). ">>},
      {ex33,<<"-opaque attributes_data() :: "
        "[{'column', column()} | {'line', info_line()} |"
@@ -903,19 +849,15 @@ type_examples() ->
            "f19 = 3 :: integer()|undefined,"
            "f5 = 3 :: undefined|integer()}). ">>}].
 
-otp_8473(doc) ->
-    "OTP_8473. Bugfix abstract type 'fun'.";
-otp_8473(suite) -> [];
+%% OTP_8473. Bugfix abstract type 'fun'.
 otp_8473(Config) when is_list(Config) ->
     Ex = [{ex1,<<"-type 'fun'(A) :: A.\n"
                  "-type funkar() :: 'fun'(fun((integer()) -> atom())).\n">>}],
-    ?line _ = [{N,ok} = {N,pp_forms(B)} ||
+    _ = [{N,ok} = {N,pp_forms(B)} ||
                   {N,B} <- Ex],
     ok.
 
-otp_8522(doc) ->
-    "OTP_8522. Avoid duplicated 'undefined' in record field types.";
-otp_8522(suite) -> [];
+%% OTP_8522. Avoid duplicated 'undefined' in record field types.
 otp_8522(Config) when is_list(Config) ->
     FileName = filename('otp_8522.erl', Config),
     C = <<"-module(otp_8522).\n"
@@ -924,11 +866,13 @@ otp_8522(Config) when is_list(Config) ->
           "            f3 :: (undefined),\n"
           "            f4 :: x | y | undefined | z,\n"
           "            f5 :: a}).\n">>,
-    ?line ok = file:write_file(FileName, C),
-    ?line {ok, _} = compile:file(FileName, [{outdir,?privdir},debug_info]),
+    ok = file:write_file(FileName, C),
+    {ok, _} = compile:file(FileName, [{outdir,?privdir},debug_info]),
     BF = filename("otp_8522", Config),
-    ?line {ok, A} = beam_lib:chunks(BF, [abstract_code]),
-    ?line 5 = count_atom(A, undefined),
+    {ok, A} = beam_lib:chunks(BF, [abstract_code]),
+    %% OTP-12719: Since 'undefined' is no longer added by the Erlang
+    %% Parser, the number of 'undefined' is 4. It used to be 5.
+    4 = count_atom(A, undefined),
     ok.
 
 count_atom(A, A) ->
@@ -940,8 +884,6 @@ count_atom(L, A) when is_list(L) ->
 count_atom(_, _) ->
     0.
 
-maps_syntax(doc) -> "Maps syntax";
-maps_syntax(suite) -> [];
 maps_syntax(Config) when is_list(Config) ->
     Ts = [{map_fun_1,
             <<"t() ->\n"
@@ -972,9 +914,7 @@ maps_syntax(Config) when is_list(Config) ->
     ok.
 
 
-otp_8567(doc) ->
-    "OTP_8567. Avoid duplicated 'undefined' in record field types.";
-otp_8567(suite) -> [];
+%% OTP_8567. Avoid duplicated 'undefined' in record field types.
 otp_8567(Config) when is_list(Config) ->
     FileName = filename('otp_8567.erl', Config),
     C = <<"-module otp_8567.\n"
@@ -983,8 +923,8 @@ otp_8567(Config) when is_list(Config) ->
           "-record r, {a}.\n"
           "-record s, {a :: integer()}.\n"
           "-type t() :: {#r{},#s{}}.\n">>,
-    ?line ok = file:write_file(FileName, C),
-    ?line {error,[{_,[{3,erl_parse,["syntax error before: ","')'"]}]}],_} =
+    ok = file:write_file(FileName, C),
+    {error,[{_,[{3,erl_parse,["syntax error before: ","')'"]}]}],_} =
         compile:file(FileName, [return]),
 
     F = <<"-module(otp_8567).\n"
@@ -998,28 +938,18 @@ otp_8567(Config) when is_list(Config) ->
           "t() ->\n"
           "    3.\n"
           "\n"
-          "-spec(t1/1 :: (ot()) -> ot1()).\n"
-          "t1(A) ->\n"
-          "    A.\n"
-          "\n"
           "-spec(t2 (ot()) -> ot1()).\n"
           "t2(A) ->\n"
           "    A.\n"
           "\n"
-          "-spec(otp_8567:t3/1 :: (ot()) -> ot1()).\n"
-          "t3(A) ->\n"
-          "    A.\n"
-          "\n"
           "-spec(otp_8567:t4 (ot()) -> ot1()).\n"
           "t4(A) ->\n"
           "    A.\n">>,
-    ?line ok = pp_forms(F),
+    ok = pp_forms(F),
 
     ok.
 
-otp_8664(doc) ->
-    "OTP_8664. Types with integer expressions.";
-otp_8664(suite) -> [];
+%% OTP_8664. Types with integer expressions.
 otp_8664(Config) when is_list(Config) ->
     FileName = filename('otp_8664.erl', Config),
     C1 = <<"-module(otp_8664).\n"
@@ -1036,42 +966,38 @@ otp_8664(Config) when is_list(Config) ->
            "-type t() :: t1() | t2() | t3() | b1() | u().\n"
            "-spec t() -> t().\n"
            "t() -> 3.\n">>,
-    ?line ok = file:write_file(FileName, C1),
-    ?line {ok, _, []} = compile:file(FileName, [return]),
+    ok = file:write_file(FileName, C1),
+    {ok, _, []} = compile:file(FileName, [return]),
 
     C2 = <<"-module(otp_8664).\n"
            "-export([t/0]).\n"
            "-spec t() -> 9 and 4.\n"
            "t() -> 0.\n">>,
-    ?line ok = file:write_file(FileName, C2),
-    ?line {error,[{_,[{3,erl_lint,{type_syntax,integer}}]}],_} =
+    ok = file:write_file(FileName, C2),
+    {error,[{_,[{3,erl_lint,{type_syntax,integer}}]}],_} =
         compile:file(FileName, [return]),
 
     ok.
 
-otp_9147(doc) ->
-    "OTP_9147. Create well-formed types when adding 'undefined'.";
-otp_9147(suite) -> [];
+%% OTP-9147. Create well-formed types when adding 'undefined'.
 otp_9147(Config) when is_list(Config) ->
     FileName = filename('otp_9147.erl', Config),
     C1 = <<"-module(otp_9147).\n"
            "-export_type([undef/0]).\n"
            "-record(undef, {f1 :: F1 :: a | b}).\n"
            "-type undef() :: #undef{}.\n">>,
-    ?line ok = file:write_file(FileName, C1),
-    ?line {ok, _, []} = 
+    ok = file:write_file(FileName, C1),
+    {ok, _, []} =
        compile:file(FileName, [return,'P',{outdir,?privdir}]),
     PFileName = filename('otp_9147.P', Config),
-    ?line {ok, Bin} = file:read_file(PFileName),
+    {ok, Bin} = file:read_file(PFileName),
     %% The parentheses around "F1 :: a | b" are new (bugfix).
-    ?line true = 
-        lists:member("-record(undef,{f1 :: undefined | (F1 :: a | b)}).",
+    true =
+        lists:member("-record(undef,{f1 :: F1 :: a | b}).",
                      string:tokens(binary_to_list(Bin), "\n")),
     ok.
 
-otp_10302(doc) ->
-    "OTP-10302. Unicode characters scanner/parser.";
-otp_10302(suite) -> [];
+%% OTP-10302. Unicode characters scanner/parser.
 otp_10302(Config) when is_list(Config) ->
     Ts = [{uni_1,
            <<"t() -> <<(<<\"abc\\x{aaa}\">>):3/binary>>.">>}
@@ -1108,9 +1034,7 @@ unicode_hook({foo,E}, I, P, H) ->
     A = erl_anno:new(0),
     erl_pp:expr({call,A,{atom,A,foo},[E]}, I, P, H).
 
-otp_10820(doc) ->
-    "OTP-10820. Unicode filenames.";
-otp_10820(suite) -> [];
+%% OTP-10820. Unicode filenames.
 otp_10820(Config) when is_list(Config) ->
     C1 = <<"%% coding: utf-8\n -module(any).">>,
     ok = do_otp_10820(Config, C1, "+pc latin1"),
@@ -1136,9 +1060,7 @@ file_attr_is_string("-file(\"" ++ _) -> true;
 file_attr_is_string([_ | L]) ->
     file_attr_is_string(L).
 
-otp_11100(doc) ->
-    "OTP-11100. Fix printing of invalid forms.";
-otp_11100(suite) -> [];
+%% OTP-11100. Fix printing of invalid forms.
 otp_11100(Config) when is_list(Config) ->
     %% There are a few places where the added code ("options(none)")
     %% doesn't make a difference (pp:bit_elem_type/1 is an example).
@@ -1173,9 +1095,7 @@ otp_11100(Config) when is_list(Config) ->
              []}}),
     ok.
 
-otp_11861(doc) ->
-    "OTP-11861. behaviour_info() and -callback.";
-otp_11861(suite) -> [];
+%% OTP-11861. behaviour_info() and -callback.
 otp_11861(Config) when is_list(Config) ->
     "-optional_callbacks([bar/0]).\n" =
         pf({attribute,3,optional_callbacks,[{bar,0}]}),
@@ -1196,11 +1116,11 @@ compile(Config, Tests) ->
                             ok ->
                                 BadL;
                             not_ok ->
-                                ?t:format("~nTest ~p failed.~n", [N]),
+                                io:format("~nTest ~p failed.~n", [N]),
                                 fail()
                         end;
                     Bad ->
-                        ?t:format("~nTest ~p failed. got~n  ~p~n",
+                        io:format("~nTest ~p failed. got~n  ~p~n",
                                   [N, Bad]),
                         fail()
                 end
@@ -1366,10 +1286,9 @@ filename(Name, Config) ->
     filename:join(?privdir, Name).
 
 fail() ->
-    io:format("failed~n"),
-    ?t:fail().
+    ct:fail(failed).
 
 %% +fnu means a peer node has to be started; slave will not do
 start_node(Name, Xargs) ->
-    ?line PA = filename:dirname(code:which(?MODULE)),
+    PA = filename:dirname(code:which(?MODULE)),
     test_server:start_node(Name, peer, [{args, "-pa " ++ PA ++ " " ++ Xargs}]).
diff --git a/lib/stdlib/test/erl_scan_SUITE.erl b/lib/stdlib/test/erl_scan_SUITE.erl
index 12ea3d128c..9432edc00f 100644
--- a/lib/stdlib/test/erl_scan_SUITE.erl
+++ b/lib/stdlib/test/erl_scan_SUITE.erl
@@ -18,11 +18,12 @@
 %% %CopyrightEnd%
 
 -module(erl_scan_SUITE).
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
+	 init_per_testcase/2, end_per_testcase/2,
 	 init_per_group/2,end_per_group/2]).
 
--export([ error_1/1, error_2/1, iso88591/1, otp_7810/1, otp_10302/1,
-          otp_10990/1, otp_10992/1, otp_11807/1]).
+-export([error_1/1, error_2/1, iso88591/1, otp_7810/1, otp_10302/1,
+	 otp_10990/1, otp_10992/1, otp_11807/1]).
 
 -import(lists, [nth/2,flatten/1]).
 -import(io_lib, [print/1]).
@@ -30,7 +31,7 @@
 %%
 %% Define to run outside of test server
 %%
-%-define(STANDALONE,1).
+%%-define(STANDALONE,1).
 
 -ifdef(STANDALONE).
 -compile(export_all).
@@ -42,23 +43,18 @@
 %% config(data_dir, _) ->
 %%     ".".
 -else.
--include_lib("test_server/include/test_server.hrl").
--export([init_per_testcase/2, end_per_testcase/2]).
+-include_lib("common_test/include/ct.hrl").
+-endif.
 
-init_per_testcase(_Case, Config) when is_list(Config) ->
-    ?line Dog=test_server:timetrap(test_server:seconds(1200)),
-    [{watchdog, Dog}|Config].
+init_per_testcase(_Case, Config) ->
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
--endif.
-
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,20}}].
 
 all() -> 
     [{group, error}, iso88591, otp_7810, otp_10302, otp_10990, otp_10992,
@@ -81,20 +77,14 @@ end_per_group(_GroupName, Config) ->
 
 
 
-error_1(doc) ->
-    ["(OTP-2347)"];
-error_1(suite) ->
-    [];
+%% (OTP-2347)
 error_1(Config) when is_list(Config) ->
-    ?line {error, _, _} = erl_scan:string("'a"),
+    {error, _, _} = erl_scan:string("'a"),
     ok.
 
-error_2(doc) ->
-    ["Checks that format_error works on the error cases."];
-error_2(suite) ->
-    [];
+%% Checks that format_error works on the error cases.
 error_2(Config) when is_list(Config) ->
-    ?line lists:foreach(fun check/1, error_cases()),
+    lists:foreach(fun check/1, error_cases()),
     ok.
 
 error_cases() ->
@@ -107,7 +97,7 @@ error_cases() ->
      "2.3e",
      "2.3e-",
      "91#9"
-].
+    ].
 
 assert_type(N, integer) when is_integer(N) ->
     ok;
@@ -128,71 +118,66 @@ check_error({error, Info, EndLine}, Module0) ->
     String = lists:flatten(Module0:format_error(Desc)),
     true = io_lib:printable_list(String).
 
-iso88591(doc) -> ["Tests the support for ISO-8859-1 i.e Latin-1"];
-iso88591(suite) -> [];
+%% Tests the support for ISO-8859-1 i.e Latin-1.
 iso88591(Config) when is_list(Config) ->
-    ?line ok =
-     case catch begin
-		   %% Some atom and variable names
-		   V1s = [$Á,$á,$é,$ë],
-		   V2s = [$N,$ä,$r],
-		   A1s = [$h,$ä,$r],
-		   A2s = [$ö,$r,$e],
-		   %% Test parsing atom and variable characters.
-		   {ok,Ts1,_} = erl_scan_string(V1s ++ " " ++ V2s ++
-					       "\327" ++
-					       A1s ++ " " ++ A2s),
-		   V1s = atom_to_list(element(3, nth(1, Ts1))),
-		   V2s = atom_to_list(element(3, nth(2, Ts1))),
-		   A1s = atom_to_list(element(3, nth(4, Ts1))),
-		   A2s = atom_to_list(element(3, nth(5, Ts1))),
-		   %% Test printing atoms
-		   A1s = flatten(print(element(3, nth(4, Ts1)))),
-		   A2s = flatten(print(element(3, nth(5, Ts1)))),
-		   %% Test parsing and printing strings.
-		   S1 = V1s ++ "\327" ++ A1s ++ "\250" ++ A2s,
-		   S1s = "\"" ++ S1 ++ "\"",
-		   {ok,Ts2,_} = erl_scan_string(S1s),
-		   S1 = element(3, nth(1, Ts2)),
-		   S1s = flatten(print(element(3, nth(1, Ts2)))),
-		   ok				%It all worked
-	       end of
-	{'EXIT',R} ->				%Something went wrong!
-	     {error,R};
-	ok -> ok				%Aok
-    end.
-
-otp_7810(doc) ->
-    ["OTP-7810. White spaces, comments, and more.."];
-otp_7810(suite) ->
-    [];
+    ok =
+	case catch begin
+		       %% Some atom and variable names
+		       V1s = [$Á,$á,$é,$ë],
+		       V2s = [$N,$ä,$r],
+		       A1s = [$h,$ä,$r],
+		       A2s = [$ö,$r,$e],
+		       %% Test parsing atom and variable characters.
+		       {ok,Ts1,_} = erl_scan_string(V1s ++ " " ++ V2s ++
+							"\327" ++
+							A1s ++ " " ++ A2s),
+		       V1s = atom_to_list(element(3, nth(1, Ts1))),
+		       V2s = atom_to_list(element(3, nth(2, Ts1))),
+		       A1s = atom_to_list(element(3, nth(4, Ts1))),
+		       A2s = atom_to_list(element(3, nth(5, Ts1))),
+		       %% Test printing atoms
+		       A1s = flatten(print(element(3, nth(4, Ts1)))),
+		       A2s = flatten(print(element(3, nth(5, Ts1)))),
+		       %% Test parsing and printing strings.
+		       S1 = V1s ++ "\327" ++ A1s ++ "\250" ++ A2s,
+		       S1s = "\"" ++ S1 ++ "\"",
+		       {ok,Ts2,_} = erl_scan_string(S1s),
+		       S1 = element(3, nth(1, Ts2)),
+		       S1s = flatten(print(element(3, nth(1, Ts2)))),
+		       ok				%It all worked
+		   end of
+	    {'EXIT',R} ->				%Something went wrong!
+		{error,R};
+	    ok -> ok				%Aok
+	end.
+
+%% OTP-7810. White spaces, comments, and more...
 otp_7810(Config) when is_list(Config) ->
-    ?line ok = reserved_words(),
-    ?line ok = atoms(),
-    ?line ok = punctuations(),
-    ?line ok = comments(),
-    ?line ok = errors(),
-    ?line ok = integers(),
-    ?line ok = base_integers(),
-    ?line ok = floats(),
-    ?line ok = dots(),
-    ?line ok = chars(),
-    ?line ok = variables(),
-    ?line ok = eof(),
-    ?line ok = illegal(),
-    ?line ok = crashes(),
-
-    ?line ok = options(),
-    ?line ok = token_info(),
-    ?line ok = column_errors(),
-    ?line ok = white_spaces(),
-
-    ?line ok = unicode(),
-
-    ?line ok = more_chars(),
-    ?line ok = more_options(),
-    ?line ok = attributes_info(),
-    ?line ok = set_attribute(),
+    ok = reserved_words(),
+    ok = atoms(),
+    ok = punctuations(),
+    ok = comments(),
+    ok = errors(),
+    ok = integers(),
+    ok = base_integers(),
+    ok = floats(),
+    ok = dots(),
+    ok = chars(),
+    ok = variables(),
+    ok = eof(),
+    ok = illegal(),
+    ok = crashes(),
+
+    ok = options(),
+    ok = token_info(),
+    ok = column_errors(),
+    ok = white_spaces(),
+
+    ok = unicode(),
+
+    ok = more_chars(),
+    ok = more_options(),
+    ok = anno_info(),
 
     ok.
 
@@ -203,10 +188,10 @@ reserved_words() ->
          'rem', 'band', 'and', 'bor', 'bxor', 'bsl', 'bsr',
          'or', 'xor'],
     [begin
-         ?line {RW, true} = {RW, erl_scan:reserved_word(RW)},
+         {RW, true} = {RW, erl_scan:reserved_word(RW)},
          S = atom_to_list(RW),
          Ts = [{RW,{1,1}}],
-         ?line test_string(S, Ts)
+         test_string(S, Ts)
      end || RW <- L],
     ok.
 
@@ -215,14 +200,14 @@ atoms() ->
     test_string("a
                  b", [{atom,{1,1},a},{atom,{2,18},b}]),
     test_string("'a b'", [{atom,{1,1},'a b'}]),
-    test_string("a", [{atom,{1,1},a}]),
-    test_string("a@2", [{atom,{1,1},a@2}]),
-    test_string([39,65,200,39], [{atom,{1,1},'AÈ'}]),
-    test_string("ärlig östen", [{atom,{1,1},ärlig},{atom,{1,7},östen}]),
-    ?line {ok,[{atom,_,'$a'}],{1,6}} =
-        erl_scan_string("'$\\a'", {1,1}),
-    ?line test("'$\\a'"),
-    ok.
+		test_string("a", [{atom,{1,1},a}]),
+		test_string("a@2", [{atom,{1,1},a@2}]),
+		test_string([39,65,200,39], [{atom,{1,1},'AÈ'}]),
+		test_string("ärlig östen", [{atom,{1,1},ärlig},{atom,{1,7},östen}]),
+		{ok,[{atom,_,'$a'}],{1,6}} =
+		    erl_scan_string("'$\\a'", {1,1}),
+		test("'$\\a'"),
+		ok.
 
 punctuations() ->
     L = ["<<", "<-", "<=", "<", ">>", ">=", ">", "->", "--",
@@ -232,7 +217,7 @@ punctuations() ->
     [begin
          W = list_to_atom(S),
          Ts = [{W,{1,1}}],
-         ?line test_string(S, Ts)
+         test_string(S, Ts)
      end || S <- L],
     Three = ["/=:=", "<=:=", "==:=", ">=:="], % three tokens...
     No = Three ++ L,
@@ -248,18 +233,18 @@ punctuations() ->
          W1 = list_to_atom(S1),
          W2 = list_to_atom(S2),
          Ts = [{W1,{1,1}},{W2,{1,-L2+1}}],
-         ?line test_string(S, Ts)
+         test_string(S, Ts)
      end || {S,[{L2,S1,S2}|_]}  <- SL],
 
     PTs1 = [{'!',{1,1}},{'(',{1,2}},{')',{1,3}},{',',{1,4}},{';',{1,5}},
             {'=',{1,6}},{'[',{1,7}},{']',{1,8}},{'{',{1,9}},{'|',{1,10}},
             {'}',{1,11}}],
-    ?line test_string("!(),;=[]{|}", PTs1),
+    test_string("!(),;=[]{|}", PTs1),
 
     PTs2 = [{'#',{1,1}},{'&',{1,2}},{'*',{1,3}},{'+',{1,4}},{'/',{1,5}},
             {':',{1,6}},{'<',{1,7}},{'>',{1,8}},{'?',{1,9}},{'@',{1,10}},
             {'\\',{1,11}},{'^',{1,12}},{'`',{1,13}},{'~',{1,14}}],
-    ?line test_string("#&*+/:<>?@\\^`~", PTs2),
+    test_string("#&*+/:<>?@\\^`~", PTs2),
 
     test_string(".. ", [{'..',{1,1}}]),
     test_string("1 .. 2",
@@ -268,9 +253,9 @@ punctuations() ->
     ok.
 
 comments() ->
-    ?line test("a %%\n b"),
+    test("a %%\n b"),
     {ok,[],1} = erl_scan_string("%"),
-    ?line test("a %%\n b"),
+    test("a %%\n b"),
     {ok,[{atom,{1,1},a},{atom,{2,2},b}],{2,3}} =
         erl_scan_string("a %%\n b", {1,1}),
     {ok,[{atom,{1,1},a},{comment,{1,3},"%%"},{atom,{2,2},b}],{2,3}} =
@@ -290,30 +275,30 @@ comments() ->
     ok.
 
 errors() ->
-    ?line {error,{1,erl_scan,{string,$',"qa"}},1} = erl_scan:string("'qa"), %'
+    {error,{1,erl_scan,{string,$',"qa"}},1} = erl_scan:string("'qa"), %'
     {error,{{1,1},erl_scan,{string,$',"qa"}},{1,4}} = %'
         erl_scan:string("'qa", {1,1}, []), %'
-    ?line {error,{1,erl_scan,{string,$","str"}},1} = %"
+    {error,{1,erl_scan,{string,$","str"}},1} = %"
         erl_scan:string("\"str"), %"
     {error,{{1,1},erl_scan,{string,$","str"}},{1,5}} = %"
         erl_scan:string("\"str", {1,1}, []), %"
-    ?line {error,{1,erl_scan,char},1} = erl_scan:string("$"),
+    {error,{1,erl_scan,char},1} = erl_scan:string("$"),
     {error,{{1,1},erl_scan,char},{1,2}} = erl_scan:string("$", {1,1}, []),
     test_string([34,65,200,34], [{string,{1,1},"AÈ"}]),
     test_string("\\", [{'\\',{1,1}}]),
-    ?line {'EXIT',_} =
+    {'EXIT',_} =
         (catch {foo, erl_scan:string('$\\a', {1,1})}), % type error
-    ?line {'EXIT',_} =
+    {'EXIT',_} =
         (catch {foo, erl_scan:tokens([], '$\\a', {1,1})}), % type error
 
-    ?line "{a,tuple}" = erl_scan:format_error({a,tuple}),
+    "{a,tuple}" = erl_scan:format_error({a,tuple}),
     ok.
 
 integers() ->
     [begin
          I = list_to_integer(S),
          Ts = [{integer,{1,1},I}],
-         ?line test_string(S, Ts)
+         test_string(S, Ts)
      end || S <- [[N] || N <- lists:seq($0, $9)] ++ ["2323","000"] ],
     ok.
 
@@ -322,11 +307,11 @@ base_integers() ->
          B = list_to_integer(BS),
          I = erlang:list_to_integer(S, B),
          Ts = [{integer,{1,1},I}],
-         ?line test_string(BS++"#"++S, Ts)
+         test_string(BS++"#"++S, Ts)
      end || {BS,S} <- [{"2","11"}, {"5","23234"}, {"12","05a"},
                        {"16","abcdef"}, {"16","ABCDEF"}] ],
 
-    ?line {error,{1,erl_scan,{base,1}},1} = erl_scan:string("1#000"),
+    {error,{1,erl_scan,{base,1}},1} = erl_scan:string("1#000"),
     {error,{{1,1},erl_scan,{base,1}},{1,2}} =
         erl_scan:string("1#000", {1,1}, []),
 
@@ -334,7 +319,7 @@ base_integers() ->
 
     [begin
          Str = BS ++ "#" ++ S,
-         ?line {error,{1,erl_scan,{illegal,integer}},1} =
+         {error,{1,erl_scan,{illegal,integer}},1} =
              erl_scan:string(Str)
      end || {BS,S} <- [{"3","3"},{"15","f"}, {"12","c"}] ],
 
@@ -350,12 +335,12 @@ floats() ->
     [begin
          F = list_to_float(FS),
          Ts = [{float,{1,1},F}],
-         ?line test_string(FS, Ts)
+         test_string(FS, Ts)
      end || FS <- ["1.0","001.17","3.31200","1.0e0","1.0E17",
                    "34.21E-18", "17.0E+14"]],
     test_string("1.e2", [{integer,{1,1},1},{'.',{1,2}},{atom,{1,3},e2}]),
 
-    ?line {error,{1,erl_scan,{illegal,float}},1} =
+    {error,{1,erl_scan,{illegal,float}},1} =
         erl_scan:string("1.0e400"),
     {error,{{1,1},erl_scan,{illegal,float}},{1,8}} =
         erl_scan:string("1.0e400", {1,1}, []),
@@ -376,31 +361,26 @@ dots() ->
            {".% öh",{ok,[{dot,1}],1}, {ok,[{dot,{1,1}}],{1,6}}},
            {".%\n", {ok,[{dot,1}],2}, {ok,[{dot,{1,1}}],{2,1}}},
            {".$",   {error,{1,erl_scan,char},1},
-                    {error,{{1,2},erl_scan,char},{1,3}}},
+	    {error,{{1,2},erl_scan,char},{1,3}}},
            {".$\\", {error,{1,erl_scan,char},1},
                     {error,{{1,2},erl_scan,char},{1,4}}},
            {".a",   {ok,[{'.',1},{atom,1,a}],1},
-                    {ok,[{'.',{1,1}},{atom,{1,2},a}],{1,3}}}
+	    {ok,[{'.',{1,1}},{atom,{1,2},a}],{1,3}}}
           ],
     [begin
          R = erl_scan_string(S),
          R2 = erl_scan_string(S, {1,1}, [])
      end || {S, R, R2} <- Dot],
 
-    ?line {ok,[{dot,_}=T1],{1,2}} = erl_scan:string(".", {1,1}, text),
-    ?line [{column,1},{length,1},{line,1},{text,"."}] =
-        erl_scan:token_info(T1, [column, length, line, text]),
-    ?line {ok,[{dot,_}=T2],{1,3}} = erl_scan:string(".%", {1,1}, text),
-    ?line [{column,1},{length,1},{line,1},{text,"."}] =
-        erl_scan:token_info(T2, [column, length, line, text]),
-    ?line {ok,[{dot,_}=T3],{1,6}} =
+    {ok,[{dot,_}=T1],{1,2}} = erl_scan:string(".", {1,1}, text),
+    [1, 1, "."] = token_info(T1),
+    {ok,[{dot,_}=T2],{1,3}} = erl_scan:string(".%", {1,1}, text),
+    [1, 1, "."] = token_info(T2),
+    {ok,[{dot,_}=T3],{1,6}} =
         erl_scan:string(".% öh", {1,1}, text),
-    ?line [{column,1},{length,1},{line,1},{text,"."}] =
-        erl_scan:token_info(T3, [column, length, line, text]),
-    ?line {error,{{1,2},erl_scan,char},{1,3}} =
-        erl_scan:string(".$", {1,1}),
-    ?line {error,{{1,2},erl_scan,char},{1,4}} =
-        erl_scan:string(".$\\", {1,1}),
+    [1, 1, "."] = token_info(T3),
+    {error,{{1,2},erl_scan,char},{1,3}} = erl_scan:string(".$", {1,1}),
+    {error,{{1,2},erl_scan,char},{1,4}} = erl_scan:string(".$\\", {1,1}),
 
     test_string(". ", [{dot,{1,1}}]),
     test_string(".  ", [{dot,{1,1}}]),
@@ -413,45 +393,45 @@ dots() ->
     test_string(".a", [{'.',{1,1}},{atom,{1,2},a}]),
 
     test_string("%. \n. ", [{dot,{2,1}}]),
-    ?line {more,C} = erl_scan:tokens([], "%. ",{1,1}, return),
+    {more,C} = erl_scan:tokens([], "%. ",{1,1}, return),
     {done,{ok,[{comment,{1,1},"%. "},
                {white_space,{1,4},"\n"},
                {dot,{2,1}}],
            {2,3}}, ""} =
         erl_scan_tokens(C, "\n. ", {1,1}, return), % any loc, any options
 
-    ?line [test_string(S, R) ||
-              {S, R} <- [{".$\n",   [{'.',{1,1}},{char,{1,2},$\n}]},
-                         {"$\\\n",  [{char,{1,1},$\n}]},
-                         {"'\\\n'", [{atom,{1,1},'\n'}]},
-                         {"$\n",    [{char,{1,1},$\n}]}] ],
+    [test_string(S, R) ||
+        {S, R} <- [{".$\n",   [{'.',{1,1}},{char,{1,2},$\n}]},
+                   {"$\\\n",  [{char,{1,1},$\n}]},
+                   {"'\\\n'", [{atom,{1,1},'\n'}]},
+                   {"$\n",    [{char,{1,1},$\n}]}] ],
     ok.
 
 chars() ->
     [begin
          L = lists:flatten(io_lib:format("$\\~.8b", [C])),
          Ts = [{char,{1,1},C}],
-         ?line test_string(L, Ts)
+         test_string(L, Ts)
      end || C <- lists:seq(0, 255)],
 
     %% Leading zeroes...
     [begin
          L = lists:flatten(io_lib:format("$\\~3.8.0b", [C])),
          Ts = [{char,{1,1},C}],
-         ?line test_string(L, Ts)
+         test_string(L, Ts)
      end || C <- lists:seq(0, 255)],
 
     %% $\^\n now increments the line...
     [begin
          L = "$\\^" ++ [C],
          Ts = [{char,{1,1},C band 2#11111}],
-         ?line test_string(L, Ts)
+         test_string(L, Ts)
      end || C <- lists:seq(0, 255)],
 
     [begin
          L = "$\\" ++ [C],
          Ts = [{char,{1,1},V}],
-         ?line test_string(L, Ts)
+         test_string(L, Ts)
      end || {C,V} <- [{$n,$\n}, {$r,$\r}, {$t,$\t}, {$v,$\v},
                       {$b,$\b}, {$f,$\f}, {$e,$\e}, {$s,$\s},
                       {$d,$\d}]],
@@ -464,13 +444,13 @@ chars() ->
     [begin
          L = "$\\" ++ [C],
          Ts = [{char,{1,1},C}],
-         ?line test_string(L, Ts)
+         test_string(L, Ts)
      end || C <- lists:seq(0, 255) -- No],
 
     [begin
          L = "'$\\" ++ [C] ++ "'",
          Ts = [{atom,{1,1},list_to_atom("$"++[C])}],
-         ?line test_string(L, Ts)
+         test_string(L, Ts)
      end || C <- lists:seq(0, 255) -- No],
 
     test_string("\"\\013a\\\n\"", [{string,{1,1},"\va\n"}]),
@@ -482,17 +462,17 @@ chars() ->
     [begin
          L = "$" ++ [C],
          Ts = [{char,{1,1},C}],
-         ?line test_string(L, Ts)
+         test_string(L, Ts)
      end || C <- lists:seq(0, 255) -- (No ++ [$\\])],
     test_string("$\n", [{char,{1,1},$\n}]),
 
-    ?line {error,{{1,1},erl_scan,char},{1,4}} =
+    {error,{{1,1},erl_scan,char},{1,4}} =
         erl_scan:string("$\\^",{1,1}),
     test_string("$\\\n", [{char,{1,1},$\n}]),
     %% Robert's scanner returns line 1:
     test_string("$\\\n", [{char,{1,1},$\n}]),
     test_string("$\n\n", [{char,{1,1},$\n}]),
-    ?line test("$\n\n"),
+    test("$\n\n"),
     ok.
 
 
@@ -505,30 +485,30 @@ variables() ->
     ok.
 
 eof() ->
-    ?line {done,{eof,1},eof} = erl_scan:tokens([], eof, 1),
+    {done,{eof,1},eof} = erl_scan:tokens([], eof, 1),
     {more, C1} = erl_scan:tokens([],"    \n", 1),
-    ?line {done,{eof,2},eof} = erl_scan:tokens(C1, eof, 1),
+    {done,{eof,2},eof} = erl_scan:tokens(C1, eof, 1),
     {more, C2} = erl_scan:tokens([], "abra", 1),
     %% An error before R13A.
-    %% ?line {done,Err={error,{1,erl_scan,scan},1},eof} =
-    ?line {done,{ok,[{atom,1,abra}],1},eof} =
+    %% {done,Err={error,{1,erl_scan,scan},1},eof} =
+    {done,{ok,[{atom,1,abra}],1},eof} =
         erl_scan_tokens(C2, eof, 1),
 
     %% With column.
-    ?line {more, C3} = erl_scan:tokens([],"    \n",{1,1}),
-    ?line {done,{eof,{2,1}},eof} = erl_scan:tokens(C3, eof, 1),
+    {more, C3} = erl_scan:tokens([],"    \n",{1,1}),
+    {done,{eof,{2,1}},eof} = erl_scan:tokens(C3, eof, 1),
     {more, C4} = erl_scan:tokens([], "abra", {1,1}),
     %% An error before R13A.
-    %% ?line {done,{error,{{1,1},erl_scan,scan},{1,5}},eof} =
-    ?line {done,{ok,[{atom,_,abra}],{1,5}},eof} =
+    %% {done,{error,{{1,1},erl_scan,scan},{1,5}},eof} =
+    {done,{ok,[{atom,_,abra}],{1,5}},eof} =
         erl_scan_tokens(C4, eof, 1),
 
     %% Robert's scanner returns "" as LeftoverChars;
     %% the R12B scanner returns eof as LeftoverChars: (eof is correct)
-    ?line {more, C5} = erl_scan:tokens([], "a", 1),
+    {more, C5} = erl_scan:tokens([], "a", 1),
     %% An error before R13A.
-    %% ?line {done,{error,{1,erl_scan,scan},1},eof} =
-    ?line {done,{ok,[{atom,1,a}],1},eof} =
+    %% {done,{error,{1,erl_scan,scan},1},eof} =
+    {done,{ok,[{atom,1,a}],1},eof} =
         erl_scan_tokens(C5,eof,1),
 
     %% With column.
@@ -539,7 +519,7 @@ eof() ->
         erl_scan_tokens(C6,eof,1),
 
     %% A dot followed by eof is special:
-    ?line {more, C} = erl_scan:tokens([], "a.", 1),
+    {more, C} = erl_scan:tokens([], "a.", 1),
     {done,{ok,[{atom,1,a},{dot,1}],1},eof} = erl_scan_tokens(C,eof,1),
     {ok,[{atom,1,foo},{dot,1}],1} = erl_scan_string("foo."),
 
@@ -554,100 +534,100 @@ eof() ->
 
 illegal() ->
     Atom = lists:duplicate(1000, $a),
-    ?line {error,{1,erl_scan,{illegal,atom}},1} = erl_scan:string(Atom),
-    ?line {done,{error,{1,erl_scan,{illegal,atom}},1},". "} =
+    {error,{1,erl_scan,{illegal,atom}},1} = erl_scan:string(Atom),
+    {done,{error,{1,erl_scan,{illegal,atom}},1},". "} =
         erl_scan:tokens([], Atom++". ", 1),
     QAtom = "'" ++ Atom ++ "'",
-    ?line {error,{1,erl_scan,{illegal,atom}},1} = erl_scan:string(QAtom),
-    ?line {done,{error,{1,erl_scan,{illegal,atom}},1},". "} =
+    {error,{1,erl_scan,{illegal,atom}},1} = erl_scan:string(QAtom),
+    {done,{error,{1,erl_scan,{illegal,atom}},1},". "} =
         erl_scan:tokens([], QAtom++". ", 1),
     Var = lists:duplicate(1000, $A),
-    ?line {error,{1,erl_scan,{illegal,var}},1} = erl_scan:string(Var),
-    ?line {done,{error,{1,erl_scan,{illegal,var}},1},". "} =
+    {error,{1,erl_scan,{illegal,var}},1} = erl_scan:string(Var),
+    {done,{error,{1,erl_scan,{illegal,var}},1},". "} =
         erl_scan:tokens([], Var++". ", 1),
     Float = "1" ++ lists:duplicate(400, $0) ++ ".0",
-    ?line {error,{1,erl_scan,{illegal,float}},1} = erl_scan:string(Float),
-    ?line {done,{error,{1,erl_scan,{illegal,float}},1},". "} =
+    {error,{1,erl_scan,{illegal,float}},1} = erl_scan:string(Float),
+    {done,{error,{1,erl_scan,{illegal,float}},1},". "} =
         erl_scan:tokens([], Float++". ", 1),
     String = "\"43\\x{aaaaaa}34\"",
-    ?line {error,{1,erl_scan,{illegal,character}},1} = erl_scan:string(String),
-    ?line {done,{error,{1,erl_scan,{illegal,character}},1},"34\". "} =
+    {error,{1,erl_scan,{illegal,character}},1} = erl_scan:string(String),
+    {done,{error,{1,erl_scan,{illegal,character}},1},"34\". "} =
         %% Would be nice if `34\"' were skipped...
         %% Maybe, but then the LeftOverChars would not be the characters
         %% immediately following the end location of the error.
         erl_scan:tokens([], String++". ", 1),
 
-    ?line {error,{{1,1},erl_scan,{illegal,atom}},{1,1001}} =
+    {error,{{1,1},erl_scan,{illegal,atom}},{1,1001}} =
         erl_scan:string(Atom, {1,1}),
-    ?line {done,{error,{{1,5},erl_scan,{illegal,atom}},{1,1005}},". "} =
+    {done,{error,{{1,5},erl_scan,{illegal,atom}},{1,1005}},". "} =
         erl_scan:tokens([], "foo "++Atom++". ", {1,1}),
-    ?line {error,{{1,1},erl_scan,{illegal,atom}},{1,1003}} =
+    {error,{{1,1},erl_scan,{illegal,atom}},{1,1003}} =
         erl_scan:string(QAtom, {1,1}),
-    ?line {done,{error,{{1,5},erl_scan,{illegal,atom}},{1,1007}},". "} =
+    {done,{error,{{1,5},erl_scan,{illegal,atom}},{1,1007}},". "} =
         erl_scan:tokens([], "foo "++QAtom++". ", {1,1}),
-    ?line {error,{{1,1},erl_scan,{illegal,var}},{1,1001}} =
+    {error,{{1,1},erl_scan,{illegal,var}},{1,1001}} =
         erl_scan:string(Var, {1,1}),
-    ?line {done,{error,{{1,5},erl_scan,{illegal,var}},{1,1005}},". "} =
+    {done,{error,{{1,5},erl_scan,{illegal,var}},{1,1005}},". "} =
         erl_scan:tokens([], "foo "++Var++". ", {1,1}),
-    ?line {error,{{1,1},erl_scan,{illegal,float}},{1,404}} =
+    {error,{{1,1},erl_scan,{illegal,float}},{1,404}} =
         erl_scan:string(Float, {1,1}),
-    ?line {done,{error,{{1,5},erl_scan,{illegal,float}},{1,408}},". "} =
+    {done,{error,{{1,5},erl_scan,{illegal,float}},{1,408}},". "} =
         erl_scan:tokens([], "foo "++Float++". ", {1,1}),
-    ?line {error,{{1,4},erl_scan,{illegal,character}},{1,14}} =
+    {error,{{1,4},erl_scan,{illegal,character}},{1,14}} =
         erl_scan:string(String, {1,1}),
-    ?line {done,{error,{{1,4},erl_scan,{illegal,character}},{1,14}},"34\". "} =
+    {done,{error,{{1,4},erl_scan,{illegal,character}},{1,14}},"34\". "} =
         erl_scan:tokens([], String++". ", {1,1}),
     ok.
 
 crashes() ->
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string([-1])}), % type error
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string("$"++[-1])}),
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string("$\\"++[-1])}),
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string("$\\^"++[-1])}),
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string([$",-1,$"],{1,1})}),
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string("\"\\v"++[-1,$"])}), %$"
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string([$",-1,$"])}),
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string("% foo"++[-1])}),
-    ?line {'EXIT',_} =
+    {'EXIT',_} = (catch {foo, erl_scan:string([-1])}), % type error
+    {'EXIT',_} = (catch {foo, erl_scan:string("$"++[-1])}),
+    {'EXIT',_} = (catch {foo, erl_scan:string("$\\"++[-1])}),
+    {'EXIT',_} = (catch {foo, erl_scan:string("$\\^"++[-1])}),
+    {'EXIT',_} = (catch {foo, erl_scan:string([$",-1,$"],{1,1})}),
+    {'EXIT',_} = (catch {foo, erl_scan:string("\"\\v"++[-1,$"])}), %$"
+    {'EXIT',_} = (catch {foo, erl_scan:string([$",-1,$"])}),
+    {'EXIT',_} = (catch {foo, erl_scan:string("% foo"++[-1])}),
+    {'EXIT',_} =
          (catch {foo, erl_scan:string("% foo"++[-1],{1,1})}),
 
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string([a])}), % type error
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string("$"++[a])}),
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string("$\\"++[a])}),
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string("$\\^"++[a])}),
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string([$",a,$"],{1,1})}),
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string("\"\\v"++[a,$"])}), %$"
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string([$",a,$"])}),
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string("% foo"++[a])}),
-    ?line {'EXIT',_} =
+    {'EXIT',_} = (catch {foo, erl_scan:string([a])}), % type error
+    {'EXIT',_} = (catch {foo, erl_scan:string("$"++[a])}),
+    {'EXIT',_} = (catch {foo, erl_scan:string("$\\"++[a])}),
+    {'EXIT',_} = (catch {foo, erl_scan:string("$\\^"++[a])}),
+    {'EXIT',_} = (catch {foo, erl_scan:string([$",a,$"],{1,1})}),
+    {'EXIT',_} = (catch {foo, erl_scan:string("\"\\v"++[a,$"])}), %$"
+    {'EXIT',_} = (catch {foo, erl_scan:string([$",a,$"])}),
+    {'EXIT',_} = (catch {foo, erl_scan:string("% foo"++[a])}),
+    {'EXIT',_} =
          (catch {foo, erl_scan:string("% foo"++[a],{1,1})}),
 
-    ?line {'EXIT',_} = (catch {foo, erl_scan:string([3.0])}), % type error
+    {'EXIT',_} = (catch {foo, erl_scan:string([3.0])}), % type error
 
     ok.
 
 options() ->
     %% line and column are not options, but tested here
-    ?line {ok,[{atom,1,foo},{white_space,1," "},{comment,1,"% bar"}], 1} =
+    {ok,[{atom,1,foo},{white_space,1," "},{comment,1,"% bar"}], 1} =
         erl_scan_string("foo % bar", 1, return),
-    ?line {ok,[{atom,1,foo},{white_space,1," "}],1} =
+    {ok,[{atom,1,foo},{white_space,1," "}],1} =
         erl_scan_string("foo % bar", 1, return_white_spaces),
-    ?line {ok,[{atom,1,foo},{comment,1,"% bar"}],1} =
+    {ok,[{atom,1,foo},{comment,1,"% bar"}],1} =
         erl_scan_string("foo % bar", 1, return_comments),
-    ?line {ok,[{atom,17,foo}],17} =
+    {ok,[{atom,17,foo}],17} =
         erl_scan_string("foo % bar", 17),
-    ?line {'EXIT',{function_clause,_}} =
+    {'EXIT',{function_clause,_}} =
         (catch {foo,
                 erl_scan:string("foo % bar", {a,1}, [])}), % type error
-    ?line {ok,[{atom,_,foo}],{17,18}} =
+    {ok,[{atom,_,foo}],{17,18}} =
         erl_scan_string("foo % bar", {17,9}, []),
-    ?line {'EXIT',{function_clause,_}} =
+    {'EXIT',{function_clause,_}} =
         (catch {foo,
                 erl_scan:string("foo % bar", {1,0}, [])}), % type error
-    ?line {ok,[{foo,1}],1} =
+    {ok,[{foo,1}],1} =
         erl_scan_string("foo % bar",1, [{reserved_word_fun,
                                          fun(W) -> W =:= foo end}]),
-    ?line {'EXIT',{badarg,_}} =
+    {'EXIT',{badarg,_}} =
         (catch {foo,
                 erl_scan:string("foo % bar",1, % type error
                                 [{reserved_word_fun,
@@ -655,180 +635,107 @@ options() ->
     ok.
 
 more_options() ->
-    ?line {ok,[{atom,A1,foo}],{19,20}} =
+    {ok,[{atom,_,foo}=T1],{19,20}} =
         erl_scan:string("foo", {19,17},[]),
-    ?line [{column,17},{line,19}] = erl_scan:attributes_info(A1),
-    ?line {done,{ok,[{atom,A2,foo},{dot,_}],{19,22}},[]} =
+    {19,17} = erl_scan:location(T1),
+    {done,{ok,[{atom,_,foo}=T2,{dot,_}],{19,22}},[]} =
         erl_scan:tokens([], "foo. ", {19,17}, [bad_opt]), % type error
-    ?line [{column,17},{line,19}] = erl_scan:attributes_info(A2),
-    ?line {ok,[{atom,A3,foo}],{19,20}} =
+    {19,17} = erl_scan:location(T2),
+    {ok,[{atom,_,foo}=T3],{19,20}} =
         erl_scan:string("foo", {19,17},[text]),
-    ?line [{column,17},{length,3},{line,19},{text,"foo"}] =
-        erl_scan:attributes_info(A3),
+    {19,17} = erl_scan:location(T3),
+    "foo" = erl_scan:text(T3),
 
-    ?line {ok,[{atom,A4,foo}],1} = erl_scan:string("foo", 1, [text]),
-    ?line [{length,3},{line,1},{text,"foo"}] = erl_scan:attributes_info(A4),
+    {ok,[{atom,_,foo}=T4],1} = erl_scan:string("foo", 1, [text]),
+    1 = erl_scan:line(T4),
+    1 = erl_scan:location(T4),
+    "foo" = erl_scan:text(T4),
 
     ok.
 
 token_info() ->
-    ?line {ok,[T1],_} = erl_scan:string("foo", {1,18}, [text]),
+    {ok,[T1],_} = erl_scan:string("foo", {1,18}, [text]),
+    {'EXIT',{badarg,_}} =
+        (catch {foo, erl_scan:category(foo)}), % type error
     {'EXIT',{badarg,_}} =
-        (catch {foo, erl_scan:token_info(T1, foo)}), % type error
-    ?line {line,1} = erl_scan:token_info(T1, line),
-    ?line {column,18} = erl_scan:token_info(T1, column),
-    ?line {length,3} = erl_scan:token_info(T1, length),
-    ?line {text,"foo"} = erl_scan:token_info(T1, text),
-    ?line [{category,atom},{column,18},{length,3},{line,1},
-           {symbol,foo},{text,"foo"}] =
-        erl_scan:token_info(T1),
-    ?line [{length,3},{column,18}] =
-        erl_scan:token_info(T1, [length, column]),
-    ?line [{location,{1,18}}] =
-        erl_scan:token_info(T1, [location]),
-    ?line {category,atom} = erl_scan:token_info(T1, category),
-    ?line [{symbol,foo}] = erl_scan:token_info(T1, [symbol]),
-
-    ?line {ok,[T2],_} = erl_scan:string("foo", 1, []),
-    ?line {line,1} = erl_scan:token_info(T2, line),
-    ?line undefined = erl_scan:token_info(T2, column),
-    ?line undefined = erl_scan:token_info(T2, length),
-    ?line undefined = erl_scan:token_info(T2, text),
-    ?line {location,1} = erl_scan:token_info(T2, location),
-    ?line [{category,atom},{line,1},{symbol,foo}] = erl_scan:token_info(T2),
-    ?line [{line,1}] = erl_scan:token_info(T2, [length, line]),
-
-    ?line {ok,[T3],_} = erl_scan:string("=", 1, []),
-    ?line [{line,1}] = erl_scan:token_info(T3, [column, line]),
-    ?line {category,'='} = erl_scan:token_info(T3, category),
-    ?line [{symbol,'='}] = erl_scan:token_info(T3, [symbol]),
+        (catch {foo, erl_scan:symbol(foo)}), % type error
+    atom = erl_scan:category(T1),
+    foo = erl_scan:symbol(T1),
+
+    {ok,[T2],_} = erl_scan:string("foo", 1, []),
+    1 = erl_scan:line(T2),
+    undefined = erl_scan:column(T2),
+    undefined = erl_scan:text(T2),
+    1 = erl_scan:location(T2),
+
+    {ok,[T3],_} = erl_scan:string("=", 1, []),
+    '=' = erl_scan:category(T3),
+    '=' = erl_scan:symbol(T3),
     ok.
 
-attributes_info() ->
-    ?line {'EXIT',_} =
-        (catch {foo,erl_scan:attributes_info(foo)}), % type error
-    [{line,18}] = erl_scan:attributes_info(erl_anno:new(18)),
-    {location,19} =
-        erl_scan:attributes_info(erl_anno:new(19), location),
-    ?line {ok,[{atom,A0,foo}],_} = erl_scan:string("foo", 19, [text]),
-    ?line {location,19} = erl_scan:attributes_info(A0, location),
-
-    ?line {ok,[{atom,A3,foo}],_} = erl_scan:string("foo", {1,3}, [text]),
-    ?line {line,1} = erl_scan:attributes_info(A3, line),
-    ?line {column,3} = erl_scan:attributes_info(A3, column),
-    ?line {location,{1,3}} = erl_scan:attributes_info(A3, location),
-    ?line {text,"foo"} = erl_scan:attributes_info(A3, text),
-
-    ?line {ok,[{atom,A4,foo}],_} = erl_scan:string("foo", 2, [text]),
-    ?line {line,2} = erl_scan:attributes_info(A4, line),
-    ?line undefined = erl_scan:attributes_info(A4, column),
-    ?line {location,2} = erl_scan:attributes_info(A4, location),
-    ?line {text,"foo"} = erl_scan:attributes_info(A4, text),
-
-    ?line {ok,[{atom,A5,foo}],_} = erl_scan:string("foo", {1,3}, []),
-    ?line {line,1} = erl_scan:attributes_info(A5, line),
-    ?line {column,3} = erl_scan:attributes_info(A5, column),
-    ?line {location,{1,3}} = erl_scan:attributes_info(A5, location),
-    ?line undefined = erl_scan:attributes_info(A5, text),
-
-    ?line undefined = erl_scan:attributes_info([], line), % type error
+anno_info() ->
+    {'EXIT',_} =
+        (catch {foo,erl_scan:line(foo)}), % type error
+    {ok,[{atom,_,foo}=T0],_} = erl_scan:string("foo", 19, [text]),
+    19 = erl_scan:location(T0),
+    19 = erl_scan:end_location(T0),
+
+    {ok,[{atom,_,foo}=T3],_} = erl_scan:string("foo", {1,3}, [text]),
+    1 = erl_scan:line(T3),
+    3 = erl_scan:column(T3),
+    {1,3} = erl_scan:location(T3),
+    {1,6} = erl_scan:end_location(T3),
+    "foo" = erl_scan:text(T3),
+
+    {ok,[{atom,_,foo}=T4],_} = erl_scan:string("foo", 2, [text]),
+    2 = erl_scan:line(T4),
+    undefined = erl_scan:column(T4),
+    2 = erl_scan:location(T4),
+    "foo" = erl_scan:text(T4),
+
+    {ok,[{atom,_,foo}=T5],_} = erl_scan:string("foo", {1,3}, []),
+    1 = erl_scan:line(T5),
+    3 = erl_scan:column(T5),
+    {1,3} = erl_scan:location(T5),
+    undefined = erl_scan:text(T5),
 
     ok.
 
-set_attribute() ->
-    F = fun(Line) -> -Line end,
-    Anno2 = erl_anno:new(2),
-    A0 = erl_scan:set_attribute(line, Anno2, F),
-    {line, -2} = erl_scan:attributes_info(A0, line),
-    ?line {ok,[{atom,A1,foo}],_} = erl_scan:string("foo", {9,17}),
-    ?line A2 = erl_scan:set_attribute(line, A1, F),
-    ?line {line,-9} = erl_scan:attributes_info(A2, line),
-    ?line {location,{-9,17}} = erl_scan:attributes_info(A2, location),
-    ?line [{line,-9},{column,17}] =
-        erl_scan:attributes_info(A2, [line,column,text]),
-
-    F2 = fun(Line) -> {17,Line} end,
-    ?line Attr1 = erl_scan:set_attribute(line, 2, F2),
-    ?line {line,{17,2}} = erl_scan:attributes_info(Attr1, line),
-    ?line undefined = erl_scan:attributes_info(Attr1, column),
-    ?line {location,{17,2}} = % a bit mixed up
-        erl_scan:attributes_info(Attr1, location),
-
-    ?line A3 = erl_scan:set_attribute(line, A1, F2),
-    ?line {line,{17,9}} = erl_scan:attributes_info(A3, line),
-    ?line {location,{{17,9},17}} = erl_scan:attributes_info(A3, location),
-    ?line [{line,{17,9}},{column,17}] =
-        erl_scan:attributes_info(A3, [line,column,text]),
-
-    ?line {ok,[{atom,A4,foo}],_} = erl_scan:string("foo", {9,17}, [text]),
-    ?line A5 = erl_scan:set_attribute(line, A4, F),
-    ?line {line,-9} = erl_scan:attributes_info(A5, line),
-    ?line {location,{-9,17}} = erl_scan:attributes_info(A5, location),
-    ?line [{line,-9},{column,17},{text,"foo"}] =
-        erl_scan:attributes_info(A5, [line,column,text]),
-
-    ?line {ok,[{atom,A6,foo}],_} = erl_scan:string("foo", 11, [text]),
-    ?line A7 = erl_scan:set_attribute(line, A6, F2),
-    %% Incompatible with pre 18:
-    %% {line,{17,11}} = erl_scan:attributes_info(A7, line),
-    {line,17} = erl_scan:attributes_info(A7, line),
-    ?line {location,{17,11}} = % mixed up
-        erl_scan:attributes_info(A7, location),
-    %% Incompatible with pre 18:
-    %% [{line,{17,11}},{text,"foo"}] =
-    %%   erl_scan:attributes_info(A7, [line,column,text]),
-    [{line,17},{column,11},{text,"foo"}] =
-        erl_scan:attributes_info(A7, [line,column,text]),
-
-    ?line {'EXIT',_} =
-        (catch {foo, erl_scan:set_attribute(line, [], F2)}), % type error
-    ?line {'EXIT',{badarg,_}} =
-        (catch {foo, erl_scan:set_attribute(column, [], F2)}), % type error
-
-    Attr10 = erl_anno:new(8),
-    Attr20 = erl_scan:set_attribute(line, Attr10,
-                                    fun(L) -> {nos,'X',L} end),
-    %% OTP-9412
-    Attr30 = erl_scan:set_attribute(line, Attr20,
-                                    fun({nos,_V,VL}) -> VL end),
-    8 = erl_anno:to_term(Attr30),
-    ok.
-
 column_errors() ->
-    ?line {error,{{1,1},erl_scan,{string,$',""}},{1,3}} = % $'
+    {error,{{1,1},erl_scan,{string,$',""}},{1,3}} = % $'
         erl_scan:string("'\\",{1,1}),
-    ?line {error,{{1,1},erl_scan,{string,$",""}},{1,3}} = % $"
+    {error,{{1,1},erl_scan,{string,$",""}},{1,3}} = % $"
         erl_scan:string("\"\\",{1,1}),
 
-    ?line {error,{{1,1},erl_scan,{string,$',""}},{1,2}} =  % $'
+    {error,{{1,1},erl_scan,{string,$',""}},{1,2}} =  % $'
         erl_scan:string("'",{1,1}),
-    ?line {error,{{1,1},erl_scan,{string,$",""}},{1,2}} =  % $"
+    {error,{{1,1},erl_scan,{string,$",""}},{1,2}} =  % $"
         erl_scan:string("\"",{1,1}),
 
-    ?line {error,{{1,1},erl_scan,char},{1,2}} =
+    {error,{{1,1},erl_scan,char},{1,2}} =
         erl_scan:string("$",{1,1}),
 
-    ?line {error,{{1,2},erl_scan,{string,$',"1234567890123456"}},{1,20}} = %'
+    {error,{{1,2},erl_scan,{string,$',"1234567890123456"}},{1,20}} = %'
         erl_scan:string(" '12345678901234567", {1,1}),
-    ?line {error,{{1,2},erl_scan,{string,$',"123456789012345 "}}, {1,20}} = %'
+    {error,{{1,2},erl_scan,{string,$',"123456789012345 "}}, {1,20}} = %'
         erl_scan:string(" '123456789012345\\s", {1,1}),
-    ?line {error,{{1,2},erl_scan,{string,$","1234567890123456"}},{1,20}} = %"
+    {error,{{1,2},erl_scan,{string,$","1234567890123456"}},{1,20}} = %"
         erl_scan:string(" \"12345678901234567", {1,1}),
-    ?line {error,{{1,2},erl_scan,{string,$","123456789012345 "}}, {1,20}} = %"
+    {error,{{1,2},erl_scan,{string,$","123456789012345 "}}, {1,20}} = %"
         erl_scan:string(" \"123456789012345\\s", {1,1}),
-    ?line {error,{{1,2},erl_scan,{string,$',"1234567890123456"}},{2,1}} = %'
+    {error,{{1,2},erl_scan,{string,$',"1234567890123456"}},{2,1}} = %'
         erl_scan:string(" '12345678901234567\n", {1,1}),
     ok.
 
 white_spaces() ->
-    ?line {ok,[{white_space,_,"\r"},
+    {ok,[{white_space,_,"\r"},
                {white_space,_,"   "},
                {atom,_,a},
                {white_space,_,"\n"}],
            _} = erl_scan_string("\r   a\n", {1,1}, return),
-    ?line test("\r   a\n"),
+    test("\r   a\n"),
     L = "{\"a\nb\", \"a\\nb\",\nabc\r,def}.\n\n",
-    ?line {ok,[{'{',_},
+    {ok,[{'{',_},
                {string,_,"a\nb"},
                {',',_},
                {white_space,_," "},
@@ -843,33 +750,33 @@ white_spaces() ->
                {dot,_},
                {white_space,_,"\n"}],
            _} = erl_scan_string(L, {1,1}, return),
-    ?line test(L),
-    ?line test("\"\n\"\n"),
-    ?line test("\n\r\n"),
-    ?line test("\n\r"),
-    ?line test("\r\n"),
-    ?line test("\n\f"),
-    ?line [test(lists:duplicate(N, $\t)) || N <- lists:seq(1, 20)],
-    ?line [test([$\n|lists:duplicate(N, $\t)]) || N <- lists:seq(1, 20)],
-    ?line [test(lists:duplicate(N, $\s)) || N <- lists:seq(1, 20)],
-    ?line [test([$\n|lists:duplicate(N, $\s)]) || N <- lists:seq(1, 20)],
-    ?line test("\v\f\n\v "),
-    ?line test("\n\e\n\b\f\n\da\n"),
+    test(L),
+    test("\"\n\"\n"),
+    test("\n\r\n"),
+    test("\n\r"),
+    test("\r\n"),
+    test("\n\f"),
+    [test(lists:duplicate(N, $\t)) || N <- lists:seq(1, 20)],
+    [test([$\n|lists:duplicate(N, $\t)]) || N <- lists:seq(1, 20)],
+    [test(lists:duplicate(N, $\s)) || N <- lists:seq(1, 20)],
+    [test([$\n|lists:duplicate(N, $\s)]) || N <- lists:seq(1, 20)],
+    test("\v\f\n\v "),
+    test("\n\e\n\b\f\n\da\n"),
     ok.
 
 unicode() ->
-    ?line {ok,[{char,1,83},{integer,1,45}],1} =
+    {ok,[{char,1,83},{integer,1,45}],1} =
         erl_scan_string("$\\12345"), % not unicode
 
-    ?line {error,{1,erl_scan,{illegal,character}},1} =
+    {error,{1,erl_scan,{illegal,character}},1} =
         erl_scan:string([1089]),
-    ?line {error,{{1,1},erl_scan,{illegal,character}},{1,2}} =
+    {error,{{1,1},erl_scan,{illegal,character}},{1,2}} =
         erl_scan:string([1089], {1,1}),
     {error,{1,erl_scan,{illegal,atom}},1} =
         erl_scan:string("'a"++[1089]++"b'", 1),
     {error,{{1,1},erl_scan,{illegal,atom}},{1,6}} =
         erl_scan:string("'a"++[1089]++"b'", {1,1}),
-    ?line test("\"a"++[1089]++"b\""),
+    test("\"a"++[1089]++"b\""),
     {ok,[{char,1,1}],1} =
         erl_scan_string([$$,$\\,$^,1089], 1),
 
@@ -877,7 +784,7 @@ unicode() ->
         erl_scan:string("\"qa\x{aaa}", 1),
     "unterminated string starting with \"qa"++[2730]++"\"" =
         erl_scan:format_error(Error),
-    ?line {error,{{1,1},erl_scan,_},{1,11}} =
+    {error,{{1,1},erl_scan,_},{1,11}} =
         erl_scan:string("\"qa\\x{aaa}",{1,1}),
     {error,{{1,1},erl_scan,{illegal,atom}},{1,12}} =
         erl_scan:string("'qa\\x{aaa}'",{1,1}),
@@ -892,14 +799,13 @@ unicode() ->
         erl_scan_string(Qs, 1),
     {ok,[Q2],{1,9}} =
         erl_scan:string("$\\x{aaa}", {1,1}, [text]),
-    [{category,char},{column,1},{length,8},
-           {line,1},{symbol,16#aaa},{text,Qs}] =
-        erl_scan:token_info(Q2),
+    [{category,char},{column,1},{line,1},{symbol,16#aaa},{text,Qs}] =
+        token_info_long(Q2),
 
     U1 = "\"\\x{aaa}\"",
-    {ok,[{string,A1,[2730]}],{1,10}} = erl_scan:string(U1, {1,1}, [text]),
-    [{line,1},{column,1},{text,"\"\\x{aaa}\""}] =
-        erl_scan:attributes_info(A1, [line, column, text]),
+    {ok,[{string,_,[2730]}=T1],{1,10}} = erl_scan:string(U1, {1,1}, [text]),
+    {1,1} = erl_scan:location(T1),
+    "\"\\x{aaa}\"" = erl_scan:text(T1),
     {ok,[{string,1,[2730]}],1} = erl_scan_string(U1, 1),
 
     U2 = "\"\\x41\\x{fff}\\x42\"",
@@ -912,17 +818,17 @@ unicode() ->
     {ok,[{string,1,[$\n,$\x{aaa},$\n]}],3} = erl_scan_string(U4, 1),
 
     %% Keep these tests:
-    ?line test(Qs),
-    ?line test(U1),
-    ?line test(U2),
-    ?line test(U3),
-    ?line test(U4),
+    test(Qs),
+    test(U1),
+    test(U2),
+    test(U3),
+    test(U4),
 
     Str1 = "\"ab" ++ [1089] ++ "cd\"",
     {ok,[{string,1,[$a,$b,1089,$c,$d]}],1} = erl_scan_string(Str1, 1),
     {ok,[{string,{1,1},[$a,$b,1089,$c,$d]}],{1,8}} =
         erl_scan_string(Str1, {1,1}),
-    ?line test(Str1),
+    test(Str1),
     Comment = "%% "++[1089],
     {ok,[{comment,1,[$%,$%,$\s,1089]}],1} =
         erl_scan_string(Comment, 1, [return]),
@@ -935,70 +841,67 @@ more_chars() ->
     %% $\x{...}, $\xHH
 
     %% All kinds of tests...
-    ?line {ok,[{char,_,123}],{1,4}} =
+    {ok,[{char,_,123}],{1,4}} =
         erl_scan_string("$\\{",{1,1}),
-    ?line {more, C1} = erl_scan:tokens([], "$\\{", {1,1}),
-    ?line {done,{ok,[{char,_,123}],{1,4}},eof} =
+    {more, C1} = erl_scan:tokens([], "$\\{", {1,1}),
+    {done,{ok,[{char,_,123}],{1,4}},eof} =
         erl_scan_tokens(C1, eof, 1),
-    ?line {ok,[{char,1,123},{atom,1,a},{'}',1}],1} =
+    {ok,[{char,1,123},{atom,1,a},{'}',1}],1} =
         erl_scan_string("$\\{a}"),
 
-    ?line {error,{{1,1},erl_scan,char},{1,4}} =
+    {error,{{1,1},erl_scan,char},{1,4}} =
         erl_scan:string("$\\x", {1,1}),
-    ?line {error,{{1,1},erl_scan,char},{1,5}} =
+    {error,{{1,1},erl_scan,char},{1,5}} =
         erl_scan:string("$\\x{",{1,1}),
-    ?line {more, C3} = erl_scan:tokens([], "$\\x", {1,1}),
-    ?line {done,{error,{{1,1},erl_scan,char},{1,4}},eof} =
+    {more, C3} = erl_scan:tokens([], "$\\x", {1,1}),
+    {done,{error,{{1,1},erl_scan,char},{1,4}},eof} =
         erl_scan:tokens(C3, eof, 1),
-    ?line {error,{{1,1},erl_scan,char},{1,5}} =
+    {error,{{1,1},erl_scan,char},{1,5}} =
         erl_scan:string("$\\x{",{1,1}),
-    ?line {more, C2} = erl_scan:tokens([], "$\\x{", {1,1}),
-    ?line {done,{error,{{1,1},erl_scan,char},{1,5}},eof} =
+    {more, C2} = erl_scan:tokens([], "$\\x{", {1,1}),
+    {done,{error,{{1,1},erl_scan,char},{1,5}},eof} =
         erl_scan:tokens(C2, eof, 1),
-    ?line {error,{1,erl_scan,{illegal,character}},1} =
+    {error,{1,erl_scan,{illegal,character}},1} =
         erl_scan:string("$\\x{g}"),
-    ?line {error,{{1,1},erl_scan,{illegal,character}},{1,5}} =
+    {error,{{1,1},erl_scan,{illegal,character}},{1,5}} =
         erl_scan:string("$\\x{g}", {1,1}),
-    ?line {error,{{1,1},erl_scan,{illegal,character}},{1,6}} =
+    {error,{{1,1},erl_scan,{illegal,character}},{1,6}} =
         erl_scan:string("$\\x{}",{1,1}),
 
-    ?line test("\"\\{0}\""),
-    ?line test("\"\\x{0}\""),
-    ?line test("\'\\{0}\'"),
-    ?line test("\'\\x{0}\'"),
+    test("\"\\{0}\""),
+    test("\"\\x{0}\""),
+    test("\'\\{0}\'"),
+    test("\'\\x{0}\'"),
 
-    ?line {error,{{2,3},erl_scan,{illegal,character}},{2,6}} =
+    {error,{{2,3},erl_scan,{illegal,character}},{2,6}} =
         erl_scan:string("\"ab \n $\\x{g}\"",{1,1}),
-    ?line {error,{{2,3},erl_scan,{illegal,character}},{2,6}} =
+    {error,{{2,3},erl_scan,{illegal,character}},{2,6}} =
         erl_scan:string("\'ab \n $\\x{g}\'",{1,1}),
 
-    ?line test("$\\{34}"),
-    ?line test("$\\x{34}"),
-    ?line test("$\\{377}"),
-    ?line test("$\\x{FF}"),
-    ?line test("$\\{400}"),
-    ?line test("$\\x{100}"),
-    ?line test("$\\x{10FFFF}"),
-    ?line test("$\\x{10ffff}"),
-    ?line test("\"$\n \\{1}\""),
-    ?line {error,{1,erl_scan,{illegal,character}},1} =
+    test("$\\{34}"),
+    test("$\\x{34}"),
+    test("$\\{377}"),
+    test("$\\x{FF}"),
+    test("$\\{400}"),
+    test("$\\x{100}"),
+    test("$\\x{10FFFF}"),
+    test("$\\x{10ffff}"),
+    test("\"$\n \\{1}\""),
+    {error,{1,erl_scan,{illegal,character}},1} =
         erl_scan:string("$\\x{110000}"),
-    ?line {error,{{1,1},erl_scan,{illegal,character}},{1,12}} =
+    {error,{{1,1},erl_scan,{illegal,character}},{1,12}} =
         erl_scan:string("$\\x{110000}", {1,1}),
 
-    ?line {error,{{1,1},erl_scan,{illegal,character}},{1,4}} =
+    {error,{{1,1},erl_scan,{illegal,character}},{1,4}} =
         erl_scan:string("$\\xfg", {1,1}),
 
-    ?line test("$\\xffg"),
+    test("$\\xffg"),
 
-    ?line {error,{{1,1},erl_scan,{illegal,character}},{1,4}} =
+    {error,{{1,1},erl_scan,{illegal,character}},{1,4}} =
         erl_scan:string("$\\xg", {1,1}),
     ok.
 
-otp_10302(doc) ->
-    "OTP-10302. Unicode characters scanner/parser.";
-otp_10302(suite) ->
-    [];
+%% OTP-10302. Unicode characters scanner/parser.
 otp_10302(Config) when is_list(Config) ->
     %% From unicode():
     {error,{1,erl_scan,{illegal,atom}},1} =
@@ -1012,16 +915,13 @@ otp_10302(Config) when is_list(Config) ->
     Qs = "$\\x{aaa}",
     {ok,[{char,1,2730}],1} = erl_scan_string(Qs, 1),
     {ok,[Q2],{1,9}} = erl_scan:string(Qs,{1,1},[text]),
-    [{category,char},{column,1},{length,8},
-     {line,1},{symbol,16#aaa},{text,Qs}] =
-        erl_scan:token_info(Q2),
-
-    Tags = [category, column, length, line, symbol, text],
+    [{category,char},{column,1},{line,1},{symbol,16#aaa},{text,Qs}] =
+        token_info_long(Q2),
 
     U1 = "\"\\x{aaa}\"",
     {ok,[T1],{1,10}} = erl_scan:string(U1, {1,1}, [text]),
-    [{category,string},{column,1},{length,9},{line,1},
-     {symbol,[16#aaa]},{text,U1}] = erl_scan:token_info(T1, Tags),
+    [{category,string},{column,1},{line,1},{symbol,[16#aaa]},{text,U1}] =
+        token_info_long(T1),
 
     U2 = "\"\\x41\\x{fff}\\x42\"",
     {ok,[{string,1,[65,4095,66]}],1} = erl_scan_string(U2, 1),
@@ -1171,18 +1071,12 @@ otp_10302(Config) when is_list(Config) ->
         erl_parse_abstract("a"++[1024]++"c", [{encoding,latin1}]),
     ok.
 
-otp_10990(doc) ->
-    "OTP-10990. Floating point number in input string.";
-otp_10990(suite) ->
-    [];
+%% OTP-10990. Floating point number in input string.
 otp_10990(Config) when is_list(Config) ->
     {'EXIT',_} = (catch {foo, erl_scan:string([$",42.0,$"],1)}),
     ok.
 
-otp_10992(doc) ->
-    "OTP-10992. List of floats to abstract format.";
-otp_10992(suite) ->
-    [];
+%% OTP-10992. List of floats to abstract format.
 otp_10992(Config) when is_list(Config) ->
     {cons,0,{float,0,42.0},{nil,0}} =
         erl_parse_abstract([42.0], [{encoding,unicode}]),
@@ -1194,10 +1088,7 @@ otp_10992(Config) when is_list(Config) ->
         erl_parse_abstract([$A,42.0], [{encoding,utf8}]),
     ok.
 
-otp_11807(doc) ->
-    "OTP-11807. Generalize erl_parse:abstract/2.";
-otp_11807(suite) ->
-    [];
+%% OTP-11807. Generalize erl_parse:abstract/2.
 otp_11807(Config) when is_list(Config) ->
     {cons,0,{integer,0,97},{cons,0,{integer,0,98},{nil,0}}} =
         erl_parse_abstract("ab", [{encoding,none}]),
@@ -1353,9 +1244,7 @@ test_wsc([], []) ->
     ok;
 test_wsc([Token|Tokens], [Token2|Tokens2]) ->
     [Text, Text2] = [Text ||
-                        {text, Text} <-
-                            [erl_scan:token_info(T, text) ||
-                                T <- [Token, Token2]]],
+                        Text <- [erl_scan:text(T) || T <- [Token, Token2]]],
     Sz = erts_debug:size(Text),
     Sz2 = erts_debug:size({Text, Text2}),
     IsCompacted = Sz2 < 2*Sz+erts_debug:size({a,a}),
@@ -1394,7 +1283,7 @@ all_same(L, Char) ->
 newlines_first([]) ->
     ok;
 newlines_first([Token|Tokens]) ->
-    {text,Text} = erl_scan:token_info(Token, text),
+    Text = erl_scan:text(Token),
     Nnls = length([C || C <- Text, C =:= $\n]),
     OK = case Text of
              [$\n|_] ->
@@ -1414,7 +1303,7 @@ select_tokens(Tokens, Tags) ->
     lists:filter(fun(T) -> lists:member(element(1, T), Tags) end, Tokens).
 
 simplify([Token|Tokens]) ->
-    {line,Line} = erl_scan:token_info(Token, line),
+    Line = erl_scan:line(Token),
     [setelement(2, Token, erl_anno:new(Line)) | simplify(Tokens)];
 simplify([]) ->
     [].
@@ -1423,17 +1312,31 @@ get_text(Tokens) ->
     lists:flatten(
       [T ||
           Token <- Tokens,
-          ({text,T} = erl_scan:token_info(Token, text)) =/= []]).
+          (T = erl_scan:text(Token)) =/= []]).
 
 test_decorated_tokens(String, Tokens) ->
     ToksAttrs = token_attrs(Tokens),
     test_strings(ToksAttrs, String, 1, 1).
 
 token_attrs(Tokens) ->
-    [{L,C,Len,T} ||
+    [{L,C,length(T),T} ||
         Token <- Tokens,
-        ([{line,L},{column,C},{length,Len},{text,T}] =
-         erl_scan:token_info(Token, [line,column,length,text])) =/= []].
+        ([C,L,T] = token_info(Token)) =/= []].
+
+token_info(T) ->
+    Column = erl_scan:column(T),
+    Line = erl_scan:line(T),
+    Text = erl_scan:text(T),
+    [Column, Line, Text].
+
+token_info_long(T) ->
+    Column = erl_scan:column(T),
+    Line = erl_scan:line(T),
+    Text = erl_scan:text(T),
+    Category = erl_scan:category(T),
+    Symbol = erl_scan:symbol(T),
+    [{category,Category},{column,Column},{line,Line},
+     {symbol,Symbol},{text,Text}].
 
 test_strings([], _S, Line, Column) ->
     {Line,Column};
@@ -1514,8 +1417,7 @@ consistent_attributes([Ts | TsL]) ->
     L = [T || T <- Ts, is_integer(element(2, T))],
     case L of
         [] ->
-            TagsL = [[Tag || {Tag,_} <-
-                                 erl_scan:attributes_info(element(2, T))] ||
+            TagsL = [[Tag || {Tag,_} <- defined(token_info_long(T))] ||
                         T <- Ts],
             case lists:usort(TagsL) of
                 [_] ->
@@ -1531,6 +1433,9 @@ consistent_attributes([Ts | TsL]) ->
             Ts
     end.
 
+defined(L) ->
+    [{T,V} || {T,V} <- L, V =/= undefined].
+
 family_list(L) ->
     sofs:to_external(family(L)).
 
diff --git a/lib/stdlib/test/error_logger_h_SUITE.erl b/lib/stdlib/test/error_logger_h_SUITE.erl
index c82b1b62ef..9828a075cc 100644
--- a/lib/stdlib/test/error_logger_h_SUITE.erl
+++ b/lib/stdlib/test/error_logger_h_SUITE.erl
@@ -25,7 +25,7 @@
 %% Event handler exports.
 -export([init/1,handle_event/2,terminate/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -48,7 +48,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 logfile(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     LogDir = filename:join(PrivDir, ?MODULE),
     Log = filename:join(LogDir, "logfile.log"),
     ok = filelib:ensure_dir(Log),
@@ -65,11 +65,18 @@ logfile(Config) ->
     error_logger:logfile(close),
     analyse_events(Log, Ev, [AtNode], unlimited),
 
-    [] = [{X, file:pid2name(X)} || X <- processes(), Data <- [process_info(X, [current_function])],
-				   Data =/= undefined,
-				   element(1, element(2, lists:keyfind(current_function, 1, Data)))
-				       =:= file_io_server,
-				   file:pid2name(X) =:= {ok, Log}],
+    %% Make sure that the file_io_server process has been stopped
+    [] = lists:filtermap(
+           fun(X) ->
+                   case {process_info(X, [current_function]),
+                         file:pid2name(X)} of
+                       {[{current_function, {file_io_server, _, _}}],
+                        {ok,P2N = Log}} ->
+                           {true, {X, P2N}};
+                       _ ->
+                           false
+                   end
+           end, processes()),
 
     test_server:stop_node(Node),
 
@@ -77,7 +84,7 @@ logfile(Config) ->
     ok.
 
 logfile_truncated(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     LogDir = filename:join(PrivDir, ?MODULE),
     Log = filename:join(LogDir, "logfile_truncated.log"),
     ok = filelib:ensure_dir(Log),
@@ -102,7 +109,7 @@ do_one_logfile(Log, Ev, Depth) ->
     analyse_events(Log, Ev, [], Depth).
 
 tty(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     LogDir = filename:join(PrivDir, ?MODULE),
     Log = filename:join(LogDir, "tty.log"),
     ok = filelib:ensure_dir(Log),
@@ -112,7 +119,7 @@ tty(Config) ->
     do_one_tty(Log, Ev, unlimited),
 
     Pa = "-pa " ++ filename:dirname(code:which(?MODULE)),
-    {ok,Node} = start_node(logfile, Pa),
+    {ok,Node} = start_node(tty, Pa),
     tty_log_open(Log),
     ok = rpc:call(Node, erlang, apply, [fun gen_events/1,[Ev]]),
     tty_log_close(),
@@ -125,7 +132,7 @@ tty(Config) ->
     ok.
 
 tty_truncated(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     LogDir = filename:join(PrivDir, ?MODULE),
     Log = filename:join(LogDir, "tty_truncated.log"),
     ok = filelib:ensure_dir(Log),
@@ -335,7 +342,7 @@ start_node(Name, Args) ->
 	{ok,Node} ->
 	    {ok,Node};
 	Error  ->
-	    test_server:fail(Error)
+	    ct:fail(Error)
     end.
 
 cleanup(File) ->
diff --git a/lib/stdlib/test/escript_SUITE.erl b/lib/stdlib/test/escript_SUITE.erl
index 87ff6a68ff..30aaac70c2 100644
--- a/lib/stdlib/test/escript_SUITE.erl
+++ b/lib/stdlib/test/escript_SUITE.erl
@@ -19,7 +19,7 @@
 
 -module(escript_SUITE).
 -export([
-	all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 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,
@@ -40,10 +40,12 @@
          unicode/1
 	]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,5}}].
 
 all() -> 
     [basic, errors, strange_name, emulator_flags,
@@ -68,103 +70,100 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?t:minutes(5)),
-    [{watchdog,Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 basic(Config) when is_list(Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     Dir = filename:absname(Data),		%Get rid of trailing slash.
-    ?line run(Dir, "factorial 5",
-	      <<"factorial 5 = 120\nExitCode:0">>),
-    ?line run(Dir, "factorial_compile 10",
-	      <<"factorial 10 = 3628800\nExitCode:0">>),
-    ?line run(Dir, "factorial_compile_main 7",
-	      <<"factorial 7 = 5040\nExitCode:0">>),
-    ?line run(Dir, "factorial_warning 20",
-	      [data_dir,<<"factorial_warning:12: Warning: function bar/0 is unused\n"
-			 "factorial 20 = 2432902008176640000\nExitCode:0">>]),
-    ?line run_with_opts(Dir, "-s", "factorial_warning",
-	      [data_dir,<<"factorial_warning:12: Warning: function bar/0 is unused\nExitCode:0">>]),
-    ?line run_with_opts(Dir, "-s -i", "factorial_warning",
-	      [data_dir,<<"factorial_warning:12: Warning: function bar/0 is unused\nExitCode:0">>]),
-    ?line run_with_opts(Dir, "-c -s", "factorial_warning",
-	      [data_dir,<<"factorial_warning:12: Warning: function bar/0 is unused\nExitCode:0">>]),
-    ?line run(Dir, "filesize "++filename:join(?config(data_dir, Config),"filesize"),
-	      [data_dir,<<"filesize:11: Warning: function id/1 is unused\n324\nExitCode:0">>]),
-    ?line run(Dir, "test_script_name",
-	      [data_dir,<<"test_script_name\nExitCode:0">>]),
-    ?line run(Dir, "tail_rec 1000",
-	      [<<"ok\nExitCode:0">>]),
+    run(Dir, "factorial 5",
+	<<"factorial 5 = 120\nExitCode:0">>),
+    run(Dir, "factorial_compile 10",
+	<<"factorial 10 = 3628800\nExitCode:0">>),
+    run(Dir, "factorial_compile_main 7",
+	<<"factorial 7 = 5040\nExitCode:0">>),
+    run(Dir, "factorial_warning 20",
+	[data_dir,<<"factorial_warning:12: Warning: function bar/0 is unused\n"
+		    "factorial 20 = 2432902008176640000\nExitCode:0">>]),
+    run_with_opts(Dir, "-s", "factorial_warning",
+		  [data_dir,<<"factorial_warning:12: Warning: function bar/0 is unused\nExitCode:0">>]),
+    run_with_opts(Dir, "-s -i", "factorial_warning",
+		  [data_dir,<<"factorial_warning:12: Warning: function bar/0 is unused\nExitCode:0">>]),
+    run_with_opts(Dir, "-c -s", "factorial_warning",
+		  [data_dir,<<"factorial_warning:12: Warning: function bar/0 is unused\nExitCode:0">>]),
+    run(Dir, "filesize "++filename:join(proplists:get_value(data_dir, Config),"filesize"),
+	[data_dir,<<"filesize:11: Warning: function id/1 is unused\n324\nExitCode:0">>]),
+    run(Dir, "test_script_name",
+	[data_dir,<<"test_script_name\nExitCode:0">>]),
+    run(Dir, "tail_rec 1000",
+	[<<"ok\nExitCode:0">>]),
 
     %% We expect the trap_exit flag for the process to be false,
     %% since that is the default state for newly spawned processes.
-    ?line run(Dir, "trap_exit",
-	      <<"false\nExitCode:0">>),
+    run(Dir, "trap_exit",
+	<<"false\nExitCode:0">>),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 errors(Config) when is_list(Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     Dir = filename:absname(Data),		%Get rid of trailing slash.
-    ?line run(Dir, "compile_error",
-	      [data_dir,<<"compile_error:5: syntax error before: '*'\n">>,
-	       data_dir,<<"compile_error:8: syntax error before: blarf\n">>,
-	       <<"escript: There were compilation errors.\nExitCode:127">>]),
-    ?line run(Dir, "lint_error",
-	      [data_dir,<<"lint_error:6: function main/1 already defined\n">>,
-	       data_dir,"lint_error:8: variable 'ExitCode' is unbound\n",
-	       <<"escript: There were compilation errors.\nExitCode:127">>]),
-    ?line run_with_opts(Dir, "-s", "lint_error",
-	      [data_dir,<<"lint_error:6: function main/1 already defined\n">>,
-	       data_dir,"lint_error:8: variable 'ExitCode' is unbound\n",
-	       <<"escript: There were compilation errors.\nExitCode:127">>]),
+    run(Dir, "compile_error",
+	[data_dir,<<"compile_error:5: syntax error before: '*'\n">>,
+	 data_dir,<<"compile_error:8: syntax error before: blarf\n">>,
+	 <<"escript: There were compilation errors.\nExitCode:127">>]),
+    run(Dir, "lint_error",
+	[data_dir,<<"lint_error:6: function main/1 already defined\n">>,
+	 data_dir,"lint_error:8: variable 'ExitCode' is unbound\n",
+	 <<"escript: There were compilation errors.\nExitCode:127">>]),
+    run_with_opts(Dir, "-s", "lint_error",
+		  [data_dir,<<"lint_error:6: function main/1 already defined\n">>,
+		   data_dir,"lint_error:8: variable 'ExitCode' is unbound\n",
+		   <<"escript: There were compilation errors.\nExitCode:127">>]),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 strange_name(Config) when is_list(Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     Dir = filename:absname(Data),		%Get rid of trailing slash.
-    ?line run(Dir, "strange.name -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"ExitCode:0">>]),
+    run(Dir, "strange.name -arg1 arg2 arg3",
+	[<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+	   "ExitCode:0">>]),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 emulator_flags(Config) when is_list(Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     Dir = filename:absname(Data),		%Get rid of trailing slash.
-    ?line run(Dir, "emulator_flags -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"nostick:[{nostick,[]}]\n"
-		"mnesia:[{mnesia,[\"dir\",\"a/directory\"]},{mnesia,[\"debug\",\"verbose\"]}]\n"
-		"ERL_FLAGS=false\n"
-		"unknown:[]\n"
-		"ExitCode:0">>]),
+    run(Dir, "emulator_flags -arg1 arg2 arg3",
+	[<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+	   "nostick:[{nostick,[]}]\n"
+	   "mnesia:[{mnesia,[\"dir\",\"a/directory\"]},{mnesia,[\"debug\",\"verbose\"]}]\n"
+	   "ERL_FLAGS=false\n"
+	   "unknown:[]\n"
+	   "ExitCode:0">>]),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 emulator_flags_no_shebang(Config) when is_list(Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     Dir = filename:absname(Data),		%Get rid of trailing slash.
     %% Need run_with_opts, to always use "escript" explicitly
-    ?line run_with_opts(Dir, "", "emulator_flags_no_shebang -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"nostick:[{nostick,[]}]\n"
-		"mnesia:[{mnesia,[\"dir\",\"a/directory\"]},{mnesia,[\"debug\",\"verbose\"]}]\n"
-		"ERL_FLAGS=false\n"
-		"unknown:[]\n"
-		"ExitCode:0">>]),
+    run_with_opts(Dir, "", "emulator_flags_no_shebang -arg1 arg2 arg3",
+		  [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+		     "nostick:[{nostick,[]}]\n"
+		     "mnesia:[{mnesia,[\"dir\",\"a/directory\"]},{mnesia,[\"debug\",\"verbose\"]}]\n"
+		     "ERL_FLAGS=false\n"
+		     "unknown:[]\n"
+		     "ExitCode:0">>]),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -173,14 +172,14 @@ emulator_flags_no_shebang(Config) when is_list(Config) ->
 
 module_script(Config) when is_list(Config) ->
     %% Read orig file
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     OrigFile = filename:join([Data,"emulator_flags"]),
     {ok, OrigBin} = file:read_file(OrigFile),
-    ?line [Shebang, Mode, Flags | Source] = string:tokens(binary_to_list(OrigBin), "\n"),
-    ?line {ok, OrigFI} = file:read_file_info(OrigFile),
+    [Shebang, Mode, Flags | Source] = string:tokens(binary_to_list(OrigBin), "\n"),
+    {ok, OrigFI} = file:read_file_info(OrigFile),
 
     %% Write source file
-    Priv = ?config(priv_dir, Config),
+    Priv = proplists:get_value(priv_dir, Config),
     Dir = filename:absname(Priv), % Get rid of trailing slash.
     Base = "module_script",
     ErlFile = filename:join([Priv, Base ++ ".erl"]),
@@ -188,85 +187,85 @@ module_script(Config) when is_list(Config) ->
 	       "-export([main/1]).\n\n",
 	       string:join(Source, "\n"),
 	       "\n"],
-    ?line ok = file:write_file(ErlFile, ErlCode),
+    ok = file:write_file(ErlFile, ErlCode),
 
-    %%%%%%%
+%%%%%%%
     %% Create and run scripts without emulator flags
 
     %% With shebang
     NoArgsBase = Base ++ "_no_args_with_shebang",
     NoArgsFile = filename:join([Priv, NoArgsBase]),
-    ?line ok = file:write_file(NoArgsFile,
-			       [Shebang, "\n",
-				ErlCode]),
-    ?line ok = file:write_file_info(NoArgsFile, OrigFI),
-
-    ?line run(Dir, NoArgsBase ++ " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"nostick:[]\n"
-		"mnesia:[]\n"
-		"ERL_FLAGS=false\n"
-		"unknown:[]\n"
-		"ExitCode:0">>]),
-
-    ?line run_with_opts(Dir, "", NoArgsBase ++  " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"nostick:[]\n"
-		"mnesia:[]\n"
-		"ERL_FLAGS=false\n"
-		"unknown:[]\n"
-		"ExitCode:0">>]),
+    ok = file:write_file(NoArgsFile,
+			 [Shebang, "\n",
+			  ErlCode]),
+    ok = file:write_file_info(NoArgsFile, OrigFI),
+
+    run(Dir, NoArgsBase ++ " -arg1 arg2 arg3",
+	[<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+	   "nostick:[]\n"
+	   "mnesia:[]\n"
+	   "ERL_FLAGS=false\n"
+	   "unknown:[]\n"
+	   "ExitCode:0">>]),
+
+    run_with_opts(Dir, "", NoArgsBase ++  " -arg1 arg2 arg3",
+		  [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+		     "nostick:[]\n"
+		     "mnesia:[]\n"
+		     "ERL_FLAGS=false\n"
+		     "unknown:[]\n"
+		     "ExitCode:0">>]),
 
     %% Without shebang
     NoArgsBase2 = Base ++ "_no_args_without_shebang",
     NoArgsFile2 = filename:join([Priv, NoArgsBase2]),
-    ?line ok = file:write_file(NoArgsFile2,
-			       ["Something else than shebang!!!", "\n",
-				ErlCode]),
-    ?line ok = file:write_file_info(NoArgsFile2, OrigFI),
-
-    ?line run_with_opts(Dir, "", NoArgsBase2 ++  " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"nostick:[]\n"
-		"mnesia:[]\n"
-		"ERL_FLAGS=false\n"
-		"unknown:[]\n"
-		"ExitCode:0">>]),
+    ok = file:write_file(NoArgsFile2,
+			 ["Something else than shebang!!!", "\n",
+			  ErlCode]),
+    ok = file:write_file_info(NoArgsFile2, OrigFI),
+
+    run_with_opts(Dir, "", NoArgsBase2 ++  " -arg1 arg2 arg3",
+		  [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+		     "nostick:[]\n"
+		     "mnesia:[]\n"
+		     "ERL_FLAGS=false\n"
+		     "unknown:[]\n"
+		     "ExitCode:0">>]),
 
     %% Plain module without header
     NoArgsBase3 = Base ++ "_no_args_without_header",
     NoArgsFile3 = filename:join([Priv, NoArgsBase3]),
-    ?line ok = file:write_file(NoArgsFile3, [ErlCode]),
-    ?line ok = file:write_file_info(NoArgsFile3, OrigFI),
-
-    ?line run_with_opts(Dir, "", NoArgsBase3 ++  " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"nostick:[]\n"
-		"mnesia:[]\n"
-		"ERL_FLAGS=false\n"
-		"unknown:[]\n"
-		"ExitCode:0">>]),
-
-    %%%%%%%
+    ok = file:write_file(NoArgsFile3, [ErlCode]),
+    ok = file:write_file_info(NoArgsFile3, OrigFI),
+
+    run_with_opts(Dir, "", NoArgsBase3 ++  " -arg1 arg2 arg3",
+		  [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+		     "nostick:[]\n"
+		     "mnesia:[]\n"
+		     "ERL_FLAGS=false\n"
+		     "unknown:[]\n"
+		     "ExitCode:0">>]),
+
+%%%%%%%
     %% Create and run scripts with emulator flags
 
     %% With shebang
     ArgsBase = Base ++ "_args_with_shebang",
     ArgsFile = filename:join([Priv, ArgsBase]),
-    ?line ok = file:write_file(ArgsFile,
-			       [Shebang, "\n",
-				Mode, "\n",
-				Flags, "\n",
-				ErlCode]),
-    ?line ok = file:write_file_info(ArgsFile, OrigFI),
-
-    ?line run(Dir, ArgsBase ++  " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"nostick:[{nostick,[]}]\n"
-		"mnesia:[{mnesia,[\"dir\",\"a/directory\"]},{mnesia,[\"debug\",\"verbose\"]}]\n"
-		"ERL_FLAGS=false\n"
-		"unknown:[]\n"
-		"ExitCode:0">>]),
+    ok = file:write_file(ArgsFile,
+			 [Shebang, "\n",
+			  Mode, "\n",
+			  Flags, "\n",
+			  ErlCode]),
+    ok = file:write_file_info(ArgsFile, OrigFI),
+
+    run(Dir, ArgsBase ++  " -arg1 arg2 arg3",
+	[<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+	   "nostick:[{nostick,[]}]\n"
+	   "mnesia:[{mnesia,[\"dir\",\"a/directory\"]},{mnesia,[\"debug\",\"verbose\"]}]\n"
+	   "ERL_FLAGS=false\n"
+	   "unknown:[]\n"
+	   "ExitCode:0">>]),
 
     ok.
 
@@ -275,103 +274,103 @@ module_script(Config) when is_list(Config) ->
 %% Generate a new escript containing the beam code and the escript header
 beam_script(Config) when is_list(Config) ->
     %% Read orig file
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     OrigFile = filename:join([Data,"emulator_flags"]),
     {ok, OrigBin} = file:read_file(OrigFile),
-    ?line [Shebang, Mode, Flags | Source] = string:tokens(binary_to_list(OrigBin), "\n"),
-    ?line {ok, OrigFI} = file:read_file_info(OrigFile),
+    [Shebang, Mode, Flags | Source] = string:tokens(binary_to_list(OrigBin), "\n"),
+    {ok, OrigFI} = file:read_file_info(OrigFile),
 
     %% Write source file
-    Priv = ?config(priv_dir, Config),
+    Priv = proplists:get_value(priv_dir, Config),
     Dir = filename:absname(Priv), % Get rid of trailing slash.
     Base = "beam_script",
     ErlFile = filename:join([Priv, Base ++ ".erl"]),
-    ?line ok = file:write_file(ErlFile,
-			       ["\n-module(", Base, ").\n",
-				"-export([main/1]).\n\n",
-				string:join(Source, "\n"),
-				"\n"]),
+    ok = file:write_file(ErlFile,
+			 ["\n-module(", Base, ").\n",
+			  "-export([main/1]).\n\n",
+			  string:join(Source, "\n"),
+			  "\n"]),
 
     %% Compile the code
-    ?line {ok, _Mod, BeamCode} = compile:file(ErlFile, [binary]),
+    {ok, _Mod, BeamCode} = compile:file(ErlFile, [binary]),
 
-    %%%%%%%
+%%%%%%%
     %% Create and run scripts without emulator flags
 
     %% With shebang
     NoArgsBase = Base ++ "_no_args_with_shebang",
     NoArgsFile = filename:join([Priv, NoArgsBase]),
-    ?line ok = file:write_file(NoArgsFile,
-			       [Shebang, "\n",
-				BeamCode]),
-    ?line ok = file:write_file_info(NoArgsFile, OrigFI),
-
-    ?line run(Dir, NoArgsBase ++  " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"nostick:[]\n"
-		"mnesia:[]\n"
-		"ERL_FLAGS=false\n"
-		"unknown:[]\n"
-		"ExitCode:0">>]),
-
-    ?line run_with_opts(Dir, "", NoArgsBase ++  " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"nostick:[]\n"
-		"mnesia:[]\n"
-		"ERL_FLAGS=false\n"
-		"unknown:[]\n"
-		"ExitCode:0">>]),
+    ok = file:write_file(NoArgsFile,
+			 [Shebang, "\n",
+			  BeamCode]),
+    ok = file:write_file_info(NoArgsFile, OrigFI),
+
+    run(Dir, NoArgsBase ++  " -arg1 arg2 arg3",
+	[<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+	   "nostick:[]\n"
+	   "mnesia:[]\n"
+	   "ERL_FLAGS=false\n"
+	   "unknown:[]\n"
+	   "ExitCode:0">>]),
+
+    run_with_opts(Dir, "", NoArgsBase ++  " -arg1 arg2 arg3",
+		  [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+		     "nostick:[]\n"
+		     "mnesia:[]\n"
+		     "ERL_FLAGS=false\n"
+		     "unknown:[]\n"
+		     "ExitCode:0">>]),
 
     %% Without shebang
     NoArgsBase2 = Base ++ "_no_args_without_shebang",
     NoArgsFile2 = filename:join([Priv, NoArgsBase2]),
-    ?line ok = file:write_file(NoArgsFile2,
-			       ["Something else than shebang!!!", "\n",
-				BeamCode]),
-    ?line ok = file:write_file_info(NoArgsFile2, OrigFI),
-
-    ?line run_with_opts(Dir, "", NoArgsBase2 ++  " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"nostick:[]\n"
-		"mnesia:[]\n"
-		"ERL_FLAGS=false\n"
-		"unknown:[]\n"
-		"ExitCode:0">>]),
+    ok = file:write_file(NoArgsFile2,
+			 ["Something else than shebang!!!", "\n",
+			  BeamCode]),
+    ok = file:write_file_info(NoArgsFile2, OrigFI),
+
+    run_with_opts(Dir, "", NoArgsBase2 ++  " -arg1 arg2 arg3",
+		  [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+		     "nostick:[]\n"
+		     "mnesia:[]\n"
+		     "ERL_FLAGS=false\n"
+		     "unknown:[]\n"
+		     "ExitCode:0">>]),
 
     %% Plain beam file without header
     NoArgsBase3 = Base ++ "_no_args_without_header",
     NoArgsFile3 = filename:join([Priv, NoArgsBase3]),
-    ?line ok = file:write_file(NoArgsFile3, [BeamCode]),
-    ?line ok = file:write_file_info(NoArgsFile3, OrigFI),
-
-    ?line run_with_opts(Dir, "", NoArgsBase3 ++  " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"nostick:[]\n"
-		"mnesia:[]\n"
-		"ERL_FLAGS=false\n"
-		"unknown:[]\n"
-		"ExitCode:0">>]),
-
-    %%%%%%%
+    ok = file:write_file(NoArgsFile3, [BeamCode]),
+    ok = file:write_file_info(NoArgsFile3, OrigFI),
+
+    run_with_opts(Dir, "", NoArgsBase3 ++  " -arg1 arg2 arg3",
+		  [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+		     "nostick:[]\n"
+		     "mnesia:[]\n"
+		     "ERL_FLAGS=false\n"
+		     "unknown:[]\n"
+		     "ExitCode:0">>]),
+
+%%%%%%%
     %% Create and run scripts with emulator flags
 
     %% With shebang
     ArgsBase = Base ++ "_args",
     ArgsFile = filename:join([Priv, ArgsBase]),
-    ?line ok = file:write_file(ArgsFile,
-			       [Shebang, "\n",
-				Mode, "\n",
-				Flags, "\n",
-				BeamCode]),
-    ?line ok = file:write_file_info(ArgsFile, OrigFI),
-
-    ?line run(Dir, ArgsBase ++  " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"nostick:[{nostick,[]}]\n"
-		"mnesia:[{mnesia,[\"dir\",\"a/directory\"]},{mnesia,[\"debug\",\"verbose\"]}]\n"
-		"ERL_FLAGS=false\n"
-		"unknown:[]\n"
-		"ExitCode:0">>]),
+    ok = file:write_file(ArgsFile,
+			 [Shebang, "\n",
+			  Mode, "\n",
+			  Flags, "\n",
+			  BeamCode]),
+    ok = file:write_file_info(ArgsFile, OrigFI),
+
+    run(Dir, ArgsBase ++  " -arg1 arg2 arg3",
+	[<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+	   "nostick:[{nostick,[]}]\n"
+	   "mnesia:[{mnesia,[\"dir\",\"a/directory\"]},{mnesia,[\"debug\",\"verbose\"]}]\n"
+	   "ERL_FLAGS=false\n"
+	   "unknown:[]\n"
+	   "ExitCode:0">>]),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -381,107 +380,107 @@ beam_script(Config) when is_list(Config) ->
 
 archive_script(Config) when is_list(Config) ->
     %% Copy the orig files to priv_dir
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Archive = filename:join([PrivDir, "archive_script.zip"]),
-    ?line {ok, _} = zip:create(Archive, ["archive_script"],
-			       [{compress, []}, {cwd, DataDir}]),
-    ?line {ok, _} = zip:extract(Archive, [{cwd, PrivDir}]),
+    {ok, _} = zip:create(Archive, ["archive_script"],
+			 [{compress, []}, {cwd, DataDir}]),
+    {ok, _} = zip:extract(Archive, [{cwd, PrivDir}]),
     TopDir = filename:join([PrivDir, "archive_script"]),
 
     %% Compile the code
-    ?line ok = compile_app(TopDir, "archive_script_dict"),
-    ?line ok = compile_app(TopDir, "archive_script_dummy"),
-    ?line {ok, MainFiles} = file:list_dir(TopDir),
-    ?line ok = compile_files(MainFiles, TopDir, TopDir),
+    ok = compile_app(TopDir, "archive_script_dict"),
+    ok = compile_app(TopDir, "archive_script_dummy"),
+    {ok, MainFiles} = file:list_dir(TopDir),
+    ok = compile_files(MainFiles, TopDir, TopDir),
 
     %% Create the archive
     {ok, TopFiles} = file:list_dir(TopDir),
-    ?line {ok, {_, ArchiveBin}} = zip:create(Archive, TopFiles,
-					     [memory, {compress, []}, {cwd, TopDir}]),
+    {ok, {_, ArchiveBin}} = zip:create(Archive, TopFiles,
+				       [memory, {compress, []}, {cwd, TopDir}]),
 
     %% Read the source script
     OrigFile = filename:join([DataDir, "emulator_flags"]),
     {ok, OrigBin} = file:read_file(OrigFile),
-    ?line [Shebang, Mode, _Flags | _Source] =
+    [Shebang, Mode, _Flags | _Source] =
 	string:tokens(binary_to_list(OrigBin), "\n"),
     Flags = "%%! -archive_script_dict foo bar"
 	" -archive_script_dict foo"
 	" -archive_script_dummy bar",
-    ?line {ok, OrigFI} = file:read_file_info(OrigFile),
+    {ok, OrigFI} = file:read_file_info(OrigFile),
 
-    %%%%%%%
+%%%%%%%
     %% Create and run scripts without emulator flags
     MainBase = "archive_script_main",
     MainScript = filename:join([PrivDir, MainBase]),
 
     %% With shebang
-    ?line ok = file:write_file(MainScript,
-			       [Shebang, "\n",
-				Flags, "\n",
-				ArchiveBin]),
-    ?line ok = file:write_file_info(MainScript, OrigFI),
-
-    ?line run(PrivDir, MainBase ++  " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"dict:[{archive_script_dict,[\"foo\",\"bar\"]},{archive_script_dict,[\"foo\"]}]\n"
-		"dummy:[{archive_script_dummy,[\"bar\"]}]\n"
-		"priv:{ok,<<\"Some private data...\\n\">>}\n"
-		"ExitCode:0">>]),
-
-    ?line run_with_opts(PrivDir, "", MainBase ++  " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"dict:[{archive_script_dict,[\"foo\",\"bar\"]},{archive_script_dict,[\"foo\"]}]\n"
-		"dummy:[{archive_script_dummy,[\"bar\"]}]\n"
-		"priv:{ok,<<\"Some private data...\\n\">>}\n"
-		"ExitCode:0">>]),
-
-    ?line ok = file:rename(MainScript, MainScript ++ "_with_shebang"),
+    ok = file:write_file(MainScript,
+			 [Shebang, "\n",
+			  Flags, "\n",
+			  ArchiveBin]),
+    ok = file:write_file_info(MainScript, OrigFI),
+
+    run(PrivDir, MainBase ++  " -arg1 arg2 arg3",
+	[<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+	   "dict:[{archive_script_dict,[\"foo\",\"bar\"]},{archive_script_dict,[\"foo\"]}]\n"
+	   "dummy:[{archive_script_dummy,[\"bar\"]}]\n"
+	   "priv:{ok,<<\"Some private data...\\n\">>}\n"
+	   "ExitCode:0">>]),
+
+    run_with_opts(PrivDir, "", MainBase ++  " -arg1 arg2 arg3",
+		  [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+		     "dict:[{archive_script_dict,[\"foo\",\"bar\"]},{archive_script_dict,[\"foo\"]}]\n"
+		     "dummy:[{archive_script_dummy,[\"bar\"]}]\n"
+		     "priv:{ok,<<\"Some private data...\\n\">>}\n"
+		     "ExitCode:0">>]),
+
+    ok = file:rename(MainScript, MainScript ++ "_with_shebang"),
 
     %% Without shebang (no flags)
-    ?line ok = file:write_file(MainScript,
-			       ["Something else than shebang!!!", "\n",
-				ArchiveBin]),
-    ?line ok = file:write_file_info(MainScript, OrigFI),
-
-    ?line run_with_opts(PrivDir, "", MainBase ++  " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"dict:[]\n"
-		"dummy:[]\n"
-		"priv:{ok,<<\"Some private data...\\n\">>}\n"
-		"ExitCode:0">>]),
-    ?line ok = file:rename(MainScript, MainScript ++ "_without_shebang"),
+    ok = file:write_file(MainScript,
+			 ["Something else than shebang!!!", "\n",
+			  ArchiveBin]),
+    ok = file:write_file_info(MainScript, OrigFI),
+
+    run_with_opts(PrivDir, "", MainBase ++  " -arg1 arg2 arg3",
+		  [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+		     "dict:[]\n"
+		     "dummy:[]\n"
+		     "priv:{ok,<<\"Some private data...\\n\">>}\n"
+		     "ExitCode:0">>]),
+    ok = file:rename(MainScript, MainScript ++ "_without_shebang"),
 
     %% Plain archive without header (no flags)
 
-    ?line ok = file:write_file(MainScript, [ArchiveBin]),
-    ?line ok = file:write_file_info(MainScript, OrigFI),
+    ok = file:write_file(MainScript, [ArchiveBin]),
+    ok = file:write_file_info(MainScript, OrigFI),
 
-    ?line run_with_opts(PrivDir, "", MainBase ++  " -arg1 arg2 arg3",
-	      [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"dict:[]\n"
-		"dummy:[]\n"
-		"priv:{ok,<<\"Some private data...\\n\">>}\n"
-		"ExitCode:0">>]),
-    ?line ok = file:rename(MainScript, MainScript ++ "_without_header"),
+    run_with_opts(PrivDir, "", MainBase ++  " -arg1 arg2 arg3",
+		  [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+		     "dict:[]\n"
+		     "dummy:[]\n"
+		     "priv:{ok,<<\"Some private data...\\n\">>}\n"
+		     "ExitCode:0">>]),
+    ok = file:rename(MainScript, MainScript ++ "_without_header"),
 
-    %%%%%%%
+%%%%%%%
     %% Create and run scripts with emulator flags
     AltBase = "archive_script_alternate_main",
     AltScript = filename:join([PrivDir, AltBase]),
-    ?line ok = file:write_file(AltScript,
-			       [Shebang, "\n",
-				Mode, "\n",
-				Flags, " -escript main archive_script_main2\n",
-				ArchiveBin]),
-    ?line ok = file:write_file_info(AltScript, OrigFI),
-
-    ?line run(PrivDir, AltBase ++  " -arg1 arg2 arg3",
-	      [<<"main2:[\"-arg1\",\"arg2\",\"arg3\"]\n"
-		"dict:[{archive_script_dict,[\"foo\",\"bar\"]},{archive_script_dict,[\"foo\"]}]\n"
-		"dummy:[{archive_script_dummy,[\"bar\"]}]\n"
-		"priv:{ok,<<\"Some private data...\\n\">>}\n"
-		"ExitCode:0">>]),
+    ok = file:write_file(AltScript,
+			 [Shebang, "\n",
+			  Mode, "\n",
+			  Flags, " -escript main archive_script_main2\n",
+			  ArchiveBin]),
+    ok = file:write_file_info(AltScript, OrigFI),
+
+    run(PrivDir, AltBase ++  " -arg1 arg2 arg3",
+	[<<"main2:[\"-arg1\",\"arg2\",\"arg3\"]\n"
+	   "dict:[{archive_script_dict,[\"foo\",\"bar\"]},{archive_script_dict,[\"foo\"]}]\n"
+	   "dummy:[{archive_script_dummy,[\"bar\"]}]\n"
+	   "priv:{ok,<<\"Some private data...\\n\">>}\n"
+	   "ExitCode:0">>]),
 
     ok.
 
@@ -508,21 +507,21 @@ archive_script(Config) when is_list(Config) ->
 %%
 archive_script_file_access(Config) when is_list(Config) ->
     %% Copy the orig files to priv_dir
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
 
     MainMod = "archive_script_file_access",
     MainSrc = MainMod ++ ".erl",
     MainBeam = MainMod ++ ".beam",
 
     Archive = filename:join([PrivDir, "archive_script_file_access.zip"]),
-    ?line {ok, _} = zip:create(Archive, ["archive_script_file_access"],
-			       [{compress, []}, {cwd, DataDir}]),
-    ?line {ok, _} = zip:extract(Archive, [{cwd, PrivDir}]),
+    {ok, _} = zip:create(Archive, ["archive_script_file_access"],
+			 [{compress, []}, {cwd, DataDir}]),
+    {ok, _} = zip:extract(Archive, [{cwd, PrivDir}]),
     TopDir = filename:join([PrivDir, "archive_script_file_access"]),
 
     %% Compile the code
-    ?line ok = compile_files([MainSrc], TopDir, TopDir),
+    ok = compile_files([MainSrc], TopDir, TopDir),
 
     %% First, create a file structure which will be included in the archive:
     %%
@@ -630,7 +629,7 @@ compile_app(TopDir, AppName) ->
     AppDir = filename:join([TopDir, AppName]),
     SrcDir = filename:join([AppDir, "src"]),
     OutDir = filename:join([AppDir, "ebin"]),
-    ?line {ok, Files} = file:list_dir(SrcDir),
+    {ok, Files} = file:list_dir(SrcDir),
     compile_files(Files, SrcDir, OutDir).
 
 compile_files([File | Files], SrcDir, OutDir) ->
@@ -652,10 +651,10 @@ compile_files([], _, _) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 epp(Config) when is_list(Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     Dir = filename:absname(Data),		%Get rid of trailing slash.
-    ?line run(Dir, "factorial_epp 5",
-	      <<"factorial 5 = 120\nExitCode:0">>),
+    run(Dir, "factorial_epp 5",
+	<<"factorial 5 = 120\nExitCode:0">>),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -695,9 +694,9 @@ create_and_extract(Config) when is_list(Config) ->
 
     %% Verify the compile_source option
     file:delete(NewFile),
-    ?line ok = escript:create(NewFile, [{source, Source}]),
-    ?line {ok, [_, _, _, {source, Source}]} = escript:extract(NewFile, []),
-    ?line {ok, [_, _, _, {source, BeamCode2}]} =
+    ok = escript:create(NewFile, [{source, Source}]),
+    {ok, [_, _, _, {source, Source}]} = escript:extract(NewFile, []),
+    {ok, [_, _, _, {source, BeamCode2}]} =
 	escript:extract(NewFile, [compile_source]),
     verify_sections(NewFile, FileInfo,
 		    [{shebang, default},
@@ -709,15 +708,15 @@ create_and_extract(Config) when is_list(Config) ->
 
 prepare_creation(Base, Config) ->
     %% Read the source
-    PrivDir = ?config(priv_dir, Config),
-    DataDir = ?config(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     OrigFile = filename:join([DataDir,"emulator_flags"]),
-    ?line {ok, FileInfo} = file:read_file_info(OrigFile),
+    {ok, FileInfo} = file:read_file_info(OrigFile),
     NewFile = filename:join([PrivDir, Base]),
-    ?line {ok, [{shebang, default},
-		{comment, _},
-		{emu_args, EmuArg},
-		{source, Source}]} =
+    {ok, [{shebang, default},
+	  {comment, _},
+	  {emu_args, EmuArg},
+	  {source, Source}]} =
 	escript:extract(OrigFile, []),
 
     %% Compile the code
@@ -725,14 +724,14 @@ prepare_creation(Base, Config) ->
     ErlCode = list_to_binary(["\n-module(", Base, ").\n",
 			      "-export([main/1]).\n\n",
 			      Source, "\n\n"]),
-    ?line ok = file:write_file(ErlFile, ErlCode),
+    ok = file:write_file(ErlFile, ErlCode),
 
     %% Compile the code
-    ?line {ok, _Mod, BeamCode} =
+    {ok, _Mod, BeamCode} =
 	compile:file(ErlFile, [binary, debug_info]),
 
     %% Create an archive
-    ?line {ok, {_, ArchiveBin}} =
+    {ok, {_, ArchiveBin}} =
 	zip:create("dummy_archive_name",
 		   [{Base ++ ".erl", ErlCode},
 		    {Base ++ ".beam", BeamCode}],
@@ -749,8 +748,8 @@ verify_sections(File, FileInfo, Sections) ->
 
     %% Create
     file:delete(File),
-    ?line ok = escript:create(File, Sections),
-    ?line ok = file:write_file_info(File, FileInfo),
+    ok = escript:create(File, Sections),
+    ok = file:write_file_info(File, FileInfo),
 
     %% Run
     Dir = filename:absname(filename:dirname(File)),
@@ -780,21 +779,21 @@ verify_sections(File, FileInfo, Sections) ->
     Expected = <<ExpectedMain/binary, ExpectedOutput/binary>>,
     case HasArg(shebang) of
 	true ->
-	    ?line run(Dir, InputArgs, [Expected]);
+	    run(Dir, InputArgs, [Expected]);
 	false ->
-	    ?line run_with_opts(Dir, [], InputArgs, [Expected])
+	    run_with_opts(Dir, [], InputArgs, [Expected])
     end,
 
     %% Verify
-    ?line {ok, Bin} = escript:create(binary, Sections),
-    ?line {ok, Read} = file:read_file(File),
-    ?line Bin = Read, % Assert
+    {ok, Bin} = escript:create(binary, Sections),
+    {ok, Read} = file:read_file(File),
+    Bin = Read, % Assert
 
     Normalized = normalize_sections(Sections),
-    ?line {ok, Extracted} = escript:extract(File, []),
+    {ok, Extracted} = escript:extract(File, []),
     io:format("Normalized; ~p\n", [Normalized]),
     io:format("Extracted ; ~p\n", [Extracted]),
-    ?line Normalized = Extracted, % Assert
+    Normalized = Extracted, % Assert
     ok.
 
 normalize_sections(Sections) ->
@@ -806,27 +805,27 @@ normalize_sections(Sections) ->
 		end
 	end,
     case lists:map(AtomToTuple, [{K, V} || {K, V} <- Sections, V =/= undefined]) of
-	    [{shebang, Shebang} | Rest] ->
-		[{shebang, Shebang} |
-		 case Rest of
-		     [{comment, Comment} | Rest2] ->
-			 [{comment, Comment} |
-			  case Rest2 of
-			      [{emu_args, EmuArgs}, Body] ->
-				  [{emu_args, EmuArgs}, Body];
-			      [Body] ->
-				  [{emu_args, undefined}, Body]
-			  end
-			 ];
-		     [{emu_args, EmuArgs}, Body] ->
-			 [{comment, undefined}, {emu_args, EmuArgs}, Body];
-		     [Body] ->
-			 [{comment, undefined}, {emu_args, undefined}, Body]
-		 end
-		];
-	    [Body] ->
-		[{shebang, undefined}, {comment, undefined}, {emu_args, undefined}, Body]
-	end.
+	[{shebang, Shebang} | Rest] ->
+	    [{shebang, Shebang} |
+	     case Rest of
+		 [{comment, Comment} | Rest2] ->
+		     [{comment, Comment} |
+		      case Rest2 of
+			  [{emu_args, EmuArgs}, Body] ->
+			      [{emu_args, EmuArgs}, Body];
+			  [Body] ->
+			      [{emu_args, undefined}, Body]
+		      end
+		     ];
+		 [{emu_args, EmuArgs}, Body] ->
+		     [{comment, undefined}, {emu_args, EmuArgs}, Body];
+		 [Body] ->
+		     [{comment, undefined}, {emu_args, undefined}, Body]
+	     end
+	    ];
+	[Body] ->
+	    [{shebang, undefined}, {comment, undefined}, {emu_args, undefined}, Body]
+    end.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
@@ -846,36 +845,36 @@ foldl(Config) when is_list(Config) ->
     %% Get line numbers and the file attribute right
     SourceFile = NewFile ++ ".erl",
     <<_:1/binary, ErlCode2/binary>> = ErlCode,
-    ?line ok = file:write_file(SourceFile, ErlCode2),
-    ?line {ok, _Mod, BeamCode} =
+    ok = file:write_file(SourceFile, ErlCode2),
+    {ok, _Mod, BeamCode} =
 	compile:file(SourceFile, [binary, debug_info]),
 
     %% Verify source script
-    ?line ok = escript:create(SourceFile, [{source, ErlCode}]),
-    ?line {ok, [{".", _, BeamCode2}]}
+    ok = escript:create(SourceFile, [{source, ErlCode}]),
+    {ok, [{".", _, BeamCode2}]}
 	= escript_foldl(Collect, [], SourceFile),
 
-    ?line {ok, Abstr} = beam_lib:chunks(BeamCode, [abstract_code]),
-    ?line {ok, Abstr2} = beam_lib:chunks(BeamCode2, [abstract_code]),
+    {ok, Abstr} = beam_lib:chunks(BeamCode, [abstract_code]),
+    {ok, Abstr2} = beam_lib:chunks(BeamCode2, [abstract_code]),
     %% io:format("abstr1=~p\n", [Abstr]),
     %% io:format("abstr2=~p\n", [Abstr2]),
-    ?line Abstr = Abstr2, % Assert
+    Abstr = Abstr2, % Assert
 
     %% Verify beam script
-    ?line ok = escript:create(NewFile, [{beam, BeamCode}]),
-    ?line {ok, [{".", _, BeamCode}]}
+    ok = escript:create(NewFile, [{beam, BeamCode}]),
+    {ok, [{".", _, BeamCode}]}
 	= escript_foldl(Collect, [], NewFile),
 
     %% Verify archive scripts
-    ?line ok = escript:create(NewFile, [{archive, ArchiveBin}]),
-    ?line {ok, [{BeamBase, #file_info{}, _},
-		{ErlBase, #file_info{}, _}]}
+    ok = escript:create(NewFile, [{archive, ArchiveBin}]),
+    {ok, [{BeamBase, #file_info{}, _},
+	  {ErlBase, #file_info{}, _}]}
 	= escript_foldl(Collect, [], NewFile),
 
     ArchiveFiles = [{ErlBase, ErlCode}, {BeamBase, BeamCode}],
-    ?line ok = escript:create(NewFile, [{archive, ArchiveFiles, []}]),
-    ?line {ok, [{BeamBase, _, _},
-	      {ErlBase, _, _}]}
+    ok = escript:create(NewFile, [{archive, ArchiveFiles, []}]),
+    {ok, [{BeamBase, _, _},
+	  {ErlBase, _, _}]}
 	= escript_foldl(Collect, [], NewFile),
 
     ok.
@@ -909,7 +908,7 @@ emulate_escript_foldl(Fun, Acc, File) ->
     end.
 
 unicode(Config) when is_list(Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     Dir = filename:absname(Data),		%Get rid of trailing slash.
     run(Dir, "unicode1",
         [<<"escript: exception error: an error occurred when evaluating"
@@ -928,12 +927,12 @@ unicode(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 overflow(Config) when is_list(Config) ->
-    Data = ?config(data_dir, Config),
+    Data = proplists:get_value(data_dir, Config),
     Dir = filename:absname(Data),		%Get rid of trailing slash.
-    ?line run(Dir, "arg_overflow",
-	      [<<"ExitCode:0">>]),
-    ?line run(Dir, "linebuf_overflow",
-	      [<<"ExitCode:0">>]),
+    run(Dir, "arg_overflow",
+	[<<"ExitCode:0">>]),
+    run(Dir, "linebuf_overflow",
+	[<<"ExitCode:0">>]),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -968,7 +967,7 @@ do_run(Dir, Cmd, Expected0) ->
 		Actual ->
 		    io:format("Expected: ~p\n", [Expected]),
 		    io:format("Actual:   ~p\n", [Actual]),
-		    ?t:fail()
+		    ct:fail(failed)
 	    end
     end.
 
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index ae431d66d9..fd0ff0e252 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -34,7 +34,7 @@
 -export([ match1/1, match2/1, match_object/1, match_object2/1]).
 -export([ dups/1, misc1/1, safe_fixtable/1, info/1, tab2list/1]).
 -export([ tab2file/1, tab2file2/1, tabfile_ext1/1,
-	tabfile_ext2/1, tabfile_ext3/1, tabfile_ext4/1, badfile/1]).
+	  tabfile_ext2/1, tabfile_ext3/1, tabfile_ext4/1, badfile/1]).
 -export([ heavy_lookup/1, heavy_lookup_element/1, heavy_concurrent/1]).
 -export([ lookup_element_mult/1]).
 -export([]).
@@ -43,8 +43,6 @@
 	 t_delete_all_objects/1, t_insert_list/1, t_test_ms/1,
 	 t_select_delete/1,t_ets_dets/1]).
 
--export([do_lookup/2, do_lookup_element/3]).
-
 -export([ordered/1, ordered_match/1, interface_equality/1,
 	 fixtable_next/1, fixtable_insert/1, rename/1, rename_unnamed/1, evil_rename/1,
 	 update_element/1, update_counter/1, evil_update_counter/1, partly_bound/1, match_heavy/1]).
@@ -85,7 +83,7 @@
 %% Convenience for manual testing
 -export([random_test/0]).
 
-% internal exports
+%% 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,
@@ -107,29 +105,27 @@
 
 -export([t_select_reverse/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
--define(m(A,B), ?line assert_eq(A,B)).
+-define(m(A,B), assert_eq(A,B)).
 
 init_per_testcase(Case, Config) ->
-    Seed = {S1,S2,S3} = random:seed0(), %now(),
-    random:seed(S1,S2,S3),
-    io:format("*** SEED: ~p ***\n", [Seed]),
+    rand:seed(exsplus),
+    io:format("*** SEED: ~p ***\n", [rand:export_seed()]),
     start_spawn_logger(),
     wait_for_test_procs(), %% Ensure previous case cleaned up
-    Dog=test_server:timetrap(test_server:minutes(20)),
     put('__ETS_TEST_CASE__', Case),
-    [{watchdog, Dog}, {test_case, Case} | Config].
+    [{test_case, Case} | Config].
+
+end_per_testcase(_Func, _Config) ->
+    wait_for_test_procs(true).
 
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    wait_for_test_procs(true),
-    test_server:timetrap_cancel(Dog).
-   
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,20}}].
 
 all() -> 
     [{group, new}, {group, insert}, {group, lookup},
@@ -159,7 +155,7 @@ all() ->
      otp_9423,
      ets_all,
      take,
-     
+
      memory_check_summary]. % MUST BE LAST
 
 groups() -> 
@@ -200,10 +196,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 %% Test that we did not have "too many" failed verify_etsmem()'s
 %% in the test suite.
@@ -213,7 +209,7 @@ end_per_group(_GroupName, Config) ->
 memory_check_summary(_Config) ->
     case whereis(ets_test_spawn_logger) of
 	undefined ->
-	    ?t:fail("No spawn logger exist");
+	    ct:fail("No spawn logger exist");
 	_ ->
 	    ets_test_spawn_logger ! {self(), get_failed_memchecks},
 	    receive {get_failed_memchecks, FailedMemchecks} -> ok end,
@@ -229,45 +225,39 @@ memory_check_summary(_Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-t_bucket_disappears(suite) ->
-    [];
-t_bucket_disappears(doc) ->
-    ["Test that a disappearing bucket during select of a non-fixed table works."];
+%% 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).
 
 t_bucket_disappears_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line ets_new(abcd, [named_table, public, {keypos, 2} | Opts]),
-    ?line ets:insert(abcd, {abcd,1,2}),
-    ?line ets:insert(abcd, {abcd,2,2}),
-    ?line ets:insert(abcd, {abcd,3,2}),
-    ?line {_, Cont} = ets:select(abcd, [{{'_', '$1', '_'}, 
-					 [{'<', '$1', {const, 10}}], 
-					 ['$1']}], 1),
-    ?line ets:delete(abcd, 2),
-    ?line ets:select(Cont),
-    ?line true = ets:delete(abcd),
-    ?line verify_etsmem(EtsMem).
-    
-
-t_match_spec_run(suite) -> 
-    [];
-t_match_spec_run(doc) ->
-    ["Check ets:match_spec_run/2."];
+    EtsMem = etsmem(),
+    ets_new(abcd, [named_table, public, {keypos, 2} | Opts]),
+    ets:insert(abcd, {abcd,1,2}),
+    ets:insert(abcd, {abcd,2,2}),
+    ets:insert(abcd, {abcd,3,2}),
+    {_, Cont} = ets:select(abcd, [{{'_', '$1', '_'},
+				   [{'<', '$1', {const, 10}}],
+				   ['$1']}], 1),
+    ets:delete(abcd, 2),
+    ets:select(Cont),
+    true = ets:delete(abcd),
+    verify_etsmem(EtsMem).
+
+
+%% Check ets:match_spec_run/2.
 t_match_spec_run(Config) when is_list(Config) ->
     init_externals(),
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
 
     t_match_spec_run_test([{1},{2},{3}],
 			  [{{'$1'},[{'>','$1',1}],['$1']}],
 			  [2,3]),
 
-    ?line Huge = [{X} || X <- lists:seq(1,2500)],
-    ?line L = lists:seq(2476,2500),
+    Huge = [{X} || X <- lists:seq(1,2500)],
+    L = lists:seq(2476,2500),
     t_match_spec_run_test(Huge, [{{'$1'},[{'>','$1',2475}],['$1']}], L),
 
-    ?line L2 = [{X*16#FFFFFFF} || X <- L],
+    L2 = [{X*16#FFFFFFF} || X <- L],
     t_match_spec_run_test(Huge,
 			  [{{'$1'}, [{'>','$1',2475}], [{{{'*','$1',16#FFFFFFF}}}]}],
 			  L2),
@@ -344,7 +334,7 @@ t_match_spec_run(Config) when is_list(Config) ->
 	  end,
     test_terms(Fun, skip_refc_check),
 
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 t_match_spec_run_test(List, MS, Result) ->
 
@@ -372,14 +362,12 @@ t_match_spec_run_test(List, MS, Result) ->
     erlang:trace(Tracee, true, [call]),
     Tracee ! start,
     TRes = ms_tracer_collect(Tracee, MonRef, []),
-    %erlang:trace(Tracee, false, [call]),
-    %Tracee ! stop,
     case TRes of
 	SRes -> ok;
 	_ ->
 	    io:format("TRACE MATCH FAILED\n"),
 	    io:format("Input = ~p\nMST = ~p\nExpected = ~p\nGot = ~p\n", [List, MST, SRes, TRes]),
-	    ?t:fail("TRACE MATCH FAILED")
+	    ct:fail("TRACE MATCH FAILED")
     end,
     ok.
 
@@ -388,32 +376,27 @@ t_match_spec_run_test(List, MS, Result) ->
 ms_tracer_collect(Tracee, Ref, Acc) ->
     receive
 	{trace, Tracee, call, _Args, [Msg]} ->
-	    %io:format("trace Args=~p  Msg=~p\n", [_Args, Msg]),
 	    ms_tracer_collect(Tracee, Ref, [Msg | Acc]);
 
 	{'DOWN', Ref, process, Tracee, _} ->
-	    %io:format("monitor DOWN for ~p\n", [Tracee]),
 	    TDRef = erlang:trace_delivered(Tracee),
 	    ms_tracer_collect(Tracee, TDRef, Acc);
 
 	{trace_delivered, Tracee, Ref} ->
-	    %%io:format("trace delivered for ~p\n", [Tracee]),
 	    lists:sort(Acc);
 
 	Other ->
 	    io:format("Unexpected message = ~p\n", [Other]),
-	    ?t:fail("Unexpected tracer msg")
+	    ct:fail("Unexpected tracer msg")
     end.
 
 
 ms_tracee(Parent, CallArgList) ->
-    %io:format("ms_tracee ~p started with ArgList = ~p\n", [self(), CallArgList]),
     Parent ! {self(), ready},
     receive start -> ok end,
     lists:foreach(fun(Args) ->
 			  erlang:apply(?MODULE, ms_tracee_dummy, tuple_to_list(Args))
 		  end, CallArgList).
-    %%receive stop -> ok end.
 
 
 
@@ -428,189 +411,181 @@ ms_clause_ets_to_trace({Head, Guard, Body}) ->
 assert_eq(A,A) -> ok;
 assert_eq(A,B) ->
     io:format("FAILED MATCH:\n~p\n =/=\n~p\n",[A,B]),
-    ?t:fail("assert_eq failed").
+    ct:fail("assert_eq failed").
 
 
-t_repair_continuation(suite) -> 
-    [];
-t_repair_continuation(doc) ->
-    ["Check ets:repair_continuation/2."];
+%% Test ets:repair_continuation/2.
 t_repair_continuation(Config) when is_list(Config) ->
     repeat_for_opts(t_repair_continuation_do).
 
 
 t_repair_continuation_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line MS = [{'_',[],[true]}],
-    ?line MS2 = [{{{'$1','_'},'_'},[],['$1']}],
+    EtsMem = etsmem(),
+    MS = [{'_',[],[true]}],
+    MS2 = [{{{'$1','_'},'_'},[],['$1']}],
     (fun() ->
-	     ?line T = ets_new(x,[ordered_set|Opts]),
-	     ?line F = fun(0,_)->ok;(N,F) -> ets:insert(T,{N,N}), F(N-1,F) end,
-	     ?line F(1000,F),
-	     ?line {_,C} = ets:select(T,MS,5),
-	     ?line C2 = erlang:setelement(5,C,<<>>),
-	     ?line {'EXIT',{badarg,_}} = (catch ets:select(C2)),
-	     ?line C3 = ets:repair_continuation(C2,MS),
-	     ?line {[true,true,true,true,true],_} = ets:select(C3),
-	     ?line {[true,true,true,true,true],_} = ets:select(C),
-	     ?line true = ets:delete(T)
+	     T = ets_new(x,[ordered_set|Opts]),
+	     F = fun(0,_)->ok;(N,F) -> ets:insert(T,{N,N}), F(N-1,F) end,
+	     F(1000,F),
+	     {_,C} = ets:select(T,MS,5),
+	     C2 = erlang:setelement(5,C,<<>>),
+	     {'EXIT',{badarg,_}} = (catch ets:select(C2)),
+	     C3 = ets:repair_continuation(C2,MS),
+	     {[true,true,true,true,true],_} = ets:select(C3),
+	     {[true,true,true,true,true],_} = ets:select(C),
+	     true = ets:delete(T)
      end)(),
     (fun() ->
-	     ?line T = ets_new(x,[ordered_set|Opts]),
-	     ?line F = fun(0,_)->ok;(N,F) -> ets:insert(T,{N,N}), F(N-1,F) end,
-	     ?line F(1000,F),
-	     ?line {_,C} = ets:select(T,MS,1001),
-	     ?line C = '$end_of_table',
-	     ?line C3 = ets:repair_continuation(C,MS),
-	     ?line '$end_of_table' = ets:select(C3),
-	     ?line '$end_of_table' = ets:select(C),
-	     ?line true = ets:delete(T)
+	     T = ets_new(x,[ordered_set|Opts]),
+	     F = fun(0,_)->ok;(N,F) -> ets:insert(T,{N,N}), F(N-1,F) end,
+	     F(1000,F),
+	     {_,C} = ets:select(T,MS,1001),
+	     C = '$end_of_table',
+	     C3 = ets:repair_continuation(C,MS),
+	     '$end_of_table' = ets:select(C3),
+	     '$end_of_table' = ets:select(C),
+	     true = ets:delete(T)
      end)(),
-    
+
     (fun() ->
-	     ?line T = ets_new(x,[ordered_set|Opts]),
-	     ?line F = fun(0,_)->ok;(N,F) -> 
-			       ets:insert(T,{integer_to_list(N),N}), 
-			       F(N-1,F) 
-		       end,
-	     ?line F(1000,F),
-	     ?line {_,C} = ets:select(T,MS,5),
-	     ?line C2 = erlang:setelement(5,C,<<>>),
-	     ?line {'EXIT',{badarg,_}} = (catch ets:select(C2)),
-	     ?line C3 = ets:repair_continuation(C2,MS),
-	     ?line {[true,true,true,true,true],_} = ets:select(C3),
-	     ?line {[true,true,true,true,true],_} = ets:select(C),
-	     ?line true = ets:delete(T)
+	     T = ets_new(x,[ordered_set|Opts]),
+	     F = fun(0,_)->ok;(N,F) ->
+			 ets:insert(T,{integer_to_list(N),N}),
+			 F(N-1,F)
+		 end,
+	     F(1000,F),
+	     {_,C} = ets:select(T,MS,5),
+	     C2 = erlang:setelement(5,C,<<>>),
+	     {'EXIT',{badarg,_}} = (catch ets:select(C2)),
+	     C3 = ets:repair_continuation(C2,MS),
+	     {[true,true,true,true,true],_} = ets:select(C3),
+	     {[true,true,true,true,true],_} = ets:select(C),
+	     true = ets:delete(T)
      end)(),
     (fun() ->
-	     ?line T = ets_new(x,[ordered_set|Opts]),
-	     ?line F = fun(0,_)->ok;(N,F) -> 
-			       ets:insert(T,{{integer_to_list(N),N},N}), 
-			       F(N-1,F) 
-		       end,
-	     ?line F(1000,F),
-	     ?line {_,C} = ets:select(T,MS2,5),
-	     ?line C2 = erlang:setelement(5,C,<<>>),
-	     ?line {'EXIT',{badarg,_}} = (catch ets:select(C2)),
-	     ?line C3 = ets:repair_continuation(C2,MS2),
-	     ?line {[_,_,_,_,_],_} = ets:select(C3),
-	     ?line {[_,_,_,_,_],_} = ets:select(C),
-	     ?line true = ets:delete(T)
+	     T = ets_new(x,[ordered_set|Opts]),
+	     F = fun(0,_)->ok;(N,F) ->
+			 ets:insert(T,{{integer_to_list(N),N},N}),
+			 F(N-1,F)
+		 end,
+	     F(1000,F),
+	     {_,C} = ets:select(T,MS2,5),
+	     C2 = erlang:setelement(5,C,<<>>),
+	     {'EXIT',{badarg,_}} = (catch ets:select(C2)),
+	     C3 = ets:repair_continuation(C2,MS2),
+	     {[_,_,_,_,_],_} = ets:select(C3),
+	     {[_,_,_,_,_],_} = ets:select(C),
+	     true = ets:delete(T)
      end)(),
-    
+
     (fun() ->
-	     ?line T = ets_new(x,[set|Opts]),
-	     ?line F = fun(0,_)->ok;(N,F) -> 
-			       ets:insert(T,{N,N}), 
-			       F(N-1,F) 
-		       end,
-	     ?line F(1000,F),
-	     ?line {_,C} = ets:select(T,MS,5),
-	     ?line C2 = erlang:setelement(4,C,<<>>),
-	     ?line {'EXIT',{badarg,_}} = (catch ets:select(C2)),
-	     ?line C3 = ets:repair_continuation(C2,MS),
-	     ?line {[true,true,true,true,true],_} = ets:select(C3),
-	     ?line {[true,true,true,true,true],_} = ets:select(C),
-	     ?line true = ets:delete(T)
+	     T = ets_new(x,[set|Opts]),
+	     F = fun(0,_)->ok;(N,F) ->
+			 ets:insert(T,{N,N}),
+			 F(N-1,F)
+		 end,
+	     F(1000,F),
+	     {_,C} = ets:select(T,MS,5),
+	     C2 = erlang:setelement(4,C,<<>>),
+	     {'EXIT',{badarg,_}} = (catch ets:select(C2)),
+	     C3 = ets:repair_continuation(C2,MS),
+	     {[true,true,true,true,true],_} = ets:select(C3),
+	     {[true,true,true,true,true],_} = ets:select(C),
+	     true = ets:delete(T)
      end)(),
     (fun() ->
-	     ?line T = ets_new(x,[set|Opts]),
-	     ?line F = fun(0,_)->ok;(N,F) -> 
-			       ets:insert(T,{integer_to_list(N),N}), 
-			       F(N-1,F) 
-		       end,
-	     ?line F(1000,F),
-	     ?line {_,C} = ets:select(T,MS,5),
-	     ?line C2 = erlang:setelement(4,C,<<>>),
-	     ?line {'EXIT',{badarg,_}} = (catch ets:select(C2)),
-	     ?line C3 = ets:repair_continuation(C2,MS),
-	     ?line {[true,true,true,true,true],_} = ets:select(C3),
-	     ?line {[true,true,true,true,true],_} = ets:select(C),
-	     ?line true = ets:delete(T)
+	     T = ets_new(x,[set|Opts]),
+	     F = fun(0,_)->ok;(N,F) ->
+			 ets:insert(T,{integer_to_list(N),N}),
+			 F(N-1,F)
+		 end,
+	     F(1000,F),
+	     {_,C} = ets:select(T,MS,5),
+	     C2 = erlang:setelement(4,C,<<>>),
+	     {'EXIT',{badarg,_}} = (catch ets:select(C2)),
+	     C3 = ets:repair_continuation(C2,MS),
+	     {[true,true,true,true,true],_} = ets:select(C3),
+	     {[true,true,true,true,true],_} = ets:select(C),
+	     true = ets:delete(T)
      end)(),
     (fun() ->
-	     ?line T = ets_new(x,[bag|Opts]),
-	     ?line F = fun(0,_)->ok;(N,F) -> 
-			       ets:insert(T,{integer_to_list(N),N}), 
-			       F(N-1,F) 
-		       end,
-	     ?line F(1000,F),
-	     ?line {_,C} = ets:select(T,MS,5),
-	     ?line C2 = erlang:setelement(4,C,<<>>),
-	     ?line {'EXIT',{badarg,_}} = (catch ets:select(C2)),
-	     ?line C3 = ets:repair_continuation(C2,MS),
-	     ?line {[true,true,true,true,true],_} = ets:select(C3),
-	     ?line {[true,true,true,true,true],_} = ets:select(C),
-	     ?line true = ets:delete(T)
+	     T = ets_new(x,[bag|Opts]),
+	     F = fun(0,_)->ok;(N,F) ->
+			 ets:insert(T,{integer_to_list(N),N}),
+			 F(N-1,F)
+		 end,
+	     F(1000,F),
+	     {_,C} = ets:select(T,MS,5),
+	     C2 = erlang:setelement(4,C,<<>>),
+	     {'EXIT',{badarg,_}} = (catch ets:select(C2)),
+	     C3 = ets:repair_continuation(C2,MS),
+	     {[true,true,true,true,true],_} = ets:select(C3),
+	     {[true,true,true,true,true],_} = ets:select(C),
+	     true = ets:delete(T)
      end)(),
     (fun() ->
-	     ?line T = ets_new(x,[duplicate_bag|Opts]),
-	     ?line F = fun(0,_)->ok;(N,F) -> 
-			       ets:insert(T,{integer_to_list(N),N}), 
-			       F(N-1,F) 
-		       end,
-	     ?line F(1000,F),
-	     ?line {_,C} = ets:select(T,MS,5),
-	     ?line C2 = erlang:setelement(4,C,<<>>),
-	     ?line {'EXIT',{badarg,_}} = (catch ets:select(C2)),
-	     ?line C3 = ets:repair_continuation(C2,MS),
-	     ?line {[true,true,true,true,true],_} = ets:select(C3),
-	     ?line {[true,true,true,true,true],_} = ets:select(C),
-	     ?line true = ets:delete(T)
+	     T = ets_new(x,[duplicate_bag|Opts]),
+	     F = fun(0,_)->ok;(N,F) ->
+			 ets:insert(T,{integer_to_list(N),N}),
+			 F(N-1,F)
+		 end,
+	     F(1000,F),
+	     {_,C} = ets:select(T,MS,5),
+	     C2 = erlang:setelement(4,C,<<>>),
+	     {'EXIT',{badarg,_}} = (catch ets:select(C2)),
+	     C3 = ets:repair_continuation(C2,MS),
+	     {[true,true,true,true,true],_} = ets:select(C3),
+	     {[true,true,true,true,true],_} = ets:select(C),
+	     true = ets:delete(T)
      end)(),
-    ?line false = ets:is_compiled_ms(<<>>),
-    ?line true = ets:is_compiled_ms(ets:match_spec_compile(MS)),
-    ?line verify_etsmem(EtsMem).
+    false = ets:is_compiled_ms(<<>>),
+    true = ets:is_compiled_ms(ets:match_spec_compile(MS)),
+    verify_etsmem(EtsMem).
 
 
-default(doc) ->
-    ["Check correct default vaules of a new ets table"];
-default(suite) -> [];
+%% Test correct default vaules of a new ets table.
 default(Config) when is_list(Config) ->
     %% Default should be set,protected
-    ?line EtsMem = etsmem(),
-    ?line Def = ets_new(def,[]),
-    ?line set = ets:info(Def,type),
-    ?line protected = ets:info(Def,protection),
+    EtsMem = etsmem(),
+    Def = ets_new(def,[]),
+    set = ets:info(Def,type),
+    protected = ets:info(Def,protection),
     Compressed = erlang:system_info(ets_always_compress),
-    ?line Compressed = ets:info(Def,compressed),
+    Compressed = ets:info(Def,compressed),
     Self = self(),
-    ?line Self = ets:info(Def,owner),
-    ?line none = ets:info(Def, heir),
-    ?line false = ets:info(Def,named_table),
-    ?line ets:delete(Def),
-    ?line verify_etsmem(EtsMem).
-
-select_fail(doc) ->
-    ["Test that select fails even if nothing can match"];
-select_fail(suite) ->
-    [];
+    Self = ets:info(Def,owner),
+    none = ets:info(Def, heir),
+    false = ets:info(Def,named_table),
+    ets:delete(Def),
+    verify_etsmem(EtsMem).
+
+%% Test that select fails even if nothing can match.
 select_fail(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     repeat_for_opts(select_fail_do, [all_types,write_concurrency]),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 select_fail_do(Opts) ->
-    ?line T = ets_new(x,Opts),
-    ?line ets:insert(T,{a,a}),
-    ?line case (catch 
-		    ets:select(T,[{{a,'_'},[],[{snuffla}]}])) of
-	      {'EXIT',{badarg,_}} ->
-		  ok;
-	      Else0 ->
-		  exit({type,ets:info(T,type),
-			expected,'EXIT',got,Else0})
-	  end,
-    ?line case (catch 
-		    ets:select(T,[{{b,'_'},[],[{snuffla}]}])) of
-	      {'EXIT',{badarg,_}} ->
-		  ok;
-	      Else1 ->
-		  exit({type,ets:info(T,type),
-			expected,'EXIT',got,Else1})
-	  end,
-    ?line ets:delete(T).
- 
+    T = ets_new(x,Opts),
+    ets:insert(T,{a,a}),
+    case (catch
+	      ets:select(T,[{{a,'_'},[],[{snuffla}]}])) of
+	{'EXIT',{badarg,_}} ->
+	    ok;
+	Else0 ->
+	    exit({type,ets:info(T,type),
+		  expected,'EXIT',got,Else0})
+    end,
+    case (catch
+	      ets:select(T,[{{b,'_'},[],[{snuffla}]}])) of
+	{'EXIT',{badarg,_}} ->
+	    ok;
+	Else1 ->
+	    exit({type,ets:info(T,type),
+		  expected,'EXIT',got,Else1})
+    end,
+    ets:delete(T).
+
 
 -define(S(T),ets:info(T,memory)).
 -define(TAB_STRUCT_SZ, erts_debug:get_internal_state('DbTable_words')).
@@ -619,218 +594,180 @@ select_fail_do(Opts) ->
 %% The hardcoded expected memory sizes (in words) are the ones we expect on:
 %%   SunOS5.8, 32-bit, non smp, private heap
 %%
-memory(doc) -> ["Whitebox test of ets:info(X,memory)"];
-memory(suite) -> [];
+
+%% Whitebox test of ets:info(X, memory).
 memory(Config) when is_list(Config) ->
-    ?line ok = chk_normal_tab_struct_size(),
+    ok = chk_normal_tab_struct_size(),
     repeat_for_opts(memory_do,[compressed]),
-    ?line catch erts_debug:set_internal_state(available_internal_state, false).
+    catch erts_debug:set_internal_state(available_internal_state, false).
 
 memory_do(Opts) ->
-    ?line L = [T1,T2,T3,T4] = fill_sets_int(1000,Opts),
+    L = [T1,T2,T3,T4] = fill_sets_int(1000,Opts),
     XR1 = case mem_mode(T1) of
-	    {normal,_} ->     {13836,13046,13046,13052}; %{13862,13072,13072,13078};
-	    {compressed,4} -> {11041,10251,10251,10252}; %{11067,10277,10277,10278};
-	    {compressed,8} -> {10050,9260,9260,9260} %{10076,9286,9286,9286}
+	      {normal,_} ->     {13836,13046,13046,13052}; %{13862,13072,13072,13078};
+	      {compressed,4} -> {11041,10251,10251,10252}; %{11067,10277,10277,10278};
+	      {compressed,8} -> {10050,9260,9260,9260} %{10076,9286,9286,9286}
 	  end,
-    ?line XRes1 = adjust_xmem(L, XR1),
-    ?line Res1 = {?S(T1),?S(T2),?S(T3),?S(T4)},
-    ?line lists:foreach(fun(T) ->
- 				Before = ets:info(T,size),
- 				Key = 2, %894, %%ets:first(T),
- 				Objs = ets:lookup(T,Key),
-				?line ets:delete(T,Key),
-				io:format("deleted key ~p from ~p changed size ~p to ~p: ~p\n",
-					  [Key, ets:info(T,type), Before, ets:info(T,size), Objs])
+    XRes1 = adjust_xmem(L, XR1),
+    Res1 = {?S(T1),?S(T2),?S(T3),?S(T4)},
+    lists:foreach(fun(T) ->
+			  Before = ets:info(T,size),
+			  Key = 2, %894, %%ets:first(T),
+			  Objs = ets:lookup(T,Key),
+			  ets:delete(T,Key),
+			  io:format("deleted key ~p from ~p changed size ~p to ~p: ~p\n",
+				    [Key, ets:info(T,type), Before, ets:info(T,size), Objs])
 		  end,
 		  L),
     XR2 = case mem_mode(T1) of
-	    {normal,_} ->     {13826,13037,13028,13034}; %{13852,13063,13054,13060};
-	    {compressed,4} -> {11031,10242,10233,10234}; %{11057,10268,10259,10260};
-	    {compressed,8} -> {10040,9251,9242,9242}     %10066,9277,9268,9268}
+	      {normal,_} ->     {13826,13037,13028,13034}; %{13852,13063,13054,13060};
+	      {compressed,4} -> {11031,10242,10233,10234}; %{11057,10268,10259,10260};
+	      {compressed,8} -> {10040,9251,9242,9242}     %10066,9277,9268,9268}
 	  end,
-    ?line XRes2 = adjust_xmem(L, XR2),
-    ?line Res2 = {?S(T1),?S(T2),?S(T3),?S(T4)},
-    ?line lists:foreach(fun(T) ->
- 				Before = ets:info(T,size),
- 				Key = 4, %802, %ets:first(T),
- 				Objs = ets:lookup(T,Key),
- 				?line ets:match_delete(T,{Key,'_'}),
-				io:format("match_deleted key ~p from ~p changed size ~p to ~p: ~p\n",
-					  [Key, ets:info(T,type), Before, ets:info(T,size), Objs])
-			end,
-			L),
+    XRes2 = adjust_xmem(L, XR2),
+    Res2 = {?S(T1),?S(T2),?S(T3),?S(T4)},
+    lists:foreach(fun(T) ->
+			  Before = ets:info(T,size),
+			  Key = 4, %802, %ets:first(T),
+			  Objs = ets:lookup(T,Key),
+			  ets:match_delete(T,{Key,'_'}),
+			  io:format("match_deleted key ~p from ~p changed size ~p to ~p: ~p\n",
+				    [Key, ets:info(T,type), Before, ets:info(T,size), Objs])
+		  end,
+		  L),
     XR3 = case mem_mode(T1) of
-		{normal,_} ->     {13816,13028,13010,13016}; %{13842,13054,13036,13042};
-		{compressed,4} -> {11021,10233,10215,10216}; %{11047,10259,10241,10242};
-		{compressed,8} -> {10030,9242,9224,9224} %{10056,9268,9250,9250}
+	      {normal,_} ->     {13816,13028,13010,13016}; %{13842,13054,13036,13042};
+	      {compressed,4} -> {11021,10233,10215,10216}; %{11047,10259,10241,10242};
+	      {compressed,8} -> {10030,9242,9224,9224} %{10056,9268,9250,9250}
 	  end,
-    ?line XRes3 = adjust_xmem(L, XR3),
-    ?line Res3 = {?S(T1),?S(T2),?S(T3),?S(T4)},
-    ?line lists:foreach(fun(T) ->
-			  ?line ets:delete_all_objects(T)
+    XRes3 = adjust_xmem(L, XR3),
+    Res3 = {?S(T1),?S(T2),?S(T3),?S(T4)},
+    lists:foreach(fun(T) ->
+			  ets:delete_all_objects(T)
 		  end,
 		  L),
-    ?line XRes4 = adjust_xmem(L, {50,260,260,260}), %{76,286,286,286}),
-    ?line Res4 = {?S(T1),?S(T2),?S(T3),?S(T4)},
+    XRes4 = adjust_xmem(L, {50,260,260,260}), %{76,286,286,286}),
+    Res4 = {?S(T1),?S(T2),?S(T3),?S(T4)},
     lists:foreach(fun(T) ->
-			  ?line ets:delete(T)
+			  ets:delete(T)
 		  end,
 		  L),
-    ?line L2 =  [T11,T12,T13,T14] = fill_sets_int(1000),
-    ?line lists:foreach(fun(T) ->
-			  ?line ets:select_delete(T,[{'_',[],[true]}])
+    L2 =  [T11,T12,T13,T14] = fill_sets_int(1000),
+    lists:foreach(fun(T) ->
+			  ets:select_delete(T,[{'_',[],[true]}])
 		  end,
 		  L2),
-    ?line XRes5 = adjust_xmem(L2, {50,260,260,260}), %{76,286,286,286}),
-    ?line Res5 = {?S(T11),?S(T12),?S(T13),?S(T14)},
-    ?line io:format("XRes1 = ~p~n"
-		    " Res1 = ~p~n~n"
-		    "XRes2 = ~p~n"
-		    " Res2 = ~p~n~n"
-		    "XRes3 = ~p~n"
-		    " Res3 = ~p~n~n"
-		    "XRes4 = ~p~n"
-		    " Res4 = ~p~n~n"
-		    "XRes5 = ~p~n"
-		    " Res5 = ~p~n~n",
-		    [XRes1, Res1,
-		     XRes2, Res2,
-		     XRes3, Res3,
-		     XRes4, Res4,
-		     XRes5, Res5]),
-    ?line XRes1 = Res1,
-    ?line XRes2 = Res2,
-    ?line XRes3 = Res3,
-    ?line XRes4 = Res4,
-    ?line XRes5 = Res5,
-    ?line ok.
+    XRes5 = adjust_xmem(L2, {50,260,260,260}), %{76,286,286,286}),
+    Res5 = {?S(T11),?S(T12),?S(T13),?S(T14)},
+    io:format("XRes1 = ~p~n"
+	      " Res1 = ~p~n~n"
+	      "XRes2 = ~p~n"
+	      " Res2 = ~p~n~n"
+	      "XRes3 = ~p~n"
+	      " Res3 = ~p~n~n"
+	      "XRes4 = ~p~n"
+	      " Res4 = ~p~n~n"
+	      "XRes5 = ~p~n"
+	      " Res5 = ~p~n~n",
+	      [XRes1, Res1,
+	       XRes2, Res2,
+	       XRes3, Res3,
+	       XRes4, Res4,
+	       XRes5, Res5]),
+    XRes1 = Res1,
+    XRes2 = Res2,
+    XRes3 = Res3,
+    XRes4 = Res4,
+    XRes5 = Res5,
+    ok.
 
 mem_mode(T) ->
     {case ets:info(T,compressed) of
-	true -> compressed;
-	false -> normal
+	 true -> compressed;
+	 false -> normal
      end,
      erlang:system_info(wordsize)}.
 
 chk_normal_tab_struct_size() ->
-    ?line System = {os:type(),
-		    os:version(),
-		    erlang:system_info(wordsize),
-		    erlang:system_info(smp_support),
-		    erlang:system_info(heap_type)},
-    ?line ?t:format("System = ~p~n", [System]),
-    %%?line ?t:format("?NORMAL_TAB_STRUCT_SZ=~p~n", [?NORMAL_TAB_STRUCT_SZ]),
-    ?line ?t:format("?TAB_STRUCT_SZ=~p~n", [?TAB_STRUCT_SZ]),
+    System = {os:type(),
+	      os:version(),
+	      erlang:system_info(wordsize),
+	      erlang:system_info(smp_support),
+	      erlang:system_info(heap_type)},
+    io:format("System = ~p~n", [System]),
+    io:format("?TAB_STRUCT_SZ=~p~n", [?TAB_STRUCT_SZ]),
     ok.
-%   ?line case System of
-%             {{unix, sunos}, {5, 8, 0}, 4, false, private} ->
-%       	  ?line ?NORMAL_TAB_STRUCT_SZ = ?TAB_STRUCT_SZ,
-%       	  ?line ok;
-%             _ ->
-%       	  ?line ok
-%         end.
-
--define(DB_TREE_STACK_NEED,50). % The static stack for a tree, in halfword pointers are two internal words
-                                % so the stack gets twice as big
--define(DB_HASH_SIZEOF_EXTSEG,260). % The segment size in words, in halfword this will be twice as large.
 
 adjust_xmem([T1,T2,T3,T4], {A0,B0,C0,D0} = _Mem0) ->
     %% Adjust for 64-bit, smp, and os:
     %%   Table struct size may differ.
 
-%   Mem1 = case ?TAB_STRUCT_SZ of
-%              ?NORMAL_TAB_STRUCT_SZ ->
-%       	   Mem0;
-%              TabStructSz ->
-%       	   TabDiff = TabStructSz - ?NORMAL_TAB_STRUCT_SZ,
-%       	   {A0+TabDiff, B0+TabDiff, C0+TabDiff, D0+TabDiff}
-%          end,
-
     TabDiff = ?TAB_STRUCT_SZ,
-    Mem1 = {A0+TabDiff, B0+TabDiff, C0+TabDiff, D0+TabDiff},
-
-    case {erlang:system_info({wordsize,internal}),erlang:system_info({wordsize,external})} of
-	%% Halfword, corrections for regular pointers occupying two internal words.
-	{4,8} ->
-	    {A1,B1,C1,D1} = Mem1,
-	    {A1+4*ets:info(T1, size)+?DB_TREE_STACK_NEED,
-	     B1+3*ets:info(T2, size)+?DB_HASH_SIZEOF_EXTSEG,
-	     C1+3*ets:info(T3, size)+?DB_HASH_SIZEOF_EXTSEG,
-	     D1+3*ets:info(T4, size)+?DB_HASH_SIZEOF_EXTSEG};
-	_ ->
-	    Mem1
-    end.
+    {A0+TabDiff, B0+TabDiff, C0+TabDiff, D0+TabDiff}.
 
-t_whitebox(doc) ->
-    ["Diverse whitebox testes"];
-t_whitebox(suite) ->
-    [];
+%% Misc. whitebox tests
 t_whitebox(Config) when is_list(Config) ->    
-    ?line EtsMem = etsmem(),
+    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),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 whitebox_1(Opts) ->
-    ?line T=ets_new(x,[bag | Opts]),
-    ?line ets:insert(T,[{du,glade},{ta,en}]),
-    ?line ets:insert(T,[{hej,hopp2},{du,glade2},{ta,en2}]),
-    ?line {_,C}=ets:match(T,{ta,'$1'},1),
-    ?line ets:select(C),
-    ?line ets:match(C),
-    ?line ets:delete(T),
+    T=ets_new(x,[bag | Opts]),
+    ets:insert(T,[{du,glade},{ta,en}]),
+    ets:insert(T,[{hej,hopp2},{du,glade2},{ta,en2}]),
+    {_,C}=ets:match(T,{ta,'$1'},1),
+    ets:select(C),
+    ets:match(C),
+    ets:delete(T),
     ok.
 
 whitebox_2(Opts) ->
-    ?line T=ets_new(x,[ordered_set, {keypos,2} | Opts]),
-    ?line T2=ets_new(x,[set, {keypos,2}| Opts]),
-    ?line 0 = ets:select_delete(T,[{{hej},[],[true]}]),
-    ?line 0 = ets:select_delete(T,[{{hej,hopp},[],[true]}]),
-    ?line 0 = ets:select_delete(T2,[{{hej},[],[true]}]),
-    ?line 0 = ets:select_delete(T2,[{{hej,hopp},[],[true]}]),
-    ?line ets:delete(T),
-    ?line ets:delete(T2),
+    T=ets_new(x,[ordered_set, {keypos,2} | Opts]),
+    T2=ets_new(x,[set, {keypos,2}| Opts]),
+    0 = ets:select_delete(T,[{{hej},[],[true]}]),
+    0 = ets:select_delete(T,[{{hej,hopp},[],[true]}]),
+    0 = ets:select_delete(T2,[{{hej},[],[true]}]),
+    0 = ets:select_delete(T2,[{{hej,hopp},[],[true]}]),
+    ets:delete(T),
+    ets:delete(T2),
     ok.
-    
-    
-t_ets_dets(doc) ->
-    ["Test ets:to/from_dets"];
-t_ets_dets(suite) ->
-    [];
+
+
+%% Test ets:to/from_dets.
 t_ets_dets(Config) when is_list(Config) ->
     repeat_for_opts(fun(Opts) -> t_ets_dets(Config,Opts) end).
 
 t_ets_dets(Config, Opts) ->
-    ?line Fname = gen_dets_filename(Config,1),
-    ?line (catch file:delete(Fname)),
-    ?line {ok,DTab} = dets:open_file(testdets_1,
+    Fname = gen_dets_filename(Config,1),
+    (catch file:delete(Fname)),
+    {ok,DTab} = dets:open_file(testdets_1,
 			       [{file, Fname}]),
-    ?line ETab = ets_new(x,Opts),
-    ?line filltabint(ETab,3000),
-    ?line DTab = ets:to_dets(ETab,DTab),
-    ?line ets:delete_all_objects(ETab),
-    ?line 0 = ets:info(ETab,size),
-    ?line true = ets:from_dets(ETab,DTab),
-    ?line 3000 = ets:info(ETab,size),
-    ?line ets:delete(ETab),
-    ?line check_badarg(catch ets:to_dets(ETab,DTab),
-		       ets, to_dets, [ETab,DTab]),
-    ?line check_badarg(catch ets:from_dets(ETab,DTab),
-		       ets, from_dets, [ETab,DTab]),
-    ?line ETab2 = ets_new(x,Opts),
-    ?line filltabint(ETab2,3000),
-    ?line dets:close(DTab),
-    ?line check_badarg(catch ets:to_dets(ETab2,DTab),
-		       ets, to_dets, [ETab2,DTab]),
-    ?line check_badarg(catch ets:from_dets(ETab2,DTab),
-		       ets, from_dets, [ETab2,DTab]),
-    ?line ets:delete(ETab2),
-    ?line (catch file:delete(Fname)),
+    ETab = ets_new(x,Opts),
+    filltabint(ETab,3000),
+    DTab = ets:to_dets(ETab,DTab),
+    ets:delete_all_objects(ETab),
+    0 = ets:info(ETab,size),
+    true = ets:from_dets(ETab,DTab),
+    3000 = ets:info(ETab,size),
+    ets:delete(ETab),
+    check_badarg(catch ets:to_dets(ETab,DTab),
+		 ets, to_dets, [ETab,DTab]),
+    check_badarg(catch ets:from_dets(ETab,DTab),
+		 ets, from_dets, [ETab,DTab]),
+    ETab2 = ets_new(x,Opts),
+    filltabint(ETab2,3000),
+    dets:close(DTab),
+    check_badarg(catch ets:to_dets(ETab2,DTab),
+		 ets, to_dets, [ETab2,DTab]),
+    check_badarg(catch ets:from_dets(ETab2,DTab),
+		 ets, from_dets, [ETab2,DTab]),
+    ets:delete(ETab2),
+    (catch file:delete(Fname)),
     ok.
 
 check_badarg({'EXIT', {badarg, [{M,F,Args,_} | _]}}, M, F, Args) ->
@@ -838,14 +775,11 @@ check_badarg({'EXIT', {badarg, [{M,F,Args,_} | _]}}, M, F, Args) ->
 check_badarg({'EXIT', {badarg, [{M,F,A,_} | _]}}, M, F, Args)  ->
     true = test_server:is_native(M) andalso length(Args) =:= A.
 
-t_delete_all_objects(doc) ->
-    ["Test ets:delete_all_objects/1"];
-t_delete_all_objects(suite) ->
-    [];
+%% Test ets:delete_all_objects/1.
 t_delete_all_objects(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     repeat_for_opts(t_delete_all_objects_do),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 get_kept_objects(T) ->
     case ets:info(T,stats) of
@@ -856,80 +790,77 @@ get_kept_objects(T) ->
     end.
 
 t_delete_all_objects_do(Opts) ->
-    ?line T=ets_new(x,Opts),
-    ?line filltabint(T,4000),
-    ?line O=ets:first(T),
-    ?line ets:next(T,O),
-    ?line ets:safe_fixtable(T,true),
-    ?line true = ets:delete_all_objects(T),
-    ?line '$end_of_table' = ets:next(T,O),
-    ?line 0 = ets:info(T,size),
-    ?line 4000 = get_kept_objects(T),
-    ?line ets:safe_fixtable(T,false),
-    ?line 0 = ets:info(T,size),
-    ?line 0 = get_kept_objects(T),
-    ?line filltabint(T,4000),
-    ?line 4000 = ets:info(T,size),
-    ?line true = ets:delete_all_objects(T),
-    ?line 0 = ets:info(T,size),
-    ?line ets:delete(T).
-
-
-t_delete_object(doc) ->
-    ["Test ets:delete_object/2"];
-t_delete_object(suite) ->
-    [];
+    T=ets_new(x,Opts),
+    filltabint(T,4000),
+    O=ets:first(T),
+    ets:next(T,O),
+    ets:safe_fixtable(T,true),
+    true = ets:delete_all_objects(T),
+    '$end_of_table' = ets:next(T,O),
+    0 = ets:info(T,size),
+    4000 = get_kept_objects(T),
+    ets:safe_fixtable(T,false),
+    0 = ets:info(T,size),
+    0 = get_kept_objects(T),
+    filltabint(T,4000),
+    4000 = ets:info(T,size),
+    true = ets:delete_all_objects(T),
+    0 = ets:info(T,size),
+    ets:delete(T).
+
+
+%% Test ets:delete_object/2.
 t_delete_object(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     repeat_for_opts(t_delete_object_do),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 t_delete_object_do(Opts) ->
-    ?line T = ets_new(x,Opts),
-    ?line filltabint(T,4000),
-    ?line del_one_by_one_set(T,1,4001),
-    ?line filltabint(T,4000),
-    ?line del_one_by_one_set(T,4000,0),
-    ?line filltabint(T,4000),
-    ?line First = ets:first(T),
-    ?line Next = ets:next(T,First),
-    ?line ets:safe_fixtable(T,true),
-    ?line ets:delete_object(T,{First, integer_to_list(First)}),
-    ?line Next = ets:next(T,First),
-    ?line 3999 = ets:info(T,size),
-    ?line 1 = get_kept_objects(T),
-    ?line ets:safe_fixtable(T,false),
-    ?line 3999 = ets:info(T,size),
-    ?line 0 = get_kept_objects(T),
-    ?line ets:delete(T),
-    ?line T1 = ets_new(x,[ordered_set | Opts]),
-    ?line filltabint(T1,4000),
-    ?line del_one_by_one_set(T1,1,4001),
-    ?line filltabint(T1,4000),
-    ?line del_one_by_one_set(T1,4000,0),
-    ?line ets:delete(T1),
-    ?line T2 = ets_new(x,[bag | Opts]),
-    ?line filltabint2(T2,4000),
-    ?line del_one_by_one_bag(T2,1,4001),
-    ?line filltabint2(T2,4000),
-    ?line del_one_by_one_bag(T2,4000,0),
-    ?line ets:delete(T2),
-    ?line T3 = ets_new(x,[duplicate_bag | Opts]),
-    ?line filltabint3(T3,4000),
-    ?line del_one_by_one_dbag_1(T3,1,4001),
-    ?line filltabint3(T3,4000),
-    ?line del_one_by_one_dbag_1(T3,4000,0),
-    ?line filltabint(T3,4000),
-    ?line filltabint3(T3,4000),
-    ?line del_one_by_one_dbag_2(T3,1,4001),
-    ?line filltabint(T3,4000),
-    ?line filltabint3(T3,4000),
-    ?line del_one_by_one_dbag_2(T3,4000,0),
-
-    ?line filltabint2(T3,4000),
-    ?line filltabint(T3,4000),
-    ?line del_one_by_one_dbag_3(T3,4000,0),
-    ?line ets:delete(T3),    
+    T = ets_new(x,Opts),
+    filltabint(T,4000),
+    del_one_by_one_set(T,1,4001),
+    filltabint(T,4000),
+    del_one_by_one_set(T,4000,0),
+    filltabint(T,4000),
+    First = ets:first(T),
+    Next = ets:next(T,First),
+    ets:safe_fixtable(T,true),
+    ets:delete_object(T,{First, integer_to_list(First)}),
+    Next = ets:next(T,First),
+    3999 = ets:info(T,size),
+    1 = get_kept_objects(T),
+    ets:safe_fixtable(T,false),
+    3999 = ets:info(T,size),
+    0 = get_kept_objects(T),
+    ets:delete(T),
+    T1 = ets_new(x,[ordered_set | Opts]),
+    filltabint(T1,4000),
+    del_one_by_one_set(T1,1,4001),
+    filltabint(T1,4000),
+    del_one_by_one_set(T1,4000,0),
+    ets:delete(T1),
+    T2 = ets_new(x,[bag | Opts]),
+    filltabint2(T2,4000),
+    del_one_by_one_bag(T2,1,4001),
+    filltabint2(T2,4000),
+    del_one_by_one_bag(T2,4000,0),
+    ets:delete(T2),
+    T3 = ets_new(x,[duplicate_bag | Opts]),
+    filltabint3(T3,4000),
+    del_one_by_one_dbag_1(T3,1,4001),
+    filltabint3(T3,4000),
+    del_one_by_one_dbag_1(T3,4000,0),
+    filltabint(T3,4000),
+    filltabint3(T3,4000),
+    del_one_by_one_dbag_2(T3,1,4001),
+    filltabint(T3,4000),
+    filltabint3(T3,4000),
+    del_one_by_one_dbag_2(T3,4000,0),
+
+    filltabint2(T3,4000),
+    filltabint(T3,4000),
+    del_one_by_one_dbag_3(T3,4000,0),
+    ets:delete(T3),
     ok.
 
 make_init_fun(N) when N > 4000->
@@ -951,21 +882,18 @@ make_init_fun(N) ->
 	    exit(close_not_expected)
     end.
 
-t_init_table(doc) ->
-    ["Test ets:init_table/2"];
-t_init_table(suite) ->
-    [];
+%% Test ets:init_table/2.
 t_init_table(Config) when is_list(Config)->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     repeat_for_opts(t_init_table_do),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 t_init_table_do(Opts) ->
-    ?line T = ets_new(x,[duplicate_bag | Opts]),
-    ?line filltabint(T,4000),
-    ?line ets:init_table(T, make_init_fun(1)),
-    ?line del_one_by_one_dbag_1(T,4000,0),
-    ?line ets:delete(T),
+    T = ets_new(x,[duplicate_bag | Opts]),
+    filltabint(T,4000),
+    ets:init_table(T, make_init_fun(1)),
+    del_one_by_one_dbag_1(T,4000,0),
+    ets:delete(T),
     ok.
 
 do_fill_dbag_using_lists(T,0) ->
@@ -976,132 +904,120 @@ do_fill_dbag_using_lists(T,N) ->
     do_fill_dbag_using_lists(T,N - 1). 
 
 
-t_insert_new(doc) ->
-    ["Test the insert_new function"];
-t_insert_new(suite) ->
-    [];
+%% Test the insert_new function.
 t_insert_new(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line L = fill_sets_int(1000) ++ fill_sets_int(1000,[{write_concurrency,true}]),
+    EtsMem = etsmem(),
+    L = fill_sets_int(1000) ++ fill_sets_int(1000,[{write_concurrency,true}]),
     lists:foreach(fun(Tab) ->
-			  ?line false = ets:insert_new(Tab,{2,"2"}),
-			  ?line true = ets:insert_new(Tab,{2002,"2002"}),
-			  ?line false = ets:insert_new(Tab,{2002,"2002"}),
-			  ?line true = ets:insert(Tab,{2002,"2002"}),
-			  ?line false =  ets:insert_new(Tab,[{2002,"2002"}]),
-			  ?line false =  ets:insert_new(Tab,[{2002,"2002"},
+			  false = ets:insert_new(Tab,{2,"2"}),
+			  true = ets:insert_new(Tab,{2002,"2002"}),
+			  false = ets:insert_new(Tab,{2002,"2002"}),
+			  true = ets:insert(Tab,{2002,"2002"}),
+			  false =  ets:insert_new(Tab,[{2002,"2002"}]),
+			  false =  ets:insert_new(Tab,[{2002,"2002"},
 						       {2003,"2003"}]),
-			  ?line false =  ets:insert_new(Tab,[{2001,"2001"},
+			  false =  ets:insert_new(Tab,[{2001,"2001"},
 						       {2002,"2002"},
 						       {2003,"2003"}]),
-			  ?line false =  ets:insert_new(Tab,[{2001,"2001"},
+			  false =  ets:insert_new(Tab,[{2001,"2001"},
 						       {2002,"2002"}]),
-			  ?line true =  ets:insert_new(Tab,[{2001,"2001"},
+			  true =  ets:insert_new(Tab,[{2001,"2001"},
 						      {2003,"2003"}]),
-			  ?line false = ets:insert_new(Tab,{2001,"2001"}),
-			  ?line false = ets:insert_new(Tab,{2002,"2002"}),
-			  ?line false = ets:insert_new(Tab,{2003,"2003"}),
-			  ?line true = ets:insert_new(Tab,{2004,"2004"}),
-			  ?line true = ets:insert_new(Tab,{2000,"2000"}),
-			  ?line true = ets:insert_new(Tab,[{2005,"2005"},
-							   {2006,"2006"},
-							   {2007,"2007"}]),
-			  ?line Num = 
+			  false = ets:insert_new(Tab,{2001,"2001"}),
+			  false = ets:insert_new(Tab,{2002,"2002"}),
+			  false = ets:insert_new(Tab,{2003,"2003"}),
+			  true = ets:insert_new(Tab,{2004,"2004"}),
+			  true = ets:insert_new(Tab,{2000,"2000"}),
+			  true = ets:insert_new(Tab,[{2005,"2005"},
+						     {2006,"2006"},
+						     {2007,"2007"}]),
+			  Num =
 			      case ets:info(Tab,type) of
 				  bag ->
-				      ?line true = 
+				      true =
 					  ets:insert(Tab,{2004,"2004-2"}),
-				      ?line false = 
+				      false =
 					  ets:insert_new(Tab,{2004,"2004-3"}),
 				      1009;
 				  duplicate_bag ->
-				      ?line true = 
+				      true =
 					  ets:insert(Tab,{2004,"2004"}),
-				      ?line false = 
+				      false =
 					  ets:insert_new(Tab,{2004,"2004"}),
 				      1010;
 				  _ ->
 				      1008
 			      end,
-			  ?line Num = ets:info(Tab,size),
-			  ?line List = ets:tab2list(Tab),
-			  ?line ets:delete_all_objects(Tab),
-			  ?line true = ets:insert_new(Tab,List),
-			  ?line false = ets:insert_new(Tab,List),
-			  ?line ets:delete(Tab)
+			  Num = ets:info(Tab,size),
+			  List = ets:tab2list(Tab),
+			  ets:delete_all_objects(Tab),
+			  true = ets:insert_new(Tab,List),
+			  false = ets:insert_new(Tab,List),
+			  ets:delete(Tab)
 		  end,
 		  L),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
-t_insert_list(doc) ->
-    ["Test ets:insert/2 with list of objects."];
-t_insert_list(suite) ->
-    [];
+%% Test ets:insert/2 with list of objects.
 t_insert_list(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     repeat_for_opts(t_insert_list_do),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 t_insert_list_do(Opts) ->
-    ?line T = ets_new(x,[duplicate_bag | Opts]),
-    ?line do_fill_dbag_using_lists(T,4000),
-    ?line del_one_by_one_dbag_2(T,4000,0),
-    ?line ets:delete(T).
+    T = ets_new(x,[duplicate_bag | Opts]),
+    do_fill_dbag_using_lists(T,4000),
+    del_one_by_one_dbag_2(T,4000,0),
+    ets:delete(T).
 
 
-t_test_ms(doc) ->
-    ["Test interface of ets:test_ms/2"];
-t_test_ms(suite) ->
-    [];
+%% Test interface of ets:test_ms/2.
 t_test_ms(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line {ok,[a,b]} = ets:test_ms({a,b},
-				   [{{'$1','$2'},[{'<','$1','$2'}],['$$']}]),
-    ?line {ok,false} = ets:test_ms({a,b},
-				   [{{'$1','$2'},[{'>','$1','$2'}],['$$']}]),
+    EtsMem = etsmem(),
+    {ok,[a,b]} = ets:test_ms({a,b},
+			     [{{'$1','$2'},[{'<','$1','$2'}],['$$']}]),
+    {ok,false} = ets:test_ms({a,b},
+			     [{{'$1','$2'},[{'>','$1','$2'}],['$$']}]),
     Tpl = {a,gb_sets:new()},
-    ?line {ok,Tpl} = ets:test_ms(Tpl, [{{'_','_'},  [], ['$_']}]), % OTP-10190
-    ?line {error,[{error,String}]} = ets:test_ms({a,b},
-						 [{{'$1','$2'},
-						   [{'flurp','$1','$2'}],
-						   ['$$']}]),
-    ?line true = (if is_list(String) -> true; true -> false end),
-    ?line verify_etsmem(EtsMem).
-
-t_select_reverse(doc) ->
-    ["Test the select reverse BIF's"];
-t_select_reverse(suite) ->
-    [];
+    {ok,Tpl} = ets:test_ms(Tpl, [{{'_','_'},  [], ['$_']}]), % OTP-10190
+    {error,[{error,String}]} = ets:test_ms({a,b},
+					   [{{'$1','$2'},
+					     [{'flurp','$1','$2'}],
+					     ['$$']}]),
+    true = (if is_list(String) -> true; true -> false end),
+    verify_etsmem(EtsMem).
+
+%% Test the select reverse BIFs.
 t_select_reverse(Config) when is_list(Config) ->
-    ?line Table = ets_new(xxx, [ordered_set]),
-    ?line filltabint(Table,1000),
-    ?line A = lists:reverse(ets:select(Table,[{{'$1', '_'},
+    Table = ets_new(xxx, [ordered_set]),
+    filltabint(Table,1000),
+    A = lists:reverse(ets:select(Table,[{{'$1', '_'},
 					 [{'>',
 					   {'rem',
 					    '$1', 5},
 					   2}],
 					 ['$_']}])),
-    ?line A = ets:select_reverse(Table,[{{'$1', '_'},
+    A = ets:select_reverse(Table,[{{'$1', '_'},
 				   [{'>',
 				     {'rem',
 				      '$1', 5},
 				     2}],
 				   ['$_']}]),
-    ?line A = reverse_chunked(Table,[{{'$1', '_'},
-				   [{'>',
-				     {'rem',
-				      '$1', 5},
-				     2}],
-				   ['$_']}],3),
-    % A set/bag/duplicate_bag should get the same result regardless
-    % of select or select_reverse
-    ?line Table2 = ets_new(xxx, [set]),
-    ?line filltabint(Table2,1000),
-    ?line Table3 = ets_new(xxx, [bag]),
-    ?line filltabint(Table3,1000),
-    ?line Table4 = ets_new(xxx, [duplicate_bag]),
-    ?line filltabint(Table4,1000),
-    ?line lists:map(fun(Tab) ->
+    A = reverse_chunked(Table,[{{'$1', '_'},
+				[{'>',
+				  {'rem',
+				   '$1', 5},
+				  2}],
+				['$_']}],3),
+    %% A set/bag/duplicate_bag should get the same result regardless
+    %% of select or select_reverse
+    Table2 = ets_new(xxx, [set]),
+    filltabint(Table2,1000),
+    Table3 = ets_new(xxx, [bag]),
+    filltabint(Table3,1000),
+    Table4 = ets_new(xxx, [duplicate_bag]),
+    filltabint(Table4,1000),
+    lists:map(fun(Tab) ->
 		      B = ets:select(Tab,[{{'$1', '_'},
 					   [{'>',
 					     {'rem',
@@ -1129,52 +1045,49 @@ do_reverse_chunked({L,C},Acc) ->
     do_reverse_chunked(ets:select_reverse(C), NewAcc).
 
 
-t_select_delete(doc) ->
-    ["Test the ets:select_delete/2 and ets:select_count/2 BIF's"];
-t_select_delete(suite) ->
-    [];
+%% Test the ets:select_delete/2 and ets:select_count/2 BIFs.
 t_select_delete(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line Tables = fill_sets_int(10000) ++ fill_sets_int(10000,[{write_concurrency,true}]),
+    EtsMem = etsmem(),
+    Tables = fill_sets_int(10000) ++ fill_sets_int(10000,[{write_concurrency,true}]),
     lists:foreach
       (fun(Table) ->
-	       ?line 4000 = ets:select_count(Table,[{{'$1', '_'},
-						     [{'>', 
-						       {'rem', 
-							'$1', 5}, 
-						       2}],
-						     [true]}]),
-	       ?line 4000 = ets:select_delete(Table,[{{'$1', '_'},
-						      [{'>', 
-							{'rem', 
-							 '$1', 5}, 
-							2}],
-						      [true]}]),
-	       ?line check(Table,
-			   fun({N,_}) when (N rem 5) =< 2 ->
-				   true;
-			      (_) ->
-				   false
-			   end,
-			   6000)
+	       4000 = ets:select_count(Table,[{{'$1', '_'},
+					       [{'>',
+						 {'rem',
+						  '$1', 5},
+						 2}],
+					       [true]}]),
+	       4000 = ets:select_delete(Table,[{{'$1', '_'},
+						[{'>',
+						  {'rem',
+						   '$1', 5},
+						  2}],
+						[true]}]),
+	       check(Table,
+		     fun({N,_}) when (N rem 5) =< 2 ->
+			     true;
+			(_) ->
+			     false
+		     end,
+		     6000)
 
        end,
        Tables),
     lists:foreach
       (fun(Table) ->
-	       ?line ets:select_delete(Table,[{'_',[],[true]}]),
-	       ?line xfilltabint(Table,4000),
-	       ?line successive_delete(Table,1,4001,bound),
-	       ?line 0 = ets:info(Table,size),
-	       ?line xfilltabint(Table,4000),
-	       ?line successive_delete(Table,4000,0, bound),
-	       ?line 0 = ets:info(Table,size),
-	       ?line xfilltabint(Table,4000),
-	       ?line successive_delete(Table,1,4001,unbound),
-	       ?line 0 = ets:info(Table,size),
-	       ?line xfilltabint(Table,4000),
-	       ?line successive_delete(Table,4000,0, unbound),
-	       ?line 0 = ets:info(Table,size)
+	       ets:select_delete(Table,[{'_',[],[true]}]),
+	       xfilltabint(Table,4000),
+	       successive_delete(Table,1,4001,bound),
+	       0 = ets:info(Table,size),
+	       xfilltabint(Table,4000),
+	       successive_delete(Table,4000,0, bound),
+	       0 = ets:info(Table,size),
+	       xfilltabint(Table,4000),
+	       successive_delete(Table,1,4001,unbound),
+	       0 = ets:info(Table,size),
+	       xfilltabint(Table,4000),
+	       successive_delete(Table,4000,0, unbound),
+	       0 = ets:info(Table,size)
 
        end,
        Tables),
@@ -1186,167 +1099,157 @@ t_select_delete(Config) when is_list(Config) ->
 		       _ -> 
 			   1
 		   end,
- 	       ?line xfilltabstr(Table, 4000),
-	       ?line 1000 = ets:select_count(Table,
-					     [{{[$3 | '$1'], '_'},
-					       [{'==',
-						 {'length', '$1'},
-						 3}],[true]}]) div F,
-	       ?line 1000 = ets:select_delete(Table,
-					      [{{[$3 | '$1'], '_'},
-						[{'==',
-						  {'length', '$1'},
-						  3}],[true]}]) div F,
-	       ?line check(Table, fun({[3,_,_,_],_}) -> false;
-				     (_) -> true
-				  end, 3000*F),
-	       ?line 8 = ets:select_count(Table,
-					  [{{"7",'_'},[],[false]},
-					   {{['_'], '_'},
-					    [],[true]}]) div F,
-	       ?line 8 = ets:select_delete(Table,
-					   [{{"7",'_'},[],[false]},
-					    {{['_'], '_'},
-					     [],[true]}]) div F,
-	       ?line check(Table, fun({"7",_}) -> true;
-				     ({[_],_}) -> false;
-				     (_) -> true
-				  end, 2992*F),
-	       ?line xfilltabstr(Table, 4000),
+	       xfilltabstr(Table, 4000),
+	       1000 = ets:select_count(Table,
+				       [{{[$3 | '$1'], '_'},
+					 [{'==',
+					   {'length', '$1'},
+					   3}],[true]}]) div F,
+	       1000 = ets:select_delete(Table,
+					[{{[$3 | '$1'], '_'},
+					  [{'==',
+					    {'length', '$1'},
+					    3}],[true]}]) div F,
+	       check(Table, fun({[3,_,_,_],_}) -> false;
+			       (_) -> true
+			    end, 3000*F),
+	       8 = ets:select_count(Table,
+				    [{{"7",'_'},[],[false]},
+				     {{['_'], '_'},
+				      [],[true]}]) div F,
+	       8 = ets:select_delete(Table,
+				     [{{"7",'_'},[],[false]},
+				      {{['_'], '_'},
+				       [],[true]}]) div F,
+	       check(Table, fun({"7",_}) -> true;
+			       ({[_],_}) -> false;
+			       (_) -> true
+			    end, 2992*F),
+	       xfilltabstr(Table, 4000),
 	       %% This happens to be interesting for other select types too
-	       ?line 200 = length(ets:select(Table,
-					     [{{[$3,'_','_'],'_'},
-					       [],[true]},
-					      {{[$1,'_','_'],'_'},
-					       [],[true]}])) div F,
-	       ?line 200 = ets:select_count(Table,
-					    [{{[$3,'_','_'],'_'},
-					      [],[true]},
-					     {{[$1,'_','_'],'_'},
-					      [],[true]}]) div F,
-	       ?line 200 = length(element(1,ets:select(Table,
-						       [{{[$3,'_','_'],'_'},
-							 [],[true]},
-							{{[$1,'_','_'],'_'},
-							 [],[true]}],
-						       1000))) div F,
-	       ?line 200 = length(
-			     ets:select_reverse(Table,
-						[{{[$3,'_','_'],'_'},
-						  [],[true]},
-						 {{[$1,'_','_'],'_'},
-						  [],[true]}])) div F,
-	       ?line 200 = length(
-			     element(1,
-				     ets:select_reverse
-				     (Table,
+	       200 = length(ets:select(Table,
+				       [{{[$3,'_','_'],'_'},
+					 [],[true]},
+					{{[$1,'_','_'],'_'},
+					 [],[true]}])) div F,
+	       200 = ets:select_count(Table,
 				      [{{[$3,'_','_'],'_'},
 					[],[true]},
 				       {{[$1,'_','_'],'_'},
-					[],[true]}],
-				      1000))) div F,
-	       ?line 200 = ets:select_delete(Table,
-					     [{{[$3,'_','_'],'_'},
-					       [],[true]},
-					      {{[$1,'_','_'],'_'},
-					       [],[true]}]) div F,
-	       ?line 0 = ets:select_count(Table,
+					[],[true]}]) div F,
+	       200 = length(element(1,ets:select(Table,
+						 [{{[$3,'_','_'],'_'},
+						   [],[true]},
+						  {{[$1,'_','_'],'_'},
+						   [],[true]}],
+						 1000))) div F,
+	       200 = length(
+		       ets:select_reverse(Table,
 					  [{{[$3,'_','_'],'_'},
 					    [],[true]},
 					   {{[$1,'_','_'],'_'},
-					    [],[true]}]) div F,
-	       ?line check(Table, fun({[$3,_,_],_}) -> false;
-				     ({[$1,_,_],_}) -> false;
-				     (_) -> true
-				  end, 3800*F)
+					    [],[true]}])) div F,
+	       200 = length(
+		       element(1,
+			       ets:select_reverse
+				 (Table,
+				  [{{[$3,'_','_'],'_'},
+				    [],[true]},
+				   {{[$1,'_','_'],'_'},
+				    [],[true]}],
+				  1000))) div F,
+	       200 = ets:select_delete(Table,
+				       [{{[$3,'_','_'],'_'},
+					 [],[true]},
+					{{[$1,'_','_'],'_'},
+					 [],[true]}]) div F,
+	       0 = ets:select_count(Table,
+				    [{{[$3,'_','_'],'_'},
+				      [],[true]},
+				     {{[$1,'_','_'],'_'},
+				      [],[true]}]) div F,
+	       check(Table, fun({[$3,_,_],_}) -> false;
+			       ({[$1,_,_],_}) -> false;
+			       (_) -> true
+			    end, 3800*F)
        end,
        Tables),
     lists:foreach(fun(Tab) -> ets:delete(Tab) end,Tables),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
-partly_bound(doc) ->
-    ["Test that partly bound keys gives faster matches"];
-partly_bound(suite) ->
-    [];
+%% Test that partly bound keys gives faster matches.
 partly_bound(Config) when is_list(Config) ->
     case os:type() of
 	{win32,_} ->
 	    {skip,"Inaccurate measurements on Windows"};
 	_ ->
-	    ?line EtsMem = etsmem(),
-	    ?line dont_make_worse(),
-	    ?line make_better(),
-	    ?line verify_etsmem(EtsMem)
+	    EtsMem = etsmem(),
+	    dont_make_worse(),
+	    make_better(),
+	    verify_etsmem(EtsMem)
     end.
 
 dont_make_worse() ->
     seventyfive_percent_success({?MODULE,dont_make_worse_sub,[]},0,0,10).
 
 dont_make_worse_sub() ->
-    ?line T = build_table([a,b],[a,b],15000),
-    ?line T1 = time_match_object(T,{'_',a,a,1500}, [{{a,a,1500},a,a,1500}]),
-    ?line T2 = time_match_object(T,{{a,a,'_'},a,a,1500}, 
-				 [{{a,a,1500},a,a,1500}]),
-    ?line ets:delete(T),
-    ?line true = (T1 > T2),
+    T = build_table([a,b],[a,b],15000),
+    T1 = time_match_object(T,{'_',a,a,1500}, [{{a,a,1500},a,a,1500}]),
+    T2 = time_match_object(T,{{a,a,'_'},a,a,1500},
+			   [{{a,a,1500},a,a,1500}]),
+    ets:delete(T),
+    true = (T1 > T2),
     ok.
-    
+
 make_better() ->
     fifty_percent_success({?MODULE,make_better_sub2,[]},0,0,10),
     fifty_percent_success({?MODULE,make_better_sub1,[]},0,0,10).
 make_better_sub1() ->
-    ?line T = build_table2([a,b],[a,b],15000),
-    ?line T1 = time_match_object(T,{'_',1500,a,a}, [{{1500,a,a},1500,a,a}]),
-    ?line T2 = time_match_object(T,{{1500,a,'_'},1500,a,a}, 
-				 [{{1500,a,a},1500,a,a}]),
-    ?line ets:delete(T),
-    ?line io:format("~p>~p~n",[(T1 / 100),T2]),
-    ?line true = ((T1 / 100) > T2), % More marginal than needed.
+    T = build_table2([a,b],[a,b],15000),
+    T1 = time_match_object(T,{'_',1500,a,a}, [{{1500,a,a},1500,a,a}]),
+    T2 = time_match_object(T,{{1500,a,'_'},1500,a,a},
+			   [{{1500,a,a},1500,a,a}]),
+    ets:delete(T),
+    io:format("~p>~p~n",[(T1 / 100),T2]),
+    true = ((T1 / 100) > T2), % More marginal than needed.
     ok.
 
 make_better_sub2() ->
-    ?line T = build_table2([a,b],[a,b],15000),
-    ?line T1 = time_match(T,{'$1',1500,a,a}),
-    ?line T2 = time_match(T,{{1500,a,'$1'},1500,a,a}),
-    ?line ets:delete(T),
-    ?line io:format("~p>~p~n",[(T1 / 100),T2]),
-    ?line true = ((T1 / 100) > T2), % More marginal than needed.
+    T = build_table2([a,b],[a,b],15000),
+    T1 = time_match(T,{'$1',1500,a,a}),
+    T2 = time_match(T,{{1500,a,'$1'},1500,a,a}),
+    ets:delete(T),
+    io:format("~p>~p~n",[(T1 / 100),T2]),
+    true = ((T1 / 100) > T2), % More marginal than needed.
     ok.
 
 
-match_heavy(doc) ->
-    ["Heavy random matching, comparing set with ordered_set."];
-match_heavy(suite) ->
-    [];
+%% Heavy random matching, comparing set with ordered_set.
 match_heavy(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir,Config),
-    DataDir = ?config(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir,Config),
+    DataDir = proplists:get_value(data_dir, Config),
     %% Easier to have in process dictionary when manually
     %% running the test function.
     put(where_to_read,DataDir),
     put(where_to_write,PrivDir),
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),    
-    NewDog=test_server:timetrap(test_server:seconds(1000)),
-    NewConfig = [{watchdog, NewDog} | lists:keydelete(watchdog,1,Config)],
     random_test(),
     drop_match(),
-    NewConfig.
+    ok.
 
 %%% Extra safety for the very low probability that this is not
 %%% caught by the random test (Statistically impossible???) 
 drop_match() ->
-    ?line EtsMem = etsmem(),
-    ?line T = build_table([a,b],[a],1500),
-    ?line [{{a,a,1},a,a,1},{{b,a,1},b,a,1}] = 
+    EtsMem = etsmem(),
+    T = build_table([a,b],[a],1500),
+    [{{a,a,1},a,a,1},{{b,a,1},b,a,1}] =
 	ets:match_object(T, {'_','_','_',1}),
-    ?line true = ets:delete(T),
-    ?line verify_etsmem(EtsMem).
+    true = ets:delete(T),
+    verify_etsmem(EtsMem).
 
 
 
 ets_match(Tab,Expr) ->
-    case random:uniform(2) of
+    case rand:uniform(2) of
 	1 ->
 	    ets:match(Tab,Expr);
 	_ ->
@@ -1355,14 +1258,14 @@ ets_match(Tab,Expr) ->
 
 match_chunked(Tab,Expr) ->
     match_chunked_collect(ets:match(Tab,Expr,
-				    random:uniform(1999) + 1)).
+				    rand:uniform(1999) + 1)).
 match_chunked_collect('$end_of_table') ->
     [];
 match_chunked_collect({Results, Continuation}) ->
     Results ++ match_chunked_collect(ets:match(Continuation)).
 
 ets_match_object(Tab,Expr) ->
-    case random:uniform(2) of
+    case rand:uniform(2) of
 	1 ->
 	    ets:match_object(Tab,Expr);
 	_ ->
@@ -1371,176 +1274,172 @@ ets_match_object(Tab,Expr) ->
 
 match_object_chunked(Tab,Expr) ->
     match_object_chunked_collect(ets:match_object(Tab,Expr,
-						  random:uniform(1999) + 1)).
+						  rand:uniform(1999) + 1)).
 match_object_chunked_collect('$end_of_table') ->
     [];
 match_object_chunked_collect({Results, Continuation}) ->
     Results ++ match_object_chunked_collect(ets:match_object(Continuation)).
 
 
-    
+
 random_test() ->
-    ?line ReadDir = get(where_to_read),
-    ?line WriteDir = get(where_to_write),
-    ?line (catch file:make_dir(WriteDir)),
-    ?line Seed = case file:consult(filename:join([ReadDir, 
-					    "preset_random_seed.txt"])) of
-	       {ok,[X]} ->
-		   X;
-	       _ ->
-		   {A,B,C} = erlang:timestamp(),
-		   random:seed(A,B,C),
-		   get(random_seed)
-	   end,
-    put(random_seed,Seed),
-    ?line {ok, F} = file:open(filename:join([WriteDir, 
-					     "last_random_seed.txt"]), 
-			      [write]),
+    ReadDir = get(where_to_read),
+    WriteDir = get(where_to_write),
+    (catch file:make_dir(WriteDir)),
+    case file:consult(filename:join([ReadDir,"preset_random_seed.txt"])) of
+	{ok,[X]} ->
+	    rand:seed(X);
+	_ ->
+	    rand:seed(exsplus)
+    end,
+    Seed = rand:export_seed(),
+    {ok,F} = file:open(filename:join([WriteDir,"last_random_seed.txt"]),
+		       [write]),
     io:format(F,"~p. ~n",[Seed]),
     file:close(F),
     io:format("Random seed ~p written to ~s, copy to ~s to rerun with "
 	      "same seed.",[Seed, 
 			    filename:join([WriteDir, "last_random_seed.txt"]),
 			    filename:join([ReadDir, 
-					    "preset_random_seed.txt"])]),
+					   "preset_random_seed.txt"])]),
     do_random_test().
 
 do_random_test() ->
-    ?line EtsMem = etsmem(),
-    ?line OrdSet = ets_new(xxx,[ordered_set]),
-    ?line Set = ets_new(xxx,[]),
-    ?line do_n_times(fun() ->
-		       ?line Key = create_random_string(25),
-		       ?line Value = create_random_tuple(25),
-		       ?line ets:insert(OrdSet,{Key,Value}),
-		       ?line ets:insert(Set,{Key,Value})
+    EtsMem = etsmem(),
+    OrdSet = ets_new(xxx,[ordered_set]),
+    Set = ets_new(xxx,[]),
+    do_n_times(fun() ->
+		       Key = create_random_string(25),
+		       Value = create_random_tuple(25),
+		       ets:insert(OrdSet,{Key,Value}),
+		       ets:insert(Set,{Key,Value})
 	       end, 5000),
-    ?line io:format("~nData inserted~n"),
-    ?line do_n_times(fun() ->
-		       ?line I = random:uniform(25),
-		       ?line Key = create_random_string(I) ++ '_',
-		       ?line L1 = ets_match_object(OrdSet,{Key,'_'}),
-		       ?line L2 = lists:sort(ets_match_object(Set,{Key,'_'})),
+    io:format("~nData inserted~n"),
+    do_n_times(fun() ->
+		       I = rand:uniform(25),
+		       Key = create_random_string(I) ++ '_',
+		       L1 = ets_match_object(OrdSet,{Key,'_'}),
+		       L2 = lists:sort(ets_match_object(Set,{Key,'_'})),
 		       case L1 == L2 of
 			   false ->
 			       io:format("~p != ~p~n",
 					 [L1,L2]),
-			       ?line exit({not_eq, L1, L2});
+			       exit({not_eq, L1, L2});
 			   true ->
 			       ok
 		       end
 	       end,
 	       2000),
-    ?line io:format("~nData matched~n"),
-    ?line ets:match_delete(OrdSet,'_'),
-    ?line ets:match_delete(Set,'_'),
-    ?line do_n_times(fun() ->
-		       ?line Value = create_random_string(25),
-		       ?line Key = create_random_tuple(25),
-		       ?line ets:insert(OrdSet,{Key,Value}),
-		       ?line ets:insert(Set,{Key,Value})
+    io:format("~nData matched~n"),
+    ets:match_delete(OrdSet,'_'),
+    ets:match_delete(Set,'_'),
+    do_n_times(fun() ->
+		       Value = create_random_string(25),
+		       Key = create_random_tuple(25),
+		       ets:insert(OrdSet,{Key,Value}),
+		       ets:insert(Set,{Key,Value})
 	       end, 2000),
-    ?line io:format("~nData inserted~n"),
+    io:format("~nData inserted~n"),
     (fun() ->
-	     ?line Key = list_to_tuple(lists:duplicate(25,'_')),
-	     ?line L1 = ets_match_object(OrdSet,{Key,'_'}),
-	     ?line L2 = lists:sort(ets_match_object(Set,{Key,'_'})),
-	     ?line 2000 = length(L1),
+	     Key = list_to_tuple(lists:duplicate(25,'_')),
+	     L1 = ets_match_object(OrdSet,{Key,'_'}),
+	     L2 = lists:sort(ets_match_object(Set,{Key,'_'})),
+	     2000 = length(L1),
 	     case L1 == L2 of
 		 false ->
 		     io:format("~p != ~p~n",
 			       [L1,L2]),
-		     ?line exit({not_eq, L1, L2});
+		     exit({not_eq, L1, L2});
 		 true ->
 		     ok
 	     end
      end)(),
     (fun() ->
-	     ?line Key = {'$1','$2','$3','$4',
-			  '$5','$6','$7','$8',
-			  '$9','$10','$11','$12',
-			  '$13','$14','$15','$16',
-			  '$17','$18','$19','$20',
-			  '$21','$22','$23','$24',
-			  '$25'},
-	     ?line L1 = ets_match_object(OrdSet,{Key,'_'}),
-	     ?line L2 = lists:sort(ets_match_object(Set,{Key,'_'})),
-	     ?line 2000 = length(L1),
+	     Key = {'$1','$2','$3','$4',
+		    '$5','$6','$7','$8',
+		    '$9','$10','$11','$12',
+		    '$13','$14','$15','$16',
+		    '$17','$18','$19','$20',
+		    '$21','$22','$23','$24',
+		    '$25'},
+	     L1 = ets_match_object(OrdSet,{Key,'_'}),
+	     L2 = lists:sort(ets_match_object(Set,{Key,'_'})),
+	     2000 = length(L1),
 	     case L1 == L2 of
 		 false ->
 		     io:format("~p != ~p~n",
 			       [L1,L2]),
-		     ?line exit({not_eq, L1, L2});
+		     exit({not_eq, L1, L2});
 		 true ->
 		     ok
 	     end
      end)(),
     (fun() ->
-	     ?line Key = {'$1','$2','$3','$4',
-			  '$5','$6','$7','$8',
-			  '$9','$10','$11','$12',
-			  '$13','$14','$15','$16',
-			  '$17','$18','$19','$20',
-			  '$21','$22','$23','$24',
-			  '$25'},
-	     ?line L1 = ets_match(OrdSet,{Key,'_'}),
-	     ?line L2 = lists:sort(ets_match(Set,{Key,'_'})),
-	     ?line 2000 = length(L1),
+	     Key = {'$1','$2','$3','$4',
+		    '$5','$6','$7','$8',
+		    '$9','$10','$11','$12',
+		    '$13','$14','$15','$16',
+		    '$17','$18','$19','$20',
+		    '$21','$22','$23','$24',
+		    '$25'},
+	     L1 = ets_match(OrdSet,{Key,'_'}),
+	     L2 = lists:sort(ets_match(Set,{Key,'_'})),
+	     2000 = length(L1),
 	     case L1 == L2 of
 		 false ->
 		     io:format("~p != ~p~n",
 			       [L1,L2]),
-		     ?line exit({not_eq, L1, L2});
+		     exit({not_eq, L1, L2});
 		 true ->
 		     ok
 	     end
      end)(),
-    ?line ets:match_delete(OrdSet,'_'),
-    ?line ets:match_delete(Set,'_'),
-    ?line do_n_times(fun() ->
-		       ?line Value = create_random_string(25),
-		       ?line Key = create_random_tuple(25),
-		       ?line ets:insert(OrdSet,{Key,Value}),
-		       ?line ets:insert(Set,{Key,Value})
+    ets:match_delete(OrdSet,'_'),
+    ets:match_delete(Set,'_'),
+    do_n_times(fun() ->
+		       Value = create_random_string(25),
+		       Key = create_random_tuple(25),
+		       ets:insert(OrdSet,{Key,Value}),
+		       ets:insert(Set,{Key,Value})
 	       end, 2000),
-    ?line io:format("~nData inserted~n"),
+    io:format("~nData inserted~n"),
     do_n_times(fun() ->
-		       ?line Key = create_partly_bound_tuple(25),
-		       ?line L1 = ets_match_object(OrdSet,{Key,'_'}),
-		       ?line L2 = lists:sort(ets_match_object(Set,{Key,'_'})),
+		       Key = create_partly_bound_tuple(25),
+		       L1 = ets_match_object(OrdSet,{Key,'_'}),
+		       L2 = lists:sort(ets_match_object(Set,{Key,'_'})),
 		       case L1 == L2 of
 			   false ->
 			       io:format("~p != ~p~n",
 					 [L1,L2]),
-			       ?line exit({not_eq, L1, L2});
+			       exit({not_eq, L1, L2});
 			   true ->
 			       ok
 		       end
 	       end,
 	       2000),
-    ?line do_n_times(fun() ->
-		       ?line Key = create_partly_bound_tuple2(25),
-		       ?line L1 = ets_match_object(OrdSet,{Key,'_'}),
-		       ?line L2 = lists:sort(ets_match_object(Set,{Key,'_'})),
+    do_n_times(fun() ->
+		       Key = create_partly_bound_tuple2(25),
+		       L1 = ets_match_object(OrdSet,{Key,'_'}),
+		       L2 = lists:sort(ets_match_object(Set,{Key,'_'})),
 		       case L1 == L2 of
 			   false ->
 			       io:format("~p != ~p~n",
 					 [L1,L2]),
-			       ?line exit({not_eq, L1, L2});
+			       exit({not_eq, L1, L2});
 			   true ->
 			       ok
 		       end
 	       end,
 	       2000),
     do_n_times(fun() ->
-		       ?line Key = create_partly_bound_tuple2(25),
-		       ?line L1 = ets_match(OrdSet,{Key,'_'}),
-		       ?line L2 = lists:sort(ets_match(Set,{Key,'_'})),
+		       Key = create_partly_bound_tuple2(25),
+		       L1 = ets_match(OrdSet,{Key,'_'}),
+		       L2 = lists:sort(ets_match(Set,{Key,'_'})),
 		       case L1 == L2 of
 			   false ->
 			       io:format("~p != ~p~n",
 					 [L1,L2]),
-			       ?line exit({not_eq, L1, L2});
+			       exit({not_eq, L1, L2});
 			   true ->
 			       ok
 		       end
@@ -1551,15 +1450,15 @@ do_random_test() ->
     ets:match_delete(Set,'_'),
     do_n_times(fun() ->
 		       do_n_times(fun() ->
-					  ?line Value = 
+					  Value =
 					      create_random_string(25),
-					  ?line Key = create_random_tuple(25),
-					  ?line ets:insert(OrdSet,{Key,Value}),
-					  ?line ets:insert(Set,{Key,Value})
+					  Key = create_random_tuple(25),
+					  ets:insert(OrdSet,{Key,Value}),
+					  ets:insert(Set,{Key,Value})
 				  end, 500),
 		       io:format("~nData inserted~n"),
 		       do_n_times(fun() ->
-					  ?line Key = 
+					  Key =
 					      create_partly_bound_tuple(25),
 					  ets:match_delete(OrdSet,{Key,'_'}),
 					  ets:match_delete(Set,{Key,'_'}),
@@ -1584,16 +1483,13 @@ do_random_test() ->
 	       10),
     ets:delete(OrdSet),
     ets:delete(Set),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
-update_element(doc) ->
-    ["test various variants of update_element"];
-update_element(suite) ->
-    [];
+%% Ttest various variants of update_element.
 update_element(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     repeat_for_opts(update_element_opts),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 update_element_opts(Opts) ->
     TupleCases = [{{key,val}, 1 ,2}, 
@@ -1603,12 +1499,12 @@ update_element_opts(Opts) ->
 		  {{val,key,val,val}, 2, [3,4,1]},
 		  {{val,val,key,val}, 3, [1,4,1,2]}, % update pos1 twice
 		  {{val,val,val,key}, 4, [2,1,2,3]}],% update pos2 twice
-    
+
     lists:foreach(fun({Tuple,KeyPos,UpdPos}) -> update_element_opts(Tuple,KeyPos,UpdPos,Opts) end, 
 		  TupleCases),
-    
+
     update_element_neg(Opts).
-    
+
 
 
 update_element_opts(Tuple,KeyPos,UpdPos,Opts) ->
@@ -1627,16 +1523,15 @@ update_element(T,Tuple,KeyPos,UpdPos) ->
 			  update_element_do(T,TupleWithKey,Key,UpdPos)
 		  end,
 		  KeyList).
-		    
+
 update_element_do(Tab,Tuple,Key,UpdPos) ->
 
-    % Strategy: Step around in Values array and call ets:update_element for the values.
-    % Take Length number of steps of size 1, then of size 2, ..., Length-1.
-    % This will try all combinations of {fromValue,toValue}
-    %
-    % IMPORTANT: size(Values) must be a prime number for this to work!!!
+    %% Strategy: Step around in Values array and call ets:update_element for the values.
+    %% Take Length number of steps of size 1, then of size 2, ..., Length-1.
+    %% This will try all combinations of {fromValue,toValue}
+    %%
+    %% IMPORTANT: size(Values) must be a prime number for this to work!!!
 
-    %io:format("update_element_do for key=~p\n",[Key]),
     Big32 = 16#12345678,
     Big64 = 16#123456789abcdef0,
     Values = { 623, -27, 0, Big32, -Big32, Big64, -Big64, Big32*Big32,
@@ -1646,14 +1541,14 @@ update_element_do(Tab,Tuple,Key,UpdPos) ->
 	       (fun(X) -> X*Big32 end),
 	       make_ref(), make_ref(), self(), ok, update_element, 28, 29 },
     Length = size(Values),
-    
+
     PosValArgF = fun(ToIx, ResList, [Pos | PosTail], Rand, MeF) ->
 			 NextIx = (ToIx+Rand) rem Length,
 			 MeF(NextIx, [{Pos,element(ToIx+1,Values)} | ResList], PosTail, Rand, MeF);
 
 		    (_ToIx, ResList, [], _Rand, _MeF) ->
 			 ResList;
-		    
+
 		    (ToIx, [], Pos, _Rand, _MeF) ->
 			 {Pos, element(ToIx+1,Values)}   % single {pos,value} arg
 		 end,
@@ -1662,10 +1557,10 @@ update_element_do(Tab,Tuple,Key,UpdPos) ->
 		      PosValArg = PosValArgF(ToIx,[],UpdPos,Rand,PosValArgF),
 		      %%io:format("update_element(~p)~n",[PosValArg]),
 		      ArgHash = erlang:phash2({Tab,Key,PosValArg}),
-		      ?line true = ets:update_element(Tab, Key, PosValArg),
-		      ?line ArgHash = erlang:phash2({Tab,Key,PosValArg}),
+		      true = ets:update_element(Tab, Key, PosValArg),
+		      ArgHash = erlang:phash2({Tab,Key,PosValArg}),
 		      NewTuple = update_tuple(PosValArg,Tuple),
-		      ?line [NewTuple] = ets:lookup(Tab,Key)
+		      [NewTuple] = ets:lookup(Tab,Key)
 	      end,
 
     LoopF = fun(_FromIx, Incr, _Times, Checksum, _MeF) when Incr >= Length -> 
@@ -1685,11 +1580,11 @@ update_element_do(Tab,Tuple,Key,UpdPos) ->
 	    end,
 
     FirstTuple = Tuple,
-    ?line true = ets:insert(Tab,FirstTuple),
-    ?line [FirstTuple] = ets:lookup(Tab,Key),
-    
+    true = ets:insert(Tab,FirstTuple),
+    [FirstTuple] = ets:lookup(Tab,Key),
+
     Checksum = LoopF(0, 1, Length, 0, LoopF),
-    ?line Checksum = (Length-1)*Length*(Length+1) div 2,  % if Length is a prime
+    Checksum = (Length-1)*Length*(Length+1) div 2,  % if Length is a prime
     ok.
 
 update_tuple({Pos,Val}, Tpl) ->
@@ -1707,14 +1602,14 @@ update_element_neg(Opts) ->
     update_element_neg_do(Set),
     update_element_neg_do(OrdSet),
     ets:delete(Set),
-    ?line {'EXIT',{badarg,_}} = (catch ets:update_element(Set,key,{2,1})),
+    {'EXIT',{badarg,_}} = (catch ets:update_element(Set,key,{2,1})),
     ets:delete(OrdSet),
-    ?line {'EXIT',{badarg,_}} = (catch ets:update_element(OrdSet,key,{2,1})),
+    {'EXIT',{badarg,_}} = (catch ets:update_element(OrdSet,key,{2,1})),
 
-    ?line Bag = ets_new(bag,[bag | Opts]),
-    ?line DBag = ets_new(duplicate_bag,[duplicate_bag | Opts]),
-    ?line {'EXIT',{badarg,_}} = (catch ets:update_element(Bag,key,{2,1})),
-    ?line {'EXIT',{badarg,_}} = (catch ets:update_element(DBag,key,{2,1})),
+    Bag = ets_new(bag,[bag | Opts]),
+    DBag = ets_new(duplicate_bag,[duplicate_bag | Opts]),
+    {'EXIT',{badarg,_}} = (catch ets:update_element(Bag,key,{2,1})),
+    {'EXIT',{badarg,_}} = (catch ets:update_element(DBag,key,{2,1})),
     true = ets:delete(Bag),
     true = ets:delete(DBag),
     ok.
@@ -1722,13 +1617,13 @@ update_element_neg(Opts) ->
 
 update_element_neg_do(T) ->
     Object = {key, 0, "Hej"},
-    ?line true = ets:insert(T,Object),
+    true = ets:insert(T,Object),
 
     UpdateF = fun(Arg3) -> 
 		      ArgHash = erlang:phash2({T,key,Arg3}),
-		      ?line {'EXIT',{badarg,_}} = (catch ets:update_element(T,key,Arg3)),
-		      ?line ArgHash = erlang:phash2({T,key,Arg3}),
-		      ?line [Object] = ets:lookup(T,key)
+		      {'EXIT',{badarg,_}} = (catch ets:update_element(T,key,Arg3)),
+		      ArgHash = erlang:phash2({T,key,Arg3}),
+		      [Object] = ets:lookup(T,key)
 	      end,
 
     %% List of invalid {Pos,Value} tuples
@@ -1744,22 +1639,19 @@ update_element_neg_do(T) ->
     UpdateF([{2,1} | {3,1}]),
     lists:foreach(fun(InvTpl) -> UpdateF([{2,1} | InvTpl]) end, InvList),
 
-    ?line true = ets:update_element(T,key,[]),
-    ?line false = ets:update_element(T,false,[]),
-    ?line false = ets:update_element(T,false,{2,1}),
-    ?line ets:delete(T,key),
-    ?line false = ets:update_element(T,key,{2,1}),
+    true = ets:update_element(T,key,[]),
+    false = ets:update_element(T,false,[]),
+    false = ets:update_element(T,false,{2,1}),
+    ets:delete(T,key),
+    false = ets:update_element(T,key,{2,1}),
     ok.
 
 
-update_counter(doc) ->
-    ["test various variants of update_counter"];
-update_counter(suite) ->
-    [];
+%% test various variants of update_counter.
 update_counter(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     repeat_for_opts(update_counter_do),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 update_counter_do(Opts) ->
     Set = ets_new(set,Opts),
@@ -1779,26 +1671,26 @@ update_counter_do(Opts) ->
     update_counter_neg(Opts).
 
 update_counter_for(T) ->
-    ?line ets:insert(T,{a,1,1}),
-    ?line 101 = ets:update_counter(T,a,100),
-    ?line [{a,101,1}] = ets:lookup(T,a),
-    ?line 101 = ets:update_counter(T,a,{3,100}),
-    ?line [{a,101,101}] = ets:lookup(T,a),
+    ets:insert(T,{a,1,1}),
+    101 = ets:update_counter(T,a,100),
+    [{a,101,1}] = ets:lookup(T,a),
+    101 = ets:update_counter(T,a,{3,100}),
+    [{a,101,101}] = ets:lookup(T,a),
 
 
     LooperF = fun(Obj, 0, _, _) ->
 		      Obj;
-		 
+
 		 (Obj, Times, Arg3, Myself) ->
-		      ?line {NewObj, Ret} = uc_mimic(Obj,Arg3),
+		      {NewObj, Ret} = uc_mimic(Obj,Arg3),
 		      ArgHash = erlang:phash2({T,a,Arg3}),
 		      %%io:format("update_counter(~p, ~p, ~p) expecting ~p\n",[T,a,Arg3,Ret]),
                       [DefaultObj] = ets:lookup(T, a),
-		      ?line Ret = ets:update_counter(T,a,Arg3),
+		      Ret = ets:update_counter(T,a,Arg3),
                       Ret = ets:update_counter(T, b, Arg3, DefaultObj),   % Use other key
-		      ?line ArgHash = erlang:phash2({T,a,Arg3}),
+		      ArgHash = erlang:phash2({T,a,Arg3}),
 		      %%io:format("NewObj=~p~n ",[NewObj]),
-		      ?line [NewObj] = ets:lookup(T,a),
+		      [NewObj] = ets:lookup(T,a),
                       true = ets:lookup(T, b) =:= [setelement(1, NewObj, b)],
                       ets:delete(T, b),
 		      Myself(NewObj,Times-1,Arg3,Myself)
@@ -1816,78 +1708,78 @@ update_counter_for(T) ->
 
     Steps = 100,
     Obj0 = {a,0,0,0,0},
-    ?line ets:insert(T,Obj0),
-    ?line Obj1 = LoopF(Obj0, Steps, {2,(SmallMax32 div Steps)*2}),
-    ?line Obj2 = LoopF(Obj1, Steps, {3,(SmallMax64 div Steps)*2}),
-    ?line Obj3 = LoopF(Obj2, Steps, {4,(Big1Max32 div Steps)*2}),
-    ?line Obj4 = LoopF(Obj3, Steps, {5,(Big1Max64 div Steps)*2}),
-
-    ?line Obj5 = LoopF(Obj4, Steps, {2,-(SmallMax32 div Steps)*4}),
-    ?line Obj6 = LoopF(Obj5, Steps, {3,-(SmallMax64 div Steps)*4}),
-    ?line Obj7 = LoopF(Obj6, Steps, {4,-(Big1Max32 div Steps)*4}),
-    ?line Obj8 = LoopF(Obj7, Steps, {5,-(Big1Max64 div Steps)*4}),
-
-    ?line Obj9 = LoopF(Obj8, Steps, {2,(SmallMax32 div Steps)*2}),
-    ?line ObjA = LoopF(Obj9, Steps, {3,(SmallMax64 div Steps)*2}),
-    ?line ObjB = LoopF(ObjA, Steps, {4,(Big1Max32 div Steps)*2}),
-    ?line Obj0 = LoopF(ObjB, Steps, {5,(Big1Max64 div Steps)*2}),
+    ets:insert(T,Obj0),
+    Obj1 = LoopF(Obj0, Steps, {2,(SmallMax32 div Steps)*2}),
+    Obj2 = LoopF(Obj1, Steps, {3,(SmallMax64 div Steps)*2}),
+    Obj3 = LoopF(Obj2, Steps, {4,(Big1Max32 div Steps)*2}),
+    Obj4 = LoopF(Obj3, Steps, {5,(Big1Max64 div Steps)*2}),
+
+    Obj5 = LoopF(Obj4, Steps, {2,-(SmallMax32 div Steps)*4}),
+    Obj6 = LoopF(Obj5, Steps, {3,-(SmallMax64 div Steps)*4}),
+    Obj7 = LoopF(Obj6, Steps, {4,-(Big1Max32 div Steps)*4}),
+    Obj8 = LoopF(Obj7, Steps, {5,-(Big1Max64 div Steps)*4}),
+
+    Obj9 = LoopF(Obj8, Steps, {2,(SmallMax32 div Steps)*2}),
+    ObjA = LoopF(Obj9, Steps, {3,(SmallMax64 div Steps)*2}),
+    ObjB = LoopF(ObjA, Steps, {4,(Big1Max32 div Steps)*2}),
+    Obj0 = LoopF(ObjB, Steps, {5,(Big1Max64 div Steps)*2}),
 
     %% back at zero, same trip again with lists
 
-    ?line Obj4 = LoopF(Obj0,Steps,[{2, (SmallMax32 div Steps)*2},
- 				   {3, (SmallMax64 div Steps)*2},
- 				   {4, (Big1Max32 div Steps)*2},
- 				   {5, (Big1Max64 div Steps)*2}]),
+    Obj4 = LoopF(Obj0,Steps,[{2, (SmallMax32 div Steps)*2},
+			     {3, (SmallMax64 div Steps)*2},
+			     {4, (Big1Max32 div Steps)*2},
+			     {5, (Big1Max64 div Steps)*2}]),
 
-    ?line Obj8 = LoopF(Obj4,Steps,[{4, -(Big1Max32 div Steps)*4},
- 				   {2, -(SmallMax32 div Steps)*4},
- 				   {5, -(Big1Max64 div Steps)*4},
- 				   {3, -(SmallMax64 div Steps)*4}]),
+    Obj8 = LoopF(Obj4,Steps,[{4, -(Big1Max32 div Steps)*4},
+			     {2, -(SmallMax32 div Steps)*4},
+			     {5, -(Big1Max64 div Steps)*4},
+			     {3, -(SmallMax64 div Steps)*4}]),
 
-    ?line Obj0 = LoopF(Obj8,Steps,[{5, (Big1Max64 div Steps)*2},
- 				   {2, (SmallMax32 div Steps)*2},
- 				   {4, (Big1Max32 div Steps)*2},				   
- 				   {3, (SmallMax64 div Steps)*2}]),
+    Obj0 = LoopF(Obj8,Steps,[{5, (Big1Max64 div Steps)*2},
+			     {2, (SmallMax32 div Steps)*2},
+			     {4, (Big1Max32 div Steps)*2},
+			     {3, (SmallMax64 div Steps)*2}]),
 
     %% make them shift size at the same time
-    ?line ObjC = LoopF(Obj0,Steps,[{5, (Big1Max64 div Steps)*2},
- 				   {3, (Big1Max64 div Steps)*2 + 1},
- 				   {2, -(Big1Max64 div Steps)*2},
- 				   {4, -(Big1Max64 div Steps)*2 + 1}]),
+    ObjC = LoopF(Obj0,Steps,[{5, (Big1Max64 div Steps)*2},
+			     {3, (Big1Max64 div Steps)*2 + 1},
+			     {2, -(Big1Max64 div Steps)*2},
+			     {4, -(Big1Max64 div Steps)*2 + 1}]),
 
     %% update twice in same list
-    ?line ObjD = LoopF(ObjC,Steps,[{5, -(Big1Max64 div Steps) + 1},
- 				   {3, -(Big1Max64 div Steps)*2 - 1},
- 				   {5, -(Big1Max64 div Steps) - 1},
- 				   {4, (Big1Max64 div Steps)*2 - 1}]),
+    ObjD = LoopF(ObjC,Steps,[{5, -(Big1Max64 div Steps) + 1},
+			     {3, -(Big1Max64 div Steps)*2 - 1},
+			     {5, -(Big1Max64 div Steps) - 1},
+			     {4, (Big1Max64 div Steps)*2 - 1}]),
 
-    ?line Obj0 = LoopF(ObjD,Steps,[{2, (Big1Max64 div Steps) - 1},
- 				   {4, Big1Max64*2},
- 				   {2, (Big1Max64 div Steps) + 1},
- 				   {4, -Big1Max64*2}]),
+    Obj0 = LoopF(ObjD,Steps,[{2, (Big1Max64 div Steps) - 1},
+			     {4, Big1Max64*2},
+			     {2, (Big1Max64 div Steps) + 1},
+			     {4, -Big1Max64*2}]),
 
     %% warping with list
-    ?line ObjE = LoopF(Obj0,1000,
- 		       [{3,SmallMax32*4 div 5,SmallMax32*2,-SmallMax32*2},
- 			{5,-SmallMax64*4 div 7,-SmallMax64*2,SmallMax64*2},
- 			{4,-Big1Max32*4 div 11,-Big1Max32*2,Big1Max32*2},
- 			{2,Big1Max64*4 div 13,Big1Max64*2,-Big1Max64*2}]),
+    ObjE = LoopF(Obj0,1000,
+		 [{3,SmallMax32*4 div 5,SmallMax32*2,-SmallMax32*2},
+		  {5,-SmallMax64*4 div 7,-SmallMax64*2,SmallMax64*2},
+		  {4,-Big1Max32*4 div 11,-Big1Max32*2,Big1Max32*2},
+		  {2,Big1Max64*4 div 13,Big1Max64*2,-Big1Max64*2}]),
 
     %% warping without list
-    ?line ObjF = LoopF(ObjE,1000,{3,SmallMax32*4 div 5,SmallMax32*2,-SmallMax32*2}),
-    ?line ObjG = LoopF(ObjF,1000,{5,-SmallMax64*4 div 7,-SmallMax64*2,SmallMax64*2}),
-    ?line ObjH = LoopF(ObjG,1000,{4,-Big1Max32*4 div 11,-Big1Max32*2,Big1Max32*2}),
-    ?line ObjI = LoopF(ObjH,1000,{2,Big1Max64*4 div 13,Big1Max64*2,-Big1Max64*2}),
+    ObjF = LoopF(ObjE,1000,{3,SmallMax32*4 div 5,SmallMax32*2,-SmallMax32*2}),
+    ObjG = LoopF(ObjF,1000,{5,-SmallMax64*4 div 7,-SmallMax64*2,SmallMax64*2}),
+    ObjH = LoopF(ObjG,1000,{4,-Big1Max32*4 div 11,-Big1Max32*2,Big1Max32*2}),
+    ObjI = LoopF(ObjH,1000,{2,Big1Max64*4 div 13,Big1Max64*2,-Big1Max64*2}),
 
     %% mixing it up
-    ?line LoopF(ObjI,1000,
-		[{3,SmallMax32*4 div 5,SmallMax32*2,-SmallMax32*2},
-		 {5,-SmallMax64*4 div 3},
-		 {3,-SmallMax32*4 div 11},
-		 {5,0},
-		 {4,1},
-		 {5,-SmallMax64*4 div 7,-SmallMax64*2,SmallMax64*2},
-		 {2,Big1Max64*4 div 13,Big1Max64*2,-Big1Max64*2}]),
+    LoopF(ObjI,1000,
+	  [{3,SmallMax32*4 div 5,SmallMax32*2,-SmallMax32*2},
+	   {5,-SmallMax64*4 div 3},
+	   {3,-SmallMax32*4 div 11},
+	   {5,0},
+	   {4,1},
+	   {5,-SmallMax64*4 div 7,-SmallMax64*2,SmallMax64*2},
+	   {2,Big1Max64*4 div 13,Big1Max64*2,-Big1Max64*2}]),
     ok.
 
 %% uc_mimic works kind of like the real ets:update_counter
@@ -1895,19 +1787,19 @@ update_counter_for(T) ->
 %% Pits = {Pos,Incr} | {Pos,Incr,Thres,Warp}
 %% Returns {Updated tuple in ets, Return value from update_counter}
 uc_mimic(Obj, Pits) when is_tuple(Pits) ->
-    ?line Pos = element(1,Pits),
-    ?line NewObj = setelement(Pos, Obj, uc_adder(element(Pos,Obj),Pits)),
-    ?line {NewObj, element(Pos,NewObj)};
+    Pos = element(1,Pits),
+    NewObj = setelement(Pos, Obj, uc_adder(element(Pos,Obj),Pits)),
+    {NewObj, element(Pos,NewObj)};
 
 uc_mimic(Obj, PitsList) when is_list(PitsList) ->
-    ?line {NewObj,ValList} = uc_mimic(Obj,PitsList,[]),
-    ?line {NewObj,lists:reverse(ValList)}.
+    {NewObj,ValList} = uc_mimic(Obj,PitsList,[]),
+    {NewObj,lists:reverse(ValList)}.
 
 uc_mimic(Obj, [], Acc) ->
-    ?line {Obj,Acc};
+    {Obj,Acc};
 uc_mimic(Obj, [Pits|Tail], Acc) ->
-    ?line {NewObj,NewVal} = uc_mimic(Obj,Pits),
-    ?line uc_mimic(NewObj,Tail,[NewVal|Acc]).		    
+    {NewObj,NewVal} = uc_mimic(Obj,Pits),
+    uc_mimic(NewObj,Tail,[NewVal|Acc]).
 
 uc_adder(Init, {_Pos, Add}) ->
     Init + Add;
@@ -1920,34 +1812,34 @@ uc_adder(Init, {_Pos, Add, Thres, Warp}) ->
 	Z ->
 	    Z
     end.
-    
+
 update_counter_neg(Opts) ->
     Set = ets_new(set,Opts),
     OrdSet = ets_new(ordered_set,[ordered_set | Opts]),
     update_counter_neg_for(Set),
     update_counter_neg_for(OrdSet),
     ets:delete(Set),
-    ?line {'EXIT',{badarg,_}} = (catch ets:update_counter(Set,key,1)),
+    {'EXIT',{badarg,_}} = (catch ets:update_counter(Set,key,1)),
     ets:delete(OrdSet),
-    ?line {'EXIT',{badarg,_}} = (catch ets:update_counter(OrdSet,key,1)),
+    {'EXIT',{badarg,_}} = (catch ets:update_counter(OrdSet,key,1)),
 
-    ?line Bag = ets_new(bag,[bag | Opts]),
-    ?line DBag = ets_new(duplicate_bag,[duplicate_bag | Opts]),
-    ?line {'EXIT',{badarg,_}} = (catch ets:update_counter(Bag,key,1)),
-    ?line {'EXIT',{badarg,_}} = (catch ets:update_counter(DBag,key,1)),
+    Bag = ets_new(bag,[bag | Opts]),
+    DBag = ets_new(duplicate_bag,[duplicate_bag | Opts]),
+    {'EXIT',{badarg,_}} = (catch ets:update_counter(Bag,key,1)),
+    {'EXIT',{badarg,_}} = (catch ets:update_counter(DBag,key,1)),
     true = ets:delete(Bag),
     true = ets:delete(DBag),
     ok.
 
 update_counter_neg_for(T) ->
     Object = {key,0,false,1},
-    ?line true = ets:insert(T,Object),
+    true = ets:insert(T,Object),
 
     UpdateF = fun(Arg3) -> 
 		      ArgHash = erlang:phash2({T,key,Arg3}),
-		      ?line {'EXIT',{badarg,_}} = (catch ets:update_counter(T,key,Arg3)),
-		      ?line ArgHash = erlang:phash2({T,key,Arg3}),
-		      ?line [Object] = ets:lookup(T,key)
+		      {'EXIT',{badarg,_}} = (catch ets:update_counter(T,key,Arg3)),
+		      ArgHash = erlang:phash2({T,key,Arg3}),
+		      [Object] = ets:lookup(T,key)
 	      end,
 
     %% List of invalid arg3-tuples
@@ -1965,28 +1857,28 @@ update_counter_neg_for(T) ->
     UpdateF([{2,1} | {4,1}]),
     lists:foreach(fun(Inv) -> UpdateF([{2,1} | Inv]) end, InvList),
 
-    ?line {'EXIT',{badarg,_}} = (catch ets:update_counter(T,false,1)),
-    ?line ets:delete(T,key),
-    ?line {'EXIT',{badarg,_}} = (catch ets:update_counter(T,key,1)),
+    {'EXIT',{badarg,_}} = (catch ets:update_counter(T,false,1)),
+    ets:delete(T,key),
+    {'EXIT',{badarg,_}} = (catch ets:update_counter(T,key,1)),
     ok.
 
-		    
+
 evil_update_counter(Config) when is_list(Config) ->
     %% The code server uses ets table. Pre-load modules that might not be
     %% already loaded.
     gb_sets:module_info(),
     math:module_info(),
     ordsets:module_info(),
-    random:module_info(),
+    rand:module_info(),
 
     repeat_for_opts(evil_update_counter_do).
 
 evil_update_counter_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line process_flag(trap_exit, true),
-    ?line Pids = [my_spawn_link(fun() -> evil_counter(I,Opts) end)  || I <- lists:seq(1, 40)],
-    ?line wait_for_all(gb_sets:from_list(Pids)),
-    ?line verify_etsmem(EtsMem),
+    EtsMem = etsmem(),
+    process_flag(trap_exit, true),
+    Pids = [my_spawn_link(fun() -> evil_counter(I,Opts) end)  || I <- lists:seq(1, 40)],
+    wait_for_all(gb_sets:from_list(Pids)),
+    verify_etsmem(EtsMem),
     ok.
 
 wait_for_all(Pids0) ->
@@ -1996,22 +1888,22 @@ wait_for_all(Pids0) ->
 	false ->
 	    receive
 		{'EXIT',Pid,normal} ->
-		    ?line Pids = gb_sets:delete(Pid, Pids0),
+		    Pids = gb_sets:delete(Pid, Pids0),
 		    wait_for_all(Pids);
 		Other ->
 		    io:format("unexpected: ~p\n", [Other]),
-		    ?line ?t:fail()
+		    ct:fail(failed)
 	    end
     end.
 
 evil_counter(I,Opts) ->
     T = ets_new(a, Opts),
     Start0 = case I rem 3 of
-		0 -> 16#12345678;
-		1 -> 16#12345678FFFFFFFF;
-		2 -> 16#7777777777FFFFFFFF863648726743
-	    end,
-    Start = Start0 + random:uniform(100000),
+		 0 -> 16#12345678;
+		 1 -> 16#12345678FFFFFFFF;
+		 2 -> 16#7777777777FFFFFFFF863648726743
+	     end,
+    Start = Start0 + rand:uniform(100000),
     ets:insert(T, {dracula,Start}),
     Iter = 40000,
     End = Start + Iter,
@@ -2026,7 +1918,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(update_counter_with_default_do).
 
 update_counter_with_default_do(Opts) ->
     T1 = ets_new(a, [set | Opts]),
@@ -2063,20 +1955,17 @@ update_counter_with_default_do(Opts) ->
 
     ok.
 
-fixtable_next(doc) ->
-    ["Check that a first-next sequence always works on a fixed table"];
-fixtable_next(suite) ->
-    [];
+%% 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]).
 
 fixtable_next_do(Opts) ->
-    ?line EtsMem = etsmem(),    
-    ?line do_fixtable_next(ets_new(set,[public | Opts])),
-    ?line verify_etsmem(EtsMem).
-    
+    EtsMem = etsmem(),
+    do_fixtable_next(ets_new(set,[public | Opts])),
+    verify_etsmem(EtsMem).
+
 do_fixtable_next(Tab) ->
-   ?line  F = fun(X,T,FF) -> case X of 
+    F = fun(X,T,FF) -> case X of
 			   0 -> true; 
 			   _ -> 
 			       ets:insert(T, {X,
@@ -2085,74 +1974,70 @@ do_fixtable_next(Tab) ->
 			       FF(X-1,T,FF) 
 		       end 
 	end,
-    ?line F(100,Tab,F),
-    ?line ets:safe_fixtable(Tab,true),
-    ?line First = ets:first(Tab),
-    ?line ets:delete(Tab, First),
-    ?line ets:next(Tab, First),
-    ?line ets:match_delete(Tab,{'_','_','_'}),
-    ?line '$end_of_table' = ets:next(Tab, First),
-    ?line true = ets:info(Tab, fixed),
-    ?line ets:safe_fixtable(Tab, false),
-    ?line false = ets:info(Tab, fixed),
-    ?line ets:delete(Tab).
-
-fixtable_insert(doc) ->    
-    ["Check inserts of deleted keys in fixed bags"];
-fixtable_insert(suite) ->
-    [];
+    F(100,Tab,F),
+    ets:safe_fixtable(Tab,true),
+    First = ets:first(Tab),
+    ets:delete(Tab, First),
+    ets:next(Tab, First),
+    ets:match_delete(Tab,{'_','_','_'}),
+    '$end_of_table' = ets:next(Tab, First),
+    true = ets:info(Tab, fixed),
+    ets:safe_fixtable(Tab, false),
+    false = ets:info(Tab, fixed),
+    ets:delete(Tab).
+
+%% Check inserts of deleted keys in fixed bags.
 fixtable_insert(Config) when is_list(Config) ->
     Combos = [[Type,{write_concurrency,WC}] || Type<- [bag,duplicate_bag], 
 					       WC <- [false,true]],
     lists:foreach(fun(Opts) -> fixtable_insert_do(Opts) end,
 		  Combos),
     ok.
-    
+
 fixtable_insert_do(Opts) ->
     io:format("Opts = ~p\n",[Opts]),
     Ets = make_table(ets, Opts, [{a,1}, {a,2}, {b,1}, {b,2}]),
     ets:safe_fixtable(Ets,true),
     ets:match_delete(Ets,{b,1}),
     First = ets:first(Ets),
-    ?line Next = case First of
-		     a -> b;
-		     b -> a
-		 end,
-    ?line Next = ets:next(Ets,First),
+    Next = case First of
+	       a -> b;
+	       b -> a
+	   end,
+    Next = ets:next(Ets,First),
     ets:delete(Ets,Next),
-    ?line '$end_of_table' = ets:next(Ets,First),
+    '$end_of_table' = ets:next(Ets,First),
     ets:insert(Ets, {Next,1}),
-    ?line false = ets:insert_new(Ets, {Next,1}),
-    ?line Next = ets:next(Ets,First),
-    ?line '$end_of_table' = ets:next(Ets,Next),
+    false = ets:insert_new(Ets, {Next,1}),
+    Next = ets:next(Ets,First),
+    '$end_of_table' = ets:next(Ets,Next),
     ets:delete(Ets,Next),
     '$end_of_table' = ets:next(Ets,First),
     ets:insert(Ets, {Next,2}),
-    ?line false = ets:insert_new(Ets, {Next,1}),
+    false = ets:insert_new(Ets, {Next,1}),
     Next = ets:next(Ets,First),
     '$end_of_table' = ets:next(Ets,Next),
     ets:delete(Ets,First),
-    ?line Next = ets:first(Ets),
-    ?line '$end_of_table' = ets:next(Ets,Next),
+    Next = ets:first(Ets),
+    '$end_of_table' = ets:next(Ets,Next),
     ets:delete(Ets,Next),
-    ?line '$end_of_table' = ets:next(Ets,First),
-    ?line true = ets:insert_new(Ets,{Next,1}),
-    ?line false = ets:insert_new(Ets,{Next,2}),
-    ?line Next = ets:next(Ets,First),
+    '$end_of_table' = ets:next(Ets,First),
+    true = ets:insert_new(Ets,{Next,1}),
+    false = ets:insert_new(Ets,{Next,2}),
+    Next = ets:next(Ets,First),
     ets:delete_object(Ets,{Next,1}),
-    ?line '$end_of_table' = ets:next(Ets,First),
-    ?line true = ets:insert_new(Ets,{Next,2}),
-    ?line false = ets:insert_new(Ets,{Next,1}),
-    ?line Next = ets:next(Ets,First),
+    '$end_of_table' = ets:next(Ets,First),
+    true = ets:insert_new(Ets,{Next,2}),
+    false = ets:insert_new(Ets,{Next,1}),
+    Next = ets:next(Ets,First),
     ets:delete(Ets,First),
     ets:safe_fixtable(Ets,false),
     {'EXIT',{badarg,_}} = (catch ets:next(Ets,First)),
     ok.
 
-write_concurrency(doc) -> ["The 'write_concurrency' option"];
-write_concurrency(suite) -> [];
+%% Test the 'write_concurrency' option.
 write_concurrency(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     Yes1 = ets_new(foo,[public,{write_concurrency,true}]),
     Yes2 = ets_new(foo,[protected,{write_concurrency,true}]),
     No1 = ets_new(foo,[private,{write_concurrency,true}]),
@@ -2172,50 +2057,49 @@ write_concurrency(Config) when is_list(Config) ->
     No7 = ets_new(foo,[public,{write_concurrency,false}]),
     No8 = ets_new(foo,[protected,{write_concurrency,false}]),
 
-    ?line YesMem = ets:info(Yes1,memory),
-    ?line NoHashMem = ets:info(No1,memory),
-    ?line NoTreeMem = ets:info(No4,memory),
+    YesMem = ets:info(Yes1,memory),
+    NoHashMem = ets:info(No1,memory),
+    NoTreeMem = ets:info(No4,memory),
     io:format("YesMem=~p NoHashMem=~p NoTreeMem=~p\n",[YesMem,NoHashMem,NoTreeMem]),
 
-    ?line YesMem = ets:info(Yes2,memory),
-    ?line YesMem = ets:info(Yes3,memory),
-    ?line YesMem = ets:info(Yes4,memory),
-    ?line YesMem = ets:info(Yes5,memory),
-    ?line YesMem = ets:info(Yes6,memory),
-    ?line NoHashMem = ets:info(No2,memory),
-    ?line NoHashMem = ets:info(No3,memory),
-    ?line NoTreeMem = ets:info(No5,memory),
-    ?line NoTreeMem = ets:info(No6,memory),
-    ?line NoHashMem = ets:info(No7,memory),
-    ?line NoHashMem = ets:info(No8,memory),
-    
+    YesMem = ets:info(Yes2,memory),
+    YesMem = ets:info(Yes3,memory),
+    YesMem = ets:info(Yes4,memory),
+    YesMem = ets:info(Yes5,memory),
+    YesMem = ets:info(Yes6,memory),
+    NoHashMem = ets:info(No2,memory),
+    NoHashMem = ets:info(No3,memory),
+    NoTreeMem = ets:info(No5,memory),
+    NoTreeMem = ets:info(No6,memory),
+    NoHashMem = ets:info(No7,memory),
+    NoHashMem = ets:info(No8,memory),
+
     case erlang:system_info(smp_support) of
 	true ->
-	    ?line true = YesMem > NoHashMem,
-	    ?line true = YesMem > NoTreeMem;
+	    true = YesMem > NoHashMem,
+	    true = YesMem > NoTreeMem;
 	false ->
-	    ?line true = YesMem =:= NoHashMem
+	    true = YesMem =:= NoHashMem
     end,
 
-    ?line {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,{write_concurrency,foo}])),
-    ?line {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,{write_concurrency}])),
-    ?line {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,{write_concurrency,true,foo}])),
-    ?line {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,write_concurrency])),
+    {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,{write_concurrency,foo}])),
+    {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,{write_concurrency}])),
+    {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,{write_concurrency,true,foo}])),
+    {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,write_concurrency])),
 
     lists:foreach(fun(T) -> ets:delete(T) end,
 		  [Yes1,Yes2,Yes3,Yes4,Yes5,Yes6,
 		   No1,No2,No3,No4,No5,No6,No7,No8]),
-    ?line verify_etsmem(EtsMem),
+    verify_etsmem(EtsMem),
     ok.
-    
-    
-heir(doc) ->   ["The 'heir' option"];
-heir(suite) -> [];
+
+
+%% The 'heir' option.
 heir(Config) when is_list(Config) ->
     repeat_for_opts(heir_do).
 
 heir_do(Opts) ->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     Master = self(),
 
     %% Different types of heir data and link/monitor relations
@@ -2224,33 +2108,33 @@ heir_do(Opts) ->
 				    lists:seq(1,10), {17,TestFun,self()},
 				    "The busy heir"],
 			     Mode<-[none,link,monitor]],
-    ?line lists:foreach(fun({Data,Mode})-> heir_1(Data,Mode,Opts) end,
-			Combos),    			
-			 
+    lists:foreach(fun({Data,Mode})-> heir_1(Data,Mode,Opts) end,
+		  Combos),
+
     %% No heir
     {Founder1,MrefF1} = my_spawn_monitor(fun()->heir_founder(Master,foo_data,Opts)end),
     Founder1 ! {go, none},
-    ?line {"No heir",Founder1} = receive_any(),
-    ?line {'DOWN', MrefF1, process, Founder1, normal} = receive_any(),
-    ?line undefined = ets:info(foo),
+    {"No heir",Founder1} = receive_any(),
+    {'DOWN', MrefF1, process, Founder1, normal} = receive_any(),
+    undefined = ets:info(foo),
 
     %% An already dead heir
     {Heir2,MrefH2} = my_spawn_monitor(fun()->die end),
-    ?line {'DOWN', MrefH2, process, Heir2, normal} = receive_any(),
+    {'DOWN', MrefH2, process, Heir2, normal} = receive_any(),
     {Founder2,MrefF2} = my_spawn_monitor(fun()->heir_founder(Master,foo_data,Opts)end),
     Founder2 ! {go, Heir2},
-    ?line {"No heir",Founder2} = receive_any(),
-    ?line {'DOWN', MrefF2, process, Founder2, normal} = receive_any(),
-    ?line undefined = ets:info(foo),
+    {"No heir",Founder2} = receive_any(),
+    {'DOWN', MrefF2, process, Founder2, normal} = receive_any(),
+    undefined = ets:info(foo),
 
     %% When heir dies before founder
     {Founder3,MrefF3} = my_spawn_monitor(fun()->heir_founder(Master,"The dying heir",Opts)end),
     {Heir3,MrefH3} = my_spawn_monitor(fun()->heir_heir(Founder3)end),
     Founder3 ! {go, Heir3},
-    ?line {'DOWN', MrefH3, process, Heir3, normal} = receive_any(),
+    {'DOWN', MrefH3, process, Heir3, normal} = receive_any(),
     Founder3 ! die_please,
-    ?line {'DOWN', MrefF3, process, Founder3, normal} = receive_any(),
-    ?line undefined = ets:info(foo),
+    {'DOWN', MrefF3, process, Founder3, normal} = receive_any(),
+    undefined = ets:info(foo),
 
     %% When heir dies and pid reused before founder dies
     repeat_while(fun() ->
@@ -2258,238 +2142,235 @@ heir_do(Opts) ->
 			 {Founder4,MrefF4} = my_spawn_monitor(fun()->heir_founder(Master,"The dying heir",Opts)end),
 			 {Heir4,MrefH4} = my_spawn_monitor(fun()->heir_heir(Founder4)end),
 			 Founder4 ! {go, Heir4},
-			 ?line {'DOWN', MrefH4, process, Heir4, normal} = receive_any(),
+			 {'DOWN', MrefH4, process, Heir4, normal} = receive_any(),
 			 erts_debug:set_internal_state(next_pid, NextPidIx),
 			 DoppelGanger = spawn_monitor_with_pid(Heir4, 
-							       fun()-> ?line die_please = receive_any() end),
+							       fun()-> die_please = receive_any() end),
 			 Founder4 ! die_please,
-			 ?line {'DOWN', MrefF4, process, Founder4, normal} = receive_any(),
+			 {'DOWN', MrefF4, process, Founder4, normal} = receive_any(),
 			 case DoppelGanger of
 			     {Heir4,MrefH4_B} ->
 				 Heir4 ! die_please,
-				 ?line {'DOWN', MrefH4_B, process, Heir4, normal} = receive_any(),
-				 ?line undefined = ets:info(foo),
+				 {'DOWN', MrefH4_B, process, Heir4, normal} = receive_any(),
+				 undefined = ets:info(foo),
 				 false;
 			     failed ->
 				 io:format("Failed to spawn process with pid ~p\n", [Heir4]),
 				 true % try again
 			 end			  
 		 end),
-	    
-    ?line verify_etsmem(EtsMem).
+
+    verify_etsmem(EtsMem).
 
 heir_founder(Master, HeirData, Opts) ->    
-    ?line {go,Heir} = receive_any(),
+    {go,Heir} = receive_any(),
     HeirTpl = case Heir of
 		  none -> {heir,none};
 		  _ -> {heir, Heir, HeirData}
 	      end,
-    ?line T = ets_new(foo,[named_table, private, HeirTpl | Opts]),
-    ?line true = ets:insert(T,{key,1}),
-    ?line [{key,1}] = ets:lookup(T,key),
+    T = ets_new(foo,[named_table, private, HeirTpl | Opts]),
+    true = ets:insert(T,{key,1}),
+    [{key,1}] = ets:lookup(T,key),
     Self = self(),
-    ?line Self = ets:info(T,owner),
-    ?line case ets:info(T,heir) of
-	      none ->
-		  ?line true = (Heir =:= none) orelse (not is_process_alive(Heir)),
-		  Master ! {"No heir",self()};
-	      
-	      Heir -> 
-		  ?line true = is_process_alive(Heir),
-		  Heir ! {table,T,HeirData},
-		  die_please = receive_any()
-	  end.
+    Self = ets:info(T,owner),
+    case ets:info(T,heir) of
+	none ->
+	    true = (Heir =:= none) orelse (not is_process_alive(Heir)),
+	    Master ! {"No heir",self()};
+
+	Heir ->
+	    true = is_process_alive(Heir),
+	    Heir ! {table,T,HeirData},
+	    die_please = receive_any()
+    end.
 
 
 heir_heir(Founder) ->
     heir_heir(Founder, none).
 heir_heir(Founder, Mode) ->
-    ?line {table,T,HeirData} = receive_any(),
-    ?line {'EXIT',{badarg,_}} = (catch ets:lookup(T,key)),
-    ?line case HeirData of
-	      "The dying heir" -> exit(normal);
-	      _ -> ok
-	  end,
+    {table,T,HeirData} = receive_any(),
+    {'EXIT',{badarg,_}} = (catch ets:lookup(T,key)),
+    case HeirData of
+	"The dying heir" -> exit(normal);
+	_ -> ok
+    end,
 
-    ?line Mref = case Mode of
-		     link -> process_flag(trap_exit, true),
-			     link(Founder);			      
-		     monitor -> erlang:monitor(process,Founder);
-		     none -> ok
-		 end,
-    ?line Founder ! die_please,
-    ?line Msg = case HeirData of
-		    "The busy heir" -> receive_any_spinning();
-		    _ -> receive_any()
-		end,
-    ?line {'ETS-TRANSFER', T, Founder, HeirData} = Msg,
-    ?line foo = T,
-    ?line Self = self(),
-    ?line Self = ets:info(T,owner),
-    ?line Self = ets:info(T,heir),
-    ?line [{key,1}] = ets:lookup(T,key),
-    ?line true = ets:insert(T,{key,2}),
-    ?line [{key,2}] = ets:lookup(T,key),
-    ?line case Mode of % Verify that EXIT or DOWN comes after ETS-TRANSFER
-	      link -> 
-		  {'EXIT',Founder,normal} = receive_any(),
-		  process_flag(trap_exit, false);
-	      monitor -> 
-		  {'DOWN', Mref, process, Founder, normal} = receive_any();
-	      none -> ok
-	  end.
+    Mref = case Mode of
+	       link -> process_flag(trap_exit, true),
+		       link(Founder);
+	       monitor -> erlang:monitor(process,Founder);
+	       none -> ok
+	   end,
+    Founder ! die_please,
+    Msg = case HeirData of
+	      "The busy heir" -> receive_any_spinning();
+	      _ -> receive_any()
+	  end,
+    {'ETS-TRANSFER', T, Founder, HeirData} = Msg,
+    foo = T,
+    Self = self(),
+    Self = ets:info(T,owner),
+    Self = ets:info(T,heir),
+    [{key,1}] = ets:lookup(T,key),
+    true = ets:insert(T,{key,2}),
+    [{key,2}] = ets:lookup(T,key),
+    case Mode of % Verify that EXIT or DOWN comes after ETS-TRANSFER
+	link ->
+	    {'EXIT',Founder,normal} = receive_any(),
+	    process_flag(trap_exit, false);
+	monitor ->
+	    {'DOWN', Mref, process, Founder, normal} = receive_any();
+	none -> ok
+    end.
 
 
 heir_1(HeirData,Mode,Opts) ->
     io:format("test with heir_data = ~p\n", [HeirData]),
     Master = self(),
-    ?line Founder = my_spawn_link(fun() -> heir_founder(Master,HeirData,Opts) end),
+    Founder = my_spawn_link(fun() -> heir_founder(Master,HeirData,Opts) end),
     io:format("founder spawned = ~p\n", [Founder]),
-    ?line {Heir,Mref} = my_spawn_monitor(fun() -> heir_heir(Founder,Mode) end),
+    {Heir,Mref} = my_spawn_monitor(fun() -> heir_heir(Founder,Mode) end),
     io:format("heir spawned = ~p\n", [{Heir,Mref}]),
-    ?line Founder ! {go, Heir},
-    ?line {'DOWN', Mref, process, Heir, normal} = receive_any().
+    Founder ! {go, Heir},
+    {'DOWN', Mref, process, Heir, normal} = receive_any().
 
-give_away(doc) -> ["ets:give_way/3"];    
-give_away(suite) -> [];
+%% Test ets:give_way/3.
 give_away(Config) when is_list(Config) ->    
     repeat_for_opts(give_away_do).
 
 give_away_do(Opts) ->
-    ?line T = ets_new(foo,[named_table, private | Opts]),
-    ?line true = ets:insert(T,{key,1}),
-    ?line [{key,1}] = ets:lookup(T,key),
+    T = ets_new(foo,[named_table, private | Opts]),
+    true = ets:insert(T,{key,1}),
+    [{key,1}] = ets:lookup(T,key),
     Parent = self(),
 
     %% Give and then give back
-    ?line {Receiver,Mref} = my_spawn_monitor(fun()-> give_away_receiver(T,Parent) end),
-    ?line give_me = receive_any(),
-    ?line true = ets:give_away(T,Receiver,here_you_are),
-    ?line {'EXIT',{badarg,_}} = (catch ets:lookup(T,key)),
-    ?line Receiver ! give_back,
-    ?line {'ETS-TRANSFER',T,Receiver,"Tillbakakaka"} = receive_any(),
-    ?line [{key,2}] = ets:lookup(T,key),
-    ?line {'DOWN', Mref, process, Receiver, normal} = receive_any(),
+    {Receiver,Mref} = my_spawn_monitor(fun()-> give_away_receiver(T,Parent) end),
+    give_me = receive_any(),
+    true = ets:give_away(T,Receiver,here_you_are),
+    {'EXIT',{badarg,_}} = (catch ets:lookup(T,key)),
+    Receiver ! give_back,
+    {'ETS-TRANSFER',T,Receiver,"Tillbakakaka"} = receive_any(),
+    [{key,2}] = ets:lookup(T,key),
+    {'DOWN', Mref, process, Receiver, normal} = receive_any(),
 
     %% Give and then let receiver keep it
-    ?line true = ets:insert(T,{key,1}),
-    ?line {Receiver3,Mref3} = my_spawn_monitor(fun()-> give_away_receiver(T,Parent) end),
-    ?line give_me = receive_any(),
-    ?line true = ets:give_away(T,Receiver3,here_you_are),
-    ?line {'EXIT',{badarg,_}} = (catch ets:lookup(T,key)),
-    ?line Receiver3 ! die_please,
-    ?line {'DOWN', Mref3, process, Receiver3, normal} = receive_any(),
-    ?line undefined = ets:info(T),
+    true = ets:insert(T,{key,1}),
+    {Receiver3,Mref3} = my_spawn_monitor(fun()-> give_away_receiver(T,Parent) end),
+    give_me = receive_any(),
+    true = ets:give_away(T,Receiver3,here_you_are),
+    {'EXIT',{badarg,_}} = (catch ets:lookup(T,key)),
+    Receiver3 ! die_please,
+    {'DOWN', Mref3, process, Receiver3, normal} = receive_any(),
+    undefined = ets:info(T),
 
     %% Give and then kill receiver to get back
-    ?line T2 = ets_new(foo,[private | Opts]),
-    ?line true = ets:insert(T2,{key,1}),
-    ?line ets:setopts(T2,{heir,self(),"Som en gummiboll..."}),
-    ?line {Receiver2,Mref2} = my_spawn_monitor(fun()-> give_away_receiver(T2,Parent) end),
-    ?line give_me = receive_any(),
-    ?line true = ets:give_away(T2,Receiver2,here_you_are),
-    ?line {'EXIT',{badarg,_}} = (catch ets:lookup(T2,key)),
-    ?line Receiver2 ! die_please,
-    ?line {'ETS-TRANSFER',T2,Receiver2,"Som en gummiboll..."} = receive_any(),
-    ?line [{key,2}] = ets:lookup(T2,key),
-    ?line {'DOWN', Mref2, process, Receiver2, normal} = receive_any(),
+    T2 = ets_new(foo,[private | Opts]),
+    true = ets:insert(T2,{key,1}),
+    ets:setopts(T2,{heir,self(),"Som en gummiboll..."}),
+    {Receiver2,Mref2} = my_spawn_monitor(fun()-> give_away_receiver(T2,Parent) end),
+    give_me = receive_any(),
+    true = ets:give_away(T2,Receiver2,here_you_are),
+    {'EXIT',{badarg,_}} = (catch ets:lookup(T2,key)),
+    Receiver2 ! die_please,
+    {'ETS-TRANSFER',T2,Receiver2,"Som en gummiboll..."} = receive_any(),
+    [{key,2}] = ets:lookup(T2,key),
+    {'DOWN', Mref2, process, Receiver2, normal} = receive_any(),
 
     %% Some negative testing
-    ?line {'EXIT',{badarg,_}} = (catch ets:give_away(T2,Receiver,"To a dead one")),
-    ?line {'EXIT',{badarg,_}} = (catch ets:give_away(T2,self(),"To myself")),
-    ?line {'EXIT',{badarg,_}} = (catch ets:give_away(T2,"not a pid","To wrong type")),
+    {'EXIT',{badarg,_}} = (catch ets:give_away(T2,Receiver,"To a dead one")),
+    {'EXIT',{badarg,_}} = (catch ets:give_away(T2,self(),"To myself")),
+    {'EXIT',{badarg,_}} = (catch ets:give_away(T2,"not a pid","To wrong type")),
 
-    ?line true = ets:delete(T2),
-    ?line {ReceiverNeg,MrefNeg} = my_spawn_monitor(fun()-> give_away_receiver(T2,Parent) end),
-    ?line give_me = receive_any(),
-    ?line {'EXIT',{badarg,_}} = (catch ets:give_away(T2,ReceiverNeg,"A deleted table")),
+    true = ets:delete(T2),
+    {ReceiverNeg,MrefNeg} = my_spawn_monitor(fun()-> give_away_receiver(T2,Parent) end),
+    give_me = receive_any(),
+    {'EXIT',{badarg,_}} = (catch ets:give_away(T2,ReceiverNeg,"A deleted table")),
 
-    ?line T3 = ets_new(foo,[public | Opts]),
+    T3 = ets_new(foo,[public | Opts]),
     my_spawn_link(fun()-> {'EXIT',{badarg,_}} = (catch ets:give_away(T3,ReceiverNeg,"From non owner")),
-		       Parent ! done
-	       end),
-    ?line done = receive_any(),
-    ?line ReceiverNeg ! no_soup_for_you,
-    ?line {'DOWN', MrefNeg, process, ReceiverNeg, normal} = receive_any(),
+			  Parent ! done
+		  end),
+    done = receive_any(),
+    ReceiverNeg ! no_soup_for_you,
+    {'DOWN', MrefNeg, process, ReceiverNeg, normal} = receive_any(),
     ok.
 
 give_away_receiver(T, Giver) ->
-    ?line {'EXIT',{badarg,_}} = (catch ets:lookup(T,key)),
-    ?line Giver ! give_me,
-    ?line case receive_any() of
-	      {'ETS-TRANSFER',T,Giver,here_you_are} ->
-		  ?line [{key,1}] = ets:lookup(T,key),
-		  ?line true = ets:insert(T,{key,2}),
-		  ?line case receive_any() of
-			    give_back ->
-				?line true = ets:give_away(T,Giver,"Tillbakakaka"),
-				?line {'EXIT',{badarg,_}} = (catch ets:lookup(T,key));
-			    die_please ->
-				ok
-			end;
-	      no_soup_for_you ->
-		  ok
-	  end.
-
-
-setopts(doc) -> ["ets:setopts/2"];
-setopts(suite) -> [];
+    {'EXIT',{badarg,_}} = (catch ets:lookup(T,key)),
+    Giver ! give_me,
+    case receive_any() of
+	{'ETS-TRANSFER',T,Giver,here_you_are} ->
+	    [{key,1}] = ets:lookup(T,key),
+	    true = ets:insert(T,{key,2}),
+	    case receive_any() of
+		give_back ->
+		    true = ets:give_away(T,Giver,"Tillbakakaka"),
+		    {'EXIT',{badarg,_}} = (catch ets:lookup(T,key));
+		die_please ->
+		    ok
+	    end;
+	no_soup_for_you ->
+	    ok
+    end.
+
+
+%% Test ets:setopts/2.
 setopts(Config) when is_list(Config) ->
     repeat_for_opts(setopts_do,[write_concurrency,all_types]).
 
 setopts_do(Opts) ->
     Self = self(),
-    ?line T = ets_new(foo,[named_table, private | Opts]),
-    ?line none = ets:info(T,heir),
+    T = ets_new(foo,[named_table, private | Opts]),
+    none = ets:info(T,heir),
     Heir = my_spawn_link(fun()->heir_heir(Self) end),
-    ?line ets:setopts(T,{heir,Heir,"Data"}),
-    ?line Heir = ets:info(T,heir),
-    ?line ets:setopts(T,{heir,self(),"Data"}),
-    ?line Self = ets:info(T,heir),
-    ?line ets:setopts(T,[{heir,Heir,"Data"}]),
-    ?line Heir = ets:info(T,heir),
-    ?line ets:setopts(T,[{heir,none}]),
-    ?line none = ets:info(T,heir),
-
-    ?line {'EXIT',{badarg,_}} = (catch ets:setopts(T,[{heir,self(),"Data"},false])),
-    ?line {'EXIT',{badarg,_}} = (catch ets:setopts(T,{heir,self()})),
-    ?line {'EXIT',{badarg,_}} = (catch ets:setopts(T,{heir,false})),
-    ?line {'EXIT',{badarg,_}} = (catch ets:setopts(T,heir)),
-    ?line {'EXIT',{badarg,_}} = (catch ets:setopts(T,{heir,false,"Data"})),
-    ?line {'EXIT',{badarg,_}} = (catch ets:setopts(T,{false,self(),"Data"})),
-
-    ?line ets:setopts(T,{protection,protected}),
-    ?line ets:setopts(T,{protection,public}),
-    ?line ets:setopts(T,{protection,private}),
-    ?line ets:setopts(T,[{protection,protected}]),
-    ?line ets:setopts(T,[{protection,public}]),
-    ?line ets:setopts(T,[{protection,private}]),
-
-    ?line {'EXIT',{badarg,_}} = (catch ets:setopts(T,{protection})),
-    ?line {'EXIT',{badarg,_}} = (catch ets:setopts(T,{protection,false})),
-    ?line {'EXIT',{badarg,_}} = (catch ets:setopts(T,{protection,private,false})),
-    ?line {'EXIT',{badarg,_}} = (catch ets:setopts(T,protection)),
-    ?line ets:delete(T),
+    ets:setopts(T,{heir,Heir,"Data"}),
+    Heir = ets:info(T,heir),
+    ets:setopts(T,{heir,self(),"Data"}),
+    Self = ets:info(T,heir),
+    ets:setopts(T,[{heir,Heir,"Data"}]),
+    Heir = ets:info(T,heir),
+    ets:setopts(T,[{heir,none}]),
+    none = ets:info(T,heir),
+
+    {'EXIT',{badarg,_}} = (catch ets:setopts(T,[{heir,self(),"Data"},false])),
+    {'EXIT',{badarg,_}} = (catch ets:setopts(T,{heir,self()})),
+    {'EXIT',{badarg,_}} = (catch ets:setopts(T,{heir,false})),
+    {'EXIT',{badarg,_}} = (catch ets:setopts(T,heir)),
+    {'EXIT',{badarg,_}} = (catch ets:setopts(T,{heir,false,"Data"})),
+    {'EXIT',{badarg,_}} = (catch ets:setopts(T,{false,self(),"Data"})),
+
+    ets:setopts(T,{protection,protected}),
+    ets:setopts(T,{protection,public}),
+    ets:setopts(T,{protection,private}),
+    ets:setopts(T,[{protection,protected}]),
+    ets:setopts(T,[{protection,public}]),
+    ets:setopts(T,[{protection,private}]),
+
+    {'EXIT',{badarg,_}} = (catch ets:setopts(T,{protection})),
+    {'EXIT',{badarg,_}} = (catch ets:setopts(T,{protection,false})),
+    {'EXIT',{badarg,_}} = (catch ets:setopts(T,{protection,private,false})),
+    {'EXIT',{badarg,_}} = (catch ets:setopts(T,protection)),
+    ets:delete(T),
     unlink(Heir),
     exit(Heir, bang),
     ok.
 
-bad_table(doc) -> ["All kinds of operations with bad table argument"];
-bad_table(suite) -> [];
+%% All kinds of operations with bad table argument.
 bad_table(Config) when is_list(Config) ->
 
     %% Open and close disk_log to stabilize etsmem.
     Name = make_ref(),
-    ?line File = filename:join([?config(priv_dir, Config),"bad_table.dummy"]),
-    ?line {ok, Name} = disk_log:open([{name, Name}, {file, File}]),
-    ?line disk_log:close(Name),
+    File = filename:join([proplists:get_value(priv_dir, Config),"bad_table.dummy"]),
+    {ok, Name} = disk_log:open([{name, Name}, {file, File}]),
+    disk_log:close(Name),
     file:delete(File),
 
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
 
     repeat_for_opts(fun(Opts) -> bad_table_do(Opts,File) end,
 		    [write_concurrency, all_types]),
-    ?line verify_etsmem(EtsMem),
+    verify_etsmem(EtsMem),
     ok.
 
 bad_table_do(Opts, DummyFile) ->
@@ -2573,26 +2454,23 @@ bad_table_op({Opts,Priv,Prot}, Op) ->
     end.
 
 bad_table_call(T,{F,Args,_}) ->
-    ?line {'EXIT',{badarg,_}} = (catch apply(ets, F, [T|Args]));
+    {'EXIT',{badarg,_}} = (catch apply(ets, F, [T|Args]));
 bad_table_call(T,{F,Args,_,tabarg_last}) ->
-    ?line {'EXIT',{badarg,_}} = (catch apply(ets, F, Args++[T]));
+    {'EXIT',{badarg,_}} = (catch apply(ets, F, Args++[T]));
 bad_table_call(T,{F,Args,_,{return,Return}}) ->
     try
-	?line Return = apply(ets, F, [T|Args])
+	Return = apply(ets, F, [T|Args])
     catch
 	error:badarg -> ok
     end.
 
 
-rename(doc) ->
-    ["Check rename of ets tables"];
-rename(suite) ->
-    [];
+%% Check rename of ets tables.
 rename(Config) when is_list(Config) ->
     repeat_for_opts(rename_do, [write_concurrency, all_types]).
 
 rename_do(Opts) ->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     ets_new(foobazz,[named_table, public | Opts]),
     ets:insert(foobazz,{foo,bazz}),
     ungermanbazz = ets:rename(foobazz,ungermanbazz),
@@ -2600,42 +2478,39 @@ rename_do(Opts) ->
     [{foo,bazz}] = ets:lookup(ungermanbazz,foo),
     {'EXIT',{badarg,_}} =  (catch ets:rename(ungermanbazz,"no atom")),
     ets:delete(ungermanbazz),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
-rename_unnamed(doc) ->
-    ["Check rename of unnamed ets table"];
-rename_unnamed(suite) ->
-    [];
+%% Check rename of unnamed ets table.
 rename_unnamed(Config) when is_list(Config) ->
     repeat_for_opts(rename_unnamed_do,[write_concurrency,all_types]).
 
 rename_unnamed_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(bonkz,[public | Opts]),
-    ?line {'EXIT',{badarg, _}} = (catch ets:insert(bonkz,{foo,bazz})),
-    ?line bonkz = ets:info(Tab, name),
-    ?line Tab = ets:rename(Tab, tjabonkz),
-    ?line {'EXIT',{badarg, _}} = (catch ets:insert(tjabonkz,{foo,bazz})),
-    ?line tjabonkz = ets:info(Tab, name),
-    ?line ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-
-evil_rename(doc) ->
-    "Rename a table with many fixations, and at the same time delete it.";
+    EtsMem = etsmem(),
+    Tab = ets_new(bonkz,[public | Opts]),
+    {'EXIT',{badarg, _}} = (catch ets:insert(bonkz,{foo,bazz})),
+    bonkz = ets:info(Tab, name),
+    Tab = ets:rename(Tab, tjabonkz),
+    {'EXIT',{badarg, _}} = (catch ets:insert(tjabonkz,{foo,bazz})),
+    tjabonkz = ets:info(Tab, name),
+    ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
+%% Rename a table with many fixations, and at the same time delete it.
 evil_rename(Config) when is_list(Config) ->
-    ?line evil_rename_1(old_hash, new_hash, [public,named_table]),
-    ?line EtsMem = etsmem(),
-    ?line evil_rename_1(old_tree, new_tree, [public,ordered_set,named_table]),
-    ?line verify_etsmem(EtsMem).
+    EtsMem = etsmem(),
+    evil_rename_1(old_hash, new_hash, [public,named_table]),
+    evil_rename_1(old_tree, new_tree, [public,ordered_set,named_table]),
+    wait_for_test_procs(true),
+    verify_etsmem(EtsMem).
 
 evil_rename_1(Old, New, Flags) ->
-    ?line process_flag(trap_exit, true),
-    ?line Old = ets_new(Old, Flags),
-    ?line Fixer = fun() -> ets:safe_fixtable(Old, true) end,
-    ?line crazy_fixtable(15000, Fixer),
-    ?line erlang:yield(),
-    ?line New = ets:rename(Old, New),
-    ?line erlang:yield(),
+    process_flag(trap_exit, true),
+    Old = ets_new(Old, Flags),
+    Fixer = fun() -> ets:safe_fixtable(Old, true) end,
+    crazy_fixtable(15000, Fixer),
+    erlang:yield(),
+    New = ets:rename(Old, New),
+    erlang:yield(),
     ets:delete(New),
     ok.
 
@@ -2666,7 +2541,8 @@ crazy_fixtable_wait(N, Dracula) ->
 crazy_fixtable_1(0, _) ->
     ok;
 crazy_fixtable_1(N, Fun) ->
-    spawn_link(Fun),
+    %%FIXME my_spawn_link(Fun),
+    my_spawn_link(Fun),
     crazy_fixtable_1(N-1, Fun).
 
 evil_creater_destroyer() ->
@@ -2678,19 +2554,16 @@ evil_create_fixed_tab() ->
     ets:safe_fixtable(T, true),
     T.
 
-interface_equality(doc) ->
-    ["Tests that the return values and errors are equal for set's and"
-     " ordered_set's where applicable"];
-interface_equality(suite) ->
-    [];
+%% 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).
 
 interface_equality_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Set = ets_new(set,[set | Opts]),
-    ?line OrderedSet = ets_new(ordered_set,[ordered_set | Opts]),
-    ?line F = fun(X,T,FF) -> case X of 
+    EtsMem = etsmem(),
+    Set = ets_new(set,[set | Opts]),
+    OrderedSet = ets_new(ordered_set,[ordered_set | Opts]),
+    F = fun(X,T,FF) -> case X of
 			   0 -> true; 
 			   _ -> 
 			       ets:insert(T, {X,
@@ -2699,38 +2572,38 @@ interface_equality_do(Opts) ->
 			       FF(X-1,T,FF) 
 		       end 
 	end,
-    ?line F(100,Set,F),
-    ?line F(100,OrderedSet,F),
-    ?line equal_results(ets, insert, Set, OrderedSet, [{a,"a"}]),
-    ?line equal_results(ets, insert, Set, OrderedSet, [{1,1,"1"}]),
-    ?line equal_results(ets, lookup, Set, OrderedSet, [10]),
-    ?line equal_results(ets, lookup, Set, OrderedSet, [1000]),
-    ?line equal_results(ets, delete, Set, OrderedSet, [10]),
-    ?line equal_results(ets, delete, Set, OrderedSet, [nott]),
-    ?line equal_results(ets, lookup, Set, OrderedSet, [1000]),
-    ?line equal_results(ets, insert, Set, OrderedSet, [10]),
-    ?line equal_results(ets, next, Set, OrderedSet, ['$end_of_table']),
-    ?line equal_results(ets, prev, Set, OrderedSet, ['$end_of_table']),
-    ?line equal_results(ets, match, Set, OrderedSet, [{'_','_','_'}]),
-    ?line equal_results(ets, match, Set, OrderedSet, [{'_','_','_','_'}]),
-    ?line equal_results(ets, match, Set, OrderedSet, [{$3,$2,2}]),
-    ?line equal_results(ets, match, Set, OrderedSet, ['_']),
-    ?line equal_results(ets, match, Set, OrderedSet, ['$1']),
-    ?line equal_results(ets, match, Set, OrderedSet, [{'_','$50',3}]),
-    ?line equal_results(ets, match, Set, OrderedSet, [['_','$50',3]]),
-    ?line equal_results(ets, match_delete, Set, OrderedSet, [{'_','_',4}]),
-    ?line equal_results(ets, match_delete, Set, OrderedSet, [{'_','_',4}]),
-    ?line equal_results(ets, match_object, Set, OrderedSet, [{'_','_',4}]),
-    ?line equal_results(ets, match_object, Set, OrderedSet, [{'_','_',5}]),
-    ?line equal_results(ets, match_object, Set, OrderedSet, [{'_','_',4}]),
-    ?line equal_results(ets, match_object, Set, OrderedSet, ['_']),
-    ?line equal_results(ets, match_object, Set, OrderedSet, ['$5011']),
-    ?line equal_results(ets, match_delete, Set, OrderedSet, ['$20']),
-    ?line equal_results(ets, lookup_element, Set, OrderedSet, [13,2]),
-    ?line equal_results(ets, lookup_element, Set, OrderedSet, [13,4]),
-    ?line equal_results(ets, lookup_element, Set, OrderedSet, [14,2]),
-    ?line equal_results(ets, delete, Set, OrderedSet, []),
-    ?line verify_etsmem(EtsMem).
+    F(100,Set,F),
+    F(100,OrderedSet,F),
+    equal_results(ets, insert, Set, OrderedSet, [{a,"a"}]),
+    equal_results(ets, insert, Set, OrderedSet, [{1,1,"1"}]),
+    equal_results(ets, lookup, Set, OrderedSet, [10]),
+    equal_results(ets, lookup, Set, OrderedSet, [1000]),
+    equal_results(ets, delete, Set, OrderedSet, [10]),
+    equal_results(ets, delete, Set, OrderedSet, [nott]),
+    equal_results(ets, lookup, Set, OrderedSet, [1000]),
+    equal_results(ets, insert, Set, OrderedSet, [10]),
+    equal_results(ets, next, Set, OrderedSet, ['$end_of_table']),
+    equal_results(ets, prev, Set, OrderedSet, ['$end_of_table']),
+    equal_results(ets, match, Set, OrderedSet, [{'_','_','_'}]),
+    equal_results(ets, match, Set, OrderedSet, [{'_','_','_','_'}]),
+    equal_results(ets, match, Set, OrderedSet, [{$3,$2,2}]),
+    equal_results(ets, match, Set, OrderedSet, ['_']),
+    equal_results(ets, match, Set, OrderedSet, ['$1']),
+    equal_results(ets, match, Set, OrderedSet, [{'_','$50',3}]),
+    equal_results(ets, match, Set, OrderedSet, [['_','$50',3]]),
+    equal_results(ets, match_delete, Set, OrderedSet, [{'_','_',4}]),
+    equal_results(ets, match_delete, Set, OrderedSet, [{'_','_',4}]),
+    equal_results(ets, match_object, Set, OrderedSet, [{'_','_',4}]),
+    equal_results(ets, match_object, Set, OrderedSet, [{'_','_',5}]),
+    equal_results(ets, match_object, Set, OrderedSet, [{'_','_',4}]),
+    equal_results(ets, match_object, Set, OrderedSet, ['_']),
+    equal_results(ets, match_object, Set, OrderedSet, ['$5011']),
+    equal_results(ets, match_delete, Set, OrderedSet, ['$20']),
+    equal_results(ets, lookup_element, Set, OrderedSet, [13,2]),
+    equal_results(ets, lookup_element, Set, OrderedSet, [13,4]),
+    equal_results(ets, lookup_element, Set, OrderedSet, [14,2]),
+    equal_results(ets, delete, Set, OrderedSet, []),
+    verify_etsmem(EtsMem).
 
 equal_results(M, F, FirstArg1, FirstArg2 ,ACommon) ->
     Res = maybe_sort((catch apply(M,F, [FirstArg1 | ACommon]))),
@@ -2738,8 +2611,6 @@ equal_results(M, F, FirstArg1, FirstArg2 ,ACommon) ->
 
 maybe_sort(L) when is_list(L) ->
     lists:sort(L);
-%maybe_sort({'EXIT',{Reason, [{Module, Function, _}|_]}}) ->
-%    {'EXIT',{Reason, [{Module, Function, '_'}]}};
 maybe_sort({'EXIT',{Reason, List}}) when is_list(List) ->
     {'EXIT',{Reason, lists:map(fun({Module, Function, _, _}) ->
 				       {Module, Function, '_'}
@@ -2748,30 +2619,27 @@ maybe_sort({'EXIT',{Reason, List}}) when is_list(List) ->
 maybe_sort(Any) ->
     Any.
 
-ordered_match(doc) ->
-    ["Test match, match_object and match_delete in ordered set's"];
-ordered_match(suite) ->
-    [];
+%% Test match, match_object and match_delete in ordered set's.
 ordered_match(Config) when is_list(Config)->
     repeat_for_opts(ordered_match_do).
 
 ordered_match_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line F = fun(X,T,FF) -> case X of 
-			 0 -> true; 
-			 _ -> 
-			     ets:insert(T, {X,
-					    integer_to_list(X), 
-					    X rem 10,
-					    X rem 100,
-					    X rem 1000}), 
-			     FF(X-1,T,FF) 
-		     end 
+    EtsMem = etsmem(),
+    F = fun(X,T,FF) -> case X of
+			   0 -> true;
+			   _ ->
+			       ets:insert(T, {X,
+					      integer_to_list(X),
+					      X rem 10,
+					      X rem 100,
+					      X rem 1000}),
+			       FF(X-1,T,FF)
+		       end
 	end,
-    ?line T1 = ets_new(xxx,[ordered_set| Opts]),
-    ?line F(3000,T1,F),
-    ?line [[3,3],[3,3],[3,3]] = ets:match(T1, {'_','_','$1','$2',3}),
-    ?line F2 = fun(X,Rem,Res,FF) -> case X of 
+    T1 = ets_new(xxx,[ordered_set| Opts]),
+    F(3000,T1,F),
+    [[3,3],[3,3],[3,3]] = ets:match(T1, {'_','_','$1','$2',3}),
+    F2 = fun(X,Rem,Res,FF) -> case X of
 				  0 -> []; 
 				  _ -> 
 				      case X rem Rem of
@@ -2787,166 +2655,153 @@ ordered_match_do(Opts) ->
 				      end
 			      end 
 	 end,
-    ?line OL1 = F2(3000,100,2,F2),
-    ?line OL1 = ets:match_object(T1, {'_','_','_',2,'_'}),
-    ?line true = ets:match_delete(T1,{'_','_','_',2,'_'}), 
-    ?line [] = ets:match_object(T1, {'_','_','_',2,'_'}),
-    ?line OL2 = F2(3000,100,3,F2),
-    ?line OL2 = ets:match_object(T1, {'_','_','_',3,'_'}),
-    ?line ets:delete(T1),
-    ?line verify_etsmem(EtsMem).
-    
-
-ordered(doc) ->
-    ["Test basic functionality in ordered_set's."];
-ordered(suite) ->
-    [];
+    OL1 = F2(3000,100,2,F2),
+    OL1 = ets:match_object(T1, {'_','_','_',2,'_'}),
+    true = ets:match_delete(T1,{'_','_','_',2,'_'}),
+    [] = ets:match_object(T1, {'_','_','_',2,'_'}),
+    OL2 = F2(3000,100,3,F2),
+    OL2 = ets:match_object(T1, {'_','_','_',3,'_'}),
+    ets:delete(T1),
+    verify_etsmem(EtsMem).
+
+
+%% Test basic functionality in ordered_set's.
 ordered(Config) when is_list(Config) ->
     repeat_for_opts(ordered_do).
 
 ordered_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line T = ets_new(oset, [ordered_set | Opts]),
-    ?line InsList = [ 
-		      25,26,27,28,
-		      5,6,7,8,
-		      21,22,23,24,
-		      9,10,11,12,
-		      1,2,3,4,
-		      17,18,19,20,
-		      13,14,15,16,
-		      1 bsl 33
-		     ],
-    ?line lists:foreach(fun(X) ->
+    EtsMem = etsmem(),
+    T = ets_new(oset, [ordered_set | Opts]),
+    InsList = [
+	       25,26,27,28,
+	       5,6,7,8,
+	       21,22,23,24,
+	       9,10,11,12,
+	       1,2,3,4,
+	       17,18,19,20,
+	       13,14,15,16,
+	       1 bsl 33
+	      ],
+    lists:foreach(fun(X) ->
 			  ets:insert(T,{X,integer_to_list(X)})
 		  end,
 		  InsList),
-    ?line IL2 = lists:map(fun(X) -> {X,integer_to_list(X)} end, InsList),
-    ?line L1 = pick_all_forward(T),
-    ?line L2 = pick_all_backwards(T),
-    ?line S1 = lists:sort(IL2),
-    ?line S2 = lists:reverse(lists:sort(IL2)),
-    ?line S1 = L1,
-    ?line S2 = L2,
-    ?line [{1,"1"}] = ets:slot(T,0),
-    ?line [{28,"28"}] = ets:slot(T,27),
-    ?line [{1 bsl 33,_}] = ets:slot(T,28),
-    ?line 27 = ets:prev(T,28),
-    ?line [{7,"7"}] = ets:slot(T,6),
-    ?line '$end_of_table' = ets:next(T,1 bsl 33),
-    ?line [{12,"12"}] = ets:slot(T,11),
-    ?line '$end_of_table' = ets:slot(T,29),
-    ?line [{1,"1"}] = ets:slot(T,0),
-    ?line 28 = ets:prev(T,1 bsl 33),
-    ?line 1 = ets:next(T,0),
-    ?line pick_all_forward(T),
-    ?line [{7,"7"}] = ets:slot(T,6),
-    ?line L2 = pick_all_backwards(T),
-    ?line [{7,"7"}] = ets:slot(T,6),
-    ?line ets:delete(T),
-    ?line verify_etsmem(EtsMem).
+    IL2 = lists:map(fun(X) -> {X,integer_to_list(X)} end, InsList),
+    L1 = pick_all_forward(T),
+    L2 = pick_all_backwards(T),
+    S1 = lists:sort(IL2),
+    S2 = lists:reverse(lists:sort(IL2)),
+    S1 = L1,
+    S2 = L2,
+    [{1,"1"}] = ets:slot(T,0),
+    [{28,"28"}] = ets:slot(T,27),
+    [{1 bsl 33,_}] = ets:slot(T,28),
+    27 = ets:prev(T,28),
+    [{7,"7"}] = ets:slot(T,6),
+    '$end_of_table' = ets:next(T,1 bsl 33),
+    [{12,"12"}] = ets:slot(T,11),
+    '$end_of_table' = ets:slot(T,29),
+    [{1,"1"}] = ets:slot(T,0),
+    28 = ets:prev(T,1 bsl 33),
+    1 = ets:next(T,0),
+    pick_all_forward(T),
+    [{7,"7"}] = ets:slot(T,6),
+    L2 = pick_all_backwards(T),
+    [{7,"7"}] = ets:slot(T,6),
+    ets:delete(T),
+    verify_etsmem(EtsMem).
 
 pick_all(_T,'$end_of_table',_How) ->
     [];
 pick_all(T,Last,How) ->
-    ?line This = case How of
+    This = case How of
 	       next ->
-		   ?line ets:next(T,Last);
+		   ets:next(T,Last);
 	       prev ->
-		   ?line ets:prev(T,Last)
+		   ets:prev(T,Last)
 	   end,
-    ?line [LastObj] = ets:lookup(T,Last),
-    ?line [LastObj | pick_all(T,This,How)].
+    [LastObj] = ets:lookup(T,Last),
+    [LastObj | pick_all(T,This,How)].
 
 pick_all_forward(T) ->
-    ?line pick_all(T,ets:first(T),next).
+    pick_all(T,ets:first(T),next).
 pick_all_backwards(T) ->
-    ?line pick_all(T,ets:last(T),prev).
-    
-    
+    pick_all(T,ets:last(T),prev).
 
-setbag(doc) ->   ["Small test case for both set and bag type ets tables."];
-setbag(suite) -> [];
+
+
+%% Small test case for both set and bag type ets tables.
 setbag(Config) when is_list(Config) ->    
-    ?line EtsMem = etsmem(),
-    ?line Set = ets_new(set,[set]),
-    ?line Bag = ets_new(bag,[bag]),
-    ?line Key = {foo,bar},
-    
+    EtsMem = etsmem(),
+    Set = ets_new(set,[set]),
+    Bag = ets_new(bag,[bag]),
+    Key = {foo,bar},
+
     %% insert some value
-    ?line ets:insert(Set,{Key,val1}),
-    ?line ets:insert(Bag,{Key,val1}),
-    
+    ets:insert(Set,{Key,val1}),
+    ets:insert(Bag,{Key,val1}),
+
     %% insert new value for same key again
-    ?line ets:insert(Set,{Key,val2}),
-    ?line ets:insert(Bag,{Key,val2}),
-    
+    ets:insert(Set,{Key,val2}),
+    ets:insert(Bag,{Key,val2}),
+
     %% check
-    ?line [{Key,val2}] = ets:lookup(Set,Key),
-    ?line [{Key,val1},{Key,val2}] = ets:lookup(Bag,Key),
+    [{Key,val2}] = ets:lookup(Set,Key),
+    [{Key,val1},{Key,val2}] = ets:lookup(Bag,Key),
 
     true = ets:delete(Set),
     true = ets:delete(Bag),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
-badnew(doc) ->
-    ["Test case to check proper return values for illegal ets_new() calls."];
-badnew(suite) -> [];
+%% Test case to check proper return values for illegal ets_new() calls.
 badnew(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line {'EXIT',{badarg,_}} = (catch ets_new(12,[])),
-    ?line {'EXIT',{badarg,_}} = (catch ets_new({a,b},[])),
-    ?line {'EXIT',{badarg,_}} = (catch ets_new(name,[foo])),
-    ?line {'EXIT',{badarg,_}} = (catch ets_new(name,{bag})),
-    ?line {'EXIT',{badarg,_}} = (catch ets_new(name,bag)),
-    ?line verify_etsmem(EtsMem).
-
-verybadnew(doc) ->
-    ["Test case to check that a not well formed list does not crash the "
-     "emulator. OTP-2314 "];
-verybadnew(suite) -> [];
+    EtsMem = etsmem(),
+    {'EXIT',{badarg,_}} = (catch ets_new(12,[])),
+    {'EXIT',{badarg,_}} = (catch ets_new({a,b},[])),
+    {'EXIT',{badarg,_}} = (catch ets_new(name,[foo])),
+    {'EXIT',{badarg,_}} = (catch ets_new(name,{bag})),
+    {'EXIT',{badarg,_}} = (catch ets_new(name,bag)),
+    verify_etsmem(EtsMem).
+
+%% OTP-2314. Test case to check that a non-proper list does not
+%% crash the emulator.
 verybadnew(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line {'EXIT',{badarg,_}} = (catch ets_new(verybad,[set|protected])),
-    ?line verify_etsmem(EtsMem).
+    EtsMem = etsmem(),
+    {'EXIT',{badarg,_}} = (catch ets_new(verybad,[set|protected])),
+    verify_etsmem(EtsMem).
 
-named(doc) ->   ["Small check to see if named tables work."];
-named(suite) -> [];
+%% Small check to see if named tables work.
 named(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = make_table(foo,
-			   [named_table],
-			   [{key,val}]),
-    ?line [{key,val}] = ets:lookup(foo,key),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-
-keypos2(doc) ->   ["Test case to check if specified keypos works."];
-keypos2(suite) -> [];
+    EtsMem = etsmem(),
+    Tab = make_table(foo,
+		     [named_table],
+		     [{key,val}]),
+    [{key,val}] = ets:lookup(foo,key),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
+%% Test case to check if specified keypos works.
 keypos2(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = make_table(foo,
-			   [set,{keypos,2}],
-			   [{val,key}, {val2,key}]),
-    ?line [{val2,key}] = ets:lookup(Tab,key),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-
-privacy(doc) ->
-    ["Privacy check. Check that a named(public/private/protected) table "
-     "cannot be read by",
-     "the wrong process(es)."];
-privacy(suite) -> [];
+    EtsMem = etsmem(),
+    Tab = make_table(foo,
+		     [set,{keypos,2}],
+		     [{val,key}, {val2,key}]),
+    [{val2,key}] = ets:lookup(Tab,key),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
+%% 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).
 
 privacy_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line process_flag(trap_exit,true),
-    ?line Owner = my_spawn_link(?MODULE,privacy_owner,[self(),Opts]),
+    EtsMem = etsmem(),
+    process_flag(trap_exit,true),
+    Owner = my_spawn_link(?MODULE,privacy_owner,[self(),Opts]),
     receive
 	{'EXIT',Owner,Reason} ->
-	    ?line exit({privacy_test,Reason});
+	    exit({privacy_test,Reason});
 	ok ->
 	    ok
     end,
@@ -2967,21 +2822,21 @@ privacy_do(Opts) ->
 
     Owner ! die,
     receive {'EXIT',Owner,_} -> ok end,
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 privacy_check(Pub,Prot,Priv) ->
     %% check read rights
-    ?line [] = ets:lookup(Pub, foo),
-    ?line [] = ets:lookup(Prot,foo),
-    ?line {'EXIT',{badarg,_}} = (catch ets:lookup(Priv,foo)),
+    [] = ets:lookup(Pub, foo),
+    [] = ets:lookup(Prot,foo),
+    {'EXIT',{badarg,_}} = (catch ets:lookup(Priv,foo)),
 
     %% check write rights
-    ?line true = ets:insert(Pub, {1,foo}),
-    ?line {'EXIT',{badarg,_}} = (catch ets:insert(Prot,{2,foo})),
-    ?line {'EXIT',{badarg,_}} = (catch ets:insert(Priv,{3,foo})),
+    true = ets:insert(Pub, {1,foo}),
+    {'EXIT',{badarg,_}} = (catch ets:insert(Prot,{2,foo})),
+    {'EXIT',{badarg,_}} = (catch ets:insert(Priv,{3,foo})),
 
     %% check that it really wasn't written, either
-    ?line [] = ets:lookup(Prot,foo).
+    [] = ets:lookup(Prot,foo).
 
 privacy_owner(Boss, Opts) ->
     ets_new(pub, [public,named_table | Opts]),
@@ -2994,7 +2849,7 @@ privacy_owner_loop(Boss) ->
     receive
 	{shift,N,Pub_Prot_Priv} ->
 	    {Pub,Prot,Priv} = rotate_tuple(Pub_Prot_Priv, N),
-	    
+
 	    ets:setopts(Pub,{protection,public}),
 	    ets:setopts(Prot,{protection,protected}),
 	    ets:setopts(Priv,{protection,private}),
@@ -3014,82 +2869,81 @@ rotate_tuple(Tuple, N) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-empty(doc) ->
-    ["Check lookup in an empty table and lookup of a non-existing key"];
-empty(suite) -> [];
+%% Check lookup in an empty table and lookup of a non-existing key.
 empty(Config) when is_list(Config) ->
     repeat_for_opts(empty_do).
 
 empty_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(foo,Opts),
-    ?line [] = ets:lookup(Tab,key),
-    ?line true = ets:insert(Tab,{key2,val}),
-    ?line [] = ets:lookup(Tab,key),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-
-badinsert(doc) ->
-    ["Check proper return values for illegal insert operations."];
-badinsert(suite) -> [];
+    EtsMem = etsmem(),
+    Tab = ets_new(foo,Opts),
+    [] = ets:lookup(Tab,key),
+    true = ets:insert(Tab,{key2,val}),
+    [] = ets:lookup(Tab,key),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
+%% Check proper return values for illegal insert operations.
 badinsert(Config) when is_list(Config) ->
     repeat_for_opts(badinsert_do).
 
 badinsert_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line {'EXIT',{badarg,_}} = (catch ets:insert(foo,{key,val})),
-    
-    ?line Tab = ets_new(foo,Opts),
-    ?line {'EXIT',{badarg,_}} = (catch ets:insert(Tab,{})),
+    EtsMem = etsmem(),
+    {'EXIT',{badarg,_}} = (catch ets:insert(foo,{key,val})),
 
-    ?line Tab3 = ets_new(foo,[{keypos,3}| Opts]),
-    ?line {'EXIT',{badarg,_}} = (catch ets:insert(Tab3,{a,b})),
+    Tab = ets_new(foo,Opts),
+    {'EXIT',{badarg,_}} = (catch ets:insert(Tab,{})),
 
-    ?line {'EXIT',{badarg,_}} = (catch ets:insert(Tab,[key,val2])),
-    ?line true = ets:delete(Tab),
-    ?line true = ets:delete(Tab3),
-    ?line verify_etsmem(EtsMem).
+    Tab3 = ets_new(foo,[{keypos,3}| Opts]),
+    {'EXIT',{badarg,_}} = (catch ets:insert(Tab3,{a,b})),
+
+    {'EXIT',{badarg,_}} = (catch ets:insert(Tab,[key,val2])),
+    true = ets:delete(Tab),
+    true = ets:delete(Tab3),
+    verify_etsmem(EtsMem).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-time_lookup(doc) ->   ["Lookup timing."];
-time_lookup(suite) -> [];
+%% Test lookup timing.
 time_lookup(Config) when is_list(Config) ->
     %% just for timing, really
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     Values = repeat_for_opts(time_lookup_do),
-    ?line verify_etsmem(EtsMem),
-    ?line {comment,lists:flatten(io_lib:format(
-				   "~p ets lookups/s",[Values]))}.
+    verify_etsmem(EtsMem),
+    {comment,lists:flatten(io_lib:format(
+			     "~p ets lookups/s",[Values]))}.
 
 time_lookup_do(Opts) ->
     Tab = ets_new(foo,Opts),
     fill_tab(Tab,foo),
     ets:insert(Tab,{{a,key},foo}),
-    {Time,_} = ?t:timecall(test_server,do_times,
-          		    [100000,ets,lookup,[Tab,{a,key}]]),
+    N = 100000,
+    {Time,_} = timer:tc(fun() -> time_lookup_many(N, Tab) end),
+    Seconds = Time / 1000000,
     true = ets:delete(Tab),
-    round(100000 / Time). % lookups/s
+    round(N / Seconds).				% lookups/s
 
-badlookup(doc) ->
-    ["Check proper return values from bad lookups in existing/non existing "
-     " ets tables"];
-badlookup(suite) -> [];
+time_lookup_many(0, _Tab) ->
+    ok;
+time_lookup_many(N, Tab) ->
+    ets:lookup(Tab, {a,key}),
+    time_lookup_many(N-1, Tab).
+
+%% Check proper return values from bad lookups in existing/non existing
+%% ets tables.
 badlookup(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line {'EXIT',{badarg,_}} = (catch ets:lookup(foo,key)),
-    ?line Tab = ets_new(foo,[]),
-    ?line ets:delete(Tab),
-    ?line {'EXIT',{badarg,_}} = (catch ets:lookup(Tab,key)),
-    ?line verify_etsmem(EtsMem).
-
-lookup_order(doc) ->   ["Test that lookup returns objects in order of insertion for bag and dbag."];
-lookup_order(suite) -> [];
+    EtsMem = etsmem(),
+    {'EXIT',{badarg,_}} = (catch ets:lookup(foo,key)),
+    Tab = ets_new(foo,[]),
+    ets:delete(Tab),
+    {'EXIT',{badarg,_}} = (catch ets:lookup(Tab,key)),
+    verify_etsmem(EtsMem).
+
+%% 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]]),
-    ?line verify_etsmem(EtsMem),
+    verify_etsmem(EtsMem),
     ok.
 
 lookup_order_do(Opts) ->
@@ -3126,7 +2980,7 @@ lookup_order_2(Opts, Fixed) ->
 			  true = ets:delete(T)
 		  end,
 		  Combos).
-			  
+
 
 check_insert({T,List0,Key},Val) ->
     %%io:format("insert ~p into ~p\n",[Val,List0]),
@@ -3141,7 +2995,7 @@ check_insert({T,List0,Key},Val) ->
 check_insert_new({T,List0,Key},Val) ->
     %%io:format("insert_new ~p into ~p\n",[Val,List0]),
     Ret = ets:insert_new(T,{Key,Val}),
-    ?line Ret = (List0 =:= []),
+    Ret = (List0 =:= []),
     List1 = case Ret of
 		true -> [{Key,Val}];
 		false -> List0
@@ -3160,40 +3014,39 @@ check_check(S={T,List,Key}) ->
     case lists:reverse(ets:lookup(T,Key)) of
 	List -> ok;
         ETS -> io:format("check failed:\nETS: ~p\nCHK: ~p\n", [ETS,List]),
-	       ?t:fail("Invalid return value from ets:lookup")
+	       ct:fail("Invalid return value from ets:lookup")
     end,
-    ?line Items = ets:info(T,size),
-    ?line Items = length(List),
+    Items = ets:info(T,size),
+    Items = length(List),
     S.
-    
+
 
 
 fill_tab(Tab,Val) ->
-    ?line ets:insert(Tab,{key,Val}),
-    ?line ets:insert(Tab,{{a,144},Val}),
-    ?line ets:insert(Tab,{{a,key2},Val}),
-    ?line ets:insert(Tab,{14,Val}),
+    ets:insert(Tab,{key,Val}),
+    ets:insert(Tab,{{a,144},Val}),
+    ets:insert(Tab,{{a,key2},Val}),
+    ets:insert(Tab,{14,Val}),
     ok.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-lookup_element_mult(doc) ->   ["Multiple return elements (OTP-2386)"];
-lookup_element_mult(suite) -> [];
+%% OTP-2386. Multiple return elements.
 lookup_element_mult(Config) when is_list(Config) ->
     repeat_for_opts(lookup_element_mult_do).
 
 lookup_element_mult_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line T = ets_new(service, [bag, {keypos, 2} | Opts]),
-    ?line D = lists:reverse(lem_data()),
-    ?line lists:foreach(fun(X) -> ets:insert(T, X) end, D),
-    ?line ok = lem_crash_3(T),
-    ?line ets:insert(T, {0, "heap_key"}),
-    ?line ets:lookup_element(T, "heap_key", 2),
-    ?line true = ets:delete(T),
-    ?line verify_etsmem(EtsMem).
+    EtsMem = etsmem(),
+    T = ets_new(service, [bag, {keypos, 2} | Opts]),
+    D = lists:reverse(lem_data()),
+    lists:foreach(fun(X) -> ets:insert(T, X) end, D),
+    ok = lem_crash_3(T),
+    ets:insert(T, {0, "heap_key"}),
+    ets:lookup_element(T, "heap_key", 2),
+    true = ets:delete(T),
+    verify_etsmem(EtsMem).
 
 lem_data() ->
     [
@@ -3220,69 +3073,64 @@ lem_crash_3(T) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-delete_elem(doc) ->
-    ["Check delete of an element inserted in a `filled' table."];
-delete_elem(suite) -> [];
+%% 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]).
 
 delete_elem_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(foo,Opts),
-    ?line fill_tab(Tab,foo),
-    ?line ets:insert(Tab,{{b,key},foo}),
-    ?line ets:insert(Tab,{{c,key},foo}),
-    ?line true = ets:delete(Tab,{b,key}),
-    ?line [] = ets:lookup(Tab,{b,key}),
-    ?line [{{c,key},foo}] = ets:lookup(Tab,{c,key}),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-    
-delete_tab(doc) ->
-    ["Check that ets:delete() works and releases the name of the deleted "
-     "table."];
-delete_tab(suite) -> [];
+    EtsMem = etsmem(),
+    Tab = ets_new(foo,Opts),
+    fill_tab(Tab,foo),
+    ets:insert(Tab,{{b,key},foo}),
+    ets:insert(Tab,{{c,key},foo}),
+    true = ets:delete(Tab,{b,key}),
+    [] = ets:lookup(Tab,{b,key}),
+    [{{c,key},foo}] = ets:lookup(Tab,{c,key}),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
+%% 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]).
 
 delete_tab_do(Opts) ->
     Name = foo,
-    ?line EtsMem = etsmem(),
-    ?line Name = ets_new(Name, [named_table | Opts]),
-    ?line true = ets:delete(foo),
+    EtsMem = etsmem(),
+    Name = ets_new(Name, [named_table | Opts]),
+    true = ets:delete(foo),
     %% The name should be available again.
-    ?line Name = ets_new(Name, [named_table | Opts]),
-    ?line true = ets:delete(Name),
-    ?line verify_etsmem(EtsMem).
+    Name = ets_new(Name, [named_table | Opts]),
+    true = ets:delete(Name),
+    verify_etsmem(EtsMem).
 
-delete_large_tab(doc) ->
-    "Check that ets:delete/1 works and that other processes can run.";
+%% Check that ets:delete/1 works and that other processes can run.
 delete_large_tab(Config) when is_list(Config) ->
-    ?line Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 200000)],
-    ?line EtsMem = etsmem(),
+    Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 200000)],
+    EtsMem = etsmem(),
     repeat_for_opts(fun(Opts) -> delete_large_tab_do(Opts,Data) end),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 delete_large_tab_do(Opts,Data) ->
-    ?line delete_large_tab_1(foo_hash, Opts, Data, false),
-    ?line delete_large_tab_1(foo_tree, [ordered_set | Opts], Data, false),
-    ?line delete_large_tab_1(foo_hash, Opts, Data, true).
+    delete_large_tab_1(foo_hash, Opts, Data, false),
+    delete_large_tab_1(foo_tree, [ordered_set | Opts], Data, false),
+    delete_large_tab_1(foo_hash, Opts, Data, true).
 
 
 delete_large_tab_1(Name, Flags, Data, Fix) ->
-    ?line Tab = ets_new(Name, Flags),
-    ?line ets:insert(Tab, Data),
+    Tab = ets_new(Name, Flags),
+    ets:insert(Tab, Data),
 
     case Fix of
 	false -> ok;
 	true ->
-	    ?line true = ets:safe_fixtable(Tab, true),
-	    ?line lists:foreach(fun({K,_}) -> ets:delete(Tab, K) end, Data)
+	    true = ets:safe_fixtable(Tab, true),
+	    lists:foreach(fun({K,_}) -> ets:delete(Tab, K) end, Data)
     end,
 
     {priority, Prio} = process_info(self(), priority),	    
-    ?line Deleter = self(),
-    ?line [SchedTracer]
+    Deleter = self(),
+    [SchedTracer]
 	= start_loopers(1,
 			Prio,
 			fun (SC) ->
@@ -3302,59 +3150,59 @@ delete_large_tab_1(Name, Flags, Data, Fix) ->
 			end,
 			0),
     SchedTracerMon = monitor(process, SchedTracer),
-    ?line Loopers = start_loopers(erlang:system_info(schedulers),
-				  Prio,
-				  fun (_) -> erlang:yield() end,
-				  ok),
-    ?line erlang:yield(),
-    ?line 1 = erlang:trace(self(),true,[running,procs,{tracer,SchedTracer}]),
-    ?line true = ets:delete(Tab),
+    Loopers = start_loopers(erlang:system_info(schedulers),
+			    Prio,
+			    fun (_) -> erlang:yield() end,
+			    ok),
+    erlang:yield(),
+    1 = erlang:trace(self(),true,[running,procs,{tracer,SchedTracer}]),
+    true = ets:delete(Tab),
     %% The register stuff is just a trace marker
-    ?line true = register(delete_large_tab_done_marker, self()),
-    ?line true = unregister(delete_large_tab_done_marker),
-    ?line undefined = ets:info(Tab),
-    ?line ok = stop_loopers(Loopers),
-    ?line receive
-	      {schedule_count, N} ->
-		  ?line io:format("~s: context switches: ~p", [Name,N]),
-		  if
-		      N >= 5 -> ?line ok;
-		      true -> ?line ?t:fail()
-		  end
-	  end,
+    true = register(delete_large_tab_done_marker, self()),
+    true = unregister(delete_large_tab_done_marker),
+    undefined = ets:info(Tab),
+    ok = stop_loopers(Loopers),
+    receive
+	{schedule_count, N} ->
+	    io:format("~s: context switches: ~p", [Name,N]),
+	    if
+		N >= 5 -> ok;
+		true -> ct:fail(failed)
+	    end
+    end,
     receive {'DOWN',SchedTracerMon,process,SchedTracer,_} -> ok end,
     ok.
 
-delete_large_named_table(doc) ->
-    "Delete a large name table and try to create a new table with the same name in another process.";
+%% Delete a large name table and try to create a new table with
+%% the same name in another process.
 delete_large_named_table(Config) when is_list(Config) ->    
-    ?line Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 200000)],
-    ?line EtsMem = etsmem(),
+    Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 200000)],
+    EtsMem = etsmem(),
     repeat_for_opts(fun(Opts) -> delete_large_named_table_do(Opts,Data) end),
-    ?line verify_etsmem(EtsMem),
+    verify_etsmem(EtsMem),
     ok.
 
 delete_large_named_table_do(Opts,Data) ->
-    ?line delete_large_named_table_1(foo_hash, [named_table | Opts], Data, false),
-    ?line delete_large_named_table_1(foo_tree, [ordered_set,named_table | Opts], Data, false),
-    ?line delete_large_named_table_1(foo_hash, [named_table | Opts], Data, true).
+    delete_large_named_table_1(foo_hash, [named_table | Opts], Data, false),
+    delete_large_named_table_1(foo_tree, [ordered_set,named_table | Opts], Data, false),
+    delete_large_named_table_1(foo_hash, [named_table | Opts], Data, true).
 
 delete_large_named_table_1(Name, Flags, Data, Fix) ->
-    ?line Tab = ets_new(Name, Flags),
-    ?line ets:insert(Tab, Data),
+    Tab = ets_new(Name, Flags),
+    ets:insert(Tab, Data),
 
     case Fix of
 	false -> ok;
 	true ->
-	    ?line true = ets:safe_fixtable(Tab, true),
-	    ?line lists:foreach(fun({K,_}) -> ets:delete(Tab, K) end, Data)
+	    true = ets:safe_fixtable(Tab, true),
+	    lists:foreach(fun({K,_}) -> ets:delete(Tab, K) end, Data)
     end,
     Parent = self(),
     {Pid, MRef} = my_spawn_opt(fun() ->
-				      receive
-					  ets_new ->
-					      ets_new(Name, [named_table])				      
-				      end
+				       receive
+					   ets_new ->
+					       ets_new(Name, [named_table])
+				       end
 			       end,
 			       [link, monitor]),
     true = ets:delete(Tab),
@@ -3362,139 +3210,128 @@ delete_large_named_table_1(Name, Flags, Data, Fix) ->
     receive {'DOWN',MRef,process,Pid,_} -> ok end,
     ok.
 
-evil_delete(doc) ->
-    "Delete a large table, and kill the process during the delete.";
+%% Delete a large table, and kill the process during the delete.
 evil_delete(Config) when is_list(Config) ->
-    ?line Data = [{I,I*I} || I <- lists:seq(1, 100000)],
+    Data = [{I,I*I} || I <- lists:seq(1, 100000)],
     repeat_for_opts(fun(Opts) -> evil_delete_do(Opts,Data) end).
 
 evil_delete_do(Opts,Data) ->
-    ?line EtsMem = etsmem(),
-    ?line evil_delete_owner(foo_hash, Opts, Data, false),
-    ?line verify_etsmem(EtsMem),
-    ?line evil_delete_owner(foo_hash, Opts, Data, true),
-    ?line verify_etsmem(EtsMem),
-    ?line evil_delete_owner(foo_tree, [ordered_set | Opts], Data, false),
-    ?line verify_etsmem(EtsMem),
-    ?line TabA = evil_delete_not_owner(foo_hash, Opts, Data, false),
-    ?line verify_etsmem(EtsMem),
-    ?line TabB = evil_delete_not_owner(foo_hash, Opts, Data, true),
-    ?line verify_etsmem(EtsMem),
-    ?line TabC = evil_delete_not_owner(foo_tree, [ordered_set | Opts], Data, false),
-    ?line verify_etsmem(EtsMem),
-    ?line lists:foreach(fun(T) -> undefined = ets:info(T) end,
-  			[TabA,TabB,TabC]).
+    EtsMem = etsmem(),
+    evil_delete_owner(foo_hash, Opts, Data, false),
+    verify_etsmem(EtsMem),
+    evil_delete_owner(foo_hash, Opts, Data, true),
+    verify_etsmem(EtsMem),
+    evil_delete_owner(foo_tree, [ordered_set | Opts], Data, false),
+    verify_etsmem(EtsMem),
+    TabA = evil_delete_not_owner(foo_hash, Opts, Data, false),
+    verify_etsmem(EtsMem),
+    TabB = evil_delete_not_owner(foo_hash, Opts, Data, true),
+    verify_etsmem(EtsMem),
+    TabC = evil_delete_not_owner(foo_tree, [ordered_set | Opts], Data, false),
+    verify_etsmem(EtsMem),
+    lists:foreach(fun(T) -> undefined = ets:info(T) end,
+		  [TabA,TabB,TabC]).
 
 evil_delete_not_owner(Name, Flags, Data, Fix) ->
     io:format("Not owner: ~p, fix = ~p", [Name,Fix]),
-    ?line Tab = ets_new(Name, [public|Flags]),
-    ?line ets:insert(Tab, Data),
+    Tab = ets_new(Name, [public|Flags]),
+    ets:insert(Tab, Data),
     case Fix of
 	false -> ok;
 	true ->
-	    ?line true = ets:safe_fixtable(Tab, true),
-	    ?line lists:foreach(fun({K,_}) -> ets:delete(Tab, K) end, Data)
+	    true = ets:safe_fixtable(Tab, true),
+	    lists:foreach(fun({K,_}) -> ets:delete(Tab, K) end, Data)
     end,
-    ?line Pid = my_spawn(fun() ->
-				 P = my_spawn_link(
-				       fun() ->
-					       receive kill -> ok end,
-					       erlang:yield(),
-					       exit(kill_linked_processes_now)
-				       end),
-				 erlang:yield(),
-				 P ! kill,
-				 true = ets:delete(Tab)
-			 end),
-    ?line Ref = erlang:monitor(process, Pid),
-    ?line receive {'DOWN',Ref,_,_,_} -> ok end,
+    Pid = my_spawn(fun() ->
+			   P = my_spawn_link(
+				 fun() ->
+					 receive kill -> ok end,
+					 erlang:yield(),
+					 exit(kill_linked_processes_now)
+				 end),
+			   erlang:yield(),
+			   P ! kill,
+			   true = ets:delete(Tab)
+		   end),
+    Ref = erlang:monitor(process, Pid),
+    receive {'DOWN',Ref,_,_,_} -> ok end,
     Tab.
 
 evil_delete_owner(Name, Flags, Data, Fix) ->
-    ?line Fun = fun() ->
-			?line Tab = ets_new(Name, [public|Flags]),
-			?line ets:insert(Tab, Data),
-			case Fix of
-			    false -> ok;
-			    true ->
-				?line true = ets:safe_fixtable(Tab, true),
-				?line lists:foreach(fun({K,_}) ->
-							    ets:delete(Tab, K)
-						    end, Data)
-			end,
-			erlang:yield(),
-			my_spawn_link(fun() ->
-					      erlang:yield(),
-					      exit(kill_linked_processes_now)
-				      end),
-			true = ets:delete(Tab)
-		end,
-    ?line Pid = my_spawn(Fun),
-    ?line Ref = erlang:monitor(process, Pid),
-    ?line receive {'DOWN',Ref,_,_,_} -> ok end.
-
-
-exit_large_table_owner(doc) ->
-    [];
-exit_large_table_owner(suite) ->
-    [];
+    Fun = fun() ->
+		  Tab = ets_new(Name, [public|Flags]),
+		  ets:insert(Tab, Data),
+		  case Fix of
+		      false -> ok;
+		      true ->
+			  true = ets:safe_fixtable(Tab, true),
+			  lists:foreach(fun({K,_}) ->
+						ets:delete(Tab, K)
+					end, Data)
+		  end,
+		  erlang:yield(),
+		  my_spawn_link(fun() ->
+					erlang:yield(),
+					exit(kill_linked_processes_now)
+				end),
+		  true = ets:delete(Tab)
+	  end,
+    Pid = my_spawn(Fun),
+    Ref = erlang:monitor(process, Pid),
+    receive {'DOWN',Ref,_,_,_} -> ok end.
+
+
 exit_large_table_owner(Config) when is_list(Config) ->
-    %%?line Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 500000)],
-    ?line FEData = fun(Do) -> repeat_while(fun(500000) -> {false,ok};
-                                              (I) -> Do({erlang:phash2(I, 16#ffffff),I}),
-                                                     {true, I+1}
-                                           end, 1)
-                   end,
-    ?line EtsMem = etsmem(),
+    %%Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 500000)],
+    FEData = fun(Do) -> repeat_while(fun(500000) -> {false,ok};
+					(I) -> Do({erlang:phash2(I, 16#ffffff),I}),
+					       {true, I+1}
+				     end, 1)
+	     end,
+    EtsMem = etsmem(),
     repeat_for_opts({exit_large_table_owner_do,{FEData,Config}}),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 exit_large_table_owner_do(Opts,{FEData,Config}) ->
-    ?line verify_rescheduling_exit(Config, FEData, [named_table | Opts], true, 1, 1),
-    ?line verify_rescheduling_exit(Config, FEData, Opts, false, 1, 1).
+    verify_rescheduling_exit(Config, FEData, [named_table | Opts], true, 1, 1),
+    verify_rescheduling_exit(Config, FEData, Opts, false, 1, 1).
 
-exit_many_large_table_owner(doc) -> [];
-exit_many_large_table_owner(suite) -> [];
 exit_many_large_table_owner(Config) when is_list(Config) ->
-    %%?line Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 500000)],
-    ?line FEData = fun(Do) -> repeat_while(fun(500000) -> {false,ok};
-                                              (I) -> Do({erlang:phash2(I, 16#ffffff),I}),
-                                                     {true, I+1}
-                                           end, 1)
-                   end,
-    ?line EtsMem = etsmem(),
+    %%Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 500000)],
+    FEData = fun(Do) -> repeat_while(fun(500000) -> {false,ok};
+					(I) -> Do({erlang:phash2(I, 16#ffffff),I}),
+					       {true, I+1}
+				     end, 1)
+	     end,
+    EtsMem = etsmem(),
     repeat_for_opts(fun(Opts) -> exit_many_large_table_owner_do(Opts,FEData,Config) end),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 exit_many_large_table_owner_do(Opts,FEData,Config) ->
-    ?line verify_rescheduling_exit(Config, FEData, Opts, true, 1, 4),
-    ?line verify_rescheduling_exit(Config, FEData, [named_table | Opts], false, 1, 4).
+    verify_rescheduling_exit(Config, FEData, Opts, true, 1, 4),
+    verify_rescheduling_exit(Config, FEData, [named_table | Opts], false, 1, 4).
 
-exit_many_tables_owner(doc) -> [];
-exit_many_tables_owner(suite) -> [];
 exit_many_tables_owner(Config) when is_list(Config) ->
     NoData = fun(_Do) -> ok end,
-    ?line EtsMem = etsmem(),
-    ?line verify_rescheduling_exit(Config, NoData, [named_table], false, 1000, 1),
-    ?line verify_rescheduling_exit(Config, NoData, [named_table,{write_concurrency,true}], false, 1000, 1),
-    ?line verify_etsmem(EtsMem).
+    EtsMem = etsmem(),
+    verify_rescheduling_exit(Config, NoData, [named_table], false, 1000, 1),
+    verify_rescheduling_exit(Config, NoData, [named_table,{write_concurrency,true}], false, 1000, 1),
+    verify_etsmem(EtsMem).
 
-exit_many_many_tables_owner(doc) -> [];
-exit_many_many_tables_owner(suite) -> [];
 exit_many_many_tables_owner(Config) when is_list(Config) ->
-    ?line Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 50)],
-    ?line FEData = fun(Do) -> lists:foreach(Do, Data) end,
+    Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 50)],
+    FEData = fun(Do) -> lists:foreach(Do, Data) end,
     repeat_for_opts(fun(Opts) -> exit_many_many_tables_owner_do(Opts,FEData,Config) end).
 
 exit_many_many_tables_owner_do(Opts,FEData,Config) ->
-    ?line verify_rescheduling_exit(Config, FEData, [named_table | Opts], true, 200, 5),
-    ?line verify_rescheduling_exit(Config, FEData, Opts, false, 200, 5),
-    ?line wait_for_test_procs(),
-    ?line EtsMem = etsmem(),
-    ?line verify_rescheduling_exit(Config, FEData, Opts, true, 200, 5),
-    ?line verify_rescheduling_exit(Config, FEData, [named_table | Opts], false, 200, 5),
-    ?line verify_etsmem(EtsMem).
-    
+    verify_rescheduling_exit(Config, FEData, [named_table | Opts], true, 200, 5),
+    verify_rescheduling_exit(Config, FEData, Opts, false, 200, 5),
+    wait_for_test_procs(),
+    EtsMem = etsmem(),
+    verify_rescheduling_exit(Config, FEData, Opts, true, 200, 5),
+    verify_rescheduling_exit(Config, FEData, [named_table | Opts], false, 200, 5),
+    verify_etsmem(EtsMem).
+
 
 count_exit_sched(TP) ->
     receive
@@ -3536,11 +3373,11 @@ vre_fix_tables(Tab) ->
     ok.
 
 verify_rescheduling_exit(Config, ForEachData, Flags, Fix, NOTabs, NOProcs) ->
-    ?line NoFix = 5,
-    ?line TestCase = atom_to_list(?config(test_case, Config)),
-    ?line Parent = self(),
-    ?line KillMe = make_ref(),
-    ?line PFun =
+    NoFix = 5,
+    TestCase = atom_to_list(proplists:get_value(test_case, Config)),
+    Parent = self(),
+    KillMe = make_ref(),
+    PFun =
 	fun () ->
 		repeat(
 		  fun () ->
@@ -3558,7 +3395,7 @@ verify_rescheduling_exit(Config, ForEachData, Flags, Fix, NOTabs, NOProcs) ->
 						lists:seq(1,NoFix)),
                                   KeyPos = ets:info(Tab,keypos),
                                   ForEachData(fun(Data) ->
-                                                ets:delete(Tab, element(KeyPos,Data))
+						      ets:delete(Tab, element(KeyPos,Data))
                                               end)
 			  end
 		  end,
@@ -3566,89 +3403,82 @@ verify_rescheduling_exit(Config, ForEachData, Flags, Fix, NOTabs, NOProcs) ->
 		Parent ! {KillMe, self()},
 		receive after infinity -> ok end
 	end,
-    ?line TPs = lists:map(fun (_) ->
-				  ?line TP = my_spawn_link(PFun),
-				  ?line 1 = erlang:trace(TP, true, [exiting]),
-				  TP
-			  end,
-			  lists:seq(1, NOProcs)),
-    ?line lists:foreach(fun (TP) ->
-				receive {KillMe, TP} -> ok end
-			end,
-			TPs),
-    ?line LPs = start_loopers(erlang:system_info(schedulers),
-			      normal,
-			      fun (_) ->
-				      erlang:yield()
-			      end,
-			      ok),
-    ?line lists:foreach(fun (TP) ->
-				?line unlink(TP),
-				?line exit(TP, bang)
-			end,
-			TPs),
-    ?line lists:foreach(fun (TP) ->
-				?line XScheds = count_exit_sched(TP),
-				?line ?t:format("~p XScheds=~p~n",
-						[TP, XScheds]),
-				?line true = XScheds >= 5
+    TPs = lists:map(fun (_) ->
+			    TP = my_spawn_link(PFun),
+			    1 = erlang:trace(TP, true, [exiting]),
+			    TP
+		    end,
+		    lists:seq(1, NOProcs)),
+    lists:foreach(fun (TP) ->
+			  receive {KillMe, TP} -> ok end
+		  end,
+		  TPs),
+    LPs = start_loopers(erlang:system_info(schedulers),
+			normal,
+			fun (_) ->
+				erlang:yield()
 			end,
-			TPs),
-    ?line stop_loopers(LPs),
-    ?line ok.
+			ok),
+    lists:foreach(fun (TP) ->
+			  unlink(TP),
+			  exit(TP, bang)
+		  end,
+		  TPs),
+    lists:foreach(fun (TP) ->
+			  XScheds = count_exit_sched(TP),
+			  io:format("~p XScheds=~p~n",
+				    [TP, XScheds]),
+			  true = XScheds >= 5
+		  end,
+		  TPs),
+    stop_loopers(LPs),
+    ok.
+
 
-			    
 
-table_leak(doc) ->
-    "Make sure that slots for ets tables are cleared properly.";
+%% Make sure that slots for ets tables are cleared properly.
 table_leak(Config) when is_list(Config) ->
     repeat_for_opts(fun(Opts) -> table_leak_1(Opts,20000) end).
 
 table_leak_1(_,0) -> ok;
 table_leak_1(Opts,N) ->
-    ?line T = ets_new(fooflarf, Opts),
-    ?line true = ets:delete(T),
+    T = ets_new(fooflarf, Opts),
+    true = ets:delete(T),
     table_leak_1(Opts,N-1).
 
-baddelete(doc) ->
-    ["Check proper return values for illegal delete operations."];
-baddelete(suite) -> [];
+%% Check proper return values for illegal delete operations.
 baddelete(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line {'EXIT',{badarg,_}} = (catch ets:delete(foo)),
-    ?line Tab = ets_new(foo,[]),
-    ?line true = ets:delete(Tab),
-    ?line {'EXIT',{badarg,_}} = (catch ets:delete(Tab)),
-    ?line verify_etsmem(EtsMem).
-
-match_delete(doc) ->
-    ["Check that match_delete works. Also tests tab2list function."];
-match_delete(suite) -> [];    
+    EtsMem = etsmem(),
+    {'EXIT',{badarg,_}} = (catch ets:delete(foo)),
+    Tab = ets_new(foo,[]),
+    true = ets:delete(Tab),
+    {'EXIT',{badarg,_}} = (catch ets:delete(Tab)),
+    verify_etsmem(EtsMem).
+
+%% Check that match_delete works. Also tests tab2list function.
 match_delete(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     repeat_for_opts(match_delete_do,[write_concurrency,all_types]),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 match_delete_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(kad,Opts),
-    ?line fill_tab(Tab,foo),
-    ?line ets:insert(Tab,{{c,key},bar}),
-    ?line _ = ets:match_delete(Tab,{'_',foo}),
-    ?line [{{c,key},bar}] = ets:tab2list(Tab),
-    ?line _ = ets:match_delete(Tab,'_'),
-    ?line [] = ets:tab2list(Tab),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-
-match_delete3(doc) ->
-    ["OTP-3005: check match_delete with constant argument."];
-match_delete3(suite) -> [];    
+    EtsMem = etsmem(),
+    Tab = ets_new(kad,Opts),
+    fill_tab(Tab,foo),
+    ets:insert(Tab,{{c,key},bar}),
+    _ = ets:match_delete(Tab,{'_',foo}),
+    [{{c,key},bar}] = ets:tab2list(Tab),
+    _ = ets:match_delete(Tab,'_'),
+    [] = ets:tab2list(Tab),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
+%% OTP-3005: check match_delete with constant argument.
 match_delete3(Config) when is_list(Config) ->
     repeat_for_opts(match_delete3_do).
 
 match_delete3_do(Opts) ->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     T = make_table(test,
 		   [duplicate_bag | Opts],
 		   [{aa,17},
@@ -3663,41 +3493,40 @@ match_delete3_do(Opts) ->
     ets:match_delete(T, {cA,1000}),
     [] = ets:match_object(T, {'_', 1000}),
     ets:delete(T),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-firstnext(doc) -> ["Tests ets:first/1 & ets:next/2."];
-firstnext(suite) -> [];
+%% Test ets:first/1 & ets:next/2.
 firstnext(Config) when is_list(Config) ->
     repeat_for_opts(firstnext_do).
 
 firstnext_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(foo,Opts),
-    ?line [] = firstnext_collect(Tab,ets:first(Tab),[]),
-    ?line fill_tab(Tab,foo),
-    ?line Len = length(ets:tab2list(Tab)),
-    ?line Len = length(firstnext_collect(Tab,ets:first(Tab),[])),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
+    EtsMem = etsmem(),
+    Tab = ets_new(foo,Opts),
+    [] = firstnext_collect(Tab,ets:first(Tab),[]),
+    fill_tab(Tab,foo),
+    Len = length(ets:tab2list(Tab)),
+    Len = length(firstnext_collect(Tab,ets:first(Tab),[])),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
 
 firstnext_collect(_Tab,'$end_of_table',List) ->
-    ?line List;
+    List;
 firstnext_collect(Tab,Key,List) ->
-    ?line firstnext_collect(Tab,ets:next(Tab,Key),[Key|List]).
+    firstnext_collect(Tab,ets:next(Tab,Key),[Key|List]).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-firstnext_concurrent(doc) -> "Tests ets:first/1 & ets:next/2.";
+%% Tests ets:first/1 & ets:next/2.
 firstnext_concurrent(Config) when is_list(Config) ->
     register(master, self()),
     ets_init(?MODULE, 20),
     [dynamic_go() || _ <- lists:seq(1, 2)],
     receive
-	after 5000 -> ok
+    after 5000 -> ok
     end.
 
 ets_init(Tab, N) ->
@@ -3728,98 +3557,94 @@ dyn_lookup(T, K) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-slot(suite) -> [];
 slot(Config) when is_list(Config) ->
     repeat_for_opts(slot_do).
 
 slot_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(foo,Opts),
-    ?line fill_tab(Tab,foo),
-    ?line Elts = ets:info(Tab,size),
-    ?line Elts = slot_loop(Tab,0,0),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
+    EtsMem = etsmem(),
+    Tab = ets_new(foo,Opts),
+    fill_tab(Tab,foo),
+    Elts = ets:info(Tab,size),
+    Elts = slot_loop(Tab,0,0),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
 
 slot_loop(Tab,SlotNo,EltsSoFar) ->
-    ?line case ets:slot(Tab,SlotNo) of
-	      '$end_of_table' ->
-		  ?line {'EXIT',{badarg,_}} =
-		      (catch ets:slot(Tab,SlotNo+1)),
-		  ?line EltsSoFar;
-	      Elts ->
-		  ?line slot_loop(Tab,SlotNo+1,EltsSoFar+length(Elts))
+    case ets:slot(Tab,SlotNo) of
+	'$end_of_table' ->
+	    {'EXIT',{badarg,_}} =
+		(catch ets:slot(Tab,SlotNo+1)),
+	    EltsSoFar;
+	Elts ->
+	    slot_loop(Tab,SlotNo+1,EltsSoFar+length(Elts))
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-match1(suite) -> [];
 match1(Config) when is_list(Config) ->
     repeat_for_opts(match1_do).
 
 match1_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(foo,Opts),
-    ?line fill_tab(Tab,foo),
-    ?line [] = ets:match(Tab,{}),
-    ?line ets:insert(Tab,{{one,4},4}),
-    ?line ets:insert(Tab,{{one,5},5}),
-    ?line ets:insert(Tab,{{two,4},4}),
-    ?line ets:insert(Tab,{{two,5},6}),
-    ?line case ets:match(Tab,{{one,'_'},'$0'}) of
-	      [[4],[5]] -> ok;
-	      [[5],[4]] -> ok
-	  end,
-    ?line case ets:match(Tab,{{two,'$1'},'$0'}) of
-	      [[4,4],[6,5]] -> ok;
-	      [[6,5],[4,4]] -> ok
-	  end,
-    ?line case ets:match(Tab,{{two,'$9'},'$4'}) of
-	      [[4,4],[6,5]] -> ok;
-	      [[6,5],[4,4]] -> ok
-	  end,
-    ?line case ets:match(Tab,{{two,'$9'},'$22'}) of
-	      [[4,4],[5,6]] -> ok;
-	      [[5,6],[4,4]] -> ok
-	  end,
-    ?line [[4]] = ets:match(Tab,{{two,'$0'},'$0'}),
-    ?line Len = length(ets:match(Tab,'$0')),
-    ?line Len = length(ets:match(Tab,'_')),
-    ?line if Len > 4 -> ok end,
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-
-match2(doc) -> ["Tests match with specified keypos bag table."];
-match2(suite) -> [];
+    EtsMem = etsmem(),
+    Tab = ets_new(foo,Opts),
+    fill_tab(Tab,foo),
+    [] = ets:match(Tab,{}),
+    ets:insert(Tab,{{one,4},4}),
+    ets:insert(Tab,{{one,5},5}),
+    ets:insert(Tab,{{two,4},4}),
+    ets:insert(Tab,{{two,5},6}),
+    case ets:match(Tab,{{one,'_'},'$0'}) of
+	[[4],[5]] -> ok;
+	[[5],[4]] -> ok
+    end,
+    case ets:match(Tab,{{two,'$1'},'$0'}) of
+	[[4,4],[6,5]] -> ok;
+	[[6,5],[4,4]] -> ok
+    end,
+    case ets:match(Tab,{{two,'$9'},'$4'}) of
+	[[4,4],[6,5]] -> ok;
+	[[6,5],[4,4]] -> ok
+    end,
+    case ets:match(Tab,{{two,'$9'},'$22'}) of
+	[[4,4],[5,6]] -> ok;
+	[[5,6],[4,4]] -> ok
+    end,
+    [[4]] = ets:match(Tab,{{two,'$0'},'$0'}),
+    Len = length(ets:match(Tab,'$0')),
+    Len = length(ets:match(Tab,'_')),
+    if Len > 4 -> ok end,
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
+%% Test match with specified keypos bag table.
 match2(Config) when is_list(Config) ->
     repeat_for_opts(match2_do).
 
 match2_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = make_table(foobar,
-			   [bag, named_table, {keypos, 2} | Opts],
-			   [{value1, key1},
-			    {value2_1, key2},
-			    {value2_2, key2},
-			    {value3_1, key3},
-			    {value3_2, key3},
-			    {value2_1, key2_wannabe}]),
-    ?line case length(ets:match(Tab, '$1')) of
-	      6 -> ok;
-	      _ -> ?t:fail("Length of matched list is wrong.")
-	  end,
-    ?line [[value3_1],[value3_2]] = ets:match(Tab, {'$1', key3}),
-    ?line [[key1]] = ets:match(Tab, {value1, '$1'}),
-    ?line [[key2_wannabe],[key2]] = ets:match(Tab, {value2_1, '$2'}),
-    ?line [] = ets:match(Tab,{'$1',nosuchkey}),
-    ?line [] = ets:match(Tab,{'$1',kgY2}), % same hash as key2
-    ?line [] = ets:match(Tab,{nosuchvalue,'$1'}),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-
-match_object(doc) -> ["Some ets:match_object test."];
-match_object(suite) -> [];    
+    EtsMem = etsmem(),
+    Tab = make_table(foobar,
+		     [bag, named_table, {keypos, 2} | Opts],
+		     [{value1, key1},
+		      {value2_1, key2},
+		      {value2_2, key2},
+		      {value3_1, key3},
+		      {value3_2, key3},
+		      {value2_1, key2_wannabe}]),
+    case length(ets:match(Tab, '$1')) of
+	6 -> ok;
+	_ -> ct:fail("Length of matched list is wrong.")
+    end,
+    [[value3_1],[value3_2]] = ets:match(Tab, {'$1', key3}),
+    [[key1]] = ets:match(Tab, {value1, '$1'}),
+    [[key2_wannabe],[key2]] = ets:match(Tab, {value2_1, '$2'}),
+    [] = ets:match(Tab,{'$1',nosuchkey}),
+    [] = ets:match(Tab,{'$1',kgY2}), % same hash as key2
+    [] = ets:match(Tab,{nosuchvalue,'$1'}),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
+%% Some ets:match_object tests.
 match_object(Config) when is_list(Config) ->
     repeat_for_opts(match_object_do).
 
@@ -3844,25 +3669,25 @@ match_object_do(Opts) ->
     case ets:match_object(Tab, {{one, '_'}, '$0'}) of
 	[{{one,5},5},{{one,4},4}] -> ok;
 	[{{one,4},4},{{one,5},5}] -> ok;
-	_ -> ?t:fail("ets:match_object() returned something funny.")
+	_ -> ct:fail("ets:match_object() returned something funny.")
     end,
     case ets:match_object(Tab, {{two, '$1'}, '$0'}) of
 	[{{two,5},6},{{two,4},4}] -> ok;
 	[{{two,4},4},{{two,5},6}] -> ok;
-	_ -> ?t:fail("ets:match_object() returned something funny.")
+	_ -> ct:fail("ets:match_object() returned something funny.")
     end,
     case ets:match_object(Tab, {{two, '$9'}, '$4'}) of
 	[{{two,5},6},{{two,4},4}] -> ok;
 	[{{two,4},4},{{two,5},6}] -> ok;
-	_ -> ?t:fail("ets:match_object() returned something funny.")
+	_ -> ct:fail("ets:match_object() returned something funny.")
     end,
     case ets:match_object(Tab, {{two, '$9'}, '$22'}) of
 	[{{two,5},6},{{two,4},4}] -> ok;
 	[{{two,4},4},{{two,5},6}] -> ok;
-	_ -> ?t:fail("ets:match_object() returned something funny.")
+	_ -> ct:fail("ets:match_object() returned something funny.")
     end,
 
-    % Check that maps are inspected for variables.
+    %% Check that maps are inspected for variables.
     [{#{camembert:=cabécou},7}] = ets:match_object(Tab, {#{camembert=>'_'},7}),
 
     [{#{"hi":="hello",#{"wazzup"=>3}:="awesome","1337":="42"},9}] =
@@ -3881,13 +3706,13 @@ match_object_do(Opts) ->
          {#{"1337" := "42","hi" := "hello","wazzup" := #{"awesome" := 3}},10}] -> ok;
         [{#{"1337" := "42","hi" := "hello","wazzup" := #{"awesome" := 3}},10},
          {#{"1337" := "42","hi" := "hello","wazzup" := "awesome"},8}] -> ok;
-        _ -> ?t:fail("ets:match_object() returned something funny.")
+        _ -> ct:fail("ets:match_object() returned something funny.")
     end,
     case ets:match_object(Tab, {#{"hi"=>'_'},'_'}) of
         [{#{"1337":="42", "hi":="hello"},_},
          {#{"1337":="42", "hi":="hello"},_},
          {#{"1337":="42", "hi":="hello"},_}] -> ok;
-        _ -> ?t:fail("ets:match_object() returned something funny.")
+        _ -> ct:fail("ets:match_object() returned something funny.")
     end,
 
     %% match large maps
@@ -3897,191 +3722,205 @@ match_object_do(Opts) ->
         %% only match a part of the map
         [{#{1:=1,5:=5,99:=99,100:=100},11},{#{1:="hi",6:="hi",99:="hi"},12}] -> ok;
         [{#{1:="hi",2:="hi",59:="hi"},12},{#{1:=1,2:=2,39:=39,100:=100},11}] -> ok;
-        _ -> ?t:fail("ets:match_object() returned something funny.")
+        _ -> ct:fail("ets:match_object() returned something funny.")
     end,
     case ets:match_object(Tab, {maps:from_list([{I,'_'}||I<-Is]),'_'}) of
         %% only match a part of the map
         [{#{1:=1,5:=5,99:=99,100:=100},11},{#{1:="hi",6:="hi",99:="hi"},12}] -> ok;
         [{#{1:="hi",2:="hi",59:="hi"},12},{#{1:=1,2:=2,39:=39,100:=100},11}] -> ok;
-        _ -> ?t:fail("ets:match_object() returned something funny.")
+        _ -> ct:fail("ets:match_object() returned something funny.")
     end,
     {'EXIT',{badarg,_}} = (catch ets:match_object(Tab, {#{'$1'=>'_'},7})),
     Mve = maps:from_list([{list_to_atom([$$|integer_to_list(I)]),'_'}||I<-Is]),
     {'EXIT',{badarg,_}} = (catch ets:match_object(Tab, {Mve,11})),
 
-    % Check that unsuccessful match returns an empty list.
+    %% Check that unsuccessful match returns an empty list.
     [] = ets:match_object(Tab, {{three,'$0'}, '$92'}),
-    % Check that '$0' equals '_'.
+    %% Check that '$0' equals '_'.
     Len = length(ets:match_object(Tab, '$0')),
     Len = length(ets:match_object(Tab, '_')),
     if Len > 4 -> ok end,
     true = ets:delete(Tab),
     verify_etsmem(EtsMem).
 
-match_object2(suite) -> [];
-match_object2(doc) -> ["Tests that db_match_object does not generate "
-		       "a `badarg' when resuming a search with no "
-		       "previous matches."];
+%% 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).
 
 match_object2_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(foo, [bag, {keypos, 2} | Opts]),
-    ?line fill_tab2(Tab, 0, 13005),     % match_db_object does 1000
-                                       % elements per pass, might
-                                       % change in the future.
-    ?line case catch ets:match_object(Tab, {hej, '$1'}) of
-	      {'EXIT', _} ->
-		  ets:delete(Tab),
-		  ?t:fail("match_object EXIT:ed");
-	      [] ->
-		  io:format("Nothing matched.");
-	      List ->
-		  io:format("Matched:~p~n",[List])
-	  end,
+    EtsMem = etsmem(),
+    Tab = ets_new(foo, [bag, {keypos, 2} | Opts]),
+    fill_tab2(Tab, 0, 13005),     % match_db_object does 1000
+						% elements per pass, might
+						% change in the future.
+    case catch ets:match_object(Tab, {hej, '$1'}) of
+	{'EXIT', _} ->
+	    ets:delete(Tab),
+	    ct:fail("match_object EXIT:ed");
+	[] ->
+	    io:format("Nothing matched.");
+	List ->
+	    io:format("Matched:~p~n",[List])
+    end,
     ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-tab2list(doc) -> ["Tests tab2list (OTP-3319)"];
-tab2list(suite) -> [];
+%% OTP-3319. Test tab2list.
 tab2list(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = make_table(foo,
-			   [ordered_set],
-			   [{a,b}, {c,b}, {b,b}, {a,c}]),
-    ?line [{a,c},{b,b},{c,b}] = ets:tab2list(Tab),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-
-misc1(doc) -> ["Simple general small test. ",
-	      "If this fails, ets is in really bad shape."];
-misc1(suite) -> [];
+    EtsMem = etsmem(),
+    Tab = make_table(foo,
+		     [ordered_set],
+		     [{a,b}, {c,b}, {b,b}, {a,c}]),
+    [{a,c},{b,b},{c,b}] = ets:tab2list(Tab),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
+%% Simple general small test.  If this fails, ets is in really bad
+%% shape.
 misc1(Config) when is_list(Config) ->
     repeat_for_opts(misc1_do).
 
 misc1_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(foo,Opts),
-    ?line true = lists:member(Tab,ets:all()),
-    ?line ets:delete(Tab),
-    ?line false = lists:member(Tab,ets:all()),
-    ?line case catch ets:delete(Tab) of
-	      {'EXIT',_Reason} ->
-		       ?line verify_etsmem(EtsMem);
-	      true ->
-		  ?t:fail("Delete of nonexisting table returned `true'.")
-	  end,
+    EtsMem = etsmem(),
+    Tab = ets_new(foo,Opts),
+    true = lists:member(Tab,ets:all()),
+    ets:delete(Tab),
+    false = lists:member(Tab,ets:all()),
+    case catch ets:delete(Tab) of
+	{'EXIT',_Reason} ->
+	    verify_etsmem(EtsMem);
+	true ->
+	    ct:fail("Delete of nonexisting table returned `true'.")
+    end,
     ok.
 
-safe_fixtable(doc) ->  ["Check the safe_fixtable function."];
-safe_fixtable(suite) -> [];
+%% Check the safe_fixtable function.
 safe_fixtable(Config) when is_list(Config) ->
     repeat_for_opts(safe_fixtable_do).
 
 safe_fixtable_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(foo, Opts),
-    ?line fill_tab(Tab, foobar),
-    ?line true = ets:safe_fixtable(Tab, true),
-    ?line receive after 1 -> ok end,
-    ?line true = ets:safe_fixtable(Tab, false),
-    ?line false = ets:info(Tab,safe_fixed),
-    ?line true = ets:safe_fixtable(Tab, true),
+    EtsMem = etsmem(),
+    Tab = ets_new(foo, Opts),
+    fill_tab(Tab, foobar),
+    true = ets:safe_fixtable(Tab, true),
+    receive after 1 -> ok end,
+    true = ets:safe_fixtable(Tab, false),
+    false = ets:info(Tab,safe_fixed_monotonic_time),
+    false = ets:info(Tab,safe_fixed),
+    SysBefore = erlang:timestamp(),
+    MonBefore = erlang:monotonic_time(),
+    true = ets:safe_fixtable(Tab, true),
+    MonAfter = erlang:monotonic_time(),
+    SysAfter = erlang:timestamp(),
     Self = self(),
-    ?line {{_,_,_},[{Self,1}]} = ets:info(Tab,safe_fixed),
+    {FixMonTime,[{Self,1}]} = ets:info(Tab,safe_fixed_monotonic_time),
+    {FixSysTime,[{Self,1}]} = ets:info(Tab,safe_fixed),
+    true = is_integer(FixMonTime),
+    true = MonBefore =< FixMonTime,
+    true = FixMonTime =< MonAfter,
+    {FstMs,FstS,FstUs} = FixSysTime,
+    true = is_integer(FstMs),
+    true = is_integer(FstS),
+    true = is_integer(FstUs),
+    case erlang:system_info(time_warp_mode) of
+	no_time_warp ->
+	    true = timer:now_diff(FixSysTime, SysBefore) >= 0,
+	    true = timer:now_diff(SysAfter, FixSysTime) >= 0;
+	_ ->
+	    %% ets:info(Tab,safe_fixed) not timewarp safe...
+	    ignore
+    end,
     %% Test that an unjustified 'unfix' is a no-op.
     {Pid,MRef} = my_spawn_monitor(fun() -> true = ets:safe_fixtable(Tab,false) end),
     {'DOWN', MRef, process, Pid, normal} = receive M -> M end,
-    ?line true = ets:info(Tab,fixed),
-    ?line {{_,_,_},[{Self,1}]} = ets:info(Tab,safe_fixed),
+    true = ets:info(Tab,fixed),
+    {FixMonTime,[{Self,1}]} = ets:info(Tab,safe_fixed_monotonic_time),
+    {FixSysTime,[{Self,1}]} = ets:info(Tab,safe_fixed),
     %% badarg's
-    ?line {'EXIT', {badarg, _}} = (catch ets:safe_fixtable(Tab, foobar)),
-    ?line true = ets:info(Tab,fixed),
-    ?line true = ets:safe_fixtable(Tab, false),
-    ?line false = ets:info(Tab,fixed),
-    ?line {'EXIT', {badarg, _}} = (catch ets:safe_fixtable(Tab, foobar)),
-    ?line false = ets:info(Tab,fixed),
-    ?line ets:delete(Tab),
-    ?line case catch ets:safe_fixtable(Tab, true) of
-	      {'EXIT', _Reason} ->
-		       ?line verify_etsmem(EtsMem);
-	      _ ->
-		  ?t:fail("Fixtable on nonexisting table returned `true'")
-	  end,
+    {'EXIT', {badarg, _}} = (catch ets:safe_fixtable(Tab, foobar)),
+    true = ets:info(Tab,fixed),
+    true = ets:safe_fixtable(Tab, false),
+    false = ets:info(Tab,fixed),
+    {'EXIT', {badarg, _}} = (catch ets:safe_fixtable(Tab, foobar)),
+    false = ets:info(Tab,fixed),
+    ets:delete(Tab),
+    case catch ets:safe_fixtable(Tab, true) of
+	{'EXIT', _Reason} ->
+	    verify_etsmem(EtsMem);
+	_ ->
+	    ct:fail("Fixtable on nonexisting table returned `true'")
+    end,
     ok.
 
-info(doc) -> ["Tests ets:info result for required tuples."];
-info(suite) -> [];
+%% Tests ets:info result for required tuples.
 info(Config) when is_list(Config) ->
     repeat_for_opts(info_do).
 
 info_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line MeMyselfI=self(),
-    ?line ThisNode=node(),
-    ?line Tab = ets_new(foobar, [{keypos, 2} | Opts]),
+    EtsMem = etsmem(),
+    MeMyselfI=self(),
+    ThisNode=node(),
+    Tab = ets_new(foobar, [{keypos, 2} | Opts]),
 
     %% Note: ets:info/1 used to return a tuple, but from R11B onwards it
     %% returns a list.
-    ?line Res = ets:info(Tab),
-    ?line {value, {memory, _Mem}} = lists:keysearch(memory, 1, Res),
-    ?line {value, {owner, MeMyselfI}} = lists:keysearch(owner, 1, Res),
-    ?line {value, {name, foobar}} = lists:keysearch(name, 1, Res),
-    ?line {value, {size, 0}} = lists:keysearch(size, 1, Res),
-    ?line {value, {node, ThisNode}} = lists:keysearch(node, 1, Res),
-    ?line {value, {named_table, false}} = lists:keysearch(named_table, 1, Res),
-    ?line {value, {type, set}} = lists:keysearch(type, 1, Res),
-    ?line {value, {keypos, 2}} = lists:keysearch(keypos, 1, Res),
-    ?line {value, {protection, protected}} =
+    Res = ets:info(Tab),
+    {value, {memory, _Mem}} = lists:keysearch(memory, 1, Res),
+    {value, {owner, MeMyselfI}} = lists:keysearch(owner, 1, Res),
+    {value, {name, foobar}} = lists:keysearch(name, 1, Res),
+    {value, {size, 0}} = lists:keysearch(size, 1, Res),
+    {value, {node, ThisNode}} = lists:keysearch(node, 1, Res),
+    {value, {named_table, false}} = lists:keysearch(named_table, 1, Res),
+    {value, {type, set}} = lists:keysearch(type, 1, Res),
+    {value, {keypos, 2}} = lists:keysearch(keypos, 1, Res),
+    {value, {protection, protected}} =
 	lists:keysearch(protection, 1, Res),
-    ?line true = ets:delete(Tab),
-    ?line undefined = ets:info(non_existing_table_xxyy),
-    ?line undefined = ets:info(non_existing_table_xxyy,type),
-    ?line undefined = ets:info(non_existing_table_xxyy,node),
-    ?line undefined = ets:info(non_existing_table_xxyy,named_table),
-    ?line undefined = ets:info(non_existing_table_xxyy,safe_fixed),
-    ?line verify_etsmem(EtsMem).
-
-dups(doc) -> ["Test various duplicate_bags stuff"];
-dups(suite) -> [];
+    true = ets:delete(Tab),
+    undefined = ets:info(non_existing_table_xxyy),
+    undefined = ets:info(non_existing_table_xxyy,type),
+    undefined = ets:info(non_existing_table_xxyy,node),
+    undefined = ets:info(non_existing_table_xxyy,named_table),
+    undefined = ets:info(non_existing_table_xxyy,safe_fixed_monotonic_time),
+    undefined = ets:info(non_existing_table_xxyy,safe_fixed),
+    verify_etsmem(EtsMem).
+
+%% Test various duplicate_bags stuff.
 dups(Config) when is_list(Config) ->
     repeat_for_opts(dups_do).
 
 dups_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line T = make_table(funky,
-			 [duplicate_bag | Opts],
-			 [{1, 2}, {1, 2}]),
-    ?line 2 = length(ets:tab2list(T)),
-    ?line ets:delete(T, 1),
-    ?line [] = ets:lookup(T, 1),
-
-    ?line ets:insert(T, {1, 2, 2}),
-    ?line ets:insert(T, {1, 2, 4}),
-    ?line ets:insert(T, {1, 2, 2}),
-    ?line ets:insert(T, {1, 2, 2}),
-    ?line ets:insert(T, {1, 2, 4}),
-
-    ?line 5 = length(ets:tab2list(T)),
-
-    ?line 5 = length(ets:match(T, {'$1', 2, '$2'})),
-    ?line 3 = length(ets:match(T, {'_', '$1', '$1'})),
-    ?line ets:match_delete(T, {'_', '$1', '$1'}),
-    ?line 0 = length(ets:match(T, {'_', '$1', '$1'})),
-    ?line ets:delete(T),
-    ?line verify_etsmem(EtsMem).
+    EtsMem = etsmem(),
+    T = make_table(funky,
+		   [duplicate_bag | Opts],
+		   [{1, 2}, {1, 2}]),
+    2 = length(ets:tab2list(T)),
+    ets:delete(T, 1),
+    [] = ets:lookup(T, 1),
+
+    ets:insert(T, {1, 2, 2}),
+    ets:insert(T, {1, 2, 4}),
+    ets:insert(T, {1, 2, 2}),
+    ets:insert(T, {1, 2, 2}),
+    ets:insert(T, {1, 2, 4}),
+
+    5 = length(ets:tab2list(T)),
+
+    5 = length(ets:match(T, {'$1', 2, '$2'})),
+    3 = length(ets:match(T, {'_', '$1', '$1'})),
+    ets:match_delete(T, {'_', '$1', '$1'}),
+    0 = length(ets:match(T, {'_', '$1', '$1'})),
+    ets:delete(T),
+    verify_etsmem(EtsMem).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-tab2file(doc) -> ["Check the ets:tab2file function on an empty "
-		  "ets table."];
-tab2file(suite) -> [];
+%% Test the ets:tab2file function on an empty ets table.
 tab2file(Config) when is_list(Config) ->
-    ?line FName = filename:join([?config(priv_dir, Config),"tab2file_case"]),
+    FName = filename:join([proplists:get_value(priv_dir, Config),"tab2file_case"]),
     tab2file_do(FName, []),
     tab2file_do(FName, [{sync,true}]),
     tab2file_do(FName, [{sync,false}]),
@@ -4091,62 +3930,60 @@ tab2file(Config) when is_list(Config) ->
 
 tab2file_do(FName, Opts) ->
     %% Write an empty ets table to a file, read back and check properties.
-    ?line Tab = ets_new(ets_SUITE_foo_tab, [named_table, set, public,
-					    {keypos, 2},
-					    compressed,
-					    {write_concurrency,true},
-					    {read_concurrency,true}]),
+    Tab = ets_new(ets_SUITE_foo_tab, [named_table, set, public,
+				      {keypos, 2},
+				      compressed,
+				      {write_concurrency,true},
+				      {read_concurrency,true}]),
     catch file:delete(FName),
     Res = ets:tab2file(Tab, FName, Opts),
     true = ets:delete(Tab),
     ok = Res,
-    %
-    ?line EtsMem = etsmem(),
-    ?line {ok, Tab2} = ets:file2tab(FName),
+    %%
+    EtsMem = etsmem(),
+    {ok, Tab2} = ets:file2tab(FName),
     public = ets:info(Tab2, protection),
-    ?line true = ets:info(Tab2, named_table),
-    ?line 2 = ets:info(Tab2, keypos),
-    ?line set = ets:info(Tab2, type),
+    true = ets:info(Tab2, named_table),
+    2 = ets:info(Tab2, keypos),
+    set = ets:info(Tab2, type),
     true = ets:info(Tab2, compressed),
     Smp = erlang:system_info(smp_support),
     Smp = ets:info(Tab2, read_concurrency),
     Smp = ets:info(Tab2, write_concurrency),
-    ?line true = ets:delete(Tab2),
-    ?line verify_etsmem(EtsMem).
+    true = ets:delete(Tab2),
+    verify_etsmem(EtsMem).
+
 
-    
-tab2file2(doc) -> ["Check the ets:tab2file function on a ",
-		   "filled set/bag type ets table."];
-tab2file2(suite) -> [];
+%% 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]).
 
 tab2file2_do(Opts, Config) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(ets_SUITE_foo_tab, [named_table, private,
-					    {keypos, 2} | Opts]),
-    ?line FName = filename:join([?config(priv_dir, Config),"tab2file2_case"]),
-    ?line ok = fill_tab2(Tab, 0, 10000),   % Fill up the table (grucho mucho!)
-    ?line Len = length(ets:tab2list(Tab)),
-    ?line Mem = ets:info(Tab, memory),
-    ?line Type = ets:info(Tab, type),
+    EtsMem = etsmem(),
+    Tab = ets_new(ets_SUITE_foo_tab, [named_table, private,
+				      {keypos, 2} | Opts]),
+    FName = filename:join([proplists:get_value(priv_dir, Config),"tab2file2_case"]),
+    ok = fill_tab2(Tab, 0, 10000),   % Fill up the table (grucho mucho!)
+    Len = length(ets:tab2list(Tab)),
+    Mem = ets:info(Tab, memory),
+    Type = ets:info(Tab, type),
     %%io:format("org tab: ~p\n",[ets:info(Tab)]),
-    ?line ok = ets:tab2file(Tab, FName),
-    ?line true = ets:delete(Tab),
+    ok = ets:tab2file(Tab, FName),
+    true = ets:delete(Tab),
 
-    ?line EtsMem4 = etsmem(),
+    EtsMem4 = etsmem(),
 
-    ?line {ok, Tab2} = ets:file2tab(FName),
+    {ok, Tab2} = ets:file2tab(FName),
     %%io:format("loaded tab: ~p\n",[ets:info(Tab2)]),
-    ?line private = ets:info(Tab2, protection),
-    ?line true = ets:info(Tab2, named_table),
-    ?line 2 = ets:info(Tab2, keypos),
-    ?line Type = ets:info(Tab2, type),
-    ?line Len = length(ets:tab2list(Tab2)),
-    ?line Mem = ets:info(Tab2, memory),
-    ?line true = ets:delete(Tab2),
+    private = ets:info(Tab2, protection),
+    true = ets:info(Tab2, named_table),
+    2 = ets:info(Tab2, keypos),
+    Type = ets:info(Tab2, type),
+    Len = length(ets:tab2list(Tab2)),
+    Mem = ets:info(Tab2, memory),
+    true = ets:delete(Tab2),
     io:format("Between = ~p\n", [EtsMem4]),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 -define(test_list, [8,5,4,1,58,125,255, 250, 245, 240, 235,
 		    230, Num rem 255, 255, 125, 130, 135, 140, 145,
@@ -4161,33 +3998,30 @@ tab2file2_do(Opts, Config) ->
 fill_tab2(_Tab, _Val, 0) ->
     ok;
 fill_tab2(Tab, Val, Num) ->
-    ?line Item =
+    Item =
 	case Num rem 10 of
 	    0 -> "String";
-	    1 -> ?line ?test_atom;
-	    2 -> ?line ?test_tuple;
-	    3 -> ?line ?test_integer;
-	    4 -> ?line ?test_float;
-	    5 -> ?line list_to_binary(?test_list); %Heap binary
-	    6 -> ?line list_to_binary(?big_test_list); %Refc binary
-	    7 -> ?line make_sub_binary(?test_list, Num); %Sub binary
-	    8 -> ?line ?test_list;
-	    9 -> ?line fun(X) -> {Tab,Val,X*Num} end
+	    1 -> ?test_atom;
+	    2 -> ?test_tuple;
+	    3 -> ?test_integer;
+	    4 -> ?test_float;
+	    5 -> list_to_binary(?test_list); %Heap binary
+	    6 -> list_to_binary(?big_test_list); %Refc binary
+	    7 -> make_sub_binary(?test_list, Num); %Sub binary
+	    8 -> ?test_list;
+	    9 -> fun(X) -> {Tab,Val,X*Num} end
 	end,
-    ?line true=ets:insert(Tab, {Item, Val}),
-    ?line fill_tab2(Tab, Val+1, Num-1),
+    true=ets:insert(Tab, {Item, Val}),
+    fill_tab2(Tab, Val+1, Num-1),
     ok.
 
-tabfile_ext1(suite) ->
-    [];
-tabfile_ext1(doc) ->
-    ["Tests verification of tables with object count extended_info"];
+%% Test verification of tables with object count extended_info.
 tabfile_ext1(Config) when is_list(Config) ->
     repeat_for_opts(fun(Opts) -> tabfile_ext1_do(Opts, Config) end).
 
 tabfile_ext1_do(Opts,Config) ->
-    ?line FName = filename:join([?config(priv_dir, Config),"nisse.dat"]),
-    ?line FName2 = filename:join([?config(priv_dir, Config),"countflip.dat"]),
+    FName = filename:join([proplists:get_value(priv_dir, Config),"nisse.dat"]),
+    FName2 = filename:join([proplists:get_value(priv_dir, Config),"countflip.dat"]),
     L = lists:seq(1,10),
     T = ets_new(x,Opts),
     Name = make_ref(),
@@ -4218,16 +4052,14 @@ tabfile_ext1_do(Opts,Config) ->
     file:delete(FName2),
     ok.
 
-tabfile_ext2(suite) ->
-    [];
-tabfile_ext2(doc) ->
-    ["Tests verification of tables with md5sum extended_info"];
+
+%% Test verification of tables with md5sum extended_info.
 tabfile_ext2(Config) when is_list(Config) ->
     repeat_for_opts(fun(Opts) -> tabfile_ext2_do(Opts,Config) end).
 
 tabfile_ext2_do(Opts,Config) ->
-    ?line FName = filename:join([?config(priv_dir, Config),"olle.dat"]),
-    ?line FName2 = filename:join([?config(priv_dir, Config),"bitflip.dat"]),
+    FName = filename:join([proplists:get_value(priv_dir, Config),"olle.dat"]),
+    FName2 = filename:join([proplists:get_value(priv_dir, Config),"bitflip.dat"]),
     L = lists:seq(1,10),
     T = ets_new(x,Opts),
     Name = make_ref(),
@@ -4258,13 +4090,10 @@ tabfile_ext2_do(Opts,Config) ->
     file:delete(FName2),
     ok.
 
-tabfile_ext3(suite) ->
-    [];
-tabfile_ext3(doc) ->
-    ["Tests verification of (named) tables without extended info"];
+%% Test verification of (named) tables without extended info.
 tabfile_ext3(Config) when is_list(Config) ->
-    ?line FName = filename:join([?config(priv_dir, Config),"namn.dat"]),
-    ?line FName2 = filename:join([?config(priv_dir, Config),"ncountflip.dat"]),
+    FName = filename:join([proplists:get_value(priv_dir, Config),"namn.dat"]),
+    FName2 = filename:join([proplists:get_value(priv_dir, Config),"ncountflip.dat"]),
     L = lists:seq(1,10),
     Name = make_ref(),
     ?MODULE = ets_new(?MODULE,[named_table]),
@@ -4292,12 +4121,9 @@ tabfile_ext3(Config) when is_list(Config) ->
     file:delete(FName2),
     ok.
 
-tabfile_ext4(suite) ->
-    [];
-tabfile_ext4(doc) ->
-    ["Tests verification of large table with md5 sum"];
+%% Tests verification of large table with md5 sum.
 tabfile_ext4(Config) when is_list(Config) ->
-    ?line FName = filename:join([?config(priv_dir, Config),"bauta.dat"]),
+    FName = filename:join([proplists:get_value(priv_dir, Config),"bauta.dat"]),
     LL = lists:seq(1,10000),
     TL = ets_new(x,[]),
     Name2 = make_ref(),
@@ -4334,12 +4160,9 @@ tabfile_ext4(Config) when is_list(Config) ->
     file:delete(FName),
     ok.
 
-badfile(suite) ->
-    [];
-badfile(doc) ->
-    ["Tests that no disk_log is left open when file has been corrupted"];
+%% Test that no disk_log is left open when file has been corrupted.
 badfile(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir,Config),
+    PrivDir = proplists:get_value(priv_dir,Config),
     File = filename:join(PrivDir, "badfile"),
     _ = file:delete(File),
     T = ets:new(table, []),
@@ -4395,32 +4218,31 @@ make_sub_binary(List, Num) when is_list(List) ->
 
 
 %% Lookup stuff like crazy...
-heavy_lookup(doc) -> ["Performs multiple lookups for every key ",
-		      "in a large table."];
-heavy_lookup(suite) -> [];
+
+%% Perform multiple lookups for every key in a large table.
 heavy_lookup(Config) when is_list(Config) ->
     repeat_for_opts(heavy_lookup_do).
 
 heavy_lookup_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(foobar_table, [set, protected, {keypos, 2} | Opts]),
-    ?line ok = fill_tab2(Tab, 0, 7000),
-    ?line ?t:do_times(50, ?MODULE, do_lookup, [Tab, 6999]),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
+    EtsMem = etsmem(),
+    Tab = ets_new(foobar_table, [set, protected, {keypos, 2} | Opts]),
+    ok = fill_tab2(Tab, 0, 7000),
+    _ = [do_lookup(Tab, 6999) || _ <- lists:seq(1, 50)],
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
 
 do_lookup(_Tab, 0) -> ok;
 do_lookup(Tab, N) ->
     case ets:lookup(Tab, N) of
-	[] -> ?t:format("Set #~p was reported as empty. Not valid.",
-				 [N]),
-	      exit('Invalid lookup');
-	_ ->  do_lookup(Tab, N-1)
+	[] ->
+	    io:format("Set #~p was reported as empty. Not valid.",
+		      [N]),
+	    exit('Invalid lookup');
+	_ ->
+	    do_lookup(Tab, N-1)
     end.
 
-heavy_lookup_element(doc) -> ["Performs multiple lookups for ",
-			      "every element in a large table."];
-heavy_lookup_element(suite) -> [];
+%% 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).
 
@@ -4428,22 +4250,22 @@ heavy_lookup_element_do(Opts) ->
     EtsMem = etsmem(),
     Tab = ets_new(foobar_table, [set, protected, {keypos, 2} | Opts]),
     ok = fill_tab2(Tab, 0, 7000),
-    % lookup ALL elements 50 times
-    ?t:do_times(50, ?MODULE, do_lookup_element, [Tab, 6999, 1]),
+    %% lookup ALL elements 50 times
+    _ = [do_lookup_element(Tab, 6999, 1) || _ <- lists:seq(1, 50)],
     true = ets:delete(Tab),
     verify_etsmem(EtsMem).
 
 do_lookup_element(_Tab, 0, _) -> ok;
 do_lookup_element(Tab, N, M) ->
-    ?line case catch ets:lookup_element(Tab, N, M) of
-	      {'EXIT', {badarg, _}} ->
-		  case M of
-		      1 -> ?t:fail("Set #~p reported as empty. Not valid.",
-				   [N]),
-			   exit('Invalid lookup_element');
-		      _ -> ?line do_lookup_element(Tab, N-1, 1)
-		  end;
-	      _ -> ?line do_lookup_element(Tab, N, M+1)
+    case catch ets:lookup_element(Tab, N, M) of
+	{'EXIT', {badarg, _}} ->
+	    case M of
+		1 -> ct:fail("Set #~p reported as empty. Not valid.",
+			     [N]),
+		     exit('Invalid lookup_element');
+		_ -> do_lookup_element(Tab, N-1, 1)
+	    end;
+	_ -> do_lookup_element(Tab, N, M+1)
     end.
 
 
@@ -4451,28 +4273,28 @@ heavy_concurrent(Config) when is_list(Config) ->
     repeat_for_opts(do_heavy_concurrent).
 
 do_heavy_concurrent(Opts) ->
-    ?line Size = 10000,
-    ?line EtsMem = etsmem(),
-    ?line Tab = ets_new(blupp, [set, public, {keypos, 2} | Opts]),
-    ?line ok = fill_tab2(Tab, 0, Size),
-    ?line Procs = lists:map(
-		    fun (N) ->
-			    my_spawn_link(
-			      fun () ->
-				      do_heavy_concurrent_proc(Tab, Size, N)
-			      end)
-		    end,
-		    lists:seq(1, 500)),
-    ?line lists:foreach(fun (P) ->
-				M = erlang:monitor(process, P),
-				receive
-				    {'DOWN', M, process, P, _} ->
-					ok
-				end
-			end,
-			Procs),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
+    Size = 10000,
+    EtsMem = etsmem(),
+    Tab = ets_new(blupp, [set, public, {keypos, 2} | Opts]),
+    ok = fill_tab2(Tab, 0, Size),
+    Procs = lists:map(
+	      fun (N) ->
+		      my_spawn_link(
+			fun () ->
+				do_heavy_concurrent_proc(Tab, Size, N)
+			end)
+	      end,
+	      lists:seq(1, 500)),
+    lists:foreach(fun (P) ->
+			  M = erlang:monitor(process, P),
+			  receive
+			      {'DOWN', M, process, P, _} ->
+				  ok
+			  end
+		  end,
+		  Procs),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
 
 do_heavy_concurrent_proc(_Tab, 0, _Offs) ->
     done;
@@ -4486,96 +4308,78 @@ do_heavy_concurrent_proc(Tab, N, Offs) ->
     do_heavy_concurrent_proc(Tab, N-1, Offs).
 
 
-fold_empty(doc) ->
-    [];
-fold_empty(suite) -> [];
 fold_empty(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line Tab = make_table(a, [], []),
-    ?line [] = ets:foldl(fun(_X) -> exit(hej) end, [], Tab),
-    ?line [] = ets:foldr(fun(_X) -> exit(hej) end, [], Tab),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-
-foldl(doc) ->
-    [];
-foldl(suite) -> [];
+    EtsMem = etsmem(),
+    Tab = make_table(a, [], []),
+    [] = ets:foldl(fun(_X) -> exit(hej) end, [], Tab),
+    [] = ets:foldr(fun(_X) -> exit(hej) end, [], Tab),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
 foldl(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line L = [{a,1}, {c,3}, {b,2}],
-    ?line LS = lists:sort(L),
-    ?line Tab = make_table(a, [bag], L),
-    ?line LS = lists:sort(ets:foldl(fun(E,A) -> [E|A] end, [], Tab)),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-
-foldr(doc) ->
-    [];
-foldr(suite) -> [];
+    EtsMem = etsmem(),
+    L = [{a,1}, {c,3}, {b,2}],
+    LS = lists:sort(L),
+    Tab = make_table(a, [bag], L),
+    LS = lists:sort(ets:foldl(fun(E,A) -> [E|A] end, [], Tab)),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
 foldr(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line L = [{a,1}, {c,3}, {b,2}],
-    ?line LS = lists:sort(L),
-    ?line Tab = make_table(a, [bag], L),
-    ?line LS = lists:sort(ets:foldr(fun(E,A) -> [E|A] end, [], Tab)),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-
-foldl_ordered(doc) ->
-    [];
-foldl_ordered(suite) -> [];
+    EtsMem = etsmem(),
+    L = [{a,1}, {c,3}, {b,2}],
+    LS = lists:sort(L),
+    Tab = make_table(a, [bag], L),
+    LS = lists:sort(ets:foldr(fun(E,A) -> [E|A] end, [], Tab)),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
 foldl_ordered(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line L = [{a,1}, {c,3}, {b,2}],
-    ?line LS = lists:sort(L),
-    ?line Tab = make_table(a, [ordered_set], L),
-    ?line LS = lists:reverse(ets:foldl(fun(E,A) -> [E|A] end, [], Tab)),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-
-foldr_ordered(doc) ->
-    [];
-foldr_ordered(suite) -> [];
+    EtsMem = etsmem(),
+    L = [{a,1}, {c,3}, {b,2}],
+    LS = lists:sort(L),
+    Tab = make_table(a, [ordered_set], L),
+    LS = lists:reverse(ets:foldl(fun(E,A) -> [E|A] end, [], Tab)),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
 foldr_ordered(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
-    ?line L = [{a,1}, {c,3}, {b,2}],
-    ?line LS = lists:sort(L),
-    ?line Tab = make_table(a, [ordered_set], L),
-    ?line LS = ets:foldr(fun(E,A) -> [E|A] end, [], Tab),
-    ?line true = ets:delete(Tab),
-    ?line verify_etsmem(EtsMem).
-
-member(suite) ->
-    [];
-member(doc) ->
-    ["Tests ets:member BIF"];
+    EtsMem = etsmem(),
+    L = [{a,1}, {c,3}, {b,2}],
+    LS = lists:sort(L),
+    Tab = make_table(a, [ordered_set], L),
+    LS = ets:foldr(fun(E,A) -> [E|A] end, [], Tab),
+    true = ets:delete(Tab),
+    verify_etsmem(EtsMem).
+
+%% Test ets:member BIF.
 member(Config) when is_list(Config) ->
     repeat_for_opts(member_do, [write_concurrency, all_types]).
 
 member_do(Opts) ->
-    ?line EtsMem = etsmem(),
-    ?line T = ets_new(xxx, Opts),
-    ?line false = ets:member(T,hej),
-    ?line E = fun(0,_F)->ok;
-		 (N,F) -> 
-		      ?line ets:insert(T,{N,N rem 10}), 
-		      F(N-1,F) 
-	      end,
-    ?line E(10000,E),                                                          
-    ?line false = ets:member(T,hej),
-    ?line true = ets:member(T,1),
-    ?line false = ets:member(T,20000),
-    ?line ets:delete(T,5),
-    ?line false = ets:member(T,5),
-    ?line ets:safe_fixtable(T,true),
-    ?line ets:delete(T,6),
-    ?line false = ets:member(T,6),
-    ?line ets:safe_fixtable(T,false),
-    ?line false = ets:member(T,6),
-    ?line ets:delete(T),
-    ?line {'EXIT',{badarg,_}} = (catch ets:member(finnsinte, 23)),
-    ?line {'EXIT',{badarg,_}} = (catch ets:member(T, 23)),
-    ?line verify_etsmem(EtsMem).
+    EtsMem = etsmem(),
+    T = ets_new(xxx, Opts),
+    false = ets:member(T,hej),
+    E = fun(0,_F)->ok;
+	   (N,F) ->
+		ets:insert(T,{N,N rem 10}),
+		F(N-1,F)
+	end,
+    E(10000,E),
+    false = ets:member(T,hej),
+    true = ets:member(T,1),
+    false = ets:member(T,20000),
+    ets:delete(T,5),
+    false = ets:member(T,5),
+    ets:safe_fixtable(T,true),
+    ets:delete(T,6),
+    false = ets:member(T,6),
+    ets:safe_fixtable(T,false),
+    false = ets:member(T,6),
+    ets:delete(T),
+    {'EXIT',{badarg,_}} = (catch ets:member(finnsinte, 23)),
+    {'EXIT',{badarg,_}} = (catch ets:member(T, 23)),
+    verify_etsmem(EtsMem).
 
 
 build_table(L1,L2,Num) ->
@@ -4661,11 +4465,11 @@ create_random_string(0) ->
     [];
 
 create_random_string(OfLength) ->
-    C = case random:uniform(2) of
-	1 ->
-	    (random:uniform($Z - $A + 1) - 1) + $A;
-	_ ->
-	    (random:uniform($z - $a + 1) - 1) + $a
+    C = case rand:uniform(2) of
+	    1 ->
+		(rand:uniform($Z - $A + 1) - 1) + $A;
+	    _ ->
+		(rand:uniform($z - $a + 1) - 1) + $a
 	end,
     [C | create_random_string(OfLength - 1)].
 
@@ -4676,23 +4480,23 @@ create_random_tuple(OfLength) ->
 			    end,create_random_string(OfLength))).
 
 create_partly_bound_tuple(OfLength) ->
-    case random:uniform(2) of
+    case rand:uniform(2) of
 	1 ->
-	   create_partly_bound_tuple1(OfLength); 
+	    create_partly_bound_tuple1(OfLength);
 	_ ->
-	   create_partly_bound_tuple3(OfLength)
+	    create_partly_bound_tuple3(OfLength)
     end.
 
 create_partly_bound_tuple1(OfLength) ->
     T0 = create_random_tuple(OfLength),
-    I = random:uniform(OfLength),
+    I = rand:uniform(OfLength),
     setelement(I,T0,'$1').
 
 
 set_n_random_elements(T0,0,_,_) ->
     T0;
 set_n_random_elements(T0,N,OfLength,GenFun) ->
-    I = random:uniform(OfLength),
+    I = rand:uniform(OfLength),
     What = GenFun(I),
     case element(I,T0) of
 	What ->
@@ -4706,12 +4510,12 @@ make_dollar_atom(I) ->
     list_to_atom([$$] ++ integer_to_list(I)).
 create_partly_bound_tuple2(OfLength) ->
     T0 = create_random_tuple(OfLength),
-    I = random:uniform(OfLength - 1),
+    I = rand:uniform(OfLength - 1),
     set_n_random_elements(T0,I,OfLength,fun make_dollar_atom/1).
 
 create_partly_bound_tuple3(OfLength) ->
     T0 = create_random_tuple(OfLength),
-    I = random:uniform(OfLength - 1),
+    I = rand:uniform(OfLength - 1),
     set_n_random_elements(T0,I,OfLength,fun(_) -> '_' end).
 
 do_n_times(_,0) ->
@@ -4755,7 +4559,7 @@ xfilltabint(Tab,N) ->
 	_ ->
 	    filltabint(Tab,N)
     end.
-    
+
 
 filltabstr(Tab,N) ->
     filltabstr(Tab,0,N).
@@ -4926,7 +4730,7 @@ successive_delete(Table,From,To,Type,TType) ->
 	 end,
     case TType of
 	X when X == bag; X == duplicate_bag ->
-	    %erlang:display(From),
+	    %%erlang:display(From),
 	    case From rem 2 of
 		0 ->
 		    2 = ets:select_delete(Table,MS);
@@ -4945,19 +4749,19 @@ successive_delete(Table,From,To,Type,TType) ->
     successive_delete(Table, Next, To, Type,TType).
 
 gen_dets_filename(Config,N) ->
-    filename:join(?config(priv_dir,Config),
+    filename:join(proplists:get_value(priv_dir,Config),
 		  "testdets_" ++ integer_to_list(N) ++ ".dets").
 
 otp_6842_select_1000(Config) when is_list(Config) -> 
-    ?line Tab = ets_new(xxx,[ordered_set]),
-    ?line [ets:insert(Tab,{X,X}) || X <- lists:seq(1,10000)],
-    ?line AllTrue = lists:duplicate(10,true),
-    ?line AllTrue = 
+    Tab = ets_new(xxx,[ordered_set]),
+    [ets:insert(Tab,{X,X}) || X <- lists:seq(1,10000)],
+    AllTrue = lists:duplicate(10,true),
+    AllTrue =
 	[ length(
 	    element(1,
 		    ets:select(Tab,[{'_',[],['$_']}],X*1000))) =:= 
-	  X*1000 || X <- lists:seq(1,10) ],
-    ?line Sequences = [[1000,1000,1000,1000,1000,1000,1000,1000,1000,1000],
+	      X*1000 || X <- lists:seq(1,10) ],
+    Sequences = [[1000,1000,1000,1000,1000,1000,1000,1000,1000,1000],
 		 [2000,2000,2000,2000,2000],
 		 [3000,3000,3000,1000],
 		 [4000,4000,2000],
@@ -4967,9 +4771,9 @@ otp_6842_select_1000(Config) when is_list(Config) ->
 		 [8000,2000],
 		 [9000,1000],
 		 [10000]],
-    ?line AllTrue = [ check_seq(Tab, ets:select(Tab,[{'_',[],['$_']}],hd(L)),L) || 
+    AllTrue = [ check_seq(Tab, ets:select(Tab,[{'_',[],['$_']}],hd(L)),L) ||
 		  L <- Sequences ],
-    ?line ets:delete(Tab),
+    ets:delete(Tab),
     ok.
 
 check_seq(_,'$end_of_table',[]) ->
@@ -5003,7 +4807,7 @@ w(_,0, _) -> ok;
 w(T,N, Id) -> 
     ets:insert(T, {N, Id}),
     w(T,N-1,Id).
-    
+
 verify(T, Ids) ->
     List = my_tab_to_list(T),
     Errors = lists:filter(fun(Bucket) ->
@@ -5014,7 +4818,7 @@ verify(T, Ids) ->
 	    ok;
 	_ ->
 	    io:format("Failed:\n~p\n", [Errors]),
-	    ?t:fail()
+	    ct:fail(failed)
     end.
 
 verify2([{_N,Id}|RL], [Id|R]) ->
@@ -5023,8 +4827,7 @@ verify2([],[]) -> false;
 verify2(_Err, _) ->
     true.
 
-otp_7665(doc) -> ["delete_object followed by delete on fixed bag failed to delete objects."];
-otp_7665(suite) -> [];
+%% 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).
 
@@ -5034,30 +4837,30 @@ otp_7665_do(Opts) ->
     Max = 10,
     lists:foreach(fun(N)-> otp_7665_act(Tab,Min,Max,N) end,
 		  lists:seq(Min,Max)),
-    ?line true = ets:delete(Tab).
-    
+    true = ets:delete(Tab).
+
 otp_7665_act(Tab,Min,Max,DelNr) ->
     List1 = [{key,N} || N <- lists:seq(Min,Max)],
-    ?line true = ets:insert(Tab, List1),
-    ?line true = ets:safe_fixtable(Tab, true),
-    ?line true = ets:delete_object(Tab, {key,DelNr}),
+    true = ets:insert(Tab, List1),
+    true = ets:safe_fixtable(Tab, true),
+    true = ets:delete_object(Tab, {key,DelNr}),
     List2 = lists:delete({key,DelNr}, List1),
 
     %% Now verify that we find all remaining objects
-    ?line List2 = ets:lookup(Tab,key),
-    ?line EList2 = lists:map(fun({key,N})-> N end, 
-			     List2),
-    ?line EList2 = ets:lookup_element(Tab,key,2),    
-    ?line true = ets:delete(Tab, key),
-    ?line [] = ets:lookup(Tab, key),
-    ?line true = ets:safe_fixtable(Tab, false),
+    List2 = ets:lookup(Tab,key),
+    EList2 = lists:map(fun({key,N})-> N end,
+		       List2),
+    EList2 = ets:lookup_element(Tab,key,2),
+    true = ets:delete(Tab, key),
+    [] = ets:lookup(Tab, key),
+    true = ets:safe_fixtable(Tab, false),
     ok.
 
 %% Whitebox testing of meta name table hashing.
 meta_wb(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
     repeat_for_opts(meta_wb_do),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 
 meta_wb_do(Opts) ->
@@ -5070,53 +4873,54 @@ meta_wb_do(Opts) ->
     Len = length(Names),
     OpFuns = {fun meta_wb_new/4, fun meta_wb_delete/4, fun meta_wb_rename/4},
 
-    ?line true = (Len >= 3),
+    true = (Len >= 3),
 
     io:format("Colliding names = ~p\n",[Names]),
     F = fun(0,_,_) -> ok;
-	   (N,Tabs,Me) -> Name1 = lists:nth(random:uniform(Len),Names), 
-			  Name2 = lists:nth(random:uniform(Len),Names), 
-			  Op = element(random:uniform(3),OpFuns),
-			  NTabs = Op(Name1, Name2, Tabs, Opts),
-			  Me(N-1,NTabs,Me) 
+	   (N,Tabs,Me) ->
+		Name1 = lists:nth(rand:uniform(Len), Names),
+		Name2 = lists:nth(rand:uniform(Len), Names),
+		Op = element(rand:uniform(3),OpFuns),
+		NTabs = Op(Name1, Name2, Tabs, Opts),
+		Me(N-1, NTabs, Me)
 	end,
     F(Len*100, [], F),
 
-    % cleanup
+    %% cleanup
     lists:foreach(fun(Name)->catch ets:delete(Name) end,
 		  Names).
-    
+
 meta_wb_new(Name, _, Tabs, Opts) ->
     case (catch ets_new(Name,[named_table|Opts])) of
 	Name ->
-	    ?line false = lists:member(Name, Tabs),
+	    false = lists:member(Name, Tabs),
 	    [Name | Tabs];	
 	{'EXIT',{badarg,_}} ->
-	    ?line true = lists:member(Name, Tabs),
+	    true = lists:member(Name, Tabs),
 	    Tabs
     end.
 meta_wb_delete(Name, _, Tabs, _) ->
     case (catch ets:delete(Name)) of
 	true ->
-	    ?line true = lists:member(Name, Tabs),
+	    true = lists:member(Name, Tabs),
 	    lists:delete(Name, Tabs);
 	{'EXIT',{badarg,_}} ->
-	    ?line false = lists:member(Name, Tabs),
+	    false = lists:member(Name, Tabs),
 	    Tabs
     end.
 meta_wb_rename(Old, New, Tabs, _) ->
     case (catch ets:rename(Old,New)) of
 	New ->
-	    ?line true = lists:member(Old, Tabs)
+	    true = lists:member(Old, Tabs)
 		andalso not lists:member(New, Tabs),
 	    [New | lists:delete(Old, Tabs)];
 	{'EXIT',{badarg,_}} ->
-	    ?line true = not lists:member(Old, Tabs) 
+	    true = not lists:member(Old, Tabs)
 		orelse lists:member(New,Tabs),
 	    Tabs
     end.
-	    
-    
+
+
 colliding_names(Name) ->
     erts_debug:set_internal_state(colliding_names, {Name,5}).
 
@@ -5124,17 +4928,13 @@ colliding_names(Name) ->
 %% OTP_6913: Grow and shrink.
 
 grow_shrink(Config) when is_list(Config) ->
-    ?line EtsMem = etsmem(),
+    EtsMem = etsmem(),
 
     Set = ets_new(a, [set]),
     grow_shrink_0(0, 3071, 3000, 5000, Set),
     ets:delete(Set),
 
-    %OrdSet = ets_new(a, [ordered_set]),
-    %grow_shrink_0(0, lists:seq(3071, 5000), OrdSet),
-    %ets:delete(OrdSet),
-
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 grow_shrink_0(N, _, _, Max, _) when N >= Max ->
     ok;
@@ -5147,21 +4947,18 @@ grow_shrink_1(N0, GrowN, ShrinkN, T) ->
     grow_shrink_3(N1, N1 - ShrinkN, T).
 
 grow_shrink_2(N, GrowTo, _) when N > GrowTo ->
-    %io:format("Grown to ~p\n", [GrowTo]),
     GrowTo;
 grow_shrink_2(N, GrowTo, T) ->
     true = ets:insert(T, {N,a}),
     grow_shrink_2(N+1, GrowTo, T).
 
 grow_shrink_3(N, ShrinkTo, _) when N =< ShrinkTo ->
-    %io:format("Shrunk to ~p\n", [ShrinkTo]),
     ShrinkTo;
 grow_shrink_3(N, ShrinkTo, T) ->
     true = ets:delete(T, N),
     grow_shrink_3(N-1, ShrinkTo, T).
-    
-grow_pseudo_deleted(doc) -> ["Grow a table that still contains pseudo-deleted objects"];
-grow_pseudo_deleted(suite) -> [];
+
+%% Grow a table that still contains pseudo-deleted objects.
 grow_pseudo_deleted(Config) when is_list(Config) ->
     only_if_smp(fun() -> grow_pseudo_deleted_do() end).
 
@@ -5172,17 +4969,17 @@ grow_pseudo_deleted_do() ->
 grow_pseudo_deleted_do(Type) ->
     process_flag(scheduler,1),
     Self = self(),
-    ?line T = ets_new(kalle,[Type,public,{write_concurrency,true}]),
+    T = ets_new(kalle,[Type,public,{write_concurrency,true}]),
     Mod = 7, Mult = 10000,
     filltabint(T,Mod*Mult),
-    ?line true = ets:safe_fixtable(T,true),
-    ?line Mult = ets:select_delete(T,
-				   [{{'$1', '_'},
-				     [{'=:=', {'rem', '$1', Mod}, 0}],
-				     [true]}]),
+    true = ets:safe_fixtable(T,true),
+    Mult = ets:select_delete(T,
+			     [{{'$1', '_'},
+			       [{'=:=', {'rem', '$1', Mod}, 0}],
+			       [true]}]),
     Left = Mult*(Mod-1),
-    ?line Left = ets:info(T,size),
-    ?line Mult = get_kept_objects(T),
+    Left = ets:info(T,size),
+    Mult = get_kept_objects(T),
     filltabstr(T,Mult),
     my_spawn_opt(
       fun() ->
@@ -5198,7 +4995,7 @@ grow_pseudo_deleted_do(Type) ->
 		    end),
 	      Self ! done
       end, [link, {scheduler,2}]),
-    ?line start = receive_any(),
+    start = receive_any(),
     io:format("Unfixing table... nitems=~p\n", [ets:info(T, size)]),
     do_tc(fun() ->
 		  true = ets:safe_fixtable(T, false)
@@ -5207,15 +5004,14 @@ grow_pseudo_deleted_do(Type) ->
 		  io:format("Unfix table done in ~p ms. nitems=~p\n",
 			    [Elapsed,ets:info(T, size)])
 	  end),
-    ?line false = ets:info(T,fixed),
-    ?line 0 = get_kept_objects(T),
-    ?line done = receive_any(),
+    false = ets:info(T,fixed),
+    0 = get_kept_objects(T),
+    done = receive_any(),
     %%verify_table_load(T), % may fail if concurrency is poor (genny)
     ets:delete(T),
     process_flag(scheduler,0).
 
-shrink_pseudo_deleted(doc) -> ["Shrink a table that still contains pseudo-deleted objects"];
-shrink_pseudo_deleted(suite) -> [];
+%% Shrink a table that still contains pseudo-deleted objects.
 shrink_pseudo_deleted(Config) when is_list(Config) ->
     only_if_smp(fun()->shrink_pseudo_deleted_do() end).
 
@@ -5226,16 +5022,16 @@ shrink_pseudo_deleted_do() ->
 shrink_pseudo_deleted_do(Type) ->
     process_flag(scheduler,1),
     Self = self(),
-    ?line T = ets_new(kalle,[Type,public,{write_concurrency,true}]),
+    T = ets_new(kalle,[Type,public,{write_concurrency,true}]),
     Half = 10000,
     filltabint(T,Half*2),
-    ?line true = ets:safe_fixtable(T,true),
-    ?line Half = ets:select_delete(T,
-				   [{{'$1', '_'},
-				     [{'>', '$1', Half}],
-				     [true]}]),    
-    ?line Half = ets:info(T,size),
-    ?line Half = get_kept_objects(T),
+    true = ets:safe_fixtable(T,true),
+    Half = ets:select_delete(T,
+			     [{{'$1', '_'},
+			       [{'>', '$1', Half}],
+			       [true]}]),
+    Half = ets:info(T,size),
+    Half = get_kept_objects(T),
     my_spawn_opt(
       fun()-> true = ets:info(T,fixed),
 	      Self ! start,
@@ -5246,10 +5042,10 @@ shrink_pseudo_deleted_do(Type) ->
 		    fun(Elapsed) ->
 			    io:format("Done with delete in ~p ms.\n",
 				      [Elapsed])
-				end),
+		    end),
 	      Self ! done
       end, [link, {scheduler,2}]),
-    ?line start = receive_any(),
+    start = receive_any(),
     io:format("Unfixing table... nitems=~p\n", [ets:info(T, size)]),
     do_tc(fun() ->
 		  true = ets:safe_fixtable(T, false)
@@ -5258,20 +5054,19 @@ shrink_pseudo_deleted_do(Type) ->
 		  io:format("Unfix table done in ~p ms. nitems=~p\n",
 			    [Elapsed,ets:info(T, size)])
 	  end),
-    ?line false = ets:info(T,fixed),
-    ?line 0 = get_kept_objects(T),
-    ?line done = receive_any(),
+    false = ets:info(T,fixed),
+    0 = get_kept_objects(T),
+    done = receive_any(),
     %%verify_table_load(T), % may fail if concurrency is poor (genny)
     ets:delete(T),
     process_flag(scheduler,0).
 
-    
 
-meta_lookup_unnamed_read(suite) -> [];
+
 meta_lookup_unnamed_read(Config) when is_list(Config) ->
     InitF = fun(_) -> Tab = ets_new(unnamed,[]),
-		     true = ets:insert(Tab,{key,data}),
-		     Tab
+		      true = ets:insert(Tab,{key,data}),
+		      Tab
 	    end,
     ExecF = fun(Tab) -> [{key,data}] = ets:lookup(Tab,key),
 			Tab		       
@@ -5280,10 +5075,9 @@ meta_lookup_unnamed_read(Config) when is_list(Config) ->
 	    end,
     run_workers(InitF,ExecF,FiniF,10000).
 
-meta_lookup_unnamed_write(suite) -> [];
 meta_lookup_unnamed_write(Config) when is_list(Config) ->
     InitF = fun(_) -> Tab = ets_new(unnamed,[]),
-			  {Tab,0}
+		      {Tab,0}
 	    end,
     ExecF = fun({Tab,N}) -> true = ets:insert(Tab,{key,N}),
 			    {Tab,N+1}
@@ -5292,7 +5086,6 @@ meta_lookup_unnamed_write(Config) when is_list(Config) ->
 	    end,
     run_workers(InitF,ExecF,FiniF,10000).
 
-meta_lookup_named_read(suite) -> [];
 meta_lookup_named_read(Config) when is_list(Config) ->
     InitF = fun([ProcN|_]) -> Name = list_to_atom(integer_to_list(ProcN)),
 			      Tab = ets_new(Name,[named_table]),
@@ -5306,11 +5099,10 @@ meta_lookup_named_read(Config) when is_list(Config) ->
 	    end,
     run_workers(InitF,ExecF,FiniF,10000).
 
-meta_lookup_named_write(suite) -> [];
 meta_lookup_named_write(Config) when is_list(Config) ->
     InitF = fun([ProcN|_]) -> Name = list_to_atom(integer_to_list(ProcN)),
-			  Tab = ets_new(Name,[named_table]),
-			  {Tab,0}
+			      Tab = ets_new(Name,[named_table]),
+			      {Tab,0}
 	    end,
     ExecF = fun({Tab,N}) -> true = ets:insert(Tab,{key,N}),
 			    {Tab,N+1}
@@ -5319,7 +5111,6 @@ meta_lookup_named_write(Config) when is_list(Config) ->
 	    end,
     run_workers(InitF,ExecF,FiniF,10000).
 
-meta_newdel_unnamed(suite) -> [];
 meta_newdel_unnamed(Config) when is_list(Config) ->
     InitF = fun(_) -> ok end,
     ExecF = fun(_) -> Tab = ets_new(unnamed,[]),
@@ -5328,7 +5119,6 @@ meta_newdel_unnamed(Config) when is_list(Config) ->
     FiniF = fun(_) -> ok end,
     run_workers(InitF,ExecF,FiniF,10000).
 
-meta_newdel_named(suite) -> [];
 meta_newdel_named(Config) when is_list(Config) ->
     InitF = fun([ProcN|_]) -> list_to_atom(integer_to_list(ProcN))
 	    end,
@@ -5339,20 +5129,18 @@ meta_newdel_named(Config) when is_list(Config) ->
     FiniF = fun(_) -> ok end,
     run_workers(InitF,ExecF,FiniF,10000).
 
-smp_insert(doc) -> ["Concurrent insert's on same table"];
-smp_insert(suite) -> [];
+%% Concurrent insert's on same table.
 smp_insert(Config) when is_list(Config) ->
     ets_new(smp_insert,[named_table,public,{write_concurrency,true}]),
     InitF = fun(_) -> ok end,
-    ExecF = fun(_) -> true = ets:insert(smp_insert,{random:uniform(10000)})
+    ExecF = fun(_) -> true = ets:insert(smp_insert,{rand:uniform(10000)})
 	    end,
     FiniF = fun(_) -> ok end,
     run_workers(InitF,ExecF,FiniF,100000),
     verify_table_load(smp_insert),
     ets:delete(smp_insert).
 
-smp_fixed_delete(doc) -> ["Concurrent delete's on same fixated table"];
-smp_fixed_delete(suite) -> [];
+%% Concurrent deletes on same fixated table.
 smp_fixed_delete(Config) when is_list(Config) ->
     only_if_smp(fun()->smp_fixed_delete_do() end).
 
@@ -5372,21 +5160,20 @@ smp_fixed_delete_do() ->
 	    end,
     FiniF = fun(_) -> ok end,
     run_workers_do(InitF,ExecF,FiniF,NumOfObjs),
-    ?line 0 = ets:info(T,size),
-    ?line true = ets:info(T,fixed),
-    ?line Buckets = num_of_buckets(T),
-    ?line NumOfObjs = get_kept_objects(T),
+    0 = ets:info(T,size),
+    true = ets:info(T,fixed),
+    Buckets = num_of_buckets(T),
+    NumOfObjs = get_kept_objects(T),
     ets:safe_fixtable(T,false),
     %% Will fail as unfix does not shrink the table:
-    %%?line Mem = ets:info(T,memory),
+    %%Mem = ets:info(T,memory),
     %%verify_table_load(T),
     ets:delete(T).
 
 num_of_buckets(T) ->
-    ?line element(1,ets:info(T,stats)).
+    element(1,ets:info(T,stats)).
 
-smp_unfix_fix(doc) -> ["Fixate hash table while other process is busy doing unfix"];
-smp_unfix_fix(suite) -> [];
+%% Fixate hash table while other process is busy doing unfix.
 smp_unfix_fix(Config) when is_list(Config) ->
     only_if_smp(fun()-> smp_unfix_fix_do() end).
 
@@ -5400,15 +5187,15 @@ smp_unfix_fix_do() ->
     filltabint(T,NumOfObjs),
     ets:safe_fixtable(T,true),
     Buckets = num_of_buckets(T),
-    ?line Deleted = ets:select_delete(T,[{{'$1', '_'},
-					  [{'=<','$1', Deleted}],
-					  [true]}]),
-    ?line Buckets = num_of_buckets(T),
+    Deleted = ets:select_delete(T,[{{'$1', '_'},
+				    [{'=<','$1', Deleted}],
+				    [true]}]),
+    Buckets = num_of_buckets(T),
     Left = NumOfObjs - Deleted,
-    ?line Left = ets:info(T,size),
-    ?line true = ets:info(T,fixed),
-    ?line Deleted = get_kept_objects(T),
-    
+    Left = ets:info(T,size),
+    true = ets:info(T,fixed),
+    Deleted = get_kept_objects(T),
+
     {Child, Mref} = 
 	my_spawn_opt(
 	  fun()->
@@ -5435,9 +5222,9 @@ smp_unfix_fix_do() ->
 		  done = receive_any()
 	  end,
 	  [link, monitor, {scheduler,2}]),
-    
-    ?line start = receive_any(),        
-    ?line true = ets:info(T,fixed),
+
+    start = receive_any(),
+    true = ets:info(T,fixed),
     io:put_chars("Parent starting to unfix... ~p\n"),
     do_tc(fun() ->
 		  ets:safe_fixtable(T, false)
@@ -5448,14 +5235,13 @@ smp_unfix_fix_do() ->
 	  end),
     Child ! done,
     {'DOWN', Mref, process, Child, normal} = receive_any(),
-    ?line false = ets:info(T,fixed),
-    ?line 0 = get_kept_objects(T),
+    false = ets:info(T,fixed),
+    0 = get_kept_objects(T),
     %%verify_table_load(T),
     ets:delete(T),
     process_flag(scheduler,0).
 
-otp_8166(doc) -> ["Unsafe unfix was done by trapping select/match"];
-otp_8166(suite) -> [];
+%% Unsafe unfix was done by trapping select/match.
 otp_8166(Config) when is_list(Config) ->
     only_if_smp(3, fun()-> otp_8166_do(false),
 			   otp_8166_do(true)
@@ -5486,8 +5272,8 @@ otp_8166_do(WC) ->
     {'DOWN', ReaderMref, process, ReaderPid, normal} = receive_any(),
     ZombieCrPid ! quit,    
     {'DOWN', ZombieCrMref, process, ZombieCrPid, normal} = receive_any(),
-    ?line false = ets:info(T,fixed),
-    ?line 0 = get_kept_objects(T),
+    false = ets:info(T,fixed),
+    0 = get_kept_objects(T),
     %%verify_table_load(T),
     ets:delete(T),
     process_flag(scheduler,0).
@@ -5528,11 +5314,11 @@ otp_8166_zombie_creator(T,Deleted) ->
 	{loop,Pid} ->
 	    filltabint(T,Deleted),
 	    ets:safe_fixtable(T,true),
-	    ?line Deleted = ets:select_delete(T,[{{'$1', '_'},
-						  [{'=<','$1', Deleted}],
-						  [true]}]),
+	    Deleted = ets:select_delete(T,[{{'$1', '_'},
+					    [{'=<','$1', Deleted}],
+					    [true]}]),
 	    Pid ! zombies_created,
-	    repeat_while(fun() -> case ets:info(T,safe_fixed) of
+	    repeat_while(fun() -> case ets:info(T,safe_fixed_monotonic_time) of
 				      {_,[_P1,_P2]} ->
 					  false;
 				      _ -> 
@@ -5548,57 +5334,55 @@ otp_8166_zombie_creator(T,Deleted) ->
 	    io:format("ignore unfix in outer loop?\n",[]),
 	    otp_8166_zombie_creator(T,Deleted)
     end.
-    
-	
-			 
+
+
+
 
 verify_table_load(T) ->
-    ?line Stats = ets:info(T,stats),
-    ?line {Buckets,AvgLen,StdDev,ExpSD,_MinLen,_MaxLen,_} = Stats,
-    ?line ok = if
-		   AvgLen > 7 ->
-		       io:format("Table overloaded: Stats=~p\n~p\n",
-				 [Stats, ets:info(T)]),
-		       false;
-
-		   Buckets>256, AvgLen < 6 ->
-		       io:format("Table underloaded: Stats=~p\n~p\n",
-				 [Stats, ets:info(T)]),
-		       false;
-		   
-		   StdDev > ExpSD*2 ->
-		       io:format("Too large standard deviation (poor hashing?),"
-				 " stats=~p\n~p\n",[Stats, ets:info(T)]),
-		       false;
-
-		   true -> 
-		       io:format("Stats = ~p\n",[Stats]),
-		       ok
-	       end.
-    
-		  
-otp_8732(doc) -> ["ets:select on a tree with NIL key object"];
+    Stats = ets:info(T,stats),
+    {Buckets,AvgLen,StdDev,ExpSD,_MinLen,_MaxLen,_} = Stats,
+    ok = if
+	     AvgLen > 7 ->
+		 io:format("Table overloaded: Stats=~p\n~p\n",
+			   [Stats, ets:info(T)]),
+		 false;
+
+	     Buckets>256, AvgLen < 6 ->
+		 io:format("Table underloaded: Stats=~p\n~p\n",
+			   [Stats, ets:info(T)]),
+		 false;
+
+	     StdDev > ExpSD*2 ->
+		 io:format("Too large standard deviation (poor hashing?),"
+			   " stats=~p\n~p\n",[Stats, ets:info(T)]),
+		 false;
+
+	     true ->
+		 io:format("Stats = ~p\n",[Stats]),
+		 ok
+	 end.
+
+
+%% ets:select on a tree with NIL key object.
 otp_8732(Config) when is_list(Config) ->
     Tab = ets_new(noname,[ordered_set]),
     filltabstr(Tab,999),
     ets:insert(Tab,{[],"nasty NIL object"}),
-    ?line [] = ets:match(Tab,{'_',nomatch}), %% Will hang if bug not fixed
+    [] = ets:match(Tab,{'_',nomatch}), %% Will hang if bug not fixed
     ok.
 
 
-smp_select_delete(suite) -> [];
-smp_select_delete(doc) ->
-    ["Run concurrent select_delete (and inserts) on same table."];
+%% Run concurrent select_delete (and inserts) on same table.
 smp_select_delete(Config) when is_list(Config) ->
     T = ets_new(smp_select_delete,[named_table,public,{write_concurrency,true}]),
     Mod = 17,
     Zeros = erlang:make_tuple(Mod,0),
     InitF = fun(_) -> Zeros end,
     ExecF = fun(Diffs0) -> 
-		    case random:uniform(20) of
+		    case rand:uniform(20) of
 			1 ->
 			    Mod = 17,
-			    Eq = random:uniform(Mod) - 1,
+			    Eq = rand:uniform(Mod) - 1,
 			    Deleted = ets:select_delete(T,
 							[{{'_', '$1'},
 							  [{'=:=', {'rem', '$1', Mod}, Eq}],
@@ -5607,67 +5391,67 @@ smp_select_delete(Config) when is_list(Config) ->
 						element(Eq+1,Diffs0) - Deleted),
 			    Diffs1;
 			_ ->
-			    Key = random:uniform(10000),
+			    Key = rand:uniform(10000),
 			    Eq = Key rem Mod,
-			    ?line case ets:insert_new(T,{Key,Key}) of
-				      true ->
-					  Diffs1 = setelement(Eq+1, Diffs0,
-							      element(Eq+1,Diffs0)+1),
-					  Diffs1;
-				      false -> Diffs0
-				  end
+			    case ets:insert_new(T,{Key,Key}) of
+				true ->
+				    Diffs1 = setelement(Eq+1, Diffs0,
+							element(Eq+1,Diffs0)+1),
+				    Diffs1;
+				false -> Diffs0
+			    end
 		    end	    
 	    end,
     FiniF = fun(Result) -> Result end,
     Results = run_workers_do(InitF,ExecF,FiniF,20000),
-    ?line TotCnts = lists:foldl(fun(Diffs, Sum) -> add_lists(Sum,tuple_to_list(Diffs)) end,
-				lists:duplicate(Mod, 0), Results),
+    TotCnts = lists:foldl(fun(Diffs, Sum) -> add_lists(Sum,tuple_to_list(Diffs)) end,
+			  lists:duplicate(Mod, 0), Results),
     io:format("TotCnts = ~p\n",[TotCnts]),
-    ?line LeftInTab = lists:foldl(fun(N,Sum) -> Sum+N end,
-				  0, TotCnts),
+    LeftInTab = lists:foldl(fun(N,Sum) -> Sum+N end,
+			    0, TotCnts),
     io:format("LeftInTab = ~p\n",[LeftInTab]),
-    ?line LeftInTab = ets:info(T,size),
+    LeftInTab = ets:info(T,size),
     lists:foldl(fun(Cnt,Eq) -> 
 			WasCnt = ets:select_count(T,
 						  [{{'_', '$1'},
 						    [{'=:=', {'rem', '$1', Mod}, Eq}],
 						    [true]}]),
 			io:format("~p: ~p =?= ~p\n",[Eq,Cnt,WasCnt]),
-			?line Cnt = WasCnt,
+			Cnt = WasCnt,
 			Eq+1
 		end, 
 		0, TotCnts),
     verify_table_load(T),
-    ?line LeftInTab = ets:select_delete(T, [{{'$1','$1'}, [], [true]}]),
-    ?line 0 = ets:info(T,size),
-    ?line false = ets:info(T,fixed),
+    LeftInTab = ets:select_delete(T, [{{'$1','$1'}, [], [true]}]),
+    0 = ets:info(T,size),
+    false = ets:info(T,fixed),
     ets:delete(T).
 
-types(doc) -> ["Test different types"];
+%% Test different types.
 types(Config) when is_list(Config) ->
     init_externals(),
     repeat_for_opts(types_do,[[set,ordered_set],compressed]).
 
 types_do(Opts) ->
     EtsMem = etsmem(),
-    ?line T = ets_new(xxx,Opts),
+    T = ets_new(xxx,Opts),
     Fun = fun(Term) ->
-            ets:insert(T,{Term}),
-            ?line [{Term}] = ets:lookup(T,Term),
-            ets:insert(T,{Term,xxx}),
-            ?line [{Term,xxx}] = ets:lookup(T,Term),
-            ets:insert(T,{Term,"xxx"}),
-            ?line [{Term,"xxx"}] = ets:lookup(T,Term),
-            ets:insert(T,{xxx,Term}),
-            ?line [{xxx,Term}] = ets:lookup(T,xxx),
-            ets:insert(T,{"xxx",Term}),
-            ?line [{"xxx",Term}] = ets:lookup(T,"xxx"),
-            ets:delete_all_objects(T),
-            ?line 0 = ets:info(T,size)
+		  ets:insert(T,{Term}),
+		  [{Term}] = ets:lookup(T,Term),
+		  ets:insert(T,{Term,xxx}),
+		  [{Term,xxx}] = ets:lookup(T,Term),
+		  ets:insert(T,{Term,"xxx"}),
+		  [{Term,"xxx"}] = ets:lookup(T,Term),
+		  ets:insert(T,{xxx,Term}),
+		  [{xxx,Term}] = ets:lookup(T,xxx),
+		  ets:insert(T,{"xxx",Term}),
+		  [{"xxx",Term}] = ets:lookup(T,"xxx"),
+		  ets:delete_all_objects(T),
+		  0 = ets:info(T,size)
           end,
     test_terms(Fun, strict),
     ets:delete(T),
-    ?line verify_etsmem(EtsMem).
+    verify_etsmem(EtsMem).
 
 
 %% OTP-9932: Memory overwrite when inserting large integers in compressed bag.
@@ -5684,9 +5468,10 @@ otp_9932(Config) when is_list(Config) ->
 	  end,
     lists:foreach(Fun, lists:seq(0, 16)),
     ets:delete(T).
-    
 
-otp_9423(doc) -> ["vm-deadlock caused by race between ets:delete and others on write_concurrency table"];
+
+%% vm-deadlock caused by race between ets:delete and others on
+%% write_concurrency table.
 otp_9423(Config) when is_list(Config) ->
     InitF = fun(_) -> {0,0} end,
     ExecF = fun({S,F}) -> 
@@ -5713,10 +5498,10 @@ otp_9423(Config) when is_list(Config) ->
 	    [P ! stop || P <- Pids],
 	    wait_pids(Pids),
 	    ok;
-	
+
 	Skipped -> Skipped
     end.
-	    
+
 
 %% Corrupted binary in compressed table
 otp_10182(Config) when is_list(Config) ->
@@ -5744,7 +5529,7 @@ ets_all_run() ->
     ets:delete(Table),
     false = lists:member(Table, ets:all()),
     ets_all_run().
-    
+
 
 take(Config) when is_list(Config) ->
     %% Simple test for set tables.
@@ -5783,9 +5568,9 @@ take(Config) when is_list(Config) ->
     ok.
 
 
-%
-% Utility functions:
-%
+%%
+%% Utility functions:
+%%
 
 add_lists(L1,L2) ->     
     add_lists(L1,L2,[]).
@@ -5807,11 +5592,11 @@ run_workers(InitF,ExecF,FiniF,Laps, Exclude) ->
 run_workers_do(InitF,ExecF,FiniF,Laps) ->
     run_workers_do(InitF,ExecF,FiniF,Laps, 0).
 run_workers_do(InitF,ExecF,FiniF,Laps, Exclude) ->
-    ?line NumOfProcs = case erlang:system_info(schedulers) of
-			   N when (N > Exclude) -> N - Exclude
-		       end,
+    NumOfProcs = case erlang:system_info(schedulers) of
+		     N when (N > Exclude) -> N - Exclude
+		 end,
     io:format("smp starting ~p workers\n",[NumOfProcs]),
-    Seeds = [{ProcN,random:uniform(9999)} || ProcN <- lists:seq(1,NumOfProcs)],
+    Seeds = [{ProcN,rand:uniform(9999)} || ProcN <- lists:seq(1,NumOfProcs)],
     Parent = self(),
     Pids = [my_spawn_link(fun()-> worker(Seed,InitF,ExecF,FiniF,Laps,Parent,NumOfProcs) end)
 	    || Seed <- Seeds],
@@ -5819,10 +5604,10 @@ run_workers_do(InitF,ExecF,FiniF,Laps, Exclude) ->
 	infinite -> Pids;
 	_ -> wait_pids(Pids)
     end.
-	    
+
 worker({ProcN,Seed}, InitF, ExecF, FiniF, Laps, Parent, NumOfProcs) ->
     io:format("smp worker ~p, seed=~p~n",[self(),Seed]),
-    random:seed(Seed,Seed,Seed),
+    rand:seed(exsplus, {Seed,Seed,Seed}),
     State1 = InitF([ProcN, NumOfProcs]),
     State2 = worker_loop(Laps, ExecF, State1),
     Result = FiniF(State2),
@@ -5837,7 +5622,7 @@ worker_loop(infinite, ExecF, State) ->
     worker_loop(infinite,ExecF,ExecF(State));
 worker_loop(N, ExecF, State) ->
     worker_loop(N-1,ExecF,ExecF(State)).
-    
+
 wait_pids(Pids) -> 
     wait_pids(Pids,[]).
 wait_pids([],Acc) -> 
@@ -5845,7 +5630,7 @@ wait_pids([],Acc) ->
 wait_pids(Pids, Acc) ->
     receive
 	{Pid,Result} ->
-	    ?line true = lists:member(Pid,Pids),
+	    true = lists:member(Pid,Pids),
 	    Others = lists:delete(Pid,Pids),
 	    io:format("wait_pid got ~p from ~p, still waiting for ~p\n",[Result,Pid,Others]),
 	    wait_pids(Others,[Result | Acc])
@@ -5871,7 +5656,7 @@ wait_for_memory_deallocations() ->
 	    erts_debug:set_internal_state(available_internal_state, true),
 	    wait_for_memory_deallocations()
     end.
-	    
+
 
 etsmem() ->
     wait_for_memory_deallocations(),
@@ -5884,35 +5669,35 @@ etsmem() ->
     ErlangMemoryEts = try erlang:memory(ets) catch error:notsup -> notsup end,
 
     Mem =
-    {ErlangMemoryEts,
-     case EtsAllocInfo of
-	 false -> undefined;
-	 MemInfo ->
-	     CS = lists:foldl(
-		    fun ({instance, _, L}, Acc) ->
-			    {value,{mbcs,MBCS}} = lists:keysearch(mbcs, 1, L),
-			    {value,{sbcs,SBCS}} = lists:keysearch(sbcs, 1, L),
-			    NewAcc = [MBCS, SBCS | Acc],
-			    case lists:keysearch(mbcs_pool, 1, L) of
-				{value,{mbcs_pool, MBCS_POOL}} ->
-				    [MBCS_POOL|NewAcc];
-				_ -> NewAcc
-			    end
-		    end,
-		    [],
-		    MemInfo),
-	     lists:foldl(
-	       fun(L, {Bl0,BlSz0}) ->
-		       {value,BlTup} = lists:keysearch(blocks, 1, L),
-		       blocks = element(1, BlTup),
-		       Bl = element(2, BlTup),
-		       {value,BlSzTup} = lists:keysearch(blocks_size, 1, L),	
-		       blocks_size = element(1, BlSzTup),
-		       BlSz = element(2, BlSzTup),
-		       {Bl0+Bl,BlSz0+BlSz}
-	       end, {0,0}, CS)
-     end},
-     {Mem,AllTabs}.
+	{ErlangMemoryEts,
+	 case EtsAllocInfo of
+	     false -> undefined;
+	     MemInfo ->
+		 CS = lists:foldl(
+			fun ({instance, _, L}, Acc) ->
+				{value,{mbcs,MBCS}} = lists:keysearch(mbcs, 1, L),
+				{value,{sbcs,SBCS}} = lists:keysearch(sbcs, 1, L),
+				NewAcc = [MBCS, SBCS | Acc],
+				case lists:keysearch(mbcs_pool, 1, L) of
+				    {value,{mbcs_pool, MBCS_POOL}} ->
+					[MBCS_POOL|NewAcc];
+				    _ -> NewAcc
+				end
+			end,
+			[],
+			MemInfo),
+		 lists:foldl(
+		   fun(L, {Bl0,BlSz0}) ->
+			   {value,BlTup} = lists:keysearch(blocks, 1, L),
+			   blocks = element(1, BlTup),
+			   Bl = element(2, BlTup),
+			   {value,BlSzTup} = lists:keysearch(blocks_size, 1, L),
+			   blocks_size = element(1, BlSzTup),
+			   BlSz = element(2, BlSzTup),
+			   {Bl0+Bl,BlSz0+BlSz}
+		   end, {0,0}, CS)
+	 end},
+    {Mem,AllTabs}.
 
 verify_etsmem({MemInfo,AllTabs}) ->
     wait_for_test_procs(),
@@ -5969,10 +5754,11 @@ spawn_logger(Procs, FailedMemchecks) ->
 				  after 0 ->
 					  case Kill of
 					      true -> exit(Proc, kill);
-					      _ -> ok
+					      _ ->
+						  erlang:display({"Waiting for 'DOWN' from", Proc,
+								  process_info(Proc),
+								  pid_status(Proc)})
 					  end,
-					  erlang:display({"Waiting for 'DOWN' from", Proc,
-							  process_info(Proc), pid_status(Proc)}),
 					  receive
 					      {'DOWN', Mon, _, _, _} ->
 						  ok
@@ -6098,7 +5884,7 @@ receive_any_spinning(Loops,0,Tries) ->
     end;
 receive_any_spinning(Loops, N, Tries) when N>0 ->
     receive_any_spinning(Loops, N-1, Tries).
-    
+
 
 
 spawn_monitor_with_pid(Pid, Fun) when is_pid(Pid) ->
@@ -6133,130 +5919,130 @@ only_if_smp(Schedulers, Func) ->
 -define(heap_binary_size, 64).
 test_terms(Test_Func, Mode) ->
     garbage_collect(),
-    ?line Pib0 = process_info(self(),binary),
-
-    ?line Test_Func(atom),
-    ?line Test_Func(''),
-    ?line Test_Func('a'),
-    ?line Test_Func('ab'),
-    ?line Test_Func('abc'),
-    ?line Test_Func('abcd'),
-    ?line Test_Func('abcde'),
-    ?line Test_Func('abcdef'),
-    ?line Test_Func('abcdefg'),
-    ?line Test_Func('abcdefgh'),
-
-    ?line Test_Func(fun() -> ok end),
+    Pib0 = process_info(self(),binary),
+
+    Test_Func(atom),
+    Test_Func(''),
+    Test_Func('a'),
+    Test_Func('ab'),
+    Test_Func('abc'),
+    Test_Func('abcd'),
+    Test_Func('abcde'),
+    Test_Func('abcdef'),
+    Test_Func('abcdefg'),
+    Test_Func('abcdefgh'),
+
+    Test_Func(fun() -> ok end),
     X = id([a,{b,c},c]),
     Y = id({x,y,z}),
     Z = id(1 bsl 8*257),
-    ?line Test_Func(fun() -> X end),
-    ?line Test_Func(fun() -> {X,Y} end),
-    ?line Test_Func([fun() -> {X,Y,Z} end,
-              fun() -> {Z,X,Y} end,
-              fun() -> {Y,Z,X} end]),
-
-    ?line Test_Func({trace_ts,{even_bigger,{some_data,fun() -> ok end}},{1,2,3}}),
-    ?line Test_Func({trace_ts,{even_bigger,{some_data,<<1,2,3,4,5,6,7,8,9,10>>}},
-              {1,2,3}}),
-
-    ?line Test_Func(1),
-    ?line Test_Func(42),
-    ?line Test_Func(-23),
-    ?line Test_Func(256),
-    ?line Test_Func(25555),
-    ?line Test_Func(-3333),
-
-    ?line Test_Func(1.0),
-
-    ?line Test_Func(183749783987483978498378478393874),
-    ?line Test_Func(-37894183749783987483978498378478393874),
+    Test_Func(fun() -> X end),
+    Test_Func(fun() -> {X,Y} end),
+    Test_Func([fun() -> {X,Y,Z} end,
+	       fun() -> {Z,X,Y} end,
+	       fun() -> {Y,Z,X} end]),
+
+    Test_Func({trace_ts,{even_bigger,{some_data,fun() -> ok end}},{1,2,3}}),
+    Test_Func({trace_ts,{even_bigger,{some_data,<<1,2,3,4,5,6,7,8,9,10>>}},
+	       {1,2,3}}),
+
+    Test_Func(1),
+    Test_Func(42),
+    Test_Func(-23),
+    Test_Func(256),
+    Test_Func(25555),
+    Test_Func(-3333),
+
+    Test_Func(1.0),
+
+    Test_Func(183749783987483978498378478393874),
+    Test_Func(-37894183749783987483978498378478393874),
     Very_Big = very_big_num(),
-    ?line Test_Func(Very_Big),
-    ?line Test_Func(-Very_Big+1),
+    Test_Func(Very_Big),
+    Test_Func(-Very_Big+1),
 
-    ?line Test_Func([]),
-    ?line Test_Func("abcdef"),
-    ?line Test_Func([a, b, 1, 2]),
-    ?line Test_Func([a|b]),
+    Test_Func([]),
+    Test_Func("abcdef"),
+    Test_Func([a, b, 1, 2]),
+    Test_Func([a|b]),
 
-    ?line Test_Func({}),
-    ?line Test_Func({1}),
-    ?line Test_Func({a, b}),
-    ?line Test_Func({a, b, c}),
-    ?line Test_Func(list_to_tuple(lists:seq(0, 255))),
-    ?line Test_Func(list_to_tuple(lists:seq(0, 256))),
+    Test_Func({}),
+    Test_Func({1}),
+    Test_Func({a, b}),
+    Test_Func({a, b, c}),
+    Test_Func(list_to_tuple(lists:seq(0, 255))),
+    Test_Func(list_to_tuple(lists:seq(0, 256))),
 
-    ?line Test_Func(make_ref()),
-    ?line Test_Func([make_ref(), make_ref()]),
+    Test_Func(make_ref()),
+    Test_Func([make_ref(), make_ref()]),
 
-    ?line Test_Func(make_port()),
+    Test_Func(make_port()),
 
-    ?line Test_Func(make_pid()),
-    ?line Test_Func(make_ext_pid()),
-    ?line Test_Func(make_ext_port()),
-    ?line Test_Func(make_ext_ref()),
+    Test_Func(make_pid()),
+    Test_Func(make_ext_pid()),
+    Test_Func(make_ext_port()),
+    Test_Func(make_ext_ref()),
 
     Bin0 = list_to_binary(lists:seq(0, 14)),
-    ?line Test_Func(Bin0),
+    Test_Func(Bin0),
     Bin1 = list_to_binary(lists:seq(0, ?heap_binary_size)),
-    ?line Test_Func(Bin1),
+    Test_Func(Bin1),
     Bin2 = list_to_binary(lists:seq(0, ?heap_binary_size+1)),
-    ?line Test_Func(Bin2),
+    Test_Func(Bin2),
     Bin3 = list_to_binary(lists:seq(0, 255)),
     garbage_collect(),
     Pib = process_info(self(),binary),
-    ?line Test_Func(Bin3),
+    Test_Func(Bin3),
     garbage_collect(),
     case Mode of
-	strict -> ?line Pib = process_info(self(),binary);
+	strict -> Pib = process_info(self(),binary);
 	skip_refc_check -> ok
     end,
 
-    ?line Test_Func(make_unaligned_sub_binary(Bin0)),
-    ?line Test_Func(make_unaligned_sub_binary(Bin1)),
-    ?line Test_Func(make_unaligned_sub_binary(Bin2)),
-    ?line Test_Func(make_unaligned_sub_binary(Bin3)),
-
-    ?line Test_Func(make_sub_binary(lists:seq(42, 43))),
-    ?line Test_Func(make_sub_binary([42,43,44])),
-    ?line Test_Func(make_sub_binary([42,43,44,45])),
-    ?line Test_Func(make_sub_binary([42,43,44,45,46])),
-    ?line Test_Func(make_sub_binary([42,43,44,45,46,47])),
-    ?line Test_Func(make_sub_binary([42,43,44,45,46,47,48])),
-    ?line Test_Func(make_sub_binary(lists:seq(42, 49))),
-    ?line Test_Func(make_sub_binary(lists:seq(0, 14))),
-    ?line Test_Func(make_sub_binary(lists:seq(0, ?heap_binary_size))),
-    ?line Test_Func(make_sub_binary(lists:seq(0, ?heap_binary_size+1))),
-    ?line Test_Func(make_sub_binary(lists:seq(0, 255))),
-
-    ?line Test_Func(make_unaligned_sub_binary(lists:seq(42, 43))),
-    ?line Test_Func(make_unaligned_sub_binary([42,43,44])),
-    ?line Test_Func(make_unaligned_sub_binary([42,43,44,45])),
-    ?line Test_Func(make_unaligned_sub_binary([42,43,44,45,46])),
-    ?line Test_Func(make_unaligned_sub_binary([42,43,44,45,46,47])),
-    ?line Test_Func(make_unaligned_sub_binary([42,43,44,45,46,47,48])),
-    ?line Test_Func(make_unaligned_sub_binary(lists:seq(42, 49))),
-    ?line Test_Func(make_unaligned_sub_binary(lists:seq(0, 14))),
-    ?line Test_Func(make_unaligned_sub_binary(lists:seq(0, ?heap_binary_size))),
-    ?line Test_Func(make_unaligned_sub_binary(lists:seq(0, ?heap_binary_size+1))),
-    ?line Test_Func(make_unaligned_sub_binary(lists:seq(0, 255))),
+    Test_Func(make_unaligned_sub_binary(Bin0)),
+    Test_Func(make_unaligned_sub_binary(Bin1)),
+    Test_Func(make_unaligned_sub_binary(Bin2)),
+    Test_Func(make_unaligned_sub_binary(Bin3)),
+
+    Test_Func(make_sub_binary(lists:seq(42, 43))),
+    Test_Func(make_sub_binary([42,43,44])),
+    Test_Func(make_sub_binary([42,43,44,45])),
+    Test_Func(make_sub_binary([42,43,44,45,46])),
+    Test_Func(make_sub_binary([42,43,44,45,46,47])),
+    Test_Func(make_sub_binary([42,43,44,45,46,47,48])),
+    Test_Func(make_sub_binary(lists:seq(42, 49))),
+    Test_Func(make_sub_binary(lists:seq(0, 14))),
+    Test_Func(make_sub_binary(lists:seq(0, ?heap_binary_size))),
+    Test_Func(make_sub_binary(lists:seq(0, ?heap_binary_size+1))),
+    Test_Func(make_sub_binary(lists:seq(0, 255))),
+
+    Test_Func(make_unaligned_sub_binary(lists:seq(42, 43))),
+    Test_Func(make_unaligned_sub_binary([42,43,44])),
+    Test_Func(make_unaligned_sub_binary([42,43,44,45])),
+    Test_Func(make_unaligned_sub_binary([42,43,44,45,46])),
+    Test_Func(make_unaligned_sub_binary([42,43,44,45,46,47])),
+    Test_Func(make_unaligned_sub_binary([42,43,44,45,46,47,48])),
+    Test_Func(make_unaligned_sub_binary(lists:seq(42, 49))),
+    Test_Func(make_unaligned_sub_binary(lists:seq(0, 14))),
+    Test_Func(make_unaligned_sub_binary(lists:seq(0, ?heap_binary_size))),
+    Test_Func(make_unaligned_sub_binary(lists:seq(0, ?heap_binary_size+1))),
+    Test_Func(make_unaligned_sub_binary(lists:seq(0, 255))),
 
     %% Bit level binaries.
-    ?line Test_Func(<<1:1>>),
-    ?line Test_Func(<<2:2>>),
-    ?line Test_Func(<<42:10>>),
-    ?line Test_Func(list_to_bitstring([<<5:6>>|lists:seq(0, 255)])),
+    Test_Func(<<1:1>>),
+    Test_Func(<<2:2>>),
+    Test_Func(<<42:10>>),
+    Test_Func(list_to_bitstring([<<5:6>>|lists:seq(0, 255)])),
 
-    ?line Test_Func(F = fun(A) -> 42*A end),
-    ?line Test_Func(lists:duplicate(32, F)),
+    Test_Func(F = fun(A) -> 42*A end),
+    Test_Func(lists:duplicate(32, F)),
 
-    ?line Test_Func(FF = fun binary_SUITE:all/1),
-    ?line Test_Func(lists:duplicate(32, FF)),
+    Test_Func(FF = fun binary_SUITE:all/1),
+    Test_Func(lists:duplicate(32, FF)),
 
     garbage_collect(),
     case Mode of
-	strict -> ?line Pib0 = process_info(self(),binary);
+	strict -> Pib0 = process_info(self(),binary);
 	skip_refc_check -> ok
     end,
     ok.
@@ -6268,18 +6054,18 @@ very_big_num() ->
     very_big_num(33, 1).
 
 very_big_num(Left, Result) when Left > 0 ->
-    ?line very_big_num(Left-1, Result*256);
+    very_big_num(Left-1, Result*256);
 very_big_num(0, Result) ->
-    ?line Result.
+    Result.
 
 make_port() ->
-    ?line open_port({spawn, "efile"}, [eof]).
+    open_port({spawn, "efile"}, [eof]).
 
 make_pid() ->
-    ?line spawn_link(?MODULE, sleeper, []).
+    spawn_link(?MODULE, sleeper, []).
 
 sleeper() ->
-    ?line receive after infinity -> ok end.
+    receive after infinity -> ok end.
 
 make_ext_pid() ->
     {Pid, _, _} = get(externals),
@@ -6337,11 +6123,11 @@ mk_pid({NodeName, Creation}, Number, Serial) when is_atom(NodeName) ->
     mk_pid({NodeNameExt, Creation}, Number, Serial);
 mk_pid({NodeNameExt, Creation}, Number, Serial) ->
     case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					?PID_EXT,
-					NodeNameExt,
-					uint32_be(Number),
-					uint32_be(Serial),
-					uint8(Creation)])) of
+					      ?PID_EXT,
+					      NodeNameExt,
+					      uint32_be(Number),
+					      uint32_be(Serial),
+					      uint8(Creation)])) of
 	Pid when is_pid(Pid) ->
 	    Pid;
 	{'EXIT', {badarg, _}} ->
@@ -6431,7 +6217,7 @@ repeat_for_opts(F, [], Acc) ->
 				     _ -> [RV | RV_Acc]
 				 end
 			end
-	          end, [], Acc);
+		end, [], Acc);
 repeat_for_opts(F, [OptList | Tail], []) when is_list(OptList) ->
     repeat_for_opts(F, Tail, [[Opt] || Opt <- OptList]);
 repeat_for_opts(F, [OptList | Tail], AccList) when is_list(OptList) ->
@@ -6443,7 +6229,7 @@ repeat_for_opts_atom2list(all_types) -> [set,ordered_set,bag,duplicate_bag];
 repeat_for_opts_atom2list(write_concurrency) -> [{write_concurrency,false},{write_concurrency,true}];
 repeat_for_opts_atom2list(read_concurrency) -> [{read_concurrency,false},{read_concurrency,true}];
 repeat_for_opts_atom2list(compressed) -> [compressed,void].
-    
+
 ets_new(Name, Opts) ->
     %%ets:new(Name, [compressed | Opts]).
     ets:new(Name, Opts).
diff --git a/lib/stdlib/test/ets_tough_SUITE.erl b/lib/stdlib/test/ets_tough_SUITE.erl
index c6f24fc670..c83c17217b 100644
--- a/lib/stdlib/test/ets_tough_SUITE.erl
+++ b/lib/stdlib/test/ets_tough_SUITE.erl
@@ -23,9 +23,11 @@
 -export([init/1,terminate/2,handle_call/3,handle_info/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 -compile([export_all]).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,5}}].
 
 all() -> 
     [ex1].
@@ -52,34 +54,31 @@ end_per_group(_GroupName, Config) ->
 -define(GLOBAL_PARAMS,ets_tough_SUITE_global_params).
 
 init_per_testcase(_Func, Config) ->
-    Dog=test_server:timetrap(test_server:seconds(300)),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Func, _Config) ->
     ets:delete(?GLOBAL_PARAMS).
 
 
 ex1(Config) when is_list(Config) ->
-    ?line ets:new(?GLOBAL_PARAMS,[named_table,public]),
-    ?line ets:insert(?GLOBAL_PARAMS,{a,set}),
-    ?line ets:insert(?GLOBAL_PARAMS,{b,set}),
-    ?line ex1_sub(Config),
-    ?line ets:insert(?GLOBAL_PARAMS,{a,ordered_set}),
-    ?line ets:insert(?GLOBAL_PARAMS,{b,set}),
-    ?line ex1_sub(Config),
-    ?line ets:insert(?GLOBAL_PARAMS,{a,ordered_set}),
-    ?line ets:insert(?GLOBAL_PARAMS,{b,ordered_set}),
-    ?line ex1_sub(Config).    
-    
-    
+    ets:new(?GLOBAL_PARAMS,[named_table,public]),
+    ets:insert(?GLOBAL_PARAMS,{a,set}),
+    ets:insert(?GLOBAL_PARAMS,{b,set}),
+    ex1_sub(Config),
+    ets:insert(?GLOBAL_PARAMS,{a,ordered_set}),
+    ets:insert(?GLOBAL_PARAMS,{b,set}),
+    ex1_sub(Config),
+    ets:insert(?GLOBAL_PARAMS,{a,ordered_set}),
+    ets:insert(?GLOBAL_PARAMS,{b,ordered_set}),
+    ex1_sub(Config).
+
+
 
 
 ex1_sub(Config) ->
     {A,B} = prep(Config),
     N = 
-	case ?config(ets_tough_SUITE_iters,Config) of
+	case proplists:get_value(ets_tough_SUITE_iters,Config) of
 	    undefined ->
 		5000;
 	    Other -> 
@@ -92,9 +91,9 @@ ex1_sub(Config) ->
     ok.
 
 prep(Config) ->
-    random:seed(),
+    rand:seed(exsplus),
     put(dump_ticket,none),
-    DumpDir = filename:join(?config(priv_dir,Config), "ets_tough"),
+    DumpDir = filename:join(proplists:get_value(priv_dir,Config), "ets_tough"),
     file:make_dir(DumpDir),
     put(dump_dir,DumpDir),
     process_flag(trap_exit,true),
@@ -188,9 +187,9 @@ operate(dump,A,_B) ->
 	    NewTicket = ddump_next(A,Units,Ticket),
 	    put(dump_ticket,NewTicket),
 	    _Result = case NewTicket of
-			 done -> done;
-			 _ ->    dump_more
-		     end,
+			  done -> done;
+			  _ ->    dump_more
+		      end,
 	    ?DEBUG(io:format("dump ~w (~w)\n",[Units,_Result]));
 	_ ->
 	    DumpDir = get(dump_dir),
@@ -211,7 +210,7 @@ operate(dump,A,_B) ->
 		    ok
 	    end
     end.
-    
+
 random_operation() ->
     Ops = {get,put,erase,dirty_get,dump},
     random_element(Ops).
@@ -221,19 +220,19 @@ random_class() ->
     random_element(Classes).
 
 random_key() ->
-    random:uniform(8).
+    rand:uniform(8).
 
 random_value() ->
-    case random:uniform(5) of
+    case rand:uniform(5) of
 	1 -> ok;
 	2 -> {data,random_key()};
 	3 -> {foo,bar,random_class()};
-	4 -> random:uniform(1000);
+	4 -> rand:uniform(1000);
 	5 -> {recursive,random_value()}
     end.
 
 random_element(T) ->
-    I = random:uniform(tuple_size(T)),
+    I = rand:uniform(tuple_size(T)),
     element(I,T).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -246,7 +245,7 @@ show_table(N) ->
 	_ ->
 	    error
     end.
-	    
+
 show_entries(Fd) ->
     case phys_read_len(Fd) of
 	{ok,Len} ->
@@ -370,7 +369,7 @@ derase(ServerPid,Class,Key) ->
 
 dget_class(ServerPid,Class,Condition) ->
     gen_server:call(ServerPid,
-		       {handle_get_class,Class,Condition},infinity).
+		    {handle_get_class,Class,Condition},infinity).
 
 %%% derase_class(ServerPid,Class) -> ok
 %%%
@@ -828,7 +827,7 @@ table_lookup_batch([],_Class,_Cond) ->
     [];
 table_lookup_batch([Table|Tables],Class,Cond) ->
     table_lookup_batch([],Tables,Table,ets:first(Table),Class,Cond,[]).
-    
+
 table_lookup_batch(_Passed,[],_,'$end_of_table',_Class,_Cond,Ack) ->
     Ack;
 table_lookup_batch(Passed,[NewTable|Tables],Table,'$end_of_table',
@@ -838,7 +837,7 @@ table_lookup_batch(Passed,[NewTable|Tables],Table,'$end_of_table',
 table_lookup_batch(Passed,Tables,Table,?ERASE_MARK(Key),Class,Cond,Ack) ->
     table_lookup_batch(Passed,Tables,Table,?ets_next(Table,?ERASE_MARK(Key)),
 		       Class,Cond,Ack);
-    
+
 table_lookup_batch(Passed,Tables,Table,Key,Class,Cond,Ack) ->
     NewAck =
 	case table_lookup(Passed,Key) of
@@ -1069,7 +1068,7 @@ phys_load_table(DumpDir,N,Tab) ->
 	Other ->
 	    {error,{open_error,Other}}
     end.
-	    
+
 phys_load_entries(Fd,Tab) ->
     case phys_read_len(Fd) of
 	{ok,Len} ->
diff --git a/lib/stdlib/test/file_sorter_SUITE.erl b/lib/stdlib/test/file_sorter_SUITE.erl
index e0d9ec1fd7..379f4d609b 100644
--- a/lib/stdlib/test/file_sorter_SUITE.erl
+++ b/lib/stdlib/test/file_sorter_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(file_sorter_SUITE).
 
-%-define(debug, true).
+%%-define(debug, true).
 
 -ifdef(debug).
 -define(format(S, A), io:format(S, A)).
@@ -28,9 +28,9 @@
 -define(t,test_server).
 -define(privdir(_), "./file_sorter_SUITE_priv").
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(format(S, A), ok).
--define(privdir(Conf), ?config(priv_dir, Conf)).
+-define(privdir(Conf), proplists:get_value(priv_dir, Conf)).
 -endif.
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -49,15 +49,14 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 init_per_testcase(_Case, Config) ->
-    Dog=?t:timetrap(?t:minutes(2)),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     [basic, badarg, term_sort, term_keysort,
@@ -83,377 +82,323 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-basic(doc) ->
-    ["Basic test case."];
-basic(suite) -> 
-    [];
+%% Basic test case.
 basic(Config) when is_list(Config) ->
     Fmt = binary,
     Arg = {format,Fmt},
     Foo = outfile("foo", Config),
     P0 = pps(),
 
-    ?line F1s = [F1] = to_files([[]], Fmt, Config),
-    ?line ok = file_sorter:sort(F1),
-    ?line [] = from_files(F1, Fmt),
-    ?line ok = file_sorter:keysort(17, F1),
-    ?line [] = from_files(F1, Fmt),
-    ?line ok = file_sorter:merge(F1s, Foo),
-    ?line [] = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line ok = file_sorter:keymerge(17, F1s, Foo),
-    ?line [] = from_files(Foo, Fmt),
-    ?line delete_files([Foo | F1s]),
-
-    ?line [F2] = to_files([[foo,bar]], Fmt, Config),
-    ?line ok = file_sorter:sort([F2], F2, Arg),
-    ?line [bar,foo] = from_files(F2, Fmt),
-    ?line delete_files(F2),
-
-    ?line Fs1 = to_files([[foo],[bar]], Fmt, Config),
-    ?line ok = file_sorter:sort(Fs1, Foo, Arg),
-    ?line [bar,foo] = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line ok = file_sorter:merge(Fs1, Foo, Arg),
-    ?line [bar,foo] = from_files(Foo, Fmt),
-    ?line delete_files([Foo | Fs1]),
-
-    ?line Fmt2 = binary_term,
-    ?line Arg2 = {format, Fmt2},
-    ?line [F3] = to_files([[{foo,1},{bar,2}]], Fmt2, Config),
-    ?line ok = file_sorter:keysort([2], [F3], F3, Arg2),
-    ?line [{foo,1},{bar,2}] = from_files(F3, Fmt2),
-    ?line delete_files(F3),
-
-    ?line Fs2 = to_files([[{foo,1}],[{bar,2}]], Fmt2, Config),
-    ?line ok = file_sorter:keysort(1, Fs2, Foo, Arg2),
-    ?line [{bar,2},{foo,1}] = from_files(Foo, Fmt2),
-    ?line delete_files(Foo),
-    ?line ok = file_sorter:keymerge(1, Fs2, Foo, Arg2),
-    ?line [{bar,2},{foo,1}] = from_files(Foo, Fmt2),
-    ?line delete_files([Foo | Fs2]),
-
-    ?line true = P0 =:= pps(),
+    F1s = [F1] = to_files([[]], Fmt, Config),
+    ok = file_sorter:sort(F1),
+    [] = from_files(F1, Fmt),
+    ok = file_sorter:keysort(17, F1),
+    [] = from_files(F1, Fmt),
+    ok = file_sorter:merge(F1s, Foo),
+    [] = from_files(Foo, Fmt),
+    delete_files(Foo),
+    ok = file_sorter:keymerge(17, F1s, Foo),
+    [] = from_files(Foo, Fmt),
+    delete_files([Foo | F1s]),
+
+    [F2] = to_files([[foo,bar]], Fmt, Config),
+    ok = file_sorter:sort([F2], F2, Arg),
+    [bar,foo] = from_files(F2, Fmt),
+    delete_files(F2),
+
+    Fs1 = to_files([[foo],[bar]], Fmt, Config),
+    ok = file_sorter:sort(Fs1, Foo, Arg),
+    [bar,foo] = from_files(Foo, Fmt),
+    delete_files(Foo),
+    ok = file_sorter:merge(Fs1, Foo, Arg),
+    [bar,foo] = from_files(Foo, Fmt),
+    delete_files([Foo | Fs1]),
+
+    Fmt2 = binary_term,
+    Arg2 = {format, Fmt2},
+    [F3] = to_files([[{foo,1},{bar,2}]], Fmt2, Config),
+    ok = file_sorter:keysort([2], [F3], F3, Arg2),
+    [{foo,1},{bar,2}] = from_files(F3, Fmt2),
+    delete_files(F3),
+
+    Fs2 = to_files([[{foo,1}],[{bar,2}]], Fmt2, Config),
+    ok = file_sorter:keysort(1, Fs2, Foo, Arg2),
+    [{bar,2},{foo,1}] = from_files(Foo, Fmt2),
+    delete_files(Foo),
+    ok = file_sorter:keymerge(1, Fs2, Foo, Arg2),
+    [{bar,2},{foo,1}] = from_files(Foo, Fmt2),
+    delete_files([Foo | Fs2]),
+
+    true = P0 =:= pps(),
 
     ok.
 
-badarg(doc) ->
-    ["Call functions with bad arguments."];
-badarg(suite) -> 
-    [];
+%% Call functions with bad arguments.
 badarg(Config) when is_list(Config) ->
     PrivDir = ?privdir(Config),
     BadFile = filename:join(PrivDir, "not_a_file"),
     ABadFile = filename:absname(BadFile),
-    ?line file:delete(BadFile),
-    ?line {error,{file_error,ABadFile,enoent}} = 
+    file:delete(BadFile),
+    {error,{file_error,ABadFile,enoent}} =
 	file_sorter:sort(BadFile),
-    ?line {'EXIT', {{badarg, {flipp}}, _}} = 
+    {'EXIT', {{badarg, {flipp}}, _}} =
 	(catch file_sorter:sort({flipp})),
-    ?line {error,{file_error,ABadFile,enoent}} = 
+    {error,{file_error,ABadFile,enoent}} =
 	file_sorter:keysort(1, BadFile),
-    ?line {'EXIT', {{badarg, {flipp}}, _}} = 
+    {'EXIT', {{badarg, {flipp}}, _}} =
 	(catch file_sorter:keysort(1, {flipp})),
 
-    ?line {'EXIT', {{badarg, {flipp}}, _}} = 
+    {'EXIT', {{badarg, {flipp}}, _}} =
 	(catch file_sorter:merge([{flipp}],foo)),
-    ?line {error,{file_error,ABadFile,enoent}} = 
+    {error,{file_error,ABadFile,enoent}} =
 	file_sorter:keymerge(1,[BadFile],foo),
-    ?line {'EXIT', {{badarg, {flipp}}, _}} = 
+    {'EXIT', {{badarg, {flipp}}, _}} =
 	(catch file_sorter:keymerge(1,[{flipp}],foo)),
-    ?line {'EXIT', {{badarg, _}, _}} = 
+    {'EXIT', {{badarg, _}, _}} =
 	(catch file_sorter:merge(fun(X) -> X end, foo)),
-    ?line {'EXIT', {{badarg, _}, _}} = 
+    {'EXIT', {{badarg, _}, _}} =
 	(catch file_sorter:keymerge(1, fun(X) -> X end, foo)),
 
-    ?line {error,{file_error,ABadFile,enoent}} = 
+    {error,{file_error,ABadFile,enoent}} =
 	file_sorter:check(BadFile),
-    ?line {'EXIT', {{badarg, {flipp}}, _}} = 
+    {'EXIT', {{badarg, {flipp}}, _}} =
 	(catch file_sorter:check({flipp})),
-    ?line {error,{file_error,ABadFile,enoent}} = 
+    {error,{file_error,ABadFile,enoent}} =
 	file_sorter:keycheck(1, BadFile),
-    ?line {'EXIT', {{badarg, {flipp}}, _}} = 
+    {'EXIT', {{badarg, {flipp}}, _}} =
 	(catch file_sorter:keycheck(1, {flipp})),
-    ?line {'EXIT', {{badarg, {flipp}}, _}} = 
+    {'EXIT', {{badarg, {flipp}}, _}} =
 	(catch file_sorter:check([{flipp}],foo)),
-    ?line {'EXIT', {{badarg, {flipp}}, _}} = 
+    {'EXIT', {{badarg, {flipp}}, _}} =
 	(catch file_sorter:keycheck(1,[{flipp}],foo)),
-    ?line {'EXIT', {{badarg, _}, _}} = 
+    {'EXIT', {{badarg, _}, _}} =
 	(catch file_sorter:check(fun(X) -> X end, foo)),
-    ?line {'EXIT', {{badarg, _}, _}} = 
+    {'EXIT', {{badarg, _}, _}} =
 	(catch file_sorter:keycheck(1, fun(X) -> X end, foo)),
 
-    ?line Fs1 = to_files([[1,2,3]], binary_term, Config),
-    ?line {'EXIT', {{badarg, flipp}, _}} = 
+    Fs1 = to_files([[1,2,3]], binary_term, Config),
+    {'EXIT', {{badarg, flipp}, _}} =
 	(catch file_sorter:check(Fs1 ++ flipp, [])),
     [F1] = Fs1,
-    ?line {error,{file_error,_,_}} = 
+    {error,{file_error,_,_}} =
         file_sorter:sort(Fs1, foo, [{tmpdir,F1},{size,0}]),
-    ?line delete_files(Fs1),
-    ?line Fs2 = to_files([[1,2,3]], binary_term, Config),
+    delete_files(Fs1),
+    Fs2 = to_files([[1,2,3]], binary_term, Config),
     {error,{file_error,_,enoent}} = 
 	file_sorter:sort(Fs2, foo, [{tmpdir,filename:absname(BadFile)},
                                     {size,0}]),
-    ?line delete_files(Fs2),
+    delete_files(Fs2),
 
-    ?line {'EXIT', {{badarg, bad}, _}} = 
+    {'EXIT', {{badarg, bad}, _}} =
 	(catch file_sorter:check([], [{format,term} | bad])),
-    ?line {'EXIT', {{badarg, [{flipp}]}, _}} = 
+    {'EXIT', {{badarg, [{flipp}]}, _}} =
 	(catch file_sorter:check([{flipp}])),
-    ?line {'EXIT', {{badarg, {flipp}}, _}} = 
+    {'EXIT', {{badarg, {flipp}}, _}} =
 	(catch file_sorter:keycheck(1, {flipp})),
-    ?line {'EXIT', {{badarg, [{flipp}]}, _}} = 
+    {'EXIT', {{badarg, [{flipp}]}, _}} =
 	(catch file_sorter:keycheck(2, [{flipp}])),
-    ?line {error,{file_error,_,eisdir}} = file_sorter:keycheck(1, []),
-    ?line {'EXIT', {{badarg, kp}, _}} = (catch file_sorter:keycheck(kp, [])),
-    ?line {'EXIT', {{badarg, kp}, _}} = 
+    {error,{file_error,_,eisdir}} = file_sorter:keycheck(1, []),
+    {'EXIT', {{badarg, kp}, _}} = (catch file_sorter:keycheck(kp, [])),
+    {'EXIT', {{badarg, kp}, _}} =
 	(catch file_sorter:keycheck([1, kp], [])),
-    ?line {'EXIT', {{badarg, kp}, _}} = 
+    {'EXIT', {{badarg, kp}, _}} =
 	(catch file_sorter:keycheck([1 | kp], [])),
-    ?line {'EXIT', {{badarg, []}, _}} = (catch file_sorter:keycheck([], [])),
-    ?line {'EXIT', {{badarg, {format, foo}}, _}} = 
+    {'EXIT', {{badarg, []}, _}} = (catch file_sorter:keycheck([], [])),
+    {'EXIT', {{badarg, {format, foo}}, _}} =
 	(catch file_sorter:check([], {format,foo})),
-    ?line {'EXIT', {{badarg, not_an_option}, _}} = 
+    {'EXIT', {{badarg, not_an_option}, _}} =
 	(catch file_sorter:keycheck(7, [], [not_an_option])),
-    ?line {'EXIT', {{badarg, format}, _}} = 
+    {'EXIT', {{badarg, format}, _}} =
 	(catch file_sorter:keycheck(1, [], [{format, binary}])),
-    ?line {'EXIT', {{badarg, order}, _}} = 
+    {'EXIT', {{badarg, order}, _}} =
 	(catch file_sorter:keycheck(1, [], [{order, fun compare/2}])),
 
-    ?line do_badarg(fun(I, O) -> file_sorter:sort(I, O) end,
-		    fun(Kp, I, O) -> file_sorter:keysort(Kp, I, O) end,
-		    BadFile),
-    ?line do_badarg_opt(fun(I, O, X) -> file_sorter:sort(I, O, X) end,
-			fun(Kp, I, O, X) -> file_sorter:keysort(Kp, I, O, X) 
-			end),
-    ?line do_badarg(fun(I, O) -> file_sorter:merge(I, O) end,
-		    fun(Kp, I, O) -> file_sorter:keymerge(Kp, I, O) end, 
-		    BadFile),
-    ?line do_badarg_opt(fun(I, O, X) -> file_sorter:merge(I, O, X) end,
-			fun(Kp, I, O, X) -> file_sorter:keymerge(Kp, I, O, X) 
-			end).
+    do_badarg(fun(I, O) -> file_sorter:sort(I, O) end,
+	      fun(Kp, I, O) -> file_sorter:keysort(Kp, I, O) end,
+	      BadFile),
+    do_badarg_opt(fun(I, O, X) -> file_sorter:sort(I, O, X) end,
+		  fun(Kp, I, O, X) -> file_sorter:keysort(Kp, I, O, X)
+		  end),
+    do_badarg(fun(I, O) -> file_sorter:merge(I, O) end,
+	      fun(Kp, I, O) -> file_sorter:keymerge(Kp, I, O) end,
+	      BadFile),
+    do_badarg_opt(fun(I, O, X) -> file_sorter:merge(I, O, X) end,
+		  fun(Kp, I, O, X) -> file_sorter:keymerge(Kp, I, O, X)
+		  end).
 
 do_badarg(F, KF, BadFile) ->
     [Char | _] = BadFile,
     AFlipp = filename:absname(flipp),
-    ?line {error,{file_error,AFlipp,enoent}} = F([flipp | flopp], foo),
-    ?line {'EXIT', {{badarg, {foo,bar}}, _}} = (catch F([], {foo,bar})),
-    ?line {'EXIT', {{badarg, Char}, _}} = (catch F(BadFile, [])),
-    ?line {'EXIT', {{badarg, {flipp}}, _}} = (catch F({flipp}, [])),
-
-    ?line {'EXIT', {{badarg, Char}, _}} = (catch KF(1, BadFile, [])),
-    ?line {'EXIT', {{badarg, {flipp}}, _}} = (catch KF(1, {flipp}, [])),
-    ?line {error,{file_error,AFlipp,enoent}} = 
+    {error,{file_error,AFlipp,enoent}} = F([flipp | flopp], foo),
+    {'EXIT', {{badarg, {foo,bar}}, _}} = (catch F([], {foo,bar})),
+    {'EXIT', {{badarg, Char}, _}} = (catch F(BadFile, [])),
+    {'EXIT', {{badarg, {flipp}}, _}} = (catch F({flipp}, [])),
+
+    {'EXIT', {{badarg, Char}, _}} = (catch KF(1, BadFile, [])),
+    {'EXIT', {{badarg, {flipp}}, _}} = (catch KF(1, {flipp}, [])),
+    {error,{file_error,AFlipp,enoent}} =
 	KF(2, [flipp | flopp], foo),
-    ?line {'EXIT', {{badarg, {foo,bar}}, _}} = (catch KF(1, [], {foo,bar})),
-    ?line {'EXIT', {{badarg, kp}, _}} = (catch KF(kp, [], foo)),
-    ?line {'EXIT', {{badarg, kp}, _}} = (catch KF([1, kp], [], foo)),
-    ?line {'EXIT', {{badarg, kp}, _}} = (catch KF([1 | kp], [], foo)),
-    ?line {'EXIT', {{badarg, []}, _}} = (catch KF([], [], foo)),
+    {'EXIT', {{badarg, {foo,bar}}, _}} = (catch KF(1, [], {foo,bar})),
+    {'EXIT', {{badarg, kp}, _}} = (catch KF(kp, [], foo)),
+    {'EXIT', {{badarg, kp}, _}} = (catch KF([1, kp], [], foo)),
+    {'EXIT', {{badarg, kp}, _}} = (catch KF([1 | kp], [], foo)),
+    {'EXIT', {{badarg, []}, _}} = (catch KF([], [], foo)),
     ok.
 
 do_badarg_opt(F, KF) ->
     AFlipp = filename:absname(flipp),
-    ?line {error,{file_error,AFlipp,enoent}} = 
-	   F([flipp | flopp], foo, []),
-    ?line {'EXIT', {{badarg, {flipp}}, _}} = (catch F([{flipp}], foo, [])),
-    ?line {'EXIT', {{badarg, {out,put}}, _}} = (catch F([], {out,put}, [])),
-    ?line {'EXIT', {{badarg, not_an_option}, _}} = 
+    {error,{file_error,AFlipp,enoent}} =
+	F([flipp | flopp], foo, []),
+    {'EXIT', {{badarg, {flipp}}, _}} = (catch F([{flipp}], foo, [])),
+    {'EXIT', {{badarg, {out,put}}, _}} = (catch F([], {out,put}, [])),
+    {'EXIT', {{badarg, not_an_option}, _}} =
 	(catch F([], foo, [not_an_option])),
-    ?line {'EXIT', {{badarg, {format, foo}}, _}} = 
-	   (catch F([], foo, {format,foo})),
-    ?line {'EXIT', {{badarg, {size,foo}}, _}} = (catch F([], foo, {size,foo})),
+    {'EXIT', {{badarg, {format, foo}}, _}} =
+	(catch F([], foo, {format,foo})),
+    {'EXIT', {{badarg, {size,foo}}, _}} = (catch F([], foo, {size,foo})),
 
-    ?line {'EXIT', {{badarg, {size, -1}}, _}} = (catch F([], foo, {size,-1})),
-    ?line {'EXIT', {{badarg, {no_files, foo}}, _}} = 
+    {'EXIT', {{badarg, {size, -1}}, _}} = (catch F([], foo, {size,-1})),
+    {'EXIT', {{badarg, {no_files, foo}}, _}} =
 	(catch F([], foo, {no_files,foo})),
-    ?line {'EXIT', {{badarg, {no_files, 1}}, _}} = 
+    {'EXIT', {{badarg, {no_files, 1}}, _}} =
 	(catch F([], foo, {no_files,1})),
-    ?line {'EXIT', {{badarg, 1}, _}} = (catch F([], foo, {tmpdir,1})),
-    ?line {'EXIT', {{badarg, {order,1}}, _}} = (catch F([], foo, {order,1})),
-    ?line {'EXIT', {{badarg, {compressed, flopp}}, _}} = 
-	   (catch F([], foo, {compressed,flopp})),
-    ?line {'EXIT', {{badarg, {unique,flopp}}, _}} = 
-	   (catch F([], foo, {unique,flopp})),
-    ?line {'EXIT', {{badarg, {header,foo}}, _}} = 
+    {'EXIT', {{badarg, 1}, _}} = (catch F([], foo, {tmpdir,1})),
+    {'EXIT', {{badarg, {order,1}}, _}} = (catch F([], foo, {order,1})),
+    {'EXIT', {{badarg, {compressed, flopp}}, _}} =
+	(catch F([], foo, {compressed,flopp})),
+    {'EXIT', {{badarg, {unique,flopp}}, _}} =
+	(catch F([], foo, {unique,flopp})),
+    {'EXIT', {{badarg, {header,foo}}, _}} =
 	(catch F([], foo, {header,foo})),
-    ?line {'EXIT', {{badarg, {header, 0}}, _}} = 
+    {'EXIT', {{badarg, {header, 0}}, _}} =
 	(catch F([], foo, {header,0})),
-    ?line {'EXIT', {{badarg, {header, 1 bsl 35}}, _}} = 
+    {'EXIT', {{badarg, {header, 1 bsl 35}}, _}} =
 	(catch F([], foo, {header,1 bsl 35})),
-    ?line {'EXIT', {{badarg, header}, _}} = 
+    {'EXIT', {{badarg, header}, _}} =
 	(catch F([], foo, [{header,1},{format,term}])),
 
-    ?line {'EXIT', {{badarg, not_an_option}, _}} = 
+    {'EXIT', {{badarg, not_an_option}, _}} =
 	(catch KF(7, [], foo, [not_an_option])),
-    ?line {'EXIT', {{badarg,format}, _}} = 
+    {'EXIT', {{badarg,format}, _}} =
 	(catch KF(1, [], foo, [{format, binary}])),
-    ?line {'EXIT', {{badarg, order}, _}} = 
+    {'EXIT', {{badarg, order}, _}} =
 	(catch KF(1, [], foo, [{order, fun compare/2}])),
-    ?line {'EXIT', {{badarg, {flipp}}, _}} = 
+    {'EXIT', {{badarg, {flipp}}, _}} =
 	(catch KF(2, [{flipp}], foo,[])),
-    ?line {error,{file_error,AFlipp,enoent}} = 
+    {error,{file_error,AFlipp,enoent}} =
 	KF(2, [flipp | flopp], foo,[]),
-    ?line {'EXIT', {{badarg, {out, put}}, _}} = 
+    {'EXIT', {{badarg, {out, put}}, _}} =
 	(catch KF(1, [], {out,put}, [])),
-    ?line {'EXIT', {{badarg, kp}, _}} = (catch KF(kp, [], foo, [])),
-    ?line {'EXIT', {{badarg, kp}, _}} = (catch KF([1, kp], [], foo, [])),
-    ?line {'EXIT', {{badarg, kp}, _}} = (catch KF([1 | kp], [], foo, [])),
+    {'EXIT', {{badarg, kp}, _}} = (catch KF(kp, [], foo, [])),
+    {'EXIT', {{badarg, kp}, _}} = (catch KF([1, kp], [], foo, [])),
+    {'EXIT', {{badarg, kp}, _}} = (catch KF([1 | kp], [], foo, [])),
     ok.
 
-term_sort(doc) ->
-    ["Sort terms on files."];
-term_sort(suite) ->
-    [];
+%% Sort terms on files.
 term_sort(Config) when is_list(Config) ->
-    ?line sort(term, [{compressed,false}], Config),
-    ?line sort(term, [{order, fun compare/2}], Config),
-    ?line sort(term, [{order, ascending}, {compressed,true}], Config),
-    ?line sort(term, [{order, descending}], Config),
+    sort(term, [{compressed,false}], Config),
+    sort(term, [{order, fun compare/2}], Config),
+    sort(term, [{order, ascending}, {compressed,true}], Config),
+    sort(term, [{order, descending}], Config),
     ok.
 
-term_keysort(doc) ->
-    ["Keysort terms on files."];
-term_keysort(suite) ->
-    [];
+%% Keysort terms on files.
 term_keysort(Config) when is_list(Config) ->
-    ?line keysort(term, [{tmpdir, ""}], Config),
-    ?line keysort(term, [{order,descending}], Config),
+    keysort(term, [{tmpdir, ""}], Config),
+    keysort(term, [{order,descending}], Config),
     ok.
 
-binary_term_sort(doc) ->
-    ["Sort binary terms on files."];
-binary_term_sort(suite) ->
-    [];
+%% Sort binary terms on files.
 binary_term_sort(Config) when is_list(Config) ->
     PrivDir = ?privdir(Config),
-    ?line sort({2, binary_term}, [], Config),
-    ?line sort(binary_term, [{tmpdir, list_to_atom(PrivDir)}], Config),
-    ?line sort(binary_term, [{tmpdir,PrivDir}], Config),
-    ?line sort({3,binary_term}, [{order, fun compare/2}], Config),
-    ?line sort(binary_term, [{order, fun compare/2}], Config),
-    ?line sort(binary_term, [{order,descending}], Config),
+    sort({2, binary_term}, [], Config),
+    sort(binary_term, [{tmpdir, list_to_atom(PrivDir)}], Config),
+    sort(binary_term, [{tmpdir,PrivDir}], Config),
+    sort({3,binary_term}, [{order, fun compare/2}], Config),
+    sort(binary_term, [{order, fun compare/2}], Config),
+    sort(binary_term, [{order,descending}], Config),
     ok.
 
-binary_term_keysort(doc) ->
-    ["Keysort binary terms on files."];
-binary_term_keysort(suite) ->
-    [];
+%% Keysort binary terms on files.
 binary_term_keysort(Config) when is_list(Config) ->
-    ?line keysort({3, binary_term}, [], Config),
-    ?line keysort(binary_term, [], Config),
-    ?line keysort(binary_term, [{order,descending}], Config),
+    keysort({3, binary_term}, [], Config),
+    keysort(binary_term, [], Config),
+    keysort(binary_term, [{order,descending}], Config),
     ok.
 
-binary_sort(doc) ->
-    ["Sort binaries on files."];
-binary_sort(suite) ->
-    [];
+%% Sort binaries on files.
 binary_sort(Config) when is_list(Config) ->
     PrivDir = ?privdir(Config),
-    ?line sort({2, binary}, [], Config),
-    ?line sort(binary, [{tmpdir, list_to_atom(PrivDir)}], Config),
-    ?line sort(binary, [{tmpdir,PrivDir}], Config),
-    ?line sort({3,binary}, [{order, fun compare/2}], Config),
-    ?line sort(binary, [{order, fun compare/2}], Config),
-    ?line sort(binary, [{order,descending}], Config),
+    sort({2, binary}, [], Config),
+    sort(binary, [{tmpdir, list_to_atom(PrivDir)}], Config),
+    sort(binary, [{tmpdir,PrivDir}], Config),
+    sort({3,binary}, [{order, fun compare/2}], Config),
+    sort(binary, [{order, fun compare/2}], Config),
+    sort(binary, [{order,descending}], Config),
     ok.
 
-term_merge(doc) ->
-    ["Merge terms on files."];
-term_merge(suite) ->
-    [];
+%% Merge terms on files.
 term_merge(Config) when is_list(Config) ->
-    ?line merge(term, [{order, fun compare/2}], Config),
-    ?line merge(term, [{order, ascending}, {compressed,true}], Config),
-    ?line merge(term, [{order, descending}, {compressed,false}], Config),
+    merge(term, [{order, fun compare/2}], Config),
+    merge(term, [{order, ascending}, {compressed,true}], Config),
+    merge(term, [{order, descending}, {compressed,false}], Config),
     ok.
 
-term_keymerge(doc) ->
-    ["Keymerge terms on files."];
-term_keymerge(suite) ->
-    [];
+%% Keymerge terms on files.
 term_keymerge(Config) when is_list(Config) ->
-    ?line keymerge(term, [], Config),
-    ?line keymerge(term, [{order, descending}], Config),
-    ?line funmerge(term, [], Config),
+    keymerge(term, [], Config),
+    keymerge(term, [{order, descending}], Config),
+    funmerge(term, [], Config),
     ok.
 
-binary_term_merge(doc) ->
-    ["Merge binary terms on files."];
-binary_term_merge(suite) ->
-    [];
+%% Merge binary terms on files.
 binary_term_merge(Config) when is_list(Config) ->
-    ?line merge(binary_term, [], Config),
-    ?line merge({7, binary_term}, [], Config),
-    ?line merge({3, binary_term}, [{order, fun compare/2}], Config),
+    merge(binary_term, [], Config),
+    merge({7, binary_term}, [], Config),
+    merge({3, binary_term}, [{order, fun compare/2}], Config),
     ok.
 
-binary_term_keymerge(doc) ->
-    ["Keymerge binary terms on files."];
-binary_term_keymerge(suite) ->
-    [];
+%% Keymerge binary terms on files.
 binary_term_keymerge(Config) when is_list(Config) ->
-    ?line keymerge({3, binary_term}, [], Config),
-    ?line keymerge(binary_term, [], Config),
-    ?line funmerge({3, binary_term}, [], Config),
-    ?line funmerge(binary_term, [], Config),
+    keymerge({3, binary_term}, [], Config),
+    keymerge(binary_term, [], Config),
+    funmerge({3, binary_term}, [], Config),
+    funmerge(binary_term, [], Config),
     ok.
 
-binary_merge(doc) ->
-    ["Merge binaries on files."];
-binary_merge(suite) ->
-    [];
+%% Merge binaries on files.
 binary_merge(Config) when is_list(Config) ->
-    ?line merge(binary, [], Config),
-    ?line merge({7, binary}, [], Config),
-    ?line merge({3, binary}, [{order, fun compare/2}], Config),
+    merge(binary, [], Config),
+    merge({7, binary}, [], Config),
+    merge({3, binary}, [{order, fun compare/2}], Config),
     ok.
 
-term_check(doc) ->
-    ["Check terms on files."];
-term_check(suite) ->
-    [];
+%% Check terms on files.
 term_check(Config) when is_list(Config) ->
-    ?line check(term, Config),
+    check(term, Config),
     ok.
 
-binary_term_check(doc) ->
-    ["Check binary terms on files."];
-binary_term_check(suite) ->
-    [];
+%% Check binary terms on files.
 binary_term_check(Config) when is_list(Config) ->
-    ?line check(binary_term, Config),
+    check(binary_term, Config),
     ok.
 
-term_keycheck(doc) ->
-    ["Keycheck terms on files."];
-term_keycheck(suite) ->
-    [];
+%% Keycheck terms on files.
 term_keycheck(Config) when is_list(Config) ->
-    ?line keycheck(term, Config),
+    keycheck(term, Config),
     ok.
 
-binary_term_keycheck(doc) ->
-    ["Keycheck binary terms on files."];
-binary_term_keycheck(suite) ->
-    [];
+%% Keycheck binary terms on files.
 binary_term_keycheck(Config) when is_list(Config) ->
-    ?line keycheck(binary_term, Config),
+    keycheck(binary_term, Config),
     ok.
 
-binary_check(doc) ->
-    ["Check binary terms on files."];
-binary_check(suite) ->
-    [];
+%% Check binary terms on files.
 binary_check(Config) when is_list(Config) ->
-    ?line check(binary, Config),
+    check(binary, Config),
     ok.
 
-inout(doc) ->
-    ["Funs as input or output."];
-inout(suite) ->
-    [];
+%% Funs as input or output.
 inout(Config) when is_list(Config) ->
     BTF = {format, binary_term},
     Foo = outfile("foo", Config),
@@ -462,52 +407,52 @@ inout(Config) when is_list(Config) ->
     End = fun(read) -> end_of_input end,
 
     IF1 = fun(read) -> {[1,7,5], End} end,
-    ?line ok = file_sorter:sort(IF1, Foo, [{format, term}]),
+    ok = file_sorter:sort(IF1, Foo, [{format, term}]),
     %% 'close' is called, but the return value is caught and ignored.
     IF2 = fun(read) -> {[1,2,3], fun(close) -> throw(ignored) end} end,
-    ?line {error, bad_object} = file_sorter:sort(IF2, Foo, BTF),
+    {error, bad_object} = file_sorter:sort(IF2, Foo, BTF),
 
     IF3 = fun(no_match) -> foo end,
-    ?line {'EXIT', {function_clause, _}} = 
+    {'EXIT', {function_clause, _}} =
 	(catch file_sorter:sort(IF3, Foo)),
     IF4 = fun(read) -> throw(my_message) end,
-    ?line my_message = (catch file_sorter:sort(IF4, Foo)),
+    my_message = (catch file_sorter:sort(IF4, Foo)),
     IF5 = fun(read) -> {error, my_error} end,
-    ?line {error, my_error} = file_sorter:sort(IF5, Foo),
+    {error, my_error} = file_sorter:sort(IF5, Foo),
 
     %% Output is fun.
-    ?line {error, bad_object} = 
+    {error, bad_object} =
 	file_sorter:sort(IF2, fun(close) -> ignored end, BTF),
     Args = [{format, term}],
-    ?line {error, bad_object} = 
-       file_sorter:keysort(1, IF2, fun(close) -> ignored end, Args),
+    {error, bad_object} =
+	file_sorter:keysort(1, IF2, fun(close) -> ignored end, Args),
     OF1 = fun(close) -> fine; (L) when is_list(L) -> fun(close) -> nice end end,
-    ?line nice = file_sorter:sort(IF1, OF1, Args),
+    nice = file_sorter:sort(IF1, OF1, Args),
     OF2 = fun(_) -> my_return end,
-    ?line my_return = file_sorter:sort(IF1, OF2, Args),
+    my_return = file_sorter:sort(IF1, OF2, Args),
     OF3 = fun(_) -> throw(my_message) end,
-    ?line my_message = (catch file_sorter:sort(IF1, OF3, Args)),
+    my_message = (catch file_sorter:sort(IF1, OF3, Args)),
     OF4 = fun(no_match) -> foo end,
-    ?line {'EXIT', {function_clause, _}} = 
+    {'EXIT', {function_clause, _}} =
 	(catch file_sorter:sort(IF1, OF4, Args)),
 
-    ?line P0 = pps(),
-    ?line Fs1 = to_files([[3,1,2,5,4], [8,3,10]], term, Config),
-    ?line error = file_sorter:sort(Fs1, fun(_) -> error end, Args),
-    ?line delete_files(Fs1),
+    P0 = pps(),
+    Fs1 = to_files([[3,1,2,5,4], [8,3,10]], term, Config),
+    error = file_sorter:sort(Fs1, fun(_) -> error end, Args),
+    delete_files(Fs1),
 
-    ?line true = P0 =:= pps(),
+    true = P0 =:= pps(),
 
     %% Passing a value from the input functions to the output functions.
     IFV1 = fun(read) -> {end_of_input, 17} end,
     OFV1 = fun({value, Value}) -> ofv(Value, []) end,
-    ?line {17, []} = file_sorter:sort(IFV1, OFV1, Args),
+    {17, []} = file_sorter:sort(IFV1, OFV1, Args),
 
     %% Output is not a fun. The value returned by input funs is ignored.
     %% OTP-5009.
-    ?line ok = file_sorter:sort(IFV1, Foo, [{format,term}]),
-    ?line [] = from_files(Foo, term),
-    ?line delete_files(Foo),
+    ok = file_sorter:sort(IFV1, Foo, [{format,term}]),
+    [] = from_files(Foo, term),
+    delete_files(Foo),
 
     ok.
 
@@ -518,10 +463,7 @@ ofv(Value, A) ->
 	    ofv(Value, [L | A])
     end.
 
-many(doc) ->
-    ["Many temporary files."];
-many(suite) ->
-    [];
+%% Many temporary files.
 many(Config) when is_list(Config) ->
     Foo = outfile("foo", Config),
     PrivDir = ?privdir(Config),
@@ -530,171 +472,168 @@ many(Config) when is_list(Config) ->
     Args = [{format, term}],
     L1 = lists:map(fun(I) -> {one, two, three, I} end, lists:seq(1,1000)),
     L2 = lists:map(fun(I) -> {four, five, six, I} end, lists:seq(1,1000)),
-    ?line Fs2 = to_files([L1, L2], term, Config),
-    ?line ok = file_sorter:sort(Fs2, Foo, [{size,1000} | Args]),
-    ?line R = lists:sort(L1++L2),
-    ?line R = from_files(Foo, term),
-    ?line 2000 = length(R),
-    ?line ok = file_sorter:sort(Fs2, Foo, [{no_files,4},{size,1000} | Args]),
-    ?line R = from_files(Foo, term),
-    ?line ok = 
+    Fs2 = to_files([L1, L2], term, Config),
+    ok = file_sorter:sort(Fs2, Foo, [{size,1000} | Args]),
+    R = lists:sort(L1++L2),
+    R = from_files(Foo, term),
+    2000 = length(R),
+    ok = file_sorter:sort(Fs2, Foo, [{no_files,4},{size,1000} | Args]),
+    R = from_files(Foo, term),
+    ok =
 	file_sorter:sort(Fs2, Foo, 
 			 [{no_files,4},{size,1000},{order,descending} | Args]),
-    ?line true = lists:reverse(R) =:= from_files(Foo, term),
-    ?line ok = 
+    true = lists:reverse(R) =:= from_files(Foo, term),
+    ok =
 	file_sorter:sort(Fs2, Foo, 
 			 [{no_files,4},{size,1000},
 			  {order,fun compare/2} | Args]),
-    ?line R = from_files(Foo, term),
-    ?line ok = file_sorter:keysort(4, Fs2, Foo, 
-				   [{no_files,4},{size,1000} | Args]),
-    ?line RK = lists:keysort(4, L1++L2),
-    ?line RK = from_files(Foo, term),
-    ?line delete_files(Foo),
-    ?line ok = 
+    R = from_files(Foo, term),
+    ok = file_sorter:keysort(4, Fs2, Foo,
+			     [{no_files,4},{size,1000} | Args]),
+    RK = lists:keysort(4, L1++L2),
+    RK = from_files(Foo, term),
+    delete_files(Foo),
+    ok =
 	file_sorter:keysort(4, Fs2, Foo, 
-		      [{no_files,4},{size,1000},{order,descending} | Args]),
-    ?line true = lists:reverse(RK) =:= from_files(Foo, term),
-    ?line delete_files(Foo),
-    ?line ok = file_sorter:keysort(4, Fs2, Foo, 
-				   [{size,500},{order,descending} | Args]),
-    ?line true = lists:reverse(RK) =:= from_files(Foo, term),
-    ?line delete_files(Foo),
-    ?line error = file_sorter:sort(Fs2, fun(_) -> error end, 
-				   [{tmpdir, PrivDir}, {no_files,3}, 
-				    {size,10000} | Args]),
+			    [{no_files,4},{size,1000},{order,descending} | Args]),
+    true = lists:reverse(RK) =:= from_files(Foo, term),
+    delete_files(Foo),
+    ok = file_sorter:keysort(4, Fs2, Foo,
+			     [{size,500},{order,descending} | Args]),
+    true = lists:reverse(RK) =:= from_files(Foo, term),
+    delete_files(Foo),
+    error = file_sorter:sort(Fs2, fun(_) -> error end,
+			     [{tmpdir, PrivDir}, {no_files,3},
+			      {size,10000} | Args]),
 
     TmpDir = filename:join(PrivDir, "tmpdir"),
     file:del_dir(TmpDir),
-    ?line ok = file:make_dir(TmpDir),
-    ?line case os:type() of
-	      {unix, _} ->
-		  ?line ok = file:change_mode(TmpDir, 8#0000),
-		  ?line {error, {file_error, _,_}} = 
-		      file_sorter:sort(Fs2, fun(_M) -> foo end, 
-				       [{no_files,3},{size,10000},
-					{tmpdir,TmpDir} | Args]);
-	      _ ->
-		  true
-	  end,
-    ?line ok = file:del_dir(TmpDir),
+    ok = file:make_dir(TmpDir),
+    case os:type() of
+	{unix, _} ->
+	    ok = file:change_mode(TmpDir, 8#0000),
+	    {error, {file_error, _,_}} =
+		file_sorter:sort(Fs2, fun(_M) -> foo end,
+				 [{no_files,3},{size,10000},
+				  {tmpdir,TmpDir} | Args]);
+	_ ->
+	    true
+    end,
+    ok = file:del_dir(TmpDir),
     delete_files(Fs2),
-    ?line true = P0 =:= pps(),
+    true = P0 =:= pps(),
     ok.
 
-misc(doc) ->
-    ["Some other tests."];
-misc(suite) ->
-    [];
+%% Some other tests.
 misc(Config) when is_list(Config) ->
     BTF = {format, binary_term},
     Foo = outfile("foo", Config),
     FFoo = filename:absname(Foo),
     P0 = pps(),
 
-    ?line [File] = Fs1 = to_files([[1,3,2]], term, Config),
-    ?line ok = file:write_file(Foo,<<>>),
-    ?line case os:type() of
-	      {unix, _} ->
-                  ok = file:change_mode(Foo, 8#0000),
-                  {error,{file_error,FFoo,eacces}} = 
-                      file_sorter:sort(Fs1, Foo, {format,term});
-              _ ->
-                  true
-          end,
-    ?line file:delete(Foo),
-    ?line NoBytes = 16, % RAM memory will never get this big, or?
-    ?line ALot = (1 bsl (NoBytes*8)) - 1,
-    ?line ok = file:write_file(File, <<ALot:NoBytes/unit:8,"foobar">>),
+    [File] = Fs1 = to_files([[1,3,2]], term, Config),
+    ok = file:write_file(Foo,<<>>),
+    case os:type() of
+	{unix, _} ->
+	    ok = file:change_mode(Foo, 8#0000),
+	    {error,{file_error,FFoo,eacces}} =
+		file_sorter:sort(Fs1, Foo, {format,term});
+	_ ->
+	    true
+    end,
+    file:delete(Foo),
+    NoBytes = 16, % RAM memory will never get this big, or?
+    ALot = (1 bsl (NoBytes*8)) - 1,
+    ok = file:write_file(File, <<ALot:NoBytes/unit:8,"foobar">>),
     FFile = filename:absname(File),
-    ?line {error, {bad_object,FFile}} = 
+    {error, {bad_object,FFile}} =
         file_sorter:sort(Fs1, Foo, [BTF, {header, 20}]),
-    ?line ok = file:write_file(File, <<30:32,"foobar">>),
-    ?line {error, {premature_eof, FFile}} = file_sorter:sort(Fs1, Foo, BTF),
-    ?line ok = file:write_file(File, <<6:32,"foobar">>),
-    ?line {error, {bad_object,FFile}} = file_sorter:sort(Fs1, Foo, BTF),
-    ?line case os:type() of
-              {unix, _} ->
-                  ok = file:change_mode(File, 8#0000),
-                  {error, {file_error,FFile,eacces}} = 
-                      file_sorter:sort(Fs1, Foo),
-                  {error, {file_error,FFile,eacces}} = 
-                      file_sorter:sort(Fs1, Foo, {format, binary_term});
-              _ ->
-                  true
-          end,
-    ?line delete_files(Fs1),
-    ?line true = P0 =:= pps(),
+    ok = file:write_file(File, <<30:32,"foobar">>),
+    {error, {premature_eof, FFile}} = file_sorter:sort(Fs1, Foo, BTF),
+    ok = file:write_file(File, <<6:32,"foobar">>),
+    {error, {bad_object,FFile}} = file_sorter:sort(Fs1, Foo, BTF),
+    case os:type() of
+	{unix, _} ->
+	    ok = file:change_mode(File, 8#0000),
+	    {error, {file_error,FFile,eacces}} =
+		file_sorter:sort(Fs1, Foo),
+	    {error, {file_error,FFile,eacces}} =
+		file_sorter:sort(Fs1, Foo, {format, binary_term});
+	_ ->
+	    true
+    end,
+    delete_files(Fs1),
+    true = P0 =:= pps(),
 
     %% bigger than chunksize
-    ?line E1 = <<32000:32, 10:256000>>,
-    ?line E2 = <<32000:32, 5:256000>>,
-    ?line E3 = <<32000:32, 8:256000>>,
-    ?line ok = file:write_file(Foo, [E1, E2, E3]),
-    ?line ok = file_sorter:sort([Foo], Foo, [{format,binary},{size,10000}]),
-    ?line ok = file_sorter:sort([Foo], Foo, [{format,fun(X) -> X end},
-                                             {size,10000}]),
-    ?line Es = list_to_binary([E2,E3,E1]),
-    ?line {ok, Es} = file:read_file(Foo),
-    ?line delete_files(Foo),
-    ?line true = P0 =:= pps(),
+    E1 = <<32000:32, 10:256000>>,
+    E2 = <<32000:32, 5:256000>>,
+    E3 = <<32000:32, 8:256000>>,
+    ok = file:write_file(Foo, [E1, E2, E3]),
+    ok = file_sorter:sort([Foo], Foo, [{format,binary},{size,10000}]),
+    ok = file_sorter:sort([Foo], Foo, [{format,fun(X) -> X end},
+				       {size,10000}]),
+    Es = list_to_binary([E2,E3,E1]),
+    {ok, Es} = file:read_file(Foo),
+    delete_files(Foo),
+    true = P0 =:= pps(),
 
     %% keysort more than one element
     L = [{c,1,a},{c,2,b},{c,3,c},{b,1,c},{b,2,b},{b,3,a},{a,1,a},{a,2,b},
          {a,3,c}],
-    ?line Fs2 = to_files([L], binary_term, Config),
-    ?line ok = file_sorter:keysort([2,3], Fs2, Foo, {format, binary_term}),
-    ?line KS2_1 = from_files(Foo, binary_term),
-    ?line KS2_2 = lists:keysort(2,lists:keysort(3, L)),
-    ?line KS2_1 = KS2_2,
-    ?line ok = file_sorter:keysort([2,3], Fs2, Foo, 
-                                   [{format, binary_term},{size,5}]),
-    ?line KS2_3 = from_files(Foo, binary_term),
-    ?line KS2_3 = KS2_2,
-    ?line ok = file_sorter:keysort([2,3,1], Fs2, Foo, {format, binary_term}),
-    ?line KS3_1 = from_files(Foo, binary_term),
-    ?line KS3_2 = lists:keysort(2, lists:keysort(3,lists:keysort(1, L))),
-    ?line KS3_1 = KS3_2,
-    ?line ok = file_sorter:keysort([2,3,1], Fs2, Foo, 
-                                   [{format, binary_term},{size,5}]),
-    ?line KS3_3 = from_files(Foo, binary_term),
-    ?line KS3_3 = KS3_2,
-    ?line delete_files([Foo | Fs2]),
-    ?line true = P0 =:= pps(),
+    Fs2 = to_files([L], binary_term, Config),
+    ok = file_sorter:keysort([2,3], Fs2, Foo, {format, binary_term}),
+    KS2_1 = from_files(Foo, binary_term),
+    KS2_2 = lists:keysort(2,lists:keysort(3, L)),
+    KS2_1 = KS2_2,
+    ok = file_sorter:keysort([2,3], Fs2, Foo,
+			     [{format, binary_term},{size,5}]),
+    KS2_3 = from_files(Foo, binary_term),
+    KS2_3 = KS2_2,
+    ok = file_sorter:keysort([2,3,1], Fs2, Foo, {format, binary_term}),
+    KS3_1 = from_files(Foo, binary_term),
+    KS3_2 = lists:keysort(2, lists:keysort(3,lists:keysort(1, L))),
+    KS3_1 = KS3_2,
+    ok = file_sorter:keysort([2,3,1], Fs2, Foo,
+			     [{format, binary_term},{size,5}]),
+    KS3_3 = from_files(Foo, binary_term),
+    KS3_3 = KS3_2,
+    delete_files([Foo | Fs2]),
+    true = P0 =:= pps(),
 
     %% bigger than chunksize
     %% Assumes that CHUNKSIZE = 16384. Illustrates that the Last argument
     %% of merge_files/5 is necessary. 
-    ?line EP1 = erlang:make_tuple(2728,foo),
-    ?line EP2 = lists:duplicate(2729,qqq),
-    ?line LL = [EP1, EP2, EP1, EP2, EP1, EP2],
-    ?line Fs3 = to_files([LL], binary, Config),
-    ?line ok = file_sorter:sort(Fs3, Foo, [{format,binary}, {unique,true}]),
-    ?line [EP1,EP2] = from_files(Foo, binary),
-    ?line delete_files(Foo),
-    ?line ok = file_sorter:sort(Fs3, Foo, 
-                                [{format,binary_term}, {unique,true}, 
-                                 {size,30000}]),
-    ?line [EP1,EP2] = from_files(Foo, binary_term),
-    ?line delete_files([Foo | Fs3]),
-
-    ?line true = P0 =:= pps(),
-
-    ?line BE1 = <<20000:32, 17:160000>>,
-    ?line BE2 = <<20000:32, 1717:160000>>,
-    ?line ok = file:write_file(Foo, [BE1,BE2,BE1,BE2]),
-    ?line ok = file_sorter:sort([Foo], Foo, [{format,binary},
-                                             {size,10000},
-                                             {unique,true}]),
-    ?line BEs = list_to_binary([BE1, BE2]),
-    ?line {ok, BEs} = file:read_file(Foo),
-    ?line delete_files(Foo),
-    ?line true = P0 =:= pps(),
-
-    ?line Fs4 = to_files([[7,4,1]], binary_term, Config),
-    ?line {error, {bad_term, _}} = file_sorter:sort(Fs4, Foo, {format, term}),
-    ?line delete_files([Foo | Fs4]),
-    ?line true = P0 =:= pps(),
+    EP1 = erlang:make_tuple(2728,foo),
+    EP2 = lists:duplicate(2729,qqq),
+    LL = [EP1, EP2, EP1, EP2, EP1, EP2],
+    Fs3 = to_files([LL], binary, Config),
+    ok = file_sorter:sort(Fs3, Foo, [{format,binary}, {unique,true}]),
+    [EP1,EP2] = from_files(Foo, binary),
+    delete_files(Foo),
+    ok = file_sorter:sort(Fs3, Foo,
+			  [{format,binary_term}, {unique,true},
+			   {size,30000}]),
+    [EP1,EP2] = from_files(Foo, binary_term),
+    delete_files([Foo | Fs3]),
+
+    true = P0 =:= pps(),
+
+    BE1 = <<20000:32, 17:160000>>,
+    BE2 = <<20000:32, 1717:160000>>,
+    ok = file:write_file(Foo, [BE1,BE2,BE1,BE2]),
+    ok = file_sorter:sort([Foo], Foo, [{format,binary},
+				       {size,10000},
+				       {unique,true}]),
+    BEs = list_to_binary([BE1, BE2]),
+    {ok, BEs} = file:read_file(Foo),
+    delete_files(Foo),
+    true = P0 =:= pps(),
+
+    Fs4 = to_files([[7,4,1]], binary_term, Config),
+    {error, {bad_term, _}} = file_sorter:sort(Fs4, Foo, {format, term}),
+    delete_files([Foo | Fs4]),
+    true = P0 =:= pps(),
 
     ok.
 
@@ -708,71 +647,71 @@ sort(Fmt, XArgs, Config) ->
     Foo = outfile("foo", Config),
 
     %% Input is a fun. Output is a fun.
-    ?line [] = file_sorter:sort(input([], 2, Fmt), output([], Fmt), Args),
-    ?line L1 = [3,1,2,5,4],
-    ?line S1 = file_sorter:sort(input(L1, 2, Fmt), output([], Fmt), TmpArgs),
-    ?line S1 = rev(lists:sort(L1), TmpArgs),
+    [] = file_sorter:sort(input([], 2, Fmt), output([], Fmt), Args),
+    L1 = [3,1,2,5,4],
+    S1 = file_sorter:sort(input(L1, 2, Fmt), output([], Fmt), TmpArgs),
+    S1 = rev(lists:sort(L1), TmpArgs),
 
     %% Input is a file. Output is a fun.
-    ?line [] = file_sorter:sort([], output([], Fmt), Args),
-    ?line L2 = [3,1,2,5,4],
-    ?line Fs1 = to_files([L2], Fmt, Config),
-    ?line S2 = file_sorter:sort(Fs1, output([], Fmt), TmpArgs),
-    ?line S2 = rev(lists:sort(L2), TmpArgs),
-    ?line delete_files(Fs1),
+    [] = file_sorter:sort([], output([], Fmt), Args),
+    L2 = [3,1,2,5,4],
+    Fs1 = to_files([L2], Fmt, Config),
+    S2 = file_sorter:sort(Fs1, output([], Fmt), TmpArgs),
+    S2 = rev(lists:sort(L2), TmpArgs),
+    delete_files(Fs1),
 
     %% Input is a file. Output is a file
-    ?line ok = file_sorter:sort([], Foo, Args),
-    ?line [] = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line ok = file_sorter:sort([], Foo, [{unique,true} | Args]),
-    ?line [] = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line L3 = [3,1,2,5,4,6],
-    ?line Fs2 = to_files([L3], Fmt, Config),
-    ?line ok = file_sorter:sort(Fs2, Foo, Args),
-    ?line true = rev(lists:sort(L3), Args) =:= from_files(Foo, Fmt),
-    ?line delete_files([Foo | Fs2]),
-    ?line L4 = [1,3,4,1,2,5,4,5,6],
-    ?line Fs3 = to_files([L4], Fmt, Config),
-    ?line ok = file_sorter:sort(Fs3, Foo, Args++[{unique,true}, 
-						 {size,100000}]),
-    ?line true = rev(lists:usort(L4), Args) =:= from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line ok = file_sorter:sort(Fs3, Foo, Args++[{unique,true}]),
-    ?line true = rev(lists:usort(L4), Args) =:= from_files(Foo, Fmt),
-    ?line delete_files([Foo | Fs3]),
+    ok = file_sorter:sort([], Foo, Args),
+    [] = from_files(Foo, Fmt),
+    delete_files(Foo),
+    ok = file_sorter:sort([], Foo, [{unique,true} | Args]),
+    [] = from_files(Foo, Fmt),
+    delete_files(Foo),
+    L3 = [3,1,2,5,4,6],
+    Fs2 = to_files([L3], Fmt, Config),
+    ok = file_sorter:sort(Fs2, Foo, Args),
+    true = rev(lists:sort(L3), Args) =:= from_files(Foo, Fmt),
+    delete_files([Foo | Fs2]),
+    L4 = [1,3,4,1,2,5,4,5,6],
+    Fs3 = to_files([L4], Fmt, Config),
+    ok = file_sorter:sort(Fs3, Foo, Args++[{unique,true},
+					   {size,100000}]),
+    true = rev(lists:usort(L4), Args) =:= from_files(Foo, Fmt),
+    delete_files(Foo),
+    ok = file_sorter:sort(Fs3, Foo, Args++[{unique,true}]),
+    true = rev(lists:usort(L4), Args) =:= from_files(Foo, Fmt),
+    delete_files([Foo | Fs3]),
 
     %% Input is a fun. Output is a file.
-    ?line ok = file_sorter:sort(input([], 2, Fmt), Foo, Args),
-    ?line [] = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line L5 = [3,1,2,5,4,7],
-    ?line ok = file_sorter:sort(input(L5, 2, Fmt), Foo, Args),
-    ?line true = rev(lists:sort(L5), Args) =:= from_files(Foo, Fmt),
-    ?line delete_files(Foo),
+    ok = file_sorter:sort(input([], 2, Fmt), Foo, Args),
+    [] = from_files(Foo, Fmt),
+    delete_files(Foo),
+    L5 = [3,1,2,5,4,7],
+    ok = file_sorter:sort(input(L5, 2, Fmt), Foo, Args),
+    true = rev(lists:sort(L5), Args) =:= from_files(Foo, Fmt),
+    delete_files(Foo),
 
     %% Removing duplicate keys.
     KFun = key_compare(2),
     L6 = [{5,e},{2,b},{3,c},{1,a},{4,d}] ++ [{2,c},{1,b},{4,a}],
     KUArgs = lists:keydelete(order, 1, Args) ++ 
-             [{unique, true}, {order, KFun},{size,100000}],
-    ?line ok = file_sorter:sort(input(L6, 2, Fmt), Foo, KUArgs),
-    ?line true = rev(lists:ukeysort(2, L6), KUArgs) =:= from_files(Foo, Fmt),
+	[{unique, true}, {order, KFun},{size,100000}],
+    ok = file_sorter:sort(input(L6, 2, Fmt), Foo, KUArgs),
+    true = rev(lists:ukeysort(2, L6), KUArgs) =:= from_files(Foo, Fmt),
     KArgs = lists:keydelete(unique, 1, KUArgs),
-    ?line ok = file_sorter:sort(input(L6, 2, Fmt), Foo, KArgs),
-    ?line true = rev(lists:keysort(2, L6), KArgs) =:= from_files(Foo, Fmt),
+    ok = file_sorter:sort(input(L6, 2, Fmt), Foo, KArgs),
+    true = rev(lists:keysort(2, L6), KArgs) =:= from_files(Foo, Fmt),
 
     %% Removing duplicate keys. Again.
     KUArgs2 = lists:keydelete(order, 1, Args) ++ 
-              [{unique, true}, {order, KFun},{size,5}],
-    ?line ok = file_sorter:sort(input(L6, 2, Fmt), Foo, KUArgs2),
-    ?line true = rev(lists:ukeysort(2, L6), KUArgs2) =:= from_files(Foo, Fmt),
+	[{unique, true}, {order, KFun},{size,5}],
+    ok = file_sorter:sort(input(L6, 2, Fmt), Foo, KUArgs2),
+    true = rev(lists:ukeysort(2, L6), KUArgs2) =:= from_files(Foo, Fmt),
     KArgs2 = lists:keydelete(unique, 1, KUArgs2),
-    ?line ok = file_sorter:sort(input(L6, 2, Fmt), Foo, KArgs2),
-    ?line true = rev(lists:keysort(2, L6), KArgs2) =:= from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    
+    ok = file_sorter:sort(input(L6, 2, Fmt), Foo, KArgs2),
+    true = rev(lists:keysort(2, L6), KArgs2) =:= from_files(Foo, Fmt),
+    delete_files(Foo),
+
     ok.
 
 keysort(Fmt, XArgs, Config) ->
@@ -781,58 +720,58 @@ keysort(Fmt, XArgs, Config) ->
     Foo = outfile("foo", Config),
 
     %% Input is files. Output is a file.
-    ?line ok = file_sorter:keysort(2, [], Foo, Args),
-    ?line [] = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line ok = file_sorter:keysort(2, [], Foo, [{unique,true} | Args]),
-    ?line [] = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line L0 = [{a,2},{a,1},{a,2},{a,2},{a,1},{a,2},{a,2},{a,3}],
-    ?line Fs0 = to_files([L0], Fmt, Config),
-    ?line S = rev(lists:ukeysort(1, L0), Args),
-    ?line ok = 
+    ok = file_sorter:keysort(2, [], Foo, Args),
+    [] = from_files(Foo, Fmt),
+    delete_files(Foo),
+    ok = file_sorter:keysort(2, [], Foo, [{unique,true} | Args]),
+    [] = from_files(Foo, Fmt),
+    delete_files(Foo),
+    L0 = [{a,2},{a,1},{a,2},{a,2},{a,1},{a,2},{a,2},{a,3}],
+    Fs0 = to_files([L0], Fmt, Config),
+    S = rev(lists:ukeysort(1, L0), Args),
+    ok =
 	file_sorter:keysort(1, Fs0, Foo, Args ++ [{unique,true},
 						  {size,100000}]),
-    ?line S = from_files(Foo, Fmt),
-    ?line ok = 
+    S = from_files(Foo, Fmt),
+    ok =
 	file_sorter:keysort(1, Fs0, Foo, Args ++ [{unique,true},
 						  {size,5}]),
-    ?line S = from_files(Foo, Fmt),
-    ?line ok = file_sorter:keysort(1, Fs0, Foo, Args ++ [{unique,true}]),
-    ?line S = from_files(Foo, Fmt),
-    ?line delete_files([Foo | Fs0]),
-    ?line L11 = [{a,1,x4},{b,2,x4},{c,3,x4}],
-    ?line L21 = [{a,1,x3},{b,2,x3},{c,3,x3}],
-    ?line L31 = [{a,1,x2},{b,2,x2},{c,3,x2}],
-    ?line L41 = [{a,1,x1},{b,2,x1},{c,3,x1}],
-    ?line All = [L11, L21, L31, L41],
-    ?line AllFlat = lists:append(All),
-    ?line Sorted = rev(lists:keysort(2, AllFlat), Args),
-    ?line Fs1 = to_files(All, Fmt, Config),
-    ?line ok = file_sorter:keysort(2, Fs1, Foo, Args),
-    ?line Sorted = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
+    S = from_files(Foo, Fmt),
+    ok = file_sorter:keysort(1, Fs0, Foo, Args ++ [{unique,true}]),
+    S = from_files(Foo, Fmt),
+    delete_files([Foo | Fs0]),
+    L11 = [{a,1,x4},{b,2,x4},{c,3,x4}],
+    L21 = [{a,1,x3},{b,2,x3},{c,3,x3}],
+    L31 = [{a,1,x2},{b,2,x2},{c,3,x2}],
+    L41 = [{a,1,x1},{b,2,x1},{c,3,x1}],
+    All = [L11, L21, L31, L41],
+    AllFlat = lists:append(All),
+    Sorted = rev(lists:keysort(2, AllFlat), Args),
+    Fs1 = to_files(All, Fmt, Config),
+    ok = file_sorter:keysort(2, Fs1, Foo, Args),
+    Sorted = from_files(Foo, Fmt),
+    delete_files(Foo),
 
     %% Input is files. Output is a fun.
-    ?line [] = file_sorter:keysort(2, [], output([], Fmt), Args),
-    ?line KS1 = file_sorter:keysort(2, Fs1, output([], Fmt), TmpArgs),
-    ?line Sorted = KS1,
-    ?line delete_files(Fs1),
+    [] = file_sorter:keysort(2, [], output([], Fmt), Args),
+    KS1 = file_sorter:keysort(2, Fs1, output([], Fmt), TmpArgs),
+    Sorted = KS1,
+    delete_files(Fs1),
 
     %% Input is a fun. Output is a file.
-    ?line ok = file_sorter:keysort(2, input([], 2, Fmt), Foo, Args),
-    ?line [] = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line ok = file_sorter:keysort(2, input(AllFlat, 4, Fmt), Foo, Args),
-    ?line Sorted = from_files(Foo,  Fmt),
-    ?line delete_files(Foo),
+    ok = file_sorter:keysort(2, input([], 2, Fmt), Foo, Args),
+    [] = from_files(Foo, Fmt),
+    delete_files(Foo),
+    ok = file_sorter:keysort(2, input(AllFlat, 4, Fmt), Foo, Args),
+    Sorted = from_files(Foo,  Fmt),
+    delete_files(Foo),
 
     %% Input is a fun. Output is a fun.
-    ?line [] = file_sorter:keysort(2, input([], 2, Fmt), output([], Fmt),Args),
-    ?line KS2 = 
+    [] = file_sorter:keysort(2, input([], 2, Fmt), output([], Fmt),Args),
+    KS2 =
 	file_sorter:keysort(2, input(AllFlat, 4, Fmt), output([], Fmt), 
 			    TmpArgs),
-    ?line Sorted = KS2,
+    Sorted = KS2,
     ok.
 
 merge(Fmt, XArgs, Config) ->
@@ -840,35 +779,35 @@ merge(Fmt, XArgs, Config) ->
     Foo = outfile("foo", Config),
 
     %% Input is a file. Output is a fun.
-    ?line [] = file_sorter:merge([], output([], Fmt), Args),
-    ?line L2 = [[1,3,5],[2,4,5]],
-    ?line Fs1 = to_files(L2, Fmt, Config),
-    ?line S2 = file_sorter:sort(Fs1, output([], Fmt), Args),
-    ?line S2 = rev(lists:sort(lists:append(L2)), Args),
-    ?line delete_files(Fs1),
+    [] = file_sorter:merge([], output([], Fmt), Args),
+    L2 = [[1,3,5],[2,4,5]],
+    Fs1 = to_files(L2, Fmt, Config),
+    S2 = file_sorter:sort(Fs1, output([], Fmt), Args),
+    S2 = rev(lists:sort(lists:append(L2)), Args),
+    delete_files(Fs1),
 
     %% Input is a file. Output is a file
-    ?line ok = file_sorter:merge([], Foo, Args),
-    ?line [] = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line ok = file_sorter:merge([], Foo, [{unique,true} | Args]),
-    ?line [] = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line L31 = [1,2,3],
-    ?line L32 = [2,3,4],
-    ?line L33 = [4,5,6],
-    ?line L3r = [L31, L32, L33],
-    ?line L3 = [rev(L31,Args), rev(L32,Args), rev(L33,Args)],
-    ?line Fs2 = to_files(L3, Fmt, Config),
-    ?line ok = file_sorter:merge(Fs2, Foo, Args),
-    ?line true = rev(lists:merge(L3r), Args) =:= from_files(Foo, Fmt),
-    ?line ok = file_sorter:merge(Fs2, Foo, Args++[{unique,true}, 
-						  {size,100000}]),
-    ?line true = rev(lists:umerge(L3r), Args) =:= from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line ok = file_sorter:merge(Fs2, Foo, Args++[{unique,true}]),
-    ?line true = rev(lists:umerge(L3r), Args) =:= from_files(Foo, Fmt),
-    ?line delete_files([Foo | Fs2]),
+    ok = file_sorter:merge([], Foo, Args),
+    [] = from_files(Foo, Fmt),
+    delete_files(Foo),
+    ok = file_sorter:merge([], Foo, [{unique,true} | Args]),
+    [] = from_files(Foo, Fmt),
+    delete_files(Foo),
+    L31 = [1,2,3],
+    L32 = [2,3,4],
+    L33 = [4,5,6],
+    L3r = [L31, L32, L33],
+    L3 = [rev(L31,Args), rev(L32,Args), rev(L33,Args)],
+    Fs2 = to_files(L3, Fmt, Config),
+    ok = file_sorter:merge(Fs2, Foo, Args),
+    true = rev(lists:merge(L3r), Args) =:= from_files(Foo, Fmt),
+    ok = file_sorter:merge(Fs2, Foo, Args++[{unique,true},
+					    {size,100000}]),
+    true = rev(lists:umerge(L3r), Args) =:= from_files(Foo, Fmt),
+    delete_files(Foo),
+    ok = file_sorter:merge(Fs2, Foo, Args++[{unique,true}]),
+    true = rev(lists:umerge(L3r), Args) =:= from_files(Foo, Fmt),
+    delete_files([Foo | Fs2]),
 
     ok.
 
@@ -877,83 +816,83 @@ keymerge(Fmt, XArgs, Config) ->
     Foo = outfile("foo", Config),
 
     %% Input is files. Output is a file.
-    ?line ok = file_sorter:keymerge(2, [], Foo, Args),
-    ?line [] = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line ok = file_sorter:keymerge(2, [], Foo, [{unique,true} | Args]),
-    ?line [] = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-    ?line L0 = [rev([{a,1},{a,2}], Args), rev([{a,2},{a,1},{a,3}], Args)],
-    ?line Fs0 = to_files(L0, Fmt, Config),
-    ?line delete_files(Foo),
-    ?line ok = file_sorter:keymerge(1, Fs0, Foo, Args ++ [{unique,false}]),
-    ?line S2 = rev([{a,1},{a,2},{a,2},{a,1},{a,3}], Args),
-    ?line S2 = from_files(Foo, Fmt),
-    ?line delete_files([Foo | Fs0]),
-    ?line L11 = [{a,1,x4},{b,2,x4},{c,3,x4}],
-    ?line L21 = [{a,1,x3},{b,2,x3},{c,3,x3}],
-    ?line L31 = [{a,1,x2},{b,2,x2},{c,3,x2}],
-    ?line L41 = [{a,1,x1},{b,2,x1},{c,3,x1}],
-    ?line All = 
+    ok = file_sorter:keymerge(2, [], Foo, Args),
+    [] = from_files(Foo, Fmt),
+    delete_files(Foo),
+    ok = file_sorter:keymerge(2, [], Foo, [{unique,true} | Args]),
+    [] = from_files(Foo, Fmt),
+    delete_files(Foo),
+    L0 = [rev([{a,1},{a,2}], Args), rev([{a,2},{a,1},{a,3}], Args)],
+    Fs0 = to_files(L0, Fmt, Config),
+    delete_files(Foo),
+    ok = file_sorter:keymerge(1, Fs0, Foo, Args ++ [{unique,false}]),
+    S2 = rev([{a,1},{a,2},{a,2},{a,1},{a,3}], Args),
+    S2 = from_files(Foo, Fmt),
+    delete_files([Foo | Fs0]),
+    L11 = [{a,1,x4},{b,2,x4},{c,3,x4}],
+    L21 = [{a,1,x3},{b,2,x3},{c,3,x3}],
+    L31 = [{a,1,x2},{b,2,x2},{c,3,x2}],
+    L41 = [{a,1,x1},{b,2,x1},{c,3,x1}],
+    All =
 	[rev(L11, Args), rev(L21, Args), rev(L31, Args), rev(L41, Args)],
-    ?line Merged1 = lists:keymerge(2, L11, L21),
-    ?line Merged2 = lists:keymerge(2, L31, L41),
-    ?line Merged = rev(lists:keymerge(2, Merged1, Merged2), Args),
-    ?line Fs1 = to_files(All, Fmt, Config),
-    ?line ok = file_sorter:keymerge(2, Fs1, Foo, Args),
-    ?line Merged = from_files(Foo, Fmt),
+    Merged1 = lists:keymerge(2, L11, L21),
+    Merged2 = lists:keymerge(2, L31, L41),
+    Merged = rev(lists:keymerge(2, Merged1, Merged2), Args),
+    Fs1 = to_files(All, Fmt, Config),
+    ok = file_sorter:keymerge(2, Fs1, Foo, Args),
+    Merged = from_files(Foo, Fmt),
 
     fun() -> 
-    UArgs = [{unique,true} | Args],
-    ?line UMerged1 = lists:ukeymerge(2, L11, L21),
-    ?line UMerged2 = lists:ukeymerge(2, L31, L41),
-    ?line UMerged = rev(lists:ukeymerge(2, UMerged1, UMerged2), Args),
-    ?line ok = file_sorter:keymerge(2, Fs1, Foo, UArgs),
-    ?line UMerged = from_files(Foo, Fmt),
-    UArgs2 = make_args(Fmt, [{unique,true}, {size,50} | XArgs]),
-    ?line ok = file_sorter:keymerge(2, Fs1, Foo, UArgs2),
-    ?line UMerged = from_files(Foo, Fmt),
-    ?line List = rev([{a,1,x4},{b,2,x4},{c,3,x4}], Args),
-    ?line FsL = to_files([List], Fmt, Config),
-    ?line ok = file_sorter:keymerge(2, FsL, Foo, UArgs),
-    ?line List = from_files(Foo, Fmt),
-    ?line List1 = [{a,1,x4},{b,2,x4},{c,3,x4}],
-    ?line List2 = [{a,3,x4},{b,4,x4},{c,5,x4}],
-    ?line FsLL = to_files([rev(List1, Args), rev(List2, Args)], Fmt, Config),
-    ?line ok = file_sorter:keymerge(2, FsLL, Foo, UArgs),
-    ?line List1_2 = rev(lists:ukeymerge(2, List1, List2), Args),
-    ?line List1_2 = from_files(Foo, Fmt),
-    ?line delete_files(Foo)
+	    UArgs = [{unique,true} | Args],
+	    UMerged1 = lists:ukeymerge(2, L11, L21),
+	    UMerged2 = lists:ukeymerge(2, L31, L41),
+	    UMerged = rev(lists:ukeymerge(2, UMerged1, UMerged2), Args),
+	    ok = file_sorter:keymerge(2, Fs1, Foo, UArgs),
+	    UMerged = from_files(Foo, Fmt),
+	    UArgs2 = make_args(Fmt, [{unique,true}, {size,50} | XArgs]),
+	    ok = file_sorter:keymerge(2, Fs1, Foo, UArgs2),
+	    UMerged = from_files(Foo, Fmt),
+	    List = rev([{a,1,x4},{b,2,x4},{c,3,x4}], Args),
+	    FsL = to_files([List], Fmt, Config),
+	    ok = file_sorter:keymerge(2, FsL, Foo, UArgs),
+	    List = from_files(Foo, Fmt),
+	    List1 = [{a,1,x4},{b,2,x4},{c,3,x4}],
+	    List2 = [{a,3,x4},{b,4,x4},{c,5,x4}],
+	    FsLL = to_files([rev(List1, Args), rev(List2, Args)], Fmt, Config),
+	    ok = file_sorter:keymerge(2, FsLL, Foo, UArgs),
+	    List1_2 = rev(lists:ukeymerge(2, List1, List2), Args),
+	    List1_2 = from_files(Foo, Fmt),
+	    delete_files(Foo)
     end(),
 
     %% Input is files. Output is a fun.
-    ?line Fs3 = to_files(All, Fmt, Config),
-    ?line [] = file_sorter:keysort(2, [], output([], Fmt), Args),
-    ?line KS1 = file_sorter:keymerge(2, Fs3, output([], Fmt), Args),
-    ?line Merged = KS1,
-    ?line delete_files([Foo | Fs3]),
-
-    ?line L2 = [[{a,1}],[{a,2}],[{a,3}],[{a,4}],[{a,5}],[{a,6}],[{a,7}]],
-    ?line Fs2 = to_files(L2, Fmt, Config),
-    ?line M = file_sorter:keymerge(1, Fs2, output([], Fmt), Args),
-    ?line M = rev(lists:append(L2), Args),
-    ?line delete_files(Fs2),
-
-    ?line LL1 = [{d,4},{e,5},{f,6}],
-    ?line LL2 = [{a,1},{b,2},{c,3}],
-    ?line LL3 = [{j,10},{k,11},{l,12}],
-    ?line LL4 = [{g,7},{h,8},{i,9}],
-    ?line LL5 = [{p,16},{q,17},{r,18}],
-    ?line LL6 = [{m,13},{n,14},{o,15}],
-    ?line LLAll = [rev(LL1, Args),rev(LL2, Args),rev(LL3, Args),
-                   rev(LL4, Args),rev(LL5, Args),rev(LL6, Args)],
-    ?line FsLL6 = to_files(LLAll, Fmt, Config),
-    ?line LL = rev(lists:sort(lists:append(LLAll)), Args),
-    ?line ok = file_sorter:keymerge(1, FsLL6, Foo, Args),
-    ?line LL = from_files(Foo, Fmt),
-    ?line ok = file_sorter:keymerge(1, FsLL6, Foo, [{unique,true} | Args]),
-    ?line LL = from_files(Foo, Fmt),
-    ?line delete_files([Foo | FsLL6]),
+    Fs3 = to_files(All, Fmt, Config),
+    [] = file_sorter:keysort(2, [], output([], Fmt), Args),
+    KS1 = file_sorter:keymerge(2, Fs3, output([], Fmt), Args),
+    Merged = KS1,
+    delete_files([Foo | Fs3]),
+
+    L2 = [[{a,1}],[{a,2}],[{a,3}],[{a,4}],[{a,5}],[{a,6}],[{a,7}]],
+    Fs2 = to_files(L2, Fmt, Config),
+    M = file_sorter:keymerge(1, Fs2, output([], Fmt), Args),
+    M = rev(lists:append(L2), Args),
+    delete_files(Fs2),
+
+    LL1 = [{d,4},{e,5},{f,6}],
+    LL2 = [{a,1},{b,2},{c,3}],
+    LL3 = [{j,10},{k,11},{l,12}],
+    LL4 = [{g,7},{h,8},{i,9}],
+    LL5 = [{p,16},{q,17},{r,18}],
+    LL6 = [{m,13},{n,14},{o,15}],
+    LLAll = [rev(LL1, Args),rev(LL2, Args),rev(LL3, Args),
+	     rev(LL4, Args),rev(LL5, Args),rev(LL6, Args)],
+    FsLL6 = to_files(LLAll, Fmt, Config),
+    LL = rev(lists:sort(lists:append(LLAll)), Args),
+    ok = file_sorter:keymerge(1, FsLL6, Foo, Args),
+    LL = from_files(Foo, Fmt),
+    ok = file_sorter:keymerge(1, FsLL6, Foo, [{unique,true} | Args]),
+    LL = from_files(Foo, Fmt),
+    delete_files([Foo | FsLL6]),
 
     ok.
 
@@ -963,84 +902,84 @@ funmerge(Fmt, XArgs, Config) ->
     UArgs = [{unique,true} | Args],
     Foo = outfile(foo, Config),
 
-    ?line EFs = to_files([[]], Fmt, Config),
-    ?line ok = file_sorter:merge(EFs, Foo, UArgs),
-    ?line [] = from_files(Foo, Fmt),
+    EFs = to_files([[]], Fmt, Config),
+    ok = file_sorter:merge(EFs, Foo, UArgs),
+    [] = from_files(Foo, Fmt),
     delete_files([Foo | EFs]),
 
-    ?line L11 = [{a,1,x4},{b,2,x4},{c,3,x4}],
-    ?line L21 = [{a,1,x3},{b,2,x3},{c,3,x3}],
-    ?line L31 = [{a,1,x2},{b,2,x2},{c,3,x2}],
-    ?line L41 = [{a,1,x1},{b,2,x1},{c,3,x1}],
-    ?line CAll = [L11, L21, L31, L41],
-    ?line CMerged1 = lists:merge(KComp, L11, L21),
-    ?line CMerged2 = lists:merge(KComp, L31, L41),
-    ?line CMerged = lists:merge(KComp, CMerged1, CMerged2),
-    ?line CFs1 = to_files(CAll, Fmt, Config),
-    ?line ok = file_sorter:merge(CFs1, Foo, Args),
-    ?line CMerged = from_files(Foo, Fmt),
+    L11 = [{a,1,x4},{b,2,x4},{c,3,x4}],
+    L21 = [{a,1,x3},{b,2,x3},{c,3,x3}],
+    L31 = [{a,1,x2},{b,2,x2},{c,3,x2}],
+    L41 = [{a,1,x1},{b,2,x1},{c,3,x1}],
+    CAll = [L11, L21, L31, L41],
+    CMerged1 = lists:merge(KComp, L11, L21),
+    CMerged2 = lists:merge(KComp, L31, L41),
+    CMerged = lists:merge(KComp, CMerged1, CMerged2),
+    CFs1 = to_files(CAll, Fmt, Config),
+    ok = file_sorter:merge(CFs1, Foo, Args),
+    CMerged = from_files(Foo, Fmt),
 
     Args4 = make_args(Fmt, [{size,50} | XArgs]),
-    ?line ok = file_sorter:merge(CFs1, Foo, [{order,KComp} | Args4]),
-    ?line CMerged = from_files(Foo, Fmt),
-
-    ?line UMerged1 = lists:umerge(KComp, L11, L21),
-    ?line UMerged2 = lists:umerge(KComp, L31, L41),
-    ?line UMerged = lists:umerge(KComp, UMerged1, UMerged2),
-    ?line ok = file_sorter:merge(CFs1, Foo, [{order,KComp} | UArgs]),
-    ?line UMerged = from_files(Foo, Fmt),
+    ok = file_sorter:merge(CFs1, Foo, [{order,KComp} | Args4]),
+    CMerged = from_files(Foo, Fmt),
+
+    UMerged1 = lists:umerge(KComp, L11, L21),
+    UMerged2 = lists:umerge(KComp, L31, L41),
+    UMerged = lists:umerge(KComp, UMerged1, UMerged2),
+    ok = file_sorter:merge(CFs1, Foo, [{order,KComp} | UArgs]),
+    UMerged = from_files(Foo, Fmt),
     UArgs2 = 
         lists:keydelete(order, 1,
                         make_args(Fmt, [{unique,true}, {size,50} | XArgs])),
-    ?line ok = file_sorter:merge(CFs1, Foo, [{order,KComp} | UArgs2]),
-    ?line UMerged = from_files(Foo, Fmt),
-    ?line delete_files(Foo),
-
-    ?line List1 = [{a,1,x4},{b,2,x4},{c,3,x4}],
-    ?line List2 = [{a,3,x4},{b,4,x4},{c,5,x4}],
-    ?line List3 = [{a,5,x4},{b,6,x4},{c,7,x4}],
-    ?line FsLL = to_files([List1, List2, List3], Fmt, Config),
-    ?line ok = file_sorter:merge(FsLL, Foo, Args),
-    ?line List1_2 = lists:merge(KComp,lists:merge(KComp,List1,List2),List3),
-    ?line List1_2 = from_files(Foo, Fmt),
-    ?line ok = file_sorter:merge(FsLL, Foo, [{order,KComp} | UArgs]),
-    ?line UList1_2 = 
+    ok = file_sorter:merge(CFs1, Foo, [{order,KComp} | UArgs2]),
+    UMerged = from_files(Foo, Fmt),
+    delete_files(Foo),
+
+    List1 = [{a,1,x4},{b,2,x4},{c,3,x4}],
+    List2 = [{a,3,x4},{b,4,x4},{c,5,x4}],
+    List3 = [{a,5,x4},{b,6,x4},{c,7,x4}],
+    FsLL = to_files([List1, List2, List3], Fmt, Config),
+    ok = file_sorter:merge(FsLL, Foo, Args),
+    List1_2 = lists:merge(KComp,lists:merge(KComp,List1,List2),List3),
+    List1_2 = from_files(Foo, Fmt),
+    ok = file_sorter:merge(FsLL, Foo, [{order,KComp} | UArgs]),
+    UList1_2 =
         lists:umerge(KComp,lists:umerge(KComp, List1, List2),List3),
-    ?line UList1_2 = from_files(Foo, Fmt),
-    ?line delete_files([Foo | CFs1]),
+    UList1_2 = from_files(Foo, Fmt),
+    delete_files([Foo | CFs1]),
 
     fun() ->
-    ?line LL1 = [{d,4},{e,5},{f,6}],
-    ?line LL2 = [{a,1},{b,2},{c,3}],
-    ?line LL3 = [{j,10},{k,11},{l,12}],
-    ?line LL4 = [{g,7},{h,8},{i,9}],
-    ?line LL5 = [{p,16},{q,17},{r,18}],
-    ?line LL6 = [{m,13},{n,14},{o,15}],
-    ?line LLAll = [LL1,LL2,LL3,LL4,LL5,LL6],
-    ?line FsLL6 = to_files(LLAll, Fmt, Config),
-    ?line LL = lists:sort(lists:append(LLAll)),
-    ?line ok = file_sorter:merge(FsLL6, Foo, Args),
-    ?line LL = from_files(Foo, Fmt),
-    ?line ok = file_sorter:merge(FsLL6, Foo, UArgs),
-    ?line LL = from_files(Foo, Fmt),
-    ?line delete_files([Foo | FsLL6])
+	    LL1 = [{d,4},{e,5},{f,6}],
+	    LL2 = [{a,1},{b,2},{c,3}],
+	    LL3 = [{j,10},{k,11},{l,12}],
+	    LL4 = [{g,7},{h,8},{i,9}],
+	    LL5 = [{p,16},{q,17},{r,18}],
+	    LL6 = [{m,13},{n,14},{o,15}],
+	    LLAll = [LL1,LL2,LL3,LL4,LL5,LL6],
+	    FsLL6 = to_files(LLAll, Fmt, Config),
+	    LL = lists:sort(lists:append(LLAll)),
+	    ok = file_sorter:merge(FsLL6, Foo, Args),
+	    LL = from_files(Foo, Fmt),
+	    ok = file_sorter:merge(FsLL6, Foo, UArgs),
+	    LL = from_files(Foo, Fmt),
+	    delete_files([Foo | FsLL6])
     end(),
 
     fun() ->
-    ?line RLL1 = [{b,2},{h,8},{n,14}],
-    ?line RLL2 = [{a,1},{g,7},{m,13}],
-    ?line RLL3 = [{d,4},{j,10},{p,16}],
-    ?line RLL4 = [{c,3},{i,9},{o,15}],
-    ?line RLL5 = [{f,6},{l,12},{r,18}],
-    ?line RLL6 = [{e,5},{k,11},{q,17}],
-    ?line RLLAll = [RLL1,RLL2,RLL3,RLL4,RLL5,RLL6],
-    ?line RFsLL6 = to_files(RLLAll, Fmt, Config),
-    ?line RLL = lists:sort(lists:append(RLLAll)),
-    ?line ok = file_sorter:merge(RFsLL6, Foo, Args),
-    ?line RLL = from_files(Foo, Fmt),
-    ?line ok = file_sorter:merge(RFsLL6, Foo, UArgs),
-    ?line RLL = from_files(Foo, Fmt),
-    ?line delete_files([Foo | RFsLL6])
+	    RLL1 = [{b,2},{h,8},{n,14}],
+	    RLL2 = [{a,1},{g,7},{m,13}],
+	    RLL3 = [{d,4},{j,10},{p,16}],
+	    RLL4 = [{c,3},{i,9},{o,15}],
+	    RLL5 = [{f,6},{l,12},{r,18}],
+	    RLL6 = [{e,5},{k,11},{q,17}],
+	    RLLAll = [RLL1,RLL2,RLL3,RLL4,RLL5,RLL6],
+	    RFsLL6 = to_files(RLLAll, Fmt, Config),
+	    RLL = lists:sort(lists:append(RLLAll)),
+	    ok = file_sorter:merge(RFsLL6, Foo, Args),
+	    RLL = from_files(Foo, Fmt),
+	    ok = file_sorter:merge(RFsLL6, Foo, UArgs),
+	    RLL = from_files(Foo, Fmt),
+	    delete_files([Foo | RFsLL6])
     end(),
 
     ok.
@@ -1054,57 +993,57 @@ check(Fmt, Config) ->
     L1 = [3,1,2,5,4],
     [F1_0] = Fs1 = to_files([L1], Fmt, Config),
     F1 = filename:absname(F1_0),
-    ?line {ok, [{F1,2,1}]} = file_sorter:check(Fs1, Args),
-    ?line {ok, [{F1,2,1}]} = file_sorter:check(Fs1, [{order,Fun} | Args]),
-    ?line {ok, [{F1,2,1}]} = file_sorter:check(Fs1, [{unique,true} | Args]),
-    ?line {ok, [{F1,2,1}]} = 
+    {ok, [{F1,2,1}]} = file_sorter:check(Fs1, Args),
+    {ok, [{F1,2,1}]} = file_sorter:check(Fs1, [{order,Fun} | Args]),
+    {ok, [{F1,2,1}]} = file_sorter:check(Fs1, [{unique,true} | Args]),
+    {ok, [{F1,2,1}]} =
 	file_sorter:check(Fs1, [{order,Fun},{unique,true} | Args]),
-    ?line {ok, [{F1,3,2}]} = 
+    {ok, [{F1,3,2}]} =
 	file_sorter:check(Fs1, [{order,descending} | Args]),
-    ?line {ok, [{F1,3,2}]} = 
+    {ok, [{F1,3,2}]} =
 	file_sorter:check(Fs1, [{unique,true},{order,descending} | Args]),
-    ?line delete_files(Fs1),
-    
+    delete_files(Fs1),
+
     L2 = [[1,2,2,3,3,4,5,5],[5,5,4,3,3,2,2,1]],
     [F2_0,F3_0] = Fs2 = to_files(L2, Fmt, Config),
     F2 = filename:absname(F2_0),
     F3 = filename:absname(F3_0),
-    ?line {ok, [{F3,3,4}]} = file_sorter:check(Fs2, Args),
-    ?line {ok, [{F3,3,4}]} = file_sorter:check(Fs2, [{order,Fun} | Args]),
-    ?line {ok, [{F2,3,2},{F3,2,5}]} = 
+    {ok, [{F3,3,4}]} = file_sorter:check(Fs2, Args),
+    {ok, [{F3,3,4}]} = file_sorter:check(Fs2, [{order,Fun} | Args]),
+    {ok, [{F2,3,2},{F3,2,5}]} =
 	file_sorter:check(Fs2, [{unique, true} | Args]),
-    ?line {ok, [{F2,3,2},{F3,2,5}]} = 
+    {ok, [{F2,3,2},{F3,2,5}]} =
 	file_sorter:check(Fs2, [{order,Fun},{unique, true} | Args]),
-    ?line {ok, [{F2,2,2}]} = 
+    {ok, [{F2,2,2}]} =
 	file_sorter:check(Fs2, [{order,descending} | Args]),
-    ?line {ok, [{F2,2,2},{F3,2,5}]} = 
+    {ok, [{F2,2,2},{F3,2,5}]} =
 	file_sorter:check(Fs2, [{unique,true},{order,descending} | Args]),
-    ?line delete_files(Fs2),
-    
+    delete_files(Fs2),
+
     L3 = [1,2,3,4],
-    ?line Fs3 = to_files([L3], Fmt, Config),
-    ?line {ok, []} = file_sorter:check(Fs3, [{unique,true} | Args]),
-    ?line {ok, []} = 
+    Fs3 = to_files([L3], Fmt, Config),
+    {ok, []} = file_sorter:check(Fs3, [{unique,true} | Args]),
+    {ok, []} =
 	file_sorter:check(Fs3, [{unique,true},{order,Fun} | Args]),
-    ?line delete_files(Fs3),
+    delete_files(Fs3),
 
     %% big objects
-    ?line T1 = erlang:make_tuple(10000,foo),
-    ?line T2 = erlang:make_tuple(10000,bar),
-    ?line L4 = [T1,T2],
-    ?line [FF_0] = Fs4 = to_files([L4], Fmt, Config),
+    T1 = erlang:make_tuple(10000,foo),
+    T2 = erlang:make_tuple(10000,bar),
+    L4 = [T1,T2],
+    [FF_0] = Fs4 = to_files([L4], Fmt, Config),
     FF = filename:absname(FF_0),
-    ?line {ok, [{FF,2,T2}]} = file_sorter:check(Fs4, [{unique,true} | Args]),
-    ?line delete_files(Fs4),
+    {ok, [{FF,2,T2}]} = file_sorter:check(Fs4, [{unique,true} | Args]),
+    delete_files(Fs4),
 
     CFun = key_compare(2),
     L10 = [[{1,a},{2,b},T10_1={1,b},{3,c}], [{1,b},T10_2={2,a}]],
     [F10_0,F11_0] = Fs10 = to_files(L10, Fmt, Config),
     F10_1 = filename:absname(F10_0),
     F11_1 = filename:absname(F11_0),
-    ?line {ok, [{F10_1,3,T10_1},{F11_1,2,T10_2}]} = 
+    {ok, [{F10_1,3,T10_1},{F11_1,2,T10_2}]} =
         file_sorter:check(Fs10, [{unique,true},{order,CFun} | Args]),
-    ?line delete_files(Fs10),
+    delete_files(Fs10),
 
     ok.
 
@@ -1112,31 +1051,31 @@ keycheck(Fmt, Config) ->
     Args0 = make_args(Fmt, [{size,5}]),
     Args = Args0 ++ [{tmpdir,?privdir(Config)}],
 
-    ?line L1 = [[{a,1},{b,2}], [{c,2},{b,1},{a,3}]],
-    ?line [F1_0,F2_0] = Fs1 = to_files(L1, Fmt, Config),
+    L1 = [[{a,1},{b,2}], [{c,2},{b,1},{a,3}]],
+    [F1_0,F2_0] = Fs1 = to_files(L1, Fmt, Config),
     F1 = filename:absname(F1_0),
     F2 = filename:absname(F2_0),
-    ?line {ok, [{F2,2,{b,1}}]} = file_sorter:keycheck(1, Fs1, Args),
-    ?line {ok, [{F2,2,{b,1}}]} = 
+    {ok, [{F2,2,{b,1}}]} = file_sorter:keycheck(1, Fs1, Args),
+    {ok, [{F2,2,{b,1}}]} =
 	file_sorter:keycheck(1, Fs1, [{unique,true} | Args]),
-    ?line {ok, [{F1,2,{b,2}}]} = 
+    {ok, [{F1,2,{b,2}}]} =
 	file_sorter:keycheck(1, Fs1, [{order,descending},{unique,true} | Args]),
-    ?line delete_files(Fs1),
-    
+    delete_files(Fs1),
+
     L2 = [[{a,1},{a,2},{a,2},{b,2}], [{c,2},{b,1},{b,2},{b,2},{a,3}]],
-    ?line [F3_0,F4_0] = Fs2 = to_files(L2, Fmt, Config),
+    [F3_0,F4_0] = Fs2 = to_files(L2, Fmt, Config),
     F3 = filename:absname(F3_0),
     F4 = filename:absname(F4_0),
-    ?line {ok, [{F4,2,{b,1}}]} = file_sorter:keycheck(1, Fs2, Args),
-    ?line {ok, [{F3,2,{a,2}},{F4,2,{b,1}}]} = 
+    {ok, [{F4,2,{b,1}}]} = file_sorter:keycheck(1, Fs2, Args),
+    {ok, [{F3,2,{a,2}},{F4,2,{b,1}}]} =
 	file_sorter:keycheck(1, Fs2, [{unique,true} | Args]),
-    ?line {ok, [{F3,4,{b,2}}]} = 
+    {ok, [{F3,4,{b,2}}]} =
 	file_sorter:keycheck(1, Fs2, [{order,descending} | Args]),
-    ?line {ok, [{F3,2,{a,2}},{F4,3,{b,2}}]} = 
+    {ok, [{F3,2,{a,2}},{F4,3,{b,2}}]} =
 	file_sorter:keycheck(1, Fs2, 
 			     [{order,descending},{unique,true} | Args]),
-    ?line delete_files(Fs2),
-    
+    delete_files(Fs2),
+
     ok.
 
 rev(L, Args) ->
@@ -1330,9 +1269,9 @@ c(Fd, Bin0, Size0, NoBytes, HL, L) ->
 	eof when Size0 =:= 0 ->
 	    lists:reverse(L);
         eof ->
-	    test_server:fail({error, premature_eof});
+	    ct:fail({error, premature_eof});
 	Error ->
-	    test_server:fail(Error)
+	    ct:fail(Error)
     end.
 
 c1(Fd, B, BinSize, HL, L) -> 
@@ -1347,7 +1286,7 @@ c1(Fd, B, BinSize, HL, L) ->
 		    <<BinTerm:Size/binary, R/binary>> = Bin,	    
 		    E = case catch binary_to_term(BinTerm) of
                             {'EXIT', _} ->
-				test_server:fail({error, bad_object});
+				ct:fail({error, bad_object});
 			    Term ->
 				Term
 			end,
diff --git a/lib/stdlib/test/filelib_SUITE.erl b/lib/stdlib/test/filelib_SUITE.erl
index 01b798faef..16616a3207 100644
--- a/lib/stdlib/test/filelib_SUITE.erl
+++ b/lib/stdlib/test/filelib_SUITE.erl
@@ -29,19 +29,18 @@
 
 -import(lists, [foreach/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?t:minutes(5)),
-    [{watchdog,Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,5}}].
 
 all() -> 
     [wildcard_one, wildcard_two, wildcard_errors,
@@ -65,14 +64,14 @@ end_per_group(_GroupName, Config) ->
 
 
 wildcard_one(Config) when is_list(Config) ->
-    ?line {ok,OldCwd} = file:get_cwd(),
-    ?line Dir = filename:join(?config(priv_dir, Config), "wildcard_one"),
-    ?line ok = file:make_dir(Dir),
+    {ok,OldCwd} = file:get_cwd(),
+    Dir = filename:join(proplists:get_value(priv_dir, Config), "wildcard_one"),
+    ok = file:make_dir(Dir),
     do_wildcard_1(Dir,
 		  fun(Wc) ->
 			  filelib:wildcard(Wc, Dir, erl_prim_loader)
 		  end),
-    ?line file:set_cwd(Dir),
+    file:set_cwd(Dir),
     do_wildcard_1(Dir,
 		  fun(Wc) ->
 			  L = filelib:wildcard(Wc),
@@ -81,30 +80,30 @@ wildcard_one(Config) when is_list(Config) ->
 			  L = filelib:wildcard(Wc, Dir),
 			  L = filelib:wildcard(Wc, Dir++"/.")
 		  end),
-    ?line file:set_cwd(OldCwd),
-    ?line ok = file:del_dir(Dir),
+    file:set_cwd(OldCwd),
+    ok = file:del_dir(Dir),
     ok.
 
 wildcard_two(Config) when is_list(Config) ->
-    ?line Dir = filename:join(?config(priv_dir, Config), "wildcard_two"),
-    ?line ok = file:make_dir(Dir),
-    ?line do_wildcard_1(Dir, fun(Wc) -> io:format("~p~n",[{Wc,Dir, X = filelib:wildcard(Wc, Dir)}]),X  end),
-    ?line do_wildcard_1(Dir, fun(Wc) -> filelib:wildcard(Wc, Dir++"/") end),
-    ?line do_wildcard_1(Dir, fun(Wc) -> filelib:wildcard(Wc, Dir++"/.") end),
+    Dir = filename:join(proplists:get_value(priv_dir, Config), "wildcard_two"),
+    ok = file:make_dir(Dir),
+    do_wildcard_1(Dir, fun(Wc) -> io:format("~p~n",[{Wc,Dir, X = filelib:wildcard(Wc, Dir)}]),X  end),
+    do_wildcard_1(Dir, fun(Wc) -> filelib:wildcard(Wc, Dir++"/") end),
+    do_wildcard_1(Dir, fun(Wc) -> filelib:wildcard(Wc, Dir++"/.") end),
     case os:type() of
 	{win32,_} ->
 	    ok;
 	_ ->
-	    ?line do_wildcard_1(Dir, fun(Wc) -> filelib:wildcard(Wc, "//"++Dir) end)
+	    do_wildcard_1(Dir, fun(Wc) -> filelib:wildcard(Wc, "//"++Dir) end)
     end,
-    ?line ok = file:del_dir(Dir),
+    ok = file:del_dir(Dir),
     ok.
 
 wildcard_errors(Config) when is_list(Config) ->
-    ?line wcc("{", missing_delimiter),
-    ?line wcc("{a", missing_delimiter),
-    ?line wcc("{a,", missing_delimiter),
-    ?line wcc("{a,b", missing_delimiter),
+    wcc("{", missing_delimiter),
+    wcc("{a", missing_delimiter),
+    wcc("{a,", missing_delimiter),
+    wcc("{a,b", missing_delimiter),
     ok.
 
 wcc(Wc, Error) ->
@@ -131,70 +130,70 @@ subtract_dir("/"++Cs, []) -> Cs.
 do_wildcard_2(Dir, Wcf) ->
     %% Basic wildcards.
     All = ["abc","abcdef","glurf"],
-    ?line Files = mkfiles(lists:reverse(All), Dir),
-    ?line All = Wcf("*"),
-    ?line ["abc","abcdef"] = Wcf("a*"),
-    ?line ["abc","abcdef"] = Wcf("abc*"),
-    ?line ["abcdef"] = Wcf("abc???"),
-    ?line ["abcdef"] = Wcf("abcd*"),
-    ?line ["abcdef"] = Wcf("*def"),
-    ?line ["abcdef","glurf"] = Wcf("{*def,gl*}"),
-    ?line ["abc","abcdef"] = Wcf("a*{def,}"),
-    ?line ["abc","abcdef"] = Wcf("a*{,def}"),
+    Files = mkfiles(lists:reverse(All), Dir),
+    All = Wcf("*"),
+    ["abc","abcdef"] = Wcf("a*"),
+    ["abc","abcdef"] = Wcf("abc*"),
+    ["abcdef"] = Wcf("abc???"),
+    ["abcdef"] = Wcf("abcd*"),
+    ["abcdef"] = Wcf("*def"),
+    ["abcdef","glurf"] = Wcf("{*def,gl*}"),
+    ["abc","abcdef"] = Wcf("a*{def,}"),
+    ["abc","abcdef"] = Wcf("a*{,def}"),
 
     %% Constant wildcard.
     ["abcdef"] = Wcf("abcdef"),
 
     %% Negative tests.
-    ?line [] = Wcf("b*"),
-    ?line [] = Wcf("bufflig"),
+    [] = Wcf("b*"),
+    [] = Wcf("bufflig"),
 
-    ?line del(Files),
+    del(Files),
     do_wildcard_3(Dir, Wcf).
-    
+
 do_wildcard_3(Dir, Wcf) ->
     %% Some character sets.
     All = ["a01","a02","a03","b00","c02","d19"],
-    ?line Files = mkfiles(lists:reverse(All), Dir),
-    ?line All = Wcf("[a-z]*"),
-    ?line All = Wcf("[a-d]*"),
-    ?line All = Wcf("[adbc]*"),
-    ?line All = Wcf("?[0-9][0-9]"),
-    ?line All = Wcf("?[0-1][0-39]"),
-    ?line All = Wcf("[abcdefgh][10][01239]"),
-    ?line ["a01","a02","a03","b00","c02"] = Wcf("[a-z]0[0-3]"),
-    ?line [] = Wcf("?[a-z][0-39]"),
-    ?line del(Files),
+    Files = mkfiles(lists:reverse(All), Dir),
+    All = Wcf("[a-z]*"),
+    All = Wcf("[a-d]*"),
+    All = Wcf("[adbc]*"),
+    All = Wcf("?[0-9][0-9]"),
+    All = Wcf("?[0-1][0-39]"),
+    All = Wcf("[abcdefgh][10][01239]"),
+    ["a01","a02","a03","b00","c02"] = Wcf("[a-z]0[0-3]"),
+    [] = Wcf("?[a-z][0-39]"),
+    del(Files),
     do_wildcard_4(Dir, Wcf).
 
 do_wildcard_4(Dir, Wcf) ->
     %% More character sets: tricky characters.
     All = ["a-","aA","aB","aC","a[","a]"],
-    ?line Files = mkfiles(lists:reverse(All), Dir),
-    ?line All = Wcf("a[][A-C-]"),
+    Files = mkfiles(lists:reverse(All), Dir),
+    All = Wcf("a[][A-C-]"),
     ["a-"] = Wcf("a[-]"),
     ["a["] = Wcf("a["),
-    ?line del(Files),
+    del(Files),
     do_wildcard_5(Dir, Wcf).
 
 do_wildcard_5(Dir, Wcf) ->
     Dirs = ["xa","blurf","yyy"],
-    ?line foreach(fun(D) -> ok = file:make_dir(filename:join(Dir, D)) end, Dirs),
+    foreach(fun(D) -> ok = file:make_dir(filename:join(Dir, D)) end, Dirs),
     All = ["blurf/nisse","xa/arne","xa/kalle","yyy/arne"],
-    ?line Files = mkfiles(lists:reverse(All), Dir),
+    Files = mkfiles(lists:reverse(All), Dir),
 
     %% Test.
-    ?line All = Wcf("*/*"),
-    ?line ["blurf/nisse","xa/arne","xa/kalle"] = Wcf("{blurf,xa}/*"),
-    ?line ["xa/arne","yyy/arne"] = Wcf("*/arne"),
-    ?line ["blurf/nisse"] = Wcf("*/nisse"),
-    ?line [] = Wcf("mountain/*"),
-    ?line [] = Wcf("xa/gurka"),
+    All = Wcf("*/*"),
+    ["blurf/nisse","xa/arne","xa/kalle"] = Wcf("{blurf,xa}/*"),
+    ["xa/arne","yyy/arne"] = Wcf("*/arne"),
+    ["blurf/nisse"] = Wcf("*/nisse"),
+    [] = Wcf("mountain/*"),
+    [] = Wcf("xa/gurka"),
     ["blurf/nisse"] = Wcf("blurf/nisse"),
 
     %% Cleanup
-    ?line del(Files),
-    ?line foreach(fun(D) -> ok = file:del_dir(filename:join(Dir, D)) end, Dirs),
+    del(Files),
+    foreach(fun(D) -> ok = file:del_dir(filename:join(Dir, D)) end, Dirs),
     do_wildcard_6(Dir, Wcf).
 
 do_wildcard_6(Dir, Wcf) ->
@@ -271,45 +270,45 @@ do_wildcard_9(Dir, Wcf) ->
 
 
 fold_files(Config) when is_list(Config) ->
-    ?line Dir = filename:join(?config(priv_dir, Config), "fold_files"),
-    ?line ok = file:make_dir(Dir),
-    ?line Dirs = [filename:join(Dir, D) || D <- ["blurf","blurf/blarf"]],
-    ?line foreach(fun(D) -> ok = file:make_dir(D) end, Dirs),
+    Dir = filename:join(proplists:get_value(priv_dir, Config), "fold_files"),
+    ok = file:make_dir(Dir),
+    Dirs = [filename:join(Dir, D) || D <- ["blurf","blurf/blarf"]],
+    foreach(fun(D) -> ok = file:make_dir(D) end, Dirs),
     All = ["fb.txt","ko.txt",
 	   "blurf/nisse.text","blurf/blarf/aaa.txt","blurf/blarf/urfa.txt"],
-    ?line Files = mkfiles(lists:reverse(All), Dir),
+    Files = mkfiles(lists:reverse(All), Dir),
 
     %% Test.
-    ?line Files0 = filelib:fold_files(Dir, "^", false,
-				      fun(H, T) -> [H|T] end, []),
-    ?line same_lists(["fb.txt","ko.txt"], Files0, Dir),
+    Files0 = filelib:fold_files(Dir, "^", false,
+				fun(H, T) -> [H|T] end, []),
+    same_lists(["fb.txt","ko.txt"], Files0, Dir),
 
-    ?line Files1 = filelib:fold_files(Dir, "^", true,
-				      fun(H, T) -> [H|T] end, []),
-    ?line same_lists(All, Files1, Dir),
+    Files1 = filelib:fold_files(Dir, "^", true,
+				fun(H, T) -> [H|T] end, []),
+    same_lists(All, Files1, Dir),
 
-    ?line Files2 = filelib:fold_files(Dir, "[.]text$", true,
-				      fun(H, T) -> [H|T] end, []),
-    ?line same_lists(["blurf/nisse.text"], Files2, Dir),
+    Files2 = filelib:fold_files(Dir, "[.]text$", true,
+				fun(H, T) -> [H|T] end, []),
+    same_lists(["blurf/nisse.text"], Files2, Dir),
 
 
-    ?line Files3 = filelib:fold_files(Dir, "^..[.]", true,
-				      fun(H, T) -> [H|T] end, []),
-    ?line same_lists(["fb.txt","ko.txt"], Files3, Dir),
+    Files3 = filelib:fold_files(Dir, "^..[.]", true,
+				fun(H, T) -> [H|T] end, []),
+    same_lists(["fb.txt","ko.txt"], Files3, Dir),
 
-    ?line Files4 = filelib:fold_files(Dir, "^ko[.]txt$", true,
-				  fun(H, T) -> [H|T] end, []),
-    ?line same_lists(["ko.txt"], Files4, Dir),
-    ?line Files4 = filelib:fold_files(Dir, "^ko[.]txt$", false,
-				      fun(H, T) -> [H|T] end, []),
+    Files4 = filelib:fold_files(Dir, "^ko[.]txt$", true,
+				fun(H, T) -> [H|T] end, []),
+    same_lists(["ko.txt"], Files4, Dir),
+    Files4 = filelib:fold_files(Dir, "^ko[.]txt$", false,
+				fun(H, T) -> [H|T] end, []),
 
-    ?line [] = filelib:fold_files(Dir, "^$", true,
-				  fun(H, T) -> [H|T] end, []),
+    [] = filelib:fold_files(Dir, "^$", true,
+			    fun(H, T) -> [H|T] end, []),
 
     %% Cleanup
-    ?line del(Files),
-    ?line foreach(fun(D) -> ok = file:del_dir(D) end, lists:reverse(Dirs)),
-    ?line ok = file:del_dir(Dir).
+    del(Files),
+    foreach(fun(D) -> ok = file:del_dir(D) end, lists:reverse(Dirs)),
+    ok = file:del_dir(Dir).
 
 same_lists(Expected0, Actual0, BaseDir) ->
     Expected = [filename:absname(N, BaseDir) || N <- lists:sort(Expected0)],
@@ -318,7 +317,7 @@ same_lists(Expected0, Actual0, BaseDir) ->
 
 mkfiles([H|T], Dir) ->
     Name = filename:join(Dir, H),
-    Garbage = [31+random:uniform(95) || _ <- lists:seq(1, random:uniform(1024))],
+    Garbage = [31+rand:uniform(95) || _ <- lists:seq(1, rand:uniform(1024))],
     file:write_file(Name, Garbage),
     [Name|mkfiles(T, Dir)];
 mkfiles([], _) -> [].
@@ -328,52 +327,49 @@ del([H|T]) ->
     del(T);
 del([]) -> ok.
 
-otp_5960(suite) ->
-    [];
-otp_5960(doc) ->
-    ["Test that filelib:ensure_dir/1 returns ok or {error,Reason}"];
+%% Test that filelib:ensure_dir/1 returns ok or {error,Reason}.
 otp_5960(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Dir = filename:join(PrivDir, "otp_5960_dir"),
-    ?line Name1 = filename:join(Dir, name1),
-    ?line Name2 = filename:join(Dir, name2),
-    ?line ok = filelib:ensure_dir(Name1), % parent is created
-    ?line ok = filelib:ensure_dir(Name1), % repeating it should be OK
-    ?line ok = filelib:ensure_dir(Name2), % parent already exists
-    ?line ok = filelib:ensure_dir(Name2), % repeating it should be OK
-    ?line Name3 = filename:join(Name1, name3),
-    ?line {ok, FileInfo} = file:read_file_info(Dir),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Dir = filename:join(PrivDir, "otp_5960_dir"),
+    Name1 = filename:join(Dir, name1),
+    Name2 = filename:join(Dir, name2),
+    ok = filelib:ensure_dir(Name1), % parent is created
+    ok = filelib:ensure_dir(Name1), % repeating it should be OK
+    ok = filelib:ensure_dir(Name2), % parent already exists
+    ok = filelib:ensure_dir(Name2), % repeating it should be OK
+    Name3 = filename:join(Name1, name3),
+    {ok, FileInfo} = file:read_file_info(Dir),
     case os:type() of
 	{win32,_} ->
 	    %% Not possibly to write protect directories on Windows
 	    %% (at least not using file:write_file_info/2).
 	    ok;
 	_ ->
-	    ?line Mode = FileInfo#file_info.mode,
-	    ?line NoWriteMode = Mode - 8#00200 - 8#00020 - 8#00002,
-	    ?line ok = file:write_file_info(Dir, #file_info{mode=NoWriteMode}), 
-	    ?line {error, _} = filelib:ensure_dir(Name3),
-	    ?line ok = file:write_file_info(Dir, #file_info{mode=Mode}),
+	    Mode = FileInfo#file_info.mode,
+	    NoWriteMode = Mode - 8#00200 - 8#00020 - 8#00002,
+	    ok = file:write_file_info(Dir, #file_info{mode=NoWriteMode}),
+	    {error, _} = filelib:ensure_dir(Name3),
+	    ok = file:write_file_info(Dir, #file_info{mode=Mode}),
 	    ok
     end.
 
 ensure_dir_eexist(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Dir = filename:join(PrivDir, "ensure_dir_eexist"),
-    ?line Name = filename:join(Dir, "same_name_as_file_and_dir"),
-    ?line ok = filelib:ensure_dir(Name),
-    ?line ok = file:write_file(Name, <<"some string\n">>),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Dir = filename:join(PrivDir, "ensure_dir_eexist"),
+    Name = filename:join(Dir, "same_name_as_file_and_dir"),
+    ok = filelib:ensure_dir(Name),
+    ok = file:write_file(Name, <<"some string\n">>),
 
     %% There already is a file with the name of the directory
     %% we want to create.
-    ?line NeedFile = filename:join(Name, "file"),
-    ?line NeedFileB = filename:join(Name, <<"file">>),
-    ?line {error, eexist} = filelib:ensure_dir(NeedFile),
-    ?line {error, eexist} = filelib:ensure_dir(NeedFileB),
+    NeedFile = filename:join(Name, "file"),
+    NeedFileB = filename:join(Name, <<"file">>),
+    {error, eexist} = filelib:ensure_dir(NeedFile),
+    {error, eexist} = filelib:ensure_dir(NeedFileB),
     ok.
 
 ensure_dir_symlink(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Dir = filename:join(PrivDir, "ensure_dir_symlink"),
     Name = filename:join(Dir, "same_name_as_file_and_dir"),
     ok = filelib:ensure_dir(Name),
@@ -392,7 +388,7 @@ ensure_dir_symlink(Config) when is_list(Config) ->
     end.
 
 wildcard_symlink(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Dir = filename:join(PrivDir, ?MODULE_STRING++"_wildcard_symlink"),
     SubDir = filename:join(Dir, "sub"),
     AFile = filename:join(SubDir, "a_file"),
@@ -452,7 +448,7 @@ basenames(Dir, Files) ->
      end || F <- Files].
 
 is_file_symlink(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Dir = filename:join(PrivDir, ?MODULE_STRING++"_is_file_symlink"),
     SubDir = filename:join(Dir, "sub"),
     AFile = filename:join(SubDir, "a_file"),
@@ -485,7 +481,7 @@ is_file_symlink(Config) ->
     end.
 
 file_props_symlink(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Dir = filename:join(PrivDir, ?MODULE_STRING++"_file_props_symlink"),
     AFile = filename:join(Dir, "a_file"),
     Alias = filename:join(Dir, "symlink"),
diff --git a/lib/stdlib/test/filename_SUITE.erl b/lib/stdlib/test/filename_SUITE.erl
index fd47da8150..3d6734b790 100644
--- a/lib/stdlib/test/filename_SUITE.erl
+++ b/lib/stdlib/test/filename_SUITE.erl
@@ -28,21 +28,31 @@
 	 basename_bin_1/1, basename_bin_2/1,
 	 dirname_bin/1, extension_bin/1, join_bin/1, t_nativename_bin/1]).
 -export([pathtype_bin/1,rootname_bin/1,split_bin/1]).
+-export([t_basedir_api/1, t_basedir_xdg/1, t_basedir_windows/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
-    [absname, absname_2, basename_1, basename_2, dirname,
-     extension,
-     join, pathtype, rootname, split, t_nativename, find_src,
-     absname_bin, absname_bin_2, basename_bin_1, basename_bin_2, dirname_bin,
-     extension_bin,
-     join_bin, pathtype_bin, rootname_bin, split_bin, t_nativename_bin].
+    [absname, absname_2,
+     find_src,
+     absname_bin, absname_bin_2,
+     {group,p},
+     t_basedir_xdg, t_basedir_windows].
 
 groups() -> 
-    [].
+    [{p, [parallel],
+      [dirname,
+       extension, extension_bin,
+       join, pathtype, rootname, split, t_nativename,
+       basename_1, basename_2,
+       basename_bin_1, basename_bin_2, dirname_bin,
+       join_bin, pathtype_bin, rootname_bin, split_bin,
+       t_nativename_bin,
+       t_basedir_api]}].
 
 init_per_suite(Config) ->
     Config.
@@ -61,67 +71,59 @@ end_per_group(_GroupName, Config) ->
 
 absname(Config) when is_list(Config) ->
     case os:type() of
-	{win32, _} -> 
-	    ?line [Drive|_] = ?config(priv_dir, Config),
-	    ?line Temp = filename:join([Drive|":/"], "temp"),
-	    ?line case file:make_dir(Temp) of
-		      ok -> ok;
-		      {error,eexist} -> ok
-		  end,
-	    ?line {ok,Cwd} = file:get_cwd(),
-	    ?line ok = file:set_cwd(Temp),
-	    ?line [Drive|":/temp/foo"] = filename:absname(foo),
-	    ?line [Drive|":/temp/foo"] = filename:absname("foo"),
-	    ?line [Drive|":/temp/../ebin"] = filename:absname("../ebin"),
-	    ?line [Drive|":/erlang"] = filename:absname("/erlang"),
-	    ?line [Drive|":/erlang/src"] = filename:absname("/erlang/src"),
-	    ?line [Drive|":/erlang/src"] = filename:absname("\\erlang\\src"),
-	    ?line [Drive|":/temp/erlang"] = filename:absname([Drive|":erlang"]),
-	    ?line [Drive|":/temp/erlang/src"] =
-		filename:absname([Drive|":erlang/src"]),
-	    ?line [Drive|":/temp/erlang/src"] =
-		filename:absname([Drive|":erlang\\src\\"]),
-	    ?line "a:/erlang" = filename:absname("a:erlang"),
-	    
-	    ?line file:set_cwd([Drive|":/"]),
-	    ?line [Drive|":/foo"] = filename:absname(foo),
-	    ?line [Drive|":/foo"] = filename:absname("foo"),
-	    ?line [Drive|":/../ebin"] = filename:absname("../ebin"),
-	    ?line [Drive|":/erlang"] = filename:absname("/erlang"),
-	    ?line [Drive|":/erlang/src"] = filename:absname("/erlang/src"),
-	    ?line [Drive|":/erlang/src"] = filename:absname(["/erlang",'/src']),
-	    ?line [Drive|":/erlang/src"] = filename:absname("\\erlang\\\\src"),
-	    ?line [Drive|":/erlang"] = filename:absname([Drive|":erlang"]),
-	    ?line [Drive|":/erlang/src"] = filename:absname([Drive|":erlang/src"]),
-	    ?line "a:/erlang" = filename:absname("a:erlang"),
-	    
-	    ?line file:set_cwd(Cwd),
-	    ok;
-	Type ->
-	    case Type of
-		{unix, _} ->
-		    ?line ok = file:set_cwd("/usr"),
-		    ?line "/usr/foo" = filename:absname(foo),
-		    ?line "/usr/foo" = filename:absname("foo"),
-		    ?line "/usr/../ebin" = filename:absname("../ebin");
-		{ose, _} ->
-		    ?line ok = file:set_cwd("/romfs"),
-		    ?line "/romfs/foo" = filename:absname(foo),
-		    ?line "/romfs/foo" = filename:absname("foo"),
-		    ?line "/romfs/../ebin" = filename:absname("../ebin")
-	    end,
-	    
-	    ?line file:set_cwd("/"),
-	    ?line "/foo" = filename:absname(foo),
-	    ?line "/foo" = filename:absname("foo"),
-	    ?line "/../ebin" = filename:absname("../ebin"),
-	    ?line "/erlang" = filename:absname("/erlang"),
-	    ?line "/erlang/src" = filename:absname("/erlang/src"),
-	    ?line "/erlang/src" = filename:absname(["/erl",'ang/s',"rc"]),
-	    ?line "/erlang/src" = filename:absname(["/erl",'a','ng',"/",'s',"rc"]),
-	    ?line "/erlang/src" = filename:absname("/erlang///src"),
-	    ?line "/file_sorter.erl" = filename:absname([file_sorter|'.erl']),
-	    ok
+        {win32, _} -> 
+            [Drive|_] = proplists:get_value(priv_dir, Config),
+            Temp = filename:join([Drive|":/"], "temp"),
+            case file:make_dir(Temp) of
+                ok -> ok;
+                {error,eexist} -> ok
+            end,
+            {ok,Cwd} = file:get_cwd(),
+            ok = file:set_cwd(Temp),
+            [Drive|":/temp/foo"] = filename:absname(foo),
+            [Drive|":/temp/foo"] = filename:absname("foo"),
+            [Drive|":/temp/../ebin"] = filename:absname("../ebin"),
+            [Drive|":/erlang"] = filename:absname("/erlang"),
+            [Drive|":/erlang/src"] = filename:absname("/erlang/src"),
+            [Drive|":/erlang/src"] = filename:absname("\\erlang\\src"),
+            [Drive|":/temp/erlang"] = filename:absname([Drive|":erlang"]),
+            [Drive|":/temp/erlang/src"] =
+                filename:absname([Drive|":erlang/src"]),
+            [Drive|":/temp/erlang/src"] =
+                filename:absname([Drive|":erlang\\src\\"]),
+            "a:/erlang" = filename:absname("a:erlang"),
+
+            file:set_cwd([Drive|":/"]),
+            [Drive|":/foo"] = filename:absname(foo),
+            [Drive|":/foo"] = filename:absname("foo"),
+            [Drive|":/../ebin"] = filename:absname("../ebin"),
+            [Drive|":/erlang"] = filename:absname("/erlang"),
+            [Drive|":/erlang/src"] = filename:absname("/erlang/src"),
+            [Drive|":/erlang/src"] = filename:absname(["/erlang",'/src']),
+            [Drive|":/erlang/src"] = filename:absname("\\erlang\\\\src"),
+            [Drive|":/erlang"] = filename:absname([Drive|":erlang"]),
+            [Drive|":/erlang/src"] = filename:absname([Drive|":erlang/src"]),
+            "a:/erlang" = filename:absname("a:erlang"),
+
+            file:set_cwd(Cwd),
+            ok;
+        {unix, _} ->
+            ok = file:set_cwd("/usr"),
+            "/usr/foo" = filename:absname(foo),
+            "/usr/foo" = filename:absname("foo"),
+            "/usr/../ebin" = filename:absname("../ebin"),
+
+            file:set_cwd("/"),
+            "/foo" = filename:absname(foo),
+            "/foo" = filename:absname("foo"),
+            "/../ebin" = filename:absname("../ebin"),
+            "/erlang" = filename:absname("/erlang"),
+            "/erlang/src" = filename:absname("/erlang/src"),
+            "/erlang/src" = filename:absname(["/erl",'ang/s',"rc"]),
+            "/erlang/src" = filename:absname(["/erl",'a','ng',"/",'s',"rc"]),
+            "/erlang/src" = filename:absname("/erlang///src"),
+            "/file_sorter.erl" = filename:absname([file_sorter|'.erl']),
+            ok
     end.
 
 
@@ -129,125 +131,119 @@ absname(Config) when is_list(Config) ->
 
 absname_2(Config) when is_list(Config) ->
     case os:type() of
-	{win32, _} ->
-	    ?line [Drive|_] = ?config(priv_dir, Config),
-	    ?line [Drive|":/temp/foo"] = filename:absname(foo, [Drive|":/temp"]),
-	    ?line [Drive|":/temp/foo"] = filename:absname("foo", [Drive|":/temp"]),
-	    ?line [Drive|":/temp/../ebin"] = filename:absname("../ebin",
-							      [Drive|":/temp"]),
-	    ?line [Drive|":/erlang"] = filename:absname("/erlang", [Drive|":/temp"]),
-	    ?line [Drive|":/erlang/src"] = filename:absname("/erlang/src",
-							    [Drive|":/temp"]),
-	    ?line [Drive|":/erlang/src"] = filename:absname("\\erlang\\src",
-							    [Drive|":/temp"]),
-	    ?line [Drive|":/temp/erlang"] = filename:absname([Drive|":erlang"],
-							     [Drive|":/temp"]),
-	    ?line [Drive|":/temp/erlang/src"] = filename:absname([Drive|":erlang/src"],
-								 [Drive|":/temp"]),
-	    ?line [Drive|":/temp/erlang/src"] =
-		filename:absname([Drive|":erlang\\src\\"], [Drive|":/temp"]),
-	    ?line "a:/erlang" = filename:absname("a:erlang", [Drive|":/temp"]),
-	    
-	    ?line file:set_cwd([Drive|":/"]),
-	    ?line [Drive|":/foo"] = filename:absname(foo, [Drive|":/"]),
-	    ?line [Drive|":/foo"] = filename:absname("foo", [Drive|":/"]),
-	    ?line [Drive|":/../ebin"] = filename:absname("../ebin", [Drive|":/"]),
-	    ?line [Drive|":/erlang"] = filename:absname("/erlang", [Drive|":/"]),
-	    ?line [Drive|":/erlang/src"] = filename:absname("/erlang/src",
-							    [Drive|":/"]),
-	    ?line [Drive|":/erlang/src"] = filename:absname("\\erlang\\\\src",
-							    [Drive|":/"]),
-	    ?line [Drive|":/erlang"] = filename:absname([Drive|":erlang"],
-							[Drive|":/"]),
-	    ?line [Drive|":/erlang/src"] = filename:absname([Drive|":erlang/src"],
-							    [Drive|":/"]),
-	    ?line "a:/erlang" = filename:absname("a:erlang", [Drive|":/"]),
-	    
-	    ok;
-	_ ->
-	    ?line "/usr/foo" = filename:absname(foo, "/usr"),
-	    ?line "/usr/foo" = filename:absname("foo", "/usr"),
-	    ?line "/usr/../ebin" = filename:absname("../ebin", "/usr"),
-	    
-	    ?line "/foo" = filename:absname(foo, "/"),
-	    ?line "/foo" = filename:absname("foo", "/"),
-	    ?line "/../ebin" = filename:absname("../ebin", "/"),
-	    ?line "/erlang" = filename:absname("/erlang", "/"),
-	    ?line "/erlang/src" = filename:absname("/erlang/src", "/"),
-	    ?line "/erlang/src" = filename:absname("/erlang///src", "/"),
-	    ok
+        {win32, _} ->
+            [Drive|_] = proplists:get_value(priv_dir, Config),
+            [Drive|":/temp/foo"] = filename:absname(foo, [Drive|":/temp"]),
+            [Drive|":/temp/foo"] = filename:absname("foo", [Drive|":/temp"]),
+            [Drive|":/temp/../ebin"] = filename:absname("../ebin",
+                                                        [Drive|":/temp"]),
+            [Drive|":/erlang"] = filename:absname("/erlang", [Drive|":/temp"]),
+            [Drive|":/erlang/src"] = filename:absname("/erlang/src",
+                                                      [Drive|":/temp"]),
+            [Drive|":/erlang/src"] = filename:absname("\\erlang\\src",
+                                                      [Drive|":/temp"]),
+            [Drive|":/temp/erlang"] = filename:absname([Drive|":erlang"],
+                                                       [Drive|":/temp"]),
+            [Drive|":/temp/erlang/src"] = filename:absname([Drive|":erlang/src"],
+                                                           [Drive|":/temp"]),
+            [Drive|":/temp/erlang/src"] =
+                filename:absname([Drive|":erlang\\src\\"], [Drive|":/temp"]),
+            "a:/erlang" = filename:absname("a:erlang", [Drive|":/temp"]),
+
+            file:set_cwd([Drive|":/"]),
+            [Drive|":/foo"] = filename:absname(foo, [Drive|":/"]),
+            [Drive|":/foo"] = filename:absname("foo", [Drive|":/"]),
+            [Drive|":/../ebin"] = filename:absname("../ebin", [Drive|":/"]),
+            [Drive|":/erlang"] = filename:absname("/erlang", [Drive|":/"]),
+            [Drive|":/erlang/src"] = filename:absname("/erlang/src",
+                                                      [Drive|":/"]),
+            [Drive|":/erlang/src"] = filename:absname("\\erlang\\\\src",
+                                                      [Drive|":/"]),
+            [Drive|":/erlang"] = filename:absname([Drive|":erlang"],
+                                                  [Drive|":/"]),
+            [Drive|":/erlang/src"] = filename:absname([Drive|":erlang/src"],
+                                                      [Drive|":/"]),
+            "a:/erlang" = filename:absname("a:erlang", [Drive|":/"]),
+
+            ok;
+        _ ->
+            "/usr/foo" = filename:absname(foo, "/usr"),
+            "/usr/foo" = filename:absname("foo", "/usr"),
+            "/usr/../ebin" = filename:absname("../ebin", "/usr"),
+
+            "/foo" = filename:absname(foo, "/"),
+            "/foo" = filename:absname("foo", "/"),
+            "/../ebin" = filename:absname("../ebin", "/"),
+            "/erlang" = filename:absname("/erlang", "/"),
+            "/erlang/src" = filename:absname("/erlang/src", "/"),
+            "/erlang/src" = filename:absname("/erlang///src", "/"),
+            ok
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 basename_1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line "." = filename:basename("."),
-    ?line "foo" = filename:basename("foo"),
-    ?line "foo" = filename:basename("/usr/foo"),
-    ?line "foo.erl" = filename:basename("A:usr/foo.erl"),
-    ?line "foo" = filename:basename('/usr/foo'),
-    ?line "foo" = filename:basename(["/usr","/","f","o","o"]),
-    ?line "foo" = filename:basename(["/usr/",foo]),
-    ?line "foo" = filename:basename(["/usr/f",oo]),
-    ?line "foo" = filename:basename(["usr/", "foo"]),
-    ?line "foo" = filename:basename(["usr/"|foo]),
-    ?line "foo" = filename:basename(["usr/foo/"]),
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line "foo" = filename:basename(["usr\\foo\\"]),
-		  ?line "foo" = filename:basename("A:\\usr\\foo"),
-		  ?line "foo" = filename:basename("A:foo");
-	      _ ->
-		  ?line "strange\\but\\true" =
-		      filename:basename("strange\\but\\true")
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    "." = filename:basename("."),
+    "foo" = filename:basename("foo"),
+    "foo" = filename:basename("/usr/foo"),
+    "foo.erl" = filename:basename("A:usr/foo.erl"),
+    "foo" = filename:basename('/usr/foo'),
+    "foo" = filename:basename(["/usr","/","f","o","o"]),
+    "foo" = filename:basename(["/usr/",foo]),
+    "foo" = filename:basename(["/usr/f",oo]),
+    "foo" = filename:basename(["usr/", "foo"]),
+    "foo" = filename:basename(["usr/"|foo]),
+    "foo" = filename:basename(["usr/foo/"]),
+    case os:type() of
+        {win32, _} ->
+            "foo" = filename:basename(["usr\\foo\\"]),
+            "foo" = filename:basename("A:\\usr\\foo"),
+            "foo" = filename:basename("A:foo");
+        _ ->
+            "strange\\but\\true" =
+                filename:basename("strange\\but\\true")
+    end,
     ok.
 
 basename_2(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line "." = filename:basename(".", ".erl"),
-    ?line "foo" = filename:basename("foo.erl", ".erl"),
-    ?line "foo" = filename:basename('foo.erl', ".erl"),
-    ?line "foo" = filename:basename("foo.erl", '.erl'),
-    ?line "foo" = filename:basename(["/usr","/","f","oo"], ".erl"),
-    ?line "foo.erl" = filename:basename("/usr/foo.erl", ".hrl"),
-    ?line "foo.erl" = filename:basename("/usr.hrl/foo.erl", ".hrl"),
-    ?line "foo" = filename:basename("/usr.hrl/foo", ".hrl"),
-    ?line "foo" = filename:basename("usr/foo/", ".erl"),
-    ?line "foo.erl" = filename:basename("usr/foo.erl/", ".erl"),
-    ?line "foo.erl" = filename:basename("usr/foo.erl/", '.erl'),
-    ?line "foo" = filename:basename(["/usr",'/','f','oo'], ".erl"),
-    ?line "foo.erl" = filename:basename(["usr/foo.e",'rl/'], ".erl"),
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line "foo" = filename:basename("A:foo", ".erl"),
-		  ?line "foo.erl" = filename:basename("a:\\usr\\foo.erl",
-						      ".hrl"),
-		  ?line "foo.erl" = filename:basename("c:\\usr.hrl\\foo.erl",
-						      ".hrl"),
-		  ?line "foo" = filename:basename("A:\\usr\\foo", ".hrl");
-	      _ ->
-		  ?line "strange\\but\\true" =
-		      filename:basename("strange\\but\\true.erl", ".erl"),
-		  ?line "strange\\but\\true" =
-		      filename:basename("strange\\but\\true", ".erl")
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    "." = filename:basename(".", ".erl"),
+    "foo" = filename:basename("foo.erl", ".erl"),
+    "foo" = filename:basename('foo.erl', ".erl"),
+    "foo" = filename:basename("foo.erl", '.erl'),
+    "foo" = filename:basename(["/usr","/","f","oo"], ".erl"),
+    "foo.erl" = filename:basename("/usr/foo.erl", ".hrl"),
+    "foo.erl" = filename:basename("/usr.hrl/foo.erl", ".hrl"),
+    "foo" = filename:basename("/usr.hrl/foo", ".hrl"),
+    "foo" = filename:basename("usr/foo/", ".erl"),
+    "foo.erl" = filename:basename("usr/foo.erl/", ".erl"),
+    "foo.erl" = filename:basename("usr/foo.erl/", '.erl'),
+    "foo" = filename:basename(["/usr",'/','f','oo'], ".erl"),
+    "foo.erl" = filename:basename(["usr/foo.e",'rl/'], ".erl"),
+    case os:type() of
+        {win32, _} ->
+            "foo" = filename:basename("A:foo", ".erl"),
+            "foo.erl" = filename:basename("a:\\usr\\foo.erl", ".hrl"),
+            "foo.erl" = filename:basename("c:\\usr.hrl\\foo.erl", ".hrl"),
+            "foo" = filename:basename("A:\\usr\\foo", ".hrl");
+        _ ->
+            "strange\\but\\true" =
+                filename:basename("strange\\but\\true.erl", ".erl"),
+            "strange\\but\\true" =
+                filename:basename("strange\\but\\true", ".erl")
+    end,
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 dirname(Config) when is_list(Config) ->
     case os:type() of
-       {win32,_} ->
-	    "A:/usr" = filename:dirname("A:/usr/foo.erl"),
-	    "A:usr" = filename:dirname("A:usr/foo.erl"),
-	    "/usr" = filename:dirname("\\usr\\foo.erl"),
-	    "/" = filename:dirname("\\usr"),
-	    "A:" = filename:dirname("A:");
-	_ -> true
+        {win32,_} ->
+            "A:/usr" = filename:dirname("A:/usr/foo.erl"),
+            "A:usr" = filename:dirname("A:usr/foo.erl"),
+            "/usr" = filename:dirname("\\usr\\foo.erl"),
+            "/" = filename:dirname("\\usr"),
+            "A:" = filename:dirname("A:");
+        _ -> true
     end,
     "usr" = filename:dirname("usr///foo.erl"),
     "." = filename:dirname("foo.erl"),
@@ -267,23 +263,22 @@ dirname(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 extension(Config) when is_list(Config) ->
-    ?line ".erl" = filename:extension("A:/usr/foo.erl"),
-    ?line ".erl" = filename:extension("A:/usr/foo.nisse.erl"),
-    ?line ".erl" = filename:extension(["A:/usr/", 'foo.ni', "sse.erl"]),
-    ?line ".erl" = filename:extension(["A:/usr/", 'foo.ni', "sse.e", 'rl']),
-    ?line ".erl" = filename:extension(["A:/usr/", 'foo.ni', "sse.e"|'rl']),
-    ?line ".erl" = filename:extension("A:/usr.bar/foo.nisse.erl"),
-    ?line "" = filename:extension("A:/usr.bar/foo"),
-    ?line "" = filename:extension("A:/usr/foo"),
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line "" = filename:extension("A:\\usr\\foo"),
-		  ?line ".erl" =
-		      filename:extension("A:/usr.bar/foo.nisse.erl"),
-		  ?line "" = filename:extension("A:/usr.bar/foo"),
-		  ok;
-	      _ -> ok
-	  end.
+    ".erl" = filename:extension("A:/usr/foo.erl"),
+    ".erl" = filename:extension("A:/usr/foo.nisse.erl"),
+    ".erl" = filename:extension(["A:/usr/", 'foo.ni', "sse.erl"]),
+    ".erl" = filename:extension(["A:/usr/", 'foo.ni', "sse.e", 'rl']),
+    ".erl" = filename:extension(["A:/usr/", 'foo.ni', "sse.e"|'rl']),
+    ".erl" = filename:extension("A:/usr.bar/foo.nisse.erl"),
+    "" = filename:extension("A:/usr.bar/foo"),
+    "" = filename:extension("A:/usr/foo"),
+    case os:type() of
+        {win32, _} ->
+            "" = filename:extension("A:\\usr\\foo"),
+            ".erl" = filename:extension("A:/usr.bar/foo.nisse.erl"),
+            "" = filename:extension("A:/usr.bar/foo"),
+            ok;
+        _ -> ok
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     
@@ -291,8 +286,8 @@ join(Config) when is_list(Config) ->
     %% Whenever joining two elements, test the equivalence between
     %% join/1 and join/2 (OTP-12158) by using help function
     %% filename_join/2.
-    ?line "/" = filename:join(["/"]),
-    ?line "/" = filename:join(["//"]),
+    "/" = filename:join(["/"]),
+    "/" = filename:join(["//"]),
     "usr/foo.erl" = filename_join("usr","foo.erl"),
     "/src/foo.erl" = filename_join(usr, "/src/foo.erl"),
     "/src/foo.erl" = filename_join("/src/",'foo.erl'),
@@ -300,7 +295,7 @@ join(Config) when is_list(Config) ->
     "/src/foo.erl" = filename_join("usr", "/src/foo.erl"),
 
     %% Make sure that redundant slashes work too.
-    ?line "a/b/c/d/e/f/g" = filename:join(["a//b/c/////d//e/f/g"]),
+    "a/b/c/d/e/f/g" = filename:join(["a//b/c/////d//e/f/g"]),
     "a/b/c/d/e/f/g" = filename_join("a//b/c/", "d//e/f/g"),
     "a/b/c/d/e/f/g" = filename_join("a//b/c", "d//e/f/g"),
     "/d/e/f/g" = filename_join("a//b/c", "/d//e/f/g"),
@@ -333,30 +328,25 @@ join(Config) when is_list(Config) ->
     "/b" = filename_join("/a/","/b/"),
     "/a/b" = filename_join("/a/","b/"),
 
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line "d:/" = filename:join(["D:/"]),
-		  ?line "d:/" = filename:join(["D:\\"]),
-		  "d:/abc" = filename_join("D:/", "abc"),
-		  "d:abc" = filename_join("D:", "abc"),
-		  ?line "a/b/c/d/e/f/g" =
-		      filename:join(["a//b\\c//\\/\\d/\\e/f\\g"]),
-		  ?line "a:usr/foo.erl" =
-		      filename:join(["A:","usr","foo.erl"]),
-		  ?line "/usr/foo.erl" =
-		      filename:join(["A:","/usr","foo.erl"]),
-		  "c:usr" = filename_join("A:","C:usr"),
-		  "a:usr" = filename_join("A:","usr"),
-		  "c:/usr" = filename_join("A:", "C:/usr"),
-		  ?line "c:/usr/foo.erl" =
-		      filename:join(["A:","C:/usr","foo.erl"]),
-		  ?line "c:usr/foo.erl" =
-		      filename:join(["A:","C:usr","foo.erl"]),
-		  ?line "d:/foo" = filename:join([$D, $:, $/, []], "foo"),
-		  ok;
-	      _ ->
-		  ok
-	  end.
+    case os:type() of
+        {win32, _} ->
+            "d:/" = filename:join(["D:/"]),
+            "d:/" = filename:join(["D:\\"]),
+            "d:/abc" = filename_join("D:/", "abc"),
+            "d:abc" = filename_join("D:", "abc"),
+            "a/b/c/d/e/f/g" = filename:join(["a//b\\c//\\/\\d/\\e/f\\g"]),
+            "a:usr/foo.erl" = filename:join(["A:","usr","foo.erl"]),
+            "/usr/foo.erl" = filename:join(["A:","/usr","foo.erl"]),
+            "c:usr" = filename_join("A:","C:usr"),
+            "a:usr" = filename_join("A:","usr"),
+            "c:/usr" = filename_join("A:", "C:/usr"),
+            "c:/usr/foo.erl" = filename:join(["A:","C:/usr","foo.erl"]),
+            "c:usr/foo.erl" = filename:join(["A:","C:usr","foo.erl"]),
+            "d:/foo" = filename:join([$D, $:, $/, []], "foo"),
+            ok;
+        _ ->
+            ok
+    end.
 
 %% Make sure join([A,B]) is equivalent to join(A,B) (OTP-12158)
 filename_join(A,B) ->
@@ -364,92 +354,92 @@ filename_join(A,B) ->
     Res = filename:join([A,B]).
 
 pathtype(Config) when is_list(Config) ->
-    ?line relative = filename:pathtype(".."),
-    ?line relative = filename:pathtype("foo"),
-    ?line relative = filename:pathtype("foo/bar"),
-    ?line relative = filename:pathtype('foo/bar'),
-    ?line relative = filename:pathtype(['f','oo',"/bar"]),
+    relative = filename:pathtype(".."),
+    relative = filename:pathtype("foo"),
+    relative = filename:pathtype("foo/bar"),
+    relative = filename:pathtype('foo/bar'),
+    relative = filename:pathtype(['f','oo',"/bar"]),
     case os:type() of
-	{win32, _} ->
-	    ?line volumerelative = filename:pathtype("/usr/local/bin"),
-	    ?line volumerelative = filename:pathtype("A:usr/local/bin"),
-	    ok;
-	_ ->
-	    ?line absolute = filename:pathtype("/"),
-	    ?line absolute = filename:pathtype("/usr/local/bin"),
-	    ok
+        {win32, _} ->
+            volumerelative = filename:pathtype("/usr/local/bin"),
+            volumerelative = filename:pathtype("A:usr/local/bin"),
+            ok;
+        _ ->
+            absolute = filename:pathtype("/"),
+            absolute = filename:pathtype("/usr/local/bin"),
+            ok
     end.
 
 rootname(Config) when is_list(Config) ->
-    ?line "/jam.src/kalle" = filename:rootname("/jam.src/kalle"),
-    ?line "/jam.src/foo" = filename:rootname("/jam.src/foo.erl"),
-    ?line "/jam.src/foo" = filename:rootname(["/ja",'m.sr',"c/foo.erl"]),
-    ?line "/jam.src/foo" = filename:rootname("/jam.src/foo.erl", ".erl"),
-    ?line "/jam.src/foo.jam" = filename:rootname("/jam.src/foo.jam", ".erl"),
-    ?line "/jam.src/foo.jam" = filename:rootname(["/jam.sr",'c/foo.j',"am"],".erl"),
-    ?line "/jam.src/foo.jam" = filename:rootname(["/jam.sr",'c/foo.j'|am],".erl"),
+    "/jam.src/kalle" = filename:rootname("/jam.src/kalle"),
+    "/jam.src/foo" = filename:rootname("/jam.src/foo.erl"),
+    "/jam.src/foo" = filename:rootname(["/ja",'m.sr',"c/foo.erl"]),
+    "/jam.src/foo" = filename:rootname("/jam.src/foo.erl", ".erl"),
+    "/jam.src/foo.jam" = filename:rootname("/jam.src/foo.jam", ".erl"),
+    "/jam.src/foo.jam" = filename:rootname(["/jam.sr",'c/foo.j',"am"],".erl"),
+    "/jam.src/foo.jam" = filename:rootname(["/jam.sr",'c/foo.j'|am],".erl"),
     ok.
 
 split(Config) when is_list(Config) ->
-    ?line ["/","usr","local","bin"] = filename:split("/usr/local/bin"),
-    ?line ["foo","bar"]= filename:split("foo/bar"),
-    ?line ["foo", "bar", "hello"]= filename:split("foo////bar//hello"),
-    ?line ["foo", "bar", "hello"]= filename:split(["foo//",'//bar//h',"ello"]),
-    ?line ["foo", "bar", "hello"]= filename:split(["foo//",'//bar//h'|ello]),
+    ["/","usr","local","bin"] = filename:split("/usr/local/bin"),
+    ["foo","bar"]= filename:split("foo/bar"),
+    ["foo", "bar", "hello"]= filename:split("foo////bar//hello"),
+    ["foo", "bar", "hello"]= filename:split(["foo//",'//bar//h',"ello"]),
+    ["foo", "bar", "hello"]= filename:split(["foo//",'//bar//h'|ello]),
     ["/"] = filename:split("/"),
     [] = filename:split(""),
     case os:type() of
-       {win32,_} ->
-	    ?line ["a:/","msdev","include"] =
-		filename:split("a:/msdev/include"),
-	    ?line ["a:/","msdev","include"] =
-		filename:split("A:/msdev/include"),
-	    ?line ["msdev","include"] =
-		filename:split("msdev\\include"),
-	    ?line ["a:/","msdev","include"] =
-		filename:split("a:\\msdev\\include"),
-	    ?line ["a:","msdev","include"] =
-		filename:split("a:msdev\\include"),
-	    ok;
-       _ ->
+        {win32,_} ->
+            ["a:/","msdev","include"] =
+                filename:split("a:/msdev/include"),
+            ["a:/","msdev","include"] =
+                filename:split("A:/msdev/include"),
+            ["msdev","include"] =
+                filename:split("msdev\\include"),
+            ["a:/","msdev","include"] =
+                filename:split("a:\\msdev\\include"),
+            ["a:","msdev","include"] =
+                filename:split("a:msdev\\include"),
+            ok;
+        _ ->
 	    ok
     end.
 
 t_nativename(Config) when is_list(Config) ->
-    ?line "abcedf" = filename:nativename(abcedf),
-    ?line "abcedf" = filename:nativename(["abc", "edf"]),
-    ?line "abcgluff" = filename:nativename(["abc", gluff]),
+    "abcedf" = filename:nativename(abcedf),
+    "abcedf" = filename:nativename(["abc", "edf"]),
+    "abcgluff" = filename:nativename(["abc", gluff]),
     case os:type() of
-	{win32, _} ->
-	    ?line "a:\\temp\\arne.exe" =
-		filename:nativename("A:/temp//arne.exe/");
-	_ ->
-	    ?line "/usr/tmp/arne" =
-		filename:nativename("/usr/tmp//arne/")
+        {win32, _} ->
+            "a:\\temp\\arne.exe" =
+                filename:nativename("A:/temp//arne.exe/");
+        _ ->
+            "/usr/tmp/arne" =
+                filename:nativename("/usr/tmp//arne/")
     end.
 
 find_src(Config) when is_list(Config) ->
-    ?line {Source,_} = filename:find_src(file),
-    ?line ["file"|_] = lists:reverse(filename:split(Source)),
-    ?line {_,_} = filename:find_src(init, [{".","."}, {"ebin","src"}]),
+    {Source,_} = filename:find_src(file),
+    ["file"|_] = lists:reverse(filename:split(Source)),
+    {_,_} = filename:find_src(init, [{".","."}, {"ebin","src"}]),
     
     %% Try to find the source for a preloaded module.
-    ?line {error,{preloaded,init}} = filename:find_src(init),
+    {error,{preloaded,init}} = filename:find_src(init),
 
     %% Make sure that find_src works for a slim BEAM file.
     OldPath = code:get_path(),
     try
-	PrivDir = ?config(priv_dir, Config),
-	code:add_patha(PrivDir),
-	Src = "simple",
-	SrcPath = filename:join(PrivDir, Src) ++ ".erl",
-	SrcContents = "-module(simple).\n",
-	ok = file:write_file(SrcPath, SrcContents),
-	{ok,simple} = compile:file(SrcPath, [slim,{outdir,PrivDir}]),
-	BeamPath = filename:join(PrivDir, Src),
-	{BeamPath,[]} = filename:find_src(simple)
+        PrivDir = proplists:get_value(priv_dir, Config),
+        code:add_patha(PrivDir),
+        Src = "simple",
+        SrcPath = filename:join(PrivDir, Src) ++ ".erl",
+        SrcContents = "-module(simple).\n",
+        ok = file:write_file(SrcPath, SrcContents),
+        {ok,simple} = compile:file(SrcPath, [slim,{outdir,PrivDir}]),
+        BeamPath = filename:join(PrivDir, Src),
+        {BeamPath,[]} = filename:find_src(simple)
     after
-	code:set_path(OldPath)
+        code:set_path(OldPath)
     end,
     ok.
 
@@ -461,58 +451,51 @@ find_src(Config) when is_list(Config) ->
 
 absname_bin(Config) when is_list(Config) ->
     case os:type() of
-	{win32, _} -> 
-	    ?line [Drive|_] = ?config(priv_dir, Config),
-	    ?line Temp = filename:join([Drive|":/"], "temp"),
-	    ?line case file:make_dir(Temp) of
-		      ok -> ok;
-		      {error,eexist} -> ok
-		  end,
-	    ?line {ok,Cwd} = file:get_cwd(),
-	    ?line ok = file:set_cwd(Temp),
-	    ?line <<Drive:8,":/temp/foo">> = filename:absname(<<"foo">>),
-	    ?line <<Drive:8,":/temp/../ebin">> = filename:absname(<<"../ebin">>),
-	    ?line <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\src">>),
-	    ?line <<Drive:8,":/temp/erlang">> = filename:absname(<<Drive:8,":erlang">>),
-	    ?line <<Drive:8,":/temp/erlang/src">> =
-		filename:absname(<<Drive:8,":erlang/src">>),
-	    ?line <<Drive:8,":/temp/erlang/src">> =
-		filename:absname(<<Drive:8,":erlang\\src\\">>),
-	    ?line <<"a:/erlang">> = filename:absname(<<"a:erlang">>),
-	    
-	    ?line file:set_cwd(<<Drive:8,":/">>),
-	    ?line <<Drive:8,":/foo">> = filename:absname(<<"foo">>),
-	    ?line <<Drive:8,":/../ebin">> = filename:absname(<<"../ebin">>),
-	    ?line <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\\\src">>),
-	    ?line <<Drive:8,":/erlang">> = filename:absname(<<Drive:8,":erlang">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>),
-	    ?line <<"a:/erlang">> = filename:absname(<<"a:erlang">>),
-	    
-	    ?line file:set_cwd(Cwd),
-	    ok;
-	Type ->
-	    case Type of
-		{unix,_} ->
-		    ?line ok = file:set_cwd(<<"/usr">>),
-		    ?line <<"/usr/foo">> = filename:absname(<<"foo">>),
-		    ?line <<"/usr/../ebin">> = filename:absname(<<"../ebin">>);
-		{ose,_} ->
-		    ?line ok = file:set_cwd(<<"/romfs">>),
-		    ?line <<"/romfs/foo">> = filename:absname(<<"foo">>),
-		    ?line <<"/romfs/../ebin">> = filename:absname(<<"../ebin">>)
-	    end,
-	    
-	    ?line file:set_cwd(<<"/">>),
-	    ?line <<"/foo">> = filename:absname(<<"foo">>),
-	    ?line <<"/../ebin">> = filename:absname(<<"../ebin">>),
-	    ?line <<"/erlang">> = filename:absname(<<"/erlang">>),
-	    ?line <<"/erlang/src">> = filename:absname(<<"/erlang/src">>),
-	    ?line <<"/erlang/src">> = filename:absname(<<"/erlang///src">>),
-	    ok
+        {win32, _} -> 
+            [Drive|_] = proplists:get_value(priv_dir, Config),
+            Temp = filename:join([Drive|":/"], "temp"),
+            case file:make_dir(Temp) of
+                ok -> ok;
+                {error,eexist} -> ok
+            end,
+            {ok,Cwd} = file:get_cwd(),
+            ok = file:set_cwd(Temp),
+            <<Drive:8,":/temp/foo">> = filename:absname(<<"foo">>),
+            <<Drive:8,":/temp/../ebin">> = filename:absname(<<"../ebin">>),
+            <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\src">>),
+            <<Drive:8,":/temp/erlang">> = filename:absname(<<Drive:8,":erlang">>),
+            <<Drive:8,":/temp/erlang/src">> =
+            filename:absname(<<Drive:8,":erlang/src">>),
+            <<Drive:8,":/temp/erlang/src">> =
+            filename:absname(<<Drive:8,":erlang\\src\\">>),
+            <<"a:/erlang">> = filename:absname(<<"a:erlang">>),
+
+            file:set_cwd(<<Drive:8,":/">>),
+            <<Drive:8,":/foo">> = filename:absname(<<"foo">>),
+            <<Drive:8,":/../ebin">> = filename:absname(<<"../ebin">>),
+            <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\\\src">>),
+            <<Drive:8,":/erlang">> = filename:absname(<<Drive:8,":erlang">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>),
+            <<"a:/erlang">> = filename:absname(<<"a:erlang">>),
+
+            file:set_cwd(Cwd),
+            ok;
+        {unix,_} ->
+            ok = file:set_cwd(<<"/usr">>),
+            <<"/usr/foo">> = filename:absname(<<"foo">>),
+            <<"/usr/../ebin">> = filename:absname(<<"../ebin">>),
+
+            file:set_cwd(<<"/">>),
+            <<"/foo">> = filename:absname(<<"foo">>),
+            <<"/../ebin">> = filename:absname(<<"../ebin">>),
+            <<"/erlang">> = filename:absname(<<"/erlang">>),
+            <<"/erlang/src">> = filename:absname(<<"/erlang/src">>),
+            <<"/erlang/src">> = filename:absname(<<"/erlang///src">>),
+            ok
     end.
 
 
@@ -520,108 +503,100 @@ absname_bin(Config) when is_list(Config) ->
 
 absname_bin_2(Config) when is_list(Config) ->
     case os:type() of
-	{win32, _} ->
-	    ?line [Drive|_] = ?config(priv_dir, Config),
-	    ?line <<Drive:8,":/temp/foo">> = filename:absname(<<"foo">>, <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/temp/../ebin">> = filename:absname(<<"../ebin">>,
-							      <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>, <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>,
-							    <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\src">>,
-							    <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/temp/erlang">> = filename:absname(<<Drive:8,":erlang">>,
-							     <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/temp/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>,
-								 <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/temp/erlang/src">> =
-		filename:absname(<<Drive:8,":erlang\\src\\">>, <<Drive:8,":/temp">>),
-	    ?line <<"a:/erlang">> = filename:absname(<<"a:erlang">>, <<Drive:8,":/temp">>),
-	    
-	    ?line file:set_cwd(<<Drive:8,":/">>),
-	    ?line <<Drive:8,":/foo">> = filename:absname(foo, <<Drive:8,":/">>),
-	    ?line <<Drive:8,":/foo">> = filename:absname(<<"foo">>, <<Drive:8,":/">>),
-	    ?line <<Drive:8,":/../ebin">> = filename:absname(<<"../ebin">>, <<Drive:8,":/">>),
-	    ?line <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>, <<Drive:8,":/">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>,
-							    <<Drive:8,":/">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\\\src">>,
-							    <<Drive:8,":/">>),
-	    ?line <<Drive:8,":/erlang">> = filename:absname(<<Drive:8,":erlang">>,
-							<<Drive:8,":/">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>,
-							    <<Drive:8,":/">>),
-	    ?line <<"a:/erlang">> = filename:absname(<<"a:erlang">>, <<Drive:8,":/">>),
-	    
-	    ok;
-	_ ->
-	    ?line <<"/usr/foo">> = filename:absname(<<"foo">>, <<"/usr">>),
-	    ?line <<"/usr/../ebin">> = filename:absname(<<"../ebin">>, <<"/usr">>),
-	    
-	    ?line <<"/foo">> = filename:absname(<<"foo">>, <<"/">>),
-	    ?line <<"/../ebin">> = filename:absname(<<"../ebin">>, <<"/">>),
-	    ?line <<"/erlang">> = filename:absname(<<"/erlang">>, <<"/">>),
-	    ?line <<"/erlang/src">> = filename:absname(<<"/erlang/src">>, <<"/">>),
-	    ?line <<"/erlang/src">> = filename:absname(<<"/erlang///src">>, <<"/">>),
-	    ok
+        {win32, _} ->
+            [Drive|_] = proplists:get_value(priv_dir, Config),
+            <<Drive:8,":/temp/foo">> = filename:absname(<<"foo">>, <<Drive:8,":/temp">>),
+            <<Drive:8,":/temp/../ebin">> = filename:absname(<<"../ebin">>,
+                                                            <<Drive:8,":/temp">>),
+            <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>, <<Drive:8,":/temp">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>,
+                                                          <<Drive:8,":/temp">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\src">>,
+                                                          <<Drive:8,":/temp">>),
+            <<Drive:8,":/temp/erlang">> = filename:absname(<<Drive:8,":erlang">>,
+                                                           <<Drive:8,":/temp">>),
+            <<Drive:8,":/temp/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>,
+                                                               <<Drive:8,":/temp">>),
+            <<Drive:8,":/temp/erlang/src">> =
+                filename:absname(<<Drive:8,":erlang\\src\\">>, <<Drive:8,":/temp">>),
+            <<"a:/erlang">> = filename:absname(<<"a:erlang">>, <<Drive:8,":/temp">>),
+
+            file:set_cwd(<<Drive:8,":/">>),
+            <<Drive:8,":/foo">> = filename:absname(foo, <<Drive:8,":/">>),
+            <<Drive:8,":/foo">> = filename:absname(<<"foo">>, <<Drive:8,":/">>),
+            <<Drive:8,":/../ebin">> = filename:absname(<<"../ebin">>, <<Drive:8,":/">>),
+            <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>, <<Drive:8,":/">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>,
+                                                          <<Drive:8,":/">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\\\src">>,
+                                                          <<Drive:8,":/">>),
+            <<Drive:8,":/erlang">> = filename:absname(<<Drive:8,":erlang">>,
+                                                      <<Drive:8,":/">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>,
+                                                          <<Drive:8,":/">>),
+            <<"a:/erlang">> = filename:absname(<<"a:erlang">>, <<Drive:8,":/">>),
+
+            ok;
+        _ ->
+            <<"/usr/foo">> = filename:absname(<<"foo">>, <<"/usr">>),
+            <<"/usr/../ebin">> = filename:absname(<<"../ebin">>, <<"/usr">>),
+            <<"/foo">> = filename:absname(<<"foo">>, <<"/">>),
+            <<"/../ebin">> = filename:absname(<<"../ebin">>, <<"/">>),
+            <<"/erlang">> = filename:absname(<<"/erlang">>, <<"/">>),
+            <<"/erlang/src">> = filename:absname(<<"/erlang/src">>, <<"/">>),
+            <<"/erlang/src">> = filename:absname(<<"/erlang///src">>, <<"/">>),
+            ok
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 basename_bin_1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line <<".">> = filename:basename(<<".">>),
-    ?line <<"foo">> = filename:basename(<<"foo">>),
-    ?line <<"foo">> = filename:basename(<<"/usr/foo">>),
-    ?line <<"foo.erl">> = filename:basename(<<"A:usr/foo.erl">>),
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line <<"foo">> = filename:basename(<<"A:\\usr\\foo">>),
-		  ?line <<"foo">> = filename:basename(<<"A:foo">>);
-	      _ ->
-		  ?line <<"strange\\but\\true">> =
-		      filename:basename(<<"strange\\but\\true">>)
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    <<".">> = filename:basename(<<".">>),
+    <<"foo">> = filename:basename(<<"foo">>),
+    <<"foo">> = filename:basename(<<"/usr/foo">>),
+    <<"foo.erl">> = filename:basename(<<"A:usr/foo.erl">>),
+    case os:type() of
+        {win32, _} ->
+            <<"foo">> = filename:basename(<<"A:\\usr\\foo">>),
+            <<"foo">> = filename:basename(<<"A:foo">>);
+        _ ->
+            <<"strange\\but\\true">> = filename:basename(<<"strange\\but\\true">>)
+    end,
     ok.
 
 basename_bin_2(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line <<".">> = filename:basename(<<".">>, <<".erl">>),
-    ?line <<"foo">> = filename:basename(<<"foo.erl">>, <<".erl">>),
-    ?line <<"foo.erl">> = filename:basename(<<"/usr/foo.erl">>, <<".hrl">>),
-    ?line <<"foo.erl">> = filename:basename(<<"/usr.hrl/foo.erl">>, <<".hrl">>),
-    ?line <<"foo">> = filename:basename(<<"/usr.hrl/foo">>, <<".hrl">>),
-    ?line <<"foo">> = filename:basename(<<"usr/foo/">>, <<".erl">>),
-    ?line <<"foo.erl">> = filename:basename(<<"usr/foo.erl/">>, <<".erl">>),
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line <<"foo">> = filename:basename(<<"A:foo">>, <<".erl">>),
-		  ?line <<"foo.erl">> = filename:basename(<<"a:\\usr\\foo.erl">>,
-						      <<".hrl">>),
-		  ?line <<"foo.erl">> = filename:basename(<<"c:\\usr.hrl\\foo.erl">>,
-						      <<".hrl">>),
-		  ?line <<"foo">> = filename:basename(<<"A:\\usr\\foo">>, <<".hrl">>);
-	      _ ->
-		  ?line <<"strange\\but\\true">> =
-		      filename:basename(<<"strange\\but\\true.erl">>, <<".erl">>),
-		  ?line <<"strange\\but\\true">> =
-		      filename:basename(<<"strange\\but\\true">>, <<".erl">>)
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    <<".">> = filename:basename(<<".">>, <<".erl">>),
+    <<"foo">> = filename:basename(<<"foo.erl">>, <<".erl">>),
+    <<"foo.erl">> = filename:basename(<<"/usr/foo.erl">>, <<".hrl">>),
+    <<"foo.erl">> = filename:basename(<<"/usr.hrl/foo.erl">>, <<".hrl">>),
+    <<"foo">> = filename:basename(<<"/usr.hrl/foo">>, <<".hrl">>),
+    <<"foo">> = filename:basename(<<"usr/foo/">>, <<".erl">>),
+    <<"foo.erl">> = filename:basename(<<"usr/foo.erl/">>, <<".erl">>),
+    case os:type() of
+        {win32, _} ->
+            <<"foo">> = filename:basename(<<"A:foo">>, <<".erl">>),
+            <<"foo.erl">> = filename:basename(<<"a:\\usr\\foo.erl">>, <<".hrl">>),
+            <<"foo.erl">> = filename:basename(<<"c:\\usr.hrl\\foo.erl">>, <<".hrl">>),
+            <<"foo">> = filename:basename(<<"A:\\usr\\foo">>, <<".hrl">>);
+        _ ->
+            <<"strange\\but\\true">> =
+                filename:basename(<<"strange\\but\\true.erl">>, <<".erl">>),
+            <<"strange\\but\\true">> =
+                filename:basename(<<"strange\\but\\true">>, <<".erl">>)
+    end,
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 dirname_bin(Config) when is_list(Config) ->
     case os:type() of
-       {win32,_} ->
-	    <<"A:/usr">> = filename:dirname(<<"A:/usr/foo.erl">>),
-	    <<"A:usr">> = filename:dirname(<<"A:usr/foo.erl">>),
-	    <<"/usr">> = filename:dirname(<<"\\usr\\foo.erl">>),
-	    <<"/">> = filename:dirname(<<"\\usr">>),
-	    <<"A:">> = filename:dirname(<<"A:">>);
-	_ -> true
+        {win32,_} ->
+            <<"A:/usr">> = filename:dirname(<<"A:/usr/foo.erl">>),
+            <<"A:usr">> = filename:dirname(<<"A:usr/foo.erl">>),
+            <<"/usr">> = filename:dirname(<<"\\usr\\foo.erl">>),
+            <<"/">> = filename:dirname(<<"\\usr">>),
+            <<"A:">> = filename:dirname(<<"A:">>);
+        _ -> true
     end,
     <<"usr">> = filename:dirname(<<"usr///foo.erl">>),
     <<".">> = filename:dirname(<<"foo.erl">>),
@@ -629,7 +604,6 @@ dirname_bin(Config) when is_list(Config) ->
     <<"/">> = filename:dirname(<<"/">>),
     <<"/">> = filename:dirname(<<"/usr">>),
     ok.
-    
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -641,10 +615,9 @@ extension_bin(Config) when is_list(Config) ->
     <<"">> = filename:extension(<<"A:/usr/foo">>),
     case os:type() of
         {win32, _} ->
-            ?line <<"">> = filename:extension(<<"A:\\usr\\foo">>),
-            ?line <<".erl">> =
-                filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
-            ?line <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
+            <<"">> = filename:extension(<<"A:\\usr\\foo">>),
+            <<".erl">> = filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
+            <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
             ok;
         _ -> ok
     end.
@@ -652,22 +625,22 @@ extension_bin(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     
 join_bin(Config) when is_list(Config) ->
-    ?line <<"/">> = filename:join([<<"/">>]),
-    ?line <<"/">> = filename:join([<<"//">>]),
-    ?line <<"usr/foo.erl">> = filename:join(<<"usr">>,<<"foo.erl">>),
-    ?line <<"/src/foo.erl">> = filename:join(usr, <<"/src/foo.erl">>),
-    ?line <<"/src/foo.erl">> = filename:join([<<"/src/">>,'foo.erl']),
-    ?line <<"/src/foo.erl">> = filename:join(<<"usr">>, ["/sr", 'c/foo.erl']),
-    ?line <<"/src/foo.erl">> = filename:join(<<"usr">>, <<"/src/foo.erl">>),
+    <<"/">> = filename:join([<<"/">>]),
+    <<"/">> = filename:join([<<"//">>]),
+    <<"usr/foo.erl">> = filename:join(<<"usr">>,<<"foo.erl">>),
+    <<"/src/foo.erl">> = filename:join(usr, <<"/src/foo.erl">>),
+    <<"/src/foo.erl">> = filename:join([<<"/src/">>,'foo.erl']),
+    <<"/src/foo.erl">> = filename:join(<<"usr">>, ["/sr", 'c/foo.erl']),
+    <<"/src/foo.erl">> = filename:join(<<"usr">>, <<"/src/foo.erl">>),
 
     %% Make sure that redundant slashes work too.
-    ?line <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c/////d//e/f/g">>]),
-    ?line <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c/">>, <<"d//e/f/g">>]),
-    ?line <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"d//e/f/g">>]),
-    ?line <<"/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"/d//e/f/g">>]),
-    ?line <<"/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"//d//e/f/g">>]),
+    <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c/////d//e/f/g">>]),
+    <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c/">>, <<"d//e/f/g">>]),
+    <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"d//e/f/g">>]),
+    <<"/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"/d//e/f/g">>]),
+    <<"/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"//d//e/f/g">>]),
 
-    ?line <<"foo/bar">> = filename:join([$f,$o,$o,$/,[]], <<"bar">>),
+    <<"foo/bar">> = filename:join([$f,$o,$o,$/,[]], <<"bar">>),
 
     %% Single dots - should be removed if in the middle of the path,
     %% but not at the end of the path.
@@ -716,30 +689,25 @@ join_bin(Config) when is_list(Config) ->
     <<"/a/b">> = filename:join([<<"/a/">>,<<"b/">>]),
     <<"/a/b">> = filename:join(<<"/a/">>,<<"b/">>),
 
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line <<"d:/">> = filename:join([<<"D:/">>]),
-		  ?line <<"d:/">> = filename:join([<<"D:\\">>]),
-		  ?line <<"d:/abc">> = filename:join([<<"D:/">>, <<"abc">>]),
-		  ?line <<"d:abc">> = filename:join([<<"D:">>, <<"abc">>]),
-		  ?line <<"a/b/c/d/e/f/g">> =
-		      filename:join([<<"a//b\\c//\\/\\d/\\e/f\\g">>]),
-		  ?line <<"a:usr/foo.erl">> =
-		      filename:join([<<"A:">>,<<"usr">>,<<"foo.erl">>]),
-		  ?line <<"/usr/foo.erl">> =
-		      filename:join([<<"A:">>,<<"/usr">>,<<"foo.erl">>]),
-		  ?line <<"c:usr">> = filename:join(<<"A:">>,<<"C:usr">>),
-		  ?line <<"a:usr">> = filename:join(<<"A:">>,<<"usr">>),
-		  ?line <<"c:/usr">> = filename:join(<<"A:">>, <<"C:/usr">>),
-		  ?line <<"c:/usr/foo.erl">> =
-		      filename:join([<<"A:">>,<<"C:/usr">>,<<"foo.erl">>]),
-		  ?line <<"c:usr/foo.erl">> =
-		      filename:join([<<"A:">>,<<"C:usr">>,<<"foo.erl">>]),
-		  ?line <<"d:/foo">> = filename:join([$D, $:, $/, []], <<"foo">>),
-		  ok;
-	      _ ->
-		  ok
-	  end.
+    case os:type() of
+        {win32, _} ->
+            <<"d:/">> = filename:join([<<"D:/">>]),
+            <<"d:/">> = filename:join([<<"D:\\">>]),
+            <<"d:/abc">> = filename:join([<<"D:/">>, <<"abc">>]),
+            <<"d:abc">> = filename:join([<<"D:">>, <<"abc">>]),
+            <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b\\c//\\/\\d/\\e/f\\g">>]),
+            <<"a:usr/foo.erl">> = filename:join([<<"A:">>,<<"usr">>,<<"foo.erl">>]),
+            <<"/usr/foo.erl">> = filename:join([<<"A:">>,<<"/usr">>,<<"foo.erl">>]),
+            <<"c:usr">> = filename:join(<<"A:">>,<<"C:usr">>),
+            <<"a:usr">> = filename:join(<<"A:">>,<<"usr">>),
+            <<"c:/usr">> = filename:join(<<"A:">>, <<"C:/usr">>),
+            <<"c:/usr/foo.erl">> = filename:join([<<"A:">>,<<"C:/usr">>,<<"foo.erl">>]),
+            <<"c:usr/foo.erl">> = filename:join([<<"A:">>,<<"C:usr">>,<<"foo.erl">>]),
+            <<"d:/foo">> = filename:join([$D, $:, $/, []], <<"foo">>),
+            ok;
+        _ ->
+            ok
+    end.
 
 pathtype_bin(Config) when is_list(Config) ->
     relative = filename:pathtype(<<"..">>),
@@ -747,14 +715,14 @@ pathtype_bin(Config) when is_list(Config) ->
     relative = filename:pathtype(<<"foo/bar">>),
     relative = filename:pathtype('foo/bar'),
     case os:type() of
-	{win32, _} ->
-	    volumerelative = filename:pathtype(<<"/usr/local/bin">>),
-	    volumerelative = filename:pathtype(<<"A:usr/local/bin">>),
-	    ok;
-	_ ->
-	    absolute = filename:pathtype(<<"/">>),
-	    absolute = filename:pathtype(<<"/usr/local/bin">>),
-	    ok
+        {win32, _} ->
+            volumerelative = filename:pathtype(<<"/usr/local/bin">>),
+            volumerelative = filename:pathtype(<<"A:usr/local/bin">>),
+            ok;
+        _ ->
+            absolute = filename:pathtype(<<"/">>),
+            absolute = filename:pathtype(<<"/usr/local/bin">>),
+            ok
     end.
 
 rootname_bin(Config) when is_list(Config) ->
@@ -773,29 +741,204 @@ split_bin(Config) when is_list(Config) ->
     [<<"/">>] = filename:split(<<"/">>),
     [] = filename:split(<<"">>),
     case os:type() of
-       {win32,_} ->
-	    [<<"a:/">>,<<"msdev">>,<<"include">>] =
-		filename:split(<<"a:/msdev/include">>),
-	    [<<"a:/">>,<<"msdev">>,<<"include">>] =
-		filename:split(<<"A:/msdev/include">>),
-	    [<<"msdev">>,<<"include">>] =
-		filename:split(<<"msdev\\include">>),
-	    [<<"a:/">>,<<"msdev">>,<<"include">>] =
-		filename:split(<<"a:\\msdev\\include">>),
-	    [<<"a:">>,<<"msdev">>,<<"include">>] =
-		filename:split(<<"a:msdev\\include">>),
-	    ok;
-       _ ->
-	    ok
+        {win32,_} ->
+            [<<"a:/">>,<<"msdev">>,<<"include">>] =
+                filename:split(<<"a:/msdev/include">>),
+            [<<"a:/">>,<<"msdev">>,<<"include">>] =
+                filename:split(<<"A:/msdev/include">>),
+            [<<"msdev">>,<<"include">>] =
+                filename:split(<<"msdev\\include">>),
+            [<<"a:/">>,<<"msdev">>,<<"include">>] =
+                filename:split(<<"a:\\msdev\\include">>),
+            [<<"a:">>,<<"msdev">>,<<"include">>] =
+                filename:split(<<"a:msdev\\include">>),
+            ok;
+        _ ->
+            ok
     end.
 
 t_nativename_bin(Config) when is_list(Config) ->
-    ?line <<"abcedf">> = filename:nativename(<<"abcedf">>),
+    <<"abcedf">> = filename:nativename(<<"abcedf">>),
+    case os:type() of
+        {win32, _} ->
+            <<"a:\\temp\\arne.exe">> =
+                filename:nativename(<<"A:/temp//arne.exe/">>);
+        _ ->
+            <<"/usr/tmp/arne">> =
+                filename:nativename(<<"/usr/tmp//arne/">>)
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% basedirs
+t_basedir_api(Config) when is_list(Config) ->
+    true = is_list(filename:basedir(site_data, "My App")),
+    true = is_list(filename:basedir(site_config, "My App")),
+    true = is_list(filename:basedir(user_data, "My App")),
+    true = is_list(filename:basedir(user_log, "My App")),
+    true = is_list(filename:basedir(user_config, "My App")),
+    true = is_list(filename:basedir(user_cache, "My App")),
+
+    true = is_list(filename:basedir(site_data, <<"My App">>)),
+    true = is_list(filename:basedir(site_config, <<"My App">>)),
+    true = is_binary(filename:basedir(user_data, <<"My App">>)),
+    true = is_binary(filename:basedir(user_log, <<"My App">>)),
+    true = is_binary(filename:basedir(user_config, <<"My App">>)),
+    true = is_binary(filename:basedir(user_cache, <<"My App">>)),
+
+    %% simulate for windows
+    case os:type() of
+        {win32,_} -> ok;
+        _ ->
+            os:putenv("APPDATA", "C:\\Documents and Settings\\otptest\\Application Data")
+    end,
+
+    true = is_list(filename:basedir(site_data, "My App", #{})),
+    true = is_list(filename:basedir(site_config, "My App", #{os=>linux})),
+    true = is_list(filename:basedir(user_data, "My App", #{os=>darwin})),
+    true = is_list(filename:basedir(user_log, "My App", #{os=>windows})),
+    true = is_list(filename:basedir(user_config, "My App",#{author=>"Erl"})),
+    true = is_list(filename:basedir(user_config, "My App",#{os=>darwin,
+                                                            author=>"Erl"})),
+    true = is_list(filename:basedir(user_config, "My App",#{os=>linux,
+                                                            author=>"Erl"})),
+    true = is_list(filename:basedir(user_cache, "My App",#{os=>windows,
+                                                           author=>"Erl"})),
+    true = is_list(filename:basedir(user_config, "My App",#{os=>darwin,
+                                                            author=>"Erla",
+                                                            version=>"1.0"})),
+    true = is_list(filename:basedir(user_config, "My App",#{os=>linux,
+                                                            version=>"2.0.1",
+                                                            author=>"Erl"})),
+    true = is_list(filename:basedir(user_cache, "My App",#{os=>windows,
+                                                           version=>"3.1.2",
+                                                           author=>"Erl"})),
+    true = is_binary(filename:basedir(user_config, "My App",#{os=>darwin,
+                                                              author=>"Erla",
+                                                              version=><<"1.0">>})),
+    true = is_binary(filename:basedir(user_config, "My App",#{os=>windows,
+                                                              version=>"2.0.1",
+                                                              author=><<"Erl">>})),
+    true = is_binary(filename:basedir(user_cache, "My App",#{os=>linux,
+                                                             version=><<"3.1.2">>,
+                                                             author=>"Erl"})),
+    %% simulate for windows
+    case os:type() of
+        {win32,_} -> ok;
+        _ -> os:unsetenv("APPDATA")
+    end,
+
+    {'EXIT', _} = (catch filename:basedir(wrong_config, "My App")),
+    {'EXIT', _} = (catch filename:basedir(user_cache, {bad,name})),
+    {'EXIT', _} = (catch filename:basedir(user_cache, "My App", badopts)),
+    {'EXIT', _} = (catch filename:basedir(user_cache, "My App", [])),
+    ok.
+
+t_basedir_windows(Config) when is_list(Config) ->
+    Types = [user_data,user_log,user_config,user_cache],
     case os:type() of
-	{win32, _} ->
-	    ?line <<"a:\\temp\\arne.exe">> =
-		filename:nativename(<<"A:/temp//arne.exe/">>);
-	_ ->
-	    ?line <<"/usr/tmp/arne">> =
-		filename:nativename(<<"/usr/tmp//arne/">>)
+        {win32,_} ->
+            ok = check_basedir_windows(Types, #{});
+        _ ->
+            %% Windows 7 and beyond
+            os:putenv("APPDATA", "C:\\Users\\otptest\\AppData\\Roaming"),
+            os:putenv("LOCALAPPDATA", "C:\\Users\\otptest\\AppData\\Local"),
+            io:format("APPDATA ~p~n", [os:getenv("APPDATA")]),
+            io:format("LOCALAPPDATA ~p~n", [os:getenv("LOCALAPPDATA")]),
+            ok = check_basedir_windows(Types,#{os=>windows}),
+            %% Windows XP
+            os:unsetenv("LOCALAPPDATA"),
+            os:putenv("APPDATA", "C:\\Documents and Settings\\otptest\\Application Data"),
+            io:format("APPDATA ~p~n", [os:getenv("APPDATA")]),
+            io:format("APPLOCALDATA ~p~n", [os:getenv("APPLOCALDATA")]),
+            ok = check_basedir_windows(Types,#{os=>windows}),
+            os:unsetenv("APPDATA")
+    end,
+    ok.
+
+check_basedir_windows([],_) -> ok;
+check_basedir_windows([Type|Types],Opt) ->
+    Name = "Some Application",
+    io:format("type: ~p~n", [Type]),
+    ok = check_basedir_windows_path(Type,
+                                    [Name],
+                                    filename:basedir(Type, Name, Opt)),
+    ok = check_basedir_windows_path(Type,
+                                    ["Erl",Name],
+                                    filename:basedir(Type, Name, Opt#{author=>"Erl"})),
+    ok = check_basedir_windows_path(Type,
+                                    [Name,"1.0"],
+                                    filename:basedir(Type, Name, Opt#{version=>"1.0"})),
+    ok = check_basedir_windows_path(Type,
+                                    ["Erl",Name,"1.0"],
+                                    filename:basedir(Type, Name, Opt#{author=>"Erl",
+                                                                      version=>"1.0"})),
+    check_basedir_windows(Types, Opt).
+
+check_basedir_windows_path(Type,Check0,Basedir) ->
+    BDR = lists:reverse(filename:split(Basedir)),
+    Check = lists:reverse(Check0),
+    io:format("~w: ~p ~p~n", [Type,Check,BDR]),
+    case Type of
+        user_log -> check_basedir_windows_path_split(["Logs"|Check],BDR);
+        user_cache -> check_basedir_windows_path_split(["Cache"|Check],BDR);
+        _ -> check_basedir_windows_path_split(Check,BDR)
+    end.
+
+check_basedir_windows_path_split([],_) -> ok;
+check_basedir_windows_path_split([Same|Check],[Same|BDR]) ->
+    check_basedir_windows_path_split(Check,BDR).
+
+
+t_basedir_xdg(Config) when is_list(Config) ->
+    check_basedir_xdg([user_data,user_log,user_config,user_cache,
+                       site_data,site_config]),
+    ok.
+
+check_basedir_xdg([]) -> ok;
+check_basedir_xdg([Type|Types]) ->
+    Name = "some_app",
+    Opt  = #{os=>linux},
+    Key  = basedir_xdg_env(Type),
+    io:format("type: ~p~n", [Type]),
+    Home = os:getenv("HOME"),
+    NDir = "/some/absolute/path",
+    DefPath = basedir_xdg_def(Type,Home,Name),
+    EnvPath = case Type of
+                  user_log    -> filename:join([NDir,Name,"log"]);
+                  site_data   -> [filename:join([NDir,Name])];
+                  site_config -> [filename:join([NDir,Name])];
+                  _           -> filename:join([NDir,Name])
+              end,
+    os:unsetenv(Key),
+    ok = check_basedir(Type, DefPath, filename:basedir(Type, Name, Opt)),
+    os:putenv(Key, NDir),
+    ok = check_basedir(Type, EnvPath, filename:basedir(Type, Name, Opt)),
+    os:unsetenv(Key),
+    ok = check_basedir(Type, DefPath, filename:basedir(Type, Name, Opt)),
+    check_basedir_xdg(Types).
+
+check_basedir(Type, Path, Basedir) ->
+    io:format("~w: ~p = ~p~n", [Type,Path,Basedir]),
+    Path = Basedir,
+    ok.
+
+basedir_xdg_env(Type) ->
+    case Type of
+        user_data   -> "XDG_DATA_HOME";
+        user_config -> "XDG_CONFIG_HOME";
+        user_cache  -> "XDG_CACHE_HOME";
+        user_log    -> "XDG_CACHE_HOME";
+        site_data   -> "XDG_DATA_DIRS";
+        site_config -> "XDG_CONFIG_DIRS"
+    end.
+
+basedir_xdg_def(Type,Home,Name) ->
+    case Type of
+        user_data   -> filename:join([Home,".local","share",Name]);
+        user_config -> filename:join([Home,".config",Name]);
+        user_cache  -> filename:join([Home,".cache",Name]);
+        user_log    -> filename:join([Home,".cache",Name,"log"]);
+        site_data   -> [filename:join([Dir,Name]) ||
+                        Dir <- ["/usr/local/share/","/usr/share/"]];
+        site_config -> [filename:join(["/etc/xdg",Name])]
     end.
diff --git a/lib/stdlib/test/fixtable_SUITE.erl b/lib/stdlib/test/fixtable_SUITE.erl
index cf716032a1..de100a11d6 100644
--- a/lib/stdlib/test/fixtable_SUITE.erl
+++ b/lib/stdlib/test/fixtable_SUITE.erl
@@ -33,7 +33,9 @@
 %%% Internal exports
 -export([command_loop/0,start_commander/0]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [multiple_fixes, multiple_processes,
@@ -56,7 +58,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %%% I wrote this thinking I would use more than one temporary at a time, but 
 %%% I wasn't... Well, maybe in the future...
@@ -68,14 +70,11 @@ end_per_group(_GroupName, Config) ->
 -define(HELPER_NODE, (atom_to_list(?MODULE) ++ "_helper1")).
 
 init_per_testcase(_Func, Config) ->
-    PrivDir = ?config(priv_dir,Config),    
+    PrivDir = proplists:get_value(priv_dir,Config),
     file:make_dir(PrivDir),
-    Dog=test_server:timetrap(test_server:seconds(60)),
-    [{watchdog, Dog}|Config].
+    Config.
 
 end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
     lists:foreach(fun(X) ->
 			  (catch dets:close(X)),
 			  (catch file:delete(dets_filename(X,Config)))
@@ -98,302 +97,280 @@ show(Term, Line) ->
 -endif.
 
 
-fixbag(doc) ->
-    ["Check for bug OTP-5087, safe_fixtable for bags could give "
-     "incorrect lookups"];
-fixbag(suite) ->
-    [];
+%% Check for bug OTP-5087; safe_fixtable for bags could give incorrect
+%% lookups.
 fixbag(Config) when is_list(Config) ->
-    ?line T = ets:new(x,[bag]),
-    ?line ets:insert(T,{a,1}),
-    ?line ets:insert(T,{a,2}),
-    ?line ets:safe_fixtable(T,true),
-    ?line ets:match_delete(T,{a,2}),
-    ?line ets:insert(T,{a,3}),
-    ?line Res = ets:lookup(T,a),
-    ?line ets:safe_fixtable(T,false),
-    ?line Res = ets:lookup(T,a),
+    T = ets:new(x,[bag]),
+    ets:insert(T,{a,1}),
+    ets:insert(T,{a,2}),
+    ets:safe_fixtable(T,true),
+    ets:match_delete(T,{a,2}),
+    ets:insert(T,{a,3}),
+    Res = ets:lookup(T,a),
+    ets:safe_fixtable(T,false),
+    Res = ets:lookup(T,a),
     ok.
 
 
 
-insert_same_key(doc) ->
-    ["Check correct behaviour if a key is deleted and reinserted during fixation."];
-insert_same_key(suite) ->
-    [];
+%% Check correct behaviour if a key is deleted and reinserted during
+%% fixation.
 insert_same_key(Config) when is_list(Config) ->
-    ?line {ok,Dets1} = dets:open_file(?DETS_TMP1,
-			       [{file, dets_filename(?DETS_TMP1,Config)}]),
-    ?line Ets1 = ets:new(ets,[]),
-    ?line insert_same_key(Dets1,dets,Config),
-    ?line insert_same_key(Ets1,ets,Config),
-    ?line ets:insert(Ets1,{1,2}),
-    ?line 1 = ets:info(Ets1,size),
-    ?line dets:insert(Dets1,{1,2}),
-    ?line 1 = dets:info(Dets1,size),
-    ?line dets:close(Dets1),
-    ?line (catch file:delete(dets_filename(Dets1,Config))),
-    ?line ets:delete(Ets1),
-    ?line {ok,Dets2} = dets:open_file(?DETS_TMP1,
-			       [{type,bag},{file, dets_filename(?DETS_TMP1,Config)}]),
-    ?line Ets2 = ets:new(ets,[bag]),
-    ?line insert_same_key(Dets2,dets,Config),
-    ?line insert_same_key(Ets2,ets,Config),
-    ?line ets:insert(Ets2,{1,2}),
-    ?line 2 = ets:info(Ets2,size),
-    ?line ets:insert(Ets2,{1,2}),
-    ?line 2 = ets:info(Ets2,size),
-    ?line dets:insert(Dets2,{1,2}),
-    ?line 2 = dets:info(Dets2,size),
-    ?line dets:insert(Dets2,{1,2}),
-    ?line 2 = dets:info(Dets2,size),
-    ?line dets:close(Dets2),
-    ?line (catch file:delete(dets_filename(Dets2,Config))),
-    ?line ets:delete(Ets2),
-    ?line {ok,Dets3} = dets:open_file(?DETS_TMP1,
-			       [{type,duplicate_bag},
-				{file, dets_filename(?DETS_TMP1,Config)}]),
-    ?line Ets3 = ets:new(ets,[duplicate_bag]),
-    ?line insert_same_key(Dets3,dets,Config),
-    ?line insert_same_key(Ets3,ets,Config),
-    ?line ets:insert(Ets3,{1,2}),
-    ?line 2 = ets:info(Ets3,size),
-    ?line ets:insert(Ets3,{1,2}),
-    ?line 3 = ets:info(Ets3,size),
-    ?line dets:insert(Dets3,{1,2}),
-    ?line 2 = dets:info(Dets3,size),
-    ?line dets:insert(Dets3,{1,2}),
-    ?line 3 = dets:info(Dets3,size),
-    ?line dets:close(Dets3),
-    ?line (catch file:delete(dets_filename(Dets3,Config))),
-    ?line ets:delete(Ets3),
+    {ok,Dets1} = dets:open_file(?DETS_TMP1,
+				[{file, dets_filename(?DETS_TMP1,Config)}]),
+    Ets1 = ets:new(ets,[]),
+    insert_same_key(Dets1,dets,Config),
+    insert_same_key(Ets1,ets,Config),
+    ets:insert(Ets1,{1,2}),
+    1 = ets:info(Ets1,size),
+    dets:insert(Dets1,{1,2}),
+    1 = dets:info(Dets1,size),
+    dets:close(Dets1),
+    (catch file:delete(dets_filename(Dets1,Config))),
+    ets:delete(Ets1),
+    {ok,Dets2} = dets:open_file(?DETS_TMP1,
+				[{type,bag},{file, dets_filename(?DETS_TMP1,Config)}]),
+    Ets2 = ets:new(ets,[bag]),
+    insert_same_key(Dets2,dets,Config),
+    insert_same_key(Ets2,ets,Config),
+    ets:insert(Ets2,{1,2}),
+    2 = ets:info(Ets2,size),
+    ets:insert(Ets2,{1,2}),
+    2 = ets:info(Ets2,size),
+    dets:insert(Dets2,{1,2}),
+    2 = dets:info(Dets2,size),
+    dets:insert(Dets2,{1,2}),
+    2 = dets:info(Dets2,size),
+    dets:close(Dets2),
+    (catch file:delete(dets_filename(Dets2,Config))),
+    ets:delete(Ets2),
+    {ok,Dets3} = dets:open_file(?DETS_TMP1,
+				[{type,duplicate_bag},
+				 {file, dets_filename(?DETS_TMP1,Config)}]),
+    Ets3 = ets:new(ets,[duplicate_bag]),
+    insert_same_key(Dets3,dets,Config),
+    insert_same_key(Ets3,ets,Config),
+    ets:insert(Ets3,{1,2}),
+    2 = ets:info(Ets3,size),
+    ets:insert(Ets3,{1,2}),
+    3 = ets:info(Ets3,size),
+    dets:insert(Dets3,{1,2}),
+    2 = dets:info(Dets3,size),
+    dets:insert(Dets3,{1,2}),
+    3 = dets:info(Dets3,size),
+    dets:close(Dets3),
+    (catch file:delete(dets_filename(Dets3,Config))),
+    ets:delete(Ets3),
     ok.
 
 insert_same_key(Tab,Mod,_Config) ->
-    ?line Mod:insert(Tab,{1,1}),
-    ?line Mod:insert(Tab,{1,2}),
-    ?line Mod:insert(Tab,{2,2}),
-    ?line Mod:insert(Tab,{2,2}),
-    ?line Mod:safe_fixtable(Tab,true),
-    ?line Mod:delete(Tab,1),
-    ?line Mod:insert(Tab,{1,1}),
-    ?line Expect = case Mod:info(Tab,type) of
-	      bag ->
-		  Mod:insert(Tab,{1,2}),
-		  2;
-	      _ -> 
-		  1
-	  end,
-    ?line Mod:delete(Tab,2),
-    ?line Mod:safe_fixtable(Tab,false),
-    ?line case Mod:info(Tab,size) of
-	      Expect ->
-		  ok;
-	      _ -> 
-		  exit({size_field_wrong,{Mod,Mod:info(Tab)}})
-	  end.
-    
-    
-
-
-owner_dies(doc) ->
-    ["Check correct behaviour if the table owner dies."];
-owner_dies(suite) ->
-    [];
+    Mod:insert(Tab,{1,1}),
+    Mod:insert(Tab,{1,2}),
+    Mod:insert(Tab,{2,2}),
+    Mod:insert(Tab,{2,2}),
+    Mod:safe_fixtable(Tab,true),
+    Mod:delete(Tab,1),
+    Mod:insert(Tab,{1,1}),
+    Expect = case Mod:info(Tab,type) of
+		 bag ->
+		     Mod:insert(Tab,{1,2}),
+		     2;
+		 _ ->
+		     1
+	     end,
+    Mod:delete(Tab,2),
+    Mod:safe_fixtable(Tab,false),
+    case Mod:info(Tab,size) of
+	Expect ->
+	    ok;
+	_ ->
+	    exit({size_field_wrong,{Mod,Mod:info(Tab)}})
+    end.
+
+
+
+
+%% Check correct behaviour if the table owner dies.
 owner_dies(Config) when is_list(Config) ->
-    ?line P1 = start_commander(),
-    ?line Ets1 = command(P1,{ets,new,[ets,[]]}),
-    ?line command(P1,{ets,safe_fixtable,[Ets1,true]}),
-    ?line {_,[{P1,1}]} = ets:info(Ets1, safe_fixed),
-    ?line stop_commander(P1),
-    ?line undefined = ets:info(Ets1, safe_fixed),
-    ?line P2 = start_commander(),
-    ?line Ets2 = command(P2,{ets,new,[ets,[public]]}),
-    ?line command(P2,{ets,safe_fixtable,[Ets2,true]}),
-    ?line ets:safe_fixtable(Ets2,true),
-    ?line true = ets:info(Ets2, fixed),
-    ?line {_,[{_,1},{_,1}]} = ets:info(Ets2, safe_fixed),
-    ?line stop_commander(P2),
-    ?line undefined = ets:info(Ets2, safe_fixed),
-    ?line undefined = ets:info(Ets2, fixed),
-    ?line P3 = start_commander(),
-    ?line {ok,Dets} = ?LOG(command(P3, {dets, open_file, 
-					[?DETS_TMP1,
-					 [{file, 
-					   dets_filename(?DETS_TMP1,
-							 Config)}]]})),
-    ?line command(P3, {dets, safe_fixtable, [Dets, true]}),
-    ?line {_,[{P3,1}]} = dets:info(Dets, safe_fixed),
-    ?line true = dets:info(Dets, fixed),
-    ?line stop_commander(P3),
-    ?line undefined = dets:info(Dets, safe_fixed),
-    ?line undefined = dets:info(Dets, fixed),
-    ?line P4 = start_commander(),
-    ?line {ok,Dets} = command(P4, {dets, open_file, 
+    P1 = start_commander(),
+    Ets1 = command(P1,{ets,new,[ets,[]]}),
+    command(P1,{ets,safe_fixtable,[Ets1,true]}),
+    {_,[{P1,1}]} = ets:info(Ets1, safe_fixed),
+    stop_commander(P1),
+    undefined = ets:info(Ets1, safe_fixed),
+    P2 = start_commander(),
+    Ets2 = command(P2,{ets,new,[ets,[public]]}),
+    command(P2,{ets,safe_fixtable,[Ets2,true]}),
+    ets:safe_fixtable(Ets2,true),
+    true = ets:info(Ets2, fixed),
+    {_,[{_,1},{_,1}]} = ets:info(Ets2, safe_fixed),
+    stop_commander(P2),
+    undefined = ets:info(Ets2, safe_fixed),
+    undefined = ets:info(Ets2, fixed),
+    P3 = start_commander(),
+    {ok,Dets} = ?LOG(command(P3, {dets, open_file,
+				  [?DETS_TMP1,
+				   [{file,
+				     dets_filename(?DETS_TMP1,
+						   Config)}]]})),
+    command(P3, {dets, safe_fixtable, [Dets, true]}),
+    {_,[{P3,1}]} = dets:info(Dets, safe_fixed),
+    true = dets:info(Dets, fixed),
+    stop_commander(P3),
+    undefined = dets:info(Dets, safe_fixed),
+    undefined = dets:info(Dets, fixed),
+    P4 = start_commander(),
+    {ok,Dets} = command(P4, {dets, open_file,
 			     [?DETS_TMP1,
 			      [{file, dets_filename(?DETS_TMP1,Config)}]]}),
-    ?line {ok,Dets} = dets:open_file(?DETS_TMP1,
+    {ok,Dets} = dets:open_file(?DETS_TMP1,
 			       [{file, dets_filename(?DETS_TMP1,Config)}]),
-    ?line false = dets:info(Dets, safe_fixed),
-    ?line command(P4, {dets, safe_fixtable, [Dets, true]}),
-    ?line dets:safe_fixtable(Dets, true),
-    ?line {_,[{_,1},{_,1}]} = dets:info(Dets, safe_fixed),
-    ?line dets:safe_fixtable(Dets, true),
-    ?line stop_commander(P4),
-    ?line S = self(),
-    ?line {_,[{S,2}]} = dets:info(Dets, safe_fixed),
-    ?line true = dets:info(Dets, fixed),
-    ?line dets:close(Dets),
-    ?line undefined = dets:info(Dets, fixed),
-    ?line undefined = dets:info(Dets, safe_fixed),
+    false = dets:info(Dets, safe_fixed),
+    command(P4, {dets, safe_fixtable, [Dets, true]}),
+    dets:safe_fixtable(Dets, true),
+    {_,[{_,1},{_,1}]} = dets:info(Dets, safe_fixed),
+    dets:safe_fixtable(Dets, true),
+    stop_commander(P4),
+    S = self(),
+    {_,[{S,2}]} = dets:info(Dets, safe_fixed),
+    true = dets:info(Dets, fixed),
+    dets:close(Dets),
+    undefined = dets:info(Dets, fixed),
+    undefined = dets:info(Dets, safe_fixed),
     ok.
-   
-
-other_process_closes(doc) ->
-    ["When another process closes an dets table, different "
-     "things should happen depending on if it has opened it before."];
 
-other_process_closes(suite) ->
-    [];
 
+%% When another process closes an dets table, different things should
+%% happen depending on if it has opened it before.
 other_process_closes(Config) when is_list(Config) ->
-    ?line {ok,Dets} = dets:open_file(?DETS_TMP1,
+    {ok,Dets} = dets:open_file(?DETS_TMP1,
 			       [{file, dets_filename(tmp1,Config)}]),
-    ?line P2 = start_commander(),
-    ?line dets:safe_fixtable(Dets,true),
-    ?line S = self(),
-    ?line {_,[{S,1}]} = dets:info(Dets, safe_fixed),
-    ?line command(P2,{dets, safe_fixtable, [Dets, true]}),
-    ?line {_,[_,_]} = dets:info(Dets, safe_fixed),
-    ?line {error, not_owner} = command(P2,{dets, close, [Dets]}),
-    ?line {_,[_,_]} = dets:info(Dets, safe_fixed),
-    ?line command(P2,{dets, open_file,[?DETS_TMP1,
+    P2 = start_commander(),
+    dets:safe_fixtable(Dets,true),
+    S = self(),
+    {_,[{S,1}]} = dets:info(Dets, safe_fixed),
+    command(P2,{dets, safe_fixtable, [Dets, true]}),
+    {_,[_,_]} = dets:info(Dets, safe_fixed),
+    {error, not_owner} = command(P2,{dets, close, [Dets]}),
+    {_,[_,_]} = dets:info(Dets, safe_fixed),
+    command(P2,{dets, open_file,[?DETS_TMP1,
 				 [{file, 
 				   dets_filename(?DETS_TMP1, Config)}]]}),
-    ?line {_,[_,_]} = dets:info(Dets, safe_fixed),
-    ?line command(P2,{dets, close, [Dets]}),
-    ?line stop_commander(P2),
-    ?line {_,[{S,1}]} = dets:info(Dets, safe_fixed),
-    ?line true = dets:info(Dets,fixed),
-    ?line dets:close(Dets),
-    ?line undefined = dets:info(Dets,fixed),
-    ?line undefined = dets:info(Dets, safe_fixed),
+    {_,[_,_]} = dets:info(Dets, safe_fixed),
+    command(P2,{dets, close, [Dets]}),
+    stop_commander(P2),
+    {_,[{S,1}]} = dets:info(Dets, safe_fixed),
+    true = dets:info(Dets,fixed),
+    dets:close(Dets),
+    undefined = dets:info(Dets,fixed),
+    undefined = dets:info(Dets, safe_fixed),
     ok.
-    
-other_process_deletes(doc) ->
-    ["Check that fixtable structures are cleaned up if another process "
-     "deletes an ets table"];
-other_process_deletes(suite) ->
-    [];
+
+%% Check that fixtable structures are cleaned up if another process
+%% deletes an ets table.
 other_process_deletes(Config) when is_list(Config) ->
-    ?line Ets = ets:new(ets,[public]),
-    ?line P = start_commander(),
-    ?line ets:safe_fixtable(Ets,true),
-    ?line ets:safe_fixtable(Ets,true),
-    ?line true = ets:info(Ets, fixed),
-    ?line {_,_} = ets:info(Ets, safe_fixed),
-    ?line command(P,{ets,delete,[Ets]}),
-    ?line stop_commander(P),
-    ?line undefined = ets:info(Ets, fixed),
-    ?line undefined = ets:info(Ets, safe_fixed),
+    Ets = ets:new(ets,[public]),
+    P = start_commander(),
+    ets:safe_fixtable(Ets,true),
+    ets:safe_fixtable(Ets,true),
+    true = ets:info(Ets, fixed),
+    {_,_} = ets:info(Ets, safe_fixed),
+    command(P,{ets,delete,[Ets]}),
+    stop_commander(P),
+    undefined = ets:info(Ets, fixed),
+    undefined = ets:info(Ets, safe_fixed),
     ok.
 
-multiple_fixes(doc) ->
-    ["Check that multiple safe_fixtable keeps the reference counter."];
-multiple_fixes(suite) ->
-    [];
+%% Check that multiple safe_fixtable keeps the reference counter.
 multiple_fixes(Config) when is_list(Config) ->
-    ?line {ok,Dets} = dets:open_file(?DETS_TMP1,
+    {ok,Dets} = dets:open_file(?DETS_TMP1,
 			       [{file, dets_filename(?DETS_TMP1,Config)}]),
-    ?line Ets = ets:new(ets,[]),
-    ?line multiple_fixes(Dets,dets),
-    ?line multiple_fixes(Ets,ets),
-    ?line dets:close(Dets),
+    Ets = ets:new(ets,[]),
+    multiple_fixes(Dets,dets),
+    multiple_fixes(Ets,ets),
+    dets:close(Dets),
     ok.
 
 multiple_fixes(Tab, Mod) ->
-    ?line false = Mod:info(Tab,fixed),
-    ?line false = Mod:info(Tab, safe_fixed),
-    ?line Mod:safe_fixtable(Tab, true),
-    ?line true = Mod:info(Tab,fixed),
-    ?line S = self(),
-    ?line {_,[{S,1}]} = Mod:info(Tab, safe_fixed),
-    ?line Mod:safe_fixtable(Tab, true),
-    ?line Mod:safe_fixtable(Tab, true),
-    ?line {_,[{S,3}]} = Mod:info(Tab, safe_fixed),
-    ?line true = Mod:info(Tab,fixed),
-    ?line Mod:safe_fixtable(Tab, false),
-    ?line {_,[{S,2}]} = Mod:info(Tab, safe_fixed),
-    ?line true = Mod:info(Tab,fixed),
-    ?line Mod:safe_fixtable(Tab, false),
-    ?line {_,[{S,1}]} = Mod:info(Tab, safe_fixed),
-    ?line true = Mod:info(Tab,fixed),
-    ?line Mod:safe_fixtable(Tab, false),
-    ?line false = Mod:info(Tab, safe_fixed),
-    ?line false = Mod:info(Tab,fixed).
-
-multiple_processes(doc) ->
-    ["Check that multiple safe_fixtable across processes are reference "
-     "counted OK"];
-multiple_processes(suite) ->
-    [];
+    false = Mod:info(Tab,fixed),
+    false = Mod:info(Tab, safe_fixed),
+    Mod:safe_fixtable(Tab, true),
+    true = Mod:info(Tab,fixed),
+    S = self(),
+    {_,[{S,1}]} = Mod:info(Tab, safe_fixed),
+    Mod:safe_fixtable(Tab, true),
+    Mod:safe_fixtable(Tab, true),
+    {_,[{S,3}]} = Mod:info(Tab, safe_fixed),
+    true = Mod:info(Tab,fixed),
+    Mod:safe_fixtable(Tab, false),
+    {_,[{S,2}]} = Mod:info(Tab, safe_fixed),
+    true = Mod:info(Tab,fixed),
+    Mod:safe_fixtable(Tab, false),
+    {_,[{S,1}]} = Mod:info(Tab, safe_fixed),
+    true = Mod:info(Tab,fixed),
+    Mod:safe_fixtable(Tab, false),
+    false = Mod:info(Tab, safe_fixed),
+    false = Mod:info(Tab,fixed).
+
+%% Check that multiple safe_fixtable across processes are reference
+%% counted OK.
 multiple_processes(Config) when is_list(Config) ->
-    ?line {ok,Dets} = dets:open_file(?DETS_TMP1,[{file, 
+    {ok,Dets} = dets:open_file(?DETS_TMP1,[{file,
 					    dets_filename(?DETS_TMP1,
 							  Config)}]),
-    ?line Ets = ets:new(ets,[public]),
-    ?line multiple_processes(Dets,dets),
-    ?line multiple_processes(Ets,ets),
+    Ets = ets:new(ets,[public]),
+    multiple_processes(Dets,dets),
+    multiple_processes(Ets,ets),
     ok.
 
 multiple_processes(Tab, Mod) ->
-    ?line io:format("Mod = ~p\n", [Mod]),
-    ?line P1 = start_commander(),
-    ?line P2 = start_commander(),
-    ?line false = Mod:info(Tab,fixed),
-    ?line false = Mod:info(Tab, safe_fixed),
-    ?line command(P1, {Mod, safe_fixtable, [Tab,true]}),
-    ?line true = Mod:info(Tab,fixed),
-    ?line {_,[{P1,1}]} = Mod:info(Tab, safe_fixed),
-    ?line command(P2, {Mod, safe_fixtable, [Tab,true]}),
-    ?line true = Mod:info(Tab,fixed),
-    ?line {_,L} = Mod:info(Tab,safe_fixed),
-    ?line true = (lists:sort(L) == lists:sort([{P1,1},{P2,1}])),
-    ?line command(P2, {Mod, safe_fixtable, [Tab,true]}),
-    ?line {_,L2} = Mod:info(Tab,safe_fixed),
-    ?line true = (lists:sort(L2) == lists:sort([{P1,1},{P2,2}])),
-    ?line command(P2, {Mod, safe_fixtable, [Tab,false]}),
-    ?line true = Mod:info(Tab,fixed),
-    ?line {_,L3} = Mod:info(Tab,safe_fixed),
-    ?line true = (lists:sort(L3) == lists:sort([{P1,1},{P2,1}])),
-    ?line command(P2, {Mod, safe_fixtable, [Tab,false]}),
-    ?line true = Mod:info(Tab,fixed),
-    ?line {_,[{P1,1}]} = Mod:info(Tab, safe_fixed),
-    ?line stop_commander(P1),
-    ?line receive after 1000 -> ok end,
-    ?line false = Mod:info(Tab,fixed),
-    ?line false = Mod:info(Tab, safe_fixed),
-    ?line command(P2, {Mod, safe_fixtable, [Tab,true]}),
-    ?line true = Mod:info(Tab,fixed),
-    ?line {_,[{P2,1}]} = Mod:info(Tab, safe_fixed),
+    io:format("Mod = ~p\n", [Mod]),
+    P1 = start_commander(),
+    P2 = start_commander(),
+    false = Mod:info(Tab,fixed),
+    false = Mod:info(Tab, safe_fixed),
+    command(P1, {Mod, safe_fixtable, [Tab,true]}),
+    true = Mod:info(Tab,fixed),
+    {_,[{P1,1}]} = Mod:info(Tab, safe_fixed),
+    command(P2, {Mod, safe_fixtable, [Tab,true]}),
+    true = Mod:info(Tab,fixed),
+    {_,L} = Mod:info(Tab,safe_fixed),
+    true = (lists:sort(L) == lists:sort([{P1,1},{P2,1}])),
+    command(P2, {Mod, safe_fixtable, [Tab,true]}),
+    {_,L2} = Mod:info(Tab,safe_fixed),
+    true = (lists:sort(L2) == lists:sort([{P1,1},{P2,2}])),
+    command(P2, {Mod, safe_fixtable, [Tab,false]}),
+    true = Mod:info(Tab,fixed),
+    {_,L3} = Mod:info(Tab,safe_fixed),
+    true = (lists:sort(L3) == lists:sort([{P1,1},{P2,1}])),
+    command(P2, {Mod, safe_fixtable, [Tab,false]}),
+    true = Mod:info(Tab,fixed),
+    {_,[{P1,1}]} = Mod:info(Tab, safe_fixed),
+    stop_commander(P1),
+    receive after 1000 -> ok end,
+    false = Mod:info(Tab,fixed),
+    false = Mod:info(Tab, safe_fixed),
+    command(P2, {Mod, safe_fixtable, [Tab,true]}),
+    true = Mod:info(Tab,fixed),
+    {_,[{P2,1}]} = Mod:info(Tab, safe_fixed),
     case Mod of
 	dets ->
-	    ?line dets:close(Tab);
+	    dets:close(Tab);
 	ets ->
-	    ?line ets:delete(Tab)
+	    ets:delete(Tab)
     end,
-    ?line stop_commander(P2),
-    ?line receive after 1000 -> ok end,
-    ?line undefined = Mod:info(Tab, safe_fixed),
+    stop_commander(P2),
+    receive after 1000 -> ok end,
+    undefined = Mod:info(Tab, safe_fixed),
     ok.
-    
-    
+
+
 
 %%% Helpers
 dets_filename(Base, Config) when is_atom(Base) ->
     dets_filename(atom_to_list(Base) ++ ".dat", Config);
 dets_filename(Basename, Config) ->
-    PrivDir = ?config(priv_dir,Config),
+    PrivDir = proplists:get_value(priv_dir,Config),
     filename:join(PrivDir, Basename).
 
 command_loop() ->
diff --git a/lib/stdlib/test/format_SUITE.erl b/lib/stdlib/test/format_SUITE.erl
index 77636687cd..b481d82ea6 100644
--- a/lib/stdlib/test/format_SUITE.erl
+++ b/lib/stdlib/test/format_SUITE.erl
@@ -25,20 +25,17 @@
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 
--include_lib("test_server/include/test_server.hrl").
-
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
+-include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [hang_1].
@@ -59,11 +56,8 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-hang_1(doc) ->
-    ["Bad args can hang (OTP-2400)"];
-hang_1(suite) ->
-    [];
+%% OTP-2400. Bad args can hang.
 hang_1(Config) when is_list(Config) ->
-    ?line _ = (catch io:format(a, "", [])),
-    ?line _ = (catch io:format({}, "", [])),
+    _ = (catch io:format(a, "", [])),
+    _ = (catch io:format({}, "", [])),
     ok.
diff --git a/lib/stdlib/test/gen_event_SUITE.erl b/lib/stdlib/test/gen_event_SUITE.erl
index b019f98b69..4bad7801ff 100644
--- a/lib/stdlib/test/gen_event_SUITE.erl
+++ b/lib/stdlib/test/gen_event_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(gen_event_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
@@ -59,75 +59,72 @@ end_per_group(_GroupName, Config) ->
 %% Start an event manager.
 %% --------------------------------------
 
-start(doc) -> [];
-start(suite) -> [];
 start(Config) when is_list(Config) ->
     OldFl = process_flag(trap_exit, true),
 
-    ?line dummy_via:reset(),
+    dummy_via:reset(),
 
-    ?line {ok, Pid0} = gen_event:start(), %anonymous
-    ?line [] = gen_event:which_handlers(Pid0),
-    ?line ok = gen_event:stop(Pid0),
+    {ok, Pid0} = gen_event:start(), %anonymous
+    [] = gen_event:which_handlers(Pid0),
+    ok = gen_event:stop(Pid0),
 
-    ?line {ok, Pid1} = gen_event:start_link(), %anonymous
-    ?line [] = gen_event:which_handlers(Pid1),
-    ?line ok = gen_event:stop(Pid1),
+    {ok, Pid1} = gen_event:start_link(), %anonymous
+    [] = gen_event:which_handlers(Pid1),
+    ok = gen_event:stop(Pid1),
 
-    ?line {ok, Pid2} = gen_event:start({local, my_dummy_name}),
-    ?line [] = gen_event:which_handlers(my_dummy_name),
-    ?line [] = gen_event:which_handlers(Pid2),
-    ?line ok = gen_event:stop(my_dummy_name),
+    {ok, Pid2} = gen_event:start({local, my_dummy_name}),
+    [] = gen_event:which_handlers(my_dummy_name),
+    [] = gen_event:which_handlers(Pid2),
+    ok = gen_event:stop(my_dummy_name),
 
-    ?line {ok, Pid3} = gen_event:start_link({local, my_dummy_name}),
-    ?line [] = gen_event:which_handlers(my_dummy_name),
-    ?line [] = gen_event:which_handlers(Pid3),
-    ?line ok = gen_event:stop(my_dummy_name),
+    {ok, Pid3} = gen_event:start_link({local, my_dummy_name}),
+    [] = gen_event:which_handlers(my_dummy_name),
+    [] = gen_event:which_handlers(Pid3),
+    ok = gen_event:stop(my_dummy_name),
 
-    ?line {ok, Pid4} = gen_event:start_link({global, my_dummy_name}),
-    ?line [] = gen_event:which_handlers({global, my_dummy_name}),
-    ?line [] = gen_event:which_handlers(Pid4),
-    ?line ok = gen_event:stop({global, my_dummy_name}),
+    {ok, Pid4} = gen_event:start_link({global, my_dummy_name}),
+    [] = gen_event:which_handlers({global, my_dummy_name}),
+    [] = gen_event:which_handlers(Pid4),
+    ok = gen_event:stop({global, my_dummy_name}),
 
-    ?line {ok, Pid5} = gen_event:start_link({via, dummy_via, my_dummy_name}),
-    ?line [] = gen_event:which_handlers({via, dummy_via, my_dummy_name}),
-    ?line [] = gen_event:which_handlers(Pid5),
-    ?line ok = gen_event:stop({via, dummy_via, my_dummy_name}),
+    {ok, Pid5} = gen_event:start_link({via, dummy_via, my_dummy_name}),
+    [] = gen_event:which_handlers({via, dummy_via, my_dummy_name}),
+    [] = gen_event:which_handlers(Pid5),
+    ok = gen_event:stop({via, dummy_via, my_dummy_name}),
 
-    ?line {ok, _} = gen_event:start_link({local, my_dummy_name}),
-    ?line {error, {already_started, _}} =
+    {ok, _} = gen_event:start_link({local, my_dummy_name}),
+    {error, {already_started, _}} =
 	gen_event:start_link({local, my_dummy_name}),
-    ?line {error, {already_started, _}} =
+    {error, {already_started, _}} =
 	gen_event:start({local, my_dummy_name}),
-    ?line ok = gen_event:stop(my_dummy_name),
+    ok = gen_event:stop(my_dummy_name),
 
-    ?line {ok, Pid6} = gen_event:start_link({global, my_dummy_name}),
-    ?line {error, {already_started, _}} =
+    {ok, Pid6} = gen_event:start_link({global, my_dummy_name}),
+    {error, {already_started, _}} =
 	gen_event:start_link({global, my_dummy_name}),
-    ?line {error, {already_started, _}} =
+    {error, {already_started, _}} =
 	gen_event:start({global, my_dummy_name}),
 
     ok = gen_event:stop({global, my_dummy_name}, shutdown, 10000),
     receive
 	{'EXIT', Pid6, shutdown} -> ok
     after 10000 ->
-	    ?t:fail(exit_gen_event)
+	    ct:fail(exit_gen_event)
     end,
 
-    ?line {ok, Pid7} = gen_event:start_link({via, dummy_via, my_dummy_name}),
-    ?line {error, {already_started, _}} =
+    {ok, Pid7} = gen_event:start_link({via, dummy_via, my_dummy_name}),
+    {error, {already_started, _}} =
 	gen_event:start_link({via, dummy_via, my_dummy_name}),
-    ?line {error, {already_started, _}} =
+    {error, {already_started, _}} =
 	gen_event:start({via, dummy_via, my_dummy_name}),
 
     exit(Pid7, shutdown),
     receive
 	{'EXIT', Pid7, shutdown} -> ok
     after 10000 ->
-	    ?t:fail(exit_gen_event)
+	    ct:fail(exit_gen_event)
     end,
 
-    ?t:messages_get(),
     process_flag(trap_exit, OldFl),
     ok.
 
@@ -184,7 +181,7 @@ hibernate(Config) when is_list(Config) ->
 
     {ok,Pid2} = gen_event:start({local, my_dummy_handler}),
     ok = gen_event:add_handler(my_dummy_handler, dummy_h,
-				     [self(),hibernate]),
+			       [self(),hibernate]),
     is_in_erlang_hibernate(Pid2),
     sys:suspend(my_dummy_handler),
     is_in_erlang_hibernate(Pid2),
@@ -193,7 +190,7 @@ hibernate(Config) when is_list(Config) ->
 
     Pid2 ! wake,
     is_not_in_erlang_hibernate(Pid2),
-   
+
     ok = gen_event:stop(my_dummy_handler),
 
     ok.
@@ -204,7 +201,7 @@ is_in_erlang_hibernate(Pid) ->
 
 is_in_erlang_hibernate_1(0, Pid) ->
     io:format("~p\n", [erlang:process_info(Pid, current_function)]),
-    ?t:fail(not_in_erlang_hibernate_3);
+    ct:fail(not_in_erlang_hibernate_3);
 is_in_erlang_hibernate_1(N, Pid) ->
     {current_function,MFA} = erlang:process_info(Pid, current_function),
     case MFA of
@@ -221,7 +218,7 @@ is_not_in_erlang_hibernate(Pid) ->
 
 is_not_in_erlang_hibernate_1(0, Pid) ->
     io:format("~p\n", [erlang:process_info(Pid, current_function)]),
-    ?t:fail(not_in_erlang_hibernate_3);
+    ct:fail(not_in_erlang_hibernate_3);
 is_not_in_erlang_hibernate_1(N, Pid) ->
     {current_function,MFA} = erlang:process_info(Pid, current_function),
     case MFA of
@@ -233,720 +230,694 @@ is_not_in_erlang_hibernate_1(N, Pid) ->
     end.
 
 
-add_handler(doc) -> [];
-add_handler(suite) -> [];
 add_handler(Config) when is_list(Config) ->
-    ?line {ok,_} = gen_event:start({local, my_dummy_handler}),
-    ?line {error, my_error} =
+    {ok,_} = gen_event:start({local, my_dummy_handler}),
+    {error, my_error} =
 	gen_event:add_handler(my_dummy_handler, dummy_h, make_error),
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line [dummy_h] = gen_event:which_handlers(my_dummy_handler),
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
+    [dummy_h] = gen_event:which_handlers(my_dummy_handler),
 
-    ?line {error, my_error} =
+    {error, my_error} =
 	gen_event:add_handler(my_dummy_handler, {dummy_h, self()}, make_error),
-    ?line [dummy_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,self()},
-				     [self()]),
+    [dummy_h] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,self()},
+			       [self()]),
     Self = self(),
-    ?line [{dummy_h, Self}, dummy_h] =
+    [{dummy_h, Self}, dummy_h] =
 	gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:stop(my_dummy_handler),
+    ok = gen_event:stop(my_dummy_handler),
     ok.
 
-add_sup_handler(doc) -> [];
-add_sup_handler(suite) -> [];
 add_sup_handler(Config) when is_list(Config) ->
-    ?line {ok,Pid} = gen_event:start({local, my_dummy_handler}),
-    ?line {error, my_error} =
+    {ok,Pid} = gen_event:start({local, my_dummy_handler}),
+    {error, my_error} =
 	gen_event:add_sup_handler(my_dummy_handler, dummy_h, make_error),
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line [dummy_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line exit(Pid, sup_died),
-    ?t:sleep(1000),
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+    [dummy_h] = gen_event:which_handlers(my_dummy_handler),
+    exit(Pid, sup_died),
+    ct:sleep(1000),
+    [] = gen_event:which_handlers(my_dummy_handler),
 
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line [dummy_h] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+    [dummy_h] = gen_event:which_handlers(my_dummy_handler),
 
-    ?line {error, my_error} =
+    {error, my_error} =
 	gen_event:add_handler(my_dummy_handler, {dummy_h, self()}, make_error),
-    ?line [dummy_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, {dummy_h,self()},
-					 [self()]),
+    [dummy_h] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_sup_handler(my_dummy_handler, {dummy_h,self()},
+				   [self()]),
     Self = self(),
-    ?line [{dummy_h, Self}, dummy_h] =
+    [{dummy_h, Self}, dummy_h] =
 	gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:stop(my_dummy_handler),
-
-    ?line receive
-	      {gen_event_EXIT, dummy_h, shutdown} ->
-		  ok
-	  after 1000 ->
-		  ?t:fail({no,{gen_event_EXIT, dummy_h, shutdown}})
-	  end,
-
-    ?line receive
-	      {gen_event_EXIT, {dummy_h,Self}, shutdown} ->
-		  ok
-	  after 1000 ->
-		  ?t:fail({no,{gen_event_EXIT, {dummy_h,Self},
-					shutdown}})
-	  end,
+    ok = gen_event:stop(my_dummy_handler),
+
+    receive
+	{gen_event_EXIT, dummy_h, shutdown} ->
+	    ok
+    after 1000 ->
+	    ct:fail({no,{gen_event_EXIT, dummy_h, shutdown}})
+    end,
+
+    receive
+	{gen_event_EXIT, {dummy_h,Self}, shutdown} ->
+	    ok
+    after 1000 ->
+	    ct:fail({no,{gen_event_EXIT, {dummy_h,Self},
+			 shutdown}})
+    end,
     ok.
 
-delete_handler(doc) -> [];
-delete_handler(suite) -> [];
 delete_handler(Config) when is_list(Config) ->
-    ?line {ok,_} = gen_event:start({local, my_dummy_handler}),
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line {error, module_not_found} =
+    {ok,_} = gen_event:start({local, my_dummy_handler}),
+    ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
+    {error, module_not_found} =
 	gen_event:delete_handler(my_dummy_handler, duuuuuuuuumy, []),
-    ?line return_hej =
+    return_hej =
 	gen_event:delete_handler(my_dummy_handler, dummy_h, return_hej),
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line ok =
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
+    ok =
 	gen_event:delete_handler(my_dummy_handler, dummy_h, []),
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
+    [] = gen_event:which_handlers(my_dummy_handler),
 
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,1}, [self()]),
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,2}, [self()]),
-    ?line {error, module_not_found} =
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,1}, [self()]),
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,2}, [self()]),
+    {error, module_not_found} =
 	gen_event:delete_handler(my_dummy_handler, {duuuuuuuuumy,1}, []),
-    ?line return_hej =
+    return_hej =
 	gen_event:delete_handler(my_dummy_handler, {dummy_h,1}, return_hej),
-    ?line return_hej =
+    return_hej =
 	gen_event:delete_handler(my_dummy_handler, {dummy_h,2}, return_hej),
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,2}, [self()]),
-    ?line ok =
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,2}, [self()]),
+    ok =
 	gen_event:delete_handler(my_dummy_handler, {dummy_h,2}, []),
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
+    [] = gen_event:which_handlers(my_dummy_handler),
 
-    ?line ok = gen_event:stop(my_dummy_handler),
+    ok = gen_event:stop(my_dummy_handler),
     ok.
 
-swap_handler(doc) -> [];
-swap_handler(suite) -> [];
 swap_handler(Config) when is_list(Config) ->
-    ?line {ok,_} = gen_event:start({local, my_dummy_handler}),
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line {error, non_existing} =
+    {ok,_} = gen_event:start({local, my_dummy_handler}),
+    ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
+    {error, non_existing} =
 	gen_event:swap_handler(my_dummy_handler, {faulty_h, swap},
 			       {dummy1_h, []}),
-    ?line ok =
+    ok =
 	gen_event:swap_handler(my_dummy_handler, {dummy_h, swap},
 			       {dummy1_h, swap}),
-    ?line [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
+    [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
 
-    ?line ok = gen_event:delete_handler(my_dummy_handler, dummy1_h, []),
+    ok = gen_event:delete_handler(my_dummy_handler, dummy1_h, []),
 
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,3}, [self()]),
-    ?line {error, non_existing} =
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,3}, [self()]),
+    {error, non_existing} =
 	gen_event:swap_handler(my_dummy_handler, {faulty_h, swap},
 			       {dummy1_h, []}),
-    ?line ok =
+    ok =
 	gen_event:swap_handler(my_dummy_handler, {{dummy_h,3}, swap},
 			       {{dummy1_h,4}, swap}),
-    ?line [{dummy1_h,4}] = gen_event:which_handlers(my_dummy_handler),
+    [{dummy1_h,4}] = gen_event:which_handlers(my_dummy_handler),
 
-    ?line ok = gen_event:delete_handler(my_dummy_handler, {dummy1_h,4}, []),
+    ok = gen_event:delete_handler(my_dummy_handler, {dummy1_h,4}, []),
 
-    ?line ok = gen_event:stop(my_dummy_handler),
+    ok = gen_event:stop(my_dummy_handler),
     ok.
-	
-swap_sup_handler(doc) -> [];
-swap_sup_handler(suite) -> [];
+
 swap_sup_handler(Config) when is_list(Config) ->
-    ?line {ok,_} = gen_event:start({local, my_dummy_handler}),
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line {error, non_existing} =
+    {ok,_} = gen_event:start({local, my_dummy_handler}),
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+    {error, non_existing} =
 	gen_event:swap_handler(my_dummy_handler, {faulty_h, swap},
 			       {dummy1_h, []}),
-    ?line ok =
+    ok =
 	gen_event:swap_handler(my_dummy_handler, {dummy_h, swap},
 			       {dummy1_h, swap}),
-    ?line [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
-
-    ?line ok = gen_event:delete_handler(my_dummy_handler, dummy1_h, []),
-    ?line receive
-	      {gen_event_EXIT, dummy1_h, normal} ->
-		  ok
-	  after 1000 ->
-		  ?t:fail({no,{gen_event_EXIT, dummy1_h, normal}})
-	  end,
-
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, {dummy_h,3},
-					 [self()]),
-    ?line {error, non_existing} =
+    [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
+
+    ok = gen_event:delete_handler(my_dummy_handler, dummy1_h, []),
+    receive
+	{gen_event_EXIT, dummy1_h, normal} ->
+	    ok
+    after 1000 ->
+	    ct:fail({no,{gen_event_EXIT, dummy1_h, normal}})
+    end,
+
+    ok = gen_event:add_sup_handler(my_dummy_handler, {dummy_h,3},
+				   [self()]),
+    {error, non_existing} =
 	gen_event:swap_sup_handler(my_dummy_handler, {faulty_h, swap},
 				   {dummy1_h, []}),
-    ?line ok =
+    ok =
 	gen_event:swap_sup_handler(my_dummy_handler, {{dummy_h,3}, swap},
 				   {{dummy1_h,4}, swap}),
-    ?line [{dummy1_h,4}] = gen_event:which_handlers(my_dummy_handler),
+    [{dummy1_h,4}] = gen_event:which_handlers(my_dummy_handler),
 
-    ?line ok = gen_event:delete_handler(my_dummy_handler, {dummy1_h,4}, []),
-    ?line receive
-	      {gen_event_EXIT, {dummy1_h,4}, normal} ->
-		  ok
-	  after 1000 ->
-		  ?t:fail({no,{gen_event_EXIT, {dummy1_h,4}, normal}})
-	  end,
+    ok = gen_event:delete_handler(my_dummy_handler, {dummy1_h,4}, []),
+    receive
+	{gen_event_EXIT, {dummy1_h,4}, normal} ->
+	    ok
+    after 1000 ->
+	    ct:fail({no,{gen_event_EXIT, {dummy1_h,4}, normal}})
+    end,
 
-    ?line ok = gen_event:stop(my_dummy_handler),
+    ok = gen_event:stop(my_dummy_handler),
     ok.
-	
-notify(doc) -> [];
-notify(suite) -> [];
+
 notify(Config) when is_list(Config) ->
-    ?line {ok,_} = gen_event:start({local, my_dummy_handler}),
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
+    {ok,_} = gen_event:start({local, my_dummy_handler}),
+    ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
     Event = {event, self()},
-    ?line [dummy_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:notify(my_dummy_handler, Event),
-    ?line receive
-	      {dummy_h, Event} ->
-		  ok
-	  end,
-    ?line ok = gen_event:notify(my_dummy_handler, {swap_event,dummy1_h,swap}),
-    ?line [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:notify(my_dummy_handler, Event),
-    ?line receive
-	      {dummy1_h, Event} ->
-		  ok
-	  end,
-    ?line ok = gen_event:notify(my_dummy_handler, delete_event),
-    ?line receive
-	      {dummy1_h, removed} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
-
-    ?line ok = gen_event:notify(my_dummy_handler, error_event),
-    ?line receive
-	      {dummy_h, returned_error} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
+    [dummy_h] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:notify(my_dummy_handler, Event),
+    receive
+	{dummy_h, Event} ->
+	    ok
+    end,
+    ok = gen_event:notify(my_dummy_handler, {swap_event,dummy1_h,swap}),
+    [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:notify(my_dummy_handler, Event),
+    receive
+	{dummy1_h, Event} ->
+	    ok
+    end,
+    ok = gen_event:notify(my_dummy_handler, delete_event),
+    receive
+	{dummy1_h, removed} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
+
+    ok = gen_event:notify(my_dummy_handler, error_event),
+    receive
+	{dummy_h, returned_error} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
 
     %% Handler with id, {Mod,Id}
 
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,5}, [self()]),
-    ?line [{dummy_h,5}] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:notify(my_dummy_handler, Event),
-    ?line receive
-	      {dummy_h, Event} ->
-		  ok
-	  end,
-    ?line ok = gen_event:notify(my_dummy_handler,
-				{swap_event, {dummy1_h, 9}, swap}),
-    ?line [{dummy1_h,9}] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:notify(my_dummy_handler, Event),
-    ?line receive
-	      {dummy1_h, Event} ->
-		  ok
-	  end,
-    ?line ok = gen_event:notify(my_dummy_handler, delete_event),
-    ?line receive
-	      {dummy1_h, removed} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,a}, [self()]),
-
-    ?line ok = gen_event:notify(my_dummy_handler, error_event),
-    ?line receive
-	      {dummy_h, returned_error} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,5}, [self()]),
+    [{dummy_h,5}] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:notify(my_dummy_handler, Event),
+    receive
+	{dummy_h, Event} ->
+	    ok
+    end,
+    ok = gen_event:notify(my_dummy_handler,
+			  {swap_event, {dummy1_h, 9}, swap}),
+    [{dummy1_h,9}] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:notify(my_dummy_handler, Event),
+    receive
+	{dummy1_h, Event} ->
+	    ok
+    end,
+    ok = gen_event:notify(my_dummy_handler, delete_event),
+    receive
+	{dummy1_h, removed} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,a}, [self()]),
+
+    ok = gen_event:notify(my_dummy_handler, error_event),
+    receive
+	{dummy_h, returned_error} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
 
     %% Supervised handler.
 
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line [dummy_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:notify(my_dummy_handler, Event),
-    ?line receive
-	      {dummy_h, Event} ->
-		  ok
-	  end,
-
-    ?line ok = gen_event:notify(my_dummy_handler, do_crash),
-    ?line receive
-	      {gen_event_EXIT, dummy_h, {'EXIT',_}} ->
-		  ok
-	  end,
-
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line ok = gen_event:notify(my_dummy_handler, {swap_event,dummy1_h,swap}),
-    ?line [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
-
-    ?line ok = gen_event:notify(my_dummy_handler, do_crash),
-    ?line receive
-	      {gen_event_EXIT, dummy1_h, {'EXIT',_}} ->
-		  ok
-	  end,
-
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line ok = gen_event:notify(my_dummy_handler, {swap_event,dummy1_h,swap}),
-    ?line [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
-
-    ?line ok = gen_event:notify(my_dummy_handler, delete_event),
-    ?line receive
-	      {dummy1_h, removed} ->
-		  ok
-	  end,
-
-    ?line receive
-	      {gen_event_EXIT, dummy1_h, normal} ->
-		  ok
-	  end,
-
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-
-    ?line ok = gen_event:stop(my_dummy_handler),
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+    [dummy_h] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:notify(my_dummy_handler, Event),
+    receive
+	{dummy_h, Event} ->
+	    ok
+    end,
+
+    ok = gen_event:notify(my_dummy_handler, do_crash),
+    receive
+	{gen_event_EXIT, dummy_h, {'EXIT',_}} ->
+	    ok
+    end,
+
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+    ok = gen_event:notify(my_dummy_handler, {swap_event,dummy1_h,swap}),
+    [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
+
+    ok = gen_event:notify(my_dummy_handler, do_crash),
+    receive
+	{gen_event_EXIT, dummy1_h, {'EXIT',_}} ->
+	    ok
+    end,
+
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+    ok = gen_event:notify(my_dummy_handler, {swap_event,dummy1_h,swap}),
+    [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
+
+    ok = gen_event:notify(my_dummy_handler, delete_event),
+    receive
+	{dummy1_h, removed} ->
+	    ok
+    end,
+
+    receive
+	{gen_event_EXIT, dummy1_h, normal} ->
+	    ok
+    end,
+
+    [] = gen_event:which_handlers(my_dummy_handler),
+
+    ok = gen_event:stop(my_dummy_handler),
     ok.
 
-sync_notify(doc) -> [];
-sync_notify(suite) -> [];
 sync_notify(Config) when is_list(Config) ->
-    ?line {ok,_} = gen_event:start({local, my_dummy_handler}),
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
+    {ok,_} = gen_event:start({local, my_dummy_handler}),
+    ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
     Event = {event, self()},
-    ?line [dummy_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:sync_notify(my_dummy_handler, Event),
-    ?line receive
-	      {dummy_h, Event} ->
-		  ok
-	  end,
-    ?line ok = gen_event:sync_notify(my_dummy_handler,
-				     {swap_event, dummy1_h, swap}),
-    ?line [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:sync_notify(my_dummy_handler, Event),
-    ?line receive
-	      {dummy1_h, Event} ->
-		  ok
-	  end,
-    ?line ok = gen_event:sync_notify(my_dummy_handler, delete_event),
-    ?line receive
-	      {dummy1_h, removed} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
-
-    ?line ok = gen_event:sync_notify(my_dummy_handler, error_event),
-    ?line receive
-	      {dummy_h, returned_error} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
+    [dummy_h] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:sync_notify(my_dummy_handler, Event),
+    receive
+	{dummy_h, Event} ->
+	    ok
+    end,
+    ok = gen_event:sync_notify(my_dummy_handler,
+			       {swap_event, dummy1_h, swap}),
+    [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:sync_notify(my_dummy_handler, Event),
+    receive
+	{dummy1_h, Event} ->
+	    ok
+    end,
+    ok = gen_event:sync_notify(my_dummy_handler, delete_event),
+    receive
+	{dummy1_h, removed} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
+
+    ok = gen_event:sync_notify(my_dummy_handler, error_event),
+    receive
+	{dummy_h, returned_error} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
 
     %% Handler with id, {Mod,Id}
 
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,5}, [self()]),
-    ?line [{dummy_h,5}] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:sync_notify(my_dummy_handler, Event),
-    ?line receive
-	      {dummy_h, Event} ->
-		  ok
-	  end,
-    ?line ok = gen_event:sync_notify(my_dummy_handler,
-				     {swap_event, {dummy1_h, 9}, swap}),
-    ?line [{dummy1_h,9}] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:sync_notify(my_dummy_handler, Event),
-    ?line receive
-	      {dummy1_h, Event} ->
-		  ok
-	  end,
-    ?line ok = gen_event:sync_notify(my_dummy_handler, delete_event),
-    ?line receive
-	      {dummy1_h, removed} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,a}, [self()]),
-
-    ?line ok = gen_event:sync_notify(my_dummy_handler, error_event),
-    ?line receive
-	      {dummy_h, returned_error} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,5}, [self()]),
+    [{dummy_h,5}] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:sync_notify(my_dummy_handler, Event),
+    receive
+	{dummy_h, Event} ->
+	    ok
+    end,
+    ok = gen_event:sync_notify(my_dummy_handler,
+			       {swap_event, {dummy1_h, 9}, swap}),
+    [{dummy1_h,9}] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:sync_notify(my_dummy_handler, Event),
+    receive
+	{dummy1_h, Event} ->
+	    ok
+    end,
+    ok = gen_event:sync_notify(my_dummy_handler, delete_event),
+    receive
+	{dummy1_h, removed} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,a}, [self()]),
+
+    ok = gen_event:sync_notify(my_dummy_handler, error_event),
+    receive
+	{dummy_h, returned_error} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
 
     %% Supervised handler.
 
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line [dummy_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:sync_notify(my_dummy_handler, Event),
-    ?line receive
-	      {dummy_h, Event} ->
-		  ok
-	  end,
-
-    ?line ok = gen_event:sync_notify(my_dummy_handler, do_crash),
-    ?line receive
-	      {gen_event_EXIT, dummy_h, {'EXIT',_}} ->
-		  ok
-	  end,
-
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line ok = gen_event:sync_notify(my_dummy_handler,
-				     {swap_event,dummy1_h,swap}),
-    ?line [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
-
-    ?line ok = gen_event:sync_notify(my_dummy_handler, do_crash),
-    ?line receive
-	      {gen_event_EXIT, dummy1_h, {'EXIT',_}} ->
-		  ok
-	  end,
-
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line ok = gen_event:sync_notify(my_dummy_handler,
-				     {swap_event,dummy1_h,swap}),
-    ?line [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
-
-    ?line ok = gen_event:sync_notify(my_dummy_handler, delete_event),
-    ?line receive
-	      {dummy1_h, removed} ->
-		  ok
-	  end,
-
-    ?line receive
-	      {gen_event_EXIT, dummy1_h, normal} ->
-		  ok
-	  end,
-
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-
-    ?line ok = gen_event:stop(my_dummy_handler),
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+    [dummy_h] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:sync_notify(my_dummy_handler, Event),
+    receive
+	{dummy_h, Event} ->
+	    ok
+    end,
+
+    ok = gen_event:sync_notify(my_dummy_handler, do_crash),
+    receive
+	{gen_event_EXIT, dummy_h, {'EXIT',_}} ->
+	    ok
+    end,
+
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+    ok = gen_event:sync_notify(my_dummy_handler,
+			       {swap_event,dummy1_h,swap}),
+    [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
+
+    ok = gen_event:sync_notify(my_dummy_handler, do_crash),
+    receive
+	{gen_event_EXIT, dummy1_h, {'EXIT',_}} ->
+	    ok
+    end,
+
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+    ok = gen_event:sync_notify(my_dummy_handler,
+			       {swap_event,dummy1_h,swap}),
+    [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
+
+    ok = gen_event:sync_notify(my_dummy_handler, delete_event),
+    receive
+	{dummy1_h, removed} ->
+	    ok
+    end,
+
+    receive
+	{gen_event_EXIT, dummy1_h, normal} ->
+	    ok
+    end,
+
+    [] = gen_event:which_handlers(my_dummy_handler),
+
+    ok = gen_event:stop(my_dummy_handler),
     ok.
 
-call(doc) -> [];
-call(suite) -> [];
 call(Config) when is_list(Config) ->
-    ?line {ok,_} = gen_event:start({local, my_dummy_handler}),
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h, 1}, [self()]),
-    ?line [{dummy_h, 1}, dummy_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line {'EXIT',_} = (catch gen_event:call(non_exist, dummy_h, hejsan)),
-    ?line {error, bad_module} =
+    {ok,_} = gen_event:start({local, my_dummy_handler}),
+    ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h, 1}, [self()]),
+    [{dummy_h, 1}, dummy_h] = gen_event:which_handlers(my_dummy_handler),
+    {'EXIT',_} = (catch gen_event:call(non_exist, dummy_h, hejsan)),
+    {error, bad_module} =
 	gen_event:call(my_dummy_handler, bad_h, hejsan),
-    ?line {ok, hejhopp} = gen_event:call(my_dummy_handler, dummy_h, hejsan),
-    ?line {ok, hejhopp} = gen_event:call(my_dummy_handler, {dummy_h, 1},
-					 hejsan),
-    ?line {ok, hejhopp} = gen_event:call(my_dummy_handler, dummy_h, hejsan,
-					 10000),
-    ?line {'EXIT', {timeout, _}} =
+    {ok, hejhopp} = gen_event:call(my_dummy_handler, dummy_h, hejsan),
+    {ok, hejhopp} = gen_event:call(my_dummy_handler, {dummy_h, 1},
+				   hejsan),
+    {ok, hejhopp} = gen_event:call(my_dummy_handler, dummy_h, hejsan,
+				   10000),
+    {'EXIT', {timeout, _}} =
 	(catch gen_event:call(my_dummy_handler, dummy_h, hejsan, 0)),
     flush(),
-    ?line ok = gen_event:delete_handler(my_dummy_handler, {dummy_h, 1}, []),
-    ?line {ok, swapped} = gen_event:call(my_dummy_handler, dummy_h,
-					 {swap_call,dummy1_h,swap}),
-    ?line [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line {error, bad_module} =
+    ok = gen_event:delete_handler(my_dummy_handler, {dummy_h, 1}, []),
+    {ok, swapped} = gen_event:call(my_dummy_handler, dummy_h,
+				   {swap_call,dummy1_h,swap}),
+    [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
+    {error, bad_module} =
 	gen_event:call(my_dummy_handler, dummy_h, hejsan),
-    ?line ok = gen_event:call(my_dummy_handler, dummy1_h, delete_call),
-    ?line receive
-	      {dummy1_h, removed} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
-
-    ?line {error, {return, faulty}} =
+    ok = gen_event:call(my_dummy_handler, dummy1_h, delete_call),
+    receive
+	{dummy1_h, removed} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
+
+    {error, {return, faulty}} =
 	gen_event:call(my_dummy_handler, dummy_h, error_call),
-    ?line receive
-	      {dummy_h, returned_error} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
-
-    ?line {error, {'EXIT', _}} =
+    receive
+	{dummy_h, returned_error} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
+
+    {error, {'EXIT', _}} =
 	gen_event:call(my_dummy_handler, dummy_h, exit_call),
 
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
+    [] = gen_event:which_handlers(my_dummy_handler),
 
     %% Handler with id, {Mod,Id}
 
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,1}, [self()]),
-    ?line [{dummy_h,1}] = gen_event:which_handlers(my_dummy_handler),
-    ?line {error, bad_module} =
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,1}, [self()]),
+    [{dummy_h,1}] = gen_event:which_handlers(my_dummy_handler),
+    {error, bad_module} =
 	gen_event:call(my_dummy_handler, bad_h, hejsan),
-    ?line {ok, hejhopp} = gen_event:call(my_dummy_handler, {dummy_h,1},
-					 hejsan),
-    ?line {ok, swapped} = gen_event:call(my_dummy_handler, {dummy_h,1},
-					 {swap_call,{dummy1_h,2},swap}),
-    ?line [{dummy1_h,2}] = gen_event:which_handlers(my_dummy_handler),
-    ?line {error, bad_module} =
+    {ok, hejhopp} = gen_event:call(my_dummy_handler, {dummy_h,1},
+				   hejsan),
+    {ok, swapped} = gen_event:call(my_dummy_handler, {dummy_h,1},
+				   {swap_call,{dummy1_h,2},swap}),
+    [{dummy1_h,2}] = gen_event:which_handlers(my_dummy_handler),
+    {error, bad_module} =
 	gen_event:call(my_dummy_handler, dummy_h, hejsan),
-    ?line ok = gen_event:call(my_dummy_handler, {dummy1_h,2}, delete_call),
-    ?line receive
-	      {dummy1_h, removed} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,3}, [self()]),
-
-    ?line {error, {return, faulty}} =
+    ok = gen_event:call(my_dummy_handler, {dummy1_h,2}, delete_call),
+    receive
+	{dummy1_h, removed} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,3}, [self()]),
+
+    {error, {return, faulty}} =
 	gen_event:call(my_dummy_handler, {dummy_h,3}, error_call),
-    ?line receive
-	      {dummy_h, returned_error} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,4}, [self()]),
-
-    ?line {error, {'EXIT', _}} =
+    receive
+	{dummy_h, returned_error} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,4}, [self()]),
+
+    {error, {'EXIT', _}} =
 	gen_event:call(my_dummy_handler, {dummy_h,4}, exit_call),
 
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
+    [] = gen_event:which_handlers(my_dummy_handler),
 
     %% Supervised handler.
 
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line [dummy_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line {error, bad_module} =
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+    [dummy_h] = gen_event:which_handlers(my_dummy_handler),
+    {error, bad_module} =
 	gen_event:call(my_dummy_handler, bad_h, hejsan),
-    ?line {ok, hejhopp} = gen_event:call(my_dummy_handler, dummy_h, hejsan),
-    ?line {ok, swapped} = gen_event:call(my_dummy_handler, dummy_h,
-					 {swap_call,dummy1_h,swap}),
-    ?line [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line {error, bad_module} =
+    {ok, hejhopp} = gen_event:call(my_dummy_handler, dummy_h, hejsan),
+    {ok, swapped} = gen_event:call(my_dummy_handler, dummy_h,
+				   {swap_call,dummy1_h,swap}),
+    [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
+    {error, bad_module} =
 	gen_event:call(my_dummy_handler, dummy_h, hejsan),
-    ?line ok = gen_event:call(my_dummy_handler, dummy1_h, delete_call),
-    ?line receive
-	      {dummy1_h, removed} ->
-		  ok
-	  end,
+    ok = gen_event:call(my_dummy_handler, dummy1_h, delete_call),
+    receive
+	{dummy1_h, removed} ->
+	    ok
+    end,
 
-    ?line receive
-	      {gen_event_EXIT, dummy1_h, normal} ->
-		  ok
-	  end,
+    receive
+	{gen_event_EXIT, dummy1_h, normal} ->
+	    ok
+    end,
 
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
 
-    ?line {error, {return, faulty}} =
+    {error, {return, faulty}} =
 	gen_event:call(my_dummy_handler, dummy_h, error_call),
-    ?line receive
-	      {dummy_h, returned_error} ->
-		  ok
-	  end,
-
-    ?line receive
-	      {gen_event_EXIT, dummy_h, {return,faulty}} ->
-		  ok
-	  after 1000 ->
-		  ?t:fail({no, {gen_event_EXIT, dummy_h, {return,faulty}}})
-	  end,
-
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-
-    ?line {error, {'EXIT', _}} =
+    receive
+	{dummy_h, returned_error} ->
+	    ok
+    end,
+
+    receive
+	{gen_event_EXIT, dummy_h, {return,faulty}} ->
+	    ok
+    after 1000 ->
+	    ct:fail({no, {gen_event_EXIT, dummy_h, {return,faulty}}})
+    end,
+
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+
+    {error, {'EXIT', _}} =
 	gen_event:call(my_dummy_handler, dummy_h, exit_call),
 
-    ?line receive
-	      {gen_event_EXIT, dummy_h, {'EXIT',_}} ->
-		  ok
-	  after 1000 ->
-		  ?t:fail({no, {gen_event_EXIT, dummy_h, {'EXIT','_'}}})
-	  end,
+    receive
+	{gen_event_EXIT, dummy_h, {'EXIT',_}} ->
+	    ok
+    after 1000 ->
+	    ct:fail({no, {gen_event_EXIT, dummy_h, {'EXIT','_'}}})
+    end,
 
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
+    [] = gen_event:which_handlers(my_dummy_handler),
 
-    ?line ok = gen_event:stop(my_dummy_handler),
+    ok = gen_event:stop(my_dummy_handler),
     ok.
 
 flush() ->
     receive _ -> flush() after 0 -> ok end.
 
-info(doc) -> [];
-info(suite) -> [];
 info(Config) when is_list(Config) ->
-    ?line {ok,_} = gen_event:start({local, my_dummy_handler}),
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
+    {ok,_} = gen_event:start({local, my_dummy_handler}),
+    ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
     Info = {info, self()},
-    ?line [dummy_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line my_dummy_handler ! Info,
-    ?line receive
-	      {dummy_h, Info} ->
-		  ok
-	  end,
-    ?line my_dummy_handler ! {swap_info,dummy1_h,swap},
-    ?line [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line my_dummy_handler ! Info,
-    ?line receive
-	      {dummy1_h, Info} ->
-		  ok
-	  end,
-    ?line my_dummy_handler ! delete_info,
-    ?line receive
-	      {dummy1_h, removed} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
-
-    ?line my_dummy_handler ! error_info,
-    ?line receive
-	      {dummy_h, returned_error} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
+    [dummy_h] = gen_event:which_handlers(my_dummy_handler),
+    my_dummy_handler ! Info,
+    receive
+	{dummy_h, Info} ->
+	    ok
+    end,
+    my_dummy_handler ! {swap_info,dummy1_h,swap},
+    [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
+    my_dummy_handler ! Info,
+    receive
+	{dummy1_h, Info} ->
+	    ok
+    end,
+    my_dummy_handler ! delete_info,
+    receive
+	{dummy1_h, removed} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, dummy_h, [self()]),
+
+    my_dummy_handler ! error_info,
+    receive
+	{dummy_h, returned_error} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
 
     %% Handler with id, {Mod,Id}
 
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,1}, [self()]),
-    ?line [{dummy_h,1}] = gen_event:which_handlers(my_dummy_handler),
-    ?line my_dummy_handler ! Info,
-    ?line receive
-	      {dummy_h, Info} ->
-		  ok
-	  end,
-    ?line my_dummy_handler ! {swap_info,{dummy1_h,2},swap},
-    ?line [{dummy1_h,2}] = gen_event:which_handlers(my_dummy_handler),
-    ?line my_dummy_handler ! Info,
-    ?line receive
-	      {dummy1_h, Info} ->
-		  ok
-	  end,
-    ?line my_dummy_handler ! delete_info,
-    ?line receive
-	      {dummy1_h, removed} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-    ?line ok = gen_event:add_handler(my_dummy_handler, {dummy_h,3}, [self()]),
-
-    ?line my_dummy_handler ! error_info,
-    ?line receive
-	      {dummy_h, returned_error} ->
-		  ok
-	  end,
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,1}, [self()]),
+    [{dummy_h,1}] = gen_event:which_handlers(my_dummy_handler),
+    my_dummy_handler ! Info,
+    receive
+	{dummy_h, Info} ->
+	    ok
+    end,
+    my_dummy_handler ! {swap_info,{dummy1_h,2},swap},
+    [{dummy1_h,2}] = gen_event:which_handlers(my_dummy_handler),
+    my_dummy_handler ! Info,
+    receive
+	{dummy1_h, Info} ->
+	    ok
+    end,
+    my_dummy_handler ! delete_info,
+    receive
+	{dummy1_h, removed} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
+    ok = gen_event:add_handler(my_dummy_handler, {dummy_h,3}, [self()]),
+
+    my_dummy_handler ! error_info,
+    receive
+	{dummy_h, returned_error} ->
+	    ok
+    end,
+    [] = gen_event:which_handlers(my_dummy_handler),
 
     %% Supervised handler
 
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line [dummy_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line my_dummy_handler ! Info,
-    ?line receive
-	      {dummy_h, Info} ->
-		  ok
-	  end,
-    ?line my_dummy_handler ! {swap_info,dummy1_h,swap},
-    ?line [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
-    ?line my_dummy_handler ! Info,
-    ?line receive
-	      {dummy1_h, Info} ->
-		  ok
-	  end,
-    ?line my_dummy_handler ! delete_info,
-    ?line receive
-	      {dummy1_h, removed} ->
-		  ok
-	  end,
-
-    ?line receive
-	      {gen_event_EXIT, dummy1_h, normal} ->
-		  ok
-	  after 1000 ->
-		  ?t:fail({no, {gen_event_EXIT, dummy1_h, normal}})
-	  end,
-
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-
-    ?line my_dummy_handler ! error_info,
-    ?line receive
-	      {dummy_h, returned_error} ->
-		  ok
-	  end,
-
-    ?line receive
-	      {gen_event_EXIT, dummy_h, {return,faulty}} ->
-		  ok
-	  after 1000 ->
-		  ?t:fail({no, {gen_event_EXIT, dummy_h, {return,faulty}}})
-	  end,
-
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
-    ?line my_dummy_handler ! do_crash,
-
-    ?line receive
-	      {gen_event_EXIT, dummy_h, {'EXIT',_}} ->
-		  ok
-	  after 1000 ->
-		  ?t:fail({no, {gen_event_EXIT, dummy_h, {'EXIT','_'}}})
-	  end,
-
-    ?line [] = gen_event:which_handlers(my_dummy_handler),
-
-    ?line ok = gen_event:stop(my_dummy_handler),
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+    [dummy_h] = gen_event:which_handlers(my_dummy_handler),
+    my_dummy_handler ! Info,
+    receive
+	{dummy_h, Info} ->
+	    ok
+    end,
+    my_dummy_handler ! {swap_info,dummy1_h,swap},
+    [dummy1_h] = gen_event:which_handlers(my_dummy_handler),
+    my_dummy_handler ! Info,
+    receive
+	{dummy1_h, Info} ->
+	    ok
+    end,
+    my_dummy_handler ! delete_info,
+    receive
+	{dummy1_h, removed} ->
+	    ok
+    end,
+
+    receive
+	{gen_event_EXIT, dummy1_h, normal} ->
+	    ok
+    after 1000 ->
+	    ct:fail({no, {gen_event_EXIT, dummy1_h, normal}})
+    end,
+
+    [] = gen_event:which_handlers(my_dummy_handler),
+
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+
+    my_dummy_handler ! error_info,
+    receive
+	{dummy_h, returned_error} ->
+	    ok
+    end,
+
+    receive
+	{gen_event_EXIT, dummy_h, {return,faulty}} ->
+	    ok
+    after 1000 ->
+	    ct:fail({no, {gen_event_EXIT, dummy_h, {return,faulty}}})
+    end,
+
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy_h, [self()]),
+    my_dummy_handler ! do_crash,
+
+    receive
+	{gen_event_EXIT, dummy_h, {'EXIT',_}} ->
+	    ok
+    after 1000 ->
+	    ct:fail({no, {gen_event_EXIT, dummy_h, {'EXIT','_'}}})
+    end,
+
+    [] = gen_event:which_handlers(my_dummy_handler),
+
+    ok = gen_event:stop(my_dummy_handler),
     ok.
 
-call_format_status(suite) ->
-    [];
-call_format_status(doc) ->
-    ["Test that sys:get_status/1,2 calls format_status/2"];
+%% Test that sys:get_status/1,2 calls format_status/2.
 call_format_status(Config) when is_list(Config) ->
-    ?line {ok, Pid} = gen_event:start({local, my_dummy_handler}),
+    {ok, Pid} = gen_event:start({local, my_dummy_handler}),
     %% State here intentionally differs from what we expect from format_status
     State = self(),
     FmtState = "dummy1_h handler state",
-    ?line ok = gen_event:add_handler(my_dummy_handler, dummy1_h, [State]),
-    ?line Status1 = sys:get_status(Pid),
-    ?line Status2 = sys:get_status(Pid, 5000),
-    ?line ok = gen_event:stop(Pid),
-    ?line {status, Pid, _, [_, _, Pid, [], Data1]} = Status1,
-    ?line HandlerInfo1 = proplists:get_value(items, Data1),
-    ?line {"Installed handlers", [{_,dummy1_h,_,FmtState,_}]} = HandlerInfo1,
-    ?line {status, Pid, _, [_, _, Pid, [], Data2]} = Status2,
-    ?line HandlerInfo2 = proplists:get_value(items, Data2),
-    ?line {"Installed handlers", [{_,dummy1_h,_,FmtState,_}]} = HandlerInfo2,
+    ok = gen_event:add_handler(my_dummy_handler, dummy1_h, [State]),
+    Status1 = sys:get_status(Pid),
+    Status2 = sys:get_status(Pid, 5000),
+    ok = gen_event:stop(Pid),
+    {status, Pid, _, [_, _, Pid, [], Data1]} = Status1,
+    HandlerInfo1 = proplists:get_value(items, Data1),
+    {"Installed handlers", [{_,dummy1_h,_,FmtState,_}]} = HandlerInfo1,
+    {status, Pid, _, [_, _, Pid, [], Data2]} = Status2,
+    HandlerInfo2 = proplists:get_value(items, Data2),
+    {"Installed handlers", [{_,dummy1_h,_,FmtState,_}]} = HandlerInfo2,
     ok.
 
-call_format_status_anon(suite) ->
-    [];
-call_format_status_anon(doc) ->
-    ["Test that sys:get_status/1,2 calls format_status/2 for anonymous gen_event processes"];
+%% Test that sys:get_status/1,2 calls format_status/2 for anonymous
+%% gen_event processes.
 call_format_status_anon(Config) when is_list(Config) ->
-    ?line {ok, Pid} = gen_event:start(),
+    {ok, Pid} = gen_event:start(),
     %% The 'Name' of the gen_event process will be a pid() here, so
     %% the next line will crash if format_status can't string-ify pids.
-    ?line Status1 = sys:get_status(Pid),
-    ?line ok = gen_event:stop(Pid),
+    Status1 = sys:get_status(Pid),
+    ok = gen_event:stop(Pid),
     Header = "Status for event handler " ++  pid_to_list(Pid),
-    ?line {status, Pid, _, [_, _, Pid, [], Data1]} = Status1,
-    ?line Header = proplists:get_value(header, Data1),
+    {status, Pid, _, [_, _, Pid, [], Data1]} = Status1,
+    Header = proplists:get_value(header, Data1),
     ok.
 
 
-error_format_status(suite) ->
-    [];
-error_format_status(doc) ->
-    ["Test that a handler error calls format_status/2"];
+%% Test that a handler error calls format_status/2.
 error_format_status(Config) when is_list(Config) ->
-    ?line error_logger_forwarder:register(),
+    error_logger_forwarder:register(),
     OldFl = process_flag(trap_exit, true),
     State = self(),
-    ?line {ok, Pid} = gen_event:start({local, my_dummy_handler}),
-    ?line ok = gen_event:add_sup_handler(my_dummy_handler, dummy1_h, [State]),
-    ?line ok = gen_event:notify(my_dummy_handler, do_crash),
-    ?line receive
-	      {gen_event_EXIT,dummy1_h,{'EXIT',_}} -> ok
-	  after 5000 ->
-		  ?t:fail(exit_gen_event)
-	  end,
+    {ok, Pid} = gen_event:start({local, my_dummy_handler}),
+    ok = gen_event:add_sup_handler(my_dummy_handler, dummy1_h, [State]),
+    ok = gen_event:notify(my_dummy_handler, do_crash),
+    receive
+	{gen_event_EXIT,dummy1_h,{'EXIT',_}} -> ok
+    after 5000 ->
+	    ct:fail(exit_gen_event)
+    end,
     FmtState = "dummy1_h handler state",
     receive
 	{error,_GroupLeader, {Pid,
@@ -955,18 +926,14 @@ error_format_status(Config) when is_list(Config) ->
 			       FmtState, _]}} ->
 	    ok;
 	Other ->
-	    ?line io:format("Unexpected: ~p", [Other]),
-	    ?line ?t:fail()
+	    io:format("Unexpected: ~p", [Other]),
+	    ct:fail(failed)
     end,
-    ?t:messages_get(),
-    ?line ok = gen_event:stop(Pid),
+    ok = gen_event:stop(Pid),
     process_flag(trap_exit, OldFl),
     ok.
 
-get_state(suite) ->
-    [];
-get_state(doc) ->
-    ["Test that sys:get_state/1,2 return the gen_event state"];
+%% Test that sys:get_state/1,2 return the gen_event state.
 get_state(Config) when is_list(Config) ->
     {ok, Pid} = gen_event:start({local, my_dummy_handler}),
     State1 = self(),
@@ -986,10 +953,7 @@ get_state(Config) when is_list(Config) ->
     ok = gen_event:stop(Pid),
     ok.
 
-replace_state(suite) ->
-    [];
-replace_state(doc) ->
-    ["Test that replace_state/2,3 replace the gen_event state"];
+%% Test that replace_state/2,3 replace the gen_event state.
 replace_state(Config) when is_list(Config) ->
     {ok, Pid} = gen_event:start({local, my_dummy_handler}),
     State1 = self(),
diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl
index e3da1a2271..e23e747dee 100644
--- a/lib/stdlib/test/gen_fsm_SUITE.erl
+++ b/lib/stdlib/test/gen_fsm_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(gen_fsm_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test cases
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
@@ -44,10 +44,9 @@
 -export([enter_loop/1]).
 
 %% Exports for apply
--export([do_msg/1, do_sync_msg/1]).
 -export([enter_loop/2]).
 
-% The gen_fsm behaviour
+%% The gen_fsm behaviour
 -export([init/1, handle_event/3, handle_sync_event/4, terminate/3,
 	 handle_info/3, format_status/2]).
 -export([idle/2,	idle/3,
@@ -55,7 +54,7 @@
 	 wfor_conf/2,	wfor_conf/3,
 	 connected/2,	connected/3]).
 -export([state0/3]).
-	 
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -93,97 +92,95 @@ end_per_group(_GroupName, Config) ->
 start1(Config) when is_list(Config) ->
     %%OldFl = process_flag(trap_exit, true),
 
-    ?line {ok, Pid0} = gen_fsm:start_link(gen_fsm_SUITE, [], []),
-    ?line ok = do_func_test(Pid0),
-    ?line ok = do_sync_func_test(Pid0),
+    {ok, Pid0} = gen_fsm:start_link(gen_fsm_SUITE, [], []),
+    ok = do_func_test(Pid0),
+    ok = do_sync_func_test(Pid0),
     stop_it(Pid0),
-%%    ?line stopped = gen_fsm:sync_send_all_state_event(Pid0, stop),
-%%    ?line {'EXIT', {timeout,_}} = 
-%%	(catch gen_fsm:sync_send_event(Pid0, hej)),
+    %%    stopped = gen_fsm:sync_send_all_state_event(Pid0, stop),
+    %%    {'EXIT', {timeout,_}} =
+    %%	(catch gen_fsm:sync_send_event(Pid0, hej)),
 
-    ?line test_server:messages_get(),
+    [] = get_messages(),
     %%process_flag(trap_exit, OldFl),
-   ok.
+    ok.
 
 %% anonymous w. shutdown
 start2(Config) when is_list(Config) ->
     %% Dont link when shutdown
-    ?line {ok, Pid0} = gen_fsm:start(gen_fsm_SUITE, [], []),
-    ?line ok = do_func_test(Pid0),
-    ?line ok = do_sync_func_test(Pid0),
-    ?line shutdown_stopped = 
+    {ok, Pid0} = gen_fsm:start(gen_fsm_SUITE, [], []),
+    ok = do_func_test(Pid0),
+    ok = do_sync_func_test(Pid0),
+    shutdown_stopped =
 	gen_fsm:sync_send_all_state_event(Pid0, stop_shutdown),
-    ?line {'EXIT', {noproc,_}} = 
+    {'EXIT', {noproc,_}} =
 	(catch gen_fsm:sync_send_event(Pid0, hej)),
 
-    ?line test_server:messages_get(),
+    [] = get_messages(),
     ok.
 
 %% anonymous with timeout
 start3(Config) when is_list(Config) ->
     %%OldFl = process_flag(trap_exit, true),
 
-    ?line {ok, Pid0} = gen_fsm:start(gen_fsm_SUITE, [], [{timeout,5}]),
-    ?line ok = do_func_test(Pid0),
-    ?line ok = do_sync_func_test(Pid0),
-    ?line stop_it(Pid0),
-    
-    ?line {error, timeout} = gen_fsm:start(gen_fsm_SUITE, sleep,
-					   [{timeout,5}]),
+    {ok, Pid0} = gen_fsm:start(gen_fsm_SUITE, [], [{timeout,5}]),
+    ok = do_func_test(Pid0),
+    ok = do_sync_func_test(Pid0),
+    stop_it(Pid0),
+
+    {error, timeout} = gen_fsm:start(gen_fsm_SUITE, sleep,
+				     [{timeout,5}]),
 
-    test_server:messages_get(),
+    [] = get_messages(),
     %%process_flag(trap_exit, OldFl),
     ok.
 
 %% anonymous with ignore
-start4(suite) -> [];
 start4(Config) when is_list(Config) ->
     OldFl = process_flag(trap_exit, true),
 
-    ?line ignore = gen_fsm:start(gen_fsm_SUITE, ignore, []),
+    ignore = gen_fsm:start(gen_fsm_SUITE, ignore, []),
 
-    test_server:messages_get(),
+    [] = get_messages(),
     process_flag(trap_exit, OldFl),
     ok.
 
 %% anonymous with stop
-start5(suite) -> [];
 start5(Config) when is_list(Config) ->
     OldFl = process_flag(trap_exit, true),
 
-    ?line {error, stopped} = gen_fsm:start(gen_fsm_SUITE, stop, []),
+    {error, stopped} = gen_fsm:start(gen_fsm_SUITE, stop, []),
 
-    test_server:messages_get(),
+    [] = get_messages(),
     process_flag(trap_exit, OldFl),
     ok.
 
 %% anonymous linked
 start6(Config) when is_list(Config) ->
-    ?line {ok, Pid} = gen_fsm:start_link(gen_fsm_SUITE, [], []),
-    ?line ok = do_func_test(Pid),
-    ?line ok = do_sync_func_test(Pid),
-    ?line stop_it(Pid),
+    {ok, Pid} = gen_fsm:start_link(gen_fsm_SUITE, [], []),
+    ok = do_func_test(Pid),
+    ok = do_sync_func_test(Pid),
+    stop_it(Pid),
 
-    test_server:messages_get(),
+    [] = get_messages(),
 
     ok.
 
 %% global register linked
 start7(Config) when is_list(Config) ->
-    ?line {ok, Pid} = 
+    {ok, Pid} =
 	gen_fsm:start_link({global, my_fsm}, gen_fsm_SUITE, [], []),
-    ?line {error, {already_started, Pid}} =
+    {error, {already_started, Pid}} =
 	gen_fsm:start_link({global, my_fsm}, gen_fsm_SUITE, [], []),
-    ?line {error, {already_started, Pid}} =
+    {error, {already_started, Pid}} =
 	gen_fsm:start({global, my_fsm}, gen_fsm_SUITE, [], []),
-    
-    ?line ok = do_func_test(Pid),
-    ?line ok = do_sync_func_test(Pid),
-    ?line ok = do_func_test({global, my_fsm}),
-    ?line ok = do_sync_func_test({global, my_fsm}),
-    ?line stop_it({global, my_fsm}),
-    
-    test_server:messages_get(),
+
+    ok = do_func_test(Pid),
+    ok = do_sync_func_test(Pid),
+    ok = do_func_test({global, my_fsm}),
+    ok = do_sync_func_test({global, my_fsm}),
+    stop_it({global, my_fsm}),
+
+    [] = get_messages(),
     ok.
 
 
@@ -191,18 +188,18 @@ start7(Config) when is_list(Config) ->
 start8(Config) when is_list(Config) ->
     %%OldFl = process_flag(trap_exit, true),
 
-    ?line {ok, Pid} = 
+    {ok, Pid} =
 	gen_fsm:start({local, my_fsm}, gen_fsm_SUITE, [], []),
-    ?line {error, {already_started, Pid}} =
+    {error, {already_started, Pid}} =
 	gen_fsm:start({local, my_fsm}, gen_fsm_SUITE, [], []),
 
-    ?line ok = do_func_test(Pid),
-    ?line ok = do_sync_func_test(Pid),
-    ?line ok = do_func_test(my_fsm),
-    ?line ok = do_sync_func_test(my_fsm),
-    ?line stop_it(Pid),
-    
-    test_server:messages_get(),
+    ok = do_func_test(Pid),
+    ok = do_sync_func_test(Pid),
+    ok = do_func_test(my_fsm),
+    ok = do_sync_func_test(my_fsm),
+    stop_it(Pid),
+
+    [] = get_messages(),
     %%process_flag(trap_exit, OldFl),
     ok.
 
@@ -210,80 +207,80 @@ start8(Config) when is_list(Config) ->
 start9(Config) when is_list(Config) ->
     %%OldFl = process_flag(trap_exit, true),
 
-    ?line {ok, Pid} = 
+    {ok, Pid} =
 	gen_fsm:start_link({local, my_fsm}, gen_fsm_SUITE, [], []),
-    ?line {error, {already_started, Pid}} =
+    {error, {already_started, Pid}} =
 	gen_fsm:start({local, my_fsm}, gen_fsm_SUITE, [], []),
 
-    ?line ok = do_func_test(Pid),
-    ?line ok = do_sync_func_test(Pid),
-    ?line ok = do_func_test(my_fsm),
-    ?line ok = do_sync_func_test(my_fsm),
-    ?line stop_it(Pid),
-    
-    test_server:messages_get(),
+    ok = do_func_test(Pid),
+    ok = do_sync_func_test(Pid),
+    ok = do_func_test(my_fsm),
+    ok = do_sync_func_test(my_fsm),
+    stop_it(Pid),
+
+    [] = get_messages(),
     %%process_flag(trap_exit, OldFl),
     ok.
 
 %% global register
 start10(Config) when is_list(Config) ->
-    ?line {ok, Pid} = 
+    {ok, Pid} =
 	gen_fsm:start({global, my_fsm}, gen_fsm_SUITE, [], []),
-    ?line {error, {already_started, Pid}} =
+    {error, {already_started, Pid}} =
 	gen_fsm:start({global, my_fsm}, gen_fsm_SUITE, [], []),
-    ?line {error, {already_started, Pid}} =
+    {error, {already_started, Pid}} =
 	gen_fsm:start_link({global, my_fsm}, gen_fsm_SUITE, [], []),
-    
-    ?line ok = do_func_test(Pid),
-    ?line ok = do_sync_func_test(Pid),
-    ?line ok = do_func_test({global, my_fsm}),
-    ?line ok = do_sync_func_test({global, my_fsm}),
-    ?line stop_it({global, my_fsm}),
-    
-    test_server:messages_get(),
+
+    ok = do_func_test(Pid),
+    ok = do_sync_func_test(Pid),
+    ok = do_func_test({global, my_fsm}),
+    ok = do_sync_func_test({global, my_fsm}),
+    stop_it({global, my_fsm}),
+
+    [] = get_messages(),
     ok.
 
 
 %% Stop registered processes
 start11(Config) when is_list(Config) ->
-    ?line {ok, Pid} = 
+    {ok, Pid} =
 	gen_fsm:start_link({local, my_fsm}, gen_fsm_SUITE, [], []),
-    ?line stop_it(Pid),
+    stop_it(Pid),
 
-    ?line {ok, _Pid1} = 
+    {ok, _Pid1} =
 	gen_fsm:start_link({local, my_fsm}, gen_fsm_SUITE, [], []),
-    ?line stop_it(my_fsm),
-    
-    ?line {ok, Pid2} = 
+    stop_it(my_fsm),
+
+    {ok, Pid2} =
 	gen_fsm:start({global, my_fsm}, gen_fsm_SUITE, [], []),
-    ?line stop_it(Pid2),
+    stop_it(Pid2),
     receive after 1 -> true end,
-    ?line Result = 
+    Result =
 	gen_fsm:start({global, my_fsm}, gen_fsm_SUITE, [], []),
     io:format("Result = ~p~n",[Result]),
-    ?line {ok, _Pid3} = Result, 
-    ?line stop_it({global, my_fsm}),
+    {ok, _Pid3} = Result,
+    stop_it({global, my_fsm}),
 
-    test_server:messages_get(),
+    [] = get_messages(),
     ok.
 
 %% Via register linked
 start12(Config) when is_list(Config) ->
-    ?line dummy_via:reset(),
-    ?line {ok, Pid} =
+    dummy_via:reset(),
+    {ok, Pid} =
 	gen_fsm:start_link({via, dummy_via, my_fsm}, gen_fsm_SUITE, [], []),
-    ?line {error, {already_started, Pid}} =
+    {error, {already_started, Pid}} =
 	gen_fsm:start_link({via, dummy_via, my_fsm}, gen_fsm_SUITE, [], []),
-    ?line {error, {already_started, Pid}} =
+    {error, {already_started, Pid}} =
 	gen_fsm:start({via, dummy_via, my_fsm}, gen_fsm_SUITE, [], []),
 
-    ?line ok = do_func_test(Pid),
-    ?line ok = do_sync_func_test(Pid),
-    ?line ok = do_func_test({via, dummy_via, my_fsm}),
-    ?line ok = do_sync_func_test({via, dummy_via, my_fsm}),
-    ?line stop_it({via, dummy_via, my_fsm}),
+    ok = do_func_test(Pid),
+    ok = do_sync_func_test(Pid),
+    ok = do_func_test({via, dummy_via, my_fsm}),
+    ok = do_sync_func_test({via, dummy_via, my_fsm}),
+    stop_it({via, dummy_via, my_fsm}),
 
-    test_server:messages_get(),
+    [] = get_messages(),
     ok.
 
 
@@ -339,7 +336,7 @@ stop6(_Config) ->
 stop7(_Config) ->
     dummy_via:reset(),
     {ok, Pid} = gen_fsm:start({via, dummy_via, to_stop},
-				  ?MODULE, [], []),
+			      ?MODULE, [], []),
     ok = gen_fsm:stop({via, dummy_via, to_stop}),
     false = erlang:is_process_alive(Pid),
     {'EXIT',noproc} = (catch gen_fsm:stop({via, dummy_via, to_stop})),
@@ -387,53 +384,57 @@ stop10(_Config) ->
     ok.
 
 %% Check that time outs in calls work
-abnormal1(suite) -> [];
 abnormal1(Config) when is_list(Config) ->
     {ok, _Pid} = gen_fsm:start({local, my_fsm}, gen_fsm_SUITE, [], []),
 
     %% timeout call.
     delayed = gen_fsm:sync_send_event(my_fsm, {delayed_answer,1}, 100),
     {'EXIT',{timeout,_}} =
-    (catch gen_fsm:sync_send_event(my_fsm, {delayed_answer,10}, 1)),
-    test_server:messages_get(),
+	(catch gen_fsm:sync_send_event(my_fsm, {delayed_answer,10}, 1)),
+    receive
+	Msg ->
+	    %% Ignore the delayed answer from the server.
+	    io:format("Delayed message: ~p", [Msg])
+    end,
+
+    [] = get_messages(),
     ok.
 
 %% Check that bad return values makes the fsm crash. Note that we must
 %% trap exit since we must link to get the real bad_return_ error
-abnormal2(suite) -> [];
 abnormal2(Config) when is_list(Config) ->
     OldFl = process_flag(trap_exit, true),
-    ?line {ok, Pid} = 
+    {ok, Pid} =
 	gen_fsm:start_link(gen_fsm_SUITE, [], []),
 
     %% bad return value in the gen_fsm loop
-    ?line {'EXIT',{{bad_return_value, badreturn},_}} =
+    {'EXIT',{{bad_return_value, badreturn},_}} =
 	(catch gen_fsm:sync_send_event(Pid, badreturn)),
-    
-    test_server:messages_get(),
+
+    [{'EXIT',Pid,{bad_return_value,badreturn}}] = get_messages(),
     process_flag(trap_exit, OldFl),
     ok.
 
 shutdown(Config) when is_list(Config) ->
-    ?line error_logger_forwarder:register(),
+    error_logger_forwarder:register(),
 
     process_flag(trap_exit, true),
 
-    ?line {ok,Pid0} = gen_fsm:start_link(gen_fsm_SUITE, [], []),
-    ?line ok = do_func_test(Pid0),
-    ?line ok = do_sync_func_test(Pid0),
-    ?line {shutdown,reason} = 
+    {ok,Pid0} = gen_fsm:start_link(gen_fsm_SUITE, [], []),
+    ok = do_func_test(Pid0),
+    ok = do_sync_func_test(Pid0),
+    {shutdown,reason} =
 	gen_fsm:sync_send_all_state_event(Pid0, stop_shutdown_reason),
     receive {'EXIT',Pid0,{shutdown,reason}} -> ok end,
     process_flag(trap_exit, false),
 
-    ?line {'EXIT', {noproc,_}} = 
+    {'EXIT', {noproc,_}} =
 	(catch gen_fsm:sync_send_event(Pid0, hej)),
 
     receive
 	Any ->
-	    ?line io:format("Unexpected: ~p", [Any]),
-	    ?line ?t:fail()
+	    io:format("Unexpected: ~p", [Any]),
+	    ct:fail(failed)
     after 500 ->
 	    ok
     end,
@@ -443,70 +444,70 @@ shutdown(Config) when is_list(Config) ->
 
 
 sys1(Config) when is_list(Config) ->
-    ?line {ok, Pid} = 
+    {ok, Pid} =
 	gen_fsm:start(gen_fsm_SUITE, [], []),
-    ?line {status, Pid, {module,gen_fsm}, _} = sys:get_status(Pid),
-    ?line sys:suspend(Pid),
-    ?line {'EXIT', {timeout,_}} = 
+    {status, Pid, {module,gen_fsm}, _} = sys:get_status(Pid),
+    sys:suspend(Pid),
+    {'EXIT', {timeout,_}} =
 	(catch gen_fsm:sync_send_event(Pid, hej)),
-    ?line sys:resume(Pid),
-    ?line stop_it(Pid).
+    sys:resume(Pid),
+    stop_it(Pid).
 
 call_format_status(Config) when is_list(Config) ->
-    ?line {ok, Pid} = gen_fsm:start(gen_fsm_SUITE, [], []),
-    ?line Status = sys:get_status(Pid),
-    ?line {status, Pid, _Mod, [_PDict, running, _, _, Data]} = Status,
-    ?line [format_status_called | _] = lists:reverse(Data),
-    ?line stop_it(Pid),
+    {ok, Pid} = gen_fsm:start(gen_fsm_SUITE, [], []),
+    Status = sys:get_status(Pid),
+    {status, Pid, _Mod, [_PDict, running, _, _, Data]} = Status,
+    [format_status_called | _] = lists:reverse(Data),
+    stop_it(Pid),
 
     %% check that format_status can handle a name being an atom (pid is
     %% already checked by the previous test)
-    ?line {ok, Pid2} = gen_fsm:start({local, gfsm}, gen_fsm_SUITE, [], []),
-    ?line Status2 = sys:get_status(gfsm),
-    ?line {status, Pid2, _Mod, [_PDict2, running, _, _, Data2]} = Status2,
-    ?line [format_status_called | _] = lists:reverse(Data2),
-    ?line stop_it(Pid2),
+    {ok, Pid2} = gen_fsm:start({local, gfsm}, gen_fsm_SUITE, [], []),
+    Status2 = sys:get_status(gfsm),
+    {status, Pid2, _Mod, [_PDict2, running, _, _, Data2]} = Status2,
+    [format_status_called | _] = lists:reverse(Data2),
+    stop_it(Pid2),
 
     %% check that format_status can handle a name being a term other than a
     %% pid or atom
     GlobalName1 = {global, "CallFormatStatus"},
-    ?line {ok, Pid3} = gen_fsm:start(GlobalName1, gen_fsm_SUITE, [], []),
-    ?line Status3 = sys:get_status(GlobalName1),
-    ?line {status, Pid3, _Mod, [_PDict3, running, _, _, Data3]} = Status3,
-    ?line [format_status_called | _] = lists:reverse(Data3),
-    ?line stop_it(Pid3),
+    {ok, Pid3} = gen_fsm:start(GlobalName1, gen_fsm_SUITE, [], []),
+    Status3 = sys:get_status(GlobalName1),
+    {status, Pid3, _Mod, [_PDict3, running, _, _, Data3]} = Status3,
+    [format_status_called | _] = lists:reverse(Data3),
+    stop_it(Pid3),
     GlobalName2 = {global, {name, "term"}},
-    ?line {ok, Pid4} = gen_fsm:start(GlobalName2, gen_fsm_SUITE, [], []),
-    ?line Status4 = sys:get_status(GlobalName2),
-    ?line {status, Pid4, _Mod, [_PDict4, running, _, _, Data4]} = Status4,
-    ?line [format_status_called | _] = lists:reverse(Data4),
-    ?line stop_it(Pid4),
+    {ok, Pid4} = gen_fsm:start(GlobalName2, gen_fsm_SUITE, [], []),
+    Status4 = sys:get_status(GlobalName2),
+    {status, Pid4, _Mod, [_PDict4, running, _, _, Data4]} = Status4,
+    [format_status_called | _] = lists:reverse(Data4),
+    stop_it(Pid4),
 
     %% check that format_status can handle a name being a term other than a
     %% pid or atom
-    ?line dummy_via:reset(),
+    dummy_via:reset(),
     ViaName1 = {via, dummy_via, "CallFormatStatus"},
-    ?line {ok, Pid5} = gen_fsm:start(ViaName1, gen_fsm_SUITE, [], []),
-    ?line Status5 = sys:get_status(ViaName1),
-    ?line {status, Pid5, _Mod, [_PDict5, running, _, _, Data5]} = Status5,
-    ?line [format_status_called | _] = lists:reverse(Data5),
-    ?line stop_it(Pid5),
+    {ok, Pid5} = gen_fsm:start(ViaName1, gen_fsm_SUITE, [], []),
+    Status5 = sys:get_status(ViaName1),
+    {status, Pid5, _Mod, [_PDict5, running, _, _, Data5]} = Status5,
+    [format_status_called | _] = lists:reverse(Data5),
+    stop_it(Pid5),
     ViaName2 = {via, dummy_via, {name, "term"}},
-    ?line {ok, Pid6} = gen_fsm:start(ViaName2, gen_fsm_SUITE, [], []),
-    ?line Status6 = sys:get_status(ViaName2),
-    ?line {status, Pid6, _Mod, [_PDict6, running, _, _, Data6]} = Status6,
-    ?line [format_status_called | _] = lists:reverse(Data6),
-    ?line stop_it(Pid6).
+    {ok, Pid6} = gen_fsm:start(ViaName2, gen_fsm_SUITE, [], []),
+    Status6 = sys:get_status(ViaName2),
+    {status, Pid6, _Mod, [_PDict6, running, _, _, Data6]} = Status6,
+    [format_status_called | _] = lists:reverse(Data6),
+    stop_it(Pid6).
 
 
 
 error_format_status(Config) when is_list(Config) ->
-    ?line error_logger_forwarder:register(),
+    error_logger_forwarder:register(),
     OldFl = process_flag(trap_exit, true),
     StateData = "called format_status",
-    ?line {ok, Pid} = gen_fsm:start(gen_fsm_SUITE, {state_data, StateData}, []),
+    {ok, Pid} = gen_fsm:start(gen_fsm_SUITE, {state_data, StateData}, []),
     %% bad return value in the gen_fsm loop
-    ?line {'EXIT',{{bad_return_value, badreturn},_}} =
+    {'EXIT',{{bad_return_value, badreturn},_}} =
 	(catch gen_fsm:sync_send_event(Pid, badreturn)),
     receive
 	{error,_GroupLeader,{Pid,
@@ -514,10 +515,9 @@ error_format_status(Config) when is_list(Config) ->
 			     [Pid,{_,_,badreturn},idle,{formatted,StateData},_]}} ->
 	    ok;
 	Other ->
-	    ?line io:format("Unexpected: ~p", [Other]),
-	    ?line ?t:fail()
+	    io:format("Unexpected: ~p", [Other]),
+	    ct:fail(failed)
     end,
-    ?t:messages_get(),
     process_flag(trap_exit, OldFl),
     ok.
 
@@ -534,12 +534,11 @@ terminate_crash_format(Config) when is_list(Config) ->
 	    ok;
 	Other ->
 	    io:format("Unexpected: ~p", [Other]),
-	    ?t:fail()
+	    ct:fail(failed)
     after 5000 ->
 	    io:format("Timeout: expected error logger msg", []),
-	    ?t:fail()
+	    ct:fail(failed)
     end,
-    _ = ?t:messages_get(),
     process_flag(trap_exit, OldFl),
     ok.
 
@@ -603,7 +602,9 @@ hibernate(Config) when is_list(Config) ->
     {ok, Pid0} = gen_fsm:start_link(?MODULE, hiber_now, []),
     is_in_erlang_hibernate(Pid0),
     stop_it(Pid0),
-    test_server:messages_get(),
+    receive
+	{'EXIT',Pid0,normal} -> ok
+    end,
 
     {ok, Pid} = gen_fsm:start_link(?MODULE, hiber, []),
     true = ({current_function,{erlang,hibernate,3}} =/=
@@ -677,7 +678,11 @@ hibernate(Config) when is_list(Config) ->
     good_morning  = gen_fsm:sync_send_all_state_event(Pid, wakeup_sync),
     is_not_in_erlang_hibernate(Pid),
     stop_it(Pid),
-    test_server:messages_get(),
+    receive
+	{'EXIT',Pid,normal} -> ok
+    end,
+
+    [] = get_messages(),
     process_flag(trap_exit, OldFl),
     ok.
 
@@ -687,7 +692,7 @@ is_in_erlang_hibernate(Pid) ->
 
 is_in_erlang_hibernate_1(0, Pid) ->
     io:format("~p\n", [erlang:process_info(Pid, current_function)]),
-    ?t:fail(not_in_erlang_hibernate_3);
+    ct:fail(not_in_erlang_hibernate_3);
 is_in_erlang_hibernate_1(N, Pid) ->
     {current_function,MFA} = erlang:process_info(Pid, current_function),
     case MFA of
@@ -704,7 +709,7 @@ is_not_in_erlang_hibernate(Pid) ->
 
 is_not_in_erlang_hibernate_1(0, Pid) ->
     io:format("~p\n", [erlang:process_info(Pid, current_function)]),
-    ?t:fail(not_in_erlang_hibernate_3);
+    ct:fail(not_in_erlang_hibernate_3);
 is_not_in_erlang_hibernate_1(N, Pid) ->
     {current_function,MFA} = erlang:process_info(Pid, current_function),
     case MFA of
@@ -715,108 +720,102 @@ is_not_in_erlang_hibernate_1(N, Pid) ->
 	    ok
     end.
 
-%%sys1(suite) -> [];
-%%sys1(_) ->
-
-enter_loop(suite) ->
-    [];
-enter_loop(doc) ->
-    ["Test gen_fsm:enter_loop/4,5,6"];
+%% Test gen_fsm:enter_loop/4,5,6.
 enter_loop(Config) when is_list(Config) ->
     OldFlag = process_flag(trap_exit, true),
 
-    ?line dummy_via:reset(),
+    dummy_via:reset(),
 
     %% Locally registered process + {local, Name}
-    ?line {ok, Pid1a} =
+    {ok, Pid1a} =
 	proc_lib:start_link(?MODULE, enter_loop, [local, local]),
-    ?line yes = gen_fsm:sync_send_event(Pid1a, 'alive?'),
-    ?line stopped = gen_fsm:sync_send_event(Pid1a, stop),
+    yes = gen_fsm:sync_send_event(Pid1a, 'alive?'),
+    stopped = gen_fsm:sync_send_event(Pid1a, stop),
     receive
 	{'EXIT', Pid1a, normal} ->
 	    ok
     after 5000 ->
-	    ?line test_server:fail(gen_fsm_did_not_die)
+	    ct:fail(gen_fsm_did_not_die)
     end,
 
     %% Unregistered process + {local, Name}
-    ?line {ok, Pid1b} =
+    {ok, Pid1b} =
 	proc_lib:start_link(?MODULE, enter_loop, [anon, local]),
     receive
 	{'EXIT', Pid1b, process_not_registered} ->
 	    ok
     after 5000 ->
-	    ?line test_server:fail(gen_fsm_did_not_die)
+	    ct:fail(gen_fsm_did_not_die)
     end,
 
     %% Globally registered process + {global, Name}
-    ?line {ok, Pid2a} =
+    {ok, Pid2a} =
 	proc_lib:start_link(?MODULE, enter_loop, [global, global]),
-    ?line yes = gen_fsm:sync_send_event(Pid2a, 'alive?'),
-    ?line stopped = gen_fsm:sync_send_event(Pid2a, stop),
+    yes = gen_fsm:sync_send_event(Pid2a, 'alive?'),
+    stopped = gen_fsm:sync_send_event(Pid2a, stop),
     receive
 	{'EXIT', Pid2a, normal} ->
 	    ok
     after 5000 ->
-	    ?line test_server:fail(gen_fsm_did_not_die)
+	    ct:fail(gen_fsm_did_not_die)
     end,
 
     %% Unregistered process + {global, Name}
-    ?line {ok, Pid2b} =
+    {ok, Pid2b} =
 	proc_lib:start_link(?MODULE, enter_loop, [anon, global]),
     receive
 	{'EXIT', Pid2b, process_not_registered_globally} ->
 	    ok
     after 5000 ->
-	    ?line test_server:fail(gen_fsm_did_not_die)
+	    ct:fail(gen_fsm_did_not_die)
     end,
 
     %% Unregistered process + no name
-    ?line {ok, Pid3} =
+    {ok, Pid3} =
 	proc_lib:start_link(?MODULE, enter_loop, [anon, anon]),
-    ?line yes = gen_fsm:sync_send_event(Pid3, 'alive?'),
-    ?line stopped = gen_fsm:sync_send_event(Pid3, stop),
+    yes = gen_fsm:sync_send_event(Pid3, 'alive?'),
+    stopped = gen_fsm:sync_send_event(Pid3, stop),
     receive
 	{'EXIT', Pid3, normal} ->
 	    ok
     after 5000 ->
-	    ?line test_server:fail(gen_fsm_did_not_die)
+	    ct:fail(gen_fsm_did_not_die)
     end,
 
     %% Process not started using proc_lib
-    ?line Pid4 =
+    Pid4 =
 	spawn_link(gen_fsm, enter_loop, [?MODULE, [], state0, []]),
     receive
 	{'EXIT', Pid4, process_was_not_started_by_proc_lib} ->
 	    ok
     after 5000 ->
-	    ?line test_server:fail(gen_fsm_did_not_die)
+	    ct:fail(gen_fsm_did_not_die)
     end,
 
     %% Make sure I am the parent, ie that ordering a shutdown will
     %% result in the process terminating with Reason==shutdown
-    ?line {ok, Pid5} =
+    {ok, Pid5} =
 	proc_lib:start_link(?MODULE, enter_loop, [anon, anon]),
-    ?line yes = gen_fsm:sync_send_event(Pid5, 'alive?'),
-    ?line exit(Pid5, shutdown),
+    yes = gen_fsm:sync_send_event(Pid5, 'alive?'),
+    exit(Pid5, shutdown),
     receive
 	{'EXIT', Pid5, shutdown} ->
 	    ok
     after 5000 ->
-	    ?line test_server:fail(gen_fsm_did_not_die)
+	    ct:fail(gen_fsm_did_not_die)
     end,
 
     %% Make sure gen_fsm:enter_loop does not accept {local,Name}
     %% when it's another process than the calling one which is
     %% registered under that name
     register(armitage, self()),
-    ?line {ok, Pid6a} =
+    {ok, Pid6a} =
 	proc_lib:start_link(?MODULE, enter_loop, [anon, local]),
     receive
 	{'EXIT', Pid6a, process_not_registered} ->
 	    ok
     after 1000 ->
-	    ?line test_server:fail(gen_fsm_started)
+	    ct:fail(gen_fsm_started)
     end,
     unregister(armitage),
 
@@ -824,25 +823,24 @@ enter_loop(Config) when is_list(Config) ->
     %% when it's another process than the calling one which is
     %% registered under that name
     global:register_name(armitage, self()),
-    ?line {ok, Pid6b} =
+    {ok, Pid6b} =
 	proc_lib:start_link(?MODULE, enter_loop, [anon, global]),
     receive
 	{'EXIT', Pid6b, process_not_registered_globally} ->
 	    ok
     after 1000 ->
-	    ?line test_server:fail(gen_fsm_started)
+	    ct:fail(gen_fsm_started)
     end,
     global:unregister_name(armitage),
 
     dummy_via:register_name(armitage, self()),
-    ?line {ok, Pid6c} =
+    {ok, Pid6c} =
 	proc_lib:start_link(?MODULE, enter_loop, [anon, via]),
     receive
 	{'EXIT', Pid6c, {process_not_registered_via, dummy_via}} ->
 	    ok
     after 1000 ->
-	    ?line test_server:fail({gen_fsm_started, process_info(self(),
-								 messages)})
+	    ct:fail({gen_fsm_started, process_info(self(), messages)})
     end,
     dummy_via:unregister_name(armitage),
 
@@ -883,8 +881,8 @@ wfor(Msg) ->
 
 
 stop_it(FSM) ->
-    ?line stopped = gen_fsm:sync_send_all_state_event(FSM, stop),
-    ?line {'EXIT',_} = 	(catch gen_fsm:sync_send_event(FSM, hej)),
+    stopped = gen_fsm:sync_send_all_state_event(FSM, stop),
+    {'EXIT',_} = 	(catch gen_fsm:sync_send_event(FSM, hej)),
     ok.
 
 
@@ -895,7 +893,7 @@ do_func_test(FSM) ->
     ok = do_connect(FSM),
     ok = gen_fsm:send_all_state_event(FSM, {'alive?', self()}),
     wfor(yes),
-    test_server:do_times(3, ?MODULE, do_msg, [FSM]),
+    _ = [do_msg(FSM) || _ <- lists:seq(1, 3)],
     ok = gen_fsm:send_all_state_event(FSM, {'alive?', self()}),
     wfor(yes),
     ok = do_disconnect(FSM),
@@ -933,7 +931,7 @@ do_sync_func_test(FSM) ->
     yes = gen_fsm:sync_send_all_state_event(FSM, 'alive?'),
     ok = do_sync_connect(FSM),
     yes = gen_fsm:sync_send_all_state_event(FSM, 'alive?'),
-    test_server:do_times(3, ?MODULE, do_sync_msg, [FSM]),
+    _ = [do_sync_msg(FSM) || _ <- lists:seq(1, 3)],
     yes = gen_fsm:sync_send_all_state_event(FSM, 'alive?'),
     ok = do_sync_disconnect(FSM),
     yes = gen_fsm:sync_send_all_state_event(FSM, 'alive?'),
@@ -964,7 +962,7 @@ do_sync_disconnect(FSM) ->
     yes = gen_fsm:sync_send_event(FSM, disconnect),
     check_state(FSM, idle).
 
-    
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
@@ -979,7 +977,7 @@ init(stop) ->
 init(stop_shutdown) ->
     {stop, shutdown};
 init(sleep) ->
-    test_server:sleep(1000),
+    timer:sleep(1000),
     {ok, idle, data};
 init({timeout, T}) ->
     {ok, idle, state, T};
@@ -1012,7 +1010,7 @@ idle(_, Data) ->
 idle({connect, _Pid}, _From, Data) ->
     {reply, accept, wfor_conf, Data};
 idle({delayed_answer, T}, _From, Data) ->
-    test_server:sleep(T),
+    timer:sleep(T),
     {reply, delayed, idle, Data};
 idle(badreturn, _From, _Data) ->
     badreturn;
@@ -1070,8 +1068,8 @@ hiber_idle('alive?', _From, Data) ->
     {reply, 'alive!', hiber_idle, Data};
 hiber_idle(hibernate_sync, _From, Data) ->
     {reply, hibernating, hiber_wakeup, Data,hibernate}.
-hiber_idle(timeout, hibernate_me) ->  % Arrive here from 
-				              % handle_info(hibernate_later,...)
+hiber_idle(timeout, hibernate_me) ->
+    %% Arrive here from handle_info(hibernate_later,...)
     {next_state, hiber_idle, [], hibernate};
 hiber_idle(hibernate_async, Data) ->
     {next_state,hiber_wakeup, Data, hibernate}.
@@ -1084,9 +1082,10 @@ hiber_wakeup(wakeup_async,Data) ->
     {next_state,hiber_idle,Data};
 hiber_wakeup(snooze_async,Data) ->
     {next_state,hiber_wakeup,Data,hibernate}.
-    
 
-handle_info(hibernate_now, _SName, _State) ->  % Arrive here from by direct ! from testcase
+
+handle_info(hibernate_now, _SName, _State) ->
+    %% Arrive here from by direct ! from testcase
     {next_state, hiber_idle, [], hibernate};
 handle_info(hibernate_later, _SName, _State) ->
     {next_state, hiber_idle, hibernate_me, 1000};
@@ -1134,3 +1133,9 @@ format_status(terminate, [_Pdict, StateData]) ->
     {formatted, StateData};
 format_status(normal, [_Pdict, _StateData]) ->
     [format_status_called].
+
+get_messages() ->
+    receive
+	Msg -> [Msg|get_messages()]
+    after 1 -> []
+    end.
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl
index 0ae763a48d..916fbc4e84 100644
--- a/lib/stdlib/test/gen_server_SUITE.erl
+++ b/lib/stdlib/test/gen_server_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(gen_server_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/inet.hrl").
 
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -40,7 +40,7 @@
 -export([stop1/1, stop2/1, stop3/1, stop4/1, stop5/1, stop6/1, stop7/1,
 	 stop8/1, stop9/1, stop10/1]).
 
-% spawn export
+%% spawn export
 -export([spec_init_local/2, spec_init_global/2, spec_init_via/2,
 	 spec_init_default_timeout/2, spec_init_global_default_timeout/2,
          spec_init_anonymous/1,
@@ -48,11 +48,13 @@
 	 spec_init_not_proc_lib/1, cast_fast_messup/0]).
 
 
-% The gen_server behaviour
+%% The gen_server behaviour
 -export([init/1, handle_call/3, handle_cast/2,
 	 handle_info/2, terminate/2, format_status/2]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [start, {group,stop}, crash, call, cast, cast_fast, info, abcast,
@@ -83,8 +85,6 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
--define(default_timeout, ?t:minutes(1)).
- 
 init_per_testcase(Case, Config) when Case == call_remote1;
 				     Case == call_remote2;
 				     Case == call_remote3;
@@ -92,11 +92,10 @@ init_per_testcase(Case, Config) when Case == call_remote1;
 				     Case == call_remote_n2;
 				     Case == call_remote_n3 ->
     {ok,N} = start_node(hubba),
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{node,N},{watchdog, Dog} | Config];
+    [{node,N} | Config];
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
+    Config.
+
 end_per_testcase(_Case, Config) ->
     case proplists:get_value(node, Config) of
 	undefined ->
@@ -104,8 +103,6 @@ end_per_testcase(_Case, Config) ->
 	N ->
 	    test_server:stop_node(N)
     end,
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
     ok.
 
 
@@ -113,131 +110,133 @@ end_per_testcase(_Case, Config) ->
 %% Start and stop a gen_server.
 %% --------------------------------------
 
-start(suite) -> [];
 start(Config) when is_list(Config) ->
     OldFl = process_flag(trap_exit, true),
 
     %% anonymous
-    ?line {ok, Pid0} = gen_server:start(gen_server_SUITE, [], []),
-    ?line ok = gen_server:call(Pid0, started_p),
-    ?line ok = gen_server:call(Pid0, stop),
-    ?line busy_wait_for_process(Pid0,600),
-    ?line {'EXIT', {noproc,_}} = (catch gen_server:call(Pid0, started_p, 1)),
+    {ok, Pid0} = gen_server:start(gen_server_SUITE, [], []),
+    ok = gen_server:call(Pid0, started_p),
+    ok = gen_server:call(Pid0, stop),
+    busy_wait_for_process(Pid0,600),
+    {'EXIT', {noproc,_}} = (catch gen_server:call(Pid0, started_p, 1)),
 
     %% anonymous with timeout
-    ?line {ok, Pid00} = gen_server:start(gen_server_SUITE, [],
-					 [{timeout,1000}]),
-    ?line ok = gen_server:call(Pid00, started_p),
-    ?line ok = gen_server:call(Pid00, stop),
-    ?line {error, timeout} = gen_server:start(gen_server_SUITE, sleep,
-					      [{timeout,100}]),
+    {ok, Pid00} = gen_server:start(gen_server_SUITE, [],
+				   [{timeout,1000}]),
+    ok = gen_server:call(Pid00, started_p),
+    ok = gen_server:call(Pid00, stop),
+    {error, timeout} = gen_server:start(gen_server_SUITE, sleep,
+					[{timeout,100}]),
 
     %% anonymous with ignore
-    ?line ignore = gen_server:start(gen_server_SUITE, ignore, []),
+    ignore = gen_server:start(gen_server_SUITE, ignore, []),
 
     %% anonymous with stop
-    ?line {error, stopped} = gen_server:start(gen_server_SUITE, stop, []),
+    {error, stopped} = gen_server:start(gen_server_SUITE, stop, []),
 
     %% anonymous linked
-    ?line {ok, Pid1} =
+    {ok, Pid1} =
 	gen_server:start_link(gen_server_SUITE, [], []),
-    ?line ok = gen_server:call(Pid1, started_p),
-    ?line ok = gen_server:call(Pid1, stop),
-    ?line receive
-	      {'EXIT', Pid1, stopped} ->
-		  ok
-	  after 5000 ->
-		  test_server:fail(not_stopped)
-	  end,
+    ok = gen_server:call(Pid1, started_p),
+    ok = gen_server:call(Pid1, stop),
+    receive
+	{'EXIT', Pid1, stopped} ->
+	    ok
+    after 5000 ->
+	    ct:fail(not_stopped)
+    end,
 
     %% local register
-    ?line {ok, Pid2} =
+    {ok, Pid2} =
 	gen_server:start({local, my_test_name},
 			 gen_server_SUITE, [], []),
-    ?line ok = gen_server:call(my_test_name, started_p),
-    ?line {error, {already_started, Pid2}} =
+    ok = gen_server:call(my_test_name, started_p),
+    {error, {already_started, Pid2}} =
 	gen_server:start({local, my_test_name},
 			 gen_server_SUITE, [], []),
-    ?line ok = gen_server:call(my_test_name, stop),
+    ok = gen_server:call(my_test_name, stop),
 
-    ?line busy_wait_for_process(Pid2,600),
+    busy_wait_for_process(Pid2,600),
 
-    ?line {'EXIT', {noproc,_}} = (catch gen_server:call(Pid2, started_p, 10)),
+    {'EXIT', {noproc,_}} = (catch gen_server:call(Pid2, started_p, 10)),
 
     %% local register linked
-    ?line {ok, Pid3} =
+    {ok, Pid3} =
 	gen_server:start_link({local, my_test_name},
 			      gen_server_SUITE, [], []), 
-    ?line ok = gen_server:call(my_test_name, started_p),
-    ?line {error, {already_started, Pid3}} =
+    ok = gen_server:call(my_test_name, started_p),
+    {error, {already_started, Pid3}} =
 	gen_server:start({local, my_test_name},
 			 gen_server_SUITE, [], []),
-    ?line ok = gen_server:call(my_test_name, stop),
-    ?line receive
-	      {'EXIT', Pid3, stopped} ->
-		  ok
-	  after 5000 ->
-		  test_server:fail(not_stopped)
-	  end,
+    ok = gen_server:call(my_test_name, stop),
+    receive
+	{'EXIT', Pid3, stopped} ->
+	    ok
+    after 5000 ->
+	    ct:fail(not_stopped)
+    end,
 
     %% global register
-    ?line {ok, Pid4} =
+    {ok, Pid4} =
 	gen_server:start({global, my_test_name},
 			 gen_server_SUITE, [], []),
-    ?line ok = gen_server:call({global, my_test_name}, started_p),
-    ?line {error, {already_started, Pid4}} =
+    ok = gen_server:call({global, my_test_name}, started_p),
+    {error, {already_started, Pid4}} =
 	gen_server:start({global, my_test_name},
 			 gen_server_SUITE, [], []),
-    ?line ok = gen_server:call({global, my_test_name}, stop),
-    test_server:sleep(1),
-    ?line {'EXIT', {noproc,_}} = (catch gen_server:call(Pid4, started_p, 10)),
+    ok = gen_server:call({global, my_test_name}, stop),
+    ct:sleep(1),
+    {'EXIT', {noproc,_}} = (catch gen_server:call(Pid4, started_p, 10)),
 
     %% global register linked
-    ?line {ok, Pid5} =
+    {ok, Pid5} =
 	gen_server:start_link({global, my_test_name},
 			      gen_server_SUITE, [], []), 
-    ?line ok = gen_server:call({global, my_test_name}, started_p),
-    ?line {error, {already_started, Pid5}} =
+    ok = gen_server:call({global, my_test_name}, started_p),
+    {error, {already_started, Pid5}} =
 	gen_server:start({global, my_test_name},
 			 gen_server_SUITE, [], []),
-    ?line ok = gen_server:call({global, my_test_name}, stop),
-    ?line receive
-	      {'EXIT', Pid5, stopped} ->
-		  ok
-	  after 5000 ->
-		  test_server:fail(not_stopped)
-	  end,
+    ok = gen_server:call({global, my_test_name}, stop),
+    receive
+	{'EXIT', Pid5, stopped} ->
+	    ok
+    after 5000 ->
+	    ct:fail(not_stopped)
+    end,
 
     %% via register
-    ?line dummy_via:reset(),
-    ?line {ok, Pid6} =
+    dummy_via:reset(),
+    {ok, Pid6} =
 	gen_server:start({via, dummy_via, my_test_name},
 			 gen_server_SUITE, [], []),
-    ?line ok = gen_server:call({via, dummy_via, my_test_name}, started_p),
-    ?line {error, {already_started, Pid6}} =
+    ok = gen_server:call({via, dummy_via, my_test_name}, started_p),
+    {error, {already_started, Pid6}} =
 	gen_server:start({via, dummy_via, my_test_name},
 			 gen_server_SUITE, [], []),
-    ?line ok = gen_server:call({via, dummy_via, my_test_name}, stop),
-    test_server:sleep(1),
-    ?line {'EXIT', {noproc,_}} = (catch gen_server:call(Pid6, started_p, 10)),
+    ok = gen_server:call({via, dummy_via, my_test_name}, stop),
+    ct:sleep(1),
+    {'EXIT', {noproc,_}} = (catch gen_server:call(Pid6, started_p, 10)),
 
     %% via register linked
-    ?line dummy_via:reset(),
-    ?line {ok, Pid7} =
+    dummy_via:reset(),
+    {ok, Pid7} =
 	gen_server:start_link({via, dummy_via, my_test_name},
 			      gen_server_SUITE, [], []),
-    ?line ok = gen_server:call({via, dummy_via, my_test_name}, started_p),
-    ?line {error, {already_started, Pid7}} =
+    ok = gen_server:call({via, dummy_via, my_test_name}, started_p),
+    {error, {already_started, Pid7}} =
 	gen_server:start({via, dummy_via, my_test_name},
 			 gen_server_SUITE, [], []),
-    ?line ok = gen_server:call({via, dummy_via, my_test_name}, stop),
-    ?line receive
-	      {'EXIT', Pid7, stopped} ->
-		  ok
-	  after 5000 ->
-		  test_server:fail(not_stopped)
-	  end,
-    test_server:messages_get(),
+    ok = gen_server:call({via, dummy_via, my_test_name}, stop),
+    receive
+	{'EXIT', Pid7, stopped} ->
+	    ok
+    after 5000 ->
+	    ct:fail(not_stopped)
+    end,
+    receive
+	Msg -> ct:fail({unexpected,Msg})
+    after 1 -> ok
+    end,
 
     process_flag(trap_exit, OldFl),
     ok.
@@ -294,7 +293,7 @@ stop6(_Config) ->
 stop7(_Config) ->
     dummy_via:reset(),
     {ok, Pid} = gen_server:start({via, dummy_via, to_stop},
-				  ?MODULE, [], []),
+				 ?MODULE, [], []),
     ok = gen_server:stop({via, dummy_via, to_stop}),
     false = erlang:is_process_alive(Pid),
     {'EXIT',noproc} = (catch gen_server:stop({via, dummy_via, to_stop})),
@@ -342,31 +341,31 @@ stop10(_Config) ->
     ok.
 
 crash(Config) when is_list(Config) ->
-    ?line error_logger_forwarder:register(),
+    error_logger_forwarder:register(),
 
     process_flag(trap_exit, true),
 
     %% This crash should not generate a crash report.
-    ?line {ok,Pid0} = gen_server:start_link(?MODULE, [], []),
-    ?line {'EXIT',{{shutdown,reason},_}} =
+    {ok,Pid0} = gen_server:start_link(?MODULE, [], []),
+    {'EXIT',{{shutdown,reason},_}} =
  	(catch gen_server:call(Pid0, shutdown_reason)),
     receive {'EXIT',Pid0,{shutdown,reason}} -> ok end,
 
     %% This crash should not generate a crash report.
-    ?line {ok,Pid1} = gen_server:start_link(?MODULE, {state,state1}, []),
-    ?line {'EXIT',{{shutdown,stop_reason},_}} =
+    {ok,Pid1} = gen_server:start_link(?MODULE, {state,state1}, []),
+    {'EXIT',{{shutdown,stop_reason},_}} =
 	(catch gen_server:call(Pid1, stop_shutdown_reason)),
     receive {'EXIT',Pid1,{shutdown,stop_reason}} -> ok end,
 
     %% This crash should not generate a crash report.
-    ?line {ok,Pid2} = gen_server:start_link(?MODULE, [], []),
-    ?line {'EXIT',{shutdown,_}} =
+    {ok,Pid2} = gen_server:start_link(?MODULE, [], []),
+    {'EXIT',{shutdown,_}} =
  	(catch gen_server:call(Pid2, exit_shutdown)),
     receive {'EXIT',Pid2,shutdown} -> ok end,
 
     %% This crash should not generate a crash report.
-    ?line {ok,Pid3} = gen_server:start_link(?MODULE, {state,state3}, []),
-    ?line {'EXIT',{shutdown,_}} =
+    {ok,Pid3} = gen_server:start_link(?MODULE, {state,state3}, []),
+    {'EXIT',{shutdown,_}} =
 	(catch gen_server:call(Pid3, stop_shutdown)),
     receive {'EXIT',Pid3,shutdown} -> ok end,
 
@@ -374,8 +373,8 @@ crash(Config) when is_list(Config) ->
 
     %% This crash should generate a crash report and a report
     %% from gen_server.
-    ?line {ok,Pid4} = gen_server:start(?MODULE, {state,state4}, []),
-    ?line {'EXIT',{crashed,_}} = (catch gen_server:call(Pid4, crash)),
+    {ok,Pid4} = gen_server:start(?MODULE, {state,state4}, []),
+    {'EXIT',{crashed,_}} = (catch gen_server:call(Pid4, crash)),
     receive
 	{error,_GroupLeader4,{Pid4,
 			      "** Generic server"++_,
@@ -384,22 +383,22 @@ crash(Config) when is_list(Config) ->
 					 |_Stacktrace]}]}} ->
 	    ok;
 	Other4a ->
- 	    ?line io:format("Unexpected: ~p", [Other4a]),
- 	    ?line ?t:fail()
+	    io:format("Unexpected: ~p", [Other4a]),
+	    ct:fail(failed)
     end,
     receive
 	{error_report,_,{Pid4,crash_report,[List4|_]}} ->
 	    {exit,crashed,_} = proplists:get_value(error_info, List4),
 	    Pid4 = proplists:get_value(pid, List4);
 	Other4 ->
-	    ?line io:format("Unexpected: ~p", [Other4]),
-	    ?line ?t:fail()
+	    io:format("Unexpected: ~p", [Other4]),
+	    ct:fail(failed)
     end,
 
     receive
 	Any ->
-	    ?line io:format("Unexpected: ~p", [Any]),
-	    ?line ?t:fail()
+	    io:format("Unexpected: ~p", [Any]),
+	    ct:fail(failed)
     after 500 ->
 	    ok
     end,
@@ -412,32 +411,31 @@ crash(Config) when is_list(Config) ->
 %% handle_call.
 %% --------------------------------------
 
-call(suite) -> [];
 call(Config) when is_list(Config) ->
     OldFl = process_flag(trap_exit, true),
 
-    ?line {ok, _Pid} =
+    {ok, _Pid} =
 	gen_server:start_link({local, my_test_name},
 			      gen_server_SUITE, [], []),
 
-    ?line ok = gen_server:call(my_test_name, started_p),
-    ?line delayed = gen_server:call(my_test_name, {delayed_answer,1}),
+    ok = gen_server:call(my_test_name, started_p),
+    delayed = gen_server:call(my_test_name, {delayed_answer,1}),
 
     %% two requests within a specified time.
-    ?line ok = gen_server:call(my_test_name, {call_within, 1000}),
-    test_server:sleep(500),
-    ?line ok = gen_server:call(my_test_name, next_call),
-    ?line ok = gen_server:call(my_test_name, {call_within, 1000}),
-    test_server:sleep(1500),
-    ?line false = gen_server:call(my_test_name, next_call),
-    
+    ok = gen_server:call(my_test_name, {call_within, 1000}),
+    timer:sleep(500),
+    ok = gen_server:call(my_test_name, next_call),
+    ok = gen_server:call(my_test_name, {call_within, 1000}),
+    timer:sleep(1500),
+    false = gen_server:call(my_test_name, next_call),
+
     %% timeout call.
-    ?line delayed = gen_server:call(my_test_name, {delayed_answer,1}, 30),
-    ?line {'EXIT',{timeout,_}} =
+    delayed = gen_server:call(my_test_name, {delayed_answer,1}, 30),
+    {'EXIT',{timeout,_}} =
 	(catch gen_server:call(my_test_name, {delayed_answer,30}, 1)),
 
     %% bad return value in the gen_server loop from handle_call.
-    ?line {'EXIT',{{bad_return_value, badreturn},_}} =
+    {'EXIT',{{bad_return_value, badreturn},_}} =
 	(catch gen_server:call(my_test_name, badreturn)),
 
     process_flag(trap_exit, OldFl),
@@ -448,92 +446,86 @@ call(Config) when is_list(Config) ->
 %% --------------------------------------
 
 start_node(Name) ->
-    ?line Pa = filename:dirname(code:which(?MODULE)),
-    ?line N = test_server:start_node(Name, slave, [{args, " -pa " ++ Pa}]),
+    Pa = filename:dirname(code:which(?MODULE)),
+    N = test_server:start_node(Name, slave, [{args, " -pa " ++ Pa}]),
     %% After starting a slave, it takes a little while until global knows
     %% about it, even if nodes() includes it, so we make sure that global
     %% knows about it before registering something on all nodes.
     global:sync(),
     N.
 
-call_remote1(suite) -> [];
 call_remote1(Config) when is_list(Config) ->
     N = hubba,
-    ?line Node = proplists:get_value(node,Config),
-    ?line {ok, Pid} = rpc:call(Node, gen_server, start,
-			       [{global, N}, ?MODULE, [], []]),    
-    ?line ok = (catch gen_server:call({global, N}, started_p, infinity)),
-    ?line exit(Pid, boom),
-    ?line {'EXIT', {Reason, _}} = (catch gen_server:call({global, N},
-							 started_p, infinity)),
-    ?line true = (Reason == noproc) orelse (Reason == boom),
+    Node = proplists:get_value(node,Config),
+    {ok, Pid} = rpc:call(Node, gen_server, start,
+			 [{global, N}, ?MODULE, [], []]),
+    ok = (catch gen_server:call({global, N}, started_p, infinity)),
+    exit(Pid, boom),
+    {'EXIT', {Reason, _}} = (catch gen_server:call({global, N},
+						   started_p, infinity)),
+    true = (Reason == noproc) orelse (Reason == boom),
     ok.
 
-call_remote2(suite) -> [];
 call_remote2(Config) when is_list(Config) ->
-    ?line N = hubba,
-    ?line Node = proplists:get_value(node,Config),
-
-    ?line {ok, Pid} = rpc:call(Node, gen_server, start,
-			       [{global, N}, ?MODULE, [], []]),
-    ?line ok = (catch gen_server:call(Pid, started_p, infinity)),
-    ?line exit(Pid, boom),
-    ?line {'EXIT', {Reason, _}} = (catch gen_server:call(Pid,
-							 started_p, infinity)),
-    ?line true = (Reason == noproc) orelse (Reason == boom),
+    N = hubba,
+    Node = proplists:get_value(node,Config),
+
+    {ok, Pid} = rpc:call(Node, gen_server, start,
+			 [{global, N}, ?MODULE, [], []]),
+    ok = (catch gen_server:call(Pid, started_p, infinity)),
+    exit(Pid, boom),
+    {'EXIT', {Reason, _}} = (catch gen_server:call(Pid,
+						   started_p, infinity)),
+    true = (Reason == noproc) orelse (Reason == boom),
     ok.
 
-call_remote3(suite) -> [];
 call_remote3(Config) when is_list(Config) ->
-    ?line Node = proplists:get_value(node,Config),
-
-    ?line {ok, Pid} = rpc:call(Node, gen_server, start,
-			       [{local, piller}, ?MODULE, [], []]),
-    ?line ok = (catch gen_server:call({piller, Node}, started_p, infinity)),
-    ?line exit(Pid, boom),
-    ?line {'EXIT', {Reason, _}} = (catch gen_server:call({piller, Node},
-							 started_p, infinity)),
-    ?line true = (Reason == noproc) orelse (Reason == boom),
+    Node = proplists:get_value(node,Config),
+
+    {ok, Pid} = rpc:call(Node, gen_server, start,
+			 [{local, piller}, ?MODULE, [], []]),
+    ok = (catch gen_server:call({piller, Node}, started_p, infinity)),
+    exit(Pid, boom),
+    {'EXIT', {Reason, _}} = (catch gen_server:call({piller, Node},
+						   started_p, infinity)),
+    true = (Reason == noproc) orelse (Reason == boom),
     ok.
 
 %% --------------------------------------
 %% Test call to nonexisting node
 %% --------------------------------------
 
-call_remote_n1(suite) -> [];
 call_remote_n1(Config) when is_list(Config) ->
-    ?line N = hubba,
-    ?line Node = proplists:get_value(node,Config),    
-    ?line {ok, _Pid} = rpc:call(Node, gen_server, start,
-			       [{global, N}, ?MODULE, [], []]),
-    ?line _ = test_server:stop_node(Node),
-    ?line {'EXIT', {noproc, _}} =
+    N = hubba,
+    Node = proplists:get_value(node,Config),
+    {ok, _Pid} = rpc:call(Node, gen_server, start,
+			  [{global, N}, ?MODULE, [], []]),
+    _ = test_server:stop_node(Node),
+    {'EXIT', {noproc, _}} =
 	(catch gen_server:call({global, N}, started_p, infinity)),
 
     ok.
 
-call_remote_n2(suite) -> [];
 call_remote_n2(Config) when is_list(Config) ->
-    ?line N = hubba,
-    ?line Node = proplists:get_value(node,Config),
+    N = hubba,
+    Node = proplists:get_value(node,Config),
 
-    ?line {ok, Pid} = rpc:call(Node, gen_server, start,
-			       [{global, N}, ?MODULE, [], []]),
-    ?line _ = test_server:stop_node(Node),
-    ?line {'EXIT', {{nodedown, Node}, _}} = (catch gen_server:call(Pid,
-							 started_p, infinity)),
+    {ok, Pid} = rpc:call(Node, gen_server, start,
+			 [{global, N}, ?MODULE, [], []]),
+    _ = test_server:stop_node(Node),
+    {'EXIT', {{nodedown, Node}, _}} = (catch gen_server:call(Pid,
+							     started_p, infinity)),
 
     ok.
 
-call_remote_n3(suite) -> [];
 call_remote_n3(Config) when is_list(Config) ->
-    ?line Node = proplists:get_value(node,Config),
+    Node = proplists:get_value(node,Config),
 
-    ?line {ok, _Pid} = rpc:call(Node, gen_server, start,
-			       [{local, piller}, ?MODULE, [], []]),
-    ?line _ = test_server:stop_node(Node),
-    ?line {'EXIT', {{nodedown, Node}, _}} = (catch gen_server:call({piller, Node},
-							 started_p, infinity)),
+    {ok, _Pid} = rpc:call(Node, gen_server, start,
+			  [{local, piller}, ?MODULE, [], []]),
+    _ = test_server:stop_node(Node),
+    {'EXIT', {{nodedown, Node}, _}} = (catch gen_server:call({piller, Node},
+							     started_p, infinity)),
 
     ok.
 
@@ -543,58 +535,56 @@ call_remote_n3(Config) when is_list(Config) ->
 %% handle_cast.
 %% --------------------------------------
 
-cast(suite) -> [];
 cast(Config) when is_list(Config) ->
-    ?line {ok, Pid} =
+    {ok, Pid} =
 	gen_server:start({local, my_test_name},
 			 gen_server_SUITE, [], []),
 
-    ?line ok = gen_server:call(my_test_name, started_p),
-
-    ?line ok = gen_server:cast(my_test_name, {self(),handle_cast}),
-    ?line receive
-	      {Pid, handled_cast} ->
-		  ok
-	  after 1000 ->
-		  test_server:fail(handle_cast)
-	  end,
-    
-    ?line ok = gen_server:cast(my_test_name, {self(),delayed_cast,1}),
-    ?line receive
-	      {Pid, delayed} ->
-		  ok
-	  after 1000 ->
-		  test_server:fail(delayed_cast)
-	  end,
-    
-    ?line ok = gen_server:cast(my_test_name, {self(),stop}),
-    ?line receive
-	      {Pid, stopped} ->
-		  ok
-	  after 1000 ->
-		  test_server:fail(stop)
-	  end,
+    ok = gen_server:call(my_test_name, started_p),
+
+    ok = gen_server:cast(my_test_name, {self(),handle_cast}),
+    receive
+	{Pid, handled_cast} ->
+	    ok
+    after 1000 ->
+	    ct:fail(handle_cast)
+    end,
+
+    ok = gen_server:cast(my_test_name, {self(),delayed_cast,1}),
+    receive
+	{Pid, delayed} ->
+	    ok
+    after 1000 ->
+	    ct:fail(delayed_cast)
+    end,
+
+    ok = gen_server:cast(my_test_name, {self(),stop}),
+    receive
+	{Pid, stopped} ->
+	    ok
+    after 1000 ->
+	    ct:fail(stop)
+    end,
     ok.
 
-cast_fast(suite) -> [];
-cast_fast(doc) -> ["Test that cast really return immediately"];
+%% Test that cast really return immediately.
 cast_fast(Config) when is_list(Config) ->
-    ?line {ok,Node} = start_node(hubba),
-    ?line {_,"@"++Host} = lists:splitwith(fun ($@) -> false; (_) -> true end,
-					   atom_to_list(Node)),
-    ?line FalseNode = list_to_atom("hopp@"++Host),
-    ?line true = rpc:cast(Node, ?MODULE, cast_fast_messup, []),
-%    ?line io:format("Nodes ~p~n", [rpc:call(N, ?MODULE, cast_fast_messup, [])]),
-    ?line test_server:sleep(1000),
-    ?line [Node] = nodes(),
-    ?line {Time,ok} = test_server:timecall(gen_server, cast, 
-					   [{hopp,FalseNode},hopp]),
-    ?line true = test_server:stop_node(Node),
-    ?line if Time > 1.0 -> % Default listen timeout is about 7.0 s
-		  test_server:fail(hanging_cast);
-	     true -> 
-		  ok
-	  end.
+    {ok,Node} = start_node(hubba),
+    {_,"@"++Host} = lists:splitwith(fun ($@) -> false; (_) -> true end,
+				    atom_to_list(Node)),
+    FalseNode = list_to_atom("hopp@"++Host),
+    true = rpc:cast(Node, ?MODULE, cast_fast_messup, []),
+    ct:sleep(1000),
+    [Node] = nodes(),
+    {Time,ok} = timer:tc(fun() ->
+				 gen_server:cast({hopp,FalseNode}, hopp)
+			 end),
+    true = test_server:stop_node(Node),
+    if Time > 1000000 ->       % Default listen timeout is about 7.0 s
+	    ct:fail(hanging_cast);
+       true ->
+	    ok
+    end.
 
 cast_fast_messup() ->
     %% Register a false node: hopp@hostname
@@ -609,37 +599,36 @@ cast_fast_messup() ->
 %% Test handle_info.
 %% --------------------------------------
 
-info(suite) -> [];
 info(Config) when is_list(Config) ->
-    ?line {ok, Pid} =
+    {ok, Pid} =
 	gen_server:start({local, my_test_name},
 			 gen_server_SUITE, [], []),
 
-    ?line ok = gen_server:call(my_test_name, started_p),
-
-    ?line Pid ! {self(),handle_info},
-    ?line receive
-	      {Pid, handled_info} ->
-		  ok
-	  after 1000 ->
-		  test_server:fail(handle_info)
-	  end,
-    
-    ?line Pid ! {self(),delayed_info,1},
-    ?line receive
-	      {Pid, delayed_info} ->
-		  ok
-	  after 1000 ->
-		  test_server:fail(delayed_info)
-	  end,
-    
-    ?line Pid ! {self(),stop},
-    ?line receive
-	      {Pid, stopped_info} ->
-		  ok
-	  after 1000 ->
-		  test_server:fail(stop_info)
-	  end,
+    ok = gen_server:call(my_test_name, started_p),
+
+    Pid ! {self(),handle_info},
+    receive
+	{Pid, handled_info} ->
+	    ok
+    after 1000 ->
+	    ct:fail(handle_info)
+    end,
+
+    Pid ! {self(),delayed_info,1},
+    receive
+	{Pid, delayed_info} ->
+	    ok
+    after 1000 ->
+	    ct:fail(delayed_info)
+    end,
+
+    Pid ! {self(),stop},
+    receive
+	{Pid, stopped_info} ->
+	    ok
+    after 1000 ->
+	    ct:fail(stop_info)
+    end,
     ok.
 
 hibernate(Config) when is_list(Config) ->
@@ -653,7 +642,7 @@ hibernate(Config) when is_list(Config) ->
 	{'EXIT', Pid0, stopped} ->
  	    ok
     after 5000 ->
-	    test_server:fail(gen_server_did_not_die)
+	    ct:fail(gen_server_did_not_die)
     end,
 
     {ok, Pid} =
@@ -720,7 +709,7 @@ hibernate(Config) when is_list(Config) ->
 	{'EXIT', Pid, stopped} ->
  	    ok
     after 5000 ->
-	    test_server:fail(gen_server_did_not_die)
+	    ct:fail(gen_server_did_not_die)
     end,
     process_flag(trap_exit, OldFl),
     ok.
@@ -731,7 +720,7 @@ is_in_erlang_hibernate(Pid) ->
 
 is_in_erlang_hibernate_1(0, Pid) ->
     io:format("~p\n", [erlang:process_info(Pid, current_function)]),
-    ?t:fail(not_in_erlang_hibernate_3);
+    ct:fail(not_in_erlang_hibernate_3);
 is_in_erlang_hibernate_1(N, Pid) ->
     {current_function,MFA} = erlang:process_info(Pid, current_function),
     case MFA of
@@ -748,38 +737,37 @@ is_in_erlang_hibernate_1(N, Pid) ->
 %% handle_cast.
 %% --------------------------------------
 
-abcast(suite) -> [];
 abcast(Config) when is_list(Config) ->
-    ?line {ok, Pid} =
+    {ok, Pid} =
 	gen_server:start({local, my_test_name},
 			 gen_server_SUITE, [], []),
 
-    ?line ok = gen_server:call(my_test_name, started_p),
-
-    ?line abcast = gen_server:abcast(my_test_name, {self(),handle_cast}),
-    ?line receive
-	      {Pid, handled_cast} ->
-		  ok
-	  after 1000 ->
-		  test_server:fail(abcast)
-	  end,
-    
-    ?line abcast = gen_server:abcast([node()], my_test_name,
-				     {self(),delayed_cast,1}),
-    ?line receive
-	      {Pid, delayed} ->
-		  ok
-	  after 1000 ->
-		  test_server:fail(delayed_abcast)
-	  end,
-    
-    ?line abcast = gen_server:abcast(my_test_name, {self(),stop}),
-    ?line receive
-	      {Pid, stopped} ->
-		  ok
-	  after 1000 ->
-		  test_server:fail(abcast_stop)
-	  end,
+    ok = gen_server:call(my_test_name, started_p),
+
+    abcast = gen_server:abcast(my_test_name, {self(),handle_cast}),
+    receive
+	{Pid, handled_cast} ->
+	    ok
+    after 1000 ->
+	    ct:fail(abcast)
+    end,
+
+    abcast = gen_server:abcast([node()], my_test_name,
+			       {self(),delayed_cast,1}),
+    receive
+	{Pid, delayed} ->
+	    ok
+    after 1000 ->
+	    ct:fail(delayed_abcast)
+    end,
+
+    abcast = gen_server:abcast(my_test_name, {self(),stop}),
+    receive
+	{Pid, stopped} ->
+	    ok
+    after 1000 ->
+	    ct:fail(abcast_stop)
+    end,
     ok.
 
 %% --------------------------------------
@@ -788,58 +776,56 @@ abcast(Config) when is_list(Config) ->
 %% handle_call.
 %% --------------------------------------
 
-multicall(suite) -> [];
 multicall(Config) when is_list(Config) ->
     OldFl = process_flag(trap_exit, true),
 
-    ?line {ok, Pid} =
+    {ok, Pid} =
 	gen_server:start_link({local, my_test_name},
 			      gen_server_SUITE, [], []),
 
-    ?line ok = gen_server:call(my_test_name, started_p),
+    ok = gen_server:call(my_test_name, started_p),
     Nodes = nodes(),
     Node = node(),
-    ?line {[{Node,delayed}],Nodes} =
-	   gen_server:multi_call(my_test_name, {delayed_answer,1}),
+    {[{Node,delayed}],Nodes} =
+	gen_server:multi_call(my_test_name, {delayed_answer,1}),
 
     %% two requests within a specified time.
-    ?line {[{Node,ok}],[]} =
-	   gen_server:multi_call([Node], my_test_name, {call_within, 1000}),
-    test_server:sleep(500),
-    ?line {[{Node,ok}],[]} =
-	   gen_server:multi_call([Node], my_test_name, next_call),
-    ?line  {[{Node,ok}],[]} =
-	    gen_server:multi_call([Node], my_test_name, {call_within, 1000}),
-    test_server:sleep(1500),
-    ?line {[{Node,false}],[]} =
-	   gen_server:multi_call([Node],my_test_name, next_call),
+    {[{Node,ok}],[]} =
+	gen_server:multi_call([Node], my_test_name, {call_within, 1000}),
+    timer:sleep(500),
+    {[{Node,ok}],[]} =
+	gen_server:multi_call([Node], my_test_name, next_call),
+    {[{Node,ok}],[]} =
+	gen_server:multi_call([Node], my_test_name, {call_within, 1000}),
+    timer:sleep(1500),
+    {[{Node,false}],[]} =
+	gen_server:multi_call([Node],my_test_name, next_call),
 
     %% Stop the server.
-    ?line {[{Node,ok}],[]} =
-	   gen_server:multi_call([Node],my_test_name, stop),
+    {[{Node,ok}],[]} =
+	gen_server:multi_call([Node],my_test_name, stop),
     receive
 	{'EXIT', Pid, stopped} -> ok
     after 1000 ->
-	    test_server:fail(multicall_stop)
+	    ct:fail(multicall_stop)
     end,
-    
+
     process_flag(trap_exit, OldFl),
 
     ok.
 
 %% OTP-3587
-multicall_down(suite) -> [];
 multicall_down(Config) when is_list(Config) ->
     %% We need a named host which is inaccessible.
-    ?line Name = node@test01,
+    Name = node@test01,
 
     %% We use 'global' as a gen_server to call.
-    ?line {Good, Bad} = gen_server:multi_call([Name, node()],
-					      global_name_server,
-					      info,
-					      3000),
+    {Good, Bad} = gen_server:multi_call([Name, node()],
+					global_name_server,
+					info,
+					3000),
     io:format("good = ~p, bad = ~p~n", [Good, Bad]),
-    ?line [Name] = Bad,
+    [Name] = Bad,
     ok.
 
 busy_wait_for_process(Pid,N) ->
@@ -854,82 +840,79 @@ busy_wait_for_process(Pid,N) ->
 	    ok
     end.
 %%--------------------------------------------------------------
-spec_init(doc) ->
-    ["Test gen_server:enter_loop/[3,4,5]. Used when you want to write " 
-     "your own special init-phase."];
-spec_init(suite) ->
-    [];
+%% Test gen_server:enter_loop/[3,4,5]. Used when you want to write
+%% your own special init-phase.
 spec_init(Config) when is_list(Config) ->
-    
+
     OldFlag = process_flag(trap_exit, true),
 
-    ?line {ok, Pid0} = start_link(spec_init_local, [{ok, my_server}, []]),
-    ?line ok = gen_server:call(Pid0, started_p),
-    ?line ok = gen_server:call(Pid0, stop),
+    {ok, Pid0} = start_link(spec_init_local, [{ok, my_server}, []]),
+    ok = gen_server:call(Pid0, started_p),
+    ok = gen_server:call(Pid0, stop),
     receive 
 	{'EXIT', Pid0, stopped} ->
  	    ok
     after 5000 ->
-	    test_server:fail(gen_server_did_not_die)
+	    ct:fail(gen_server_did_not_die)
     end,
-    
-    ?line {ok, Pid01} = start_link(spec_init_local, [{not_ok, my_server}, []]),
+
+    {ok, Pid01} = start_link(spec_init_local, [{not_ok, my_server}, []]),
     receive 
  	{'EXIT', Pid01, process_not_registered} ->
  	    ok
     after 5000 ->
-	    test_server:fail(gen_server_did_not_die)
+	    ct:fail(gen_server_did_not_die)
     end,
-    
-    ?line {ok, Pid1} = start_link(spec_init_global, [{ok, my_server}, []]),
-    ?line ok = gen_server:call(Pid1, started_p),
-    ?line ok = gen_server:call(Pid1, stop),
+
+    {ok, Pid1} = start_link(spec_init_global, [{ok, my_server}, []]),
+    ok = gen_server:call(Pid1, started_p),
+    ok = gen_server:call(Pid1, stop),
     receive 
 	{'EXIT', Pid1, stopped} ->
  	    ok
     after 5000 ->
-	    test_server:fail(gen_server_did_not_die)
+	    ct:fail(gen_server_did_not_die)
     end,
-    
-    ?line {ok, Pid11} = 
+
+    {ok, Pid11} =
 	start_link(spec_init_global, [{not_ok, my_server}, []]),
 
     receive 
 	{'EXIT', Pid11, process_not_registered_globally} ->
  	    ok
     after 5000 ->
-	    test_server:fail(gen_server_did_not_die)
+	    ct:fail(gen_server_did_not_die)
     end,
-    
-    ?line {ok, Pid2} = start_link(spec_init_anonymous, [[]]),
-    ?line ok = gen_server:call(Pid2, started_p),
-    ?line ok = gen_server:call(Pid2, stop),
+
+    {ok, Pid2} = start_link(spec_init_anonymous, [[]]),
+    ok = gen_server:call(Pid2, started_p),
+    ok = gen_server:call(Pid2, stop),
     receive 
 	{'EXIT', Pid2, stopped} ->
  	    ok
     after 5000 ->
-	    test_server:fail(gen_server_did_not_die)
+	    ct:fail(gen_server_did_not_die)
     end,
-    
-    ?line {ok, Pid3} = start_link(spec_init_anonymous_default_timeout, [[]]),
-    ?line ok = gen_server:call(Pid3, started_p),
-    ?line ok = gen_server:call(Pid3, stop),
+
+    {ok, Pid3} = start_link(spec_init_anonymous_default_timeout, [[]]),
+    ok = gen_server:call(Pid3, started_p),
+    ok = gen_server:call(Pid3, stop),
     receive 
 	{'EXIT', Pid3, stopped} ->
  	    ok
     after 5000 ->
-	    test_server:fail(gen_server_did_not_die)
+	    ct:fail(gen_server_did_not_die)
     end,
-    
-    ?line {ok, Pid4} = 
+
+    {ok, Pid4} =
 	start_link(spec_init_default_timeout, [{ok, my_server}, []]),
-    ?line ok = gen_server:call(Pid4, started_p),
-    ?line ok = gen_server:call(Pid4, stop),
+    ok = gen_server:call(Pid4, started_p),
+    ok = gen_server:call(Pid4, stop),
     receive 
 	{'EXIT', Pid4, stopped} ->
  	    ok
     after 5000 ->
-	    test_server:fail(gen_server_did_not_die)
+	    ct:fail(gen_server_did_not_die)
     end,
 
     %% Before the OTP-10130 fix this failed because a timeout message
@@ -939,83 +922,79 @@ spec_init(Config) when is_list(Config) ->
 	start_link(spec_init_global_default_timeout, [{ok, hurra}, []]),
     timer:sleep(1000),
     ok = gen_server:call(_PidHurra, started_p),
-    
-    ?line Pid5 = 
+
+    Pid5 =
 	erlang:spawn_link(?MODULE, spec_init_not_proc_lib, [[]]),
     receive 
 	{'EXIT', Pid5, process_was_not_started_by_proc_lib} ->
  	    ok
     after 5000 ->
-	    test_server:fail(gen_server_did_not_die)
+	    ct:fail(gen_server_did_not_die)
     end,
     process_flag(trap_exit, OldFlag),
     ok.
 
 %%--------------------------------------------------------------
-spec_init_local_registered_parent(doc) ->
-    ["Test that terminate is run when the parent is a locally registered "
-     "process OTP-4820"];
-spec_init_local_registered_parent(suite) -> [];
+%% OTP-4820. Test that terminate is run when the parent is a locally
+%% registered process.
 spec_init_local_registered_parent(Config) when is_list(Config) ->
 
     register(foobar, self()),
     process_flag(trap_exit, true),
-    
-    ?line {ok, Pid} = start_link(spec_init_local, [{ok, my_server}, []]),
-    
-    ?line ok = gen_server:cast(my_server, {self(),stop}),
-    ?line receive
-	      {Pid, stopped} ->
-		  ok
-	  after 1000 ->
-		  test_server:fail(stop)
-	  end,
+
+    {ok, Pid} = start_link(spec_init_local, [{ok, my_server}, []]),
+
+    ok = gen_server:cast(my_server, {self(),stop}),
+    receive
+	{Pid, stopped} ->
+	    ok
+    after 1000 ->
+	    ct:fail(stop)
+    end,
     unregister(foobar),
     ok.
+
 %%--------------------------------------------------------------
-spec_init_global_registered_parent(doc) ->
-    ["Test that terminate is run when the parent is a global registered "
-     "process OTP-4820"];
-spec_init_global_registered_parent(suite) -> [];
+%% OTP-4820. Test that terminate is run when the parent is a global registered
+%% process.
 spec_init_global_registered_parent(Config) when is_list(Config) ->
 
     global:register_name(foobar, self()),
     process_flag(trap_exit, true),
-    
-    ?line {ok, Pid} = start_link(spec_init_global, [{ok, my_server}, []]),
-    
-    ?line ok = gen_server:call(Pid, started_p),
-    ?line ok = gen_server:cast(Pid, {self(),stop}),  
-
-    ?line receive
-	      {Pid, stopped} ->
-		  ok
-	  after 1000 ->
-		  test_server:fail(stop)
-	  end,
+
+    {ok, Pid} = start_link(spec_init_global, [{ok, my_server}, []]),
+
+    ok = gen_server:call(Pid, started_p),
+    ok = gen_server:cast(Pid, {self(),stop}),
+
+    receive
+	{Pid, stopped} ->
+	    ok
+    after 1000 ->
+	    ct:fail(stop)
+    end,
     global:unregister_name(foobar),
     ok.
+
 %%--------------------------------------------------------------
-otp_5854(suite) ->
-    [];
-otp_5854(doc) ->
-    ["Test check for registered name in enter_loop/3,4,5"];
+
+%% Test check for registered name in enter_loop/3,4,5.
 otp_5854(Config) when is_list(Config) ->
     OldFlag = process_flag(trap_exit, true),
 
-    ?line dummy_via:reset(),
+    dummy_via:reset(),
 
     %% Make sure gen_server:enter_loop does not accept {local,Name}
     %% when it's another process than the calling one which is
     %% registered under that name
     register(armitage, self()),
-    ?line {ok, Pid1} =
+    {ok, Pid1} =
 	start_link(spec_init_local, [{not_ok, armitage}, []]),
     receive
 	{'EXIT', Pid1, process_not_registered} ->
 	    ok
     after 1000 ->
-	    ?line test_server:fail(gen_server_started)
+	    ct:fail(gen_server_started)
     end,
     unregister(armitage),
 
@@ -1023,25 +1002,25 @@ otp_5854(Config) when is_list(Config) ->
     %% when it's another process than the calling one which is
     %% registered under that name
     global:register_name(armitage, self()),
-    ?line {ok, Pid2} =
+    {ok, Pid2} =
 	start_link(spec_init_global, [{not_ok, armitage}, []]),
     receive
 	{'EXIT', Pid2, process_not_registered_globally} ->
 	    ok
     after 1000 ->
-	    ?line test_server:fail(gen_server_started)
+	    ct:fail(gen_server_started)
     end,
     global:unregister_name(armitage),
 
     %% (same for {via, Mod, Name})
     dummy_via:register_name(armitage, self()),
-    ?line {ok, Pid3} =
+    {ok, Pid3} =
 	start_link(spec_init_via, [{not_ok, armitage}, []]),
     receive
 	{'EXIT', Pid3, {process_not_registered_via, dummy_via}} ->
 	    ok
     after 1000 ->
-	    ?line test_server:fail(gen_server_started)
+	    ct:fail(gen_server_started)
     end,
     dummy_via:unregister_name(armitage),
 
@@ -1053,89 +1032,85 @@ otp_5854(Config) when is_list(Config) ->
 %% returns.
 
 otp_7669(Config) when is_list(Config) ->
-    ?line ?t:do_times(100, fun do_otp_7669_local_ignore/0),
-    ?line ?t:do_times(100, fun do_otp_7669_global_ignore/0),
-    ?line ?t:do_times(10, fun do_otp_7669_stop/0),
+    do_times(100, fun do_otp_7669_local_ignore/0),
+    do_times(100, fun do_otp_7669_global_ignore/0),
+    do_times(10, fun do_otp_7669_stop/0),
     ok.    
 
+do_times(0, _) ->
+    ok;
+do_times(N, Fun) ->
+    Fun(),
+    do_times(N-1, Fun).
+
 do_otp_7669_local_ignore() ->
     %% The name should never be registered after the return
     %% from gen_server:start/3.
-    ?line ignore = gen_server:start({local,?MODULE}, ?MODULE, ignore, []),
-    ?line undefined = whereis(?MODULE),
-    ?line ignore = gen_server:start({local,?MODULE}, ?MODULE, ignore, []),
-    ?line undefined = whereis(?MODULE),
-    ?line ignore = gen_server:start_link({local,?MODULE}, ?MODULE, ignore, []),
-    ?line undefined = whereis(?MODULE).
+    ignore = gen_server:start({local,?MODULE}, ?MODULE, ignore, []),
+    undefined = whereis(?MODULE),
+    ignore = gen_server:start({local,?MODULE}, ?MODULE, ignore, []),
+    undefined = whereis(?MODULE),
+    ignore = gen_server:start_link({local,?MODULE}, ?MODULE, ignore, []),
+    undefined = whereis(?MODULE).
 
 do_otp_7669_global_ignore() ->
-    ?line ignore = gen_server:start({global,?MODULE}, ?MODULE, ignore, []),
-    ?line undefined = global:whereis_name(?MODULE),
-    ?line ignore = gen_server:start_link({global,?MODULE}, ?MODULE, ignore, []),
-    ?line undefined = global:whereis_name(?MODULE).
+    ignore = gen_server:start({global,?MODULE}, ?MODULE, ignore, []),
+    undefined = global:whereis_name(?MODULE),
+    ignore = gen_server:start_link({global,?MODULE}, ?MODULE, ignore, []),
+    undefined = global:whereis_name(?MODULE).
 
 do_otp_7669_stop() ->
     %% The name should never be registered after the return
     %% from gen_server:start/3.
-    ?line {error,stopped} = gen_server:start({local,?MODULE},
-					     ?MODULE, stop, []),
-    ?line undefined = whereis(?MODULE),
+    {error,stopped} = gen_server:start({local,?MODULE},
+				       ?MODULE, stop, []),
+    undefined = whereis(?MODULE),
 
-    ?line {error,stopped} = gen_server:start({global,?MODULE},
-					     ?MODULE, stop, []),
-    ?line undefined = global:whereis_name(?MODULE).
+    {error,stopped} = gen_server:start({global,?MODULE},
+				       ?MODULE, stop, []),
+    undefined = global:whereis_name(?MODULE).
 
-%% Verify that sys:get_status correctly calls our format_status/2 fun
-%%
-call_format_status(suite) ->
-    [];
-call_format_status(doc) ->
-    ["Test that sys:get_status/1,2 calls format_status/2"];
+%% Verify that sys:get_status correctly calls our format_status/2 fun.
 call_format_status(Config) when is_list(Config) ->
-    ?line {ok, Pid} = gen_server:start_link({local, call_format_status},
-					    ?MODULE, [], []),
-    ?line Status1 = sys:get_status(call_format_status),
-    ?line {status, Pid, _Mod, [_PDict, running, _Parent, _, Data1]} = Status1,
-    ?line [format_status_called | _] = lists:reverse(Data1),
-    ?line Status2 = sys:get_status(call_format_status, 5000),
-    ?line {status, Pid, _Mod, [_PDict, running, _Parent, _, Data2]} = Status2,
-    ?line [format_status_called | _] = lists:reverse(Data2),
+    {ok, Pid} = gen_server:start_link({local, call_format_status},
+				      ?MODULE, [], []),
+    Status1 = sys:get_status(call_format_status),
+    {status, Pid, _Mod, [_PDict, running, _Parent, _, Data1]} = Status1,
+    [format_status_called | _] = lists:reverse(Data1),
+    Status2 = sys:get_status(call_format_status, 5000),
+    {status, Pid, _Mod, [_PDict, running, _Parent, _, Data2]} = Status2,
+    [format_status_called | _] = lists:reverse(Data2),
 
     %% check that format_status can handle a name being a pid (atom is
     %% already checked by the previous test)
-    ?line {ok, Pid3} = gen_server:start_link(gen_server_SUITE, [], []),
-    ?line Status3 = sys:get_status(Pid3),
-    ?line {status, Pid3, _Mod, [_PDict3, running, _Parent, _, Data3]} = Status3,
-    ?line [format_status_called | _] = lists:reverse(Data3),
+    {ok, Pid3} = gen_server:start_link(gen_server_SUITE, [], []),
+    Status3 = sys:get_status(Pid3),
+    {status, Pid3, _Mod, [_PDict3, running, _Parent, _, Data3]} = Status3,
+    [format_status_called | _] = lists:reverse(Data3),
 
     %% check that format_status can handle a name being a term other than a
     %% pid or atom
     GlobalName1 = {global, "CallFormatStatus"},
-    ?line {ok, Pid4} = gen_server:start_link(GlobalName1,
-					     gen_server_SUITE, [], []),
-    ?line Status4 = sys:get_status(Pid4),
-    ?line {status, Pid4, _Mod, [_PDict4, running, _Parent, _, Data4]} = Status4,
-    ?line [format_status_called | _] = lists:reverse(Data4),
+    {ok, Pid4} = gen_server:start_link(GlobalName1,
+				       gen_server_SUITE, [], []),
+    Status4 = sys:get_status(Pid4),
+    {status, Pid4, _Mod, [_PDict4, running, _Parent, _, Data4]} = Status4,
+    [format_status_called | _] = lists:reverse(Data4),
     GlobalName2 = {global, {name, "term"}},
-    ?line {ok, Pid5} = gen_server:start_link(GlobalName2,
-					     gen_server_SUITE, [], []),
-    ?line Status5 = sys:get_status(GlobalName2),
-    ?line {status, Pid5, _Mod, [_PDict5, running, _Parent, _, Data5]} = Status5,
-    ?line [format_status_called | _] = lists:reverse(Data5),
+    {ok, Pid5} = gen_server:start_link(GlobalName2,
+				       gen_server_SUITE, [], []),
+    Status5 = sys:get_status(GlobalName2),
+    {status, Pid5, _Mod, [_PDict5, running, _Parent, _, Data5]} = Status5,
+    [format_status_called | _] = lists:reverse(Data5),
     ok.
 
-%% Verify that error termination correctly calls our format_status/2 fun
-%%
-error_format_status(suite) ->
-    [];
-error_format_status(doc) ->
-    ["Test that an error termination calls format_status/2"];
+%% Verify that error termination correctly calls our format_status/2 fun.
 error_format_status(Config) when is_list(Config) ->
-    ?line error_logger_forwarder:register(),
+    error_logger_forwarder:register(),
     OldFl = process_flag(trap_exit, true),
     State = "called format_status",
-    ?line {ok, Pid} = gen_server:start_link(?MODULE, {state, State}, []),
-    ?line {'EXIT',{crashed,_}} = (catch gen_server:call(Pid, crash)),
+    {ok, Pid} = gen_server:start_link(?MODULE, {state, State}, []),
+    {'EXIT',{crashed,_}} = (catch gen_server:call(Pid, crash)),
     receive
 	{'EXIT', Pid, crashed} ->
 	    ok
@@ -1148,10 +1123,9 @@ error_format_status(Config) when is_list(Config) ->
 					|_Stacktrace]}]}} ->
 	    ok;
 	Other ->
-	    ?line io:format("Unexpected: ~p", [Other]),
-	    ?line ?t:fail()
+	    io:format("Unexpected: ~p", [Other]),
+	    ct:fail(failed)
     end,
-    ?t:messages_get(),
     process_flag(trap_exit, OldFl),
     ok.
 
@@ -1169,29 +1143,23 @@ terminate_crash_format(Config) when is_list(Config) ->
 			     "** Generic server"++_,
 			     [Pid,stop, {formatted, State},
 			      {{crash, terminate},[{?MODULE,terminate,2,_}
-						  |_Stacktrace]}]}} ->
+						   |_Stacktrace]}]}} ->
 	    ok;
 	Other ->
 	    io:format("Unexpected: ~p", [Other]),
-	    ?t:fail()
+	    ct:fail(failed)
     after 5000 ->
 	    io:format("Timeout: expected error logger msg", []),
-	    ?t:fail()
+	    ct:fail(failed)
     end,
-    ?t:messages_get(),
     process_flag(trap_exit, OldFl),
     ok.
 
 %% Verify that sys:get_state correctly returns gen_server state
-%%
-get_state(suite) ->
-    [];
-get_state(doc) ->
-    ["Test that sys:get_state/1,2 return the gen_server state"];
 get_state(Config) when is_list(Config) ->
     State = self(),
     {ok, _Pid} = gen_server:start_link({local, get_state},
-                                             ?MODULE, {state,State}, []),
+				       ?MODULE, {state,State}, []),
     State = sys:get_state(get_state),
     State = sys:get_state(get_state, 5000),
     {ok, Pid} = gen_server:start_link(?MODULE, {state,State}, []),
@@ -1203,15 +1171,10 @@ get_state(Config) when is_list(Config) ->
     ok.
 
 %% Verify that sys:replace_state correctly replaces gen_server state
-%%
-replace_state(suite) ->
-    [];
-replace_state(doc) ->
-    ["Test that sys:replace_state/1,2 replace the gen_server state"];
 replace_state(Config) when is_list(Config) ->
     State = self(),
     {ok, _Pid} = gen_server:start_link({local, replace_state},
-                                             ?MODULE, {state,State}, []),
+				       ?MODULE, {state,State}, []),
     State = sys:get_state(replace_state),
     NState1 = "replaced",
     Replace1 = fun(_) -> NState1 end,
@@ -1250,16 +1213,16 @@ call_with_huge_message_queue(Config) when is_list(Config) ->
 	     "is not implemented"};
 	false ->
 	    do_call_with_huge_message_queue()
-		end.
+    end.
 
 do_call_with_huge_message_queue() ->
-    ?line Pid = spawn_link(fun echo_loop/0),
+    Pid = spawn_link(fun echo_loop/0),
 
-    ?line {Time,ok} = tc(fun() -> calls(10000, Pid) end),
+    {Time,ok} = tc(fun() -> calls(10000, Pid) end),
 
-    ?line [self() ! {msg,N} || N <- lists:seq(1, 500000)],
+    [self() ! {msg,N} || N <- lists:seq(1, 500000)],
     erlang:garbage_collect(),
-    ?line {NewTime,ok} = tc(fun() -> calls(10000, Pid) end),
+    {NewTime,ok} = tc(fun() -> calls(10000, Pid) end),
     io:format("Time for empty message queue: ~p", [Time]),
     io:format("Time for huge message queue: ~p", [NewTime]),
 
@@ -1269,7 +1232,7 @@ do_call_with_huge_message_queue() ->
 	    ok;
 	Q ->
 	    io:format("Q = ~p", [Q]),
-	    ?line ?t:fail()
+	    ct:fail(failed)
     end,
     ok.
 
@@ -1381,7 +1344,7 @@ init(stop) ->
 init(hibernate) ->
     {ok,[],hibernate};
 init(sleep) ->
-    test_server:sleep(1000),
+    ct:sleep(1000),
     {ok, []};
 init({state,State}) ->
     {ok, State}.
@@ -1435,11 +1398,11 @@ handle_info(timeout, {reply_to, From}) ->
     gen_server:reply(From, delayed),
     {noreply, []};
 handle_info(timeout, hibernate_me) -> % Arrive here from 
-				      % handle_info(hibernate_later,...)
+						% handle_info(hibernate_later,...)
     {noreply, [], hibernate};
 handle_info(hibernate_now, _State) ->  % Arrive here from 
-				       % handle_cast({_,hibernate_later},...)
-				       % and by direct ! from testcase
+						% handle_cast({_,hibernate_later},...)
+						% and by direct ! from testcase
     {noreply, [], hibernate};
 handle_info(hibernate_later, _State) ->
     {noreply, hibernate_me, 1000};
diff --git a/lib/stdlib/test/id_transform_SUITE.erl b/lib/stdlib/test/id_transform_SUITE.erl
index 1cff990697..aaa6a758d5 100644
--- a/lib/stdlib/test/id_transform_SUITE.erl
+++ b/lib/stdlib/test/id_transform_SUITE.erl
@@ -29,11 +29,12 @@
 -export([check/2,check2/1,g/0,f/1,t/1,t1/1,t2/1,t3/1,t4/1,
 	 t5/1,apa/1,new_fun/0]).
 
-						% Serves as test...
+%% Serves as test...
 -hej(hopp).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [id_transform].
@@ -54,7 +55,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-id_transform(doc) -> "Test erl_id_trans.";
+%% Test erl_id_trans.
 id_transform(Config) when is_list(Config) ->
     File = filename:join([code:lib_dir(stdlib),"examples",
 			"erl_id_trans.erl"]),
@@ -62,10 +63,8 @@ id_transform(Config) when is_list(Config) ->
     {module,erl_id_trans} = code:load_binary(erl_id_trans, File, Bin),
     case test_server:purify_is_running() of
 	false ->
-	    Dog = ct:timetrap(?t:hours(1)),
-	    Res = run_in_test_suite(),
-	    ?t:timetrap_cancel(Dog),
-	    Res;
+	    ct:timetrap({hours,1}),
+	    run_in_test_suite();
 	true ->
 	    {skip,"Valgrind (too slow)"}
     end.
@@ -139,9 +138,9 @@ do_trans_1(File, Tree0) ->
 	    {failed,{File,{transform,{unknown,Else}}}}
     end.
 
-% From here on there's only fake code to serve as test cases 
-% for the id_transform.
-% They need to be exported.
+%% From here on there's only fake code to serve as test cases
+%% for the id_transform.
+%% They need to be exported.
 
 check(X,_Y) when X ->   
     true;
@@ -192,7 +191,7 @@ f(X) ->
 	    nok
     end.
 
-% Stolen from erl_lint_SUITE.erl
+%% Stolen from erl_lint_SUITE.erl
 -record(apa, {}).
 
 t(A) when atom(A) ->
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index 0e897631ff..ddc55b1466 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -26,7 +26,7 @@
 
 -export([error_1/1, float_g/1, otp_5403/1, otp_5813/1, otp_6230/1, 
          otp_6282/1, otp_6354/1, otp_6495/1, otp_6517/1, otp_6502/1,
-         manpage/1, otp_6708/1, otp_7084/1, otp_7421/1,
+         manpage/1, otp_6708/1, otp_7084/0, otp_7084/1, otp_7421/1,
 	 io_lib_collect_line_3_wb/1, cr_whitespace_in_string/1,
 	 io_fread_newlines/1, otp_8989/1, io_lib_fread_literal/1,
 	 printable_range/1, bad_printable_range/1,
@@ -37,7 +37,7 @@
 
 -export([pretty/2]).
 
-%-define(debug, true).
+%%-define(debug, true).
 
 -ifdef(debug).
 -define(format(S, A), io:format(S, A)).
@@ -46,24 +46,20 @@
 -define(t, test_server).
 -define(privdir(_), "./io_SUITE_priv").
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(format(S, A), ok).
--define(privdir(Conf), ?config(priv_dir, Conf)).
+-define(privdir(Conf), proplists:get_value(priv_dir, Conf)).
 -endif.
 
-
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
-
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
+    Config.
+
 end_per_testcase(_Case, _Config) ->
-    Dog = ?config(watchdog, _Config),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [error_1, float_g, otp_5403, otp_5813, otp_6230,
@@ -92,855 +88,588 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-error_1(doc) ->
-    ["Error cases for output"];
-error_1(suite) ->
-    [];
+%% Error cases for output.
 error_1(Config) when is_list(Config) ->
     %% We don't do erroneous output on stdout - the test server
     %% seems to catch that somehow.
-    ?line PrivDir = ?privdir(Config),
-    ?line File = filename:join(PrivDir, "slask"),
-    ?line {ok, F1} = file:open(File, [write]),
-    ?line {'EXIT', _} = (catch io:format(muttru, "hej", [])),
-    ?line {'EXIT', _} = (catch io:format(F1, pelle, "hej")),
-    ?line {'EXIT', _} = (catch io:format(F1, 1, "hej")),
-    ?line {'EXIT', _} = (catch io:format(F1, "~p~", [kaka])),
-    ?line {'EXIT', _} = (catch io:format(F1, "~m~n", [kaka])),
+    PrivDir = ?privdir(Config),
+    File = filename:join(PrivDir, "slask"),
+    {ok, F1} = file:open(File, [write]),
+    {'EXIT', _} = (catch io:format(muttru, "hej", [])),
+    {'EXIT', _} = (catch io:format(F1, pelle, "hej")),
+    {'EXIT', _} = (catch io:format(F1, 1, "hej")),
+    {'EXIT', _} = (catch io:format(F1, "~p~", [kaka])),
+    {'EXIT', _} = (catch io:format(F1, "~m~n", [kaka])),
 
     %% This causes the file process to die, and it is linked to us,
     %% so we can't catch the error this easily.
-%    ?line {'EXIT', _} = (catch io:put_chars(F1, 666)),
+    %%    {'EXIT', _} = (catch io:put_chars(F1, 666)),
 
-    ?line file:close(F1),
-    ?line {'EXIT', _} = (catch io:format(F1, "~p", ["hej"])),
+    file:close(F1),
+    {'EXIT', _} = (catch io:format(F1, "~p", ["hej"])),
     ok.
 
 float_g(Config) when is_list(Config) ->
-    ?line ["5.00000e-2",
-	   "0.500000",
-	   "5.00000",
-	   "50.0000",
-	   "500.000",
-	   "5000.00",
-	   "5.00000e+4",
-	   "5.00000e+5"] = float_g_1("~g", 5.0, -2, 5),
-    
-    ?line ["-5.0000e-2",
-	   "-0.50000",
-	   "-5.0000",
-	   "-50.000",
-	   "-500.00",
-	   "-5000.0",
-	   "-5.0000e+4",
-	   "-5.0000e+5"] = float_g_1("~.5g", -5.0, -2, 5),
-    
-    ?line ["5.000e-2",
-	   "0.5000",
-	   "5.000",
-	   "50.00",
-	   "500.0",
-	   "5.000e+3",
-	   "5.000e+4",
-	   "5.000e+5"] = float_g_1("~.4g", 5.0, -2, 5),
-    
-    ?line ["-5.00e-2",
-	   "-0.500",
-	   "-5.00",
-	   "-50.0",
-	   "-5.00e+2",
-	   "-5.00e+3",
-	   "-5.00e+4",
-	   "-5.00e+5"] = float_g_1("~.3g", -5.0, -2, 5),
-    
-    ?line ["5.0e-2",
-	   "0.50",
-	   "5.0",
-	   "5.0e+1",
-	   "5.0e+2",
-	   "5.0e+3",
-	   "5.0e+4",
-	   "5.0e+5"] = float_g_1("~.2g", 5.0, -2, 5),
-    
-    ?line 
-	case catch fmt("~.1g", [0.5]) of
-	    "0.5" ->
-		?line 
-		    ["5.0e-2",
-		     "0.5",
-		     "5.0e+0",
-		     "5.0e+1",
-		     "5.0e+2",
-		     "5.0e+3",
-		     "5.0e+4",
-		     "5.0e+5"] = float_g_1("~.1g", 5.0, -2, 5);
-	    {'EXIT',_} -> ok
-	end,
-    
-    ?line ["4.99999e-2",
-	   "0.499999",
-	   "4.99999",
-	   "49.9999",
-	   "499.999",
-	   "4999.99",
-	   "4.99999e+4",
-	   "4.99999e+5"] = float_g_1("~g", 4.9999949999, -2, 5),
-    
-    ?line ["-5.00000e-2",
-	   "-0.500000",
-	   "-5.00000",
-	   "-50.0000",
-	   "-500.000",
-	   "-5000.00",
-	   "-5.00000e+4",
-	   "-5.00000e+5"] = float_g_1("~g", -4.9999950001, -2, 5),
+    ["5.00000e-2",
+     "0.500000",
+     "5.00000",
+     "50.0000",
+     "500.000",
+     "5000.00",
+     "5.00000e+4",
+     "5.00000e+5"] = float_g_1("~g", 5.0, -2, 5),
+
+    ["-5.0000e-2",
+     "-0.50000",
+     "-5.0000",
+     "-50.000",
+     "-500.00",
+     "-5000.0",
+     "-5.0000e+4",
+     "-5.0000e+5"] = float_g_1("~.5g", -5.0, -2, 5),
+
+    ["5.000e-2",
+     "0.5000",
+     "5.000",
+     "50.00",
+     "500.0",
+     "5.000e+3",
+     "5.000e+4",
+     "5.000e+5"] = float_g_1("~.4g", 5.0, -2, 5),
+
+    ["-5.00e-2",
+     "-0.500",
+     "-5.00",
+     "-50.0",
+     "-5.00e+2",
+     "-5.00e+3",
+     "-5.00e+4",
+     "-5.00e+5"] = float_g_1("~.3g", -5.0, -2, 5),
+
+    ["5.0e-2",
+     "0.50",
+     "5.0",
+     "5.0e+1",
+     "5.0e+2",
+     "5.0e+3",
+     "5.0e+4",
+     "5.0e+5"] = float_g_1("~.2g", 5.0, -2, 5),
+
+    case catch fmt("~.1g", [0.5]) of
+	"0.5" ->
+	    ["5.0e-2",
+	     "0.5",
+	     "5.0e+0",
+	     "5.0e+1",
+	     "5.0e+2",
+	     "5.0e+3",
+	     "5.0e+4",
+	     "5.0e+5"] = float_g_1("~.1g", 5.0, -2, 5);
+	{'EXIT',_} -> ok
+    end,
+
+    ["4.99999e-2",
+     "0.499999",
+     "4.99999",
+     "49.9999",
+     "499.999",
+     "4999.99",
+     "4.99999e+4",
+     "4.99999e+5"] = float_g_1("~g", 4.9999949999, -2, 5),
+
+    ["-5.00000e-2",
+     "-0.500000",
+     "-5.00000",
+     "-50.0000",
+     "-500.000",
+     "-5000.00",
+     "-5.00000e+4",
+     "-5.00000e+5"] = float_g_1("~g", -4.9999950001, -2, 5),
     ok.
 
 float_g_1(Fmt, V, Min, Max) ->
     [fmt(Fmt, [V*math:pow(10, E)]) || E <- lists:seq(Min, Max)].
 
-otp_5403(doc) ->
-    ["OTP-5403. ~s formats I/O lists and a single binary."];
-otp_5403(suite) ->
-    [];
+%% OTP-5403. ~s formats I/O lists and a single binary.
 otp_5403(Config) when is_list(Config) ->
-    ?line "atom" = fmt("~s", [atom]),
-    ?line "binary" = fmt("~s", [<<"binary">>]),
-    ?line "atail" = fmt("~s", [["a" | <<"tail">>]]),
-    ?line "deepcharlist" = fmt("~s", [["deep",["char",["list"]]]]),
-    ?line "somebinaries" = fmt("~s", [[<<"some">>,[<<"binaries">>]]]),
+    "atom" = fmt("~s", [atom]),
+    "binary" = fmt("~s", [<<"binary">>]),
+    "atail" = fmt("~s", [["a" | <<"tail">>]]),
+    "deepcharlist" = fmt("~s", [["deep",["char",["list"]]]]),
+    "somebinaries" = fmt("~s", [[<<"some">>,[<<"binaries">>]]]),
     ok.
 
-otp_5813(doc) ->
-    ["OTP-5813. read/3 is new."];
-otp_5813(suite) ->
-    [];
+%% OTP-5813. read/3 is new.
 otp_5813(Config) when is_list(Config) ->
-    ?line PrivDir = ?privdir(Config),
-    ?line File = filename:join(PrivDir, "test"),
+    PrivDir = ?privdir(Config),
+    File = filename:join(PrivDir, "test"),
 
-    ?line ok = file:write_file(File, <<"a. ">>),
-    ?line {ok, Fd} = file:open(File, [read]),
-    ?line {ok, a, 1} = io:read(Fd, '', 1),
-    ?line {eof,1} = io:read(Fd, '', 1),
+    ok = file:write_file(File, <<"a. ">>),
+    {ok, Fd} = file:open(File, [read]),
+    {ok, a, 1} = io:read(Fd, '', 1),
+    {eof,1} = io:read(Fd, '', 1),
     ok = file:close(Fd),
 
-    ?line ok = file:write_file(File, <<"[}.">>),
-    ?line {ok, Fd2} = file:open(File, [read]),
-    ?line {error,{1,_,_},1} = io:read(Fd2, '', 1),
-    ?line ok = file:close(Fd),
+    ok = file:write_file(File, <<"[}.">>),
+    {ok, Fd2} = file:open(File, [read]),
+    {error,{1,_,_},1} = io:read(Fd2, '', 1),
+    ok = file:close(Fd),
 
     file:delete(File),
     ok.
 
-otp_6230(doc) ->
-    ["OTP-6230. ~p and ~P with (huge) binaries."];
-otp_6230(suite) ->
-    [];
+%% OTP-6230. ~p and ~P with (huge) binaries.
 otp_6230(Config) when is_list(Config) ->
     %% The problem is actually huge binaries, but the small tests here
     %% just run through most of the modified code.
-    ?line "<<>>" = fmt("~P", [<<"">>,-1]),
-    ?line "<<\"hej\">>" = fmt("~P", [<<"hej">>,-1]),
-    ?line "{hej,...}" = fmt("~P", [{hej,<<"hej">>},2]),
-    ?line "{hej,<<...>>}" = fmt("~P", [{hej,<<"hej">>},3]),
-    ?line "{hej,<<\"hejs\"...>>}" = fmt("~P", [{hej,<<"hejsan">>},4]),
-    ?line "{hej,<<\"hej\">>}" = fmt("~P", [{hej,<<"hej">>},6]),
-    ?line "<<...>>" = fmt("~P", [<<"hej">>,1]),
-    ?line "<<\"hejs\"...>>" = fmt("~P", [<<"hejsan">>,2]),
-    ?line "<<\"hej\">>" = fmt("~P", [<<"hej">>,4]),
-    ?line "{hej,<<127,...>>}" = 
+    "<<>>" = fmt("~P", [<<"">>,-1]),
+    "<<\"hej\">>" = fmt("~P", [<<"hej">>,-1]),
+    "{hej,...}" = fmt("~P", [{hej,<<"hej">>},2]),
+    "{hej,<<...>>}" = fmt("~P", [{hej,<<"hej">>},3]),
+    "{hej,<<\"hejs\"...>>}" = fmt("~P", [{hej,<<"hejsan">>},4]),
+    "{hej,<<\"hej\">>}" = fmt("~P", [{hej,<<"hej">>},6]),
+    "<<...>>" = fmt("~P", [<<"hej">>,1]),
+    "<<\"hejs\"...>>" = fmt("~P", [<<"hejsan">>,2]),
+    "<<\"hej\">>" = fmt("~P", [<<"hej">>,4]),
+    "{hej,<<127,...>>}" =
         fmt("~P", [{hej,<<127:8,<<"hej">>/binary>>},4]),
-    ?line "{hej,<<127,104,101,...>>}" = 
+    "{hej,<<127,104,101,...>>}" =
         fmt("~P", [{hej,<<127:8,<<"hej">>/binary>>},6]),
 
     B = list_to_binary(lists:duplicate(30000, $a)),
-    ?line "<<\"aaaa"++_ = fmt("~P", [B, 20000]),
+    "<<\"aaaa"++_ = fmt("~P", [B, 20000]),
     ok.
 
-otp_6282(doc) ->
-    ["OTP-6282. ~p truncates strings (like binaries) depending on depth."];
-otp_6282(suite) ->
-    [];
+%% OTP-6282. ~p truncates strings (like binaries) depending on depth.
 otp_6282(Config) when is_list(Config) ->
-    ?line "[]" = p("", 1, 20, 1),
-    ?line "[]" = p("", 1, 20, -1),
-    ?line "[...]" = p("a", 1, 20, 1),
-    ?line "\"a\"" = p("a", 1, 20, 2),
-    ?line "\"aa\"" = p("aa", 1, 20, 2),
-    ?line "\"aaa\"" = p("aaa", 1, 20, 2),
-    ?line "\"aaaa\"" = p("aaaa", 1, 20, 2),
-    % ?line "\"aaaa\"..." = p("aaaaaa", 1, 20, 2),
-    ?line "\"a\"" = p("a", 1, 20, -1),
-    % ?line "\"aa\"..." = p([$a,$a,1000], 1, 20, 2),
-    % ?line "\"aa\"..." = p([$a,$a,1000], 1, 20, 3),
-    ?line "[97,97,1000]" = p([$a,$a,1000], 1, 20, 4),
+    "[]" = p("", 1, 20, 1),
+    "[]" = p("", 1, 20, -1),
+    "[...]" = p("a", 1, 20, 1),
+    "\"a\"" = p("a", 1, 20, 2),
+    "\"aa\"" = p("aa", 1, 20, 2),
+    "\"aaa\"" = p("aaa", 1, 20, 2),
+    "\"aaaa\"" = p("aaaa", 1, 20, 2),
+    "\"a\"" = p("a", 1, 20, -1),
+    "[97,97,1000]" = p([$a,$a,1000], 1, 20, 4),
     S1 = lists:duplicate(200,$a),
-    ?line "[...]" = p(S1, 1, 20, 1),
-    % ?line "\"aaaaaaaaaaaaaaaa\"\n \"aaaaaaaaaaaaaaaa\"\n \"aaaa\"..." = 
-    % ?line "\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"..." = 
-    %          p(S1, 1, 20, 10),
-    ?line true = "\"" ++ S1 ++ "\"" =:= p(S1, 1, 205, -1),
-    ?line "[97,97,1000|...]" = p([$a,$a,1000,1000], 1, 20, 4),
-
-    ?line "[[]]" = p([""], 1, 20, 2),
-    ?line "[[]]" = p([""], 1, 20, -1),
-    ?line "[[...]]" = p(["a"], 1, 20, 2),
-    ?line "[\"a\"]" = p(["a"], 1, 20, 3),
-    ?line "[\"aa\"]" = p(["aa"], 1, 20, 3),
-    ?line "[\"aaa\"]" = p(["aaa"], 1, 20, 3),
-    ?line "[\"a\"]" = p(["a"], 1, 20, -1),
-    % ?line "[\"aa\"...]" = p([[$a,$a,1000]], 1, 20, 3),
-    % ?line "[\"aa\"...]" = p([[$a,$a,1000]], 1, 20, 4),
-    ?line "[[97,97,1000]]" = p([[$a,$a,1000]], 1, 20, 5),
-    ?line "[[...]]" = p([S1], 1, 20, 2),
-    % ?line "[\"aaaaaaaaaaaaaa\"\n  \"aaaaaaaaaaaaaa\"\n  \"aaaaaaaa\"...]" = 
-    % ?line "[\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"...]" = 
-    %            p([S1], 1, 20, 11),
-    ?line true = "[\"" ++ S1 ++ "\"]" =:= p([S1], 1, 210, -1),
-    ?line "[[97,97,1000|...]]" = p([[$a,$a,1000,1000]], 1, 20, 5),
-
-    % ?line "[\"aaaa\"...]" = p(["aaaaa"], 1, 10, 3),
-    ?line "[\"aaaaa\"]" = p(["aaaaa"], 1, 10, 6),
+    "[...]" = p(S1, 1, 20, 1),
+    true = "\"" ++ S1 ++ "\"" =:= p(S1, 1, 205, -1),
+    "[97,97,1000|...]" = p([$a,$a,1000,1000], 1, 20, 4),
+
+    "[[]]" = p([""], 1, 20, 2),
+    "[[]]" = p([""], 1, 20, -1),
+    "[[...]]" = p(["a"], 1, 20, 2),
+    "[\"a\"]" = p(["a"], 1, 20, 3),
+    "[\"aa\"]" = p(["aa"], 1, 20, 3),
+    "[\"aaa\"]" = p(["aaa"], 1, 20, 3),
+    "[\"a\"]" = p(["a"], 1, 20, -1),
+    "[[97,97,1000]]" = p([[$a,$a,1000]], 1, 20, 5),
+    "[[...]]" = p([S1], 1, 20, 2),
+    true = "[\"" ++ S1 ++ "\"]" =:= p([S1], 1, 210, -1),
+    "[[97,97,1000|...]]" = p([[$a,$a,1000,1000]], 1, 20, 5),
+
+    "[\"aaaaa\"]" = p(["aaaaa"], 1, 10, 6),
 
     ok.
 
-otp_6354(doc) ->
-    ["OTP-6354. io_lib_pretty rewritten."];
-otp_6354(suite) ->
-    [];
+%% OTP-6354. io_lib_pretty rewritten.
 otp_6354(Config) when is_list(Config) ->
     %% A few tuples:
-    ?line "{}" = p({}, 1, 20, -1),
-    ?line "..." = p({}, 1, 20, 0),
-    ?line "{}" = p({}, 1, 20, 1),
-    ?line "{}" = p({}, 1, 20, 2),
-    ?line "{a}" = p({a}, 1, 20, -1),
-    ?line "..." = p({a}, 1, 20, 0),
-    ?line "{...}" = p({a}, 1, 20, 1),
-    ?line "{a}" = p({a}, 1, 20, 2),
-    ?line "{a,b}" = p({a,b}, 1, 20, -1),
-    ?line "..." = p({a,b}, 1, 20, 0),
-    ?line "{...}" = p({a,b}, 1, 20, 1),
-    ?line "{a,...}" = p({a,b}, 1, 20, 2),
-    ?line "{a,b}" = p({a,b}, 1, 20, 3),
-    ?line "{}" = p({}, 1, 1, -1),
-    ?line "..." = p({}, 1, 1, 0),
-    ?line "{}" = p({}, 1, 1, 1),
-    ?line "{}" = p({}, 1, 1, 2),
-    ?line "{a}" = p({a}, 1, 1, -1),
-    ?line "..." = p({a}, 1, 1, 0),
-    ?line "{...}" = p({a}, 1, 1, 1),
-    ?line "{a}" = p({a}, 1, 1, 2),
-    ?line "{a,\n b}" = p({a,b}, 1, 1, -1),
-    ?line "{1,\n b}" = p({1,b}, 1, 1, -1),
-    ?line "..." = p({a,b}, 1, 1, 0),
-    ?line "{...}" = p({a,b}, 1, 1, 1),
-    ?line "{a,...}" = p({a,b}, 1, 1, 2),
-    ?line "{a,\n b}" = p({a,b}, 1, 1, 3),
-    ?line "{{}}" = p({{}}, 1, 1, 2),
-    ?line "{[]}" = p({[]}, 1, 1, 2),
-    ?line bt(<<"{1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]}">>,
-             p({1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]}, -1)),
-    ?line bt(<<"{abcd,ddddd,\n      ddddd}">>,
-             p({abcd,ddddd,ddddd}, 1,16, -1)),
-    ?line bt(<<"{1,2,a,b,\n {sfdsf,sdfdsfs},\n [sfsdf,sdfsdf]}">>,
-             p({1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]}, 1, 35, 100)),
-    % With other terms than atomic ones on the same line:
-%     ?line bt(<<"{1,2,a,b,{sfdsf,sdfdsfs},\n [sfsdf,sdfsdf]}">>,
-%              p({1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]}, 1, 35, 100)),
-    % With line breaks:
-%     ?line bt(<<"{1,\n"
-%                " 2,\n"
-%                " a,\n"
-%                " b,\n"
-%                " {sfdsf,sdfdsfs},\n"
-%                " [sfsdf,sdfsdf]}">>,
-%              p({1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]}, 1, 35, 100)),
-    ?line "{1,{1,{2,3}}}" = p({1,{1,{2,3}}}, 1, 80, 100),
-
-    ?line bt(<<"{wwwww,{wwwww,{wwwww,{wwwww,{wwwww,lkjsldfj,klsdjfjklds,\n"
- "                                   sdkfjdsl,sdakfjdsklj,sdkljfsdj}}}}}">>,
-             p({wwwww,{wwwww,{wwwww,{wwwww,{wwwww,lkjsldfj,klsdjfjklds,
-                              sdkfjdsl,sdakfjdsklj,sdkljfsdj}}}}}, -1)),
-
-    % With no restriction on number of characters per line:
-%     ?line bt(<<"{wwwww,{wwwww,{wwwww,{wwwww,{wwwww,lkjsldfj,klsdjfjklds,"
-%                "sdkfjdsl,sdakfjdsklj,\n"
-%                "                                   sdkljfsdj}}}}}">>,
-%              p({wwwww,{wwwww,{wwwww,{wwwww,{wwwww,lkjsldfj,klsdjfjklds,
-%                               sdkfjdsl,sdakfjdsklj,sdkljfsdj}}}}}, -1)),
-
-    % With line breaks:
-%     ?line bt(<<"{wwwww,{wwwww,{wwwww,{wwwww,{wwwww,lkjsldfj,\n"
-%               "                                   klsdjfjklds,\n"
-%               "                                   sdkfjdsl,\n"
-%               "                                   sdakfjdsklj,\n"
-%               "                                   sdkljfsdj}}}}}">>,
-%              p({wwwww,{wwwww,{wwwww,{wwwww,{wwwww,lkjsldfj,klsdjfjklds,
-%                               sdkfjdsl,sdakfjdsklj,sdkljfsdj}}}}}, -1)),
-    ?line bt(<<"{wwwww,\n"
-              "    {wwwww,\n"
-              "        {wwwww,\n"
-              "            {wwwww,\n"
-              "                {wwwww,\n"
-              "                    {lkjsldfj,\n"
-              "                        {klsdjfjklds,\n"
-              "                            {klajsljls,\n"
-              "                                #aaaaaaaaaaaaaaaaaaaaa"
-                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaa{}}}}}}}}}">>,
-             p({wwwww,{wwwww,{wwwww,{wwwww,{wwwww,{lkjsldfj,
-                            {klsdjfjklds,{klajsljls,
-                {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}}}}}}}}}, 
-               -1)),
-    ?line "{{...},...}" = p({{a,b},{a,b,c},{d,e,f}},1,8,2),
+    "{}" = p({}, 1, 20, -1),
+    "..." = p({}, 1, 20, 0),
+    "{}" = p({}, 1, 20, 1),
+    "{}" = p({}, 1, 20, 2),
+    "{a}" = p({a}, 1, 20, -1),
+    "..." = p({a}, 1, 20, 0),
+    "{...}" = p({a}, 1, 20, 1),
+    "{a}" = p({a}, 1, 20, 2),
+    "{a,b}" = p({a,b}, 1, 20, -1),
+    "..." = p({a,b}, 1, 20, 0),
+    "{...}" = p({a,b}, 1, 20, 1),
+    "{a,...}" = p({a,b}, 1, 20, 2),
+    "{a,b}" = p({a,b}, 1, 20, 3),
+    "{}" = p({}, 1, 1, -1),
+    "..." = p({}, 1, 1, 0),
+    "{}" = p({}, 1, 1, 1),
+    "{}" = p({}, 1, 1, 2),
+    "{a}" = p({a}, 1, 1, -1),
+    "..." = p({a}, 1, 1, 0),
+    "{...}" = p({a}, 1, 1, 1),
+    "{a}" = p({a}, 1, 1, 2),
+    "{a,\n b}" = p({a,b}, 1, 1, -1),
+    "{1,\n b}" = p({1,b}, 1, 1, -1),
+    "..." = p({a,b}, 1, 1, 0),
+    "{...}" = p({a,b}, 1, 1, 1),
+    "{a,...}" = p({a,b}, 1, 1, 2),
+    "{a,\n b}" = p({a,b}, 1, 1, 3),
+    "{{}}" = p({{}}, 1, 1, 2),
+    "{[]}" = p({[]}, 1, 1, 2),
+    bt(<<"{1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]}">>,
+       p({1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]}, -1)),
+    bt(<<"{abcd,ddddd,\n      ddddd}">>,
+       p({abcd,ddddd,ddddd}, 1,16, -1)),
+    bt(<<"{1,2,a,b,\n {sfdsf,sdfdsfs},\n [sfsdf,sdfsdf]}">>,
+       p({1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]}, 1, 35, 100)),
+    "{1,{1,{2,3}}}" = p({1,{1,{2,3}}}, 1, 80, 100),
+
+    bt(<<"{wwwww,{wwwww,{wwwww,{wwwww,{wwwww,lkjsldfj,klsdjfjklds,\n"
+	 "                                   sdkfjdsl,sdakfjdsklj,sdkljfsdj}}}}}">>,
+       p({wwwww,{wwwww,{wwwww,{wwwww,{wwwww,lkjsldfj,klsdjfjklds,
+				      sdkfjdsl,sdakfjdsklj,sdkljfsdj}}}}}, -1)),
+
+    bt(<<"{wwwww,\n"
+	 "    {wwwww,\n"
+	 "        {wwwww,\n"
+	 "            {wwwww,\n"
+	 "                {wwwww,\n"
+	 "                    {lkjsldfj,\n"
+	 "                        {klsdjfjklds,\n"
+	 "                            {klajsljls,\n"
+	 "                                #aaaaaaaaaaaaaaaaaaaaa"
+	 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaa{}}}}}}}}}">>,
+       p({wwwww,{wwwww,{wwwww,{wwwww,{wwwww,{lkjsldfj,
+					     {klsdjfjklds,{klajsljls,
+							   {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}}}}}}}}},
+	 -1)),
+    "{{...},...}" = p({{a,b},{a,b,c},{d,e,f}},1,8,2),
     %% Closing brackets and parentheses count:
-    ?line "{{a,b,c},\n {{1,2,\n   3}}}" = p({{a,b,c},{{1,2,3}}},1,11,-1),
-    % With line breaks:
-%     ?line "{{a,b,c},\n {{1,\n   2,\n   3}}}" = p({{a,b,c},{{1,2,3}}},1,11,-1),
-    ?line "{{a,b,c},\n [1,2,\n  3]}" = p({{a,b,c},[1,2,3]},1,10,-1),
-    % With line breaks:
-%     ?line "{{a,b,c},\n [1,\n  2,\n  3]}" = p({{a,b,c},[1,2,3]},1,10,-1),
-    ?line "[{{a,b,c},\n  {1,2,\n   3}}]" = p([{{a,b,c},{1,2,3}}],1,12,-1),
-    % With line breaks:
-%     ?line "[{{a,b,c},\n  {1,\n   2,\n   3}}]" = p([{{a,b,c},{1,2,3}}],1,12,-1),
+    "{{a,b,c},\n {{1,2,\n   3}}}" = p({{a,b,c},{{1,2,3}}},1,11,-1),
+    %% With line breaks:
+    "{{a,b,c},\n [1,2,\n  3]}" = p({{a,b,c},[1,2,3]},1,10,-1),
+    %% With line breaks:
+    "[{{a,b,c},\n  {1,2,\n   3}}]" = p([{{a,b,c},{1,2,3}}],1,12,-1),
 
     %% A few lists:
-    ?line "[]" = p([], 1, 20, -1),
-    ?line "..." = p([], 1, 20, 0),
-    ?line "[]" = p([], 1, 20, 1),
-    ?line "[]" = p([], 1, 20, 2),
-    ?line "[a]" = p([a], 1, 20, -1),
-    ?line "..." = p([a], 1, 20, 0),
-    ?line "[...]" = p([a], 1, 20, 1),
-    ?line "[a]" = p([a], 1, 20, 2),
-    ?line "[a,b]" = p([a,b], 1, 20, -1),
-    ?line "..." = p([a,b], 1, 20, 0),
-    ?line "[...]" = p([a,b], 1, 20, 1),
-    ?line "[a|...]" = p([a,b], 1, 20, 2),
-    ?line "[a,b]" = p([a,b], 1, 20, 3),
-    ?line "[a|b]" = p([a|b], 1, 20, -1),
-    ?line "..." = p([a|b], 1, 20, 0),
-    ?line "[...]" = p([a|b], 1, 20, 1),
-    ?line "[a|...]" = p([a|b], 1, 20, 2),
-    ?line "[a|b]" = p([a|b], 1, 20, 3),
-    ?line "[]" = p([], 1, 1, -1),
-    ?line "..." = p([], 1, 1, 0),
-    ?line "[]" = p([], 1, 1, 1),
-    ?line "[]" = p([], 1, 1, 2),
-    ?line "[a]" = p([a], 1, 1, -1),
-    ?line "..." = p([a], 1, 1, 0),
-    ?line "[...]" = p([a], 1, 1, 1),
-    ?line "[a]" = p([a], 1, 1, 2),
-    ?line "[a,\n b]" = p([a,b], 1, 1, -1),
-    ?line "..." = p([a,b], 1, 1, 0),
-    ?line "[...]" = p([a,b], 1, 1, 1),
-    ?line "[a|...]" = p([a,b], 1, 1, 2),
-    ?line "[a,\n b]" = p([a,b], 1, 1, 3),
-    ?line "[a|\n b]" = p([a|b], 1, 1, -1),
-    ?line "..." = p([a|b], 1, 1, 0),
-    ?line "[...]" = p([a|b], 1, 1, 1),
-    ?line "[a|...]" = p([a|b], 1, 1, 2),
-    ?line "[a|\n b]" = p([a|b], 1, 1, 3),
-    ?line "[{}]" = p([{}], 1, 1, 2),
-    ?line "[[]]" = p([[]], 1, 1, 2),
-    ?line bt(<<"[1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]]">>,
-             p([1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]], -1)),
-    ?line bt(<<"[1,2,a,b,\n {sfdsf,sdfdsfs},\n [sfsdf,sdfsdf]]">>,
-             p([1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]], 1, 35, 100)),
-    % With other terms than atomic ones on the same line:
-%     ?line bt(<<"[1,2,a,b,{sfdsf,sdfdsfs},\n [sfsdf,sdfsdf]]">>,
-%              p([1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]], 1, 35, 100)),
-    % With line breaks:
-%     ?line bt(<<"[1,\n"
-%                " 2,\n"
-%                " a,\n"
-%                " b,\n"
-%                " {sfdsf,sdfdsfs},\n"
-%                " [sfsdf,sdfsdf]]">>,
-%              p([1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]], 1, 35, 100)),
+    "[]" = p([], 1, 20, -1),
+    "..." = p([], 1, 20, 0),
+    "[]" = p([], 1, 20, 1),
+    "[]" = p([], 1, 20, 2),
+    "[a]" = p([a], 1, 20, -1),
+    "..." = p([a], 1, 20, 0),
+    "[...]" = p([a], 1, 20, 1),
+    "[a]" = p([a], 1, 20, 2),
+    "[a,b]" = p([a,b], 1, 20, -1),
+    "..." = p([a,b], 1, 20, 0),
+    "[...]" = p([a,b], 1, 20, 1),
+    "[a|...]" = p([a,b], 1, 20, 2),
+    "[a,b]" = p([a,b], 1, 20, 3),
+    "[a|b]" = p([a|b], 1, 20, -1),
+    "..." = p([a|b], 1, 20, 0),
+    "[...]" = p([a|b], 1, 20, 1),
+    "[a|...]" = p([a|b], 1, 20, 2),
+    "[a|b]" = p([a|b], 1, 20, 3),
+    "[]" = p([], 1, 1, -1),
+    "..." = p([], 1, 1, 0),
+    "[]" = p([], 1, 1, 1),
+    "[]" = p([], 1, 1, 2),
+    "[a]" = p([a], 1, 1, -1),
+    "..." = p([a], 1, 1, 0),
+    "[...]" = p([a], 1, 1, 1),
+    "[a]" = p([a], 1, 1, 2),
+    "[a,\n b]" = p([a,b], 1, 1, -1),
+    "..." = p([a,b], 1, 1, 0),
+    "[...]" = p([a,b], 1, 1, 1),
+    "[a|...]" = p([a,b], 1, 1, 2),
+    "[a,\n b]" = p([a,b], 1, 1, 3),
+    "[a|\n b]" = p([a|b], 1, 1, -1),
+    "..." = p([a|b], 1, 1, 0),
+    "[...]" = p([a|b], 1, 1, 1),
+    "[a|...]" = p([a|b], 1, 1, 2),
+    "[a|\n b]" = p([a|b], 1, 1, 3),
+    "[{}]" = p([{}], 1, 1, 2),
+    "[[]]" = p([[]], 1, 1, 2),
+    bt(<<"[1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]]">>,
+       p([1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]], -1)),
+    bt(<<"[1,2,a,b,\n {sfdsf,sdfdsfs},\n [sfsdf,sdfsdf]]">>,
+       p([1,2,a,b,{sfdsf,sdfdsfs},[sfsdf,sdfsdf]], 1, 35, 100)),
     %% Element #8 is not printable:
-    ?line "[49," ++ _ = p("1234567"++[3,4,5,6,7], 1, 100, 9),
-    % ?line "\"1234567\"..." = p("1234567"++[3,4,5,6,7], 1, 100, 8),
+    "[49," ++ _ = p("1234567"++[3,4,5,6,7], 1, 100, 9),
+    %% "\"1234567\"..." = p("1234567"++[3,4,5,6,7], 1, 100, 8),
 
     %% A few records:
     %% -record(a, {}).
     %% -record(a, {}).
-    ?line "..." = p({a}, 0),
-    ?line "{...}" = p({a}, 1),
-    ?line "#a{}" = p({a}, 2),
-    ?line "#a{}" = p({a}, -1),
+    "..." = p({a}, 0),
+    "{...}" = p({a}, 1),
+    "#a{}" = p({a}, 2),
+    "#a{}" = p({a}, -1),
     %% -record(b, {f}).
-    ?line "{...}" = p({b}, 1),
-    ?line "..." = p({b,c}, 0),
-    ?line "{...}" = p({b,c}, 1),
-    ?line "#b{...}" = p({b,c}, 2),
-    ?line "#b{f = c}" = p({b,c}, 3),
-    ?line "#b{f = c}" = p({b,c}, -1),
-    ?line "..." = p({b,{c,d}}, 0),
-    ?line "{...}" = p({b,{c,d}}, 1),
-    ?line "#b{...}" = p({b,{c,d}}, 2),
-    ?line "#b{f = {...}}" = p({b,{c,d}}, 3),
-    ?line "#b{f = {c,...}}" = p({b,{c,d}}, 4),
-    ?line "#b{f = {c,d}}" = p({b,{c,d}}, 5),
-    ?line "#b{f = {...}}" = p({b,{b,c}}, 3),
-    ?line "#b{f = #b{...}}" = p({b,{b,c}}, 4),
-    ?line "#b{f = #b{f = c}}" = p({b,{b,c}}, 5),
+    "{...}" = p({b}, 1),
+    "..." = p({b,c}, 0),
+    "{...}" = p({b,c}, 1),
+    "#b{...}" = p({b,c}, 2),
+    "#b{f = c}" = p({b,c}, 3),
+    "#b{f = c}" = p({b,c}, -1),
+    "..." = p({b,{c,d}}, 0),
+    "{...}" = p({b,{c,d}}, 1),
+    "#b{...}" = p({b,{c,d}}, 2),
+    "#b{f = {...}}" = p({b,{c,d}}, 3),
+    "#b{f = {c,...}}" = p({b,{c,d}}, 4),
+    "#b{f = {c,d}}" = p({b,{c,d}}, 5),
+    "#b{f = {...}}" = p({b,{b,c}}, 3),
+    "#b{f = #b{...}}" = p({b,{b,c}}, 4),
+    "#b{f = #b{f = c}}" = p({b,{b,c}}, 5),
     %% -record(c, {f1, f2}).
-    ?line "#c{f1 = d,f2 = e}" = p({c,d,e}, -1),
-    ?line "..." = p({c,d,e}, 0),
-    ?line "{...}" = p({c,d,e}, 1),
-    ?line "#c{...}" = p({c,d,e}, 2),
-    ?line "#c{f1 = d,...}" = p({c,d,e}, 3),
-    ?line "#c{f1 = d,f2 = e}" = p({c,d,e}, 4),
+    "#c{f1 = d,f2 = e}" = p({c,d,e}, -1),
+    "..." = p({c,d,e}, 0),
+    "{...}" = p({c,d,e}, 1),
+    "#c{...}" = p({c,d,e}, 2),
+    "#c{f1 = d,...}" = p({c,d,e}, 3),
+    "#c{f1 = d,f2 = e}" = p({c,d,e}, 4),
     %% -record(d, {a..., b..., c.., d...}).
-    ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,\n"
-               "   cccccccccccccccccccc = 3,dddddddddddddddddddd = 4,\n"
-               "   eeeeeeeeeeeeeeeeeeee = 5}">>,
-             p({d,1,2,3,4,5}, -1)),
-    % With no restriction on number of characters per line:
-%     ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,"
-%                "cccccccccccccccccccc = 3,\n   dddddddddddddddddddd = 4,"
-%                "eeeeeeeeeeeeeeeeeeee = 5}">>,
-%              p({d,1,2,3,4,5}, -1)),
-    % With line breaks:
-%     ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,\n"
-%               "   bbbbbbbbbbbbbbbbbbbb = 2,\n"
-%               "   cccccccccccccccccccc = 3,\n"
-%               "   dddddddddddddddddddd = 4,\n"
-%               "   eeeeeeeeeeeeeeeeeeee = 5}">>,
-%              p({d,1,2,3,4,5}, -1)),
-    ?line "..." = p({d,1,2,3,4,5}, 0),
-    ?line "{...}" = p({d,1,2,3,4,5}, 1),
-    ?line "#d{...}" = p({d,1,2,3,4,5}, 2),
-    ?line "#d{aaaaaaaaaaaaaaaaaaaa = 1,...}" = p({d,1,2,3,4,5}, 3),
-    ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,...}">>,
-             p({d,1,2,3,4,5}, 4)),
-    ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,\n"
-               "   cccccccccccccccccccc = 3,...}">>,
-             p({d,1,2,3,4,5}, 5)), % longer than 80 characters...
-    % With no restriction on number of characters per line:
-%     ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,"
-%                "cccccccccccccccccccc = 3,...}">>,
-%              p({d,1,2,3,4,5}, 5)), % longer than 80 characters...
-    % With line breaks:
-%     ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,\n"
-%               "   bbbbbbbbbbbbbbbbbbbb = 2,\n"
-%               "   cccccccccccccccccccc = 3,...}">>,
-%              p({d,1,2,3,4,5}, 5)),
-    ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,\n"
-               "   cccccccccccccccccccc = 3,dddddddddddddddddddd = 4,...}">>,
-             p({d,1,2,3,4,5}, 6)),
-    % With no restriction on number of characters per line:
-%     ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,"
-%                "cccccccccccccccccccc = 3,\n   dddddddddddddddddddd = 4,...}">>,
-%              p({d,1,2,3,4,5}, 6)),
-    % With line breaks:
-%     ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,\n"
-%               "   bbbbbbbbbbbbbbbbbbbb = 2,\n"
-%               "   cccccccccccccccccccc = 3,\n"
-%               "   dddddddddddddddddddd = 4,...}">>,
-%              p({d,1,2,3,4,5}, 6)),
-    ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,\n"
-               "   cccccccccccccccccccc = 3,dddddddddddddddddddd = 4,\n"
-               "   eeeeeeeeeeeeeeeeeeee = 5}">>,
-             p({d,1,2,3,4,5}, 7)),
-    % With no restriction on number of characters per line:
-%     ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,"
-%                "cccccccccccccccccccc = 3,\n   dddddddddddddddddddd = 4,"
-%                "eeeeeeeeeeeeeeeeeeee = 5}">>,
-%              p({d,1,2,3,4,5}, 7)),
-    % With line breaks:
-%     ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,\n"
-%               "   bbbbbbbbbbbbbbbbbbbb = 2,\n"
-%               "   cccccccccccccccccccc = 3,\n"
-%               "   dddddddddddddddddddd = 4,\n"
-%               "   eeeeeeeeeeeeeeeeeeee = 5}">>,
-%              p({d,1,2,3,4,5}, 7)),
-    ?line bt(<<"#rrrrr{\n"
-              "    f1 = 1,\n"
-              "    f2 = #rrrrr{f1 = a,f2 = b,f3 = c},\n"
-              "    f3 = \n"
-              "        #rrrrr{\n"
-              "            f1 = h,f2 = i,\n"
-              "            f3 = \n"
-              "                #rrrrr{\n"
-              "                    f1 = aa,\n"
-              "                    f2 = \n"
-              "                        #rrrrr{\n"
-              "                            f1 = #rrrrr{f1 = a,f2 = b,f3 = c},\n"
-              "                            f2 = 2,f3 = 3},\n"
-              "                    f3 = bb}}}">>,
-             p({rrrrr,1,{rrrrr,a,b,c},{rrrrr,h,i,
-                                       {rrrrr,aa,{rrrrr,{rrrrr,a,b,c},
-                                                  2,3},bb}}}, 
-               -1)),
-    % With other terms than atomic ones on the same line:
-%     ?line bt(<<"#rrrrr{\n"
-%               "    f1 = 1,f2 = #rrrrr{f1 = a,f2 = b,f3 = c},\n"
-%               "    f3 = \n"
-%               "        #rrrrr{\n"
-%               "            f1 = h,f2 = i,\n"
-%               "            f3 = \n"
-%               "                #rrrrr{\n"
-%               "                    f1 = aa,\n"
-%               "                    f2 = \n"
-%               "                        #rrrrr{\n"
-%               "                            f1 = #rrrrr{f1 = a,f2 = b,"
-%                                                "f3 = c},f2 = 2,f3 = 3},\n"
-%               "                    f3 = bb}}}">>,
-%              p({rrrrr,1,{rrrrr,a,b,c},{rrrrr,h,i,
-%                                        {rrrrr,aa,{rrrrr,{rrrrr,a,b,c},
-%                                                   2,3},bb}}}, 
-%                -1)),
-    % With line breaks:
-%     ?line bt(<<"#rrrrr{\n"
-%               "    f1 = 1,\n"
-%               "    f2 = #rrrrr{f1 = a,f2 = b,f3 = c},\n"
-%               "    f3 = \n"
-%               "        #rrrrr{\n"
-%               "            f1 = h,\n"
-%               "            f2 = i,\n"
-%               "            f3 = \n"
-%               "                #rrrrr{\n"
-%               "                    f1 = aa,\n"
-%               "                    f2 = \n"
-%               "                        #rrrrr{\n"
-%               "                            f1 = #rrrrr{f1 = a,f2 = b,"
-%                                                "f3 = c},\n"
-%               "                            f2 = 2,\n"
-%               "                            f3 = 3},\n"
-%               "                    f3 = bb}}}">>,
-%              p({rrrrr,1,{rrrrr,a,b,c},{rrrrr,h,i,
-%                                        {rrrrr,aa,{rrrrr,{rrrrr,a,b,c},
-%                                                   2,3},bb}}}, 
-%                -1)),
-    ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,\n"
-              "   bbbbbbbbbbbbbbbbbbbb = \n"
-              "       #d{aaaaaaaaaaaaaaaaaaaa = a,bbbbbbbbbbbbbbbbbbbb = b,\n"
-              "          cccccccccccccccccccc = c,dddddddddddddddddddd = d,\n"
-              "          eeeeeeeeeeeeeeeeeeee = e},\n"
-              "   cccccccccccccccccccc = 3,\n"
-              "   dddddddddddddddddddd = \n"
-              "       #d{aaaaaaaaaaaaaaaaaaaa = h,bbbbbbbbbbbbbbbbbbbb = i,\n"
-              "          cccccccccccccccccccc = \n"
-              "              #d{aaaaaaaaaaaaaaaaaaaa = aa,"
-                                       "bbbbbbbbbbbbbbbbbbbb = bb,\n"
-              "                 cccccccccccccccccccc = \n"
-              "                     #d{aaaaaaaaaaaaaaaaaaaa = 1,"
-                                        "bbbbbbbbbbbbbbbbbbbb = 2,\n"
-              "                        cccccccccccccccccccc = 3,"
-                                        "dddddddddddddddddddd = 4,\n"
-              "                        eeeeeeeeeeeeeeeeeeee = 5},\n"
-              "                 dddddddddddddddddddd = dd,"
-                                    "eeeeeeeeeeeeeeeeeeee = ee},\n"
-              "          dddddddddddddddddddd = k,"
-                              "eeeeeeeeeeeeeeeeeeee = l},\n"
-              "   eeeeeeeeeeeeeeeeeeee = 5}">>,
-             p({d,1,{d,a,b,c,d,e},3,{d,h,i,{d,aa,bb,{d,1,2,3,4,5},dd,ee},
-                                     k,l},5}, -1)),
-    % With line breaks:
-%     ?line bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,\n"
-%               "   bbbbbbbbbbbbbbbbbbbb = \n"
-%               "       #d{aaaaaaaaaaaaaaaaaaaa = a,\n"
-%               "          bbbbbbbbbbbbbbbbbbbb = b,\n"
-%               "          cccccccccccccccccccc = c,\n"
-%               "          dddddddddddddddddddd = d,\n"
-%               "          eeeeeeeeeeeeeeeeeeee = e},\n"
-%               "   cccccccccccccccccccc = 3,\n"
-%               "   dddddddddddddddddddd = \n"
-%               "       #d{aaaaaaaaaaaaaaaaaaaa = h,\n"
-%               "          bbbbbbbbbbbbbbbbbbbb = i,\n"
-%               "          cccccccccccccccccccc = \n"
-%               "              #d{aaaaaaaaaaaaaaaaaaaa = aa,\n"
-%               "                 bbbbbbbbbbbbbbbbbbbb = bb,\n"
-%               "                 cccccccccccccccccccc = \n"
-%               "                     #d{aaaaaaaaaaaaaaaaaaaa = 1,\n"
-%               "                        bbbbbbbbbbbbbbbbbbbb = 2,\n"
-%               "                        cccccccccccccccccccc = 3,\n"
-%               "                        dddddddddddddddddddd = 4,\n"
-%               "                        eeeeeeeeeeeeeeeeeeee = 5},\n"
-%               "                 dddddddddddddddddddd = dd,\n"
-%               "                 eeeeeeeeeeeeeeeeeeee = ee},\n"
-%               "          dddddddddddddddddddd = k,\n"
-%               "          eeeeeeeeeeeeeeeeeeee = l},\n"
-%               "   eeeeeeeeeeeeeeeeeeee = 5}">>,
-%              p({d,1,{d,a,b,c,d,e},3,{d,h,i,{d,aa,bb,{d,1,2,3,4,5},dd,ee},
-%                                      k,l},5}, -1)),
+    bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,\n"
+	 "   cccccccccccccccccccc = 3,dddddddddddddddddddd = 4,\n"
+	 "   eeeeeeeeeeeeeeeeeeee = 5}">>,
+       p({d,1,2,3,4,5}, -1)),
+    "..." = p({d,1,2,3,4,5}, 0),
+    "{...}" = p({d,1,2,3,4,5}, 1),
+    "#d{...}" = p({d,1,2,3,4,5}, 2),
+    "#d{aaaaaaaaaaaaaaaaaaaa = 1,...}" = p({d,1,2,3,4,5}, 3),
+    bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,...}">>,
+       p({d,1,2,3,4,5}, 4)),
+    bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,\n"
+	 "   cccccccccccccccccccc = 3,...}">>,
+       p({d,1,2,3,4,5}, 5)), % longer than 80 characters...
+    bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,\n"
+	 "   cccccccccccccccccccc = 3,dddddddddddddddddddd = 4,...}">>,
+       p({d,1,2,3,4,5}, 6)),
+    bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,bbbbbbbbbbbbbbbbbbbb = 2,\n"
+	 "   cccccccccccccccccccc = 3,dddddddddddddddddddd = 4,\n"
+	 "   eeeeeeeeeeeeeeeeeeee = 5}">>,
+       p({d,1,2,3,4,5}, 7)),
+    bt(<<"#rrrrr{\n"
+	 "    f1 = 1,\n"
+	 "    f2 = #rrrrr{f1 = a,f2 = b,f3 = c},\n"
+	 "    f3 = \n"
+	 "        #rrrrr{\n"
+	 "            f1 = h,f2 = i,\n"
+	 "            f3 = \n"
+	 "                #rrrrr{\n"
+	 "                    f1 = aa,\n"
+	 "                    f2 = \n"
+	 "                        #rrrrr{\n"
+	 "                            f1 = #rrrrr{f1 = a,f2 = b,f3 = c},\n"
+	 "                            f2 = 2,f3 = 3},\n"
+	 "                    f3 = bb}}}">>,
+       p({rrrrr,1,{rrrrr,a,b,c},{rrrrr,h,i,
+				 {rrrrr,aa,{rrrrr,{rrrrr,a,b,c},
+					    2,3},bb}}},
+	 -1)),
+    bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,\n"
+	 "   bbbbbbbbbbbbbbbbbbbb = \n"
+	 "       #d{aaaaaaaaaaaaaaaaaaaa = a,bbbbbbbbbbbbbbbbbbbb = b,\n"
+	 "          cccccccccccccccccccc = c,dddddddddddddddddddd = d,\n"
+	 "          eeeeeeeeeeeeeeeeeeee = e},\n"
+	 "   cccccccccccccccccccc = 3,\n"
+	 "   dddddddddddddddddddd = \n"
+	 "       #d{aaaaaaaaaaaaaaaaaaaa = h,bbbbbbbbbbbbbbbbbbbb = i,\n"
+	 "          cccccccccccccccccccc = \n"
+	 "              #d{aaaaaaaaaaaaaaaaaaaa = aa,"
+	 "bbbbbbbbbbbbbbbbbbbb = bb,\n"
+	 "                 cccccccccccccccccccc = \n"
+	 "                     #d{aaaaaaaaaaaaaaaaaaaa = 1,"
+	 "bbbbbbbbbbbbbbbbbbbb = 2,\n"
+	 "                        cccccccccccccccccccc = 3,"
+	 "dddddddddddddddddddd = 4,\n"
+	 "                        eeeeeeeeeeeeeeeeeeee = 5},\n"
+	 "                 dddddddddddddddddddd = dd,"
+	 "eeeeeeeeeeeeeeeeeeee = ee},\n"
+	 "          dddddddddddddddddddd = k,"
+	 "eeeeeeeeeeeeeeeeeeee = l},\n"
+	 "   eeeeeeeeeeeeeeeeeeee = 5}">>,
+       p({d,1,{d,a,b,c,d,e},3,{d,h,i,{d,aa,bb,{d,1,2,3,4,5},dd,ee},
+			       k,l},5}, -1)),
 
     A = aaaaaaaaaaaaa,
     %% Print the record with dots at the end of the line (Ll = 80).
-    ?line "{aaaaaaa" ++ _ = 
-          p({A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,
-             {A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,
-              {A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,
-               {A,{A,{ggg,{hhh,{ii,{jj,{kk,{ll,{mm,{nn,{oo,{d,1,2,3,4,5}
-                }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-                 }}}}}}}}}}}}}}}}, 146),
-    ?line "{aaaaaaa" ++ _ = 
-          p({A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,
-             {A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,
-              {A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,
-               {A,{A,{A,{A,{A,{ggg,{hhh,{ii,{jj,{kk,{ll,{mm,{nn,{oo,{a}
-                }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
-                 }}}}}}}}}}}}}}}}}}}, 152),
-
-    ?line bt(<<"{aaaaaaaaaaaaa,\n"
-               "    {aaaaaaaaaaaaa,\n"
-               "        {aaaaaaaaaaaaa,\n"
-               "            {aaaaaaaaaaaaa,\n"
-               "                {aaaaaaaaaaaaa,\n"
-               "                    {aaaaaaaaaaaaa,\n"
-               "                        {g,{h,{i,{j,{k,{l,{m,{n,{o,#"
-                                           "d{...}}}}}}}}}}}}}}}}">>,
-             p({A,{A,{A,{A,{A,{A,
-                {g,{h,{i,{j,{k,{l,{m,{n,{o,{d,1,2,3,4,5}}}}}}}}}}}}}}}}, 32)),
-    ?line bt(<<"{a,#b{f = {c,{d,{e,{f,...}}}}}}">>,
-             p({a,{b,{c,{d,{e,{f,g}}}}}}, 12)),
-    ?line bt(<<"{aaaaaaaaaaaaa,\n"
-              "    {aaaaaaaaaaaaa,\n"
-              "        {aaaaaaaaaaaaa,\n"
-              "            {aaaaaaaaaaaaa,\n"
-              "                {aaaaaaaaaaaaa,\n"
-              "                    {aaaaaaaaaaaaa,\n"
-              "                        {aaaaaaaaaaaaa,\n"
-              "                            {aaaaaaaaaaaaa,\n"
-              "                                {aaaaaaaaaaaaa,#c{f1 = ddd,"
-                          "f2 = eee}}}}}}}}}}">>,
-             p({A,{A,{A,{A,{A,{A,{A,{A,{A,{c,ddd,eee}}}}}}}}}}, 100)),
-    ?line bt(<<"{aaaaaaaaaaaaa,\n"
-               "    {aaaaaaaaaaaaa,{aaaaaaaaaaaaa,{aaaaaaaaaaaaa,...}}}}">>, 
-             p({A,{A,{A,{A,{b}}}}}, 8)),
-    % With no restriction on number of characters per line:
-%     ?line bt(<<"{aaaaaaaaaaaaa,{aaaaaaaaaaaaa,{aaaaaaaaaaaaa,"
-%               "{aaaaaaaaaaaaa,...}}}}">>, 
-%              p({A,{A,{A,{A,{b}}}}}, 8)),
-    ?line bt(<<"{aaaaaaaaaaaaa,\n"
-            "    {aaaaaaaaaaaaa,\n"
-            "        {aaaaaaaaaaaaa,{aaaaaaaaaaaaa,{aaaaaaaaaaaaa,...}}}}}">>,
-             p({A,{A,{A,{A,{A,{b}}}}}}, 10)),
-    % With no restriction on number of characters per line:
-%     ?line bt(<<"{aaaaaaaaaaaaa,\n"
-%                "    {aaaaaaaaaaaaa,{aaaaaaaaaaaaa,{aaaaaaaaaaaaa,"
-%                          "{aaaaaaaaaaaaa,...}}}}}">>,
-%              p({A,{A,{A,{A,{A,{b}}}}}}, 10)),
-    ?line bt(<<"{aaaaaaaaaaaaa,\n"
-              "    {aaaaaaaaaaaaa,\n"
-              "        {aaaaaaaaaaaaa,\n"
-              "            {aaaaaaaaaaaaa,\n"
-              "                {aaaaaaaaaaaaa,\n"
-              "                    {aaaaaaaaaaaaa,\n"
-              "                        {aaaaaaaaaaaaa,\n"
-              "                            {aaaaaaaaaaaaa,\n"
-              "                                {aaaaaaaaaaaaa,"
-                      "{aaaaaaaaaaaaa,#a{}}}}}}}}}}}">>,
-             p({A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{a}}}}}}}}}}}, 23)),
-    ?line bt(<<"{aaaaaaaaaaaaa,\n"
-               "    {aaaaaaaaaaaaa,\n"
-               "        {aaaaaaaaaaaaa,\n",
-               "            #rrrrr{\n"
-               "                f1 = kljlkjlksfdgkljlsdkjf,"
-                         "f2 = kljkljsdaflkjlkjsdf,...}}}}">>,
-             p({A,{A,{A,{rrrrr, kljlkjlksfdgkljlsdkjf, 
-                         kljkljsdaflkjlkjsdf, 
-                         asdfkldsjfklkljsdklfds}}}}, 10)),
-    % With no restriction on number of characters per line:
-%     ?line bt(<<"{aaaaaaaaaaaaa,\n"
-%                "    {aaaaaaaaaaaaa,\n"
-%                "        {aaaaaaaaaaaaa,\n",
-%                "            #rrrrr{f1 = kljlkjlksfdgkljlsdkjf,f2 = "
-%                              "kljkljsdaflkjlkjsdf,...}}}}">>,
-%              p({A,{A,{A,{rrrrr, kljlkjlksfdgkljlsdkjf, 
-%                          kljkljsdaflkjlkjsdf, 
-%                          asdfkldsjfklkljsdklfds}}}}, 10)),
-    ?line bt(<<"{aaaaaaaaaaaaa,\n"
-              "    {aaaaaaaaaaaaa,\n"
-              "        {aaaaaaaaaaaaa,\n"
-              "            {aaaaaaaaaaaaa,\n"
-              "                {aaaaaaaaaaaaa,\n"
-              "                    {aaaaaaaaaaaaa,\n"
-              "                        {aaaaaaaaaaaaa,\n"
-              "                            {g,{h,{i,{j,{k,{l,{m,{n,"
-                               "{o,#a{}}}}}}}}}}}}}}}}}">>,
-             p({A,{A,{A,{A,{A,{A,{A,
-                      {g,{h,{i,{j,{k,{l,{m,{n,{o,{a}}}}}}}}}}}}}}}}}, 100)),
-    ?line bt(<<"#c{\n"
-              " f1 = \n"
-              "  #c{\n"
-              "   f1 = \n"
-              "    #c{\n"
-              "     f1 = \n"
-              "      #c{\n"
-              "       f1 = \n"
-              "        #c{\n"
-              "         f1 = \n"
-              "          #c{\n"
-              "           f1 = \n"
-              "            #c{\n"
-              "             f1 = \n"
-              "              #c{\n"
-              "               f1 = \n"
-              "                #c{\n"
-              "                 f1 = #c{f1 = #c{f1 = #c{f1 = a,"
-                                     "f2 = b},f2 = b},f2 = b},\n"
-              "                 f2 = b},\n"
-              "               f2 = b},\n"
-              "             f2 = b},\n"
-              "           f2 = b},\n"
-              "         f2 = b},\n"
-              "       f2 = b},\n"
-              "     f2 = b},\n"
-              "   f2 = b},\n"
-              " f2 = b}">>,
-              p({c,{c,{c,{c,{c,{c,{c,{c,{c,{c,{c,{c,a,b},b},b},b},b},b},
-                                b},b},b},b},b},b}, -1)),
-    ?line bt(<<"#rrrrr{\n"
-              " f1 = \n"
-              "  #rrrrr{\n"
-              "   f1 = \n"
-              "    #rrrrr{\n"
-              "     f1 = \n"
-              "      #rrrrr{\n"
-              "       f1 = \n"
-              "        {rrrrr,{rrrrr,a,#rrrrr{f1 = {rrrrr,1,2},f2 = a,"
-                                 "f3 = b}},b},\n"
-              "       f2 = {rrrrr,c,d},\n"
-              "       f3 = {rrrrr,1,2}},\n"
-              "     f2 = 1,f3 = 2},\n"
-              "   f2 = 3,f3 = 4},\n"
-              " f2 = 5,f3 = 6}">>,
-             p({rrrrr,{rrrrr,{rrrrr,{rrrrr,{rrrrr,{rrrrr,a,{rrrrr,
-                              {rrrrr,1,2},a,b}},b},{rrrrr,c,d},{rrrrr,1,2}},
-                              1,2},3,4},5,6}, -1)),
-    % With other terms than atomic ones on the same line:
-%     ?line bt(<<"#rrrrr{\n"
-%               " f1 = \n"
-%               "  #rrrrr{\n"
-%               "   f1 = \n"
-%               "    #rrrrr{\n"
-%               "     f1 = \n"
-%               "      #rrrrr{\n"
-%               "       f1 = \n"
-%               "        {rrrrr,{rrrrr,a,#rrrrr{f1 = {rrrrr,1,2},f2 = a,"
-%                                  "f3 = b}},b},\n"
-%               "       f2 = {rrrrr,c,d},f3 = {rrrrr,1,2}},\n"
-%               "     f2 = 1,f3 = 2},\n"
-%               "   f2 = 3,f3 = 4},\n"
-%               " f2 = 5,f3 = 6}">>,
-%              p({rrrrr,{rrrrr,{rrrrr,{rrrrr,{rrrrr,{rrrrr,a,{rrrrr,
-%                               {rrrrr,1,2},a,b}},b},{rrrrr,c,d},{rrrrr,1,2}},
-%                               1,2},3,4},5,6}, -1)),
-    % With no restriction on number of characters per line:
-%     ?line bt(<<"#rrrrr{\n"
-%               " f1 = \n"
-%               "  #rrrrr{\n"
-%               "   f1 = \n"
-%               "    #rrrrr{\n"
-%               "     f1 = \n"
-%               "      #rrrrr{\n"
-%               "       f1 = {rrrrr,{rrrrr,a,#rrrrr{f1 = {rrrrr,1,2},f2 = a,"
-%                                  "f3 = b}},b},\n"
-%               "       f2 = {rrrrr,c,d},f3 = {rrrrr,1,2}},\n"
-%               "     f2 = 1,f3 = 2},\n"
-%               "   f2 = 3,f3 = 4},\n"
-%               " f2 = 5,f3 = 6}">>,
-%              p({rrrrr,{rrrrr,{rrrrr,{rrrrr,{rrrrr,{rrrrr,a,{rrrrr,
-%                               {rrrrr,1,2},a,b}},b},{rrrrr,c,d},{rrrrr,1,2}},
-%                               1,2},3,4},5,6}, -1)),
-    % With line breaks:
-%     ?line bt(<<"#rrrrr{\n"
-%               " f1 = \n"
-%               "  #rrrrr{\n"
-%               "   f1 = \n"
-%               "    #rrrrr{\n"
-%               "     f1 = \n"
-%               "      #rrrrr{\n"
-%               "       f1 = {rrrrr,{rrrrr,a,#rrrrr{f1 = {rrrrr,1,2},f2 = a,"
-%                                  "f3 = b}},b},\n"
-%               "       f2 = {rrrrr,c,d},\n"
-%               "       f3 = {rrrrr,1,2}},\n"
-%               "     f2 = 1,\n"
-%               "     f3 = 2},\n"
-%               "   f2 = 3,\n"
-%               "   f3 = 4},\n"
-%               " f2 = 5,\n"
-%               " f3 = 6}">>,
-%              p({rrrrr,{rrrrr,{rrrrr,{rrrrr,{rrrrr,{rrrrr,a,{rrrrr,
-%                               {rrrrr,1,2},a,b}},b},{rrrrr,c,d},{rrrrr,1,2}},
-%                               1,2},3,4},5,6}, -1)),
-    ?line "{aaa,\n {aaa," ++ _ = 
+    "{aaaaaaa" ++ _ =
+	p({A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,
+								       {A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,
+																 {A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,
+																							   {A,{A,{ggg,{hhh,{ii,{jj,{kk,{ll,{mm,{nn,{oo,{d,1,2,3,4,5}
+																												   }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+						       }}}}}}}}}}}}}}}}, 146),
+    "{aaaaaaa" ++ _ =
+	p({A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,
+								       {A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,
+																 {A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{A,
+																							   {A,{A,{A,{A,{A,{ggg,{hhh,{ii,{jj,{kk,{ll,{mm,{nn,{oo,{a}
+																													    }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+								}}}}}}}}}}}}}}}}}}}, 152),
+
+    bt(<<"{aaaaaaaaaaaaa,\n"
+	 "    {aaaaaaaaaaaaa,\n"
+	 "        {aaaaaaaaaaaaa,\n"
+	 "            {aaaaaaaaaaaaa,\n"
+	 "                {aaaaaaaaaaaaa,\n"
+	 "                    {aaaaaaaaaaaaa,\n"
+	 "                        {g,{h,{i,{j,{k,{l,{m,{n,{o,#"
+	 "d{...}}}}}}}}}}}}}}}}">>,
+       p({A,{A,{A,{A,{A,{A,
+			 {g,{h,{i,{j,{k,{l,{m,{n,{o,{d,1,2,3,4,5}}}}}}}}}}}}}}}}, 32)),
+    bt(<<"{a,#b{f = {c,{d,{e,{f,...}}}}}}">>,
+       p({a,{b,{c,{d,{e,{f,g}}}}}}, 12)),
+    bt(<<"{aaaaaaaaaaaaa,\n"
+	 "    {aaaaaaaaaaaaa,\n"
+	 "        {aaaaaaaaaaaaa,\n"
+	 "            {aaaaaaaaaaaaa,\n"
+	 "                {aaaaaaaaaaaaa,\n"
+	 "                    {aaaaaaaaaaaaa,\n"
+	 "                        {aaaaaaaaaaaaa,\n"
+	 "                            {aaaaaaaaaaaaa,\n"
+	 "                                {aaaaaaaaaaaaa,#c{f1 = ddd,"
+	 "f2 = eee}}}}}}}}}}">>,
+       p({A,{A,{A,{A,{A,{A,{A,{A,{A,{c,ddd,eee}}}}}}}}}}, 100)),
+    bt(<<"{aaaaaaaaaaaaa,\n"
+	 "    {aaaaaaaaaaaaa,{aaaaaaaaaaaaa,{aaaaaaaaaaaaa,...}}}}">>,
+       p({A,{A,{A,{A,{b}}}}}, 8)),
+    bt(<<"{aaaaaaaaaaaaa,\n"
+	 "    {aaaaaaaaaaaaa,\n"
+	 "        {aaaaaaaaaaaaa,{aaaaaaaaaaaaa,{aaaaaaaaaaaaa,...}}}}}">>,
+       p({A,{A,{A,{A,{A,{b}}}}}}, 10)),
+    bt(<<"{aaaaaaaaaaaaa,\n"
+	 "    {aaaaaaaaaaaaa,\n"
+	 "        {aaaaaaaaaaaaa,\n"
+	 "            {aaaaaaaaaaaaa,\n"
+	 "                {aaaaaaaaaaaaa,\n"
+	 "                    {aaaaaaaaaaaaa,\n"
+	 "                        {aaaaaaaaaaaaa,\n"
+	 "                            {aaaaaaaaaaaaa,\n"
+	 "                                {aaaaaaaaaaaaa,"
+	 "{aaaaaaaaaaaaa,#a{}}}}}}}}}}}">>,
+       p({A,{A,{A,{A,{A,{A,{A,{A,{A,{A,{a}}}}}}}}}}}, 23)),
+    bt(<<"{aaaaaaaaaaaaa,\n"
+	 "    {aaaaaaaaaaaaa,\n"
+	 "        {aaaaaaaaaaaaa,\n",
+	 "            #rrrrr{\n"
+	 "                f1 = kljlkjlksfdgkljlsdkjf,"
+	 "f2 = kljkljsdaflkjlkjsdf,...}}}}">>,
+       p({A,{A,{A,{rrrrr, kljlkjlksfdgkljlsdkjf,
+		   kljkljsdaflkjlkjsdf,
+		   asdfkldsjfklkljsdklfds}}}}, 10)),
+    bt(<<"{aaaaaaaaaaaaa,\n"
+	 "    {aaaaaaaaaaaaa,\n"
+	 "        {aaaaaaaaaaaaa,\n"
+	 "            {aaaaaaaaaaaaa,\n"
+	 "                {aaaaaaaaaaaaa,\n"
+	 "                    {aaaaaaaaaaaaa,\n"
+	 "                        {aaaaaaaaaaaaa,\n"
+	 "                            {g,{h,{i,{j,{k,{l,{m,{n,"
+	 "{o,#a{}}}}}}}}}}}}}}}}}">>,
+       p({A,{A,{A,{A,{A,{A,{A,
+			    {g,{h,{i,{j,{k,{l,{m,{n,{o,{a}}}}}}}}}}}}}}}}}, 100)),
+    bt(<<"#c{\n"
+	 " f1 = \n"
+	 "  #c{\n"
+	 "   f1 = \n"
+	 "    #c{\n"
+	 "     f1 = \n"
+	 "      #c{\n"
+	 "       f1 = \n"
+	 "        #c{\n"
+	 "         f1 = \n"
+	 "          #c{\n"
+	 "           f1 = \n"
+	 "            #c{\n"
+	 "             f1 = \n"
+	 "              #c{\n"
+	 "               f1 = \n"
+	 "                #c{\n"
+	 "                 f1 = #c{f1 = #c{f1 = #c{f1 = a,"
+	 "f2 = b},f2 = b},f2 = b},\n"
+	 "                 f2 = b},\n"
+	 "               f2 = b},\n"
+	 "             f2 = b},\n"
+	 "           f2 = b},\n"
+	 "         f2 = b},\n"
+	 "       f2 = b},\n"
+	 "     f2 = b},\n"
+	 "   f2 = b},\n"
+	 " f2 = b}">>,
+       p({c,{c,{c,{c,{c,{c,{c,{c,{c,{c,{c,{c,a,b},b},b},b},b},b},
+			 b},b},b},b},b},b}, -1)),
+    bt(<<"#rrrrr{\n"
+	 " f1 = \n"
+	 "  #rrrrr{\n"
+	 "   f1 = \n"
+	 "    #rrrrr{\n"
+	 "     f1 = \n"
+	 "      #rrrrr{\n"
+	 "       f1 = \n"
+	 "        {rrrrr,{rrrrr,a,#rrrrr{f1 = {rrrrr,1,2},f2 = a,"
+	 "f3 = b}},b},\n"
+	 "       f2 = {rrrrr,c,d},\n"
+	 "       f3 = {rrrrr,1,2}},\n"
+	 "     f2 = 1,f3 = 2},\n"
+	 "   f2 = 3,f3 = 4},\n"
+	 " f2 = 5,f3 = 6}">>,
+       p({rrrrr,{rrrrr,{rrrrr,{rrrrr,{rrrrr,{rrrrr,a,{rrrrr,
+						      {rrrrr,1,2},a,b}},b},{rrrrr,c,d},{rrrrr,1,2}},
+			1,2},3,4},5,6}, -1)),
+    "{aaa,\n {aaa," ++ _ =
         p({aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,
-           {aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,
-            {aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,
-             {aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,
-              {aaa,a}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}, 
+								       {aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,
+															       {aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,
+																						  {aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,{aaa,
+																												{aaa,a}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}},
           1, 80, -1),
 
     %% A few other cases...
-    ?line "{a,#Fun<" ++ _ = lists:flatten(io_lib_pretty:print({a,fun fmt/2})),
-    ?line "#Fun<" ++ _ = io_lib_pretty:print(fun() -> foo end),
-    % ?line "[<<\"foobar\">>|<<\"barf\"...>>]" = 
-    %             p([<<"foobar">>|<<"barfoo">>], 1, 30, 4),
+    "{a,#Fun<" ++ _ = lists:flatten(io_lib_pretty:print({a,fun fmt/2})),
+    "#Fun<" ++ _ = io_lib_pretty:print(fun() -> foo end),
     %% No support for negative columns any more:
-    ?line "[a,\n [b,\n  c,\n  d,\n  [e,\n   f]],\n c]" = 
-          p([a,[b,c,d,[e,f]],c], -1, 2, 10),
-    ?line "[a,\n [b,\n  c,\n  d,\n  [e,\n   f]],\n c]" = 
-          p([a,[b,c,d,[e,f]],c], 0, 2, 10),
+    "[a,\n [b,\n  c,\n  d,\n  [e,\n   f]],\n c]" =
+	p([a,[b,c,d,[e,f]],c], -1, 2, 10),
+    "[a,\n [b,\n  c,\n  d,\n  [e,\n   f]],\n c]" =
+	p([a,[b,c,d,[e,f]],c], 0, 2, 10),
     %% 20 bytes are tried first, then the rest. Try 21 bytes:
     L = lists:duplicate(20, $a),
-    % ?line bt(<<"<<\"aaaaaa\"\n  \"aaaaaa\"\n  \"aaaaaa\"\n  \"aaa\">>">>,
-    ?line bt(<<"<<\"aaaaaaaaaaaaaaaaaaaaa\">>">>,
-             p(list_to_binary([$a | L]), 1, 10, -1)),
-    ?line "<<97," ++ _ = p(list_to_binary(L ++ [3]), 1, 10, -1),
-    % ?line "<<\"aaaa\"...>>" = p(list_to_binary(L ++ [3]), 1, 10, 2),
-    % ?line "<<\"aaaaaa\"\n  \"aa\"...>>" = 
-    % ?line "<<\"aaaaaaaa\"...>>" =
-    %               p(list_to_binary(L ++ [3]), 1, 10, 3),
-    % ?line "<<\"aaaaaa\"\n  \"aaaaaa\"\n  \"aaaaaa\"\n  \"aa\"...>>" = 
-    % ?line "<<\"aaaaaaaaaaaaaaaaaaaa\"...>>" =
-    %        p(list_to_binary(L ++ [3]), 1, 10, 21),
-    ?line "<<97," ++ _ = p(list_to_binary(L ++ [3]), 1, 10, 22),
-
-    ?line "\"\\b\\t\\n\\v\\f\\r\\e\250\"" = 
-              p([8,9,10,11,12,13,27,168], 1, 40, -1),
-    % ?line "\"\\b\\t\\n\"\n \"\\v\\f\\r\"\n \"\\e\250\"" =
-    ?line "\"\\b\\t\\n\\v\\f\\r\\e¨\"" =
-              p([8,9,10,11,12,13,27,168], 1, 10, -1),
-    ?line "\"\\b\\t\\n\\v\\f\\r\\e\250\"" = 
-              p([8,9,10,11,12,13,27,168], 1, 40, 100),
-    % ?line "\"\\e\\t\\nab\"\n \"cd\"" = 
-    ?line "\"\\e\\t\\nabcd\"" = 
-              p("\e\t\nabcd", 1, 12, -1),
+    %% bt(<<"<<\"aaaaaa\"\n  \"aaaaaa\"\n  \"aaaaaa\"\n  \"aaa\">>">>,
+    bt(<<"<<\"aaaaaaaaaaaaaaaaaaaaa\">>">>,
+       p(list_to_binary([$a | L]), 1, 10, -1)),
+    "<<97," ++ _ = p(list_to_binary(L ++ [3]), 1, 10, -1),
+    "<<97," ++ _ = p(list_to_binary(L ++ [3]), 1, 10, 22),
+
+    "\"\\b\\t\\n\\v\\f\\r\\e\250\"" =
+	p([8,9,10,11,12,13,27,168], 1, 40, -1),
+    %% "\"\\b\\t\\n\"\n \"\\v\\f\\r\"\n \"\\e\250\"" =
+    "\"\\b\\t\\n\\v\\f\\r\\e¨\"" =
+	p([8,9,10,11,12,13,27,168], 1, 10, -1),
+    "\"\\b\\t\\n\\v\\f\\r\\e\250\"" =
+	p([8,9,10,11,12,13,27,168], 1, 40, 100),
+    %% "\"\\e\\t\\nab\"\n \"cd\"" =
+    "\"\\e\\t\\nabcd\"" =
+	p("\e\t\nabcd", 1, 12, -1),
 
     %% DEL (127) is special...
-    ?line "[127]" = p("\d", 1, 10, -1),
-    ?line "[127]" = p([127], 1, 10, 100),
+    "[127]" = p("\d", 1, 10, -1),
+    "[127]" = p([127], 1, 10, 100),
 
-    ?line "<<\"\\b\\t\\n\\v\\f\\r\\e\250\">>" = 
-              p(<<8,9,10,11,12,13,27,168>>, 1, 40, -1),
-    ?line "<<\"\\b\\t\\n\\v\\f\\r\\e\250\">>" = 
-              p(<<8,9,10,11,12,13,27,168>>, 1, 10, -1),
-    ?line "<<127>>" = p(<<127>>, 1, 10, 100),
+    "<<\"\\b\\t\\n\\v\\f\\r\\e\250\">>" =
+	p(<<8,9,10,11,12,13,27,168>>, 1, 40, -1),
+    "<<\"\\b\\t\\n\\v\\f\\r\\e\250\">>" =
+	p(<<8,9,10,11,12,13,27,168>>, 1, 10, -1),
+    "<<127>>" = p(<<127>>, 1, 10, 100),
 
     %% "Partial" string binaries:
-    ?line "<<\"he\"...>>" = p(list_to_binary("he"++[3]), 1, 80, 2),
-    ?line "<<\"he\"...>>" = p(list_to_binary("he"++[3]), 1, 80, 3),
-    ?line "<<104,101,3>>" = p(list_to_binary("he"++[3]), 1, 80, 4),
-    ?line "<<...>>" = p(list_to_binary([3] ++ "he"), 1, 80, 1),
-    ?line "<<3,...>>" = p(list_to_binary([3] ++ "he"), 1, 80, 2),
-    ?line "<<3,104,...>>" = p(list_to_binary([3] ++ "he"), 1, 80, 3),
-
-    ?line "<<\"12345678901234567890\"...>>" = 
-                 p(list_to_binary("12345678901234567890"++[3]), 1, 80, 8),
-    ?line "<<\"12345678901234567890\"...>>" = 
-                 p(list_to_binary("12345678901234567890"++[3]), 1, 80, 21),
-    ?line "<<49," ++ _ = 
-                 p(list_to_binary("12345678901234567890"++[3]), 1, 80, 22),
-
-    ?line "{sdfsdfj,\n    23" ++ _ = 
-           p({sdfsdfj,23423423342.23432423}, 1, 17, -1),
-
-    ?line bt(<<"kljkljlksdjjlf kljalkjlsdajafasjdfj [kjljklasdf,kjlljsfd,sdfsdkjfsd,kjjsdf,jl,
+    "<<\"he\"...>>" = p(list_to_binary("he"++[3]), 1, 80, 2),
+    "<<\"he\"...>>" = p(list_to_binary("he"++[3]), 1, 80, 3),
+    "<<104,101,3>>" = p(list_to_binary("he"++[3]), 1, 80, 4),
+    "<<...>>" = p(list_to_binary([3] ++ "he"), 1, 80, 1),
+    "<<3,...>>" = p(list_to_binary([3] ++ "he"), 1, 80, 2),
+    "<<3,104,...>>" = p(list_to_binary([3] ++ "he"), 1, 80, 3),
+
+    "<<\"12345678901234567890\"...>>" =
+	p(list_to_binary("12345678901234567890"++[3]), 1, 80, 8),
+    "<<\"12345678901234567890\"...>>" =
+	p(list_to_binary("12345678901234567890"++[3]), 1, 80, 21),
+    "<<49," ++ _ =
+	p(list_to_binary("12345678901234567890"++[3]), 1, 80, 22),
+
+    "{sdfsdfj,\n    23" ++ _ =
+	p({sdfsdfj,23423423342.23432423}, 1, 17, -1),
+
+    bt(<<"kljkljlksdjjlf kljalkjlsdajafasjdfj [kjljklasdf,kjlljsfd,sdfsdkjfsd,kjjsdf,jl,
                                      lkjjlajsfd|jsdf]">>,
              fmt("~w ~w ~p", 
                  [kljkljlksdjjlf,
@@ -949,45 +678,36 @@ otp_6354(Config) when is_list(Config) ->
                    jsdf]])),
 
     %% Binaries are split as well:
-    ?line bt(<<"<<80,100,0,55,55,55,55,55,55,55,55,55,\n  "
+    bt(<<"<<80,100,0,55,55,55,55,55,55,55,55,55,\n  "
                "55,55,55,55,55,55,55,...>>">>, 
              p(<<80,100,0,55,55,55,55,55,55,55,55,55,55,55,55,55,55,55,
                  55,55,55,55,55,55,55,55,55,55,55,55>>,1,40,20)),
-    ?line bt(<<"<<80,100,0,55,55,55,55,55,55,55,55,55,\n  "
+    bt(<<"<<80,100,0,55,55,55,55,55,55,55,55,55,\n  "
                "55,55,55,55,55,55,55,55,55,55,55,55,\n  55,55,55,55,55,55>>">>,
              p(<<80,100,0,55,55,55,55,55,55,55,55,55,55,55,55,55,55,55,
                  55,55,55,55,55,55,55,55,55,55,55,55>>,1,40,-1)),
-    ?line "<<0,0,0,\n  ...>>" = p(<<0,0,0,0,0>>, 1, 10, 4),
+    "<<0,0,0,\n  ...>>" = p(<<0,0,0,0,0>>, 1, 10, 4),
 
     %% ~W now uses ",..." when printing tuples
-    ?line "[a,b|...]" = fmt("~W", [[a,b,c,d,e], 3]),
-    ?line "{a,b,...}" = fmt("~W", [{a,b,c,d,e}, 3]),
+    "[a,b|...]" = fmt("~W", [[a,b,c,d,e], 3]),
+    "{a,b,...}" = fmt("~W", [{a,b,c,d,e}, 3]),
     ok.
 
-otp_6495(doc) ->
-    ["OTP-6495. io_lib_pretty bugfix."];
-otp_6495(suite) ->
-    [];
+%% OTP-6495. io_lib_pretty bugfix.
 otp_6495(Config) when is_list(Config) ->
-    ?line bt(<<"[120,120,120,120,120,120,120,120,120,120,120,120,120,120,"
+    bt(<<"[120,120,120,120,120,120,120,120,120,120,120,120,120,120,"
                "120,120,120,120,120]<<1>>">>,
              fmt("~w~p", ["xxxxxxxxxxxxxxxxxxx", <<1>>])),
     ok.
 
-otp_6517(doc) ->
-    ["OTP-6517. The Format argument of fwrite can be a binary."];
-otp_6517(suite) ->
-    [];
+%% OTP-6517. The Format argument of fwrite can be a binary.
 otp_6517(Config) when is_list(Config) ->
-    ?line "string" = fmt(<<"~s">>, [<<"string">>]),
+    "string" = fmt(<<"~s">>, [<<"string">>]),
     ok.
 
-otp_6502(doc) ->
-    ["OTP-6502. Bits."];
-otp_6502(suite) ->
-    [];
+%% OTP-6502. Bits.
 otp_6502(Config) when is_list(Config) ->
-    ?line bt(<<
+    bt(<<
      "[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25]"
      "<<0,0,8,\n"
      "                                                                     "
@@ -995,10 +715,7 @@ otp_6502(Config) when is_list(Config) ->
              fmt("~w~p", [lists:seq(0, 25), <<17:25>>])),
     ok.
 
-otp_7421(doc) ->
-    ["OTP-7421. Soft limit of 60 chars removed when pretty printing."];
-otp_7421(suite) ->
-    [];
+%% OTP-7421. Soft limit of 60 chars removed when pretty printing.
 otp_7421(Config) when is_list(Config) ->
     bt(<<"{aa,bb,\n"
          "    c,dd,\n"
@@ -1066,31 +783,28 @@ rfd(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, 0) ->
 rfd(_, _) ->
     no.
 
-manpage(doc) ->
-    ["The examples in io(3) and io_lib(3)."];
-manpage(suite) ->
-    [];
+%% The examples in io(3) and io_lib(3).
 manpage(Config) when is_list(Config) ->
     %% The examples that write or print only, not the ones that read...
 
-    ?line bt(<<"Hello world!\n">>,
+    bt(<<"Hello world!\n">>,
              fmt("Hello world!~n", [])),
-    ?line bt(<<"|     aaaaa|bbbbb     |ccccc|\n">>, % bugfix
+    bt(<<"|     aaaaa|bbbbb     |ccccc|\n">>, % bugfix
              fmt("|~10.5c|~-10.5c|~5c|~n", [$a, $b, $c])),
-    ?line bt(<<"|**********|\n">>,
+    bt(<<"|**********|\n">>,
              fmt("|~10w|~n", [{hey, hey, hey}])),
-    ?line bt(<<"|{hey,hey,h|\n">>,
+    bt(<<"|{hey,hey,h|\n">>,
              fmt("|~10s|~n", [io_lib:write({hey, hey, hey})])),
 
     T = [{attributes,[[{id,age,1.50000},{mode,explicit},
         {typename,"INTEGER"}], [{id,cho},{mode,explicit},{typename,'Cho'}]]},
         {typename,'Person'},{tag,{'PRIVATE',3}},{mode,implicit}],
-    ?line bt(<<"[{attributes,[[{id,age,1.5},{mode,explicit},{typename,"
+    bt(<<"[{attributes,[[{id,age,1.5},{mode,explicit},{typename,"
                "[73,78,84,69,71,69,82]}],[{id,cho},{mode,explicit},"
                "{typename,'Cho'}]]},{typename,'Person'},{tag,{'PRIVATE',3}},"
                "{mode,implicit}]\n">>,
              fmt("~w~n", [T])),
-    ?line bt(<<"[{attributes,[[{id,age,1.5},\n"
+    bt(<<"[{attributes,[[{id,age,1.5},\n"
                "               {mode,explicit},\n"
                "               {typename,\"INTEGER\"}],\n"
                "              [{id,cho},{mode,explicit},{typename,'Cho'}]]},\n"
@@ -1098,7 +812,7 @@ manpage(Config) when is_list(Config) ->
                " {tag,{'PRIVATE',3}},\n"
                " {mode,implicit}]\n">>,
              fmt("~62p~n", [T])),
-    ?line bt(<<"Here T = [{attributes,[[{id,age,1.5},\n"
+    bt(<<"Here T = [{attributes,[[{id,age,1.5},\n"
                "                        {mode,explicit},\n"
                "                        {typename,\"INTEGER\"}],\n"
                "                       [{id,cho},\n"
@@ -1108,67 +822,64 @@ manpage(Config) when is_list(Config) ->
                "          {tag,{'PRIVATE',3}},\n"
                "          {mode,implicit}]\n">>,
               fmt("Here T = ~62p~n", [T])),
-    ?line bt(<<"[{attributes,[[{id,age,1.5},{mode,explicit},"
+    bt(<<"[{attributes,[[{id,age,1.5},{mode,explicit},"
                "{typename,...}],[{id,cho},{mode,...},{...}]]},"
                "{typename,'Person'},{tag,{'PRIVATE',3}},{mode,implicit}]\n">>,
              fmt("~W~n", [T,9])),
-    ?line bt(<<"[{attributes,[[{id,age,1.5},{mode,explicit},{typename,...}],"
+    bt(<<"[{attributes,[[{id,age,1.5},{mode,explicit},{typename,...}],"
                "\n              "
                "[{id,cho},{mode,...},{...}]]},\n {typename,'Person'},\n "
                "{tag,{'PRIVATE',3}},\n {mode,implicit}]\n">>,
              fmt("~62P~n", [T,9])),
 
-    ?line "1F\n" = fmt("~.16B~n", [31]),
-    ?line "-10011\n" = fmt("~.2B~n", [-19]),
-    ?line "5Z\n" = fmt("~.36B~n", [5*36+35]),
-    ?line "10#31\n" = fmt("~X~n", [31,"10#"]),
-    ?line "-0x1F\n" = fmt("~.16X~n", [-31,"0x"]),
-    ?line "10#31\n" = fmt("~.10#~n", [31]),
-    ?line "-16#1F\n" = fmt("~.16#~n", [-31]),
-    ?line "abc def 'abc def'  {foo,1} A \n" = 
+    "1F\n" = fmt("~.16B~n", [31]),
+    "-10011\n" = fmt("~.2B~n", [-19]),
+    "5Z\n" = fmt("~.36B~n", [5*36+35]),
+    "10#31\n" = fmt("~X~n", [31,"10#"]),
+    "-0x1F\n" = fmt("~.16X~n", [-31,"0x"]),
+    "10#31\n" = fmt("~.10#~n", [31]),
+    "-16#1F\n" = fmt("~.16#~n", [-31]),
+    "abc def 'abc def'  {foo,1} A \n" =
            fmt("~s ~w ~i ~w ~c ~n",
                ['abc def', 'abc def', {foo, 1},{foo, 1}, 65]),
-    % fmt("~s", [65]),
+    %% fmt("~s", [65]),
 
     %% io_lib(3)
-    ?line bt(<<"{1,[2],[3],[...],...}">>,
+    bt(<<"{1,[2],[3],[...],...}">>,
              lists:flatten(io_lib:write({1,[2],[3],[4,5],6,7,8,9}, 5))),
     ok.
 
-otp_6708(doc) ->
-    ["OTP-6708. Fewer newlines when pretty-printing."];
-otp_6708(suite) ->
-    [];
+%% OTP-6708. Fewer newlines when pretty-printing.
 otp_6708(Config) when is_list(Config) ->
-    ?line bt(<<"[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,\n"
+    bt(<<"[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,\n"
                " 23,24,25,26,27,28,29|...]">>,
              p(lists:seq(1,1000), 30)),
-    ?line bt(<<"{lkjasklfjsdak,mlkasjdflksj,klasdjfklasd,jklasdfjkl,\n"
+    bt(<<"{lkjasklfjsdak,mlkasjdflksj,klasdjfklasd,jklasdfjkl,\n"
                "               jklsdjfklsd,masdfjkkl}">>,
              p({lkjasklfjsdak,mlkasjdflksj,klasdjfklasd,jklasdfjkl,
                 jklsdjfklsd, masdfjkkl}, -1)),
-    ?line bt(<<"#b{f = {lkjljalksdf,jklaskfjd,kljasdlf,kljasdf,kljsdlkf,\n"
+    bt(<<"#b{f = {lkjljalksdf,jklaskfjd,kljasdlf,kljasdf,kljsdlkf,\n"
                "                    kjdd}}">>,
              p({b, {lkjljalksdf,jklaskfjd,kljasdlf,kljasdf,kljsdlkf,kjdd}}, 
                -1)),
-    ?line bt(<<"#b{f = {lkjljalksdf,jklaskfjd,kljasdlf,kljasdf,kljsdlkf,\n"
+    bt(<<"#b{f = {lkjljalksdf,jklaskfjd,kljasdlf,kljasdf,kljsdlkf,\n"
                "                    kdd}}">>,
              p({b, {lkjljalksdf,jklaskfjd,kljasdlf,kljasdf,kljsdlkf,kdd}}, 
                -1)),
-    ?line bt(<<"#e{f = undefined,g = undefined,\n"
+    bt(<<"#e{f = undefined,g = undefined,\n"
                "   h = #e{f = 11,g = 22,h = 333}}">>,
              p({e,undefined,undefined,{e,11,22,333}}, -1)),
-    ?line bt(<<"[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21|\n"
+    bt(<<"[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21|\n"
                " apa11]">>,
              p(lists:seq(1,21) ++ apa11, -1)),
-    ?line bt(<<"[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,\n"
+    bt(<<"[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,\n"
                " 23,\n"
                " {{abadalkjlasdjflksdajfksdklfsdjlkfdlskjflsdj"
                         "flsdjfldsdsdddd}}]">>,
           p(lists:seq(1,23) ++ 
             [{{abadalkjlasdjflksdajfksdklfsdjlkfdlskjflsdjflsdjfldsdsdddd}}],
             -1)),
-    ?line bt(<<"{lkjasdf,\n"
+    bt(<<"{lkjasdf,\n"
                "    {kjkjsd,\n"
                "        {kjsd,\n"
                "            {kljsdf,\n"
@@ -1180,7 +891,7 @@ otp_6708(Config) when is_list(Config) ->
                                    {dkjsdf,{kjlds,
                                             {kljsd,{kljs,{kljlkjsd}}}}}}}}}},
                -1)),
-    ?line bt(<<"{lkjasdf,\n"
+    bt(<<"{lkjasdf,\n"
                "    {kjkjsd,\n"
                "        {kjsd,{kljsdf,{kjlsd,{dkjsdf,{kjlds,"
                                 "{kljsd,{kljs}}}}}}}}}">>,
@@ -1188,24 +899,24 @@ otp_6708(Config) when is_list(Config) ->
                                  {kljsdf,{kjlsd,{dkjsdf,
                                                  {kjlds,{kljsd,{kljs}}}}}}}}},
                -1)),
-    ?line bt(<<"<<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,\n"
+    bt(<<"<<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,\n"
                "  22,23>>">>,
              p(list_to_binary(lists:seq(1,23)), -1)),
-    ?line bt(<<"<<100,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,\n"
+    bt(<<"<<100,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,\n"
                "  27>>">>,
              p(list_to_binary([100|lists:seq(10,27)]), -1)),
-    ?line bt(<<"<<100,101,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,\n"
+    bt(<<"<<100,101,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,\n"
                "  26>>">>,
              p(list_to_binary([100,101|lists:seq(10,26)]), -1)),
-    ?line bt(<<"{{<<100,101,102,10,11,12,13,14,15,16,17,18,19,20,21,22,\n"
+    bt(<<"{{<<100,101,102,10,11,12,13,14,15,16,17,18,19,20,21,22,\n"
                "    23>>}}">>,
              p({{list_to_binary([100,101,102|lists:seq(10,23)])}}, -1)),
-    ?line bt(<<"[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22|\n"
+    bt(<<"[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22|\n"
                " ap]">>,
              p(lists:seq(1,22) ++ ap, -1)),
-    ?line bt(<<"[1,2,3,4,5,6,7,8,9,10,{},[],\n <<>>,11,12,13,14,15]">>,
+    bt(<<"[1,2,3,4,5,6,7,8,9,10,{},[],\n <<>>,11,12,13,14,15]">>,
              p(lists:seq(1,10) ++ [{},[],<<>>] ++ lists:seq(11,15),1,30,-1)),
-    ?line bt(<<"[ddd,ddd,\n"
+    bt(<<"[ddd,ddd,\n"
                " {1},\n"
                " [1,2],\n"
                " ddd,kdfd,\n"
@@ -1215,7 +926,7 @@ otp_6708(Config) when is_list(Config) ->
              p([ddd,ddd,{1},[1,2],ddd,kdfd,[[1,2],a,b,c],<<"foo">>,<<"bar">>,
                 1,{2}],1,50,-1)),
 
-    ?line bt(<<"{dskljsadfkjsdlkjflksdjflksdjfklsdjklfjsdklfjlsdjfkl,jksd,\n"
+    bt(<<"{dskljsadfkjsdlkjflksdjflksdjfklsdjklfjsdklfjlsdjfkl,jksd,\n"
                "                                                     "
                    "lkjsdf,kljsdf,kljsf,kljsdf,kljsdf,jkldf,jklsdf,kljsdf,\n"
                "                                                     "
@@ -1226,7 +937,7 @@ otp_6708(Config) when is_list(Config) ->
                 lkjsdf,kljsdf,kljsf,kljsdf,kljsdf,jkldf,jklsdf,kljsdf,
                 kljsdf,jklsdf,lkjfd,lkjsdf,kljsdf,kljsdf,lkjsdf,kljsdf,
                 lkjsdfsd,kljsdf,kjsfj}, 1, 110, -1)),
-    ?line bt(<<"{dskljsadfkjsdlkjflksdjflksdjfklsdjklfjsdklfjlsdjfkl,"
+    bt(<<"{dskljsadfkjsdlkjflksdjflksdjfklsdjklfjsdklfjlsdjfkl,"
                   "#d{aaaaaaaaaaaaaaaaaaaa = 1,\n"
                "                                                        "
                   "bbbbbbbbbbbbbbbbbbbb = 2,cccccccccccccccccccc = 3,\n"
@@ -1239,15 +950,12 @@ otp_6708(Config) when is_list(Config) ->
 -define(ONE(N), ((1 bsl N) - 1)).
 -define(ALL_ONES, ((1 bsl 52) - 1)).
 
-otp_7084(doc) ->
-    ["OTP-7084. Printing floating point numbers nicely."];
-otp_7084(suite) ->
-    [];
+
+otp_7084() ->
+    [{timetrap,{minutes,3}}].
+
+%% OTP-7084. Printing floating point numbers nicely.
 otp_7084(Config) when is_list(Config) ->
-    OldDog=?config(watchdog, Config),
-    test_server:timetrap_cancel(OldDog),
-    Timeout = 180,
-    ?line Dog = test_server:timetrap({seconds,Timeout}),
     L = [{g_warm_up, fun g_warm_up/0},
          {g_big_pos_float, fun g_big_pos_float/0},
          {g_small_neg_float, fun g_small_neg_float/0},
@@ -1263,7 +971,6 @@ otp_7084(Config) when is_list(Config) ->
         catch throw:Reason -> 
             Reason
         end,
-    ?line test_server:timetrap_cancel(Dog),
     R.
 
 g_warm_up() ->
@@ -1295,7 +1002,7 @@ g_close_to_zero() ->
 
 g_denormalized() ->
     %% Denormalized floats (mantissa carry):
-%    D = 5,
+%%    D = 5,
     %% Faster:
     D = 1,
     [ft({{S,0,?ONE(N)},D,D}) || S <- [0,1], N <- lists:seq(0, 52)],
@@ -1303,7 +1010,7 @@ g_denormalized() ->
 
 g_normalized() -> 
     %% Normalized floats (exponent carry):
-%    D = 5,
+%%    D = 5,
     %% Faster:
     D = 1,
     [ft({{S,E,?ONE(52)},D,D}) || S <- [0,1], E <- lists:seq(0, 2045)],
@@ -1322,8 +1029,7 @@ g_choice() ->
 g_misc() -> 
     L_0_308 = lists:seq(0, 308),
     L_0_307 = lists:seq(0, 307),
-%    L_1_9 = lists:seq(1, 9),
-%    L_0_9 = lists:seq(0, 9),
+
     %% Faster:
     L_1_9 = [1,5,9],
     L_0_9 = [0,1,5,9],
@@ -1798,10 +1504,10 @@ pack(Sign, Exp, Frac) ->
 
 %% Whitebox test of io_lib:collect_line/3.
 io_lib_collect_line_3_wb(Config) when is_list(Config) ->
-    ?line do_collect_line(binary, "\n"),
-    ?line do_collect_line(binary, "\r\n"),
-    ?line do_collect_line(list, "\n"),
-    ?line do_collect_line(list, "\r\n"),
+    do_collect_line(binary, "\n"),
+    do_collect_line(binary, "\r\n"),
+    do_collect_line(list, "\n"),
+    do_collect_line(list, "\r\n"),
     ok.
 
 do_collect_line(Mode, Eol) ->
@@ -1860,44 +1566,44 @@ do_collect_line_adjust_rest(Rest, [List|T]) when is_list(List) ->
 
 
 cr_whitespace_in_string(Config) when is_list(Config) ->
-    ?line {ok,["abc"],[]} = io_lib:fread("~s", "\rabc").
+    {ok,["abc"],[]} = io_lib:fread("~s", "\rabc").
 
 
 
 io_fread_newlines(Config) when is_list(Config) ->
-    ?line PrivDir = ?privdir(Config),
-    ?line Fname = filename:join(PrivDir, "io_fread_newlines.txt"),
-    ?line F0 = [[0,1,2,3,4,5,6,7,8,9]],
-    ?line F1 = [[0,1,2,3,4,5,6,7,8],[9]],
-    ?line F2 = [[0,1,2,3,4,5,6,7],[8,9]],
-    ?line F3 = [[0,1,2,3,4,5,6],[7,8,9]],
-    ?line F4 = [[0,1,2,3,4,5],[6,7,8,9]],
-    ?line F5 = [[0,1,2,3,4],[5,6,7,8,9]],
-    ?line F6 = [[0,1,2,3],[4,5,6,7],[8,9]],
-    ?line F7 = [[0,1,2],[3,4,5],[6,7,8],[9]],
-    ?line F8 = [[0,1],[2,3],[4,5],[6,7],[8,9]],
-    ?line F9 = [[0],[1],[2],[3],[4],[5],[6],[7],[8],[9]],
-    ?line Newlines = ["\n", "\r\n", "\r"],
+    PrivDir = ?privdir(Config),
+    Fname = filename:join(PrivDir, "io_fread_newlines.txt"),
+    F0 = [[0,1,2,3,4,5,6,7,8,9]],
+    F1 = [[0,1,2,3,4,5,6,7,8],[9]],
+    F2 = [[0,1,2,3,4,5,6,7],[8,9]],
+    F3 = [[0,1,2,3,4,5,6],[7,8,9]],
+    F4 = [[0,1,2,3,4,5],[6,7,8,9]],
+    F5 = [[0,1,2,3,4],[5,6,7,8,9]],
+    F6 = [[0,1,2,3],[4,5,6,7],[8,9]],
+    F7 = [[0,1,2],[3,4,5],[6,7,8],[9]],
+    F8 = [[0,1],[2,3],[4,5],[6,7],[8,9]],
+    F9 = [[0],[1],[2],[3],[4],[5],[6],[7],[8],[9]],
+    Newlines = ["\n", "\r\n", "\r"],
     try
-	?line io_fread_newlines_1([F0,F1,F2,F3,F4,F5,F6,F7,F8,F9],
+	io_fread_newlines_1([F0,F1,F2,F3,F4,F5,F6,F7,F8,F9],
 				  Fname, Newlines)
     after
 	file:delete(Fname)
     end.
 
 io_fread_newlines_1(Fs, Fname, [Newline|Newlines]) ->
-    ?line ok = io_fread_newlines_2(Fs, Fname, Newline),
-    ?line io_fread_newlines_1(Fs, Fname, Newlines);
+    ok = io_fread_newlines_2(Fs, Fname, Newline),
+    io_fread_newlines_1(Fs, Fname, Newlines);
 io_fread_newlines_1(_, _, []) -> ok.
 
 io_fread_newlines_2([F|Fs], Fname, Newline) ->
-    ?line N1 = write_newlines_file(Fname, F, Newline),
-    ?line {F2,N2} = read_newlines_file(Fname),
-    ?line io:format("~w ~p ~w~n~n", [N1,F,N2]),
-    ?line F2 = lists:flatten(F),
+    N1 = write_newlines_file(Fname, F, Newline),
+    {F2,N2} = read_newlines_file(Fname),
+    io:format("~w ~p ~w~n~n", [N1,F,N2]),
+    F2 = lists:flatten(F),
     %% Intermediate newlines are not counted
-    ?line N2 = N1 - (length(F) - 1)*length(Newline),
-    ?line io_fread_newlines_2(Fs, Fname, Newline);
+    N2 = N1 - (length(F) - 1)*length(Newline),
+    io_fread_newlines_2(Fs, Fname, Newline);
 io_fread_newlines_2([], _, _) -> ok.
 
 
@@ -1939,111 +1645,108 @@ read_newlines(Fd, Acc, N0) ->
 
 
 
-otp_8989(doc) ->
-    "OTP-8989 io:format for ~F.Ps ignores P in some cases";
+%% OTP-8989 io:format for ~F.Ps ignores P in some cases.
 otp_8989(Suite) when is_list(Suite) ->
     Hello = "Hello",
-    ?line " Hello" = fmt("~6.6s", [Hello]),
-    ?line " Hello" = fmt("~*.6s", [6,Hello]),
-    ?line " Hello" = fmt("~6.*s", [6,Hello]),
-    ?line " Hello" = fmt("~*.*s", [6,6,Hello]),
+    " Hello" = fmt("~6.6s", [Hello]),
+    " Hello" = fmt("~*.6s", [6,Hello]),
+    " Hello" = fmt("~6.*s", [6,Hello]),
+    " Hello" = fmt("~*.*s", [6,6,Hello]),
     %%
-    ?line " Hello" = fmt("~6.5s", [Hello]),
-    ?line " Hello" = fmt("~*.5s", [6,Hello]),
-    ?line " Hello" = fmt("~6.*s", [5,Hello]),
-    ?line " Hello" = fmt("~*.*s", [6,5,Hello]),
+    " Hello" = fmt("~6.5s", [Hello]),
+    " Hello" = fmt("~*.5s", [6,Hello]),
+    " Hello" = fmt("~6.*s", [5,Hello]),
+    " Hello" = fmt("~*.*s", [6,5,Hello]),
     %%
-    ?line "  Hell" = fmt("~6.4s", [Hello]),
-    ?line "  Hell" = fmt("~*.4s", [6,Hello]),
-    ?line "  Hell" = fmt("~6.*s", [4,Hello]),
-    ?line "  Hell" = fmt("~*.*s", [6,4,Hello]),
+    "  Hell" = fmt("~6.4s", [Hello]),
+    "  Hell" = fmt("~*.4s", [6,Hello]),
+    "  Hell" = fmt("~6.*s", [4,Hello]),
+    "  Hell" = fmt("~*.*s", [6,4,Hello]),
     %%
-    ?line "Hello" = fmt("~5.5s", [Hello]),
-    ?line "Hello" = fmt("~*.5s", [5,Hello]),
-    ?line "Hello" = fmt("~5.*s", [5,Hello]),
-    ?line "Hello" = fmt("~*.*s", [5,5,Hello]),
+    "Hello" = fmt("~5.5s", [Hello]),
+    "Hello" = fmt("~*.5s", [5,Hello]),
+    "Hello" = fmt("~5.*s", [5,Hello]),
+    "Hello" = fmt("~*.*s", [5,5,Hello]),
     %%
-    ?line " Hell" = fmt("~5.4s", [Hello]),
-    ?line " Hell" = fmt("~*.4s", [5,Hello]),
-    ?line " Hell" = fmt("~5.*s", [4,Hello]),
-    ?line " Hell" = fmt("~*.*s", [5,4,Hello]),
+    " Hell" = fmt("~5.4s", [Hello]),
+    " Hell" = fmt("~*.4s", [5,Hello]),
+    " Hell" = fmt("~5.*s", [4,Hello]),
+    " Hell" = fmt("~*.*s", [5,4,Hello]),
     %%
-    ?line "Hell" = fmt("~4.4s", [Hello]),
-    ?line "Hell" = fmt("~*.4s", [4,Hello]),
-    ?line "Hell" = fmt("~4.*s", [4,Hello]),
-    ?line "Hell" = fmt("~*.*s", [4,4,Hello]),
+    "Hell" = fmt("~4.4s", [Hello]),
+    "Hell" = fmt("~*.4s", [4,Hello]),
+    "Hell" = fmt("~4.*s", [4,Hello]),
+    "Hell" = fmt("~*.*s", [4,4,Hello]),
     %%
-    ?line " Hel" = fmt("~4.3s", [Hello]),
-    ?line " Hel" = fmt("~*.3s", [4,Hello]),
-    ?line " Hel" = fmt("~4.*s", [3,Hello]),
-    ?line " Hel" = fmt("~*.*s", [4,3,Hello]),
+    " Hel" = fmt("~4.3s", [Hello]),
+    " Hel" = fmt("~*.3s", [4,Hello]),
+    " Hel" = fmt("~4.*s", [3,Hello]),
+    " Hel" = fmt("~*.*s", [4,3,Hello]),
     %%
     %%
-    ?line "Hello " = fmt("~-6.6s", [Hello]),
-    ?line "Hello " = fmt("~*.6s", [-6,Hello]),
-    ?line "Hello " = fmt("~-6.*s", [6,Hello]),
-    ?line "Hello " = fmt("~*.*s", [-6,6,Hello]),
+    "Hello " = fmt("~-6.6s", [Hello]),
+    "Hello " = fmt("~*.6s", [-6,Hello]),
+    "Hello " = fmt("~-6.*s", [6,Hello]),
+    "Hello " = fmt("~*.*s", [-6,6,Hello]),
     %%
-    ?line "Hello " = fmt("~-6.5s", [Hello]),
-    ?line "Hello " = fmt("~*.5s", [-6,Hello]),
-    ?line "Hello " = fmt("~-6.*s", [5,Hello]),
-    ?line "Hello " = fmt("~*.*s", [-6,5,Hello]),
+    "Hello " = fmt("~-6.5s", [Hello]),
+    "Hello " = fmt("~*.5s", [-6,Hello]),
+    "Hello " = fmt("~-6.*s", [5,Hello]),
+    "Hello " = fmt("~*.*s", [-6,5,Hello]),
     %%
-    ?line "Hell  " = fmt("~-6.4s", [Hello]),
-    ?line "Hell  " = fmt("~*.4s", [-6,Hello]),
-    ?line "Hell  " = fmt("~-6.*s", [4,Hello]),
-    ?line "Hell  " = fmt("~*.*s", [-6,4,Hello]),
+    "Hell  " = fmt("~-6.4s", [Hello]),
+    "Hell  " = fmt("~*.4s", [-6,Hello]),
+    "Hell  " = fmt("~-6.*s", [4,Hello]),
+    "Hell  " = fmt("~*.*s", [-6,4,Hello]),
     %%
-    ?line "Hello" = fmt("~-5.5s", [Hello]),
-    ?line "Hello" = fmt("~*.5s", [-5,Hello]),
-    ?line "Hello" = fmt("~-5.*s", [5,Hello]),
-    ?line "Hello" = fmt("~*.*s", [-5,5,Hello]),
+    "Hello" = fmt("~-5.5s", [Hello]),
+    "Hello" = fmt("~*.5s", [-5,Hello]),
+    "Hello" = fmt("~-5.*s", [5,Hello]),
+    "Hello" = fmt("~*.*s", [-5,5,Hello]),
     %%
-    ?line "Hell " = fmt("~-5.4s", [Hello]),
-    ?line "Hell " = fmt("~*.4s", [-5,Hello]),
-    ?line "Hell " = fmt("~-5.*s", [4,Hello]),
-    ?line "Hell " = fmt("~*.*s", [-5,4,Hello]),
+    "Hell " = fmt("~-5.4s", [Hello]),
+    "Hell " = fmt("~*.4s", [-5,Hello]),
+    "Hell " = fmt("~-5.*s", [4,Hello]),
+    "Hell " = fmt("~*.*s", [-5,4,Hello]),
     %%
-    ?line "Hell" = fmt("~-4.4s", [Hello]),
-    ?line "Hell" = fmt("~*.4s", [-4,Hello]),
-    ?line "Hell" = fmt("~-4.*s", [4,Hello]),
-    ?line "Hell" = fmt("~*.*s", [-4,4,Hello]),
+    "Hell" = fmt("~-4.4s", [Hello]),
+    "Hell" = fmt("~*.4s", [-4,Hello]),
+    "Hell" = fmt("~-4.*s", [4,Hello]),
+    "Hell" = fmt("~*.*s", [-4,4,Hello]),
     %%
-    ?line "Hel " = fmt("~-4.3s", [Hello]),
-    ?line "Hel " = fmt("~*.3s", [-4,Hello]),
-    ?line "Hel " = fmt("~-4.*s", [3,Hello]),
-    ?line "Hel " = fmt("~*.*s", [-4,3,Hello]),
+    "Hel " = fmt("~-4.3s", [Hello]),
+    "Hel " = fmt("~*.3s", [-4,Hello]),
+    "Hel " = fmt("~-4.*s", [3,Hello]),
+    "Hel " = fmt("~*.*s", [-4,3,Hello]),
     ok.
 
-io_lib_fread_literal(doc) ->
-    "OTP-9439 io_lib:fread bug for literate at end";
+%% OTP-9439 io_lib:fread bug for literate at end.
 io_lib_fread_literal(Suite) when is_list(Suite) ->
-    ?line {more,"~d",0,""} = io_lib:fread("~d", ""),
-    ?line {error,{fread,integer}} = io_lib:fread("~d", " "),
-    ?line {more,"~d",1,""} = io_lib:fread(" ~d", " "),
-    ?line {ok,[17],"X"} = io_lib:fread(" ~d", " 17X"),
+    {more,"~d",0,""} = io_lib:fread("~d", ""),
+    {error,{fread,integer}} = io_lib:fread("~d", " "),
+    {more,"~d",1,""} = io_lib:fread(" ~d", " "),
+    {ok,[17],"X"} = io_lib:fread(" ~d", " 17X"),
     %%
-    ?line {more,"d",0,""} = io_lib:fread("d", ""),
-    ?line {error,{fread,input}} = io_lib:fread("d", " "),
-    ?line {more,"d",1,""} = io_lib:fread(" d", " "),
-    ?line {ok,[],"X"} = io_lib:fread(" d", " dX"),
+    {more,"d",0,""} = io_lib:fread("d", ""),
+    {error,{fread,input}} = io_lib:fread("d", " "),
+    {more,"d",1,""} = io_lib:fread(" d", " "),
+    {ok,[],"X"} = io_lib:fread(" d", " dX"),
     %%
-    ?line {done,eof,_} = io_lib:fread([], eof, "~d"),
-    ?line {done,eof,_} = io_lib:fread([], eof, " ~d"),
-    ?line {more,C1} = io_lib:fread([], " \n", " ~d"),
-    ?line {done,{error,{fread,input}},_} = io_lib:fread(C1, eof, " ~d"),
-    ?line {done,{ok,[18]},""} = io_lib:fread(C1, "18\n", " ~d"),
+    {done,eof,_} = io_lib:fread([], eof, "~d"),
+    {done,eof,_} = io_lib:fread([], eof, " ~d"),
+    {more,C1} = io_lib:fread([], " \n", " ~d"),
+    {done,{error,{fread,input}},_} = io_lib:fread(C1, eof, " ~d"),
+    {done,{ok,[18]},""} = io_lib:fread(C1, "18\n", " ~d"),
     %%
-    ?line {done,eof,_} = io_lib:fread([], eof, "d"),
-    ?line {done,eof,_} = io_lib:fread([], eof, " d"),
-    ?line {more,C2} = io_lib:fread([], " \n", " d"),
-    ?line {done,{error,{fread,input}},_} = io_lib:fread(C2, eof, " d"),
-    ?line {done,{ok,[]},[]} = io_lib:fread(C2, "d\n", " d"),
+    {done,eof,_} = io_lib:fread([], eof, "d"),
+    {done,eof,_} = io_lib:fread([], eof, " d"),
+    {more,C2} = io_lib:fread([], " \n", " d"),
+    {done,{error,{fread,input}},_} = io_lib:fread(C2, eof, " d"),
+    {done,{ok,[]},[]} = io_lib:fread(C2, "d\n", " d"),
     ok.
 
 
-printable_range(doc) ->
-    "Check that the printable range set by the user actually works";
+%% Check that the printable range set by the user actually works.
 printable_range(Suite) when is_list(Suite) ->
     Pa = filename:dirname(code:which(?MODULE)),
     {ok, UNode} = test_server:start_node(printable_range_unicode, slave,
@@ -2125,27 +1828,37 @@ rpc_call_max(Node, M, F, Args) ->
 %% Make sure that a bad specification for a printable range is rejected.
 bad_printable_range(Config) when is_list(Config) ->
     Cmd = lists:concat([lib:progname()," +pcunnnnnicode -run erlang halt"]),
-    case os:cmd(Cmd) of
-	"bad range of printable characters" ++ _ ->
-	    ok;
-	String ->
-	    io:format("~s\n", [String]),
-	    ?t:fail()
+    P = open_port({spawn, Cmd}, [stderr_to_stdout, {line, 200}]),
+    ok = receive
+	     {P, {data, {eol , "bad range of printable characters" ++ _}}} ->
+		 ok;
+	     Other ->
+		 Other
+	 after 1000 ->
+		 timeout
+	 end,
+    catch port_close(P),
+    flush_from_port(P),
+    ok.
+
+flush_from_port(P) ->
+    receive {P, _} ->
+	    flush_from_port(P)
+    after 0 ->
+	    ok
     end.
 
-io_lib_print_binary_depth_one(doc) ->
-    "Test binaries printed with a depth of one behave correctly";
+%% Test binaries printed with a depth of one behave correctly.
 io_lib_print_binary_depth_one(Suite) when is_list(Suite) ->
-    ?line "<<>>" = fmt("~W", [<<>>, 1]),
-    ?line "<<>>" = fmt("~P", [<<>>, 1]),
-    ?line "<<...>>" = fmt("~W", [<<1>>, 1]),
-    ?line "<<...>>" = fmt("~P", [<<1>>, 1]),
-    ?line "<<...>>" = fmt("~W", [<<1:7>>, 1]),
-    ?line "<<...>>" = fmt("~P", [<<1:7>>, 1]),
+    "<<>>" = fmt("~W", [<<>>, 1]),
+    "<<>>" = fmt("~P", [<<>>, 1]),
+    "<<...>>" = fmt("~W", [<<1>>, 1]),
+    "<<...>>" = fmt("~P", [<<1>>, 1]),
+    "<<...>>" = fmt("~W", [<<1:7>>, 1]),
+    "<<...>>" = fmt("~P", [<<1:7>>, 1]),
     ok.
 
-otp_10302(doc) ->
-    "OTP-10302. Unicode";
+%% OTP-10302. Unicode.
 otp_10302(Suite) when is_list(Suite) ->
     Pa = filename:dirname(code:which(?MODULE)),
     {ok, UNode} = test_server:start_node(printable_range_unicode, slave,
@@ -2201,15 +1914,13 @@ pretty(Term, Opts) when is_list(Opts) ->
 is_latin1(S) ->
     S >= 0 andalso S =< 255.
 
-otp_10836(doc) ->
-    "OTP-10836. ~ts extended to latin1";
+%% OTP-10836. ~ts extended to latin1.
 otp_10836(Suite) when is_list(Suite) ->
     S = io_lib:format("~ts", [[<<"äpple"/utf8>>, <<"äpple">>]]),
     "äppleäpple" = lists:flatten(S),
     ok.
 
-otp_10755(doc) ->
-    "OTP-10755. The 'l' modifier";
+%% OTP-10755. The 'l' modifier
 otp_10755(Suite) when is_list(Suite) ->
     S = "string",
     "\"string\"" = fmt("~p", [S]),
@@ -2253,12 +1964,14 @@ io_lib_width_too_small(_Config) ->
 %% Test that the time for a huge message queue is not
 %% significantly slower than with an empty message queue.
 io_with_huge_message_queue(Config) when is_list(Config) ->
-    case test_server:is_native(gen) of
-	true ->
+    case {test_server:is_native(gen),test_server:is_cover()} of
+	{true,_} ->
 	    {skip,
 	     "gen is native - huge message queue optimization "
 	     "is not implemented"};
-	false ->
+	{_,true} ->
+	    {skip,"Running under cover"};
+	{false,false} ->
 	    do_io_with_huge_message_queue(Config)
     end.
 
@@ -2266,26 +1979,42 @@ do_io_with_huge_message_queue(Config) ->
     PrivDir = ?privdir(Config),
     File = filename:join(PrivDir, "slask"),
     {ok, F1} = file:open(File, [write]),
-
-    {Time,ok} = timer:tc(fun() -> writes(1000, F1) end),
+    Test = fun(Times) ->
+		   {Time,ok} = timer:tc(fun() -> writes(Times, F1) end),
+		   Time
+	   end,
+    {Times,EmptyTime} = calibrate(100, Test),
 
     [self() ! {msg,N} || N <- lists:seq(1, 500000)],
     erlang:garbage_collect(),
-    {NewTime,ok} = timer:tc(fun() -> writes(1000, F1) end),
+    FullTime = Test(Times),
     file:close(F1),
-    io:format("Time for empty message queue: ~p", [Time]),
-    io:format("Time for huge message queue: ~p", [NewTime]),
+    file:delete(File),
+    io:format("Number of writes: ~p", [Times]),
+    io:format("Time for empty message queue: ~p", [EmptyTime]),
+    io:format("Time for huge message queue: ~p", [FullTime]),
 
-    IsCover = test_server:is_cover(),
-    case (NewTime+1) / (Time+1) of
-	Q when Q < 10; IsCover ->
+    case (FullTime+1) / (EmptyTime+1) of
+	Q when Q < 10 ->
 	    ok;
 	Q ->
 	    io:format("Q = ~p", [Q]),
-	    ?t:fail()
+	    ct:fail(failed)
     end,
     ok.
 
+%% Make sure that the time is not too short. That could cause the
+%% test case to fail.
+calibrate(N, Test) when N =< 100000 ->
+    case Test(N) of
+	Time when Time < 50000 ->
+	    calibrate(10*N, Test);
+	Time ->
+	    {N,Time}
+    end;
+calibrate(N, _) ->
+    N.
+
 writes(0, _) -> ok;
 writes(N, F1) ->
     file:write(F1, "hello\n"),
@@ -2343,7 +2072,7 @@ re_fmt(Pattern, Format, Args) ->
 	nomatch ->
 	    io:format("Pattern: ~s", [Pattern]),
 	    io:format("Result:  ~s", [S]),
-	    ?t:fail();
+	    ct:fail(failed);
 	match ->
 	    ok
     end.
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
index 811c7ed7bb..ecd0d44db9 100644
--- a/lib/stdlib/test/io_proto_SUITE.erl
+++ b/lib/stdlib/test/io_proto_SUITE.erl
@@ -39,7 +39,7 @@
 
 -export([uprompt/1]).
 
-%-define(without_test_server, true).
+%%-define(without_test_server, true).
 
 -ifdef(without_test_server).
 -define(line, put(line, ?LINE), ).
@@ -47,8 +47,8 @@
 -define(t, test_server).
 -define(privdir(_), "./io_SUITE_priv").
 -else.
--include_lib("test_server/include/test_server.hrl").
--define(privdir(Conf), ?config(priv_dir, Conf)).
+-include_lib("common_test/include/ct.hrl").
+-define(privdir(Conf), proplists:get_value(priv_dir, Conf)).
 -endif.
 
 %%-define(debug, true).
@@ -57,30 +57,25 @@
 -define(format(S, A), io:format(S, A)).
 -define(dbg(Data),io:format(standard_error, "DBG: ~p\r\n",[Data])).
 -define(RM_RF(Dir),begin io:format(standard_error, "Not Removed: ~p\r\n",[Dir]), 
-	ok end).
+			 ok end).
 -else.
 -define(format(S, A), ok).
 -define(dbg(Data),noop).
 -define(RM_RF(Dir),rm_rf(Dir)).
 -endif.
 
-
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(20)).
-
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
     Term = os:getenv("TERM", "dumb"),
     os:putenv("TERM","vt100"),
-    [{watchdog, Dog}, {term, Term} | Config].
+    [{term, Term} | Config].
 end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    Term = ?config(term,Config),
+    Term = proplists:get_value(term,Config),
     os:putenv("TERM",Term),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,20}}].
 
 all() -> 
     [setopts_getopts, unicode_options, unicode_options_gen,
@@ -110,184 +105,175 @@ end_per_group(_GroupName, Config) ->
 	  q = [],
 	  nxt = eof,
 	  mode = list
-	  }).
+	 }).
 
 uprompt(_L) ->
     [1050,1072,1082,1074,1086,32,1077,32,85,110,105,99,111,100,101,32,63].
 
-unicode_prompt(suite) ->
-    [];
-unicode_prompt(doc) ->
-    ["Test that an Unicode prompt does not crash the shell"];
+%% Test that an Unicode prompt does not crash the shell.
 unicode_prompt(Config) when is_list(Config) ->
-    ?line PA = filename:dirname(code:which(?MODULE)),
+    PA = filename:dirname(code:which(?MODULE)),
     case proplists:get_value(default_shell,Config) of
 	old ->
 	    ok;
 	new ->
-	    ?line rtnode([{putline,""},
-			  {putline, "2."},
-			  {getline, "2"},
-			  {putline, "shell:prompt_func({io_proto_SUITE,uprompt})."},
-			  {getline, "default"},
-			  {putline, "io:get_line('')."},
-			  {putline, "hej"},
-			  {getline, "\"hej\\n\""},
-			  {putline, "io:setopts([{binary,true}])."},
-			  {getline, "ok"},
-			  {putline, "io:get_line('')."},
-			  {putline, "hej"},
-			  {getline, "<<\"hej\\n\">>"}
-			 ],[],[],"-pa \""++ PA++"\"")
+	    rtnode([{putline,""},
+		    {putline, "2."},
+		    {getline, "2"},
+		    {putline, "shell:prompt_func({io_proto_SUITE,uprompt})."},
+		    {getline, "default"},
+		    {putline, "io:get_line('')."},
+		    {putline, "hej"},
+		    {getline, "\"hej\\n\""},
+		    {putline, "io:setopts([{binary,true}])."},
+		    {getline, "ok"},
+		    {putline, "io:get_line('')."},
+		    {putline, "hej"},
+		    {getline, "<<\"hej\\n\">>"}
+		   ],[],[],"-pa \""++ PA++"\"")
     end,
     %% And one with oldshell
-     ?line rtnode([{putline,""},
-		   {putline, "2."},
-		   {getline_re, ".*2$"},
-		   {putline, "shell:prompt_func({io_proto_SUITE,uprompt})."},
-		   {getline_re, ".*default"},
-		   {putline, "io:get_line('')."},
-		   {putline, "hej"},
-		   {getline_re, ".*\"hej\\\\n\""},
-		   {putline, "io:setopts([{binary,true}])."},
-		   {getline_re, ".*ok"},
-		   {putline, "io:get_line('')."},
-		   {putline, "hej"},
-		   {getline_re, ".*<<\"hej\\\\n\">>"}
-		  ],[],[],"-oldshell -pa \""++PA++"\""),
+    rtnode([{putline,""},
+	    {putline, "2."},
+	    {getline_re, ".*2$"},
+	    {putline, "shell:prompt_func({io_proto_SUITE,uprompt})."},
+	    {getline_re, ".*default"},
+	    {putline, "io:get_line('')."},
+	    {putline, "hej"},
+	    {getline_re, ".*\"hej\\\\n\""},
+	    {putline, "io:setopts([{binary,true}])."},
+	    {getline_re, ".*ok"},
+	    {putline, "io:get_line('')."},
+	    {putline, "hej"},
+	    {getline_re, ".*<<\"hej\\\\n\">>"}
+	   ],[],[],"-oldshell -pa \""++PA++"\""),
     ok.
-    
 
-setopts_getopts(suite) ->
-    [];
-setopts_getopts(doc) ->
-    ["Check io:setopts and io:getopts functions"];
+
+%% Check io:setopts and io:getopts functions.
 setopts_getopts(Config) when is_list(Config) ->
-    ?line FileName = filename:join([?config(priv_dir,Config),
-				    "io_proto_SUITE_setopts_getopts.dat"]),
-    ?line {ok,WFile} = file:open(FileName,[write]),
-    ?line Server = start_io_server_proxy(),
-    ?line [{binary, false}] = io:getopts(Server),
-    ?line [getopts] = proxy_getall(Server),
-    ?line [{binary,false},{encoding,latin1}] = lists:sort(io:getopts(WFile)),
-    ?line proxy_setnext(Server,"Hej"),
-    ?line "Hej" = io:get_line(Server,''),
-    ?line proxy_setnext(Server,"Hej"++[532]),
-    ?line [$H,$e,$j,532] = io:get_line(Server,''),
-    ?line ok = io:setopts(Server,[{binary,true}]),
-    ?line proxy_setnext(Server,"Hej"),
-    ?line <<"Hej">> = io:get_line(Server,''),
-    ?line proxy_setnext(Server,"Hej"++[532]),
-    ?line <<72,101,106,200,148>> = io:get_line(Server,''),
-    ?line [$H,$e,$j,532] = lists:flatten(io_lib:format("~ts",[<<72,101,106,200,148>>])),
-    ?line file:write(WFile,<<"HejA">>),
-    ?line file:write(WFile,unicode:characters_to_binary("Hej"++[532],unicode,unicode)),
-    ?line file:write(WFile,unicode:characters_to_binary("Hej"++[532],unicode,{utf16,big})),
-    ?line file:write(WFile,unicode:characters_to_binary("Hej"++[532],unicode,{utf16,little})),
-    ?line file:write(WFile,unicode:characters_to_binary("Hej"++[532],unicode,{utf32,big})),
-    ?line file:write(WFile,unicode:characters_to_binary("Hej"++[532],unicode,{utf32,little})),
-    ?line file:close(WFile),
-    ?line {ok,RFile} = file:open(FileName,[read]),
-    ?line [{binary,false},{encoding,latin1}] = lists:sort(io:getopts(RFile)),
-    ?line [$H,$e,$j,$A] = io:get_chars(RFile,'',4),
-    ?line io:setopts(RFile,[{encoding,unicode}]),
-    ?line [$H,$e,$j,532] = io:get_chars(RFile,'',4),
-    ?line [{binary,false},{encoding,unicode}] = lists:sort(io:getopts(RFile)),
-    ?line io:setopts(RFile,[{encoding,{utf16,big}}]),
-    ?line [$H,$e,$j,532] = io:get_chars(RFile,'',4),
-    ?line [{binary,false},{encoding,{utf16,big}}] = 
+    FileName = filename:join([proplists:get_value(priv_dir,Config),
+			      "io_proto_SUITE_setopts_getopts.dat"]),
+    {ok,WFile} = file:open(FileName,[write]),
+    Server = start_io_server_proxy(),
+    [{binary, false}] = io:getopts(Server),
+    [getopts] = proxy_getall(Server),
+    [{binary,false},{encoding,latin1}] = lists:sort(io:getopts(WFile)),
+    proxy_setnext(Server,"Hej"),
+    "Hej" = io:get_line(Server,''),
+    proxy_setnext(Server,"Hej"++[532]),
+    [$H,$e,$j,532] = io:get_line(Server,''),
+    ok = io:setopts(Server,[{binary,true}]),
+    proxy_setnext(Server,"Hej"),
+    <<"Hej">> = io:get_line(Server,''),
+    proxy_setnext(Server,"Hej"++[532]),
+    <<72,101,106,200,148>> = io:get_line(Server,''),
+    [$H,$e,$j,532] = lists:flatten(io_lib:format("~ts",[<<72,101,106,200,148>>])),
+    file:write(WFile,<<"HejA">>),
+    file:write(WFile,unicode:characters_to_binary("Hej"++[532],unicode,unicode)),
+    file:write(WFile,unicode:characters_to_binary("Hej"++[532],unicode,{utf16,big})),
+    file:write(WFile,unicode:characters_to_binary("Hej"++[532],unicode,{utf16,little})),
+    file:write(WFile,unicode:characters_to_binary("Hej"++[532],unicode,{utf32,big})),
+    file:write(WFile,unicode:characters_to_binary("Hej"++[532],unicode,{utf32,little})),
+    file:close(WFile),
+    {ok,RFile} = file:open(FileName,[read]),
+    [{binary,false},{encoding,latin1}] = lists:sort(io:getopts(RFile)),
+    [$H,$e,$j,$A] = io:get_chars(RFile,'',4),
+    io:setopts(RFile,[{encoding,unicode}]),
+    [$H,$e,$j,532] = io:get_chars(RFile,'',4),
+    [{binary,false},{encoding,unicode}] = lists:sort(io:getopts(RFile)),
+    io:setopts(RFile,[{encoding,{utf16,big}}]),
+    [$H,$e,$j,532] = io:get_chars(RFile,'',4),
+    [{binary,false},{encoding,{utf16,big}}] =
 	lists:sort(io:getopts(RFile)),
-    ?line io:setopts(RFile,[{encoding,{utf16,little}}]),
-    ?line [$H,$e,$j,532] = io:get_chars(RFile,'',4),
-    ?line [{binary,false},{encoding,{utf16,little}}] = 
+    io:setopts(RFile,[{encoding,{utf16,little}}]),
+    [$H,$e,$j,532] = io:get_chars(RFile,'',4),
+    [{binary,false},{encoding,{utf16,little}}] =
 	lists:sort(io:getopts(RFile)),
-    ?line io:setopts(RFile,[{encoding,{utf32,big}}]),
-    ?line [$H,$e,$j,532] = io:get_chars(RFile,'',4),
-    ?line [{binary,false},{encoding,{utf32,big}}] = 
+    io:setopts(RFile,[{encoding,{utf32,big}}]),
+    [$H,$e,$j,532] = io:get_chars(RFile,'',4),
+    [{binary,false},{encoding,{utf32,big}}] =
 	lists:sort(io:getopts(RFile)),
-    ?line io:setopts(RFile,[{encoding,{utf32,little}}]),
-    ?line [$H,$e,$j,532] = io:get_chars(RFile,'',4),
-    ?line [{binary,false},{encoding,{utf32,little}}] = 
+    io:setopts(RFile,[{encoding,{utf32,little}}]),
+    [$H,$e,$j,532] = io:get_chars(RFile,'',4),
+    [{binary,false},{encoding,{utf32,little}}] =
 	lists:sort(io:getopts(RFile)),
-    ?line eof = io:get_line(RFile,''),
-    ?line file:position(RFile,0),
-    ?line io:setopts(RFile,[{binary,true},{encoding,latin1}]),
-    ?line <<$H,$e,$j,$A>> = io:get_chars(RFile,'',4),
-    ?line [{binary,true},{encoding,latin1}] = lists:sort(io:getopts(RFile)),
-    ?line io:setopts(RFile,[{encoding,unicode}]),
-    ?line <<$H,$e,$j,532/utf8>> = io:get_chars(RFile,'',4),
-    ?line [{binary,true},{encoding,unicode}] = lists:sort(io:getopts(RFile)),
-    ?line io:setopts(RFile,[{encoding,{utf16,big}}]),
-    ?line <<$H,$e,$j,532/utf8>> = io:get_chars(RFile,'',4),
-    ?line [{binary,true},{encoding,{utf16,big}}] = 
+    eof = io:get_line(RFile,''),
+    file:position(RFile,0),
+    io:setopts(RFile,[{binary,true},{encoding,latin1}]),
+    <<$H,$e,$j,$A>> = io:get_chars(RFile,'',4),
+    [{binary,true},{encoding,latin1}] = lists:sort(io:getopts(RFile)),
+    io:setopts(RFile,[{encoding,unicode}]),
+    <<$H,$e,$j,532/utf8>> = io:get_chars(RFile,'',4),
+    [{binary,true},{encoding,unicode}] = lists:sort(io:getopts(RFile)),
+    io:setopts(RFile,[{encoding,{utf16,big}}]),
+    <<$H,$e,$j,532/utf8>> = io:get_chars(RFile,'',4),
+    [{binary,true},{encoding,{utf16,big}}] =
 	lists:sort(io:getopts(RFile)),
-    ?line io:setopts(RFile,[{encoding,{utf16,little}}]),
-    ?line <<$H,$e,$j,532/utf8>> = io:get_chars(RFile,'',4),
-    ?line [{binary,true},{encoding,{utf16,little}}] = 
+    io:setopts(RFile,[{encoding,{utf16,little}}]),
+    <<$H,$e,$j,532/utf8>> = io:get_chars(RFile,'',4),
+    [{binary,true},{encoding,{utf16,little}}] =
 	lists:sort(io:getopts(RFile)),
-    ?line io:setopts(RFile,[{encoding,{utf32,big}}]),
-    ?line <<$H,$e,$j,532/utf8>> = io:get_chars(RFile,'',4),
-    ?line [{binary,true},{encoding,{utf32,big}}] = 
+    io:setopts(RFile,[{encoding,{utf32,big}}]),
+    <<$H,$e,$j,532/utf8>> = io:get_chars(RFile,'',4),
+    [{binary,true},{encoding,{utf32,big}}] =
 	lists:sort(io:getopts(RFile)),
-    ?line io:setopts(RFile,[{encoding,{utf32,little}}]),
-    ?line <<$H,$e,$j,532/utf8>> = io:get_chars(RFile,'',4),
-    ?line [{binary,true},{encoding,{utf32,little}}] = 
+    io:setopts(RFile,[{encoding,{utf32,little}}]),
+    <<$H,$e,$j,532/utf8>> = io:get_chars(RFile,'',4),
+    [{binary,true},{encoding,{utf32,little}}] =
 	lists:sort(io:getopts(RFile)),
-    ?line eof = io:get_line(RFile,''),
-    ?line file:close(RFile),
+    eof = io:get_line(RFile,''),
+    file:close(RFile),
     case proplists:get_value(default_shell,Config) of
 	old ->
 	    ok;
 	new ->
 	    %% So, lets test another node with new interactive shell
-	    ?line rtnode([{putline,""},
-			  {putline, "2."},
-			  {getline, "2"},
-			  {putline, "lists:keyfind(binary,1,io:getopts())."},
-			  {getline, "{binary,false}"},
-			  {putline, "io:get_line('')."},
-			  {putline, "hej"},
-			  {getline, "\"hej\\n\""},
-			  {putline, "io:setopts([{binary,true}])."},
-			  {getline, "ok"},
-			  {putline, "io:get_line('')."},
-			  {putline, "hej"},
-			  {getline, "<<\"hej\\n\">>"}
-			 ],[])
+	    rtnode([{putline,""},
+		    {putline, "2."},
+		    {getline, "2"},
+		    {putline, "lists:keyfind(binary,1,io:getopts())."},
+		    {getline, "{binary,false}"},
+		    {putline, "io:get_line('')."},
+		    {putline, "hej"},
+		    {getline, "\"hej\\n\""},
+		    {putline, "io:setopts([{binary,true}])."},
+		    {getline, "ok"},
+		    {putline, "io:get_line('')."},
+		    {putline, "hej"},
+		    {getline, "<<\"hej\\n\">>"}
+		   ],[])
     end,
     %% And one with oldshell
-    ?line rtnode([{putline,""},
-		  {putline, "2."},
-		  {getline_re, ".*2$"},
-		  {putline, "lists:keyfind(binary,1,io:getopts())."},
-		  {getline_re, ".*{binary,false}"},
-		  {putline, "io:get_line('')."},
-		  {putline, "hej"},
-		  {getline_re, ".*\"hej\\\\n\""},
-		  {putline, "io:setopts([{binary,true}])."},
-		  {getline_re, ".*ok"},
-		  {putline, "io:get_line('')."},
-		  {putline, "hej"},
-		  {getline_re, ".*<<\"hej\\\\n\">>"}
-		  ],[],[],"-oldshell"),
+    rtnode([{putline,""},
+	    {putline, "2."},
+	    {getline_re, ".*2$"},
+	    {putline, "lists:keyfind(binary,1,io:getopts())."},
+	    {getline_re, ".*{binary,false}"},
+	    {putline, "io:get_line('')."},
+	    {putline, "hej"},
+	    {getline_re, ".*\"hej\\\\n\""},
+	    {putline, "io:setopts([{binary,true}])."},
+	    {getline_re, ".*ok"},
+	    {putline, "io:get_line('')."},
+	    {putline, "hej"},
+	    {getline_re, ".*<<\"hej\\\\n\">>"}
+	   ],[],[],"-oldshell"),
     ok.
 
 
 get_lc_ctype() ->
-	case {os:type(),os:version()} of
-		{{unix,sunos},{5,N,_}} when N =< 8 ->
-			"iso_8859_1";
-		_ ->
-			"ISO-8859-1"
-	end.
-    
-unicode_options(suite) ->
-    [];
-unicode_options(doc) ->
-    ["Tests various unicode options"];
+    case {os:type(),os:version()} of
+	{{unix,sunos},{5,N,_}} when N =< 8 ->
+	    "iso_8859_1";
+	_ ->
+	    "ISO-8859-1"
+    end.
+
+%% Test various unicode options.
 unicode_options(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir,Config),
-    PrivDir = ?config(priv_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
+    PrivDir = proplists:get_value(priv_dir,Config),
     %% A string in both russian and greek characters, which is present
     %% in all the internal test files (but in different formats of course)...
     TestData = [1090,1093,1077,32,1073,1080,1075,32,
@@ -322,13 +308,10 @@ unicode_options(Config) when is_list(Config) ->
 			"external_utf16_little_bom.dat",
 			"external_utf16_big_bom.dat"],
     ReadBomFile = fun(File,Dir) ->
-			  %io:format(standard_error,"~s\r\n",[filename:join([Dir,File])]),			  
 			  {ok,F} = file:open(filename:join([Dir,File]),
 					     [read,binary]),
 			  {ok,Bin} = file:read(F,4),
 			  {Type,Bytes} = unicode:bom_to_encoding(Bin),
-			  %io:format(standard_error,"~p\r\n",[{Type,Bytes}]),			  
-			  
 			  file:position(F,Bytes),
 			  io:setopts(F,[{encoding,Type}]),
 			  R = unicode:characters_to_list(
@@ -346,26 +329,26 @@ unicode_options(Config) when is_list(Config) ->
 			      R
 		      end,
     ReadBomlessFileList = fun({Type,File},DataLen,Dir) ->
-			      {ok,F} = file:open(filename:join([Dir,File]),
-						 [read,
-						  {encoding,Type}]),
-			      R = io:get_chars(F,'',DataLen),
-			      file:close(F),
-			      R
-		      end,
+				  {ok,F} = file:open(filename:join([Dir,File]),
+						     [read,
+						      {encoding,Type}]),
+				  R = io:get_chars(F,'',DataLen),
+				  file:close(F),
+				  R
+			  end,
     ReadBomlessFileListLine = fun({Type,File},Dir) ->
-			      {ok,F} = file:open(filename:join([Dir,File]),
-						 [read,
-						  {encoding,Type}]),
-			      R = io:get_line(F,''),
-			      file:close(F),
-			      R
-		      end,
-    ?line [TestData = ReadBomFile(F,DataDir) || F <- InternalBomFiles ],
-    ?line [ExternalTestData = ReadBomFile(F,DataDir) || F <- ExternalBomFiles ],
-    ?line [TestData = ReadBomlessFile(F,length(TestData),DataDir) || F <- AllNoBom ],
-    ?line [TestData = ReadBomlessFileList(F,length(TestData),DataDir) || F <- AllNoBom ],
-    ?line [TestData = ReadBomlessFileListLine(F,DataDir) || F <- AllNoBom ],
+				      {ok,F} = file:open(filename:join([Dir,File]),
+							 [read,
+							  {encoding,Type}]),
+				      R = io:get_line(F,''),
+				      file:close(F),
+				      R
+			      end,
+    [TestData = ReadBomFile(F,DataDir) || F <- InternalBomFiles ],
+    [ExternalTestData = ReadBomFile(F,DataDir) || F <- ExternalBomFiles ],
+    [TestData = ReadBomlessFile(F,length(TestData),DataDir) || F <- AllNoBom ],
+    [TestData = ReadBomlessFileList(F,length(TestData),DataDir) || F <- AllNoBom ],
+    [TestData = ReadBomlessFileListLine(F,DataDir) || F <- AllNoBom ],
 
     BomDir = filename:join([PrivDir,"BOMDATA"]),
     BomlessDir = filename:join([PrivDir,"BOMLESSDATA"]),
@@ -381,8 +364,8 @@ unicode_options(Config) when is_list(Config) ->
 			   file:close(F),
 			   ok
 		   end,
-    ?line [ ok = WriteBomFile(F,BomDir) || F <- AllNoBom ],
-    ?line [TestData = ReadBomFile(F,BomDir) || {_,F} <- AllNoBom ],
+    [ ok = WriteBomFile(F,BomDir) || F <- AllNoBom ],
+    [TestData = ReadBomFile(F,BomDir) || {_,F} <- AllNoBom ],
     WriteBomlessFile = fun({Enc,File},TData,Dir) ->
 			       {ok,F} = file:open(
 					  filename:join([Dir,File]),
@@ -391,13 +374,13 @@ unicode_options(Config) when is_list(Config) ->
 			       file:close(F),
 			       ok
 		       end,
-    ?line [ ok = WriteBomlessFile(F,TestData,BomlessDir) || F <- AllNoBom ],
-    ?line [TestData = ReadBomlessFile(F,length(TestData),BomlessDir) || F <- AllNoBom ],
-    ?line [TestData = ReadBomlessFileList(F,length(TestData),BomlessDir) || F <- AllNoBom ],
-    ?line [TestData = ReadBomlessFileListLine(F,BomlessDir) || F <- AllNoBom ],
-    
+    [ ok = WriteBomlessFile(F,TestData,BomlessDir) || F <- AllNoBom ],
+    [TestData = ReadBomlessFile(F,length(TestData),BomlessDir) || F <- AllNoBom ],
+    [TestData = ReadBomlessFileList(F,length(TestData),BomlessDir) || F <- AllNoBom ],
+    [TestData = ReadBomlessFileListLine(F,BomlessDir) || F <- AllNoBom ],
+
     CannotReadFile = fun({Enc,File},Dir) ->
-			     %io:format(standard_error,"~s\r\n",[filename:join([Dir,File])]),
+			     %%io:format(standard_error,"~s\r\n",[filename:join([Dir,File])]),
 			     {ok,F} = file:open(
 					filename:join([Dir,File]),
 					[read,binary,{encoding,Enc}]),
@@ -414,14 +397,14 @@ unicode_options(Config) when is_list(Config) ->
 			     {error,terminated} = io:get_chars(F,'',10),
 			     ok
 		     end,
-    ?line [ ok = CannotReadFile(F,DataDir) || F <- AllNoBom ],
-    ?line [ ok = CannotReadFile(F,BomlessDir) || F <- AllNoBom ],
-    ?line [ ok = CannotReadFile(F,BomDir) || F <- AllNoBom ],			     
+    [ ok = CannotReadFile(F,DataDir) || F <- AllNoBom ],
+    [ ok = CannotReadFile(F,BomlessDir) || F <- AllNoBom ],
+    [ ok = CannotReadFile(F,BomDir) || F <- AllNoBom ],
 
-    ?line [ ok = WriteBomlessFile(F,TestData2,BomlessDir) || F <- AllNoBom ],
-    ?line [TestData2 = ReadBomlessFile(F,length(TestData2),BomlessDir) || F <- AllNoBom ],
-    ?line [TestData2 = ReadBomlessFileList(F,length(TestData2),BomlessDir) || F <- AllNoBom ],
-    ?line [TestData2 = ReadBomlessFileListLine(F,BomlessDir) || F <- AllNoBom ],
+    [ ok = WriteBomlessFile(F,TestData2,BomlessDir) || F <- AllNoBom ],
+    [TestData2 = ReadBomlessFile(F,length(TestData2),BomlessDir) || F <- AllNoBom ],
+    [TestData2 = ReadBomlessFileList(F,length(TestData2),BomlessDir) || F <- AllNoBom ],
+    [TestData2 = ReadBomlessFileListLine(F,BomlessDir) || F <- AllNoBom ],
 
 
     FailDir = filename:join([PrivDir,"FAIL"]),
@@ -431,56 +414,56 @@ unicode_options(Config) when is_list(Config) ->
 			      {ok,F} = file:open(
 					 filename:join([Dir,File]),
 					 [write,binary]),
-			      ?line {'EXIT', {no_translation,_}} =
+			      {'EXIT', {no_translation,_}} =
 				  (catch io:put_chars(F,TestData)),
-			      ?line {'EXIT', {terminated,_}} = (catch io:put_chars(F,TestData)),
+			      {'EXIT', {terminated,_}} = (catch io:put_chars(F,TestData)),
 			      ok
 		      end,
-    ?line [ ok = CannotWriteFile(F,FailDir) || F <- AllNoBom ],
+    [ ok = CannotWriteFile(F,FailDir) || F <- AllNoBom ],
 
     case proplists:get_value(default_shell,Config) of
 	old ->
 	    ok;
 	new ->
 	    %% OK, time for the group_leaders...
-	    ?line rtnode([{putline,""},
-			  {putline, "2."},
-			  {getline, "2"},
-			  {putline, "lists:keyfind(encoding,1,io:getopts())."},
-			  {getline, "{encoding,latin1}"},
-			  {putline, "io:format(\"~ts~n\",[[1024]])."},
-			  {getline, "\\x{400}"},
-			  {putline, "io:setopts([unicode])."},
-			  {getline, "ok"},
-			  {putline, "io:format(\"~ts~n\",[[1024]])."},
-			  {getline,
-			   binary_to_list(unicode:characters_to_binary(
-					    [1024],unicode,utf8))}
-			 ],[],"LC_CTYPE=\""++get_lc_ctype()++"\"; "
-			 "export LC_CTYPE; ")
+	    rtnode([{putline,""},
+		    {putline, "2."},
+		    {getline, "2"},
+		    {putline, "lists:keyfind(encoding,1,io:getopts())."},
+		    {getline, "{encoding,latin1}"},
+		    {putline, "io:format(\"~ts~n\",[[1024]])."},
+		    {getline, "\\x{400}"},
+		    {putline, "io:setopts([unicode])."},
+		    {getline, "ok"},
+		    {putline, "io:format(\"~ts~n\",[[1024]])."},
+		    {getline,
+		     binary_to_list(unicode:characters_to_binary(
+				      [1024],unicode,utf8))}
+		   ],[],"LC_CTYPE=\""++get_lc_ctype()++"\"; "
+		   "export LC_CTYPE; ")
     end,
-    ?line rtnode([{putline,""},
-		  {putline, "2."},
-		  {getline_re, ".*2$"},
-		  {putline, "lists:keyfind(encoding,1,io:getopts())."},
-		  {getline_re, ".*{encoding,latin1}"},
-		  {putline, "io:format(\"~ts~n\",[[1024]])."},
-		  {getline_re, ".*\\\\x{400\\}"},
-		  {putline, "io:setopts([{encoding,unicode}])."},
-		  {getline_re, ".*ok"},
-		  {putline, "io:format(\"~ts~n\",[[1024]])."},
-		  {getline_re, 
-		   ".*"++binary_to_list(unicode:characters_to_binary(
-					  [1024],unicode,utf8))}
-		 ],[],"LC_CTYPE=\""++get_lc_ctype()++"\"; export LC_CTYPE; ",
-		 " -oldshell "),
+    rtnode([{putline,""},
+	    {putline, "2."},
+	    {getline_re, ".*2$"},
+	    {putline, "lists:keyfind(encoding,1,io:getopts())."},
+	    {getline_re, ".*{encoding,latin1}"},
+	    {putline, "io:format(\"~ts~n\",[[1024]])."},
+	    {getline_re, ".*\\\\x{400\\}"},
+	    {putline, "io:setopts([{encoding,unicode}])."},
+	    {getline_re, ".*ok"},
+	    {putline, "io:format(\"~ts~n\",[[1024]])."},
+	    {getline_re,
+	     ".*"++binary_to_list(unicode:characters_to_binary(
+				    [1024],unicode,utf8))}
+	   ],[],"LC_CTYPE=\""++get_lc_ctype()++"\"; export LC_CTYPE; ",
+	   " -oldshell "),
 
     ok.
-    
+
 %% Tests various unicode options on random generated files.
 unicode_options_gen(Config) when is_list(Config) ->
     random:seed(1240, 900586, 553728),
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     AllModes = [utf8,utf16,{utf16,big},{utf16,little},
 		utf32,{utf32,big},{utf32,little}],
     FSize = 9*1024,
@@ -621,7 +604,7 @@ do_read_whole_file(Fname, Options, Fun) ->
     Res = do_read_whole_file_1(Fun, F),
     ok = file:close(F),
     unicode:characters_to_list(Res, unicode).
-			 
+
 do_read_whole_file_1(Fun, F) ->
     case Fun(F) of
 	eof ->
@@ -646,7 +629,7 @@ do_write_read_file(Fname, Options, Encoding, Writer) ->
     {ok,Bin} = file:read_file(Fname),
     ok = file:delete(Fname),
     Bin.
-			
+
 enc2str(Atom) when is_atom(Atom) ->
     atom_to_list(Atom);
 enc2str({A1,A2}) when is_atom(A1), is_atom(A2) ->
@@ -656,14 +639,14 @@ enc2str({A1,A2}) when is_atom(A1), is_atom(A2) ->
 random_unicode(0) ->
     [];
 random_unicode(N) ->
-    % Favour large unicode and make linebreaks
+    %% Favour large unicode and make linebreaks
     X = case random:uniform(20) of
-	   A when A =< 1 -> $\n;
-	   A0 when A0 =< 3 -> random:uniform(16#10FFFF);
-	   A1 when A1 =< 6 -> random:uniform(16#10FFFF - 16#7F) + 16#7F;
-	   A2 when A2 =< 12 -> random:uniform(16#10FFFF - 16#7FF) + 16#7FF;
-	   _ -> random:uniform(16#10FFFF - 16#FFFF) + 16#FFFF
-       end,
+	    A when A =< 1 -> $\n;
+	    A0 when A0 =< 3 -> random:uniform(16#10FFFF);
+	    A1 when A1 =< 6 -> random:uniform(16#10FFFF - 16#7F) + 16#7F;
+	    A2 when A2 =< 12 -> random:uniform(16#10FFFF - 16#7FF) + 16#7FF;
+	    _ -> random:uniform(16#10FFFF - 16#FFFF) + 16#FFFF
+	end,
     case X of
 	Inv1 when Inv1 >= 16#D800, Inv1 =< 16#DFFF;
 	          Inv1 =:= 16#FFFE; 
@@ -672,15 +655,12 @@ random_unicode(N) ->
 	_ ->
 	    [X | random_unicode(N-1)]
     end.
-	    
 
-binary_options(suite) ->
-    [];
-binary_options(doc) ->
-    ["Tests variants with binary option"];
+
+%% Test variants with binary option.
 binary_options(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir,Config),
-    PrivDir = ?config(priv_dir,Config),
+    DataDir = proplists:get_value(data_dir,Config),
+    PrivDir = proplists:get_value(priv_dir,Config),
     TestData = unicode:characters_to_binary(
 		 [1090,1093,1077,32,1073,1080,1075,32,
 		  1088,1077,1076,32,1092,1086,1100,32,1093,
@@ -691,84 +671,79 @@ binary_options(Config) when is_list(Config) ->
     First10List = binary_to_list(First10),
     Second10List = binary_to_list(Second10),
     TestFile = filename:join([DataDir, "testdata_utf8.dat"]),
-    ?line {ok, F} = file:open(TestFile,[read]),
-    ?line {ok, First10List} = file:read(F,10),
-    ?line io:setopts(F,[binary]),
-    ?line {ok, Second10} = file:read(F,10),
-    ?line file:close(F),
-    ?line {ok, F2} = file:open(TestFile,[read,binary]),
-    ?line {ok, First10} = file:read(F2,10),
-    ?line io:setopts(F2,[list]),
-    ?line {ok, Second10List} = file:read(F2,10),
-    ?line file:position(F2,0),
-    %dbg:tracer(),dbg:p(F2,call),dbg:tpl(file_io_server,x),
-    ?line First10List = io:get_chars(F2,'',10),
-    ?line io:setopts(F2,[binary]),
-    ?line Second10 = unicode:characters_to_binary(io:get_chars(F2,'',10),unicode,latin1),
-    ?line file:close(F2),
-    ?line LineBreakFileName =  filename:join([PrivDir, "testdata.dat"]),
-    ?line LineBreakTestData = <<TestData/binary,$\n>>, 
-    ?line LineBreakTestDataList = binary_to_list(LineBreakTestData),
-    ?line file:write_file(LineBreakFileName,[LineBreakTestData,LineBreakTestData,LineBreakTestData,TestData]),
-    ?line {ok, F3} = file:open(LineBreakFileName,[read]),
-    ?line LineBreakTestDataList = io:get_line(F3,''),
-    ?line io:setopts(F3,[binary]),
-    ?line LineBreakTestData =  unicode:characters_to_binary(io:get_line(F3,''),unicode,latin1),
-    ?line io:setopts(F3,[list]),
-    ?line LineBreakTestDataList = io:get_line(F3,''),
-    ?line io:setopts(F3,[binary]), 
-    %ok = io:format(standard_error,"TestData = ~w~n",[TestData]),
-    ?line TestData = unicode:characters_to_binary(io:get_line(F3,''),unicode,latin1),
-    ?line eof = io:get_line(F3,''),
-    ?line file:close(F3),
+    {ok, F} = file:open(TestFile,[read]),
+    {ok, First10List} = file:read(F,10),
+    io:setopts(F,[binary]),
+    {ok, Second10} = file:read(F,10),
+    file:close(F),
+    {ok, F2} = file:open(TestFile,[read,binary]),
+    {ok, First10} = file:read(F2,10),
+    io:setopts(F2,[list]),
+    {ok, Second10List} = file:read(F2,10),
+    file:position(F2,0),
+    First10List = io:get_chars(F2,'',10),
+    io:setopts(F2,[binary]),
+    Second10 = unicode:characters_to_binary(io:get_chars(F2,'',10),unicode,latin1),
+    file:close(F2),
+    LineBreakFileName =  filename:join([PrivDir, "testdata.dat"]),
+    LineBreakTestData = <<TestData/binary,$\n>>,
+    LineBreakTestDataList = binary_to_list(LineBreakTestData),
+    file:write_file(LineBreakFileName,[LineBreakTestData,LineBreakTestData,LineBreakTestData,TestData]),
+    {ok, F3} = file:open(LineBreakFileName,[read]),
+    LineBreakTestDataList = io:get_line(F3,''),
+    io:setopts(F3,[binary]),
+    LineBreakTestData =  unicode:characters_to_binary(io:get_line(F3,''),unicode,latin1),
+    io:setopts(F3,[list]),
+    LineBreakTestDataList = io:get_line(F3,''),
+    io:setopts(F3,[binary]),
+    TestData = unicode:characters_to_binary(io:get_line(F3,''),unicode,latin1),
+    eof = io:get_line(F3,''),
+    file:close(F3),
+
     %% OK, time for the group_leaders...
-    %% io:format(standard_error,"Hmmm:~w~n",["<<\""++binary_to_list(<<"\345\344\366"/utf8>>)++"\\n\">>"]),
     case proplists:get_value(default_shell,Config) of
 	old ->
 	    ok;
 	new ->
-	    ?line rtnode([{putline, "2."},
-			  {getline, "2"},
-			  {putline, "lists:keyfind(binary,1,io:getopts())."},
-			  {getline, "{binary,false}"},
-			  {putline, "io:get_line('')."},
-			  {putline, "hej"},
-			  {getline, "\"hej\\n\""},
-			  {putline, "io:setopts([{binary,true},unicode])."},
-			  {getline, "ok"},
-			  {putline, "io:get_line('')."},
-			  {putline, "hej"},
-			  {getline, "<<\"hej\\n\">>"},
-			  {putline, "io:get_line('')."},
-			  {putline, binary_to_list(<<"\345\344\366"/utf8>>)},
-			  {getline, "<<\""++binary_to_list(<<"\345\344\366"/utf8>>)++"\\n\"/utf8>>"}
-			 ],[])
+	    rtnode([{putline, "2."},
+		    {getline, "2"},
+		    {putline, "lists:keyfind(binary,1,io:getopts())."},
+		    {getline, "{binary,false}"},
+		    {putline, "io:get_line('')."},
+		    {putline, "hej"},
+		    {getline, "\"hej\\n\""},
+		    {putline, "io:setopts([{binary,true},unicode])."},
+		    {getline, "ok"},
+		    {putline, "io:get_line('')."},
+		    {putline, "hej"},
+		    {getline, "<<\"hej\\n\">>"},
+		    {putline, "io:get_line('')."},
+		    {putline, binary_to_list(<<"\345\344\366"/utf8>>)},
+		    {getline, "<<\""++binary_to_list(<<"\345\344\366"/utf8>>)++"\\n\"/utf8>>"}
+		   ],[])
     end,
-   %% And one with oldshell
-    ?line rtnode([{putline, "2."},
-		  {getline_re, ".*2$"},
-		  {putline, "lists:keyfind(binary,1,io:getopts())."},
-		  {getline_re, ".*{binary,false}"},
-		  {putline, "io:get_line('')."},
-		  {putline, "hej"},
-		  {getline_re, ".*\"hej\\\\n\""},
-		  {putline, "io:setopts([{binary,true},unicode])."},
-		  {getline_re, ".*ok"},
-		  {putline, "io:get_line('')."},
-		  {putline, "hej"},
-		  {getline_re, ".*<<\"hej\\\\n\">>"},
-		  {putline, "io:get_line('')."},
-		  {putline, binary_to_list(<<"\345\344\366"/utf8>>)},
-		  {getline_re, ".*<<\""++binary_to_list(<<"\345\344\366"/utf8>>)++"\\\\n\"/utf8>>"}
-		  ],[],[],"-oldshell"),
+    %% And one with oldshell
+    rtnode([{putline, "2."},
+	    {getline_re, ".*2$"},
+	    {putline, "lists:keyfind(binary,1,io:getopts())."},
+	    {getline_re, ".*{binary,false}"},
+	    {putline, "io:get_line('')."},
+	    {putline, "hej"},
+	    {getline_re, ".*\"hej\\\\n\""},
+	    {putline, "io:setopts([{binary,true},unicode])."},
+	    {getline_re, ".*ok"},
+	    {putline, "io:get_line('')."},
+	    {putline, "hej"},
+	    {getline_re, ".*<<\"hej\\\\n\">>"},
+	    {putline, "io:get_line('')."},
+	    {putline, binary_to_list(<<"\345\344\366"/utf8>>)},
+	    {getline_re, ".*<<\""++binary_to_list(<<"\345\344\366"/utf8>>)++"\\\\n\"/utf8>>"}
+	   ],[],[],"-oldshell"),
     ok.
 
-bc_with_r12(suite) ->
-    [];
-bc_with_r12(doc) ->
-    ["Test io protocol compatibility with R12 nodes"];
+%% Test io protocol compatibility with R12 nodes.
 bc_with_r12(Config) when is_list(Config) ->
-    case ?t:is_release_available("r12b") of
+    case test_server:is_release_available("r12b") of
 	true -> bc_with_r12_1(Config);
 	false -> {skip,"No R12B found"}
     end.
@@ -776,135 +751,134 @@ bc_with_r12(Config) when is_list(Config) ->
 bc_with_r12_1(Config) ->
     PA = filename:dirname(code:which(?MODULE)),
     Name1 = io_proto_r12_1,
-    ?line N1 = list_to_atom(atom_to_list(Name1) ++ "@" ++ hostname()),
-    ?line ?t:start_node(Name1, peer, [{args, "-pz \""++PA++"\""},{erl,[{release,"r12b"}]}]),
-    DataDir = ?config(data_dir,Config),
-    %PrivDir = ?config(priv_dir,Config),
+    N1 = list_to_atom(atom_to_list(Name1) ++ "@" ++ hostname()),
+    test_server:start_node(Name1, peer, [{args, "-pz \""++PA++"\""},
+					 {erl,[{release,"r12b"}]}]),
+    DataDir = proplists:get_value(data_dir,Config),
     FileName1 = filename:join([DataDir,"testdata_latin1.dat"]),
     TestDataLine1 = [229,228,246],
     TestDataLine2 = [197,196,214],
-    ?line SPid1 = rpc:call(N1,erlang,spawn,[?MODULE,hold_the_line,[self(),FileName1,[read]]]),
-    ?line {ok,F1} = receive
-			{SPid1,Res1} ->
-			    Res1
-		    after 5000 ->
-			    exit(timeout)
-		    end,
-    ?line TestDataLine1 = chomp(io:get_line(F1,'')),
-    ?line SPid1 ! die,
+    SPid1 = rpc:call(N1,erlang,spawn,[?MODULE,hold_the_line,[self(),FileName1,[read]]]),
+    {ok,F1} = receive
+		  {SPid1,Res1} ->
+		      Res1
+	      after 5000 ->
+		      exit(timeout)
+	      end,
+    TestDataLine1 = chomp(io:get_line(F1,'')),
+    SPid1 ! die,
     receive after 1000 -> ok end,
-    ?line SPid2 = rpc:call(N1,erlang,spawn,[?MODULE,hold_the_line,[self(),FileName1,[read,binary]]]),
-    ?line {ok,F2} = receive
-			{SPid2,Res2} ->
-			    Res2
-		    after 5000 ->
-			    exit(timeout)
-		    end,
+    SPid2 = rpc:call(N1,erlang,spawn,[?MODULE,hold_the_line,[self(),FileName1,[read,binary]]]),
+    {ok,F2} = receive
+		  {SPid2,Res2} ->
+		      Res2
+	      after 5000 ->
+		      exit(timeout)
+	      end,
     TestDataLine1BinUtf = unicode:characters_to_binary(TestDataLine1),
     TestDataLine1BinLatin = list_to_binary(TestDataLine1),
     TestDataLine2BinUtf = unicode:characters_to_binary(TestDataLine2),
     TestDataLine2BinLatin = list_to_binary(TestDataLine2),
-    ?line TestDataLine1BinUtf = chomp(io:get_line(F2,'')),
-    ?line TestDataLine2BinUtf = chomp(io:get_line(F2,'')),
-    %io:format(standard_error,"Exec:~s\r\n",[rpc:call(N1,os,find_executable,["erl"])]),
-    %io:format(standard_error,"Io:~s\r\n",[rpc:call(N1,code,which,[io])]),
-    %io:format(standard_error,"File_io_server:~s\r\n",[rpc:call(N1,code,which,[file_io_server])]),
-    ?line file:position(F2,0),
-    ?line TestDataLine1BinLatin =  chomp(rpc:call(N1,io,get_line,[F2,''])),
-    ?line TestDataLine2BinUtf = chomp(io:get_line(F2,'')),
-    ?line file:position(F2,0),
-    ?line TestDataLine1BinUtf = chomp(io:get_line(F2,'')),
-    ?line TestDataLine2BinLatin =  chomp(rpc:call(N1,io,get_line,[F2,''])),
-    ?line eof =  chomp(rpc:call(N1,io,get_line,[F2,''])),
-    ?line file:position(F2,0),
-    ?line TestDataLine1BinLatin =  rpc:call(N1,io,get_chars,[F2,'',3]),
+    TestDataLine1BinUtf = chomp(io:get_line(F2,'')),
+    TestDataLine2BinUtf = chomp(io:get_line(F2,'')),
+    %%io:format(standard_error,"Exec:~s\r\n",[rpc:call(N1,os,find_executable,["erl"])]),
+    %%io:format(standard_error,"Io:~s\r\n",[rpc:call(N1,code,which,[io])]),
+    %%io:format(standard_error,"File_io_server:~s\r\n",[rpc:call(N1,code,which,[file_io_server])]),
+    file:position(F2,0),
+    TestDataLine1BinLatin =  chomp(rpc:call(N1,io,get_line,[F2,''])),
+    TestDataLine2BinUtf = chomp(io:get_line(F2,'')),
+    file:position(F2,0),
+    TestDataLine1BinUtf = chomp(io:get_line(F2,'')),
+    TestDataLine2BinLatin =  chomp(rpc:call(N1,io,get_line,[F2,''])),
+    eof =  chomp(rpc:call(N1,io,get_line,[F2,''])),
+    file:position(F2,0),
+    TestDataLine1BinLatin =  rpc:call(N1,io,get_chars,[F2,'',3]),
     io:get_chars(F2,'',1),
-    ?line TestDataLine2BinLatin =  chomp(rpc:call(N1,io,get_line,[F2,''])),
-    ?line file:position(F2,0),
-    ?line {ok,[TestDataLine1]} = io:fread(F2,'',"~s"),
-    ?line {ok,[TestDataLine2]} = rpc:call(N1,io,fread,[F2,'',"~s"]),
-
-    ?line DataLen1 = length(TestDataLine1),
-    ?line DataLen2 = length(TestDataLine2),
-
-    ?line file:position(F2,0),
-    ?line {ok,TestDataLine1BinLatin} = file:read(F2,DataLen1),
-    ?line {ok,_} = file:read(F2,1),
-    ?line {ok,TestDataLine2BinLatin} = rpc:call(N1,file,read,[F2,DataLen2]),
-    ?line {ok,_} = file:read(F2,1),
-    ?line eof = rpc:call(N1,file,read,[F2,1]),
+    TestDataLine2BinLatin =  chomp(rpc:call(N1,io,get_line,[F2,''])),
+    file:position(F2,0),
+    {ok,[TestDataLine1]} = io:fread(F2,'',"~s"),
+    {ok,[TestDataLine2]} = rpc:call(N1,io,fread,[F2,'',"~s"]),
+
+    DataLen1 = length(TestDataLine1),
+    DataLen2 = length(TestDataLine2),
+
+    file:position(F2,0),
+    {ok,TestDataLine1BinLatin} = file:read(F2,DataLen1),
+    {ok,_} = file:read(F2,1),
+    {ok,TestDataLine2BinLatin} = rpc:call(N1,file,read,[F2,DataLen2]),
+    {ok,_} = file:read(F2,1),
+    eof = rpc:call(N1,file,read,[F2,1]),
     %% As r12 has a bug when setting options with setopts, we need
     %% to reopen the file...
-    ?line SPid2 ! die,
+    SPid2 ! die,
     receive after 1000 -> ok end,
-    ?line SPid3 = rpc:call(N1,erlang,spawn,[?MODULE,hold_the_line,[self(),FileName1,[read]]]),
-    ?line {ok,F3} = receive
-			{SPid3,Res3} ->
-			    Res3
-		    after 5000 ->
-			    exit(timeout)
-		    end,
-    
-    ?line file:position(F3,0),
-    ?line {ok,[TestDataLine1]} = io:fread(F3,'',"~s"),
-    ?line {ok,[TestDataLine2]} = rpc:call(N1,io,fread,[F3,'',"~s"]),
-
-    
-    ?line file:position(F3,0),
-    ?line {ok,TestDataLine1} = file:read(F3,DataLen1),
-    ?line {ok,_} = file:read(F3,1),
-    ?line {ok,TestDataLine2} = rpc:call(N1,file,read,[F3,DataLen2]),
-    ?line {ok,_} = file:read(F3,1),
-    ?line eof = rpc:call(N1,file,read,[F3,1]),
-    
+    SPid3 = rpc:call(N1,erlang,spawn,[?MODULE,hold_the_line,[self(),FileName1,[read]]]),
+    {ok,F3} = receive
+		  {SPid3,Res3} ->
+		      Res3
+	      after 5000 ->
+		      exit(timeout)
+	      end,
+
+    file:position(F3,0),
+    {ok,[TestDataLine1]} = io:fread(F3,'',"~s"),
+    {ok,[TestDataLine2]} = rpc:call(N1,io,fread,[F3,'',"~s"]),
+
+
+    file:position(F3,0),
+    {ok,TestDataLine1} = file:read(F3,DataLen1),
+    {ok,_} = file:read(F3,1),
+    {ok,TestDataLine2} = rpc:call(N1,file,read,[F3,DataLen2]),
+    {ok,_} = file:read(F3,1),
+    eof = rpc:call(N1,file,read,[F3,1]),
+
 
     %% So, lets do it all again, but the other way around
     {ok,F4} = file:open(FileName1,[read]),
-    ?line TestDataLine1 = chomp(io:get_line(F4,'')),
-    ?line file:position(F4,0),
-    ?line io:setopts(F4,[binary]),
-    ?line TestDataLine1BinUtf = chomp(io:get_line(F4,'')),
-    ?line TestDataLine2BinUtf = chomp(io:get_line(F4,'')),
-    ?line file:position(F4,0),
-    ?line TestDataLine1BinUtf = chomp(io:get_line(F4,'')),
-    ?line TestDataLine2BinUtf = chomp(io:get_line(F4,'')),
-    ?line file:position(F4,0),
-    %dbg:tracer(),dbg:p(F4,[call,m]),dbg:tpl(file_io_server,x),dbg:tpl(io_lib,x),
-    ?line TestDataLine1BinUtf = chomp(io:get_line(F4,'')),
-    ?line TestDataLine2BinLatin =  chomp(rpc:call(N1,io,get_line,[F4,''])),
-    ?line file:position(F4,0),
-    ?line TestDataLine1BinLatin =  chomp(rpc:call(N1,io,get_line,[F4,''])),
-    ?line TestDataLine2BinUtf = chomp(io:get_line(F4,'')),
-    ?line eof =  chomp(rpc:call(N1,io,get_line,[F4,''])),
-    ?line file:position(F4,0),
-    ?line TestDataLine1BinLatin =  rpc:call(N1,io,get_chars,[F4,'',3]),
+    TestDataLine1 = chomp(io:get_line(F4,'')),
+    file:position(F4,0),
+    io:setopts(F4,[binary]),
+    TestDataLine1BinUtf = chomp(io:get_line(F4,'')),
+    TestDataLine2BinUtf = chomp(io:get_line(F4,'')),
+    file:position(F4,0),
+    TestDataLine1BinUtf = chomp(io:get_line(F4,'')),
+    TestDataLine2BinUtf = chomp(io:get_line(F4,'')),
+    file:position(F4,0),
+    TestDataLine1BinUtf = chomp(io:get_line(F4,'')),
+    TestDataLine2BinLatin =  chomp(rpc:call(N1,io,get_line,[F4,''])),
+    file:position(F4,0),
+    TestDataLine1BinLatin =  chomp(rpc:call(N1,io,get_line,[F4,''])),
+    TestDataLine2BinUtf = chomp(io:get_line(F4,'')),
+    eof =  chomp(rpc:call(N1,io,get_line,[F4,''])),
+    file:position(F4,0),
+    TestDataLine1BinLatin =  rpc:call(N1,io,get_chars,[F4,'',3]),
     io:get_chars(F4,'',1),
-    ?line TestDataLine2BinLatin =  chomp(rpc:call(N1,io,get_line,[F4,''])),
-    ?line file:position(F4,0),
-    ?line {ok,[TestDataLine1]} = io:fread(F4,'',"~s"),
-    ?line {ok,[TestDataLine2]} = rpc:call(N1,io,fread,[F4,'',"~s"]),
-    ?line file:position(F4,0),
-    ?line {ok,TestDataLine1BinLatin} = file:read(F4,DataLen1),
-    ?line {ok,_} = file:read(F4,1),
-    ?line {ok,TestDataLine2BinLatin} = rpc:call(N1,file,read,[F4,DataLen2]),
-    ?line {ok,_} = file:read(F4,1),
-    ?line eof = rpc:call(N1,file,read,[F4,1]),
-    ?line io:setopts(F4,[list]),
-
-    ?line file:position(F4,0),
-    ?line {ok,[TestDataLine1]} = io:fread(F4,'',"~s"),
-    ?line {ok,[TestDataLine2]} = rpc:call(N1,io,fread,[F4,'',"~s"]),
-
-    
-    ?line file:position(F4,0),
-    ?line {ok,TestDataLine1} = file:read(F4,DataLen1),
-    ?line {ok,_} = file:read(F4,1),
-    ?line {ok,TestDataLine2} = rpc:call(N1,file,read,[F4,DataLen2]),
-    ?line {ok,_} = file:read(F4,1),
-    ?line eof = rpc:call(N1,file,read,[F4,1]),
-    
+    TestDataLine2BinLatin =  chomp(rpc:call(N1,io,get_line,[F4,''])),
+    file:position(F4,0),
+    {ok,[TestDataLine1]} = io:fread(F4,'',"~s"),
+    {ok,[TestDataLine2]} = rpc:call(N1,io,fread,[F4,'',"~s"]),
+    file:position(F4,0),
+    {ok,TestDataLine1BinLatin} = file:read(F4,DataLen1),
+    {ok,_} = file:read(F4,1),
+    {ok,TestDataLine2BinLatin} = rpc:call(N1,file,read,[F4,DataLen2]),
+    {ok,_} = file:read(F4,1),
+    eof = rpc:call(N1,file,read,[F4,1]),
+    io:setopts(F4,[list]),
+
+    file:position(F4,0),
+    {ok,[TestDataLine1]} = io:fread(F4,'',"~s"),
+    {ok,[TestDataLine2]} = rpc:call(N1,io,fread,[F4,'',"~s"]),
+
+
+    file:position(F4,0),
+    {ok,TestDataLine1} = file:read(F4,DataLen1),
+    {ok,_} = file:read(F4,1),
+    {ok,TestDataLine2} = rpc:call(N1,file,read,[F4,DataLen2]),
+    {ok,_} = file:read(F4,1),
+    eof = rpc:call(N1,file,read,[F4,1]),
+
     file:close(F4),
-    ?t:stop_node(N1),
+    test_server:stop_node(N1),
     ok.
 
 hold_the_line(Parent,Filename,Options) ->
@@ -913,14 +887,11 @@ hold_the_line(Parent,Filename,Options) ->
 	die ->
 	    ok
     end.
-    
 
-bc_with_r12_gl(suite) ->
-    [];
-bc_with_r12_gl(doc) ->
-    ["Test io protocol compatibility with R12 nodes (terminals)"];
+
+%% Test io protocol compatibility with R12 nodes (terminals).
 bc_with_r12_gl(Config) when is_list(Config) ->
-    case ?t:is_release_available("r12b") of
+    case test_server:is_release_available("r12b") of
 	true -> 
 	    case  get_progs() of
 		{error,Reason} ->
@@ -932,12 +903,9 @@ bc_with_r12_gl(Config) when is_list(Config) ->
 	    {skip,"No R12B found"}
     end.
 
-bc_with_r12_ogl(suite) ->
-    [];
-bc_with_r12_ogl(doc) ->
-    ["Test io protocol compatibility with R12 nodes (oldshell)"];
+%% Test io protocol compatibility with R12 nodes (oldshell).
 bc_with_r12_ogl(Config) when is_list(Config) ->
-    case ?t:is_release_available("r12b") of
+    case test_server:is_release_available("r12b") of
 	true -> 
 	    case  get_progs() of
 		{error,Reason} ->
@@ -952,8 +920,9 @@ bc_with_r12_ogl(Config) when is_list(Config) ->
 bc_with_r12_gl_1(_Config,Machine) ->
     PA = filename:dirname(code:which(?MODULE)),
     Name1 = io_proto_r12_gl_1,
-    ?line N1 = list_to_atom(atom_to_list(Name1) ++ "@" ++ hostname()),
-    ?line ?t:start_node(Name1, peer, [{args, "-pz \""++PA++"\""},{erl,[{release,"r12b"}]}]),
+    N1 = list_to_atom(atom_to_list(Name1) ++ "@" ++ hostname()),
+    test_server:start_node(Name1, peer, [{args, "-pz \""++PA++"\""},
+					 {erl,[{release,"r12b"}]}]),
     TestDataLine1 = [229,228,246],
     TestDataLine1BinUtf = unicode:characters_to_binary(TestDataLine1),
     TestDataLine1BinLatin = list_to_binary(TestDataLine1),
@@ -963,141 +932,141 @@ bc_with_r12_gl_1(_Config,Machine) ->
     register(io_proto_suite,self()),
     AM1 = spawn(?MODULE,Machine,
 		[MyNodeList, "io_proto_suite", N2List]),
-    
-    ?line GL = receive X when is_pid(X) -> X end,
+
+    GL = receive X when is_pid(X) -> X end,
     %% get_line
-    ?line "Hej\n" = rpc:call(N1,io,get_line,[GL,"Prompt\n"]),
-    ?line io:setopts(GL,[binary]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line <<"Hej\n">> = rpc:call(N1,io,get_line,[GL,"Prompt\n"]),
-    ?line io:setopts(GL,[{encoding,latin1}]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinLatin = chomp(rpc:call(N1,io,get_line,[GL,"Prompt\n"])),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinUtf = chomp(io:get_line(GL,"Prompt\n")),
-    ?line io:setopts(GL,[{encoding,unicode}]),
-    
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinLatin = chomp(rpc:call(N1,io,get_line,[GL,"Prompt\n"])),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinUtf = chomp(io:get_line(GL,"Prompt\n")),
-    ?line io:setopts(GL,[list]),
-    ?line io:format(GL,"Okej~n",[]),
-    
+    "Hej\n" = rpc:call(N1,io,get_line,[GL,"Prompt\n"]),
+    io:setopts(GL,[binary]),
+    io:format(GL,"Okej~n",[]),
+    <<"Hej\n">> = rpc:call(N1,io,get_line,[GL,"Prompt\n"]),
+    io:setopts(GL,[{encoding,latin1}]),
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinLatin = chomp(rpc:call(N1,io,get_line,[GL,"Prompt\n"])),
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinUtf = chomp(io:get_line(GL,"Prompt\n")),
+    io:setopts(GL,[{encoding,unicode}]),
+
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinLatin = chomp(rpc:call(N1,io,get_line,[GL,"Prompt\n"])),
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinUtf = chomp(io:get_line(GL,"Prompt\n")),
+    io:setopts(GL,[list]),
+    io:format(GL,"Okej~n",[]),
+
     %%get_chars
-    ?line "Hej" = rpc:call(N1,io,get_chars,[GL,"Prompt\n",3]),
-    ?line io:setopts(GL,[binary]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line <<"Hej">> = rpc:call(N1,io,get_chars,[GL,"Prompt\n",3]),
-    ?line io:setopts(GL,[{encoding,latin1}]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinLatin = rpc:call(N1,io,get_chars,[GL,"Prompt\n",3]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinUtf = io:get_chars(GL,"Prompt\n",3),
-    ?line io:setopts(GL,[{encoding,unicode}]),
-    
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinLatin = rpc:call(N1,io,get_chars,[GL,"Prompt\n",3]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinUtf = io:get_chars(GL,"Prompt\n",3),
-    ?line io:setopts(GL,[list]),
-    ?line io:format(GL,"Okej~n",[]),
+    "Hej" = rpc:call(N1,io,get_chars,[GL,"Prompt\n",3]),
+    io:setopts(GL,[binary]),
+    io:format(GL,"Okej~n",[]),
+    <<"Hej">> = rpc:call(N1,io,get_chars,[GL,"Prompt\n",3]),
+    io:setopts(GL,[{encoding,latin1}]),
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinLatin = rpc:call(N1,io,get_chars,[GL,"Prompt\n",3]),
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinUtf = io:get_chars(GL,"Prompt\n",3),
+    io:setopts(GL,[{encoding,unicode}]),
+
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinLatin = rpc:call(N1,io,get_chars,[GL,"Prompt\n",3]),
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinUtf = io:get_chars(GL,"Prompt\n",3),
+    io:setopts(GL,[list]),
+    io:format(GL,"Okej~n",[]),
     %%fread
-    ?line {ok,["Hej"]} = rpc:call(N1,io,fread,[GL,"Prompt\n","~s"]),
-    ?line io:setopts(GL,[binary]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line {ok,["Hej"]} = rpc:call(N1,io,fread,[GL,"Prompt\n","~s"]),
-    ?line io:setopts(GL,[{encoding,latin1}]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line {ok,[TestDataLine1]} = rpc:call(N1,io,fread,[GL,"Prompt\n","~s"]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line {ok,[TestDataLine1]} = io:fread(GL,"Prompt\n","~s"),
-    ?line io:setopts(GL,[{encoding,unicode}]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line {ok,[TestDataLine1]} = rpc:call(N1,io,fread,[GL,"Prompt\n","~s"]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line {ok,[TestDataLine1]} = io:fread(GL,"Prompt\n","~s"),
-    ?line io:setopts(GL,[list]),
-    ?line io:format(GL,"Okej~n",[]),
-    
-
-    ?line receive
-	      {AM1,done} ->
-		  ok
-	  after 5000 ->
-		  exit(timeout)
-	  end,
-    ?t:stop_node(N1),
+    {ok,["Hej"]} = rpc:call(N1,io,fread,[GL,"Prompt\n","~s"]),
+    io:setopts(GL,[binary]),
+    io:format(GL,"Okej~n",[]),
+    {ok,["Hej"]} = rpc:call(N1,io,fread,[GL,"Prompt\n","~s"]),
+    io:setopts(GL,[{encoding,latin1}]),
+    io:format(GL,"Okej~n",[]),
+    {ok,[TestDataLine1]} = rpc:call(N1,io,fread,[GL,"Prompt\n","~s"]),
+    io:format(GL,"Okej~n",[]),
+    {ok,[TestDataLine1]} = io:fread(GL,"Prompt\n","~s"),
+    io:setopts(GL,[{encoding,unicode}]),
+    io:format(GL,"Okej~n",[]),
+    {ok,[TestDataLine1]} = rpc:call(N1,io,fread,[GL,"Prompt\n","~s"]),
+    io:format(GL,"Okej~n",[]),
+    {ok,[TestDataLine1]} = io:fread(GL,"Prompt\n","~s"),
+    io:setopts(GL,[list]),
+    io:format(GL,"Okej~n",[]),
+
+
+    receive
+	{AM1,done} ->
+	    ok
+    after 5000 ->
+	    exit(timeout)
+    end,
+    test_server:stop_node(N1),
     ok.
- 
+
 
 answering_machine1(OthNode,OthReg,Me) ->
     TestDataLine1 = [229,228,246],
     TestDataUtf = binary_to_list(unicode:characters_to_binary(TestDataLine1)),
-    ?line rtnode([{putline,""},
-		  {putline, "2."},
-		  {getline, "2"},
-		  {putline, "{"++OthReg++","++OthNode++"} ! group_leader()."},
-		  {getline, "<"},
-		  % get_line
-		  {getline_re, ".*Prompt"},
-		  {putline, "Hej"},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, "Hej"},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataLine1},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataLine1},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataUtf},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataUtf},
-		  {getline_re, ".*Okej"},
-		  % get_chars
-		  {getline_re, ".*Prompt"},
-		  {putline, "Hej"},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, "Hej"},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataLine1},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataLine1},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataUtf},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataUtf},
-		  {getline_re, ".*Okej"},
-		  % fread
-		  {getline_re, ".*Prompt"},
-		  {putline, "Hej"},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, "Hej"},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataLine1},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataLine1},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataUtf},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataUtf},
-		  {getline_re, ".*Okej"}
-		  
-		 ],Me,"LC_CTYPE=\""++get_lc_ctype()++"\"; export LC_CTYPE; "),
+    rtnode([{putline,""},
+	    {putline, "2."},
+	    {getline, "2"},
+	    {putline, "{"++OthReg++","++OthNode++"} ! group_leader()."},
+	    {getline, "<"},
+	    %% get_line
+	    {getline_re, ".*Prompt"},
+	    {putline, "Hej"},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, "Hej"},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataLine1},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataLine1},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataUtf},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataUtf},
+	    {getline_re, ".*Okej"},
+	    %% get_chars
+	    {getline_re, ".*Prompt"},
+	    {putline, "Hej"},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, "Hej"},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataLine1},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataLine1},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataUtf},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataUtf},
+	    {getline_re, ".*Okej"},
+	    %% fread
+	    {getline_re, ".*Prompt"},
+	    {putline, "Hej"},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, "Hej"},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataLine1},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataLine1},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataUtf},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataUtf},
+	    {getline_re, ".*Okej"}
+
+	   ],Me,"LC_CTYPE=\""++get_lc_ctype()++"\"; export LC_CTYPE; "),
     O = list_to_atom(OthReg),
     O ! {self(),done},
     ok.
@@ -1105,79 +1074,76 @@ answering_machine1(OthNode,OthReg,Me) ->
 answering_machine2(OthNode,OthReg,Me) ->
     TestDataLine1 = [229,228,246],
     TestDataUtf = binary_to_list(unicode:characters_to_binary(TestDataLine1)),
-    ?line rtnode([{putline,""},
-		  {putline, "2."},
-		  {getline, "2"},
-		  {putline, "{"++OthReg++","++OthNode++"} ! group_leader()."},
-		  {getline_re, ".*<[0-9].*"},
-		  % get_line
-		  {getline_re, ".*Prompt"},
-		  {putline, "Hej"},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, "Hej"},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataLine1},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataLine1},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataUtf},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataUtf},
-		  {getline_re, ".*Okej"},
-		  % get_chars
-		  {getline_re, ".*Prompt"},
-		  {putline, "Hej"},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, "Hej"},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataLine1},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataLine1},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataUtf},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataUtf},
-		  {getline_re, ".*Okej"},
-		  % fread
-		  {getline_re, ".*Prompt"},
-		  {putline, "Hej"},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, "Hej"},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataLine1},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataLine1},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataUtf},
-		  {getline_re, ".*Okej"},
-		  {getline_re, ".*Prompt"},
-		  {putline, TestDataUtf},
-		  {getline_re, ".*Okej"}
-		  
-		 ],Me,"LC_CTYPE=\""++get_lc_ctype()++"\"; export LC_CTYPE; "," -oldshell "),
+    rtnode([{putline,""},
+	    {putline, "2."},
+	    {getline, "2"},
+	    {putline, "{"++OthReg++","++OthNode++"} ! group_leader()."},
+	    {getline_re, ".*<[0-9].*"},
+	    %% get_line
+	    {getline_re, ".*Prompt"},
+	    {putline, "Hej"},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, "Hej"},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataLine1},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataLine1},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataUtf},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataUtf},
+	    {getline_re, ".*Okej"},
+	    %% get_chars
+	    {getline_re, ".*Prompt"},
+	    {putline, "Hej"},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, "Hej"},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataLine1},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataLine1},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataUtf},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataUtf},
+	    {getline_re, ".*Okej"},
+	    %% fread
+	    {getline_re, ".*Prompt"},
+	    {putline, "Hej"},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, "Hej"},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataLine1},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataLine1},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataUtf},
+	    {getline_re, ".*Okej"},
+	    {getline_re, ".*Prompt"},
+	    {putline, TestDataUtf},
+	    {getline_re, ".*Okej"}
+
+	   ],Me,"LC_CTYPE=\""++get_lc_ctype()++"\"; export LC_CTYPE; "," -oldshell "),
     O = list_to_atom(OthReg),
     O ! {self(),done},
     ok.
-    
 
-read_modes_ogl(suite) ->
-    [];
-read_modes_ogl(doc) ->
-    ["Test various modes when reading from the group leade from another machine"];
+
+%% Test various modes when reading from the group leade from another machine.
 read_modes_ogl(Config) when is_list(Config) -> 
     case get_progs() of
 	{error,Reason} ->
@@ -1186,10 +1152,7 @@ read_modes_ogl(Config) when is_list(Config) ->
 	    read_modes_gl_1(Config,answering_machine2)
     end.
 
-read_modes_gl(suite) ->
-    [];
-read_modes_gl(doc) ->
-    ["Test various modes when reading from the group leade from another machine"];
+%% Test various modes when reading from the group leade from another machine.
 read_modes_gl(Config) when is_list(Config) -> 
     case {get_progs(),proplists:get_value(default_shell,Config)} of
 	{{error,Reason},_} ->
@@ -1210,81 +1173,78 @@ read_modes_gl_1(_Config,Machine) ->
     register(io_proto_suite,self()),
     AM1 = spawn(?MODULE,Machine,
 		[MyNodeList, "io_proto_suite", N2List]),
-    
-    ?line GL = receive X when is_pid(X) -> X end,
+
+    GL = receive X when is_pid(X) -> X end,
     ?dbg({group_leader,X}),
     %% get_line
-    ?line receive after 500 -> ok end, % Dont clash with the new shell...
-    ?line "Hej\n" = io:get_line(GL,"Prompt\n"),
-    ?line io:setopts(GL,[binary]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line <<"Hej\n">> = io:get_line(GL,"Prompt\n"),
-    ?line io:setopts(GL,[{encoding,latin1}]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinLatin = chomp(io:request(GL,{get_line,latin1,"Prompt\n"})),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinUtf = chomp(io:get_line(GL,"Prompt\n")),
-    ?line io:setopts(GL,[{encoding,unicode}]),
-    
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinLatin = chomp(io:request(GL,{get_line,latin1,"Prompt\n"})),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinUtf = chomp(io:get_line(GL,"Prompt\n")),
-    ?line io:setopts(GL,[list]),
-    ?line io:format(GL,"Okej~n",[]),
-    
+    receive after 500 -> ok end, % Dont clash with the new shell...
+    "Hej\n" = io:get_line(GL,"Prompt\n"),
+    io:setopts(GL,[binary]),
+    io:format(GL,"Okej~n",[]),
+    <<"Hej\n">> = io:get_line(GL,"Prompt\n"),
+    io:setopts(GL,[{encoding,latin1}]),
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinLatin = chomp(io:request(GL,{get_line,latin1,"Prompt\n"})),
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinUtf = chomp(io:get_line(GL,"Prompt\n")),
+    io:setopts(GL,[{encoding,unicode}]),
+
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinLatin = chomp(io:request(GL,{get_line,latin1,"Prompt\n"})),
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinUtf = chomp(io:get_line(GL,"Prompt\n")),
+    io:setopts(GL,[list]),
+    io:format(GL,"Okej~n",[]),
+
     %%get_chars
-    ?line "Hej" = io:get_chars(GL,"Prompt\n",3),
-    ?line io:setopts(GL,[binary]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line <<"Hej">> = io:get_chars(GL,"Prompt\n",3),
-    ?line io:setopts(GL,[{encoding,latin1}]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinLatin = io:request(GL,{get_chars,latin1,"Prompt\n",3}),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinUtf = io:get_chars(GL,"Prompt\n",3),
-    ?line io:setopts(GL,[{encoding,unicode}]),
-    
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinLatin = io:request(GL,{get_chars,latin1,"Prompt\n",3}),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line TestDataLine1BinUtf = io:get_chars(GL,"Prompt\n",3),
-    ?line io:setopts(GL,[list]),
-    ?line io:format(GL,"Okej~n",[]),
+    "Hej" = io:get_chars(GL,"Prompt\n",3),
+    io:setopts(GL,[binary]),
+    io:format(GL,"Okej~n",[]),
+    <<"Hej">> = io:get_chars(GL,"Prompt\n",3),
+    io:setopts(GL,[{encoding,latin1}]),
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinLatin = io:request(GL,{get_chars,latin1,"Prompt\n",3}),
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinUtf = io:get_chars(GL,"Prompt\n",3),
+    io:setopts(GL,[{encoding,unicode}]),
+
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinLatin = io:request(GL,{get_chars,latin1,"Prompt\n",3}),
+    io:format(GL,"Okej~n",[]),
+    TestDataLine1BinUtf = io:get_chars(GL,"Prompt\n",3),
+    io:setopts(GL,[list]),
+    io:format(GL,"Okej~n",[]),
     %%fread
-    ?line {ok,["Hej"]} = io:fread(GL,"Prompt\n","~s"),
-    ?line io:setopts(GL,[binary]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line {ok,["Hej"]} = io:fread(GL,"Prompt\n","~s"),
-    ?line io:setopts(GL,[{encoding,latin1}]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line {ok,[TestDataLine1]} = io:fread(GL,"Prompt\n","~s"),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line {ok,[TestDataLine1]} = io:fread(GL,"Prompt\n","~s"),
-    ?line io:setopts(GL,[{encoding,unicode}]),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line {ok,[TestDataLine1]} = io:fread(GL,"Prompt\n","~s"),
-    ?line io:format(GL,"Okej~n",[]),
-    ?line {ok,[TestDataLine1]} = io:fread(GL,"Prompt\n","~s"),
-    ?line io:setopts(GL,[list]),
-    ?line io:format(GL,"Okej~n",[]),
-    
-
-    ?line receive
-	      {AM1,done} ->
-		  ok
-	  after 5000 ->
-		  exit(timeout)
-	  end,
+    {ok,["Hej"]} = io:fread(GL,"Prompt\n","~s"),
+    io:setopts(GL,[binary]),
+    io:format(GL,"Okej~n",[]),
+    {ok,["Hej"]} = io:fread(GL,"Prompt\n","~s"),
+    io:setopts(GL,[{encoding,latin1}]),
+    io:format(GL,"Okej~n",[]),
+    {ok,[TestDataLine1]} = io:fread(GL,"Prompt\n","~s"),
+    io:format(GL,"Okej~n",[]),
+    {ok,[TestDataLine1]} = io:fread(GL,"Prompt\n","~s"),
+    io:setopts(GL,[{encoding,unicode}]),
+    io:format(GL,"Okej~n",[]),
+    {ok,[TestDataLine1]} = io:fread(GL,"Prompt\n","~s"),
+    io:format(GL,"Okej~n",[]),
+    {ok,[TestDataLine1]} = io:fread(GL,"Prompt\n","~s"),
+    io:setopts(GL,[list]),
+    io:format(GL,"Okej~n",[]),
+
+
+    receive
+	{AM1,done} ->
+	    ok
+    after 5000 ->
+	    exit(timeout)
+    end,
     ok.
 
 
-broken_unicode(suite) ->
-    [];
-broken_unicode(doc) ->
-    ["Test behaviour when reading broken Unicode files"];
+%% Test behaviour when reading broken Unicode files
 broken_unicode(Config) when is_list(Config) ->
-    Dir = ?config(priv_dir,Config),
+    Dir = proplists:get_value(priv_dir,Config),
     Latin1Name = filename:join([Dir,"latin1_data_file.dat"]),
     Utf8Name = filename:join([Dir,"utf8_data_file.dat"]),
     Latin1Data = iolist_to_binary(lists:duplicate(10,lists:seq(0,255)++[255,255,255])),
@@ -1292,10 +1252,10 @@ broken_unicode(Config) when is_list(Config) ->
 		 lists:duplicate(10,lists:seq(0,255))),
     file:write_file(Latin1Name,Latin1Data),
     file:write_file(Utf8Name,Utf8Data),
-    ?line [ latin1 = heuristic_encoding_file2(Latin1Name,N,utf8) || N <- lists:seq(1,100)++[1024,2048,10000]],
-    ?line [ utf8 = heuristic_encoding_file2(Utf8Name,N,utf8) || N <- lists:seq(1,100)++[1024,2048,10000]],
-    ?line [ latin1 = heuristic_encoding_file2(Latin1Name,N,utf16) || N <- lists:seq(1,100)++[1024,2048,10000]],
-    ?line [ latin1 = heuristic_encoding_file2(Latin1Name,N,utf32) || N <- lists:seq(1,100)++[1024,2048,10000]],
+    [ latin1 = heuristic_encoding_file2(Latin1Name,N,utf8) || N <- lists:seq(1,100)++[1024,2048,10000]],
+    [ utf8 = heuristic_encoding_file2(Utf8Name,N,utf8) || N <- lists:seq(1,100)++[1024,2048,10000]],
+    [ latin1 = heuristic_encoding_file2(Latin1Name,N,utf16) || N <- lists:seq(1,100)++[1024,2048,10000]],
+    [ latin1 = heuristic_encoding_file2(Latin1Name,N,utf32) || N <- lists:seq(1,100)++[1024,2048,10000]],
     ok.
 
 
@@ -1314,10 +1274,7 @@ loop_through_file2(F,Bin,Chunk,Enc) when is_binary(Bin) ->
 
 
 
-eof_on_pipe(suite) ->
-    [];
-eof_on_pipe(doc) ->
-    ["tests eof before newline on stdin when erlang is in pipe"];
+%% Test eof before newline on stdin when erlang is in pipe.
 eof_on_pipe(Config) when is_list(Config) ->
     case {get_progs(),os:type()} of
 	{{error,Reason},_} ->
@@ -1337,10 +1294,10 @@ eof_on_pipe(Config) when is_list(Config) ->
 				   end
 			   end,
 		CommandLine1 = EchoLine ++
-		"\""++Erl++"\" -noshell -eval  "
-		"'io:format(\"~p\",[io:get_line(\"\")]),"
-		"io:format(\"~p\",[io:get_line(\"\")]),"
-		"io:format(\"~p\",[io:get_line(\"\")]).' -run init stop",
+		    "\""++Erl++"\" -noshell -eval  "
+		    "'io:format(\"~p\",[io:get_line(\"\")]),"
+		    "io:format(\"~p\",[io:get_line(\"\")]),"
+		    "io:format(\"~p\",[io:get_line(\"\")]).' -run init stop",
 		case os:cmd(CommandLine1) of
 		    "\"a\\n\"\"bu\"eof" ->
 			ok;
@@ -1348,10 +1305,10 @@ eof_on_pipe(Config) when is_list(Config) ->
 			exit({unexpected1,Other1})
 		end,
 		CommandLine2 = EchoLine ++
-		"\""++Erl++"\" -noshell -eval  "
-		"'io:setopts([binary]),io:format(\"~p\",[io:get_line(\"\")]),"
-		"io:format(\"~p\",[io:get_line(\"\")]),"
-		"io:format(\"~p\",[io:get_line(\"\")]).' -run init stop",
+		    "\""++Erl++"\" -noshell -eval  "
+		    "'io:setopts([binary]),io:format(\"~p\",[io:get_line(\"\")]),"
+		    "io:format(\"~p\",[io:get_line(\"\")]),"
+		    "io:format(\"~p\",[io:get_line(\"\")]).' -run init stop",
 		case os:cmd(CommandLine2) of
 		    "<<\"a\\n\">><<\"bu\">>eof" ->
 			ok;
@@ -1360,12 +1317,12 @@ eof_on_pipe(Config) when is_list(Config) ->
 		end
 	    catch
 		throw:skip ->
-		     {skipped,"unsupported echo program"}
+		    {skipped,"unsupported echo program"}
 	    end;
 	{_,_} ->
 	    {skipped,"Only on linux"}
     end.
-    
+
 
 %%
 %% Tool for running interactive shell (stolen from the kernel
@@ -1435,16 +1392,16 @@ timeout(normal) ->
 -ifndef(debug).
 rm_rf(Dir) ->
     try
-      {ok,List} = file:list_dir(Dir),
-      Files = [filename:join([Dir,X]) || X <- List],
-      [case file:list_dir(Y) of
-	   {error, enotdir} ->
-	       ok = file:delete(Y);
-	   _ ->
-	       ok = rm_rf(Y)
-       end || Y <- Files],
-       ok = file:del_dir(Dir),
-       ok
+	{ok,List} = file:list_dir(Dir),
+	Files = [filename:join([Dir,X]) || X <- List],
+	[case file:list_dir(Y) of
+	     {error, enotdir} ->
+		 ok = file:delete(Y);
+	     _ ->
+		 ok = rm_rf(Y)
+	 end || Y <- Files],
+	ok = file:del_dir(Dir),
+	ok
     catch
 	_:Exception -> {error, {Exception,Dir}}
     end.
@@ -1509,7 +1466,7 @@ get_and_put(CPid, [{putline_raw, Line}|T],N) ->
     Timeout = timeout(normal),
     receive
 	{send_line, ok} ->
-	     get_and_put(CPid, T,N+1)
+	    get_and_put(CPid, T,N+1)
     after Timeout ->
 	    error_logger:error_msg("~p: putline_raw timeout (~p) sending "
 				   "\"~s\" (command number ~p)~n",
@@ -1523,7 +1480,7 @@ get_and_put(CPid, [{putline, Line}|T],N) ->
     Timeout = timeout(normal),
     receive
 	{send_line, ok} ->
-	     get_and_put(CPid, [{getline, []}|T],N)
+	    get_and_put(CPid, [{getline, []}|T],N)
     after Timeout ->
 	    error_logger:error_msg("~p: putline timeout (~p) sending "
 				   "\"~s\" (command number ~p)~n[~p]~n",
@@ -1540,8 +1497,8 @@ wait_for_runerl_server(SPid) ->
     after Timeout ->
 	    {error, timeout}
     end.
-	
-    
+
+
 
 stop_runerl_node(CPid) ->
     Ref = erlang:monitor(process, CPid),
@@ -1592,11 +1549,11 @@ create_tempdir(Dir,X) when X > $Z, X < $a ->
     create_tempdir(Dir,$a);
 create_tempdir(Dir,X) when X > $z -> 
     Estr = lists:flatten(
-		     io_lib:format("Unable to create ~s, reason eexist",
-				   [Dir++[$z]])),
+	     io_lib:format("Unable to create ~s, reason eexist",
+			   [Dir++[$z]])),
     {error, Estr};
 create_tempdir(Dir0, Ch) ->
-    % Expect fairly standard unix.
+    %% Expect fairly standard unix.
     Dir = Dir0++[Ch],
     case file:make_dir(Dir) of
 	{error, eexist} ->
@@ -1634,8 +1591,8 @@ start_runerl_node(RunErl,Erl,Tempdir,Nodename,Extra) ->
 		   [];
 	       _ ->
 		   " -sname "++(if is_atom(Nodename) -> atom_to_list(Nodename);
-				  true -> Nodename 
-			       end)++
+				   true -> Nodename
+				end)++
 		       " -setcookie "++atom_to_list(erlang:get_cookie())
 	   end,
     XXArg = case Extra of
@@ -1646,9 +1603,9 @@ start_runerl_node(RunErl,Erl,Tempdir,Nodename,Extra) ->
 	    end,
     spawn(fun() ->
 		  ?dbg("\""++RunErl++"\" "++Tempdir++"/ "++Tempdir++
-		       " \""++Erl++XArg++XXArg++"\""),
+			   " \""++Erl++XArg++XXArg++"\""),
 		  os:cmd("\""++RunErl++"\" "++Tempdir++"/ "++Tempdir++
-			 " \""++Erl++XArg++XXArg++"\"")
+			     " \""++Erl++XArg++XXArg++"\"")
 	  end).
 
 start_toerl_server(ToErl,Tempdir) ->
@@ -1706,7 +1663,7 @@ toerl_loop(Port,Acc) ->
 		_ ->
 		    toerl_loop(Port,[{Tag0,Data}|Acc])
 	    end;
-	 {Pid,{get_line,Timeout}} ->
+	{Pid,{get_line,Timeout}} ->
 	    case Acc of
 		[] ->
 		    case get_data_within(Port,Timeout,[]) of
@@ -1755,10 +1712,10 @@ toerl_loop(Port,Acc) ->
 	Other ->
 	    {error, {unexpected, Other}}
     end.
-	
+
 millistamp() ->
     erlang:monotonic_time(milli_seconds).
-    
+
 get_data_within(Port, X, Acc) when X =< 0 ->
     ?dbg({get_data_within, X, Acc, ?LINE}),
     receive
@@ -1877,8 +1834,8 @@ request({get_until, Encoding, Prompt, M, F, As}, State) ->
     {ok, convert(State#state.nxt, Encoding, State#state.mode), State#state{nxt = eof, q = [{get_until, Encoding, Prompt, M, F, As} | State#state.q]}};
 request({get_chars, Encoding, Prompt, N}, State) ->
     {ok, convert(State#state.nxt, Encoding, State#state.mode), State#state{nxt = eof, 
-				      q = [{get_chars, Encoding, Prompt, N} | 
-					   State#state.q]}};
+									   q = [{get_chars, Encoding, Prompt, N} |
+										State#state.q]}};
 request({get_line, Encoding, Prompt}, State) ->
     {ok, convert(State#state.nxt, Encoding, State#state.mode), 
      State#state{nxt = eof, 
@@ -1910,7 +1867,7 @@ request(getopts, State) ->
 	     binary -> [{binary, true}]
 	 end, State#state{q=[getopts | State#state.q ]}};
 request({requests, Reqs}, State) ->
-     multi_request(Reqs, {ok, ok, State}).
+    multi_request(Reqs, {ok, ok, State}).
 
 multi_request([R|Rs], {ok, _Res, State}) ->
     multi_request(Rs, request(R, State));
@@ -1941,7 +1898,7 @@ convert(Data, latin1, binary) ->
 	_ ->
 	    {error, {cannot_convert, unicode, latin1}}
     end.
-	
+
 hostname() ->
     from($@, atom_to_list(node())).
 
diff --git a/lib/stdlib/test/lists_SUITE.erl b/lib/stdlib/test/lists_SUITE.erl
index a0f7fd2744..b21eb37ee3 100644
--- a/lib/stdlib/test/lists_SUITE.erl
+++ b/lib/stdlib/test/lists_SUITE.erl
@@ -22,26 +22,20 @@
 %%%-----------------------------------------------------------------
 
 -module(lists_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-
-% Default timetrap timeout (set in init_per_testcase).
-% This should be set relatively high (10-15 times the expected
-% max testcasetime).
--define(default_timeout, ?t:minutes(4)).
-
-% Test server specific exports
+%% 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([init_per_testcase/2, end_per_testcase/2]).
 
-% Test cases must be exported.
+%% Test cases must be exported.
 -export([member/1, reverse/1,
 	 keymember/1, keysearch_keyfind/1,
          keystore/1, keytake/1, keyreplace/1,
 	 append_1/1, append_2/1,
 	 seq_loop/1, seq_2/1, seq_3/1, seq_2_e/1, seq_3_e/1,
-	
+
 	 sublist_2/1, sublist_3/1, sublist_2_e/1, sublist_3_e/1,
 	 flatten_1/1, flatten_2/1, flatten_1_e/1, flatten_2_e/1,
 	 dropwhile/1, takewhile/1,
@@ -78,7 +72,9 @@
 %%
 %% all/1
 %%
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,4}}].
 
 all() -> 
     [{group, append},
@@ -141,58 +137,48 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-%
-% Test cases starts here.
-%
+%%
+%% Test cases starts here.
+%%
 
-append_1(doc) ->   [];
-append_1(suite) -> [];
 append_1(Config) when is_list(Config) ->
-    ?line "abcdef"=lists:append(["abc","def"]),
-    ?line [hej, du,[glade, [bagare]]]=
+    "abcdef"=lists:append(["abc","def"]),
+    [hej, du,[glade, [bagare]]]=
 	lists:append([[hej], [du], [[glade, [bagare]]]]),
-    ?line [10, [elem]]=lists:append([[10], [[elem]]]),
+    [10, [elem]]=lists:append([[10], [[elem]]]),
     ok.
 
-append_2(doc) ->   [];
-append_2(suite) -> [];
 append_2(Config) when is_list(Config) ->
-    ?line "abcdef"=lists:append("abc", "def"),
-    ?line [hej, du]=lists:append([hej], [du]),
-    ?line [10, [elem]]=lists:append([10], [[elem]]),
+    "abcdef"=lists:append("abc", "def"),
+    [hej, du]=lists:append([hej], [du]),
+    [10, [elem]]=lists:append([10], [[elem]]),
     ok.
 
-reverse(suite) ->
-    [];
-reverse(doc) ->
-    ["Tests the lists:reverse() implementation. The function is "
-     "`non-blocking', and only processes a fixed number of elements "
-     "at a time."];
+%% Tests the lists:reverse() implementation. The function is
+%% `non-blocking', and only processes a fixed number of elements at a
+%% time.
 reverse(Config) when is_list(Config) ->
-    ?line reverse_test(0),
-    ?line reverse_test(1),
-    ?line reverse_test(2),
-    ?line reverse_test(128),
-    ?line reverse_test(256),
-    ?line reverse_test(1000),
-    ?line reverse_test(1998),
-    ?line reverse_test(1999),
-    ?line reverse_test(2000),
-    ?line reverse_test(2001),
-    ?line reverse_test(3998),
-    ?line reverse_test(3999),
-    ?line reverse_test(4000),
-    ?line reverse_test(4001),
-    ?line reverse_test(60001),
-    ?line reverse_test(100007),
+    reverse_test(0),
+    reverse_test(1),
+    reverse_test(2),
+    reverse_test(128),
+    reverse_test(256),
+    reverse_test(1000),
+    reverse_test(1998),
+    reverse_test(1999),
+    reverse_test(2000),
+    reverse_test(2001),
+    reverse_test(3998),
+    reverse_test(3999),
+    reverse_test(4000),
+    reverse_test(4001),
+    reverse_test(60001),
+    reverse_test(100007),
     ok.
 
 reverse_test(0) ->
@@ -210,27 +196,25 @@ reverse_test(Num) ->
     List0 = lists:reverse(List),
     ok.
 
-member(doc) ->
-    ["Tests the lists:member() implementation."
-     "This test case depends on lists:reverse() to work, "
-     "wich is tested in a separate test case."];
+%% Test the lists:member() implementation.  This test case depends on
+%% lists:reverse() to work, wich is tested in a separate test case.
 member(Config) when is_list(Config) ->
-    ?line {'EXIT',{badarg,_}} = (catch lists:member(45, {a,b,c})),
-    ?line {'EXIT',{badarg,_}} = (catch lists:member(45, [0|non_list_tail])),
-    ?line false = lists:member(4233, []),
-    ?line member_test(1),
-    ?line member_test(100),
-    ?line member_test(256),
-    ?line member_test(1000),
-    ?line member_test(1998),
-    ?line member_test(1999),
-    ?line member_test(2000),
-    ?line member_test(2001),
-    ?line member_test(3998),
-    ?line member_test(3999),
-    ?line member_test(4000),
-    ?line member_test(4001),
-    ?line member_test(100008),
+    {'EXIT',{badarg,_}} = (catch lists:member(45, {a,b,c})),
+    {'EXIT',{badarg,_}} = (catch lists:member(45, [0|non_list_tail])),
+    false = lists:member(4233, []),
+    member_test(1),
+    member_test(100),
+    member_test(256),
+    member_test(1000),
+    member_test(1998),
+    member_test(1999),
+    member_test(2000),
+    member_test(2001),
+    member_test(3998),
+    member_test(3999),
+    member_test(4000),
+    member_test(4001),
+    member_test(100008),
     ok.
 
 member_test(Num) ->
@@ -246,78 +230,78 @@ member_test(Num) ->
     false = lists:member({a,b,c}, List).
 
 keymember(Config) when is_list(Config) ->
-    ?line false = lists:keymember(anything_goes, 1, []),
-    ?line {'EXIT',{badarg,_}} = (catch lists:keymember(anything_goes, -1, [])),
-    ?line {'EXIT',{badarg,_}} = (catch lists:keymember(anything_goes, 0, [])),
-    ?line {'EXIT',{badarg,_}} = (catch lists:keymember(anything_goes, 1, {1,2,3})),
+    false = lists:keymember(anything_goes, 1, []),
+    {'EXIT',{badarg,_}} = (catch lists:keymember(anything_goes, -1, [])),
+    {'EXIT',{badarg,_}} = (catch lists:keymember(anything_goes, 0, [])),
+    {'EXIT',{badarg,_}} = (catch lists:keymember(anything_goes, 1, {1,2,3})),
     List = [{52.0,a},{-19,b,c},{37.5,d},an_atom,42.0,{39},{45,{x,y,z}}],
 
-    ?line false = lists:keymember(333, 5, List),
-    ?line false = lists:keymember(333, 999, List),
-    ?line false = lists:keymember(37, 1, List),
-
-    ?line true = lists:keymember(52.0, 1, List),
-    ?line true = lists:keymember(52, 1, List),
-    ?line true = lists:keymember(-19, 1, List),
-    ?line true = lists:keymember(-19.0, 1, List),
-    ?line true = lists:keymember(37.5, 1, List),
-    ?line true = lists:keymember(39, 1, List),
-    ?line true = lists:keymember(39.0, 1, List),
-    ?line true = lists:keymember(45, 1, List),
-    ?line true = lists:keymember(45.0, 1, List),
-
-    ?line true = lists:keymember(a, 2, List),
-    ?line true = lists:keymember(b, 2, List),
-    ?line true = lists:keymember(c, 3, List),
-    ?line true = lists:keymember(d, 2, List),
-    ?line true = lists:keymember({x,y,z}, 2, List),
-
-    ?line Long0 = lists:seq(1, 100007),
-    ?line false = lists:keymember(kalle, 1, Long0),
-    ?line Long = lists:foldl(fun(E, A) -> [{1/E,E}|A] end, [], Long0),
-    ?line true = lists:keymember(1, 2, Long),
-    ?line true = lists:keymember(2, 2, Long),
-    ?line true = lists:keymember(1.0, 2, Long),
-    ?line true = lists:keymember(2.0, 2, Long),
-    ?line true = lists:keymember(100006, 2, Long),
+    false = lists:keymember(333, 5, List),
+    false = lists:keymember(333, 999, List),
+    false = lists:keymember(37, 1, List),
+
+    true = lists:keymember(52.0, 1, List),
+    true = lists:keymember(52, 1, List),
+    true = lists:keymember(-19, 1, List),
+    true = lists:keymember(-19.0, 1, List),
+    true = lists:keymember(37.5, 1, List),
+    true = lists:keymember(39, 1, List),
+    true = lists:keymember(39.0, 1, List),
+    true = lists:keymember(45, 1, List),
+    true = lists:keymember(45.0, 1, List),
+
+    true = lists:keymember(a, 2, List),
+    true = lists:keymember(b, 2, List),
+    true = lists:keymember(c, 3, List),
+    true = lists:keymember(d, 2, List),
+    true = lists:keymember({x,y,z}, 2, List),
+
+    Long0 = lists:seq(1, 100007),
+    false = lists:keymember(kalle, 1, Long0),
+    Long = lists:foldl(fun(E, A) -> [{1/E,E}|A] end, [], Long0),
+    true = lists:keymember(1, 2, Long),
+    true = lists:keymember(2, 2, Long),
+    true = lists:keymember(1.0, 2, Long),
+    true = lists:keymember(2.0, 2, Long),
+    true = lists:keymember(100006, 2, Long),
     ok.
 
 keysearch_keyfind(Config) when is_list(Config) ->
-    ?line false = key_search_find(anything_goes, 1, []),
-    ?line {'EXIT',{badarg,_}} = (catch key_search_find(anything_goes, -1, [])),
-    ?line {'EXIT',{badarg,_}} = (catch key_search_find(anything_goes, 0, [])),
-    ?line {'EXIT',{badarg,_}} = (catch key_search_find(anything_goes, 1, {1,2,3})),
+    false = key_search_find(anything_goes, 1, []),
+    {'EXIT',{badarg,_}} = (catch key_search_find(anything_goes, -1, [])),
+    {'EXIT',{badarg,_}} = (catch key_search_find(anything_goes, 0, [])),
+    {'EXIT',{badarg,_}} = (catch key_search_find(anything_goes, 1, {1,2,3})),
 
     First = {x,42.0},
     Second = {y,-77},
     Third = {z,[a,b,c],{5.0}},
     List = [First,Second,Third],
-    
-    ?line false = key_search_find(333, 1, []),
-    ?line false = key_search_find(333, 5, List),
-    ?line false = key_search_find(333, 999, List),
-    ?line false = key_search_find(37, 1, List),
-
-    ?line {value,First} = key_search_find(42, 2, List),
-    ?line {value,First} = key_search_find(42.0, 2, List),
-
-    ?line {value,Second} = key_search_find(-77, 2, List),
-    ?line {value,Second} = key_search_find(-77.0, 2, List),
-
-    ?line {value,Third} = key_search_find(z, 1, List),
-    ?line {value,Third} = key_search_find([a,b,c], 2, List),
-    ?line {value,Third} = key_search_find({5}, 3, List),
-    ?line {value,Third} = key_search_find({5.0}, 3, List),
-
-    ?line Long0 = lists:seq(1, 100007),
-    ?line false = key_search_find(kalle, 1, Long0),
-    ?line Long = lists:foldl(fun(E, A) -> [{1/E,float(E)}|A] end, [], Long0),
-    ?line {value,{_,1.0}} = key_search_find(1, 2, Long),
-    ?line {value,{_,1.0}} = key_search_find(1.0, 2, Long),
-    ?line {value,{_,2.0}} = key_search_find(2, 2, Long),
-    ?line {value,{_,2.0}} = key_search_find(2.0, 2, Long),
-    ?line {value,{_,33988.0}} = key_search_find(33988, 2, Long),
-    ?line {value,{_,33988.0}} = key_search_find(33988.0, 2, Long),
+
+    false = key_search_find(333, 1, []),
+    false = key_search_find(333, 5, List),
+    false = key_search_find(333, 999, List),
+    false = key_search_find(37, 1, List),
+
+    {value,First} = key_search_find(42, 2, List),
+    {value,First} = key_search_find(42.0, 2, List),
+
+    {value,Second} = key_search_find(-77, 2, List),
+    {value,Second} = key_search_find(-77.0, 2, List),
+
+    {value,Third} = key_search_find(z, 1, List),
+    {value,Third} = key_search_find([a,b,c], 2, List),
+    {value,Third} = key_search_find({5}, 3, List),
+    {value,Third} = key_search_find({5.0}, 3, List),
+
+    Long0 = lists:seq(1, 100007),
+    false = key_search_find(kalle, 1, Long0),
+    Long = lists:foldl(fun(E, A) -> [{1/E,float(E)}|A] end, [], Long0),
+    {value,{_,1.0}} = key_search_find(1, 2, Long),
+    {value,{_,1.0}} = key_search_find(1.0, 2, Long),
+    {value,{_,2.0}} = key_search_find(2, 2, Long),
+    {value,{_,2.0}} = key_search_find(2.0, 2, Long),
+    {value,{_,33988.0}} = key_search_find(33988, 2, Long),
+    {value,{_,33988.0}} = key_search_find(33988.0, 2, Long),
     ok.
 
 %% Test both lists:keysearch/3 and lists:keyfind/3. The only
@@ -333,29 +317,29 @@ key_search_find(Key, Pos, List) ->
     end.
 
 dropwhile(Config) when is_list(Config) ->
-    ?line F = fun(C) -> C =:= $@ end,
+    F = fun(C) -> C =:= $@ end,
 
-    ?line [] = lists:dropwhile(F, []),
-    ?line [a] = lists:dropwhile(F, [a]),
-    ?line [a,b] = lists:dropwhile(F, [a,b]),
-    ?line [a,b,c] = lists:dropwhile(F, [a,b,c]),
+    [] = lists:dropwhile(F, []),
+    [a] = lists:dropwhile(F, [a]),
+    [a,b] = lists:dropwhile(F, [a,b]),
+    [a,b,c] = lists:dropwhile(F, [a,b,c]),
 
-    ?line [] = lists:dropwhile(F, [$@]),
-    ?line [] = lists:dropwhile(F, [$@,$@]),
-    ?line [a,$@] = lists:dropwhile(F, [$@,a,$@]),
+    [] = lists:dropwhile(F, [$@]),
+    [] = lists:dropwhile(F, [$@,$@]),
+    [a,$@] = lists:dropwhile(F, [$@,a,$@]),
 
-    ?line [$k] = lists:dropwhile(F, [$@,$k]),
-    ?line [$k,$l] = lists:dropwhile(F, [$@,$@,$k,$l]),
-    ?line [a] = lists:dropwhile(F, [$@,$@,$@,a]),
+    [$k] = lists:dropwhile(F, [$@,$k]),
+    [$k,$l] = lists:dropwhile(F, [$@,$@,$k,$l]),
+    [a] = lists:dropwhile(F, [$@,$@,$@,a]),
 
-    ?line [a,$@,b] = lists:dropwhile(F, [$@,a,$@,b]),
-    ?line [a,$@,b] = lists:dropwhile(F, [$@,$@,a,$@,b]),
-    ?line [a,$@,b] = lists:dropwhile(F, [$@,$@,$@,a,$@,b]),
+    [a,$@,b] = lists:dropwhile(F, [$@,a,$@,b]),
+    [a,$@,b] = lists:dropwhile(F, [$@,$@,a,$@,b]),
+    [a,$@,b] = lists:dropwhile(F, [$@,$@,$@,a,$@,b]),
 
     Long = lists:seq(1, 1024),
     Shorter = lists:seq(800, 1024),
 
-    ?line Shorter = lists:dropwhile(fun(E) -> E < 800 end, Long),
+    Shorter = lists:dropwhile(fun(E) -> E < 800 end, Long),
 
     ok.
 
@@ -386,41 +370,35 @@ takewhile(Config) when is_list(Config) ->
 
     ok.
 
-keystore(doc) ->
-    ["OTP-XXX."];
-keystore(suite) -> [];
 keystore(Config) when is_list(Config) ->
-    ?line {'EXIT',_} = (catch lists:keystore(key, 0, [], {1})),
-    ?line {'EXIT',_} = (catch lists:keystore(key, 1, {}, {})),
-    ?line {'EXIT',_} = (catch lists:keystore(key, 1, {a,b}, {})),
-    ?line {'EXIT', _} = (catch lists:keystore(a, 2, [{1,a}], b)),
+    {'EXIT',_} = (catch lists:keystore(key, 0, [], {1})),
+    {'EXIT',_} = (catch lists:keystore(key, 1, {}, {})),
+    {'EXIT',_} = (catch lists:keystore(key, 1, {a,b}, {})),
+    {'EXIT', _} = (catch lists:keystore(a, 2, [{1,a}], b)),
     T = {k,17},
-    ?line [T] = lists:keystore(a, 2, [], T),
-    ?line [{1,a},{2,b},{k,17}] = lists:keystore(c, 2, [{1,a},{2,b}],T),
+    [T] = lists:keystore(a, 2, [], T),
+    [{1,a},{2,b},{k,17}] = lists:keystore(c, 2, [{1,a},{2,b}],T),
     L = [{1,a},{2,b},{3,c}],
-    ?line [{k,17},{2,b},{3,c}] = lists:keystore(a, 2, L, T),
-    ?line [{1,a},{k,17},{3,c}] = lists:keystore(b, 2, L, T),
-    ?line [{1,a},{2,b},{k,17}] = lists:keystore(c, 2, L, T),
-    ?line [{2,b}] = lists:keystore(a, 2, [{1,a}], {2,b}),
-    ?line [{1,a}] = lists:keystore(foo, 1, [], {1,a}),
+    [{k,17},{2,b},{3,c}] = lists:keystore(a, 2, L, T),
+    [{1,a},{k,17},{3,c}] = lists:keystore(b, 2, L, T),
+    [{1,a},{2,b},{k,17}] = lists:keystore(c, 2, L, T),
+    [{2,b}] = lists:keystore(a, 2, [{1,a}], {2,b}),
+    [{1,a}] = lists:keystore(foo, 1, [], {1,a}),
     ok.
 
-keytake(doc) ->
-    ["OTP-XXX."];
-keytake(suite) -> [];
 keytake(Config) when is_list(Config) ->
-    ?line {'EXIT',_} = (catch lists:keytake(key, 0, [])),
-    ?line {'EXIT',_} = (catch lists:keytake(key, 1, {})),
-    ?line {'EXIT',_} = (catch lists:keytake(key, 1, {a,b})),
-    ?line false = lists:keytake(key, 2, [{a}]),
-    ?line false = lists:keytake(key, 1, [a]),
-    ?line false = lists:keytake(k, 1, []),
-    ?line false = lists:keytake(k, 1, [{a},{b},{c}]),
+    {'EXIT',_} = (catch lists:keytake(key, 0, [])),
+    {'EXIT',_} = (catch lists:keytake(key, 1, {})),
+    {'EXIT',_} = (catch lists:keytake(key, 1, {a,b})),
+    false = lists:keytake(key, 2, [{a}]),
+    false = lists:keytake(key, 1, [a]),
+    false = lists:keytake(k, 1, []),
+    false = lists:keytake(k, 1, [{a},{b},{c}]),
     L = [{a,1},{b,2},{c,3}],
-    ?line {value,{a,1},[{b,2},{c,3}]} = lists:keytake(1, 2, L),
-    ?line {value,{b,2},[{a,1},{c,3}]} = lists:keytake(2, 2, L),
-    ?line {value,{c,3},[{a,1},{b,2}]} = lists:keytake(3, 2, L),
-    ?line false = lists:keytake(4, 2, L),
+    {value,{a,1},[{b,2},{c,3}]} = lists:keytake(1, 2, L),
+    {value,{b,2},[{a,1},{c,3}]} = lists:keytake(2, 2, L),
+    {value,{c,3},[{a,1},{b,2}]} = lists:keytake(3, 2, L),
+    false = lists:keytake(4, 2, L),
     ok.
 
 %% Test lists:keyreplace/4.
@@ -434,153 +412,147 @@ keyreplace(Config) when is_list(Config) ->
     {'EXIT',_} = (catch lists:keyreplace(k, 0, [], {a,b})),
     ok.
 
-merge(doc) ->   ["merge functions"];
-merge(suite) -> [];
 merge(Config) when is_list(Config) ->
 
     %% merge list of lists
-    ?line [] = lists:merge([]),
-    ?line [] = lists:merge([[]]),
-    ?line [] = lists:merge([[],[]]),
-    ?line [] = lists:merge([[],[],[]]),
-    ?line [1] = lists:merge([[1]]),
-    ?line [1,1,2,2] = lists:merge([[1,2],[1,2]]),
-    ?line [1] = lists:merge([[1],[],[]]),
-    ?line [1] = lists:merge([[],[1],[]]),
-    ?line [1] = lists:merge([[],[],[1]]),
-    ?line [1,2] = lists:merge([[1],[2],[]]),
-    ?line [1,2] = lists:merge([[1],[],[2]]),
-    ?line [1,2] = lists:merge([[],[1],[2]]),
-    ?line [1,2,3,4,5,6] = lists:merge([[1,2],[],[5,6],[],[3,4],[]]),
-    ?line [1,2,3,4] = lists:merge([[4],[3],[2],[1]]),
-    ?line [1,2,3,4,5] = lists:merge([[1],[2],[3],[4],[5]]),
-    ?line [1,2,3,4,5,6] = lists:merge([[1],[2],[3],[4],[5],[6]]),
-    ?line [1,2,3,4,5,6,7,8,9] = 
+    [] = lists:merge([]),
+    [] = lists:merge([[]]),
+    [] = lists:merge([[],[]]),
+    [] = lists:merge([[],[],[]]),
+    [1] = lists:merge([[1]]),
+    [1,1,2,2] = lists:merge([[1,2],[1,2]]),
+    [1] = lists:merge([[1],[],[]]),
+    [1] = lists:merge([[],[1],[]]),
+    [1] = lists:merge([[],[],[1]]),
+    [1,2] = lists:merge([[1],[2],[]]),
+    [1,2] = lists:merge([[1],[],[2]]),
+    [1,2] = lists:merge([[],[1],[2]]),
+    [1,2,3,4,5,6] = lists:merge([[1,2],[],[5,6],[],[3,4],[]]),
+    [1,2,3,4] = lists:merge([[4],[3],[2],[1]]),
+    [1,2,3,4,5] = lists:merge([[1],[2],[3],[4],[5]]),
+    [1,2,3,4,5,6] = lists:merge([[1],[2],[3],[4],[5],[6]]),
+    [1,2,3,4,5,6,7,8,9] =
 	lists:merge([[1],[2],[3],[4],[5],[6],[7],[8],[9]]),
     Seq = lists:seq(1,100),
-    ?line true = Seq == lists:merge(lists:map(fun(E) -> [E] end, Seq)),
+    true = Seq == lists:merge(lists:map(fun(E) -> [E] end, Seq)),
 
     Two = [1,2],
     Six = [1,2,3,4,5,6],
 
     %% 2-way merge
-    ?line [] = lists:merge([], []),
-    ?line Two = lists:merge(Two, []),
-    ?line Two = lists:merge([], Two),
-    ?line Six = lists:merge([1,3,5], [2,4,6]),
-    ?line Six = lists:merge([2,4,6], [1,3,5]),
-    ?line Six = lists:merge([1,2,3], [4,5,6]),
-    ?line Six = lists:merge([4,5,6], [1,2,3]),
-    ?line Six = lists:merge([1,2,5],[3,4,6]),
-    ?line [1,2,3,5,7] = lists:merge([1,3,5,7], [2]),
-    ?line [1,2,3,4,5,7] = lists:merge([1,3,5,7], [2,4]),
-    ?line [1,2,3,4,5,6,7] = lists:merge([1,3,5,7], [2,4,6]),
-    ?line [1,2,3,5,7] = lists:merge([2], [1,3,5,7]),
-    ?line [1,2,3,4,5,7] = lists:merge([2,4], [1,3,5,7]),
-    ?line [1,2,3,4,5,6,7] = lists:merge([2,4,6], [1,3,5,7]),
+    [] = lists:merge([], []),
+    Two = lists:merge(Two, []),
+    Two = lists:merge([], Two),
+    Six = lists:merge([1,3,5], [2,4,6]),
+    Six = lists:merge([2,4,6], [1,3,5]),
+    Six = lists:merge([1,2,3], [4,5,6]),
+    Six = lists:merge([4,5,6], [1,2,3]),
+    Six = lists:merge([1,2,5],[3,4,6]),
+    [1,2,3,5,7] = lists:merge([1,3,5,7], [2]),
+    [1,2,3,4,5,7] = lists:merge([1,3,5,7], [2,4]),
+    [1,2,3,4,5,6,7] = lists:merge([1,3,5,7], [2,4,6]),
+    [1,2,3,5,7] = lists:merge([2], [1,3,5,7]),
+    [1,2,3,4,5,7] = lists:merge([2,4], [1,3,5,7]),
+    [1,2,3,4,5,6,7] = lists:merge([2,4,6], [1,3,5,7]),
 
     %% 3-way merge
-    ?line [] = lists:merge3([], [], []),
-    ?line Two = lists:merge3([], [], Two),
-    ?line Two = lists:merge3([], Two, []),
-    ?line Two = lists:merge3(Two, [], []),
-    ?line Six = lists:merge3([], [1,3,5], [2,4,6]),
-    ?line Six = lists:merge3([1,3,5], [], [2,4,6]),
-    ?line Six = lists:merge3([1,3,5], [2,4,6], []),
-    ?line Nine = lists:merge3([1,4,7],[2,5,8],[3,6,9]),
-    ?line Nine = lists:merge3([1,4,7],[3,6,9],[2,5,8]),
-    ?line Nine = lists:merge3([3,6,9],[1,4,7],[2,5,8]),
-    ?line Nine = lists:merge3([4,5,6],[1,2,3],[7,8,9]),
-    ?line Nine = lists:merge3([1,2,3],[4,5,6],[7,8,9]),
-    ?line Nine = lists:merge3([7,8,9],[4,5,6],[1,2,3]),
-    ?line Nine = lists:merge3([4,5,6],[7,8,9],[1,2,3]),
-
-    ok.
-
-rmerge(doc) ->   ["reverse merge functions"];
-rmerge(suite) -> [];
+    [] = lists:merge3([], [], []),
+    Two = lists:merge3([], [], Two),
+    Two = lists:merge3([], Two, []),
+    Two = lists:merge3(Two, [], []),
+    Six = lists:merge3([], [1,3,5], [2,4,6]),
+    Six = lists:merge3([1,3,5], [], [2,4,6]),
+    Six = lists:merge3([1,3,5], [2,4,6], []),
+    Nine = lists:merge3([1,4,7],[2,5,8],[3,6,9]),
+    Nine = lists:merge3([1,4,7],[3,6,9],[2,5,8]),
+    Nine = lists:merge3([3,6,9],[1,4,7],[2,5,8]),
+    Nine = lists:merge3([4,5,6],[1,2,3],[7,8,9]),
+    Nine = lists:merge3([1,2,3],[4,5,6],[7,8,9]),
+    Nine = lists:merge3([7,8,9],[4,5,6],[1,2,3]),
+    Nine = lists:merge3([4,5,6],[7,8,9],[1,2,3]),
+
+    ok.
+
+%% reverse merge functions
 rmerge(Config) when is_list(Config) ->
 
     Two = [2,1],
     Six = [6,5,4,3,2,1],
 
     %% 2-way reversed merge
-    ?line [] = lists:rmerge([], []),
-    ?line Two = lists:rmerge(Two, []),
-    ?line Two = lists:rmerge([], Two),
-    ?line Six = lists:rmerge([5,3,1], [6,4,2]),
-    ?line Six = lists:rmerge([6,4,2], [5,3,1]),
-    ?line Six = lists:rmerge([3,2,1], [6,5,4]),
-    ?line Six = lists:rmerge([6,5,4], [3,2,1]),
-    ?line Six = lists:rmerge([4,3,2],[6,5,1]),
-    ?line [7,6,5,3,1] = lists:rmerge([7,5,3,1], [6]),
-    ?line [7,6,5,4,3,1] = lists:rmerge([7,5,3,1], [6,4]),
-    ?line [7,6,5,4,3,2,1] = lists:rmerge([7,5,3,1], [6,4,2]),
-    ?line [7,5,3,2,1] = lists:rmerge([2], [7,5,3,1]),
-    ?line [7,5,4,3,2,1] = lists:rmerge([4,2], [7,5,3,1]),
-    ?line [7,6,5,4,3,2,1] = lists:rmerge([6,4,2], [7,5,3,1]),
+    [] = lists:rmerge([], []),
+    Two = lists:rmerge(Two, []),
+    Two = lists:rmerge([], Two),
+    Six = lists:rmerge([5,3,1], [6,4,2]),
+    Six = lists:rmerge([6,4,2], [5,3,1]),
+    Six = lists:rmerge([3,2,1], [6,5,4]),
+    Six = lists:rmerge([6,5,4], [3,2,1]),
+    Six = lists:rmerge([4,3,2],[6,5,1]),
+    [7,6,5,3,1] = lists:rmerge([7,5,3,1], [6]),
+    [7,6,5,4,3,1] = lists:rmerge([7,5,3,1], [6,4]),
+    [7,6,5,4,3,2,1] = lists:rmerge([7,5,3,1], [6,4,2]),
+    [7,5,3,2,1] = lists:rmerge([2], [7,5,3,1]),
+    [7,5,4,3,2,1] = lists:rmerge([4,2], [7,5,3,1]),
+    [7,6,5,4,3,2,1] = lists:rmerge([6,4,2], [7,5,3,1]),
 
     Nine = [9,8,7,6,5,4,3,2,1],
 
     %% 3-way reversed merge
-    ?line [] = lists:rmerge3([], [], []),
-    ?line Two = lists:rmerge3([], [], Two),
-    ?line Two = lists:rmerge3([], Two, []),
-    ?line Two = lists:rmerge3(Two, [], []),
-    ?line Six = lists:rmerge3([], [5,3,1], [6,4,2]),
-    ?line Six = lists:rmerge3([5,3,1], [], [6,4,2]),
-    ?line Six = lists:rmerge3([5,3,1], [6,4,2], []),
-    ?line Nine = lists:rmerge3([7,4,1],[8,5,2],[9,6,3]),
-    ?line Nine = lists:rmerge3([7,4,1],[9,6,3],[8,5,2]),
-    ?line Nine = lists:rmerge3([9,6,3],[7,4,1],[8,5,2]),
-    ?line Nine = lists:rmerge3([6,5,4],[3,2,1],[9,8,7]),
-    ?line Nine = lists:rmerge3([3,2,1],[6,5,4],[9,8,7]),
-    ?line Nine = lists:rmerge3([9,8,7],[6,5,4],[3,2,1]),
-    ?line Nine = lists:rmerge3([6,5,4],[9,8,7],[3,2,1]),
-
-    ok.
-
-sort_1(doc) ->   ["sort/1"];
-sort_1(suite) -> [];
+    [] = lists:rmerge3([], [], []),
+    Two = lists:rmerge3([], [], Two),
+    Two = lists:rmerge3([], Two, []),
+    Two = lists:rmerge3(Two, [], []),
+    Six = lists:rmerge3([], [5,3,1], [6,4,2]),
+    Six = lists:rmerge3([5,3,1], [], [6,4,2]),
+    Six = lists:rmerge3([5,3,1], [6,4,2], []),
+    Nine = lists:rmerge3([7,4,1],[8,5,2],[9,6,3]),
+    Nine = lists:rmerge3([7,4,1],[9,6,3],[8,5,2]),
+    Nine = lists:rmerge3([9,6,3],[7,4,1],[8,5,2]),
+    Nine = lists:rmerge3([6,5,4],[3,2,1],[9,8,7]),
+    Nine = lists:rmerge3([3,2,1],[6,5,4],[9,8,7]),
+    Nine = lists:rmerge3([9,8,7],[6,5,4],[3,2,1]),
+    Nine = lists:rmerge3([6,5,4],[9,8,7],[3,2,1]),
+
+    ok.
+
 sort_1(Config) when is_list(Config) ->
-    ?line [] = lists:sort([]),
-    ?line [a] = lists:sort([a]),
-    ?line [a,a] = lists:sort([a,a]),
-    ?line [a,b] = lists:sort([a,b]),
-    ?line [a,b] = lists:sort([b,a]),
-    ?line [1,1] = lists:sort([1,1]),
-    ?line [1,1,2,3] = lists:sort([1,1,3,2]),
-    ?line [1,2,3,3] = lists:sort([3,3,1,2]),
-    ?line [1,1,1,1] = lists:sort([1,1,1,1]),
-    ?line [1,1,1,2,2,2,3,3,3] = lists:sort([3,3,3,2,2,2,1,1,1]),
-    ?line [1,1,1,2,2,2,3,3,3] = lists:sort([1,1,1,2,2,2,3,3,3]),
-
-    ?line lists:foreach(fun check/1, perms([1,2,3])),
-    ?line lists:foreach(fun check/1, perms([1,2,3,4,5,6,7,8])),
-    ok.
-
-sort_rand(doc) ->   ["sort/1 on big randomized lists"];
-sort_rand(suite) -> [];
+    [] = lists:sort([]),
+    [a] = lists:sort([a]),
+    [a,a] = lists:sort([a,a]),
+    [a,b] = lists:sort([a,b]),
+    [a,b] = lists:sort([b,a]),
+    [1,1] = lists:sort([1,1]),
+    [1,1,2,3] = lists:sort([1,1,3,2]),
+    [1,2,3,3] = lists:sort([3,3,1,2]),
+    [1,1,1,1] = lists:sort([1,1,1,1]),
+    [1,1,1,2,2,2,3,3,3] = lists:sort([3,3,3,2,2,2,1,1,1]),
+    [1,1,1,2,2,2,3,3,3] = lists:sort([1,1,1,2,2,2,3,3,3]),
+
+    lists:foreach(fun check/1, perms([1,2,3])),
+    lists:foreach(fun check/1, perms([1,2,3,4,5,6,7,8])),
+    ok.
+
+%% sort/1 on big randomized lists
 sort_rand(Config) when is_list(Config) ->
-    ?line ok = check(biglist(10)),
-    ?line ok = check(biglist(100)),
-    ?line ok = check(biglist(1000)),
-    ?line ok = check(biglist(10000)),
+    ok = check(biglist(10)),
+    ok = check(biglist(100)),
+    ok = check(biglist(1000)),
+    ok = check(biglist(10000)),
     ok.
 
 %% sort/1 was really stable for a while - the order of equal elements
 %% was kept - but since the performance suffered a bit, this "feature"
 %% was removed.
-sort_stable(doc) ->   ["sort/1 should be stable for equal terms."];
-sort_stable(suite) -> [];
+
+%% sort/1 should be stable for equal terms.
 sort_stable(Config) when is_list(Config) ->
-    ?line ok = check_stability(bigfunlist(10)),
-    ?line ok = check_stability(bigfunlist(100)),
-    ?line ok = check_stability(bigfunlist(1000)),
-    ?line case erlang:system_info(modified_timing_level) of
-              undefined -> ok = check_stability(bigfunlist(10000));
-              _ -> ok
-          end,
+    ok = check_stability(bigfunlist(10)),
+    ok = check_stability(bigfunlist(100)),
+    ok = check_stability(bigfunlist(1000)),
+    case erlang:system_info(modified_timing_level) of
+	undefined -> ok = check_stability(bigfunlist(10000));
+	_ -> ok
+    end,
     ok.
 
 check([]) ->
@@ -619,188 +591,180 @@ expl_pid([], L) ->
     L.
 
 
-usort_1(suite) -> [];
-usort_1(doc) -> [""];
 usort_1(Conf) when is_list(Conf) ->
-    ?line [] = lists:usort([]),
-    ?line [1] = lists:usort([1]), 
-    ?line [1] = lists:usort([1,1]),
-    ?line [1] = lists:usort([1,1,1,1,1]),
-    ?line [1,2] = lists:usort([1,2]),
-    ?line [1,2] = lists:usort([1,2,1]),
-    ?line [1,2] = lists:usort([1,2,2]),
-    ?line [1,2,3] = lists:usort([1,3,2]),
-    ?line [1,3] = lists:usort([3,1,3]),
-    ?line [0,1,3] = lists:usort([3,1,0]),
-    ?line [1,2,3] = lists:usort([3,1,2]),
-    ?line [1,2] = lists:usort([2,1,1]),
-    ?line [1,2] = lists:usort([2,1]),
-    ?line [0,3,4,8,9] = lists:usort([3,8,9,0,9,4]),
-
-    ?line lists:foreach(fun ucheck/1, perms([1,2,3])),
-    ?line lists:foreach(fun ucheck/1, perms([1,2,3,4,5,6,2,1])),
-
-    ok.
-
-umerge(suite) -> [];
-umerge(doc) -> [""];
+    [] = lists:usort([]),
+    [1] = lists:usort([1]),
+    [1] = lists:usort([1,1]),
+    [1] = lists:usort([1,1,1,1,1]),
+    [1,2] = lists:usort([1,2]),
+    [1,2] = lists:usort([1,2,1]),
+    [1,2] = lists:usort([1,2,2]),
+    [1,2,3] = lists:usort([1,3,2]),
+    [1,3] = lists:usort([3,1,3]),
+    [0,1,3] = lists:usort([3,1,0]),
+    [1,2,3] = lists:usort([3,1,2]),
+    [1,2] = lists:usort([2,1,1]),
+    [1,2] = lists:usort([2,1]),
+    [0,3,4,8,9] = lists:usort([3,8,9,0,9,4]),
+
+    lists:foreach(fun ucheck/1, perms([1,2,3])),
+    lists:foreach(fun ucheck/1, perms([1,2,3,4,5,6,2,1])),
+
+    ok.
+
 umerge(Conf) when is_list(Conf) ->
     %% merge list of lists
-    ?line [] = lists:umerge([]),
-    ?line [] = lists:umerge([[]]),
-    ?line [] = lists:umerge([[],[]]),
-    ?line [] = lists:umerge([[],[],[]]),
-    ?line [1] = lists:umerge([[1]]),
-    ?line [1,2] = lists:umerge([[1,2],[1,2]]),
-    ?line [1] = lists:umerge([[1],[],[]]),
-    ?line [1] = lists:umerge([[],[1],[]]),
-    ?line [1] = lists:umerge([[],[],[1]]),
-    ?line [1,2] = lists:umerge([[1],[2],[]]),
-    ?line [1,2] = lists:umerge([[1],[],[2]]),
-    ?line [1,2] = lists:umerge([[],[1],[2]]),
-    ?line [1,2,3,4,5,6] = lists:umerge([[1,2],[],[5,6],[],[3,4],[]]),
-    ?line [1,2,3,4] = lists:umerge([[4],[3],[2],[1]]),
-    ?line [1,2,3,4,5] = lists:umerge([[1],[2],[3],[4],[5]]),
-    ?line [1,2,3,4,5,6] = lists:umerge([[1],[2],[3],[4],[5],[6]]),
-    ?line [1,2,3,4,5,6,7,8,9] = 
+    [] = lists:umerge([]),
+    [] = lists:umerge([[]]),
+    [] = lists:umerge([[],[]]),
+    [] = lists:umerge([[],[],[]]),
+    [1] = lists:umerge([[1]]),
+    [1,2] = lists:umerge([[1,2],[1,2]]),
+    [1] = lists:umerge([[1],[],[]]),
+    [1] = lists:umerge([[],[1],[]]),
+    [1] = lists:umerge([[],[],[1]]),
+    [1,2] = lists:umerge([[1],[2],[]]),
+    [1,2] = lists:umerge([[1],[],[2]]),
+    [1,2] = lists:umerge([[],[1],[2]]),
+    [1,2,3,4,5,6] = lists:umerge([[1,2],[],[5,6],[],[3,4],[]]),
+    [1,2,3,4] = lists:umerge([[4],[3],[2],[1]]),
+    [1,2,3,4,5] = lists:umerge([[1],[2],[3],[4],[5]]),
+    [1,2,3,4,5,6] = lists:umerge([[1],[2],[3],[4],[5],[6]]),
+    [1,2,3,4,5,6,7,8,9] =
         lists:umerge([[1],[2],[3],[4],[5],[6],[7],[8],[9]]),
-    ?line [1,2,4,6,8] = lists:umerge([[1,2],[2,4,6,8]]),
+    [1,2,4,6,8] = lists:umerge([[1,2],[2,4,6,8]]),
     Seq = lists:seq(1,100),
-    ?line true = Seq == lists:umerge(lists:map(fun(E) -> [E] end, Seq)),
+    true = Seq == lists:umerge(lists:map(fun(E) -> [E] end, Seq)),
 
     Two = [1,2],
     Six = [1,2,3,4,5,6],
 
     %% 2-way unique merge
-    ?line [] = lists:umerge([], []),
-    ?line Two = lists:umerge(Two, []),
-    ?line Two = lists:umerge([], Two),
-    ?line Six = lists:umerge([1,3,5], [2,4,6]),
-    ?line Six = lists:umerge([2,4,6], [1,3,5]),
-    ?line Six = lists:umerge([1,2,3], [4,5,6]),
-    ?line Six = lists:umerge([4,5,6], [1,2,3]),
-    ?line Six = lists:umerge([1,2,5],[3,4,6]),
-    ?line [1,2,3,5,7] = lists:umerge([1,3,5,7], [2]),
-    ?line [1,2,3,4,5,7] = lists:umerge([1,3,5,7], [2,4]),
-    ?line [1,2,3,4,5,6,7] = lists:umerge([1,3,5,7], [2,4,6]),
-    ?line [1,2,3,5,7] = lists:umerge([2], [1,3,5,7]),
-    ?line [1,2,3,4,5,7] = lists:umerge([2,4], [1,3,5,7]),
-    ?line [1,2,3,4,5,6,7] = lists:umerge([2,4,6], [1,3,5,7]),
-
-    ?line [1,2,3,5,7] = lists:umerge([1,2,3,5,7], [2]),
-    ?line [1,2,3,4,5,7] = lists:umerge([1,2,3,4,5,7], [2,4]),
-    ?line [1,2,3,4,5,6,7] = lists:umerge([1,2,3,4,5,6,7], [2,4,6]),
-    ?line [1,2,3,5,7] = lists:umerge([2], [1,2,3,5,7]),
-    ?line [1,2,3,4,5,7] = lists:umerge([2,4], [1,2,3,4,5,7]),
-    ?line [1,2,3,4,5,6,7] = lists:umerge([2,4,6], [1,2,3,4,5,6,7]),
+    [] = lists:umerge([], []),
+    Two = lists:umerge(Two, []),
+    Two = lists:umerge([], Two),
+    Six = lists:umerge([1,3,5], [2,4,6]),
+    Six = lists:umerge([2,4,6], [1,3,5]),
+    Six = lists:umerge([1,2,3], [4,5,6]),
+    Six = lists:umerge([4,5,6], [1,2,3]),
+    Six = lists:umerge([1,2,5],[3,4,6]),
+    [1,2,3,5,7] = lists:umerge([1,3,5,7], [2]),
+    [1,2,3,4,5,7] = lists:umerge([1,3,5,7], [2,4]),
+    [1,2,3,4,5,6,7] = lists:umerge([1,3,5,7], [2,4,6]),
+    [1,2,3,5,7] = lists:umerge([2], [1,3,5,7]),
+    [1,2,3,4,5,7] = lists:umerge([2,4], [1,3,5,7]),
+    [1,2,3,4,5,6,7] = lists:umerge([2,4,6], [1,3,5,7]),
+
+    [1,2,3,5,7] = lists:umerge([1,2,3,5,7], [2]),
+    [1,2,3,4,5,7] = lists:umerge([1,2,3,4,5,7], [2,4]),
+    [1,2,3,4,5,6,7] = lists:umerge([1,2,3,4,5,6,7], [2,4,6]),
+    [1,2,3,5,7] = lists:umerge([2], [1,2,3,5,7]),
+    [1,2,3,4,5,7] = lists:umerge([2,4], [1,2,3,4,5,7]),
+    [1,2,3,4,5,6,7] = lists:umerge([2,4,6], [1,2,3,4,5,6,7]),
 
     %% 3-way unique merge
-    ?line [] = lists:umerge3([], [], []),
-    ?line Two = lists:umerge3([], [], Two),
-    ?line Two = lists:umerge3([], Two, []),
-    ?line Two = lists:umerge3(Two, [], []),
-    ?line Six = lists:umerge3([], [1,3,5], [2,4,6]),
-    ?line Six = lists:umerge3([1,3,5], [], [2,4,6]),
-    ?line Six = lists:umerge3([1,3,5], [2,4,6], []),
-    ?line Nine = lists:umerge3([1,4,7],[2,5,8],[3,6,9]),
-    ?line Nine = lists:umerge3([1,4,7],[3,6,9],[2,5,8]),
-    ?line Nine = lists:umerge3([3,6,9],[1,4,7],[2,5,8]),
-    ?line Nine = lists:umerge3([4,5,6],[1,2,3],[7,8,9]),
-    ?line Nine = lists:umerge3([1,2,3],[4,5,6],[7,8,9]),
-    ?line Nine = lists:umerge3([7,8,9],[4,5,6],[1,2,3]),
-    ?line Nine = lists:umerge3([4,5,6],[7,8,9],[1,2,3]),
-
-    ?line [1,2,3] = lists:umerge3([1,2,3],[1,2,3],[1,2,3]),
-    ?line [1,2,3,4] = lists:umerge3([2,3,4],[1,2,3],[2,3,4]),
-    ?line [1,2,3] = lists:umerge3([1,2,3],[2,3],[1,2,3]),
-    ?line [1,2,3,4] = lists:umerge3([2,3,4],[3,4],[1,2,3]),
-
-    ok.
-
-rumerge(suite) -> [];
-rumerge(doc) -> [""];
+    [] = lists:umerge3([], [], []),
+    Two = lists:umerge3([], [], Two),
+    Two = lists:umerge3([], Two, []),
+    Two = lists:umerge3(Two, [], []),
+    Six = lists:umerge3([], [1,3,5], [2,4,6]),
+    Six = lists:umerge3([1,3,5], [], [2,4,6]),
+    Six = lists:umerge3([1,3,5], [2,4,6], []),
+    Nine = lists:umerge3([1,4,7],[2,5,8],[3,6,9]),
+    Nine = lists:umerge3([1,4,7],[3,6,9],[2,5,8]),
+    Nine = lists:umerge3([3,6,9],[1,4,7],[2,5,8]),
+    Nine = lists:umerge3([4,5,6],[1,2,3],[7,8,9]),
+    Nine = lists:umerge3([1,2,3],[4,5,6],[7,8,9]),
+    Nine = lists:umerge3([7,8,9],[4,5,6],[1,2,3]),
+    Nine = lists:umerge3([4,5,6],[7,8,9],[1,2,3]),
+
+    [1,2,3] = lists:umerge3([1,2,3],[1,2,3],[1,2,3]),
+    [1,2,3,4] = lists:umerge3([2,3,4],[1,2,3],[2,3,4]),
+    [1,2,3] = lists:umerge3([1,2,3],[2,3],[1,2,3]),
+    [1,2,3,4] = lists:umerge3([2,3,4],[3,4],[1,2,3]),
+
+    ok.
+
 rumerge(Conf) when is_list(Conf) ->
     Two = [2,1],
     Six = [6,5,4,3,2,1],
 
     %% 2-way reversed unique merge
-    ?line [] = lists:rumerge([], []),
-    ?line Two = lists:rumerge(Two, []),
-    ?line Two = lists:rumerge([], Two),
-    ?line Six = lists:rumerge([5,3,1], [6,4,2]),
-    ?line Six = lists:rumerge([6,4,2], [5,3,1]),
-    ?line Six = lists:rumerge([3,2,1], [6,5,4]),
-    ?line Six = lists:rumerge([6,5,4], [3,2,1]),
-    ?line Six = lists:rumerge([4,3,2],[6,5,1]),
-    ?line [7,6,5,3,1] = lists:rumerge([7,5,3,1], [6]),
-    ?line [7,6,5,4,3,1] = lists:rumerge([7,5,3,1], [6,4]),
-    ?line [7,6,5,4,3,2,1] = lists:rumerge([7,5,3,1], [6,4,2]),
-    ?line [7,5,3,2,1] = lists:rumerge([2], [7,5,3,1]),
-    ?line [7,5,4,3,2,1] = lists:rumerge([4,2], [7,5,3,1]),
-    ?line [7,6,5,4,3,2,1] = lists:rumerge([6,4,2], [7,5,3,1]),
-
-    ?line [7,6,5,3,1] = lists:rumerge([7,6,5,3,1], [6]),
-    ?line [7,6,5,4,3,1] = lists:rumerge([7,6,5,4,3,1], [6,4]),
-    ?line [7,6,5,4,3,2,1] = lists:rumerge([7,6,5,4,3,2,1], [6,4,2]),
-    ?line [7,5,3,2,1] = lists:rumerge([2], [7,5,3,2,1]),
-    ?line [7,5,4,3,2,1] = lists:rumerge([4,2], [7,5,4,3,2,1]),
-    ?line [7,6,5,4,3,2,1] = lists:rumerge([6,4,2], [7,6,5,4,3,2,1]),
+    [] = lists:rumerge([], []),
+    Two = lists:rumerge(Two, []),
+    Two = lists:rumerge([], Two),
+    Six = lists:rumerge([5,3,1], [6,4,2]),
+    Six = lists:rumerge([6,4,2], [5,3,1]),
+    Six = lists:rumerge([3,2,1], [6,5,4]),
+    Six = lists:rumerge([6,5,4], [3,2,1]),
+    Six = lists:rumerge([4,3,2],[6,5,1]),
+    [7,6,5,3,1] = lists:rumerge([7,5,3,1], [6]),
+    [7,6,5,4,3,1] = lists:rumerge([7,5,3,1], [6,4]),
+    [7,6,5,4,3,2,1] = lists:rumerge([7,5,3,1], [6,4,2]),
+    [7,5,3,2,1] = lists:rumerge([2], [7,5,3,1]),
+    [7,5,4,3,2,1] = lists:rumerge([4,2], [7,5,3,1]),
+    [7,6,5,4,3,2,1] = lists:rumerge([6,4,2], [7,5,3,1]),
+
+    [7,6,5,3,1] = lists:rumerge([7,6,5,3,1], [6]),
+    [7,6,5,4,3,1] = lists:rumerge([7,6,5,4,3,1], [6,4]),
+    [7,6,5,4,3,2,1] = lists:rumerge([7,6,5,4,3,2,1], [6,4,2]),
+    [7,5,3,2,1] = lists:rumerge([2], [7,5,3,2,1]),
+    [7,5,4,3,2,1] = lists:rumerge([4,2], [7,5,4,3,2,1]),
+    [7,6,5,4,3,2,1] = lists:rumerge([6,4,2], [7,6,5,4,3,2,1]),
 
     Nine = [9,8,7,6,5,4,3,2,1],
 
     %% 3-way reversed unique merge
-    ?line [] = lists:rumerge3([], [], []),
-    ?line Two = lists:rumerge3([], [], Two),
-    ?line Two = lists:rumerge3([], Two, []),
-    ?line Two = lists:rumerge3(Two, [], []),
-    ?line Six = lists:rumerge3([], [5,3,1], [6,4,2]),
-    ?line Six = lists:rumerge3([5,3,1], [], [6,4,2]),
-    ?line Six = lists:rumerge3([5,3,1], [6,4,2], []),
-    ?line Nine = lists:rumerge3([7,4,1],[8,5,2],[9,6,3]),
-    ?line Nine = lists:rumerge3([7,4,1],[9,6,3],[8,5,2]),
-    ?line Nine = lists:rumerge3([9,6,3],[7,4,1],[8,5,2]),
-    ?line Nine = lists:rumerge3([6,5,4],[3,2,1],[9,8,7]),
-    ?line Nine = lists:rumerge3([3,2,1],[6,5,4],[9,8,7]),
-    ?line Nine = lists:rumerge3([9,8,7],[6,5,4],[3,2,1]),
-    ?line Nine = lists:rumerge3([6,5,4],[9,8,7],[3,2,1]),
-
-    ?line [3,2,1] = lists:rumerge3([3,2,1],[3,2,1],[3,2,1]),
-    ?line [4,3,2,1] = lists:rumerge3([4,3,2],[3,2,1],[3,2,1]),
-    ?line [5,4,3,2,1] = lists:rumerge3([4,3,2],[5,4,3,2],[5,4,3,2,1]),
-    ?line [6,5,4,3,2] = lists:rumerge3([4,3,2],[5,4,3,2],[6,5,4,3]),
+    [] = lists:rumerge3([], [], []),
+    Two = lists:rumerge3([], [], Two),
+    Two = lists:rumerge3([], Two, []),
+    Two = lists:rumerge3(Two, [], []),
+    Six = lists:rumerge3([], [5,3,1], [6,4,2]),
+    Six = lists:rumerge3([5,3,1], [], [6,4,2]),
+    Six = lists:rumerge3([5,3,1], [6,4,2], []),
+    Nine = lists:rumerge3([7,4,1],[8,5,2],[9,6,3]),
+    Nine = lists:rumerge3([7,4,1],[9,6,3],[8,5,2]),
+    Nine = lists:rumerge3([9,6,3],[7,4,1],[8,5,2]),
+    Nine = lists:rumerge3([6,5,4],[3,2,1],[9,8,7]),
+    Nine = lists:rumerge3([3,2,1],[6,5,4],[9,8,7]),
+    Nine = lists:rumerge3([9,8,7],[6,5,4],[3,2,1]),
+    Nine = lists:rumerge3([6,5,4],[9,8,7],[3,2,1]),
+
+    [3,2,1] = lists:rumerge3([3,2,1],[3,2,1],[3,2,1]),
+    [4,3,2,1] = lists:rumerge3([4,3,2],[3,2,1],[3,2,1]),
+    [5,4,3,2,1] = lists:rumerge3([4,3,2],[5,4,3,2],[5,4,3,2,1]),
+    [6,5,4,3,2] = lists:rumerge3([4,3,2],[5,4,3,2],[6,5,4,3]),
 
     L1 = [c,d,e],
     L2 = [b,c,d],
-    ?line true = 
+    true =
 	lists:umerge(L1, L2) == 
 	lists:reverse(lists:rumerge(lists:reverse(L1), lists:reverse(L2))),
     ok.
 
-usort_rand(doc) ->   ["usort/1 on big randomized lists"];
-usort_rand(suite) -> [];
+%% usort/1 on big randomized lists.
 usort_rand(Config) when is_list(Config) ->
-    ?line ok = ucheck(biglist(10)),
-    ?line ok = ucheck(biglist(100)),
-    ?line ok = ucheck(biglist(1000)),
-    ?line ok = ucheck(biglist(10000)),
+    ok = ucheck(biglist(10)),
+    ok = ucheck(biglist(100)),
+    ok = ucheck(biglist(1000)),
+    ok = ucheck(biglist(10000)),
 
-    ?line ok = ucheck(ubiglist(10)),
-    ?line ok = ucheck(ubiglist(100)),
-    ?line ok = ucheck(ubiglist(1000)),
-    ?line ok = ucheck(ubiglist(10000)),
+    ok = ucheck(ubiglist(10)),
+    ok = ucheck(ubiglist(100)),
+    ok = ucheck(ubiglist(1000)),
+    ok = ucheck(ubiglist(10000)),
     ok.
 
-usort_stable(doc) ->   ["usort/1 should keep the first duplicate."];
-usort_stable(suite) -> [];
+%% usort/1 should keep the first duplicate.
 usort_stable(Config) when is_list(Config) ->
-    ?line ok = ucheck_stability(bigfunlist(3)),
-    ?line ok = ucheck_stability(bigfunlist(10)),
-    ?line ok = ucheck_stability(bigfunlist(100)),
-    ?line ok = ucheck_stability(bigfunlist(1000)),
-    ?line case erlang:system_info(modified_timing_level) of
-              undefined -> ok = ucheck_stability(bigfunlist(10000));
-              _ -> ok
-          end,
+    ok = ucheck_stability(bigfunlist(3)),
+    ok = ucheck_stability(bigfunlist(10)),
+    ok = ucheck_stability(bigfunlist(100)),
+    ok = ucheck_stability(bigfunlist(1000)),
+    case erlang:system_info(modified_timing_level) of
+	undefined -> ok = ucheck_stability(bigfunlist(10000));
+	_ -> ok
+    end,
     ok.
 
 ucheck([]) ->
@@ -829,163 +793,155 @@ ucheck_stability(L) ->
     check_stab(L, U, S, "usort/1", "ukeysort/2").
 
 
-keymerge(doc) -> ["Key merge two lists."];
-keymerge(suite) -> [];
+%% Key merge two lists.
 keymerge(Config) when is_list(Config) ->
 
     Two = [{1,a},{2,b}],
     Six = [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f}],
 
     %% 2-way keymerge
-    ?line [] = lists:keymerge(1, [], []),
-    ?line Two = lists:keymerge(1, Two, []),
-    ?line Two = lists:keymerge(1, [], Two),
-    ?line Six = lists:keymerge(1, [{1,a},{3,c},{5,e}], [{2,b},{4,d},{6,f}]),
-    ?line Six = lists:keymerge(1, [{2,b},{4,d},{6,f}], [{1,a},{3,c},{5,e}]),
-    ?line Six = lists:keymerge(1, [{1,a},{2,b},{3,c}], [{4,d},{5,e},{6,f}]),
-    ?line Six = lists:keymerge(1, [{4,d},{5,e},{6,f}], [{1,a},{2,b},{3,c}]),
-    ?line Six = lists:keymerge(1, [{1,a},{2,b},{5,e}],[{3,c},{4,d},{6,f}]),
-    ?line [{1,a},{2,b},{3,c},{5,e},{7,g}] = 
+    [] = lists:keymerge(1, [], []),
+    Two = lists:keymerge(1, Two, []),
+    Two = lists:keymerge(1, [], Two),
+    Six = lists:keymerge(1, [{1,a},{3,c},{5,e}], [{2,b},{4,d},{6,f}]),
+    Six = lists:keymerge(1, [{2,b},{4,d},{6,f}], [{1,a},{3,c},{5,e}]),
+    Six = lists:keymerge(1, [{1,a},{2,b},{3,c}], [{4,d},{5,e},{6,f}]),
+    Six = lists:keymerge(1, [{4,d},{5,e},{6,f}], [{1,a},{2,b},{3,c}]),
+    Six = lists:keymerge(1, [{1,a},{2,b},{5,e}],[{3,c},{4,d},{6,f}]),
+    [{1,a},{2,b},{3,c},{5,e},{7,g}] =
 	lists:keymerge(1, [{1,a},{3,c},{5,e},{7,g}], [{2,b}]),
-    ?line [{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}] = 
+    [{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}] =
 	lists:keymerge(1, [{1,a},{3,c},{5,e},{7,g}], [{2,b},{4,d}]),
-    ?line [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}] = 
+    [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}] =
 	lists:keymerge(1, [{1,a},{3,c},{5,e},{7,g}], [{2,b},{4,d},{6,f}]),
-    ?line [{1,a},{2,b},{3,c},{5,e},{7,g}] = 
+    [{1,a},{2,b},{3,c},{5,e},{7,g}] =
 	lists:keymerge(1, [{2,b}], [{1,a},{3,c},{5,e},{7,g}]),
-    ?line [{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}] = 
+    [{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}] =
 	lists:keymerge(1, [{2,b},{4,d}], [{1,a},{3,c},{5,e},{7,g}]),
-    ?line [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}] = 
+    [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}] =
 	lists:keymerge(1, [{2,b},{4,d},{6,f}], [{1,a},{3,c},{5,e},{7,g}]),
 
-    ?line [{b,2},{c,11},{c,12},{c,21},{c,22},{e,5}] =
+    [{b,2},{c,11},{c,12},{c,21},{c,22},{e,5}] =
 	lists:keymerge(1,[{c,11},{c,12},{e,5}], [{b,2},{c,21},{c,22}]),
 
     ok.
 
-rkeymerge(doc) -> ["Reverse key merge two lists."];
-rkeymerge(suite) -> [];
+%% Reverse key merge two lists.
 rkeymerge(Config) when is_list(Config) ->
 
     Two = [{2,b},{1,a}],
     Six = [{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}],
 
     %% 2-way reversed keymerge
-    ?line [] = lists:rkeymerge(1, [], []),
-    ?line Two = lists:rkeymerge(1, Two, []),
-    ?line Two = lists:rkeymerge(1, [], Two),
-    ?line Six = lists:rkeymerge(1, [{5,e},{3,c},{1,a}], [{6,f},{4,d},{2,b}]),
-    ?line Six = lists:rkeymerge(1, [{6,f},{4,d},{2,b}], [{5,e},{3,c},{1,a}]),
-    ?line Six = lists:rkeymerge(1, [{3,c},{2,b},{1,a}], [{6,f},{5,e},{4,d}]),
-    ?line Six = lists:rkeymerge(1, [{6,f},{5,e},{4,d}], [{3,c},{2,b},{1,a}]),
-    ?line Six = lists:rkeymerge(1, [{4,d},{3,c},{2,b}],[{6,f},{5,e},{1,a}]),
-    ?line [{7,g},{6,f},{5,e},{3,c},{1,a}] = 
+    [] = lists:rkeymerge(1, [], []),
+    Two = lists:rkeymerge(1, Two, []),
+    Two = lists:rkeymerge(1, [], Two),
+    Six = lists:rkeymerge(1, [{5,e},{3,c},{1,a}], [{6,f},{4,d},{2,b}]),
+    Six = lists:rkeymerge(1, [{6,f},{4,d},{2,b}], [{5,e},{3,c},{1,a}]),
+    Six = lists:rkeymerge(1, [{3,c},{2,b},{1,a}], [{6,f},{5,e},{4,d}]),
+    Six = lists:rkeymerge(1, [{6,f},{5,e},{4,d}], [{3,c},{2,b},{1,a}]),
+    Six = lists:rkeymerge(1, [{4,d},{3,c},{2,b}],[{6,f},{5,e},{1,a}]),
+    [{7,g},{6,f},{5,e},{3,c},{1,a}] =
 	lists:rkeymerge(1, [{7,g},{5,e},{3,c},{1,a}], [{6,f}]),
-    ?line [{7,g},{6,f},{5,e},{4,d},{3,c},{1,a}] = 
+    [{7,g},{6,f},{5,e},{4,d},{3,c},{1,a}] =
 	lists:rkeymerge(1, [{7,g},{5,e},{3,c},{1,a}], [{6,f},{4,d}]),
-    ?line [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}] = 
+    [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}] =
 	lists:rkeymerge(1, [{7,g},{5,e},{3,c},{1,a}], [{6,f},{4,d},{2,b}]),
-    ?line [{7,g},{5,e},{3,c},{2,b},{1,a}] = 
+    [{7,g},{5,e},{3,c},{2,b},{1,a}] =
 	lists:rkeymerge(1, [{2,b}], [{7,g},{5,e},{3,c},{1,a}]),
-    ?line [{7,g},{5,e},{4,d},{3,c},{2,b},{1,a}] = 
+    [{7,g},{5,e},{4,d},{3,c},{2,b},{1,a}] =
 	lists:rkeymerge(1, [{4,d},{2,b}], [{7,g},{5,e},{3,c},{1,a}]),
-    ?line [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}] = 
+    [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}] =
 	lists:rkeymerge(1, [{6,f},{4,d},{2,b}], [{7,g},{5,e},{3,c},{1,a}]),
 
     L1 = [{c,11},{c,12},{e,5}],
     L2 = [{b,2},{c,21},{c,22}],
-    ?line true = 
+    true =
 	lists:keymerge(1, L1, L2) == 
 	lists:reverse(lists:rkeymerge(1,lists:reverse(L1), 
 				      lists:reverse(L2))),
 
     ok.
 
-keysort_1(doc) ->   ["keysort"];
-keysort_1(suite) -> [];
 keysort_1(Config) when is_list(Config) ->
-    ?line ok = keysort_check(1, [], []),
-    ?line ok = keysort_check(1, [{a,b}], [{a,b}]),
-    ?line ok = keysort_check(1, [{a,b},{a,b}], [{a,b},{a,b}]),
-    ?line ok = keysort_check(1, [{a,b},{b,c}], [{a,b},{b,c}]),
-    ?line ok = keysort_check(1, [{b,c},{a,b}], [{a,b},{b,c}]),
-    ?line ok = keysort_check(1,
-			     [{1,e},{3,f},{2,y},{0,z},{x,14}],
-			     [{0,z},{1,e},{2,y},{3,f},{x,14}]),
-    ?line ok = keysort_check(1,
-			     [{1,a},{1,a},{1,a},{1,a}],
-			     [{1,a},{1,a},{1,a},{1,a}]),
-
-    ?line [{b,1},{c,1}] = lists:keysort(1, [{c,1},{b,1}]),
-    ?line [{a,0},{b,2},{c,3},{d,4}] = 
-	  lists:keysort(1, [{d,4},{c,3},{b,2},{a,0}]),
-    ?line [{a,0},{b,1},{b,2},{c,1}] =
-	  lists:keysort(1, [{c,1},{b,1},{b,2},{a,0}]),
-    ?line [{a,0},{b,1},{b,2},{c,1},{d,4}] =
-	  lists:keysort(1, [{c,1},{b,1},{b,2},{a,0},{d,4}]),
+    ok = keysort_check(1, [], []),
+    ok = keysort_check(1, [{a,b}], [{a,b}]),
+    ok = keysort_check(1, [{a,b},{a,b}], [{a,b},{a,b}]),
+    ok = keysort_check(1, [{a,b},{b,c}], [{a,b},{b,c}]),
+    ok = keysort_check(1, [{b,c},{a,b}], [{a,b},{b,c}]),
+    ok = keysort_check(1,
+		       [{1,e},{3,f},{2,y},{0,z},{x,14}],
+		       [{0,z},{1,e},{2,y},{3,f},{x,14}]),
+    ok = keysort_check(1,
+		       [{1,a},{1,a},{1,a},{1,a}],
+		       [{1,a},{1,a},{1,a},{1,a}]),
+
+    [{b,1},{c,1}] = lists:keysort(1, [{c,1},{b,1}]),
+    [{a,0},{b,2},{c,3},{d,4}] =
+	lists:keysort(1, [{d,4},{c,3},{b,2},{a,0}]),
+    [{a,0},{b,1},{b,2},{c,1}] =
+	lists:keysort(1, [{c,1},{b,1},{b,2},{a,0}]),
+    [{a,0},{b,1},{b,2},{c,1},{d,4}] =
+	lists:keysort(1, [{c,1},{b,1},{b,2},{a,0},{d,4}]),
 
     SFun = fun(L) -> fun(X) -> keysort_check(1, X, L) end end,
     L1 = [{1,a},{2,b},{3,c}],
-    ?line lists:foreach(SFun(L1), perms(L1)),
+    lists:foreach(SFun(L1), perms(L1)),
     L2 = [{1,a},{1,a},{2,b}],
-    ?line lists:foreach(SFun(L2), perms(L2)),
+    lists:foreach(SFun(L2), perms(L2)),
     L3 = [{1,a},{1,a},{1,a},{2,b}],
-    ?line lists:foreach(SFun(L3), perms(L3)),
+    lists:foreach(SFun(L3), perms(L3)),
     L4 = [{a,1},{a,1},{b,2},{b,2},{c,3},{d,4},{e,5},{f,6}],
-    ?line lists:foreach(SFun(L4), perms(L4)),
+    lists:foreach(SFun(L4), perms(L4)),
 
     ok.
 
-keysort_stable(doc) ->   ["keysort should be stable"];
-keysort_stable(suite) -> [];
+%% keysort should be stable
 keysort_stable(Config) when is_list(Config) ->
-    ?line ok = keysort_check(1, [{1,b},{1,c}], [{1,b},{1,c}]),
-    ?line ok = keysort_check(1, [{1,c},{1,b}], [{1,c},{1,b}]),
-    ?line ok = keysort_check(1,
-			     [{1,c},{1,b},{2,x},{3,p},{2,a}],
-			     [{1,c},{1,b},{2,x},{2,a},{3,p}]),
-    ?line ok = keysort_check(1, 
-			     [{1,a},{1,b},{1,a},{1,a}],
-			     [{1,a},{1,b},{1,a},{1,a}]),
-    ok.
-
-keysort_error(doc) ->   ["keysort should exit when given bad arguments"];
-keysort_error(suite) -> [];
+    ok = keysort_check(1, [{1,b},{1,c}], [{1,b},{1,c}]),
+    ok = keysort_check(1, [{1,c},{1,b}], [{1,c},{1,b}]),
+    ok = keysort_check(1,
+		       [{1,c},{1,b},{2,x},{3,p},{2,a}],
+		       [{1,c},{1,b},{2,x},{2,a},{3,p}]),
+    ok = keysort_check(1,
+		       [{1,a},{1,b},{1,a},{1,a}],
+		       [{1,a},{1,b},{1,a},{1,a}]),
+    ok.
+
+%% keysort should exit when given bad arguments
 keysort_error(Config) when is_list(Config) ->
-    ?line {'EXIT', _} = (catch lists:keysort(0, [{1,b},{1,c}])),
-    ?line {'EXIT', _} = (catch lists:keysort(3, [{1,b},{1,c}])),
-    ?line {'EXIT', _} = (catch lists:keysort(1.5, [{1,b},{1,c}])),
-    ?line {'EXIT', _} = (catch lists:keysort(x, [{1,b},{1,c}])),
-    ?line {'EXIT', _} = (catch lists:keysort(x, [])),
-    ?line {'EXIT', _} = (catch lists:keysort(x, [{1,b}])),
-    ?line {'EXIT', _} = (catch lists:keysort(1, [a,b])),
-    ?line {'EXIT', _} = (catch lists:keysort(1, [{1,b} | {1,c}])),
-    ok.
-
-keysort_i(doc) ->   ["keysort with other key than first element"];
-keysort_i(suite) -> [];
+    {'EXIT', _} = (catch lists:keysort(0, [{1,b},{1,c}])),
+    {'EXIT', _} = (catch lists:keysort(3, [{1,b},{1,c}])),
+    {'EXIT', _} = (catch lists:keysort(1.5, [{1,b},{1,c}])),
+    {'EXIT', _} = (catch lists:keysort(x, [{1,b},{1,c}])),
+    {'EXIT', _} = (catch lists:keysort(x, [])),
+    {'EXIT', _} = (catch lists:keysort(x, [{1,b}])),
+    {'EXIT', _} = (catch lists:keysort(1, [a,b])),
+    {'EXIT', _} = (catch lists:keysort(1, [{1,b} | {1,c}])),
+    ok.
+
+%% keysort with other key than first element
 keysort_i(Config) when is_list(Config) ->
-    ?line ok = keysort_check(2, [{a,2},{b,1},{c,3}], [{b,1},{a,2},{c,3}]),
+    ok = keysort_check(2, [{a,2},{b,1},{c,3}], [{b,1},{a,2},{c,3}]),
     ok.
 
-keysort_rand(doc) ->   ["keysort on big randomized lists"];
-keysort_rand(suite) -> [];
+%% keysort on big randomized lists
 keysort_rand(Config) when is_list(Config) ->
-    ?line ok = keysort_check3(1, biglist(10)),
-    ?line ok = keysort_check3(1, biglist(100)),
-    ?line ok = keysort_check3(1, biglist(1000)),
-    ?line ok = keysort_check3(1, biglist(10000)),
+    ok = keysort_check3(1, biglist(10)),
+    ok = keysort_check3(1, biglist(100)),
+    ok = keysort_check3(1, biglist(1000)),
+    ok = keysort_check3(1, biglist(10000)),
 
-    ?line ok = keysort_check3(2, biglist(10)),
-    ?line ok = keysort_check3(2, biglist(100)),
-    ?line ok = keysort_check3(2, biglist(1000)),
-    ?line ok = keysort_check3(2, biglist(10000)),
+    ok = keysort_check3(2, biglist(10)),
+    ok = keysort_check3(2, biglist(100)),
+    ok = keysort_check3(2, biglist(1000)),
+    ok = keysort_check3(2, biglist(10000)),
     ok.
 
 %%% Keysort a list, check that the returned list is what we expected,
 %%% and that it is actually sorted.
 keysort_check(I, Input, Expected) ->
-    ?line Expected = lists:keysort(I, Input),
+    Expected = lists:keysort(I, Input),
     check_sorted(I, Input, Expected).
 
 keysort_check3(I, Input) ->
@@ -1020,232 +976,223 @@ keycompare(I, J, A, B) when element(I, A) == element(I, B),
     ok.
 
 
-ukeymerge(suite) -> [];
-ukeymerge(doc) -> ["Merge two lists while removing duplicates."];
+%% Merge two lists while removing duplicates.
 ukeymerge(Conf) when is_list(Conf) ->
 
     Two = [{1,a},{2,b}],
     Six = [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f}],
 
     %% 2-way unique keymerge
-    ?line [] = lists:ukeymerge(1, [], []),
-    ?line Two = lists:ukeymerge(1, Two, []),
-    ?line Two = lists:ukeymerge(1, [], Two),
-    ?line [] = lists:ukeymerge(1, [], []),
-    ?line Two = lists:ukeymerge(1, Two, []),
-    ?line Two = lists:ukeymerge(1, [], Two),
-    ?line Six = lists:ukeymerge(1, [{1,a},{3,c},{5,e}], [{2,b},{4,d},{6,f}]),
-    ?line Six = lists:ukeymerge(1, [{2,b},{4,d},{6,f}], [{1,a},{3,c},{5,e}]),
-    ?line Six = lists:ukeymerge(1, [{1,a},{2,b},{3,c}], [{4,d},{5,e},{6,f}]),
-    ?line Six = lists:ukeymerge(1, [{4,d},{5,e},{6,f}], [{1,a},{2,b},{3,c}]),
-    ?line Six = lists:ukeymerge(1, [{1,a},{2,b},{5,e}],[{3,c},{4,d},{6,f}]),
-    ?line [{1,a},{2,b},{3,c},{5,e},{7,g}] = 
+    [] = lists:ukeymerge(1, [], []),
+    Two = lists:ukeymerge(1, Two, []),
+    Two = lists:ukeymerge(1, [], Two),
+    [] = lists:ukeymerge(1, [], []),
+    Two = lists:ukeymerge(1, Two, []),
+    Two = lists:ukeymerge(1, [], Two),
+    Six = lists:ukeymerge(1, [{1,a},{3,c},{5,e}], [{2,b},{4,d},{6,f}]),
+    Six = lists:ukeymerge(1, [{2,b},{4,d},{6,f}], [{1,a},{3,c},{5,e}]),
+    Six = lists:ukeymerge(1, [{1,a},{2,b},{3,c}], [{4,d},{5,e},{6,f}]),
+    Six = lists:ukeymerge(1, [{4,d},{5,e},{6,f}], [{1,a},{2,b},{3,c}]),
+    Six = lists:ukeymerge(1, [{1,a},{2,b},{5,e}],[{3,c},{4,d},{6,f}]),
+    [{1,a},{2,b},{3,c},{5,e},{7,g}] =
 	lists:ukeymerge(1, [{1,a},{3,c},{5,e},{7,g}], [{2,b}]),
-    ?line [{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}] = 
+    [{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}] =
 	lists:ukeymerge(1, [{1,a},{3,c},{5,e},{7,g}], [{2,b},{4,d}]),
-    ?line [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}] = 
+    [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}] =
 	lists:ukeymerge(1, [{1,a},{3,c},{5,e},{7,g}], [{2,b},{4,d},{6,f}]),
-    ?line [{1,a},{2,b},{3,c},{5,e},{7,g}] = 
+    [{1,a},{2,b},{3,c},{5,e},{7,g}] =
 	lists:ukeymerge(1, [{2,b}], [{1,a},{3,c},{5,e},{7,g}]),
-    ?line [{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}] = 
+    [{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}] =
 	lists:ukeymerge(1, [{2,b},{4,d}], [{1,a},{3,c},{5,e},{7,g}]),
-    ?line [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}] = 
+    [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}] =
 	lists:ukeymerge(1, [{2,b},{4,d},{6,f}], [{1,a},{3,c},{5,e},{7,g}]),
 
-    ?line [{1,a},{2,b},{3,c},{5,e},{7,g}] = 
+    [{1,a},{2,b},{3,c},{5,e},{7,g}] =
 	lists:ukeymerge(1, [{1,a},{2,b},{3,c},{5,e},{7,g}], [{2,b}]),
-    ?line [{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}] = 
+    [{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}] =
 	lists:ukeymerge(1, [{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}], 
 			[{2,b},{4,d}]),
-    ?line [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}] = 
+    [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}] =
 	lists:ukeymerge(1, [{1,a},{3,c},{5,e},{6,f},{7,g}], 
 			[{2,b},{4,d},{6,f}]),
-    ?line [{1,a},{2,b},{3,c},{5,e},{7,g}] = 
+    [{1,a},{2,b},{3,c},{5,e},{7,g}] =
 	lists:ukeymerge(1, [{2,b}], [{1,a},{2,b},{3,c},{5,e},{7,g}]),
-    ?line [{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}] = 
+    [{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}] =
 	lists:ukeymerge(1, [{2,b},{4,d}], 
 			[{1,a},{2,b},{3,c},{4,d},{5,e},{7,g}]),
-    ?line [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}] = 
+    [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}] =
 	lists:ukeymerge(1, [{2,b},{4,d},{6,f}], 
-		     [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}]),
+			[{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{7,g}]),
 
     L1 = [{a,1},{a,3},{a,5},{a,7}],
     L2 = [{b,1},{b,3},{b,5},{b,7}],
-    ?line L1 = lists:ukeymerge(2, L1, L2),
+    L1 = lists:ukeymerge(2, L1, L2),
 
     ok.
 
-rukeymerge(suite) -> [];
-rukeymerge(doc) -> 
-    ["Reverse merge two lists while removing duplicates."];
+%% Reverse merge two lists while removing duplicates.
 rukeymerge(Conf) when is_list(Conf) ->
 
     Two = [{2,b},{1,a}],
     Six = [{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}],
 
     %% 2-way reversed unique keymerge
-    ?line [] = lists:rukeymerge(1, [], []),
-    ?line Two = lists:rukeymerge(1, Two, []),
-    ?line Two = lists:rukeymerge(1, [], Two),
-    ?line Six = lists:rukeymerge(1, [{5,e},{3,c},{1,a}], [{6,f},{4,d},{2,b}]),
-    ?line Six = lists:rukeymerge(1, [{6,f},{4,d},{2,b}], [{5,e},{3,c},{1,a}]),
-    ?line Six = lists:rukeymerge(1, [{3,c},{2,b},{1,a}], [{6,f},{5,e},{4,d}]),
-    ?line Six = lists:rukeymerge(1, [{6,f},{5,e},{4,d}], [{3,c},{2,b},{1,a}]),
-    ?line Six = lists:rukeymerge(1, [{4,d},{3,c},{2,b}],[{6,f},{5,e},{1,a}]),
-    ?line [{7,g},{6,f},{5,e},{3,c},{1,a}] = 
+    [] = lists:rukeymerge(1, [], []),
+    Two = lists:rukeymerge(1, Two, []),
+    Two = lists:rukeymerge(1, [], Two),
+    Six = lists:rukeymerge(1, [{5,e},{3,c},{1,a}], [{6,f},{4,d},{2,b}]),
+    Six = lists:rukeymerge(1, [{6,f},{4,d},{2,b}], [{5,e},{3,c},{1,a}]),
+    Six = lists:rukeymerge(1, [{3,c},{2,b},{1,a}], [{6,f},{5,e},{4,d}]),
+    Six = lists:rukeymerge(1, [{6,f},{5,e},{4,d}], [{3,c},{2,b},{1,a}]),
+    Six = lists:rukeymerge(1, [{4,d},{3,c},{2,b}],[{6,f},{5,e},{1,a}]),
+    [{7,g},{6,f},{5,e},{3,c},{1,a}] =
 	lists:rukeymerge(1, [{7,g},{5,e},{3,c},{1,a}], [{6,f}]),
-    ?line [{7,g},{6,f},{5,e},{4,d},{3,c},{1,a}] = 
+    [{7,g},{6,f},{5,e},{4,d},{3,c},{1,a}] =
 	lists:rukeymerge(1, [{7,g},{5,e},{3,c},{1,a}], [{6,f},{4,d}]),
-    ?line [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}] = 
+    [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}] =
 	lists:rukeymerge(1, [{7,g},{5,e},{3,c},{1,a}], [{6,f},{4,d},{2,b}]),
-    ?line [{7,g},{5,e},{3,c},{2,b},{1,a}] = 
+    [{7,g},{5,e},{3,c},{2,b},{1,a}] =
 	lists:rukeymerge(1, [{2,b}], [{7,g},{5,e},{3,c},{1,a}]),
-    ?line [{7,g},{5,e},{4,d},{3,c},{2,b},{1,a}] = 
+    [{7,g},{5,e},{4,d},{3,c},{2,b},{1,a}] =
 	lists:rukeymerge(1, [{4,d},{2,b}], [{7,g},{5,e},{3,c},{1,a}]),
-    ?line [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}] = 
+    [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}] =
 	lists:rukeymerge(1, [{6,f},{4,d},{2,b}], [{7,g},{5,e},{3,c},{1,a}]),
 
-    ?line [{7,g},{6,f},{5,e},{3,c},{1,a}] = 
+    [{7,g},{6,f},{5,e},{3,c},{1,a}] =
 	lists:rukeymerge(1, [{7,g},{6,f},{5,e},{3,c},{1,a}], [{6,f}]),
-    ?line [{7,g},{6,f},{5,e},{4,d},{3,c},{1,a}] = 
+    [{7,g},{6,f},{5,e},{4,d},{3,c},{1,a}] =
 	lists:rukeymerge(1, [{7,g},{6,f},{5,e},{4,d},{3,c},{1,a}], 
 			 [{6,f},{4,d}]),
-    ?line [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}] = 
+    [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}] =
 	lists:rukeymerge(1, [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}], 
-		      [{6,f},{4,d},{2,b}]),
-    ?line [{7,g},{5,e},{3,c},{2,b},{1,a}] = 
+			 [{6,f},{4,d},{2,b}]),
+    [{7,g},{5,e},{3,c},{2,b},{1,a}] =
 	lists:rukeymerge(1, [{2,b}], [{7,g},{5,e},{3,c},{2,b},{1,a}]),
-    ?line [{7,g},{5,e},{4,d},{3,c},{2,b},{1,a}] = 
+    [{7,g},{5,e},{4,d},{3,c},{2,b},{1,a}] =
 	lists:rukeymerge(1, [{4,d},{2,b}], 
 			 [{7,g},{5,e},{4,d},{3,c},{2,b},{1,a}]),
-    ?line [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}] = 
+    [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}] =
 	lists:rukeymerge(1, [{6,f},{4,d},{2,b}], 
-		      [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}]),
+			 [{7,g},{6,f},{5,e},{4,d},{3,c},{2,b},{1,a}]),
 
     L1 = [{a,1},{a,3},{a,5},{a,7}],
     L2 = [{b,1},{b,3},{b,5},{b,7}],
-    ?line true = 
+    true =
 	lists:ukeymerge(2, L1, L2) == 
 	lists:reverse(lists:rukeymerge(2, lists:reverse(L1), 
 				       lists:reverse(L2))),
 
     ok.
 
-ukeysort_1(doc) ->   ["ukeysort"];
-ukeysort_1(suite) -> [];
 ukeysort_1(Config) when is_list(Config) ->
-    ?line ok = ukeysort_check(1, [], []),
-    ?line ok = ukeysort_check(1, [{a,b}], [{a,b}]),
-    ?line ok = ukeysort_check(1, [{a,b},{a,b}], [{a,b}]),
-    ?line ok = ukeysort_check(1, [{a,b},{b,c}], [{a,b},{b,c}]),
-    ?line ok = ukeysort_check(1, [{b,c},{a,b}], [{a,b},{b,c}]),
-    ?line ok = ukeysort_check(1,
-                              [{1,e},{3,f},{2,y},{0,z},{x,14}],
-                              [{0,z},{1,e},{2,y},{3,f},{x,14}]),
-    ?line ok = ukeysort_check(1, [{1,a},{1,a},{1,a},{1,a}], [{1,a}]),
+    ok = ukeysort_check(1, [], []),
+    ok = ukeysort_check(1, [{a,b}], [{a,b}]),
+    ok = ukeysort_check(1, [{a,b},{a,b}], [{a,b}]),
+    ok = ukeysort_check(1, [{a,b},{b,c}], [{a,b},{b,c}]),
+    ok = ukeysort_check(1, [{b,c},{a,b}], [{a,b},{b,c}]),
+    ok = ukeysort_check(1,
+			[{1,e},{3,f},{2,y},{0,z},{x,14}],
+			[{0,z},{1,e},{2,y},{3,f},{x,14}]),
+    ok = ukeysort_check(1, [{1,a},{1,a},{1,a},{1,a}], [{1,a}]),
 
     L1 = [{1,a},{1,b},{1,a}],
     L1u = lists:ukeysort(1, L1),
     L2 = [{1,a},{1,b},{1,a}],
     L2u = lists:ukeysort(1, L2),
-    ?line ok = ukeysort_check(1, lists:keymerge(1, L1, L2), 
-                              lists:ukeymerge(1, L1u, L2u)),
+    ok = ukeysort_check(1, lists:keymerge(1, L1, L2),
+			lists:ukeymerge(1, L1u, L2u)),
     L3 = [{1,a},{1,b},{1,a},{2,a}],
     L3u = lists:ukeysort(1, L3),
-    ?line ok = ukeysort_check(1, lists:keymerge(1, L3, L2), 
-                              lists:ukeymerge(1, L3u, L2u)),
+    ok = ukeysort_check(1, lists:keymerge(1, L3, L2),
+			lists:ukeymerge(1, L3u, L2u)),
     L4 = [{1,b},{1,a}],
     L4u = lists:ukeysort(1, L4),
-    ?line ok = ukeysort_check(1, lists:keymerge(1, L1, L4), 
-                              lists:ukeymerge(1, L1u, L4u)),
+    ok = ukeysort_check(1, lists:keymerge(1, L1, L4),
+			lists:ukeymerge(1, L1u, L4u)),
     L5 = [{1,a},{1,b},{1,a},{2,a}],
     L5u = lists:ukeysort(1, L5),
-    ?line ok = ukeysort_check(1, lists:keymerge(1, [], L5), 
-                              lists:ukeymerge(1, [], L5u)),
-    ?line ok = ukeysort_check(1, lists:keymerge(1, L5, []), 
-                              lists:ukeymerge(1, L5u, [])),
+    ok = ukeysort_check(1, lists:keymerge(1, [], L5),
+			lists:ukeymerge(1, [], L5u)),
+    ok = ukeysort_check(1, lists:keymerge(1, L5, []),
+			lists:ukeymerge(1, L5u, [])),
     L6 = [{3,a}],
     L6u = lists:ukeysort(1, L6),
-    ?line ok = ukeysort_check(1, lists:keymerge(1, L5, L6), 
-                              lists:ukeymerge(1, L5u, L6u)),
+    ok = ukeysort_check(1, lists:keymerge(1, L5, L6),
+			lists:ukeymerge(1, L5u, L6u)),
 
-    ?line [{b,1},{c,1}] = lists:ukeysort(1, [{c,1},{c,1},{c,1},{c,1},{b,1}]),
-    ?line [{a,0},{b,2},{c,3},{d,4}] = 
-	  lists:ukeysort(1, [{d,4},{c,3},{b,2},{b,2},{a,0}]),
-    ?line [{a,0},{b,1},{c,1}] =
-	  lists:ukeysort(1, [{c,1},{b,1},{b,1},{b,2},{b,2},{a,0}]),
-    ?line [{a,0},{b,1},{c,1},{d,4}] =
-	  lists:ukeysort(1, [{c,1},{b,1},{b,2},{a,0},{a,0},{d,4},{d,4}]),
+    [{b,1},{c,1}] = lists:ukeysort(1, [{c,1},{c,1},{c,1},{c,1},{b,1}]),
+    [{a,0},{b,2},{c,3},{d,4}] =
+	lists:ukeysort(1, [{d,4},{c,3},{b,2},{b,2},{a,0}]),
+    [{a,0},{b,1},{c,1}] =
+	lists:ukeysort(1, [{c,1},{b,1},{b,1},{b,2},{b,2},{a,0}]),
+    [{a,0},{b,1},{c,1},{d,4}] =
+	lists:ukeysort(1, [{c,1},{b,1},{b,2},{a,0},{a,0},{d,4},{d,4}]),
 
     SFun = fun(L) -> fun(X) -> ukeysort_check(2, X, L) end end,
     PL = [{a,1},{b,2},{c,3},{d,4},{e,5},{f,6}],
     Ps = perms([{a,1},{b,2},{c,3},{d,4},{e,5},{f,6},{b,2},{a,1}]),
-    ?line lists:foreach(SFun(PL), Ps),
+    lists:foreach(SFun(PL), Ps),
 
     M1L = [{1,a},{1,a},{2,b}],
     M1s = [{1,a},{2,b}],
-    ?line lists:foreach(SFun(M1s), perms(M1L)),
+    lists:foreach(SFun(M1s), perms(M1L)),
     M2L = [{1,a},{2,b},{2,b}],
     M2s = [{1,a},{2,b}],
-    ?line lists:foreach(SFun(M2s), perms(M2L)),
+    lists:foreach(SFun(M2s), perms(M2L)),
     M3 = [{1,a},{2,b},{3,c}],
-    ?line lists:foreach(SFun(M3), perms(M3)),
+    lists:foreach(SFun(M3), perms(M3)),
 
     ok.
 
-ukeysort_stable(doc) ->   ["ukeysort should keep the first duplicate"];
-ukeysort_stable(suite) -> [];
+%% ukeysort should keep the first duplicate.
 ukeysort_stable(Config) when is_list(Config) ->
-    ?line ok = ukeysort_check(1, [{1,b},{1,c}], [{1,b}]),
-    ?line ok = ukeysort_check(1, [{1,c},{1,b}], [{1,c}]),
-    ?line ok = ukeysort_check(1,
-                              [{1,c},{1,b},{2,x},{3,p},{2,a}],
-                              [{1,c},{2,x},{3,p}]),
-
-    ?line ok = ukeysort_check(1, [{1,a},{1,b},{1,b}], [{1,a}]),
-    ?line ok = ukeysort_check(1, [{2,a},{1,b},{2,a}], [{1,b},{2,a}]),
-
-    ?line ok = ukeysort_check_stability(bigfunlist(3)),
-    ?line ok = ukeysort_check_stability(bigfunlist(10)),
-    ?line ok = ukeysort_check_stability(bigfunlist(100)),
-    ?line ok = ukeysort_check_stability(bigfunlist(1000)),
-    ?line case erlang:system_info(modified_timing_level) of
-              undefined -> ok = ukeysort_check_stability(bigfunlist(10000));
-              _ -> ok
-          end,
-    ok.
-
-ukeysort_error(doc) ->   ["ukeysort should exit when given bad arguments"];
-ukeysort_error(suite) -> [];
+    ok = ukeysort_check(1, [{1,b},{1,c}], [{1,b}]),
+    ok = ukeysort_check(1, [{1,c},{1,b}], [{1,c}]),
+    ok = ukeysort_check(1,
+			[{1,c},{1,b},{2,x},{3,p},{2,a}],
+			[{1,c},{2,x},{3,p}]),
+
+    ok = ukeysort_check(1, [{1,a},{1,b},{1,b}], [{1,a}]),
+    ok = ukeysort_check(1, [{2,a},{1,b},{2,a}], [{1,b},{2,a}]),
+
+    ok = ukeysort_check_stability(bigfunlist(3)),
+    ok = ukeysort_check_stability(bigfunlist(10)),
+    ok = ukeysort_check_stability(bigfunlist(100)),
+    ok = ukeysort_check_stability(bigfunlist(1000)),
+    case erlang:system_info(modified_timing_level) of
+	undefined -> ok = ukeysort_check_stability(bigfunlist(10000));
+	_ -> ok
+    end,
+    ok.
+
+%% ukeysort should exit when given bad arguments.
 ukeysort_error(Config) when is_list(Config) ->
-    ?line {'EXIT', _} = (catch lists:ukeysort(0, [{1,b},{1,c}])),
-    ?line {'EXIT', _} = (catch lists:ukeysort(3, [{1,b},{1,c}])),
-    ?line {'EXIT', _} = (catch lists:ukeysort(1.5, [{1,b},{1,c}])),
-    ?line {'EXIT', _} = (catch lists:ukeysort(x, [{1,b},{1,c}])),
-    ?line {'EXIT', _} = (catch lists:ukeysort(x, [])),
-    ?line {'EXIT', _} = (catch lists:ukeysort(x, [{1,b}])),
-    ?line {'EXIT', _} = (catch lists:ukeysort(1, [a,b])),
-    ?line {'EXIT', _} = (catch lists:ukeysort(1, [{1,b} | {1,c}])),
-    ok.
-
-ukeysort_i(doc) ->   ["ukeysort with other key than first element"];
-ukeysort_i(suite) -> [];
+    {'EXIT', _} = (catch lists:ukeysort(0, [{1,b},{1,c}])),
+    {'EXIT', _} = (catch lists:ukeysort(3, [{1,b},{1,c}])),
+    {'EXIT', _} = (catch lists:ukeysort(1.5, [{1,b},{1,c}])),
+    {'EXIT', _} = (catch lists:ukeysort(x, [{1,b},{1,c}])),
+    {'EXIT', _} = (catch lists:ukeysort(x, [])),
+    {'EXIT', _} = (catch lists:ukeysort(x, [{1,b}])),
+    {'EXIT', _} = (catch lists:ukeysort(1, [a,b])),
+    {'EXIT', _} = (catch lists:ukeysort(1, [{1,b} | {1,c}])),
+    ok.
+
+%% ukeysort with other key than first element.
 ukeysort_i(Config) when is_list(Config) ->
-    ?line ok = ukeysort_check(2, [{a,2},{b,1},{c,3}], [{b,1},{a,2},{c,3}]),
+    ok = ukeysort_check(2, [{a,2},{b,1},{c,3}], [{b,1},{a,2},{c,3}]),
     ok.
 
-ukeysort_rand(doc) ->   ["ukeysort on big randomized lists"];
-ukeysort_rand(suite) -> [];
+%% ukeysort on big randomized lists.
 ukeysort_rand(Config) when is_list(Config) ->
-    ?line ok = ukeysort_check3(2, biglist(10)),
-    ?line ok = ukeysort_check3(2, biglist(100)),
-    ?line ok = ukeysort_check3(2, biglist(1000)),
-    ?line ok = ukeysort_check3(2, biglist(10000)),
+    ok = ukeysort_check3(2, biglist(10)),
+    ok = ukeysort_check3(2, biglist(100)),
+    ok = ukeysort_check3(2, biglist(1000)),
+    ok = ukeysort_check3(2, biglist(10000)),
 
-    ?line ok = gen_ukeysort_check(1, ubiglist(10)),
-    ?line ok = gen_ukeysort_check(1, ubiglist(100)),
-    ?line ok = gen_ukeysort_check(1, ubiglist(1000)),
-    ?line ok = gen_ukeysort_check(1, ubiglist(10000)),
+    ok = gen_ukeysort_check(1, ubiglist(10)),
+    ok = gen_ukeysort_check(1, ubiglist(100)),
+    ok = gen_ukeysort_check(1, ubiglist(1000)),
+    ok = gen_ukeysort_check(1, ubiglist(10000)),
     ok.
 
 %% Check that ukeysort/2 is stable and correct relative keysort/2.
@@ -1272,7 +1219,7 @@ ukeysort_check_stability(L) ->
 %%% Uniquely keysort a list, check that the returned list is what we
 %%% expected, and that it is actually sorted.
 ukeysort_check(I, Input, Expected) ->
-    ?line Expected = lists:ukeysort(I, Input),
+    Expected = lists:ukeysort(I, Input),
     ucheck_sorted(I, Input, Expected).
 
 ukeysort_check3(I, Input) ->
@@ -1309,8 +1256,7 @@ ukeycompare(I, J, A, B) when A =/= B,
 
 
 
-funmerge(doc) -> ["Merge two lists using a fun."];
-funmerge(suite) -> [];
+%% Merge two lists using a fun.
 funmerge(Config) when is_list(Config) ->
 
     Two = [1,2],
@@ -1318,29 +1264,28 @@ funmerge(Config) when is_list(Config) ->
     F = fun(X, Y) -> X =< Y end,
 
     %% 2-way merge
-    ?line [] = lists:merge(F, [], []),
-    ?line Two = lists:merge(F, Two, []),
-    ?line Two = lists:merge(F, [], Two),
-    ?line Six = lists:merge(F, [1,3,5], [2,4,6]),
-    ?line Six = lists:merge(F, [2,4,6], [1,3,5]),
-    ?line Six = lists:merge(F, [1,2,3], [4,5,6]),
-    ?line Six = lists:merge(F, [4,5,6], [1,2,3]),
-    ?line Six = lists:merge(F, [1,2,5],[3,4,6]),
-    ?line [1,2,3,5,7] = lists:merge(F, [1,3,5,7], [2]),
-    ?line [1,2,3,4,5,7] = lists:merge(F, [1,3,5,7], [2,4]),
-    ?line [1,2,3,4,5,6,7] = lists:merge(F, [1,3,5,7], [2,4,6]),
-    ?line [1,2,3,5,7] = lists:merge(F, [2], [1,3,5,7]),
-    ?line [1,2,3,4,5,7] = lists:merge(F, [2,4], [1,3,5,7]),
-    ?line [1,2,3,4,5,6,7] = lists:merge(F, [2,4,6], [1,3,5,7]),
+    [] = lists:merge(F, [], []),
+    Two = lists:merge(F, Two, []),
+    Two = lists:merge(F, [], Two),
+    Six = lists:merge(F, [1,3,5], [2,4,6]),
+    Six = lists:merge(F, [2,4,6], [1,3,5]),
+    Six = lists:merge(F, [1,2,3], [4,5,6]),
+    Six = lists:merge(F, [4,5,6], [1,2,3]),
+    Six = lists:merge(F, [1,2,5],[3,4,6]),
+    [1,2,3,5,7] = lists:merge(F, [1,3,5,7], [2]),
+    [1,2,3,4,5,7] = lists:merge(F, [1,3,5,7], [2,4]),
+    [1,2,3,4,5,6,7] = lists:merge(F, [1,3,5,7], [2,4,6]),
+    [1,2,3,5,7] = lists:merge(F, [2], [1,3,5,7]),
+    [1,2,3,4,5,7] = lists:merge(F, [2,4], [1,3,5,7]),
+    [1,2,3,4,5,6,7] = lists:merge(F, [2,4,6], [1,3,5,7]),
 
     F2 = fun(X,Y) -> element(1,X) =< element(1,Y) end,
-    ?line [{b,2},{c,11},{c,12},{c,21},{c,22},{e,5}] =
+    [{b,2},{c,11},{c,12},{c,21},{c,22},{e,5}] =
 	lists:merge(F2,[{c,11},{c,12},{e,5}], [{b,2},{c,21},{c,22}]),
 
     ok.
 
-rfunmerge(doc) -> ["Reverse merge two lists using a fun."];
-rfunmerge(suite) -> [];
+%% Reverse merge two lists using a fun.
 rfunmerge(Config) when is_list(Config) ->
 
     Two = [2,1],
@@ -1348,86 +1293,81 @@ rfunmerge(Config) when is_list(Config) ->
     F = fun(X, Y) -> X =< Y end,
 
     %% 2-way reversed merge
-    ?line [] = lists:rmerge(F, [], []),
-    ?line Two = lists:rmerge(F, Two, []),
-    ?line Two = lists:rmerge(F, [], Two),
-    ?line Six = lists:rmerge(F, [5,3,1], [6,4,2]),
-    ?line Six = lists:rmerge(F, [6,4,2], [5,3,1]),
-    ?line Six = lists:rmerge(F, [3,2,1], [6,5,4]),
-    ?line Six = lists:rmerge(F, [6,5,4], [3,2,1]),
-    ?line Six = lists:rmerge(F, [4,3,2],[6,5,1]),
-    ?line [7,6,5,3,1] = lists:rmerge(F, [7,5,3,1], [6]),
-    ?line [7,6,5,4,3,1] = lists:rmerge(F, [7,5,3,1], [6,4]),
-    ?line [7,6,5,4,3,2,1] = lists:rmerge(F, [7,5,3,1], [6,4,2]),
-    ?line [7,5,3,2,1] = lists:rmerge(F, [2], [7,5,3,1]),
-    ?line [7,5,4,3,2,1] = lists:rmerge(F, [4,2], [7,5,3,1]),
-    ?line [7,6,5,4,3,2,1] = lists:rmerge(F, [6,4,2], [7,5,3,1]),
+    [] = lists:rmerge(F, [], []),
+    Two = lists:rmerge(F, Two, []),
+    Two = lists:rmerge(F, [], Two),
+    Six = lists:rmerge(F, [5,3,1], [6,4,2]),
+    Six = lists:rmerge(F, [6,4,2], [5,3,1]),
+    Six = lists:rmerge(F, [3,2,1], [6,5,4]),
+    Six = lists:rmerge(F, [6,5,4], [3,2,1]),
+    Six = lists:rmerge(F, [4,3,2],[6,5,1]),
+    [7,6,5,3,1] = lists:rmerge(F, [7,5,3,1], [6]),
+    [7,6,5,4,3,1] = lists:rmerge(F, [7,5,3,1], [6,4]),
+    [7,6,5,4,3,2,1] = lists:rmerge(F, [7,5,3,1], [6,4,2]),
+    [7,5,3,2,1] = lists:rmerge(F, [2], [7,5,3,1]),
+    [7,5,4,3,2,1] = lists:rmerge(F, [4,2], [7,5,3,1]),
+    [7,6,5,4,3,2,1] = lists:rmerge(F, [6,4,2], [7,5,3,1]),
 
     F2 = fun(X,Y) -> element(1,X) =< element(1,Y) end,
     L1 = [{c,11},{c,12},{e,5}],
     L2 = [{b,2},{c,21},{c,22}],
-    ?line true = 
+    true =
 	lists:merge(F2, L1, L2) == 
 	lists:reverse(lists:rmerge(F2,lists:reverse(L1), lists:reverse(L2))),
 
     ok.
 
 
-funsort_1(doc) ->   ["sort/2"];
-funsort_1(suite) -> [];
 funsort_1(Config) when is_list(Config) ->
-    ?line ok = funsort_check(1, [], []),
-    ?line ok = funsort_check(1, [{a,b}], [{a,b}]),
-    ?line ok = funsort_check(1, [{a,b},{a,b}], [{a,b},{a,b}]),
-    ?line ok = funsort_check(1, [{a,b},{b,c}], [{a,b},{b,c}]),
-    ?line ok = funsort_check(1, [{b,c},{a,b}], [{a,b},{b,c}]),
-    ?line ok = funsort_check(1,
-			     [{1,e},{3,f},{2,y},{0,z},{x,14}],
-			     [{0,z},{1,e},{2,y},{3,f},{x,14}]),
+    ok = funsort_check(1, [], []),
+    ok = funsort_check(1, [{a,b}], [{a,b}]),
+    ok = funsort_check(1, [{a,b},{a,b}], [{a,b},{a,b}]),
+    ok = funsort_check(1, [{a,b},{b,c}], [{a,b},{b,c}]),
+    ok = funsort_check(1, [{b,c},{a,b}], [{a,b},{b,c}]),
+    ok = funsort_check(1,
+		       [{1,e},{3,f},{2,y},{0,z},{x,14}],
+		       [{0,z},{1,e},{2,y},{3,f},{x,14}]),
     F = funsort_fun(1),
 
-    ?line [{b,1},{c,1}] = lists:sort(F, [{c,1},{b,1}]),
-    ?line [{a,0},{b,2},{c,3},{d,4}] = 
-	  lists:sort(F, [{d,4},{c,3},{b,2},{a,0}]),
-    ?line [{a,0},{b,1},{b,2},{c,1}] =
-	  lists:sort(F, [{c,1},{b,1},{b,2},{a,0}]),
-    ?line [{a,0},{b,1},{b,2},{c,1},{d,4}] =
-	  lists:sort(F, [{c,1},{b,1},{b,2},{a,0},{d,4}]),
+    [{b,1},{c,1}] = lists:sort(F, [{c,1},{b,1}]),
+    [{a,0},{b,2},{c,3},{d,4}] =
+	lists:sort(F, [{d,4},{c,3},{b,2},{a,0}]),
+    [{a,0},{b,1},{b,2},{c,1}] =
+	lists:sort(F, [{c,1},{b,1},{b,2},{a,0}]),
+    [{a,0},{b,1},{b,2},{c,1},{d,4}] =
+	lists:sort(F, [{c,1},{b,1},{b,2},{a,0},{d,4}]),
 
     SFun = fun(L) -> fun(X) -> funsort_check(1, X, L) end end,
     L1 = [{1,a},{1,a},{2,b},{2,b},{3,c},{4,d},{5,e},{6,f}],
-    ?line lists:foreach(SFun(L1), perms(L1)),
+    lists:foreach(SFun(L1), perms(L1)),
 
     ok.
 
-funsort_stable(doc) ->   ["sort/2 should be stable"];
-funsort_stable(suite) -> [];
+%% sort/2 should be stable.
 funsort_stable(Config) when is_list(Config) ->
-    ?line ok = funsort_check(1, [{1,b},{1,c}], [{1,b},{1,c}]),
-    ?line ok = funsort_check(1, [{1,c},{1,b}], [{1,c},{1,b}]),
-    ?line ok = funsort_check(1,
-			     [{1,c},{1,b},{2,x},{3,p},{2,a}],
-			     [{1,c},{1,b},{2,x},{2,a},{3,p}]),
+    ok = funsort_check(1, [{1,b},{1,c}], [{1,b},{1,c}]),
+    ok = funsort_check(1, [{1,c},{1,b}], [{1,c},{1,b}]),
+    ok = funsort_check(1,
+		       [{1,c},{1,b},{2,x},{3,p},{2,a}],
+		       [{1,c},{1,b},{2,x},{2,a},{3,p}]),
     ok.
 
-funsort_error(doc) ->   ["sort/2 should exit when given bad arguments"];
-funsort_error(suite) -> [];
+%% sort/2 should exit when given bad arguments.
 funsort_error(Config) when is_list(Config) ->
-    ?line {'EXIT', _} = (catch lists:sort(1, [{1,b} , {1,c}])),
-    ?line {'EXIT', _} = (catch lists:sort(fun(X,Y) -> X =< Y end, 
-					  [{1,b} | {1,c}])),
+    {'EXIT', _} = (catch lists:sort(1, [{1,b} , {1,c}])),
+    {'EXIT', _} = (catch lists:sort(fun(X,Y) -> X =< Y end,
+				    [{1,b} | {1,c}])),
     ok.
 
-funsort_rand(doc) ->   ["sort/2 on big randomized lists"];
-funsort_rand(suite) -> [];
+%% sort/2 on big randomized lists.
 funsort_rand(Config) when is_list(Config) ->
-    ?line ok = funsort_check3(1, biglist(10)),
-    ?line ok = funsort_check3(1, biglist(100)),
-    ?line ok = funsort_check3(1, biglist(1000)),
-    ?line ok = funsort_check3(1, biglist(10000)),
+    ok = funsort_check3(1, biglist(10)),
+    ok = funsort_check3(1, biglist(100)),
+    ok = funsort_check3(1, biglist(1000)),
+    ok = funsort_check3(1, biglist(10000)),
     ok.
 
-% Do a keysort
+%% Do a keysort
 funsort(I, L) ->
     lists:sort(funsort_fun(I), L).
 
@@ -1437,12 +1377,11 @@ funsort_check3(I, Input) ->
 %%% Keysort a list, check that the returned list is what we expected,
 %%% and that it is actually sorted.
 funsort_check(I, Input, Expected) ->
-    ?line Expected = funsort(I, Input),
+    Expected = funsort(I, Input),
     check_sorted(I, Input, Expected).
 
 
-ufunmerge(suite) -> [];
-ufunmerge(doc) -> ["Merge two lists while removing duplicates using a fun."];
+%% Merge two lists while removing duplicates using a fun.
 ufunmerge(Conf) when is_list(Conf) ->
 
     Two = [1,2],
@@ -1450,175 +1389,168 @@ ufunmerge(Conf) when is_list(Conf) ->
     F = fun(X, Y) -> X =< Y end,
 
     %% 2-way unique merge
-    ?line [] = lists:umerge(F, [], []),
-    ?line Two = lists:umerge(F, Two, []),
-    ?line Two = lists:umerge(F, [], Two),
-    ?line Six = lists:umerge(F, [1,3,5], [2,4,6]),
-    ?line Six = lists:umerge(F, [2,4,6], [1,3,5]),
-    ?line Six = lists:umerge(F, [1,2,3], [4,5,6]),
-    ?line Six = lists:umerge(F, [4,5,6], [1,2,3]),
-    ?line Six = lists:umerge(F, [1,2,5],[3,4,6]),
-    ?line [1,2,3,5,7] = lists:umerge(F, [1,3,5,7], [2]),
-    ?line [1,2,3,4,5,7] = lists:umerge(F, [1,3,5,7], [2,4]),
-    ?line [1,2,3,4,5,6,7] = lists:umerge(F, [1,3,5,7], [2,4,6]),
-    ?line [1,2,3,5,7] = lists:umerge(F, [2], [1,3,5,7]),
-    ?line [1,2,3,4,5,7] = lists:umerge(F, [2,4], [1,3,5,7]),
-    ?line [1,2,3,4,5,6,7] = lists:umerge(F, [2,4,6], [1,3,5,7]),
-
-    ?line [1,2,3,5,7] = lists:umerge(F, [1,2,3,5,7], [2]),
-    ?line [1,2,3,4,5,7] = lists:umerge(F, [1,2,3,4,5,7], [2,4]),
-    ?line [1,2,3,4,5,6,7] = lists:umerge(F, [1,3,5,6,7], [2,4,6]),
-    ?line [1,2,3,5,7] = lists:umerge(F, [2], [1,2,3,5,7]),
-    ?line [1,2,3,4,5,7] = lists:umerge(F, [2,4], [1,2,3,4,5,7]),
-    ?line [1,2,3,4,5,6,7] = lists:umerge(F, [2,4,6], [1,2,3,4,5,6,7]),
+    [] = lists:umerge(F, [], []),
+    Two = lists:umerge(F, Two, []),
+    Two = lists:umerge(F, [], Two),
+    Six = lists:umerge(F, [1,3,5], [2,4,6]),
+    Six = lists:umerge(F, [2,4,6], [1,3,5]),
+    Six = lists:umerge(F, [1,2,3], [4,5,6]),
+    Six = lists:umerge(F, [4,5,6], [1,2,3]),
+    Six = lists:umerge(F, [1,2,5],[3,4,6]),
+    [1,2,3,5,7] = lists:umerge(F, [1,3,5,7], [2]),
+    [1,2,3,4,5,7] = lists:umerge(F, [1,3,5,7], [2,4]),
+    [1,2,3,4,5,6,7] = lists:umerge(F, [1,3,5,7], [2,4,6]),
+    [1,2,3,5,7] = lists:umerge(F, [2], [1,3,5,7]),
+    [1,2,3,4,5,7] = lists:umerge(F, [2,4], [1,3,5,7]),
+    [1,2,3,4,5,6,7] = lists:umerge(F, [2,4,6], [1,3,5,7]),
+
+    [1,2,3,5,7] = lists:umerge(F, [1,2,3,5,7], [2]),
+    [1,2,3,4,5,7] = lists:umerge(F, [1,2,3,4,5,7], [2,4]),
+    [1,2,3,4,5,6,7] = lists:umerge(F, [1,3,5,6,7], [2,4,6]),
+    [1,2,3,5,7] = lists:umerge(F, [2], [1,2,3,5,7]),
+    [1,2,3,4,5,7] = lists:umerge(F, [2,4], [1,2,3,4,5,7]),
+    [1,2,3,4,5,6,7] = lists:umerge(F, [2,4,6], [1,2,3,4,5,6,7]),
 
     L1 = [{a,1},{a,3},{a,5},{a,7}],
     L2 = [{b,1},{b,3},{b,5},{b,7}],
     F2 = fun(X,Y) -> element(2,X) =< element(2,Y) end,
-    ?line L1 = lists:umerge(F2, L1, L2),
-    ?line [{b,2},{e,5},{c,11},{c,12},{c,21},{c,22}] =
+    L1 = lists:umerge(F2, L1, L2),
+    [{b,2},{e,5},{c,11},{c,12},{c,21},{c,22}] =
 	lists:umerge(F2, [{e,5},{c,11},{c,12}], [{b,2},{c,21},{c,22}]),
 
     ok.
 
-rufunmerge(suite) -> [];
-rufunmerge(doc) -> 
-    ["Reverse merge two lists while removing duplicates using a fun."];
+%% Reverse merge two lists while removing duplicates using a fun.
 rufunmerge(Conf) when is_list(Conf) ->
     Two = [2,1],
     Six = [6,5,4,3,2,1],
     F = fun(X, Y) -> X =< Y end,
 
     %% 2-way reversed unique merge
-    ?line [] = lists:rumerge(F, [], []),
-    ?line Two = lists:rumerge(F, Two, []),
-    ?line Two = lists:rumerge(F, [], Two),
-    ?line Six = lists:rumerge(F, [5,3,1], [6,4,2]),
-    ?line Six = lists:rumerge(F, [6,4,2], [5,3,1]),
-    ?line Six = lists:rumerge(F, [3,2,1], [6,5,4]),
-    ?line Six = lists:rumerge(F, [6,5,4], [3,2,1]),
-    ?line Six = lists:rumerge(F, [4,3,2],[6,5,1]),
-    ?line [7,6,5,3,1] = lists:rumerge(F, [7,5,3,1], [6]),
-    ?line [7,6,5,4,3,1] = lists:rumerge(F, [7,5,3,1], [6,4]),
-    ?line [7,6,5,4,3,2,1] = lists:rumerge(F, [7,5,3,1], [6,4,2]),
-    ?line [7,5,3,2,1] = lists:rumerge(F, [2], [7,5,3,1]),
-    ?line [7,5,4,3,2,1] = lists:rumerge(F, [4,2], [7,5,3,1]),
-    ?line [7,6,5,4,3,2,1] = lists:rumerge(F, [6,4,2], [7,5,3,1]),
-
-    ?line [7,6,5,3,1] = lists:rumerge(F, [7,6,5,3,1], [6]),
-    ?line [7,6,5,4,3,1] = lists:rumerge(F, [7,6,5,4,3,1], [6,4]),
-    ?line [7,6,5,4,3,2,1] = lists:rumerge(F, [7,6,5,4,3,2,1], [6,4,2]),
-    ?line [7,5,3,2,1] = lists:rumerge(F, [2], [7,5,3,2,1]),
-    ?line [7,5,4,3,2,1] = lists:rumerge(F, [4,2], [7,5,4,3,2,1]),
-    ?line [7,6,5,4,3,2,1] = lists:rumerge(F, [6,4,2], [7,6,5,4,3,2,1]),
+    [] = lists:rumerge(F, [], []),
+    Two = lists:rumerge(F, Two, []),
+    Two = lists:rumerge(F, [], Two),
+    Six = lists:rumerge(F, [5,3,1], [6,4,2]),
+    Six = lists:rumerge(F, [6,4,2], [5,3,1]),
+    Six = lists:rumerge(F, [3,2,1], [6,5,4]),
+    Six = lists:rumerge(F, [6,5,4], [3,2,1]),
+    Six = lists:rumerge(F, [4,3,2],[6,5,1]),
+    [7,6,5,3,1] = lists:rumerge(F, [7,5,3,1], [6]),
+    [7,6,5,4,3,1] = lists:rumerge(F, [7,5,3,1], [6,4]),
+    [7,6,5,4,3,2,1] = lists:rumerge(F, [7,5,3,1], [6,4,2]),
+    [7,5,3,2,1] = lists:rumerge(F, [2], [7,5,3,1]),
+    [7,5,4,3,2,1] = lists:rumerge(F, [4,2], [7,5,3,1]),
+    [7,6,5,4,3,2,1] = lists:rumerge(F, [6,4,2], [7,5,3,1]),
+
+    [7,6,5,3,1] = lists:rumerge(F, [7,6,5,3,1], [6]),
+    [7,6,5,4,3,1] = lists:rumerge(F, [7,6,5,4,3,1], [6,4]),
+    [7,6,5,4,3,2,1] = lists:rumerge(F, [7,6,5,4,3,2,1], [6,4,2]),
+    [7,5,3,2,1] = lists:rumerge(F, [2], [7,5,3,2,1]),
+    [7,5,4,3,2,1] = lists:rumerge(F, [4,2], [7,5,4,3,2,1]),
+    [7,6,5,4,3,2,1] = lists:rumerge(F, [6,4,2], [7,6,5,4,3,2,1]),
 
     F2 = fun(X,Y) -> element(1,X) =< element(1,Y) end,
     L1 = [{1,a},{1,b},{1,a}],
     L2 = [{1,a},{1,b},{1,a}],
-    ?line true = lists:umerge(F2, L1, L2) == 
+    true = lists:umerge(F2, L1, L2) ==
 	lists:reverse(lists:rumerge(F, lists:reverse(L2), lists:reverse(L1))),
 
     L3 = [{c,11},{c,12},{e,5}],
     L4 = [{b,2},{c,21},{c,22}],
-    ?line true = 
+    true =
 	lists:umerge(F2, L3, L4) == 
 	lists:reverse(lists:rumerge(F2,lists:reverse(L3), lists:reverse(L4))),
 
     ok.
 
-ufunsort_1(doc) ->   ["usort/2"];
-ufunsort_1(suite) -> [];
 ufunsort_1(Config) when is_list(Config) ->
-    ?line ok = ufunsort_check(1, [], []),
-    ?line ok = ufunsort_check(1, [{a,b}], [{a,b}]),
-    ?line ok = ufunsort_check(1, [{a,b},{a,b}], [{a,b}]),
-    ?line ok = ufunsort_check(1, [{a,b},{b,c}], [{a,b},{b,c}]),
-    ?line ok = ufunsort_check(1, [{b,c},{a,b}], [{a,b},{b,c}]),
-    ?line ok = ufunsort_check(1,
-			      [{1,e},{3,f},{2,y},{0,z},{x,14}],
-			      [{0,z},{1,e},{2,y},{3,f},{x,14}]),
-    ?line ok = ufunsort_check(1,
-			      [{1,a},{2,b},{3,c},{2,b},{1,a},{2,b},{3,c},
-			       {2,b},{1,a}],
-			      [{1,a},{2,b},{3,c}]),
-    ?line ok = ufunsort_check(1, 
-			      [{1,a},{1,a},{1,b},{1,b},{1,a},{2,a}],
-			      [{1,a},{2,a}]),
+    ok = ufunsort_check(1, [], []),
+    ok = ufunsort_check(1, [{a,b}], [{a,b}]),
+    ok = ufunsort_check(1, [{a,b},{a,b}], [{a,b}]),
+    ok = ufunsort_check(1, [{a,b},{b,c}], [{a,b},{b,c}]),
+    ok = ufunsort_check(1, [{b,c},{a,b}], [{a,b},{b,c}]),
+    ok = ufunsort_check(1,
+			[{1,e},{3,f},{2,y},{0,z},{x,14}],
+			[{0,z},{1,e},{2,y},{3,f},{x,14}]),
+    ok = ufunsort_check(1,
+			[{1,a},{2,b},{3,c},{2,b},{1,a},{2,b},{3,c},
+			 {2,b},{1,a}],
+			[{1,a},{2,b},{3,c}]),
+    ok = ufunsort_check(1,
+			[{1,a},{1,a},{1,b},{1,b},{1,a},{2,a}],
+			[{1,a},{2,a}]),
 
     F = funsort_fun(1),
     L1 = [{1,a},{1,b},{1,a}],
     L2 = [{1,a},{1,b},{1,a}],
-    ?line ok = ufunsort_check(1, lists:keymerge(1, L1, L2), 
-                              lists:umerge(F, lists:usort(F, L1), 
-                                           lists:usort(F, L2))),
+    ok = ufunsort_check(1, lists:keymerge(1, L1, L2),
+			lists:umerge(F, lists:usort(F, L1),
+				     lists:usort(F, L2))),
     L3 = [{1,a},{1,b},{1,a},{2,a}],
-    ?line ok = ufunsort_check(1, lists:keymerge(1, L3, L2), 
-                              lists:umerge(F, lists:usort(F, L3), 
-                                           lists:usort(F, L2))),
+    ok = ufunsort_check(1, lists:keymerge(1, L3, L2),
+			lists:umerge(F, lists:usort(F, L3),
+				     lists:usort(F, L2))),
     L4 = [{1,b},{1,a}],
-    ?line ok = ufunsort_check(1, lists:keymerge(1, L1, L4), 
-                              lists:umerge(F, lists:usort(F, L1), 
-                                           lists:usort(F, L4))),
+    ok = ufunsort_check(1, lists:keymerge(1, L1, L4),
+			lists:umerge(F, lists:usort(F, L1),
+				     lists:usort(F, L4))),
     L5 = [{1,a},{1,b},{1,a},{2,a}],
-    ?line ok = ufunsort_check(1, lists:keymerge(1, L5, []), 
-                              lists:umerge(F, lists:usort(F, L5), [])),
+    ok = ufunsort_check(1, lists:keymerge(1, L5, []),
+			lists:umerge(F, lists:usort(F, L5), [])),
     L6 = [{3,a}],
-    ?line ok = ufunsort_check(1, lists:keymerge(1, L5, L6), 
-                              lists:umerge(F, lists:usort(F, L5), 
-                                           lists:usort(F, L6))),
-
-    ?line [{b,1},{c,1}] = lists:usort(F, [{c,1},{c,1},{b,1}]),
-    ?line [{a,0},{b,2},{c,3},{d,4}] = 
-	  lists:usort(F, [{d,4},{c,3},{b,2},{b,2},{a,0}]),
-    ?line [{a,0},{b,1},{c,1}] =
-	  lists:usort(F, [{c,1},{b,1},{b,1},{b,2},{b,2},{a,0}]),
-    ?line [{a,0},{b,1},{c,1},{d,4}] =
-	  lists:usort(F, [{c,1},{b,1},{b,2},{a,0},{a,0},{d,4},{d,4}]),
+    ok = ufunsort_check(1, lists:keymerge(1, L5, L6),
+			lists:umerge(F, lists:usort(F, L5),
+				     lists:usort(F, L6))),
+
+    [{b,1},{c,1}] = lists:usort(F, [{c,1},{c,1},{b,1}]),
+    [{a,0},{b,2},{c,3},{d,4}] =
+	lists:usort(F, [{d,4},{c,3},{b,2},{b,2},{a,0}]),
+    [{a,0},{b,1},{c,1}] =
+	lists:usort(F, [{c,1},{b,1},{b,1},{b,2},{b,2},{a,0}]),
+    [{a,0},{b,1},{c,1},{d,4}] =
+	lists:usort(F, [{c,1},{b,1},{b,2},{a,0},{a,0},{d,4},{d,4}]),
 
     SFun = fun(L) -> fun(X) -> ufunsort_check(1, X, L) end end,
     PL = [{1,a},{2,b},{3,c},{4,d},{5,e},{6,f}],
     Ps = perms([{1,a},{2,b},{3,c},{4,d},{5,e},{6,f},{2,b},{1,a}]),
-    ?line lists:foreach(SFun(PL), Ps),
+    lists:foreach(SFun(PL), Ps),
 
     ok.
 
-ufunsort_stable(doc) ->   ["usort/2 should be stable"];
-ufunsort_stable(suite) -> [];
+%% usort/2 should be stable.
 ufunsort_stable(Config) when is_list(Config) ->
-    ?line ok = ufunsort_check(1, [{1,b},{1,c}], [{1,b}]),
-    ?line ok = ufunsort_check(1, [{1,c},{1,b}], [{1,c}]),
-    ?line ok = ufunsort_check(1,
-			      [{1,c},{1,b},{2,x},{3,p},{2,a}],
-			      [{1,c},{2,x},{3,p}]),
-
-    ?line ok = ufunsort_check_stability(bigfunlist(10)),
-    ?line ok = ufunsort_check_stability(bigfunlist(100)),
-    ?line ok = ufunsort_check_stability(bigfunlist(1000)),
-    ?line case erlang:system_info(modified_timing_level) of
-              undefined -> ok = ufunsort_check_stability(bigfunlist(10000));
-              _ -> ok
-          end,
-    ok.
-
-ufunsort_error(doc) ->   ["usort/2 should exit when given bad arguments"];
-ufunsort_error(suite) -> [];
+    ok = ufunsort_check(1, [{1,b},{1,c}], [{1,b}]),
+    ok = ufunsort_check(1, [{1,c},{1,b}], [{1,c}]),
+    ok = ufunsort_check(1,
+			[{1,c},{1,b},{2,x},{3,p},{2,a}],
+			[{1,c},{2,x},{3,p}]),
+
+    ok = ufunsort_check_stability(bigfunlist(10)),
+    ok = ufunsort_check_stability(bigfunlist(100)),
+    ok = ufunsort_check_stability(bigfunlist(1000)),
+    case erlang:system_info(modified_timing_level) of
+	undefined -> ok = ufunsort_check_stability(bigfunlist(10000));
+	_ -> ok
+    end,
+    ok.
+
+%% usort/2 should exit when given bad arguments.
 ufunsort_error(Config) when is_list(Config) ->
-    ?line {'EXIT', _} = (catch lists:usort(1, [{1,b} , {1,c}])),
-    ?line {'EXIT', _} = (catch lists:usort(fun(X,Y) -> X =< Y end, 
-					   [{1,b} | {1,c}])),
+    {'EXIT', _} = (catch lists:usort(1, [{1,b} , {1,c}])),
+    {'EXIT', _} = (catch lists:usort(fun(X,Y) -> X =< Y end,
+				     [{1,b} | {1,c}])),
     ok.
 
-ufunsort_rand(doc) ->   ["usort/2 on big randomized lists"];
-ufunsort_rand(suite) -> [];
+%% usort/2 on big randomized lists.
 ufunsort_rand(Config) when is_list(Config) ->
-    ?line ok = ufunsort_check3(1, biglist(10)),
-    ?line ok = ufunsort_check3(1, biglist(100)),
-    ?line ok = ufunsort_check3(1, biglist(1000)),
-    ?line ok = ufunsort_check3(1, biglist(10000)),
+    ok = ufunsort_check3(1, biglist(10)),
+    ok = ufunsort_check3(1, biglist(100)),
+    ok = ufunsort_check3(1, biglist(1000)),
+    ok = ufunsort_check3(1, biglist(10000)),
 
-    ?line ok = gen_ufunsort_check(1, ubiglist(100)),
-    ?line ok = gen_ufunsort_check(1, ubiglist(1000)),
-    ?line ok = gen_ufunsort_check(1, ubiglist(10000)),
+    ok = gen_ufunsort_check(1, ubiglist(100)),
+    ok = gen_ufunsort_check(1, ubiglist(1000)),
+    ok = gen_ufunsort_check(1, ubiglist(10000)),
     ok.
 
 %% Check that usort/2 is stable and correct relative sort/2.
@@ -1646,10 +1578,10 @@ ufunsort_check3(I, Input) ->
 %%% Keysort a list, check that the returned list is what we expected,
 %%% and that it is actually sorted.
 ufunsort_check(I, Input, Expected) ->
-    ?line Expected = ufunsort(I, Input),
+    Expected = ufunsort(I, Input),
     ucheck_sorted(I, Input, Expected).
 
-% Do a keysort
+%% Do a keysort
 ufunsort(I, L) ->
     lists:usort(funsort_fun(I), L).
 
@@ -1677,8 +1609,7 @@ check_stab(L, U, S, US, SS) ->
 %%% Element 3 in the tuple is the position of the tuple in the list.
 
 biglist(N) ->
-    {A, B, C} = get_seed(),
-    random:seed(A, B, C),
+    rand:seed(exsplus),
     biglist(N, []).
 
 biglist(0, L) ->
@@ -1694,8 +1625,7 @@ biglist(N, L) ->
 %%% No sequence number.
 
 ubiglist(N) ->
-    {A, B, C} = get_seed(),
-    random:seed(A, B, C),
+    rand:seed(exsplus),
     ubiglist(N, []).
 
 ubiglist(0, L) ->
@@ -1703,7 +1633,7 @@ ubiglist(0, L) ->
 ubiglist(N, L) ->
     E = urandom_tuple(11, 6),
     ubiglist(N-1, [E|L]).
-    
+
 urandom_tuple(N, I) ->
     R1 = randint(N),
     R2 = randint(I),
@@ -1719,8 +1649,7 @@ urandom_tuple(N, I) ->
 %%% sequence number.
 
 bigfunlist(N) ->
-    {A, B, C} = get_seed(),
-    random:seed(A, B, C),
+    rand:seed(exsplus),
     bigfunlist_1(N).
 
 bigfunlist_1(N) when N < 30000 -> % Now (R8) max 32000 different pids.
@@ -1736,7 +1665,7 @@ bigfunlist(0, _P, L) ->
 bigfunlist(N, P, L) ->
     {E, NP} = random_funtuple(P, 11),
     bigfunlist(N-1, NP, [E | L]).
-    
+
 random_funtuple(P, N) ->
     R = randint(N),
     F = make_fun(),
@@ -1747,28 +1676,20 @@ random_funtuple(P, N) ->
 make_fun() ->
     Pid = spawn(?MODULE, make_fun, [self()]),
     receive {Pid, Fun} -> Fun end.
-    
+
 make_fun(Pid) ->
     Pid ! {self(), fun make_fun/1}.
 
 fun_pid(Fun) ->
     erlang:fun_info(Fun, pid).
 
-get_seed() ->
-    case random:seed() of
-	undefined ->
-	    erlang:timestamp();
-	Tuple ->
-	    Tuple
-    end.
-
 random_tuple(N, Seq) ->
     R1 = randint(N),
     R2 = randint(N),
     {R1, R2, Seq}.
 
 randint(N) ->
-    trunc(random:uniform() * N).
+    trunc(rand:uniform() * N).
 
 %% The first "duplicate" is kept.
 no_dups([]) ->
@@ -1830,8 +1751,7 @@ sort_loop_1(Pid) ->
     end.
 
 sloop(N) ->
-    {A, B, C} = get_seed(),
-    random:seed(A, B, C),
+    rand:seed(exsplus),
     sloop(N, #state{}).
 
 sloop(N, S) ->
@@ -1866,7 +1786,7 @@ sloop(N, S) ->
 		 end,
 	    sloop(N, NS)
     end.
-	    
+
 display_state(S) ->    
     io:format("sort:   ~p~n", [S#state.sort]),
     io:format("usort:  ~p~n", [S#state.usort]),
@@ -2135,85 +2055,67 @@ rkeymerge2_2(_I, T1, _E1, [], M, H1) ->
 %%%------------------------------------------------------------
 
 
-seq_loop(doc) ->
-    ["Test for infinite loop (OTP-2404)."];
-seq_loop(suite) ->
-    [];
+%% Test for infinite loop (OTP-2404).
 seq_loop(Config) when is_list(Config) ->
-    ?line _ = (catch lists:seq(1, 5, -1)),
+    _ = (catch lists:seq(1, 5, -1)),
     ok.
 
-seq_2(doc) ->
-    ["Non-error cases for seq/2"];
-seq_2(suite) ->
-    [];
+%% Non-error cases for seq/2.
 seq_2(Config) when is_list(Config) ->
-    ?line [1,2,3] = lists:seq(1,3),
-    ?line [1] = lists:seq(1,1),
-    ?line Big = 748274827583793785928592859,
-    ?line Big1 = Big+1,
-    ?line Big2 = Big+2,
-    ?line [Big, Big1, Big2] = lists:seq(Big, Big+2),
+    [1,2,3] = lists:seq(1,3),
+    [1] = lists:seq(1,1),
+    Big = 748274827583793785928592859,
+    Big1 = Big+1,
+    Big2 = Big+2,
+    [Big, Big1, Big2] = lists:seq(Big, Big+2),
     ok.
 
-seq_2_e(doc) ->
-    ["Error cases for seq/2"];
-seq_2_e(suite) ->
-    [];
+%% Error cases for seq/2.
 seq_2_e(Config) when is_list(Config) ->
-    ?line seq_error([4, 2]),
-    ?line seq_error([1, a]),
-    ?line seq_error([1.0, 2.0]),
+    seq_error([4, 2]),
+    seq_error([1, a]),
+    seq_error([1.0, 2.0]),
     ok.
 
 seq_error(Args) ->
     {'EXIT', _} = (catch apply(lists, seq, Args)).
 
-seq_3(doc) ->
-    ["Non-error cases for seq/3"];
-seq_3(suite) ->
-    [];
+%% Non-error cases for seq/3.
 seq_3(Config) when is_list(Config) ->
-    ?line [1,2,3] = lists:seq(1,3,1),
-    ?line [1] = lists:seq(1,1,1),
-    ?line Big = 748274827583793785928592859,
-    ?line Big1 = Big+1,
-    ?line Big2 = Big+2,
-    ?line [Big, Big1, Big2] = lists:seq(Big, Big+2,1),
+    [1,2,3] = lists:seq(1,3,1),
+    [1] = lists:seq(1,1,1),
+    Big = 748274827583793785928592859,
+    Big1 = Big+1,
+    Big2 = Big+2,
+    [Big, Big1, Big2] = lists:seq(Big, Big+2,1),
 
-    ?line [3,2,1] = lists:seq(3,1,-1),
-    ?line [1] = lists:seq(1,1,-1),
+    [3,2,1] = lists:seq(3,1,-1),
+    [1] = lists:seq(1,1,-1),
 
-    ?line [3,1] = lists:seq(3,1,-2),
-    ?line [1] = lists:seq(1, 10, 10),
-    ?line [1, 4, 7, 10, 13, 16, 19] = lists:seq(1, 19, 3),
-    ?line [1, 4, 7, 10, 13, 16, 19] = lists:seq(1, 20, 3),
-    ?line [1, 4, 7, 10, 13, 16, 19] = lists:seq(1, 21, 3),
+    [3,1] = lists:seq(3,1,-2),
+    [1] = lists:seq(1, 10, 10),
+    [1, 4, 7, 10, 13, 16, 19] = lists:seq(1, 19, 3),
+    [1, 4, 7, 10, 13, 16, 19] = lists:seq(1, 20, 3),
+    [1, 4, 7, 10, 13, 16, 19] = lists:seq(1, 21, 3),
 
-    ?line [1] = lists:seq(1, 1, 0),		%OTP-2613
+    [1] = lists:seq(1, 1, 0),		%OTP-2613
     ok.
 
-seq_3_e(doc) ->
-    ["Error cases for seq/3"];
-seq_3_e(suite) ->
-    [];
+%% Error cases for seq/3.
 seq_3_e(Config) when is_list(Config) ->
-    ?line seq_error([4, 2, 1]),
-    ?line seq_error([3, 5, -1]),
-    ?line seq_error([1, a, 1]),
-    ?line seq_error([1.0, 2.0, 1]),
+    seq_error([4, 2, 1]),
+    seq_error([3, 5, -1]),
+    seq_error([1, a, 1]),
+    seq_error([1.0, 2.0, 1]),
 
-    ?line seq_error([1, 3, 1.0]),
-    ?line seq_error([1, 3, a]),
-    ?line seq_error([1, 3, 0]),
+    seq_error([1, 3, 1.0]),
+    seq_error([1, 3, a]),
+    seq_error([1, 3, 0]),
 
-    ?line seq_error([a, a, 0]),
+    seq_error([a, a, 0]),
     ok.
 
-otp_7230(doc) -> 
-    ["OTP-7230. seq/1,2 returns the empty list"];
-otp_7230(suite) ->
-    [];
+%% OTP-7230. seq/1,2 returns the empty list.
 otp_7230(Config) when is_list(Config) ->
     From = -10,
     To = 10,
@@ -2222,26 +2124,26 @@ otp_7230(Config) when is_list(Config) ->
 
     L = lists:seq(From, To),
     SL = lists:seq(StepFrom, StepTo),
-    ?line [] = 
-    [{F, T, S} || 
-        F <- L, T <- L, S <- SL,
-          not check_seq(F, T, S, catch lists:seq(F, T, S))
-        orelse
-          S =:= 1 andalso not check_seq(F, T, S, catch lists:seq(F, T))
+    [] =
+	[{F, T, S} ||
+	    F <- L, T <- L, S <- SL,
+	    not check_seq(F, T, S, catch lists:seq(F, T, S))
+		orelse
+		S =:= 1 andalso not check_seq(F, T, S, catch lists:seq(F, T))
         ].
 
 check_seq(From, To, 0, R) ->
-      From =:= To andalso R =:= [From]
-    orelse
-      From =/= To andalso is_tuple(R) andalso element(1, R) =:= 'EXIT';
+    From =:= To andalso R =:= [From]
+	orelse
+	From =/= To andalso is_tuple(R) andalso element(1, R) =:= 'EXIT';
 check_seq(From, To, Step, []) when Step =/= 0 ->
-      0 =:= property(From, To, Step)
-    andalso 
-    (
-      Step > 0 andalso To < From andalso From-To =< Step
-    orelse
-      Step < 0 andalso To > From andalso To-From =< -Step
-    );
+    0 =:= property(From, To, Step)
+	andalso
+	  (
+	  Step > 0 andalso To < From andalso From-To =< Step
+	  orelse
+	  Step < 0 andalso To > From andalso To-From =< -Step
+	 );
 check_seq(From, To, Step, R) when R =/= [], To < From, Step > 0 ->
     is_tuple(R) andalso element(1, R) =:= 'EXIT';
 check_seq(From, To, Step, R) when R =/= [], To > From, Step < 0 ->
@@ -2252,27 +2154,27 @@ check_seq(From, To, Step, L) when is_list(L), L =/= [], Step =/= 0 ->
     Min = lists:min(L),
     Max = lists:max(L),
 
-      [] =:= [E || E <- L, not is_integer(E)]
-    andalso
-      %% The difference between two consecutive elements is Step:
-      begin
-        LS = [First-Step]++L,
-        LR = L++[Last+Step],
-        [Step] =:= lists:usort([B-A || {A,B} <- lists:zip(LS, LR)])
-      end
-    andalso
-      %% The first element of L is From:
-      From =:= First
-    andalso
-      %% No element outside the given interval:
-      Min >= lists:min([From, To])
-    andalso
-      Max =< lists:max([From, To])
-    andalso
-      %% All elements are present:
-      abs(To-Last) < abs(Step)
-    andalso
-      length(L) =:= property(From, To, Step);
+    [] =:= [E || E <- L, not is_integer(E)]
+	andalso
+    %% The difference between two consecutive elements is Step:
+	begin
+	    LS = [First-Step]++L,
+	    LR = L++[Last+Step],
+	    [Step] =:= lists:usort([B-A || {A,B} <- lists:zip(LS, LR)])
+	end
+	andalso
+    %% The first element of L is From:
+	From =:= First
+	andalso
+    %% No element outside the given interval:
+	Min >= lists:min([From, To])
+	andalso
+	Max =< lists:max([From, To])
+	andalso
+    %% All elements are present:
+	abs(To-Last) < abs(Step)
+	andalso
+	length(L) =:= property(From, To, Step);
 check_seq(_From, _To, _Step, _R) ->
     false.
 
@@ -2282,25 +2184,22 @@ property(From, To, Step) ->
 %%%------------------------------------------------------------
 
 
--define(sublist_error2(X,Y), ?line {'EXIT', _} = (catch lists:sublist(X,Y))).
--define(sublist_error3(X,Y,Z), ?line {'EXIT', _} = (catch lists:sublist(X,Y,Z))).
+-define(sublist_error2(X,Y), {'EXIT', _} = (catch lists:sublist(X,Y))).
+-define(sublist_error3(X,Y,Z), {'EXIT', _} = (catch lists:sublist(X,Y,Z))).
 
-sublist_2(doc) ->   ["sublist/2"];
-sublist_2(suite) -> [];
 sublist_2(Config) when is_list(Config) ->
-    ?line [] = lists:sublist([], 0),
-    ?line [] = lists:sublist([], 1),
-    ?line [] = lists:sublist([a], 0),
-    ?line [a] = lists:sublist([a], 1),
-    ?line [a] = lists:sublist([a], 2),
-    ?line [a] = lists:sublist([a|b], 1),
+    [] = lists:sublist([], 0),
+    [] = lists:sublist([], 1),
+    [] = lists:sublist([a], 0),
+    [a] = lists:sublist([a], 1),
+    [a] = lists:sublist([a], 2),
+    [a] = lists:sublist([a|b], 1),
 
-    ?line [a,b] = lists:sublist([a,b|c], 2),
+    [a,b] = lists:sublist([a,b|c], 2),
 
     ok.
 
-sublist_2_e(doc) ->   ["sublist/2 error cases"];
-sublist_2_e(suite) -> [];
+%% sublist/2 error cases.
 sublist_2_e(Config) when is_list(Config) ->
     ?sublist_error2([], -1),
     ?sublist_error2(a, -1),
@@ -2312,36 +2211,33 @@ sublist_2_e(Config) when is_list(Config) ->
     ?sublist_error2([], 1.5),
     ok.
 
-sublist_3(doc) ->   ["sublist/3"];
-sublist_3(suite) -> [];
 sublist_3(Config) when is_list(Config) ->
-    ?line [] = lists:sublist([], 1, 0),
-    ?line [] = lists:sublist([], 1, 1),
-    ?line [] = lists:sublist([a], 1, 0),
-    ?line [a] = lists:sublist([a], 1, 1),
-    ?line [a] = lists:sublist([a], 1, 2),
-    ?line [a] = lists:sublist([a|b], 1, 1),
-
-    ?line [] = lists:sublist([], 1, 0),
-    ?line [] = lists:sublist([], 1, 1),
-    ?line [] = lists:sublist([a], 1, 0),
-    ?line [a] = lists:sublist([a], 1, 1),
-    ?line [a] = lists:sublist([a], 1, 2),
-    ?line [] = lists:sublist([a], 2, 1),
-    ?line [] = lists:sublist([a], 2, 2),
-    ?line [] = lists:sublist([a], 2, 79),
-    ?line [] = lists:sublist([a,b|c], 1, 0),
-    ?line [] = lists:sublist([a,b|c], 2, 0),
-    ?line [a] = lists:sublist([a,b|c], 1, 1),
-    ?line [b] = lists:sublist([a,b|c], 2, 1),
-    ?line [a,b] = lists:sublist([a,b|c], 1, 2),
-
-    ?line [] = lists:sublist([a], 2, 0),
-
-    ok.
-
-sublist_3_e(doc) ->   ["sublist/3 error cases"];
-sublist_3_e(suite) -> [];
+    [] = lists:sublist([], 1, 0),
+    [] = lists:sublist([], 1, 1),
+    [] = lists:sublist([a], 1, 0),
+    [a] = lists:sublist([a], 1, 1),
+    [a] = lists:sublist([a], 1, 2),
+    [a] = lists:sublist([a|b], 1, 1),
+
+    [] = lists:sublist([], 1, 0),
+    [] = lists:sublist([], 1, 1),
+    [] = lists:sublist([a], 1, 0),
+    [a] = lists:sublist([a], 1, 1),
+    [a] = lists:sublist([a], 1, 2),
+    [] = lists:sublist([a], 2, 1),
+    [] = lists:sublist([a], 2, 2),
+    [] = lists:sublist([a], 2, 79),
+    [] = lists:sublist([a,b|c], 1, 0),
+    [] = lists:sublist([a,b|c], 2, 0),
+    [a] = lists:sublist([a,b|c], 1, 1),
+    [b] = lists:sublist([a,b|c], 2, 1),
+    [a,b] = lists:sublist([a,b|c], 1, 2),
+
+    [] = lists:sublist([a], 2, 0),
+
+    ok.
+
+%% sublist/3 error cases
 sublist_3_e(Config) when is_list(Config) ->
     ?sublist_error3([], 1, -1),
     ?sublist_error3(a, 1, -1),
@@ -2375,8 +2271,8 @@ sublist_3_e(Config) when is_list(Config) ->
 %%%------------------------------------------------------------
 
 
--define(flatten_error1(X), ?line {'EXIT', _} = (catch lists:flatten(X))).
--define(flatten_error2(X,Y), ?line {'EXIT', _} = (catch lists:flatten(X,Y))).
+-define(flatten_error1(X), {'EXIT', _} = (catch lists:flatten(X))).
+-define(flatten_error2(X,Y), {'EXIT', _} = (catch lists:flatten(X,Y))).
 
 %% Test lists:flatten/1,2 and lists:flatlength/1.
 flatten_1(Config) when is_list(Config) ->
@@ -2397,8 +2293,7 @@ lists_flatten(List) ->
     Len = length(Flat),
     Flat.
 
-flatten_1_e(doc) ->   ["flatten/1 error cases"];
-flatten_1_e(suite) -> [];
+%% flatten/1 error cases
 flatten_1_e(Config) when is_list(Config) ->
     ?flatten_error1(a),
     ?flatten_error1([a|b]),
@@ -2416,60 +2311,59 @@ flatten_2(Config) when is_list(Config) ->
     [a,b,c,[no,flatten]] = lists:flatten([[a,[b,c]]], [[no,flatten]]),
     ok.
 
-flatten_2_e(doc) ->   ["flatten/2 error cases"];
-flatten_2_e(suite) -> [];
+%% flatten/2 error cases.
 flatten_2_e(Config) when is_list(Config) ->
     ok.
 
 %% Test lists:zip/2, lists:unzip/1.
 zip_unzip(Config) when is_list(Config) ->
-    ?line [] = lists:zip([], []),
-    ?line [{a,b}] = lists:zip([a], [b]),
-    ?line [{42.0,{kalle,nisse}},{a,b}] = lists:zip([42.0,a], [{kalle,nisse},b]),
+    [] = lists:zip([], []),
+    [{a,b}] = lists:zip([a], [b]),
+    [{42.0,{kalle,nisse}},{a,b}] = lists:zip([42.0,a], [{kalle,nisse},b]),
 
     %% Longer lists.
-    ?line SeqA = lists:seq(45, 200),
-    ?line SeqB = [A*A || A <- SeqA],
-    ?line AB = lists:zip(SeqA, SeqB),
-    ?line SeqA = [A || {A,_} <- AB],
-    ?line SeqB = [B || {_,B} <- AB],
-    ?line {SeqA,SeqB} = lists:unzip(AB),
-    
+    SeqA = lists:seq(45, 200),
+    SeqB = [A*A || A <- SeqA],
+    AB = lists:zip(SeqA, SeqB),
+    SeqA = [A || {A,_} <- AB],
+    SeqB = [B || {_,B} <- AB],
+    {SeqA,SeqB} = lists:unzip(AB),
+
     %% Some more unzip/1.
-    ?line {[],[]} = lists:unzip([]),
-    ?line {[a],[b]} = lists:unzip([{a,b}]),
-    ?line {[a,c],[b,d]} = lists:unzip([{a,b},{c,d}]),
+    {[],[]} = lists:unzip([]),
+    {[a],[b]} = lists:unzip([{a,b}]),
+    {[a,c],[b,d]} = lists:unzip([{a,b},{c,d}]),
 
     %% Error cases.
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zip([], [b])),
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zip([a], [])),
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zip([a], [b,c])),
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zip([a], [b,c])),
+    {'EXIT',{function_clause,_}} = (catch lists:zip([], [b])),
+    {'EXIT',{function_clause,_}} = (catch lists:zip([a], [])),
+    {'EXIT',{function_clause,_}} = (catch lists:zip([a], [b,c])),
+    {'EXIT',{function_clause,_}} = (catch lists:zip([a], [b,c])),
     ok.
 
 %% Test lists:zip3/3, lists:unzip3/1.
 zip_unzip3(Config) when is_list(Config) ->
-    ?line [] = lists:zip3([], [], []),
-    ?line [{a,b,c}] = lists:zip3([a], [b], [c]),
+    [] = lists:zip3([], [], []),
+    [{a,b,c}] = lists:zip3([a], [b], [c]),
 
     %% Longer lists.
-    ?line SeqA = lists:seq(45, 200),
-    ?line SeqB = [2*A || A <- SeqA],
-    ?line SeqC = [A*A || A <- SeqA],
-    ?line ABC = lists:zip3(SeqA, SeqB, SeqC),
-    ?line SeqA = [A || {A,_,_} <- ABC],
-    ?line SeqB = [B || {_,B,_} <- ABC],
-    ?line SeqC = [C || {_,_,C} <- ABC],
-    ?line {SeqA,SeqB,SeqC} = lists:unzip3(ABC),
+    SeqA = lists:seq(45, 200),
+    SeqB = [2*A || A <- SeqA],
+    SeqC = [A*A || A <- SeqA],
+    ABC = lists:zip3(SeqA, SeqB, SeqC),
+    SeqA = [A || {A,_,_} <- ABC],
+    SeqB = [B || {_,B,_} <- ABC],
+    SeqC = [C || {_,_,C} <- ABC],
+    {SeqA,SeqB,SeqC} = lists:unzip3(ABC),
 
     %% Some more unzip3/1.
-    ?line {[],[],[]} = lists:unzip3([]),
-    ?line {[a],[b],[c]} = lists:unzip3([{a,b,c}]),
+    {[],[],[]} = lists:unzip3([]),
+    {[a],[b],[c]} = lists:unzip3([{a,b,c}]),
 
     %% Error cases.
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zip3([], [], [c])),
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zip3([], [b], [])),
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zip3([a], [], [])),
+    {'EXIT',{function_clause,_}} = (catch lists:zip3([], [], [c])),
+    {'EXIT',{function_clause,_}} = (catch lists:zip3([], [b], [])),
+    {'EXIT',{function_clause,_}} = (catch lists:zip3([a], [], [])),
 
     ok.
 
@@ -2477,61 +2371,61 @@ zip_unzip3(Config) when is_list(Config) ->
 zipwith(Config) when is_list(Config) ->
     Zip = fun(A, B) -> [A|B] end,
 
-    ?line [] = lists:zipwith(Zip, [], []),
-    ?line [[a|b]] = lists:zipwith(Zip, [a], [b]),
+    [] = lists:zipwith(Zip, [], []),
+    [[a|b]] = lists:zipwith(Zip, [a], [b]),
 
     %% Longer lists.
-    ?line SeqA = lists:seq(77, 300),
-    ?line SeqB = [A*A || A <- SeqA],
-    ?line AB = lists:zipwith(Zip, SeqA, SeqB),
-    ?line SeqA = [A || [A|_] <- AB],
-    ?line SeqB = [B || [_|B] <- AB],
-    
+    SeqA = lists:seq(77, 300),
+    SeqB = [A*A || A <- SeqA],
+    AB = lists:zipwith(Zip, SeqA, SeqB),
+    SeqA = [A || [A|_] <- AB],
+    SeqB = [B || [_|B] <- AB],
+
     %% Error cases.
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zipwith(badfun, [], [])),
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zipwith(Zip, [], [b])),
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zipwith(Zip, [a], [])),
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zipwith(Zip, [a], [b,c])),
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zipwith(Zip, [a], [b,c])),
+    {'EXIT',{function_clause,_}} = (catch lists:zipwith(badfun, [], [])),
+    {'EXIT',{function_clause,_}} = (catch lists:zipwith(Zip, [], [b])),
+    {'EXIT',{function_clause,_}} = (catch lists:zipwith(Zip, [a], [])),
+    {'EXIT',{function_clause,_}} = (catch lists:zipwith(Zip, [a], [b,c])),
+    {'EXIT',{function_clause,_}} = (catch lists:zipwith(Zip, [a], [b,c])),
     ok.
 
 %% Test lists:zipwith3/4.
 zipwith3(Config) when is_list(Config) ->
     Zip = fun(A, B, C) -> [A,B,C] end,
 
-    ?line [] = lists:zipwith3(Zip, [], [], []),
-    ?line [[a,b,c]] = lists:zipwith3(Zip, [a], [b], [c]),
+    [] = lists:zipwith3(Zip, [], [], []),
+    [[a,b,c]] = lists:zipwith3(Zip, [a], [b], [c]),
 
     %% Longer lists.
-    ?line SeqA = lists:seq(45, 200),
-    ?line SeqB = [2*A || A <- SeqA],
-    ?line SeqC = [A*A || A <- SeqA],
-    ?line ABC = lists:zipwith3(Zip, SeqA, SeqB, SeqC),
-    ?line SeqA = [A || [A,_,_] <- ABC],
-    ?line SeqB = [B || [_,B,_] <- ABC],
-    ?line SeqC = [C || [_,_,C] <- ABC],
+    SeqA = lists:seq(45, 200),
+    SeqB = [2*A || A <- SeqA],
+    SeqC = [A*A || A <- SeqA],
+    ABC = lists:zipwith3(Zip, SeqA, SeqB, SeqC),
+    SeqA = [A || [A,_,_] <- ABC],
+    SeqB = [B || [_,B,_] <- ABC],
+    SeqC = [C || [_,_,C] <- ABC],
 
     %% Error cases.
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zipwith3(badfun, [], [], [])),
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zipwith3(Zip, [], [], [c])),
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zipwith3(Zip, [], [b], [])),
-    ?line {'EXIT',{function_clause,_}} = (catch lists:zipwith3(Zip, [a], [], [])),
+    {'EXIT',{function_clause,_}} = (catch lists:zipwith3(badfun, [], [], [])),
+    {'EXIT',{function_clause,_}} = (catch lists:zipwith3(Zip, [], [], [c])),
+    {'EXIT',{function_clause,_}} = (catch lists:zipwith3(Zip, [], [b], [])),
+    {'EXIT',{function_clause,_}} = (catch lists:zipwith3(Zip, [a], [], [])),
 
     ok.
 
 %% Test lists:filter/2, lists:partition/2.
 filter_partition(Config) when is_list(Config) ->
     F = fun(I) -> I rem 2 =:= 0 end,
-    ?line filpart(F, [], []),
-    ?line filpart(F, [1], []),
-    ?line filpart(F, [1,3,17], []),
-    ?line filpart(F, [1,2,3,17], [2]),
-    ?line filpart(F, [6,8,1,2,3,17], [6,8,2]),
-    ?line filpart(F, [6,8,1,2,42,3,17], [6,8,2,42]),
+    filpart(F, [], []),
+    filpart(F, [1], []),
+    filpart(F, [1,3,17], []),
+    filpart(F, [1,2,3,17], [2]),
+    filpart(F, [6,8,1,2,3,17], [6,8,2]),
+    filpart(F, [6,8,1,2,42,3,17], [6,8,2,42]),
 
     %% Error cases.
-    ?line {'EXIT',{function_clause,_}} = (catch lists:filter(badfun, [])),
-    ?line {'EXIT',{function_clause,_}} = (catch lists:partition(badfun, [])),
+    {'EXIT',{function_clause,_}} = (catch lists:filter(badfun, [])),
+    {'EXIT',{function_clause,_}} = (catch lists:partition(badfun, [])),
     ok.
 
 filpart(F, All, Exp) ->
@@ -2540,8 +2434,7 @@ filpart(F, All, Exp) ->
     {Exp,Other} = lists:partition(F, All).
 
 
-otp_5939(doc) ->   ["OTP-5939. Guard tests added."];
-otp_5939(suite) -> [];
+%% OTP-5939. Guard tests added.
 otp_5939(Config) when is_list(Config) ->
     Fun1 = fun(A) -> A end,
     Fun2 = fun(A, B) -> {A,B} end,
@@ -2550,163 +2443,161 @@ otp_5939(Config) when is_list(Config) ->
     Fold = fun(_E, A) -> A end,
     MapFold = fun(E, A) -> {E,A} end,
 
-    ?line {'EXIT', _} = (catch lists:usort( [asd], [qwe])),
-
-    ?line {'EXIT', _} = (catch lists:zipwith(func, [], [])),
-    ?line [] = lists:zipwith(Fun2, [], []),
-    ?line {'EXIT', _} = (catch lists:zipwith3(func, [], [], [])),
-    ?line [] = lists:zipwith3(Fun3, [], [], []),
-    ?line {'EXIT', _} = (catch lists:keymap(func, 1, [])),
-    ?line {'EXIT', _} = (catch lists:keymap(Fun1, 0, [])),
-    ?line [] = lists:keymap(Fun1, 1, []),
-    ?line {'EXIT', _} = (catch lists:merge(func, [], [1])),
-    ?line {'EXIT', _} = (catch lists:merge(func, [1], [])),
-    ?line [] = lists:merge(Fun2, [], []),
-    ?line {'EXIT', _} = (catch lists:rmerge(func, [], [1])),
-    ?line {'EXIT', _} = (catch lists:rmerge(func, [1], [])),
-    ?line [] = lists:rmerge(Fun2, [], []),
-    ?line {'EXIT', _} = (catch lists:usort(func, [])),
-    ?line {'EXIT', _} = (catch lists:usort(func, [a])),
-    ?line {'EXIT', _} = (catch lists:usort(func, [a, b])),
-    ?line [] = lists:usort(Fun2, []),
-    ?line {'EXIT', _} = (catch lists:umerge(func, [], [1])),
-    ?line {'EXIT', _} = (catch lists:merge(func, [1], [])),
-    ?line [] = lists:umerge(Fun2, [], []),
-    ?line {'EXIT', _} = (catch lists:rumerge(func, [], [1])),
-    ?line {'EXIT', _} = (catch lists:rumerge(func, [1], [])),
-    ?line [] = lists:rumerge(Fun2, [], []),
-    ?line {'EXIT', _} = (catch lists:all(func, [])),
-    ?line true = lists:all(Pred, []),
-    ?line {'EXIT', _} = (catch lists:any(func, [])),
-    ?line false = lists:any(Pred, []),
-    ?line {'EXIT', _} = (catch lists:map(func, [])),
-    ?line [] = lists:map(Fun1, []),
-    ?line {'EXIT', _} = (catch lists:flatmap(func, [])),
-    ?line [] = lists:flatmap(Fun1, []),
-    ?line {'EXIT', _} = (catch lists:foldl(func, [], [])),
-    ?line [] = lists:foldl(Fold, [], []),
-    ?line {'EXIT', _} = (catch lists:foldr(func, [], [])),
-    ?line [] = lists:foldr(Fold, [], []),
-    ?line {'EXIT', _} = (catch lists:filter(func, [])),
-    ?line [] = lists:filter(Pred, []),
-    ?line {'EXIT', _} = (catch lists:partition(func, [])),
-    ?line {[],[]} = lists:partition(Pred, []),
-    ?line {'EXIT', _} = (catch lists:filtermap(func, [])),
-    ?line [] = lists:filtermap(Fun1, []),
-    ?line {'EXIT', _} = (catch lists:foreach(func, [])),
-    ?line ok = lists:foreach(Fun1, []),
-    ?line {'EXIT', _} = (catch lists:mapfoldl(func, [], [])),
-    ?line {[],[]} = lists:mapfoldl(MapFold, [], []),
-    ?line {'EXIT', _} = (catch lists:mapfoldr(func, [], [])),
-    ?line {[],[]} = lists:mapfoldr(MapFold, [], []),
-    ?line {'EXIT', _} = (catch lists:takewhile(func, [])),
-    ?line [] = lists:takewhile(Pred, []),
-    ?line {'EXIT', _} = (catch lists:dropwhile(func, [])),
-    ?line [] = lists:dropwhile(Pred, []),
-    ?line {'EXIT', _} = (catch lists:splitwith(func, [])),
-    ?line {[],[]} = lists:splitwith(Pred, []),
-
-    ok.
-
-otp_6023(doc) ->   ["OTP-6023. lists:keyreplace/4, a typecheck."];
-otp_6023(suite) -> [];
+    {'EXIT', _} = (catch lists:usort( [asd], [qwe])),
+
+    {'EXIT', _} = (catch lists:zipwith(func, [], [])),
+    [] = lists:zipwith(Fun2, [], []),
+    {'EXIT', _} = (catch lists:zipwith3(func, [], [], [])),
+    [] = lists:zipwith3(Fun3, [], [], []),
+    {'EXIT', _} = (catch lists:keymap(func, 1, [])),
+    {'EXIT', _} = (catch lists:keymap(Fun1, 0, [])),
+    [] = lists:keymap(Fun1, 1, []),
+    {'EXIT', _} = (catch lists:merge(func, [], [1])),
+    {'EXIT', _} = (catch lists:merge(func, [1], [])),
+    [] = lists:merge(Fun2, [], []),
+    {'EXIT', _} = (catch lists:rmerge(func, [], [1])),
+    {'EXIT', _} = (catch lists:rmerge(func, [1], [])),
+    [] = lists:rmerge(Fun2, [], []),
+    {'EXIT', _} = (catch lists:usort(func, [])),
+    {'EXIT', _} = (catch lists:usort(func, [a])),
+    {'EXIT', _} = (catch lists:usort(func, [a, b])),
+    [] = lists:usort(Fun2, []),
+    {'EXIT', _} = (catch lists:umerge(func, [], [1])),
+    {'EXIT', _} = (catch lists:merge(func, [1], [])),
+    [] = lists:umerge(Fun2, [], []),
+    {'EXIT', _} = (catch lists:rumerge(func, [], [1])),
+    {'EXIT', _} = (catch lists:rumerge(func, [1], [])),
+    [] = lists:rumerge(Fun2, [], []),
+    {'EXIT', _} = (catch lists:all(func, [])),
+    true = lists:all(Pred, []),
+    {'EXIT', _} = (catch lists:any(func, [])),
+    false = lists:any(Pred, []),
+    {'EXIT', _} = (catch lists:map(func, [])),
+    [] = lists:map(Fun1, []),
+    {'EXIT', _} = (catch lists:flatmap(func, [])),
+    [] = lists:flatmap(Fun1, []),
+    {'EXIT', _} = (catch lists:foldl(func, [], [])),
+    [] = lists:foldl(Fold, [], []),
+    {'EXIT', _} = (catch lists:foldr(func, [], [])),
+    [] = lists:foldr(Fold, [], []),
+    {'EXIT', _} = (catch lists:filter(func, [])),
+    [] = lists:filter(Pred, []),
+    {'EXIT', _} = (catch lists:partition(func, [])),
+    {[],[]} = lists:partition(Pred, []),
+    {'EXIT', _} = (catch lists:filtermap(func, [])),
+    [] = lists:filtermap(Fun1, []),
+    {'EXIT', _} = (catch lists:foreach(func, [])),
+    ok = lists:foreach(Fun1, []),
+    {'EXIT', _} = (catch lists:mapfoldl(func, [], [])),
+    {[],[]} = lists:mapfoldl(MapFold, [], []),
+    {'EXIT', _} = (catch lists:mapfoldr(func, [], [])),
+    {[],[]} = lists:mapfoldr(MapFold, [], []),
+    {'EXIT', _} = (catch lists:takewhile(func, [])),
+    [] = lists:takewhile(Pred, []),
+    {'EXIT', _} = (catch lists:dropwhile(func, [])),
+    [] = lists:dropwhile(Pred, []),
+    {'EXIT', _} = (catch lists:splitwith(func, [])),
+    {[],[]} = lists:splitwith(Pred, []),
+
+    ok.
+
+%% OTP-6023. lists:keyreplace/4, a typecheck.
 otp_6023(Config) when is_list(Config) ->
-    ?line {'EXIT', _} = (catch lists:keyreplace(a, 2, [{1,a}], b)),
-    ?line [{2,b}] = lists:keyreplace(a, 2, [{1,a}], {2,b}),
+    {'EXIT', _} = (catch lists:keyreplace(a, 2, [{1,a}], b)),
+    [{2,b}] = lists:keyreplace(a, 2, [{1,a}], {2,b}),
 
     ok.
 
-otp_6606(doc) ->   ["OTP-6606. sort and keysort bug"];
-otp_6606(suite) -> [];
+%% OTP-6606. sort and keysort bug.
 otp_6606(Config) when is_list(Config) ->
     I = 1,
     F = float(1),
     L1 = [{F,I},{F,F},{I,I},{I,F}],
-    ?line L1 = lists:keysort(1, L1),
-    ?line L1 = lists:sort(L1),
+    L1 = lists:keysort(1, L1),
+    L1 = lists:sort(L1),
     L2 = [{I,I},{I,F},{F,I},{F,F}],
-    ?line L2 = lists:keysort(1, L2),
-    ?line L2 = lists:sort(L2),
+    L2 = lists:keysort(1, L2),
+    L2 = lists:sort(L2),
     ok.
 
 %% Test lists:suffix/2.
 suffix(Config) when is_list(Config) ->
-    ?line true = lists:suffix([], []),
-    ?line true = lists:suffix([], [a]),
-    ?line true = lists:suffix([], [a,b]),
-    ?line true = lists:suffix([], [a,b,c]),
-    ?line true = lists:suffix([a], lists:duplicate(200000, a)),
-    ?line true = lists:suffix(lists:seq(1, 1024),
-			      lists:seq(2, 64000) ++ lists:seq(1, 1024)),
-    ?line true = lists:suffix(lists:duplicate(20000, a),
-			      lists:duplicate(200000, a)),
-    ?line true = lists:suffix([2.0,3.0], [1.0,2.0,3.0]),
+    true = lists:suffix([], []),
+    true = lists:suffix([], [a]),
+    true = lists:suffix([], [a,b]),
+    true = lists:suffix([], [a,b,c]),
+    true = lists:suffix([a], lists:duplicate(200000, a)),
+    true = lists:suffix(lists:seq(1, 1024),
+			lists:seq(2, 64000) ++ lists:seq(1, 1024)),
+    true = lists:suffix(lists:duplicate(20000, a),
+			lists:duplicate(200000, a)),
+    true = lists:suffix([2.0,3.0], [1.0,2.0,3.0]),
 
     %% False cases.
-    ?line false = lists:suffix([a], []),
-    ?line false = lists:suffix([a,b,c], []),
-    ?line false = lists:suffix([a,b,c], [b,c]),
-    ?line false = lists:suffix([a,b,c], [a,b,c,a,b]),
-    ?line false = lists:suffix(lists:duplicate(199999, a)++[b],
-			       lists:duplicate(200000, a)),
-    ?line false = lists:suffix([2.0,3.0], [1,2,3]),
+    false = lists:suffix([a], []),
+    false = lists:suffix([a,b,c], []),
+    false = lists:suffix([a,b,c], [b,c]),
+    false = lists:suffix([a,b,c], [a,b,c,a,b]),
+    false = lists:suffix(lists:duplicate(199999, a)++[b],
+			 lists:duplicate(200000, a)),
+    false = lists:suffix([2.0,3.0], [1,2,3]),
 
     %% Error cases.
-    ?line {'EXIT',_} = (catch lists:suffix({a,b,c}, [])),
-    ?line {'EXIT',_} = (catch lists:suffix([], {a,b})),
-    ?line {'EXIT',_} = (catch lists:suffix([a|b], [])),
-    ?line {'EXIT',_} = (catch lists:suffix([a,b|c], [a|b])),
-    ?line {'EXIT',_} = (catch lists:suffix([a|b], [a,b|c])),
-    ?line {'EXIT',_} = (catch lists:suffix([a|b], [a|b])),
-    
+    {'EXIT',_} = (catch lists:suffix({a,b,c}, [])),
+    {'EXIT',_} = (catch lists:suffix([], {a,b})),
+    {'EXIT',_} = (catch lists:suffix([a|b], [])),
+    {'EXIT',_} = (catch lists:suffix([a,b|c], [a|b])),
+    {'EXIT',_} = (catch lists:suffix([a|b], [a,b|c])),
+    {'EXIT',_} = (catch lists:suffix([a|b], [a|b])),
+
     ok.
 
 %% Test lists:subtract/2 and the '--' operator.
 subtract(Config) when is_list(Config) ->
-    ?line [] = sub([], []),
-    ?line [] = sub([], [a]),
-    ?line [] = sub([], lists:seq(1, 1024)),
-    ?line sub_non_matching([a], []),
-    ?line sub_non_matching([1,2], [make_ref()]),
-    ?line sub_non_matching(lists:seq(1, 1024), [make_ref(),make_ref()]),
-    
+    [] = sub([], []),
+    [] = sub([], [a]),
+    [] = sub([], lists:seq(1, 1024)),
+    sub_non_matching([a], []),
+    sub_non_matching([1,2], [make_ref()]),
+    sub_non_matching(lists:seq(1, 1024), [make_ref(),make_ref()]),
+
     %% Matching subtracts.
-    ?line [] = sub([a], [a]),
-    ?line [a] = sub([a,b], [b]),
-    ?line [a] = sub([a,b], [b,c]),
-    ?line [a] = sub([a,b,c], [b,c]),
-    ?line [a] = sub([a,b,c], [b,c]),
-    ?line [d,a,a] = sub([a,b,c,d,a,a], [a,b,c]),
-    ?line [d,x,a] = sub([a,b,c,d,a,x,a], [a,b,c,a]),
-    ?line [1,2,3,4,5,6,7,8,9,9999,10000,20,21,22] =
+    [] = sub([a], [a]),
+    [a] = sub([a,b], [b]),
+    [a] = sub([a,b], [b,c]),
+    [a] = sub([a,b,c], [b,c]),
+    [a] = sub([a,b,c], [b,c]),
+    [d,a,a] = sub([a,b,c,d,a,a], [a,b,c]),
+    [d,x,a] = sub([a,b,c,d,a,x,a], [a,b,c,a]),
+    [1,2,3,4,5,6,7,8,9,9999,10000,20,21,22] =
 	sub(lists:seq(1, 10000)++[20,21,22], lists:seq(10, 9998)),
 
     %% Floats/integers.
-    ?line [42.0,42.0] = sub([42.0,42,42.0], [42,42,42]),
-    ?line [1,2,3,4,43.0] = sub([1,2,3,4,5,42.0,43.0], [42.0,5]),
+    [42.0,42.0] = sub([42.0,42,42.0], [42,42,42]),
+    [1,2,3,4,43.0] = sub([1,2,3,4,5,42.0,43.0], [42.0,5]),
 
     %% Crashing subtracts.
-    ?line {'EXIT',_} = (catch sub([], [a|b])),
-    ?line {'EXIT',_} = (catch sub([a], [a|b])),
-    ?line {'EXIT',_} = (catch sub([a|b], [])),
-    ?line {'EXIT',_} = (catch sub([a|b], [])),
-    ?line {'EXIT',_} = (catch sub([a|b], [a])),
+    {'EXIT',_} = (catch sub([], [a|b])),
+    {'EXIT',_} = (catch sub([a], [a|b])),
+    {'EXIT',_} = (catch sub([a|b], [])),
+    {'EXIT',_} = (catch sub([a|b], [])),
+    {'EXIT',_} = (catch sub([a|b], [a])),
 
     ok.
 
 sub_non_matching(A, B) ->
     A = sub(A, B).
-    
+
 sub(A, B) ->
     Res = A -- B,
     Res = lists:subtract(A, B).
 
 %% Test lists:droplast/1
 droplast(Config) when is_list(Config) ->
-    ?line [] = lists:droplast([x]),
-    ?line [x] = lists:droplast([x, y]),
-    ?line {'EXIT', {function_clause, _}} = (catch lists:droplast([])),
-    ?line {'EXIT', {function_clause, _}} = (catch lists:droplast(x)),
+    [] = lists:droplast([x]),
+    [x] = lists:droplast([x, y]),
+    {'EXIT', {function_clause, _}} = (catch lists:droplast([])),
+    {'EXIT', {function_clause, _}} = (catch lists:droplast(x)),
 
     ok.
 
diff --git a/lib/stdlib/test/log_mf_h_SUITE.erl b/lib/stdlib/test/log_mf_h_SUITE.erl
index 86af3d4614..9b543aa37c 100644
--- a/lib/stdlib/test/log_mf_h_SUITE.erl
+++ b/lib/stdlib/test/log_mf_h_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(log_mf_h_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -53,17 +53,17 @@ end_per_group(_GroupName, Config) ->
 %%-----------------------------------------------------------------
 
 test(Config) when is_list(Config) ->
-    ?line {ok, Pid} = gen_event:start_link(),
-    ?line PrivDir = ?config(priv_dir, Config),
+    {ok, Pid} = gen_event:start_link(),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Log1 = PrivDir ++ "/log1",
-    ?line ok = file:make_dir(Log1),
+    ok = file:make_dir(Log1),
     Args1 = log_mf_h:init(Log1, 500, 3),
     gen_event:add_handler(Pid, log_mf_h, Args1),
     generate(Pid, 200),
     {ok, Files} = file:list_dir(Log1),
-    ?line true = lists:member("1", Files),
-    ?line true = lists:member("index", Files),
-    ?line false = lists:member("2", Files),
+    true = lists:member("1", Files),
+    true = lists:member("index", Files),
+    false = lists:member("2", Files),
     generate(Pid, 2500),
     %% The documentation doesn't guarantee that syncing one request
     %% causes all previous ones to be finished too, but that seems to
@@ -71,26 +71,26 @@ test(Config) when is_list(Config) ->
     %% look for them with 'list_dir'.
     gen_event:sync_notify(Pid, "end"),
     {ok, Files2} = file:list_dir(Log1),
-    ?line true = lists:member("1", Files2),
-    ?line true = lists:member("2", Files2),
-    ?line true = lists:member("3", Files2),
-    ?line false = lists:member("4", Files2),
-    ?line true = lists:member("index", Files2),
-    ?line {ok, #file_info{size=Size1,type=regular}} = file:read_file_info(Log1 ++ "/1"),
-    ?line if Size1 > 500 -> test_server:fail({too_big, Size1});
-	     true -> ok end,
-    ?line {ok, #file_info{size=Size2,type=regular}} = file:read_file_info(Log1 ++ "/2"),
-    ?line if Size2 > 500 -> test_server:fail({too_big, Size2});
-	     true -> ok end,
-    ?line {ok, #file_info{size=Size3,type=regular}} = file:read_file_info(Log1 ++ "/3"),
-    ?line if Size3 > 500 -> test_server:fail({too_big, Size3});
-	     true -> ok end,
+    true = lists:member("1", Files2),
+    true = lists:member("2", Files2),
+    true = lists:member("3", Files2),
+    false = lists:member("4", Files2),
+    true = lists:member("index", Files2),
+    {ok, #file_info{size=Size1,type=regular}} = file:read_file_info(Log1 ++ "/1"),
+    if Size1 > 500 -> ct:fail({too_big, Size1});
+       true -> ok end,
+    {ok, #file_info{size=Size2,type=regular}} = file:read_file_info(Log1 ++ "/2"),
+    if Size2 > 500 -> ct:fail({too_big, Size2});
+       true -> ok end,
+    {ok, #file_info{size=Size3,type=regular}} = file:read_file_info(Log1 ++ "/3"),
+    if Size3 > 500 -> ct:fail({too_big, Size3});
+       true -> ok end,
     gen_event:delete_handler(Pid, log_mf_h, []),
-    ?line {ok, Index} = read_index_file(Log1),
+    {ok, Index} = read_index_file(Log1),
     gen_event:add_handler(Pid, log_mf_h, Args1),    
     X = if Index == 3 -> 1; true -> Index + 1 end,
-    ?line {ok, X} = read_index_file(Log1).
-    
+    {ok, X} = read_index_file(Log1).
+
 
 generate(Pid, Bytes) when Bytes > 32 ->
     gen_event:notify(Pid, make_list(32, [])),
@@ -110,4 +110,3 @@ read_index_file(Dir) ->
 	    end;
 	_ -> error
     end.
-
diff --git a/lib/stdlib/test/maps_SUITE.erl b/lib/stdlib/test/maps_SUITE.erl
index 40a8b6ac81..7f94b7bcb1 100644
--- a/lib/stdlib/test/maps_SUITE.erl
+++ b/lib/stdlib/test/maps_SUITE.erl
@@ -23,11 +23,9 @@
 
 -module(maps_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
--define(default_timeout, ?t:minutes(1)).
-
-% Test server specific exports
+%% Test server specific exports
 -export([all/0]).
 -export([suite/0]).
 -export([init_per_suite/1]).
@@ -39,14 +37,15 @@
          t_fold_3/1,t_map_2/1,t_size_1/1,
          t_with_2/1,t_without_2/1]).
 
-%-define(badmap(V,F,Args), {'EXIT', {{badmap,V}, [{maps,F,Args,_}|_]}}).
-%-define(badarg(F,Args), {'EXIT', {badarg, [{maps,F,Args,_}|_]}}).
-% silly broken hipe
+%%-define(badmap(V,F,Args), {'EXIT', {{badmap,V}, [{maps,F,Args,_}|_]}}).
+%%-define(badarg(F,Args), {'EXIT', {badarg, [{maps,F,Args,_}|_]}}).
+%% silly broken hipe
 -define(badmap(V,F,_Args), {'EXIT', {{badmap,V}, [{maps,F,_,_}|_]}}).
 -define(badarg(F,_Args), {'EXIT', {badarg, [{maps,F,_,_}|_]}}).
 
 suite() ->
-    [{ct_hooks, [ts_install_cth]}].
+    [{ct_hooks, [ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() ->
     [t_get_3,t_filter_2,
@@ -60,12 +59,9 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
 t_get_3(Config) when is_list(Config) ->
diff --git a/lib/stdlib/test/ms_transform_SUITE.erl b/lib/stdlib/test/ms_transform_SUITE.erl
index f02e82b39c..a8bd90de84 100644
--- a/lib/stdlib/test/ms_transform_SUITE.erl
+++ b/lib/stdlib/test/ms_transform_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2015. 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.
@@ -20,9 +20,10 @@
 -module(ms_transform_SUITE).
 -author('[email protected]').
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2,
 	 init_per_group/2,end_per_group/2]).
 -export([basic_ets/1]).
 -export([basic_dbg/1]).
@@ -42,17 +43,16 @@
 -export([warnings/1]).
 -export([no_warnings/1]).
 -export([eep37/1]).
--export([init_per_testcase/2, end_per_testcase/2]).
 
 init_per_testcase(_Func, Config) ->
-    Dog=test_server:timetrap(test_server:seconds(360)),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Func, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog).
+end_per_testcase(_Func, _Config) ->
+    ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,6}}].
 
 all() -> 
     [from_shell, basic_ets, basic_dbg, records,
@@ -79,94 +79,89 @@ end_per_group(_GroupName, Config) ->
 
 %% This may be subject to change
 -define(WARN_NUMBER_SHADOW,50).
-warnings(suite) ->
-    [];
-warnings(doc) ->
-    ["Check that shadowed variables in fun head generate warning"];
+
+%% Check that shadowed variables in fun head generate warning.
 warnings(Config) when is_list(Config) ->
-    ?line setup(Config),
+    setup(Config),
     Prog = <<"A=5, "
-	    "ets:fun2ms(fun({A,B}) "
-	    "            when is_integer(A) and (A+5 > B) -> "
-	    "              A andalso B "
-	    "            end)">>,
-    ?line [{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'A'}}]}] =
+	     "ets:fun2ms(fun({A,B}) "
+	     "            when is_integer(A) and (A+5 > B) -> "
+	     "              A andalso B "
+	     "            end)">>,
+    [{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'A'}}]}] =
 	compile_ww(Prog),
     Prog2 = <<"C = 5,
                ets:fun2ms(fun ({A,B} =
-                                       C) when is_integer(A) and (A+5 > B) ->
+				   C) when is_integer(A) and (A+5 > B) ->
                                   {A andalso B,C}
                           end)">>,
     [{_,[{3,ms_transform,{?WARN_NUMBER_SHADOW,'C'}}]}] =
-	compile_ww(Prog2),
-    Rec3 = <<"-record(a,{a,b,c,d=foppa}).">>,
-    Prog3 = <<"A = 3,
+	      compile_ww(Prog2),
+	      Rec3 = <<"-record(a,{a,b,c,d=foppa}).">>,
+	      Prog3 = <<"A = 3,
                C = 5,
-               ets:fun2ms(fun (C
-                                 = #a{a = A, b = B})
-                              when is_integer(A) and (A+5 > B) ->
-                                  {A andalso B,C}
-                          end)">>,
+			ets:fun2ms(fun (C
+					= #a{a = A, b = B})
+					 when is_integer(A) and (A+5 > B) ->
+					   {A andalso B,C}
+				   end)">>,
     [{_,[{3,ms_transform,{?WARN_NUMBER_SHADOW,'C'}},
          {4,ms_transform,{?WARN_NUMBER_SHADOW,'A'}}]}] =
-	compile_ww(Rec3,Prog3),
-    Rec4 = <<"-record(a,{a,b,c,d=foppa}).">>,
-    Prog4 = <<"A=3,C=5, "
-	     "F = fun(B) -> B*3 end,"
-	     "erlang:display(F(A)),"
-	     "ets:fun2ms(fun(#a{a = A, b = B} = C) "
-	     "            when is_integer(A) and (A+5 > B) -> "
-	     "              {A andalso B,C} "
-	     "            end)">>,
-    ?line [{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'A'}},
-	       {_,ms_transform,{?WARN_NUMBER_SHADOW,'C'}}]}] =
-	compile_ww(Rec4,Prog4),
-    Rec5 = <<"-record(a,{a,b,c,d=foppa}).">>,
-    Prog5 = <<"A=3,C=5, "
-	     "F = fun(B) -> B*3 end,"
-	     "erlang:display(F(A)),"
-	     "B = ets:fun2ms(fun(#a{a = A, b = B} = C) "
-	     "            when is_integer(A) and (A+5 > B) -> "
-	     "              {A andalso B,C} "
-	     "            end)">>,
-    ?line [{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'A'}},
-	       {_,ms_transform,{?WARN_NUMBER_SHADOW,'C'}}]}] =
-	compile_ww(Rec5,Prog5),
-    Prog6 = <<"   X=bar, "
-	     "    A = case X of"
-	     "       foo ->"
-	     "          foo;"
-	     "       Y ->"
-	     "          ets:fun2ms(fun(Y) ->" % This is a warning
-	     "                         3*Y"
-	     "                     end)"
-	     "   end,"
-	     "   ets:fun2ms(fun(Y) ->" % Y out of "scope" here, so no warning
-	     "                  {3*Y,A}"
-	     "              end)">>,
-    ?line [{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'Y'}}]}] =
-	compile_ww(Prog6),
-    Prog7 = <<"   X=bar, "
-	     "    A = case X of"
-	     "       foo ->"
-	     "          Y = foo;"
-	     "       Y ->"
-	     "          bar"
-	     "   end,"
-	     "   ets:fun2ms(fun(Y) ->" % Y exported from case and safe, so warn
-	     "                  {3*Y,A}"
-	     "              end)">>,
-    ?line [{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'Y'}}]}] =
-	compile_ww(Prog7),
-    ok.
-
-no_warnings(suite) ->
-    [];
-no_warnings(doc) ->
-    ["Check that variables bound in other function clauses don't generate "
-     "warning"];
+			compile_ww(Rec3,Prog3),
+			Rec4 = <<"-record(a,{a,b,c,d=foppa}).">>,
+			Prog4 = <<"A=3,C=5, "
+				  "F = fun(B) -> B*3 end,"
+				  "erlang:display(F(A)),"
+				  "ets:fun2ms(fun(#a{a = A, b = B} = C) "
+				  "            when is_integer(A) and (A+5 > B) -> "
+				  "              {A andalso B,C} "
+				  "            end)">>,
+			[{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'A'}},
+			     {_,ms_transform,{?WARN_NUMBER_SHADOW,'C'}}]}] =
+			compile_ww(Rec4,Prog4),
+			Rec5 = <<"-record(a,{a,b,c,d=foppa}).">>,
+			Prog5 = <<"A=3,C=5, "
+				  "F = fun(B) -> B*3 end,"
+				  "erlang:display(F(A)),"
+				  "B = ets:fun2ms(fun(#a{a = A, b = B} = C) "
+				  "            when is_integer(A) and (A+5 > B) -> "
+				  "              {A andalso B,C} "
+				  "            end)">>,
+			[{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'A'}},
+			     {_,ms_transform,{?WARN_NUMBER_SHADOW,'C'}}]}] =
+			compile_ww(Rec5,Prog5),
+			Prog6 = <<"   X=bar, "
+				  "    A = case X of"
+				  "       foo ->"
+				  "          foo;"
+				  "       Y ->"
+				  "          ets:fun2ms(fun(Y) ->" % This is a warning
+				  "                         3*Y"
+				  "                     end)"
+				  "   end,"
+				  "   ets:fun2ms(fun(Y) ->" % Y out of "scope" here, so no warning
+				  "                  {3*Y,A}"
+				  "              end)">>,
+			[{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'Y'}}]}] =
+			compile_ww(Prog6),
+			Prog7 = <<"   X=bar, "
+				  "    A = case X of"
+				  "       foo ->"
+				  "          Y = foo;"
+				  "       Y ->"
+				  "          bar"
+				  "   end,"
+				  "   ets:fun2ms(fun(Y) ->" % Y exported from case and safe, so warn
+				  "                  {3*Y,A}"
+				  "              end)">>,
+			[{_,[{_,ms_transform,{?WARN_NUMBER_SHADOW,'Y'}}]}] =
+			compile_ww(Prog7),
+			ok.
+
+%% Check that variables bound in other function clauses don't generate
+%% warning.
 no_warnings(Config) when is_list(Config) ->
-    ?line setup(Config),
+    setup(Config),
     Prog = <<"tmp(X) when X > 100 ->\n",
 	     "   Y=X,\n"
 	     "   Y;\n"
@@ -174,188 +169,167 @@ no_warnings(Config) when is_list(Config) ->
 	     "   ets:fun2ms(fun(Y) ->\n"
 	     "                  {X, 3*Y}\n"
 	     "              end)">>,
-    ?line [] = compile_no_ww(Prog),
+    [] = compile_no_ww(Prog),
 
     Prog2 = <<"tmp(X) when X > 100 ->\n",
-	     "   Y=X,\n"
-	     "   Y;\n"
-	     "tmp(X) when X < 200 ->\n"
-	     "   ok;\n"
-	     "tmp(X) ->\n"
-	     "   ets:fun2ms(fun(Y) ->\n"
-	     "                  {X, 3*Y}\n"
-	     "              end)">>,
-    ?line [] = compile_no_ww(Prog2),
+	      "   Y=X,\n"
+	      "   Y;\n"
+	      "tmp(X) when X < 200 ->\n"
+	      "   ok;\n"
+	      "tmp(X) ->\n"
+	      "   ets:fun2ms(fun(Y) ->\n"
+	      "                  {X, 3*Y}\n"
+	      "              end)">>,
+    [] = compile_no_ww(Prog2),
     ok.
 
-andalso_orelse(suite) ->
-    [];
-andalso_orelse(doc) ->
-    ["Tests that andalso and orelse are allowed in guards."];
+%% Test that andalso and orelse are allowed in guards.
 andalso_orelse(Config) when is_list(Config) ->
-    ?line setup(Config),
-    ?line [{{'$1','$2'},
-	    [{'and',{is_integer,'$1'},{'>',{'+','$1',5},'$2'}}],
-	    [{'andalso','$1','$2'}]}] = 
+    setup(Config),
+    [{{'$1','$2'},
+      [{'and',{is_integer,'$1'},{'>',{'+','$1',5},'$2'}}],
+      [{'andalso','$1','$2'}]}] =
 	compile_and_run(<<"ets:fun2ms(fun({A,B}) "
-			 "            when is_integer(A) and (A+5 > B) -> "
-			 "              A andalso B "
-			 "            end)">>),
-    ?line [{{'$1','$2'},
-	    [{'or',{is_atom,'$1'},{'>',{'+','$1',5},'$2'}}],
-	    [{'orelse','$1','$2'}]}] = 
+			  "            when is_integer(A) and (A+5 > B) -> "
+			  "              A andalso B "
+			  "            end)">>),
+    [{{'$1','$2'},
+      [{'or',{is_atom,'$1'},{'>',{'+','$1',5},'$2'}}],
+      [{'orelse','$1','$2'}]}] =
 	compile_and_run(<<"ets:fun2ms(fun({A,B}) "
-			 "            when is_atom(A) or (A+5 > B) -> "
-			 "              A orelse B "
-			 "            end)">>),
-    ?line [{{'$1','$2'},
-            [{'andalso',{is_integer,'$1'},{'>',{'+','$1',5},'$2'}}],
-            ['$1']}] = 
+			  "            when is_atom(A) or (A+5 > B) -> "
+			  "              A orelse B "
+			  "            end)">>),
+    [{{'$1','$2'},
+      [{'andalso',{is_integer,'$1'},{'>',{'+','$1',5},'$2'}}],
+      ['$1']}] =
         compile_and_run(
-	    <<"ets:fun2ms(fun({A,B}) when is_integer(A) andalso (A+5 > B) ->"
-	     "			 A "
-	     "		 end)">>),
-    ?line [{{'$1','$2'},
-            [{'orelse',{is_atom,'$1'},{'>',{'+','$1',5},'$2'}}],
-            ['$1']}] =
+	  <<"ets:fun2ms(fun({A,B}) when is_integer(A) andalso (A+5 > B) ->"
+	    "			 A "
+	    "		 end)">>),
+    [{{'$1','$2'},
+      [{'orelse',{is_atom,'$1'},{'>',{'+','$1',5},'$2'}}],
+      ['$1']}] =
         compile_and_run(
-	    <<"ets:fun2ms(fun({A,B}) when is_atom(A) orelse (A+5 > B) -> "
-	     "			 A "
-	     "		 end)">>),
+	  <<"ets:fun2ms(fun({A,B}) when is_atom(A) orelse (A+5 > B) -> "
+	    "			 A "
+	    "		 end)">>),
     ok.
-    
-    
-bitsyntax(suite) ->
-    [];
-bitsyntax(doc) ->
-    ["Tests that bitsyntax works and does not work where appropriate"];
+
+
+%% Test that bitsyntax works and does not work where appropriate.
 bitsyntax(Config) when is_list(Config) ->
-    ?line setup(Config),
-    ?line [{'_',[],
-	    [<<0,27,0,27>>]}] =
+    setup(Config),
+    [{'_',[],
+      [<<0,27,0,27>>]}] =
 	compile_and_run(<<"A = 27, "
 			  "ets:fun2ms(fun(_) -> <<A:16,27:16>> end)">>),
-    ?line  [{{<<15,47>>,
-	      '$1',
-	      '$2'},
-	     [{'=:=','$1',
-	       <<0,27>>},
-	      {'=:=','$2',
-	       <<27,28,19>>}],
-	     [<<188,0,13>>]}] =
+    [{{<<15,47>>,
+       '$1',
+       '$2'},
+      [{'=:=','$1',
+	<<0,27>>},
+       {'=:=','$2',
+	<<27,28,19>>}],
+      [<<188,0,13>>]}] =
 	compile_and_run(<<"A = 27, "
 			  "ets:fun2ms("
                           "  fun({<<15,47>>,B,C}) "
 			  "  when B =:= <<A:16>>, C =:= <<27,28,19>> -> "
 			  "    <<A:4,12:4,13:16>> "
 			  "  end)">>),
-    ?line expect_failure(
-	    <<>>,
-	    <<"ets:fun2ms(fun({<<15,47>>,B,C}) "
-	     "            when B =:= <<16>>, C =:= <<27,28,19>> -> "
-	     "              <<B:4,12:4,13:16>> "
-	     "            end)">>),
-    ?line expect_failure(
-	    <<>>,
-	    <<"ets:fun2ms(fun({<<A:15,47>>,B,C}) "
-	     "            when B =:= <<16>>, C =:= <<27,28,19>> -> "
-	     "              <<B:4,12:4,13:16>> "
-	     "            end)">>),
+    expect_failure(
+      <<>>,
+      <<"ets:fun2ms(fun({<<15,47>>,B,C}) "
+	"            when B =:= <<16>>, C =:= <<27,28,19>> -> "
+	"              <<B:4,12:4,13:16>> "
+	"            end)">>),
+    expect_failure(
+      <<>>,
+      <<"ets:fun2ms(fun({<<A:15,47>>,B,C}) "
+	"            when B =:= <<16>>, C =:= <<27,28,19>> -> "
+	"              <<B:4,12:4,13:16>> "
+	"            end)">>),
     ok.
 
-record_defaults(suite) ->
-    [];
-record_defaults(doc) ->
-    ["Tests that record defaults works"];
+%% Test that record defaults works.
 record_defaults(Config) when is_list(Config) ->
-    ?line setup(Config),    
-    ?line [{{<<27>>,{a,5,'$1',hej,hej}},
-	    [],
-	    [{{a,hej,{'*','$1',2},flurp,flurp}}]}] = 
+    setup(Config),
+    [{{<<27>>,{a,5,'$1',hej,hej}},
+      [],
+      [{{a,hej,{'*','$1',2},flurp,flurp}}]}] =
 	compile_and_run(<<"-record(a,{a,b,c,d=foppa}).">>,
 			<<"ets:fun2ms(fun({<<27>>,#a{a=5, b=B,_=hej}}) -> "
-		                        "#a{a=hej,b=B*2,_=flurp} "
-	                              "end)">>),
+			  "#a{a=hej,b=B*2,_=flurp} "
+			  "end)">>),
     ok.
 
-basic_ets(suite) ->
-    [];
-basic_ets(doc) ->
-    ["Tests basic ets:fun2ms"];
+%% Test basic ets:fun2ms.
 basic_ets(Config) when is_list(Config) ->
-    ?line setup(Config),
-    ?line [{{a,b},[],[true]}] = compile_and_run(
-				  <<"ets:fun2ms(fun({a,b}) -> true end)">>),
-    ?line [{{'$1',foo},[{is_list,'$1'}],[{{{hd,'$1'},'$_'}}]},
+    setup(Config),
+    [{{a,b},[],[true]}] = compile_and_run(
+			    <<"ets:fun2ms(fun({a,b}) -> true end)">>),
+    [{{'$1',foo},[{is_list,'$1'}],[{{{hd,'$1'},'$_'}}]},
      {{'$1','$1'},[{is_tuple,'$1'}],[{{{element,1,'$1'},'$*'}}]}] =
 	compile_and_run(<<"ets:fun2ms(fun({X,foo}) when is_list(X) -> ",
-			                     "{hd(X),object()};",
-			                "({X,X}) when is_tuple(X) ->",
-			                     "{element(1,X),bindings()}",
-			             "end)">>),
-    ?line [{{'$1','$2'},[],[{{'$2','$1'}}]}] =
+			  "{hd(X),object()};",
+			  "({X,X}) when is_tuple(X) ->",
+			  "{element(1,X),bindings()}",
+			  "end)">>),
+    [{{'$1','$2'},[],[{{'$2','$1'}}]}] =
 	compile_and_run(<<"ets:fun2ms(fun({A,B}) -> {B,A} end)">>),
-    ?line [{{'$1','$2'},[],[['$2','$1']]}] =
+    [{{'$1','$2'},[],[['$2','$1']]}] =
 	compile_and_run(<<"ets:fun2ms(fun({A,B}) -> [B,A] end)">>),
     ok.
 
-basic_dbg(suite) ->
-    [];
-basic_dbg(doc) ->
-    ["Tests basic ets:fun2ms"];
+%% Tests basic ets:fun2ms.
 basic_dbg(Config) when is_list(Config) ->
-    ?line setup(Config),
-    ?line [{[a,b],[],[{message,banan},{return_trace}]}] =
+    setup(Config),
+    [{[a,b],[],[{message,banan},{return_trace}]}] =
 	compile_and_run(<<"dbg:fun2ms(fun([a,b]) -> message(banan), ",
-			"return_trace() end)">>),
-    ?line [{['$1','$2'],[],[{{'$2','$1'}}]}] = 
+			  "return_trace() end)">>),
+    [{['$1','$2'],[],[{{'$2','$1'}}]}] =
 	compile_and_run(<<"dbg:fun2ms(fun([A,B]) -> {B,A} end)">>),
-    ?line [{['$1','$2'],[],[['$2','$1']]}] =
+    [{['$1','$2'],[],[['$2','$1']]}] =
 	compile_and_run(<<"dbg:fun2ms(fun([A,B]) -> [B,A] end)">>),
-    ?line [{['$1','$2'],[],['$*']}] =
+    [{['$1','$2'],[],['$*']}] =
 	compile_and_run(<<"dbg:fun2ms(fun([A,B]) -> bindings() end)">>),
-    ?line [{['$1','$2'],[],['$_']}] =
+    [{['$1','$2'],[],['$_']}] =
 	compile_and_run(<<"dbg:fun2ms(fun([A,B]) -> object() end)">>),
     ok.
 
-from_shell(suite) ->
-    [];
-from_shell(doc) ->
-    ["Test calling of ets/dbg:fun2ms from the shell"]; 
+%% Test calling of ets/dbg:fun2ms from the shell.
 from_shell(Config) when is_list(Config) ->
-    ?line setup(Config),
-    ?line Fun = do_eval("fun({a,b}) -> true end"),
-    ?line [{{a,b},[],[true]}] = apply(ets,fun2ms,[Fun]),
-    ?line [{{a,b},[],[true]}] = do_eval("ets:fun2ms(fun({a,b}) -> true end)"),
-    ?line Fun2 = do_eval("fun([a,b]) -> message(banan), return_trace() end"),
-    ?line [{[a,b],[],[{message,banan},{return_trace}]}]
+    setup(Config),
+    Fun = do_eval("fun({a,b}) -> true end"),
+    [{{a,b},[],[true]}] = apply(ets,fun2ms,[Fun]),
+    [{{a,b},[],[true]}] = do_eval("ets:fun2ms(fun({a,b}) -> true end)"),
+    Fun2 = do_eval("fun([a,b]) -> message(banan), return_trace() end"),
+    [{[a,b],[],[{message,banan},{return_trace}]}]
 	= apply(dbg,fun2ms,[Fun2]),
-    ?line [{[a,b],[],[{message,banan},{return_trace}]}] =
+    [{[a,b],[],[{message,banan},{return_trace}]}] =
 	do_eval(
 	  "dbg:fun2ms(fun([a,b]) -> message(banan), return_trace() end)"),
     ok.
 
-records(suite) ->
-    [];
-records(doc) ->
-    ["Tests expansion of records in fun2ms"];
+%% Tests expansion of records in fun2ms.
 records(Config) when is_list(Config) ->
-    ?line setup(Config),
-    ?line RD = <<"-record(t, {"
-	             "t1 = [],"
-	             "t2 = foo,"
-	             "t3,"
-	             "t4"
-	            "}).">>,
-    ?line [{{t,'$1','$2',foo,'_'},[{is_list,'$1'}],[{{{hd,'$1'},'$_'}}]},
+    setup(Config),
+    RD = <<"-record(t, {"
+	   "t1 = [] :: list(),"
+	   "t2 = foo :: atom(),"
+	   "t3,"
+	   "t4"
+	   "}).">>,
+    [{{t,'$1','$2',foo,'_'},[{is_list,'$1'}],[{{{hd,'$1'},'$_'}}]},
      {{t,'_','_','_','_'},[{'==',{element,2,'$_'},nisse}],[{{'$*'}}]}] =
 	compile_and_run(RD,<<
-   "ets:fun2ms(fun(#t{t1 = X, t2 = Y, t3 = foo}) when is_list(X) -> 
+			     "ets:fun2ms(fun(#t{t1 = X, t2 = Y, t3 = foo}) when is_list(X) ->
  		       {hd(X),object()}; 
- 		  (#t{}) when (object())#t.t1 == nisse -> 
- 		       {bindings()}  
- 	       end)">>),
-    ?line [{{t,'$1','$2','_',foo},
+			     (#t{}) when (object())#t.t1 == nisse ->
+				   {bindings()}
+			   end)">>),
+    [{{t,'$1','$2','_',foo},
       [{'==',{element,4,'$_'},7},{is_list,'$1'}],
       [{{{hd,'$1'},'$_'}}]},
      {'$1',[{is_record,'$1',t,5}],
@@ -373,7 +347,7 @@ records(Config) when is_list(Config) ->
 		       }  
  	       end)"
 			>>),
-    ?line [{[{t,'$1','$2',foo,'_'}],[{is_list,'$1'}],[{{{hd,'$1'},'$_'}}]},
+    [{[{t,'$1','$2',foo,'_'}],[{is_list,'$1'}],[{{{hd,'$1'},'$_'}}]},
      {[{t,'_','_','_','_'}],[{'==',{element,2,{hd,'$_'}},nisse}],[{{'$*'}}]}]=
 	compile_and_run(RD,<<
     "dbg:fun2ms(fun([#t{t1 = X, t2 = Y, t3 = foo}]) when is_list(X) -> 
@@ -385,78 +359,66 @@ records(Config) when is_list(Config) ->
     ok.
 
 
-record_index(suite) ->
-    [];
-record_index(doc) ->
-    ["Tests expansion of records in fun2ms, part 2"];
+%% Test expansion of records in fun2ms, part 2.
 record_index(Config) when is_list(Config) ->
-    ?line setup(Config),
-    ?line RD = <<"-record(a,{a,b}).">>,
-    ?line [{{2},[],[true]}] = compile_and_run(RD,
+    setup(Config),
+    RD = <<"-record(a,{a,b}).">>,
+    [{{2},[],[true]}] = compile_and_run(RD,
 			  <<"ets:fun2ms(fun({#a.a}) -> true end)">>),
-    ?line [{{2},[],[2]}] = compile_and_run(RD,
+    [{{2},[],[2]}] = compile_and_run(RD,
 			  <<"ets:fun2ms(fun({#a.a}) -> #a.a end)">>),
-    ?line [{{2,'$1'},[{'>','$1',2}],[2]}] = compile_and_run(RD,
+    [{{2,'$1'},[{'>','$1',2}],[2]}] = compile_and_run(RD,
 		    <<"ets:fun2ms(fun({#a.a,A}) when A > #a.a -> #a.a end)">>),
     ok.
 
-top_match(suite) ->
-    [];
-top_match(doc) ->
-    ["Tests matching on top level in head to give alias for object()"];
+%% Tests matching on top level in head to give alias for object().
 top_match(Config) when is_list(Config) ->
-    ?line setup(Config),
-    ?line RD = <<"-record(a,{a,b}).">>,
-    ?line [{{a,3,'_'},[],['$_']}] = 
+    setup(Config),
+    RD = <<"-record(a,{a,b}).">>,
+    [{{a,3,'_'},[],['$_']}] =
 	compile_and_run(RD,
 			<<"ets:fun2ms(fun(A = #a{a=3}) -> A end)">>),
-    ?line [{{a,3,'_'},[],['$_']}] = 
+    [{{a,3,'_'},[],['$_']}] =
 	compile_and_run(RD,
 			<<"ets:fun2ms(fun(#a{a=3} = A) -> A end)">>),
-    ?line [{[a,b],[],['$_']}] = 
+    [{[a,b],[],['$_']}] =
 	compile_and_run(RD,
 			<<"dbg:fun2ms(fun(A = [a,b]) -> A end)">>),
-    ?line [{[a,b],[],['$_']}] = 
+    [{[a,b],[],['$_']}] =
 	compile_and_run(RD,
 			<<"dbg:fun2ms(fun([a,b] = A) -> A end)">>),
-    ?line expect_failure(RD,
+    expect_failure(RD,
 			 <<"ets:fun2ms(fun({a,A = {_,b}}) -> A end)">>),
-    ?line expect_failure(RD,
+    expect_failure(RD,
 			 <<"dbg:fun2ms(fun([a,A = {_,b}]) -> A end)">>),
-    ?line expect_failure(RD,
+    expect_failure(RD,
 			 <<"ets:fun2ms(fun(A#a{a = 2}) -> A end)">>),
     ok.
 
-multipass(suite) ->
-    [];
-multipass(doc) ->
-    ["Tests that multi-defined fields in records give errors."];
+%% Tests that multi-defined fields in records give errors.
 multipass(Config) when is_list(Config) ->
-    ?line setup(Config),
-    ?line RD = <<"-record(a,{a,b}).">>,
-    ?line expect_failure(RD,<<"ets:fun2ms(fun(A) -> #a{a=2,a=3} end)">>), 
-    ?line expect_failure(RD,<<"ets:fun2ms(fun(A) -> A#a{a=2,a=3} end)">>),
-    ?line expect_failure(RD,<<"ets:fun2ms(fun(A) when A =:= #a{a=2,a=3} ->",
+    setup(Config),
+    RD = <<"-record(a,{a,b}).">>,
+    expect_failure(RD,<<"ets:fun2ms(fun(A) -> #a{a=2,a=3} end)">>),
+    expect_failure(RD,<<"ets:fun2ms(fun(A) -> A#a{a=2,a=3} end)">>),
+    expect_failure(RD,<<"ets:fun2ms(fun(A) when A =:= #a{a=2,a=3} ->",
 			 " true end)">>), 
-    ?line expect_failure(RD,<<"ets:fun2ms(fun({A,B})when A =:= B#a{a=2,a=3}->",
+    expect_failure(RD,<<"ets:fun2ms(fun({A,B})when A =:= B#a{a=2,a=3}->",
 			 "true end)">>),
-    ?line expect_failure(RD,<<"ets:fun2ms(fun(#a{a=3,a=3}) -> true end)">>),
-    ?line compile_and_run(RD,<<"ets:fun2ms(fun(A) -> #a{a=2,b=3} end)">>), 
-    ?line compile_and_run(RD,<<"ets:fun2ms(fun(A) -> A#a{a=2,b=3} end)">>),
-    ?line compile_and_run(RD,<<"ets:fun2ms(fun(A) when A =:= #a{a=2,b=3} ->",
+    expect_failure(RD,<<"ets:fun2ms(fun(#a{a=3,a=3}) -> true end)">>),
+    compile_and_run(RD,<<"ets:fun2ms(fun(A) -> #a{a=2,b=3} end)">>),
+    compile_and_run(RD,<<"ets:fun2ms(fun(A) -> A#a{a=2,b=3} end)">>),
+    compile_and_run(RD,<<"ets:fun2ms(fun(A) when A =:= #a{a=2,b=3} ->",
 			 " true end)">>), 
-    ?line compile_and_run(RD,<<"ets:fun2ms(fun({A,B})when A=:= B#a{a=2,b=3}->",
+    compile_and_run(RD,<<"ets:fun2ms(fun({A,B})when A=:= B#a{a=2,b=3}->",
 			 "true end)">>),
-    ?line compile_and_run(RD,<<"ets:fun2ms(fun(#a{a=3,b=3}) -> true end)">>),
+    compile_and_run(RD,<<"ets:fun2ms(fun(#a{a=3,b=3}) -> true end)">>),
     ok.
 
 
-old_guards(suite) ->
-    [];
-old_guards(doc) ->
-    ["Tests that old type tests in guards are translated"];
+%% Test that old type tests in guards are translated.
 old_guards(Config) when is_list(Config) ->
-    ?line setup(Config),
+    setup(Config),
     Tests = [
 	     {atom,is_atom},
 	     {float,is_float},
@@ -469,7 +431,7 @@ old_guards(Config) when is_list(Config) ->
 	     {tuple,is_tuple},
 	     {binary,is_binary},
 	     {function,is_function}],
-    ?line lists:foreach(
+    lists:foreach(
 	    fun({Old,New}) ->
 		    Bin = list_to_binary([<<"ets:fun2ms(fun(X) when ">>,
 					  atom_to_list(Old),
@@ -482,15 +444,15 @@ old_guards(Config) when is_list(Config) ->
 		    end
 	    end,
 	    Tests),
-    ?line RD = <<"-record(a,{a,b}).">>,
-    ?line [{'$1',[{is_record,'$1',a,3}],[true]}] =
+    RD = <<"-record(a,{a,b}).">>,
+    [{'$1',[{is_record,'$1',a,3}],[true]}] =
 	compile_and_run(RD,
 			<<"ets:fun2ms(fun(X) when record(X,a) -> true end)">>),
-    ?line expect_failure
+    expect_failure
 	    (RD,
 	     <<"ets:fun2ms(fun(X) when integer(X) and constant(X) -> "
 	      "true end)">>),
-    ?line [{'$1',[{is_integer,'$1'},
+    [{'$1',[{is_integer,'$1'},
 		  {is_float,'$1'},
 		  {is_atom,'$1'},
 		  {is_list,'$1'},
@@ -511,13 +473,10 @@ old_guards(Config) when is_list(Config) ->
 			     >>),
     ok.
     
-autoimported(suite) ->
-    [];
-autoimported(doc) ->
-    ["Tests use of autoimported bif's used like erlang:'+'(A,B) in guards"
-     " and body."];
+%% Test use of autoimported BIFs used like erlang:'+'(A,B) in guards
+%% and body.
 autoimported(Config) when is_list(Config) ->
-    ?line setup(Config),
+    setup(Config),
     Allowed = [
 	       {abs,1},
 	       {element,2},
@@ -530,7 +489,7 @@ autoimported(Config) when is_list(Config) ->
 	       {tl,1},
 	       {trunc,1},
 	       {self,0},
-               %{float,1}, see float_1_function/1
+               %%{float,1}, see float_1_function/1
 	       {is_atom,1},
 	       {is_float,1},
 	       {is_integer,1},
@@ -547,8 +506,8 @@ autoimported(Config) when is_list(Config) ->
 	       {'or',2,infix},
 	       {'xor',2,infix},
 	       {'not',1},
-	       %{'andalso',2,infix},
-	       %{'orelse',2,infix},
+	       %%{'andalso',2,infix},
+	       %%{'orelse',2,infix},
 	       {'+',1},
 	       {'+',2,infix},
 	       {'-',1},
@@ -571,8 +530,8 @@ autoimported(Config) when is_list(Config) ->
 	       {'=:=',2,infix},
 	       {'/=',2,infix},
 	       {'=/=',2,infix}],
-    ?line RD = <<"-record(a,{a,b}).">>,
-    ?line lists:foreach(
+    RD = <<"-record(a,{a,b}).">>,
+    lists:foreach(
 	    fun({A,0}) ->
 		    L = atom_to_list(A),
 		    Bin1 = list_to_binary(
@@ -687,85 +646,76 @@ autoimported(Config) when is_list(Config) ->
 	    Allowed),
     ok.
 
-semicolon(suite) ->
-    [];
-semicolon(doc) ->
-    ["Tests semicolon in guards of match_specs."];
+%% Test semicolon in guards of match_specs.
 semicolon(Config) when is_list(Config) ->
-    ?line setup(Config),
-    ?line Res01 = compile_and_run
+    setup(Config),
+    Res01 = compile_and_run
 		   (<<"ets:fun2ms(fun(X) when is_integer(X); "
 		     "is_float(X) -> true end)">>),
-    ?line Res02 = compile_and_run
+    Res02 = compile_and_run
 		   (<<"ets:fun2ms(fun(X) when is_integer(X) -> true; "
 		     "(X) when is_float(X) -> true end)">>),
-    ?line Res01 = Res02,
-    ?line Res11 = compile_and_run
+    Res01 = Res02,
+    Res11 = compile_and_run
 		   (<<"ets:fun2ms(fun(X) when is_integer(X); "
 		     "is_float(X); atom(X) -> true end)">>),
-    ?line Res12 = compile_and_run
+    Res12 = compile_and_run
 		   (<<"ets:fun2ms(fun(X) when is_integer(X) -> true; "
 		     "(X) when is_float(X) -> true; "
 		     "(X) when is_atom(X) -> true end)">>),
-    ?line Res11 = Res12,
+    Res11 = Res12,
     ok.
     
     
-float_1_function(suite) ->
-    [];
-float_1_function(doc) ->
-    ["OTP-5297. The function float/1."];
+%% OTP-5297. The function float/1.
 float_1_function(Config) when is_list(Config) ->
-    ?line setup(Config),
+    setup(Config),
     RunMS = fun(L, MS) -> 
                     ets:match_spec_run(L, ets:match_spec_compile(MS)) 
             end,
-    ?line MS1 = compile_and_run
+    MS1 = compile_and_run
                   (<<"ets:fun2ms(fun(X) -> float(X) end)">>),
-    ?line [F1] = RunMS([3], MS1),
-    ?line true = is_float(F1) and (F1 == 3),
+    [F1] = RunMS([3], MS1),
+    true = is_float(F1) and (F1 == 3),
                   
-    ?line MS1b = compile_and_run
+    MS1b = compile_and_run
                   (<<"dbg:fun2ms(fun(X) -> float(X) end)">>),
-    ?line [F2] = RunMS([3], MS1b),
-    ?line true = is_float(F2) and (F2 == 3),
+    [F2] = RunMS([3], MS1b),
+    true = is_float(F2) and (F2 == 3),
                   
-    ?line MS2 = compile_and_run
+    MS2 = compile_and_run
             (<<"ets:fun2ms(fun(X) when is_pid(X) or float(X) -> true end)">>),
-    ?line [] = RunMS([3.0], MS2),
+    [] = RunMS([3.0], MS2),
 
-    ?line MS3 = compile_and_run
+    MS3 = compile_and_run
             (<<"dbg:fun2ms(fun(X) when is_pid(X); float(X) -> true end)">>),
-    ?line [true] = RunMS([3.0], MS3),
+    [true] = RunMS([3.0], MS3),
 
-    ?line MS4 = compile_and_run
+    MS4 = compile_and_run
             (<<"ets:fun2ms(fun(X) when erlang:float(X) > 1 -> big;"
                "              (_) -> small end)">>),
-    ?line [small,big] = RunMS([1.0, 3.0], MS4),
+    [small,big] = RunMS([1.0, 3.0], MS4),
 
-    ?line MS5 = compile_and_run
+    MS5 = compile_and_run
             (<<"ets:fun2ms(fun(X) when float(X) > 1 -> big;"
                "              (_) -> small end)">>),
-    ?line [small,big] = RunMS([1.0, 3.0], MS5),
+    [small,big] = RunMS([1.0, 3.0], MS5),
 
     %% This is the test from autoimported/1.
-    ?line [{'$1',[{is_float,'$1'}],[{float,'$1'}]}] = 
+    [{'$1',[{is_float,'$1'}],[{float,'$1'}]}] =
         compile_and_run
             (<<"ets:fun2ms(fun(X) when float(X) -> float(X) end)">>),
-    ?line [{'$1',[{float,'$1'}],[{float,'$1'}]}] =
+    [{'$1',[{float,'$1'}],[{float,'$1'}]}] =
         compile_and_run
            (<<"ets:fun2ms(fun(X) when erlang:'float'(X) -> "
               "erlang:'float'(X) end)">>),
     ok.
 
 
-action_function(suite) ->
-    [];
-action_function(doc) ->
-    ["Test all 'action functions'."];
+%% Test all 'action functions'.
 action_function(Config) when is_list(Config) ->
-    ?line setup(Config),
-    ?line [{['$1','$2'],[],
+    setup(Config),
+    [{['$1','$2'],[],
 	    [{set_seq_token,label,0},
 	     {get_seq_token},
 	     {message,'$1'},
@@ -778,7 +728,7 @@ action_function(Config) when is_list(Config) ->
 	    "message(X), "
 	    "return_trace(), "
 	    "exception_trace() end)">>),
-    ?line [{['$1','$2'],[],
+    [{['$1','$2'],[],
 	    [{process_dump},
 	     {enable_trace,send},
 	     {enable_trace,'$2',send},
@@ -791,7 +741,7 @@ action_function(Config) when is_list(Config) ->
 	    "enable_trace(Y, send), "
 	    "disable_trace(procs), "
 	    "disable_trace(Y, procs) end)">>),
-    ?line [{['$1','$2'],
+    [{['$1','$2'],
 	    [],
 	    [{display,'$1'},
 	     {caller},
@@ -821,7 +771,7 @@ eep37(Config) when is_list(Config) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Helpers
+%% Helpers
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 setup(Config) ->
@@ -832,14 +782,13 @@ temp_name() ->
     Conf = get(mts_config),
     C = get(mts_tf_counter),
     put(mts_tf_counter,C+1),
-    filename:join([?config(priv_dir,Conf),
+    filename:join([proplists:get_value(priv_dir,Conf),
 		   "tempfile"++integer_to_list(C)++".tmp"]).
 
 
 expect_failure(Recs,Code) ->
     case (catch compile_and_run(Recs,Code)) of
 	      {'EXIT',_Foo} ->
-		  %erlang:display(_Foo),
 		  ok;
 	      Other ->
 		  exit({expected,failure,got,Other})
diff --git a/lib/stdlib/test/proc_lib_SUITE.erl b/lib/stdlib/test/proc_lib_SUITE.erl
index f7a6a38138..ebce74545a 100644
--- a/lib/stdlib/test/proc_lib_SUITE.erl
+++ b/lib/stdlib/test/proc_lib_SUITE.erl
@@ -44,7 +44,7 @@
 -ifdef(STANDALONE).
 -define(line, noop, ).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -endif.
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
@@ -115,7 +115,7 @@ crash(Config) when is_list(Config) ->
 
     %% Spawn function with neighbour.
     Pid4 = proc_lib:spawn(?MODULE, sp2, []),
-    test_server:sleep(100),
+    ct:sleep(100),
     {?MODULE,sp2,[]} = proc_lib:initial_call(Pid4),
     {?MODULE,sp2,0} = proc_lib:translate_initial_call(Pid4),
     Pid4 ! die,
@@ -152,9 +152,9 @@ analyse_crash(Pid, Expected0, ExpLinks) ->
 	    analyse_links(ExpLinks, Links);
 	Unexpected ->
 	    io:format("~p\n", [Unexpected]),
-	    test_server:fail(unexpected_message)
+	    ct:fail(unexpected_message)
     after 5000 ->
-	    test_server:fail(no_crash_report)
+	    ct:fail(no_crash_report)
     end.
 
 analyse_links([H|Es], [{neighbour,N}|Links]) ->
@@ -170,7 +170,7 @@ analyse_crash_1([{Key,Pattern}|T], Report) ->
     case lists:keyfind(Key, 1, Report) of
 	false ->
 	    io:format("~p", [Report]),
-	    test_server:fail({missing_key,Key});
+	    ct:fail({missing_key,Key});
 	{Key,Info} ->
 	    try
 		match_info(Pattern, Info)
@@ -179,7 +179,7 @@ analyse_crash_1([{Key,Pattern}|T], Report) ->
 		    io:format("key: ~p", [Key]),
 		    io:format("pattern: ~p", [Pattern]),
 		    io:format("actual: ~p", [Report]),
-		    test_server:fail(no_match)
+		    ct:fail(no_match)
 	    end,
 	    analyse_crash_1(T, Report)
     end;
@@ -203,7 +203,7 @@ sync_start_nolink(Config) when is_list(Config) ->
     receive
 	{sync_started, F} -> 
 	    exit(F, kill),
-	    test_server:fail(async_start)
+	    ct:fail(async_start)
     after 1000 -> ok
     end,
     receive
@@ -214,14 +214,14 @@ sync_start_nolink(Config) when is_list(Config) ->
 	{sync_started, _} -> ok
     after 1000 ->
 	    exit(Pid2, kill),
-	    test_server:fail(no_sync_start)
+	    ct:fail(no_sync_start)
     end,
     ok.
-    
+
 sync_start_link(Config) when is_list(Config) ->
     _Pid = spawn_link(?MODULE, sp3, [self()]),
     receive
-	{sync_started, _} -> test_server:fail(async_start)
+	{sync_started, _} -> ct:fail(async_start)
     after 1000 -> ok
     end,
     receive
@@ -230,24 +230,24 @@ sync_start_link(Config) when is_list(Config) ->
     end,
     receive
 	{sync_started, _} -> ok
-    after 1000 -> test_server:fail(no_sync_start)
+    after 1000 -> ct:fail(no_sync_start)
     end,
     ok.
-    
+
 spawn_opt(Config) when is_list(Config) ->
     F = fun sp1/0,
     {name,Fname} = erlang:fun_info(F, name),
     FunMFArgs = {?MODULE,Fname,[]},
     FunMFArity = {?MODULE,Fname,0},
-    ?line Pid1 = proc_lib:spawn_opt(node(), F, [{priority,low}]),
-    ?line Pid = proc_lib:spawn_opt(F, [{priority,low}]),
-    ?line test_server:sleep(100),
-    ?line FunMFArgs = proc_lib:initial_call(Pid),
-    ?line FunMFArity = proc_lib:translate_initial_call(Pid),
-    ?line Pid ! die,
-    ?line FunMFArgs = proc_lib:initial_call(Pid1),
-    ?line FunMFArity = proc_lib:translate_initial_call(Pid1),
-    ?line Pid1 ! die,
+    Pid1 = proc_lib:spawn_opt(node(), F, [{priority,low}]),
+    Pid = proc_lib:spawn_opt(F, [{priority,low}]),
+    ct:sleep(100),
+    FunMFArgs = proc_lib:initial_call(Pid),
+    FunMFArity = proc_lib:translate_initial_call(Pid),
+    Pid ! die,
+    FunMFArgs = proc_lib:initial_call(Pid1),
+    FunMFArity = proc_lib:translate_initial_call(Pid1),
+    Pid1 ! die,
     ok.
 
 
@@ -283,57 +283,57 @@ hibernate(Config) when is_list(Config) ->
     Ref = make_ref(),
     Self = self(),
     LoopData = {Ref,Self},
-    ?line Pid = proc_lib:spawn_link(?MODULE, hib_loop, [LoopData]),
+    Pid = proc_lib:spawn_link(?MODULE, hib_loop, [LoopData]),
 
     %% Just check that the child process can process and answer messages.
-    ?line Pid ! {Self,loop_data},
+    Pid ! {Self,loop_data},
     receive
 	{loop_data,LoopData} -> ok;
 	Unexpected0 ->
-	    ?line io:format("Unexpected: ~p\n", [Unexpected0]),
-	    ?line ?t:fail()
+	    io:format("Unexpected: ~p\n", [Unexpected0]),
+	    ct:fail(failed)
     after 1000 ->
-	    ?line io:format("Timeout"),
-	    ?line ?t:fail()
+	    io:format("Timeout"),
+	    ct:fail(failed)
     end,
 
     %% Hibernate the process.
-    ?line Pid ! hibernate,
+    Pid ! hibernate,
     erlang:yield(),
     io:format("~p\n", [process_info(Pid, heap_size)]),
 
 
     %% Send a message to the process...
 
-    ?line Pid ! {Self,loop_data},
+    Pid ! {Self,loop_data},
 
     %% ... expect first a wake up message from the process...
     receive
 	{awaken,LoopData} -> ok;
 	Unexpected1 ->
-	    ?line io:format("Unexpected: ~p\n", [Unexpected1]),
-	    ?line ?t:fail()
+	    io:format("Unexpected: ~p\n", [Unexpected1]),
+	    ct:fail(failed)
     after 1000 ->
-	    ?line io:format("Timeout"),
-	    ?line ?t:fail()
+	    io:format("Timeout"),
+	    ct:fail(failed)
     end,
 
     %% ... followed by the answer to the actual request.
     receive
 	{loop_data,LoopData} -> ok;
 	Unexpected2 ->
-	    ?line io:format("Unexpected: ~p\n", [Unexpected2]),
-	    ?line ?t:fail()
+	    io:format("Unexpected: ~p\n", [Unexpected2]),
+	    ct:fail(failed)
     after 1000 ->
-	    ?line io:format("Timeout"),
-	    ?line ?t:fail()
+	    io:format("Timeout"),
+	    ct:fail(failed)
     end,
 
     %% Test that errors are handled correctly after wake up from hibernation...
 
-    ?line process_flag(trap_exit, true),
-    ?line error_logger:add_report_handler(?MODULE, self()),
-    ?line Pid ! crash,
+    process_flag(trap_exit, true),
+    error_logger:add_report_handler(?MODULE, self()),
+    Pid ! crash,
 
     %% We should receive two messages. Especially in the SMP emulator,
     %% we can't be sure of the message order, so sort the messages before
@@ -341,10 +341,10 @@ hibernate(Config) when is_list(Config) ->
 
     Messages = lists:sort(hib_receive_messages(2)),
     io:format("~p", [Messages]),
-    ?line [{'EXIT',Pid,i_crashed},{crash_report,Pid,[Report,[]]}] = Messages,
+    [{'EXIT',Pid,i_crashed},{crash_report,Pid,[Report,[]]}] = Messages,
 
     %% Check that the initial_call has the expected format.
-    ?line {value,{initial_call,{?MODULE,hib_loop,[_]}}} =
+    {value,{initial_call,{?MODULE,hib_loop,[_]}}} =
 	lists:keysearch(initial_call, 1, Report),
 
     error_logger:delete_report_handler(?MODULE),
@@ -371,10 +371,7 @@ hib_receive_messages(N) ->
 	Any -> [Any|hib_receive_messages(N-1)]
     end.
 
-otp_6345(suite) ->
-    [];
-otp_6345(doc) ->
-    ["'monitor' spawn_opt option"];
+%% 'monitor' spawn_opt option.
 otp_6345(Config) when is_list(Config) ->
     Opts = [link,monitor],
     {'EXIT', {badarg,[{proc_lib,check_for_monitor,_,_}|_Stack]}} =
@@ -392,11 +389,8 @@ otp_6345_loop() ->
 	    otp_6345_loop()
     end.
 
-%% OTP-9803
-init_dont_hang(suite) ->
-    [];
-init_dont_hang(doc) ->
-    ["Check that proc_lib:start don't hang if spawned process crashes before proc_lib:init_ack/2"];
+%% OTP-9803. Check that proc_lib:start() doesn't hang if spawned process
+%% crashes before proc_lib:init_ack/2.
 init_dont_hang(Config) when is_list(Config) ->
     %% Start should behave as start_link
     process_flag(trap_exit, true),
@@ -489,7 +483,7 @@ stop(_Config) ->
     {'EXIT',noproc} = (catch proc_lib:stop({to_stop,Node})),
 
     true = test_server:stop_node(Node),
-    
+
     %% Remote registered name, but non-existing node
     {'EXIT',{{nodedown,Node},_}} = (catch proc_lib:stop({to_stop,Node})),
     ok.
@@ -522,7 +516,7 @@ t_format() ->
 
     if
 	Tsz >= Usz ->
-	    ?t:fail();
+	    ct:fail(failed);
 	true ->
 	    ok
     end,
@@ -549,7 +543,7 @@ t_format_looper() ->
 %%-----------------------------------------------------------------
 init(Tester) ->
     {ok, Tester}.
-    
+
 handle_event({error_report, _GL, {Pid, crash_report, Report}}, Tester) ->
     io:format("~s\n", [proc_lib:format(Report)]),
     Tester ! {crash_report, Pid, Report},
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index 52fdb69b73..75971bcf11 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -25,7 +25,7 @@
 -define(QLC, qlc).
 -define(QLCs, "qlc").
 
-%-define(debug, true).
+%%-define(debug, true).
 
 %% There are often many tests per testcase. Most tests are copied to a
 %% module, a file. The file is compiled and the test run. Should the
@@ -43,10 +43,10 @@
 -define(testcase, current_testcase). % don't know
 -define(t, test_server).
 -else.
--include_lib("test_server/include/test_server.hrl").
--define(datadir, ?config(data_dir, Config)).
--define(privdir, ?config(priv_dir, Config)).
--define(testcase, ?config(?TESTCASE, Config)).
+-include_lib("common_test/include/ct.hrl").
+-define(datadir, proplists:get_value(data_dir, Config)).
+-define(privdir, proplists:get_value(priv_dir, Config)).
+-define(testcase, proplists:get_value(?TESTCASE, Config)).
 -endif.
 
 -include_lib("stdlib/include/ms_transform.hrl").
@@ -80,7 +80,7 @@
 
 	  backward/1, forward/1,
 
-         eep37/1]).
+	  eep37/1]).
 
 %% Internal exports.
 -export([bad_table_throw/1, bad_table_exit/1, default_table/1, bad_table/1,
@@ -107,19 +107,15 @@
 	 handle_event/2, handle_call/2, handle_info/2,
 	 terminate/2]).
 
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(5)).
-
 init_per_testcase(Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{?TESTCASE, Case}, {watchdog, Dog} | Config].
+    [{?TESTCASE, Case} | Config].
 
 end_per_testcase(_Case, _Config) ->
-    Dog = ?config(watchdog, _Config),
-    test_server:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,5}}].
 
 all() -> 
     [{group, parse_transform}, {group, evaluation},
@@ -159,35 +155,30 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-badarg(doc) ->
-    "Badarg.";
-badarg(suite) -> [];
 badarg(Config) when is_list(Config) ->
     Ts =
-      [{badarg,
-       <<"-import(qlc, [q/1, q/2]).
+	[{badarg,
+	  <<"-import(qlc, [q/1, q/2]).
           q(_, _, _) -> ok.
 
-          badarg() ->
-              qlc:q(foo),
-              qlc:q(foo, cache_all),
-              qlc:q(foo, cache_all, extra),
-              q(bar),
-              q(bar, cache_all),
-              q(bar, cache_all, extra).
-       ">>,
+badarg() ->
+    qlc:q(foo),
+    qlc:q(foo, cache_all),
+    qlc:q(foo, cache_all, extra),
+    q(bar),
+    q(bar, cache_all),
+    q(bar, cache_all, extra).
+">>,
        [],
-       {errors,[{5,?QLC,not_a_query_list_comprehension},
-                {6,?QLC,not_a_query_list_comprehension},
-                {8,?QLC,not_a_query_list_comprehension},
-                {9,?QLC,not_a_query_list_comprehension}],
-        []}}],
-    ?line [] = compile(Config, Ts),
+{errors,[{5,?QLC,not_a_query_list_comprehension},
+	 {6,?QLC,not_a_query_list_comprehension},
+	 {8,?QLC,not_a_query_list_comprehension},
+	 {9,?QLC,not_a_query_list_comprehension}],
+ []}}],
+    [] = compile(Config, Ts),
     ok.
 
-nested_qlc(doc) ->
-    "Nested qlc expressions.";
-nested_qlc(suite) -> [];
+%% Nested qlc expressions.
 nested_qlc(Config) when is_list(Config) ->
     %% Nested QLC expressions. X is bound before the first one; Z and X
     %% before the second one.
@@ -227,12 +218,10 @@ nested_qlc(Config) when is_list(Config) ->
        [warn_unused_vars],
        {warnings,[{{6,39},erl_lint,{shadowed_var,'X',generate}}]}}
     ],
-    ?line [] = compile(Config, Ts),
+    [] = compile(Config, Ts),
     ok.
 
-unused_var(doc) ->
-    "Unused variable with a name that should not be introduced.";
-unused_var(suite) -> [];
+%% Unused variable with a name that should not be introduced.
 unused_var(Config) when is_list(Config) ->
     Ts = 
      [{unused_var,
@@ -244,12 +233,10 @@ unused_var(Config) when is_list(Config) ->
        ">>,
        [warn_unused_vars],
        {warnings,[{{2,33},erl_lint,{unused_var,'Y1'}}]}}],
-    ?line [] = compile(Config, Ts),
+    [] = compile(Config, Ts),
     ok.
 
-lc(doc) ->
-    "Ordinary LC expression.";
-lc(suite) -> [];
+%% Ordinary LC expression.
 lc(Config) when is_list(Config) ->
     Ts = 
      [{lc,
@@ -258,12 +245,10 @@ lc(Config) when is_list(Config) ->
         ">>,
        [],
        {warnings,[{{2,30},erl_lint,{shadowed_var,'X',generate}}]}}],
-    ?line [] = compile(Config, Ts),
+    [] = compile(Config, Ts),
     ok.
            
-fun_clauses(doc) ->
-    "Fun with several clauses.";
-fun_clauses(suite) -> [];
+%% Fun with several clauses.
 fun_clauses(Config) when is_list(Config) ->
     Ts = 
      [{fun_clauses,
@@ -279,12 +264,10 @@ fun_clauses(Config) when is_list(Config) ->
                   {{3,41},erl_lint,{shadowed_var,'X',generate}},
                   {{4,22},erl_lint,{shadowed_var,'X','fun'}},
                   {{4,41},erl_lint,{shadowed_var,'X',generate}}]}}],
-    ?line [] = compile(Config, Ts),
+    [] = compile(Config, Ts),
     ok.
 
-filter_var(doc) ->
-    "Variable introduced in filter.";
-filter_var(suite) -> [];
+%% Variable introduced in filter.
 filter_var(Config) when is_list(Config) ->
     Ts = 
      [{filter_var,
@@ -309,13 +292,11 @@ filter_var(Config) when is_list(Config) ->
         ">>,
        [],
        {errors,[{{2,25},erl_lint,{unsafe_var,'V',{'case',{3,19}}}}],[]}}],
-    ?line [] = compile(Config, Ts),
+    [] = compile(Config, Ts),
     ok.
 
 
-single(doc) ->
-    "Unused pattern variable.";
-single(suite) -> [];
+%% Unused pattern variable.
 single(Config) when is_list(Config) ->
     Ts = 
      [{single,
@@ -325,12 +306,10 @@ single(Config) when is_list(Config) ->
         ">>,
        [warn_unused_vars],
        {warnings,[{{2,30},erl_lint,{unused_var,'Y'}}]}}],
-    ?line [] = compile(Config, Ts),
+    [] = compile(Config, Ts),
     ok.
 
-exported_var(doc) ->
-    "Exported variable in list expression (rhs of generator).";
-exported_var(suite) -> [];
+%% Exported variable in list expression (rhs of generator).
 exported_var(Config) when is_list(Config) ->
     Ts = 
      [{exported_var,
@@ -347,12 +326,10 @@ exported_var(Config) when is_list(Config) ->
        [warn_export_vars],
        {warnings,[{{7,37},erl_lint,{exported_var,'Z',{'case',{3,36}}}},
                   {{7,44},erl_lint,{exported_var,'Z',{'case',{3,36}}}}]}}],
-    ?line [] = compile(Config, Ts),
+    [] = compile(Config, Ts),
     ok.
 
-generator_vars(doc) ->
-    "Errors for generator variable used in list expression.";
-generator_vars(suite) -> [];
+%% Errors for generator variable used in list expression.
 generator_vars(Config) when is_list(Config) ->
     Ts = 
       [{generator_vars,
@@ -374,12 +351,10 @@ generator_vars(Config) when is_list(Config) ->
                  {{9,33},?QLC,{used_generator_variable,'Z'}},
                  {{9,40},?QLC,{used_generator_variable,'Z'}}],
          []}}],
-    ?line [] = compile(Config, Ts),
+    [] = compile(Config, Ts),
     ok.
 
-nomatch(doc) ->
-    "Unreachable clauses also found when compiling.";
-nomatch(suite) -> [];
+%% Unreachable clauses also found when compiling.
 nomatch(Config) when is_list(Config) ->
     Ts =
       [{unreachable1,
@@ -451,13 +426,11 @@ nomatch(Config) when is_list(Config) ->
         {warnings,[{3,v3_core,nomatch}]}}
 
       ],
-    ?line [] = compile(Config, Ts),
+    [] = compile(Config, Ts),
     ok.
     
 
-errors(doc) ->
-    "Errors within qlc expressions also found when compiling.";
-errors(suite) -> [];
+%% Errors within qlc expressions also found when compiling.
 errors(Config) when is_list(Config) ->
     Ts =
       [{errors1,
@@ -466,12 +439,10 @@ errors(Config) when is_list(Config) ->
         ">>,
         [],
         {errors,[{{2,33},erl_lint,{unbound_var,'A'}}],[]}}],
-    ?line [] = compile(Config, Ts),
+    [] = compile(Config, Ts),
     ok.
 
-pattern(doc) ->
-    "Patterns.";
-pattern(suite) -> [];
+%% Patterns.
 pattern(Config) when is_list(Config) ->
     Ts = [
       <<"%% Records in patterns. No lookup.
@@ -493,14 +464,12 @@ pattern(Config) when is_list(Config) ->
          end, [{<<\"hej\">>}])">>
 
        ],
-    ?line run(Config, <<"-record(a, {k,v}).
+    run(Config, <<"-record(a, {k,v}).
                          -record(k, {t,v}).\n">>, Ts),
     ok.
 
 
-eval(doc) ->
-    "eval/2";
-eval(suite) -> [];
+%% eval/2
 eval(Config) when is_list(Config) ->
     ScratchDir = filename:join([?privdir, "scratch","."]),
 
@@ -616,12 +585,10 @@ eval(Config) when is_list(Config) ->
 
           ],
     
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-cursor(doc) ->
-    "cursor/2";
-cursor(suite) -> [];
+%% cursor/2
 cursor(Config) when is_list(Config) ->
     ScratchDir = filename:join([?privdir, "scratch","."]),
     Ts = [<<"{'EXIT',{badarg,_}} = 
@@ -730,12 +697,10 @@ cursor(Config) when is_list(Config) ->
              ok = qlc:delete_cursor(C2)">>
 
          ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-fold(doc) ->
-    "fold/4";
-fold(suite) -> [];
+%% fold/4
 fold(Config) when is_list(Config) ->
     ScratchDir = filename:join([?privdir, "scratch","."]),
     Ts = [<<"Q = qlc:q([X || X <- [1,2,1,2,1]]),
@@ -825,12 +790,10 @@ fold(Config) when is_list(Config) ->
                (catch qlc:fold(F, [], Q, [{unique_all,false}]))
             ">>
          ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-eval_unique(doc) ->
-    "Test the unique_all option of eval.";
-eval_unique(suite) -> [];
+%% Test the unique_all option of eval.
 eval_unique(Config) when is_list(Config) ->
     Ts = [<<"QLC1 = qlc:q([X || X <- qlc:append([[1,1,2], [1,2,3,2,3]])]),
              [1,2,3] = qlc:eval(QLC1, {unique_all,true}),
@@ -922,12 +885,10 @@ eval_unique(Config) when is_list(Config) ->
              {sort,{sort,{list,_},[{unique,true}]},[]} = i(Q)">>
 
          ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-eval_cache(doc) ->
-    "Test the cache_all and unique_all options of eval.";
-eval_cache(suite) -> [];
+%% Test the cache_all and unique_all options of eval.
 eval_cache(Config) when is_list(Config) ->
     Ts = [
        <<"E = ets:new(apa, [ordered_set]),
@@ -1056,12 +1017,10 @@ eval_cache(Config) when is_list(Config) ->
           [1] = qlc:e(H, unique_all)">>
 
          ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-append(doc) ->
-    "Test the append function.";
-append(suite) -> [];
+%% Test the append function.
 append(Config) when is_list(Config) ->
     Ts = [<<"C = qlc:cursor(qlc:q([X || X <- [0,1,2,3], begin 10/X > 0.0 end])),
              R = (catch qlc:next_answers(C)),
@@ -1121,12 +1080,12 @@ append(Config) when is_list(Config) ->
              foo() -> bar">>,
 
           %% Used to work up to R11B.
-          % <<"apa = qlc:e(qlc:q([X || X <- qlc:append([[1,2,3], ugly()])])),
-          %   ok.
-          %
-          %   ugly() ->
-          %       [a | apa].
-          %   foo() -> bar">>,
+          %% <<"apa = qlc:e(qlc:q([X || X <- qlc:append([[1,2,3], ugly()])])),
+          %%   ok.
+          %%
+          %%   ugly() ->
+          %%       [a | apa].
+          %%   foo() -> bar">>,
 
           
           %% Maybe this one should fail.
@@ -1179,99 +1138,93 @@ append(Config) when is_list(Config) ->
              [a,b,1,2,1,2] = qlc:e(Q)">>
 
           ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-evaluator(doc) ->
-    "Simple call from evaluator.";
-evaluator(suite) -> [];
+%% Simple call from evaluator.
 evaluator(Config) when is_list(Config) ->
-    ?line true = is_alive(),
+    true = is_alive(),
     evaluator_2(Config, []),
-    ?line {ok, Node} = start_node(qlc_SUITE_evaluator),
-    ?line ok = rpc:call(Node, ?MODULE, evaluator_2, [Config, [compiler]]),
-    ?line ?t:stop_node(Node),
+    {ok, Node} = start_node(qlc_SUITE_evaluator),
+    ok = rpc:call(Node, ?MODULE, evaluator_2, [Config, [compiler]]),
+    test_server:stop_node(Node),
     ok.
 
 evaluator_2(Config, Apps) ->
-    ?line lists:foreach(fun(App) -> true = code:del_path(App) end, Apps),
+    lists:foreach(fun(App) -> true = code:del_path(App) end, Apps),
     FileName = filename:join(?privdir, "eval"),
-    ?line ok = file:write_file(FileName, 
+    ok = file:write_file(FileName,
                          <<"H = qlc:q([X || X <- L]),
                             [1,2,3] = qlc:e(H).">>),
-    ?line Bs = erl_eval:add_binding('L', [1,2,3], erl_eval:new_bindings()),
-    ?line ok = file:eval(FileName, Bs),
+    Bs = erl_eval:add_binding('L', [1,2,3], erl_eval:new_bindings()),
+    ok = file:eval(FileName, Bs),
 
     %% The error message is "handled" a bit too much... 
     %% (no trace of erl_lint left)
-    ?line ok = file:write_file(FileName, 
+    ok = file:write_file(FileName,
              <<"H = qlc:q([X || X <- L]), qlc:e(H).">>),
-    ?line {error,_} = file:eval(FileName),
+    {error,_} = file:eval(FileName),
 
     %% Ugly error message; badarg is caught by file.erl.
-    ?line ok = file:write_file(FileName, 
+    ok = file:write_file(FileName,
              <<"H = qlc:q([Z || {X,Y} <- [{a,2}], Z <- [Y]]), qlc:e(H).">>),
-    ?line {error,_} = file:eval(FileName),
+    {error,_} = file:eval(FileName),
 
     _ = file:delete(FileName),
     ok.
 
 start_node(Name) ->
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?t:start_node(Name, slave, [{args, "-pa " ++ PA}]).
+    PA = filename:dirname(code:which(?MODULE)),
+    test_server:start_node(Name, slave, [{args, "-pa " ++ PA}]).
 
-string_to_handle(doc) ->
-    "string_to_handle/1,2.";
-string_to_handle(suite) -> [];
+%% string_to_handle/1,2.
 string_to_handle(Config) when is_list(Config) ->
-    ?line {'EXIT',{badarg,_}} = (catch qlc:string_to_handle(14)),
-    ?line {'EXIT',{badarg,_}} = 
+    {'EXIT',{badarg,_}} = (catch qlc:string_to_handle(14)),
+    {'EXIT',{badarg,_}} =
         (catch qlc:string_to_handle("[X || X <- [a].", unique_all)),
-    ?line R1 = {error, _, {_,erl_scan,_}} = qlc:string_to_handle("'"),
-    ?line "1: unterminated " ++ _ = lists:flatten(qlc:format_error(R1)),
-    ?line {error, _, {_,erl_parse,_}} = qlc:string_to_handle("foo"),
-    ?line {'EXIT',{badarg,_}} = (catch qlc:string_to_handle("foo, bar.")),
-    ?line R3 = {error, _, {_,?QLC,not_a_query_list_comprehension}} = 
+    R1 = {error, _, {_,erl_scan,_}} = qlc:string_to_handle("'"),
+    "1: unterminated " ++ _ = lists:flatten(qlc:format_error(R1)),
+    {error, _, {_,erl_parse,_}} = qlc:string_to_handle("foo"),
+    {'EXIT',{badarg,_}} = (catch qlc:string_to_handle("foo, bar.")),
+    R3 = {error, _, {_,?QLC,not_a_query_list_comprehension}} =
         qlc:string_to_handle("bad."),
-    ?line "1: argument is not" ++ _ = lists:flatten(qlc:format_error(R3)),
-    ?line R4 = {error, _, {_,?QLC,{used_generator_variable,'Y'}}} = 
+    "1: argument is not" ++ _ = lists:flatten(qlc:format_error(R3)),
+    R4 = {error, _, {_,?QLC,{used_generator_variable,'Y'}}} =
         qlc:string_to_handle("[X || begin Y = [1,2], true end, X <- Y]."),
-    ?line "1: generated variable 'Y'" ++ _ = 
+    "1: generated variable 'Y'" ++ _ =
         lists:flatten(qlc:format_error(R4)),
-    ?line {error, _, {_,erl_lint,_}} = qlc:string_to_handle("[X || X <- A]."),
-    ?line H1 = qlc:string_to_handle("[X || X <- [1,2]]."),
-    ?line [1,2] = qlc:e(H1),
-    ?line H2 = qlc:string_to_handle("[X || X <- qlc:append([a,b],"
+    {error, _, {_,erl_lint,_}} = qlc:string_to_handle("[X || X <- A]."),
+    H1 = qlc:string_to_handle("[X || X <- [1,2]]."),
+    [1,2] = qlc:e(H1),
+    H2 = qlc:string_to_handle("[X || X <- qlc:append([a,b],"
                                     "qlc:e(qlc:q([X || X <- [c,d,e]])))]."),
-    ?line [a,b,c,d,e] = qlc:e(H2),
+    [a,b,c,d,e] = qlc:e(H2),
     %% The generated fun has many arguments (erl_eval has a maximum of 20).
-    ?line H3 = qlc:string_to_handle(
+    H3 = qlc:string_to_handle(
            "[{A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W} ||"
            " {A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W} <- []]."),
-    ?line [] = qlc:e(H3),
-    ?line Bs1 = erl_eval:add_binding('L', [1,2,3], erl_eval:new_bindings()),
-    ?line H4 = qlc:string_to_handle("[X || X <- L].", [], Bs1),
-    ?line [1,2,3] = qlc:e(H4),
-    ?line H5 = qlc:string_to_handle("[X || X <- [1,2,1,2]].", [unique, cache]),
-    ?line [1,2] = qlc:e(H5),
-
-    ?line Ets = ets:new(test, []),
-    ?line true = ets:insert(Ets, [{1}]),
-    ?line Bs2 = erl_eval:add_binding('E', Ets, erl_eval:new_bindings()),
-    ?line Q = "[X || {X} <- ets:table(E)].",
-    ?line [1] = qlc:e(qlc:string_to_handle(Q, [], Bs2)),
-    ?line [1] = qlc:e(qlc:string_to_handle(Q, {max_lookup,1000}, Bs2)),
-    ?line [1] = qlc:e(qlc:string_to_handle(Q, {max_lookup,infinity}, Bs2)),
-    ?line {'EXIT',{badarg,_}} = 
+    [] = qlc:e(H3),
+    Bs1 = erl_eval:add_binding('L', [1,2,3], erl_eval:new_bindings()),
+    H4 = qlc:string_to_handle("[X || X <- L].", [], Bs1),
+    [1,2,3] = qlc:e(H4),
+    H5 = qlc:string_to_handle("[X || X <- [1,2,1,2]].", [unique, cache]),
+    [1,2] = qlc:e(H5),
+
+    Ets = ets:new(test, []),
+    true = ets:insert(Ets, [{1}]),
+    Bs2 = erl_eval:add_binding('E', Ets, erl_eval:new_bindings()),
+    Q = "[X || {X} <- ets:table(E)].",
+    [1] = qlc:e(qlc:string_to_handle(Q, [], Bs2)),
+    [1] = qlc:e(qlc:string_to_handle(Q, {max_lookup,1000}, Bs2)),
+    [1] = qlc:e(qlc:string_to_handle(Q, {max_lookup,infinity}, Bs2)),
+    {'EXIT',{badarg,_}} =
         (catch qlc:string_to_handle(Q, {max_lookup,-1}, Bs2)),
-    ?line {'EXIT', {no_lookup_to_carry_out, _}} = 
+    {'EXIT', {no_lookup_to_carry_out, _}} =
         (catch qlc:e(qlc:string_to_handle(Q, {lookup,true}, Bs2))),
-    ?line ets:delete(Ets),
+    ets:delete(Ets),
     ok.
 
-table(doc) ->
-    "table";
-table(suite) -> [];
+%% table
 table(Config) when is_list(Config) ->
     dets:start(),
     Ts = [
@@ -1353,11 +1306,11 @@ table(Config) when is_list(Config) ->
           ets:delete(E)">>,
 
        %% The info tag num_of_objects is currently not used.
-%        <<"E = ets:new(test, [ordered_set]),
-%           true = ets:insert(E, [{1,a},{2,b},{3,c}]),
-%           H = qlc:q([X || X <- qlc_SUITE:bad_table_info_fun_n_objects(E)]),
-%           {'EXIT', finito} = (catch {any_term,qlc:e(H)}),
-%           ets:delete(E)">>,
+%%        <<"E = ets:new(test, [ordered_set]),
+%%           true = ets:insert(E, [{1,a},{2,b},{3,c}]),
+%%           H = qlc:q([X || X <- qlc_SUITE:bad_table_info_fun_n_objects(E)]),
+%%           {'EXIT', finito} = (catch {any_term,qlc:e(H)}),
+%%           ets:delete(E)">>,
 
        <<"E = ets:new(test, [ordered_set]),
           true = ets:insert(E, [{1,a},{2,b},{3,c}]),
@@ -1473,7 +1426,7 @@ table(Config) when is_list(Config) ->
               [1,2] = lookup_keys(Q)
            end, [{1,1},{2,2}])">>
        ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
 
     Ts2 = [
        %% [T || P <- Table, F] turned into a match spec. Records needed.
@@ -1484,13 +1437,11 @@ table(Config) when is_list(Config) ->
           [{a,1,2},{a,3,4}] = lists:sort(qlc:eval(QH)),
           ets:delete(E)">>
        ],
-    ?line run(Config, <<"-record(a, {b,c}).\n">>, Ts2),
+    run(Config, <<"-record(a, {b,c}).\n">>, Ts2),
 
     ok.
 
-process_dies(doc) ->
-    "Caller or cursor process dies.";
-process_dies(suite) -> [];
+%% Caller or cursor process dies.
 process_dies(Config) when is_list(Config) ->
     Ts = [
        <<"E = ets:new(test, []),
@@ -1629,12 +1580,10 @@ process_dies(Config) when is_list(Config) ->
           true = ets:delete(E), ok">>
 
         ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-sort(doc) ->
-    "The sort option.";
-sort(suite) -> [];
+%% The sort option.
 sort(Config) when is_list(Config) ->
     Ts = [
        <<"H = qlc:q([X || X <- qlc:sort([1,2,3,2], {unique,true})]),
@@ -1741,12 +1690,10 @@ sort(Config) when is_list(Config) ->
        end
 
         ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-keysort(doc) ->
-    "The sort option.";
-keysort(suite) -> [];
+%% The sort option.
 keysort(Config) when is_list(Config) ->
 
     Ts = [
@@ -1865,13 +1812,11 @@ keysort(Config) when is_list(Config) ->
           100003 = length(R)">>
 
         ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
 
     ok.
 
-filesort(doc) ->
-    "keysort/1,2, using a file.";
-filesort(suite) -> [];
+%% keysort/1,2, using a file.
 filesort(Config) when is_list(Config) ->
     Ts = [
        <<"Q = qlc:q([X || X <- [{3},{1},{2}]]),
@@ -1879,13 +1824,11 @@ filesort(Config) when is_list(Config) ->
           Q2 = qlc:q([{X,Y} || Y <- [1,2], X <- qlc:keysort([1],Q,Opts)]),
           [{{1},1},{{2},1},{{3},1},{{1},2},{{2},2},{{3},2}] = qlc:e(Q2)">>
         ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
 
-cache(doc) ->
-    "The cache option.";
-cache(suite) -> [];
+%% The cache option.
 cache(Config) when is_list(Config) ->
     Ts = [
        <<"{'EXIT', {badarg, _}} = (catch qlc:q([X || X <- [1,2]], badarg))">>,
@@ -2043,12 +1986,10 @@ cache(Config) when is_list(Config) ->
            []} = i(H, cache_all)">>
        
        ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-cache_list(doc) ->
-    "OTP-6038. The {cache,list} option.";
-cache_list(suite) -> [];
+%% OTP-6038. The {cache,list} option.
 cache_list(Config) when is_list(Config) ->
     Ts = [
        begin
@@ -2334,12 +2275,10 @@ cache_list(Config) when is_list(Config) ->
           {'EXIT', {badarg, _}} = (catch qlc:e(Q, {max_list_size, foo}))">>
 
        ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-filter(doc) ->
-    "Filters and match specs.";
-filter(suite) -> [];
+%% Filters and match specs.
 filter(Config) when is_list(Config) ->
     Ts = [
        <<"L = [1,2,3,4,5],
@@ -2461,12 +2400,10 @@ filter(Config) when is_list(Config) ->
           [{2,b},{2,c},{3,b},{3,c}] = qlc:e(H)">>
 
        ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-info(doc) ->
-    "info/2.";
-info(suite) -> [];
+%% info/2.
 info(Config) when is_list(Config) ->
     Ts = [
        <<"{list, [1,2]} = i(qlc:q([X || X <- [1,2]])),
@@ -2686,12 +2623,10 @@ info(Config) when is_list(Config) ->
           [{4},{5},{6}] = qlc:e(F(3))">>
 
        ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-nested_info(doc) ->
-    "Nested QLC expressions. QLC expressions in filter and template.";
-nested_info(suite) -> [];
+%% Nested QLC expressions. QLC expressions in filter and template.
 nested_info(Config) when is_list(Config) ->
     Ts = [
        <<"L = [{1,a},{2,b},{3,c}],
@@ -2792,13 +2727,11 @@ nested_info(Config) when is_list(Config) ->
           [{1,1},{1,1},{1,2},{1,2},{2,1},{2,1},{2,2},{2,2}] = qlc:e(Q)">>
 
        ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
 
-lookup1(doc) ->
-    "Lookup keys. Mostly test of patterns.";
-lookup1(suite) -> [];
+%% Lookup keys. Mostly test of patterns.
 lookup1(Config) when is_list(Config) ->
     Ts = [
        <<"etsc(fun(E) ->
@@ -3003,12 +2936,10 @@ lookup1(Config) when is_list(Config) ->
         []}
 
        ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-lookup2(doc) ->
-    "Lookup keys. Mostly test of filters.";
-lookup2(suite) -> [];
+%% Lookup keys. Mostly test of filters.
 lookup2(Config) when is_list(Config) ->
     Ts = [
        <<"%% Only guards are inspected. No lookup.
@@ -3708,9 +3639,7 @@ lookup2(Config) when is_list(Config) ->
 
     ok.
 
-lookup_rec(doc) ->
-    "Lookup keys. With records.";
-lookup_rec(suite) -> [];
+%% Lookup keys. With records.
 lookup_rec(Config) when is_list(Config) ->
     Ts = [
        <<"etsc(fun(E) ->
@@ -3778,12 +3707,10 @@ lookup_rec(Config) when is_list(Config) ->
                 [_] = lookup_keys(Q)
         end, [{keypos,2}], [#r{a=foo}])">>
        ],
-    ?line run(Config, <<"-record(r, {a}).\n">>, Ts),
+    run(Config, <<"-record(r, {a}).\n">>, Ts),
     ok.
 
-indices(doc) ->
-    "Using indices for lookup.";
-indices(suite) -> [];
+%% Using indices for lookup.
 indices(Config) when is_list(Config) ->
     Ts = [
        <<"L = [{1,a},{2,b},{3,c}],
@@ -3845,12 +3772,10 @@ indices(Config) when is_list(Config) ->
           [{c,3,z,w}] = qlc:eval(QH)">>
 
        ],
-    ?line run(Config, <<"-record(r, {a}).\n">>, Ts),
+    run(Config, <<"-record(r, {a}).\n">>, Ts),
     ok.
 
-pre_fun(doc) ->
-    "Test the table/2 callback functions parent_fun and stop_fun.";
-pre_fun(suite) -> [];
+%% Test the table/2 callback functions parent_fun and stop_fun.
 pre_fun(Config) when is_list(Config) ->
     Ts = [
        <<"PF = process_flag(trap_exit, true),
@@ -3926,12 +3851,10 @@ pre_fun(Config) when is_list(Config) ->
 
        ],
     
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-skip_filters(doc) ->
-    "Lookup keys. With records.";
-skip_filters(suite) -> [];
+%% Lookup keys. With records.
 skip_filters(Config) when is_list(Config) ->
     %% Skipped filters
     TsS = [
@@ -4051,7 +3974,7 @@ skip_filters(Config) when is_list(Config) ->
           end, [{0},{1},{2},{3},{4}])">>
 
            ],
-    ?line run(Config, TsS),
+    run(Config, TsS),
 
     Ts = [
        <<"etsc(fun(E) ->
@@ -4329,14 +4252,12 @@ skip_filters(Config) when is_list(Config) ->
               end, [{1},{2},{3}])">>
 
           ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
 
     ok.
 
 
-ets(doc) ->
-    "ets:table/1,2.";
-ets(suite) -> [];
+%% ets:table/1,2.
 ets(Config) when is_list(Config) ->
     Ts = [
        <<"E = ets:new(t, [ordered_set]),
@@ -4377,12 +4298,10 @@ ets(Config) when is_list(Config) ->
 
        ],
     
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-dets(doc) ->
-    "dets:table/1,2.";
-dets(suite) -> [];
+%% dets:table/1,2.
 dets(Config) when is_list(Config) ->
     dets:start(),
     T = t,
@@ -4475,14 +4394,12 @@ dets(Config) when is_list(Config) ->
 
        ],
     
-    ?line run(Config, Ts),
+    run(Config, Ts),
     _ = file:delete(Fname),
     ok.
 
 
-join_option(doc) ->
-    "The 'join' option (any, lookup, merge, nested_loop). Also cache/unique.";
-join_option(suite) -> [];
+%% The 'join' option (any, lookup, merge, nested_loop). Also cache/unique.
 join_option(Config) when is_list(Config) ->
     Ts = [
        <<"Q1 = qlc:q([X || X <- [1,2,3]],{join,merge}),
@@ -4607,7 +4524,7 @@ join_option(Config) when is_list(Config) ->
           ets:delete(E1)">>
 
        ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
 
     %% The 'cache' and 'unique' options of qlc/2 affects join.
     CUTs = [
@@ -4655,13 +4572,11 @@ join_option(Config) when is_list(Config) ->
                   _],[{unique,true}]} = i(Q, Options),
           [{1,1,1},{2,2,1},{1,1,2},{2,2,2}] = qlc:e(Q, Options)">>
        ],
-    ?line run(Config, CUTs),
+    run(Config, CUTs),
 
     ok.
 
-join_filter(doc) ->
-    "Various aspects of filters and join.";
-join_filter(suite) -> [];
+%% Various aspects of filters and join.
 join_filter(Config) when is_list(Config) ->
     Ts = [
       <<"E1 = create_ets(1, 10),
@@ -4698,12 +4613,10 @@ join_filter(Config) when is_list(Config) ->
               end, [{a},{b},{c}])">>
 
     ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-join_lookup(doc) ->
-    "Lookup join.";
-join_lookup(suite) -> [];
+%% Lookup join.
 join_lookup(Config) when is_list(Config) ->
     Ts = [
        <<"E1 = create_ets(1, 10),
@@ -4793,12 +4706,10 @@ join_lookup(Config) when is_list(Config) ->
           ets:delete(E)">>
 
           ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-join_merge(doc) ->
-    "Merge join.";
-join_merge(suite) -> [];
+%% Merge join.
 join_merge(Config) when is_list(Config) ->
     Ts = [
        <<"Q = qlc:q([{X,Y} || {X} <- [], {Y} <- [{1}], X =:= Y], 
@@ -5070,7 +4981,7 @@ join_merge(Config) when is_list(Config) ->
           [{2,a}] = qlc:e(Q)">>
 
           ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
 
     %% Small examples. Returning an error term.
     ETs = [
@@ -5249,7 +5160,7 @@ join_merge(Config) when is_list(Config) ->
           err = qlc:e(Q)">>
 
           ],
-    ?line run(Config, ETs),
+    run(Config, ETs),
 
     %% Mostly examples where temporary files are needed while merging.
     FTs = [
@@ -5408,13 +5319,11 @@ join_merge(Config) when is_list(Config) ->
 
 
           ],
-    ?line run(Config, FTs),
+    run(Config, FTs),
     
     ok.
 
-join_sort(doc) ->
-    "Merge join optimizations (avoid unnecessary sorting).";
-join_sort(suite) -> [];
+%% Merge join optimizations (avoid unnecessary sorting).
 join_sort(Config) when is_list(Config) ->
     Ts = [
        <<"H1_1 = qlc:keysort(1, [{1,2,3},{4,5,6}]),
@@ -5694,12 +5603,10 @@ join_sort(Config) when is_list(Config) ->
                end, [{1,2},{3,4}])">>
 
          ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-join_complex(doc) ->
-    "Join of more than two columns.";
-join_complex(suite) -> [];
+%% Join of more than two columns.
 join_complex(Config) when is_list(Config) ->
     Ts = [{three,
            <<"three() ->
@@ -5727,7 +5634,7 @@ join_complex(Config) when is_list(Config) ->
            {warnings,[{2,qlc,too_many_joins}]}}
        ],
 
-    ?line compile(Config, Ts),
+    compile(Config, Ts),
 
     Ts2 = [{three,
             <<"three() ->
@@ -5756,14 +5663,12 @@ join_complex(Config) when is_list(Config) ->
            {[],["cannot handle more than one join efficiently"]}}
        ],
 
-    ?line compile_format(Config, Ts2),
+    compile_format(Config, Ts2),
 
     ok.
 
 
-otp_5644(doc) ->
-    "OTP-5644. Handle the new language element M:F/A.";
-otp_5644(suite) -> [];
+%% OTP-5644. Handle the new language element M:F/A.
 otp_5644(Config) when is_list(Config) ->
     Ts = [
        <<"Q = qlc:q([fun modul:mfa/0 || _ <- [1,2], 
@@ -5771,12 +5676,10 @@ otp_5644(Config) when is_list(Config) ->
           [_,_] = qlc:eval(Q)">>
        ],
     
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-otp_5195(doc) ->
-    "OTP-5195. Allow traverse functions returning terms.";
-otp_5195(suite) -> [];
+%% OTP-5195. Allow traverse functions returning terms.
 otp_5195(Config) when is_list(Config) ->
     %% Several minor improvements have been implemented in OTP-5195.
     %% The test cases are spread all over... except these.
@@ -5854,7 +5757,7 @@ otp_5195(Config) when is_list(Config) ->
 
        ],
     
-    ?line run(Config, Ts),
+    run(Config, Ts),
 
     Ts2 = [<<"Q = qlc:q([{X,Y} || {X} <- [{1},{2},{3}],
                                   begin
@@ -5863,13 +5766,11 @@ otp_5195(Config) when is_list(Config) ->
                                   end,
                                   X =:= Y]),
               [{3,3}] = qlc:e(Q)">>],
-    ?line run(Config, Ts2),
+    run(Config, Ts2),
 
     ok.
 
-otp_6038_bug(doc) ->
-    "OTP-6038. Bug fixes: unique and keysort; cache.";
-otp_6038_bug(suite) -> [];
+%% OTP-6038. Bug fixes: unique and keysort; cache.
 otp_6038_bug(Config) when is_list(Config) ->
     %% The 'unique' option can no longer be merged with the keysort options.
     %% This used to return [{1,a},{1,c},{2,b},{2,d}], but since 
@@ -5879,7 +5780,7 @@ otp_6038_bug(Config) when is_list(Config) ->
              H2 = qlc:keysort(1, H1, [{unique,true}]),
              [{1,a},{2,b}] = qlc:e(H2)">>],
 
-    ?line run(Config, Ts),
+    run(Config, Ts),
     
     %% Sometimes the cache options did not empty the correct tables.
     CTs = [
@@ -5908,13 +5809,11 @@ otp_6038_bug(Config) when is_list(Config) ->
           L = [{X,Y} || X <- [1,2], Y <- L4],
           true = R =:= L">>
        ],
-    ?line run(Config, CTs),    
+    run(Config, CTs),
 
     ok.
 
-otp_6359(doc) ->
-    "OTP-6359. dets:select() never returns the empty list.";
-otp_6359(suite) -> [];
+%% OTP-6359. dets:select() never returns the empty list.
 otp_6359(Config) when is_list(Config) ->
     dets:start(),
     T = luna,
@@ -5933,12 +5832,10 @@ otp_6359(Config) when is_list(Config) ->
            ok">>]
     ],
 
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
-otp_6562(doc) ->
-    "OTP-6562. compressed = false (should be []) when sorting before join.";
-otp_6562(suite) -> [];
+%% OTP-6562. compressed = false (should be []) when sorting before join.
 otp_6562(Config) when is_list(Config) ->
     Bug = [
       %% This example uses a file to sort E2 on the second column. It is
@@ -5957,7 +5854,7 @@ otp_6562(Config) when is_list(Config) ->
          ets:delete(E1),
          ets:delete(E2)">>
     ],
-    ?line run(Config, Bug),
+    run(Config, Bug),
 
     Bits = [
        {otp_6562_1,
@@ -5969,18 +5866,16 @@ otp_6562(Config) when is_list(Config) ->
         {errors,[{2,qlc,binary_generator}],
          []}}
        ],
-    ?line [] = compile(Config, Bits),
+    [] = compile(Config, Bits),
 
-    ?line R1 = {error,qlc,{1,qlc,binary_generator}}
+    R1 = {error,qlc,{1,qlc,binary_generator}}
              = qlc:string_to_handle("[X || <<X:8>> <= <<\"hej\">>]."),
-    ?line "1: cannot handle binary generators\n" = 
+    "1: cannot handle binary generators\n" =
              lists:flatten(qlc:format_error(R1)),
 
     ok.
 
-otp_6590(doc) ->
-    "OTP-6590. Bug fix (join info).";
-otp_6590(suite) -> [];
+%% OTP-6590. Bug fix (join info).
 otp_6590(Config) when is_list(Config) ->
     Ts = [<<"fun(Tab1Value) -> 
                     Q = qlc:q([T1#tab1.id || T1 <- [#tab1{id = id1,
@@ -5992,13 +5887,11 @@ otp_6590(Config) when is_list(Config) ->
                     [id1] = qlc:e(Q)
             end(v)">>],
 
-    ?line run(Config, <<"-record(tab1, {id, tab2_id, value}).
+    run(Config, <<"-record(tab1, {id, tab2_id, value}).
                          -record(tab2, {id, value}).\n">>, Ts),
     ok.
 
-otp_6673(doc) ->
-    "OTP-6673. Optimizations and fixes.";
-otp_6673(suite) -> [];
+%% OTP-6673. Optimizations and fixes.
 otp_6673(Config) when is_list(Config) ->
     Ts_PT = 
         [<<"etsc(fun(E1) ->
@@ -6054,7 +5947,7 @@ otp_6673(Config) when is_list(Config) ->
                  end, 
                  [{1,x},{2,y},{3,z}])">>],
 
-    ?line run(Config, Ts_PT),
+    run(Config, Ts_PT),
 
     MS = ets:fun2ms(fun({X,_Y}=T) when X > 1 -> T end),
     Ts_RT = [
@@ -6091,13 +5984,11 @@ otp_6673(Config) when is_list(Config) ->
                  end, [{x,1},{y,2},{z,3}])">>
 
     ],
-    ?line run(Config, Ts_RT),
+    run(Config, Ts_RT),
 
     ok.
 
-otp_6964(doc) ->
-    "OTP-6964. New option 'tmpdir_usage'.";
-otp_6964(suite) -> [];
+%% OTP-6964. New option 'tmpdir_usage'.
 otp_6964(Config) when is_list(Config) ->
     T1 = [
        <<"Q1 = qlc:q([{X} || X <- [1,2]]),
@@ -6131,7 +6022,7 @@ otp_6964(Config) when is_list(Config) ->
           _ = erlang:system_flag(backtrace_depth, D)
       end,
           qlc_SUITE:uninstall_error_logger()">>],
-    ?line run(Config, T1),
+    run(Config, T1),
 
     T2 = [
        <<"%% File sorter.
@@ -6164,7 +6055,7 @@ otp_6964(Config) when is_list(Config) ->
           {info, caching} = qlc_SUITE:read_error_logger(),
           qlc_SUITE:uninstall_error_logger()">>],
 
-    ?line run(Config, T2),
+    run(Config, T2),
 
     T3 = [
        <<"%% sort/keysort
@@ -6194,7 +6085,7 @@ otp_6964(Config) when is_list(Config) ->
           qlc_SUITE:uninstall_error_logger(),
           ets:delete(E1),
           ets:delete(E2)">>],
-    ?line run(Config, T3),
+    run(Config, T3),
 
     T4 = [
        <<"%% cache list
@@ -6225,18 +6116,16 @@ otp_6964(Config) when is_list(Config) ->
                            lists:flatten(qlc:format_error(ErrReply))
                end, [{keypos,1}], [{I,a,lists:duplicate(100000,1)} || 
                                        I <- lists:seq(1, 10)])">>],
-    ?line run(Config, T4),
+    run(Config, T4),
     ok.
 
-otp_7238(doc) ->
-    "OTP-7238. info-option 'depth', &c.";
-otp_7238(suite) -> [];
+%% OTP-7238. info-option 'depth', &c.
 otp_7238(Config) when is_list(Config) ->
     dets:start(),
     T = otp_7238, 
     Fname = filename(T, Config),
 
-    ?line ok = compile_gb_table(Config),
+    ok = compile_gb_table(Config),
 
     %% A few more warnings.
     T1 = [
@@ -6365,7 +6254,7 @@ otp_7238(Config) when is_list(Config) ->
         [],
         {warnings,[{2,sys_core_fold,no_clause_match}]}}
          ],
-    ?line [] = compile(Config, T1),
+    [] = compile(Config, T1),
 
     %% 'depth' is a new option used by info()
     T2 = [
@@ -6591,7 +6480,7 @@ otp_7238(Config) when is_list(Config) ->
           qlc:info(Q, [{format,abstract_code},{depth, 2}])">>
 
          ],
-    ?line run(Config, T2),
+    run(Config, T2),
 
     T3 = [
 %%        {nomatch_6,
@@ -6607,7 +6496,7 @@ otp_7238(Config) when is_list(Config) ->
 %%         [],
 %%         {[],["pattern cannot possibly match"]}}
        ],
-    ?line compile_format(Config, T3),
+    compile_format(Config, T3),
 
     %% *Very* simple test - just check that it doesn't crash.
     Type = [{cres,
@@ -6615,13 +6504,11 @@ otp_7238(Config) when is_list(Config) ->
                 {'EXIT',{{badfun,_},_}} = (catch qlc:e(Q))">>,
              [type_checker],
              []}],
-    ?line run(Config, Type),
+    run(Config, Type),
 
     ok.
     
-otp_7114(doc) ->
-    "OTP-7114. Match spec, table and duplicated objects..";
-otp_7114(suite) -> [];
+%% OTP-7114. Match spec, table and duplicated objects...
 otp_7114(Config) when is_list(Config) ->
     Ts = [<<"T = ets:new(t, [bag]),
              [ets:insert(T, {t, I, I div 2}) || I <- lists:seq(1,10)],
@@ -6632,11 +6519,9 @@ otp_7114(Config) when is_list(Config) ->
              [0,1,2,3,4,5] = qlc:e(qlc:sort(qlc:e(Q1)), unique_all),
              ets:delete(T),
              ok">>],
-    ?line run(Config, Ts).
+    run(Config, Ts).
 
-otp_7232(doc) ->
-    "OTP-7232. qlc:info() bug (pids, ports, refs, funs).";
-otp_7232(suite) -> [];
+%% OTP-7232. qlc:info() bug (pids, ports, refs, funs).
 otp_7232(Config) when is_list(Config) ->
     Ts = [<<"L = [fun math:sqrt/1, list_to_pid(\"<0.4.1>\"),
                   erlang:make_ref()],
@@ -6664,11 +6549,9 @@ otp_7232(Config) when is_list(Config) ->
              \"[<<8,1:1>>]\" = qlc:info(Q)">>
 
          ],
-    ?line run(Config, Ts).
+    run(Config, Ts).
 
-otp_7552(doc) ->
-    "OTP-7552. Merge join bug.";
-otp_7552(suite) -> [];
+%% OTP-7552. Merge join bug.
 otp_7552(Config) when is_list(Config) ->
     %% The poor performance cannot be observed unless the 
     %% (redundant) join filter is skipped. 
@@ -6691,11 +6574,9 @@ otp_7552(Config) when is_list(Config) ->
                    Qn = F(nested_loop),
                    true = lists:sort(qlc:e(Qm, {max_list_size,20})) =:= 
                           lists:sort(qlc:e(Qn))">>],
-    ?line run(Config, Ts).
+    run(Config, Ts).
 
-otp_7714(doc) ->
-    "OTP-7714. Merge join bug.";
-otp_7714(suite) -> [];
+%% OTP-7714. Merge join bug.
 otp_7714(Config) when is_list(Config) ->
     %% The original example uses Mnesia. This one does not.
     Ts = [<<"E1 = ets:new(set,[]),
@@ -6710,11 +6591,9 @@ otp_7714(Config) when is_list(Config) ->
              [{a,1},{a,2},{a,3}] = lists:sort(qlc:e(Q)),
              ets:delete(E1),
              ets:delete(E2)">>],
-    ?line run(Config, Ts).
+    run(Config, Ts).
 
-otp_11758(doc) ->
-    "OTP-11758. Bug.";
-otp_11758(suite) -> [];
+%% OTP-11758. Bug.
 otp_11758(Config) when is_list(Config) ->
     Ts = [<<"T = ets:new(r, [{keypos, 2}]),
              L = [{rrr, xxx, aaa}, {rrr, yyy, bbb}],
@@ -6725,12 +6604,10 @@ otp_11758(Config) when is_list(Config) ->
              ets:delete(T)">>],
     run(Config, Ts).
 
-otp_6674(doc) ->
-    "OTP-6674. match/comparison.";
-otp_6674(suite) -> [];
+%% OTP-6674. match/comparison.
 otp_6674(Config) when is_list(Config) ->
 
-    ?line ok = compile_gb_table(Config),
+    ok = compile_gb_table(Config),
 
     Ts = [%% lookup join
           <<"E = ets:new(join, [ordered_set]),
@@ -7153,11 +7030,9 @@ otp_6674(Config) when is_list(Config) ->
 
     ],
 
-    ?line run(Config, Ts).
+    run(Config, Ts).
 
-otp_12946(doc) ->
-    ["Syntax error."];
-otp_12946(suite) -> [];
+%% Syntax error.
 otp_12946(Config) when is_list(Config) ->
     Text =
         <<"-export([init/0]).
@@ -7167,12 +7042,10 @@ otp_12946(Config) when is_list(Config) ->
     {errors,[{4,erl_parse,_}],[]} = compile_file(Config, Text, []),
     ok.
 
-manpage(doc) ->
-    "Examples from qlc(3).";
-manpage(suite) -> [];
+%% Examples from qlc(3).
 manpage(Config) when is_list(Config) ->
 
-    ?line ok = compile_gb_table(Config),
+    ok = compile_gb_table(Config),
 
     Ts = [
        <<"QH = qlc:q([{X,Y} || X <- [a,b], Y <- [1,2]]),
@@ -7327,7 +7200,7 @@ manpage(Config) when is_list(Config) ->
                    ets:match_spec_compile([{{{'$1','$2'},'_'},[],['$1']}]))\",
           L = qlc:info(QH)">>
       ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
 
     L = [1,2,3],
     Bs = erl_eval:add_binding('L', L, erl_eval:new_bindings()),
@@ -7345,7 +7218,7 @@ manpage(Config) when is_list(Config) ->
 
             true = qlc:info(QH1) =:= qlc:info(QH2),
             true = ets:delete(Tab)">>]],
-    ?line run(Config, ETs),
+    run(Config, ETs),
 
     %% dets(3)
     DTs = [
@@ -7358,16 +7231,16 @@ manpage(Config) when is_list(Config) ->
 
             true = qlc:info(QH1) =:= qlc:info(QH2),
             ok = dets:close(T)">>]],
-    ?line run(Config, DTs),
+    run(Config, DTs),
 
     ok.
 
 compile_gb_table(Config) ->
     GB_table_file = filename("gb_table.erl", Config),
-    ?line ok = file:write_file(GB_table_file, gb_table()),
-    ?line {ok, gb_table} = compile:file(GB_table_file, [{outdir,?privdir}]),
-    ?line code:purge(gb_table),
-    ?line {module, gb_table} = 
+    ok = file:write_file(GB_table_file, gb_table()),
+    {ok, gb_table} = compile:file(GB_table_file, [{outdir,?privdir}]),
+    code:purge(gb_table),
+    {module, gb_table} =
         code:load_abs(filename:rootname(GB_table_file)),
     ok.
 
@@ -7433,9 +7306,7 @@ gb_iter(I0, N, EFun) ->
     ">>.
 
 
-backward(doc) ->
-    "OTP-6674. Join info and extra constants.";
-backward(suite) -> [];
+%% OTP-6674. Join info and extra constants.
 backward(Config) when is_list(Config) ->
     try_old_join_info(Config),
     ok.
@@ -7470,9 +7341,6 @@ try_old_join_info(Config) ->
         qlc:info(H2, {format,debug}),
     [{1,1},{2,2}] = qlc:e(H2).
 
-forward(doc) ->
-    "";
-forward(suite) -> [];
 forward(Config) when is_list(Config) ->
     Ts = [
       %% LC_fun() returns something unknown.
@@ -7481,12 +7349,12 @@ forward(Config) when is_list(Config) ->
          {'EXIT', {{unsupported_qlc_handle,_},_}} = (catch qlc:e(FakeH))">>,
 
 %% 'f1' should be used for new stuff that does not interfer with old behavior
-%       %% The unused element 'f1' of #qlc_table seems to be used.
-%       <<"DF = fun() -> foo end,
-%          FakeH = {qlc_handle,{qlc_table,DF,
-%                        true,DF,DF,DF,DF,DF,
-%                        undefined,not_undefined,undefined,no_match_spec}},
-%          {'EXIT', {{unsupported_qlc_handle,_},_}} = (catch qlc:e(FakeH))">>,
+%%       %% The unused element 'f1' of #qlc_table seems to be used.
+%%       <<"DF = fun() -> foo end,
+%%          FakeH = {qlc_handle,{qlc_table,DF,
+%%                        true,DF,DF,DF,DF,DF,
+%%                        undefined,not_undefined,undefined,no_match_spec}},
+%%          {'EXIT', {{unsupported_qlc_handle,_},_}} = (catch qlc:e(FakeH))">>,
 
       %% #qlc_opt has changed.
       <<"H = qlc:q([X || X <- []]),
@@ -7495,7 +7363,7 @@ forward(Config) when is_list(Config) ->
          {'EXIT', {{unsupported_qlc_handle,_},_}} = (catch qlc:e(FakeH))">>
 
      ],
-    ?line run(Config, Ts),
+    run(Config, Ts),
     ok.
 
 eep37(Config) when is_list(Config) ->
@@ -7955,7 +7823,7 @@ run_test(Config, Extra, {cres, Body, Opts, ExpectedCompileReturn}) ->
 
     R = case catch Mod:function() of
             {'EXIT', _Reason} = Error ->
-                ?t:format("failed, got ~p~n", [Error]),
+                io:format("failed, got ~p~n", [Error]),
                 fail(SourceFile);
             Reply ->
                 Reply
@@ -7966,7 +7834,7 @@ run_test(Config, Extra, {cres, Body, Opts, ExpectedCompileReturn}) ->
         {file, cover_compiled} ->
             ok;
         {file, _} ->
-            ?t:format("qlc_pt was loaded in runtime~n", []),
+            io:format("qlc_pt was loaded in runtime~n", []),
             fail(SourceFile);
         false ->
             ok
@@ -8167,16 +8035,15 @@ warnings(File, Ws) ->
     end.
 
 expected(Test, Expected, Got, File) ->
-    ?t:format("~nTest ~p failed. ", [Test]),
+    io:format("~nTest ~p failed. ", [Test]),
     expected(Expected, Got, File).
 
 expected(Expected, Got, File) ->
-    ?t:format("Expected~n  ~p~n, but got~n  ~p~n", [Expected, Got]),
+    io:format("Expected~n  ~p~n, but got~n  ~p~n", [Expected, Got]),
     fail(File).
 
 fail(Source) ->
-    io:format("failed~n"),
-    ?t:fail({failed,testcase,on,Source}).
+    ct:fail({failed,testcase,on,Source}).
 
 %% Copied from global_SUITE.erl.
 
@@ -8197,8 +8064,8 @@ read_error_logger() ->
         {error, Pid, Tuple} ->
             {error, Pid, Tuple}
     after 1000 ->
-	    ?line io:format("No reply after 1 s\n", []),
-	    ?line ?t:fail()
+	    io:format("No reply after 1 s\n", []),
+	    ct:fail(failed)
     end.
 
 %%-----------------------------------------------------------------
diff --git a/lib/stdlib/test/queue_SUITE.erl b/lib/stdlib/test/queue_SUITE.erl
index c965a8b218..cd3f8e6e2f 100644
--- a/lib/stdlib/test/queue_SUITE.erl
+++ b/lib/stdlib/test/queue_SUITE.erl
@@ -19,26 +19,23 @@
 %%
 -module(queue_SUITE).
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2,
 	 init_per_group/2,end_per_group/2]).
 
 -export([do/1, to_list/1, io_test/1, op_test/1, error/1, oops/1]).
 
--export([init_per_testcase/2, end_per_testcase/2]).
 
--include_lib("test_server/include/test_server.hrl").
-
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
+-include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [do, to_list, io_test, op_test, error, oops].
@@ -59,47 +56,40 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-do(doc) ->
-    [""];
-do(suite) ->
-    [];
 do(Config) when is_list(Config) ->
-    ?line L = [{in, 1},
-	       {in, 2},
-	       {out, {value, 1}},
-	       {in, 3},
-	       {out, {value, 2}},
-	       {out, {value, 3}},
-	       {out, empty}
-	      ],
-    
-    ?line E = queue:new(),
-    ?line [] = queue:to_list(E),
-    ?line Q = do_queue(E, L),
-    ?line true = queue:is_empty(Q),
-    ?line 0 = queue:len(Q),
+    L = [{in, 1},
+	 {in, 2},
+	 {out, {value, 1}},
+	 {in, 3},
+	 {out, {value, 2}},
+	 {out, {value, 3}},
+	 {out, empty}
+	],
+
+    E = queue:new(),
+    [] = queue:to_list(E),
+    Q = do_queue(E, L),
+    true = queue:is_empty(Q),
+    0 = queue:len(Q),
     ok.
 
-to_list(doc) ->
-    ["OTP-2701"];
-to_list(suite) ->
-    [];
+%% OTP-2701
 to_list(Config) when is_list(Config) ->
-    ?line E = queue:new(),
-    ?line Q = do_queue(E, [{in, 1},
-			   {in, 2},
-			   {in, 3},
-			   {out, {value, 1}},
-			   {in, 4},
-			   {in, 5}]),
-    ?line true = queue:is_queue(Q),
-    ?line 4 = queue:len(Q),
-    ?line case queue:to_list(Q) of
-	      [2,3,4,5] ->
-		  ok;
-	      Other1 ->
-		  test_server:fail(Other1)
-	  end,
+    E = queue:new(),
+    Q = do_queue(E, [{in, 1},
+		     {in, 2},
+		     {in, 3},
+		     {out, {value, 1}},
+		     {in, 4},
+		     {in, 5}]),
+    true = queue:is_queue(Q),
+    4 = queue:len(Q),
+    case queue:to_list(Q) of
+	[2,3,4,5] ->
+	    ok;
+	Other1 ->
+	    ct:fail(Other1)
+    end,
     ok.
 
 do_queue(Q, []) ->
@@ -114,93 +104,86 @@ do_queue_1({out, E}, Q) ->
 	{E, Q1} ->
 	    Q1;
 	Other ->
-	    test_server:fail({"out failed", E, Q, Other})
+	    ct:fail({"out failed", E, Q, Other})
     end.
 
 
-io_test(doc) ->
-    "Test input and output";
-io_test(suite) ->
-    [];
+%% Test input and output.
 io_test(Config) when is_list(Config) ->
     E = queue:new(),
     do_io_test(E),
     ok.
 
 do_io_test(E) ->
-    ?line [4,3,5] = 
+    [4,3,5] =
 	io([snoc,snoc,head,head,head,cons,cons,snoc], E, 1),
-    ?line [5,3,4] = 
+    [5,3,4] =
 	io([cons,cons,daeh,daeh,daeh,snoc,snoc,cons], E, 1),
-    ?line [4,3,5] = 
+    [4,3,5] =
 	io([in,in,out,out,out,in_r,in_r,in], E, 1),
-    ?line [5,3,4] = 
+    [5,3,4] =
 	io([in_r,in_r,out_r,out_r,out_r,in,in,in_r], E, 1),
     %%
-    ?line [] = 
+    [] =
 	io([snoc,snoc,head,snoc,snoc,head,head,snoc,head,head], E, 1),
-    ?line [] = 
+    [] =
 	io([cons,cons,daeh,cons,cons,daeh,daeh,cons,daeh,daeh], E, 1),
-    ?line [] = 
+    [] =
 	io([in,in,out,in,in,out,out,in,out,out], E, 1),
-    ?line [] = 
+    [] =
 	io([in_r,in_r,out_r,in_r,in_r,out_r,out_r,in_r,out_r,out_r], 
 	   E, 1),
     %%
-    ?line [5,6] = 
+    [5,6] =
 	io([snoc,snoc,snoc,head,head,snoc,snoc,snoc,head,head], E, 1),
-    ?line [6,5] = 
+    [6,5] =
 	io([cons,cons,cons,daeh,daeh,cons,cons,cons,daeh,daeh], E, 1),
-    ?line [5,6] = 
+    [5,6] =
 	io([in,in,in,out,out,in,in,in,out,out], E, 1),
-    ?line [6,5] = 
+    [6,5] =
 	io([in_r,in_r,in_r,out_r,out_r,in_r,in_r,in_r,out_r,out_r], 
 	   E, 1),
     %%
-    ?line [5] = 
+    [5] =
 	io([snoc,head,head,snoc,head,snoc,head,snoc,head,snoc], E, 1),
-    ?line [5] = 
+    [5] =
 	io([cons,daeh,daeh,cons,daeh,cons,daeh,cons,daeh,cons], E, 1),
-    ?line [5] = 
+    [5] =
 	io([in,out,out,in,out,in,out,in,out,in], E, 1),
-    ?line [5] = 
+    [5] =
 	io([in_r,out_r,out_r,in_r,out_r,in_r,out_r,in_r,out_r,in_r], 
 	   E, 1),
     %%
-    ?line [] =
+    [] =
 	io([snoc,head,snoc,snoc,head,head,snoc,snoc,snoc,head,head,head], 
 	   E, 1),
-    ?line [] =
+    [] =
 	io([cons,daeh,cons,cons,daeh,daeh,cons,cons,cons,daeh,daeh,daeh],
-	  E, 1),
-    ?line [] =
+	   E, 1),
+    [] =
 	io([in,out,in,in,out,out,in,in,in,out,out,out], 
 	   E, 1),
-    ?line [] =
+    [] =
 	io([in_r,out_r,in_r,in_r,out_r,out_r,in_r,in_r,in_r,out_r,out_r,out_r],
-	  E, 1),
+	   E, 1),
     %%
-    ?line [3] =	io([cons,cons,cons,snoc,daeh,daeh,daeh], E, 1),
-    ?line [3] =	io([snoc,snoc,snoc,cons,head,head,head], E, 1),
-    ?line [3] =	io([in,in,in,in_r,out,out,out], E, 1),
-    ?line [3] =	io([in_r,in_r,in_r,in,out_r,out_r,out_r], E, 1),
+    [3] =	io([cons,cons,cons,snoc,daeh,daeh,daeh], E, 1),
+    [3] =	io([snoc,snoc,snoc,cons,head,head,head], E, 1),
+    [3] =	io([in,in,in,in_r,out,out,out], E, 1),
+    [3] =	io([in_r,in_r,in_r,in,out_r,out_r,out_r], E, 1),
     %%
-    ?line Q2 = queue:join(queue:cons(1, E),queue:cons(2, E)),
-    ?line Q1 = queue:reverse(Q2),
-    ?line [1] = io([head],  Q1, 3),
-    ?line [1] = io([out],   Q1, 3),
-    ?line [1] = io([daeh],  Q2, 3),
-    ?line [1] = io([out_r], Q2, 3),
-%    ?line [2] =	io([cons,cons,snoc,daeh,daeh], [], 1),
-%    ?line [2] =	io([snoc,snoc,cons,head,head], [], 1),
-%    ?line [2] =	io([in,in,in_r,out,out], [], 1),
-%    ?line [2] =	io([in_r,in_r,in,out_r,out_r], [], 1),
+    Q2 = queue:join(queue:cons(1, E),queue:cons(2, E)),
+    Q1 = queue:reverse(Q2),
+    [1] = io([head],  Q1, 3),
+    [1] = io([out],   Q1, 3),
+    [1] = io([daeh],  Q2, 3),
+    [1] = io([out_r], Q2, 3),
     %%
-    ?line [2] =
+    [2] =
 	io([in,peek,peek_r,drop,in_r,peek,peek_r,in,peek,peek_r,drop_r], E, 1),
     %% Malformed queues UGLY-GUTS-ALL-OVER-THE-PLACE
-    ?line [2,1] = io([peek], {[1,2],[]}, 1),
-    ?line [1,2] = io([peek_r], {[],[1,2]}, 1),
+    [2,1] = io([peek], {[1,2],[]}, 1),
+    [1,2] = io([peek_r], {[],[1,2]}, 1),
     %%
     ok.
 
@@ -269,7 +252,7 @@ io([peek_r | Tail], Q, Q0, X) ->
 io([drop | Tail], Q, [], X) ->
     try queue:drop(Q) of
 	V ->
-	    test_server:fail({?MODULE,?LINE,V})
+	    ct:fail({?MODULE,?LINE,V})
     catch
 	error:empty ->
 	    io(Tail, Q, [], X)
@@ -280,7 +263,7 @@ io([drop | Tail], Q, [_ | T], X) ->
 io([drop_r | Tail], Q, [], X) ->
     try queue:drop_r(Q) of
 	V ->
-	    test_server:fail({?MODULE,?LINE,V})
+	    ct:fail({?MODULE,?LINE,V})
     catch
 	error:empty ->
 	    io(Tail, Q, [], X)
@@ -298,108 +281,102 @@ io([], Q, QQ, _X) ->
     QQ.
 
 
-op_test(doc) ->
-    "Test operations on whole queues";
-op_test(suite) ->
-    [];
+%% Test operations on whole queues.
 op_test(Config) when is_list(Config) ->
     do_op_test(fun id/1),
     ok.
 
 do_op_test(F) ->
-    ?line Len = 50,
-    ?line Len2 = 2*Len,
-    ?line L1 = lists:seq(1, Len),
-    ?line L1r = lists:reverse(L1),
-    ?line L2 = lists:seq(Len+1, Len2),
-    ?line L2r = lists:reverse(L2),
-    ?line L3 = L1++L2,
-    ?line L3r = L2r++L1r,
-    ?line Q0 = F(queue:new()),
-    ?line [] = queue:to_list(Q0),
-    ?line Q0 = F(queue:from_list([])),
-    ?line Q1 = F(queue:from_list(L1)),
-    ?line Q2 = F(queue:from_list(L2)),
-    ?line Q3 = F(queue:from_list(L3)),
-    ?line Len = queue:len(Q1),
-    ?line Len = queue:len(Q2),
-    ?line Len2 = queue:len(Q3),
-    ?line L1 = queue:to_list(Q1),
-    ?line L2 = queue:to_list(Q2),
-    ?line L3 = queue:to_list(Q3),
-    ?line Q3b = queue:join(Q0, queue:join(queue:join(Q1, Q2), Q0)),
-    ?line L3 = queue:to_list(Q3b),
-    ?line {Q0, Q3New1} = queue:split(0, Q3),
-    ?line L3 = queue:to_list(Q3New1),
-    ?line {Q3New2, Q0} = queue:split(Len2, Q3),
-    ?line L3 = queue:to_list(Q3New2),
-    ?line {Q1a, Q2a} = queue:split(Len, Q3),
-    ?line L1 = queue:to_list(Q1a),
-    ?line L2 = queue:to_list(Q2a),
-    ?line {Q3c, Q3d} = queue:split(2, Q3),
-    ?line L3 = queue:to_list(Q3c) ++ queue:to_list(Q3d),
-    ?line {Q1b, Q2b} = queue:split(Len, Q3b),
-    ?line L1 = queue:to_list(Q1b),
-    ?line L2 = queue:to_list(Q2b),
-    ?line Len = queue:len(Q1b),
-    ?line Len = queue:len(Q2b),
-    ?line Len2 = queue:len(Q3b),
-    ?line Q1r = queue:reverse(Q1),
-    ?line Q2r = queue:reverse(Q2),
-    ?line Q1ar = queue:reverse(Q1a),
-    ?line Q2ar = queue:reverse(Q2a),
-    ?line Q1br = queue:reverse(Q1b),
-    ?line Q2br = queue:reverse(Q2b),
-    ?line Q3br = queue:reverse(Q3b),
-    ?line L1r = queue:to_list(Q1r),
-    ?line L1r = queue:to_list(Q1ar),
-    ?line L1r = queue:to_list(Q1br),
-    ?line L2r = queue:to_list(Q2r),
-    ?line L2r = queue:to_list(Q2ar),
-    ?line L2r = queue:to_list(Q2br),
-    ?line L3r = queue:to_list(Q3br),
-    ?line Len = queue:len(Q1br),
-    ?line Len = queue:len(Q2br),
-    ?line Len2 = queue:len(Q3br),
-    ?line false = queue:member([], Q0),
-    ?line false = queue:member(0, Q0),
-    ?line false = queue:member(0, Q1),
-    ?line false = queue:member([], Q1),
-    ?line true = queue:member(1, Q1),
-    ?line false = queue:member(1.0, Q1),
-    ?line true = queue:member(Len, Q1),
+    Len = 50,
+    Len2 = 2*Len,
+    L1 = lists:seq(1, Len),
+    L1r = lists:reverse(L1),
+    L2 = lists:seq(Len+1, Len2),
+    L2r = lists:reverse(L2),
+    L3 = L1++L2,
+    L3r = L2r++L1r,
+    Q0 = F(queue:new()),
+    [] = queue:to_list(Q0),
+    Q0 = F(queue:from_list([])),
+    Q1 = F(queue:from_list(L1)),
+    Q2 = F(queue:from_list(L2)),
+    Q3 = F(queue:from_list(L3)),
+    Len = queue:len(Q1),
+    Len = queue:len(Q2),
+    Len2 = queue:len(Q3),
+    L1 = queue:to_list(Q1),
+    L2 = queue:to_list(Q2),
+    L3 = queue:to_list(Q3),
+    Q3b = queue:join(Q0, queue:join(queue:join(Q1, Q2), Q0)),
+    L3 = queue:to_list(Q3b),
+    {Q0, Q3New1} = queue:split(0, Q3),
+    L3 = queue:to_list(Q3New1),
+    {Q3New2, Q0} = queue:split(Len2, Q3),
+    L3 = queue:to_list(Q3New2),
+    {Q1a, Q2a} = queue:split(Len, Q3),
+    L1 = queue:to_list(Q1a),
+    L2 = queue:to_list(Q2a),
+    {Q3c, Q3d} = queue:split(2, Q3),
+    L3 = queue:to_list(Q3c) ++ queue:to_list(Q3d),
+    {Q1b, Q2b} = queue:split(Len, Q3b),
+    L1 = queue:to_list(Q1b),
+    L2 = queue:to_list(Q2b),
+    Len = queue:len(Q1b),
+    Len = queue:len(Q2b),
+    Len2 = queue:len(Q3b),
+    Q1r = queue:reverse(Q1),
+    Q2r = queue:reverse(Q2),
+    Q1ar = queue:reverse(Q1a),
+    Q2ar = queue:reverse(Q2a),
+    Q1br = queue:reverse(Q1b),
+    Q2br = queue:reverse(Q2b),
+    Q3br = queue:reverse(Q3b),
+    L1r = queue:to_list(Q1r),
+    L1r = queue:to_list(Q1ar),
+    L1r = queue:to_list(Q1br),
+    L2r = queue:to_list(Q2r),
+    L2r = queue:to_list(Q2ar),
+    L2r = queue:to_list(Q2br),
+    L3r = queue:to_list(Q3br),
+    Len = queue:len(Q1br),
+    Len = queue:len(Q2br),
+    Len2 = queue:len(Q3br),
+    false = queue:member([], Q0),
+    false = queue:member(0, Q0),
+    false = queue:member(0, Q1),
+    false = queue:member([], Q1),
+    true = queue:member(1, Q1),
+    false = queue:member(1.0, Q1),
+    true = queue:member(Len, Q1),
     %%
     %% Additional coverage.
-    ?line {MyL1r,MyL2r} = lists:split(Len-2, L1r),
-    ?line MyQ0r = queue:reverse(F(queue:from_list(L1))),
-    ?line {MyQ1r,MyQ2r} = queue:split(Len-2, MyQ0r),
-    ?line MyL1r = queue:to_list(MyQ1r),
-    ?line MyL2r = queue:to_list(MyQ2r),
-    ?line MyQ3r = queue:filter(
-		   fun (X) when X rem 4 >= 2 -> false;
-		       (X) when X rem 8 == 0 -> [float(X),{X}];
-		       (X) when X rem 2 >= 1 -> [{X}];
-		       (_)                   -> true
-		   end, MyQ1r),
-    ?line MyL3r = lists:flatten(
-		    [if X rem 8 == 0 -> [float(X),{X}];
-			X rem 2 >= 1 -> {X};
-			true         -> X
-		     end || X <- MyL1r,
-			    X rem 4 < 2]),
-    ?line MyL3r = queue:to_list(MyQ3r),
-    ?line MyQ4 = F(queue:from_list([11,22,33,44])),
-    ?line [11,22] = queue:to_list(queue:filter(fun(X) when X < 27 -> true;
-						  (_) -> [] end, MyQ4)),
-    ?line [33,44] = queue:to_list(queue:filter(fun(X) when X < 27 -> false;
-						  (X) -> [X] end, MyQ4)),
+    {MyL1r,MyL2r} = lists:split(Len-2, L1r),
+    MyQ0r = queue:reverse(F(queue:from_list(L1))),
+    {MyQ1r,MyQ2r} = queue:split(Len-2, MyQ0r),
+    MyL1r = queue:to_list(MyQ1r),
+    MyL2r = queue:to_list(MyQ2r),
+    MyQ3r = queue:filter(
+	      fun (X) when X rem 4 >= 2 -> false;
+		  (X) when X rem 8 == 0 -> [float(X),{X}];
+		  (X) when X rem 2 >= 1 -> [{X}];
+		  (_)                   -> true
+	      end, MyQ1r),
+    MyL3r = lists:flatten(
+	      [if X rem 8 == 0 -> [float(X),{X}];
+		  X rem 2 >= 1 -> {X};
+		  true         -> X
+	       end || X <- MyL1r,
+		      X rem 4 < 2]),
+    MyL3r = queue:to_list(MyQ3r),
+    MyQ4 = F(queue:from_list([11,22,33,44])),
+    [11,22] = queue:to_list(queue:filter(fun(X) when X < 27 -> true;
+					    (_) -> [] end, MyQ4)),
+    [33,44] = queue:to_list(queue:filter(fun(X) when X < 27 -> false;
+					    (X) -> [X] end, MyQ4)),
     %%
     ok.
 
-error(doc) ->
-    "Test queue errors";
-error(suite) ->
-    [];
+%% Test queue errors.
 error(Config) when is_list(Config) ->
     do_error(fun id/1, illegal_queue),
     do_error(fun id/1, {[],illegal_queue}),
@@ -417,65 +394,62 @@ trycatch(M, F, Args) ->
     end.
 
 do_error(F, IQ) ->
-    ?line io:format("Illegal Queue: ~p~n", [IQ]),
+    io:format("Illegal Queue: ~p~n", [IQ]),
     %%
-    ?line {error,badarg} = trycatch(in, [1, IQ]),
-    ?line {error,badarg} = trycatch(out, [IQ]),
-    ?line {error,badarg} = trycatch(in_r ,[1, IQ]),
-    ?line {error,badarg} = trycatch(out_r ,[IQ]),
-    ?line {error,badarg} = trycatch(to_list ,[IQ]),
+    {error,badarg} = trycatch(in, [1, IQ]),
+    {error,badarg} = trycatch(out, [IQ]),
+    {error,badarg} = trycatch(in_r ,[1, IQ]),
+    {error,badarg} = trycatch(out_r ,[IQ]),
+    {error,badarg} = trycatch(to_list ,[IQ]),
     %%
-    ?line {error,badarg} = trycatch(from_list, [no_list]),
-    ?line {error,badarg} = trycatch(is_empty, [IQ]),
-    ?line {error,badarg} = trycatch(len, [IQ]),
+    {error,badarg} = trycatch(from_list, [no_list]),
+    {error,badarg} = trycatch(is_empty, [IQ]),
+    {error,badarg} = trycatch(len, [IQ]),
     %%
-    ?line {error,badarg} = trycatch(cons, [1, IQ]),
-    ?line {error,badarg} = trycatch(head, [IQ]),
-    ?line {error,badarg} = trycatch(tail, [IQ]),
+    {error,badarg} = trycatch(cons, [1, IQ]),
+    {error,badarg} = trycatch(head, [IQ]),
+    {error,badarg} = trycatch(tail, [IQ]),
     %%
-    ?line {error,badarg} = trycatch(snoc, [IQ, 1]),
-    ?line {error,badarg} = trycatch(last, [IQ]),
-    ?line {error,badarg} = trycatch(daeh, [IQ]),
-    ?line {error,badarg} = trycatch(liat, [IQ]),
-    ?line {error,badarg} = trycatch(lait, [IQ]),
-    ?line {error,badarg} = trycatch(init, [IQ]),
+    {error,badarg} = trycatch(snoc, [IQ, 1]),
+    {error,badarg} = trycatch(last, [IQ]),
+    {error,badarg} = trycatch(daeh, [IQ]),
+    {error,badarg} = trycatch(liat, [IQ]),
+    {error,badarg} = trycatch(lait, [IQ]),
+    {error,badarg} = trycatch(init, [IQ]),
     %%
-    ?line {error,badarg} = trycatch(reverse, [IQ]),
-    ?line {error,badarg} = trycatch(join, [F(queue:new()), IQ]),
-    ?line {error,badarg} = trycatch(join, [IQ, F(queue:new())]),
-    ?line {error,badarg} = trycatch(split, [17, IQ]),
-    ?line {error,badarg} = trycatch(head, [IQ]),
+    {error,badarg} = trycatch(reverse, [IQ]),
+    {error,badarg} = trycatch(join, [F(queue:new()), IQ]),
+    {error,badarg} = trycatch(join, [IQ, F(queue:new())]),
+    {error,badarg} = trycatch(split, [17, IQ]),
+    {error,badarg} = trycatch(head, [IQ]),
     %%
-    ?line Q0 = F(queue:new()),
-    ?line {error,badarg} = trycatch(split, [1, Q0]),
-    ?line {error,badarg} = trycatch(split, [2, queue:snoc(Q0, 1)]),
+    Q0 = F(queue:new()),
+    {error,badarg} = trycatch(split, [1, Q0]),
+    {error,badarg} = trycatch(split, [2, queue:snoc(Q0, 1)]),
     %%
-    ?line {value,false}  = trycatch(is_queue, [IQ]),
-    ?line {error,badarg} = trycatch(get, [IQ]),
-    ?line {error,badarg} = trycatch(peek, [IQ]),
-    ?line {error,badarg} = trycatch(peek_r, [IQ]),
-    ?line {error,badarg} = trycatch(filter, [fun id/1, IQ]),
-    ?line {error,badarg} = trycatch(filter, [no_fun, Q0]),
+    {value,false}  = trycatch(is_queue, [IQ]),
+    {error,badarg} = trycatch(get, [IQ]),
+    {error,badarg} = trycatch(peek, [IQ]),
+    {error,badarg} = trycatch(peek_r, [IQ]),
+    {error,badarg} = trycatch(filter, [fun id/1, IQ]),
+    {error,badarg} = trycatch(filter, [no_fun, Q0]),
     %%
-    ?line {error,badarg} = trycatch(member, [1, IQ]),
+    {error,badarg} = trycatch(member, [1, IQ]),
     ok.
 
 id(X) ->
     X.
 
-oops(doc) ->
-    "Test queue errors";
-oops(suite) ->
-    [];
+%% Test queue errors.
 oops(Config) when is_list(Config) ->
-    ?line N = 3142,
-    ?line Optab = optab(),
-    ?line Seed0 = random:seed0(),
-    ?line {Is,Seed} = random_list(N, tuple_size(Optab), Seed0, []),
-    ?line io:format("~p ", [Is]),
-    ?line QA = queue:new(),
-    ?line QB = {[]},
-    ?line emul([QA], [QB], Seed, [element(I, Optab) || I <- Is]).
+    N = 3142,
+    Optab = optab(),
+    Seed0 = rand:seed(exsplus, {1,2,4}),
+    {Is,Seed} = random_list(N, tuple_size(Optab), Seed0, []),
+    io:format("~p ", [Is]),
+    QA = queue:new(),
+    QB = {[]},
+    emul([QA], [QB], Seed, [element(I, Optab) || I <- Is]).
 
 optab() ->
     {{new,[],        q,     fun ()     -> {[]} end},
@@ -562,20 +536,20 @@ args([], _, Seed, R) ->
 args([q|Ts], [Q|Qs]=Qss, Seed, R) ->
     args(Ts, if Qs =:= [] -> Qss; true -> Qs end, Seed, [Q|R]);
 args([l|Ts], Qs, Seed0, R) ->
-    {N,Seed1} = random:uniform_s(17, Seed0),
+    {N,Seed1} = rand:uniform_s(17, Seed0),
     {L,Seed} = random_list(N, 4711, Seed1, []),
     args(Ts, Qs, Seed, [L|R]);
 args([t|Ts], Qs, Seed0, R) ->
-    {T,Seed} = random:uniform_s(4711, Seed0),
+    {T,Seed} = rand:uniform_s(4711, Seed0),
     args(Ts, Qs, Seed, [T|R]);
 args([n|Ts], Qs, Seed0, R) ->
-    {N,Seed} = random:uniform_s(17, Seed0),
+    {N,Seed} = rand:uniform_s(17, Seed0),
     args(Ts, Qs, Seed, [N|R]).
 
 random_list(0, _, Seed, R) ->
     {R,Seed};
 random_list(N, M, Seed0, R) ->
-    {X,Seed} = random:uniform_s(M, Seed0),
+    {X,Seed} = rand:uniform_s(M, Seed0),
     random_list(N-1, M, Seed, [X|R]).
 
 call(Func, As) ->
diff --git a/lib/stdlib/test/rand_SUITE.erl b/lib/stdlib/test/rand_SUITE.erl
index 03b5ce1a25..6830101e96 100644
--- a/lib/stdlib/test/rand_SUITE.erl
+++ b/lib/stdlib/test/rand_SUITE.erl
@@ -33,21 +33,19 @@
 
 -export([test/0, gen/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(3)).
 -define(LOOP, 1000000).
 
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,3}}].
 
 all() ->
     [seed, interval_int, interval_float,
@@ -85,16 +83,13 @@ algs() ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-seed(doc) ->
-    ["Test that seed and seed_s and export_seed/0 is working."];
-seed(suite) ->
-    [];
+%% Test that seed and seed_s and export_seed/0 is working.
 seed(Config) when is_list(Config) ->
     Algs = algs(),
     Test = fun(Alg) ->
 		   try seed_1(Alg)
 		   catch _:Reason ->
-			   test_server:fail({Alg, Reason, erlang:get_stacktrace()})
+			   ct:fail({Alg, Reason, erlang:get_stacktrace()})
 		   end
 	   end,
     [Test(Alg) || Alg <- Algs],
@@ -139,10 +134,7 @@ seed_1(Alg) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-api_eq(doc) ->
-    ["Check that both api's are consistent with each other."];
-api_eq(suite) ->
-    [];
+%% Check that both APIs are consistent with each other.
 api_eq(_Config) ->
     Algs = algs(),
     Small = fun(Alg) ->
@@ -188,10 +180,7 @@ api_eq_1(S00) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-interval_int(doc) ->
-    ["Check that uniform/1 returns values within the proper interval."];
-interval_int(suite) ->
-    [];
+%% Check that uniform/1 returns values within the proper interval.
 interval_int(Config) when is_list(Config) ->
     Algs = algs(),
     Small = fun(Alg) ->
@@ -225,10 +214,7 @@ interval_int_1(N, Top, Max) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-interval_float(doc) ->
-    ["Check that uniform/0 returns values within the proper interval."];
-interval_float(suite) ->
-    [];
+%% Check that uniform/0 returns values within the proper interval.
 interval_float(Config) when is_list(Config) ->
     Algs = algs(),
     Test = fun(Alg) ->
@@ -252,8 +238,7 @@ interval_float_1(N) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-reference(doc) -> ["Check if exs64 algorithm generates the proper sequence."];
-reference(suite) -> [];
+%% Check if exs64 algorithm generates the proper sequence.
 reference(Config) when is_list(Config) ->
     [reference_1(Alg) || Alg <- algs()],
     ok.
@@ -267,7 +252,6 @@ reference_1(Alg) ->
 	    io:format("Failed: ~p~n",[Alg]),
 	    io:format("Length ~p ~p~n",[length(Refval), length(Testval)]),
 	    io:format("Head ~p ~p~n",[hd(Refval), hd(Testval)]),
-	    %% test_server:fail({Alg, Refval -- Testval}),
 	    ok
     end.
 
@@ -330,9 +314,9 @@ basic_uniform_1(0, {#{type:=Alg}, _}, Sum, A) ->
 
     %% Verify that the basic statistics are ok
     %% be gentle we don't want to see to many failing tests
-    abs(0.5 - AverN) < 0.005 orelse test_server:fail({average, Alg, AverN}),
-    abs(?LOOP div 100 - Min) < 1000 orelse test_server:fail({min, Alg, Min}),
-    abs(?LOOP div 100 - Max) < 1000 orelse test_server:fail({max, Alg, Max}),
+    abs(0.5 - AverN) < 0.005 orelse ct:fail({average, Alg, AverN}),
+    abs(?LOOP div 100 - Min) < 1000 orelse ct:fail({min, Alg, Min}),
+    abs(?LOOP div 100 - Max) < 1000 orelse ct:fail({max, Alg, Max}),
     ok.
 
 basic_uniform_2(N, S0, Sum, A0) when N > 0 ->
@@ -349,9 +333,9 @@ basic_uniform_2(0, {#{type:=Alg}, _}, Sum, A) ->
 
     %% Verify that the basic statistics are ok
     %% be gentle we don't want to see to many failing tests
-    abs(50.5 - AverN) < 0.5 orelse test_server:fail({average, Alg, AverN}),
-    abs(?LOOP div 100 - Min) < 1000 orelse test_server:fail({min, Alg, Min}),
-    abs(?LOOP div 100 - Max) < 1000 orelse test_server:fail({max, Alg, Max}),
+    abs(50.5 - AverN) < 0.5 orelse ct:fail({average, Alg, AverN}),
+    abs(?LOOP div 100 - Min) < 1000 orelse ct:fail({min, Alg, Min}),
+    abs(?LOOP div 100 - Max) < 1000 orelse ct:fail({max, Alg, Max}),
     ok.
 
 basic_normal_1(N, S0, Sum, Sq) when N > 0 ->
@@ -363,14 +347,13 @@ basic_normal_1(0, {#{type:=Alg}, _}, Sum, SumSq) ->
     io:format("~.10w: Average: ~7.4f StdDev ~6.4f~n", [Alg, Mean, StdDev]),
     %% Verify that the basic statistics are ok
     %% be gentle we don't want to see to many failing tests
-    abs(Mean) < 0.005 orelse test_server:fail({average, Alg, Mean}),
-    abs(StdDev - 1.0) < 0.005 orelse test_server:fail({stddev, Alg, StdDev}),
+    abs(Mean) < 0.005 orelse ct:fail({average, Alg, Mean}),
+    abs(StdDev - 1.0) < 0.005 orelse ct:fail({stddev, Alg, StdDev}),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-plugin(doc) ->   ["Test that the user can write algorithms"];
-plugin(suite) -> [];
+%% Test that the user can write algorithms.
 plugin(Config) when is_list(Config) ->
     _ = lists:foldl(fun(_, S0) ->
 			    {V1, S1} = rand:uniform_s(10000, S0),
diff --git a/lib/stdlib/test/random_SUITE.erl b/lib/stdlib/test/random_SUITE.erl
index 738f73ae15..34b350e132 100644
--- a/lib/stdlib/test/random_SUITE.erl
+++ b/lib/stdlib/test/random_SUITE.erl
@@ -19,26 +19,23 @@
 
 -module(random_SUITE).
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2,
 	 init_per_group/2,end_per_group/2]).
 
 -export([interval_1/1, seed0/1, seed/1]).
 
--export([init_per_testcase/2, end_per_testcase/2]).
 
--include_lib("test_server/include/test_server.hrl").
-
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
+-include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog} | Config].
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [interval_1, seed0, seed].
@@ -59,59 +56,50 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-seed0(doc) ->
-    ["Test that seed is set implicitly, and always the same."];
-seed0(suite) ->
-    [];
+%% Test that seed is set implicitly, and always the same.
 seed0(Config) when is_list(Config) ->
-    ?line Self = self(),
-    ?line _ = spawn(fun() -> Self ! random:uniform() end),
-    ?line F1 = receive
-		   Fa -> Fa
-	  end,
-    ?line _ = spawn(fun() -> random:seed(),
-			     Self ! random:uniform() end),
-    ?line F2 = receive
-		   Fb -> Fb
-	       end,
-    ?line F1 = F2,
+    Self = self(),
+    _ = spawn(fun() -> Self ! random:uniform() end),
+    F1 = receive
+	     Fa -> Fa
+	 end,
+    _ = spawn(fun() -> random:seed(),
+		       Self ! random:uniform() end),
+    F2 = receive
+	     Fb -> Fb
+	 end,
+    F1 = F2,
     ok.
 
-seed(doc) ->
-    ["Test that seed/1 and seed/3 is equivalent."];
-seed(suite) ->
-    [];
+%% Test that seed/1 and seed/3 are equivalent.
 seed(Config) when is_list(Config) ->
-    ?line Self = self(),
+    Self = self(),
     Seed = {S1, S2, S3} = erlang:timestamp(),
-    ?line _ = spawn(fun() ->
-    	random:seed(S1,S2,S3),
-    	Rands = lists:foldl(fun
-	    (_, Out) -> [random:uniform(10000)|Out]
-	end, [], lists:seq(1,100)),
-    	Self ! {seed_test, Rands}
-    end),
-    ?line Rands1 = receive {seed_test, R1s} -> R1s end,
-    ?line _ = spawn(fun() ->
-    	random:seed(Seed),
-    	Rands = lists:foldl(fun
-	    (_, Out) -> [random:uniform(10000)|Out]
-	end, [], lists:seq(1,100)),
-    	Self ! {seed_test, Rands}
-    end),
-    ?line Rands2 = receive {seed_test, R2s} -> R2s end,
-    ?line Rands1 = Rands2,
+    _ = spawn(fun() ->
+		      random:seed(S1,S2,S3),
+		      Rands = lists:foldl(fun
+					      (_, Out) -> [random:uniform(10000)|Out]
+					 end, [], lists:seq(1,100)),
+		      Self ! {seed_test, Rands}
+	      end),
+    Rands1 = receive {seed_test, R1s} -> R1s end,
+    _ = spawn(fun() ->
+		      random:seed(Seed),
+		      Rands = lists:foldl(fun
+					      (_, Out) -> [random:uniform(10000)|Out]
+					 end, [], lists:seq(1,100)),
+		      Self ! {seed_test, Rands}
+	      end),
+    Rands2 = receive {seed_test, R2s} -> R2s end,
+    Rands1 = Rands2,
     ok.
 
 
-interval_1(doc) ->
-    ["Check that uniform/1 returns values within the proper interval."];
-interval_1(suite) ->
-    [];
+%% Check that uniform/1 returns values within the proper interval.
 interval_1(Config) when is_list(Config) ->
-    ?line Top = 7,
-    ?line N = 10,
-    ?line check_interval(N, Top),
+    Top = 7,
+    N = 10,
+    check_interval(N, Top),
     ok.
 
 check_interval(0, _) -> ok;
@@ -119,9 +107,9 @@ check_interval(N, Top) ->
     X = random:uniform(Top),
     if
 	X < 1 ->
-	    test_server:fail(too_small);
+	    ct:fail(too_small);
 	X > Top ->
-	    test_server:fail(too_large);
+	    ct:fail(too_large);
 	true ->
 	    ok
     end,
diff --git a/lib/stdlib/test/random_iolist.erl b/lib/stdlib/test/random_iolist.erl
index 9a0f034e72..6da7da04de 100644
--- a/lib/stdlib/test/random_iolist.erl
+++ b/lib/stdlib/test/random_iolist.erl
@@ -36,7 +36,7 @@ run2(Iter,Fun1,Fun2) ->
     compare2(Iter,Fun1,Fun2).
 
 random_byte() ->
-     random:uniform(256) - 1.
+     rand:uniform(256) - 1.
 
 random_list(0,Acc) ->
     Acc;
@@ -45,7 +45,7 @@ random_list(N,Acc) ->
 
 random_binary(N) ->
     B = list_to_binary(random_list(N,[])),
-    case {random:uniform(2),size(B)} of
+    case {rand:uniform(2),size(B)} of
 	{2,M} when M > 1 ->
 	    S = M-1,
 	    <<_:3,C:S/binary,_:5>> = B,
@@ -57,7 +57,7 @@ random_list(N) ->
     random_list(N,[]).
 
 front() ->
-    case random:uniform(10) of
+    case rand:uniform(10) of
 	10 ->
 	    false;
 	_ ->
@@ -65,7 +65,7 @@ front() ->
     end.
 
 any_type() ->
-    case random:uniform(10) of
+    case rand:uniform(10) of
 	1 ->
 	    list;
 	2 ->
@@ -77,7 +77,7 @@ any_type() ->
     end.
 
 tail_type() ->
-    case random:uniform(5) of
+    case rand:uniform(5) of
 	1 ->
 	    list;
 	2 ->
@@ -90,9 +90,9 @@ random_length(N) ->
     UpperLimit = 255,
     case N of
 	M when M > UpperLimit ->
-	    random:uniform(UpperLimit+1) - 1;
+	    rand:uniform(UpperLimit+1) - 1;
 	_ ->
-	    random:uniform(N+1) - 1
+	    rand:uniform(N+1) - 1
     end.
 
 random_iolist(0,Acc) ->
@@ -139,7 +139,7 @@ random_iolist(N) ->
     
 
 standard_seed() ->
-    random:seed(1201,855653,380975).
+    rand:seed(exsplus, {1201,855653,380975}).
 
 do_comp(List,F1,F2) ->
     X = F1(List),
diff --git a/lib/stdlib/test/random_unicode_list.erl b/lib/stdlib/test/random_unicode_list.erl
index ecafe42318..3bc86a8430 100644
--- a/lib/stdlib/test/random_unicode_list.erl
+++ b/lib/stdlib/test/random_unicode_list.erl
@@ -85,7 +85,7 @@ int_to_utf32_little(I) ->
 id(I) -> I.
 
 random_char() ->
-     case random:uniform(16#10FFFF+1) - 1 of
+     case rand:uniform(16#10FFFF+1) - 1 of
 	 X when X >= 16#D800,
 	  X =< 16#DFFF ->
 	     random_char();
@@ -116,13 +116,13 @@ random_binary(N,Enc) ->
 					   int_to(Enc,X)
 				   end,
 				   L)),
-    case {random:uniform(3),size(B)} of
+    case {rand:uniform(3),size(B)} of
 	{2,M} when M > 1 ->
 	    B2 = id(<<1:3,B/binary,1:5>>),
 	    <<_:3,C:M/binary,_:5>> = B2,
 	    C;
 	{3,M} when M > 1 ->
-	    X = random:uniform(M+1)-1,
+	    X = rand:uniform(M+1)-1,
 	    <<B1:X/binary,B2/binary>> = B,
 	    [B1,B2];
 	_ ->
@@ -132,7 +132,7 @@ random_list(N) ->
     random_list(N,[]).
 
 front() ->
-    case random:uniform(10) of
+    case rand:uniform(10) of
 	10 ->
 	    false;
 	_ ->
@@ -140,7 +140,7 @@ front() ->
     end.
 
 any_type() ->
-    case random:uniform(10) of
+    case rand:uniform(10) of
 	1 ->
 	    list;
 	2 ->
@@ -152,7 +152,7 @@ any_type() ->
     end.
 
 tail_type() ->
-    case random:uniform(5) of
+    case rand:uniform(5) of
 	1 ->
 	    list;
 	2 ->
@@ -165,9 +165,9 @@ random_length(N) ->
     UpperLimit = 255,
     case N of
 	M when M > UpperLimit ->
-	    random:uniform(UpperLimit+1) - 1;
+	    rand:uniform(UpperLimit+1) - 1;
 	_ ->
-	    random:uniform(N+1) - 1
+	    rand:uniform(N+1) - 1
     end.
 
 random_unicode_list(0,Acc,_Enc) ->
@@ -214,7 +214,7 @@ random_unicode_list(N,Enc) ->
     
 
 standard_seed() ->
-    random:seed(1201,855653,380975).
+    rand:seed(exsplus, {1201,855653,380975}).
 
 do_comp(List,F1,F2) ->
     X = F1(List),
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl
index d78d6153da..a937e7b1cf 100644
--- a/lib/stdlib/test/re_SUITE.erl
+++ b/lib/stdlib/test/re_SUITE.erl
@@ -30,10 +30,12 @@
 	 opt_no_start_optimize/1,opt_never_utf/1,opt_ucp/1,
 	 match_limit/1,sub_binaries/1,copt/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,3}}].
 
 all() -> 
     [pcre, compile_options, run_options, combined_options,
@@ -61,264 +63,247 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-pcre(doc) ->
-    ["Run all applicable tests from the PCRE testsuites."];
+%% Run all applicable tests from the PCRE testsuites.
 pcre(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(3)),
-    RootDir = ?config(data_dir, Config),
+    RootDir = proplists:get_value(data_dir, Config),
     Res = run_pcre_tests:test(RootDir),
     0 = lists:sum([ X || {X,_,_} <- Res ]),
-    ?t:timetrap_cancel(Dog),
     {comment,Res}.
 
-compile_options(doc) ->
-    ["Test all documented compile options"];
+%% Test all documented compile options.
 compile_options(Config) when is_list(Config) ->
-    ?line ok = ctest("ABDabcdABCD","abcd",[],true,{match,[{3,4}]}),
-    ?line ok = ctest("ABDabcdABCD","abcd",[anchored],true,nomatch),
-    ?line ok = ctest("ABDabcdABCD",".*abcd",[anchored],true,{match,[{0,7}]}),
-    ?line ok = ctest("ABCabcdABC","ABCD",[],true,nomatch),
-    ?line ok = ctest("ABCabcdABC","ABCD",[caseless],true,{match,[{3,4}]}),
-    ?line ok = ctest("abcdABC\n","ABC$",[],true,{match,[{4,3}]}),
-    ?line ok = ctest("abcdABC\n","ABC$",[dollar_endonly],true,nomatch),
-    ?line ok = ctest("abcdABC\n","ABC.",[],true,nomatch),
-    ?line ok = ctest("abcdABC\n","ABC.",[dotall],true,{match,[{4,4}]}),
-    ?line ok = ctest("abcdABCD","ABC .",[],true,nomatch),
-    ?line ok = ctest("abcdABCD","ABC .",[extended],true,{match,[{4,4}]}),
-    ?line ok = ctest("abcd\nABCD","ABC",[],true,{match,[{5,3}]}),
-    ?line ok = ctest("abcd\nABCD","ABC",[firstline],true,nomatch),
-    ?line ok = ctest("abcd\nABCD","^ABC",[],true,nomatch),
-    ?line ok = ctest("abcd\nABCD","^ABC",[multiline],true,{match,[{5,3}]}),
-    ?line ok = ctest("abcdABCD","(ABC)",[],true,{match,[{4,3},{4,3}]}),
-    ?line ok = ctest("abcdABCD","(ABC)",[no_auto_capture],true,{match,[{4,3}]}),
-    ?line ok = ctest(notused,"(?<FOO>ABC)|(?<FOO>DEF)",[],false,notused),
-    ?line ok = ctest("abcdABCD","(?<FOO>ABC)|(?<FOO>DEF)",[dupnames],true,{match,[{4,3},{4,3}]}),
-    ?line ok = ctest("abcdABCDabcABCD","abcd.*D",[],true,{match,[{0,15}]}),
-    ?line ok = ctest("abcdABCDabcABCD","abcd.*D",[ungreedy],true,{match,[{0,8}]}),
-    ?line ok = ctest("abcdABCabcABC\nD","abcd.*D",[],true,nomatch),
-    ?line ok = ctest("abcdABCabcABC\nD","abcd.*D",[{newline,cr}],true,{match,[{0,15}]}),
-    ?line ok = ctest("abcdABCabcABC\rD","abcd.*D",[],true,{match,[{0,15}]}),
-    ?line ok = ctest("abcdABCabcABC\rD","abcd.*D",[{newline,lf}],true,{match,[{0,15}]}),
-    ?line ok = ctest("abcdABCabcd\r\n","abcd$",[{newline,lf}],true,nomatch),
-    ?line ok = ctest("abcdABCabcd\r\n","abcd$",[{newline,cr}],true,nomatch),
-    ?line ok = ctest("abcdABCabcd\r\n","abcd$",[{newline,crlf}],true,{match,[{7,4}]}),
-    
-     ?line ok = ctest("abcdABCabcd\r","abcd$",[{newline,crlf}],true,nomatch),
-     ?line ok = ctest("abcdABCabcd\n","abcd$",[{newline,crlf}],true,nomatch),
-    ?line ok = ctest("abcdABCabcd\r\n","abcd$",[{newline,anycrlf}],true,{match,[{7,4}]}),
-    
-     ?line ok = ctest("abcdABCabcd\r","abcd$",[{newline,anycrlf}],true,{match,[{7,4}]}),
-     ?line ok = ctest("abcdABCabcd\n","abcd$",[{newline,anycrlf}],true,{match,[{7,4}]}),
+    ok = ctest("ABDabcdABCD","abcd",[],true,{match,[{3,4}]}),
+    ok = ctest("ABDabcdABCD","abcd",[anchored],true,nomatch),
+    ok = ctest("ABDabcdABCD",".*abcd",[anchored],true,{match,[{0,7}]}),
+    ok = ctest("ABCabcdABC","ABCD",[],true,nomatch),
+    ok = ctest("ABCabcdABC","ABCD",[caseless],true,{match,[{3,4}]}),
+    ok = ctest("abcdABC\n","ABC$",[],true,{match,[{4,3}]}),
+    ok = ctest("abcdABC\n","ABC$",[dollar_endonly],true,nomatch),
+    ok = ctest("abcdABC\n","ABC.",[],true,nomatch),
+    ok = ctest("abcdABC\n","ABC.",[dotall],true,{match,[{4,4}]}),
+    ok = ctest("abcdABCD","ABC .",[],true,nomatch),
+    ok = ctest("abcdABCD","ABC .",[extended],true,{match,[{4,4}]}),
+    ok = ctest("abcd\nABCD","ABC",[],true,{match,[{5,3}]}),
+    ok = ctest("abcd\nABCD","ABC",[firstline],true,nomatch),
+    ok = ctest("abcd\nABCD","^ABC",[],true,nomatch),
+    ok = ctest("abcd\nABCD","^ABC",[multiline],true,{match,[{5,3}]}),
+    ok = ctest("abcdABCD","(ABC)",[],true,{match,[{4,3},{4,3}]}),
+    ok = ctest("abcdABCD","(ABC)",[no_auto_capture],true,{match,[{4,3}]}),
+    ok = ctest(notused,"(?<FOO>ABC)|(?<FOO>DEF)",[],false,notused),
+    ok = ctest("abcdABCD","(?<FOO>ABC)|(?<FOO>DEF)",[dupnames],true,{match,[{4,3},{4,3}]}),
+    ok = ctest("abcdABCDabcABCD","abcd.*D",[],true,{match,[{0,15}]}),
+    ok = ctest("abcdABCDabcABCD","abcd.*D",[ungreedy],true,{match,[{0,8}]}),
+    ok = ctest("abcdABCabcABC\nD","abcd.*D",[],true,nomatch),
+    ok = ctest("abcdABCabcABC\nD","abcd.*D",[{newline,cr}],true,{match,[{0,15}]}),
+    ok = ctest("abcdABCabcABC\rD","abcd.*D",[],true,{match,[{0,15}]}),
+    ok = ctest("abcdABCabcABC\rD","abcd.*D",[{newline,lf}],true,{match,[{0,15}]}),
+    ok = ctest("abcdABCabcd\r\n","abcd$",[{newline,lf}],true,nomatch),
+    ok = ctest("abcdABCabcd\r\n","abcd$",[{newline,cr}],true,nomatch),
+    ok = ctest("abcdABCabcd\r\n","abcd$",[{newline,crlf}],true,{match,[{7,4}]}),
+
+    ok = ctest("abcdABCabcd\r","abcd$",[{newline,crlf}],true,nomatch),
+    ok = ctest("abcdABCabcd\n","abcd$",[{newline,crlf}],true,nomatch),
+    ok = ctest("abcdABCabcd\r\n","abcd$",[{newline,anycrlf}],true,{match,[{7,4}]}),
+
+    ok = ctest("abcdABCabcd\r","abcd$",[{newline,anycrlf}],true,{match,[{7,4}]}),
+    ok = ctest("abcdABCabcd\n","abcd$",[{newline,anycrlf}],true,{match,[{7,4}]}),
     ok.
 
-run_options(doc) ->
-    ["Test all documented run specific options"];
+%% Test all documented run specific options.
 run_options(Config) when is_list(Config) ->
-    ?line rtest("ABCabcdABC","abc",[],[],true),
-    ?line rtest("ABCabcdABC","abc",[anchored],[],false),
-    % Anchored in run overrides unanchored in compilation
-    ?line rtest("ABCabcdABC","abc",[],[anchored],false), 
-    
-    ?line rtest("","a?b?",[],[],true),
-    ?line rtest("","a?b?",[],[notempty],false),
-
-    ?line rtest("abc","^a",[],[],true),
-    ?line rtest("abc","^a",[],[notbol],false),
-    ?line rtest("ab\nc","^a",[multiline],[],true),
-    ?line rtest("ab\nc","^a",[multiline],[notbol],false),
-    ?line rtest("ab\nc","^c",[multiline],[notbol],true),
-
-    ?line rtest("abc","c$",[],[],true),
-    ?line rtest("abc","c$",[],[noteol],false),
-
-    ?line rtest("ab\nc","b$",[multiline],[],true),
-    ?line rtest("ab\nc","c$",[multiline],[],true),
-    ?line rtest("ab\nc","b$",[multiline],[noteol],true),
-    ?line rtest("ab\nc","c$",[multiline],[noteol],false),
-
-    ?line rtest("abc","ab",[],[{offset,0}],true),
-    ?line rtest("abc","ab",[],[{offset,1}],false),
-    
-    ?line rtest("abcdABCabcABC\nD","abcd.*D",[],[],false),
-    ?line rtest("abcdABCabcABC\nD","abcd.*D",[],[{newline,cr}],true),
-    ?line rtest("abcdABCabcABC\rD","abcd.*D",[],[],true),
-    ?line rtest("abcdABCabcABC\rD","abcd.*D",[{newline,cr}],[{newline,lf}],true),
-    ?line rtest("abcdABCabcd\r\n","abcd$",[],[{newline,lf}],false),
-    ?line rtest("abcdABCabcd\r\n","abcd$",[],[{newline,cr}],false),
-    ?line rtest("abcdABCabcd\r\n","abcd$",[],[{newline,crlf}],true),
-    
-    ?line rtest("abcdABCabcd\r","abcd$",[],[{newline,crlf}],false),
-    ?line rtest("abcdABCabcd\n","abcd$",[],[{newline,crlf}],false),
-    ?line rtest("abcdABCabcd\r\n","abcd$",[],[{newline,anycrlf}],true),
-    
-    ?line rtest("abcdABCabcd\r","abcd$",[],[{newline,anycrlf}],true),
-    ?line rtest("abcdABCabcd\n","abcd$",[],[{newline,anycrlf}],true),
-    
-    ?line {ok,MP} = re:compile(".*(abcd).*"),
-    ?line {match,[{0,10},{3,4}]} = re:run("ABCabcdABC",MP,[]),
-    ?line {match,[{0,10},{3,4}]} = re:run("ABCabcdABC",MP,[{capture,all}]),
-    ?line {match,[{0,10},{3,4}]} = re:run("ABCabcdABC",MP,[{capture,all,index}]),
-    ?line {match,["ABCabcdABC","abcd"]} = re:run("ABCabcdABC",MP,[{capture,all,list}]),
-    ?line {match,[<<"ABCabcdABC">>,<<"abcd">>]} = re:run("ABCabcdABC",MP,[{capture,all,binary}]),
-    ?line {match,[{0,10}]} = re:run("ABCabcdABC",MP,[{capture,first}]),
-    ?line {match,[{0,10}]} = re:run("ABCabcdABC",MP,[{capture,first,index}]),       ?line {match,["ABCabcdABC"]} = re:run("ABCabcdABC",MP,[{capture,first,list}]),       
-    ?line {match,[<<"ABCabcdABC">>]} = re:run("ABCabcdABC",MP,[{capture,first,binary}]),    
-    
-    ?line {match,[{3,4}]} = re:run("ABCabcdABC",MP,[{capture,all_but_first}]),
-    ?line {match,[{3,4}]} = re:run("ABCabcdABC",MP,[{capture,all_but_first,index}]),
-    ?line {match,["abcd"]} = re:run("ABCabcdABC",MP,[{capture,all_but_first,list}]),
-    ?line {match,[<<"abcd">>]} = re:run("ABCabcdABC",MP,[{capture,all_but_first,binary}]),
-    
-    ?line match = re:run("ABCabcdABC",MP,[{capture,none}]),
-    ?line match = re:run("ABCabcdABC",MP,[{capture,none,index}]),
-    ?line match = re:run("ABCabcdABC",MP,[{capture,none,list}]),
-    ?line match = re:run("ABCabcdABC",MP,[{capture,none,binary}]),
-
-    ?line {ok,MP2} = re:compile(".*(?<FOO>abcd).*"),
-    ?line {match,[{3,4}]} = re:run("ABCabcdABC",MP2,[{capture,[1]}]),
-    ?line {match,[{3,4}]} = re:run("ABCabcdABC",MP2,[{capture,['FOO']}]),
-    ?line {match,[{3,4}]} = re:run("ABCabcdABC",MP2,[{capture,["FOO"]}]),
-    ?line {match,["abcd"]} = re:run("ABCabcdABC",MP2,[{capture,["FOO"],list}]),
-    ?line {match,[<<"abcd">>]} = re:run("ABCabcdABC",MP2,[{capture,["FOO"],binary}]),
-    
-    ?line {match,[{-1,0}]} = re:run("ABCabcdABC",MP2,[{capture,[200]}]),
-    ?line {match,[{-1,0}]} = re:run("ABCabcdABC",MP2,[{capture,['BAR']}]),
-    ?line {match,[""]} = re:run("ABCabcdABC",MP2,[{capture,[200],list}]),
-    ?line {match,[""]} = re:run("ABCabcdABC",MP2,[{capture,['BAR'],list}]),
-    ?line {match,[<<>>]} = re:run("ABCabcdABC",MP2,[{capture,[200],binary}]),
-    ?line {match,[<<>>]} = re:run("ABCabcdABC",MP2,[{capture,['BAR'],binary}]),
-
-    ?line {ok, MP3} = re:compile(".*((?<FOO>abdd)|a(..d)).*"),
-    ?line {match,[{0,10},{3,4},{-1,0},{4,3}]} = re:run("ABCabcdABC",MP3,[]),
-    ?line {match,[{0,10},{3,4},{-1,0},{4,3}]} = re:run("ABCabcdABC",MP3,[{capture,all,index}]),
-    ?line {match,[<<"ABCabcdABC">>,<<"abcd">>,<<>>,<<"bcd">>]} = re:run("ABCabcdABC",MP3,[{capture,all,binary}]),
-    ?line {match,["ABCabcdABC","abcd",[],"bcd"]} = re:run("ABCabcdABC",MP3,[{capture,all,list}]),
+    rtest("ABCabcdABC","abc",[],[],true),
+    rtest("ABCabcdABC","abc",[anchored],[],false),
+    %% Anchored in run overrides unanchored in compilation
+    rtest("ABCabcdABC","abc",[],[anchored],false),
+
+    rtest("","a?b?",[],[],true),
+    rtest("","a?b?",[],[notempty],false),
+
+    rtest("abc","^a",[],[],true),
+    rtest("abc","^a",[],[notbol],false),
+    rtest("ab\nc","^a",[multiline],[],true),
+    rtest("ab\nc","^a",[multiline],[notbol],false),
+    rtest("ab\nc","^c",[multiline],[notbol],true),
+
+    rtest("abc","c$",[],[],true),
+    rtest("abc","c$",[],[noteol],false),
+
+    rtest("ab\nc","b$",[multiline],[],true),
+    rtest("ab\nc","c$",[multiline],[],true),
+    rtest("ab\nc","b$",[multiline],[noteol],true),
+    rtest("ab\nc","c$",[multiline],[noteol],false),
+
+    rtest("abc","ab",[],[{offset,0}],true),
+    rtest("abc","ab",[],[{offset,1}],false),
+
+    rtest("abcdABCabcABC\nD","abcd.*D",[],[],false),
+    rtest("abcdABCabcABC\nD","abcd.*D",[],[{newline,cr}],true),
+    rtest("abcdABCabcABC\rD","abcd.*D",[],[],true),
+    rtest("abcdABCabcABC\rD","abcd.*D",[{newline,cr}],[{newline,lf}],true),
+    rtest("abcdABCabcd\r\n","abcd$",[],[{newline,lf}],false),
+    rtest("abcdABCabcd\r\n","abcd$",[],[{newline,cr}],false),
+    rtest("abcdABCabcd\r\n","abcd$",[],[{newline,crlf}],true),
+
+    rtest("abcdABCabcd\r","abcd$",[],[{newline,crlf}],false),
+    rtest("abcdABCabcd\n","abcd$",[],[{newline,crlf}],false),
+    rtest("abcdABCabcd\r\n","abcd$",[],[{newline,anycrlf}],true),
+
+    rtest("abcdABCabcd\r","abcd$",[],[{newline,anycrlf}],true),
+    rtest("abcdABCabcd\n","abcd$",[],[{newline,anycrlf}],true),
+
+    {ok,MP} = re:compile(".*(abcd).*"),
+    {match,[{0,10},{3,4}]} = re:run("ABCabcdABC",MP,[]),
+    {match,[{0,10},{3,4}]} = re:run("ABCabcdABC",MP,[{capture,all}]),
+    {match,[{0,10},{3,4}]} = re:run("ABCabcdABC",MP,[{capture,all,index}]),
+    {match,["ABCabcdABC","abcd"]} = re:run("ABCabcdABC",MP,[{capture,all,list}]),
+    {match,[<<"ABCabcdABC">>,<<"abcd">>]} = re:run("ABCabcdABC",MP,[{capture,all,binary}]),
+    {match,[{0,10}]} = re:run("ABCabcdABC",MP,[{capture,first}]),
+    {match,[{0,10}]} = re:run("ABCabcdABC",MP,[{capture,first,index}]),       ?line {match,["ABCabcdABC"]} = re:run("ABCabcdABC",MP,[{capture,first,list}]),
+    {match,[<<"ABCabcdABC">>]} = re:run("ABCabcdABC",MP,[{capture,first,binary}]),
+
+    {match,[{3,4}]} = re:run("ABCabcdABC",MP,[{capture,all_but_first}]),
+    {match,[{3,4}]} = re:run("ABCabcdABC",MP,[{capture,all_but_first,index}]),
+    {match,["abcd"]} = re:run("ABCabcdABC",MP,[{capture,all_but_first,list}]),
+    {match,[<<"abcd">>]} = re:run("ABCabcdABC",MP,[{capture,all_but_first,binary}]),
+
+    match = re:run("ABCabcdABC",MP,[{capture,none}]),
+    match = re:run("ABCabcdABC",MP,[{capture,none,index}]),
+    match = re:run("ABCabcdABC",MP,[{capture,none,list}]),
+    match = re:run("ABCabcdABC",MP,[{capture,none,binary}]),
+
+    {ok,MP2} = re:compile(".*(?<FOO>abcd).*"),
+    {match,[{3,4}]} = re:run("ABCabcdABC",MP2,[{capture,[1]}]),
+    {match,[{3,4}]} = re:run("ABCabcdABC",MP2,[{capture,['FOO']}]),
+    {match,[{3,4}]} = re:run("ABCabcdABC",MP2,[{capture,["FOO"]}]),
+    {match,["abcd"]} = re:run("ABCabcdABC",MP2,[{capture,["FOO"],list}]),
+    {match,[<<"abcd">>]} = re:run("ABCabcdABC",MP2,[{capture,["FOO"],binary}]),
+
+    {match,[{-1,0}]} = re:run("ABCabcdABC",MP2,[{capture,[200]}]),
+    {match,[{-1,0}]} = re:run("ABCabcdABC",MP2,[{capture,['BAR']}]),
+    {match,[""]} = re:run("ABCabcdABC",MP2,[{capture,[200],list}]),
+    {match,[""]} = re:run("ABCabcdABC",MP2,[{capture,['BAR'],list}]),
+    {match,[<<>>]} = re:run("ABCabcdABC",MP2,[{capture,[200],binary}]),
+    {match,[<<>>]} = re:run("ABCabcdABC",MP2,[{capture,['BAR'],binary}]),
+
+    {ok, MP3} = re:compile(".*((?<FOO>abdd)|a(..d)).*"),
+    {match,[{0,10},{3,4},{-1,0},{4,3}]} = re:run("ABCabcdABC",MP3,[]),
+    {match,[{0,10},{3,4},{-1,0},{4,3}]} = re:run("ABCabcdABC",MP3,[{capture,all,index}]),
+    {match,[<<"ABCabcdABC">>,<<"abcd">>,<<>>,<<"bcd">>]} = re:run("ABCabcdABC",MP3,[{capture,all,binary}]),
+    {match,["ABCabcdABC","abcd",[],"bcd"]} = re:run("ABCabcdABC",MP3,[{capture,all,list}]),
     ok.
-    
 
-    
-combined_options(doc) ->    
-    ["Test compile options given directly to run"];
+
+
+%% Test compile options given directly to run.
 combined_options(Config) when is_list(Config) ->
-    ?line ok = crtest("ABDabcdABCD","abcd",[],true,{match,[{3,4}]}),
-    ?line ok = crtest("ABDabcdABCD","abcd",[anchored],true,nomatch),
-    ?line ok = crtest("ABDabcdABCD",".*abcd",[anchored],true,{match,[{0,7}]}),
-    ?line ok = crtest("ABCabcdABC","ABCD",[],true,nomatch),
-    ?line ok = crtest("ABCabcdABC","ABCD",[caseless],true,{match,[{3,4}]}),
-    ?line ok = crtest("abcdABC\n","ABC$",[],true,{match,[{4,3}]}),
-    ?line ok = crtest("abcdABC\n","ABC$",[dollar_endonly],true,nomatch),
-    ?line ok = crtest("abcdABC\n","ABC.",[],true,nomatch),
-    ?line ok = crtest("abcdABC\n","ABC.",[dotall],true,{match,[{4,4}]}),
-    ?line ok = crtest("abcdABCD","ABC .",[],true,nomatch),
-    ?line ok = crtest("abcdABCD","ABC .",[extended],true,{match,[{4,4}]}),
-    ?line ok = crtest("abcd\nABCD","ABC",[],true,{match,[{5,3}]}),
-    ?line ok = crtest("abcd\nABCD","ABC",[firstline],true,nomatch),
-    ?line ok = crtest("abcd\nABCD","^ABC",[],true,nomatch),
-    ?line ok = crtest("abcd\nABCD","^ABC",[multiline],true,{match,[{5,3}]}),
-    ?line ok = crtest("abcdABCD","(ABC)",[],true,{match,[{4,3},{4,3}]}),
-    ?line ok = crtest("abcdABCD","(ABC)",[no_auto_capture],true,{match,[{4,3}]}),
-    ?line ok = crtest(notused,"(?<FOO>ABC)|(?<FOO>DEF)",[],false,notused),
-    ?line ok = crtest("abcdABCD","(?<FOO>ABC)|(?<FOO>DEF)",[dupnames],true,{match,[{4,3},{4,3}]}),
-    ?line ok = crtest("abcdABCDabcABCD","abcd.*D",[],true,{match,[{0,15}]}),
-    ?line ok = crtest("abcdABCDabcABCD","abcd.*D",[ungreedy],true,{match,[{0,8}]}),
-    ?line ok = ctest("abcdABCabcABC\nD","abcd.*D",[],true,nomatch),
-    ?line ok = crtest("abcdABCabcABC\nD","abcd.*D",[{newline,cr}],true,{match,[{0,15}]}),
-    ?line ok = crtest("abcdABCabcABC\rD","abcd.*D",[],true,{match,[{0,15}]}),
-    ?line ok = crtest("abcdABCabcABC\rD","abcd.*D",[{newline,lf}],true,{match,[{0,15}]}),
-    ?line ok = crtest("abcdABCabcd\r\n","abcd$",[{newline,lf}],true,nomatch),
-    ?line ok = crtest("abcdABCabcd\r\n","abcd$",[{newline,cr}],true,nomatch),
-    ?line ok = crtest("abcdABCabcd\r\n","abcd$",[{newline,crlf}],true,{match,[{7,4}]}),
-    
-    ?line ok = crtest("abcdABCabcd\r","abcd$",[{newline,crlf}],true,nomatch),
-    ?line ok = crtest("abcdABCabcd\n","abcd$",[{newline,crlf}],true,nomatch),
-    ?line ok = crtest("abcdABCabcd\r\n","abcd$",[{newline,anycrlf}],true,{match,[{7,4}]}),
-    
-    ?line ok = crtest("abcdABCabcd\r","abcd$",[{newline,anycrlf}],true,{match,[{7,4}]}),
-    ?line ok = crtest("abcdABCabcd\n","abcd$",[{newline,anycrlf}],true,{match,[{7,4}]}),
-
-    ?line ok = crtest("abcdABCabcd\r\n","abcd$",[{newline,anycrlf},{capture,all,list}],true,{match,["abcd"]}),
-    
-    ?line ok = crtest("abcdABCabcd\r","abcd$",[{newline,anycrlf},{capture,all,list}],true,{match,["abcd"]}),
-    
-    ?line ok = crtest("abcdABCabcd\n","abcd$",[{newline,anycrlf},{capture,all,list}],true,{match,["abcd"]}),
-    
-    ?line ok = crtest("abcdABCabcd\r\n","abcd$",[{newline,anycrlf},{capture,all,binary}],true,{match,[<<"abcd">>]}),
-    
-    ?line ok = crtest("abcdABCabcd\r","abcd$",[{newline,anycrlf},{capture,all,binary}],true,{match,[<<"abcd">>]}),
-    ?line ok = crtest("abcdABCabcd\n","abcd$",[{newline,anycrlf},{capture,all,binary}],true,{match,[<<"abcd">>]}),
-    
-    % Check that unique run-options fail in compile only case:
-    ?line {'EXIT',{badarg,_}} = (catch re:compile("abcd$",[{newline,anycrlf},{capture,all,binary}])),
-    ?line {'EXIT',{badarg,_}} = (catch re:compile("abcd$",[{newline,anycrlf},{offset,3}])),
-    ?line {'EXIT',{badarg,_}} = (catch re:compile("abcd$",[{newline,anycrlf},notempty])),
-    ?line {'EXIT',{badarg,_}} = (catch re:compile("abcd$",[{newline,anycrlf},notbol])),
-    ?line {'EXIT',{badarg,_}} = (catch re:compile("abcd$",[{newline,anycrlf},noteol])),
-
-
-    ?line {match,_} = re:run("abcdABCabcd\r\n","abcd$",[{newline,crlf}]),
-    ?line nomatch = re:run("abcdABCabcd\r\nefgh","abcd$",[{newline,crlf}]),
-    ?line {match,_} = re:run("abcdABCabcd\r\nefgh","abcd$",[{newline,crlf},multiline]),
-    ?line nomatch = re:run("abcdABCabcd\r\nefgh","efgh$",[{newline,crlf},multiline,noteol]),
-    ?line {match,_} = re:run("abcdABCabcd\r\nefgh","abcd$",[{newline,crlf},multiline,noteol]),
-    ?line {match,_} = re:run("abcdABCabcd\r\nefgh","^abcd",[{newline,crlf},multiline,noteol]),
-    ?line nomatch = re:run("abcdABCabcd\r\nefgh","^abcd",[{newline,crlf},multiline,notbol]),
-    ?line {match,_} = re:run("abcdABCabcd\r\nefgh","^efgh",[{newline,crlf},multiline,notbol]),
-    ?line {match,_} = re:run("ABC\nD","[a-z]*",[{newline,crlf}]),
-    ?line nomatch = re:run("ABC\nD","[a-z]*",[{newline,crlf},notempty]),
+    ok = crtest("ABDabcdABCD","abcd",[],true,{match,[{3,4}]}),
+    ok = crtest("ABDabcdABCD","abcd",[anchored],true,nomatch),
+    ok = crtest("ABDabcdABCD",".*abcd",[anchored],true,{match,[{0,7}]}),
+    ok = crtest("ABCabcdABC","ABCD",[],true,nomatch),
+    ok = crtest("ABCabcdABC","ABCD",[caseless],true,{match,[{3,4}]}),
+    ok = crtest("abcdABC\n","ABC$",[],true,{match,[{4,3}]}),
+    ok = crtest("abcdABC\n","ABC$",[dollar_endonly],true,nomatch),
+    ok = crtest("abcdABC\n","ABC.",[],true,nomatch),
+    ok = crtest("abcdABC\n","ABC.",[dotall],true,{match,[{4,4}]}),
+    ok = crtest("abcdABCD","ABC .",[],true,nomatch),
+    ok = crtest("abcdABCD","ABC .",[extended],true,{match,[{4,4}]}),
+    ok = crtest("abcd\nABCD","ABC",[],true,{match,[{5,3}]}),
+    ok = crtest("abcd\nABCD","ABC",[firstline],true,nomatch),
+    ok = crtest("abcd\nABCD","^ABC",[],true,nomatch),
+    ok = crtest("abcd\nABCD","^ABC",[multiline],true,{match,[{5,3}]}),
+    ok = crtest("abcdABCD","(ABC)",[],true,{match,[{4,3},{4,3}]}),
+    ok = crtest("abcdABCD","(ABC)",[no_auto_capture],true,{match,[{4,3}]}),
+    ok = crtest(notused,"(?<FOO>ABC)|(?<FOO>DEF)",[],false,notused),
+    ok = crtest("abcdABCD","(?<FOO>ABC)|(?<FOO>DEF)",[dupnames],true,{match,[{4,3},{4,3}]}),
+    ok = crtest("abcdABCDabcABCD","abcd.*D",[],true,{match,[{0,15}]}),
+    ok = crtest("abcdABCDabcABCD","abcd.*D",[ungreedy],true,{match,[{0,8}]}),
+    ok = ctest("abcdABCabcABC\nD","abcd.*D",[],true,nomatch),
+    ok = crtest("abcdABCabcABC\nD","abcd.*D",[{newline,cr}],true,{match,[{0,15}]}),
+    ok = crtest("abcdABCabcABC\rD","abcd.*D",[],true,{match,[{0,15}]}),
+    ok = crtest("abcdABCabcABC\rD","abcd.*D",[{newline,lf}],true,{match,[{0,15}]}),
+    ok = crtest("abcdABCabcd\r\n","abcd$",[{newline,lf}],true,nomatch),
+    ok = crtest("abcdABCabcd\r\n","abcd$",[{newline,cr}],true,nomatch),
+    ok = crtest("abcdABCabcd\r\n","abcd$",[{newline,crlf}],true,{match,[{7,4}]}),
+
+    ok = crtest("abcdABCabcd\r","abcd$",[{newline,crlf}],true,nomatch),
+    ok = crtest("abcdABCabcd\n","abcd$",[{newline,crlf}],true,nomatch),
+    ok = crtest("abcdABCabcd\r\n","abcd$",[{newline,anycrlf}],true,{match,[{7,4}]}),
+
+    ok = crtest("abcdABCabcd\r","abcd$",[{newline,anycrlf}],true,{match,[{7,4}]}),
+    ok = crtest("abcdABCabcd\n","abcd$",[{newline,anycrlf}],true,{match,[{7,4}]}),
+
+    ok = crtest("abcdABCabcd\r\n","abcd$",[{newline,anycrlf},{capture,all,list}],true,{match,["abcd"]}),
+
+    ok = crtest("abcdABCabcd\r","abcd$",[{newline,anycrlf},{capture,all,list}],true,{match,["abcd"]}),
+
+    ok = crtest("abcdABCabcd\n","abcd$",[{newline,anycrlf},{capture,all,list}],true,{match,["abcd"]}),
+
+    ok = crtest("abcdABCabcd\r\n","abcd$",[{newline,anycrlf},{capture,all,binary}],true,{match,[<<"abcd">>]}),
+
+    ok = crtest("abcdABCabcd\r","abcd$",[{newline,anycrlf},{capture,all,binary}],true,{match,[<<"abcd">>]}),
+    ok = crtest("abcdABCabcd\n","abcd$",[{newline,anycrlf},{capture,all,binary}],true,{match,[<<"abcd">>]}),
+
+    %% Check that unique run-options fail in compile only case:
+    {'EXIT',{badarg,_}} = (catch re:compile("abcd$",[{newline,anycrlf},{capture,all,binary}])),
+    {'EXIT',{badarg,_}} = (catch re:compile("abcd$",[{newline,anycrlf},{offset,3}])),
+    {'EXIT',{badarg,_}} = (catch re:compile("abcd$",[{newline,anycrlf},notempty])),
+    {'EXIT',{badarg,_}} = (catch re:compile("abcd$",[{newline,anycrlf},notbol])),
+    {'EXIT',{badarg,_}} = (catch re:compile("abcd$",[{newline,anycrlf},noteol])),
+
+
+    {match,_} = re:run("abcdABCabcd\r\n","abcd$",[{newline,crlf}]),
+    nomatch = re:run("abcdABCabcd\r\nefgh","abcd$",[{newline,crlf}]),
+    {match,_} = re:run("abcdABCabcd\r\nefgh","abcd$",[{newline,crlf},multiline]),
+    nomatch = re:run("abcdABCabcd\r\nefgh","efgh$",[{newline,crlf},multiline,noteol]),
+    {match,_} = re:run("abcdABCabcd\r\nefgh","abcd$",[{newline,crlf},multiline,noteol]),
+    {match,_} = re:run("abcdABCabcd\r\nefgh","^abcd",[{newline,crlf},multiline,noteol]),
+    nomatch = re:run("abcdABCabcd\r\nefgh","^abcd",[{newline,crlf},multiline,notbol]),
+    {match,_} = re:run("abcdABCabcd\r\nefgh","^efgh",[{newline,crlf},multiline,notbol]),
+    {match,_} = re:run("ABC\nD","[a-z]*",[{newline,crlf}]),
+    nomatch = re:run("ABC\nD","[a-z]*",[{newline,crlf},notempty]),
     ok.
 
-replace_autogen(doc) ->    
-    ["Test replace with autogenerated erlang module"];
+%% Test replace with autogenerated erlang module.
 replace_autogen(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(3)),
     re_testoutput1_replacement_test:run(),
-    ?t:timetrap_cancel(Dog),
     ok.
 
-global_capture(doc) ->    
-    ["Tests capture options together with global searching"];
+%% Test capture options together with global searching.
 global_capture(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(3)),
-    ?line {match,[{3,4}]} = re:run("ABCabcdABC",".*(?<FOO>abcd).*",[{capture,[1]}]),
-    ?line {match,[{10,4}]} = re:run("ABCabcdABCabcdA",".*(?<FOO>abcd).*",[{capture,[1]}]),
-    ?line {match,[[{10,4}]]} = re:run("ABCabcdABCabcdA",".*(?<FOO>abcd).*",[global,{capture,[1]}]),
-    ?line {match,[{3,4}]} = re:run("ABCabcdABC",".*(?<FOO>abcd).*",[{capture,['FOO']}]),
-    ?line {match,[{10,4}]} = re:run("ABCabcdABCabcdA",".*(?<FOO>abcd).*",[{capture,['FOO']}]),
-    ?line {match,[[{10,4}]]} = re:run("ABCabcdABCabcdA",".*(?<FOO>abcd).*",[global,{capture,['FOO']}]),
-    ?line {match,[[{3,4},{3,4}],[{10,4},{10,4}]]} = re:run("ABCabcdABCabcdA","(?<FOO>abcd)",[global]),
-    ?line {match,[[{3,4},{3,4}],[{10,4},{10,4}]]} = re:run("ABCabcdABCabcdA","(?<FOO>abcd)",[global,{capture,all}]),
-    ?line {match,[[{3,4},{3,4}],[{10,4},{10,4}]]} = re:run("ABCabcdABCabcdA","(?<FOO>abcd)",[global,{capture,all,index}]),
-    ?line {match,[[{3,4}],[{10,4}]]} = re:run("ABCabcdABCabcdA","(?<FOO>abcd)",[global,{capture,first}]),
-    ?line {match,[[{3,4}],[{10,4}]]} = re:run("ABCabcdABCabcdA","(?<FOO>abcd)",[global,{capture,all_but_first}]),
-    ?line {match,[[<<"bcd">>],[<<"bcd">>]]} = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,all_but_first,binary}]),
-    ?line {match,[["bcd"],["bcd"]]} = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,all_but_first,list}]),
-    ?line {match,[["abcd","bcd"],["abcd","bcd"]]} = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,all,list}]),
-    ?line {match,[[<<"abcd">>,<<"bcd">>],[<<"abcd">>,<<"bcd">>]]} = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,all,binary}]),
-    ?line {match,[[{3,4},{4,3}],[{10,4},{11,3}]]} = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,all,index}]),
-    ?line match = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,none,index}]),
-    ?line match = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,none,binary}]),
-    ?line match = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,none,list}]),
-    ?line {match,[[<<195,133,98,99,100>>,<<"bcd">>],[<<"abcd">>,<<"bcd">>]]} = re:run("ABCÅbcdABCabcdA",".(?<FOO>bcd)",[global,{capture,all,binary},unicode]),
-    ?line {match,[["Åbcd","bcd"],["abcd","bcd"]]} = re:run(<<"ABC",8#303,8#205,"bcdABCabcdA">>,".(?<FOO>bcd)",[global,{capture,all,list},unicode]),
-    ?line {match,[["Åbcd","bcd"],["abcd","bcd"]]} = re:run("ABCÅbcdABCabcdA",".(?<FOO>bcd)",[global,{capture,all,list},unicode]),
-    ?line {match,[[{3,5},{5,3}],[{11,4},{12,3}]]} = re:run("ABCÅbcdABCabcdA",".(?<FOO>bcd)",[global,{capture,all,index},unicode]),
-    ?t:timetrap_cancel(Dog),
+    {match,[{3,4}]} = re:run("ABCabcdABC",".*(?<FOO>abcd).*",[{capture,[1]}]),
+    {match,[{10,4}]} = re:run("ABCabcdABCabcdA",".*(?<FOO>abcd).*",[{capture,[1]}]),
+    {match,[[{10,4}]]} = re:run("ABCabcdABCabcdA",".*(?<FOO>abcd).*",[global,{capture,[1]}]),
+    {match,[{3,4}]} = re:run("ABCabcdABC",".*(?<FOO>abcd).*",[{capture,['FOO']}]),
+    {match,[{10,4}]} = re:run("ABCabcdABCabcdA",".*(?<FOO>abcd).*",[{capture,['FOO']}]),
+    {match,[[{10,4}]]} = re:run("ABCabcdABCabcdA",".*(?<FOO>abcd).*",[global,{capture,['FOO']}]),
+    {match,[[{3,4},{3,4}],[{10,4},{10,4}]]} = re:run("ABCabcdABCabcdA","(?<FOO>abcd)",[global]),
+    {match,[[{3,4},{3,4}],[{10,4},{10,4}]]} = re:run("ABCabcdABCabcdA","(?<FOO>abcd)",[global,{capture,all}]),
+    {match,[[{3,4},{3,4}],[{10,4},{10,4}]]} = re:run("ABCabcdABCabcdA","(?<FOO>abcd)",[global,{capture,all,index}]),
+    {match,[[{3,4}],[{10,4}]]} = re:run("ABCabcdABCabcdA","(?<FOO>abcd)",[global,{capture,first}]),
+    {match,[[{3,4}],[{10,4}]]} = re:run("ABCabcdABCabcdA","(?<FOO>abcd)",[global,{capture,all_but_first}]),
+    {match,[[<<"bcd">>],[<<"bcd">>]]} = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,all_but_first,binary}]),
+    {match,[["bcd"],["bcd"]]} = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,all_but_first,list}]),
+    {match,[["abcd","bcd"],["abcd","bcd"]]} = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,all,list}]),
+    {match,[[<<"abcd">>,<<"bcd">>],[<<"abcd">>,<<"bcd">>]]} = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,all,binary}]),
+    {match,[[{3,4},{4,3}],[{10,4},{11,3}]]} = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,all,index}]),
+    match = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,none,index}]),
+    match = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,none,binary}]),
+    match = re:run("ABCabcdABCabcdA","a(?<FOO>bcd)",[global,{capture,none,list}]),
+    {match,[[<<195,133,98,99,100>>,<<"bcd">>],[<<"abcd">>,<<"bcd">>]]} = re:run("ABCÅbcdABCabcdA",".(?<FOO>bcd)",[global,{capture,all,binary},unicode]),
+    {match,[["Åbcd","bcd"],["abcd","bcd"]]} = re:run(<<"ABC",8#303,8#205,"bcdABCabcdA">>,".(?<FOO>bcd)",[global,{capture,all,list},unicode]),
+    {match,[["Åbcd","bcd"],["abcd","bcd"]]} = re:run("ABCÅbcdABCabcdA",".(?<FOO>bcd)",[global,{capture,all,list},unicode]),
+    {match,[[{3,5},{5,3}],[{11,4},{12,3}]]} = re:run("ABCÅbcdABCabcdA",".(?<FOO>bcd)",[global,{capture,all,index},unicode]),
     ok.
 
-replace_input_types(doc) ->
-    ["Tests replace with different input types"];
+%% Test replace with different input types.
 replace_input_types(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(3)),
-    ?line <<"abcd">> = re:replace("abcd","Z","X",[{return,binary},unicode]),
-    ?line <<"abcd">> = re:replace("abcd","\x{400}","X",[{return,binary},unicode]),
-    ?line <<"a",208,128,"cd">> = re:replace(<<"abcd">>,"b","\x{400}",[{return,binary},unicode]),
-    ?t:timetrap_cancel(Dog),
+    <<"abcd">> = re:replace("abcd","Z","X",[{return,binary},unicode]),
+    <<"abcd">> = re:replace("abcd","\x{400}","X",[{return,binary},unicode]),
+    <<"a",208,128,"cd">> = re:replace(<<"abcd">>,"b","\x{400}",[{return,binary},unicode]),
     ok.
 
-replace_return(doc) ->    
-    ["Tests return options of replace together with global searching"];
+%% Test return options of replace together with global searching.
 replace_return(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(3)),
     {'EXIT',{badarg,_}} = (catch re:replace("na","(a","")),
     ok = replacetest(<<"nisse">>,"i","a",[{return,binary}],<<"nasse">>),
     ok = replacetest("ABC\305abcdABCabcdA","a(?<FOO>bcd)","X",[global,{return,binary}],<<"ABCÅXABCXA">>),
@@ -339,7 +324,6 @@ replace_return(Config) when is_list(Config) ->
     ok = replacetest("a\x{400}bcd","d","X",[global,{return,binary},unicode],<<"a",208,128,"bcX">>),
     ok = replacetest("a\x{400}bcd","Z","X",[global,{return,list},unicode],"a\x{400}bcd"),
     ok = replacetest("a\x{400}bcd","Z","X",[global,{return,binary},unicode],<<"a",208,128,"bcd">>),
-    ?t:timetrap_cancel(Dog),
     ok.
 
 rtest(Subj, RE, Copt, Ropt, true) ->
@@ -412,18 +396,13 @@ copt(ungreedy) -> true;
 copt(unicode) -> true;
 copt(_) -> false.
 
-split_autogen(doc) ->    
-    ["Test split with autogenerated erlang module"];
+%% Test split with autogenerated erlang module.
 split_autogen(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(3)),
     re_testoutput1_split_test:run(),
-    ?t:timetrap_cancel(Dog),
     ok.
 
-split_options(doc) ->
-    ["Test special options to split."];
+%% Test special options to split.
 split_options(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(1)),
     ok = splittest("a b c ","( )",[group,trim],[[<<"a">>,<<" ">>],[<<"b">>,<<" ">>],[<<"c">>,<<" ">>]]),
     ok = splittest("a b c ","( )",[group,{parts,0}],[[<<"a">>,<<" ">>],[<<"b">>,<<" ">>],[<<"c">>,<<" ">>]]),
     ok = splittest("a b c ","( )",[{parts,infinity},group],[[<<"a">>,<<" ">>],[<<"b">>,<<" ">>],[<<"c">>,<<" ">>],[<<>>]]),
@@ -439,27 +418,23 @@ split_options(Config) when is_list(Config) ->
     {'EXIT',{badarg,_}} = (catch re:split("a b c d","( +)",[{parts,banan}])),
     {'EXIT',{badarg,_}} = (catch re:split("a b c d","( +)",[{capture,all}])),
     {'EXIT',{badarg,_}} = (catch re:split("a b c d","( +)",[{capture,[],binary}])),
-    % Parts 0 is equal to no parts specification (implicit strip)
+    %% Parts 0 is equal to no parts specification (implicit strip)
     ok = splittest("a b c d","( *)",[{parts,0},{return,list}],["a"," ","b"," ","c"," ","d"]),
-    ?t:timetrap_cancel(Dog),
     ok.
-    
+
 join([]) -> [];
 join([A]) -> [A];
 join([H|T]) -> [H,<<":">>|join(T)].
 
-split_specials(doc) ->
-    ["Some special cases of split that are easy to get wrong."];
+%% Some special cases of split that are easy to get wrong.
 split_specials(Config) when is_list(Config) ->
     %% More or less just to remember these icky cases
-    Dog = ?t:timetrap(?t:minutes(1)),
-    ?line <<"::abd:f">> = 
+    <<"::abd:f">> =
 	iolist_to_binary(join(re:split("abdf","^(?!(ab)de|x)(abd)(f)",[trim]))),
-    ?line <<":abc2xyzabc3">> = 
+    <<":abc2xyzabc3">> =
 	iolist_to_binary(join(re:split("abc1abc2xyzabc3","\\Aabc.",[trim]))),
-    ?t:timetrap_cancel(Dog),
     ok.
-    
+
 
 %% Test that errors are handled correctly by the erlang code.
 error_handling(_Config) ->
@@ -470,26 +445,26 @@ error_handling(_Config) ->
 	false ->
 	    error_handling()
     end.
-	    
+
 error_handling() ->
-    % This test checks the exception tuples manufactured in the erlang
-    % code to hide the trapping from the user at least when it comes to errors
-    Dog = ?t:timetrap(?t:minutes(1)),
-    % The malformed precomiled RE is detected after 
-    % the trap to re:grun from grun, in the grun function clause
-    % that handles precompiled expressions
+    %% This test checks the exception tuples manufactured in the erlang
+    %% code to hide the trapping from the user at least when it comes to errors
+
+    %% The malformed precomiled RE is detected after
+    %% the trap to re:grun from grun, in the grun function clause
+    %% that handles precompiled expressions
     {'EXIT',{badarg,[{re,run,["apa",{1,2,3,4},[global]],_},
 		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:run("apa",{1,2,3,4},[global])),
-    % An invalid capture list will also cause a badarg late, 
-    % but with a non pre compiled RE, the exception should be thrown by the
-    % grun function clause that handles RE's compiled implicitly by
-    % the run/3 BIF before trapping.
+    %% An invalid capture list will also cause a badarg late,
+    %% but with a non pre compiled RE, the exception should be thrown by the
+    %% grun function clause that handles RE's compiled implicitly by
+    %% the run/3 BIF before trapping.
     {'EXIT',{badarg,[{re,run,["apa","p",[{capture,[1,{a}]},global]],_},
 		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:run("apa","p",[{capture,[1,{a}]},global])),
-    % And so the case of a precompiled expression together with
-    % a compile-option (binary and list subject):
+    %% And so the case of a precompiled expression together with
+    %% a compile-option (binary and list subject):
     {ok,RE} = re:compile("(p)"),
     {match,[[{1,1},{1,1}]]} = re:run(<<"apa">>,RE,[global]),
     {match,[[{1,1},{1,1}]]} = re:run("apa",RE,[global]),
@@ -509,7 +484,7 @@ error_handling() ->
     {error, {compile, {_,_}}} = re:run("apa","(p",[report_errors]),
     {'EXIT',{badarg,_}} = (catch re:run("apa","(p",[global])),
     {error, {compile, {_,_}}} = re:run("apa","(p",[report_errors,global]),
-    % Badly formed options
+    %% Badly formed options
     {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,["global"])),
     {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[{offset,-1}])),
     {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[{offset,ett}])),
@@ -536,7 +511,7 @@ error_handling() ->
     {'EXIT',{badarg,_}} = (catch re:run(<<"apa",2:2>>,<<"(p)">>,[{capture,[0,1],binary}])), 
     <<_:4,Temp:3/binary,_:4>> = <<38,23,6,18>>,
     {match,[{1,1},{1,1}]} = re:run(Temp,<<"(p)">>,[]), % Unaligned works 
-    % The replace errors:
+    %% The replace errors:
     {'EXIT',{badarg,[{re,replace,["apa",{1,2,3,4},"X",[]],_},
 		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:replace("apa",{1,2,3,4},"X",[])),
@@ -572,13 +547,13 @@ error_handling() ->
 	(catch iolist_to_binary(re:replace("apa","p","X",
 					   [{return,banana}]))),
     {'EXIT',{badarg,_}} = (catch re:replace("apa","(p","X",[])),
-    % Badarg, not compile error.
+    %% Badarg, not compile error.
     {'EXIT',{badarg,[{re,replace,
 		      ["apa","(p","X",[{return,banana}]],_},
 		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch iolist_to_binary(re:replace("apa","(p","X",
 					   [{return,banana}]))),
-    % And the split errors:
+    %% And the split errors:
     [<<"a">>,<<"a">>] = (catch re:split("apa","p",[])),
     [<<"a">>,<<"p">>,<<"a">>] = (catch re:split("apa",RE,[])),
     {'EXIT',{badarg,[{re,split,["apa","p",[report_errors]],_},
@@ -618,34 +593,31 @@ error_handling() ->
 		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa",RE,[banana])),
     {'EXIT',{badarg,_}} = (catch re:split("apa","(p")),
-    %Exception on bad argument, not compilation error
+    %%Exception on bad argument, not compilation error
     {'EXIT',{badarg,[{re,split,
 		      ["apa",
 		       "(p",
 		       [banana]],_},
 		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa","(p",[banana])),
-    ?t:timetrap_cancel(Dog),
     ok.
-    
-pcre_cve_2008_2371(doc) ->
-    "Fix as in http://vcs.pcre.org/viewvc?revision=360&view=revision";
+
+%% Fix as in http://vcs.pcre.org/viewvc?revision=360&view=revision
 pcre_cve_2008_2371(Config) when is_list(Config) ->
     %% Make sure it doesn't crash the emulator.
     re:compile(<<"(?i)[\xc3\xa9\xc3\xbd]|[\xc3\xa9\xc3\xbdA]">>, [unicode]),
     ok.
 
-pcre_compile_workspace_overflow(doc) ->
-    "Patch from http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch";
+%% Patch from
+%% http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch
 pcre_compile_workspace_overflow(Config) when is_list(Config) ->
     N = 819,
-    ?line {error,{"internal error: overran compiling workspace",799}} =
+    {error,{"internal error: overran compiling workspace",799}} =
 	re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]),
     ok.
-re_infinite_loop(doc) ->
-    "Make sure matches that really loop infinitely actually fail";
+
+%% Make sure matches that really loop infinitely actually fail.
 re_infinite_loop(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(1)),
     Str =
         "http:/www.flickr.com/slideShow/index.gne?group_id=&user_id=69845378@N0",
     EMail_regex = "[a-z0-9!#$%&'*+/=?^_`{|}~-]+"
@@ -657,20 +629,17 @@ re_infinite_loop(Config) when is_list(Config) ->
     nomatch = re:run(Str, EMail_regex, [global]),
     {error,match_limit} = re:run(Str, EMail_regex,[report_errors]),
     {error,match_limit} = re:run(Str, EMail_regex,[report_errors,global]),
-    ?t:timetrap_cancel(Dog),
     ok.
-re_backwards_accented(doc) ->
-    "Check for nasty bug where accented graphemes can make PCRE back past "
-	"beginning of subject";
+
+%% Check for nasty bug where accented graphemes can make PCRE back
+%% past beginning of subject.
 re_backwards_accented(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(1)),
-    ?line match = re:run(<<65,204,128,65,204,128,97,98,99>>,
-			 <<"\\X?abc">>,
-			 [unicode,{capture,none}]),
-    ?t:timetrap_cancel(Dog),
+    match = re:run(<<65,204,128,65,204,128,97,98,99>>,
+		   <<"\\X?abc">>,
+		   [unicode,{capture,none}]),
     ok.
-opt_dupnames(doc) ->
-    "Check correct handling of dupnames option to re";
+
+%% Check correct handling of dupnames option to re.
 opt_dupnames(Config) when is_list(Config) ->
     Days = ["Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
     _ = [ begin
@@ -704,9 +673,9 @@ opt_dupnames(Config) when is_list(Config) ->
 					 "(?<DN>Sat)(?:urday)?",
 					 [dupnames, {capture, ['Skrap','DN','Skrap2'],index}]),
     {match,[{-1,0},{0,3},{-1,0}]} = re:run("Wednesday","(?<Skrap>.)(?<DN>Mon|Fri|Sun)(?:day)?(?<Skrap2>.)|"
-					 "(?<DN>Tue)(?:sday)?|(?<DN>Wed)nesday|(?<DN>Thu)(?:rsday)?|"
-					 "(?<DN>Sat)(?:urday)?",
-					 [dupnames, {capture, ['Skrap','DN','Skrap2'],index}]),
+					   "(?<DN>Tue)(?:sday)?|(?<DN>Wed)nesday|(?<DN>Thu)(?:rsday)?|"
+					   "(?<DN>Sat)(?:urday)?",
+					   [dupnames, {capture, ['Skrap','DN','Skrap2'],index}]),
     nomatch = re:run("Wednsday","(?<Skrap>.)(?<DN>Mon|Fri|Sun)(?:day)?(?<Skrap2>.)|"
 		     "(?<DN>Tue)(?:sday)?|(?<DN>Wed)nesday|(?<DN>Thu)(?:rsday)?|"
 		     "(?<DN>Sat)(?:urday)?",
@@ -758,8 +727,7 @@ opt_dupnames(Config) when is_list(Config) ->
 			  "h","a","n","T","e","then"],binary}]), 
     ok.
 
-opt_all_names(doc) ->
-    "Test capturing of all_names";
+%% Test capturing of all_names.
 opt_all_names(Config) when is_list(Config) ->
     Days = ["Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
     {match,[{1,3},{0,1},{7,1}]} = re:run("SMondayX","(?<Skrap>.)(?<DN>Mon|Fri|Sun)(?:day)?(?<Skrap2>.)|"
@@ -767,10 +735,10 @@ opt_all_names(Config) when is_list(Config) ->
 					 "(?<DN>Sat)(?:urday)?",
 					 [dupnames, {capture, all_names,index}]),
     {match,[{0,3},{-1,0},{-1,0}]} = re:run("Wednesday","(?<Skrap>.)(?<DN>Mon|Fri|Sun)(?:day)?(?<Skrap2>.)|"
-					 "(?<DN>Tue)(?:sday)?|(?<DN>Wed)nesday|(?<DN>Thu)(?:rsday)?|"
-					 "(?<DN>Sat)(?:urday)?",
-					 [dupnames, {capture, all_names,index}]),
-    
+					   "(?<DN>Tue)(?:sday)?|(?<DN>Wed)nesday|(?<DN>Thu)(?:rsday)?|"
+					   "(?<DN>Sat)(?:urday)?",
+					   [dupnames, {capture, all_names,index}]),
+
     _ = [ begin
 	      {match,[{0,3}]} =
 		  re:run(Day,
@@ -809,7 +777,7 @@ opt_all_names(Config) when is_list(Config) ->
     {match,[[<<>>,<<>>,<<"C">>],
 	    [<<>>,<<>>,<<"C">>],
 	    [<<>>,<<>>,<<"C">>]]} = re:run("CCC","(?<A>A)|(?<B>B)|(?<C>C)",
-				       [global,{capture, all_names, binary}]),
+					   [global,{capture, all_names, binary}]),
     {match,[[<<"C">>,<<>>],
 	    [<<>>,<<"B">>],
 	    [<<"C">>,<<>>]]} = re:run("CBC","(?<A>A)|(?<B>B)|(?<A>C)",
@@ -831,8 +799,7 @@ opt_all_names(Config) when is_list(Config) ->
 	       [dupnames,{capture,all_names,binary}]),
     ok.
 
-inspect(doc) ->
-    "Test the minimal inspect function";
+%% Test the minimal inspect function.
 inspect(Config) when is_list(Config)->
     {ok,MP} = re:compile("(?<A>A)|(?<B>B)|(?<C>C)."),
     {namelist,[<<"A">>,<<"B">>,<<"C">>]} = re:inspect(MP,namelist),
@@ -845,15 +812,13 @@ inspect(Config) when is_list(Config)->
     {'EXIT',{badarg,_}} = (catch re:inspect({re_pattern,3,0,0,<<"kalle",2:2>>},namelist)),
     ok.
 
-opt_no_start_optimize(doc) ->
-    "Test that the no_start_optimize compilation flag works";
+%% Test that the no_start_optimize compilation flag works.
 opt_no_start_optimize(Config) when is_list(Config) ->
     {match, [{3,3}]} = re:run("DEFABC","(*COMMIT)ABC",[]), % Start optimization makes this result wrong!
     nomatch = re:run("DEFABC","(*COMMIT)ABC",[no_start_optimize]), % This is the correct result...
     ok.
 
-opt_never_utf(doc) ->
-    "Check that the never_utf option works";
+%% Check that the never_utf option works.
 opt_never_utf(Config) when is_list(Config) ->
     {match,[{0,3}]} = re:run("ABC","ABC",[never_utf]),
     {match,[{0,3}]} = re:run("ABC","(*UTF)ABC",[]),
@@ -867,29 +832,29 @@ opt_never_utf(Config) when is_list(Config) ->
     {error,_} = (catch re:compile("(*UTF)ABC",[never_utf])),
     {error,_} = (catch re:compile("(*UTF8)ABC",[never_utf])),
     ok.
-opt_ucp(doc) ->
-    "Check that the ucp option is passed to PCRE";
+
+%% Check that the ucp option is passed to PCRE.
 opt_ucp(Config) when is_list(Config) ->
     {match,[{0,1}]} = re:run([$a],"\\w",[unicode]),
     {match,[{0,2}]} = re:run([229],"\\w",[unicode]), % Latin1 works without UCP, as we have a default 
-						     % Latin1 table
+    %% Latin1 table
     nomatch = re:run([1024],"\\w",[unicode]), % Latin1 word characters only, 1024 is not latin1
     {match,[{0,2}]} = re:run([1024],"\\w",[unicode,ucp]), % Any Unicode word character works with 'ucp'
     ok.
-match_limit(doc) ->
-    "Check that the match_limit and match_limit_recursion options work";
+
+%% Check that the match_limit and match_limit_recursion options work.
 match_limit(Config) when is_list(Config) ->
     nomatch = re:run("aaaaaaaaaaaaaz","(a+)*zz",[]),
     nomatch = re:run("aaaaaaaaaaaaaz","(a+)*zz",[{match_limit,3000}]),
     nomatch = re:run("aaaaaaaaaaaaaz","(a+)*zz",[{match_limit_recursion,10}]),
     nomatch = re:run("aaaaaaaaaaaaaz","(a+)*zz",[report_errors]),
     {error,match_limit} = re:run("aaaaaaaaaaaaaz","(a+)*zz",[{match_limit,3000},
-						 report_errors]),
+							     report_errors]),
     {error,match_limit_recursion} = 
 	re:run("aaaaaaaaaaaaaz","(a+)*zz",[{match_limit_recursion,10},
 					   report_errors]),
     {error,match_limit} = re:run("aaaaaaaaaaaaaz","(a+)*zz",[{match_limit,3000},
-						 report_errors,global]),
+							     report_errors,global]),
     {error,match_limit_recursion} = 
 	re:run("aaaaaaaaaaaaaz","(a+)*zz",[{match_limit_recursion,10},
 					   report_errors,global]),
@@ -902,9 +867,9 @@ match_limit(Config) when is_list(Config) ->
     "aaaaaaaaaaaaaz" = re:replace("aaaaaaaaaaaaaz","(a+)*zz","!",
 				  [{match_limit,3000},{return,list}]),
     {'EXIT', {badarg,_}} = (catch re:replace("aaaaaaaaaaaaaz","(a+)*zz","!",
-				  [{match_limit_recursion,-1},{return,list}])),
+					     [{match_limit_recursion,-1},{return,list}])),
     {'EXIT', {badarg,_}} = (catch re:replace("aaaaaaaaaaaaaz","(a+)*zz","!",
-				  [{match_limit,-1},{return,list}])),
+					     [{match_limit,-1},{return,list}])),
     {'EXIT', {badarg,_}} = (catch re:run("aaaaaaaaaaaaaz","(a+)*zz",
 					 [{match_limit_recursion,-1},
 					  report_errors,global])),
@@ -912,9 +877,8 @@ match_limit(Config) when is_list(Config) ->
 					 [{match_limit,-1},
 					  report_errors,global])),
     ok.
-sub_binaries(doc) ->
-    "test that we get sub-binaries if subject is a binary and we "
-	"capture binaries";
+%% Test that we get sub-binaries if subject is a binary and we capture
+%% binaries.
 sub_binaries(Config) when is_list(Config) ->
     Bin = list_to_binary(lists:seq(1,255)),
     {match,[B,C]}=re:run(Bin,"(a)",[{capture,all,binary}]),
diff --git a/lib/stdlib/test/run_pcre_tests.erl b/lib/stdlib/test/run_pcre_tests.erl
index 1fdc777470..8b0373d062 100644
--- a/lib/stdlib/test/run_pcre_tests.erl
+++ b/lib/stdlib/test/run_pcre_tests.erl
@@ -69,8 +69,6 @@ pick_exec_options([]) ->
 test([],_,_,_) ->
     0;
 test([{RE0,Line,Options0,Tests}|T],PreCompile,XMode,REAsList) ->
-    %io:format("."),
-    %case RE of <<>> -> io:format("Empty re:~w~n",[Line]); _ -> ok end,
     Unicode = lists:member(unicode,Options0),
     RE = case REAsList of
 	     true ->
@@ -90,7 +88,6 @@ test([{RE0,Line,Options0,Tests}|T],PreCompile,XMode,REAsList) ->
 		   end,
     case Cres of
 	{ok,P} ->
-	    %erlang:display({testrun,RE,P,Tests,ExecOptions,Xopt,XMode}),
 	    case (catch testrun(RE,P,Tests,ExecOptions,Xopt,XMode)) of
 		N when is_integer(N) ->
 		    N + test(T,PreCompile,XMode,REAsList);
@@ -125,16 +122,10 @@ test([{RE0,Line,Options0,Tests}|T],PreCompile,XMode,REAsList) ->
 loopexec(_,_,X,Y,_,_) when X > Y ->
     {match,[]};
 loopexec(P,Chal,X,Y,Unicode,Xopt) ->
-    %io:format("~p~n",[X]),
     case re:run(Chal,P,[{offset,X}]++Xopt) of
 	nomatch ->
-	    %io:format(" re:exec(~p,~p,[{offset,~p}]) -> ~p~n",
-	%	      [P,Chal,X,no]),
 	    {match,[]};
-	    %loopexec(P,Chal,X+1,Y);
 	{match,[{A,B}|More]} ->
-	    %io:format(" re:exec(~p,~p,[{offset,~p}]) -> ~p~n",
-	%	      [P,Chal,X,{match,[{A,B}|More]}]),
 	    {match,Rest} = 
 		case B>0 of
 		    true ->
@@ -169,7 +160,6 @@ forward(Chal,A,N,true) ->
 	       _ ->
 		   1
 	   end,
-    %io:format("Forward ~p~n",[Forw]),
     forward(Chal,A+Forw,N-1,true).
     
 contains_eightbit(<<>>) ->
@@ -334,8 +324,6 @@ testrun(RE,P,[{Chal,Line,ExecOpt,Responses}|T],EO,Xopt0,XMode) ->
 				    nomatch ->
 					nomatch;
 				    {match, Reslist} ->
-					%io:format("re:run(~w,~w,~w) -> ~w~n",[Chal,P,ExecOpt++Xopt++
-					%    [{capture,all,list}],Reslist]),
 					UFix = lists:member(unicode,EO),
 					{match,bfix([if 
 							 UFix =:= true -> list_to_utf8(L); 
@@ -425,7 +413,6 @@ pickline(Start,Stop,Bin) when Stop >= size(Bin) ->
     {Res,Stop};
     
 pickline(Start,Stop,Bin) ->
-    %erlang:display({Start,Stop,size(Bin)}),
     <<_:Stop/binary,Ch,_/binary>> = Bin,
     case Ch of
 	$\n ->
@@ -465,15 +452,13 @@ stru([{_,<<>>}|T]) ->
     stru(T);
 stru([{Line,<<Ch,Re0/binary>>}|T0]) ->
     {T,Re} = find_rest_re(Ch,[{Line,Re0}|T0]),
-    %io:format("DBG: ~p~n",[Re]),
     {NewRe,<< Ch, Options/binary >>} = end_of_re(Ch,Re),
     case interpret_options_x(backstrip(frontstrip(Options)),NewRe) of
 	{Olist,<<>>} -> 
 	    U = lists:member(unicode,Olist),
 	    case T of
 		[{_,<<$-,_/binary>>}|Con] ->
-		    %Debug output, we skip those 
-		    %io:format("Skipping debug (~w)~n",[Line]),
+		    %%Debug output, we skip those
 		    TmpT = skip_debug(Con),
 		    {NewT,Matches} = stru2(TmpT,U),
 		    [{NewRe,Line,Olist,Matches}|stru(NewT)];
@@ -482,12 +467,10 @@ stru([{Line,<<Ch,Re0/binary>>}|T0]) ->
 		    {NewT,Matches} = stru2(NewT0,U),
 		    [{NewRe,Line,Olist,Matches}|stru(NewT)];
 		[{_,<<Bla,_/binary>>}|_] when Bla =/= $  ->
-		    %io:format("Skipping blabla (~w)~n",[Line]),
 		    NewT = skip_until_empty(T),
 		    stru(NewT);
 		_ ->
 		    {NewT,Matches} = stru2(T,U),
-		    %erlang:display({NewRe,Line,Olist,Matches}),
 		    Matches1 = case U of
 				   true ->
 				       Matches ++
@@ -496,7 +479,6 @@ stru([{Line,<<Ch,Re0/binary>>}|T0]) ->
 				   false ->
 				       Matches
 			       end,
-		    %erlang:display({NewRe,Line,Olist,Matches1}),
 		    [{NewRe,Line,Olist,Matches1}|stru(NewT)]
 	    end;
 	{_,Rest} ->
@@ -605,7 +587,7 @@ backslash_end(<<_,R/binary>>) ->
     backslash_end(R).
 
 stru2([{Line,<<$ ,Rest/binary>>} | T],U) ->
-    % A challenge
+    %% A challenge
     case  (catch responses(T,U)) of
 	{NewT,Rlist} ->
 	    {NewNewT,StrList} = stru2(NewT,U),
@@ -765,17 +747,17 @@ pick_offset(Rest) ->
 escape(<<>>,_) ->
     {[],<<>>};
 escape(<<$\\, Ch, Rest/binary>>,U) when Ch >= $A, Ch =< $Z; Ch =:= $? ->
-    %Options in the string...
+    %%Options in the string...
     NewOpts = eopt(Ch),
     {MoreOpts,Tail} = escape(Rest,U),
     {NewOpts ++ MoreOpts,Tail};
 escape(<<$\\, $>, Rest/binary>>,U) ->
-    %Offset Options in the string...
+    %%Offset Options in the string...
     {NewOpt,NewRest} = pick_offset(Rest),
     {MoreOpts,Tail} = escape(NewRest,U),
     {[NewOpt|MoreOpts],Tail};
 escape(<<$\\, $<, Rest/binary>>,U) ->
-    %CR Options in the string...
+    %%CR Options in the string...
     {NewOpt,NewRest} = pinch_cr(Rest),
     {MoreOpts,Tail} = escape(NewRest,U),
     {[NewOpt|MoreOpts],Tail};
@@ -789,7 +771,6 @@ escape(<<$\\, Ch, Rest/binary>>,U) ->
 			     {<<$\\>>,<<Ch,Rest/binary>>}
 		     end;
 		 CCC ->
-		     %erlang:display({escape,CCC}),
 		     {<<CCC>>,Rest}
 	     end,
     {MoreOpts,Tail} = escape(NR,U),
@@ -877,7 +858,6 @@ multi_esc(<<$x,${,N,O,$},Rest/binary>>,Unicode)
 	 ((N >= $a) and (N =< $f))) and 
 	(((O >= $0) and (O =< $9)) or ((O >= $A) and (O =< $F)) or 
 	 ((O >= $a) and (O =< $f)))) -> 
-    %io:format("~p(~p)~n",[<<$x,${,N,O,$}>>,get(unicode)]),
     Cha = (trx(N) bsl 4) bor trx(O),
     case Unicode of
 	false ->
@@ -974,8 +954,8 @@ single_esc($\\) ->
     $\\;
 single_esc($a) ->
     7;
-%single_esc(Ch) when Ch >= $A, Ch =< $Z -> % eh?
-%    Ch;
+%%single_esc(Ch) when Ch >= $A, Ch =< $Z -> % eh?
+%%    Ch;
 
 single_esc(_) ->
     no.
@@ -1003,8 +983,6 @@ gen_split_test(OneFile) ->
     io:format(F,"-module(~s).~n",[ErlModule]),
     io:format(F,"-compile(export_all).~n",[]),
     io:format(F,"-compile(no_native).~n",[]),
-    %io:format(F,"-include(\"test_server.hrl\").~n",[]),
-    %io:format(F,"-define(line,erlang:display(?LINE),).~n",[]),
     io:format(F,"%% This file is generated by running ~w:gen_split_test(~p)~n",
 	      [?MODULE,OneFile]),
     io:format(F,"join([]) -> [];~n",[]),
@@ -1083,7 +1061,7 @@ dumponesplit(F,{RE,Line,O,TS}) ->
 %% Generate replacement tests from indatafile, 
 %% you will need perl on the machine
 gen_repl_test(OneFile) ->
-    random:seed(1219,687731,62804),
+    rand:seed(exsplus, {1219,687731,62804}),
     {ok,Bin} = file:read_file(OneFile),
     Lines = splitfile(0,Bin,1),
     Structured = stru(Lines),
@@ -1095,7 +1073,6 @@ gen_repl_test(OneFile) ->
     io:format(F,"-module(~s).~n",[ErlModule]),
     io:format(F,"-compile(export_all).~n",[]),
     io:format(F,"-compile(no_native).~n",[]),
-    %io:format(F,"-include(\"test_server.hrl\").~n",[]),
     io:format(F,"%% This file is generated by running ~w:gen_repl_test(~p)~n",
 	      [?MODULE,OneFile]),
     io:format(F,"run() ->~n",[]),
@@ -1237,15 +1214,15 @@ btr(_) ->
 
 
 ranchar() ->
-    case random:uniform(10) of
+    case rand:uniform(10) of
 	9 -> $&;
         10 -> <<"\\1">>;		 
 	N when N < 5 ->
-	    random:uniform($Z-$A)+$A-1;
+	    rand:uniform($Z-$A)+$A-1;
 	M when M < 9 ->
-	    random:uniform($z-$a)+$a-1
+	    rand:uniform($z-$a)+$a-1
     end.
 
 ranstring() ->
-    iolist_to_binary([ranchar() || _ <- lists:duplicate(random:uniform(20),0) ]).
+    iolist_to_binary([ranchar() || _ <- lists:duplicate(rand:uniform(20),0) ]).
 
diff --git a/lib/stdlib/test/select_SUITE.erl b/lib/stdlib/test/select_SUITE.erl
index ead64ffc75..b7e86377c4 100644
--- a/lib/stdlib/test/select_SUITE.erl
+++ b/lib/stdlib/test/select_SUITE.erl
@@ -27,21 +27,21 @@
 %% Define to run outside of test server
 %%
 %%-define(STANDALONE,1).
- 
+
 %%
 %% Define for debug output
 %%
 %%-define(debug,1).
- 
+
 -ifdef(STANDALONE).
 -define(config(A,B),config(A,B)).
 -export([config/2]).
--define(fmt(A,B),io:format(A,B)).
 -else.
--include_lib("test_server/include/test_server.hrl").
--define(fmt(A,B),test_server:format(A,B)).
+-include_lib("common_test/include/ct.hrl").
 -endif.
- 
+
+-define(fmt(A,B), io:format(A, B)).
+
 -ifdef(debug).
 -ifdef(STANDALONE).
 -define(line, erlang:display({?MODULE,?LINE}), ).
@@ -53,7 +53,7 @@
 -endif.
 -define(dbgformat(A,B),noop).
 -endif.
- 
+
 -ifdef(STANDALONE).
 config(priv_dir,_) ->
     ".".
@@ -64,16 +64,15 @@ config(priv_dir,_) ->
 	 init_per_testcase/2, end_per_testcase/2, 
 	 return_values/1]).
 
-init_per_testcase(_Case, Config) when is_list(Config) ->
-    ?line Dog=test_server:timetrap(test_server:seconds(1200)),
-    [{watchdog, Dog}|Config].
+init_per_testcase(_Case, Config) ->
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,20}}].
 
 all() -> 
     [return_values, select_test].
@@ -94,17 +93,11 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-select_test(suite) ->
-    [];
-select_test(doc) ->
-    ["Tests select in numerous ways"];
+%% Test select in numerous ways.
 select_test(Config) when is_list(Config) ->
     do_test(Config).
 
-return_values(suite) ->
-    [];
-return_values(doc) ->
-    ["Tests return values in specific situations for select/3 and select/1"];
+%% Test return values in specific situations for select/3 and select/1.
 return_values(Config) when is_list(Config) ->
     do_return_values().
 
@@ -117,7 +110,7 @@ table_factor({ets,_}) ->
     100.
 
 gen_dets_filename(Config,N) ->
-    filename:join(?config(priv_dir,Config),
+    filename:join(proplists:get_value(priv_dir,Config),
 		  "testdets_" ++ integer_to_list(N) ++ ".dets").
 
 create_tables(Config) ->
@@ -128,15 +121,15 @@ create_tables(Config) ->
     F1 = gen_dets_filename(Config,1),
     (catch file:delete(F1)),
     {ok,DetsPlain} = dets:open_file(testdets_1,
-			       [{file, F1}]),
+				    [{file, F1}]),
     F3 = gen_dets_filename(Config,3),
     (catch file:delete(F3)),
     {ok,DetsBag} = dets:open_file(testdets_3,
-				     [{file, F3},{type, bag}]),
+				  [{file, F3},{type, bag}]),
     F4 = gen_dets_filename(Config,4),
     (catch file:delete(F4)),
     {ok,DetsDBag} = dets:open_file(testdets_4,
-				     [{file, F4},{type, duplicate_bag}]),
+				   [{file, F4},{type, duplicate_bag}]),
     [{ets,Hash}, {ets,Tree}, {ets,Bag}, {ets,DBag}, 
      {dets, DetsPlain}, {dets, DetsBag}, {dets, DetsDBag}].
 
@@ -189,7 +182,7 @@ build_tables(Config,Type) ->
     L = create_tables(Config),
     ?dbgformat("Tables: ~p~n",[L]),
     lists:foreach(fun(TD) ->
-		      fill_table(TD,table_size(TD),Type)
+			  fill_table(TD,table_size(TD),Type)
 		  end,
 		  L),
     L.
@@ -202,21 +195,20 @@ destroy_tables([{ets,Tab}|T]) ->
 destroy_tables([{dets,Tab}|T]) ->
     dets:close(Tab),
     destroy_tables(T).
-    
+
 
 init_random(Config) ->
-    WriteDir = ReadDir = ?config(priv_dir,Config),
+    WriteDir = ReadDir = proplists:get_value(priv_dir,Config),
     (catch file:make_dir(WriteDir)),
     Seed = case file:consult(filename:join([ReadDir, 
 					    "preset_random_seed2.txt"])) of
 	       {ok,[X]} ->
 		   X;
 	       _ ->
-		   {A,B,C} = erlang:timestamp(),
-		   random:seed(A,B,C),
-		   get(random_seed)
+		   rand:seed(exsplus),
+		   rand:export_seed()
 	   end,
-    put(random_seed,Seed),
+    rand:seed(Seed),
     {ok, F} = file:open(filename:join([WriteDir, "last_random_seed2.txt"]), 
 			[write]),
     io:format(F,"~p. ~n",[Seed]),
@@ -224,27 +216,27 @@ init_random(Config) ->
     ok.
 
 create_random_key(N,Type) ->
-    gen_key(random:uniform(N),Type).
+    gen_key(rand:uniform(N),Type).
 
 create_pb_key(N,list) ->
-    X = random:uniform(N),
-    case random:uniform(4) of
+    X = rand:uniform(N),
+    case rand:uniform(4) of
 	3 -> {[X, X+1, '_'], fun([Z,Z1,P1]) ->  
-				      [Z,Z1,P1] =:= [X,X+1,P1] end};
+				     [Z,Z1,P1] =:= [X,X+1,P1] end};
 	2 -> {[X, '_', '_'], fun([Z,P1,P2]) ->  [Z,P1,P2] =:= [X,P1,P2] end};
 	1 -> {[X, X+1, '$1'], fun([Z,Z1,P1]) ->  
 				      [Z,Z1,P1] =:= [X,X+1,P1] end};
 	_ -> {[X, '$1', '$2'], fun([Z,P1,P2]) ->  [Z,P1,P2] =:= [X,P1,P2] end}
     end;
 create_pb_key(N, tuple) ->
-    X = random:uniform(N),
-    case random:uniform(2) of
+    X = rand:uniform(N),
+    case rand:uniform(2) of
 	1 -> {{X, X+1, '$1'},fun({Z,Z1,P1}) ->  {Z,Z1,P1} =:= {X,X+1,P1} end};
 	_ -> {{X, '$1', '$2'},fun({Z,P1,P2}) ->  {Z,P1,P2} =:= {X,P1,P2} end}
     end;
 create_pb_key(N, complex) ->
-    X = random:uniform(N),
-    case random:uniform(2) of
+    X = rand:uniform(N),
+    case rand:uniform(2) of
 	1 -> {{[X, X+1], '$1'}, fun({[Z,Z1],P1}) ->  
 					{[Z,Z1],P1} =:= {[X,X+1],P1} end};
 	_ -> {{[X, '$1'], '$2'},fun({[Z,P1],P2}) -> 
@@ -310,7 +302,7 @@ cmp_ms_to_fun({Mod,Tab}, MS, Fun1, Fun2, ChunkSize) ->
 	false ->
 	    ?fmt("Match_spec result differs from fun result:~n",[]),
 	    ?fmt("Parameters: ~p,~p,~p,~p~n", 
-		      [{Mod,Tab}, MS, Fun1, Fun2]),
+		 [{Mod,Tab}, MS, Fun1, Fun2]),
 	    ?fmt("Match_spec Result: ~p~n", [MSRes]),
 	    ?fmt("Fun Result: ~p~n", [FunRes]),
 	    Info = (catch Mod:info(Tab)),
@@ -352,18 +344,18 @@ do_test(Config) ->
 			  ?fmt("multi_key done for type ~w~n",[Type]),
 			  multi_mixed_key(Tabs,Type),
 			  ?fmt("multi_mixed_key done for type ~w~n",
-				    [Type]),
+			       [Type]),
 			  destroy_tables(Tabs)
 		  end,
 		  [tuple, list, complex]),
     ok.
-    
+
 basic_key(Tabs,Type) ->
     Fun = fun() ->
 		  lists:map(fun(Tab) ->
-				    ?line Key = 
+				    Key =
 					create_random_key(num_els(Tab),Type),
-				    ?line  MS = 
+				    MS =
 					[{{Key,'_','_','_','_'},[],['$_']}],
 				    MF = fun({Key0,A,B,F,Bi},Acc) ->
 						 case Key =:= Key0 of
@@ -374,18 +366,18 @@ basic_key(Tabs,Type) ->
 							 Acc
 						 end
 					 end,
-				    ?line cmp_ms_to_fun(Tab,MS,MF,[])
+				    cmp_ms_to_fun(Tab,MS,MF,[])
 			    end,
 			    Tabs)
 	  end,
-    ?line do_n(50,Fun),
+    do_n(50,Fun),
     ok.
-		  
+
 basic_pb_key(Tabs,Type) ->
     InnerFun = fun(Tab) ->
-		       ?line {Key,KeyFun}  = 
+		       {Key,KeyFun}  =
 			   create_pb_key(num_els(Tab),Type),
-		       ?line MS = [{{Key,'_','_','_','_'},[],['$_']}],
+		       MS = [{{Key,'_','_','_','_'},[],['$_']}],
 		       MF = fun({Key0,A,B,F,Bi},Acc) ->
 				    case KeyFun(Key0) of
 					true ->
@@ -395,27 +387,27 @@ basic_pb_key(Tabs,Type) ->
 					    Acc
 				    end
 			    end,
-		       ?line cmp_ms_to_fun(Tab,MS,MF,[])
+		       cmp_ms_to_fun(Tab,MS,MF,[])
 	       end,
-    ?line {Etses, Detses} = split_by_type(Tabs),
-    
-    ?line FunEts = fun() ->
-			   ?line lists:foreach(InnerFun,
-					       Etses)
-		   end,
-    ?line FunDets = fun() ->
-			    ?line lists:foreach(InnerFun,
-						Detses)
-		    end,
-    ?line do_n(table_factor(hd(Etses)) div 2,FunEts),
-    ?line do_n(10,FunDets),
+    {Etses, Detses} = split_by_type(Tabs),
+
+    FunEts = fun() ->
+		     lists:foreach(InnerFun,
+				   Etses)
+	     end,
+    FunDets = fun() ->
+		      lists:foreach(InnerFun,
+				    Detses)
+	      end,
+    do_n(table_factor(hd(Etses)) div 2,FunEts),
+    do_n(10,FunDets),
     ok.
-		  
+
 double_pb_key(Tabs,Type) ->
     InnerFun = fun(Tab) ->
-		       ?line {KeyA,KeyFunA}  = 
+		       {KeyA,KeyFunA}  =
 			   create_pb_key(num_els(Tab),Type),
-		       ?line {KeyB,KeyFunB}  = 
+		       {KeyB,KeyFunB}  =
 			   create_pb_key(num_els(Tab),Type),
 		       MS = [{{KeyA,'_','_','_','_'},[],['$_']},
 			     {{KeyB,'_','_','_','_'},[],['$_']}],
@@ -449,51 +441,51 @@ double_pb_key(Tabs,Type) ->
 					    end
 				    end
 			    end,
-		       ?line cmp_ms_to_fun(Tab,MS,MF,[])
+		       cmp_ms_to_fun(Tab,MS,MF,[])
 	       end,
-    ?line {Etses, Detses} = split_by_type(Tabs),
-    
-    ?line FunEts = fun() ->
-			   ?line lists:foreach(InnerFun,
-					       Etses)
-		   end,
-    ?line FunDets = fun() ->
-			    ?line lists:foreach(InnerFun,
-						Detses)
-		    end,
-    ?line do_n(table_factor(hd(Etses)) div 2,FunEts),
-    ?line do_n(10,FunDets),
+    {Etses, Detses} = split_by_type(Tabs),
+
+    FunEts = fun() ->
+		     lists:foreach(InnerFun,
+				   Etses)
+	     end,
+    FunDets = fun() ->
+		      lists:foreach(InnerFun,
+				    Detses)
+	      end,
+    do_n(table_factor(hd(Etses)) div 2,FunEts),
+    do_n(10,FunDets),
     ok.
-		  
-	    
+
+
 multi_key(Tabs,Type) ->
     Fun = fun() ->
 		  lists:map(fun(Tab) ->
-				    ?line KeyA  = 
+				    KeyA  =
 					create_random_key(num_els(Tab),Type),
-				    ?line KeyB  = 
+				    KeyB  =
 					create_random_key(num_els(Tab),Type),
-				    ?line KeyC  = 
+				    KeyC  =
 					create_random_key(num_els(Tab),Type),
-				    ?line KeyD  = 
+				    KeyD  =
 					create_random_key(num_els(Tab),Type),
-				    ?line KeyE  = 
+				    KeyE  =
 					create_random_key(num_els(Tab),Type),
-				    ?line KeyF  = 
+				    KeyF  =
 					create_random_key(num_els(Tab),Type),
-				    ?line KeyG  = 
+				    KeyG  =
 					create_random_key(num_els(Tab),Type),
-				    ?line KeyH  = 
+				    KeyH  =
 					create_random_key(num_els(Tab),Type),
-				    ?line KeyI  = 
+				    KeyI  =
 					create_random_key(num_els(Tab),Type),
-				    ?line KeyJ  = 
+				    KeyJ  =
 					create_random_key(num_els(Tab),Type),
-				    ?line KeyK  = 
+				    KeyK  =
 					create_random_key(num_els(Tab),Type),
-				    ?line KeyL  = 
+				    KeyL  =
 					create_random_key(num_els(Tab),Type),
-				    
+
 				    MS = [{{KeyA,'$1','_','$2','_'},[],
 					   [{{'$1','$2'}}]},
 					  {{KeyB,'$1','_','$2','_'},[],
@@ -520,7 +512,7 @@ multi_key(Tabs,Type) ->
 					   [{{'$1','$2'}}]}
 					 ],
 				    ?dbgformat("Tab: ~p, MS: ~p~n",
-					      [Tab,MS]),
+					       [Tab,MS]),
 				    MF = fun({Key0,A,_B,F,_Bi},Acc) ->
 						 case Key0 of
 						     KeyA ->
@@ -563,40 +555,40 @@ multi_key(Tabs,Type) ->
 							 Acc
 						 end
 					 end,
-				    ?line cmp_ms_to_fun(Tab,MS,MF,[])
+				    cmp_ms_to_fun(Tab,MS,MF,[])
 			    end,
 			    Tabs)
 	  end,
-    ?line do_n(33,Fun),
+    do_n(33,Fun),
     ok.
-		  
+
 multi_mixed_key(Tabs,Type) ->
     InnerFun = fun(Tab) ->
-		       ?line KeyA  = 
+		       KeyA  =
 			   create_random_key(num_els(Tab),Type),
-		       ?line KeyB  = 
+		       KeyB  =
 			   create_random_key(num_els(Tab),Type),
-		       ?line KeyC  = 
+		       KeyC  =
 			   create_random_key(num_els(Tab),Type),
-		       ?line KeyD  = 
+		       KeyD  =
 			   create_random_key(num_els(Tab),Type),
-		       ?line {KeyE, FunE}  = 
+		       {KeyE, FunE}  =
 			   create_pb_key(num_els(Tab),Type),
-		       ?line KeyF  = 
+		       KeyF  =
 			   create_random_key(num_els(Tab),Type),
-		       ?line {KeyG, FunG}  = 
+		       {KeyG, FunG}  =
 			   create_pb_key(num_els(Tab),Type),
-		       ?line KeyH  = 
+		       KeyH  =
 			   create_random_key(num_els(Tab),Type),
-		       ?line KeyI  = 
+		       KeyI  =
 			   create_random_key(num_els(Tab),Type),
-		       ?line {KeyJ, FunJ}  = 
+		       {KeyJ, FunJ}  =
 			   create_pb_key(num_els(Tab),Type),
-		       ?line KeyK  = 
+		       KeyK  =
 			   create_random_key(num_els(Tab),Type),
-		       ?line KeyL  = 
+		       KeyL  =
 			   create_random_key(num_els(Tab),Type),
-		       
+
 		       MS = [{{KeyA,'$1','_','$2','_'},[],
 			      [{{'$1','$2'}}]},
 			     {{KeyB,'$1','_','$2','_'},[],
@@ -665,34 +657,34 @@ multi_mixed_key(Tabs,Type) ->
 					    end
 				    end
 			    end,
-		       ?line cmp_ms_to_fun(Tab,MS,MF,[]),
-		       ?line case Tab of
-				 {ets,_} ->
-				     ?line cmp_ms_to_fun(Tab,MS,MF,[],1),  
-				     ?line cmp_ms_to_fun(Tab,MS,MF,[],10),  
-				     ?line cmp_ms_to_fun(Tab,MS,MF,[],1000000),  
-				     ?line cmp_ms_to_fun(Tab,MS,MF,[],-1),  
-				     ?line cmp_ms_to_fun(Tab,MS,MF,[],-10),  
-				     ?line cmp_ms_to_fun(Tab,MS,MF,[],-1000000);  
-				 _ ->
-				     ok
-			     end
+		       cmp_ms_to_fun(Tab,MS,MF,[]),
+		       case Tab of
+			   {ets,_} ->
+			       cmp_ms_to_fun(Tab,MS,MF,[],1),
+			       cmp_ms_to_fun(Tab,MS,MF,[],10),
+			       cmp_ms_to_fun(Tab,MS,MF,[],1000000),
+			       cmp_ms_to_fun(Tab,MS,MF,[],-1),
+			       cmp_ms_to_fun(Tab,MS,MF,[],-10),
+			       cmp_ms_to_fun(Tab,MS,MF,[],-1000000);
+			   _ ->
+			       ok
+		       end
 	       end,
-    ?line {Etses, Detses} = split_by_type(Tabs),
-    
-    ?line FunEts = fun() ->
-			   ?line lists:foreach(InnerFun,
-					       Etses)
-		   end,
-    ?line FunDets = fun() ->
-			    ?line lists:foreach(InnerFun,
-						Detses)
-		    end,
-    ?line do_n(table_factor(hd(Etses)) div 2,FunEts),
-    ?line do_n(table_factor(hd(Detses)) div 2,FunDets),
+    {Etses, Detses} = split_by_type(Tabs),
+
+    FunEts = fun() ->
+		     lists:foreach(InnerFun,
+				   Etses)
+	     end,
+    FunDets = fun() ->
+		      lists:foreach(InnerFun,
+				    Detses)
+	      end,
+    do_n(table_factor(hd(Etses)) div 2,FunEts),
+    do_n(table_factor(hd(Detses)) div 2,FunDets),
     ok.
-		  
-	    
+
+
 split_by_type(List) ->    
     split_by_type(List,[],[]).
 split_by_type([],AccEts,AccDets) ->
@@ -703,121 +695,119 @@ split_by_type([{ets,Tab}|T],AccEts,AccDets) ->
     split_by_type(T,[{ets,Tab}|AccEts],AccDets).
 
 whitebox() ->
-    ?line ets:new(xxx,[named_table, ordered_set]),
-    ?line ets:new(yyy,[named_table]),
-    ?line E = fun(0,_)->ok;
-		 (N,F) -> 
-		      ?line ets:insert(xxx,{N,N rem 10}), 
-		      ?line ets:insert(yyy,{N,N rem 10}), 
-		      F(N-1,F) 
-	      end,
-    ?line E(10000,E),                                                          
-
-    ?line G = fun(F,C,A) -> 
-		      ?line case ets:select(C) of 
-				{L,C2} -> 
-				    ?line F(F,C2,A+length(L)); 
-				'$end_of_table' -> 
-				    ?line A 
-			    end 
-	      end,
-    ?line H=fun({L,C}) -> 
-		    ?line G(G,C,length(L)) 
-	    end,
-    
-    ?line 1 = H(ets:select(xxx,[{{'$1','$2'},[{'<','$1',2}],['$_']}],7)),
-    ?line 10000 = H(ets:select(xxx,[{{'$1','$2'},[],['$_']}],1)),
-    ?line 1 = H(ets:select(yyy,[{{'$1','$2'},[{'<','$1',2}],['$_']}],7)),
-    ?line 10000 = H(ets:select(yyy,[{{'$1','$2'},[],['$_']}],1)),
-
-    ?line {[{5,5}],_} = ets:select(xxx,[{{5,'$2'},[],['$_']}],1),
-    ?line {[{5,5}],_} = ets:select(yyy,[{{5,'$2'},[],['$_']}],1),
-
-    ?line I = fun(_,0) -> 
-		      ok;
-		 (I,N) -> 
-		      ?line 10000 =  
-			  H(ets:select(xxx,[{{'$1','$2'},[],['$_']}],N)), 
-		      I(I,N-1) 
-	      end,
-    ?line I(I,2000),
-    ?line J = fun(F,C,A) -> 
-		      ?line case ets:select(C) of 
-				{L,C2} -> 
-				    ?line F(F,C2,lists:reverse(L)++A); 
-				'$end_of_table' -> 
-				    ?line lists:reverse(A) 
-			    end 
-	      end,
-    ?line K = fun({L,C}) -> 
-		      ?line J(J,C,lists:reverse(L)) 
-	      end,
-    ?line M = fun(_, _, 0) -> 
-		      ok;
-		 (F, What, N) -> 
-		      ?line What =  
-			  K(ets:select(xxx,[{{'$1','$2'},[],['$_']}],N)), 
-		      F(F, What, N-1) 
-	      end,
-    ?line N = fun(HM) -> 
-		      ?line What = ets:select(xxx,[{{'$1','$2'},[],['$_']}]), 
-		      ?line What = lists:sort(What), 
-		      M(M, What, HM) 
-	      end,
-    ?line N(2000),
-    ?line ets:delete(xxx),
-    ?line ets:delete(yyy).
+    ets:new(xxx,[named_table, ordered_set]),
+    ets:new(yyy,[named_table]),
+    E = fun(0,_)->ok;
+	   (N,F) ->
+		ets:insert(xxx,{N,N rem 10}),
+		ets:insert(yyy,{N,N rem 10}),
+		F(N-1,F)
+	end,
+    E(10000,E),
+
+    G = fun(F,C,A) ->
+		case ets:select(C) of
+		    {L,C2} ->
+			F(F,C2,A+length(L));
+		    '$end_of_table' ->
+			A
+		end
+	end,
+    H=fun({L,C}) ->
+	      G(G,C,length(L))
+      end,
+
+    1 = H(ets:select(xxx,[{{'$1','$2'},[{'<','$1',2}],['$_']}],7)),
+    10000 = H(ets:select(xxx,[{{'$1','$2'},[],['$_']}],1)),
+    1 = H(ets:select(yyy,[{{'$1','$2'},[{'<','$1',2}],['$_']}],7)),
+    10000 = H(ets:select(yyy,[{{'$1','$2'},[],['$_']}],1)),
+
+    {[{5,5}],_} = ets:select(xxx,[{{5,'$2'},[],['$_']}],1),
+    {[{5,5}],_} = ets:select(yyy,[{{5,'$2'},[],['$_']}],1),
+
+    I = fun(_,0) ->
+		ok;
+	   (I,N) ->
+		10000 =
+		    H(ets:select(xxx,[{{'$1','$2'},[],['$_']}],N)),
+		I(I,N-1)
+	end,
+    I(I,2000),
+    J = fun(F,C,A) ->
+		case ets:select(C) of
+		    {L,C2} ->
+			F(F,C2,lists:reverse(L)++A);
+		    '$end_of_table' ->
+			lists:reverse(A)
+		end
+	end,
+    K = fun({L,C}) ->
+		J(J,C,lists:reverse(L))
+	end,
+    M = fun(_, _, 0) ->
+		ok;
+	   (F, What, N) ->
+		What =
+		    K(ets:select(xxx,[{{'$1','$2'},[],['$_']}],N)),
+		F(F, What, N-1)
+	end,
+    N = fun(HM) ->
+		What = ets:select(xxx,[{{'$1','$2'},[],['$_']}]),
+		What = lists:sort(What),
+		M(M, What, HM)
+	end,
+    N(2000),
+    ets:delete(xxx),
+    ets:delete(yyy).
 
 
 do_return_values() ->
-    ?line T = ets:new(xxx,[ordered_set]),
-    ?line U = ets:new(xxx,[]),
-    ?line '$end_of_table' = ets:select(T,[{'_',[],['$_']}],1),
-    ?line '$end_of_table' = ets:select(U,[{'_',[],['$_']}],1),
-    ?line ets:insert(T,{ett,1}),
-    ?line ets:insert(U,{ett,1}),
-    ?line {[{ett,1}],C1} = ets:select(T,[{'_',[],['$_']}],1),
-    ?line '$end_of_table' = ets:select(C1),
-    ?line {[{ett,1}],C2} = ets:select(U,[{'_',[],['$_']}],1),
-    ?line '$end_of_table' = ets:select(C2),
-    ?line {[{ett,1}],C3} = ets:select(T,[{'_',[],['$_']}],2),
-    ?line '$end_of_table' = ets:select(C3),
-    ?line {[{ett,1}],C4} = ets:select(U,[{'_',[],['$_']}],2),
-    ?line '$end_of_table' = ets:select(C4),
-    ?line E = fun(0,_)->ok;
-		 (N,F) -> 
-		      ?line ets:insert(T,{N,N rem 10}), 
-		      ?line ets:insert(U,{N,N rem 10}), 
-		      F(N-1,F) 
-	      end,
-    ?line E(10000,E),                                                          
-    ?line '$end_of_table' = ets:select(T,[{{hej, hopp},[],['$_']}],1),
-    ?line '$end_of_table' = ets:select(U,[{{hej,hopp},[],['$_']}],1),
-    ?line {[{ett,1}],CC1} = ets:select(T,[{{'$1','_'},[{is_atom, '$1'}],
-					  ['$_']}],1),
-    ?line '$end_of_table' = ets:select(CC1),
-    ?line {[{ett,1}],CC2} = ets:select(U,[{{'$1','_'},[{is_atom, '$1'}],
-					  ['$_']}],1),
-    ?line '$end_of_table' = ets:select(CC2),
-    ?line {[{ett,1}],CC3} = ets:select(T,[{{'$1','_'},[{is_atom, '$1'}],
-					  ['$_']}],2),
-    ?line '$end_of_table' = ets:select(CC3),
-    ?line {[{ett,1}],CC4} = ets:select(U,[{{'$1','_'},[{is_atom, '$1'}],
-					  ['$_']}],2),
-    ?line '$end_of_table' = ets:select(CC4),
-    ?line ets:delete(T),
-    ?line ets:delete(U),
-    ?line V = ets:new(xxx,[{keypos, 4}]),
-    ?line X = ets:new(xxx,[ordered_set, {keypos, 4}]),
-    ?line ets:insert(V,{1,1,1,ett}),
-    ?line ets:insert(X,{1,1,1,ett}),
-    ?line '$end_of_table' = ets:select(V,[{{1,1,1},[],['$_']}],1),
-    ?line '$end_of_table' = ets:select(X,[{{1,1,1},[],['$_']}],1),
-    ?line ets:delete(V),
-    ?line ets:delete(X),
+    T = ets:new(xxx,[ordered_set]),
+    U = ets:new(xxx,[]),
+    '$end_of_table' = ets:select(T,[{'_',[],['$_']}],1),
+    '$end_of_table' = ets:select(U,[{'_',[],['$_']}],1),
+    ets:insert(T,{ett,1}),
+    ets:insert(U,{ett,1}),
+    {[{ett,1}],C1} = ets:select(T,[{'_',[],['$_']}],1),
+    '$end_of_table' = ets:select(C1),
+    {[{ett,1}],C2} = ets:select(U,[{'_',[],['$_']}],1),
+    '$end_of_table' = ets:select(C2),
+    {[{ett,1}],C3} = ets:select(T,[{'_',[],['$_']}],2),
+    '$end_of_table' = ets:select(C3),
+    {[{ett,1}],C4} = ets:select(U,[{'_',[],['$_']}],2),
+    '$end_of_table' = ets:select(C4),
+    E = fun(0,_)->ok;
+	   (N,F) ->
+		ets:insert(T,{N,N rem 10}),
+		ets:insert(U,{N,N rem 10}),
+		F(N-1,F)
+	end,
+    E(10000,E),
+    '$end_of_table' = ets:select(T,[{{hej, hopp},[],['$_']}],1),
+    '$end_of_table' = ets:select(U,[{{hej,hopp},[],['$_']}],1),
+    {[{ett,1}],CC1} = ets:select(T,[{{'$1','_'},[{is_atom, '$1'}],
+				     ['$_']}],1),
+    '$end_of_table' = ets:select(CC1),
+    {[{ett,1}],CC2} = ets:select(U,[{{'$1','_'},[{is_atom, '$1'}],
+				     ['$_']}],1),
+    '$end_of_table' = ets:select(CC2),
+    {[{ett,1}],CC3} = ets:select(T,[{{'$1','_'},[{is_atom, '$1'}],
+				     ['$_']}],2),
+    '$end_of_table' = ets:select(CC3),
+    {[{ett,1}],CC4} = ets:select(U,[{{'$1','_'},[{is_atom, '$1'}],
+				     ['$_']}],2),
+    '$end_of_table' = ets:select(CC4),
+    ets:delete(T),
+    ets:delete(U),
+    V = ets:new(xxx,[{keypos, 4}]),
+    X = ets:new(xxx,[ordered_set, {keypos, 4}]),
+    ets:insert(V,{1,1,1,ett}),
+    ets:insert(X,{1,1,1,ett}),
+    '$end_of_table' = ets:select(V,[{{1,1,1},[],['$_']}],1),
+    '$end_of_table' = ets:select(X,[{{1,1,1},[],['$_']}],1),
+    ets:delete(V),
+    ets:delete(X),
     ok.
-    
-    
 
 
 
diff --git a/lib/stdlib/test/sets_SUITE.erl b/lib/stdlib/test/sets_SUITE.erl
index 972a812072..b866cb62e0 100644
--- a/lib/stdlib/test/sets_SUITE.erl
+++ b/lib/stdlib/test/sets_SUITE.erl
@@ -31,20 +31,19 @@
 	 is_set/1,fold/1,filter/1,
 	 take_smallest/1,take_largest/1, iterate/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -import(lists, [foldl/3,reverse/1]).
 
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?t:minutes(5)),
-    [{watchdog,Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,5}}].
 
 all() -> 
     [create, add_element, del_element, subtract,
@@ -107,9 +106,9 @@ add_element_del([H|T], M, S, Del, []) ->
     add_element_del(T, M, M(add_element, {H,S}), Del, [H]);
 add_element_del([H|T], M, S0, Del, Inserted) ->
     S1 = M(add_element, {H,S0}),
-    case random:uniform(3) of
+    case rand:uniform(3) of
 	1 ->
-	    OldEl = lists:nth(random:uniform(length(Inserted)), Inserted),
+	    OldEl = lists:nth(rand:uniform(length(Inserted)), Inserted),
 	    S = M(del_element, {OldEl,S1}),
 	    add_element_del(T, M, S, [OldEl|Del], [H|Inserted]);
 	_ ->
@@ -438,7 +437,7 @@ iterate_1(M) ->
     M(empty, []).
 
 iterate_2(M) ->
-    random:seed(1, 2, 42),
+    rand:seed(exsplus, {1,2,42}),
     iter_set(M, 1000).
 
 iter_set(_M, 0) ->
@@ -447,7 +446,7 @@ iter_set(M, N) ->
     L = [I || I <- lists:seq(1, N)],
     T = M(from_list, L),
     L = lists:reverse(iterate_set(M, T)),
-    R = random:uniform(N),
+    R = rand:uniform(N),
     S = lists:reverse(iterate_set(M, R, T)),
     S = [E || E <- L, E >= R],
     iter_set(M, N-1).
@@ -481,7 +480,7 @@ sets_mods() ->
 
 test_all(Tester) ->
     Res = [begin
-	       random:seed(1, 2, 42),
+	       rand:seed(exsplus, {1,2,42}),
 	       S = Tester(M),
 	       {M(size, S),lists:sort(M(to_list, S))}
 	   end || M <- sets_mods()],
@@ -492,7 +491,7 @@ test_all([{Low,High}|T], Tester) ->
 test_all([Sz|T], Tester) when is_integer(Sz) ->
     List = rnd_list(Sz),
     Res = [begin
-		     random:seed(19, 2, Sz),
+		     rand:seed(exsplus, {19,2,Sz}),
 		     S = Tester(List, M),
 		     {M(size, S),lists:sort(M(to_list, S))}
 		 end || M <- sets_mods()],
@@ -512,10 +511,10 @@ rnd_list(Sz) ->
     rnd_list_1(Sz, []).
     
 atomic_rnd_term() ->
-    case random:uniform(3) of
-	1 -> list_to_atom(integer_to_list($\s+random:uniform(94))++"rnd");
-	2 -> random:uniform();
-	3 -> random:uniform(50)-37
+    case rand:uniform(3) of
+	1 -> list_to_atom(integer_to_list($\s+rand:uniform(94))++"rnd");
+	2 -> rand:uniform();
+	3 -> rand:uniform(50)-37
     end.
 
 rnd_list_1(0, Acc) -> Acc;
@@ -543,7 +542,7 @@ remove_some(List0, P) ->
     end.
 
 remove_some([H|T], P, Acc) ->
-    case random:uniform() of
+    case rand:uniform() of
 	F when F < P ->				%Remove.
 	    remove_some(T, P, Acc);
 	_ ->
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index a9dd6b5817..af735218b9 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -52,28 +52,25 @@
 config(priv_dir,_) ->
     ".".
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -export([init_per_testcase/2, end_per_testcase/2]).
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(10)).
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
-    ?line OrigPath = code:get_path(),
-    ?line code:add_patha(?config(priv_dir,Config)),
-    [{orig_path,OrigPath}, {watchdog, Dog} | Config].
+    OrigPath = code:get_path(),
+    code:add_patha(proplists:get_value(priv_dir,Config)),
+    [{orig_path,OrigPath} | Config].
 
 end_per_testcase(_Case, Config) ->
-    ?line Dog = ?config(watchdog, Config),
-    ?line test_server:timetrap_cancel(Dog),
-    ?line OrigPath = ?config(orig_path,Config),
-    ?line code:set_path(OrigPath),
-    ?line application:unset_env(stdlib, restricted_shell),
-    ?line (catch code:purge(user_default)),
-    ?line (catch code:delete(user_default)),
+    OrigPath = proplists:get_value(orig_path,Config),
+    code:set_path(OrigPath),
+    application:unset_env(stdlib, restricted_shell),
+    (catch code:purge(user_default)),
+    (catch code:delete(user_default)),
     ok.
 -endif.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,10}}].
 
 all() -> 
     [forget, records, known_bugs, otp_5226, otp_5327,
@@ -112,101 +109,95 @@ end_per_group(_GroupName, Config) ->
 -record(state, {bin, reply, leader, unic = latin1}).
 
 
-start_restricted_from_shell(doc) ->
-    ["Test that a restricted shell can be started from the normal shell"];
-start_restricted_from_shell(suite) ->
-    [];
+%% Test that a restricted shell can be started from the normal shell.
 start_restricted_from_shell(Config) when is_list(Config) ->
-    ?line [{error,nofile}] = scan(<<"begin shell:start_restricted("
-				    "nonexisting_module) end.">>),
-    ?line Test = filename:join(?config(priv_dir, Config), 
-			       "test_restricted.erl"),
+    [{error,nofile}] = scan(<<"begin shell:start_restricted("
+			      "nonexisting_module) end.">>),
+    Test = filename:join(proplists:get_value(priv_dir, Config),
+			 "test_restricted.erl"),
     Contents = <<"-module(test_restricted).
                   -export([local_allowed/3, non_local_allowed/3]).
-                  local_allowed(m,[],State) ->
-                      {true,State};
-                  local_allowed(ugly,[],_State) ->
-                      non_conforming_reply;
-                  local_allowed(_,_,State) ->
-                      {false,State}.
-
-                  non_local_allowed({shell,stop_restricted},[],State) ->
-                      {true,State};
-                  non_local_allowed({erlang,'+'},[_],State) ->
-                      {true,State};
-                  non_local_allowed({erlang,'-'},[_,_],_State) ->
-                      non_conforming_reply;
-                  non_local_allowed({h, d}, [Arg], S) ->
-                      {{redirect, {erlang,hd}, [Arg]}, S};
-                  non_local_allowed(_,_,State) ->
-                      {false,State}.
-                 ">>,
-    ?line ok = compile_file(Config, Test, Contents, []),
-    ?line "exception exit: restricted shell starts now" = 
-	comm_err(<<"begin shell:start_restricted("
-			 "test_restricted) end.">>),
-    ?line {ok, test_restricted} = 
-	application:get_env(stdlib, restricted_shell),
-    ?line "Module" ++ _ = t({<<"begin m() end.">>, utf8}),
-    ?line "exception exit: restricted shell does not allow c(foo)" = 
-	comm_err(<<"begin c(foo) end.">>),
-    ?line "exception exit: restricted shell does not allow init:stop()" = 
-	comm_err(<<"begin init:stop() end.">>),
-    ?line "exception exit: restricted shell does not allow init:stop()" = 
-	comm_err(<<"begin F = fun() -> init:stop() end, F() end.">>),
-    ?line "exception error: an error occurred when evaluating an arithmetic expression" =
-	comm_err(<<"begin +a end.">>),
-    ?line "exception exit: restricted shell does not allow a + b" = 
-	comm_err(<<"begin a+b end.">>),
-    ?line "exception exit: restricted shell does not allow - b" = 
-	comm_err(<<"begin -b end.">>),
-    ?line "exception exit: restricted shell does not allow 1 + 2" = 
-	comm_err(<<"begin if atom(1 + 2> 0) -> 1; true -> 2 end end.">>),
-    ?line "exception exit: restricted shell does not allow 1 + 2" = 
-	comm_err(<<"begin if is_atom(1 + 2> 0) -> 1; true -> 2 end end.">>),
-    ?line "exception exit: restricted shell does not allow - 2" = 
-	comm_err(<<"begin if - 2 -> 1; true -> 2 end end.">>),
-    ?line "exception exit: restricted shell does not allow - 2" = 
-    comm_err(<<"begin if (- 2 > 0)  andalso true -> 1; true -> 2 end end.">>),
-    ?line "exception exit: restricted shell does not allow - 2" = 
-    comm_err(<<"begin if (- 2 > 0)  orelse true -> 1; true -> 2 end end.">>),
-    ?line "exception exit: restricted shell does not allow 1 + 2" = 
-        comm_err(<<"begin if 1 + 2 > 0 -> 1; true -> 2 end end.">>),
-    ?line "exception exit: restricted shell does not allow 1 + 2" = 
-   comm_err(<<"begin if erlang:is_atom(1 + 2> 0) -> 1; true -> 2 end end.">>),
-    ?line "exception exit: restricted shell does not allow is_integer(1)" = 
-        comm_err(<<"begin if is_integer(1) -> 1; true -> 2 end end.">>),
-    ?line "exception exit: restricted shell does not allow is_integer(1)" = 
-        comm_err(<<"begin if integer(1) -> 1; true -> 2 end end.">>),
-    ?line "exception exit: "
-          "restricted shell module returned bad value non_conforming_reply" =
-        comm_err(<<"ugly().">>),
-    ?line [one] = scan(<<"h:d([one,two]).">>),
-    ?line "exception exit: "
-          "restricted shell module returned bad value non_conforming_reply" =
-        comm_err(<<"1 - 2.">>),
-    ?line "exception exit: restricted shell stopped"=  
-	comm_err(<<"begin shell:stop_restricted() end.">>),
-    ?line undefined = 
-	application:get_env(stdlib, restricted_shell),
-    ok.
-
-start_restricted_on_command_line(doc) ->
-    ["Check restricted shell when started from the command line"];
-start_restricted_on_command_line(suite) ->
-    [];
+local_allowed(m,[],State) ->
+    {true,State};
+local_allowed(ugly,[],_State) ->
+    non_conforming_reply;
+local_allowed(_,_,State) ->
+    {false,State}.
+
+non_local_allowed({shell,stop_restricted},[],State) ->
+    {true,State};
+non_local_allowed({erlang,'+'},[_],State) ->
+    {true,State};
+non_local_allowed({erlang,'-'},[_,_],_State) ->
+    non_conforming_reply;
+non_local_allowed({h, d}, [Arg], S) ->
+    {{redirect, {erlang,hd}, [Arg]}, S};
+non_local_allowed(_,_,State) ->
+    {false,State}.
+">>,
+    ok = compile_file(Config, Test, Contents, []),
+"exception exit: restricted shell starts now" =
+comm_err(<<"begin shell:start_restricted("
+	   "test_restricted) end.">>),
+{ok, test_restricted} =
+application:get_env(stdlib, restricted_shell),
+"Module" ++ _ = t({<<"begin m() end.">>, utf8}),
+"exception exit: restricted shell does not allow c(foo)" =
+comm_err(<<"begin c(foo) end.">>),
+"exception exit: restricted shell does not allow init:stop()" =
+comm_err(<<"begin init:stop() end.">>),
+"exception exit: restricted shell does not allow init:stop()" =
+comm_err(<<"begin F = fun() -> init:stop() end, F() end.">>),
+"exception error: an error occurred when evaluating an arithmetic expression" =
+comm_err(<<"begin +a end.">>),
+"exception exit: restricted shell does not allow a + b" =
+comm_err(<<"begin a+b end.">>),
+"exception exit: restricted shell does not allow - b" =
+comm_err(<<"begin -b end.">>),
+"exception exit: restricted shell does not allow 1 + 2" =
+comm_err(<<"begin if atom(1 + 2> 0) -> 1; true -> 2 end end.">>),
+"exception exit: restricted shell does not allow 1 + 2" =
+comm_err(<<"begin if is_atom(1 + 2> 0) -> 1; true -> 2 end end.">>),
+"exception exit: restricted shell does not allow - 2" =
+comm_err(<<"begin if - 2 -> 1; true -> 2 end end.">>),
+"exception exit: restricted shell does not allow - 2" =
+comm_err(<<"begin if (- 2 > 0)  andalso true -> 1; true -> 2 end end.">>),
+"exception exit: restricted shell does not allow - 2" =
+comm_err(<<"begin if (- 2 > 0)  orelse true -> 1; true -> 2 end end.">>),
+"exception exit: restricted shell does not allow 1 + 2" =
+comm_err(<<"begin if 1 + 2 > 0 -> 1; true -> 2 end end.">>),
+"exception exit: restricted shell does not allow 1 + 2" =
+comm_err(<<"begin if erlang:is_atom(1 + 2> 0) -> 1; true -> 2 end end.">>),
+"exception exit: restricted shell does not allow is_integer(1)" =
+comm_err(<<"begin if is_integer(1) -> 1; true -> 2 end end.">>),
+"exception exit: restricted shell does not allow is_integer(1)" =
+comm_err(<<"begin if integer(1) -> 1; true -> 2 end end.">>),
+"exception exit: "
+"restricted shell module returned bad value non_conforming_reply" =
+comm_err(<<"ugly().">>),
+[one] = scan(<<"h:d([one,two]).">>),
+"exception exit: "
+"restricted shell module returned bad value non_conforming_reply" =
+comm_err(<<"1 - 2.">>),
+"exception exit: restricted shell stopped"=
+comm_err(<<"begin shell:stop_restricted() end.">>),
+undefined =
+application:get_env(stdlib, restricted_shell),
+ok.
+
+%% Check restricted shell when started from the command line.
 start_restricted_on_command_line(Config) when is_list(Config) ->
-    ?line {ok,Node} = start_node(shell_suite_helper_1,
-				 "-pa "++?config(priv_dir,Config)++ 
-				 " -stdlib restricted_shell foo"),
-    ?line "Warning! Restricted shell module foo not found: nofile"++_ = 
+    {ok,Node} = start_node(shell_suite_helper_1,
+			   "-pa "++proplists:get_value(priv_dir,Config)++
+			       " -stdlib restricted_shell foo"),
+    "Warning! Restricted shell module foo not found: nofile"++_ =
 	t({Node, <<"begin m() end.">>}),
-    ?line "exception exit: restricted shell does not allow m()" =
+    "exception exit: restricted shell does not allow m()" =
 	comm_err({Node, <<"begin m() end.">>}),
-    ?line [ok] = 
+    [ok] =
 	(catch scan({Node, <<"begin q() end.">>})),
-    ?line test_server:stop_node(Node),
-    ?line Test = filename:join(?config(priv_dir, Config), 
+    test_server:stop_node(Node),
+    Test = filename:join(proplists:get_value(priv_dir, Config),
 			       "test_restricted2.erl"),
     Contents = <<"-module(test_restricted2).
                   -export([local_allowed/3, non_local_allowed/3]).
@@ -222,36 +213,34 @@ start_restricted_on_command_line(Config) when is_list(Config) ->
                   non_local_allowed(_,_,State) ->
                       {false,State}.
                  ">>,
-    ?line ok = compile_file(Config, Test, Contents, []),
-    ?line {ok,Node2} = start_node(shell_suite_helper_2,
-				 "-pa "++?config(priv_dir,Config)++ 
+    ok = compile_file(Config, Test, Contents, []),
+    {ok,Node2} = start_node(shell_suite_helper_2,
+				 "-pa "++proplists:get_value(priv_dir,Config)++
 				 " -stdlib restricted_shell test_restricted2"),
-    ?line "Module" ++ _ = t({Node2,<<"begin m() end.">>, utf8}),
-    ?line "exception exit: restricted shell does not allow c(foo)" = 
+    "Module" ++ _ = t({Node2,<<"begin m() end.">>, utf8}),
+    "exception exit: restricted shell does not allow c(foo)" =
 	comm_err({Node2,<<"begin c(foo) end.">>}),
-    ?line "exception exit: restricted shell does not allow init:stop()" = 
+    "exception exit: restricted shell does not allow init:stop()" =
 	comm_err({Node2,<<"begin init:stop() end.">>}),
-    ?line "exception exit: restricted shell does not allow init:stop()" = 
+    "exception exit: restricted shell does not allow init:stop()" =
 	comm_err({Node2,<<"begin F = fun() -> init:stop() end, F() end.">>}),
-    ?line [Node2] = 
+    [Node2] =
 	scan({Node2, <<"begin erlang:node() end.">>}),
-    ?line [Node2] = 
+    [Node2] =
 	scan({Node2, <<"begin node() end.">>}),
-    ?line "exception exit: restricted shell stopped"=  
+    "exception exit: restricted shell stopped"=
 	comm_err({Node2,<<"begin shell:stop_restricted() end.">>}),
-    ?line [ok] = 
+    [ok] =
 	scan({Node2, <<"begin q() end.">>}),
-    ?line test_server:stop_node(Node2),
+    test_server:stop_node(Node2),
     ok.
 
-restricted_local(suite) ->
-    [];
-restricted_local(doc) ->
-    ["Tests calling local shell functions with spectacular arguments in restricted shell"];
+%% Tests calling local shell functions with spectacular arguments in
+%% restricted shell.
 restricted_local(Config) when is_list(Config) ->
-    ?line [{error,nofile}] = scan(<<"begin shell:start_restricted("
+    [{error,nofile}] = scan(<<"begin shell:start_restricted("
 				    "nonexisting_module) end.">>),
-    ?line Test = filename:join(?config(priv_dir, Config), 
+    Test = filename:join(proplists:get_value(priv_dir, Config),
 			       "test_restricted_local.erl"),
     Contents = <<"-module(test_restricted_local).
                   -export([local_allowed/3, non_local_allowed/3]).
@@ -271,8 +260,8 @@ restricted_local(Config) when is_list(Config) ->
                   non_local_allowed(_,_,State) ->
                       {false,State}.
                  ">>,
-    ?line ok = compile_file(Config, Test, Contents, []),
-    ?line Test2 = filename:join(?config(priv_dir, Config), 
+    ok = compile_file(Config, Test, Contents, []),
+    Test2 = filename:join(proplists:get_value(priv_dir, Config),
 			       "user_default.erl"),
     Contents2 = <<"-module(user_default).
                   -export([funkis/1,apple/1]).
@@ -283,117 +272,113 @@ restricted_local(Config) when is_list(Config) ->
                   apple(_) ->
                       apple.
                  ">>,
-    ?line ok = compile_file(Config, Test2, Contents2, []),
-    ?line "exception exit: restricted shell starts now" = 
+    ok = compile_file(Config, Test2, Contents2, []),
+    "exception exit: restricted shell starts now" =
 	comm_err(<<"begin shell:start_restricted("
 			 "test_restricted_local) end.">>),
-    ?line {ok, test_restricted_local} = 
+    {ok, test_restricted_local} =
 	application:get_env(stdlib, restricted_shell),
-    ?line "exception exit: restricted shell does not allow foo(" ++ _ = 
+    "exception exit: restricted shell does not allow foo(" ++ _ =
 	comm_err(<<"begin F=fun() -> hello end, foo(F) end.">>),
-    ?line "exception error: undefined shell command banan/1" = 
+    "exception error: undefined shell command banan/1" =
 	comm_err(<<"begin F=fun() -> hello end, banan(F) end.">>),
-    ?line "{error,"++_ = t(<<"begin F=fun() -> hello end, c(F) end.">>),
-    ?line "exception exit: restricted shell does not allow l(" ++ _ = 
+    "{error,"++_ = t(<<"begin F=fun() -> hello end, c(F) end.">>),
+    "exception exit: restricted shell does not allow l(" ++ _ =
 	comm_err(<<"begin F=fun() -> hello end, l(F) end.">>),
-    ?line "exception error: variable 'F' is unbound" = 
+    "exception error: variable 'F' is unbound" =
 	comm_err(<<"begin F=fun() -> hello end, f(F), F end.">>),
-    ?line [funkis] = 
+    [funkis] =
 	scan(<<"begin F=fun() -> hello end, funkis(F) end.">>),
-    ?line "exception exit: restricted shell does not allow apple(" ++ _ =
+    "exception exit: restricted shell does not allow apple(" ++ _ =
 	comm_err(<<"begin F=fun() -> hello end, apple(F) end.">>),
-    ?line "exception exit: restricted shell stopped"=  
+    "exception exit: restricted shell stopped"=
 	comm_err(<<"begin shell:stop_restricted() end.">>),
-    ?line undefined = 
+    undefined =
 	application:get_env(stdlib, restricted_shell),
-    ?line (catch code:purge(user_default)),
-    ?line true = (catch code:delete(user_default)),
+    (catch code:purge(user_default)),
+    true = (catch code:delete(user_default)),
     ok.
     
 
-forget(doc) ->
-    ["f/0 and f/1"];
-forget(suite) ->
-    [];
+%% f/0 and f/1.
 forget(Config) when is_list(Config) ->
     %% f/0
-    ?line [ok] = scan(<<"begin f() end.">>),
-    ?line "1: variable 'A' is unbound" = 
+    [ok] = scan(<<"begin f() end.">>),
+    "1: variable 'A' is unbound" =
         comm_err(<<"A = 3, f(), A.">>),
-    ?line [ok] = scan(<<"A = 3, A = f(), A.">>),
+    [ok] = scan(<<"A = 3, A = f(), A.">>),
 
     %% f/1
-    ?line [ok] = scan(<<"begin f(A) end.">>),
-    ?line "1: variable 'A' is unbound" = 
+    [ok] = scan(<<"begin f(A) end.">>),
+    "1: variable 'A' is unbound" =
         comm_err(<<"A = 3, f(A), A.">>),
-    ?line [ok] = scan(<<"A = 3, A = f(A), A.">>),
-    ?line "exception error: no function clause matching call to f/1" =
+    [ok] = scan(<<"A = 3, A = f(A), A.">>),
+    "exception error: no function clause matching call to f/1" =
         comm_err(<<"f(a).">>),
     ok.
 
-records(doc) ->
-    ["Test of the record support. OTP-5063."];
-records(suite) ->
-    [];
+%% Test of the record support. OTP-5063.
 records(Config) when is_list(Config) ->
     %% rd/2
-    ?line [{attribute,_,record,{bar,_}},ok] = 
+    [{attribute,_,record,{bar,_}},ok] =
         scan(<<"rd(foo,{bar}), 
                 rd(bar,{foo = (#foo{})#foo.bar}),
                 rl(bar).">>),
-    ?line "variable 'R' is unbound" = % used to work (before OTP-5878, R11B)
+    "variable 'R' is unbound" = % used to work (before OTP-5878, R11B)
         exit_string(<<"rd(foo,{bar}), 
                        R = #foo{},
                        rd(bar,{foo = R#foo.bar}).">>),
-    ?line "exception error: no function clause matching call to rd/2" = 
+    "exception error: no function clause matching call to rd/2" =
         comm_err(<<"rd({foo},{bar}).">>),
-    ?line "bad record declaration" = exit_string(<<"A = bar, rd(foo,A).">>),
-    ?line [foo] = scan(<<"begin rd(foo,{bar}) end.">>),
-    ?line "1: record foo undefined" = 
+    "bad record declaration" = exit_string(<<"A = bar, rd(foo,A).">>),
+    [foo] = scan(<<"begin rd(foo,{bar}) end.">>),
+    "1: record foo undefined" =
          comm_err(<<"begin rd(foo,{bar}), #foo{} end.">>),
-    ?line ['f o o'] = scan(<<"rd('f o o', {bar}).">>),
-    ?line [foo] = scan(<<"rd(foo,{bar}), rd(foo,{foo = #foo{}}).">>),
+    ['f o o'] = scan(<<"rd('f o o', {bar}).">>),
+    [foo] = scan(<<"rd(foo,{bar}), rd(foo,{foo = #foo{}}).">>),
 
     %% rf/0,1
-    ?line [_, {attribute,_,record,{foo,_}},ok] = 
+    [_, {attribute,_,record,{foo,_}},ok] =
          scan(<<"rf('_'). rd(foo,{bar}),rl().">>),
-    ?line "1: record foo undefined" = 
+    "1: record foo undefined" =
         comm_err(<<"rd(foo,{bar}), #foo{}, rf(foo), #foo{}.">>),
-    ?line [ok,{foo,undefined}] = 
+    [ok,{foo,undefined}] =
         scan(<<"rd(foo,{bar}), A = #foo{}, rf(foo). A.">>),
-    ?line [_] = scan(<<"begin rf() end.">>),
-    ?line [ok] = scan(<<"begin rf(foo) end.">>),
+    [_] = scan(<<"begin rf() end.">>),
+    [ok] = scan(<<"begin rf(foo) end.">>),
 
     %% rp/1
-    ?line "#foo{bar = undefined}.\nok.\n" = 
+    "#foo{bar = undefined}.\nok.\n" =
         t(<<"rd(foo,{bar}), rp(#foo{}).">>),
-    ?line [{foo,3,4,3},ok] = scan(<<"rd(foo,{a = 3, b}), rp({foo,3,4,3}).">>),
-    ?line "#foo{a = 12}.\nok.\n" = t(<<"rd(foo,{a = 3}), rp({foo,12}).">>),
-    ?line [{[{foo}],12},ok] = scan(<<"rd(foo,{a = 3}), rp({[{foo}],12}).">>),
+    [{foo,3,4,3},ok] = scan(<<"rd(foo,{a = 3, b}), rp({foo,3,4,3}).">>),
+    "#foo{a = 12}.\nok.\n" = t(<<"rd(foo,{a = 3}), rp({foo,12}).">>),
+    [{[{foo}],12},ok] = scan(<<"rd(foo,{a = 3}), rp({[{foo}],12}).">>),
 
     %% rr/1,2,3
     MS = ?MODULE_STRING,
     RR1 = "rr(" ++ MS ++ "). #state{}.",
-    ?line "[state]\n"
+    "[state]\n"
           "#state{bin = undefined,reply = undefined,leader = undefined,\n"
           "       unic = latin1}.\n" =
         t(RR1),
     RR2 = "rr(" ++ MS ++ ",[state]). #state{}.",
-    ?line "[state]\n"
+    "[state]\n"
           "#state{bin = undefined,reply = undefined,leader = undefined,\n"
           "       unic = latin1}.\n" =
         t(RR2),
     RR3 = "rr(" ++ MS ++ ",'_'). #state{}.",
-    ?line "[state]\n"
+    "[state]\n"
           "#state{bin = undefined,reply = undefined,leader = undefined,\n"
           "       unic = latin1}.\n" =
         t(RR3),
     RR4 = "rr(" ++ MS ++ ", '_', {d,test1}).",
-    ?line [[state]] = scan(RR4),
+    [[state]] = scan(RR4),
 
-    Test = filename:join(?config(priv_dir, Config), "test.erl"),
+    Test = filename:join(proplists:get_value(priv_dir, Config), "test.erl"),
     Contents = <<"-module(test).
-                  -record(state, {bin, reply, leader}).
+                  -record(state, {bin :: binary(),
+                                  reply = no,
+                                  leader = some :: atom()}).
 
                   -ifdef(test1).
                   -record(test1, {f}).
@@ -402,7 +387,7 @@ records(Config) when is_list(Config) ->
                   -ifdef(test2).
                   -record(test2, {g}).
                   -endif.">>,
-    ?line ok = file:write_file(Test, Contents),
+    ok = file:write_file(Test, Contents),
 
     RR5 = "rr(\"" ++ Test ++ "\", '_', {d,test1}), rl([test1,test2]).",
     A1 = erl_anno:new(1),
@@ -413,164 +398,155 @@ records(Config) when is_list(Config) ->
            "\", '_', [{d,test1},{d,test2,17}]), rl([test1,test2]).",
     [{attribute,A1,record,{test1,_}},{attribute,A1,record,{test2,_}},ok] =
         scan(RR7),
-    ?line PreReply = scan(<<"rr(prim_file).">>), % preloaded...
-    ?line true = is_list(PreReply),
-    ?line Dir = filename:join(?config(priv_dir, Config), "*.erl"),
-    ?line RR8 = "rp(rr(\"" ++ Dir ++ "\")).",
-    ?line [_,ok] = scan(RR8),
+    PreReply = scan(<<"rr(prim_file).">>), % preloaded...
+    true = is_list(PreReply),
+    Dir = filename:join(proplists:get_value(priv_dir, Config), "*.erl"),
+    RR8 = "rp(rr(\"" ++ Dir ++ "\")).",
+    [_,ok] = scan(RR8),
     file:delete(Test),
 
     RR1000 = "begin rr(" ++ MS ++ ") end.",
-    ?line [_] = scan(RR1000),
+    [_] = scan(RR1000),
     RR1001 = "begin rr(" ++ MS ++ ", state) end.",
-    ?line [_] = scan(RR1001),
+    [_] = scan(RR1001),
     RR1002 = "begin rr(" ++ MS ++ ", state,{i,'.'}) end.",
-    ?line [_] = scan(RR1002),
+    [_] = scan(RR1002),
 
-    ?line [{error,nofile}] = scan(<<"rr(not_a_module).">>),
-    ?line [{error,invalid_filename}] = scan(<<"rr({foo}).">>),
-    ?line [[]] = scan(<<"rr(\"not_a_file\").">>),
+    [{error,nofile}] = scan(<<"rr(not_a_module).">>),
+    [{error,invalid_filename}] = scan(<<"rr({foo}).">>),
+    [[]] = scan(<<"rr(\"not_a_file\").">>),
 
     %% using records
-    ?line [2] = scan(<<"rd(foo,{bar}), record_info(size, foo).">>),
-    ?line [true] = scan(<<"rd(foo,{bar}), is_record(#foo{}, foo).">>),
-    ?line [true] = scan(<<"rd(foo,{bar}), erlang:is_record(#foo{}, foo).">>),
-    ?line [true] = scan(<<"rd(foo,{bar}), 
+    [2] = scan(<<"rd(foo,{bar}), record_info(size, foo).">>),
+    [true] = scan(<<"rd(foo,{bar}), is_record(#foo{}, foo).">>),
+    [true] = scan(<<"rd(foo,{bar}), erlang:is_record(#foo{}, foo).">>),
+    [true] = scan(<<"rd(foo,{bar}),
                      fun() when record(#foo{},foo) -> true end().">>),
-    ?line [2] = scan(<<"rd(foo,{bar}), #foo.bar.">>),
-    ?line "#foo{bar = 17}.\n" = 
+    [2] = scan(<<"rd(foo,{bar}), #foo.bar.">>),
+    "#foo{bar = 17}.\n" =
         t(<<"rd(foo,{bar}), A = #foo{}, A#foo{bar = 17}.">>),
 
     %% test of is_record/2 in lc
-    ?line "[#foo{bar = 3}].\n" = 
+    "[#foo{bar = 3}].\n" =
         t(<<"rd(foo,{bar}), [X || X <- [#foo{bar=3},x,[],{a,b}],"
             "is_record(X, foo)].">>),
-    ?line "[x,[],{a,b}].\n" = 
+    "[x,[],{a,b}].\n" =
         t(<<"rd(foo,{bar}), [X || X <- [#foo{bar=3},x,[],{a,b}],"
             "not is_record(X, foo)].">>),
-    ?line "[#foo{bar = 3}].\n" = 
+    "[#foo{bar = 3}].\n" =
         t(<<"rd(foo,{bar}), [X || X <- [#foo{bar=3},x,[],{a,b}],"
             "begin is_record(X, foo) end].">>),
-    ?line "[x,[],{a,b}].\n" = 
+    "[x,[],{a,b}].\n" =
         t(<<"rd(foo,{bar}), [X || X <- [#foo{bar=3},x,[],{a,b}],"
             "begin not is_record(X, foo) end].">>),
 
-    ?line "[#foo{bar = 3},x,[],{a,b}].\n" = 
+    "[#foo{bar = 3},x,[],{a,b}].\n" =
         t(<<"rd(foo,{bar}), [X || X <- [#foo{bar=3},x,[],{a,b}],"
             "is_record(X, foo) or not is_binary(X)].">>),
-    ?line "[#foo{bar = 3},x,[],{a,b}].\n" = 
+    "[#foo{bar = 3},x,[],{a,b}].\n" =
         t(<<"rd(foo,{bar}), [X || X <- [#foo{bar=3},x,[],{a,b}],"
             "not is_record(X, foo) or not is_binary(X)].">>),
-    ?line "[#foo{bar = 3}].\n" = 
+    "[#foo{bar = 3}].\n" =
         t(<<"rd(foo,{bar}), [X || X <- [#foo{bar=3},x,[],{a,b}],"
             "is_record(X, foo) or is_reference(X)].">>),
-    ?line "[x,[],{a,b}].\n" = 
+    "[x,[],{a,b}].\n" =
         t(<<"rd(foo,{bar}), [X || X <- [#foo{bar=3},x,[],{a,b}],"
             "not is_record(X, foo) or is_reference(X)].">>),
 
-    ?line "[#foo{bar = 3},x,[],{a,b}].\n" = 
+    "[#foo{bar = 3},x,[],{a,b}].\n" =
         t(<<"rd(foo,{bar}), [X || X <- [#foo{bar=3},x,[],{a,b}],"
             "begin is_record(X, foo) or not is_binary(X) end].">>),
-    ?line "[#foo{bar = 3},x,[],{a,b}].\n" = 
+    "[#foo{bar = 3},x,[],{a,b}].\n" =
         t(<<"rd(foo,{bar}), [X || X <- [#foo{bar=3},x,[],{a,b}],"
             "begin not is_record(X, foo) or not is_binary(X) end].">>),
-    ?line "[#foo{bar = 3}].\n" = 
+    "[#foo{bar = 3}].\n" =
         t(<<"rd(foo,{bar}), [X || X <- [#foo{bar=3},x,[],{a,b}],"
             "begin is_record(X, foo) or is_reference(X) end].">>),
-    ?line "[x,[],{a,b}].\n" = 
+    "[x,[],{a,b}].\n" =
         t(<<"rd(foo,{bar}), [X || X <- [#foo{bar=3},x,[],{a,b}],"
             "begin not is_record(X, foo) or is_reference(X) end].">>),
 
-    ?line [ok] = 
+    [ok] =
         scan(<<"rd(a,{}), is_record({a},a) andalso true, b().">>),
     
     %% nested record defs
-    ?line "#b{a = #a{}}.\n" = t(<<"rd(a,{}), rd(b, {a = #a{}}), #b{}.">>),
+    "#b{a = #a{}}.\n" = t(<<"rd(a,{}), rd(b, {a = #a{}}), #b{}.">>),
 
-    ?line [ok,ok,ok] = scan(<<"rf('_'), rp(rp(rl(rf(rf(rf(rl())))))).">>),
+    [ok,ok,ok] = scan(<<"rf('_'), rp(rp(rl(rf(rf(rf(rl())))))).">>),
 
     ok.
 
-known_bugs(doc) ->
-    ["Known bugs."];
-known_bugs(suite) ->
-    [];
+%% Known bugs.
 known_bugs(Config) when is_list(Config) ->
     %% erl_eval:merge_bindings/2 cannot handle _removal_ of bindings.
-    ?line [3] = scan(<<"A = 3, length(begin f(A), [3] end), A.">>),
+    [3] = scan(<<"A = 3, length(begin f(A), [3] end), A.">>),
     ok.
 
-otp_5226(doc) ->
-    ["OTP-5226. Wildcards accepted when reading BEAM files using rr/1,2,3."];
-otp_5226(suite) ->
-    [];
+%% OTP-5226. Wildcards accepted when reading BEAM files using rr/1,2,3.
 otp_5226(Config) when is_list(Config) ->
     Test1 = <<"-module(test1).
                -record('_test1', {a,b}).">>,
     Test2 = <<"-module(test2).
                -record('_test2', {c,d}).">>,
-    ?line File1 = filename("test1.erl", Config),
-    ?line File2 = filename("test2.erl", Config),
-    ?line Beam = filename("*.beam", Config),
-    ?line ok = compile_file(Config, File1, Test1, [no_debug_info]),
-    ?line ok = compile_file(Config, File2, Test2, [no_debug_info]),
-    RR = "rr(\"" ++ Beam ++ "\").",
-    ?line [Recs] = scan(RR),
-    ?line true = lists:member('_test1', Recs),
-    ?line true = lists:member('_test2', Recs),
-    file:delete(filename("test1.beam", Config)),
-    file:delete(filename("test2.beam", Config)),
-    file:delete(File1),
-    file:delete(File2),
-    ok.
-
-otp_5327(doc) ->
-    ["OTP-5226. Test of eval_bits, mostly."];
-otp_5327(suite) ->
-    [];
+    File1 = filename("test1.erl", Config),
+	      File2 = filename("test2.erl", Config),
+	      Beam = filename("*.beam", Config),
+	      ok = compile_file(Config, File1, Test1, [no_debug_info]),
+	      ok = compile_file(Config, File2, Test2, [no_debug_info]),
+	      RR = "rr(\"" ++ Beam ++ "\").",
+	      [Recs] = scan(RR),
+	      true = lists:member('_test1', Recs),
+	      true = lists:member('_test2', Recs),
+	      file:delete(filename("test1.beam", Config)),
+	      file:delete(filename("test2.beam", Config)),
+	      file:delete(File1),
+	      file:delete(File2),
+	      ok.
+
+%% OTP-5226. Test of eval_bits, mostly.
 otp_5327(Config) when is_list(Config) ->
-    ?line "exception error: bad argument" = 
+    "exception error: bad argument" =
         comm_err(<<"<<\"hej\":default>>.">>),
-    ?line <<"abc">> = 
+    <<"abc">> =
         erl_parse:normalise({bin,1,[{bin_element,1,{string,1,"abc"},
-                                    default,default}]}),
-    ?line [<<"abc">>] = scan(<<"<<(<<\"abc\">>):3/binary>>.">>),
-    ?line [<<"abc">>] = scan(<<"<<(<<\"abc\">>)/binary>>.">>),
-    ?line "exception error: bad argument" = 
+				     default,default}]}),
+    [<<"abc">>] = scan(<<"<<(<<\"abc\">>):3/binary>>.">>),
+    [<<"abc">>] = scan(<<"<<(<<\"abc\">>)/binary>>.">>),
+    "exception error: bad argument" =
         comm_err(<<"<<(<<\"abc\">>):4/binary>>.">>),
-    ?line true = byte_size(hd(scan("<<3.14:64/float>>."))) =:= 8,
-    ?line true = byte_size(hd(scan("<<3.14:32/float>>."))) =:= 4,
-    ?line "exception error: bad argument" = 
+    true = byte_size(hd(scan("<<3.14:64/float>>."))) =:= 8,
+    true = byte_size(hd(scan("<<3.14:32/float>>."))) =:= 4,
+    "exception error: bad argument" =
         comm_err(<<"<<3.14:128/float>>.">>),
-    ?line "exception error: bad argument" = 
+    "exception error: bad argument" =
         comm_err(<<"<<10:default>>.">>),
-    ?line [<<98,1:1>>] = scan(<<"<<3:3,5:6>>.">>),
-    ?line {'EXIT',{badarg,_}} = 
+    [<<98,1:1>>] = scan(<<"<<3:3,5:6>>.">>),
+    {'EXIT',{badarg,_}} =
         (catch erl_parse:normalise({bin,1,[{bin_element,1,{integer,1,17},
                                             {atom,1,all},
                                             default}]})),
-    ?line [<<-20/signed>>] = scan(<<"<<-20/signed>> = <<-20>>.">>),
-    ?line [<<-300:16/signed>>] = 
-             scan(<<"<<-300:16/signed>> = <<-300:16>>.">>),
-    ?line [<<-1000:24/signed>>] = 
-             scan(<<"<<-1000:24/signed>> = <<-1000:24>>.">>),
-    ?line [<<-(1 bsl 29):32/signed>>] = 
+    [<<-20/signed>>] = scan(<<"<<-20/signed>> = <<-20>>.">>),
+    [<<-300:16/signed>>] =
+	scan(<<"<<-300:16/signed>> = <<-300:16>>.">>),
+    [<<-1000:24/signed>>] =
+	scan(<<"<<-1000:24/signed>> = <<-1000:24>>.">>),
+    [<<-(1 bsl 29):32/signed>>] =
         scan(<<"<<-(1 bsl 29):32/signed>> = <<-(1 bsl 29):32>>.">>),
 
-    ?line "exception error: no match of right hand side value <<0,0,0>>" = 
+    "exception error: no match of right hand side value <<0,0,0>>" =
         comm_err(<<"<<B:3/unit:7-binary,_/binary>> = <<0:24>>.">>),
-    ?line true = [<<103133:64/float>>] =:= 
+    true = [<<103133:64/float>>] =:=
         scan(<<"<<103133:64/float>> = <<103133:64/float>>.">>),
-    ?line true = [<<103133.0:64/float>>] =:= 
+    true = [<<103133.0:64/float>>] =:=
         scan(<<"<<103133.0:64/float>> = <<103133:64/float>>.">>),
-    ?line true = [<<103133:64/float>>] =:= scan(<<"<<103133:64/float>>.">>),
+    true = [<<103133:64/float>>] =:= scan(<<"<<103133:64/float>>.">>),
     Int = 17,
-    ?line true = [<<Int:64/float>>] =:= scan(<<"Int = 17, <<Int:64/float>>.">>),
-    ?line "exception error: no match of right hand side value" ++ _ = 
+    true = [<<Int:64/float>>] =:= scan(<<"Int = 17, <<Int:64/float>>.">>),
+    "exception error: no match of right hand side value" ++ _ =
         comm_err(<<"<<103133:64/binary>> = <<103133:64/float>>.">>),
-    ?line "exception error: interpreted function with arity 1 called with two arguments" = 
+    "exception error: interpreted function with arity 1 called with two arguments" =
         comm_err(<<"(fun(X) -> X end)(a,b).">>),
-    ?line {'EXIT', {{illegal_pattern,_}, _}} =
+    {'EXIT', {{illegal_pattern,_}, _}} =
         (catch evaluate("<<A:a>> = <<17:32>>.", [])),
     C = <<"
          <<A:4,B:4,C:4,D:4,E:4,F:4>> = <<\"hej\">>,
@@ -579,60 +555,54 @@ otp_5327(Config) when is_list(Config) ->
             _ -> 2
          end.
         ">>,
-    ?line 1 = evaluate(C, []),
+    1 = evaluate(C, []),
     %% unbound_var would be nicer...
-    ?line {'EXIT',{{illegal_pattern,_},_}} = 
+    {'EXIT',{{illegal_pattern,_},_}} =
         (catch evaluate(<<"<<A:B>> = <<17:32>>.">>, [])),
     %% undefined_bittype is turned into badmatch:
-    ?line {'EXIT',{{badmatch,<<17:32>>},_}} = 
+    {'EXIT',{{badmatch,<<17:32>>},_}} =
         (catch evaluate(<<"<<A/apa>> = <<17:32>>.">>, [])),
-    ?line {'EXIT',_} = 
+    {'EXIT',_} =
         (catch evaluate(<<"<<17/binary-unit:8-unit:16>>.">>, [])),
-    ?line {'EXIT',_} = 
+    {'EXIT',_} =
         (catch evaluate(<<"<<17:32/unsigned-signed>> = <<17:32>>.">>, [])),
-    ?line {'EXIT',_} = 
+    {'EXIT',_} =
         (catch evaluate(<<"<<17:32/unsigned-signed>>.">>, [])),
-    ?line <<17:32>> = evaluate(<<"<<17:32/signed-signed>>.">>, []),
-    ?line {'EXIT',_} = 
+    <<17:32>> = evaluate(<<"<<17:32/signed-signed>>.">>, []),
+    {'EXIT',_} =
         (catch evaluate(<<"<<32/unit:8>>.">>, [])),
     ok.
 
-otp_5435(doc) ->
-    ["OTP-5435. sys_pre_expand not in the path."];
-otp_5435(suite) ->
-    [];
+%% OTP-5435. sys_pre_expand not in the path.
 otp_5435(Config) when is_list(Config) ->
-    ?line true = <<103133:64/float>> =:= 
+    true = <<103133:64/float>> =:=
         evaluate(<<"<<103133:64/float>> = <<103133:64/float>>.">>, []),
-    ?line true = <<103133.0:64/float>> =:= 
+    true = <<103133.0:64/float>> =:=
         evaluate(<<"<<103133.0:64/float>> = <<103133:64/float>>.">>, []),
-    ?line true = is_alive(),
-    ?line {ok, Node} = start_node(shell_SUITE_otp_5435),
-    ?line ok = rpc:call(Node, ?MODULE, otp_5435_2, []),
-    ?line ?t:stop_node(Node),
+    true = is_alive(),
+    {ok, Node} = start_node(shell_SUITE_otp_5435),
+    ok = rpc:call(Node, ?MODULE, otp_5435_2, []),
+    test_server:stop_node(Node),
     ok.
-             
+
 start_node(Name) ->
-    ?line PA = filename:dirname(code:which(?MODULE)),
-    ?t:start_node(Name, slave, [{args, "-pa " ++ PA}]).
+    PA = filename:dirname(code:which(?MODULE)),
+    test_server:start_node(Name, slave, [{args, "-pa " ++ PA}]).
 
 otp_5435_2() ->
-    ?line true = code:del_path(compiler),
+    true = code:del_path(compiler),
     %% sys_pre_expand can no longer be found
     %% OTP-5876. But erl_expand_records can!
-    ?line [{attribute,_,record,{bar,_}},ok] = 
+    [{attribute,_,record,{bar,_}},ok] =
         scan(<<"rd(foo,{bar}), 
                 rd(bar,{foo = (#foo{})#foo.bar}),
-                rl(bar).">>),
+	       rl(bar).">>),
     ok.
 
-otp_5195(doc) ->
-    ["OTP-5195. QLC, mostly."];
-otp_5195(suite) ->
-    [];
+%% OTP-5195. QLC, mostly.
 otp_5195(Config) when is_list(Config) ->
     %% QLC. It was easier to put these cases here than in qlc_SUITE.
-    ?line "[#a{b = undefined}].\n" = 
+    "[#a{b = undefined}].\n" =
         t(<<"rd(a,{b}), qlc:e(qlc:q([X || X <- [#a{}],is_record(X, a)])).">>),
 
     %% An experimental shell used to translate error tuples:
@@ -640,570 +610,556 @@ otp_5195(Config) when is_list(Config) ->
     %% "list expression\".\n" = 
     %%    t(<<"qlc:q([X || X <- [{a}], Y <- [X]]).">>),
     %% Same as last one (if the shell does not translate error tuples):
-    ?line [{error,qlc,{1,qlc,{used_generator_variable,'X'}}}] = 
+    [{error,qlc,{1,qlc,{used_generator_variable,'X'}}}] =
         scan(<<"qlc:q([X || X <- [{a}], Y <- [X]]).">>),
-    ?line {error,qlc,{1,qlc,{used_generator_variable,'X'}}} = 
+    {error,qlc,{1,qlc,{used_generator_variable,'X'}}} =
         evaluate(<<"qlc:q([X || X <- [{a}], Y <- [X]]).">>, []),
     Ugly = <<"qlc:e(qlc:q([X || X <- qlc:append([[1,2,3],ugly()])])).">>,
-    ?line "undefined shell command ugly/0" = error_string(Ugly),
-    ?line {'EXIT',{undef,_}} = (catch evaluate(Ugly, [])),
+    "undefined shell command ugly/0" = error_string(Ugly),
+    {'EXIT',{undef,_}} = (catch evaluate(Ugly, [])),
 
     V_1 = <<"qlc:e(qlc:q([X || X <- qlc:append([[1,2,3],v(-1)])])).">>,
-    ?line "- 1: command not found" = comm_err(V_1),
-    ?line {'EXIT', {undef,_}} = (catch evaluate(V_1, [])),
+    "- 1: command not found" = comm_err(V_1),
+    {'EXIT', {undef,_}} = (catch evaluate(V_1, [])),
 
-    ?line "1\n2\n3\n3.\n" = 
+    "1\n2\n3\n3.\n" =
         t(<<"1. 2. 3. 3 = fun(A) when A =:= 2 -> v(3) end(v(2)).">>),
 
-    ?line List4 = t(<<"[a,list]. A = [1,2]. "
-                      "qlc:q([X || X <- qlc:append(A, v(1))]). "
-                      "[1,2,a,list] = qlc:e(v(-1)).">>),
-    ?line "[1,2,a,list].\n" = string:substr(List4, string:len(List4)-13),
+    List4 = t(<<"[a,list]. A = [1,2]. "
+		"qlc:q([X || X <- qlc:append(A, v(1))]). "
+		"[1,2,a,list] = qlc:e(v(-1)).">>),
+    "[1,2,a,list].\n" = string:substr(List4, string:len(List4)-13),
 
     ok.
 
-otp_5915(doc) ->
-    ["OTP-5915. Strict record tests in guards."];
-otp_5915(suite) ->
-    [];
+%% OTP-5915. Strict record tests in guards.
 otp_5915(Config) when is_list(Config) ->
     C = <<"
         rd(r, {a = 4,b}),
-        rd(r1, {a,b}),
-        rd(r2, {a = #r1{},b,c=length([1,2,3])}),
-        rd(r3, {a = fun(_) -> #r1{} end(1), b}),
-
-        foo = fun(A) when A#r1.a > A#r1.b -> foo end(#r1{b = 2}),
-        0 = fun(A) when A#r2.a -> 0 end(#r2{a = true}),
-        1 = fun(A) when (#r1{a = A})#r1.a > 2 -> 1 end(3),
-        2 = fun(N) when ((#r2{a = #r{a = 4}, b = length([a,b,c])})#r2.a)#r.a > N ->
-                    2 end(2),
-        3 = fun(A) when (A#r2.a)#r1.a =:= 3 -> 3 end(#r2{a = #r1{a = 3}}),
-        ok = fun() ->
-                     F = fun(A) when record(A#r.a, r1) -> 4;
-                            (A) when record(A#r1.a, r1) -> 5
-                         end,
-                     5 = F(#r1{a = #r1{}}),
-                     4 = F(#r{a = #r1{}}),
-                     ok
-             end(),
-        3 = fun(A) when record(A#r1.a, r),
-                              (A#r1.a)#r.a > 3 -> 3
-            end(#r1{a = #r{a = 4}}),
-        7 = fun(A) when record(A#r3.a, r1) -> 7 end(#r3{}),
-        [#r1{a = 2,b = 1}] = 
-            fun() ->
-                    [A || A <- [#r1{a = 1, b = 3}, 
-                                #r2{a = 2,b = 1}, 
-                                #r1{a = 2, b = 1}],
-                          A#r1.a > 
-                              A#r1.b]
-            end(),
-        {[_],b} = 
-            fun(L) ->
+	  rd(r1, {a,b}),
+	  rd(r2, {a = #r1{},b,c=length([1,2,3])}),
+	  rd(r3, {a = fun(_) -> #r1{} end(1), b}),
+
+	  foo = fun(A) when A#r1.a > A#r1.b -> foo end(#r1{b = 2}),
+	  0 = fun(A) when A#r2.a -> 0 end(#r2{a = true}),
+	  1 = fun(A) when (#r1{a = A})#r1.a > 2 -> 1 end(3),
+	  2 = fun(N) when ((#r2{a = #r{a = 4}, b = length([a,b,c])})#r2.a)#r.a > N ->
+		      2 end(2),
+	  3 = fun(A) when (A#r2.a)#r1.a =:= 3 -> 3 end(#r2{a = #r1{a = 3}}),
+	  ok = fun() ->
+		       F = fun(A) when record(A#r.a, r1) -> 4;
+			      (A) when record(A#r1.a, r1) -> 5
+			   end,
+		       5 = F(#r1{a = #r1{}}),
+		       4 = F(#r{a = #r1{}}),
+		       ok
+	       end(),
+	  3 = fun(A) when record(A#r1.a, r),
+			  (A#r1.a)#r.a > 3 -> 3
+	      end(#r1{a = #r{a = 4}}),
+	  7 = fun(A) when record(A#r3.a, r1) -> 7 end(#r3{}),
+	  [#r1{a = 2,b = 1}] =
+	  fun() ->
+		  [A || A <- [#r1{a = 1, b = 3},
+			      #r2{a = 2,b = 1},
+			      #r1{a = 2, b = 1}],
+			A#r1.a >
+			    A#r1.b]
+	  end(),
+	  {[_],b} =
+	  fun(L) ->
                     %% A is checked only once:
-                    R1 = [{A,B} || A <- L, A#r1.a, B <- L, A#r1.b],
-                    A = #r2{a = true},
+		  R1 = [{A,B} || A <- L, A#r1.a, B <- L, A#r1.b],
+		  A = #r2{a = true},
                     %% A is checked again:
-                    B = if A#r1.a -> a; true -> b end,
-                    {R1,B}
-            end([#r1{a = true, b = true}]),
-
-        p = fun(A) when (A#r1.a =:= 2) or (A#r2.a =:= 1) -> o;
-               (_) -> p
-            end(#r1{a = 2}),
-
-        o = fun(A) when (A#r1.a =:= 2) orelse (A#r2.a =:= 1) -> o;
-               (_) -> p
-            end(#r1{a = 2}),
-
-        3 = fun(A) when A#r1.a > 3, 
-                        record(A, r1) -> 3
-            end(#r1{a = 5}),
-
-        ok = fun() ->
-                     F = fun(A) when (A#r2.a =:= 1) orelse (A#r2.a) -> 2;
-                            (A) when (A#r1.a =:= 1) orelse (A#r1.a) -> 1;
-                            (A) when (A#r2.a =:= 2) andalso (A#r2.b) -> 3
-                         end,
-                     1 = F(#r1{a = 1}),
-                     2 = F(#r2{a = true}),
-                     3 = F(#r2{a = 2, b = true}),
-                     ok
-             end(),
-
-        b = fun(A) when false or not (A#r.a =:= 1) -> a;
-               (_) -> b
-            end(#r1{a = 1}),
-        b = fun(A) when not (A#r.a =:= 1) or false -> a;
-               (_) -> b
-            end(#r1{a = 1}),
-
-        ok = fun() ->
-                     F = fun(A) when not (A#r.a =:= 1) -> yes;
-                            (_) -> no
-                         end,
-                     no = F(#r1{a = 2}),
-                     yes = F(#r{a = 2}),
-                     no = F(#r{a = 1}),
-                     ok
-             end(),
-
-        a = fun(A) when record(A, r),
-                        A#r.a =:= 1,
-                        A#r.b =:= 2 ->a
-            end(#r{a = 1, b = 2}),
-        a = fun(A) when erlang:is_record(A, r),
-                        A#r.a =:= 1,
-                        A#r.b =:= 2 -> a
-            end(#r{a = 1, b = 2}),
-        a = fun(A) when is_record(A, r),
-                        A#r.a =:= 1,
-                        A#r.b =:= 2 -> a
-            end(#r{a = 1, b = 2}),
-
-        nop = fun(A) when (is_record(A, r1) and (A#r1.a > 3)) or (A#r2.a < 1) ->
-                      japp;
-                 (_) ->
-                      nop
-              end(#r2{a = 0}),
-        nop = fun(A) when (A#r1.a > 3) or (A#r2.a < 1) -> japp;
-                 (_) ->
-                      nop
-              end(#r2{a = 0}),
-
-        ok = fun() ->
-                     F = fun(A) when (A#r1.a =:= 2) or (A#r2.a =:= 1) -> o;
-                            (_) -> p
-                         end,
-                     p = F(#r2{a = 1}),
-                     p = F(#r1{a = 2}),
-                     ok
-             end(),
-
-        ok = fun() ->
-                     F = fun(A) when fail, A#r1.a; A#r1.a -> ab;
-                            (_) -> bu
-                         end,
-                     ab = F(#r1{a = true}),
-                     bu = F(#r2{a = true}),
-                     ok
-             end(),
-
-        both = fun(A) when A#r.a, A#r.b -> both 
-               end(#r{a = true, b = true}),
-
-        ok = fun() ->
-                     F = fun(A, B) when ((A#r1.a) orelse (B#r2.a)) 
-                                        or (B#r2.b) or (A#r1.b) -> true;
-                            (_, _) -> false
-                         end,
-                     true = F(#r1{a = false, b = false}, #r2{a = false, b = true}),
-                     false = F(#r1{a = true, b = true}, #r1{a = false, b = true}),
-                     ok
-             end(),
-
-        ok.">>,
+		  B = if A#r1.a -> a; true -> b end,
+		  {R1,B}
+	  end([#r1{a = true, b = true}]),
+
+	  p = fun(A) when (A#r1.a =:= 2) or (A#r2.a =:= 1) -> o;
+		 (_) -> p
+	      end(#r1{a = 2}),
+
+	  o = fun(A) when (A#r1.a =:= 2) orelse (A#r2.a =:= 1) -> o;
+		 (_) -> p
+	      end(#r1{a = 2}),
+
+	  3 = fun(A) when A#r1.a > 3,
+			  record(A, r1) -> 3
+	      end(#r1{a = 5}),
+
+	  ok = fun() ->
+		       F = fun(A) when (A#r2.a =:= 1) orelse (A#r2.a) -> 2;
+			      (A) when (A#r1.a =:= 1) orelse (A#r1.a) -> 1;
+			      (A) when (A#r2.a =:= 2) andalso (A#r2.b) -> 3
+			   end,
+		       1 = F(#r1{a = 1}),
+		       2 = F(#r2{a = true}),
+		       3 = F(#r2{a = 2, b = true}),
+		       ok
+	       end(),
+
+	  b = fun(A) when false or not (A#r.a =:= 1) -> a;
+		 (_) -> b
+	      end(#r1{a = 1}),
+	  b = fun(A) when not (A#r.a =:= 1) or false -> a;
+		 (_) -> b
+	      end(#r1{a = 1}),
+
+	  ok = fun() ->
+		       F = fun(A) when not (A#r.a =:= 1) -> yes;
+			      (_) -> no
+			   end,
+		       no = F(#r1{a = 2}),
+		       yes = F(#r{a = 2}),
+		       no = F(#r{a = 1}),
+		       ok
+	       end(),
+
+	  a = fun(A) when record(A, r),
+			  A#r.a =:= 1,
+			  A#r.b =:= 2 ->a
+	      end(#r{a = 1, b = 2}),
+	  a = fun(A) when erlang:is_record(A, r),
+			  A#r.a =:= 1,
+			  A#r.b =:= 2 -> a
+	      end(#r{a = 1, b = 2}),
+	  a = fun(A) when is_record(A, r),
+			  A#r.a =:= 1,
+			  A#r.b =:= 2 -> a
+	      end(#r{a = 1, b = 2}),
+
+	  nop = fun(A) when (is_record(A, r1) and (A#r1.a > 3)) or (A#r2.a < 1) ->
+			japp;
+		   (_) ->
+			nop
+		end(#r2{a = 0}),
+	  nop = fun(A) when (A#r1.a > 3) or (A#r2.a < 1) -> japp;
+		   (_) ->
+			nop
+		end(#r2{a = 0}),
+
+	  ok = fun() ->
+		       F = fun(A) when (A#r1.a =:= 2) or (A#r2.a =:= 1) -> o;
+			      (_) -> p
+			   end,
+		       p = F(#r2{a = 1}),
+		       p = F(#r1{a = 2}),
+		       ok
+	       end(),
+
+	  ok = fun() ->
+		       F = fun(A) when fail, A#r1.a; A#r1.a -> ab;
+			      (_) -> bu
+			   end,
+		       ab = F(#r1{a = true}),
+		       bu = F(#r2{a = true}),
+		       ok
+	       end(),
+
+	  both = fun(A) when A#r.a, A#r.b -> both
+		 end(#r{a = true, b = true}),
+
+	  ok = fun() ->
+		       F = fun(A, B) when ((A#r1.a) orelse (B#r2.a))
+					  or (B#r2.b) or (A#r1.b) -> true;
+			      (_, _) -> false
+			   end,
+		       true = F(#r1{a = false, b = false}, #r2{a = false, b = true}),
+		       false = F(#r1{a = true, b = true}, #r1{a = false, b = true}),
+		       ok
+	       end(),
+
+	  ok.">>,
     [ok] = scan(C),
-    ok.
+	  ok.
 
-otp_5916(doc) ->
-    ["OTP-5916. erlang:is_record/3 allowed in guards."];
-otp_5916(suite) ->
-    [];
+%% OTP-5916. erlang:is_record/3 allowed in guards.
 otp_5916(Config) when is_list(Config) ->
     C = <<"
         rd(r1, {a,b}),
-        rd(r2, {a,b}),
+	  rd(r2, {a,b}),
 
-        true = if erlang:is_record(#r1{},r1,3) -> true; true ->  false end,
-        false = if erlang:is_record(#r2{},r1,3) -> true; true ->  false end,
+	  true = if erlang:is_record(#r1{},r1,3) -> true; true ->  false end,
+	  false = if erlang:is_record(#r2{},r1,3) -> true; true ->  false end,
 
-        true = if is_record(#r1{},r1,3) -> true; true ->  false end,
-        false = if is_record(#r2{},r1,3) -> true; true ->  false end,
+	  true = if is_record(#r1{},r1,3) -> true; true ->  false end,
+	  false = if is_record(#r2{},r1,3) -> true; true ->  false end,
 
-        ok.">>,
+	  ok.">>,
     [ok] = scan(C),
-    ok.
+	  ok.
 
 
-bs_match_misc_SUITE(doc) ->
-    ["OTP-5327. Adopted from parts of emulator/test/bs_match_misc_SUITE.erl."];
-bs_match_misc_SUITE(suite) -> 
-    [];
+%% OTP-5327. Adopted from parts of emulator/test/bs_match_misc_SUITE.erl.
 bs_match_misc_SUITE(Config) when is_list(Config) ->
     C = <<"
       F1 = fun() -> 3.1415 end,
 
-      FOne = fun() -> 1.0 end,
-
-      Fcmp = fun(F1, F2) when (F1 - F2) / F2 < 0.0000001 -> ok end,
-
-      MakeSubBin = fun(Bin0) ->
-          Sz = size(Bin0),
-          Bin1 = <<37,Bin0/binary,38,39>>,
-          <<_:8,Bin:Sz/binary,_:8,_:8>> = Bin1,
-          Bin
-      end,
-
-      MatchFloat = 
-            fun(Bin0, Fsz, I) ->
-                Bin = MakeSubBin(Bin0),
-                Bsz = size(Bin) * 8,
-                Tsz = Bsz - Fsz - I,
-                <<_:I,F:Fsz/float,_:Tsz>> = Bin,
-                F
-            end,
-
-      TFloat = fun() ->
-          F = F1(),
-          G = FOne(),
-
-          G = MatchFloat(<<63,128,0,0>>, 32, 0),
-          G = MatchFloat(<<63,240,0,0,0,0,0,0>>, 64, 0),
-
-          Fcmp(F, MatchFloat(<<F:32/float>>, 32, 0)),
-          Fcmp(F, MatchFloat(<<F:64/float>>, 64, 0)),
-          Fcmp(F, MatchFloat(<<1:1,F:32/float,127:7>>, 32, 1)),
-          Fcmp(F, MatchFloat(<<1:1,F:64/float,127:7>>, 64, 1)),
-          Fcmp(F, MatchFloat(<<1:13,F:32/float,127:3>>, 32, 13)),
-          Fcmp(F, MatchFloat(<<1:13,F:64/float,127:3>>, 64, 13))
-       end,
-       TFloat(),
-
-       F2 = fun() -> 2.7133 end,
-
-       MatchFloatLittle = fun(Bin0, Fsz, I) ->
-           Bin = MakeSubBin(Bin0),
-           Bsz = size(Bin) * 8,
-           Tsz = Bsz - Fsz - I,
-           <<_:I,F:Fsz/float-little,_:Tsz>> = Bin,
-           F
-       end,
-
-       LittleFloat = fun() ->
-          F = F2(),
-          G = FOne(),
-
-          G = MatchFloatLittle(<<0,0,0,0,0,0,240,63>>, 64, 0),
-          G = MatchFloatLittle(<<0,0,128,63>>, 32, 0),
-
-          Fcmp(F, MatchFloatLittle(<<F:32/float-little>>, 32, 0)),
-          Fcmp(F, MatchFloatLittle(<<F:64/float-little>>, 64, 0)),
-          Fcmp(F, MatchFloatLittle(<<1:1,F:32/float-little,127:7>>, 32, 1)),
-          Fcmp(F, MatchFloatLittle(<<1:1,F:64/float-little,127:7>>, 64, 1)),
-          Fcmp(F, MatchFloatLittle(<<1:13,F:32/float-little,127:3>>, 32, 13)),
-          Fcmp(F, MatchFloatLittle(<<1:13,F:64/float-little,127:3>>, 64, 13))
-       end,
-       LittleFloat(),
-
-       Sean1 = fun(<<B/binary>>) when size(B) < 4 -> small;
-                  (<<1, _B/binary>>) -> large
-               end,
-
-       Sean = fun() ->
-          small = Sean1(<<>>),
-          small = Sean1(<<1>>),
-          small = Sean1(<<1,2>>),
-          small = Sean1(<<1,2,3>>),
-          large = Sean1(<<1,2,3,4>>),
-
-          small = Sean1(<<4>>),
-          small = Sean1(<<4,5>>),
-          small = Sean1(<<4,5,6>>),
-          {'EXIT',{function_clause,_}} = (catch Sean1(<<4,5,6,7>>))
-       end,
-       Sean(),
-
-       NativeBig = fun() ->
-           <<37.33:64/native-float>> = <<37.33:64/big-float>>,
-           <<3974:16/native-integer>> = <<3974:16/big-integer>>
-       end,
-
-       NativeLittle = fun() ->
-           <<37869.32343:64/native-float>> = <<37869.32343:64/little-float>>,
-           <<7974:16/native-integer>> = <<7974:16/little-integer>>
-       end,
-
-       Native = fun() ->
-          <<3.14:64/native-float>> = <<3.14:64/native-float>>,
-          <<333:16/native>> = <<333:16/native>>,
-          <<38658345:32/native>> = <<38658345:32/native>>,
-          case <<1:16/native>> of
-              <<0,1>> -> NativeBig();
-              <<1,0>> -> NativeLittle()
-          end
-       end,
-       Native(),
-
-       Split = fun(<<N:16,B:N/binary,T/binary>>) -> {B,T} end,
-
-       Split2 = fun(N, <<N:16,B:N/binary,T/binary>>) -> {B,T} end,
-
-       Split_2 = fun(<<N0:8,N:N0,B:N/binary,T/binary>>) -> {B,T} end,
-
-       Skip = fun(<<N:8,_:N/binary,T/binary>>) -> T end,
-
-       SizeVar = fun() -> 
-           {<<45>>,<<>>} = Split(<<1:16,45>>),
-           {<<45>>,<<46,47>>} = Split(<<1:16,45,46,47>>),
-           {<<45,46>>,<<47>>} = Split(<<2:16,45,46,47>>),
-
-           {<<45,46,47>>,<<48>>} = Split_2(<<16:8,3:16,45,46,47,48>>),
-
-           {<<45,46>>,<<47>>} = Split2(2, <<2:16,45,46,47>>),
-           {'EXIT',{function_clause,_}} = 
-                   (catch Split2(42, <<2:16,45,46,47>>)),
-
-           <<\"cdef\">> = Skip(<<2:8,\"abcdef\">>)
+	  FOne = fun() -> 1.0 end,
+
+	  Fcmp = fun(F1, F2) when (F1 - F2) / F2 < 0.0000001 -> ok end,
+
+	  MakeSubBin = fun(Bin0) ->
+			       Sz = size(Bin0),
+			       Bin1 = <<37,Bin0/binary,38,39>>,
+			       <<_:8,Bin:Sz/binary,_:8,_:8>> = Bin1,
+			       Bin
+		       end,
+
+	  MatchFloat =
+	  fun(Bin0, Fsz, I) ->
+		  Bin = MakeSubBin(Bin0),
+		  Bsz = size(Bin) * 8,
+		  Tsz = Bsz - Fsz - I,
+		  <<_:I,F:Fsz/float,_:Tsz>> = Bin,
+		  F
+	  end,
+
+	  TFloat = fun() ->
+			   F = F1(),
+			   G = FOne(),
+
+			   G = MatchFloat(<<63,128,0,0>>, 32, 0),
+			   G = MatchFloat(<<63,240,0,0,0,0,0,0>>, 64, 0),
+
+			   Fcmp(F, MatchFloat(<<F:32/float>>, 32, 0)),
+			   Fcmp(F, MatchFloat(<<F:64/float>>, 64, 0)),
+			   Fcmp(F, MatchFloat(<<1:1,F:32/float,127:7>>, 32, 1)),
+			   Fcmp(F, MatchFloat(<<1:1,F:64/float,127:7>>, 64, 1)),
+			   Fcmp(F, MatchFloat(<<1:13,F:32/float,127:3>>, 32, 13)),
+			   Fcmp(F, MatchFloat(<<1:13,F:64/float,127:3>>, 64, 13))
+		   end,
+	  TFloat(),
+
+	  F2 = fun() -> 2.7133 end,
+
+	  MatchFloatLittle = fun(Bin0, Fsz, I) ->
+				     Bin = MakeSubBin(Bin0),
+				     Bsz = size(Bin) * 8,
+				     Tsz = Bsz - Fsz - I,
+				     <<_:I,F:Fsz/float-little,_:Tsz>> = Bin,
+				     F
+			     end,
+
+	  LittleFloat = fun() ->
+				F = F2(),
+				G = FOne(),
+
+				G = MatchFloatLittle(<<0,0,0,0,0,0,240,63>>, 64, 0),
+				G = MatchFloatLittle(<<0,0,128,63>>, 32, 0),
+
+				Fcmp(F, MatchFloatLittle(<<F:32/float-little>>, 32, 0)),
+				Fcmp(F, MatchFloatLittle(<<F:64/float-little>>, 64, 0)),
+				Fcmp(F, MatchFloatLittle(<<1:1,F:32/float-little,127:7>>, 32, 1)),
+				Fcmp(F, MatchFloatLittle(<<1:1,F:64/float-little,127:7>>, 64, 1)),
+				Fcmp(F, MatchFloatLittle(<<1:13,F:32/float-little,127:3>>, 32, 13)),
+				Fcmp(F, MatchFloatLittle(<<1:13,F:64/float-little,127:3>>, 64, 13))
+			end,
+	  LittleFloat(),
+
+	  Sean1 = fun(<<B/binary>>) when size(B) < 4 -> small;
+		     (<<1, _B/binary>>) -> large
+		  end,
+
+	  Sean = fun() ->
+			 small = Sean1(<<>>),
+			 small = Sean1(<<1>>),
+			 small = Sean1(<<1,2>>),
+			 small = Sean1(<<1,2,3>>),
+			 large = Sean1(<<1,2,3,4>>),
+
+			 small = Sean1(<<4>>),
+			 small = Sean1(<<4,5>>),
+			 small = Sean1(<<4,5,6>>),
+			 {'EXIT',{function_clause,_}} = (catch Sean1(<<4,5,6,7>>))
+		 end,
+	  Sean(),
+
+	  NativeBig = fun() ->
+			      <<37.33:64/native-float>> = <<37.33:64/big-float>>,
+			      <<3974:16/native-integer>> = <<3974:16/big-integer>>
+		      end,
+
+	  NativeLittle = fun() ->
+				 <<37869.32343:64/native-float>> = <<37869.32343:64/little-float>>,
+				 <<7974:16/native-integer>> = <<7974:16/little-integer>>
+			 end,
+
+	  Native = fun() ->
+			   <<3.14:64/native-float>> = <<3.14:64/native-float>>,
+			   <<333:16/native>> = <<333:16/native>>,
+			   <<38658345:32/native>> = <<38658345:32/native>>,
+			   case <<1:16/native>> of
+			       <<0,1>> -> NativeBig();
+			       <<1,0>> -> NativeLittle()
+			   end
+		   end,
+	  Native(),
+
+	  Split = fun(<<N:16,B:N/binary,T/binary>>) -> {B,T} end,
+
+	  Split2 = fun(N, <<N:16,B:N/binary,T/binary>>) -> {B,T} end,
+
+	  Split_2 = fun(<<N0:8,N:N0,B:N/binary,T/binary>>) -> {B,T} end,
+
+	  Skip = fun(<<N:8,_:N/binary,T/binary>>) -> T end,
+
+	  SizeVar = fun() ->
+			    {<<45>>,<<>>} = Split(<<1:16,45>>),
+			    {<<45>>,<<46,47>>} = Split(<<1:16,45,46,47>>),
+			    {<<45,46>>,<<47>>} = Split(<<2:16,45,46,47>>),
+
+			    {<<45,46,47>>,<<48>>} = Split_2(<<16:8,3:16,45,46,47,48>>),
+
+			    {<<45,46>>,<<47>>} = Split2(2, <<2:16,45,46,47>>),
+			    {'EXIT',{function_clause,_}} =
+				(catch Split2(42, <<2:16,45,46,47>>)),
+
+			    <<\"cdef\">> = Skip(<<2:8,\"abcdef\">>)
        end,
-       SizeVar(),
-
-       Wcheck = fun(<<A>>) when A==3-> ok1;
-                   (<<_,_:2/binary>>) -> ok2;
-                   (<<_>>) -> ok3;
-                   (Other) -> {error,Other}
-                end,
-
-       Wiger = fun()  ->
-           ok1 = Wcheck(<<3>>),
-           ok2 = Wcheck(<<1,2,3>>),
-           ok3 = Wcheck(<<4>>),
-           {error,<<1,2,3,4>>} = Wcheck(<<1,2,3,4>>),
-           {error,<<>>} = Wcheck(<<>>)
-       end,  
-       Wiger(),
-
-       ok.
-       ">>,
+			      SizeVar(),
+
+			      Wcheck = fun(<<A>>) when A==3-> ok1;
+					  (<<_,_:2/binary>>) -> ok2;
+					  (<<_>>) -> ok3;
+					  (Other) -> {error,Other}
+				       end,
+
+			      Wiger = fun()  ->
+					      ok1 = Wcheck(<<3>>),
+					      ok2 = Wcheck(<<1,2,3>>),
+					      ok3 = Wcheck(<<4>>),
+					      {error,<<1,2,3,4>>} = Wcheck(<<1,2,3,4>>),
+					      {error,<<>>} = Wcheck(<<>>)
+				      end,
+			      Wiger(),
+
+			      ok.
+">>,
     [ok] = scan(C),
-    ok = evaluate(C, []).
+ok = evaluate(C, []).
 
 %% This one is not run during night builds since it takes several minutes.
-bs_match_int_SUITE(doc) ->
-    ["OTP-5327. Adopted from emulator/test/bs_match_int_SUITE.erl."];
-bs_match_int_SUITE(suite) -> 
-    [];
+
+%% OTP-5327. Adopted from emulator/test/bs_match_int_SUITE.erl.
 bs_match_int_SUITE(Config) when is_list(Config) ->
     C = <<"
        FunClause = fun({'EXIT',{function_clause,_}}) -> ok end,
 
-       Mkbin = fun(L) when list(L) -> list_to_binary(L) end,
-
-       GetInt1 = fun(<<I:0>>) -> I;
-                    (<<I:8>>) -> I;
-                    (<<I:16>>) -> I;
-                    (<<I:24>>) -> I;
-                    (<<I:32>>) -> I
-                 end,
-
-       GetInt2 = fun(Bin0, I, F) when size(Bin0) < 4 ->
-                       Bin = <<0,Bin0/binary>>,
-                       I = GetInt1(Bin),
-                       F(Bin, I, F);
-                    (_, I, _F) -> I
-                 end,
-
-       GetInt = fun(Bin) ->
-                   I = GetInt1(Bin),
-                   GetInt2(Bin, I, GetInt2)
-                end,
-
-
-       Cmp128 = fun(<<I:128>>, I) -> equal;
-                   (_, _) -> not_equal
-                end,
-
-       Uint2 = fun([H|T], Acc, F) -> F(T, Acc bsl 8 bor H, F);
-                  ([], Acc, _F) -> Acc
-               end,
-
-       Uint = fun(L) -> Uint2(L, 0, Uint2) end,
-
-       Integer = fun() -> 
-           0 = GetInt(Mkbin([])),
-           0 = GetInt(Mkbin([0])),
-           42 = GetInt(Mkbin([42])),
-           255 = GetInt(Mkbin([255])),
-           256 = GetInt(Mkbin([1,0])),
-           257 = GetInt(Mkbin([1,1])),
-           258 = GetInt(Mkbin([1,2])),
-           258 = GetInt(Mkbin([1,2])),
-           65534 = GetInt(Mkbin([255,254])),
-           16776455 = GetInt(Mkbin([255,253,7])),
-           4245492555 = GetInt(Mkbin([253,13,19,75])),
-           4294967294 = GetInt(Mkbin([255,255,255,254])),
-           4294967295 = GetInt(Mkbin([255,255,255,255])),
-           Eight = [200,1,19,128,222,42,97,111],
-           Cmp128(Eight, Uint(Eight)),
-           FunClause(catch GetInt(Mkbin(lists:seq(1,5))))
-       end,
-       Integer(),
-
-       Sint = fun(Bin) ->
-                  case Bin of
-                      <<I:8/signed>> -> I;
-                      <<I:8/signed,_:3,_:5>> -> I;
-                      Other -> {no_match,Other}
-                  end
-              end,
-
-       SignedInteger = fun() ->
-           {no_match,_} = Sint(Mkbin([])),
-           {no_match,_} = Sint(Mkbin([1,2,3])),
-           127 = Sint(Mkbin([127])),
-           -1 = Sint(Mkbin([255])),
-           -128 = Sint(Mkbin([128])),
-           42 = Sint(Mkbin([42,255])),
-           127 = Sint(Mkbin([127,255]))
-       end,
-       SignedInteger(),
-
-       Dynamic5 = fun(Bin, S1, S2, A, B) ->
-                      case Bin of
-                          <<A:S1,B:S2>> ->
-                              % io:format(\"~p ~p ~p ~p~n\", [S1,S2,A,B]),
-                              ok;
-                          _Other -> erlang:error(badmatch, [Bin,S1,S2,A,B])
-                      end
-                   end,
-
-       Dynamic2 = fun(Bin, S1, F) when S1 >= 0 ->
-                       S2 = size(Bin) * 8 - S1,
-                       Dynamic5(Bin, S1, S2, (1 bsl S1) - 1, (1 bsl S2) - 1),
-                       F(Bin, S1-1, F);
-                     (_, _, _) -> ok
-                  end,
-
-       Dynamic = fun(Bin, S1) ->
-          Dynamic2(Bin, S1, Dynamic2)
-       end,
-
-       Dynamic(Mkbin([255]), 8),
-       Dynamic(Mkbin([255,255]), 16),
-       Dynamic(Mkbin([255,255,255]), 24),
-       Dynamic(Mkbin([255,255,255,255]), 32),
-           
-       BigToLittle4 = 
-           fun([B0,B1,B2,B3,B4,B5,B6,B7|T], N, Acc, F) when N >= 8 ->
-                      F(T, N-8, [B0,B1,B2,B3,B4,B5,B6,B7|Acc], F);
-              (List, N, Acc, _F) -> lists:sublist(List, 1, N) ++ Acc
-           end,
-
-       BigToLittle = 
-            fun(List, N) -> BigToLittle4(List, N, [], BigToLittle4) end,
-
-       ReversedSublist =
-             fun(_List, 0, Acc, _F) -> Acc;
-                ([H|T], N, Acc, F) -> F(T, N-1, [H|Acc], F)
-             end,
-    
-       TwoComplementAndReverse = 
-             fun([H|T], Carry, Acc, F) ->
-                      Sum = 1-H+Carry,
-                      F(T, Sum div 2, [Sum rem 2|Acc], F);
-                ([], Carry, Acc, _F) -> [Carry|Acc]
-             end,
-
-       MakeInt = fun(_List, 0, Acc, _F) -> Acc;
-                    ([H|T], N, Acc, F) -> F(T, N-1, Acc bsl 1 bor H, F)
-                 end,
-
-       MakeSignedInt = 
-             fun(_List, 0) -> 0;
-                ([0|_]=List, N) -> MakeInt(List, N, 0, MakeInt);
-                ([1|_]=List0, N) ->
-                    List1 = ReversedSublist(List0, N, [], ReversedSublist),
-                    List2 = TwoComplementAndReverse(List1, 1, [], 
-                                                    TwoComplementAndReverse),
-                    -MakeInt(List2, length(List2), 0, MakeInt)
-             end,
-    
-      BitsToList =
-           fun([H|T], 0, F) -> F(T, 16#80, F);
-              ([H|_]=List, Mask, F) ->
-                   [case H band Mask of
+	  Mkbin = fun(L) when list(L) -> list_to_binary(L) end,
+
+	  GetInt1 = fun(<<I:0>>) -> I;
+		       (<<I:8>>) -> I;
+		       (<<I:16>>) -> I;
+		       (<<I:24>>) -> I;
+		       (<<I:32>>) -> I
+		    end,
+
+	  GetInt2 = fun(Bin0, I, F) when size(Bin0) < 4 ->
+			    Bin = <<0,Bin0/binary>>,
+			    I = GetInt1(Bin),
+			    F(Bin, I, F);
+		       (_, I, _F) -> I
+		    end,
+
+	  GetInt = fun(Bin) ->
+			   I = GetInt1(Bin),
+			   GetInt2(Bin, I, GetInt2)
+		   end,
+
+
+	  Cmp128 = fun(<<I:128>>, I) -> equal;
+		      (_, _) -> not_equal
+		   end,
+
+	  Uint2 = fun([H|T], Acc, F) -> F(T, Acc bsl 8 bor H, F);
+		     ([], Acc, _F) -> Acc
+		  end,
+
+	  Uint = fun(L) -> Uint2(L, 0, Uint2) end,
+
+	  Integer = fun() ->
+			    0 = GetInt(Mkbin([])),
+			    0 = GetInt(Mkbin([0])),
+			    42 = GetInt(Mkbin([42])),
+			    255 = GetInt(Mkbin([255])),
+			    256 = GetInt(Mkbin([1,0])),
+			    257 = GetInt(Mkbin([1,1])),
+			    258 = GetInt(Mkbin([1,2])),
+			    258 = GetInt(Mkbin([1,2])),
+			    65534 = GetInt(Mkbin([255,254])),
+			    16776455 = GetInt(Mkbin([255,253,7])),
+			    4245492555 = GetInt(Mkbin([253,13,19,75])),
+			    4294967294 = GetInt(Mkbin([255,255,255,254])),
+			    4294967295 = GetInt(Mkbin([255,255,255,255])),
+			    Eight = [200,1,19,128,222,42,97,111],
+			    Cmp128(Eight, Uint(Eight)),
+			    FunClause(catch GetInt(Mkbin(lists:seq(1,5))))
+		    end,
+	  Integer(),
+
+	  Sint = fun(Bin) ->
+			 case Bin of
+			     <<I:8/signed>> -> I;
+			     <<I:8/signed,_:3,_:5>> -> I;
+			     Other -> {no_match,Other}
+			 end
+		 end,
+
+	  SignedInteger = fun() ->
+				  {no_match,_} = Sint(Mkbin([])),
+				  {no_match,_} = Sint(Mkbin([1,2,3])),
+				  127 = Sint(Mkbin([127])),
+				  -1 = Sint(Mkbin([255])),
+				  -128 = Sint(Mkbin([128])),
+				  42 = Sint(Mkbin([42,255])),
+				  127 = Sint(Mkbin([127,255]))
+			  end,
+	  SignedInteger(),
+
+	  Dynamic5 = fun(Bin, S1, S2, A, B) ->
+			     case Bin of
+				 <<A:S1,B:S2>> ->
+                              %% io:format(\"~p ~p ~p ~p~n\", [S1,S2,A,B]),
+				     ok;
+				 _Other -> erlang:error(badmatch, [Bin,S1,S2,A,B])
+			     end
+		     end,
+
+	  Dynamic2 = fun(Bin, S1, F) when S1 >= 0 ->
+			     S2 = size(Bin) * 8 - S1,
+			     Dynamic5(Bin, S1, S2, (1 bsl S1) - 1, (1 bsl S2) - 1),
+			     F(Bin, S1-1, F);
+			(_, _, _) -> ok
+		     end,
+
+	  Dynamic = fun(Bin, S1) ->
+			    Dynamic2(Bin, S1, Dynamic2)
+		    end,
+
+	  Dynamic(Mkbin([255]), 8),
+	  Dynamic(Mkbin([255,255]), 16),
+	  Dynamic(Mkbin([255,255,255]), 24),
+	  Dynamic(Mkbin([255,255,255,255]), 32),
+
+	  BigToLittle4 =
+	  fun([B0,B1,B2,B3,B4,B5,B6,B7|T], N, Acc, F) when N >= 8 ->
+		  F(T, N-8, [B0,B1,B2,B3,B4,B5,B6,B7|Acc], F);
+	     (List, N, Acc, _F) -> lists:sublist(List, 1, N) ++ Acc
+	  end,
+
+	  BigToLittle =
+	  fun(List, N) -> BigToLittle4(List, N, [], BigToLittle4) end,
+
+	  ReversedSublist =
+	  fun(_List, 0, Acc, _F) -> Acc;
+	     ([H|T], N, Acc, F) -> F(T, N-1, [H|Acc], F)
+	  end,
+
+	  TwoComplementAndReverse =
+	  fun([H|T], Carry, Acc, F) ->
+		  Sum = 1-H+Carry,
+		  F(T, Sum div 2, [Sum rem 2|Acc], F);
+	     ([], Carry, Acc, _F) -> [Carry|Acc]
+	  end,
+
+	  MakeInt = fun(_List, 0, Acc, _F) -> Acc;
+		       ([H|T], N, Acc, F) -> F(T, N-1, Acc bsl 1 bor H, F)
+		    end,
+
+	  MakeSignedInt =
+	  fun(_List, 0) -> 0;
+	     ([0|_]=List, N) -> MakeInt(List, N, 0, MakeInt);
+	     ([1|_]=List0, N) ->
+		  List1 = ReversedSublist(List0, N, [], ReversedSublist),
+		  List2 = TwoComplementAndReverse(List1, 1, [],
+						  TwoComplementAndReverse),
+		  -MakeInt(List2, length(List2), 0, MakeInt)
+	  end,
+
+	  BitsToList =
+	  fun([H|T], 0, F) -> F(T, 16#80, F);
+	     ([H|_]=List, Mask, F) ->
+		  [case H band Mask of
                        0 -> 0;
                        _ -> 1
-                    end | F(List, Mask bsr 1, F)];
-              ([], _, _F) -> []
-           end,
-
-       MoreDynamic3 = 
-            fun(Action, Bin, List, Bef, Aft, F) when Bef =< Aft ->
-                Action(Bin, List, Bef, Aft-Bef),
-                F(Action, Bin, List, Bef, Aft-1, F);
-               (_, _, _, _, _, _) -> ok
-            end,
-
-       MoreDynamic2 = 
-            fun(Action, Bin, [_|T]=List, Bef, F) ->
-                   MoreDynamic3(Action, Bin, List, Bef, size(Bin)*8, 
-                                MoreDynamic3),
-                   F(Action, Bin, T, Bef+1, F);
-                (_, _, [], _, _F) -> ok
-            end,
-
-       MoreDynamic1 = 
-            fun(Action, Bin) ->
-                   BitList = BitsToList(binary_to_list(Bin),16#80,BitsToList),
-                   MoreDynamic2(Action, Bin, BitList, 0, MoreDynamic2)
-            end,
-
-       MoreDynamic = fun() ->
-           % Unsigned big-endian numbers.
-           Unsigned  = fun(Bin, List, SkipBef, N) ->
-                               SkipAft = 8*size(Bin) - N - SkipBef,
-                               <<_:SkipBef,Int:N,_:SkipAft>> = Bin,
-                               Int = MakeInt(List, N, 0, MakeInt)
-                       end,
-           MoreDynamic1(Unsigned, erlang:md5(Mkbin([42]))),
+		   end | F(List, Mask bsr 1, F)];
+	     ([], _, _F) -> []
+	  end,
+
+	  MoreDynamic3 =
+	  fun(Action, Bin, List, Bef, Aft, F) when Bef =< Aft ->
+		  Action(Bin, List, Bef, Aft-Bef),
+		  F(Action, Bin, List, Bef, Aft-1, F);
+	     (_, _, _, _, _, _) -> ok
+	  end,
+
+	  MoreDynamic2 =
+	  fun(Action, Bin, [_|T]=List, Bef, F) ->
+		  MoreDynamic3(Action, Bin, List, Bef, size(Bin)*8,
+			       MoreDynamic3),
+		  F(Action, Bin, T, Bef+1, F);
+	     (_, _, [], _, _F) -> ok
+	  end,
+
+	  MoreDynamic1 =
+	  fun(Action, Bin) ->
+		  BitList = BitsToList(binary_to_list(Bin),16#80,BitsToList),
+		  MoreDynamic2(Action, Bin, BitList, 0, MoreDynamic2)
+	  end,
+
+	  MoreDynamic = fun() ->
+           %% Unsigned big-endian numbers.
+				Unsigned  = fun(Bin, List, SkipBef, N) ->
+						    SkipAft = 8*size(Bin) - N - SkipBef,
+						    <<_:SkipBef,Int:N,_:SkipAft>> = Bin,
+						    Int = MakeInt(List, N, 0, MakeInt)
+					    end,
+				MoreDynamic1(Unsigned, erlang:md5(Mkbin([42]))),
 
            %% Signed big-endian numbers.
-           Signed  = fun(Bin, List, SkipBef, N) ->
-                             SkipAft = 8*size(Bin) - N - SkipBef,
-                             <<_:SkipBef,Int:N/signed,_:SkipAft>> = Bin,
-                             case MakeSignedInt(List, N) of
-                                 Int -> ok;
-                                 Other ->
-                                     io:format(\"Bin = ~p,\", [Bin]),
+				Signed  = fun(Bin, List, SkipBef, N) ->
+						  SkipAft = 8*size(Bin) - N - SkipBef,
+						  <<_:SkipBef,Int:N/signed,_:SkipAft>> = Bin,
+						  case MakeSignedInt(List, N) of
+						      Int -> ok;
+						      Other ->
+							  io:format(\"Bin = ~p,\", [Bin]),
                                      io:format(\"SkipBef = ~p, N = ~p\", 
                                                [SkipBef,N]),
-                                     io:format(\"Expected ~p, got ~p\", 
+								    io:format(\"Expected ~p, got ~p\",
                                                [Int,Other])
-                             end
-                     end,
-           MoreDynamic1(Signed, erlang:md5(Mkbin([43]))),
+								    end
+								    end,
+								    MoreDynamic1(Signed, erlang:md5(Mkbin([43]))),
 
            %% Unsigned little-endian numbers.
-           UnsLittle  = fun(Bin, List, SkipBef, N) ->
-                                SkipAft = 8*size(Bin) - N - SkipBef,
-                                <<_:SkipBef,Int:N/little,_:SkipAft>> = Bin,
-                                Int = MakeInt(BigToLittle(List, N), N, 0, 
-                                              MakeInt)
-                        end,
-           MoreDynamic1(UnsLittle, erlang:md5(Mkbin([44]))),
+								    UnsLittle  = fun(Bin, List, SkipBef, N) ->
+											 SkipAft = 8*size(Bin) - N - SkipBef,
+											 <<_:SkipBef,Int:N/little,_:SkipAft>> = Bin,
+											 Int = MakeInt(BigToLittle(List, N), N, 0,
+												       MakeInt)
+										 end,
+								    MoreDynamic1(UnsLittle, erlang:md5(Mkbin([44]))),
 
            %% Signed little-endian numbers.
-           SignLittle  = fun(Bin, List, SkipBef, N) ->
-                                 SkipAft = 8*size(Bin) - N - SkipBef,
-                                 <<_:SkipBef,Int:N/signed-little,_:SkipAft>> = Bin,
-                                 Little = BigToLittle(List, N),
-                                 Int = MakeSignedInt(Little, N)
-                         end,
-           MoreDynamic1(SignLittle, erlang:md5(Mkbin([45])))
-       end,
-       MoreDynamic(),
-
-       ok.
-       ">>,
+								    SignLittle  = fun(Bin, List, SkipBef, N) ->
+											  SkipAft = 8*size(Bin) - N - SkipBef,
+											  <<_:SkipBef,Int:N/signed-little,_:SkipAft>> = Bin,
+											  Little = BigToLittle(List, N),
+											  Int = MakeSignedInt(Little, N)
+										  end,
+								    MoreDynamic1(SignLittle, erlang:md5(Mkbin([45])))
+								    end,
+								    MoreDynamic(),
+
+								    ok.
+">>,
     [ok] = scan(C),
-    ok = evaluate(C, []).
+ok = evaluate(C, []).
 
-bs_match_tail_SUITE(doc) ->
-    ["OTP-5327. Adopted from emulator/test/bs_match_tail_SUITE.erl."];
-bs_match_tail_SUITE(suite) -> 
-    [];
+%% OTP-5327. Adopted from emulator/test/bs_match_tail_SUITE.erl.
 bs_match_tail_SUITE(Config) when is_list(Config) ->
     C = <<"
           GetTailUsed = fun(<<A:1,T/binary>>) -> {A,T} end,
@@ -1211,13 +1167,13 @@ bs_match_tail_SUITE(Config) when is_list(Config) ->
           GetTailUnused = fun(<<A:15,_/binary>>) -> A end,
 
           GetDynTailUsed = fun(Bin, Sz) ->
-                              <<A:Sz,T/binary>> = Bin,
-                              {A,T}
+				   <<A:Sz,T/binary>> = Bin,
+				   {A,T}
                            end,
 
           GetDynTailUnused = fun(Bin, Sz) ->
-                                 <<A:Sz,_/binary>> = Bin,
-                                 A
+				     <<A:Sz,_/binary>> = Bin,
+				     A
                              end,
 
           Mkbin = fun(L) when list(L) -> list_to_binary(L) end,
@@ -1227,12 +1183,12 @@ bs_match_tail_SUITE(Config) when is_list(Config) ->
           TestZeroTail2 = fun(<<_A:4,_B:4>>) -> ok end,
 
           ZeroTail = fun() ->
-              7 = (catch TestZeroTail(Mkbin([7]))),
-              {'EXIT',{function_clause,_}} = 
-                   (catch TestZeroTail(Mkbin([1,2]))),
-              {'EXIT',{function_clause,_}} = 
-                   (catch TestZeroTail2(Mkbin([1,2,3])))
-          end,
+			     7 = (catch TestZeroTail(Mkbin([7]))),
+			     {'EXIT',{function_clause,_}} =
+				 (catch TestZeroTail(Mkbin([1,2]))),
+			     {'EXIT',{function_clause,_}} =
+				 (catch TestZeroTail2(Mkbin([1,2,3])))
+		     end,
           ZeroTail(),
 
           AlGetTailUsed = fun(<<A:16,T/binary>>) -> {A,T} end,
@@ -1240,45 +1196,42 @@ bs_match_tail_SUITE(Config) when is_list(Config) ->
           AlGetTailUnused = fun(<<A:16,_/binary>>) -> A end,
 
           Aligned = fun() ->
-            Tail1 = Mkbin([]),
-            {258,Tail1} = AlGetTailUsed(Mkbin([1,2])),
-            Tail2 = Mkbin(lists:seq(1, 127)),
-            {35091,Tail2} = AlGetTailUsed(Mkbin([137,19|Tail2])),
-
-            64896 = AlGetTailUnused(Mkbin([253,128])),
-            64895 = AlGetTailUnused(Mkbin([253,127|lists:seq(42, 255)])),
-
-            Tail3 = Mkbin(lists:seq(0, 19)),
-            {0,Tail1} = GetDynTailUsed(Tail1, 0),
-            {0,Tail3} = GetDynTailUsed(Mkbin([Tail3]), 0),
-            {73,Tail3} = GetDynTailUsed(Mkbin([73|Tail3]), 8),
-
-            0 = GetDynTailUnused(Mkbin([]), 0),
-            233 = GetDynTailUnused(Mkbin([233]), 8),
-            23 = GetDynTailUnused(Mkbin([23,22,2]), 8)
-          end,
+			    Tail1 = Mkbin([]),
+			    {258,Tail1} = AlGetTailUsed(Mkbin([1,2])),
+			    Tail2 = Mkbin(lists:seq(1, 127)),
+			    {35091,Tail2} = AlGetTailUsed(Mkbin([137,19|Tail2])),
+
+			    64896 = AlGetTailUnused(Mkbin([253,128])),
+			    64895 = AlGetTailUnused(Mkbin([253,127|lists:seq(42, 255)])),
+
+			    Tail3 = Mkbin(lists:seq(0, 19)),
+			    {0,Tail1} = GetDynTailUsed(Tail1, 0),
+			    {0,Tail3} = GetDynTailUsed(Mkbin([Tail3]), 0),
+			    {73,Tail3} = GetDynTailUsed(Mkbin([73|Tail3]), 8),
+
+			    0 = GetDynTailUnused(Mkbin([]), 0),
+			    233 = GetDynTailUnused(Mkbin([233]), 8),
+			    23 = GetDynTailUnused(Mkbin([23,22,2]), 8)
+		    end,
           Aligned(),
-    
+
           UnAligned = fun() ->
-            {'EXIT',{function_clause,_}} = 
-                   (catch GetTailUsed(Mkbin([42]))),
-            {'EXIT',{{badmatch,_},_}} = 
-                   (catch GetDynTailUsed(Mkbin([137]), 3)),
-            {'EXIT',{function_clause,_}} = 
-                   (catch GetTailUnused(Mkbin([42,33]))),
-            {'EXIT',{{badmatch,_},_}} = 
-                   (catch GetDynTailUnused(Mkbin([44]), 7))
-          end,
+			      {'EXIT',{function_clause,_}} =
+				  (catch GetTailUsed(Mkbin([42]))),
+			      {'EXIT',{{badmatch,_},_}} =
+				  (catch GetDynTailUsed(Mkbin([137]), 3)),
+			      {'EXIT',{function_clause,_}} =
+				  (catch GetTailUnused(Mkbin([42,33]))),
+			      {'EXIT',{{badmatch,_},_}} =
+				  (catch GetDynTailUnused(Mkbin([44]), 7))
+		      end,
           UnAligned(),
           ok.
-       ">>,
+">>,
     [ok] = scan(C),
-    ok = evaluate(C, []).
+ok = evaluate(C, []).
 
-bs_match_bin_SUITE(doc) ->
-    ["OTP-5327. Adopted from emulator/test/bs_match_bin_SUITE.erl."];
-bs_match_bin_SUITE(suite) -> 
-    [];
+%% OTP-5327. Adopted from emulator/test/bs_match_bin_SUITE.erl.
 bs_match_bin_SUITE(Config) when is_list(Config) ->
     ByteSplitBinary = 
         <<"ByteSplit = 
@@ -1288,252 +1241,249 @@ bs_match_bin_SUITE(Config) when is_list(Config) ->
                      <<B1:Sz1/binary,B2:Sz2/binary>> = B,
                      B1 = list_to_binary(lists:sublist(L, 1, Pos)),
                      B2 = list_to_binary(lists:nthtail(Pos, L)),
-                        Fun(L, B, Pos-1, Fun);
-                 (L, B, _, _Fun) -> ok
-             end,
-           Mkbin = fun(L) when list(L) -> list_to_binary(L) end,
-           L = lists:seq(0, 57),
-           B = Mkbin(L),
-           ByteSplit(L, B, size(B), ByteSplit),
-           Id = fun(I) -> I end,
-           MakeUnalignedSubBinary =
-             fun(Bin0) ->
-                     Bin1 = <<0:3,Bin0/binary,31:5>>,
-                     Sz = size(Bin0),
-                     <<0:3,Bin:Sz/binary,31:5>> = Id(Bin1),
-                     Bin
+		     Fun(L, B, Pos-1, Fun);
+		(L, B, _, _Fun) -> ok
              end,
-           Unaligned = MakeUnalignedSubBinary(B),
-           ByteSplit(L, Unaligned, size(Unaligned), ByteSplit),
-           ok.
-        ">>,
+	  Mkbin = fun(L) when list(L) -> list_to_binary(L) end,
+	  L = lists:seq(0, 57),
+	  B = Mkbin(L),
+	  ByteSplit(L, B, size(B), ByteSplit),
+	  Id = fun(I) -> I end,
+	  MakeUnalignedSubBinary =
+	  fun(Bin0) ->
+		  Bin1 = <<0:3,Bin0/binary,31:5>>,
+		  Sz = size(Bin0),
+		  <<0:3,Bin:Sz/binary,31:5>> = Id(Bin1),
+		  Bin
+	  end,
+	  Unaligned = MakeUnalignedSubBinary(B),
+	  ByteSplit(L, Unaligned, size(Unaligned), ByteSplit),
+	  ok.
+">>,
     [ok] = scan(ByteSplitBinary),
-    ok = evaluate(ByteSplitBinary, []),
-    BitSplitBinary = 
-        <<"Mkbin = fun(L) when list(L) -> list_to_binary(L) end,
+ok = evaluate(ByteSplitBinary, []),
+BitSplitBinary =
+<<"Mkbin = fun(L) when list(L) -> list_to_binary(L) end,
 
            MakeInt = 
-              fun(List, 0, Acc, _F) -> Acc;
-                 ([H|T], N, Acc, F) -> F(T, N-1, Acc bsl 1 bor H, F)
-              end,
-
-           MakeBinFromList = 
-               fun(List, 0, _F) -> Mkbin([]);
-                  (List, N, F) ->
-                    list_to_binary([MakeInt(List, 8, 0, MakeInt),
-		                    F(lists:nthtail(8, List), N-8, F)])
-               end,
-
-           BitSplitBinary3 = 
-                fun(Action, Bin, List, Bef, Aft, F) when Bef =< Aft ->
-                    Action(Bin, List, Bef, (Aft-Bef) div 8 * 8),
-                    F(Action, Bin, List, Bef, Aft-8, F);
-                   (_, _, _, _, _, _) -> ok 
-                end,
-
-           BitSplitBinary2 = 
-                fun(Action, Bin, [_|T]=List, Bef, F) ->
-                       BitSplitBinary3(Action, Bin, List, Bef, size(Bin)*8, 
-                                       BitSplitBinary3),
-                       F(Action, Bin, T, Bef+1, F);
-                   (Action, Bin, [], Bef, F) -> ok
-                end,
-
-           BitsToList =
-                fun([H|T], 0, F) -> F(T, 16#80, F);
-                   ([H|_]=List, Mask, F) ->
-                        [case H band Mask of
-                            0 -> 0;
-                            _ -> 1
-                         end | F(List, Mask bsr 1, F)];
-                   ([], _, _F) -> []
-                end,
-
-           BitSplitBinary1 = 
-                 fun(Action, Bin) ->
-                    BitList = BitsToList(binary_to_list(Bin), 16#80, 
-                                         BitsToList),
-                    BitSplitBinary2(Action, Bin, BitList, 0, BitSplitBinary2)
-                 end,
-
-           Fun = fun(Bin, List, SkipBef, N) ->
-                  SkipAft = 8*size(Bin) - N - SkipBef,
-                  <<I1:SkipBef,OutBin:N/binary-unit:1,I2:SkipAft>> = Bin,
-                  OutBin = MakeBinFromList(List, N, MakeBinFromList)
-           end,
-
-           BitSplitBinary1(Fun, erlang:md5(<<1,2,3>>)),
-           Id = fun(I) -> I end,
-           MakeUnalignedSubBinary =
-             fun(Bin0) ->
-                     Bin1 = <<0:3,Bin0/binary,31:5>>,
-                     Sz = size(Bin0),
-                     <<0:3,Bin:Sz/binary,31:5>> = Id(Bin1),
-                     Bin
-             end,
-           BitSplitBinary1(Fun, MakeUnalignedSubBinary(erlang:md5(<<1,2,3>>))),
-           ok.
-        ">>,
+  fun(List, 0, Acc, _F) -> Acc;
+     ([H|T], N, Acc, F) -> F(T, N-1, Acc bsl 1 bor H, F)
+  end,
+
+  MakeBinFromList =
+  fun(List, 0, _F) -> Mkbin([]);
+     (List, N, F) ->
+	  list_to_binary([MakeInt(List, 8, 0, MakeInt),
+			  F(lists:nthtail(8, List), N-8, F)])
+  end,
+
+  BitSplitBinary3 =
+  fun(Action, Bin, List, Bef, Aft, F) when Bef =< Aft ->
+	  Action(Bin, List, Bef, (Aft-Bef) div 8 * 8),
+	  F(Action, Bin, List, Bef, Aft-8, F);
+     (_, _, _, _, _, _) -> ok
+  end,
+
+  BitSplitBinary2 =
+  fun(Action, Bin, [_|T]=List, Bef, F) ->
+	  BitSplitBinary3(Action, Bin, List, Bef, size(Bin)*8,
+			  BitSplitBinary3),
+	  F(Action, Bin, T, Bef+1, F);
+     (Action, Bin, [], Bef, F) -> ok
+  end,
+
+  BitsToList =
+  fun([H|T], 0, F) -> F(T, 16#80, F);
+     ([H|_]=List, Mask, F) ->
+	  [case H band Mask of
+	       0 -> 0;
+	       _ -> 1
+	   end | F(List, Mask bsr 1, F)];
+     ([], _, _F) -> []
+  end,
+
+  BitSplitBinary1 =
+  fun(Action, Bin) ->
+	  BitList = BitsToList(binary_to_list(Bin), 16#80,
+			       BitsToList),
+	  BitSplitBinary2(Action, Bin, BitList, 0, BitSplitBinary2)
+  end,
+
+  Fun = fun(Bin, List, SkipBef, N) ->
+		SkipAft = 8*size(Bin) - N - SkipBef,
+		<<I1:SkipBef,OutBin:N/binary-unit:1,I2:SkipAft>> = Bin,
+		OutBin = MakeBinFromList(List, N, MakeBinFromList)
+	end,
+
+  BitSplitBinary1(Fun, erlang:md5(<<1,2,3>>)),
+  Id = fun(I) -> I end,
+  MakeUnalignedSubBinary =
+  fun(Bin0) ->
+	  Bin1 = <<0:3,Bin0/binary,31:5>>,
+	  Sz = size(Bin0),
+	  <<0:3,Bin:Sz/binary,31:5>> = Id(Bin1),
+	  Bin
+  end,
+  BitSplitBinary1(Fun, MakeUnalignedSubBinary(erlang:md5(<<1,2,3>>))),
+  ok.
+">>,
     [ok] = scan(BitSplitBinary),
-    ok = evaluate(BitSplitBinary, []).
+ok = evaluate(BitSplitBinary, []).
 
 -define(FAIL(Expr), "{'EXIT',{badarg,_}} = (catch " ??Expr ")").
 
 -define(COF(Int0),
         "(fun(Int) ->
                        true = <<Int:32/float>> =:= <<(float(Int)):32/float>>,
-                       true = <<Int:64/float>> =:= <<(float(Int)):64/float>>
-                   end)(Nonliteral(" ??Int0 ")),
-        true = <<" ??Int0 ":32/float>> =:= <<(float("??Int0")):32/float>>,
-        true = <<" ??Int0 ":64/float>> =:= <<(float("??Int0")):64/float>>").
+	true = <<Int:64/float>> =:= <<(float(Int)):64/float>>
+	    end)(Nonliteral(" ??Int0 ")),
+true = <<" ??Int0 ":32/float>> =:= <<(float("??Int0")):32/float>>,
+true = <<" ??Int0 ":64/float>> =:= <<(float("??Int0")):64/float>>").
 
 -define(COF64(Int0),
         "(fun(Int) ->
                        true = <<Int:64/float>> =:= <<(float(Int)):64/float>>
-                   end)(Nonliteral(" ??Int0 ")),
-        true = <<" ??Int0 ":64/float>> =:= <<(float("??Int0")):64/float>>").
+	    end)(Nonliteral(" ??Int0 ")),
+true = <<" ??Int0 ":64/float>> =:= <<(float("??Int0")):64/float>>").
 
-bs_construct_SUITE(doc) ->
-    ["OTP-5327. Adopted from parts of emulator/test/bs_construct_SUITE.erl."];
-bs_construct_SUITE(suite) -> 
-    [];
+%% OTP-5327. Adopted from parts of emulator/test/bs_construct_SUITE.erl.
 bs_construct_SUITE(Config) when is_list(Config) ->
     C1 = <<"
 
        Testf_1 = fun(W, B) -> "
             ?FAIL(<<42:W>>) ","
-            ?FAIL(<<3.14:W/float>>) ","
-            ?FAIL(<<B:W/binary>>) "
+				  ?FAIL(<<3.14:W/float>>) ","
+				  ?FAIL(<<B:W/binary>>) "
        end,
 
-       TestF = fun() -> "
+	   TestF = fun() -> "
             ?FAIL(<<3.14>>) ","
-            ?FAIL(<<<<1,2>>>>) ","
+				?FAIL(<<<<1,2>>>>) ","
 
-            ?FAIL(<<2.71/binary>>) ","
-            ?FAIL(<<24334/binary>>) ","
-            ?FAIL(<<24334344294788947129487129487219847/binary>>) ","
+				?FAIL(<<2.71/binary>>) ","
+				?FAIL(<<24334/binary>>) ","
+				?FAIL(<<24334344294788947129487129487219847/binary>>) ","
 
-            ?FAIL(<<<<1,2,3>>/float>>) ",
+				?FAIL(<<<<1,2,3>>/float>>) ",
 
             %% Negative field widths.
             Testf_1(-8, <<1,2,3,4,5>>),"
 
             ?FAIL(<<42:(-16)>>) ","
-            ?FAIL(<<3.14:(-8)/float>>) ","
-            ?FAIL(<<<<23,56,0,2>>:(-16)/binary>>) ","
-            ?FAIL(<<<<23,56,0,2>>:(2.5)/binary>>) ","
-            ?FAIL(<<<<23,56,0,2>>:(anka)>>) "
+				?FAIL(<<3.14:(-8)/float>>) ","
+				?FAIL(<<<<23,56,0,2>>:(-16)/binary>>) ","
+				?FAIL(<<<<23,56,0,2>>:(2.5)/binary>>) ","
+				?FAIL(<<<<23,56,0,2>>:(anka)>>) "
        end,                 
-       TestF(),
+	   TestF(),
 
-       NotUsed1 = fun(I, BinString) -> <<I:32,BinString/binary>>, ok end,
+	   NotUsed1 = fun(I, BinString) -> <<I:32,BinString/binary>>, ok end,
 
-       NotUsed2 = fun(I, Sz) -> <<I:Sz>>, ok end,
+	   NotUsed2 = fun(I, Sz) -> <<I:Sz>>, ok end,
 
-       NotUsed3 = fun(I) -><<I:(-8)>>, ok end,
+	   NotUsed3 = fun(I) -><<I:(-8)>>, ok end,
 
-       NotUsed = fun() ->
-            ok = NotUsed1(3, <<\"dum\">>),
+	   NotUsed = fun() ->
+			     ok = NotUsed1(3, <<\"dum\">>),
             {'EXIT',{badarg,_}} = (catch NotUsed1(3, \"dum\")), "
-            ?FAIL(NotUsed2(444, -2)) ","
-            ?FAIL(NotUsed2(444, anka)) ","
-            ?FAIL(NotUsed3(444)) "
+						  ?FAIL(NotUsed2(444, -2)) ","
+						  ?FAIL(NotUsed2(444, anka)) ","
+						  ?FAIL(NotUsed3(444)) "
        end,
-       NotUsed(),            
-
-       InGuard3 = fun(Bin, A, B) when <<A:13,B:3>> == Bin -> 1;
-                     (Bin, A, B) when <<A:16,B/binary>> == Bin -> 2;
-                     (Bin, A, B) when <<A:14,B/float,3:2>> == Bin -> 3;
-                     (Bin, A, B) when {a,b,<<A:14,B/float,3:2>>} == Bin -> 
-                          cant_happen;
-                     (_, _, _) -> nope
-                  end,
-
-       InGuard = fun() ->
-            1 = InGuard3(<<16#74ad:16>>, 16#e95, 5),
-            2 = InGuard3(<<16#3A,16#F7,\"hello\">>, 16#3AF7, <<\"hello\">>),
+						  NotUsed(),
+
+						  InGuard3 = fun(Bin, A, B) when <<A:13,B:3>> == Bin -> 1;
+								(Bin, A, B) when <<A:16,B/binary>> == Bin -> 2;
+								(Bin, A, B) when <<A:14,B/float,3:2>> == Bin -> 3;
+								(Bin, A, B) when {a,b,<<A:14,B/float,3:2>>} == Bin ->
+								     cant_happen;
+								(_, _, _) -> nope
+							     end,
+
+						  InGuard = fun() ->
+								    1 = InGuard3(<<16#74ad:16>>, 16#e95, 5),
+								    2 = InGuard3(<<16#3A,16#F7,\"hello\">>, 16#3AF7, <<\"hello\">>),
             3 = InGuard3(<<16#FBCD:14,3.1415/float,3:2>>, 16#FBCD, 3.1415),
-            nope = InGuard3(<<1>>, 42, b),
-            nope = InGuard3(<<1>>, a, b),
-            nope = InGuard3(<<1,2>>, 1, 1),
-            nope = InGuard3(<<4,5>>, 1, 2.71),
-            nope = InGuard3(<<4,5>>, 1, <<12,13>>)
-       end,
-       InGuard(),
+										   nope = InGuard3(<<1>>, 42, b),
+										   nope = InGuard3(<<1>>, a, b),
+										   nope = InGuard3(<<1,2>>, 1, 1),
+										   nope = InGuard3(<<4,5>>, 1, 2.71),
+										   nope = InGuard3(<<4,5>>, 1, <<12,13>>)
+										   end,
+										   InGuard(),
 
-       Nonliteral = fun(X) -> X end,
+										   Nonliteral = fun(X) -> X end,
 
-       CoerceToFloat = fun() -> "
+										   CoerceToFloat = fun() -> "
            ?COF(0) ","
-           ?COF(-1) ","
-           ?COF(1) ","
-           ?COF(42) ","
-           ?COF(255) ","
-           ?COF(-255) ","
-           ?COF64(298748888888888888888888888883478264866528467367364766666666666666663) ","
-           ?COF64(-367546729879999999999947826486652846736736476555566666663) "
+														?COF(-1) ","
+														?COF(1) ","
+														?COF(42) ","
+														?COF(255) ","
+														?COF(-255) ","
+														?COF64(298748888888888888888888888883478264866528467367364766666666666666663) ","
+														?COF64(-367546729879999999999947826486652846736736476555566666663) "
        end,
-       CoerceToFloat(),
-       ok.
-       ">>,
+										   CoerceToFloat(),
+										   ok.
+">>,
     [ok] = scan(C1),
-    ok = evaluate(C1, []),
+ok = evaluate(C1, []),
 
-    %% There is another one, lib/compiler/test/bs_construct_SUITE.erl...
-    C2 = <<"
+%% There is another one, lib/compiler/test/bs_construct_SUITE.erl...
+C2 = <<"
        I = fun(X) -> X end,
 
        Fail = fun() -> 
 
-         I_minus_777 = I(-777),
-         I_minus_2047 = I(-2047),
+		      I_minus_777 = I(-777),
+		      I_minus_2047 = I(-2047),
 
          %% One negative field size, but the sum of field sizes will be 1 byte.
          %% Make sure that we reject that properly.
 
-         {'EXIT',{badarg,_}} = (catch <<I_minus_777:2048/unit:8,
-                                             57:I_minus_2047/unit:8>>),
+		      {'EXIT',{badarg,_}} = (catch <<I_minus_777:2048/unit:8,
+						     57:I_minus_2047/unit:8>>),
 
          %% Same thing, but use literals.
-         {'EXIT',{badarg,_}} = (catch <<I_minus_777:2048/unit:8,
-                                             57:(-2047)/unit:8>>),
+		      {'EXIT',{badarg,_}} = (catch <<I_minus_777:2048/unit:8,
+						     57:(-2047)/unit:8>>),
 
          %% Bad alignment.
-         I_one = I(1),
-         <<1:1>> = <<2375:I_one>>,
-         <<3:2>> = <<45:1,2375:I_one>>,
-         <<14:4>> = <<45:1,2375:I_one,918:2>>,
-         <<118:7>> = <<45:1,2375:I_one,918:5>>,
+		      I_one = I(1),
+		      <<1:1>> = <<2375:I_one>>,
+		      <<3:2>> = <<45:1,2375:I_one>>,
+		      <<14:4>> = <<45:1,2375:I_one,918:2>>,
+		      <<118:7>> = <<45:1,2375:I_one,918:5>>,
 
          %% Not numbers.
-         {'EXIT',{badarg,_}} = (catch <<45:(I(not_a_number))>>),
-         {'EXIT',{badarg,_}} = (catch <<13:8,45:(I(not_a_number))>>),
+		      {'EXIT',{badarg,_}} = (catch <<45:(I(not_a_number))>>),
+		      {'EXIT',{badarg,_}} = (catch <<13:8,45:(I(not_a_number))>>),
 
          %% Unaligned sizes.
-         BadSz = I(7),
-         <<2:4>> = <<34:4>>,
-         <<34:7>> = <<34:BadSz>>,
+		      BadSz = I(7),
+		      <<2:4>> = <<34:4>>,
+		      <<34:7>> = <<34:BadSz>>,
 
-         [] = [X || {X} <- [], X == <<3:BadSz>>],
-         [] = [X || {X} <- [], X == <<3:4>>]
-       end,
+		      [] = [X || {X} <- [], X == <<3:BadSz>>],
+		      [] = [X || {X} <- [], X == <<3:4>>]
+	      end,
        Fail(),
 
        FloatBin1 = fun(F) ->
-         {<<1,2,3>>,F+3.0}
-       end,
+			   {<<1,2,3>>,F+3.0}
+		   end,
 
        FloatBin = fun() ->
            %% Some more coverage.
-           {<<1,2,3>>,7.0} = FloatBin1(4)
-       end,
+			  {<<1,2,3>>,7.0} = FloatBin1(4)
+		  end,
        FloatBin(),
 
        ok.
-       ">>,
+">>,
     [ok] = scan(C2),
-    ok = evaluate(C2, []).
+ok = evaluate(C2, []).
 
 evaluate(B, Vars) when is_binary(B) ->
     evaluate(binary_to_list(B), Vars);
@@ -1547,60 +1497,55 @@ evaluate(Str, Vars) ->
     end.
 
 
-refman_bit_syntax(doc) ->
-    ["Bit syntax examples from the Reference Manual. OTP-5237."];
-refman_bit_syntax(suite) ->
-    [];
+%% Bit syntax examples from the Reference Manual. OTP-5237.
 refman_bit_syntax(Config) when is_list(Config) ->
     %% Reference Manual "Bit Syntax Expressions"
-    ?line Bin1 = <<1,17,42>>,
-    ?line true = [1,17,42] =:= binary_to_list(Bin1),
-    ?line Bin2 = <<"abc">>,
-    ?line true = "abc" =:= binary_to_list(Bin2),
-    ?line Bin3 = <<1,17,42:16>>,
-    ?line true = [1,17,0,42] =:= binary_to_list(Bin3),
-    ?line <<_A,_B,C:16>> = <<1,17,42:16>>,
-    ?line true = C =:= 42,
-    ?line <<D:16,_E,F>> = <<1,17,42:16>>,
-    ?line true = D =:= 273,
-    ?line true = F =:= 42,
+    Bin1 = <<1,17,42>>,
+    true = [1,17,42] =:= binary_to_list(Bin1),
+    Bin2 = <<"abc">>,
+    true = "abc" =:= binary_to_list(Bin2),
+    Bin3 = <<1,17,42:16>>,
+    true = [1,17,0,42] =:= binary_to_list(Bin3),
+    <<_A,_B,C:16>> = <<1,17,42:16>>,
+    true = C =:= 42,
+    <<D:16,_E,F>> = <<1,17,42:16>>,
+    true = D =:= 273,
+    true = F =:= 42,
     <<_G,H/binary>> = <<1,17,42:16>>,
-    ?line true = H =:= <<17,0,42>>,
+    true = H =:= <<17,0,42>>,
 
-    ?line [ok] = 
+    [ok] =
         scan(<<"Bin1 = <<1,17,42>>,
                          true = [1,17,42] =:= binary_to_list(Bin1),
-              Bin2 = <<\"abc\">>,
+	       Bin2 = <<\"abc\">>,
                          true = \"abc\" =:= binary_to_list(Bin2),
                          Bin3 = <<1,17,42:16>>,
-                      true = 
-                      [1,17,0,42] =:= binary_to_list(Bin3),
-                      <<A,B,C:16>> = <<1,17,42:16>>,
-                      true = C =:= 42,
-                      <<D:16,E,F>> = <<1,17,42:16>>,
-                      true = D =:= 273,
-                      true = F =:= 42,
-                      <<G,H/binary>> = <<1,17,42:16>>,
-                      true = H =:= <<17,0,42>>,
-                      ok.">>),
+			true =
+			[1,17,0,42] =:= binary_to_list(Bin3),
+			<<A,B,C:16>> = <<1,17,42:16>>,
+			true = C =:= 42,
+			<<D:16,E,F>> = <<1,17,42:16>>,
+			true = D =:= 273,
+			true = F =:= 42,
+			<<G,H/binary>> = <<1,17,42:16>>,
+			true = H =:= <<17,0,42>>,
+			ok.">>),
 
     %% Binary comprehensions.
-    ?line <<2,4,6>> =  << << (X*2) >> || <<X>> <= << 1,2,3 >> >>,
-    ok.
+    <<2,4,6>> =  << << (X*2) >> || <<X>> <= << 1,2,3 >> >>,
+			ok.
 
 
 -define(IP_VERSION, 4).
 -define(IP_MIN_HDR_LEN, 5).
-progex_bit_syntax(doc) ->
-    ["Bit syntax examples from Programming Examples. OTP-5237."];
-progex_bit_syntax(suite) ->
-    [];
+
+%% Bit syntax examples from Programming Examples. OTP-5237.
 progex_bit_syntax(Config) when is_list(Config) ->
     Bin11 = <<1, 17, 42>>,
     true = [1, 17, 42] =:= binary_to_list(Bin11),
     Bin12 = <<"abc">>,
     true = [97, 98, 99] =:= binary_to_list(Bin12),
-    
+
     A = 1, B = 17, C = 42,
     Bin2 = <<A, B, C:16>>,
     true = [1, 17, 00, 42] =:= binary_to_list(Bin2),
@@ -1613,10 +1558,10 @@ progex_bit_syntax(Config) when is_list(Config) ->
                    DgramSize = byte_size(Dgram),
                    case Dgram of 
                        <<?IP_VERSION:4, HLen:4, SrvcType:8, TotLen:16, 
-                        ID:16, Flgs:3, FragOff:13,
-                        TTL:8, Proto:8, HdrChkSum:16,
-                        SrcIP:32, DestIP:32, 
-                        RestDgram/binary>> when HLen>=5, 4*HLen=<DgramSize ->
+			 ID:16, Flgs:3, FragOff:13,
+			 TTL:8, Proto:8, HdrChkSum:16,
+			 SrcIP:32, DestIP:32,
+			 RestDgram/binary>> when HLen>=5, 4*HLen=<DgramSize ->
                            OptsLen = 4*(HLen - ?IP_MIN_HDR_LEN),
                            <<Opts:OptsLen/binary,Data/binary>> = RestDgram,
                            {SrvcType, TotLen, Flgs, FragOff, ID, HdrChkSum,
@@ -1653,57 +1598,57 @@ progex_bit_syntax(Config) when is_list(Config) ->
     B2 = triples_to_bin2(BL),
     true = Lst =:= binary_to_list(B2),
 
-    ?line [ok] = scan(
-     <<"Bin11 = <<1, 17, 42>>,
+    [ok] = scan(
+	     <<"Bin11 = <<1, 17, 42>>,
         true = [1, 17, 42] =:= binary_to_list(Bin11),
-        Bin12 = <<\"abc\">>,
+	       Bin12 = <<\"abc\">>,
         true = [97, 98, 99] =:= binary_to_list(Bin12),
 
-        A = 1, B = 17, C = 42,
-        Bin2 = <<A, B, C:16>>,
-        true = [1, 17, 00, 42] =:= binary_to_list(Bin2),
-        <<D:16, E, F/binary>> = Bin2,
-        true = D =:= 273,
-        true = E =:= 00,
-        true = [42] =:= binary_to_list(F),
-
-        Fun4 = fun(Dgram) ->
-                       DgramSize = byte_size(Dgram),
-                       case Dgram of 
-                           <<4:4, HLen:4, SrvcType:8, TotLen:16, 
-                            ID:16, Flgs:3, FragOff:13,
-                            TTL:8, Proto:8, HdrChkSum:16,
-                            SrcIP:32, DestIP:32, 
-                            RestDgram/binary>> when HLen>=5, 
-                                                    4*HLen=<DgramSize ->
-                              OptsLen = 4*(HLen - 5),
-                              <<Opts:OptsLen/binary,Data/binary>> = RestDgram,
-                              {SrvcType, TotLen, Flgs, FragOff, ID, HdrChkSum,
-                               Proto, TTL, SrcIP, DestIP, Data, Opts};
-                           _ ->
-                              not_ok
-                       end
-               end,
-        true = Fun4(<<>>) =:= not_ok,
-        true = is_tuple(Fun4(list_to_binary
-                  ([<<4:4,5:4>>,list_to_binary(lists:seq(1,255))]))),
-
-        X = 23432324, Y = 24324234,
-        <<10:7>> = <<X:1, Y:6>>,
-        Z = 234324324,
-        XYZ = <<X:1, Y:6, Z:1>>,
-        true = [20] =:= binary_to_list(XYZ),
-        Hello1 = <<\"hello\">>,
+			 A = 1, B = 17, C = 42,
+			 Bin2 = <<A, B, C:16>>,
+			 true = [1, 17, 00, 42] =:= binary_to_list(Bin2),
+			 <<D:16, E, F/binary>> = Bin2,
+			 true = D =:= 273,
+			 true = E =:= 00,
+			 true = [42] =:= binary_to_list(F),
+
+			 Fun4 = fun(Dgram) ->
+					DgramSize = byte_size(Dgram),
+					case Dgram of
+					    <<4:4, HLen:4, SrvcType:8, TotLen:16,
+					      ID:16, Flgs:3, FragOff:13,
+					      TTL:8, Proto:8, HdrChkSum:16,
+					      SrcIP:32, DestIP:32,
+					      RestDgram/binary>> when HLen>=5,
+								      4*HLen=<DgramSize ->
+						OptsLen = 4*(HLen - 5),
+						<<Opts:OptsLen/binary,Data/binary>> = RestDgram,
+						{SrvcType, TotLen, Flgs, FragOff, ID, HdrChkSum,
+						 Proto, TTL, SrcIP, DestIP, Data, Opts};
+					    _ ->
+						not_ok
+					end
+				end,
+			 true = Fun4(<<>>) =:= not_ok,
+			 true = is_tuple(Fun4(list_to_binary
+						([<<4:4,5:4>>,list_to_binary(lists:seq(1,255))]))),
+
+			 X = 23432324, Y = 24324234,
+			 <<10:7>> = <<X:1, Y:6>>,
+			 Z = 234324324,
+			 XYZ = <<X:1, Y:6, Z:1>>,
+			 true = [20] =:= binary_to_list(XYZ),
+			 Hello1 = <<\"hello\">>,
         Hello2 = <<$h,$e,$l,$l,$o>>,
-        true = \"hello\" =:= binary_to_list(Hello1),
+				    true = \"hello\" =:= binary_to_list(Hello1),
         true = \"hello\" =:= binary_to_list(Hello2),
 
         FunM1 = fun(<<X1:7/binary, Y1:1/binary>>) -> {X1,Y1} end,
-        true = {<<\"1234567\">>,<<\"8\">>} =:= FunM1(<<\"12345678\">>),
+				    true = {<<\"1234567\">>,<<\"8\">>} =:= FunM1(<<\"12345678\">>),
 
         FunM2 = fun(<<_X1:7/binary-unit:7, _Y1:1/binary-unit:1>>) -> ok;
                    (_) -> not_ok end,
-        true = not_ok =:= FunM2(<<\"1\">>),
+					      true = not_ok =:= FunM2(<<\"1\">>),
         ok.">>),
 
     ok.
@@ -1724,590 +1669,577 @@ triples_to_bin2([{X,Y,Z} | T], Acc) ->
 triples_to_bin2([], Acc) -> 
     list_to_binary(lists:reverse(Acc)).
 
-progex_records(doc) ->
-    ["Record examples from Programming Examples. OTP-5237."];
-progex_records(suite) ->
-    [];
+%% Record examples from Programming Examples. OTP-5237.
 progex_records(Config) when is_list(Config) ->
     Test1 = 
-       <<"-module(recs).
+	<<"-module(recs).
           -record(person, {name = \"\", phone = [], address}).
           -record(name, {first = \"Robert\", last = \"Ericsson\"}).
           -record(person2, {name = #name{}, phone}).
-          -export([t/0]).
+-export([t/0]).
 
-          t() ->
-              _P1 = #person{phone=[0,8,2,3,4,3,1,2], name=\"Robert\"},
+t() ->
+    _P1 = #person{phone=[0,8,2,3,4,3,1,2], name=\"Robert\"},
               \"Robert\" = _P1#person.name,
               [0,8,2,3,4,3,1,2] = _P1#person.phone,
-               undefined = _P1#person.address,
+		  undefined = _P1#person.address,
 
-              _P2 = #person{name = \"Jakob\", _ = '_'},
+		  _P2 = #person{name = \"Jakob\", _ = '_'},
                \"Jakob\" = _P2#person.name,
               '_' = _P2#person.phone,
-              '_' = _P2#person.address,
-    
-              P = #person{name = \"Joe\", phone = [0,8,2,3,4,3,1,2]},
+				'_' = _P2#person.address,
+
+				P = #person{name = \"Joe\", phone = [0,8,2,3,4,3,1,2]},
               \"Joe\" = P#person.name,
               [0,8,2,3,4,3,1,2] = P#person.phone,
-              undefined = P#person.address,
+					    undefined = P#person.address,
 
-              P1 = #person{name=\"Joe\", phone=[1,2,3], address=\"A street\"},
+					    P1 = #person{name=\"Joe\", phone=[1,2,3], address=\"A street\"},
               P2 = P1#person{name=\"Robert\"},
               \"Robert\" = P2#person.name,
               [1,2,3] = P2#person.phone,
-              \"A street\" = P2#person.address,
+			     \"A street\" = P2#person.address,
               a_person = foo(P1),
 
-              {found, [1,2,3]} = 
-                     find_phone([#person{name = a}, 
-                                 #person{name = b, phone = [3,2,1]},
-                                 #person{name = c, phone = [1,2,3]}],
-                                c),
+			     {found, [1,2,3]} =
+				 find_phone([#person{name = a},
+					     #person{name = b, phone = [3,2,1]},
+					     #person{name = c, phone = [1,2,3]}],
+					    c),
 
-              P3 = #person{name=\"Joe\", phone=[0,0,7], address=\"A street\"},
+			     P3 = #person{name=\"Joe\", phone=[0,0,7], address=\"A street\"},
               #person{name = Name} = P3, 
-              \"Joe\" = Name,
+					  \"Joe\" = Name,
 
               \"Robert\" = demo(),
               ok.
 
-              foo(P) when is_record(P, person) -> a_person;
-              foo(_) -> not_a_person.
+foo(P) when is_record(P, person) -> a_person;
+foo(_) -> not_a_person.
 
-              find_phone([#person{name=Name, phone=Phone} | _], Name) ->
-                  {found,  Phone};
-              find_phone([_| T], Name) ->
-                  find_phone(T, Name);
-              find_phone([], _Name) ->
-                  not_found.
+find_phone([#person{name=Name, phone=Phone} | _], Name) ->
+    {found,  Phone};
+find_phone([_| T], Name) ->
+    find_phone(T, Name);
+find_phone([], _Name) ->
+    not_found.
 
-              demo() ->
-                  P = #person2{name= #name{first=\"Robert\",last=\"Virding\"},
+demo() ->
+    P = #person2{name= #name{first=\"Robert\",last=\"Virding\"},
                                phone=123},
-                  _First = (P#person2.name)#name.first.
-         ">>,
-    ?line ok = run_file(Config, recs, Test1), 
+		 _First = (P#person2.name)#name.first.
+">>,
+    ok = run_file(Config, recs, Test1),
 
-    Test1_shell = 
-       <<"rd(person, {name = \"\", phone = [], address}),
+Test1_shell =
+<<"rd(person, {name = \"\", phone = [], address}),
           rd(name, {first = \"Robert\", last = \"Ericsson\"}),
           rd(person2, {name = #name{}, phone}),
 
-          _P1 = #person{phone=[0,8,2,3,4,3,1,2], name=\"Robert\"},
+		    _P1 = #person{phone=[0,8,2,3,4,3,1,2], name=\"Robert\"},
           \"Robert\" = _P1#person.name,
           [0,8,2,3,4,3,1,2] = _P1#person.phone,
-           undefined = _P1#person.address,
+				  undefined = _P1#person.address,
 
-          _P2 = #person{name = \"Jakob\", _ = '_'},
+				  _P2 = #person{name = \"Jakob\", _ = '_'},
            \"Jakob\" = _P2#person.name,
           '_' = _P2#person.phone,
-          '_' = _P2#person.address,
+						'_' = _P2#person.address,
 
-          P = #person{name = \"Joe\", phone = [0,8,2,3,4,3,1,2]},
+						P = #person{name = \"Joe\", phone = [0,8,2,3,4,3,1,2]},
           \"Joe\" = P#person.name,
           [0,8,2,3,4,3,1,2] = P#person.phone,
-          undefined = P#person.address,
+							    undefined = P#person.address,
 
-          P1 = #person{name=\"Joe\", phone=[1,2,3], address=\"A street\"},
+							    P1 = #person{name=\"Joe\", phone=[1,2,3], address=\"A street\"},
           P2 = P1#person{name=\"Robert\"},
           \"Robert\" = P2#person.name,
           [1,2,3] = P2#person.phone,
-          \"A street\" = P2#person.address,
+			 \"A street\" = P2#person.address,
           Foo = fun(P) when is_record(P, person) -> a_person;
                    (_) -> not_a_person
                 end,
-          a_person = Foo(P1),
-
-          Find = fun([#person{name=Name, phone=Phone} | _], Name, Fn) ->
-                         {found,  Phone};
-                    ([_| T], Name, Fn) ->
-                         Fn(T, Name, Fn);
-                    ([], _Name, _Fn) ->
-                         not_found
-                 end,
-
-          {found, [1,2,3]} = Find([#person{name = a}, 
-                                   #person{name = b, phone = [3,2,1]},
-                                   #person{name = c, phone = [1,2,3]}],
-                                  c, 
-                                  Find),
-
-          P3 = #person{name=\"Joe\", phone=[0,0,7], address=\"A street\"},
+			 a_person = Foo(P1),
+
+			 Find = fun([#person{name=Name, phone=Phone} | _], Name, Fn) ->
+					{found,  Phone};
+				   ([_| T], Name, Fn) ->
+					Fn(T, Name, Fn);
+				   ([], _Name, _Fn) ->
+					not_found
+				end,
+
+			 {found, [1,2,3]} = Find([#person{name = a},
+						  #person{name = b, phone = [3,2,1]},
+						  #person{name = c, phone = [1,2,3]}],
+						 c,
+						 Find),
+
+			 P3 = #person{name=\"Joe\", phone=[0,0,7], address=\"A street\"},
           #person{name = Name} = P3, 
-          \"Joe\" = Name,
+				      \"Joe\" = Name,
 
           Demo = fun() ->
-              P17 = #person2{name= #name{first=\"Robert\",last=\"Virding\"},
+			 P17 = #person2{name= #name{first=\"Robert\",last=\"Virding\"},
                            phone=123},
-              _First = (P17#person2.name)#name.first
-                 end,
+					_First = (P17#person2.name)#name.first
+					end,
 
-          \"Robert\" = Demo(),
+					\"Robert\" = Demo(),
           ok.
-     ">>,
-    ?line [ok] = scan(Test1_shell),
+">>,
+    [ok] = scan(Test1_shell),
 
-    Test2 = 
-       <<"-module(recs).
+Test2 =
+<<"-module(recs).
           -record(person, {name, age, phone = [], dict = []}).
-          -compile(export_all).
+-compile(export_all).
 
-          t() -> ok.
+t() -> ok.
 
-          make_hacker_without_phone(Name, Age) ->
-             #person{name = Name, age = Age, 
-                      dict = [{computer_knowledge, excellent}, 
-                              {drinks, coke}]}.
-          print(#person{name = Name, age = Age,
-                        phone = Phone, dict = Dict}) ->
-              io:format(\"Name: ~s, Age: ~w, Phone: ~w ~n\" 
+make_hacker_without_phone(Name, Age) ->
+    #person{name = Name, age = Age,
+	    dict = [{computer_knowledge, excellent},
+		    {drinks, coke}]}.
+print(#person{name = Name, age = Age,
+	      phone = Phone, dict = Dict}) ->
+    io:format(\"Name: ~s, Age: ~w, Phone: ~w ~n\"
                         \"Dictionary: ~w.~n\", [Name, Age, Phone, Dict]).
 
           birthday(P) when record(P, person) -> 
-             P#person{age = P#person.age + 1}.
+		     P#person{age = P#person.age + 1}.
 
-          register_two_hackers() ->
-             Hacker1 = make_hacker_without_phone(\"Joe\", 29),
+register_two_hackers() ->
+    Hacker1 = make_hacker_without_phone(\"Joe\", 29),
              OldHacker = birthday(Hacker1),
-             % The central_register_server should have 
-             % an interface function for this.
-             central_register_server ! {register_person, Hacker1},
-             central_register_server ! {register_person, 
-                       OldHacker#person{name = \"Robert\", 
+             %% The central_register_server should have
+             %% an interface function for this.
+					central_register_server ! {register_person, Hacker1},
+					central_register_server ! {register_person,
+								   OldHacker#person{name = \"Robert\",
                                         phone = [0,8,3,2,4,5,3,1]}}.
-       ">>,
-    ?line ok = run_file(Config, recs, Test2),
-    ok.
+">>,
+    ok = run_file(Config, recs, Test2),
+ok.
 
-progex_lc(doc) ->
-    ["List comprehension examples from Programming Examples. OTP-5237."];
-progex_lc(suite) ->
-    [];
+%% List comprehension examples from Programming Examples. OTP-5237.
 progex_lc(Config) when is_list(Config) ->
     Test1 = 
-       <<"-module(lc).
+	<<"-module(lc).
           -export([t/0]).
 
-          t() ->
-              [a,4,b,5,6] = [X || X <- [1,2,a,3,4,b,5,6], X > 3],
-              [4,5,6] = [X || X <- [1,2,a,3,4,b,5,6], integer(X), X > 3],
-              [{1,a},{1,b},{2,a},{2,b},{3,a},{3,b}] = 
-                  [{X, Y} || X <- [1,2,3], Y <- [a,b]],
-
-              [1,2,3,4,5,6,7,8] = sort([4,5,1,8,3,6,7,2]),
-              [[b,u,g],[b,g,u],[u,b,g],[u,g,b],[g,b,u],[g,u,b]] = 
-                  perms([b,u,g]),
-              [] = pyth(11),
-              [{3,4,5},{4,3,5}] = pyth(12),
-              [{3,4,5},{4,3,5},{5,12,13},{6,8,10},{8,6,10},{8,15,17},
-               {9,12,15},{12,5,13},{12,9,15},{12,16,20},{15,8,17},
-               {16,12,20}] = pyth(50),
-              [] = pyth1(11),
-              [{3,4,5},{4,3,5}] = pyth1(12),
-              [{3,4,5},{4,3,5},{5,12,13},{6,8,10},{8,6,10},{8,15,17},
-               {9,12,15},{12,5,13},{12,9,15},{12,16,20},{15,8,17},
-               {16,12,20}] = pyth1(50),
-              [1,2,3,4,5] = append([[1,2,3],[4,5]]),
-              [2,3,4] = map(fun(X) -> X + 1 end, [1,2,3]),
-              [2,4] = filter(fun(X) -> X > 1 end, [0,2,4]),
-              [1,2,3,7] = select(b,[{a,1},{b,2},{c,3},{b,7}]),
-              [2,7] = select2(b,[{a,1},{b,2},{c,3},{b,7}]),
-              ok.
-
-          sort([Pivot|T]) ->
-              sort([ X || X <- T, X < Pivot]) ++
-              [Pivot] ++
-              sort([ X || X <- T, X >= Pivot]);
-          sort([]) -> [].
-
-          perms([]) -> [[]];
-          perms(L)  -> [[H|T] || H <- L, T <- perms(L--[H])].
-
-          pyth(N) ->
-              [ {A,B,C} ||
-                  A <- lists:seq(1,N),
-                  B <- lists:seq(1,N),
-                  C <- lists:seq(1,N),
-                  A+B+C =< N,
-                  A*A+B*B == C*C 
-              ].
-
-          pyth1(N) ->
-              [{A,B,C} ||
-                  A <- lists:seq(1,N),
-                  B <- lists:seq(1,N-A+1),
-                  C <- lists:seq(1,N-A-B+2),
-                  A+B+C =< N,
-                  A*A+B*B == C*C ].
-
-         append(L)   ->  [X || L1 <- L, X <- L1].
-         map(Fun, L) -> [Fun(X) || X <- L].
-         filter(Pred, L) -> [X || X <- L, Pred(X)].
-
-         select(X, L) ->  [Y || {X, Y} <- L].
-         select2(X, L) ->  [Y || {X1, Y} <- L, X == X1].
-       ">>,
-    ?line ok = run_file(Config, lc, Test1),
-
-    Test1_shell = 
-       <<"[a,4,b,5,6] = [X || X <- [1,2,a,3,4,b,5,6], X > 3],
-          [4,5,6] = [X || X <- [1,2,a,3,4,b,5,6], integer(X), X > 3],
-          [{1,a},{1,b},{2,a},{2,b},{3,a},{3,b}] = 
-              [{X, Y} || X <- [1,2,3], Y <- [a,b]],
-
-          Sort = fun([Pivot|T], Fn) ->
-                        Fn([ X || X <- T, X < Pivot], Fn) ++
-                        [Pivot] ++
-                        Fn([ X || X <- T, X >= Pivot], Fn);
-                     ([], _Fn) -> []
-                 end,
-
-          [1,2,3,4,5,6,7,8] = Sort([4,5,1,8,3,6,7,2], Sort),
-          Perms = fun([], _Fn) -> [[]];
-                     (L, Fn)  -> [[H|T] || H <- L, T <- Fn(L--[H], Fn)]
-                  end,
-          [[b,u,g],[b,g,u],[u,b,g],[u,g,b],[g,b,u],[g,u,b]] = 
-              Perms([b,u,g], Perms),
-
-          Pyth = fun(N) ->
-                      [ {A,B,C} ||
-                          A <- lists:seq(1,N),
-                          B <- lists:seq(1,N),
-                          C <- lists:seq(1,N),
-                          A+B+C =< N,
-                          A*A+B*B == C*C 
-                      ]
-                 end,
-
-          [] = Pyth(11),
-          [{3,4,5},{4,3,5}] = Pyth(12),
-          %[{3,4,5},{4,3,5},{5,12,13},{6,8,10},{8,6,10},{8,15,17},
-          % {9,12,15},{12,5,13},{12,9,15},{12,16,20},{15,8,17},
-          % {16,12,20}] = Pyth(50),
-
-          Pyth1 = fun(N) ->
-                      [{A,B,C} ||
-                          A <- lists:seq(1,N),
-                          B <- lists:seq(1,N-A+1),
-                          C <- lists:seq(1,N-A-B+2),
-                          A+B+C =< N,
-                          A*A+B*B == C*C ]
-                  end,
-
-          [] = Pyth1(11),
-          [{3,4,5},{4,3,5}] = Pyth1(12),
-          [{3,4,5},{4,3,5},{5,12,13},{6,8,10},{8,6,10},{8,15,17},
-           {9,12,15},{12,5,13},{12,9,15},{12,16,20},{15,8,17},
-           {16,12,20}] = Pyth1(50),
-
-          Append = fun(L)   ->  [X || L1 <- L, X <- L1] end,
-          [1,2,3,4,5] = Append([[1,2,3],[4,5]]),
-          Map = fun(Fun, L) -> [Fun(X) || X <- L] end,
-          [2,3,4] = Map(fun(X) -> X + 1 end, [1,2,3]),
-          Filter = fun(Pred, L) -> [X || X <- L, Pred(X)] end,
-          [2,4] = Filter(fun(X) -> X > 1 end, [0,2,4]),
-
-          Select = fun(X, L) ->  [Y || {X, Y} <- L] end,
-          [1,2,3,7] = Select(b,[{a,1},{b,2},{c,3},{b,7}]),
-          Select2 = fun(X, L) ->  [Y || {X1, Y} <- L, X == X1] end,
-          [2,7] = Select2(b,[{a,1},{b,2},{c,3},{b,7}]),
-          ok.
-       ">>,
-    ?line [ok] = scan(Test1_shell),
+t() ->
+    [a,4,b,5,6] = [X || X <- [1,2,a,3,4,b,5,6], X > 3],
+    [4,5,6] = [X || X <- [1,2,a,3,4,b,5,6], integer(X), X > 3],
+    [{1,a},{1,b},{2,a},{2,b},{3,a},{3,b}] =
+	[{X, Y} || X <- [1,2,3], Y <- [a,b]],
+
+    [1,2,3,4,5,6,7,8] = sort([4,5,1,8,3,6,7,2]),
+    [[b,u,g],[b,g,u],[u,b,g],[u,g,b],[g,b,u],[g,u,b]] =
+	perms([b,u,g]),
+    [] = pyth(11),
+    [{3,4,5},{4,3,5}] = pyth(12),
+    [{3,4,5},{4,3,5},{5,12,13},{6,8,10},{8,6,10},{8,15,17},
+     {9,12,15},{12,5,13},{12,9,15},{12,16,20},{15,8,17},
+     {16,12,20}] = pyth(50),
+    [] = pyth1(11),
+    [{3,4,5},{4,3,5}] = pyth1(12),
+    [{3,4,5},{4,3,5},{5,12,13},{6,8,10},{8,6,10},{8,15,17},
+     {9,12,15},{12,5,13},{12,9,15},{12,16,20},{15,8,17},
+     {16,12,20}] = pyth1(50),
+    [1,2,3,4,5] = append([[1,2,3],[4,5]]),
+    [2,3,4] = map(fun(X) -> X + 1 end, [1,2,3]),
+    [2,4] = filter(fun(X) -> X > 1 end, [0,2,4]),
+    [1,2,3,7] = select(b,[{a,1},{b,2},{c,3},{b,7}]),
+    [2,7] = select2(b,[{a,1},{b,2},{c,3},{b,7}]),
     ok.
 
-progex_funs(doc) ->
-    ["Funs examples from Programming Examples. OTP-5237."];
-progex_funs(suite) ->
-    [];
+sort([Pivot|T]) ->
+    sort([ X || X <- T, X < Pivot]) ++
+	[Pivot] ++
+	sort([ X || X <- T, X >= Pivot]);
+sort([]) -> [].
+
+perms([]) -> [[]];
+perms(L)  -> [[H|T] || H <- L, T <- perms(L--[H])].
+
+pyth(N) ->
+    [ {A,B,C} ||
+	A <- lists:seq(1,N),
+	B <- lists:seq(1,N),
+	C <- lists:seq(1,N),
+	A+B+C =< N,
+	A*A+B*B == C*C
+    ].
+
+pyth1(N) ->
+    [{A,B,C} ||
+	A <- lists:seq(1,N),
+	B <- lists:seq(1,N-A+1),
+	C <- lists:seq(1,N-A-B+2),
+	A+B+C =< N,
+	A*A+B*B == C*C ].
+
+append(L)   ->  [X || L1 <- L, X <- L1].
+map(Fun, L) -> [Fun(X) || X <- L].
+filter(Pred, L) -> [X || X <- L, Pred(X)].
+
+select(X, L) ->  [Y || {X, Y} <- L].
+select2(X, L) ->  [Y || {X1, Y} <- L, X == X1].
+">>,
+    ok = run_file(Config, lc, Test1),
+
+Test1_shell =
+<<"[a,4,b,5,6] = [X || X <- [1,2,a,3,4,b,5,6], X > 3],
+          [4,5,6] = [X || X <- [1,2,a,3,4,b,5,6], integer(X), X > 3],
+  [{1,a},{1,b},{2,a},{2,b},{3,a},{3,b}] =
+  [{X, Y} || X <- [1,2,3], Y <- [a,b]],
+
+  Sort = fun([Pivot|T], Fn) ->
+		 Fn([ X || X <- T, X < Pivot], Fn) ++
+		     [Pivot] ++
+		     Fn([ X || X <- T, X >= Pivot], Fn);
+	    ([], _Fn) -> []
+	 end,
+
+  [1,2,3,4,5,6,7,8] = Sort([4,5,1,8,3,6,7,2], Sort),
+  Perms = fun([], _Fn) -> [[]];
+	     (L, Fn)  -> [[H|T] || H <- L, T <- Fn(L--[H], Fn)]
+	  end,
+  [[b,u,g],[b,g,u],[u,b,g],[u,g,b],[g,b,u],[g,u,b]] =
+  Perms([b,u,g], Perms),
+
+  Pyth = fun(N) ->
+		 [ {A,B,C} ||
+		     A <- lists:seq(1,N),
+		     B <- lists:seq(1,N),
+		     C <- lists:seq(1,N),
+		     A+B+C =< N,
+		     A*A+B*B == C*C
+		 ]
+	 end,
+
+  [] = Pyth(11),
+  [{3,4,5},{4,3,5}] = Pyth(12),
+%%[{3,4,5},{4,3,5},{5,12,13},{6,8,10},{8,6,10},{8,15,17},
+%% {9,12,15},{12,5,13},{12,9,15},{12,16,20},{15,8,17},
+%% {16,12,20}] = Pyth(50),
+
+  Pyth1 = fun(N) ->
+		  [{A,B,C} ||
+		      A <- lists:seq(1,N),
+		      B <- lists:seq(1,N-A+1),
+		      C <- lists:seq(1,N-A-B+2),
+		      A+B+C =< N,
+		      A*A+B*B == C*C ]
+	  end,
+
+  [] = Pyth1(11),
+  [{3,4,5},{4,3,5}] = Pyth1(12),
+  [{3,4,5},{4,3,5},{5,12,13},{6,8,10},{8,6,10},{8,15,17},
+   {9,12,15},{12,5,13},{12,9,15},{12,16,20},{15,8,17},
+   {16,12,20}] = Pyth1(50),
+
+  Append = fun(L)   ->  [X || L1 <- L, X <- L1] end,
+  [1,2,3,4,5] = Append([[1,2,3],[4,5]]),
+  Map = fun(Fun, L) -> [Fun(X) || X <- L] end,
+  [2,3,4] = Map(fun(X) -> X + 1 end, [1,2,3]),
+  Filter = fun(Pred, L) -> [X || X <- L, Pred(X)] end,
+  [2,4] = Filter(fun(X) -> X > 1 end, [0,2,4]),
+
+  Select = fun(X, L) ->  [Y || {X, Y} <- L] end,
+  [1,2,3,7] = Select(b,[{a,1},{b,2},{c,3},{b,7}]),
+  Select2 = fun(X, L) ->  [Y || {X1, Y} <- L, X == X1] end,
+  [2,7] = Select2(b,[{a,1},{b,2},{c,3},{b,7}]),
+  ok.
+">>,
+    [ok] = scan(Test1_shell),
+ok.
+
+%% Funs examples from Programming Examples. OTP-5237.
 progex_funs(Config) when is_list(Config) ->
     Test1 = 
-       <<"-module(funs).
+	<<"-module(funs).
           -compile(export_all).
 
-          double([H|T]) -> [2*H|double(T)];
-          double([])    -> [].
+double([H|T]) -> [2*H|double(T)];
+double([])    -> [].
 
-          add_one([H|T]) -> [H+1|add_one(T)];
-          add_one([])    -> [].
+add_one([H|T]) -> [H+1|add_one(T)];
+add_one([])    -> [].
 
-          map(F, [H|T]) -> [F(H)|map(F, T)];
-          map(F, [])    -> [].
+map(F, [H|T]) -> [F(H)|map(F, T)];
+map(F, [])    -> [].
 
-          double2(L)  -> map(fun(X) -> 2*X end, L).
-          add_one2(L) -> map(fun(X) -> 1 + X end, L).
+double2(L)  -> map(fun(X) -> 2*X end, L).
+add_one2(L) -> map(fun(X) -> 1 + X end, L).
 
-          print_list(Stream, [H|T]) ->
-              io:format(Stream, \"~p~n\", [H]),
+print_list(Stream, [H|T]) ->
+    io:format(Stream, \"~p~n\", [H]),
               print_list(Stream, T);
-          print_list(Stream, []) ->
-              true.
-
-          broadcast(Msg, [Pid|Pids]) ->
-              Pid ! Msg,
-              broadcast(Msg, Pids);
-          broadcast(_, []) ->
-              true.
-
-          foreach(F, [H|T]) ->
-              F(H),
-              foreach(F, T);
-          foreach(F, []) ->
-              ok.
+		  print_list(Stream, []) ->
+		     true.
+
+broadcast(Msg, [Pid|Pids]) ->
+    Pid ! Msg,
+    broadcast(Msg, Pids);
+broadcast(_, []) ->
+    true.
+
+foreach(F, [H|T]) ->
+    F(H),
+    foreach(F, T);
+foreach(F, []) ->
+    ok.
 
-          print_list2(S, L) -> 
-              foreach(fun(H) -> io:format(S, \"~p~n\",[H]) end, L).
+print_list2(S, L) ->
+    foreach(fun(H) -> io:format(S, \"~p~n\",[H]) end, L).
 
           broadcast2(M, L) -> foreach(fun(Pid) -> Pid ! M end, L).
 
-          t1() -> map(fun(X) -> 2 * X end, [1,2,3,4,5]).
+t1() -> map(fun(X) -> 2 * X end, [1,2,3,4,5]).
 
-          t2() -> map(fun double/1, [1,2,3,4,5]).
+t2() -> map(fun double/1, [1,2,3,4,5]).
 
-          t3() -> map({?MODULE, double3}, [1,2,3,4,5]).
+t3() -> map({?MODULE, double3}, [1,2,3,4,5]).
 
-          double3(X) -> X * 2.
+double3(X) -> X * 2.
 
-          f(F, Args) when function(F) ->
-             apply(F, Args);
-          f(N, _) when integer(N) ->
-             N.
+f(F, Args) when function(F) ->
+    apply(F, Args);
+f(N, _) when integer(N) ->
+    N.
 
-          print_list3(File, List) ->
-              {ok, Stream} = file:open(File, write),
-              foreach(fun(X) -> io:format(Stream,\"~p~n\",[X]) end, List),
+print_list3(File, List) ->
+    {ok, Stream} = file:open(File, write),
+    foreach(fun(X) -> io:format(Stream,\"~p~n\",[X]) end, List),
               file:close(Stream).
 
-          print_list4(File, List) ->
-              {ok, Stream} = file:open(File, write),
-              foreach(fun(File) -> 
-                          io:format(Stream,\"~p~n\",[File]) 
+print_list4(File, List) ->
+    {ok, Stream} = file:open(File, write),
+    foreach(fun(File) ->
+		    io:format(Stream,\"~p~n\",[File])
                       end, List),
-              file:close(Stream).
+		    file:close(Stream).
+
+any(Pred, [H|T]) ->
+    case Pred(H) of
+	true  ->  true;
+	false ->  any(Pred, T)
+    end;
+any(Pred, []) ->
+    false.
 
-          any(Pred, [H|T]) ->
-              case Pred(H) of
-                  true  ->  true;
-                  false ->  any(Pred, T)
-              end;
-          any(Pred, []) ->
-              false.
-
-          all(Pred, [H|T]) ->
-              case Pred(H) of
-                  true  ->  all(Pred, T);
-                  false ->  false
-              end;
-          all(Pred, []) ->
-              true.
-
-          foldl(F, Accu, [Hd|Tail]) ->
-              foldl(F, F(Hd, Accu), Tail);
-          foldl(F, Accu, []) -> Accu.
-
-          mapfoldl(F, Accu0, [Hd|Tail]) ->
-              {R,Accu1} = F(Hd, Accu0),
-              {Rs,Accu2} = mapfoldl(F, Accu1, Tail),
-              {[R|Rs], Accu2};
-          mapfoldl(F, Accu, []) -> {[], Accu}.
-
-          filter(F, [H|T]) ->
-              case F(H) of
-                  true  -> [H|filter(F, T)];
-                  false -> filter(F, T)
-              end;
-          filter(F, []) -> [].
-
-          diff(L1, L2) -> 
-              filter(fun(X) -> not lists:member(X, L2) end, L1).
-
-          intersection(L1,L2) -> filter(fun(X) -> lists:member(X,L1) end, L2).
-
-          takewhile(Pred, [H|T]) ->
-              case Pred(H) of
-                  true  -> [H|takewhile(Pred, T)];
-                  false -> []
-              end;
-          takewhile(Pred, []) ->
-              [].
-
-          dropwhile(Pred, [H|T]) ->
-              case Pred(H) of
-                  true  -> dropwhile(Pred, T);
-                  false -> [H|T]
-              end;
-          dropwhile(Pred, []) ->
-              [].
-
-          splitlist(Pred, L) ->
-              splitlist(Pred, L, []).
-
-          splitlist(Pred, [H|T], L) ->
-              case Pred(H) of 
-                  true  -> splitlist(Pred, T, [H|L]);
-                  false -> {lists:reverse(L), [H|T]}
-              end;
-          splitlist(Pred, [], L) ->
-              {lists:reverse(L), []}.
-
-          first(Pred, [H|T]) ->
-              case Pred(H) of
-                  true ->
-                      {true, H};
-                  false ->
-                      first(Pred, T)
-              end;
-          first(Pred, []) ->
-              false.
-
-          ints_from(N) ->
-              fun() ->
-                      [N|ints_from(N+1)]
-              end.
-
-          pconst(X) ->
-              fun (T) ->
-                 case T of
-                     [X|T1] -> {ok, {const, X}, T1};
-                     _      -> fail
-                 end
-              end.
-
-          pand(P1, P2) ->
-              fun (T) ->
-                  case P1(T) of
-                      {ok, R1, T1} ->
-                          case P2(T1) of
-                              {ok, R2, T2} ->
-                                  {ok, {'and', R1, R2}};
-                              fail ->
-                                  fail
-                          end;
-                      fail ->
-                          fail
-                  end
-              end.
-
-          por(P1, P2) ->
-              fun (T) ->
-                  case P1(T) of
-                      {ok, R, T1} -> 
-                          {ok, {'or',1,R}, T1};
-                      fail -> 
-                          case P2(T) of
-                              {ok, R1, T1} ->
-                                  {ok, {'or',2,R1}, T1};
-                              fail ->
-                                  fail
-                          end
-                  end
-              end.
-
-          grammar() ->
-              pand(
-                   por(pconst(a), pconst(b)),
-                   por(pconst(c), pconst(d))).
-
-          parse(List) ->
-              (grammar())(List).
-
-
-          t() ->
-               [2,4,6,8] = double([1,2,3,4]),
-               [2,3,4,5] = add_one([1,2,3,4]),
-               [2,4,6,8] = double2([1,2,3,4]),
-               [2,3,4,5] = add_one2([1,2,3,4]),
-               XX = ints_from(1),
-               [1 | _] = XX(),
-               1 = hd(XX()),
-               Y = tl(XX()),
-               2 = hd(Y()),
-
-               P1 = pconst(a),
-               {ok,{const,a},[b,c]} = P1([a,b,c]),
-               fail = P1([x,y,z]),
-
-               {ok,{'and',{'or',1,{const,a}},{'or',1,{const,c}}}} =
-                    parse([a,c]),
-               {ok,{'and',{'or',1,{const,a}},{'or',2,{const,d}}}} =
-                   parse([a,d]),
-               {ok,{'and',{'or',2,{const,b}},{'or',1,{const,c}}}} =
-                   parse([b,c]),
-               {ok,{'and',{'or',2,{const,b}},{'or',2,{const,d}}}} =
-                   parse([b,d]),
-               fail = parse([a,b]),
-               ok.
-         ">>,
-    ?line ok = run_file(Config, funs, Test1),
-
-    Test2_shell = 
-       <<"Double = fun(X) -> 2 * X end,
+all(Pred, [H|T]) ->
+    case Pred(H) of
+	true  ->  all(Pred, T);
+	false ->  false
+    end;
+all(Pred, []) ->
+    true.
+
+foldl(F, Accu, [Hd|Tail]) ->
+    foldl(F, F(Hd, Accu), Tail);
+foldl(F, Accu, []) -> Accu.
+
+mapfoldl(F, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = F(Hd, Accu0),
+    {Rs,Accu2} = mapfoldl(F, Accu1, Tail),
+    {[R|Rs], Accu2};
+mapfoldl(F, Accu, []) -> {[], Accu}.
+
+filter(F, [H|T]) ->
+    case F(H) of
+	true  -> [H|filter(F, T)];
+	false -> filter(F, T)
+    end;
+filter(F, []) -> [].
+
+diff(L1, L2) ->
+    filter(fun(X) -> not lists:member(X, L2) end, L1).
+
+intersection(L1,L2) -> filter(fun(X) -> lists:member(X,L1) end, L2).
+
+takewhile(Pred, [H|T]) ->
+    case Pred(H) of
+	true  -> [H|takewhile(Pred, T)];
+	false -> []
+    end;
+takewhile(Pred, []) ->
+    [].
+
+dropwhile(Pred, [H|T]) ->
+    case Pred(H) of
+	true  -> dropwhile(Pred, T);
+	false -> [H|T]
+    end;
+dropwhile(Pred, []) ->
+    [].
+
+splitlist(Pred, L) ->
+    splitlist(Pred, L, []).
+
+splitlist(Pred, [H|T], L) ->
+    case Pred(H) of
+	true  -> splitlist(Pred, T, [H|L]);
+	false -> {lists:reverse(L), [H|T]}
+    end;
+splitlist(Pred, [], L) ->
+    {lists:reverse(L), []}.
+
+first(Pred, [H|T]) ->
+    case Pred(H) of
+	true ->
+	    {true, H};
+	false ->
+	    first(Pred, T)
+    end;
+first(Pred, []) ->
+    false.
+
+ints_from(N) ->
+    fun() ->
+	    [N|ints_from(N+1)]
+    end.
+
+pconst(X) ->
+    fun (T) ->
+	    case T of
+		[X|T1] -> {ok, {const, X}, T1};
+		_      -> fail
+	    end
+    end.
+
+pand(P1, P2) ->
+    fun (T) ->
+	    case P1(T) of
+		{ok, R1, T1} ->
+		    case P2(T1) of
+			{ok, R2, T2} ->
+			    {ok, {'and', R1, R2}};
+			fail ->
+			    fail
+		    end;
+		fail ->
+		    fail
+	    end
+    end.
+
+por(P1, P2) ->
+    fun (T) ->
+	    case P1(T) of
+		{ok, R, T1} ->
+		    {ok, {'or',1,R}, T1};
+		fail ->
+		    case P2(T) of
+			{ok, R1, T1} ->
+			    {ok, {'or',2,R1}, T1};
+			fail ->
+			    fail
+		    end
+	    end
+    end.
+
+grammar() ->
+    pand(
+      por(pconst(a), pconst(b)),
+      por(pconst(c), pconst(d))).
+
+parse(List) ->
+    (grammar())(List).
+
+
+t() ->
+    [2,4,6,8] = double([1,2,3,4]),
+    [2,3,4,5] = add_one([1,2,3,4]),
+    [2,4,6,8] = double2([1,2,3,4]),
+    [2,3,4,5] = add_one2([1,2,3,4]),
+    XX = ints_from(1),
+    [1 | _] = XX(),
+    1 = hd(XX()),
+    Y = tl(XX()),
+    2 = hd(Y()),
+
+    P1 = pconst(a),
+    {ok,{const,a},[b,c]} = P1([a,b,c]),
+    fail = P1([x,y,z]),
+
+    {ok,{'and',{'or',1,{const,a}},{'or',1,{const,c}}}} =
+	parse([a,c]),
+    {ok,{'and',{'or',1,{const,a}},{'or',2,{const,d}}}} =
+	parse([a,d]),
+    {ok,{'and',{'or',2,{const,b}},{'or',1,{const,c}}}} =
+	parse([b,c]),
+    {ok,{'and',{'or',2,{const,b}},{'or',2,{const,d}}}} =
+	parse([b,d]),
+    fail = parse([a,b]),
+    ok.
+">>,
+    ok = run_file(Config, funs, Test1),
+
+Test2_shell =
+<<"Double = fun(X) -> 2 * X end,
           [2,4,6,8,10] = lists:map(Double, [1,2,3,4,5]),
-          
-          Big =  fun(X) -> if X > 10 -> true; true -> false end end,
-          false = lists:any(Big, [1,2,3,4]),
-          true = lists:any(Big, [1,2,3,12,5]),
-          false = lists:all(Big, [1,2,3,4,12,6]),
-          true = lists:all(Big, [12,13,14,15]),
-          L = [\"I\",\"like\",\"Erlang\"],
+
+  Big =  fun(X) -> if X > 10 -> true; true -> false end end,
+  false = lists:any(Big, [1,2,3,4]),
+  true = lists:any(Big, [1,2,3,12,5]),
+  false = lists:all(Big, [1,2,3,4,12,6]),
+  true = lists:all(Big, [12,13,14,15]),
+  L = [\"I\",\"like\",\"Erlang\"],
           11 = lists:foldl(fun(X, Sum) -> length(X) + Sum end, 0, L),
-          Upcase =  fun(X) when $a =< X,  X =< $z -> X + $A - $a;
-                       (X) -> X
-                    end,
-          Upcase_word = fun(X) -> lists:map(Upcase, X) end,
-          \"ERLANG\" = Upcase_word(\"Erlang\"),
+       Upcase =  fun(X) when $a =< X,  X =< $z -> X + $A - $a;
+		    (X) -> X
+		 end,
+       Upcase_word = fun(X) -> lists:map(Upcase, X) end,
+       \"ERLANG\" = Upcase_word(\"Erlang\"),
           [\"I\",\"LIKE\",\"ERLANG\"] = lists:map(Upcase_word, L),
           {[\"I\",\"LIKE\",\"ERLANG\"],11} =
                lists:mapfoldl(fun(Word, Sum) -> 
-                                  {Upcase_word(Word), Sum + length(Word)}
+				      {Upcase_word(Word), Sum + length(Word)}
                               end, 0, L),
-          [500,12,45] = lists:filter(Big, [500,12,2,45,6,7]),
-          [200,500,45] = lists:takewhile(Big, [200,500,45,5,3,45,6]),
-          [5,3,45,6] = lists:dropwhile(Big, [200,500,45,5,3,45,6]),
-          {[200,500,45],[5,3,45,6]} = 
-               lists:splitwith(Big, [200,500,45,5,3,45,6]),
+	    [500,12,45] = lists:filter(Big, [500,12,2,45,6,7]),
+	    [200,500,45] = lists:takewhile(Big, [200,500,45,5,3,45,6]),
+	    [5,3,45,6] = lists:dropwhile(Big, [200,500,45,5,3,45,6]),
+	    {[200,500,45],[5,3,45,6]} =
+		lists:splitwith(Big, [200,500,45,5,3,45,6]),
           %% {true,45} = lists:first(Big, [1,2,45,6,123]),
           %% false = lists:first(Big, [1,2,4,5]),
-          
-          Adder = fun(X) -> fun(Y) -> X + Y end end,
-          Add6 = Adder(6),
-          16 = Add6(10),
-          ok.
-       ">>,
-    ?line [ok] = scan(Test2_shell),
-    ok.
+
+	    Adder = fun(X) -> fun(Y) -> X + Y end end,
+	    Add6 = Adder(6),
+	    16 = Add6(10),
+	    ok.
+">>,
+    [ok] = scan(Test2_shell),
+ok.
 
 
-otp_5990(doc) ->
-    "OTP-5990. {erlang,is_record}.";
-otp_5990(suite) -> [];
+%% OTP-5990. {erlang,is_record}.
 otp_5990(Config) when is_list(Config) ->
-    ?line [true] = 
+    [true] =
         scan(<<"rd('OrdSet', {orddata = {},ordtype = type}), "
                "S = #'OrdSet'{ordtype = {}}, "
                "if tuple(S#'OrdSet'.ordtype) -> true; true -> false end.">>),
     ok.
 
-otp_6166(doc) ->
-    "OTP-6166. Order of record definitions.";
-otp_6166(suite) -> [];
+%% OTP-6166. Order of record definitions.
 otp_6166(Config) when is_list(Config) ->
-    Test1 = filename:join(?config(priv_dir, Config), "test1.hrl"),
+    Test1 = filename:join(proplists:get_value(priv_dir, Config), "test1.hrl"),
     Contents1 = <<"-module(test1).
                    -record(r5, {f}). -record(r3, {f = #r5{}}). "
                   "-record(r1, {f = #r3{}}). -record(r4, {f = #r1{}}). "
-                  "-record(r2, {f = #r4{}}).">>,
-    ?line ok = file:write_file(Test1, Contents1),
+"-record(r2, {f = #r4{}}).">>,
+    ok = file:write_file(Test1, Contents1),
 
-    Test2 = filename:join(?config(priv_dir, Config), "test2.hrl"),
+    Test2 = filename:join(proplists:get_value(priv_dir, Config), "test2.hrl"),
     Contents2 = <<"-module(test2).
                    -record(r5, {f}). -record(r3, {f = #r5{}}). "
                   "-record(r1, {f = #r3{}}). -record(r4, {f = #r1{}}). "
                   "-record(r2, {f = #r4{}}).
                    -record(r6, {f = #r5{}}).            % r6 > r0
                    -record(r0, {f = #r5{}, g = #r5{}}). % r0 < r5">>,
-    ?line ok = file:write_file(Test2, Contents2),
+    ok = file:write_file(Test2, Contents2),
     
     RR12 = "[r1,r2,r3,r4,r5] = rr(\"" ++ Test1 ++ "\"), 
             [r0,r1,r2,r3,r4,r5,r6] = rr(\"" ++ Test2 ++ "\"), 
@@ -2315,74 +2247,72 @@ otp_6166(Config) when is_list(Config) ->
             true = is_record(R0, r0),
             true = is_record(R6, r6),
             ok. ",
-    ?line [ok] = scan(RR12),
+    [ok] = scan(RR12),
 
     file:delete(Test1),
     file:delete(Test2),
     ok.
 
-otp_6554(doc) ->
-    "OTP-6554. Formatted exits and error messages.";
-otp_6554(suite) -> [];
+%% OTP-6554. Formatted exits and error messages.
 otp_6554(Config) when is_list(Config) ->
     %% Should check the stacktrace as well...
-    ?line "exception error: bad argument" = 
+    "exception error: bad argument" =
         comm_err(<<"math:sqrt(a).">>),
-    ?line "exception error: bad argument" = 
+    "exception error: bad argument" =
         comm_err(<<"fun(X, Y) -> X ++ Y end(a, b).">>),
-    ?line "exception error: bad argument" = 
+    "exception error: bad argument" =
         comm_err(<<"math:sqrt(lists:seq(1,40)).">>),
-    ?line "exception error: bad argument" = 
+    "exception error: bad argument" =
         comm_err(<<"math:sqrt(lists:seq(1,10)).">>),
-    ?line "exception error: bad argument" = 
+    "exception error: bad argument" =
         comm_err(<<"a ++ b.">>),
-    ?line "exception error: bad argument" = 
+    "exception error: bad argument" =
         comm_err(<<"I = {file_info,undefined,undefined,undefined,undefined,
                          undefined,undefined,undefined,undefined,undefined,
                          undefined,undefined,undefined,undefined},
                     aa ++ I.">>),
-    ?line "exception error: bad argument" = 
+    "exception error: bad argument" =
         comm_err(<<"I = {file_info,undefined,undefined,undefined,undefined,
                          undefined,undefined,undefined,undefined,undefined,
                          undefined,undefined,undefined,undefined},
                     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ++ I.">>),
-    ?line "exception error: bad argument" = 
+    "exception error: bad argument" =
         comm_err(<<"I = {file_info,undefined,undefined,undefined,undefined,
                          undefined,undefined,undefined,undefined,undefined,
                          undefined,undefined,undefined,undefined},
                     I ++ I.">>),
-    ?line "exception error: bad argument" = 
+    "exception error: bad argument" =
         comm_err(<<"fun(X) -> not X end(a).">>),
-    ?line "exception error: bad argument: a" = 
+    "exception error: bad argument: a" =
         comm_err(<<"fun(A, B) -> A orelse B end(a, b).">>),
-    ?line "exception error: an error occurred when evaluating an arithmetic expression" =
+    "exception error: an error occurred when evaluating an arithmetic expression" =
         comm_err(<<"math:sqrt(2)/round(math:sqrt(0)).">>),
-    ?line "exception error: interpreted function with arity 1 called with no arguments" = 
+    "exception error: interpreted function with arity 1 called with no arguments" =
         comm_err(<<"fun(V) -> V end().">>),
-    ?line "exception error: interpreted function with arity 1 called with two arguments" = 
+    "exception error: interpreted function with arity 1 called with two arguments" =
         comm_err(<<"fun(V) -> V end(1,2).">>),
-    ?line "exception error: interpreted function with arity 0 called with one argument" = 
+    "exception error: interpreted function with arity 0 called with one argument" =
         comm_err(<<"fun() -> v end(1).">>),
-    ?line "exception error: interpreted function with arity 0 called with 4 arguments" = 
+    "exception error: interpreted function with arity 0 called with 4 arguments" =
         comm_err(<<"fun() -> v end(1,2,3,4).">>),
-    ?line "exception error: math:sqrt/1 called with two arguments" = 
+    "exception error: math:sqrt/1 called with two arguments" =
         comm_err(<<"fun math:sqrt/1(1,2).">>),
-    ?line "exception error: bad function 1." ++ _ = 
+    "exception error: bad function 1." ++ _ =
         comm_err(<<"(math:sqrt(2))().">>),
-    ?line "exception error: bad function [1," ++ _ = 
+    "exception error: bad function [1," ++ _ =
         comm_err(<<"(lists:seq(1, 100))().">>),
-    ?line "exception error: no match of right hand side value 1" ++ _ = 
+    "exception error: no match of right hand side value 1" ++ _ =
         comm_err(<<"a = math:sqrt(2).">>),
-    ?line "exception error: no match of right hand side value" ++ _ = 
+    "exception error: no match of right hand side value" ++ _ =
         comm_err(<<"I = {file_info,undefined,undefined,undefined,undefined,
                          undefined,undefined,undefined,undefined,undefined,
                          undefined,undefined,undefined,undefined},
                     a = I.">>),
-    ?line "exception error: no case clause matching 1" ++ _ = 
+    "exception error: no case clause matching 1" ++ _ =
         comm_err(<<"case math:sqrt(2) of a -> ok end.">>),
-    ?line "exception error: no case clause matching [1," ++ _ = 
+    "exception error: no case clause matching [1," ++ _ =
         comm_err(<<"V = lists:seq(1, 20), case V of a -> ok end.">>),
-    ?line "exception error: no function clause matching" = 
+    "exception error: no function clause matching" =
         comm_err(<<"fun(P) when is_pid(P) -> true end(a).">>),
     case test_server:is_native(erl_eval) of
 	true ->
@@ -2404,68 +2334,68 @@ otp_6554(Config) when is_list(Config) ->
 		"lists:reverse(34) (lists.erl, line " ++ _ =
 		comm_err(<<"lists:reverse(34).">>)
     end,
-    ?line "exception error: function_clause" =
+    "exception error: function_clause" =
         comm_err(<<"erlang:error(function_clause, 4).">>),
-    ?line "exception error: no function clause matching" ++ _ = 
+    "exception error: no function clause matching" ++ _ =
         comm_err(<<"fun(a, b, c, d) -> foo end"
                    "       (lists:seq(1,17),"
                    "        lists:seq(1, 18),"
                    "        lists:seq(1, 40),"
                    "        lists:seq(1, 5)).">>),
 
-    ?line "exception error: no function clause matching" = 
+    "exception error: no function clause matching" =
         comm_err(<<"fun(P, q) when is_pid(P) -> true end(a, b).">>),
-    ?line "exception error: no true branch found when evaluating an if expression" = 
+    "exception error: no true branch found when evaluating an if expression" =
         comm_err(<<"if length([a,b]) > 17 -> a end.">>),
-    ?line "exception error: no such process or port" = 
+    "exception error: no such process or port" =
         comm_err(<<"Pid = spawn(fun() -> a end),"
                    "timer:sleep(1),"
                    "link(Pid).">>),
-    ?line "exception error: a system limit has been reached" = 
+    "exception error: a system limit has been reached" =
         comm_err(<<"list_to_atom(lists:duplicate(300,$a)).">>),
-    ?line "exception error: bad receive timeout value" = 
+    "exception error: bad receive timeout value" =
         comm_err(<<"receive after a -> foo end.">>),
-    ?line "exception error: no try clause matching 1" ++ _ = 
+    "exception error: no try clause matching 1" ++ _ =
         comm_err(<<"try math:sqrt(2) of bar -> yes after 3 end.">>),
-    ?line "exception error: no try clause matching [1" ++ _ = 
+    "exception error: no try clause matching [1" ++ _ =
         comm_err(<<"V = lists:seq(1, 20),"
                    "try V of bar -> yes after 3 end.">>),
-    ?line "exception error: undefined function math:sqrt/2" = 
+    "exception error: undefined function math:sqrt/2" =
         comm_err(<<"math:sqrt(2, 2).">>),
-    ?line "exception error: limit of number of arguments to interpreted function "
+    "exception error: limit of number of arguments to interpreted function "
           "exceeded" = 
         comm_err(<<"fun(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U) ->"
                    "   a end().">>),
-    ?line "exception error: bad filter a" = 
+    "exception error: bad filter a" =
         comm_err(<<"[b || begin a end].">>),
-    ?line "exception error: bad generator a" = 
+    "exception error: bad generator a" =
         comm_err(<<"[X || X <- a].">>),
-    ?line "exception throw: undef" = comm_err(<<"throw(undef).">>),
-    ?line "exception exit: undef" = comm_err(<<"exit(undef).">>),
+    "exception throw: undef" = comm_err(<<"throw(undef).">>),
+    "exception exit: undef" = comm_err(<<"exit(undef).">>),
 
-    ?line "exception exit: foo" = 
+    "exception exit: foo" =
           comm_err(<<"catch spawn_link(fun() ->"
                      "                     timer:sleep(300), exit(foo) "
                      "                 end),"
                      "timer:sleep(500).">>),
-    ?line [ok] = scan(
+    [ok] = scan(
                    <<"begin process_flag(trap_exit, true),"
                      "  Pid = spawn_link(fun() ->"
                      "                       timer:sleep(300), exit(foo) "
                      "                   end),"
                      "  timer:sleep(500),"
                      "  receive {'EXIT', Pid, foo} -> ok end end.">>),
-    ?line "exception exit: badarith" = 
+    "exception exit: badarith" =
           comm_err(<<"catch spawn_link(fun() ->"
                      "                     timer:sleep(300), 1/0 "
                      "                 end),"
                      "timer:sleep(500).">>),
-    ?line "exception exit: {nocatch,foo}" = 
+    "exception exit: {nocatch,foo}" =
           comm_err(<<"catch spawn_link(fun() ->"
                      "                     timer:sleep(300), throw(foo) "
                      "                 end),"
                      "timer:sleep(500).">>),
-    ?line [ok] = scan(
+    [ok] = scan(
                    <<"begin process_flag(trap_exit, true),"
                      "  Pid = spawn_link(fun() ->"
                      "                       timer:sleep(300), throw(foo) "
@@ -2474,37 +2404,37 @@ otp_6554(Config) when is_list(Config) ->
                      "  receive {'EXIT', Pid, {{nocatch,foo},_}} -> ok end "
                      "end.">>),
 
-    ?line "exception error: an error occurred when evaluating an arithmetic expression" =
+    "exception error: an error occurred when evaluating an arithmetic expression" =
         comm_err(<<"begin catch_exception(true), 1/0 end.">>),
-    ?line "exception error: an error occurred when evaluating an arithmetic expression" =
+    "exception error: an error occurred when evaluating an arithmetic expression" =
         comm_err(<<"begin catch_exception(false), 1/0 end.">>),
-    ?line "exception error: no function clause matching call to catch_exception/1" = 
+    "exception error: no function clause matching call to catch_exception/1" =
         comm_err(<<"catch_exception(1).">>),
 
     %% A bug was corrected (expansion of 'try'):
-    ?line "2: command not found" = 
+    "2: command not found" =
         comm_err(<<"try 1 of 1 -> v(2) after 3 end.">>),
     %% Cover a few lines:
-    ?line "3: command not found" = 
+    "3: command not found" =
         comm_err(<<"receive foo -> foo after 0 -> v(3) end.">>),
-    ?line "3: command not found" = 
+    "3: command not found" =
         comm_err(<<"receive foo -> foo after 0 -> e(3) end.">>),
-    ?line "1 / 0: command not found" = comm_err(<<"v(1/0).">>),
-    ?line "1\n1.\n" = t(<<"1. e(1).">>),
-    ?line [ok] = scan(<<"h().">>),
-    ?line "exception exit: normal" = comm_err(<<"exit(normal).">>),
-    ?line [foo] = scan(<<"begin history(0), foo end.">>),
-    ?line application:unset_env(stdlib, shell_history_length),
-    ?line [true] = scan(<<"begin <<10:(1024*1024*10)>>,"
+    "1 / 0: command not found" = comm_err(<<"v(1/0).">>),
+    "1\n1.\n" = t(<<"1. e(1).">>),
+    [ok] = scan(<<"h().">>),
+    "exception exit: normal" = comm_err(<<"exit(normal).">>),
+    [foo] = scan(<<"begin history(0), foo end.">>),
+    application:unset_env(stdlib, shell_history_length),
+    [true] = scan(<<"begin <<10:(1024*1024*10)>>,"
                           "<<10:(1024*1024*10)>>, garbage_collect() end.">>),
-    ?line "1: syntax error before: '.'" = comm_err("1-."),
-    %% ?line comm_err(<<"exit().">>), % would hang
-    ?line "exception error: no function clause matching call to history/1" =
+    "1: syntax error before: '.'" = comm_err("1-."),
+    %% comm_err(<<"exit().">>), % would hang
+    "exception error: no function clause matching call to history/1" =
         comm_err(<<"history(foo).">>),
-    ?line "exception error: no function clause matching call to results/1" =
+    "exception error: no function clause matching call to results/1" =
         comm_err(<<"results(foo).">>),
 
-    ?line Test = filename:join(?config(priv_dir, Config), 
+    Test = filename:join(proplists:get_value(priv_dir, Config),
 			       "otp_6554.erl"),
     Contents = <<"-module(otp_6554).
                   -export([local_allowed/3, non_local_allowed/3]).
@@ -2514,31 +2444,31 @@ otp_6554(Config) when is_list(Config) ->
                   non_local_allowed(_,_,State) ->
                       {true,State}.
                  ">>,
-    ?line ok = compile_file(Config, Test, Contents, []),
-    ?line "exception exit: restricted shell starts now" = 
+    ok = compile_file(Config, Test, Contents, []),
+    "exception exit: restricted shell starts now" =
 	comm_err(<<"begin shell:start_restricted(otp_6554) end.">>),
-    ?line "-record(r,{}).\n1.\nok.\n" = 
+    "-record(r,{}).\n1.\nok.\n" =
                     t(<<"f(), f(B), h(), b(), history(20), results(20),"
                         "rd(r, {}), rl(r), rf('_'), rl(), rf(),"
                         "rp(1), _ = rr({foo}), _ = rr({foo}, []),"
                         "rr({foo}, [], []), ok.">>),
-    ?line "false.\n" = t(<<"catch_exception(true).">>),
-    ?line "exception exit: restricted shell stopped"=  
+    "false.\n" = t(<<"catch_exception(true).">>),
+    "exception exit: restricted shell stopped"=
 	comm_err(<<"begin shell:stop_restricted() end.">>),
-    ?line "true.\n" = t(<<"catch_exception(false).">>),
+    "true.\n" = t(<<"catch_exception(false).">>),
 
-    ?line "20\n1\n1\n1: results(2)\n2: 1\n-> 1\n3: v(2)\n-> 1.\nok.\n" = 
+    "20\n1\n1\n1: results(2)\n2: 1\n-> 1\n3: v(2)\n-> 1.\nok.\n" =
              t(<<"results(2). 1. v(2). h().">>),
-    ?line application:unset_env(stdlib, shell_saved_results),
-    ?line "1\nfoo\n17\nB = foo\nC = 17\nF = fun() ->\n           foo"
+    application:unset_env(stdlib, shell_saved_results),
+    "1\nfoo\n17\nB = foo\nC = 17\nF = fun() ->\n           foo"
           "\n    end.\nok.\n" = 
         t(<<"begin F = fun() -> foo end, 1 end. B = F(). C = 17. b().">>),
 
-    ?line "3: command not found" = comm_err(<<"#{v(3) => v}.">>),
-    ?line "3: command not found" = comm_err(<<"#{k => v(3)}.">>),
-    ?line "3: command not found" = comm_err(<<"#{v(3) := v}.">>),
-    ?line "3: command not found" = comm_err(<<"#{k := v(3)}.">>),
-    ?line "3: command not found" = comm_err(<<"(v(3))#{}.">>),
+    "3: command not found" = comm_err(<<"#{v(3) => v}.">>),
+    "3: command not found" = comm_err(<<"#{k => v(3)}.">>),
+    "3: command not found" = comm_err(<<"#{v(3) := v}.">>),
+    "3: command not found" = comm_err(<<"#{k := v(3)}.">>),
+    "3: command not found" = comm_err(<<"(v(3))#{}.">>),
     %% Tests I'd like to do: (you should try them manually)
     %% "catch spawn_link(fun() -> timer:sleep(1000), exit(foo) end)."
     %%   "** exception error: foo" should be output after 1 second
@@ -2550,12 +2480,10 @@ otp_6554(Config) when is_list(Config) ->
 
     ok.
 
-otp_7184(doc) ->
-    "OTP-7184. Propagate exit signals from dying evaluator process.";
-otp_7184(suite) -> [];
+%% OTP-7184. Propagate exit signals from dying evaluator process.
 otp_7184(Config) when is_list(Config) ->
     register(otp_7184, self()),
-    ?line catch 
+    catch
            t(<<"P = self(),
                 spawn_link(fun() -> process_flag(trap_exit,true),
                                     P ! up,
@@ -2567,7 +2495,7 @@ otp_7184(Config) when is_list(Config) ->
                 erlang:raise(throw, thrown, []).">>),
     receive {otp_7184,{'EXIT',_,{{nocatch,thrown},[]}}} -> ok end,
 
-    ?line catch 
+    catch
            t(<<"P = self(),
                 spawn_link(fun() -> process_flag(trap_exit,true),
                                     P ! up,
@@ -2579,7 +2507,7 @@ otp_7184(Config) when is_list(Config) ->
                 erlang:raise(exit, fini, []).">>),
     receive {otp_7184,{'EXIT',_,{fini,[]}}} -> ok end,
 
-    ?line catch 
+    catch
            t(<<"P = self(),
                 spawn_link(fun() -> process_flag(trap_exit,true),
                                     P ! up,
@@ -2594,18 +2522,16 @@ otp_7184(Config) when is_list(Config) ->
     unregister(otp_7184),
 
     %% v/1, a few missed cases
-    ?line "17\n<<0,0,0,64>>.\nok.\n" =
+    "17\n<<0,0,0,64>>.\nok.\n" =
         t(<<"17. "
             "<<64:32>>. "
            "<<64>> = << << X >> || << X >>  <= v(2), X > v(1) >>, ok.">>),
 
-    ?line "17\n<<0,17>>.\n" =t(<<"17. <<(v(1)):16>>.">>),
+    "17\n<<0,17>>.\n" =t(<<"17. <<(v(1)):16>>.">>),
 
     ok.
 
-otp_7232(doc) ->
-    "OTP-7232. qlc:info() bug.";
-otp_7232(suite) -> [];
+%% OTP-7232. qlc:info() bug.
 otp_7232(Config) when is_list(Config) ->
     Info = <<"qlc:info(qlc:sort(qlc:q([X || X <- [55296,56296]]), "
              "{order, fun(A,B)-> A>B end})).">>,
@@ -2616,24 +2542,22 @@ otp_7232(Config) when is_list(Config) ->
     "           end}])" = evaluate(Info, []),
     ok.
 
-otp_8393(doc) ->
-    "OTP-8393. Prompt string.";
-otp_8393(suite) -> [];
+%% OTP-8393. Prompt string.
 otp_8393(Config) when is_list(Config) ->
-    ?line _ = shell:prompt_func(default),
-    ?line "Bad prompt function: '> '" =
+    _ = shell:prompt_func(default),
+    "Bad prompt function: '> '" =
         prompt_err(<<"shell:prompt_func('> ').">>),
 
-    ?line _ = shell:prompt_func(default),
-    ?line "exception error: an error occurred when evaluating an arithmetic expression"++_ =
+    _ = shell:prompt_func(default),
+    "exception error: an error occurred when evaluating an arithmetic expression"++_ =
         prompt_err(<<"shell:prompt_func({shell_SUITE,prompt4}).">>),
 
-    ?line _ = shell:prompt_func(default),
-    ?line "default.\n" =
+    _ = shell:prompt_func(default),
+    "default.\n" =
         t(<<"shell:prompt_func({shell_SUITE,prompt2}).">>),
 
-    ?line _ = shell:prompt_func(default),
-    ?line "default\nl.\n" = 
+    _ = shell:prompt_func(default),
+    "default\nl.\n" =
         t(<<"shell:prompt_func({shell_SUITE,prompt3}). l.">>),
 
     %%
@@ -2642,8 +2566,8 @@ otp_8393(Config) when is_list(Config) ->
     %% That is instead tested in the io_proto_SUITE, which has
     %% the right infrastructure in place for such tests. /PaN
     %%
-    ?line _ = shell:prompt_func(default),
-    ?line "default\nl.\n" = 
+    _ = shell:prompt_func(default),
+    "default\nl.\n" =
         t(<<"shell:prompt_func({shell_SUITE,prompt5}). l.">>),
 
     %% Restricted shell.
@@ -2661,30 +2585,30 @@ otp_8393(Config) when is_list(Config) ->
                   non_local_allowed(_,_,State) ->
                       {false,State}.
                  ">>,
-    ?line Test = filename:join(?config(priv_dir, Config), 
+    Test = filename:join(proplists:get_value(priv_dir, Config),
 			       "test_restricted_shell.erl"),
-    ?line ok = compile_file(Config, Test, Contents, []),
-    ?line _ = shell:prompt_func(default),
-    ?line "exception exit: restricted shell starts now" = 
+    ok = compile_file(Config, Test, Contents, []),
+    _ = shell:prompt_func(default),
+    "exception exit: restricted shell starts now" =
 	comm_err(<<"begin shell:start_restricted("
 			 "test_restricted_shell) end.">>),
-    ?line "default.\n"++_ = 
+    "default.\n"++_ =
         t(<<"shell:prompt_func({shell_SUITE,prompt1}).">>),
-    ?line "exception exit: restricted shell does not allow apple(" ++ _ =
+    "exception exit: restricted shell does not allow apple(" ++ _ =
 	comm_err(<<"apple(1).">>),
-    ?line "{shell_SUITE,prompt1}.\n" = 
+    "{shell_SUITE,prompt1}.\n" =
         t(<<"shell:prompt_func(default).">>),
-    ?line "exception exit: restricted shell stopped"=  
+    "exception exit: restricted shell stopped"=
 	comm_err(<<"begin shell:stop_restricted() end.">>),
-    ?line undefined = 
+    undefined =
 	application:get_env(stdlib, restricted_shell),
 
-    ?line NR = shell:results(20),
-    ?line "default\n20.\n" = 
+    NR = shell:results(20),
+    "default\n20.\n" =
         t(<<"shell:prompt_func({shell_SUITE,prompt3}). results(0).">>),
 
-    ?line _ = shell:prompt_func(default),
-    ?line 0 = shell:results(NR),
+    _ = shell:prompt_func(default),
+    0 = shell:results(NR),
     ok.
 
 prompt1(_L) ->
@@ -2745,12 +2669,10 @@ prompt_err(B) ->
     S = string:strip(S2, both, $"),
     string:strip(S, right, $.).
 
-otp_10302(doc) ->
-    "OTP-10302. Unicode.";
-otp_10302(suite) -> [];
+%% OTP-10302. Unicode.
 otp_10302(Config) when is_list(Config) ->
     {ok,Node} = start_node(shell_suite_helper_2,
-			   "-pa "++?config(priv_dir,Config)++
+			   "-pa "++proplists:get_value(priv_dir,Config)++
 			   " +pc unicode"),
     Test1 =
         <<"begin
@@ -3095,9 +3017,9 @@ run_file(Config, Module, Test) ->
     ok.
 
 compile_file(Config, File, Test, Opts0) ->
-    ?line Opts = [export_all,return,{outdir,?config(priv_dir, Config)}|Opts0],
-    ?line ok = file:write_file(File, Test),
-    ?line case compile:file(File, Opts) of
+    Opts = [export_all,return,{outdir,proplists:get_value(priv_dir, Config)}|Opts0],
+    ok = file:write_file(File, Test),
+    case compile:file(File, Opts) of
               {ok, _M, _Ws} -> ok;
               _ -> error
           end.
@@ -3105,10 +3027,10 @@ compile_file(Config, File, Test, Opts0) ->
 filename(Name, Config) when is_atom(Name) ->
     filename(atom_to_list(Name), Config);
 filename(Name, Config) ->
-    filename:join(?config(priv_dir, Config), Name).
+    filename:join(proplists:get_value(priv_dir, Config), Name).
 
 start_node(Name, Xargs) ->
-    ?line N = test_server:start_node(Name, slave, [{args, " " ++ Xargs}]),
+    N = test_server:start_node(Name, slave, [{args, " " ++ Xargs}]),
     global:sync(),
     N.
 
diff --git a/lib/stdlib/test/slave_SUITE.erl b/lib/stdlib/test/slave_SUITE.erl
index 65627b3741..dc14e4735a 100644
--- a/lib/stdlib/test/slave_SUITE.erl
+++ b/lib/stdlib/test/slave_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(slave_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, t_start/1, t_start_link/1,
@@ -29,7 +29,9 @@
 -export([fun_init/1, test_errors/1]).
 -export([timeout_test/1, auth_test/1, rsh_test/1, start_a_slave/3]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [t_start_link, start_link_nodedown, t_start, errors].
@@ -50,30 +52,27 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-t_start_link(suite) -> [];
 t_start_link(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(20)),
-
     %% Define useful variables.
 
-    ?line Host = host(),
-    ?line Slave1 = node_name(Host, slave1),
-    ?line Slave2 = node_name(Host, slave2),
+    Host = host(),
+    Slave1 = node_name(Host, slave1),
+    Slave2 = node_name(Host, slave2),
 
     %% Test slave:start_link() with one, two, and three arguments.
 
-    ?line ThisNode = node(),
-    ?line {error, {already_running, ThisNode}} = slave:start_link(Host),
-    ?line {ok, Slave1} = slave:start_link(Host, slave1),
-    ?line {ok, Slave2} = slave:start_link(Host, slave2, "-my_option 42"),
-    ?line {ok, [["42"]]} = rpc:call(Slave2, init, get_argument, [my_option]),
+    ThisNode = node(),
+    {error, {already_running, ThisNode}} = slave:start_link(Host),
+    {ok, Slave1} = slave:start_link(Host, slave1),
+    {ok, Slave2} = slave:start_link(Host, slave2, "-my_option 42"),
+    {ok, [["42"]]} = rpc:call(Slave2, init, get_argument, [my_option]),
 
     %% Kill the two slave nodes and verify that they are dead.
 
-    ?line rpc:cast(Slave1, erlang, halt, []),
-    ?line rpc:cast(Slave2, erlang, halt, []),
-    ?line is_dead(Slave1),
-    ?line is_dead(Slave2),
+    rpc:cast(Slave1, erlang, halt, []),
+    rpc:cast(Slave2, erlang, halt, []),
+    is_dead(Slave1),
+    is_dead(Slave2),
 
     %% Start two slave nodes from another process and verify that
     %% the slaves die when that process terminates.
@@ -85,41 +84,36 @@ t_start_link(Config) when is_list(Config) ->
 			    Parent ! slaves_started,
 			    receive never -> ok end
 		    end),
-    ?line receive slaves_started -> ok end,
-    ?line process_flag(trap_exit, true),
-    ?line wait_alive(Slave1),
-    ?line wait_alive(Slave2),
-    ?line exit(Pid, kill),
-    ?line receive {'EXIT', Pid, killed} -> ok end,
-    ?line test_server:sleep(250),
-    ?line is_dead(Slave1),
-    ?line is_dead(Slave2),
-		  
-    ?line test_server:timetrap_cancel(Dog),
+    receive slaves_started -> ok end,
+    process_flag(trap_exit, true),
+    wait_alive(Slave1),
+    wait_alive(Slave2),
+    exit(Pid, kill),
+    receive {'EXIT', Pid, killed} -> ok end,
+    ct:sleep(250),
+    is_dead(Slave1),
+    is_dead(Slave2),
+
     ok.
 
 %% Test that slave:start_link() works when the master exits.
 
-start_link_nodedown(suite) -> [];
 start_link_nodedown(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(20)),
-
     %% Define useful variables.
 
-    ?line Host = host(),
-    ?line Master = node_name(Host, my_master),
-    ?line Slave = node_name(Host, my_slave),
+    Host = host(),
+    Master = node_name(Host, my_master),
+    Slave = node_name(Host, my_slave),
+
+    Pa = "-pa " ++ filename:dirname(code:which(?MODULE)),
+    {ok, Master} = slave:start_link(Host, my_master, Pa),
+    spawn(Master, ?MODULE, start_a_slave, [self(), Host, my_slave]),
+    {reply, {ok, _Node}} = receive Any -> Any end,
 
-    ?line Pa = "-pa " ++ filename:dirname(code:which(?MODULE)),
-    ?line {ok, Master} = slave:start_link(Host, my_master, Pa),
-    ?line spawn(Master, ?MODULE, start_a_slave, [self(), Host, my_slave]),
-    ?line {reply, {ok, _Node}} = receive Any -> Any end,
-    
-    ?line rpc:call(Master, erlang, halt, []),
-    ?line receive after 200 -> ok end,
-    ?line pang = net_adm:ping(Slave),
+    rpc:call(Master, erlang, halt, []),
+    receive after 200 -> ok end,
+    pang = net_adm:ping(Slave),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 start_a_slave(ReplyTo, Host, Name) ->
@@ -128,82 +122,74 @@ start_a_slave(ReplyTo, Host, Name) ->
 
 %% Test slave:start().
 
-t_start(suite) -> [];
 t_start(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(20)),
-    
     %% Define useful variables.
 
-    ?line Host = host(),
-    ?line Slave1 = node_name(Host, slave1),
-    ?line Slave2 = node_name(Host, slave2),
+    Host = host(),
+    Slave1 = node_name(Host, slave1),
+    Slave2 = node_name(Host, slave2),
 
     %% By running all tests from this master node which is linked
     %% to this test case, we ensure that all slaves are killed
     %% if this test case fails.  (If they are not, and therefore further
     %% test cases fail, there is a bug in slave.)
 
-    ?line {ok, Master} = slave:start_link(Host, master),
-    
+    {ok, Master} = slave:start_link(Host, master),
+
     %% Test slave:start() with one, two, and three arguments.
 
-    ?line ThisNode = node(),
-    ?line {error, {already_running, ThisNode}} = slave:start(Host),
-    ?line {ok, Slave1} = rpc:call(Master, slave, start, [Host, slave1]),
-    ?line {ok, Slave2} = rpc:call(Master, slave, start,
-				  [Host, slave2, "-my_option 42"]),
-    ?line {ok, [["42"]]} = rpc:call(Slave2, init, get_argument, [my_option]),
+    ThisNode = node(),
+    {error, {already_running, ThisNode}} = slave:start(Host),
+    {ok, Slave1} = rpc:call(Master, slave, start, [Host, slave1]),
+    {ok, Slave2} = rpc:call(Master, slave, start,
+			    [Host, slave2, "-my_option 42"]),
+    {ok, [["42"]]} = rpc:call(Slave2, init, get_argument, [my_option]),
 
     %% Test that a slave terminates when its master node terminates.
 
-    ?line ok = slave:stop(Slave2),
-    ?line is_dead(Slave2),
-    ?line {ok, Slave2} = rpc:call(Slave1, slave, start, [Host, slave2]),
-    ?line is_alive(Slave2),
-    ?line rpc:call(Slave1, erlang, halt, []),	% Kill master.
+    ok = slave:stop(Slave2),
+    is_dead(Slave2),
+    {ok, Slave2} = rpc:call(Slave1, slave, start, [Host, slave2]),
+    is_alive(Slave2),
+    rpc:call(Slave1, erlang, halt, []),	% Kill master.
     receive after 1000 -> ok end,		% Make sure slaves have noticed
 						% their dead master.
-    ?line is_dead(Slave1),
-    ?line is_dead(Slave2),			% Slave should be dead, too.
+    is_dead(Slave1),
+    is_dead(Slave2),			% Slave should be dead, too.
 
     %% Kill all slaves and verify that they are dead.
 
-    ?line ok = slave:stop(Slave1),
-    ?line ok = slave:stop(Slave2),
-    ?line is_dead(Slave1),
-    ?line is_dead(Slave2),
+    ok = slave:stop(Slave1),
+    ok = slave:stop(Slave2),
+    is_dead(Slave1),
+    is_dead(Slave2),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 %% Test the various error conditions in parallell (since the timeout
 %% in slave is 32 seconds).
 
-errors(suite) -> [];
 errors(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(50)),
-
-    ?line process_flag(trap_exit, true),
-    ?line Pa = filename:dirname(code:which(?MODULE)),
-    ?line {ok, Master} = slave_start_link(host(), master,
-					  "-rsh no_rsh_program -pa "++Pa++
-					  " -env ERL_CRASH_DUMP erl_crash_dump.master"),
-    ?line Pids = rpc:call(Master, ?MODULE, test_errors, [self()]),
-    ?line wait_for_result(Pids),
+    process_flag(trap_exit, true),
+    Pa = filename:dirname(code:which(?MODULE)),
+    {ok, Master} = slave_start_link(host(), master,
+				    "-rsh no_rsh_program -pa "++Pa++
+					" -env ERL_CRASH_DUMP erl_crash_dump.master"),
+    Pids = rpc:call(Master, ?MODULE, test_errors, [self()]),
+    wait_for_result(Pids),
 
-    ?line test_server:timetrap_cancel(Dog),
     ok.
 
 wait_for_result([]) ->
     ok;
 wait_for_result(Pids) ->
-    ?line receive
-	      {'EXIT', Pid, normal} ->
-		  io:format("Process ~p terminated", [Pid]),
-		  wait_for_result(lists:delete(Pid, Pids));
-	      {'EXIT', _, Reason} ->
-		  exit(Reason)
-	  end.
+    receive
+	{'EXIT', Pid, normal} ->
+	    io:format("Process ~p terminated", [Pid]),
+	    wait_for_result(lists:delete(Pid, Pids));
+	{'EXIT', _, Reason} ->
+	    exit(Reason)
+    end.
 
 show_process_info(Pid) ->
     io:format("~p: ~p", [Pid, catch process_info(Pid, initial_call)]).
@@ -211,25 +197,25 @@ show_process_info(Pid) ->
 test_errors(ResultTo) ->
     %% Sigh!  We use ordinary spawn instead of fun_spawn/1 to be able
     %% identify the processes by their initial call.
-    ?line P1 = spawn(?MODULE, timeout_test, [ResultTo]),
-    ?line P2 = spawn(?MODULE, auth_test, [ResultTo]),
-    ?line P3 = spawn(?MODULE, rsh_test, [ResultTo]),
+    P1 = spawn(?MODULE, timeout_test, [ResultTo]),
+    P2 = spawn(?MODULE, auth_test, [ResultTo]),
+    P3 = spawn(?MODULE, rsh_test, [ResultTo]),
     Pids =[P1, P2, P3],
-    ?line lists:foreach(fun show_process_info/1, Pids),
+    lists:foreach(fun show_process_info/1, Pids),
     Pids.
 
 timeout_test(ResultTo) ->
     link(ResultTo),
-    ?line {error, timeout} = slave:start(host(), slave1, "-boot no_boot_script").
+    {error, timeout} = slave:start(host(), slave1, "-boot no_boot_script").
 
 auth_test(ResultTo) ->
     link(ResultTo),
-    ?line {error, timeout} = slave:start(host(), slave2,
-					 "-setcookie definitely_not_a_cookie").
+    {error, timeout} = slave:start(host(), slave2,
+				   "-setcookie definitely_not_a_cookie").
 
 rsh_test(ResultTo) ->
     link(ResultTo),
-    ?line {error, no_rsh} = slave:start(super, slave3).
+    {error, no_rsh} = slave:start(super, slave3).
 
 
 %%% Utilities.    
@@ -239,7 +225,7 @@ wait_alive(Node) ->
     wait_alive_1(10, Node).
 
 wait_alive_1(0, Node) ->
-    ?t:fail({still_not_alive,Node});
+    ct:fail({still_not_alive,Node});
 wait_alive_1(N, Node) ->
     case rpc:call(Node, init, get_status, []) of
 	{started,_} ->
diff --git a/lib/stdlib/test/sofs_SUITE.erl b/lib/stdlib/test/sofs_SUITE.erl
index d23eb3abb9..2277b2d6fb 100644
--- a/lib/stdlib/test/sofs_SUITE.erl
+++ b/lib/stdlib/test/sofs_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(sofs_SUITE).
 
-%-define(debug, true).
+%%-define(debug, true).
 
 -ifdef(debug).
 -define(format(S, A), io:format(S, A)).
@@ -27,7 +27,7 @@
 -define(config(X,Y), foo).
 -define(t, test_server).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(format(S, A), ok).
 -endif.
 
@@ -35,28 +35,28 @@
 	 init_per_group/2,end_per_group/2]).
 
 -export([ from_term_1/1, set_1/1, from_sets_1/1, relation_1/1,
-	 a_function_1/1, family_1/1, projection/1,
-	 relation_to_family_1/1, domain_1/1, range_1/1, image/1,
-	 inverse_image/1, inverse_1/1, converse_1/1, no_elements_1/1,
-	 substitution/1, restriction/1, drestriction/1,
-	 strict_relation_1/1, extension/1, weak_relation_1/1,
-	 to_sets_1/1, specification/1, union_1/1, intersection_1/1,
-	 difference/1, symdiff/1, symmetric_partition/1,
-	 is_sofs_set_1/1, is_set_1/1, is_equal/1, is_subset/1,
-	 is_a_function_1/1, is_disjoint/1, join/1, canonical/1,
-	 composite_1/1, relative_product_1/1, relative_product_2/1,
-	 product_1/1, partition_1/1, partition_3/1,
-	 multiple_relative_product/1, digraph/1, constant_function/1,
-	 misc/1]).
+	  a_function_1/1, family_1/1, projection/1,
+	  relation_to_family_1/1, domain_1/1, range_1/1, image/1,
+	  inverse_image/1, inverse_1/1, converse_1/1, no_elements_1/1,
+	  substitution/1, restriction/1, drestriction/1,
+	  strict_relation_1/1, extension/1, weak_relation_1/1,
+	  to_sets_1/1, specification/1, union_1/1, intersection_1/1,
+	  difference/1, symdiff/1, symmetric_partition/1,
+	  is_sofs_set_1/1, is_set_1/1, is_equal/1, is_subset/1,
+	  is_a_function_1/1, is_disjoint/1, join/1, canonical/1,
+	  composite_1/1, relative_product_1/1, relative_product_2/1,
+	  product_1/1, partition_1/1, partition_3/1,
+	  multiple_relative_product/1, digraph/1, constant_function/1,
+	  misc/1]).
 
 -export([ family_specification/1,
-         family_domain_1/1, family_range_1/1,
-	 family_to_relation_1/1, 
-         union_of_family_1/1, intersection_of_family_1/1,
-         family_projection/1, family_difference/1, 
-         family_intersection_1/1, family_union_1/1,
-         family_intersection_2/1, family_union_2/1,
-         partition_family/1]).
+	  family_domain_1/1, family_range_1/1,
+	  family_to_relation_1/1,
+	  union_of_family_1/1, intersection_of_family_1/1,
+	  family_projection/1, family_difference/1,
+	  family_intersection_1/1, family_union_1/1,
+	  family_intersection_2/1, family_union_2/1,
+	  partition_family/1]).
 
 -import(sofs, 
 	[a_function/1, a_function/2, constant_function/2,
@@ -87,7 +87,9 @@
 
 -compile({inline,[{eval,2}]}).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,2}}].
 
 all() -> 
     [{group, sofs}, {group, sofs_family}].
@@ -129,401 +131,384 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    Dog=?t:timetrap(?t:minutes(2)),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
 %% [{2,b},{1,a,b}] == lists:sort([{2,b},{1,a,b}])
 %% [{1,a,b},{2,b}] == lists:keysort(1,[{2,b},{1,a,b}])
 
 
-from_term_1(suite) -> [];
-from_term_1(doc) -> [""];
 from_term_1(Conf) when is_list(Conf) ->
     %% would go wrong: projection(1,from_term([{2,b},{1,a,b}])),
 
-    ?line {'EXIT', {badarg, _}} = (catch from_term([], {atom,'_',atom})),
-    ?line {'EXIT', {badarg, _}} = (catch from_term([], [])),
-    ?line {'EXIT', {badarg, _}} = (catch from_term([], [atom,atom])),
-
-    ?line [] = to_external(from_term([])),
-    ?line eval(from_term([]), empty_set()),
-    ?line [] = to_external(from_term([], ['_'])),
-    ?line eval(from_term([], ['_']), empty_set()),
-    ?line [[]] = to_external(from_term([[]])),
-    ?line [[['_']]] = type(from_term([[],[[]]])),
-    ?line [[],[[]]] = to_external(from_term([[],[[]]])),
-    ?line [[['_']]] = type(from_term([[],[[]]])),
-    ?line eval(from_term([a],['_']), set([a])),
-    ?line [[],[a]] = to_external(from_term([[],[a]])),
-    ?line [[],[{a}]] = to_external(from_term([[{a}],[]])),
-    ?line [{[],[{a,b,[d]}]},{[{a,b}],[]}] =
+    {'EXIT', {badarg, _}} = (catch from_term([], {atom,'_',atom})),
+    {'EXIT', {badarg, _}} = (catch from_term([], [])),
+    {'EXIT', {badarg, _}} = (catch from_term([], [atom,atom])),
+
+    [] = to_external(from_term([])),
+    eval(from_term([]), empty_set()),
+    [] = to_external(from_term([], ['_'])),
+    eval(from_term([], ['_']), empty_set()),
+    [[]] = to_external(from_term([[]])),
+    [[['_']]] = type(from_term([[],[[]]])),
+    [[],[[]]] = to_external(from_term([[],[[]]])),
+    [[['_']]] = type(from_term([[],[[]]])),
+    eval(from_term([a],['_']), set([a])),
+    [[],[a]] = to_external(from_term([[],[a]])),
+    [[],[{a}]] = to_external(from_term([[{a}],[]])),
+    [{[],[{a,b,[d]}]},{[{a,b}],[]}] =
 	to_external(from_term([{[],[{a,b,[d]}]},{[{a,b}],[]}])),
 
-    ?line [{[a,b],[c,d]}] = to_external(from_term([{[a,b],[c,d]}])),
-    ?line [{{a,b},[a,b],{{a},{b}}}] =
+    [{[a,b],[c,d]}] = to_external(from_term([{[a,b],[c,d]}])),
+    [{{a,b},[a,b],{{a},{b}}}] =
 	to_external(from_term([{{a,b},[a,b],{{a},{b}}}])),
-    ?line [{{a,{[a,b]},a}},{{z,{[y,z]},z}}] =
+    [{{a,{[a,b]},a}},{{z,{[y,z]},z}}] =
 	to_external(from_term([{{a,{[a,b,a]},a}},{{z,{[y,y,z]},z}}])),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch from_term([{m1,[{m1,f1,1},{m1,f2,2}]},{m2,[]},{m3,[a]}])),
-    ?line MS1 = [{m1,[{m1,f1,1},{m1,f2,2}]},{m2,[]},{m3,[{m3,f3,3}]}],
-    ?line eval(to_external(from_term(MS1)), MS1),
-
-    ?line eval(to_external(from_term(a)), a),
-    ?line eval(to_external(from_term({a})), {a}),
-
-    ?line eval(to_external(from_term([[a],[{b,c}]],[[atomic]])),
-	       [[a],[{b,c}]]),
-    ?line eval(type(from_term([[a],[{b,c}]],[[atomic]])),
-	       [[atomic]]),
-
-    ?line {'EXIT', {badarg, _}} = (catch from_term([[],[],a])),
-    ?line {'EXIT', {badarg, _}} = (catch from_term([{[a,b],[c,{d}]}])),
-    ?line {'EXIT', {badarg, _}} = (catch from_term([[],[a],[{a}]])),
-    ?line {'EXIT', {badarg, _}} = (catch from_term([a,{a,b}])),
-    ?line {'EXIT', {badarg, _}} = (catch from_term([[a],[{b,c}]],[['_']])),
-    ?line {'EXIT', {badarg, _}} = (catch from_term([a | {a,b}])),
-    ?line {'EXIT', {badarg, _}} = 
+    MS1 = [{m1,[{m1,f1,1},{m1,f2,2}]},{m2,[]},{m3,[{m3,f3,3}]}],
+    eval(to_external(from_term(MS1)), MS1),
+
+    eval(to_external(from_term(a)), a),
+    eval(to_external(from_term({a})), {a}),
+
+    eval(to_external(from_term([[a],[{b,c}]],[[atomic]])),
+	 [[a],[{b,c}]]),
+    eval(type(from_term([[a],[{b,c}]],[[atomic]])),
+	 [[atomic]]),
+
+    {'EXIT', {badarg, _}} = (catch from_term([[],[],a])),
+    {'EXIT', {badarg, _}} = (catch from_term([{[a,b],[c,{d}]}])),
+    {'EXIT', {badarg, _}} = (catch from_term([[],[a],[{a}]])),
+    {'EXIT', {badarg, _}} = (catch from_term([a,{a,b}])),
+    {'EXIT', {badarg, _}} = (catch from_term([[a],[{b,c}]],[['_']])),
+    {'EXIT', {badarg, _}} = (catch from_term([a | {a,b}])),
+    {'EXIT', {badarg, _}} =
 	(catch from_term([{{a},b,c},{d,e,f}],[{{atom},atom,atom}])),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch from_term([{a,{b,c}} | tail], [{atom,{atom,atom}}])),
-    ?line {'EXIT', {badarg, _}} = (catch from_term({})),
-    ?line {'EXIT', {badarg, _}} = (catch from_term([{}])),
+    {'EXIT', {badarg, _}} = (catch from_term({})),
+    {'EXIT', {badarg, _}} = (catch from_term([{}])),
 
-    ?line [{foo,bar},[b,a]] = 
+    [{foo,bar},[b,a]] =
         to_external(from_term([[b,a],{foo,bar},[b,a]], [atom])),
-    ?line [{[atom],{atom,atom}}] = 
+    [{[atom],{atom,atom}}] =
 	type(from_term([{[], {a,b}},{[a,b],{e,f}}])),
-    ?line [{[atom],{atom,atom}}] = 
+    [{[atom],{atom,atom}}] =
 	type(from_term([{[], {a,b}},{[a,b],{e,f}}], [{[atom],{atom,atom}}])),
-    ?line [[atom]] = type(from_term([[a],[{b,c}]],[[atom]])),
+    [[atom]] = type(from_term([[a],[{b,c}]],[[atom]])),
 
-    ?line {atom, atom} = type(from_term({a,b}, {atom, atom})),
-    ?line atom = type(from_term(a, atom)),
-    ?line {'EXIT', {badarg, _}} = (catch from_term({a,b},{atom})),
-    ?line [{{a},b,c},{{d},e,f}] = 
+    {atom, atom} = type(from_term({a,b}, {atom, atom})),
+    atom = type(from_term(a, atom)),
+    {'EXIT', {badarg, _}} = (catch from_term({a,b},{atom})),
+    [{{a},b,c},{{d},e,f}] =
 	to_external(from_term([{{a},b,c},{{a},b,c},{{d},e,f}],
 			      [{{atom},atom,atom}])),
 
     %% from_external too...
-    ?line e = to_external(from_external(e, atom)),
-    ?line {e} = to_external(from_external({e}, {atom})),
-    ?line [e] = to_external(from_external([e], [atom])),
+    e = to_external(from_external(e, atom)),
+    {e} = to_external(from_external({e}, {atom})),
+    [e] = to_external(from_external([e], [atom])),
 
     %% and is_type...
-    ?line true = is_type(['_']),
-    ?line false = is_type('_'),
-    ?line true = is_type([['_']]),
-    ?line false = is_type({atom,[],atom}),
-    ?line false = is_type({atom,'_',atom}),
-    ?line true = is_type({atom,atomic,atom}),
-    ?line true = is_type({atom,atom}),
-    ?line true = is_type(atom),
-    ?line true = is_type([atom]),
-    ?line true = is_type(type),
+    true = is_type(['_']),
+    false = is_type('_'),
+    true = is_type([['_']]),
+    false = is_type({atom,[],atom}),
+    false = is_type({atom,'_',atom}),
+    true = is_type({atom,atomic,atom}),
+    true = is_type({atom,atom}),
+    true = is_type(atom),
+    true = is_type([atom]),
+    true = is_type(type),
 
     ok.
 
-set_1(suite) -> [];
-set_1(doc) -> [""];
 set_1(Conf) when is_list(Conf) ->
     %% set/1
-    ?line {'EXIT', {badarg, _}} = (catch set(a)),
-    ?line {'EXIT', {badarg, _}} = (catch set({a})),
-    ?line eval(set([]), from_term([],[atom])),
-    ?line eval(set([a,b,c]), from_term([a,b,c])),
-    ?line eval(set([a,b,a,a,b]), from_term([a,b])),
-    ?line eval(set([a,b,c,a,d,d,c,1]), from_term([1,a,b,c,d])),
-    ?line eval(set([a,b,d,a,c]), from_term([a,b,c,d])),
-    ?line eval(set([f,e,d,c,d]), from_term([c,d,e,f])),
-    ?line eval(set([h,f,d,g,g,d,c]), from_term([c,d,f,g,h])),
-    ?line eval(set([h,e,d,k,l]), from_term([d,e,h,k,l])),
-    ?line eval(set([h,e,c,k,d]), from_term([c,d,e,h,k])),
+    {'EXIT', {badarg, _}} = (catch set(a)),
+    {'EXIT', {badarg, _}} = (catch set({a})),
+    eval(set([]), from_term([],[atom])),
+    eval(set([a,b,c]), from_term([a,b,c])),
+    eval(set([a,b,a,a,b]), from_term([a,b])),
+    eval(set([a,b,c,a,d,d,c,1]), from_term([1,a,b,c,d])),
+    eval(set([a,b,d,a,c]), from_term([a,b,c,d])),
+    eval(set([f,e,d,c,d]), from_term([c,d,e,f])),
+    eval(set([h,f,d,g,g,d,c]), from_term([c,d,f,g,h])),
+    eval(set([h,e,d,k,l]), from_term([d,e,h,k,l])),
+    eval(set([h,e,c,k,d]), from_term([c,d,e,h,k])),
 
     %% set/2
-    ?line {'EXIT', {badarg, _}} = (catch set(a, [a])),
-    ?line {'EXIT', {badarg, _}} = (catch set({a}, [a])),
-    ?line {'EXIT', {badarg, _}} = (catch set([a], {a})),
-    ?line {'EXIT', {badarg, _}} = (catch set([a], a)),
-    ?line {'EXIT', {badarg, _}} = (catch set([a], [a,b])),
-    ?line {'EXIT', {badarg, _}} = (catch set([a | b],[foo])),
-    ?line {'EXIT', {badarg, _}} = (catch set([a | b],['_'])),
-    ?line {'EXIT', {badarg, _}} = (catch set([a | b],[[atom]])),
-    ?line {'EXIT', {badarg, _}} = (catch set([{}],[{}])),
-    ?line eval(set([a],['_']), from_term([a],['_'])),
-    ?line eval(set([], ['_']), empty_set()),
-    ?line eval(set([a,b,a,b],[foo]), from_term([a,b],[foo])),
+    {'EXIT', {badarg, _}} = (catch set(a, [a])),
+    {'EXIT', {badarg, _}} = (catch set({a}, [a])),
+    {'EXIT', {badarg, _}} = (catch set([a], {a})),
+    {'EXIT', {badarg, _}} = (catch set([a], a)),
+    {'EXIT', {badarg, _}} = (catch set([a], [a,b])),
+    {'EXIT', {badarg, _}} = (catch set([a | b],[foo])),
+    {'EXIT', {badarg, _}} = (catch set([a | b],['_'])),
+    {'EXIT', {badarg, _}} = (catch set([a | b],[[atom]])),
+    {'EXIT', {badarg, _}} = (catch set([{}],[{}])),
+    eval(set([a],['_']), from_term([a],['_'])),
+    eval(set([], ['_']), empty_set()),
+    eval(set([a,b,a,b],[foo]), from_term([a,b],[foo])),
 
     ok.
 
-from_sets_1(suite) -> [];
-from_sets_1(doc) -> [""];
 from_sets_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
+    E = empty_set(),
 
     %% unordered
-    ?line eval(from_sets([]), E),
-    ?line {'EXIT', {type_mismatch, _}} = 
+    eval(from_sets([]), E),
+    {'EXIT', {type_mismatch, _}} =
 	(catch from_sets([from_term([{a,b}]), 
                           E,
                           from_term([{a,b,c}])])),
-    ?line eval(from_sets([from_term([{a,b}]), E]), 
-               from_term([[],[{a,b}]])),
+    eval(from_sets([from_term([{a,b}]), E]),
+	 from_term([[],[{a,b}]])),
 
-    ?line eval(from_sets([from_term({a,b},{atom,atom}), 
-                          from_term({b,c},{atom,atom})]),
-	       relation([{a,b}, {b,c}])),
-    ?line {'EXIT', {type_mismatch, _}} = 
+    eval(from_sets([from_term({a,b},{atom,atom}),
+		    from_term({b,c},{atom,atom})]),
+	 relation([{a,b}, {b,c}])),
+    {'EXIT', {type_mismatch, _}} =
 	(catch from_sets([from_term({a,b},{atom,atom}), 
 			  from_term({a,b,c},{atom,atom,atom})])),
-    ?line {'EXIT', {badarg, _}} = (catch from_sets(foo)),
-    ?line eval(from_sets([E]), from_term([[]])),
-    ?line eval(from_sets([E,E]), from_term([[]])),
-    ?line eval(from_sets([E,set([a])]), from_term([[],[a]])),
-    ?line {'EXIT', {badarg, _}} = (catch from_sets([E,{a}])),
-    ?line {'EXIT', {type_mismatch, _}} = 
+    {'EXIT', {badarg, _}} = (catch from_sets(foo)),
+    eval(from_sets([E]), from_term([[]])),
+    eval(from_sets([E,E]), from_term([[]])),
+    eval(from_sets([E,set([a])]), from_term([[],[a]])),
+    {'EXIT', {badarg, _}} = (catch from_sets([E,{a}])),
+    {'EXIT', {type_mismatch, _}} =
 	(catch from_sets([E,from_term({a}),E])),
-    ?line {'EXIT', {type_mismatch, _}} = (catch from_sets([from_term({a}),E])),
+    {'EXIT', {type_mismatch, _}} = (catch from_sets([from_term({a}),E])),
 
     %% ordered
-    ?line O = {from_term(a,atom), from_term({b}, {atom}), set([c,d])},
-    ?line eval(from_sets(O), from_term({a,{b},[c,d]}, {atom,{atom},[atom]})),
-    ?line {'EXIT', {badarg, _}} = (catch from_sets([a,b])),
-    ?line {'EXIT', {badarg, _}} = (catch from_sets({a,b})),
-    ?line eval(from_sets({from_term({a}),E}), from_term({{a},[]})),
+    O = {from_term(a,atom), from_term({b}, {atom}), set([c,d])},
+    eval(from_sets(O), from_term({a,{b},[c,d]}, {atom,{atom},[atom]})),
+    {'EXIT', {badarg, _}} = (catch from_sets([a,b])),
+    {'EXIT', {badarg, _}} = (catch from_sets({a,b})),
+    eval(from_sets({from_term({a}),E}), from_term({{a},[]})),
     ok.
 
-relation_1(suite) -> [];
-relation_1(doc) -> [""];
 relation_1(Conf) when is_list(Conf) ->
     %% relation/1
-    ?line eval(relation([]), from_term([], [{atom,atom}])),
-    ?line eval(from_term([{a}]), relation([{a}])),
-    ?line {'EXIT', {badarg, _}} = (catch relation(a)),
-    ?line {'EXIT', {badarg, _}} = (catch relation([{a} | a])),
-    ?line {'EXIT', {badarg, _}} = (catch relation([{}])),
-    ?line {'EXIT', {badarg, _}} = (catch relation([],0)),
-    ?line {'EXIT', {badarg, _}} = (catch relation([{a}],a)),
+    eval(relation([]), from_term([], [{atom,atom}])),
+    eval(from_term([{a}]), relation([{a}])),
+    {'EXIT', {badarg, _}} = (catch relation(a)),
+    {'EXIT', {badarg, _}} = (catch relation([{a} | a])),
+    {'EXIT', {badarg, _}} = (catch relation([{}])),
+    {'EXIT', {badarg, _}} = (catch relation([],0)),
+    {'EXIT', {badarg, _}} = (catch relation([{a}],a)),
 
     %% relation/2
-    ?line eval(relation([{a},{b}], 1), from_term([{a},{b}])),
-    ?line eval(relation([{1,a},{2,b},{1,a}], [{x,y}]),
-	       from_term([{1,a},{2,b}], [{x,y}])),
-    ?line eval(relation([{[1,2],a},{[2,1],b},{[2,1],a}], [{[x],y}]),
-	       from_term([{[1,2],a},{[1,2],b}], [{[x],y}])),
-    ?line {'EXIT', {badarg, _}} = (catch relation([{1,a},{2,b}], [{[x],y}])),
-    ?line {'EXIT', {badarg, _}} = (catch relation([{1,a},{1,a,b}], [{x,y}])),
-    ?line {'EXIT', {badarg, _}} = (catch relation([{a}], 2)),
-    ?line {'EXIT', {badarg, _}} = (catch relation([{a},{b},{c,d}], 1)),
-    ?line eval(relation([{{a},[{foo,bar}]}], ['_']), 
-	       from_term([{{a},[{foo,bar}]}], ['_'])),
-    ?line eval(relation([], ['_']), from_term([], ['_'])),
-    ?line {'EXIT', {badarg, _}} = (catch relation([[a]],['_'])),
-    ?line eval(relation([{[a,b,a]}], [{[atom]}]), from_term([{[a,b,a]}])),
-    ?line eval(relation([{[a,b,a],[[d,e,d]]}], [{[atom],[[atom]]}]), 
-	       from_term([{[a,b,a],[[d,e,d]]}])),
-    ?line eval(relation([{[a,b,a],[[d,e,d]]}], [{atom,[[atom]]}]), 
-	       from_term([{[a,b,a],[[d,e,d]]}], [{atom,[[atom]]}])),
+    eval(relation([{a},{b}], 1), from_term([{a},{b}])),
+    eval(relation([{1,a},{2,b},{1,a}], [{x,y}]),
+	 from_term([{1,a},{2,b}], [{x,y}])),
+    eval(relation([{[1,2],a},{[2,1],b},{[2,1],a}], [{[x],y}]),
+	 from_term([{[1,2],a},{[1,2],b}], [{[x],y}])),
+    {'EXIT', {badarg, _}} = (catch relation([{1,a},{2,b}], [{[x],y}])),
+    {'EXIT', {badarg, _}} = (catch relation([{1,a},{1,a,b}], [{x,y}])),
+    {'EXIT', {badarg, _}} = (catch relation([{a}], 2)),
+    {'EXIT', {badarg, _}} = (catch relation([{a},{b},{c,d}], 1)),
+    eval(relation([{{a},[{foo,bar}]}], ['_']),
+	 from_term([{{a},[{foo,bar}]}], ['_'])),
+    eval(relation([], ['_']), from_term([], ['_'])),
+    {'EXIT', {badarg, _}} = (catch relation([[a]],['_'])),
+    eval(relation([{[a,b,a]}], [{[atom]}]), from_term([{[a,b,a]}])),
+    eval(relation([{[a,b,a],[[d,e,d]]}], [{[atom],[[atom]]}]),
+	 from_term([{[a,b,a],[[d,e,d]]}])),
+    eval(relation([{[a,b,a],[[d,e,d]]}], [{atom,[[atom]]}]),
+	 from_term([{[a,b,a],[[d,e,d]]}], [{atom,[[atom]]}])),
     ok.
 
-a_function_1(suite) -> [];
-a_function_1(doc) -> [""];
 a_function_1(Conf) when is_list(Conf) ->
     %% a_function/1
-    ?line eval(a_function([]), from_term([], [{atom,atom}])),
-    ?line eval(a_function([{a,b},{a,b},{b,c}]), from_term([{a,b},{b,c}])),
-    ?line {'EXIT', {badarg, _}} = (catch a_function([{a}])),
-    ?line {'EXIT', {badarg, _}} = (catch a_function([{a},{b},{c,d}])),
-    ?line {'EXIT', {badarg, _}} = (catch a_function(a)),
-    ?line {'EXIT', {badarg, _}} = (catch a_function([{a,b} | a])),
-    ?line {'EXIT', {bad_function, _}} = 
+    eval(a_function([]), from_term([], [{atom,atom}])),
+    eval(a_function([{a,b},{a,b},{b,c}]), from_term([{a,b},{b,c}])),
+    {'EXIT', {badarg, _}} = (catch a_function([{a}])),
+    {'EXIT', {badarg, _}} = (catch a_function([{a},{b},{c,d}])),
+    {'EXIT', {badarg, _}} = (catch a_function(a)),
+    {'EXIT', {badarg, _}} = (catch a_function([{a,b} | a])),
+    {'EXIT', {bad_function, _}} =
 	(catch a_function([{a,b},{b,c},{a,c}])),
     F = 0.0, I = round(F),
     if
         F == I -> % term ordering
-            ?line {'EXIT', {bad_function, _}} = 
+            {'EXIT', {bad_function, _}} =
                 (catch a_function([{I,a},{F,b}])),
-            ?line {'EXIT', {bad_function, _}} = 
-                 (catch a_function([{[I],a},{[F],b}],[{[a],b}]));
+            {'EXIT', {bad_function, _}} =
+		(catch a_function([{[I],a},{[F],b}],[{[a],b}]));
         true -> 
-            ?line 2 = no_elements(a_function([{I,a},{F,b}])),
-            ?line 2 = no_elements(a_function([{[I],a},{[F],b}],[{[a],b}]))
+            2 = no_elements(a_function([{I,a},{F,b}])),
+            2 = no_elements(a_function([{[I],a},{[F],b}],[{[a],b}]))
     end,
 
     %% a_function/2
     FT = [{atom,atom}],
-    ?line eval(a_function([], FT), from_term([], FT)),
-    ?line eval(a_function([{a,b},{b,c},{b,c}], FT), 
-	       from_term([{a,b},{b,c}], FT)),
-    ?line {'EXIT', {badarg, _}} = (catch a_function([{a,b}], [{a}])),
-    ?line {'EXIT', {badarg, _}} = (catch a_function([{a,b}], [{a,[b,c]}])),
-    ?line {'EXIT', {badarg, _}} = (catch a_function([{a}], FT)),
-    ?line {'EXIT', {badarg, _}} = (catch a_function([{a},{b},{c,d}], FT)),
-    ?line {'EXIT', {badarg, _}} = (catch a_function(a, FT)),
-    ?line {'EXIT', {badarg, _}} = (catch a_function([{a,b} | a], FT)),
-    ?line eval(a_function([{{a},[{foo,bar}]}], ['_']),
-	       from_term([{{a},[{foo,bar}]}], ['_'])),
-    ?line eval(a_function([], ['_']), from_term([], ['_'])),
-    ?line {'EXIT', {badarg, _}} = (catch a_function([[a]],['_'])),
-    ?line {'EXIT', {bad_function, _}} = 
+    eval(a_function([], FT), from_term([], FT)),
+    eval(a_function([{a,b},{b,c},{b,c}], FT),
+	 from_term([{a,b},{b,c}], FT)),
+    {'EXIT', {badarg, _}} = (catch a_function([{a,b}], [{a}])),
+    {'EXIT', {badarg, _}} = (catch a_function([{a,b}], [{a,[b,c]}])),
+    {'EXIT', {badarg, _}} = (catch a_function([{a}], FT)),
+    {'EXIT', {badarg, _}} = (catch a_function([{a},{b},{c,d}], FT)),
+    {'EXIT', {badarg, _}} = (catch a_function(a, FT)),
+    {'EXIT', {badarg, _}} = (catch a_function([{a,b} | a], FT)),
+    eval(a_function([{{a},[{foo,bar}]}], ['_']),
+	 from_term([{{a},[{foo,bar}]}], ['_'])),
+    eval(a_function([], ['_']), from_term([], ['_'])),
+    {'EXIT', {badarg, _}} = (catch a_function([[a]],['_'])),
+    {'EXIT', {bad_function, _}} =
 	(catch a_function([{a,b},{b,c},{a,c}], FT)),
-    ?line eval(a_function([{a,[a]},{a,[a,a]}], [{atom,[atom]}]),
-	       from_term([{a,[a]}])),
-    ?line eval(a_function([{[b,a],c},{[a,b],c}], [{[atom],atom}]),
-	       from_term([{[a,b],c}])),
+    eval(a_function([{a,[a]},{a,[a,a]}], [{atom,[atom]}]),
+	 from_term([{a,[a]}])),
+    eval(a_function([{[b,a],c},{[a,b],c}], [{[atom],atom}]),
+	 from_term([{[a,b],c}])),
     ok.
 
-family_1(suite) -> [];
-family_1(doc) -> [""];
 family_1(Conf) when is_list(Conf) ->
     %% family/1
-    ?line eval(family([]), from_term([],[{atom,[atom]}])),
-    ?line {'EXIT', {badarg, _}} = (catch family(a)),
-    ?line {'EXIT', {badarg, _}} = (catch family([a])),
-    ?line {'EXIT', {badarg, _}} = (catch family([{a,b}])),
-    ?line {'EXIT', {badarg, _}} = (catch family([{a,[]} | a])),
-    ?line {'EXIT', {badarg, _}} = (catch family([{a,[a|b]}])),
-    ?line {'EXIT', {bad_function, _}} = 
+    eval(family([]), from_term([],[{atom,[atom]}])),
+    {'EXIT', {badarg, _}} = (catch family(a)),
+    {'EXIT', {badarg, _}} = (catch family([a])),
+    {'EXIT', {badarg, _}} = (catch family([{a,b}])),
+    {'EXIT', {badarg, _}} = (catch family([{a,[]} | a])),
+    {'EXIT', {badarg, _}} = (catch family([{a,[a|b]}])),
+    {'EXIT', {bad_function, _}} =
         (catch family([{a,[a]},{a,[]}])),
-    ?line {'EXIT', {bad_function, _}} = 
+    {'EXIT', {bad_function, _}} =
 	(catch family([{a,[]},{b,[]},{a,[a]}])),
     F = 0.0, I = round(F),
     if
         F == I -> % term ordering
-            ?line {'EXIT', {bad_function, _}} = 
+            {'EXIT', {bad_function, _}} =
                 (catch family([{I,[a]},{F,[b]}])),
-            ?line true = (1 =:= no_elements(family([{a,[I]},{a,[F]}])));
+            true = (1 =:= no_elements(family([{a,[I]},{a,[F]}])));
         true -> 
-            ?line {'EXIT', {bad_function, _}} = 
+            {'EXIT', {bad_function, _}} =
                 (catch family([{a,[I]},{a,[F]}]))
     end,
-    ?line eval(family([{a,[]},{b,[b]},{a,[]}]), from_term([{a,[]},{b,[b]}])),
-    ?line eval(to_external(family([{b,[{hej,san},tjo]},{a,[]}])),
-               [{a,[]},{b,[tjo,{hej,san}]}]),
-    ?line eval(family([{a,[a]},{a,[a,a]}]), family([{a,[a]}])),
+    eval(family([{a,[]},{b,[b]},{a,[]}]), from_term([{a,[]},{b,[b]}])),
+    eval(to_external(family([{b,[{hej,san},tjo]},{a,[]}])),
+	 [{a,[]},{b,[tjo,{hej,san}]}]),
+    eval(family([{a,[a]},{a,[a,a]}]), family([{a,[a]}])),
 
     %% family/2
     FT = [{a,[a]}],
-    ?line eval(family([], FT), from_term([],FT)),
-    ?line {'EXIT', {badarg, _}} = (catch family(a,FT)),
-    ?line {'EXIT', {badarg, _}} = (catch family([a],FT)),
-    ?line {'EXIT', {badarg, _}} = (catch family([{a,b}],FT)),
-    ?line {'EXIT', {badarg, _}} = (catch family([{a,[]} | a],FT)),
-    ?line {'EXIT', {badarg, _}} = (catch family([{a,[a|b]}], FT)),
-    ?line {'EXIT', {bad_function, _}} = 
+    eval(family([], FT), from_term([],FT)),
+    {'EXIT', {badarg, _}} = (catch family(a,FT)),
+    {'EXIT', {badarg, _}} = (catch family([a],FT)),
+    {'EXIT', {badarg, _}} = (catch family([{a,b}],FT)),
+    {'EXIT', {badarg, _}} = (catch family([{a,[]} | a],FT)),
+    {'EXIT', {badarg, _}} = (catch family([{a,[a|b]}], FT)),
+    {'EXIT', {bad_function, _}} =
         (catch family([{a,[a]},{a,[]}], FT)),
-    ?line {'EXIT', {bad_function, _}} = 
+    {'EXIT', {bad_function, _}} =
 	(catch family([{a,[]},{b,[]},{a,[a]}], FT)),
-    ?line eval(family([{a,[]},{b,[b,b]},{a,[]}], FT), 
-	       from_term([{a,[]},{b,[b]}], FT)),
-    ?line eval(to_external(family([{b,[{hej,san},tjo]},{a,[]}], FT)),
-               [{a,[]},{b,[tjo,{hej,san}]}]),
-
-    ?line eval(family([{{a},[{foo,bar}]}], ['_']),
-	       from_term([{{a},[{foo,bar}]}], ['_'])),
-    ?line eval(family([], ['_']), from_term([], ['_'])),
-    ?line {'EXIT', {badarg, _}} = (catch family([[a]],['_'])),
-    ?line {'EXIT', {badarg, _}} = (catch family([{a,b}],['_'])),
-    ?line {'EXIT', {badarg, _}} = 
+    eval(family([{a,[]},{b,[b,b]},{a,[]}], FT),
+	 from_term([{a,[]},{b,[b]}], FT)),
+    eval(to_external(family([{b,[{hej,san},tjo]},{a,[]}], FT)),
+	 [{a,[]},{b,[tjo,{hej,san}]}]),
+
+    eval(family([{{a},[{foo,bar}]}], ['_']),
+	 from_term([{{a},[{foo,bar}]}], ['_'])),
+    eval(family([], ['_']), from_term([], ['_'])),
+    {'EXIT', {badarg, _}} = (catch family([[a]],['_'])),
+    {'EXIT', {badarg, _}} = (catch family([{a,b}],['_'])),
+    {'EXIT', {badarg, _}} =
 	(catch family([{a,[foo]}], [{atom,atom}])),
-    ?line eval(family([{{a},[{foo,bar}]}], [{{dt},[{r1,t2}]}]),
-	       from_term([{{a},[{foo,bar}]}], [{{dt},[{r1,t2}]}])),
-    ?line eval(family([{a,[a]},{a,[a,a]}],[{atom,[atom]}]),
-	       family([{a,[a]}])),
-    ?line eval(family([{[a,b],[a]},{[b,a],[a,a]}],[{[atom],[atom]}]),
-	       from_term([{[a,b],[a]},{[b,a],[a,a]}])),
+    eval(family([{{a},[{foo,bar}]}], [{{dt},[{r1,t2}]}]),
+	 from_term([{{a},[{foo,bar}]}], [{{dt},[{r1,t2}]}])),
+    eval(family([{a,[a]},{a,[a,a]}],[{atom,[atom]}]),
+	 family([{a,[a]}])),
+    eval(family([{[a,b],[a]},{[b,a],[a,a]}],[{[atom],[atom]}]),
+	 from_term([{[a,b],[a]},{[b,a],[a,a]}])),
     ok.
 
-projection(suite) -> [];
-projection(doc) -> [""];
 projection(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
+    E = empty_set(),
+    ER = relation([]),
 
     %% set of ordered sets
-    ?line S1 = relation([{a,1},{b,2},{b,22},{c,0}]),
-    ?line S2 = relation([{a,1},{a,2},{a,3},{b,4},{b,5},{b,6}]),
-
-    ?line eval(projection(1, E), E),
-    ?line eval(projection(1, ER), set([])),
-    ?line eval(projection(1, relation([{a,1}])), set([a])),
-    ?line eval(projection(1, S1), set([a,b,c])),
-    ?line eval(projection(1, S2), set([a,b])),
-    ?line eval(projection(2, S1), set([0,1,2,22])),
-    ?line eval(projection(2, relation([{1,a},{2,a},{3,b}])), set([a,b])),
-    ?line eval(projection(1, relation([{a},{b},{c}])), set([a,b,c])),
+    S1 = relation([{a,1},{b,2},{b,22},{c,0}]),
+    S2 = relation([{a,1},{a,2},{a,3},{b,4},{b,5},{b,6}]),
+
+    eval(projection(1, E), E),
+    eval(projection(1, ER), set([])),
+    eval(projection(1, relation([{a,1}])), set([a])),
+    eval(projection(1, S1), set([a,b,c])),
+    eval(projection(1, S2), set([a,b])),
+    eval(projection(2, S1), set([0,1,2,22])),
+    eval(projection(2, relation([{1,a},{2,a},{3,b}])), set([a,b])),
+    eval(projection(1, relation([{a},{b},{c}])), set([a,b,c])),
 
     Fun1 = {external, fun({A,B,C}) -> {A,{B,C}} end},
-    ?line eval(projection(Fun1, E), E),
+    eval(projection(Fun1, E), E),
     %% No check here:
-    ?line eval(projection(3, projection(Fun1, empty_set())), E),
-    ?line E2 = relation([], 3),
-    ?line eval(projection(Fun1, E2), from_term([], [{atom,{atom,atom}}])),
+    eval(projection(3, projection(Fun1, empty_set())), E),
+    E2 = relation([], 3),
+    eval(projection(Fun1, E2), from_term([], [{atom,{atom,atom}}])),
 
     Fun2 = {external, fun({A,_B}) -> {A} end},
-    ?line eval(projection(Fun2, ER), from_term([], [{atom}])),
-    ?line eval(projection(Fun2, relation([{a,1}])), relation([{a}])),
-    ?line eval(projection(Fun2, relation([{a,1},{b,3},{a,2}])), 
-               relation([{a},{b}])),
+    eval(projection(Fun2, ER), from_term([], [{atom}])),
+    eval(projection(Fun2, relation([{a,1}])), relation([{a}])),
+    eval(projection(Fun2, relation([{a,1},{b,3},{a,2}])),
+	 relation([{a},{b}])),
     Fun3 = {external, fun({A,_B,C}) -> {C,{A},C} end}, 
-    ?line eval(projection(Fun3, relation([{a,1,x},{b,3,y},{a,2,z}])),
-               from_term([{x,{a},x},{y,{b},y},{z,{a},z}])),
+    eval(projection(Fun3, relation([{a,1,x},{b,3,y},{a,2,z}])),
+	 from_term([{x,{a},x},{y,{b},y},{z,{a},z}])),
     Fun4 = {external, fun(A={B,_C,_D}) -> {B, A} end},
-    ?line eval(projection(Fun4, relation([{a,1,x},{b,3,y},{a,2,z}])),
-               from_term([{a,{a,1,x}},{b,{b,3,y}},{a,{a,2,z}}])),
+    eval(projection(Fun4, relation([{a,1,x},{b,3,y},{a,2,z}])),
+	 from_term([{a,{a,1,x}},{b,{b,3,y}},{a,{a,2,z}}])),
 
-    ?line eval(projection({external, fun({A,B,_C,D}) -> {A,B,A,D} end},
-			  relation([{1,1,1,2}, {1,1,3,1}])),
-               relation([{1,1,1,1}, {1,1,1,2}])),
+    eval(projection({external, fun({A,B,_C,D}) -> {A,B,A,D} end},
+		    relation([{1,1,1,2}, {1,1,3,1}])),
+	 relation([{1,1,1,1}, {1,1,1,2}])),
 
-    ?line {'EXIT', {badarg, _}} = (catch projection(1, set([]))),
-    ?line {'EXIT', {function_clause, _}} = 
+    {'EXIT', {badarg, _}} = (catch projection(1, set([]))),
+    {'EXIT', {function_clause, _}} =
 	(catch projection({external, fun({A}) -> A end}, S1)),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch projection({external, fun({A,_}) -> {A,0} end}, 
 			  from_term([{1,a}]))),
 
     %% {} is not an ordered set
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch projection({external, fun(_) -> {} end}, ER)),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch projection({external, fun(_) -> {{}} end}, ER)),
-    ?line eval(projection({external, fun({T,_}) -> T end}, 
-			  relation([{{},a},{{},b}])),
-	       set([{}])),
-    ?line eval(projection({external, fun({T}) -> T end}, relation([{{}}])),
-	       set([{}])),
-
-    ?line eval(projection({external, fun(A) -> {A} end}, 
-			  relation([{1,a},{2,b}])), 
-	       from_term([{{1,a}},{{2,b}}])),
-    ?line eval(projection({external, fun({A,B}) -> {B,A} end}, 
-			  relation([{1,a},{2,b}])),
-	       relation([{a,1},{b,2}])),
-    ?line eval(projection({external, fun(X=Y=A) -> {X,Y,A} end}, set([a,b,c])),
-	       relation([{a,a,a},{b,b,b},{c,c,c}])),
-
-    ?line eval(projection({external, fun({A,{_},B}) -> {A,B} end}, 
-			  from_term([{a,{a},b},{a,{b},c}])),
-               relation([{a,b},{a,c}])),
-    ?line eval(projection({external, fun({A,_,B}) -> {A,B} end},
-			  relation([{a,{},b},{a,{},c}])),
-               relation([{a,b},{a,c}])),
+    eval(projection({external, fun({T,_}) -> T end},
+		    relation([{{},a},{{},b}])),
+	 set([{}])),
+    eval(projection({external, fun({T}) -> T end}, relation([{{}}])),
+	 set([{}])),
+
+    eval(projection({external, fun(A) -> {A} end},
+		    relation([{1,a},{2,b}])),
+	 from_term([{{1,a}},{{2,b}}])),
+    eval(projection({external, fun({A,B}) -> {B,A} end},
+		    relation([{1,a},{2,b}])),
+	 relation([{a,1},{b,2}])),
+    eval(projection({external, fun(X=Y=A) -> {X,Y,A} end}, set([a,b,c])),
+	 relation([{a,a,a},{b,b,b},{c,c,c}])),
+
+    eval(projection({external, fun({A,{_},B}) -> {A,B} end},
+		    from_term([{a,{a},b},{a,{b},c}])),
+	 relation([{a,b},{a,c}])),
+    eval(projection({external, fun({A,_,B}) -> {A,B} end},
+		    relation([{a,{},b},{a,{},c}])),
+	 relation([{a,b},{a,c}])),
     Fun5 = fun(S) -> from_term({to_external(S),0}, {type(S),atom}) end,
-    ?line eval(projection(Fun5, E), E),
-    ?line eval(projection(Fun5, set([a,b])), from_term([{a,0},{b,0}])),
-    ?line eval(projection(Fun5, relation([{a,1},{b,2}])),
-	       from_term([{{a,1},0},{{b,2},0}])),
-    ?line eval(projection(Fun5, from_term([[a],[b]])),
-	       from_term([{[a],0},{[b],0}])),
+    eval(projection(Fun5, E), E),
+    eval(projection(Fun5, set([a,b])), from_term([{a,0},{b,0}])),
+    eval(projection(Fun5, relation([{a,1},{b,2}])),
+	 from_term([{{a,1},0},{{b,2},0}])),
+    eval(projection(Fun5, from_term([[a],[b]])),
+	 from_term([{[a],0},{[b],0}])),
 
     F = 0.0, I = round(F),
-    ?line FR = relation([{I},{F}]),
+    FR = relation([{I},{F}]),
     if
         F == I -> % term ordering
             true = (no_elements(projection(1, FR)) =:= 1);
@@ -532,382 +517,374 @@ projection(Conf) when is_list(Conf) ->
     end,
 
     %% set of sets
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch projection({external, fun(X) -> X end}, 
 			  from_term([], [[atom]]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch projection({external, fun(X) -> X end}, from_term([[a]]))),
-    ?line eval(projection(fun sofs:union/1,
-			  from_term([[[1,2],[2,3]], [[a,b],[b,c]]])),
-               from_term([[1,2,3], [a,b,c]])),
-    ?line eval(projection(fun(_) -> from_term([a]) end, 
-			  from_term([[b]], [[a]])),
-               from_term([[a]])),
-    ?line eval(projection(fun(_) -> from_term([a]) end, 
-			  from_term([[1,2],[3,4]])),
-               from_term([[a]])),
+    eval(projection(fun sofs:union/1,
+		    from_term([[[1,2],[2,3]], [[a,b],[b,c]]])),
+	 from_term([[1,2,3], [a,b,c]])),
+    eval(projection(fun(_) -> from_term([a]) end,
+		    from_term([[b]], [[a]])),
+	 from_term([[a]])),
+    eval(projection(fun(_) -> from_term([a]) end,
+		    from_term([[1,2],[3,4]])),
+	 from_term([[a]])),
     Fun10 = fun(S) ->
-                   %% Cheating a lot...
-                   case to_external(S) of
-                       [1] -> from_term({1,1});
-                       _ -> S
-                   end
-           end,
-    ?line eval(projection(Fun10, from_term([[1]])), from_term([{1,1}])),
-    ?line eval(projection(fun(_) -> from_term({a}) end, from_term([[a]])),
-	       from_term([{a}])),
-    ?line {'EXIT', {badarg, _}} = 
+		    %% Cheating a lot...
+		    case to_external(S) of
+			[1] -> from_term({1,1});
+			_ -> S
+		    end
+	    end,
+    eval(projection(Fun10, from_term([[1]])), from_term([{1,1}])),
+    eval(projection(fun(_) -> from_term({a}) end, from_term([[a]])),
+	 from_term([{a}])),
+    {'EXIT', {badarg, _}} =
 	(catch projection(fun(_) -> {a} end, from_term([[a]]))),
 
     ok.
 
-substitution(suite) -> [];
-substitution(doc) -> [""];
 substitution(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
+    E = empty_set(),
+    ER = relation([]),
 
     %% set of ordered sets
-    ?line S1 = relation([{a,1},{b,2},{b,22},{c,0}]),
-    ?line S2 = relation([{a,1},{a,2},{a,3},{b,4},{b,5},{b,6}]),
+    S1 = relation([{a,1},{b,2},{b,22},{c,0}]),
+    S2 = relation([{a,1},{a,2},{a,3},{b,4},{b,5},{b,6}]),
 
-    ?line eval(substitution(1, E), E),
+    eval(substitution(1, E), E),
     %% No check here:
     Fun0 = {external, fun({A,B,C}) -> {A,{B,C}} end},
-    ?line eval(substitution(3, substitution(Fun0, empty_set())), E),
-    ?line eval(substitution(1, ER), from_term([],[{{atom,atom},atom}])),
-    ?line eval(substitution(1, relation([{a,1}])), from_term([{{a,1},a}])),
-    ?line eval(substitution(1, S1), 
-               from_term([{{a,1},a},{{b,2},b},{{b,22},b},{{c,0},c}])),
-    ?line eval(substitution(1, S2), 
-               from_term([{{a,1},a},{{a,2},a},{{a,3},a},{{b,4},b},
-                          {{b,5},b},{{b,6},b}])),
-    ?line eval(substitution(2, S1), 
-               from_term([{{a,1},1},{{b,2},2},{{b,22},22},{{c,0},0}])),
-    
+    eval(substitution(3, substitution(Fun0, empty_set())), E),
+    eval(substitution(1, ER), from_term([],[{{atom,atom},atom}])),
+    eval(substitution(1, relation([{a,1}])), from_term([{{a,1},a}])),
+    eval(substitution(1, S1),
+	 from_term([{{a,1},a},{{b,2},b},{{b,22},b},{{c,0},c}])),
+    eval(substitution(1, S2),
+	 from_term([{{a,1},a},{{a,2},a},{{a,3},a},{{b,4},b},
+		    {{b,5},b},{{b,6},b}])),
+    eval(substitution(2, S1),
+	 from_term([{{a,1},1},{{b,2},2},{{b,22},22},{{c,0},0}])),
+
     Fun1 = fun({A,_B}) -> {A} end, 
     XFun1 = {external, Fun1},
-    ?line eval(substitution(XFun1, E), E),
-    ?line eval(substitution(Fun1, E), E),
-    ?line eval(substitution(XFun1, ER), from_term([], [{{atom,atom},{atom}}])),
-    ?line eval(substitution(XFun1, relation([{a,1}])), 
-	       from_term([{{a,1},{a}}])),
-    ?line eval(substitution(XFun1, relation([{a,1},{b,3},{a,2}])), 
-               from_term([{{a,1},{a}},{{a,2},{a}},{{b,3},{b}}])),
-    ?line eval(substitution({external, fun({A,_B,C}) -> {C,A,C} end}, 
-			    relation([{a,1,x},{b,3,y},{a,2,z}])),
-               from_term([{{a,1,x},{x,a,x}},{{a,2,z},{z,a,z}},
-                          {{b,3,y},{y,b,y}}])),
+    eval(substitution(XFun1, E), E),
+    eval(substitution(Fun1, E), E),
+    eval(substitution(XFun1, ER), from_term([], [{{atom,atom},{atom}}])),
+    eval(substitution(XFun1, relation([{a,1}])),
+	 from_term([{{a,1},{a}}])),
+    eval(substitution(XFun1, relation([{a,1},{b,3},{a,2}])),
+	 from_term([{{a,1},{a}},{{a,2},{a}},{{b,3},{b}}])),
+    eval(substitution({external, fun({A,_B,C}) -> {C,A,C} end},
+		      relation([{a,1,x},{b,3,y},{a,2,z}])),
+	 from_term([{{a,1,x},{x,a,x}},{{a,2,z},{z,a,z}},
+		    {{b,3,y},{y,b,y}}])),
     Fun2 = fun(S) -> {A,_B} = to_external(S), from_term({A}) end,
-    ?line eval(substitution(Fun2, ER), E),
-    ?line eval(substitution(Fun2, relation([{a,1}])), 
-	       from_term([{{a,1},{a}}])),
+    eval(substitution(Fun2, ER), E),
+    eval(substitution(Fun2, relation([{a,1}])),
+	 from_term([{{a,1},{a}}])),
     Fun3 = fun(S) -> from_term({to_external(S),0}, {type(S),atom}) end,
-    ?line eval(substitution(Fun3, E), E),
-    ?line eval(substitution(Fun3, set([a,b])),
-	       from_term([{a,{a,0}},{b,{b,0}}])),
-    ?line eval(substitution(Fun3, relation([{a,1},{b,2}])),
-	       from_term([{{a,1},{{a,1},0}},{{b,2},{{b,2},0}}])),
-    ?line eval(substitution(Fun3, from_term([[a],[b]])),
-	       from_term([{[a],{[a],0}},{[b],{[b],0}}])),
-    
-    ?line eval(substitution(fun(_) -> E end, from_term([[a],[b]])),
-	       from_term([{[a],[]},{[b],[]}])),
-
-    ?line {'EXIT', {badarg, _}} = (catch substitution(1, set([]))),
-    ?line eval(substitution(1, ER), from_term([], [{{atom,atom},atom}])),
-    ?line {'EXIT', {function_clause, _}} = 
+    eval(substitution(Fun3, E), E),
+    eval(substitution(Fun3, set([a,b])),
+	 from_term([{a,{a,0}},{b,{b,0}}])),
+    eval(substitution(Fun3, relation([{a,1},{b,2}])),
+	 from_term([{{a,1},{{a,1},0}},{{b,2},{{b,2},0}}])),
+    eval(substitution(Fun3, from_term([[a],[b]])),
+	 from_term([{[a],{[a],0}},{[b],{[b],0}}])),
+
+    eval(substitution(fun(_) -> E end, from_term([[a],[b]])),
+	 from_term([{[a],[]},{[b],[]}])),
+
+    {'EXIT', {badarg, _}} = (catch substitution(1, set([]))),
+    eval(substitution(1, ER), from_term([], [{{atom,atom},atom}])),
+    {'EXIT', {function_clause, _}} =
 	(catch substitution({external, fun({A,_}) -> A end}, set([]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch substitution({external, fun({A,_}) -> {A,0} end}, 
 			    from_term([{1,a}]))),
 
     %% set of sets
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch substitution({external, fun(X) -> X end}, 
 			    from_term([], [[atom]]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch substitution({external, fun(X) -> X end}, from_term([[a]]))),
-    ?line eval(substitution(fun(X) -> X end, from_term([], [[atom]])), E),
-    ?line eval(substitution(fun sofs:union/1,
-                            from_term([[[1,2],[2,3]], [[a,b],[b,c]]])),
-               from_term([{[[1,2],[2,3]],[1,2,3]}, {[[a,b],[b,c]],[a,b,c]}])),
-    ?line eval(substitution(fun(_) -> from_term([a]) end, 
-			    from_term([[b]], [[a]])),
-               from_term([{[b],[a]}], [{[a],[atom]}])),
-    ?line eval(substitution(fun(_) -> from_term([a]) end, 
-			    from_term([[1,2],[3,4]])),
-               from_term([{[1,2],[a]},{[3,4],[a]}])),
+    eval(substitution(fun(X) -> X end, from_term([], [[atom]])), E),
+    eval(substitution(fun sofs:union/1,
+		      from_term([[[1,2],[2,3]], [[a,b],[b,c]]])),
+	 from_term([{[[1,2],[2,3]],[1,2,3]}, {[[a,b],[b,c]],[a,b,c]}])),
+    eval(substitution(fun(_) -> from_term([a]) end,
+		      from_term([[b]], [[a]])),
+	 from_term([{[b],[a]}], [{[a],[atom]}])),
+    eval(substitution(fun(_) -> from_term([a]) end,
+		      from_term([[1,2],[3,4]])),
+	 from_term([{[1,2],[a]},{[3,4],[a]}])),
     Fun10 = fun(S) ->
-                   %% Cheating a lot...
-                   case to_external(S) of
-                       [1] -> from_term({1,1});
-                       _ -> S
-                   end
-           end,
-    ?line eval(substitution(Fun10, from_term([[1]])), 
-	       from_term([{[1],{1,1}}])),
-    ?line {'EXIT', {type_mismatch, _}} =
+		    %% Cheating a lot...
+		    case to_external(S) of
+			[1] -> from_term({1,1});
+			_ -> S
+		    end
+	    end,
+    eval(substitution(Fun10, from_term([[1]])),
+	 from_term([{[1],{1,1}}])),
+    {'EXIT', {type_mismatch, _}} =
         (catch substitution(Fun10, from_term([[1],[2]]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
         (catch substitution(Fun10, from_term([[1],[0]]))),
 
-    ?line eval(substitution(fun(_) -> from_term({a}) end, from_term([[a]])),
-	       from_term([{[a],{a}}])),
-    ?line {'EXIT', {badarg, _}} = 
+    eval(substitution(fun(_) -> from_term({a}) end, from_term([[a]])),
+	 from_term([{[a],{a}}])),
+    {'EXIT', {badarg, _}} =
 	(catch substitution(fun(_) -> {a} end, from_term([[a]]))),
 
     ok.
 
-restriction(suite) -> [];
-restriction(doc) -> [""];
 restriction(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([], 2),
+    E = empty_set(),
+    ER = relation([], 2),
 
     %% set of ordered sets
-    ?line S1 = relation([{a,1},{b,2},{b,22},{c,0}]),
-    ?line eval(restriction(S1, set([a,b])), 
-               relation([{a,1},{b,2},{b,22}])),
-    ?line eval(restriction(2, S1, set([1,2])),  
-               relation([{a,1},{b,2}])),
-    ?line eval(restriction(S1, set([a,b,c])), S1),
-    ?line eval(restriction(1, S1, set([0,1,d,e])), ER),
-    ?line eval(restriction(1, S1, E), ER),
-    ?line eval(restriction({external, fun({_A,B,C}) -> {B,C} end}, 
-                           relation([{a,aa,1},{b,bb,2},{c,cc,3}]),
-                           relation([{bb,2},{cc,3}])),
-               relation([{b,bb,2},{c,cc,3}])),
+    S1 = relation([{a,1},{b,2},{b,22},{c,0}]),
+    eval(restriction(S1, set([a,b])),
+	 relation([{a,1},{b,2},{b,22}])),
+    eval(restriction(2, S1, set([1,2])),
+	 relation([{a,1},{b,2}])),
+    eval(restriction(S1, set([a,b,c])), S1),
+    eval(restriction(1, S1, set([0,1,d,e])), ER),
+    eval(restriction(1, S1, E), ER),
+    eval(restriction({external, fun({_A,B,C}) -> {B,C} end},
+		     relation([{a,aa,1},{b,bb,2},{c,cc,3}]),
+		     relation([{bb,2},{cc,3}])),
+	 relation([{b,bb,2},{c,cc,3}])),
     R1 = relation([],[{a,b}]),
-    ?line eval(restriction(2, R1,sofs:set([],[b])), R1),
+    eval(restriction(2, R1,sofs:set([],[b])), R1),
     Id = fun(X) -> X end,
     XId = {external, Id},
-    ?line eval(restriction(XId, relation([{a,b}]), E), ER),
-    ?line eval(restriction(XId, E, relation([{b,d}])), E),
+    eval(restriction(XId, relation([{a,b}]), E), ER),
+    eval(restriction(XId, E, relation([{b,d}])), E),
     Fun1 = fun(S) -> {_A,B,C} = to_external(S), from_term({B,C}) end,
-    ?line eval(restriction(Fun1,
-                           relation([{a,aa,1},{b,bb,2},{c,cc,3}]),
-                           relation([{bb,2},{cc,3}])),
-               relation([{b,bb,2},{c,cc,3}])),
-    ?line eval(restriction({external, fun({_,{A},B}) -> {A,B} end},
-                           from_term([{a,{aa},1},{b,{bb},2},{c,{cc},3}]), 
-                           from_term([{bb,2},{cc,3}])),
-               from_term([{b,{bb},2},{c,{cc},3}])),
+    eval(restriction(Fun1,
+		     relation([{a,aa,1},{b,bb,2},{c,cc,3}]),
+		     relation([{bb,2},{cc,3}])),
+	 relation([{b,bb,2},{c,cc,3}])),
+    eval(restriction({external, fun({_,{A},B}) -> {A,B} end},
+		     from_term([{a,{aa},1},{b,{bb},2},{c,{cc},3}]),
+		     from_term([{bb,2},{cc,3}])),
+	 from_term([{b,{bb},2},{c,{cc},3}])),
     S5 = relation([{1,a},{2,b},{3,c}]),
-    ?line eval(restriction(2, S5, set([b,c])), relation([{2,b},{3,c}])),
+    eval(restriction(2, S5, set([b,c])), relation([{2,b},{3,c}])),
     S4 = relation([{a,1},{b,2},{b,27},{c,0}]),
-    ?line eval(restriction(2, S4, E), ER),
+    eval(restriction(2, S4, E), ER),
     S6 = relation([{1,a},{2,c},{3,b}]),
-    ?line eval(restriction(2, S6, set([d,e])), ER),
-    ?line eval(restriction(2, 
-			   relation([{1,d},{2,c},{3,b},{4,a},{5,e}]), 
-			   set([c])),
-	       relation([{2,c}])),
-    ?line eval(restriction(XId, 
-			   relation([{1,a},{3,b},{4,c},{4,d}]), 
-			   relation([{2,a},{2,c},{4,c}])),
-	       relation([{4,c}])),
-    ?line eval(restriction(2, relation([{a,b}]), E), ER),
-    ?line eval(restriction(2, E, relation([{b,d}])), E),
-    ?line eval(restriction(2, relation([{b,d}]), E), ER),
-    ?line eval(restriction(XId, E, set([a])), E),
-    ?line eval(restriction(1, S1, E), ER),
-    ?line {'EXIT', {badarg, _}} =
+    eval(restriction(2, S6, set([d,e])), ER),
+    eval(restriction(2,
+		     relation([{1,d},{2,c},{3,b},{4,a},{5,e}]),
+		     set([c])),
+	 relation([{2,c}])),
+    eval(restriction(XId,
+		     relation([{1,a},{3,b},{4,c},{4,d}]),
+		     relation([{2,a},{2,c},{4,c}])),
+	 relation([{4,c}])),
+    eval(restriction(2, relation([{a,b}]), E), ER),
+    eval(restriction(2, E, relation([{b,d}])), E),
+    eval(restriction(2, relation([{b,d}]), E), ER),
+    eval(restriction(XId, E, set([a])), E),
+    eval(restriction(1, S1, E), ER),
+    {'EXIT', {badarg, _}} =
 	(catch restriction(3, relation([{a,b}]), E)),
-    ?line {'EXIT', {badarg, _}} =
+    {'EXIT', {badarg, _}} =
 	(catch restriction(3, relation([{a,b}]), relation([{b,d}]))),
-    ?line {'EXIT', {badarg, _}} =
+    {'EXIT', {badarg, _}} =
 	(catch restriction(3, relation([{a,b}]), set([{b,d}]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch restriction(2, relation([{a,b}]), relation([{b,d}]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch restriction({external, fun({A,_B}) -> A end}, 
 			   relation([{a,b}]), relation([{b,d}]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch restriction({external, fun({A,_}) -> {A,0} end}, 
 			   from_term([{1,a}]),
 			   from_term([{1,0}]))),
-    ?line eval(restriction(2, relation([{a,d},{b,e},{c,b},{d,c}]), set([b,d])),
-	       relation([{a,d},{c,b}])),
-    ?line {'EXIT', {function_clause, _}} =
+    eval(restriction(2, relation([{a,d},{b,e},{c,b},{d,c}]), set([b,d])),
+	 relation([{a,d},{c,b}])),
+    {'EXIT', {function_clause, _}} =
 	(catch restriction({external, fun({A,_B}) -> A end}, set([]), E)),
 
     Fun3 = fun(S) -> from_term({to_external(S),0}, {type(S),atom}) end,
-    ?line eval(restriction(Fun3, set([1,2]), from_term([{1,0}])),
-	       from_term([1])),
+    eval(restriction(Fun3, set([1,2]), from_term([{1,0}])),
+	 from_term([1])),
 
     %% set of sets
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch restriction({external, fun(X) -> X end}, 
 			   from_term([], [[atom]]), set([a]))),
     S2 = from_term([], [[atom]]),
-    ?line eval(restriction(Id, S2, E), E),
+    eval(restriction(Id, S2, E), E),
     S3 = from_term([[a],[b]], [[atom]]),
-    ?line eval(restriction(Id, S3, E), E),
-    ?line eval(restriction(Id, from_term([], [[atom]]), set([a])),
-	       from_term([], [[atom]])),
-    ?line eval(restriction(fun sofs:union/1,
-                           from_term([[[a],[b]], [[b],[c]], 
-                                      [[], [a,b]], [[1],[2]]]), 
-                           from_term([[a,b],[1,2,3],[b,c]])),
-               from_term([[[],[a,b]], [[a],[b]],[[b],[c]]])),
-    ?line eval(restriction(fun(_) -> from_term([a]) end, 
-                           from_term([], [[atom]]),
-                           from_term([], [[a]])),
-               from_term([], [[atom]])),
-    ?line {'EXIT', {type_mismatch, _}} =
+    eval(restriction(Id, S3, E), E),
+    eval(restriction(Id, from_term([], [[atom]]), set([a])),
+	 from_term([], [[atom]])),
+    eval(restriction(fun sofs:union/1,
+		     from_term([[[a],[b]], [[b],[c]],
+				[[], [a,b]], [[1],[2]]]),
+		     from_term([[a,b],[1,2,3],[b,c]])),
+	 from_term([[[],[a,b]], [[a],[b]],[[b],[c]]])),
+    eval(restriction(fun(_) -> from_term([a]) end,
+		     from_term([], [[atom]]),
+		     from_term([], [[a]])),
+	 from_term([], [[atom]])),
+    {'EXIT', {type_mismatch, _}} =
         (catch restriction(fun(_) -> from_term([a]) end, 
                            from_term([[1,2],[3,4]]),
                            from_term([], [atom]))),
     Fun10 = fun(S) ->
-                   %% Cheating a lot...
-                   case to_external(S) of
-                       [1] -> from_term({1,1});
-                       _ -> S
-                   end
-           end,
-    ?line {'EXIT', {type_mismatch, _}} =
+		    %% Cheating a lot...
+		    case to_external(S) of
+			[1] -> from_term({1,1});
+			_ -> S
+		    end
+	    end,
+    {'EXIT', {type_mismatch, _}} =
         (catch restriction(Fun10, from_term([[1]]), from_term([], [[atom]]))),
-    ?line {'EXIT', {type_mismatch, _}} = 
+    {'EXIT', {type_mismatch, _}} =
         (catch restriction(fun(_) -> from_term({a}) end, 
                            from_term([[a]]),
                            from_term([], [atom]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch restriction(fun(_) -> {a} end, 
                            from_term([[a]]),
                            from_term([], [atom]))),
     ok.
 
-drestriction(suite) -> [];
-drestriction(doc) -> [""];
 drestriction(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([], 2),
+    E = empty_set(),
+    ER = relation([], 2),
 
     %% set of ordered sets
-    ?line S1 = relation([{a,1},{b,2},{b,22},{c,0}]),
-    ?line eval(drestriction(S1, set([a,b])), relation([{c,0}])),
-    ?line eval(drestriction(2, S1, set([1,2])),  
-               relation([{b,22},{c,0}])),
-    ?line eval(drestriction(S1, set([a,b,c])), ER),
-    ?line eval(drestriction(2, ER, set([a,b])), ER),
-    ?line eval(drestriction(1, S1, set([0,1,d,e])), S1),
-    ?line eval(drestriction(1, S1, E), S1),
-    ?line eval(drestriction({external, fun({_A,B,C}) -> {B,C} end}, 
-                            relation([{a,aa,1},{b,bb,2},{c,cc,3}]),
-                            relation([{bb,2},{cc,3}])),
-               relation([{a,aa,1}])),
+    S1 = relation([{a,1},{b,2},{b,22},{c,0}]),
+    eval(drestriction(S1, set([a,b])), relation([{c,0}])),
+    eval(drestriction(2, S1, set([1,2])),
+	 relation([{b,22},{c,0}])),
+    eval(drestriction(S1, set([a,b,c])), ER),
+    eval(drestriction(2, ER, set([a,b])), ER),
+    eval(drestriction(1, S1, set([0,1,d,e])), S1),
+    eval(drestriction(1, S1, E), S1),
+    eval(drestriction({external, fun({_A,B,C}) -> {B,C} end},
+		      relation([{a,aa,1},{b,bb,2},{c,cc,3}]),
+		      relation([{bb,2},{cc,3}])),
+	 relation([{a,aa,1}])),
     Id = fun(X) -> X end,
     XId = {external, Id},
-    ?line eval(drestriction(XId, relation([{a,b}]), E), relation([{a,b}])),
-    ?line eval(drestriction(XId, E, relation([{b,d}])), E),
+    eval(drestriction(XId, relation([{a,b}]), E), relation([{a,b}])),
+    eval(drestriction(XId, E, relation([{b,d}])), E),
     Fun1 = fun(S) -> {_A,B,C} = to_external(S), from_term({B,C}) end,
-    ?line eval(drestriction(Fun1,
-                            relation([{a,aa,1},{b,bb,2},{c,cc,3}]),
-                            relation([{bb,2},{cc,3}])),
-               relation([{a,aa,1}])),
-    ?line eval(drestriction({external, fun({_,{A},B}) -> {A,B} end},
-                            from_term([{a,{aa},1},{b,{bb},2},{c,{cc},3}]), 
-                            from_term([{bb,2},{cc,3}])),
-               from_term([{a,{aa},1}])),
+    eval(drestriction(Fun1,
+		      relation([{a,aa,1},{b,bb,2},{c,cc,3}]),
+		      relation([{bb,2},{cc,3}])),
+	 relation([{a,aa,1}])),
+    eval(drestriction({external, fun({_,{A},B}) -> {A,B} end},
+		      from_term([{a,{aa},1},{b,{bb},2},{c,{cc},3}]),
+		      from_term([{bb,2},{cc,3}])),
+	 from_term([{a,{aa},1}])),
     S5 = relation([{1,a},{2,b},{3,c}]),
-    ?line eval(drestriction(2, S5, set([b,c])), relation([{1,a}])),
+    eval(drestriction(2, S5, set([b,c])), relation([{1,a}])),
     S4 = relation([{a,1},{b,2},{b,27},{c,0}]),
-    ?line eval(drestriction(2, S4, set([])), S4),
+    eval(drestriction(2, S4, set([])), S4),
     S6 = relation([{1,a},{2,c},{3,b}]),
-    ?line eval(drestriction(2, S6, set([d,e])), S6),
-    ?line eval(drestriction(2, 
-			    relation([{1,d},{2,c},{3,b},{4,a},{5,e}]), 
-			    set([c])),
-	       relation([{1,d},{3,b},{4,a},{5,e}])),
-    ?line eval(drestriction(XId, 
-			    relation([{1,a},{3,b},{4,c},{4,d}]), 
-			    relation([{2,a},{2,c},{4,c}])),
-	       relation([{1,a},{3,b},{4,d}])),
-    ?line eval(drestriction(2, relation([{a,b}]), E), relation([{a,b}])),
-    ?line eval(drestriction(2, E, relation([{b,d}])), E),
-    ?line eval(drestriction(2, relation([{b,d}]), E), relation([{b,d}])),
-    ?line eval(drestriction(XId, E, set([a])), E),
-    ?line eval(drestriction(1, S1, E), S1),
-    ?line {'EXIT', {badarg, _}} =
+    eval(drestriction(2, S6, set([d,e])), S6),
+    eval(drestriction(2,
+		      relation([{1,d},{2,c},{3,b},{4,a},{5,e}]),
+		      set([c])),
+	 relation([{1,d},{3,b},{4,a},{5,e}])),
+    eval(drestriction(XId,
+		      relation([{1,a},{3,b},{4,c},{4,d}]),
+		      relation([{2,a},{2,c},{4,c}])),
+	 relation([{1,a},{3,b},{4,d}])),
+    eval(drestriction(2, relation([{a,b}]), E), relation([{a,b}])),
+    eval(drestriction(2, E, relation([{b,d}])), E),
+    eval(drestriction(2, relation([{b,d}]), E), relation([{b,d}])),
+    eval(drestriction(XId, E, set([a])), E),
+    eval(drestriction(1, S1, E), S1),
+    {'EXIT', {badarg, _}} =
 	(catch drestriction(3, relation([{a,b}]), E)),
-    ?line {'EXIT', {badarg, _}} =
+    {'EXIT', {badarg, _}} =
 	(catch drestriction(3, relation([{a,b}]), relation([{b,d}]))),
-    ?line {'EXIT', {badarg, _}} =
+    {'EXIT', {badarg, _}} =
 	(catch drestriction(3, relation([{a,b}]), set([{b,d}]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch drestriction(2, relation([{a,b}]), relation([{b,d}]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch drestriction({external, fun({A,_B}) -> A end}, 
 			    relation([{a,b}]), relation([{b,d}]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch drestriction({external, fun({A,_}) -> {A,0} end}, 
 			    from_term([{1,a}]),
 			    from_term([{1,0}]))),
-    ?line eval(drestriction(2, relation([{a,d},{b,e},{c,b},{d,c}]), set([b,d])),
-	       relation([{b,e},{d,c}])),
-    ?line {'EXIT', {function_clause, _}} =
+    eval(drestriction(2, relation([{a,d},{b,e},{c,b},{d,c}]), set([b,d])),
+	 relation([{b,e},{d,c}])),
+    {'EXIT', {function_clause, _}} =
 	(catch drestriction({external, fun({A,_B}) -> A end}, set([]), E)),
 
     Fun3 = fun(S) -> from_term({to_external(S),0}, {type(S),atom}) end,
-    ?line eval(drestriction(Fun3, set([1,2]), from_term([{1,0}])),
-	       from_term([2])),
+    eval(drestriction(Fun3, set([1,2]), from_term([{1,0}])),
+	 from_term([2])),
 
     %% set of sets
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch drestriction({external, fun(X) -> X end}, 
 			    from_term([], [[atom]]), set([a]))),
     S2 = from_term([], [[atom]]),
-    ?line eval(drestriction(Id, S2, E), S2),
+    eval(drestriction(Id, S2, E), S2),
     S3 = from_term([[a],[b]], [[atom]]),
-    ?line eval(drestriction(Id, S3, E), S3),
-    ?line eval(drestriction(Id, from_term([], [[atom]]), set([a])),
-	       from_term([], [[atom]])),
-    ?line eval(drestriction(fun sofs:union/1,
-                            from_term([[[a],[b]], [[b],[c]], 
-                                       [[], [a,b]], [[1],[2]]]), 
-                            from_term([[a,b],[1,2,3],[b,c]])),
-               from_term([[[1],[2]]])),
-    ?line eval(drestriction(fun(_) -> from_term([a]) end, 
-                            from_term([], [[atom]]),
-                            from_term([], [[a]])),
-               from_term([], [[atom]])),
-    ?line {'EXIT', {type_mismatch, _}} =
+    eval(drestriction(Id, S3, E), S3),
+    eval(drestriction(Id, from_term([], [[atom]]), set([a])),
+	 from_term([], [[atom]])),
+    eval(drestriction(fun sofs:union/1,
+		      from_term([[[a],[b]], [[b],[c]],
+				 [[], [a,b]], [[1],[2]]]),
+		      from_term([[a,b],[1,2,3],[b,c]])),
+	 from_term([[[1],[2]]])),
+    eval(drestriction(fun(_) -> from_term([a]) end,
+		      from_term([], [[atom]]),
+		      from_term([], [[a]])),
+	 from_term([], [[atom]])),
+    {'EXIT', {type_mismatch, _}} =
         (catch drestriction(fun(_) -> from_term([a]) end, 
                             from_term([[1,2],[3,4]]),
                             from_term([], [atom]))),
     Fun10 = fun(S) ->
-                   %% Cheating a lot...
-                   case to_external(S) of
-                       [1] -> from_term({1,1});
-                       _ -> S
-                   end
-           end,
-    ?line {'EXIT', {type_mismatch, _}} =
+		    %% Cheating a lot...
+		    case to_external(S) of
+			[1] -> from_term({1,1});
+			_ -> S
+		    end
+	    end,
+    {'EXIT', {type_mismatch, _}} =
         (catch drestriction(Fun10, from_term([[1]]), from_term([], [[atom]]))),
-    ?line {'EXIT', {type_mismatch, _}} = 
+    {'EXIT', {type_mismatch, _}} =
         (catch drestriction(fun(_) -> from_term({a}) end, 
                             from_term([[a]]),
                             from_term([], [atom]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch drestriction(fun(_) -> {a} end, 
 			    from_term([[a]]),
 			    from_term([], [atom]))),
     ok.
 
-strict_relation_1(suite) -> [];
-strict_relation_1(doc) -> [""];
 strict_relation_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([], 2),
-    ?line eval(strict_relation(E), E),
-    ?line eval(strict_relation(ER), ER),
-    ?line eval(strict_relation(relation([{1,a},{a,a},{2,b}])),
-               relation([{1,a},{2,b}])),
-    ?line {'EXIT', {badarg, _}} = 
+    E = empty_set(),
+    ER = relation([], 2),
+    eval(strict_relation(E), E),
+    eval(strict_relation(ER), ER),
+    eval(strict_relation(relation([{1,a},{a,a},{2,b}])),
+	 relation([{1,a},{2,b}])),
+    {'EXIT', {badarg, _}} =
         (catch strict_relation(relation([{1,2,3}]))),
     F = 0.0, I = round(F),
-    ?line FR = relation([{F,I}]),
+    FR = relation([{F,I}]),
     if
         F == I -> % term ordering
             eval(strict_relation(FR), ER);
@@ -916,362 +893,334 @@ strict_relation_1(Conf) when is_list(Conf) ->
     end,
     ok.
 
-extension(suite) -> [];
-extension(doc) -> [""];
 extension(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([], 2),
-    ?line EF = family([]),
-    ?line C1 = from_term(3),
-    ?line C2 = from_term([3]),
-    ?line {'EXIT', {function_clause, _}} = (catch extension(foo, E, C1)),
-    ?line {'EXIT', {function_clause, _}} = (catch extension(ER, foo, C1)),
-    ?line {'EXIT', {{case_clause, _},_}} = (catch extension(ER, E, foo)),
-    ?line {'EXIT', {type_mismatch, _}} = (catch extension(ER, E, E)),
-    ?line {'EXIT', {badarg, _}} = (catch extension(C2, E, E)),
-    ?line eval(E, extension(E, E, E)),
-    ?line eval(EF, extension(EF, E, E)),
-    ?line eval(family([{3,[]}]), extension(EF, set([3]), E)),
-    ?line eval(ER, extension(ER, E, C1)),
-    ?line eval(E, extension(E, ER, E)),
-    ?line eval(from_term([],[{{atom,atom},type(ER)}]), extension(E, ER, ER)),
-
-    ?line R1 = relation([{c,7},{c,9},{c,11},{d,17},{f,20}]),
-    ?line S1 = set([a,c,d,e]),
-    ?line eval(extension(R1, S1, C1), lextension(R1, S1, C1)),
-
-    ?line S2 = set([1,2,3]),
-    ?line eval(extension(ER, S2, C1), lextension(ER, S2, C1)),
-
-    ?line R3 = relation([{4,a},{8,b}]),
-    ?line S3 = set([1,2,3,4,5,6,7,8,9,10,11]),
-    ?line eval(extension(R3, S3, C1), lextension(R3, S3, C1)),
-
-    ?line R4 = relation([{2,b},{4,d},{6,f}]),
-    ?line S4 = set([1,3,5,7]),
-    ?line eval(extension(R4, S4, C1), lextension(R4, S4, C1)),
-
-    ?line F1 = family([{a,[1]},{c,[2]}]),
-    ?line S5 = set([a,b,c,d]),
-    ?line eval(extension(F1, S5, C2), lextension(F1, S5, C2)),
+    E = empty_set(),
+    ER = relation([], 2),
+    EF = family([]),
+    C1 = from_term(3),
+    C2 = from_term([3]),
+    {'EXIT', {function_clause, _}} = (catch extension(foo, E, C1)),
+    {'EXIT', {function_clause, _}} = (catch extension(ER, foo, C1)),
+    {'EXIT', {{case_clause, _},_}} = (catch extension(ER, E, foo)),
+    {'EXIT', {type_mismatch, _}} = (catch extension(ER, E, E)),
+    {'EXIT', {badarg, _}} = (catch extension(C2, E, E)),
+    eval(E, extension(E, E, E)),
+    eval(EF, extension(EF, E, E)),
+    eval(family([{3,[]}]), extension(EF, set([3]), E)),
+    eval(ER, extension(ER, E, C1)),
+    eval(E, extension(E, ER, E)),
+    eval(from_term([],[{{atom,atom},type(ER)}]), extension(E, ER, ER)),
+
+    R1 = relation([{c,7},{c,9},{c,11},{d,17},{f,20}]),
+    S1 = set([a,c,d,e]),
+    eval(extension(R1, S1, C1), lextension(R1, S1, C1)),
+
+    S2 = set([1,2,3]),
+    eval(extension(ER, S2, C1), lextension(ER, S2, C1)),
+
+    R3 = relation([{4,a},{8,b}]),
+    S3 = set([1,2,3,4,5,6,7,8,9,10,11]),
+    eval(extension(R3, S3, C1), lextension(R3, S3, C1)),
+
+    R4 = relation([{2,b},{4,d},{6,f}]),
+    S4 = set([1,3,5,7]),
+    eval(extension(R4, S4, C1), lextension(R4, S4, C1)),
+
+    F1 = family([{a,[1]},{c,[2]}]),
+    S5 = set([a,b,c,d]),
+    eval(extension(F1, S5, C2), lextension(F1, S5, C2)),
     ok.
 
 lextension(R, S, C) ->
     union(R, drestriction(1, constant_function(S, C), domain(R))).
 
-weak_relation_1(suite) -> [];
-weak_relation_1(doc) -> [""];
 weak_relation_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([], 2),
-    ?line eval(weak_relation(E), E),
-    ?line eval(weak_relation(ER), ER),
-    ?line eval(weak_relation(relation([{a,1},{a,2},{b,2},{c,c}])),
-               relation([{1,1},{2,2},{a,1},{a,2},{a,a},{b,2},{b,b},{c,c}])),
-    ?line eval(weak_relation(relation([{a,1},{a,a},{a,b}])),
-               relation([{1,1},{a,1},{a,a},{a,b},{b,b}])),
-    ?line eval(weak_relation(relation([{a,1},{a,b},{7,w}])),
-               relation([{1,1},{7,7},{7,w},{a,1},{a,a},{a,b},{b,b},{w,w}])),
-    ?line {'EXIT', {badarg, _}} = 
+    E = empty_set(),
+    ER = relation([], 2),
+    eval(weak_relation(E), E),
+    eval(weak_relation(ER), ER),
+    eval(weak_relation(relation([{a,1},{a,2},{b,2},{c,c}])),
+	 relation([{1,1},{2,2},{a,1},{a,2},{a,a},{b,2},{b,b},{c,c}])),
+    eval(weak_relation(relation([{a,1},{a,a},{a,b}])),
+	 relation([{1,1},{a,1},{a,a},{a,b},{b,b}])),
+    eval(weak_relation(relation([{a,1},{a,b},{7,w}])),
+	 relation([{1,1},{7,7},{7,w},{a,1},{a,a},{a,b},{b,b},{w,w}])),
+    {'EXIT', {badarg, _}} =
 	(catch weak_relation(from_term([{{a},a}]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch weak_relation(from_term([{a,a}],[{d,r}]))),
-    ?line {'EXIT', {badarg, _}} = (catch weak_relation(relation([{1,2,3}]))),
+    {'EXIT', {badarg, _}} = (catch weak_relation(relation([{1,2,3}]))),
 
     F = 0.0, I = round(F),
     if
         F == I -> % term ordering
-            ?line FR1 = relation([{F,I}]),
+            FR1 = relation([{F,I}]),
             eval(weak_relation(FR1), FR1),
-            ?line FR2 = relation([{F,2},{I,1}]),
+            FR2 = relation([{F,2},{I,1}]),
             true = no_elements(weak_relation(FR2)) =:= 5,
-            ?line FR3 = relation([{1,0},{1.0,1}]),
+            FR3 = relation([{1,0},{1.0,1}]),
             true = no_elements(weak_relation(FR3)) =:= 3;
         true -> 
             ok
     end,
     ok.
 
-to_sets_1(suite) ->  [];
-to_sets_1(doc) -> [""];
 to_sets_1(Conf) when is_list(Conf) ->
-    ?line {'EXIT', {badarg, _}} = (catch to_sets(from_term(a))),
-    ?line {'EXIT', {function_clause, _}} = (catch to_sets(a)),
+    {'EXIT', {badarg, _}} = (catch to_sets(from_term(a))),
+    {'EXIT', {function_clause, _}} = (catch to_sets(a)),
     %% unordered
-    ?line [] = to_sets(empty_set()),
-    ?line eval(to_sets(from_term([a])), [from_term(a)]),
-    ?line eval(to_sets(from_term([[]],[[atom]])), [set([])]),
+    [] = to_sets(empty_set()),
+    eval(to_sets(from_term([a])), [from_term(a)]),
+    eval(to_sets(from_term([[]],[[atom]])), [set([])]),
 
-    ?line L = [from_term([a,b]),from_term([c,d])],
-    ?line eval(to_sets(from_sets(L)), L),
+    L = [from_term([a,b]),from_term([c,d])],
+    eval(to_sets(from_sets(L)), L),
 
-    ?line eval(to_sets(relation([{a,1},{b,2}])),
-               [from_term({a,1},{atom,atom}), from_term({b,2},{atom,atom})]),
+    eval(to_sets(relation([{a,1},{b,2}])),
+	 [from_term({a,1},{atom,atom}), from_term({b,2},{atom,atom})]),
 
     %% ordered
-    ?line O = {from_term(a,atom), from_term({b}, {atom}), set([c,d])},
-    ?line eval(to_sets(from_sets(O)), O),
+    O = {from_term(a,atom), from_term({b}, {atom}), set([c,d])},
+    eval(to_sets(from_sets(O)), O),
     ok.
 
 
-specification(suite) -> [];
-specification(doc) -> [""];
 specification(Conf) when is_list(Conf) ->
     Fun = {external, fun(I) when is_integer(I) -> true; (_) -> false end},
-    ?line [1,2,3] = to_external(specification(Fun, set([a,1,b,2,c,3]))),
+    [1,2,3] = to_external(specification(Fun, set([a,1,b,2,c,3]))),
 
     Fun2 = fun(S) -> is_subset(S, set([1,3,5,7,9])) end,
     S2 = from_term([[1],[2],[3],[4],[5],[6],[7]]),
-    ?line eval(specification(Fun2, S2), from_term([[1],[3],[5],[7]])),
+    eval(specification(Fun2, S2), from_term([[1],[3],[5],[7]])),
     Fun2x = fun([1]) -> true;
 	       ([3]) -> true;
 	       (_) -> false 
 	    end,
-    ?line eval(specification({external,Fun2x}, S2), from_term([[1],[3]])),
+    eval(specification({external,Fun2x}, S2), from_term([[1],[3]])),
 
     Fun3 = fun(_) -> neither_true_nor_false end,
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch specification(Fun3, set([a]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch specification({external, Fun3}, set([a]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch specification(Fun3, from_term([[a]]))),
-    ?line {'EXIT', {function_clause, _}} = 
+    {'EXIT', {function_clause, _}} =
 	(catch specification(Fun, a)),
     ok.
 
-union_1(suite) -> [];
-union_1(doc) -> [""];
 union_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([], 2),
-    ?line {'EXIT', {badarg, _}} = (catch union(ER)),
-    ?line {'EXIT', {type_mismatch, _}} =
+    E = empty_set(),
+    ER = relation([], 2),
+    {'EXIT', {badarg, _}} = (catch union(ER)),
+    {'EXIT', {type_mismatch, _}} =
 	(catch union(relation([{a,b}]), relation([{a,b,c}]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch union(from_term([{a,b}]), from_term([{c,[x]}]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch union(from_term([{a,b}]), from_term([{c,d}], [{d,r}]))),
-    ?line {'EXIT', {badarg, _}} = (catch union(set([a,b,c]))),
-    ?line eval(union(E), E),
-    ?line eval(union(from_term([[]],[[atom]])), set([])),
-    ?line eval(union(from_term([[{a,b},{b,c}],[{b,c}]])), 
-               relation([{a,b},{b,c}])),
-    ?line eval(union(from_term([[1,2,3],[2,3,4],[3,4,5]])), 
-               set([1,2,3,4,5])),
-
-    ?line eval(union(from_term([{[a],[],c}]), from_term([{[],[],q}])),
-	       from_term([{[a],[],c},{[],[],q}])),
-
-    ?line eval(union(E, E), E),
-    ?line eval(union(set([a,b]), E), set([a,b])),
-    ?line eval(union(E, set([a,b])), set([a,b])),
-
-    ?line eval(union(from_term([[a,b]])), from_term([a,b])),
+    {'EXIT', {badarg, _}} = (catch union(set([a,b,c]))),
+    eval(union(E), E),
+    eval(union(from_term([[]],[[atom]])), set([])),
+    eval(union(from_term([[{a,b},{b,c}],[{b,c}]])),
+	 relation([{a,b},{b,c}])),
+    eval(union(from_term([[1,2,3],[2,3,4],[3,4,5]])),
+	 set([1,2,3,4,5])),
+
+    eval(union(from_term([{[a],[],c}]), from_term([{[],[],q}])),
+	 from_term([{[a],[],c},{[],[],q}])),
+
+    eval(union(E, E), E),
+    eval(union(set([a,b]), E), set([a,b])),
+    eval(union(E, set([a,b])), set([a,b])),
+
+    eval(union(from_term([[a,b]])), from_term([a,b])),
     ok.
 
-intersection_1(suite) -> [];
-intersection_1(doc) -> [""];
 intersection_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line {'EXIT', {badarg, _}} = (catch intersection(from_term([a,b]))),
-    ?line {'EXIT', {badarg, _}} = (catch intersection(E)),
-    ?line {'EXIT', {type_mismatch, _}} =
+    E = empty_set(),
+    {'EXIT', {badarg, _}} = (catch intersection(from_term([a,b]))),
+    {'EXIT', {badarg, _}} = (catch intersection(E)),
+    {'EXIT', {type_mismatch, _}} =
 	(catch intersection(relation([{a,b}]), relation([{a,b,c}]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch intersection(relation([{a,b}]), from_term([{a,b}],[{d,r}]))),
 
-    ?line eval(intersection(from_term([[a,b,c],[d,e,f],[g,h,i]])), set([])),
-
-    ?line eval(intersection(E, E), E),
-    ?line eval(intersection(set([a,b,c]),set([0,b,q])), 
-               set([b])),
-    ?line eval(intersection(set([0,b,q]),set([a,b,c])), 
-               set([b])),
-    ?line eval(intersection(set([a,b,c]),set([a,b,c])), 
-               set([a,b,c])),
-    ?line eval(intersection(set([a,b,d]),set([c,d])), 
-               set([d])),
+    eval(intersection(from_term([[a,b,c],[d,e,f],[g,h,i]])), set([])),
+
+    eval(intersection(E, E), E),
+    eval(intersection(set([a,b,c]),set([0,b,q])),
+	 set([b])),
+    eval(intersection(set([0,b,q]),set([a,b,c])),
+	 set([b])),
+    eval(intersection(set([a,b,c]),set([a,b,c])),
+	 set([a,b,c])),
+    eval(intersection(set([a,b,d]),set([c,d])),
+	 set([d])),
     ok.
 
-difference(suite) -> [];
-difference(doc) -> [""];
 difference(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line {'EXIT', {type_mismatch, _}} =
+    E = empty_set(),
+    {'EXIT', {type_mismatch, _}} =
 	(catch difference(relation([{a,b}]), relation([{a,b,c}]))),
-    ?line eval(difference(E, E), E),
-    ?line {'EXIT', {type_mismatch, _}} =
+    eval(difference(E, E), E),
+    {'EXIT', {type_mismatch, _}} =
 	(catch difference(relation([{a,b}]), from_term([{a,c}],[{d,r}]))),
-    ?line eval(difference(set([a,b,c,d,f]), set([a,d,e,g])), 
-               set([b,c,f])),
-    ?line eval(difference(set([a,b,c]), set([d,e,f])), 
-               set([a,b,c])),
-    ?line eval(difference(set([a,b,c]), set([a,b,c,d,e,f])), 
-               set([])),
-    ?line eval(difference(set([e,f,g]), set([a,b,c,e])), 
-               set([f,g])),
-    ?line eval(difference(set([a,b,d,e,f]), set([c])), 
-               set([a,b,d,e,f])),
+    eval(difference(set([a,b,c,d,f]), set([a,d,e,g])),
+	 set([b,c,f])),
+    eval(difference(set([a,b,c]), set([d,e,f])),
+	 set([a,b,c])),
+    eval(difference(set([a,b,c]), set([a,b,c,d,e,f])),
+	 set([])),
+    eval(difference(set([e,f,g]), set([a,b,c,e])),
+	 set([f,g])),
+    eval(difference(set([a,b,d,e,f]), set([c])),
+	 set([a,b,d,e,f])),
     ok.
 
-symdiff(suite) -> [];
-symdiff(doc) -> [""];
 symdiff(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line {'EXIT', {type_mismatch, _}} =
+    E = empty_set(),
+    {'EXIT', {type_mismatch, _}} =
 	(catch symdiff(relation([{a,b}]), relation([{a,b,c}]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch symdiff(relation([{a,b}]), from_term([{a,b}], [{d,r}]))),
-    ?line eval(symdiff(E, E), E),
-    ?line eval(symdiff(set([a,b,c,d,e,f]), set([0,1,a,c])),
-               union(set([b,d,e,f]), set([0,1]))),
-    ?line eval(symdiff(set([a,b,c]), set([q,v,w,x,y])),
-               union(set([a,b,c]), set([q,v,w,x,y]))),
-    ?line eval(symdiff(set([a,b,c,d,e,f]), set([a,b,c])),
-               set([d,e,f])),
-    ?line eval(symdiff(set([c,e,g,h,i]), set([b,d,f])),
-               union(set([c,e,g,h,i]), set([b,d,f]))),
-    ?line eval(symdiff(set([c,d,g,h,k,l]), 
-                       set([a,b,e,f,i,j,m,n])),
-               union(set([c,d,g,h,k,l]), set([a,b,e,f,i,j,m,n]))),
-    ?line eval(symdiff(set([c,d,g,h,k,l]), 
-                       set([d,e,h,i,l,m,n,o,p])),
-               union(set([c,g,k]), set([e,i,m,n,o,p]))),
+    eval(symdiff(E, E), E),
+    eval(symdiff(set([a,b,c,d,e,f]), set([0,1,a,c])),
+	 union(set([b,d,e,f]), set([0,1]))),
+    eval(symdiff(set([a,b,c]), set([q,v,w,x,y])),
+	 union(set([a,b,c]), set([q,v,w,x,y]))),
+    eval(symdiff(set([a,b,c,d,e,f]), set([a,b,c])),
+	 set([d,e,f])),
+    eval(symdiff(set([c,e,g,h,i]), set([b,d,f])),
+	 union(set([c,e,g,h,i]), set([b,d,f]))),
+    eval(symdiff(set([c,d,g,h,k,l]),
+		 set([a,b,e,f,i,j,m,n])),
+	 union(set([c,d,g,h,k,l]), set([a,b,e,f,i,j,m,n]))),
+    eval(symdiff(set([c,d,g,h,k,l]),
+		 set([d,e,h,i,l,m,n,o,p])),
+	 union(set([c,g,k]), set([e,i,m,n,o,p]))),
     ok.
 
-symmetric_partition(suite) -> [];
-symmetric_partition(doc) -> [""];
 symmetric_partition(Conf) when is_list(Conf) ->
-    ?line E = set([]),
-    ?line S1 = set([1,2,3,4]),
-    ?line S2 = set([3,4,5,6]),
-    ?line S3 = set([3,4]),
-    ?line S4 = set([1,2,3,4,5,6]),
-    ?line T1 = set([1,2]),
-    ?line T2 = set([3,4]),
-    ?line T3 = set([5,6]),
-    ?line T4 = set([1,2,5,6]),
-    ?line {'EXIT', {type_mismatch, _}} =
+    E = set([]),
+    S1 = set([1,2,3,4]),
+    S2 = set([3,4,5,6]),
+    S3 = set([3,4]),
+    S4 = set([1,2,3,4,5,6]),
+    T1 = set([1,2]),
+    T2 = set([3,4]),
+    T3 = set([5,6]),
+    T4 = set([1,2,5,6]),
+    {'EXIT', {type_mismatch, _}} =
 	(catch symmetric_partition(relation([{a,b}]), relation([{a,b,c}]))),
-    ?line {E, E, E} = symmetric_partition(E, E),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {E, E, E} = symmetric_partition(E, E),
+    {'EXIT', {type_mismatch, _}} =
 	(catch symmetric_partition(relation([{a,b}]), 
                                    from_term([{a,c}],[{d,r}]))),
-    ?line {E, E, S1} = symmetric_partition(E, S1),
-    ?line {S1, E, E} = symmetric_partition(S1, E),
-    ?line {T1, T2, T3} = symmetric_partition(S1, S2),
-    ?line {T3, T2, T1} = symmetric_partition(S2, S1),
-    ?line {E, T2, T4} = symmetric_partition(S3, S4),
-    ?line {T4, T2, E} = symmetric_partition(S4, S3),
-
-    ?line S5 = set([1,3,5]),
-    ?line S6 = set([2,4,6,7,8]),
-    ?line {S5, E, S6} = symmetric_partition(S5, S6),
-    ?line {S6, E, S5} = symmetric_partition(S6, S5),
-    ?line EE = empty_set(),
-    ?line {EE, EE, EE} = symmetric_partition(EE, EE),
+    {E, E, S1} = symmetric_partition(E, S1),
+    {S1, E, E} = symmetric_partition(S1, E),
+    {T1, T2, T3} = symmetric_partition(S1, S2),
+    {T3, T2, T1} = symmetric_partition(S2, S1),
+    {E, T2, T4} = symmetric_partition(S3, S4),
+    {T4, T2, E} = symmetric_partition(S4, S3),
+
+    S5 = set([1,3,5]),
+    S6 = set([2,4,6,7,8]),
+    {S5, E, S6} = symmetric_partition(S5, S6),
+    {S6, E, S5} = symmetric_partition(S6, S5),
+    EE = empty_set(),
+    {EE, EE, EE} = symmetric_partition(EE, EE),
 
     ok.
 
-is_sofs_set_1(suite) -> [];
-is_sofs_set_1(doc) -> [""];
 is_sofs_set_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line true = is_sofs_set(E),
-    ?line true = is_sofs_set(from_term([a])),
-    ?line true = is_sofs_set(from_term({a})),
-    ?line true = is_sofs_set(from_term(a)),
-    ?line false = is_sofs_set(a),
+    E = empty_set(),
+    true = is_sofs_set(E),
+    true = is_sofs_set(from_term([a])),
+    true = is_sofs_set(from_term({a})),
+    true = is_sofs_set(from_term(a)),
+    false = is_sofs_set(a),
     ok.
 
-is_set_1(suite) -> [];
-is_set_1(doc) -> [""];
 is_set_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line true = is_set(E),
-    ?line true = is_set(from_term([a])),
-    ?line false = is_set(from_term({a})),
-    ?line false = is_set(from_term(a)),
-    ?line {'EXIT', _} = (catch is_set(a)),
-
-    ?line true = is_empty_set(E),
-    ?line false = is_empty_set(from_term([a])),
-    ?line false = is_empty_set(from_term({a})),
-    ?line false = is_empty_set(from_term(a)),
-    ?line {'EXIT', _} = (catch is_empty_set(a)),
+    E = empty_set(),
+    true = is_set(E),
+    true = is_set(from_term([a])),
+    false = is_set(from_term({a})),
+    false = is_set(from_term(a)),
+    {'EXIT', _} = (catch is_set(a)),
+
+    true = is_empty_set(E),
+    false = is_empty_set(from_term([a])),
+    false = is_empty_set(from_term({a})),
+    false = is_empty_set(from_term(a)),
+    {'EXIT', _} = (catch is_empty_set(a)),
 
     ok.
 
-is_equal(suite) -> [];
-is_equal(doc) -> [""];
 is_equal(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line true = is_equal(E, E),
-    ?line false = is_equal(from_term([a]), E),
-    ?line {'EXIT', {type_mismatch, _}} =
+    E = empty_set(),
+    true = is_equal(E, E),
+    false = is_equal(from_term([a]), E),
+    {'EXIT', {type_mismatch, _}} =
 	(catch is_equal(intersection(set([a]), set([b])),
 			intersection(from_term([{a}]), from_term([{b}])))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch is_equal(from_term([],[{[atom],atom,[atom]}]), 
 			from_term([],[{[atom],{atom},[atom]}]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch is_equal(set([a]), from_term([a],[type]))),
 
-    ?line E2 = from_sets({from_term(a,atom)}),
-    ?line true = is_equal(E2, E2),
-    ?line true = is_equal(from_term({a}, {atom}), E2),
-    ?line false = is_equal(from_term([{[a],[],c}]), 
-			   from_term([{[],[],q}])),
+    E2 = from_sets({from_term(a,atom)}),
+    true = is_equal(E2, E2),
+    true = is_equal(from_term({a}, {atom}), E2),
+    false = is_equal(from_term([{[a],[],c}]),
+		     from_term([{[],[],q}])),
 
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
         (catch is_equal(E, E2)),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
         (catch is_equal(E2, E)),
-    ?line true = is_equal(from_term({[],a,[]},{[atom],atom,[atom]}), 
-                          from_term({[],a,[]},{[atom],atom,[atom]})),
-    ?line {'EXIT', {type_mismatch, _}} =
+    true = is_equal(from_term({[],a,[]},{[atom],atom,[atom]}),
+		    from_term({[],a,[]},{[atom],atom,[atom]})),
+    {'EXIT', {type_mismatch, _}} =
 	(catch is_equal(from_term({[],a,[]},{[atom],atom,[atom]}), 
 			from_term({[],{a},[]},{[atom],{atom},[atom]}))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch is_equal(from_term({a}), from_term({a},{type}))),
 
     ok.
 
-is_subset(suite) -> [];
-is_subset(doc) -> [""];
 is_subset(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line true = is_subset(E, E),
-    ?line true = is_subset(set([a,c,e]), set([a,b,c,d,e])),
-    ?line false = is_subset(set([a,b]), E),
-    ?line false = is_subset(set([d,e,f]), set([b,c,d,e])),
-    ?line false = is_subset(set([a,b,c]), set([b,c])),
-    ?line false = is_subset(set([b,c]), set([a,c])),
-    ?line false = is_subset(set([d,e]), set([a,b])),
-    ?line {'EXIT', {type_mismatch, _}} =
+    E = empty_set(),
+    true = is_subset(E, E),
+    true = is_subset(set([a,c,e]), set([a,b,c,d,e])),
+    false = is_subset(set([a,b]), E),
+    false = is_subset(set([d,e,f]), set([b,c,d,e])),
+    false = is_subset(set([a,b,c]), set([b,c])),
+    false = is_subset(set([b,c]), set([a,c])),
+    false = is_subset(set([d,e]), set([a,b])),
+    {'EXIT', {type_mismatch, _}} =
 	(catch is_subset(intersection(set([a]), set([b])),
 			 intersection(from_term([{a}]), from_term([{b}])))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
         (catch is_subset(set([a]), from_term([a,b], [at]))),
     ok.
 
-is_a_function_1(suite) -> [];
-is_a_function_1(doc) -> [""];
 is_a_function_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([], 2),
-    ?line {'EXIT', {badarg, _}} = (catch is_a_function(set([a,b]))),
-    ?line true = is_a_function(E),
-    ?line true = is_a_function(ER),
-    ?line true = is_a_function(relation([])),
-    ?line true = is_a_function(relation([],2)),
-    ?line true = is_a_function(relation([{a,b},{b,c}])),
-    ?line false = is_a_function(relation([{a,b},{b,c},{b,d},{e,f}])),
-    ?line IS = relation([{{a,b},c},{{a,b},d}]),
-    ?line false = is_a_function(IS),
+    E = empty_set(),
+    ER = relation([], 2),
+    {'EXIT', {badarg, _}} = (catch is_a_function(set([a,b]))),
+    true = is_a_function(E),
+    true = is_a_function(ER),
+    true = is_a_function(relation([])),
+    true = is_a_function(relation([],2)),
+    true = is_a_function(relation([{a,b},{b,c}])),
+    false = is_a_function(relation([{a,b},{b,c},{b,d},{e,f}])),
+    IS = relation([{{a,b},c},{{a,b},d}]),
+    false = is_a_function(IS),
     F = 0.0, I = round(F),
-    ?line FR = relation([{I,F},{F,1}]),
+    FR = relation([{I,F},{F,1}]),
     if
         F == I -> % term ordering
             false = is_a_function(FR);
@@ -1280,343 +1229,315 @@ is_a_function_1(Conf) when is_list(Conf) ->
     end,
     ok.
 
-is_disjoint(suite) -> [];
-is_disjoint(doc) -> [""];
 is_disjoint(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line {'EXIT', {type_mismatch, _}} = 
+    E = empty_set(),
+    {'EXIT', {type_mismatch, _}} =
 	(catch is_disjoint(relation([{a,1}]), set([a,b]))),
-    ?line {'EXIT', {type_mismatch, _}} = 
+    {'EXIT', {type_mismatch, _}} =
 	(catch is_disjoint(set([a]), from_term([a],[mota]))),
-    ?line true = is_disjoint(E, E),
-    ?line false = is_disjoint(set([a,b,c]),set([b,c,d])),
-    ?line false = is_disjoint(set([b,c,d]),set([a,b,c])),
-    ?line true = is_disjoint(set([a,c,e]),set([b,d,f])),
+    true = is_disjoint(E, E),
+    false = is_disjoint(set([a,b,c]),set([b,c,d])),
+    false = is_disjoint(set([b,c,d]),set([a,b,c])),
+    true = is_disjoint(set([a,c,e]),set([b,d,f])),
     ok.
 
-join(suite) -> [];
-join(doc) -> [""];
 join(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-
-    ?line {'EXIT', {badarg, _}} = (catch join(relation([{a,1}]), 3, E, 5)),
-    ?line {'EXIT', {badarg, _}} = (catch join(E, 1, relation([{a,1}]), 3)),
-    ?line {'EXIT', {badarg, _}} = (catch join(E, 1, from_term([a]), 1)),
-
-    ?line eval(join(E, 1, E, 2), E),
-    ?line eval(join(E, 1, from_term([{{a},b}]), 2), E),
-    ?line eval(join(from_term([{{a},b}]), 2, E, 1), E),
-    ?line eval(join(from_term([{{a},b,e}]), 2, from_term([{c,{d}}]), 1),
-               from_term([], [{{atom},atom,atom,{atom}}])),
-    ?line eval(join(relation([{a}]), 1, relation([{1,a},{2,a}]), 2),
-               relation([{a,1},{a,2}])),
-    ?line eval(join(relation([{a,b,c},{b,c,d}]), 2, 
-                    relation([{1,b},{2,a},{3,c}]), 2),
-               relation([{a,b,c,1},{b,c,d,3}])),
-    ?line eval(join(relation([{1,a,aa},{1,b,bb},{1,c,cc},{2,a,aa},{2,b,bb}]), 
-                    1,
-                    relation([{1,c,cc},{1,d,dd},{1,e,ee},{2,c,cc},{2,d,dd}]),
-                    1),
-             relation([{1,a,aa,c,cc},{1,a,aa,d,dd},{1,a,aa,e,ee},{1,b,bb,c,cc},
-		       {1,b,bb,d,dd},{1,b,bb,e,ee},{1,c,cc,c,cc},{1,c,cc,d,dd},
-		       {1,c,cc,e,ee},{2,a,aa,c,cc},{2,a,aa,d,dd},{2,b,bb,c,cc},
-		       {2,b,bb,d,dd}])),
+    E = empty_set(),
+
+    {'EXIT', {badarg, _}} = (catch join(relation([{a,1}]), 3, E, 5)),
+    {'EXIT', {badarg, _}} = (catch join(E, 1, relation([{a,1}]), 3)),
+    {'EXIT', {badarg, _}} = (catch join(E, 1, from_term([a]), 1)),
+
+    eval(join(E, 1, E, 2), E),
+    eval(join(E, 1, from_term([{{a},b}]), 2), E),
+    eval(join(from_term([{{a},b}]), 2, E, 1), E),
+    eval(join(from_term([{{a},b,e}]), 2, from_term([{c,{d}}]), 1),
+	 from_term([], [{{atom},atom,atom,{atom}}])),
+    eval(join(relation([{a}]), 1, relation([{1,a},{2,a}]), 2),
+	 relation([{a,1},{a,2}])),
+    eval(join(relation([{a,b,c},{b,c,d}]), 2,
+	      relation([{1,b},{2,a},{3,c}]), 2),
+	 relation([{a,b,c,1},{b,c,d,3}])),
+    eval(join(relation([{1,a,aa},{1,b,bb},{1,c,cc},{2,a,aa},{2,b,bb}]),
+	      1,
+	      relation([{1,c,cc},{1,d,dd},{1,e,ee},{2,c,cc},{2,d,dd}]),
+	      1),
+	 relation([{1,a,aa,c,cc},{1,a,aa,d,dd},{1,a,aa,e,ee},{1,b,bb,c,cc},
+		   {1,b,bb,d,dd},{1,b,bb,e,ee},{1,c,cc,c,cc},{1,c,cc,d,dd},
+		   {1,c,cc,e,ee},{2,a,aa,c,cc},{2,a,aa,d,dd},{2,b,bb,c,cc},
+		   {2,b,bb,d,dd}])),
 
     R1 = relation([{a,b},{b,c}]),
     R2 = relation([{b,1},{a,2},{c,3},{c,4}]),
-    ?line eval(join(R1, 1, R2, 1), from_term([{a,b,2},{b,c,1}])),
-    ?line eval(join(R1, 2, R2, 1), from_term([{a,b,1},{b,c,3},{b,c,4}])),
-    ?line eval(join(R1, 1, converse(R2), 2),
-	       from_term([{a,b,2},{b,c,1}])),
-    ?line eval(join(R1, 2, converse(R2), 2),
-	       from_term([{a,b,1},{b,c,3},{b,c,4}])),
+    eval(join(R1, 1, R2, 1), from_term([{a,b,2},{b,c,1}])),
+    eval(join(R1, 2, R2, 1), from_term([{a,b,1},{b,c,3},{b,c,4}])),
+    eval(join(R1, 1, converse(R2), 2),
+	 from_term([{a,b,2},{b,c,1}])),
+    eval(join(R1, 2, converse(R2), 2),
+	 from_term([{a,b,1},{b,c,3},{b,c,4}])),
     ok.
 
-canonical(suite) -> [];
-canonical(doc) -> [""];
 canonical(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),    
-    ?line {'EXIT', {badarg, _}} = 
+    E = empty_set(),
+    {'EXIT', {badarg, _}} =
         (catch canonical_relation(set([a,b]))),
-    ?line eval(canonical_relation(E), E),
-    ?line eval(canonical_relation(from_term([[]])), E),
-    ?line eval(canonical_relation(from_term([[a,b,c]])),
-               from_term([{a,[a,b,c]},{b,[a,b,c]},{c,[a,b,c]}])),
+    eval(canonical_relation(E), E),
+    eval(canonical_relation(from_term([[]])), E),
+    eval(canonical_relation(from_term([[a,b,c]])),
+	 from_term([{a,[a,b,c]},{b,[a,b,c]},{c,[a,b,c]}])),
     ok.
 
-relation_to_family_1(suite) -> [];
-relation_to_family_1(doc) -> [""];
 relation_to_family_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line EF = family([]),
-    ?line eval(relation_to_family(E), E),
-    ?line eval(relation_to_family(relation([])), EF),
-    ?line eval(relation_to_family(relation([], 2)), EF),
-    ?line R = relation([{b,1},{c,7},{c,9},{c,11}]),
-    ?line F = family([{b,[1]},{c,[7,9,11]}]),
-    ?line eval(relation_to_family(R), F),
-    ?line eval(sofs:rel2fam(R), F),
-    ?line {'EXIT', {badarg, _}} = (catch relation_to_family(set([a]))),
+    E = empty_set(),
+    EF = family([]),
+    eval(relation_to_family(E), E),
+    eval(relation_to_family(relation([])), EF),
+    eval(relation_to_family(relation([], 2)), EF),
+    R = relation([{b,1},{c,7},{c,9},{c,11}]),
+    F = family([{b,[1]},{c,[7,9,11]}]),
+    eval(relation_to_family(R), F),
+    eval(sofs:rel2fam(R), F),
+    {'EXIT', {badarg, _}} = (catch relation_to_family(set([a]))),
     ok.
 
-domain_1(suite) -> [];
-domain_1(doc) -> [""];
 domain_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
-    ?line {'EXIT', {badarg, _}} = (catch domain(relation([],3))),
-    ?line eval(domain(E), E),
-    ?line eval(domain(ER), set([])),
-    ?line eval(domain(relation([{1,a},{1,b},{2,a},{2,b}])), set([1,2])),
-    ?line eval(domain(relation([{a,1},{b,2},{c,3}])), set([a,b,c])),
-    ?line eval(field(relation([{a,1},{b,2},{c,3}])), 
-               set([a,b,c,1,2,3])),
+    E = empty_set(),
+    ER = relation([]),
+    {'EXIT', {badarg, _}} = (catch domain(relation([],3))),
+    eval(domain(E), E),
+    eval(domain(ER), set([])),
+    eval(domain(relation([{1,a},{1,b},{2,a},{2,b}])), set([1,2])),
+    eval(domain(relation([{a,1},{b,2},{c,3}])), set([a,b,c])),
+    eval(field(relation([{a,1},{b,2},{c,3}])),
+	 set([a,b,c,1,2,3])),
     F = 0.0, I = round(F),
-    ?line FR = relation([{I,a},{F,b}]),
+    FR = relation([{I,a},{F,b}]),
     if
         F == I -> % term ordering
-            ?line true = (1 =:= no_elements(domain(FR)));
+            true = (1 =:= no_elements(domain(FR)));
         true -> 
-            ?line true = (2 =:= no_elements(domain(FR)))
+            true = (2 =:= no_elements(domain(FR)))
     end,
     ok.
 
-range_1(suite) -> [];
-range_1(doc) -> [""];
 range_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
-    ?line {'EXIT', {badarg, _}} = (catch range(relation([],3))),
-    ?line eval(range(E), E),
-    ?line eval(range(ER), set([])),
-    ?line eval(range(relation([{1,a},{1,b},{2,a},{2,b}])), set([a,b])),
-    ?line eval(range(relation([{a,1},{b,2},{c,3}])), set([1,2,3])),
+    E = empty_set(),
+    ER = relation([]),
+    {'EXIT', {badarg, _}} = (catch range(relation([],3))),
+    eval(range(E), E),
+    eval(range(ER), set([])),
+    eval(range(relation([{1,a},{1,b},{2,a},{2,b}])), set([a,b])),
+    eval(range(relation([{a,1},{b,2},{c,3}])), set([1,2,3])),
     ok.
-    
-inverse_1(suite) -> [];
-inverse_1(doc) -> [""];
+
 inverse_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
-    ?line {'EXIT', {badarg, _}} = (catch inverse(relation([],3))),
-    ?line {'EXIT', {bad_function, _}} = 
+    E = empty_set(),
+    ER = relation([]),
+    {'EXIT', {badarg, _}} = (catch inverse(relation([],3))),
+    {'EXIT', {bad_function, _}} =
 	(catch inverse(relation([{1,a},{1,b}]))),
-    ?line {'EXIT', {bad_function, _}} = 
+    {'EXIT', {bad_function, _}} =
 	(catch inverse(relation([{1,a},{2,a}]))),
-    ?line eval(inverse(E), E),
-    ?line eval(inverse(ER), ER),
-    ?line eval(inverse(relation([{a,1},{b,2},{c,3}])),
-               relation([{1,a},{2,b},{3,c}])),
+    eval(inverse(E), E),
+    eval(inverse(ER), ER),
+    eval(inverse(relation([{a,1},{b,2},{c,3}])),
+	 relation([{1,a},{2,b},{3,c}])),
     F = 0.0, I = round(F),
-    ?line FR = relation([{I,a},{F,b}]),
+    FR = relation([{I,a},{F,b}]),
     if
         F == I -> % term ordering
-            ?line {'EXIT', {bad_function, _}} = (catch inverse(FR));
+            {'EXIT', {bad_function, _}} = (catch inverse(FR));
         true -> 
-            ?line eval(inverse(FR), relation([{a,I},{b,F}]))
+            eval(inverse(FR), relation([{a,I},{b,F}]))
     end,
     ok.
-    
-converse_1(suite) -> [];
-converse_1(doc) -> [""];
+
 converse_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
-    ?line {'EXIT', {badarg, _}} = (catch converse(relation([],3))),
-    ?line eval(converse(ER), ER),
-    ?line eval(converse(E), E),
-    ?line eval(converse(relation([{a,1},{b,2},{c,3}])),
-               relation([{1,a},{2,b},{3,c}])),
-    ?line eval(converse(relation([{1,a},{1,b}])),
-	       relation([{a,1},{b,1}])),
-    ?line eval(converse(relation([{1,a},{2,a}])),
-	       relation([{a,1},{a,2}])),
+    E = empty_set(),
+    ER = relation([]),
+    {'EXIT', {badarg, _}} = (catch converse(relation([],3))),
+    eval(converse(ER), ER),
+    eval(converse(E), E),
+    eval(converse(relation([{a,1},{b,2},{c,3}])),
+	 relation([{1,a},{2,b},{3,c}])),
+    eval(converse(relation([{1,a},{1,b}])),
+	 relation([{a,1},{b,1}])),
+    eval(converse(relation([{1,a},{2,a}])),
+	 relation([{a,1},{a,2}])),
     ok.
-    
-no_elements_1(suite) -> [];
-no_elements_1(doc) -> [""];
+
 no_elements_1(Conf) when is_list(Conf) ->
-    ?line 0 = no_elements(empty_set()),
-    ?line 0 = no_elements(set([])),
-    ?line 1 = no_elements(from_term([a])),
-    ?line 10 = no_elements(from_term(lists:seq(1,10))),
-    ?line 3 = no_elements(from_term({a,b,c},{atom,atom,atom})),
-    ?line {'EXIT', {badarg, _}} = (catch no_elements(from_term(a))),
-    ?line {'EXIT', {function_clause, _}} = (catch no_elements(a)),
+    0 = no_elements(empty_set()),
+    0 = no_elements(set([])),
+    1 = no_elements(from_term([a])),
+    10 = no_elements(from_term(lists:seq(1,10))),
+    3 = no_elements(from_term({a,b,c},{atom,atom,atom})),
+    {'EXIT', {badarg, _}} = (catch no_elements(from_term(a))),
+    {'EXIT', {function_clause, _}} = (catch no_elements(a)),
     ok.
 
-image(suite) -> [];
-image(doc) -> [""];
 image(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
-    ?line eval(image(E, E), E),
-    ?line eval(image(ER, E), set([])),
-    ?line eval(image(relation([{a,1},{b,2},{c,3},{f,6}]), set([a,b,c,d,f])), 
-               set([1,2,3,6])),
-    ?line eval(image(relation([{a,1},{b,2},{c,3},{d,4},{r,17}]), 
-		     set([b,c,q,r])), 
-               set([2,3,17])),
-    ?line eval(image(from_term([{[a],{1}},{[b],{2}}]), from_term([[a]])),
-	       from_term([{1}])),
-    ?line eval(image(relation([{1,a},{2,a},{3,a},{4,b},{2,b}]), set([1,2,4])),
-	       set([a,b])),
-    ?line {'EXIT', {badarg, _}} =
+    E = empty_set(),
+    ER = relation([]),
+    eval(image(E, E), E),
+    eval(image(ER, E), set([])),
+    eval(image(relation([{a,1},{b,2},{c,3},{f,6}]), set([a,b,c,d,f])),
+	 set([1,2,3,6])),
+    eval(image(relation([{a,1},{b,2},{c,3},{d,4},{r,17}]),
+	       set([b,c,q,r])),
+	 set([2,3,17])),
+    eval(image(from_term([{[a],{1}},{[b],{2}}]), from_term([[a]])),
+	 from_term([{1}])),
+    eval(image(relation([{1,a},{2,a},{3,a},{4,b},{2,b}]), set([1,2,4])),
+	 set([a,b])),
+    {'EXIT', {badarg, _}} =
 	(catch image(from_term([a,b]), E)),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch image(from_term([{[a],1}]), set([[a]]))),
     ok.
 
-inverse_image(suite) -> [];
-inverse_image(doc) -> [""];
 inverse_image(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
-    ?line eval(inverse_image(E, E), E),
-    ?line eval(inverse_image(ER, E), set([])),
-    ?line eval(inverse_image(converse(relation([{a,1},{b,2},{c,3},{f,6}])), 
-			     set([a,b,c,d,f])), 
-               set([1,2,3,6])),
-    ?line eval(inverse_image(converse(relation([{a,1},{b,2},{c,3},
-						{d,4},{r,17}])), 
-			     set([b,c,q,r])), 
-               set([2,3,17])),
-    ?line eval(inverse_image(converse(from_term([{[a],{1}},{[b],{2}}])), 
-			     from_term([[a]])),
-	       from_term([{1}])),
-    ?line eval(inverse_image(converse(relation([{1,a},{2,a},
-						{3,a},{4,b},{2,b}])), 
-			     set([1,2,4])),
-	       set([a,b])),
-    ?line {'EXIT', {badarg, _}} =
+    E = empty_set(),
+    ER = relation([]),
+    eval(inverse_image(E, E), E),
+    eval(inverse_image(ER, E), set([])),
+    eval(inverse_image(converse(relation([{a,1},{b,2},{c,3},{f,6}])),
+		       set([a,b,c,d,f])),
+	 set([1,2,3,6])),
+    eval(inverse_image(converse(relation([{a,1},{b,2},{c,3},
+					  {d,4},{r,17}])),
+		       set([b,c,q,r])),
+	 set([2,3,17])),
+    eval(inverse_image(converse(from_term([{[a],{1}},{[b],{2}}])),
+		       from_term([[a]])),
+	 from_term([{1}])),
+    eval(inverse_image(converse(relation([{1,a},{2,a},
+					  {3,a},{4,b},{2,b}])),
+		       set([1,2,4])),
+	 set([a,b])),
+    {'EXIT', {badarg, _}} =
 	(catch inverse_image(from_term([a,b]), E)),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch inverse_image(converse(from_term([{[a],1}])), set([[a]]))),
     ok.
 
-composite_1(suite) -> [];
-composite_1(doc) -> [""];
 composite_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line EF = a_function([]),
-    ?line eval(composite(E, E), E),
-    ?line eval(composite(E, a_function([{a,b}])), E),
-    ?line eval(composite(relation([{a,b}]), E), E),
-    ?line {'EXIT', {bad_function, _}} = 
+    E = empty_set(),
+    EF = a_function([]),
+    eval(composite(E, E), E),
+    eval(composite(E, a_function([{a,b}])), E),
+    eval(composite(relation([{a,b}]), E), E),
+    {'EXIT', {bad_function, _}} =
 	(catch composite(EF, relation([{a,b},{a,c}]))),
-    ?line {'EXIT', {bad_function, _}} = 
+    {'EXIT', {bad_function, _}} =
 	(catch composite(a_function([{b,a}]), EF)),
-    ?line {'EXIT', {bad_function, _}} = 
+    {'EXIT', {bad_function, _}} =
 	(catch composite(relation([{1,a},{2,b},{2,a}]), 
 			 a_function([{a,1},{b,3}]))),
-    ?line {'EXIT', {bad_function, _}} = 
-	 (catch composite(a_function([{1,a},{2,b}]), a_function([{b,3}]))),
-    ?line eval(composite(EF, EF), EF),
-    ?line eval(composite(a_function([{b,a}]), from_term([{a,{b,c}}])),
-               from_term([{b,{b,c}}])),
-    ?line eval(composite(a_function([{q,1},{z,2}]), 
-			 a_function([{1,a},{2,a}])),
-               a_function([{q,a},{z,a}])),
-    ?line eval(composite(a_function([{a,0},{b,0},{c,1},{d,1},{e,2},{f,3}]), 
-			 a_function([{0,p},{1,q},{2,r},{3,w},{4,aa}])),
-               a_function([{c,q},{d,q},{f,w},{e,r},{a,p},{b,p}])),
-    ?line eval(composite(a_function([{1,c}]), 
-			 a_function([{a,1},{b,3},{c,4}])),
-	       a_function([{1,4}])),
-    ?line {'EXIT', {bad_function, _}} = 
+    {'EXIT', {bad_function, _}} =
+	(catch composite(a_function([{1,a},{2,b}]), a_function([{b,3}]))),
+    eval(composite(EF, EF), EF),
+    eval(composite(a_function([{b,a}]), from_term([{a,{b,c}}])),
+	 from_term([{b,{b,c}}])),
+    eval(composite(a_function([{q,1},{z,2}]),
+		   a_function([{1,a},{2,a}])),
+	 a_function([{q,a},{z,a}])),
+    eval(composite(a_function([{a,0},{b,0},{c,1},{d,1},{e,2},{f,3}]),
+		   a_function([{0,p},{1,q},{2,r},{3,w},{4,aa}])),
+	 a_function([{c,q},{d,q},{f,w},{e,r},{a,p},{b,p}])),
+    eval(composite(a_function([{1,c}]),
+		   a_function([{a,1},{b,3},{c,4}])),
+	 a_function([{1,4}])),
+    {'EXIT', {bad_function, _}} =
 	(catch composite(a_function([{1,a},{2,b}]), 
 			 a_function([{a,1},{c,3}]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch composite(from_term([a,b]), E)),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch composite(E, from_term([a,b]))),
-    ?line {'EXIT', {type_mismatch, _}} = 
+    {'EXIT', {type_mismatch, _}} =
         (catch composite(from_term([{a,b}]), from_term([{{a},b}]))),
-    ?line {'EXIT', {type_mismatch, _}} = 
+    {'EXIT', {type_mismatch, _}} =
         (catch composite(from_term([{a,b}]), 
 			 from_term([{b,c}], [{d,r}]))),
     F = 0.0, I = round(F),
-    ?line FR1 = relation([{1,c}]),
-    ?line FR2 = relation([{I,1},{F,3},{c,4}]),
+    FR1 = relation([{1,c}]),
+    FR2 = relation([{I,1},{F,3},{c,4}]),
     if
         F == I -> % term ordering
-            ?line {'EXIT', {bad_function, _}} = (catch composite(FR1, FR2));
+            {'EXIT', {bad_function, _}} = (catch composite(FR1, FR2));
         true -> 
-            ?line eval(composite(FR1, FR2), a_function([{1,4}]))
+            eval(composite(FR1, FR2), a_function([{1,4}]))
     end,
     ok.
 
-relative_product_1(suite) -> [];
-relative_product_1(doc) -> [""];
 relative_product_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
-    ?line eval(relative_product1(E, E), E),
-    ?line eval(relative_product1(E, relation([{a,b}])), E),
-    ?line eval(relative_product1(relation([{a,b}]), E), E),
-    ?line eval(relative_product1(relation([{a,b}]), from_term([{a,{b,c}}])),
-               from_term([{b,{b,c}}])),
-    ?line eval(relative_product1(relation([{1,z},{1,q},{2,z}]), 
-				 relation([{1,a},{1,b},{2,a}])),
-               relation([{q,a},{q,b},{z,a},{z,b}])),
-    ?line eval(relative_product1(relation([{0,a},{0,b},{1,c},
-					   {1,d},{2,e},{3,f}]), 
-				 relation([{1,q},{3,w}])),
-               relation([{c,q},{d,q},{f,w}])),
-    ?line {'EXIT', {badarg, _}} = 
+    E = empty_set(),
+    ER = relation([]),
+    eval(relative_product1(E, E), E),
+    eval(relative_product1(E, relation([{a,b}])), E),
+    eval(relative_product1(relation([{a,b}]), E), E),
+    eval(relative_product1(relation([{a,b}]), from_term([{a,{b,c}}])),
+	 from_term([{b,{b,c}}])),
+    eval(relative_product1(relation([{1,z},{1,q},{2,z}]),
+			   relation([{1,a},{1,b},{2,a}])),
+	 relation([{q,a},{q,b},{z,a},{z,b}])),
+    eval(relative_product1(relation([{0,a},{0,b},{1,c},
+				     {1,d},{2,e},{3,f}]),
+			   relation([{1,q},{3,w}])),
+	 relation([{c,q},{d,q},{f,w}])),
+    {'EXIT', {badarg, _}} =
 	(catch relative_product1(from_term([a,b]), ER)),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch relative_product1(ER, from_term([a,b]))),
-    ?line {'EXIT', {type_mismatch, _}} = 
+    {'EXIT', {type_mismatch, _}} =
         (catch relative_product1(from_term([{a,b}]), from_term([{{a},b}]))),
-    ?line {'EXIT', {type_mismatch, _}} = 
+    {'EXIT', {type_mismatch, _}} =
         (catch relative_product1(from_term([{a,b}]), 
 				 from_term([{b,c}], [{d,r}]))),
     ok.
 
-relative_product_2(suite) -> [];
-relative_product_2(doc) -> [""];
 relative_product_2(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
+    E = empty_set(),
+    ER = relation([]),
 
-    ?line {'EXIT', {badarg, _}} = (catch relative_product({from_term([a,b])})),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {badarg, _}} = (catch relative_product({from_term([a,b])})),
+    {'EXIT', {type_mismatch, _}} =
 	(catch relative_product({from_term([{a,b}]), from_term([{{a},b}])})),
-    ?line {'EXIT', {badarg, _}} = (catch relative_product({})), 
-    ?line true = is_equal(relative_product({ER}), 
-			  from_term([], [{atom,{atom}}])),
-    ?line eval(relative_product({relation([{a,b},{c,a}]),
-				 relation([{a,1},{a,2}]),
-				 relation([{a,aa},{c,1}])}),
-               from_term([{a,{b,1,aa}},{a,{b,2,aa}}])),
-    ?line eval(relative_product({relation([{a,b}])}, E), E),
-    ?line eval(relative_product({E}, relation([{a,b}])), E),
-    ?line eval(relative_product({E,from_term([], [{{atom,atom,atom},atom}])}),
-	       E),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} = (catch relative_product({})),
+    true = is_equal(relative_product({ER}),
+		    from_term([], [{atom,{atom}}])),
+    eval(relative_product({relation([{a,b},{c,a}]),
+			   relation([{a,1},{a,2}]),
+			   relation([{a,aa},{c,1}])}),
+	 from_term([{a,{b,1,aa}},{a,{b,2,aa}}])),
+    eval(relative_product({relation([{a,b}])}, E), E),
+    eval(relative_product({E}, relation([{a,b}])), E),
+    eval(relative_product({E,from_term([], [{{atom,atom,atom},atom}])}),
+	 E),
+    {'EXIT', {badarg, _}} =
         (catch relative_product({from_term([a,b])}, E)),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch relative_product({relation([])}, set([]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch relative_product({from_term([{a,b}]), 
 				 from_term([{{a},b}])}, ER)),
 
-    ?line {'EXIT', {badarg, _}} = (catch relative_product({}, ER)),
-    ?line relprod2({relation([{a,b}])}, from_term([],[{{atom},atom}]), ER),
-    ?line relprod2({relation([{a,b}]),relation([{a,1}])},
-                   from_term([{{b,1},{tjo,hej,sa}}]),
-                   from_term([{a,{tjo,hej,sa}}])),
-    ?line relprod2({relation([{a,b}]), ER}, from_term([{{a,b},b}]), ER),
-    ?line relprod2({relation([{a,b},{c,a}]),
-                    relation([{a,1},{a,2}])},
-                   from_term([{{b,1},b1},{{b,2},b2}]),
-                   relation([{a,b1},{a,b2}])),
-    ?line eval(relative_product({relation([{a,b}]), ER}), 
-               from_term([],[{atom,{atom,atom}}])),
-    ?line eval(relative_product({from_term([{{a,[a,b]},[a]}]),
-				 from_term([{{a,[a,b]},[[a,b]]}])}),
-               from_term([{{a,[a,b]},{[a],[[a,b]]}}])),
+    {'EXIT', {badarg, _}} = (catch relative_product({}, ER)),
+    relprod2({relation([{a,b}])}, from_term([],[{{atom},atom}]), ER),
+    relprod2({relation([{a,b}]),relation([{a,1}])},
+	     from_term([{{b,1},{tjo,hej,sa}}]),
+	     from_term([{a,{tjo,hej,sa}}])),
+    relprod2({relation([{a,b}]), ER}, from_term([{{a,b},b}]), ER),
+    relprod2({relation([{a,b},{c,a}]),
+	      relation([{a,1},{a,2}])},
+	     from_term([{{b,1},b1},{{b,2},b2}]),
+	     relation([{a,b1},{a,b2}])),
+    eval(relative_product({relation([{a,b}]), ER}),
+	 from_term([],[{atom,{atom,atom}}])),
+    eval(relative_product({from_term([{{a,[a,b]},[a]}]),
+			   from_term([{{a,[a,b]},[[a,b]]}])}),
+	 from_term([{{a,[a,b]},{[a],[[a,b]]}}])),
     ok.
 
 relprod2(A1T, A2, R) ->
@@ -1624,219 +1545,213 @@ relprod2(A1T, A2, R) ->
     eval(relative_product(A1T, A2), R),
     eval(relative_product(tuple_to_list(A1T), A2), R).
 
-product_1(suite) -> [];
-product_1(doc) -> [""];
 product_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line eval(product(E, E), E),
-    ?line eval(product(relation([]), E), E),
-    ?line eval(product(E, relation([])), E),
-    ?line eval(product(relation([{a,b}]),relation([{c,d}])),
-               from_term([{{a,b},{c,d}}],[{{atom,atom},{atom,atom}}])),
-
-    ?line eval(product({E, set([a,b,c])}), E),
-    ?line eval(product({set([a,b,c]), E}), E),
-    ?line eval(product({set([a,b,c]), E, E}), E),
-    ?line eval(product({E,E}), E),
-    ?line eval(product({set([a,b]),set([1,2])}), 
-               relation([{a,1},{a,2},{b,1},{b,2}])),
-    ?line eval(product({from_term([a,b]), from_term([{a,b},{c,d}]),
-                        from_term([1])}),
-               from_term([{a,{a,b},1},{a,{c,d},1},{b,{a,b},1},{b,{c,d},1}])),
-    ?line {'EXIT', {badarg, _}} = (catch product({})),
-    ?line {'EXIT', {badarg, _}} = (catch product({foo})),
-    ?line eval(product({E}), E),
-    ?line eval(product({E, E}), E),
-    ?line eval(product(set([a,b]), set([1,2])),
-               relation([{a,1},{a,2},{b,1},{b,2}])),
-    ?line eval(product({relation([]), E}), E),
+    E = empty_set(),
+    eval(product(E, E), E),
+    eval(product(relation([]), E), E),
+    eval(product(E, relation([])), E),
+    eval(product(relation([{a,b}]),relation([{c,d}])),
+	 from_term([{{a,b},{c,d}}],[{{atom,atom},{atom,atom}}])),
+
+    eval(product({E, set([a,b,c])}), E),
+    eval(product({set([a,b,c]), E}), E),
+    eval(product({set([a,b,c]), E, E}), E),
+    eval(product({E,E}), E),
+    eval(product({set([a,b]),set([1,2])}),
+	 relation([{a,1},{a,2},{b,1},{b,2}])),
+    eval(product({from_term([a,b]), from_term([{a,b},{c,d}]),
+		  from_term([1])}),
+	 from_term([{a,{a,b},1},{a,{c,d},1},{b,{a,b},1},{b,{c,d},1}])),
+    {'EXIT', {badarg, _}} = (catch product({})),
+    {'EXIT', {badarg, _}} = (catch product({foo})),
+    eval(product({E}), E),
+    eval(product({E, E}), E),
+    eval(product(set([a,b]), set([1,2])),
+	 relation([{a,1},{a,2},{b,1},{b,2}])),
+    eval(product({relation([]), E}), E),
     ok.
 
-partition_1(suite) -> [];
-partition_1(doc) -> [""];
 partition_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
-    ?line Id = fun(A) -> A end,
-    ?line S1 = relation([{a,1},{b,2},{b,22},{c,0}]),
-    ?line eval(partition(1, E), E),
-    ?line eval(partition(2, E), E),
-    ?line eval(partition(1, ER), from_term([], [type(ER)])),
-    ?line eval(partition(2, ER), from_term([], [type(ER)])),
-    ?line eval(partition(1, relation([{1,a},{1,b},{2,c},{2,d}])), 
-	       from_term([[{1,a},{1,b}],[{2,c},{2,d}]])),
-    ?line eval(partition(2, relation([{1,a},{1,b},{2,a},{2,b},{3,c}])), 
-	       from_term([[{1,a},{2,a}],[{1,b},{2,b}],[{3,c}]])),
-    ?line eval(partition(2, relation([{1,a}])), from_term([[{1,a}]])),
-    ?line eval(partition(2, relation([{1,a},{2,b}])),
-			 from_term([[{1,a}],[{2,b}]])),
-    ?line eval(partition(2, relation([{1,a},{2,a},{3,a}])), 
-	       from_term([[{1,a},{2,a},{3,a}]])),
-    ?line eval(partition(2, relation([{1,b},{2,a}])), % OTP-4516
-	       from_term([[{1,b}],[{2,a}]])),
-    ?line eval(union(partition(Id, S1)), S1),
-    ?line eval(partition({external, fun({A,{B,_}}) -> {A,B} end}, 
-                         from_term([{a,{b,c}},{b,{c,d}},{a,{b,f}}])),
-               from_term([[{a,{b,c}},{a,{b,f}}],[{b,{c,d}}]])),
+    E = empty_set(),
+    ER = relation([]),
+    Id = fun(A) -> A end,
+    S1 = relation([{a,1},{b,2},{b,22},{c,0}]),
+    eval(partition(1, E), E),
+    eval(partition(2, E), E),
+    eval(partition(1, ER), from_term([], [type(ER)])),
+    eval(partition(2, ER), from_term([], [type(ER)])),
+    eval(partition(1, relation([{1,a},{1,b},{2,c},{2,d}])),
+	 from_term([[{1,a},{1,b}],[{2,c},{2,d}]])),
+    eval(partition(2, relation([{1,a},{1,b},{2,a},{2,b},{3,c}])),
+	 from_term([[{1,a},{2,a}],[{1,b},{2,b}],[{3,c}]])),
+    eval(partition(2, relation([{1,a}])), from_term([[{1,a}]])),
+    eval(partition(2, relation([{1,a},{2,b}])),
+	 from_term([[{1,a}],[{2,b}]])),
+    eval(partition(2, relation([{1,a},{2,a},{3,a}])),
+	 from_term([[{1,a},{2,a},{3,a}]])),
+    eval(partition(2, relation([{1,b},{2,a}])), % OTP-4516
+	 from_term([[{1,b}],[{2,a}]])),
+    eval(union(partition(Id, S1)), S1),
+    eval(partition({external, fun({A,{B,_}}) -> {A,B} end},
+		   from_term([{a,{b,c}},{b,{c,d}},{a,{b,f}}])),
+	 from_term([[{a,{b,c}},{a,{b,f}}],[{b,{c,d}}]])),
     F = 0.0, I = round(F),
-    ?line FR = relation([{I,a},{F,b}]),
+    FR = relation([{I,a},{F,b}]),
     if
         F == I -> % term ordering
-            ?line eval(partition(1, FR), from_term([[{I,a},{F,b}]]));
+            eval(partition(1, FR), from_term([[{I,a},{F,b}]]));
         true -> 
-            ?line eval(partition(1, FR), from_term([[{I,a}],[{F,b}]]))
+            eval(partition(1, FR), from_term([[{I,a}],[{F,b}]]))
     end,
-    ?line {'EXIT', {badarg, _}} = (catch partition(2, set([a]))),
-    ?line {'EXIT', {badarg, _}} = (catch partition(1, set([a]))),
-    ?line eval(partition(Id, set([a])), from_term([[a]])),
-
-    ?line eval(partition(E), E),
-    ?line P1 = from_term([[a,b,c],[d,e,f],[g,h]]),
-    ?line P2 = from_term([[a,d],[b,c,e,f,q,v]]),
-    ?line eval(partition(union(P1, P2)), 
-               from_term([[a],[b,c],[d],[e,f],[g,h],[q,v]])),
-    ?line {'EXIT', {badarg, _}} = (catch partition(from_term([a]))),
+    {'EXIT', {badarg, _}} = (catch partition(2, set([a]))),
+    {'EXIT', {badarg, _}} = (catch partition(1, set([a]))),
+    eval(partition(Id, set([a])), from_term([[a]])),
+
+    eval(partition(E), E),
+    P1 = from_term([[a,b,c],[d,e,f],[g,h]]),
+    P2 = from_term([[a,d],[b,c,e,f,q,v]]),
+    eval(partition(union(P1, P2)),
+	 from_term([[a],[b,c],[d],[e,f],[g,h],[q,v]])),
+    {'EXIT', {badarg, _}} = (catch partition(from_term([a]))),
     ok.
 
-partition_3(suite) -> [];
-partition_3(doc) -> [""];
 partition_3(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
+    E = empty_set(),
+    ER = relation([]),
 
     %% set of ordered sets
-    ?line S1 = relation([{a,1},{b,2},{b,22},{c,0}]),
-    ?line eval(partition(1, S1, set([0,1,d,e])),
-	       lpartition(1, S1, set([0,1,d,e]))),
-    ?line eval(partition(1, S1, E), lpartition(1, S1, E)),
-    ?line eval(partition(2, ER, set([a,b])), lpartition(2, ER, set([a,b]))),
+    S1 = relation([{a,1},{b,2},{b,22},{c,0}]),
+    eval(partition(1, S1, set([0,1,d,e])),
+	 lpartition(1, S1, set([0,1,d,e]))),
+    eval(partition(1, S1, E), lpartition(1, S1, E)),
+    eval(partition(2, ER, set([a,b])), lpartition(2, ER, set([a,b]))),
 
     XFun1 = {external, fun({_A,B,C}) -> {B,C} end},
     R1a = relation([{a,aa,1},{b,bb,2},{c,cc,3}]),
     R1b = relation([{bb,2},{cc,3}]),
-    ?line eval(partition(XFun1, R1a, R1b), lpartition(XFun1, R1a, R1b)),
+    eval(partition(XFun1, R1a, R1b), lpartition(XFun1, R1a, R1b)),
 
     Id = fun(X) -> X end,
     XId = {external, Id},
     R2 = relation([{a,b}]),
-    ?line eval(partition(XId, R2, E), lpartition(XId, R2, E)),
+    eval(partition(XId, R2, E), lpartition(XId, R2, E)),
 
     R3 = relation([{b,d}]),
-    ?line eval(partition(XId, E, R3), lpartition(XId, E, R3)),
+    eval(partition(XId, E, R3), lpartition(XId, E, R3)),
 
     Fun1 = fun(S) -> {_A,B,C} = to_external(S), from_term({B,C}) end,
     R4a = relation([{a,aa,1},{b,bb,2},{c,cc,3}]),
     R4b = relation([{bb,2},{cc,3}]),
-    ?line eval(partition(Fun1,R4a,R4b), lpartition(Fun1,R4a,R4b)),
+    eval(partition(Fun1,R4a,R4b), lpartition(Fun1,R4a,R4b)),
 
     XFun2 = {external, fun({_,{A},B}) -> {A,B} end},
     R5a = from_term([{a,{aa},1},{b,{bb},2},{c,{cc},3}]),
     R5b = from_term([{bb,2},{cc,3}]),
-    ?line eval(partition(XFun2,R5a, R5b), lpartition(XFun2,R5a, R5b)),
+    eval(partition(XFun2,R5a, R5b), lpartition(XFun2,R5a, R5b)),
 
     R6 = relation([{a,b}]),
-    ?line eval(partition(2, R6, E), lpartition(2, R6, E)),
+    eval(partition(2, R6, E), lpartition(2, R6, E)),
 
     R7 = relation([{b,d}]),
-    ?line eval(partition(2, E, R7), lpartition(2, E, R7)),
+    eval(partition(2, E, R7), lpartition(2, E, R7)),
 
     S2 = set([a]),
-    ?line eval(partition(XId, E, S2), lpartition(XId, E, S2)),
-    ?line eval(partition(XId, S1, E), lpartition(XId, S1, E)),
-    ?line {'EXIT', {badarg, _}} =
+    eval(partition(XId, E, S2), lpartition(XId, E, S2)),
+    eval(partition(XId, S1, E), lpartition(XId, S1, E)),
+    {'EXIT', {badarg, _}} =
 	(catch partition(3, relation([{a,b}]), E)),
-    ?line {'EXIT', {badarg, _}} =
+    {'EXIT', {badarg, _}} =
 	(catch partition(3, relation([{a,b}]), relation([{b,d}]))),
-    ?line {'EXIT', {badarg, _}} =
+    {'EXIT', {badarg, _}} =
 	(catch partition(3, relation([{a,b}]), set([{b,d}]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch partition(2, relation([{a,b}]), relation([{b,d}]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
 	(catch partition({external, fun({A,_B}) -> A end}, 
 			 relation([{a,b}]), relation([{b,d}]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch partition({external, fun({A,_}) -> {A,0} end}, 
 			 from_term([{1,a}]),
 			 from_term([{1,0}]))),
 
     S18a = relation([{1,e},{2,b},{3,c},{4,b},{5,a},{6,0}]),
     S18b = set([b,d,f]),
-    ?line eval(partition({external,fun({_,X}) -> X end}, S18a, S18b),
-	       lpartition({external,fun({_,X}) -> X end}, S18a, S18b)),
+    eval(partition({external,fun({_,X}) -> X end}, S18a, S18b),
+	 lpartition({external,fun({_,X}) -> X end}, S18a, S18b)),
     S19a = sofs:relation([{3,a},{8,b}]),
     S19b = set([2,6,7]),
-    ?line eval(partition({external,fun({X,_}) -> X end}, S19a, S19b),
-	       lpartition({external,fun({X,_}) -> X end}, S19a, S19b)),
+    eval(partition({external,fun({X,_}) -> X end}, S19a, S19b),
+	 lpartition({external,fun({X,_}) -> X end}, S19a, S19b)),
 
     R8a = relation([{a,d},{b,e},{c,b},{d,c}]),
     S8 = set([b,d]),
-    ?line eval(partition(2, R8a, S8), lpartition(2, R8a, S8)),
+    eval(partition(2, R8a, S8), lpartition(2, R8a, S8)),
 
     S16a = relation([{1,e},{2,b},{3,c},{4,b},{5,a},{6,0}]),
     S16b = set([b,c,d]),
-    ?line eval(partition(2, S16a, S16b), lpartition(2, S16a, S16b)),
+    eval(partition(2, S16a, S16b), lpartition(2, S16a, S16b)),
     S17a = relation([{e,1},{b,2},{c,3},{b,4},{a,5},{0,6}]),
     S17b = set([b,c,d]),
-    ?line eval(partition(1, S17a, S17b), lpartition(1, S17a, S17b)),
+    eval(partition(1, S17a, S17b), lpartition(1, S17a, S17b)),
 
-    ?line {'EXIT', {function_clause, _}} =
+    {'EXIT', {function_clause, _}} =
 	(catch partition({external, fun({A,_B}) -> A end}, set([]), E)),
 
     Fun3 = fun(S) -> from_term({to_external(S),0}, {type(S),atom}) end,
     S9a = set([1,2]),
     S9b = from_term([{1,0}]),
-    ?line eval(partition(Fun3, S9a, S9b), lpartition(Fun3, S9a, S9b)),
+    eval(partition(Fun3, S9a, S9b), lpartition(Fun3, S9a, S9b)),
 
     S14a = relation([{1,a},{2,b},{3,c},{0,0}]),
     S14b = set([b,c]),
-    ?line eval(partition(2, S14a, S14b), lpartition(2, S14a, S14b)),
+    eval(partition(2, S14a, S14b), lpartition(2, S14a, S14b)),
     S15a = relation([{a,1},{b,2},{c,3},{0,0}]),
     S15b = set([b,c]),
-    ?line eval(partition(1, S15a, S15b), lpartition(1, S15a, S15b)),
+    eval(partition(1, S15a, S15b), lpartition(1, S15a, S15b)),
 
     %% set of sets
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch partition({external, fun(X) -> X end}, 
 			 from_term([], [[atom]]), set([a]))),
 
     S10 = from_term([], [[atom]]),
-    ?line eval(partition(Id, S10, E), lpartition(Id, S10, E)),
+    eval(partition(Id, S10, E), lpartition(Id, S10, E)),
 
     S10e = from_term([[a],[b]], [[atom]]),
-    ?line eval(partition(Id, S10e, E), lpartition(Id, S10e, E)),
+    eval(partition(Id, S10e, E), lpartition(Id, S10e, E)),
 
     S11a = from_term([], [[atom]]),
     S11b = set([a]),
-    ?line eval(partition(Id, S11a, S11b), lpartition(Id, S11a, S11b)),
+    eval(partition(Id, S11a, S11b), lpartition(Id, S11a, S11b)),
 
     S12a = from_term([[[a],[b]], [[b],[c]], [[], [a,b]], [[1],[2]]]),
     S12b = from_term([[a,b],[1,2,3],[b,c]]),
-    ?line eval(partition(fun sofs:union/1, S12a, S12b),
-	       lpartition(fun sofs:union/1, S12a, S12b)),
+    eval(partition(fun sofs:union/1, S12a, S12b),
+	 lpartition(fun sofs:union/1, S12a, S12b)),
 
     Fun13 = fun(_) -> from_term([a]) end,
     S13a = from_term([], [[atom]]),
     S13b = from_term([], [[a]]),
-    ?line eval(partition(Fun13, S13a, S13b), lpartition(Fun13, S13a, S13b)),
+    eval(partition(Fun13, S13a, S13b), lpartition(Fun13, S13a, S13b)),
 
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
         (catch partition(fun(_) -> from_term([a]) end, 
 			 from_term([[1,2],[3,4]]),
 			 from_term([], [atom]))),
     Fun10 = fun(S) ->
-                   %% Cheating a lot...
-                   case to_external(S) of
-                       [1] -> from_term({1,1});
-                       _ -> S
-                   end
-           end,
-    ?line {'EXIT', {type_mismatch, _}} =
+		    %% Cheating a lot...
+		    case to_external(S) of
+			[1] -> from_term({1,1});
+			_ -> S
+		    end
+	    end,
+    {'EXIT', {type_mismatch, _}} =
         (catch partition(Fun10, from_term([[1]]), from_term([], [[atom]]))),
-    ?line {'EXIT', {type_mismatch, _}} = 
+    {'EXIT', {type_mismatch, _}} =
         (catch partition(fun(_) -> from_term({a}) end, 
 			 from_term([[a]]),
 			 from_term([], [atom]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch partition(fun(_) -> {a} end, 
 			 from_term([[a]]),
 			 from_term([], [atom]))),
@@ -1845,84 +1760,80 @@ partition_3(Conf) when is_list(Conf) ->
 lpartition(F, S1, S2) ->
     {restriction(F, S1, S2), drestriction(F, S1, S2)}.
 
-multiple_relative_product(suite) -> [];
-multiple_relative_product(doc) -> [""];
 multiple_relative_product(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
-    ?line T = relation([{a,1},{a,11},{b,2},{c,3},{c,33},{d,4}]), 
-    ?line {'EXIT', {badarg, _}} = 
+    E = empty_set(),
+    ER = relation([]),
+    T = relation([{a,1},{a,11},{b,2},{c,3},{c,33},{d,4}]),
+    {'EXIT', {badarg, _}} =
         (catch multiple_relative_product({}, ER)),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch multiple_relative_product({}, relation([{a,b}]))),
-    ?line eval(multiple_relative_product({E,T,T}, relation([], 3)), E),
-    ?line eval(multiple_relative_product({T,T,T}, E), E),
-    ?line eval(multiple_relative_product({T,T,T}, relation([],3)), 
-               from_term([],[{{atom,atom,atom},{atom,atom,atom}}])),
-    ?line eval(multiple_relative_product({T,T,T}, 
+    eval(multiple_relative_product({E,T,T}, relation([], 3)), E),
+    eval(multiple_relative_product({T,T,T}, E), E),
+    eval(multiple_relative_product({T,T,T}, relation([],3)),
+	 from_term([],[{{atom,atom,atom},{atom,atom,atom}}])),
+    eval(multiple_relative_product({T,T,T},
                                    relation([{a,b,c},{c,d,a}])),
-               from_term([{{a,b,c},{1,2,3}}, {{a,b,c},{1,2,33}},
-                          {{a,b,c},{11,2,3}}, {{a,b,c},{11,2,33}},
-                          {{c,d,a},{3,4,1}}, {{c,d,a},{3,4,11}},
-                          {{c,d,a},{33,4,1}}, {{c,d,a},{33,4,11}}])),
-    ?line {'EXIT', {type_mismatch, _}} =
+	 from_term([{{a,b,c},{1,2,3}}, {{a,b,c},{1,2,33}},
+		    {{a,b,c},{11,2,3}}, {{a,b,c},{11,2,33}},
+		    {{c,d,a},{3,4,1}}, {{c,d,a},{3,4,11}},
+		    {{c,d,a},{33,4,1}}, {{c,d,a},{33,4,11}}])),
+    {'EXIT', {type_mismatch, _}} =
 	(catch multiple_relative_product({T}, from_term([{{a}}]))), 
     ok.
 
-digraph(suite) -> [];
-digraph(doc) -> [""];
 digraph(Conf) when is_list(Conf) ->
-    ?line T0 = ets:all(),
-    ?line E = empty_set(),
-    ?line R = relation([{a,b},{b,c},{c,d},{d,a}]),
-    ?line F = relation_to_family(R),
+    T0 = ets:all(),
+    E = empty_set(),
+    R = relation([{a,b},{b,c},{c,d},{d,a}]),
+    F = relation_to_family(R),
     Type = type(F),
 
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch family_to_digraph(set([a]))),
     digraph_fail(badarg, catch family_to_digraph(set([a]), [foo])),
     digraph_fail(badarg, catch family_to_digraph(F, [foo])),
     digraph_fail(cyclic, catch family_to_digraph(family([{a,[a]}]),[acyclic])),
 
-    ?line G1 = family_to_digraph(E),
-    ?line {'EXIT', {badarg, _}} = (catch digraph_to_family(G1, foo)),
-    ?line {'EXIT', {badarg, _}} = (catch digraph_to_family(G1, atom)),
-    ?line true = [] == to_external(digraph_to_family(G1)),
-    ?line true = [] == to_external(digraph_to_family(G1, Type)),
-    ?line true = digraph:delete(G1),
-
-    ?line G1a = family_to_digraph(E, [protected]),
-    ?line true = [] == to_external(digraph_to_family(G1a)),
-    ?line true = [] == to_external(digraph_to_family(G1a, Type)),
-    ?line true = digraph:delete(G1a),
-
-    ?line G2 = family_to_digraph(F),
-    ?line true = F == digraph_to_family(G2),
-    ?line true = F == digraph_to_family(G2, type(F)),
-    ?line true = digraph:delete(G2),
-
-    ?line R2 = from_term([{{a},b},{{c},d}]),
-    ?line F2 = relation_to_family(R2),
-    ?line Type2 = type(F2),
-    ?line G3 = family_to_digraph(F2, [protected]),
-    ?line true = is_subset(F2, digraph_to_family(G3, Type2)),
-    ?line true = digraph:delete(G3),
+    G1 = family_to_digraph(E),
+    {'EXIT', {badarg, _}} = (catch digraph_to_family(G1, foo)),
+    {'EXIT', {badarg, _}} = (catch digraph_to_family(G1, atom)),
+    true = [] == to_external(digraph_to_family(G1)),
+    true = [] == to_external(digraph_to_family(G1, Type)),
+    true = digraph:delete(G1),
+
+    G1a = family_to_digraph(E, [protected]),
+    true = [] == to_external(digraph_to_family(G1a)),
+    true = [] == to_external(digraph_to_family(G1a, Type)),
+    true = digraph:delete(G1a),
+
+    G2 = family_to_digraph(F),
+    true = F == digraph_to_family(G2),
+    true = F == digraph_to_family(G2, type(F)),
+    true = digraph:delete(G2),
+
+    R2 = from_term([{{a},b},{{c},d}]),
+    F2 = relation_to_family(R2),
+    Type2 = type(F2),
+    G3 = family_to_digraph(F2, [protected]),
+    true = is_subset(F2, digraph_to_family(G3, Type2)),
+    true = digraph:delete(G3),
 
     Fl = 0.0, I = round(Fl),
     if
         Fl == I -> % term ordering
-            ?line G4 = digraph:new(),
+            G4 = digraph:new(),
             digraph:add_vertex(G4, Fl),
             digraph:add_vertex(G4, I),
-            ?line {'EXIT', {badarg, _}} = 
+            {'EXIT', {badarg, _}} =
                 (catch digraph_to_family(G4, Type)),
-            ?line {'EXIT', {badarg, _}} = 
+            {'EXIT', {badarg, _}} =
                 (catch digraph_to_family(G4)),
-            ?line true = digraph:delete(G4);
+            true = digraph:delete(G4);
         true -> ok
     end,
-    
-    ?line true = T0 == ets:all(),
+
+    true = T0 == ets:all(),
     ok.
 
 digraph_fail(ExitReason, Fail) ->
@@ -1932,32 +1843,28 @@ digraph_fail(ExitReason, Fail) ->
 	{true,2} -> ok
     end.
 
-constant_function(suite) -> [];
-constant_function(doc) -> [""];
 constant_function(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line C = from_term(3),
-    ?line eval(constant_function(E, C), E),
-    ?line eval(constant_function(set([a,b]), E), from_term([{a,[]},{b,[]}])),
-    ?line eval(constant_function(set([a,b]), C), from_term([{a,3},{b,3}])),
-    ?line {'EXIT', {badarg, _}} = (catch constant_function(C, C)),
-    ?line {'EXIT', {badarg, _}} = (catch constant_function(set([]), foo)),
+    E = empty_set(),
+    C = from_term(3),
+    eval(constant_function(E, C), E),
+    eval(constant_function(set([a,b]), E), from_term([{a,[]},{b,[]}])),
+    eval(constant_function(set([a,b]), C), from_term([{a,3},{b,3}])),
+    {'EXIT', {badarg, _}} = (catch constant_function(C, C)),
+    {'EXIT', {badarg, _}} = (catch constant_function(set([]), foo)),
     ok.
 
-misc(suite) -> [];
-misc(doc) -> [""];
 misc(Conf) when is_list(Conf) ->
-    % find "relational" part of relation:
-    ?line S = relation([{a,b},{b,c},{b,d},{c,d}]),
+    %% find "relational" part of relation:
+    S = relation([{a,b},{b,c},{b,d},{c,d}]),
     Id = fun(A) -> A end,
-    ?line RR = relational_restriction(S),
-    ?line eval(union(difference(partition(Id,S), partition(1,S))), RR),
-    ?line eval(union(difference(partition(1,S), partition(Id,S))), RR),
-
-    % the "functional" part:
-    ?line eval(union(intersection(partition(1,S), partition(Id,S))),
-               difference(S, RR)),
-    ?line {'EXIT', {undef, _}} =    
+    RR = relational_restriction(S),
+    eval(union(difference(partition(Id,S), partition(1,S))), RR),
+    eval(union(difference(partition(1,S), partition(Id,S))), RR),
+
+    %% the "functional" part:
+    eval(union(intersection(partition(1,S), partition(Id,S))),
+	 difference(S, RR)),
+    {'EXIT', {undef, _}} =
         (catch projection(fun external:foo/1, set([a,b,c]))),
     ok.
 
@@ -1966,157 +1873,143 @@ relational_restriction(R) ->
     family_to_relation(family_specification(Fun, relation_to_family(R))).
 
 
-family_specification(suite) -> [];
-family_specification(doc) -> [""];
 family_specification(Conf) when is_list(Conf) ->
     E = empty_set(),
     %% internal
-    ?line eval(family_specification(fun sofs:is_set/1, E), E),
-    ?line {'EXIT', {badarg, _}} =    
-       (catch family_specification(fun sofs:is_set/1, set([]))),
-    ?line F1 = from_term([{1,[1]}]),
-    ?line eval(family_specification(fun sofs:is_set/1, F1), F1),
+    eval(family_specification(fun sofs:is_set/1, E), E),
+    {'EXIT', {badarg, _}} =
+	(catch family_specification(fun sofs:is_set/1, set([]))),
+    F1 = from_term([{1,[1]}]),
+    eval(family_specification(fun sofs:is_set/1, F1), F1),
     Fun = fun(S) -> is_subset(S, set([0,1,2,3,4])) end,
-    ?line F2 = family([{a,[1,2]},{b,[3,4,5]}]),
-    ?line eval(family_specification(Fun, F2), family([{a,[1,2]}])),
-    ?line F3 = from_term([{a,[]},{b,[]}]),
-    ?line eval(family_specification(fun sofs:is_set/1, F3), F3),
+    F2 = family([{a,[1,2]},{b,[3,4,5]}]),
+    eval(family_specification(Fun, F2), family([{a,[1,2]}])),
+    F3 = from_term([{a,[]},{b,[]}]),
+    eval(family_specification(fun sofs:is_set/1, F3), F3),
     Fun2 = fun(_) -> throw(fippla) end, 
-    ?line fippla = (catch family_specification(Fun2, family([{a,[1]}]))),
+    fippla = (catch family_specification(Fun2, family([{a,[1]}]))),
     Fun3 = fun(_) -> neither_true_nor_false end,
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch family_specification(Fun3, F3)),
 
     %% external
     IsList = {external, fun(L) when is_list(L) -> true; (_) -> false end},
-    ?line eval(family_specification(IsList, E), E),
-    ?line eval(family_specification(IsList, F1), F1),
+    eval(family_specification(IsList, E), E),
+    eval(family_specification(IsList, F1), F1),
     MF = {external, fun(L) -> lists:member(3, L) end},
-    ?line eval(family_specification(MF, F2), family([{b,[3,4,5]}])),
-    ?line fippla = (catch family_specification(Fun2, family([{a,[1]}]))),
-    ?line {'EXIT', {badarg, _}} = 
+    eval(family_specification(MF, F2), family([{b,[3,4,5]}])),
+    fippla = (catch family_specification(Fun2, family([{a,[1]}]))),
+    {'EXIT', {badarg, _}} =
 	(catch family_specification({external, Fun3}, F3)),
     ok.
 
-family_domain_1(suite) -> [];
-family_domain_1(doc) -> [""];
 family_domain_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = from_term([{a,[]},{b,[]}],[{atom,[{atom,atom}]}]),
-    ?line EF = from_term([{a,[]},{b,[]}],[{atom,[atom]}]),
-    ?line eval(family_domain(E), E),
-    ?line eval(family_domain(ER), EF),
-    ?line FR = from_term([{a,[{1,a},{2,b},{3,c}]},{b,[]},{c,[{4,d},{5,e}]}]),
-    ?line eval(family_domain(FR), from_term([{a,[1,2,3]},{b,[]},{c,[4,5]}])),
-    ?line eval(family_field(E), E),
-    ?line eval(family_field(FR), 
-               from_term([{a,[a,b,c,1,2,3]},{b,[]},{c,[d,e,4,5]}])),
-    ?line eval(family_domain(from_term([{{a},[{{1,[]},c}]}])),
-               from_term([{{a},[{1,[]}]}])),
-    ?line eval(family_domain(from_term([{{a},[{{1,[a]},c}]}])),
-               from_term([{{a},[{1,[a]}]}])),
-    ?line eval(family_domain(from_term([{{a},[]}])),
-	       from_term([{{a},[]}])),
-    ?line eval(family_domain(from_term([], type(FR))), 
-               from_term([], [{atom,[atom]}])),
-    ?line {'EXIT', {badarg, _}} = (catch family_domain(set([a]))),
-    ?line {'EXIT', {badarg, _}} = (catch family_field(set([a]))),
-    ?line {'EXIT', {badarg, _}} = (catch family_domain(set([{a,[b]}]))),
+    E = empty_set(),
+    ER = from_term([{a,[]},{b,[]}],[{atom,[{atom,atom}]}]),
+    EF = from_term([{a,[]},{b,[]}],[{atom,[atom]}]),
+    eval(family_domain(E), E),
+    eval(family_domain(ER), EF),
+    FR = from_term([{a,[{1,a},{2,b},{3,c}]},{b,[]},{c,[{4,d},{5,e}]}]),
+    eval(family_domain(FR), from_term([{a,[1,2,3]},{b,[]},{c,[4,5]}])),
+    eval(family_field(E), E),
+    eval(family_field(FR),
+	 from_term([{a,[a,b,c,1,2,3]},{b,[]},{c,[d,e,4,5]}])),
+    eval(family_domain(from_term([{{a},[{{1,[]},c}]}])),
+	 from_term([{{a},[{1,[]}]}])),
+    eval(family_domain(from_term([{{a},[{{1,[a]},c}]}])),
+	 from_term([{{a},[{1,[a]}]}])),
+    eval(family_domain(from_term([{{a},[]}])),
+	 from_term([{{a},[]}])),
+    eval(family_domain(from_term([], type(FR))),
+	 from_term([], [{atom,[atom]}])),
+    {'EXIT', {badarg, _}} = (catch family_domain(set([a]))),
+    {'EXIT', {badarg, _}} = (catch family_field(set([a]))),
+    {'EXIT', {badarg, _}} = (catch family_domain(set([{a,[b]}]))),
     ok.
 
-family_range_1(suite) -> [];
-family_range_1(doc) -> [""];
 family_range_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = from_term([{a,[]},{b,[]}],[{atom,[{atom,atom}]}]),
-    ?line EF = from_term([{a,[]},{b,[]}],[{atom,[atom]}]),
-    ?line eval(family_range(E), E),
-    ?line eval(family_range(ER), EF),
-    ?line FR = from_term([{a,[{1,a},{2,b},{3,c}]},{b,[]},{c,[{4,d},{5,e}]}]),
-    ?line eval(family_range(FR), from_term([{a,[a,b,c]},{b,[]},{c,[d,e]}])),
-    ?line eval(family_range(from_term([{{a},[{c,{1,[a]}}]}])),
-               from_term([{{a},[{1,[a]}]}])),
-    ?line eval(family_range(from_term([{{a},[{c,{1,[]}}]}])),
-               from_term([{{a},[{1,[]}]}])),
-    ?line eval(family_range(from_term([{{a},[]}])),
-	       from_term([{{a},[]}])),
-    ?line eval(family_range(from_term([], type(FR))), 
-               from_term([], [{atom,[atom]}])),
-    ?line {'EXIT', {badarg, _}} = (catch family_range(set([a]))),
-    ?line {'EXIT', {badarg, _}} = (catch family_range(set([{a,[b]}]))),
+    E = empty_set(),
+    ER = from_term([{a,[]},{b,[]}],[{atom,[{atom,atom}]}]),
+    EF = from_term([{a,[]},{b,[]}],[{atom,[atom]}]),
+    eval(family_range(E), E),
+    eval(family_range(ER), EF),
+    FR = from_term([{a,[{1,a},{2,b},{3,c}]},{b,[]},{c,[{4,d},{5,e}]}]),
+    eval(family_range(FR), from_term([{a,[a,b,c]},{b,[]},{c,[d,e]}])),
+    eval(family_range(from_term([{{a},[{c,{1,[a]}}]}])),
+	 from_term([{{a},[{1,[a]}]}])),
+    eval(family_range(from_term([{{a},[{c,{1,[]}}]}])),
+	 from_term([{{a},[{1,[]}]}])),
+    eval(family_range(from_term([{{a},[]}])),
+	 from_term([{{a},[]}])),
+    eval(family_range(from_term([], type(FR))),
+	 from_term([], [{atom,[atom]}])),
+    {'EXIT', {badarg, _}} = (catch family_range(set([a]))),
+    {'EXIT', {badarg, _}} = (catch family_range(set([{a,[b]}]))),
     ok.
 
-family_to_relation_1(suite) -> [];
-family_to_relation_1(doc) -> [""];
 family_to_relation_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line ER = relation([]),
-    ?line EF = family([]),
-    ?line eval(family_to_relation(E), E),
-    ?line eval(family_to_relation(EF), ER),
-    ?line eval(sofs:fam2rel(EF), ER),
-    ?line F = family([{a,[]},{b,[1]},{c,[7,9,11]}]),
-    ?line eval(family_to_relation(F), relation([{b,1},{c,7},{c,9},{c,11}])),
-    ?line {'EXIT', {badarg, _}} = (catch family_to_relation(set([a]))),
+    E = empty_set(),
+    ER = relation([]),
+    EF = family([]),
+    eval(family_to_relation(E), E),
+    eval(family_to_relation(EF), ER),
+    eval(sofs:fam2rel(EF), ER),
+    F = family([{a,[]},{b,[1]},{c,[7,9,11]}]),
+    eval(family_to_relation(F), relation([{b,1},{c,7},{c,9},{c,11}])),
+    {'EXIT', {badarg, _}} = (catch family_to_relation(set([a]))),
     ok.
 
-union_of_family_1(suite) -> [];
-union_of_family_1(doc) -> [""];
 union_of_family_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line EF = from_term([{a,[]},{b,[]}],[{atom,[atom]}]),
-    ?line eval(union_of_family(E), E),
-    ?line eval(union_of_family(EF), set([])),
-    ?line eval(union_of_family(family([])), set([])),
-    ?line FR = from_term([{a,[1,2,3]},{b,[]},{c,[4,5]}]),
-    ?line eval(union_of_family(FR), set([1,2,3,4,5])),
-    ?line eval(union_of_family(sofs:family([{a,[1,2]},{b,[1,2]}])),
-	       set([1,2])),
-    ?line {'EXIT', {badarg, _}} = (catch union_of_family(set([a]))),
+    E = empty_set(),
+    EF = from_term([{a,[]},{b,[]}],[{atom,[atom]}]),
+    eval(union_of_family(E), E),
+    eval(union_of_family(EF), set([])),
+    eval(union_of_family(family([])), set([])),
+    FR = from_term([{a,[1,2,3]},{b,[]},{c,[4,5]}]),
+    eval(union_of_family(FR), set([1,2,3,4,5])),
+    eval(union_of_family(sofs:family([{a,[1,2]},{b,[1,2]}])),
+	 set([1,2])),
+    {'EXIT', {badarg, _}} = (catch union_of_family(set([a]))),
     ok.
 
-intersection_of_family_1(suite) -> [];
-intersection_of_family_1(doc) -> [""];
 intersection_of_family_1(Conf) when is_list(Conf) ->
-    ?line EF = from_term([{a,[]},{b,[]}],[{atom,[atom]}]),
-    ?line eval(intersection_of_family(EF), set([])),
-    ?line FR = from_term([{a,[1,2,3]},{b,[2,3]},{c,[3,4,5]}]),
-    ?line eval(intersection_of_family(FR), set([3])),
-    ?line {'EXIT', {badarg, _}} = 
+    EF = from_term([{a,[]},{b,[]}],[{atom,[atom]}]),
+    eval(intersection_of_family(EF), set([])),
+    FR = from_term([{a,[1,2,3]},{b,[2,3]},{c,[3,4,5]}]),
+    eval(intersection_of_family(FR), set([3])),
+    {'EXIT', {badarg, _}} =
         (catch intersection_of_family(family([]))),
-    ?line EE = from_term([], [[atom]]),
-    ?line {'EXIT', {badarg, _}} = (catch intersection_of_family(EE)),
-    ?line {'EXIT', {badarg, _}} = (catch intersection_of_family(set([a]))),
+    EE = from_term([], [[atom]]),
+    {'EXIT', {badarg, _}} = (catch intersection_of_family(EE)),
+    {'EXIT', {badarg, _}} = (catch intersection_of_family(set([a]))),
     ok.
 
-family_projection(suite) -> [];
-family_projection(doc) -> [""];
 family_projection(Conf) when is_list(Conf) ->
     SSType = [{atom,[[atom]]}],
     SRType = [{atom,[{atom,atom}]}],
-    ?line E = empty_set(),
-
-    ?line eval(family_projection(fun(X) -> X end, family([])), E),
-    ?line L1 = [{a,[]}],
-    ?line eval(family_projection(fun sofs:union/1, E), E),
-    ?line eval(family_projection(fun sofs:union/1, from_term(L1, SSType)),
-               family(L1)),
-    ?line {'EXIT', {badarg, _}} =    
+    E = empty_set(),
+
+    eval(family_projection(fun(X) -> X end, family([])), E),
+    L1 = [{a,[]}],
+    eval(family_projection(fun sofs:union/1, E), E),
+    eval(family_projection(fun sofs:union/1, from_term(L1, SSType)),
+	 family(L1)),
+    {'EXIT', {badarg, _}} =
         (catch family_projection(fun sofs:union/1, set([]))),
-    ?line {'EXIT', {badarg, _}} =
+    {'EXIT', {badarg, _}} =
         (catch family_projection(fun sofs:union/1, from_term([{1,[1]}]))),
 
-    ?line F2 = from_term([{a,[[1],[2]]},{b,[[3,4],[5]]}], SSType),
-    ?line eval(family_projection(fun sofs:union/1, F2),
-               family_union(F2)),
+    F2 = from_term([{a,[[1],[2]]},{b,[[3,4],[5]]}], SSType),
+    eval(family_projection(fun sofs:union/1, F2),
+	 family_union(F2)),
 
-    ?line F3 = from_term([{1,[{a,b},{b,c},{c,d}]},{3,[]},{5,[{3,5}]}],
-                         SRType),
-    ?line eval(family_projection(fun sofs:domain/1, F3), family_domain(F3)),
-    ?line eval(family_projection(fun sofs:range/1, F3), family_range(F3)),
+    F3 = from_term([{1,[{a,b},{b,c},{c,d}]},{3,[]},{5,[{3,5}]}],
+		   SRType),
+    eval(family_projection(fun sofs:domain/1, F3), family_domain(F3)),
+    eval(family_projection(fun sofs:range/1, F3), family_range(F3)),
 
-    ?line eval(family_projection(fun(_) -> E end, family([{a,[b,c]}])),
-	       from_term([{a,[]}])),
+    eval(family_projection(fun(_) -> E end, family([{a,[b,c]}])),
+	 from_term([{a,[]}])),
 
     Fun1 = fun(S) ->
                    case to_external(S) of
@@ -2124,264 +2017,252 @@ family_projection(Conf) when is_list(Conf) ->
                        _ -> S
                    end
            end,
-    ?line eval(family_projection(Fun1, family([{a,[1]}])), 
-	       from_term([{a,{1,1}}])),
+    eval(family_projection(Fun1, family([{a,[1]}])),
+	 from_term([{a,{1,1}}])),
     Fun2 = fun(_) -> throw(fippla) end, 
-    ?line fippla = 
+    fippla =
         (catch family_projection(Fun2, family([{a,[1]}]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
         (catch family_projection(Fun1, from_term([{1,[1]},{2,[2]}]))),
-    ?line {'EXIT', {type_mismatch, _}} =
+    {'EXIT', {type_mismatch, _}} =
         (catch family_projection(Fun1, from_term([{1,[1]},{0,[0]}]))),
 
-    ?line eval(family_projection(fun(_) -> E end, from_term([{a,[]}])),
-	       from_term([{a,[]}])),
+    eval(family_projection(fun(_) -> E end, from_term([{a,[]}])),
+	 from_term([{a,[]}])),
     F4 = from_term([{a,[{1,2,3}]},{b,[{4,5,6}]},{c,[]},{m3,[]}]),
     Z = from_term(0),
-    ?line eval(family_projection(fun(S) -> local_adjoin(S, Z) end, F4),
-	      from_term([{a,[{{1,2,3},0}]},{b,[{{4,5,6},0}]},{c,[]},{m3,[]}])),
-    ?line {'EXIT', {badarg, _}} =
+    eval(family_projection(fun(S) -> local_adjoin(S, Z) end, F4),
+	 from_term([{a,[{{1,2,3},0}]},{b,[{{4,5,6},0}]},{c,[]},{m3,[]}])),
+    {'EXIT', {badarg, _}} =
         (catch family_projection({external, fun(X) -> X end}, 
 				 from_term([{1,[1]}]))),
 
     %% ordered set element
-    ?line eval(family_projection(fun(_) -> from_term(a, atom) end, 
-				 from_term([{1,[a]}])),
-	       from_term([{1,a}])),
+    eval(family_projection(fun(_) -> from_term(a, atom) end,
+			   from_term([{1,[a]}])),
+	 from_term([{1,a}])),
     ok.
 
-family_difference(suite) -> [];
-family_difference(doc) -> [""];
 family_difference(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line EF = family([]),
-    ?line F9 = from_term([{b,[b,c]}]),
-    ?line F10 = from_term([{a,[b,c]}]),
-    ?line eval(family_difference(E, E), E),
-    ?line eval(family_difference(E, F10), from_term([], type(F10))),
-    ?line eval(family_difference(F10, E), F10),
-    ?line eval(family_difference(F9, F10), F9),
-    ?line eval(family_difference(F10, F10), family([{a,[]}])),
-    ?line F20 = from_term([{a,[1,2,3]},{b,[1,2,3]},{c,[1,2,3]}]),
-    ?line F21 = from_term([{b,[1,2,3]},{c,[1,2,3]}]),
-    ?line eval(family_difference(F20, from_term([{a,[2]}])),
-               from_term([{a,[1,3]},{b,[1,2,3]},{c,[1,2,3]}])),
-    ?line eval(family_difference(F20, from_term([{0,[2]},{q,[1,2]}])), F20),
-    ?line eval(family_difference(F20, F21),
-               from_term([{a,[1,2,3]},{b,[]},{c,[]}])),
-
-    ?line eval(family_difference(from_term([{e,[f,g]}]), family([])),
-               from_term([{e,[f,g]}])),
-    ?line eval(family_difference(from_term([{e,[f,g]}]), EF),
-               from_term([{e,[f,g]}])),
-    ?line eval(family_difference(from_term([{a,[a,b,c,d]},{c,[b,c]}]),
-                                 from_term([{a,[b,c]},{b,[d]},{d,[e,f]}])),
-               from_term([{a,[a,d]},{c,[b,c]}])),
-    ?line {'EXIT', {badarg, _}} = 
+    E = empty_set(),
+    EF = family([]),
+    F9 = from_term([{b,[b,c]}]),
+    F10 = from_term([{a,[b,c]}]),
+    eval(family_difference(E, E), E),
+    eval(family_difference(E, F10), from_term([], type(F10))),
+    eval(family_difference(F10, E), F10),
+    eval(family_difference(F9, F10), F9),
+    eval(family_difference(F10, F10), family([{a,[]}])),
+    F20 = from_term([{a,[1,2,3]},{b,[1,2,3]},{c,[1,2,3]}]),
+    F21 = from_term([{b,[1,2,3]},{c,[1,2,3]}]),
+    eval(family_difference(F20, from_term([{a,[2]}])),
+	 from_term([{a,[1,3]},{b,[1,2,3]},{c,[1,2,3]}])),
+    eval(family_difference(F20, from_term([{0,[2]},{q,[1,2]}])), F20),
+    eval(family_difference(F20, F21),
+	 from_term([{a,[1,2,3]},{b,[]},{c,[]}])),
+
+    eval(family_difference(from_term([{e,[f,g]}]), family([])),
+	 from_term([{e,[f,g]}])),
+    eval(family_difference(from_term([{e,[f,g]}]), EF),
+	 from_term([{e,[f,g]}])),
+    eval(family_difference(from_term([{a,[a,b,c,d]},{c,[b,c]}]),
+			   from_term([{a,[b,c]},{b,[d]},{d,[e,f]}])),
+	 from_term([{a,[a,d]},{c,[b,c]}])),
+    {'EXIT', {badarg, _}} =
 	(catch family_difference(set([]), set([]))),
-    ?line {'EXIT', {type_mismatch, _}} =    
+    {'EXIT', {type_mismatch, _}} =
 	(catch family_difference(from_term([{a,[b,c]}]),
                                  from_term([{e,[{f}]}]))),
-    ?line {'EXIT', {type_mismatch, _}} =    
+    {'EXIT', {type_mismatch, _}} =
 	(catch family_difference(from_term([{a,[b]}]),
                                  from_term([{c,[d]}], [{i,[s]}]))),
     ok.
 
-family_intersection_1(suite) -> [];
-family_intersection_1(doc) -> [""];
 family_intersection_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line EF = family([]),
-    ?line ES = from_term([], [{atom,[[atom]]}]),
-    ?line eval(family_intersection(E), E),
-    ?line {'EXIT', {badarg, _}} = (catch family_intersection(EF)),
-    ?line eval(family_intersection(ES), EF),
-    ?line {'EXIT', {badarg, _}} = (catch family_intersection(set([]))),
-    ?line {'EXIT', {badarg, _}} = 
+    E = empty_set(),
+    EF = family([]),
+    ES = from_term([], [{atom,[[atom]]}]),
+    eval(family_intersection(E), E),
+    {'EXIT', {badarg, _}} = (catch family_intersection(EF)),
+    eval(family_intersection(ES), EF),
+    {'EXIT', {badarg, _}} = (catch family_intersection(set([]))),
+    {'EXIT', {badarg, _}} =
         (catch family_intersection(from_term([{a,[1,2]}]))),
-    ?line F1 = from_term([{a,[[1],[2],[2,3]]},{b,[]},{c,[[4]]}]),
-    ?line {'EXIT', {badarg, _}} = (catch family_intersection(F1)),
-    ?line F2 = from_term([{b,[[1],[2],[2,3]]},{a,[]},{c,[[4]]}]),
-    ?line {'EXIT', {badarg, _}} = (catch family_intersection(F2)),
-    ?line F3 = from_term([{a,[[1,2,3],[2],[2,3]]},{c,[[4,5,6],[5,6,7]]}]),
-    ?line eval(family_intersection(F3), family([{a,[2]},{c,[5,6]}])),
+    F1 = from_term([{a,[[1],[2],[2,3]]},{b,[]},{c,[[4]]}]),
+    {'EXIT', {badarg, _}} = (catch family_intersection(F1)),
+    F2 = from_term([{b,[[1],[2],[2,3]]},{a,[]},{c,[[4]]}]),
+    {'EXIT', {badarg, _}} = (catch family_intersection(F2)),
+    F3 = from_term([{a,[[1,2,3],[2],[2,3]]},{c,[[4,5,6],[5,6,7]]}]),
+    eval(family_intersection(F3), family([{a,[2]},{c,[5,6]}])),
     ok.
 
-family_intersection_2(suite) -> [];
-family_intersection_2(doc) -> [""];
 family_intersection_2(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line EF = family([]),
-    ?line F1 = from_term([{a,[1,2]},{b,[4,5]},{c,[7,8]},{d,[10,11]}]),
-    ?line F2 = from_term([{c,[6,7]},{d,[9,10,11]},{q,[1]}]),
-    ?line F3 = from_term([{a,[1,2]},{b,[4,5]},{c,[6,7,8]},{d,[9,10,11]},
-                          {q,[1]}]),
-
-    ?line eval(family_intersection(E, E), E),
-    ?line eval(family_intersection(EF, EF), EF),
-    ?line eval(family_intersection(F1, F2), 
-               from_term([{c,[7]},{d,[10,11]}])),
-    ?line eval(family_intersection(F1, F3), F1),
-    ?line eval(family_intersection(F2, F3), F2),
-
-    ?line eval(family_intersection(EF, from_term([{e,[f,g]}])), EF),
-    ?line eval(family_intersection(E, from_term([{e,[f,g]}])), EF),
-    ?line eval(family_intersection(from_term([{e,[f,g]}]), EF), EF),
-    ?line eval(family_intersection(from_term([{e,[f,g]}]), E), EF),
-    ?line {'EXIT', {type_mismatch, _}} =    
+    E = empty_set(),
+    EF = family([]),
+    F1 = from_term([{a,[1,2]},{b,[4,5]},{c,[7,8]},{d,[10,11]}]),
+    F2 = from_term([{c,[6,7]},{d,[9,10,11]},{q,[1]}]),
+    F3 = from_term([{a,[1,2]},{b,[4,5]},{c,[6,7,8]},{d,[9,10,11]},
+		    {q,[1]}]),
+
+    eval(family_intersection(E, E), E),
+    eval(family_intersection(EF, EF), EF),
+    eval(family_intersection(F1, F2),
+	 from_term([{c,[7]},{d,[10,11]}])),
+    eval(family_intersection(F1, F3), F1),
+    eval(family_intersection(F2, F3), F2),
+
+    eval(family_intersection(EF, from_term([{e,[f,g]}])), EF),
+    eval(family_intersection(E, from_term([{e,[f,g]}])), EF),
+    eval(family_intersection(from_term([{e,[f,g]}]), EF), EF),
+    eval(family_intersection(from_term([{e,[f,g]}]), E), EF),
+    {'EXIT', {type_mismatch, _}} =
 	(catch family_intersection(from_term([{a,[b,c]}]),
                                    from_term([{e,[{f}]}]))),
 
-    ?line F11 = family([{a,[1,2,3]},{b,[0,2,4]},{c,[0,3,6,9]}]),
-    ?line eval(union_of_family(F11), set([0,1,2,3,4,6,9])),
-    ?line F12 = from_term([{a,[1,2,3,4]},{b,[0,2,4]},{c,[2,3,4,5]}]),
-    ?line eval(intersection_of_family(F12), set([2,4])),
+    F11 = family([{a,[1,2,3]},{b,[0,2,4]},{c,[0,3,6,9]}]),
+    eval(union_of_family(F11), set([0,1,2,3,4,6,9])),
+    F12 = from_term([{a,[1,2,3,4]},{b,[0,2,4]},{c,[2,3,4,5]}]),
+    eval(intersection_of_family(F12), set([2,4])),
     ok.
 
-family_union_1(suite) -> [];
-family_union_1(doc) -> [""];
 family_union_1(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line EF = family([]),
-    ?line ES = from_term([], [{atom,[[atom]]}]),
-    ?line eval(family_union(E), E),
-    ?line eval(family_union(ES), EF),
-    ?line {'EXIT', {badarg, _}} = (catch family_union(set([]))),
-    ?line {'EXIT', {badarg, _}} = 
+    E = empty_set(),
+    EF = family([]),
+    ES = from_term([], [{atom,[[atom]]}]),
+    eval(family_union(E), E),
+    eval(family_union(ES), EF),
+    {'EXIT', {badarg, _}} = (catch family_union(set([]))),
+    {'EXIT', {badarg, _}} =
         (catch family_union(from_term([{a,[1,2]}]))),
-    ?line eval(family_union(from_term([{a,[[1],[2],[2,3]]},{b,[]},{c,[[4]]}])),
-               family([{a,[1,2,3]},{b,[]},{c,[4]}])),
+    eval(family_union(from_term([{a,[[1],[2],[2,3]]},{b,[]},{c,[[4]]}])),
+	 family([{a,[1,2,3]},{b,[]},{c,[4]}])),
     ok.
 
-family_union_2(suite) -> [];
-family_union_2(doc) -> [""];
 family_union_2(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
-    ?line EF = family([]),
-    ?line F1 = from_term([{a,[1,2]},{b,[4,5]},{c,[7,8]},{d,[10,11]}]),
-    ?line F2 = from_term([{c,[6,7]},{d,[9,10,11]},{q,[1]}]),
-    ?line F3 = from_term([{a,[1,2]},{b,[4,5]},{c,[6,7,8]},{d,[9,10,11]},
-                          {q,[1]}]),
-
-    ?line eval(family_union(E, E), E),
-    ?line eval(family_union(F1, E), F1),
-    ?line eval(family_union(E, F2), F2),
-    ?line eval(family_union(F1, F2), F3),
-    ?line eval(family_union(F2, F1), F3),
-
-    ?line eval(family_union(E, from_term([{e,[f,g]}])),
-               from_term([{e,[f,g]}])),
-    ?line eval(family_union(EF, from_term([{e,[f,g]}])),
-               from_term([{e,[f,g]}])),
-    ?line eval(family_union(from_term([{e,[f,g]}]), E), 
-               from_term([{e,[f,g]}])),
-    ?line {'EXIT', {badarg, _}} = 
+    E = empty_set(),
+    EF = family([]),
+    F1 = from_term([{a,[1,2]},{b,[4,5]},{c,[7,8]},{d,[10,11]}]),
+    F2 = from_term([{c,[6,7]},{d,[9,10,11]},{q,[1]}]),
+    F3 = from_term([{a,[1,2]},{b,[4,5]},{c,[6,7,8]},{d,[9,10,11]},
+		    {q,[1]}]),
+
+    eval(family_union(E, E), E),
+    eval(family_union(F1, E), F1),
+    eval(family_union(E, F2), F2),
+    eval(family_union(F1, F2), F3),
+    eval(family_union(F2, F1), F3),
+
+    eval(family_union(E, from_term([{e,[f,g]}])),
+	 from_term([{e,[f,g]}])),
+    eval(family_union(EF, from_term([{e,[f,g]}])),
+	 from_term([{e,[f,g]}])),
+    eval(family_union(from_term([{e,[f,g]}]), E),
+	 from_term([{e,[f,g]}])),
+    {'EXIT', {badarg, _}} =
 	(catch family_union(set([]),set([]))),
-    ?line {'EXIT', {type_mismatch, _}} =    
+    {'EXIT', {type_mismatch, _}} =
 	(catch family_union(from_term([{a,[b,c]}]), 
                             from_term([{e,[{f}]}]))),
     ok.
 
-partition_family(suite) -> [];
-partition_family(doc) -> [""];
 partition_family(Conf) when is_list(Conf) ->
-    ?line E = empty_set(),
+    E = empty_set(),
 
     %% set of ordered sets
-    ?line ER = relation([]),
-    ?line EF = from_term([], [{atom,[{atom,atom}]}]),
-
-    ?line eval(partition_family(1, E), E),
-    ?line eval(partition_family(2, E), E),
-    ?line eval(partition_family(fun sofs:union/1, E), E),
-    ?line eval(partition_family(1, ER), EF),
-    ?line eval(partition_family(2, ER), EF),
-    ?line {'EXIT', {badarg, _}} = (catch partition_family(1, set([]))),
-    ?line {'EXIT', {badarg, _}} = (catch partition_family(2, set([]))),
-    ?line {'EXIT', {function_clause, _}} =
+    ER = relation([]),
+    EF = from_term([], [{atom,[{atom,atom}]}]),
+
+    eval(partition_family(1, E), E),
+    eval(partition_family(2, E), E),
+    eval(partition_family(fun sofs:union/1, E), E),
+    eval(partition_family(1, ER), EF),
+    eval(partition_family(2, ER), EF),
+    {'EXIT', {badarg, _}} = (catch partition_family(1, set([]))),
+    {'EXIT', {badarg, _}} = (catch partition_family(2, set([]))),
+    {'EXIT', {function_clause, _}} =
 	(catch partition_family(fun({_A,B}) -> {B} end, from_term([{1}]))),
-    ?line eval(partition_family(1, relation([{1,a},{1,b},{2,c},{2,d}])), 
-	       from_term([{1,[{1,a},{1,b}]},{2,[{2,c},{2,d}]}])),
-    ?line eval(partition_family(1, relation([{1,a},{2,b}])),
-	       from_term([{1,[{1,a}]},{2,[{2,b}]}])),
-    ?line eval(partition_family(2, relation([{1,a},{1,b},{2,a},{2,b},{3,c}])), 
-	       from_term([{a,[{1,a},{2,a}]},{b,[{1,b},{2,b}]},{c,[{3,c}]}])),
-    ?line eval(partition_family(2, relation([{1,a}])), 
-	       from_term([{a,[{1,a}]}])),
-    ?line eval(partition_family(2, relation([{1,a},{2,a},{3,a}])), 
-	       from_term([{a,[{1,a},{2,a},{3,a}]}])),
-    ?line eval(partition_family(2, relation([{1,a},{2,b}])),
-	       from_term([{a,[{1,a}]},{b,[{2,b}]}])),
-    ?line F13 = from_term([{a,b,c},{a,b,d},{b,b,c},{a,c,c},{a,c,d},{b,c,c}]),
-    ?line eval(partition_family(2, F13),
-               from_term([{b,[{a,b,c},{a,b,d},{b,b,c}]},
-                          {c,[{a,c,c},{a,c,d},{b,c,c}]}])),
+    eval(partition_family(1, relation([{1,a},{1,b},{2,c},{2,d}])),
+	 from_term([{1,[{1,a},{1,b}]},{2,[{2,c},{2,d}]}])),
+    eval(partition_family(1, relation([{1,a},{2,b}])),
+	 from_term([{1,[{1,a}]},{2,[{2,b}]}])),
+    eval(partition_family(2, relation([{1,a},{1,b},{2,a},{2,b},{3,c}])),
+	 from_term([{a,[{1,a},{2,a}]},{b,[{1,b},{2,b}]},{c,[{3,c}]}])),
+    eval(partition_family(2, relation([{1,a}])),
+	 from_term([{a,[{1,a}]}])),
+    eval(partition_family(2, relation([{1,a},{2,a},{3,a}])),
+	 from_term([{a,[{1,a},{2,a},{3,a}]}])),
+    eval(partition_family(2, relation([{1,a},{2,b}])),
+	 from_term([{a,[{1,a}]},{b,[{2,b}]}])),
+    F13 = from_term([{a,b,c},{a,b,d},{b,b,c},{a,c,c},{a,c,d},{b,c,c}]),
+    eval(partition_family(2, F13),
+	 from_term([{b,[{a,b,c},{a,b,d},{b,b,c}]},
+		    {c,[{a,c,c},{a,c,d},{b,c,c}]}])),
 
     Fun1 = {external, fun({A,_B}) -> {A} end}, 
-    ?line eval(partition_family(Fun1, relation([{a,1},{a,2},{b,3}])),
-	       from_term([{{a},[{a,1},{a,2}]},{{b},[{b,3}]}])),
+    eval(partition_family(Fun1, relation([{a,1},{a,2},{b,3}])),
+	 from_term([{{a},[{a,1},{a,2}]},{{b},[{b,3}]}])),
     Fun2 = fun(S) -> {A,_B} = to_external(S), from_term({A}) end,
-    ?line eval(partition_family(Fun2, relation([{a,1},{a,2},{b,3}])),
-	       from_term([{{a},[{a,1},{a,2}]},{{b},[{b,3}]}])),
+    eval(partition_family(Fun2, relation([{a,1},{a,2},{b,3}])),
+	 from_term([{{a},[{a,1},{a,2}]},{{b},[{b,3}]}])),
 
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
 	(catch partition_family({external, fun({A,_}) -> {A,0} end}, 
 				from_term([{1,a}]))),
-    ?line [{{atom,atom},[{atom,atom,atom,atom}]}] = 
+    [{{atom,atom},[{atom,atom,atom,atom}]}] =
 	type(partition_family({external, fun({A,_B,C,_D}) -> {C,A} end}, 
 			      relation([],4))),
 
     Fun3 = fun(S) -> from_term({to_external(S),0}, {type(S),atom}) end,
-    ?line eval(partition_family(Fun3, E), E),
-    ?line eval(partition_family(Fun3, set([a,b])),
-	       from_term([{{a,0},[a]}, {{b,0},[b]}])),
-    ?line eval(partition_family(Fun3, relation([{a,1},{b,2}])),
-	       from_term([{{{a,1},0},[{a,1}]},{{{b,2},0},[{b,2}]}])),
-    ?line eval(partition_family(Fun3, from_term([[a],[b]])),
-	       from_term([{{[a],0},[[a]]}, {{[b],0},[[b]]}])),
-    ?line partition_family({external, fun(X) -> X end}, E),
+    eval(partition_family(Fun3, E), E),
+    eval(partition_family(Fun3, set([a,b])),
+	 from_term([{{a,0},[a]}, {{b,0},[b]}])),
+    eval(partition_family(Fun3, relation([{a,1},{b,2}])),
+	 from_term([{{{a,1},0},[{a,1}]},{{{b,2},0},[{b,2}]}])),
+    eval(partition_family(Fun3, from_term([[a],[b]])),
+	 from_term([{{[a],0},[[a]]}, {{[b],0},[[b]]}])),
+    partition_family({external, fun(X) -> X end}, E),
 
     F = 0.0, I = round(F),
-    ?line FR = relation([{I,a},{F,b}]),
+    FR = relation([{I,a},{F,b}]),
     if
         F == I -> % term ordering
-            ?line true = (1 =:= no_elements(partition_family(1, FR)));
+            true = (1 =:= no_elements(partition_family(1, FR)));
         true -> 
-            ?line eval(partition_family(1, FR), 
-                       from_term([{I,[{I,a}]},{F,[{F,b}]}]))
+            eval(partition_family(1, FR),
+		 from_term([{I,[{I,a}]},{F,[{F,b}]}]))
     end,
     %% set of sets
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch partition_family({external, fun(X) -> X end}, 
 				from_term([], [[atom]]))),
-    ?line {'EXIT', {badarg, _}} = 
+    {'EXIT', {badarg, _}} =
         (catch partition_family({external, fun(X) -> X end}, 
 				from_term([[a]]))),
-    ?line eval(partition_family(fun sofs:union/1,
-				from_term([[[1],[1,2]], [[1,2]]])),
-	       from_term([{[1,2], [[[1],[1,2]],[[1,2]]]}])),
-    ?line eval(partition_family(fun(X) -> X end, 
-				from_term([[1],[1,2],[1,2,3]])),
-	       from_term([{[1],[[1]]},{[1,2],[[1,2]]},{[1,2,3],[[1,2,3]]}])),
-
-    ?line eval(partition_family(fun(_) -> from_term([a]) end, 
-                                from_term([], [[atom]])),
-	       E),
+    eval(partition_family(fun sofs:union/1,
+			  from_term([[[1],[1,2]], [[1,2]]])),
+	 from_term([{[1,2], [[[1],[1,2]],[[1,2]]]}])),
+    eval(partition_family(fun(X) -> X end,
+			  from_term([[1],[1,2],[1,2,3]])),
+	 from_term([{[1],[[1]]},{[1,2],[[1,2]]},{[1,2,3],[[1,2,3]]}])),
+
+    eval(partition_family(fun(_) -> from_term([a]) end,
+			  from_term([], [[atom]])),
+	 E),
     Fun10 = fun(S) ->
-                   %% Cheating a lot...
-                   case to_external(S) of
-                       [1] -> from_term({1,1});
-                       _ -> S
-                   end
-           end,
+		    %% Cheating a lot...
+		    case to_external(S) of
+			[1] -> from_term({1,1});
+			_ -> S
+		    end
+	    end,
 
-    ?line eval(partition_family(Fun10, from_term([[1]])),
-	       from_term([{{1,1},[[1]]}])),
-    ?line eval(partition_family(fun(_) -> from_term({a}) end, 
-                                from_term([[a]])),
-	       from_term([{{a},[[a]]}])),
-    ?line {'EXIT', {badarg, _}} = 
-         (catch partition_family(fun(_) -> {a} end, from_term([[a]]))),
+    eval(partition_family(Fun10, from_term([[1]])),
+	 from_term([{{1,1},[[1]]}])),
+    eval(partition_family(fun(_) -> from_term({a}) end,
+			  from_term([[a]])),
+	 from_term([{{a},[[a]]}])),
+    {'EXIT', {badarg, _}} =
+	(catch partition_family(fun(_) -> {a} end, from_term([[a]]))),
     ok.
 
 %% Not meant to be efficient...
diff --git a/lib/stdlib/test/stdlib_SUITE.erl b/lib/stdlib/test/stdlib_SUITE.erl
index a586729b30..f7064c4169 100644
--- a/lib/stdlib/test/stdlib_SUITE.erl
+++ b/lib/stdlib/test/stdlib_SUITE.erl
@@ -21,7 +21,7 @@
 %%% Purpose:Stdlib application test suite.
 %%%-----------------------------------------------------------------
 -module(stdlib_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -compile(export_all).
 
@@ -31,10 +31,7 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [app_test, appup_test, assert_test, {group,upgrade}].
-
-groups() -> 
-    [{upgrade,[minor_upgrade,major_upgrade]}].
+    [app_test, appup_test, assert_test].
 
 init_per_suite(Config) ->
     Config.
@@ -42,13 +39,9 @@ init_per_suite(Config) ->
 end_per_suite(_Config) ->
     ok.
 
-init_per_group(upgrade, Config) ->
-    ct_release_test:init(Config);
 init_per_group(_GroupName, Config) ->
     Config.
 
-end_per_group(upgrade, Config) ->
-    ct_release_test:cleanup(Config);
 end_per_group(_GroupName, Config) ->
     Config.
 
@@ -58,15 +51,12 @@ init_per_testcase(_Case, Config) ->
 end_per_testcase(_Case, _Config) ->
     ok.
 
-%
-% Test cases starts here.
-%
-app_test(suite) ->
-    [];
-app_test(doc) ->
-    ["Application consistency test."];
+%%
+%% Test cases starts here.
+%%
+%% Application consistency test.
 app_test(Config) when is_list(Config) ->
-    ?t:app_test(stdlib),
+    test_server:app_test(stdlib),
     ok.
 
 %% Test that appup allows upgrade from/downgrade to a maximum of one
@@ -165,35 +155,10 @@ check_appup([],_,_) ->
     ok.
 
 
-minor_upgrade(Config) ->
-    ct_release_test:upgrade(stdlib,minor,{?MODULE,[]},Config).
-
-major_upgrade(Config) ->
-    ct_release_test:upgrade(stdlib,major,{?MODULE,[]},Config).
-
-%% Version numbers are checked by ct_release_test, so there is nothing
-%% more to check here...
-upgrade_init(CtData,State) ->
-    {ok,{FromVsn,ToVsn}} = ct_release_test:get_app_vsns(CtData,stdlib),
-    case ct_release_test:get_appup(CtData,stdlib) of
-	{ok,{FromVsn,ToVsn,[restart_new_emulator],[restart_new_emulator]}} ->
-	    io:format("Upgrade/downgrade ~p <--> ~p",[FromVsn,ToVsn]);
-	{error,{vsn_not_found,_}} when FromVsn==ToVsn ->
-	    io:format("No upgrade test for stdlib, same version")
-    end,
-    State.
-upgrade_upgraded(_CtData,State) ->
-    State.
-upgrade_downgraded(_CtData,State) ->
-    State.
-
-
 -include_lib("stdlib/include/assert.hrl").
 -include_lib("stdlib/include/assert.hrl"). % test repeated inclusion
-assert_test(suite) ->
-    [];
-assert_test(doc) ->
-    ["Assert macros test."];
+
+%% Assert macros test.
 assert_test(_Config) ->
     ok = ?assert(true),
     {'EXIT',{{assert, _},_}} = (catch ?assert(false)),
diff --git a/lib/stdlib/test/string_SUITE.erl b/lib/stdlib/test/string_SUITE.erl
index 53eea6f180..b5d221732e 100644
--- a/lib/stdlib/test/string_SUITE.erl
+++ b/lib/stdlib/test/string_SUITE.erl
@@ -21,28 +21,24 @@
 %%% Purpose: string test suite.
 %%%-----------------------------------------------------------------
 -module(string_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
-
-% Test server specific exports
+%% 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([init_per_testcase/2, end_per_testcase/2]).
 
-% Test cases must be exported.
+%% Test cases must be exported.
 -export([len/1,equal/1,concat/1,chr_rchr/1,str_rstr/1]).
 -export([span_cspan/1,substr/1,tokens/1,chars/1]).
 -export([copies/1,words/1,strip/1,sub_word/1,left_right/1]).
 -export([sub_string/1,centre/1, join/1]).
 -export([to_integer/1,to_float/1]).
 -export([to_upper_to_lower/1]).
-%%
-%% all/1
-%%
-suite() -> [{ct_hooks,[ts_install_cth]}].
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [len, equal, concat, chr_rchr, str_rstr, span_cspan,
@@ -67,155 +63,125 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+
+end_per_testcase(_Case, _Config) ->
     ok.
 
-%
-% Test cases starts here.
-%
+%%
+%% Test cases starts here.
+%%
 
-len(suite) ->
-    [];
-len(doc) ->
-    [];
 len(Config) when is_list(Config) ->
-    ?line 0 = string:len(""),
-    ?line L = tuple_size(list_to_tuple(atom_to_list(?MODULE))),
-    ?line L = string:len(atom_to_list(?MODULE)),
+    0 = string:len(""),
+    L = tuple_size(list_to_tuple(atom_to_list(?MODULE))),
+    L = string:len(atom_to_list(?MODULE)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:len({})),
+    {'EXIT',_} = (catch string:len({})),
     ok.
 
-equal(suite) ->
-    [];
-equal(doc) ->
-    [];
 equal(Config) when is_list(Config) ->
-    ?line true = string:equal("", ""),
-    ?line false = string:equal("", " "),
-    ?line true = string:equal("laban", "laban"),
-    ?line false = string:equal("skvimp", "skvump"),
+    true = string:equal("", ""),
+    false = string:equal("", " "),
+    true = string:equal("laban", "laban"),
+    false = string:equal("skvimp", "skvump"),
     %% invalid arg type
-    ?line true = string:equal(2, 2),			% not good, should crash
+    true = string:equal(2, 2),			% not good, should crash
     ok.
 
-concat(suite) ->
-    [];
-concat(doc) ->
-    [];
 concat(Config) when is_list(Config) ->
-    ?line "erlang rules" = string:concat("erlang ", "rules"),
-    ?line "" = string:concat("", ""),
-    ?line "x" = string:concat("x", ""),
-    ?line "y" = string:concat("", "y"),
+    "erlang rules" = string:concat("erlang ", "rules"),
+    "" = string:concat("", ""),
+    "x" = string:concat("x", ""),
+    "y" = string:concat("", "y"),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:concat(hello, please)),
+    {'EXIT',_} = (catch string:concat(hello, please)),
     ok.
 
-chr_rchr(suite) ->
-    [];
-chr_rchr(doc) ->
-    [];
 chr_rchr(Config) when is_list(Config) ->
     {_,_,X} = erlang:timestamp(),
-    ?line 0 = string:chr("", (X rem (255-32)) + 32),
-    ?line 0 = string:rchr("", (X rem (255-32)) + 32),
-    ?line 1 = string:chr("x", $x),
-    ?line 1 = string:rchr("x", $x),
-    ?line 1 = string:chr("xx", $x),
-    ?line 2 = string:rchr("xx", $x),
-    ?line 3 = string:chr("xyzyx", $z),
-    ?line 3 = string:rchr("xyzyx", $z),
+    0 = string:chr("", (X rem (255-32)) + 32),
+    0 = string:rchr("", (X rem (255-32)) + 32),
+    1 = string:chr("x", $x),
+    1 = string:rchr("x", $x),
+    1 = string:chr("xx", $x),
+    2 = string:rchr("xx", $x),
+    3 = string:chr("xyzyx", $z),
+    3 = string:rchr("xyzyx", $z),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:chr(hello, $h)),
+    {'EXIT',_} = (catch string:chr(hello, $h)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:chr("hello", h)),
+    {'EXIT',_} = (catch string:chr("hello", h)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:rchr(hello, $h)),
+    {'EXIT',_} = (catch string:rchr(hello, $h)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:rchr("hello", h)),
+    {'EXIT',_} = (catch string:rchr("hello", h)),
     ok.
 
-str_rstr(suite) ->
-    [];
-str_rstr(doc) ->
-    [];
 str_rstr(Config) when is_list(Config) ->
     {_,_,X} = erlang:timestamp(),
-    ?line 0 = string:str("", [(X rem (255-32)) + 32]),
-    ?line 0 = string:rstr("", [(X rem (255-32)) + 32]),
-    ?line 1 = string:str("x", "x"),
-    ?line 1 = string:rstr("x", "x"),
-    ?line 0 = string:str("hello", ""),
-    ?line 0 = string:rstr("hello", ""),
-    ?line 1 = string:str("xxxx", "xx"),
-    ?line 3 = string:rstr("xxxx", "xx"),
-    ?line 3 = string:str("xy z yx", " z"),
-    ?line 3 = string:rstr("xy z yx", " z"),
+    0 = string:str("", [(X rem (255-32)) + 32]),
+    0 = string:rstr("", [(X rem (255-32)) + 32]),
+    1 = string:str("x", "x"),
+    1 = string:rstr("x", "x"),
+    0 = string:str("hello", ""),
+    0 = string:rstr("hello", ""),
+    1 = string:str("xxxx", "xx"),
+    3 = string:rstr("xxxx", "xx"),
+    3 = string:str("xy z yx", " z"),
+    3 = string:rstr("xy z yx", " z"),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:str(hello, "he")),
+    {'EXIT',_} = (catch string:str(hello, "he")),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:str("hello", he)),
+    {'EXIT',_} = (catch string:str("hello", he)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:rstr(hello, "he")),
+    {'EXIT',_} = (catch string:rstr(hello, "he")),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:rstr("hello", he)),
+    {'EXIT',_} = (catch string:rstr("hello", he)),
     ok.
 
-span_cspan(suite) ->
-    [];
-span_cspan(doc) ->
-    [];
 span_cspan(Config) when is_list(Config) ->
-    ?line 0 = string:span("", "1"),
-    ?line 0 = string:span("1", ""),
-    ?line 0 = string:cspan("", "1"),
-    ?line 1 = string:cspan("1", ""),
-    ?line 1 = string:span("1  ", "1"),
-    ?line 5 = string:span("  1  ", "12 "),
-    ?line 6 = string:span("1231234", "123"),
-    ?line 0 = string:cspan("1  ", "1"),
-    ?line 1 = string:cspan("3 ", "12 "),
-    ?line 6 = string:cspan("1231234", "4"),
+    0 = string:span("", "1"),
+    0 = string:span("1", ""),
+    0 = string:cspan("", "1"),
+    1 = string:cspan("1", ""),
+    1 = string:span("1  ", "1"),
+    5 = string:span("  1  ", "12 "),
+    6 = string:span("1231234", "123"),
+    0 = string:cspan("1  ", "1"),
+    1 = string:cspan("3 ", "12 "),
+    6 = string:cspan("1231234", "4"),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:span(1234, "1")),
+    {'EXIT',_} = (catch string:span(1234, "1")),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:span(1234, "1")),
+    {'EXIT',_} = (catch string:span(1234, "1")),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:cspan("1234", 1)),
+    {'EXIT',_} = (catch string:cspan("1234", 1)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:cspan("1234", 4)),
+    {'EXIT',_} = (catch string:cspan("1234", 4)),
     ok.
 
 
-substr(suite) ->
-    [];
-substr(doc) ->
-    [];
 substr(Config) when is_list(Config) ->
-    ?line {'EXIT',_} = (catch string:substr("", 0)), 
-    ?line [] = string:substr("", 1), 
-    ?line {'EXIT',_} = (catch string:substr("", 2)), 
-    ?line [] = string:substr("1", 2), 
-    ?line {'EXIT',_} = (catch  string:substr("", 0, 1)), 
-    ?line [] = string:substr("", 1, 1), 
-    ?line [] = string:substr("", 1, 2), 
-    ?line {'EXIT',_} = (catch string:substr("", 2, 2)),
-    ?line "1234" = string:substr("1234", 1), 
-    ?line "1234" = string:substr("1234", 1, 4), 
-    ?line "1234" = string:substr("1234", 1, 5), 
-    ?line "23" = string:substr("1234", 2, 2), 
-    ?line "4" = string:substr("1234", 4), 
-    ?line "" = string:substr("1234", 4, 0), 
-    ?line "4" = string:substr("1234", 4, 1), 
-    %% invalid arg type
-    ?line {'EXIT',_} = (catch string:substr(1234, 1)),
-    %% invalid arg type
-    ?line {'EXIT',_} = (catch string:substr("1234", "1")),
+    {'EXIT',_} = (catch string:substr("", 0)),
+    [] = string:substr("", 1),
+    {'EXIT',_} = (catch string:substr("", 2)),
+    [] = string:substr("1", 2),
+    {'EXIT',_} = (catch  string:substr("", 0, 1)),
+    [] = string:substr("", 1, 1),
+    [] = string:substr("", 1, 2),
+    {'EXIT',_} = (catch string:substr("", 2, 2)),
+    "1234" = string:substr("1234", 1),
+    "1234" = string:substr("1234", 1, 4),
+    "1234" = string:substr("1234", 1, 5),
+    "23" = string:substr("1234", 2, 2),
+    "4" = string:substr("1234", 4),
+    "" = string:substr("1234", 4, 0),
+    "4" = string:substr("1234", 4, 1),
+    %% invalid arg type
+    {'EXIT',_} = (catch string:substr(1234, 1)),
+    %% invalid arg type
+    {'EXIT',_} = (catch string:substr("1234", "1")),
     ok.
 
 tokens(Config) when is_list(Config) ->
@@ -252,261 +218,217 @@ replace_sep(C, Seps, New) ->
 	false -> C
     end.
 
-chars(suite) ->
-    [];
-chars(doc) ->
-    [];
 chars(Config) when is_list(Config) ->
-    ?line [] = string:chars($., 0),
-    ?line [] = string:chars($., 0, []),
-    ?line 10 = length(string:chars(32, 10, [])),
-    ?line "aaargh" = string:chars($a, 3, "rgh"),
+    [] = string:chars($., 0),
+    [] = string:chars($., 0, []),
+    10 = length(string:chars(32, 10, [])),
+    "aaargh" = string:chars($a, 3, "rgh"),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:chars($x, [])),
+    {'EXIT',_} = (catch string:chars($x, [])),
     ok.
 
-copies(suite) ->
-    [];
-copies(doc) ->
-    [];
 copies(Config) when is_list(Config) ->
-    ?line "" = string:copies("", 10),
-    ?line "" = string:copies(".", 0),
-    ?line "." = string:copies(".", 1),
-    ?line 30 = length(string:copies("123", 10)),
+    "" = string:copies("", 10),
+    "" = string:copies(".", 0),
+    "." = string:copies(".", 1),
+    30 = length(string:copies("123", 10)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:copies("hej", -1)),
-    ?line {'EXIT',_} = (catch string:copies("hej", 2.0)),
+    {'EXIT',_} = (catch string:copies("hej", -1)),
+    {'EXIT',_} = (catch string:copies("hej", 2.0)),
     ok.
 
-words(suite) ->
-    [];
-words(doc) ->
-    [];
 words(Config) when is_list(Config) ->
-    ?line 1 = string:words(""),
-    ?line 1 = string:words("", $,),
-    ?line 1 = string:words("hello"),
-    ?line 1 = string:words("hello", $,),
-    ?line 1 = string:words("...", $.),
-    ?line 2 = string:words("2.35", $.),
-    ?line 100 = string:words(string:copies(". ", 100)),
+    1 = string:words(""),
+    1 = string:words("", $,),
+    1 = string:words("hello"),
+    1 = string:words("hello", $,),
+    1 = string:words("...", $.),
+    2 = string:words("2.35", $.),
+    100 = string:words(string:copies(". ", 100)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:chars(hej, 1)),
+    {'EXIT',_} = (catch string:chars(hej, 1)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:chars("hej", 1, " ")),
+    {'EXIT',_} = (catch string:chars("hej", 1, " ")),
     ok.
 
 
-strip(suite) ->
-    [];
-strip(doc) ->
-    [];
 strip(Config) when is_list(Config) ->
-    ?line "" = string:strip(""),
-    ?line "" = string:strip("", both),  
-    ?line "" = string:strip("", both, $.),  
-    ?line "hej" = string:strip("  hej  "),  
-    ?line "hej  " = string:strip("  hej  ", left),
-    ?line "  hej" = string:strip("  hej  ", right),
-    ?line "  hej  " = string:strip("  hej  ", right, $.),
-    ?line "hej  hopp" = string:strip("  hej  hopp  ", both),
+    "" = string:strip(""),
+    "" = string:strip("", both),
+    "" = string:strip("", both, $.),
+    "hej" = string:strip("  hej  "),
+    "hej  " = string:strip("  hej  ", left),
+    "  hej" = string:strip("  hej  ", right),
+    "  hej  " = string:strip("  hej  ", right, $.),
+    "hej  hopp" = string:strip("  hej  hopp  ", both),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:strip(hej)),
+    {'EXIT',_} = (catch string:strip(hej)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:strip(" hej", up)),
+    {'EXIT',_} = (catch string:strip(" hej", up)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:strip(" hej", left, " ")),	% not good
+    {'EXIT',_} = (catch string:strip(" hej", left, " ")),	% not good
     ok.
 
-sub_word(suite) ->
-    [];
-sub_word(doc) ->
-    [];
 sub_word(Config) when is_list(Config) ->
-    ?line "" = string:sub_word("", 1),
-    ?line "" = string:sub_word("", 1, $,),
-    ?line {'EXIT',_} = (catch string:sub_word("1 2 3", 0)),
-    ?line "" = string:sub_word("1 2 3", 4),
-    ?line "llo th" = string:sub_word("but hello there", 2, $e),
+    "" = string:sub_word("", 1),
+    "" = string:sub_word("", 1, $,),
+    {'EXIT',_} = (catch string:sub_word("1 2 3", 0)),
+    "" = string:sub_word("1 2 3", 4),
+    "llo th" = string:sub_word("but hello there", 2, $e),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:sub_word('hello there', 1)),
+    {'EXIT',_} = (catch string:sub_word('hello there', 1)),
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:sub_word("hello there", 1, "e")),
+    {'EXIT',_} = (catch string:sub_word("hello there", 1, "e")),
     ok.
 
-left_right(suite) ->
-    [];
-left_right(doc) ->
-    [];
 left_right(Config) when is_list(Config) ->
-    ?line "" = string:left("", 0),
-    ?line "" = string:left("hej", 0),
-    ?line "" = string:left("hej", 0, $.),
-    ?line "" = string:right("", 0),
-    ?line "" = string:right("hej", 0),
-    ?line "" = string:right("hej", 0, $.),
-    ?line "123  " = string:left("123 ", 5),
-    ?line "  123" = string:right(" 123", 5),
-    ?line "123!!" = string:left("123!", 5, $!),
-    ?line "==123" = string:right("=123", 5, $=),
-    ?line "1" = string:left("123", 1, $.),
-    ?line "3" = string:right("123", 1, $.),
-    %% invalid arg type
-    ?line {'EXIT',_} = (catch string:left(hello, 5)),
-    %% invalid arg type
-    ?line {'EXIT',_} = (catch string:right(hello, 5)),
-    %% invalid arg type
-    ?line {'EXIT',_} = (catch string:left("hello", 5, ".")),
-    %% invalid arg type
-    ?line {'EXIT',_} = (catch string:right("hello", 5, ".")),
+    "" = string:left("", 0),
+    "" = string:left("hej", 0),
+    "" = string:left("hej", 0, $.),
+    "" = string:right("", 0),
+    "" = string:right("hej", 0),
+    "" = string:right("hej", 0, $.),
+    "123  " = string:left("123 ", 5),
+    "  123" = string:right(" 123", 5),
+    "123!!" = string:left("123!", 5, $!),
+    "==123" = string:right("=123", 5, $=),
+    "1" = string:left("123", 1, $.),
+    "3" = string:right("123", 1, $.),
+    %% invalid arg type
+    {'EXIT',_} = (catch string:left(hello, 5)),
+    %% invalid arg type
+    {'EXIT',_} = (catch string:right(hello, 5)),
+    %% invalid arg type
+    {'EXIT',_} = (catch string:left("hello", 5, ".")),
+    %% invalid arg type
+    {'EXIT',_} = (catch string:right("hello", 5, ".")),
     ok.
 
-sub_string(suite) ->
-    [];
-sub_string(doc) ->
-    [];
 sub_string(Config) when is_list(Config) ->
-    ?line {'EXIT',_} = (catch string:sub_string("", 0)), 
-    ?line [] = string:sub_string("", 1), 
-    ?line {'EXIT',_} = (catch string:sub_string("", 2)), 
-    ?line [] = string:sub_string("1", 2), 
-    ?line {'EXIT',_} = (catch string:sub_string("", 0, 1)), 
-    ?line [] = string:sub_string("", 1, 1), 
-    ?line [] = string:sub_string("", 1, 2), 
-    ?line {'EXIT',_} = (catch string:sub_string("", 2, 2)),
-    ?line "1234" = string:sub_string("1234", 1), 
-    ?line "1234" = string:sub_string("1234", 1, 4), 
-    ?line "1234" = string:sub_string("1234", 1, 5), 
-    ?line "23" = string:sub_string("1234", 2, 3), 
-    ?line "4" = string:sub_string("1234", 4), 
-    ?line "4" = string:sub_string("1234", 4, 4), 
-    ?line "4" = string:sub_string("1234", 4, 5), 
-    %% invalid arg type
-    ?line {'EXIT',_} = (catch string:sub_string(1234, 1)),
-    %% invalid arg type
-    ?line {'EXIT',_} = (catch string:sub_string("1234", "1")),
+    {'EXIT',_} = (catch string:sub_string("", 0)),
+    [] = string:sub_string("", 1),
+    {'EXIT',_} = (catch string:sub_string("", 2)),
+    [] = string:sub_string("1", 2),
+    {'EXIT',_} = (catch string:sub_string("", 0, 1)),
+    [] = string:sub_string("", 1, 1),
+    [] = string:sub_string("", 1, 2),
+    {'EXIT',_} = (catch string:sub_string("", 2, 2)),
+    "1234" = string:sub_string("1234", 1),
+    "1234" = string:sub_string("1234", 1, 4),
+    "1234" = string:sub_string("1234", 1, 5),
+    "23" = string:sub_string("1234", 2, 3),
+    "4" = string:sub_string("1234", 4),
+    "4" = string:sub_string("1234", 4, 4),
+    "4" = string:sub_string("1234", 4, 5),
+    %% invalid arg type
+    {'EXIT',_} = (catch string:sub_string(1234, 1)),
+    %% invalid arg type
+    {'EXIT',_} = (catch string:sub_string("1234", "1")),
     ok.
 
-centre(suite) ->
-    [];
-centre(doc) ->
-    [];
 centre(Config) when is_list(Config) ->
-    ?line "" = string:centre("", 0),
-    ?line "" = string:centre("1", 0),
-    ?line "" = string:centre("", 0, $-),
-    ?line "" = string:centre("1", 0, $-),
-    ?line "gd" = string:centre("agda", 2),
-    ?line "agda " = string:centre("agda", 5),
-    ?line " agda " = string:centre("agda", 6),
-    ?line "agda." = string:centre("agda", 5, $.),
-    ?line "--agda--" = string:centre("agda", 8, $-),
-    ?line "agda" = string:centre("agda", 4),
-    %% invalid arg type
-    ?line {'EXIT',_} = (catch string:centre(hello, 10)),
+    "" = string:centre("", 0),
+    "" = string:centre("1", 0),
+    "" = string:centre("", 0, $-),
+    "" = string:centre("1", 0, $-),
+    "gd" = string:centre("agda", 2),
+    "agda " = string:centre("agda", 5),
+    " agda " = string:centre("agda", 6),
+    "agda." = string:centre("agda", 5, $.),
+    "--agda--" = string:centre("agda", 8, $-),
+    "agda" = string:centre("agda", 4),
+    %% invalid arg type
+    {'EXIT',_} = (catch string:centre(hello, 10)),
     ok.
 
-to_integer(suite) ->
-    [];
-to_integer(doc) ->
-    [];
 to_integer(Config) when is_list(Config) ->
-    ?line {1,""} = test_to_integer("1"),
-    ?line {1,""} = test_to_integer("+1"),
-    ?line {-1,""} = test_to_integer("-1"),
-    ?line {1,"="} = test_to_integer("1="),
-    ?line {7,"F"} = test_to_integer("7F"),
-    ?line {709,""} = test_to_integer("709"),
-    ?line {709,"*2"} = test_to_integer("709*2"),
-    ?line {0,"xAB"} = test_to_integer("0xAB"),
-    ?line {16,"#FF"} = test_to_integer("16#FF"),
-    ?line {error,no_integer} = test_to_integer(""),
-    ?line {error,no_integer} = test_to_integer("!1"),
-    ?line {error,no_integer} = test_to_integer("F1"),
-    ?line {error,not_a_list} = test_to_integer('23'),
-    ?line {3,[[]]} = test_to_integer([$3,[]]),
-    ?line {3,[hello]} = test_to_integer([$3,hello]),
+    {1,""} = test_to_integer("1"),
+    {1,""} = test_to_integer("+1"),
+    {-1,""} = test_to_integer("-1"),
+    {1,"="} = test_to_integer("1="),
+    {7,"F"} = test_to_integer("7F"),
+    {709,""} = test_to_integer("709"),
+    {709,"*2"} = test_to_integer("709*2"),
+    {0,"xAB"} = test_to_integer("0xAB"),
+    {16,"#FF"} = test_to_integer("16#FF"),
+    {error,no_integer} = test_to_integer(""),
+    {error,no_integer} = test_to_integer("!1"),
+    {error,no_integer} = test_to_integer("F1"),
+    {error,not_a_list} = test_to_integer('23'),
+    {3,[[]]} = test_to_integer([$3,[]]),
+    {3,[hello]} = test_to_integer([$3,hello]),
     ok.
 
 test_to_integer(Str) ->
     io:format("Checking ~p~n", [Str]),
     case string:to_integer(Str) of
 	{error,_Reason} = Bad ->
-	    ?line {'EXIT',_} = (catch list_to_integer(Str)),
+	    {'EXIT',_} = (catch list_to_integer(Str)),
 	    Bad;
 	{F,_Rest} = Res ->
-	    ?line _ = integer_to_list(F),
+	    _ = integer_to_list(F),
 	    Res
     end.
 
-to_float(suite) ->
-    [];
-to_float(doc) ->
-    [];
 to_float(Config) when is_list(Config) ->
-    ?line {1.2,""} = test_to_float("1.2"),
-    ?line {1.2,""} = test_to_float("1,2"),
-    ?line {120.0,""} = test_to_float("1.2e2"),
-    ?line {120.0,""} = test_to_float("+1,2e2"),
-    ?line {-120.0,""} = test_to_float("-1.2e2"),
-    ?line {-120.0,""} = test_to_float("-1,2e+2"),
-    ?line {-1.2e-2,""} = test_to_float("-1.2e-2"),
-    ?line {1.2,"="} = test_to_float("1.2="),
-    ?line {7.9,"e"} = test_to_float("7.9e"),
-    ?line {7.9,"ee"} = test_to_float("7.9ee"),
-    ?line {7.9,"e+"} = test_to_float("7.9e+"),
-    ?line {7.9,"e-"} = test_to_float("7.9e-"),
-    ?line {7.9,"e++"} = test_to_float("7.9e++"),
-    ?line {7.9,"e--"} = test_to_float("7.9e--"),
-    ?line {7.9,"e+e"} = test_to_float("7.9e+e"),
-    ?line {7.9,"e-e"} = test_to_float("7.9e-e"),
-    ?line {7.9,"e+."} = test_to_float("7.9e+."),
-    ?line {7.9,"e-."} = test_to_float("7.9e-."),
-    ?line {7.9,"e+,"} = test_to_float("7.9e+,"),
-    ?line {7.9,"e-,"} = test_to_float("7.9e-,"),
-    ?line {error,no_float} = test_to_float(""),
-    ?line {error,no_float} = test_to_float("e1,0"),
-    ?line {error,no_float} = test_to_float("1;0"),
-    ?line {error,no_float} = test_to_float("1"),
-    ?line {error,no_float} = test_to_float("1e"),
-    ?line {error,no_float} = test_to_float("2."),
-    ?line {error,not_a_list} = test_to_float('2.3'),
-    ?line {2.3,[[]]} = test_to_float([$2,$.,$3,[]]),
-    ?line {2.3,[hello]} = test_to_float([$2,$.,$3,hello]),
+    {1.2,""} = test_to_float("1.2"),
+    {1.2,""} = test_to_float("1,2"),
+    {120.0,""} = test_to_float("1.2e2"),
+    {120.0,""} = test_to_float("+1,2e2"),
+    {-120.0,""} = test_to_float("-1.2e2"),
+    {-120.0,""} = test_to_float("-1,2e+2"),
+    {-1.2e-2,""} = test_to_float("-1.2e-2"),
+    {1.2,"="} = test_to_float("1.2="),
+    {7.9,"e"} = test_to_float("7.9e"),
+    {7.9,"ee"} = test_to_float("7.9ee"),
+    {7.9,"e+"} = test_to_float("7.9e+"),
+    {7.9,"e-"} = test_to_float("7.9e-"),
+    {7.9,"e++"} = test_to_float("7.9e++"),
+    {7.9,"e--"} = test_to_float("7.9e--"),
+    {7.9,"e+e"} = test_to_float("7.9e+e"),
+    {7.9,"e-e"} = test_to_float("7.9e-e"),
+    {7.9,"e+."} = test_to_float("7.9e+."),
+    {7.9,"e-."} = test_to_float("7.9e-."),
+    {7.9,"e+,"} = test_to_float("7.9e+,"),
+    {7.9,"e-,"} = test_to_float("7.9e-,"),
+    {error,no_float} = test_to_float(""),
+    {error,no_float} = test_to_float("e1,0"),
+    {error,no_float} = test_to_float("1;0"),
+    {error,no_float} = test_to_float("1"),
+    {error,no_float} = test_to_float("1e"),
+    {error,no_float} = test_to_float("2."),
+    {error,not_a_list} = test_to_float('2.3'),
+    {2.3,[[]]} = test_to_float([$2,$.,$3,[]]),
+    {2.3,[hello]} = test_to_float([$2,$.,$3,hello]),
     ok.
 
 test_to_float(Str) ->
     io:format("Checking ~p~n", [Str]),
     case string:to_float(Str) of
 	{error,_Reason} = Bad ->
-	    ?line {'EXIT',_} = (catch list_to_float(Str)),
+	    {'EXIT',_} = (catch list_to_float(Str)),
 	    Bad;
 	{F,_Rest} = Res ->
-	    ?line _ = float_to_list(F),
+	    _ = float_to_list(F),
 	    Res
     end.
-	    
-to_upper_to_lower(suite) ->
-    [];
-to_upper_to_lower(doc) ->
-    [];
+
 to_upper_to_lower(Config) when is_list(Config) ->
-    ?line "1234ABCDEFÅÄÖ=" = string:to_upper("1234abcdefåäö="),
-    ?line "éèíúùòóåäöabc()" = string:to_lower("ÉÈÍÚÙÒÓÅÄÖabc()"),
-    ?line All = lists:seq(0, 255),
+    "1234ABCDEFÅÄÖ=" = string:to_upper("1234abcdefåäö="),
+    "éèíúùòóåäöabc()" = string:to_lower("ÉÈÍÚÙÒÓÅÄÖabc()"),
+    All = lists:seq(0, 255),
 
-    ?line UC = string:to_upper(All),
-    ?line 256 = length(UC),
-    ?line all_upper_latin1(UC, 0),
+    UC = string:to_upper(All),
+    256 = length(UC),
+    all_upper_latin1(UC, 0),
 
-    ?line LC = string:to_lower(All),
-    ?line all_lower_latin1(LC, 0),
+    LC = string:to_lower(All),
+    all_lower_latin1(LC, 0),
 
-    ?line LC = string:to_lower(string:to_upper(LC)),
-    ?line LC = string:to_lower(string:to_upper(UC)),
-    ?line UC = string:to_upper(string:to_lower(LC)),
-    ?line UC = string:to_upper(string:to_lower(UC)),
+    LC = string:to_lower(string:to_upper(LC)),
+    LC = string:to_lower(string:to_upper(UC)),
+    UC = string:to_upper(string:to_lower(LC)),
+    UC = string:to_upper(string:to_lower(UC)),
     ok.
 
 all_upper_latin1([C|T], C) when 0 =< C, C < $a;
@@ -533,15 +455,11 @@ all_lower_latin1([H|T], C) when $A =< C, C =< $Z;
     all_lower_latin1(T, C+1);
 all_lower_latin1([], 256) -> ok.
 
-join(suite) ->
-    [];
-join(doc) ->
-    [];
 join(Config) when is_list(Config) ->
-    ?line "erlang rules" = string:join(["erlang", "rules"], " "),
-    ?line "a,-,b,-,c" = string:join(["a", "b", "c"], ",-,"),
-    ?line "1234" = string:join(["1", "2", "3", "4"], ""),
-    ?line [] = string:join([], ""), % OTP-7231
+    "erlang rules" = string:join(["erlang", "rules"], " "),
+    "a,-,b,-,c" = string:join(["a", "b", "c"], ",-,"),
+    "1234" = string:join(["1", "2", "3", "4"], ""),
+    [] = string:join([], ""), % OTP-7231
     %% invalid arg type
-    ?line {'EXIT',_} = (catch string:join([apa], "")),
+    {'EXIT',_} = (catch string:join([apa], "")),
     ok.
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl
index 8cb2a5194a..9de5a57e7f 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -22,7 +22,6 @@
 -module(supervisor_SUITE).
 
 -include_lib("common_test/include/ct.hrl").
--define(TIMEOUT, ?t:minutes(1)).
 
 %% Testserver specific export
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -67,6 +66,7 @@
 
 %% Misc tests
 -export([child_unlink/1, tree/1, count_children/1,
+	 count_restarting_children/1,
 	 do_not_save_start_parameters_for_temporary_children/1,
 	 do_not_save_child_specs_for_temporary_children/1,
 	 simple_one_for_one_scale_many_temporary_children/1,
@@ -77,7 +77,8 @@
 %%-------------------------------------------------------------------------
 
 suite() ->
-    [{ct_hooks,[ts_install_cth]}].
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [{group, sup_start}, {group, sup_start_map}, {group, sup_stop}, child_adm,
@@ -90,7 +91,8 @@ all() ->
      {group, normal_termination},
      {group, shutdown_termination},
      {group, abnormal_termination}, child_unlink, tree,
-     count_children, do_not_save_start_parameters_for_temporary_children,
+     count_children, count_restarting_children,
+     do_not_save_start_parameters_for_temporary_children,
      do_not_save_child_specs_for_temporary_children,
      simple_one_for_one_scale_many_temporary_children, temporary_bystander,
      simple_global_supervisor, hanging_restart_loop, hanging_restart_loop_simple,
@@ -142,11 +144,9 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 init_per_testcase(_Case, Config) ->
-    Dog = ?t:timetrap(?TIMEOUT),
-    [{watchdog,Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    ?t:timetrap_cancel(?config(watchdog,Config)),
+end_per_testcase(_Case, _Config) ->
     ok.
 
 start_link(InitResult) ->
@@ -702,7 +702,7 @@ permanent_normal(Config) when is_list(Config) ->
 	true ->
 	    ok;
 	false ->
-	    test_server:fail({permanent_child_not_restarted, Child1})
+	    ct:fail({permanent_child_not_restarted, Child1})
     end,
     [1,1,0,1] = get_child_counts(sup_test).
 
@@ -751,7 +751,7 @@ permanent_shutdown(Config) when is_list(Config) ->
 	true ->
 	    ok;
 	false ->
-	    test_server:fail({permanent_child_not_restarted, Child1})
+	    ct:fail({permanent_child_not_restarted, Child1})
     end,
     [1,1,0,1] = get_child_counts(sup_test),
 
@@ -762,7 +762,7 @@ permanent_shutdown(Config) when is_list(Config) ->
 	true ->
 	    ok;
 	false ->
-	    test_server:fail({permanent_child_not_restarted, Child1})
+	    ct:fail({permanent_child_not_restarted, Child1})
     end,
 
     [1,1,0,1] = get_child_counts(sup_test).
@@ -815,7 +815,7 @@ temporary_shutdown(Config) when is_list(Config) ->
 faulty_application_shutdown(Config) when is_list(Config) ->
 
     %% Set some paths
-    AppDir  = filename:join(?config(data_dir, Config), "app_faulty"),
+    AppDir  = filename:join(proplists:get_value(data_dir, Config), "app_faulty"),
     EbinDir = filename:join(AppDir, "ebin"),
 
     %% Start faulty app
@@ -858,7 +858,7 @@ permanent_abnormal(Config) when is_list(Config) ->
 	true ->
 	    ok;
 	false ->
-	    test_server:fail({permanent_child_not_restarted, Child1})
+	    ct:fail({permanent_child_not_restarted, Child1})
     end,
     [1,1,0,1] = get_child_counts(sup_test).
 
@@ -877,7 +877,7 @@ transient_abnormal(Config) when is_list(Config) ->
 	true ->
 	    ok;
 	false ->
-	    test_server:fail({transient_child_not_restarted, Child1})
+	    ct:fail({transient_child_not_restarted, Child1})
     end,
     [1,1,0,1] = get_child_counts(sup_test).
 
@@ -973,9 +973,9 @@ one_for_one(Config) when is_list(Config) ->
     if length(Children) == 2 ->
 	    case lists:keysearch(CPid2, 2, Children) of
 		{value, _} -> ok;
-		_ ->  test_server:fail(bad_child)
+		_ ->  ct:fail(bad_child)
 	    end;
-       true ->  test_server:fail({bad_child_list, Children})
+       true ->  ct:fail({bad_child_list, Children})
     end,
     [2,2,0,2] = get_child_counts(sup_test),
 
@@ -1026,7 +1026,7 @@ one_for_all(Config) when is_list(Config) ->
     Children = supervisor:which_children(sup_test),
     if length(Children) == 2 -> ok;
        true ->
-	    test_server:fail({bad_child_list, Children})
+	    ct:fail({bad_child_list, Children})
     end,
 
     %% Test that no old children is still alive
@@ -1101,7 +1101,7 @@ one_for_all_other_child_fails_restart(Config) when is_list(Config) ->
 	{_childName, _Pid} ->
 	    exit(SupPid, kill),
 	    check_exit([StarterPid, SupPid]),
-	    test_server:fail({restarting_child_not_terminated, Child1Pid2})
+	    ct:fail({restarting_child_not_terminated, Child1Pid2})
     end,
     %% Let the restart complete.
     Child1Pid3 = receive {child1, Pid5} -> Pid5 end,
@@ -1128,9 +1128,9 @@ simple_one_for_one(Config) when is_list(Config) ->
     if length(Children) == 2 ->
 	    case lists:keysearch(CPid2, 2, Children) of
 		{value, _} -> ok;
-		_ ->  test_server:fail(bad_child)
+		_ ->  ct:fail(bad_child)
 	    end;
-       true ->  test_server:fail({bad_child_list, Children})
+       true ->  ct:fail({bad_child_list, Children})
     end,
     [1,2,0,2] = get_child_counts(sup_test),
 
@@ -1164,9 +1164,9 @@ simple_one_for_one_shutdown(Config) when is_list(Config) ->
     if T < 1000*ShutdownTime ->
             %% Because supervisor's children wait before exiting, it can't
             %% terminate quickly
-            test_server:fail({shutdown_too_short, T});
+            ct:fail({shutdown_too_short, T});
        T >= 1000*5*ShutdownTime ->
-            test_server:fail({shutdown_too_long, T});
+            ct:fail({shutdown_too_long, T});
        true ->
             check_exit([SupPid])
     end.
@@ -1188,9 +1188,9 @@ simple_one_for_one_extra(Config) when is_list(Config) ->
     if length(Children) == 2 ->
 	    case lists:keysearch(CPid2, 2, Children) of
 		{value, _} -> ok;
-		_ ->  test_server:fail(bad_child)
+		_ ->  ct:fail(bad_child)
 	    end;
-       true ->  test_server:fail({bad_child_list, Children})
+       true ->  ct:fail({bad_child_list, Children})
     end,
     [1,2,0,2] = get_child_counts(sup_test),
     terminate(SupPid, CPid2, child2, abnormal),
@@ -1242,7 +1242,7 @@ rest_for_one(Config) when is_list(Config) ->
     if length(Children) == 3 ->
 	    ok;
        true ->
-	    test_server:fail({bad_child_list, Children})
+	    ct:fail({bad_child_list, Children})
     end,
     [3,3,0,3] = get_child_counts(sup_test),
 
@@ -1318,7 +1318,7 @@ rest_for_one_other_child_fails_restart(Config) when is_list(Config) ->
 	{child1, _Child1Pid3} ->
 	    exit(SupPid, kill),
 	    check_exit([StarterPid, SupPid]),
-	    test_server:fail({restarting_started_child, Child1Pid2})
+	    ct:fail({restarting_started_child, Child1Pid2})
     end,
     StarterPid ! {stop, Self},
     check_exit([StarterPid, SupPid]).
@@ -1348,7 +1348,7 @@ child_unlink(Config) when is_list(Config) ->
 	    ok;
 	_ ->
 	    exit(Pid, kill),
-	    test_server:fail(supervisor_hangs)
+	    ct:fail(supervisor_hangs)
     end.
 %%-------------------------------------------------------------------------
 %% Test a basic supervison tree.
@@ -1459,6 +1459,54 @@ count_children(Config) when is_list(Config) ->
     [1,0,0,0] = get_child_counts(sup_test).
 
 %%-------------------------------------------------------------------------
+%% Test count_children when some children are restarting
+count_restarting_children(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    Child = {child, {supervisor_deadlock, start_child_noreg, []},
+	     permanent, brutal_kill, worker, []},
+    %% 2 sek delay on failing restart (see supervisor_deadlock.erl) ->
+    %% MaxR=20, MaxT=10 should ensure a restart loop when starting and
+    %% restarting 3 instances of the child (as below)
+    {ok, SupPid} = start_link({ok, {{simple_one_for_one, 20, 10}, [Child]}}),
+
+    %% Ets table with state read by supervisor_deadlock.erl
+    ets:new(supervisor_deadlock,[set,named_table,public]),
+    ets:insert(supervisor_deadlock,{fail_start,false}),
+
+    [1,0,0,0] = get_child_counts(SupPid),
+    {ok, Ch1_1} = supervisor:start_child(SupPid, []),
+    [1,1,0,1] = get_child_counts(SupPid),
+    {ok, Ch1_2} = supervisor:start_child(SupPid, []),
+    [1,2,0,2] = get_child_counts(SupPid),
+    {ok, Ch1_3} = supervisor:start_child(SupPid, []),
+    [1,3,0,3] = get_child_counts(SupPid),
+
+    supervisor_deadlock:restart_child(Ch1_1),
+    supervisor_deadlock:restart_child(Ch1_2),
+    supervisor_deadlock:restart_child(Ch1_3),
+    ct:sleep(400),
+    [1,3,0,3] = get_child_counts(SupPid),
+    [Ch2_1, Ch2_2, Ch2_3] = [C || {_,C,_,_} <- supervisor:which_children(SupPid)],
+
+    ets:insert(supervisor_deadlock,{fail_start,true}),
+    supervisor_deadlock:restart_child(Ch2_1),
+    supervisor_deadlock:restart_child(Ch2_2),
+    ct:sleep(4000),	   % allow restart to happen before proceeding
+    [1,1,0,3] = get_child_counts(SupPid),
+
+    ets:insert(supervisor_deadlock,{fail_start,false}),
+    ct:sleep(4000),	   % allow restart to happen before proceeding
+    [1,3,0,3] = get_child_counts(SupPid),
+
+    ok = supervisor:terminate_child(SupPid, Ch2_3),
+    [1,2,0,2] = get_child_counts(SupPid),
+    [Ch3_1, Ch3_2] = [C || {_,C,_,_} <- supervisor:which_children(SupPid)],
+    ok = supervisor:terminate_child(SupPid, Ch3_1),
+    [1,1,0,1] = get_child_counts(SupPid),
+    ok = supervisor:terminate_child(SupPid, Ch3_2),
+    [1,0,0,0] = get_child_counts(SupPid).
+
+%%-------------------------------------------------------------------------
 %% Temporary children shall not be restarted so they should not save
 %% start parameters, as it potentially can take up a huge amount of
 %% memory for no purpose.
@@ -1639,7 +1687,7 @@ simple_one_for_one_scale_many_temporary_children(_Config) ->
 		    %% The scaling shoul be linear (i.e.10, really), but we
 		    %% give some extra here to avoid failing the test
 		    %% unecessarily.
-		    ?t:fail({bad_scaling,Scaling});
+		    ct:fail({bad_scaling,Scaling});
 	       true ->
 		    ok
 	    end;
@@ -2068,14 +2116,14 @@ in_child_list([Pid | Rest], Pids) ->
 	true ->
 	    in_child_list(Rest, Pids);
 	false ->
-	    test_server:fail(child_should_be_alive)
+	    ct:fail(child_should_be_alive)
     end.
 not_in_child_list([], _) ->
     true;
 not_in_child_list([Pid | Rest], Pids) ->
     case is_in_child_list(Pid, Pids) of
 	true ->
-	    test_server:fail(child_should_not_be_alive);
+	    ct:fail(child_should_not_be_alive);
 	false ->
 	    not_in_child_list(Rest, Pids)
     end.
@@ -2096,7 +2144,7 @@ check_exit_reason(Reason) ->
 	{'EXIT', _, Reason} ->
 	    ok;
 	{'EXIT', _, Else} ->
-	    test_server:fail({bad_exit_reason, Else})
+	    ct:fail({bad_exit_reason, Else})
     end.
 
 check_exit_reason(Pid, Reason) ->
@@ -2104,5 +2152,5 @@ check_exit_reason(Pid, Reason) ->
 	{'EXIT', Pid, Reason} ->
 	    ok;
 	{'EXIT', Pid, Else} ->
-	    test_server:fail({bad_exit_reason, Else})
+	    ct:fail({bad_exit_reason, Else})
     end.
diff --git a/lib/stdlib/test/supervisor_bridge_SUITE.erl b/lib/stdlib/test/supervisor_bridge_SUITE.erl
index b55fbfaf0d..029cb3fd7f 100644
--- a/lib/stdlib/test/supervisor_bridge_SUITE.erl
+++ b/lib/stdlib/test/supervisor_bridge_SUITE.erl
@@ -24,13 +24,15 @@
          simple_global_supervisor/1]).
 -export([client/1,init/1,internal_loop_init/1,terminate/2,server9212/0]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(bridge_name,supervisor_bridge_SUITE_server).
 -define(work_bridge_name,work_supervisor_bridge_SUITE_server).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
 
 all() -> 
     [starting, mini_terminate, mini_die, badstart, simple_global_supervisor].
@@ -53,33 +55,30 @@ end_per_group(_GroupName, Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-starting(suite) -> [];
 starting(Config) when is_list(Config) ->
     process_flag(trap_exit,true),
 
-    ?line ignore = start(1),
-    ?line {error,testing} = start(2),
+    ignore = start(1),
+    {error,testing} = start(2),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-mini_terminate(suite) -> [];
 mini_terminate(Config) when is_list(Config) ->
     miniappl(1),
     ok.
 
-mini_die(suite) -> [];
 mini_die(Config) when is_list(Config) ->
     miniappl(2),
     ok.
 
 miniappl(N) ->
     process_flag(trap_exit,true),
-    ?line {ok,Server} = start(3),
-    ?line Client = spawn_link(?MODULE,client,[N]),
-    ?line Handle = test_server:timetrap(2000),
-    ?line miniappl_loop(Client,Server),
-    ?line test_server:timetrap_cancel(Handle).
+    {ok,Server} = start(3),
+    Client = spawn_link(?MODULE,client,[N]),
+    ct:timetrap({seconds,2}),
+    miniappl_loop(Client, Server).
+
 
 miniappl_loop([],[]) ->
     ok;
@@ -87,19 +86,19 @@ miniappl_loop(Client,Server) ->
     io:format("Client ~p, Server ~p\n",[Client,Server]),
     receive
 	{'EXIT',Client,_} ->
-	    ?line miniappl_loop([],Server);
+	    miniappl_loop([],Server);
 	{'EXIT',Server,killed} -> %% terminate
-	    ?line miniappl_loop(Client,[]);
+	    miniappl_loop(Client,[]);
 	{'EXIT',Server,died} -> %% die
-	    ?line miniappl_loop(Client,[]);
+	    miniappl_loop(Client,[]);
 	{dying,_Reason} ->
-	    ?line miniappl_loop(Client, Server);
+	    miniappl_loop(Client, Server);
 	Other ->
-	    ?line exit({failed,Other})
+	    exit({failed,Other})
     end.
 
 %%%%%%%%%%%%%%%%%%%%
-% Client
+%% Client
 
 client(N) ->
     io:format("Client starting...\n"),
@@ -112,7 +111,7 @@ client(N) ->
     exit(fine).
 
 %%%%%%%%%%%%%%%%%%%%
-% Non compliant server
+%% Non compliant server
 
 start(N) ->
     supervisor_bridge:start_link({local,?bridge_name},?MODULE,N).
@@ -170,45 +169,44 @@ terminate(_Reason, _State) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-badstart(suite) -> [];
-badstart(doc) -> "Test various bad ways of starting a supervisor bridge.";
+%% Test various bad ways of starting a supervisor bridge.
 badstart(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(1)),
-
     %% Various bad arguments.
 
-    ?line {'EXIT',_} =
+    {'EXIT',_} =
 	(catch supervisor_bridge:start_link({xxx,?bridge_name},?MODULE,1)),
-    ?line {'EXIT',_} =
+    {'EXIT',_} =
 	(catch supervisor_bridge:start_link({local,"foo"},?MODULE,1)),
-    ?line {'EXIT',_} =
+    {'EXIT',_} =
 	(catch supervisor_bridge:start_link(?bridge_name,?MODULE,1)),
-    ?line [] = test_server:messages_get(),	% No messages waiting
+    receive
+	Msg ->
+	    ct:fail({unexpected,Msg})
+    after 1 ->
+	    ok
+    end,
 
     %% Already started.
 
-    ?line process_flag(trap_exit, true),
-    ?line {ok,Pid} =
+    process_flag(trap_exit, true),
+    {ok,Pid} =
 	supervisor_bridge:start_link({local,?bridge_name},?MODULE,3),
-    ?line {error,{already_started,Pid}} =
+    {error,{already_started,Pid}} =
 	supervisor_bridge:start_link({local,?bridge_name},?MODULE,3),
-    ?line public_kill(),
+    public_kill(),
 
     %% We used to wait 1 ms before retrieving the message queue,
     %% but that might not always be enough if the machine is overloaded.
-    ?line receive
-	      {'EXIT', Pid, killed} -> ok
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    receive
+	{'EXIT', Pid, killed} -> ok
+    end,
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% OTP-9212. Restart of global supervisor.
 
-simple_global_supervisor(suite) -> [];
-simple_global_supervisor(doc) -> "Globally registered supervisor.";
+%% Globally registered supervisor.
 simple_global_supervisor(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap({seconds,10}),
 
     Child = {child, {?MODULE,server9212,[]}, permanent, 2000, worker, []},
     InitResult = {ok, {{one_for_all,3,60}, [Child]}},
@@ -216,16 +214,15 @@ simple_global_supervisor(Config) when is_list(Config) ->
         supervisor:start_link({local,bridge9212}, ?MODULE, {4,InitResult}),
 
     BN_1 = global:whereis_name(?bridge_name),
-    ?line exit(BN_1, kill),
+    exit(BN_1, kill),
     timer:sleep(200),
     BN_2 = global:whereis_name(?bridge_name),
-    ?line true = is_pid(BN_2),
-    ?line true = BN_1 =/= BN_2,
+    true = is_pid(BN_2),
+    true = BN_1 =/= BN_2,
 
-    ?line process_flag(trap_exit, true),
+    process_flag(trap_exit, true),
     exit(Sup, kill),
-    ?line receive {'EXIT', Sup, killed} -> ok end,
-    ?line test_server:timetrap_cancel(Dog),
+    receive {'EXIT', Sup, killed} -> ok end,
     ok.
 
 server9212() ->
diff --git a/lib/stdlib/test/supervisor_deadlock.erl b/lib/stdlib/test/supervisor_deadlock.erl
index 288547a972..8d3d1c6f30 100644
--- a/lib/stdlib/test/supervisor_deadlock.erl
+++ b/lib/stdlib/test/supervisor_deadlock.erl
@@ -11,9 +11,11 @@ init([child]) ->
             %% terminates immediately
             {ok, []};
         [{fail_start, true}] ->
-	    %% Restart frequency is MaxR=8, MaxT=10, so this will
-	    %% ensure that restart intensity is not reached -> restart
-	    %% loop
+	    %% A restart frequency of MaxR=8, MaxT=10 should ensure
+	    %% that restart intensity is not reached -> restart loop.
+	    %% (Note that if we use simple_one_for_one, and start
+	    %% 'many' child instances, the restart frequency must be
+	    %% ajusted accordingly.)
             timer:sleep(2000), % NOTE: this could be a gen_server call timeout
 
             {stop, error}
@@ -41,5 +43,11 @@ code_change(_OldVsn, State, _Extra) ->
 start_child() ->
     gen_server:start_link({local, ?MODULE}, ?MODULE, [child], []).
 
+start_child_noreg() ->
+    gen_server:start_link(?MODULE, [child], []).
+
 restart_child() ->
     gen_server:cast(supervisor_deadlock, restart).
+
+restart_child(Pid) ->
+    gen_server:cast(Pid, restart).
diff --git a/lib/stdlib/test/sys_SUITE.erl b/lib/stdlib/test/sys_SUITE.erl
index 573fa6f358..39bc835824 100644
--- a/lib/stdlib/test/sys_SUITE.erl
+++ b/lib/stdlib/test/sys_SUITE.erl
@@ -22,7 +22,7 @@
 	 init_per_group/2,end_per_group/2,log/1,log_to_file/1,
 	 stats/1,trace/1,suspend/1,install/1,special_process/1]).
 -export([handle_call/3,terminate/2,init/1]).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(server,sys_SUITE_server).
 
@@ -53,7 +53,6 @@ end_per_group(_GroupName, Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-log(suite) -> [];
 log(Config) when is_list(Config) ->
     {ok,_Server} = start(),
     ok = sys:log(?server,true),
@@ -63,9 +62,8 @@ log(Config) when is_list(Config) ->
     stop(),
     ok.
 
-log_to_file(suite) -> [];
 log_to_file(Config) when is_list(Config) ->
-    TempName = test_server:temp_name(?config(priv_dir,Config) ++ "sys."),
+    TempName = test_server:temp_name(proplists:get_value(priv_dir,Config) ++ "sys."),
     {ok,_Server} = start(),
     ok = sys:log_to_file(?server,TempName),
     {ok,-44} = public_call(44),
@@ -74,20 +72,19 @@ log_to_file(Config) when is_list(Config) ->
     Msg1 = io:get_line(Fd,''),
     Msg2 = io:get_line(Fd,''),
     file:close(Fd),
-    lists:prefix("*DBG* sys_SUITE_server got call {req,44} from ",Msg1),
-    lists:prefix("*DBG* sys_SUITE_server sent {ok,-44} to ",Msg2),
+    "*DBG* sys_SUITE_server got call {req,44} from " ++ _ = Msg1,
+    "*DBG* sys_SUITE_server sent {ok,-44} to " ++ _ = Msg2,
     stop(),
     ok.
 
-stats(suite) -> [];
 stats(Config) when is_list(Config) ->
     Self = self(),
     {ok,_Server} = start(),
     ok = sys:statistics(?server,true),
     {ok,-44} = public_call(44),
     {ok,Stats} = sys:statistics(?server,get),
-    lists:member({messages_in,1},Stats),
-    lists:member({messages_out,1},Stats),
+    true = lists:member({messages_in,1}, Stats),
+    true = lists:member({messages_out,0}, Stats),
     ok = sys:statistics(?server,false),
     {status,_Pid,{module,_Mod},[_PDict,running,Self,_,_]} =
 	sys:get_status(?server),
@@ -95,43 +92,40 @@ stats(Config) when is_list(Config) ->
     stop(),
     ok.
 
-trace(suite) -> [];
 trace(Config) when is_list(Config) ->
     {ok,_Server} = start(),
-    test_server:sleep(2000),
-    test_server:capture_start(),
+    ct:sleep(2000),
+    ct:capture_start(),
     sys:trace(?server,true),
     {ok,-44} = public_call(44),
     %% ho, hum, allow for the io to reach us..
-    test_server:sleep(1000),
-    test_server:capture_stop(),
-    [Msg1,Msg2] = test_server:capture_get(),
-    lists:prefix("*DBG* sys_SUITE_server got call {req,44} from ",Msg1),
-    lists:prefix("*DBG* sys_SUITE_server sent {ok,-44} to ",Msg2),
+    ct:sleep(1000),
+    ct:capture_stop(),
+    [Msg1,Msg2] = ct:capture_get(),
+    "*DBG* sys_SUITE_server got call {req,44} from " ++ _ = Msg1,
+    "*DBG* sys_SUITE_server sent {ok,-44} to " ++ _ = Msg2,
     stop(),
     ok.
 
-suspend(suite) -> [];
 suspend(Config) when is_list(Config) ->
-    ?line {ok,_Server} = start(),
-    ?line sys:suspend(?server,1000),
-    ?line {'EXIT',_} = (catch public_call(48)),
-    ?line {status,_,_,[_,suspended,_,_,_]} = sys:get_status(?server),
-    ?line sys:suspend(?server,1000), %% doing it twice is no error
-    ?line {'EXIT',_} = (catch public_call(48)),
-    ?line sys:resume(?server),
-    ?line {status,_,_,[_,running,_,_,_]} = sys:get_status(?server),
-    ?line {ok,-48} = (catch public_call(48)),
-    ?line sys:resume(?server), %% doing it twice is no error
-    ?line {ok,-48} = (catch public_call(48)),
-    ?line stop(),
+    {ok,_Server} = start(),
+    sys:suspend(?server,1000),
+    {'EXIT',_} = (catch public_call(48)),
+    {status,_,_,[_,suspended,_,_,_]} = sys:get_status(?server),
+    sys:suspend(?server,1000), %% doing it twice is no error
+    {'EXIT',_} = (catch public_call(48)),
+    sys:resume(?server),
+    {status,_,_,[_,running,_,_,_]} = sys:get_status(?server),
+    {ok,-48} = (catch public_call(48)),
+    sys:resume(?server), %% doing it twice is no error
+    {ok,-48} = (catch public_call(48)),
+    stop(),
     ok.
 
-install(suite) -> [];
 install(Config) when is_list(Config) ->
-    ?line {ok,_Server} = start(),
-    ?line Master = self(),
-    ?line SpyFun = 
+    {ok,_Server} = start(),
+    Master = self(),
+    SpyFun =
 	fun(func_state,Event,ProcState) ->
 		case Event of
 		    {in,{'$gen_call',_From,{req,Arg}}} ->
@@ -141,22 +135,26 @@ install(Config) when is_list(Config) ->
 			io:format("Trigged other=~p\n",[Other])
 		end
 	end,
-    ?line sys:install(?server,{SpyFun,func_state}),
-    ?line {ok,-1} = (catch public_call(1)),
-    ?line sys:no_debug(?server),
-    ?line {ok,-2} = (catch public_call(2)),
-    ?line sys:install(?server,{SpyFun,func_state}),
-    ?line sys:install(?server,{SpyFun,func_state}),
-    ?line {ok,-3} = (catch public_call(3)),
-    ?line sys:remove(?server,SpyFun),
-    ?line {ok,-4} = (catch public_call(4)),
-    ?line Msgs = test_server:messages_get(),
-    ?line [{spy_got,{request,1},sys_SUITE_server},
-	   {spy_got,{request,3},sys_SUITE_server}] = Msgs,
-    ?line stop(),
+    sys:install(?server,{SpyFun,func_state}),
+    {ok,-1} = (catch public_call(1)),
+    sys:no_debug(?server),
+    {ok,-2} = (catch public_call(2)),
+    sys:install(?server,{SpyFun,func_state}),
+    sys:install(?server,{SpyFun,func_state}),
+    {ok,-3} = (catch public_call(3)),
+    sys:remove(?server,SpyFun),
+    {ok,-4} = (catch public_call(4)),
+    [{spy_got,{request,1},sys_SUITE_server},
+     {spy_got,{request,3},sys_SUITE_server}] = get_messages(),
+    stop(),
     ok.
 
-special_process(suite) -> [];
+get_messages() ->
+    receive
+	Msg -> [Msg|get_messages()]
+    after 1 -> []
+    end.
+
 special_process(Config) when is_list(Config) ->
     ok = spec_proc(sys_sp1),
     ok = spec_proc(sys_sp2).
diff --git a/lib/stdlib/test/tar_SUITE.erl b/lib/stdlib/test/tar_SUITE.erl
index 6da017f818..7f20851445 100644
--- a/lib/stdlib/test/tar_SUITE.erl
+++ b/lib/stdlib/test/tar_SUITE.erl
@@ -26,7 +26,7 @@
 	 extract_from_open_file/1, symlinks/1, open_add_close/1, cooked_compressed/1,
 	 memory/1,unicode/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
@@ -53,10 +53,9 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-borderline(doc) ->
-    ["Test creating, listing and extracting one file from an archive",
-     "multiple times with different file sizes. ",
-     "Also check that the file attributes of the extracted file has survived."];
+%% Test creating, listing and extracting one file from an archive,
+%% multiple times with different file sizes.  Also check that the file
+%% attributes of the extracted file has survived.
 borderline(Config) when is_list(Config) ->
 
     %% Note: We cannot use absolute paths, because the pathnames will be
@@ -64,47 +63,47 @@ borderline(Config) when is_list(Config) ->
     %% Therefore, strip off the current working directory from the front
     %% of the private directory path.
 
-    ?line {ok, Cwd} = file:get_cwd(),
-    ?line RootDir = ?config(priv_dir, Config),
-    ?line TempDir = remove_prefix(Cwd++"/", filename:join(RootDir, "borderline")),
-    ?line ok = file:make_dir(TempDir),
+    {ok, Cwd} = file:get_cwd(),
+    RootDir = proplists:get_value(priv_dir, Config),
+    TempDir = remove_prefix(Cwd++"/", filename:join(RootDir, "borderline")),
+    ok = file:make_dir(TempDir),
 
-    ?line Record = 512,
-    ?line Block = 20 * Record,
+    Record = 512,
+    Block = 20 * Record,
 
-    ?line lists:foreach(fun(Size) -> borderline_test(Size, TempDir) end,
-			[0, 1, 10, 13, 127, 333, Record-1, Record, Record+1,
-			 Block-2*Record-1, Block-2*Record, Block-2*Record+1,
-			 Block-Record-1, Block-Record, Block-Record+1,
-			 Block-1, Block, Block+1,
-			 Block+Record-1, Block+Record, Block+Record+1]),
+    lists:foreach(fun(Size) -> borderline_test(Size, TempDir) end,
+		  [0, 1, 10, 13, 127, 333, Record-1, Record, Record+1,
+		   Block-2*Record-1, Block-2*Record, Block-2*Record+1,
+		   Block-Record-1, Block-Record, Block-Record+1,
+		   Block-1, Block, Block+1,
+		   Block+Record-1, Block+Record, Block+Record+1]),
 
     %% Clean up.
-    ?line delete_files([TempDir]),
+    delete_files([TempDir]),
 
     ok.
 
 borderline_test(Size, TempDir) ->
-    ?line Archive = filename:join(TempDir, "ar_"++integer_to_list(Size)++".tar"),
-    ?line Name = filename:join(TempDir, "file_"++integer_to_list(Size)),
-    ?line io:format("Testing size ~p", [Size]),
+    Archive = filename:join(TempDir, "ar_"++integer_to_list(Size)++".tar"),
+    Name = filename:join(TempDir, "file_"++integer_to_list(Size)),
+    io:format("Testing size ~p", [Size]),
 
     %% Create a file and archive it.
     X0 = erlang:monotonic_time(),
-    ?line file:write_file(Name, random_byte_list(X0, Size)),
-    ?line ok = erl_tar:create(Archive, [Name]),
-    ?line ok = file:delete(Name),
+    file:write_file(Name, random_byte_list(X0, Size)),
+    ok = erl_tar:create(Archive, [Name]),
+    ok = file:delete(Name),
 
     %% Verify listing and extracting.
-    ?line {ok, [Name]} = erl_tar:table(Archive),
-    ?line ok = erl_tar:extract(Archive, [verbose]),
+    {ok, [Name]} = erl_tar:table(Archive),
+    ok = erl_tar:extract(Archive, [verbose]),
 
     %% Verify contents of extracted file.
-    ?line {ok, Bin} = file:read_file(Name),
-    ?line true = match_byte_list(X0, binary_to_list(Bin)),
+    {ok, Bin} = file:read_file(Name),
+    true = match_byte_list(X0, binary_to_list(Bin)),
 
     %% Verify that Unix tar can read it.
-    ?line tar_tf(Archive, Name),
+    tar_tf(Archive, Name),
 
     ok.
 
@@ -117,20 +116,20 @@ tar_tf(Archive, Name) ->
     end.
 
 tar_tf1(Archive, Name) ->
-    ?line Expect = Name ++ "\n",
-    ?line cmd_expect("tar tf " ++ Archive, Expect).
+    Expect = Name ++ "\n",
+    cmd_expect("tar tf " ++ Archive, Expect).
 
 %% We can't use os:cmd/1, because Unix 'tar tf Name' on Solaris never
 %% terminates when given an archive of a size it doesn't like.
 
 cmd_expect(Cmd, Expect) ->
-    ?line Port = open_port({spawn, make_cmd(Cmd)}, [stream, in, eof]),
-    ?line get_data(Port, Expect).
+    Port = open_port({spawn, make_cmd(Cmd)}, [stream, in, eof]),
+    get_data(Port, Expect).
 
 get_data(Port, Expect) ->
     receive
 	{Port, {data, Bytes}} ->
-	    ?line get_data(Port, match_output(Bytes, Expect, Port));
+	    get_data(Port, match_output(Bytes, Expect, Port));
 	{Port, eof} ->
 	    Port ! {self(), close}, 
 	    receive
@@ -143,26 +142,26 @@ get_data(Port, Expect) ->
 	    after 1 ->				% force context switch
 		    ok
 	    end, 
-	    ?line match_output(eof, Expect, Port)
+	    match_output(eof, Expect, Port)
     end.
 
 match_output([C|Output], [C|Expect], Port) ->
-    ?line match_output(Output, Expect, Port);
+    match_output(Output, Expect, Port);
 match_output([_|_], [_|_], Port) ->
-    ?line kill_port_and_fail(Port, badmatch);
+    kill_port_and_fail(Port, badmatch);
 match_output([X|Output], [], Port) ->
-    ?line kill_port_and_fail(Port, {too_much_data, [X|Output]});
+    kill_port_and_fail(Port, {too_much_data, [X|Output]});
 match_output([], Expect, _Port) ->
     Expect;
 match_output(eof, [], _Port) ->
     [];
 match_output(eof, _Expect, Port) ->
-    ?line kill_port_and_fail(Port, unexpected_end_of_input).
+    kill_port_and_fail(Port, unexpected_end_of_input).
 
 kill_port_and_fail(Port, Reason) ->
     unlink(Port),
     exit(Port, die),
-    test_server:fail(Reason).
+    ct:fail(Reason).
 
 make_cmd(Cmd) ->
     case os:type() of
@@ -198,58 +197,56 @@ random_byte_list(_X, 0, Result) ->
 next_random(X) ->
     (X*17059465+1) band 16#fffffffff.
 
-atomic(doc) ->
-    ["Test the 'atomic' operations: create/extract/table, on compressed "
-     "and uncompressed archives."
-     "Also test the 'cooked' option."];
-atomic(suite) -> [];
+%% Test the 'atomic' operations: create/extract/table, on compressed
+%% and uncompressed archives.
+%% Also test the 'cooked' option.
 atomic(Config) when is_list(Config) ->
-    ?line ok = file:set_cwd(?config(priv_dir, Config)),
-    ?line DataFiles = data_files(),
-    ?line Names = [Name || {Name,_,_} <- DataFiles],
+    ok = file:set_cwd(proplists:get_value(priv_dir, Config)),
+    DataFiles = data_files(),
+    Names = [Name || {Name,_,_} <- DataFiles],
     io:format("Names: ~p", [Names]),
 
     %% Create an uncompressed archive.  The compressed flag should still be
     %% allowed when listing contents or extracting.
 
-    ?line Tar1 = "uncompressed.tar",
-    ?line erl_tar:create(Tar1, Names, []),
-    ?line {ok, Names} = erl_tar:table(Tar1, []),
-    ?line {ok, Names} = erl_tar:table(Tar1, [compressed]),
-    ?line {ok, Names} = erl_tar:table(Tar1, [cooked]),
-    ?line {ok, Names} = erl_tar:table(Tar1, [compressed,cooked]),
-    
+    Tar1 = "uncompressed.tar",
+    erl_tar:create(Tar1, Names, []),
+    {ok, Names} = erl_tar:table(Tar1, []),
+    {ok, Names} = erl_tar:table(Tar1, [compressed]),
+    {ok, Names} = erl_tar:table(Tar1, [cooked]),
+    {ok, Names} = erl_tar:table(Tar1, [compressed,cooked]),
+
     %% Create a compressed archive.
 
-    ?line Tar2 = "compressed.tar",
-    ?line erl_tar:create(Tar2, Names, [compressed]),
-    ?line {ok, Names} = erl_tar:table(Tar2, [compressed]),
-    ?line {error, Reason} = erl_tar:table(Tar2, []),
-    ?line {ok, Names} = erl_tar:table(Tar2, [compressed,cooked]),
-    ?line {error, Reason} = erl_tar:table(Tar2, [cooked]),
-    ?line ok = io:format("No compressed option: ~p, ~s",
-			 [Reason, erl_tar:format_error(Reason)]),
+    Tar2 = "compressed.tar",
+    erl_tar:create(Tar2, Names, [compressed]),
+    {ok, Names} = erl_tar:table(Tar2, [compressed]),
+    {error, Reason} = erl_tar:table(Tar2, []),
+    {ok, Names} = erl_tar:table(Tar2, [compressed,cooked]),
+    {error, Reason} = erl_tar:table(Tar2, [cooked]),
+    ok = io:format("No compressed option: ~p, ~s",
+		   [Reason, erl_tar:format_error(Reason)]),
 
     %% Same test again, but this time created with 'cooked'
 
-    ?line Tar3 = "uncompressed_cooked.tar",
-    ?line erl_tar:create(Tar3, Names, [cooked]),
-    ?line {ok, Names} = erl_tar:table(Tar3, []),
-    ?line {ok, Names} = erl_tar:table(Tar3, [compressed]),
-    ?line {ok, Names} = erl_tar:table(Tar3, [cooked]),
-    ?line {ok, Names} = erl_tar:table(Tar3, [compressed,cooked]),
-    
-    ?line Tar4 = "compressed_cooked.tar",
-    ?line erl_tar:create(Tar4, Names, [compressed,cooked]),
-    ?line {ok, Names} = erl_tar:table(Tar4, [compressed]),
-    ?line {error, Reason} = erl_tar:table(Tar4, []),
-    ?line {ok, Names} = erl_tar:table(Tar4, [compressed,cooked]),
-    ?line {error, Reason} = erl_tar:table(Tar4, [cooked]),
-    ?line ok = io:format("No compressed option: ~p, ~s",
-			 [Reason, erl_tar:format_error(Reason)]),
+    Tar3 = "uncompressed_cooked.tar",
+    erl_tar:create(Tar3, Names, [cooked]),
+    {ok, Names} = erl_tar:table(Tar3, []),
+    {ok, Names} = erl_tar:table(Tar3, [compressed]),
+    {ok, Names} = erl_tar:table(Tar3, [cooked]),
+    {ok, Names} = erl_tar:table(Tar3, [compressed,cooked]),
+
+    Tar4 = "compressed_cooked.tar",
+    erl_tar:create(Tar4, Names, [compressed,cooked]),
+    {ok, Names} = erl_tar:table(Tar4, [compressed]),
+    {error, Reason} = erl_tar:table(Tar4, []),
+    {ok, Names} = erl_tar:table(Tar4, [compressed,cooked]),
+    {error, Reason} = erl_tar:table(Tar4, [cooked]),
+    ok = io:format("No compressed option: ~p, ~s",
+		   [Reason, erl_tar:format_error(Reason)]),
 
     %% Clean up.
-    ?line delete_files([Tar1,Tar2,Tar3,Tar4|Names]),
+    delete_files([Tar1,Tar2,Tar3,Tar4|Names]),
 
     ok.
 
@@ -279,50 +276,48 @@ create_files([{Name, Size, First}|Rest]) ->
 create_files([]) ->
     ok.
 
-long_names(doc) ->
-    ["Test to extract an Unix tar file containing filenames longer than 100 ",
-    "characters and empty directories."];
+%% Test to extract an Unix tar file containing filenames longer than
+%% 100 characters and empty directories.
 long_names(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line Long = filename:join(DataDir, "long_names.tar"),
+    DataDir = proplists:get_value(data_dir, Config),
+    Long = filename:join(DataDir, "long_names.tar"),
     run_in_short_tempdir(Config,
 			 fun() -> do_long_names(Long) end).
 
 do_long_names(Long) ->
     %% Try table/2 and extract/2.
-    ?line case erl_tar:table(Long, [verbose]) of
-	      {ok,List} when is_list(List) ->
-		  ?line io:format("~p\n", [List])
-	  end,
+    case erl_tar:table(Long, [verbose]) of
+	{ok,List} when is_list(List) ->
+	    io:format("~p\n", [List])
+    end,
 
-    ?line {ok,Cwd} = file:get_cwd(),
-    ?line ok = erl_tar:extract(Long),
-    ?line Base = filename:join([Cwd, "original_software", "written_by",
-				"a_bunch_of_hackers",
-				"spending_all_their_nights",
-				"still", "not_long_enough",
-				"but_soon_it_will_be"]),
+    {ok,Cwd} = file:get_cwd(),
+    ok = erl_tar:extract(Long),
+    Base = filename:join([Cwd, "original_software", "written_by",
+			  "a_bunch_of_hackers",
+			  "spending_all_their_nights",
+			  "still", "not_long_enough",
+			  "but_soon_it_will_be"]),
 
     %% Verify that the empty directory was created.
-    ?line EmptyDir = filename:join(Base, "empty_directory"),
-    ?line {ok, #file_info{type=directory}} = file:read_file_info(EmptyDir),
+    EmptyDir = filename:join(Base, "empty_directory"),
+    {ok, #file_info{type=directory}} = file:read_file_info(EmptyDir),
 
     %% Verify that the files were created.
-    ?line {ok,First} = file:read_file(filename:join(Base, "first_file")),
-    ?line {ok,Second} = file:read_file(filename:join(Base, "second_file")),
-    ?line "Here"++_ = binary_to_list(First),
-    ?line "And"++_ = binary_to_list(Second),
+    {ok,First} = file:read_file(filename:join(Base, "first_file")),
+    {ok,Second} = file:read_file(filename:join(Base, "second_file")),
+    "Here"++_ = binary_to_list(First),
+    "And"++_ = binary_to_list(Second),
 
     ok.
 
-create_long_names(doc) ->
-    ["Creates a tar file from a deep directory structure (filenames are ",
-     "longer than 100 characters)."];
+%% Creates a tar file from a deep directory structure (filenames are
+%% longer than 100 characters).
 create_long_names(Config) when is_list(Config) ->
     run_in_short_tempdir(Config, fun create_long_names/0).
-    
+
 create_long_names() ->
-    ?line {ok,Dir} = file:get_cwd(),
+    {ok,Dir} = file:get_cwd(),
     Dirs = ["aslfjkshjkhliuf",
 	    "asdhjfehnbfsky",
 	    "sahajfskdfhsz",
@@ -330,49 +325,48 @@ create_long_names() ->
 	    "f7nafhjgffagkhsfkhsjk",
 	    "dfjasldkfjsdkfjashbv"],
 
-    ?line DeepDir = make_dirs(Dirs, []),
-    ?line AFile = filename:join(DeepDir, "a_file"),
-    ?line Hello = "hello, world\n",
-    ?line ok = file:write_file(AFile, Hello),
-    ?line TarName = filename:join(Dir,  "my_tar_with_long_names.tar"),
-    ?line ok = erl_tar:create(TarName, [AFile]),
+    DeepDir = make_dirs(Dirs, []),
+    AFile = filename:join(DeepDir, "a_file"),
+    Hello = "hello, world\n",
+    ok = file:write_file(AFile, Hello),
+    TarName = filename:join(Dir,  "my_tar_with_long_names.tar"),
+    ok = erl_tar:create(TarName, [AFile]),
 
     %% Print contents.
-    ?line ok = erl_tar:tt(TarName),
+    ok = erl_tar:tt(TarName),
 
     %% Extract and verify.
-    ?line ExtractDir = "extract_dir",
-    ?line ok = file:make_dir(ExtractDir),
-    ?line ok = erl_tar:extract(TarName, [{cwd,ExtractDir}]),
-    ?line {ok, Bin} = file:read_file(filename:join(ExtractDir, AFile)),
-    ?line Hello = binary_to_list(Bin),
+    ExtractDir = "extract_dir",
+    ok = file:make_dir(ExtractDir),
+    ok = erl_tar:extract(TarName, [{cwd,ExtractDir}]),
+    {ok, Bin} = file:read_file(filename:join(ExtractDir, AFile)),
+    Hello = binary_to_list(Bin),
 
     ok.
 
 make_dirs([Dir|Rest], []) ->
-    ?line ok = file:make_dir(Dir),
-    ?line make_dirs(Rest, Dir);
+    ok = file:make_dir(Dir),
+    make_dirs(Rest, Dir);
 make_dirs([Dir|Rest], Parent) ->
-    ?line Name = filename:join(Parent, Dir),
-    ?line ok = file:make_dir(Name),
-    ?line make_dirs(Rest, Name);
+    Name = filename:join(Parent, Dir),
+    ok = file:make_dir(Name),
+    make_dirs(Rest, Name);
 make_dirs([], Dir) ->
     Dir.
 
-bad_tar(doc) ->
-    ["Try erl_tar:table/2 and erl_tar:extract/2 on some corrupted tar files."];
+%% Try erl_tar:table/2 and erl_tar:extract/2 on some corrupted tar files.
 bad_tar(Config) when is_list(Config) ->
-    ?line try_bad("bad_checksum", bad_header, Config),
-    ?line try_bad("bad_octal",    bad_header, Config),
-    ?line try_bad("bad_too_short",    eof, Config),
-    ?line try_bad("bad_even_shorter", eof, Config),
+    try_bad("bad_checksum", bad_header, Config),
+    try_bad("bad_octal",    bad_header, Config),
+    try_bad("bad_too_short",    eof, Config),
+    try_bad("bad_even_shorter", eof, Config),
     ok.
 
 try_bad(Name0, Reason, Config) ->
-    %% Intentionally no ?line macros here.
+    %% Intentionally no macros here.
 
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Name = Name0 ++ ".tar",
     io:format("~nTrying ~s", [Name]),
     Full = filename:join(DataDir, Name),
@@ -383,38 +377,37 @@ try_bad(Name0, Reason, Config) ->
 	    io:format("Result: ~p", [Expected]),
 	    case catch erl_tar:format_error(Reason) of
 		{'EXIT', CrashReason} ->
-		    test_server:fail({format_error, crashed, CrashReason});
+		    ct:fail({format_error, crashed, CrashReason});
 		String when is_list(String) ->
 		    io:format("format_error(~p) -> ~s", [Reason, String]);
 		Other ->
-		    test_server:fail({format_error, returned, Other})
+		    ct:fail({format_error, returned, Other})
 	    end;
 	{Other1, Other2} ->
 	    io:format("table/2 returned ~p", [Other1]),
 	    io:format("extract/2 returned ~p", [Other2]),
-	    test_server:fail({bad_return_value, Other1, Other2})
+	    ct:fail({bad_return_value, Other1, Other2})
     end.
 
-errors(doc) ->
-    ["Tests that some common errors return correct error codes ",
-     "and that format_error/1 handles them correctly."];
+%% Tests that some common errors return correct error codes
+%% and that format_error/1 handles them correctly.
 errors(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
 
     %% Give the tar file the same name as a directory.
-    ?line BadTar = filename:join(PrivDir, "bad_tarfile.tar"),
-    ?line ok = file:make_dir(BadTar),
-    ?line try_error(erl_tar, create, [BadTar, []], {BadTar, eisdir}),
+    BadTar = filename:join(PrivDir, "bad_tarfile.tar"),
+    ok = file:make_dir(BadTar),
+    try_error(erl_tar, create, [BadTar, []], {BadTar, eisdir}),
 
     %% Try including non-existent files in the tar file.
-    ?line NonExistent = "non_existent_file",
-    ?line GoodTar = filename:join(PrivDir, "a_good_tarfile.tar"),
-    ?line try_error(erl_tar, create, [GoodTar, [NonExistent]],
-		    {NonExistent, enoent}),
+    NonExistent = "non_existent_file",
+    GoodTar = filename:join(PrivDir, "a_good_tarfile.tar"),
+    try_error(erl_tar, create, [GoodTar, [NonExistent]],
+	      {NonExistent, enoent}),
 
     %% Clean up.
-    ?line delete_files([GoodTar,BadTar]),
-    
+    delete_files([GoodTar,BadTar]),
+
     ok.
 
 try_error(M, F, A, Error) ->
@@ -423,18 +416,18 @@ try_error(M, F, A, Error) ->
 	{'EXIT', Reason} ->
 	    exit(Reason);
 	ok ->
-	    test_server:fail(unexpected_success);
+	    ct:fail(unexpected_success);
 	{error, Error} ->
 	    case catch erl_tar:format_error(Error) of
 		{'EXIT', FReason} ->
-		    test_server:fail({format_error, crashed, FReason});
+		    ct:fail({format_error, crashed, FReason});
 		String when is_list(String) ->
 		    io:format("format_error(~p) -> ~s", [Error, String]);
 		Other ->
-		    test_server:fail({format_error, returned, Other})
+		    ct:fail({format_error, returned, Other})
 	    end;
 	Other ->
-	    test_server:fail({expected, {error, Error}, actual, Other})
+	    ct:fail({expected, {error, Error}, actual, Other})
     end.
 
 %% remove_prefix(Prefix, List) -> ListWithoutPrefix.
@@ -444,107 +437,104 @@ remove_prefix([C|Rest1], [C|Rest2]) ->
 remove_prefix(_, Result) ->
     Result.
 
-extract_from_binary(doc) ->
-    "Test extracting a tar archive from a binary.";
+%% Test extracting a tar archive from a binary.
 extract_from_binary(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Long = filename:join(DataDir, "no_fancy_stuff.tar"),
-    ?line ExtractDir = filename:join(PrivDir, "extract_from_binary"),
-    ?line ok = file:make_dir(ExtractDir),
-    
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Long = filename:join(DataDir, "no_fancy_stuff.tar"),
+    ExtractDir = filename:join(PrivDir, "extract_from_binary"),
+    ok = file:make_dir(ExtractDir),
+
     %% Read a tar file into a binary and extract from the binary.
-    ?line {ok, Bin} = file:read_file(Long),
-    ?line ok = erl_tar:extract({binary, Bin}, [{cwd,ExtractDir}]),
+    {ok, Bin} = file:read_file(Long),
+    ok = erl_tar:extract({binary, Bin}, [{cwd,ExtractDir}]),
 
     %% Verify.
     Dir = filename:join(ExtractDir, "no_fancy_stuff"),
-    ?line true = filelib:is_dir(Dir),
-    ?line true = filelib:is_file(filename:join(Dir, "a_dir_list")),
-    ?line true = filelib:is_file(filename:join(Dir, "EPLICENCE")),
+    true = filelib:is_dir(Dir),
+    true = filelib:is_file(filename:join(Dir, "a_dir_list")),
+    true = filelib:is_file(filename:join(Dir, "EPLICENCE")),
 
     %% Clean up.
-    ?line delete_files([ExtractDir]),
+    delete_files([ExtractDir]),
 
     ok.
 
 extract_from_binary_compressed(Config) when is_list(Config) ->
     %% Test extracting a compressed tar archive from a binary.
-    ?line DataDir = ?config(data_dir, Config),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Name = filename:join(DataDir, "cooked_tar_problem.tar.gz"),
-    ?line ExtractDir = filename:join(PrivDir, "extract_from_binary_compressed"),
-    ?line ok = file:make_dir(ExtractDir),
-    ?line {ok,Bin} = file:read_file(Name),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Name = filename:join(DataDir, "cooked_tar_problem.tar.gz"),
+    ExtractDir = filename:join(PrivDir, "extract_from_binary_compressed"),
+    ok = file:make_dir(ExtractDir),
+    {ok,Bin} = file:read_file(Name),
 
     %% Try taking contents.
-    ?line {ok,Files} = erl_tar:table({binary,Bin}, [compressed]),
-    ?line io:format("~p\n", [Files]),
-    ?line 19 = length(Files),
-    
+    {ok,Files} = erl_tar:table({binary,Bin}, [compressed]),
+    io:format("~p\n", [Files]),
+    19 = length(Files),
+
     %% Trying extracting from a binary.
-    ?line ok = erl_tar:extract({binary,Bin}, [compressed,{cwd,ExtractDir}]),
-    ?line {ok,List} = file:list_dir(filename:join(ExtractDir, "ddll_SUITE_data")),
-    ?line io:format("~p\n", [List]),
-    ?line 19 = length(List),
+    ok = erl_tar:extract({binary,Bin}, [compressed,{cwd,ExtractDir}]),
+    {ok,List} = file:list_dir(filename:join(ExtractDir, "ddll_SUITE_data")),
+    io:format("~p\n", [List]),
+    19 = length(List),
 
     %% Clean up while at the same time testing that all file
     %% were extracted as expected.
     lists:foreach(fun(N) ->
 			  File = filename:join(ExtractDir, N),
 			  io:format("Deleting: ~p\n", [File]),
-			  ?line ok = file:delete(File)
+			  ok = file:delete(File)
 		  end, Files),
 
     %% Clean up the rest.
-    ?line delete_files([ExtractDir]),
+    delete_files([ExtractDir]),
 
     ok.
 
-extract_from_open_file(doc) ->
-    "Test extracting a tar archive from an open file.";
+%% Test extracting a tar archive from an open file.
 extract_from_open_file(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Long = filename:join(DataDir, "no_fancy_stuff.tar"),
-    ?line ExtractDir = filename:join(PrivDir, "extract_from_open_file"),
-    ?line ok = file:make_dir(ExtractDir),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Long = filename:join(DataDir, "no_fancy_stuff.tar"),
+    ExtractDir = filename:join(PrivDir, "extract_from_open_file"),
+    ok = file:make_dir(ExtractDir),
 
-    ?line {ok, File} = file:open(Long, [read]),
-    ?line ok = erl_tar:extract({file, File}, [{cwd,ExtractDir}]),
+    {ok, File} = file:open(Long, [read]),
+    ok = erl_tar:extract({file, File}, [{cwd,ExtractDir}]),
 
     %% Verify.
     Dir = filename:join(ExtractDir, "no_fancy_stuff"),
-    ?line true = filelib:is_dir(Dir),
-    ?line true = filelib:is_file(filename:join(Dir, "a_dir_list")),
-    ?line true = filelib:is_file(filename:join(Dir, "EPLICENCE")),
+    true = filelib:is_dir(Dir),
+    true = filelib:is_file(filename:join(Dir, "a_dir_list")),
+    true = filelib:is_file(filename:join(Dir, "EPLICENCE")),
 
     %% Close open file.
-    ?line ok = file:close(File),
+    ok = file:close(File),
 
     %% Clean up.
-    ?line delete_files([ExtractDir]),
+    delete_files([ExtractDir]),
 
     ok.
 
-symlinks(doc) ->
-    "Test that archives containing symlinks can be created and extracted.";
+%% Test that archives containing symlinks can be created and extracted.
 symlinks(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Dir = filename:join(PrivDir, "symlinks"),
-    ?line ok = file:make_dir(Dir),
-    ?line ABadSymlink = filename:join(Dir, "bad_symlink"),
-    ?line PointsTo = "/a/definitely/non_existing/path",
-    ?line Res = case make_symlink("/a/definitely/non_existing/path", ABadSymlink) of
-		    {error, enotsup} ->
-			{skip, "Symbolic links not supported on this platform"};
-		    ok ->
-			symlinks(Dir, "bad_symlink", PointsTo),
-			long_symlink(Dir)
-		end,
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Dir = filename:join(PrivDir, "symlinks"),
+    ok = file:make_dir(Dir),
+    ABadSymlink = filename:join(Dir, "bad_symlink"),
+    PointsTo = "/a/definitely/non_existing/path",
+    Res = case make_symlink("/a/definitely/non_existing/path", ABadSymlink) of
+	      {error, enotsup} ->
+		  {skip, "Symbolic links not supported on this platform"};
+	      ok ->
+		  symlinks(Dir, "bad_symlink", PointsTo),
+		  long_symlink(Dir)
+	  end,
 
     %% Clean up.
-    ?line delete_files([Dir]),
+    delete_files([Dir]),
     Res.
 
 make_symlink(Path, Link) ->
@@ -569,103 +559,103 @@ make_symlink(Path, Link) ->
 	_ ->
 	    file:make_symlink(Path, Link)
     end.
-	  
+
 symlinks(Dir, BadSymlink, PointsTo) ->
-    ?line Tar = filename:join(Dir, "symlink.tar"),
-    ?line DerefTar = filename:join(Dir, "dereference.tar"),
+    Tar = filename:join(Dir, "symlink.tar"),
+    DerefTar = filename:join(Dir, "dereference.tar"),
 
     %% Create the archive.
 
-    ?line ok = file:set_cwd(Dir),
-    ?line GoodSymlink = "good_symlink",
-    ?line AFile = "a_good_file",
-    ?line ALine = "A line of text for a file.",
-    ?line ok = file:write_file(AFile, ALine),
-    ?line ok = file:make_symlink(AFile, GoodSymlink),
-    ?line ok = erl_tar:create(Tar, [BadSymlink, GoodSymlink, AFile], [verbose]),
+    ok = file:set_cwd(Dir),
+    GoodSymlink = "good_symlink",
+    AFile = "a_good_file",
+    ALine = "A line of text for a file.",
+    ok = file:write_file(AFile, ALine),
+    ok = file:make_symlink(AFile, GoodSymlink),
+    ok = erl_tar:create(Tar, [BadSymlink, GoodSymlink, AFile], [verbose]),
 
     %% List contents of tar file.
 
-    ?line ok = erl_tar:tt(Tar),
+    ok = erl_tar:tt(Tar),
 
     %% Also create another archive with the dereference flag.
 
-    ?line ok = erl_tar:create(DerefTar, [AFile, GoodSymlink], [dereference, verbose]),
+    ok = erl_tar:create(DerefTar, [AFile, GoodSymlink], [dereference, verbose]),
 
     %% Extract files to a new directory.
 
-    ?line NewDir = filename:join(Dir, "extracted"),
-    ?line ok = file:make_dir(NewDir),
-    ?line ok = erl_tar:extract(Tar, [{cwd, NewDir}, verbose]),
+    NewDir = filename:join(Dir, "extracted"),
+    ok = file:make_dir(NewDir),
+    ok = erl_tar:extract(Tar, [{cwd, NewDir}, verbose]),
 
     %% Verify that the files are there.
 
-    ?line ok = file:set_cwd(NewDir),
-    ?line {ok, #file_info{type=symlink}} = file:read_link_info(BadSymlink),
-    ?line {ok, PointsTo} = file:read_link(BadSymlink),
-    ?line {ok, #file_info{type=symlink}} = file:read_link_info(GoodSymlink),
-    ?line {ok, AFile} = file:read_link(GoodSymlink),
-    ?line Expected = list_to_binary(ALine),
-    ?line {ok, Expected} = file:read_file(GoodSymlink),
+    ok = file:set_cwd(NewDir),
+    {ok, #file_info{type=symlink}} = file:read_link_info(BadSymlink),
+    {ok, PointsTo} = file:read_link(BadSymlink),
+    {ok, #file_info{type=symlink}} = file:read_link_info(GoodSymlink),
+    {ok, AFile} = file:read_link(GoodSymlink),
+    Expected = list_to_binary(ALine),
+    {ok, Expected} = file:read_file(GoodSymlink),
 
     %% Extract the "dereferenced archive"  to a new directory.
 
-    ?line NewDirDeref = filename:join(Dir, "extracted_deref"),
-    ?line ok = file:make_dir(NewDirDeref),
-    ?line ok = erl_tar:extract(DerefTar, [{cwd, NewDirDeref}, verbose]),
+    NewDirDeref = filename:join(Dir, "extracted_deref"),
+    ok = file:make_dir(NewDirDeref),
+    ok = erl_tar:extract(DerefTar, [{cwd, NewDirDeref}, verbose]),
 
     %% Verify that the files are there.
 
-    ?line ok = file:set_cwd(NewDirDeref),
-    ?line {ok, #file_info{type=regular}} = file:read_link_info(GoodSymlink),
-    ?line {ok, #file_info{type=regular}} = file:read_link_info(AFile),
-    ?line {ok, Expected} = file:read_file(GoodSymlink),
-    ?line {ok, Expected} = file:read_file(AFile),
+    ok = file:set_cwd(NewDirDeref),
+    {ok, #file_info{type=regular}} = file:read_link_info(GoodSymlink),
+    {ok, #file_info{type=regular}} = file:read_link_info(AFile),
+    {ok, Expected} = file:read_file(GoodSymlink),
+    {ok, Expected} = file:read_file(AFile),
 
     ok.
 
 long_symlink(Dir) ->
-    ?line Tar = filename:join(Dir, "long_symlink.tar"),
-    ?line ok = file:set_cwd(Dir),
-
-    ?line AFile = "long_symlink",
-    ?line FarTooLong = "/tmp/aarrghh/this/path/is/far/longer/than/one/hundred/characters/which/is/the/maximum/number/of/characters/allowed",
-    ?line ok = file:make_symlink(FarTooLong, AFile),
-    ?line {error,Error} = erl_tar:create(Tar, [AFile], [verbose]),
-    ?line io:format("Error: ~s\n", [erl_tar:format_error(Error)]),
-    ?line {FarTooLong,symbolic_link_too_long} = Error,
+    Tar = filename:join(Dir, "long_symlink.tar"),
+    ok = file:set_cwd(Dir),
+
+    AFile = "long_symlink",
+    FarTooLong = "/tmp/aarrghh/this/path/is/far/longer/than/one/hundred/characters/which/is/the/maximum/number/of/characters/allowed",
+    ok = file:make_symlink(FarTooLong, AFile),
+    {error,Error} = erl_tar:create(Tar, [AFile], [verbose]),
+    io:format("Error: ~s\n", [erl_tar:format_error(Error)]),
+    {FarTooLong,symbolic_link_too_long} = Error,
     ok.
 
 open_add_close(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line ok = file:set_cwd(PrivDir),
-    ?line Dir = filename:join(PrivDir, "open_add_close"),
-    ?line ok = file:make_dir(Dir),
-
-    ?line [{FileOne,_,_},{FileTwo,_,_},{FileThree,_,_}] = oac_files(),
-    ?line ADir = "empty_dir",
-    ?line AnotherDir = "another_dir",
-    ?line SomeContent = filename:join(AnotherDir, "some_content"),
-    ?line ok = file:make_dir(ADir),
-    ?line ok = file:make_dir(AnotherDir),
-    ?line ok = file:make_dir(SomeContent),
-
-    ?line TarOne = filename:join(Dir, "archive1.tar"),
-    ?line {ok,AD} = erl_tar:open(TarOne, [write]),
-    ?line ok = erl_tar:add(AD, FileOne, []),
-    ?line ok = erl_tar:add(AD, FileTwo, "second file", []),
-    ?line ok = erl_tar:add(AD, FileThree, [verbose]),
-    ?line ok = erl_tar:add(AD, FileThree, "chunked", [{chunks,11411},verbose]),
-    ?line ok = erl_tar:add(AD, ADir, [verbose]),
-    ?line ok = erl_tar:add(AD, AnotherDir, [verbose]),
-    ?line ok = erl_tar:close(AD),
-
-    ?line ok = erl_tar:t(TarOne),
-    ?line ok = erl_tar:tt(TarOne),
-
-    ?line {ok,[FileOne,"second file",FileThree,"chunked",ADir,SomeContent]} = erl_tar:table(TarOne),
-
-    ?line delete_files(["oac_file","oac_small","oac_big",Dir,AnotherDir,ADir]),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    ok = file:set_cwd(PrivDir),
+    Dir = filename:join(PrivDir, "open_add_close"),
+    ok = file:make_dir(Dir),
+
+    [{FileOne,_,_},{FileTwo,_,_},{FileThree,_,_}] = oac_files(),
+    ADir = "empty_dir",
+    AnotherDir = "another_dir",
+    SomeContent = filename:join(AnotherDir, "some_content"),
+    ok = file:make_dir(ADir),
+    ok = file:make_dir(AnotherDir),
+    ok = file:make_dir(SomeContent),
+
+    TarOne = filename:join(Dir, "archive1.tar"),
+    {ok,AD} = erl_tar:open(TarOne, [write]),
+    ok = erl_tar:add(AD, FileOne, []),
+    ok = erl_tar:add(AD, FileTwo, "second file", []),
+    ok = erl_tar:add(AD, FileThree, [verbose]),
+    ok = erl_tar:add(AD, FileThree, "chunked", [{chunks,11411},verbose]),
+    ok = erl_tar:add(AD, ADir, [verbose]),
+    ok = erl_tar:add(AD, AnotherDir, [verbose]),
+    ok = erl_tar:close(AD),
+
+    ok = erl_tar:t(TarOne),
+    ok = erl_tar:tt(TarOne),
+
+    {ok,[FileOne,"second file",FileThree,"chunked",ADir,SomeContent]} = erl_tar:table(TarOne),
+
+    delete_files(["oac_file","oac_small","oac_big",Dir,AnotherDir,ADir]),
 
     ok.
 
@@ -678,60 +668,59 @@ oac_files() ->
 
 cooked_compressed(Config) when is_list(Config) ->
     %% Test that a compressed archive can be read in cooked mode.
-    ?line DataDir = ?config(data_dir, Config),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Name = filename:join(DataDir, "cooked_tar_problem.tar.gz"),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Name = filename:join(DataDir, "cooked_tar_problem.tar.gz"),
 
     %% Try table/2 and extract/2.
-    ?line {ok,List} = erl_tar:table(Name, [cooked,compressed]),
-    ?line io:format("~p\n", [List]),
-    ?line 19 = length(List),
-    ?line ok = erl_tar:extract(Name, [cooked,compressed,{cwd,PrivDir}]),
+    {ok,List} = erl_tar:table(Name, [cooked,compressed]),
+    io:format("~p\n", [List]),
+    19 = length(List),
+    ok = erl_tar:extract(Name, [cooked,compressed,{cwd,PrivDir}]),
 
     %% Clean up while at the same time testing that all file
     %% were extracted as expected.
     lists:foreach(fun(N) ->
 			  File = filename:join(PrivDir, N),
 			  io:format("Deleting: ~p\n", [File]),
-			  ?line ok = file:delete(File)
+			  ok = file:delete(File)
 		  end, List),
 
     %% Clean up.
-    ?line delete_files([filename:join(PrivDir, "ddll_SUITE_data")]),
+    delete_files([filename:join(PrivDir, "ddll_SUITE_data")]),
     ok.
 
-memory(doc) ->
-    ["Test that an archive can be created directly from binaries and "
-     "that an archive can be extracted into binaries."];
+%% Test that an archive can be created directly from binaries and
+%% that an archive can be extracted into binaries.
 memory(Config) when is_list(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
-
-    ?line FileBins = [{"bar/fum", <<"BARFUM">>},{"foo", <<"FOO">>}],
-    ?line Name1 = filename:join(DataDir, "memory.tar"),
-    ?line ok = erl_tar:create(Name1, FileBins, [write,verbose]),
-    ?line {ok,Extracted1} = erl_tar:extract(Name1, [memory,verbose]),
-    ?line FileBins1 = lists:sort(Extracted1),
-
-    ?line io:format("FileBins: ~p\n", [FileBins]),
-    ?line io:format("FileBins1: ~p\n", [FileBins1]),
-    ?line FileBins = FileBins1,
-
-    ?line Name2 = filename:join(DataDir, "memory2.tar"),
-    ?line {ok,Fd} = erl_tar:open(Name2, [write]),
-    ?line [ok,ok] = [erl_tar:add(Fd, B, N, [write,verbose]) || {N,B} <- FileBins],
-    ?line ok = erl_tar:close(Fd),
-    ?line {ok,Extracted2} = erl_tar:extract(Name2, [memory,verbose]),
-    ?line FileBins2 = lists:sort(Extracted2),
-    ?line io:format("FileBins2: ~p\n", [FileBins2]),
-    ?line FileBins = FileBins2,
+    DataDir = proplists:get_value(data_dir, Config),
+
+    FileBins = [{"bar/fum", <<"BARFUM">>},{"foo", <<"FOO">>}],
+    Name1 = filename:join(DataDir, "memory.tar"),
+    ok = erl_tar:create(Name1, FileBins, [write,verbose]),
+    {ok,Extracted1} = erl_tar:extract(Name1, [memory,verbose]),
+    FileBins1 = lists:sort(Extracted1),
+
+    io:format("FileBins: ~p\n", [FileBins]),
+    io:format("FileBins1: ~p\n", [FileBins1]),
+    FileBins = FileBins1,
+
+    Name2 = filename:join(DataDir, "memory2.tar"),
+    {ok,Fd} = erl_tar:open(Name2, [write]),
+    [ok,ok] = [erl_tar:add(Fd, B, N, [write,verbose]) || {N,B} <- FileBins],
+    ok = erl_tar:close(Fd),
+    {ok,Extracted2} = erl_tar:extract(Name2, [memory,verbose]),
+    FileBins2 = lists:sort(Extracted2),
+    io:format("FileBins2: ~p\n", [FileBins2]),
+    FileBins = FileBins2,
 
     %% Clean up.
-    ?line ok = delete_files([Name1,Name2]),
+    ok = delete_files([Name1,Name2]),
     ok.
 
 %% Test filenames with characters outside the US ASCII range.
 unicode(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     do_unicode(PrivDir),
     case has_transparent_naming() of
 	true ->
@@ -811,7 +800,7 @@ delete_files([Item|Rest]) ->
 %% 260 characters.
 run_in_short_tempdir(Config, Fun) ->
     {ok,Cwd} = file:get_cwd(),
-    PrivDir0 = ?config(priv_dir, Config),
+    PrivDir0 = proplists:get_value(priv_dir, Config),
 
     %% Normalize name to make sure that there is no slash at the end.
     PrivDir = filename:absname(PrivDir0),
@@ -850,7 +839,7 @@ start_node(Name, Args) ->
     ct:log("Trying to start ~w@~s~n", [Name,Host]),
     case test_server:start_node(Name, peer, [{args,Args}]) of
 	{error,Reason} ->
-	    test_server:fail(Reason);
+	    ct:fail(Reason);
 	{ok,Node} ->
 	    ct:log("Node ~p started~n", [Node]),
 	    Node
diff --git a/lib/stdlib/test/timer_SUITE.erl b/lib/stdlib/test/timer_SUITE.erl
index 057d82fb65..d4bbd39d50 100644
--- a/lib/stdlib/test/timer_SUITE.erl
+++ b/lib/stdlib/test/timer_SUITE.erl
@@ -24,7 +24,7 @@
 -export([big_test/1, collect/3, i_t/3, a_t/2]).
 -export([do_nrev/1, internal_watchdog/2]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Random test of the timer module. This is a really nasty test, as it
 %% runs a lot of timeouts and then checks in the end if any of them
@@ -41,7 +41,9 @@
 %% reasonable on different machines; therefore the test can sometimes
 %% fail, even though the timer module is ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,20}}].
 
 all() -> 
     [do_big_test].
@@ -65,23 +67,19 @@ end_per_group(_GroupName, Config) ->
 %% ------------------------------------------------------- %%
 
 do_big_test(TConfig) when is_list(TConfig) ->
-    Dog = ?t:timetrap(?t:minutes(20)),
     Save = process_flag(trap_exit, true),
     Result = big_test(200),
     process_flag(trap_exit, Save),
-    ?t:timetrap_cancel(Dog),
     report_result(Result).
 
 report_result(ok) -> ok;
-report_result(Error) -> ?line test_server:fail(Error).
+report_result(Error) -> ct:fail(Error).
 
 %% ------------------------------------------------------- %%
 
 big_test(N) ->
     C = start_collect(),
     system_time(), system_time(), system_time(),
-    random:seed(erlang:timestamp()),
-    random:uniform(100),random:uniform(100),random:uniform(100),
 
     big_loop(C, N, []),
 
@@ -100,7 +98,7 @@ big_test(N) ->
     Result = analyze_report(Report),
     %%io:format("big_test is done: ~w~n", [Result]),
     Result.
-    
+
 big_loop(_C, 0, []) ->
     %%io:format("All processes are done!~n", []),
     ok;
@@ -111,8 +109,8 @@ big_loop(C, 0, Pids) ->
 	{'EXIT', Pid, done} ->
 	    big_loop(C, 0, lists:delete(Pid, Pids));
 	{'EXIT', Pid, Error} ->
-	    ?line ok = io:format("XXX Pid ~w died with reason ~p~n",
-				 [Pid, Error]),
+	    ok = io:format("XXX Pid ~w died with reason ~p~n",
+			   [Pid, Error]),
 	    big_loop(C, 0, lists:delete(Pid, Pids))
     end;
 big_loop(C, N, Pids) ->
@@ -121,24 +119,24 @@ big_loop(C, N, Pids) ->
 	{'EXIT', Pid, done} ->
 	    big_loop(C, N, lists:delete(Pid, Pids));
 	{'EXIT', Pid, Error} ->
-	    ?line ok =io:format("XXX Internal error: Pid ~w died, reason ~p~n",
-				 [Pid, Error]),
+	    ok =io:format("XXX Internal error: Pid ~w died, reason ~p~n",
+			  [Pid, Error]),
 	    big_loop(C, N, lists:delete(Pid, Pids))
     after 0 ->
 
 	    %% maybe start an interval timer test
-	    Pids1 = maybe_start_i_test(Pids, C, random:uniform(4)),
-	    
+	    Pids1 = maybe_start_i_test(Pids, C, rand:uniform(4)),
+
 	    %% start 1-4 "after" tests
-	    Pids2 = start_after_test(Pids1, C, random:uniform(4)),
+	    Pids2 = start_after_test(Pids1, C, rand:uniform(4)),
 	    %%Pids2=Pids1,
 
 	    %% wait a little while
-	    timer:sleep(random:uniform(200)*3),
+	    timer:sleep(rand:uniform(200)*3),
 
 	    %% spawn zero, one or two nrev to get some load ;-/
-	    Pids3 = start_nrev(Pids2, random:uniform(100)),
-	    
+	    Pids3 = start_nrev(Pids2, rand:uniform(100)),
+
 	    big_loop(C, N-1, Pids3)
     end.
 
@@ -148,20 +146,20 @@ start_nrev(Pids, N) when N < 25 ->
 start_nrev(Pids, N) when N < 75 ->
     [spawn_link(timer_SUITE, do_nrev, [1])|Pids];
 start_nrev(Pids, _N) ->
-    NrevPid1 = spawn_link(timer_SUITE, do_nrev, [random:uniform(1000)*10]),
+    NrevPid1 = spawn_link(timer_SUITE, do_nrev, [rand:uniform(1000)*10]),
     NrevPid2 = spawn_link(timer_SUITE, do_nrev, [1]),
     [NrevPid1,NrevPid2|Pids].
-    
+
 
 start_after_test(Pids, C, 1) ->
-    TO1 = random:uniform(100)*47,
+    TO1 = rand:uniform(100)*47,
     [s_a_t(C, TO1)|Pids];
 start_after_test(Pids, C, 2) ->
-    TO1 = random:uniform(100)*47,
-    TO2 = TO1 div random:uniform(3) + 101,
+    TO1 = rand:uniform(100)*47,
+    TO2 = TO1 div rand:uniform(3) + 101,
     [s_a_t(C, TO1),s_a_t(C, TO2)|Pids];
 start_after_test(Pids, C, N) ->
-    TO1 = random:uniform(100)*47,
+    TO1 = rand:uniform(100)*47,
     start_after_test([s_a_t(C, TO1)|Pids], C, N-1).
 
 s_a_t(C, TimeOut) ->
@@ -179,16 +177,16 @@ a_t(C, TimeOut) ->
 	watchdog ->
 	    Stop = system_time(),
 	    report(C, Start,Stop,TimeOut),
-	    ?line ok = io:format("Internal watchdog timeout (a), not good!!~n",
-				 []),
+	    ok = io:format("Internal watchdog timeout (a), not good!!~n",
+			   []),
 	    exit(done)
     end.
 
 
 maybe_start_i_test(Pids, C, 1) ->
     %% ok do it
-    TOI = random:uniform(53)*49,
-    CountI = random:uniform(10) + 3,                      % at least 4 times
+    TOI = rand:uniform(53)*49,
+    CountI = rand:uniform(10) + 3,		% at least 4 times
     [spawn_link(timer_SUITE, i_t, [C, TOI, CountI])|Pids];
 maybe_start_i_test(Pids, _C, _) ->
     Pids.
@@ -210,8 +208,8 @@ i_wait(Start, Prev, Times, TimeOut, Times, Ref, C) ->
 	    Now = system_time(),
 	    report_interval(C, {final,Times}, Start, Prev, Now, TimeOut),
 	    timer:cancel(Ref),
-	    ?line ok = io:format("Internal watchdog timeout (i), not good!!~n",
-				 []),
+	    ok = io:format("Internal watchdog timeout (i), not good!!~n",
+			   []),
 	    exit(done)
     end;
 i_wait(Start, Prev, Count, TimeOut, Times, Ref, C) ->
@@ -223,8 +221,8 @@ i_wait(Start, Prev, Count, TimeOut, Times, Ref, C) ->
 	watchdog ->
 	    Now = system_time(),
 	    report_interval(C, {final,Count}, Start, Prev, Now, TimeOut),
-	    ?line ok = io:format("Internal watchdog timeout (j), not good!!~n",
-				 []),
+	    ok = io:format("Internal watchdog timeout (j), not good!!~n",
+			   []),
 	    exit(done)
     end.
 
@@ -291,13 +289,6 @@ update(New, Stat) when New < Stat#stat.min ->
 update(New, Stat) ->
     Stat#stat{n=Stat#stat.n + 1, avg=(New+Stat#stat.avg) div 2}.
 
-%update(New, {N,Max,Min,Avg}) when New>Max ->
-%    {N+1,New,Min,(New+Avg) div 2};
-%update(New, {N,Max,Min,Avg}) when New<Min ->
-%    {N+1,Max,New,(New+Avg) div 2};
-%update(New, {N,Max,Min,Avg}) ->
-%    {N+1,Max,Min,(New+Avg) div 2}.
-
 print_report({E,LateS,EarlyS,I}) ->
     Early = EarlyS#stat.n, Late = LateS#stat.n,
     Total = E + Early + Late,
@@ -381,10 +372,10 @@ nrev([]) ->
     [];
 nrev([H|T]) ->
     append(nrev(T), [H]).
-    
+
 append([H|T],Z) ->
-	[H|append(T,Z)];
+    [H|append(T,Z)];
 append([],X) ->
-	X.
+    X.
 
 %% ------------------------------------------------------- %%
diff --git a/lib/stdlib/test/timer_simple_SUITE.erl b/lib/stdlib/test/timer_simple_SUITE.erl
index 93fbc3a032..64fce2a4b2 100644
--- a/lib/stdlib/test/timer_simple_SUITE.erl
+++ b/lib/stdlib/test/timer_simple_SUITE.erl
@@ -51,12 +51,14 @@
 	 timer/4,
 	 timer/5]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(MAXREF, (1 bsl 18)).
 -define(REFMARG, 30).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,10}}].
 
 all() -> 
     [apply_after, send_after1, send_after2, send_after3,
@@ -87,222 +89,198 @@ init_per_testcase(_, Config) when is_list(Config) ->
 
 %% Testing timer interface!!
 
-apply_after(doc) -> "Test of apply_after, with sending of message.";
-apply_after(suite) -> [];
+%% Test of apply_after, with sending of message.
 apply_after(Config) when is_list(Config) ->
-    ?line timer:apply_after(500, ?MODULE, send, [self(), ok_apply]),
-    ?line ok = get_mess(1000, ok_apply).
+    timer:apply_after(500, ?MODULE, send, [self(), ok_apply]),
+    ok = get_mess(1000, ok_apply).
 
-send_after1(doc) -> "Test of send_after with time = 0.";
-send_after1(suite) -> [];
+%% Test of send_after with time = 0.
 send_after1(Config) when is_list(Config) ->
-    ?line timer:send_after(0, ok_send1),
-    ?line ok = get_mess(1000, ok_send1).
+    timer:send_after(0, ok_send1),
+    ok = get_mess(1000, ok_send1).
 
-send_after2(doc) -> "Test of send_after with time = 500.";
-send_after2(suite) -> [];
+%% Test of send_after with time = 500.
 send_after2(Config) when is_list(Config) ->
-    ?line timer:send_after(500, self(), ok_send2),
-    ?line ok = get_mess(2000, ok_send2).
+    timer:send_after(500, self(), ok_send2),
+    ok = get_mess(2000, ok_send2).
 
-send_after3(doc) -> "Test of send_after with time = 500, with receiver "
-			"a registered process. [OTP-2735]";
-send_after3(suite) -> [];
+%% Test of send_after with time = 500, with receiver a registered
+%% process. [OTP-2735]
 send_after3(Config) when is_list(Config) ->
-    ?line Name = list_to_atom(pid_to_list(self())),
-    ?line register(Name, self()),
-    ?line timer:send_after(500, Name, ok_send3),
-    ?line ok = get_mess(2000, ok_send3),
-    ?line unregister(Name).
-
-exit_after1(doc) -> "Test of exit_after with time = 1000.";
-exit_after1(suite) -> [];
+    Name = list_to_atom(pid_to_list(self())),
+    register(Name, self()),
+    timer:send_after(500, Name, ok_send3),
+    ok = get_mess(2000, ok_send3),
+    unregister(Name).
+
+%% Test of exit_after with time = 1000.
 exit_after1(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line Pid = spawn_link(?MODULE, forever, []),
-    ?line timer:exit_after(1000, Pid, exit_test1),
-    ?line ok = get_mess(5000, {'EXIT', Pid, exit_test1}).
-
-exit_after2(doc) -> "Test of exit_after with time = 1000. The process to "
-			"exit is the name of a registered process. "
-			"[OTP-2735]";
-exit_after2(suite) -> [];
+    process_flag(trap_exit, true),
+    Pid = spawn_link(?MODULE, forever, []),
+    timer:exit_after(1000, Pid, exit_test1),
+    ok = get_mess(5000, {'EXIT', Pid, exit_test1}).
+
+%% Test of exit_after with time = 1000. The process to exit is the
+%% name of a registered process.  [OTP-2735]
 exit_after2(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line Pid = spawn_link(?MODULE, forever, []),
-    ?line Name = list_to_atom(pid_to_list(Pid)),
-    ?line register(Name, Pid),
-    ?line timer:exit_after(1000, Name, exit_test2),
-    ?line ok = get_mess(2000, {'EXIT', Pid, exit_test2}).
-
-kill_after1(doc) -> "Test of kill_after with time = 1000.";
-kill_after1(suite) -> [];
+    process_flag(trap_exit, true),
+    Pid = spawn_link(?MODULE, forever, []),
+    Name = list_to_atom(pid_to_list(Pid)),
+    register(Name, Pid),
+    timer:exit_after(1000, Name, exit_test2),
+    ok = get_mess(2000, {'EXIT', Pid, exit_test2}).
+
+%% Test of kill_after with time = 1000.
 kill_after1(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line Pid = spawn_link(?MODULE, forever, []),
-    ?line timer:kill_after(1000, Pid),
-    ?line ok = get_mess(2000, {'EXIT', Pid, killed}).
-
-kill_after2(doc) -> "Test of kill_after with time = 1000. The process to "
-			"exit is the name of a registered process. "
-			"[OTP-2735]";
-kill_after2(suite) -> [];
+    process_flag(trap_exit, true),
+    Pid = spawn_link(?MODULE, forever, []),
+    timer:kill_after(1000, Pid),
+    ok = get_mess(2000, {'EXIT', Pid, killed}).
+
+%% Test of kill_after with time = 1000. The process to exit is the
+%% name of a registered process.  [OTP-2735]
 kill_after2(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line Pid = spawn_link(?MODULE, forever, []),
-    ?line Name = list_to_atom(pid_to_list(Pid)),
-    ?line register(Name, Pid),
-    ?line timer:kill_after(1000, Name),
-    ?line ok = get_mess(2000, {'EXIT', Pid, killed}).
-
-apply_interval(doc) -> "Test of apply_interval by sending messages. Receive "
-                       "3 messages, cancel the timer, and check that we do "
-		       "not get any more messages.";
-apply_interval(suite) -> [];
+    process_flag(trap_exit, true),
+    Pid = spawn_link(?MODULE, forever, []),
+    Name = list_to_atom(pid_to_list(Pid)),
+    register(Name, Pid),
+    timer:kill_after(1000, Name),
+    ok = get_mess(2000, {'EXIT', Pid, killed}).
+
+%% Test of apply_interval by sending messages. Receive
+%% 3 messages, cancel the timer, and check that we do
+%% not get any more messages.
 apply_interval(Config) when is_list(Config) ->
-    ?line {ok, Ref} = timer:apply_interval(1000, ?MODULE, send, 
+    {ok, Ref} = timer:apply_interval(1000, ?MODULE, send,
 				     [self(), apply_int]),
-    ?line ok = get_mess(1500, apply_int, 3),
-    ?line timer:cancel(Ref),
-    ?line nor = get_mess(1000, apply_int).
-
-send_interval1(doc) -> "Test of send_interval/2. Receive 5 messages, cancel "
-		      "the timer, and check that we do not get any more "
-                      "messages.";
-send_interval1(suite) -> [];
+    ok = get_mess(1500, apply_int, 3),
+    timer:cancel(Ref),
+    nor = get_mess(1000, apply_int).
+
+%% Test of send_interval/2. Receive 5 messages, cancel the timer, and
+%% check that we do not get any more messages.
 send_interval1(Config) when is_list(Config) ->
     {ok, Ref} = timer:send_interval(1000, send_int),
-    ?line ok = get_mess(1500, send_int, 5),
+    ok = get_mess(1500, send_int, 5),
     timer:cancel(Ref),
-    ?line nor = get_mess(1000, send_int). % We should receive only five
+    nor = get_mess(1000, send_int). % We should receive only five
 
-send_interval2(doc) -> "Test of send_interval/3. Receive 2 messages, cancel "
-		      "the timer, and check that we do not get any more "
-                      "messages.";
-send_interval2(suite) -> [];
+%% Test of send_interval/3. Receive 2 messages, cancel the timer, and
+%% check that we do not get any more messages.
 send_interval2(Config) when is_list(Config) ->
     {ok, Ref} = timer:send_interval(1000, self(), send_int2),
-    ?line ok = get_mess(1500, send_int2, 2),
+    ok = get_mess(1500, send_int2, 2),
     timer:cancel(Ref),
-    ?line nor = get_mess(1000, send_int2).  % We should receive only two
+    nor = get_mess(1000, send_int2).  % We should receive only two
 
-send_interval3(doc) -> "Test of send_interval/3. Receive 2 messages, cancel "
-		      "the timer, and check that we do not get any more "
-                      "messages. The receiver is the name of a registered "
-			   "process. [OTP-2735]";
-send_interval3(suite) -> [];
+%% Test of send_interval/3. Receive 2 messages, cancel the timer, and
+%% check that we do not get any more messages. The receiver is the
+%% name of a registered process. [OTP-2735]
 send_interval3(Config) when is_list(Config) ->
-    ?line process_flag(trap_exit, true),
-    ?line Name = list_to_atom(pid_to_list(self())),
-    ?line register(Name, self()),
-    ?line {ok, Ref} = timer:send_interval(1000, Name, send_int3),
-    ?line ok = get_mess(1500, send_int3, 2),
+    process_flag(trap_exit, true),
+    Name = list_to_atom(pid_to_list(self())),
+    register(Name, self()),
+    {ok, Ref} = timer:send_interval(1000, Name, send_int3),
+    ok = get_mess(1500, send_int3, 2),
     timer:cancel(Ref),
-    ?line nor = get_mess(1000, send_int3),  % We should receive only two
-    ?line unregister(Name).
+    nor = get_mess(1000, send_int3),  % We should receive only two
+    unregister(Name).
 
-send_interval4(doc) -> "Test that send interval stops sending msg when the "
-			   "receiving process terminates.";
-send_interval4(suite) -> [];
+%% Test that send interval stops sending msg when the receiving
+%% process terminates.
 send_interval4(Config) when is_list(Config) ->
-    ?line timer:send_interval(500, one_time_only),
+    timer:send_interval(500, one_time_only),
     receive 
 	one_time_only -> ok
     end,
-    ?line timer_server ! {'EXIT', self(), normal}, % Should remove the timer
-    ?line timer:send_after(600, send_intv_ok),
-    ?line send_intv_ok = receive 
-			     Msg -> Msg
-			 end.
-
-cancel1(doc) -> "Test that we can cancel a timer.";
-cancel1(suite) -> [];
+    timer_server ! {'EXIT', self(), normal}, % Should remove the timer
+    timer:send_after(600, send_intv_ok),
+    send_intv_ok = receive
+		       Msg -> Msg
+		   end.
+
+%% Test that we can cancel a timer.
 cancel1(Config) when is_list(Config) ->
-    ?line {ok, Ref} = timer:send_after(1000, this_should_be_canceled),
-    ?line timer:cancel(Ref),
-    ?line nor = get_mess(2000, this_should_be_canceled). % We should rec 0 msgs
+    {ok, Ref} = timer:send_after(1000, this_should_be_canceled),
+    timer:cancel(Ref),
+    nor = get_mess(2000, this_should_be_canceled). % We should rec 0 msgs
 
-cancel2(doc) -> "Test cancel/1 with bad argument.";
-cancel2(suite) -> [];
+%% Test cancel/1 with bad argument.
 cancel2(Config) when is_list(Config) ->
-    ?line {error, badarg} = timer:cancel(no_reference). 
+    {error, badarg} = timer:cancel(no_reference).
 
-tc(doc) -> "Test sleep/1 and tc/3.";
-tc(suite) -> [];
+%% Test sleep/1 and tc/3.
 tc(Config) when is_list(Config) ->
     %% This should test both sleep and tc/3
-    ?line {Res1, ok} = timer:tc(timer, sleep, [500]),
-    ?line ok = 	if
+    {Res1, ok} = timer:tc(timer, sleep, [500]),
+    ok = 	if
 		    Res1 < 500*1000 -> {too_early, Res1}; % Too early
 		    Res1 > 800*1000 -> {too_late, Res1};  % Too much time
 		    true -> ok
 		end,
 
     %% tc/2
-    ?line {Res2, ok} = timer:tc(fun(T) -> timer:sleep(T) end, [500]),
-    ?line ok = 	if
+    {Res2, ok} = timer:tc(fun(T) -> timer:sleep(T) end, [500]),
+    ok = 	if
 		    Res2 < 500*1000 -> {too_early, Res2}; % Too early
 		    Res2 > 800*1000 -> {too_late, Res2};  % Too much time
 		    true -> ok
 		end,
-    
+
     %% tc/1
-    ?line {Res3, ok} = timer:tc(fun() -> timer:sleep(500) end),
-    ?line ok = 	if
+    {Res3, ok} = timer:tc(fun() -> timer:sleep(500) end),
+    ok = 	if
     		    Res3 < 500*1000 -> {too_early, Res3}; % Too early
     		    Res3 > 800*1000 -> {too_late, Res3};  % Too much time
     		    true -> ok
     		end,
 
     %% Check that timer:tc don't catch errors
-    ?line ok = try timer:tc(erlang, exit, [foo]) 
-	       catch exit:foo -> ok
-	       end,
-    
-    ?line ok = try timer:tc(fun(Reason) -> 1 = Reason end, [foo]) 
-	       catch error:{badmatch,_} -> ok
-	       end,
-    
-    ?line ok = try timer:tc(fun() -> throw(foo) end) 
-	       catch foo -> ok
-	       end,
-    
+    ok = try timer:tc(erlang, exit, [foo])
+	 catch exit:foo -> ok
+	 end,
+
+    ok = try timer:tc(fun(Reason) -> 1 = Reason end, [foo])
+	 catch error:{badmatch,_} -> ok
+	 end,
+
+    ok = try timer:tc(fun() -> throw(foo) end)
+	 catch foo -> ok
+	 end,
+
     %% Check that return values are propageted
     Self = self(),
-    ?line {_, Self} = timer:tc(erlang, self, []),
-    ?line {_, Self} = timer:tc(fun(P) -> P end, [self()]),
-    ?line {_, Self} = timer:tc(fun() -> self() end),
-
-    ?line Sec = timer:seconds(4),
-    ?line Min = timer:minutes(4),
-    ?line Hour = timer:hours(4),
-    ?line MyRes = 4*1000 + 4*60*1000 + 4*60*60*1000,
-    ?line if  MyRes == Sec + Min + Hour -> ok end,
-    ?line TimerRes = timer:hms(4,4,4),
-    ?line if MyRes == TimerRes -> ok end,
+    {_, Self} = timer:tc(erlang, self, []),
+    {_, Self} = timer:tc(fun(P) -> P end, [self()]),
+    {_, Self} = timer:tc(fun() -> self() end),
+
+    Sec = timer:seconds(4),
+    Min = timer:minutes(4),
+    Hour = timer:hours(4),
+    MyRes = 4*1000 + 4*60*1000 + 4*60*60*1000,
+    if  MyRes == Sec + Min + Hour -> ok end,
+    TimerRes = timer:hms(4,4,4),
+    if MyRes == TimerRes -> ok end,
     ok.
 
-unique_refs(doc) ->
-    "Tests that cancellations of one-shot timers do not accidentally "
-	"cancel interval timers [OTP-2771].";
-unique_refs(suite) ->
-    [];
+%% Test that cancellations of one-shot timers do not accidentally
+%% cancel interval timers. [OTP-2771].
 unique_refs(Config) when is_list(Config) ->
-    ?line ITimers = repeat_send_interval(10),		% 10 interval timers
-    ?line eat_refs(?MAXREF - ?REFMARG),
-    ?line set_and_cancel_one_shots(?REFMARG),
-    ?line NumLeft = num_timers(),
-    ?line io:format("~w timers left, should be 10\n", [NumLeft]),
-    ?line cancel(ITimers),
-    ?line receive_nisse(),
-    ?line 10 = NumLeft.
+    ITimers = repeat_send_interval(10),		% 10 interval timers
+    eat_refs(?MAXREF - ?REFMARG),
+    set_and_cancel_one_shots(?REFMARG),
+    NumLeft = num_timers(),
+    io:format("~w timers left, should be 10\n", [NumLeft]),
+    cancel(ITimers),
+    receive_nisse(),
+    10 = NumLeft.
 
 
 repeat_send_interval(0) ->
     [];
 repeat_send_interval(M) ->
-    ?line {ok, Ref} = timer:send_interval(6000,self(), nisse),
-    ?line [Ref| repeat_send_interval(M - 1)].
+    {ok, Ref} = timer:send_interval(6000,self(), nisse),
+    [Ref| repeat_send_interval(M - 1)].
 
 eat_refs(0) ->
     0;
@@ -320,8 +298,8 @@ set_and_cancel_one_shots(N) ->
     set_and_cancel_one_shots(N-1).
 
 cancel([T| Ts]) ->
-    ?line timer:cancel(T),
-    ?line cancel(Ts);
+    timer:cancel(T),
+    cancel(Ts);
 cancel([]) ->
     ok.
 
@@ -344,7 +322,7 @@ get_mess(Time, Mess, N) ->
     receive 
 	Mess -> get_mess(Time, Mess, N-1)
     after Time
-	  -> nor   % Not Received
+	      -> nor   % Not Received
     end.
 
 forever() ->
@@ -352,16 +330,13 @@ forever() ->
     forever().
 
 
-%
-% Testing for performance (on different implementations) of timers 
-% 
+%%
+%% Testing for performance (on different implementations) of timers
+%%
+
 
-timer_perf(suite) -> [];
 timer_perf(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?t:minutes(10)),
-    Res = performance(timer),
-    ?t:timetrap_cancel(Dog),
-    Res.
+    performance(timer).
 
 performance(Mod) ->
     process_flag(trap_exit, true),    
@@ -374,7 +349,7 @@ performance(Mod) ->
 
 big_test(M) ->
     Load_Pids = start_nrev(20, M),   % Increase if more load wanted :)
- 
+
     LPids = spawn_timers(5, M, 10000, 5),
 
     apply(M, sleep, [4000]),
@@ -384,7 +359,7 @@ big_test(M) ->
     SPids = spawn_timers(15, M, 100, 3),
 
     Res = wait(SPids ++ MPids ++ LPids, [], 0, M),
-    
+
     lists:foreach(fun(Pid) -> exit(Pid, kill) end, Load_Pids),
     Res.
 
@@ -395,12 +370,12 @@ wait(Pids, ResList, N, M) ->
 	{Pid, ok, Res, T} ->
 	    wait(lists:delete(Pid, Pids), [{T, Res} | ResList], N, M);
 	{Pid, Error}->
-	    ?line test_server:fail(Error),
+	    ct:fail(Error),
 	    wait(lists:delete(Pid, Pids), ResList, N+1, M);
 	{'EXIT', Pid, normal} ->
 	    wait(lists:delete(Pid, Pids), ResList, N, M);
 	{'EXIT', Pid, Reason} ->
-    	    ?line test_server:fail({Pid,Reason})
+	    ct:fail({Pid,Reason})
     end.
 
 spawn_timers(0, _, _, _) ->
@@ -440,7 +415,6 @@ timer_irec(Start, T, {N, Max}, Res, {Pid, Mod, Ref}) ->
 	done ->
 	    Now = system_time(),
 	    Elapsed = (Now - (Start + (N*T*1000))) div 1000,
-%	    io:format("~w Now ~w Started ~w Elap ~w~n", [T,Now,Start,Elapsed]),
 	    timer_irec(Start, T,
 		       {N+1, Max},
 		       [Elapsed | Res],
@@ -476,11 +450,11 @@ nrev([]) ->
     [];
 nrev([H|T]) ->
     append(nrev(T), [H]).
-    
+
 append([H|T],Z) ->
-	[H|append(T,Z)];
+    [H|append(T,Z)];
 append([],X) ->
-	X.
+    X.
 
 system_time() ->    
     erlang:monotonic_time(micro_seconds).
@@ -488,7 +462,6 @@ system_time() ->
 %% ------------------------------------------------------- %%
 
 report_result({Res, 0}) ->
-%    io:format("DEBUG0 all ~p ~n", [Res]),
     {A_List, I_List} = split_list(Res, [], []),
     A_val = calc_a_val(A_List),
     I_val = calc_i_val(I_List),
@@ -497,7 +470,7 @@ report_result({Res, 0}) ->
 
 report_result({Head, N}) ->
     io:format("Test Failed: Number of internal tmo ~w~n", [N]),
-    ?line test_server:fail({Head, N}).
+    ct:fail({Head, N}).
 
 split_list([], AL, IL) ->
     {AL, IL};
@@ -547,11 +520,11 @@ get_ivals(List) ->
     LTot = lists:map(fun(X) -> element(2, X) end, List),
     LMin = lists:map(fun(X) -> element(4, X) end, List),
     LMax = lists:map(fun(X) -> element(5, X) end, List),
-    
+
     MaxTot  = lists:max(LTot),
     MinTot  = lists:min(LTot),
     AverTot = lists:sum(LTot) div Len,
-    
+
     IterMax = lists:max(LMax),
     IterMin = lists:min(LMin),
     IterAver= AverTot div Num,
diff --git a/lib/stdlib/test/unicode_SUITE.erl b/lib/stdlib/test/unicode_SUITE.erl
index 8bb2555213..d2ee5d19a4 100644
--- a/lib/stdlib/test/unicode_SUITE.erl
+++ b/lib/stdlib/test/unicode_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(unicode_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,	 
@@ -37,16 +37,16 @@
 	 ex_binaries_errors_utf16_big/1,
 	 ex_binaries_errors_utf32_little/1,
 	 ex_binaries_errors_utf32_big/1]).
-	 
-init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    Dog=?t:timetrap(?t:minutes(20)),
-    [{watchdog, Dog}|Config].
 
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog).
+init_per_testcase(_Case, Config) ->
+    Config.
+
+end_per_testcase(_Case, _Config) ->
+    ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,20}}].
 
 all() -> 
     [utf8_illegal_sequences_bif,
@@ -80,7 +80,7 @@ binaries_errors_limit(Config) when is_list(Config) ->
     ex_binaries_errors_utf8(Config),
     setlimit(default),
     ok.
-    
+
 ex_binaries_errors_utf8(Config) when is_list(Config) ->
     %% Original smoke test, we should not forget the original offset...
     <<_:8,_:8,RR2/binary>> = <<$a,$b,164,165,$c>>,
@@ -151,10 +151,10 @@ utf16_inner_loop([_|List], BrokenPart, BrokenSz, PartlyBroken, PBSz, Endian) ->
     utf16_inner_loop(List, BrokenPart, BrokenSz, PartlyBroken, PBSz, Endian);
 utf16_inner_loop([], _, _, _, _, _) ->
     ok.
-    
+
 ex_binaries_errors_utf32_big(Config) when is_list(Config) ->
     ex_binaries_errors_utf32(big).
-    
+
 ex_binaries_errors_utf32_little(Config) when is_list(Config) ->
     ex_binaries_errors_utf32(little).
 
@@ -180,7 +180,7 @@ ex_binaries_errors_utf32(Endian) ->
 			   PartlyBroken, PBSz, Endian)
       end || N <- lists:seq(1, 16, 3) ],
     ok.
-    
+
 utf32_inner_loop([_|List], BrokenPart, BrokenSz, PartlyBroken, PBSz, Endian) ->
     Sz = length(List)*4 + BrokenSz,
     Chomped = binary:part(PartlyBroken, PBSz - Sz, Sz),
@@ -199,115 +199,115 @@ exceptions(Config) when is_list(Config) ->
     ex_exceptions(Config).
 
 ex_exceptions(Config) when is_list(Config) ->
-    ?line L = lists:seq(0,255),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L++255,unicode)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary({1,2,3},unicode)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1,unicode)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1.0,unicode)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary('1',unicode)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,apa],unicode)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,4.0],unicode)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L++255,latin1)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary({1,2,3},latin1)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1,latin1)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1.0,latin1)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary('1',latin1)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,apa],latin1)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,4.0],latin1)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,gnarfl)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,L)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,{latin1})),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,[latin1])),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,1)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,1.0)),
+    L = lists:seq(0,255),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L++255,unicode)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary({1,2,3},unicode)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1,unicode)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1.0,unicode)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary('1',unicode)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,apa],unicode)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,4.0],unicode)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L++255,latin1)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary({1,2,3},latin1)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1,latin1)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1.0,latin1)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary('1',latin1)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,apa],latin1)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,4.0],latin1)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,gnarfl)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,L)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,{latin1})),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,[latin1])),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,1)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,1.0)),
     Encodings = [unicode, utf8,utf16,utf32,{utf16,big},
 		 {utf16,little},{utf32,big},{utf32,little}],
     [ begin
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L++255,unicode,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary({1,2,3},unicode,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1,unicode,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1.0,unicode,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary('1',unicode,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,apa],unicode,
-									  Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,4.0],unicode,
-									  Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L++255,latin1,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary({1,2,3},latin1,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1,latin1,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1.0,latin1,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary('1',latin1,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,apa],latin1,
-									  Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,4.0],latin1,
-									  Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,gnarfl,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,L,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,{latin1},Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,[latin1],Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,1,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,1.0,Enc))
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L++255,unicode,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary({1,2,3},unicode,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1,unicode,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1.0,unicode,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary('1',unicode,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,apa],unicode,
+								    Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,4.0],unicode,
+								    Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L++255,latin1,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary({1,2,3},latin1,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1,latin1,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(1.0,latin1,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary('1',latin1,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,apa],latin1,
+								    Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary([1,2,3,4.0],latin1,
+								    Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,gnarfl,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,L,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,{latin1},Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,[latin1],Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,1,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_binary(L,1.0,Enc))
       end || Enc <- Encodings ],
 
 
     Encodings2 = [latin1, unicode, utf8,utf16,utf32,{utf16,big},
-		 {utf16,little},{utf32,big},{utf32,little}],
+		  {utf16,little},{utf32,big},{utf32,little}],
     [ begin
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L++255,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_list({1,2,3},Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(1,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(1.0,Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_list('1',Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_list([1,2,3,apa],Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_list([1,2,3,4.0],Enc)),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L,{Enc})),
-	  ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L,[Enc]))
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L++255,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_list({1,2,3},Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(1,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(1.0,Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_list('1',Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_list([1,2,3,apa],Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_list([1,2,3,4.0],Enc)),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L,{Enc})),
+	  {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L,[Enc]))
       end || Enc <- Encodings2 ],
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L,gnarfl)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L,L)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L,1)),
-    ?line {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L,1.0)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L,gnarfl)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L,L)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L,1)),
+    {'EXIT',{badarg,_}} = (catch unicode:characters_to_list(L,1.0)),
     [ begin
-	  ?line Bx = unicode:characters_to_binary(L,latin1, Enc),
-	  ?line L = unicode:characters_to_list(Bx,Enc)
+	  Bx = unicode:characters_to_binary(L,latin1, Enc),
+	  L = unicode:characters_to_list(Bx,Enc)
       end || Enc <- Encodings ],
-    ?line B = unicode:characters_to_binary(L,latin1),
-    ?line L = unicode:characters_to_list(B,unicode),
-    ?line L = unicode:characters_to_list(list_to_binary(L),latin1),
-    ?line More = <<B/binary,0,1,2>>,
-    ?line B2 = list_to_binary([254,255]),
-    ?line B3 = list_to_binary([0,1,2,254,255]),
-    ?line {error,B,Rest1} = unicode:characters_to_binary([L,B2],unicode),
-    ?line B2 = iolist_to_binary(Rest1),
-    ?line {error,More,Rest2} = unicode:characters_to_binary([L,B3],unicode),
-    [ begin ?line {error,_,_} = unicode:characters_to_binary([L,B2],unicode,Enc) end
+    B = unicode:characters_to_binary(L,latin1),
+    L = unicode:characters_to_list(B,unicode),
+    L = unicode:characters_to_list(list_to_binary(L),latin1),
+    More = <<B/binary,0,1,2>>,
+    B2 = list_to_binary([254,255]),
+    B3 = list_to_binary([0,1,2,254,255]),
+    {error,B,Rest1} = unicode:characters_to_binary([L,B2],unicode),
+    B2 = iolist_to_binary(Rest1),
+    {error,More,Rest2} = unicode:characters_to_binary([L,B3],unicode),
+    [ begin {error,_,_} = unicode:characters_to_binary([L,B2],unicode,Enc) end
       || Enc <- Encodings ],
-    ?line Valid0 = unicode:characters_to_binary([L,254,255],unicode),
-    ?line Valid1 = unicode:characters_to_binary([L,254,255],latin1),
-    ?line Valid2 = unicode:characters_to_binary([L,254,255,256,257],unicode),
-    ?line Valid3 = unicode:characters_to_binary([L,B2],latin1),
-    ?line true = is_binary(Valid0),
-    ?line true = is_binary(Valid1),
-    ?line true = is_binary(Valid2),
-    ?line true = is_binary(Valid3),
-    ?line Valid4 = unicode:characters_to_binary([L,B3],latin1),
-    ?line true = is_binary(Valid4),
-    ?line B2 = iolist_to_binary(Rest2),
-    ?line true = (L ++ [254,255] =:=  unicode:characters_to_list(Valid0,unicode)),
-    ?line true = (L ++ [254,255,256,257] =:=  unicode:characters_to_list(Valid2,unicode)),
+    Valid0 = unicode:characters_to_binary([L,254,255],unicode),
+    Valid1 = unicode:characters_to_binary([L,254,255],latin1),
+    Valid2 = unicode:characters_to_binary([L,254,255,256,257],unicode),
+    Valid3 = unicode:characters_to_binary([L,B2],latin1),
+    true = is_binary(Valid0),
+    true = is_binary(Valid1),
+    true = is_binary(Valid2),
+    true = is_binary(Valid3),
+    Valid4 = unicode:characters_to_binary([L,B3],latin1),
+    true = is_binary(Valid4),
+    B2 = iolist_to_binary(Rest2),
+    true = (L ++ [254,255] =:=  unicode:characters_to_list(Valid0,unicode)),
+    true = (L ++ [254,255,256,257] =:=  unicode:characters_to_list(Valid2,unicode)),
     lists:foreach(fun(Enco) ->
-			  ?line Valid0x = unicode:characters_to_binary([L,254,255],unicode,Enco),
-			  ?line Valid1x = unicode:characters_to_binary([L,254,255],latin1,Enco),
-			  ?line Valid2x = unicode:characters_to_binary([L,254,255,256,257],unicode,Enco),
-			  ?line Valid3x = unicode:characters_to_binary([L,B2],latin1,Enco),
-			  ?line true = is_binary(Valid0x),
-			  ?line true = is_binary(Valid1x),
-			  ?line true = is_binary(Valid2x),
-			  ?line true = is_binary(Valid3x)
+			  Valid0x = unicode:characters_to_binary([L,254,255],unicode,Enco),
+			  Valid1x = unicode:characters_to_binary([L,254,255],latin1,Enco),
+			  Valid2x = unicode:characters_to_binary([L,254,255,256,257],unicode,Enco),
+			  Valid3x = unicode:characters_to_binary([L,B2],latin1,Enco),
+			  true = is_binary(Valid0x),
+			  true = is_binary(Valid1x),
+			  true = is_binary(Valid2x),
+			  true = is_binary(Valid3x)
 
 		  end, Encodings),
     ok.
-    
+
 
 latin1(Config) when is_list(Config) ->
     setlimit(10),
@@ -316,132 +316,132 @@ latin1(Config) when is_list(Config) ->
     ex_latin1(Config).
 
 ex_latin1(Config) when is_list(Config) ->
-    ?line All = lists:seq(0,255),
-    ?line AllBin = list_to_binary(All),
-    ?line AllUtf8 = unicode:characters_to_binary(All,latin1),
-    ?line AllUtf8 = unicode:characters_to_binary(AllBin,latin1),
-    ?line AllUtf8 = unicode:characters_to_binary([AllBin],latin1),
-    ?line AllUtf8 = unicode:characters_to_binary(make_unaligned(AllBin),latin1),
-    ?line AllUtf8 = unicode:characters_to_binary([make_unaligned(AllBin)],latin1),
-    ?line AllUtf8 = list_to_utf8_bsyntax([AllBin],latin1),
-    ?line AllUtf8 = list_to_utf8_bsyntax([make_unaligned(AllBin)],latin1),
-    ?line AllUtf8 = unicode_mixed_to_utf8_1(All),
-
-    ?line AllUtf16_Big = unicode:characters_to_binary(All,latin1,utf16),
-    ?line AllUtf16_Big = unicode:characters_to_binary(AllBin,latin1,utf16),
-    ?line AllUtf16_Big = unicode:characters_to_binary([AllBin],latin1,utf16),
-    ?line AllUtf16_Big = unicode:characters_to_binary(make_unaligned(AllBin),latin1,utf16),
-    ?line AllUtf16_Big = unicode:characters_to_binary([make_unaligned(AllBin)],latin1,utf16),
-    ?line AllUtf16_Big = list_to_utf16_big_bsyntax([AllBin],latin1),
-    ?line AllUtf16_Big = list_to_utf16_big_bsyntax([make_unaligned(AllBin)],latin1),
-
-    ?line AllUtf16_Little = unicode:characters_to_binary(All,latin1,{utf16,little}),
-    ?line AllUtf16_Little = unicode:characters_to_binary(AllBin,latin1,{utf16,little}),
-    ?line AllUtf16_Little = unicode:characters_to_binary([AllBin],latin1,{utf16,little}),
-    ?line AllUtf16_Little = unicode:characters_to_binary(make_unaligned(AllBin),latin1,
-							 {utf16,little}),
-    ?line AllUtf16_Little = unicode:characters_to_binary([make_unaligned(AllBin)],latin1,
-							 {utf16,little}),
-    ?line AllUtf16_Little = list_to_utf16_little_bsyntax([AllBin],latin1),
-    ?line AllUtf16_Little = list_to_utf16_little_bsyntax([make_unaligned(AllBin)],latin1),
-
-    ?line AllUtf32_Big = unicode:characters_to_binary(All,latin1,utf32),
-    ?line AllUtf32_Big = unicode:characters_to_binary(AllBin,latin1,utf32),
-    ?line AllUtf32_Big = unicode:characters_to_binary([AllBin],latin1,utf32),
-    ?line AllUtf32_Big = unicode:characters_to_binary(make_unaligned(AllBin),latin1,utf32),
-    ?line AllUtf32_Big = unicode:characters_to_binary([make_unaligned(AllBin)],latin1,utf32),
-    ?line AllUtf32_Big = list_to_utf32_big_bsyntax([AllBin],latin1),
-    ?line AllUtf32_Big = list_to_utf32_big_bsyntax([make_unaligned(AllBin)],latin1),
-
-    ?line AllUtf32_Little = unicode:characters_to_binary(All,latin1,{utf32,little}),
-    ?line AllUtf32_Little = unicode:characters_to_binary(AllBin,latin1,{utf32,little}),
-    ?line AllUtf32_Little = unicode:characters_to_binary([AllBin],latin1,{utf32,little}),
-    ?line AllUtf32_Little = unicode:characters_to_binary(make_unaligned(AllBin),latin1,
-							 {utf32,little}),
-    ?line AllUtf32_Little = unicode:characters_to_binary([make_unaligned(AllBin)],latin1,
-							 {utf32,little}),
-    ?line AllUtf32_Little = list_to_utf32_little_bsyntax([AllBin],latin1),
-    ?line AllUtf32_Little = list_to_utf32_little_bsyntax([make_unaligned(AllBin)],latin1),
-
-    ?line DoubleUtf8 = <<AllUtf8/binary,AllUtf8/binary>>,
-    ?line DoubleUtf8 = unicode:characters_to_binary([All,AllBin],latin1),
-    ?line DoubleUtf8 = 
+    All = lists:seq(0,255),
+    AllBin = list_to_binary(All),
+    AllUtf8 = unicode:characters_to_binary(All,latin1),
+    AllUtf8 = unicode:characters_to_binary(AllBin,latin1),
+    AllUtf8 = unicode:characters_to_binary([AllBin],latin1),
+    AllUtf8 = unicode:characters_to_binary(make_unaligned(AllBin),latin1),
+    AllUtf8 = unicode:characters_to_binary([make_unaligned(AllBin)],latin1),
+    AllUtf8 = list_to_utf8_bsyntax([AllBin],latin1),
+    AllUtf8 = list_to_utf8_bsyntax([make_unaligned(AllBin)],latin1),
+    AllUtf8 = unicode_mixed_to_utf8_1(All),
+
+    AllUtf16_Big = unicode:characters_to_binary(All,latin1,utf16),
+    AllUtf16_Big = unicode:characters_to_binary(AllBin,latin1,utf16),
+    AllUtf16_Big = unicode:characters_to_binary([AllBin],latin1,utf16),
+    AllUtf16_Big = unicode:characters_to_binary(make_unaligned(AllBin),latin1,utf16),
+    AllUtf16_Big = unicode:characters_to_binary([make_unaligned(AllBin)],latin1,utf16),
+    AllUtf16_Big = list_to_utf16_big_bsyntax([AllBin],latin1),
+    AllUtf16_Big = list_to_utf16_big_bsyntax([make_unaligned(AllBin)],latin1),
+
+    AllUtf16_Little = unicode:characters_to_binary(All,latin1,{utf16,little}),
+    AllUtf16_Little = unicode:characters_to_binary(AllBin,latin1,{utf16,little}),
+    AllUtf16_Little = unicode:characters_to_binary([AllBin],latin1,{utf16,little}),
+    AllUtf16_Little = unicode:characters_to_binary(make_unaligned(AllBin),latin1,
+						   {utf16,little}),
+    AllUtf16_Little = unicode:characters_to_binary([make_unaligned(AllBin)],latin1,
+						   {utf16,little}),
+    AllUtf16_Little = list_to_utf16_little_bsyntax([AllBin],latin1),
+    AllUtf16_Little = list_to_utf16_little_bsyntax([make_unaligned(AllBin)],latin1),
+
+    AllUtf32_Big = unicode:characters_to_binary(All,latin1,utf32),
+    AllUtf32_Big = unicode:characters_to_binary(AllBin,latin1,utf32),
+    AllUtf32_Big = unicode:characters_to_binary([AllBin],latin1,utf32),
+    AllUtf32_Big = unicode:characters_to_binary(make_unaligned(AllBin),latin1,utf32),
+    AllUtf32_Big = unicode:characters_to_binary([make_unaligned(AllBin)],latin1,utf32),
+    AllUtf32_Big = list_to_utf32_big_bsyntax([AllBin],latin1),
+    AllUtf32_Big = list_to_utf32_big_bsyntax([make_unaligned(AllBin)],latin1),
+
+    AllUtf32_Little = unicode:characters_to_binary(All,latin1,{utf32,little}),
+    AllUtf32_Little = unicode:characters_to_binary(AllBin,latin1,{utf32,little}),
+    AllUtf32_Little = unicode:characters_to_binary([AllBin],latin1,{utf32,little}),
+    AllUtf32_Little = unicode:characters_to_binary(make_unaligned(AllBin),latin1,
+						   {utf32,little}),
+    AllUtf32_Little = unicode:characters_to_binary([make_unaligned(AllBin)],latin1,
+						   {utf32,little}),
+    AllUtf32_Little = list_to_utf32_little_bsyntax([AllBin],latin1),
+    AllUtf32_Little = list_to_utf32_little_bsyntax([make_unaligned(AllBin)],latin1),
+
+    DoubleUtf8 = <<AllUtf8/binary,AllUtf8/binary>>,
+    DoubleUtf8 = unicode:characters_to_binary([All,AllBin],latin1),
+    DoubleUtf8 =
 	unicode:characters_to_binary([All,make_unaligned(AllBin)],latin1),
-    ?line DoubleUtf8 = unicode:characters_to_binary([All|AllBin],latin1),
-    ?line DoubleUtf8 = 
+    DoubleUtf8 = unicode:characters_to_binary([All|AllBin],latin1),
+    DoubleUtf8 =
 	unicode:characters_to_binary([All|make_unaligned(AllBin)],latin1),
-    ?line DoubleUtf8 = unicode:characters_to_binary([AllBin,All],latin1),
-    ?line DoubleUtf8 = unicode:characters_to_binary([AllBin|All],latin1),
-    ?line DoubleUtf8 = list_to_utf8_bsyntax([AllBin|All],latin1), 
+    DoubleUtf8 = unicode:characters_to_binary([AllBin,All],latin1),
+    DoubleUtf8 = unicode:characters_to_binary([AllBin|All],latin1),
+    DoubleUtf8 = list_to_utf8_bsyntax([AllBin|All],latin1),
 
-    ?line DoubleUtf16 = <<AllUtf16_Big/binary,AllUtf16_Big/binary>>,
-    ?line DoubleUtf16 = unicode:characters_to_binary([All,AllBin],latin1,{utf16,big}),
-    ?line DoubleUtf16 = 
+    DoubleUtf16 = <<AllUtf16_Big/binary,AllUtf16_Big/binary>>,
+    DoubleUtf16 = unicode:characters_to_binary([All,AllBin],latin1,{utf16,big}),
+    DoubleUtf16 =
 	unicode:characters_to_binary([All,make_unaligned(AllBin)],latin1,{utf16,big}),
-    ?line DoubleUtf16 = unicode:characters_to_binary([All|AllBin],latin1,{utf16,big}),
-    ?line DoubleUtf16 = 
+    DoubleUtf16 = unicode:characters_to_binary([All|AllBin],latin1,{utf16,big}),
+    DoubleUtf16 =
 	unicode:characters_to_binary([All|make_unaligned(AllBin)],latin1,{utf16,big}),
-    ?line DoubleUtf16 = unicode:characters_to_binary([AllBin,All],latin1,{utf16,big}),
-    ?line DoubleUtf16 = unicode:characters_to_binary([AllBin|All],latin1,{utf16,big}),
-    ?line DoubleUtf16 = list_to_utf16_big_bsyntax([AllBin|All],latin1), 
-
-    ?line All = unicode:characters_to_list(AllUtf8,unicode),
-    ?line All = unicode:characters_to_list(make_unaligned(AllUtf8),unicode),
-    ?line All = utf8_to_list_bsyntax(AllUtf8),
-    ?line AllAll = All ++ All,
-    ?line AllAll = unicode:characters_to_list(DoubleUtf8,unicode),
-    ?line AllAll = unicode:characters_to_list(make_unaligned(DoubleUtf8),unicode),
-    ?line AllAll = utf8_to_list_bsyntax(DoubleUtf8),
-    ?line {error,AllUtf8,Rest1} =  unicode:characters_to_binary(All++[16#FFF],latin1),
-    ?line [16#FFF] = lists:flatten(Rest1),
-    ?line {error,DoubleUtf8,Rest2} = 
+    DoubleUtf16 = unicode:characters_to_binary([AllBin,All],latin1,{utf16,big}),
+    DoubleUtf16 = unicode:characters_to_binary([AllBin|All],latin1,{utf16,big}),
+    DoubleUtf16 = list_to_utf16_big_bsyntax([AllBin|All],latin1),
+
+    All = unicode:characters_to_list(AllUtf8,unicode),
+    All = unicode:characters_to_list(make_unaligned(AllUtf8),unicode),
+    All = utf8_to_list_bsyntax(AllUtf8),
+    AllAll = All ++ All,
+    AllAll = unicode:characters_to_list(DoubleUtf8,unicode),
+    AllAll = unicode:characters_to_list(make_unaligned(DoubleUtf8),unicode),
+    AllAll = utf8_to_list_bsyntax(DoubleUtf8),
+    {error,AllUtf8,Rest1} =  unicode:characters_to_binary(All++[16#FFF],latin1),
+    [16#FFF] = lists:flatten(Rest1),
+    {error,DoubleUtf8,Rest2} =
 	unicode:characters_to_binary([All,AllBin,16#FFF],latin1),
-    ?line {error,DoubleUtf16,Rest2x} = 
+    {error,DoubleUtf16,Rest2x} =
 	unicode:characters_to_binary([All,AllBin,16#FFF],latin1,utf16),
-    ?line [16#FFF] = lists:flatten(Rest2),
-    ?line [16#FFF] = lists:flatten(Rest2x),
-    ?line {error,AllUtf8,Rest3} = 
+    [16#FFF] = lists:flatten(Rest2),
+    [16#FFF] = lists:flatten(Rest2x),
+    {error,AllUtf8,Rest3} =
 	unicode:characters_to_binary([All,16#FFF,AllBin,16#FFF],
-			    latin1),
-    ?line {error,AllUtf8,Rest3} = 
+				     latin1),
+    {error,AllUtf8,Rest3} =
 	unicode:characters_to_binary([All,16#FFF,make_unaligned(AllBin),16#FFF],
-			    latin1),
-    ?line {error,AllUtf16_Big,Rest3x} = 
+				     latin1),
+    {error,AllUtf16_Big,Rest3x} =
 	unicode:characters_to_binary([All,16#FFF,AllBin,16#FFF],
-			    latin1,{utf16,big}),
-    ?line {error,AllUtf16_Big,Rest3x} = 
+				     latin1,{utf16,big}),
+    {error,AllUtf16_Big,Rest3x} =
 	unicode:characters_to_binary([All,16#FFF,make_unaligned(AllBin),16#FFF],
-			    latin1,{utf16,big}),
-    ?line [16#FFF,AllBin,16#FFF] = lists:flatten(Rest3),
-    ?line [16#FFF,AllBin,16#FFF] = lists:flatten(Rest3x),
-    ?line DoubleSize = byte_size(DoubleUtf8),
-    ?line AllBut1 = DoubleSize - 1,
-    ?line AllBut2 = DoubleSize - 2,
-    ?line <<MissingLastByte:AllBut1/binary,_>> = DoubleUtf8,
-    ?line <<_:AllBut2/binary,MissingStart:1/binary,_>> = DoubleUtf8,
-    ?line {ChompedList,_} = lists:split(length(AllAll) - 1,AllAll),
-    ?line {incomplete,ChompedList,MissingStart} = 
+				     latin1,{utf16,big}),
+    [16#FFF,AllBin,16#FFF] = lists:flatten(Rest3),
+    [16#FFF,AllBin,16#FFF] = lists:flatten(Rest3x),
+    DoubleSize = byte_size(DoubleUtf8),
+    AllBut1 = DoubleSize - 1,
+    AllBut2 = DoubleSize - 2,
+    <<MissingLastByte:AllBut1/binary,_>> = DoubleUtf8,
+    <<_:AllBut2/binary,MissingStart:1/binary,_>> = DoubleUtf8,
+    {ChompedList,_} = lists:split(length(AllAll) - 1,AllAll),
+    {incomplete,ChompedList,MissingStart} =
 	unicode:characters_to_list(MissingLastByte,unicode),
-    ?line {incomplete,ChompedList,MissingStart} = 
+    {incomplete,ChompedList,MissingStart} =
 	unicode:characters_to_list(make_unaligned(MissingLastByte),unicode),
 
-    ?line DoubleSize16 = byte_size(DoubleUtf16),
-    ?line DoubleUtf16_2 = list_to_binary([DoubleUtf16,<<16#FFFFF/utf16-big>>]),
-    ?line DoubleSize16_2 = byte_size(DoubleUtf16_2),
-    ?line AllBut1_16 = DoubleSize16 - 1,
-    ?line AllBut2_16_2 = DoubleSize16_2 - 2,
-    ?line <<MissingLastBytes16:AllBut2_16_2/binary,_,_>> = DoubleUtf16_2,
-    ?line <<MissingLastByte16:AllBut1_16/binary,_>> = DoubleUtf16,
-    ?line {incomplete,AllAll,_} = 
+    DoubleSize16 = byte_size(DoubleUtf16),
+    DoubleUtf16_2 = list_to_binary([DoubleUtf16,<<16#FFFFF/utf16-big>>]),
+    DoubleSize16_2 = byte_size(DoubleUtf16_2),
+    AllBut1_16 = DoubleSize16 - 1,
+    AllBut2_16_2 = DoubleSize16_2 - 2,
+    <<MissingLastBytes16:AllBut2_16_2/binary,_,_>> = DoubleUtf16_2,
+    <<MissingLastByte16:AllBut1_16/binary,_>> = DoubleUtf16,
+    {incomplete,AllAll,_} =
 	unicode:characters_to_list(MissingLastBytes16,utf16),
-    ?line {incomplete,AllAll,_} = 
+    {incomplete,AllAll,_} =
 	unicode:characters_to_list(make_unaligned(MissingLastBytes16),utf16),
-    ?line {incomplete,ChompedList,_} = 
+    {incomplete,ChompedList,_} =
 	unicode:characters_to_list(MissingLastByte16,utf16),
-    ?line {incomplete,ChompedList,_} = 
+    {incomplete,ChompedList,_} =
 	unicode:characters_to_list(make_unaligned(MissingLastByte16),utf16),
     ok.
-    
+
 roundtrips(Config) when is_list(Config) ->
     setlimit(10),
     ex_roundtrips(Config),
@@ -449,23 +449,21 @@ roundtrips(Config) when is_list(Config) ->
     ex_roundtrips(Config).
 
 ex_roundtrips(Config) when is_list(Config) ->
-    ?line L1 = ranges(0, 16#D800 - 1, 
-		      erlang:system_info(context_reductions) * 11),
-    ?line L2 = ranges(16#DFFF + 1, 16#10000 - 1,
-		      erlang:system_info(context_reductions) * 11),
-    %?line L3 = ranges(16#FFFF + 1, 16#10FFFF, 
-    %		      erlang:system_info(context_reductions) * 11),
-    ?line L3 = ranges(16#FFFFF, 16#10FFFF, 
-		      erlang:system_info(context_reductions) * 11),
-    ?line L = L1 ++ L2 ++ L3,
-    ?line LLen = length(L),
-    ?line Parts = erlang:system_info(schedulers),
-    ?line Lists = splitup(L,LLen,Parts),
-    ?line PidRefs = [spawn_monitor(fun() ->
-					   do_roundtrips(MyPart)
-				   end) || MyPart <- Lists],
-    ?line [receive {'DOWN',Ref,process,Pid,Reason} -> normal=Reason end ||
-	      {Pid,Ref} <- PidRefs],
+    L1 = ranges(0, 16#D800 - 1,
+		erlang:system_info(context_reductions) * 11),
+    L2 = ranges(16#DFFF + 1, 16#10000 - 1,
+		erlang:system_info(context_reductions) * 11),
+    L3 = ranges(16#FFFFF, 16#10FFFF,
+		erlang:system_info(context_reductions) * 11),
+    L = L1 ++ L2 ++ L3,
+    LLen = length(L),
+    Parts = erlang:system_info(schedulers),
+    Lists = splitup(L,LLen,Parts),
+    PidRefs = [spawn_monitor(fun() ->
+				     do_roundtrips(MyPart)
+			     end) || MyPart <- Lists],
+    [receive {'DOWN',Ref,process,Pid,Reason} -> normal=Reason end ||
+	{Pid,Ref} <- PidRefs],
     ok.
 
 do_roundtrips([]) ->
@@ -529,10 +527,10 @@ ex_random_lists(Config) when is_list(Config) ->
     PlainFlatten4 = fun(L) ->
 			    iolist_to_binary([int_to_utf8(X) || X <- unicode:characters_to_list(flatb(L),latin1)])
 		    end,
-    ?line random_iolist:run(150, PlainFlatten1, PlainFlatten3),
-    ?line random_iolist:run(150, PlainFlatten2, PlainFlatten3),
-    ?line random_iolist:run(150, PlainFlatten1, PlainFlatten2),
-    ?line random_iolist:run(150, PlainFlatten1, PlainFlatten4),
+    random_iolist:run(150, PlainFlatten1, PlainFlatten3),
+    random_iolist:run(150, PlainFlatten2, PlainFlatten3),
+    random_iolist:run(150, PlainFlatten1, PlainFlatten2),
+    random_iolist:run(150, PlainFlatten1, PlainFlatten4),
     SelfMade = fun(L) ->
 		       iolist_to_binary(lists:map(fun(X) ->
 							  int_to_utf8(X)
@@ -548,52 +546,52 @@ ex_random_lists(Config) when is_list(Config) ->
 				Other
 			end
 		end,
-    ?line random_iolist:run(150, PlainFlatten1, SelfMade),
-    ?line random_iolist:run(150, PlainFlatten2, SelfMadeA),
+    random_iolist:run(150, PlainFlatten1, SelfMade),
+    random_iolist:run(150, PlainFlatten2, SelfMadeA),
 
     RoundTrip11 = fun(L) ->
-			 unicode:characters_to_list(unicode:characters_to_binary(L,latin1),unicode)
-		 end,
+			  unicode:characters_to_list(unicode:characters_to_binary(L,latin1),unicode)
+		  end,
     RoundTrip21 = fun(L) ->
-			 utf8_to_list_bsyntax(unicode:characters_to_binary(L,latin1))
-		 end,
+			  utf8_to_list_bsyntax(unicode:characters_to_binary(L,latin1))
+		  end,
     RoundTrip31 = fun(L) ->
-			 unicode:characters_to_list(list_to_utf8_bsyntax(L,latin1),unicode)
-		 end,
+			  unicode:characters_to_list(list_to_utf8_bsyntax(L,latin1),unicode)
+		  end,
     RoundTrip41 = fun(L) ->
-			 utf8_to_list_bsyntax(list_to_utf8_bsyntax(L,latin1))
-		 end,
+			  utf8_to_list_bsyntax(list_to_utf8_bsyntax(L,latin1))
+		  end,
     RoundTrip51 = fun(L) ->
-			 unicode:characters_to_list(L,latin1)
-		 end,
-    ?line random_iolist:run(150, RoundTrip11,RoundTrip21),
-    ?line random_iolist:run(150, RoundTrip21,RoundTrip31),
-    ?line random_iolist:run(150, RoundTrip31,RoundTrip41),
-    ?line random_iolist:run(150, RoundTrip11,RoundTrip41),
-    ?line random_iolist:run(150, RoundTrip21,RoundTrip41),
-    ?line random_iolist:run(150, RoundTrip11,RoundTrip31),
-    ?line random_iolist:run(150, RoundTrip11,RoundTrip51),
+			  unicode:characters_to_list(L,latin1)
+		  end,
+    random_iolist:run(150, RoundTrip11,RoundTrip21),
+    random_iolist:run(150, RoundTrip21,RoundTrip31),
+    random_iolist:run(150, RoundTrip31,RoundTrip41),
+    random_iolist:run(150, RoundTrip11,RoundTrip41),
+    random_iolist:run(150, RoundTrip21,RoundTrip41),
+    random_iolist:run(150, RoundTrip11,RoundTrip31),
+    random_iolist:run(150, RoundTrip11,RoundTrip51),
 
 
     UniFlatten1 = fun(L) ->
 			  unicode:characters_to_binary(flat(L),unicode)
 		  end,
     UniFlatten2 = fun(L) ->
-			    unicode:characters_to_binary(L,unicode)
+			  unicode:characters_to_binary(L,unicode)
 		  end,
     UniFlatten3 = fun(L) ->
-			    unicode:characters_to_binary(flatx(L),unicode)
+			  unicode:characters_to_binary(flatx(L),unicode)
 		  end,
     UniFlatten4 = fun(L) ->
-			    unicode:characters_to_binary(unicode:characters_to_list(L,unicode),unicode)
+			  unicode:characters_to_binary(unicode:characters_to_list(L,unicode),unicode)
 		  end,
-    ?line random_unicode_list:run(150, UniFlatten1,UniFlatten2),
-    ?line random_unicode_list:run(150, UniFlatten1,UniFlatten3),
-    ?line random_unicode_list:run(150, UniFlatten2,UniFlatten4),
-    ?line random_unicode_list:run(150, UniFlatten2,UniFlatten3),
+    random_unicode_list:run(150, UniFlatten1,UniFlatten2),
+    random_unicode_list:run(150, UniFlatten1,UniFlatten3),
+    random_unicode_list:run(150, UniFlatten2,UniFlatten4),
+    random_unicode_list:run(150, UniFlatten2,UniFlatten3),
 
-    ?line Encodings = [utf8,{utf16,big},
-		       {utf16,little},{utf32,big},{utf32,little}],
+    Encodings = [utf8,{utf16,big},
+		 {utf16,little},{utf32,big},{utf32,little}],
     lists:foreach(fun(OutEnc1) ->
 			  lists:foreach(fun(InEnc1) -> 
 						Uni16BigFlatten1 = fun(L) ->
@@ -608,11 +606,10 @@ ex_random_lists(Config) when is_list(Config) ->
 						Uni16BigFlatten4 = fun(L) ->
 									   unicode:characters_to_binary(unicode:characters_to_list(L,InEnc1),InEnc1,OutEnc1)
 								   end,
-						%erlang:display({InEnc1,OutEnc1}),
-						?line random_unicode_list:run(150, Uni16BigFlatten1,Uni16BigFlatten2,InEnc1),
-						?line random_unicode_list:run(150, Uni16BigFlatten1,Uni16BigFlatten3,InEnc1),
-						?line random_unicode_list:run(150, Uni16BigFlatten2,Uni16BigFlatten4,InEnc1),
-						?line random_unicode_list:run(150, Uni16BigFlatten2,Uni16BigFlatten3,InEnc1)
+						random_unicode_list:run(150, Uni16BigFlatten1,Uni16BigFlatten2,InEnc1),
+						random_unicode_list:run(150, Uni16BigFlatten1,Uni16BigFlatten3,InEnc1),
+						random_unicode_list:run(150, Uni16BigFlatten2,Uni16BigFlatten4,InEnc1),
+						random_unicode_list:run(150, Uni16BigFlatten2,Uni16BigFlatten3,InEnc1)
 					end, Encodings)
 		  end, Encodings),
     SelfMade1 = fun(L) ->
@@ -624,10 +621,10 @@ ex_random_lists(Config) when is_list(Config) ->
     SelfMade3 = fun(L) ->
 			list_to_utf8_bsyntax(L,unicode)
 		end,
-    ?line random_unicode_list:run(150, SelfMade1,SelfMade2),
-    ?line random_unicode_list:run(150, UniFlatten2, SelfMade1),
-    ?line random_unicode_list:run(150, UniFlatten2, SelfMade2),
-    ?line random_unicode_list:run(150, UniFlatten2, SelfMade3),
+    random_unicode_list:run(150, SelfMade1,SelfMade2),
+    random_unicode_list:run(150, UniFlatten2, SelfMade1),
+    random_unicode_list:run(150, UniFlatten2, SelfMade2),
+    random_unicode_list:run(150, UniFlatten2, SelfMade3),
     RoundTrip1 = fun(L) ->
 			 unicode:characters_to_list(unicode:characters_to_binary(L,unicode),unicode)
 		 end,
@@ -640,12 +637,12 @@ ex_random_lists(Config) when is_list(Config) ->
     RoundTrip4 = fun(L) ->
 			 utf8_to_list_bsyntax(list_to_utf8_bsyntax(L,unicode))
 		 end,
-    ?line random_unicode_list:run(150, RoundTrip1,RoundTrip2),
-    ?line random_unicode_list:run(150, RoundTrip2,RoundTrip3),
-    ?line random_unicode_list:run(150, RoundTrip3,RoundTrip4),
-    ?line random_unicode_list:run(150, RoundTrip1,RoundTrip4),
-    ?line random_unicode_list:run(150, RoundTrip2,RoundTrip4),
-    ?line random_unicode_list:run(150, RoundTrip1,RoundTrip3),
+    random_unicode_list:run(150, RoundTrip1,RoundTrip2),
+    random_unicode_list:run(150, RoundTrip2,RoundTrip3),
+    random_unicode_list:run(150, RoundTrip3,RoundTrip4),
+    random_unicode_list:run(150, RoundTrip1,RoundTrip4),
+    random_unicode_list:run(150, RoundTrip2,RoundTrip4),
+    random_unicode_list:run(150, RoundTrip1,RoundTrip3),
     lists:foreach(fun(OutEnc2) ->
 			  lists:foreach(fun(InEnc2) ->
 						RoundTripUtf16_Big_1 = fun(L) ->
@@ -660,12 +657,12 @@ ex_random_lists(Config) when is_list(Config) ->
 						RoundTripUtf16_Big_4 = fun(L) ->
 									       x_to_list_bsyntax(InEnc2,list_to_x_bsyntax(InEnc2,L,InEnc2))
 								       end,
-						?line random_unicode_list:run(150, RoundTripUtf16_Big_1,RoundTripUtf16_Big_2,InEnc2),
-						?line random_unicode_list:run(150, RoundTripUtf16_Big_2,RoundTripUtf16_Big_3,InEnc2),
-						?line random_unicode_list:run(150, RoundTripUtf16_Big_3,RoundTripUtf16_Big_4,InEnc2),
-						?line random_unicode_list:run(150, RoundTripUtf16_Big_1,RoundTripUtf16_Big_4,InEnc2),
-						?line random_unicode_list:run(150, RoundTripUtf16_Big_2,RoundTripUtf16_Big_4,InEnc2),
-						?line random_unicode_list:run(150, RoundTripUtf16_Big_1,RoundTripUtf16_Big_3,InEnc2)
+						random_unicode_list:run(150, RoundTripUtf16_Big_1,RoundTripUtf16_Big_2,InEnc2),
+						random_unicode_list:run(150, RoundTripUtf16_Big_2,RoundTripUtf16_Big_3,InEnc2),
+						random_unicode_list:run(150, RoundTripUtf16_Big_3,RoundTripUtf16_Big_4,InEnc2),
+						random_unicode_list:run(150, RoundTripUtf16_Big_1,RoundTripUtf16_Big_4,InEnc2),
+						random_unicode_list:run(150, RoundTripUtf16_Big_2,RoundTripUtf16_Big_4,InEnc2),
+						random_unicode_list:run(150, RoundTripUtf16_Big_1,RoundTripUtf16_Big_3,InEnc2)
 					end, Encodings)
 		  end, Encodings),
     ToList1 = fun(L) ->
@@ -680,12 +677,12 @@ ex_random_lists(Config) when is_list(Config) ->
     ToList4 = fun(L) ->
 		      utf8_to_list(unicode_mixed_to_utf8_2(L))
 	      end,
-    ?line random_unicode_list:run(150, ToList1,ToList2),
-    ?line random_unicode_list:run(150, ToList2,ToList3),
-    ?line random_unicode_list:run(150, ToList3,ToList4),
-    ?line random_unicode_list:run(150, ToList1,ToList4),
-    ?line random_unicode_list:run(150, ToList2,ToList4),
-    ?line random_unicode_list:run(150, ToList1,ToList3),
+    random_unicode_list:run(150, ToList1,ToList2),
+    random_unicode_list:run(150, ToList2,ToList3),
+    random_unicode_list:run(150, ToList3,ToList4),
+    random_unicode_list:run(150, ToList1,ToList4),
+    random_unicode_list:run(150, ToList2,ToList4),
+    random_unicode_list:run(150, ToList1,ToList3),
 
     ok.
 
@@ -696,13 +693,13 @@ utf16_illegal_sequences_bif(Config) when is_list(Config) ->
     ex_utf16_illegal_sequences_bif(Config).
 
 ex_utf16_illegal_sequences_bif(Config) when is_list(Config) ->
-    ?line utf16_fail_range_bif_simple(16#10FFFF+1, 16#10FFFF+512), %Too large.
-    ?line utf16_fail_range_bif(16#D800, 16#DFFF),		%Reserved for UTF-16.
+    utf16_fail_range_bif_simple(16#10FFFF+1, 16#10FFFF+512), %Too large.
+    utf16_fail_range_bif(16#D800, 16#DFFF),		%Reserved for UTF-16.
+
+    lonely_hi_surrogate_bif(16#D800, 16#DBFF,incomplete),
+    lonely_hi_surrogate_bif(16#DC00, 16#DFFF,error),
+    leading_lo_surrogate_bif(16#DC00, 16#DFFF),
 
-    ?line lonely_hi_surrogate_bif(16#D800, 16#DBFF,incomplete),
-    ?line lonely_hi_surrogate_bif(16#DC00, 16#DFFF,error),
-    ?line leading_lo_surrogate_bif(16#DC00, 16#DFFF),
-    
     ok.
 
 utf16_fail_range_bif(Char, End) when Char =< End ->
@@ -770,20 +767,20 @@ utf8_illegal_sequences_bif(Config) when is_list(Config) ->
     ex_utf8_illegal_sequences_bif(Config).
 
 ex_utf8_illegal_sequences_bif(Config) when is_list(Config) ->
-    ?line fail_range_bif(16#10FFFF+1, 16#10FFFF+512), %Too large.
-    ?line fail_range_bif(16#D800, 16#DFFF),		%Reserved for UTF-16.
+    fail_range_bif(16#10FFFF+1, 16#10FFFF+512), %Too large.
+    fail_range_bif(16#D800, 16#DFFF),		%Reserved for UTF-16.
 
     %% Illegal first character.
-    ?line [fail_bif(<<I,16#8F,16#8F,16#8F>>,unicode) || I <- lists:seq(16#80, 16#BF)],
+    [fail_bif(<<I,16#8F,16#8F,16#8F>>,unicode) || I <- lists:seq(16#80, 16#BF)],
 
     %% Short sequences.
-    ?line short_sequences_bif(16#80, 16#10FFFF),
+    short_sequences_bif(16#80, 16#10FFFF),
 
     %% Overlong sequences. (Using more bytes than necessary
     %% is not allowed.)
-    ?line overlong_bif(0, 127, 2),
-    ?line overlong_bif(128, 16#7FF, 3),
-    ?line overlong_bif(16#800, 16#FFFF, 4),
+    overlong_bif(0, 127, 2),
+    overlong_bif(128, 16#7FF, 3),
+    overlong_bif(16#800, 16#FFFF, 4),
     ok.
 
 fail_range_bif(Char, End) when Char =< End ->
@@ -797,7 +794,6 @@ fail_range_bif(_, _) -> ok.
 
 short_sequences_bif(Char, End) ->
     Step = (End - Char) div erlang:system_info(schedulers) + 1,
-%    Step = (End - Char) + 1,
     PidRefs = short_sequences_bif_1(Char, Step, End),
     [receive {'DOWN',Ref,process,Pid,Reason} -> normal=Reason end ||
 	{Pid,Ref} <- PidRefs],
@@ -918,8 +914,8 @@ only_fail_bif_1(Bin,Coding) ->
 	Other ->
 	    exit({faulty_encoding_accepted,[Bin],Coding,Other})
     end.
-    
-	    
+
+
 
 
 fail_bif(Bin,Coding) ->
@@ -1021,9 +1017,9 @@ unicode_mixed_to_utf8_2(L) ->
 			int_to_utf8(E)
 		end || E <- Flist ],
     iolist_to_binary([ExpList]).
-    
-    
-    
+
+
+
 
 utf8_to_list_bsyntax(<<>>) ->
     [];
@@ -1042,8 +1038,8 @@ list_to_utf8_bsyntax(List,latin1) ->
     FList = flatb(List),
     list_to_binary([ <<E/utf8>> || E <- FList ]).
 
-    
-    
+
+
 
 
 %%
@@ -1066,7 +1062,7 @@ int_to_utf16_little(U) when U >= 16#10000, U =< 16#10FFFF ->
     LO = (16#DC00 bor (UPrim band 16#3FF)),
     <<HI:16/little,LO:16/little>>.
 
-    
+
 %% This function intentionally allows construction of
 %% UTF-8 sequence in illegal ranges.
 int_to_utf8(I) when I =< 16#7F ->
@@ -1093,7 +1089,7 @@ int_to_utf8(I) when I =< 16#3FFFFFF ->
     B2 = (I bsr 18),
     B1 = (I bsr 24),
     <<1:1,1:1,1:1,1:1,1:1,0:1,B1:2,1:1,0:1,B2:6,1:1,0:1,B3:6,1:1,0:1,B4:6,
-     1:1,0:1,B5:6>>.
+      1:1,0:1,B5:6>>.
 
 utf16_big_to_list_bsyntax(<<>>) ->
     [];
@@ -1131,7 +1127,7 @@ list_to_utf16_little_bsyntax(List,latin1) ->
     list_to_binary([ <<E/utf16-little>> || E <- FList ]).
 
 
-    
+
 utf32_big_to_list_bsyntax(<<>>) ->
     [];
 utf32_big_to_list_bsyntax(<<C/utf32-big,R/binary>>) ->
@@ -1162,12 +1158,12 @@ list_to_utf32_little_bsyntax(List,{utf32,little}) ->
 			     E;
 			 true ->
 			     <<E/utf32-little>>
-		      end || E <- FList ]);
+		     end || E <- FList ]);
 list_to_utf32_little_bsyntax(List,latin1) ->
     FList = flatb(List),
     list_to_binary([ <<E/utf32-little>> || E <- FList ]).
 
-    
+
 
 %% int_to_utf8(I, NumberOfBytes) -> Binary.
 %%  This function can be used to construct overlong sequences.
@@ -1211,7 +1207,7 @@ utf8_to_int(<<1:1,1:1,0:1,B1:5,1:1,0:1,B2:6>>) ->
 utf8_to_int(<<1:1,1:1,1:1,0:1,B1:4,1:1,0:1,B2:6,1:1,0:1,B3:6>>) ->
     (B1 bsl 12) bor (B2 bsl 6) bor B3; 
 utf8_to_int(<<1:1,1:1,1:1,1:1,0:1,B1:3,1:1,0:1,
-	     B2:6,1:1,0:1,B3:6,1:1,0:1,B4:6>>) ->
+	      B2:6,1:1,0:1,B3:6,1:1,0:1,B4:6>>) ->
     Res = (B1 bsl 18) bor (B2 bsl 12) bor (B3 bsl 6) bor B4,
     case Res of
 	X when X > 16#10FFFF ->
@@ -1295,10 +1291,9 @@ list_to_x_bsyntax({utf32,big},L,Enc) ->
     list_to_utf32_big_bsyntax(L,Enc);
 list_to_x_bsyntax({utf32,little},L,Enc) ->
     list_to_utf32_little_bsyntax(L,Enc).
-    
+
 
 make_unaligned(Bin0) when is_binary(Bin0) ->
-%    put(c_count,get(c_count)+1),    
     Bin1 = <<0:3,Bin0/binary,31:5>>,
     Sz = byte_size(Bin0),
     <<0:3,Bin:Sz/binary,31:5>> = id(Bin1),
@@ -1310,80 +1305,3 @@ setlimit(X) ->
     erts_debug:set_internal_state(available_internal_state,true),
     io:format("Setting loop limit, old: ~p, now set to ~p~n",
 	      [erts_debug:set_internal_state(unicode_loop_limit,X),X]).
-
-
-%%
-%% Tracing utility
-%%
-
-%% tr_dump() ->
-%%     erlang:display(lists:sort(ets:tab2list(values))).
-
-%% tr_off(Pid) ->
-%%     receive after 10000 -> ok end,
-%%     tr_dump(),
-%%     Ref = erlang:monitor(process,Pid),
-%%     exit(Pid,kill),
-%%     receive
-%% 	{'DOWN',Ref,_,_,_} -> ok
-%%     end,
-%%     ok.
-
-%% tr_on() ->   
-%%     catch ets:delete(values),
-%%     ets:new(values,[named_table,public]),
-%%     ets:insert(values,{traps,0}),
-%%     catch ets:delete(state),
-%%     ets:new(state,[named_table,public]),
-%%     Pid = spawn(?MODULE,trace_recv,[values,state]),
-%%     erlang:trace(new,true,[garbage_collection,{tracer,Pid},timestamp,call]),
-%%     erlang:trace_pattern({erlang,list_to_utf8,2},[{'_',[],[{return_trace}]}],[global]),
-%%     Pid.
-
-%% ts_to_int({Mega,Sec,Micro}) ->
-%%     ((Mega * 1000000) + Sec) * 1000000 + Micro.
-
-%% trace_recv(Values,State) ->
-%%     receive
-%% 	{trace_ts,Pid,call,_,TS} ->
-%% 	    case ets:lookup(State,{call,Pid}) of
-%% 		[{{call,Pid},_}] ->
-%% 		    ets:update_counter(values,traps,1);
-%% 		_ ->
-%% 		    ok
-%% 	    end,
-%% 	    ets:insert(State,{{call,Pid},ts_to_int(TS)});
-%% 	{trace_ts,Pid,return_from,_,_,TS} ->
-%% 	    case ets:lookup(State,{call,Pid}) of
-%% 		[{{call,Pid},TS2}] ->
-%% 		    ets:delete(State,{call,Pid}),
-%% 		    Elapsed = ts_to_int(TS) - TS2,
-%% 		    case ets:lookup(Values,Pid) of
-%% 			[{Pid,GCNum,CallNum,GCTime,CallTime}] ->
-%% 			    ets:insert(Values,{Pid,GCNum,CallNum+1,GCTime,CallTime+Elapsed});
-%% 			[] ->
-%% 			     ets:insert(Values,{Pid,0,1,0,Elapsed})
-%% 		    end;
-%% 		_Other ->
-%% 		    erlang:display({what2,Pid})
-%% 	    end;
-%% 	{trace_ts,Pid,gc_start,_,TS} ->
-%% 	    ets:insert(State,{{gc,Pid},ts_to_int(TS)});
-%% 	{trace_ts,Pid,gc_end,_,TS} ->
-%% 	    case ets:lookup(State,{gc,Pid}) of
-%% 		[{{gc,Pid},TS2}] ->
-%% 		    ets:delete(State,{gc,Pid}),
-%% 		    Elapsed = ts_to_int(TS) - TS2,
-%% 		    case ets:lookup(Values,Pid) of
-%% 			[{Pid,Num,CNum,Time,CTime}] ->
-%% 			    ets:insert(Values,{Pid,Num+1,CNum,Time+Elapsed,CTime});
-%% 			[] ->
-%% 			     ets:insert(Values,{Pid,1,0,Elapsed,0})
-%% 		    end;
-%% 		_Other ->
-%% 		    erlang:display({what,Pid})
-%% 	    end;
-%% 	X ->
-%% 	    erlang:display({trace_recv,X})
-%%     end,
-%%     trace_recv(Values,State).
diff --git a/lib/stdlib/test/win32reg_SUITE.erl b/lib/stdlib/test/win32reg_SUITE.erl
index 82baa43318..62619dff47 100644
--- a/lib/stdlib/test/win32reg_SUITE.erl
+++ b/lib/stdlib/test/win32reg_SUITE.erl
@@ -22,9 +22,11 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,long/1,evil_write/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,10}}].
 
 all() -> 
     [long, evil_write].
@@ -49,54 +51,52 @@ init_per_suite(Config) when is_list(Config) ->
 end_per_suite(Config) when is_list(Config) ->
     Config.
 
-long(doc) -> "Test long keys and entries (OTP-3446).";
+%% Test long keys and entries (OTP-3446).
 long(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-
-    ?line LongKey = "software\\" ++
+    LongKey = "software\\" ++
 	lists:flatten(lists:duplicate(10, "..\\software\\")) ++
 	"Ericsson\\Erlang",
-    ?line {ok,Reg} = win32reg:open([read,write]),
-    ?line ok = win32reg:change_key(Reg, "\\hklm"),
-    ?line ok = win32reg:change_key(Reg, LongKey),
-    ?line {ok,ErlangKey} = win32reg:current_key(Reg),
-    io:format("Erlang key: ~s", [ErlangKey]),
+    {ok,Read} = win32reg:open([read]),
+    ok = win32reg:change_key(Read, "\\hklm"),
 
+    ok = win32reg:change_key(Read, LongKey),
+    {ok,ErlangKey} = win32reg:current_key(Read),
+    io:format("Erlang key: ~s~n", [ErlangKey]),
+    ok = win32reg:close(Read),
+
+    {ok,Reg} = win32reg:open([read, write]),
     %% Write a long value and read it back.
-    ?line TestKey = "test_key",
-    ?line LongValue = lists:concat(["This is a long value generated by the test case ",?MODULE,":long/1. "|lists:duplicate(128, "a")]),
-    ?line ok = win32reg:set_value(Reg, TestKey, LongValue),
-    ?line {ok,LongValue} = win32reg:value(Reg, TestKey),
+    TestKey = "test_key",
+    LongValue = lists:concat(["This is a long value generated by the test case ",?MODULE,":long/1. "|lists:duplicate(128, "a")]),
+    ok = win32reg:set_value(Reg, TestKey, LongValue),
+    {ok,LongValue} = win32reg:value(Reg, TestKey),
 
+    io:format("Where ~p Key ~s Value ~s ~n", [win32reg:current_key(Reg), TestKey, LongValue]),
     %% Done.
 
-    ?line ok = win32reg:close(Reg),
-    ?line test_server:timetrap_cancel(Dog),
+    ok = win32reg:close(Reg),
     ok.
 
 evil_write(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-
-    ?line Key = "Software\\Ericsson\\Erlang",
-    ?line {ok,Reg} = win32reg:open([read,write]),
-    ?line ok = win32reg:change_key(Reg, "\\hklm"),
-    ?line ok = win32reg:change_key(Reg, Key),
-    ?line {ok,ErlangKey} = win32reg:current_key(Reg),
+    Key = "Software\\Ericsson\\Erlang",
+    {ok,Reg} = win32reg:open([read,write]),
+    ok = win32reg:change_key(Reg, "\\hkcu"),
+    ok = win32reg:change_key_create(Reg, Key),
+    {ok,ErlangKey} = win32reg:current_key(Reg),
     io:format("Erlang key: ~s", [ErlangKey]),
 
     %% Write keys with different length and read it back.
-    ?line TestKey = "test_key " ++ lists:duplicate(128, $a),
+    TestKey = "test_key " ++ lists:duplicate(128, $a),
     evil_write_1(Reg, TestKey),
 
     %% Done.
-    ?line ok = win32reg:close(Reg),
-    ?line test_server:timetrap_cancel(Dog),
+    ok = win32reg:close(Reg),
     ok.
 
 evil_write_1(Reg, [_|[_|_]=Key]=Key0) ->
-    ?line io:format("Key = ~p\n", [Key0]),
-    ?line ok = win32reg:set_value(Reg, Key0, "A good value for me"),
-    ?line {ok,_Val} = win32reg:value(Reg, Key0),
-    ?line ok = win32reg:delete_value(Reg, Key0),
+    io:format("Key = ~p\n", [Key0]),
+    ok = win32reg:set_value(Reg, Key0, "A good value for me"),
+    {ok,_Val} = win32reg:value(Reg, Key0),
+    ok = win32reg:delete_value(Reg, Key0),
     evil_write_1(Reg, Key);
 evil_write_1(_, [_]) -> ok.
diff --git a/lib/stdlib/test/y2k_SUITE.erl b/lib/stdlib/test/y2k_SUITE.erl
index 9e766e80ab..7828eb26ed 100644
--- a/lib/stdlib/test/y2k_SUITE.erl
+++ b/lib/stdlib/test/y2k_SUITE.erl
@@ -22,7 +22,7 @@
 
 -module(y2k_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
@@ -55,104 +55,80 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-date_1999_01_01(doc) ->
-    "#1 : 1999-01-01: test roll-over from 1998-12-31 to 1999-01-01.";
-date_1999_01_01(suite) ->
-    [];
+%% #1 : 1999-01-01: test roll-over from 1998-12-31 to 1999-01-01.
 date_1999_01_01(Config) when is_list(Config) ->
-    ?line Date = {1998, 12, 31}, NextDate = {1999, 1, 1},
-    ?line match(next_date(Date), NextDate),
+    Date = {1998, 12, 31}, NextDate = {1999, 1, 1},
+    match(next_date(Date), NextDate),
     TZD = tzd(Date),
     if 
 	TZD > 0 ->
-	    ?line Time = {24 - TZD, 0, 0},
-	    ?line {NDate, _NTime} = 
+	    Time = {24 - TZD, 0, 0},
+	    {NDate, _NTime} =
 		erlang:localtime_to_universaltime({Date, Time}),
-	    ?line match(NDate, NextDate);
+	    match(NDate, NextDate);
 	TZD < 0  ->
-	    ?line Time = {24 + TZD, 0, 0},
-	    ?line {NDate, _NTime} = 
+	    Time = {24 + TZD, 0, 0},
+	    {NDate, _NTime} =
 		erlang:universaltime_to_localtime({Date, Time}),
-	    ?line match(NDate, NextDate);
+	    match(NDate, NextDate);
 	true  ->
 	    ok
     end.
-    
-date_1999_02_28(doc) ->
-    "#2 : 1999-02-28: test roll-over from 1999-02-28 to 1999-03-01.";
-date_1999_02_28(suite) ->
-    [];
+
+%% #2 : 1999-02-28: test roll-over from 1999-02-28 to 1999-03-01.
 date_1999_02_28(Config) when is_list(Config) ->
-    ?line Date = {1999, 2, 28}, NextDate = {1999, 3, 1},
-    ?line match(next_date(Date), NextDate),
-    ?line match(tz_next_date(Date), NextDate).
-
-date_1999_09_09(doc) ->
-    "#3 : 1999-09-09: test roll-over from 1999-09-08 to 1999-09-09.";
-date_1999_09_09(suite) ->
-    [];
+    Date = {1999, 2, 28}, NextDate = {1999, 3, 1},
+    match(next_date(Date), NextDate),
+    match(tz_next_date(Date), NextDate).
+
+%% #3 : 1999-09-09: test roll-over from 1999-09-08 to 1999-09-09.
 date_1999_09_09(Config) when is_list(Config) ->
-    ?line Date = {1999, 9, 8}, NextDate = {1999, 9, 9},
-    ?line match(next_date(Date), NextDate),
-    ?line match(tz_next_date(Date), NextDate).
-
-date_2000_01_01(doc) ->
-    "#4 : 2000-01-01: test roll-over from 1999-12-31 to 2000-01-01 to "
-    "2000-01-02.";
-date_2000_01_01(suite) ->
-    [];
+    Date = {1999, 9, 8}, NextDate = {1999, 9, 9},
+    match(next_date(Date), NextDate),
+    match(tz_next_date(Date), NextDate).
+
+%% #4 : 2000-01-01: test roll-over from 1999-12-31 to 2000-01-01 to
+%% 2000-01-02.;
 date_2000_01_01(Config) when is_list(Config) ->
-    ?line Date = {1999, 12, 31}, NextDate = {2000, 1, 1},
-    ?line match(next_date(Date), NextDate),
-    ?line match(tz_next_date(Date), NextDate),
-    ?line NextDate1 = {2000, 1, 2},
-    ?line match(next_date(NextDate), NextDate1),
-    ?line match(tz_next_date(NextDate), NextDate1).
-
-date_2000_02_29(doc) ->
-    "#5 : 2000-02-29: test roll-over from 2000-02-28 to 2000-02-29 to "
-    "2000-03-01.";
-date_2000_02_29(suite) ->
-    [];
+    Date = {1999, 12, 31}, NextDate = {2000, 1, 1},
+    match(next_date(Date), NextDate),
+    match(tz_next_date(Date), NextDate),
+    NextDate1 = {2000, 1, 2},
+    match(next_date(NextDate), NextDate1),
+    match(tz_next_date(NextDate), NextDate1).
+
+%% #5 : 2000-02-29: test roll-over from 2000-02-28 to 2000-02-29 to
+%% 2000-03-01.
 date_2000_02_29(Config) when is_list(Config) ->
-    ?line Date = {2000, 2, 28}, NextDate = {2000, 2, 29},
-    ?line match(next_date(Date), NextDate),
-    ?line match(tz_next_date(Date), NextDate),
-    ?line NextDate1 = {2000, 3, 1},
-    ?line match(next_date(NextDate), NextDate1),
-    ?line match(tz_next_date(NextDate), NextDate1).
-
-date_2001_01_01(doc) ->
-    "#6 : 2001-01-01: test roll-over from 2000-12-31 to 2001-01-01.";
-date_2001_01_01(suite) ->
-    [];
+    Date = {2000, 2, 28}, NextDate = {2000, 2, 29},
+    match(next_date(Date), NextDate),
+    match(tz_next_date(Date), NextDate),
+    NextDate1 = {2000, 3, 1},
+    match(next_date(NextDate), NextDate1),
+    match(tz_next_date(NextDate), NextDate1).
+
+%% #6 : 2001-01-01: test roll-over from 2000-12-31 to 2001-01-01.
 date_2001_01_01(Config) when is_list(Config) ->
-    ?line Date = {2000, 12, 31}, NextDate = {2001, 1, 1},
-    ?line match(next_date(Date), NextDate),
-    ?line match(tz_next_date(Date), NextDate).
-
-date_2001_02_29(doc) ->
-    "#7 : 2001-02-29: test roll-over from 2001-02-28 to 2001-03-01.";
-date_2001_02_29(suite) ->
-    [];
+    Date = {2000, 12, 31}, NextDate = {2001, 1, 1},
+    match(next_date(Date), NextDate),
+    match(tz_next_date(Date), NextDate).
+
+%% #7 : 2001-02-29: test roll-over from 2001-02-28 to 2001-03-01.
 date_2001_02_29(Config) when is_list(Config) ->
-    ?line Date = {2001, 2, 28}, NextDate = {2001, 3, 1},
-    ?line match(next_date(Date), NextDate),
-    ?line match(tz_next_date(Date), NextDate).
-
-date_2004_02_29(doc) ->
-    "#8 : 2004-02-29: test roll-over from 2004-02-28 to 2004-02-29 to "
-    "2004-03-01.";
-date_2004_02_29(suite) ->
-    [];
+    Date = {2001, 2, 28}, NextDate = {2001, 3, 1},
+    match(next_date(Date), NextDate),
+    match(tz_next_date(Date), NextDate).
+
+%% #8 : 2004-02-29: test roll-over from 2004-02-28 to 2004-02-29 to
+%% 2004-03-01.
 date_2004_02_29(Config) when is_list(Config) ->
-    ?line Date = {2004, 2, 28}, NextDate = {2004, 2, 29},
-    ?line match(next_date(Date), NextDate),
-    ?line match(tz_next_date(Date), NextDate),
-    ?line NextDate1 = {2004, 3, 1},
-    ?line match(next_date(NextDate), NextDate1),
-    ?line match(tz_next_date(NextDate), NextDate1).
-   
+    Date = {2004, 2, 28}, NextDate = {2004, 2, 29},
+    match(next_date(Date), NextDate),
+    match(tz_next_date(Date), NextDate),
+    NextDate1 = {2004, 3, 1},
+    match(next_date(NextDate), NextDate1),
+    match(tz_next_date(NextDate), NextDate1).
+
 %%
 %% Local functions
 %%
@@ -162,7 +138,7 @@ next_date(Date) ->
 %% timezonediff
 %%
 tzd(Date) ->
-    ?line {_LDate, {LH, _LM, _LS}} = 
+    {_LDate, {LH, _LM, _LS}} =
 	erlang:universaltime_to_localtime({Date, {12, 0, 0}}),
     12 - LH.
 
@@ -170,15 +146,15 @@ tz_next_date(Date) ->
     TZD = tzd(Date),
     if 
 	TZD > 0 ->
-	    ?line Time = {24 - TZD, 0, 0},
-	    ?line {NDate, _NTime} = 
+	    Time = {24 - TZD, 0, 0},
+	    {NDate, _NTime} =
 		erlang:localtime_to_universaltime({Date, Time}),
-	    ?line NDate;
+	    NDate;
 	TZD < 0  ->
-	    ?line Time = {24 + TZD, 0, 0},
-	    ?line {NDate, _NTime} = 
+	    Time = {24 + TZD, 0, 0},
+	    {NDate, _NTime} =
 		erlang:universaltime_to_localtime({Date, Time}),
-	    ?line NDate;
+	    NDate;
 	true  ->
 	    Date
     end.
@@ -189,6 +165,3 @@ tz_next_date(Date) ->
 
 match(X, X) ->
     ok.
-
-
-
diff --git a/lib/stdlib/test/zip_SUITE.erl b/lib/stdlib/test/zip_SUITE.erl
index c275053691..57ad869f24 100644
--- a/lib/stdlib/test/zip_SUITE.erl
+++ b/lib/stdlib/test/zip_SUITE.erl
@@ -28,8 +28,7 @@
          compress_control/1,
 	 foldl/1]).
 
--include_lib("test_server/include/test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 -include_lib("stdlib/include/zip.hrl").
 
@@ -57,12 +56,11 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-borderline(doc) ->
-    ["Test creating, listing and extracting one file from an archive "
-     "multiple times with different file sizes. Also check that the "
-     "modification date of the extracted file has survived."];
+%% Test creating, listing and extracting one file from an archive
+%% multiple times with different file sizes. Also check that the
+%% modification date of the extracted file has survived.
 borderline(Config) when is_list(Config) ->
-    RootDir = ?config(priv_dir, Config),
+    RootDir = proplists:get_value(priv_dir, Config),
     TempDir = filename:join(RootDir, "borderline"),
     ok = file:make_dir(TempDir),
 
@@ -179,7 +177,7 @@ match_output(eof, Expect, Port) ->
 kill_port_and_fail(Port, Reason) ->
     unlink(Port),
     exit(Port, die),
-    test_server:fail(Reason).
+    ct:fail(Reason).
 
 make_cmd(Cmd) ->
     Cmd.
@@ -216,12 +214,10 @@ random_byte_list(_X, 0, Result) ->
 next_random(X) ->
     (X*17059465+1) band 16#fffffffff.
 
-atomic(doc) ->
-    ["Test the 'atomic' operations: zip/unzip/list_dir, on archives."
-     "Also test the 'cooked' option."];
-atomic(suite) -> [];
+%% Test the 'atomic' operations: zip/unzip/list_dir, on archives.
+%% Also test the 'cooked' option.
 atomic(Config) when is_list(Config) ->
-    ok = file:set_cwd(?config(priv_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(priv_dir, Config)),
     DataFiles = data_files(),
     Names = [Name || {Name,_,_} <- DataFiles],
     io:format("Names: ~p", [Names]),
@@ -244,12 +240,10 @@ atomic(Config) when is_list(Config) ->
 
     ok.
 
-openzip_api(doc) ->
-    ["Test the openzip_open/2, openzip_get/1, openzip_get/2, openzip_close/1 "
-     "and openzip_list_dir/1 functions."];
-openzip_api(suite) -> [];
+%% Test the openzip_open/2, openzip_get/1, openzip_get/2, openzip_close/1
+%% and openzip_list_dir/1 functions.
 openzip_api(Config) when is_list(Config) ->
-    ok = file:set_cwd(?config(priv_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(priv_dir, Config)),
     DataFiles = data_files(),
     Names = [Name || {Name, _, _} <- DataFiles],
     io:format("Names: ~p", [Names]),
@@ -283,12 +277,10 @@ openzip_api(Config) when is_list(Config) ->
 
     ok.
 
-zip_api(doc) ->
-    ["Test the zip_open/2, zip_get/1, zip_get/2, zip_close/1 "
-     "and zip_list_dir/1 functions."];
-zip_api(suite) -> [];
+%% Test the zip_open/2, zip_get/1, zip_get/2, zip_close/1,
+%% and zip_list_dir/1 functions.
 zip_api(Config) when is_list(Config) ->
-    ok = file:set_cwd(?config(priv_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(priv_dir, Config)),
     DataFiles = data_files(),
     Names = [Name || {Name, _, _} <- DataFiles],
     io:format("Names: ~p", [Names]),
@@ -319,13 +311,11 @@ zip_api(Config) when is_list(Config) ->
     %% Clean up.
     delete_files([Names]),
 
-   ok.
+    ok.
 
-open_leak(doc) ->
-    ["Test that zip doesn't leak processes and ports where the "
-     "controlling process dies without closing an zip opened with "
-     "zip:zip_open/1."];
-open_leak(suite) -> [];
+%% Test that zip doesn't leak processes and ports where the
+%% controlling process dies without closing an zip opened with
+%% zip:zip_open/1.
 open_leak(Config) when is_list(Config) ->
     %% Create a zip archive
     Zip = "zip.zip",
@@ -359,13 +349,10 @@ spawned_zip_dead(ZipSrv) ->
             false
     end.
 
-unzip_options(doc) ->
-    ["Test options for unzip, only cwd and file_list currently"];
-unzip_options(suite) ->
-    [];
+%% Test options for unzip, only cwd and file_list currently.
 unzip_options(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     Long = filename:join(DataDir, "abc.zip"),
 
     %% create a temp directory
@@ -375,28 +362,25 @@ unzip_options(Config) when is_list(Config) ->
     FList = ["quotes/rain.txt","wikipedia.txt"],
 
     %% Unzip a zip file in Subdir
-    ?line {ok, RetList} = zip:unzip(Long, [{cwd, Subdir},
-                                           {file_list, FList}]),
+    {ok, RetList} = zip:unzip(Long, [{cwd, Subdir},
+				     {file_list, FList}]),
 
     %% Verify.
-    ?line true = (length(FList) =:= length(RetList)),
-    ?line lists:foreach(fun(F)-> {ok,B} = file:read_file(filename:join(DataDir, F)),
-                                 {ok,B} = file:read_file(filename:join(Subdir, F)) end,
-                        FList),
-    ?line lists:foreach(fun(F)-> ok = file:delete(F) end,
-                        RetList),
+    true = (length(FList) =:= length(RetList)),
+    lists:foreach(fun(F)-> {ok,B} = file:read_file(filename:join(DataDir, F)),
+			   {ok,B} = file:read_file(filename:join(Subdir, F)) end,
+		  FList),
+    lists:foreach(fun(F)-> ok = file:delete(F) end,
+		  RetList),
 
     %% Clean up and verify no more files.
-    ?line 0 = delete_files([Subdir]),
+    0 = delete_files([Subdir]),
     ok.
 
-unzip_jar(doc) ->
-    ["Test unzip a jar file (OTP-7382)"];
-unzip_jar(suite) ->
-    [];
+%% Test unzip a jar file (OTP-7382).
 unzip_jar(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     JarFile = filename:join(DataDir, "test.jar"),
 
     %% create a temp directory
@@ -409,28 +393,25 @@ unzip_jar(Config) when is_list(Config) ->
     {ok, RetList} = zip:unzip(JarFile),
 
     %% Verify.
-    ?line lists:foreach(fun(F)-> {ok,B} = file:read_file(filename:join(DataDir, F)),
-                                 {ok,B} = file:read_file(filename:join(Subdir, F)) end,
-                        FList),
-    ?line lists:foreach(fun(F)-> ok = file:delete(F) end,
-                        RetList),
+    lists:foreach(fun(F)-> {ok,B} = file:read_file(filename:join(DataDir, F)),
+			   {ok,B} = file:read_file(filename:join(Subdir, F)) end,
+		  FList),
+    lists:foreach(fun(F)-> ok = file:delete(F) end,
+		  RetList),
 
     %% Clean up and verify no more files.
-    ?line 0 = delete_files([Subdir]),
+    0 = delete_files([Subdir]),
     ok.
 
-zip_options(doc) ->
-    ["Test the options for unzip, only cwd currently"];
-zip_options(suite) ->
-    [];
+%% Test the options for unzip, only cwd currently.
 zip_options(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     ok = file:set_cwd(PrivDir),
     DataFiles = data_files(),
     Names = [Name || {Name, _, _} <- DataFiles],
 
     %% Make sure cwd is not where we get the files
-    ok = file:set_cwd(?config(data_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(data_dir, Config)),
 
     %% Create a zip archive
     {ok, {_,Zip}} =
@@ -460,10 +441,7 @@ zip_options(Config) when is_list(Config) ->
 
     ok.
 
-list_dir_options(doc) ->
-    ["Test the options for list_dir... one day"];
-list_dir_options(suite) ->
-    [];
+%% Test the options for list_dir... one day.
 list_dir_options(Config) when is_list(Config) ->
     ok.
 
@@ -515,10 +493,9 @@ create_files([]) ->
 %% make_dirs([], Dir) ->
 %%     Dir.
 
-bad_zip(doc) ->
-    ["Try zip:unzip/1 on some corrupted zip files."];
+%% Try zip:unzip/1 on some corrupted zip files.
 bad_zip(Config) when is_list(Config) ->
-    ok = file:set_cwd(?config(priv_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(priv_dir, Config)),
     try_bad("bad_crc",    {bad_crc, "abc.txt"}, Config),
     try_bad("bad_central_directory", bad_central_directory, Config),
     try_bad("bad_file_header",    bad_file_header, Config),
@@ -538,7 +515,7 @@ try_bad(N, R, Config) ->
 try_bad(Name0, Reason, What, Config) ->
     %% Intentionally no macros here.
 
-    DataDir = ?config(data_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
     Name = Name0 ++ ".zip",
     io:format("~nTrying ~s", [Name]),
     Full = filename:join(DataDir, Name),
@@ -548,14 +525,13 @@ try_bad(Name0, Reason, What, Config) ->
             io:format("Result: ~p\n", [Expected]);
         Other ->
             io:format("unzip/2 returned ~p (expected ~p)\n", [Other, Expected]),
-            test_server:fail({bad_return_value, Other})
+            ct:fail({bad_return_value, Other})
     end.
 
-unzip_to_binary(doc) ->
-    ["Test extracting to binary with memory option."];
+%% Test extracting to binary with memory option.
 unzip_to_binary(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     WorkDir = filename:join(PrivDir, "unzip_to_binary"),
     _ = file:make_dir(WorkDir),
 
@@ -574,11 +550,10 @@ unzip_to_binary(Config) when is_list(Config) ->
 
     ok.
 
-zip_to_binary(doc) ->
-    ["Test compressing to binary with memory option."];
+%% Test compressing to binary with memory option.
 zip_to_binary(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     WorkDir = filename:join(PrivDir, "zip_to_binary"),
     _ = file:make_dir(WorkDir),
 
@@ -607,8 +582,7 @@ zip_to_binary(Config) when is_list(Config) ->
 
     ok.
 
-aliases(doc) ->
-    ["Test using the aliases, extract/2, table/2 and create/3"];
+%% Test using the aliases, extract/2, table/2 and create/3.
 aliases(Config) when is_list(Config) ->
     {_, _, X0} = erlang:timestamp(),
     Size = 100,
@@ -629,11 +603,10 @@ aliases(Config) when is_list(Config) ->
 
 
 
-unzip_from_binary(doc) ->
-    ["Test extracting a zip archive from a binary."];
+%% Test extracting a zip archive from a binary.
 unzip_from_binary(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
-    PrivDir = ?config(priv_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     ExtractDir = filename:join(PrivDir, "extract_from_binary"),
     ok = file:make_dir(ExtractDir),
     Archive = filename:join(ExtractDir, "abc.zip"),
@@ -699,11 +672,9 @@ do_delete_files([Item|Rest], Cnt) ->
     end,
     do_delete_files(Rest, Cnt + DelCnt).
 
-compress_control(doc) ->
-    ["Test control of which files that should be compressed"];
-compress_control(suite) -> [];
+%% Test control of which files that should be compressed.
 compress_control(Config) when is_list(Config) ->
-    ok = file:set_cwd(?config(priv_dir, Config)),
+    ok = file:set_cwd(proplists:get_value(priv_dir, Config)),
     Dir = "compress_control",
     Files = [
              {Dir,                                                          dir,   $d},
@@ -834,32 +805,32 @@ extensions([], Old) ->
     Old.
 
 foldl(Config) ->
-    PrivDir = ?config(priv_dir, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
     File = filename:join([PrivDir, "foldl.zip"]),
 
     FooBin = <<"FOO">>,
     BarBin = <<"BAR">>,
     Files = [{"foo", FooBin}, {"bar", BarBin}],
-    ?line {ok, {File, Bin}} = zip:create(File, Files, [memory]),
+    {ok, {File, Bin}} = zip:create(File, Files, [memory]),
     ZipFun = fun(N, I, B, Acc) -> [{N, B(), I()} | Acc] end,
-    ?line {ok, FileSpec} = zip:foldl(ZipFun, [], {File, Bin}),
-    ?line [{"bar", BarBin, #file_info{}}, {"foo", FooBin, #file_info{}}] = FileSpec,
-    ?line {ok, {File, Bin}} = zip:create(File, lists:reverse(FileSpec), [memory]),
-    ?line {foo_bin, FooBin} =
+    {ok, FileSpec} = zip:foldl(ZipFun, [], {File, Bin}),
+    [{"bar", BarBin, #file_info{}}, {"foo", FooBin, #file_info{}}] = FileSpec,
+    {ok, {File, Bin}} = zip:create(File, lists:reverse(FileSpec), [memory]),
+    {foo_bin, FooBin} =
 	try
 	    zip:foldl(fun("foo", _, B, _) -> throw(B()); (_, _, _, Acc) -> Acc end, [], {File, Bin})
 	catch
 	    throw:FooBin ->
 		{foo_bin, FooBin}
 	end,
-    ?line ok = file:write_file(File, Bin),
-    ?line {ok, FileSpec} = zip:foldl(ZipFun, [], File),
+    ok = file:write_file(File, Bin),
+    {ok, FileSpec} = zip:foldl(ZipFun, [], File),
 
-    ?line {error, einval} = zip:foldl(fun() -> ok end, [], File),
-    ?line {error, einval} = zip:foldl(ZipFun, [], 42),
-    ?line {error, einval} = zip:foldl(ZipFun, [], {File, 42}),
+    {error, einval} = zip:foldl(fun() -> ok end, [], File),
+    {error, einval} = zip:foldl(ZipFun, [], 42),
+    {error, einval} = zip:foldl(ZipFun, [], {File, 42}),
 
-    ?line ok = file:delete(File),
-    ?line {error, enoent} = zip:foldl(ZipFun, [], File),
+    ok = file:delete(File),
+    {error, enoent} = zip:foldl(ZipFun, [], File),
 
     ok.
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 39b44c9104..5bac4be9d7 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 2.7
+STDLIB_VSN = 2.8
diff --git a/lib/syntax_tools/src/erl_recomment.erl b/lib/syntax_tools/src/erl_recomment.erl
index 72e1e2d2f5..5ce533285d 100644
--- a/lib/syntax_tools/src/erl_recomment.erl
+++ b/lib/syntax_tools/src/erl_recomment.erl
@@ -611,12 +611,15 @@ expand_comment(C) ->
 	       attrs             :: erl_syntax:syntaxTreeAttributes(),
 	       precomments  = [] :: [erl_syntax:syntaxTree()],
 	       postcomments = [] :: [erl_syntax:syntaxTree()],
-	       subtrees     = [] :: [erl_syntax:syntaxTree()]}).
+	       subtrees     = [] :: [extendedSyntaxTree()]}).
+
 
 -record(list, {min = 0           :: integer(),
 	       max = 0           :: integer(),
 	       subtrees = []     :: [erl_syntax:syntaxTree()]}).
 
+-type extendedSyntaxTree() :: #tree{} | #leaf{} | #list{}.
+
 leaf_node(Min, Max, Value) ->
     #leaf{min = Min,
 	  max = Max,
diff --git a/lib/syntax_tools/src/erl_syntax.erl b/lib/syntax_tools/src/erl_syntax.erl
index 3f2a3e05dd..97b5797b06 100644
--- a/lib/syntax_tools/src/erl_syntax.erl
+++ b/lib/syntax_tools/src/erl_syntax.erl
@@ -355,7 +355,7 @@
 %% where `Pos' `Ann' and `Comments' are the corresponding values of a
 %% `tree' or `wrapper' record.
 
--record(attr, {pos = 0    :: term(),
+-record(attr, {pos = erl_anno:new(0) :: term(),
 	       ann = []   :: [term()],
 	       com = none :: 'none' | #com{}}).
 -type syntaxTreeAttributes() :: #attr{}.
diff --git a/lib/syntax_tools/src/erl_syntax_lib.erl b/lib/syntax_tools/src/erl_syntax_lib.erl
index 5b5b18d15b..58c4cc5244 100644
--- a/lib/syntax_tools/src/erl_syntax_lib.erl
+++ b/lib/syntax_tools/src/erl_syntax_lib.erl
@@ -359,9 +359,9 @@ new_variable_name(S) ->
 %% within a reasonably small range relative to the number of elements in
 %% the set.
 %%
-%% This function uses the module `random' to generate new
+%% This function uses the module `rand' to generate new
 %% keys. The seed it uses may be initialized by calling
-%% `random:seed/0' or `random:seed/3' before this
+%% `rand:seed/1' or `rand:seed/2' before this
 %% function is first called.
 %%
 %% @see new_variable_name/1
@@ -404,7 +404,13 @@ start_range(S) ->
 %% order, but (pseudo-)randomly distributed over the range.
 
 generate(_Key, Range) ->
-    random:uniform(Range).    % works well
+    _ = case rand:export_seed() of
+	    undefined ->
+		rand:seed(exsplus, {753,8,73});
+	    _ ->
+		ok
+	end,
+    rand:uniform(Range).			% works well
 
 
 %% =====================================================================
diff --git a/lib/syntax_tools/src/erl_tidy.erl b/lib/syntax_tools/src/erl_tidy.erl
index db7f0939a3..f2de12b410 100644
--- a/lib/syntax_tools/src/erl_tidy.erl
+++ b/lib/syntax_tools/src/erl_tidy.erl
@@ -937,7 +937,7 @@ hidden_uses_2(Tree, Used) ->
 
 -record(env, {file		       :: file:filename(),
               module                   :: atom(),
-              current                  :: fa(),
+              current                  :: fa() | 'undefined',
               imports = dict:new()     :: dict:dict(atom(), atom()),
               context = normal	       :: context(),
               verbosity = 1	       :: 0 | 1 | 2,
@@ -949,10 +949,10 @@ hidden_uses_2(Tree, Used) ->
               new_guard_tests = true   :: boolean(),
 	      old_guard_tests = false  :: boolean()}).
 
--record(st, {varc              :: non_neg_integer(),
+-record(st, {varc              :: non_neg_integer() | 'undefined',
 	     used = sets:new() :: sets:set({atom(), arity()}),
 	     imported          :: sets:set({atom(), arity()}),
-	     vars              :: sets:set(atom()),
+	     vars              :: sets:set(atom()) | 'undefined',
 	     functions         :: sets:set({atom(), arity()}),
 	     new_forms = []    :: [erl_syntax:syntaxTree()],
 	     rename            :: dict:dict(mfa(), {atom(), atom()})}).
@@ -1064,13 +1064,13 @@ visit_clause(Tree, Env, St0) ->
 
 visit_infix_expr(Tree, #env{context = guard_test}, St0) ->
     %% Detect transition from guard test to guard expression.
-    visit_other(Tree, #env{context = guard_expr}, St0);
+    visit_other(Tree, #env{context = guard_expr, file = ""}, St0);
 visit_infix_expr(Tree, Env, St0) ->
     visit_other(Tree, Env, St0).
 
 visit_prefix_expr(Tree, #env{context = guard_test}, St0) ->
     %% Detect transition from guard test to guard expression.
-    visit_other(Tree, #env{context = guard_expr}, St0);
+    visit_other(Tree, #env{context = guard_expr, file = ""}, St0);
 visit_prefix_expr(Tree, Env, St0) ->
     visit_other(Tree, Env, St0).
 
diff --git a/lib/syntax_tools/src/igor.erl b/lib/syntax_tools/src/igor.erl
index eac5af5540..4557678f9d 100644
--- a/lib/syntax_tools/src/igor.erl
+++ b/lib/syntax_tools/src/igor.erl
@@ -1594,10 +1594,11 @@ alias_expansions_2(Modules, Table) ->
 	       preserved  :: boolean(),
 	       no_headers :: boolean(),
 	       notes      :: notes(),
-	       map        :: map_fun(),
+	       map        :: map_fun() | 'undefined',
 	       renaming   :: fun((atom()) -> map_fun()),
 	       expand     :: dict:dict({atom(), integer()},
-                                       {atom(), {atom(), integer()}}),
+                                       {atom(), {atom(), integer()}})
+                           | 'undefined',
 	       redirect	  :: dict:dict(atom(), atom())
 	      }).
 
diff --git a/lib/syntax_tools/src/merl.erl b/lib/syntax_tools/src/merl.erl
index 690306c17b..163ce48bbc 100644
--- a/lib/syntax_tools/src/merl.erl
+++ b/lib/syntax_tools/src/merl.erl
@@ -514,15 +514,17 @@ parse_forms([]) ->
 parse_2(Ts) ->
     %% one or more comma-separated expressions?
     %% (recall that Ts has no dot tokens if we get to this stage)
-    case erl_parse:parse_exprs(Ts ++ [{dot,0}]) of
+    A = a0(),
+    case erl_parse:parse_exprs(Ts ++ [{dot,A}]) of
         {ok, Exprs} -> Exprs;
         {error, E} ->
-            parse_3(Ts ++ [{'end',0}, {dot,0}], [E])
+            parse_3(Ts ++ [{'end',A}, {dot,A}], [E])
     end.
 
 parse_3(Ts, Es) ->
     %% try-clause or clauses?
-    case erl_parse:parse_exprs([{'try',0}, {atom,0,true}, {'catch',0} | Ts]) of
+    A = a0(),
+    case erl_parse:parse_exprs([{'try',A}, {atom,A,true}, {'catch',A} | Ts]) of
         {ok, [{'try',_,_,_,_,_}=X]} ->
             %% get the right kind of qualifiers in the clause patterns
             erl_syntax:try_expr_handlers(X);
@@ -533,7 +535,8 @@ parse_3(Ts, Es) ->
 parse_4(Ts, Es) ->
     %% fun-clause or clauses? (`(a)' is also a pattern, but `(a,b)' isn't,
     %% so fun-clauses must be tried before normal case-clauses
-    case erl_parse:parse_exprs([{'fun',0} | Ts]) of
+    A = a0(),
+    case erl_parse:parse_exprs([{'fun',A} | Ts]) of
         {ok, [{'fun',_,{clauses,Cs}}]} -> Cs;
         {error, E} ->
             parse_5(Ts, [E|Es])
@@ -541,7 +544,8 @@ parse_4(Ts, Es) ->
 
 parse_5(Ts, Es) ->
     %% case-clause or clauses?
-    case erl_parse:parse_exprs([{'case',0}, {atom,0,true}, {'of',0} | Ts]) of
+    A = a0(),
+    case erl_parse:parse_exprs([{'case',A}, {atom,A,true}, {'of',A} | Ts]) of
         {ok, [{'case',_,_,Cs}]} -> Cs;
         {error, E} ->
             %% select the best error to report
@@ -1210,7 +1214,7 @@ merge_comments(StartLine, Cs, [], Acc) ->
     merge_comments(StartLine, [], [],
                    [erl_syntax:set_pos(
                       erl_syntax:comment(Indent, Text),
-                      StartLine + Line - 1)
+                      anno(StartLine + Line - 1))
                     || {Line, _, Indent, Text} <- Cs] ++ Acc);
 merge_comments(StartLine, [C|Cs], [T|Ts], Acc) ->
     {Line, _Col, Indent, Text} = C,
@@ -1228,3 +1232,9 @@ merge_comments(StartLine, [C|Cs], [T|Ts], Acc) ->
                    [erl_syntax:comment(Indent, Text)], T),
             merge_comments(StartLine, Cs, [Tc|Ts], Acc)
     end.
+
+a0() ->
+    anno(0).
+
+anno(Location) ->
+    erl_anno:new(Location).
diff --git a/lib/syntax_tools/src/merl_transform.erl b/lib/syntax_tools/src/merl_transform.erl
index 66b06c8137..fe58b6a122 100644
--- a/lib/syntax_tools/src/merl_transform.erl
+++ b/lib/syntax_tools/src/merl_transform.erl
@@ -68,8 +68,7 @@ case_guard([{expr,_}, {text,Text}]) ->
     erl_syntax:is_literal(Text).
 
 case_body([{expr,Expr}, {text,_Text}], T) ->
-    pre_expand_case(Expr, erl_syntax:case_expr_clauses(T),
-                    erl_syntax:get_pos(T)).
+    pre_expand_case(Expr, erl_syntax:case_expr_clauses(T), get_location(T)).
 
 post(T) ->
     merl:switch(
@@ -79,7 +78,7 @@ post(T) ->
                   lists:all(fun erl_syntax:is_literal/1, [F|As])
           end,
           fun ([{args, As}, {function, F}]) ->
-                  Line = erl_syntax:get_pos(F),
+                  Line = get_location(F),
                   [F1|As1] = lists:map(fun erl_syntax:concrete/1, [F|As]),
                   eval_call(Line, F1, As1, T)
           end},
@@ -118,7 +117,7 @@ expand_qquote(_As, T, _StartPos) ->
 expand_template(F, [Pattern | Args], T) ->
     case erl_syntax:is_literal(Pattern) of
         true ->
-            Line = erl_syntax:get_pos(Pattern),
+            Line = get_location(Pattern),
             As = [erl_syntax:concrete(Pattern)],
             merl:qquote(Line, "merl:_@function(_@pattern, _@args)",
                [{function, F},
@@ -260,3 +259,12 @@ is_erlang_var([C|_]) when C >= $A, C =< $Z ; C >= $À, C =< $Þ, C /= $× ->
     true;
 is_erlang_var(_) ->
     false.
+
+get_location(T) ->
+    Pos = erl_syntax:get_pos(T),
+    case erl_anno:is_anno(Pos) of
+        true ->
+            erl_anno:location(Pos);
+        false ->
+            Pos
+    end.
diff --git a/lib/syntax_tools/test/Makefile b/lib/syntax_tools/test/Makefile
index 569c044b1a..4ace860223 100644
--- a/lib/syntax_tools/test/Makefile
+++ b/lib/syntax_tools/test/Makefile
@@ -26,7 +26,7 @@ RELSYSDIR = $(RELEASE_PATH)/syntax_tools_test
 # ----------------------------------------------------
 
 ERL_MAKE_FLAGS += 
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
diff --git a/lib/syntax_tools/test/merl_SUITE.erl b/lib/syntax_tools/test/merl_SUITE.erl
index 125250395a..945972d405 100644
--- a/lib/syntax_tools/test/merl_SUITE.erl
+++ b/lib/syntax_tools/test/merl_SUITE.erl
@@ -16,7 +16,7 @@
 %% 
 -module(merl_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% include the Merl header file
 -include_lib("syntax_tools/include/merl.hrl").
diff --git a/lib/syntax_tools/test/syntax_tools_SUITE.erl b/lib/syntax_tools/test/syntax_tools_SUITE.erl
index 40e00e0554..eb52cce6af 100644
--- a/lib/syntax_tools/test/syntax_tools_SUITE.erl
+++ b/lib/syntax_tools/test/syntax_tools_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(syntax_tools_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
diff --git a/lib/test_server/AUTHORS b/lib/test_server/AUTHORS
deleted file mode 100644
index 3212999174..0000000000
--- a/lib/test_server/AUTHORS
+++ /dev/null
@@ -1,12 +0,0 @@
-Original Authors and Contributors:
-
-Mattias Nilsson
-Bj�rn Gustavsson
-Janne Lindblad
-Patrik Winroth
-Claes Wikstr�m
-Siri Hansen
-Peter Andersson
-
-...and others.
-
diff --git a/lib/test_server/Makefile b/lib/test_server/Makefile
deleted file mode 100644
index 382749d1fc..0000000000
--- a/lib/test_server/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1996-2009. 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%
-#
-
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-#
-# Macros
-#
-
-SUB_DIRECTORIES = src doc/src
-
-include vsn.mk
-VSN = $(TEST_SERVER_VSN)
-
-SPECIAL_TARGETS =
-
-#
-# Default Subdir Targets
-#
-include $(ERL_TOP)/make/otp_subdir.mk
-
diff --git a/lib/test_server/README b/lib/test_server/README
deleted file mode 100644
index fc71c90ca8..0000000000
--- a/lib/test_server/README
+++ /dev/null
@@ -1,113 +0,0 @@
-===========================================================================
-                          OTP Test Server
-===========================================================================
-
-To compile the 'test_server' application you need to build and install
-a Erlang/OTP system from source. Get your open source Erlang/OTP from
-http://www.erlang.org/. The resulting "erlc" command must be in the
-search path for commands.
-
-The Erlang test_server application and the example tests are to be
-inserted into an existing source tree for Erlang/OTP.
-
-You don't run the Test Server or the tests from the source tree.
-Instead a test installation area $TESTROOT is used with the resulting
-directory structure
-
-  $TESTROOT/test_server
-  $TESTROOT/<app1>_test
-  $TESTROOT/<app2>_test
-  .
-  .
-
-For more details see the test_server documentation can be found in the
-"$ERL_TOP/lib/test_server/doc/html" directory.
-
-
-Unpacking the sources
----------------------
-
-Enter your Erlang/OTP source tree and unpack the OTP Test Server and
-optionally the test examples
-
-  % cd otp_src_RXX
-  % gunzip -c test_server-<VSN>.tar.gz | tar xf -
-  % gunzip -c emulator-YYYY-MM-DD.tar.gz | tar xf -
-  % gunzip -c stdlib-YYYY-MM-DD.tar.gz | tar xf -
-
-
-How to build and install the OTP Test Server
---------------------------------------------
-
-Set the ERL_TOP variable to the top directory of the source tree
-
-  % cd otp_src_RXX
-
-  % setenv ERL_TOP `pwd`
-  or
-  % export ERL_TOP=`pwd`
-
-If not done before you need to run the configure script
-
-  % ./configure
-
-Then build and install from the the base directory of the test_server
-application
-
-  % cd lib/test_server
-  % gmake release_tests TESTROOT=<some dir>
-
-
-How to build and install the example test suites
-------------------------------------------------
-
-If you want to build and install the example test suites
-you build and install from the the test directories
-
-  % cd $ERL_TOP/lib/stdlib/test
-  % gmake release_tests TESTROOT=<some dir>
-
-  % cd $ERL_TOP/erts/emulator/test
-  % gmake release_tests TESTROOT=<some dir>
-
-
-How to run OTP test suites
---------------------------
-
-First cd into $TESTROOT/test_server
-
-  % cd $TESTROOT/test_server
-
-Install the OTP Test Server framework
-
-  % erl
-  1> ts:install().
-
-Check which tests are available
-
-  2> ts:tests().
-  [...]
-
-Run the collections of test suites one at the time
-
-  3> ts:run(emulator).  (starts a xterm with an Erlang shell)
-  4> ts:run(stdlib).    (starts a xterm with an Erlang shell)
-
-or all at once
-
-  5> ts:run().          (the node running the tests will be in the background)
-
-Note that it is normal to see lots of error messages in the Erlang
-shell. The tests will stress the system with lots of invalid input to
-find problems in the error handling.
-
-Also note that a failing test case does not always indicate a bug in
-Erlang/OTP. Differences in the network setup, machine configuration
-etc may cause a test case to fail or time out.
-
-The result of the tests are recorded in the file named "index.html" in
-the "$TESTROOT/test_server" directory. You can follow the progress of
-tests suites not yet completed from "last_test.html".
-
-For more details see the test_server documentation can be found in the
-"$ERL_TOP/lib/test_server/doc/html" directory.
diff --git a/lib/test_server/doc/html/.gitignore b/lib/test_server/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/test_server/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/test_server/doc/man3/.gitignore b/lib/test_server/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/test_server/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/test_server/doc/man6/.gitignore b/lib/test_server/doc/man6/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/test_server/doc/man6/.gitignore
+++ /dev/null
diff --git a/lib/test_server/doc/pdf/.gitignore b/lib/test_server/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/test_server/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/test_server/doc/src/Makefile b/lib/test_server/doc/src/Makefile
deleted file mode 100644
index 8c5418aee5..0000000000
--- a/lib/test_server/doc/src/Makefile
+++ /dev/null
@@ -1,140 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2002-2012. 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%
-#
-
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(TEST_SERVER_VSN)
-APPLICATION=test_server
-
-DOC_EXTRA_FRONT_PAGE_INFO=Important note: \
-The Test Server application is obsolete and will be removed \
-in the next major OTP release
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = \
-	test_server_ctrl.xml \
-	test_server.xml
-XML_REF3_INTERNAL = \
-	ts.xml
-XML_REF6_FILES = test_server_app.xml
-
-XML_PART_FILES = \
-	part.xml \
-	part_notes.xml \
-	part_notes_history.xml
-
-XML_CHAPTER_FILES = \
-	basics_chapter.xml \
-	run_test_chapter.xml \
-	write_test_chapter.xml \
-	test_spec_chapter.xml \
-	example_chapter.xml \
-	write_framework_chapter.xml \
-	notes.xml \
-	notes_history.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES)  $(XML_REF6_FILES) \
-            $(XML_PART_FILES) $(XML_CHAPTER_FILES) 
-
-GIF_FILES =
-
-# ----------------------------------------------------
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-HTML_INTERNAL = $(XML_REF3_INTERNAL:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-MAN3_INTERNAL = $(XML_REF3_INTERNAL:%.xml=$(MAN3DIR)/%.3)
-MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/test_server-$(VSN).pdf
-
-# ----------------------------------------------------
-# FLAGS 
-# ----------------------------------------------------
-XML_FLAGS += 
-DVIPS_FLAGS += 
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-docs: pdf html man
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-man: $(MAN3_FILES) $(MAN3_INTERNAL) $(MAN6_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-debug opt: 
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(MAN6DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~ 
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		"$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man6"
-	$(INSTALL_DATA) $(MAN6_FILES) "$(RELEASE_PATH)/man/man6"
-
-release_spec:
-
-release_tests_spec:
diff --git a/lib/test_server/doc/src/basics_chapter.xml b/lib/test_server/doc/src/basics_chapter.xml
deleted file mode 100644
index 9e9f38aab4..0000000000
--- a/lib/test_server/doc/src/basics_chapter.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2002</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Test Server Basics</title>
-    <prepared>Siri Hansen</prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>basics_chapter.xml</file>
-  </header>
-
-  <section>
-    <title>Introduction</title>
-    <p><em>Test Server</em> is a portable test tool for automated
-    testing of Erlang programs and OTP applications. It provides an
-    interface for running test programs directly with Test Server 
-    as well as an interface for integrating Test Server
-    with a framework application. The latter makes it possible to use
-    Test Server as the engine of a higher level test tool
-    application.</p>
-
-    <p>It is strongly recommended that Test Server be used from inside
-    a framework application, rather than interfaced directly for
-    running test programs. Test Server can be pretty difficult to use
-    since it's a very general and quite extensive and complex
-    application. Furthermore, the <c>test_server_ctrl</c> functions
-    are not meant to be used from within the actual test programs. The
-    framework should handle communication with Test Server and deal
-    with the more complex aspects of this interaction automatically so
-    that a higher level interface may be provided for the tester. For
-    test tool usage to be productive, a simpler, more intuitive and 
-    (if required) more specific interface is required than what Test Server
-    can provide.</p>
-
-    <p>OTP delivers a general purpose framework for Test Server, called
-    <em>Common Test</em>. This application is a tool well suited for
-    automated black box testing of target systems of <em>any kind</em> 
-    (not necessarily implemented in Erlang). Common Test is also a very
-    useful tool for white box testing of Erlang programs and OTP
-    applications. Unless a more specific functionality and/or user 
-    interface is required (in which case you might need to implement 
-    your own framework), Common Test should do the job for 
-    you. Please read the Common Test User's Guide and reference manual 
-    for more information.</p>
-
-    <p>Under normal circumstances, knowledge about the Test Server
-    application is not required for using the Common Test framework.
-    However, if you want to use Test Server without a framework,
-    or learn how to integrate it with your own framework, please read on...
-    </p>
-    </section>
-    <section>
-    <title>Getting started</title>
-    <p>Testing when using Test Server is done by running test
-      suites. A test suite is a number of test cases, where each test
-      case tests one or more things. The test case is the smallest unit
-      that the test server deals with. One or more test cases are
-      grouped together into one ordinary Erlang module, which is called
-      a test suite. Several test suite modules can be grouped together
-      in special test specification files representing whole application
-      and/or system test "jobs".
-      </p>
-    <p>The test suite Erlang module must follow a certain interface,
-      which is specified by Test Server. See the section on writing
-      test suites for details about this.
-      </p>
-    <p>Each test case is considered a success if it returns to the
-      caller, no matter what the returned value is. An exception to this
-      is the return value <c>{skip, Reason}</c> which indicates that the
-      test case is skipped. A failure is specified as a crash, no matter
-      what the crash reason is.
-      </p>
-    <p>As a test suite runs, all information (including output to
-      stdout) is recorded in several different log files. A minimum of
-      information is displayed to the user console. This only include
-      start and stop information, plus a note for each failed test case.
-      </p>
-    <p>The result from each test case is recorded in an HTML log file
-      which is created for each test run. Every test case gets one row
-      in a table presenting total time, whether the case was successful
-      or not, if it was skipped, and possibly also a comment. The HTML
-      file has links to each test case's logfile, which may be viewed
-      from e.g. Netscape or any other HTML capable browser.
-      </p>
-    <p>The Test Server consists of three parts: 
-      </p>
-    <list type="bulleted">
-      <item>The part that executes the test suites and
-       provides support for the test suite author is called
-      <c>test_server</c>. This is described in the chapter about
-       writing test cases in this user's guide, and in the reference
-       manual for the <c>test_server</c> module.</item>
-      <item>The controlling part, which provides the low level
-       operator interface, starts and stops slave nodes and writes
-       log files, is called
-      <c>test_server_ctrl</c>. The Test Server Controller should not
-       be used directly when running tests. Instead a framework built
-       on top of it should be used. More information
-       about how to write your own framework can be found
-       in this user's guide and in the reference manual for the
-      <c>test_server_ctrl</c> module.</item>
-    </list>
-  </section>
-
-  <section>
-    <title>Definition of terms</title>
-    <taglist>
-      <tag><em>conf(iguration) case</em></tag>
-      <item>This is a group of test cases which need some specific
-       configuration. A conf case contains an initiation function which
-       sets up a specific configuration, one or more test cases using
-       this configuration, and a cleanup function which restores the
-       configuration. A conf case is specified in a test specification
-       either like this:<c>{conf,InitFunc,ListOfCases,CleanupFunc}</c>,
-       or this: <c>{conf,Properties,InitFunc,ListOfCases,CleanupFunc}</c>
-       </item>
-      <tag><em>datadir</em></tag>
-      <item>Data directory for a test suite. This directory contains
-       any files used by the test suite, e.g. additional erlang
-       modules, c code or data files. If the data directory contains
-       code which must be compiled before the test suite is run, it
-       should also contain a makefile source called Makefile.src
-       defining how to compile.
-      </item>
-      <tag><em>documentation clause</em></tag>
-      <item>One of the function clauses in a test case. This clause
-       shall return a list of strings describing what the test case
-       tests.
-      </item>
-      <tag><em>execution clause</em></tag>
-      <item>One of the function clauses in a test case. This clause
-       implements the actual test case, i.e. calls the functions that
-       shall be tested and checks results. The clause shall crash if it
-       fails.
-      </item>
-      <tag><em>major log file</em></tag>
-      <item>This is the test suites log file.
-      </item>
-      <tag><em>Makefile.src</em></tag>
-      <item>This file is used by the test server framework to generate
-       a makefile for a datadir. It contains some special characters
-       which are replaced according to the platform currently tested.
-      </item>
-      <tag><em>minor log file</em></tag>
-      <item>This is a separate log file for each test case.
-      </item>
-      <tag><em>privdir</em></tag>
-      <item>Private directory for a test suite. This directory should
-       be used when the test suite needs to write to files.
-      </item>
-      <tag><em>skip case</em></tag>
-      <item>A test case which shall be skipped.
-      </item>
-      <tag><em>specification clause</em></tag>
-      <item>One of the function clauses in a test case. This clause
-       shall return an empty list, a test specification or
-      <c>{skip,Reason}</c>. If an empty list is returned, it means
-       that the test case shall be executed, and so it must also have
-       an execution clause.
-      </item>
-      <tag><em>test case</em></tag>
-      <item>A single test included in a test suite. Typically it tests
-       one function in a module or application. A test case is
-       implemented as a function in a test suite module. The function
-       can have three clauses, the documentation-, specification- and
-       execution clause.
-      </item>
-      <tag><em>test specification</em></tag>
-      <item>A specification of which test suites and test cases to
-       run. There can be test specifications on three different levels
-       in a test. The top level is a test specification file which
-       roughly specifies what to test for a whole application. Then
-       there is a test specification for each test suite returned from
-       the <c>all(suite)</c> function in the suite. And there can also
-       be a test specification returned from the specification clause
-       of a test case.
-      </item>
-      <tag><em>test specification file</em></tag>
-      <item>This is a text file containing the test specification for
-       an application. The file has the extension ".spec" or
-       ".spec.Platform", where Platform is e.g. "vxworks".
-      </item>
-      <tag><em>test suite</em></tag>
-      <item>An erlang module containing a collection of test cases for
-       a specific application or module.
-      </item>
-      <tag><em>topcase</em></tag>
-      <item>The first "command" in a test specification file. This
-       command contains the test specification, like this:
-      <c>{topcase,TestSpecification}</c></item>
-    </taglist>
-  </section>
-</chapter>
-
diff --git a/lib/test_server/doc/src/book.xml b/lib/test_server/doc/src/book.xml
deleted file mode 100644
index 6eb7daae1a..0000000000
--- a/lib/test_server/doc/src/book.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>2002</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Test Server</title>
-    <prepared>Siri Hansen</prepared>
-    <docno></docno>
-    <date>2002-07-11</date>
-    <rev></rev>
-    <file>book.xml</file>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>Test Server</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-  </preamble>
-  <parts lift="no">
-    <xi:include href="part.xml"/>
-  </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-  <listofterms></listofterms>
-  <index></index>
-</book>
-
diff --git a/lib/test_server/doc/src/example_chapter.xml b/lib/test_server/doc/src/example_chapter.xml
deleted file mode 100644
index ec152fdd6c..0000000000
--- a/lib/test_server/doc/src/example_chapter.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2002</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Examples</title>
-    <prepared>Siri Hansen</prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>example_chapter.xml</file>
-  </header>
-
-  <section>
-    <title>Test suite</title>
-    <code type="none">
--module(my_SUITE).
-
--export([all/1,
-         not_started/1, not_started_func1/1, not_started_func2/1,
-         start/1, stop/1,
-         func1/1, func2/1 
-        ]).
-
--export([init_per_testcase/2, end_per_testcase/2]).
-
--include("test_server.hrl").
-
--define(default_timeout, ?t:minutes(1)).
-
-init_per_testcase(_Case, Config) ->
-    Dog=?t:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
-all(suite) -> 
-    %% Test specification on test suite level
-    [not_started,
-     {conf, start, [func1, func2], stop}].
-
-not_started(suite) ->
-    %% Test specification on test case level
-    [not_started_func1, not_started_func2];
-not_started(doc) ->
-    ["Testing all functions when application is not started"].
-%% No execution clause unless the specification clause returns [].
-
-
-not_started_func1(suite) ->
-    [];
-not_started_func1(doc) ->
-    ["Testing function 1 when application is not started"].
-not_started_func1(Config) when list(Config) ->
-    {error, not_started} = myapp:func1(dummy_ref,1),
-    {error, not_started} = myapp:func1(dummy_ref,2),
-    ok.
-
-not_started_func2(suite) ->
-    [];
-not_started_func2(doc) ->
-    ["Testing function 2 when application is not started"].
-not_started_func2(Config) when list(Config) ->
-    {error, not_started} = myapp:func2(dummy_ref,1),
-    {error, not_started} = myapp:func2(dummy_ref,2),
-    ok.
-
-
-%% No specification clause needed for an init function in a conf case!!!
-start(doc) ->
-    ["Testing start of my application."];
-start(Config) when list(Config) ->
-    Ref = myapp:start(),
-    case erlang:whereis(my_main_process) of
-      Pid when pid(Pid) -> 
-         [{myapp_ref,Ref}|Config];
-      undefined -> 
-         %% Since this is the init function in a conf case, the rest of the 
-         %% cases in the conf case will be skipped if this case fails.
-         ?t:fail("my_main_process did not start")
-    end.
-
-func1(suite) ->
-    [];
-func1(doc) ->
-    ["Test that func1 returns ok when argument is 1 and error if argument is 2"];
-func1(Config) when list(Config) ->
-    Ref = ?config(myapp_ref,Config),
-    ok = myapp:func1(Ref,1),
-    error = myapp:func1(Ref,2),
-    ok.
-
-func2(suite) ->
-    [];
-func2(doc) ->
-    ["Test that func1 returns ok when argument is 3 and error if argument is 4"];
-func2(Config) when list(Config) ->
-    Ref = ?config(myapp_ref,Config),
-    ok = myapp:func2(Ref,3),
-    error = myapp:func2(Ref,4),
-    ok.
-
-%% No specification clause needed for a cleanup function in a conf case!!!
-stop(doc) ->
-    ["Testing termination of my application"];
-stop(Config) when list(Config) ->
-    Ref = ?config(myapp_ref,Config),
-    ok = myapp:stop(Ref),
-    case erlang:whereis(my_main_process) of
-      undefined -> 
-         lists:keydelete(myapp_ref,1,Config);
-      Pid when pid(Pid) -> 
-         ?t:fail("my_main_process did not stop")
-    end.
-    </code>
-  </section>
-
-  <section>
-    <title>Test specification file</title>
-    <p><em><c>myapp.spec:</c></em></p>
-    <code type="none">
-{topcase, {dir, "../myapp_test"}}. % Test specification on top level    </code>
-    <p><em><c>myapp.spec.vxworks:</c></em></p>
-    <code type="none">
-{topcase, {dir, "../myapp_test"}}. % Test specification on top level
-{skip,{my_SUITE,func2,"Not applicable on VxWorks"}}.    </code>
-  </section>
-</chapter>
-
-
diff --git a/lib/test_server/doc/src/fascicules.xml b/lib/test_server/doc/src/fascicules.xml
deleted file mode 100644
index 37feca543f..0000000000
--- a/lib/test_server/doc/src/fascicules.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE fascicules SYSTEM "fascicules.dtd">
-
-<fascicules>
-  <fascicule file="part" href="part_frame.html" entry="no">
-    User's Guide
-  </fascicule>
-  <fascicule file="ref_man" href="ref_man_frame.html" entry="yes">
-    Reference Manual
-  </fascicule>
-  <fascicule file="part_notes" href="part_notes_frame.html" entry="no">
-    Release Notes
-  </fascicule>
-  <fascicule file="" href="../../../../doc/print.html" entry="no">
-    Off-Print
-  </fascicule>
-</fascicules>
-
diff --git a/lib/test_server/doc/src/notes.xml b/lib/test_server/doc/src/notes.xml
deleted file mode 100644
index b48bda94d0..0000000000
--- a/lib/test_server/doc/src/notes.xml
+++ /dev/null
@@ -1,1694 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2004</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-
-    </legalnotice>
-
-    <title>APPLICATION Release Notes</title>
-    <prepared>Peter Andersson</prepared>
-    <responsible>Peter Andersson</responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2007-11-30</date>
-    <rev>A</rev>
-    <file>notes.xml</file>
-  </header>
-
-<section><title>Test_Server 3.9.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    When generating Makefile from Makefile.src,
-	    ts_lib:get_arg/4 earlier removed all spaces in the
-	    extracted argument. The code was probably meant for
-	    removing leading and trailing spaces only, and is now
-	    corrected to do so.</p>
-          <p>
-	    Own Id: OTP-13015</p>
-        </item>
-        <item>
-          <p>
-	    With the Common Test 'create_priv_dir' start option set
-	    to 'auto_per_tc', the name of the priv directory for a
-	    configuration function could clash with the name of the
-	    priv directory for a test case, which would cause Test
-	    Server failure. This error has been corrected.</p>
-          <p>
-	    Own Id: OTP-13181</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.9</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    The status of an aborted test due to test suite
-	    compilation error has changed from 'auto_skipped' to
-	    'failed'. This affects both the textual log file, event
-	    handling and CT hook callbacks. The logging of
-	    compilation failures has also been improved, especially
-	    in the case of multiple test suites failing compilation.</p>
-          <p>
-	    Own Id: OTP-10816</p>
-        </item>
-        <item>
-          <p>
-	    The Test Server source code parser (erl2html2) failed to
-	    handle the macro tuple in the syntax tree returned by
-	    epp_dodger. This error has been corrected.</p>
-          <p>
-	    Own Id: OTP-12740</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The Test Server application has been marked as obsolete
-	    and will be removed from OTP in the next major release
-	    (OTP 19.0).</p>
-          <p>
-	    Own Id: OTP-10923 Aux Id: OTP-12705 </p>
-        </item>
-        <item>
-          <p>
-	    When running OTP tests using the ts interface, it is now
-	    possible to specify so called test categories per OTP
-	    application. A test category is represented by a CT test
-	    specification and defines an arbitrary subset of existing
-	    test suites, groups and cases. Examples of test
-	    categories are 'smoke' (smoke tests) and 'bench'
-	    (benchmarks). (Call ts:help() for more info). Also,
-	    functions for reading terms from the current test
-	    specification during test, ct:get_testspec_terms/0 and
-	    ct:get_testspec_terms/1, have been implemented.</p>
-          <p>
-	    Own Id: OTP-11962</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.8.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    If the last expression in a test case causes a timetrap
-	    timeout, the stack trace is ignored and not printed to
-	    the test case log file. This happens because the
-	    {Suite,TestCase,Line} info is not available in the stack
-	    trace in this scenario, due to tail call elimination.
-	    Common Test has been modified to handle this situation by
-	    inserting a {Suite,TestCase,last_expr} tuple in the
-	    correct place and printing the stack trace as expected.</p>
-          <p>
-	    Own Id: OTP-12697 Aux Id: seq12848 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.8</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    When installing test suites in a cross compilation
-	    environment, ts_install was not able to read the values
-	    of the environment variables specified in the
-	    configuration file. This has been fixed.</p>
-          <p>
-	    Own Id: OTP-11441</p>
-        </item>
-        <item>
-          <p>
-	    Printouts by means of ct:log/2/3 or ct:pal/2/3 from the
-	    hook functions on_tc_fail/2 and on_tc_skip/2 would (quite
-	    unexpectedly) end up in the "unexpected i/o" log file
-	    instead of in the test case log file. This behaviour has
-	    been changed so that now, all printouts (including stdio
-	    printouts) from these hook functions will be routed to
-	    the test case log file.</p>
-          <p>
-	    Own Id: OTP-12468</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The format of the information printed on top of the test
-	    case (and configuration function) log file has been
-	    slightly modified, mainly in order to make the start
-	    configuration data easier to read and interpret.</p>
-          <p>
-	    Own Id: OTP-12518 Aux Id: seq12808 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.7.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    The source code to html code generator in Test Server
-	    (and Common Test) would fail to generate anchors in the
-	    html code for functions with non-expandable macros,
-	    resulting in bad html links to such functions. This
-	    correction lets the code generator ignore macros that
-	    can't be expanded (i.e. not pre-process them), so that
-	    correct anchors will always be produced.</p>
-          <p>
-	    Own Id: OTP-11766 Aux Id: seq12556 </p>
-        </item>
-        <item>
-          <p>
-	    Make sure to install .hrl files when needed</p>
-          <p>
-	    Own Id: OTP-12197</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Distribute <c>autoconf</c> helpers to applications at
-	    build time instead of having multiple identical copies
-	    committed in the repository.</p>
-          <p>
-	    Own Id: OTP-12348</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.7.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    The mechanism for running code cover analysis with
-	    common_test has been improved. Earlier, if a test run
-	    consisted of multiple tests, cover would be started and
-	    stopped for each test. This would give "intermediate"
-	    cover logs available from the "Coverage log" link on the
-	    test suite result pages. To accumulate cover data over
-	    all tests, the 'export' option had to be used in the
-	    cover spec file. This was not well documented, and the
-	    functionality was quite confusing.</p>
-          <p>
-	    Using the 'nodes' option in the cover spec file would
-	    fail when the test run consisted of multiple tests, since
-	    the specified nodes would only be included in the cover
-	    analysis of the first test.</p>
-          <p>
-	    The repeated compilation and analysis of the same modules
-	    was also very time consuming.</p>
-          <p>
-	    To overcome these problems, ct will now only cover
-	    compile and analyze modules once per test run, i.e. once
-	    for each cover spec file. The log file is available via a
-	    new button on the top level index page. The old "Coverage
-	    log" links on the test suite result pages still exist,
-	    but they all point to the same log containing the
-	    accumulated result.</p>
-          <p>
-	    Own Id: OTP-11971</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.7</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Application upgrade (appup) files are corrected for the
-	    following applications: </p>
-          <p>
-	    <c>asn1, common_test, compiler, crypto, debugger,
-	    dialyzer, edoc, eldap, erl_docgen, et, eunit, gs, hipe,
-	    inets, observer, odbc, os_mon, otp_mibs, parsetools,
-	    percept, public_key, reltool, runtime_tools, ssh,
-	    syntax_tools, test_server, tools, typer, webtool, wx,
-	    xmerl</c></p>
-          <p>
-	    A new test utility for testing appup files is added to
-	    test_server. This is now used by most applications in
-	    OTP.</p>
-          <p>
-	    (Thanks to Tobias Schlager)</p>
-          <p>
-	    Own Id: OTP-11744</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Calls to erlang:open_port/2 with 'spawn' are updated to
-	    handle space in the command path.</p>
-          <p>
-	    Own Id: OTP-10842</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.6.4</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p>The way Common Test handles skipping of test cases has
-	    been updated. In previous versions, returning
-	    <c>{skip,Reason}</c> from a configuration function (such
-	    as init_per_suite or init_per_group), resulted in all
-	    affected test cases getting skipped with status
-	    <c>auto_skipped</c>. This was inappropriate, since this
-	    status is supposed to be used to inform that Common Test
-	    has taken the initiative to skip something (e.g. a test
-	    case group if init_per_group failed). Therefore, in this
-	    version of Common Test, whenever the user skips a suite,
-	    group, or individual test case (by means of a
-	    configuration function or test specification term), the
-	    affected test cases get the status <c>user_skipped</c>
-	    instead.</p> <p>This update has meant a few changes that
-	    may affect Common Test users in various ways:</p> <list>
-	    <item>The test results and statistics will be affected,
-	    which is important to know when running regression tests
-	    and comparing results to previous test runs.</item>
-	    <item>Users that read or parse the textual log file
-	    <c>suite.log</c> will notice that an auto skipped
-	    function is now reported as <c>auto_skipped</c> rather
-	    than <c>skipped</c> as before.</item> <item>When
-	    <c>require</c> fails in an info function (such as suite/0
-	    or group/1), all affected configuration functions and
-	    test cases are marked as <c>auto_skipped</c>.</item>
-	    <item>If Common Test detects an error in the test suite
-	    (such as e.g. an invalid all/0 function), all affected
-	    configuration functions and test cases are marked as
-	    <c>auto_skipped</c>.</item> <item>If a repeated test run
-	    session reaches a deadline with <c>force_stop</c>
-	    enabled, all remaining test cases are marked as
-	    <c>auto_skipped</c> rather than <c>user_skipped</c> as
-	    before.</item> <item>The event messages that Common Test
-	    generates during test runs have been affected by this
-	    update. For details see OTP-11524.</item> </list>
-          <p>
-	    Own Id: OTP-11305 Aux Id: OTP-11524 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.6.3</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Test Server installed an error handler (test_server_h)
-	    only to be able to write the name of the current test
-	    case to stdout whenever it received an error- or progress
-	    report. This functionality was not useful and has been
-	    removed. The built-in Common Test hook, cth_log_redirect,
-	    has instead been improved to now also tag all error- and
-	    progress reports in the log with suite-, group-, and/or
-	    test case name.</p>
-          <p>
-	    Own Id: OTP-11263 Aux Id: seq12251 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    A new log, the "Pre- and Post Test I/O Log", has been
-	    introduced, which makes it possible to capture error- and
-	    progress reports, as well as printouts made with ct:log/2
-	    and ct:pal/2, before and after a test run. (Some minor
-	    improvements of the logging system have been made at the
-	    same time). Links to the new log are found on the Common
-	    Test Framework Log page. The Common Test User's Guide has
-	    been updated with information about the new log and also
-	    with a new section on how to synchronize external
-	    applications with Common Test by means of the CT Hook
-	    init and terminate functions.</p>
-          <p>
-	    Own Id: OTP-11272</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Known Bugs and Problems</title>
-      <list>
-        <item>
-          <p>
-	    Test Server: Report auto_skipped in major log.</p>
-          <p>
-	    Own Id: OTP-11297</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.6.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Some unused code related to remote targets is removed,
-	    and documentation is updated.</p>
-          <p>
-	    Own Id: OTP-10607 Aux Id: kunagi-338 [249] </p>
-        </item>
-        <item>
-          <p>
-	    A bug in test_server_gl caused io requests containing
-	    invalid data (i.e. not unicode:chardata()) to hang, since
-	    no io reply was sent. This has been corrected.</p>
-          <p>
-	    Own Id: OTP-10991</p>
-        </item>
-        <item>
-          <p>
-	    Common Test would, in case of timetrap error, print a
-	    warning in the log if end_per_testcase wasn't implemented
-	    in the suite, even though it's an optional function. This
-	    printout has been removed.</p>
-          <p>
-	    Own Id: OTP-11052</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The '-force_stop' flag to use with time-limited repeats
-	    of test runs can now be used with a new 'skip_rest'
-	    option which causes the rest of the test cases in the
-	    ongoing test job to be skipped when the time limit is
-	    reached. E.g. 'ct_run -spec xxx -duration 010000
-	    -force_stop skip_rest'</p>
-          <p>
-	    Own Id: OTP-10856 Aux Id: OTP-10832 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.6.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    The unicode update of test_server for R16A introduced a
-	    few potential errors when logging to files. Sometimes ~tp
-	    or ~ts was used for formatting also when writing to files
-	    that were not opened with the {encoding,utf8} option. If
-	    then the argument contained unicode characters above 255,
-	    the file descriptor would crash. This has been corrected
-	    by the following modifications:</p> <list> <item> Since the
-	    'unexpected_io' log file is used only when the test case
-	    HTML file is not available (e.g. between test cases),
-	    this file is now also a HTML file and as other
-	    test_server HTML logs it is always UTF-8 encoded </item>
-	    <item> Since it is possible to change which information
-	    is going to which log file (with
-	    test_server_ctrl:set_levels/3), we do not have full
-	    control over which information is written to which file.
-	    This means that any printout could be written to the
-	    'major' log file (suite.log), which was earlier encoded
-	    as latin1. To avoid crashing this file descriptor due to
-	    unicode strings, the 'major' log file is now also encoded
-	    in UTF-8 (possible incopatibility). </item> <item> The
-	    cross_cover.info file is no longer a text file which can
-	    be read with file:consult/1, instead it is written as a
-	    pure binary file using term_to_binary when writing and
-	    binary_to_term when reading. </item> <item> The encoding
-	    of the file named 'last_name', which only content is the
-	    path to the last run.&lt;timestamp&gt; directory, is now
-	    dependent on the file name mode of the VM. If file names
-	    are expected to be unicode, then the 'last_name' file is
-	    UTF-8 encoded, else it is latin1 encoded. </item> </list>
-          <p>
-	    Also, ~tp has been changed back to ~p unless it is
-	    somehow likely that the argument includes strings. It is
-	    not obvious that this is the correct thing to do, but
-	    some decission had to be taken...</p>
-          <p>
-	    Own Id: OTP-10780</p>
-        </item>
-        <item>
-          <p>
-	    Using the force_stop flag/option to interrupt a test run
-	    caused a crash in Common Test. This problem has been
-	    solved.</p>
-          <p>
-	    Own Id: OTP-10832</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.6</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Line numbering of erlang files that were not correctly
-	    indented could be wrong after coverting to html with
-	    erl2html2:convert/[2,3] (the source code pointed to from
-	    the test case). This has been corrected.</p>
-          <p>
-	    Also, there are now link targets for each line and not
-	    only for each 10th line, and link targets for functions
-	    now include the arity and not only the function name
-	    (e.g. func/1 has a link target "func-1").</p>
-          <p>
-	    Own Id: OTP-9710 Aux Id: seq11945, kunagi-201 [112] </p>
-        </item>
-        <item>
-          <p>
-	    Severe errors detected by <c>test_server</c> (e.g. if log
-	    files directories cannot be created) will now be reported
-	    to <c>common_test</c> and noted in the <c>common_test</c>
-	    logs.</p>
-          <p>
-	    Own Id: OTP-9769 Aux Id: kunagi-202 [113] </p>
-        </item>
-        <item>
-          <p>
-	    The earlier undocumented cross cover feature for
-	    accumulating cover data over multiple tests has now been
-	    fixed and documented.</p>
-          <p>
-	    Own Id: OTP-9870 Aux Id: kunagi-206 [117] </p>
-        </item>
-        <item>
-          <p>
-	    If the test suite itself was included in code coverage
-	    analysis, then the test_server would not manage to set
-	    data_dir correctly for the test. This has been corrected.</p>
-          <p>
-	    Own Id: OTP-9956 Aux Id: kunagi-207 [118] </p>
-        </item>
-        <item>
-          <p>
-	    Any call to test_server:break/1 should cancel all active
-	    timetramps. However, in some cases
-	    Suite:end_per_testcase/2 is executed on a different
-	    process than the test case itself, and if
-	    test_server:break/1 was called from there, the timetraps
-	    were not cancelled. This has been corrected.</p>
-          <p>
-	    Own Id: OTP-10046 Aux Id: kunagi-174 [85] </p>
-        </item>
-        <item>
-	    <p>When a test case failed because of a timetrap time
-	    out, the <c>Config</c> data for the case was lost in the
-	    following call to <c>end_per_testcase/2</c>, and also in
-	    calls to the CT Hook function
-	    <c>post_end_per_testcase/4</c>. This problem has been
-	    solved and the <c>Config</c> data is now correctly passed
-	    to the above functions after a timetrap timeout
-	    failure.</p>
-          <p>
-	    Own Id: OTP-10070 Aux Id: kunagi-175 [86] </p>
-        </item>
-        <item>
-	    <p>In test_server, the same process would supervise the
-	    currently running test case and be group leader (and IO
-	    server) for the test case. Furthermore, when running
-	    parallel test cases, new temporary supervisor/group
-	    leader processes were spawned and the process that was
-	    group leader for sequential test cases would not be
-	    active. That would lead to several problems:</p>
-	    <p>* Processes started by init_per_suite will inherit the
-	    group leader of the init_per_suite process (and that
-	    group leader would not process IO requests when parallel
-	    test cases was running). If later a parallel test case
-	    caused such a processto print using (for example)
-	    io:format/2, the calling would hang.</p>
-	    <p>* Similarly, if a process was spawned from a parallel
-	    test case, it would inherit the temporary group leader
-	    for that parallel test case. If that spawned process
-	    later - when the group of parallel tests have finished -
-	    attempted to print something, its group leader would be
-	    dead and there would be <c>badarg</c> exception.</p>
-	    <p>Those problems have been solved by having group
-	    leaders separate from the processes that supervises the
-	    test cases, and keeping temporary group leader process
-	    for parallel test cases alive until no more process in
-	    the system use them as group leaders.</p>
-	    <p>Also, a new <c>unexpected_io.log</c> log file
-	    (reachable from the summary page of each test suite) has
-	    been introduced. All unexpected IO will be printed into
-	    it(for example, IO to a group leader for a parallel test
-	    case that has finished).</p>
-          <p>
-	    Own Id: OTP-10101 Aux Id: OTP-10125 </p>
-        </item>
-        <item>
-          <p>
-	    The stability of <c>common_test</c> and
-	    <c>test_server</c> when running test cases in parallel
-	    has been improved.</p>
-          <p>
-	    Own Id: OTP-10480 Aux Id: kunagi-318 [229] </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Added a general framework for executing benchmarks of
-	    Erlang/OTP. Benchmarks for the Erlang VM and mnesia have
-	    been incorporated in the framework. </p>
-          <p>
-	    For details about how to add more benchmarks see
-	    $ERL_TOP/HOWTO/BENCHMARKS.md in the source distribution.</p>
-          <p>
-	    Own Id: OTP-10156</p>
-        </item>
-        <item>
-          <p>
-	    Update common test modules to handle Unicode:</p> <list>
-	    <item> Use UTF-8 encoding for all HTML files, except the
-	    HTML version of the test suite generated with
-	    erl2html2:convert, which will have the same encoding as
-	    the original test suite (.erl) file. </item> <item>
-	    Encode link targets in HTML files with
-	    test_server_ctrl:uri_encode/1. </item> <item> Use unicode
-	    modifier 't' with ~s when appropriate. </item> <item> Use
-	    unicode:characters_to_list and
-	    unicode:characters_to_binary for conversion between
-	    binaries and strings instead of binary_to_list and
-	    list_to_binary. </item> </list>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.5.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    test_server_h will now recognize info_reports written by
-	    ct connection handlers (according to the description in
-	    cth_conn_log) and ignore them as they will be completely
-	    handled by by ct_conn_log_h.</p>
-          <p>
-	    Earlier test_server_h would print a tag (testcase name)
-	    before forwarding the report to error_logger_tty_h. This
-	    would cause lots of tags in the log with no info report
-	    following (since error_logger_tty_h did not handle them).</p>
-          <p>
-	    Own Id: OTP-10571</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Known Bugs and Problems</title>
-      <list>
-        <item>
-          <p>
-	    Restore Config data if lost when test case fails.</p>
-          <p>
-	    Own Id: OTP-10070 Aux Id: kunagi-175 [86] </p>
-        </item>
-        <item>
-          <p>
-	    IO server error in test_server.</p>
-          <p>
-	    Own Id: OTP-10125 Aux Id: OTP-10101, kunagi-177 [88] </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.5.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    The documentation has been updated with the latest
-	    changes for the test_server_ctrl:report/2 function.</p>
-          <p>
-	    Own Id: OTP-10086 Aux Id: seq12066 </p>
-        </item>
-        <item>
-          <p>
-	    The ct:get_status/0 function failed to report status if a
-	    parallel test case group was running at the time of the
-	    call. This has been fixed and the return value for the
-	    function has been updated. Please see the ct reference
-	    manual for details.</p>
-          <p>
-	    Own Id: OTP-10172</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    It is now possible to sort the HTML tables by clicking on
-	    the header elements. In order to reset a sorted table,
-	    the browser window should simply be refreshed. This
-	    feature requires that the browser supports javascript,
-	    and has javascript execution enabled. If the 'ct_run
-	    -basic_html' flag is used, no javascript code is included
-	    in the generated HTML code.</p>
-          <p>
-	    Own Id: OTP-9896 Aux Id: seq12034, OTP-9835 </p>
-        </item>
-        <item>
-          <p>
-	    Verbosity levels for log printouts has been added. This
-	    makes it possible to specify preferred verbosity for
-	    different categories of log printouts, as well as general
-	    printouts (such as standard IO), to allow control over
-	    which strings get printed and which get ignored. New
-	    versions of the Common Test logging functions, ct:log,
-	    ct:pal and ct:print, have been introduced, with a new
-	    Importance argument added. The Importance value is
-	    compared to the verbosity level at runtime. More
-	    information can be found in the chapter about Logging in
-	    the Common Test User's Guide.</p>
-          <p>
-	    Own Id: OTP-10067 Aux Id: seq12050 </p>
-        </item>
-        <item>
-          <p>
-	    The Erlang/OTP test runner ts has been extended to allow
-	    cross compilation of test suites. To cross compile the
-	    test suites first follow the normal cross compilation
-	    procedures and release the tests on the build host. Then
-	    install ts using an xcomp specification file and compile
-	    test suites using ts:compile_testcases/0. For more
-	    details see $ERL_TOP/xcomp/README.md.</p>
-          <p>
-	    Own Id: OTP-10074</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.5.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    After a test case timeout or abortion, the
-	    end_per_testcase function executes on a new dedicated
-	    process. The group leader for this process should be set
-	    to the IO server for the test case, which was not done
-	    properly. The result of this error was that no warnings
-	    about end_per_testcase failing or timing out were ever
-	    printed in the test case log. Also, help functions such
-	    as e.g. test_server:stop_node/1, attempting to
-	    synchronize with the IO server, would hang. The fault has
-	    been corrected.</p>
-          <p>
-	    Own Id: OTP-9666</p>
-        </item>
-        <item>
-          <p>
-	    A deadlock situation could occur if Common Test is
-	    forwarding error_handler printouts to Test Server at the
-	    same time a new test case is starting. This error has
-	    been fixed.</p>
-          <p>
-	    Own Id: OTP-9894</p>
-        </item>
-        <item>
-          <p>
-	    When a test case was killed because of a timetrap
-	    timeout, the current location (suite, case and line) was
-	    not printed correctly in the log files. This has been
-	    corrected.</p>
-          <p>
-	    Own Id: OTP-9930 Aux Id: seq12002 </p>
-        </item>
-        <item>
-          <p>
-	    Test Server and Common Test would add new error handlers
-	    with each test run and fail to remove previously added
-	    ones. In the case of Test Server, this would only happen
-	    if SASL was not running on the test node. This has been
-	    fixed.</p>
-          <p>
-	    Own Id: OTP-9941 Aux Id: seq12009 </p>
-        </item>
-        <item>
-          <p>
-	    If a test case process was terminated due to an exit
-	    signal from a linked process, Test Server failed to
-	    report the correct name of the suite and case to the
-	    framework. This has been corrected.</p>
-          <p>
-	    Own Id: OTP-9958 Aux Id: OTP-9855 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    A new optional feature has been introduced that enables
-	    Common Test to generate priv_dir directory names that are
-	    unique for each test case or config function. The name of
-	    the option/flag is 'create_priv_dir' and it can be set to
-	    value 'auto_per_run' (which is the default, existing,
-	    behaviour), or 'auto_per_tc' or 'manual_per_tc'. If
-	    'auto_per_tc' is used, Test Server creates a dedicated
-	    priv_dir automatically for each test case (which can be
-	    very expensive in case of many and/or repeated cases). If
-	    'manual_per_tc' is used, the user needs to create the
-	    priv_dir explicitly by calling the new function
-	    ct:make_priv_dir/0.</p>
-          <p>
-	    Own Id: OTP-9659 Aux Id: seq11930 </p>
-        </item>
-        <item>
-          <p>
-	    A column for test case group name has been added to the
-	    suite overview HTML log file.</p>
-          <p>
-	    Own Id: OTP-9730 Aux Id: seq11952 </p>
-        </item>
-        <item>
-          <p>
-	    It is now possible to use the post_end_per_testcase CT
-	    hook function to print a comment for a test case in the
-	    overview log file, even if the test case gets killed by a
-	    timetrap or unknown exit signal, or if the
-	    end_per_testcase function times out.</p>
-          <p>
-	    Own Id: OTP-9855 Aux Id: seq11979 </p>
-        </item>
-        <item>
-          <p>
-	    Common Test will now print error information (with a time
-	    stamp) in the test case log file immediately when a test
-	    case fails. This makes it easier to see when, in time,
-	    the fault actually occured, and aid the job of locating
-	    relevant trace and debug printouts in the log.</p>
-          <p>
-	    Own Id: OTP-9904 Aux Id: seq11985, OTP-9900 </p>
-        </item>
-        <item>
-          <p>
-	    Test Server has been modified to check the SASL
-	    errlog_type parameter when receiving an error logger
-	    event, so that it doesn't print reports of type that the
-	    user has disabled.</p>
-          <p>
-	    Own Id: OTP-9955 Aux Id: seq12013 </p>
-        </item>
-        <item>
-          <p>
-	    If an application cannot be found by ts it is
-	    automatically skipped when testing.</p>
-          <p>
-	    Own Id: OTP-9971</p>
-        </item>
-        <item>
-          <p>
-	    By specifying a user defined function ({M,F,A} or fun) as
-	    timetrap value, either by means of an info function or by
-	    calling ct:timetrap/1, it is now possible to set a
-	    timetrap that will be triggered when the user function
-	    returns.</p>
-          <p>
-	    Own Id: OTP-9988 Aux Id: OTP-9501, seq11894 </p>
-        </item>
-        <item>
-          <p>
-	    If the optional configuration functions init_per_suite/1
-	    and end_per_suite/1 are not implemented in the test
-	    suite, local Common Test versions of these functions are
-	    called instead, and will be displayed in the overview log
-	    file. Any printouts made by the pre- or
-	    post_init_per_suite and pre- or post_end_per_suite hook
-	    functions are saved in the log files for these functions.</p>
-          <p>
-	    Own Id: OTP-9992</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.5</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The test case group info function has been implemented in
-	    Common Test. Before execution of a test case group, a
-	    call is now made to <c>TestSuite:group(GroupName)</c>.
-	    The function returns a list of test properties, e.g. to
-	    specify timetrap values, require configuration data, etc
-	    (analogue to the test suite- and test case info
-	    function). The scope of the properties set by
-	    <c>group(GroupName)</c> is all test cases and sub-groups
-	    of group <c>GroupName</c>.</p>
-          <p>
-	    Own Id: OTP-9235</p>
-        </item>
-        <item>
-          <p>
-	    The look of the HTML log files generated by Common Test
-	    and Test Server has been improved (and made easier to
-	    customize) by means of a CSS file.</p>
-          <p>
-	    Own Id: OTP-9706</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Known Bugs and Problems</title>
-      <list>
-        <item>
-          <p>
-	    Fix problems in CT/TS due to line numbers in exceptions.</p>
-          <p>
-	    Own Id: OTP-9203</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.4.5</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    An error in how comments are colored in the test suite
-	    overview html log file has been corrected. As result, a
-	    new framework callback function, format_comment/1, has
-	    been introduced.</p>
-          <p>
-	    Own Id: OTP-9237</p>
-        </item>
-        <item>
-          <p>
-	    Test Server did not release SASL TTY handlers
-	    (sasl_report_tty_h and error_logger_tty_h) properly after
-	    each test run. This error has been fixed.</p>
-          <p>
-	    Own Id: OTP-9311</p>
-        </item>
-        <item>
-          <p>
-	    Automatically generated init- and end-configuration
-	    functions for test case groups caused incorrect execution
-	    order of test cases. This has been corrected.</p>
-          <p>
-	    Own Id: OTP-9369</p>
-        </item>
-        <item>
-          <p>
-	    If ct:log/2 was called with bad arguments, this could
-	    cause the Common Test IO handling process to crash. This
-	    fault has been corrected.</p>
-          <p>
-	    Own Id: OTP-9371 Aux Id: OTP-8933 </p>
-        </item>
-        <item>
-          <p>
-	    A bug has been fixed that made Test Server call the
-	    end_tc/3 framework function with an incorrect module name
-	    as first argument.</p>
-          <p>
-	    Own Id: OTP-9379 Aux Id: seq11863 </p>
-        </item>
-        <item>
-          <p>
-	    If end_per_testcase caused a timetrap timeout, the actual
-	    test case status was discarded and the test case logged
-	    as successful (even if the case had actually failed
-	    before the call to end_per_testcase). This fault has been
-	    fixed.</p>
-          <p>
-	    Own Id: OTP-9397</p>
-        </item>
-        <item>
-          <p>
-	    If a timetrap timeout occured during execution of of a
-	    function in a lib module (i.e. a function called directly
-	    or indirectly from a test case), the Suite argument in
-	    the end_tc/3 framework callback function would not
-	    correctly contain the name of the test suite, but the lib
-	    module. (This would only happen if the lib module was
-	    compiled with ct.hrl included). This error has been
-	    solved.</p>
-          <p>
-	    Own Id: OTP-9398</p>
-        </item>
-        <item>
-          <p>
-	    Add a proplist() type</p>
-          <p>
-	    Recently I was adding specs to an API and found that
-	    there is no canonical proplist() type defined. (Thanks to
-	    Ryan Zezeski)</p>
-          <p>
-	    Own Id: OTP-9499</p>
-        </item>
-        <item>
-	    <p> XML files have been corrected. </p>
-          <p>
-	    Own Id: OTP-9550 Aux Id: OTP-9541 </p>
-        </item>
-        <item>
-          <p>
-	    If a test suite would start with a test case group
-	    defined without the init_per_group/2 and end_per_group/2
-	    function, init_per_suite/1 would not execute initially
-	    and logging of the test run would fail. This error has
-	    been fixed.</p>
-          <p>
-	    Own Id: OTP-9584</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    A new option, 'logopts', has been introduced, to make it
-	    possible to modify some aspects of the logging behaviour
-	    in Common Test (or Test Server). For example, whenever an
-	    io printout is made, test_server adds newline (\n) to the
-	    end of the output string. This may not always be a
-	    preferred action and can therefore be disabled by means
-	    of "ct_run ... -logopts no_nl" (or ct:run_test([...,
-	    {logopts,[no_nl]}])). A new framework callback function,
-	    get_logopts/0, has been introduced (see the ct_framework
-	    module for details).</p>
-          <p>
-	    Own Id: OTP-9372 Aux Id: OTP-9396 </p>
-        </item>
-        <item>
-          <p>
-	    A new option, 'logopts', has been introduced, to make it
-	    possible to modify some aspects of the logging behaviour
-	    in Common Test (or Test Server). For example, if the html
-	    version of the test suite source code should not be
-	    generated during the test run (and consequently be
-	    unavailable in the log file system), the feature may be
-	    disabled by means of "ct_run ... -logopts no_src" (or
-	    ct:run_test([..., {logopts,[no_src]}])). A new framework
-	    callback function, get_logopts/0, has been introduced
-	    (see the ct_framework module for details).</p>
-          <p>
-	    Own Id: OTP-9396 Aux Id: seq11869, OTP-9372 </p>
-        </item>
-        <item>
-          <p>
-	    It is now possible to use a tuple {M,F,A}, or a fun, as
-	    timetrap specification in the suite info function or test
-	    case info functions. The function must return a valid
-	    timeout value, as documented in the common_test man page
-	    and in the User's Guide.</p>
-          <p>
-	    Own Id: OTP-9501 Aux Id: seq11894 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.4.4</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    It was previously not possible to use timetrap value
-	    'infinity' with ct:timetrap/1. This has been fixed.</p>
-          <p>
-	    Own Id: OTP-9159</p>
-        </item>
-        <item>
-          <p>
-	    A bug that made it impossible to cancel the previous
-	    timetrap when calling ct:timetrap/1 has been corrected.</p>
-          <p>
-	    Own Id: OTP-9233 Aux Id: OTP-9159 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    When running tests with auto-compilation disabled, Common
-	    Test could only display the test suite source code on
-	    html format in the test case log if the source file was
-	    located in the same directory as the pre-compiled suite.
-	    This has been modified so that Common Test now tries to
-	    locate the source file by means of the test suite module
-	    info (Suite:module_info/1). As a result, a suite may now
-	    be compiled to a different output directory (e.g.
-	    $MYTEST/bin) than the source code directory (e.g.
-	    $MYTEST/src), without the source-code-to-html generation
-	    being affected.</p>
-          <p>
-	    Own Id: OTP-9138</p>
-        </item>
-        <item>
-          <p>
-	    It is now possible to return a tuple {fail,Reason} from
-	    init_per_testcase/2. The result is that the associated
-	    test case gets logged as failed without ever executing.</p>
-          <p>
-	    Own Id: OTP-9160 Aux Id: seq11502 </p>
-        </item>
-        <item>
-          <p>
-	    Added DragonflyBSD check in test_server configure.</p>
-          <p>
-	    Own Id: OTP-9249</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.4.3</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Updated the ts*.config files to contain information
-	    relevant to testing Erlang/OTP in an open source
-	    environment.</p>
-          <p>
-	    Own Id: OTP-9017</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Alpha release of Common Test Hooks (CTH). CTHs allow the
-	    users of common test to abtract out common behaviours
-	    from test suites in a much more elegant and flexible way
-	    than was possible before. Note that the addition of this
-	    feature may introduce minor changes in the undocumented
-	    behaviour of the interface inbetween common_test and
-	    test_server.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-8851</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.4.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>Miscellaneous updates</p>
-          <p>
-	    Own Id: OTP-8976</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.4.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Returning {return_group_result,failed} from end_per_group
-	    in a group that is part of a sequence, did not cause the
-	    proceeding cases (or groups) to get skipped. This has
-	    been fixed.</p>
-          <p>
-	    Own Id: OTP-8753 Aux Id: seq11644 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Common Test has been updated to handle start options and
-	    test specification terms for test case groups (and test
-	    cases in groups). Also, an option named 'label', has been
-	    added that associates the test run with a name that
-	    Common Test prints in the overview HTML logs.</p>
-          <p>
-	    Own Id: OTP-8725 Aux Id: OTP-8727 </p>
-        </item>
-        <item>
-          <p>
-	    It is now possible to skip all tests in a suite, or a
-	    group, by returning {fail,Reason} from the end_tc/5
-	    framework function for init_per_suite, or init_per_group.</p>
-          <p>
-	    Own Id: OTP-8805 Aux Id: seq11664 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.4</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Returning {fail,Reason} from the framework end_tc
-	    function was not handled properly by Test Server for all
-	    test suite functions.</p>
-          <p>
-	    Own Id: OTP-8492 Aux Id: seq11502 </p>
-        </item>
-        <item>
-          <p>
-	    If the framework end_tc function would hang and get
-	    aborted by Test Server, there was no indication of
-	    failure in the logs. This has been fixed.</p>
-          <p>
-	    Own Id: OTP-8682 Aux Id: seq11504 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    It is now possible for the Test Server framework end_tc
-	    function to change the status of the test case from ok or
-	    auto-skipped to failed by returning {fail,Reason}.</p>
-          <p>
-	    Own Id: OTP-8495 Aux Id: seq11502 </p>
-        </item>
-        <item>
-          <p>
-	    Test Server will now call the end_per_testcase/2 function
-	    even if the test case has been terminated explicitly
-	    (with abort_current_testcase/1), or after a timetrap
-	    timeout. Under these circumstances the return value of
-	    end_per_testcase is completely ignored. Therefore the
-	    function will not be able to change the reason for test
-	    case termination by returning {fail,Reason}, nor will it
-	    be able to save data with {save_config,Data}.</p>
-          <p>
-	    Own Id: OTP-8500 Aux Id: seq11521 </p>
-        </item>
-        <item>
-          <p>
-	    Previously, a repeat property of a test case group
-	    specified the number of times the group should be
-	    repeated after the main test run. I.e. {repeat,N} would
-	    case the group to execute 1+N times. To be consistent
-	    with the behaviour of the run_test repeat option, this
-	    has been changed. N now specifies the absolute number of
-	    executions instead.</p>
-          <p>
-	    Own Id: OTP-8689 Aux Id: seq11502 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.3.6</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    The Test Server parse transform did not handle bit string
-	    comprehensions. This has been fixed.</p>
-          <p>
-	    Own Id: OTP-8458 Aux Id: OTP-8311 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The tc_status value in the Config list for a test case
-	    that has failed because of a timetrap timeout, has
-	    changed from {tc_status,timeout} to
-	    {tc_status,timetrap_timeout}.</p>
-          <p>
-	    Own Id: OTP-8302</p>
-        </item>
-        <item>
-	    <p>The documentation is now possible to build in an open
-	    source environment after a number of bugs are fixed and
-	    some features are added in the documentation build
-	    process. </p>
-	    <p>- The arity calculation is updated.</p>
-	    <p>- The module prefix used in the function names for
-	    bif's are removed in the generated links so the links
-	    will look like
-	    "http://www.erlang.org/doc/man/erlang.html#append_element-2"
-	    instead of
-	    "http://www.erlang.org/doc/man/erlang.html#erlang:append_element-2".</p>
-	    <p>- Enhanced the menu positioning in the html
-	    documentation when a new page is loaded.</p>
-	    <p>- A number of corrections in the generation of man
-	    pages (thanks to Sergei Golovan)</p>
-	    <p>- The legal notice is taken from the xml book file so
-	    OTP's build process can be used for non OTP
-	    applications.</p>
-          <p>
-	    Own Id: OTP-8343</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.3.5</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    If the init_per_testcase/2 function fails, the test case
-	    now gets marked and counted as auto skipped, not user
-	    skipped (which would previously happen).</p>
-          <p>
-	    Own Id: OTP-8289</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The documentation is now built with open source tools
-	    (xsltproc and fop) that exists on most platforms. One
-	    visible change is that the frames are removed.</p>
-          <p>
-	    Own Id: OTP-8201</p>
-        </item>
-        <item>
-          <p>
-	    It is now possible to fail a test case from the
-	    end_per_testcase/2 function, by returning {fail,Reason}.</p>
-          <p>
-	    Own Id: OTP-8284</p>
-        </item>
-        <item>
-          <p>
-	    It is now possible to fail a test case by having the
-	    end_tc/3 framework function return {fail,Reason} for the
-	    test case.</p>
-          <p>
-	    Own Id: OTP-8285</p>
-        </item>
-        <item>
-          <p>
-	    The test_server framework API (e.g. the end_tc/3
-	    function) has been modified. See the test_server_ctrl
-	    documentation for details.</p>
-          <p>
-	    Own Id: OTP-8286 Aux Id: OTP-8285, OTP-8287 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.3.4</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    When running a suite starting with a test case group,
-	    Test Server crashed if init_per_suite/1 exited or
-	    returned skip. This has been fixed.</p>
-          <p>
-	    Own Id: OTP-8105 Aux Id: OTP-8089 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Various updates and fixes in Common Test and Test Server.</p>
-          <p>
-	    Own Id: OTP-8045 Aux Id: OTP-8089,OTP-8105,OTP-8163 </p>
-        </item>
-        <item>
-          <p>
-	    Errors in coverage data collection and analysis were
-	    difficult to detect. The logging has been improved so
-	    that more information about e.g. imported and missing
-	    modules is printed to the html log files.</p>
-          <p>
-	    Own Id: OTP-8163 Aux Id: seq11374 </p>
-        </item>
-        <item>
-          <p>
-	    The Common Test HTML overview pages have been improved.
-	    It is now possible to see if a test case has been skipped
-	    explicitly or because a configuration function has
-	    failed. Also, the history page (all_runs.html) now has
-	    scrolling text displaying the test names. The old format
-	    (showing names as a truncated string) can still be
-	    generated by means of the flag/option 'basic_html'.</p>
-          <p>
-	    Own Id: OTP-8177</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.3.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Various corrections and improvements of Common Test and
-	    Test Server.</p>
-          <p>
-	    Own Id: OTP-7981</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.3.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Minor updates and corrections.</p>
-          <p>
-	    Own Id: OTP-7897</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The conf case in Test Server has been extended with
-	    properties that make it possible to execute test cases in
-	    parallel, in sequence and in shuffled order. It is now
-	    also possible to repeat test cases according to different
-	    criterias. The properties can be combined, making it
-	    possible to e.g. repeat a conf case a certain number of
-	    times and execute the test cases in different (random)
-	    order every time. The properties are specified in a list
-	    in the conf case definition: {conf, Properties, InitCase,
-	    TestCases, EndCase}. The available properties are:
-	    parallel, sequence, shuffle, repeat, repeat_until_all_ok,
-	    repeat_until_any_ok, repeat_until_any_fail,
-	    repeat_until_all_fail.</p>
-          <p>
-	    Own Id: OTP-7511 Aux Id: OTP-7839 </p>
-        </item>
-        <item>
-	    <p>The test server starts Cover on nodes of the same
-	    version as the test server itself only.</p>
-          <p>
-	    Own Id: OTP-7699</p>
-        </item>
-        <item>
-          <p>
-	    The Erlang mode for Emacs has been updated with new and
-	    modified skeletons for Common Test and TS. Syntax for
-	    test case groups in Common Test (and conf cases with
-	    properties in TS) has been added and a new minimal Common
-	    Test suite skeleton has been introduced.</p>
-          <p>
-	    Own Id: OTP-7856</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-<section><title>Test_Server 3.2.4.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-            The step functionality in Common Test (based on
-            interaction with Debugger) was broken. This has been
-            fixed, and some new step features have also been added.
-            Please see the Common Test User's Guide for details.</p>
-          <p>
-            Own Id: OTP-7800 Aux Id: seq11106 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.2.4</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Miscellaneous updates.</p>
-          <p>
-	    Own Id: OTP-7527</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.2.3</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    When a testcase terminated due to a timetrap, io sent to
-	    the group leader from framework:end_tc/3 (using
-	    ct:pal/2/3 or ct:log/2/3) would cause deadlock. This has
-	    been fixed.</p>
-          <p>
-	    Own Id: OTP-7447 Aux Id: seq11010 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Various updates and improvements, plus some minor bug
-	    fixes, have been implemented in Common Test and Test
-	    Server.</p>
-          <p>
-	    Own Id: OTP-7112</p>
-        </item>
-        <item>
-          <p>
-	    It is now possible, by means of the new function
-	    ct:abort_current_testcase/1 or
-	    test_server_ctrl:abort_current_testcase/1, to abort the
-	    currently executing test case.</p>
-          <p>
-	    Own Id: OTP-7518 Aux Id: OTP-7112 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.2.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p><c>erlang:system_info/1</c> now accepts the
-	    <c>logical_processors</c>, and <c>debug_compiled</c>
-	    arguments. For more info see the, <c>erlang(3)</c>
-	    documentation.</p> <p>The scale factor returned by
-	    <c>test_server:timetrap_scale_factor/0</c> is now also
-	    effected if the emulator uses a larger amount of
-	    scheduler threads than the amount of logical processors
-	    on the system. </p>
-          <p>
-	    Own Id: OTP-7175</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.2.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    When init_per_suite or end_per_suite terminated due to
-	    runtime failure, test_server failed to format the line
-	    number information properly and crashed. This error has
-	    now been fixed.</p>
-          <p>
-	    Own Id: OTP-7091</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Test_Server 3.2.0</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Test Server is a portable test server for automated
-	    application testing. The server can run test suites on
-	    local or remote targets and log progress and results to
-	    HTML pages. The main purpose of Test Server is to act as
-	    engine inside customized test tools. A callback interface
-	    for such framework applications is provided.</p>
-          <p>
-	    Own Id: OTP-6989</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-</chapter>
-
diff --git a/lib/test_server/doc/src/notes_history.xml b/lib/test_server/doc/src/notes_history.xml
deleted file mode 100644
index ca7880d74f..0000000000
--- a/lib/test_server/doc/src/notes_history.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2006</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Test Server Release Notes History</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-
-  <section>
-    <title>Test Server 3.1.1</title>
-
-    <section>
-      <title>Improvements and new features</title>
-      <list type="bulleted">
-        <item>
-          <p>Added functions <c>test_server:break/1</c> and
-            <c>test_server:continue/0</c> for semiautomatic testing.</p>
-          <p><c>test_server:timetrap/1</c> can now also take
-            <c>{hours,H} | {minutes,M | {seconds,S}</c>.</p>
-          <p>Added function
-            <c>test_server_ctrl:multiply_timetraps/1</c>,
-            <c>test_server_ctrl:add_case/3</c>,
-            <c>test_server_ctrl:add_cases/2/3</c>.</p>
-          <p>Added test suite functions <c>init_per_suite/1</c> and
-            <c>end_per_suite/1</c>.</p>
-          <p><c>fin_per_testcase/2</c> is changed to
-            <c>end_per_testcase/2</c>. <c>fin_per_testcase</c> is kept
-            for backwards compatibility.</p>
-          <p>Added support for writing own test server frameworks.
-            Callback functions <c>init_tc/1</c>, <c>end_tc/3</c>, 
-            <c>get_suite/2</c>, <c>report/2</c>, <c>warn/1</c>.</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Test Server 3.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Added the options <c>cover</c> and <c>cover_details</c>
-            to <c>ts:run</c>. When one of these options is used, 
-            the tested application will be cover compiled
-            before the test is run. The cover compiled code will also
-            be loaded on all slave or peer nodes started with
-            <c>test_server:start_node</c>. When the test is completed
-            coverage data from all nodes is collected and merged, and
-            presented in the coverage log to which there will be a link
-            from the test suite result page (i.e. the one with the 
-            heading "Test suite ... results").</p>
-          <p>The <c>cover_details</c> option will do 
-            <c>cover:analyse_to_file</c> for each cover compiled module,
-            while the <c>cover</c> option only will produce a list of
-            modules and the number of covered/uncovered lines in each
-            module.</p>
-          <p>To make it possible to run all test from a script (like in
-            the OTP daily builds), the following is added:
-            <c>ts:run([all_tests | Options])</c>.</p>
-          <p>This means that e.g. the following is possible:
-            <c>erl -s ts run all_tests batch cover</c>.</p>
-          <p>Note that it is also possible to run tests with cover even 
-            if you don't use <c>ts</c>.
-            See <c>test_server_ctrl:cover/2/3</c>.</p>
-          <p>Own Id: OTP-4703</p>
-        </item>
-        <item>
-          <p>Removed module <c>ts_save.erl</c> and function
-            <c>ts:save/0/1</c><em>(incompatible)</em>.</p>
-          <p>Added config variable <c>ipv6_hosts</c> to
-            <c>ts:install/1</c> and test spec file.</p>
-          <p>No longer removing duplicates of test cases from test spec
-            <em>(incompatible)</em>.</p>
-          <p>Added function <c>test_server:run_on_shielded_node/2</c>.</p>
-          <p>Creation of html files for test suite source does no longer
-            crash if suite contains more than 9999 lines of code.</p>
-          <p>Added functionality for cross cover compilation,
-            i.e. collection of cover data from all tests.</p>
-          <p>Multiplying timetrap times with 10 when running with cover.</p>
-          <p>Added <c>ts:r/3</c> for running tests with cover.</p>
-          <p>*** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>Own Id: OTP-5040</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/test_server/doc/src/part.xml b/lib/test_server/doc/src/part.xml
deleted file mode 100644
index 685ed16a94..0000000000
--- a/lib/test_server/doc/src/part.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2002</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Test Server User's Guide</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2002-07-11</date>
-    <rev></rev>
-  </header>
-  <description>
-    <p><em>Test Server</em> is a portable test server for
-      automated application testing. The server can run test suites
-      and log progress and results to HTML
-      pages. The main purpose of Test Server is to act as engine
-      inside customized test tools. A callback interface for 
-      such framework applications is provided.</p>
-  </description>
-  <xi:include href="basics_chapter.xml"/>
-  <xi:include href="test_spec_chapter.xml"/>
-  <xi:include href="write_test_chapter.xml"/>
-  <xi:include href="run_test_chapter.xml"/>
-  <xi:include href="write_framework_chapter.xml"/>
-  <xi:include href="example_chapter.xml"/>
-</part>
-
diff --git a/lib/test_server/doc/src/part_notes.xml b/lib/test_server/doc/src/part_notes.xml
deleted file mode 100644
index 8cb9b6c591..0000000000
--- a/lib/test_server/doc/src/part_notes.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2004</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Test Server Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p>The <em>Test Server</em> is a portable test server for
-      application testing. The test server can run automatic test suites
-      and log progress and results to HTML
-      pages. It also provides some support for test suite authors.</p>
-    <p>For information about older versions, see
-      <url href="part_notes_history_frame.html">Release Notes History</url>.</p>
-  </description>
-  <xi:include href="notes.xml"/>
-</part>
-
diff --git a/lib/test_server/doc/src/part_notes_history.xml b/lib/test_server/doc/src/part_notes_history.xml
deleted file mode 100644
index 468b5aa8ba..0000000000
--- a/lib/test_server/doc/src/part_notes_history.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part>
-  <header>
-    <copyright>
-      <year>2006</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Test Server Release Notes History</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p>The <em>Test Server</em> is a portable test server for
-      application testing. The test server can run automatic test suites
-      and log progress and results to HTML
-      pages. It also provides some support for test suite authors.</p>
-  </description>
-  <include file="notes_history"></include>
-</part>
-
diff --git a/lib/test_server/doc/src/ref_man.xml b/lib/test_server/doc/src/ref_man.xml
deleted file mode 100644
index 1b06d9750b..0000000000
--- a/lib/test_server/doc/src/ref_man.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2002</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Test Server Reference Manual</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>ref_man.xml</file>
-  </header>
-  <description>
-    <p><em>Test Server</em> is a portable test server for
-      automated application testing. The server can run test suites
-      and log progress and results to HTML
-      pages. The main purpose of Test Server is to act as engine
-      inside customized test tools. A callback interface for 
-      such framework applications is provided.</p>
-  </description>
-  <xi:include href="test_server_app.xml"/>
-  <xi:include href="test_server_ctrl.xml"/>
-  <xi:include href="test_server.xml"/>
-</application>
-
diff --git a/lib/test_server/doc/src/run_test_chapter.xml b/lib/test_server/doc/src/run_test_chapter.xml
deleted file mode 100644
index cb5b29c993..0000000000
--- a/lib/test_server/doc/src/run_test_chapter.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2002</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Running Test Suites</title>
-    <prepared>Siri Hansen</prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>run_test_chapter.xml</file>
-  </header>
-
-  <section>
-    <title>Using the test server controller</title>
-    <p>The test server controller provides a low level interface to
-      all the Test Server functionality. It is possible to use this
-      interface directly, but it is recommended to use a framework
-      such as <em>Common Test</em> instead. If no existing framework
-      suits your needs, you could of course build your own 
-      on top of the test server controller. Some information about how 
-      to do this can be found in the section named "Writing you own 
-      test server framework" in the Test Server User's Guide.
-      </p>
-    <p>For information about using the controller directly, please see 
-      all available functions in the reference manual for
-      <c>test_server_ctrl</c>.
-    </p>
-  </section>
-</chapter>
-
diff --git a/lib/test_server/doc/src/test_server.xml b/lib/test_server/doc/src/test_server.xml
deleted file mode 100644
index 96ff6de3ba..0000000000
--- a/lib/test_server/doc/src/test_server.xml
+++ /dev/null
@@ -1,853 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2007</year>
-      <year>2013</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>test_server</title>
-    <prepared>Siri Hansen</prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date></date>
-    <rev></rev>
-    <file>test_server_ref.sgml</file>
-  </header>
-  <module>test_server</module>
-  <modulesummary>This module provides support for test suite authors.</modulesummary>
-  <description>
-    <p>The <c>test_server</c> module aids the test suite author by providing
-      various support functions. The supported functionality includes:
-      </p>
-    <list type="bulleted">
-      <item>Logging and timestamping
-      </item>
-      <item>Capturing output to stdout
-      </item>
-      <item>Retrieving and flushing the message queue of a process
-      </item>
-      <item>Watchdog timers, process sleep, time measurement and unit
-       conversion
-      </item>
-      <item>Private scratch directory for all test suites
-      </item>
-      <item>Start and stop of slave- or peer nodes</item>
-    </list>
-    <p>For more information on how to write test cases and for
-      examples, please see the Test Server User's Guide. 
-      </p>
-  </description>
-
-  <section>
-    <title>TEST SUITE SUPPORT FUNCTIONS</title>
-    <p>The following functions are supposed to be used inside a test
-      suite.
-      </p>
-  </section>
-  <funcs>
-    <func>
-      <name>os_type() -> OSType</name>
-      <fsummary>Returns the OS type of the target node</fsummary>
-      <type>
-        <v>OSType = term()</v>
-        <d>This is the same as returned from <c>os:type/0</c></d>
-      </type>
-      <desc>
-        <p>This function is equivalent to <c>os:type/0</c>. It is kept
-        for backwards compatibility.</p>
-      </desc>
-    </func>
-    <func>
-      <name>fail()</name>
-      <name>fail(Reason)</name>
-      <fsummary>Makes the test case fail.</fsummary>
-      <type>
-        <v>Reason = term()</v>
-        <d>The reason why the test case failed.</d>
-      </type>
-      <desc>
-        <p>This will make the test suite fail with a given reason, or
-          with <c>suite_failed</c> if no reason was given. Use this
-          function if you want to terminate a test case, as this will
-          make it easier to read the log- and HTML files. <c>Reason</c>
-          will appear in the comment field in the HTML log.</p>
-      </desc>
-    </func>
-    <func>
-      <name>timetrap(Timout) -> Handle</name>
-      <fsummary></fsummary>
-      <type>
-        <v>Timeout = integer() | {hours,H} | {minutes,M} | {seconds,S}</v>
-        <v>H = M = S = integer()</v>
-        <v>Pid = pid()</v>
-        <d>The process that is to be timetrapped (<c>self()</c>by default)</d>
-      </type>
-      <desc>
-        <p>Sets up a time trap for the current process. An expired
-          timetrap kills the process with reason
-          <c>timetrap_timeout</c>. The returned handle is to be given
-          as argument to <c>timetrap_cancel</c> before the timetrap
-          expires.  If <c>Timeout</c> is an integer, it is expected to
-          be milliseconds.</p>
-        <note>
-          <p>If the current process is trapping exits, it will not be killed
-            by the exit signal with reason <c>timetrap_timeout</c>.
-            If this happens, the process will be sent an exit signal
-            with reason <c>kill</c> 10 seconds later which will kill the
-            process. Information about the timetrap timeout will in
-            this case not be found in the test logs. However, the
-            error_logger will be sent a warning.</p>
-        </note>
-      </desc>
-    </func>
-    <func>
-      <name>timetrap_cancel(Handle) -> ok</name>
-      <fsummary>Cancels a timetrap.</fsummary>
-      <type>
-        <v>Handle = term()</v>
-        <d>Handle returned from <c>timetrap</c></d>
-      </type>
-      <desc>
-        <p>This function cancels a timetrap. This must be done before
-          the timetrap expires.</p>
-      </desc>
-    </func>
-    <func>
-      <name>timetrap_scale_factor() -> ScaleFactor</name>
-      <fsummary>Returns the scale factor for timeouts.</fsummary>
-      <type>
-        <v>ScaleFactor = integer()</v>
-      </type>
-      <desc>
-        <p>This function returns the scale factor by which all timetraps
-	are scaled. It is normally 1, but can be greater than 1 if
-	the test_server is running <c>cover</c>, using a larger amount of
-	scheduler threads than the amount of logical processors on the
-	system, running under purify, valgrind or in a debug-compiled
-	emulator. The scale factor can be used if you need to scale you
-	own timeouts in test cases with same factor as the test_server
-	uses.</p>
-      </desc>
-    </func>
-    <func>
-      <name>sleep(MSecs) -> ok</name>
-      <fsummary>Suspens the calling task for a specified time.</fsummary>
-      <type>
-        <v>MSecs = integer() | float() | infinity</v>
-        <d>The number of milliseconds to sleep</d>
-      </type>
-      <desc>
-        <p>This function suspends the calling process for at least the
-          supplied number of milliseconds. There are two major reasons
-          why you should use this function instead of
-          <c>timer:sleep</c>, the first being that the module
-          <c>timer</c> may be unavailable at the time the test suite is
-          run, and the second that it also accepts floating point
-          numbers.</p>
-      </desc>
-    </func>
-    <func>
-      <name>adjusted_sleep(MSecs) -> ok</name>
-      <fsummary>Suspens the calling task for a specified time.</fsummary>
-      <type>
-        <v>MSecs = integer() | float() | infinity</v>
-        <d>The default number of milliseconds to sleep</d>
-      </type>
-      <desc>
-        <p>This function suspends the calling process for at least the
-          supplied number of milliseconds. The function behaves the same
-	  way as <c>test_server:sleep/1</c>, only <c>MSecs</c>
-	  will be multiplied by the 'multiply_timetraps' value, if set,
-	  and also automatically scaled up if 'scale_timetraps' is set
-	  to true (which it is by default).</p>
-      </desc>
-    </func>
-    <func>
-      <name>hours(N) -> MSecs</name>
-      <name>minutes(N) -> MSecs</name>
-      <name>seconds(N) -> MSecs</name>
-      <fsummary></fsummary>
-      <type>
-        <v>N = integer()</v>
-        <d>Value to convert to milliseconds.</d>
-      </type>
-      <desc>
-        <p>Theese functions convert <c>N</c> number of hours, minutes
-          or seconds into milliseconds.
-          </p>
-        <p>Use this function when you want to
-          <c>test_server:sleep/1</c> for a number of seconds, minutes or
-          hours(!).</p>
-      </desc>
-    </func>
-    <func>
-      <name>format(Format) -> ok</name>
-      <name>format(Format, Args)</name>
-      <name>format(Pri, Format)</name>
-      <name>format(Pri, Format, Args)</name>
-      <fsummary></fsummary>
-      <type>
-        <v>Format = string()</v>
-        <d>Format as described for <c>io_:format</c>.</d>
-        <v>Args = list()</v>
-        <d>List of arguments to format.</d>
-      </type>
-      <desc>
-        <p>Formats output just like <c>io:format</c> but sends the
-          formatted string to a logfile. If the urgency value,
-          <c>Pri</c>, is lower than some threshold value, it will also
-          be written to the test person's console. Default urgency is
-          50, default threshold for display on the console is 1.
-          </p>
-        <p>Typically, the test person don't want to see everything a
-          test suite outputs, but is merely interested in if the test
-          cases succeeded or not, which the test server tells him. If he
-          would like to see more, he could manually change the threshold
-          values by using the <c>test_server_ctrl:set_levels/3</c>
-          function.</p>
-      </desc>
-    </func>
-    <func>
-      <name>capture_start() -> ok</name>
-      <name>capture_stop() -> ok</name>
-      <name>capture_get() -> list()</name>
-      <fsummary>Captures all output to stdout for a process.</fsummary>
-      <desc>
-        <p>These functions makes it possible to capture all output to
-          stdout from a process started by the test suite. The list of
-          characters captured can be purged by using <c>capture_get</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>messages_get() -> list()</name>
-      <fsummary>Empty the message queue.</fsummary>
-      <desc>
-        <p>This function will empty and return all the messages
-          currently in the calling process' message queue.</p>
-      </desc>
-    </func>
-    <func>
-      <name>timecall(M, F, A) -> {Time, Value}</name>
-      <fsummary>Measures the time needed to call a function.</fsummary>
-      <type>
-        <v>M = atom()</v>
-        <d>The name of the module where the function resides.</d>
-        <v>F = atom()</v>
-        <d>The name of the function to call in the module.</d>
-        <v>A = list()</v>
-        <d>The arguments to supply the called function.</d>
-        <v>Time = integer()</v>
-        <d>The number of seconds it took to call the function.</d>
-        <v>Value = term()</v>
-        <d>Value returned from the called function.</d>
-      </type>
-      <desc>
-        <p>This function measures the time (in seconds) it takes to
-          call a certain function. The function call is <em>not</em>
-          caught within a catch.</p>
-      </desc>
-    </func>
-    <func>
-      <name>do_times(N, M, F, A) -> ok</name>
-      <name>do_times(N, Fun)</name>
-      <fsummary>Calls MFA or Fun N times.</fsummary>
-      <type>
-        <v>N = integer()</v>
-        <d>Number of times to call MFA.</d>
-        <v>M = atom()</v>
-        <d>Module name where the function resides.</d>
-        <v>F = atom()</v>
-        <d>Function name to call.</d>
-        <v>A = list()</v>
-        <d>Arguments to M:F.</d>
-      </type>
-      <desc>
-        <p>Calls MFA or Fun N times. Useful for extensive testing of a
-          sensitive function.</p>
-      </desc>
-    </func>
-    <func>
-      <name>m_out_of_n(M, N, Fun) -> ok | exit({m_out_of_n_failed, {R,left_to_do}}</name>
-      <fsummary>Fault tolerant <c>do_times</c>.</fsummary>
-      <type>
-        <v>N = integer()</v>
-        <d>Number of times to call the Fun.</d>
-        <v>M = integer()</v>
-        <d>Number of times to require a successful return.</d>
-      </type>
-      <desc>
-        <p>Repeatedly evaluates the given function until it succeeds
-          (doesn't crash) M times. If, after N times, M successful
-          attempts have not been accomplished, the process crashes with
-          reason {m_out_of_n_failed, {R,left_to_do}}, where R indicates
-          how many cases that was still to be successfully completed.
-          </p>
-        <p>For example:
-          </p>
-        <p><c>m_out_of_n(1,4,fun() -> tricky_test_case() end)</c>          <br></br>
-Tries to run tricky_test_case() up to 4 times, and is
-          happy if it succeeds once.
-          </p>
-        <p><c>m_out_of_n(7,8,fun() -> clock_sanity_check() end)</c>          <br></br>
-Tries running clock_sanity_check() up to 8 times,and
-          allows the function to fail once.  This might be useful if
-          clock_sanity_check/0 is known to fail if the clock crosses an
-          hour boundary during the test (and the up to 8 test runs could
-          never cross 2 boundaries)</p>
-      </desc>
-    </func>
-    <func>
-      <name>call_crash(M, F, A) -> Result</name>
-      <name>call_crash(Time, M, F, A) -> Result</name>
-      <name>call_crash(Time, Crash, M, F, A) -> Result</name>
-      <fsummary>Calls MFA and succeeds if it crashes.</fsummary>
-      <type>
-        <v>Result = ok | exit(call_crash_timeout) | exit({wrong_crash_reason, Reason})</v>
-        <v>Crash = term()</v>
-        <d>Crash return from the function.</d>
-        <v>Time = integer()</v>
-        <d>Timeout in milliseconds.</d>
-        <v>M = atom()</v>
-        <d>Module name where the function resides.</d>
-        <v>F = atom()</v>
-        <d>Function name to call.</d>
-        <v>A = list()</v>
-        <d>Arguments to M:F.</d>
-      </type>
-      <desc>
-        <p>Spawns a new process that calls MFA. The call is considered
-          successful if the call crashes with the gives reason
-          (<c>Crash</c>) or any reason if not specified. The call must
-          terminate within the given time (default <c>infinity</c>), or
-          it is considered a failure.</p>
-      </desc>
-    </func>
-    <func>
-      <name>temp_name(Stem) -> Name</name>
-      <fsummary>Returns a unique filename.</fsummary>
-      <type>
-        <v>Stem = string()</v>
-      </type>
-      <desc>
-        <p>Returns a unique filename starting with <c>Stem</c> with
-          enough extra characters appended to make up a unique
-          filename. The filename returned is guaranteed not to exist in
-          the filesystem at the time of the call.</p>
-      </desc>
-    </func>
-    <func>
-      <name>break(Comment) -> ok</name>
-      <fsummary>Cancel all timetraps and wait for call to continue/0.</fsummary>
-      <type>
-        <v>Comment = string()</v>
-      </type>
-      <desc>
-        <p><c>Comment</c> is a string which will be written in
-          the shell, e.g. explaining what to do.</p>
-        <p>This function will cancel all timetraps and pause the
-          execution of the test case until the user executes the
-          <c>continue/0</c> function. It gives the user the opportunity
-          to interact with the erlang node running the tests, e.g. for
-          debugging purposes or for manually executing a part of the
-          test case.</p>
-        <p>When the <c>break/1</c> function is called, the shell will
-          look something like this:</p>
-        <code type="none"><![CDATA[
-   --- SEMIAUTOMATIC TESTING ---
-   The test case executes on process <0.51.0>
-
-
-   "Here is a comment, it could e.g. instruct to pull out a card"
-
-
-   -----------------------------
-
-   Continue with --> test_server:continue().        ]]></code>
-        <p>The user can now interact with the erlang node, and when
-          ready call <c>test_server:continue().</c></p>
-        <p>Note that this function can not be used if the test is
-          executed with <c>ts:run/0/1/2/3/4</c> in <c>batch</c> mode.</p>
-      </desc>
-    </func>
-    <func>
-      <name>continue() -> ok</name>
-      <fsummary>Continue after break/1.</fsummary>
-      <desc>
-        <p>This function must be called in order to continue after a
-          test case has called <c>break/1</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>run_on_shielded_node(Fun, CArgs) -> term()</name>
-      <fsummary>Execute a function a shielded node.</fsummary>
-      <type>
-        <v>Fun = function() (arity 0)</v>
-        <d>Function to execute on the shielded node.</d>
-        <v>CArg = string()</v>
-        <d>Extra command line arguments to use when starting the shielded node.</d>
-      </type>
-      <desc>
-        <p><c>Fun</c> is executed in a process on a temporarily created
-          hidden node with a proxy for communication with the test server
-          node. The node is called a shielded node (should have been called
-          a shield node). If <c>Fun</c> is successfully executed, the result
-          is returned. A peer node (see <c>start_node/3</c>) started from
-          the shielded node will be shielded from test server node, i.e.
-          they will not be aware of each other. This is useful when you want
-          to start nodes from earlier OTP releases than the OTP release of
-          the test server node.</p>
-        <p>Nodes from an earlier OTP release can normally not be started
-          if the test server hasn't been started in compatibility mode
-          (see the <c>+R</c> flag in the <c>erl(1)</c> documentation) of
-          an earlier release. If a shielded node is started in compatibility
-          mode of an earlier OTP release than the OTP release of the test
-          server node, the shielded node can start nodes of an earlier OTP
-          release.</p>
-        <note>
-          <p>You <em>must</em> make sure that nodes started by the shielded
-            node never communicate directly with the test server node.</p>
-        </note>
-        <note>
-          <p>Slave nodes always communicate with the test server node;
-            therefore, <em>never</em> start <em>slave nodes</em> from the
-            shielded node, <em>always</em> start <em>peer nodes</em>.</p>
-        </note>
-      </desc>
-    </func>
-    <func>
-      <name>start_node(Name, Type, Options) -> {ok, Node} | {error, Reason}</name>
-      <fsummary>Start a node.</fsummary>
-      <type>
-        <v>Name = atom() | string()</v>
-        <d>Name of the slavenode to start (as given to -sname or -name)</d>
-        <v>Type = slave | peer</v>
-        <d>The type of node to start.</d>
-        <v>Options = [{atom(), term()]</v>
-        <d>Tuplelist of options</d>
-      </type>
-      <desc>
-        <p>This functions starts a node, possibly on a remote machine,
-          and guarantees cross architecture transparency. Type is set to
-          either <c>slave</c> or <c>peer</c>.
-          </p>
-        <p><c>slave</c> means that the new node will have a master,
-          i.e. the slave node will terminate if the master terminates,
-          TTY output produced on the slave will be sent back to the
-          master node and file I/O is done via the master. The master is
-          normally the target node unless the target is itself a slave.
-          </p>
-        <p><c>peer</c> means that the new node is an independent node
-          with no master.
-          </p>
-        <p><c>Options</c> is a tuplelist which can contain one or more
-          of
-          </p>
-        <taglist>
-          <tag><c>{remote, true}</c></tag>
-          <item>Start the node on a remote host. If not specified, the
-           node will be started on the local host.  Test cases that
-           require a remote host will fail with a reasonable comment if
-           no remote hosts are available at the time they are run.
-          </item>
-          <tag><c>{args, Arguments}</c></tag>
-          <item>Arguments passed directly to the node. This is
-           typically a string appended to the command line.
-          </item>
-          <tag><c>{wait, false}</c></tag>
-          <item>Don't wait until the node is up. By default, this
-           function does not return until the node is up and running,
-           but this option makes it return as soon as the node start
-           command is given..
-                    <br></br>
-Only valid for peer nodes
-          </item>
-          <tag><c>{fail_on_error, false}</c></tag>
-          <item>Returns <c>{error, Reason}</c> rather than failing the
-           test case.
-                    <br></br>
-Only valid for peer nodes. Note that slave nodes always
-           act as if they had <c>fail_on_error=false</c></item>
-          <tag><c>{erl, ReleaseList}</c></tag>
-          <item>Use an Erlang emulator determined by ReleaseList when
-           starting nodes, instead of the same emulator as the test
-           server is running. ReleaseList is a list of specifiers,
-           where a specifier is either {release, Rel}, {prog, Prog}, or
-           'this'. Rel is either the name of a release, e.g., "r12b_patched"
-           or 'latest'. 'this' means using the same emulator as the test
-           server. Prog is the name of an emulator executable.  If the
-           list has more than one element, one of them is picked
-           randomly.  (Only works on Solaris and Linux, and the test server 
-           gives warnings when it notices that nodes are not of the same
-           version as itself.)
-                    <br></br>
-          <br></br>
-
-           When specifying this option to run a previous release, use
-          <c>is_release_available/1</c> function to test if the given
-           release is available and skip the test case if not.
-                    <br></br>
-          <br></br>
-
-           In order to avoid compatibility problems (may not appear right
-           away), use a shielded node (see <c>run_on_shielded_node/2</c>)
-           when starting nodes from different OTP releases than the test
-           server.
-          </item>
-          <tag><c>{cleanup, false}</c></tag>
-          <item>Tells the test server not to kill this node if it is
-           still alive after the test case is completed. This is useful
-           if the same node is to be used by a group of test cases.
-          </item>
-          <tag><c>{env, Env}</c></tag>
-          <item><c>Env</c> should be a list of tuples <c>{Name, Val}</c>,
-           where <c>Name</c> is the name of an environment variable, and
-          <c>Val</c> is the value it is to have in the started node.
-           Both <c>Name</c> and <c>Val</c> must be strings. The one
-           exception is <c>Val</c> being the atom <c>false</c> (in
-           analogy  with  <c>os:getenv/1</c>),  which  removes  the
-           environment variable. Only valid for peer nodes. Not
-           available on VxWorks.</item>
-	  <tag><c>{start_cover, false}</c></tag>
-	  <item>By default the test server will start cover on all nodes
-	   when the test is run with code coverage analysis. To make
-	   sure cover is not started on a new node, set this option to
-	   <c>false</c>. This can be necessary if the connection to
-	   the node at some point will be broken but the node is
-	   expected to stay alive. The reason is that a remote cover
-	   node can not continue to run without its main node. Another
-	   solution would be to explicitly stop cover on the node
-	   before breaking the connection, but in some situations (if
-	   old code resides in one or more processes) this is not
-	   possible.</item>
-        </taglist>
-      </desc>
-    </func>
-    <func>
-      <name>stop_node(NodeName) -> bool()</name>
-      <fsummary>Stops a node</fsummary>
-      <type>
-        <v>NodeName = term()</v>
-        <d>Name of the node to stop</d>
-      </type>
-      <desc>
-        <p>This functions stops a node previously started with
-          <c>start_node/3</c>. Use this function to stop any node you
-          start, or the test server will produce a warning message in
-          the test logs, and kill the nodes automatically unless it was
-          started with the <c>{cleanup, false}</c> option.</p>
-      </desc>
-    </func>
-    <func>
-      <name>is_commercial() -> bool()</name>
-      <fsummary>Tests whether the emulator is commercially supported</fsummary>
-      <desc>
-        <p>This function test whether the emulator is commercially supported
-	emulator. The tests for a commercially supported emulator could be more
-	stringent (for instance, a commercial release should always contain
-	documentation for all applications).</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>is_release_available(Release) -> bool()</name>
-      <fsummary>Tests whether a release is available</fsummary>
-      <type>
-        <v>Release = string() | atom()</v>
-        <d>Release to test for</d>
-      </type>
-      <desc>
-        <p>This function test whether the release given by
-          <c>Release</c> (for instance, "r12b_patched") is available
-          on the computer that the test_server controller is running on.
-          Typically, you should skip the test case if not.</p>
-        <p>Caution: This function may not be called from the <c>suite</c>
-          clause of a test case, as the test_server will deadlock.</p>
-      </desc>
-    </func>
-    <func>
-      <name>is_native(Mod) -> bool()</name>
-      <fsummary>Checks whether the module is natively compiled or not</fsummary>
-      <type>
-        <v>Mod = atom()</v>
-        <d>A module name</d>
-      </type>
-      <desc>
-        <p>Checks whether the module is natively compiled or not</p>
-      </desc>
-    </func>
-    <func>
-      <name>app_test(App) -> ok | test_server:fail()</name>
-      <name>app_test(App,Mode)</name>
-      <fsummary>Checks an applications .app file for obvious errors</fsummary>
-      <type>
-        <v>App = term()</v>
-        <d>The name of the application to test</d>
-        <v>Mode = pedantic | tolerant</v>
-        <d>Default is pedantic</d>
-      </type>
-      <desc>
-        <p>Checks an applications .app file for obvious errors.
-          The following is checked:
-          </p>
-        <list type="bulleted">
-          <item>required fields
-          </item>
-          <item>that all modules specified actually exists
-          </item>
-          <item>that all requires applications exists
-          </item>
-          <item>that no module included in the application has export_all
-          </item>
-          <item>that all modules in the ebin/ dir is included (If
-          <c>Mode==tolerant</c> this only produces a warning, as all
-           modules does not have to be included)</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>appup_test(App) -> ok | test_server:fail()</name>
-      <fsummary>Checks an applications .appup file for obvious errors</fsummary>
-      <type>
-        <v>App = term()</v>
-        <d>The name of the application to test</d>
-      </type>
-      <desc>
-        <p>Checks an applications .appup file for obvious errors.
-          The following is checked:
-          </p>
-        <list type="bulleted">
-          <item>syntax
-          </item>
-          <item>that .app file version and .appup file version match
-          </item>
-          <item>for non-library applications: validity of high-level upgrade
-           instructions, specifying no instructions is explicitly allowed
-           (in this case the application is not upgradeable)</item>
-          <item>for library applications: that there is exactly one wildcard
-           regexp clause restarting the application when upgrading or
-           downgrading from any version</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>comment(Comment) -> ok</name>
-      <fsummary>Print a comment on the HTML result page</fsummary>
-      <type>
-        <v>Comment = string()</v>
-      </type>
-      <desc>
-        <p>The given String will occur in the comment field of the
-          table on the HTML result page. If called several times, only
-          the last comment is printed.  comment/1 is also overwritten by
-          the return value {comment,Comment} from a test case or by
-          fail/1 (which prints Reason as a comment).</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>TEST SUITE EXPORTS</title>
-    <p>The following functions must be exported from a test suite
-      module.
-      </p>
-  </section>
-  <funcs>
-    <func>
-      <name>all(suite) -> TestSpec | {skip, Comment}</name>
-      <fsummary>Returns the module's test specification</fsummary>
-      <type>
-        <v>TestSpec = list()</v>
-        <v>Comment = string()</v>
-        <d>This comment will be printed on the HTML result page</d>
-      </type>
-      <desc>
-        <p>This function must return the test specification for the
-          test suite module. The syntax of a test specification is
-          described in the Test Server User's Guide.</p>
-      </desc>
-    </func>
-    <func>
-      <name>init_per_suite(Config0) -> Config1 | {skip, Comment}</name>
-      <fsummary>Test suite initiation</fsummary>
-      <type>
-        <v>Config0 = Config1 = [tuple()]</v>
-        <v>Comment = string()</v>
-	<d>Describes why the suite is skipped</d>
-      </type>
-      <desc>
-        <p>This function is called before all other test cases in the
-          suite. <c>Config</c> is the configuration which can be modified
-          here. Whatever is returned from this function is given as
-          <c>Config</c> to the test cases.
-          </p>
-        <p>If this function fails, all test cases in the suite will be
-          skipped.</p>
-      </desc>
-    </func>
-    <func>
-      <name>end_per_suite(Config) -> void()</name>
-      <fsummary>Test suite finalization</fsummary>
-      <type>
-        <v>Config = [tuple()]</v>
-      </type>
-      <desc>
-        <p>This function is called after the last test case in the
-          suite, and can be used to clean up whatever the test cases
-          have done. The return value is ignored.</p>
-      </desc>
-    </func>
-    <func>
-      <name>init_per_testcase(Case, Config0) -> Config1 | {skip, Comment}</name>
-      <fsummary>Test case initiation</fsummary>
-      <type>
-        <v>Case = atom()</v>
-        <v>Config0 = Config1 = [tuple()]</v>
-        <v>Comment = string()</v>
-	<d>Describes why the test case is skipped</d>
-      </type>
-      <desc>
-        <p>This function is called before each test case. The
-          <c>Case</c> argument is the name of the test case, and
-          <c>Config</c> is the configuration which can be modified
-          here. Whatever is returned from this function is given as
-          <c>Config</c> to the test case.</p>
-      </desc>
-    </func>
-    <func>
-      <name>end_per_testcase(Case, Config) -> void()</name>
-      <fsummary>Test case finalization</fsummary>
-      <type>
-        <v>Case = atom()</v>
-        <v>Config = [tuple()]</v>
-      </type>
-      <desc>
-        <p>This function is called after each test case, and can be
-          used to clean up whatever the test case has done. The return
-          value is ignored.</p>
-      </desc>
-    </func>
-    <func>
-      <name>Case(doc) -> [Decription]</name>
-      <name>Case(suite) -> [] | TestSpec | {skip, Comment}</name>
-      <name>Case(Config) -> {skip, Comment} | {comment, Comment} | Ok</name>
-      <fsummary>A test case</fsummary>
-      <type>
-        <v>Description = string()</v>
-        <d>Short description of the test case</d>
-        <v>TestSpec = list()</v>
-        <v>Comment = string()</v>
-        <d>This comment will be printed on the HTML result page</d>
-        <v>Ok = term()</v>
-        <v>Config = [tuple()]</v>
-        <d>Elements from the Config parameter can be read with the ?config macro, see section about test suite support macros</d>
-      </type>
-      <desc>
-        <p>The <em>documentation clause</em> (argument <c>doc</c>) can
-          be used for automatic generation of test documentation or test
-          descriptions.
-          </p>
-        <p>The <em>specification clause</em> (argument <c>spec</c>)
-          shall return an empty list, the test specification for the
-          test case or <c>{skip,Comment}</c>. The syntax of a test
-          specification is described in the Test Server User's Guide.
-          </p>
-        <p>The <em>execution clause</em> (argument <c>Config</c>) is
-          only called if the specification clause returns an empty list.
-          The execution clause is the real test case. Here you must call
-          the functions you want to test, and do whatever you need to
-          check the result. If something fails, make sure the process
-          crashes or call <c>test_server:fail/0/1</c> (which also will
-          cause the process to crash).
-          </p>
-        <p>You can return <c>{skip,Comment}</c> if you decide not to
-          run the test case after all, e.g. if it is not applicable on
-          this platform.
-          </p>
-        <p>You can return <c>{comment,Comment}</c> if you wish to
-          print some information in the 'Comment' field on the HTML
-          result page.
-          </p>
-        <p>If the execution clause returns anything else, it is
-          considered a success, unless it is <c>{'EXIT',Reason}</c> or
-          <c>{'EXIT',Pid,Reason}</c> which can't be distinguished from a
-          crash, and thus will be considered a failure.
-          </p>
-        <p>A <em>conf test case</em> is a group of test cases with an
-          init and a cleanup function. The init and cleanup functions
-          are also test cases, but they have special rules:</p>
-	  <list type="bulleted">
-	  <item>They do not need a specification clause.</item>
-	  <item>They must always have the execution clause.</item>
-	  <item>They must return the <c>Config</c> parameter, a modified
-          version of it or <c>{skip,Comment}</c> from the execution clause.</item>
-	  <item>The cleanup function may also return a tuple 
-	  <c>{return_group_result,Status}</c>, which is used to return the
-	  status of the conf case to Test Server and/or to a conf case on a
-	  higher level. (<c>Status = ok | skipped | failed</c>).</item>
-	  <item><c>init_per_testcase</c> and <c>end_per_testcase</c> are
-          not called before and after these functions.</item>
-	  </list>
-      </desc>
-    </func>
-  </funcs>
-
-
-  <section>
-    <title>TEST SUITE SUPPORT MACROS</title>
-    <p>There are some macros defined in the <c>test_server.hrl</c>
-      that are quite useful for test suite programmers:
-      </p>
-    <p>The <em>config</em> macro, is used to
-      retrieve information from the <c>Config</c> variable sent to all
-      test cases. It is used with two arguments, where the first is the
-      name of the configuration variable you wish to retrieve, and the
-      second is the <c>Config</c> variable supplied to the test case
-      from the test server.
-      </p>
-    <p>Possible configuration variables include:</p>
-    <list type="bulleted">
-      <item><c>data_dir</c>  - Data file directory.</item>
-      <item><c>priv_dir</c>  - Scratch file directory.</item>
-      <item><c>nodes</c>     - Nodes specified in the spec file</item>
-      <item><c>nodenames</c> - Generated nodenames.</item>
-      <item>Whatever added by conf test cases or
-      <c>init_per_testcase/2</c></item>
-    </list>
-    <p>Examples of the <c>config</c> macro can be seen in the Examples chapter
-      in the user's guide.</p>
-    <p>The <em>line</em> and <em>line_trace</em> macros are deprecated, see
-      below.</p>
-  </section>
-
-  <section>
-    <title>TEST SUITE LINE NUMBERS</title>
-    <p>In the past, ERTS did not produce line numbers when generating
-      stacktraces, test_server was thus unable to provide them when reporting
-      test failures. It had instead two different mecanisms to do it: either by
-      using the <c>line</c> macro or by using the <c>test_server_line</c> parse
-      transform. Both are deprecated and should not be used in new tests
-      anymore.</p>
-  </section>
-</erlref>
-
diff --git a/lib/test_server/doc/src/test_server_app.xml b/lib/test_server/doc/src/test_server_app.xml
deleted file mode 100644
index 4830916561..0000000000
--- a/lib/test_server/doc/src/test_server_app.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE appref SYSTEM "appref.dtd">
-
-<appref>
-  <header>
-    <copyright>
-      <year>2002</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Test Server Application</title>
-    <prepared>Siri Hansen</prepared>
-    <responsible>Peter Andersson</responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2002-07-12</date>
-    <rev>PA1</rev>
-    <file>test_server_app.xml</file>
-  </header>
-  <app>test_server</app>
-  <appsummary>Test Server for manual or automatic testing of Erlang code</appsummary>
-  <description>
-    <p><em>Test Server</em> is a portable test server for
-      automated application testing. The server can run test suites
-      and log progress and results to HTML
-      pages. The main purpose of Test Server is to act as engine
-      inside customized test tools. A callback interface for 
-      such framework applications is provided.</p>
-    <p>In brief the test server supports:</p>
-    <list type="bulleted">
-      <item>Running multiple, concurrent test suites</item>
-      <item>Test suites may contain other test suites, in a tree fashion</item>
-      <item>Logging of the events in a test suite, on both suite and case levels</item>
-      <item>HTML presentation of test suite results</item>
-      <item>HTML presentation of test suite code</item>
-      <item>Support for test suite authors, e.g. start/stop slave nodes</item>
-      <item>Call trace on target and slave nodes</item>
-    </list>
-    <p>For information about how to write test cases and test suites,
-      please see the Test Server User's Guide and the reference
-      manual for the <c>test_server</c> module.
-      </p>
-    <p><em>Common Test</em> is an existing test tool application based on the 
-      OTP Test Server. Please read the Common Test User's Guide for more information.
-    </p>
-  </description>
-
-  <section>
-    <title>Configuration</title>
-    <p>There are currently no configuration parameters available for
-      this application.
-      </p>
-  </section>
-
-  <section>
-    <title>SEE ALSO</title>
-    <p></p>
-  </section>
-</appref>
-
diff --git a/lib/test_server/doc/src/test_server_ctrl.xml b/lib/test_server/doc/src/test_server_ctrl.xml
deleted file mode 100644
index 2762997ece..0000000000
--- a/lib/test_server/doc/src/test_server_ctrl.xml
+++ /dev/null
@@ -1,844 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2007</year>
-      <year>2013</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>The Test Server Controller</title>
-    <prepared>Siri Hansen, Peter Andersson</prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date></date>
-    <rev></rev>
-    <file>test_server_ctrl_ref.sgml</file>
-  </header>
-  <module>test_server_ctrl</module>
-  <modulesummary>This module provides a low level interface to the Test Server.</modulesummary>
-  <description>
-    <p>The <c>test_server_ctrl</c> module provides a low level
-      interface to the Test Server. This interface is normally
-      not used directly by the tester, but through a framework built 
-      on top of <c>test_server_ctrl</c>.
-      </p>
-    <p>Common Test is such a framework, well suited for automated
-      black box testing of target systems of any kind (not necessarily
-      implemented in Erlang). Common Test is also a very useful tool for
-      white box testing Erlang programs and OTP applications. 
-      Please see the Common Test User's Guide and reference manual for 
-      more information.
-      </p>
-    <p>If you want to write your own framework, some more information
-      can be found in the chapter "Writing your own test server
-      framework" in the Test Server User's Guide. Details about the
-      interface provided by <c>test_server_ctrl</c> follows below.
-      </p>
-  </description>
-  <funcs>
-    <func>
-      <name>start() -> Result</name>
-      <fsummary>Starts the test server.</fsummary>
-      <type>
-        <v>Result = ok | {error, {already_started, pid()}</v>
-      </type>
-      <desc>
-        <p>This function starts the test server.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop() -> ok</name>
-      <fsummary>Stops the test server immediately.</fsummary>
-      <desc>
-        <p>This stops the test server and
-          all its activity.  The running test suite (if any) will be
-          halted.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_dir(Name, Dir) -> ok</name>
-      <name>add_dir(Name, Dir, Pattern) -> ok</name>
-      <name>add_dir(Name, [Dir|Dirs]) -> ok</name>
-      <name>add_dir(Name, [Dir|Dirs], Pattern) -> ok</name>
-      <fsummary>Add a directory to the job queue.</fsummary>
-      <type>
-        <v>Name = term()</v>
-        <d>The jobname for this directory.</d>
-        <v>Dir = term()</v>
-        <d>The directory to scan for test suites.</d>
-        <v>Dirs = [term()]</v>
-        <d>List of directories to scan for test suites.</d>
-        <v>Pattern = term()</v>
-        <d>Suite match pattern. Directories will be scanned for Pattern_SUITE.erl files.</d>
-      </type>
-      <desc>
-        <p>Puts a collection of suites matching (*_SUITE) in given
-          directories into the job queue. <c>Name</c> is an arbitrary
-          name for the job, it can be any erlang term. If <c>Pattern</c>
-          is given, only modules matching <c>Pattern*</c> will be added.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_module(Mod) -> ok</name>
-      <name>add_module(Name, [Mod|Mods]) -> ok</name>
-      <fsummary>Add a module to the job queue with or without a given name.</fsummary>
-      <type>
-        <v>Mod = atom()</v>
-        <v>Mods = [atom()]</v>
-        <d>The name(s) of the module(s) to add.</d>
-        <v>Name = term()</v>
-        <d>Name for the job.</d>
-      </type>
-      <desc>
-        <p>This function adds a module or a list of modules, to the
-          test servers job queue. <c>Name</c> may be any Erlang
-          term. When <c>Name</c> is not given, the job gets the name of
-          the module.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_case(Mod, Case) -> ok</name>
-      <fsummary>Adds one test case to the job queue.</fsummary>
-      <type>
-        <v>Mod = atom()</v>
-        <d>Name of the module the test case is in.</d>
-        <v>Case = atom() </v>
-        <d>Function name of the test case to add.</d>
-      </type>
-      <desc>
-        <p>This function will add one test case to the job queue. The
-          job will be given the module's name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_case(Name, Mod, Case) -> ok</name>
-      <fsummary>Equivalent to add_case/2, but with specified name.</fsummary>
-      <type>
-        <v>Name = string()</v>
-        <d>Name to use for the test job.</d>
-      </type>
-      <desc>
-        <p>Equivalent to <c>add_case/2</c>, but the test job will get
-          the specified name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_cases(Mod, Cases) -> ok</name>
-      <fsummary>Adds a list of test cases to the job queue.</fsummary>
-      <type>
-        <v>Mod = atom()</v>
-        <d>Name of the module the test case is in.</d>
-        <v>Cases = [Case] </v>
-        <v>Case = atom() </v>
-        <d>Function names of the test cases to add.</d>
-      </type>
-      <desc>
-        <p>This function will add one or more test cases to the job
-          queue. The job will be given the module's name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_cases(Name, Mod, Cases) -> ok</name>
-      <fsummary>Equivalent to add_cases/2, but with specified name.</fsummary>
-      <type>
-        <v>Name = string()</v>
-        <d>Name to use for the test job.</d>
-      </type>
-      <desc>
-        <p>Equivalent to <c>add_cases/2</c>, but the test job will get
-          the specified name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_spec(TestSpecFile) -> ok | {error, nofile}</name>
-      <fsummary>Adds a test specification file to the job queue.</fsummary>
-      <type>
-        <v>TestSpecFile = string()</v>
-        <d>Name of the test specification file</d>
-      </type>
-      <desc>
-        <p>This function will add the content of the given test
-          specification file to the job queue. The job will be given the
-          name of the test specification file, e.g. if the file is
-          called <c>test.spec</c>, the job will be called <c>test</c>.
-          </p>
-        <p>See the reference manual for the test server application
-          for details about the test specification file.</p>
-      </desc>
-      </func>
-      <func>
-        <name>add_dir_with_skip(Name, [Dir|Dirs], Skip) -> ok</name>
-	<name>add_dir_with_skip(Name, [Dir|Dirs], Pattern, Skip) -> ok</name>
-        <name>add_module_with_skip(Mod, Skip) -> ok</name>
-        <name>add_module_with_skip(Name, [Mod|Mods], Skip) -> ok</name>
-        <name>add_case_with_skip(Mod, Case, Skip) -> ok</name>
-        <name>add_case_with_skip(Name, Mod, Case, Skip) -> ok</name>
-	<name>add_cases_with_skip(Mod, Cases, Skip) -> ok</name>
-	<name>add_cases_with_skip(Name, Mod, Cases, Skip) -> ok</name>
-	<fsummary>Same purpose as functions listed above, but with extra Skip argument.</fsummary>
-	<type>
-	<v>Skip = [SkipItem]</v>
-	<d>List of items to be skipped from the test.</d>
-        <v>SkipItem = {Mod,Comment} | {Mod,Case,Comment} | {Mod,Cases,Comment}</v>
-	<v>Mod = atom()</v>
-	<d>Test suite name.</d>
-	<v>Comment = string()</v>
-	<d>Reason why suite or case is being skipped.</d>
-	<v>Cases = [Case]</v>
-	<v>Case = atom()</v>
-	<d>Name of test case function.</d>
-	</type>
-	<desc>
-	  <p>These functions add test jobs just like the add_dir, add_module,
-	    add_case and add_cases functions above, but carry an additional
-	    argument, Skip. Skip is a list of items that should be skipped
-	    in the current test run. Test job items that occur in the Skip
-	    list will be logged as SKIPPED with the associated Comment.</p>
-	</desc>
-    </func>
-    <func>
-      <name>add_tests_with_skip(Name, Tests, Skip) -> ok</name>
-      <fsummary>Adds different types of jobs to the run queue.</fsummary>
-      <type>
-        <v>Name = term()</v>
-        <d>The jobname for this directory.</d>
-	<v>Tests = [TestItem]</v>
-	<d>List of jobs to add to the run queue.</d>
-	<v>TestItem = {Dir,all,all} | {Dir,Mods,all} | {Dir,Mod,Cases}</v>
-        <v>Dir = term()</v>
-        <d>The directory to scan for test suites.</d>
-	<v>Mods = [Mod]</v>
-	<v>Mod = atom()</v>
-	<d>Test suite name.</d>
-	<v>Cases = [Case]</v>
-	<v>Case = atom()</v>
-	<d>Name of test case function.</d>
-	<v>Skip = [SkipItem]</v>
-	<d>List of items to be skipped from the test.</d>
-        <v>SkipItem = {Mod,Comment} | {Mod,Case,Comment} | {Mod,Cases,Comment}</v>
-	<v>Comment = string()</v>
-	<d>Reason why suite or case is being skipped.</d>
-      </type>
-	<desc>
-	<p>This function adds various test jobs to the test_server_ctrl
-	job queue. These jobs can be of different type (all or specific suites 
-	in one directory, all or specific cases in one suite, etc). It is also
-	possible to get particular items skipped by passing them along in the
-	Skip list (see the add_*_with_skip functions above).</p>
-	</desc>
-    </func>
-    <func>
-      <name>abort_current_testcase(Reason) -> ok | {error,no_testcase_running}</name>
-      <fsummary>Aborts the test case currently executing.</fsummary>
-      <type>
-      <v>Reason = term()</v>
-      <d>The reason for stopping the test case, which will be printed in the log.</d>
-      </type>
-	<desc>
-	<p>When calling this function, the currently executing test case will be aborted.
-	   It is the user's responsibility to know for sure which test case is currently
-	   executing. The function is therefore only safe to call from a function which
-	   has been called (or synchronously invoked) by the test case.</p>
-	</desc>
-    </func>
-    <func>
-      <name>set_levels(Console, Major, Minor) -> ok</name>
-      <fsummary>Sets the levels of I/O.</fsummary>
-      <type>
-        <v>Console = integer()</v>
-        <d>Level for I/O to be sent to console.</d>
-        <v>Major = integer()</v>
-        <d>Level for I/O to be sent to the major logfile.</d>
-        <v>Minor = integer()</v>
-        <d>Level for I/O to be sent to the minor logfile.</d>
-      </type>
-      <desc>
-        <p>Determines where I/O from test suites/test server will
-          go. All text output from test suites and the test server is
-          tagged with a priority value which ranges from 0 to 100, 100
-          being the most detailed. (see the section about log files in
-          the user's guide). Output from the test cases (using
-          <c>io:format/2</c>) has a detail level of 50. Depending on the
-          levels set by this function, this I/O may be sent to the
-          console, the major log file (for the whole test suite) or to
-          the minor logfile (separate for each test case).
-          </p>
-        <p>All output with detail level:</p>
-        <list type="bulleted">
-          <item>Less than or equal to <c>Console</c> is displayed on
-           the screen (default 1)
-          </item>
-          <item>Less than or equal to <c>Major</c> is logged in the
-           major log file (default 19)
-          </item>
-          <item>Greater than or equal to <c>Minor</c> is logged in the
-           minor log files (default 10)
-          </item>
-        </list>
-        <p>To view the currently set thresholds, use the
-          <c>get_levels/0</c> function.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_levels() -> {Console, Major, Minor}</name>
-      <fsummary>Returns the current levels.</fsummary>
-      <desc>
-        <p>Returns the current levels. See <c>set_levels/3</c> for
-          types.</p>
-      </desc>
-    </func>
-    <func>
-      <name>jobs() -> JobQueue</name>
-      <fsummary>Returns the job queue.</fsummary>
-      <type>
-        <v>JobQueue = [{list(), pid()}]</v>
-      </type>
-      <desc>
-        <p>This function will return all the jobs currently in the job
-          queue.</p>
-      </desc>
-    </func>
-    <func>
-      <name>multiply_timetraps(N) -> ok</name>
-      <fsummary>All timetraps started after this will be multiplied by N.</fsummary>
-      <type>
-        <v>N = integer() | infinity</v>
-      </type>
-      <desc>
-        <p>This function should be called before a test is started
-          which requires extended timetraps, e.g. if extensive tracing
-          is used. All timetraps started after this call will be
-          multiplied by <c>N</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>scale_timetraps(Bool) -> ok</name>
-      <fsummary>.</fsummary>
-      <type>
-        <v>Bool = true | false</v>
-      </type>
-      <desc>
-        <p>This function should be called before a test is started.
-	  The parameter specifies if test_server should attempt
-	  to automatically scale the timetrap value in order to compensate
-	  for delays caused by e.g. the cover tool.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_timetrap_parameters() -> {N,Bool} </name>
-      <fsummary>Read the parameter values that affect timetraps.</fsummary>
-      <type>
-        <v>N = integer() | infinity</v>
-        <v>Bool = true | false</v>
-      </type>
-      <desc>
-        <p>This function may be called to read the values set by
-	<c>multiply_timetraps/1</c> and <c>scale_timetraps/1</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>cover(Application,Analyse) -> ok</name>
-      <name>cover(CoverFile,Analyse) -> ok</name>
-      <name>cover(App,CoverFile,Analyse) -> ok</name>
-      <fsummary>Informs the test_server controller that next test shall run with code coverage analysis.</fsummary>
-      <type>
-        <v>Application = atom()</v>
-        <d>OTP application to cover compile</d>
-        <v>CoverFile = string()</v>
-        <d>Name of file listing modules to exclude from or include in cover compilation. The filename must include full path to the file.</d>
-        <v>Analyse = details | overview</v>
-      </type>
-      <desc>
-        <p>This function informs the test_server controller that next
-          test shall run with code coverage analysis. All timetraps will
-          automatically be multiplied by 10 when cover i run.
-          </p>
-        <p><c>Application</c> and <c>CoverFile</c> indicates what to
-          cover compile. If <c>Application</c> is given, the default is
-          that all modules in the <c>ebin</c> directory of the
-          application will be cover compiled. The <c>ebin</c> directory
-          is found by adding <c>ebin</c> to
-          <c>code:lib_dir(Application)</c>.
-          </p>
-        <p>A <c>CoverFile</c> can have the following entries:</p>
-        <code type="none">
-{exclude, all | ExcludeModuleList}.
-{include, IncludeModuleList}.
-{cross, CrossCoverInfo}.</code>
-        <p>Note that each line must end with a full
-          stop. <c>ExcludeModuleList</c> and <c>IncludeModuleList</c>
-          are lists of atoms, where each atom is a module name.
-          </p>
-
-	<p><c>CrossCoverInfo</c> is used when collecting cover data
-	  over multiple tests. Modules listed here are compiled, but
-	  they will not be analysed when the test is finished. See
-	  <seealso
-	  marker="#cross_cover_analyse-2">cross_cover_analyse/2</seealso>
-	  for more information about the cross cover mechanism and the
-	  format of <c>CrossCoverInfo</c>.
-	  </p>
-        <p>If both an <c>Application</c> and a <c>CoverFile</c> is
-          given, all modules in the application are cover compiled,
-          except for the modules listed in <c>ExcludeModuleList</c>. The
-          modules in <c>IncludeModuleList</c> are also cover compiled.
-          </p>
-        <p>If a <c>CoverFile</c> is given, but no <c>Application</c>,
-          only the modules in <c>IncludeModuleList</c> are cover
-          compiled.
-          </p>
-        <p><c>Analyse</c> indicates the detail level of the cover
-          analysis. If <c>Analyse = details</c>, each cover compiled
-          module will be analysed with
-          <c>cover:analyse_to_file/1</c>. If <c>Analyse = overview</c>
-          an overview of all cover compiled modules is created, listing
-          the number of covered and not covered lines for each module.
-          </p>
-        <p>If the test following this call starts any slave or peer
-          nodes with <c>test_server:start_node/3</c>, the same cover
-          compiled code will be loaded on all nodes. If the loading
-          fails, e.g. if the node runs an old version of OTP, the node
-          will simply not be a part of the coverage analysis. Note that
-          slave or peer nodes must be stopped with
-          <c>test_server:stop_node/1</c> for the node to be part of the
-          coverage analysis, else the test server will not be able to
-          fetch coverage data from the node.
-          </p>
-        <p>When the test is finished, the coverage analysis is
-          automatically completed, logs are created and the cover
-          compiled modules are unloaded. If another test is to be run
-          with coverage analysis, <c>test_server_ctrl:cover/2/3</c> must
-          be called again.
-          </p>
-      </desc>
-    </func>
-    <func>
-      <name>cross_cover_analyse(Level, Tests) -> ok</name>
-      <fsummary>Analyse cover data collected from multiple tests</fsummary>
-      <type>
-        <v>Level = details | overview</v>
-        <v>Tests = [{Tag,LogDir}]</v>
-	<v>Tag = atom()</v>
-	<d>Test identifier.</d>
-	<v>LogDir = string()</v>
-	<d>Log directory for the test identified by <c>Tag</c>. This
-	  can either be the <c>run.&lt;timestamp&gt;</c> directory or
-	  the parent directory of this (in which case the latest
-	  <c>run.&lt;timestamp&gt;</c> directory is chosen.</d>
-      </type>
-      <desc>
-        <p>Analyse cover data collected from multiple tests. The modules
-          analysed are the ones listed in <c>cross</c> statements in
-          the cover files. These are modules that are heavily used by
-          other tests than the one where they belong or are explicitly
-          tested. They should then be listed as cross modules in the
-          cover file for the test where they are used but do not
-          belong. Se example below.</p>
-        <p>This function should be run after all tests are completed,
-          and the result will be stored in a file called
-          <c>cross_cover.html</c> in the <c>run.&lt;timestamp&gt;</c>
-          directory of the test the modules belong to.</p>
-	<p>Note that the function can be executed on any node, and it
-	  does not require <c>test_server_ctrl</c> to be started first.</p>
-        <p>The <c>cross</c> statement in the cover file must be like this:</p>
-        <code type="none">
-{cross,[{Tag,Modules}]}.</code>
-        <p>where <c>Tag</c> is the same as <c>Tag</c> in the
-          <c>Tests</c> parameter to this function and <c>Modules</c> is a
-          list of module names (atoms).</p>
-	<p><em>Example:</em></p>
-	<p>If the module <c>m1</c> belongs to system <c>s1</c> but is
-	  heavily used also in the tests for another system <c>s2</c>,
-	  then the cover files for the two systems' tests could be like
-	  this:</p>
-<code type="none">
-s1.cover:
-  {include,[m1]}.
-
-s2.cover:
-  {include,[....]}. % modules belonging to system s2
-  {cross,[{s1,[m1]}]}.</code>
-        <p>When the tests for both <c>s1</c> and <c>s2</c> are completed, run</p>
-<code type="none">
-test_server_ctrl:cross_cover_analyse(Level,[{s1,S1LogDir},{s2,S2LogDir}])
-</code>
-
-        <p>and the accumulated cover data for <c>m1</c> will be written to
-	  <c>S1LogDir/[run.&lt;timestamp&gt;/]cross_cover.html</c>.</p>
-	<p>Note that the <c>m1</c> module will also be presented in the
-	  normal coverage log for <c>s1</c> (due to the include statement in
-	  <c>s1.cover</c>), but that only includes the coverage achieved by the
-	  <c>s1</c> test itself.</p>
-	<p>The Tag in the <c>cross</c> statement in the cover file has
-	  no other purpose than mapping the list of modules
-	  (<c>[m1]</c> in the example above) to the correct log
-	  directory where it should be included in the
-	  <c>cross_cover.html</c> file (<c>S1LogDir</c> in the example
-	  above). I.e. the value of <c>Tag</c> has no meaning, it
-	  could be <c>foo</c> as well as <c>s1</c> above, as long as
-	  the same <c>Tag</c> is used in the cover file and in the
-	  call to this function.</p>
-      </desc>
-    </func>
-    <func>
-      <name>trc(TraceInfoFile) -> ok | {error, Reason}</name>
-      <fsummary>Starts call trace on target and slave nodes</fsummary>
-      <type>
-        <v>TraceInfoFile = atom() | string()</v>
-        <d>Name of a file defining which functions to trace and how</d>
-      </type>
-      <desc>
-        <p>This function starts call trace on target and on slave or
-          peer nodes that are started or will be started by the test
-          suites.
-          </p>
-        <p>Timetraps are not extended automatically when tracing is
-          used. Use <c>multiply_timetraps/1</c> if necessary.
-          </p>
-        <p>Note that the trace support in the test server is in a very
-          early stage of the implementation, and thus not yet as
-          powerful as one might wish for.
-          </p>
-        <p>The trace information file specified by the
-          <c>TraceInfoFile</c> argument is a text file containing one or
-          more of the following elements:
-          </p>
-        <list type="bulleted">
-          <item><c>{SetTP,Module,Pattern}.</c></item>
-          <item><c>{SetTP,Module,Function,Pattern}.</c></item>
-          <item><c>{SetTP,Module,Function,Arity,Pattern}.</c></item>
-          <item><c>ClearTP.</c></item>
-          <item><c>{ClearTP,Module}.</c></item>
-          <item><c>{ClearTP,Module,Function}.</c></item>
-          <item><c>{ClearTP,Module,Function,Arity}.</c></item>
-        </list>
-        <taglist>
-          <tag><c>SetTP = tp | tpl</c></tag>
-          <item>This is maps to the corresponding functions in the
-          <c>ttb</c> module in the <c>observer</c>
-           application. <c>tp</c> means set trace pattern on global
-           function calls. <c>tpl</c> means set trace pattern on local
-           and global function calls.
-          </item>
-          <tag><c>ClearTP =  ctp | ctpl | ctpg</c></tag>
-          <item>This is maps to the corresponding functions in the
-          <c>ttb</c> module in the <c>observer</c>
-           application. <c>ctp</c> means clear trace pattern (i.e. turn
-           off) on global and local function calls. <c>ctpl</c> means
-           clear trace pattern on local function calls only and <c>ctpg</c>
-           means clear trace pattern on global function calls only.
-          </item>
-          <tag><c>Module = atom()</c></tag>
-          <item>The module to trace
-          </item>
-          <tag><c>Function = atom()</c></tag>
-          <item>The name of the function to trace
-          </item>
-          <tag><c>Arity = integer()</c></tag>
-          <item>The arity of the function to trace
-          </item>
-          <tag><c>Pattern = [] | match_spec()</c></tag>
-          <item>The trace pattern to set for the module or
-           function. For a description of the match_spec() syntax,
-           please turn to the User's guide for the runtime system
-           (erts). The chapter "Match Specification in Erlang" explains
-           the general match specification language.
-          </item>
-        </taglist>
-        <p>The trace result will be logged in a (binary) file called
-          <c>NodeName-test_server</c> in the current directory of the
-          test server controller node. The log must be formatted using
-          <c>ttb:format/1/2</c>.
-          </p>
-      </desc>
-    </func>
-    <func>
-      <name>stop_trace() -> ok | {error, not_tracing}</name>
-      <fsummary>Stops tracing on target and slave nodes.</fsummary>
-      <desc>
-        <p>This function stops tracing on target, and on slave or peer
-          nodes that are currently running. New slave or peer nodes will
-          no longer be traced after this.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>FUNCTIONS INVOKED FROM COMMAND LINE</title>
-    <p>The following functions are supposed to be invoked from the
-      command line using the <c>-s</c> option when starting the erlang
-      node.</p>
-  </section>
-  <funcs>
-    <func>
-      <name>run_test(CommandLine) -> ok</name>
-      <fsummary>Runs the tests specified on the command line.</fsummary>
-      <type>
-        <v>CommandLine = FlagList</v>
-      </type>
-      <desc>
-        <p>This function is supposed to be invoked from the
-          commandline. It starts the test server, interprets the
-          argument supplied from the commandline, runs the tests
-          specified and when all tests are done, stops the test server
-          and returns to the Erlang prompt.
-          </p>
-        <p>The <c>CommandLine</c> argument is a list of command line
-          flags, typically <c>['KEY1', Value1, 'KEY2', Value2, ...]</c>. 
-          The valid command line flags are listed below.
-          </p>
-        <p>Under a UNIX command prompt, this function can be invoked like this:
-                    <br></br>
-<c>erl -noshell -s test_server_ctrl run_test KEY1 Value1 KEY2 Value2 ... -s erlang halt</c></p>
-        <p>Or make an alias (this is for unix/tcsh)          <br></br>
-<c>alias erl_test 'erl -noshell -s test_server_ctrl run_test \!* -s erlang halt'</c></p>
-        <p>And then use it like this          <br></br>
-<c>erl_test KEY1 Value1 KEY2 Value2 ...</c>          <br></br>
-</p>
-        <p>The valid command line flags are</p>
-        <taglist>
-          <tag><c>DIR dir</c></tag>
-          <item>Adds all test modules in the directory <c>dir</c> to
-           the job queue.
-          </item>
-          <tag><c>MODULE mod</c></tag>
-          <item>Adds the module <c>mod</c> to the job queue.
-          </item>
-          <tag><c>CASE mod case</c></tag>
-          <item>Adds the case <c>case</c> in module <c>mod</c> to the
-           job queue.
-          </item>
-          <tag><c>SPEC spec</c></tag>
-          <item>Runs the test specification file <c>spec</c>.
-          </item>
-          <tag><c>SKIPMOD mod</c></tag>
-          <item>Skips all test cases in the module <c>mod</c></item>
-          <tag><c>SKIPCASE mod case</c></tag>
-          <item>Skips the test case <c>case</c> in module <c>mod</c>.
-          </item>
-          <tag><c>NAME name</c></tag>
-          <item>Names the test suite to something else than the
-           default name. This does not apply to <c>SPEC</c> which keeps
-           its names.
-          </item>
-          <tag><c>COVER app cover_file analyse</c></tag>
-          <item>Indicates that the test should be run with cover
-           analysis. <c>app</c>, <c>cover_file</c> and <c>analyse</c>
-           corresponds to the parameters to
-          <c>test_server_ctrl:cover/3</c>. If no cover file is used,
-           the atom <c>none</c> should be given.
-          </item>
-          <tag><c>TRACE traceinfofile</c></tag>
-          <item>Specifies a trace information file. When this option
-           is given, call tracing is started on the target node and all
-           slave or peer nodes that are started. The trace information
-           file specifies which modules and functions to trace. See the
-           function <c>trc/1</c> above for more information about the
-           syntax of this file.
-          </item>
-        </taglist>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>FRAMEWORK CALLBACK FUNCTIONS</title>
-    <p>A test server framework can be defined by setting the
-      environment variable <c>TEST_SERVER_FRAMEWORK</c> to a module
-      name. This module will then be framework callback module, and it
-      must export the following function:</p>
-  </section>
-  <funcs>
-    <func>
-      <name>get_suite(Mod,Func) -> TestCaseList</name>
-      <fsummary>Get subcases.</fsummary>
-      <type>
-        <v>Mod = atom()</v>
-	<d>Test suite name.</d>
-        <v>Func = atom()</v>
-	<d>Name of test case.</d>
-        <v>TestCaseList = [SubCase]</v>
-	<d>List of test cases.</d>
-        <v>SubCase = atom()</v>
-	<d>Name of a case.</d>
-      </type>
-      <desc>
-        <p>This function is called before a test case is started. The
-          purpose is to retrieve a list of subcases. The default
-          behaviour of this function should be to call
-          <c>Mod:Func(suite)</c> and return the result from this call.</p>
-      </desc>
-    </func>
-    <func>
-      <name>init_tc(Mod,Func,Args0) -> {ok,Args1} | {skip,ReasonToSkip} | {auto_skip,ReasonToSkip} | {fail,ReasonToFail}</name>
-      <fsummary>Preparation for a test case or configuration function.</fsummary>
-      <type>
-        <v>Mod = atom()</v>
-	<d>Test suite name.</d>
-        <v>Func = atom()</v>
-	<d>Name of test case or configuration function.</d>
-        <v>Args0 = Args1 = [tuple()]</v>
-	<d>Normally Args = [Config]</d>
-	<v>ReasonToSkip = term()</v>
-	<d>Reason to skip the test case or configuration function.</d>
-	<v>ReasonToFail = term()</v>
-	<d>Reason to fail the test case or configuration function.</d>
-      </type>
-      <desc>
-        <p>This function is called before a test case or configuration
-	function starts. It is called on the process executing the function
-        <c>Mod:Func</c>. Typical use of this function can be to alter
-        the input parameters to the test case function (<c>Args</c>) or
-        to set properties for the executing process.</p>
-	<p>By returning <c>{skip,Reason}</c>, <c>Func</c> gets skipped.
-	<c>Func</c> also gets skipped if <c>{auto_skip,Reason}</c> is returned,
-	but then gets an auto skipped status (rather than user skipped).</p>
-	<p>To fail <c>Func</c> immediately instead of executing it, return 
-	<c>{fail,ReasonToFail}.</c></p>
-      </desc>
-    </func>
-    <func>
-      <name>end_tc(Mod,Func,Status) -> ok | {fail,ReasonToFail}</name>
-      <fsummary>Cleanup after a test case or configuration function.</fsummary>
-      <type>
-        <v>Mod = atom()</v>
-	<d>Test suite name.</d>
-        <v>Func = atom()</v>
-	<d>Name of test case or configuration function.</d>
-        <v>Status = {Result,Args} | {TCPid,Result,Args}</v>
-	<d>The status of the test case or configuration function.</d>
-	<v>ReasonToFail = term()</v>
-	<d>Reason to fail the test case or configuration function.</d>
-	<v>Result = ok | Skip | Fail</v>
-	<d>The final result of the test case or configuration function.</d>
-	<v>TCPid = pid()</v>
-	<d>Pid of the process executing Func</d>
-	<v>Skip = {skip,SkipReason}</v>
-	<v>SkipReason = term() | {failed,{Mod,init_per_testcase,term()}}</v>
-	<d>Reason why the function was skipped.</d>
-	<v>Fail = {error,term()} | {'EXIT',term()} | {timetrap_timeout,integer()} |
-	          {testcase_aborted,term()} | testcase_aborted_or_killed | 
-		  {failed,term()} | {failed,{Mod,end_per_testcase,term()}}</v>
-	<d>Reason why the function failed.</d>
-        <v>Args = [tuple()]</v>
-	<d>Normally Args = [Config]</d>
-      </type>
-      <desc>
-        <p>This function is called when a test case, or a configuration function,
-	  is finished. It is normally called on the process where the function
-          <c>Mod:Func</c> has been executing, but if not, the pid of the test 
-	  case process is passed with the <c>Status</c> argument.</p> 
-	  <p>Typical use of the <c>end_tc/3</c> function can be to clean up 
-	  after <c>init_tc/3</c>.</p> 
-	  <p>If <c>Func</c> is a test case, it is possible to analyse the value of 
-	  <c>Result</c> to verify that <c>init_per_testcase/2</c> and 
-	  <c>end_per_testcase/2</c> executed successfully.</p>
-	  <p>It is possible with <c>end_tc/3</c> to fail an otherwise successful
-	  test case, by returning <c>{fail,ReasonToFail}</c>. The test case <c>Func</c>
-	  will be logged as failed with the provided term as reason.</p>
-      </desc>
-    </func>
-    <func>
-      <name>report(What,Data) -> ok</name>
-      <fsummary>Progress report for test.</fsummary>
-      <type>
-        <v>What = atom()</v>
-        <v>Data = term()</v>
-      </type>
-      <desc>
-        <p>This function is called in order to keep the framework up-to-date with 
-	the progress of the test. This is useful e.g. if the
-        framework implements a GUI where the progress information is
-        constantly updated. The following can be reported:
-        </p>
-        <p><c>What = tests_start, Data = {Name,NumCases}</c><br></br>
-	   <c>What = loginfo, Data = [{topdir,TestRootDir},{rundir,CurrLogDir}]</c><br></br>
-	   <c>What = tests_done, Data = {Ok,Failed,{UserSkipped,AutoSkipped}}</c><br></br>
-	   <c>What = tc_start, Data = {{Mod,{Func,GroupName}},TCLogFile}</c><br></br>
-	   <c>What = tc_done, Data = {Mod,{Func,GroupName},Result}</c><br></br>
-	   <c>What = tc_user_skip, Data = {Mod,{Func,GroupName},Comment}</c><br></br>
-	   <c>What = tc_auto_skip, Data = {Mod,{Func,GroupName},Comment}</c><br></br>
-	   <c>What = framework_error, Data = {{FWMod,FWFunc},Error}</c></p>
-	<p>Note that for a test case function that doesn't belong to a group,
-	  <c>GroupName</c> has value <c>undefined</c>, otherwise the name of the test
-	  case group.</p>
-      </desc>
-    </func>
-    <func>
-      <name>error_notification(Mod, Func, Args, Error) -> ok</name>
-      <fsummary>Inform framework of crashing testcase or configuration function.</fsummary>
-      <type>
-        <v>Mod = atom()</v>
-	<d>Test suite name.</d>
-        <v>Func = atom()</v>
-	<d>Name of test case or configuration function.</d>
-        <v>Args = [tuple()]</v>
-	<d>Normally Args = [Config]</d>
-        <v>Error = {Reason,Location}</v>
-	<v>Reason = term()</v>
-	<d>Reason for termination.</d>
-	<v>Location = unknown | [{Mod,Func,Line}]</v>
-	<d>Last known position in Mod before termination.</d>
-        <v>Line = integer()</v>
-	<d>Line number in file Mod.erl.</d> 
-      </type>
-      <desc>
-        <p>This function is called as the result of function <c>Mod:Func</c> failing
-	  with Reason at Location. The function is intended mainly to aid
-	  specific logging or error handling in the framework application. Note
-	  that for Location to have relevant values (i.e. other than unknown), 
-	  the <c>line</c> macro or <c>test_server_line</c> parse transform must 
-	  be used. For details, please see the section about test suite line numbers
-	  in the <c>test_server</c> reference manual page.</p>
-      </desc>
-    </func>
-    <func>
-      <name>warn(What) -> boolean()</name>
-      <fsummary>Ask framework if test server should issue a warning for What.</fsummary>
-      <type>
-        <v>What = processes | nodes</v>
-      </type>
-      <desc>
-        <p>The test server checks the number of processes and nodes
-          before and after the test is executed. This function is a
-          question to the framework if the test server should warn when
-          the number of processes or nodes has changed during the test
-          execution. If <c>true</c> is returned, a warning will be written
-          in the test case minor log file.</p>
-      </desc>
-    </func>
-    <func>
-      <name>target_info() -> InfoStr</name>
-      <fsummary>Print info about the target system to the test case log.</fsummary>
-      <type>
-        <v>InfoStr = string() | ""</v>
-      </type>
-      <desc>
-        <p>The test server will ask the framework for information about
-	  the test target system and print InfoStr in the test case
-	  log file below the host information.</p>
-      </desc>
-    </func>
-  </funcs>
-</erlref>
-
diff --git a/lib/test_server/doc/src/test_spec_chapter.xml b/lib/test_server/doc/src/test_spec_chapter.xml
deleted file mode 100644
index 0a62010364..0000000000
--- a/lib/test_server/doc/src/test_spec_chapter.xml
+++ /dev/null
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2002</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Test Structure and Test Specifications</title>
-    <prepared>Siri Hansen</prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>test_spec_chapter.xml</file>
-  </header>
-
-  <section>
-    <title>Test structure</title>
-    <p>A test consists of a set of test cases. Each test case is
-      implemented as an erlang function. An erlang module implementing
-      one or more test cases is called a test suite.
-      </p>
-  </section>
-
-  <section>
-    <title>Test specifications</title>
-    <p>A test specification is a specification of which test suites
-      and test cases to run and which to skip. A test specification can
-      also group several test cases into conf cases with init and
-      cleanup functions (see section about configuration cases
-      below). In a test there can be test specifications on three
-      different levels:
-      </p>
-    <p>The top level is a test specification file which roughly
-      specifies what to test for a whole application. The test
-      specification in such a file is encapsulated in a topcase
-      command. 
-      </p>
-    <p>Then there is a test specification for each test suite,
-      specifying which test cases to run within the suite. The test
-      specification for a test suite is returned from the
-      <c>all(suite)</c> function in the test suite module. 
-      </p>
-    <p>And finally there can be a test specification per test case,
-      specifying sub test cases to run. The test specification for a
-      test case is returned from the specification clause of the test
-      case.
-      </p>
-    <p>When a test starts, the total test specification is built in a
-      tree fashion, starting from the top level test specification.
-      </p>
-    <p>The following are the valid elements of a test
-      specification. The specification can be one of these elements or a
-      list with any combination of the elements:
-      </p>
-    <taglist>
-      <tag><c>{Mod, Case}</c></tag>
-      <item>This specifies the test case Mod:Case/1
-      </item>
-      <tag><c>{dir, Dir}</c></tag>
-      <item>This specifies all modules <c>*_SUITE</c> in the directory
-      <c>Dir</c></item>
-      <tag><c>{dir, Dir, Pattern}</c></tag>
-      <item>This specifies all modules <c>Pattern*</c> in the
-       directory <c>Dir</c></item>
-      <tag><c>{conf, Init, TestSpec, Fin}</c></tag>
-      <item>This is a configuration case. In a test specification
-       file, <c>Init</c> and <c>Fin</c> must be
-      <c>{Mod,Func}</c>. Inside a module they can also be just
-      <c>Func</c>. See the section named Configuration Cases below for
-       more information about this.
-      </item>
-      <tag><c>{conf, Properties, Init, TestSpec, Fin}</c></tag>
-      <item>This is a configuration case as explained above, but
-       which also takes a list of execution properties for its group
-       of test cases and nested sub-groups.
-      </item>
-      <tag><c>{make, Init, TestSpec, Fin}</c></tag>
-      <item>This is a special version of a conf case which is only
-       used by the test server framework <c>ts</c>. <c>Init</c> and
-      <c>Fin</c> are make and unmake functions for a data
-       directory. <c>TestSpec</c> is the test specification for the
-       test suite owning the data directory in question. If the make
-       function fails, all tests in the test suite are skipped. The
-       difference between this "make case" and a normal conf case is
-       that for the make case, <c>Init</c> and <c>Fin</c> are given with
-       arguments (<c>{Mod,Func,Args}</c>).
-      </item>
-      <tag><c>Case</c></tag>
-      <item>This can only be used inside a module, i.e. not a test
-       specification file. It specifies the test case
-      <c>CurrentModule:Case</c>.
-      </item>
-    </taglist>
-  </section>
-
-  <section>
-    <title>Test Specification Files</title>
-    <p>A test specification file is a text file containing the top
-      level test specification (a topcase command), and possibly one or
-      more additional commands. A "command" in a test specification file
-      means a key-value tuple ended by a dot-newline sequence.
-      </p>
-    <p>The following commands are valid:
-      </p>
-    <taglist>
-      <tag><c>{topcase, TestSpec}</c></tag>
-      <item>This command is mandatory in all test specification
-       files. <c>TestSpec</c> is the top level test specification of a
-       test.
-      </item>
-      <tag><c>{skip, {Mod, Comment}}</c></tag>
-      <item>This specifies that all cases in the module <c>Mod</c>
-       shall be skipped. <c>Comment</c> is a string.
-      </item>
-      <tag><c>{skip, {Mod, Case, Comment}}</c></tag>
-      <item>This specifies that the case <c>Mod:Case</c> shall be
-       skipped.
-      </item>
-      <tag><c>{skip, {Mod, CaseList, Comment}}</c></tag>
-      <item>This specifies that all cases <c>Mod:Case</c>, where
-      <c>Case</c> is in <c>CaseList</c>, shall be skipped.
-      </item>
-      <tag><c>{nodes, Nodes}</c></tag>
-      <item><c>Nodes</c> is a list of nodenames available to the test
-       suite. It will be added to the <c>Config</c> argument to all
-       test cases. <c>Nodes</c> is a list of atoms.
-      </item>
-      <tag><c>{require_nodenames, Num}</c></tag>
-      <item>Specifies how many nodenames the test suite will
-       need. Theese will be automatically generated and inserted into the
-      <c>Config</c> argument to all test cases. <c>Num</c> is an
-       integer.
-      </item>
-      <tag><c>{hosts, Hosts}</c></tag>
-      <item>This is a list of available hosts on which to start slave
-       nodes. It is used when the <c>{remote, true}</c> option is given
-       to the <c>test_server:start_node/3</c> function. Also, if
-      <c>{require_nodenames, Num}</c> is contained in a test
-       specification file, the generated nodenames will be spread over
-       all hosts given in this <c>Hosts</c> list. The hostnames are
-       atoms or strings.
-      </item>
-      <tag><c>{diskless, true}</c></tag>
-      <item>Adds <c>{diskless, true}</c> to the <c>Config</c> argument
-       to all test cases. This is kept for backwards compatibility and
-       should not be used. Use a configuration case instead.
-      </item>
-      <tag><c>{ipv6_hosts, Hosts}</c></tag>
-      <item>Adds <c>{ipv6_hosts, Hosts}</c> to the <c>Config</c>
-       argument to all test cases.</item>
-    </taglist>
-    <p>All test specification files shall have the extension
-      ".spec". If special test specification files are needed for
-      Windows or VxWorks platforms, additional files with the
-      extension ".spec.win" and ".spec.vxworks" shall be
-      used. This is useful e.g. if some test cases shall be skipped on
-      these platforms.
-      </p>
-    <p>Some examples for test specification files can be found in the
-      Examples section of this user's guide.
-      </p>
-  </section>
-
-  <section>
-    <title>Configuration cases</title>
-    <p>If a group of test cases need the same initialization, a so called
-      <em>configuration</em> or <em>conf</em> case can be used. A conf
-      case consists of an initialization function, the group of test cases
-      needing this initialization and a cleanup or finalization function.
-      </p>
-    <p>If the init function in a conf case fails or returns
-      <c>{skip,Comment}</c>, the rest of the test cases in the conf case
-      (including the cleanup function) are skipped. If the init function
-      succeeds, the cleanup function will always be called, even if some
-      of the test cases in between failed.
-      </p>
-    <p>Both the init function and the cleanup function in a conf case
-      get the <c>Config</c> parameter as only argument. This parameter
-      can be modified or returned as is. Whatever is returned by the
-      init function is given as <c>Config</c> parameter to the rest of
-      the test cases in the conf case, including the cleanup function.
-      </p>
-    <p>If the <c>Config</c> parameter is changed by the init function,
-      it must be restored by the cleanup function. Whatever is returned
-      by the cleanup function will be given to the next test case called.
-      </p>
-    <p>The optional <c>Properties</c> list can be used to specify
-      execution properties for the test cases and possibly nested
-      sub-groups of the configuration case. The available properties are:</p>
-    <pre>
-      Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
-      Shuffle = shuffle | {shuffle,Seed}
-      Seed = {integer(),integer(),integer()}
-      RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
-                   repeat_until_any_ok | repeat_until_any_fail
-      N = integer() | forever</pre>
-
-    <p>If the <c>parallel</c> property is specified, Test Server will execute
-    all test cases in the group in parallel. If <c>sequence</c> is specified,
-    the cases will be executed in a sequence, meaning if one case fails, all
-    following cases will be skipped. If <c>shuffle</c> is specified, the cases
-    in the group will be executed in random order. The <c>repeat</c> property
-    orders Test Server to repeat execution of the cases in the group a given
-    number of times, or until any, or all, cases fail or succeed.</p>
-
-    <p>Properties may be combined so that e.g. if <c>shuffle</c>, 
-    <c>repeat_until_any_fail</c> and <c>sequence</c> are all specified, the test 
-    cases in the group will be executed repeatedly and in random order until
-    a test case fails, when execution is immediately stopped and the rest of 
-    the cases skipped.</p>
-
-    <p>The properties for a conf case is always printed on the top of the HTML log 
-    for the group's init function. Also, the total execution time for a conf case
-    can be found at the bottom of the log for the group's end function.</p>
-
-    <p>Configuration cases may be nested so that sets of grouped cases can be 
-    configured with the same init- and end functions.</p>
-  </section>
-
-  <section>
-    <title>The parallel property and nested configuration cases</title>
-    <p>If a conf case has a parallel property, its test cases will be spawned
-    simultaneously and get executed in parallel. A test case is not allowed
-    to execute in parallel with the end function however, which means
-    that the time it takes to execute a set of parallel cases is equal to the
-    execution time of the slowest test case in the group. A negative side
-    effect of running test cases in parallel is that the HTML summary pages
-    are not updated with links to the individual test case logs until the 
-    end function for the conf case has finished.</p>
-
-    <p>A conf case nested under a parallel conf case will start executing in 
-    parallel with previous (parallel) test cases (no matter what properties the 
-    nested conf case has). Since, however, test cases are never executed in 
-    parallel with the init- or the end function of the same conf case, it's 
-    only after a nested group of cases has finished that any remaining parallel 
-    cases in the previous conf case get spawned.</p>
-  </section>
-
-  <section>
-    <title>Repeated execution of test cases</title>
-    <marker id="repeated_cases"></marker>
-    <p>A conf case may be repeated a certain number of times
-    (specified by an integer) or indefinitely (specified by <c>forever</c>).
-    The repetition may also be stopped prematurely if any or all cases
-    fail or succeed, i.e. if the property <c>repeat_until_any_fail</c>,
-    <c>repeat_until_any_ok</c>, <c>repeat_until_all_fail</c>, or 
-    <c>repeat_until_all_ok</c> is used. If the basic <c>repeat</c>
-    property is used, status of test cases is irrelevant for the repeat 
-    operation.</p>
-    
-    <p>It is possible to return the status of a conf case (ok or
-    failed), to affect the execution of the conf case on the level above. 
-    This is accomplished by, in the end function, looking up the value
-    of <c>tc_group_properties</c> in the <c>Config</c> list and checking the
-    result of the finished test cases. If status <c>failed</c> should be
-    returned from the conf case as a result, the end function should return
-    the value <c>{return_group_result,failed}</c>. The status of a nested conf
-    case is taken into account by Test Server when deciding if execution
-    should be repeated or not (unless the basic <c>repeat</c> property is used).</p>
-
-    <p>The <c>tc_group_properties</c> value is a list of status tuples, 
-    each with the key <c>ok</c>, <c>skipped</c> and <c>failed</c>. The
-    value of a status tuple is a list containing names of test cases 
-    that have been executed with the corresponding status as result.</p>
-
-    <p>Here's an example of how to return the status from a conf case:</p>
-    <pre>
-      conf_end_function(Config) ->
-          Status = ?config(tc_group_result, Config),
-          case proplists:get_value(failed, Status) of
-              [] ->                                   % no failed cases 
-	          {return_group_result,ok};
-	      _Failed ->                              % one or more failed
-	          {return_group_result,failed}
-          end.</pre>
-
-    <p>It is also possible in the end function to check the status of
-    a nested conf case (maybe to determine what status the current conf case should
-    return). This is as simple as illustrated in the example above, only the
-    name of the end function of the nested conf case is stored in a tuple 
-    <c>{group_result,EndFunc}</c>, which can be searched for in the status lists. 
-    Example:</p>
-    <pre>
-      conf_end_function_X(Config) ->
-          Status = ?config(tc_group_result, Config),
-          Failed = proplists:get_value(failed, Status),
-          case lists:member({group_result,conf_end_function_Y}, Failed) of
-	        true ->
-		    {return_group_result,failed};
-                false ->                                                    
-	            {return_group_result,ok}
-          end; 
-      ...</pre>
-
-    <note><p>When a conf case is repeated, the init- and end functions
-      are also always called with each repetition.</p></note>
-  </section>
-
-  <section>
-    <title>Shuffled test case order</title>
-    <p>The order that test cases in a conf case are executed, is under normal
-    circumstances the same as the order defined in the test specification.
-    With the <c>shuffle</c> property set, however, Test Server will instead 
-    execute the test cases in random order.</p>
-
-    <p>The user may provide a seed value (a tuple of three integers) with
-    the shuffle property: <c>{shuffle,Seed}</c>. This way, the same shuffling
-    order can be created every time the conf case is executed. If no seed value
-    is given, Test Server creates a "random" seed for the shuffling operation 
-    (using the return value of <c>erlang:now()</c>). The seed value is always
-    printed to the log file of the init function so that it can be used to
-    recreate the same execution order in subsequent test runs.</p>
-
-    <note><p>If execution of a conf case with shuffled test cases is repeated,
-      the seed will not be reset in between turns.</p></note>
-
-    <p>If a nested conf case is specified in a conf case with a <c>shuffle</c> 
-    property, the execution order of the nested cases in relation to the test cases 
-    (and other conf cases) is also random. The order of the test cases in the nested
-    conf case is however not random (unless, of course, this one also has a
-    <c>shuffle</c> property).</p>
-  </section>
-
-  <section>
-    <title>Skipping test cases</title>
-    <p>It is possible to skip certain test cases, for example if you
-      know beforehand that a specific test case fails. This might be
-      functionality which isn't yet implemented, a bug that is known but
-      not yet fixed or some functionality which doesn't work or isn't
-      applicable on a specific platform.
-      </p>
-    <p>There are several different ways to state that a test case
-      should be skipped:</p>
-    <list type="bulleted">
-      <item>Using the <c>{skip,What}</c> command in a test
-       specification file
-      </item>
-      <item>Returning <c>{skip,Reason}</c> from the
-      <c>init_per_testcase/2</c> function
-      </item>
-      <item>Returning <c>{skip,Reason}</c> from the specification
-       clause of the test case
-      </item>
-      <item>Returning <c>{skip,Reason}</c> from the execution clause
-       of the test case
-      </item>
-    </list>
-    <p>The latter of course means that the execution clause is
-      actually called, so the author must make sure that the test case
-      is not run. For more information about the different clauses in a
-      test case, see the chapter about writing test cases.
-      </p>
-    <p>When a test case is skipped, it will be noted as <c>SKIPPED</c>
-      in the HTML log.
-      </p>
-  </section>
-</chapter>
-
diff --git a/lib/test_server/doc/src/ts.xml b/lib/test_server/doc/src/ts.xml
deleted file mode 100644
index 60dfdbc545..0000000000
--- a/lib/test_server/doc/src/ts.xml
+++ /dev/null
@@ -1,568 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2007</year>
-      <year>2013</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>The OTP Test Server Framework</title>
-    <prepared>Mattias Nilsson</prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date></date>
-    <rev></rev>
-    <file>ts.xml</file>
-  </header>
-  <module>ts</module>
-  <modulesummary>Test Server Framework for testing OTP</modulesummary>
-  <description>
-    <p>This is a framework for testing OTP. The <c>ts</c> module
-      implements the interface to all the functionality in the
-      framework.
-      </p>
-    <p>The framework is built on top of the Test Server Controller,
-      <c>test_server_ctrl</c>, and provides a high level operator
-      interface. The main features added by the framework are:
-      </p>
-    <list type="bulleted">
-      <item>Automatic compilation of test suites and data directories
-      </item>
-      <item>Collection of files in central directories and creation of
-       additional HTML pages for better overview.
-      </item>
-      <item>Single command interface for running all available tests
-      </item>
-      <item>Spawns a new node with correct parameters before starting
-       the test server
-      </item>
-      <item>Atomatically creates the parameter file needed when
-       running tests on remote target
-      </item>
-    </list>
-    <p>More information about the Test Server Framework and how to run
-      test cases can be found in the Test Server User's Guide.
-      </p>
-    <p>For writing you own test server framework, please turn to the
-      reference manual for the Test Server Controller and chapter named
-      "Writing your own test server framework" in the Test Server User's
-      Guide.
-      </p>
-      <p>SETUP</p>
-    <p>To be able to run <c>ts</c>, you must first `install'
-        <c>ts</c> for the current environment. This is done by calling
-        <c>ts:install/0/1/2</c>. A file called `variables' is created
-        and used by <c>ts</c> when running test suites. It is not
-        recommended to edit this file, but it is possible to alter if
-        <c>ts</c> gets the wrong idea about your environment.
-        </p>
-    <p><c>ts:install/0</c> is used if the target platform is the
-        same as the controller host, i.e. if you run on "local target"
-        and no options are needed. Then running <c>ts:install/0</c> <c>ts</c>
-	will run an autoconf script for your current
-        environment and set up the necessary variables needed by the
-        test suites.
-        </p>
-    <p><c>ts:install/1</c> or <c>ts:install/2</c> is used if the
-        target platform is different from the controller host, i.e. if
-        you run on "remote target" or if special options are required
-        for your system.
-        </p>
-      <p>See the reference manual for detailed information about
-        <c>ts:install/0/1/2</c>.
-        </p>
-    <p>Some of the common variables in the 'variables' file are
-        described below. Do not make any assumptions as of what is found
-        in this file, as it may change at any time.
-        </p>
-    <list>
-        <item><c>longnames</c><br></br>
-        Set to true if the system is using fully qualified
-         nodenames.
-        </item>
-        <item><c>platform_id</c><br></br>
-        This is the currently installed platform identification
-         string.
-        </item>
-        <item><c>platform_filename</c><br></br>
-        This is the name used to create the final save directory
-         for test runs.
-        </item>
-        <item><c>platform_label</c><br></br>
-        This is the string presented in the generated test
-         results index page.
-        </item>
-        <item><c>rsh_name</c><br></br>
-        This is the rsh program to use when starting slave or
-         peer nodes on a remote host.
-        </item>
-        <item><c>erl_flags</c><br></br>
-        Compile time flags used when compiling test suites.
-        </item>
-        <item><c>erl_release</c><br></br>
-        The Erlang/OTP release being tested.
-        </item>
-        <item><c>'EMULATOR'</c><br></br>
-        The emulator being tested (e.g. beam)
-        </item>
-        <item><c>'CPU'</c><br></br>
-        The CPU in the machine running the tests, e.g. sparc.
-        </item>
-        <item><c>target_host</c><br></br>
-        The target host name
-        </item>
-        <item><c>os</c><br></br>
-        The target operating system, e.g. solaris2.8
-        </item>
-        <item><c>target</c><br></br>
-        The current target platform, e.g. sparc-sun-solaris2.8
-        </item>
-      </list>
-      <p>RUNNING TESTS</p>
-      <p>After installing <c>ts</c>, you can run your test with the
-        <c>ts:run/0/1/2/3/4</c> functions. These functions, however,
-        require a special directory structure to be able to find your
-        test suites. Both the test server and all tests must be located
-        under your $TESTROOT directory. The test server implementation
-        shall be located in the directory <c>$TESTROOT/test_server</c>
-        and for each application there must be a directory named
-        <c><![CDATA[$TESTROOT/<application>_test]]></c> containing the .spec file
-        and all test suites and data directories for the
-        application. Note that there shall only be one .spec file for
-        each application.
-        </p>
-      <p><c>$TESTROOT/test_server</c> must be the current directory
-        when calling the <c>ts:run/*</c> function.
-        </p>
-      <p>All available tests can be found with <c>ts:tests()</c>. This
-        will list all applications for which a test specification file
-        <c><![CDATA[../<application>_test/<application>.spec]]></c> can be found.
-        </p>
-      <p>To run all these tests, use <c>ts:run()</c>.
-        </p>
-      <p>To run one or some of the tests, use <c>ts:run(Tests)</c>,
-        where <c>Tests</c> is the name of the application you want to
-        test, or a list of such names.
-        </p>
-      <p>To run one test suite within a test, use
-        <c>ts:run(Test,Suite)</c>.
-        </p>
-      <p>To run one test case within a suite, use
-        <c>ts:run(Test,Suite,Case)</c></p>
-      <p>To all these functions, you can also add a list of
-        options. Please turn to the reference manual for the <c>ts</c>
-        module to see the valid options to use.
-        </p>
-      <p>The function <c>ts:help()</c> displays some simple help for
-        the functions in <c>ts</c>. Use this for quick reference.
-        </p>
-      <p>LOG FILES</p>
-      <p>As the execution of the test suites go on, events are logged in
-      four different ways:
-      </p>
-    <list type="bulleted">
-      <item>Text to the operator's console.</item>
-      <item>Suite related information is sent to the major log file.</item>
-      <item>Case related information is sent to the minor log file.</item>
-      <item>The HTML log file gets updated with test results.</item>
-    </list>
-    <p>Typically the operator, who may run hundreds or thousands of
-      test cases, doesn't want to fill the screen with details
-      about/from the specific test cases. By default, the operator will
-      only see:
-      </p>
-    <list type="bulleted">
-      <item>A confirmation that the test has started.
-      </item>
-      <item>A small note about each failed test case.
-      </item>
-      <item>A summary of all the run test cases.
-      </item>
-      <item>A confirmation that the test run is complete
-      </item>
-      <item>Some special information like error reports and progress
-       reports, printouts written with erlang:display/1 or io:format/3
-       specifically addressed to somewhere other than
-      <c>standard_io</c>.</item>
-    </list>
-    <p>This is enough for the operator to know, and if he wants to dig
-      in deeper into a specific test case result, he can do so by
-      following the links in the HTML presentation to take a look in the
-      major or minor log files.
-      </p>
-    <p>A detailed report of the entire test suite is stored in the
-      major logfile, the exact reason for failure, time spent etc.
-      </p>
-    <p>The HTML log file is a summary of the major log file, but gives
-      a much better overview of the test run. It also has links to every
-      test case's log file for quick viewing with a HTML browser.
-      </p>
-    <p>The minor log file contain full details of every single test
-      case, each one in a separate file. This way the files should be
-      easy to compare with previous test runs, even if the set of test
-      cases change.
-      </p>
-    <p>Which information that goes where is user configurable via the
-      test server controller. Three threshold values determine what
-      comes out on screen, and in the major or minor log files. The
-      contents that goes to the HTML log file is fixed, and cannot be
-      altered.
-      </p>
-
-  </description>
-  <funcs>
-    <func>
-      <name>install() -> ok | {error, Reason}</name>
-      <name>install(TargetSystem) -> ok | {error, Reason}</name>
-      <name>install(Opts) -> ok | {error, Reason}</name>
-      <name>install(TargetSystem,Opts) -> ok | {error, Reason}</name>
-      <fsummary>Installs the Test Server Framework</fsummary>
-      <type>
-        <v>TargetSystem = {Architecture, TargetHost}</v>
-        <v>Architecture = atom() or string()</v>
-        <d>e.g. "ose" or "vxworks_ppc603"</d>
-        <v>TargetHost = atom() or string()</v>
-        <d>The name of the target host</d>
-        <v>Opts = list()</v>
-      </type>
-      <desc>
-        <p>Installs and configures the Test Server Framework for
-          running test suites. If a remote host is to be used, the
-          <c>TargetSystem</c> argument must be given so that "cross
-		  installation" can be done. Installation is required for
-		  any of the functions in <c>ts</c> to work.
-          </p>
-        <p>Opts may be one or more of
-          </p>
-        <list>
-          <item><c>{longnames, Bool}</c><br></br>
-          Use fully qualified hostnames for test_server and
-           slave nodes. Bool is <c>true</c> or <c>false</c> (default).
-          </item>
-          <item><c>{verbose, Level}</c><br></br>
-          Verbosity level for test server output, set to 0, 1 or
-           2, where 0 is quiet(default).
-          </item>
-          <item><c>{hosts, Hosts}</c><br></br>
-          This is a list of available hosts on which to start
-           slave nodes. It is used when the <c>{remote, true}</c>
-           option is given to the <c>test_server:start_node/3</c>
-           function. Also, if <c>{require_nodenames, Num}</c> is
-           contained in a test specification file, the generated
-           nodenames will be spread over all hosts given in this
-          <c>Hosts</c> list. The hostnames are given as atoms or
-           strings.
-          </item>
-          <item><c>{slavetargets, SlaveTarges}</c><br></br>
-          For VxWorks only. This is a list of
-           available hosts where slave nodes can be started. This is
-           necessary because only one node can run per host in the
-           VxWorks environment. This is not the same as
-          <c>{hosts, Hosts}</c> because it is used for all slave nodes
-           - not only the ones started with <c>{remote, true}</c>. The
-           hostnames are given as atoms or strings.
-          </item>
-          <item><c>{crossroot, TargetErlRoot}</c><br></br>
-          Erlang root directory on target host
-                    <br></br>
-This option is mandatory for remote targets
-          </item>
-          <item><c>{master, {MasterHost, MasterCookie}}</c><br></br>
-          If target is remote and the target node is started as
-           a slave node, this option
-           indicates which master and cookie to use. The given master
-           will also be used as master for slave nodes started with
-          <c>test_server:start_node/3</c>. It is expected that the
-          <c>erl_boot_server</c> is started on the master node before
-           the test is run. If this option is not given, the test
-           server controller node is used as master and the
-          <c>erl_boot_server</c> is automatically started.
-          </item>
-          <item><c>{erl_start_args, ArgString}</c><br></br>
-          Additional arguments to be used when starting the test
-           server controller node. <c>ArgString</c> will be appended to
-           the command line when starting the erlang node. Note that
-           this will only affect the startup of the <em>controller node</em>, 
-	   i.e. not the target node or any slave nodes
-           startet from a test case.
-          </item>
-          <item><c>{ipv6_hosts, HostList}</c><br></br>
-          This option will be inserted in the
-          <c>Config</c> parameter for each test case. <c>HostList</c>
-           is a list of hosts supporting IPv6.
-          </item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>help() -> ok</name>
-      <fsummary>Presents simple help on the functions in <c>ts</c></fsummary>
-      <desc>
-        <p>Presents simple help on the functions in <c>ts</c>. Useful
-          for quick reference.</p>
-      </desc>
-    </func>
-    <func>
-      <name>tests() -> Tests</name>
-      <fsummary>Returns the list of available tests</fsummary>
-      <desc>
-        <p>Returns the list of available tests. This is actually just
-          a list of all test specification files found by looking up
-          "../*_test/*.spec".
-          </p>
-        <p>In each ../Name_test/ directory there should be one test
-          specification file named Name.spec.</p>
-      </desc>
-    </func>
-    <func>
-      <name>run() -> ok | {error, Reason}</name>
-      <name>run([all_tests|Opts])</name>
-      <name>run(Specs)</name>
-      <name>run(Specs, Opts)</name>
-      <name>run(Spec, Module)</name>
-      <name>run(Spec, Module, Opts)</name>
-      <name>run(Spec, Module, Case)</name>
-      <name>run(Spec, Module, Case, Opts)</name>
-      <fsummary>Runs (specified) test suite(s)</fsummary>
-      <type>
-        <v>Specs = Spec | [Spec]</v>
-        <v>Spec = atom()</v>
-        <v>Module = atom()</v>
-        <v>Case = atom()</v>
-        <v>Opts = [Opt]</v>
-        <v>Opt = batch | verbose | {verbose, Level} | {vars, Vars} |  keep_topcase | cover | cover_details |{cover,CoverFile} |  {cover_details,CoverFile} | {trace, TraceSpec}</v>
-        <v>Level = integer(); 0 means silent</v>
-        <v>Vars = list() of key-value tuples</v>
-        <v>CoverFile = string(); name of file listing modules to exclude from or include in cover compilation. The name must include full path to the file.</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>This function runs test suite(s)/case(s). To be able to run
-          any tests, ts:install must first be called to create the
-          <c>variables</c> file needed.  To run a whole test specification,
-          only specify the name of the test specification, and all test
-          suite modules belonging to that test spec will be run.  To run
-          a single module in a test specification, use the Module
-          argument to specify the name of the module to run and all test
-          cases in that module will be run, and to run a specified test
-          case, specify the name of the test case using the Case
-          argument. If called with no argument, all test specifications
-          available will be run. Use ts:tests/0 to see the available
-          test specifications.
-          </p>
-        <p>If the <c>batch</c> option is not given, a new xterm is
-          started (unix) when <c>ts:run</c> is called.
-          </p>
-        <p>The <c>verbose</c> option sets the verbosity level for test
-          server output. This has the same effect as if given to
-          <c>ts:install/1/2</c></p>
-        <p>The <c>vars</c> option can be used for adding configuration
-          variables that are not in the <c>variables</c> file generated
-          during installation. Can be any of the <c>Opts</c> valid for
-          <c>ts:install/1/2</c>.
-          </p>
-        <p>The <c>keep_topcase</c> option forces <c>ts</c> to keep the
-          topcase in your test specification file as is. This option can
-          only be used if you don't give the <c>Module</c> or
-          <c>Case</c> parameters to <c>ts:run</c>. The
-          <c>keep_topcase</c> option is necessary if your topcase
-          contains anything other than <c><![CDATA[{dir,"../<Name>_test"}]]></c>. If
-          the option is not used, <c>ts</c> will modify your topcase.
-          </p>
-        <p>The <c>cover</c> and <c>cover_details</c> options indicates
-          that the test shall be run with code coverage
-          analysis. <c>cover_details</c> means that analysis shall be
-          done on the most detailed level. If the test is run with a
-          remote target, this option creates a list of uncovered lines
-          in each cover compiled module. If the test is run with a local
-          target, each cover compiled module will be analysed with
-          <c>cover:analyse_to_file/1</c>. The <c>cover</c> options will
-          only create an overview of all cover compiled modules with the
-          number of covered and not covered lines.
-          </p>
-        <p>The <c>CoverFile</c> which can be given with the
-          <c>cover</c> and <c>cover_details</c> options must be the
-          filename of a file listing modules to be excluded from or
-          included in the cover compilation. By default, <c>ts</c>
-          believes that <c>Spec</c> is the name of an OTP application
-          and that all modules in this application shall be cover
-          compiled. The <c>CoverFile</c> can exclude modules that belong
-          to the application and add modules that don't belong to the
-          application. The file can have the following entries:</p>
-        <code type="none">
-{exclude, all | ExcludeModuleList}.
-{include, IncludeModuleList}.        </code>
-        <p>Note that each line must end with a full
-          stop. <c>ExcludeModuleList</c> and <c>IncludeModuleList</c>
-          are lists of atoms, where each atom is a module name.
-          </p>
-        <p>If the <c>cover</c> or <c>cover_details</c> options are
-          given on their own, the directory <c><![CDATA[../<Spec>_test]]></c> is
-          searched for a <c>CoverFile</c> named <c><![CDATA[<Spec>.cover]]></c>. If
-          this file is not found, <c>Spec</c> is assumed to be the name
-          of an OTP application, and all modules in the <c>ebin</c>
-          directory for the application are cover compiled. The
-          <c>ebin</c> directory is found by adding <c>ebin</c> to
-          <c>code:lib_dir(Spec)</c>.
-          </p>
-        <p>The same cover compiled code will be loaded on all slave or
-          peer nodes started with <c>test_server:start_node/3</c>. The
-          exception is nodes that run an old version of OTP. If the loading 
-          fails, the node will simply not be a part of the coverage
-          analysis. Note that slave and peer nodes must be stopped with
-          <c>test_server:stop_node/1</c> for the node to be part of the
-          coverage analysis, else the test server will not be able to
-          fetch coverage data from the node.
-          </p>
-        <p>The <c>trace</c> option is used to turn on call trace on
-          target and on slave or peer nodes started with
-          <c>test_server:start_node/3</c>. <c>TraceSpec</c> can be the
-          name of a trace information file, or a list of elements like
-          the ones in a trace information file. Please turn to the
-          reference manual for <c>test_server_ctrl:trc/1</c> for details
-          about the trace information file.
-          </p>
-      </desc>
-    </func>
-    <func>
-      <name>cross_cover_analyse(Level) -> ok</name>
-      <name>cross_cover_analyse([Level]) -> ok</name>
-      <fsummary>Analyse cover data collected from all tests</fsummary>
-      <desc>
-        <p>Analyse cover data collected from all tests.
-          </p>
-        <p>See test_server_ctrl:cross_cover_analyse/2
-          </p>
-      </desc>
-    </func>
-    <func>
-      <name>r() -> ok</name>
-      <name>r(Opts) -> ok</name>
-      <name>r(SpecOrSuite) -> ok</name>
-      <name>r(SpecOrSuite,Opts) -> ok</name>
-      <name>r(Suite,Case) -> ok</name>
-      <name>r(Suite,Case,Opts) -> ok</name>
-      <fsummary>Run test suite or test case without <c>ts</c>installed</fsummary>
-      <type>
-        <v>SpecOrSuite = Spec | Suite</v>
-        <v>Spec = string()</v>
-        <d>"Name.spec" or "Name.spec.OsType", where OsType is vxworks</d>
-        <v>Suite = atom()</v>
-        <v>Case = atom()</v>
-        <v>Opts = [Opt]</v>
-        <v>Opt = {Cover,AppOrCoverFile} | {Cover,Application,CoverFile}</v>
-        <v>Cover = cover | cover_details</v>
-        <v>AppOrCoverFile = Application | CoverFile</v>
-        <v>Application = atom()</v>
-        <d>OTP application to cover compile</d>
-        <v>CoverFile = string()</v>
-        <d>Name of file listing modules to exclude from or include in cover compilation</d>
-      </type>
-      <desc>
-        <p>This function can be used to run a test suites or test
-          cases directly, without any of the additional features added
-          by the test server framework. It is simply a wrapper function
-          for the <c>add_dir</c>, <c>add_spec</c>, <c>add_module</c> and 
-          <c>add_case</c> functions in <c>test_server_ctrl</c>:
-          </p>
-        <p><c>r() -> add_dir(".")</c>          <br></br>
-<c>r(Spec) -> add_spec(Spec)</c>          <br></br>
-<c>r(Suite) -> add_module(Suite)</c>          <br></br>
-<c>r(Suite,Case) -> add_case(Suite,Case)</c></p>
-        <p>To use this function, it is required that the test suite is
-          compiled and in the code path of the node where the function
-          is called. The function can be used without having <c>ts</c>
-          installed.
-          </p>
-        <p>For information about the <c>cover</c> and
-          <c>cover_details</c> options, see <c>test_server_ctrl:cover/2/3</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>estone() -> ok | {error, Reason}</name>
-      <name>estone(Opts) -> ok</name>
-      <fsummary>Runs the EStone test</fsummary>
-      <desc>
-        <p>This function runs the EStone test. It is a shortcut for
-          running the test suite <c>estone_SUITE</c> in the
-          <c>kernel</c> application.
-          </p>
-        <p><c>Opts</c> is the same as the <c>Opts</c> argument for the
-          <c>ts:run</c> functions.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>Makfile.src in Data Directory</title>
-    <p>If a data directory contains code which must be compiled before
-      the test suite is run, a makefile source called
-      <c>Makefile.src</c> can be placed in the data directory. This file
-      will be converted to a valid makefile by <c>ts:run/0/1/2/3/4</c>.
-      </p>
-    <p>The reason for generating the makefile is that you can use
-      variables from the <c>variables</c> file which was generated by
-      <c>ts:install/0/1/2</c>. All occurrences of <c>@Key@</c> in
-      <c>Makefile.src</c> is substituted by the <c>Value</c> from
-      <c>{Key,Value}</c> found in the <c>variables</c> file. Example:
-      </p>
-    <p>Cut from <c>variables</c>:</p>
-    <code type="none">
-    ...
-    {'EMULATOR',"beam"}.
-    {'CFLAGS',"-g -O2"}.
-    {'LD',"$(CC) $(CFLAGS)"}.
-    {'CC',"gcc"}.
-    ...
-    </code>
-    <p><c>Makefile.src</c> for compiling erlang code could look
-      something like this:</p>
-    <code type="none">
-    EFLAGS=+debug_info
-    
-    all: ordsets1.@EMULATOR@
-    
-    ordsets1.@EMULATOR@: ordsets1.erl
-           erlc $(EFLAGS) ordsets1.erl
-    </code>
-    <p><c>Makefile.src</c> for compiling c code could look
-      something like this:</p>
-    <code type="none">
-    CC = @CC@
-    LD = @LD@
-    CFLAGS = @CFLAGS@ -I@erl_include@ @DEFS@
-    CROSSLDFLAGS = @CROSSLDFLAGS@
-    
-    PROGS = nfs_check@exe@
-    
-    all: $(PROGS)
-    
-    nfs_check@exe@: nfs_check@obj@
-           $(LD) $(CROSSLDFLAGS) -o nfs_check nfs_check@obj@ @LIBS@
-
-    nfs_check@obj@: nfs_check.c
-           $(CC) -c -o nfs_check@obj@ $(CFLAGS) nfs_check.c
-    </code>
-  </section>
-</erlref>
-
diff --git a/lib/test_server/doc/src/why_test_chapter.xml b/lib/test_server/doc/src/why_test_chapter.xml
deleted file mode 100644
index 3d0e8271b1..0000000000
--- a/lib/test_server/doc/src/why_test_chapter.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2002</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Why Test</title>
-    <prepared>Siri Hansen</prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-
-  <section>
-    <title>Goals</title>
-    <p>It's not possible to prove that a program is correct by
-      testing. On the contrary, it has been formally proven that it is
-      impossible to prove programs in general by testing. Theoretical
-      program proofs or plain examination of code may be viable options
-      for those that wish to certify that a program is correct. The test
-      server, as it is based on testing, cannot be used for
-      certification. Its intended use is instead to (cost effectively)
-      <em>find bugs</em>. A successful test suite is one that reveals a
-      bug. If a test suite results in Ok, then we know very little that
-      we didn't know before.
-      </p>
-  </section>
-
-  <section>
-    <title>What to test?</title>
-    <p>There are many kinds of test suites. Some concentrate on
-      calling every function in the interface to some module or
-      server. Some other do the same, but uses all kinds of illegal
-      parameters, and verifies that the server stays alive and rejects
-      the requests with reasonable error codes. Some test suites
-      simulate an application (typically consisting of a few modules of
-      an application), some try to do tricky requests in general, some
-      test suites even test internal functions.
-      </p>
-    <p>Another interesting category of test suites are the ones that
-      check that fixed bugs don't reoccur. When a bugfix is introduced,
-      a test case that checks for that specific bug should be written
-      and submitted to the affected test suite(s).
-      </p>
-    <p>Aim for finding bugs. Write whatever test that has the highest
-      probability of finding a bug, now or in the future. Concentrate
-      more on the critical parts. Bugs in critical subsystems are a lot
-      more expensive than others.
-      </p>
-    <p>Aim for functionality testing rather than implementation
-      details. Implementation details change quite often, and the test
-      suites should be long lived. Often implementation details differ
-      on different platforms and versions. If implementation details
-      have to be tested, try to factor them out into separate test
-      cases. Later on these test cases may be rewritten, or just
-      skipped.
-      </p>
-    <p>Also, aim for testing everything once, no less, no more. It's
-      not effective having every test case fail just because one
-      function in the interface changed.
-      </p>
-  </section>
-
-  <section>
-    <title>How much to test</title>
-    <p>There is a unix shell script that counts the number of non
-      commented words (lines and characters too) of source code in each
-      application's test directory and divides with the number of such
-      source words in the src directory. This is a measure of how much
-      test code there is.
-      </p>
-    <p>There has been much debate over how much test code, compared to
-      production code, should be written in a project. More test code
-      finds more bugs, but test code needs to be maintained just like
-      the production code, and it's expensive to write it in the first
-      place. In several articles from relatively mature software
-      organizations that I have read, the amount of test code has been
-      about the same as the production code.  </p>
-    <p>In OTP, at the time of
-      writing, few applications come even close to this, some have no
-      test code at all.
-      </p>
-
-    <section>
-      <title>Full coverage</title>
-      <p>It is possible to cover compile the modules being tested
-        before running the test suites. Doing so displays which branches
-        of the code that are tested by the test suite, and which are
-        not. Many use this as a measure of a good test suite. When every
-        single line of source code is covered once by the test suite,
-        the test suite is finished.
-        </p>
-      <p>A coverage of 100% still proves nothing, though. It doesn't
-        mean that the code is error free, that everything is tested. For
-        instance, if a function contains a division, it has to be
-        executed at least twice. Once with parameters that cause
-        division by zero, and once with other parameters.
-        </p>
-      <p>High degree of coverage is good of course, it means that no
-        major parts of the code has been left untested. It's another
-        question whether it's cost effective. You're only likely to find
-        50% more bugs when going from 67% to 100% coverage, but the work
-        (cost) is maybe 200% as large, or more, because reaching all of
-        those obscure branches is usually complicated.
-        </p>
-      <p>Again, the reason for testing with the test server is to find
-        bugs, not to create certificates of valid code. Maximizing the
-        number of found bugs per hour probably means not going for 100%
-        coverage. For some module the optimum may be 70%, for some other
-        maybe 250%. 100% shouldn't be a goal in itself.</p>
-    </section>
-
-    <section>
-      <title>User interface testing</title>
-      <p>It is very difficult to do sensible testing of user
-        interfaces, especially the graphic ones. The test server has
-        some support for capturing the text I/O that goes to the user,
-        but none for graphics. There are several tools on the market
-        that help with this.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/test_server/doc/src/write_framework_chapter.xml b/lib/test_server/doc/src/write_framework_chapter.xml
deleted file mode 100644
index d10b580c34..0000000000
--- a/lib/test_server/doc/src/write_framework_chapter.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2002</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Write you own test server framework</title>
-    <prepared>Siri Hansen</prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>write_framework_chapter.xml</file>
-  </header>
-
-  <section>
-    <title>Introduction</title>
-    <p>The test server controller can be interfaced from the operating
-      system or from within Erlang. The nature of your new framework
-      will decide which interface to use. If you want your framework to
-      start a new node for each test, the operating system interface is
-      very convenient. If your node is already started, going from
-      within Erlang might be a more flexible solution.
-      </p>
-    <p>The two methods are described below.
-      </p>
-  </section>
-
-  <section>
-    <title>Interfacing the test server controller from Erlang</title>
-    <p>Using the test server from Erlang means that you have to start
-      the test server and then add test jobs. Use
-      <c>test_server_ctrl:start/0</c> to start the test server, and
-      <c>test_server_ctrl:stop/0</c> to stop it.
-      </p>
-
-    <section>
-      <title>Adding test jobs</title>
-      <p>There are many commands available for adding test cases to
-        the test server's job queue:        <br></br>
-</p>
-      <list type="bulleted">
-        <item>Single test case        <br></br>
-<c>test_server_ctrl:add_case/2/3</c></item>
-        <item>Multiple test cases from same suite        <br></br>
-<c>test_server_ctrl:add_cases/2/3</c></item>
-        <item>Test suite module or modules        <br></br>
-<c>test_server_ctrl:add_module/1/2</c></item>
-        <item>Some or all test suite modules in a directory        <br></br>
-<c>test_server_ctrl:add_dir/2/3</c></item>
-        <item>Test cases specified in a test specification file        <br></br>
-<c>test_server_ctrl:add_spec/1</c></item>
-      </list>
-      <p>All test suites are given a unique name, which is usually
-        given when the test suite is added to the job queue. In some
-        cases, a default name is used, as in the case when a module is
-        added without a specified name. The test job name is used to
-        store logfiles, which are stored in the `name.logs' directory
-        under the current directory.
-        </p>
-      <p>See the reference manual for details about the functions for
-        adding test jobs.
-        </p>
-    </section>
-  </section>
-
-  <section>
-    <title>Interfacing the test server controller from the operating system.</title>
-    <p>The function <c>run_test/1</c> is your interface in the test
-      server controller if you wish to use it from the operating
-      system. You simply start an erlang shell and invoke this function
-      with the <c>-s</c> option. <c>run_test/1</c> starts the test
-      server, runs the test specified by the command line and stops the
-      test server. The argument to <c>run_test/1</c> is a list of
-      command line flags, typically
-      <c>['KEY1', Value1, 'KEY2', Value2, ...]</c>. 
-      The valid command line flags are listed in the reference manual
-      for <c>test_server_ctrl</c>.
-      </p>
-    <p>A typical command line may look like this      <br></br>
-<c>erl -noshell -s test_server_ctrl run_test KEY1 Value1 KEY2 Value2 ... -s erlang halt</c></p>
-    <p>Or make an alias (this is for unix/tcsh)      <br></br>
-<c>alias erl_test 'erl -noshell -s test_server_ctrl run_test \!* -s erlang halt'</c></p>
-    <p>And then use it like this      <br></br>
-<c>erl_test KEY1 Value1 KEY2 Value2 ...</c>      <br></br>
-</p>
-
-    <section>
-      <title>An Example</title>
-      <p>An example of starting a test run from the command line        <br></br>
-</p>
-      <p><c>erl -name test_srv -noshell -rsh /home/super/otp/bin/ctrsh </c>        <br></br>
-<c>-pa /clearcase/otp/erts/lib/kernel/test </c>        <br></br>
-<c>-boot start_sasl -sasl errlog_type error </c>        <br></br>
-<c>-s test_server_ctrl run_test SPEC kernel.spec -s erlang halt</c>        <br></br>
-</p>
-    </section>
-  </section>
-
-  <section>
-    <title>Framework callback functions</title>
-    <p>By defining the environment variable
-      <c>TEST_SERVER_FRAMEWORK</c> to a module name, the framework
-      callback functions can be used. The framework callback functions
-      are called by the test server in order let the framework interact
-      with the execution of the tests and to keep the framework upto
-      date with information about the test progress.
-      </p>
-    <p>The framework callback functions are described in the reference
-      manual for <c>test_server_ctrl</c>.
-      </p>
-    <p>Note that this topic is in an early stage of development, and
-      changes might occur.
-      </p>
-  </section>
-
-  <section>
-    <title>Other concerns</title>
-    <p>Some things to think about when writing you own test server
-      framework:
-      </p>
-    <list type="bulleted">
-      <item><c>emulator version</c> - Make sure that the intended
-       version of the emulator is started.
-      </item>
-      <item><c>operating system path</c> - If test cases use port
-       programs, make sure the paths are correct.
-      </item>
-      <item><c>recompilation</c> - Make sure all test suites are fresh
-       compiled.
-      </item>
-      <item><c>test_server.hrl</c> - Make sure the
-      <c>test_server.hrl</c> file is in the include path when
-       compiling test suites.
-      </item>
-      <item><c>running applications</c> - Some test suites require
-       some applications to be running (e.g. sasl). Make sure they are
-       started.
-      </item>
-    </list>
-  </section>
-</chapter>
-
diff --git a/lib/test_server/doc/src/write_test_chapter.xml b/lib/test_server/doc/src/write_test_chapter.xml
deleted file mode 100644
index c3e1881b8a..0000000000
--- a/lib/test_server/doc/src/write_test_chapter.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2002</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Writing Test Suites</title>
-    <prepared>Siri Hansen</prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>write_test_chapter.xml</file>
-  </header>
-
-  <section>
-    <title>Support for test suite authors</title>
-    <p>The <c>test_server</c> module provides some useful functions
-      to support the test suite author. This includes:
-      </p>
-    <list type="bulleted">
-      <item>Starting and stopping slave or peer nodes</item>
-      <item>Capturing and checking stdout output</item>
-      <item>Retrieving and flushing process message queue</item>
-      <item>Watchdog timers</item>
-      <item>Checking that a function crashes</item>
-      <item>Checking that a function succeeds at least m out of n times</item>
-      <item>Checking .app files</item>
-    </list>
-    <p>Please turn to the reference manual for the <c>test_server</c>
-      module for details about these functions.
-      </p>
-  </section>
-
-  <section>
-    <title>Test suites</title>
-    <p>A test suite is an ordinary Erlang module that contains test
-      cases. It's recommended that the module has a name on the form
-      *_SUITE.erl. Otherwise, the directory function will not find the
-      modules (by default).
-      </p>
-    <p>For some of the test server support, the test server include
-      file <c>test_server.hrl</c> must be included. Never include it
-      with the full path, for portability reasons. Use the compiler 
-      include directive instead.
-      </p>
-    <p>The special function <c>all(suite)</c> in each module is called
-      to get the test specification for that module. The function
-      typically returns a list of test cases in that module, but any
-      test specification could be returned. Please see the chapter
-      about test specifications for details about this.
-      </p>
-  </section>
-
-  <section>
-    <title>Init per test case</title>
-    <p>In each test suite module, the functions
-      <c>init_per_testcase/2</c> and <c>end_per_testcase/2</c> must be
-      implemented.
-      </p>
-    <p><c>init_per_testcase</c> is called before each test case in the
-      test suite, giving a (limited) possibility for initialization.
-      </p>
-    <p><c>end_per_testcase/2</c> is called after each test case is
-      completed, giving a possibility to clean up.
-      </p>
-    <p>The first argument to these functions is the name of the test
-      case. This can be used to do individual initialization and cleanup for
-      each test cases.
-      </p>
-    <p>The second argument is a list of tuples called
-      <c>Config</c>. The first element in a <c>Config</c> tuple
-      should be an atom - a key value to be used for searching. 
-      <c>init_per_testcase/2</c> may modify the <c>Config</c>
-      parameter or just return it as is. Whatever is retuned by
-      <c>init_per_testcase/2</c> is given as <c>Config</c> parameter to
-      the test case itself.
-      </p>
-    <p>The return value of <c>end_per_testcase/2</c> is ignored by the
-      test server.
-      </p>
-  </section>
-
-  <section>
-    <title>Test cases</title>
-    <p>The smallest unit that the test server is concerned with is a
-      test case. Each test case can in turn test many things, for
-      example make several calls to the same interface function with
-      different parameters.
-      </p>
-    <p>It is possible to put many or few tests into each test
-      case. How many things each test case tests is up to the author,
-      but here are some things to keep in mind.
-      </p>
-    <p>Very small test cases often leads to more code, since
-      initialization has to be duplicated. Larger code, especially with
-      a lot of duplication, increases maintenance and reduces
-      readability.
-      </p>
-    <p>Larger test cases make it harder to tell what went wrong if it
-      fails, and force us to skip larger portions of test code if a
-      specific part fails. These effects are accentuated when running on
-      multiple platforms because test cases often have to be skipped.
-      </p>
-    <p>A test case generally consists of three parts, the
-      documentation part, the specification part and the execution
-      part. These are implemented as three clauses of the same function.
-      </p>
-    <p>The documentation clause matches the argument '<c>doc</c>' and
-      returns a list for strings describing what the test case tests.
-      </p>
-    <p>The specification clause matches the argument '<c>suite</c>'
-      and returns the test specification for this particular test
-      case. If the test specification is an empty list, this indicates
-      that the test case is a leaf test case, i.e. one to be executed.
-      </p>
-    <p>The execution clause implements the actual test case. It takes
-      one argument, <c>Config</c>, which contain configuration
-      information like <c>data_dir</c> and <c>priv_dir</c>. See <seealso marker="#data_priv_dir">Data and Private Directories</seealso> for
-      more information about these.
-      </p>
-    <p>The <c>Config</c> variable can also contain the
-      <c>nodenames</c> key, if requested by the <c>require_nodenames</c>
-      command in the test suite specification file. All <c>Config</c>
-      items should be extracted using the <c>?config</c> macro. This is
-      to ensure future compatibility if the <c>Config</c> format
-      changes. See the reference manual for <c>test_server</c> for
-      details about this macro.
-      </p>
-    <p>If the execution clause crashes or exits, it is considered a
-      failure. If it returns <c>{skip,Reason}</c>, the test case is
-      considered skipped. If it returns <c>{comment,String}</c>,
-      the string will be added in the 'Comment' field on the HTML
-      result page. If the execution clause returns anything else, it is
-      considered a success, unless it is <c>{'EXIT',Reason}</c> or
-      <c>{'EXIT',Pid,Reason}</c> which can't be distinguished from a
-      crash, and thus will be considered a failure.
-      </p>
-  </section>
-
-  <section>
-    <marker id="data_priv_dir"></marker>
-    <title>Data and Private Directories</title>
-    <p>The data directory (<c>data_dir</c>) is the directory where the test
-      module has its own files needed for the testing. A compiler test
-      case may have source files to feed into the compiler, a release
-      upgrade test case may have some old and new release of
-      something. A graphics test case may have some icons and a test
-      case doing a lot of math with bignums might store the correct
-      answers there. The name of the <c>data_dir</c> is the the name of
-      the test suite and then "_data". For example,
-      <c>"some_path/foo_SUITE.beam"</c> has the data directory
-      <c>"some_path/foo_SUITE_data/"</c>.
-      </p>
-    <p>The <c>priv_dir</c> is the test suite's private directory. This
-      directory should be used when a test case needs to write to
-      files. The name of the private directory is generated by the test
-      server, which also creates the directory.
-      </p>
-    <p><em>Warning:</em> Do not depend on current directory to be
-      writable, or to point to anything in particular. All scratch files
-      are to be written in the <c>priv_dir</c>, and all data files found
-      in <c>data_dir</c>. If the current directory has to be something
-      specific, it must be set with <c>file:set_cwd/1</c>.
-      </p>
-  </section>
-
-  <section>
-    <title>Execution environment</title>
-    <p>Each time a test case is about to be executed, a new process is
-      created with <c>spawn_link</c>. This is so that the test case will
-      have no dependencies to earlier tests, with respect to process flags,
-      process links, messages in the queue, other processes having registered
-      the process, etc. As little as possible is done to change the initial
-      context of the process (what is created by plain spawn). Here is a
-      list of differences:
-      </p>
-    <list type="bulleted">
-      <item>It has a link to the test server. If this link is removed,
-       the test server will not know when the test case is finished,
-       just wait infinitely.
-      </item>
-      <item>It often holds a few items in the process dictionary, all
-       with names starting with '<c>test_server_</c>'. This is to keep
-       track of if/where a test case fails.
-      </item>
-      <item>There is a top-level catch. All of the test case code is
-       catched, so that the location of a crash can be reported back to
-       the test server. If the test case process is killed by another
-       process (thus the catch code is never executed) the test server
-       is not able to tell where the test case was executing.
-      </item>
-      <item>It has a special group leader implemented by the test
-       server. This way the test server is able to capture the io that
-       the test case provokes. This is also used by some of the test
-       server support functions.
-      </item>
-    </list>
-    <p>There is no time limit for a test case, unless the test case
-      itself imposes such a limit, by calling
-      <c>test_server:timetrap/1</c> for example.  The call can be made
-      in each test case, or in the <c>init_per_testcase/2</c>
-      function. Make sure to call the corresponding
-      <c>test_server:timetrap_cancel/1</c> function as well, e.g in the
-      <c>end_per_testcase/2</c> function, or else the test cases will
-      always fail.
-      </p>
-  </section>
-
-</chapter>
-
diff --git a/lib/test_server/ebin/.gitignore b/lib/test_server/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/test_server/ebin/.gitignore
+++ /dev/null
diff --git a/lib/test_server/include/test_server.hrl b/lib/test_server/include/test_server.hrl
deleted file mode 100644
index 77864ef3b5..0000000000
--- a/lib/test_server/include/test_server.hrl
+++ /dev/null
@@ -1,32 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2011. 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%
-%%
-
--ifdef(line_trace).
--line_trace(true).
--define(line,
-	io:format(lists:concat([?MODULE,",",integer_to_list(?LINE),": ~p"]),
-		  [erlang:monotonic_time()-erlang:system_info(start_time)]),).
--else.
--define(line,).
--endif.
--define(t,test_server).
--define(config,test_server:lookup_config).
-
-
diff --git a/lib/test_server/include/test_server_line.hrl b/lib/test_server/include/test_server_line.hrl
deleted file mode 100644
index 37da956cd0..0000000000
--- a/lib/test_server/include/test_server_line.hrl
+++ /dev/null
@@ -1,20 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2011. 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%
-%%
-
diff --git a/lib/test_server/info b/lib/test_server/info
deleted file mode 100644
index 7a9ed6c700..0000000000
--- a/lib/test_server/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: test Test Applications
-short: The OTP Test Server
diff --git a/lib/test_server/prebuild.skip b/lib/test_server/prebuild.skip
deleted file mode 100644
index 8ee4101f6a..0000000000
--- a/lib/test_server/prebuild.skip
+++ /dev/null
@@ -1 +0,0 @@
-src/autom4te.cache
diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
deleted file mode 100644
index 6a26ee2933..0000000000
--- a/lib/test_server/src/Makefile
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1996-2013. 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%
-#
-
-include $(ERL_TOP)/make/target.mk
-
-# ----------------------------------------------------
-# Configuration info.
-# ----------------------------------------------------
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(TEST_SERVER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/test_server-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES= test_server_ctrl \
-	 test_server_gl \
-	 test_server_io \
-	 test_server_node \
-	 test_server \
-	 test_server_sup \
-	 erl2html2
-
-TS_MODULES= \
-	ts \
-	ts_run \
-	ts_lib \
-	ts_make \
-	ts_erl_config \
-	ts_autoconf_win32 \
-	ts_install \
-	ts_install_cth \
-	ts_benchmark
-
-TARGET_MODULES= $(MODULES:%=$(EBIN)/%)
-TS_TARGET_MODULES= $(TS_MODULES:%=$(EBIN)/%)
-
-ERL_FILES= $(MODULES:=.erl)
-TS_ERL_FILES= $(TS_MODULES:=.erl)
-HRL_FILES = ../include/test_server.hrl ../include/test_server_line.hrl
-INTERNAL_HRL_FILES = test_server_internal.hrl
-TS_HRL_FILES= ts.hrl
-C_FILES = 
-AUTOCONF_FILES = configure.in conf_vars.in
-PROGRAMS = configure config.sub config.guess install-sh 
-CONFIG = ts.config ts.unix.config ts.win32.config
-
-TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) \
-	       $(APP_TARGET) $(APPUP_TARGET)
-TS_TARGET_FILES = $(TS_MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-TARGETS = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(PROGRAMS) \
-	  $(APP_TARGET) $(APPUP_TARGET)
-TS_TARGETS = $(TS_MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-APP_FILE= test_server.app
-APP_SRC= $(APP_FILE).src
-APP_TARGET= $(EBIN)/$(APP_FILE)
-
-APPUP_FILE= test_server.appup
-APPUP_SRC= $(APPUP_FILE).src
-APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS += -I../include -Werror
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-tests debug opt: $(TARGETS) $(TS_TARGETS)
-
-clean:
-	rm -f $(TARGET_FILES) $(TS_TARGET_FILES)
-	rm -f core
-
-docs:
-
-configure: configure.in
-	autoconf configure.in > configure
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
-
-release_tests_spec: opt
-	$(INSTALL_DIR) "$(RELEASE_PATH)/test_server"
-	$(INSTALL_DATA) $(ERL_FILES) $(TS_ERL_FILES) \
-		$(HRL_FILES) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) \
-		$(TS_TARGET_FILES) \
-		$(AUTOCONF_FILES) $(C_FILES) $(CONFIG) \
-		"$(RELEASE_PATH)/test_server"
-	$(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server"
-
-release_docs_spec:
-
diff --git a/lib/test_server/src/test_server.app.src b/lib/test_server/src/test_server.app.src
deleted file mode 100644
index 334be8109d..0000000000
--- a/lib/test_server/src/test_server.app.src
+++ /dev/null
@@ -1,39 +0,0 @@
-% This is an -*- erlang -*- file.
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2009-2013. 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%
-
-{application, test_server,
- [{description, "The OTP Test Server application"},
-  {vsn, "%VSN%"},
-  {modules, [
-	     erl2html2,
-	     test_server_ctrl,
-	     test_server,
-	     test_server_io,
-	     test_server_node,
-	     test_server_sup
-	    ]},
-  {registered, [test_server_ctrl,
-		test_server,
-		test_server_break_process]},
-  {applications, [kernel,stdlib]},
-  {env, []},
-  {runtime_dependencies, ["tools-2.8","stdlib-2.5","runtime_tools-1.8.16",
-			  "observer-2.1","kernel-4.0","inets-6.0",
-			  "syntax_tools-1.7","erts-7.0"]}]}.
-  
diff --git a/lib/test_server/src/test_server.appup.src b/lib/test_server/src/test_server.appup.src
deleted file mode 100644
index 7c4aa630ae..0000000000
--- a/lib/test_server/src/test_server.appup.src
+++ /dev/null
@@ -1,22 +0,0 @@
-%% -*- erlang -*-
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2014. 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%
-{"%VSN%",
- [{<<".*">>,[{restart_application, test_server}]}],
- [{<<".*">>,[{restart_application, test_server}]}]
-}.
diff --git a/lib/test_server/src/things/distr_startup_SUITE.erl b/lib/test_server/src/things/distr_startup_SUITE.erl
deleted file mode 100644
index aa84ab007f..0000000000
--- a/lib/test_server/src/things/distr_startup_SUITE.erl
+++ /dev/null
@@ -1,239 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. 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%
-%%
--module(distr_startup_SUITE).
--compile([export_all]).
-%%-define(line_trace,1).
--include("test_server.hrl").
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all(suite) -> [reads,writes].
-
--define(iterations,10000).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-app1() ->
-    {application, app1,
-     [{description, "ERTS  CXC 138 10"},
-      {vsn, "2.0"},
-      {applications, [kernel, stdlib]},
-      {mod, {ch_sup, {app1, 1, 3}}}]}.
-
-app3() ->
-    {application, app3,
-     [{description, "ERTS  CXC 138 10"},
-      {vsn, "2.0"},
-      {applications, [kernel, stdlib]},
-      {mod, {ch_sup, {app3, 7, 9}}}]}.
-
-
-config(Fd,C1,C2,C3) ->
-    io:format(Fd, 
-	      "[{kernel, [{sync_nodes_optional, ['~s','~s','~s']},"
-	      "{sync_nodes_timeout, 1},"
-	      "{distributed, [{app1, ['~s', '~s', '~s']},"
-	      "{app2, 10000, ['~s', '~s', '~s']},"
-	      "{app3, 5000, [{'~s', '~s'}, '~s']}]}]}].~n",
-	      [C1,C2,C3, C1,C2,C3, C1,C2,C3, C1,C2,C3]).
-
-from(H, [H | T]) -> T;
-from(H, [_ | T]) -> from(H, T);
-from(H, []) -> [].
-
-%%-----------------------------------------------------------------
-%% Test suite for distributed applications, tests start, load
-%% etc indirectly.
-%% Should be started in a CC view with:
-%% erl -sname master -rsh ctrsh
-%%-----------------------------------------------------------------
-start_nodes(Conf) ->
-    % Write a config file
-    ?line Nodes = ?config(nodes,Conf),
-    ?line [C1,C2,C3|_] = Nodes, %% Need at least 3 nodes
-    ?line Dir = ?config(priv_dir,Conf),
-    ?line {ok, Fd} = file:open(Dir ++ "sys.config", write),
-    ?line config(Fd,C1,C2,C3),
-    ?line file:close(Fd),
-    ?line Config = Dir ++ "sys",
-
-    % Test [cp1, cp2, cp3]
-    ?line {ok, Cp1} = start_node(lists:nth(1,Nodes), Config),
-    ?line {ok, Cp2} = start_node(lists:nth(2,Nodes), Config),
-    ?line {ok, Cp3} = start_node(lists:nth(3,Nodes), Config),
-    % Start app1 and make sure cp1 starts it
-    %%?line rpc:multicall([Cp1, Cp2, Cp3], application, load, [app1()]),
-    %%?line rpc:multicall([Cp1, Cp2, Cp3], application, start,[app1,permanent]),
-    ?line test_server:sleep(1000),
-    {Cp1,Cp2,Cp3}.
-
-stop_nodes({Cp1,Cp2,Cp3}) ->
-    ?line stop_node(Cp1),
-    ?line stop_node(Cp2),
-    ?line stop_node(Cp3).
-
-start_node(NodeAtHost, Config) ->
-    ?line NodeAtHostStr = atom_to_list(NodeAtHost),
-    ?line HostStr = from($@,NodeAtHostStr),
-    ?line NodeStr = lists:reverse(from($@,lists:reverse(NodeAtHostStr))),
-    ?line Host = list_to_atom(HostStr),
-    ?line Node = list_to_atom(NodeStr),
-    ?line io:format("Launching slave node ~p@~p ~p",[Node,Host,Config]),
-    ?line slave:start(Host, Node, lists:concat(["-config ", Config])).
-
-stop_node(Node) ->
-    ?line rpc:cast(Node, erlang, halt, []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-start_client_process(Cp,Mode,NodeNum) ->
-    io:format("Starting client process at ~p in mode ~p",[Cp,Mode]),
-    ?line case rpc:call(Cp, erlang, spawn,
-			[?MODULE, client,
-			 [Mode,NodeNum,self(),random:uniform(1000)]]) of
-	      {badrpc,Reason} ->
-		  ?line exit({badrpc,{Cp,Reason}});
-	      Client ->
-		  ?line Client
-	  end.
-
-start_clients(Mode,Conf) ->
-    ?line random:seed(4711,0,0),
-    ?line {Cp1,Cp2,Cp3} = start_nodes(Conf),
-    ?line Client1 = start_client_process(Cp1,Mode,1),
-    ?line Client2 = start_client_process(Cp2,Mode,2),
-    ?line Client3 = start_client_process(Cp3,Mode,3),
-    test_server:format(1,"All 3 nodes started, "
-		       "power off client(s) any time...",[]),
-    Client1 ! go,
-    Client2 ! go,
-    Client3 ! go,
-    {{Cp1,Cp2,Cp3},{Client1,Client2,Client3}}.
-
-stop_clients(Cps) ->
-    test_server:format(1,"Test completed.",[]),
-    ?line stop_nodes(Cps).
-
-data() ->
-    {{self(),foo,bar,[1,2,3,4,5,6,7],{{{{}}}},
-      "We need pretty long packages, so that there is a big risk "
-      "of cutting it in the middle when suddenly turning off "
-      "the power or breaking the connection.  "
-      "We don't check the contents of the data very much, but "
-      "at least there is a magic cookie at the end (123456)."
-      "If that one arrives correctly, the link is ok as far "
-      "as we are concerned."},
-     123456}.
-
-reads(suite) -> [];
-reads(Conf) ->
-    ?line {Cps,_} = start_clients(w,Conf),
-    ?line read_loop(?iterations,0),
-    ?line stop_clients(Cps),
-    ok.
-
-read_loop(0,M) ->
-    ok;
-read_loop(N,M) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(0.5)),
-    M2 =
-	receive
-	    {Node,Count,{_,123456}} ->
-		?line setelement(Node,M,element(Node,M)+1);
-	    {Node,Count,Data} ->
-		?line exit({network_transmission_error,Data});
-	    {nodedown,Node} ->
-		?line test_server:format(1,"Node ~s went down",[Node]),
-		?line M;
-	    Other ->
-		?line M
-	after test_server:seconds(0.1) ->
-		?line io:format("No message!"),
-		?line M
-	end,
-    ?line test_server:timetrap_cancel(Dog),    
-    ?line M3 =
-	case N rem 100 of
-	    0 -> io:format("~p reads to go (~w msgs)",[N,M2]),
-		 {0,0,0};
-	    _ -> M2
-	  end,
-    ?line read_loop(N-1,M3).
-
-client(w,NodeNum,Pid,Seed) ->
-    random:seed(Seed,0,0),
-    receive
-	go -> ok
-    end,
-    client_write_loop(Pid,0,NodeNum,data());
-client(r,NodeNum,Pid,Seed) ->
-    random:seed(Seed,0,0),
-    receive
-	go -> ok
-    end,
-    client_read_loop(0).
-
-client_write_loop(Pid,N,NodeNum,Data) ->
-    test_server:sleep(random:uniform(20)),
-    Pid ! {NodeNum,N,Data},
-    client_write_loop(Pid,N+1,NodeNum,Data).
-
-writes(suite) -> [];
-writes(Conf) ->
-    ?line {Cps,{C1,C2,C3}} = start_clients(r,Conf),
-    ?line write_loop(2*?iterations,{C1,C2,C3},data()),
-    ?line stop_clients(Cps),
-    ok.
-
-write_loop(0,_,_) ->
-    ok;
-write_loop(N,Clients,Data) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(0.5)),
-    ?line Client = element(random:uniform(size(Clients)),Clients),
-    ?line Client ! {node(),N,Data},
-    ?line test_server:timetrap_cancel(Dog),
-    receive
-	{nodedown,Node} ->
-	    ?line test_server:format(1,"Node ~s went down",[Node])
-    after 0 ->
-	    ?line ok
-    end,
-    ?line case N rem 100 of
-	      0 -> io:format("~p writes to go",[N]);
-	      _ -> ok
-	  end,
-    ?line write_loop(N-1,Clients,Data).
-
-client_read_loop(N) ->
-    receive
-	{Node,Count,{_,123456}} ->
-	    ?line ok;
-	{Node,Count,Data} ->
-	    ?line io:format("~p(~p): transmission error from node ~p(~p): ~p",
-			    [node(),N,Node,Count,Data]);
-	Other ->
-	    ?line io:format("~p(~p): got a strange message: ~p",
-			    [node(),N,Other])
-    end,
-    client_read_loop(N+1).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
diff --git a/lib/test_server/src/things/mnesia_power_SUITE.erl b/lib/test_server/src/things/mnesia_power_SUITE.erl
deleted file mode 100644
index e9bc75e583..0000000000
--- a/lib/test_server/src/things/mnesia_power_SUITE.erl
+++ /dev/null
@@ -1,126 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. 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%
-%%
--module(mnesia_power_SUITE).
--compile([export_all]).
-%%-define(line_trace,1).
--include("test_server.hrl").
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all(suite) -> [run].
-
--define(iterations,3). %% nof power-off cycles to do before acceptance
--define(rows,8). %% nof database rows to use (not too big, please)
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--record(sum_table_1,{row,a,b,c,s}).
-
-run(suite) -> [];
-run(Config) ->
-    ?line mnesia:create_schema([node()]),
-    ?line mnesia:start(),
-    ?line mnesia:create_table([{name, sum_table_1}, {disc_copies,[node()]},
-			       {attributes,record_info(fields,sum_table_1)}]),
-    ?line run_test(Config,?iterations).
-
-run(Config,N) ->
-    ?line mnesia:start(),
-    ?line check_consistency(sum_table_1),
-    case N of
-	0 -> ?line ok;
-	N -> ?line run_test(Config,N)
-    end.
-    
-run_test(Config,N) ->
-    ?line Pid1a = start_manipulator(sum_table_1),
-    ?line Pid1b = start_manipulator(sum_table_1),
-    ?line Pid1c = start_manipulator(sum_table_1),
-    ?line test_server:resume_point(?MODULE,run,[Config,N-1]),
-    ?line test_server:format(1,"Manipulating data like crazy now, "
-		       "power off any time..."),
-    ?line test_server:sleep(infinity).
-
-start_manipulator(Table) ->
-    ?line spawn_link(?MODULE,manipulator_init,[Table]).
-
-manipulator_init(Table) ->
-    random:seed(4711,0,0),
-    manipulator(0,Table).
-
-manipulator(N,Table) ->
-    ?line Fun = 
-	fun() ->
-		?line Row = random:uniform(?rows),
-		?line A = random:uniform(100000),
-		?line B = random:uniform(100000),
-		?line C = random:uniform(100000),
-		?line Sum = A+B+C,
-		?line case mnesia:write(#sum_table_1
-					{row=Row,a=A,b=B,c=C,s=Sum}) of
-			  ok -> ok;
-			  Other ->
-			      ?line io:format("Trans failed: ~p\n",[Other])
-		      end
-	end,
-    ?line mnesia:transaction(Fun),
-    case mnesia:table_info(sum_table_1,size) of
-	0 -> exit(still_empty);
-	_ -> ok
-    end,
-    case N rem 2000 of
-	0 -> io:format("~p did ~p operations",[self(),N]),
-	     check_consistency(sum_table_1);
-	_ -> ok
-    end,
-    ?line manipulator(N+1,Table).
-
-check_consistency(Table) ->
-    io:format("Checking consistency of table ~p\n",[Table]),
-    All = mnesia:table_info(Table,wild_pattern),
-    ?line Fun =
-        fun() ->
-		mnesia:match_object(All)
-        end,
-  ?line case mnesia:transaction(Fun) of
-	    {atomic,Val} ->
-		check_consistency_rows(Val,0);
-	    Other ->
-		io:format("Trans failed: ~p\n",[Other]),
-		exit(failed),
-		check_consistency(Table)
-	  end.
-
-check_consistency_rows([#sum_table_1{a=A,b=B,c=C,s=Sum}|Rows],N) ->
-    ?line Sum=A+B+C,
-    ?line check_consistency_rows(Rows,N+1);
-check_consistency_rows([],N) ->
-    io:format("All ~p rows were consistent\n",[N]),
-    {ok,N};
-check_consistency_rows(Thing,N) ->
-    io:format("Mnesia transaction returned:\n~p\n",[Thing]),
-    exit({bad_format,Thing}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-				  
-    
-		
-			      
diff --git a/lib/test_server/src/things/random_kill_SUITE.erl b/lib/test_server/src/things/random_kill_SUITE.erl
deleted file mode 100644
index 917bc2b3d5..0000000000
--- a/lib/test_server/src/things/random_kill_SUITE.erl
+++ /dev/null
@@ -1,82 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. 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%
-%%
--module(random_kill_SUITE).
--compile([export_all]).
-%%-define(line_trace,1).
--include("test_server.hrl").
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all(suite) -> [run].
-
--define(iterations,25). %% Kill this many processes, 
-                        %% possibly with reboots in between
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-run(suite) -> [];
-run(Config) ->
-    registered(?iterations).
-
-registered(0) ->
-    ok;
-registered(N) ->
-    random:seed(3461*N,1159*N,351*N),
-    Pid = select_victim(registered),
-    test_server:resume_point(?MODULE,registered,[N-1]),
-    test_server:format("About to kill pid ~p (~p)\n~p",
-		       [Pid,process_info(Pid,registered_name),info(Pid)]),
-    %%exit(Pid,kill),
-    registered(N-1).
-
-info(Pid) ->
-    Rest0 = tl(pid_to_list(Pid)),
-    {P1,Rest1} = get_until($.,Rest0),
-    {P2,Rest2} = get_until($.,Rest1),
-    {P3,_}     = get_until($>,Rest2),
-    c:i(list_to_integer(P1),list_to_integer(P2),list_to_integer(P3)).
-
-get_until(Ch,L) ->
-    get_until(Ch,L,[]).
-get_until(Ch,[],Acc) ->
-    {lists:reverse(Acc),[]};
-get_until(Ch,[Ch|T],Acc) ->
-    {lists:reverse(Acc),T};
-get_until(Ch,[H|T],Acc) ->
-    get_until(Ch,T,[H|Acc]).
-
-select_victim(registered) ->
-    Pids =
-	lists:map(fun(Server)-> whereis(Server) end,registered()),
-    ImmunePids =
-	[self()|lists:map(fun(Job)-> element(2,Job) end,test_server:jobs())],
-    SuitablePids =
-	lists:filter(fun(Pid)-> case lists:member(Pid,ImmunePids) of
-				    true -> false;
-				    false -> true
-				end
-		     end, Pids),
-    Selected = random:uniform(length(SuitablePids)),
-    io:format("Selected ~p if ~p",[Selected,length(SuitablePids)]),
-    lists:nth(Selected,SuitablePids).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-					 
diff --git a/lib/test_server/src/things/soft.gs.txt b/lib/test_server/src/things/soft.gs.txt
deleted file mode 100644
index ec57884997..0000000000
--- a/lib/test_server/src/things/soft.gs.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-6> gs:start().
-RealTimeViolation, 478ms (after 1164 good)
-{1,<0.65.0>}
-RealTimeViolation, 352ms (after 0 good)
-RealTimeViolation, 492ms (after 0 good)
-RealTimeViolation, 166ms (after 0 good)
-RealTimeInfo, 18ms (after 7 good)
-RealTimeViolation, 115ms (after 13 good)
-7> application-specific initialization failed: couldn't connect to display ":0.0"
-RealTimeViolation, 20340ms (after 0 good)
-gs error: user backend died reason {port_handler,#Port,normal}
-   
-RealTimeInfo, 31ms (after 21 good)
-RealTimeInfo, 21ms (after 69 good)
-RealTimeInfo, 21ms (after 119 good)
-RealTimeInfo, 21ms (after 169 good)
diff --git a/lib/test_server/src/things/verify.erl b/lib/test_server/src/things/verify.erl
deleted file mode 100644
index b09d0fbda9..0000000000
--- a/lib/test_server/src/things/verify.erl
+++ /dev/null
@@ -1,200 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. 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%
-%%
--module(verify).
-
--export([dir/0, dir/1]).
-
-%% usage verify:dir()
-%% or    verify:dir(Dir)
-%% 
-%% runs tests on all files with the extension ".t1"
-%% creates an error log file verify.log in the directory where the
-%% tests were run
-
--import(lists, [reverse/1, foldl/3, map/2]).
-
-dir() ->
-    dir(".").
-
-dir(Dir) ->
-    case file:list_dir(Dir) of
-	{ok, Files} ->
-	    VFiles = collect_vers(Files, []),
-	    VFiles1 = map(fun(F) -> Dir ++ "/" ++ F end, VFiles),
-	    Nerrs = foldl(fun(F, Sum) -> 
-				  case file(F) of
-				      {file,_,had,N,errors} ->
-					  Sum + N;
-				      no_errors ->
-					  Sum;
-				      Other ->
-					  Sum + 1
-				  end
-			  end, 0, VFiles1),
-	    case Nerrs of
-		0 -> no_errors;
-		_ -> {dir,Dir,had,Nerrs,errors}
-	    end;
-	_ ->
-	    {error, cannot,list_dir, Dir}
-    end.
-
-collect_vers([H|T], L) ->
-    case reverse(H) of
-	[$1,$t,$.|T1] -> collect_vers(T, [reverse(T1)|L]);
-	_             -> collect_vers(T, L)
-    end;
-collect_vers([], L) ->
-    L.
-
-file(File) ->
-    case file:open(File ++ ".t1", read) of
-	{ok, S} ->
-	    io:format("Verifying: ~s\n", [File]),
-	    ErrFile = File ++ ".errs",
-	    {ok, E} = file:open(ErrFile, write),
-	    Bind0 = erl_eval:new_bindings(),
-	    NErrs = do(S, {E, File, Bind0, 0}, 1),
-	    file:close(S),
-	    file:close(E),
-	    case NErrs of
-		0 ->
-		    file:delete(ErrFile),
-		    no_errors;
-		_ ->
-		    {file,File,had,NErrs,errors}
-	    end;
-	_ ->
-	    error_in_opening_file
-    end.
-
-do(S, Env, Line) ->
-    R = io:scan_erl_exprs(S, '', Line),
-    do1(R, S, Env).
-
-do1({eof,_}, _, {_,_,_,NErrs}) ->
-    NErrs;
-do1({ok,Toks,Next}, S, Env0) ->
-    E1 = handle_toks(Toks, Next, Env0),
-    do(S, E1, Next);
-do1({error, {Line,Mod,Args}, Next}, S, E) ->
-    io:format("*** ~w ~p~n", [Line,Mod:format_error(Args)]),
-    E1 = add_error(E),
-    do(S, E1, Next).
-
-add_error({Stream, File, Bindings, N}) -> {Stream, File, Bindings, N+1}.
-
-handle_toks(Toks, Line, Env0) ->
-    %% io:format("Toks:~p\n", [Toks]).
-    case erl_parse:parse_exprs(Toks) of
-	{ok, Exprs} ->
-	    %% io:format("Got:~p\n", [Exprs]),
-	    eval(Exprs, Line, Env0);
-	{error, {LineNo, Mod, What}} ->
-	    Str = apply(Mod, format_error, [What]),
-	    io:format("*** Line:~w  ***~s\n", [LineNo, Str]),
-	    add_error(Env0);
-	Parse_error ->
-	    io:format("Parse Error:~p\n",[Parse_error]),
- 	    add_error(Env0)
-    end.
-
-forget([{var,_,Name}], B0) -> erl_eval:del_binding(Name, B0);
-forget([], _)              -> erl_eval:new_bindings().
-
-eval([{call,_,{atom,_,f}, Args}], _, {Stream, Bind0, Errs}) ->
-    Bind1 = forget(Args, Bind0),
-    {Stream, Bind1, Errs};
-eval(Exprs, Line, {Stream, File, Bind0, NErrs}) ->
-    %% io:format("Bindings >> ~p\n", [Bind0]),
-    %% io:format("Exprs >> ~p\n", [Exprs]),
-    case catch erl_eval:exprs(Exprs, Bind0) of
-	{'EXIT', Reason} ->
-	    out_both(Stream, "----------------------------------~n", []),
-	    out_both(Stream, "File:~s Error in:~s~n", [File, pp(Exprs)]),
-	    print_bindings(Stream, Exprs, Bind0),
-	    print_lhs(Stream, Exprs),
-	    out_both(Stream, '*** Rhs evaluated to:~p~n',[rhs(Exprs, Bind0)]),
-	    {Stream, File, Bind0, NErrs+1};
-	{value, _, Bind1} ->
-	    {Stream, File, Bind1, NErrs}
-    end.
-
-pp([H])   -> erl_pp:expr(H);
-pp([H|T]) -> [erl_pp:expr(H),$,|pp(T)];
-pp([])    -> [].
-
-print_bindings(E, Form, Bindings) ->
-    case varsin(Form) of
-	[] ->
-	    true;
-	Vars ->
-	    print_vars(E, Vars, Bindings)
-    end.
-
-print_vars(E, [Var|T], Bindings) ->
-    case erl_eval:binding(Var, Bindings) of
-	{value, Val} ->
-	    out_both(E, '~s = ~p\n',[Var, Val]);
-	unbound ->
-	    out_both(E, '~s *is unbound*\n', [Var])
-    end,
-    print_vars(E, T, Bindings);
-print_vars(_, [], _) ->
-    true.
-
-
-out_both(E, Format, Data) ->
-    io:format(Format, Data),
-    io:format(E, Format, Data).
-
-print_lhs(E, [{match, _, Lhs, Rhs}]) ->
-    %% io:format(">>>> here:~w\n",[Lhs]),
-    out_both(E, '*** Lhs was:~s\n',[erl_pp:expr(Lhs)]);
-print_lhs(E, _) ->
-    out_both(E, '** UNDEFINED **', []).
-
-
-rhs([{match, _, Lhs, Rhs}], Bindings) ->
-    case catch erl_eval:exprs([Rhs], Bindings) of
-	{value, Val, _} -> Val;
-	Other           ->  undefined()
-    end;
-rhs(_, _) ->
-    undefined().
-
-varsin(X) -> varsin(X, []).
-
-varsin({var,_,'_'}, L) ->
-    L;
-varsin({var,_,V}, L) ->
-    case lists:member(V, L) of
-	true  -> L;
-	false -> [V|L]
-    end;
-varsin([H|T], L) ->
-    varsin(T, varsin(H, L));
-varsin(T, L) when tuple(T) ->
-    varsin(tuple_to_list(T), L);
-varsin(_, L) ->
-    L.
-    
-undefined() ->
-    '** UNDEFINED **'.
diff --git a/lib/test_server/test/Makefile b/lib/test_server/test/Makefile
deleted file mode 100644
index 8eec940505..0000000000
--- a/lib/test_server/test/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2012. 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%
-#
-
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES= \
-	test_server_SUITE \
-	test_server_test_lib \
-	erl2html2_SUITE
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-INSTALL_PROGS= $(TARGET_FILES)
-
-EMAKEFILE=Emakefile
-COVERFILE=test_server.cover
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/test_server_test
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-ERL_MAKE_FLAGS += -pa $(ERL_TOP)/lib/test_server/ebin
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/test
-
-EBIN = .
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-.PHONY: make_emakefile
-
-make_emakefile:
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) \
-	'*_SUITE_make' > $(EMAKEFILE)
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\
-	>> $(EMAKEFILE)
-
-tests debug opt: make_emakefile
-	erl $(ERL_MAKE_FLAGS) -make
-
-clean:
-	rm -f $(EMAKEFILE)
-	rm -f $(TARGET_FILES) $(GEN_FILES)
-	rm -f core
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-
-release_tests_spec: make_emakefile
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(COVERFILE) "$(RELSYSDIR)"
-	$(INSTALL_DATA) test_server_test_lib.hrl test_server.spec test_server.cover "$(RELSYSDIR)"
-	chmod -R u+w "$(RELSYSDIR)"
-	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
-
-release_docs_spec:
diff --git a/lib/test_server/test/test_server.cover b/lib/test_server/test/test_server.cover
deleted file mode 100644
index 052415377d..0000000000
--- a/lib/test_server/test/test_server.cover
+++ /dev/null
@@ -1 +0,0 @@
-{incl_app,test_server,details}.
diff --git a/lib/test_server/test/test_server.spec b/lib/test_server/test/test_server.spec
deleted file mode 100644
index a3b4d01d08..0000000000
--- a/lib/test_server/test/test_server.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites, "../test_server_test", all}.
diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk
deleted file mode 100644
index 3a3815c557..0000000000
--- a/lib/test_server/vsn.mk
+++ /dev/null
@@ -1 +0,0 @@
-TEST_SERVER_VSN = 3.9.1
diff --git a/lib/tools/Makefile b/lib/tools/Makefile
index 2699ffab51..fef33743c0 100644
--- a/lib/tools/Makefile
+++ b/lib/tools/Makefile
@@ -24,7 +24,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 # Macros
 # ----------------------------------------------------
 
-SUB_DIRECTORIES = c_src src doc/src examples priv emacs
+SUB_DIRECTORIES = c_src src doc/src examples emacs
 
 include vsn.mk
 VSN = $(TOOLS_VSN)
diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
index 66bba229f6..e8bce149b1 100644
--- a/lib/tools/c_src/Makefile.in
+++ b/lib/tools/c_src/Makefile.in
@@ -97,11 +97,8 @@ DRIVERS=
 
 ifneq ($(strip $(ETHR_LIB_NAME)),)
 # Need ethread package for emem
-ifneq ($(findstring ose,$(TARGET)),ose)
-# Do not build on OSE
 PROGS += $(BIN_DIR)/emem$(TYPEMARKER)@EXEEXT@
 endif
-endif
 
 EMEM_OBJ_DIR=$(OBJ_DIR)/emem
 CREATE_DIRS += $(EMEM_OBJ_DIR)
@@ -152,12 +149,7 @@ ERTS_LIB = $(ERL_TOP/erts/lib_src/obj/$(TARGET)/$(TYPE)/MADE
 
 _create_dirs := $(shell mkdir -p $(CREATE_DIRS))
 
-ifneq ($(findstring ose,$(TARGET)),ose)
 all: $(PROGS) $(DRIVERS)
-else
-# Do not build dynamic files on OSE
-all:
-endif
 
 $(ERTS_LIB):
 	$(make_verbose)cd $(ERL_TOP)/erts/lib_src && $(MAKE) $(TYPE)
diff --git a/lib/tools/doc/src/cover_chapter.xml b/lib/tools/doc/src/cover_chapter.xml
index 2f7f8d8083..c3f1570477 100644
--- a/lib/tools/doc/src/cover_chapter.xml
+++ b/lib/tools/doc/src/cover_chapter.xml
@@ -451,48 +451,5 @@ ok
       <p>When Cover is stopped, all Cover compiled modules are unloaded.</p>
     </section>
   </section>
-
-  <section>
-    <title>Using the Web Based User Interface to Cover</title>
-
-    <section>
-      <title>Introduction</title>
-      <p>To ease the use of Cover there is a web based user interface
-        to Cover called WebCover. WebCover is designed to be started
-        and used via WebTool. It is possible to Cover compile Erlang
-        modules and to generate printable Cover and Call analyses via
-        the web based user interface.</p>
-    </section>
-
-    <section>
-      <title>Start the Web Based User Interface to Cover</title>
-      <p>To start WebCover you can either start WebTool, point a
-        browser to the start page of WebTool and start WebCover from
-        there, or you can use the <c>start_webtool</c> script to start
-        Webtool, WebCover and a browser. See WebTool documentation for
-        further information.</p>
-      <p>Currently WebCover is only compatible
-        with Internet Explorer and Netscape Navigator 4.0 and higher.</p>
-    </section>
-
-    <section>
-      <title>Navigating WebCover</title>
-      <p>From the menu in the lefthand frame you can select the
-        <c>Nodes</c>, <c>Compile</c>, <c>Import</c> or <c>Result</c>
-        page.</p>
-      <p>From the <c>Nodes</c> page you can add remote nodes to
-        participate in the coverage analysis. Coverage data from all
-        involved nodes will then be merged during analysis.</p>
-      <p>From the <c>Compile</c> page you can Cover compile <c>.erl</c>
-        or <c>.beam</c> files.</p>
-      <p>From the <c>Import</c> page you can import coverage data from
-        a previous analysis. Imported data will then be merged with
-        the current coverage data. <em>Note</em> that it is only possible to
-        import files with the extension <c>.coverdata</c>.</p>
-      <p>From the <c>Result</c> page you can analyse, reset or export
-        coverage data.</p>
-      <p>Please follow the instructions on each page.</p>
-    </section>
-  </section>
 </chapter>
 
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index 985207a39b..c62b0607ee 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -31,6 +31,32 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
+<section><title>Tools 2.8.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    <c>cover:compile_beam/1</c> and
+	    <c>cover:compile_beam_directory/1,2</c> crashed when
+	    trying to compile a beam file without a <c>'file'</c>
+	    attribute. This has been corrected and an error is
+	    returned instead.</p>
+          <p>
+	    Thanks to Louis-Philippe Gauthier for reporting this bug.</p>
+          <p>
+	    Own Id: OTP-13200</p>
+        </item>
+        <item>
+	    <p>Fix a bit string comprehension bug in Cover. </p>
+          <p>
+	    Own Id: OTP-13277 Aux Id: PR 856 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 2.8.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/tools/emacs/erlang-skels-old.el b/lib/tools/emacs/erlang-skels-old.el
index c271cce3cb..d0b2bfd97f 100644
--- a/lib/tools/emacs/erlang-skels-old.el
+++ b/lib/tools/emacs/erlang-skels-old.el
@@ -816,7 +816,7 @@ Please see the function `tempo-define-template'.")
    "%% Note: This directive should only be used in test suites." n
     "-compile(export_all)." n n
 
-    "-include_lib(\"test_server/include/test_server.hrl\")." n n
+    "-include_lib(\"common_test/include/ct.hrl\")." n n
 
     (erlang-skel-separator 2)
     "%% TEST SERVER CALLBACK FUNCTIONS" n
diff --git a/lib/tools/emacs/erlang-skels.el b/lib/tools/emacs/erlang-skels.el
index 6880ec733c..ac37ff2ee5 100644
--- a/lib/tools/emacs/erlang-skels.el
+++ b/lib/tools/emacs/erlang-skels.el
@@ -1070,7 +1070,7 @@ Please see the function `tempo-define-template'.")
    "%% Note: This directive should only be used in test suites." n
     "-compile(export_all)." n n
 
-    "-include_lib(\"test_server/include/test_server.hrl\")." n n
+    "-include_lib(\"common_test/include/ct.hrl\")." n n
 
     (erlang-skel-separator-start 2)
     "%% TEST SERVER CALLBACK FUNCTIONS" n
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 466bf139b9..2ff14dea02 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -897,6 +897,7 @@ resulting regexp is surrounded by \\_< and \\_>."
       "get_module_info"
       "get_stacktrace"
       "hash"
+      "has_prepared_code_on_load"
       "hibernate"
       "insert_element"
       "is_builtin"
diff --git a/lib/gs/contribs/ebin/.gitignore b/lib/tools/priv/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/gs/contribs/ebin/.gitignore
+++ b/lib/tools/priv/.gitignore
diff --git a/lib/tools/priv/Makefile b/lib/tools/priv/Makefile
deleted file mode 100644
index aa4aaa2fc8..0000000000
--- a/lib/tools/priv/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# ``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.
-# 
-# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-# AB. All Rights Reserved.''
-# 
-#     $Id$
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN = $(TOOLS_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ---------------------------------------------------- 
-
-HTDOCS_FILES =  index.html
-
-TOOL_FILES = cover.tool
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: 
-
-clean:
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR)  "$(RELSYSDIR)/priv"
-	$(INSTALL_DATA) $(HTDOCS_FILES) "$(RELSYSDIR)/priv"
-	$(INSTALL_DATA) $(TOOL_FILES) "$(RELSYSDIR)/priv"
-
-release_docs_spec:
-
-
-
diff --git a/lib/tools/priv/cover.tool b/lib/tools/priv/cover.tool
deleted file mode 100644
index 9e72f89ff4..0000000000
--- a/lib/tools/priv/cover.tool
+++ /dev/null
@@ -1,2 +0,0 @@
-{version,"1.2"}.
-[{config_func,{cover_web,configData,[]}}].
diff --git a/lib/tools/priv/index.html b/lib/tools/priv/index.html
deleted file mode 100644
index 6b60ef5d0a..0000000000
--- a/lib/tools/priv/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Erlang webb tools </TITLE>
-</HEAD>
-<FRAMESET COLS="250,*">
-<FRAME NAME="menu" SRC="/webcover/erl/cover_web/menu_frame">
-<FRAME NAME="main" SRC="/webcover/erl/cover_web/compile_frame">
-</FRAMESET>
-</HTML>
-
diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
index 9fcfb79628..7301ff856a 100644
--- a/lib/tools/src/Makefile
+++ b/lib/tools/src/Makefile
@@ -37,7 +37,6 @@ RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(VSN)
 
 MODULES= \
 	cover                \
-	cover_web	     \
 	eprof                \
 	fprof                \
 	cprof                \
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 0ae5c7978d..87de31919f 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -20,9 +20,7 @@
 -module(cover).
 
 %%
-%% This module implements the Erlang coverage tool. The module named
-%% cover_web implements a user interface for the coverage tool to run
-%% under webtool.
+%% This module implements the Erlang coverage tool.
 %% 
 %% ARCHITECTURE
 %% The coverage tool consists of one process on each node involved in
@@ -2004,9 +2002,7 @@ munge_expr({lc,Line,Expr,Qs}, Vars) ->
     {MungedQs, Vars3} = munge_qualifiers(Qs, Vars2),
     {{lc,Line,MungedExpr,MungedQs}, Vars3};
 munge_expr({bc,Line,Expr,Qs}, Vars) ->
-    {bin,BLine,[{bin_element,EL,Val,Sz,TSL}|Es]} = Expr,
-    Expr2 = {bin,BLine,[{bin_element,EL,?BLOCK1(Val),Sz,TSL}|Es]},
-    {MungedExpr,Vars2} = munge_expr(Expr2, Vars),
+    {MungedExpr,Vars2} = munge_expr(?BLOCK1(Expr), Vars),
     {MungedQs, Vars3} = munge_qualifiers(Qs, Vars2),
     {{bc,Line,MungedExpr,MungedQs}, Vars3};
 munge_expr({block,Line,Body}, Vars) ->
diff --git a/lib/tools/src/cover_web.erl b/lib/tools/src/cover_web.erl
deleted file mode 100644
index ae8b3f25cf..0000000000
--- a/lib/tools/src/cover_web.erl
+++ /dev/null
@@ -1,1185 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. 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%
-%%                                                                        
-
--module(cover_web).
--author('[email protected]').
--behaviour(gen_server).
-
-%%Export of configuration function
--export([configData/0]).
-%% External exports
--export([init/1, handle_call/3, handle_cast/2, handle_info/2, 
-	 terminate/2, code_change/3]).
-
--export([start_link/0,start/0,stop/0]).
--export([menu_frame/2,nodes_frame/2,import_frame/2,
-	 compile_frame/2,result_frame/2]).
--export([list_dir/2,compile/2,add_node/2,remove_node/2,result/2,
-	 calls/2,coverage/2,import/2]).
-
--record(state,{dir}).
-
--include_lib("kernel/include/file.hrl").
-
-%% Timeouts
--define(DEFAULT_TIME,10000).
--define(MAX_COMPILE_TIME,60000).
--define(MAX_ANALYSE_TIME,30000).
-
-%% Colors
--define(INFO_BG_COLOR,"#C0C0EA").
-
-%%%----------------------------------------------------------------------
-%%% API - called from erlang shell
-%%%----------------------------------------------------------------------
-%% Start webtool and webcover from erlang shell
-start() ->
-    webtool:start(),
-    webtool:start_tools([],"app=webcover"),
-    ok.
-
-%% Stop webtool and webcover from erlang shell
-stop() ->
-    webtool:stop_tools([],"app=webcover"),
-    webtool:stop().
-
-
-
-%%%----------------------------------------------------------------------
-%%% API - called from webtool
-%%%----------------------------------------------------------------------
-start_link() ->
-    gen_server:start_link({local, webcover_server},cover_web, [], []).
-
-
-nodes_frame(Env,Input)->
-    call({nodes_frame,Env,Input}).
-
-add_node(Env,Input)->
-    call({add_node,Env,Input}).
-
-remove_node(Env,Input)->
-    call({remove_node,Env,Input}).
-
-compile_frame(Env,Input)->
-    call({compile_frame,Env,Input}).
-
-list_dir(Env,Input) ->
-    call({list_dir,Env,Input}).
-
-compile(Env,Input)->
-    call({compile,Env,Input},?MAX_COMPILE_TIME).
-
-result_frame(Env,Input)->
-    call({result_frame,Env,Input}).
-
-result(Env,Input) ->
-    call({result,Env,Input},?MAX_ANALYSE_TIME).
-
-calls(Env,Input) ->
-    call({calls,Env,Input}).
-
-coverage(Env,Input) ->
-    call({coverage,Env,Input}).
-
-import_frame(Env,Input)->
-    call({import_frame,Env,Input}).
-
-import(Env,Input)->
-    call({import,Env,Input}).
-
-menu_frame(Env,Input)->
-    call({menu_frame,Env,Input}).
-
-call(Msg) ->
-    call(Msg,?DEFAULT_TIME).
-call(Msg,Time) ->
-    gen_server:call(webcover_server,Msg,Time).
-    
-			    
-
-configData()->
-    {webcover,[{web_data,{"WebCover","/webcover"}},
-               {alias,{"/webcover",code:priv_dir(tools)}},
-	       {alias,{erl_alias,"/webcover/erl",[cover_web]}},
-	       {start,{child,{{local,webcover_server},
-			      {cover_web,start_link,[]},
-			      permanent,100,worker,[cover_web]}}}
-	      ]}.
-
-
-%%%----------------------------------------------------------------------
-%%% Callback functions from gen_server
-%%%----------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% Func: init/1
-%% Returns: {ok, State}          |
-%%          {ok, State, Timeout} |
-%%          ignore               |
-%%          {stop, Reason}
-%%----------------------------------------------------------------------
-init([]) ->
-    cover:start(),
-    CS = whereis(cover_server),
-    link(CS),
-    GL = spawn_link(fun group_leader_proc/0),
-    group_leader(GL,CS),
-
-    %% Must trap exists in order to have terminate/2 executed when
-    %% crashing because of a linked process crash.
-    process_flag(trap_exit,true),
-    {ok,Cwd} = file:get_cwd(),
-    {ok, #state{dir=Cwd}}.
-
-group_leader_proc() ->
-    register(cover_group_leader_proc,self()),
-    group_leader_loop([]).
-group_leader_loop(Warnings) ->
-    receive
-	{io_request,From,ReplyAs,{put_chars,io_lib,Func,[Format,Args]}} ->
-	    Msg = (catch io_lib:Func(Format,Args)),
-	    From ! {io_reply,ReplyAs,ok},
-	    case lists:member(Msg,Warnings) of
-		true -> group_leader_loop(Warnings);
-		false -> group_leader_loop([Msg|Warnings])
-	    end;
-	{io_request,From,ReplyAs,{put_chars,_Encoding,io_lib,Func,[Format,Args]}} ->
-	    Msg = (catch io_lib:Func(Format,Args)),
-	    From ! {io_reply,ReplyAs,ok},
-	    case lists:member(Msg,Warnings) of
-		true -> group_leader_loop(Warnings);
-		false -> group_leader_loop([Msg|Warnings])
-	    end;
-	IoReq when element(1,IoReq)=:= io_request ->
-	    group_leader() ! IoReq,
-	    group_leader_loop(Warnings);
-	{From,get_warnings} ->
-	    Warnings1 = 
-		receive 
-		    {io_request,From,ReplyAs,
-		     {put_chars,io_lib,Func,[Format,Args]}} ->
-			Msg = (catch io_lib:Func(Format,Args)),
-			From ! {io_reply,ReplyAs,ok},
-			case lists:member(Msg,Warnings) of
-			    true -> Warnings;
-			    false -> [Msg|Warnings]
-			end
-		after 0 ->
-			Warnings
-		end,
-	    From ! {warnings,Warnings1},
-	    group_leader_loop([])
-    end.
-
-%%----------------------------------------------------------------------
-%% Func: handle_call/3
-%% Returns: {reply, Reply, State}          |
-%%          {reply, Reply, State, Timeout} |
-%%          {noreply, State}               |
-%%          {noreply, State, Timeout}      |
-%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-handle_call({nodes_frame,_Env,_Input},_From,State)->
-    {reply,nodes_frame1(),State};
-
-handle_call({add_node,_Env,Input},_From,State)->
-    {reply,do_add_node(Input),State};
-
-handle_call({remove_node,_Env,Input},_From,State)->
-    {reply,do_remove_node(Input),State};
-
-handle_call({compile_frame,_Env,_Input},_From,State)->
-    {reply,compile_frame1(State#state.dir),State};
-
-handle_call({list_dir,_Env,Input},_From,State)->
-    Dir = get_input_data(Input,"path"),
-    case filelib:is_dir(Dir) of
-	true ->
-	    {reply,compile_frame1(Dir),State#state{dir=Dir}};
-	false ->
-	    Err = Dir ++ " is not a directory",
-	    {reply,compile_frame1(State#state.dir,Err),State}
-    end;
-handle_call({compile,_Env,Input},_From,State)->
-    {reply,do_compile(Input,State#state.dir),State};
-
-handle_call({result_frame,_Env,_Input},_From,State)->
-    {reply,result_frame1(),State};
-
-handle_call({result,_Env,Input},_From,State)->
-    {reply,handle_result(Input),State};
-
-handle_call({calls,_Env,Input},_From,State)->
-    {reply,call_page(Input),State};
-
-handle_call({coverage,_Env,Input},_From,State)->
-    {reply,coverage_page(Input),State};
-
-handle_call({import_frame,_Env,_Input},_From,State)->
-    {ok,Cwd} = file:get_cwd(),
-    {reply,import_frame1(Cwd),State};
-
-handle_call({import,_Env,Input},_From,State)->
-    {reply,do_import(Input),State};
-
-handle_call({menu_frame,_Env,_Input},_From,State)->
-    {reply,menu_frame1(),State};
-
-handle_call(_Request, _From, State) ->
-    Reply = bad_request,
-    {reply, Reply, State}.
-
-
-%%----------------------------------------------------------------------
-%% Func: handle_cast/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-handle_cast(_Msg, State) ->
-    {noreply, State}.
-
-%%----------------------------------------------------------------------
-%% Func: handle_info/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-handle_info({'EXIT',_Pid,Reason}, State) ->
-    {stop, Reason, State}.
-
-%%----------------------------------------------------------------------
-%% Func: terminate/2
-%% Purpose: Shutdown the server
-%% Returns: any (ignored by gen_server)
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    cover:stop(),
-    ok.
-
-%%--------------------------------------------------------------------
-%% Func: code_change/3
-%% Purpose: Convert process state when code is changed
-%% Returns: {ok, NewState}
-%%--------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%%----------------------------------------------------------------------
-%%% Internal functions
-%%%----------------------------------------------------------------------
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%% The functions that creates the whole pages by collecting all the   %%
-%% neccessary data for each page. These functions are the public      %%
-%% interface.                                                         %%
-%%                                                                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%----------------------------------------------------------------------
-%% Returns the page to the left frame
-%%----------------------------------------------------------------------
-menu_frame1()->
-    [header(),html_header(""),menu_body(),html_end()].
-
-%%----------------------------------------------------------------------
-%% Creates the page where the user can add and remove nodes
-%%----------------------------------------------------------------------
-
-nodes_frame1()->
-    nodes_frame1([]).
-nodes_frame1(Err)->
-    [header(),html_header("Add/remove nodes"),nodes_body(Err),html_end()].
-
-%%----------------------------------------------------------------------
-%% Creates the page where the user can cover compile modules
-%%----------------------------------------------------------------------
-
-compile_frame1(Dir)->
-    compile_frame1(Dir,[]).
-compile_frame1(Dir,Err) ->
-    [header(),html_header("Cover compile"),compile_body(Dir,Err),html_end()].
-
-%%----------------------------------------------------------------------
-%% Creates the page where the user can handle results
-%%----------------------------------------------------------------------
-
-result_frame1()->
-    result_frame1([]).
-result_frame1(Err) ->
-    [header(),html_header("Show cover results"),result_body(Err),html_end()].
-
-%%----------------------------------------------------------------------
-%%The beginning of the page that clear the cover information on a cover
-%%compiled module
-%%----------------------------------------------------------------------
-call_page(Input)->
-    [header(),html_header("Code coverage"),call_result(Input),html_end()].
-
-coverage_page(Input)->
-    [header(),html_header("Code coverage"),coverage_result(Input),html_end()].
-
-%%----------------------------------------------------------------------
-%% Creates the page where the user an import files
-%%----------------------------------------------------------------------
-import_frame1(Dir) ->
-    import_frame1(Dir,"").
-import_frame1(Dir,Err) ->
-    [header(),html_header("Import coverdata"),import_body(Dir,Err),html_end()].
-    
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%% The functions that build the body of the menu frame                %%
-%%                                                                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-menu_body() ->
-    Nodes = cover:which_nodes(),
-    Modules = cover:modules(),
-    Imported = cover:imported(),
-    ["<A HREF=\"./nodes_frame\" TARGET=\"main\">Nodes</A><BR>\n",
-     "<A HREF=\"./compile_frame\" TARGET=\"main\">Compile</A><BR>\n",
-     "<A HREF=\"./import_frame\" TARGET=\"main\">Import</A><BR>\n",
-     "<A HREF=\"./result_frame\" TARGET=\"main\">Result</A>\n",
-     "<P><B>Nodes:</B>\n",
-     "<UL>\n",
-     lists:map(fun(N) -> "<LI>"++atom_to_list(N)++"</LI>\n" end,[node()|Nodes]),
-     "</UL>\n",
-     "<P><B>Compiled modules:</B>\n",
-     "<UL>\n",
-     lists:map(fun(M) -> "<LI>"++atom_to_list(M)++"</LI>\n" end,Modules),
-     "</UL>\n",
-     "<P><B>Imported files:</B>\n",
-     "<UL>\n",
-     "<FONT SIZE=-1>\n",
-     lists:map(fun(F) -> 
-		       Short = filename:basename(F),
-		       "<LI TITLE=\""++F++"\">"++Short++"</LI>\n" end,Imported),
-     "</FONT>\n",
-     "</UL>\n"].
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%% The functions that build the body of the nodes frame               %%
-%%                                                                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-nodes_body(Err) ->
-    CN = cover:which_nodes(),
-    Fun = fun(N) -> 
-		  NStr = atom_to_list(N),
-		  ["<OPTION VALUE=",NStr,
-		   " onClick=\"node.value=selected_node.value\">",NStr,
-		   "</OPTION>\n"] 
-	  end,
-    AllNodes = lists:append(lists:map(Fun,nodes()--CN)),
-    CoverNodes = lists:append(lists:map(Fun,CN)),
-
-    [reload_menu_script(Err),
-     "<H1 ALIGN=center>Nodes</H1>\n",
-     "<TABLE BORDER=0 WIDTH=600 ALIGN=center>\n",     
-     "<TR><TD BGCOLOR=",?INFO_BG_COLOR," COLSPAN=2>\n",
-     "<P>You can run cover over several nodes simultaneously. Coverage data\n",
-     "from all involved nodes will be merged during analysis.\n",
-     "<P>Select or enter node names to add or remove here.\n",
-     "</TD></TR>\n",
-     "<TR><TD COLSPAN=2><BR><BR></TD></TR>\n",
-     "<FORM ACTION=\"./add_node\" NAME=add_node>\n",
-     "<TR><TD VALIGN=top>Add node:</TD>\n",
-     "<TD><INPUT TYPE=text NAME=\"node\" SIZE=40 >",
-     "<INPUT TYPE=submit\n",
-     " onClick=\"if(!node.value){node.value=selected_node.value};\" VALUE=Add>"
-     "<BR><SELECT NAME=selected_node TITLE=\"Select node\">\n",
-     AllNodes ++
-     "</SELECT>\n",
-     "</TD></TR>\n"
-     "</FORM>\n",
-     "<TR><TD COLSPAN=2><BR><BR></TD></TR>\n",
-     "<FORM ACTION=\"./remove_node\" NAME=remove_node>\n",
-     "<TR><TD>Remove node:</TD>\n", 
-     "<TD><SELECT NAME=node TITLE=\"Select node\">\n",
-     CoverNodes ++
-     "</SELECT>\n",
-     "<INPUT TYPE=submit VALUE=Remove>"
-     "</TD></TR>\n",
-     "</FORM>",
-     "</TABLE>"].
-          
-
-do_add_node(Input) ->
-    NodeStr = get_input_data(Input, "node"),
-    Node = list_to_atom(NodeStr),
-    case net_adm:ping(Node) of
-	pong ->
-	    cover:start(Node),
-	    nodes_frame1();
-	pang ->
-	    nodes_frame1("Node \\\'" ++ NodeStr ++ "\\\' is not alive")
-    end.
-
-do_remove_node(Input) ->
-    Node = list_to_atom(get_input_data(Input, "node")),
-    cover:stop(Node),
-    nodes_frame1().
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                     %
-% The functions that is used when the user wants to compile something %
-%                                                                     %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-compile_body(Dir,Err) ->
-    Erls = filelib:wildcard(filename:join(Dir,"*.erl")),
-    Beams = filelib:wildcard(filename:join(Dir,"*.beam")),
-    
-    [reload_menu_script(Err),
-     "<H1 ALIGN=center>Compile</H1>\n",
-     "<TABLE WIDTH=600 ALIGN=center BORDER=0>\n",
-     "<TR><TD COLSPAN=3 BGCOLOR=",?INFO_BG_COLOR,">\n",
-     "Each module which shall be part of the cover analysis must be prepared\n",
-     "or 'cover compiled'. On this page you can select .erl files and/or\n",
-     ".beam files to include in the analysis. If you select a .erl file it\n",
-     "will first be compiled with the Erlang compiler and then prepared for\n",
-     "coverage analysis. If you select a .beam file it will be prepared for\n",
-     "coverage analysis directly.\n",
-     "</TD></TR>\n",
-     "<FORM ACTION=\"./list_dir\" NAME=list_dir>\n",
-     "<TR><TD WIDTH=30% BGCOLOR=",?INFO_BG_COLOR," ROWSPAN=2>\n",
-     "To list a different directory, enter the directory name here.\n",
-     "</TD>\n",
-     "<TH COLSPAN=2><BR>List directory:<BR></TH>\n",
-     "</TR>\n",
-     "<TR><TD ALIGN=center COLSPAN=2>\n",
-     "<INPUT TYPE=text NAME=\"path\" SIZE=40 VALUE=",Dir,">",
-     "<INPUT TYPE=submit VALUE=Ok>",
-     "<BR><BR></TD></TR>\n",
-     "</FORM>\n",
-     "<FORM ACTION=\"./compile\" NAME=compile_selection>\n",
-     "<TR><TD BGCOLOR=",?INFO_BG_COLOR," ROWSPAN=2>\n",
-     "<P>Select one or more .erl or .beam files to prepare for coverage\n"
-     "analysis, and click the \"Compile\" button.\n",
-     "<P>To reload the original file after coverage analysis is complete,\n"
-     "select one or more files and click the \"Uncompile\" button, or\n",
-     "simply click the \"Uncompile all\" button to reload all originals.\n"
-     "</TD>\n",
-     "<TH>.erl files</TH><TH>.beam files</TH></TR>\n",
-     "<TR><TD ALIGN=center VALIGN=top>\n",
-     "<SELECT NAME=erl TITLE=\"Select .erl files to compile\" MULTIPLE=true",
-     " SIZE=15>\n",
-     list_modules(Erls) ++
-     "</SELECT></TD>\n",
-     "<TD ALIGN=center VALIGN=top>\n",
-     "<SELECT NAME=beam TITLE=\"Select .beam files to compile\"MULTIPLE=true",
-     " SIZE=15>\n",
-     list_modules(Beams) ++
-     "</SELECT></TD></TR>\n"
-     "<TR><TD BGCOLOR=",?INFO_BG_COLOR," ROWSPAN=2>\n",
-     "Compile options are only needed for .erl files. The options must be\n"
-     "given e.g. like this: \n"
-     "<FONT SIZE=-1>[{i,\"/my/path/include\"},{i,\"/other/path/\"}]</FONT>\n"
-     "</TD>\n",
-     "<TH COLSPAN=2><BR>Compile options:<BR></TH>\n",
-     "</TR>\n",
-     "<TR><TD COLSPAN=2 ALIGN=center>\n",
-     "<INPUT TYPE=text NAME=\"options\" SIZE=40>\n",
-     "<INPUT TYPE=hidden NAME=\"action\"></TD></TR>\n",
-     "<TR><TD></TD><TD ALIGN=center COLSPAN=2>\n",
-     "<INPUT TYPE=submit onClick=\"action.value=\'compile\';\"VALUE=Compile>",
-     "<INPUT TYPE=submit onClick=\"action.value=\'uncompile\';\" ",
-     "VALUE=Uncompile>",
-     "<INPUT TYPE=submit onClick=\"action.value=\'uncompile_all\';\" ",
-     "VALUE=\"Uncompile all\">",
-     "<BR><INPUT TYPE=reset VALUE=\"Reset form\"></TD></TR>\n",
-     "</FORM>\n",
-     "</TABLE>\n"].
-
-list_modules([File|Files]) ->
-    Mod = filename:basename(File),
-    ["<OPTION VALUE=",File," onDblClick=\"action.value=\'compile\';submit();\">",
-     Mod,"</OPTION>\n" | list_modules(Files)];
-list_modules([]) ->
-    [].
-
-do_compile(Input,Dir) ->
-    {Erls,Beams,Opts,Action} = get_compile_input(parse(Input),[],[]),
-    Errs = 
-	case Action of
-	    "compile" ->
-		do_compile(Erls,Beams,Opts,[]);
-	    "uncompile" ->
-		do_uncompile(Erls++Beams);
-	    "uncompile_all" ->
-		do_uncompile(cover:modules())
-	end,
-    compile_frame1(Dir,Errs).
-
-get_compile_input([{"erl",File}|Input],Erl,Beam) ->
-    get_compile_input(Input,[File|Erl],Beam);
-get_compile_input([{"beam",File}|Input],Erl,Beam) ->
-    get_compile_input(Input,Erl,[File|Beam]);
-get_compile_input([{"options",Opts0},{"action",Action}],Erl,Beam) ->
-    Opts = parse_options(Opts0),
-    {Erl,Beam,Opts,Action}.
-
-do_compile([Erl|Erls],Beams,Opts,Errs) ->
-    case cover:compile_module(Erl,Opts) of
-	{ok,_} ->
-	    do_compile(Erls,Beams,Opts,Errs);
-	{error,File} ->
-	    do_compile(Erls,Beams,Opts,["\\n"++File|Errs])
-    end;
-do_compile([],[Beam|Beams],Opts,Errs) ->
-    case cover:compile_beam(Beam) of
-	{ok,_} ->
-	    do_compile([],Beams,Opts,Errs);
-	{error,{no_abstract_code,File}} ->
-	    do_compile([],Beams,Opts,["\\n"++File++" (no_abstract_code)"|Errs])
-    end;
-do_compile([],[],_,[]) ->
-    [];
-do_compile([],[],_,Errs) ->
-    "Compilation failed for the following files:" ++ Errs.
-
-parse_options(Options)->
-    case erl_scan:string(Options ++".") of
-	{ok,Tokens,_Line} ->
-	    case erl_parse:parse_exprs(Tokens) of
-		{ok,X}->
-		    case lists:map(fun erl_parse:normalise/1, X) of
-			[List] when is_list(List) -> List;
-			List -> List
-		    end;
-		_ ->
-		    []
-	    end;
-	_ ->
-	    []
-    end.
-	    
-
-do_uncompile(Files) ->
-    lists:foreach(
-      fun(File) ->
-	      Module = 
-		  if is_atom(File) -> 
-			  File;
-		     true -> 
-			  ModStr = filename:basename(filename:rootname(File)),
-			  list_to_atom(ModStr)
-		  end,
-	      case code:which(Module) of
-		  cover_compiled ->
-		      code:purge(Module),
-		      case code:load_file(Module) of
-			  {module, Module} ->
-			      ok;
-			  {error, _Reason2} ->
-			      code:delete(Module)
-		      end;
-		  _ ->
-		      ok
-	      end
-      end,
-      Files),
-    [].
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                     %
-% The functions that builds the body of the page for coverage analysis%
-% 		                                                      %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-result_body(Err) ->
-    [reload_menu_script(Err),
-     "<H1 ALIGN=center>Result</H1>\n",
-     "<TABLE BORDER=0 WIDTH=600 ALIGN=center>\n",
-     "<TR><TD BGCOLOR=",?INFO_BG_COLOR,">\n",
-     "<P>After executing all your tests you can view the result of the\n",
-     "coverage analysis here. For each module you can\n",
-     "<DL>\n",
-     "<DT><B>Analyse to file</B></DT>\n",
-     "<DD>The source code of the module is shown with the number of calls\n",
-     "to each line stated in the left margin. Lines which are never called\n",
-     "are colored red.</DD>\n",
-     "<DT><B>Analyse coverage</B></DT>\n",
-     "<DD>Show the number of covered and uncovered lines in the module.</DD>\n",
-     "<DT><B>Analyse calls</B></DT>\n",
-     "<DD>Show the number of calls in the module.</DD>\n",
-     "<DT><B>Reset module</B></DT>\n",
-     "<DD>Delete all coverage data for the module.</DD>\n",
-     "<DT><B>Export module</B></DT>\n",
-     "<DD>Write all coverage data for the module to a file. The data can\n",
-     "later be imported from the \"Import\" page.</DD>\n",
-     "</DL>\n",
-     "<P>You can also reset or export data for all modules with the\n",
-     "<B>Reset all</B> and <B>Export all</B> actions respectively. For these\n",
-     "two actions there is no need to select a module.\n",
-     "<P>Select module and action from the drop down menus below, and click\n",
-     "the \"Execute\" button.\n",
-     "</TD></TR>\n",
-     "<TR><TD><BR><BR>\n",
-     result_selections(),
-     "</TD></TR></TABLE>"].
-
-result_selections() ->
-    ModList = filter_modlist(cover:modules()++cover:imported_modules(),[]),
-
-    ["<FORM ACTION=\"./result\" NAME=result_selection>\n",
-     "<TABLE WIDTH=\"300\" BORDER=0 ALIGN=center>\n",
-     "<TR><TD ALIGN=left>\n",
-     "Module:\n",
-     "<BR><SELECT NAME=module TITLE=\"Select module\">\n",
-     ModList ++
-     "</SELECT>\n",
-     "</TD>\n",
-     "<TD ALIGN=left>\n",
-     "Action:\n",
-     "<BR><SELECT NAME=action TITLE=\"Select action\">\n",
-     "<OPTION VALUE=\"analyse_to_file\">Analyse to file</OPTION>\n"
-     "<OPTION VALUE=\"coverage\">Analyse coverage</OPTION>\n"
-     "<OPTION VALUE=\"calls\">Analyse calls</OPTION>\n"
-     "<OPTION VALUE=\"reset\">Reset module</OPTION>\n"
-     "<OPTION VALUE=\"reset_all\">Reset all</OPTION>\n"
-     "<OPTION VALUE=\"export\">Export module</OPTION>\n"
-     "<OPTION VALUE=\"export_all\">Export all</OPTION>\n"
-     "</SELECT>\n",
-     "</TD>\n",
-     "<TD ALIGN=center VALIGN=bottom><INPUT TYPE=submit VALUE=Execute>\n"
-     "</TD></TR>\n"
-     "</TABLE>\n",
-     "</FORM>\n"].
-
-filter_modlist([M|Ms],Already) ->
-    case lists:member(M,Already) of
-	true ->
-	    filter_modlist(Ms,Already);
-	false ->
-	    MStr = atom_to_list(M),
-	    ["<OPTION VALUE=",MStr,">",MStr,"</OPTION>\n" |
-		filter_modlist(Ms,[M|Already])]
-    end;
-filter_modlist([],_Already) ->
-    [].
-    
-
-
-handle_result(Input) ->
-    case parse(Input) of
-	[{"module",M},{"action",A}] ->
-	    case A of
-		"analyse_to_file" ->
-		    case cover:analyse_to_file(list_to_atom(M),[html]) of
-			{ok,File} ->
-			    case file:read_file(File) of
-				{ok,HTML}->
-				    file:delete(File),
-				    [header(),
-				     reload_menu_script(""),
-				     binary_to_list(HTML)];
-				_ ->
-				    result_frame1("Can not read file" ++ File)
-			    end;
-			{error,no_source_code_found} ->
-			    result_frame1("No source code found for \\\'" ++
-					  M ++ "\\\'")
-		    end;
-		"calls" ->
-		    call_page(Input);
-		"coverage" ->
-		    coverage_page(Input);
-		"reset" ->
-		    cover:reset(list_to_atom(M)),
-		    result_frame1("Coverage data for \\\'" ++ M ++ 
-				  "\\\' is now reset");
-		"reset_all" ->
-		    cover:reset(),
-		    result_frame1("All coverage data is now reset");
-		"export" ->
-		    ExportFile = generate_filename(M),
-		    cover:export(ExportFile,list_to_atom(M)),
-		    result_frame1("Coverage data for \\\'" ++ M ++ 
-				  "\\\' is now exported to file \\\"" ++
-				  ExportFile ++ "\\\"");
-		"export_all" ->
-		    ExportFile = generate_filename("COVER"),
-		    cover:export(ExportFile),
-		    result_frame1(
-		      "All coverage data is now exported to file \\\"" ++
-		      ExportFile ++ "\\\"")
-	    end;
-	[{"action",_A}] ->
-	    result_frame1("No module is selected")
-    end.
-
-generate_filename(Prefix) ->
-    {ok,Cwd} = file:get_cwd(),
-    filename:join(Cwd,Prefix ++ "_" ++ ts() ++ ".coverdata").
-    
-ts() ->
-    {{Y,M,D},{H,Min,S}} = calendar:now_to_local_time(erlang:timestamp()),
-    io_lib:format("~4.4.0w~2.2.0w~2.2.0w-~2.2.0w~2.2.0w~2.2.0w",
-		  [Y,M,D,H,Min,S]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                     %
-% The functions that builds the body of the page that shows the calls %
-% 		                                                      %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-call_result(Input)->
-    Mod = list_to_atom(get_input_data(Input, "module")),
-    case cover:analyse(Mod,calls) of
-	{error,_}->
-	    error_body();
-	{ok,_} ->
-	    call_result2(Mod,Input)
-    end.
-
-call_result2(Mod,Input)->
-    Result = 
-	case get_input_data(Input,"what") of
-	    "mod" ->
-		call_result(mod,Mod);
-	    "func" ->
-		call_result(func,Mod);
-	    "clause" ->
-		call_result(clause,Mod);
-	    _->
-		call_result(all,Mod)
-	end,
-    result_choice("calls",Mod) ++ Result.
-
-result_choice(Level,Mod)->
-    ModStr=atom_to_list(Mod),
-    [reload_menu_script(""),
-     "<TABLE WIDTH=100%><TR>\n",
-     "<TD><A HREF=./",Level,"?module=",ModStr,"&what=all>All Data</A></TD>\n",
-     "<TD><A HREF=./",Level,"?module=",ModStr,"&what=mod>Module</A></TD>\n",
-     "<TD><A HREF=./",Level,"?module=",ModStr,"&what=func>Function</A></TD>\n",
-     "<TD><A HREF=./",Level,"?module=",ModStr,"&what=clause>Clause</A></TD>\n",
-     "</TR></TABLE><BR>\n"].
-
-call_result(Mode,Module)->
-    Content = 
-	case Mode of
-	    mod->
-		format_cover_call(cover:analyse(Module,calls,module),mod);
-	    func->
-		format_cover_call(cover:analyse(Module,calls,function),func);
-	    clause->
-		format_cover_call(cover:analyse(Module,calls,clause),clause);
-	    _->
-		format_cover_call(cover:analyse(Module,calls,module),mod) ++
-		   format_cover_call(cover:analyse(Module,calls,function),func)++
-		   format_cover_call(cover:analyse(Module,calls,clause),clause)
-	end,
-    getModDate(Module,date())++"<BR>"++
-    "<TABLE WIDTH=\"100%\" BORDER=1>"
-                ++ Content ++"</TABLE>".
-
-
-format_cover_call({error,_},_)->
-    ["<TR><TD>\n",
-     "<BR><BR><BR><BR>\n",
-     "<FONT SIZE=5>The selected module is not Cover Compiled</FONT>\n",
-     "<BR>\n",
-     "</TD></TR>\n"];
-
-format_cover_call({ok,{Mod,Calls}},mod)->
-    ["<TR BGCOLOR=\"#8899AA\"><TD COLSPAN=5><B>Module calls</B></TD></TR>\n", 
-     "<TR><TD COLSPAN=4><I>Module</I></TD>",
-     "<TD ALIGN=\"right\"><I>Number of calls</I></TD></TR>\n",
-     "<TR><TD COLSPAN=4>" ++ atom_to_list(Mod) ++"</TD>"
-     "<TD ALIGN=\"right\">" ++ integer_to_list(Calls)++"</TD></TR>\n"];
-
-format_cover_call({ok,Calls},func)->
-    ["<TR BGCOLOR=\"#8899AA\"><TD COLSPAN=5><B>Function calls</B></TD></TR>\n",
-     "<TR><TD><I>Module</I></TD><TD><I>Function</I></TD>",
-     "<TD COLSPAN=2 ALIGN=\"right\"><I>Arity</I></TD>",
-     "<TD ALIGN=\"right\"><I>Number of calls </I></TD></TR>\n",
-     lists:append(
-       lists:map(
-	 fun({{Mod,Func,Arity},Nr_of_calls})->
-		 ["<TR><TD WIDTH=\"20%\">"++ atom_to_list(Mod)++"</TD>\n",
-		  "<TD WIDTH=\"20%\" >" ++ atom_to_list(Func) ++" </TD>\n",
-		  "<TD COLSPAN=2 WIDTH=\"40%\" ALIGN=\"right\">",
-		  integer_to_list(Arity), 
-		  "</TD>\n",
-		  "<TD WIDTH=\"20%\" ALIGN=\"right\">",
-		  integer_to_list(Nr_of_calls), 
-		  "</TD></TR>\n"]
-	 end,
-	 Calls))];
-
-format_cover_call({ok,Calls},clause)->
-    ["<TR BGCOLOR=\"#8899AA\"><TD COLSPAN=5><B>Clause calls</B></TD></TR>\n",
-     "<TR><TD><I>Module</I></TD><TD><I>Function</I></TD>",
-     "<TD ALIGN=\"right\"><I>Arity</I></TD>",
-     "<TD ALIGN=\"right\"><I>Ordinal</I></TD>",
-     "<TD ALIGN=\"right\"><I>Number of calls</I></TD></TR>\n",
-     lists:append(
-       lists:map(
-	 fun({{Mod,Func,Arity,Ord},Nr_of_calls})->
-		 ["<TR><TD WIDTH=\"20%\" >", atom_to_list(Mod), "</TD>\n",  
-		  "<TD WIDTH=\"20%\" >", atom_to_list(Func), "</TD>\n",
-		  "<TD WIDTH=\"20%\" ALIGN=\"right\">",
-		  integer_to_list(Arity),
-		  "</TD>\n",
-		  "<TD WIDTH=\"20%\" ALIGN=\"right\">",
-		  integer_to_list(Ord),
-		  "</TD>\n",
-		  "<TD WIDTH=\"20%\" ALIGN=\"right\">",
-		  integer_to_list(Nr_of_calls),
-		  "</TD></TR>\n"]
-	 end,
-	 Calls))].
-
-
-error_body()->
-    ["<TABLE WIDTH=\"100%\" BORDER=1>\n",
-     "<TR ALIGN=\"center\">\n",
-     "<TD>\n",
-     "<BR><BR><BR><BR><BR><BR>\n",
-     "<FONT SIZE=5>The selected module is not Cover Compiled</FONT>\n",
-     "<BR>\n",
-     "</TD>\n",
-     "</TR>\n",
-     "</TABLE>\n"].
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                     %
-% The functions that builds the body of the page that shows coverage  %
-% 		                                                      %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-coverage_result(Input)->
-    Mod = list_to_atom(get_input_data(Input, "module")),
-    case cover:analyse(Mod,coverage) of
-	{error,_}->
-	    error_body();
-	{ok,_} ->
-	    coverage_result2(Mod,Input)
-    end.
-
-coverage_result2(Mod,Input)->
-    Result = 
-	case get_input_data(Input,"what") of
-	    "mod" ->
-		coverage_result(mod,Mod);
-	    "func" ->
-		coverage_result(func,Mod);
-	    "clause" ->
-		coverage_result(clause,Mod);
-	    _->
-		coverage_result(all,Mod)
-	end,
-    result_choice("coverage",Mod) ++ Result.
-
-coverage_result(Mode,Module)->
-    Content = 
-	case Mode of
-	    mod->
-		format_cover_coverage(cover:analyse(Module,coverage,module),
-				      mod);
-	    func->
-		format_cover_coverage(cover:analyse(Module,coverage,function),
-				      func);
-	    clause->
-		format_cover_coverage(cover:analyse(Module,coverage,clause),
-				      clause);
-	    _->
-		format_cover_coverage(cover:analyse(Module,coverage,module),
-				      mod) ++
-		   format_cover_coverage(cover:analyse(Module,coverage,function),
-					 func)++
-		   format_cover_coverage(cover:analyse(Module,coverage,clause),
-					 clause)
-	      end,
-    getModDate(Module,date())++"<BR>"++
-    "<TABLE WIDTH=\"100%\" BORDER=1>"
-                ++ Content ++"</TABLE>".
-
-getModDate(Module,{Year,Mon,Day})->
-    "<TABLE>
-      <TR>
-        <TD>Module:</TD> 
-        <TD>" ++ atom_to_list(Module) ++ "</TD> 
-      </TR>
-     <TR>
-        <TD>Date:</TD> 
-        <TD>" ++ integer_to_list(Day) ++ "/" ++ 
-                 integer_to_list(Mon) ++"&nbsp;-&nbsp;"++ 
-                 integer_to_list(Year)  ++ 
-       "</TD> 
-     </TR>
-   </TABLE>".
-
-
-format_cover_coverage({error,_},_)->
-     "<TR><TD>
-      <BR><BR><BR><BR>
-      <FONT SIZE=5>The selected module is not Cover Compiled</FONT>
-      <BR>  
-      </TD></TR>";
-
-
-format_cover_coverage({ok,{Mod,{Cov,Not_cov}}},mod)->
-    ["<TR BGCOLOR=\"#8899AA\"><TD COLSPAN=6><B>Module coverage</B></TD></TR>\n",
-     "<TR><TD COLSPAN=4><I>Module</I></TD>\n",
-     "<TD ALIGN=\"right\"><I>Covered</I></TD>\n"
-     "<TD ALIGN=\"RIGHT\" NOWRAP=\"true\"><I>Not Covered</I></TD>\n",
-     "</TR>\n",
-     "<TR><TD COLSPAN=4>", atom_to_list(Mod), "</TD>\n"
-     "<TD ALIGN=\"right\">", integer_to_list(Cov), "</TD>\n"
-     "<TD ALIGN=\"right\" >", integer_to_list(Not_cov), "</TD></TR>\n"];
-
-format_cover_coverage({ok,Cov_res},func)->
-    ["<TR BGCOLOR=\"#8899AA\"><TD COLSPAN=6><B>Function coverage</B></TD>\n",
-     "</TR>\n",
-     "<TR><TD><I>Module</I></TD><TD><I>Function</I></TD>",
-     "<TD ALIGN=\"right\"><I>Arity</I></TD>",
-     "<TD COLSPAN=2 ALIGN=\"right\"><I>Covered</I></TD>",
-     "<TD ALIGN=\"right\" STYLE=\"white-space:nowrap\"><I>Not Covered</I></TD>",
-     "</TR>\n",
-     lists:append(
-       lists:map(
-	 fun({{Mod,Func,Arity},{Cov,Not_cov}})->
-		 ["<TR><TD WIDTH=\"20%\" >"++ atom_to_list(Mod) ++" </TD>\n",
-		  "<TD WIDTH=\"20%\" >" ++ atom_to_list(Func) ++"</TD>\n",
-		  "<TD WIDTH=\"40%\" ALIGN=\"right\">",
-		  integer_to_list(Arity),
-		  "</TD>\n",  
-		  "<TD WIDTH=\"40%\" ALIGN=\"right\" COLSPAN=2>",
-		  integer_to_list(Cov),
-		  "</TD>\n"
-		  "<TD WIDTH=\"20%\" ALIGN=\"right\">",
-		  integer_to_list(Not_cov),
-		  "</TD></TR>\n"]
-	 end,
-	 Cov_res))];
-
-format_cover_coverage({ok,Cov_res},clause)->
-    ["<TR BGCOLOR=\"#8899AA\"><TD COLSPAN=6><B>Clause coverage</B></TD></TR>\n",
-     "<TR><TD><I>Module</I></TD><TD><I>Function</I></TD>\n",
-     "<TD ALIGN=\"right\"><I>Arity</I></TD>\n",
-     "<TD ALIGN=\"right\"><I>Ordinal<I></TD>\n",
-     "<TD ALIGN=\"right\">Covered</TD>\n",
-     "<TD ALIGN=\"right\" STYLE=\"white-space:nowrap\">Not Covered</TD></TR>\n",
-     lists:append(
-       lists:map(
-	 fun({{Mod,Func,Arity,Ord},{Cov,Not_cov}})->
-		 ["<TR><TD WIDTH=\"20%\" >"++ atom_to_list(Mod) ++"</TD>\n",  
-		  "<TD WIDTH=\"20%\" >" ++ atom_to_list(Func) ++" </TD>\n",
-		  "<TD WIDTH=\"20%\" ALIGN=\"right\">",
-		  integer_to_list(Arity),
-		  "</TD>\n"
-		  "<TD WIDTH=\"20%\" ALIGN=\"right\">",
-		  integer_to_list(Ord),
-		  "</TD>\n"
-		  "<TD WIDTH=\"20%\" ALIGN=\"right\">",
-		  integer_to_list(Cov),
-		  "</TD>\n"
-		  "<TD WIDTH=\"20%\" ALIGN=\"right\">",
-		  integer_to_list(Not_cov),
-		  "</TD></TR>\n"]
-	 end,
-	 Cov_res))].
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                     %
-% The functions that builds the body of the import page               %
-% 		                                                      %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-import_body(Dir,Err) ->
-    [reload_menu_script(Err),
-     "<H1 ALIGN=center>Import</H1>\n",
-     "<TABLE BORDER=0 WIDTH=600 ALIGN=center>\n",     
-     "<TR><TD BGCOLOR=",?INFO_BG_COLOR,">\n",
-     "<P>You can import coverage data from a previous analysis. If you do so\n",
-     "the imported data will be merged with the current coverage data.\n",
-     "<P>You can export data from the current analysis from the \"Result\"\n",
-     "page.\n",
-     "<P>Select the file to import here.\n",
-     "</TD></TR>\n",
-     "<TR><TD ALIGN=center><BR><BR>\n",
-     "<FORM NAME=change_import_dir METHOD=post ACTION=\"./import\">\n",
-     "<B>Change directory:</B><BR>\n",
-     "<INPUT TYPE=text NAME=\"file\" SIZE=30 VALUE=",Dir,">",
-     "<INPUT TYPE=hidden NAME=dir VALUE=",Dir,">\n",
-     "<INPUT TYPE=submit VALUE=Ok><BR>\n",
-     "</FORM>\n",
-     browse_import(Dir),
-     "</TABLE>"].
-
-browse_import(Dir) ->
-    {ok,List} = file:list_dir(Dir),
-    Sorted = lists:reverse(lists:sort(List)),
-    {Dirs,Files} = filter_files(Dir,Sorted,[],[]),
-    ["<FORM NAME=browse_import METHOD=post ACTION=\"./import\">\n"
-     "<SELECT NAME=file TITLE=\"Select import file\" SIZE=10>\n",
-     "<OPTION VALUE=\"..\" onDblClick=submit()>../</OPTION>\n",
-     Dirs,
-     Files,
-     "</SELECT>\n",
-     "<INPUT TYPE=hidden NAME=dir VALUE=",Dir,">\n",
-     "<BR><INPUT TYPE=submit VALUE=Ok>\n"
-     "</FORM>\n"].
-
-filter_files(Dir,[File|Files],Ds,Fs) ->
-    case filename:extension(File) of
-	".coverdata" ->
-	    Fs1 = ["<OPTION VALUE=",File," onDblClick=submit()>",
-		   File,"</OPTION>\n" | Fs],
-	    filter_files(Dir,Files,Ds,Fs1);
-	_ ->
-	    FullName = filename:join(Dir,File),
-	    case filelib:is_dir(FullName) of
-		true ->
-		    Ds1 = ["<OPTION VALUE=",File," onDblClick=submit()>",
-			   File,"/</OPTION>\n" | Ds],
-		    filter_files(Dir,Files,Ds1,Fs);
-		false ->
-		    filter_files(Dir,Files,Ds,Fs)
-	    end
-    end;
-filter_files(_Dir,[],Ds,Fs) ->
-    {Ds,Fs}.
-
-
-
-
-do_import(Input) ->
-    case parse(Input) of
-	[{"file",File0},{"dir",Dir}] ->
-	    File = filename:join(Dir,File0),
-	    case filelib:is_dir(File) of
-		true ->
-		    import_frame1(File);
-		false ->
-		    case filelib:is_file(File) of
-			true ->
-			    case cover:import(File) of
-				ok ->
-				    import_frame1(Dir);
-				{error,{cant_open_file,ExportFile,_Reason}} ->
-				    import_frame1(Dir,
-						  "Error importing file\\n\\\"" 
-						  ++ ExportFile ++ "\\\"")
-			    end;
-			false ->
-			    import_frame1(Dir,
-					  "Error importing file\\n\\\"" ++ 
-					  File ++ "\\\"")
-		    end
-	    end;
-	[{"dir",Dir}] ->
-	    import_frame1(Dir,"No file is selected")
-    end.
-	    
-
-    
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                     %
-% Different private helper functions                                   %
-% 		                                                      %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%Create the Header for the page If we now the mimetype use that type %%
-%%otherwise use text                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-  
-header() ->
-    header("text/html").
-header(MimeType) ->
-    "Pragma:no-cache\r\n" ++
-    "Content-type: " ++ MimeType ++ "\r\n\r\n".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
-%%Create the Htmlheader set the title of the page                     %%       
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-html_header(Title) ->    
-    "<HTML>\n" ++
-	"<HEAD>\n" ++
-	"<TITLE>" ++ Title ++  "</TITLE>\n" ++
-	"</HEAD>\n"
-	"<BODY BGCOLOR=\"#FFFFFF\">\n".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Close the body- and Html tags                                      %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-html_end()->
-    "</BODY></HTML>".
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% A script which reloads the menu frame and possibly pops up an alert%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-reload_menu_script(Err) ->
-    ["<SCRIPT>\n",
-     "function reloadMenu()\n",
-     "  {\n",
-     "    parent.menu.document.location.href=\"./menu_frame\";\n",
-     case Err of
-	 "" -> "";
-	 _ -> "    alert(\""++Err++"\");\n"
-     end,
-     case get_warnings() of
-	 [] -> 
-	     "";
-	 Warnings -> 
-	     "    alert(\""++fix_newline(lists:flatten(Warnings))++"\");\n"
-     end,
-     "  }\n",
-     "</SCRIPT>\n",
-     "<BODY onLoad=reloadMenu() BGCOLOR=\"#FFFFFF\">"].
-
-fix_newline([$\n|Rest]) ->
-    [$\\,$n|fix_newline(Rest)];
-fix_newline([$"|Rest]) ->
-    [$\\,$"|fix_newline(Rest)];
-fix_newline([Char|Rest]) ->
-    [Char|fix_newline(Rest)];
-fix_newline([]) ->
-    [].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Control the input data and return the intresting values or error   %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-get_input_data(Input,Key)->
-    case lists:keysearch(Key,1,parse(Input)) of
-	{value,{Key,Value}} ->
-	    Value;
-	false ->
-	    undefined
-    end.
-
-parse(Input) ->
-    httpd:parse_query(Input).
-
-
-get_warnings() ->
-    cover_group_leader_proc ! {self(), get_warnings},
-    receive {warnings,Warnings} ->
-	    Warnings
-    end.
diff --git a/lib/tools/src/cprof.erl b/lib/tools/src/cprof.erl
index 0240f876bc..f6d68f0bf8 100644
--- a/lib/tools/src/cprof.erl
+++ b/lib/tools/src/cprof.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-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.
@@ -114,6 +114,7 @@ analyse(Limit) when is_integer(Limit) ->
 analyse(M) when is_atom(M) ->
     analyse(M, 1).
 
+-dialyzer({no_improper_lists, analyse/2}).
 analyse(M, Limit) when is_atom(M), is_integer(Limit) ->
     L0 = [begin
 	      MFA = {M,F,A},
diff --git a/lib/tools/src/fprof.erl b/lib/tools/src/fprof.erl
index 7c6fab0b75..c5c24c8eb3 100644
--- a/lib/tools/src/fprof.erl
+++ b/lib/tools/src/fprof.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2001-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.
@@ -2251,6 +2251,8 @@ do_analyse(Table, Analyse) ->
     ?dbg(5, "do_analyse_1(_, _) ->~p~n", [Result]),
     Result.
 
+-dialyzer({no_improper_lists, do_analyse_1/2}).
+
 do_analyse_1(Table, 
 	   #analyse{group_leader = GroupLeader,
 		    dest = Io,
@@ -2624,6 +2626,8 @@ funcstat_pd(Pid, Func1, Func0, Clocks) ->
 funcstat_sort_r(FuncstatList, Element) ->
     funcstat_sort_r_1(FuncstatList, Element, []).
 
+-dialyzer({no_improper_lists, funcstat_sort_r_1/3}).
+
 funcstat_sort_r_1([], _, R) ->
     postsort_r(lists:sort(R));
 funcstat_sort_r_1([#funcstat{callers_sum = #clocks{} = Clocks,
@@ -2646,6 +2650,8 @@ funcstat_sort_r_1([#funcstat{callers_sum = #clocks{} = Clocks,
 clocks_sort_r(L, E) ->
     clocks_sort_r_1(L, E, []).
 
+-dialyzer({no_improper_lists, clocks_sort_r_1/3}).
+
 clocks_sort_r_1([], _, R) ->
     postsort_r(lists:sort(R));
 clocks_sort_r_1([#clocks{} = C | L], E, R) ->
diff --git a/lib/tools/src/lcnt.erl b/lib/tools/src/lcnt.erl
index e8b3d242e4..d552d5b46e 100644
--- a/lib/tools/src/lcnt.erl
+++ b/lib/tools/src/lcnt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2015. 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.
@@ -94,12 +94,12 @@
 
 -record(stats, {
 	file  :: atom(),
-	line  :: non_neg_integer(),
+	line  :: non_neg_integer() | 'undefined',
 	tries :: non_neg_integer(),
 	colls :: non_neg_integer(),
 	time  :: non_neg_integer(), % us
 	nt    :: non_neg_integer(), % #timings collected
-	hist  :: tuple()            % histogram
+	hist  :: tuple() | 'undefined'  % histogram
     }).
 
 -record(lock, {
@@ -757,7 +757,7 @@ list2lock([F|Fs], Ls) ->
 
 stats2stats([]) -> [];
 stats2stats([Stat|Stats]) ->
-    Sz = tuple_size(#stats{}),
+    Sz = record_info(size, stats),
     [stat2stat(Stat,Sz)|stats2stats(Stats)].
 
 stat2stat(Stat,Sz) when tuple_size(Stat) =:= Sz -> Stat;
@@ -933,7 +933,6 @@ strings(Strings) -> strings(Strings, []).
 strings([], Out) -> Out;
 strings([{space,  N,      S} | Ss], Out) -> strings(Ss, Out ++ term2string(term2string("~~~ws", [N]), [S]));
 strings([{left,   N,      S} | Ss], Out) -> strings(Ss, Out ++ term2string(term2string(" ~~s~~~ws", [N]), [S,""]));
-strings([{format, Format, S} | Ss], Out) -> strings(Ss, Out ++ term2string(Format, [S]));
 strings([S|Ss], Out) -> strings(Ss, Out ++ term2string("~ts", [S])).
 
 
diff --git a/lib/tools/src/make.erl b/lib/tools/src/make.erl
index 5d5a1ef2bd..26378f28a0 100644
--- a/lib/tools/src/make.erl
+++ b/lib/tools/src/make.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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.
@@ -299,10 +299,11 @@ check_includes(File, IncludePath, ObjMTime) ->
     end.
     
 check_includes2(Epp, File, ObjMTime) ->
+    A1 = erl_anno:new(1),
     case epp:parse_erl_form(Epp) of
-	{ok, {attribute, 1, file, {File, 1}}} ->
+	{ok, {attribute, A1, file, {File, A1}}} ->
 	    check_includes2(Epp, File, ObjMTime);
-	{ok, {attribute, 1, file, {IncFile, 1}}} ->
+	{ok, {attribute, A1, file, {IncFile, A1}}} ->
 	    case file:read_file_info(IncFile) of
 		{ok, #file_info{mtime=MTime}} when MTime>ObjMTime ->
 		    epp:close(Epp),
diff --git a/lib/tools/src/tools.app.src b/lib/tools/src/tools.app.src
index 978b54719c..a00969eabe 100644
--- a/lib/tools/src/tools.app.src
+++ b/lib/tools/src/tools.app.src
@@ -21,7 +21,6 @@
  [{description, "DEVTOOLS  CXC 138 16"},
   {vsn, "%VSN%"},
   {modules, [cover,
-	     cover_web,
 	     eprof,
 	     fprof,
 	     instrument,
@@ -36,12 +35,12 @@
 	     xref_utils
 	    ]
   },
-  {registered,[webcover_server]},
+  {registered, []},
   {applications, [kernel, stdlib]},
   {env, [{file_util_search_methods,[{"", ""}, {"ebin", "esrc"}, {"ebin", "src"}]}
 	]
   },
-  {runtime_dependencies, ["webtool-0.8.10","stdlib-2.5","runtime_tools-1.8.14",
+  {runtime_dependencies, ["stdlib-2.5","runtime_tools-1.8.14",
 			  "kernel-3.0","inets-5.10","erts-7.0",
 			  "compiler-5.0"]}
  ]
diff --git a/lib/tools/src/xref_utils.erl b/lib/tools/src/xref_utils.erl
index 438ec93962..f69aa70244 100644
--- a/lib/tools/src/xref_utils.erl
+++ b/lib/tools/src/xref_utils.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2000-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.
@@ -245,6 +245,8 @@ select_last_application_version(AppVs) ->
     TL = to_external(partition(1, relation(AppVs))),
     [last(keysort(2, L)) || L <- TL].
 
+-record(scan, {collected = [], errors = [], seen = [], unreadable = []}).
+
 %% scan_directory(Directory, Recurse, Collect, Watch) -> 
 %%     {Collected, Errors, Seen, Unreadable}
 %%
@@ -261,8 +263,9 @@ select_last_application_version(AppVs) ->
 %% Unreadable.
 %%
 scan_directory(File, Recurse, Collect, Watch) ->
-    Init = [[] | {[],[],[]}],
-    [L | {E,J,U}] = find_files_dir(File, Recurse, Collect, Watch, Init),
+    Init = #scan{},
+    S = find_files_dir(File, Recurse, Collect, Watch, Init),
+    #scan{collected = L, errors = E, seen = J, unreadable = U} = S,
     {reverse(L), reverse(E), reverse(J), reverse(U)}.
 
 %% {Dir, Basename} | false
@@ -576,8 +579,7 @@ find_files_dir(Dir, Recurse, Collect, Watch, L) ->
 	{ok, Files} ->
 	    find_files(sort(Files), Dir, Recurse, Collect, Watch, L);
 	{error, Error} ->
-	    [B | {E,J,U}] = L,
-	    [B | {[file_error(Dir, Error)|E],J,U}]
+            L#scan{errors = [file_error(Dir, Error)|L#scan.errors]}
     end.
 
 find_files([F | Fs], Dir, Recurse, Collect, Watch, L) ->
@@ -588,22 +590,23 @@ find_files([F | Fs], Dir, Recurse, Collect, Watch, L) ->
              {ok, {_, directory, _, _}} ->
 		 L;
 	     Info ->
-		 [B | EJU = {E,J,U}] = L,
+                 #scan{collected = B, errors = E,
+                       seen = J, unreadable = U} = L,
 		 Ext = filename:extension(File),
 		 C = member(Ext, Collect),
 		 case C of
 		     true ->
 			 case Info of
 			     {ok, {_, file, readable, _}} ->
-				 [[{Dir,F} | B] | EJU];
+                                 L#scan{collected = [{Dir,F} | B]};
 			     {ok, {_, file, unreadable, _}} ->
-				 [B | {E,J,[File|U]}];
+                                 L#scan{unreadable = [File|U]};
 			     Error ->
-				 [B | {[Error|E],J,U}]
+                                 L#scan{errors = [Error|E]}
 			 end;
 		     false ->
 			 case member(Ext, Watch) of
-			     true -> [B | {E,[File|J],U}];
+                             true -> L#scan{seen = [File|J]};
 			     false -> L
 			 end
 		 end
diff --git a/lib/tools/test/Makefile b/lib/tools/test/Makefile
index 49b86628b7..8768413dc1 100644
--- a/lib/tools/test/Makefile
+++ b/lib/tools/test/Makefile
@@ -53,8 +53,7 @@ RELSYSDIR = $(RELEASE_PATH)/tools_test
 # FLAGS
 # ----------------------------------------------------
 ERL_MAKE_FLAGS += 
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include \
-	-I$(ERL_TOP)/lib/percept/include
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/percept/include
 
 EBIN = .
 
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 483ea9774e..d4b346c407 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2001-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.
@@ -21,14 +21,15 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     NoStartStop = [eif,otp_5305,otp_5418,otp_7095,otp_8273,
                    otp_8340,otp_8188,compile_beam_opts,eep37,
-		   analyse_no_beam, line_0, compile_beam_no_file],
+		   analyse_no_beam, line_0, compile_beam_no_file,
+                   otp_13277, otp_13289],
     StartStop = [start, compile, analyse, misc, stop,
 		 distribution, reconnect, die_and_reconnect,
 		 dont_reconnect_after_stop, stop_node_after_disconnect,
@@ -1252,7 +1253,7 @@ otp_8340(doc) ->
     ["OTP-8340. Bug."];
 otp_8340(suite) -> [];
 otp_8340(Config) when is_list(Config) ->
-    ?line [{{t,1},1},{{t,2},1},{{t,4},1}] = 
+    [{{t,1},1},{{t,2},1},{{t,4},1}] =
         analyse_expr(<<"<< \n"
                        " <<3:2, \n"
                        "   SeqId:62>> \n"
@@ -1745,6 +1746,38 @@ do_scan(Str) ->
     {done,{ok,T,_},C} = erl_scan:tokens([],Str,0),
     [ T | do_scan(C) ].
 
+otp_13277(doc) ->
+    ["PR 856. Fix a bc bug."];
+otp_13277(Config) ->
+    Test = <<"-module(t).
+              -export([t/0]).
+
+              pad(A, L) ->
+                  P = << <<\"#\">> || _ <- lists:seq(1, L) >>,
+                  <<A/binary, P/binary>>.
+
+              t() ->
+                  pad(<<\"hi\">>, 2).
+             ">>,
+    ?line File = cc_mod(t, Test, Config),
+    ?line <<"hi##">> = t:t(),
+    ?line ok = file:delete(File),
+    ok.
+
+%% Test general expressions in a binary comprehension.
+otp_13289(Config) ->
+    Test = <<"-module(t).
+              -export([t/0]).
+
+              t() ->
+                  << (id(<<I>>)) || I <- [1,2,3] >>.
+
+              id(I) -> I.
+             ">>,
+    File = cc_mod(t, Test, Config),
+    <<1,2,3>> = t:t(),
+    ok = file:delete(File),
+    ok.
 
 %%--Auxiliary------------------------------------------------------------
 
diff --git a/lib/tools/test/cover_SUITE_data/d.erl b/lib/tools/test/cover_SUITE_data/d.erl
index 696e27e49b..b1d8ebd62e 100644
--- a/lib/tools/test/cover_SUITE_data/d.erl
+++ b/lib/tools/test/cover_SUITE_data/d.erl
@@ -6,7 +6,7 @@
 	 size/0]).
 -export([init/0]). % spawn
 
--record(person, {name, age, location, moved=false}).
+-record(person, {name, age :: integer(), location, moved=false :: boolean()}).
 
 %%%----------------------------------------------------------------------
 %%% User interface functions
diff --git a/lib/tools/test/cprof_SUITE.erl b/lib/tools/test/cprof_SUITE.erl
index 7b22dea7ed..8beaf4f399 100644
--- a/lib/tools/test/cprof_SUITE.erl
+++ b/lib/tools/test/cprof_SUITE.erl
@@ -42,7 +42,7 @@
 -define(config(A,B),config(A,B)).
 -export([config/2]).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -endif.
  
 -ifdef(debug).
diff --git a/lib/tools/test/emem_SUITE.erl b/lib/tools/test/emem_SUITE.erl
index 95cda98558..93d21623ce 100644
--- a/lib/tools/test/emem_SUITE.erl
+++ b/lib/tools/test/emem_SUITE.erl
@@ -43,7 +43,7 @@
 
 -include_lib("kernel/include/file.hrl").
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(5)).
 
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index 5428643667..6274eabc37 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(eprof_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	init_per_group/2,end_per_group/2]).
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index e8f179c630..d1a673d6b7 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(fprof_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server framework exports
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
diff --git a/lib/tools/test/ignore_cores.erl b/lib/tools/test/ignore_cores.erl
index 13f34cd10f..e40b91392c 100644
--- a/lib/tools/test/ignore_cores.erl
+++ b/lib/tools/test/ignore_cores.erl
@@ -28,7 +28,7 @@
 
 -module(ignore_cores).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([init/1, fini/1, setup/3, setup/4, restore/1, dir/1]).
 
diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl
index 3b981a9303..773d805cd0 100644
--- a/lib/tools/test/instrument_SUITE.erl
+++ b/lib/tools/test/instrument_SUITE.erl
@@ -25,7 +25,7 @@
 
 -export(['+Mim true'/1, '+Mis true'/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=?t:timetrap(10000),
diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl
index f3789a4137..47b8031bee 100644
--- a/lib/tools/test/lcnt_SUITE.erl
+++ b/lib/tools/test/lcnt_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 
 -module(lcnt_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl
index 70bc8502bf..fdcc310df1 100644
--- a/lib/tools/test/make_SUITE.erl
+++ b/lib/tools/test/make_SUITE.erl
@@ -25,7 +25,7 @@
 	 otp_6057_a/1, otp_6057_b/1, otp_6057_c/1,
 	 otp_6057_end/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -include_lib("kernel/include/file.hrl").
 
diff --git a/lib/tools/test/tools_SUITE.erl b/lib/tools/test/tools_SUITE.erl
index 9403124c96..ae2a69305b 100644
--- a/lib/tools/test/tools_SUITE.erl
+++ b/lib/tools/test/tools_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(tools_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index ad47b31443..53aa80d2a3 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -30,7 +30,7 @@
 -define(privdir, "xref_SUITE_priv").
 -define(copydir, "xref_SUITE_priv/datacopy").
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(format(S, A), ok).
 -define(datadir, ?config(data_dir, Conf)).
 -define(privdir, ?config(priv_dir, Conf)).
@@ -1151,17 +1151,13 @@ read_expected(Version) ->
 	  {POS8+4,{FF,{a,b,1}}},
 	  {POS8+4,{FF,{erlang,apply,2}}},
 	  {POS8+5,{FF,{erlang,apply,2}}},
-	  {POS8+6,{FF,{erlang,apply,3}}},
 	  {POS8+6,{FF,{m,f,1}}},
-	  {POS8+7,{FF,{erlang,apply,3}}},
-	  {POS9+1,{FF,{erlang,apply,3}}},
 	  {POS9+1,{FF,{read,bi,0}}},
 	  {POS9+2,{FF,{a,b,1}}},
 	  {POS9+2,{FF,{erlang,apply,2}}},
 	  {POS9+3,{FF,{erlang,apply,2}}},
 	  {POS9+4,{FF,{erlang,apply,2}}},
 	  {POS9+4,{FF,{erlang,not_a_function,1}}},
-	  {POS9+5,{FF,{erlang,apply,3}}},
 	  {POS9+5,{FF,{mod,func,2}}},
 	  {POS9+6,{FF,{erlang,apply,1}}},
 	  {POS9+7,{FF,{erlang,apply,2}}},
@@ -1169,17 +1165,11 @@ read_expected(Version) ->
 	  {POS9+8,{FF,{q,f,1}}},
 	  {POS10+4,{FF,{erlang,apply,2}}},
 	  {POS10+5,{FF,{mod1,fun1,1}}},
-	  {POS11+1,{FF,{erlang,apply,3}}},
-	  {POS11+2,{FF,{erlang,apply,3}}},
-	  {POS11+3,{FF,{erlang,apply,3}}},
-	  {POS11+4,{FF,{erlang,apply,3}}},
 	  {POS11+6,{FF,{erlang,apply,2}}},
 	  {POS12+1,{FF,{erlang,apply,2}}},
 	  {POS12+4,{FF,{erlang,apply,2}}},
-	  {POS12+5,{FF,{erlang,apply,3}}},
 	  {POS12+5,{FF,{m3,f3,2}}},
 	  {POS12+7,{FF,{erlang,apply,2}}},
-	  {POS12+8,{FF,{erlang,apply,3}}},
 	  {POS13+1,{FF,{dm,df,1}}},
 	  {POS13+6,{{read,bi,0},{foo,module_info,0}}},
 	  {POS13+7,{{read,bi,0},{read,module_info,0}}},
@@ -1189,10 +1179,6 @@ read_expected(Version) ->
 
     OK = case Version of
 	     abstract_v1 ->
-		 [{POS8+3, {FF,{erlang,apply,3}}},
-		  {POS10+1, {FF,{erlang,apply,3}}},
-		  {POS10+6, {FF,{erlang,apply,3}}}]
-                 ++
                  [{0,{FF,{read,'$F_EXPR',178}}},
                   {0,{FF,{modul,'$F_EXPR',179}}}]
                  ++ O1;
@@ -1213,13 +1199,25 @@ read_expected(Version) ->
             {POS3+3,  {FF,{erlang,spawn_link,3}}},
             {POS3+4, {FF,{erlang,spawn_link,3}}},
             {POS6+4, {FF,{erlang,spawn,3}}},
+	    {POS8+6,{FF,{erlang,apply,3}}},
+	    {POS8+7,{FF,{erlang,apply,3}}},
+	    {POS9+1,{FF,{erlang,apply,3}}},
+	    {POS9+5,{FF,{erlang,apply,3}}},
+	    {POS11+1,{FF,{erlang,apply,3}}},
+	    {POS11+2,{FF,{erlang,apply,3}}},
+	    {POS11+3,{FF,{erlang,apply,3}}},
+	    {POS11+4,{FF,{erlang,apply,3}}},
+	    {POS12+5,{FF,{erlang,apply,3}}},
+	    {POS12+8,{FF,{erlang,apply,3}}},
             {POS13+5, {{read,bi,0},{erlang,length,1}}},
             {POS14+3, {{read,bi,0},{erlang,length,1}}}],
 
     %% Operators (OTP-8647):
     OKB = case Version of
               abstract_v1 ->
-                  [];
+		  [{POS8+3, {FF,{erlang,apply,3}}},
+		   {POS10+1, {FF,{erlang,apply,3}}},
+		   {POS10+6, {FF,{erlang,apply,3}}}];
               _ ->
                   [{POS13+16, {{read,bi,0},{erlang,'!',2}}},
                    {POS13+16, {{read,bi,0},{erlang,'-',1}}},
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index 3efe89d9f9..70564f05c6 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 2.8.2
+TOOLS_VSN = 2.8.3
diff --git a/lib/typer/src/typer.erl b/lib/typer/src/typer.erl
index 562530c868..5c82750a21 100644
--- a/lib/typer/src/typer.erl
+++ b/lib/typer/src/typer.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2006-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.
@@ -137,11 +137,14 @@ extract(#analysis{macros = Macros,
   NewCodeServer =
     try
       NewRecords = dialyzer_codeserver:get_temp_records(CodeServer1),
+      NewExpTypes = dialyzer_codeserver:get_temp_exported_types(CodeServer1),
+      case sets:size(NewExpTypes) of 0 -> ok end,
       OldRecords = dialyzer_plt:get_types(TrustPLT), % XXX change to the PLT?
       MergedRecords = dialyzer_utils:merge_records(NewRecords, OldRecords),
       CodeServer2 = dialyzer_codeserver:set_temp_records(MergedRecords, CodeServer1),
-      CodeServer3 = dialyzer_utils:process_record_remote_types(CodeServer2),
-      dialyzer_contracts:process_contract_remote_types(CodeServer3)
+      CodeServer3 = dialyzer_codeserver:finalize_exported_types(NewExpTypes, CodeServer2),
+      CodeServer4 = dialyzer_utils:process_record_remote_types(CodeServer3),
+      dialyzer_contracts:process_contract_remote_types(CodeServer4)
     catch
       throw:{error, ErrorMsg} ->
 	compile_error(ErrorMsg)
@@ -845,8 +848,7 @@ collect_info(Analysis) ->
       %% io:format("Merged Records ~p",[MergedRecords]),
       TmpCServer1 = dialyzer_codeserver:set_temp_records(MergedRecords, TmpCServer),
       TmpCServer2 =
-        dialyzer_codeserver:insert_temp_exported_types(MergedExpTypes,
-                                                       TmpCServer1),
+        dialyzer_codeserver:finalize_exported_types(MergedExpTypes, TmpCServer1),
       TmpCServer3 = dialyzer_utils:process_record_remote_types(TmpCServer2),
       dialyzer_contracts:process_contract_remote_types(TmpCServer3)
     catch
diff --git a/lib/typer/test/Makefile b/lib/typer/test/Makefile
index d6dd22b6cf..fb5570d9f0 100644
--- a/lib/typer/test/Makefile
+++ b/lib/typer/test/Makefile
@@ -25,7 +25,7 @@ RELSYSDIR = $(RELEASE_PATH)/typer_test
 # ----------------------------------------------------
 
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
+ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
diff --git a/lib/webtool/AUTHORS b/lib/webtool/AUTHORS
deleted file mode 100644
index 5f173dd264..0000000000
--- a/lib/webtool/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Original Authors and Contributors:
-
-Siri Hansen
-Martin Gustafsson
diff --git a/lib/webtool/Makefile b/lib/webtool/Makefile
deleted file mode 100644
index 9afcb87af2..0000000000
--- a/lib/webtool/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2001-2009. 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%
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-SUB_DIRECTORIES = src priv doc/src 
-
-include vsn.mk
-VSN = $(WEBTOOL_VSN)
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
-
-
diff --git a/lib/webtool/doc/html/.gitignore b/lib/webtool/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/webtool/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/webtool/doc/man1/.gitignore b/lib/webtool/doc/man1/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/webtool/doc/man1/.gitignore
+++ /dev/null
diff --git a/lib/webtool/doc/man3/.gitignore b/lib/webtool/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/webtool/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/webtool/doc/pdf/.gitignore b/lib/webtool/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/webtool/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/webtool/doc/src/Makefile b/lib/webtool/doc/src/Makefile
deleted file mode 100644
index 57de52a616..0000000000
--- a/lib/webtool/doc/src/Makefile
+++ /dev/null
@@ -1,132 +0,0 @@
-# ``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.
-# 
-# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-# AB. All Rights Reserved.''
-# 
-#     $Id$
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(WEBTOOL_VSN)
-APPLICATION=webtool
-
-DOC_EXTRA_FRONT_PAGE_INFO=Important note: \
-The Webtool application is obsolete and will be removed \
-in the next major OTP release
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-
-XML_REF1_FILES = start_webtool.xml
-
-XML_REF3_FILES = webtool.xml
-
-XML_PART_FILES = \
-	part.xml \
-	part_notes.xml \
-	part_notes_history.xml
-
-XML_CHAPTER_FILES = \
-	webtool_chapter.xml \
-	notes.xml \
-	notes_history.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = \
-	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
-	$(XML_PART_FILES) $(XML_REF3_FILES) \
-	 $(XML_REF1_FILES) $(XML_APPLICATION_FILES)
-
-GIF_FILES =
-
-# ----------------------------------------------------
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-
-MAN1_FILES = $(XML_REF1_FILES:%.xml=$(MAN1DIR)/%.1)
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-# ----------------------------------------------------
-# FLAGS 
-# ----------------------------------------------------
-XML_FLAGS += 
-DVIPS_FLAGS += 
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-docs: pdf html man
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN1DIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~ 
-
-man: $(MAN1_FILES) $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-debug opt: 
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		"$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man1"
-	$(INSTALL_DATA) $(MAN1_FILES) "$(RELEASE_PATH)/man/man1"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
-
-release_spec:
-
diff --git a/lib/webtool/doc/src/book.xml b/lib/webtool/doc/src/book.xml
deleted file mode 100644
index feccee7c62..0000000000
--- a/lib/webtool/doc/src/book.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>2001</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>WebTool</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev>1.0</rev>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>WebTool</pagetext>
-  <preamble>
-  </preamble>
-  <parts lift="no">
-    <xi:include href="part.xml"/>
-  </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-  <listofterms></listofterms>
-  <index></index>
-</book>
-
diff --git a/lib/webtool/doc/src/fascicules.xml b/lib/webtool/doc/src/fascicules.xml
deleted file mode 100644
index 37feca543f..0000000000
--- a/lib/webtool/doc/src/fascicules.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE fascicules SYSTEM "fascicules.dtd">
-
-<fascicules>
-  <fascicule file="part" href="part_frame.html" entry="no">
-    User's Guide
-  </fascicule>
-  <fascicule file="ref_man" href="ref_man_frame.html" entry="yes">
-    Reference Manual
-  </fascicule>
-  <fascicule file="part_notes" href="part_notes_frame.html" entry="no">
-    Release Notes
-  </fascicule>
-  <fascicule file="" href="../../../../doc/print.html" entry="no">
-    Off-Print
-  </fascicule>
-</fascicules>
-
diff --git a/lib/webtool/doc/src/notes.xml b/lib/webtool/doc/src/notes.xml
deleted file mode 100644
index 21309261a8..0000000000
--- a/lib/webtool/doc/src/notes.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2004</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-
-    </legalnotice>
-
-    <title>Webtool Release Notes</title>
-    <prepared>otp_appnotes</prepared>
-    <docno>nil</docno>
-    <date>nil</date>
-    <rev>nil</rev>
-    <file>notes.xml</file>
-  </header>
-  <p>This document describes the changes made to the Webtool
-    application.</p>
-
-<section><title>WebTool 0.9</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The Webtool application has been marked as obsolete and
-	    will be removed from OTP in the next major release (OTP
-	    19.0).</p>
-          <p>
-	    Own Id: OTP-10922 Aux Id: OTP-12705 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>WebTool 0.8.10</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Application upgrade (appup) files are corrected for the
-	    following applications: </p>
-          <p>
-	    <c>asn1, common_test, compiler, crypto, debugger,
-	    dialyzer, edoc, eldap, erl_docgen, et, eunit, gs, hipe,
-	    inets, observer, odbc, os_mon, otp_mibs, parsetools,
-	    percept, public_key, reltool, runtime_tools, ssh,
-	    syntax_tools, test_server, tools, typer, webtool, wx,
-	    xmerl</c></p>
-          <p>
-	    A new test utility for testing appup files is added to
-	    test_server. This is now used by most applications in
-	    OTP.</p>
-          <p>
-	    (Thanks to Tobias Schlager)</p>
-          <p>
-	    Own Id: OTP-11744</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>WebTool 0.8.9.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>WebTool 0.8.9.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Miscellaneous documentation build updates</p>
-          <p>
-	    Own Id: OTP-9813</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>WebTool 0.8.9</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Do not install *.bat files on non-win32 machines (Thanks
-	    to Hans Ulrich Niedermann)</p>
-          <p>
-	    Own Id: OTP-9515</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>WebTool 0.8.8</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Various small documentation fixes (Thanks to Bernard
-	    Duggan)</p>
-          <p>
-	    Own Id: OTP-9172</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>WebTool 0.8.7</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Up until now Netscape has been the default web browser on
-	    Unix/Linux. Webtool has now been updated to start Firefox
-	    as default browser instead.</p>
-          <p>
-	    Own Id: OTP-8651 Aux Id: OTP-8650 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>WebTool 0.8.6</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc updates</p>
-          <p>
-	    Own Id: OTP-8456</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>WebTool 0.8.5</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The documentation is now built with open source tools
-	    (xsltproc and fop) that exists on most platforms. One
-	    visible change is that the frames are removed.</p>
-          <p>
-	    Own Id: OTP-8201</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>WebTool 0.8.4</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The copyright notices have been updated.</p>
-          <p>
-	    Own Id: OTP-7851</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-<section><title>WebTool 0.8.3.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Minor updates.</p>
-          <p>
-	    Own Id: OTP-6998</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-  <section>
-    <title>WebTool 0.8.3.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Minor Makefile changes.</p>
-          <p>Own Id: OTP-6689</p>
-        </item>
-        <item>
-          <p>Obsolete guard tests (such as list()) have been replaced
-            with the modern guard tests (such as is_list()).</p>
-          <p>Own Id: OTP-6725</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>WebTool 0.8.3</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Removed some dead code discovered by Dialyzer.</p>
-          <p>Own Id: OTP-6041</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/webtool/doc/src/notes_history.xml b/lib/webtool/doc/src/notes_history.xml
deleted file mode 100644
index 792475d948..0000000000
--- a/lib/webtool/doc/src/notes_history.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2006</year>
-      <year>2013</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Webtool Release Notes History</title>
-    <prepared>otp_appnotes</prepared>
-    <docno>nil</docno>
-    <date>nil</date>
-    <rev>nil</rev>
-  </header>
-
-  <section>
-    <title>Webtool 0.8.2</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Bugfix: <c>webtool</c> crashed when trying to find a free
-            port number if connection failed with other reason than
-            <c>econnrefused</c>.</p>
-          <p>Own Id: OTP-5166</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Misc improvements:</p>
-          <list type="bulleted">
-            <item>The function <c>debug_app/1</c> and some error
-             printouts are added to simplify debugging of own
-             application.</item>
-            <item>Multiple webtool instances can now be started on
-             the same host. If the default port (8888) is in use, port
-             8889 is tried. If 8889 is also used, 8890 is tried and so
-             on. Max number of ports tried is 256.</item>
-            <item><em>Incompatible:</em> If <c>Data</c> is set to
-            <c>PortNumber</c> in <c>start(Path,Data)</c>, the default
-             data will be used for ip-number (<c>127.0.0.1</c>) and
-             server name (<c>localhost</c>).</item>
-          </list>
-          <p>*** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>Own Id: OTP-4724</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/webtool/doc/src/part.xml b/lib/webtool/doc/src/part.xml
deleted file mode 100644
index b0c4ee310d..0000000000
--- a/lib/webtool/doc/src/part.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2001</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>WebTool User's Guide</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p><em>WebTool</em> provides a easy way to use web based tools with
-      Erlang/OTP. It configures and starts a webserver as well as all
-      available tools.</p>
-  </description>
-  <xi:include href="webtool_chapter.xml"/>
-</part>
-
diff --git a/lib/webtool/doc/src/part_notes.xml b/lib/webtool/doc/src/part_notes.xml
deleted file mode 100644
index db2b790f3f..0000000000
--- a/lib/webtool/doc/src/part_notes.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2004</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>WebTool Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p><em>WebTool</em> provides an easy way to use web based tools with
-      Erlang/OTP. It configures and starts a webserver as well as all
-      available tools.</p>
-    <p>For information about older versions, see
-      <url href="part_notes_history_frame.html">Release Notes History</url>.</p>
-  </description>
-  <xi:include href="notes"/>
-</part>
-
diff --git a/lib/webtool/doc/src/part_notes_history.xml b/lib/webtool/doc/src/part_notes_history.xml
deleted file mode 100644
index 50ce62e58d..0000000000
--- a/lib/webtool/doc/src/part_notes_history.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part>
-  <header>
-    <copyright>
-      <year>2006</year>
-      <year>2013</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>WebTool Release Notes History</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p><em>WebTool</em> provides a easy way to use web based tools with
-      Erlang/OTP. It configures and starts a webserver as well as all
-      available tools.</p>
-  </description>
-  <include file="notes_history"></include>
-</part>
-
diff --git a/lib/webtool/doc/src/ref_man.xml b/lib/webtool/doc/src/ref_man.xml
deleted file mode 100644
index aa81392b11..0000000000
--- a/lib/webtool/doc/src/ref_man.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2001</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>WebTool Reference Manual</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p><em>WebTool</em> provides an easy way to use web based tools with
-      Erlang/OTP. It configures and starts a webserver as well as all
-      available tools.</p>
-  </description>
-  <xi:include href="webtool.xml"/>
-  <xi:include href="start_webtool.xml"/>
-</application>
-
diff --git a/lib/webtool/doc/src/start_webtool.xml b/lib/webtool/doc/src/start_webtool.xml
deleted file mode 100644
index e9c94c4271..0000000000
--- a/lib/webtool/doc/src/start_webtool.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE comref SYSTEM "comref.dtd">
-
-<comref>
-  <header>
-    <copyright>
-      <year>2003</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-
-    </legalnotice>
-
-    <title>start_webtool</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno>1</docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2003-06-18</date>
-    <rev></rev>
-    <file>start_webtool.sgml</file>
-  </header>
-  <com>start_webtool</com>
-  <comsummary>WebTool Start Script</comsummary>
-  <description>
-    <p>The <c>start_webtool</c> script starts WebTool, a WebTool
-      application and a web browser pointing to this application.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>start_webtool application [ browser ]</name>
-      <fsummary>Start a WebTool Application</fsummary>
-      <desc>
-        <p>Starts WebTool, the given WebTool Application and a web
-          browser pointing to this application.
-          </p>
-        <p>If no argument is given, a list of available applications
-          is displayed, e.g.</p>
-        <pre>
->start_webtool
-Starting webtool...
-WebTool is available at http://localhost:8888/
-Or  http://127.0.0.1:8888/
-
-Usage: start_webtool application [ browser ]
-
-Available applications are: [orber,appmon,crashdump_viewer,webcover]
-Default browser is 'iexplore' (Internet Explorer) on Windows or else 'firefox'        </pre>
-        <p>To start any of the listed applications, give the
-          application name as the first argument, e.g.</p>
-        <pre>
->start_webtool webcover
-Starting webtool...
-WebTool is available at http://localhost:8888/
-Or  http://127.0.0.1:8888/
-Starting webcover...
-Sending URL to netscape...done        </pre>
-        <p>The WebTool application WebCover is then started and the
-          default browser is used. The default browser is Internet
-          Explorer on Windows or else Firefox.
-          </p>
-        <p>To use another browser, give the browser's start command
-          as the second argument, e.g.</p>
-        <pre>
->start_webtool webcover mozilla
-Starting webtool...
-WebTool is available at http://localhost:8888/
-Or  http://127.0.0.1:8888/
-Starting webcover...
-Sending URL to mozilla...done        </pre>
-        <p>If the given browser name is not known to WebTool, WebTool
-          will run it as a command with the start URL as the only
-          argument, e.g.</p>
-        <pre>
->start_webtool webcover mybrowser
-Starting webtool...
-WebTool is available at http://localhost:8888/
-Or  http://127.0.0.1:8888/
-Starting webcover...
-Starting mybrowser...        </pre>
-        <p>Here the command <c>"mybrowser http://localhost:8888/webcover"</c> is executed.
-          </p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>See Also</title>
-    <p><seealso marker="webtool">webtool(3)</seealso></p>
-  </section>
-</comref>
-
diff --git a/lib/webtool/doc/src/webtool.xml b/lib/webtool/doc/src/webtool.xml
deleted file mode 100644
index 2647518dae..0000000000
--- a/lib/webtool/doc/src/webtool.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2001</year>
-      <year>2013</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>webtool</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>webtool</module>
-  <modulesummary>WebTool is a tool used to simplify the implementation of web based tools with Erlang/OTP.</modulesummary>
-  <description>
-    <p>WebTool makes it easy to use web based tools with Erlang/OTP. WebTool
-      configures and starts the webserver httpd.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>start()-> {ok,Pid}| {stop,Reason}</name>
-      <fsummary>Start WebTool.</fsummary>
-      <desc>
-        <p>Start WebTool with default data, i.e. port 8888, ip-number
-          127.0.0.1, and server-name <c>localhost</c>. If port 8888 is
-          in use, port 8889 is tried instead. If 8889 is also in use,
-          8890 is tried and so on. Max number of ports tried is 256.
-          </p>
-        <p>The <c>mime.types</c> file and WebTool's own HTML files
-          are assumed to be in the directory
-          <c><![CDATA[webtool-<vsn>/priv/root/conf]]></c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start(Path,Data)->{ok,Pid}|{stop,Reason}</name>
-      <fsummary>Start WebTool with default configuration.</fsummary>
-      <type>
-        <v>Path = string() | standard_path</v>
-        <v>Data = [Port,Address,Name] | PortNumber | standard_data</v>
-        <v>Port = {port,PortNumber}</v>
-        <v>Address = {bind_address,IpNumber}</v>
-        <v>Name = {server_name,ServerName}</v>
-        <v>PortNumber = integer()</v>
-        <v>IpNumber = tuple(), e.g. {127,0,0,1}</v>
-        <v>ServerName = string()</v>
-        <v>Pid = pid()</v>
-      </type>
-      <desc>
-        <p>Use this function to start WebTool if the default port, 
-          ip-number,servername or path can not be used.</p>
-        <p><c>Path</c> is the directory where the <c>mime.types</c>
-          file and WebTool's own HTML files are located. By default
-          this is <c><![CDATA[webtool-<vsn>/priv]]></c>, and in most cases there
-          is no need to change this. If <c>Path</c> is set to
-          <c>standard_path</c> the default will be used.</p>
-        <p>If <c>Data</c> is set to <c>PortNumber</c>, the default data
-          will be used for ip-number (<c>127.0.0.1</c>) and server
-          name (<c>localhost</c>).</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop()->void</name>
-      <fsummary>Stop WebTool.</fsummary>
-      <desc>
-        <p>Stop WebTool and the tools started by WebTool.</p>
-      </desc>
-    </func>
-    <func>
-      <name>debug_app(Module)->void</name>
-      <fsummary>Debug a WebTool application.</fsummary>
-      <type>
-        <v>Module = atom()</v>
-      </type>
-      <desc>
-        <p>Debug a WebTool application by tracing all functions in the
-          given module which are called from WebTool.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop_debug()->void</name>
-      <fsummary>Stop debugging an application and format the trace log.</fsummary>
-      <desc>
-        <p>Stop the tracing started by <c>debug_app/1</c>, and format
-          the trace log.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>CALLBACK FUNCTIONS</title>
-    <p>The following callback function must be implemented by each web
-      based tool that will be used via WebTool. When started, WebTool
-      searches the Erlang code path for *.tool files to locate all web
-      based tools and their callback functions. See the <seealso marker="webtool_chapter">WebTool User's Guide</seealso> for more
-      information about the *.tool files.</p>
-  </section>
-  <funcs>
-    <func>
-      <name>Module:Func(Data)-> {Name,WebData}|error</name>
-      <fsummary>Returns configuration data needed by WebTool to configure and start a tool.</fsummary>
-      <type>
-        <v>Data = term()</v>
-        <v>Name = atom()</v>
-        <v>WebData = [WebOptions]</v>
-        <v>WebOptions = LinkData | Alias | Start</v>
-        <v>LinkData = {web_data,{ToolName,Url}}</v>
-        <v>Alias = {alias,{VirtualPath,RealPath}} |  {alias,{erl_alias,Path,[Modules]}</v>
-        <v>Start = {start,StartData}</v>
-        <v>ToolName = Url = VirtualPath = RealPath = Path = string()</v>
-        <v>Modules = atom()</v>
-        <v>StartData = AppData | ChildSpec | Func</v>
-        <v>AppData = {app,AppName}</v>
-        <v>ChildSpec = {child,child_spec()}</v>
-        <d>See the Reference Manual for the module supervisor in the STDLIB application for details about child_spec().</d>
-        <v>Func = {func,{StartMod,StartFunc,StartArg}, {StopMod,StopFunc,StopArg}}</v>
-        <v>AppName = StartMod = StartFunc = StopMod = StopFunc =atom()</v>
-        <v>StartArg = StopArg =  [term()]</v>
-      </type>
-      <desc>
-        <p>This is the configuration function (<c>config_func</c>)
-          which must be stated in the <c>*.tool</c> file.</p>
-        <p>The function is called by WebTool at startup to retrieve the
-          data needed to start and configure the tool. <c>LinkData</c> is
-          used by WebTool to create the link to the tool. <c>Alias</c> is
-          used to create the aliases needed by the webserver. <c>Start</c>
-          is used to start and stop the tool.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>See Also</title>
-    <p><seealso marker="start_webtool">start_webtool(1)</seealso>, 
-      <seealso marker="webtool_chapter">WebTool User's Guide</seealso></p>
-  </section>
-</erlref>
-
diff --git a/lib/webtool/doc/src/webtool_chapter.xml b/lib/webtool/doc/src/webtool_chapter.xml
deleted file mode 100644
index 160a42f855..0000000000
--- a/lib/webtool/doc/src/webtool_chapter.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2001</year><year>2013</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>WebTool User Guide</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>webtool_chapter.xml</file>
-  </header>
-
-  <section>
-    <title>Introduction </title>
-    <p>WebTool provides an easy and efficient way to implement web
-      based tools with Erlang/OTP. WebTool configures and starts the
-      webserver and the various web based tools.</p>
-    <p>All tools that shall run under WebTool must have a *.tool
-      file in the code path or in its priv directory. When WebTool
-      starts it searches the code path for such files. For each
-      <c>ebin</c> directory in the path, the <c>priv</c> directory is
-      also searched. The *.tool files contain the configuration data
-      for each web based tool.</p>
-  </section>
-
-  <section>
-    <title>Starting WebTool</title>
-    <p>Start WebTool by calling the function <c>webtool:start/0</c> or
-      <c>webtool:start/2</c>.  If <c>webtool:start/0</c> is used the
-      start page of WebTool is available at
-      <em>http://localhost:8888/</em> or
-      <em>http://127.0.0.1:8888/</em>, and the directory containing
-      the root directory for the webserver, is assumed to be
-      <c><![CDATA[webtool-<vsn>/priv]]></c>.</p>
-    <p>Use <c>webtool:start/2</c> if the default path for the root
-      directory, port, ip-number or server name can not be used. See
-      the Reference Manual for <seealso marker="webtool">webtool</seealso> for more information.</p>
-    <p>WebTool, with the default configuration as in <c>start/0</c>,
-      can also be started with the <c>start_webtool</c> script which
-      is available in the <c>priv</c> directory of the WebTool
-      application. See the Reference Manual for <seealso marker="start_webtool">start_webtool</seealso> for further
-      information about this script. For Windows users, the batch file
-      <c>start_webtool.bat</c> can be used for the same purpose.</p>
-  </section>
-
-  <section>
-    <title>Using WebTool</title>
-    <p>Start WebTool and point the browser to the corresponding URL. 
-      At the top of the page there is a frame with a link named 
-      <em>WebTool</em>. Click that link and a page where it is
-      possible to start the available tools will appear in the main
-      frame.</p>
-  </section>
-
-  <section>
-    <title>Start a web based tool</title>
-    <p>Click on the link labeled <em>WebTool</em> in the topmost  frame,
-      select the checkbox for each tool to start and
-      click on the button labeled <em>Start</em>. A link to each tool
-      that WebTool succeeded to start will appear in the topmost frame.</p>
-  </section>
-
-  <section>
-    <title>Stop a web based tool</title>
-    <p>Click on the link labeled <em>WebTool</em> in the topmost
-      frame. Select <em>Stop Tools</em> in the left frame. Select the
-      checkbox for each tool to stop and click on the button labeled
-      <em>Stop</em>.</p>
-  </section>
-
-  <section>
-    <title>Develop new web based tools</title>
-    <p>WebTool can be used as a framework when developing new web based
-      tools.</p>
-    <p>A web based tool running under WebTool will typically consist of
-      three parts.</p>
-    <list type="bulleted">
-      <item>A *.tool file which defines how WebTool can find the tool's
-       configuration data</item>
-      <item>The Erlang code generating the web interface to the tool (HTML
-       code)</item>
-      <item>The tool itself.</item>
-    </list>
-    <p>In most cases it is a good idea to separate the code for
-      creation of the html-pages and the code for the logic. This
-      increases the readability of the code and the logic might be
-      possible to reuse.</p>
-
-    <section>
-      <title>The *.tool file</title>
-      <p>When WebTool starts it searches the current path for
-        <c>*.tool</c> files to find all available tools. The *.tool
-        file contains a version identifier and a list of tuples which
-        is the configuration data. The version identifier specifies
-        the *.tool file version, i.e. not the version of
-        webtool. Currently the only valid version is "1.2" and the
-        only valid configuration tag is
-        <c>config_func</c>. <c>config_func</c> specifies which
-        function WebTool must call to get further configuration data
-        for the tool. This means that a *.tool file generally must
-        look like this:</p>
-      <code type="none">
-   {version,"1.2"}.
-   [{config_func,{Module,Function,Arguments}}].      </code>
-      <p><c>Module</c> is the name of the module where the callback
-        function is defined. <c>Function</c> is the name of the
-        callback function, and <c>Arguments</c> is the list of
-        arguments to the callback function.</p>
-    </section>
-
-    <section>
-      <title>The configuration function</title>
-      <p>The *.tool file points out a configuration function. This
-        function must return a list of configuration parameters (see
-        the Reference Manual for <seealso marker="webtool">webtool</seealso>).</p>
-      <p>The <c>web_data</c> parameter is mandatory and it specifies
-        the name of the tool and the link to the tool's start
-        page. All other parameters are optional.</p>
-      <p>If the tool requires any processes to run, the <c>start</c>
-        parameter specifies the function that WebTool must call in
-        order to start the process(es).</p>
-      <p>The <c>alias</c> parameters are passed directly on to the
-        webserver (INETS). The webserver has three ways to create
-        dynamic web pages CGI, Eval Scheme and Erl Scheme. All tools
-        running under WebTool must use Erl Scheme.</p>
-      <p>Erl Scheme tries to resemble plain CGI. The big difference is
-        that Erl Scheme can only execute Erlang code. The code will
-        furthermore be executed on the same instance as the webserver.</p>
-      <p>An URL which calls an Erlang function with Erl Scheme can have
-        the following syntax:</p>
-      <code type="none"><![CDATA[
-http://Servername:Port/ErlScriptAlias/Mod/Func<?QueryString>      ]]></code>
-      <p>An <c>alias</c> parameter in the configuration function can be
-        an ErlScriptAlias as used in the above URL. The definition of
-        an ErlScriptAlias shall be like this:</p>
-      <p><c>{alias,{erl_alias,Path,[Modules]}}</c>, e.g.</p>
-      <p><c>{alias,{erl_alias,"/testtool",[helloworld]}}</c></p>
-      <p>The following URL will then cause a call to the function
-        helloworld:helloworld/2 (if WebTool is started with default
-        settings i.e. servername "localhost" and port 8888):</p>
-      <p><c>http://localhost:8888/testtool/helloworld/helloworld</c></p>
-      <p>Note that the module <c>helloworld</c> must be in the code
-        path of the node running WebTool.</p>
-      <p>Functions that are called via the Erl Scheme must take two 
-        arguments, <c>Environment</c> and <c>Input</c>. 
-        </p>
-      <list type="bulleted">
-        <item><c>Environment</c> is a list of key/value tuples.</item>
-        <item><c>Input</c> is the part of the URL after the "?", i.e. the
-         part of the URL containing name-value pairs. If the page was
-         called with the URL:
-                <br></br>
-<c><![CDATA[http://localhost:8888/testtool/helloworld/helloworld?input1=one&amp;input2=two]]></c>        <br></br>
-<c>Input</c> will be the string
-        <c><![CDATA["input1=one&amp;input2=two"]]></c>.  In the module
-        <c>httpd</c> in the INETS application there is a function
-        <c>parse_query</c> which will parse such a string and return
-         a list of key-value tuples.</item>
-      </list>
-      <p>An <c>alias</c> parameter in the configuration function can
-        also be a normal path alias. This can e.g. be used to point
-        out a directory where HTML files are stored. The following
-        definition states that the URL
-        <c>http://localhost:8888/mytool_home/</c> really points to the
-        directory <c>/usr/local/otp/lib/myapp-1.0/priv</c>:</p>
-      <p><c>{alias,{"/mytool_home","/usr/local/otp/lib/myapp-1.0/priv"}}</c></p>
-      <p>See the INETS documentation, especially the module
-        <c>mod_esi</c>, for a more in depth coverage of the Erl Scheme.</p>
-    </section>
-
-    <section>
-      <title>A small example</title>
-      <p>A Hello World example that uses Erl Scheme would look like
-        this. Note that this example does not have a process running
-        and thus does not need a <c>start</c> parameter in the
-        configuration function.
-        </p>
-      <p><em>helloworld.erl:</em></p>
-      <pre>
-        -module(helloworld).
-        -export([config_data/0]).
-        -export([helloworld/2]).
-        
-        config_data()->
-            {testtool,
-             [{web_data,{"TestTool","/testtool/helloworld/helloworld"}},
-              {alias,{erl_alias,"/testtool",[helloworld]}}]}.
-        
-        helloworld(_Env,_Input)-&gt;
-            [header(),html_header(),helloworld_body(),html_end()].
-
-        header() -&gt;
-            header("text/html").
-
-        header(MimeType) -&gt;
-            "Content-type: " ++ MimeType ++ "\r\n\r\n".
-
-        html_header() -&gt;    
-            "&lt;HTML&gt;
-               &lt;HEAD&gt;
-                  &lt;TITLE&gt;Hello world Example &lt;/TITLE&gt;
-               &lt;/HEAD&gt;\n".
-
-        helloworld_body()-&gt;
-            "&lt;BODY&gt;Hello World&lt;/BODY&gt;".
-
-        html_end()-&gt;
-            "&lt;/HTML&gt;".
-      </pre>
-      <p>To use this example with WebTool a *.tool file must be created
-        and added to a directory in the current path, e.g. the same
-        directory as the compiled <c>helloworld.beam</c>.</p>
-      <p><em>testtool.tool:</em></p>
-      <code type="none">
-        {version,"1.2"}.
-        [{config_func, {helloworld,config_data,[]}}].
-      </code>
-      <p>When <c>helloworld.erl</c> is compiled, start WebTool by
-        calling the function <c>webtool:start()</c> and point your
-        browser to <em>http://localhost:8888/</em>. Select WebTool in
-        the topmost frame and start TestTool from the web page.  Click
-        on the link labeled <em>TestTool</em> in the topmost frame.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/webtool/ebin/.gitignore b/lib/webtool/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/webtool/ebin/.gitignore
+++ /dev/null
diff --git a/lib/webtool/info b/lib/webtool/info
deleted file mode 100644
index 4d8dc6f2cb..0000000000
--- a/lib/webtool/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: tools
-short: A tool that simplifying the use of  web based Erlang tools
diff --git a/lib/webtool/priv/Makefile b/lib/webtool/priv/Makefile
deleted file mode 100644
index 4963767a4d..0000000000
--- a/lib/webtool/priv/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# ``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.
-# 
-# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-# AB. All Rights Reserved.''
-# 
-#     $Id$
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(WEBTOOL_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/webtool-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ---------------------------------------------------- 
-
-WEBSERVER_CONFIG_FILES = root/conf/mime.types
-
-HTDOCS_FILES =  root/doc/index.html \
-	        root/doc/tool_management.html \
-	        root/doc/start_info.html 
-
-ifeq ($(findstring win32,$(TARGET)),win32)
-WIN32_SCRIPTS= bin/start_webtool.bat
-else
-WIN32_SCRIPTS=
-endif
-SCRIPTS = bin/start_webtool $(WIN32_SCRIPTS)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: 
-
-clean:
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR)  "$(RELSYSDIR)/priv"
-	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/root"
-	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/root/conf"
-	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/root/doc"
-	$(INSTALL_DATA) $(HTDOCS_FILES) "$(RELSYSDIR)/priv/root/doc"
-	$(INSTALL_DATA) $(WEBSERVER_CONFIG_FILES) "$(RELSYSDIR)/priv/root/conf"
-	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/bin"
-	$(INSTALL_SCRIPT)  $(SCRIPTS) "$(RELSYSDIR)/priv/bin"
-
-release_docs_spec:
-
-
diff --git a/lib/webtool/priv/bin/start_webtool b/lib/webtool/priv/bin/start_webtool
deleted file mode 100755
index e552fb5af0..0000000000
--- a/lib/webtool/priv/bin/start_webtool
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh 
-
-erl -sname webtool -s webtool script_start $@
diff --git a/lib/webtool/priv/bin/start_webtool.bat b/lib/webtool/priv/bin/start_webtool.bat
deleted file mode 100644
index cd16aa6200..0000000000
--- a/lib/webtool/priv/bin/start_webtool.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@ECHO OFF

-CALL erl -sname webtool -s webtool script_start %* -s erlang halt
\ No newline at end of file
diff --git a/lib/webtool/priv/root/conf/mime.types b/lib/webtool/priv/root/conf/mime.types
deleted file mode 100644
index 32f7cd853c..0000000000
--- a/lib/webtool/priv/root/conf/mime.types
+++ /dev/null
@@ -1,99 +0,0 @@
-# This is a comment. I love comments.
-
-application/activemessage
-application/andrew-inset
-application/applefile
-application/atomicmail
-application/dca-rft
-application/dec-dx
-application/mac-binhex40	hqx
-application/mac-compactpro	cpt
-application/macwriteii
-application/msword		doc
-application/news-message-id
-application/news-transmission
-application/octet-stream	bin dms lha lzh exe class
-application/oda			oda
-application/pdf			pdf
-application/postscript		ai eps ps
-application/powerpoint		ppt
-application/remote-printing
-application/rtf			rtf
-application/slate
-application/wita
-application/wordperfect5.1
-application/x-bcpio		bcpio
-application/x-cdlink		vcd
-application/x-compress		Z
-application/x-cpio		cpio
-application/x-csh		csh
-application/x-director		dcr dir dxr
-application/x-dvi		dvi
-application/x-gtar		gtar
-application/x-gzip		gz
-application/x-hdf		hdf
-application/x-httpd-cgi		cgi
-application/x-koan		skp skd skt skm
-application/x-latex		latex
-application/x-mif		mif
-application/x-netcdf		nc cdf
-application/x-sh		sh
-application/x-shar		shar
-application/x-stuffit		sit
-application/x-sv4cpio		sv4cpio
-application/x-sv4crc		sv4crc
-application/x-tar		tar
-application/x-tcl		tcl
-application/x-tex		tex
-application/x-texinfo		texinfo texi
-application/x-troff		t tr roff
-application/x-troff-man		man
-application/x-troff-me		me
-application/x-troff-ms		ms
-application/x-ustar		ustar
-application/x-wais-source	src
-application/zip			zip
-audio/basic			au snd
-audio/mpeg			mpga mp2
-audio/x-aiff			aif aiff aifc
-audio/x-pn-realaudio		ram
-audio/x-pn-realaudio-plugin	rpm
-audio/x-realaudio		ra
-audio/x-wav			wav
-chemical/x-pdb			pdb xyz
-image/gif			gif
-image/ief			ief
-image/jpeg			jpeg jpg jpe
-image/png			png
-image/tiff			tiff tif
-image/x-cmu-raster		ras
-image/x-portable-anymap		pnm
-image/x-portable-bitmap		pbm
-image/x-portable-graymap	pgm
-image/x-portable-pixmap		ppm
-image/x-rgb			rgb
-image/x-xbitmap			xbm
-image/x-xpixmap			xpm
-image/x-xwindowdump		xwd
-message/external-body
-message/news
-message/partial
-message/rfc822
-multipart/alternative
-multipart/appledouble
-multipart/digest
-multipart/mixed
-multipart/parallel
-text/html			html htm
-text/x-server-parsed-html	shtml
-text/plain			txt
-text/richtext			rtx
-text/tab-separated-values	tsv
-text/x-setext			etx
-text/x-sgml			sgml sgm
-video/mpeg			mpeg mpg mpe
-video/quicktime			qt mov
-video/x-msvideo			avi
-video/x-sgi-movie		movie
-x-conference/x-cooltalk		ice
-x-world/x-vrml			wrl vrml
diff --git a/lib/webtool/priv/root/doc/index.html b/lib/webtool/priv/root/doc/index.html
deleted file mode 100644
index 9fbb143cc7..0000000000
--- a/lib/webtool/priv/root/doc/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Erlang WebTool</TITLE>
-</HEAD>
-<FRAMESET ROWS="60,*">
-<FRAME NAME="top1" SRC="webtool/webtool/started_tools">
-<FRAME NAME="app_frame" SRC="./start_info.html">
-</FRAMESET>
-</HTML>
-
-
diff --git a/lib/webtool/priv/root/doc/start_info.html b/lib/webtool/priv/root/doc/start_info.html
deleted file mode 100644
index fcf44433f1..0000000000
--- a/lib/webtool/priv/root/doc/start_info.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<HTML>
-<HEAD>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<TABLE WIDTH=100% HEIGHT=100%>
-<TR VALIGN="middle">
-<TD ALIGN="center">
-
-<TABLE WIDTH="60%">
-<TR>
-<TD ALIGN="center"><FONT SIZE=6>Welcome <BR> to<BR> WebTool</FONT></TD>
-</TR>
-
-<TR>
-<TD><BR><BR><BR><BR>
-</TD>
-</TR>
-
-<TR>
-<TD ALIGN="center">Click on the link WebTool on the top of the page, or <A HREF=tool_management.html>here</a> to start the Web based tools.</TD>
-</TR>
-</TABLE>
-
-</TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/lib/webtool/priv/root/doc/tool_management.html b/lib/webtool/priv/root/doc/tool_management.html
deleted file mode 100644
index 19d9dbcb9e..0000000000
--- a/lib/webtool/priv/root/doc/tool_management.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Erlang WebTool </TITLE>
-</HEAD>
-<FRAMESET COLS="200,*">
-<FRAME NAME="left" SRC="/webtool/webtool/toolbar">
-<FRAME NAME="right" SRC="/webtool/webtool/start_tools">
-</FRAMESET>
-
diff --git a/lib/webtool/src/webtool.app.src b/lib/webtool/src/webtool.app.src
deleted file mode 100644
index 6b9750c2b4..0000000000
--- a/lib/webtool/src/webtool.app.src
+++ /dev/null
@@ -1,28 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. 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%
-%%
-{application,webtool,
-	[{description,"Toolbar lookalike for the web"},
-	{vsn,"%VSN%"},
-	{modules,[webtool,webtool_sup]},
-	{registered,[web_tool,websup]},
-	{applications,[kernel,stdlib]},
-	{runtime_dependencies, ["stdlib-2.0","observer-2.0","kernel-3.0",
-				"inets-5.10","erts-6.0"]}]}.
-	
diff --git a/lib/webtool/src/webtool.appup.src b/lib/webtool/src/webtool.appup.src
deleted file mode 100644
index 1394d0d6d5..0000000000
--- a/lib/webtool/src/webtool.appup.src
+++ /dev/null
@@ -1,22 +0,0 @@
-%% -*- erlang -*-
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2014. 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%
-{"%VSN%",
- [{<<".*">>,[{restart_application, webtool}]}],
- [{<<".*">>,[{restart_application, webtool}]}]
-}.
diff --git a/lib/webtool/src/webtool.erl b/lib/webtool/src/webtool.erl
deleted file mode 100644
index 80dad53f8f..0000000000
--- a/lib/webtool/src/webtool.erl
+++ /dev/null
@@ -1,1208 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2001-2010. 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%
-%%
--module(webtool).
--behaviour(gen_server).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%% The general idea is:                                               %%
-%%                                                                    %%
-%%                                                                    %%
-%% 1. Scan through the path for *.tool files and find all the web     %%
-%%    based tools. Query each tool for configuration data.            %%
-%% 2. Add Alias for Erlscript and html for each tool to               %%
-%%    the webserver configuration data.                               %%
-%% 3. Start the webserver.                                            %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% API functions
--export([start/0, start/2, stop/0]).
-
-%% Starting Webtool from a shell script
--export([script_start/0, script_start/1]).
-
-%% Web api
--export([started_tools/2, toolbar/2, start_tools/2, stop_tools/2]).
-
-%% API against other tools
--export([is_localhost/0]).
-
-%% Debug export s
--export([get_tools1/1]).
--export([debug/1, stop_debug/0, debug_app/1]).
-
-%% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2, code_change/3]).
-
--include_lib("kernel/include/file.hrl").
--include_lib("stdlib/include/ms_transform.hrl").
-
--record(state,{priv_dir,app_data,supvis,web_data,started=[]}).
-
--define(MAX_NUMBER_OF_WEBTOOLS,256).
--define(DEFAULT_PORT,8888).% must be >1024 or the user must be root on unix
--define(DEFAULT_ADDR,{127,0,0,1}).
-
--define(WEBTOOL_ALIAS,{webtool,[{alias,{erl_alias,"/webtool",[webtool]}}]}).
--define(HEADER,"Pragma:no-cache\r\n Content-type: text/html\r\n\r\n").
--define(HTML_HEADER,"<HTML>\r\n<HEAD>\r\n<TITLE>WebTool</TITLE>\r\n</HEAD>\r\n<BODY BGCOLOR=\"#FFFFFF\">\r\n").
--define(HTML_HEADER_RELOAD,"<HTML>\r\n<HEAD>\r\n<TITLE>WebTool
-                             </TITLE>\r\n</HEAD>\r\n
-                             <BODY BGCOLOR=\"#FFFFFF\" onLoad=reloadCompiledList()>\r\n").
-
--define(HTML_END,"</BODY></HTML>").
-
--define(SEND_URL_TIMEOUT,5000).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% For debugging only.                                              %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Start tracing with
-%% debug(Functions).
-%% Functions = local | global | FunctionList
-%% FunctionList = [Function]
-%% Function = {FunctionName,Arity} | FunctionName |
-%%            {Module, FunctionName, Arity} | {Module,FunctionName}
-debug(F) -> 
-    ttb:tracer(all,[{file,"webtool.trc"}]), % tracing all nodes
-    ttb:p(all,[call,timestamp]),
-    MS = [{'_',[],[{return_trace},{message,{caller}}]}],
-    tp(F,MS),
-    ttb:ctp(?MODULE,stop_debug), % don't want tracing of the stop_debug func
-    ok.
-tp(local,MS) -> % all functions
-    ttb:tpl(?MODULE,MS);
-tp(global,MS) -> % all exported functions
-    ttb:tp(?MODULE,MS);
-tp([{M,F,A}|T],MS) -> % Other module
-    ttb:tpl(M,F,A,MS),
-    tp(T,MS);
-tp([{M,F}|T],MS) when is_atom(F) -> % Other module
-    ttb:tpl(M,F,MS),
-    tp(T,MS);
-tp([{F,A}|T],MS) -> % function/arity
-    ttb:tpl(?MODULE,F,A,MS),
-    tp(T,MS);
-tp([F|T],MS) -> % function
-    ttb:tpl(?MODULE,F,MS),
-    tp(T,MS);
-tp([],_MS) ->
-    ok.
-stop_debug() ->
-    ttb:stop([format]).
-
-debug_app(Mod) ->
-    ttb:tracer(all,[{file,"webtool_app.trc"},{handler,{fun out/4,true}}]),
-    ttb:p(all,[call,timestamp]),
-    MS = [{'_',[],[{return_trace},{message,{caller}}]}],
-    ttb:tp(Mod,MS),
-    ok.
-   
-out(_,{trace_ts,Pid,call,MFA={M,F,A},{W,_,_},TS},_,S) 
-  when W==webtool;W==mod_esi-> 
-    io:format("~w: (~p)~ncall ~s~n", [TS,Pid,ffunc(MFA)]),
-    [{M,F,length(A)}|S];
-out(_,{trace_ts,Pid,return_from,MFA,R,TS},_,[MFA|S]) ->
-    io:format("~w: (~p)~nreturned from ~s -> ~p~n", [TS,Pid,ffunc(MFA),R]),
-    S;
-out(_,_,_,_) ->
-    ok.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% Functions called via script.                                     %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-script_start() ->
-    usage(),
-    halt().
-script_start([App]) ->
-    DefaultBrowser = 
-	case os:type() of
-	    {win32,_} -> iexplore;
-	    _ -> firefox
-	end,
-    script_start([App,DefaultBrowser]);
-script_start([App,Browser]) ->
-    io:format("Starting webtool...\n"),
-    start(),
-    AvailableApps = get_applications(),
-    {OSType,_} = os:type(),
-    case lists:keysearch(App,1,AvailableApps) of
-	{value,{App,StartPage}} ->
-	    io:format("Starting ~w...\n",[App]),
-	    start_tools([],"app=" ++ atom_to_list(App)),
-	    PortStr = integer_to_list(get_port()),
-	    Url = case StartPage of
-		      "/" ++ Page -> 
-			  "http://localhost:" ++ PortStr ++ "/" ++ Page;
-		      _ -> 
-			  "http://localhost:" ++ PortStr ++ "/" ++ StartPage
-		  end,
-	    case Browser of 
-		none ->
-		    ok;
-                iexplore when OSType == win32->
-                    io:format("Starting internet explorer...\n"),
-                    {ok,R} = win32reg:open(""),
-		    Key="\\local_machine\\SOFTWARE\\Microsoft\\IE Setup\\Setup",
-                    win32reg:change_key(R,Key),
-                    {ok,Val} = win32reg:value(R,"Path"),
-		    IExplore=filename:join(win32reg:expand(Val),"iexplore.exe"),
-                    os:cmd("\"" ++ IExplore ++ "\" " ++ Url);
-		_ when OSType == win32 ->
-                    io:format("Starting ~w...\n",[Browser]),
-                    os:cmd("\"" ++ atom_to_list(Browser) ++ "\" " ++ Url);
-		B when B==firefox; B==mozilla ->
-		    io:format("Sending URL to ~w...",[Browser]),
-		    BStr = atom_to_list(Browser),
-		    SendCmd = BStr ++ " -raise -remote \'openUrl(" ++ 
-			Url ++ ")\'",
-		    Port = open_port({spawn,SendCmd},[exit_status]),
-		    receive 
-			{Port,{exit_status,0}} -> 
-			    io:format("done\n"),
-			    ok;
-			{Port,{exit_status,_Error}} ->
-			    io:format(" not running, starting ~w...\n",
-				      [Browser]),
-			    os:cmd(BStr ++ " " ++ Url),
-			    ok
-		    after ?SEND_URL_TIMEOUT ->
-			    io:format(" failed, starting ~w...\n",[Browser]),
-			    erlang:port_close(Port),
-			    os:cmd(BStr ++ " " ++ Url)
-		    end;
-		_ ->
-		    io:format("Starting ~w...\n",[Browser]),
-		    os:cmd(atom_to_list(Browser) ++ " " ++ Url)
-	    end,
-	    ok;
-	false ->
-	    stop(),
-	    io:format("\n{error,{unknown_app,~p}}\n",[App]),
-	    halt()
-    end.
-
-usage() ->
-    io:format("Starting webtool...\n"),
-    start(),
-    Apps = lists:map(fun({A,_}) -> A end,get_applications()),
-    io:format(
-      "\nUsage: start_webtool application [ browser ]\n"
-      "\nAvailable applications are: ~p\n"
-      "Default browser is \'iexplore\' (Internet Explorer) on Windows "
-      "or else \'firefox\'\n",
-      [Apps]),
-    stop().
-
-
-get_applications() ->
-    gen_server:call(web_tool,get_applications).
-    
-get_port() ->
-    gen_server:call(web_tool,get_port).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% Api functions to the genserver.                                  %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%----------------------------------------------------------------------
-%
-%----------------------------------------------------------------------
-
-start()->
-    start(standard_path,standard_data).
-
-start(Path,standard_data)->
-    case get_standard_data() of
-	{error,Reason} ->
-	    {error,Reason};
-	Data ->
-	    start(Path,Data)
-    end;
-    
-start(standard_path,Data)->
-    Path=get_path(),
-    start(Path,Data);
-    
-start(Path,Port) when is_integer(Port)->
-    Data = get_standard_data(Port),
-    start(Path,Data);
-	
-start(Path,Data0)->
-    Data = Data0 ++ rest_of_standard_data(),
-    gen_server:start({local,web_tool},webtool,{Path,Data},[]).
-
-stop()->
-    gen_server:call(web_tool,stoppit).
-
-%----------------------------------------------------------------------
-%Web Api functions called by the web
-%----------------------------------------------------------------------
-started_tools(Env,Input)->
-    gen_server:call(web_tool,{started_tools,Env,Input}).
-
-toolbar(Env,Input)->    
-    gen_server:call(web_tool,{toolbar,Env,Input}).
-
-start_tools(Env,Input)->
-    gen_server:call(web_tool,{start_tools,Env,Input}).
-
-stop_tools(Env,Input)->
-    gen_server:call(web_tool,{stop_tools,Env,Input}).
-%----------------------------------------------------------------------
-%Support API for other tools
-%----------------------------------------------------------------------
-
-is_localhost()->
-    gen_server:call(web_tool,is_localhost).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%%The gen_server callback functions that builds the webbpages       %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-handle_call(get_applications,_,State)->
-    MS = ets:fun2ms(fun({Tool,{web_data,{_,Start}}}) -> {Tool,Start} end),
-    Tools = ets:select(State#state.app_data,MS),
-    {reply,Tools,State};
-
-handle_call(get_port,_,State)->
-    {value,{port,Port}}=lists:keysearch(port,1,State#state.web_data),
-    {reply,Port,State};
-
-handle_call({started_tools,_Env,_Input},_,State)->
-    {reply,started_tools_page(State),State};
-
-handle_call({toolbar,_Env,_Input},_,State)->
-    {reply,toolbar(),State};
-
-handle_call({start_tools,Env,Input},_,State)->
-    {NewState,Page}=start_tools_page(Env,Input,State),
-    {reply,Page,NewState};
-
-handle_call({stop_tools,Env,Input},_,State)->
-    {NewState,Page}=stop_tools_page(Env,Input,State),
-    {reply,Page,NewState};
-
-handle_call(stoppit,_From,Data)->
-    {stop,normal,ok,Data};
-
-handle_call(is_localhost,_From,Data)->
-    Result=case proplists:get_value(bind_address, Data#state.web_data) of
-	?DEFAULT_ADDR ->
-	    true;
-	_IpNumber ->
-	    false 
-    end,
-    {reply,Result,Data}.
-
-
-handle_info(_Message,State)->
-    {noreply,State}.
-
-handle_cast(_Request,State)->
-    {noreply,State}.
-
-code_change(_,State,_)->
-    {ok,State}.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% The other functions needed by the gen_server behaviour 
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%----------------------------------------------------------------------
-% Start the gen_server
-%----------------------------------------------------------------------
-init({Path,Config})->
-    case filelib:is_dir(Path) of
-	true ->
-	    {ok, Table} = get_tool_files_data(),
-	    insert_app(?WEBTOOL_ALIAS, Table),
-	    case webtool_sup:start_link() of
-		{ok, Pid} ->
-		    case start_webserver(Table, Path, Config) of
-			{ok, _} ->
-			    print_url(Config),	
-			    {ok,#state{priv_dir=Path,
-				       app_data=Table,
-				       supvis=Pid,
-				       web_data=Config}};
-			{error, Error} ->
-			    {stop, {error, Error}}
-		    end;
-		Error ->
-		    {stop,Error}
-	    end;
-	false ->
-	   {stop, {error, error_dir}}
-    end.
-
-terminate(_Reason,Data)->
-    %%shut down the webbserver
-    shutdown_server(Data),
-    %%Shutdown the different tools that are started with application:start
-    shutdown_apps(Data),
-    %%Shutdown the supervisor and its children will die
-    shutdown_supervisor(Data),
-    ok.
-
-print_url(ConfigData)->
-    Server=proplists:get_value(server_name,ConfigData,"undefined"),
-    Port=proplists:get_value(port,ConfigData,"undefined"),
-    {A,B,C,D}=proplists:get_value(bind_address,ConfigData,"undefined"),
-    io:format("WebTool is available at http://~s:~w/~n",[Server,Port]),
-    io:format("Or  http://~w.~w.~w.~w:~w/~n",[A,B,C,D,Port]).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% begin build the pages
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------------------------------------
-%The page that shows the started tools
-%----------------------------------------------------------------------
-started_tools_page(State)->
-    [?HEADER,?HTML_HEADER,started_tools(State),?HTML_END].
-
-toolbar()->
-    [?HEADER,?HTML_HEADER,toolbar_page(),?HTML_END].
-
-               
-start_tools_page(_Env,Input,State)->
-    %%io:format("~n======= ~n ~p ~n============~n",[Input]),
-    case get_tools(Input) of
-	{tools,Tools}->
-	    %%io:format("~n======= ~n ~p ~n============~n",[Tools]),
-	    {ok,NewState}=handle_apps(Tools,State,start),
-	    {NewState,[?HEADER,?HTML_HEADER_RELOAD,reload_started_apps(),
-		       show_unstarted_apps(NewState),?HTML_END]};
-	_ ->
-	    {State,[?HEADER,?HTML_HEADER,show_unstarted_apps(State),?HTML_END]}
-    end.
-
-stop_tools_page(_Env,Input,State)->
-    case get_tools(Input) of
-	{tools,Tools}->
-	    {ok,NewState}=handle_apps(Tools,State,stop),
-	    {NewState,[?HEADER,?HTML_HEADER_RELOAD,reload_started_apps(),
-		       show_started_apps(NewState),?HTML_END]};
-	_ ->
-	    {State,[?HEADER,?HTML_HEADER,show_started_apps(State),?HTML_END]}
-    end.
-	
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Functions that start and config the webserver
-%% 1. Collect the config data
-%% 2. Start webserver
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------------------------------------
-% Start the webserver
-%----------------------------------------------------------------------
-start_webserver(Data,Path,Config)->
-    case get_conf_data(Data,Path,Config) of
-	{ok,Conf_data}->
-	    %%io:format("Conf_data: ~p~n",[Conf_data]),
-	    start_server(Conf_data);
-	{error,Error} ->
-	    {error,{error_server_conf_file,Error}}
-    end.
-
-start_server(Conf_data)->
-    case inets:start(httpd, Conf_data, stand_alone) of
-	{ok,Pid}->
-	    {ok,Pid};
-	Error->
-	    {error,{server_error,Error}}
-    end.
-
-%----------------------------------------------------------------------
-% Create config data for the webserver 
-%----------------------------------------------------------------------
-get_conf_data(Data,Path,Config)->
-    Aliases=get_aliases(Data),
-    ServerRoot = filename:join([Path,"root"]),
-    MimeTypesFile = filename:join([ServerRoot,"conf","mime.types"]),
-    case httpd_conf:load_mime_types(MimeTypesFile) of
-	{ok,MimeTypes} ->
-	    Config1 = Config ++ Aliases,
-	    Config2 = [{server_root,ServerRoot},
-			    {document_root,filename:join([Path,"root/doc"])},
-			    {mime_types,MimeTypes} |
-			    Config1],
-	    {ok,Config2};
-	Error ->
-	    Error
-    end.
-
-%----------------------------------------------------------------------
-% Control the path for *.tools files 
-%----------------------------------------------------------------------
-get_tool_files_data()->
-    Tools=get_tools1(code:get_path()),
-    %%io:format("Data : ~p ~n",[Tools]),
-    get_file_content(Tools).
-
-%----------------------------------------------------------------------
-%Control that the data in the file really is erlang terms
-%---------------------------------------------------------------------- 
-get_file_content(Tools)->
-    Get_data=fun({tool,ToolData}) ->
-		     %%io:format("Data : ~p ~n",[ToolData]),
-		     case proplists:get_value(config_func,ToolData) of
-			 {M,F,A}->
-			     case catch apply(M,F,A) of
-				 {'EXIT',_} ->
-				     bad_data;
-				 Data when is_tuple(Data) ->
-				     Data;
-				 _->
-				     bad_data  
-			     end;
-			 _ ->
-				bad_data
-		     end
-	     end,
-    insert_file_content([X ||X<-lists:map(Get_data,Tools),X/=bad_data]).
-
-%----------------------------------------------------------------------
-%Insert the data from the file in to the ets:table
-%----------------------------------------------------------------------
-insert_file_content(Content)->
-    Table=ets:new(app_data,[bag]),
-    lists:foreach(fun(X)->
-			  insert_app(X,Table)
-		  end,Content),
-    {ok,Table}.
-
-%----------------------------------------------------------------------
-%Control that we got a a tuple of a atom and a list if so add the 
-%elements in the list to the ets:table
-%----------------------------------------------------------------------
-insert_app({Name,Key_val_list},Table) when is_list(Key_val_list),is_atom(Name)->
-    %%io:format("ToolData: ~p: ~p~n",[Name,Key_val_list]),
-    lists:foreach(
-      fun({alias,{erl_alias,Alias,Mods}}) ->
-	      Key_val = {erl_script_alias,{Alias,Mods}},
-	      %%io:format("Insert: ~p~n",[Key_val]),
-	      ets:insert(Table,{Name,Key_val});
-	 (Key_val_pair)->
-	      %%io:format("Insert: ~p~n",[Key_val_pair]),
-	      ets:insert(Table,{Name,Key_val_pair})
-      end,
-      Key_val_list);
-
-insert_app(_,_)->
-    ok.
-   
-%----------------------------------------------------------------------
-% Select all the alias in the database
-%----------------------------------------------------------------------
-get_aliases(Data)->
-    MS = ets:fun2ms(fun({_,{erl_script_alias,Alias}}) -> 
-			    {erl_script_alias,Alias};
-		       ({_,{alias,Alias}}) -> 
-			    {alias,Alias} 
-		    end),
-    ets:select(Data,MS).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% Helper functions                                                 %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-get_standard_data(Port)->
-    [
-     {port,Port},
-     {bind_address,?DEFAULT_ADDR},
-     {server_name,"localhost"}
-    ].
-
-get_standard_data()->
-    case get_free_port(?DEFAULT_PORT,?MAX_NUMBER_OF_WEBTOOLS) of
-	{error,Reason} -> {error,Reason};
-	Port ->
-	    [
-	     {port,Port},
-	     {bind_address,?DEFAULT_ADDR},
-	     {server_name,"localhost"}
-	    ]
-    end.
-
-get_free_port(_Port,0) ->
-    {error,no_free_port_found};
-get_free_port(Port,N) ->
-    case gen_tcp:connect("localhost",Port,[]) of
-	{error, _Reason} ->
-	    Port;
-	{ok,Sock} ->
-	    gen_tcp:close(Sock),
-	    get_free_port(Port+1,N-1)
-    end.
-
-rest_of_standard_data() ->
-    [
-     %% Do not allow the server to be crashed by malformed http-request
-     {max_header_siz,1024},
-     {max_header_action,reply414},
-     %% Go on a straight ip-socket
-     {com_type,ip_comm},
-     %% Do not change the order of these module names!!
-     {modules,[mod_alias,
-	       mod_auth,
-	       mod_esi,
-	       mod_actions,
-	       mod_cgi,
-	       mod_include,
-	       mod_dir,
-	       mod_get,
-	       mod_head,
-	       mod_log,
-	       mod_disk_log]},
-     {directory_index,["index.html"]},
-     {default_type,"text/plain"}
-    ].
-
-
-get_path()->
-    code:priv_dir(webtool).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% These functions is used to shutdown the webserver
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------------------------------------
-% Shut down the webbserver 
-%----------------------------------------------------------------------
-shutdown_server(State)->
-    {Addr,Port} = get_addr_and_port(State#state.web_data),
-    inets:stop(httpd,{Addr,Port}).
-
-get_addr_and_port(Config) ->
-    Addr = proplists:get_value(bind_address,Config,?DEFAULT_ADDR),
-    Port = proplists:get_value(port,Config,?DEFAULT_PORT),
-    {Addr,Port}.
-
-%----------------------------------------------------------------------
-% Select all apps in the table and close them
-%----------------------------------------------------------------------
-shutdown_apps(State)->
-    Data=State#state.app_data,
-    MS = ets:fun2ms(fun({_,{start,HowToStart}}) -> HowToStart end),
-    lists:foreach(fun(Start_app)->
-			  stop_app(Start_app)
-		  end,
-		  ets:select(Data,MS)).
-
-%----------------------------------------------------------------------
-%Shuts down the supervisor that supervises tools that is not
-%Designed as applications
-%----------------------------------------------------------------------
-shutdown_supervisor(State)->
-    %io:format("~n==================~n"),
-    webtool_sup:stop(State#state.supvis).
-    %io:format("~n==================~n").
-
-%----------------------------------------------------------------------
-%close the individual apps.
-%----------------------------------------------------------------------  
-stop_app({child,_Real_name})->
-    ok;
-
-stop_app({app,Real_name})->
-    application:stop(Real_name);
-
-stop_app({func,_Start,Stop})->    
-    case Stop of
-	{M,F,A} ->
-	    catch apply(M,F,A);
-	_NoStop ->
-	    ok
-    end.
-
-
-
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% These functions creates the webpage where the user can select if 
-%% to start apps or to stop apps
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-toolbar_page()->
-    "<TABLE>
-       <TR>
-         <TD>
-             <B>Select Action</B>
-         </TD>
-       </TR>
-       <TR>
-         <TD>
-            <A HREF=\"./start_tools\" TARGET=right> Start Tools</A>
-         </TD>
-       </TR>
-       <TR>
-         <TD>
-            <A HREF=\"./stop_tools\" TARGET=right> Stop Tools</A>
-	 </TD> 
-      </TR> 
-    </TABLE>".
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% These functions creates the webbpage that  shows the started apps
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------------------------------------
-% started_tools(State)->String (html table)
-% State is a record of type state
-%----------------------------------------------------------------------
-started_tools(State)->
-    Names=get_started_apps(State#state.app_data,State#state.started),
-    "<TABLE BORDER=1 WIDTH=100%>
-	"++ make_rows(Names,[],0) ++"
-     </TABLE>".
-%----------------------------------------------------------------------
-%get_started_apps(Data,Started)-> [{web_name,link}]
-%selects the started apps from the ets table of apps.
-%----------------------------------------------------------------------
-    
-get_started_apps(Data,Started)->
-    SelectData=fun({Name,Link}) ->
-		       {Name,Link}
-	       end,
-    MS = lists:map(fun(A) -> {{A,{web_data,'$1'}},[],['$1']} end,Started),
-
-    [{"WebTool","/tool_management.html"} | 
-     [SelectData(X) || X <- ets:select(Data,MS)]].
-
-%----------------------------------------------------------------------
-% make_rows(List,Result,Fields)-> String (The rows of a htmltable
-% List a list of tupler discibed above
-% Result an accumulator for the result
-% Field, counter that counts the number of cols in each row.
-%----------------------------------------------------------------------
-make_rows([],Result,Fields)->
-    Result ++ fill_out(Fields);
-make_rows([Data|Paths],Result,Field)when Field==0->
-   make_rows(Paths,Result ++ "<TR>" ++ make_field(Data),Field+1);
-
-make_rows([Path|Paths],Result,Field)when Field==4->
-   make_rows(Paths,Result ++ make_field(Path) ++ "</TR>",0);
-
-make_rows([Path|Paths],Result,Field)->
-   make_rows(Paths,Result ++ make_field(Path),Field+1).
-
-%----------------------------------------------------------------------
-% make_fields(Path)-> String that is a field i a html table
-% Path is a name url tuple {Name,url}
-%----------------------------------------------------------------------
-make_field(Path)->
-    "<TD WIDTH=20%>" ++ get_name(Path) ++ "</TD>".
-
-
-%----------------------------------------------------------------------
-%get_name({Nae,Url})->String that represents a <A> tag in html. 
-%----------------------------------------------------------------------
-get_name({Name,Url})->
-    "<A HREF=\"" ++ Url ++ "\" TARGET=app_frame>" ++ Name ++ "</A>".
-
-
-%----------------------------------------------------------------------
-% fill_out(Nr)-> String, that represent Nr fields in a html-table.
-%----------------------------------------------------------------------
-fill_out(Nr)when Nr==0->
-    [];
-fill_out(Nr)when Nr==4->
-    "<TD WIDTH=\"20%\" >&nbsp</TD></TR>";
-
-fill_out(Nr)->
-    "<TD WIDTH=\"20%\">&nbsp</TD>" ++ fill_out(Nr+1).
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%%These functions starts applicatons and builds the page showing tools
-%%to start
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%---------------------------------------------------------------------- 
-%Controls whether the user selected a tool to start
-%----------------------------------------------------------------------
-get_tools(Input)->
-    case httpd:parse_query(Input) of
-	[]->
-	    no_tools;
-	 Tools->
-	    FormatData=fun({_Name,Data}) -> list_to_atom(Data) end,
-	    SelectData=
-		fun({Name,_Data}) -> string:equal(Name,"app") end,
-	    {tools,[FormatData(X)||X<-Tools,SelectData(X)]}
-    end.
-
-%----------------------------------------------------------------------
-% Selects the data to start  the applications the user has ordered 
-% starting of 
-%----------------------------------------------------------------------
-handle_apps([],State,_Cmd)->
-    {ok,State};
-
-handle_apps([Tool|Tools],State,Cmd)->
-    case ets:match_object(State#state.app_data,{Tool,{start,'_'}}) of
-	[]->
-	    Started = case Cmd of
-			  start ->
-			      [Tool|State#state.started];
-			  stop ->
-			      lists:delete(Tool,State#state.started)
-		      end,
-	    {ok,#state{priv_dir=State#state.priv_dir,
-		       app_data=State#state.app_data,
-		       supvis=State#state.supvis,
-		       web_data=State#state.web_data,
-		       started=Started}};
-	ToStart ->
-	    case handle_apps2(ToStart,State,Cmd) of
-		{ok,NewState}->
-		    handle_apps(Tools,NewState,Cmd);
-		_->
-		    handle_apps(Tools,State,Cmd)
-	    end
-    end.
-
-%----------------------------------------------------------------------
-%execute every start or stop data about a tool.
-%----------------------------------------------------------------------
-handle_apps2([{Name,Start_data}],State,Cmd)->
-    case handle_app({Name,Start_data},State#state.app_data,State#state.supvis,Cmd) of
-	ok->
-	    Started = case Cmd of
-			  start ->
-			      [Name|State#state.started];
-			  stop ->
-			      
-			      lists:delete(Name,State#state.started)
-		      end,
-	    {ok,#state{priv_dir=State#state.priv_dir,
-		       app_data=State#state.app_data,
-		       supvis=State#state.supvis,
-		       web_data=State#state.web_data,
-		       started=Started}};
-	_->
-	    error
-    end;
-
-handle_apps2([{Name,Start_data}|Rest],State,Cmd)->
-    case handle_app({Name,Start_data},State#state.app_data,State#state.supvis,Cmd)of
-	ok->
-	    handle_apps2(Rest,State,Cmd);
-	_->
-	    error
-    end.
-
-
-%----------------------------------------------------------------------
-% Handle start and stop of applications
-%---------------------------------------------------------------------- 
-
-handle_app({Name,{start,{func,Start,Stop}}},Data,_Pid,Cmd)->
-    Action = case Cmd of
-		 start ->
-		     Start;
-		 _ ->
-		     Stop
-	     end,    
-    case Action of
-	{M,F,A} ->
-	    case catch apply(M,F,A) of
-		{'EXIT',_} = Exit->
-		    %%! Here the tool disappears from the webtool interface!!
-		    io:format("\n=======ERROR (webtool, line ~w) =======\n"
-			      "Could not start application \'~p\'\n\n"
-			      "~w:~w(~s) ->\n"
-			      "~p\n\n",
-			      [?LINE,Name,M,F,format_args(A),Exit]),
-		    ets:delete(Data,Name);
-		_OK->
-		    ok
-	    end;
-	_NoStart ->
-	    ok
-    end;
-	    
-
-handle_app({Name,{start,{child,ChildSpec}}},Data,Pid,Cmd)->
-    case Cmd of
-	start ->
-	    case catch supervisor:start_child(Pid,ChildSpec) of
-		{ok,_}->
-		    ok;
-		{ok,_,_}->
-		    ok;
-		{error,Reason}->
-		    %%! Here the tool disappears from the webtool interface!!
-		    io:format("\n=======ERROR (webtool, line ~w) =======\n"
-			      "Could not start application \'~p\'\n\n"
-			      "supervisor:start_child(~p,~p) ->\n"
-			      "~p\n\n",
-			      [?LINE,Name,Pid,ChildSpec,{error,Reason}]),
-		    ets:delete(Data,Name);
-		Error ->
-		    %%! Here the tool disappears from the webtool interface!!
-		    io:format("\n=======ERROR (webtool, line ~w) =======\n"
-			      "Could not start application \'~p\'\n\n"
-			      "supervisor:start_child(~p,~p) ->\n"
-			      "~p\n\n",
-			      [?LINE,Name,Pid,ChildSpec,Error]),
-		    ets:delete(Data,Name)
-	    end;
-	stop ->
-	    case catch supervisor:terminate_child(websup,element(1,ChildSpec)) of
-		ok ->
-		    supervisor:delete_child(websup,element(1,ChildSpec));
-		_ ->
-		    error
-	    end
-    end;
-
-
-
-handle_app({Name,{start,{app,Real_name}}},Data,_Pid,Cmd)->
-    case Cmd of
-	start ->
-	    case application:start(Real_name,temporary) of
-		ok->
-		    io:write(Name),
-		    ok;
-		{error,{already_started,_}}->
-		    %% Remove it from the database so we dont start
-		    %% anything already started
-		    ets:match_delete(Data,{Name,{start,{app,Real_name}}}),
-		    ok;
-		{error,_Reason}=Error->
-		    %%! Here the tool disappears from the webtool interface!!
-		    io:format("\n=======ERROR (webtool, line ~w) =======\n"
-			      "Could not start application \'~p\'\n\n"
-			      "application:start(~p,~p) ->\n"
-			      "~p\n\n",
-			      [?LINE,Name,Real_name,temporary,Error]),
-		    ets:delete(Data,Name)
-	    end;
-	
-	stop ->
-	    application:stop(Real_name)
-    end;
-
-%----------------------------------------------------------------------
-% If the data is incorrect delete the app
-%----------------------------------------------------------------------
-handle_app({Name,Incorrect},Data,_Pid,Cmd)->
-    %%! Here the tool disappears from the webtool interface!!
-    io:format("\n=======ERROR (webtool, line ~w) =======\n"
-	      "Could not ~w application \'~p\'\n\n"
-	      "Incorrect data: ~p\n\n",
-	      [?LINE,Cmd,Name,Incorrect]),
-    ets:delete(Data,Name).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% this functions creates the page that shows the unstarted tools   %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-reload_started_apps()->
-    "<script>
-        function reloadCompiledList()
-        {
-          parent.parent.top1.document.location.href=\"/webtool/webtool/started_tools\";
-        }
-     </script>".
-
-show_unstarted_apps(State)->
-  "<TABLE HEIGHT=100%  WIDTH=100% BORDER=0> 
-    <TR HEIGHT=80%><TD ALIGN=\"center\" VALIGN=\"middle\"> 
-      <FORM NAME=\"stop_apps\" ACTION=\"/webtool/webtool/start_tools\" >
-       <TABLE BORDER=1 WIDTH=60%>
-	 <TR BGCOLOR=\"#8899AA\">
-	   <TD ALIGN=CENTER COLSPAN=2><FONT SIZE=4>Available Tools<FONT></TD>
-	 </TR>
- 	<TR>
-	   <TD WIDTH=50%>
-	       <TABLE BORDER=0>
-	           "++ list_available_apps(State)++"
-                   <TR><TD COLSPAN=2>&nbsp;</TD></TR>
-                   <TR>
-                      <TD COLSPAN=2 ALIGN=\"center\">
-                         <INPUT TYPE=submit VALUE=\"Start\">
-                      </TD>
-                   </TR>
-                </TABLE>
-            </TD>
-           <TD>   
-             To Start a Tool:
-             <UL>
-             <LI>Select the
-             checkbox for each tool to
-             start.</LI>
-             <LI>Click on the 
-             button marked <EM>Start</EM>.</LI></UL>
-            </TD>         
-         </TR>
-      </TABLE> 
-    </FORM>
-   </TD></TR>
-   <TR><TD>&nbsp;</TD></TR>
-   </TABLE>".
-
-
-
-list_available_apps(State)->
-    MS = ets:fun2ms(fun({Tool,{web_data,{Name,_}}}) -> {Tool,Name} end),
-    Unstarted_apps=
-	lists:filter(
-	  fun({Tool,_})->
-		  false==lists:member(Tool,State#state.started)
-	  end,
-	  ets:select(State#state.app_data,MS)),
-    case Unstarted_apps of
-	[]->
-	    "<TR><TD>All tools are started</TD></TR>";
-	_->
-	    list_apps(Unstarted_apps)
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                  %%
-%% these functions creates the page that shows the started apps     %%
-%% the user can select to shutdown                                  %%
-%%                                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-show_started_apps(State)->
-  "<TABLE HEIGHT=100%  WIDTH=100% BORDER=0> 
-    <TR HEIGHT=80%><TD ALIGN=\"center\" VALIGN=\"middle\"> 
-      <FORM NAME=\"stop_apps\" ACTION=\"/webtool/webtool/stop_tools\" >
-       <TABLE BORDER=1 WIDTH=60%>
-	 <TR BGCOLOR=\"#8899AA\">
-	   <TD ALIGN=CENTER COLSPAN=2><FONT SIZE=4>Started Tools<FONT></TD>
-	 </TR>
- 	<TR>
-	   <TD WIDTH=50%>
-	       <TABLE BORDER=0>
-	           "++ list_started_apps(State)++"
-                   <TR><TD COLSPAN=2>&nbsp;</TD></TR>
-                   <TR>
-                      <TD COLSPAN=2 ALIGN=\"center\">
-                         <INPUT TYPE=submit VALUE=\"Stop\">
-                      </TD>
-                   </TR>
-                </TABLE>
-            </TD>
-           <TD>   
-             Stop a Tool:
-             <UL>
-             <LI>Select the
-             checkbox for each tool to
-             stop.</LI>
-             <LI>Click on the 
-             button marked <EM>Stop</EM>.</LI></UL>
-            </TD>         
-         </TR>
-      </TABLE> 
-    </FORM>
-   </TD></TR>
-   <TR><TD>&nbsp;</TD></TR>
-   </TABLE>".
-
-list_started_apps(State)->
-    MS = lists:map(fun(A) -> {{A,{web_data,{'$1','_'}}},[],[{{A,'$1'}}]} end,
-		   State#state.started),
-    Started_apps= ets:select(State#state.app_data,MS),
-    case Started_apps of
-	[]->
-	    "<TR><TD>No tool is started yet.</TD></TR>";
-	_->
-	    list_apps(Started_apps)
-    end.
-
-
-list_apps(Apps) ->
-      lists:map(fun({Tool,Name})->
-			"<TR><TD>
-                            <INPUT TYPE=\"checkbox\" NAME=\"app\" VALUE=\""  
-			    ++ atom_to_list(Tool) ++ "\">
-                               " ++ Name ++ "     
-                            </TD></TR>"
-		end,
-		Apps).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                   %%
-%% Collecting the data from the  *.tool files                        %%
-%%                                                                   %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%----------------------------------------
-% get_tools(Dirs) => [{M,F,A},{M,F,A}...{M,F,A}]
-%   Dirs - [string()] Directory names
-% Calls get_tools2/2 recursively for a number of directories
-% to retireve the configuration data for the web based tools.
-%----------------------------------------
-get_tools1(Dirs)->
-    get_tools1(Dirs,[]).
-
-get_tools1([Dir|Rest],Data) when is_list(Dir) ->
-    Tools=case filename:basename(Dir) of
-	      %% Dir is an 'ebin' directory, check in '../priv' as well
-	      "ebin" ->
-		  [get_tools2(filename:join(filename:dirname(Dir),"priv")) |
-		   get_tools2(Dir)];
-	      _ ->
-		  get_tools2(Dir)
-	  end,
-    get_tools1(Rest,[Tools|Data]);
-
-get_tools1([],Data) ->
-  lists:flatten(Data).
-
-%----------------------------------------
-% get_tools2(Directory) => DataList
-%   DataList : [WebTuple]|[]
-%   WebTuple: {tool,[{web,M,F,A}]}
-%
-%----------------------------------------
-get_tools2(Dir)->
-    get_tools2(tool_files(Dir),[]).
-
-get_tools2([ToolFile|Rest],Data) ->
-    case get_tools3(ToolFile) of
-	{tool,WebData} ->
-	    get_tools2(Rest,[{tool,WebData}|Data]);
-	{error,_Reason} ->
-	    get_tools2(Rest,Data);
-	nodata ->
-	    get_tools2(Rest,Data)
-    end;
-
-get_tools2([],Data) ->
-    Data.
-
-%----------------------------------------
-% get_tools3(ToolFile) => {ok,Tool}|{error,Reason}|nodata 
-%   Tool: {tool,[KeyValTuple]}
-%   ToolFile - string() A .tool file
-%   Now we have the file get the data and sort it out
-%----------------------------------------
-get_tools3(ToolFile) ->
-    case file:consult(ToolFile) of
-	{error,open} ->
-	    {error,nofile};
-	{error,read} ->
-	    {error,format};
-	{ok,[{version,"1.2"},ToolInfo]} when is_list(ToolInfo)->
-	    webdata(ToolInfo);
-	{ok,[{version,_Vsn},_Info]} ->
-	    {error,old_version};
-	{ok,_Other} ->
-	    {error,format}
-    end.
-
-
-%----------------------------------------------------------------------
-% webdata(TupleList)-> ToolTuple| nodata
-% ToolTuple: {tool,[{config_func,{M,F,A}}]}
-%
-% There are a little unneccesary work in this format but it is extendable
-%----------------------------------------------------------------------
-webdata(TupleList)-> 
-    case proplists:get_value(config_func,TupleList,nodata) of
-	{M,F,A} ->
-	    {tool,[{config_func,{M,F,A}}]};
-	_ ->
-	   nodata
-    end.
-
-
-%=============================================================================
-% Functions for getting *.tool configuration files
-%=============================================================================
-
-%----------------------------------------
-% tool_files(Dir) => ToolFiles
-%   Dir - string() Directory name
-%   ToolFiles - [string()]
-% Return the list of all files in Dir ending with .tool (appended to Dir)
-%----------------------------------------
-tool_files(Dir) ->
-    case file:list_dir(Dir) of
-	{ok,Files} ->
-	    filter_tool_files(Dir,Files);
-	{error,_Reason} ->
-	    []
-    end.
-
-%----------------------------------------
-% filter_tool_files(Dir,Files) => ToolFiles
-%   Dir - string() Directory name
-%   Files, ToolFiles - [string()] File names
-% Filters out the files in Files ending with .tool and append them to Dir
-%----------------------------------------
-filter_tool_files(_Dir,[]) ->
-    [];
-filter_tool_files(Dir,[File|Rest]) ->
-    case filename:extension(File) of
-	".tool" ->
-	    [filename:join(Dir,File)|filter_tool_files(Dir,Rest)];
-	_ ->
-	    filter_tool_files(Dir,Rest)
-    end.
-
-
-%%%-----------------------------------------------------------------
-%%% format functions
-ffunc({M,F,A}) when is_list(A) ->
-    io_lib:format("~w:~w(~s)\n",[M,F,format_args(A)]);
-ffunc({M,F,A}) when is_integer(A) ->
-    io_lib:format("~w:~w/~w\n",[M,F,A]).
-
-format_args([]) ->
-    "";
-format_args(Args) ->
-    Str = lists:append(["~p"|lists:duplicate(length(Args)-1,",~p")]),
-    io_lib:format(Str,Args).
diff --git a/lib/webtool/src/webtool_sup.erl b/lib/webtool/src/webtool_sup.erl
deleted file mode 100644
index e4a05c53ae..0000000000
--- a/lib/webtool/src/webtool_sup.erl
+++ /dev/null
@@ -1,75 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. 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%
-%%
--module(webtool_sup).
-
--behaviour(supervisor).
-
-%% External exports
--export([start_link/0,stop/1]).
-
-%% supervisor callbacks
--export([init/1]).
-
-%%%----------------------------------------------------------------------
-%%% API
-%%%----------------------------------------------------------------------
-start_link() ->
-    supervisor:start_link({local,websup},webtool_sup, []).
-
-stop(Pid)->
-   exit(Pid,normal).
-%%%----------------------------------------------------------------------
-%%% Callback functions from supervisor
-%%%----------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% Func: init/1
-%% Returns: {ok,  {SupFlags,  [ChildSpec]}} |
-%%          ignore                          |
-%%          {error, Reason}   
-%%----------------------------------------------------------------------
-init(_StartArgs) ->
-    %%Child1 = 
-    %%Child2 ={webcover_backend,{webcover_backend,start_link,[]},permanent,2000,worker,[webcover_backend]},
-    %%{ok,{{simple_one_for_one,5,10},[Child1]}}.
-    {ok,{{one_for_one,100,10},[]}}.
-
-%%%----------------------------------------------------------------------
-%%% Internal functions
-%%%----------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/webtool/test/Makefile b/lib/webtool/test/Makefile
deleted file mode 100644
index 93aa1c09eb..0000000000
--- a/lib/webtool/test/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES= \
-	webtool_SUITE
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-INSTALL_PROGS= $(TARGET_FILES)
-
-EMAKEFILE=Emakefile
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/webtool_test
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include
-
-EBIN = .
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-make_emakefile:
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) \
-	> $(EMAKEFILE)
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
-	>> $(EMAKEFILE)
-
-tests debug opt: make_emakefile
-	erl $(ERL_MAKE_FLAGS) -make
-
-clean:
-	rm -f $(EMAKEFILE)
-	rm -f $(TARGET_FILES) $(GEN_FILES)
-	rm -f core
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-
-release_tests_spec: make_emakefile
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DATA) webtool.spec "$(RELSYSDIR)"
-	chmod -R u+w "$(RELSYSDIR)"
-
-release_docs_spec:
diff --git a/lib/webtool/test/webtool.spec b/lib/webtool/test/webtool.spec
deleted file mode 100644
index 134e6ed40c..0000000000
--- a/lib/webtool/test/webtool.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../webtool_test",all}.
diff --git a/lib/webtool/test/webtool_SUITE.erl b/lib/webtool/test/webtool_SUITE.erl
deleted file mode 100644
index 9e2d9a2e0f..0000000000
--- a/lib/webtool/test/webtool_SUITE.erl
+++ /dev/null
@@ -1,51 +0,0 @@
-%% ``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.
-%%
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%%
--module(webtool_SUITE).
-
--compile([export_all]).
--include_lib("common_test/include/ct.hrl").
-
-suite() ->
-    [{ct_hooks, [ts_install_cth]}].
-
-all() ->
-    [app, appup].
-
-groups() ->
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-     ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-app() ->
-    [{doc, "Test that the webtool app file is ok"}].
-app(Config) when is_list(Config) ->
-    ok = ?t:app_test(webtool).
-
-appup() ->
-    [{doc, "Test that the webtool appup file is ok"}].
-appup(Config) when is_list(Config) ->
-    ok = ?t:appup_test(webtool).
diff --git a/lib/webtool/vsn.mk b/lib/webtool/vsn.mk
deleted file mode 100644
index 4a701ae6e0..0000000000
--- a/lib/webtool/vsn.mk
+++ /dev/null
@@ -1 +0,0 @@
-WEBTOOL_VSN=0.9
diff --git a/lib/wx/api_gen/gl_gen.erl b/lib/wx/api_gen/gl_gen.erl
index 8b24e38cc0..ab8f842d31 100644
--- a/lib/wx/api_gen/gl_gen.erl
+++ b/lib/wx/api_gen/gl_gen.erl
@@ -191,7 +191,7 @@ parse_define([#xmlElement{name=initializer,content=Contents}|_R],Def,_Os) ->
     try
 	case Val0 of
 	    "0x" ++ Val1 ->
-		_ = http_util:hexlist_to_integer(Val1),
+		_ = list_to_integer(Val1, 16),
 		Def#def{val=Val1, type=hex};
 	    _ ->
 		Val = list_to_integer(Val0),
diff --git a/lib/wx/api_gen/wx_extra/added_func.h b/lib/wx/api_gen/wx_extra/added_func.h
index 0698621c5f..417188cc8a 100644
--- a/lib/wx/api_gen/wx_extra/added_func.h
+++ b/lib/wx/api_gen/wx_extra/added_func.h
@@ -32,3 +32,10 @@ class wxToolBar {
     wxToolBarToolBase * AddStretchableSpace();
     wxToolBarToolBase * InsertStretchableSpace(size_t pos);
 };
+
+
+class wxWindow {
+ public:
+    bool IsDoubleBuffered();
+    void SetDoubleBuffered(bool on);
+};
diff --git a/lib/wx/api_gen/wx_gen.erl b/lib/wx/api_gen/wx_gen.erl
index 5cf09e5eee..ec2c35cc0e 100644
--- a/lib/wx/api_gen/wx_gen.erl
+++ b/lib/wx/api_gen/wx_gen.erl
@@ -705,6 +705,8 @@ parse_type2(["unsigned"|R],Info,Opts,T=#type{mod=Mod}) ->
     parse_type2(R,Info,Opts,T#type{mod=[unsigned|Mod]});
 parse_type2(["int"|R],Info,Opts,  T) -> 
     parse_type2(R,Info,Opts,T#type{name=int,base=int});
+parse_type2(["wxByte"|R],Info,Opts,  T) ->
+    parse_type2(R,Info,Opts,T#type{name=int,base=int});
 parse_type2(["char"|R],Info,Opts,  T) -> 
     parse_type2(R,Info,Opts,T#type{name="char",base=int});
 parse_type2([N="size_t"|R], Info, Opts,  T) -> 
@@ -1373,7 +1375,7 @@ extract_enum3([#xmlElement{name=initializer,content=Cs}|_],_Id,[{Name,_}|Acc]) -
     try
 	case Val0 of
 	    ["0x" ++ Val1] ->
-		Val = http_util:hexlist_to_integer(Val1),
+		Val = list_to_integer(Val1, 16),
 		{[{Name, Val}|Acc], Val+1};
 	    ["1", "<<", Shift] ->
 		Val = 1 bsl list_to_integer(Shift),
@@ -1429,7 +1431,7 @@ extract_def([#xmlElement{name=param}|_],Name,_) ->
 extract_def([#xmlElement{name=initializer,content=Cs}|_R],N,Skip) ->
     Val0 = extract_def2(Cs),
     case Val0 of
-	"0x" ++ Val1 -> {N, http_util:hexlist_to_integer(Val1)};
+	"0x" ++ Val1 -> {N, list_to_integer(Val1, 16)};
 	_ ->
 	    try
 		Val = list_to_integer(Val0),
@@ -1451,7 +1453,7 @@ extract_def(_,N,_) ->
     throw(N).
 
 extract_def2([#xmlText{value=Val}|R]) ->
-    strip_comment(string:strip(Val)) ++ extract_def2(R);
+    string:strip(strip_comment(Val)) ++ extract_def2(R);
 extract_def2([#xmlElement{content=Cs}|R]) ->
     extract_def2(Cs) ++ extract_def2(R);
 extract_def2([]) -> [].
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl
index ed7b27f3bf..71b2038c56 100644
--- a/lib/wx/api_gen/wx_gen_cpp.erl
+++ b/lib/wx/api_gen/wx_gen_cpp.erl
@@ -116,8 +116,13 @@ taylormade_class(#class{name=CName, methods=Ms}) ->
 gen_constructors(#class{name=Class, methods=Ms0}) ->
     Ms = lists:append(Ms0),
     Cs = lists:filter(fun(#method{method_type=MT}) -> MT =:= constructor end, Ms),
-    [gen_constructor(Class, Const) || Const <- Cs].
-
+    [gen_constructor(Class, Const) || Const <- Cs],
+    case need_copy_constr(Class) of
+	true ->
+	    w(" E~s(~s copy) : ~s(copy) {};~n", [Class, Class, Class]);
+	false ->
+	    ignore
+    end.
 gen_constructor(_Class, #method{where=merged_c}) -> ok;
 gen_constructor(_Class, #method{where=erl_no_opt}) -> ok;
 gen_constructor(Class, _M=#method{params=Ps, opts=FOpts}) ->
@@ -145,6 +150,14 @@ gen_constructor(Class, _M=#method{params=Ps, opts=FOpts}) ->
     Endif andalso w("#endif~n", []),
     ok.
 
+
+need_copy_constr("wxFont") -> true;
+need_copy_constr("wxIcon") -> true;
+need_copy_constr("wxImage") -> true;
+need_copy_constr("wxBitmap") -> true;
+%%need_copy_constr("wxGraphics" ++ _) -> true;
+need_copy_constr(_) -> false.
+
 gen_type(#type{name=Type, ref={pointer,1}, mod=Mod},_) ->
     mods(Mod) ++ to_string(Type) ++ " * ";
 gen_type(#type{name=Type, ref={pointer,2}, mod=Mod},_) ->
@@ -805,18 +818,21 @@ return_res1(#type{name=Type,base={comp,_,_},single=array,by_val=true}) ->
     {Type ++ " Result = ", ""};
 return_res1(#type{name=Type,single=true,by_val=true, base={class, _}}) ->
     %% Temporary memory leak !!!!!!
-    case Type of
-	"wxImage" ->  ok;
-	"wxFont"  ->  ok;
-	"wxBitmap" -> ok;
-	"wxIcon" ->   ok;
-	"wxGraphics" ++ _ -> ok;
+    case {need_copy_constr(Type),Type} of
+	{true, _}  ->  ok;
+	{_, "wxGraphics" ++ _} -> ok;
 	_ ->
 	    io:format("~s::~s Building return value of temp ~s~n",
 		      [get(current_class),get(current_func),Type])
     end,
-    {Type ++ " * Result = new " ++ Type ++ "(", "); newPtr((void *) Result,"
-     ++ "3, memenv);"};
+    case need_copy_constr(Type) of
+	true ->
+	    {Type ++ " * Result = new E" ++ Type ++ "(", "); newPtr((void *) Result,"
+	     ++ "3, memenv);"};
+	false ->
+	    {Type ++ " * Result = new " ++ Type ++ "(", "); newPtr((void *) Result,"
+	     ++ "3, memenv);"}
+    end;
 return_res1(#type{base={enum,_Type},single=true,by_val=true}) ->
     {"int Result = " , ""};
 return_res1(#type{name="wxCharBuffer", base={binary,_},single=true,by_val=true}) ->
diff --git a/lib/wx/api_gen/wx_gen_erl.erl b/lib/wx/api_gen/wx_gen_erl.erl
index 9df5cb853e..e11d4f725c 100644
--- a/lib/wx/api_gen/wx_gen_erl.erl
+++ b/lib/wx/api_gen/wx_gen_erl.erl
@@ -1089,7 +1089,7 @@ gen_enums_ints() ->
     %% open_write("../include/wx.hrl"), opened in gen_event_recs
     w("~n%% Hardcoded Records~n", []),
     w("-record(wxMouseState, {x :: integer(), y :: integer(),~n"
-      "          leftDown :: boolean(), middleDown :: boolean, rightDown :: boolean, ~n"
+      "          leftDown :: boolean(), middleDown :: boolean(), rightDown :: boolean(), ~n"
       "          controlDown :: boolean(), shiftDown :: boolean(),~n"
       "          altDown :: boolean(), metaDown :: boolean(), cmdDown :: boolean()~n"
       "        }).~n", []),
@@ -1169,7 +1169,7 @@ build_enum_ints(#enum{from=From, vals=Vals},Done) ->
 
 const_value(V,_,_) when is_integer(V) -> integer_to_list(V);
 const_value(V = "16#" ++ IntList,_,_) ->
-    _ = http_util:hexlist_to_integer(IntList), %% ASSERT
+    _ = list_to_integer(IntList, 16), %% ASSERT
     V;
 const_value(V0, EnumClass, Ignore) ->
     try
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index f5a6751696..c6a2df29d7 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -150,7 +150,12 @@
   'ShouldInheritColours','Show','Thaw','TransferDataFromWindow',
   'TransferDataToWindow',%'UnregisterHotKey',
   'Update','UpdateWindowUI','Validate',
-  'WarpPointer']}.
+  'WarpPointer',
+  {'SetTransparent', [{test_if, "wxCHECK_VERSION(2,8,12)"}]},
+  {'CanSetTransparent', [{test_if, "wxCHECK_VERSION(2,8,12)"}]},
+  {'IsDoubleBuffered', [{test_if, "wxCHECK_VERSION(3,0,0)"}]},
+  {'SetDoubleBuffered', [{test_if, "wxCHECK_VERSION(3,0,0) && !defined(__WXMAC__)"}]}
+]}.
 
 {class, wxTopLevelWindowGTK, wxWindow, 
  [{alias, [{wxTopLevelWindowGTK, wxTopLevelWindow}]}],
@@ -839,7 +844,7 @@
   'GetItemSpacing','GetItemState',
   'GetItemText','GetItemTextColour',
   'GetNextItem','GetSelectedItemCount','GetTextColour','GetTopItem',
-  'GetViewRect',{'HitTest',[{"pSubItem",nowhere}, {"flags", in}]},
+  'GetViewRect',{'HitTest',[{"pSubItem",out}]},
   'InsertColumn','InsertItem',
   %%'OnGetItemAttr', 'OnGetItemImage','OnGetItemText',
   'RefreshItem','RefreshItems','ScrollList',
diff --git a/lib/wx/c_src/gen/wxe_derived_dest.h b/lib/wx/c_src/gen/wxe_derived_dest.h
index 1dcf029244..fc0ae0d9fc 100644
--- a/lib/wx/c_src/gen/wxe_derived_dest.h
+++ b/lib/wx/c_src/gen/wxe_derived_dest.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2015. All Rights Reserved.
+ * Copyright Ericsson AB 2008-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.
@@ -180,6 +180,7 @@ class EwxBitmap : public wxBitmap {
  EwxBitmap(const wxString& filename,wxBitmapType type) : wxBitmap(filename,type) {};
  EwxBitmap(const wxImage& image,int depth) : wxBitmap(image,depth) {};
  EwxBitmap() : wxBitmap() {};
+ EwxBitmap(wxBitmap copy) : wxBitmap(copy) {};
 };
 
 class EwxIcon : public wxIcon {
@@ -187,6 +188,7 @@ class EwxIcon : public wxIcon {
  EwxIcon(const wxString& filename,wxBitmapType type,int desiredWidth,int desiredHeight) : wxIcon(filename,type,desiredWidth,desiredHeight) {};
  EwxIcon(const wxIconLocation& loc) : wxIcon(loc) {};
  EwxIcon() : wxIcon() {};
+ EwxIcon(wxIcon copy) : wxIcon(copy) {};
 };
 
 class EwxCursor : public wxCursor {
@@ -215,6 +217,7 @@ class EwxImage : public wxImage {
  EwxImage(const wxString& name,const wxString& mimetype,int index) : wxImage(name,mimetype,index) {};
  EwxImage(const wxString& name,long type,int index) : wxImage(name,type,index) {};
  EwxImage() : wxImage() {};
+ EwxImage(wxImage copy) : wxImage(copy) {};
 };
 
 class EwxBrush : public wxBrush {
@@ -300,6 +303,7 @@ class EwxFont : public wxFont {
  EwxFont(int size,wxFontFamily family,wxFontStyle style,int weight,bool underlined,const wxString& face,wxFontEncoding encoding) : wxFont(size,family,style,weight,underlined,face,encoding) {};
  EwxFont(const wxString& fontname) : wxFont(fontname) {};
  EwxFont() : wxFont() {};
+ EwxFont(wxFont copy) : wxFont(copy) {};
 };
 
 class EwxToolTip : public wxToolTip {
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp
index b2830dbc63..059cee59f4 100644
--- a/lib/wx/c_src/gen/wxe_funcs.cpp
+++ b/lib/wx/c_src/gen/wxe_funcs.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2015. All Rights Reserved.
+ * Copyright Ericsson AB 2008-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.
@@ -519,7 +519,7 @@ case wxWindow_GetExtraStyle: { // wxWindow::GetExtraStyle
 case wxWindow_GetFont: { // wxWindow::GetFont
  wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetFont()); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new EwxFont(This->GetFont()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -1668,10 +1668,47 @@ case wxWindow_WarpPointer: { // wxWindow::WarpPointer
  This->WarpPointer(*x,*y);
  break;
 }
+#if wxCHECK_VERSION(2,8,12)
+case wxWindow_SetTransparent: { // wxWindow::SetTransparent
+ wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ int * alpha = (int *) bp; bp += 4;
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->SetTransparent(*alpha);
+ rt.addBool(Result);
+ break;
+}
+#endif
+#if wxCHECK_VERSION(2,8,12)
+case wxWindow_CanSetTransparent: { // wxWindow::CanSetTransparent
+ wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->CanSetTransparent();
+ rt.addBool(Result);
+ break;
+}
+#endif
+#if wxCHECK_VERSION(3,0,0)
+case wxWindow_IsDoubleBuffered: { // wxWindow::IsDoubleBuffered
+ wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->IsDoubleBuffered();
+ rt.addBool(Result);
+ break;
+}
+#endif
+#if wxCHECK_VERSION(3,0,0) && !defined(__WXMAC__)
+case wxWindow_SetDoubleBuffered: { // wxWindow::SetDoubleBuffered
+ wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ bool * on = (bool *) bp; bp += 4;
+ if(!This) throw wxe_badarg(0);
+ This->SetDoubleBuffered(*on);
+ break;
+}
+#endif
 case wxTopLevelWindow_GetIcon: { // wxTopLevelWindow::GetIcon
  wxTopLevelWindow *This = (wxTopLevelWindow *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxIcon * Result = new wxIcon(This->GetIcon()); newPtr((void *) Result,3, memenv);;
+ const wxIcon * Result = new EwxIcon(This->GetIcon()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -3065,7 +3102,7 @@ case wxGrid_GetCellFont: { // wxGrid::GetCellFont
  int * row = (int *) bp; bp += 4;
  int * col = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetCellFont(*row,*col)); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new EwxFont(This->GetCellFont(*row,*col)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -3160,7 +3197,7 @@ case wxGrid_GetDefaultCellBackgroundColour: { // wxGrid::GetDefaultCellBackgroun
 case wxGrid_GetDefaultCellFont: { // wxGrid::GetDefaultCellFont
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetDefaultCellFont()); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new EwxFont(This->GetDefaultCellFont()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -3299,7 +3336,7 @@ case wxGrid_GetLabelBackgroundColour: { // wxGrid::GetLabelBackgroundColour
 case wxGrid_GetLabelFont: { // wxGrid::GetLabelFont
  wxGrid *This = (wxGrid *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetLabelFont()); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new EwxFont(This->GetLabelFont()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -9061,7 +9098,7 @@ case wxBitmap_new_2_1: { // wxBitmap::wxBitmap
 case wxBitmap_ConvertToImage: { // wxBitmap::ConvertToImage
  wxBitmap *This = (wxBitmap *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->ConvertToImage()); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new EwxImage(This->ConvertToImage()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9132,7 +9169,7 @@ case wxBitmap_GetSubBitmap: { // wxBitmap::GetSubBitmap
  int * rectH = (int *) bp; bp += 4;
  wxRect rect = wxRect(*rectX,*rectY,*rectW,*rectH);
  if(!This) throw wxe_badarg(0);
- wxBitmap * Result = new wxBitmap(This->GetSubBitmap(rect)); newPtr((void *) Result,3, memenv);;
+ wxBitmap * Result = new EwxBitmap(This->GetSubBitmap(rect)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -9314,7 +9351,7 @@ case wxIconBundle_GetIcon_1_1: { // wxIconBundle::GetIcon
  int * sizeH = (int *) bp; bp += 4;
  wxSize size = wxSize(*sizeW,*sizeH);
  if(!This) throw wxe_badarg(0);
- const wxIcon * Result = new wxIcon(This->GetIcon(size)); newPtr((void *) Result,3, memenv);;
+ const wxIcon * Result = new EwxIcon(This->GetIcon(size)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -9328,7 +9365,7 @@ case wxIconBundle_GetIcon_1_0: { // wxIconBundle::GetIcon
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- const wxIcon * Result = new wxIcon(This->GetIcon(size)); newPtr((void *) Result,3, memenv);;
+ const wxIcon * Result = new EwxIcon(This->GetIcon(size)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -9537,7 +9574,7 @@ case wxImage_Blur: { // wxImage::Blur
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  int * radius = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->Blur(*radius)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new EwxImage(This->Blur(*radius)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9545,7 +9582,7 @@ case wxImage_BlurHorizontal: { // wxImage::BlurHorizontal
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  int * radius = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->BlurHorizontal(*radius)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new EwxImage(This->BlurHorizontal(*radius)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9553,7 +9590,7 @@ case wxImage_BlurVertical: { // wxImage::BlurVertical
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  int * radius = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->BlurVertical(*radius)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new EwxImage(This->BlurVertical(*radius)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9592,7 +9629,7 @@ case wxImage_ConvertToGreyscale: { // wxImage::ConvertToGreyscale
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->ConvertToGreyscale(lr,lg,lb)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new EwxImage(This->ConvertToGreyscale(lr,lg,lb)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9602,14 +9639,14 @@ case wxImage_ConvertToMono: { // wxImage::ConvertToMono
  unsigned int * g = (unsigned int *) bp; bp += 4;
  unsigned int * b = (unsigned int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->ConvertToMono(*r,*g,*b)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new EwxImage(This->ConvertToMono(*r,*g,*b)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
 case wxImage_Copy: { // wxImage::Copy
  wxImage *This = (wxImage *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->Copy()); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new EwxImage(This->Copy()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9831,7 +9868,7 @@ case wxImage_GetSubImage: { // wxImage::GetSubImage
  int * rectH = (int *) bp; bp += 4;
  wxRect rect = wxRect(*rectX,*rectY,*rectW,*rectH);
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->GetSubImage(rect)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new EwxImage(This->GetSubImage(rect)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -9976,7 +10013,7 @@ case wxImage_Mirror: { // wxImage::Mirror
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->Mirror(horizontally)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new EwxImage(This->Mirror(horizontally)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -10057,7 +10094,7 @@ case wxImage_Rotate: { // wxImage::Rotate
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->Rotate(*angle,centre_of_rotation,interpolating,offset_after_rotation)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new EwxImage(This->Rotate(*angle,centre_of_rotation,interpolating,offset_after_rotation)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -10079,7 +10116,7 @@ case wxImage_Rotate90: { // wxImage::Rotate90
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->Rotate90(clockwise)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new EwxImage(This->Rotate90(clockwise)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -10129,7 +10166,7 @@ quality = *(wxImageResizeQuality *) bp; bp += 4;;
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->Scale(*width,*height,quality)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new EwxImage(This->Scale(*width,*height,quality)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -10157,7 +10194,7 @@ case wxImage_Size: { // wxImage::Size
   } break;
  }};
  if(!This) throw wxe_badarg(0);
- wxImage * Result = new wxImage(This->Size(size,pos,r,g,b)); newPtr((void *) Result,3, memenv);;
+ wxImage * Result = new EwxImage(This->Size(size,pos,r,g,b)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxImage");
  break;
 }
@@ -10617,7 +10654,7 @@ case wxRegion_Contains_1_1: { // wxRegion::Contains
 case wxRegion_ConvertToBitmap: { // wxRegion::ConvertToBitmap
  wxRegion *This = (wxRegion *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxBitmap * Result = new wxBitmap(This->ConvertToBitmap()); newPtr((void *) Result,3, memenv);;
+ wxBitmap * Result = new EwxBitmap(This->ConvertToBitmap()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -13344,28 +13381,28 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
 case wxBitmapButton_GetBitmapDisabled: { // wxBitmapButton::GetBitmapDisabled
  wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxBitmap * Result = new wxBitmap(This->GetBitmapDisabled()); newPtr((void *) Result,3, memenv);;
+ const wxBitmap * Result = new EwxBitmap(This->GetBitmapDisabled()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
 case wxBitmapButton_GetBitmapFocus: { // wxBitmapButton::GetBitmapFocus
  wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxBitmap * Result = new wxBitmap(This->GetBitmapFocus()); newPtr((void *) Result,3, memenv);;
+ const wxBitmap * Result = new EwxBitmap(This->GetBitmapFocus()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
 case wxBitmapButton_GetBitmapLabel: { // wxBitmapButton::GetBitmapLabel
  wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxBitmap * Result = new wxBitmap(This->GetBitmapLabel()); newPtr((void *) Result,3, memenv);;
+ const wxBitmap * Result = new EwxBitmap(This->GetBitmapLabel()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
 case wxBitmapButton_GetBitmapSelected: { // wxBitmapButton::GetBitmapSelected
  wxBitmapButton *This = (wxBitmapButton *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxBitmap * Result = new wxBitmap(This->GetBitmapSelected()); newPtr((void *) Result,3, memenv);;
+ const wxBitmap * Result = new EwxBitmap(This->GetBitmapSelected()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -15483,7 +15520,7 @@ case wxListCtrl_GetItemFont: { // wxListCtrl::GetItemFont
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * item = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetItemFont(*item)); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new EwxFont(This->GetItemFont(*item)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -15594,14 +15631,18 @@ case wxListCtrl_GetViewRect: { // wxListCtrl::GetViewRect
  break;
 }
 case wxListCtrl_HitTest: { // wxListCtrl::HitTest
+ int flags;
+ long pSubItem;
  wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4;
  int * pointX = (int *) bp; bp += 4;
  int * pointY = (int *) bp; bp += 4;
  wxPoint point = wxPoint(*pointX,*pointY);
- int * flags = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- long Result = This->HitTest(point,*flags);
+ long Result = This->HitTest(point,flags,&pSubItem);
  rt.addInt(Result);
+ rt.addInt(flags);
+ rt.addInt(pSubItem);
+ rt.addTupleCount(3);
  break;
 }
 case wxListCtrl_InsertColumn_2: { // wxListCtrl::InsertColumn
@@ -16029,7 +16070,7 @@ case wxListItem_GetColumn: { // wxListItem::GetColumn
 case wxListItem_GetFont: { // wxListItem::GetFont
  wxListItem *This = (wxListItem *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetFont()); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new EwxFont(This->GetFont()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -16376,7 +16417,7 @@ case wxImageList_GetBitmap: { // wxImageList::GetBitmap
  wxImageList *This = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxBitmap * Result = new wxBitmap(This->GetBitmap(*index)); newPtr((void *) Result,3, memenv);;
+ wxBitmap * Result = new EwxBitmap(This->GetBitmap(*index)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -16384,7 +16425,7 @@ case wxImageList_GetIcon: { // wxImageList::GetIcon
  wxImageList *This = (wxImageList *) getPtr(bp,memenv); bp += 4;
  int * index = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxIcon * Result = new wxIcon(This->GetIcon(*index)); newPtr((void *) Result,3, memenv);;
+ wxIcon * Result = new EwxIcon(This->GetIcon(*index)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -16495,7 +16536,7 @@ case wxTextAttr_GetBackgroundColour: { // wxTextAttr::GetBackgroundColour
 case wxTextAttr_GetFont: { // wxTextAttr::GetFont
  wxTextAttr *This = (wxTextAttr *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- const wxFont * Result = new wxFont(This->GetFont()); newPtr((void *) Result,3, memenv);;
+ const wxFont * Result = new EwxFont(This->GetFont()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -18841,7 +18882,7 @@ case wxTreeCtrl_GetItemFont: { // wxTreeCtrl::GetItemFont
  bp += 4; /* Align */
  wxTreeItemId item = wxTreeItemId((void *) *(wxUint64 *) bp); bp += 8;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetItemFont(item)); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new EwxFont(This->GetItemFont(item)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -19868,7 +19909,7 @@ case wxStaticBitmap_Create: { // wxStaticBitmap::Create
 case wxStaticBitmap_GetBitmap: { // wxStaticBitmap::GetBitmap
  wxStaticBitmap *This = (wxStaticBitmap *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxBitmap * Result = new wxBitmap(This->GetBitmap()); newPtr((void *) Result,3, memenv);;
+ wxBitmap * Result = new EwxBitmap(This->GetBitmap()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -21558,7 +21599,7 @@ validator = (wxValidator *) getPtr(bp,memenv); bp += 4;
 case wxFontPickerCtrl_GetSelectedFont: { // wxFontPickerCtrl::GetSelectedFont
  wxFontPickerCtrl *This = (wxFontPickerCtrl *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetSelectedFont()); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new EwxFont(This->GetSelectedFont()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -21936,7 +21977,7 @@ case wxFontData_GetColour: { // wxFontData::GetColour
 case wxFontData_GetChosenFont: { // wxFontData::GetChosenFont
  wxFontData *This = (wxFontData *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetChosenFont()); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new EwxFont(This->GetChosenFont()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -21950,7 +21991,7 @@ case wxFontData_GetEnableEffects: { // wxFontData::GetEnableEffects
 case wxFontData_GetInitialFont: { // wxFontData::GetInitialFont
  wxFontData *This = (wxFontData *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetInitialFont()); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new EwxFont(This->GetInitialFont()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -23233,7 +23274,7 @@ case wxXmlResource_LoadBitmap: { // wxXmlResource::LoadBitmap
  wxString name = wxString(bp, wxConvUTF8);
  bp += *nameLen+((8-((0+ *nameLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- wxBitmap * Result = new wxBitmap(This->LoadBitmap(name)); newPtr((void *) Result,3, memenv);;
+ wxBitmap * Result = new EwxBitmap(This->LoadBitmap(name)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -23289,7 +23330,7 @@ case wxXmlResource_LoadIcon: { // wxXmlResource::LoadIcon
  wxString name = wxString(bp, wxConvUTF8);
  bp += *nameLen+((8-((0+ *nameLen) & 7)) & 7);
  if(!This) throw wxe_badarg(0);
- wxIcon * Result = new wxIcon(This->LoadIcon(name)); newPtr((void *) Result,3, memenv);;
+ wxIcon * Result = new EwxIcon(This->LoadIcon(name)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -24839,7 +24880,7 @@ case wxAuiNotebook_GetPageBitmap: { // wxAuiNotebook::GetPageBitmap
  wxAuiNotebook *This = (wxAuiNotebook *) getPtr(bp,memenv); bp += 4;
  int * page_idx = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxBitmap * Result = new wxBitmap(This->GetPageBitmap(*page_idx)); newPtr((void *) Result,3, memenv);;
+ wxBitmap * Result = new EwxBitmap(This->GetPageBitmap(*page_idx)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -25032,7 +25073,7 @@ case wxAuiDockArt_GetFont: { // wxAuiDockArt::GetFont
  wxAuiDockArt *This = (wxAuiDockArt *) getPtr(bp,memenv); bp += 4;
  int * id = (int *) bp; bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetFont(*id)); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new EwxFont(This->GetFont(*id)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -26671,7 +26712,7 @@ case wxColourPickerEvent_GetColour: { // wxColourPickerEvent::GetColour
 case wxFontPickerEvent_GetFont: { // wxFontPickerEvent::GetFont
  wxFontPickerEvent *This = (wxFontPickerEvent *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxFont * Result = new wxFont(This->GetFont()); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new EwxFont(This->GetFont()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
@@ -30602,7 +30643,7 @@ case wxArtProvider_GetBitmap: { // wxArtProvider::GetBitmap
  bp += 4; /* Align */
   } break;
  }};
- wxBitmap * Result = new wxBitmap(wxArtProvider::GetBitmap(id,client,size)); newPtr((void *) Result,3, memenv);;
+ wxBitmap * Result = new EwxBitmap(wxArtProvider::GetBitmap(id,client,size)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -30625,7 +30666,7 @@ case wxArtProvider_GetIcon: { // wxArtProvider::GetIcon
  bp += 4; /* Align */
   } break;
  }};
- wxIcon * Result = new wxIcon(wxArtProvider::GetIcon(id,client,size)); newPtr((void *) Result,3, memenv);;
+ wxIcon * Result = new EwxIcon(wxArtProvider::GetIcon(id,client,size)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxIcon");
  break;
 }
@@ -30808,7 +30849,7 @@ bitmap = (wxBitmap *) getPtr(bp,memenv); bp += 4;
 case wxBitmapDataObject_GetBitmap: { // wxBitmapDataObject::GetBitmap
  wxBitmapDataObject *This = (wxBitmapDataObject *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxBitmap * Result = new wxBitmap(This->GetBitmap()); newPtr((void *) Result,3, memenv);;
+ wxBitmap * Result = new EwxBitmap(This->GetBitmap()); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxBitmap");
  break;
 }
@@ -31428,7 +31469,7 @@ case wxSystemSettings_GetColour: { // wxSystemSettings::GetColour
 }
 case wxSystemSettings_GetFont: { // wxSystemSettings::GetFont
  wxSystemFont index = *(wxSystemFont *) bp; bp += 4;;
- wxFont * Result = new wxFont(wxSystemSettings::GetFont(index)); newPtr((void *) Result,3, memenv);;
+ wxFont * Result = new EwxFont(wxSystemSettings::GetFont(index)); newPtr((void *) Result,3, memenv);;
  rt.addRef(getRef((void *)Result,memenv), "wxFont");
  break;
 }
diff --git a/lib/wx/c_src/gen/wxe_macros.h b/lib/wx/c_src/gen/wxe_macros.h
index 1d50278360..0d3b79b7f9 100644
--- a/lib/wx/c_src/gen/wxe_macros.h
+++ b/lib/wx/c_src/gen/wxe_macros.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2015. All Rights Reserved.
+ * Copyright Ericsson AB 2008-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.
@@ -241,3185 +241,3189 @@
 #define wxWindow_UpdateWindowUI 281
 #define wxWindow_Validate 282
 #define wxWindow_WarpPointer 283
-#define wxTopLevelWindow_GetIcon 284
-#define wxTopLevelWindow_GetIcons 285
-#define wxTopLevelWindow_GetTitle 286
-#define wxTopLevelWindow_IsActive 287
-#define wxTopLevelWindow_Iconize 288
-#define wxTopLevelWindow_IsFullScreen 289
-#define wxTopLevelWindow_IsIconized 290
-#define wxTopLevelWindow_IsMaximized 291
-#define wxTopLevelWindow_Maximize 292
-#define wxTopLevelWindow_RequestUserAttention 293
-#define wxTopLevelWindow_SetIcon 294
-#define wxTopLevelWindow_SetIcons 295
-#define wxTopLevelWindow_CenterOnScreen 296
-#define wxTopLevelWindow_CentreOnScreen 297
-#define wxTopLevelWindow_SetShape 299
-#define wxTopLevelWindow_SetTitle 300
-#define wxTopLevelWindow_ShowFullScreen 301
-#define wxFrame_new_4 303
-#define wxFrame_new_0 304
-#define wxFrame_destruct 306
-#define wxFrame_Create 307
-#define wxFrame_CreateStatusBar 308
-#define wxFrame_CreateToolBar 309
-#define wxFrame_GetClientAreaOrigin 310
-#define wxFrame_GetMenuBar 311
-#define wxFrame_GetStatusBar 312
-#define wxFrame_GetStatusBarPane 313
-#define wxFrame_GetToolBar 314
-#define wxFrame_ProcessCommand 315
-#define wxFrame_SendSizeEvent 316
-#define wxFrame_SetMenuBar 317
-#define wxFrame_SetStatusBar 318
-#define wxFrame_SetStatusBarPane 319
-#define wxFrame_SetStatusText 320
-#define wxFrame_SetStatusWidths 321
-#define wxFrame_SetToolBar 322
-#define wxMiniFrame_new_0 323
-#define wxMiniFrame_new_4 324
-#define wxMiniFrame_Create 325
-#define wxMiniFrame_destroy 326
-#define wxSplashScreen_new_0 327
-#define wxSplashScreen_new_6 328
-#define wxSplashScreen_destruct 329
-#define wxSplashScreen_GetSplashStyle 330
-#define wxSplashScreen_GetTimeout 331
-#define wxPanel_new_0 332
-#define wxPanel_new_6 333
-#define wxPanel_new_2 334
-#define wxPanel_destruct 335
-#define wxPanel_InitDialog 336
-#define wxPanel_SetFocusIgnoringChildren 337
-#define wxScrolledWindow_new_0 338
-#define wxScrolledWindow_new_2 339
-#define wxScrolledWindow_destruct 340
-#define wxScrolledWindow_CalcScrolledPosition_4 341
-#define wxScrolledWindow_CalcScrolledPosition_1 342
-#define wxScrolledWindow_CalcUnscrolledPosition_4 343
-#define wxScrolledWindow_CalcUnscrolledPosition_1 344
-#define wxScrolledWindow_EnableScrolling 345
-#define wxScrolledWindow_GetScrollPixelsPerUnit 346
-#define wxScrolledWindow_GetViewStart 347
-#define wxScrolledWindow_DoPrepareDC 348
-#define wxScrolledWindow_PrepareDC 349
-#define wxScrolledWindow_Scroll 350
-#define wxScrolledWindow_SetScrollbars 351
-#define wxScrolledWindow_SetScrollRate 352
-#define wxScrolledWindow_SetTargetWindow 353
-#define wxSashWindow_new_0 354
-#define wxSashWindow_new_2 355
-#define wxSashWindow_destruct 356
-#define wxSashWindow_GetSashVisible 357
-#define wxSashWindow_GetMaximumSizeX 358
-#define wxSashWindow_GetMaximumSizeY 359
-#define wxSashWindow_GetMinimumSizeX 360
-#define wxSashWindow_GetMinimumSizeY 361
-#define wxSashWindow_SetMaximumSizeX 362
-#define wxSashWindow_SetMaximumSizeY 363
-#define wxSashWindow_SetMinimumSizeX 364
-#define wxSashWindow_SetMinimumSizeY 365
-#define wxSashWindow_SetSashVisible 366
-#define wxSashLayoutWindow_new_0 367
-#define wxSashLayoutWindow_new_2 368
-#define wxSashLayoutWindow_Create 369
-#define wxSashLayoutWindow_GetAlignment 370
-#define wxSashLayoutWindow_GetOrientation 371
-#define wxSashLayoutWindow_SetAlignment 372
-#define wxSashLayoutWindow_SetDefaultSize 373
-#define wxSashLayoutWindow_SetOrientation 374
-#define wxSashLayoutWindow_destroy 375
-#define wxGrid_new_0 376
-#define wxGrid_new_3 377
-#define wxGrid_new_4 378
-#define wxGrid_destruct 379
-#define wxGrid_AppendCols 380
-#define wxGrid_AppendRows 381
-#define wxGrid_AutoSize 382
-#define wxGrid_AutoSizeColumn 383
-#define wxGrid_AutoSizeColumns 384
-#define wxGrid_AutoSizeRow 385
-#define wxGrid_AutoSizeRows 386
-#define wxGrid_BeginBatch 387
-#define wxGrid_BlockToDeviceRect 388
-#define wxGrid_CanDragColSize 389
-#define wxGrid_CanDragRowSize 390
-#define wxGrid_CanDragGridSize 391
-#define wxGrid_CanEnableCellControl 392
-#define wxGrid_CellToRect_2 393
-#define wxGrid_CellToRect_1 394
-#define wxGrid_ClearGrid 395
-#define wxGrid_ClearSelection 396
-#define wxGrid_CreateGrid 397
-#define wxGrid_DeleteCols 398
-#define wxGrid_DeleteRows 399
-#define wxGrid_DisableCellEditControl 400
-#define wxGrid_DisableDragColSize 401
-#define wxGrid_DisableDragGridSize 402
-#define wxGrid_DisableDragRowSize 403
-#define wxGrid_EnableCellEditControl 404
-#define wxGrid_EnableDragColSize 405
-#define wxGrid_EnableDragGridSize 406
-#define wxGrid_EnableDragRowSize 407
-#define wxGrid_EnableEditing 408
-#define wxGrid_EnableGridLines 409
-#define wxGrid_EndBatch 410
-#define wxGrid_Fit 411
-#define wxGrid_ForceRefresh 412
-#define wxGrid_GetBatchCount 413
-#define wxGrid_GetCellAlignment 414
-#define wxGrid_GetCellBackgroundColour 415
-#define wxGrid_GetCellEditor 416
-#define wxGrid_GetCellFont 417
-#define wxGrid_GetCellRenderer 418
-#define wxGrid_GetCellTextColour 419
-#define wxGrid_GetCellValue_2 420
-#define wxGrid_GetCellValue_1 421
-#define wxGrid_GetColLabelAlignment 422
-#define wxGrid_GetColLabelSize 423
-#define wxGrid_GetColLabelValue 424
-#define wxGrid_GetColMinimalAcceptableWidth 425
-#define wxGrid_GetDefaultCellAlignment 426
-#define wxGrid_GetDefaultCellBackgroundColour 427
-#define wxGrid_GetDefaultCellFont 428
-#define wxGrid_GetDefaultCellTextColour 429
-#define wxGrid_GetDefaultColLabelSize 430
-#define wxGrid_GetDefaultColSize 431
-#define wxGrid_GetDefaultEditor 432
-#define wxGrid_GetDefaultEditorForCell_2 433
-#define wxGrid_GetDefaultEditorForCell_1 434
-#define wxGrid_GetDefaultEditorForType 435
-#define wxGrid_GetDefaultRenderer 436
-#define wxGrid_GetDefaultRendererForCell 437
-#define wxGrid_GetDefaultRendererForType 438
-#define wxGrid_GetDefaultRowLabelSize 439
-#define wxGrid_GetDefaultRowSize 440
-#define wxGrid_GetGridCursorCol 441
-#define wxGrid_GetGridCursorRow 442
-#define wxGrid_GetGridLineColour 443
-#define wxGrid_GridLinesEnabled 444
-#define wxGrid_GetLabelBackgroundColour 445
-#define wxGrid_GetLabelFont 446
-#define wxGrid_GetLabelTextColour 447
-#define wxGrid_GetNumberCols 448
-#define wxGrid_GetNumberRows 449
-#define wxGrid_GetOrCreateCellAttr 450
-#define wxGrid_GetRowMinimalAcceptableHeight 451
-#define wxGrid_GetRowLabelAlignment 452
-#define wxGrid_GetRowLabelSize 453
-#define wxGrid_GetRowLabelValue 454
-#define wxGrid_GetRowSize 455
-#define wxGrid_GetScrollLineX 456
-#define wxGrid_GetScrollLineY 457
-#define wxGrid_GetSelectedCells 458
-#define wxGrid_GetSelectedCols 459
-#define wxGrid_GetSelectedRows 460
-#define wxGrid_GetSelectionBackground 461
-#define wxGrid_GetSelectionBlockTopLeft 462
-#define wxGrid_GetSelectionBlockBottomRight 463
-#define wxGrid_GetSelectionForeground 464
-#define wxGrid_GetViewWidth 465
-#define wxGrid_GetGridWindow 466
-#define wxGrid_GetGridRowLabelWindow 467
-#define wxGrid_GetGridColLabelWindow 468
-#define wxGrid_GetGridCornerLabelWindow 469
-#define wxGrid_HideCellEditControl 470
-#define wxGrid_InsertCols 471
-#define wxGrid_InsertRows 472
-#define wxGrid_IsCellEditControlEnabled 473
-#define wxGrid_IsCurrentCellReadOnly 474
-#define wxGrid_IsEditable 475
-#define wxGrid_IsInSelection_2 476
-#define wxGrid_IsInSelection_1 477
-#define wxGrid_IsReadOnly 478
-#define wxGrid_IsSelection 479
-#define wxGrid_IsVisible_3 480
-#define wxGrid_IsVisible_2 481
-#define wxGrid_MakeCellVisible_2 482
-#define wxGrid_MakeCellVisible_1 483
-#define wxGrid_MoveCursorDown 484
-#define wxGrid_MoveCursorLeft 485
-#define wxGrid_MoveCursorRight 486
-#define wxGrid_MoveCursorUp 487
-#define wxGrid_MoveCursorDownBlock 488
-#define wxGrid_MoveCursorLeftBlock 489
-#define wxGrid_MoveCursorRightBlock 490
-#define wxGrid_MoveCursorUpBlock 491
-#define wxGrid_MovePageDown 492
-#define wxGrid_MovePageUp 493
-#define wxGrid_RegisterDataType 494
-#define wxGrid_SaveEditControlValue 495
-#define wxGrid_SelectAll 496
-#define wxGrid_SelectBlock_5 497
-#define wxGrid_SelectBlock_3 498
-#define wxGrid_SelectCol 499
-#define wxGrid_SelectRow 500
-#define wxGrid_SetCellAlignment_4 501
-#define wxGrid_SetCellAlignment_3 502
-#define wxGrid_SetCellAlignment_1 503
-#define wxGrid_SetCellBackgroundColour_3_0 504
-#define wxGrid_SetCellBackgroundColour_1 505
-#define wxGrid_SetCellBackgroundColour_3_1 506
-#define wxGrid_SetCellEditor 507
-#define wxGrid_SetCellFont 508
-#define wxGrid_SetCellRenderer 509
-#define wxGrid_SetCellTextColour_3_0 510
-#define wxGrid_SetCellTextColour_3_1 511
-#define wxGrid_SetCellTextColour_1 512
-#define wxGrid_SetCellValue_3_0 513
-#define wxGrid_SetCellValue_2 514
-#define wxGrid_SetCellValue_3_1 515
-#define wxGrid_SetColAttr 516
-#define wxGrid_SetColFormatBool 517
-#define wxGrid_SetColFormatNumber 518
-#define wxGrid_SetColFormatFloat 519
-#define wxGrid_SetColFormatCustom 520
-#define wxGrid_SetColLabelAlignment 521
-#define wxGrid_SetColLabelSize 522
-#define wxGrid_SetColLabelValue 523
-#define wxGrid_SetColMinimalWidth 524
-#define wxGrid_SetColMinimalAcceptableWidth 525
-#define wxGrid_SetColSize 526
-#define wxGrid_SetDefaultCellAlignment 527
-#define wxGrid_SetDefaultCellBackgroundColour 528
-#define wxGrid_SetDefaultCellFont 529
-#define wxGrid_SetDefaultCellTextColour 530
-#define wxGrid_SetDefaultEditor 531
-#define wxGrid_SetDefaultRenderer 532
-#define wxGrid_SetDefaultColSize 533
-#define wxGrid_SetDefaultRowSize 534
-#define wxGrid_SetGridCursor 535
-#define wxGrid_SetGridLineColour 536
-#define wxGrid_SetLabelBackgroundColour 537
-#define wxGrid_SetLabelFont 538
-#define wxGrid_SetLabelTextColour 539
-#define wxGrid_SetMargins 540
-#define wxGrid_SetReadOnly 541
-#define wxGrid_SetRowAttr 542
-#define wxGrid_SetRowLabelAlignment 543
-#define wxGrid_SetRowLabelSize 544
-#define wxGrid_SetRowLabelValue 545
-#define wxGrid_SetRowMinimalHeight 546
-#define wxGrid_SetRowMinimalAcceptableHeight 547
-#define wxGrid_SetRowSize 548
-#define wxGrid_SetScrollLineX 549
-#define wxGrid_SetScrollLineY 550
-#define wxGrid_SetSelectionBackground 551
-#define wxGrid_SetSelectionForeground 552
-#define wxGrid_SetSelectionMode 553
-#define wxGrid_ShowCellEditControl 554
-#define wxGrid_XToCol 555
-#define wxGrid_XToEdgeOfCol 556
-#define wxGrid_YToEdgeOfRow 557
-#define wxGrid_YToRow 558
-#define wxGridCellRenderer_Draw 559
-#define wxGridCellRenderer_GetBestSize 560
-#define wxGridCellEditor_Create 561
-#define wxGridCellEditor_IsCreated 562
-#define wxGridCellEditor_SetSize 563
-#define wxGridCellEditor_Show 564
-#define wxGridCellEditor_PaintBackground 565
-#define wxGridCellEditor_BeginEdit 566
-#define wxGridCellEditor_EndEdit 567
-#define wxGridCellEditor_Reset 568
-#define wxGridCellEditor_StartingKey 569
-#define wxGridCellEditor_StartingClick 570
-#define wxGridCellEditor_HandleReturn 571
-#define wxGridCellBoolRenderer_new 572
-#define wxGridCellBoolRenderer_destroy 573
-#define wxGridCellBoolEditor_new 574
-#define wxGridCellBoolEditor_IsTrueValue 575
-#define wxGridCellBoolEditor_UseStringValues 576
-#define wxGridCellBoolEditor_destroy 577
-#define wxGridCellFloatRenderer_new 578
-#define wxGridCellFloatRenderer_GetPrecision 579
-#define wxGridCellFloatRenderer_GetWidth 580
-#define wxGridCellFloatRenderer_SetParameters 581
-#define wxGridCellFloatRenderer_SetPrecision 582
-#define wxGridCellFloatRenderer_SetWidth 583
-#define wxGridCellFloatRenderer_destroy 584
-#define wxGridCellFloatEditor_new 585
-#define wxGridCellFloatEditor_SetParameters 586
-#define wxGridCellFloatEditor_destroy 587
-#define wxGridCellStringRenderer_new 588
-#define wxGridCellStringRenderer_destroy 589
-#define wxGridCellTextEditor_new 590
-#define wxGridCellTextEditor_SetParameters 591
-#define wxGridCellTextEditor_destroy 592
-#define wxGridCellChoiceEditor_new 594
-#define wxGridCellChoiceEditor_SetParameters 595
-#define wxGridCellChoiceEditor_destroy 596
-#define wxGridCellNumberRenderer_new 597
-#define wxGridCellNumberRenderer_destroy 598
-#define wxGridCellNumberEditor_new 599
-#define wxGridCellNumberEditor_GetValue 600
-#define wxGridCellNumberEditor_SetParameters 601
-#define wxGridCellNumberEditor_destroy 602
-#define wxGridCellAttr_SetTextColour 603
-#define wxGridCellAttr_SetBackgroundColour 604
-#define wxGridCellAttr_SetFont 605
-#define wxGridCellAttr_SetAlignment 606
-#define wxGridCellAttr_SetReadOnly 607
-#define wxGridCellAttr_SetRenderer 608
-#define wxGridCellAttr_SetEditor 609
-#define wxGridCellAttr_HasTextColour 610
-#define wxGridCellAttr_HasBackgroundColour 611
-#define wxGridCellAttr_HasFont 612
-#define wxGridCellAttr_HasAlignment 613
-#define wxGridCellAttr_HasRenderer 614
-#define wxGridCellAttr_HasEditor 615
-#define wxGridCellAttr_GetTextColour 616
-#define wxGridCellAttr_GetBackgroundColour 617
-#define wxGridCellAttr_GetFont 618
-#define wxGridCellAttr_GetAlignment 619
-#define wxGridCellAttr_GetRenderer 620
-#define wxGridCellAttr_GetEditor 621
-#define wxGridCellAttr_IsReadOnly 622
-#define wxGridCellAttr_SetDefAttr 623
-#define wxDC_Blit 624
-#define wxDC_CalcBoundingBox 625
-#define wxDC_Clear 626
-#define wxDC_ComputeScaleAndOrigin 627
-#define wxDC_CrossHair 628
-#define wxDC_DestroyClippingRegion 629
-#define wxDC_DeviceToLogicalX 630
-#define wxDC_DeviceToLogicalXRel 631
-#define wxDC_DeviceToLogicalY 632
-#define wxDC_DeviceToLogicalYRel 633
-#define wxDC_DrawArc 634
-#define wxDC_DrawBitmap 635
-#define wxDC_DrawCheckMark 636
-#define wxDC_DrawCircle 637
-#define wxDC_DrawEllipse_2 639
-#define wxDC_DrawEllipse_1 640
-#define wxDC_DrawEllipticArc 641
-#define wxDC_DrawIcon 642
-#define wxDC_DrawLabel 643
-#define wxDC_DrawLine 644
-#define wxDC_DrawLines 645
-#define wxDC_DrawPolygon 647
-#define wxDC_DrawPoint 649
-#define wxDC_DrawRectangle_2 651
-#define wxDC_DrawRectangle_1 652
-#define wxDC_DrawRotatedText 653
-#define wxDC_DrawRoundedRectangle_3 655
-#define wxDC_DrawRoundedRectangle_2 656
-#define wxDC_DrawText 657
-#define wxDC_EndDoc 658
-#define wxDC_EndPage 659
-#define wxDC_FloodFill 660
-#define wxDC_GetBackground 661
-#define wxDC_GetBackgroundMode 662
-#define wxDC_GetBrush 663
-#define wxDC_GetCharHeight 664
-#define wxDC_GetCharWidth 665
-#define wxDC_GetClippingBox 666
-#define wxDC_GetFont 668
-#define wxDC_GetLayoutDirection 669
-#define wxDC_GetLogicalFunction 670
-#define wxDC_GetMapMode 671
-#define wxDC_GetMultiLineTextExtent_4 672
-#define wxDC_GetMultiLineTextExtent_1 673
-#define wxDC_GetPartialTextExtents 674
-#define wxDC_GetPen 675
-#define wxDC_GetPixel 676
-#define wxDC_GetPPI 677
-#define wxDC_GetSize 679
-#define wxDC_GetSizeMM 681
-#define wxDC_GetTextBackground 682
-#define wxDC_GetTextExtent_4 683
-#define wxDC_GetTextExtent_1 684
-#define wxDC_GetTextForeground 686
-#define wxDC_GetUserScale 687
-#define wxDC_GradientFillConcentric_3 688
-#define wxDC_GradientFillConcentric_4 689
-#define wxDC_GradientFillLinear 690
-#define wxDC_LogicalToDeviceX 691
-#define wxDC_LogicalToDeviceXRel 692
-#define wxDC_LogicalToDeviceY 693
-#define wxDC_LogicalToDeviceYRel 694
-#define wxDC_MaxX 695
-#define wxDC_MaxY 696
-#define wxDC_MinX 697
-#define wxDC_MinY 698
-#define wxDC_IsOk 699
-#define wxDC_ResetBoundingBox 700
-#define wxDC_SetAxisOrientation 701
-#define wxDC_SetBackground 702
-#define wxDC_SetBackgroundMode 703
-#define wxDC_SetBrush 704
-#define wxDC_SetClippingRegion_2 706
-#define wxDC_SetClippingRegion_1_1 707
-#define wxDC_SetClippingRegion_1_0 708
-#define wxDC_SetDeviceOrigin 709
-#define wxDC_SetFont 710
-#define wxDC_SetLayoutDirection 711
-#define wxDC_SetLogicalFunction 712
-#define wxDC_SetMapMode 713
-#define wxDC_SetPalette 714
-#define wxDC_SetPen 715
-#define wxDC_SetTextBackground 716
-#define wxDC_SetTextForeground 717
-#define wxDC_SetUserScale 718
-#define wxDC_StartDoc 719
-#define wxDC_StartPage 720
-#define wxMirrorDC_new 721
-#define wxMirrorDC_destroy 722
-#define wxScreenDC_new 723
-#define wxScreenDC_destruct 724
-#define wxPostScriptDC_new_0 725
-#define wxPostScriptDC_new_1 726
-#define wxPostScriptDC_destruct 727
-#define wxPostScriptDC_SetResolution 728
-#define wxPostScriptDC_GetResolution 729
-#define wxWindowDC_new_0 730
-#define wxWindowDC_new_1 731
-#define wxWindowDC_destruct 732
-#define wxClientDC_new_0 733
-#define wxClientDC_new_1 734
-#define wxClientDC_destroy 735
-#define wxPaintDC_new_0 736
-#define wxPaintDC_new_1 737
-#define wxPaintDC_destroy 738
-#define wxMemoryDC_new_1_0 740
-#define wxMemoryDC_new_1_1 741
-#define wxMemoryDC_new_0 742
-#define wxMemoryDC_destruct 744
-#define wxMemoryDC_SelectObject 745
-#define wxMemoryDC_SelectObjectAsSource 746
-#define wxBufferedDC_new_0 747
-#define wxBufferedDC_new_2 748
-#define wxBufferedDC_new_3 749
-#define wxBufferedDC_destruct 750
-#define wxBufferedDC_Init_2 751
-#define wxBufferedDC_Init_3 752
-#define wxBufferedPaintDC_new_3 753
-#define wxBufferedPaintDC_new_2 754
-#define wxBufferedPaintDC_destruct 755
-#define wxGraphicsObject_destruct 756
-#define wxGraphicsObject_GetRenderer 757
-#define wxGraphicsObject_IsNull 758
-#define wxGraphicsContext_destruct 759
-#define wxGraphicsContext_Create_1_1 760
-#define wxGraphicsContext_Create_1_0 761
-#define wxGraphicsContext_Create_0 762
-#define wxGraphicsContext_CreatePen 763
-#define wxGraphicsContext_CreateBrush 764
-#define wxGraphicsContext_CreateRadialGradientBrush 765
-#define wxGraphicsContext_CreateLinearGradientBrush 766
-#define wxGraphicsContext_CreateFont 767
-#define wxGraphicsContext_CreateMatrix 768
-#define wxGraphicsContext_CreatePath 769
-#define wxGraphicsContext_Clip_1 770
-#define wxGraphicsContext_Clip_4 771
-#define wxGraphicsContext_ResetClip 772
-#define wxGraphicsContext_DrawBitmap 773
-#define wxGraphicsContext_DrawEllipse 774
-#define wxGraphicsContext_DrawIcon 775
-#define wxGraphicsContext_DrawLines 776
-#define wxGraphicsContext_DrawPath 777
-#define wxGraphicsContext_DrawRectangle 778
-#define wxGraphicsContext_DrawRoundedRectangle 779
-#define wxGraphicsContext_DrawText_3 780
-#define wxGraphicsContext_DrawText_4_0 781
-#define wxGraphicsContext_DrawText_4_1 782
-#define wxGraphicsContext_DrawText_5 783
-#define wxGraphicsContext_FillPath 784
-#define wxGraphicsContext_StrokePath 785
-#define wxGraphicsContext_GetPartialTextExtents 786
-#define wxGraphicsContext_GetTextExtent 787
-#define wxGraphicsContext_Rotate 788
-#define wxGraphicsContext_Scale 789
-#define wxGraphicsContext_Translate 790
-#define wxGraphicsContext_GetTransform 791
-#define wxGraphicsContext_SetTransform 792
-#define wxGraphicsContext_ConcatTransform 793
-#define wxGraphicsContext_SetBrush_1_1 794
-#define wxGraphicsContext_SetBrush_1_0 795
-#define wxGraphicsContext_SetFont_1 796
-#define wxGraphicsContext_SetFont_2 797
-#define wxGraphicsContext_SetPen_1_0 798
-#define wxGraphicsContext_SetPen_1_1 799
-#define wxGraphicsContext_StrokeLine 800
-#define wxGraphicsContext_StrokeLines 801
-#define wxGraphicsMatrix_Concat 803
-#define wxGraphicsMatrix_Get 805
-#define wxGraphicsMatrix_Invert 806
-#define wxGraphicsMatrix_IsEqual 807
-#define wxGraphicsMatrix_IsIdentity 809
-#define wxGraphicsMatrix_Rotate 810
-#define wxGraphicsMatrix_Scale 811
-#define wxGraphicsMatrix_Translate 812
-#define wxGraphicsMatrix_Set 813
-#define wxGraphicsMatrix_TransformPoint 814
-#define wxGraphicsMatrix_TransformDistance 815
-#define wxGraphicsPath_MoveToPoint_2 816
-#define wxGraphicsPath_MoveToPoint_1 817
-#define wxGraphicsPath_AddArc_6 818
-#define wxGraphicsPath_AddArc_5 819
-#define wxGraphicsPath_AddArcToPoint 820
-#define wxGraphicsPath_AddCircle 821
-#define wxGraphicsPath_AddCurveToPoint_6 822
-#define wxGraphicsPath_AddCurveToPoint_3 823
-#define wxGraphicsPath_AddEllipse 824
-#define wxGraphicsPath_AddLineToPoint_2 825
-#define wxGraphicsPath_AddLineToPoint_1 826
-#define wxGraphicsPath_AddPath 827
-#define wxGraphicsPath_AddQuadCurveToPoint 828
-#define wxGraphicsPath_AddRectangle 829
-#define wxGraphicsPath_AddRoundedRectangle 830
-#define wxGraphicsPath_CloseSubpath 831
-#define wxGraphicsPath_Contains_3 832
-#define wxGraphicsPath_Contains_2 833
-#define wxGraphicsPath_GetBox 835
-#define wxGraphicsPath_GetCurrentPoint 837
-#define wxGraphicsPath_Transform 838
-#define wxGraphicsRenderer_GetDefaultRenderer 839
-#define wxGraphicsRenderer_CreateContext_1_1 840
-#define wxGraphicsRenderer_CreateContext_1_0 841
-#define wxGraphicsRenderer_CreatePen 842
-#define wxGraphicsRenderer_CreateBrush 843
-#define wxGraphicsRenderer_CreateLinearGradientBrush 844
-#define wxGraphicsRenderer_CreateRadialGradientBrush 845
-#define wxGraphicsRenderer_CreateFont 846
-#define wxGraphicsRenderer_CreateMatrix 847
-#define wxGraphicsRenderer_CreatePath 848
-#define wxMenuBar_new_1 850
-#define wxMenuBar_new_0 852
-#define wxMenuBar_destruct 854
-#define wxMenuBar_Append 855
-#define wxMenuBar_Check 856
-#define wxMenuBar_Enable_2 857
-#define wxMenuBar_Enable_1 858
-#define wxMenuBar_EnableTop 859
-#define wxMenuBar_FindMenu 860
-#define wxMenuBar_FindMenuItem 861
-#define wxMenuBar_FindItem 862
-#define wxMenuBar_GetHelpString 863
-#define wxMenuBar_GetLabel_1 864
-#define wxMenuBar_GetLabel_0 865
-#define wxMenuBar_GetLabelTop 866
-#define wxMenuBar_GetMenu 867
-#define wxMenuBar_GetMenuCount 868
-#define wxMenuBar_Insert 869
-#define wxMenuBar_IsChecked 870
-#define wxMenuBar_IsEnabled_1 871
-#define wxMenuBar_IsEnabled_0 872
-#define wxMenuBar_Remove 873
-#define wxMenuBar_Replace 874
-#define wxMenuBar_SetHelpString 875
-#define wxMenuBar_SetLabel_2 876
-#define wxMenuBar_SetLabel_1 877
-#define wxMenuBar_SetLabelTop 878
-#define wxControl_GetLabel 879
-#define wxControl_SetLabel 880
-#define wxControlWithItems_Append_1 881
-#define wxControlWithItems_Append_2 882
-#define wxControlWithItems_appendStrings_1 883
-#define wxControlWithItems_Clear 884
-#define wxControlWithItems_Delete 885
-#define wxControlWithItems_FindString 886
-#define wxControlWithItems_getClientData 887
-#define wxControlWithItems_setClientData 888
-#define wxControlWithItems_GetCount 889
-#define wxControlWithItems_GetSelection 890
-#define wxControlWithItems_GetString 891
-#define wxControlWithItems_GetStringSelection 892
-#define wxControlWithItems_Insert_2 893
-#define wxControlWithItems_Insert_3 894
-#define wxControlWithItems_IsEmpty 895
-#define wxControlWithItems_Select 896
-#define wxControlWithItems_SetSelection 897
-#define wxControlWithItems_SetString 898
-#define wxControlWithItems_SetStringSelection 899
-#define wxMenu_new_2 902
-#define wxMenu_new_1 903
-#define wxMenu_destruct 905
-#define wxMenu_Append_3 906
-#define wxMenu_Append_1 907
-#define wxMenu_Append_4_0 908
-#define wxMenu_Append_4_1 909
-#define wxMenu_AppendCheckItem 910
-#define wxMenu_AppendRadioItem 911
-#define wxMenu_AppendSeparator 912
-#define wxMenu_Break 913
-#define wxMenu_Check 914
-#define wxMenu_Delete_1_0 915
-#define wxMenu_Delete_1_1 916
-#define wxMenu_Destroy_1_0 917
-#define wxMenu_Destroy_1_1 918
-#define wxMenu_Enable 919
-#define wxMenu_FindItem_1 920
-#define wxMenu_FindItem_2 921
-#define wxMenu_FindItemByPosition 922
-#define wxMenu_GetHelpString 923
-#define wxMenu_GetLabel 924
-#define wxMenu_GetMenuItemCount 925
-#define wxMenu_GetMenuItems 926
-#define wxMenu_GetTitle 928
-#define wxMenu_Insert_2 929
-#define wxMenu_Insert_3 930
-#define wxMenu_Insert_5_1 931
-#define wxMenu_Insert_5_0 932
-#define wxMenu_InsertCheckItem 933
-#define wxMenu_InsertRadioItem 934
-#define wxMenu_InsertSeparator 935
-#define wxMenu_IsChecked 936
-#define wxMenu_IsEnabled 937
-#define wxMenu_Prepend_1 938
-#define wxMenu_Prepend_2 939
-#define wxMenu_Prepend_4_1 940
-#define wxMenu_Prepend_4_0 941
-#define wxMenu_PrependCheckItem 942
-#define wxMenu_PrependRadioItem 943
-#define wxMenu_PrependSeparator 944
-#define wxMenu_Remove_1_0 945
-#define wxMenu_Remove_1_1 946
-#define wxMenu_SetHelpString 947
-#define wxMenu_SetLabel 948
-#define wxMenu_SetTitle 949
-#define wxMenuItem_new 950
-#define wxMenuItem_destruct 952
-#define wxMenuItem_Check 953
-#define wxMenuItem_Enable 954
-#define wxMenuItem_GetBitmap 955
-#define wxMenuItem_GetHelp 956
-#define wxMenuItem_GetId 957
-#define wxMenuItem_GetKind 958
-#define wxMenuItem_GetLabel 959
-#define wxMenuItem_GetLabelFromText 960
-#define wxMenuItem_GetMenu 961
-#define wxMenuItem_GetText 962
-#define wxMenuItem_GetSubMenu 963
-#define wxMenuItem_IsCheckable 964
-#define wxMenuItem_IsChecked 965
-#define wxMenuItem_IsEnabled 966
-#define wxMenuItem_IsSeparator 967
-#define wxMenuItem_IsSubMenu 968
-#define wxMenuItem_SetBitmap 969
-#define wxMenuItem_SetHelp 970
-#define wxMenuItem_SetMenu 971
-#define wxMenuItem_SetSubMenu 972
-#define wxMenuItem_SetText 973
-#define wxToolBar_AddControl 974
-#define wxToolBar_AddSeparator 975
-#define wxToolBar_AddTool_5 976
-#define wxToolBar_AddTool_4_0 977
-#define wxToolBar_AddTool_1 978
-#define wxToolBar_AddTool_4_1 979
-#define wxToolBar_AddTool_3 980
-#define wxToolBar_AddTool_6 981
-#define wxToolBar_AddCheckTool 982
-#define wxToolBar_AddRadioTool 983
-#define wxToolBar_AddStretchableSpace 984
-#define wxToolBar_InsertStretchableSpace 985
-#define wxToolBar_DeleteTool 986
-#define wxToolBar_DeleteToolByPos 987
-#define wxToolBar_EnableTool 988
-#define wxToolBar_FindById 989
-#define wxToolBar_FindControl 990
-#define wxToolBar_FindToolForPosition 991
-#define wxToolBar_GetToolSize 992
-#define wxToolBar_GetToolBitmapSize 993
-#define wxToolBar_GetMargins 994
-#define wxToolBar_GetToolEnabled 995
-#define wxToolBar_GetToolLongHelp 996
-#define wxToolBar_GetToolPacking 997
-#define wxToolBar_GetToolPos 998
-#define wxToolBar_GetToolSeparation 999
-#define wxToolBar_GetToolShortHelp 1000
-#define wxToolBar_GetToolState 1001
-#define wxToolBar_InsertControl 1002
-#define wxToolBar_InsertSeparator 1003
-#define wxToolBar_InsertTool_5 1004
-#define wxToolBar_InsertTool_2 1005
-#define wxToolBar_InsertTool_4 1006
-#define wxToolBar_Realize 1007
-#define wxToolBar_RemoveTool 1008
-#define wxToolBar_SetMargins 1009
-#define wxToolBar_SetToolBitmapSize 1010
-#define wxToolBar_SetToolLongHelp 1011
-#define wxToolBar_SetToolPacking 1012
-#define wxToolBar_SetToolShortHelp 1013
-#define wxToolBar_SetToolSeparation 1014
-#define wxToolBar_ToggleTool 1015
-#define wxStatusBar_new_0 1017
-#define wxStatusBar_new_2 1018
-#define wxStatusBar_destruct 1020
-#define wxStatusBar_Create 1021
-#define wxStatusBar_GetFieldRect 1022
-#define wxStatusBar_GetFieldsCount 1023
-#define wxStatusBar_GetStatusText 1024
-#define wxStatusBar_PopStatusText 1025
-#define wxStatusBar_PushStatusText 1026
-#define wxStatusBar_SetFieldsCount 1027
-#define wxStatusBar_SetMinHeight 1028
-#define wxStatusBar_SetStatusText 1029
-#define wxStatusBar_SetStatusWidths 1030
-#define wxStatusBar_SetStatusStyles 1031
-#define wxBitmap_new_0 1032
-#define wxBitmap_new_3 1033
-#define wxBitmap_new_4 1034
-#define wxBitmap_new_2_0 1035
-#define wxBitmap_new_2_1 1036
-#define wxBitmap_destruct 1037
-#define wxBitmap_ConvertToImage 1038
-#define wxBitmap_CopyFromIcon 1039
-#define wxBitmap_Create 1040
-#define wxBitmap_GetDepth 1041
-#define wxBitmap_GetHeight 1042
-#define wxBitmap_GetPalette 1043
-#define wxBitmap_GetMask 1044
-#define wxBitmap_GetWidth 1045
-#define wxBitmap_GetSubBitmap 1046
-#define wxBitmap_LoadFile 1047
-#define wxBitmap_Ok 1048
-#define wxBitmap_SaveFile 1049
-#define wxBitmap_SetDepth 1050
-#define wxBitmap_SetHeight 1051
-#define wxBitmap_SetMask 1052
-#define wxBitmap_SetPalette 1053
-#define wxBitmap_SetWidth 1054
-#define wxIcon_new_0 1055
-#define wxIcon_new_2 1056
-#define wxIcon_new_1 1057
-#define wxIcon_CopyFromBitmap 1058
-#define wxIcon_destroy 1059
-#define wxIconBundle_new_0 1060
-#define wxIconBundle_new_2 1061
-#define wxIconBundle_new_1_0 1062
-#define wxIconBundle_new_1_1 1063
-#define wxIconBundle_destruct 1064
-#define wxIconBundle_AddIcon_2 1065
-#define wxIconBundle_AddIcon_1 1066
-#define wxIconBundle_GetIcon_1_1 1067
-#define wxIconBundle_GetIcon_1_0 1068
-#define wxCursor_new_0 1069
-#define wxCursor_new_1_0 1070
-#define wxCursor_new_1_1 1071
-#define wxCursor_new_4 1072
-#define wxCursor_destruct 1073
-#define wxCursor_Ok 1074
-#define wxMask_new_0 1075
-#define wxMask_new_2_1 1076
-#define wxMask_new_2_0 1077
-#define wxMask_new_1 1078
-#define wxMask_destruct 1079
-#define wxMask_Create_2_1 1080
-#define wxMask_Create_2_0 1081
-#define wxMask_Create_1 1082
-#define wxImage_new_0 1083
-#define wxImage_new_3_0 1084
-#define wxImage_new_4 1085
-#define wxImage_new_5 1086
-#define wxImage_new_2 1087
-#define wxImage_new_3_1 1088
-#define wxImage_Blur 1089
-#define wxImage_BlurHorizontal 1090
-#define wxImage_BlurVertical 1091
-#define wxImage_ConvertAlphaToMask 1092
-#define wxImage_ConvertToGreyscale 1093
-#define wxImage_ConvertToMono 1094
-#define wxImage_Copy 1095
-#define wxImage_Create_3 1096
-#define wxImage_Create_4 1097
-#define wxImage_Create_5 1098
-#define wxImage_Destroy 1099
-#define wxImage_FindFirstUnusedColour 1100
-#define wxImage_GetImageExtWildcard 1101
-#define wxImage_GetAlpha_2 1102
-#define wxImage_GetAlpha_0 1103
-#define wxImage_GetBlue 1104
-#define wxImage_GetData 1105
-#define wxImage_GetGreen 1106
-#define wxImage_GetImageCount 1107
-#define wxImage_GetHeight 1108
-#define wxImage_GetMaskBlue 1109
-#define wxImage_GetMaskGreen 1110
-#define wxImage_GetMaskRed 1111
-#define wxImage_GetOrFindMaskColour 1112
-#define wxImage_GetPalette 1113
-#define wxImage_GetRed 1114
-#define wxImage_GetSubImage 1115
-#define wxImage_GetWidth 1116
-#define wxImage_HasAlpha 1117
-#define wxImage_HasMask 1118
-#define wxImage_GetOption 1119
-#define wxImage_GetOptionInt 1120
-#define wxImage_HasOption 1121
-#define wxImage_InitAlpha 1122
-#define wxImage_InitStandardHandlers 1123
-#define wxImage_IsTransparent 1124
-#define wxImage_LoadFile_2 1125
-#define wxImage_LoadFile_3 1126
-#define wxImage_Ok 1127
-#define wxImage_RemoveHandler 1128
-#define wxImage_Mirror 1129
-#define wxImage_Replace 1130
-#define wxImage_Rescale 1131
-#define wxImage_Resize 1132
-#define wxImage_Rotate 1133
-#define wxImage_RotateHue 1134
-#define wxImage_Rotate90 1135
-#define wxImage_SaveFile_1 1136
-#define wxImage_SaveFile_2_0 1137
-#define wxImage_SaveFile_2_1 1138
-#define wxImage_Scale 1139
-#define wxImage_Size 1140
-#define wxImage_SetAlpha_3 1141
-#define wxImage_SetAlpha_2 1142
-#define wxImage_SetData_2 1143
-#define wxImage_SetData_4 1144
-#define wxImage_SetMask 1145
-#define wxImage_SetMaskColour 1146
-#define wxImage_SetMaskFromImage 1147
-#define wxImage_SetOption_2_1 1148
-#define wxImage_SetOption_2_0 1149
-#define wxImage_SetPalette 1150
-#define wxImage_SetRGB_5 1151
-#define wxImage_SetRGB_4 1152
-#define wxImage_destroy 1153
-#define wxBrush_new_0 1154
-#define wxBrush_new_2 1155
-#define wxBrush_new_1 1156
-#define wxBrush_destruct 1158
-#define wxBrush_GetColour 1159
-#define wxBrush_GetStipple 1160
-#define wxBrush_GetStyle 1161
-#define wxBrush_IsHatch 1162
-#define wxBrush_IsOk 1163
-#define wxBrush_SetColour_1 1164
-#define wxBrush_SetColour_3 1165
-#define wxBrush_SetStipple 1166
-#define wxBrush_SetStyle 1167
-#define wxPen_new_0 1168
-#define wxPen_new_2 1169
-#define wxPen_destruct 1170
-#define wxPen_GetCap 1171
-#define wxPen_GetColour 1172
-#define wxPen_GetJoin 1173
-#define wxPen_GetStyle 1174
-#define wxPen_GetWidth 1175
-#define wxPen_IsOk 1176
-#define wxPen_SetCap 1177
-#define wxPen_SetColour_1 1178
-#define wxPen_SetColour_3 1179
-#define wxPen_SetJoin 1180
-#define wxPen_SetStyle 1181
-#define wxPen_SetWidth 1182
-#define wxRegion_new_0 1183
-#define wxRegion_new_4 1184
-#define wxRegion_new_2 1185
-#define wxRegion_new_1_1 1186
-#define wxRegion_new_1_0 1188
-#define wxRegion_destruct 1190
-#define wxRegion_Clear 1191
-#define wxRegion_Contains_2 1192
-#define wxRegion_Contains_1_0 1193
-#define wxRegion_Contains_4 1194
-#define wxRegion_Contains_1_1 1195
-#define wxRegion_ConvertToBitmap 1196
-#define wxRegion_GetBox 1197
-#define wxRegion_Intersect_4 1198
-#define wxRegion_Intersect_1_1 1199
-#define wxRegion_Intersect_1_0 1200
-#define wxRegion_IsEmpty 1201
-#define wxRegion_Subtract_4 1202
-#define wxRegion_Subtract_1_1 1203
-#define wxRegion_Subtract_1_0 1204
-#define wxRegion_Offset_2 1205
-#define wxRegion_Offset_1 1206
-#define wxRegion_Union_4 1207
-#define wxRegion_Union_1_2 1208
-#define wxRegion_Union_1_1 1209
-#define wxRegion_Union_1_0 1210
-#define wxRegion_Union_3 1211
-#define wxRegion_Xor_4 1212
-#define wxRegion_Xor_1_1 1213
-#define wxRegion_Xor_1_0 1214
-#define wxAcceleratorTable_new_0 1215
-#define wxAcceleratorTable_new_2 1216
-#define wxAcceleratorTable_destruct 1217
-#define wxAcceleratorTable_Ok 1218
-#define wxAcceleratorEntry_new_1_0 1219
-#define wxAcceleratorEntry_new_1_1 1220
-#define wxAcceleratorEntry_GetCommand 1221
-#define wxAcceleratorEntry_GetFlags 1222
-#define wxAcceleratorEntry_GetKeyCode 1223
-#define wxAcceleratorEntry_Set 1224
-#define wxAcceleratorEntry_destroy 1225
-#define wxCaret_new_3 1230
-#define wxCaret_new_2 1231
-#define wxCaret_destruct 1233
-#define wxCaret_Create_3 1234
-#define wxCaret_Create_2 1235
-#define wxCaret_GetBlinkTime 1236
-#define wxCaret_GetPosition 1238
-#define wxCaret_GetSize 1240
-#define wxCaret_GetWindow 1241
-#define wxCaret_Hide 1242
-#define wxCaret_IsOk 1243
-#define wxCaret_IsVisible 1244
-#define wxCaret_Move_2 1245
-#define wxCaret_Move_1 1246
-#define wxCaret_SetBlinkTime 1247
-#define wxCaret_SetSize_2 1248
-#define wxCaret_SetSize_1 1249
-#define wxCaret_Show 1250
-#define wxSizer_Add_2_1 1251
-#define wxSizer_Add_2_0 1252
-#define wxSizer_Add_3 1253
-#define wxSizer_Add_2_3 1254
-#define wxSizer_Add_2_2 1255
-#define wxSizer_AddSpacer 1256
-#define wxSizer_AddStretchSpacer 1257
-#define wxSizer_CalcMin 1258
-#define wxSizer_Clear 1259
-#define wxSizer_Detach_1_2 1260
-#define wxSizer_Detach_1_1 1261
-#define wxSizer_Detach_1_0 1262
-#define wxSizer_Fit 1263
-#define wxSizer_FitInside 1264
-#define wxSizer_GetChildren 1265
-#define wxSizer_GetItem_2_1 1266
-#define wxSizer_GetItem_2_0 1267
-#define wxSizer_GetItem_1 1268
-#define wxSizer_GetSize 1269
-#define wxSizer_GetPosition 1270
-#define wxSizer_GetMinSize 1271
-#define wxSizer_Hide_2_0 1272
-#define wxSizer_Hide_2_1 1273
-#define wxSizer_Hide_1 1274
-#define wxSizer_Insert_3_1 1275
-#define wxSizer_Insert_3_0 1276
-#define wxSizer_Insert_4 1277
-#define wxSizer_Insert_3_3 1278
-#define wxSizer_Insert_3_2 1279
-#define wxSizer_Insert_2 1280
-#define wxSizer_InsertSpacer 1281
-#define wxSizer_InsertStretchSpacer 1282
-#define wxSizer_IsShown_1_2 1283
-#define wxSizer_IsShown_1_1 1284
-#define wxSizer_IsShown_1_0 1285
-#define wxSizer_Layout 1286
-#define wxSizer_Prepend_2_1 1287
-#define wxSizer_Prepend_2_0 1288
-#define wxSizer_Prepend_3 1289
-#define wxSizer_Prepend_2_3 1290
-#define wxSizer_Prepend_2_2 1291
-#define wxSizer_Prepend_1 1292
-#define wxSizer_PrependSpacer 1293
-#define wxSizer_PrependStretchSpacer 1294
-#define wxSizer_RecalcSizes 1295
-#define wxSizer_Remove_1_1 1296
-#define wxSizer_Remove_1_0 1297
-#define wxSizer_Replace_3_1 1298
-#define wxSizer_Replace_3_0 1299
-#define wxSizer_Replace_2 1300
-#define wxSizer_SetDimension 1301
-#define wxSizer_SetMinSize_2 1302
-#define wxSizer_SetMinSize_1 1303
-#define wxSizer_SetItemMinSize_3_2 1304
-#define wxSizer_SetItemMinSize_2_2 1305
-#define wxSizer_SetItemMinSize_3_1 1306
-#define wxSizer_SetItemMinSize_2_1 1307
-#define wxSizer_SetItemMinSize_3_0 1308
-#define wxSizer_SetItemMinSize_2_0 1309
-#define wxSizer_SetSizeHints 1310
-#define wxSizer_SetVirtualSizeHints 1311
-#define wxSizer_Show_2_2 1312
-#define wxSizer_Show_2_1 1313
-#define wxSizer_Show_2_0 1314
-#define wxSizer_Show_1 1315
-#define wxSizerFlags_new 1316
-#define wxSizerFlags_Align 1317
-#define wxSizerFlags_Border_2 1318
-#define wxSizerFlags_Border_1 1319
-#define wxSizerFlags_Center 1320
-#define wxSizerFlags_Centre 1321
-#define wxSizerFlags_Expand 1322
-#define wxSizerFlags_Left 1323
-#define wxSizerFlags_Proportion 1324
-#define wxSizerFlags_Right 1325
-#define wxSizerFlags_destroy 1326
-#define wxSizerItem_new_5_1 1327
-#define wxSizerItem_new_2_1 1328
-#define wxSizerItem_new_5_0 1329
-#define wxSizerItem_new_2_0 1330
-#define wxSizerItem_new_6 1331
-#define wxSizerItem_new_3 1332
-#define wxSizerItem_new_0 1333
-#define wxSizerItem_destruct 1334
-#define wxSizerItem_CalcMin 1335
-#define wxSizerItem_DeleteWindows 1336
-#define wxSizerItem_DetachSizer 1337
-#define wxSizerItem_GetBorder 1338
-#define wxSizerItem_GetFlag 1339
-#define wxSizerItem_GetMinSize 1340
-#define wxSizerItem_GetPosition 1341
-#define wxSizerItem_GetProportion 1342
-#define wxSizerItem_GetRatio 1343
-#define wxSizerItem_GetRect 1344
-#define wxSizerItem_GetSize 1345
-#define wxSizerItem_GetSizer 1346
-#define wxSizerItem_GetSpacer 1347
-#define wxSizerItem_GetUserData 1348
-#define wxSizerItem_GetWindow 1349
-#define wxSizerItem_IsSizer 1350
-#define wxSizerItem_IsShown 1351
-#define wxSizerItem_IsSpacer 1352
-#define wxSizerItem_IsWindow 1353
-#define wxSizerItem_SetBorder 1354
-#define wxSizerItem_SetDimension 1355
-#define wxSizerItem_SetFlag 1356
-#define wxSizerItem_SetInitSize 1357
-#define wxSizerItem_SetMinSize_1 1358
-#define wxSizerItem_SetMinSize_2 1359
-#define wxSizerItem_SetProportion 1360
-#define wxSizerItem_SetRatio_2 1361
-#define wxSizerItem_SetRatio_1_1 1362
-#define wxSizerItem_SetRatio_1_0 1363
-#define wxSizerItem_SetSizer 1364
-#define wxSizerItem_SetSpacer_1 1365
-#define wxSizerItem_SetSpacer_2 1366
-#define wxSizerItem_SetWindow 1367
-#define wxSizerItem_Show 1368
-#define wxBoxSizer_new 1369
-#define wxBoxSizer_GetOrientation 1370
-#define wxBoxSizer_destroy 1371
-#define wxStaticBoxSizer_new_2 1372
-#define wxStaticBoxSizer_new_3 1373
-#define wxStaticBoxSizer_GetStaticBox 1374
-#define wxStaticBoxSizer_destroy 1375
-#define wxGridSizer_new_4 1376
-#define wxGridSizer_new_2 1377
-#define wxGridSizer_GetCols 1378
-#define wxGridSizer_GetHGap 1379
-#define wxGridSizer_GetRows 1380
-#define wxGridSizer_GetVGap 1381
-#define wxGridSizer_SetCols 1382
-#define wxGridSizer_SetHGap 1383
-#define wxGridSizer_SetRows 1384
-#define wxGridSizer_SetVGap 1385
-#define wxGridSizer_destroy 1386
-#define wxFlexGridSizer_new_4 1387
-#define wxFlexGridSizer_new_2 1388
-#define wxFlexGridSizer_AddGrowableCol 1389
-#define wxFlexGridSizer_AddGrowableRow 1390
-#define wxFlexGridSizer_GetFlexibleDirection 1391
-#define wxFlexGridSizer_GetNonFlexibleGrowMode 1392
-#define wxFlexGridSizer_RemoveGrowableCol 1393
-#define wxFlexGridSizer_RemoveGrowableRow 1394
-#define wxFlexGridSizer_SetFlexibleDirection 1395
-#define wxFlexGridSizer_SetNonFlexibleGrowMode 1396
-#define wxFlexGridSizer_destroy 1397
-#define wxGridBagSizer_new 1398
-#define wxGridBagSizer_Add_3_2 1399
-#define wxGridBagSizer_Add_3_1 1400
-#define wxGridBagSizer_Add_4 1401
-#define wxGridBagSizer_Add_1_0 1402
-#define wxGridBagSizer_Add_2_1 1403
-#define wxGridBagSizer_Add_2_0 1404
-#define wxGridBagSizer_Add_3_0 1405
-#define wxGridBagSizer_Add_1_1 1406
-#define wxGridBagSizer_CalcMin 1407
-#define wxGridBagSizer_CheckForIntersection_2 1408
-#define wxGridBagSizer_CheckForIntersection_3 1409
-#define wxGridBagSizer_FindItem_1_1 1410
-#define wxGridBagSizer_FindItem_1_0 1411
-#define wxGridBagSizer_FindItemAtPoint 1412
-#define wxGridBagSizer_FindItemAtPosition 1413
-#define wxGridBagSizer_FindItemWithData 1414
-#define wxGridBagSizer_GetCellSize 1415
-#define wxGridBagSizer_GetEmptyCellSize 1416
-#define wxGridBagSizer_GetItemPosition_1_2 1417
-#define wxGridBagSizer_GetItemPosition_1_1 1418
-#define wxGridBagSizer_GetItemPosition_1_0 1419
-#define wxGridBagSizer_GetItemSpan_1_2 1420
-#define wxGridBagSizer_GetItemSpan_1_1 1421
-#define wxGridBagSizer_GetItemSpan_1_0 1422
-#define wxGridBagSizer_SetEmptyCellSize 1423
-#define wxGridBagSizer_SetItemPosition_2_2 1424
-#define wxGridBagSizer_SetItemPosition_2_1 1425
-#define wxGridBagSizer_SetItemPosition_2_0 1426
-#define wxGridBagSizer_SetItemSpan_2_2 1427
-#define wxGridBagSizer_SetItemSpan_2_1 1428
-#define wxGridBagSizer_SetItemSpan_2_0 1429
-#define wxGridBagSizer_destroy 1430
-#define wxStdDialogButtonSizer_new 1431
-#define wxStdDialogButtonSizer_AddButton 1432
-#define wxStdDialogButtonSizer_Realize 1433
-#define wxStdDialogButtonSizer_SetAffirmativeButton 1434
-#define wxStdDialogButtonSizer_SetCancelButton 1435
-#define wxStdDialogButtonSizer_SetNegativeButton 1436
-#define wxStdDialogButtonSizer_destroy 1437
-#define wxFont_new_0 1438
-#define wxFont_new_1 1439
-#define wxFont_new_5 1440
-#define wxFont_destruct 1442
-#define wxFont_IsFixedWidth 1443
-#define wxFont_GetDefaultEncoding 1444
-#define wxFont_GetFaceName 1445
-#define wxFont_GetFamily 1446
-#define wxFont_GetNativeFontInfoDesc 1447
-#define wxFont_GetNativeFontInfoUserDesc 1448
-#define wxFont_GetPointSize 1449
-#define wxFont_GetStyle 1450
-#define wxFont_GetUnderlined 1451
-#define wxFont_GetWeight 1452
-#define wxFont_Ok 1453
-#define wxFont_SetDefaultEncoding 1454
-#define wxFont_SetFaceName 1455
-#define wxFont_SetFamily 1456
-#define wxFont_SetPointSize 1457
-#define wxFont_SetStyle 1458
-#define wxFont_SetUnderlined 1459
-#define wxFont_SetWeight 1460
-#define wxToolTip_Enable 1461
-#define wxToolTip_SetDelay 1462
-#define wxToolTip_new 1463
-#define wxToolTip_SetTip 1464
-#define wxToolTip_GetTip 1465
-#define wxToolTip_GetWindow 1466
-#define wxToolTip_destroy 1467
-#define wxButton_new_3 1469
-#define wxButton_new_0 1470
-#define wxButton_destruct 1471
-#define wxButton_Create 1472
-#define wxButton_GetDefaultSize 1473
-#define wxButton_SetDefault 1474
-#define wxButton_SetLabel 1475
-#define wxBitmapButton_new_4 1477
-#define wxBitmapButton_new_0 1478
-#define wxBitmapButton_Create 1479
-#define wxBitmapButton_GetBitmapDisabled 1480
-#define wxBitmapButton_GetBitmapFocus 1482
-#define wxBitmapButton_GetBitmapLabel 1484
-#define wxBitmapButton_GetBitmapSelected 1486
-#define wxBitmapButton_SetBitmapDisabled 1488
-#define wxBitmapButton_SetBitmapFocus 1489
-#define wxBitmapButton_SetBitmapLabel 1490
-#define wxBitmapButton_SetBitmapSelected 1491
-#define wxBitmapButton_destroy 1492
-#define wxToggleButton_new_0 1493
-#define wxToggleButton_new_4 1494
-#define wxToggleButton_Create 1495
-#define wxToggleButton_GetValue 1496
-#define wxToggleButton_SetValue 1497
-#define wxToggleButton_destroy 1498
-#define wxCalendarCtrl_new_0 1499
-#define wxCalendarCtrl_new_3 1500
-#define wxCalendarCtrl_Create 1501
-#define wxCalendarCtrl_destruct 1502
-#define wxCalendarCtrl_SetDate 1503
-#define wxCalendarCtrl_GetDate 1504
-#define wxCalendarCtrl_EnableYearChange 1505
-#define wxCalendarCtrl_EnableMonthChange 1506
-#define wxCalendarCtrl_EnableHolidayDisplay 1507
-#define wxCalendarCtrl_SetHeaderColours 1508
-#define wxCalendarCtrl_GetHeaderColourFg 1509
-#define wxCalendarCtrl_GetHeaderColourBg 1510
-#define wxCalendarCtrl_SetHighlightColours 1511
-#define wxCalendarCtrl_GetHighlightColourFg 1512
-#define wxCalendarCtrl_GetHighlightColourBg 1513
-#define wxCalendarCtrl_SetHolidayColours 1514
-#define wxCalendarCtrl_GetHolidayColourFg 1515
-#define wxCalendarCtrl_GetHolidayColourBg 1516
-#define wxCalendarCtrl_GetAttr 1517
-#define wxCalendarCtrl_SetAttr 1518
-#define wxCalendarCtrl_SetHoliday 1519
-#define wxCalendarCtrl_ResetAttr 1520
-#define wxCalendarCtrl_HitTest 1521
-#define wxCalendarDateAttr_new_0 1522
-#define wxCalendarDateAttr_new_2_1 1523
-#define wxCalendarDateAttr_new_2_0 1524
-#define wxCalendarDateAttr_SetTextColour 1525
-#define wxCalendarDateAttr_SetBackgroundColour 1526
-#define wxCalendarDateAttr_SetBorderColour 1527
-#define wxCalendarDateAttr_SetFont 1528
-#define wxCalendarDateAttr_SetBorder 1529
-#define wxCalendarDateAttr_SetHoliday 1530
-#define wxCalendarDateAttr_HasTextColour 1531
-#define wxCalendarDateAttr_HasBackgroundColour 1532
-#define wxCalendarDateAttr_HasBorderColour 1533
-#define wxCalendarDateAttr_HasFont 1534
-#define wxCalendarDateAttr_HasBorder 1535
-#define wxCalendarDateAttr_IsHoliday 1536
-#define wxCalendarDateAttr_GetTextColour 1537
-#define wxCalendarDateAttr_GetBackgroundColour 1538
-#define wxCalendarDateAttr_GetBorderColour 1539
-#define wxCalendarDateAttr_GetFont 1540
-#define wxCalendarDateAttr_GetBorder 1541
-#define wxCalendarDateAttr_destroy 1542
-#define wxCheckBox_new_4 1544
-#define wxCheckBox_new_0 1545
-#define wxCheckBox_Create 1546
-#define wxCheckBox_GetValue 1547
-#define wxCheckBox_Get3StateValue 1548
-#define wxCheckBox_Is3rdStateAllowedForUser 1549
-#define wxCheckBox_Is3State 1550
-#define wxCheckBox_IsChecked 1551
-#define wxCheckBox_SetValue 1552
-#define wxCheckBox_Set3StateValue 1553
-#define wxCheckBox_destroy 1554
-#define wxCheckListBox_new_0 1555
-#define wxCheckListBox_new_3 1557
-#define wxCheckListBox_Check 1558
-#define wxCheckListBox_IsChecked 1559
-#define wxCheckListBox_destroy 1560
-#define wxChoice_new_3 1563
-#define wxChoice_new_0 1564
-#define wxChoice_destruct 1566
-#define wxChoice_Create 1568
-#define wxChoice_Delete 1569
-#define wxChoice_GetColumns 1570
-#define wxChoice_SetColumns 1571
-#define wxComboBox_new_0 1572
-#define wxComboBox_new_3 1574
-#define wxComboBox_destruct 1575
-#define wxComboBox_Create 1577
-#define wxComboBox_CanCopy 1578
-#define wxComboBox_CanCut 1579
-#define wxComboBox_CanPaste 1580
-#define wxComboBox_CanRedo 1581
-#define wxComboBox_CanUndo 1582
-#define wxComboBox_Copy 1583
-#define wxComboBox_Cut 1584
-#define wxComboBox_GetInsertionPoint 1585
-#define wxComboBox_GetLastPosition 1586
-#define wxComboBox_GetValue 1587
-#define wxComboBox_Paste 1588
-#define wxComboBox_Redo 1589
-#define wxComboBox_Replace 1590
-#define wxComboBox_Remove 1591
-#define wxComboBox_SetInsertionPoint 1592
-#define wxComboBox_SetInsertionPointEnd 1593
-#define wxComboBox_SetSelection_1 1594
-#define wxComboBox_SetSelection_2 1595
-#define wxComboBox_SetValue 1596
-#define wxComboBox_Undo 1597
-#define wxGauge_new_0 1598
-#define wxGauge_new_4 1599
-#define wxGauge_Create 1600
-#define wxGauge_GetBezelFace 1601
-#define wxGauge_GetRange 1602
-#define wxGauge_GetShadowWidth 1603
-#define wxGauge_GetValue 1604
-#define wxGauge_IsVertical 1605
-#define wxGauge_SetBezelFace 1606
-#define wxGauge_SetRange 1607
-#define wxGauge_SetShadowWidth 1608
-#define wxGauge_SetValue 1609
-#define wxGauge_Pulse 1610
-#define wxGauge_destroy 1611
-#define wxGenericDirCtrl_new_0 1612
-#define wxGenericDirCtrl_new_2 1613
-#define wxGenericDirCtrl_destruct 1614
-#define wxGenericDirCtrl_Create 1615
-#define wxGenericDirCtrl_Init 1616
-#define wxGenericDirCtrl_CollapseTree 1617
-#define wxGenericDirCtrl_ExpandPath 1618
-#define wxGenericDirCtrl_GetDefaultPath 1619
-#define wxGenericDirCtrl_GetPath 1620
-#define wxGenericDirCtrl_GetFilePath 1621
-#define wxGenericDirCtrl_GetFilter 1622
-#define wxGenericDirCtrl_GetFilterIndex 1623
-#define wxGenericDirCtrl_GetRootId 1624
-#define wxGenericDirCtrl_GetTreeCtrl 1625
-#define wxGenericDirCtrl_ReCreateTree 1626
-#define wxGenericDirCtrl_SetDefaultPath 1627
-#define wxGenericDirCtrl_SetFilter 1628
-#define wxGenericDirCtrl_SetFilterIndex 1629
-#define wxGenericDirCtrl_SetPath 1630
-#define wxStaticBox_new_4 1632
-#define wxStaticBox_new_0 1633
-#define wxStaticBox_Create 1634
-#define wxStaticBox_destroy 1635
-#define wxStaticLine_new_2 1637
-#define wxStaticLine_new_0 1638
-#define wxStaticLine_Create 1639
-#define wxStaticLine_IsVertical 1640
-#define wxStaticLine_GetDefaultSize 1641
-#define wxStaticLine_destroy 1642
-#define wxListBox_new_3 1645
-#define wxListBox_new_0 1646
-#define wxListBox_destruct 1648
-#define wxListBox_Create 1650
-#define wxListBox_Deselect 1651
-#define wxListBox_GetSelections 1652
-#define wxListBox_InsertItems 1653
-#define wxListBox_IsSelected 1654
-#define wxListBox_Set 1655
-#define wxListBox_HitTest 1656
-#define wxListBox_SetFirstItem_1_0 1657
-#define wxListBox_SetFirstItem_1_1 1658
-#define wxListCtrl_new_0 1659
-#define wxListCtrl_new_2 1660
-#define wxListCtrl_Arrange 1661
-#define wxListCtrl_AssignImageList 1662
-#define wxListCtrl_ClearAll 1663
-#define wxListCtrl_Create 1664
-#define wxListCtrl_DeleteAllItems 1665
-#define wxListCtrl_DeleteColumn 1666
-#define wxListCtrl_DeleteItem 1667
-#define wxListCtrl_EditLabel 1668
-#define wxListCtrl_EnsureVisible 1669
-#define wxListCtrl_FindItem_3_0 1670
-#define wxListCtrl_FindItem_3_1 1671
-#define wxListCtrl_GetColumn 1672
-#define wxListCtrl_GetColumnCount 1673
-#define wxListCtrl_GetColumnWidth 1674
-#define wxListCtrl_GetCountPerPage 1675
-#define wxListCtrl_GetEditControl 1676
-#define wxListCtrl_GetImageList 1677
-#define wxListCtrl_GetItem 1678
-#define wxListCtrl_GetItemBackgroundColour 1679
-#define wxListCtrl_GetItemCount 1680
-#define wxListCtrl_GetItemData 1681
-#define wxListCtrl_GetItemFont 1682
-#define wxListCtrl_GetItemPosition 1683
-#define wxListCtrl_GetItemRect 1684
-#define wxListCtrl_GetItemSpacing 1685
-#define wxListCtrl_GetItemState 1686
-#define wxListCtrl_GetItemText 1687
-#define wxListCtrl_GetItemTextColour 1688
-#define wxListCtrl_GetNextItem 1689
-#define wxListCtrl_GetSelectedItemCount 1690
-#define wxListCtrl_GetTextColour 1691
-#define wxListCtrl_GetTopItem 1692
-#define wxListCtrl_GetViewRect 1693
-#define wxListCtrl_HitTest 1694
-#define wxListCtrl_InsertColumn_2 1695
-#define wxListCtrl_InsertColumn_3 1696
-#define wxListCtrl_InsertItem_1 1697
-#define wxListCtrl_InsertItem_2_1 1698
-#define wxListCtrl_InsertItem_2_0 1699
-#define wxListCtrl_InsertItem_3 1700
-#define wxListCtrl_RefreshItem 1701
-#define wxListCtrl_RefreshItems 1702
-#define wxListCtrl_ScrollList 1703
-#define wxListCtrl_SetBackgroundColour 1704
-#define wxListCtrl_SetColumn 1705
-#define wxListCtrl_SetColumnWidth 1706
-#define wxListCtrl_SetImageList 1707
-#define wxListCtrl_SetItem_1 1708
-#define wxListCtrl_SetItem_4 1709
-#define wxListCtrl_SetItemBackgroundColour 1710
-#define wxListCtrl_SetItemCount 1711
-#define wxListCtrl_SetItemData 1712
-#define wxListCtrl_SetItemFont 1713
-#define wxListCtrl_SetItemImage 1714
-#define wxListCtrl_SetItemColumnImage 1715
-#define wxListCtrl_SetItemPosition 1716
-#define wxListCtrl_SetItemState 1717
-#define wxListCtrl_SetItemText 1718
-#define wxListCtrl_SetItemTextColour 1719
-#define wxListCtrl_SetSingleStyle 1720
-#define wxListCtrl_SetTextColour 1721
-#define wxListCtrl_SetWindowStyleFlag 1722
-#define wxListCtrl_SortItems 1723
-#define wxListCtrl_destroy 1724
-#define wxListView_ClearColumnImage 1725
-#define wxListView_Focus 1726
-#define wxListView_GetFirstSelected 1727
-#define wxListView_GetFocusedItem 1728
-#define wxListView_GetNextSelected 1729
-#define wxListView_IsSelected 1730
-#define wxListView_Select 1731
-#define wxListView_SetColumnImage 1732
-#define wxListItem_new_0 1733
-#define wxListItem_new_1 1734
-#define wxListItem_destruct 1735
-#define wxListItem_Clear 1736
-#define wxListItem_GetAlign 1737
-#define wxListItem_GetBackgroundColour 1738
-#define wxListItem_GetColumn 1739
-#define wxListItem_GetFont 1740
-#define wxListItem_GetId 1741
-#define wxListItem_GetImage 1742
-#define wxListItem_GetMask 1743
-#define wxListItem_GetState 1744
-#define wxListItem_GetText 1745
-#define wxListItem_GetTextColour 1746
-#define wxListItem_GetWidth 1747
-#define wxListItem_SetAlign 1748
-#define wxListItem_SetBackgroundColour 1749
-#define wxListItem_SetColumn 1750
-#define wxListItem_SetFont 1751
-#define wxListItem_SetId 1752
-#define wxListItem_SetImage 1753
-#define wxListItem_SetMask 1754
-#define wxListItem_SetState 1755
-#define wxListItem_SetStateMask 1756
-#define wxListItem_SetText 1757
-#define wxListItem_SetTextColour 1758
-#define wxListItem_SetWidth 1759
-#define wxListItemAttr_new_0 1760
-#define wxListItemAttr_new_3 1761
-#define wxListItemAttr_GetBackgroundColour 1762
-#define wxListItemAttr_GetFont 1763
-#define wxListItemAttr_GetTextColour 1764
-#define wxListItemAttr_HasBackgroundColour 1765
-#define wxListItemAttr_HasFont 1766
-#define wxListItemAttr_HasTextColour 1767
-#define wxListItemAttr_SetBackgroundColour 1768
-#define wxListItemAttr_SetFont 1769
-#define wxListItemAttr_SetTextColour 1770
-#define wxListItemAttr_destroy 1771
-#define wxImageList_new_0 1772
-#define wxImageList_new_3 1773
-#define wxImageList_Add_1 1774
-#define wxImageList_Add_2_0 1775
-#define wxImageList_Add_2_1 1776
-#define wxImageList_Create 1777
-#define wxImageList_Draw 1779
-#define wxImageList_GetBitmap 1780
-#define wxImageList_GetIcon 1781
-#define wxImageList_GetImageCount 1782
-#define wxImageList_GetSize 1783
-#define wxImageList_Remove 1784
-#define wxImageList_RemoveAll 1785
-#define wxImageList_Replace_2 1786
-#define wxImageList_Replace_3 1787
-#define wxImageList_destroy 1788
-#define wxTextAttr_new_0 1789
-#define wxTextAttr_new_2 1790
-#define wxTextAttr_GetAlignment 1791
-#define wxTextAttr_GetBackgroundColour 1792
-#define wxTextAttr_GetFont 1793
-#define wxTextAttr_GetLeftIndent 1794
-#define wxTextAttr_GetLeftSubIndent 1795
-#define wxTextAttr_GetRightIndent 1796
-#define wxTextAttr_GetTabs 1797
-#define wxTextAttr_GetTextColour 1798
-#define wxTextAttr_HasBackgroundColour 1799
-#define wxTextAttr_HasFont 1800
-#define wxTextAttr_HasTextColour 1801
-#define wxTextAttr_GetFlags 1802
-#define wxTextAttr_IsDefault 1803
-#define wxTextAttr_SetAlignment 1804
-#define wxTextAttr_SetBackgroundColour 1805
-#define wxTextAttr_SetFlags 1806
-#define wxTextAttr_SetFont 1807
-#define wxTextAttr_SetLeftIndent 1808
-#define wxTextAttr_SetRightIndent 1809
-#define wxTextAttr_SetTabs 1810
-#define wxTextAttr_SetTextColour 1811
-#define wxTextAttr_destroy 1812
-#define wxTextCtrl_new_3 1814
-#define wxTextCtrl_new_0 1815
-#define wxTextCtrl_destruct 1817
-#define wxTextCtrl_AppendText 1818
-#define wxTextCtrl_CanCopy 1819
-#define wxTextCtrl_CanCut 1820
-#define wxTextCtrl_CanPaste 1821
-#define wxTextCtrl_CanRedo 1822
-#define wxTextCtrl_CanUndo 1823
-#define wxTextCtrl_Clear 1824
-#define wxTextCtrl_Copy 1825
-#define wxTextCtrl_Create 1826
-#define wxTextCtrl_Cut 1827
-#define wxTextCtrl_DiscardEdits 1828
-#define wxTextCtrl_ChangeValue 1829
-#define wxTextCtrl_EmulateKeyPress 1830
-#define wxTextCtrl_GetDefaultStyle 1831
-#define wxTextCtrl_GetInsertionPoint 1832
-#define wxTextCtrl_GetLastPosition 1833
-#define wxTextCtrl_GetLineLength 1834
-#define wxTextCtrl_GetLineText 1835
-#define wxTextCtrl_GetNumberOfLines 1836
-#define wxTextCtrl_GetRange 1837
-#define wxTextCtrl_GetSelection 1838
-#define wxTextCtrl_GetStringSelection 1839
-#define wxTextCtrl_GetStyle 1840
-#define wxTextCtrl_GetValue 1841
-#define wxTextCtrl_IsEditable 1842
-#define wxTextCtrl_IsModified 1843
-#define wxTextCtrl_IsMultiLine 1844
-#define wxTextCtrl_IsSingleLine 1845
-#define wxTextCtrl_LoadFile 1846
-#define wxTextCtrl_MarkDirty 1847
-#define wxTextCtrl_Paste 1848
-#define wxTextCtrl_PositionToXY 1849
-#define wxTextCtrl_Redo 1850
-#define wxTextCtrl_Remove 1851
-#define wxTextCtrl_Replace 1852
-#define wxTextCtrl_SaveFile 1853
-#define wxTextCtrl_SetDefaultStyle 1854
-#define wxTextCtrl_SetEditable 1855
-#define wxTextCtrl_SetInsertionPoint 1856
-#define wxTextCtrl_SetInsertionPointEnd 1857
-#define wxTextCtrl_SetMaxLength 1859
-#define wxTextCtrl_SetSelection 1860
-#define wxTextCtrl_SetStyle 1861
-#define wxTextCtrl_SetValue 1862
-#define wxTextCtrl_ShowPosition 1863
-#define wxTextCtrl_Undo 1864
-#define wxTextCtrl_WriteText 1865
-#define wxTextCtrl_XYToPosition 1866
-#define wxNotebook_new_0 1869
-#define wxNotebook_new_3 1870
-#define wxNotebook_destruct 1871
-#define wxNotebook_AddPage 1872
-#define wxNotebook_AdvanceSelection 1873
-#define wxNotebook_AssignImageList 1874
-#define wxNotebook_Create 1875
-#define wxNotebook_DeleteAllPages 1876
-#define wxNotebook_DeletePage 1877
-#define wxNotebook_RemovePage 1878
-#define wxNotebook_GetCurrentPage 1879
-#define wxNotebook_GetImageList 1880
-#define wxNotebook_GetPage 1882
-#define wxNotebook_GetPageCount 1883
-#define wxNotebook_GetPageImage 1884
-#define wxNotebook_GetPageText 1885
-#define wxNotebook_GetRowCount 1886
-#define wxNotebook_GetSelection 1887
-#define wxNotebook_GetThemeBackgroundColour 1888
-#define wxNotebook_HitTest 1890
-#define wxNotebook_InsertPage 1892
-#define wxNotebook_SetImageList 1893
-#define wxNotebook_SetPadding 1894
-#define wxNotebook_SetPageSize 1895
-#define wxNotebook_SetPageImage 1896
-#define wxNotebook_SetPageText 1897
-#define wxNotebook_SetSelection 1898
-#define wxNotebook_ChangeSelection 1899
-#define wxChoicebook_new_0 1900
-#define wxChoicebook_new_3 1901
-#define wxChoicebook_AddPage 1902
-#define wxChoicebook_AdvanceSelection 1903
-#define wxChoicebook_AssignImageList 1904
-#define wxChoicebook_Create 1905
-#define wxChoicebook_DeleteAllPages 1906
-#define wxChoicebook_DeletePage 1907
-#define wxChoicebook_RemovePage 1908
-#define wxChoicebook_GetCurrentPage 1909
-#define wxChoicebook_GetImageList 1910
-#define wxChoicebook_GetPage 1912
-#define wxChoicebook_GetPageCount 1913
-#define wxChoicebook_GetPageImage 1914
-#define wxChoicebook_GetPageText 1915
-#define wxChoicebook_GetSelection 1916
-#define wxChoicebook_HitTest 1917
-#define wxChoicebook_InsertPage 1918
-#define wxChoicebook_SetImageList 1919
-#define wxChoicebook_SetPageSize 1920
-#define wxChoicebook_SetPageImage 1921
-#define wxChoicebook_SetPageText 1922
-#define wxChoicebook_SetSelection 1923
-#define wxChoicebook_ChangeSelection 1924
-#define wxChoicebook_destroy 1925
-#define wxToolbook_new_0 1926
-#define wxToolbook_new_3 1927
-#define wxToolbook_AddPage 1928
-#define wxToolbook_AdvanceSelection 1929
-#define wxToolbook_AssignImageList 1930
-#define wxToolbook_Create 1931
-#define wxToolbook_DeleteAllPages 1932
-#define wxToolbook_DeletePage 1933
-#define wxToolbook_RemovePage 1934
-#define wxToolbook_GetCurrentPage 1935
-#define wxToolbook_GetImageList 1936
-#define wxToolbook_GetPage 1938
-#define wxToolbook_GetPageCount 1939
-#define wxToolbook_GetPageImage 1940
-#define wxToolbook_GetPageText 1941
-#define wxToolbook_GetSelection 1942
-#define wxToolbook_HitTest 1944
-#define wxToolbook_InsertPage 1945
-#define wxToolbook_SetImageList 1946
-#define wxToolbook_SetPageSize 1947
-#define wxToolbook_SetPageImage 1948
-#define wxToolbook_SetPageText 1949
-#define wxToolbook_SetSelection 1950
-#define wxToolbook_ChangeSelection 1951
-#define wxToolbook_destroy 1952
-#define wxListbook_new_0 1953
-#define wxListbook_new_3 1954
-#define wxListbook_AddPage 1955
-#define wxListbook_AdvanceSelection 1956
-#define wxListbook_AssignImageList 1957
-#define wxListbook_Create 1958
-#define wxListbook_DeleteAllPages 1959
-#define wxListbook_DeletePage 1960
-#define wxListbook_RemovePage 1961
-#define wxListbook_GetCurrentPage 1962
-#define wxListbook_GetImageList 1963
-#define wxListbook_GetPage 1965
-#define wxListbook_GetPageCount 1966
-#define wxListbook_GetPageImage 1967
-#define wxListbook_GetPageText 1968
-#define wxListbook_GetSelection 1969
-#define wxListbook_HitTest 1971
-#define wxListbook_InsertPage 1972
-#define wxListbook_SetImageList 1973
-#define wxListbook_SetPageSize 1974
-#define wxListbook_SetPageImage 1975
-#define wxListbook_SetPageText 1976
-#define wxListbook_SetSelection 1977
-#define wxListbook_ChangeSelection 1978
-#define wxListbook_destroy 1979
-#define wxTreebook_new_0 1980
-#define wxTreebook_new_3 1981
-#define wxTreebook_AddPage 1982
-#define wxTreebook_AdvanceSelection 1983
-#define wxTreebook_AssignImageList 1984
-#define wxTreebook_Create 1985
-#define wxTreebook_DeleteAllPages 1986
-#define wxTreebook_DeletePage 1987
-#define wxTreebook_RemovePage 1988
-#define wxTreebook_GetCurrentPage 1989
-#define wxTreebook_GetImageList 1990
-#define wxTreebook_GetPage 1992
-#define wxTreebook_GetPageCount 1993
-#define wxTreebook_GetPageImage 1994
-#define wxTreebook_GetPageText 1995
-#define wxTreebook_GetSelection 1996
-#define wxTreebook_ExpandNode 1997
-#define wxTreebook_IsNodeExpanded 1998
-#define wxTreebook_HitTest 2000
-#define wxTreebook_InsertPage 2001
-#define wxTreebook_InsertSubPage 2002
-#define wxTreebook_SetImageList 2003
-#define wxTreebook_SetPageSize 2004
-#define wxTreebook_SetPageImage 2005
-#define wxTreebook_SetPageText 2006
-#define wxTreebook_SetSelection 2007
-#define wxTreebook_ChangeSelection 2008
-#define wxTreebook_destroy 2009
-#define wxTreeCtrl_new_2 2012
-#define wxTreeCtrl_new_0 2013
-#define wxTreeCtrl_destruct 2015
-#define wxTreeCtrl_AddRoot 2016
-#define wxTreeCtrl_AppendItem 2017
-#define wxTreeCtrl_AssignImageList 2018
-#define wxTreeCtrl_AssignStateImageList 2019
-#define wxTreeCtrl_Collapse 2020
-#define wxTreeCtrl_CollapseAndReset 2021
-#define wxTreeCtrl_Create 2022
-#define wxTreeCtrl_Delete 2023
-#define wxTreeCtrl_DeleteAllItems 2024
-#define wxTreeCtrl_DeleteChildren 2025
-#define wxTreeCtrl_EditLabel 2026
-#define wxTreeCtrl_EnsureVisible 2027
-#define wxTreeCtrl_Expand 2028
-#define wxTreeCtrl_GetBoundingRect 2029
-#define wxTreeCtrl_GetChildrenCount 2031
-#define wxTreeCtrl_GetCount 2032
-#define wxTreeCtrl_GetEditControl 2033
-#define wxTreeCtrl_GetFirstChild 2034
-#define wxTreeCtrl_GetNextChild 2035
-#define wxTreeCtrl_GetFirstVisibleItem 2036
-#define wxTreeCtrl_GetImageList 2037
-#define wxTreeCtrl_GetIndent 2038
-#define wxTreeCtrl_GetItemBackgroundColour 2039
-#define wxTreeCtrl_GetItemData 2040
-#define wxTreeCtrl_GetItemFont 2041
-#define wxTreeCtrl_GetItemImage_1 2042
-#define wxTreeCtrl_GetItemImage_2 2043
-#define wxTreeCtrl_GetItemText 2044
-#define wxTreeCtrl_GetItemTextColour 2045
-#define wxTreeCtrl_GetLastChild 2046
-#define wxTreeCtrl_GetNextSibling 2047
-#define wxTreeCtrl_GetNextVisible 2048
-#define wxTreeCtrl_GetItemParent 2049
-#define wxTreeCtrl_GetPrevSibling 2050
-#define wxTreeCtrl_GetPrevVisible 2051
-#define wxTreeCtrl_GetRootItem 2052
-#define wxTreeCtrl_GetSelection 2053
-#define wxTreeCtrl_GetSelections 2054
-#define wxTreeCtrl_GetStateImageList 2055
-#define wxTreeCtrl_HitTest 2056
-#define wxTreeCtrl_InsertItem 2058
-#define wxTreeCtrl_IsBold 2059
-#define wxTreeCtrl_IsExpanded 2060
-#define wxTreeCtrl_IsSelected 2061
-#define wxTreeCtrl_IsVisible 2062
-#define wxTreeCtrl_ItemHasChildren 2063
-#define wxTreeCtrl_IsTreeItemIdOk 2064
-#define wxTreeCtrl_PrependItem 2065
-#define wxTreeCtrl_ScrollTo 2066
-#define wxTreeCtrl_SelectItem_1 2067
-#define wxTreeCtrl_SelectItem_2 2068
-#define wxTreeCtrl_SetIndent 2069
-#define wxTreeCtrl_SetImageList 2070
-#define wxTreeCtrl_SetItemBackgroundColour 2071
-#define wxTreeCtrl_SetItemBold 2072
-#define wxTreeCtrl_SetItemData 2073
-#define wxTreeCtrl_SetItemDropHighlight 2074
-#define wxTreeCtrl_SetItemFont 2075
-#define wxTreeCtrl_SetItemHasChildren 2076
-#define wxTreeCtrl_SetItemImage_2 2077
-#define wxTreeCtrl_SetItemImage_3 2078
-#define wxTreeCtrl_SetItemText 2079
-#define wxTreeCtrl_SetItemTextColour 2080
-#define wxTreeCtrl_SetStateImageList 2081
-#define wxTreeCtrl_SetWindowStyle 2082
-#define wxTreeCtrl_SortChildren 2083
-#define wxTreeCtrl_Toggle 2084
-#define wxTreeCtrl_ToggleItemSelection 2085
-#define wxTreeCtrl_Unselect 2086
-#define wxTreeCtrl_UnselectAll 2087
-#define wxTreeCtrl_UnselectItem 2088
-#define wxScrollBar_new_0 2089
-#define wxScrollBar_new_3 2090
-#define wxScrollBar_destruct 2091
-#define wxScrollBar_Create 2092
-#define wxScrollBar_GetRange 2093
-#define wxScrollBar_GetPageSize 2094
-#define wxScrollBar_GetThumbPosition 2095
-#define wxScrollBar_GetThumbSize 2096
-#define wxScrollBar_SetThumbPosition 2097
-#define wxScrollBar_SetScrollbar 2098
-#define wxSpinButton_new_2 2100
-#define wxSpinButton_new_0 2101
-#define wxSpinButton_Create 2102
-#define wxSpinButton_GetMax 2103
-#define wxSpinButton_GetMin 2104
-#define wxSpinButton_GetValue 2105
-#define wxSpinButton_SetRange 2106
-#define wxSpinButton_SetValue 2107
-#define wxSpinButton_destroy 2108
-#define wxSpinCtrl_new_0 2109
-#define wxSpinCtrl_new_2 2110
-#define wxSpinCtrl_Create 2112
-#define wxSpinCtrl_SetValue_1_1 2115
-#define wxSpinCtrl_SetValue_1_0 2116
-#define wxSpinCtrl_GetValue 2118
-#define wxSpinCtrl_SetRange 2120
-#define wxSpinCtrl_SetSelection 2121
-#define wxSpinCtrl_GetMin 2123
-#define wxSpinCtrl_GetMax 2125
-#define wxSpinCtrl_destroy 2126
-#define wxStaticText_new_0 2127
-#define wxStaticText_new_4 2128
-#define wxStaticText_Create 2129
-#define wxStaticText_GetLabel 2130
-#define wxStaticText_SetLabel 2131
-#define wxStaticText_Wrap 2132
-#define wxStaticText_destroy 2133
-#define wxStaticBitmap_new_0 2134
-#define wxStaticBitmap_new_4 2135
-#define wxStaticBitmap_Create 2136
-#define wxStaticBitmap_GetBitmap 2137
-#define wxStaticBitmap_SetBitmap 2138
-#define wxStaticBitmap_destroy 2139
-#define wxRadioBox_new 2140
-#define wxRadioBox_destruct 2142
-#define wxRadioBox_Create 2143
-#define wxRadioBox_Enable_2 2144
-#define wxRadioBox_Enable_1 2145
-#define wxRadioBox_GetSelection 2146
-#define wxRadioBox_GetString 2147
-#define wxRadioBox_SetSelection 2148
-#define wxRadioBox_Show_2 2149
-#define wxRadioBox_Show_1 2150
-#define wxRadioBox_GetColumnCount 2151
-#define wxRadioBox_GetItemHelpText 2152
-#define wxRadioBox_GetItemToolTip 2153
-#define wxRadioBox_GetItemFromPoint 2155
-#define wxRadioBox_GetRowCount 2156
-#define wxRadioBox_IsItemEnabled 2157
-#define wxRadioBox_IsItemShown 2158
-#define wxRadioBox_SetItemHelpText 2159
-#define wxRadioBox_SetItemToolTip 2160
-#define wxRadioButton_new_0 2161
-#define wxRadioButton_new_4 2162
-#define wxRadioButton_Create 2163
-#define wxRadioButton_GetValue 2164
-#define wxRadioButton_SetValue 2165
-#define wxRadioButton_destroy 2166
-#define wxSlider_new_6 2168
-#define wxSlider_new_0 2169
-#define wxSlider_Create 2170
-#define wxSlider_GetLineSize 2171
-#define wxSlider_GetMax 2172
-#define wxSlider_GetMin 2173
-#define wxSlider_GetPageSize 2174
-#define wxSlider_GetThumbLength 2175
-#define wxSlider_GetValue 2176
-#define wxSlider_SetLineSize 2177
-#define wxSlider_SetPageSize 2178
-#define wxSlider_SetRange 2179
-#define wxSlider_SetThumbLength 2180
-#define wxSlider_SetValue 2181
-#define wxSlider_destroy 2182
-#define wxDialog_new_4 2184
-#define wxDialog_new_0 2185
-#define wxDialog_destruct 2187
-#define wxDialog_Create 2188
-#define wxDialog_CreateButtonSizer 2189
-#define wxDialog_CreateStdDialogButtonSizer 2190
-#define wxDialog_EndModal 2191
-#define wxDialog_GetAffirmativeId 2192
-#define wxDialog_GetReturnCode 2193
-#define wxDialog_IsModal 2194
-#define wxDialog_SetAffirmativeId 2195
-#define wxDialog_SetReturnCode 2196
-#define wxDialog_Show 2197
-#define wxDialog_ShowModal 2198
-#define wxColourDialog_new_0 2199
-#define wxColourDialog_new_2 2200
-#define wxColourDialog_destruct 2201
-#define wxColourDialog_Create 2202
-#define wxColourDialog_GetColourData 2203
-#define wxColourData_new_0 2204
-#define wxColourData_new_1 2205
-#define wxColourData_destruct 2206
-#define wxColourData_GetChooseFull 2207
-#define wxColourData_GetColour 2208
-#define wxColourData_GetCustomColour 2210
-#define wxColourData_SetChooseFull 2211
-#define wxColourData_SetColour 2212
-#define wxColourData_SetCustomColour 2213
-#define wxPalette_new_0 2214
-#define wxPalette_new_4 2215
-#define wxPalette_destruct 2217
-#define wxPalette_Create 2218
-#define wxPalette_GetColoursCount 2219
-#define wxPalette_GetPixel 2220
-#define wxPalette_GetRGB 2221
-#define wxPalette_IsOk 2222
-#define wxDirDialog_new 2226
-#define wxDirDialog_destruct 2227
-#define wxDirDialog_GetPath 2228
-#define wxDirDialog_GetMessage 2229
-#define wxDirDialog_SetMessage 2230
-#define wxDirDialog_SetPath 2231
-#define wxFileDialog_new 2235
-#define wxFileDialog_destruct 2236
-#define wxFileDialog_GetDirectory 2237
-#define wxFileDialog_GetFilename 2238
-#define wxFileDialog_GetFilenames 2239
-#define wxFileDialog_GetFilterIndex 2240
-#define wxFileDialog_GetMessage 2241
-#define wxFileDialog_GetPath 2242
-#define wxFileDialog_GetPaths 2243
-#define wxFileDialog_GetWildcard 2244
-#define wxFileDialog_SetDirectory 2245
-#define wxFileDialog_SetFilename 2246
-#define wxFileDialog_SetFilterIndex 2247
-#define wxFileDialog_SetMessage 2248
-#define wxFileDialog_SetPath 2249
-#define wxFileDialog_SetWildcard 2250
-#define wxPickerBase_SetInternalMargin 2251
-#define wxPickerBase_GetInternalMargin 2252
-#define wxPickerBase_SetTextCtrlProportion 2253
-#define wxPickerBase_SetPickerCtrlProportion 2254
-#define wxPickerBase_GetTextCtrlProportion 2255
-#define wxPickerBase_GetPickerCtrlProportion 2256
-#define wxPickerBase_HasTextCtrl 2257
-#define wxPickerBase_GetTextCtrl 2258
-#define wxPickerBase_IsTextCtrlGrowable 2259
-#define wxPickerBase_SetPickerCtrlGrowable 2260
-#define wxPickerBase_SetTextCtrlGrowable 2261
-#define wxPickerBase_IsPickerCtrlGrowable 2262
-#define wxFilePickerCtrl_new_0 2263
-#define wxFilePickerCtrl_new_3 2264
-#define wxFilePickerCtrl_Create 2265
-#define wxFilePickerCtrl_GetPath 2266
-#define wxFilePickerCtrl_SetPath 2267
-#define wxFilePickerCtrl_destroy 2268
-#define wxDirPickerCtrl_new_0 2269
-#define wxDirPickerCtrl_new_3 2270
-#define wxDirPickerCtrl_Create 2271
-#define wxDirPickerCtrl_GetPath 2272
-#define wxDirPickerCtrl_SetPath 2273
-#define wxDirPickerCtrl_destroy 2274
-#define wxColourPickerCtrl_new_0 2275
-#define wxColourPickerCtrl_new_3 2276
-#define wxColourPickerCtrl_Create 2277
-#define wxColourPickerCtrl_GetColour 2278
-#define wxColourPickerCtrl_SetColour_1_1 2279
-#define wxColourPickerCtrl_SetColour_1_0 2280
-#define wxColourPickerCtrl_destroy 2281
-#define wxDatePickerCtrl_new_0 2282
-#define wxDatePickerCtrl_new_3 2283
-#define wxDatePickerCtrl_GetRange 2284
-#define wxDatePickerCtrl_GetValue 2285
-#define wxDatePickerCtrl_SetRange 2286
-#define wxDatePickerCtrl_SetValue 2287
-#define wxDatePickerCtrl_destroy 2288
-#define wxFontPickerCtrl_new_0 2289
-#define wxFontPickerCtrl_new_3 2290
-#define wxFontPickerCtrl_Create 2291
-#define wxFontPickerCtrl_GetSelectedFont 2292
-#define wxFontPickerCtrl_SetSelectedFont 2293
-#define wxFontPickerCtrl_GetMaxPointSize 2294
-#define wxFontPickerCtrl_SetMaxPointSize 2295
-#define wxFontPickerCtrl_destroy 2296
-#define wxFindReplaceDialog_new_0 2299
-#define wxFindReplaceDialog_new_4 2300
-#define wxFindReplaceDialog_destruct 2301
-#define wxFindReplaceDialog_Create 2302
-#define wxFindReplaceDialog_GetData 2303
-#define wxFindReplaceData_new_0 2304
-#define wxFindReplaceData_new_1 2305
-#define wxFindReplaceData_GetFindString 2306
-#define wxFindReplaceData_GetReplaceString 2307
-#define wxFindReplaceData_GetFlags 2308
-#define wxFindReplaceData_SetFlags 2309
-#define wxFindReplaceData_SetFindString 2310
-#define wxFindReplaceData_SetReplaceString 2311
-#define wxFindReplaceData_destroy 2312
-#define wxMultiChoiceDialog_new_0 2313
-#define wxMultiChoiceDialog_new_5 2315
-#define wxMultiChoiceDialog_GetSelections 2316
-#define wxMultiChoiceDialog_SetSelections 2317
-#define wxMultiChoiceDialog_destroy 2318
-#define wxSingleChoiceDialog_new_0 2319
-#define wxSingleChoiceDialog_new_5 2321
-#define wxSingleChoiceDialog_GetSelection 2322
-#define wxSingleChoiceDialog_GetStringSelection 2323
-#define wxSingleChoiceDialog_SetSelection 2324
-#define wxSingleChoiceDialog_destroy 2325
-#define wxTextEntryDialog_new 2326
-#define wxTextEntryDialog_GetValue 2327
-#define wxTextEntryDialog_SetValue 2328
-#define wxTextEntryDialog_destroy 2329
-#define wxPasswordEntryDialog_new 2330
-#define wxPasswordEntryDialog_destroy 2331
-#define wxFontData_new_0 2332
-#define wxFontData_new_1 2333
-#define wxFontData_destruct 2334
-#define wxFontData_EnableEffects 2335
-#define wxFontData_GetAllowSymbols 2336
-#define wxFontData_GetColour 2337
-#define wxFontData_GetChosenFont 2338
-#define wxFontData_GetEnableEffects 2339
-#define wxFontData_GetInitialFont 2340
-#define wxFontData_GetShowHelp 2341
-#define wxFontData_SetAllowSymbols 2342
-#define wxFontData_SetChosenFont 2343
-#define wxFontData_SetColour 2344
-#define wxFontData_SetInitialFont 2345
-#define wxFontData_SetRange 2346
-#define wxFontData_SetShowHelp 2347
-#define wxFontDialog_new_0 2351
-#define wxFontDialog_new_2 2353
-#define wxFontDialog_Create 2355
-#define wxFontDialog_GetFontData 2356
-#define wxFontDialog_destroy 2358
-#define wxProgressDialog_new 2359
-#define wxProgressDialog_destruct 2360
-#define wxProgressDialog_Resume 2361
-#define wxProgressDialog_Update_2 2362
-#define wxProgressDialog_Update_0 2363
-#define wxMessageDialog_new 2364
-#define wxMessageDialog_destruct 2365
-#define wxPageSetupDialog_new 2366
-#define wxPageSetupDialog_destruct 2367
-#define wxPageSetupDialog_GetPageSetupData 2368
-#define wxPageSetupDialog_ShowModal 2369
-#define wxPageSetupDialogData_new_0 2370
-#define wxPageSetupDialogData_new_1_0 2371
-#define wxPageSetupDialogData_new_1_1 2372
-#define wxPageSetupDialogData_destruct 2373
-#define wxPageSetupDialogData_EnableHelp 2374
-#define wxPageSetupDialogData_EnableMargins 2375
-#define wxPageSetupDialogData_EnableOrientation 2376
-#define wxPageSetupDialogData_EnablePaper 2377
-#define wxPageSetupDialogData_EnablePrinter 2378
-#define wxPageSetupDialogData_GetDefaultMinMargins 2379
-#define wxPageSetupDialogData_GetEnableMargins 2380
-#define wxPageSetupDialogData_GetEnableOrientation 2381
-#define wxPageSetupDialogData_GetEnablePaper 2382
-#define wxPageSetupDialogData_GetEnablePrinter 2383
-#define wxPageSetupDialogData_GetEnableHelp 2384
-#define wxPageSetupDialogData_GetDefaultInfo 2385
-#define wxPageSetupDialogData_GetMarginTopLeft 2386
-#define wxPageSetupDialogData_GetMarginBottomRight 2387
-#define wxPageSetupDialogData_GetMinMarginTopLeft 2388
-#define wxPageSetupDialogData_GetMinMarginBottomRight 2389
-#define wxPageSetupDialogData_GetPaperId 2390
-#define wxPageSetupDialogData_GetPaperSize 2391
-#define wxPageSetupDialogData_GetPrintData 2393
-#define wxPageSetupDialogData_IsOk 2394
-#define wxPageSetupDialogData_SetDefaultInfo 2395
-#define wxPageSetupDialogData_SetDefaultMinMargins 2396
-#define wxPageSetupDialogData_SetMarginTopLeft 2397
-#define wxPageSetupDialogData_SetMarginBottomRight 2398
-#define wxPageSetupDialogData_SetMinMarginTopLeft 2399
-#define wxPageSetupDialogData_SetMinMarginBottomRight 2400
-#define wxPageSetupDialogData_SetPaperId 2401
-#define wxPageSetupDialogData_SetPaperSize_1_1 2402
-#define wxPageSetupDialogData_SetPaperSize_1_0 2403
-#define wxPageSetupDialogData_SetPrintData 2404
-#define wxPrintDialog_new_2_0 2405
-#define wxPrintDialog_new_2_1 2406
-#define wxPrintDialog_destruct 2407
-#define wxPrintDialog_GetPrintDialogData 2408
-#define wxPrintDialog_GetPrintDC 2409
-#define wxPrintDialogData_new_0 2410
-#define wxPrintDialogData_new_1_1 2411
-#define wxPrintDialogData_new_1_0 2412
-#define wxPrintDialogData_destruct 2413
-#define wxPrintDialogData_EnableHelp 2414
-#define wxPrintDialogData_EnablePageNumbers 2415
-#define wxPrintDialogData_EnablePrintToFile 2416
-#define wxPrintDialogData_EnableSelection 2417
-#define wxPrintDialogData_GetAllPages 2418
-#define wxPrintDialogData_GetCollate 2419
-#define wxPrintDialogData_GetFromPage 2420
-#define wxPrintDialogData_GetMaxPage 2421
-#define wxPrintDialogData_GetMinPage 2422
-#define wxPrintDialogData_GetNoCopies 2423
-#define wxPrintDialogData_GetPrintData 2424
-#define wxPrintDialogData_GetPrintToFile 2425
-#define wxPrintDialogData_GetSelection 2426
-#define wxPrintDialogData_GetToPage 2427
-#define wxPrintDialogData_IsOk 2428
-#define wxPrintDialogData_SetCollate 2429
-#define wxPrintDialogData_SetFromPage 2430
-#define wxPrintDialogData_SetMaxPage 2431
-#define wxPrintDialogData_SetMinPage 2432
-#define wxPrintDialogData_SetNoCopies 2433
-#define wxPrintDialogData_SetPrintData 2434
-#define wxPrintDialogData_SetPrintToFile 2435
-#define wxPrintDialogData_SetSelection 2436
-#define wxPrintDialogData_SetToPage 2437
-#define wxPrintData_new_0 2438
-#define wxPrintData_new_1 2439
-#define wxPrintData_destruct 2440
-#define wxPrintData_GetCollate 2441
-#define wxPrintData_GetBin 2442
-#define wxPrintData_GetColour 2443
-#define wxPrintData_GetDuplex 2444
-#define wxPrintData_GetNoCopies 2445
-#define wxPrintData_GetOrientation 2446
-#define wxPrintData_GetPaperId 2447
-#define wxPrintData_GetPrinterName 2448
-#define wxPrintData_GetQuality 2449
-#define wxPrintData_IsOk 2450
-#define wxPrintData_SetBin 2451
-#define wxPrintData_SetCollate 2452
-#define wxPrintData_SetColour 2453
-#define wxPrintData_SetDuplex 2454
-#define wxPrintData_SetNoCopies 2455
-#define wxPrintData_SetOrientation 2456
-#define wxPrintData_SetPaperId 2457
-#define wxPrintData_SetPrinterName 2458
-#define wxPrintData_SetQuality 2459
-#define wxPrintPreview_new_2 2462
-#define wxPrintPreview_new_3 2463
-#define wxPrintPreview_destruct 2465
-#define wxPrintPreview_GetCanvas 2466
-#define wxPrintPreview_GetCurrentPage 2467
-#define wxPrintPreview_GetFrame 2468
-#define wxPrintPreview_GetMaxPage 2469
-#define wxPrintPreview_GetMinPage 2470
-#define wxPrintPreview_GetPrintout 2471
-#define wxPrintPreview_GetPrintoutForPrinting 2472
-#define wxPrintPreview_IsOk 2473
-#define wxPrintPreview_PaintPage 2474
-#define wxPrintPreview_Print 2475
-#define wxPrintPreview_RenderPage 2476
-#define wxPrintPreview_SetCanvas 2477
-#define wxPrintPreview_SetCurrentPage 2478
-#define wxPrintPreview_SetFrame 2479
-#define wxPrintPreview_SetPrintout 2480
-#define wxPrintPreview_SetZoom 2481
-#define wxPreviewFrame_new 2482
-#define wxPreviewFrame_destruct 2483
-#define wxPreviewFrame_CreateControlBar 2484
-#define wxPreviewFrame_CreateCanvas 2485
-#define wxPreviewFrame_Initialize 2486
-#define wxPreviewFrame_OnCloseWindow 2487
-#define wxPreviewControlBar_new 2488
-#define wxPreviewControlBar_destruct 2489
-#define wxPreviewControlBar_CreateButtons 2490
-#define wxPreviewControlBar_GetPrintPreview 2491
-#define wxPreviewControlBar_GetZoomControl 2492
-#define wxPreviewControlBar_SetZoomControl 2493
-#define wxPrinter_new 2495
-#define wxPrinter_CreateAbortWindow 2496
-#define wxPrinter_GetAbort 2497
-#define wxPrinter_GetLastError 2498
-#define wxPrinter_GetPrintDialogData 2499
-#define wxPrinter_Print 2500
-#define wxPrinter_PrintDialog 2501
-#define wxPrinter_ReportError 2502
-#define wxPrinter_Setup 2503
-#define wxPrinter_destroy 2504
-#define wxXmlResource_new_1 2505
-#define wxXmlResource_new_2 2506
-#define wxXmlResource_destruct 2507
-#define wxXmlResource_AttachUnknownControl 2508
-#define wxXmlResource_ClearHandlers 2509
-#define wxXmlResource_CompareVersion 2510
-#define wxXmlResource_Get 2511
-#define wxXmlResource_GetFlags 2512
-#define wxXmlResource_GetVersion 2513
-#define wxXmlResource_GetXRCID 2514
-#define wxXmlResource_InitAllHandlers 2515
-#define wxXmlResource_Load 2516
-#define wxXmlResource_LoadBitmap 2517
-#define wxXmlResource_LoadDialog_2 2518
-#define wxXmlResource_LoadDialog_3 2519
-#define wxXmlResource_LoadFrame_2 2520
-#define wxXmlResource_LoadFrame_3 2521
-#define wxXmlResource_LoadIcon 2522
-#define wxXmlResource_LoadMenu 2523
-#define wxXmlResource_LoadMenuBar_2 2524
-#define wxXmlResource_LoadMenuBar_1 2525
-#define wxXmlResource_LoadPanel_2 2526
-#define wxXmlResource_LoadPanel_3 2527
-#define wxXmlResource_LoadToolBar 2528
-#define wxXmlResource_Set 2529
-#define wxXmlResource_SetFlags 2530
-#define wxXmlResource_Unload 2531
-#define wxXmlResource_xrcctrl 2532
-#define wxHtmlEasyPrinting_new 2533
-#define wxHtmlEasyPrinting_destruct 2534
-#define wxHtmlEasyPrinting_GetPrintData 2535
-#define wxHtmlEasyPrinting_GetPageSetupData 2536
-#define wxHtmlEasyPrinting_PreviewFile 2537
-#define wxHtmlEasyPrinting_PreviewText 2538
-#define wxHtmlEasyPrinting_PrintFile 2539
-#define wxHtmlEasyPrinting_PrintText 2540
-#define wxHtmlEasyPrinting_PageSetup 2541
-#define wxHtmlEasyPrinting_SetFonts 2542
-#define wxHtmlEasyPrinting_SetHeader 2543
-#define wxHtmlEasyPrinting_SetFooter 2544
-#define wxGLCanvas_new_2 2546
-#define wxGLCanvas_new_3_1 2547
-#define wxGLCanvas_new_3_0 2548
-#define wxGLCanvas_GetContext 2549
-#define wxGLCanvas_SetCurrent 2551
-#define wxGLCanvas_SwapBuffers 2552
-#define wxGLCanvas_destroy 2553
-#define wxAuiManager_new 2554
-#define wxAuiManager_destruct 2555
-#define wxAuiManager_AddPane_2_1 2556
-#define wxAuiManager_AddPane_3 2557
-#define wxAuiManager_AddPane_2_0 2558
-#define wxAuiManager_DetachPane 2559
-#define wxAuiManager_GetAllPanes 2560
-#define wxAuiManager_GetArtProvider 2561
-#define wxAuiManager_GetDockSizeConstraint 2562
-#define wxAuiManager_GetFlags 2563
-#define wxAuiManager_GetManagedWindow 2564
-#define wxAuiManager_GetManager 2565
-#define wxAuiManager_GetPane_1_1 2566
-#define wxAuiManager_GetPane_1_0 2567
-#define wxAuiManager_HideHint 2568
-#define wxAuiManager_InsertPane 2569
-#define wxAuiManager_LoadPaneInfo 2570
-#define wxAuiManager_LoadPerspective 2571
-#define wxAuiManager_SavePaneInfo 2572
-#define wxAuiManager_SavePerspective 2573
-#define wxAuiManager_SetArtProvider 2574
-#define wxAuiManager_SetDockSizeConstraint 2575
-#define wxAuiManager_SetFlags 2576
-#define wxAuiManager_SetManagedWindow 2577
-#define wxAuiManager_ShowHint 2578
-#define wxAuiManager_UnInit 2579
-#define wxAuiManager_Update 2580
-#define wxAuiPaneInfo_new_0 2581
-#define wxAuiPaneInfo_new_1 2582
-#define wxAuiPaneInfo_destruct 2583
-#define wxAuiPaneInfo_BestSize_1 2584
-#define wxAuiPaneInfo_BestSize_2 2585
-#define wxAuiPaneInfo_Bottom 2586
-#define wxAuiPaneInfo_BottomDockable 2587
-#define wxAuiPaneInfo_Caption 2588
-#define wxAuiPaneInfo_CaptionVisible 2589
-#define wxAuiPaneInfo_Centre 2590
-#define wxAuiPaneInfo_CentrePane 2591
-#define wxAuiPaneInfo_CloseButton 2592
-#define wxAuiPaneInfo_DefaultPane 2593
-#define wxAuiPaneInfo_DestroyOnClose 2594
-#define wxAuiPaneInfo_Direction 2595
-#define wxAuiPaneInfo_Dock 2596
-#define wxAuiPaneInfo_Dockable 2597
-#define wxAuiPaneInfo_Fixed 2598
-#define wxAuiPaneInfo_Float 2599
-#define wxAuiPaneInfo_Floatable 2600
-#define wxAuiPaneInfo_FloatingPosition_1 2601
-#define wxAuiPaneInfo_FloatingPosition_2 2602
-#define wxAuiPaneInfo_FloatingSize_1 2603
-#define wxAuiPaneInfo_FloatingSize_2 2604
-#define wxAuiPaneInfo_Gripper 2605
-#define wxAuiPaneInfo_GripperTop 2606
-#define wxAuiPaneInfo_HasBorder 2607
-#define wxAuiPaneInfo_HasCaption 2608
-#define wxAuiPaneInfo_HasCloseButton 2609
-#define wxAuiPaneInfo_HasFlag 2610
-#define wxAuiPaneInfo_HasGripper 2611
-#define wxAuiPaneInfo_HasGripperTop 2612
-#define wxAuiPaneInfo_HasMaximizeButton 2613
-#define wxAuiPaneInfo_HasMinimizeButton 2614
-#define wxAuiPaneInfo_HasPinButton 2615
-#define wxAuiPaneInfo_Hide 2616
-#define wxAuiPaneInfo_IsBottomDockable 2617
-#define wxAuiPaneInfo_IsDocked 2618
-#define wxAuiPaneInfo_IsFixed 2619
-#define wxAuiPaneInfo_IsFloatable 2620
-#define wxAuiPaneInfo_IsFloating 2621
-#define wxAuiPaneInfo_IsLeftDockable 2622
-#define wxAuiPaneInfo_IsMovable 2623
-#define wxAuiPaneInfo_IsOk 2624
-#define wxAuiPaneInfo_IsResizable 2625
-#define wxAuiPaneInfo_IsRightDockable 2626
-#define wxAuiPaneInfo_IsShown 2627
-#define wxAuiPaneInfo_IsToolbar 2628
-#define wxAuiPaneInfo_IsTopDockable 2629
-#define wxAuiPaneInfo_Layer 2630
-#define wxAuiPaneInfo_Left 2631
-#define wxAuiPaneInfo_LeftDockable 2632
-#define wxAuiPaneInfo_MaxSize_1 2633
-#define wxAuiPaneInfo_MaxSize_2 2634
-#define wxAuiPaneInfo_MaximizeButton 2635
-#define wxAuiPaneInfo_MinSize_1 2636
-#define wxAuiPaneInfo_MinSize_2 2637
-#define wxAuiPaneInfo_MinimizeButton 2638
-#define wxAuiPaneInfo_Movable 2639
-#define wxAuiPaneInfo_Name 2640
-#define wxAuiPaneInfo_PaneBorder 2641
-#define wxAuiPaneInfo_PinButton 2642
-#define wxAuiPaneInfo_Position 2643
-#define wxAuiPaneInfo_Resizable 2644
-#define wxAuiPaneInfo_Right 2645
-#define wxAuiPaneInfo_RightDockable 2646
-#define wxAuiPaneInfo_Row 2647
-#define wxAuiPaneInfo_SafeSet 2648
-#define wxAuiPaneInfo_SetFlag 2649
-#define wxAuiPaneInfo_Show 2650
-#define wxAuiPaneInfo_ToolbarPane 2651
-#define wxAuiPaneInfo_Top 2652
-#define wxAuiPaneInfo_TopDockable 2653
-#define wxAuiPaneInfo_Window 2654
-#define wxAuiPaneInfo_GetWindow 2655
-#define wxAuiPaneInfo_GetFrame 2656
-#define wxAuiPaneInfo_GetDirection 2657
-#define wxAuiPaneInfo_GetLayer 2658
-#define wxAuiPaneInfo_GetRow 2659
-#define wxAuiPaneInfo_GetPosition 2660
-#define wxAuiPaneInfo_GetFloatingPosition 2661
-#define wxAuiPaneInfo_GetFloatingSize 2662
-#define wxAuiNotebook_new_0 2663
-#define wxAuiNotebook_new_2 2664
-#define wxAuiNotebook_AddPage 2665
-#define wxAuiNotebook_Create 2666
-#define wxAuiNotebook_DeletePage 2667
-#define wxAuiNotebook_GetArtProvider 2668
-#define wxAuiNotebook_GetPage 2669
-#define wxAuiNotebook_GetPageBitmap 2670
-#define wxAuiNotebook_GetPageCount 2671
-#define wxAuiNotebook_GetPageIndex 2672
-#define wxAuiNotebook_GetPageText 2673
-#define wxAuiNotebook_GetSelection 2674
-#define wxAuiNotebook_InsertPage 2675
-#define wxAuiNotebook_RemovePage 2676
-#define wxAuiNotebook_SetArtProvider 2677
-#define wxAuiNotebook_SetFont 2678
-#define wxAuiNotebook_SetPageBitmap 2679
-#define wxAuiNotebook_SetPageText 2680
-#define wxAuiNotebook_SetSelection 2681
-#define wxAuiNotebook_SetTabCtrlHeight 2682
-#define wxAuiNotebook_SetUniformBitmapSize 2683
-#define wxAuiNotebook_destroy 2684
-#define wxAuiTabArt_SetFlags 2685
-#define wxAuiTabArt_SetMeasuringFont 2686
-#define wxAuiTabArt_SetNormalFont 2687
-#define wxAuiTabArt_SetSelectedFont 2688
-#define wxAuiTabArt_SetColour 2689
-#define wxAuiTabArt_SetActiveColour 2690
-#define wxAuiDockArt_GetColour 2691
-#define wxAuiDockArt_GetFont 2692
-#define wxAuiDockArt_GetMetric 2693
-#define wxAuiDockArt_SetColour 2694
-#define wxAuiDockArt_SetFont 2695
-#define wxAuiDockArt_SetMetric 2696
-#define wxAuiSimpleTabArt_new 2697
-#define wxAuiSimpleTabArt_destroy 2698
-#define wxMDIParentFrame_new_0 2699
-#define wxMDIParentFrame_new_4 2700
-#define wxMDIParentFrame_destruct 2701
-#define wxMDIParentFrame_ActivateNext 2702
-#define wxMDIParentFrame_ActivatePrevious 2703
-#define wxMDIParentFrame_ArrangeIcons 2704
-#define wxMDIParentFrame_Cascade 2705
-#define wxMDIParentFrame_Create 2706
-#define wxMDIParentFrame_GetActiveChild 2707
-#define wxMDIParentFrame_GetClientWindow 2708
-#define wxMDIParentFrame_Tile 2709
-#define wxMDIChildFrame_new_0 2710
-#define wxMDIChildFrame_new_4 2711
-#define wxMDIChildFrame_destruct 2712
-#define wxMDIChildFrame_Activate 2713
-#define wxMDIChildFrame_Create 2714
-#define wxMDIChildFrame_Maximize 2715
-#define wxMDIChildFrame_Restore 2716
-#define wxMDIClientWindow_new_0 2717
-#define wxMDIClientWindow_new_2 2718
-#define wxMDIClientWindow_destruct 2719
-#define wxMDIClientWindow_CreateClient 2720
-#define wxLayoutAlgorithm_new 2721
-#define wxLayoutAlgorithm_LayoutFrame 2722
-#define wxLayoutAlgorithm_LayoutMDIFrame 2723
-#define wxLayoutAlgorithm_LayoutWindow 2724
-#define wxLayoutAlgorithm_destroy 2725
-#define wxEvent_GetId 2726
-#define wxEvent_GetSkipped 2727
-#define wxEvent_GetTimestamp 2728
-#define wxEvent_IsCommandEvent 2729
-#define wxEvent_ResumePropagation 2730
-#define wxEvent_ShouldPropagate 2731
-#define wxEvent_Skip 2732
-#define wxEvent_StopPropagation 2733
-#define wxCommandEvent_getClientData 2734
-#define wxCommandEvent_GetExtraLong 2735
-#define wxCommandEvent_GetInt 2736
-#define wxCommandEvent_GetSelection 2737
-#define wxCommandEvent_GetString 2738
-#define wxCommandEvent_IsChecked 2739
-#define wxCommandEvent_IsSelection 2740
-#define wxCommandEvent_SetInt 2741
-#define wxCommandEvent_SetString 2742
-#define wxScrollEvent_GetOrientation 2743
-#define wxScrollEvent_GetPosition 2744
-#define wxScrollWinEvent_GetOrientation 2745
-#define wxScrollWinEvent_GetPosition 2746
-#define wxMouseEvent_AltDown 2747
-#define wxMouseEvent_Button 2748
-#define wxMouseEvent_ButtonDClick 2749
-#define wxMouseEvent_ButtonDown 2750
-#define wxMouseEvent_ButtonUp 2751
-#define wxMouseEvent_CmdDown 2752
-#define wxMouseEvent_ControlDown 2753
-#define wxMouseEvent_Dragging 2754
-#define wxMouseEvent_Entering 2755
-#define wxMouseEvent_GetButton 2756
-#define wxMouseEvent_GetPosition 2759
-#define wxMouseEvent_GetLogicalPosition 2760
-#define wxMouseEvent_GetLinesPerAction 2761
-#define wxMouseEvent_GetWheelRotation 2762
-#define wxMouseEvent_GetWheelDelta 2763
-#define wxMouseEvent_GetX 2764
-#define wxMouseEvent_GetY 2765
-#define wxMouseEvent_IsButton 2766
-#define wxMouseEvent_IsPageScroll 2767
-#define wxMouseEvent_Leaving 2768
-#define wxMouseEvent_LeftDClick 2769
-#define wxMouseEvent_LeftDown 2770
-#define wxMouseEvent_LeftIsDown 2771
-#define wxMouseEvent_LeftUp 2772
-#define wxMouseEvent_MetaDown 2773
-#define wxMouseEvent_MiddleDClick 2774
-#define wxMouseEvent_MiddleDown 2775
-#define wxMouseEvent_MiddleIsDown 2776
-#define wxMouseEvent_MiddleUp 2777
-#define wxMouseEvent_Moving 2778
-#define wxMouseEvent_RightDClick 2779
-#define wxMouseEvent_RightDown 2780
-#define wxMouseEvent_RightIsDown 2781
-#define wxMouseEvent_RightUp 2782
-#define wxMouseEvent_ShiftDown 2783
-#define wxSetCursorEvent_GetCursor 2784
-#define wxSetCursorEvent_GetX 2785
-#define wxSetCursorEvent_GetY 2786
-#define wxSetCursorEvent_HasCursor 2787
-#define wxSetCursorEvent_SetCursor 2788
-#define wxKeyEvent_AltDown 2789
-#define wxKeyEvent_CmdDown 2790
-#define wxKeyEvent_ControlDown 2791
-#define wxKeyEvent_GetKeyCode 2792
-#define wxKeyEvent_GetModifiers 2793
-#define wxKeyEvent_GetPosition 2796
-#define wxKeyEvent_GetRawKeyCode 2797
-#define wxKeyEvent_GetRawKeyFlags 2798
-#define wxKeyEvent_GetUnicodeKey 2799
-#define wxKeyEvent_GetX 2800
-#define wxKeyEvent_GetY 2801
-#define wxKeyEvent_HasModifiers 2802
-#define wxKeyEvent_MetaDown 2803
-#define wxKeyEvent_ShiftDown 2804
-#define wxSizeEvent_GetSize 2805
-#define wxMoveEvent_GetPosition 2806
-#define wxEraseEvent_GetDC 2807
-#define wxFocusEvent_GetWindow 2808
-#define wxChildFocusEvent_GetWindow 2809
-#define wxMenuEvent_GetMenu 2810
-#define wxMenuEvent_GetMenuId 2811
-#define wxMenuEvent_IsPopup 2812
-#define wxCloseEvent_CanVeto 2813
-#define wxCloseEvent_GetLoggingOff 2814
-#define wxCloseEvent_SetCanVeto 2815
-#define wxCloseEvent_SetLoggingOff 2816
-#define wxCloseEvent_Veto 2817
-#define wxShowEvent_SetShow 2818
-#define wxShowEvent_GetShow 2819
-#define wxIconizeEvent_Iconized 2820
-#define wxJoystickEvent_ButtonDown 2821
-#define wxJoystickEvent_ButtonIsDown 2822
-#define wxJoystickEvent_ButtonUp 2823
-#define wxJoystickEvent_GetButtonChange 2824
-#define wxJoystickEvent_GetButtonState 2825
-#define wxJoystickEvent_GetJoystick 2826
-#define wxJoystickEvent_GetPosition 2827
-#define wxJoystickEvent_GetZPosition 2828
-#define wxJoystickEvent_IsButton 2829
-#define wxJoystickEvent_IsMove 2830
-#define wxJoystickEvent_IsZMove 2831
-#define wxUpdateUIEvent_CanUpdate 2832
-#define wxUpdateUIEvent_Check 2833
-#define wxUpdateUIEvent_Enable 2834
-#define wxUpdateUIEvent_Show 2835
-#define wxUpdateUIEvent_GetChecked 2836
-#define wxUpdateUIEvent_GetEnabled 2837
-#define wxUpdateUIEvent_GetShown 2838
-#define wxUpdateUIEvent_GetSetChecked 2839
-#define wxUpdateUIEvent_GetSetEnabled 2840
-#define wxUpdateUIEvent_GetSetShown 2841
-#define wxUpdateUIEvent_GetSetText 2842
-#define wxUpdateUIEvent_GetText 2843
-#define wxUpdateUIEvent_GetMode 2844
-#define wxUpdateUIEvent_GetUpdateInterval 2845
-#define wxUpdateUIEvent_ResetUpdateTime 2846
-#define wxUpdateUIEvent_SetMode 2847
-#define wxUpdateUIEvent_SetText 2848
-#define wxUpdateUIEvent_SetUpdateInterval 2849
-#define wxMouseCaptureChangedEvent_GetCapturedWindow 2850
-#define wxPaletteChangedEvent_SetChangedWindow 2851
-#define wxPaletteChangedEvent_GetChangedWindow 2852
-#define wxQueryNewPaletteEvent_SetPaletteRealized 2853
-#define wxQueryNewPaletteEvent_GetPaletteRealized 2854
-#define wxNavigationKeyEvent_GetDirection 2855
-#define wxNavigationKeyEvent_SetDirection 2856
-#define wxNavigationKeyEvent_IsWindowChange 2857
-#define wxNavigationKeyEvent_SetWindowChange 2858
-#define wxNavigationKeyEvent_IsFromTab 2859
-#define wxNavigationKeyEvent_SetFromTab 2860
-#define wxNavigationKeyEvent_GetCurrentFocus 2861
-#define wxNavigationKeyEvent_SetCurrentFocus 2862
-#define wxHelpEvent_GetOrigin 2863
-#define wxHelpEvent_GetPosition 2864
-#define wxHelpEvent_SetOrigin 2865
-#define wxHelpEvent_SetPosition 2866
-#define wxContextMenuEvent_GetPosition 2867
-#define wxContextMenuEvent_SetPosition 2868
-#define wxIdleEvent_CanSend 2869
-#define wxIdleEvent_GetMode 2870
-#define wxIdleEvent_RequestMore 2871
-#define wxIdleEvent_MoreRequested 2872
-#define wxIdleEvent_SetMode 2873
-#define wxGridEvent_AltDown 2874
-#define wxGridEvent_ControlDown 2875
-#define wxGridEvent_GetCol 2876
-#define wxGridEvent_GetPosition 2877
-#define wxGridEvent_GetRow 2878
-#define wxGridEvent_MetaDown 2879
-#define wxGridEvent_Selecting 2880
-#define wxGridEvent_ShiftDown 2881
-#define wxNotifyEvent_Allow 2882
-#define wxNotifyEvent_IsAllowed 2883
-#define wxNotifyEvent_Veto 2884
-#define wxSashEvent_GetEdge 2885
-#define wxSashEvent_GetDragRect 2886
-#define wxSashEvent_GetDragStatus 2887
-#define wxListEvent_GetCacheFrom 2888
-#define wxListEvent_GetCacheTo 2889
-#define wxListEvent_GetKeyCode 2890
-#define wxListEvent_GetIndex 2891
-#define wxListEvent_GetColumn 2892
-#define wxListEvent_GetPoint 2893
-#define wxListEvent_GetLabel 2894
-#define wxListEvent_GetText 2895
-#define wxListEvent_GetImage 2896
-#define wxListEvent_GetData 2897
-#define wxListEvent_GetMask 2898
-#define wxListEvent_GetItem 2899
-#define wxListEvent_IsEditCancelled 2900
-#define wxDateEvent_GetDate 2901
-#define wxCalendarEvent_GetWeekDay 2902
-#define wxFileDirPickerEvent_GetPath 2903
-#define wxColourPickerEvent_GetColour 2904
-#define wxFontPickerEvent_GetFont 2905
-#define wxStyledTextEvent_GetPosition 2906
-#define wxStyledTextEvent_GetKey 2907
-#define wxStyledTextEvent_GetModifiers 2908
-#define wxStyledTextEvent_GetModificationType 2909
-#define wxStyledTextEvent_GetText 2910
-#define wxStyledTextEvent_GetLength 2911
-#define wxStyledTextEvent_GetLinesAdded 2912
-#define wxStyledTextEvent_GetLine 2913
-#define wxStyledTextEvent_GetFoldLevelNow 2914
-#define wxStyledTextEvent_GetFoldLevelPrev 2915
-#define wxStyledTextEvent_GetMargin 2916
-#define wxStyledTextEvent_GetMessage 2917
-#define wxStyledTextEvent_GetWParam 2918
-#define wxStyledTextEvent_GetLParam 2919
-#define wxStyledTextEvent_GetListType 2920
-#define wxStyledTextEvent_GetX 2921
-#define wxStyledTextEvent_GetY 2922
-#define wxStyledTextEvent_GetDragText 2923
-#define wxStyledTextEvent_GetDragAllowMove 2924
-#define wxStyledTextEvent_GetDragResult 2925
-#define wxStyledTextEvent_GetShift 2926
-#define wxStyledTextEvent_GetControl 2927
-#define wxStyledTextEvent_GetAlt 2928
-#define utils_wxGetKeyState 2929
-#define utils_wxGetMousePosition 2930
-#define utils_wxGetMouseState 2931
-#define utils_wxSetDetectableAutoRepeat 2932
-#define utils_wxBell 2933
-#define utils_wxFindMenuItemId 2934
-#define utils_wxGenericFindWindowAtPoint 2935
-#define utils_wxFindWindowAtPoint 2936
-#define utils_wxBeginBusyCursor 2937
-#define utils_wxEndBusyCursor 2938
-#define utils_wxIsBusy 2939
-#define utils_wxShutdown 2940
-#define utils_wxShell 2941
-#define utils_wxLaunchDefaultBrowser 2942
-#define utils_wxGetEmailAddress 2943
-#define utils_wxGetUserId 2944
-#define utils_wxGetHomeDir 2945
-#define utils_wxNewId 2946
-#define utils_wxRegisterId 2947
-#define utils_wxGetCurrentId 2948
-#define utils_wxGetOsDescription 2949
-#define utils_wxIsPlatformLittleEndian 2950
-#define utils_wxIsPlatform64Bit 2951
-#define gdicmn_wxDisplaySize 2952
-#define gdicmn_wxSetCursor 2953
-#define wxPrintout_new 2954
-#define wxPrintout_destruct 2955
-#define wxPrintout_GetDC 2956
-#define wxPrintout_GetPageSizeMM 2957
-#define wxPrintout_GetPageSizePixels 2958
-#define wxPrintout_GetPaperRectPixels 2959
-#define wxPrintout_GetPPIPrinter 2960
-#define wxPrintout_GetPPIScreen 2961
-#define wxPrintout_GetTitle 2962
-#define wxPrintout_IsPreview 2963
-#define wxPrintout_FitThisSizeToPaper 2964
-#define wxPrintout_FitThisSizeToPage 2965
-#define wxPrintout_FitThisSizeToPageMargins 2966
-#define wxPrintout_MapScreenSizeToPaper 2967
-#define wxPrintout_MapScreenSizeToPage 2968
-#define wxPrintout_MapScreenSizeToPageMargins 2969
-#define wxPrintout_MapScreenSizeToDevice 2970
-#define wxPrintout_GetLogicalPaperRect 2971
-#define wxPrintout_GetLogicalPageRect 2972
-#define wxPrintout_GetLogicalPageMarginsRect 2973
-#define wxPrintout_SetLogicalOrigin 2974
-#define wxPrintout_OffsetLogicalOrigin 2975
-#define wxStyledTextCtrl_new_2 2976
-#define wxStyledTextCtrl_new_0 2977
-#define wxStyledTextCtrl_destruct 2978
-#define wxStyledTextCtrl_Create 2979
-#define wxStyledTextCtrl_AddText 2980
-#define wxStyledTextCtrl_AddStyledText 2981
-#define wxStyledTextCtrl_InsertText 2982
-#define wxStyledTextCtrl_ClearAll 2983
-#define wxStyledTextCtrl_ClearDocumentStyle 2984
-#define wxStyledTextCtrl_GetLength 2985
-#define wxStyledTextCtrl_GetCharAt 2986
-#define wxStyledTextCtrl_GetCurrentPos 2987
-#define wxStyledTextCtrl_GetAnchor 2988
-#define wxStyledTextCtrl_GetStyleAt 2989
-#define wxStyledTextCtrl_Redo 2990
-#define wxStyledTextCtrl_SetUndoCollection 2991
-#define wxStyledTextCtrl_SelectAll 2992
-#define wxStyledTextCtrl_SetSavePoint 2993
-#define wxStyledTextCtrl_GetStyledText 2994
-#define wxStyledTextCtrl_CanRedo 2995
-#define wxStyledTextCtrl_MarkerLineFromHandle 2996
-#define wxStyledTextCtrl_MarkerDeleteHandle 2997
-#define wxStyledTextCtrl_GetUndoCollection 2998
-#define wxStyledTextCtrl_GetViewWhiteSpace 2999
-#define wxStyledTextCtrl_SetViewWhiteSpace 3000
-#define wxStyledTextCtrl_PositionFromPoint 3001
-#define wxStyledTextCtrl_PositionFromPointClose 3002
-#define wxStyledTextCtrl_GotoLine 3003
-#define wxStyledTextCtrl_GotoPos 3004
-#define wxStyledTextCtrl_SetAnchor 3005
-#define wxStyledTextCtrl_GetCurLine 3006
-#define wxStyledTextCtrl_GetEndStyled 3007
-#define wxStyledTextCtrl_ConvertEOLs 3008
-#define wxStyledTextCtrl_GetEOLMode 3009
-#define wxStyledTextCtrl_SetEOLMode 3010
-#define wxStyledTextCtrl_StartStyling 3011
-#define wxStyledTextCtrl_SetStyling 3012
-#define wxStyledTextCtrl_GetBufferedDraw 3013
-#define wxStyledTextCtrl_SetBufferedDraw 3014
-#define wxStyledTextCtrl_SetTabWidth 3015
-#define wxStyledTextCtrl_GetTabWidth 3016
-#define wxStyledTextCtrl_SetCodePage 3017
-#define wxStyledTextCtrl_MarkerDefine 3018
-#define wxStyledTextCtrl_MarkerSetForeground 3019
-#define wxStyledTextCtrl_MarkerSetBackground 3020
-#define wxStyledTextCtrl_MarkerAdd 3021
-#define wxStyledTextCtrl_MarkerDelete 3022
-#define wxStyledTextCtrl_MarkerDeleteAll 3023
-#define wxStyledTextCtrl_MarkerGet 3024
-#define wxStyledTextCtrl_MarkerNext 3025
-#define wxStyledTextCtrl_MarkerPrevious 3026
-#define wxStyledTextCtrl_MarkerDefineBitmap 3027
-#define wxStyledTextCtrl_MarkerAddSet 3028
-#define wxStyledTextCtrl_MarkerSetAlpha 3029
-#define wxStyledTextCtrl_SetMarginType 3030
-#define wxStyledTextCtrl_GetMarginType 3031
-#define wxStyledTextCtrl_SetMarginWidth 3032
-#define wxStyledTextCtrl_GetMarginWidth 3033
-#define wxStyledTextCtrl_SetMarginMask 3034
-#define wxStyledTextCtrl_GetMarginMask 3035
-#define wxStyledTextCtrl_SetMarginSensitive 3036
-#define wxStyledTextCtrl_GetMarginSensitive 3037
-#define wxStyledTextCtrl_StyleClearAll 3038
-#define wxStyledTextCtrl_StyleSetForeground 3039
-#define wxStyledTextCtrl_StyleSetBackground 3040
-#define wxStyledTextCtrl_StyleSetBold 3041
-#define wxStyledTextCtrl_StyleSetItalic 3042
-#define wxStyledTextCtrl_StyleSetSize 3043
-#define wxStyledTextCtrl_StyleSetFaceName 3044
-#define wxStyledTextCtrl_StyleSetEOLFilled 3045
-#define wxStyledTextCtrl_StyleResetDefault 3046
-#define wxStyledTextCtrl_StyleSetUnderline 3047
-#define wxStyledTextCtrl_StyleSetCase 3048
-#define wxStyledTextCtrl_StyleSetHotSpot 3049
-#define wxStyledTextCtrl_SetSelForeground 3050
-#define wxStyledTextCtrl_SetSelBackground 3051
-#define wxStyledTextCtrl_GetSelAlpha 3052
-#define wxStyledTextCtrl_SetSelAlpha 3053
-#define wxStyledTextCtrl_SetCaretForeground 3054
-#define wxStyledTextCtrl_CmdKeyAssign 3055
-#define wxStyledTextCtrl_CmdKeyClear 3056
-#define wxStyledTextCtrl_CmdKeyClearAll 3057
-#define wxStyledTextCtrl_SetStyleBytes 3058
-#define wxStyledTextCtrl_StyleSetVisible 3059
-#define wxStyledTextCtrl_GetCaretPeriod 3060
-#define wxStyledTextCtrl_SetCaretPeriod 3061
-#define wxStyledTextCtrl_SetWordChars 3062
-#define wxStyledTextCtrl_BeginUndoAction 3063
-#define wxStyledTextCtrl_EndUndoAction 3064
-#define wxStyledTextCtrl_IndicatorSetStyle 3065
-#define wxStyledTextCtrl_IndicatorGetStyle 3066
-#define wxStyledTextCtrl_IndicatorSetForeground 3067
-#define wxStyledTextCtrl_IndicatorGetForeground 3068
-#define wxStyledTextCtrl_SetWhitespaceForeground 3069
-#define wxStyledTextCtrl_SetWhitespaceBackground 3070
-#define wxStyledTextCtrl_GetStyleBits 3071
-#define wxStyledTextCtrl_SetLineState 3072
-#define wxStyledTextCtrl_GetLineState 3073
-#define wxStyledTextCtrl_GetMaxLineState 3074
-#define wxStyledTextCtrl_GetCaretLineVisible 3075
-#define wxStyledTextCtrl_SetCaretLineVisible 3076
-#define wxStyledTextCtrl_GetCaretLineBackground 3077
-#define wxStyledTextCtrl_SetCaretLineBackground 3078
-#define wxStyledTextCtrl_AutoCompShow 3079
-#define wxStyledTextCtrl_AutoCompCancel 3080
-#define wxStyledTextCtrl_AutoCompActive 3081
-#define wxStyledTextCtrl_AutoCompPosStart 3082
-#define wxStyledTextCtrl_AutoCompComplete 3083
-#define wxStyledTextCtrl_AutoCompStops 3084
-#define wxStyledTextCtrl_AutoCompSetSeparator 3085
-#define wxStyledTextCtrl_AutoCompGetSeparator 3086
-#define wxStyledTextCtrl_AutoCompSelect 3087
-#define wxStyledTextCtrl_AutoCompSetCancelAtStart 3088
-#define wxStyledTextCtrl_AutoCompGetCancelAtStart 3089
-#define wxStyledTextCtrl_AutoCompSetFillUps 3090
-#define wxStyledTextCtrl_AutoCompSetChooseSingle 3091
-#define wxStyledTextCtrl_AutoCompGetChooseSingle 3092
-#define wxStyledTextCtrl_AutoCompSetIgnoreCase 3093
-#define wxStyledTextCtrl_AutoCompGetIgnoreCase 3094
-#define wxStyledTextCtrl_UserListShow 3095
-#define wxStyledTextCtrl_AutoCompSetAutoHide 3096
-#define wxStyledTextCtrl_AutoCompGetAutoHide 3097
-#define wxStyledTextCtrl_AutoCompSetDropRestOfWord 3098
-#define wxStyledTextCtrl_AutoCompGetDropRestOfWord 3099
-#define wxStyledTextCtrl_RegisterImage 3100
-#define wxStyledTextCtrl_ClearRegisteredImages 3101
-#define wxStyledTextCtrl_AutoCompGetTypeSeparator 3102
-#define wxStyledTextCtrl_AutoCompSetTypeSeparator 3103
-#define wxStyledTextCtrl_AutoCompSetMaxWidth 3104
-#define wxStyledTextCtrl_AutoCompGetMaxWidth 3105
-#define wxStyledTextCtrl_AutoCompSetMaxHeight 3106
-#define wxStyledTextCtrl_AutoCompGetMaxHeight 3107
-#define wxStyledTextCtrl_SetIndent 3108
-#define wxStyledTextCtrl_GetIndent 3109
-#define wxStyledTextCtrl_SetUseTabs 3110
-#define wxStyledTextCtrl_GetUseTabs 3111
-#define wxStyledTextCtrl_SetLineIndentation 3112
-#define wxStyledTextCtrl_GetLineIndentation 3113
-#define wxStyledTextCtrl_GetLineIndentPosition 3114
-#define wxStyledTextCtrl_GetColumn 3115
-#define wxStyledTextCtrl_SetUseHorizontalScrollBar 3116
-#define wxStyledTextCtrl_GetUseHorizontalScrollBar 3117
-#define wxStyledTextCtrl_SetIndentationGuides 3118
-#define wxStyledTextCtrl_GetIndentationGuides 3119
-#define wxStyledTextCtrl_SetHighlightGuide 3120
-#define wxStyledTextCtrl_GetHighlightGuide 3121
-#define wxStyledTextCtrl_GetLineEndPosition 3122
-#define wxStyledTextCtrl_GetCodePage 3123
-#define wxStyledTextCtrl_GetCaretForeground 3124
-#define wxStyledTextCtrl_GetReadOnly 3125
-#define wxStyledTextCtrl_SetCurrentPos 3126
-#define wxStyledTextCtrl_SetSelectionStart 3127
-#define wxStyledTextCtrl_GetSelectionStart 3128
-#define wxStyledTextCtrl_SetSelectionEnd 3129
-#define wxStyledTextCtrl_GetSelectionEnd 3130
-#define wxStyledTextCtrl_SetPrintMagnification 3131
-#define wxStyledTextCtrl_GetPrintMagnification 3132
-#define wxStyledTextCtrl_SetPrintColourMode 3133
-#define wxStyledTextCtrl_GetPrintColourMode 3134
-#define wxStyledTextCtrl_FindText 3135
-#define wxStyledTextCtrl_FormatRange 3136
-#define wxStyledTextCtrl_GetFirstVisibleLine 3137
-#define wxStyledTextCtrl_GetLine 3138
-#define wxStyledTextCtrl_GetLineCount 3139
-#define wxStyledTextCtrl_SetMarginLeft 3140
-#define wxStyledTextCtrl_GetMarginLeft 3141
-#define wxStyledTextCtrl_SetMarginRight 3142
-#define wxStyledTextCtrl_GetMarginRight 3143
-#define wxStyledTextCtrl_GetModify 3144
-#define wxStyledTextCtrl_SetSelection 3145
-#define wxStyledTextCtrl_GetSelectedText 3146
-#define wxStyledTextCtrl_GetTextRange 3147
-#define wxStyledTextCtrl_HideSelection 3148
-#define wxStyledTextCtrl_LineFromPosition 3149
-#define wxStyledTextCtrl_PositionFromLine 3150
-#define wxStyledTextCtrl_LineScroll 3151
-#define wxStyledTextCtrl_EnsureCaretVisible 3152
-#define wxStyledTextCtrl_ReplaceSelection 3153
-#define wxStyledTextCtrl_SetReadOnly 3154
-#define wxStyledTextCtrl_CanPaste 3155
-#define wxStyledTextCtrl_CanUndo 3156
-#define wxStyledTextCtrl_EmptyUndoBuffer 3157
-#define wxStyledTextCtrl_Undo 3158
-#define wxStyledTextCtrl_Cut 3159
-#define wxStyledTextCtrl_Copy 3160
-#define wxStyledTextCtrl_Paste 3161
-#define wxStyledTextCtrl_Clear 3162
-#define wxStyledTextCtrl_SetText 3163
-#define wxStyledTextCtrl_GetText 3164
-#define wxStyledTextCtrl_GetTextLength 3165
-#define wxStyledTextCtrl_GetOvertype 3166
-#define wxStyledTextCtrl_SetCaretWidth 3167
-#define wxStyledTextCtrl_GetCaretWidth 3168
-#define wxStyledTextCtrl_SetTargetStart 3169
-#define wxStyledTextCtrl_GetTargetStart 3170
-#define wxStyledTextCtrl_SetTargetEnd 3171
-#define wxStyledTextCtrl_GetTargetEnd 3172
-#define wxStyledTextCtrl_ReplaceTarget 3173
-#define wxStyledTextCtrl_SearchInTarget 3174
-#define wxStyledTextCtrl_SetSearchFlags 3175
-#define wxStyledTextCtrl_GetSearchFlags 3176
-#define wxStyledTextCtrl_CallTipShow 3177
-#define wxStyledTextCtrl_CallTipCancel 3178
-#define wxStyledTextCtrl_CallTipActive 3179
-#define wxStyledTextCtrl_CallTipPosAtStart 3180
-#define wxStyledTextCtrl_CallTipSetHighlight 3181
-#define wxStyledTextCtrl_CallTipSetBackground 3182
-#define wxStyledTextCtrl_CallTipSetForeground 3183
-#define wxStyledTextCtrl_CallTipSetForegroundHighlight 3184
-#define wxStyledTextCtrl_CallTipUseStyle 3185
-#define wxStyledTextCtrl_VisibleFromDocLine 3186
-#define wxStyledTextCtrl_DocLineFromVisible 3187
-#define wxStyledTextCtrl_WrapCount 3188
-#define wxStyledTextCtrl_SetFoldLevel 3189
-#define wxStyledTextCtrl_GetFoldLevel 3190
-#define wxStyledTextCtrl_GetLastChild 3191
-#define wxStyledTextCtrl_GetFoldParent 3192
-#define wxStyledTextCtrl_ShowLines 3193
-#define wxStyledTextCtrl_HideLines 3194
-#define wxStyledTextCtrl_GetLineVisible 3195
-#define wxStyledTextCtrl_SetFoldExpanded 3196
-#define wxStyledTextCtrl_GetFoldExpanded 3197
-#define wxStyledTextCtrl_ToggleFold 3198
-#define wxStyledTextCtrl_EnsureVisible 3199
-#define wxStyledTextCtrl_SetFoldFlags 3200
-#define wxStyledTextCtrl_EnsureVisibleEnforcePolicy 3201
-#define wxStyledTextCtrl_SetTabIndents 3202
-#define wxStyledTextCtrl_GetTabIndents 3203
-#define wxStyledTextCtrl_SetBackSpaceUnIndents 3204
-#define wxStyledTextCtrl_GetBackSpaceUnIndents 3205
-#define wxStyledTextCtrl_SetMouseDwellTime 3206
-#define wxStyledTextCtrl_GetMouseDwellTime 3207
-#define wxStyledTextCtrl_WordStartPosition 3208
-#define wxStyledTextCtrl_WordEndPosition 3209
-#define wxStyledTextCtrl_SetWrapMode 3210
-#define wxStyledTextCtrl_GetWrapMode 3211
-#define wxStyledTextCtrl_SetWrapVisualFlags 3212
-#define wxStyledTextCtrl_GetWrapVisualFlags 3213
-#define wxStyledTextCtrl_SetWrapVisualFlagsLocation 3214
-#define wxStyledTextCtrl_GetWrapVisualFlagsLocation 3215
-#define wxStyledTextCtrl_SetWrapStartIndent 3216
-#define wxStyledTextCtrl_GetWrapStartIndent 3217
-#define wxStyledTextCtrl_SetLayoutCache 3218
-#define wxStyledTextCtrl_GetLayoutCache 3219
-#define wxStyledTextCtrl_SetScrollWidth 3220
-#define wxStyledTextCtrl_GetScrollWidth 3221
-#define wxStyledTextCtrl_TextWidth 3222
-#define wxStyledTextCtrl_GetEndAtLastLine 3223
-#define wxStyledTextCtrl_TextHeight 3224
-#define wxStyledTextCtrl_SetUseVerticalScrollBar 3225
-#define wxStyledTextCtrl_GetUseVerticalScrollBar 3226
-#define wxStyledTextCtrl_AppendText 3227
-#define wxStyledTextCtrl_GetTwoPhaseDraw 3228
-#define wxStyledTextCtrl_SetTwoPhaseDraw 3229
-#define wxStyledTextCtrl_TargetFromSelection 3230
-#define wxStyledTextCtrl_LinesJoin 3231
-#define wxStyledTextCtrl_LinesSplit 3232
-#define wxStyledTextCtrl_SetFoldMarginColour 3233
-#define wxStyledTextCtrl_SetFoldMarginHiColour 3234
-#define wxStyledTextCtrl_LineDown 3235
-#define wxStyledTextCtrl_LineDownExtend 3236
-#define wxStyledTextCtrl_LineUp 3237
-#define wxStyledTextCtrl_LineUpExtend 3238
-#define wxStyledTextCtrl_CharLeft 3239
-#define wxStyledTextCtrl_CharLeftExtend 3240
-#define wxStyledTextCtrl_CharRight 3241
-#define wxStyledTextCtrl_CharRightExtend 3242
-#define wxStyledTextCtrl_WordLeft 3243
-#define wxStyledTextCtrl_WordLeftExtend 3244
-#define wxStyledTextCtrl_WordRight 3245
-#define wxStyledTextCtrl_WordRightExtend 3246
-#define wxStyledTextCtrl_Home 3247
-#define wxStyledTextCtrl_HomeExtend 3248
-#define wxStyledTextCtrl_LineEnd 3249
-#define wxStyledTextCtrl_LineEndExtend 3250
-#define wxStyledTextCtrl_DocumentStart 3251
-#define wxStyledTextCtrl_DocumentStartExtend 3252
-#define wxStyledTextCtrl_DocumentEnd 3253
-#define wxStyledTextCtrl_DocumentEndExtend 3254
-#define wxStyledTextCtrl_PageUp 3255
-#define wxStyledTextCtrl_PageUpExtend 3256
-#define wxStyledTextCtrl_PageDown 3257
-#define wxStyledTextCtrl_PageDownExtend 3258
-#define wxStyledTextCtrl_EditToggleOvertype 3259
-#define wxStyledTextCtrl_Cancel 3260
-#define wxStyledTextCtrl_DeleteBack 3261
-#define wxStyledTextCtrl_Tab 3262
-#define wxStyledTextCtrl_BackTab 3263
-#define wxStyledTextCtrl_NewLine 3264
-#define wxStyledTextCtrl_FormFeed 3265
-#define wxStyledTextCtrl_VCHome 3266
-#define wxStyledTextCtrl_VCHomeExtend 3267
-#define wxStyledTextCtrl_ZoomIn 3268
-#define wxStyledTextCtrl_ZoomOut 3269
-#define wxStyledTextCtrl_DelWordLeft 3270
-#define wxStyledTextCtrl_DelWordRight 3271
-#define wxStyledTextCtrl_LineCut 3272
-#define wxStyledTextCtrl_LineDelete 3273
-#define wxStyledTextCtrl_LineTranspose 3274
-#define wxStyledTextCtrl_LineDuplicate 3275
-#define wxStyledTextCtrl_LowerCase 3276
-#define wxStyledTextCtrl_UpperCase 3277
-#define wxStyledTextCtrl_LineScrollDown 3278
-#define wxStyledTextCtrl_LineScrollUp 3279
-#define wxStyledTextCtrl_DeleteBackNotLine 3280
-#define wxStyledTextCtrl_HomeDisplay 3281
-#define wxStyledTextCtrl_HomeDisplayExtend 3282
-#define wxStyledTextCtrl_LineEndDisplay 3283
-#define wxStyledTextCtrl_LineEndDisplayExtend 3284
-#define wxStyledTextCtrl_HomeWrapExtend 3285
-#define wxStyledTextCtrl_LineEndWrap 3286
-#define wxStyledTextCtrl_LineEndWrapExtend 3287
-#define wxStyledTextCtrl_VCHomeWrap 3288
-#define wxStyledTextCtrl_VCHomeWrapExtend 3289
-#define wxStyledTextCtrl_LineCopy 3290
-#define wxStyledTextCtrl_MoveCaretInsideView 3291
-#define wxStyledTextCtrl_LineLength 3292
-#define wxStyledTextCtrl_BraceHighlight 3293
-#define wxStyledTextCtrl_BraceBadLight 3294
-#define wxStyledTextCtrl_BraceMatch 3295
-#define wxStyledTextCtrl_GetViewEOL 3296
-#define wxStyledTextCtrl_SetViewEOL 3297
-#define wxStyledTextCtrl_SetModEventMask 3298
-#define wxStyledTextCtrl_GetEdgeColumn 3299
-#define wxStyledTextCtrl_SetEdgeColumn 3300
-#define wxStyledTextCtrl_SetEdgeMode 3301
-#define wxStyledTextCtrl_GetEdgeMode 3302
-#define wxStyledTextCtrl_GetEdgeColour 3303
-#define wxStyledTextCtrl_SetEdgeColour 3304
-#define wxStyledTextCtrl_SearchAnchor 3305
-#define wxStyledTextCtrl_SearchNext 3306
-#define wxStyledTextCtrl_SearchPrev 3307
-#define wxStyledTextCtrl_LinesOnScreen 3308
-#define wxStyledTextCtrl_UsePopUp 3309
-#define wxStyledTextCtrl_SelectionIsRectangle 3310
-#define wxStyledTextCtrl_SetZoom 3311
-#define wxStyledTextCtrl_GetZoom 3312
-#define wxStyledTextCtrl_GetModEventMask 3313
-#define wxStyledTextCtrl_SetSTCFocus 3314
-#define wxStyledTextCtrl_GetSTCFocus 3315
-#define wxStyledTextCtrl_SetStatus 3316
-#define wxStyledTextCtrl_GetStatus 3317
-#define wxStyledTextCtrl_SetMouseDownCaptures 3318
-#define wxStyledTextCtrl_GetMouseDownCaptures 3319
-#define wxStyledTextCtrl_SetSTCCursor 3320
-#define wxStyledTextCtrl_GetSTCCursor 3321
-#define wxStyledTextCtrl_SetControlCharSymbol 3322
-#define wxStyledTextCtrl_GetControlCharSymbol 3323
-#define wxStyledTextCtrl_WordPartLeft 3324
-#define wxStyledTextCtrl_WordPartLeftExtend 3325
-#define wxStyledTextCtrl_WordPartRight 3326
-#define wxStyledTextCtrl_WordPartRightExtend 3327
-#define wxStyledTextCtrl_SetVisiblePolicy 3328
-#define wxStyledTextCtrl_DelLineLeft 3329
-#define wxStyledTextCtrl_DelLineRight 3330
-#define wxStyledTextCtrl_GetXOffset 3331
-#define wxStyledTextCtrl_ChooseCaretX 3332
-#define wxStyledTextCtrl_SetXCaretPolicy 3333
-#define wxStyledTextCtrl_SetYCaretPolicy 3334
-#define wxStyledTextCtrl_GetPrintWrapMode 3335
-#define wxStyledTextCtrl_SetHotspotActiveForeground 3336
-#define wxStyledTextCtrl_SetHotspotActiveBackground 3337
-#define wxStyledTextCtrl_SetHotspotActiveUnderline 3338
-#define wxStyledTextCtrl_SetHotspotSingleLine 3339
-#define wxStyledTextCtrl_ParaDownExtend 3340
-#define wxStyledTextCtrl_ParaUp 3341
-#define wxStyledTextCtrl_ParaUpExtend 3342
-#define wxStyledTextCtrl_PositionBefore 3343
-#define wxStyledTextCtrl_PositionAfter 3344
-#define wxStyledTextCtrl_CopyRange 3345
-#define wxStyledTextCtrl_CopyText 3346
-#define wxStyledTextCtrl_SetSelectionMode 3347
-#define wxStyledTextCtrl_GetSelectionMode 3348
-#define wxStyledTextCtrl_LineDownRectExtend 3349
-#define wxStyledTextCtrl_LineUpRectExtend 3350
-#define wxStyledTextCtrl_CharLeftRectExtend 3351
-#define wxStyledTextCtrl_CharRightRectExtend 3352
-#define wxStyledTextCtrl_HomeRectExtend 3353
-#define wxStyledTextCtrl_VCHomeRectExtend 3354
-#define wxStyledTextCtrl_LineEndRectExtend 3355
-#define wxStyledTextCtrl_PageUpRectExtend 3356
-#define wxStyledTextCtrl_PageDownRectExtend 3357
-#define wxStyledTextCtrl_StutteredPageUp 3358
-#define wxStyledTextCtrl_StutteredPageUpExtend 3359
-#define wxStyledTextCtrl_StutteredPageDown 3360
-#define wxStyledTextCtrl_StutteredPageDownExtend 3361
-#define wxStyledTextCtrl_WordLeftEnd 3362
-#define wxStyledTextCtrl_WordLeftEndExtend 3363
-#define wxStyledTextCtrl_WordRightEnd 3364
-#define wxStyledTextCtrl_WordRightEndExtend 3365
-#define wxStyledTextCtrl_SetWhitespaceChars 3366
-#define wxStyledTextCtrl_SetCharsDefault 3367
-#define wxStyledTextCtrl_AutoCompGetCurrent 3368
-#define wxStyledTextCtrl_Allocate 3369
-#define wxStyledTextCtrl_FindColumn 3370
-#define wxStyledTextCtrl_GetCaretSticky 3371
-#define wxStyledTextCtrl_SetCaretSticky 3372
-#define wxStyledTextCtrl_ToggleCaretSticky 3373
-#define wxStyledTextCtrl_SetPasteConvertEndings 3374
-#define wxStyledTextCtrl_GetPasteConvertEndings 3375
-#define wxStyledTextCtrl_SelectionDuplicate 3376
-#define wxStyledTextCtrl_SetCaretLineBackAlpha 3377
-#define wxStyledTextCtrl_GetCaretLineBackAlpha 3378
-#define wxStyledTextCtrl_StartRecord 3379
-#define wxStyledTextCtrl_StopRecord 3380
-#define wxStyledTextCtrl_SetLexer 3381
-#define wxStyledTextCtrl_GetLexer 3382
-#define wxStyledTextCtrl_Colourise 3383
-#define wxStyledTextCtrl_SetProperty 3384
-#define wxStyledTextCtrl_SetKeyWords 3385
-#define wxStyledTextCtrl_SetLexerLanguage 3386
-#define wxStyledTextCtrl_GetProperty 3387
-#define wxStyledTextCtrl_GetStyleBitsNeeded 3388
-#define wxStyledTextCtrl_GetCurrentLine 3389
-#define wxStyledTextCtrl_StyleSetSpec 3390
-#define wxStyledTextCtrl_StyleSetFont 3391
-#define wxStyledTextCtrl_StyleSetFontAttr 3392
-#define wxStyledTextCtrl_StyleSetCharacterSet 3393
-#define wxStyledTextCtrl_StyleSetFontEncoding 3394
-#define wxStyledTextCtrl_CmdKeyExecute 3395
-#define wxStyledTextCtrl_SetMargins 3396
-#define wxStyledTextCtrl_GetSelection 3397
-#define wxStyledTextCtrl_PointFromPosition 3398
-#define wxStyledTextCtrl_ScrollToLine 3399
-#define wxStyledTextCtrl_ScrollToColumn 3400
-#define wxStyledTextCtrl_SetVScrollBar 3401
-#define wxStyledTextCtrl_SetHScrollBar 3402
-#define wxStyledTextCtrl_GetLastKeydownProcessed 3403
-#define wxStyledTextCtrl_SetLastKeydownProcessed 3404
-#define wxStyledTextCtrl_SaveFile 3405
-#define wxStyledTextCtrl_LoadFile 3406
-#define wxStyledTextCtrl_DoDragOver 3407
-#define wxStyledTextCtrl_DoDropText 3408
-#define wxStyledTextCtrl_GetUseAntiAliasing 3409
-#define wxStyledTextCtrl_AddTextRaw 3410
-#define wxStyledTextCtrl_InsertTextRaw 3411
-#define wxStyledTextCtrl_GetCurLineRaw 3412
-#define wxStyledTextCtrl_GetLineRaw 3413
-#define wxStyledTextCtrl_GetSelectedTextRaw 3414
-#define wxStyledTextCtrl_GetTextRangeRaw 3415
-#define wxStyledTextCtrl_SetTextRaw 3416
-#define wxStyledTextCtrl_GetTextRaw 3417
-#define wxStyledTextCtrl_AppendTextRaw 3418
-#define wxArtProvider_GetBitmap 3419
-#define wxArtProvider_GetIcon 3420
-#define wxTreeEvent_GetKeyCode 3421
-#define wxTreeEvent_GetItem 3422
-#define wxTreeEvent_GetKeyEvent 3423
-#define wxTreeEvent_GetLabel 3424
-#define wxTreeEvent_GetOldItem 3425
-#define wxTreeEvent_GetPoint 3426
-#define wxTreeEvent_IsEditCancelled 3427
-#define wxTreeEvent_SetToolTip 3428
-#define wxNotebookEvent_GetOldSelection 3429
-#define wxNotebookEvent_GetSelection 3430
-#define wxNotebookEvent_SetOldSelection 3431
-#define wxNotebookEvent_SetSelection 3432
-#define wxFileDataObject_new 3433
-#define wxFileDataObject_AddFile 3434
-#define wxFileDataObject_GetFilenames 3435
-#define wxFileDataObject_destroy 3436
-#define wxTextDataObject_new 3437
-#define wxTextDataObject_GetTextLength 3438
-#define wxTextDataObject_GetText 3439
-#define wxTextDataObject_SetText 3440
-#define wxTextDataObject_destroy 3441
-#define wxBitmapDataObject_new_1_1 3442
-#define wxBitmapDataObject_new_1_0 3443
-#define wxBitmapDataObject_GetBitmap 3444
-#define wxBitmapDataObject_SetBitmap 3445
-#define wxBitmapDataObject_destroy 3446
-#define wxClipboard_new 3448
-#define wxClipboard_destruct 3449
-#define wxClipboard_AddData 3450
-#define wxClipboard_Clear 3451
-#define wxClipboard_Close 3452
-#define wxClipboard_Flush 3453
-#define wxClipboard_GetData 3454
-#define wxClipboard_IsOpened 3455
-#define wxClipboard_Open 3456
-#define wxClipboard_SetData 3457
-#define wxClipboard_UsePrimarySelection 3459
-#define wxClipboard_IsSupported 3460
-#define wxClipboard_Get 3461
-#define wxSpinEvent_GetPosition 3462
-#define wxSpinEvent_SetPosition 3463
-#define wxSplitterWindow_new_0 3464
-#define wxSplitterWindow_new_2 3465
-#define wxSplitterWindow_destruct 3466
-#define wxSplitterWindow_Create 3467
-#define wxSplitterWindow_GetMinimumPaneSize 3468
-#define wxSplitterWindow_GetSashGravity 3469
-#define wxSplitterWindow_GetSashPosition 3470
-#define wxSplitterWindow_GetSplitMode 3471
-#define wxSplitterWindow_GetWindow1 3472
-#define wxSplitterWindow_GetWindow2 3473
-#define wxSplitterWindow_Initialize 3474
-#define wxSplitterWindow_IsSplit 3475
-#define wxSplitterWindow_ReplaceWindow 3476
-#define wxSplitterWindow_SetSashGravity 3477
-#define wxSplitterWindow_SetSashPosition 3478
-#define wxSplitterWindow_SetSashSize 3479
-#define wxSplitterWindow_SetMinimumPaneSize 3480
-#define wxSplitterWindow_SetSplitMode 3481
-#define wxSplitterWindow_SplitHorizontally 3482
-#define wxSplitterWindow_SplitVertically 3483
-#define wxSplitterWindow_Unsplit 3484
-#define wxSplitterWindow_UpdateSize 3485
-#define wxSplitterEvent_GetSashPosition 3486
-#define wxSplitterEvent_GetX 3487
-#define wxSplitterEvent_GetY 3488
-#define wxSplitterEvent_GetWindowBeingRemoved 3489
-#define wxSplitterEvent_SetSashPosition 3490
-#define wxHtmlWindow_new_0 3491
-#define wxHtmlWindow_new_2 3492
-#define wxHtmlWindow_AppendToPage 3493
-#define wxHtmlWindow_GetOpenedAnchor 3494
-#define wxHtmlWindow_GetOpenedPage 3495
-#define wxHtmlWindow_GetOpenedPageTitle 3496
-#define wxHtmlWindow_GetRelatedFrame 3497
-#define wxHtmlWindow_HistoryBack 3498
-#define wxHtmlWindow_HistoryCanBack 3499
-#define wxHtmlWindow_HistoryCanForward 3500
-#define wxHtmlWindow_HistoryClear 3501
-#define wxHtmlWindow_HistoryForward 3502
-#define wxHtmlWindow_LoadFile 3503
-#define wxHtmlWindow_LoadPage 3504
-#define wxHtmlWindow_SelectAll 3505
-#define wxHtmlWindow_SelectionToText 3506
-#define wxHtmlWindow_SelectLine 3507
-#define wxHtmlWindow_SelectWord 3508
-#define wxHtmlWindow_SetBorders 3509
-#define wxHtmlWindow_SetFonts 3510
-#define wxHtmlWindow_SetPage 3511
-#define wxHtmlWindow_SetRelatedFrame 3512
-#define wxHtmlWindow_SetRelatedStatusBar 3513
-#define wxHtmlWindow_ToText 3514
-#define wxHtmlWindow_destroy 3515
-#define wxHtmlLinkEvent_GetLinkInfo 3516
-#define wxSystemSettings_GetColour 3517
-#define wxSystemSettings_GetFont 3518
-#define wxSystemSettings_GetMetric 3519
-#define wxSystemSettings_GetScreenType 3520
-#define wxSystemOptions_GetOption 3521
-#define wxSystemOptions_GetOptionInt 3522
-#define wxSystemOptions_HasOption 3523
-#define wxSystemOptions_IsFalse 3524
-#define wxSystemOptions_SetOption_2_1 3525
-#define wxSystemOptions_SetOption_2_0 3526
-#define wxAuiNotebookEvent_SetSelection 3527
-#define wxAuiNotebookEvent_GetSelection 3528
-#define wxAuiNotebookEvent_SetOldSelection 3529
-#define wxAuiNotebookEvent_GetOldSelection 3530
-#define wxAuiNotebookEvent_SetDragSource 3531
-#define wxAuiNotebookEvent_GetDragSource 3532
-#define wxAuiManagerEvent_SetManager 3533
-#define wxAuiManagerEvent_GetManager 3534
-#define wxAuiManagerEvent_SetPane 3535
-#define wxAuiManagerEvent_GetPane 3536
-#define wxAuiManagerEvent_SetButton 3537
-#define wxAuiManagerEvent_GetButton 3538
-#define wxAuiManagerEvent_SetDC 3539
-#define wxAuiManagerEvent_GetDC 3540
-#define wxAuiManagerEvent_Veto 3541
-#define wxAuiManagerEvent_GetVeto 3542
-#define wxAuiManagerEvent_SetCanVeto 3543
-#define wxAuiManagerEvent_CanVeto 3544
-#define wxLogNull_new 3545
-#define wxLogNull_destroy 3546
-#define wxTaskBarIcon_new 3547
-#define wxTaskBarIcon_destruct 3548
-#define wxTaskBarIcon_PopupMenu 3549
-#define wxTaskBarIcon_RemoveIcon 3550
-#define wxTaskBarIcon_SetIcon 3551
-#define wxLocale_new_0 3552
-#define wxLocale_new_2 3554
-#define wxLocale_destruct 3555
-#define wxLocale_Init 3557
-#define wxLocale_AddCatalog_1 3558
-#define wxLocale_AddCatalog_3 3559
-#define wxLocale_AddCatalogLookupPathPrefix 3560
-#define wxLocale_GetCanonicalName 3561
-#define wxLocale_GetLanguage 3562
-#define wxLocale_GetLanguageName 3563
-#define wxLocale_GetLocale 3564
-#define wxLocale_GetName 3565
-#define wxLocale_GetString_2 3566
-#define wxLocale_GetString_4 3567
-#define wxLocale_GetHeaderValue 3568
-#define wxLocale_GetSysName 3569
-#define wxLocale_GetSystemEncoding 3570
-#define wxLocale_GetSystemEncodingName 3571
-#define wxLocale_GetSystemLanguage 3572
-#define wxLocale_IsLoaded 3573
-#define wxLocale_IsOk 3574
-#define wxActivateEvent_GetActive 3575
-#define wxPopupWindow_new_2 3577
-#define wxPopupWindow_new_0 3578
-#define wxPopupWindow_destruct 3580
-#define wxPopupWindow_Create 3581
-#define wxPopupWindow_Position 3582
-#define wxPopupTransientWindow_new_0 3583
-#define wxPopupTransientWindow_new_2 3584
-#define wxPopupTransientWindow_destruct 3585
-#define wxPopupTransientWindow_Popup 3586
-#define wxPopupTransientWindow_Dismiss 3587
-#define wxOverlay_new 3588
-#define wxOverlay_destruct 3589
-#define wxOverlay_Reset 3590
-#define wxDCOverlay_new_6 3591
-#define wxDCOverlay_new_2 3592
-#define wxDCOverlay_destruct 3593
-#define wxDCOverlay_Clear 3594
+#define wxWindow_SetTransparent 284
+#define wxWindow_CanSetTransparent 285
+#define wxWindow_IsDoubleBuffered 286
+#define wxWindow_SetDoubleBuffered 287
+#define wxTopLevelWindow_GetIcon 288
+#define wxTopLevelWindow_GetIcons 289
+#define wxTopLevelWindow_GetTitle 290
+#define wxTopLevelWindow_IsActive 291
+#define wxTopLevelWindow_Iconize 292
+#define wxTopLevelWindow_IsFullScreen 293
+#define wxTopLevelWindow_IsIconized 294
+#define wxTopLevelWindow_IsMaximized 295
+#define wxTopLevelWindow_Maximize 296
+#define wxTopLevelWindow_RequestUserAttention 297
+#define wxTopLevelWindow_SetIcon 298
+#define wxTopLevelWindow_SetIcons 299
+#define wxTopLevelWindow_CenterOnScreen 300
+#define wxTopLevelWindow_CentreOnScreen 301
+#define wxTopLevelWindow_SetShape 303
+#define wxTopLevelWindow_SetTitle 304
+#define wxTopLevelWindow_ShowFullScreen 305
+#define wxFrame_new_4 307
+#define wxFrame_new_0 308
+#define wxFrame_destruct 310
+#define wxFrame_Create 311
+#define wxFrame_CreateStatusBar 312
+#define wxFrame_CreateToolBar 313
+#define wxFrame_GetClientAreaOrigin 314
+#define wxFrame_GetMenuBar 315
+#define wxFrame_GetStatusBar 316
+#define wxFrame_GetStatusBarPane 317
+#define wxFrame_GetToolBar 318
+#define wxFrame_ProcessCommand 319
+#define wxFrame_SendSizeEvent 320
+#define wxFrame_SetMenuBar 321
+#define wxFrame_SetStatusBar 322
+#define wxFrame_SetStatusBarPane 323
+#define wxFrame_SetStatusText 324
+#define wxFrame_SetStatusWidths 325
+#define wxFrame_SetToolBar 326
+#define wxMiniFrame_new_0 327
+#define wxMiniFrame_new_4 328
+#define wxMiniFrame_Create 329
+#define wxMiniFrame_destroy 330
+#define wxSplashScreen_new_0 331
+#define wxSplashScreen_new_6 332
+#define wxSplashScreen_destruct 333
+#define wxSplashScreen_GetSplashStyle 334
+#define wxSplashScreen_GetTimeout 335
+#define wxPanel_new_0 336
+#define wxPanel_new_6 337
+#define wxPanel_new_2 338
+#define wxPanel_destruct 339
+#define wxPanel_InitDialog 340
+#define wxPanel_SetFocusIgnoringChildren 341
+#define wxScrolledWindow_new_0 342
+#define wxScrolledWindow_new_2 343
+#define wxScrolledWindow_destruct 344
+#define wxScrolledWindow_CalcScrolledPosition_4 345
+#define wxScrolledWindow_CalcScrolledPosition_1 346
+#define wxScrolledWindow_CalcUnscrolledPosition_4 347
+#define wxScrolledWindow_CalcUnscrolledPosition_1 348
+#define wxScrolledWindow_EnableScrolling 349
+#define wxScrolledWindow_GetScrollPixelsPerUnit 350
+#define wxScrolledWindow_GetViewStart 351
+#define wxScrolledWindow_DoPrepareDC 352
+#define wxScrolledWindow_PrepareDC 353
+#define wxScrolledWindow_Scroll 354
+#define wxScrolledWindow_SetScrollbars 355
+#define wxScrolledWindow_SetScrollRate 356
+#define wxScrolledWindow_SetTargetWindow 357
+#define wxSashWindow_new_0 358
+#define wxSashWindow_new_2 359
+#define wxSashWindow_destruct 360
+#define wxSashWindow_GetSashVisible 361
+#define wxSashWindow_GetMaximumSizeX 362
+#define wxSashWindow_GetMaximumSizeY 363
+#define wxSashWindow_GetMinimumSizeX 364
+#define wxSashWindow_GetMinimumSizeY 365
+#define wxSashWindow_SetMaximumSizeX 366
+#define wxSashWindow_SetMaximumSizeY 367
+#define wxSashWindow_SetMinimumSizeX 368
+#define wxSashWindow_SetMinimumSizeY 369
+#define wxSashWindow_SetSashVisible 370
+#define wxSashLayoutWindow_new_0 371
+#define wxSashLayoutWindow_new_2 372
+#define wxSashLayoutWindow_Create 373
+#define wxSashLayoutWindow_GetAlignment 374
+#define wxSashLayoutWindow_GetOrientation 375
+#define wxSashLayoutWindow_SetAlignment 376
+#define wxSashLayoutWindow_SetDefaultSize 377
+#define wxSashLayoutWindow_SetOrientation 378
+#define wxSashLayoutWindow_destroy 379
+#define wxGrid_new_0 380
+#define wxGrid_new_3 381
+#define wxGrid_new_4 382
+#define wxGrid_destruct 383
+#define wxGrid_AppendCols 384
+#define wxGrid_AppendRows 385
+#define wxGrid_AutoSize 386
+#define wxGrid_AutoSizeColumn 387
+#define wxGrid_AutoSizeColumns 388
+#define wxGrid_AutoSizeRow 389
+#define wxGrid_AutoSizeRows 390
+#define wxGrid_BeginBatch 391
+#define wxGrid_BlockToDeviceRect 392
+#define wxGrid_CanDragColSize 393
+#define wxGrid_CanDragRowSize 394
+#define wxGrid_CanDragGridSize 395
+#define wxGrid_CanEnableCellControl 396
+#define wxGrid_CellToRect_2 397
+#define wxGrid_CellToRect_1 398
+#define wxGrid_ClearGrid 399
+#define wxGrid_ClearSelection 400
+#define wxGrid_CreateGrid 401
+#define wxGrid_DeleteCols 402
+#define wxGrid_DeleteRows 403
+#define wxGrid_DisableCellEditControl 404
+#define wxGrid_DisableDragColSize 405
+#define wxGrid_DisableDragGridSize 406
+#define wxGrid_DisableDragRowSize 407
+#define wxGrid_EnableCellEditControl 408
+#define wxGrid_EnableDragColSize 409
+#define wxGrid_EnableDragGridSize 410
+#define wxGrid_EnableDragRowSize 411
+#define wxGrid_EnableEditing 412
+#define wxGrid_EnableGridLines 413
+#define wxGrid_EndBatch 414
+#define wxGrid_Fit 415
+#define wxGrid_ForceRefresh 416
+#define wxGrid_GetBatchCount 417
+#define wxGrid_GetCellAlignment 418
+#define wxGrid_GetCellBackgroundColour 419
+#define wxGrid_GetCellEditor 420
+#define wxGrid_GetCellFont 421
+#define wxGrid_GetCellRenderer 422
+#define wxGrid_GetCellTextColour 423
+#define wxGrid_GetCellValue_2 424
+#define wxGrid_GetCellValue_1 425
+#define wxGrid_GetColLabelAlignment 426
+#define wxGrid_GetColLabelSize 427
+#define wxGrid_GetColLabelValue 428
+#define wxGrid_GetColMinimalAcceptableWidth 429
+#define wxGrid_GetDefaultCellAlignment 430
+#define wxGrid_GetDefaultCellBackgroundColour 431
+#define wxGrid_GetDefaultCellFont 432
+#define wxGrid_GetDefaultCellTextColour 433
+#define wxGrid_GetDefaultColLabelSize 434
+#define wxGrid_GetDefaultColSize 435
+#define wxGrid_GetDefaultEditor 436
+#define wxGrid_GetDefaultEditorForCell_2 437
+#define wxGrid_GetDefaultEditorForCell_1 438
+#define wxGrid_GetDefaultEditorForType 439
+#define wxGrid_GetDefaultRenderer 440
+#define wxGrid_GetDefaultRendererForCell 441
+#define wxGrid_GetDefaultRendererForType 442
+#define wxGrid_GetDefaultRowLabelSize 443
+#define wxGrid_GetDefaultRowSize 444
+#define wxGrid_GetGridCursorCol 445
+#define wxGrid_GetGridCursorRow 446
+#define wxGrid_GetGridLineColour 447
+#define wxGrid_GridLinesEnabled 448
+#define wxGrid_GetLabelBackgroundColour 449
+#define wxGrid_GetLabelFont 450
+#define wxGrid_GetLabelTextColour 451
+#define wxGrid_GetNumberCols 452
+#define wxGrid_GetNumberRows 453
+#define wxGrid_GetOrCreateCellAttr 454
+#define wxGrid_GetRowMinimalAcceptableHeight 455
+#define wxGrid_GetRowLabelAlignment 456
+#define wxGrid_GetRowLabelSize 457
+#define wxGrid_GetRowLabelValue 458
+#define wxGrid_GetRowSize 459
+#define wxGrid_GetScrollLineX 460
+#define wxGrid_GetScrollLineY 461
+#define wxGrid_GetSelectedCells 462
+#define wxGrid_GetSelectedCols 463
+#define wxGrid_GetSelectedRows 464
+#define wxGrid_GetSelectionBackground 465
+#define wxGrid_GetSelectionBlockTopLeft 466
+#define wxGrid_GetSelectionBlockBottomRight 467
+#define wxGrid_GetSelectionForeground 468
+#define wxGrid_GetViewWidth 469
+#define wxGrid_GetGridWindow 470
+#define wxGrid_GetGridRowLabelWindow 471
+#define wxGrid_GetGridColLabelWindow 472
+#define wxGrid_GetGridCornerLabelWindow 473
+#define wxGrid_HideCellEditControl 474
+#define wxGrid_InsertCols 475
+#define wxGrid_InsertRows 476
+#define wxGrid_IsCellEditControlEnabled 477
+#define wxGrid_IsCurrentCellReadOnly 478
+#define wxGrid_IsEditable 479
+#define wxGrid_IsInSelection_2 480
+#define wxGrid_IsInSelection_1 481
+#define wxGrid_IsReadOnly 482
+#define wxGrid_IsSelection 483
+#define wxGrid_IsVisible_3 484
+#define wxGrid_IsVisible_2 485
+#define wxGrid_MakeCellVisible_2 486
+#define wxGrid_MakeCellVisible_1 487
+#define wxGrid_MoveCursorDown 488
+#define wxGrid_MoveCursorLeft 489
+#define wxGrid_MoveCursorRight 490
+#define wxGrid_MoveCursorUp 491
+#define wxGrid_MoveCursorDownBlock 492
+#define wxGrid_MoveCursorLeftBlock 493
+#define wxGrid_MoveCursorRightBlock 494
+#define wxGrid_MoveCursorUpBlock 495
+#define wxGrid_MovePageDown 496
+#define wxGrid_MovePageUp 497
+#define wxGrid_RegisterDataType 498
+#define wxGrid_SaveEditControlValue 499
+#define wxGrid_SelectAll 500
+#define wxGrid_SelectBlock_5 501
+#define wxGrid_SelectBlock_3 502
+#define wxGrid_SelectCol 503
+#define wxGrid_SelectRow 504
+#define wxGrid_SetCellAlignment_4 505
+#define wxGrid_SetCellAlignment_3 506
+#define wxGrid_SetCellAlignment_1 507
+#define wxGrid_SetCellBackgroundColour_3_0 508
+#define wxGrid_SetCellBackgroundColour_1 509
+#define wxGrid_SetCellBackgroundColour_3_1 510
+#define wxGrid_SetCellEditor 511
+#define wxGrid_SetCellFont 512
+#define wxGrid_SetCellRenderer 513
+#define wxGrid_SetCellTextColour_3_0 514
+#define wxGrid_SetCellTextColour_3_1 515
+#define wxGrid_SetCellTextColour_1 516
+#define wxGrid_SetCellValue_3_0 517
+#define wxGrid_SetCellValue_2 518
+#define wxGrid_SetCellValue_3_1 519
+#define wxGrid_SetColAttr 520
+#define wxGrid_SetColFormatBool 521
+#define wxGrid_SetColFormatNumber 522
+#define wxGrid_SetColFormatFloat 523
+#define wxGrid_SetColFormatCustom 524
+#define wxGrid_SetColLabelAlignment 525
+#define wxGrid_SetColLabelSize 526
+#define wxGrid_SetColLabelValue 527
+#define wxGrid_SetColMinimalWidth 528
+#define wxGrid_SetColMinimalAcceptableWidth 529
+#define wxGrid_SetColSize 530
+#define wxGrid_SetDefaultCellAlignment 531
+#define wxGrid_SetDefaultCellBackgroundColour 532
+#define wxGrid_SetDefaultCellFont 533
+#define wxGrid_SetDefaultCellTextColour 534
+#define wxGrid_SetDefaultEditor 535
+#define wxGrid_SetDefaultRenderer 536
+#define wxGrid_SetDefaultColSize 537
+#define wxGrid_SetDefaultRowSize 538
+#define wxGrid_SetGridCursor 539
+#define wxGrid_SetGridLineColour 540
+#define wxGrid_SetLabelBackgroundColour 541
+#define wxGrid_SetLabelFont 542
+#define wxGrid_SetLabelTextColour 543
+#define wxGrid_SetMargins 544
+#define wxGrid_SetReadOnly 545
+#define wxGrid_SetRowAttr 546
+#define wxGrid_SetRowLabelAlignment 547
+#define wxGrid_SetRowLabelSize 548
+#define wxGrid_SetRowLabelValue 549
+#define wxGrid_SetRowMinimalHeight 550
+#define wxGrid_SetRowMinimalAcceptableHeight 551
+#define wxGrid_SetRowSize 552
+#define wxGrid_SetScrollLineX 553
+#define wxGrid_SetScrollLineY 554
+#define wxGrid_SetSelectionBackground 555
+#define wxGrid_SetSelectionForeground 556
+#define wxGrid_SetSelectionMode 557
+#define wxGrid_ShowCellEditControl 558
+#define wxGrid_XToCol 559
+#define wxGrid_XToEdgeOfCol 560
+#define wxGrid_YToEdgeOfRow 561
+#define wxGrid_YToRow 562
+#define wxGridCellRenderer_Draw 563
+#define wxGridCellRenderer_GetBestSize 564
+#define wxGridCellEditor_Create 565
+#define wxGridCellEditor_IsCreated 566
+#define wxGridCellEditor_SetSize 567
+#define wxGridCellEditor_Show 568
+#define wxGridCellEditor_PaintBackground 569
+#define wxGridCellEditor_BeginEdit 570
+#define wxGridCellEditor_EndEdit 571
+#define wxGridCellEditor_Reset 572
+#define wxGridCellEditor_StartingKey 573
+#define wxGridCellEditor_StartingClick 574
+#define wxGridCellEditor_HandleReturn 575
+#define wxGridCellBoolRenderer_new 576
+#define wxGridCellBoolRenderer_destroy 577
+#define wxGridCellBoolEditor_new 578
+#define wxGridCellBoolEditor_IsTrueValue 579
+#define wxGridCellBoolEditor_UseStringValues 580
+#define wxGridCellBoolEditor_destroy 581
+#define wxGridCellFloatRenderer_new 582
+#define wxGridCellFloatRenderer_GetPrecision 583
+#define wxGridCellFloatRenderer_GetWidth 584
+#define wxGridCellFloatRenderer_SetParameters 585
+#define wxGridCellFloatRenderer_SetPrecision 586
+#define wxGridCellFloatRenderer_SetWidth 587
+#define wxGridCellFloatRenderer_destroy 588
+#define wxGridCellFloatEditor_new 589
+#define wxGridCellFloatEditor_SetParameters 590
+#define wxGridCellFloatEditor_destroy 591
+#define wxGridCellStringRenderer_new 592
+#define wxGridCellStringRenderer_destroy 593
+#define wxGridCellTextEditor_new 594
+#define wxGridCellTextEditor_SetParameters 595
+#define wxGridCellTextEditor_destroy 596
+#define wxGridCellChoiceEditor_new 598
+#define wxGridCellChoiceEditor_SetParameters 599
+#define wxGridCellChoiceEditor_destroy 600
+#define wxGridCellNumberRenderer_new 601
+#define wxGridCellNumberRenderer_destroy 602
+#define wxGridCellNumberEditor_new 603
+#define wxGridCellNumberEditor_GetValue 604
+#define wxGridCellNumberEditor_SetParameters 605
+#define wxGridCellNumberEditor_destroy 606
+#define wxGridCellAttr_SetTextColour 607
+#define wxGridCellAttr_SetBackgroundColour 608
+#define wxGridCellAttr_SetFont 609
+#define wxGridCellAttr_SetAlignment 610
+#define wxGridCellAttr_SetReadOnly 611
+#define wxGridCellAttr_SetRenderer 612
+#define wxGridCellAttr_SetEditor 613
+#define wxGridCellAttr_HasTextColour 614
+#define wxGridCellAttr_HasBackgroundColour 615
+#define wxGridCellAttr_HasFont 616
+#define wxGridCellAttr_HasAlignment 617
+#define wxGridCellAttr_HasRenderer 618
+#define wxGridCellAttr_HasEditor 619
+#define wxGridCellAttr_GetTextColour 620
+#define wxGridCellAttr_GetBackgroundColour 621
+#define wxGridCellAttr_GetFont 622
+#define wxGridCellAttr_GetAlignment 623
+#define wxGridCellAttr_GetRenderer 624
+#define wxGridCellAttr_GetEditor 625
+#define wxGridCellAttr_IsReadOnly 626
+#define wxGridCellAttr_SetDefAttr 627
+#define wxDC_Blit 628
+#define wxDC_CalcBoundingBox 629
+#define wxDC_Clear 630
+#define wxDC_ComputeScaleAndOrigin 631
+#define wxDC_CrossHair 632
+#define wxDC_DestroyClippingRegion 633
+#define wxDC_DeviceToLogicalX 634
+#define wxDC_DeviceToLogicalXRel 635
+#define wxDC_DeviceToLogicalY 636
+#define wxDC_DeviceToLogicalYRel 637
+#define wxDC_DrawArc 638
+#define wxDC_DrawBitmap 639
+#define wxDC_DrawCheckMark 640
+#define wxDC_DrawCircle 641
+#define wxDC_DrawEllipse_2 643
+#define wxDC_DrawEllipse_1 644
+#define wxDC_DrawEllipticArc 645
+#define wxDC_DrawIcon 646
+#define wxDC_DrawLabel 647
+#define wxDC_DrawLine 648
+#define wxDC_DrawLines 649
+#define wxDC_DrawPolygon 651
+#define wxDC_DrawPoint 653
+#define wxDC_DrawRectangle_2 655
+#define wxDC_DrawRectangle_1 656
+#define wxDC_DrawRotatedText 657
+#define wxDC_DrawRoundedRectangle_3 659
+#define wxDC_DrawRoundedRectangle_2 660
+#define wxDC_DrawText 661
+#define wxDC_EndDoc 662
+#define wxDC_EndPage 663
+#define wxDC_FloodFill 664
+#define wxDC_GetBackground 665
+#define wxDC_GetBackgroundMode 666
+#define wxDC_GetBrush 667
+#define wxDC_GetCharHeight 668
+#define wxDC_GetCharWidth 669
+#define wxDC_GetClippingBox 670
+#define wxDC_GetFont 672
+#define wxDC_GetLayoutDirection 673
+#define wxDC_GetLogicalFunction 674
+#define wxDC_GetMapMode 675
+#define wxDC_GetMultiLineTextExtent_4 676
+#define wxDC_GetMultiLineTextExtent_1 677
+#define wxDC_GetPartialTextExtents 678
+#define wxDC_GetPen 679
+#define wxDC_GetPixel 680
+#define wxDC_GetPPI 681
+#define wxDC_GetSize 683
+#define wxDC_GetSizeMM 685
+#define wxDC_GetTextBackground 686
+#define wxDC_GetTextExtent_4 687
+#define wxDC_GetTextExtent_1 688
+#define wxDC_GetTextForeground 690
+#define wxDC_GetUserScale 691
+#define wxDC_GradientFillConcentric_3 692
+#define wxDC_GradientFillConcentric_4 693
+#define wxDC_GradientFillLinear 694
+#define wxDC_LogicalToDeviceX 695
+#define wxDC_LogicalToDeviceXRel 696
+#define wxDC_LogicalToDeviceY 697
+#define wxDC_LogicalToDeviceYRel 698
+#define wxDC_MaxX 699
+#define wxDC_MaxY 700
+#define wxDC_MinX 701
+#define wxDC_MinY 702
+#define wxDC_IsOk 703
+#define wxDC_ResetBoundingBox 704
+#define wxDC_SetAxisOrientation 705
+#define wxDC_SetBackground 706
+#define wxDC_SetBackgroundMode 707
+#define wxDC_SetBrush 708
+#define wxDC_SetClippingRegion_2 710
+#define wxDC_SetClippingRegion_1_1 711
+#define wxDC_SetClippingRegion_1_0 712
+#define wxDC_SetDeviceOrigin 713
+#define wxDC_SetFont 714
+#define wxDC_SetLayoutDirection 715
+#define wxDC_SetLogicalFunction 716
+#define wxDC_SetMapMode 717
+#define wxDC_SetPalette 718
+#define wxDC_SetPen 719
+#define wxDC_SetTextBackground 720
+#define wxDC_SetTextForeground 721
+#define wxDC_SetUserScale 722
+#define wxDC_StartDoc 723
+#define wxDC_StartPage 724
+#define wxMirrorDC_new 725
+#define wxMirrorDC_destroy 726
+#define wxScreenDC_new 727
+#define wxScreenDC_destruct 728
+#define wxPostScriptDC_new_0 729
+#define wxPostScriptDC_new_1 730
+#define wxPostScriptDC_destruct 731
+#define wxPostScriptDC_SetResolution 732
+#define wxPostScriptDC_GetResolution 733
+#define wxWindowDC_new_0 734
+#define wxWindowDC_new_1 735
+#define wxWindowDC_destruct 736
+#define wxClientDC_new_0 737
+#define wxClientDC_new_1 738
+#define wxClientDC_destroy 739
+#define wxPaintDC_new_0 740
+#define wxPaintDC_new_1 741
+#define wxPaintDC_destroy 742
+#define wxMemoryDC_new_1_0 744
+#define wxMemoryDC_new_1_1 745
+#define wxMemoryDC_new_0 746
+#define wxMemoryDC_destruct 748
+#define wxMemoryDC_SelectObject 749
+#define wxMemoryDC_SelectObjectAsSource 750
+#define wxBufferedDC_new_0 751
+#define wxBufferedDC_new_2 752
+#define wxBufferedDC_new_3 753
+#define wxBufferedDC_destruct 754
+#define wxBufferedDC_Init_2 755
+#define wxBufferedDC_Init_3 756
+#define wxBufferedPaintDC_new_3 757
+#define wxBufferedPaintDC_new_2 758
+#define wxBufferedPaintDC_destruct 759
+#define wxGraphicsObject_destruct 760
+#define wxGraphicsObject_GetRenderer 761
+#define wxGraphicsObject_IsNull 762
+#define wxGraphicsContext_destruct 763
+#define wxGraphicsContext_Create_1_1 764
+#define wxGraphicsContext_Create_1_0 765
+#define wxGraphicsContext_Create_0 766
+#define wxGraphicsContext_CreatePen 767
+#define wxGraphicsContext_CreateBrush 768
+#define wxGraphicsContext_CreateRadialGradientBrush 769
+#define wxGraphicsContext_CreateLinearGradientBrush 770
+#define wxGraphicsContext_CreateFont 771
+#define wxGraphicsContext_CreateMatrix 772
+#define wxGraphicsContext_CreatePath 773
+#define wxGraphicsContext_Clip_1 774
+#define wxGraphicsContext_Clip_4 775
+#define wxGraphicsContext_ResetClip 776
+#define wxGraphicsContext_DrawBitmap 777
+#define wxGraphicsContext_DrawEllipse 778
+#define wxGraphicsContext_DrawIcon 779
+#define wxGraphicsContext_DrawLines 780
+#define wxGraphicsContext_DrawPath 781
+#define wxGraphicsContext_DrawRectangle 782
+#define wxGraphicsContext_DrawRoundedRectangle 783
+#define wxGraphicsContext_DrawText_3 784
+#define wxGraphicsContext_DrawText_4_0 785
+#define wxGraphicsContext_DrawText_4_1 786
+#define wxGraphicsContext_DrawText_5 787
+#define wxGraphicsContext_FillPath 788
+#define wxGraphicsContext_StrokePath 789
+#define wxGraphicsContext_GetPartialTextExtents 790
+#define wxGraphicsContext_GetTextExtent 791
+#define wxGraphicsContext_Rotate 792
+#define wxGraphicsContext_Scale 793
+#define wxGraphicsContext_Translate 794
+#define wxGraphicsContext_GetTransform 795
+#define wxGraphicsContext_SetTransform 796
+#define wxGraphicsContext_ConcatTransform 797
+#define wxGraphicsContext_SetBrush_1_1 798
+#define wxGraphicsContext_SetBrush_1_0 799
+#define wxGraphicsContext_SetFont_1 800
+#define wxGraphicsContext_SetFont_2 801
+#define wxGraphicsContext_SetPen_1_0 802
+#define wxGraphicsContext_SetPen_1_1 803
+#define wxGraphicsContext_StrokeLine 804
+#define wxGraphicsContext_StrokeLines 805
+#define wxGraphicsMatrix_Concat 807
+#define wxGraphicsMatrix_Get 809
+#define wxGraphicsMatrix_Invert 810
+#define wxGraphicsMatrix_IsEqual 811
+#define wxGraphicsMatrix_IsIdentity 813
+#define wxGraphicsMatrix_Rotate 814
+#define wxGraphicsMatrix_Scale 815
+#define wxGraphicsMatrix_Translate 816
+#define wxGraphicsMatrix_Set 817
+#define wxGraphicsMatrix_TransformPoint 818
+#define wxGraphicsMatrix_TransformDistance 819
+#define wxGraphicsPath_MoveToPoint_2 820
+#define wxGraphicsPath_MoveToPoint_1 821
+#define wxGraphicsPath_AddArc_6 822
+#define wxGraphicsPath_AddArc_5 823
+#define wxGraphicsPath_AddArcToPoint 824
+#define wxGraphicsPath_AddCircle 825
+#define wxGraphicsPath_AddCurveToPoint_6 826
+#define wxGraphicsPath_AddCurveToPoint_3 827
+#define wxGraphicsPath_AddEllipse 828
+#define wxGraphicsPath_AddLineToPoint_2 829
+#define wxGraphicsPath_AddLineToPoint_1 830
+#define wxGraphicsPath_AddPath 831
+#define wxGraphicsPath_AddQuadCurveToPoint 832
+#define wxGraphicsPath_AddRectangle 833
+#define wxGraphicsPath_AddRoundedRectangle 834
+#define wxGraphicsPath_CloseSubpath 835
+#define wxGraphicsPath_Contains_3 836
+#define wxGraphicsPath_Contains_2 837
+#define wxGraphicsPath_GetBox 839
+#define wxGraphicsPath_GetCurrentPoint 841
+#define wxGraphicsPath_Transform 842
+#define wxGraphicsRenderer_GetDefaultRenderer 843
+#define wxGraphicsRenderer_CreateContext_1_1 844
+#define wxGraphicsRenderer_CreateContext_1_0 845
+#define wxGraphicsRenderer_CreatePen 846
+#define wxGraphicsRenderer_CreateBrush 847
+#define wxGraphicsRenderer_CreateLinearGradientBrush 848
+#define wxGraphicsRenderer_CreateRadialGradientBrush 849
+#define wxGraphicsRenderer_CreateFont 850
+#define wxGraphicsRenderer_CreateMatrix 851
+#define wxGraphicsRenderer_CreatePath 852
+#define wxMenuBar_new_1 854
+#define wxMenuBar_new_0 856
+#define wxMenuBar_destruct 858
+#define wxMenuBar_Append 859
+#define wxMenuBar_Check 860
+#define wxMenuBar_Enable_2 861
+#define wxMenuBar_Enable_1 862
+#define wxMenuBar_EnableTop 863
+#define wxMenuBar_FindMenu 864
+#define wxMenuBar_FindMenuItem 865
+#define wxMenuBar_FindItem 866
+#define wxMenuBar_GetHelpString 867
+#define wxMenuBar_GetLabel_1 868
+#define wxMenuBar_GetLabel_0 869
+#define wxMenuBar_GetLabelTop 870
+#define wxMenuBar_GetMenu 871
+#define wxMenuBar_GetMenuCount 872
+#define wxMenuBar_Insert 873
+#define wxMenuBar_IsChecked 874
+#define wxMenuBar_IsEnabled_1 875
+#define wxMenuBar_IsEnabled_0 876
+#define wxMenuBar_Remove 877
+#define wxMenuBar_Replace 878
+#define wxMenuBar_SetHelpString 879
+#define wxMenuBar_SetLabel_2 880
+#define wxMenuBar_SetLabel_1 881
+#define wxMenuBar_SetLabelTop 882
+#define wxControl_GetLabel 883
+#define wxControl_SetLabel 884
+#define wxControlWithItems_Append_1 885
+#define wxControlWithItems_Append_2 886
+#define wxControlWithItems_appendStrings_1 887
+#define wxControlWithItems_Clear 888
+#define wxControlWithItems_Delete 889
+#define wxControlWithItems_FindString 890
+#define wxControlWithItems_getClientData 891
+#define wxControlWithItems_setClientData 892
+#define wxControlWithItems_GetCount 893
+#define wxControlWithItems_GetSelection 894
+#define wxControlWithItems_GetString 895
+#define wxControlWithItems_GetStringSelection 896
+#define wxControlWithItems_Insert_2 897
+#define wxControlWithItems_Insert_3 898
+#define wxControlWithItems_IsEmpty 899
+#define wxControlWithItems_Select 900
+#define wxControlWithItems_SetSelection 901
+#define wxControlWithItems_SetString 902
+#define wxControlWithItems_SetStringSelection 903
+#define wxMenu_new_2 906
+#define wxMenu_new_1 907
+#define wxMenu_destruct 909
+#define wxMenu_Append_3 910
+#define wxMenu_Append_1 911
+#define wxMenu_Append_4_0 912
+#define wxMenu_Append_4_1 913
+#define wxMenu_AppendCheckItem 914
+#define wxMenu_AppendRadioItem 915
+#define wxMenu_AppendSeparator 916
+#define wxMenu_Break 917
+#define wxMenu_Check 918
+#define wxMenu_Delete_1_0 919
+#define wxMenu_Delete_1_1 920
+#define wxMenu_Destroy_1_0 921
+#define wxMenu_Destroy_1_1 922
+#define wxMenu_Enable 923
+#define wxMenu_FindItem_1 924
+#define wxMenu_FindItem_2 925
+#define wxMenu_FindItemByPosition 926
+#define wxMenu_GetHelpString 927
+#define wxMenu_GetLabel 928
+#define wxMenu_GetMenuItemCount 929
+#define wxMenu_GetMenuItems 930
+#define wxMenu_GetTitle 932
+#define wxMenu_Insert_2 933
+#define wxMenu_Insert_3 934
+#define wxMenu_Insert_5_1 935
+#define wxMenu_Insert_5_0 936
+#define wxMenu_InsertCheckItem 937
+#define wxMenu_InsertRadioItem 938
+#define wxMenu_InsertSeparator 939
+#define wxMenu_IsChecked 940
+#define wxMenu_IsEnabled 941
+#define wxMenu_Prepend_1 942
+#define wxMenu_Prepend_2 943
+#define wxMenu_Prepend_4_1 944
+#define wxMenu_Prepend_4_0 945
+#define wxMenu_PrependCheckItem 946
+#define wxMenu_PrependRadioItem 947
+#define wxMenu_PrependSeparator 948
+#define wxMenu_Remove_1_0 949
+#define wxMenu_Remove_1_1 950
+#define wxMenu_SetHelpString 951
+#define wxMenu_SetLabel 952
+#define wxMenu_SetTitle 953
+#define wxMenuItem_new 954
+#define wxMenuItem_destruct 956
+#define wxMenuItem_Check 957
+#define wxMenuItem_Enable 958
+#define wxMenuItem_GetBitmap 959
+#define wxMenuItem_GetHelp 960
+#define wxMenuItem_GetId 961
+#define wxMenuItem_GetKind 962
+#define wxMenuItem_GetLabel 963
+#define wxMenuItem_GetLabelFromText 964
+#define wxMenuItem_GetMenu 965
+#define wxMenuItem_GetText 966
+#define wxMenuItem_GetSubMenu 967
+#define wxMenuItem_IsCheckable 968
+#define wxMenuItem_IsChecked 969
+#define wxMenuItem_IsEnabled 970
+#define wxMenuItem_IsSeparator 971
+#define wxMenuItem_IsSubMenu 972
+#define wxMenuItem_SetBitmap 973
+#define wxMenuItem_SetHelp 974
+#define wxMenuItem_SetMenu 975
+#define wxMenuItem_SetSubMenu 976
+#define wxMenuItem_SetText 977
+#define wxToolBar_AddControl 978
+#define wxToolBar_AddSeparator 979
+#define wxToolBar_AddTool_5 980
+#define wxToolBar_AddTool_4_0 981
+#define wxToolBar_AddTool_1 982
+#define wxToolBar_AddTool_4_1 983
+#define wxToolBar_AddTool_3 984
+#define wxToolBar_AddTool_6 985
+#define wxToolBar_AddCheckTool 986
+#define wxToolBar_AddRadioTool 987
+#define wxToolBar_AddStretchableSpace 988
+#define wxToolBar_InsertStretchableSpace 989
+#define wxToolBar_DeleteTool 990
+#define wxToolBar_DeleteToolByPos 991
+#define wxToolBar_EnableTool 992
+#define wxToolBar_FindById 993
+#define wxToolBar_FindControl 994
+#define wxToolBar_FindToolForPosition 995
+#define wxToolBar_GetToolSize 996
+#define wxToolBar_GetToolBitmapSize 997
+#define wxToolBar_GetMargins 998
+#define wxToolBar_GetToolEnabled 999
+#define wxToolBar_GetToolLongHelp 1000
+#define wxToolBar_GetToolPacking 1001
+#define wxToolBar_GetToolPos 1002
+#define wxToolBar_GetToolSeparation 1003
+#define wxToolBar_GetToolShortHelp 1004
+#define wxToolBar_GetToolState 1005
+#define wxToolBar_InsertControl 1006
+#define wxToolBar_InsertSeparator 1007
+#define wxToolBar_InsertTool_5 1008
+#define wxToolBar_InsertTool_2 1009
+#define wxToolBar_InsertTool_4 1010
+#define wxToolBar_Realize 1011
+#define wxToolBar_RemoveTool 1012
+#define wxToolBar_SetMargins 1013
+#define wxToolBar_SetToolBitmapSize 1014
+#define wxToolBar_SetToolLongHelp 1015
+#define wxToolBar_SetToolPacking 1016
+#define wxToolBar_SetToolShortHelp 1017
+#define wxToolBar_SetToolSeparation 1018
+#define wxToolBar_ToggleTool 1019
+#define wxStatusBar_new_0 1021
+#define wxStatusBar_new_2 1022
+#define wxStatusBar_destruct 1024
+#define wxStatusBar_Create 1025
+#define wxStatusBar_GetFieldRect 1026
+#define wxStatusBar_GetFieldsCount 1027
+#define wxStatusBar_GetStatusText 1028
+#define wxStatusBar_PopStatusText 1029
+#define wxStatusBar_PushStatusText 1030
+#define wxStatusBar_SetFieldsCount 1031
+#define wxStatusBar_SetMinHeight 1032
+#define wxStatusBar_SetStatusText 1033
+#define wxStatusBar_SetStatusWidths 1034
+#define wxStatusBar_SetStatusStyles 1035
+#define wxBitmap_new_0 1036
+#define wxBitmap_new_3 1037
+#define wxBitmap_new_4 1038
+#define wxBitmap_new_2_0 1039
+#define wxBitmap_new_2_1 1040
+#define wxBitmap_destruct 1041
+#define wxBitmap_ConvertToImage 1042
+#define wxBitmap_CopyFromIcon 1043
+#define wxBitmap_Create 1044
+#define wxBitmap_GetDepth 1045
+#define wxBitmap_GetHeight 1046
+#define wxBitmap_GetPalette 1047
+#define wxBitmap_GetMask 1048
+#define wxBitmap_GetWidth 1049
+#define wxBitmap_GetSubBitmap 1050
+#define wxBitmap_LoadFile 1051
+#define wxBitmap_Ok 1052
+#define wxBitmap_SaveFile 1053
+#define wxBitmap_SetDepth 1054
+#define wxBitmap_SetHeight 1055
+#define wxBitmap_SetMask 1056
+#define wxBitmap_SetPalette 1057
+#define wxBitmap_SetWidth 1058
+#define wxIcon_new_0 1059
+#define wxIcon_new_2 1060
+#define wxIcon_new_1 1061
+#define wxIcon_CopyFromBitmap 1062
+#define wxIcon_destroy 1063
+#define wxIconBundle_new_0 1064
+#define wxIconBundle_new_2 1065
+#define wxIconBundle_new_1_0 1066
+#define wxIconBundle_new_1_1 1067
+#define wxIconBundle_destruct 1068
+#define wxIconBundle_AddIcon_2 1069
+#define wxIconBundle_AddIcon_1 1070
+#define wxIconBundle_GetIcon_1_1 1071
+#define wxIconBundle_GetIcon_1_0 1072
+#define wxCursor_new_0 1073
+#define wxCursor_new_1_0 1074
+#define wxCursor_new_1_1 1075
+#define wxCursor_new_4 1076
+#define wxCursor_destruct 1077
+#define wxCursor_Ok 1078
+#define wxMask_new_0 1079
+#define wxMask_new_2_1 1080
+#define wxMask_new_2_0 1081
+#define wxMask_new_1 1082
+#define wxMask_destruct 1083
+#define wxMask_Create_2_1 1084
+#define wxMask_Create_2_0 1085
+#define wxMask_Create_1 1086
+#define wxImage_new_0 1087
+#define wxImage_new_3_0 1088
+#define wxImage_new_4 1089
+#define wxImage_new_5 1090
+#define wxImage_new_2 1091
+#define wxImage_new_3_1 1092
+#define wxImage_Blur 1093
+#define wxImage_BlurHorizontal 1094
+#define wxImage_BlurVertical 1095
+#define wxImage_ConvertAlphaToMask 1096
+#define wxImage_ConvertToGreyscale 1097
+#define wxImage_ConvertToMono 1098
+#define wxImage_Copy 1099
+#define wxImage_Create_3 1100
+#define wxImage_Create_4 1101
+#define wxImage_Create_5 1102
+#define wxImage_Destroy 1103
+#define wxImage_FindFirstUnusedColour 1104
+#define wxImage_GetImageExtWildcard 1105
+#define wxImage_GetAlpha_2 1106
+#define wxImage_GetAlpha_0 1107
+#define wxImage_GetBlue 1108
+#define wxImage_GetData 1109
+#define wxImage_GetGreen 1110
+#define wxImage_GetImageCount 1111
+#define wxImage_GetHeight 1112
+#define wxImage_GetMaskBlue 1113
+#define wxImage_GetMaskGreen 1114
+#define wxImage_GetMaskRed 1115
+#define wxImage_GetOrFindMaskColour 1116
+#define wxImage_GetPalette 1117
+#define wxImage_GetRed 1118
+#define wxImage_GetSubImage 1119
+#define wxImage_GetWidth 1120
+#define wxImage_HasAlpha 1121
+#define wxImage_HasMask 1122
+#define wxImage_GetOption 1123
+#define wxImage_GetOptionInt 1124
+#define wxImage_HasOption 1125
+#define wxImage_InitAlpha 1126
+#define wxImage_InitStandardHandlers 1127
+#define wxImage_IsTransparent 1128
+#define wxImage_LoadFile_2 1129
+#define wxImage_LoadFile_3 1130
+#define wxImage_Ok 1131
+#define wxImage_RemoveHandler 1132
+#define wxImage_Mirror 1133
+#define wxImage_Replace 1134
+#define wxImage_Rescale 1135
+#define wxImage_Resize 1136
+#define wxImage_Rotate 1137
+#define wxImage_RotateHue 1138
+#define wxImage_Rotate90 1139
+#define wxImage_SaveFile_1 1140
+#define wxImage_SaveFile_2_0 1141
+#define wxImage_SaveFile_2_1 1142
+#define wxImage_Scale 1143
+#define wxImage_Size 1144
+#define wxImage_SetAlpha_3 1145
+#define wxImage_SetAlpha_2 1146
+#define wxImage_SetData_2 1147
+#define wxImage_SetData_4 1148
+#define wxImage_SetMask 1149
+#define wxImage_SetMaskColour 1150
+#define wxImage_SetMaskFromImage 1151
+#define wxImage_SetOption_2_1 1152
+#define wxImage_SetOption_2_0 1153
+#define wxImage_SetPalette 1154
+#define wxImage_SetRGB_5 1155
+#define wxImage_SetRGB_4 1156
+#define wxImage_destroy 1157
+#define wxBrush_new_0 1158
+#define wxBrush_new_2 1159
+#define wxBrush_new_1 1160
+#define wxBrush_destruct 1162
+#define wxBrush_GetColour 1163
+#define wxBrush_GetStipple 1164
+#define wxBrush_GetStyle 1165
+#define wxBrush_IsHatch 1166
+#define wxBrush_IsOk 1167
+#define wxBrush_SetColour_1 1168
+#define wxBrush_SetColour_3 1169
+#define wxBrush_SetStipple 1170
+#define wxBrush_SetStyle 1171
+#define wxPen_new_0 1172
+#define wxPen_new_2 1173
+#define wxPen_destruct 1174
+#define wxPen_GetCap 1175
+#define wxPen_GetColour 1176
+#define wxPen_GetJoin 1177
+#define wxPen_GetStyle 1178
+#define wxPen_GetWidth 1179
+#define wxPen_IsOk 1180
+#define wxPen_SetCap 1181
+#define wxPen_SetColour_1 1182
+#define wxPen_SetColour_3 1183
+#define wxPen_SetJoin 1184
+#define wxPen_SetStyle 1185
+#define wxPen_SetWidth 1186
+#define wxRegion_new_0 1187
+#define wxRegion_new_4 1188
+#define wxRegion_new_2 1189
+#define wxRegion_new_1_1 1190
+#define wxRegion_new_1_0 1192
+#define wxRegion_destruct 1194
+#define wxRegion_Clear 1195
+#define wxRegion_Contains_2 1196
+#define wxRegion_Contains_1_0 1197
+#define wxRegion_Contains_4 1198
+#define wxRegion_Contains_1_1 1199
+#define wxRegion_ConvertToBitmap 1200
+#define wxRegion_GetBox 1201
+#define wxRegion_Intersect_4 1202
+#define wxRegion_Intersect_1_1 1203
+#define wxRegion_Intersect_1_0 1204
+#define wxRegion_IsEmpty 1205
+#define wxRegion_Subtract_4 1206
+#define wxRegion_Subtract_1_1 1207
+#define wxRegion_Subtract_1_0 1208
+#define wxRegion_Offset_2 1209
+#define wxRegion_Offset_1 1210
+#define wxRegion_Union_4 1211
+#define wxRegion_Union_1_2 1212
+#define wxRegion_Union_1_1 1213
+#define wxRegion_Union_1_0 1214
+#define wxRegion_Union_3 1215
+#define wxRegion_Xor_4 1216
+#define wxRegion_Xor_1_1 1217
+#define wxRegion_Xor_1_0 1218
+#define wxAcceleratorTable_new_0 1219
+#define wxAcceleratorTable_new_2 1220
+#define wxAcceleratorTable_destruct 1221
+#define wxAcceleratorTable_Ok 1222
+#define wxAcceleratorEntry_new_1_0 1223
+#define wxAcceleratorEntry_new_1_1 1224
+#define wxAcceleratorEntry_GetCommand 1225
+#define wxAcceleratorEntry_GetFlags 1226
+#define wxAcceleratorEntry_GetKeyCode 1227
+#define wxAcceleratorEntry_Set 1228
+#define wxAcceleratorEntry_destroy 1229
+#define wxCaret_new_3 1234
+#define wxCaret_new_2 1235
+#define wxCaret_destruct 1237
+#define wxCaret_Create_3 1238
+#define wxCaret_Create_2 1239
+#define wxCaret_GetBlinkTime 1240
+#define wxCaret_GetPosition 1242
+#define wxCaret_GetSize 1244
+#define wxCaret_GetWindow 1245
+#define wxCaret_Hide 1246
+#define wxCaret_IsOk 1247
+#define wxCaret_IsVisible 1248
+#define wxCaret_Move_2 1249
+#define wxCaret_Move_1 1250
+#define wxCaret_SetBlinkTime 1251
+#define wxCaret_SetSize_2 1252
+#define wxCaret_SetSize_1 1253
+#define wxCaret_Show 1254
+#define wxSizer_Add_2_1 1255
+#define wxSizer_Add_2_0 1256
+#define wxSizer_Add_3 1257
+#define wxSizer_Add_2_3 1258
+#define wxSizer_Add_2_2 1259
+#define wxSizer_AddSpacer 1260
+#define wxSizer_AddStretchSpacer 1261
+#define wxSizer_CalcMin 1262
+#define wxSizer_Clear 1263
+#define wxSizer_Detach_1_2 1264
+#define wxSizer_Detach_1_1 1265
+#define wxSizer_Detach_1_0 1266
+#define wxSizer_Fit 1267
+#define wxSizer_FitInside 1268
+#define wxSizer_GetChildren 1269
+#define wxSizer_GetItem_2_1 1270
+#define wxSizer_GetItem_2_0 1271
+#define wxSizer_GetItem_1 1272
+#define wxSizer_GetSize 1273
+#define wxSizer_GetPosition 1274
+#define wxSizer_GetMinSize 1275
+#define wxSizer_Hide_2_0 1276
+#define wxSizer_Hide_2_1 1277
+#define wxSizer_Hide_1 1278
+#define wxSizer_Insert_3_1 1279
+#define wxSizer_Insert_3_0 1280
+#define wxSizer_Insert_4 1281
+#define wxSizer_Insert_3_3 1282
+#define wxSizer_Insert_3_2 1283
+#define wxSizer_Insert_2 1284
+#define wxSizer_InsertSpacer 1285
+#define wxSizer_InsertStretchSpacer 1286
+#define wxSizer_IsShown_1_2 1287
+#define wxSizer_IsShown_1_1 1288
+#define wxSizer_IsShown_1_0 1289
+#define wxSizer_Layout 1290
+#define wxSizer_Prepend_2_1 1291
+#define wxSizer_Prepend_2_0 1292
+#define wxSizer_Prepend_3 1293
+#define wxSizer_Prepend_2_3 1294
+#define wxSizer_Prepend_2_2 1295
+#define wxSizer_Prepend_1 1296
+#define wxSizer_PrependSpacer 1297
+#define wxSizer_PrependStretchSpacer 1298
+#define wxSizer_RecalcSizes 1299
+#define wxSizer_Remove_1_1 1300
+#define wxSizer_Remove_1_0 1301
+#define wxSizer_Replace_3_1 1302
+#define wxSizer_Replace_3_0 1303
+#define wxSizer_Replace_2 1304
+#define wxSizer_SetDimension 1305
+#define wxSizer_SetMinSize_2 1306
+#define wxSizer_SetMinSize_1 1307
+#define wxSizer_SetItemMinSize_3_2 1308
+#define wxSizer_SetItemMinSize_2_2 1309
+#define wxSizer_SetItemMinSize_3_1 1310
+#define wxSizer_SetItemMinSize_2_1 1311
+#define wxSizer_SetItemMinSize_3_0 1312
+#define wxSizer_SetItemMinSize_2_0 1313
+#define wxSizer_SetSizeHints 1314
+#define wxSizer_SetVirtualSizeHints 1315
+#define wxSizer_Show_2_2 1316
+#define wxSizer_Show_2_1 1317
+#define wxSizer_Show_2_0 1318
+#define wxSizer_Show_1 1319
+#define wxSizerFlags_new 1320
+#define wxSizerFlags_Align 1321
+#define wxSizerFlags_Border_2 1322
+#define wxSizerFlags_Border_1 1323
+#define wxSizerFlags_Center 1324
+#define wxSizerFlags_Centre 1325
+#define wxSizerFlags_Expand 1326
+#define wxSizerFlags_Left 1327
+#define wxSizerFlags_Proportion 1328
+#define wxSizerFlags_Right 1329
+#define wxSizerFlags_destroy 1330
+#define wxSizerItem_new_5_1 1331
+#define wxSizerItem_new_2_1 1332
+#define wxSizerItem_new_5_0 1333
+#define wxSizerItem_new_2_0 1334
+#define wxSizerItem_new_6 1335
+#define wxSizerItem_new_3 1336
+#define wxSizerItem_new_0 1337
+#define wxSizerItem_destruct 1338
+#define wxSizerItem_CalcMin 1339
+#define wxSizerItem_DeleteWindows 1340
+#define wxSizerItem_DetachSizer 1341
+#define wxSizerItem_GetBorder 1342
+#define wxSizerItem_GetFlag 1343
+#define wxSizerItem_GetMinSize 1344
+#define wxSizerItem_GetPosition 1345
+#define wxSizerItem_GetProportion 1346
+#define wxSizerItem_GetRatio 1347
+#define wxSizerItem_GetRect 1348
+#define wxSizerItem_GetSize 1349
+#define wxSizerItem_GetSizer 1350
+#define wxSizerItem_GetSpacer 1351
+#define wxSizerItem_GetUserData 1352
+#define wxSizerItem_GetWindow 1353
+#define wxSizerItem_IsSizer 1354
+#define wxSizerItem_IsShown 1355
+#define wxSizerItem_IsSpacer 1356
+#define wxSizerItem_IsWindow 1357
+#define wxSizerItem_SetBorder 1358
+#define wxSizerItem_SetDimension 1359
+#define wxSizerItem_SetFlag 1360
+#define wxSizerItem_SetInitSize 1361
+#define wxSizerItem_SetMinSize_1 1362
+#define wxSizerItem_SetMinSize_2 1363
+#define wxSizerItem_SetProportion 1364
+#define wxSizerItem_SetRatio_2 1365
+#define wxSizerItem_SetRatio_1_1 1366
+#define wxSizerItem_SetRatio_1_0 1367
+#define wxSizerItem_SetSizer 1368
+#define wxSizerItem_SetSpacer_1 1369
+#define wxSizerItem_SetSpacer_2 1370
+#define wxSizerItem_SetWindow 1371
+#define wxSizerItem_Show 1372
+#define wxBoxSizer_new 1373
+#define wxBoxSizer_GetOrientation 1374
+#define wxBoxSizer_destroy 1375
+#define wxStaticBoxSizer_new_2 1376
+#define wxStaticBoxSizer_new_3 1377
+#define wxStaticBoxSizer_GetStaticBox 1378
+#define wxStaticBoxSizer_destroy 1379
+#define wxGridSizer_new_4 1380
+#define wxGridSizer_new_2 1381
+#define wxGridSizer_GetCols 1382
+#define wxGridSizer_GetHGap 1383
+#define wxGridSizer_GetRows 1384
+#define wxGridSizer_GetVGap 1385
+#define wxGridSizer_SetCols 1386
+#define wxGridSizer_SetHGap 1387
+#define wxGridSizer_SetRows 1388
+#define wxGridSizer_SetVGap 1389
+#define wxGridSizer_destroy 1390
+#define wxFlexGridSizer_new_4 1391
+#define wxFlexGridSizer_new_2 1392
+#define wxFlexGridSizer_AddGrowableCol 1393
+#define wxFlexGridSizer_AddGrowableRow 1394
+#define wxFlexGridSizer_GetFlexibleDirection 1395
+#define wxFlexGridSizer_GetNonFlexibleGrowMode 1396
+#define wxFlexGridSizer_RemoveGrowableCol 1397
+#define wxFlexGridSizer_RemoveGrowableRow 1398
+#define wxFlexGridSizer_SetFlexibleDirection 1399
+#define wxFlexGridSizer_SetNonFlexibleGrowMode 1400
+#define wxFlexGridSizer_destroy 1401
+#define wxGridBagSizer_new 1402
+#define wxGridBagSizer_Add_3_2 1403
+#define wxGridBagSizer_Add_3_1 1404
+#define wxGridBagSizer_Add_4 1405
+#define wxGridBagSizer_Add_1_0 1406
+#define wxGridBagSizer_Add_2_1 1407
+#define wxGridBagSizer_Add_2_0 1408
+#define wxGridBagSizer_Add_3_0 1409
+#define wxGridBagSizer_Add_1_1 1410
+#define wxGridBagSizer_CalcMin 1411
+#define wxGridBagSizer_CheckForIntersection_2 1412
+#define wxGridBagSizer_CheckForIntersection_3 1413
+#define wxGridBagSizer_FindItem_1_1 1414
+#define wxGridBagSizer_FindItem_1_0 1415
+#define wxGridBagSizer_FindItemAtPoint 1416
+#define wxGridBagSizer_FindItemAtPosition 1417
+#define wxGridBagSizer_FindItemWithData 1418
+#define wxGridBagSizer_GetCellSize 1419
+#define wxGridBagSizer_GetEmptyCellSize 1420
+#define wxGridBagSizer_GetItemPosition_1_2 1421
+#define wxGridBagSizer_GetItemPosition_1_1 1422
+#define wxGridBagSizer_GetItemPosition_1_0 1423
+#define wxGridBagSizer_GetItemSpan_1_2 1424
+#define wxGridBagSizer_GetItemSpan_1_1 1425
+#define wxGridBagSizer_GetItemSpan_1_0 1426
+#define wxGridBagSizer_SetEmptyCellSize 1427
+#define wxGridBagSizer_SetItemPosition_2_2 1428
+#define wxGridBagSizer_SetItemPosition_2_1 1429
+#define wxGridBagSizer_SetItemPosition_2_0 1430
+#define wxGridBagSizer_SetItemSpan_2_2 1431
+#define wxGridBagSizer_SetItemSpan_2_1 1432
+#define wxGridBagSizer_SetItemSpan_2_0 1433
+#define wxGridBagSizer_destroy 1434
+#define wxStdDialogButtonSizer_new 1435
+#define wxStdDialogButtonSizer_AddButton 1436
+#define wxStdDialogButtonSizer_Realize 1437
+#define wxStdDialogButtonSizer_SetAffirmativeButton 1438
+#define wxStdDialogButtonSizer_SetCancelButton 1439
+#define wxStdDialogButtonSizer_SetNegativeButton 1440
+#define wxStdDialogButtonSizer_destroy 1441
+#define wxFont_new_0 1442
+#define wxFont_new_1 1443
+#define wxFont_new_5 1444
+#define wxFont_destruct 1446
+#define wxFont_IsFixedWidth 1447
+#define wxFont_GetDefaultEncoding 1448
+#define wxFont_GetFaceName 1449
+#define wxFont_GetFamily 1450
+#define wxFont_GetNativeFontInfoDesc 1451
+#define wxFont_GetNativeFontInfoUserDesc 1452
+#define wxFont_GetPointSize 1453
+#define wxFont_GetStyle 1454
+#define wxFont_GetUnderlined 1455
+#define wxFont_GetWeight 1456
+#define wxFont_Ok 1457
+#define wxFont_SetDefaultEncoding 1458
+#define wxFont_SetFaceName 1459
+#define wxFont_SetFamily 1460
+#define wxFont_SetPointSize 1461
+#define wxFont_SetStyle 1462
+#define wxFont_SetUnderlined 1463
+#define wxFont_SetWeight 1464
+#define wxToolTip_Enable 1465
+#define wxToolTip_SetDelay 1466
+#define wxToolTip_new 1467
+#define wxToolTip_SetTip 1468
+#define wxToolTip_GetTip 1469
+#define wxToolTip_GetWindow 1470
+#define wxToolTip_destroy 1471
+#define wxButton_new_3 1473
+#define wxButton_new_0 1474
+#define wxButton_destruct 1475
+#define wxButton_Create 1476
+#define wxButton_GetDefaultSize 1477
+#define wxButton_SetDefault 1478
+#define wxButton_SetLabel 1479
+#define wxBitmapButton_new_4 1481
+#define wxBitmapButton_new_0 1482
+#define wxBitmapButton_Create 1483
+#define wxBitmapButton_GetBitmapDisabled 1484
+#define wxBitmapButton_GetBitmapFocus 1486
+#define wxBitmapButton_GetBitmapLabel 1488
+#define wxBitmapButton_GetBitmapSelected 1490
+#define wxBitmapButton_SetBitmapDisabled 1492
+#define wxBitmapButton_SetBitmapFocus 1493
+#define wxBitmapButton_SetBitmapLabel 1494
+#define wxBitmapButton_SetBitmapSelected 1495
+#define wxBitmapButton_destroy 1496
+#define wxToggleButton_new_0 1497
+#define wxToggleButton_new_4 1498
+#define wxToggleButton_Create 1499
+#define wxToggleButton_GetValue 1500
+#define wxToggleButton_SetValue 1501
+#define wxToggleButton_destroy 1502
+#define wxCalendarCtrl_new_0 1503
+#define wxCalendarCtrl_new_3 1504
+#define wxCalendarCtrl_Create 1505
+#define wxCalendarCtrl_destruct 1506
+#define wxCalendarCtrl_SetDate 1507
+#define wxCalendarCtrl_GetDate 1508
+#define wxCalendarCtrl_EnableYearChange 1509
+#define wxCalendarCtrl_EnableMonthChange 1510
+#define wxCalendarCtrl_EnableHolidayDisplay 1511
+#define wxCalendarCtrl_SetHeaderColours 1512
+#define wxCalendarCtrl_GetHeaderColourFg 1513
+#define wxCalendarCtrl_GetHeaderColourBg 1514
+#define wxCalendarCtrl_SetHighlightColours 1515
+#define wxCalendarCtrl_GetHighlightColourFg 1516
+#define wxCalendarCtrl_GetHighlightColourBg 1517
+#define wxCalendarCtrl_SetHolidayColours 1518
+#define wxCalendarCtrl_GetHolidayColourFg 1519
+#define wxCalendarCtrl_GetHolidayColourBg 1520
+#define wxCalendarCtrl_GetAttr 1521
+#define wxCalendarCtrl_SetAttr 1522
+#define wxCalendarCtrl_SetHoliday 1523
+#define wxCalendarCtrl_ResetAttr 1524
+#define wxCalendarCtrl_HitTest 1525
+#define wxCalendarDateAttr_new_0 1526
+#define wxCalendarDateAttr_new_2_1 1527
+#define wxCalendarDateAttr_new_2_0 1528
+#define wxCalendarDateAttr_SetTextColour 1529
+#define wxCalendarDateAttr_SetBackgroundColour 1530
+#define wxCalendarDateAttr_SetBorderColour 1531
+#define wxCalendarDateAttr_SetFont 1532
+#define wxCalendarDateAttr_SetBorder 1533
+#define wxCalendarDateAttr_SetHoliday 1534
+#define wxCalendarDateAttr_HasTextColour 1535
+#define wxCalendarDateAttr_HasBackgroundColour 1536
+#define wxCalendarDateAttr_HasBorderColour 1537
+#define wxCalendarDateAttr_HasFont 1538
+#define wxCalendarDateAttr_HasBorder 1539
+#define wxCalendarDateAttr_IsHoliday 1540
+#define wxCalendarDateAttr_GetTextColour 1541
+#define wxCalendarDateAttr_GetBackgroundColour 1542
+#define wxCalendarDateAttr_GetBorderColour 1543
+#define wxCalendarDateAttr_GetFont 1544
+#define wxCalendarDateAttr_GetBorder 1545
+#define wxCalendarDateAttr_destroy 1546
+#define wxCheckBox_new_4 1548
+#define wxCheckBox_new_0 1549
+#define wxCheckBox_Create 1550
+#define wxCheckBox_GetValue 1551
+#define wxCheckBox_Get3StateValue 1552
+#define wxCheckBox_Is3rdStateAllowedForUser 1553
+#define wxCheckBox_Is3State 1554
+#define wxCheckBox_IsChecked 1555
+#define wxCheckBox_SetValue 1556
+#define wxCheckBox_Set3StateValue 1557
+#define wxCheckBox_destroy 1558
+#define wxCheckListBox_new_0 1559
+#define wxCheckListBox_new_3 1561
+#define wxCheckListBox_Check 1562
+#define wxCheckListBox_IsChecked 1563
+#define wxCheckListBox_destroy 1564
+#define wxChoice_new_3 1567
+#define wxChoice_new_0 1568
+#define wxChoice_destruct 1570
+#define wxChoice_Create 1572
+#define wxChoice_Delete 1573
+#define wxChoice_GetColumns 1574
+#define wxChoice_SetColumns 1575
+#define wxComboBox_new_0 1576
+#define wxComboBox_new_3 1578
+#define wxComboBox_destruct 1579
+#define wxComboBox_Create 1581
+#define wxComboBox_CanCopy 1582
+#define wxComboBox_CanCut 1583
+#define wxComboBox_CanPaste 1584
+#define wxComboBox_CanRedo 1585
+#define wxComboBox_CanUndo 1586
+#define wxComboBox_Copy 1587
+#define wxComboBox_Cut 1588
+#define wxComboBox_GetInsertionPoint 1589
+#define wxComboBox_GetLastPosition 1590
+#define wxComboBox_GetValue 1591
+#define wxComboBox_Paste 1592
+#define wxComboBox_Redo 1593
+#define wxComboBox_Replace 1594
+#define wxComboBox_Remove 1595
+#define wxComboBox_SetInsertionPoint 1596
+#define wxComboBox_SetInsertionPointEnd 1597
+#define wxComboBox_SetSelection_1 1598
+#define wxComboBox_SetSelection_2 1599
+#define wxComboBox_SetValue 1600
+#define wxComboBox_Undo 1601
+#define wxGauge_new_0 1602
+#define wxGauge_new_4 1603
+#define wxGauge_Create 1604
+#define wxGauge_GetBezelFace 1605
+#define wxGauge_GetRange 1606
+#define wxGauge_GetShadowWidth 1607
+#define wxGauge_GetValue 1608
+#define wxGauge_IsVertical 1609
+#define wxGauge_SetBezelFace 1610
+#define wxGauge_SetRange 1611
+#define wxGauge_SetShadowWidth 1612
+#define wxGauge_SetValue 1613
+#define wxGauge_Pulse 1614
+#define wxGauge_destroy 1615
+#define wxGenericDirCtrl_new_0 1616
+#define wxGenericDirCtrl_new_2 1617
+#define wxGenericDirCtrl_destruct 1618
+#define wxGenericDirCtrl_Create 1619
+#define wxGenericDirCtrl_Init 1620
+#define wxGenericDirCtrl_CollapseTree 1621
+#define wxGenericDirCtrl_ExpandPath 1622
+#define wxGenericDirCtrl_GetDefaultPath 1623
+#define wxGenericDirCtrl_GetPath 1624
+#define wxGenericDirCtrl_GetFilePath 1625
+#define wxGenericDirCtrl_GetFilter 1626
+#define wxGenericDirCtrl_GetFilterIndex 1627
+#define wxGenericDirCtrl_GetRootId 1628
+#define wxGenericDirCtrl_GetTreeCtrl 1629
+#define wxGenericDirCtrl_ReCreateTree 1630
+#define wxGenericDirCtrl_SetDefaultPath 1631
+#define wxGenericDirCtrl_SetFilter 1632
+#define wxGenericDirCtrl_SetFilterIndex 1633
+#define wxGenericDirCtrl_SetPath 1634
+#define wxStaticBox_new_4 1636
+#define wxStaticBox_new_0 1637
+#define wxStaticBox_Create 1638
+#define wxStaticBox_destroy 1639
+#define wxStaticLine_new_2 1641
+#define wxStaticLine_new_0 1642
+#define wxStaticLine_Create 1643
+#define wxStaticLine_IsVertical 1644
+#define wxStaticLine_GetDefaultSize 1645
+#define wxStaticLine_destroy 1646
+#define wxListBox_new_3 1649
+#define wxListBox_new_0 1650
+#define wxListBox_destruct 1652
+#define wxListBox_Create 1654
+#define wxListBox_Deselect 1655
+#define wxListBox_GetSelections 1656
+#define wxListBox_InsertItems 1657
+#define wxListBox_IsSelected 1658
+#define wxListBox_Set 1659
+#define wxListBox_HitTest 1660
+#define wxListBox_SetFirstItem_1_0 1661
+#define wxListBox_SetFirstItem_1_1 1662
+#define wxListCtrl_new_0 1663
+#define wxListCtrl_new_2 1664
+#define wxListCtrl_Arrange 1665
+#define wxListCtrl_AssignImageList 1666
+#define wxListCtrl_ClearAll 1667
+#define wxListCtrl_Create 1668
+#define wxListCtrl_DeleteAllItems 1669
+#define wxListCtrl_DeleteColumn 1670
+#define wxListCtrl_DeleteItem 1671
+#define wxListCtrl_EditLabel 1672
+#define wxListCtrl_EnsureVisible 1673
+#define wxListCtrl_FindItem_3_0 1674
+#define wxListCtrl_FindItem_3_1 1675
+#define wxListCtrl_GetColumn 1676
+#define wxListCtrl_GetColumnCount 1677
+#define wxListCtrl_GetColumnWidth 1678
+#define wxListCtrl_GetCountPerPage 1679
+#define wxListCtrl_GetEditControl 1680
+#define wxListCtrl_GetImageList 1681
+#define wxListCtrl_GetItem 1682
+#define wxListCtrl_GetItemBackgroundColour 1683
+#define wxListCtrl_GetItemCount 1684
+#define wxListCtrl_GetItemData 1685
+#define wxListCtrl_GetItemFont 1686
+#define wxListCtrl_GetItemPosition 1687
+#define wxListCtrl_GetItemRect 1688
+#define wxListCtrl_GetItemSpacing 1689
+#define wxListCtrl_GetItemState 1690
+#define wxListCtrl_GetItemText 1691
+#define wxListCtrl_GetItemTextColour 1692
+#define wxListCtrl_GetNextItem 1693
+#define wxListCtrl_GetSelectedItemCount 1694
+#define wxListCtrl_GetTextColour 1695
+#define wxListCtrl_GetTopItem 1696
+#define wxListCtrl_GetViewRect 1697
+#define wxListCtrl_HitTest 1698
+#define wxListCtrl_InsertColumn_2 1699
+#define wxListCtrl_InsertColumn_3 1700
+#define wxListCtrl_InsertItem_1 1701
+#define wxListCtrl_InsertItem_2_1 1702
+#define wxListCtrl_InsertItem_2_0 1703
+#define wxListCtrl_InsertItem_3 1704
+#define wxListCtrl_RefreshItem 1705
+#define wxListCtrl_RefreshItems 1706
+#define wxListCtrl_ScrollList 1707
+#define wxListCtrl_SetBackgroundColour 1708
+#define wxListCtrl_SetColumn 1709
+#define wxListCtrl_SetColumnWidth 1710
+#define wxListCtrl_SetImageList 1711
+#define wxListCtrl_SetItem_1 1712
+#define wxListCtrl_SetItem_4 1713
+#define wxListCtrl_SetItemBackgroundColour 1714
+#define wxListCtrl_SetItemCount 1715
+#define wxListCtrl_SetItemData 1716
+#define wxListCtrl_SetItemFont 1717
+#define wxListCtrl_SetItemImage 1718
+#define wxListCtrl_SetItemColumnImage 1719
+#define wxListCtrl_SetItemPosition 1720
+#define wxListCtrl_SetItemState 1721
+#define wxListCtrl_SetItemText 1722
+#define wxListCtrl_SetItemTextColour 1723
+#define wxListCtrl_SetSingleStyle 1724
+#define wxListCtrl_SetTextColour 1725
+#define wxListCtrl_SetWindowStyleFlag 1726
+#define wxListCtrl_SortItems 1727
+#define wxListCtrl_destroy 1728
+#define wxListView_ClearColumnImage 1729
+#define wxListView_Focus 1730
+#define wxListView_GetFirstSelected 1731
+#define wxListView_GetFocusedItem 1732
+#define wxListView_GetNextSelected 1733
+#define wxListView_IsSelected 1734
+#define wxListView_Select 1735
+#define wxListView_SetColumnImage 1736
+#define wxListItem_new_0 1737
+#define wxListItem_new_1 1738
+#define wxListItem_destruct 1739
+#define wxListItem_Clear 1740
+#define wxListItem_GetAlign 1741
+#define wxListItem_GetBackgroundColour 1742
+#define wxListItem_GetColumn 1743
+#define wxListItem_GetFont 1744
+#define wxListItem_GetId 1745
+#define wxListItem_GetImage 1746
+#define wxListItem_GetMask 1747
+#define wxListItem_GetState 1748
+#define wxListItem_GetText 1749
+#define wxListItem_GetTextColour 1750
+#define wxListItem_GetWidth 1751
+#define wxListItem_SetAlign 1752
+#define wxListItem_SetBackgroundColour 1753
+#define wxListItem_SetColumn 1754
+#define wxListItem_SetFont 1755
+#define wxListItem_SetId 1756
+#define wxListItem_SetImage 1757
+#define wxListItem_SetMask 1758
+#define wxListItem_SetState 1759
+#define wxListItem_SetStateMask 1760
+#define wxListItem_SetText 1761
+#define wxListItem_SetTextColour 1762
+#define wxListItem_SetWidth 1763
+#define wxListItemAttr_new_0 1764
+#define wxListItemAttr_new_3 1765
+#define wxListItemAttr_GetBackgroundColour 1766
+#define wxListItemAttr_GetFont 1767
+#define wxListItemAttr_GetTextColour 1768
+#define wxListItemAttr_HasBackgroundColour 1769
+#define wxListItemAttr_HasFont 1770
+#define wxListItemAttr_HasTextColour 1771
+#define wxListItemAttr_SetBackgroundColour 1772
+#define wxListItemAttr_SetFont 1773
+#define wxListItemAttr_SetTextColour 1774
+#define wxListItemAttr_destroy 1775
+#define wxImageList_new_0 1776
+#define wxImageList_new_3 1777
+#define wxImageList_Add_1 1778
+#define wxImageList_Add_2_0 1779
+#define wxImageList_Add_2_1 1780
+#define wxImageList_Create 1781
+#define wxImageList_Draw 1783
+#define wxImageList_GetBitmap 1784
+#define wxImageList_GetIcon 1785
+#define wxImageList_GetImageCount 1786
+#define wxImageList_GetSize 1787
+#define wxImageList_Remove 1788
+#define wxImageList_RemoveAll 1789
+#define wxImageList_Replace_2 1790
+#define wxImageList_Replace_3 1791
+#define wxImageList_destroy 1792
+#define wxTextAttr_new_0 1793
+#define wxTextAttr_new_2 1794
+#define wxTextAttr_GetAlignment 1795
+#define wxTextAttr_GetBackgroundColour 1796
+#define wxTextAttr_GetFont 1797
+#define wxTextAttr_GetLeftIndent 1798
+#define wxTextAttr_GetLeftSubIndent 1799
+#define wxTextAttr_GetRightIndent 1800
+#define wxTextAttr_GetTabs 1801
+#define wxTextAttr_GetTextColour 1802
+#define wxTextAttr_HasBackgroundColour 1803
+#define wxTextAttr_HasFont 1804
+#define wxTextAttr_HasTextColour 1805
+#define wxTextAttr_GetFlags 1806
+#define wxTextAttr_IsDefault 1807
+#define wxTextAttr_SetAlignment 1808
+#define wxTextAttr_SetBackgroundColour 1809
+#define wxTextAttr_SetFlags 1810
+#define wxTextAttr_SetFont 1811
+#define wxTextAttr_SetLeftIndent 1812
+#define wxTextAttr_SetRightIndent 1813
+#define wxTextAttr_SetTabs 1814
+#define wxTextAttr_SetTextColour 1815
+#define wxTextAttr_destroy 1816
+#define wxTextCtrl_new_3 1818
+#define wxTextCtrl_new_0 1819
+#define wxTextCtrl_destruct 1821
+#define wxTextCtrl_AppendText 1822
+#define wxTextCtrl_CanCopy 1823
+#define wxTextCtrl_CanCut 1824
+#define wxTextCtrl_CanPaste 1825
+#define wxTextCtrl_CanRedo 1826
+#define wxTextCtrl_CanUndo 1827
+#define wxTextCtrl_Clear 1828
+#define wxTextCtrl_Copy 1829
+#define wxTextCtrl_Create 1830
+#define wxTextCtrl_Cut 1831
+#define wxTextCtrl_DiscardEdits 1832
+#define wxTextCtrl_ChangeValue 1833
+#define wxTextCtrl_EmulateKeyPress 1834
+#define wxTextCtrl_GetDefaultStyle 1835
+#define wxTextCtrl_GetInsertionPoint 1836
+#define wxTextCtrl_GetLastPosition 1837
+#define wxTextCtrl_GetLineLength 1838
+#define wxTextCtrl_GetLineText 1839
+#define wxTextCtrl_GetNumberOfLines 1840
+#define wxTextCtrl_GetRange 1841
+#define wxTextCtrl_GetSelection 1842
+#define wxTextCtrl_GetStringSelection 1843
+#define wxTextCtrl_GetStyle 1844
+#define wxTextCtrl_GetValue 1845
+#define wxTextCtrl_IsEditable 1846
+#define wxTextCtrl_IsModified 1847
+#define wxTextCtrl_IsMultiLine 1848
+#define wxTextCtrl_IsSingleLine 1849
+#define wxTextCtrl_LoadFile 1850
+#define wxTextCtrl_MarkDirty 1851
+#define wxTextCtrl_Paste 1852
+#define wxTextCtrl_PositionToXY 1853
+#define wxTextCtrl_Redo 1854
+#define wxTextCtrl_Remove 1855
+#define wxTextCtrl_Replace 1856
+#define wxTextCtrl_SaveFile 1857
+#define wxTextCtrl_SetDefaultStyle 1858
+#define wxTextCtrl_SetEditable 1859
+#define wxTextCtrl_SetInsertionPoint 1860
+#define wxTextCtrl_SetInsertionPointEnd 1861
+#define wxTextCtrl_SetMaxLength 1863
+#define wxTextCtrl_SetSelection 1864
+#define wxTextCtrl_SetStyle 1865
+#define wxTextCtrl_SetValue 1866
+#define wxTextCtrl_ShowPosition 1867
+#define wxTextCtrl_Undo 1868
+#define wxTextCtrl_WriteText 1869
+#define wxTextCtrl_XYToPosition 1870
+#define wxNotebook_new_0 1873
+#define wxNotebook_new_3 1874
+#define wxNotebook_destruct 1875
+#define wxNotebook_AddPage 1876
+#define wxNotebook_AdvanceSelection 1877
+#define wxNotebook_AssignImageList 1878
+#define wxNotebook_Create 1879
+#define wxNotebook_DeleteAllPages 1880
+#define wxNotebook_DeletePage 1881
+#define wxNotebook_RemovePage 1882
+#define wxNotebook_GetCurrentPage 1883
+#define wxNotebook_GetImageList 1884
+#define wxNotebook_GetPage 1886
+#define wxNotebook_GetPageCount 1887
+#define wxNotebook_GetPageImage 1888
+#define wxNotebook_GetPageText 1889
+#define wxNotebook_GetRowCount 1890
+#define wxNotebook_GetSelection 1891
+#define wxNotebook_GetThemeBackgroundColour 1892
+#define wxNotebook_HitTest 1894
+#define wxNotebook_InsertPage 1896
+#define wxNotebook_SetImageList 1897
+#define wxNotebook_SetPadding 1898
+#define wxNotebook_SetPageSize 1899
+#define wxNotebook_SetPageImage 1900
+#define wxNotebook_SetPageText 1901
+#define wxNotebook_SetSelection 1902
+#define wxNotebook_ChangeSelection 1903
+#define wxChoicebook_new_0 1904
+#define wxChoicebook_new_3 1905
+#define wxChoicebook_AddPage 1906
+#define wxChoicebook_AdvanceSelection 1907
+#define wxChoicebook_AssignImageList 1908
+#define wxChoicebook_Create 1909
+#define wxChoicebook_DeleteAllPages 1910
+#define wxChoicebook_DeletePage 1911
+#define wxChoicebook_RemovePage 1912
+#define wxChoicebook_GetCurrentPage 1913
+#define wxChoicebook_GetImageList 1914
+#define wxChoicebook_GetPage 1916
+#define wxChoicebook_GetPageCount 1917
+#define wxChoicebook_GetPageImage 1918
+#define wxChoicebook_GetPageText 1919
+#define wxChoicebook_GetSelection 1920
+#define wxChoicebook_HitTest 1921
+#define wxChoicebook_InsertPage 1922
+#define wxChoicebook_SetImageList 1923
+#define wxChoicebook_SetPageSize 1924
+#define wxChoicebook_SetPageImage 1925
+#define wxChoicebook_SetPageText 1926
+#define wxChoicebook_SetSelection 1927
+#define wxChoicebook_ChangeSelection 1928
+#define wxChoicebook_destroy 1929
+#define wxToolbook_new_0 1930
+#define wxToolbook_new_3 1931
+#define wxToolbook_AddPage 1932
+#define wxToolbook_AdvanceSelection 1933
+#define wxToolbook_AssignImageList 1934
+#define wxToolbook_Create 1935
+#define wxToolbook_DeleteAllPages 1936
+#define wxToolbook_DeletePage 1937
+#define wxToolbook_RemovePage 1938
+#define wxToolbook_GetCurrentPage 1939
+#define wxToolbook_GetImageList 1940
+#define wxToolbook_GetPage 1942
+#define wxToolbook_GetPageCount 1943
+#define wxToolbook_GetPageImage 1944
+#define wxToolbook_GetPageText 1945
+#define wxToolbook_GetSelection 1946
+#define wxToolbook_HitTest 1948
+#define wxToolbook_InsertPage 1949
+#define wxToolbook_SetImageList 1950
+#define wxToolbook_SetPageSize 1951
+#define wxToolbook_SetPageImage 1952
+#define wxToolbook_SetPageText 1953
+#define wxToolbook_SetSelection 1954
+#define wxToolbook_ChangeSelection 1955
+#define wxToolbook_destroy 1956
+#define wxListbook_new_0 1957
+#define wxListbook_new_3 1958
+#define wxListbook_AddPage 1959
+#define wxListbook_AdvanceSelection 1960
+#define wxListbook_AssignImageList 1961
+#define wxListbook_Create 1962
+#define wxListbook_DeleteAllPages 1963
+#define wxListbook_DeletePage 1964
+#define wxListbook_RemovePage 1965
+#define wxListbook_GetCurrentPage 1966
+#define wxListbook_GetImageList 1967
+#define wxListbook_GetPage 1969
+#define wxListbook_GetPageCount 1970
+#define wxListbook_GetPageImage 1971
+#define wxListbook_GetPageText 1972
+#define wxListbook_GetSelection 1973
+#define wxListbook_HitTest 1975
+#define wxListbook_InsertPage 1976
+#define wxListbook_SetImageList 1977
+#define wxListbook_SetPageSize 1978
+#define wxListbook_SetPageImage 1979
+#define wxListbook_SetPageText 1980
+#define wxListbook_SetSelection 1981
+#define wxListbook_ChangeSelection 1982
+#define wxListbook_destroy 1983
+#define wxTreebook_new_0 1984
+#define wxTreebook_new_3 1985
+#define wxTreebook_AddPage 1986
+#define wxTreebook_AdvanceSelection 1987
+#define wxTreebook_AssignImageList 1988
+#define wxTreebook_Create 1989
+#define wxTreebook_DeleteAllPages 1990
+#define wxTreebook_DeletePage 1991
+#define wxTreebook_RemovePage 1992
+#define wxTreebook_GetCurrentPage 1993
+#define wxTreebook_GetImageList 1994
+#define wxTreebook_GetPage 1996
+#define wxTreebook_GetPageCount 1997
+#define wxTreebook_GetPageImage 1998
+#define wxTreebook_GetPageText 1999
+#define wxTreebook_GetSelection 2000
+#define wxTreebook_ExpandNode 2001
+#define wxTreebook_IsNodeExpanded 2002
+#define wxTreebook_HitTest 2004
+#define wxTreebook_InsertPage 2005
+#define wxTreebook_InsertSubPage 2006
+#define wxTreebook_SetImageList 2007
+#define wxTreebook_SetPageSize 2008
+#define wxTreebook_SetPageImage 2009
+#define wxTreebook_SetPageText 2010
+#define wxTreebook_SetSelection 2011
+#define wxTreebook_ChangeSelection 2012
+#define wxTreebook_destroy 2013
+#define wxTreeCtrl_new_2 2016
+#define wxTreeCtrl_new_0 2017
+#define wxTreeCtrl_destruct 2019
+#define wxTreeCtrl_AddRoot 2020
+#define wxTreeCtrl_AppendItem 2021
+#define wxTreeCtrl_AssignImageList 2022
+#define wxTreeCtrl_AssignStateImageList 2023
+#define wxTreeCtrl_Collapse 2024
+#define wxTreeCtrl_CollapseAndReset 2025
+#define wxTreeCtrl_Create 2026
+#define wxTreeCtrl_Delete 2027
+#define wxTreeCtrl_DeleteAllItems 2028
+#define wxTreeCtrl_DeleteChildren 2029
+#define wxTreeCtrl_EditLabel 2030
+#define wxTreeCtrl_EnsureVisible 2031
+#define wxTreeCtrl_Expand 2032
+#define wxTreeCtrl_GetBoundingRect 2033
+#define wxTreeCtrl_GetChildrenCount 2035
+#define wxTreeCtrl_GetCount 2036
+#define wxTreeCtrl_GetEditControl 2037
+#define wxTreeCtrl_GetFirstChild 2038
+#define wxTreeCtrl_GetNextChild 2039
+#define wxTreeCtrl_GetFirstVisibleItem 2040
+#define wxTreeCtrl_GetImageList 2041
+#define wxTreeCtrl_GetIndent 2042
+#define wxTreeCtrl_GetItemBackgroundColour 2043
+#define wxTreeCtrl_GetItemData 2044
+#define wxTreeCtrl_GetItemFont 2045
+#define wxTreeCtrl_GetItemImage_1 2046
+#define wxTreeCtrl_GetItemImage_2 2047
+#define wxTreeCtrl_GetItemText 2048
+#define wxTreeCtrl_GetItemTextColour 2049
+#define wxTreeCtrl_GetLastChild 2050
+#define wxTreeCtrl_GetNextSibling 2051
+#define wxTreeCtrl_GetNextVisible 2052
+#define wxTreeCtrl_GetItemParent 2053
+#define wxTreeCtrl_GetPrevSibling 2054
+#define wxTreeCtrl_GetPrevVisible 2055
+#define wxTreeCtrl_GetRootItem 2056
+#define wxTreeCtrl_GetSelection 2057
+#define wxTreeCtrl_GetSelections 2058
+#define wxTreeCtrl_GetStateImageList 2059
+#define wxTreeCtrl_HitTest 2060
+#define wxTreeCtrl_InsertItem 2062
+#define wxTreeCtrl_IsBold 2063
+#define wxTreeCtrl_IsExpanded 2064
+#define wxTreeCtrl_IsSelected 2065
+#define wxTreeCtrl_IsVisible 2066
+#define wxTreeCtrl_ItemHasChildren 2067
+#define wxTreeCtrl_IsTreeItemIdOk 2068
+#define wxTreeCtrl_PrependItem 2069
+#define wxTreeCtrl_ScrollTo 2070
+#define wxTreeCtrl_SelectItem_1 2071
+#define wxTreeCtrl_SelectItem_2 2072
+#define wxTreeCtrl_SetIndent 2073
+#define wxTreeCtrl_SetImageList 2074
+#define wxTreeCtrl_SetItemBackgroundColour 2075
+#define wxTreeCtrl_SetItemBold 2076
+#define wxTreeCtrl_SetItemData 2077
+#define wxTreeCtrl_SetItemDropHighlight 2078
+#define wxTreeCtrl_SetItemFont 2079
+#define wxTreeCtrl_SetItemHasChildren 2080
+#define wxTreeCtrl_SetItemImage_2 2081
+#define wxTreeCtrl_SetItemImage_3 2082
+#define wxTreeCtrl_SetItemText 2083
+#define wxTreeCtrl_SetItemTextColour 2084
+#define wxTreeCtrl_SetStateImageList 2085
+#define wxTreeCtrl_SetWindowStyle 2086
+#define wxTreeCtrl_SortChildren 2087
+#define wxTreeCtrl_Toggle 2088
+#define wxTreeCtrl_ToggleItemSelection 2089
+#define wxTreeCtrl_Unselect 2090
+#define wxTreeCtrl_UnselectAll 2091
+#define wxTreeCtrl_UnselectItem 2092
+#define wxScrollBar_new_0 2093
+#define wxScrollBar_new_3 2094
+#define wxScrollBar_destruct 2095
+#define wxScrollBar_Create 2096
+#define wxScrollBar_GetRange 2097
+#define wxScrollBar_GetPageSize 2098
+#define wxScrollBar_GetThumbPosition 2099
+#define wxScrollBar_GetThumbSize 2100
+#define wxScrollBar_SetThumbPosition 2101
+#define wxScrollBar_SetScrollbar 2102
+#define wxSpinButton_new_2 2104
+#define wxSpinButton_new_0 2105
+#define wxSpinButton_Create 2106
+#define wxSpinButton_GetMax 2107
+#define wxSpinButton_GetMin 2108
+#define wxSpinButton_GetValue 2109
+#define wxSpinButton_SetRange 2110
+#define wxSpinButton_SetValue 2111
+#define wxSpinButton_destroy 2112
+#define wxSpinCtrl_new_0 2113
+#define wxSpinCtrl_new_2 2114
+#define wxSpinCtrl_Create 2116
+#define wxSpinCtrl_SetValue_1_1 2119
+#define wxSpinCtrl_SetValue_1_0 2120
+#define wxSpinCtrl_GetValue 2122
+#define wxSpinCtrl_SetRange 2124
+#define wxSpinCtrl_SetSelection 2125
+#define wxSpinCtrl_GetMin 2127
+#define wxSpinCtrl_GetMax 2129
+#define wxSpinCtrl_destroy 2130
+#define wxStaticText_new_0 2131
+#define wxStaticText_new_4 2132
+#define wxStaticText_Create 2133
+#define wxStaticText_GetLabel 2134
+#define wxStaticText_SetLabel 2135
+#define wxStaticText_Wrap 2136
+#define wxStaticText_destroy 2137
+#define wxStaticBitmap_new_0 2138
+#define wxStaticBitmap_new_4 2139
+#define wxStaticBitmap_Create 2140
+#define wxStaticBitmap_GetBitmap 2141
+#define wxStaticBitmap_SetBitmap 2142
+#define wxStaticBitmap_destroy 2143
+#define wxRadioBox_new 2144
+#define wxRadioBox_destruct 2146
+#define wxRadioBox_Create 2147
+#define wxRadioBox_Enable_2 2148
+#define wxRadioBox_Enable_1 2149
+#define wxRadioBox_GetSelection 2150
+#define wxRadioBox_GetString 2151
+#define wxRadioBox_SetSelection 2152
+#define wxRadioBox_Show_2 2153
+#define wxRadioBox_Show_1 2154
+#define wxRadioBox_GetColumnCount 2155
+#define wxRadioBox_GetItemHelpText 2156
+#define wxRadioBox_GetItemToolTip 2157
+#define wxRadioBox_GetItemFromPoint 2159
+#define wxRadioBox_GetRowCount 2160
+#define wxRadioBox_IsItemEnabled 2161
+#define wxRadioBox_IsItemShown 2162
+#define wxRadioBox_SetItemHelpText 2163
+#define wxRadioBox_SetItemToolTip 2164
+#define wxRadioButton_new_0 2165
+#define wxRadioButton_new_4 2166
+#define wxRadioButton_Create 2167
+#define wxRadioButton_GetValue 2168
+#define wxRadioButton_SetValue 2169
+#define wxRadioButton_destroy 2170
+#define wxSlider_new_6 2172
+#define wxSlider_new_0 2173
+#define wxSlider_Create 2174
+#define wxSlider_GetLineSize 2175
+#define wxSlider_GetMax 2176
+#define wxSlider_GetMin 2177
+#define wxSlider_GetPageSize 2178
+#define wxSlider_GetThumbLength 2179
+#define wxSlider_GetValue 2180
+#define wxSlider_SetLineSize 2181
+#define wxSlider_SetPageSize 2182
+#define wxSlider_SetRange 2183
+#define wxSlider_SetThumbLength 2184
+#define wxSlider_SetValue 2185
+#define wxSlider_destroy 2186
+#define wxDialog_new_4 2188
+#define wxDialog_new_0 2189
+#define wxDialog_destruct 2191
+#define wxDialog_Create 2192
+#define wxDialog_CreateButtonSizer 2193
+#define wxDialog_CreateStdDialogButtonSizer 2194
+#define wxDialog_EndModal 2195
+#define wxDialog_GetAffirmativeId 2196
+#define wxDialog_GetReturnCode 2197
+#define wxDialog_IsModal 2198
+#define wxDialog_SetAffirmativeId 2199
+#define wxDialog_SetReturnCode 2200
+#define wxDialog_Show 2201
+#define wxDialog_ShowModal 2202
+#define wxColourDialog_new_0 2203
+#define wxColourDialog_new_2 2204
+#define wxColourDialog_destruct 2205
+#define wxColourDialog_Create 2206
+#define wxColourDialog_GetColourData 2207
+#define wxColourData_new_0 2208
+#define wxColourData_new_1 2209
+#define wxColourData_destruct 2210
+#define wxColourData_GetChooseFull 2211
+#define wxColourData_GetColour 2212
+#define wxColourData_GetCustomColour 2214
+#define wxColourData_SetChooseFull 2215
+#define wxColourData_SetColour 2216
+#define wxColourData_SetCustomColour 2217
+#define wxPalette_new_0 2218
+#define wxPalette_new_4 2219
+#define wxPalette_destruct 2221
+#define wxPalette_Create 2222
+#define wxPalette_GetColoursCount 2223
+#define wxPalette_GetPixel 2224
+#define wxPalette_GetRGB 2225
+#define wxPalette_IsOk 2226
+#define wxDirDialog_new 2230
+#define wxDirDialog_destruct 2231
+#define wxDirDialog_GetPath 2232
+#define wxDirDialog_GetMessage 2233
+#define wxDirDialog_SetMessage 2234
+#define wxDirDialog_SetPath 2235
+#define wxFileDialog_new 2239
+#define wxFileDialog_destruct 2240
+#define wxFileDialog_GetDirectory 2241
+#define wxFileDialog_GetFilename 2242
+#define wxFileDialog_GetFilenames 2243
+#define wxFileDialog_GetFilterIndex 2244
+#define wxFileDialog_GetMessage 2245
+#define wxFileDialog_GetPath 2246
+#define wxFileDialog_GetPaths 2247
+#define wxFileDialog_GetWildcard 2248
+#define wxFileDialog_SetDirectory 2249
+#define wxFileDialog_SetFilename 2250
+#define wxFileDialog_SetFilterIndex 2251
+#define wxFileDialog_SetMessage 2252
+#define wxFileDialog_SetPath 2253
+#define wxFileDialog_SetWildcard 2254
+#define wxPickerBase_SetInternalMargin 2255
+#define wxPickerBase_GetInternalMargin 2256
+#define wxPickerBase_SetTextCtrlProportion 2257
+#define wxPickerBase_SetPickerCtrlProportion 2258
+#define wxPickerBase_GetTextCtrlProportion 2259
+#define wxPickerBase_GetPickerCtrlProportion 2260
+#define wxPickerBase_HasTextCtrl 2261
+#define wxPickerBase_GetTextCtrl 2262
+#define wxPickerBase_IsTextCtrlGrowable 2263
+#define wxPickerBase_SetPickerCtrlGrowable 2264
+#define wxPickerBase_SetTextCtrlGrowable 2265
+#define wxPickerBase_IsPickerCtrlGrowable 2266
+#define wxFilePickerCtrl_new_0 2267
+#define wxFilePickerCtrl_new_3 2268
+#define wxFilePickerCtrl_Create 2269
+#define wxFilePickerCtrl_GetPath 2270
+#define wxFilePickerCtrl_SetPath 2271
+#define wxFilePickerCtrl_destroy 2272
+#define wxDirPickerCtrl_new_0 2273
+#define wxDirPickerCtrl_new_3 2274
+#define wxDirPickerCtrl_Create 2275
+#define wxDirPickerCtrl_GetPath 2276
+#define wxDirPickerCtrl_SetPath 2277
+#define wxDirPickerCtrl_destroy 2278
+#define wxColourPickerCtrl_new_0 2279
+#define wxColourPickerCtrl_new_3 2280
+#define wxColourPickerCtrl_Create 2281
+#define wxColourPickerCtrl_GetColour 2282
+#define wxColourPickerCtrl_SetColour_1_1 2283
+#define wxColourPickerCtrl_SetColour_1_0 2284
+#define wxColourPickerCtrl_destroy 2285
+#define wxDatePickerCtrl_new_0 2286
+#define wxDatePickerCtrl_new_3 2287
+#define wxDatePickerCtrl_GetRange 2288
+#define wxDatePickerCtrl_GetValue 2289
+#define wxDatePickerCtrl_SetRange 2290
+#define wxDatePickerCtrl_SetValue 2291
+#define wxDatePickerCtrl_destroy 2292
+#define wxFontPickerCtrl_new_0 2293
+#define wxFontPickerCtrl_new_3 2294
+#define wxFontPickerCtrl_Create 2295
+#define wxFontPickerCtrl_GetSelectedFont 2296
+#define wxFontPickerCtrl_SetSelectedFont 2297
+#define wxFontPickerCtrl_GetMaxPointSize 2298
+#define wxFontPickerCtrl_SetMaxPointSize 2299
+#define wxFontPickerCtrl_destroy 2300
+#define wxFindReplaceDialog_new_0 2303
+#define wxFindReplaceDialog_new_4 2304
+#define wxFindReplaceDialog_destruct 2305
+#define wxFindReplaceDialog_Create 2306
+#define wxFindReplaceDialog_GetData 2307
+#define wxFindReplaceData_new_0 2308
+#define wxFindReplaceData_new_1 2309
+#define wxFindReplaceData_GetFindString 2310
+#define wxFindReplaceData_GetReplaceString 2311
+#define wxFindReplaceData_GetFlags 2312
+#define wxFindReplaceData_SetFlags 2313
+#define wxFindReplaceData_SetFindString 2314
+#define wxFindReplaceData_SetReplaceString 2315
+#define wxFindReplaceData_destroy 2316
+#define wxMultiChoiceDialog_new_0 2317
+#define wxMultiChoiceDialog_new_5 2319
+#define wxMultiChoiceDialog_GetSelections 2320
+#define wxMultiChoiceDialog_SetSelections 2321
+#define wxMultiChoiceDialog_destroy 2322
+#define wxSingleChoiceDialog_new_0 2323
+#define wxSingleChoiceDialog_new_5 2325
+#define wxSingleChoiceDialog_GetSelection 2326
+#define wxSingleChoiceDialog_GetStringSelection 2327
+#define wxSingleChoiceDialog_SetSelection 2328
+#define wxSingleChoiceDialog_destroy 2329
+#define wxTextEntryDialog_new 2330
+#define wxTextEntryDialog_GetValue 2331
+#define wxTextEntryDialog_SetValue 2332
+#define wxTextEntryDialog_destroy 2333
+#define wxPasswordEntryDialog_new 2334
+#define wxPasswordEntryDialog_destroy 2335
+#define wxFontData_new_0 2336
+#define wxFontData_new_1 2337
+#define wxFontData_destruct 2338
+#define wxFontData_EnableEffects 2339
+#define wxFontData_GetAllowSymbols 2340
+#define wxFontData_GetColour 2341
+#define wxFontData_GetChosenFont 2342
+#define wxFontData_GetEnableEffects 2343
+#define wxFontData_GetInitialFont 2344
+#define wxFontData_GetShowHelp 2345
+#define wxFontData_SetAllowSymbols 2346
+#define wxFontData_SetChosenFont 2347
+#define wxFontData_SetColour 2348
+#define wxFontData_SetInitialFont 2349
+#define wxFontData_SetRange 2350
+#define wxFontData_SetShowHelp 2351
+#define wxFontDialog_new_0 2355
+#define wxFontDialog_new_2 2357
+#define wxFontDialog_Create 2359
+#define wxFontDialog_GetFontData 2360
+#define wxFontDialog_destroy 2362
+#define wxProgressDialog_new 2363
+#define wxProgressDialog_destruct 2364
+#define wxProgressDialog_Resume 2365
+#define wxProgressDialog_Update_2 2366
+#define wxProgressDialog_Update_0 2367
+#define wxMessageDialog_new 2368
+#define wxMessageDialog_destruct 2369
+#define wxPageSetupDialog_new 2370
+#define wxPageSetupDialog_destruct 2371
+#define wxPageSetupDialog_GetPageSetupData 2372
+#define wxPageSetupDialog_ShowModal 2373
+#define wxPageSetupDialogData_new_0 2374
+#define wxPageSetupDialogData_new_1_0 2375
+#define wxPageSetupDialogData_new_1_1 2376
+#define wxPageSetupDialogData_destruct 2377
+#define wxPageSetupDialogData_EnableHelp 2378
+#define wxPageSetupDialogData_EnableMargins 2379
+#define wxPageSetupDialogData_EnableOrientation 2380
+#define wxPageSetupDialogData_EnablePaper 2381
+#define wxPageSetupDialogData_EnablePrinter 2382
+#define wxPageSetupDialogData_GetDefaultMinMargins 2383
+#define wxPageSetupDialogData_GetEnableMargins 2384
+#define wxPageSetupDialogData_GetEnableOrientation 2385
+#define wxPageSetupDialogData_GetEnablePaper 2386
+#define wxPageSetupDialogData_GetEnablePrinter 2387
+#define wxPageSetupDialogData_GetEnableHelp 2388
+#define wxPageSetupDialogData_GetDefaultInfo 2389
+#define wxPageSetupDialogData_GetMarginTopLeft 2390
+#define wxPageSetupDialogData_GetMarginBottomRight 2391
+#define wxPageSetupDialogData_GetMinMarginTopLeft 2392
+#define wxPageSetupDialogData_GetMinMarginBottomRight 2393
+#define wxPageSetupDialogData_GetPaperId 2394
+#define wxPageSetupDialogData_GetPaperSize 2395
+#define wxPageSetupDialogData_GetPrintData 2397
+#define wxPageSetupDialogData_IsOk 2398
+#define wxPageSetupDialogData_SetDefaultInfo 2399
+#define wxPageSetupDialogData_SetDefaultMinMargins 2400
+#define wxPageSetupDialogData_SetMarginTopLeft 2401
+#define wxPageSetupDialogData_SetMarginBottomRight 2402
+#define wxPageSetupDialogData_SetMinMarginTopLeft 2403
+#define wxPageSetupDialogData_SetMinMarginBottomRight 2404
+#define wxPageSetupDialogData_SetPaperId 2405
+#define wxPageSetupDialogData_SetPaperSize_1_1 2406
+#define wxPageSetupDialogData_SetPaperSize_1_0 2407
+#define wxPageSetupDialogData_SetPrintData 2408
+#define wxPrintDialog_new_2_0 2409
+#define wxPrintDialog_new_2_1 2410
+#define wxPrintDialog_destruct 2411
+#define wxPrintDialog_GetPrintDialogData 2412
+#define wxPrintDialog_GetPrintDC 2413
+#define wxPrintDialogData_new_0 2414
+#define wxPrintDialogData_new_1_1 2415
+#define wxPrintDialogData_new_1_0 2416
+#define wxPrintDialogData_destruct 2417
+#define wxPrintDialogData_EnableHelp 2418
+#define wxPrintDialogData_EnablePageNumbers 2419
+#define wxPrintDialogData_EnablePrintToFile 2420
+#define wxPrintDialogData_EnableSelection 2421
+#define wxPrintDialogData_GetAllPages 2422
+#define wxPrintDialogData_GetCollate 2423
+#define wxPrintDialogData_GetFromPage 2424
+#define wxPrintDialogData_GetMaxPage 2425
+#define wxPrintDialogData_GetMinPage 2426
+#define wxPrintDialogData_GetNoCopies 2427
+#define wxPrintDialogData_GetPrintData 2428
+#define wxPrintDialogData_GetPrintToFile 2429
+#define wxPrintDialogData_GetSelection 2430
+#define wxPrintDialogData_GetToPage 2431
+#define wxPrintDialogData_IsOk 2432
+#define wxPrintDialogData_SetCollate 2433
+#define wxPrintDialogData_SetFromPage 2434
+#define wxPrintDialogData_SetMaxPage 2435
+#define wxPrintDialogData_SetMinPage 2436
+#define wxPrintDialogData_SetNoCopies 2437
+#define wxPrintDialogData_SetPrintData 2438
+#define wxPrintDialogData_SetPrintToFile 2439
+#define wxPrintDialogData_SetSelection 2440
+#define wxPrintDialogData_SetToPage 2441
+#define wxPrintData_new_0 2442
+#define wxPrintData_new_1 2443
+#define wxPrintData_destruct 2444
+#define wxPrintData_GetCollate 2445
+#define wxPrintData_GetBin 2446
+#define wxPrintData_GetColour 2447
+#define wxPrintData_GetDuplex 2448
+#define wxPrintData_GetNoCopies 2449
+#define wxPrintData_GetOrientation 2450
+#define wxPrintData_GetPaperId 2451
+#define wxPrintData_GetPrinterName 2452
+#define wxPrintData_GetQuality 2453
+#define wxPrintData_IsOk 2454
+#define wxPrintData_SetBin 2455
+#define wxPrintData_SetCollate 2456
+#define wxPrintData_SetColour 2457
+#define wxPrintData_SetDuplex 2458
+#define wxPrintData_SetNoCopies 2459
+#define wxPrintData_SetOrientation 2460
+#define wxPrintData_SetPaperId 2461
+#define wxPrintData_SetPrinterName 2462
+#define wxPrintData_SetQuality 2463
+#define wxPrintPreview_new_2 2466
+#define wxPrintPreview_new_3 2467
+#define wxPrintPreview_destruct 2469
+#define wxPrintPreview_GetCanvas 2470
+#define wxPrintPreview_GetCurrentPage 2471
+#define wxPrintPreview_GetFrame 2472
+#define wxPrintPreview_GetMaxPage 2473
+#define wxPrintPreview_GetMinPage 2474
+#define wxPrintPreview_GetPrintout 2475
+#define wxPrintPreview_GetPrintoutForPrinting 2476
+#define wxPrintPreview_IsOk 2477
+#define wxPrintPreview_PaintPage 2478
+#define wxPrintPreview_Print 2479
+#define wxPrintPreview_RenderPage 2480
+#define wxPrintPreview_SetCanvas 2481
+#define wxPrintPreview_SetCurrentPage 2482
+#define wxPrintPreview_SetFrame 2483
+#define wxPrintPreview_SetPrintout 2484
+#define wxPrintPreview_SetZoom 2485
+#define wxPreviewFrame_new 2486
+#define wxPreviewFrame_destruct 2487
+#define wxPreviewFrame_CreateControlBar 2488
+#define wxPreviewFrame_CreateCanvas 2489
+#define wxPreviewFrame_Initialize 2490
+#define wxPreviewFrame_OnCloseWindow 2491
+#define wxPreviewControlBar_new 2492
+#define wxPreviewControlBar_destruct 2493
+#define wxPreviewControlBar_CreateButtons 2494
+#define wxPreviewControlBar_GetPrintPreview 2495
+#define wxPreviewControlBar_GetZoomControl 2496
+#define wxPreviewControlBar_SetZoomControl 2497
+#define wxPrinter_new 2499
+#define wxPrinter_CreateAbortWindow 2500
+#define wxPrinter_GetAbort 2501
+#define wxPrinter_GetLastError 2502
+#define wxPrinter_GetPrintDialogData 2503
+#define wxPrinter_Print 2504
+#define wxPrinter_PrintDialog 2505
+#define wxPrinter_ReportError 2506
+#define wxPrinter_Setup 2507
+#define wxPrinter_destroy 2508
+#define wxXmlResource_new_1 2509
+#define wxXmlResource_new_2 2510
+#define wxXmlResource_destruct 2511
+#define wxXmlResource_AttachUnknownControl 2512
+#define wxXmlResource_ClearHandlers 2513
+#define wxXmlResource_CompareVersion 2514
+#define wxXmlResource_Get 2515
+#define wxXmlResource_GetFlags 2516
+#define wxXmlResource_GetVersion 2517
+#define wxXmlResource_GetXRCID 2518
+#define wxXmlResource_InitAllHandlers 2519
+#define wxXmlResource_Load 2520
+#define wxXmlResource_LoadBitmap 2521
+#define wxXmlResource_LoadDialog_2 2522
+#define wxXmlResource_LoadDialog_3 2523
+#define wxXmlResource_LoadFrame_2 2524
+#define wxXmlResource_LoadFrame_3 2525
+#define wxXmlResource_LoadIcon 2526
+#define wxXmlResource_LoadMenu 2527
+#define wxXmlResource_LoadMenuBar_2 2528
+#define wxXmlResource_LoadMenuBar_1 2529
+#define wxXmlResource_LoadPanel_2 2530
+#define wxXmlResource_LoadPanel_3 2531
+#define wxXmlResource_LoadToolBar 2532
+#define wxXmlResource_Set 2533
+#define wxXmlResource_SetFlags 2534
+#define wxXmlResource_Unload 2535
+#define wxXmlResource_xrcctrl 2536
+#define wxHtmlEasyPrinting_new 2537
+#define wxHtmlEasyPrinting_destruct 2538
+#define wxHtmlEasyPrinting_GetPrintData 2539
+#define wxHtmlEasyPrinting_GetPageSetupData 2540
+#define wxHtmlEasyPrinting_PreviewFile 2541
+#define wxHtmlEasyPrinting_PreviewText 2542
+#define wxHtmlEasyPrinting_PrintFile 2543
+#define wxHtmlEasyPrinting_PrintText 2544
+#define wxHtmlEasyPrinting_PageSetup 2545
+#define wxHtmlEasyPrinting_SetFonts 2546
+#define wxHtmlEasyPrinting_SetHeader 2547
+#define wxHtmlEasyPrinting_SetFooter 2548
+#define wxGLCanvas_new_2 2550
+#define wxGLCanvas_new_3_1 2551
+#define wxGLCanvas_new_3_0 2552
+#define wxGLCanvas_GetContext 2553
+#define wxGLCanvas_SetCurrent 2555
+#define wxGLCanvas_SwapBuffers 2556
+#define wxGLCanvas_destroy 2557
+#define wxAuiManager_new 2558
+#define wxAuiManager_destruct 2559
+#define wxAuiManager_AddPane_2_1 2560
+#define wxAuiManager_AddPane_3 2561
+#define wxAuiManager_AddPane_2_0 2562
+#define wxAuiManager_DetachPane 2563
+#define wxAuiManager_GetAllPanes 2564
+#define wxAuiManager_GetArtProvider 2565
+#define wxAuiManager_GetDockSizeConstraint 2566
+#define wxAuiManager_GetFlags 2567
+#define wxAuiManager_GetManagedWindow 2568
+#define wxAuiManager_GetManager 2569
+#define wxAuiManager_GetPane_1_1 2570
+#define wxAuiManager_GetPane_1_0 2571
+#define wxAuiManager_HideHint 2572
+#define wxAuiManager_InsertPane 2573
+#define wxAuiManager_LoadPaneInfo 2574
+#define wxAuiManager_LoadPerspective 2575
+#define wxAuiManager_SavePaneInfo 2576
+#define wxAuiManager_SavePerspective 2577
+#define wxAuiManager_SetArtProvider 2578
+#define wxAuiManager_SetDockSizeConstraint 2579
+#define wxAuiManager_SetFlags 2580
+#define wxAuiManager_SetManagedWindow 2581
+#define wxAuiManager_ShowHint 2582
+#define wxAuiManager_UnInit 2583
+#define wxAuiManager_Update 2584
+#define wxAuiPaneInfo_new_0 2585
+#define wxAuiPaneInfo_new_1 2586
+#define wxAuiPaneInfo_destruct 2587
+#define wxAuiPaneInfo_BestSize_1 2588
+#define wxAuiPaneInfo_BestSize_2 2589
+#define wxAuiPaneInfo_Bottom 2590
+#define wxAuiPaneInfo_BottomDockable 2591
+#define wxAuiPaneInfo_Caption 2592
+#define wxAuiPaneInfo_CaptionVisible 2593
+#define wxAuiPaneInfo_Centre 2594
+#define wxAuiPaneInfo_CentrePane 2595
+#define wxAuiPaneInfo_CloseButton 2596
+#define wxAuiPaneInfo_DefaultPane 2597
+#define wxAuiPaneInfo_DestroyOnClose 2598
+#define wxAuiPaneInfo_Direction 2599
+#define wxAuiPaneInfo_Dock 2600
+#define wxAuiPaneInfo_Dockable 2601
+#define wxAuiPaneInfo_Fixed 2602
+#define wxAuiPaneInfo_Float 2603
+#define wxAuiPaneInfo_Floatable 2604
+#define wxAuiPaneInfo_FloatingPosition_1 2605
+#define wxAuiPaneInfo_FloatingPosition_2 2606
+#define wxAuiPaneInfo_FloatingSize_1 2607
+#define wxAuiPaneInfo_FloatingSize_2 2608
+#define wxAuiPaneInfo_Gripper 2609
+#define wxAuiPaneInfo_GripperTop 2610
+#define wxAuiPaneInfo_HasBorder 2611
+#define wxAuiPaneInfo_HasCaption 2612
+#define wxAuiPaneInfo_HasCloseButton 2613
+#define wxAuiPaneInfo_HasFlag 2614
+#define wxAuiPaneInfo_HasGripper 2615
+#define wxAuiPaneInfo_HasGripperTop 2616
+#define wxAuiPaneInfo_HasMaximizeButton 2617
+#define wxAuiPaneInfo_HasMinimizeButton 2618
+#define wxAuiPaneInfo_HasPinButton 2619
+#define wxAuiPaneInfo_Hide 2620
+#define wxAuiPaneInfo_IsBottomDockable 2621
+#define wxAuiPaneInfo_IsDocked 2622
+#define wxAuiPaneInfo_IsFixed 2623
+#define wxAuiPaneInfo_IsFloatable 2624
+#define wxAuiPaneInfo_IsFloating 2625
+#define wxAuiPaneInfo_IsLeftDockable 2626
+#define wxAuiPaneInfo_IsMovable 2627
+#define wxAuiPaneInfo_IsOk 2628
+#define wxAuiPaneInfo_IsResizable 2629
+#define wxAuiPaneInfo_IsRightDockable 2630
+#define wxAuiPaneInfo_IsShown 2631
+#define wxAuiPaneInfo_IsToolbar 2632
+#define wxAuiPaneInfo_IsTopDockable 2633
+#define wxAuiPaneInfo_Layer 2634
+#define wxAuiPaneInfo_Left 2635
+#define wxAuiPaneInfo_LeftDockable 2636
+#define wxAuiPaneInfo_MaxSize_1 2637
+#define wxAuiPaneInfo_MaxSize_2 2638
+#define wxAuiPaneInfo_MaximizeButton 2639
+#define wxAuiPaneInfo_MinSize_1 2640
+#define wxAuiPaneInfo_MinSize_2 2641
+#define wxAuiPaneInfo_MinimizeButton 2642
+#define wxAuiPaneInfo_Movable 2643
+#define wxAuiPaneInfo_Name 2644
+#define wxAuiPaneInfo_PaneBorder 2645
+#define wxAuiPaneInfo_PinButton 2646
+#define wxAuiPaneInfo_Position 2647
+#define wxAuiPaneInfo_Resizable 2648
+#define wxAuiPaneInfo_Right 2649
+#define wxAuiPaneInfo_RightDockable 2650
+#define wxAuiPaneInfo_Row 2651
+#define wxAuiPaneInfo_SafeSet 2652
+#define wxAuiPaneInfo_SetFlag 2653
+#define wxAuiPaneInfo_Show 2654
+#define wxAuiPaneInfo_ToolbarPane 2655
+#define wxAuiPaneInfo_Top 2656
+#define wxAuiPaneInfo_TopDockable 2657
+#define wxAuiPaneInfo_Window 2658
+#define wxAuiPaneInfo_GetWindow 2659
+#define wxAuiPaneInfo_GetFrame 2660
+#define wxAuiPaneInfo_GetDirection 2661
+#define wxAuiPaneInfo_GetLayer 2662
+#define wxAuiPaneInfo_GetRow 2663
+#define wxAuiPaneInfo_GetPosition 2664
+#define wxAuiPaneInfo_GetFloatingPosition 2665
+#define wxAuiPaneInfo_GetFloatingSize 2666
+#define wxAuiNotebook_new_0 2667
+#define wxAuiNotebook_new_2 2668
+#define wxAuiNotebook_AddPage 2669
+#define wxAuiNotebook_Create 2670
+#define wxAuiNotebook_DeletePage 2671
+#define wxAuiNotebook_GetArtProvider 2672
+#define wxAuiNotebook_GetPage 2673
+#define wxAuiNotebook_GetPageBitmap 2674
+#define wxAuiNotebook_GetPageCount 2675
+#define wxAuiNotebook_GetPageIndex 2676
+#define wxAuiNotebook_GetPageText 2677
+#define wxAuiNotebook_GetSelection 2678
+#define wxAuiNotebook_InsertPage 2679
+#define wxAuiNotebook_RemovePage 2680
+#define wxAuiNotebook_SetArtProvider 2681
+#define wxAuiNotebook_SetFont 2682
+#define wxAuiNotebook_SetPageBitmap 2683
+#define wxAuiNotebook_SetPageText 2684
+#define wxAuiNotebook_SetSelection 2685
+#define wxAuiNotebook_SetTabCtrlHeight 2686
+#define wxAuiNotebook_SetUniformBitmapSize 2687
+#define wxAuiNotebook_destroy 2688
+#define wxAuiTabArt_SetFlags 2689
+#define wxAuiTabArt_SetMeasuringFont 2690
+#define wxAuiTabArt_SetNormalFont 2691
+#define wxAuiTabArt_SetSelectedFont 2692
+#define wxAuiTabArt_SetColour 2693
+#define wxAuiTabArt_SetActiveColour 2694
+#define wxAuiDockArt_GetColour 2695
+#define wxAuiDockArt_GetFont 2696
+#define wxAuiDockArt_GetMetric 2697
+#define wxAuiDockArt_SetColour 2698
+#define wxAuiDockArt_SetFont 2699
+#define wxAuiDockArt_SetMetric 2700
+#define wxAuiSimpleTabArt_new 2701
+#define wxAuiSimpleTabArt_destroy 2702
+#define wxMDIParentFrame_new_0 2703
+#define wxMDIParentFrame_new_4 2704
+#define wxMDIParentFrame_destruct 2705
+#define wxMDIParentFrame_ActivateNext 2706
+#define wxMDIParentFrame_ActivatePrevious 2707
+#define wxMDIParentFrame_ArrangeIcons 2708
+#define wxMDIParentFrame_Cascade 2709
+#define wxMDIParentFrame_Create 2710
+#define wxMDIParentFrame_GetActiveChild 2711
+#define wxMDIParentFrame_GetClientWindow 2712
+#define wxMDIParentFrame_Tile 2713
+#define wxMDIChildFrame_new_0 2714
+#define wxMDIChildFrame_new_4 2715
+#define wxMDIChildFrame_destruct 2716
+#define wxMDIChildFrame_Activate 2717
+#define wxMDIChildFrame_Create 2718
+#define wxMDIChildFrame_Maximize 2719
+#define wxMDIChildFrame_Restore 2720
+#define wxMDIClientWindow_new_0 2721
+#define wxMDIClientWindow_new_2 2722
+#define wxMDIClientWindow_destruct 2723
+#define wxMDIClientWindow_CreateClient 2724
+#define wxLayoutAlgorithm_new 2725
+#define wxLayoutAlgorithm_LayoutFrame 2726
+#define wxLayoutAlgorithm_LayoutMDIFrame 2727
+#define wxLayoutAlgorithm_LayoutWindow 2728
+#define wxLayoutAlgorithm_destroy 2729
+#define wxEvent_GetId 2730
+#define wxEvent_GetSkipped 2731
+#define wxEvent_GetTimestamp 2732
+#define wxEvent_IsCommandEvent 2733
+#define wxEvent_ResumePropagation 2734
+#define wxEvent_ShouldPropagate 2735
+#define wxEvent_Skip 2736
+#define wxEvent_StopPropagation 2737
+#define wxCommandEvent_getClientData 2738
+#define wxCommandEvent_GetExtraLong 2739
+#define wxCommandEvent_GetInt 2740
+#define wxCommandEvent_GetSelection 2741
+#define wxCommandEvent_GetString 2742
+#define wxCommandEvent_IsChecked 2743
+#define wxCommandEvent_IsSelection 2744
+#define wxCommandEvent_SetInt 2745
+#define wxCommandEvent_SetString 2746
+#define wxScrollEvent_GetOrientation 2747
+#define wxScrollEvent_GetPosition 2748
+#define wxScrollWinEvent_GetOrientation 2749
+#define wxScrollWinEvent_GetPosition 2750
+#define wxMouseEvent_AltDown 2751
+#define wxMouseEvent_Button 2752
+#define wxMouseEvent_ButtonDClick 2753
+#define wxMouseEvent_ButtonDown 2754
+#define wxMouseEvent_ButtonUp 2755
+#define wxMouseEvent_CmdDown 2756
+#define wxMouseEvent_ControlDown 2757
+#define wxMouseEvent_Dragging 2758
+#define wxMouseEvent_Entering 2759
+#define wxMouseEvent_GetButton 2760
+#define wxMouseEvent_GetPosition 2763
+#define wxMouseEvent_GetLogicalPosition 2764
+#define wxMouseEvent_GetLinesPerAction 2765
+#define wxMouseEvent_GetWheelRotation 2766
+#define wxMouseEvent_GetWheelDelta 2767
+#define wxMouseEvent_GetX 2768
+#define wxMouseEvent_GetY 2769
+#define wxMouseEvent_IsButton 2770
+#define wxMouseEvent_IsPageScroll 2771
+#define wxMouseEvent_Leaving 2772
+#define wxMouseEvent_LeftDClick 2773
+#define wxMouseEvent_LeftDown 2774
+#define wxMouseEvent_LeftIsDown 2775
+#define wxMouseEvent_LeftUp 2776
+#define wxMouseEvent_MetaDown 2777
+#define wxMouseEvent_MiddleDClick 2778
+#define wxMouseEvent_MiddleDown 2779
+#define wxMouseEvent_MiddleIsDown 2780
+#define wxMouseEvent_MiddleUp 2781
+#define wxMouseEvent_Moving 2782
+#define wxMouseEvent_RightDClick 2783
+#define wxMouseEvent_RightDown 2784
+#define wxMouseEvent_RightIsDown 2785
+#define wxMouseEvent_RightUp 2786
+#define wxMouseEvent_ShiftDown 2787
+#define wxSetCursorEvent_GetCursor 2788
+#define wxSetCursorEvent_GetX 2789
+#define wxSetCursorEvent_GetY 2790
+#define wxSetCursorEvent_HasCursor 2791
+#define wxSetCursorEvent_SetCursor 2792
+#define wxKeyEvent_AltDown 2793
+#define wxKeyEvent_CmdDown 2794
+#define wxKeyEvent_ControlDown 2795
+#define wxKeyEvent_GetKeyCode 2796
+#define wxKeyEvent_GetModifiers 2797
+#define wxKeyEvent_GetPosition 2800
+#define wxKeyEvent_GetRawKeyCode 2801
+#define wxKeyEvent_GetRawKeyFlags 2802
+#define wxKeyEvent_GetUnicodeKey 2803
+#define wxKeyEvent_GetX 2804
+#define wxKeyEvent_GetY 2805
+#define wxKeyEvent_HasModifiers 2806
+#define wxKeyEvent_MetaDown 2807
+#define wxKeyEvent_ShiftDown 2808
+#define wxSizeEvent_GetSize 2809
+#define wxMoveEvent_GetPosition 2810
+#define wxEraseEvent_GetDC 2811
+#define wxFocusEvent_GetWindow 2812
+#define wxChildFocusEvent_GetWindow 2813
+#define wxMenuEvent_GetMenu 2814
+#define wxMenuEvent_GetMenuId 2815
+#define wxMenuEvent_IsPopup 2816
+#define wxCloseEvent_CanVeto 2817
+#define wxCloseEvent_GetLoggingOff 2818
+#define wxCloseEvent_SetCanVeto 2819
+#define wxCloseEvent_SetLoggingOff 2820
+#define wxCloseEvent_Veto 2821
+#define wxShowEvent_SetShow 2822
+#define wxShowEvent_GetShow 2823
+#define wxIconizeEvent_Iconized 2824
+#define wxJoystickEvent_ButtonDown 2825
+#define wxJoystickEvent_ButtonIsDown 2826
+#define wxJoystickEvent_ButtonUp 2827
+#define wxJoystickEvent_GetButtonChange 2828
+#define wxJoystickEvent_GetButtonState 2829
+#define wxJoystickEvent_GetJoystick 2830
+#define wxJoystickEvent_GetPosition 2831
+#define wxJoystickEvent_GetZPosition 2832
+#define wxJoystickEvent_IsButton 2833
+#define wxJoystickEvent_IsMove 2834
+#define wxJoystickEvent_IsZMove 2835
+#define wxUpdateUIEvent_CanUpdate 2836
+#define wxUpdateUIEvent_Check 2837
+#define wxUpdateUIEvent_Enable 2838
+#define wxUpdateUIEvent_Show 2839
+#define wxUpdateUIEvent_GetChecked 2840
+#define wxUpdateUIEvent_GetEnabled 2841
+#define wxUpdateUIEvent_GetShown 2842
+#define wxUpdateUIEvent_GetSetChecked 2843
+#define wxUpdateUIEvent_GetSetEnabled 2844
+#define wxUpdateUIEvent_GetSetShown 2845
+#define wxUpdateUIEvent_GetSetText 2846
+#define wxUpdateUIEvent_GetText 2847
+#define wxUpdateUIEvent_GetMode 2848
+#define wxUpdateUIEvent_GetUpdateInterval 2849
+#define wxUpdateUIEvent_ResetUpdateTime 2850
+#define wxUpdateUIEvent_SetMode 2851
+#define wxUpdateUIEvent_SetText 2852
+#define wxUpdateUIEvent_SetUpdateInterval 2853
+#define wxMouseCaptureChangedEvent_GetCapturedWindow 2854
+#define wxPaletteChangedEvent_SetChangedWindow 2855
+#define wxPaletteChangedEvent_GetChangedWindow 2856
+#define wxQueryNewPaletteEvent_SetPaletteRealized 2857
+#define wxQueryNewPaletteEvent_GetPaletteRealized 2858
+#define wxNavigationKeyEvent_GetDirection 2859
+#define wxNavigationKeyEvent_SetDirection 2860
+#define wxNavigationKeyEvent_IsWindowChange 2861
+#define wxNavigationKeyEvent_SetWindowChange 2862
+#define wxNavigationKeyEvent_IsFromTab 2863
+#define wxNavigationKeyEvent_SetFromTab 2864
+#define wxNavigationKeyEvent_GetCurrentFocus 2865
+#define wxNavigationKeyEvent_SetCurrentFocus 2866
+#define wxHelpEvent_GetOrigin 2867
+#define wxHelpEvent_GetPosition 2868
+#define wxHelpEvent_SetOrigin 2869
+#define wxHelpEvent_SetPosition 2870
+#define wxContextMenuEvent_GetPosition 2871
+#define wxContextMenuEvent_SetPosition 2872
+#define wxIdleEvent_CanSend 2873
+#define wxIdleEvent_GetMode 2874
+#define wxIdleEvent_RequestMore 2875
+#define wxIdleEvent_MoreRequested 2876
+#define wxIdleEvent_SetMode 2877
+#define wxGridEvent_AltDown 2878
+#define wxGridEvent_ControlDown 2879
+#define wxGridEvent_GetCol 2880
+#define wxGridEvent_GetPosition 2881
+#define wxGridEvent_GetRow 2882
+#define wxGridEvent_MetaDown 2883
+#define wxGridEvent_Selecting 2884
+#define wxGridEvent_ShiftDown 2885
+#define wxNotifyEvent_Allow 2886
+#define wxNotifyEvent_IsAllowed 2887
+#define wxNotifyEvent_Veto 2888
+#define wxSashEvent_GetEdge 2889
+#define wxSashEvent_GetDragRect 2890
+#define wxSashEvent_GetDragStatus 2891
+#define wxListEvent_GetCacheFrom 2892
+#define wxListEvent_GetCacheTo 2893
+#define wxListEvent_GetKeyCode 2894
+#define wxListEvent_GetIndex 2895
+#define wxListEvent_GetColumn 2896
+#define wxListEvent_GetPoint 2897
+#define wxListEvent_GetLabel 2898
+#define wxListEvent_GetText 2899
+#define wxListEvent_GetImage 2900
+#define wxListEvent_GetData 2901
+#define wxListEvent_GetMask 2902
+#define wxListEvent_GetItem 2903
+#define wxListEvent_IsEditCancelled 2904
+#define wxDateEvent_GetDate 2905
+#define wxCalendarEvent_GetWeekDay 2906
+#define wxFileDirPickerEvent_GetPath 2907
+#define wxColourPickerEvent_GetColour 2908
+#define wxFontPickerEvent_GetFont 2909
+#define wxStyledTextEvent_GetPosition 2910
+#define wxStyledTextEvent_GetKey 2911
+#define wxStyledTextEvent_GetModifiers 2912
+#define wxStyledTextEvent_GetModificationType 2913
+#define wxStyledTextEvent_GetText 2914
+#define wxStyledTextEvent_GetLength 2915
+#define wxStyledTextEvent_GetLinesAdded 2916
+#define wxStyledTextEvent_GetLine 2917
+#define wxStyledTextEvent_GetFoldLevelNow 2918
+#define wxStyledTextEvent_GetFoldLevelPrev 2919
+#define wxStyledTextEvent_GetMargin 2920
+#define wxStyledTextEvent_GetMessage 2921
+#define wxStyledTextEvent_GetWParam 2922
+#define wxStyledTextEvent_GetLParam 2923
+#define wxStyledTextEvent_GetListType 2924
+#define wxStyledTextEvent_GetX 2925
+#define wxStyledTextEvent_GetY 2926
+#define wxStyledTextEvent_GetDragText 2927
+#define wxStyledTextEvent_GetDragAllowMove 2928
+#define wxStyledTextEvent_GetDragResult 2929
+#define wxStyledTextEvent_GetShift 2930
+#define wxStyledTextEvent_GetControl 2931
+#define wxStyledTextEvent_GetAlt 2932
+#define utils_wxGetKeyState 2933
+#define utils_wxGetMousePosition 2934
+#define utils_wxGetMouseState 2935
+#define utils_wxSetDetectableAutoRepeat 2936
+#define utils_wxBell 2937
+#define utils_wxFindMenuItemId 2938
+#define utils_wxGenericFindWindowAtPoint 2939
+#define utils_wxFindWindowAtPoint 2940
+#define utils_wxBeginBusyCursor 2941
+#define utils_wxEndBusyCursor 2942
+#define utils_wxIsBusy 2943
+#define utils_wxShutdown 2944
+#define utils_wxShell 2945
+#define utils_wxLaunchDefaultBrowser 2946
+#define utils_wxGetEmailAddress 2947
+#define utils_wxGetUserId 2948
+#define utils_wxGetHomeDir 2949
+#define utils_wxNewId 2950
+#define utils_wxRegisterId 2951
+#define utils_wxGetCurrentId 2952
+#define utils_wxGetOsDescription 2953
+#define utils_wxIsPlatformLittleEndian 2954
+#define utils_wxIsPlatform64Bit 2955
+#define gdicmn_wxDisplaySize 2956
+#define gdicmn_wxSetCursor 2957
+#define wxPrintout_new 2958
+#define wxPrintout_destruct 2959
+#define wxPrintout_GetDC 2960
+#define wxPrintout_GetPageSizeMM 2961
+#define wxPrintout_GetPageSizePixels 2962
+#define wxPrintout_GetPaperRectPixels 2963
+#define wxPrintout_GetPPIPrinter 2964
+#define wxPrintout_GetPPIScreen 2965
+#define wxPrintout_GetTitle 2966
+#define wxPrintout_IsPreview 2967
+#define wxPrintout_FitThisSizeToPaper 2968
+#define wxPrintout_FitThisSizeToPage 2969
+#define wxPrintout_FitThisSizeToPageMargins 2970
+#define wxPrintout_MapScreenSizeToPaper 2971
+#define wxPrintout_MapScreenSizeToPage 2972
+#define wxPrintout_MapScreenSizeToPageMargins 2973
+#define wxPrintout_MapScreenSizeToDevice 2974
+#define wxPrintout_GetLogicalPaperRect 2975
+#define wxPrintout_GetLogicalPageRect 2976
+#define wxPrintout_GetLogicalPageMarginsRect 2977
+#define wxPrintout_SetLogicalOrigin 2978
+#define wxPrintout_OffsetLogicalOrigin 2979
+#define wxStyledTextCtrl_new_2 2980
+#define wxStyledTextCtrl_new_0 2981
+#define wxStyledTextCtrl_destruct 2982
+#define wxStyledTextCtrl_Create 2983
+#define wxStyledTextCtrl_AddText 2984
+#define wxStyledTextCtrl_AddStyledText 2985
+#define wxStyledTextCtrl_InsertText 2986
+#define wxStyledTextCtrl_ClearAll 2987
+#define wxStyledTextCtrl_ClearDocumentStyle 2988
+#define wxStyledTextCtrl_GetLength 2989
+#define wxStyledTextCtrl_GetCharAt 2990
+#define wxStyledTextCtrl_GetCurrentPos 2991
+#define wxStyledTextCtrl_GetAnchor 2992
+#define wxStyledTextCtrl_GetStyleAt 2993
+#define wxStyledTextCtrl_Redo 2994
+#define wxStyledTextCtrl_SetUndoCollection 2995
+#define wxStyledTextCtrl_SelectAll 2996
+#define wxStyledTextCtrl_SetSavePoint 2997
+#define wxStyledTextCtrl_GetStyledText 2998
+#define wxStyledTextCtrl_CanRedo 2999
+#define wxStyledTextCtrl_MarkerLineFromHandle 3000
+#define wxStyledTextCtrl_MarkerDeleteHandle 3001
+#define wxStyledTextCtrl_GetUndoCollection 3002
+#define wxStyledTextCtrl_GetViewWhiteSpace 3003
+#define wxStyledTextCtrl_SetViewWhiteSpace 3004
+#define wxStyledTextCtrl_PositionFromPoint 3005
+#define wxStyledTextCtrl_PositionFromPointClose 3006
+#define wxStyledTextCtrl_GotoLine 3007
+#define wxStyledTextCtrl_GotoPos 3008
+#define wxStyledTextCtrl_SetAnchor 3009
+#define wxStyledTextCtrl_GetCurLine 3010
+#define wxStyledTextCtrl_GetEndStyled 3011
+#define wxStyledTextCtrl_ConvertEOLs 3012
+#define wxStyledTextCtrl_GetEOLMode 3013
+#define wxStyledTextCtrl_SetEOLMode 3014
+#define wxStyledTextCtrl_StartStyling 3015
+#define wxStyledTextCtrl_SetStyling 3016
+#define wxStyledTextCtrl_GetBufferedDraw 3017
+#define wxStyledTextCtrl_SetBufferedDraw 3018
+#define wxStyledTextCtrl_SetTabWidth 3019
+#define wxStyledTextCtrl_GetTabWidth 3020
+#define wxStyledTextCtrl_SetCodePage 3021
+#define wxStyledTextCtrl_MarkerDefine 3022
+#define wxStyledTextCtrl_MarkerSetForeground 3023
+#define wxStyledTextCtrl_MarkerSetBackground 3024
+#define wxStyledTextCtrl_MarkerAdd 3025
+#define wxStyledTextCtrl_MarkerDelete 3026
+#define wxStyledTextCtrl_MarkerDeleteAll 3027
+#define wxStyledTextCtrl_MarkerGet 3028
+#define wxStyledTextCtrl_MarkerNext 3029
+#define wxStyledTextCtrl_MarkerPrevious 3030
+#define wxStyledTextCtrl_MarkerDefineBitmap 3031
+#define wxStyledTextCtrl_MarkerAddSet 3032
+#define wxStyledTextCtrl_MarkerSetAlpha 3033
+#define wxStyledTextCtrl_SetMarginType 3034
+#define wxStyledTextCtrl_GetMarginType 3035
+#define wxStyledTextCtrl_SetMarginWidth 3036
+#define wxStyledTextCtrl_GetMarginWidth 3037
+#define wxStyledTextCtrl_SetMarginMask 3038
+#define wxStyledTextCtrl_GetMarginMask 3039
+#define wxStyledTextCtrl_SetMarginSensitive 3040
+#define wxStyledTextCtrl_GetMarginSensitive 3041
+#define wxStyledTextCtrl_StyleClearAll 3042
+#define wxStyledTextCtrl_StyleSetForeground 3043
+#define wxStyledTextCtrl_StyleSetBackground 3044
+#define wxStyledTextCtrl_StyleSetBold 3045
+#define wxStyledTextCtrl_StyleSetItalic 3046
+#define wxStyledTextCtrl_StyleSetSize 3047
+#define wxStyledTextCtrl_StyleSetFaceName 3048
+#define wxStyledTextCtrl_StyleSetEOLFilled 3049
+#define wxStyledTextCtrl_StyleResetDefault 3050
+#define wxStyledTextCtrl_StyleSetUnderline 3051
+#define wxStyledTextCtrl_StyleSetCase 3052
+#define wxStyledTextCtrl_StyleSetHotSpot 3053
+#define wxStyledTextCtrl_SetSelForeground 3054
+#define wxStyledTextCtrl_SetSelBackground 3055
+#define wxStyledTextCtrl_GetSelAlpha 3056
+#define wxStyledTextCtrl_SetSelAlpha 3057
+#define wxStyledTextCtrl_SetCaretForeground 3058
+#define wxStyledTextCtrl_CmdKeyAssign 3059
+#define wxStyledTextCtrl_CmdKeyClear 3060
+#define wxStyledTextCtrl_CmdKeyClearAll 3061
+#define wxStyledTextCtrl_SetStyleBytes 3062
+#define wxStyledTextCtrl_StyleSetVisible 3063
+#define wxStyledTextCtrl_GetCaretPeriod 3064
+#define wxStyledTextCtrl_SetCaretPeriod 3065
+#define wxStyledTextCtrl_SetWordChars 3066
+#define wxStyledTextCtrl_BeginUndoAction 3067
+#define wxStyledTextCtrl_EndUndoAction 3068
+#define wxStyledTextCtrl_IndicatorSetStyle 3069
+#define wxStyledTextCtrl_IndicatorGetStyle 3070
+#define wxStyledTextCtrl_IndicatorSetForeground 3071
+#define wxStyledTextCtrl_IndicatorGetForeground 3072
+#define wxStyledTextCtrl_SetWhitespaceForeground 3073
+#define wxStyledTextCtrl_SetWhitespaceBackground 3074
+#define wxStyledTextCtrl_GetStyleBits 3075
+#define wxStyledTextCtrl_SetLineState 3076
+#define wxStyledTextCtrl_GetLineState 3077
+#define wxStyledTextCtrl_GetMaxLineState 3078
+#define wxStyledTextCtrl_GetCaretLineVisible 3079
+#define wxStyledTextCtrl_SetCaretLineVisible 3080
+#define wxStyledTextCtrl_GetCaretLineBackground 3081
+#define wxStyledTextCtrl_SetCaretLineBackground 3082
+#define wxStyledTextCtrl_AutoCompShow 3083
+#define wxStyledTextCtrl_AutoCompCancel 3084
+#define wxStyledTextCtrl_AutoCompActive 3085
+#define wxStyledTextCtrl_AutoCompPosStart 3086
+#define wxStyledTextCtrl_AutoCompComplete 3087
+#define wxStyledTextCtrl_AutoCompStops 3088
+#define wxStyledTextCtrl_AutoCompSetSeparator 3089
+#define wxStyledTextCtrl_AutoCompGetSeparator 3090
+#define wxStyledTextCtrl_AutoCompSelect 3091
+#define wxStyledTextCtrl_AutoCompSetCancelAtStart 3092
+#define wxStyledTextCtrl_AutoCompGetCancelAtStart 3093
+#define wxStyledTextCtrl_AutoCompSetFillUps 3094
+#define wxStyledTextCtrl_AutoCompSetChooseSingle 3095
+#define wxStyledTextCtrl_AutoCompGetChooseSingle 3096
+#define wxStyledTextCtrl_AutoCompSetIgnoreCase 3097
+#define wxStyledTextCtrl_AutoCompGetIgnoreCase 3098
+#define wxStyledTextCtrl_UserListShow 3099
+#define wxStyledTextCtrl_AutoCompSetAutoHide 3100
+#define wxStyledTextCtrl_AutoCompGetAutoHide 3101
+#define wxStyledTextCtrl_AutoCompSetDropRestOfWord 3102
+#define wxStyledTextCtrl_AutoCompGetDropRestOfWord 3103
+#define wxStyledTextCtrl_RegisterImage 3104
+#define wxStyledTextCtrl_ClearRegisteredImages 3105
+#define wxStyledTextCtrl_AutoCompGetTypeSeparator 3106
+#define wxStyledTextCtrl_AutoCompSetTypeSeparator 3107
+#define wxStyledTextCtrl_AutoCompSetMaxWidth 3108
+#define wxStyledTextCtrl_AutoCompGetMaxWidth 3109
+#define wxStyledTextCtrl_AutoCompSetMaxHeight 3110
+#define wxStyledTextCtrl_AutoCompGetMaxHeight 3111
+#define wxStyledTextCtrl_SetIndent 3112
+#define wxStyledTextCtrl_GetIndent 3113
+#define wxStyledTextCtrl_SetUseTabs 3114
+#define wxStyledTextCtrl_GetUseTabs 3115
+#define wxStyledTextCtrl_SetLineIndentation 3116
+#define wxStyledTextCtrl_GetLineIndentation 3117
+#define wxStyledTextCtrl_GetLineIndentPosition 3118
+#define wxStyledTextCtrl_GetColumn 3119
+#define wxStyledTextCtrl_SetUseHorizontalScrollBar 3120
+#define wxStyledTextCtrl_GetUseHorizontalScrollBar 3121
+#define wxStyledTextCtrl_SetIndentationGuides 3122
+#define wxStyledTextCtrl_GetIndentationGuides 3123
+#define wxStyledTextCtrl_SetHighlightGuide 3124
+#define wxStyledTextCtrl_GetHighlightGuide 3125
+#define wxStyledTextCtrl_GetLineEndPosition 3126
+#define wxStyledTextCtrl_GetCodePage 3127
+#define wxStyledTextCtrl_GetCaretForeground 3128
+#define wxStyledTextCtrl_GetReadOnly 3129
+#define wxStyledTextCtrl_SetCurrentPos 3130
+#define wxStyledTextCtrl_SetSelectionStart 3131
+#define wxStyledTextCtrl_GetSelectionStart 3132
+#define wxStyledTextCtrl_SetSelectionEnd 3133
+#define wxStyledTextCtrl_GetSelectionEnd 3134
+#define wxStyledTextCtrl_SetPrintMagnification 3135
+#define wxStyledTextCtrl_GetPrintMagnification 3136
+#define wxStyledTextCtrl_SetPrintColourMode 3137
+#define wxStyledTextCtrl_GetPrintColourMode 3138
+#define wxStyledTextCtrl_FindText 3139
+#define wxStyledTextCtrl_FormatRange 3140
+#define wxStyledTextCtrl_GetFirstVisibleLine 3141
+#define wxStyledTextCtrl_GetLine 3142
+#define wxStyledTextCtrl_GetLineCount 3143
+#define wxStyledTextCtrl_SetMarginLeft 3144
+#define wxStyledTextCtrl_GetMarginLeft 3145
+#define wxStyledTextCtrl_SetMarginRight 3146
+#define wxStyledTextCtrl_GetMarginRight 3147
+#define wxStyledTextCtrl_GetModify 3148
+#define wxStyledTextCtrl_SetSelection 3149
+#define wxStyledTextCtrl_GetSelectedText 3150
+#define wxStyledTextCtrl_GetTextRange 3151
+#define wxStyledTextCtrl_HideSelection 3152
+#define wxStyledTextCtrl_LineFromPosition 3153
+#define wxStyledTextCtrl_PositionFromLine 3154
+#define wxStyledTextCtrl_LineScroll 3155
+#define wxStyledTextCtrl_EnsureCaretVisible 3156
+#define wxStyledTextCtrl_ReplaceSelection 3157
+#define wxStyledTextCtrl_SetReadOnly 3158
+#define wxStyledTextCtrl_CanPaste 3159
+#define wxStyledTextCtrl_CanUndo 3160
+#define wxStyledTextCtrl_EmptyUndoBuffer 3161
+#define wxStyledTextCtrl_Undo 3162
+#define wxStyledTextCtrl_Cut 3163
+#define wxStyledTextCtrl_Copy 3164
+#define wxStyledTextCtrl_Paste 3165
+#define wxStyledTextCtrl_Clear 3166
+#define wxStyledTextCtrl_SetText 3167
+#define wxStyledTextCtrl_GetText 3168
+#define wxStyledTextCtrl_GetTextLength 3169
+#define wxStyledTextCtrl_GetOvertype 3170
+#define wxStyledTextCtrl_SetCaretWidth 3171
+#define wxStyledTextCtrl_GetCaretWidth 3172
+#define wxStyledTextCtrl_SetTargetStart 3173
+#define wxStyledTextCtrl_GetTargetStart 3174
+#define wxStyledTextCtrl_SetTargetEnd 3175
+#define wxStyledTextCtrl_GetTargetEnd 3176
+#define wxStyledTextCtrl_ReplaceTarget 3177
+#define wxStyledTextCtrl_SearchInTarget 3178
+#define wxStyledTextCtrl_SetSearchFlags 3179
+#define wxStyledTextCtrl_GetSearchFlags 3180
+#define wxStyledTextCtrl_CallTipShow 3181
+#define wxStyledTextCtrl_CallTipCancel 3182
+#define wxStyledTextCtrl_CallTipActive 3183
+#define wxStyledTextCtrl_CallTipPosAtStart 3184
+#define wxStyledTextCtrl_CallTipSetHighlight 3185
+#define wxStyledTextCtrl_CallTipSetBackground 3186
+#define wxStyledTextCtrl_CallTipSetForeground 3187
+#define wxStyledTextCtrl_CallTipSetForegroundHighlight 3188
+#define wxStyledTextCtrl_CallTipUseStyle 3189
+#define wxStyledTextCtrl_VisibleFromDocLine 3190
+#define wxStyledTextCtrl_DocLineFromVisible 3191
+#define wxStyledTextCtrl_WrapCount 3192
+#define wxStyledTextCtrl_SetFoldLevel 3193
+#define wxStyledTextCtrl_GetFoldLevel 3194
+#define wxStyledTextCtrl_GetLastChild 3195
+#define wxStyledTextCtrl_GetFoldParent 3196
+#define wxStyledTextCtrl_ShowLines 3197
+#define wxStyledTextCtrl_HideLines 3198
+#define wxStyledTextCtrl_GetLineVisible 3199
+#define wxStyledTextCtrl_SetFoldExpanded 3200
+#define wxStyledTextCtrl_GetFoldExpanded 3201
+#define wxStyledTextCtrl_ToggleFold 3202
+#define wxStyledTextCtrl_EnsureVisible 3203
+#define wxStyledTextCtrl_SetFoldFlags 3204
+#define wxStyledTextCtrl_EnsureVisibleEnforcePolicy 3205
+#define wxStyledTextCtrl_SetTabIndents 3206
+#define wxStyledTextCtrl_GetTabIndents 3207
+#define wxStyledTextCtrl_SetBackSpaceUnIndents 3208
+#define wxStyledTextCtrl_GetBackSpaceUnIndents 3209
+#define wxStyledTextCtrl_SetMouseDwellTime 3210
+#define wxStyledTextCtrl_GetMouseDwellTime 3211
+#define wxStyledTextCtrl_WordStartPosition 3212
+#define wxStyledTextCtrl_WordEndPosition 3213
+#define wxStyledTextCtrl_SetWrapMode 3214
+#define wxStyledTextCtrl_GetWrapMode 3215
+#define wxStyledTextCtrl_SetWrapVisualFlags 3216
+#define wxStyledTextCtrl_GetWrapVisualFlags 3217
+#define wxStyledTextCtrl_SetWrapVisualFlagsLocation 3218
+#define wxStyledTextCtrl_GetWrapVisualFlagsLocation 3219
+#define wxStyledTextCtrl_SetWrapStartIndent 3220
+#define wxStyledTextCtrl_GetWrapStartIndent 3221
+#define wxStyledTextCtrl_SetLayoutCache 3222
+#define wxStyledTextCtrl_GetLayoutCache 3223
+#define wxStyledTextCtrl_SetScrollWidth 3224
+#define wxStyledTextCtrl_GetScrollWidth 3225
+#define wxStyledTextCtrl_TextWidth 3226
+#define wxStyledTextCtrl_GetEndAtLastLine 3227
+#define wxStyledTextCtrl_TextHeight 3228
+#define wxStyledTextCtrl_SetUseVerticalScrollBar 3229
+#define wxStyledTextCtrl_GetUseVerticalScrollBar 3230
+#define wxStyledTextCtrl_AppendText 3231
+#define wxStyledTextCtrl_GetTwoPhaseDraw 3232
+#define wxStyledTextCtrl_SetTwoPhaseDraw 3233
+#define wxStyledTextCtrl_TargetFromSelection 3234
+#define wxStyledTextCtrl_LinesJoin 3235
+#define wxStyledTextCtrl_LinesSplit 3236
+#define wxStyledTextCtrl_SetFoldMarginColour 3237
+#define wxStyledTextCtrl_SetFoldMarginHiColour 3238
+#define wxStyledTextCtrl_LineDown 3239
+#define wxStyledTextCtrl_LineDownExtend 3240
+#define wxStyledTextCtrl_LineUp 3241
+#define wxStyledTextCtrl_LineUpExtend 3242
+#define wxStyledTextCtrl_CharLeft 3243
+#define wxStyledTextCtrl_CharLeftExtend 3244
+#define wxStyledTextCtrl_CharRight 3245
+#define wxStyledTextCtrl_CharRightExtend 3246
+#define wxStyledTextCtrl_WordLeft 3247
+#define wxStyledTextCtrl_WordLeftExtend 3248
+#define wxStyledTextCtrl_WordRight 3249
+#define wxStyledTextCtrl_WordRightExtend 3250
+#define wxStyledTextCtrl_Home 3251
+#define wxStyledTextCtrl_HomeExtend 3252
+#define wxStyledTextCtrl_LineEnd 3253
+#define wxStyledTextCtrl_LineEndExtend 3254
+#define wxStyledTextCtrl_DocumentStart 3255
+#define wxStyledTextCtrl_DocumentStartExtend 3256
+#define wxStyledTextCtrl_DocumentEnd 3257
+#define wxStyledTextCtrl_DocumentEndExtend 3258
+#define wxStyledTextCtrl_PageUp 3259
+#define wxStyledTextCtrl_PageUpExtend 3260
+#define wxStyledTextCtrl_PageDown 3261
+#define wxStyledTextCtrl_PageDownExtend 3262
+#define wxStyledTextCtrl_EditToggleOvertype 3263
+#define wxStyledTextCtrl_Cancel 3264
+#define wxStyledTextCtrl_DeleteBack 3265
+#define wxStyledTextCtrl_Tab 3266
+#define wxStyledTextCtrl_BackTab 3267
+#define wxStyledTextCtrl_NewLine 3268
+#define wxStyledTextCtrl_FormFeed 3269
+#define wxStyledTextCtrl_VCHome 3270
+#define wxStyledTextCtrl_VCHomeExtend 3271
+#define wxStyledTextCtrl_ZoomIn 3272
+#define wxStyledTextCtrl_ZoomOut 3273
+#define wxStyledTextCtrl_DelWordLeft 3274
+#define wxStyledTextCtrl_DelWordRight 3275
+#define wxStyledTextCtrl_LineCut 3276
+#define wxStyledTextCtrl_LineDelete 3277
+#define wxStyledTextCtrl_LineTranspose 3278
+#define wxStyledTextCtrl_LineDuplicate 3279
+#define wxStyledTextCtrl_LowerCase 3280
+#define wxStyledTextCtrl_UpperCase 3281
+#define wxStyledTextCtrl_LineScrollDown 3282
+#define wxStyledTextCtrl_LineScrollUp 3283
+#define wxStyledTextCtrl_DeleteBackNotLine 3284
+#define wxStyledTextCtrl_HomeDisplay 3285
+#define wxStyledTextCtrl_HomeDisplayExtend 3286
+#define wxStyledTextCtrl_LineEndDisplay 3287
+#define wxStyledTextCtrl_LineEndDisplayExtend 3288
+#define wxStyledTextCtrl_HomeWrapExtend 3289
+#define wxStyledTextCtrl_LineEndWrap 3290
+#define wxStyledTextCtrl_LineEndWrapExtend 3291
+#define wxStyledTextCtrl_VCHomeWrap 3292
+#define wxStyledTextCtrl_VCHomeWrapExtend 3293
+#define wxStyledTextCtrl_LineCopy 3294
+#define wxStyledTextCtrl_MoveCaretInsideView 3295
+#define wxStyledTextCtrl_LineLength 3296
+#define wxStyledTextCtrl_BraceHighlight 3297
+#define wxStyledTextCtrl_BraceBadLight 3298
+#define wxStyledTextCtrl_BraceMatch 3299
+#define wxStyledTextCtrl_GetViewEOL 3300
+#define wxStyledTextCtrl_SetViewEOL 3301
+#define wxStyledTextCtrl_SetModEventMask 3302
+#define wxStyledTextCtrl_GetEdgeColumn 3303
+#define wxStyledTextCtrl_SetEdgeColumn 3304
+#define wxStyledTextCtrl_SetEdgeMode 3305
+#define wxStyledTextCtrl_GetEdgeMode 3306
+#define wxStyledTextCtrl_GetEdgeColour 3307
+#define wxStyledTextCtrl_SetEdgeColour 3308
+#define wxStyledTextCtrl_SearchAnchor 3309
+#define wxStyledTextCtrl_SearchNext 3310
+#define wxStyledTextCtrl_SearchPrev 3311
+#define wxStyledTextCtrl_LinesOnScreen 3312
+#define wxStyledTextCtrl_UsePopUp 3313
+#define wxStyledTextCtrl_SelectionIsRectangle 3314
+#define wxStyledTextCtrl_SetZoom 3315
+#define wxStyledTextCtrl_GetZoom 3316
+#define wxStyledTextCtrl_GetModEventMask 3317
+#define wxStyledTextCtrl_SetSTCFocus 3318
+#define wxStyledTextCtrl_GetSTCFocus 3319
+#define wxStyledTextCtrl_SetStatus 3320
+#define wxStyledTextCtrl_GetStatus 3321
+#define wxStyledTextCtrl_SetMouseDownCaptures 3322
+#define wxStyledTextCtrl_GetMouseDownCaptures 3323
+#define wxStyledTextCtrl_SetSTCCursor 3324
+#define wxStyledTextCtrl_GetSTCCursor 3325
+#define wxStyledTextCtrl_SetControlCharSymbol 3326
+#define wxStyledTextCtrl_GetControlCharSymbol 3327
+#define wxStyledTextCtrl_WordPartLeft 3328
+#define wxStyledTextCtrl_WordPartLeftExtend 3329
+#define wxStyledTextCtrl_WordPartRight 3330
+#define wxStyledTextCtrl_WordPartRightExtend 3331
+#define wxStyledTextCtrl_SetVisiblePolicy 3332
+#define wxStyledTextCtrl_DelLineLeft 3333
+#define wxStyledTextCtrl_DelLineRight 3334
+#define wxStyledTextCtrl_GetXOffset 3335
+#define wxStyledTextCtrl_ChooseCaretX 3336
+#define wxStyledTextCtrl_SetXCaretPolicy 3337
+#define wxStyledTextCtrl_SetYCaretPolicy 3338
+#define wxStyledTextCtrl_GetPrintWrapMode 3339
+#define wxStyledTextCtrl_SetHotspotActiveForeground 3340
+#define wxStyledTextCtrl_SetHotspotActiveBackground 3341
+#define wxStyledTextCtrl_SetHotspotActiveUnderline 3342
+#define wxStyledTextCtrl_SetHotspotSingleLine 3343
+#define wxStyledTextCtrl_ParaDownExtend 3344
+#define wxStyledTextCtrl_ParaUp 3345
+#define wxStyledTextCtrl_ParaUpExtend 3346
+#define wxStyledTextCtrl_PositionBefore 3347
+#define wxStyledTextCtrl_PositionAfter 3348
+#define wxStyledTextCtrl_CopyRange 3349
+#define wxStyledTextCtrl_CopyText 3350
+#define wxStyledTextCtrl_SetSelectionMode 3351
+#define wxStyledTextCtrl_GetSelectionMode 3352
+#define wxStyledTextCtrl_LineDownRectExtend 3353
+#define wxStyledTextCtrl_LineUpRectExtend 3354
+#define wxStyledTextCtrl_CharLeftRectExtend 3355
+#define wxStyledTextCtrl_CharRightRectExtend 3356
+#define wxStyledTextCtrl_HomeRectExtend 3357
+#define wxStyledTextCtrl_VCHomeRectExtend 3358
+#define wxStyledTextCtrl_LineEndRectExtend 3359
+#define wxStyledTextCtrl_PageUpRectExtend 3360
+#define wxStyledTextCtrl_PageDownRectExtend 3361
+#define wxStyledTextCtrl_StutteredPageUp 3362
+#define wxStyledTextCtrl_StutteredPageUpExtend 3363
+#define wxStyledTextCtrl_StutteredPageDown 3364
+#define wxStyledTextCtrl_StutteredPageDownExtend 3365
+#define wxStyledTextCtrl_WordLeftEnd 3366
+#define wxStyledTextCtrl_WordLeftEndExtend 3367
+#define wxStyledTextCtrl_WordRightEnd 3368
+#define wxStyledTextCtrl_WordRightEndExtend 3369
+#define wxStyledTextCtrl_SetWhitespaceChars 3370
+#define wxStyledTextCtrl_SetCharsDefault 3371
+#define wxStyledTextCtrl_AutoCompGetCurrent 3372
+#define wxStyledTextCtrl_Allocate 3373
+#define wxStyledTextCtrl_FindColumn 3374
+#define wxStyledTextCtrl_GetCaretSticky 3375
+#define wxStyledTextCtrl_SetCaretSticky 3376
+#define wxStyledTextCtrl_ToggleCaretSticky 3377
+#define wxStyledTextCtrl_SetPasteConvertEndings 3378
+#define wxStyledTextCtrl_GetPasteConvertEndings 3379
+#define wxStyledTextCtrl_SelectionDuplicate 3380
+#define wxStyledTextCtrl_SetCaretLineBackAlpha 3381
+#define wxStyledTextCtrl_GetCaretLineBackAlpha 3382
+#define wxStyledTextCtrl_StartRecord 3383
+#define wxStyledTextCtrl_StopRecord 3384
+#define wxStyledTextCtrl_SetLexer 3385
+#define wxStyledTextCtrl_GetLexer 3386
+#define wxStyledTextCtrl_Colourise 3387
+#define wxStyledTextCtrl_SetProperty 3388
+#define wxStyledTextCtrl_SetKeyWords 3389
+#define wxStyledTextCtrl_SetLexerLanguage 3390
+#define wxStyledTextCtrl_GetProperty 3391
+#define wxStyledTextCtrl_GetStyleBitsNeeded 3392
+#define wxStyledTextCtrl_GetCurrentLine 3393
+#define wxStyledTextCtrl_StyleSetSpec 3394
+#define wxStyledTextCtrl_StyleSetFont 3395
+#define wxStyledTextCtrl_StyleSetFontAttr 3396
+#define wxStyledTextCtrl_StyleSetCharacterSet 3397
+#define wxStyledTextCtrl_StyleSetFontEncoding 3398
+#define wxStyledTextCtrl_CmdKeyExecute 3399
+#define wxStyledTextCtrl_SetMargins 3400
+#define wxStyledTextCtrl_GetSelection 3401
+#define wxStyledTextCtrl_PointFromPosition 3402
+#define wxStyledTextCtrl_ScrollToLine 3403
+#define wxStyledTextCtrl_ScrollToColumn 3404
+#define wxStyledTextCtrl_SetVScrollBar 3405
+#define wxStyledTextCtrl_SetHScrollBar 3406
+#define wxStyledTextCtrl_GetLastKeydownProcessed 3407
+#define wxStyledTextCtrl_SetLastKeydownProcessed 3408
+#define wxStyledTextCtrl_SaveFile 3409
+#define wxStyledTextCtrl_LoadFile 3410
+#define wxStyledTextCtrl_DoDragOver 3411
+#define wxStyledTextCtrl_DoDropText 3412
+#define wxStyledTextCtrl_GetUseAntiAliasing 3413
+#define wxStyledTextCtrl_AddTextRaw 3414
+#define wxStyledTextCtrl_InsertTextRaw 3415
+#define wxStyledTextCtrl_GetCurLineRaw 3416
+#define wxStyledTextCtrl_GetLineRaw 3417
+#define wxStyledTextCtrl_GetSelectedTextRaw 3418
+#define wxStyledTextCtrl_GetTextRangeRaw 3419
+#define wxStyledTextCtrl_SetTextRaw 3420
+#define wxStyledTextCtrl_GetTextRaw 3421
+#define wxStyledTextCtrl_AppendTextRaw 3422
+#define wxArtProvider_GetBitmap 3423
+#define wxArtProvider_GetIcon 3424
+#define wxTreeEvent_GetKeyCode 3425
+#define wxTreeEvent_GetItem 3426
+#define wxTreeEvent_GetKeyEvent 3427
+#define wxTreeEvent_GetLabel 3428
+#define wxTreeEvent_GetOldItem 3429
+#define wxTreeEvent_GetPoint 3430
+#define wxTreeEvent_IsEditCancelled 3431
+#define wxTreeEvent_SetToolTip 3432
+#define wxNotebookEvent_GetOldSelection 3433
+#define wxNotebookEvent_GetSelection 3434
+#define wxNotebookEvent_SetOldSelection 3435
+#define wxNotebookEvent_SetSelection 3436
+#define wxFileDataObject_new 3437
+#define wxFileDataObject_AddFile 3438
+#define wxFileDataObject_GetFilenames 3439
+#define wxFileDataObject_destroy 3440
+#define wxTextDataObject_new 3441
+#define wxTextDataObject_GetTextLength 3442
+#define wxTextDataObject_GetText 3443
+#define wxTextDataObject_SetText 3444
+#define wxTextDataObject_destroy 3445
+#define wxBitmapDataObject_new_1_1 3446
+#define wxBitmapDataObject_new_1_0 3447
+#define wxBitmapDataObject_GetBitmap 3448
+#define wxBitmapDataObject_SetBitmap 3449
+#define wxBitmapDataObject_destroy 3450
+#define wxClipboard_new 3452
+#define wxClipboard_destruct 3453
+#define wxClipboard_AddData 3454
+#define wxClipboard_Clear 3455
+#define wxClipboard_Close 3456
+#define wxClipboard_Flush 3457
+#define wxClipboard_GetData 3458
+#define wxClipboard_IsOpened 3459
+#define wxClipboard_Open 3460
+#define wxClipboard_SetData 3461
+#define wxClipboard_UsePrimarySelection 3463
+#define wxClipboard_IsSupported 3464
+#define wxClipboard_Get 3465
+#define wxSpinEvent_GetPosition 3466
+#define wxSpinEvent_SetPosition 3467
+#define wxSplitterWindow_new_0 3468
+#define wxSplitterWindow_new_2 3469
+#define wxSplitterWindow_destruct 3470
+#define wxSplitterWindow_Create 3471
+#define wxSplitterWindow_GetMinimumPaneSize 3472
+#define wxSplitterWindow_GetSashGravity 3473
+#define wxSplitterWindow_GetSashPosition 3474
+#define wxSplitterWindow_GetSplitMode 3475
+#define wxSplitterWindow_GetWindow1 3476
+#define wxSplitterWindow_GetWindow2 3477
+#define wxSplitterWindow_Initialize 3478
+#define wxSplitterWindow_IsSplit 3479
+#define wxSplitterWindow_ReplaceWindow 3480
+#define wxSplitterWindow_SetSashGravity 3481
+#define wxSplitterWindow_SetSashPosition 3482
+#define wxSplitterWindow_SetSashSize 3483
+#define wxSplitterWindow_SetMinimumPaneSize 3484
+#define wxSplitterWindow_SetSplitMode 3485
+#define wxSplitterWindow_SplitHorizontally 3486
+#define wxSplitterWindow_SplitVertically 3487
+#define wxSplitterWindow_Unsplit 3488
+#define wxSplitterWindow_UpdateSize 3489
+#define wxSplitterEvent_GetSashPosition 3490
+#define wxSplitterEvent_GetX 3491
+#define wxSplitterEvent_GetY 3492
+#define wxSplitterEvent_GetWindowBeingRemoved 3493
+#define wxSplitterEvent_SetSashPosition 3494
+#define wxHtmlWindow_new_0 3495
+#define wxHtmlWindow_new_2 3496
+#define wxHtmlWindow_AppendToPage 3497
+#define wxHtmlWindow_GetOpenedAnchor 3498
+#define wxHtmlWindow_GetOpenedPage 3499
+#define wxHtmlWindow_GetOpenedPageTitle 3500
+#define wxHtmlWindow_GetRelatedFrame 3501
+#define wxHtmlWindow_HistoryBack 3502
+#define wxHtmlWindow_HistoryCanBack 3503
+#define wxHtmlWindow_HistoryCanForward 3504
+#define wxHtmlWindow_HistoryClear 3505
+#define wxHtmlWindow_HistoryForward 3506
+#define wxHtmlWindow_LoadFile 3507
+#define wxHtmlWindow_LoadPage 3508
+#define wxHtmlWindow_SelectAll 3509
+#define wxHtmlWindow_SelectionToText 3510
+#define wxHtmlWindow_SelectLine 3511
+#define wxHtmlWindow_SelectWord 3512
+#define wxHtmlWindow_SetBorders 3513
+#define wxHtmlWindow_SetFonts 3514
+#define wxHtmlWindow_SetPage 3515
+#define wxHtmlWindow_SetRelatedFrame 3516
+#define wxHtmlWindow_SetRelatedStatusBar 3517
+#define wxHtmlWindow_ToText 3518
+#define wxHtmlWindow_destroy 3519
+#define wxHtmlLinkEvent_GetLinkInfo 3520
+#define wxSystemSettings_GetColour 3521
+#define wxSystemSettings_GetFont 3522
+#define wxSystemSettings_GetMetric 3523
+#define wxSystemSettings_GetScreenType 3524
+#define wxSystemOptions_GetOption 3525
+#define wxSystemOptions_GetOptionInt 3526
+#define wxSystemOptions_HasOption 3527
+#define wxSystemOptions_IsFalse 3528
+#define wxSystemOptions_SetOption_2_1 3529
+#define wxSystemOptions_SetOption_2_0 3530
+#define wxAuiNotebookEvent_SetSelection 3531
+#define wxAuiNotebookEvent_GetSelection 3532
+#define wxAuiNotebookEvent_SetOldSelection 3533
+#define wxAuiNotebookEvent_GetOldSelection 3534
+#define wxAuiNotebookEvent_SetDragSource 3535
+#define wxAuiNotebookEvent_GetDragSource 3536
+#define wxAuiManagerEvent_SetManager 3537
+#define wxAuiManagerEvent_GetManager 3538
+#define wxAuiManagerEvent_SetPane 3539
+#define wxAuiManagerEvent_GetPane 3540
+#define wxAuiManagerEvent_SetButton 3541
+#define wxAuiManagerEvent_GetButton 3542
+#define wxAuiManagerEvent_SetDC 3543
+#define wxAuiManagerEvent_GetDC 3544
+#define wxAuiManagerEvent_Veto 3545
+#define wxAuiManagerEvent_GetVeto 3546
+#define wxAuiManagerEvent_SetCanVeto 3547
+#define wxAuiManagerEvent_CanVeto 3548
+#define wxLogNull_new 3549
+#define wxLogNull_destroy 3550
+#define wxTaskBarIcon_new 3551
+#define wxTaskBarIcon_destruct 3552
+#define wxTaskBarIcon_PopupMenu 3553
+#define wxTaskBarIcon_RemoveIcon 3554
+#define wxTaskBarIcon_SetIcon 3555
+#define wxLocale_new_0 3556
+#define wxLocale_new_2 3558
+#define wxLocale_destruct 3559
+#define wxLocale_Init 3561
+#define wxLocale_AddCatalog_1 3562
+#define wxLocale_AddCatalog_3 3563
+#define wxLocale_AddCatalogLookupPathPrefix 3564
+#define wxLocale_GetCanonicalName 3565
+#define wxLocale_GetLanguage 3566
+#define wxLocale_GetLanguageName 3567
+#define wxLocale_GetLocale 3568
+#define wxLocale_GetName 3569
+#define wxLocale_GetString_2 3570
+#define wxLocale_GetString_4 3571
+#define wxLocale_GetHeaderValue 3572
+#define wxLocale_GetSysName 3573
+#define wxLocale_GetSystemEncoding 3574
+#define wxLocale_GetSystemEncodingName 3575
+#define wxLocale_GetSystemLanguage 3576
+#define wxLocale_IsLoaded 3577
+#define wxLocale_IsOk 3578
+#define wxActivateEvent_GetActive 3579
+#define wxPopupWindow_new_2 3581
+#define wxPopupWindow_new_0 3582
+#define wxPopupWindow_destruct 3584
+#define wxPopupWindow_Create 3585
+#define wxPopupWindow_Position 3586
+#define wxPopupTransientWindow_new_0 3587
+#define wxPopupTransientWindow_new_2 3588
+#define wxPopupTransientWindow_destruct 3589
+#define wxPopupTransientWindow_Popup 3590
+#define wxPopupTransientWindow_Dismiss 3591
+#define wxOverlay_new 3592
+#define wxOverlay_destruct 3593
+#define wxOverlay_Reset 3594
+#define wxDCOverlay_new_6 3595
+#define wxDCOverlay_new_2 3596
+#define wxDCOverlay_destruct 3597
+#define wxDCOverlay_Clear 3598
 
 
diff --git a/lib/wx/c_src/wxe_driver.c b/lib/wx/c_src/wxe_driver.c
index eb7d7dcaeb..6f027ea25b 100644
--- a/lib/wx/c_src/wxe_driver.c
+++ b/lib/wx/c_src/wxe_driver.c
@@ -241,12 +241,10 @@ standard_outputv(ErlDrvData drv_data, ErlIOVec* ev)
       bin = ev->binv[1];
       driver_binary_inc_refc(bin); /* Otherwise it could get deallocated */
       binref->bin = bin;
-      sd->bin = binref;
    } else { /* Empty binary (becomes NULL) */
       binref->base = NULL;
       binref->size = 0;
       binref->from = driver_caller(sd->port_handle);
       binref->bin = NULL;
-      sd->bin = binref;
    }
 }
diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp
index 5126804b9f..7f2e767a6b 100644
--- a/lib/wx/c_src/wxe_gl.cpp
+++ b/lib/wx/c_src/wxe_gl.cpp
@@ -138,9 +138,9 @@ void gl_dispatch(int op, char *bp,ErlDrvTermData caller,WXEBinRef *bins){
     wxGLCanvas * current = glc[caller];
     if(current) {
       if(current != glc[gl_active]) {
-	gl_active = caller;
 	current->SetCurrent();
       }
+      gl_active = caller;
     } else {
       ErlDrvTermData rt[] = // Error msg
 	{ERL_DRV_ATOM, driver_mk_atom((char *) "_egl_error_"),
diff --git a/lib/wx/configure.in b/lib/wx/configure.in
index 48fcca640c..bf27b72aa7 100644
--- a/lib/wx/configure.in
+++ b/lib/wx/configure.in
@@ -164,14 +164,14 @@ case $host_os in
 	CPPFLAGS="$CPPFLAGS -D_MACOSX $PTHR_CFLAGS"
 	;;
     mingw32)
-	CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0500 -D_WINDOWS -D_UNICODE -DUNICODE"
-	CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0500"	
+	CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE"
+	CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600"
 	AC_MSG_WARN([Reverting to 32-bit time_t])
 	CPPFLAGS="$CPPFLAGS -D_USE_32BIT_TIME_T"
 	;;
     win32)
-	CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0500 -D_WINDOWS -D_UNICODE -DUNICODE"
-	CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0500"
+	CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE"
+	CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600"
 	;;
     *)
 	CFLAGS="$CFLAGS -Wno-deprecated-declarations"
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 0bbeeaafab..f895540b25 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,6 +32,26 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
+<section><title>Wx 1.6.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed commands with multiple binaries, such as
+	    <c>wxImage:new/4</c>. Added
+	    <c>wxWindow:SetDoubleBuffered/1</c>,
+	    <c>wxWindow:isDoubleBuffered/1</c>,
+	    <c>wxWindow:setTransparent/2</c> and
+	    <c>wxWindow:canSetTransparent/1</c>. Fixed timing issues.</p>
+          <p>
+	    Own Id: OTP-13404</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Wx 1.6</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/wx/examples/demo/ex_canvas.erl b/lib/wx/examples/demo/ex_canvas.erl
index cdc783055c..acc94743d6 100644
--- a/lib/wx/examples/demo/ex_canvas.erl
+++ b/lib/wx/examples/demo/ex_canvas.erl
@@ -219,4 +219,4 @@ redraw(DC, Bitmap) ->
     wxMemoryDC:destroy(MemoryDC).
 
 get_pos(W,H) ->
-    {random:uniform(W), random:uniform(H)}.
+    {rand:uniform(W), rand:uniform(H)}.
diff --git a/lib/wx/examples/sudoku/sudoku_game.erl b/lib/wx/examples/sudoku/sudoku_game.erl
index e3c39b4ec9..8bb5fe4d38 100644
--- a/lib/wx/examples/sudoku/sudoku_game.erl
+++ b/lib/wx/examples/sudoku/sudoku_game.erl
@@ -151,8 +151,7 @@ test() ->  %% Known to solvable
      {{9,2},4}, {{9,4},5}, {{9,6},8}, {{9,8},7}].
 
 new_game(S) ->
-    {X,Y,Z} = erlang:now(),
-    random:seed(Y,X,Z),
+    rand:seed(exsplus),
     case new_game(1,1,gb_sets:empty(),empty_table(S#s{}),[], 0) of
 	stop -> new_game(S); 
 	Game -> Game
@@ -171,7 +170,7 @@ new_game(R,C,BT,St,Acc,Cnt) when R < 10, C < 10 ->
 	    [{{BR,BC},BVal,BBT,BST}|BAcc] = Acc,
 	    new_game(BR,BC,gb_sets:add(BVal,BBT),BST,BAcc,Cnt+1);
 	Size -> 
-	    Ind = random:uniform(Size),
+	    Ind = rand:uniform(Size),
 	    V = lists:nth(Ind,gb_sets:to_list(S)),
 	    new_game(R,C+1,gb_sets:empty(),
 		     add({R,C,M},V,St),		    
@@ -207,7 +206,7 @@ pick_shown(Given,Left,S0,Level,Gfx) ->
 	    io:format("Below level ~p ~p~n", [GivenSz,Level]),
             S0;
        true ->
-	    Ran = random:uniform(LeftSz),
+	    Ran = rand:uniform(LeftSz),
 	    V   = lists:nth(Ran,gb_sets:to_list(Left)),
 	    S1  = rebuild_all(rcm(V),S0#s{v=setelement(V,S0#s.v,0)}),
 	    case solve(S1, true) of
diff --git a/lib/wx/include/wx.hrl b/lib/wx/include/wx.hrl
index 1bc00ca235..44df57898a 100644
--- a/lib/wx/include/wx.hrl
+++ b/lib/wx/include/wx.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -353,7 +353,7 @@
 
 %% Hardcoded Records
 -record(wxMouseState, {x :: integer(), y :: integer(),
-          leftDown :: boolean(), middleDown :: boolean, rightDown :: boolean, 
+          leftDown :: boolean(), middleDown :: boolean(), rightDown :: boolean(), 
           controlDown :: boolean(), shiftDown :: boolean(),
           altDown :: boolean(), metaDown :: boolean(), cmdDown :: boolean()
         }).
@@ -4085,7 +4085,3 @@
 -define(wxWINDOW_VARIANT_MINI, 2).
 -define(wxWINDOW_VARIANT_LARGE, 3).
 -define(wxWINDOW_VARIANT_MAX, 4).
-% From "xmlres.h": wxXmlResourceFlags
--define(wxXRC_USE_LOCALE, 1).
--define(wxXRC_NO_SUBCLASSING, 2).
--define(wxXRC_NO_RELOADING, 4).
diff --git a/lib/wx/src/gen/wxAuiNotebook.erl b/lib/wx/src/gen/wxAuiNotebook.erl
index f66048f0d3..7ec1acb26d 100644
--- a/lib/wx/src/gen/wxAuiNotebook.erl
+++ b/lib/wx/src/gen/wxAuiNotebook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -37,10 +37,10 @@
   setTabCtrlHeight/2,setUniformBitmapSize/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -52,23 +52,24 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setForegroundColour/2,
   setHelpText/2,setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,
   setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,setPalette/2,
   setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,
   setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
   setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
-  setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
   setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
   setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
@@ -349,6 +350,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxBitmapButton.erl b/lib/wx/src/gen/wxBitmapButton.erl
index e0fb4bc78a..642828b0b0 100644
--- a/lib/wx/src/gen/wxBitmapButton.erl
+++ b/lib/wx/src/gen/wxBitmapButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -36,10 +36,10 @@
   setBitmapLabel/2,setBitmapSelected/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -51,24 +51,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDefault/1,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDefault/1,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -229,6 +230,14 @@ setDefault(This) -> wxButton:setDefault(This).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxButton.erl b/lib/wx/src/gen/wxButton.erl
index 06e6e53976..c94303bbea 100644
--- a/lib/wx/src/gen/wxButton.erl
+++ b/lib/wx/src/gen/wxButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,10 +34,10 @@
   setLabel/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -49,24 +49,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setMaxSize/2,setMinSize/2,
   setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -179,6 +180,14 @@ destroy(Obj=#wx_ref{type=Type}) ->
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxCalendarCtrl.erl b/lib/wx/src/gen/wxCalendarCtrl.erl
index 2c24063372..1d4baeed08 100644
--- a/lib/wx/src/gen/wxCalendarCtrl.erl
+++ b/lib/wx/src/gen/wxCalendarCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -38,10 +38,10 @@
   setHighlightColours/3,setHoliday/2,setHolidayColours/3]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -53,24 +53,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -363,6 +364,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxCheckBox.erl b/lib/wx/src/gen/wxCheckBox.erl
index c190ebcf27..2cea4d04b4 100644
--- a/lib/wx/src/gen/wxCheckBox.erl
+++ b/lib/wx/src/gen/wxCheckBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -35,10 +35,10 @@
   setValue/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -50,24 +50,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -216,6 +217,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxCheckListBox.erl b/lib/wx/src/gen/wxCheckListBox.erl
index 94656daac8..f6013e4863 100644
--- a/lib/wx/src/gen/wxCheckListBox.erl
+++ b/lib/wx/src/gen/wxCheckListBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -35,46 +35,48 @@
 -export([check/2,check/3,destroy/1,isChecked/2,new/0,new/2,new/3]).
 
 %% inherited exports
--export([append/2,append/3,appendStrings/2,cacheBestSize/2,captureMouse/1,center/1,
-  center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
-  centreOnParent/2,clear/1,clearBackground/1,clientToScreen/2,clientToScreen/3,
-  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
-  delete/2,deselect/2,destroyChildren/1,disable/1,disconnect/1,disconnect/2,
-  disconnect/3,enable/1,enable/2,findString/2,findString/3,findWindow/2,
-  fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,getBackgroundColour/1,
-  getBackgroundStyle/1,getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,
-  getChildren/1,getClientData/2,getClientSize/1,getContainingSizer/1,
-  getCount/1,getCursor/1,getDropTarget/1,getEventHandler/1,getExtraStyle/1,
-  getFont/1,getForegroundColour/1,getGrandParent/1,getHandle/1,getHelpText/1,
-  getId/1,getLabel/1,getMaxSize/1,getMinSize/1,getName/1,getParent/1,
-  getPosition/1,getRect/1,getScreenPosition/1,getScreenRect/1,getScrollPos/2,
-  getScrollRange/2,getScrollThumb/2,getSelection/1,getSelections/1,
-  getSize/1,getSizer/1,getString/2,getStringSelection/1,getTextExtent/2,
-  getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
-  getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,hitTest/2,inheritAttributes/1,initDialog/1,insert/3,insert/4,
-  insertItems/3,invalidateBestSize/1,isEmpty/1,isEnabled/1,isExposed/2,
-  isExposed/3,isExposed/5,isRetained/1,isSelected/2,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  select/2,set/2,setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientData/3,setClientSize/2,setClientSize/3,
-  setContainingSizer/2,setCursor/2,setDropTarget/2,setExtraStyle/2,
-  setFirstItem/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,
-  setHelpText/2,setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,
-  setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,setPalette/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setSelection/2,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setString/3,setStringSelection/2,setThemeEnabled/2,setToolTip/2,setVirtualSize/2,
-  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
-  update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
+-export([append/2,append/3,appendStrings/2,cacheBestSize/2,canSetTransparent/1,
+  captureMouse/1,center/1,center/2,centerOnParent/1,centerOnParent/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,clear/1,clearBackground/1,
+  clientToScreen/2,clientToScreen/3,close/1,close/2,connect/2,connect/3,
+  convertDialogToPixels/2,convertPixelsToDialog/2,delete/2,deselect/2,
+  destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
+  enable/1,enable/2,findString/2,findString/3,findWindow/2,fit/1,fitInside/1,
+  freeze/1,getAcceleratorTable/1,getBackgroundColour/1,getBackgroundStyle/1,
+  getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,getChildren/1,
+  getClientData/2,getClientSize/1,getContainingSizer/1,getCount/1,getCursor/1,
+  getDropTarget/1,getEventHandler/1,getExtraStyle/1,getFont/1,getForegroundColour/1,
+  getGrandParent/1,getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1,
+  getMinSize/1,getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1,
+  getScreenRect/1,getScrollPos/2,getScrollRange/2,getScrollThumb/2,
+  getSelection/1,getSelections/1,getSize/1,getSizer/1,getString/2,getStringSelection/1,
+  getTextExtent/2,getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,
+  getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,hasScrollbar/2,
+  hasTransparentBackground/1,hide/1,hitTest/2,inheritAttributes/1,initDialog/1,
+  insert/3,insert/4,insertItems/3,invalidateBestSize/1,isDoubleBuffered/1,
+  isEmpty/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,
+  isSelected/2,isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,
+  makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,
+  scrollPages/2,scrollWindow/3,scrollWindow/4,select/2,set/2,setAcceleratorTable/2,
+  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
+  setClientData/3,setClientSize/2,setClientSize/3,setContainingSizer/2,
+  setCursor/2,setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFirstItem/2,
+  setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,setHelpText/2,
+  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setSelection/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setString/3,
+  setStringSelection/2,setThemeEnabled/2,setToolTip/2,setTransparent/2,
+  setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,
+  setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,
+  shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
+  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
+  validate/1,warpPointer/3]).
 
 -export_type([wxCheckListBox/0]).
 %% @hidden
@@ -220,6 +222,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxChoice.erl b/lib/wx/src/gen/wxChoice.erl
index ddeb00beca..73867d6597 100644
--- a/lib/wx/src/gen/wxChoice.erl
+++ b/lib/wx/src/gen/wxChoice.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -35,45 +35,47 @@
   setColumns/2]).
 
 %% inherited exports
--export([append/2,append/3,appendStrings/2,cacheBestSize/2,captureMouse/1,center/1,
-  center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
-  centreOnParent/2,clear/1,clearBackground/1,clientToScreen/2,clientToScreen/3,
-  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
-  destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
-  enable/1,enable/2,findString/2,findString/3,findWindow/2,fit/1,fitInside/1,
-  freeze/1,getAcceleratorTable/1,getBackgroundColour/1,getBackgroundStyle/1,
-  getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,getChildren/1,
-  getClientData/2,getClientSize/1,getContainingSizer/1,getCount/1,getCursor/1,
-  getDropTarget/1,getEventHandler/1,getExtraStyle/1,getFont/1,getForegroundColour/1,
-  getGrandParent/1,getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1,
-  getMinSize/1,getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1,
+-export([append/2,append/3,appendStrings/2,cacheBestSize/2,canSetTransparent/1,
+  captureMouse/1,center/1,center/2,centerOnParent/1,centerOnParent/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,clear/1,clearBackground/1,
+  clientToScreen/2,clientToScreen/3,close/1,close/2,connect/2,connect/3,
+  convertDialogToPixels/2,convertPixelsToDialog/2,destroyChildren/1,
+  disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
+  findString/2,findString/3,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
+  getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
+  getCharHeight/1,getCharWidth/1,getChildren/1,getClientData/2,getClientSize/1,
+  getContainingSizer/1,getCount/1,getCursor/1,getDropTarget/1,getEventHandler/1,
+  getExtraStyle/1,getFont/1,getForegroundColour/1,getGrandParent/1,
+  getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1,getMinSize/1,
+  getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1,
   getScreenRect/1,getScrollPos/2,getScrollRange/2,getScrollThumb/2,
   getSelection/1,getSize/1,getSizer/1,getString/2,getStringSelection/1,
   getTextExtent/2,getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,
   getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,hasScrollbar/2,
   hasTransparentBackground/1,hide/1,inheritAttributes/1,initDialog/1,
-  insert/3,insert/4,invalidateBestSize/1,isEmpty/1,isEnabled/1,isExposed/2,
-  isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1,
-  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,
-  moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2,
-  pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  select/2,setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientData/3,setClientSize/2,setClientSize/3,
-  setContainingSizer/2,setCursor/2,setDropTarget/2,setExtraStyle/2,
-  setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,setHelpText/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
-  setScrollPos/4,setScrollbar/5,setScrollbar/6,setSelection/2,setSize/2,
-  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
-  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setString/3,
-  setStringSelection/2,setThemeEnabled/2,setToolTip/2,setVirtualSize/2,
-  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
-  update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
+  insert/3,insert/4,invalidateBestSize/1,isDoubleBuffered/1,isEmpty/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,select/2,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientData/3,
+  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
+  setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
+  setSelection/2,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,
+  setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,
+  setSizerAndFit/3,setString/3,setStringSelection/2,setThemeEnabled/2,
+  setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
+  setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
+  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
+  validate/1,warpPointer/3]).
 
 -export_type([wxChoice/0]).
 %% @hidden
@@ -235,6 +237,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxChoicebook.erl b/lib/wx/src/gen/wxChoicebook.erl
index 7627662437..37a44a813a 100644
--- a/lib/wx/src/gen/wxChoicebook.erl
+++ b/lib/wx/src/gen/wxChoicebook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -38,10 +38,10 @@
   setPageSize/2,setPageText/3,setSelection/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -53,24 +53,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -383,6 +384,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxColourDialog.erl b/lib/wx/src/gen/wxColourDialog.erl
index 66cde944c5..15eee30727 100644
--- a/lib/wx/src/gen/wxColourDialog.erl
+++ b/lib/wx/src/gen/wxColourDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,11 +34,11 @@
 -export([create/2,create/3,destroy/1,getColourData/1,new/0,new/1,new/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1,
   disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
   endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -53,25 +53,26 @@
   getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,
-  maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
-  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
-  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
-  setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
+  scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
+  setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
+  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
   setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1,
@@ -222,6 +223,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxColourPickerCtrl.erl b/lib/wx/src/gen/wxColourPickerCtrl.erl
index a6ca31c06d..486441c005 100644
--- a/lib/wx/src/gen/wxColourPickerCtrl.erl
+++ b/lib/wx/src/gen/wxColourPickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,10 +34,10 @@
 -export([create/3,create/4,destroy/1,getColour/1,new/0,new/2,new/3,setColour/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -50,30 +50,31 @@
   getSize/1,getSizer/1,getTextCtrl/1,getTextCtrlProportion/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTextCtrl/1,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,isRetained/1,
-  isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,
-  lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
-  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
-  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
-  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
-  removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,
-  scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
-  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
-  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,setLabel/2,
-  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
-  setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,setPickerCtrlGrowable/2,
-  setPickerCtrlProportion/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,
-  setScrollbar/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,
-  setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,
-  setSizerAndFit/3,setTextCtrlGrowable/1,setTextCtrlGrowable/2,setTextCtrlProportion/2,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
-  update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,
+  isRetained/1,isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,
+  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,
+  moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2,
+  pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
+  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
+  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
+  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
+  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
+  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,
+  setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,
+  setPickerCtrlGrowable/2,setPickerCtrlProportion/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5,
+  setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
+  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTextCtrlGrowable/1,
+  setTextCtrlGrowable/2,setTextCtrlProportion/2,setThemeEnabled/2,
+  setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
+  setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
+  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
+  validate/1,warpPointer/3]).
 
 -export_type([wxColourPickerCtrl/0]).
 %% @hidden
@@ -220,6 +221,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxComboBox.erl b/lib/wx/src/gen/wxComboBox.erl
index 0e34c72934..37d6e71605 100644
--- a/lib/wx/src/gen/wxComboBox.erl
+++ b/lib/wx/src/gen/wxComboBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -37,45 +37,47 @@
   setSelection/2,setSelection/3,setValue/2,undo/1]).
 
 %% inherited exports
--export([append/2,append/3,appendStrings/2,cacheBestSize/2,captureMouse/1,center/1,
-  center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
-  centreOnParent/2,clear/1,clearBackground/1,clientToScreen/2,clientToScreen/3,
-  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
-  delete/2,destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
-  enable/1,enable/2,findString/2,findString/3,findWindow/2,fit/1,fitInside/1,
-  freeze/1,getAcceleratorTable/1,getBackgroundColour/1,getBackgroundStyle/1,
-  getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,getChildren/1,
-  getClientData/2,getClientSize/1,getContainingSizer/1,getCount/1,getCursor/1,
-  getDropTarget/1,getEventHandler/1,getExtraStyle/1,getFont/1,getForegroundColour/1,
-  getGrandParent/1,getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1,
-  getMinSize/1,getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1,
+-export([append/2,append/3,appendStrings/2,cacheBestSize/2,canSetTransparent/1,
+  captureMouse/1,center/1,center/2,centerOnParent/1,centerOnParent/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,clear/1,clearBackground/1,
+  clientToScreen/2,clientToScreen/3,close/1,close/2,connect/2,connect/3,
+  convertDialogToPixels/2,convertPixelsToDialog/2,delete/2,destroyChildren/1,
+  disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
+  findString/2,findString/3,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
+  getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
+  getCharHeight/1,getCharWidth/1,getChildren/1,getClientData/2,getClientSize/1,
+  getContainingSizer/1,getCount/1,getCursor/1,getDropTarget/1,getEventHandler/1,
+  getExtraStyle/1,getFont/1,getForegroundColour/1,getGrandParent/1,
+  getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1,getMinSize/1,
+  getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1,
   getScreenRect/1,getScrollPos/2,getScrollRange/2,getScrollThumb/2,
   getSelection/1,getSize/1,getSizer/1,getString/2,getStringSelection/1,
   getTextExtent/2,getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,
   getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,hasScrollbar/2,
   hasTransparentBackground/1,hide/1,inheritAttributes/1,initDialog/1,
-  insert/3,insert/4,invalidateBestSize/1,isEmpty/1,isEnabled/1,isExposed/2,
-  isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1,
-  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,
-  moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2,
-  pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  select/2,setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientData/3,setClientSize/2,setClientSize/3,
-  setContainingSizer/2,setCursor/2,setDropTarget/2,setExtraStyle/2,
-  setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,setHelpText/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
-  setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5,
-  setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
-  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setString/3,setStringSelection/2,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
-  update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
+  insert/3,insert/4,invalidateBestSize/1,isDoubleBuffered/1,isEmpty/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,select/2,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientData/3,
+  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
+  setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
+  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
+  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
+  setString/3,setStringSelection/2,setThemeEnabled/2,setToolTip/2,setTransparent/2,
+  setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,
+  setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,
+  shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
+  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
+  validate/1,warpPointer/3]).
 
 -export_type([wxComboBox/0]).
 %% @hidden
@@ -370,6 +372,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxControl.erl b/lib/wx/src/gen/wxControl.erl
index f0fb88e3eb..f84ec34b02 100644
--- a/lib/wx/src/gen/wxControl.erl
+++ b/lib/wx/src/gen/wxControl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -32,10 +32,10 @@
 -export([getLabel/1,setLabel/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -47,24 +47,25 @@
   getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3,
   getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setMaxSize/2,setMinSize/2,
   setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -96,6 +97,14 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
 
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxControlWithItems.erl b/lib/wx/src/gen/wxControlWithItems.erl
index 5f4ed9701b..d52c7917a2 100644
--- a/lib/wx/src/gen/wxControlWithItems.erl
+++ b/lib/wx/src/gen/wxControlWithItems.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -36,10 +36,10 @@
   setString/3,setStringSelection/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -51,24 +51,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -278,6 +279,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxDatePickerCtrl.erl b/lib/wx/src/gen/wxDatePickerCtrl.erl
index 73df9c1395..057f91d4e8 100644
--- a/lib/wx/src/gen/wxDatePickerCtrl.erl
+++ b/lib/wx/src/gen/wxDatePickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,10 +34,10 @@
 -export([destroy/1,getRange/3,getValue/1,new/0,new/2,new/3,setRange/3,setValue/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -50,30 +50,31 @@
   getSize/1,getSizer/1,getTextCtrl/1,getTextCtrlProportion/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTextCtrl/1,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,isRetained/1,
-  isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,
-  lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
-  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
-  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
-  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
-  removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,
-  scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
-  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
-  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,setLabel/2,
-  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
-  setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,setPickerCtrlGrowable/2,
-  setPickerCtrlProportion/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,
-  setScrollbar/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,
-  setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,
-  setSizerAndFit/3,setTextCtrlGrowable/1,setTextCtrlGrowable/2,setTextCtrlProportion/2,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
-  update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,
+  isRetained/1,isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,
+  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,
+  moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2,
+  pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
+  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
+  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
+  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
+  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
+  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,
+  setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,
+  setPickerCtrlGrowable/2,setPickerCtrlProportion/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5,
+  setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
+  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTextCtrlGrowable/1,
+  setTextCtrlGrowable/2,setTextCtrlProportion/2,setThemeEnabled/2,
+  setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
+  setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
+  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
+  validate/1,warpPointer/3]).
 
 -export_type([wxDatePickerCtrl/0]).
 %% @hidden
@@ -196,6 +197,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxDialog.erl b/lib/wx/src/gen/wxDialog.erl
index aa4df5888c..c3f4828c68 100644
--- a/lib/wx/src/gen/wxDialog.erl
+++ b/lib/wx/src/gen/wxDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -35,11 +35,11 @@
   new/0,new/3,new/4,setAffirmativeId/2,setReturnCode/2,show/1,show/2,showModal/1]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -53,29 +53,30 @@
   getVirtualSize/1,getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,
   hasScrollbar/2,hasTransparentBackground/1,hide/1,iconize/1,iconize/2,
   inheritAttributes/1,initDialog/1,invalidateBestSize/1,isActive/1,
-  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,isIconized/1,
-  isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1,
-  lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,requestUserAttention/1,
-  requestUserAttention/2,screenToClient/1,screenToClient/2,scrollLines/2,
-  scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
-  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
-  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
-  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
-  setOwnForegroundColour/2,setPalette/2,setScrollPos/3,setScrollPos/4,
-  setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,setSize/3,setSize/5,
-  setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
-  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,setTitle/2,
-  setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
-  setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
-  setWindowVariant/2,shouldInheritColours/1,showFullScreen/2,showFullScreen/3,
-  thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
-  updateWindowUI/2,validate/1,warpPointer/3]).
+  isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,
+  isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,
+  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,
+  maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
+  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
+  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
+  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
+  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
+  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
+  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
+  showFullScreen/2,showFullScreen/3,thaw/1,transferDataFromWindow/1,
+  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
+  validate/1,warpPointer/3]).
 
 -export_type([wxDialog/0]).
 %% @hidden
@@ -297,6 +298,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxDirDialog.erl b/lib/wx/src/gen/wxDirDialog.erl
index cf1d558b00..aa7a419bcd 100644
--- a/lib/wx/src/gen/wxDirDialog.erl
+++ b/lib/wx/src/gen/wxDirDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,11 +34,11 @@
 -export([destroy/1,getMessage/1,getPath/1,new/1,new/2,setMessage/2,setPath/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1,
   disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
   endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -53,25 +53,26 @@
   getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,
-  maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
-  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
-  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
-  setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
+  scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
+  setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
+  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
   setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1,
@@ -230,6 +231,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxDirPickerCtrl.erl b/lib/wx/src/gen/wxDirPickerCtrl.erl
index 1db48b467c..fea7ee71a1 100644
--- a/lib/wx/src/gen/wxDirPickerCtrl.erl
+++ b/lib/wx/src/gen/wxDirPickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,10 +34,10 @@
 -export([create/3,create/4,destroy/1,getPath/1,new/0,new/2,new/3,setPath/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -50,30 +50,31 @@
   getSize/1,getSizer/1,getTextCtrl/1,getTextCtrlProportion/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTextCtrl/1,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,isRetained/1,
-  isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,
-  lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
-  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
-  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
-  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
-  removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,
-  scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
-  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
-  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,setLabel/2,
-  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
-  setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,setPickerCtrlGrowable/2,
-  setPickerCtrlProportion/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,
-  setScrollbar/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,
-  setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,
-  setSizerAndFit/3,setTextCtrlGrowable/1,setTextCtrlGrowable/2,setTextCtrlProportion/2,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
-  update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,
+  isRetained/1,isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,
+  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,
+  moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2,
+  pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
+  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
+  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
+  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
+  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
+  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,
+  setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,
+  setPickerCtrlGrowable/2,setPickerCtrlProportion/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5,
+  setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
+  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTextCtrlGrowable/1,
+  setTextCtrlGrowable/2,setTextCtrlProportion/2,setThemeEnabled/2,
+  setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
+  setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
+  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
+  validate/1,warpPointer/3]).
 
 -export_type([wxDirPickerCtrl/0]).
 %% @hidden
@@ -213,6 +214,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxFileDialog.erl b/lib/wx/src/gen/wxFileDialog.erl
index d3dac3ba2d..36ee6463ae 100644
--- a/lib/wx/src/gen/wxFileDialog.erl
+++ b/lib/wx/src/gen/wxFileDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -36,11 +36,11 @@
   setFilename/2,setFilterIndex/2,setMessage/2,setPath/2,setWildcard/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1,
   disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
   endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -55,25 +55,26 @@
   getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,
-  maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
-  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
-  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
-  setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
+  scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
+  setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
+  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
   setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1,
@@ -323,6 +324,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxFilePickerCtrl.erl b/lib/wx/src/gen/wxFilePickerCtrl.erl
index d781bdf000..2b57a5927b 100644
--- a/lib/wx/src/gen/wxFilePickerCtrl.erl
+++ b/lib/wx/src/gen/wxFilePickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,10 +34,10 @@
 -export([create/3,create/4,destroy/1,getPath/1,new/0,new/2,new/3,setPath/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -50,30 +50,31 @@
   getSize/1,getSizer/1,getTextCtrl/1,getTextCtrlProportion/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTextCtrl/1,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,isRetained/1,
-  isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,
-  lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
-  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
-  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
-  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
-  removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,
-  scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
-  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
-  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,setLabel/2,
-  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
-  setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,setPickerCtrlGrowable/2,
-  setPickerCtrlProportion/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,
-  setScrollbar/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,
-  setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,
-  setSizerAndFit/3,setTextCtrlGrowable/1,setTextCtrlGrowable/2,setTextCtrlProportion/2,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
-  update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,
+  isRetained/1,isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,
+  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,
+  moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2,
+  pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
+  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
+  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
+  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
+  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
+  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,
+  setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,
+  setPickerCtrlGrowable/2,setPickerCtrlProportion/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5,
+  setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
+  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTextCtrlGrowable/1,
+  setTextCtrlGrowable/2,setTextCtrlProportion/2,setThemeEnabled/2,
+  setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
+  setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
+  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
+  validate/1,warpPointer/3]).
 
 -export_type([wxFilePickerCtrl/0]).
 %% @hidden
@@ -217,6 +218,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxFindReplaceDialog.erl b/lib/wx/src/gen/wxFindReplaceDialog.erl
index a14a05fb8e..d265e232b3 100644
--- a/lib/wx/src/gen/wxFindReplaceDialog.erl
+++ b/lib/wx/src/gen/wxFindReplaceDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,11 +34,11 @@
 -export([create/4,create/5,destroy/1,getData/1,new/0,new/3,new/4]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1,
   disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
   endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -53,25 +53,26 @@
   getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,
-  maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
-  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
-  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
-  setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
+  scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
+  setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
+  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
   setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1,
@@ -226,6 +227,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxFontDialog.erl b/lib/wx/src/gen/wxFontDialog.erl
index cf0938a57d..de199cfcce 100644
--- a/lib/wx/src/gen/wxFontDialog.erl
+++ b/lib/wx/src/gen/wxFontDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,11 +34,11 @@
 -export([create/3,destroy/1,getFontData/1,new/0,new/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1,
   disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
   endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -53,25 +53,26 @@
   getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,
-  maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
-  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
-  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
-  setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
+  scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
+  setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
+  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
   setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1,
@@ -198,6 +199,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxFontPickerCtrl.erl b/lib/wx/src/gen/wxFontPickerCtrl.erl
index b5c3b641ee..c21061e0fe 100644
--- a/lib/wx/src/gen/wxFontPickerCtrl.erl
+++ b/lib/wx/src/gen/wxFontPickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -35,10 +35,10 @@
   new/2,new/3,setMaxPointSize/2,setSelectedFont/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -51,30 +51,31 @@
   getSize/1,getSizer/1,getTextCtrl/1,getTextCtrlProportion/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTextCtrl/1,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,isRetained/1,
-  isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,
-  lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
-  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
-  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
-  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
-  removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,
-  scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
-  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
-  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,setLabel/2,
-  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
-  setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,setPickerCtrlGrowable/2,
-  setPickerCtrlProportion/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,
-  setScrollbar/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,
-  setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,
-  setSizerAndFit/3,setTextCtrlGrowable/1,setTextCtrlGrowable/2,setTextCtrlProportion/2,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
-  update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isPickerCtrlGrowable/1,
+  isRetained/1,isShown/1,isTextCtrlGrowable/1,isTopLevel/1,layout/1,
+  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,
+  moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2,
+  pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
+  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
+  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
+  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
+  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
+  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setInternalMargin/2,
+  setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setPickerCtrlGrowable/1,
+  setPickerCtrlGrowable/2,setPickerCtrlProportion/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5,
+  setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
+  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTextCtrlGrowable/1,
+  setTextCtrlGrowable/2,setTextCtrlProportion/2,setThemeEnabled/2,
+  setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
+  setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
+  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
+  validate/1,warpPointer/3]).
 
 -export_type([wxFontPickerCtrl/0]).
 %% @hidden
@@ -226,6 +227,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxFrame.erl b/lib/wx/src/gen/wxFrame.erl
index 6fa1a2b958..75860cd9b7 100644
--- a/lib/wx/src/gen/wxFrame.erl
+++ b/lib/wx/src/gen/wxFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -37,11 +37,11 @@
   setStatusText/3,setStatusWidths/2,setToolBar/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -55,29 +55,30 @@
   getVirtualSize/1,getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,
   hasScrollbar/2,hasTransparentBackground/1,hide/1,iconize/1,iconize/2,
   inheritAttributes/1,initDialog/1,invalidateBestSize/1,isActive/1,
-  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,isIconized/1,
-  isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1,
-  lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,requestUserAttention/1,
-  requestUserAttention/2,screenToClient/1,screenToClient/2,scrollLines/2,
-  scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
-  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
-  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
-  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
-  setOwnForegroundColour/2,setPalette/2,setScrollPos/3,setScrollPos/4,
-  setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,setSize/3,setSize/5,
-  setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
-  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,setTitle/2,
-  setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
-  setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
-  setWindowVariant/2,shouldInheritColours/1,show/1,show/2,showFullScreen/2,
-  showFullScreen/3,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
-  update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
+  isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,
+  isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,
+  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,
+  maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
+  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
+  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
+  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
+  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
+  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
+  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
+  show/1,show/2,showFullScreen/2,showFullScreen/3,thaw/1,transferDataFromWindow/1,
+  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
+  validate/1,warpPointer/3]).
 
 -export_type([wxFrame/0]).
 %% @hidden
@@ -374,6 +375,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxGLCanvas.erl b/lib/wx/src/gen/wxGLCanvas.erl
index b00b45ad24..9d3d13740d 100644
--- a/lib/wx/src/gen/wxGLCanvas.erl
+++ b/lib/wx/src/gen/wxGLCanvas.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -32,10 +32,10 @@
 -export([destroy/1,getContext/1,new/1,new/2,new/3,setCurrent/1,swapBuffers/1]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -47,24 +47,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -193,6 +194,14 @@ destroy(Obj=#wx_ref{type=Type}) ->
   ok.
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxGauge.erl b/lib/wx/src/gen/wxGauge.erl
index 0b64f097ad..51c35145c4 100644
--- a/lib/wx/src/gen/wxGauge.erl
+++ b/lib/wx/src/gen/wxGauge.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -35,10 +35,10 @@
   setShadowWidth/2,setValue/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -50,24 +50,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -238,6 +239,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxGenericDirCtrl.erl b/lib/wx/src/gen/wxGenericDirCtrl.erl
index 014111144f..bc26a1645e 100644
--- a/lib/wx/src/gen/wxGenericDirCtrl.erl
+++ b/lib/wx/src/gen/wxGenericDirCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -36,10 +36,10 @@
   setFilterIndex/2,setPath/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -51,24 +51,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -296,6 +297,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxGrid.erl b/lib/wx/src/gen/wxGrid.erl
index 0d35804529..49bd89f188 100644
--- a/lib/wx/src/gen/wxGrid.erl
+++ b/lib/wx/src/gen/wxGrid.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -86,10 +86,10 @@
 
 %% inherited exports
 -export([cacheBestSize/2,calcScrolledPosition/2,calcScrolledPosition/3,calcUnscrolledPosition/2,
-  calcUnscrolledPosition/3,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+  calcUnscrolledPosition/3,canSetTransparent/1,captureMouse/1,center/1,
+  center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   doPrepareDC/2,enable/1,enable/2,enableScrolling/3,findWindow/2,fitInside/1,
   freeze/1,getAcceleratorTable/1,getBackgroundColour/1,getBackgroundStyle/1,
@@ -102,25 +102,26 @@
   getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3,
   getToolTip/1,getUpdateRegion/1,getViewStart/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,prepareDC/2,raise/1,refresh/1,refresh/2,
-  refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,
-  screenToClient/1,screenToClient/2,scroll/3,scrollLines/2,scrollPages/2,
-  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
-  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
-  setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2,
-  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
-  setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
-  setPalette/2,setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5,
-  setScrollbar/6,setScrollbars/5,setScrollbars/6,setSize/2,setSize/3,
-  setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
-  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,
-  setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,prepareDC/2,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scroll/3,
+  scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
+  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
+  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFocusIgnoringChildren/1,setFont/2,setForegroundColour/2,setHelpText/2,
+  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
+  setScrollPos/4,setScrollRate/3,setScrollbar/5,setScrollbar/6,setScrollbars/5,
+  setScrollbars/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,
+  setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,
+  setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,setToolTip/2,
+  setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
   setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
   setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
@@ -2157,6 +2158,14 @@ setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This).
 initDialog(This) -> wxPanel:initDialog(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxHtmlWindow.erl b/lib/wx/src/gen/wxHtmlWindow.erl
index 6b0b172b24..759b8ba0fd 100644
--- a/lib/wx/src/gen/wxHtmlWindow.erl
+++ b/lib/wx/src/gen/wxHtmlWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -40,10 +40,10 @@
 
 %% inherited exports
 -export([cacheBestSize/2,calcScrolledPosition/2,calcScrolledPosition/3,calcUnscrolledPosition/2,
-  calcUnscrolledPosition/3,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+  calcUnscrolledPosition/3,canSetTransparent/1,captureMouse/1,center/1,
+  center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   doPrepareDC/2,enable/1,enable/2,enableScrolling/3,findWindow/2,fit/1,
   fitInside/1,freeze/1,getAcceleratorTable/1,getBackgroundColour/1,
@@ -56,25 +56,26 @@
   getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3,
   getToolTip/1,getUpdateRegion/1,getViewStart/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,prepareDC/2,raise/1,refresh/1,refresh/2,
-  refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,
-  screenToClient/1,screenToClient/2,scroll/3,scrollLines/2,scrollPages/2,
-  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
-  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
-  setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2,
-  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
-  setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
-  setPalette/2,setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5,
-  setScrollbar/6,setScrollbars/5,setScrollbars/6,setSize/2,setSize/3,
-  setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
-  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,
-  setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,prepareDC/2,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scroll/3,
+  scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
+  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
+  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFocusIgnoringChildren/1,setFont/2,setForegroundColour/2,setHelpText/2,
+  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
+  setScrollPos/4,setScrollRate/3,setScrollbar/5,setScrollbar/6,setScrollbars/5,
+  setScrollbars/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,
+  setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,
+  setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,setToolTip/2,
+  setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
   setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
   setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
@@ -370,6 +371,14 @@ setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This).
 initDialog(This) -> wxPanel:initDialog(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxListBox.erl b/lib/wx/src/gen/wxListBox.erl
index 14cc553935..eaa026839e 100644
--- a/lib/wx/src/gen/wxListBox.erl
+++ b/lib/wx/src/gen/wxListBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -35,45 +35,47 @@
   isSelected/2,new/0,new/2,new/3,set/2,setFirstItem/2]).
 
 %% inherited exports
--export([append/2,append/3,appendStrings/2,cacheBestSize/2,captureMouse/1,center/1,
-  center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
-  centreOnParent/2,clear/1,clearBackground/1,clientToScreen/2,clientToScreen/3,
-  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
-  delete/2,destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
-  enable/1,enable/2,findString/2,findString/3,findWindow/2,fit/1,fitInside/1,
-  freeze/1,getAcceleratorTable/1,getBackgroundColour/1,getBackgroundStyle/1,
-  getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,getChildren/1,
-  getClientData/2,getClientSize/1,getContainingSizer/1,getCount/1,getCursor/1,
-  getDropTarget/1,getEventHandler/1,getExtraStyle/1,getFont/1,getForegroundColour/1,
-  getGrandParent/1,getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1,
-  getMinSize/1,getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1,
+-export([append/2,append/3,appendStrings/2,cacheBestSize/2,canSetTransparent/1,
+  captureMouse/1,center/1,center/2,centerOnParent/1,centerOnParent/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,clear/1,clearBackground/1,
+  clientToScreen/2,clientToScreen/3,close/1,close/2,connect/2,connect/3,
+  convertDialogToPixels/2,convertPixelsToDialog/2,delete/2,destroyChildren/1,
+  disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
+  findString/2,findString/3,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
+  getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
+  getCharHeight/1,getCharWidth/1,getChildren/1,getClientData/2,getClientSize/1,
+  getContainingSizer/1,getCount/1,getCursor/1,getDropTarget/1,getEventHandler/1,
+  getExtraStyle/1,getFont/1,getForegroundColour/1,getGrandParent/1,
+  getHandle/1,getHelpText/1,getId/1,getLabel/1,getMaxSize/1,getMinSize/1,
+  getName/1,getParent/1,getPosition/1,getRect/1,getScreenPosition/1,
   getScreenRect/1,getScrollPos/2,getScrollRange/2,getScrollThumb/2,
   getSelection/1,getSize/1,getSizer/1,getString/2,getStringSelection/1,
   getTextExtent/2,getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,
   getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,hasScrollbar/2,
   hasTransparentBackground/1,hide/1,inheritAttributes/1,initDialog/1,
-  insert/3,insert/4,invalidateBestSize/1,isEmpty/1,isEnabled/1,isExposed/2,
-  isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1,
-  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,
-  moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2,
-  pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  select/2,setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientData/3,setClientSize/2,setClientSize/3,
-  setContainingSizer/2,setCursor/2,setDropTarget/2,setExtraStyle/2,
-  setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,setHelpText/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
-  setScrollPos/4,setScrollbar/5,setScrollbar/6,setSelection/2,setSize/2,
-  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
-  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setString/3,
-  setStringSelection/2,setThemeEnabled/2,setToolTip/2,setVirtualSize/2,
-  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
-  update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
+  insert/3,insert/4,invalidateBestSize/1,isDoubleBuffered/1,isEmpty/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,select/2,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientData/3,
+  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
+  setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
+  setSelection/2,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,
+  setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,
+  setSizerAndFit/3,setString/3,setStringSelection/2,setThemeEnabled/2,
+  setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
+  setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
+  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
+  validate/1,warpPointer/3]).
 
 -export_type([wxListBox/0]).
 %% @hidden
@@ -278,6 +280,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxListCtrl.erl b/lib/wx/src/gen/wxListCtrl.erl
index 491511b729..ed997710c8 100644
--- a/lib/wx/src/gen/wxListCtrl.erl
+++ b/lib/wx/src/gen/wxListCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -38,7 +38,7 @@
   getItemData/2,getItemFont/2,getItemPosition/2,getItemRect/2,getItemRect/3,
   getItemSpacing/1,getItemState/3,getItemText/2,getItemTextColour/2,
   getNextItem/2,getNextItem/3,getSelectedItemCount/1,getTextColour/1,
-  getTopItem/1,getViewRect/1,hitTest/3,insertColumn/3,insertColumn/4,
+  getTopItem/1,getViewRect/1,hitTest/2,insertColumn/3,insertColumn/4,
   insertItem/2,insertItem/3,insertItem/4,refreshItem/2,refreshItems/3,
   scrollList/3,setBackgroundColour/2,setColumn/3,setColumnWidth/3,setImageList/3,
   setItem/2,setItem/4,setItem/5,setItemBackgroundColour/3,setItemColumnImage/4,
@@ -47,10 +47,10 @@
   setSingleStyle/2,setSingleStyle/3,setTextColour/2,setWindowStyleFlag/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -62,27 +62,28 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundStyle/2,setCaret/2,
-  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
-  setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
-  setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowVariant/2,shouldInheritColours/1,show/1,
-  show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,
-  updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
+  setCursor/2,setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,
+  setFocusFromKbd/1,setFont/2,setForegroundColour/2,setHelpText/2,setId/2,
+  setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5,
+  setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
+  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,setToolTip/2,
+  setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowVariant/2,
+  shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
+  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
+  validate/1,warpPointer/3]).
 
 -export_type([wxListCtrl/0]).
 %% @hidden
@@ -515,13 +516,14 @@ getViewRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   <<ThisRef:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlhittest">external documentation</a>.
--spec hitTest(This, Point, Flags) -> integer() when
-	This::wxListCtrl(), Point::{X::integer(), Y::integer()}, Flags::integer().
-hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PointX,PointY},Flags)
- when is_integer(PointX),is_integer(PointY),is_integer(Flags) ->
+-spec hitTest(This, Point) -> Result when
+	Result ::{Res ::integer(), Flags::integer(), PSubItem::integer()},
+	This::wxListCtrl(), Point::{X::integer(), Y::integer()}.
+hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PointX,PointY})
+ when is_integer(PointX),is_integer(PointY) ->
   ?CLASS(ThisT,wxListCtrl),
   wxe_util:call(?wxListCtrl_HitTest,
-  <<ThisRef:32/?UI,PointX:32/?UI,PointY:32/?UI,Flags:32/?UI>>).
+  <<ThisRef:32/?UI,PointX:32/?UI,PointY:32/?UI>>).
 
 %% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlinsertcolumn">external documentation</a>.
 %% <br /> Also:<br />
@@ -869,6 +871,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxListView.erl b/lib/wx/src/gen/wxListView.erl
index 3720fe86c1..288afcee82 100644
--- a/lib/wx/src/gen/wxListView.erl
+++ b/lib/wx/src/gen/wxListView.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,10 +34,10 @@
   isSelected/2,select/2,select/3,setColumnImage/3]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -49,24 +49,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -168,6 +169,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxListbook.erl b/lib/wx/src/gen/wxListbook.erl
index b5083c5746..6ea34e8eb1 100644
--- a/lib/wx/src/gen/wxListbook.erl
+++ b/lib/wx/src/gen/wxListbook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -38,10 +38,10 @@
   setPageSize/2,setPageText/3,setSelection/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -53,24 +53,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -383,6 +384,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxMDIChildFrame.erl b/lib/wx/src/gen/wxMDIChildFrame.erl
index 05f07f1066..ed29e5431f 100644
--- a/lib/wx/src/gen/wxMDIChildFrame.erl
+++ b/lib/wx/src/gen/wxMDIChildFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -35,11 +35,11 @@
   new/4,restore/1]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createStatusBar/1,createStatusBar/2,createToolBar/1,createToolBar/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -55,26 +55,27 @@
   getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1,
-  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,
-  moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2,
-  pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,processCommand/2,raise/1,refresh/1,
-  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
-  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  sendSizeEvent/1,setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
-  setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
-  setId/2,setLabel/2,setMaxSize/2,setMenuBar/2,setMinSize/2,setName/2,
-  setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,setPalette/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setStatusBar/2,setStatusBarPane/2,setStatusText/2,setStatusText/3,
-  setStatusWidths/2,setThemeEnabled/2,setTitle/2,setToolBar/2,setToolTip/2,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,processCommand/2,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
+  scrollWindow/4,sendSizeEvent/1,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2,
+  setStatusBarPane/2,setStatusText/2,setStatusText/3,setStatusWidths/2,
+  setThemeEnabled/2,setTitle/2,setToolBar/2,setToolTip/2,setTransparent/2,
   setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,
   setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,
   shouldInheritColours/1,show/1,show/2,showFullScreen/2,showFullScreen/3,
@@ -274,6 +275,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxMDIClientWindow.erl b/lib/wx/src/gen/wxMDIClientWindow.erl
index 20569718f7..6f10627086 100644
--- a/lib/wx/src/gen/wxMDIClientWindow.erl
+++ b/lib/wx/src/gen/wxMDIClientWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -32,10 +32,10 @@
 -export([createClient/2,createClient/3,destroy/1,new/0,new/1,new/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -47,24 +47,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -135,6 +136,14 @@ destroy(Obj=#wx_ref{type=Type}) ->
   ok.
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxMDIParentFrame.erl b/lib/wx/src/gen/wxMDIParentFrame.erl
index 9aeba68ea3..47d9182d60 100644
--- a/lib/wx/src/gen/wxMDIParentFrame.erl
+++ b/lib/wx/src/gen/wxMDIParentFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -36,11 +36,11 @@
   tile/1,tile/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createStatusBar/1,createStatusBar/2,createToolBar/1,createToolBar/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -56,32 +56,32 @@
   getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1,
-  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2,
-  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,processCommand/2,
-  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
-  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  processCommand/2,raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,
+  releaseMouse/1,removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
   screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
   scrollWindow/4,sendSizeEvent/1,setAcceleratorTable/2,setAutoLayout/2,
   setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
-  setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2,
-  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,
-  setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,setMaxSize/2,
-  setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
-  setOwnForegroundColour/2,setPalette/2,setScrollPos/3,setScrollPos/4,
-  setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,setSize/3,setSize/5,
-  setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
-  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2,setStatusBarPane/2,
-  setStatusText/2,setStatusText/3,setStatusWidths/2,setThemeEnabled/2,
-  setTitle/2,setToolBar/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,showFullScreen/2,showFullScreen/3,thaw/1,transferDataFromWindow/1,
-  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
-  validate/1,warpPointer/3]).
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2,
+  setStatusBarPane/2,setStatusText/2,setStatusText/3,setStatusWidths/2,
+  setThemeEnabled/2,setTitle/2,setToolBar/2,setToolTip/2,setTransparent/2,
+  setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,
+  setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,
+  shouldInheritColours/1,show/1,show/2,showFullScreen/2,showFullScreen/3,
+  thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
+  updateWindowUI/2,validate/1,warpPointer/3]).
 
 -export_type([wxMDIParentFrame/0]).
 %% @hidden
@@ -313,6 +313,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxMenuBar.erl b/lib/wx/src/gen/wxMenuBar.erl
index cb35015c08..5e879da5ed 100644
--- a/lib/wx/src/gen/wxMenuBar.erl
+++ b/lib/wx/src/gen/wxMenuBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -36,10 +36,10 @@
   setLabelTop/3]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,getBackgroundColour/1,
   getBackgroundStyle/1,getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,
@@ -51,24 +51,24 @@
   getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3,getToolTip/1,
   getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,getWindowVariant/1,
   hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,hide/1,inheritAttributes/1,
-  initDialog/1,invalidateBestSize/1,isExposed/2,isExposed/3,isExposed/5,
-  isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,
-  makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
-  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
-  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
-  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
-  removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,
-  scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
-  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
-  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setId/2,setMaxSize/2,setMinSize/2,
-  setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
+  initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,isExposed/2,
+  isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1,
+  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,
+  moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2,
+  pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
+  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
+  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
+  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
+  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
+  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setMaxSize/2,
+  setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -340,6 +340,14 @@ destroy(Obj=#wx_ref{type=Type}) ->
   ok.
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxMessageDialog.erl b/lib/wx/src/gen/wxMessageDialog.erl
index f024145ed6..1fe99b2b88 100644
--- a/lib/wx/src/gen/wxMessageDialog.erl
+++ b/lib/wx/src/gen/wxMessageDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,11 +34,11 @@
 -export([destroy/1,new/2,new/3]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1,
   disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
   endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -53,25 +53,26 @@
   getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,
-  maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
-  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
-  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
-  setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
+  scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
+  setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
+  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
   setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1,
@@ -191,6 +192,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxMiniFrame.erl b/lib/wx/src/gen/wxMiniFrame.erl
index 7622ddf0d2..f731cc5416 100644
--- a/lib/wx/src/gen/wxMiniFrame.erl
+++ b/lib/wx/src/gen/wxMiniFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,11 +34,11 @@
 -export([create/4,create/5,destroy/1,new/0,new/3,new/4]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createStatusBar/1,createStatusBar/2,createToolBar/1,createToolBar/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -54,32 +54,32 @@
   getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1,
-  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2,
-  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,processCommand/2,
-  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
-  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  processCommand/2,raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,
+  releaseMouse/1,removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
   screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
   scrollWindow/4,sendSizeEvent/1,setAcceleratorTable/2,setAutoLayout/2,
   setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
-  setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2,
-  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,
-  setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,setMaxSize/2,
-  setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
-  setOwnForegroundColour/2,setPalette/2,setScrollPos/3,setScrollPos/4,
-  setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,setSize/3,setSize/5,
-  setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
-  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2,setStatusBarPane/2,
-  setStatusText/2,setStatusText/3,setStatusWidths/2,setThemeEnabled/2,
-  setTitle/2,setToolBar/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,showFullScreen/2,showFullScreen/3,thaw/1,transferDataFromWindow/1,
-  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
-  validate/1,warpPointer/3]).
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2,
+  setStatusBarPane/2,setStatusText/2,setStatusText/3,setStatusWidths/2,
+  setThemeEnabled/2,setTitle/2,setToolBar/2,setToolTip/2,setTransparent/2,
+  setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,
+  setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,
+  shouldInheritColours/1,show/1,show/2,showFullScreen/2,showFullScreen/3,
+  thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
+  updateWindowUI/2,validate/1,warpPointer/3]).
 
 -export_type([wxMiniFrame/0]).
 %% @hidden
@@ -241,6 +241,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxMultiChoiceDialog.erl b/lib/wx/src/gen/wxMultiChoiceDialog.erl
index e79f11ef7d..96e9c070a3 100644
--- a/lib/wx/src/gen/wxMultiChoiceDialog.erl
+++ b/lib/wx/src/gen/wxMultiChoiceDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,11 +34,11 @@
 -export([destroy/1,getSelections/1,new/0,new/4,new/5,setSelections/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1,
   disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
   endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -53,25 +53,26 @@
   getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,
-  maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
-  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
-  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
-  setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
+  scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
+  setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
+  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
   setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1,
@@ -216,6 +217,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxNotebook.erl b/lib/wx/src/gen/wxNotebook.erl
index 16c2d4fc6f..5011375aad 100644
--- a/lib/wx/src/gen/wxNotebook.erl
+++ b/lib/wx/src/gen/wxNotebook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -38,10 +38,10 @@
   setPadding/2,setPageImage/3,setPageSize/2,setPageText/3,setSelection/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -53,24 +53,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -408,6 +409,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxPanel.erl b/lib/wx/src/gen/wxPanel.erl
index 5b6d4a2974..ceb894fe31 100644
--- a/lib/wx/src/gen/wxPanel.erl
+++ b/lib/wx/src/gen/wxPanel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -32,10 +32,10 @@
 -export([destroy/1,initDialog/1,new/0,new/1,new/2,new/5,new/6,setFocusIgnoringChildren/1]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -47,24 +47,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,invalidateBestSize/1,isEnabled/1,isExposed/2,
-  isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1,
-  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,
-  moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2,
-  pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -154,6 +155,14 @@ destroy(Obj=#wx_ref{type=Type}) ->
   ok.
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxPasswordEntryDialog.erl b/lib/wx/src/gen/wxPasswordEntryDialog.erl
index da9a711405..ac3f1c9d8c 100644
--- a/lib/wx/src/gen/wxPasswordEntryDialog.erl
+++ b/lib/wx/src/gen/wxPasswordEntryDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -35,11 +35,11 @@
 -export([destroy/1,new/2,new/3]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1,
   disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
   endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -54,8 +54,8 @@
   getTitle/1,getToolTip/1,getUpdateRegion/1,getValue/1,getVirtualSize/1,
   getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,hasScrollbar/2,
   hasTransparentBackground/1,hide/1,iconize/1,iconize/2,inheritAttributes/1,
-  initDialog/1,invalidateBestSize/1,isActive/1,isEnabled/1,isExposed/2,
-  isExposed/3,isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,
+  initDialog/1,invalidateBestSize/1,isActive/1,isDoubleBuffered/1,isEnabled/1,
+  isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,
   isModal/1,isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,
   lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2,move/2,move/3,
   move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2,
@@ -66,19 +66,19 @@
   scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
   setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
   setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
-  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
-  setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3,
-  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
-  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
-  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
-  setTitle/2,setToolTip/2,setValue/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1,
-  transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
-  updateWindowUI/2,validate/1,warpPointer/3]).
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
+  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2,
+  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
+  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
+  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
+  setThemeEnabled/2,setTitle/2,setToolTip/2,setTransparent/2,setValue/2,
+  setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,
+  setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,
+  shouldInheritColours/1,show/1,show/2,showFullScreen/2,showFullScreen/3,
+  showModal/1,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
+  update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
 -export_type([wxPasswordEntryDialog/0]).
 %% @hidden
@@ -201,6 +201,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxPickerBase.erl b/lib/wx/src/gen/wxPickerBase.erl
index 74de8bf7f1..bbdeaf6af8 100644
--- a/lib/wx/src/gen/wxPickerBase.erl
+++ b/lib/wx/src/gen/wxPickerBase.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -36,10 +36,10 @@
   setTextCtrlGrowable/1,setTextCtrlGrowable/2,setTextCtrlProportion/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -51,24 +51,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -213,6 +214,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxPopupTransientWindow.erl b/lib/wx/src/gen/wxPopupTransientWindow.erl
index 40a63b09ec..c07c6e239e 100644
--- a/lib/wx/src/gen/wxPopupTransientWindow.erl
+++ b/lib/wx/src/gen/wxPopupTransientWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -33,10 +33,10 @@
 -export([destroy/1,dismiss/1,new/0,new/1,new/2,popup/1,popup/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -48,24 +48,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,position/3,raise/1,refresh/1,refresh/2,
-  refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,
-  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
-  scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
-  setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,position/3,raise/1,
+  refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -145,6 +146,14 @@ destroy(Obj=#wx_ref{type=Type}) ->
 position(This,PtOrigin,Size) -> wxPopupWindow:position(This,PtOrigin,Size).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxPopupWindow.erl b/lib/wx/src/gen/wxPopupWindow.erl
index 41390e08e7..439f5fac54 100644
--- a/lib/wx/src/gen/wxPopupWindow.erl
+++ b/lib/wx/src/gen/wxPopupWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -32,10 +32,10 @@
 -export([create/2,create/3,destroy/1,new/0,new/1,new/2,position/3]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -47,24 +47,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -142,6 +143,14 @@ destroy(Obj=#wx_ref{type=Type}) ->
   ok.
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxPreviewCanvas.erl b/lib/wx/src/gen/wxPreviewCanvas.erl
index 91d0672def..67357dbd65 100644
--- a/lib/wx/src/gen/wxPreviewCanvas.erl
+++ b/lib/wx/src/gen/wxPreviewCanvas.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -35,10 +35,10 @@
 
 %% inherited exports
 -export([cacheBestSize/2,calcScrolledPosition/2,calcScrolledPosition/3,calcUnscrolledPosition/2,
-  calcUnscrolledPosition/3,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+  calcUnscrolledPosition/3,canSetTransparent/1,captureMouse/1,center/1,
+  center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   doPrepareDC/2,enable/1,enable/2,enableScrolling/3,findWindow/2,fit/1,
   fitInside/1,freeze/1,getAcceleratorTable/1,getBackgroundColour/1,
@@ -51,25 +51,26 @@
   getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3,
   getToolTip/1,getUpdateRegion/1,getViewStart/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,prepareDC/2,raise/1,refresh/1,refresh/2,
-  refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,
-  screenToClient/1,screenToClient/2,scroll/3,scrollLines/2,scrollPages/2,
-  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
-  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
-  setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2,
-  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
-  setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
-  setPalette/2,setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5,
-  setScrollbar/6,setScrollbars/5,setScrollbars/6,setSize/2,setSize/3,
-  setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
-  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,
-  setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,prepareDC/2,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scroll/3,
+  scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
+  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
+  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFocusIgnoringChildren/1,setFont/2,setForegroundColour/2,setHelpText/2,
+  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
+  setScrollPos/4,setScrollRate/3,setScrollbar/5,setScrollbar/6,setScrollbars/5,
+  setScrollbars/6,setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,
+  setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,
+  setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,setToolTip/2,
+  setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
   setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
   setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
@@ -120,6 +121,14 @@ setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This).
 initDialog(This) -> wxPanel:initDialog(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxPreviewControlBar.erl b/lib/wx/src/gen/wxPreviewControlBar.erl
index 9bc290aef8..0e1828e87b 100644
--- a/lib/wx/src/gen/wxPreviewControlBar.erl
+++ b/lib/wx/src/gen/wxPreviewControlBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,10 +34,10 @@
   new/4,setZoomControl/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -49,24 +49,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1,
   setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -151,6 +152,14 @@ setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This).
 initDialog(This) -> wxPanel:initDialog(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxPreviewFrame.erl b/lib/wx/src/gen/wxPreviewFrame.erl
index 9423fc2333..fe684478a5 100644
--- a/lib/wx/src/gen/wxPreviewFrame.erl
+++ b/lib/wx/src/gen/wxPreviewFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -35,11 +35,11 @@
   onCloseWindow/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createStatusBar/1,createStatusBar/2,createToolBar/1,createToolBar/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -55,32 +55,32 @@
   getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1,
-  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2,
-  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,processCommand/2,
-  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
-  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  processCommand/2,raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,
+  releaseMouse/1,removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
   screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
   scrollWindow/4,sendSizeEvent/1,setAcceleratorTable/2,setAutoLayout/2,
   setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
-  setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2,
-  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,
-  setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,setMaxSize/2,
-  setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
-  setOwnForegroundColour/2,setPalette/2,setScrollPos/3,setScrollPos/4,
-  setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,setSize/3,setSize/5,
-  setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
-  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2,setStatusBarPane/2,
-  setStatusText/2,setStatusText/3,setStatusWidths/2,setThemeEnabled/2,
-  setTitle/2,setToolBar/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,showFullScreen/2,showFullScreen/3,thaw/1,transferDataFromWindow/1,
-  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
-  validate/1,warpPointer/3]).
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2,
+  setStatusBarPane/2,setStatusText/2,setStatusText/3,setStatusWidths/2,
+  setThemeEnabled/2,setTitle/2,setToolBar/2,setToolTip/2,setTransparent/2,
+  setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,
+  setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,
+  shouldInheritColours/1,show/1,show/2,showFullScreen/2,showFullScreen/3,
+  thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
+  updateWindowUI/2,validate/1,warpPointer/3]).
 
 -export_type([wxPreviewFrame/0]).
 %% @hidden
@@ -244,6 +244,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxPrintDialog.erl b/lib/wx/src/gen/wxPrintDialog.erl
index 4f253b4988..a337089d5a 100644
--- a/lib/wx/src/gen/wxPrintDialog.erl
+++ b/lib/wx/src/gen/wxPrintDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,11 +34,11 @@
 -export([destroy/1,getPrintDC/1,getPrintDialogData/1,new/1,new/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1,
   disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
   endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -53,25 +53,26 @@
   getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,
-  maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
-  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
-  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
-  setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
+  scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
+  setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
+  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
   setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1,
@@ -213,6 +214,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxProgressDialog.erl b/lib/wx/src/gen/wxProgressDialog.erl
index 544d67a7d8..665b900729 100644
--- a/lib/wx/src/gen/wxProgressDialog.erl
+++ b/lib/wx/src/gen/wxProgressDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,11 +34,11 @@
 -export([destroy/1,new/2,new/3,resume/1,update/1,update/2,update/3]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1,
   disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
   endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -53,25 +53,26 @@
   getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,
-  maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
-  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
-  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
-  setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
+  scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
+  setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
+  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
   setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1,
@@ -228,6 +229,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxRadioBox.erl b/lib/wx/src/gen/wxRadioBox.erl
index 331c83d695..5ef1deff66 100644
--- a/lib/wx/src/gen/wxRadioBox.erl
+++ b/lib/wx/src/gen/wxRadioBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -36,10 +36,10 @@
   setItemHelpText/3,setItemToolTip/3,setSelection/2,show/1,show/2,show/3]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,getBackgroundColour/1,
   getBackgroundStyle/1,getBestSize/1,getCaret/1,getCharHeight/1,getCharWidth/1,
@@ -51,24 +51,24 @@
   getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3,getToolTip/1,
   getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,getWindowVariant/1,
   hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,hide/1,inheritAttributes/1,
-  initDialog/1,invalidateBestSize/1,isEnabled/1,isExposed/2,isExposed/3,
-  isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1,
-  lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
-  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
-  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
-  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
-  removeChild/2,reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,
-  scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
-  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
-  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,isEnabled/1,
+  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
+  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
+  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
+  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
+  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
+  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
+  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
+  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
+  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
   updateWindowUI/2,validate/1,warpPointer/3]).
@@ -348,6 +348,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxRadioButton.erl b/lib/wx/src/gen/wxRadioButton.erl
index ab08c5807e..3b4689a27b 100644
--- a/lib/wx/src/gen/wxRadioButton.erl
+++ b/lib/wx/src/gen/wxRadioButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -33,10 +33,10 @@
 -export([create/4,create/5,destroy/1,getValue/1,new/0,new/3,new/4,setValue/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -48,24 +48,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -171,6 +172,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxSashLayoutWindow.erl b/lib/wx/src/gen/wxSashLayoutWindow.erl
index c64ed77f31..223c07419d 100644
--- a/lib/wx/src/gen/wxSashLayoutWindow.erl
+++ b/lib/wx/src/gen/wxSashLayoutWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,10 +34,10 @@
   new/2,setAlignment/2,setDefaultSize/2,setOrientation/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -51,9 +51,9 @@
   getTextExtent/2,getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,
   getWindowStyleFlag/1,getWindowVariant/1,hasCapture/1,hasScrollbar/2,
   hasTransparentBackground/1,hide/1,inheritAttributes/1,initDialog/1,
-  invalidateBestSize/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,
-  isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,
-  makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  invalidateBestSize/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1,
+  lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
   moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
   popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
   raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
@@ -61,17 +61,17 @@
   scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
   setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
   setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMaximumSizeX/2,setMaximumSizeY/2,setMinSize/2,setMinimumSizeX/2,
   setMinimumSizeY/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
   setOwnForegroundColour/2,setPalette/2,setSashVisible/3,setScrollPos/3,
   setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,setSize/3,setSize/5,
   setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
   setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,setToolTip/2,
-  setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,
-  setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,
-  shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
+  setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
+  setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
   validate/1,warpPointer/3]).
 
@@ -220,6 +220,14 @@ getMaximumSizeX(This) -> wxSashWindow:getMaximumSizeX(This).
 getSashVisible(This,Edge) -> wxSashWindow:getSashVisible(This,Edge).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxSashWindow.erl b/lib/wx/src/gen/wxSashWindow.erl
index 7f9f15aa58..4a39726ffd 100644
--- a/lib/wx/src/gen/wxSashWindow.erl
+++ b/lib/wx/src/gen/wxSashWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,10 +34,10 @@
   setMinimumSizeX/2,setMinimumSizeY/2,setSashVisible/3]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -49,24 +49,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -207,6 +208,14 @@ destroy(Obj=#wx_ref{type=Type}) ->
   ok.
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxScrollBar.erl b/lib/wx/src/gen/wxScrollBar.erl
index 97c30f2972..ccddf84835 100644
--- a/lib/wx/src/gen/wxScrollBar.erl
+++ b/lib/wx/src/gen/wxScrollBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,10 +34,10 @@
   getThumbSize/1,new/0,new/2,new/3,setScrollbar/5,setScrollbar/6,setThumbPosition/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -49,25 +49,26 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setSize/2,setSize/3,setSize/5,
   setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
   setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,setToolTip/2,
-  setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,
-  setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,
-  shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
+  setTransparent/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
+  setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
+  setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
   transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
   validate/1,warpPointer/3]).
 
@@ -215,6 +216,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxScrolledWindow.erl b/lib/wx/src/gen/wxScrolledWindow.erl
index 5513014c31..7c807980b4 100644
--- a/lib/wx/src/gen/wxScrolledWindow.erl
+++ b/lib/wx/src/gen/wxScrolledWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -36,10 +36,10 @@
   scroll/3,setScrollRate/3,setScrollbars/5,setScrollbars/6,setTargetWindow/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -51,24 +51,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1,
   setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -258,6 +259,14 @@ setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This).
 initDialog(This) -> wxPanel:initDialog(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxSingleChoiceDialog.erl b/lib/wx/src/gen/wxSingleChoiceDialog.erl
index c5743c4ea1..641cb2836f 100644
--- a/lib/wx/src/gen/wxSingleChoiceDialog.erl
+++ b/lib/wx/src/gen/wxSingleChoiceDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,11 +34,11 @@
 -export([destroy/1,getSelection/1,getStringSelection/1,new/0,new/4,new/5,setSelection/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1,
   disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
   endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -53,25 +53,26 @@
   getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,
-  maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
-  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
-  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
-  setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
+  scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
+  setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
+  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
   setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1,
@@ -223,6 +224,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxSlider.erl b/lib/wx/src/gen/wxSlider.erl
index 93ec783e48..02103aed01 100644
--- a/lib/wx/src/gen/wxSlider.erl
+++ b/lib/wx/src/gen/wxSlider.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -35,10 +35,10 @@
   setRange/3,setThumbLength/2,setValue/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -50,24 +50,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -247,6 +248,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxSpinButton.erl b/lib/wx/src/gen/wxSpinButton.erl
index 52d71dd9c2..82b48f87da 100644
--- a/lib/wx/src/gen/wxSpinButton.erl
+++ b/lib/wx/src/gen/wxSpinButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,10 +34,10 @@
   new/2,setRange/3,setValue/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -49,24 +49,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -195,6 +196,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxSpinCtrl.erl b/lib/wx/src/gen/wxSpinCtrl.erl
index 6fe5197359..89fa971543 100644
--- a/lib/wx/src/gen/wxSpinCtrl.erl
+++ b/lib/wx/src/gen/wxSpinCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,10 +34,10 @@
   new/2,setRange/3,setSelection/3,setValue/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -49,24 +49,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -232,6 +233,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxSplashScreen.erl b/lib/wx/src/gen/wxSplashScreen.erl
index 6c12907d38..fad8cfcd8e 100644
--- a/lib/wx/src/gen/wxSplashScreen.erl
+++ b/lib/wx/src/gen/wxSplashScreen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,11 +34,11 @@
 -export([destroy/1,getSplashStyle/1,getTimeout/1,new/0,new/5,new/6]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createStatusBar/1,createStatusBar/2,createToolBar/1,createToolBar/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -54,32 +54,32 @@
   getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isRetained/1,isShown/1,isTopLevel/1,layout/1,
-  lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,maximize/2,
-  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,processCommand/2,
-  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
-  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  processCommand/2,raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,
+  releaseMouse/1,removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
   screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
   scrollWindow/4,sendSizeEvent/1,setAcceleratorTable/2,setAutoLayout/2,
   setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
-  setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2,
-  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,
-  setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,setMaxSize/2,
-  setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
-  setOwnForegroundColour/2,setPalette/2,setScrollPos/3,setScrollPos/4,
-  setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,setSize/3,setSize/5,
-  setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
-  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2,setStatusBarPane/2,
-  setStatusText/2,setStatusText/3,setStatusWidths/2,setThemeEnabled/2,
-  setTitle/2,setToolBar/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
-  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
-  show/1,show/2,showFullScreen/2,showFullScreen/3,thaw/1,transferDataFromWindow/1,
-  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
-  validate/1,warpPointer/3]).
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMenuBar/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
+  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setStatusBar/2,
+  setStatusBarPane/2,setStatusText/2,setStatusText/3,setStatusWidths/2,
+  setThemeEnabled/2,setTitle/2,setToolBar/2,setToolTip/2,setTransparent/2,
+  setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,
+  setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,
+  shouldInheritColours/1,show/1,show/2,showFullScreen/2,showFullScreen/3,
+  thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,updateWindowUI/1,
+  updateWindowUI/2,validate/1,warpPointer/3]).
 
 -export_type([wxSplashScreen/0]).
 %% @hidden
@@ -230,6 +230,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxSplitterWindow.erl b/lib/wx/src/gen/wxSplitterWindow.erl
index b6b7a328ad..7db8dc60c4 100644
--- a/lib/wx/src/gen/wxSplitterWindow.erl
+++ b/lib/wx/src/gen/wxSplitterWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -37,10 +37,10 @@
   unsplit/1,unsplit/2,updateSize/1]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -52,24 +52,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -358,6 +359,14 @@ destroy(Obj=#wx_ref{type=Type}) ->
   ok.
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxStaticBitmap.erl b/lib/wx/src/gen/wxStaticBitmap.erl
index 1673e3b62d..4da50262b9 100644
--- a/lib/wx/src/gen/wxStaticBitmap.erl
+++ b/lib/wx/src/gen/wxStaticBitmap.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -33,10 +33,10 @@
 -export([create/4,create/5,destroy/1,getBitmap/1,new/0,new/3,new/4,setBitmap/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -48,24 +48,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -167,6 +168,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxStaticBox.erl b/lib/wx/src/gen/wxStaticBox.erl
index f6a715f051..04584f23b2 100644
--- a/lib/wx/src/gen/wxStaticBox.erl
+++ b/lib/wx/src/gen/wxStaticBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -33,10 +33,10 @@
 -export([create/4,create/5,destroy/1,new/0,new/3,new/4]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -48,24 +48,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -150,6 +151,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxStaticLine.erl b/lib/wx/src/gen/wxStaticLine.erl
index 6306a01c62..6d23c5ac3d 100644
--- a/lib/wx/src/gen/wxStaticLine.erl
+++ b/lib/wx/src/gen/wxStaticLine.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,10 +34,10 @@
   new/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -49,24 +49,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -167,6 +168,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxStaticText.erl b/lib/wx/src/gen/wxStaticText.erl
index 4c5d72d5e7..635f29a1e8 100644
--- a/lib/wx/src/gen/wxStaticText.erl
+++ b/lib/wx/src/gen/wxStaticText.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -33,10 +33,10 @@
 -export([create/4,create/5,destroy/1,getLabel/1,new/0,new/3,new/4,setLabel/2,wrap/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -48,24 +48,25 @@
   getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3,
   getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setMaxSize/2,setMinSize/2,
   setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -173,6 +174,14 @@ destroy(Obj=#wx_ref{type=Type}) ->
  %% From wxControl
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxStatusBar.erl b/lib/wx/src/gen/wxStatusBar.erl
index 254b9b0236..2cd0d4a43e 100644
--- a/lib/wx/src/gen/wxStatusBar.erl
+++ b/lib/wx/src/gen/wxStatusBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -35,10 +35,10 @@
   setStatusStyles/2,setStatusText/2,setStatusText/3,setStatusWidths/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -50,24 +50,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -295,6 +296,14 @@ destroy(Obj=#wx_ref{type=Type}) ->
   ok.
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxStyledTextCtrl.erl b/lib/wx/src/gen/wxStyledTextCtrl.erl
index 4598cc7609..8e629db9ff 100644
--- a/lib/wx/src/gen/wxStyledTextCtrl.erl
+++ b/lib/wx/src/gen/wxStyledTextCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -135,10 +135,10 @@
   wordRightExtend/1,wordStartPosition/3,wrapCount/2,zoomIn/1,zoomOut/1]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -150,27 +150,27 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
-  moveBeforeInTabOrder/2,navigate/1,navigate/2,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
-  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
-  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
-  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
-  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
-  setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2,
-  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,
-  setHelpText/2,setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,
-  setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,setPalette/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setSize/2,
-  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
-  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
-  setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
-  setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
-  setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
-  transferDataToWindow/1,update/1,updateWindowUI/1,updateWindowUI/2,
-  validate/1,warpPointer/3]).
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,
+  move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,navigate/2,
+  parent_class/1,popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,
+  popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,
+  releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,screenToClient/2,
+  scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
+  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
+  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
+  setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
+  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
+  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
+  show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
+  update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
 
 -export_type([wxStyledTextCtrl/0]).
 %% @hidden
@@ -4078,6 +4078,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxTextCtrl.erl b/lib/wx/src/gen/wxTextCtrl.erl
index de9e1c307a..5840812579 100644
--- a/lib/wx/src/gen/wxTextCtrl.erl
+++ b/lib/wx/src/gen/wxTextCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -41,10 +41,10 @@
   setStyle/4,setValue/2,showPosition/2,undo/1,writeText/2,xYToPosition/3]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -56,24 +56,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -597,6 +598,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxTextEntryDialog.erl b/lib/wx/src/gen/wxTextEntryDialog.erl
index b18ba27607..a93c3857a8 100644
--- a/lib/wx/src/gen/wxTextEntryDialog.erl
+++ b/lib/wx/src/gen/wxTextEntryDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -34,11 +34,11 @@
 -export([destroy/1,getValue/1,new/2,new/3,setValue/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centerOnScreen/1,centerOnScreen/2,centre/1,centre/2,
-  centreOnParent/1,centreOnParent/2,centreOnScreen/1,centreOnScreen/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centerOnScreen/1,centerOnScreen/2,
+  centre/1,centre/2,centreOnParent/1,centreOnParent/2,centreOnScreen/1,
+  centreOnScreen/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   createButtonSizer/2,createStdDialogButtonSizer/2,destroyChildren/1,
   disable/1,disconnect/1,disconnect/2,disconnect/3,enable/1,enable/2,
   endModal/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
@@ -53,25 +53,26 @@
   getTitle/1,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
   hide/1,iconize/1,iconize/2,inheritAttributes/1,initDialog/1,invalidateBestSize/1,
-  isActive/1,isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isFullScreen/1,
-  isIconized/1,isMaximized/1,isModal/1,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,maximize/1,
-  maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
-  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
-  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
-  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
-  reparent/2,requestUserAttention/1,requestUserAttention/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,setBackgroundColour/2,
-  setBackgroundStyle/2,setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,
-  setCursor/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
-  setFont/2,setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,
-  setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,
-  setOwnFont/2,setOwnForegroundColour/2,setPalette/2,setReturnCode/2,
-  setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,
-  setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
-  setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setTitle/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
+  isActive/1,isDoubleBuffered/1,isEnabled/1,isExposed/2,isExposed/3,
+  isExposed/5,isFullScreen/1,isIconized/1,isMaximized/1,isModal/1,isRetained/1,
+  isShown/1,isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,
+  makeModal/2,maximize/1,maximize/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
+  moveBeforeInTabOrder/2,navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,
+  popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,
+  raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,
+  removeChild/2,reparent/2,requestUserAttention/1,requestUserAttention/2,
+  screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,
+  scrollWindow/4,setAcceleratorTable/2,setAffirmativeId/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
+  setForegroundColour/2,setHelpText/2,setIcon/2,setIcons/2,setId/2,setLabel/2,
+  setMaxSize/2,setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,
+  setOwnForegroundColour/2,setPalette/2,setReturnCode/2,setScrollPos/3,
+  setScrollPos/4,setScrollbar/5,setScrollbar/6,setShape/2,setSize/2,
+  setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,
+  setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setThemeEnabled/2,
+  setTitle/2,setToolTip/2,setTransparent/2,setVirtualSize/2,setVirtualSize/3,
   setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,showFullScreen/2,showFullScreen/3,showModal/1,thaw/1,
@@ -211,6 +212,14 @@ getIcons(This) -> wxTopLevelWindow:getIcons(This).
 getIcon(This) -> wxTopLevelWindow:getIcon(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxToggleButton.erl b/lib/wx/src/gen/wxToggleButton.erl
index 45795318c6..dffb4b159d 100644
--- a/lib/wx/src/gen/wxToggleButton.erl
+++ b/lib/wx/src/gen/wxToggleButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -33,10 +33,10 @@
 -export([create/4,create/5,destroy/1,getValue/1,new/0,new/3,new/4,setValue/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -48,24 +48,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -171,6 +172,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxToolBar.erl b/lib/wx/src/gen/wxToolBar.erl
index bee20b97f4..b3cce2b6e9 100644
--- a/lib/wx/src/gen/wxToolBar.erl
+++ b/lib/wx/src/gen/wxToolBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -42,10 +42,10 @@
   setToolShortHelp/3,toggleTool/3]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -57,24 +57,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -673,6 +674,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxToolbook.erl b/lib/wx/src/gen/wxToolbook.erl
index f959a73004..cf77aefd8a 100644
--- a/lib/wx/src/gen/wxToolbook.erl
+++ b/lib/wx/src/gen/wxToolbook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -38,10 +38,10 @@
   setPageSize/2,setPageText/3,setSelection/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -53,24 +53,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -383,6 +384,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxTopLevelWindow.erl b/lib/wx/src/gen/wxTopLevelWindow.erl
index e11a72fab9..72813b0073 100644
--- a/lib/wx/src/gen/wxTopLevelWindow.erl
+++ b/lib/wx/src/gen/wxTopLevelWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -36,10 +36,10 @@
   showFullScreen/2,showFullScreen/3]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -51,24 +51,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -301,6 +302,14 @@ showFullScreen(#wx_ref{type=ThisT,ref=ThisRef},Show, Options)
 
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxTreeCtrl.erl b/lib/wx/src/gen/wxTreeCtrl.erl
index ef6e2b6fea..43dee9107d 100644
--- a/lib/wx/src/gen/wxTreeCtrl.erl
+++ b/lib/wx/src/gen/wxTreeCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -54,10 +54,10 @@
   unselectItem/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -69,24 +69,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,show/1,
   show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,update/1,
   updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -945,6 +946,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxTreebook.erl b/lib/wx/src/gen/wxTreebook.erl
index 19f1d7cfe4..1900f47289 100644
--- a/lib/wx/src/gen/wxTreebook.erl
+++ b/lib/wx/src/gen/wxTreebook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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.
@@ -39,10 +39,10 @@
   setPageSize/2,setPageText/3,setSelection/2]).
 
 %% inherited exports
--export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
+-export([cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,center/2,
+  centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,connect/2,connect/3,convertDialogToPixels/2,convertPixelsToDialog/2,
   destroyChildren/1,disable/1,disconnect/1,disconnect/2,disconnect/3,
   enable/1,enable/2,findWindow/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCaret/1,
@@ -54,24 +54,25 @@
   getScrollRange/2,getScrollThumb/2,getSize/1,getSizer/1,getTextExtent/2,
   getTextExtent/3,getToolTip/1,getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,
   getWindowVariant/1,hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,
-  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isEnabled/1,
-  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
-  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
-  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
-  navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,popEventHandler/2,
-  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
-  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
-  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
-  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
-  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  hide/1,inheritAttributes/1,initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,
+  isEnabled/1,isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,
+  isTopLevel/1,layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,
+  move/2,move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,
+  navigate/1,navigate/2,pageDown/1,pageUp/1,parent_class/1,popEventHandler/1,
+  popEventHandler/2,popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,
+  refresh/2,refreshRect/2,refreshRect/3,releaseMouse/1,removeChild/2,
+  reparent/2,screenToClient/1,screenToClient/2,scrollLines/2,scrollPages/2,
+  scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
+  setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
+  setClientSize/3,setContainingSizer/2,setCursor/2,setDoubleBuffered/2,
   setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
   setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -439,6 +440,14 @@ setLabel(This,Label) -> wxControl:setLabel(This,Label).
 getLabel(This) -> wxControl:getLabel(This).
  %% From wxWindow
 %% @hidden
+setDoubleBuffered(This,On) -> wxWindow:setDoubleBuffered(This,On).
+%% @hidden
+isDoubleBuffered(This) -> wxWindow:isDoubleBuffered(This).
+%% @hidden
+canSetTransparent(This) -> wxWindow:canSetTransparent(This).
+%% @hidden
+setTransparent(This,Alpha) -> wxWindow:setTransparent(This,Alpha).
+%% @hidden
 warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
 %% @hidden
 validate(This) -> wxWindow:validate(This).
diff --git a/lib/wx/src/gen/wxWindow.erl b/lib/wx/src/gen/wxWindow.erl
index 09928de09a..a8a61d547b 100644
--- a/lib/wx/src/gen/wxWindow.erl
+++ b/lib/wx/src/gen/wxWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -28,13 +28,13 @@
 
 -module(wxWindow).
 -include("wxe.hrl").
--export(['Destroy'/1,cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
-  centerOnParent/2,centre/1,centre/2,centreOnParent/1,centreOnParent/2,
-  clearBackground/1,clientToScreen/2,clientToScreen/3,close/1,close/2,
-  convertDialogToPixels/2,convertPixelsToDialog/2,destroy/1,destroyChildren/1,
-  disable/1,enable/1,enable/2,findFocus/0,findWindow/2,findWindowById/1,
-  findWindowById/2,findWindowByLabel/1,findWindowByLabel/2,findWindowByName/1,
-  findWindowByName/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
+-export(['Destroy'/1,cacheBestSize/2,canSetTransparent/1,captureMouse/1,center/1,
+  center/2,centerOnParent/1,centerOnParent/2,centre/1,centre/2,centreOnParent/1,
+  centreOnParent/2,clearBackground/1,clientToScreen/2,clientToScreen/3,
+  close/1,close/2,convertDialogToPixels/2,convertPixelsToDialog/2,destroy/1,
+  destroyChildren/1,disable/1,enable/1,enable/2,findFocus/0,findWindow/2,
+  findWindowById/1,findWindowById/2,findWindowByLabel/1,findWindowByLabel/2,
+  findWindowByName/1,findWindowByName/2,fit/1,fitInside/1,freeze/1,getAcceleratorTable/1,
   getBackgroundColour/1,getBackgroundStyle/1,getBestSize/1,getCapture/0,
   getCaret/1,getCharHeight/1,getCharWidth/1,getChildren/1,getClientSize/1,
   getContainingSizer/1,getCursor/1,getDropTarget/1,getEventHandler/1,
@@ -45,24 +45,24 @@
   getSize/1,getSizer/1,getTextExtent/2,getTextExtent/3,getToolTip/1,
   getUpdateRegion/1,getVirtualSize/1,getWindowStyleFlag/1,getWindowVariant/1,
   hasCapture/1,hasScrollbar/2,hasTransparentBackground/1,hide/1,inheritAttributes/1,
-  initDialog/1,invalidateBestSize/1,isEnabled/1,isExposed/2,isExposed/3,
-  isExposed/5,isRetained/1,isShown/1,isTopLevel/1,layout/1,lineDown/1,
-  lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,move/3,move/4,moveAfterInTabOrder/2,
-  moveBeforeInTabOrder/2,navigate/1,navigate/2,new/0,new/2,new/3,pageDown/1,
-  pageUp/1,popEventHandler/1,popEventHandler/2,popupMenu/2,popupMenu/3,
-  popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,refreshRect/3,
-  releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,screenToClient/2,
-  scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,
-  setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,
-  setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  initDialog/1,invalidateBestSize/1,isDoubleBuffered/1,isEnabled/1,
+  isExposed/2,isExposed/3,isExposed/5,isRetained/1,isShown/1,isTopLevel/1,
+  layout/1,lineDown/1,lineUp/1,lower/1,makeModal/1,makeModal/2,move/2,
+  move/3,move/4,moveAfterInTabOrder/2,moveBeforeInTabOrder/2,navigate/1,
+  navigate/2,new/0,new/2,new/3,pageDown/1,pageUp/1,popEventHandler/1,popEventHandler/2,
+  popupMenu/2,popupMenu/3,popupMenu/4,raise/1,refresh/1,refresh/2,refreshRect/2,
+  refreshRect/3,releaseMouse/1,removeChild/2,reparent/2,screenToClient/1,
+  screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
+  setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
+  setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
+  setDoubleBuffered/2,setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
   setSizeHints/4,setSizer/2,setSizer/3,setSizerAndFit/2,setSizerAndFit/3,
-  setThemeEnabled/2,setToolTip/2,setVirtualSize/2,setVirtualSize/3,
-  setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
+  setThemeEnabled/2,setToolTip/2,setTransparent/2,setVirtualSize/2,
+  setVirtualSize/3,setVirtualSizeHints/2,setVirtualSizeHints/3,setVirtualSizeHints/4,
   setWindowStyle/2,setWindowStyleFlag/2,setWindowVariant/2,shouldInheritColours/1,
   show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1,
   update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]).
@@ -1910,6 +1910,40 @@ warpPointer(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:cast(?wxWindow_WarpPointer,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsettransparent">external documentation</a>.
+-spec setTransparent(This, Alpha) -> boolean() when
+	This::wxWindow(), Alpha::integer().
+setTransparent(#wx_ref{type=ThisT,ref=ThisRef},Alpha)
+ when is_integer(Alpha) ->
+  ?CLASS(ThisT,wxWindow),
+  wxe_util:call(?wxWindow_SetTransparent,
+  <<ThisRef:32/?UI,Alpha:32/?UI>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowcansettransparent">external documentation</a>.
+-spec canSetTransparent(This) -> boolean() when
+	This::wxWindow().
+canSetTransparent(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxWindow),
+  wxe_util:call(?wxWindow_CanSetTransparent,
+  <<ThisRef:32/?UI>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowisdoublebuffered">external documentation</a>.
+-spec isDoubleBuffered(This) -> boolean() when
+	This::wxWindow().
+isDoubleBuffered(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxWindow),
+  wxe_util:call(?wxWindow_IsDoubleBuffered,
+  <<ThisRef:32/?UI>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetdoublebuffered">external documentation</a>.
+-spec setDoubleBuffered(This, On) -> ok when
+	This::wxWindow(), On::boolean().
+setDoubleBuffered(#wx_ref{type=ThisT,ref=ThisRef},On)
+ when is_boolean(On) ->
+  ?CLASS(ThisT,wxWindow),
+  wxe_util:cast(?wxWindow_SetDoubleBuffered,
+  <<ThisRef:32/?UI,(wxe_util:from_bool(On)):32/?UI>>).
+
 %% @doc Destroys this object, do not use object again
 -spec destroy(This::wxWindow()) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
diff --git a/lib/wx/src/gen/wxe_debug.hrl b/lib/wx/src/gen/wxe_debug.hrl
index 375adde47d..2ec485cd52 100644
--- a/lib/wx/src/gen/wxe_debug.hrl
+++ b/lib/wx/src/gen/wxe_debug.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -192,3186 +192,3190 @@ wxdebug_table() ->
  {281, {wxWindow, updateWindowUI, 1}},
  {282, {wxWindow, validate, 0}},
  {283, {wxWindow, warpPointer, 2}},
- {284, {wxTopLevelWindow, getIcon, 0}},
- {285, {wxTopLevelWindow, getIcons, 0}},
- {286, {wxTopLevelWindow, getTitle, 0}},
- {287, {wxTopLevelWindow, isActive, 0}},
- {288, {wxTopLevelWindow, iconize, 1}},
- {289, {wxTopLevelWindow, isFullScreen, 0}},
- {290, {wxTopLevelWindow, isIconized, 0}},
- {291, {wxTopLevelWindow, isMaximized, 0}},
- {292, {wxTopLevelWindow, maximize, 1}},
- {293, {wxTopLevelWindow, requestUserAttention, 1}},
- {294, {wxTopLevelWindow, setIcon, 1}},
- {295, {wxTopLevelWindow, setIcons, 1}},
- {296, {wxTopLevelWindow, centerOnScreen, 1}},
- {297, {wxTopLevelWindow, centreOnScreen, 1}},
- {299, {wxTopLevelWindow, setShape, 1}},
- {300, {wxTopLevelWindow, setTitle, 1}},
- {301, {wxTopLevelWindow, showFullScreen, 2}},
- {303, {wxFrame, new_4, 4}},
- {304, {wxFrame, new_0, 0}},
- {306, {wxFrame, destruct, 0}},
- {307, {wxFrame, create, 4}},
- {308, {wxFrame, createStatusBar, 1}},
- {309, {wxFrame, createToolBar, 1}},
- {310, {wxFrame, getClientAreaOrigin, 0}},
- {311, {wxFrame, getMenuBar, 0}},
- {312, {wxFrame, getStatusBar, 0}},
- {313, {wxFrame, getStatusBarPane, 0}},
- {314, {wxFrame, getToolBar, 0}},
- {315, {wxFrame, processCommand, 1}},
- {316, {wxFrame, sendSizeEvent, 0}},
- {317, {wxFrame, setMenuBar, 1}},
- {318, {wxFrame, setStatusBar, 1}},
- {319, {wxFrame, setStatusBarPane, 1}},
- {320, {wxFrame, setStatusText, 2}},
- {321, {wxFrame, setStatusWidths, 2}},
- {322, {wxFrame, setToolBar, 1}},
- {323, {wxMiniFrame, new_0, 0}},
- {324, {wxMiniFrame, new_4, 4}},
- {325, {wxMiniFrame, create, 4}},
- {326, {wxMiniFrame, 'Destroy', undefined}},
- {327, {wxSplashScreen, new_0, 0}},
- {328, {wxSplashScreen, new_6, 6}},
- {329, {wxSplashScreen, destruct, 0}},
- {330, {wxSplashScreen, getSplashStyle, 0}},
- {331, {wxSplashScreen, getTimeout, 0}},
- {332, {wxPanel, new_0, 0}},
- {333, {wxPanel, new_6, 6}},
- {334, {wxPanel, new_2, 2}},
- {335, {wxPanel, destruct, 0}},
- {336, {wxPanel, initDialog, 0}},
- {337, {wxPanel, setFocusIgnoringChildren, 0}},
- {338, {wxScrolledWindow, new_0, 0}},
- {339, {wxScrolledWindow, new_2, 2}},
- {340, {wxScrolledWindow, destruct, 0}},
- {341, {wxScrolledWindow, calcScrolledPosition_4, 4}},
- {342, {wxScrolledWindow, calcScrolledPosition_1, 1}},
- {343, {wxScrolledWindow, calcUnscrolledPosition_4, 4}},
- {344, {wxScrolledWindow, calcUnscrolledPosition_1, 1}},
- {345, {wxScrolledWindow, enableScrolling, 2}},
- {346, {wxScrolledWindow, getScrollPixelsPerUnit, 2}},
- {347, {wxScrolledWindow, getViewStart, 2}},
- {348, {wxScrolledWindow, doPrepareDC, 1}},
- {349, {wxScrolledWindow, prepareDC, 1}},
- {350, {wxScrolledWindow, scroll, 2}},
- {351, {wxScrolledWindow, setScrollbars, 5}},
- {352, {wxScrolledWindow, setScrollRate, 2}},
- {353, {wxScrolledWindow, setTargetWindow, 1}},
- {354, {wxSashWindow, new_0, 0}},
- {355, {wxSashWindow, new_2, 2}},
- {356, {wxSashWindow, destruct, 0}},
- {357, {wxSashWindow, getSashVisible, 1}},
- {358, {wxSashWindow, getMaximumSizeX, 0}},
- {359, {wxSashWindow, getMaximumSizeY, 0}},
- {360, {wxSashWindow, getMinimumSizeX, 0}},
- {361, {wxSashWindow, getMinimumSizeY, 0}},
- {362, {wxSashWindow, setMaximumSizeX, 1}},
- {363, {wxSashWindow, setMaximumSizeY, 1}},
- {364, {wxSashWindow, setMinimumSizeX, 1}},
- {365, {wxSashWindow, setMinimumSizeY, 1}},
- {366, {wxSashWindow, setSashVisible, 2}},
- {367, {wxSashLayoutWindow, new_0, 0}},
- {368, {wxSashLayoutWindow, new_2, 2}},
- {369, {wxSashLayoutWindow, create, 2}},
- {370, {wxSashLayoutWindow, getAlignment, 0}},
- {371, {wxSashLayoutWindow, getOrientation, 0}},
- {372, {wxSashLayoutWindow, setAlignment, 1}},
- {373, {wxSashLayoutWindow, setDefaultSize, 1}},
- {374, {wxSashLayoutWindow, setOrientation, 1}},
- {375, {wxSashLayoutWindow, 'Destroy', undefined}},
- {376, {wxGrid, new_0, 0}},
- {377, {wxGrid, new_3, 3}},
- {378, {wxGrid, new_4, 4}},
- {379, {wxGrid, destruct, 0}},
- {380, {wxGrid, appendCols, 1}},
- {381, {wxGrid, appendRows, 1}},
- {382, {wxGrid, autoSize, 0}},
- {383, {wxGrid, autoSizeColumn, 2}},
- {384, {wxGrid, autoSizeColumns, 1}},
- {385, {wxGrid, autoSizeRow, 2}},
- {386, {wxGrid, autoSizeRows, 1}},
- {387, {wxGrid, beginBatch, 0}},
- {388, {wxGrid, blockToDeviceRect, 2}},
- {389, {wxGrid, canDragColSize, 0}},
- {390, {wxGrid, canDragRowSize, 0}},
- {391, {wxGrid, canDragGridSize, 0}},
- {392, {wxGrid, canEnableCellControl, 0}},
- {393, {wxGrid, cellToRect_2, 2}},
- {394, {wxGrid, cellToRect_1, 1}},
- {395, {wxGrid, clearGrid, 0}},
- {396, {wxGrid, clearSelection, 0}},
- {397, {wxGrid, createGrid, 3}},
- {398, {wxGrid, deleteCols, 1}},
- {399, {wxGrid, deleteRows, 1}},
- {400, {wxGrid, disableCellEditControl, 0}},
- {401, {wxGrid, disableDragColSize, 0}},
- {402, {wxGrid, disableDragGridSize, 0}},
- {403, {wxGrid, disableDragRowSize, 0}},
- {404, {wxGrid, enableCellEditControl, 1}},
- {405, {wxGrid, enableDragColSize, 1}},
- {406, {wxGrid, enableDragGridSize, 1}},
- {407, {wxGrid, enableDragRowSize, 1}},
- {408, {wxGrid, enableEditing, 1}},
- {409, {wxGrid, enableGridLines, 1}},
- {410, {wxGrid, endBatch, 0}},
- {411, {wxGrid, fit, 0}},
- {412, {wxGrid, forceRefresh, 0}},
- {413, {wxGrid, getBatchCount, 0}},
- {414, {wxGrid, getCellAlignment, 4}},
- {415, {wxGrid, getCellBackgroundColour, 2}},
- {416, {wxGrid, getCellEditor, 2}},
- {417, {wxGrid, getCellFont, 2}},
- {418, {wxGrid, getCellRenderer, 2}},
- {419, {wxGrid, getCellTextColour, 2}},
- {420, {wxGrid, getCellValue_2, 2}},
- {421, {wxGrid, getCellValue_1, 1}},
- {422, {wxGrid, getColLabelAlignment, 2}},
- {423, {wxGrid, getColLabelSize, 0}},
- {424, {wxGrid, getColLabelValue, 1}},
- {425, {wxGrid, getColMinimalAcceptableWidth, 0}},
- {426, {wxGrid, getDefaultCellAlignment, 2}},
- {427, {wxGrid, getDefaultCellBackgroundColour, 0}},
- {428, {wxGrid, getDefaultCellFont, 0}},
- {429, {wxGrid, getDefaultCellTextColour, 0}},
- {430, {wxGrid, getDefaultColLabelSize, 0}},
- {431, {wxGrid, getDefaultColSize, 0}},
- {432, {wxGrid, getDefaultEditor, 0}},
- {433, {wxGrid, getDefaultEditorForCell_2, 2}},
- {434, {wxGrid, getDefaultEditorForCell_1, 1}},
- {435, {wxGrid, getDefaultEditorForType, 1}},
- {436, {wxGrid, getDefaultRenderer, 0}},
- {437, {wxGrid, getDefaultRendererForCell, 2}},
- {438, {wxGrid, getDefaultRendererForType, 1}},
- {439, {wxGrid, getDefaultRowLabelSize, 0}},
- {440, {wxGrid, getDefaultRowSize, 0}},
- {441, {wxGrid, getGridCursorCol, 0}},
- {442, {wxGrid, getGridCursorRow, 0}},
- {443, {wxGrid, getGridLineColour, 0}},
- {444, {wxGrid, gridLinesEnabled, 0}},
- {445, {wxGrid, getLabelBackgroundColour, 0}},
- {446, {wxGrid, getLabelFont, 0}},
- {447, {wxGrid, getLabelTextColour, 0}},
- {448, {wxGrid, getNumberCols, 0}},
- {449, {wxGrid, getNumberRows, 0}},
- {450, {wxGrid, getOrCreateCellAttr, 2}},
- {451, {wxGrid, getRowMinimalAcceptableHeight, 0}},
- {452, {wxGrid, getRowLabelAlignment, 2}},
- {453, {wxGrid, getRowLabelSize, 0}},
- {454, {wxGrid, getRowLabelValue, 1}},
- {455, {wxGrid, getRowSize, 1}},
- {456, {wxGrid, getScrollLineX, 0}},
- {457, {wxGrid, getScrollLineY, 0}},
- {458, {wxGrid, getSelectedCells, 0}},
- {459, {wxGrid, getSelectedCols, 0}},
- {460, {wxGrid, getSelectedRows, 0}},
- {461, {wxGrid, getSelectionBackground, 0}},
- {462, {wxGrid, getSelectionBlockTopLeft, 0}},
- {463, {wxGrid, getSelectionBlockBottomRight, 0}},
- {464, {wxGrid, getSelectionForeground, 0}},
- {465, {wxGrid, getViewWidth, 0}},
- {466, {wxGrid, getGridWindow, 0}},
- {467, {wxGrid, getGridRowLabelWindow, 0}},
- {468, {wxGrid, getGridColLabelWindow, 0}},
- {469, {wxGrid, getGridCornerLabelWindow, 0}},
- {470, {wxGrid, hideCellEditControl, 0}},
- {471, {wxGrid, insertCols, 1}},
- {472, {wxGrid, insertRows, 1}},
- {473, {wxGrid, isCellEditControlEnabled, 0}},
- {474, {wxGrid, isCurrentCellReadOnly, 0}},
- {475, {wxGrid, isEditable, 0}},
- {476, {wxGrid, isInSelection_2, 2}},
- {477, {wxGrid, isInSelection_1, 1}},
- {478, {wxGrid, isReadOnly, 2}},
- {479, {wxGrid, isSelection, 0}},
- {480, {wxGrid, isVisible_3, 3}},
- {481, {wxGrid, isVisible_2, 2}},
- {482, {wxGrid, makeCellVisible_2, 2}},
- {483, {wxGrid, makeCellVisible_1, 1}},
- {484, {wxGrid, moveCursorDown, 1}},
- {485, {wxGrid, moveCursorLeft, 1}},
- {486, {wxGrid, moveCursorRight, 1}},
- {487, {wxGrid, moveCursorUp, 1}},
- {488, {wxGrid, moveCursorDownBlock, 1}},
- {489, {wxGrid, moveCursorLeftBlock, 1}},
- {490, {wxGrid, moveCursorRightBlock, 1}},
- {491, {wxGrid, moveCursorUpBlock, 1}},
- {492, {wxGrid, movePageDown, 0}},
- {493, {wxGrid, movePageUp, 0}},
- {494, {wxGrid, registerDataType, 3}},
- {495, {wxGrid, saveEditControlValue, 0}},
- {496, {wxGrid, selectAll, 0}},
- {497, {wxGrid, selectBlock_5, 5}},
- {498, {wxGrid, selectBlock_3, 3}},
- {499, {wxGrid, selectCol, 2}},
- {500, {wxGrid, selectRow, 2}},
- {501, {wxGrid, setCellAlignment_4, 4}},
- {502, {wxGrid, setCellAlignment_3, 3}},
- {503, {wxGrid, setCellAlignment_1, 1}},
- {504, {wxGrid, setCellBackgroundColour_3_0, 3}},
- {505, {wxGrid, setCellBackgroundColour_1, 1}},
- {506, {wxGrid, setCellBackgroundColour_3_1, 3}},
- {507, {wxGrid, setCellEditor, 3}},
- {508, {wxGrid, setCellFont, 3}},
- {509, {wxGrid, setCellRenderer, 3}},
- {510, {wxGrid, setCellTextColour_3_0, 3}},
- {511, {wxGrid, setCellTextColour_3_1, 3}},
- {512, {wxGrid, setCellTextColour_1, 1}},
- {513, {wxGrid, setCellValue_3_0, 3}},
- {514, {wxGrid, setCellValue_2, 2}},
- {515, {wxGrid, setCellValue_3_1, 3}},
- {516, {wxGrid, setColAttr, 2}},
- {517, {wxGrid, setColFormatBool, 1}},
- {518, {wxGrid, setColFormatNumber, 1}},
- {519, {wxGrid, setColFormatFloat, 2}},
- {520, {wxGrid, setColFormatCustom, 2}},
- {521, {wxGrid, setColLabelAlignment, 2}},
- {522, {wxGrid, setColLabelSize, 1}},
- {523, {wxGrid, setColLabelValue, 2}},
- {524, {wxGrid, setColMinimalWidth, 2}},
- {525, {wxGrid, setColMinimalAcceptableWidth, 1}},
- {526, {wxGrid, setColSize, 2}},
- {527, {wxGrid, setDefaultCellAlignment, 2}},
- {528, {wxGrid, setDefaultCellBackgroundColour, 1}},
- {529, {wxGrid, setDefaultCellFont, 1}},
- {530, {wxGrid, setDefaultCellTextColour, 1}},
- {531, {wxGrid, setDefaultEditor, 1}},
- {532, {wxGrid, setDefaultRenderer, 1}},
- {533, {wxGrid, setDefaultColSize, 2}},
- {534, {wxGrid, setDefaultRowSize, 2}},
- {535, {wxGrid, setGridCursor, 2}},
- {536, {wxGrid, setGridLineColour, 1}},
- {537, {wxGrid, setLabelBackgroundColour, 1}},
- {538, {wxGrid, setLabelFont, 1}},
- {539, {wxGrid, setLabelTextColour, 1}},
- {540, {wxGrid, setMargins, 2}},
- {541, {wxGrid, setReadOnly, 3}},
- {542, {wxGrid, setRowAttr, 2}},
- {543, {wxGrid, setRowLabelAlignment, 2}},
- {544, {wxGrid, setRowLabelSize, 1}},
- {545, {wxGrid, setRowLabelValue, 2}},
- {546, {wxGrid, setRowMinimalHeight, 2}},
- {547, {wxGrid, setRowMinimalAcceptableHeight, 1}},
- {548, {wxGrid, setRowSize, 2}},
- {549, {wxGrid, setScrollLineX, 1}},
- {550, {wxGrid, setScrollLineY, 1}},
- {551, {wxGrid, setSelectionBackground, 1}},
- {552, {wxGrid, setSelectionForeground, 1}},
- {553, {wxGrid, setSelectionMode, 1}},
- {554, {wxGrid, showCellEditControl, 0}},
- {555, {wxGrid, xToCol, 2}},
- {556, {wxGrid, xToEdgeOfCol, 1}},
- {557, {wxGrid, yToEdgeOfRow, 1}},
- {558, {wxGrid, yToRow, 1}},
- {559, {wxGridCellRenderer, draw, 7}},
- {560, {wxGridCellRenderer, getBestSize, 5}},
- {561, {wxGridCellEditor, create, 3}},
- {562, {wxGridCellEditor, isCreated, 0}},
- {563, {wxGridCellEditor, setSize, 1}},
- {564, {wxGridCellEditor, show, 2}},
- {565, {wxGridCellEditor, paintBackground, 2}},
- {566, {wxGridCellEditor, beginEdit, 3}},
- {567, {wxGridCellEditor, endEdit, 3}},
- {568, {wxGridCellEditor, reset, 0}},
- {569, {wxGridCellEditor, startingKey, 1}},
- {570, {wxGridCellEditor, startingClick, 0}},
- {571, {wxGridCellEditor, handleReturn, 1}},
- {572, {wxGridCellBoolRenderer, new, 0}},
- {573, {wxGridCellBoolRenderer, 'Destroy', undefined}},
- {574, {wxGridCellBoolEditor, new, 0}},
- {575, {wxGridCellBoolEditor, isTrueValue, 1}},
- {576, {wxGridCellBoolEditor, useStringValues, 1}},
- {577, {wxGridCellBoolEditor, 'Destroy', undefined}},
- {578, {wxGridCellFloatRenderer, new, 1}},
- {579, {wxGridCellFloatRenderer, getPrecision, 0}},
- {580, {wxGridCellFloatRenderer, getWidth, 0}},
- {581, {wxGridCellFloatRenderer, setParameters, 1}},
- {582, {wxGridCellFloatRenderer, setPrecision, 1}},
- {583, {wxGridCellFloatRenderer, setWidth, 1}},
- {584, {wxGridCellFloatRenderer, 'Destroy', undefined}},
- {585, {wxGridCellFloatEditor, new, 1}},
- {586, {wxGridCellFloatEditor, setParameters, 1}},
- {587, {wxGridCellFloatEditor, 'Destroy', undefined}},
- {588, {wxGridCellStringRenderer, new, 0}},
- {589, {wxGridCellStringRenderer, 'Destroy', undefined}},
- {590, {wxGridCellTextEditor, new, 0}},
- {591, {wxGridCellTextEditor, setParameters, 1}},
- {592, {wxGridCellTextEditor, 'Destroy', undefined}},
- {594, {wxGridCellChoiceEditor, new, 2}},
- {595, {wxGridCellChoiceEditor, setParameters, 1}},
- {596, {wxGridCellChoiceEditor, 'Destroy', undefined}},
- {597, {wxGridCellNumberRenderer, new, 0}},
- {598, {wxGridCellNumberRenderer, 'Destroy', undefined}},
- {599, {wxGridCellNumberEditor, new, 1}},
- {600, {wxGridCellNumberEditor, getValue, 0}},
- {601, {wxGridCellNumberEditor, setParameters, 1}},
- {602, {wxGridCellNumberEditor, 'Destroy', undefined}},
- {603, {wxGridCellAttr, setTextColour, 1}},
- {604, {wxGridCellAttr, setBackgroundColour, 1}},
- {605, {wxGridCellAttr, setFont, 1}},
- {606, {wxGridCellAttr, setAlignment, 2}},
- {607, {wxGridCellAttr, setReadOnly, 1}},
- {608, {wxGridCellAttr, setRenderer, 1}},
- {609, {wxGridCellAttr, setEditor, 1}},
- {610, {wxGridCellAttr, hasTextColour, 0}},
- {611, {wxGridCellAttr, hasBackgroundColour, 0}},
- {612, {wxGridCellAttr, hasFont, 0}},
- {613, {wxGridCellAttr, hasAlignment, 0}},
- {614, {wxGridCellAttr, hasRenderer, 0}},
- {615, {wxGridCellAttr, hasEditor, 0}},
- {616, {wxGridCellAttr, getTextColour, 0}},
- {617, {wxGridCellAttr, getBackgroundColour, 0}},
- {618, {wxGridCellAttr, getFont, 0}},
- {619, {wxGridCellAttr, getAlignment, 2}},
- {620, {wxGridCellAttr, getRenderer, 3}},
- {621, {wxGridCellAttr, getEditor, 3}},
- {622, {wxGridCellAttr, isReadOnly, 0}},
- {623, {wxGridCellAttr, setDefAttr, 1}},
- {624, {wxDC, blit, 5}},
- {625, {wxDC, calcBoundingBox, 2}},
- {626, {wxDC, clear, 0}},
- {627, {wxDC, computeScaleAndOrigin, 0}},
- {628, {wxDC, crossHair, 1}},
- {629, {wxDC, destroyClippingRegion, 0}},
- {630, {wxDC, deviceToLogicalX, 1}},
- {631, {wxDC, deviceToLogicalXRel, 1}},
- {632, {wxDC, deviceToLogicalY, 1}},
- {633, {wxDC, deviceToLogicalYRel, 1}},
- {634, {wxDC, drawArc, 3}},
- {635, {wxDC, drawBitmap, 3}},
- {636, {wxDC, drawCheckMark, 1}},
- {637, {wxDC, drawCircle, 2}},
- {639, {wxDC, drawEllipse_2, 2}},
- {640, {wxDC, drawEllipse_1, 1}},
- {641, {wxDC, drawEllipticArc, 4}},
- {642, {wxDC, drawIcon, 2}},
- {643, {wxDC, drawLabel, 3}},
- {644, {wxDC, drawLine, 2}},
- {645, {wxDC, drawLines, 3}},
- {647, {wxDC, drawPolygon, 3}},
- {649, {wxDC, drawPoint, 1}},
- {651, {wxDC, drawRectangle_2, 2}},
- {652, {wxDC, drawRectangle_1, 1}},
- {653, {wxDC, drawRotatedText, 3}},
- {655, {wxDC, drawRoundedRectangle_3, 3}},
- {656, {wxDC, drawRoundedRectangle_2, 2}},
- {657, {wxDC, drawText, 2}},
- {658, {wxDC, endDoc, 0}},
- {659, {wxDC, endPage, 0}},
- {660, {wxDC, floodFill, 3}},
- {661, {wxDC, getBackground, 0}},
- {662, {wxDC, getBackgroundMode, 0}},
- {663, {wxDC, getBrush, 0}},
- {664, {wxDC, getCharHeight, 0}},
- {665, {wxDC, getCharWidth, 0}},
- {666, {wxDC, getClippingBox, 4}},
- {668, {wxDC, getFont, 0}},
- {669, {wxDC, getLayoutDirection, 0}},
- {670, {wxDC, getLogicalFunction, 0}},
- {671, {wxDC, getMapMode, 0}},
- {672, {wxDC, getMultiLineTextExtent_4, 4}},
- {673, {wxDC, getMultiLineTextExtent_1, 1}},
- {674, {wxDC, getPartialTextExtents, 2}},
- {675, {wxDC, getPen, 0}},
- {676, {wxDC, getPixel, 2}},
- {677, {wxDC, getPPI, 0}},
- {679, {wxDC, getSize, 0}},
- {681, {wxDC, getSizeMM, 0}},
- {682, {wxDC, getTextBackground, 0}},
- {683, {wxDC, getTextExtent_4, 4}},
- {684, {wxDC, getTextExtent_1, 1}},
- {686, {wxDC, getTextForeground, 0}},
- {687, {wxDC, getUserScale, 2}},
- {688, {wxDC, gradientFillConcentric_3, 3}},
- {689, {wxDC, gradientFillConcentric_4, 4}},
- {690, {wxDC, gradientFillLinear, 4}},
- {691, {wxDC, logicalToDeviceX, 1}},
- {692, {wxDC, logicalToDeviceXRel, 1}},
- {693, {wxDC, logicalToDeviceY, 1}},
- {694, {wxDC, logicalToDeviceYRel, 1}},
- {695, {wxDC, maxX, 0}},
- {696, {wxDC, maxY, 0}},
- {697, {wxDC, minX, 0}},
- {698, {wxDC, minY, 0}},
- {699, {wxDC, isOk, 0}},
- {700, {wxDC, resetBoundingBox, 0}},
- {701, {wxDC, setAxisOrientation, 2}},
- {702, {wxDC, setBackground, 1}},
- {703, {wxDC, setBackgroundMode, 1}},
- {704, {wxDC, setBrush, 1}},
- {706, {wxDC, setClippingRegion_2, 2}},
- {707, {wxDC, setClippingRegion_1_1, 1}},
- {708, {wxDC, setClippingRegion_1_0, 1}},
- {709, {wxDC, setDeviceOrigin, 2}},
- {710, {wxDC, setFont, 1}},
- {711, {wxDC, setLayoutDirection, 1}},
- {712, {wxDC, setLogicalFunction, 1}},
- {713, {wxDC, setMapMode, 1}},
- {714, {wxDC, setPalette, 1}},
- {715, {wxDC, setPen, 1}},
- {716, {wxDC, setTextBackground, 1}},
- {717, {wxDC, setTextForeground, 1}},
- {718, {wxDC, setUserScale, 2}},
- {719, {wxDC, startDoc, 1}},
- {720, {wxDC, startPage, 0}},
- {721, {wxMirrorDC, new, 2}},
- {722, {wxMirrorDC, 'Destroy', undefined}},
- {723, {wxScreenDC, new, 0}},
- {724, {wxScreenDC, destruct, 0}},
- {725, {wxPostScriptDC, new_0, 0}},
- {726, {wxPostScriptDC, new_1, 1}},
- {727, {wxPostScriptDC, destruct, 0}},
- {728, {wxPostScriptDC, setResolution, 1}},
- {729, {wxPostScriptDC, getResolution, 0}},
- {730, {wxWindowDC, new_0, 0}},
- {731, {wxWindowDC, new_1, 1}},
- {732, {wxWindowDC, destruct, 0}},
- {733, {wxClientDC, new_0, 0}},
- {734, {wxClientDC, new_1, 1}},
- {735, {wxClientDC, 'Destroy', undefined}},
- {736, {wxPaintDC, new_0, 0}},
- {737, {wxPaintDC, new_1, 1}},
- {738, {wxPaintDC, 'Destroy', undefined}},
- {740, {wxMemoryDC, new_1_0, 1}},
- {741, {wxMemoryDC, new_1_1, 1}},
- {742, {wxMemoryDC, new_0, 0}},
- {744, {wxMemoryDC, destruct, 0}},
- {745, {wxMemoryDC, selectObject, 1}},
- {746, {wxMemoryDC, selectObjectAsSource, 1}},
- {747, {wxBufferedDC, new_0, 0}},
- {748, {wxBufferedDC, new_2, 2}},
- {749, {wxBufferedDC, new_3, 3}},
- {750, {wxBufferedDC, destruct, 0}},
- {751, {wxBufferedDC, init_2, 2}},
- {752, {wxBufferedDC, init_3, 3}},
- {753, {wxBufferedPaintDC, new_3, 3}},
- {754, {wxBufferedPaintDC, new_2, 2}},
- {755, {wxBufferedPaintDC, destruct, 0}},
- {756, {wxGraphicsObject, destruct, 0}},
- {757, {wxGraphicsObject, getRenderer, 0}},
- {758, {wxGraphicsObject, isNull, 0}},
- {759, {wxGraphicsContext, destruct, 0}},
- {760, {wxGraphicsContext, create_1_1, 1}},
- {761, {wxGraphicsContext, create_1_0, 1}},
- {762, {wxGraphicsContext, create_0, 0}},
- {763, {wxGraphicsContext, createPen, 1}},
- {764, {wxGraphicsContext, createBrush, 1}},
- {765, {wxGraphicsContext, createRadialGradientBrush, 7}},
- {766, {wxGraphicsContext, createLinearGradientBrush, 6}},
- {767, {wxGraphicsContext, createFont, 2}},
- {768, {wxGraphicsContext, createMatrix, 1}},
- {769, {wxGraphicsContext, createPath, 0}},
- {770, {wxGraphicsContext, clip_1, 1}},
- {771, {wxGraphicsContext, clip_4, 4}},
- {772, {wxGraphicsContext, resetClip, 0}},
- {773, {wxGraphicsContext, drawBitmap, 5}},
- {774, {wxGraphicsContext, drawEllipse, 4}},
- {775, {wxGraphicsContext, drawIcon, 5}},
- {776, {wxGraphicsContext, drawLines, 3}},
- {777, {wxGraphicsContext, drawPath, 2}},
- {778, {wxGraphicsContext, drawRectangle, 4}},
- {779, {wxGraphicsContext, drawRoundedRectangle, 5}},
- {780, {wxGraphicsContext, drawText_3, 3}},
- {781, {wxGraphicsContext, drawText_4_0, 4}},
- {782, {wxGraphicsContext, drawText_4_1, 4}},
- {783, {wxGraphicsContext, drawText_5, 5}},
- {784, {wxGraphicsContext, fillPath, 2}},
- {785, {wxGraphicsContext, strokePath, 1}},
- {786, {wxGraphicsContext, getPartialTextExtents, 2}},
- {787, {wxGraphicsContext, getTextExtent, 5}},
- {788, {wxGraphicsContext, rotate, 1}},
- {789, {wxGraphicsContext, scale, 2}},
- {790, {wxGraphicsContext, translate, 2}},
- {791, {wxGraphicsContext, getTransform, 0}},
- {792, {wxGraphicsContext, setTransform, 1}},
- {793, {wxGraphicsContext, concatTransform, 1}},
- {794, {wxGraphicsContext, setBrush_1_1, 1}},
- {795, {wxGraphicsContext, setBrush_1_0, 1}},
- {796, {wxGraphicsContext, setFont_1, 1}},
- {797, {wxGraphicsContext, setFont_2, 2}},
- {798, {wxGraphicsContext, setPen_1_0, 1}},
- {799, {wxGraphicsContext, setPen_1_1, 1}},
- {800, {wxGraphicsContext, strokeLine, 4}},
- {801, {wxGraphicsContext, strokeLines, 2}},
- {803, {wxGraphicsMatrix, concat, 1}},
- {805, {wxGraphicsMatrix, get, 1}},
- {806, {wxGraphicsMatrix, invert, 0}},
- {807, {wxGraphicsMatrix, isEqual, 1}},
- {809, {wxGraphicsMatrix, isIdentity, 0}},
- {810, {wxGraphicsMatrix, rotate, 1}},
- {811, {wxGraphicsMatrix, scale, 2}},
- {812, {wxGraphicsMatrix, translate, 2}},
- {813, {wxGraphicsMatrix, set, 1}},
- {814, {wxGraphicsMatrix, transformPoint, 2}},
- {815, {wxGraphicsMatrix, transformDistance, 2}},
- {816, {wxGraphicsPath, moveToPoint_2, 2}},
- {817, {wxGraphicsPath, moveToPoint_1, 1}},
- {818, {wxGraphicsPath, addArc_6, 6}},
- {819, {wxGraphicsPath, addArc_5, 5}},
- {820, {wxGraphicsPath, addArcToPoint, 5}},
- {821, {wxGraphicsPath, addCircle, 3}},
- {822, {wxGraphicsPath, addCurveToPoint_6, 6}},
- {823, {wxGraphicsPath, addCurveToPoint_3, 3}},
- {824, {wxGraphicsPath, addEllipse, 4}},
- {825, {wxGraphicsPath, addLineToPoint_2, 2}},
- {826, {wxGraphicsPath, addLineToPoint_1, 1}},
- {827, {wxGraphicsPath, addPath, 1}},
- {828, {wxGraphicsPath, addQuadCurveToPoint, 4}},
- {829, {wxGraphicsPath, addRectangle, 4}},
- {830, {wxGraphicsPath, addRoundedRectangle, 5}},
- {831, {wxGraphicsPath, closeSubpath, 0}},
- {832, {wxGraphicsPath, contains_3, 3}},
- {833, {wxGraphicsPath, contains_2, 2}},
- {835, {wxGraphicsPath, getBox, 0}},
- {837, {wxGraphicsPath, getCurrentPoint, 0}},
- {838, {wxGraphicsPath, transform, 1}},
- {839, {wxGraphicsRenderer, getDefaultRenderer, 0}},
- {840, {wxGraphicsRenderer, createContext_1_1, 1}},
- {841, {wxGraphicsRenderer, createContext_1_0, 1}},
- {842, {wxGraphicsRenderer, createPen, 1}},
- {843, {wxGraphicsRenderer, createBrush, 1}},
- {844, {wxGraphicsRenderer, createLinearGradientBrush, 6}},
- {845, {wxGraphicsRenderer, createRadialGradientBrush, 7}},
- {846, {wxGraphicsRenderer, createFont, 2}},
- {847, {wxGraphicsRenderer, createMatrix, 1}},
- {848, {wxGraphicsRenderer, createPath, 0}},
- {850, {wxMenuBar, new_1, 1}},
- {852, {wxMenuBar, new_0, 0}},
- {854, {wxMenuBar, destruct, 0}},
- {855, {wxMenuBar, append, 2}},
- {856, {wxMenuBar, check, 2}},
- {857, {wxMenuBar, enable_2, 2}},
- {858, {wxMenuBar, enable_1, 1}},
- {859, {wxMenuBar, enableTop, 2}},
- {860, {wxMenuBar, findMenu, 1}},
- {861, {wxMenuBar, findMenuItem, 2}},
- {862, {wxMenuBar, findItem, 2}},
- {863, {wxMenuBar, getHelpString, 1}},
- {864, {wxMenuBar, getLabel_1, 1}},
- {865, {wxMenuBar, getLabel_0, 0}},
- {866, {wxMenuBar, getLabelTop, 1}},
- {867, {wxMenuBar, getMenu, 1}},
- {868, {wxMenuBar, getMenuCount, 0}},
- {869, {wxMenuBar, insert, 3}},
- {870, {wxMenuBar, isChecked, 1}},
- {871, {wxMenuBar, isEnabled_1, 1}},
- {872, {wxMenuBar, isEnabled_0, 0}},
- {873, {wxMenuBar, remove, 1}},
- {874, {wxMenuBar, replace, 3}},
- {875, {wxMenuBar, setHelpString, 2}},
- {876, {wxMenuBar, setLabel_2, 2}},
- {877, {wxMenuBar, setLabel_1, 1}},
- {878, {wxMenuBar, setLabelTop, 2}},
- {879, {wxControl, getLabel, 0}},
- {880, {wxControl, setLabel, 1}},
- {881, {wxControlWithItems, append_1, 1}},
- {882, {wxControlWithItems, append_2, 2}},
- {883, {wxControlWithItems, appendStrings_1, 1}},
- {884, {wxControlWithItems, clear, 0}},
- {885, {wxControlWithItems, delete, 1}},
- {886, {wxControlWithItems, findString, 2}},
- {887, {wxControlWithItems, getClientData, 1}},
- {888, {wxControlWithItems, setClientData, 2}},
- {889, {wxControlWithItems, getCount, 0}},
- {890, {wxControlWithItems, getSelection, 0}},
- {891, {wxControlWithItems, getString, 1}},
- {892, {wxControlWithItems, getStringSelection, 0}},
- {893, {wxControlWithItems, insert_2, 2}},
- {894, {wxControlWithItems, insert_3, 3}},
- {895, {wxControlWithItems, isEmpty, 0}},
- {896, {wxControlWithItems, select, 1}},
- {897, {wxControlWithItems, setSelection, 1}},
- {898, {wxControlWithItems, setString, 2}},
- {899, {wxControlWithItems, setStringSelection, 1}},
- {902, {wxMenu, new_2, 2}},
- {903, {wxMenu, new_1, 1}},
- {905, {wxMenu, destruct, 0}},
- {906, {wxMenu, append_3, 3}},
- {907, {wxMenu, append_1, 1}},
- {908, {wxMenu, append_4_0, 4}},
- {909, {wxMenu, append_4_1, 4}},
- {910, {wxMenu, appendCheckItem, 3}},
- {911, {wxMenu, appendRadioItem, 3}},
- {912, {wxMenu, appendSeparator, 0}},
- {913, {wxMenu, break, 0}},
- {914, {wxMenu, check, 2}},
- {915, {wxMenu, delete_1_0, 1}},
- {916, {wxMenu, delete_1_1, 1}},
- {917, {wxMenu, destroy_1_0, 1}},
- {918, {wxMenu, destroy_1_1, 1}},
- {919, {wxMenu, enable, 2}},
- {920, {wxMenu, findItem_1, 1}},
- {921, {wxMenu, findItem_2, 2}},
- {922, {wxMenu, findItemByPosition, 1}},
- {923, {wxMenu, getHelpString, 1}},
- {924, {wxMenu, getLabel, 1}},
- {925, {wxMenu, getMenuItemCount, 0}},
- {926, {wxMenu, getMenuItems, 0}},
- {928, {wxMenu, getTitle, 0}},
- {929, {wxMenu, insert_2, 2}},
- {930, {wxMenu, insert_3, 3}},
- {931, {wxMenu, insert_5_1, 5}},
- {932, {wxMenu, insert_5_0, 5}},
- {933, {wxMenu, insertCheckItem, 4}},
- {934, {wxMenu, insertRadioItem, 4}},
- {935, {wxMenu, insertSeparator, 1}},
- {936, {wxMenu, isChecked, 1}},
- {937, {wxMenu, isEnabled, 1}},
- {938, {wxMenu, prepend_1, 1}},
- {939, {wxMenu, prepend_2, 2}},
- {940, {wxMenu, prepend_4_1, 4}},
- {941, {wxMenu, prepend_4_0, 4}},
- {942, {wxMenu, prependCheckItem, 3}},
- {943, {wxMenu, prependRadioItem, 3}},
- {944, {wxMenu, prependSeparator, 0}},
- {945, {wxMenu, remove_1_0, 1}},
- {946, {wxMenu, remove_1_1, 1}},
- {947, {wxMenu, setHelpString, 2}},
- {948, {wxMenu, setLabel, 2}},
- {949, {wxMenu, setTitle, 1}},
- {950, {wxMenuItem, new, 1}},
- {952, {wxMenuItem, destruct, 0}},
- {953, {wxMenuItem, check, 1}},
- {954, {wxMenuItem, enable, 1}},
- {955, {wxMenuItem, getBitmap, 0}},
- {956, {wxMenuItem, getHelp, 0}},
- {957, {wxMenuItem, getId, 0}},
- {958, {wxMenuItem, getKind, 0}},
- {959, {wxMenuItem, getLabel, 0}},
- {960, {wxMenuItem, getLabelFromText, 1}},
- {961, {wxMenuItem, getMenu, 0}},
- {962, {wxMenuItem, getText, 0}},
- {963, {wxMenuItem, getSubMenu, 0}},
- {964, {wxMenuItem, isCheckable, 0}},
- {965, {wxMenuItem, isChecked, 0}},
- {966, {wxMenuItem, isEnabled, 0}},
- {967, {wxMenuItem, isSeparator, 0}},
- {968, {wxMenuItem, isSubMenu, 0}},
- {969, {wxMenuItem, setBitmap, 1}},
- {970, {wxMenuItem, setHelp, 1}},
- {971, {wxMenuItem, setMenu, 1}},
- {972, {wxMenuItem, setSubMenu, 1}},
- {973, {wxMenuItem, setText, 1}},
- {974, {wxToolBar, addControl, 1}},
- {975, {wxToolBar, addSeparator, 0}},
- {976, {wxToolBar, addTool_5, 5}},
- {977, {wxToolBar, addTool_4_0, 4}},
- {978, {wxToolBar, addTool_1, 1}},
- {979, {wxToolBar, addTool_4_1, 4}},
- {980, {wxToolBar, addTool_3, 3}},
- {981, {wxToolBar, addTool_6, 6}},
- {982, {wxToolBar, addCheckTool, 4}},
- {983, {wxToolBar, addRadioTool, 4}},
- {984, {wxToolBar, addStretchableSpace, 0}},
- {985, {wxToolBar, insertStretchableSpace, 1}},
- {986, {wxToolBar, deleteTool, 1}},
- {987, {wxToolBar, deleteToolByPos, 1}},
- {988, {wxToolBar, enableTool, 2}},
- {989, {wxToolBar, findById, 1}},
- {990, {wxToolBar, findControl, 1}},
- {991, {wxToolBar, findToolForPosition, 2}},
- {992, {wxToolBar, getToolSize, 0}},
- {993, {wxToolBar, getToolBitmapSize, 0}},
- {994, {wxToolBar, getMargins, 0}},
- {995, {wxToolBar, getToolEnabled, 1}},
- {996, {wxToolBar, getToolLongHelp, 1}},
- {997, {wxToolBar, getToolPacking, 0}},
- {998, {wxToolBar, getToolPos, 1}},
- {999, {wxToolBar, getToolSeparation, 0}},
- {1000, {wxToolBar, getToolShortHelp, 1}},
- {1001, {wxToolBar, getToolState, 1}},
- {1002, {wxToolBar, insertControl, 2}},
- {1003, {wxToolBar, insertSeparator, 1}},
- {1004, {wxToolBar, insertTool_5, 5}},
- {1005, {wxToolBar, insertTool_2, 2}},
- {1006, {wxToolBar, insertTool_4, 4}},
- {1007, {wxToolBar, realize, 0}},
- {1008, {wxToolBar, removeTool, 1}},
- {1009, {wxToolBar, setMargins, 2}},
- {1010, {wxToolBar, setToolBitmapSize, 1}},
- {1011, {wxToolBar, setToolLongHelp, 2}},
- {1012, {wxToolBar, setToolPacking, 1}},
- {1013, {wxToolBar, setToolShortHelp, 2}},
- {1014, {wxToolBar, setToolSeparation, 1}},
- {1015, {wxToolBar, toggleTool, 2}},
- {1017, {wxStatusBar, new_0, 0}},
- {1018, {wxStatusBar, new_2, 2}},
- {1020, {wxStatusBar, destruct, 0}},
- {1021, {wxStatusBar, create, 2}},
- {1022, {wxStatusBar, getFieldRect, 2}},
- {1023, {wxStatusBar, getFieldsCount, 0}},
- {1024, {wxStatusBar, getStatusText, 1}},
- {1025, {wxStatusBar, popStatusText, 1}},
- {1026, {wxStatusBar, pushStatusText, 2}},
- {1027, {wxStatusBar, setFieldsCount, 2}},
- {1028, {wxStatusBar, setMinHeight, 1}},
- {1029, {wxStatusBar, setStatusText, 2}},
- {1030, {wxStatusBar, setStatusWidths, 2}},
- {1031, {wxStatusBar, setStatusStyles, 2}},
- {1032, {wxBitmap, new_0, 0}},
- {1033, {wxBitmap, new_3, 3}},
- {1034, {wxBitmap, new_4, 4}},
- {1035, {wxBitmap, new_2_0, 2}},
- {1036, {wxBitmap, new_2_1, 2}},
- {1037, {wxBitmap, destruct, 0}},
- {1038, {wxBitmap, convertToImage, 0}},
- {1039, {wxBitmap, copyFromIcon, 1}},
- {1040, {wxBitmap, create, 3}},
- {1041, {wxBitmap, getDepth, 0}},
- {1042, {wxBitmap, getHeight, 0}},
- {1043, {wxBitmap, getPalette, 0}},
- {1044, {wxBitmap, getMask, 0}},
- {1045, {wxBitmap, getWidth, 0}},
- {1046, {wxBitmap, getSubBitmap, 1}},
- {1047, {wxBitmap, loadFile, 2}},
- {1048, {wxBitmap, ok, 0}},
- {1049, {wxBitmap, saveFile, 3}},
- {1050, {wxBitmap, setDepth, 1}},
- {1051, {wxBitmap, setHeight, 1}},
- {1052, {wxBitmap, setMask, 1}},
- {1053, {wxBitmap, setPalette, 1}},
- {1054, {wxBitmap, setWidth, 1}},
- {1055, {wxIcon, new_0, 0}},
- {1056, {wxIcon, new_2, 2}},
- {1057, {wxIcon, new_1, 1}},
- {1058, {wxIcon, copyFromBitmap, 1}},
- {1059, {wxIcon, 'Destroy', undefined}},
- {1060, {wxIconBundle, new_0, 0}},
- {1061, {wxIconBundle, new_2, 2}},
- {1062, {wxIconBundle, new_1_0, 1}},
- {1063, {wxIconBundle, new_1_1, 1}},
- {1064, {wxIconBundle, destruct, 0}},
- {1065, {wxIconBundle, addIcon_2, 2}},
- {1066, {wxIconBundle, addIcon_1, 1}},
- {1067, {wxIconBundle, getIcon_1_1, 1}},
- {1068, {wxIconBundle, getIcon_1_0, 1}},
- {1069, {wxCursor, new_0, 0}},
- {1070, {wxCursor, new_1_0, 1}},
- {1071, {wxCursor, new_1_1, 1}},
- {1072, {wxCursor, new_4, 4}},
- {1073, {wxCursor, destruct, 0}},
- {1074, {wxCursor, ok, 0}},
- {1075, {wxMask, new_0, 0}},
- {1076, {wxMask, new_2_1, 2}},
- {1077, {wxMask, new_2_0, 2}},
- {1078, {wxMask, new_1, 1}},
- {1079, {wxMask, destruct, 0}},
- {1080, {wxMask, create_2_1, 2}},
- {1081, {wxMask, create_2_0, 2}},
- {1082, {wxMask, create_1, 1}},
- {1083, {wxImage, new_0, 0}},
- {1084, {wxImage, new_3_0, 3}},
- {1085, {wxImage, new_4, 4}},
- {1086, {wxImage, new_5, 5}},
- {1087, {wxImage, new_2, 2}},
- {1088, {wxImage, new_3_1, 3}},
- {1089, {wxImage, blur, 1}},
- {1090, {wxImage, blurHorizontal, 1}},
- {1091, {wxImage, blurVertical, 1}},
- {1092, {wxImage, convertAlphaToMask, 1}},
- {1093, {wxImage, convertToGreyscale, 1}},
- {1094, {wxImage, convertToMono, 3}},
- {1095, {wxImage, copy, 0}},
- {1096, {wxImage, create_3, 3}},
- {1097, {wxImage, create_4, 4}},
- {1098, {wxImage, create_5, 5}},
- {1099, {wxImage, 'Destroy', 0}},
- {1100, {wxImage, findFirstUnusedColour, 4}},
- {1101, {wxImage, getImageExtWildcard, 0}},
- {1102, {wxImage, getAlpha_2, 2}},
- {1103, {wxImage, getAlpha_0, 0}},
- {1104, {wxImage, getBlue, 2}},
- {1105, {wxImage, getData, 0}},
- {1106, {wxImage, getGreen, 2}},
- {1107, {wxImage, getImageCount, 2}},
- {1108, {wxImage, getHeight, 0}},
- {1109, {wxImage, getMaskBlue, 0}},
- {1110, {wxImage, getMaskGreen, 0}},
- {1111, {wxImage, getMaskRed, 0}},
- {1112, {wxImage, getOrFindMaskColour, 3}},
- {1113, {wxImage, getPalette, 0}},
- {1114, {wxImage, getRed, 2}},
- {1115, {wxImage, getSubImage, 1}},
- {1116, {wxImage, getWidth, 0}},
- {1117, {wxImage, hasAlpha, 0}},
- {1118, {wxImage, hasMask, 0}},
- {1119, {wxImage, getOption, 1}},
- {1120, {wxImage, getOptionInt, 1}},
- {1121, {wxImage, hasOption, 1}},
- {1122, {wxImage, initAlpha, 0}},
- {1123, {wxImage, initStandardHandlers, 0}},
- {1124, {wxImage, isTransparent, 3}},
- {1125, {wxImage, loadFile_2, 2}},
- {1126, {wxImage, loadFile_3, 3}},
- {1127, {wxImage, ok, 0}},
- {1128, {wxImage, removeHandler, 1}},
- {1129, {wxImage, mirror, 1}},
- {1130, {wxImage, replace, 6}},
- {1131, {wxImage, rescale, 3}},
- {1132, {wxImage, resize, 3}},
- {1133, {wxImage, rotate, 3}},
- {1134, {wxImage, rotateHue, 1}},
- {1135, {wxImage, rotate90, 1}},
- {1136, {wxImage, saveFile_1, 1}},
- {1137, {wxImage, saveFile_2_0, 2}},
- {1138, {wxImage, saveFile_2_1, 2}},
- {1139, {wxImage, scale, 3}},
- {1140, {wxImage, size, 3}},
- {1141, {wxImage, setAlpha_3, 3}},
- {1142, {wxImage, setAlpha_2, 2}},
- {1143, {wxImage, setData_2, 2}},
- {1144, {wxImage, setData_4, 4}},
- {1145, {wxImage, setMask, 1}},
- {1146, {wxImage, setMaskColour, 3}},
- {1147, {wxImage, setMaskFromImage, 4}},
- {1148, {wxImage, setOption_2_1, 2}},
- {1149, {wxImage, setOption_2_0, 2}},
- {1150, {wxImage, setPalette, 1}},
- {1151, {wxImage, setRGB_5, 5}},
- {1152, {wxImage, setRGB_4, 4}},
- {1153, {wxImage, 'Destroy', undefined}},
- {1154, {wxBrush, new_0, 0}},
- {1155, {wxBrush, new_2, 2}},
- {1156, {wxBrush, new_1, 1}},
- {1158, {wxBrush, destruct, 0}},
- {1159, {wxBrush, getColour, 0}},
- {1160, {wxBrush, getStipple, 0}},
- {1161, {wxBrush, getStyle, 0}},
- {1162, {wxBrush, isHatch, 0}},
- {1163, {wxBrush, isOk, 0}},
- {1164, {wxBrush, setColour_1, 1}},
- {1165, {wxBrush, setColour_3, 3}},
- {1166, {wxBrush, setStipple, 1}},
- {1167, {wxBrush, setStyle, 1}},
- {1168, {wxPen, new_0, 0}},
- {1169, {wxPen, new_2, 2}},
- {1170, {wxPen, destruct, 0}},
- {1171, {wxPen, getCap, 0}},
- {1172, {wxPen, getColour, 0}},
- {1173, {wxPen, getJoin, 0}},
- {1174, {wxPen, getStyle, 0}},
- {1175, {wxPen, getWidth, 0}},
- {1176, {wxPen, isOk, 0}},
- {1177, {wxPen, setCap, 1}},
- {1178, {wxPen, setColour_1, 1}},
- {1179, {wxPen, setColour_3, 3}},
- {1180, {wxPen, setJoin, 1}},
- {1181, {wxPen, setStyle, 1}},
- {1182, {wxPen, setWidth, 1}},
- {1183, {wxRegion, new_0, 0}},
- {1184, {wxRegion, new_4, 4}},
- {1185, {wxRegion, new_2, 2}},
- {1186, {wxRegion, new_1_1, 1}},
- {1188, {wxRegion, new_1_0, 1}},
- {1190, {wxRegion, destruct, 0}},
- {1191, {wxRegion, clear, 0}},
- {1192, {wxRegion, contains_2, 2}},
- {1193, {wxRegion, contains_1_0, 1}},
- {1194, {wxRegion, contains_4, 4}},
- {1195, {wxRegion, contains_1_1, 1}},
- {1196, {wxRegion, convertToBitmap, 0}},
- {1197, {wxRegion, getBox, 0}},
- {1198, {wxRegion, intersect_4, 4}},
- {1199, {wxRegion, intersect_1_1, 1}},
- {1200, {wxRegion, intersect_1_0, 1}},
- {1201, {wxRegion, isEmpty, 0}},
- {1202, {wxRegion, subtract_4, 4}},
- {1203, {wxRegion, subtract_1_1, 1}},
- {1204, {wxRegion, subtract_1_0, 1}},
- {1205, {wxRegion, offset_2, 2}},
- {1206, {wxRegion, offset_1, 1}},
- {1207, {wxRegion, union_4, 4}},
- {1208, {wxRegion, union_1_2, 1}},
- {1209, {wxRegion, union_1_1, 1}},
- {1210, {wxRegion, union_1_0, 1}},
- {1211, {wxRegion, union_3, 3}},
- {1212, {wxRegion, xor_4, 4}},
- {1213, {wxRegion, xor_1_1, 1}},
- {1214, {wxRegion, xor_1_0, 1}},
- {1215, {wxAcceleratorTable, new_0, 0}},
- {1216, {wxAcceleratorTable, new_2, 2}},
- {1217, {wxAcceleratorTable, destruct, 0}},
- {1218, {wxAcceleratorTable, ok, 0}},
- {1219, {wxAcceleratorEntry, new_1_0, 1}},
- {1220, {wxAcceleratorEntry, new_1_1, 1}},
- {1221, {wxAcceleratorEntry, getCommand, 0}},
- {1222, {wxAcceleratorEntry, getFlags, 0}},
- {1223, {wxAcceleratorEntry, getKeyCode, 0}},
- {1224, {wxAcceleratorEntry, set, 4}},
- {1225, {wxAcceleratorEntry, 'Destroy', undefined}},
- {1230, {wxCaret, new_3, 3}},
- {1231, {wxCaret, new_2, 2}},
- {1233, {wxCaret, destruct, 0}},
- {1234, {wxCaret, create_3, 3}},
- {1235, {wxCaret, create_2, 2}},
- {1236, {wxCaret, getBlinkTime, 0}},
- {1238, {wxCaret, getPosition, 0}},
- {1240, {wxCaret, getSize, 0}},
- {1241, {wxCaret, getWindow, 0}},
- {1242, {wxCaret, hide, 0}},
- {1243, {wxCaret, isOk, 0}},
- {1244, {wxCaret, isVisible, 0}},
- {1245, {wxCaret, move_2, 2}},
- {1246, {wxCaret, move_1, 1}},
- {1247, {wxCaret, setBlinkTime, 1}},
- {1248, {wxCaret, setSize_2, 2}},
- {1249, {wxCaret, setSize_1, 1}},
- {1250, {wxCaret, show, 1}},
- {1251, {wxSizer, add_2_1, 2}},
- {1252, {wxSizer, add_2_0, 2}},
- {1253, {wxSizer, add_3, 3}},
- {1254, {wxSizer, add_2_3, 2}},
- {1255, {wxSizer, add_2_2, 2}},
- {1256, {wxSizer, addSpacer, 1}},
- {1257, {wxSizer, addStretchSpacer, 1}},
- {1258, {wxSizer, calcMin, 0}},
- {1259, {wxSizer, clear, 1}},
- {1260, {wxSizer, detach_1_2, 1}},
- {1261, {wxSizer, detach_1_1, 1}},
- {1262, {wxSizer, detach_1_0, 1}},
- {1263, {wxSizer, fit, 1}},
- {1264, {wxSizer, fitInside, 1}},
- {1265, {wxSizer, getChildren, 0}},
- {1266, {wxSizer, getItem_2_1, 2}},
- {1267, {wxSizer, getItem_2_0, 2}},
- {1268, {wxSizer, getItem_1, 1}},
- {1269, {wxSizer, getSize, 0}},
- {1270, {wxSizer, getPosition, 0}},
- {1271, {wxSizer, getMinSize, 0}},
- {1272, {wxSizer, hide_2_0, 2}},
- {1273, {wxSizer, hide_2_1, 2}},
- {1274, {wxSizer, hide_1, 1}},
- {1275, {wxSizer, insert_3_1, 3}},
- {1276, {wxSizer, insert_3_0, 3}},
- {1277, {wxSizer, insert_4, 4}},
- {1278, {wxSizer, insert_3_3, 3}},
- {1279, {wxSizer, insert_3_2, 3}},
- {1280, {wxSizer, insert_2, 2}},
- {1281, {wxSizer, insertSpacer, 2}},
- {1282, {wxSizer, insertStretchSpacer, 2}},
- {1283, {wxSizer, isShown_1_2, 1}},
- {1284, {wxSizer, isShown_1_1, 1}},
- {1285, {wxSizer, isShown_1_0, 1}},
- {1286, {wxSizer, layout, 0}},
- {1287, {wxSizer, prepend_2_1, 2}},
- {1288, {wxSizer, prepend_2_0, 2}},
- {1289, {wxSizer, prepend_3, 3}},
- {1290, {wxSizer, prepend_2_3, 2}},
- {1291, {wxSizer, prepend_2_2, 2}},
- {1292, {wxSizer, prepend_1, 1}},
- {1293, {wxSizer, prependSpacer, 1}},
- {1294, {wxSizer, prependStretchSpacer, 1}},
- {1295, {wxSizer, recalcSizes, 0}},
- {1296, {wxSizer, remove_1_1, 1}},
- {1297, {wxSizer, remove_1_0, 1}},
- {1298, {wxSizer, replace_3_1, 3}},
- {1299, {wxSizer, replace_3_0, 3}},
- {1300, {wxSizer, replace_2, 2}},
- {1301, {wxSizer, setDimension, 4}},
- {1302, {wxSizer, setMinSize_2, 2}},
- {1303, {wxSizer, setMinSize_1, 1}},
- {1304, {wxSizer, setItemMinSize_3_2, 3}},
- {1305, {wxSizer, setItemMinSize_2_2, 2}},
- {1306, {wxSizer, setItemMinSize_3_1, 3}},
- {1307, {wxSizer, setItemMinSize_2_1, 2}},
- {1308, {wxSizer, setItemMinSize_3_0, 3}},
- {1309, {wxSizer, setItemMinSize_2_0, 2}},
- {1310, {wxSizer, setSizeHints, 1}},
- {1311, {wxSizer, setVirtualSizeHints, 1}},
- {1312, {wxSizer, show_2_2, 2}},
- {1313, {wxSizer, show_2_1, 2}},
- {1314, {wxSizer, show_2_0, 2}},
- {1315, {wxSizer, show_1, 1}},
- {1316, {wxSizerFlags, new, 1}},
- {1317, {wxSizerFlags, align, 1}},
- {1318, {wxSizerFlags, border_2, 2}},
- {1319, {wxSizerFlags, border_1, 1}},
- {1320, {wxSizerFlags, center, 0}},
- {1321, {wxSizerFlags, centre, 0}},
- {1322, {wxSizerFlags, expand, 0}},
- {1323, {wxSizerFlags, left, 0}},
- {1324, {wxSizerFlags, proportion, 1}},
- {1325, {wxSizerFlags, right, 0}},
- {1326, {wxSizerFlags, 'Destroy', undefined}},
- {1327, {wxSizerItem, new_5_1, 5}},
- {1328, {wxSizerItem, new_2_1, 2}},
- {1329, {wxSizerItem, new_5_0, 5}},
- {1330, {wxSizerItem, new_2_0, 2}},
- {1331, {wxSizerItem, new_6, 6}},
- {1332, {wxSizerItem, new_3, 3}},
- {1333, {wxSizerItem, new_0, 0}},
- {1334, {wxSizerItem, destruct, 0}},
- {1335, {wxSizerItem, calcMin, 0}},
- {1336, {wxSizerItem, deleteWindows, 0}},
- {1337, {wxSizerItem, detachSizer, 0}},
- {1338, {wxSizerItem, getBorder, 0}},
- {1339, {wxSizerItem, getFlag, 0}},
- {1340, {wxSizerItem, getMinSize, 0}},
- {1341, {wxSizerItem, getPosition, 0}},
- {1342, {wxSizerItem, getProportion, 0}},
- {1343, {wxSizerItem, getRatio, 0}},
- {1344, {wxSizerItem, getRect, 0}},
- {1345, {wxSizerItem, getSize, 0}},
- {1346, {wxSizerItem, getSizer, 0}},
- {1347, {wxSizerItem, getSpacer, 0}},
- {1348, {wxSizerItem, getUserData, 0}},
- {1349, {wxSizerItem, getWindow, 0}},
- {1350, {wxSizerItem, isSizer, 0}},
- {1351, {wxSizerItem, isShown, 0}},
- {1352, {wxSizerItem, isSpacer, 0}},
- {1353, {wxSizerItem, isWindow, 0}},
- {1354, {wxSizerItem, setBorder, 1}},
- {1355, {wxSizerItem, setDimension, 2}},
- {1356, {wxSizerItem, setFlag, 1}},
- {1357, {wxSizerItem, setInitSize, 2}},
- {1358, {wxSizerItem, setMinSize_1, 1}},
- {1359, {wxSizerItem, setMinSize_2, 2}},
- {1360, {wxSizerItem, setProportion, 1}},
- {1361, {wxSizerItem, setRatio_2, 2}},
- {1362, {wxSizerItem, setRatio_1_1, 1}},
- {1363, {wxSizerItem, setRatio_1_0, 1}},
- {1364, {wxSizerItem, setSizer, 1}},
- {1365, {wxSizerItem, setSpacer_1, 1}},
- {1366, {wxSizerItem, setSpacer_2, 2}},
- {1367, {wxSizerItem, setWindow, 1}},
- {1368, {wxSizerItem, show, 1}},
- {1369, {wxBoxSizer, new, 1}},
- {1370, {wxBoxSizer, getOrientation, 0}},
- {1371, {wxBoxSizer, 'Destroy', undefined}},
- {1372, {wxStaticBoxSizer, new_2, 2}},
- {1373, {wxStaticBoxSizer, new_3, 3}},
- {1374, {wxStaticBoxSizer, getStaticBox, 0}},
- {1375, {wxStaticBoxSizer, 'Destroy', undefined}},
- {1376, {wxGridSizer, new_4, 4}},
- {1377, {wxGridSizer, new_2, 2}},
- {1378, {wxGridSizer, getCols, 0}},
- {1379, {wxGridSizer, getHGap, 0}},
- {1380, {wxGridSizer, getRows, 0}},
- {1381, {wxGridSizer, getVGap, 0}},
- {1382, {wxGridSizer, setCols, 1}},
- {1383, {wxGridSizer, setHGap, 1}},
- {1384, {wxGridSizer, setRows, 1}},
- {1385, {wxGridSizer, setVGap, 1}},
- {1386, {wxGridSizer, 'Destroy', undefined}},
- {1387, {wxFlexGridSizer, new_4, 4}},
- {1388, {wxFlexGridSizer, new_2, 2}},
- {1389, {wxFlexGridSizer, addGrowableCol, 2}},
- {1390, {wxFlexGridSizer, addGrowableRow, 2}},
- {1391, {wxFlexGridSizer, getFlexibleDirection, 0}},
- {1392, {wxFlexGridSizer, getNonFlexibleGrowMode, 0}},
- {1393, {wxFlexGridSizer, removeGrowableCol, 1}},
- {1394, {wxFlexGridSizer, removeGrowableRow, 1}},
- {1395, {wxFlexGridSizer, setFlexibleDirection, 1}},
- {1396, {wxFlexGridSizer, setNonFlexibleGrowMode, 1}},
- {1397, {wxFlexGridSizer, 'Destroy', undefined}},
- {1398, {wxGridBagSizer, new, 1}},
- {1399, {wxGridBagSizer, add_3_2, 3}},
- {1400, {wxGridBagSizer, add_3_1, 3}},
- {1401, {wxGridBagSizer, add_4, 4}},
- {1402, {wxGridBagSizer, add_1_0, 1}},
- {1403, {wxGridBagSizer, add_2_1, 2}},
- {1404, {wxGridBagSizer, add_2_0, 2}},
- {1405, {wxGridBagSizer, add_3_0, 3}},
- {1406, {wxGridBagSizer, add_1_1, 1}},
- {1407, {wxGridBagSizer, calcMin, 0}},
- {1408, {wxGridBagSizer, checkForIntersection_2, 2}},
- {1409, {wxGridBagSizer, checkForIntersection_3, 3}},
- {1410, {wxGridBagSizer, findItem_1_1, 1}},
- {1411, {wxGridBagSizer, findItem_1_0, 1}},
- {1412, {wxGridBagSizer, findItemAtPoint, 1}},
- {1413, {wxGridBagSizer, findItemAtPosition, 1}},
- {1414, {wxGridBagSizer, findItemWithData, 1}},
- {1415, {wxGridBagSizer, getCellSize, 2}},
- {1416, {wxGridBagSizer, getEmptyCellSize, 0}},
- {1417, {wxGridBagSizer, getItemPosition_1_2, 1}},
- {1418, {wxGridBagSizer, getItemPosition_1_1, 1}},
- {1419, {wxGridBagSizer, getItemPosition_1_0, 1}},
- {1420, {wxGridBagSizer, getItemSpan_1_2, 1}},
- {1421, {wxGridBagSizer, getItemSpan_1_1, 1}},
- {1422, {wxGridBagSizer, getItemSpan_1_0, 1}},
- {1423, {wxGridBagSizer, setEmptyCellSize, 1}},
- {1424, {wxGridBagSizer, setItemPosition_2_2, 2}},
- {1425, {wxGridBagSizer, setItemPosition_2_1, 2}},
- {1426, {wxGridBagSizer, setItemPosition_2_0, 2}},
- {1427, {wxGridBagSizer, setItemSpan_2_2, 2}},
- {1428, {wxGridBagSizer, setItemSpan_2_1, 2}},
- {1429, {wxGridBagSizer, setItemSpan_2_0, 2}},
- {1430, {wxGridBagSizer, 'Destroy', undefined}},
- {1431, {wxStdDialogButtonSizer, new, 0}},
- {1432, {wxStdDialogButtonSizer, addButton, 1}},
- {1433, {wxStdDialogButtonSizer, realize, 0}},
- {1434, {wxStdDialogButtonSizer, setAffirmativeButton, 1}},
- {1435, {wxStdDialogButtonSizer, setCancelButton, 1}},
- {1436, {wxStdDialogButtonSizer, setNegativeButton, 1}},
- {1437, {wxStdDialogButtonSizer, 'Destroy', undefined}},
- {1438, {wxFont, new_0, 0}},
- {1439, {wxFont, new_1, 1}},
- {1440, {wxFont, new_5, 5}},
- {1442, {wxFont, destruct, 0}},
- {1443, {wxFont, isFixedWidth, 0}},
- {1444, {wxFont, getDefaultEncoding, 0}},
- {1445, {wxFont, getFaceName, 0}},
- {1446, {wxFont, getFamily, 0}},
- {1447, {wxFont, getNativeFontInfoDesc, 0}},
- {1448, {wxFont, getNativeFontInfoUserDesc, 0}},
- {1449, {wxFont, getPointSize, 0}},
- {1450, {wxFont, getStyle, 0}},
- {1451, {wxFont, getUnderlined, 0}},
- {1452, {wxFont, getWeight, 0}},
- {1453, {wxFont, ok, 0}},
- {1454, {wxFont, setDefaultEncoding, 1}},
- {1455, {wxFont, setFaceName, 1}},
- {1456, {wxFont, setFamily, 1}},
- {1457, {wxFont, setPointSize, 1}},
- {1458, {wxFont, setStyle, 1}},
- {1459, {wxFont, setUnderlined, 1}},
- {1460, {wxFont, setWeight, 1}},
- {1461, {wxToolTip, enable, 1}},
- {1462, {wxToolTip, setDelay, 1}},
- {1463, {wxToolTip, new, 1}},
- {1464, {wxToolTip, setTip, 1}},
- {1465, {wxToolTip, getTip, 0}},
- {1466, {wxToolTip, getWindow, 0}},
- {1467, {wxToolTip, 'Destroy', undefined}},
- {1469, {wxButton, new_3, 3}},
- {1470, {wxButton, new_0, 0}},
- {1471, {wxButton, destruct, 0}},
- {1472, {wxButton, create, 3}},
- {1473, {wxButton, getDefaultSize, 0}},
- {1474, {wxButton, setDefault, 0}},
- {1475, {wxButton, setLabel, 1}},
- {1477, {wxBitmapButton, new_4, 4}},
- {1478, {wxBitmapButton, new_0, 0}},
- {1479, {wxBitmapButton, create, 4}},
- {1480, {wxBitmapButton, getBitmapDisabled, 0}},
- {1482, {wxBitmapButton, getBitmapFocus, 0}},
- {1484, {wxBitmapButton, getBitmapLabel, 0}},
- {1486, {wxBitmapButton, getBitmapSelected, 0}},
- {1488, {wxBitmapButton, setBitmapDisabled, 1}},
- {1489, {wxBitmapButton, setBitmapFocus, 1}},
- {1490, {wxBitmapButton, setBitmapLabel, 1}},
- {1491, {wxBitmapButton, setBitmapSelected, 1}},
- {1492, {wxBitmapButton, 'Destroy', undefined}},
- {1493, {wxToggleButton, new_0, 0}},
- {1494, {wxToggleButton, new_4, 4}},
- {1495, {wxToggleButton, create, 4}},
- {1496, {wxToggleButton, getValue, 0}},
- {1497, {wxToggleButton, setValue, 1}},
- {1498, {wxToggleButton, 'Destroy', undefined}},
- {1499, {wxCalendarCtrl, new_0, 0}},
- {1500, {wxCalendarCtrl, new_3, 3}},
- {1501, {wxCalendarCtrl, create, 3}},
- {1502, {wxCalendarCtrl, destruct, 0}},
- {1503, {wxCalendarCtrl, setDate, 1}},
- {1504, {wxCalendarCtrl, getDate, 0}},
- {1505, {wxCalendarCtrl, enableYearChange, 1}},
- {1506, {wxCalendarCtrl, enableMonthChange, 1}},
- {1507, {wxCalendarCtrl, enableHolidayDisplay, 1}},
- {1508, {wxCalendarCtrl, setHeaderColours, 2}},
- {1509, {wxCalendarCtrl, getHeaderColourFg, 0}},
- {1510, {wxCalendarCtrl, getHeaderColourBg, 0}},
- {1511, {wxCalendarCtrl, setHighlightColours, 2}},
- {1512, {wxCalendarCtrl, getHighlightColourFg, 0}},
- {1513, {wxCalendarCtrl, getHighlightColourBg, 0}},
- {1514, {wxCalendarCtrl, setHolidayColours, 2}},
- {1515, {wxCalendarCtrl, getHolidayColourFg, 0}},
- {1516, {wxCalendarCtrl, getHolidayColourBg, 0}},
- {1517, {wxCalendarCtrl, getAttr, 1}},
- {1518, {wxCalendarCtrl, setAttr, 2}},
- {1519, {wxCalendarCtrl, setHoliday, 1}},
- {1520, {wxCalendarCtrl, resetAttr, 1}},
- {1521, {wxCalendarCtrl, hitTest, 2}},
- {1522, {wxCalendarDateAttr, new_0, 0}},
- {1523, {wxCalendarDateAttr, new_2_1, 2}},
- {1524, {wxCalendarDateAttr, new_2_0, 2}},
- {1525, {wxCalendarDateAttr, setTextColour, 1}},
- {1526, {wxCalendarDateAttr, setBackgroundColour, 1}},
- {1527, {wxCalendarDateAttr, setBorderColour, 1}},
- {1528, {wxCalendarDateAttr, setFont, 1}},
- {1529, {wxCalendarDateAttr, setBorder, 1}},
- {1530, {wxCalendarDateAttr, setHoliday, 1}},
- {1531, {wxCalendarDateAttr, hasTextColour, 0}},
- {1532, {wxCalendarDateAttr, hasBackgroundColour, 0}},
- {1533, {wxCalendarDateAttr, hasBorderColour, 0}},
- {1534, {wxCalendarDateAttr, hasFont, 0}},
- {1535, {wxCalendarDateAttr, hasBorder, 0}},
- {1536, {wxCalendarDateAttr, isHoliday, 0}},
- {1537, {wxCalendarDateAttr, getTextColour, 0}},
- {1538, {wxCalendarDateAttr, getBackgroundColour, 0}},
- {1539, {wxCalendarDateAttr, getBorderColour, 0}},
- {1540, {wxCalendarDateAttr, getFont, 0}},
- {1541, {wxCalendarDateAttr, getBorder, 0}},
- {1542, {wxCalendarDateAttr, 'Destroy', undefined}},
- {1544, {wxCheckBox, new_4, 4}},
- {1545, {wxCheckBox, new_0, 0}},
- {1546, {wxCheckBox, create, 4}},
- {1547, {wxCheckBox, getValue, 0}},
- {1548, {wxCheckBox, get3StateValue, 0}},
- {1549, {wxCheckBox, is3rdStateAllowedForUser, 0}},
- {1550, {wxCheckBox, is3State, 0}},
- {1551, {wxCheckBox, isChecked, 0}},
- {1552, {wxCheckBox, setValue, 1}},
- {1553, {wxCheckBox, set3StateValue, 1}},
- {1554, {wxCheckBox, 'Destroy', undefined}},
- {1555, {wxCheckListBox, new_0, 0}},
- {1557, {wxCheckListBox, new_3, 3}},
- {1558, {wxCheckListBox, check, 2}},
- {1559, {wxCheckListBox, isChecked, 1}},
- {1560, {wxCheckListBox, 'Destroy', undefined}},
- {1563, {wxChoice, new_3, 3}},
- {1564, {wxChoice, new_0, 0}},
- {1566, {wxChoice, destruct, 0}},
- {1568, {wxChoice, create, 6}},
- {1569, {wxChoice, delete, 1}},
- {1570, {wxChoice, getColumns, 0}},
- {1571, {wxChoice, setColumns, 1}},
- {1572, {wxComboBox, new_0, 0}},
- {1574, {wxComboBox, new_3, 3}},
- {1575, {wxComboBox, destruct, 0}},
- {1577, {wxComboBox, create, 7}},
- {1578, {wxComboBox, canCopy, 0}},
- {1579, {wxComboBox, canCut, 0}},
- {1580, {wxComboBox, canPaste, 0}},
- {1581, {wxComboBox, canRedo, 0}},
- {1582, {wxComboBox, canUndo, 0}},
- {1583, {wxComboBox, copy, 0}},
- {1584, {wxComboBox, cut, 0}},
- {1585, {wxComboBox, getInsertionPoint, 0}},
- {1586, {wxComboBox, getLastPosition, 0}},
- {1587, {wxComboBox, getValue, 0}},
- {1588, {wxComboBox, paste, 0}},
- {1589, {wxComboBox, redo, 0}},
- {1590, {wxComboBox, replace, 3}},
- {1591, {wxComboBox, remove, 2}},
- {1592, {wxComboBox, setInsertionPoint, 1}},
- {1593, {wxComboBox, setInsertionPointEnd, 0}},
- {1594, {wxComboBox, setSelection_1, 1}},
- {1595, {wxComboBox, setSelection_2, 2}},
- {1596, {wxComboBox, setValue, 1}},
- {1597, {wxComboBox, undo, 0}},
- {1598, {wxGauge, new_0, 0}},
- {1599, {wxGauge, new_4, 4}},
- {1600, {wxGauge, create, 4}},
- {1601, {wxGauge, getBezelFace, 0}},
- {1602, {wxGauge, getRange, 0}},
- {1603, {wxGauge, getShadowWidth, 0}},
- {1604, {wxGauge, getValue, 0}},
- {1605, {wxGauge, isVertical, 0}},
- {1606, {wxGauge, setBezelFace, 1}},
- {1607, {wxGauge, setRange, 1}},
- {1608, {wxGauge, setShadowWidth, 1}},
- {1609, {wxGauge, setValue, 1}},
- {1610, {wxGauge, pulse, 0}},
- {1611, {wxGauge, 'Destroy', undefined}},
- {1612, {wxGenericDirCtrl, new_0, 0}},
- {1613, {wxGenericDirCtrl, new_2, 2}},
- {1614, {wxGenericDirCtrl, destruct, 0}},
- {1615, {wxGenericDirCtrl, create, 2}},
- {1616, {wxGenericDirCtrl, init, 0}},
- {1617, {wxGenericDirCtrl, collapseTree, 0}},
- {1618, {wxGenericDirCtrl, expandPath, 1}},
- {1619, {wxGenericDirCtrl, getDefaultPath, 0}},
- {1620, {wxGenericDirCtrl, getPath, 0}},
- {1621, {wxGenericDirCtrl, getFilePath, 0}},
- {1622, {wxGenericDirCtrl, getFilter, 0}},
- {1623, {wxGenericDirCtrl, getFilterIndex, 0}},
- {1624, {wxGenericDirCtrl, getRootId, 0}},
- {1625, {wxGenericDirCtrl, getTreeCtrl, 0}},
- {1626, {wxGenericDirCtrl, reCreateTree, 0}},
- {1627, {wxGenericDirCtrl, setDefaultPath, 1}},
- {1628, {wxGenericDirCtrl, setFilter, 1}},
- {1629, {wxGenericDirCtrl, setFilterIndex, 1}},
- {1630, {wxGenericDirCtrl, setPath, 1}},
- {1632, {wxStaticBox, new_4, 4}},
- {1633, {wxStaticBox, new_0, 0}},
- {1634, {wxStaticBox, create, 4}},
- {1635, {wxStaticBox, 'Destroy', undefined}},
- {1637, {wxStaticLine, new_2, 2}},
- {1638, {wxStaticLine, new_0, 0}},
- {1639, {wxStaticLine, create, 2}},
- {1640, {wxStaticLine, isVertical, 0}},
- {1641, {wxStaticLine, getDefaultSize, 0}},
- {1642, {wxStaticLine, 'Destroy', undefined}},
- {1645, {wxListBox, new_3, 3}},
- {1646, {wxListBox, new_0, 0}},
- {1648, {wxListBox, destruct, 0}},
- {1650, {wxListBox, create, 6}},
- {1651, {wxListBox, deselect, 1}},
- {1652, {wxListBox, getSelections, 1}},
- {1653, {wxListBox, insertItems, 2}},
- {1654, {wxListBox, isSelected, 1}},
- {1655, {wxListBox, set, 1}},
- {1656, {wxListBox, hitTest, 1}},
- {1657, {wxListBox, setFirstItem_1_0, 1}},
- {1658, {wxListBox, setFirstItem_1_1, 1}},
- {1659, {wxListCtrl, new_0, 0}},
- {1660, {wxListCtrl, new_2, 2}},
- {1661, {wxListCtrl, arrange, 1}},
- {1662, {wxListCtrl, assignImageList, 2}},
- {1663, {wxListCtrl, clearAll, 0}},
- {1664, {wxListCtrl, create, 2}},
- {1665, {wxListCtrl, deleteAllItems, 0}},
- {1666, {wxListCtrl, deleteColumn, 1}},
- {1667, {wxListCtrl, deleteItem, 1}},
- {1668, {wxListCtrl, editLabel, 1}},
- {1669, {wxListCtrl, ensureVisible, 1}},
- {1670, {wxListCtrl, findItem_3_0, 3}},
- {1671, {wxListCtrl, findItem_3_1, 3}},
- {1672, {wxListCtrl, getColumn, 2}},
- {1673, {wxListCtrl, getColumnCount, 0}},
- {1674, {wxListCtrl, getColumnWidth, 1}},
- {1675, {wxListCtrl, getCountPerPage, 0}},
- {1676, {wxListCtrl, getEditControl, 0}},
- {1677, {wxListCtrl, getImageList, 1}},
- {1678, {wxListCtrl, getItem, 1}},
- {1679, {wxListCtrl, getItemBackgroundColour, 1}},
- {1680, {wxListCtrl, getItemCount, 0}},
- {1681, {wxListCtrl, getItemData, 1}},
- {1682, {wxListCtrl, getItemFont, 1}},
- {1683, {wxListCtrl, getItemPosition, 2}},
- {1684, {wxListCtrl, getItemRect, 3}},
- {1685, {wxListCtrl, getItemSpacing, 0}},
- {1686, {wxListCtrl, getItemState, 2}},
- {1687, {wxListCtrl, getItemText, 1}},
- {1688, {wxListCtrl, getItemTextColour, 1}},
- {1689, {wxListCtrl, getNextItem, 2}},
- {1690, {wxListCtrl, getSelectedItemCount, 0}},
- {1691, {wxListCtrl, getTextColour, 0}},
- {1692, {wxListCtrl, getTopItem, 0}},
- {1693, {wxListCtrl, getViewRect, 0}},
- {1694, {wxListCtrl, hitTest, 2}},
- {1695, {wxListCtrl, insertColumn_2, 2}},
- {1696, {wxListCtrl, insertColumn_3, 3}},
- {1697, {wxListCtrl, insertItem_1, 1}},
- {1698, {wxListCtrl, insertItem_2_1, 2}},
- {1699, {wxListCtrl, insertItem_2_0, 2}},
- {1700, {wxListCtrl, insertItem_3, 3}},
- {1701, {wxListCtrl, refreshItem, 1}},
- {1702, {wxListCtrl, refreshItems, 2}},
- {1703, {wxListCtrl, scrollList, 2}},
- {1704, {wxListCtrl, setBackgroundColour, 1}},
- {1705, {wxListCtrl, setColumn, 2}},
- {1706, {wxListCtrl, setColumnWidth, 2}},
- {1707, {wxListCtrl, setImageList, 2}},
- {1708, {wxListCtrl, setItem_1, 1}},
- {1709, {wxListCtrl, setItem_4, 4}},
- {1710, {wxListCtrl, setItemBackgroundColour, 2}},
- {1711, {wxListCtrl, setItemCount, 1}},
- {1712, {wxListCtrl, setItemData, 2}},
- {1713, {wxListCtrl, setItemFont, 2}},
- {1714, {wxListCtrl, setItemImage, 3}},
- {1715, {wxListCtrl, setItemColumnImage, 3}},
- {1716, {wxListCtrl, setItemPosition, 2}},
- {1717, {wxListCtrl, setItemState, 3}},
- {1718, {wxListCtrl, setItemText, 2}},
- {1719, {wxListCtrl, setItemTextColour, 2}},
- {1720, {wxListCtrl, setSingleStyle, 2}},
- {1721, {wxListCtrl, setTextColour, 1}},
- {1722, {wxListCtrl, setWindowStyleFlag, 1}},
- {1723, {wxListCtrl, sortItems, 2}},
- {1724, {wxListCtrl, 'Destroy', undefined}},
- {1725, {wxListView, clearColumnImage, 1}},
- {1726, {wxListView, focus, 1}},
- {1727, {wxListView, getFirstSelected, 0}},
- {1728, {wxListView, getFocusedItem, 0}},
- {1729, {wxListView, getNextSelected, 1}},
- {1730, {wxListView, isSelected, 1}},
- {1731, {wxListView, select, 2}},
- {1732, {wxListView, setColumnImage, 2}},
- {1733, {wxListItem, new_0, 0}},
- {1734, {wxListItem, new_1, 1}},
- {1735, {wxListItem, destruct, 0}},
- {1736, {wxListItem, clear, 0}},
- {1737, {wxListItem, getAlign, 0}},
- {1738, {wxListItem, getBackgroundColour, 0}},
- {1739, {wxListItem, getColumn, 0}},
- {1740, {wxListItem, getFont, 0}},
- {1741, {wxListItem, getId, 0}},
- {1742, {wxListItem, getImage, 0}},
- {1743, {wxListItem, getMask, 0}},
- {1744, {wxListItem, getState, 0}},
- {1745, {wxListItem, getText, 0}},
- {1746, {wxListItem, getTextColour, 0}},
- {1747, {wxListItem, getWidth, 0}},
- {1748, {wxListItem, setAlign, 1}},
- {1749, {wxListItem, setBackgroundColour, 1}},
- {1750, {wxListItem, setColumn, 1}},
- {1751, {wxListItem, setFont, 1}},
- {1752, {wxListItem, setId, 1}},
- {1753, {wxListItem, setImage, 1}},
- {1754, {wxListItem, setMask, 1}},
- {1755, {wxListItem, setState, 1}},
- {1756, {wxListItem, setStateMask, 1}},
- {1757, {wxListItem, setText, 1}},
- {1758, {wxListItem, setTextColour, 1}},
- {1759, {wxListItem, setWidth, 1}},
- {1760, {wxListItemAttr, new_0, 0}},
- {1761, {wxListItemAttr, new_3, 3}},
- {1762, {wxListItemAttr, getBackgroundColour, 0}},
- {1763, {wxListItemAttr, getFont, 0}},
- {1764, {wxListItemAttr, getTextColour, 0}},
- {1765, {wxListItemAttr, hasBackgroundColour, 0}},
- {1766, {wxListItemAttr, hasFont, 0}},
- {1767, {wxListItemAttr, hasTextColour, 0}},
- {1768, {wxListItemAttr, setBackgroundColour, 1}},
- {1769, {wxListItemAttr, setFont, 1}},
- {1770, {wxListItemAttr, setTextColour, 1}},
- {1771, {wxListItemAttr, 'Destroy', undefined}},
- {1772, {wxImageList, new_0, 0}},
- {1773, {wxImageList, new_3, 3}},
- {1774, {wxImageList, add_1, 1}},
- {1775, {wxImageList, add_2_0, 2}},
- {1776, {wxImageList, add_2_1, 2}},
- {1777, {wxImageList, create, 3}},
- {1779, {wxImageList, draw, 5}},
- {1780, {wxImageList, getBitmap, 1}},
- {1781, {wxImageList, getIcon, 1}},
- {1782, {wxImageList, getImageCount, 0}},
- {1783, {wxImageList, getSize, 3}},
- {1784, {wxImageList, remove, 1}},
- {1785, {wxImageList, removeAll, 0}},
- {1786, {wxImageList, replace_2, 2}},
- {1787, {wxImageList, replace_3, 3}},
- {1788, {wxImageList, 'Destroy', undefined}},
- {1789, {wxTextAttr, new_0, 0}},
- {1790, {wxTextAttr, new_2, 2}},
- {1791, {wxTextAttr, getAlignment, 0}},
- {1792, {wxTextAttr, getBackgroundColour, 0}},
- {1793, {wxTextAttr, getFont, 0}},
- {1794, {wxTextAttr, getLeftIndent, 0}},
- {1795, {wxTextAttr, getLeftSubIndent, 0}},
- {1796, {wxTextAttr, getRightIndent, 0}},
- {1797, {wxTextAttr, getTabs, 0}},
- {1798, {wxTextAttr, getTextColour, 0}},
- {1799, {wxTextAttr, hasBackgroundColour, 0}},
- {1800, {wxTextAttr, hasFont, 0}},
- {1801, {wxTextAttr, hasTextColour, 0}},
- {1802, {wxTextAttr, getFlags, 0}},
- {1803, {wxTextAttr, isDefault, 0}},
- {1804, {wxTextAttr, setAlignment, 1}},
- {1805, {wxTextAttr, setBackgroundColour, 1}},
- {1806, {wxTextAttr, setFlags, 1}},
- {1807, {wxTextAttr, setFont, 2}},
- {1808, {wxTextAttr, setLeftIndent, 2}},
- {1809, {wxTextAttr, setRightIndent, 1}},
- {1810, {wxTextAttr, setTabs, 1}},
- {1811, {wxTextAttr, setTextColour, 1}},
- {1812, {wxTextAttr, 'Destroy', undefined}},
- {1814, {wxTextCtrl, new_3, 3}},
- {1815, {wxTextCtrl, new_0, 0}},
- {1817, {wxTextCtrl, destruct, 0}},
- {1818, {wxTextCtrl, appendText, 1}},
- {1819, {wxTextCtrl, canCopy, 0}},
- {1820, {wxTextCtrl, canCut, 0}},
- {1821, {wxTextCtrl, canPaste, 0}},
- {1822, {wxTextCtrl, canRedo, 0}},
- {1823, {wxTextCtrl, canUndo, 0}},
- {1824, {wxTextCtrl, clear, 0}},
- {1825, {wxTextCtrl, copy, 0}},
- {1826, {wxTextCtrl, create, 3}},
- {1827, {wxTextCtrl, cut, 0}},
- {1828, {wxTextCtrl, discardEdits, 0}},
- {1829, {wxTextCtrl, changeValue, 1}},
- {1830, {wxTextCtrl, emulateKeyPress, 1}},
- {1831, {wxTextCtrl, getDefaultStyle, 0}},
- {1832, {wxTextCtrl, getInsertionPoint, 0}},
- {1833, {wxTextCtrl, getLastPosition, 0}},
- {1834, {wxTextCtrl, getLineLength, 1}},
- {1835, {wxTextCtrl, getLineText, 1}},
- {1836, {wxTextCtrl, getNumberOfLines, 0}},
- {1837, {wxTextCtrl, getRange, 2}},
- {1838, {wxTextCtrl, getSelection, 2}},
- {1839, {wxTextCtrl, getStringSelection, 0}},
- {1840, {wxTextCtrl, getStyle, 2}},
- {1841, {wxTextCtrl, getValue, 0}},
- {1842, {wxTextCtrl, isEditable, 0}},
- {1843, {wxTextCtrl, isModified, 0}},
- {1844, {wxTextCtrl, isMultiLine, 0}},
- {1845, {wxTextCtrl, isSingleLine, 0}},
- {1846, {wxTextCtrl, loadFile, 2}},
- {1847, {wxTextCtrl, markDirty, 0}},
- {1848, {wxTextCtrl, paste, 0}},
- {1849, {wxTextCtrl, positionToXY, 3}},
- {1850, {wxTextCtrl, redo, 0}},
- {1851, {wxTextCtrl, remove, 2}},
- {1852, {wxTextCtrl, replace, 3}},
- {1853, {wxTextCtrl, saveFile, 1}},
- {1854, {wxTextCtrl, setDefaultStyle, 1}},
- {1855, {wxTextCtrl, setEditable, 1}},
- {1856, {wxTextCtrl, setInsertionPoint, 1}},
- {1857, {wxTextCtrl, setInsertionPointEnd, 0}},
- {1859, {wxTextCtrl, setMaxLength, 1}},
- {1860, {wxTextCtrl, setSelection, 2}},
- {1861, {wxTextCtrl, setStyle, 3}},
- {1862, {wxTextCtrl, setValue, 1}},
- {1863, {wxTextCtrl, showPosition, 1}},
- {1864, {wxTextCtrl, undo, 0}},
- {1865, {wxTextCtrl, writeText, 1}},
- {1866, {wxTextCtrl, xYToPosition, 2}},
- {1869, {wxNotebook, new_0, 0}},
- {1870, {wxNotebook, new_3, 3}},
- {1871, {wxNotebook, destruct, 0}},
- {1872, {wxNotebook, addPage, 3}},
- {1873, {wxNotebook, advanceSelection, 1}},
- {1874, {wxNotebook, assignImageList, 1}},
- {1875, {wxNotebook, create, 3}},
- {1876, {wxNotebook, deleteAllPages, 0}},
- {1877, {wxNotebook, deletePage, 1}},
- {1878, {wxNotebook, removePage, 1}},
- {1879, {wxNotebook, getCurrentPage, 0}},
- {1880, {wxNotebook, getImageList, 0}},
- {1882, {wxNotebook, getPage, 1}},
- {1883, {wxNotebook, getPageCount, 0}},
- {1884, {wxNotebook, getPageImage, 1}},
- {1885, {wxNotebook, getPageText, 1}},
- {1886, {wxNotebook, getRowCount, 0}},
- {1887, {wxNotebook, getSelection, 0}},
- {1888, {wxNotebook, getThemeBackgroundColour, 0}},
- {1890, {wxNotebook, hitTest, 2}},
- {1892, {wxNotebook, insertPage, 4}},
- {1893, {wxNotebook, setImageList, 1}},
- {1894, {wxNotebook, setPadding, 1}},
- {1895, {wxNotebook, setPageSize, 1}},
- {1896, {wxNotebook, setPageImage, 2}},
- {1897, {wxNotebook, setPageText, 2}},
- {1898, {wxNotebook, setSelection, 1}},
- {1899, {wxNotebook, changeSelection, 1}},
- {1900, {wxChoicebook, new_0, 0}},
- {1901, {wxChoicebook, new_3, 3}},
- {1902, {wxChoicebook, addPage, 3}},
- {1903, {wxChoicebook, advanceSelection, 1}},
- {1904, {wxChoicebook, assignImageList, 1}},
- {1905, {wxChoicebook, create, 3}},
- {1906, {wxChoicebook, deleteAllPages, 0}},
- {1907, {wxChoicebook, deletePage, 1}},
- {1908, {wxChoicebook, removePage, 1}},
- {1909, {wxChoicebook, getCurrentPage, 0}},
- {1910, {wxChoicebook, getImageList, 0}},
- {1912, {wxChoicebook, getPage, 1}},
- {1913, {wxChoicebook, getPageCount, 0}},
- {1914, {wxChoicebook, getPageImage, 1}},
- {1915, {wxChoicebook, getPageText, 1}},
- {1916, {wxChoicebook, getSelection, 0}},
- {1917, {wxChoicebook, hitTest, 2}},
- {1918, {wxChoicebook, insertPage, 4}},
- {1919, {wxChoicebook, setImageList, 1}},
- {1920, {wxChoicebook, setPageSize, 1}},
- {1921, {wxChoicebook, setPageImage, 2}},
- {1922, {wxChoicebook, setPageText, 2}},
- {1923, {wxChoicebook, setSelection, 1}},
- {1924, {wxChoicebook, changeSelection, 1}},
- {1925, {wxChoicebook, 'Destroy', undefined}},
- {1926, {wxToolbook, new_0, 0}},
- {1927, {wxToolbook, new_3, 3}},
- {1928, {wxToolbook, addPage, 3}},
- {1929, {wxToolbook, advanceSelection, 1}},
- {1930, {wxToolbook, assignImageList, 1}},
- {1931, {wxToolbook, create, 3}},
- {1932, {wxToolbook, deleteAllPages, 0}},
- {1933, {wxToolbook, deletePage, 1}},
- {1934, {wxToolbook, removePage, 1}},
- {1935, {wxToolbook, getCurrentPage, 0}},
- {1936, {wxToolbook, getImageList, 0}},
- {1938, {wxToolbook, getPage, 1}},
- {1939, {wxToolbook, getPageCount, 0}},
- {1940, {wxToolbook, getPageImage, 1}},
- {1941, {wxToolbook, getPageText, 1}},
- {1942, {wxToolbook, getSelection, 0}},
- {1944, {wxToolbook, hitTest, 2}},
- {1945, {wxToolbook, insertPage, 4}},
- {1946, {wxToolbook, setImageList, 1}},
- {1947, {wxToolbook, setPageSize, 1}},
- {1948, {wxToolbook, setPageImage, 2}},
- {1949, {wxToolbook, setPageText, 2}},
- {1950, {wxToolbook, setSelection, 1}},
- {1951, {wxToolbook, changeSelection, 1}},
- {1952, {wxToolbook, 'Destroy', undefined}},
- {1953, {wxListbook, new_0, 0}},
- {1954, {wxListbook, new_3, 3}},
- {1955, {wxListbook, addPage, 3}},
- {1956, {wxListbook, advanceSelection, 1}},
- {1957, {wxListbook, assignImageList, 1}},
- {1958, {wxListbook, create, 3}},
- {1959, {wxListbook, deleteAllPages, 0}},
- {1960, {wxListbook, deletePage, 1}},
- {1961, {wxListbook, removePage, 1}},
- {1962, {wxListbook, getCurrentPage, 0}},
- {1963, {wxListbook, getImageList, 0}},
- {1965, {wxListbook, getPage, 1}},
- {1966, {wxListbook, getPageCount, 0}},
- {1967, {wxListbook, getPageImage, 1}},
- {1968, {wxListbook, getPageText, 1}},
- {1969, {wxListbook, getSelection, 0}},
- {1971, {wxListbook, hitTest, 2}},
- {1972, {wxListbook, insertPage, 4}},
- {1973, {wxListbook, setImageList, 1}},
- {1974, {wxListbook, setPageSize, 1}},
- {1975, {wxListbook, setPageImage, 2}},
- {1976, {wxListbook, setPageText, 2}},
- {1977, {wxListbook, setSelection, 1}},
- {1978, {wxListbook, changeSelection, 1}},
- {1979, {wxListbook, 'Destroy', undefined}},
- {1980, {wxTreebook, new_0, 0}},
- {1981, {wxTreebook, new_3, 3}},
- {1982, {wxTreebook, addPage, 3}},
- {1983, {wxTreebook, advanceSelection, 1}},
- {1984, {wxTreebook, assignImageList, 1}},
- {1985, {wxTreebook, create, 3}},
- {1986, {wxTreebook, deleteAllPages, 0}},
- {1987, {wxTreebook, deletePage, 1}},
- {1988, {wxTreebook, removePage, 1}},
- {1989, {wxTreebook, getCurrentPage, 0}},
- {1990, {wxTreebook, getImageList, 0}},
- {1992, {wxTreebook, getPage, 1}},
- {1993, {wxTreebook, getPageCount, 0}},
- {1994, {wxTreebook, getPageImage, 1}},
- {1995, {wxTreebook, getPageText, 1}},
- {1996, {wxTreebook, getSelection, 0}},
- {1997, {wxTreebook, expandNode, 2}},
- {1998, {wxTreebook, isNodeExpanded, 1}},
- {2000, {wxTreebook, hitTest, 2}},
- {2001, {wxTreebook, insertPage, 4}},
- {2002, {wxTreebook, insertSubPage, 4}},
- {2003, {wxTreebook, setImageList, 1}},
- {2004, {wxTreebook, setPageSize, 1}},
- {2005, {wxTreebook, setPageImage, 2}},
- {2006, {wxTreebook, setPageText, 2}},
- {2007, {wxTreebook, setSelection, 1}},
- {2008, {wxTreebook, changeSelection, 1}},
- {2009, {wxTreebook, 'Destroy', undefined}},
- {2012, {wxTreeCtrl, new_2, 2}},
- {2013, {wxTreeCtrl, new_0, 0}},
- {2015, {wxTreeCtrl, destruct, 0}},
- {2016, {wxTreeCtrl, addRoot, 2}},
- {2017, {wxTreeCtrl, appendItem, 3}},
- {2018, {wxTreeCtrl, assignImageList, 1}},
- {2019, {wxTreeCtrl, assignStateImageList, 1}},
- {2020, {wxTreeCtrl, collapse, 1}},
- {2021, {wxTreeCtrl, collapseAndReset, 1}},
- {2022, {wxTreeCtrl, create, 2}},
- {2023, {wxTreeCtrl, delete, 1}},
- {2024, {wxTreeCtrl, deleteAllItems, 0}},
- {2025, {wxTreeCtrl, deleteChildren, 1}},
- {2026, {wxTreeCtrl, editLabel, 1}},
- {2027, {wxTreeCtrl, ensureVisible, 1}},
- {2028, {wxTreeCtrl, expand, 1}},
- {2029, {wxTreeCtrl, getBoundingRect, 3}},
- {2031, {wxTreeCtrl, getChildrenCount, 2}},
- {2032, {wxTreeCtrl, getCount, 0}},
- {2033, {wxTreeCtrl, getEditControl, 0}},
- {2034, {wxTreeCtrl, getFirstChild, 2}},
- {2035, {wxTreeCtrl, getNextChild, 2}},
- {2036, {wxTreeCtrl, getFirstVisibleItem, 0}},
- {2037, {wxTreeCtrl, getImageList, 0}},
- {2038, {wxTreeCtrl, getIndent, 0}},
- {2039, {wxTreeCtrl, getItemBackgroundColour, 1}},
- {2040, {wxTreeCtrl, getItemData, 1}},
- {2041, {wxTreeCtrl, getItemFont, 1}},
- {2042, {wxTreeCtrl, getItemImage_1, 1}},
- {2043, {wxTreeCtrl, getItemImage_2, 2}},
- {2044, {wxTreeCtrl, getItemText, 1}},
- {2045, {wxTreeCtrl, getItemTextColour, 1}},
- {2046, {wxTreeCtrl, getLastChild, 1}},
- {2047, {wxTreeCtrl, getNextSibling, 1}},
- {2048, {wxTreeCtrl, getNextVisible, 1}},
- {2049, {wxTreeCtrl, getItemParent, 1}},
- {2050, {wxTreeCtrl, getPrevSibling, 1}},
- {2051, {wxTreeCtrl, getPrevVisible, 1}},
- {2052, {wxTreeCtrl, getRootItem, 0}},
- {2053, {wxTreeCtrl, getSelection, 0}},
- {2054, {wxTreeCtrl, getSelections, 1}},
- {2055, {wxTreeCtrl, getStateImageList, 0}},
- {2056, {wxTreeCtrl, hitTest, 2}},
- {2058, {wxTreeCtrl, insertItem, 4}},
- {2059, {wxTreeCtrl, isBold, 1}},
- {2060, {wxTreeCtrl, isExpanded, 1}},
- {2061, {wxTreeCtrl, isSelected, 1}},
- {2062, {wxTreeCtrl, isVisible, 1}},
- {2063, {wxTreeCtrl, itemHasChildren, 1}},
- {2064, {wxTreeCtrl, isTreeItemIdOk, 1}},
- {2065, {wxTreeCtrl, prependItem, 3}},
- {2066, {wxTreeCtrl, scrollTo, 1}},
- {2067, {wxTreeCtrl, selectItem_1, 1}},
- {2068, {wxTreeCtrl, selectItem_2, 2}},
- {2069, {wxTreeCtrl, setIndent, 1}},
- {2070, {wxTreeCtrl, setImageList, 1}},
- {2071, {wxTreeCtrl, setItemBackgroundColour, 2}},
- {2072, {wxTreeCtrl, setItemBold, 2}},
- {2073, {wxTreeCtrl, setItemData, 2}},
- {2074, {wxTreeCtrl, setItemDropHighlight, 2}},
- {2075, {wxTreeCtrl, setItemFont, 2}},
- {2076, {wxTreeCtrl, setItemHasChildren, 2}},
- {2077, {wxTreeCtrl, setItemImage_2, 2}},
- {2078, {wxTreeCtrl, setItemImage_3, 3}},
- {2079, {wxTreeCtrl, setItemText, 2}},
- {2080, {wxTreeCtrl, setItemTextColour, 2}},
- {2081, {wxTreeCtrl, setStateImageList, 1}},
- {2082, {wxTreeCtrl, setWindowStyle, 1}},
- {2083, {wxTreeCtrl, sortChildren, 1}},
- {2084, {wxTreeCtrl, toggle, 1}},
- {2085, {wxTreeCtrl, toggleItemSelection, 1}},
- {2086, {wxTreeCtrl, unselect, 0}},
- {2087, {wxTreeCtrl, unselectAll, 0}},
- {2088, {wxTreeCtrl, unselectItem, 1}},
- {2089, {wxScrollBar, new_0, 0}},
- {2090, {wxScrollBar, new_3, 3}},
- {2091, {wxScrollBar, destruct, 0}},
- {2092, {wxScrollBar, create, 3}},
- {2093, {wxScrollBar, getRange, 0}},
- {2094, {wxScrollBar, getPageSize, 0}},
- {2095, {wxScrollBar, getThumbPosition, 0}},
- {2096, {wxScrollBar, getThumbSize, 0}},
- {2097, {wxScrollBar, setThumbPosition, 1}},
- {2098, {wxScrollBar, setScrollbar, 5}},
- {2100, {wxSpinButton, new_2, 2}},
- {2101, {wxSpinButton, new_0, 0}},
- {2102, {wxSpinButton, create, 2}},
- {2103, {wxSpinButton, getMax, 0}},
- {2104, {wxSpinButton, getMin, 0}},
- {2105, {wxSpinButton, getValue, 0}},
- {2106, {wxSpinButton, setRange, 2}},
- {2107, {wxSpinButton, setValue, 1}},
- {2108, {wxSpinButton, 'Destroy', undefined}},
- {2109, {wxSpinCtrl, new_0, 0}},
- {2110, {wxSpinCtrl, new_2, 2}},
- {2112, {wxSpinCtrl, create, 2}},
- {2115, {wxSpinCtrl, setValue_1_1, 1}},
- {2116, {wxSpinCtrl, setValue_1_0, 1}},
- {2118, {wxSpinCtrl, getValue, 0}},
- {2120, {wxSpinCtrl, setRange, 2}},
- {2121, {wxSpinCtrl, setSelection, 2}},
- {2123, {wxSpinCtrl, getMin, 0}},
- {2125, {wxSpinCtrl, getMax, 0}},
- {2126, {wxSpinCtrl, 'Destroy', undefined}},
- {2127, {wxStaticText, new_0, 0}},
- {2128, {wxStaticText, new_4, 4}},
- {2129, {wxStaticText, create, 4}},
- {2130, {wxStaticText, getLabel, 0}},
- {2131, {wxStaticText, setLabel, 1}},
- {2132, {wxStaticText, wrap, 1}},
- {2133, {wxStaticText, 'Destroy', undefined}},
- {2134, {wxStaticBitmap, new_0, 0}},
- {2135, {wxStaticBitmap, new_4, 4}},
- {2136, {wxStaticBitmap, create, 4}},
- {2137, {wxStaticBitmap, getBitmap, 0}},
- {2138, {wxStaticBitmap, setBitmap, 1}},
- {2139, {wxStaticBitmap, 'Destroy', undefined}},
- {2140, {wxRadioBox, new, 7}},
- {2142, {wxRadioBox, destruct, 0}},
- {2143, {wxRadioBox, create, 7}},
- {2144, {wxRadioBox, enable_2, 2}},
- {2145, {wxRadioBox, enable_1, 1}},
- {2146, {wxRadioBox, getSelection, 0}},
- {2147, {wxRadioBox, getString, 1}},
- {2148, {wxRadioBox, setSelection, 1}},
- {2149, {wxRadioBox, show_2, 2}},
- {2150, {wxRadioBox, show_1, 1}},
- {2151, {wxRadioBox, getColumnCount, 0}},
- {2152, {wxRadioBox, getItemHelpText, 1}},
- {2153, {wxRadioBox, getItemToolTip, 1}},
- {2155, {wxRadioBox, getItemFromPoint, 1}},
- {2156, {wxRadioBox, getRowCount, 0}},
- {2157, {wxRadioBox, isItemEnabled, 1}},
- {2158, {wxRadioBox, isItemShown, 1}},
- {2159, {wxRadioBox, setItemHelpText, 2}},
- {2160, {wxRadioBox, setItemToolTip, 2}},
- {2161, {wxRadioButton, new_0, 0}},
- {2162, {wxRadioButton, new_4, 4}},
- {2163, {wxRadioButton, create, 4}},
- {2164, {wxRadioButton, getValue, 0}},
- {2165, {wxRadioButton, setValue, 1}},
- {2166, {wxRadioButton, 'Destroy', undefined}},
- {2168, {wxSlider, new_6, 6}},
- {2169, {wxSlider, new_0, 0}},
- {2170, {wxSlider, create, 6}},
- {2171, {wxSlider, getLineSize, 0}},
- {2172, {wxSlider, getMax, 0}},
- {2173, {wxSlider, getMin, 0}},
- {2174, {wxSlider, getPageSize, 0}},
- {2175, {wxSlider, getThumbLength, 0}},
- {2176, {wxSlider, getValue, 0}},
- {2177, {wxSlider, setLineSize, 1}},
- {2178, {wxSlider, setPageSize, 1}},
- {2179, {wxSlider, setRange, 2}},
- {2180, {wxSlider, setThumbLength, 1}},
- {2181, {wxSlider, setValue, 1}},
- {2182, {wxSlider, 'Destroy', undefined}},
- {2184, {wxDialog, new_4, 4}},
- {2185, {wxDialog, new_0, 0}},
- {2187, {wxDialog, destruct, 0}},
- {2188, {wxDialog, create, 4}},
- {2189, {wxDialog, createButtonSizer, 1}},
- {2190, {wxDialog, createStdDialogButtonSizer, 1}},
- {2191, {wxDialog, endModal, 1}},
- {2192, {wxDialog, getAffirmativeId, 0}},
- {2193, {wxDialog, getReturnCode, 0}},
- {2194, {wxDialog, isModal, 0}},
- {2195, {wxDialog, setAffirmativeId, 1}},
- {2196, {wxDialog, setReturnCode, 1}},
- {2197, {wxDialog, show, 1}},
- {2198, {wxDialog, showModal, 0}},
- {2199, {wxColourDialog, new_0, 0}},
- {2200, {wxColourDialog, new_2, 2}},
- {2201, {wxColourDialog, destruct, 0}},
- {2202, {wxColourDialog, create, 2}},
- {2203, {wxColourDialog, getColourData, 0}},
- {2204, {wxColourData, new_0, 0}},
- {2205, {wxColourData, new_1, 1}},
- {2206, {wxColourData, destruct, 0}},
- {2207, {wxColourData, getChooseFull, 0}},
- {2208, {wxColourData, getColour, 0}},
- {2210, {wxColourData, getCustomColour, 1}},
- {2211, {wxColourData, setChooseFull, 1}},
- {2212, {wxColourData, setColour, 1}},
- {2213, {wxColourData, setCustomColour, 2}},
- {2214, {wxPalette, new_0, 0}},
- {2215, {wxPalette, new_4, 4}},
- {2217, {wxPalette, destruct, 0}},
- {2218, {wxPalette, create, 4}},
- {2219, {wxPalette, getColoursCount, 0}},
- {2220, {wxPalette, getPixel, 3}},
- {2221, {wxPalette, getRGB, 4}},
- {2222, {wxPalette, isOk, 0}},
- {2226, {wxDirDialog, new, 2}},
- {2227, {wxDirDialog, destruct, 0}},
- {2228, {wxDirDialog, getPath, 0}},
- {2229, {wxDirDialog, getMessage, 0}},
- {2230, {wxDirDialog, setMessage, 1}},
- {2231, {wxDirDialog, setPath, 1}},
- {2235, {wxFileDialog, new, 2}},
- {2236, {wxFileDialog, destruct, 0}},
- {2237, {wxFileDialog, getDirectory, 0}},
- {2238, {wxFileDialog, getFilename, 0}},
- {2239, {wxFileDialog, getFilenames, 1}},
- {2240, {wxFileDialog, getFilterIndex, 0}},
- {2241, {wxFileDialog, getMessage, 0}},
- {2242, {wxFileDialog, getPath, 0}},
- {2243, {wxFileDialog, getPaths, 1}},
- {2244, {wxFileDialog, getWildcard, 0}},
- {2245, {wxFileDialog, setDirectory, 1}},
- {2246, {wxFileDialog, setFilename, 1}},
- {2247, {wxFileDialog, setFilterIndex, 1}},
- {2248, {wxFileDialog, setMessage, 1}},
- {2249, {wxFileDialog, setPath, 1}},
- {2250, {wxFileDialog, setWildcard, 1}},
- {2251, {wxPickerBase, setInternalMargin, 1}},
- {2252, {wxPickerBase, getInternalMargin, 0}},
- {2253, {wxPickerBase, setTextCtrlProportion, 1}},
- {2254, {wxPickerBase, setPickerCtrlProportion, 1}},
- {2255, {wxPickerBase, getTextCtrlProportion, 0}},
- {2256, {wxPickerBase, getPickerCtrlProportion, 0}},
- {2257, {wxPickerBase, hasTextCtrl, 0}},
- {2258, {wxPickerBase, getTextCtrl, 0}},
- {2259, {wxPickerBase, isTextCtrlGrowable, 0}},
- {2260, {wxPickerBase, setPickerCtrlGrowable, 1}},
- {2261, {wxPickerBase, setTextCtrlGrowable, 1}},
- {2262, {wxPickerBase, isPickerCtrlGrowable, 0}},
- {2263, {wxFilePickerCtrl, new_0, 0}},
- {2264, {wxFilePickerCtrl, new_3, 3}},
- {2265, {wxFilePickerCtrl, create, 3}},
- {2266, {wxFilePickerCtrl, getPath, 0}},
- {2267, {wxFilePickerCtrl, setPath, 1}},
- {2268, {wxFilePickerCtrl, 'Destroy', undefined}},
- {2269, {wxDirPickerCtrl, new_0, 0}},
- {2270, {wxDirPickerCtrl, new_3, 3}},
- {2271, {wxDirPickerCtrl, create, 3}},
- {2272, {wxDirPickerCtrl, getPath, 0}},
- {2273, {wxDirPickerCtrl, setPath, 1}},
- {2274, {wxDirPickerCtrl, 'Destroy', undefined}},
- {2275, {wxColourPickerCtrl, new_0, 0}},
- {2276, {wxColourPickerCtrl, new_3, 3}},
- {2277, {wxColourPickerCtrl, create, 3}},
- {2278, {wxColourPickerCtrl, getColour, 0}},
- {2279, {wxColourPickerCtrl, setColour_1_1, 1}},
- {2280, {wxColourPickerCtrl, setColour_1_0, 1}},
- {2281, {wxColourPickerCtrl, 'Destroy', undefined}},
- {2282, {wxDatePickerCtrl, new_0, 0}},
- {2283, {wxDatePickerCtrl, new_3, 3}},
- {2284, {wxDatePickerCtrl, getRange, 2}},
- {2285, {wxDatePickerCtrl, getValue, 0}},
- {2286, {wxDatePickerCtrl, setRange, 2}},
- {2287, {wxDatePickerCtrl, setValue, 1}},
- {2288, {wxDatePickerCtrl, 'Destroy', undefined}},
- {2289, {wxFontPickerCtrl, new_0, 0}},
- {2290, {wxFontPickerCtrl, new_3, 3}},
- {2291, {wxFontPickerCtrl, create, 3}},
- {2292, {wxFontPickerCtrl, getSelectedFont, 0}},
- {2293, {wxFontPickerCtrl, setSelectedFont, 1}},
- {2294, {wxFontPickerCtrl, getMaxPointSize, 0}},
- {2295, {wxFontPickerCtrl, setMaxPointSize, 1}},
- {2296, {wxFontPickerCtrl, 'Destroy', undefined}},
- {2299, {wxFindReplaceDialog, new_0, 0}},
- {2300, {wxFindReplaceDialog, new_4, 4}},
- {2301, {wxFindReplaceDialog, destruct, 0}},
- {2302, {wxFindReplaceDialog, create, 4}},
- {2303, {wxFindReplaceDialog, getData, 0}},
- {2304, {wxFindReplaceData, new_0, 0}},
- {2305, {wxFindReplaceData, new_1, 1}},
- {2306, {wxFindReplaceData, getFindString, 0}},
- {2307, {wxFindReplaceData, getReplaceString, 0}},
- {2308, {wxFindReplaceData, getFlags, 0}},
- {2309, {wxFindReplaceData, setFlags, 1}},
- {2310, {wxFindReplaceData, setFindString, 1}},
- {2311, {wxFindReplaceData, setReplaceString, 1}},
- {2312, {wxFindReplaceData, 'Destroy', undefined}},
- {2313, {wxMultiChoiceDialog, new_0, 0}},
- {2315, {wxMultiChoiceDialog, new_5, 5}},
- {2316, {wxMultiChoiceDialog, getSelections, 0}},
- {2317, {wxMultiChoiceDialog, setSelections, 1}},
- {2318, {wxMultiChoiceDialog, 'Destroy', undefined}},
- {2319, {wxSingleChoiceDialog, new_0, 0}},
- {2321, {wxSingleChoiceDialog, new_5, 5}},
- {2322, {wxSingleChoiceDialog, getSelection, 0}},
- {2323, {wxSingleChoiceDialog, getStringSelection, 0}},
- {2324, {wxSingleChoiceDialog, setSelection, 1}},
- {2325, {wxSingleChoiceDialog, 'Destroy', undefined}},
- {2326, {wxTextEntryDialog, new, 3}},
- {2327, {wxTextEntryDialog, getValue, 0}},
- {2328, {wxTextEntryDialog, setValue, 1}},
- {2329, {wxTextEntryDialog, 'Destroy', undefined}},
- {2330, {wxPasswordEntryDialog, new, 3}},
- {2331, {wxPasswordEntryDialog, 'Destroy', undefined}},
- {2332, {wxFontData, new_0, 0}},
- {2333, {wxFontData, new_1, 1}},
- {2334, {wxFontData, destruct, 0}},
- {2335, {wxFontData, enableEffects, 1}},
- {2336, {wxFontData, getAllowSymbols, 0}},
- {2337, {wxFontData, getColour, 0}},
- {2338, {wxFontData, getChosenFont, 0}},
- {2339, {wxFontData, getEnableEffects, 0}},
- {2340, {wxFontData, getInitialFont, 0}},
- {2341, {wxFontData, getShowHelp, 0}},
- {2342, {wxFontData, setAllowSymbols, 1}},
- {2343, {wxFontData, setChosenFont, 1}},
- {2344, {wxFontData, setColour, 1}},
- {2345, {wxFontData, setInitialFont, 1}},
- {2346, {wxFontData, setRange, 2}},
- {2347, {wxFontData, setShowHelp, 1}},
- {2351, {wxFontDialog, new_0, 0}},
- {2353, {wxFontDialog, new_2, 2}},
- {2355, {wxFontDialog, create, 2}},
- {2356, {wxFontDialog, getFontData, 0}},
- {2358, {wxFontDialog, 'Destroy', undefined}},
- {2359, {wxProgressDialog, new, 3}},
- {2360, {wxProgressDialog, destruct, 0}},
- {2361, {wxProgressDialog, resume, 0}},
- {2362, {wxProgressDialog, update_2, 2}},
- {2363, {wxProgressDialog, update_0, 0}},
- {2364, {wxMessageDialog, new, 3}},
- {2365, {wxMessageDialog, destruct, 0}},
- {2366, {wxPageSetupDialog, new, 2}},
- {2367, {wxPageSetupDialog, destruct, 0}},
- {2368, {wxPageSetupDialog, getPageSetupData, 0}},
- {2369, {wxPageSetupDialog, showModal, 0}},
- {2370, {wxPageSetupDialogData, new_0, 0}},
- {2371, {wxPageSetupDialogData, new_1_0, 1}},
- {2372, {wxPageSetupDialogData, new_1_1, 1}},
- {2373, {wxPageSetupDialogData, destruct, 0}},
- {2374, {wxPageSetupDialogData, enableHelp, 1}},
- {2375, {wxPageSetupDialogData, enableMargins, 1}},
- {2376, {wxPageSetupDialogData, enableOrientation, 1}},
- {2377, {wxPageSetupDialogData, enablePaper, 1}},
- {2378, {wxPageSetupDialogData, enablePrinter, 1}},
- {2379, {wxPageSetupDialogData, getDefaultMinMargins, 0}},
- {2380, {wxPageSetupDialogData, getEnableMargins, 0}},
- {2381, {wxPageSetupDialogData, getEnableOrientation, 0}},
- {2382, {wxPageSetupDialogData, getEnablePaper, 0}},
- {2383, {wxPageSetupDialogData, getEnablePrinter, 0}},
- {2384, {wxPageSetupDialogData, getEnableHelp, 0}},
- {2385, {wxPageSetupDialogData, getDefaultInfo, 0}},
- {2386, {wxPageSetupDialogData, getMarginTopLeft, 0}},
- {2387, {wxPageSetupDialogData, getMarginBottomRight, 0}},
- {2388, {wxPageSetupDialogData, getMinMarginTopLeft, 0}},
- {2389, {wxPageSetupDialogData, getMinMarginBottomRight, 0}},
- {2390, {wxPageSetupDialogData, getPaperId, 0}},
- {2391, {wxPageSetupDialogData, getPaperSize, 0}},
- {2393, {wxPageSetupDialogData, getPrintData, 0}},
- {2394, {wxPageSetupDialogData, isOk, 0}},
- {2395, {wxPageSetupDialogData, setDefaultInfo, 1}},
- {2396, {wxPageSetupDialogData, setDefaultMinMargins, 1}},
- {2397, {wxPageSetupDialogData, setMarginTopLeft, 1}},
- {2398, {wxPageSetupDialogData, setMarginBottomRight, 1}},
- {2399, {wxPageSetupDialogData, setMinMarginTopLeft, 1}},
- {2400, {wxPageSetupDialogData, setMinMarginBottomRight, 1}},
- {2401, {wxPageSetupDialogData, setPaperId, 1}},
- {2402, {wxPageSetupDialogData, setPaperSize_1_1, 1}},
- {2403, {wxPageSetupDialogData, setPaperSize_1_0, 1}},
- {2404, {wxPageSetupDialogData, setPrintData, 1}},
- {2405, {wxPrintDialog, new_2_0, 2}},
- {2406, {wxPrintDialog, new_2_1, 2}},
- {2407, {wxPrintDialog, destruct, 0}},
- {2408, {wxPrintDialog, getPrintDialogData, 0}},
- {2409, {wxPrintDialog, getPrintDC, 0}},
- {2410, {wxPrintDialogData, new_0, 0}},
- {2411, {wxPrintDialogData, new_1_1, 1}},
- {2412, {wxPrintDialogData, new_1_0, 1}},
- {2413, {wxPrintDialogData, destruct, 0}},
- {2414, {wxPrintDialogData, enableHelp, 1}},
- {2415, {wxPrintDialogData, enablePageNumbers, 1}},
- {2416, {wxPrintDialogData, enablePrintToFile, 1}},
- {2417, {wxPrintDialogData, enableSelection, 1}},
- {2418, {wxPrintDialogData, getAllPages, 0}},
- {2419, {wxPrintDialogData, getCollate, 0}},
- {2420, {wxPrintDialogData, getFromPage, 0}},
- {2421, {wxPrintDialogData, getMaxPage, 0}},
- {2422, {wxPrintDialogData, getMinPage, 0}},
- {2423, {wxPrintDialogData, getNoCopies, 0}},
- {2424, {wxPrintDialogData, getPrintData, 0}},
- {2425, {wxPrintDialogData, getPrintToFile, 0}},
- {2426, {wxPrintDialogData, getSelection, 0}},
- {2427, {wxPrintDialogData, getToPage, 0}},
- {2428, {wxPrintDialogData, isOk, 0}},
- {2429, {wxPrintDialogData, setCollate, 1}},
- {2430, {wxPrintDialogData, setFromPage, 1}},
- {2431, {wxPrintDialogData, setMaxPage, 1}},
- {2432, {wxPrintDialogData, setMinPage, 1}},
- {2433, {wxPrintDialogData, setNoCopies, 1}},
- {2434, {wxPrintDialogData, setPrintData, 1}},
- {2435, {wxPrintDialogData, setPrintToFile, 1}},
- {2436, {wxPrintDialogData, setSelection, 1}},
- {2437, {wxPrintDialogData, setToPage, 1}},
- {2438, {wxPrintData, new_0, 0}},
- {2439, {wxPrintData, new_1, 1}},
- {2440, {wxPrintData, destruct, 0}},
- {2441, {wxPrintData, getCollate, 0}},
- {2442, {wxPrintData, getBin, 0}},
- {2443, {wxPrintData, getColour, 0}},
- {2444, {wxPrintData, getDuplex, 0}},
- {2445, {wxPrintData, getNoCopies, 0}},
- {2446, {wxPrintData, getOrientation, 0}},
- {2447, {wxPrintData, getPaperId, 0}},
- {2448, {wxPrintData, getPrinterName, 0}},
- {2449, {wxPrintData, getQuality, 0}},
- {2450, {wxPrintData, isOk, 0}},
- {2451, {wxPrintData, setBin, 1}},
- {2452, {wxPrintData, setCollate, 1}},
- {2453, {wxPrintData, setColour, 1}},
- {2454, {wxPrintData, setDuplex, 1}},
- {2455, {wxPrintData, setNoCopies, 1}},
- {2456, {wxPrintData, setOrientation, 1}},
- {2457, {wxPrintData, setPaperId, 1}},
- {2458, {wxPrintData, setPrinterName, 1}},
- {2459, {wxPrintData, setQuality, 1}},
- {2462, {wxPrintPreview, new_2, 2}},
- {2463, {wxPrintPreview, new_3, 3}},
- {2465, {wxPrintPreview, destruct, 0}},
- {2466, {wxPrintPreview, getCanvas, 0}},
- {2467, {wxPrintPreview, getCurrentPage, 0}},
- {2468, {wxPrintPreview, getFrame, 0}},
- {2469, {wxPrintPreview, getMaxPage, 0}},
- {2470, {wxPrintPreview, getMinPage, 0}},
- {2471, {wxPrintPreview, getPrintout, 0}},
- {2472, {wxPrintPreview, getPrintoutForPrinting, 0}},
- {2473, {wxPrintPreview, isOk, 0}},
- {2474, {wxPrintPreview, paintPage, 2}},
- {2475, {wxPrintPreview, print, 1}},
- {2476, {wxPrintPreview, renderPage, 1}},
- {2477, {wxPrintPreview, setCanvas, 1}},
- {2478, {wxPrintPreview, setCurrentPage, 1}},
- {2479, {wxPrintPreview, setFrame, 1}},
- {2480, {wxPrintPreview, setPrintout, 1}},
- {2481, {wxPrintPreview, setZoom, 1}},
- {2482, {wxPreviewFrame, new, 3}},
- {2483, {wxPreviewFrame, destruct, 0}},
- {2484, {wxPreviewFrame, createControlBar, 0}},
- {2485, {wxPreviewFrame, createCanvas, 0}},
- {2486, {wxPreviewFrame, initialize, 0}},
- {2487, {wxPreviewFrame, onCloseWindow, 1}},
- {2488, {wxPreviewControlBar, new, 4}},
- {2489, {wxPreviewControlBar, destruct, 0}},
- {2490, {wxPreviewControlBar, createButtons, 0}},
- {2491, {wxPreviewControlBar, getPrintPreview, 0}},
- {2492, {wxPreviewControlBar, getZoomControl, 0}},
- {2493, {wxPreviewControlBar, setZoomControl, 1}},
- {2495, {wxPrinter, new, 1}},
- {2496, {wxPrinter, createAbortWindow, 2}},
- {2497, {wxPrinter, getAbort, 0}},
- {2498, {wxPrinter, getLastError, 0}},
- {2499, {wxPrinter, getPrintDialogData, 0}},
- {2500, {wxPrinter, print, 3}},
- {2501, {wxPrinter, printDialog, 1}},
- {2502, {wxPrinter, reportError, 3}},
- {2503, {wxPrinter, setup, 1}},
- {2504, {wxPrinter, 'Destroy', undefined}},
- {2505, {wxXmlResource, new_1, 1}},
- {2506, {wxXmlResource, new_2, 2}},
- {2507, {wxXmlResource, destruct, 0}},
- {2508, {wxXmlResource, attachUnknownControl, 3}},
- {2509, {wxXmlResource, clearHandlers, 0}},
- {2510, {wxXmlResource, compareVersion, 4}},
- {2511, {wxXmlResource, get, 0}},
- {2512, {wxXmlResource, getFlags, 0}},
- {2513, {wxXmlResource, getVersion, 0}},
- {2514, {wxXmlResource, getXRCID, 2}},
- {2515, {wxXmlResource, initAllHandlers, 0}},
- {2516, {wxXmlResource, load, 1}},
- {2517, {wxXmlResource, loadBitmap, 1}},
- {2518, {wxXmlResource, loadDialog_2, 2}},
- {2519, {wxXmlResource, loadDialog_3, 3}},
- {2520, {wxXmlResource, loadFrame_2, 2}},
- {2521, {wxXmlResource, loadFrame_3, 3}},
- {2522, {wxXmlResource, loadIcon, 1}},
- {2523, {wxXmlResource, loadMenu, 1}},
- {2524, {wxXmlResource, loadMenuBar_2, 2}},
- {2525, {wxXmlResource, loadMenuBar_1, 1}},
- {2526, {wxXmlResource, loadPanel_2, 2}},
- {2527, {wxXmlResource, loadPanel_3, 3}},
- {2528, {wxXmlResource, loadToolBar, 2}},
- {2529, {wxXmlResource, set, 1}},
- {2530, {wxXmlResource, setFlags, 1}},
- {2531, {wxXmlResource, unload, 1}},
- {2532, {wxXmlResource, xrcctrl, 3}},
- {2533, {wxHtmlEasyPrinting, new, 1}},
- {2534, {wxHtmlEasyPrinting, destruct, 0}},
- {2535, {wxHtmlEasyPrinting, getPrintData, 0}},
- {2536, {wxHtmlEasyPrinting, getPageSetupData, 0}},
- {2537, {wxHtmlEasyPrinting, previewFile, 1}},
- {2538, {wxHtmlEasyPrinting, previewText, 2}},
- {2539, {wxHtmlEasyPrinting, printFile, 1}},
- {2540, {wxHtmlEasyPrinting, printText, 2}},
- {2541, {wxHtmlEasyPrinting, pageSetup, 0}},
- {2542, {wxHtmlEasyPrinting, setFonts, 3}},
- {2543, {wxHtmlEasyPrinting, setHeader, 2}},
- {2544, {wxHtmlEasyPrinting, setFooter, 2}},
- {2546, {wxGLCanvas, new_2, 2}},
- {2547, {wxGLCanvas, new_3_1, 3}},
- {2548, {wxGLCanvas, new_3_0, 3}},
- {2549, {wxGLCanvas, getContext, 0}},
- {2551, {wxGLCanvas, setCurrent, 0}},
- {2552, {wxGLCanvas, swapBuffers, 0}},
- {2553, {wxGLCanvas, 'Destroy', undefined}},
- {2554, {wxAuiManager, new, 1}},
- {2555, {wxAuiManager, destruct, 0}},
- {2556, {wxAuiManager, addPane_2_1, 2}},
- {2557, {wxAuiManager, addPane_3, 3}},
- {2558, {wxAuiManager, addPane_2_0, 2}},
- {2559, {wxAuiManager, detachPane, 1}},
- {2560, {wxAuiManager, getAllPanes, 0}},
- {2561, {wxAuiManager, getArtProvider, 0}},
- {2562, {wxAuiManager, getDockSizeConstraint, 2}},
- {2563, {wxAuiManager, getFlags, 0}},
- {2564, {wxAuiManager, getManagedWindow, 0}},
- {2565, {wxAuiManager, getManager, 1}},
- {2566, {wxAuiManager, getPane_1_1, 1}},
- {2567, {wxAuiManager, getPane_1_0, 1}},
- {2568, {wxAuiManager, hideHint, 0}},
- {2569, {wxAuiManager, insertPane, 3}},
- {2570, {wxAuiManager, loadPaneInfo, 2}},
- {2571, {wxAuiManager, loadPerspective, 2}},
- {2572, {wxAuiManager, savePaneInfo, 1}},
- {2573, {wxAuiManager, savePerspective, 0}},
- {2574, {wxAuiManager, setArtProvider, 1}},
- {2575, {wxAuiManager, setDockSizeConstraint, 2}},
- {2576, {wxAuiManager, setFlags, 1}},
- {2577, {wxAuiManager, setManagedWindow, 1}},
- {2578, {wxAuiManager, showHint, 1}},
- {2579, {wxAuiManager, unInit, 0}},
- {2580, {wxAuiManager, update, 0}},
- {2581, {wxAuiPaneInfo, new_0, 0}},
- {2582, {wxAuiPaneInfo, new_1, 1}},
- {2583, {wxAuiPaneInfo, destruct, 0}},
- {2584, {wxAuiPaneInfo, bestSize_1, 1}},
- {2585, {wxAuiPaneInfo, bestSize_2, 2}},
- {2586, {wxAuiPaneInfo, bottom, 0}},
- {2587, {wxAuiPaneInfo, bottomDockable, 1}},
- {2588, {wxAuiPaneInfo, caption, 1}},
- {2589, {wxAuiPaneInfo, captionVisible, 1}},
- {2590, {wxAuiPaneInfo, centre, 0}},
- {2591, {wxAuiPaneInfo, centrePane, 0}},
- {2592, {wxAuiPaneInfo, closeButton, 1}},
- {2593, {wxAuiPaneInfo, defaultPane, 0}},
- {2594, {wxAuiPaneInfo, destroyOnClose, 1}},
- {2595, {wxAuiPaneInfo, direction, 1}},
- {2596, {wxAuiPaneInfo, dock, 0}},
- {2597, {wxAuiPaneInfo, dockable, 1}},
- {2598, {wxAuiPaneInfo, fixed, 0}},
- {2599, {wxAuiPaneInfo, float, 0}},
- {2600, {wxAuiPaneInfo, floatable, 1}},
- {2601, {wxAuiPaneInfo, floatingPosition_1, 1}},
- {2602, {wxAuiPaneInfo, floatingPosition_2, 2}},
- {2603, {wxAuiPaneInfo, floatingSize_1, 1}},
- {2604, {wxAuiPaneInfo, floatingSize_2, 2}},
- {2605, {wxAuiPaneInfo, gripper, 1}},
- {2606, {wxAuiPaneInfo, gripperTop, 1}},
- {2607, {wxAuiPaneInfo, hasBorder, 0}},
- {2608, {wxAuiPaneInfo, hasCaption, 0}},
- {2609, {wxAuiPaneInfo, hasCloseButton, 0}},
- {2610, {wxAuiPaneInfo, hasFlag, 1}},
- {2611, {wxAuiPaneInfo, hasGripper, 0}},
- {2612, {wxAuiPaneInfo, hasGripperTop, 0}},
- {2613, {wxAuiPaneInfo, hasMaximizeButton, 0}},
- {2614, {wxAuiPaneInfo, hasMinimizeButton, 0}},
- {2615, {wxAuiPaneInfo, hasPinButton, 0}},
- {2616, {wxAuiPaneInfo, hide, 0}},
- {2617, {wxAuiPaneInfo, isBottomDockable, 0}},
- {2618, {wxAuiPaneInfo, isDocked, 0}},
- {2619, {wxAuiPaneInfo, isFixed, 0}},
- {2620, {wxAuiPaneInfo, isFloatable, 0}},
- {2621, {wxAuiPaneInfo, isFloating, 0}},
- {2622, {wxAuiPaneInfo, isLeftDockable, 0}},
- {2623, {wxAuiPaneInfo, isMovable, 0}},
- {2624, {wxAuiPaneInfo, isOk, 0}},
- {2625, {wxAuiPaneInfo, isResizable, 0}},
- {2626, {wxAuiPaneInfo, isRightDockable, 0}},
- {2627, {wxAuiPaneInfo, isShown, 0}},
- {2628, {wxAuiPaneInfo, isToolbar, 0}},
- {2629, {wxAuiPaneInfo, isTopDockable, 0}},
- {2630, {wxAuiPaneInfo, layer, 1}},
- {2631, {wxAuiPaneInfo, left, 0}},
- {2632, {wxAuiPaneInfo, leftDockable, 1}},
- {2633, {wxAuiPaneInfo, maxSize_1, 1}},
- {2634, {wxAuiPaneInfo, maxSize_2, 2}},
- {2635, {wxAuiPaneInfo, maximizeButton, 1}},
- {2636, {wxAuiPaneInfo, minSize_1, 1}},
- {2637, {wxAuiPaneInfo, minSize_2, 2}},
- {2638, {wxAuiPaneInfo, minimizeButton, 1}},
- {2639, {wxAuiPaneInfo, movable, 1}},
- {2640, {wxAuiPaneInfo, name, 1}},
- {2641, {wxAuiPaneInfo, paneBorder, 1}},
- {2642, {wxAuiPaneInfo, pinButton, 1}},
- {2643, {wxAuiPaneInfo, position, 1}},
- {2644, {wxAuiPaneInfo, resizable, 1}},
- {2645, {wxAuiPaneInfo, right, 0}},
- {2646, {wxAuiPaneInfo, rightDockable, 1}},
- {2647, {wxAuiPaneInfo, row, 1}},
- {2648, {wxAuiPaneInfo, safeSet, 1}},
- {2649, {wxAuiPaneInfo, setFlag, 2}},
- {2650, {wxAuiPaneInfo, show, 1}},
- {2651, {wxAuiPaneInfo, toolbarPane, 0}},
- {2652, {wxAuiPaneInfo, top, 0}},
- {2653, {wxAuiPaneInfo, topDockable, 1}},
- {2654, {wxAuiPaneInfo, window, 1}},
- {2655, {wxAuiPaneInfo, getWindow, 0}},
- {2656, {wxAuiPaneInfo, getFrame, 0}},
- {2657, {wxAuiPaneInfo, getDirection, 0}},
- {2658, {wxAuiPaneInfo, getLayer, 0}},
- {2659, {wxAuiPaneInfo, getRow, 0}},
- {2660, {wxAuiPaneInfo, getPosition, 0}},
- {2661, {wxAuiPaneInfo, getFloatingPosition, 0}},
- {2662, {wxAuiPaneInfo, getFloatingSize, 0}},
- {2663, {wxAuiNotebook, new_0, 0}},
- {2664, {wxAuiNotebook, new_2, 2}},
- {2665, {wxAuiNotebook, addPage, 3}},
- {2666, {wxAuiNotebook, create, 2}},
- {2667, {wxAuiNotebook, deletePage, 1}},
- {2668, {wxAuiNotebook, getArtProvider, 0}},
- {2669, {wxAuiNotebook, getPage, 1}},
- {2670, {wxAuiNotebook, getPageBitmap, 1}},
- {2671, {wxAuiNotebook, getPageCount, 0}},
- {2672, {wxAuiNotebook, getPageIndex, 1}},
- {2673, {wxAuiNotebook, getPageText, 1}},
- {2674, {wxAuiNotebook, getSelection, 0}},
- {2675, {wxAuiNotebook, insertPage, 4}},
- {2676, {wxAuiNotebook, removePage, 1}},
- {2677, {wxAuiNotebook, setArtProvider, 1}},
- {2678, {wxAuiNotebook, setFont, 1}},
- {2679, {wxAuiNotebook, setPageBitmap, 2}},
- {2680, {wxAuiNotebook, setPageText, 2}},
- {2681, {wxAuiNotebook, setSelection, 1}},
- {2682, {wxAuiNotebook, setTabCtrlHeight, 1}},
- {2683, {wxAuiNotebook, setUniformBitmapSize, 1}},
- {2684, {wxAuiNotebook, 'Destroy', undefined}},
- {2685, {wxAuiTabArt, setFlags, 1}},
- {2686, {wxAuiTabArt, setMeasuringFont, 1}},
- {2687, {wxAuiTabArt, setNormalFont, 1}},
- {2688, {wxAuiTabArt, setSelectedFont, 1}},
- {2689, {wxAuiTabArt, setColour, 1}},
- {2690, {wxAuiTabArt, setActiveColour, 1}},
- {2691, {wxAuiDockArt, getColour, 1}},
- {2692, {wxAuiDockArt, getFont, 1}},
- {2693, {wxAuiDockArt, getMetric, 1}},
- {2694, {wxAuiDockArt, setColour, 2}},
- {2695, {wxAuiDockArt, setFont, 2}},
- {2696, {wxAuiDockArt, setMetric, 2}},
- {2697, {wxAuiSimpleTabArt, new, 0}},
- {2698, {wxAuiSimpleTabArt, 'Destroy', undefined}},
- {2699, {wxMDIParentFrame, new_0, 0}},
- {2700, {wxMDIParentFrame, new_4, 4}},
- {2701, {wxMDIParentFrame, destruct, 0}},
- {2702, {wxMDIParentFrame, activateNext, 0}},
- {2703, {wxMDIParentFrame, activatePrevious, 0}},
- {2704, {wxMDIParentFrame, arrangeIcons, 0}},
- {2705, {wxMDIParentFrame, cascade, 0}},
- {2706, {wxMDIParentFrame, create, 4}},
- {2707, {wxMDIParentFrame, getActiveChild, 0}},
- {2708, {wxMDIParentFrame, getClientWindow, 0}},
- {2709, {wxMDIParentFrame, tile, 1}},
- {2710, {wxMDIChildFrame, new_0, 0}},
- {2711, {wxMDIChildFrame, new_4, 4}},
- {2712, {wxMDIChildFrame, destruct, 0}},
- {2713, {wxMDIChildFrame, activate, 0}},
- {2714, {wxMDIChildFrame, create, 4}},
- {2715, {wxMDIChildFrame, maximize, 1}},
- {2716, {wxMDIChildFrame, restore, 0}},
- {2717, {wxMDIClientWindow, new_0, 0}},
- {2718, {wxMDIClientWindow, new_2, 2}},
- {2719, {wxMDIClientWindow, destruct, 0}},
- {2720, {wxMDIClientWindow, createClient, 2}},
- {2721, {wxLayoutAlgorithm, new, 0}},
- {2722, {wxLayoutAlgorithm, layoutFrame, 2}},
- {2723, {wxLayoutAlgorithm, layoutMDIFrame, 2}},
- {2724, {wxLayoutAlgorithm, layoutWindow, 2}},
- {2725, {wxLayoutAlgorithm, 'Destroy', undefined}},
- {2726, {wxEvent, getId, 0}},
- {2727, {wxEvent, getSkipped, 0}},
- {2728, {wxEvent, getTimestamp, 0}},
- {2729, {wxEvent, isCommandEvent, 0}},
- {2730, {wxEvent, resumePropagation, 1}},
- {2731, {wxEvent, shouldPropagate, 0}},
- {2732, {wxEvent, skip, 1}},
- {2733, {wxEvent, stopPropagation, 0}},
- {2734, {wxCommandEvent, getClientData, 0}},
- {2735, {wxCommandEvent, getExtraLong, 0}},
- {2736, {wxCommandEvent, getInt, 0}},
- {2737, {wxCommandEvent, getSelection, 0}},
- {2738, {wxCommandEvent, getString, 0}},
- {2739, {wxCommandEvent, isChecked, 0}},
- {2740, {wxCommandEvent, isSelection, 0}},
- {2741, {wxCommandEvent, setInt, 1}},
- {2742, {wxCommandEvent, setString, 1}},
- {2743, {wxScrollEvent, getOrientation, 0}},
- {2744, {wxScrollEvent, getPosition, 0}},
- {2745, {wxScrollWinEvent, getOrientation, 0}},
- {2746, {wxScrollWinEvent, getPosition, 0}},
- {2747, {wxMouseEvent, altDown, 0}},
- {2748, {wxMouseEvent, button, 1}},
- {2749, {wxMouseEvent, buttonDClick, 1}},
- {2750, {wxMouseEvent, buttonDown, 1}},
- {2751, {wxMouseEvent, buttonUp, 1}},
- {2752, {wxMouseEvent, cmdDown, 0}},
- {2753, {wxMouseEvent, controlDown, 0}},
- {2754, {wxMouseEvent, dragging, 0}},
- {2755, {wxMouseEvent, entering, 0}},
- {2756, {wxMouseEvent, getButton, 0}},
- {2759, {wxMouseEvent, getPosition, 0}},
- {2760, {wxMouseEvent, getLogicalPosition, 1}},
- {2761, {wxMouseEvent, getLinesPerAction, 0}},
- {2762, {wxMouseEvent, getWheelRotation, 0}},
- {2763, {wxMouseEvent, getWheelDelta, 0}},
- {2764, {wxMouseEvent, getX, 0}},
- {2765, {wxMouseEvent, getY, 0}},
- {2766, {wxMouseEvent, isButton, 0}},
- {2767, {wxMouseEvent, isPageScroll, 0}},
- {2768, {wxMouseEvent, leaving, 0}},
- {2769, {wxMouseEvent, leftDClick, 0}},
- {2770, {wxMouseEvent, leftDown, 0}},
- {2771, {wxMouseEvent, leftIsDown, 0}},
- {2772, {wxMouseEvent, leftUp, 0}},
- {2773, {wxMouseEvent, metaDown, 0}},
- {2774, {wxMouseEvent, middleDClick, 0}},
- {2775, {wxMouseEvent, middleDown, 0}},
- {2776, {wxMouseEvent, middleIsDown, 0}},
- {2777, {wxMouseEvent, middleUp, 0}},
- {2778, {wxMouseEvent, moving, 0}},
- {2779, {wxMouseEvent, rightDClick, 0}},
- {2780, {wxMouseEvent, rightDown, 0}},
- {2781, {wxMouseEvent, rightIsDown, 0}},
- {2782, {wxMouseEvent, rightUp, 0}},
- {2783, {wxMouseEvent, shiftDown, 0}},
- {2784, {wxSetCursorEvent, getCursor, 0}},
- {2785, {wxSetCursorEvent, getX, 0}},
- {2786, {wxSetCursorEvent, getY, 0}},
- {2787, {wxSetCursorEvent, hasCursor, 0}},
- {2788, {wxSetCursorEvent, setCursor, 1}},
- {2789, {wxKeyEvent, altDown, 0}},
- {2790, {wxKeyEvent, cmdDown, 0}},
- {2791, {wxKeyEvent, controlDown, 0}},
- {2792, {wxKeyEvent, getKeyCode, 0}},
- {2793, {wxKeyEvent, getModifiers, 0}},
- {2796, {wxKeyEvent, getPosition, 0}},
- {2797, {wxKeyEvent, getRawKeyCode, 0}},
- {2798, {wxKeyEvent, getRawKeyFlags, 0}},
- {2799, {wxKeyEvent, getUnicodeKey, 0}},
- {2800, {wxKeyEvent, getX, 0}},
- {2801, {wxKeyEvent, getY, 0}},
- {2802, {wxKeyEvent, hasModifiers, 0}},
- {2803, {wxKeyEvent, metaDown, 0}},
- {2804, {wxKeyEvent, shiftDown, 0}},
- {2805, {wxSizeEvent, getSize, 0}},
- {2806, {wxMoveEvent, getPosition, 0}},
- {2807, {wxEraseEvent, getDC, 0}},
- {2808, {wxFocusEvent, getWindow, 0}},
- {2809, {wxChildFocusEvent, getWindow, 0}},
- {2810, {wxMenuEvent, getMenu, 0}},
- {2811, {wxMenuEvent, getMenuId, 0}},
- {2812, {wxMenuEvent, isPopup, 0}},
- {2813, {wxCloseEvent, canVeto, 0}},
- {2814, {wxCloseEvent, getLoggingOff, 0}},
- {2815, {wxCloseEvent, setCanVeto, 1}},
- {2816, {wxCloseEvent, setLoggingOff, 1}},
- {2817, {wxCloseEvent, veto, 1}},
- {2818, {wxShowEvent, setShow, 1}},
- {2819, {wxShowEvent, getShow, 0}},
- {2820, {wxIconizeEvent, iconized, 0}},
- {2821, {wxJoystickEvent, buttonDown, 1}},
- {2822, {wxJoystickEvent, buttonIsDown, 1}},
- {2823, {wxJoystickEvent, buttonUp, 1}},
- {2824, {wxJoystickEvent, getButtonChange, 0}},
- {2825, {wxJoystickEvent, getButtonState, 0}},
- {2826, {wxJoystickEvent, getJoystick, 0}},
- {2827, {wxJoystickEvent, getPosition, 0}},
- {2828, {wxJoystickEvent, getZPosition, 0}},
- {2829, {wxJoystickEvent, isButton, 0}},
- {2830, {wxJoystickEvent, isMove, 0}},
- {2831, {wxJoystickEvent, isZMove, 0}},
- {2832, {wxUpdateUIEvent, canUpdate, 1}},
- {2833, {wxUpdateUIEvent, check, 1}},
- {2834, {wxUpdateUIEvent, enable, 1}},
- {2835, {wxUpdateUIEvent, show, 1}},
- {2836, {wxUpdateUIEvent, getChecked, 0}},
- {2837, {wxUpdateUIEvent, getEnabled, 0}},
- {2838, {wxUpdateUIEvent, getShown, 0}},
- {2839, {wxUpdateUIEvent, getSetChecked, 0}},
- {2840, {wxUpdateUIEvent, getSetEnabled, 0}},
- {2841, {wxUpdateUIEvent, getSetShown, 0}},
- {2842, {wxUpdateUIEvent, getSetText, 0}},
- {2843, {wxUpdateUIEvent, getText, 0}},
- {2844, {wxUpdateUIEvent, getMode, 0}},
- {2845, {wxUpdateUIEvent, getUpdateInterval, 0}},
- {2846, {wxUpdateUIEvent, resetUpdateTime, 0}},
- {2847, {wxUpdateUIEvent, setMode, 1}},
- {2848, {wxUpdateUIEvent, setText, 1}},
- {2849, {wxUpdateUIEvent, setUpdateInterval, 1}},
- {2850, {wxMouseCaptureChangedEvent, getCapturedWindow, 0}},
- {2851, {wxPaletteChangedEvent, setChangedWindow, 1}},
- {2852, {wxPaletteChangedEvent, getChangedWindow, 0}},
- {2853, {wxQueryNewPaletteEvent, setPaletteRealized, 1}},
- {2854, {wxQueryNewPaletteEvent, getPaletteRealized, 0}},
- {2855, {wxNavigationKeyEvent, getDirection, 0}},
- {2856, {wxNavigationKeyEvent, setDirection, 1}},
- {2857, {wxNavigationKeyEvent, isWindowChange, 0}},
- {2858, {wxNavigationKeyEvent, setWindowChange, 1}},
- {2859, {wxNavigationKeyEvent, isFromTab, 0}},
- {2860, {wxNavigationKeyEvent, setFromTab, 1}},
- {2861, {wxNavigationKeyEvent, getCurrentFocus, 0}},
- {2862, {wxNavigationKeyEvent, setCurrentFocus, 1}},
- {2863, {wxHelpEvent, getOrigin, 0}},
- {2864, {wxHelpEvent, getPosition, 0}},
- {2865, {wxHelpEvent, setOrigin, 1}},
- {2866, {wxHelpEvent, setPosition, 1}},
- {2867, {wxContextMenuEvent, getPosition, 0}},
- {2868, {wxContextMenuEvent, setPosition, 1}},
- {2869, {wxIdleEvent, canSend, 1}},
- {2870, {wxIdleEvent, getMode, 0}},
- {2871, {wxIdleEvent, requestMore, 1}},
- {2872, {wxIdleEvent, moreRequested, 0}},
- {2873, {wxIdleEvent, setMode, 1}},
- {2874, {wxGridEvent, altDown, 0}},
- {2875, {wxGridEvent, controlDown, 0}},
- {2876, {wxGridEvent, getCol, 0}},
- {2877, {wxGridEvent, getPosition, 0}},
- {2878, {wxGridEvent, getRow, 0}},
- {2879, {wxGridEvent, metaDown, 0}},
- {2880, {wxGridEvent, selecting, 0}},
- {2881, {wxGridEvent, shiftDown, 0}},
- {2882, {wxNotifyEvent, allow, 0}},
- {2883, {wxNotifyEvent, isAllowed, 0}},
- {2884, {wxNotifyEvent, veto, 0}},
- {2885, {wxSashEvent, getEdge, 0}},
- {2886, {wxSashEvent, getDragRect, 0}},
- {2887, {wxSashEvent, getDragStatus, 0}},
- {2888, {wxListEvent, getCacheFrom, 0}},
- {2889, {wxListEvent, getCacheTo, 0}},
- {2890, {wxListEvent, getKeyCode, 0}},
- {2891, {wxListEvent, getIndex, 0}},
- {2892, {wxListEvent, getColumn, 0}},
- {2893, {wxListEvent, getPoint, 0}},
- {2894, {wxListEvent, getLabel, 0}},
- {2895, {wxListEvent, getText, 0}},
- {2896, {wxListEvent, getImage, 0}},
- {2897, {wxListEvent, getData, 0}},
- {2898, {wxListEvent, getMask, 0}},
- {2899, {wxListEvent, getItem, 0}},
- {2900, {wxListEvent, isEditCancelled, 0}},
- {2901, {wxDateEvent, getDate, 0}},
- {2902, {wxCalendarEvent, getWeekDay, 0}},
- {2903, {wxFileDirPickerEvent, getPath, 0}},
- {2904, {wxColourPickerEvent, getColour, 0}},
- {2905, {wxFontPickerEvent, getFont, 0}},
- {2906, {wxStyledTextEvent, getPosition, 0}},
- {2907, {wxStyledTextEvent, getKey, 0}},
- {2908, {wxStyledTextEvent, getModifiers, 0}},
- {2909, {wxStyledTextEvent, getModificationType, 0}},
- {2910, {wxStyledTextEvent, getText, 0}},
- {2911, {wxStyledTextEvent, getLength, 0}},
- {2912, {wxStyledTextEvent, getLinesAdded, 0}},
- {2913, {wxStyledTextEvent, getLine, 0}},
- {2914, {wxStyledTextEvent, getFoldLevelNow, 0}},
- {2915, {wxStyledTextEvent, getFoldLevelPrev, 0}},
- {2916, {wxStyledTextEvent, getMargin, 0}},
- {2917, {wxStyledTextEvent, getMessage, 0}},
- {2918, {wxStyledTextEvent, getWParam, 0}},
- {2919, {wxStyledTextEvent, getLParam, 0}},
- {2920, {wxStyledTextEvent, getListType, 0}},
- {2921, {wxStyledTextEvent, getX, 0}},
- {2922, {wxStyledTextEvent, getY, 0}},
- {2923, {wxStyledTextEvent, getDragText, 0}},
- {2924, {wxStyledTextEvent, getDragAllowMove, 0}},
- {2925, {wxStyledTextEvent, getDragResult, 0}},
- {2926, {wxStyledTextEvent, getShift, 0}},
- {2927, {wxStyledTextEvent, getControl, 0}},
- {2928, {wxStyledTextEvent, getAlt, 0}},
- {2929, {utils, getKeyState, 1}},
- {2930, {utils, getMousePosition, 2}},
- {2931, {utils, getMouseState, 0}},
- {2932, {utils, setDetectableAutoRepeat, 1}},
- {2933, {utils, bell, 0}},
- {2934, {utils, findMenuItemId, 3}},
- {2935, {utils, genericFindWindowAtPoint, 1}},
- {2936, {utils, findWindowAtPoint, 1}},
- {2937, {utils, beginBusyCursor, 1}},
- {2938, {utils, endBusyCursor, 0}},
- {2939, {utils, isBusy, 0}},
- {2940, {utils, shutdown, 1}},
- {2941, {utils, shell, 1}},
- {2942, {utils, launchDefaultBrowser, 2}},
- {2943, {utils, getEmailAddress, 0}},
- {2944, {utils, getUserId, 0}},
- {2945, {utils, getHomeDir, 0}},
- {2946, {utils, newId, 0}},
- {2947, {utils, registerId, 1}},
- {2948, {utils, getCurrentId, 0}},
- {2949, {utils, getOsDescription, 0}},
- {2950, {utils, isPlatformLittleEndian, 0}},
- {2951, {utils, isPlatform64Bit, 0}},
- {2952, {gdicmn, displaySize, 2}},
- {2953, {gdicmn, setCursor, 1}},
- {2954, {wxPrintout, new, 1}},
- {2955, {wxPrintout, destruct, 0}},
- {2956, {wxPrintout, getDC, 0}},
- {2957, {wxPrintout, getPageSizeMM, 2}},
- {2958, {wxPrintout, getPageSizePixels, 2}},
- {2959, {wxPrintout, getPaperRectPixels, 0}},
- {2960, {wxPrintout, getPPIPrinter, 2}},
- {2961, {wxPrintout, getPPIScreen, 2}},
- {2962, {wxPrintout, getTitle, 0}},
- {2963, {wxPrintout, isPreview, 0}},
- {2964, {wxPrintout, fitThisSizeToPaper, 1}},
- {2965, {wxPrintout, fitThisSizeToPage, 1}},
- {2966, {wxPrintout, fitThisSizeToPageMargins, 2}},
- {2967, {wxPrintout, mapScreenSizeToPaper, 0}},
- {2968, {wxPrintout, mapScreenSizeToPage, 0}},
- {2969, {wxPrintout, mapScreenSizeToPageMargins, 1}},
- {2970, {wxPrintout, mapScreenSizeToDevice, 0}},
- {2971, {wxPrintout, getLogicalPaperRect, 0}},
- {2972, {wxPrintout, getLogicalPageRect, 0}},
- {2973, {wxPrintout, getLogicalPageMarginsRect, 1}},
- {2974, {wxPrintout, setLogicalOrigin, 2}},
- {2975, {wxPrintout, offsetLogicalOrigin, 2}},
- {2976, {wxStyledTextCtrl, new_2, 2}},
- {2977, {wxStyledTextCtrl, new_0, 0}},
- {2978, {wxStyledTextCtrl, destruct, 0}},
- {2979, {wxStyledTextCtrl, create, 2}},
- {2980, {wxStyledTextCtrl, addText, 1}},
- {2981, {wxStyledTextCtrl, addStyledText, 1}},
- {2982, {wxStyledTextCtrl, insertText, 2}},
- {2983, {wxStyledTextCtrl, clearAll, 0}},
- {2984, {wxStyledTextCtrl, clearDocumentStyle, 0}},
- {2985, {wxStyledTextCtrl, getLength, 0}},
- {2986, {wxStyledTextCtrl, getCharAt, 1}},
- {2987, {wxStyledTextCtrl, getCurrentPos, 0}},
- {2988, {wxStyledTextCtrl, getAnchor, 0}},
- {2989, {wxStyledTextCtrl, getStyleAt, 1}},
- {2990, {wxStyledTextCtrl, redo, 0}},
- {2991, {wxStyledTextCtrl, setUndoCollection, 1}},
- {2992, {wxStyledTextCtrl, selectAll, 0}},
- {2993, {wxStyledTextCtrl, setSavePoint, 0}},
- {2994, {wxStyledTextCtrl, getStyledText, 2}},
- {2995, {wxStyledTextCtrl, canRedo, 0}},
- {2996, {wxStyledTextCtrl, markerLineFromHandle, 1}},
- {2997, {wxStyledTextCtrl, markerDeleteHandle, 1}},
- {2998, {wxStyledTextCtrl, getUndoCollection, 0}},
- {2999, {wxStyledTextCtrl, getViewWhiteSpace, 0}},
- {3000, {wxStyledTextCtrl, setViewWhiteSpace, 1}},
- {3001, {wxStyledTextCtrl, positionFromPoint, 1}},
- {3002, {wxStyledTextCtrl, positionFromPointClose, 2}},
- {3003, {wxStyledTextCtrl, gotoLine, 1}},
- {3004, {wxStyledTextCtrl, gotoPos, 1}},
- {3005, {wxStyledTextCtrl, setAnchor, 1}},
- {3006, {wxStyledTextCtrl, getCurLine, 1}},
- {3007, {wxStyledTextCtrl, getEndStyled, 0}},
- {3008, {wxStyledTextCtrl, convertEOLs, 1}},
- {3009, {wxStyledTextCtrl, getEOLMode, 0}},
- {3010, {wxStyledTextCtrl, setEOLMode, 1}},
- {3011, {wxStyledTextCtrl, startStyling, 2}},
- {3012, {wxStyledTextCtrl, setStyling, 2}},
- {3013, {wxStyledTextCtrl, getBufferedDraw, 0}},
- {3014, {wxStyledTextCtrl, setBufferedDraw, 1}},
- {3015, {wxStyledTextCtrl, setTabWidth, 1}},
- {3016, {wxStyledTextCtrl, getTabWidth, 0}},
- {3017, {wxStyledTextCtrl, setCodePage, 1}},
- {3018, {wxStyledTextCtrl, markerDefine, 3}},
- {3019, {wxStyledTextCtrl, markerSetForeground, 2}},
- {3020, {wxStyledTextCtrl, markerSetBackground, 2}},
- {3021, {wxStyledTextCtrl, markerAdd, 2}},
- {3022, {wxStyledTextCtrl, markerDelete, 2}},
- {3023, {wxStyledTextCtrl, markerDeleteAll, 1}},
- {3024, {wxStyledTextCtrl, markerGet, 1}},
- {3025, {wxStyledTextCtrl, markerNext, 2}},
- {3026, {wxStyledTextCtrl, markerPrevious, 2}},
- {3027, {wxStyledTextCtrl, markerDefineBitmap, 2}},
- {3028, {wxStyledTextCtrl, markerAddSet, 2}},
- {3029, {wxStyledTextCtrl, markerSetAlpha, 2}},
- {3030, {wxStyledTextCtrl, setMarginType, 2}},
- {3031, {wxStyledTextCtrl, getMarginType, 1}},
- {3032, {wxStyledTextCtrl, setMarginWidth, 2}},
- {3033, {wxStyledTextCtrl, getMarginWidth, 1}},
- {3034, {wxStyledTextCtrl, setMarginMask, 2}},
- {3035, {wxStyledTextCtrl, getMarginMask, 1}},
- {3036, {wxStyledTextCtrl, setMarginSensitive, 2}},
- {3037, {wxStyledTextCtrl, getMarginSensitive, 1}},
- {3038, {wxStyledTextCtrl, styleClearAll, 0}},
- {3039, {wxStyledTextCtrl, styleSetForeground, 2}},
- {3040, {wxStyledTextCtrl, styleSetBackground, 2}},
- {3041, {wxStyledTextCtrl, styleSetBold, 2}},
- {3042, {wxStyledTextCtrl, styleSetItalic, 2}},
- {3043, {wxStyledTextCtrl, styleSetSize, 2}},
- {3044, {wxStyledTextCtrl, styleSetFaceName, 2}},
- {3045, {wxStyledTextCtrl, styleSetEOLFilled, 2}},
- {3046, {wxStyledTextCtrl, styleResetDefault, 0}},
- {3047, {wxStyledTextCtrl, styleSetUnderline, 2}},
- {3048, {wxStyledTextCtrl, styleSetCase, 2}},
- {3049, {wxStyledTextCtrl, styleSetHotSpot, 2}},
- {3050, {wxStyledTextCtrl, setSelForeground, 2}},
- {3051, {wxStyledTextCtrl, setSelBackground, 2}},
- {3052, {wxStyledTextCtrl, getSelAlpha, 0}},
- {3053, {wxStyledTextCtrl, setSelAlpha, 1}},
- {3054, {wxStyledTextCtrl, setCaretForeground, 1}},
- {3055, {wxStyledTextCtrl, cmdKeyAssign, 3}},
- {3056, {wxStyledTextCtrl, cmdKeyClear, 2}},
- {3057, {wxStyledTextCtrl, cmdKeyClearAll, 0}},
- {3058, {wxStyledTextCtrl, setStyleBytes, 2}},
- {3059, {wxStyledTextCtrl, styleSetVisible, 2}},
- {3060, {wxStyledTextCtrl, getCaretPeriod, 0}},
- {3061, {wxStyledTextCtrl, setCaretPeriod, 1}},
- {3062, {wxStyledTextCtrl, setWordChars, 1}},
- {3063, {wxStyledTextCtrl, beginUndoAction, 0}},
- {3064, {wxStyledTextCtrl, endUndoAction, 0}},
- {3065, {wxStyledTextCtrl, indicatorSetStyle, 2}},
- {3066, {wxStyledTextCtrl, indicatorGetStyle, 1}},
- {3067, {wxStyledTextCtrl, indicatorSetForeground, 2}},
- {3068, {wxStyledTextCtrl, indicatorGetForeground, 1}},
- {3069, {wxStyledTextCtrl, setWhitespaceForeground, 2}},
- {3070, {wxStyledTextCtrl, setWhitespaceBackground, 2}},
- {3071, {wxStyledTextCtrl, getStyleBits, 0}},
- {3072, {wxStyledTextCtrl, setLineState, 2}},
- {3073, {wxStyledTextCtrl, getLineState, 1}},
- {3074, {wxStyledTextCtrl, getMaxLineState, 0}},
- {3075, {wxStyledTextCtrl, getCaretLineVisible, 0}},
- {3076, {wxStyledTextCtrl, setCaretLineVisible, 1}},
- {3077, {wxStyledTextCtrl, getCaretLineBackground, 0}},
- {3078, {wxStyledTextCtrl, setCaretLineBackground, 1}},
- {3079, {wxStyledTextCtrl, autoCompShow, 2}},
- {3080, {wxStyledTextCtrl, autoCompCancel, 0}},
- {3081, {wxStyledTextCtrl, autoCompActive, 0}},
- {3082, {wxStyledTextCtrl, autoCompPosStart, 0}},
- {3083, {wxStyledTextCtrl, autoCompComplete, 0}},
- {3084, {wxStyledTextCtrl, autoCompStops, 1}},
- {3085, {wxStyledTextCtrl, autoCompSetSeparator, 1}},
- {3086, {wxStyledTextCtrl, autoCompGetSeparator, 0}},
- {3087, {wxStyledTextCtrl, autoCompSelect, 1}},
- {3088, {wxStyledTextCtrl, autoCompSetCancelAtStart, 1}},
- {3089, {wxStyledTextCtrl, autoCompGetCancelAtStart, 0}},
- {3090, {wxStyledTextCtrl, autoCompSetFillUps, 1}},
- {3091, {wxStyledTextCtrl, autoCompSetChooseSingle, 1}},
- {3092, {wxStyledTextCtrl, autoCompGetChooseSingle, 0}},
- {3093, {wxStyledTextCtrl, autoCompSetIgnoreCase, 1}},
- {3094, {wxStyledTextCtrl, autoCompGetIgnoreCase, 0}},
- {3095, {wxStyledTextCtrl, userListShow, 2}},
- {3096, {wxStyledTextCtrl, autoCompSetAutoHide, 1}},
- {3097, {wxStyledTextCtrl, autoCompGetAutoHide, 0}},
- {3098, {wxStyledTextCtrl, autoCompSetDropRestOfWord, 1}},
- {3099, {wxStyledTextCtrl, autoCompGetDropRestOfWord, 0}},
- {3100, {wxStyledTextCtrl, registerImage, 2}},
- {3101, {wxStyledTextCtrl, clearRegisteredImages, 0}},
- {3102, {wxStyledTextCtrl, autoCompGetTypeSeparator, 0}},
- {3103, {wxStyledTextCtrl, autoCompSetTypeSeparator, 1}},
- {3104, {wxStyledTextCtrl, autoCompSetMaxWidth, 1}},
- {3105, {wxStyledTextCtrl, autoCompGetMaxWidth, 0}},
- {3106, {wxStyledTextCtrl, autoCompSetMaxHeight, 1}},
- {3107, {wxStyledTextCtrl, autoCompGetMaxHeight, 0}},
- {3108, {wxStyledTextCtrl, setIndent, 1}},
- {3109, {wxStyledTextCtrl, getIndent, 0}},
- {3110, {wxStyledTextCtrl, setUseTabs, 1}},
- {3111, {wxStyledTextCtrl, getUseTabs, 0}},
- {3112, {wxStyledTextCtrl, setLineIndentation, 2}},
- {3113, {wxStyledTextCtrl, getLineIndentation, 1}},
- {3114, {wxStyledTextCtrl, getLineIndentPosition, 1}},
- {3115, {wxStyledTextCtrl, getColumn, 1}},
- {3116, {wxStyledTextCtrl, setUseHorizontalScrollBar, 1}},
- {3117, {wxStyledTextCtrl, getUseHorizontalScrollBar, 0}},
- {3118, {wxStyledTextCtrl, setIndentationGuides, 1}},
- {3119, {wxStyledTextCtrl, getIndentationGuides, 0}},
- {3120, {wxStyledTextCtrl, setHighlightGuide, 1}},
- {3121, {wxStyledTextCtrl, getHighlightGuide, 0}},
- {3122, {wxStyledTextCtrl, getLineEndPosition, 1}},
- {3123, {wxStyledTextCtrl, getCodePage, 0}},
- {3124, {wxStyledTextCtrl, getCaretForeground, 0}},
- {3125, {wxStyledTextCtrl, getReadOnly, 0}},
- {3126, {wxStyledTextCtrl, setCurrentPos, 1}},
- {3127, {wxStyledTextCtrl, setSelectionStart, 1}},
- {3128, {wxStyledTextCtrl, getSelectionStart, 0}},
- {3129, {wxStyledTextCtrl, setSelectionEnd, 1}},
- {3130, {wxStyledTextCtrl, getSelectionEnd, 0}},
- {3131, {wxStyledTextCtrl, setPrintMagnification, 1}},
- {3132, {wxStyledTextCtrl, getPrintMagnification, 0}},
- {3133, {wxStyledTextCtrl, setPrintColourMode, 1}},
- {3134, {wxStyledTextCtrl, getPrintColourMode, 0}},
- {3135, {wxStyledTextCtrl, findText, 4}},
- {3136, {wxStyledTextCtrl, formatRange, 7}},
- {3137, {wxStyledTextCtrl, getFirstVisibleLine, 0}},
- {3138, {wxStyledTextCtrl, getLine, 1}},
- {3139, {wxStyledTextCtrl, getLineCount, 0}},
- {3140, {wxStyledTextCtrl, setMarginLeft, 1}},
- {3141, {wxStyledTextCtrl, getMarginLeft, 0}},
- {3142, {wxStyledTextCtrl, setMarginRight, 1}},
- {3143, {wxStyledTextCtrl, getMarginRight, 0}},
- {3144, {wxStyledTextCtrl, getModify, 0}},
- {3145, {wxStyledTextCtrl, setSelection, 2}},
- {3146, {wxStyledTextCtrl, getSelectedText, 0}},
- {3147, {wxStyledTextCtrl, getTextRange, 2}},
- {3148, {wxStyledTextCtrl, hideSelection, 1}},
- {3149, {wxStyledTextCtrl, lineFromPosition, 1}},
- {3150, {wxStyledTextCtrl, positionFromLine, 1}},
- {3151, {wxStyledTextCtrl, lineScroll, 2}},
- {3152, {wxStyledTextCtrl, ensureCaretVisible, 0}},
- {3153, {wxStyledTextCtrl, replaceSelection, 1}},
- {3154, {wxStyledTextCtrl, setReadOnly, 1}},
- {3155, {wxStyledTextCtrl, canPaste, 0}},
- {3156, {wxStyledTextCtrl, canUndo, 0}},
- {3157, {wxStyledTextCtrl, emptyUndoBuffer, 0}},
- {3158, {wxStyledTextCtrl, undo, 0}},
- {3159, {wxStyledTextCtrl, cut, 0}},
- {3160, {wxStyledTextCtrl, copy, 0}},
- {3161, {wxStyledTextCtrl, paste, 0}},
- {3162, {wxStyledTextCtrl, clear, 0}},
- {3163, {wxStyledTextCtrl, setText, 1}},
- {3164, {wxStyledTextCtrl, getText, 0}},
- {3165, {wxStyledTextCtrl, getTextLength, 0}},
- {3166, {wxStyledTextCtrl, getOvertype, 0}},
- {3167, {wxStyledTextCtrl, setCaretWidth, 1}},
- {3168, {wxStyledTextCtrl, getCaretWidth, 0}},
- {3169, {wxStyledTextCtrl, setTargetStart, 1}},
- {3170, {wxStyledTextCtrl, getTargetStart, 0}},
- {3171, {wxStyledTextCtrl, setTargetEnd, 1}},
- {3172, {wxStyledTextCtrl, getTargetEnd, 0}},
- {3173, {wxStyledTextCtrl, replaceTarget, 1}},
- {3174, {wxStyledTextCtrl, searchInTarget, 1}},
- {3175, {wxStyledTextCtrl, setSearchFlags, 1}},
- {3176, {wxStyledTextCtrl, getSearchFlags, 0}},
- {3177, {wxStyledTextCtrl, callTipShow, 2}},
- {3178, {wxStyledTextCtrl, callTipCancel, 0}},
- {3179, {wxStyledTextCtrl, callTipActive, 0}},
- {3180, {wxStyledTextCtrl, callTipPosAtStart, 0}},
- {3181, {wxStyledTextCtrl, callTipSetHighlight, 2}},
- {3182, {wxStyledTextCtrl, callTipSetBackground, 1}},
- {3183, {wxStyledTextCtrl, callTipSetForeground, 1}},
- {3184, {wxStyledTextCtrl, callTipSetForegroundHighlight, 1}},
- {3185, {wxStyledTextCtrl, callTipUseStyle, 1}},
- {3186, {wxStyledTextCtrl, visibleFromDocLine, 1}},
- {3187, {wxStyledTextCtrl, docLineFromVisible, 1}},
- {3188, {wxStyledTextCtrl, wrapCount, 1}},
- {3189, {wxStyledTextCtrl, setFoldLevel, 2}},
- {3190, {wxStyledTextCtrl, getFoldLevel, 1}},
- {3191, {wxStyledTextCtrl, getLastChild, 2}},
- {3192, {wxStyledTextCtrl, getFoldParent, 1}},
- {3193, {wxStyledTextCtrl, showLines, 2}},
- {3194, {wxStyledTextCtrl, hideLines, 2}},
- {3195, {wxStyledTextCtrl, getLineVisible, 1}},
- {3196, {wxStyledTextCtrl, setFoldExpanded, 2}},
- {3197, {wxStyledTextCtrl, getFoldExpanded, 1}},
- {3198, {wxStyledTextCtrl, toggleFold, 1}},
- {3199, {wxStyledTextCtrl, ensureVisible, 1}},
- {3200, {wxStyledTextCtrl, setFoldFlags, 1}},
- {3201, {wxStyledTextCtrl, ensureVisibleEnforcePolicy, 1}},
- {3202, {wxStyledTextCtrl, setTabIndents, 1}},
- {3203, {wxStyledTextCtrl, getTabIndents, 0}},
- {3204, {wxStyledTextCtrl, setBackSpaceUnIndents, 1}},
- {3205, {wxStyledTextCtrl, getBackSpaceUnIndents, 0}},
- {3206, {wxStyledTextCtrl, setMouseDwellTime, 1}},
- {3207, {wxStyledTextCtrl, getMouseDwellTime, 0}},
- {3208, {wxStyledTextCtrl, wordStartPosition, 2}},
- {3209, {wxStyledTextCtrl, wordEndPosition, 2}},
- {3210, {wxStyledTextCtrl, setWrapMode, 1}},
- {3211, {wxStyledTextCtrl, getWrapMode, 0}},
- {3212, {wxStyledTextCtrl, setWrapVisualFlags, 1}},
- {3213, {wxStyledTextCtrl, getWrapVisualFlags, 0}},
- {3214, {wxStyledTextCtrl, setWrapVisualFlagsLocation, 1}},
- {3215, {wxStyledTextCtrl, getWrapVisualFlagsLocation, 0}},
- {3216, {wxStyledTextCtrl, setWrapStartIndent, 1}},
- {3217, {wxStyledTextCtrl, getWrapStartIndent, 0}},
- {3218, {wxStyledTextCtrl, setLayoutCache, 1}},
- {3219, {wxStyledTextCtrl, getLayoutCache, 0}},
- {3220, {wxStyledTextCtrl, setScrollWidth, 1}},
- {3221, {wxStyledTextCtrl, getScrollWidth, 0}},
- {3222, {wxStyledTextCtrl, textWidth, 2}},
- {3223, {wxStyledTextCtrl, getEndAtLastLine, 0}},
- {3224, {wxStyledTextCtrl, textHeight, 1}},
- {3225, {wxStyledTextCtrl, setUseVerticalScrollBar, 1}},
- {3226, {wxStyledTextCtrl, getUseVerticalScrollBar, 0}},
- {3227, {wxStyledTextCtrl, appendText, 1}},
- {3228, {wxStyledTextCtrl, getTwoPhaseDraw, 0}},
- {3229, {wxStyledTextCtrl, setTwoPhaseDraw, 1}},
- {3230, {wxStyledTextCtrl, targetFromSelection, 0}},
- {3231, {wxStyledTextCtrl, linesJoin, 0}},
- {3232, {wxStyledTextCtrl, linesSplit, 1}},
- {3233, {wxStyledTextCtrl, setFoldMarginColour, 2}},
- {3234, {wxStyledTextCtrl, setFoldMarginHiColour, 2}},
- {3235, {wxStyledTextCtrl, lineDown, 0}},
- {3236, {wxStyledTextCtrl, lineDownExtend, 0}},
- {3237, {wxStyledTextCtrl, lineUp, 0}},
- {3238, {wxStyledTextCtrl, lineUpExtend, 0}},
- {3239, {wxStyledTextCtrl, charLeft, 0}},
- {3240, {wxStyledTextCtrl, charLeftExtend, 0}},
- {3241, {wxStyledTextCtrl, charRight, 0}},
- {3242, {wxStyledTextCtrl, charRightExtend, 0}},
- {3243, {wxStyledTextCtrl, wordLeft, 0}},
- {3244, {wxStyledTextCtrl, wordLeftExtend, 0}},
- {3245, {wxStyledTextCtrl, wordRight, 0}},
- {3246, {wxStyledTextCtrl, wordRightExtend, 0}},
- {3247, {wxStyledTextCtrl, home, 0}},
- {3248, {wxStyledTextCtrl, homeExtend, 0}},
- {3249, {wxStyledTextCtrl, lineEnd, 0}},
- {3250, {wxStyledTextCtrl, lineEndExtend, 0}},
- {3251, {wxStyledTextCtrl, documentStart, 0}},
- {3252, {wxStyledTextCtrl, documentStartExtend, 0}},
- {3253, {wxStyledTextCtrl, documentEnd, 0}},
- {3254, {wxStyledTextCtrl, documentEndExtend, 0}},
- {3255, {wxStyledTextCtrl, pageUp, 0}},
- {3256, {wxStyledTextCtrl, pageUpExtend, 0}},
- {3257, {wxStyledTextCtrl, pageDown, 0}},
- {3258, {wxStyledTextCtrl, pageDownExtend, 0}},
- {3259, {wxStyledTextCtrl, editToggleOvertype, 0}},
- {3260, {wxStyledTextCtrl, cancel, 0}},
- {3261, {wxStyledTextCtrl, deleteBack, 0}},
- {3262, {wxStyledTextCtrl, tab, 0}},
- {3263, {wxStyledTextCtrl, backTab, 0}},
- {3264, {wxStyledTextCtrl, newLine, 0}},
- {3265, {wxStyledTextCtrl, formFeed, 0}},
- {3266, {wxStyledTextCtrl, vCHome, 0}},
- {3267, {wxStyledTextCtrl, vCHomeExtend, 0}},
- {3268, {wxStyledTextCtrl, zoomIn, 0}},
- {3269, {wxStyledTextCtrl, zoomOut, 0}},
- {3270, {wxStyledTextCtrl, delWordLeft, 0}},
- {3271, {wxStyledTextCtrl, delWordRight, 0}},
- {3272, {wxStyledTextCtrl, lineCut, 0}},
- {3273, {wxStyledTextCtrl, lineDelete, 0}},
- {3274, {wxStyledTextCtrl, lineTranspose, 0}},
- {3275, {wxStyledTextCtrl, lineDuplicate, 0}},
- {3276, {wxStyledTextCtrl, lowerCase, 0}},
- {3277, {wxStyledTextCtrl, upperCase, 0}},
- {3278, {wxStyledTextCtrl, lineScrollDown, 0}},
- {3279, {wxStyledTextCtrl, lineScrollUp, 0}},
- {3280, {wxStyledTextCtrl, deleteBackNotLine, 0}},
- {3281, {wxStyledTextCtrl, homeDisplay, 0}},
- {3282, {wxStyledTextCtrl, homeDisplayExtend, 0}},
- {3283, {wxStyledTextCtrl, lineEndDisplay, 0}},
- {3284, {wxStyledTextCtrl, lineEndDisplayExtend, 0}},
- {3285, {wxStyledTextCtrl, homeWrapExtend, 0}},
- {3286, {wxStyledTextCtrl, lineEndWrap, 0}},
- {3287, {wxStyledTextCtrl, lineEndWrapExtend, 0}},
- {3288, {wxStyledTextCtrl, vCHomeWrap, 0}},
- {3289, {wxStyledTextCtrl, vCHomeWrapExtend, 0}},
- {3290, {wxStyledTextCtrl, lineCopy, 0}},
- {3291, {wxStyledTextCtrl, moveCaretInsideView, 0}},
- {3292, {wxStyledTextCtrl, lineLength, 1}},
- {3293, {wxStyledTextCtrl, braceHighlight, 2}},
- {3294, {wxStyledTextCtrl, braceBadLight, 1}},
- {3295, {wxStyledTextCtrl, braceMatch, 1}},
- {3296, {wxStyledTextCtrl, getViewEOL, 0}},
- {3297, {wxStyledTextCtrl, setViewEOL, 1}},
- {3298, {wxStyledTextCtrl, setModEventMask, 1}},
- {3299, {wxStyledTextCtrl, getEdgeColumn, 0}},
- {3300, {wxStyledTextCtrl, setEdgeColumn, 1}},
- {3301, {wxStyledTextCtrl, setEdgeMode, 1}},
- {3302, {wxStyledTextCtrl, getEdgeMode, 0}},
- {3303, {wxStyledTextCtrl, getEdgeColour, 0}},
- {3304, {wxStyledTextCtrl, setEdgeColour, 1}},
- {3305, {wxStyledTextCtrl, searchAnchor, 0}},
- {3306, {wxStyledTextCtrl, searchNext, 2}},
- {3307, {wxStyledTextCtrl, searchPrev, 2}},
- {3308, {wxStyledTextCtrl, linesOnScreen, 0}},
- {3309, {wxStyledTextCtrl, usePopUp, 1}},
- {3310, {wxStyledTextCtrl, selectionIsRectangle, 0}},
- {3311, {wxStyledTextCtrl, setZoom, 1}},
- {3312, {wxStyledTextCtrl, getZoom, 0}},
- {3313, {wxStyledTextCtrl, getModEventMask, 0}},
- {3314, {wxStyledTextCtrl, setSTCFocus, 1}},
- {3315, {wxStyledTextCtrl, getSTCFocus, 0}},
- {3316, {wxStyledTextCtrl, setStatus, 1}},
- {3317, {wxStyledTextCtrl, getStatus, 0}},
- {3318, {wxStyledTextCtrl, setMouseDownCaptures, 1}},
- {3319, {wxStyledTextCtrl, getMouseDownCaptures, 0}},
- {3320, {wxStyledTextCtrl, setSTCCursor, 1}},
- {3321, {wxStyledTextCtrl, getSTCCursor, 0}},
- {3322, {wxStyledTextCtrl, setControlCharSymbol, 1}},
- {3323, {wxStyledTextCtrl, getControlCharSymbol, 0}},
- {3324, {wxStyledTextCtrl, wordPartLeft, 0}},
- {3325, {wxStyledTextCtrl, wordPartLeftExtend, 0}},
- {3326, {wxStyledTextCtrl, wordPartRight, 0}},
- {3327, {wxStyledTextCtrl, wordPartRightExtend, 0}},
- {3328, {wxStyledTextCtrl, setVisiblePolicy, 2}},
- {3329, {wxStyledTextCtrl, delLineLeft, 0}},
- {3330, {wxStyledTextCtrl, delLineRight, 0}},
- {3331, {wxStyledTextCtrl, getXOffset, 0}},
- {3332, {wxStyledTextCtrl, chooseCaretX, 0}},
- {3333, {wxStyledTextCtrl, setXCaretPolicy, 2}},
- {3334, {wxStyledTextCtrl, setYCaretPolicy, 2}},
- {3335, {wxStyledTextCtrl, getPrintWrapMode, 0}},
- {3336, {wxStyledTextCtrl, setHotspotActiveForeground, 2}},
- {3337, {wxStyledTextCtrl, setHotspotActiveBackground, 2}},
- {3338, {wxStyledTextCtrl, setHotspotActiveUnderline, 1}},
- {3339, {wxStyledTextCtrl, setHotspotSingleLine, 1}},
- {3340, {wxStyledTextCtrl, paraDownExtend, 0}},
- {3341, {wxStyledTextCtrl, paraUp, 0}},
- {3342, {wxStyledTextCtrl, paraUpExtend, 0}},
- {3343, {wxStyledTextCtrl, positionBefore, 1}},
- {3344, {wxStyledTextCtrl, positionAfter, 1}},
- {3345, {wxStyledTextCtrl, copyRange, 2}},
- {3346, {wxStyledTextCtrl, copyText, 2}},
- {3347, {wxStyledTextCtrl, setSelectionMode, 1}},
- {3348, {wxStyledTextCtrl, getSelectionMode, 0}},
- {3349, {wxStyledTextCtrl, lineDownRectExtend, 0}},
- {3350, {wxStyledTextCtrl, lineUpRectExtend, 0}},
- {3351, {wxStyledTextCtrl, charLeftRectExtend, 0}},
- {3352, {wxStyledTextCtrl, charRightRectExtend, 0}},
- {3353, {wxStyledTextCtrl, homeRectExtend, 0}},
- {3354, {wxStyledTextCtrl, vCHomeRectExtend, 0}},
- {3355, {wxStyledTextCtrl, lineEndRectExtend, 0}},
- {3356, {wxStyledTextCtrl, pageUpRectExtend, 0}},
- {3357, {wxStyledTextCtrl, pageDownRectExtend, 0}},
- {3358, {wxStyledTextCtrl, stutteredPageUp, 0}},
- {3359, {wxStyledTextCtrl, stutteredPageUpExtend, 0}},
- {3360, {wxStyledTextCtrl, stutteredPageDown, 0}},
- {3361, {wxStyledTextCtrl, stutteredPageDownExtend, 0}},
- {3362, {wxStyledTextCtrl, wordLeftEnd, 0}},
- {3363, {wxStyledTextCtrl, wordLeftEndExtend, 0}},
- {3364, {wxStyledTextCtrl, wordRightEnd, 0}},
- {3365, {wxStyledTextCtrl, wordRightEndExtend, 0}},
- {3366, {wxStyledTextCtrl, setWhitespaceChars, 1}},
- {3367, {wxStyledTextCtrl, setCharsDefault, 0}},
- {3368, {wxStyledTextCtrl, autoCompGetCurrent, 0}},
- {3369, {wxStyledTextCtrl, allocate, 1}},
- {3370, {wxStyledTextCtrl, findColumn, 2}},
- {3371, {wxStyledTextCtrl, getCaretSticky, 0}},
- {3372, {wxStyledTextCtrl, setCaretSticky, 1}},
- {3373, {wxStyledTextCtrl, toggleCaretSticky, 0}},
- {3374, {wxStyledTextCtrl, setPasteConvertEndings, 1}},
- {3375, {wxStyledTextCtrl, getPasteConvertEndings, 0}},
- {3376, {wxStyledTextCtrl, selectionDuplicate, 0}},
- {3377, {wxStyledTextCtrl, setCaretLineBackAlpha, 1}},
- {3378, {wxStyledTextCtrl, getCaretLineBackAlpha, 0}},
- {3379, {wxStyledTextCtrl, startRecord, 0}},
- {3380, {wxStyledTextCtrl, stopRecord, 0}},
- {3381, {wxStyledTextCtrl, setLexer, 1}},
- {3382, {wxStyledTextCtrl, getLexer, 0}},
- {3383, {wxStyledTextCtrl, colourise, 2}},
- {3384, {wxStyledTextCtrl, setProperty, 2}},
- {3385, {wxStyledTextCtrl, setKeyWords, 2}},
- {3386, {wxStyledTextCtrl, setLexerLanguage, 1}},
- {3387, {wxStyledTextCtrl, getProperty, 1}},
- {3388, {wxStyledTextCtrl, getStyleBitsNeeded, 0}},
- {3389, {wxStyledTextCtrl, getCurrentLine, 0}},
- {3390, {wxStyledTextCtrl, styleSetSpec, 2}},
- {3391, {wxStyledTextCtrl, styleSetFont, 2}},
- {3392, {wxStyledTextCtrl, styleSetFontAttr, 7}},
- {3393, {wxStyledTextCtrl, styleSetCharacterSet, 2}},
- {3394, {wxStyledTextCtrl, styleSetFontEncoding, 2}},
- {3395, {wxStyledTextCtrl, cmdKeyExecute, 1}},
- {3396, {wxStyledTextCtrl, setMargins, 2}},
- {3397, {wxStyledTextCtrl, getSelection, 2}},
- {3398, {wxStyledTextCtrl, pointFromPosition, 1}},
- {3399, {wxStyledTextCtrl, scrollToLine, 1}},
- {3400, {wxStyledTextCtrl, scrollToColumn, 1}},
- {3401, {wxStyledTextCtrl, setVScrollBar, 1}},
- {3402, {wxStyledTextCtrl, setHScrollBar, 1}},
- {3403, {wxStyledTextCtrl, getLastKeydownProcessed, 0}},
- {3404, {wxStyledTextCtrl, setLastKeydownProcessed, 1}},
- {3405, {wxStyledTextCtrl, saveFile, 1}},
- {3406, {wxStyledTextCtrl, loadFile, 1}},
- {3407, {wxStyledTextCtrl, doDragOver, 3}},
- {3408, {wxStyledTextCtrl, doDropText, 3}},
- {3409, {wxStyledTextCtrl, getUseAntiAliasing, 0}},
- {3410, {wxStyledTextCtrl, addTextRaw, 1}},
- {3411, {wxStyledTextCtrl, insertTextRaw, 2}},
- {3412, {wxStyledTextCtrl, getCurLineRaw, 1}},
- {3413, {wxStyledTextCtrl, getLineRaw, 1}},
- {3414, {wxStyledTextCtrl, getSelectedTextRaw, 0}},
- {3415, {wxStyledTextCtrl, getTextRangeRaw, 2}},
- {3416, {wxStyledTextCtrl, setTextRaw, 1}},
- {3417, {wxStyledTextCtrl, getTextRaw, 0}},
- {3418, {wxStyledTextCtrl, appendTextRaw, 1}},
- {3419, {wxArtProvider, getBitmap, 2}},
- {3420, {wxArtProvider, getIcon, 2}},
- {3421, {wxTreeEvent, getKeyCode, 0}},
- {3422, {wxTreeEvent, getItem, 0}},
- {3423, {wxTreeEvent, getKeyEvent, 0}},
- {3424, {wxTreeEvent, getLabel, 0}},
- {3425, {wxTreeEvent, getOldItem, 0}},
- {3426, {wxTreeEvent, getPoint, 0}},
- {3427, {wxTreeEvent, isEditCancelled, 0}},
- {3428, {wxTreeEvent, setToolTip, 1}},
- {3429, {wxNotebookEvent, getOldSelection, 0}},
- {3430, {wxNotebookEvent, getSelection, 0}},
- {3431, {wxNotebookEvent, setOldSelection, 1}},
- {3432, {wxNotebookEvent, setSelection, 1}},
- {3433, {wxFileDataObject, new, 0}},
- {3434, {wxFileDataObject, addFile, 1}},
- {3435, {wxFileDataObject, getFilenames, 0}},
- {3436, {wxFileDataObject, 'Destroy', undefined}},
- {3437, {wxTextDataObject, new, 1}},
- {3438, {wxTextDataObject, getTextLength, 0}},
- {3439, {wxTextDataObject, getText, 0}},
- {3440, {wxTextDataObject, setText, 1}},
- {3441, {wxTextDataObject, 'Destroy', undefined}},
- {3442, {wxBitmapDataObject, new_1_1, 1}},
- {3443, {wxBitmapDataObject, new_1_0, 1}},
- {3444, {wxBitmapDataObject, getBitmap, 0}},
- {3445, {wxBitmapDataObject, setBitmap, 1}},
- {3446, {wxBitmapDataObject, 'Destroy', undefined}},
- {3448, {wxClipboard, new, 0}},
- {3449, {wxClipboard, destruct, 0}},
- {3450, {wxClipboard, addData, 1}},
- {3451, {wxClipboard, clear, 0}},
- {3452, {wxClipboard, close, 0}},
- {3453, {wxClipboard, flush, 0}},
- {3454, {wxClipboard, getData, 1}},
- {3455, {wxClipboard, isOpened, 0}},
- {3456, {wxClipboard, open, 0}},
- {3457, {wxClipboard, setData, 1}},
- {3459, {wxClipboard, usePrimarySelection, 1}},
- {3460, {wxClipboard, isSupported, 1}},
- {3461, {wxClipboard, get, 0}},
- {3462, {wxSpinEvent, getPosition, 0}},
- {3463, {wxSpinEvent, setPosition, 1}},
- {3464, {wxSplitterWindow, new_0, 0}},
- {3465, {wxSplitterWindow, new_2, 2}},
- {3466, {wxSplitterWindow, destruct, 0}},
- {3467, {wxSplitterWindow, create, 2}},
- {3468, {wxSplitterWindow, getMinimumPaneSize, 0}},
- {3469, {wxSplitterWindow, getSashGravity, 0}},
- {3470, {wxSplitterWindow, getSashPosition, 0}},
- {3471, {wxSplitterWindow, getSplitMode, 0}},
- {3472, {wxSplitterWindow, getWindow1, 0}},
- {3473, {wxSplitterWindow, getWindow2, 0}},
- {3474, {wxSplitterWindow, initialize, 1}},
- {3475, {wxSplitterWindow, isSplit, 0}},
- {3476, {wxSplitterWindow, replaceWindow, 2}},
- {3477, {wxSplitterWindow, setSashGravity, 1}},
- {3478, {wxSplitterWindow, setSashPosition, 2}},
- {3479, {wxSplitterWindow, setSashSize, 1}},
- {3480, {wxSplitterWindow, setMinimumPaneSize, 1}},
- {3481, {wxSplitterWindow, setSplitMode, 1}},
- {3482, {wxSplitterWindow, splitHorizontally, 3}},
- {3483, {wxSplitterWindow, splitVertically, 3}},
- {3484, {wxSplitterWindow, unsplit, 1}},
- {3485, {wxSplitterWindow, updateSize, 0}},
- {3486, {wxSplitterEvent, getSashPosition, 0}},
- {3487, {wxSplitterEvent, getX, 0}},
- {3488, {wxSplitterEvent, getY, 0}},
- {3489, {wxSplitterEvent, getWindowBeingRemoved, 0}},
- {3490, {wxSplitterEvent, setSashPosition, 1}},
- {3491, {wxHtmlWindow, new_0, 0}},
- {3492, {wxHtmlWindow, new_2, 2}},
- {3493, {wxHtmlWindow, appendToPage, 1}},
- {3494, {wxHtmlWindow, getOpenedAnchor, 0}},
- {3495, {wxHtmlWindow, getOpenedPage, 0}},
- {3496, {wxHtmlWindow, getOpenedPageTitle, 0}},
- {3497, {wxHtmlWindow, getRelatedFrame, 0}},
- {3498, {wxHtmlWindow, historyBack, 0}},
- {3499, {wxHtmlWindow, historyCanBack, 0}},
- {3500, {wxHtmlWindow, historyCanForward, 0}},
- {3501, {wxHtmlWindow, historyClear, 0}},
- {3502, {wxHtmlWindow, historyForward, 0}},
- {3503, {wxHtmlWindow, loadFile, 1}},
- {3504, {wxHtmlWindow, loadPage, 1}},
- {3505, {wxHtmlWindow, selectAll, 0}},
- {3506, {wxHtmlWindow, selectionToText, 0}},
- {3507, {wxHtmlWindow, selectLine, 1}},
- {3508, {wxHtmlWindow, selectWord, 1}},
- {3509, {wxHtmlWindow, setBorders, 1}},
- {3510, {wxHtmlWindow, setFonts, 3}},
- {3511, {wxHtmlWindow, setPage, 1}},
- {3512, {wxHtmlWindow, setRelatedFrame, 2}},
- {3513, {wxHtmlWindow, setRelatedStatusBar, 1}},
- {3514, {wxHtmlWindow, toText, 0}},
- {3515, {wxHtmlWindow, 'Destroy', undefined}},
- {3516, {wxHtmlLinkEvent, getLinkInfo, 0}},
- {3517, {wxSystemSettings, getColour, 1}},
- {3518, {wxSystemSettings, getFont, 1}},
- {3519, {wxSystemSettings, getMetric, 2}},
- {3520, {wxSystemSettings, getScreenType, 0}},
- {3521, {wxSystemOptions, getOption, 1}},
- {3522, {wxSystemOptions, getOptionInt, 1}},
- {3523, {wxSystemOptions, hasOption, 1}},
- {3524, {wxSystemOptions, isFalse, 1}},
- {3525, {wxSystemOptions, setOption_2_1, 2}},
- {3526, {wxSystemOptions, setOption_2_0, 2}},
- {3527, {wxAuiNotebookEvent, setSelection, 1}},
- {3528, {wxAuiNotebookEvent, getSelection, 0}},
- {3529, {wxAuiNotebookEvent, setOldSelection, 1}},
- {3530, {wxAuiNotebookEvent, getOldSelection, 0}},
- {3531, {wxAuiNotebookEvent, setDragSource, 1}},
- {3532, {wxAuiNotebookEvent, getDragSource, 0}},
- {3533, {wxAuiManagerEvent, setManager, 1}},
- {3534, {wxAuiManagerEvent, getManager, 0}},
- {3535, {wxAuiManagerEvent, setPane, 1}},
- {3536, {wxAuiManagerEvent, getPane, 0}},
- {3537, {wxAuiManagerEvent, setButton, 1}},
- {3538, {wxAuiManagerEvent, getButton, 0}},
- {3539, {wxAuiManagerEvent, setDC, 1}},
- {3540, {wxAuiManagerEvent, getDC, 0}},
- {3541, {wxAuiManagerEvent, veto, 1}},
- {3542, {wxAuiManagerEvent, getVeto, 0}},
- {3543, {wxAuiManagerEvent, setCanVeto, 1}},
- {3544, {wxAuiManagerEvent, canVeto, 0}},
- {3545, {wxLogNull, new, 0}},
- {3546, {wxLogNull, 'Destroy', undefined}},
- {3547, {wxTaskBarIcon, new, 0}},
- {3548, {wxTaskBarIcon, destruct, 0}},
- {3549, {wxTaskBarIcon, popupMenu, 1}},
- {3550, {wxTaskBarIcon, removeIcon, 0}},
- {3551, {wxTaskBarIcon, setIcon, 2}},
- {3552, {wxLocale, new_0, 0}},
- {3554, {wxLocale, new_2, 2}},
- {3555, {wxLocale, destruct, 0}},
- {3557, {wxLocale, init, 1}},
- {3558, {wxLocale, addCatalog_1, 1}},
- {3559, {wxLocale, addCatalog_3, 3}},
- {3560, {wxLocale, addCatalogLookupPathPrefix, 1}},
- {3561, {wxLocale, getCanonicalName, 0}},
- {3562, {wxLocale, getLanguage, 0}},
- {3563, {wxLocale, getLanguageName, 1}},
- {3564, {wxLocale, getLocale, 0}},
- {3565, {wxLocale, getName, 0}},
- {3566, {wxLocale, getString_2, 2}},
- {3567, {wxLocale, getString_4, 4}},
- {3568, {wxLocale, getHeaderValue, 2}},
- {3569, {wxLocale, getSysName, 0}},
- {3570, {wxLocale, getSystemEncoding, 0}},
- {3571, {wxLocale, getSystemEncodingName, 0}},
- {3572, {wxLocale, getSystemLanguage, 0}},
- {3573, {wxLocale, isLoaded, 1}},
- {3574, {wxLocale, isOk, 0}},
- {3575, {wxActivateEvent, getActive, 0}},
- {3577, {wxPopupWindow, new_2, 2}},
- {3578, {wxPopupWindow, new_0, 0}},
- {3580, {wxPopupWindow, destruct, 0}},
- {3581, {wxPopupWindow, create, 2}},
- {3582, {wxPopupWindow, position, 2}},
- {3583, {wxPopupTransientWindow, new_0, 0}},
- {3584, {wxPopupTransientWindow, new_2, 2}},
- {3585, {wxPopupTransientWindow, destruct, 0}},
- {3586, {wxPopupTransientWindow, popup, 1}},
- {3587, {wxPopupTransientWindow, dismiss, 0}},
- {3588, {wxOverlay, new, 0}},
- {3589, {wxOverlay, destruct, 0}},
- {3590, {wxOverlay, reset, 0}},
- {3591, {wxDCOverlay, new_6, 6}},
- {3592, {wxDCOverlay, new_2, 2}},
- {3593, {wxDCOverlay, destruct, 0}},
- {3594, {wxDCOverlay, clear, 0}},
+ {284, {wxWindow, setTransparent, 1}},
+ {285, {wxWindow, canSetTransparent, 0}},
+ {286, {wxWindow, isDoubleBuffered, 0}},
+ {287, {wxWindow, setDoubleBuffered, 1}},
+ {288, {wxTopLevelWindow, getIcon, 0}},
+ {289, {wxTopLevelWindow, getIcons, 0}},
+ {290, {wxTopLevelWindow, getTitle, 0}},
+ {291, {wxTopLevelWindow, isActive, 0}},
+ {292, {wxTopLevelWindow, iconize, 1}},
+ {293, {wxTopLevelWindow, isFullScreen, 0}},
+ {294, {wxTopLevelWindow, isIconized, 0}},
+ {295, {wxTopLevelWindow, isMaximized, 0}},
+ {296, {wxTopLevelWindow, maximize, 1}},
+ {297, {wxTopLevelWindow, requestUserAttention, 1}},
+ {298, {wxTopLevelWindow, setIcon, 1}},
+ {299, {wxTopLevelWindow, setIcons, 1}},
+ {300, {wxTopLevelWindow, centerOnScreen, 1}},
+ {301, {wxTopLevelWindow, centreOnScreen, 1}},
+ {303, {wxTopLevelWindow, setShape, 1}},
+ {304, {wxTopLevelWindow, setTitle, 1}},
+ {305, {wxTopLevelWindow, showFullScreen, 2}},
+ {307, {wxFrame, new_4, 4}},
+ {308, {wxFrame, new_0, 0}},
+ {310, {wxFrame, destruct, 0}},
+ {311, {wxFrame, create, 4}},
+ {312, {wxFrame, createStatusBar, 1}},
+ {313, {wxFrame, createToolBar, 1}},
+ {314, {wxFrame, getClientAreaOrigin, 0}},
+ {315, {wxFrame, getMenuBar, 0}},
+ {316, {wxFrame, getStatusBar, 0}},
+ {317, {wxFrame, getStatusBarPane, 0}},
+ {318, {wxFrame, getToolBar, 0}},
+ {319, {wxFrame, processCommand, 1}},
+ {320, {wxFrame, sendSizeEvent, 0}},
+ {321, {wxFrame, setMenuBar, 1}},
+ {322, {wxFrame, setStatusBar, 1}},
+ {323, {wxFrame, setStatusBarPane, 1}},
+ {324, {wxFrame, setStatusText, 2}},
+ {325, {wxFrame, setStatusWidths, 2}},
+ {326, {wxFrame, setToolBar, 1}},
+ {327, {wxMiniFrame, new_0, 0}},
+ {328, {wxMiniFrame, new_4, 4}},
+ {329, {wxMiniFrame, create, 4}},
+ {330, {wxMiniFrame, 'Destroy', undefined}},
+ {331, {wxSplashScreen, new_0, 0}},
+ {332, {wxSplashScreen, new_6, 6}},
+ {333, {wxSplashScreen, destruct, 0}},
+ {334, {wxSplashScreen, getSplashStyle, 0}},
+ {335, {wxSplashScreen, getTimeout, 0}},
+ {336, {wxPanel, new_0, 0}},
+ {337, {wxPanel, new_6, 6}},
+ {338, {wxPanel, new_2, 2}},
+ {339, {wxPanel, destruct, 0}},
+ {340, {wxPanel, initDialog, 0}},
+ {341, {wxPanel, setFocusIgnoringChildren, 0}},
+ {342, {wxScrolledWindow, new_0, 0}},
+ {343, {wxScrolledWindow, new_2, 2}},
+ {344, {wxScrolledWindow, destruct, 0}},
+ {345, {wxScrolledWindow, calcScrolledPosition_4, 4}},
+ {346, {wxScrolledWindow, calcScrolledPosition_1, 1}},
+ {347, {wxScrolledWindow, calcUnscrolledPosition_4, 4}},
+ {348, {wxScrolledWindow, calcUnscrolledPosition_1, 1}},
+ {349, {wxScrolledWindow, enableScrolling, 2}},
+ {350, {wxScrolledWindow, getScrollPixelsPerUnit, 2}},
+ {351, {wxScrolledWindow, getViewStart, 2}},
+ {352, {wxScrolledWindow, doPrepareDC, 1}},
+ {353, {wxScrolledWindow, prepareDC, 1}},
+ {354, {wxScrolledWindow, scroll, 2}},
+ {355, {wxScrolledWindow, setScrollbars, 5}},
+ {356, {wxScrolledWindow, setScrollRate, 2}},
+ {357, {wxScrolledWindow, setTargetWindow, 1}},
+ {358, {wxSashWindow, new_0, 0}},
+ {359, {wxSashWindow, new_2, 2}},
+ {360, {wxSashWindow, destruct, 0}},
+ {361, {wxSashWindow, getSashVisible, 1}},
+ {362, {wxSashWindow, getMaximumSizeX, 0}},
+ {363, {wxSashWindow, getMaximumSizeY, 0}},
+ {364, {wxSashWindow, getMinimumSizeX, 0}},
+ {365, {wxSashWindow, getMinimumSizeY, 0}},
+ {366, {wxSashWindow, setMaximumSizeX, 1}},
+ {367, {wxSashWindow, setMaximumSizeY, 1}},
+ {368, {wxSashWindow, setMinimumSizeX, 1}},
+ {369, {wxSashWindow, setMinimumSizeY, 1}},
+ {370, {wxSashWindow, setSashVisible, 2}},
+ {371, {wxSashLayoutWindow, new_0, 0}},
+ {372, {wxSashLayoutWindow, new_2, 2}},
+ {373, {wxSashLayoutWindow, create, 2}},
+ {374, {wxSashLayoutWindow, getAlignment, 0}},
+ {375, {wxSashLayoutWindow, getOrientation, 0}},
+ {376, {wxSashLayoutWindow, setAlignment, 1}},
+ {377, {wxSashLayoutWindow, setDefaultSize, 1}},
+ {378, {wxSashLayoutWindow, setOrientation, 1}},
+ {379, {wxSashLayoutWindow, 'Destroy', undefined}},
+ {380, {wxGrid, new_0, 0}},
+ {381, {wxGrid, new_3, 3}},
+ {382, {wxGrid, new_4, 4}},
+ {383, {wxGrid, destruct, 0}},
+ {384, {wxGrid, appendCols, 1}},
+ {385, {wxGrid, appendRows, 1}},
+ {386, {wxGrid, autoSize, 0}},
+ {387, {wxGrid, autoSizeColumn, 2}},
+ {388, {wxGrid, autoSizeColumns, 1}},
+ {389, {wxGrid, autoSizeRow, 2}},
+ {390, {wxGrid, autoSizeRows, 1}},
+ {391, {wxGrid, beginBatch, 0}},
+ {392, {wxGrid, blockToDeviceRect, 2}},
+ {393, {wxGrid, canDragColSize, 0}},
+ {394, {wxGrid, canDragRowSize, 0}},
+ {395, {wxGrid, canDragGridSize, 0}},
+ {396, {wxGrid, canEnableCellControl, 0}},
+ {397, {wxGrid, cellToRect_2, 2}},
+ {398, {wxGrid, cellToRect_1, 1}},
+ {399, {wxGrid, clearGrid, 0}},
+ {400, {wxGrid, clearSelection, 0}},
+ {401, {wxGrid, createGrid, 3}},
+ {402, {wxGrid, deleteCols, 1}},
+ {403, {wxGrid, deleteRows, 1}},
+ {404, {wxGrid, disableCellEditControl, 0}},
+ {405, {wxGrid, disableDragColSize, 0}},
+ {406, {wxGrid, disableDragGridSize, 0}},
+ {407, {wxGrid, disableDragRowSize, 0}},
+ {408, {wxGrid, enableCellEditControl, 1}},
+ {409, {wxGrid, enableDragColSize, 1}},
+ {410, {wxGrid, enableDragGridSize, 1}},
+ {411, {wxGrid, enableDragRowSize, 1}},
+ {412, {wxGrid, enableEditing, 1}},
+ {413, {wxGrid, enableGridLines, 1}},
+ {414, {wxGrid, endBatch, 0}},
+ {415, {wxGrid, fit, 0}},
+ {416, {wxGrid, forceRefresh, 0}},
+ {417, {wxGrid, getBatchCount, 0}},
+ {418, {wxGrid, getCellAlignment, 4}},
+ {419, {wxGrid, getCellBackgroundColour, 2}},
+ {420, {wxGrid, getCellEditor, 2}},
+ {421, {wxGrid, getCellFont, 2}},
+ {422, {wxGrid, getCellRenderer, 2}},
+ {423, {wxGrid, getCellTextColour, 2}},
+ {424, {wxGrid, getCellValue_2, 2}},
+ {425, {wxGrid, getCellValue_1, 1}},
+ {426, {wxGrid, getColLabelAlignment, 2}},
+ {427, {wxGrid, getColLabelSize, 0}},
+ {428, {wxGrid, getColLabelValue, 1}},
+ {429, {wxGrid, getColMinimalAcceptableWidth, 0}},
+ {430, {wxGrid, getDefaultCellAlignment, 2}},
+ {431, {wxGrid, getDefaultCellBackgroundColour, 0}},
+ {432, {wxGrid, getDefaultCellFont, 0}},
+ {433, {wxGrid, getDefaultCellTextColour, 0}},
+ {434, {wxGrid, getDefaultColLabelSize, 0}},
+ {435, {wxGrid, getDefaultColSize, 0}},
+ {436, {wxGrid, getDefaultEditor, 0}},
+ {437, {wxGrid, getDefaultEditorForCell_2, 2}},
+ {438, {wxGrid, getDefaultEditorForCell_1, 1}},
+ {439, {wxGrid, getDefaultEditorForType, 1}},
+ {440, {wxGrid, getDefaultRenderer, 0}},
+ {441, {wxGrid, getDefaultRendererForCell, 2}},
+ {442, {wxGrid, getDefaultRendererForType, 1}},
+ {443, {wxGrid, getDefaultRowLabelSize, 0}},
+ {444, {wxGrid, getDefaultRowSize, 0}},
+ {445, {wxGrid, getGridCursorCol, 0}},
+ {446, {wxGrid, getGridCursorRow, 0}},
+ {447, {wxGrid, getGridLineColour, 0}},
+ {448, {wxGrid, gridLinesEnabled, 0}},
+ {449, {wxGrid, getLabelBackgroundColour, 0}},
+ {450, {wxGrid, getLabelFont, 0}},
+ {451, {wxGrid, getLabelTextColour, 0}},
+ {452, {wxGrid, getNumberCols, 0}},
+ {453, {wxGrid, getNumberRows, 0}},
+ {454, {wxGrid, getOrCreateCellAttr, 2}},
+ {455, {wxGrid, getRowMinimalAcceptableHeight, 0}},
+ {456, {wxGrid, getRowLabelAlignment, 2}},
+ {457, {wxGrid, getRowLabelSize, 0}},
+ {458, {wxGrid, getRowLabelValue, 1}},
+ {459, {wxGrid, getRowSize, 1}},
+ {460, {wxGrid, getScrollLineX, 0}},
+ {461, {wxGrid, getScrollLineY, 0}},
+ {462, {wxGrid, getSelectedCells, 0}},
+ {463, {wxGrid, getSelectedCols, 0}},
+ {464, {wxGrid, getSelectedRows, 0}},
+ {465, {wxGrid, getSelectionBackground, 0}},
+ {466, {wxGrid, getSelectionBlockTopLeft, 0}},
+ {467, {wxGrid, getSelectionBlockBottomRight, 0}},
+ {468, {wxGrid, getSelectionForeground, 0}},
+ {469, {wxGrid, getViewWidth, 0}},
+ {470, {wxGrid, getGridWindow, 0}},
+ {471, {wxGrid, getGridRowLabelWindow, 0}},
+ {472, {wxGrid, getGridColLabelWindow, 0}},
+ {473, {wxGrid, getGridCornerLabelWindow, 0}},
+ {474, {wxGrid, hideCellEditControl, 0}},
+ {475, {wxGrid, insertCols, 1}},
+ {476, {wxGrid, insertRows, 1}},
+ {477, {wxGrid, isCellEditControlEnabled, 0}},
+ {478, {wxGrid, isCurrentCellReadOnly, 0}},
+ {479, {wxGrid, isEditable, 0}},
+ {480, {wxGrid, isInSelection_2, 2}},
+ {481, {wxGrid, isInSelection_1, 1}},
+ {482, {wxGrid, isReadOnly, 2}},
+ {483, {wxGrid, isSelection, 0}},
+ {484, {wxGrid, isVisible_3, 3}},
+ {485, {wxGrid, isVisible_2, 2}},
+ {486, {wxGrid, makeCellVisible_2, 2}},
+ {487, {wxGrid, makeCellVisible_1, 1}},
+ {488, {wxGrid, moveCursorDown, 1}},
+ {489, {wxGrid, moveCursorLeft, 1}},
+ {490, {wxGrid, moveCursorRight, 1}},
+ {491, {wxGrid, moveCursorUp, 1}},
+ {492, {wxGrid, moveCursorDownBlock, 1}},
+ {493, {wxGrid, moveCursorLeftBlock, 1}},
+ {494, {wxGrid, moveCursorRightBlock, 1}},
+ {495, {wxGrid, moveCursorUpBlock, 1}},
+ {496, {wxGrid, movePageDown, 0}},
+ {497, {wxGrid, movePageUp, 0}},
+ {498, {wxGrid, registerDataType, 3}},
+ {499, {wxGrid, saveEditControlValue, 0}},
+ {500, {wxGrid, selectAll, 0}},
+ {501, {wxGrid, selectBlock_5, 5}},
+ {502, {wxGrid, selectBlock_3, 3}},
+ {503, {wxGrid, selectCol, 2}},
+ {504, {wxGrid, selectRow, 2}},
+ {505, {wxGrid, setCellAlignment_4, 4}},
+ {506, {wxGrid, setCellAlignment_3, 3}},
+ {507, {wxGrid, setCellAlignment_1, 1}},
+ {508, {wxGrid, setCellBackgroundColour_3_0, 3}},
+ {509, {wxGrid, setCellBackgroundColour_1, 1}},
+ {510, {wxGrid, setCellBackgroundColour_3_1, 3}},
+ {511, {wxGrid, setCellEditor, 3}},
+ {512, {wxGrid, setCellFont, 3}},
+ {513, {wxGrid, setCellRenderer, 3}},
+ {514, {wxGrid, setCellTextColour_3_0, 3}},
+ {515, {wxGrid, setCellTextColour_3_1, 3}},
+ {516, {wxGrid, setCellTextColour_1, 1}},
+ {517, {wxGrid, setCellValue_3_0, 3}},
+ {518, {wxGrid, setCellValue_2, 2}},
+ {519, {wxGrid, setCellValue_3_1, 3}},
+ {520, {wxGrid, setColAttr, 2}},
+ {521, {wxGrid, setColFormatBool, 1}},
+ {522, {wxGrid, setColFormatNumber, 1}},
+ {523, {wxGrid, setColFormatFloat, 2}},
+ {524, {wxGrid, setColFormatCustom, 2}},
+ {525, {wxGrid, setColLabelAlignment, 2}},
+ {526, {wxGrid, setColLabelSize, 1}},
+ {527, {wxGrid, setColLabelValue, 2}},
+ {528, {wxGrid, setColMinimalWidth, 2}},
+ {529, {wxGrid, setColMinimalAcceptableWidth, 1}},
+ {530, {wxGrid, setColSize, 2}},
+ {531, {wxGrid, setDefaultCellAlignment, 2}},
+ {532, {wxGrid, setDefaultCellBackgroundColour, 1}},
+ {533, {wxGrid, setDefaultCellFont, 1}},
+ {534, {wxGrid, setDefaultCellTextColour, 1}},
+ {535, {wxGrid, setDefaultEditor, 1}},
+ {536, {wxGrid, setDefaultRenderer, 1}},
+ {537, {wxGrid, setDefaultColSize, 2}},
+ {538, {wxGrid, setDefaultRowSize, 2}},
+ {539, {wxGrid, setGridCursor, 2}},
+ {540, {wxGrid, setGridLineColour, 1}},
+ {541, {wxGrid, setLabelBackgroundColour, 1}},
+ {542, {wxGrid, setLabelFont, 1}},
+ {543, {wxGrid, setLabelTextColour, 1}},
+ {544, {wxGrid, setMargins, 2}},
+ {545, {wxGrid, setReadOnly, 3}},
+ {546, {wxGrid, setRowAttr, 2}},
+ {547, {wxGrid, setRowLabelAlignment, 2}},
+ {548, {wxGrid, setRowLabelSize, 1}},
+ {549, {wxGrid, setRowLabelValue, 2}},
+ {550, {wxGrid, setRowMinimalHeight, 2}},
+ {551, {wxGrid, setRowMinimalAcceptableHeight, 1}},
+ {552, {wxGrid, setRowSize, 2}},
+ {553, {wxGrid, setScrollLineX, 1}},
+ {554, {wxGrid, setScrollLineY, 1}},
+ {555, {wxGrid, setSelectionBackground, 1}},
+ {556, {wxGrid, setSelectionForeground, 1}},
+ {557, {wxGrid, setSelectionMode, 1}},
+ {558, {wxGrid, showCellEditControl, 0}},
+ {559, {wxGrid, xToCol, 2}},
+ {560, {wxGrid, xToEdgeOfCol, 1}},
+ {561, {wxGrid, yToEdgeOfRow, 1}},
+ {562, {wxGrid, yToRow, 1}},
+ {563, {wxGridCellRenderer, draw, 7}},
+ {564, {wxGridCellRenderer, getBestSize, 5}},
+ {565, {wxGridCellEditor, create, 3}},
+ {566, {wxGridCellEditor, isCreated, 0}},
+ {567, {wxGridCellEditor, setSize, 1}},
+ {568, {wxGridCellEditor, show, 2}},
+ {569, {wxGridCellEditor, paintBackground, 2}},
+ {570, {wxGridCellEditor, beginEdit, 3}},
+ {571, {wxGridCellEditor, endEdit, 3}},
+ {572, {wxGridCellEditor, reset, 0}},
+ {573, {wxGridCellEditor, startingKey, 1}},
+ {574, {wxGridCellEditor, startingClick, 0}},
+ {575, {wxGridCellEditor, handleReturn, 1}},
+ {576, {wxGridCellBoolRenderer, new, 0}},
+ {577, {wxGridCellBoolRenderer, 'Destroy', undefined}},
+ {578, {wxGridCellBoolEditor, new, 0}},
+ {579, {wxGridCellBoolEditor, isTrueValue, 1}},
+ {580, {wxGridCellBoolEditor, useStringValues, 1}},
+ {581, {wxGridCellBoolEditor, 'Destroy', undefined}},
+ {582, {wxGridCellFloatRenderer, new, 1}},
+ {583, {wxGridCellFloatRenderer, getPrecision, 0}},
+ {584, {wxGridCellFloatRenderer, getWidth, 0}},
+ {585, {wxGridCellFloatRenderer, setParameters, 1}},
+ {586, {wxGridCellFloatRenderer, setPrecision, 1}},
+ {587, {wxGridCellFloatRenderer, setWidth, 1}},
+ {588, {wxGridCellFloatRenderer, 'Destroy', undefined}},
+ {589, {wxGridCellFloatEditor, new, 1}},
+ {590, {wxGridCellFloatEditor, setParameters, 1}},
+ {591, {wxGridCellFloatEditor, 'Destroy', undefined}},
+ {592, {wxGridCellStringRenderer, new, 0}},
+ {593, {wxGridCellStringRenderer, 'Destroy', undefined}},
+ {594, {wxGridCellTextEditor, new, 0}},
+ {595, {wxGridCellTextEditor, setParameters, 1}},
+ {596, {wxGridCellTextEditor, 'Destroy', undefined}},
+ {598, {wxGridCellChoiceEditor, new, 2}},
+ {599, {wxGridCellChoiceEditor, setParameters, 1}},
+ {600, {wxGridCellChoiceEditor, 'Destroy', undefined}},
+ {601, {wxGridCellNumberRenderer, new, 0}},
+ {602, {wxGridCellNumberRenderer, 'Destroy', undefined}},
+ {603, {wxGridCellNumberEditor, new, 1}},
+ {604, {wxGridCellNumberEditor, getValue, 0}},
+ {605, {wxGridCellNumberEditor, setParameters, 1}},
+ {606, {wxGridCellNumberEditor, 'Destroy', undefined}},
+ {607, {wxGridCellAttr, setTextColour, 1}},
+ {608, {wxGridCellAttr, setBackgroundColour, 1}},
+ {609, {wxGridCellAttr, setFont, 1}},
+ {610, {wxGridCellAttr, setAlignment, 2}},
+ {611, {wxGridCellAttr, setReadOnly, 1}},
+ {612, {wxGridCellAttr, setRenderer, 1}},
+ {613, {wxGridCellAttr, setEditor, 1}},
+ {614, {wxGridCellAttr, hasTextColour, 0}},
+ {615, {wxGridCellAttr, hasBackgroundColour, 0}},
+ {616, {wxGridCellAttr, hasFont, 0}},
+ {617, {wxGridCellAttr, hasAlignment, 0}},
+ {618, {wxGridCellAttr, hasRenderer, 0}},
+ {619, {wxGridCellAttr, hasEditor, 0}},
+ {620, {wxGridCellAttr, getTextColour, 0}},
+ {621, {wxGridCellAttr, getBackgroundColour, 0}},
+ {622, {wxGridCellAttr, getFont, 0}},
+ {623, {wxGridCellAttr, getAlignment, 2}},
+ {624, {wxGridCellAttr, getRenderer, 3}},
+ {625, {wxGridCellAttr, getEditor, 3}},
+ {626, {wxGridCellAttr, isReadOnly, 0}},
+ {627, {wxGridCellAttr, setDefAttr, 1}},
+ {628, {wxDC, blit, 5}},
+ {629, {wxDC, calcBoundingBox, 2}},
+ {630, {wxDC, clear, 0}},
+ {631, {wxDC, computeScaleAndOrigin, 0}},
+ {632, {wxDC, crossHair, 1}},
+ {633, {wxDC, destroyClippingRegion, 0}},
+ {634, {wxDC, deviceToLogicalX, 1}},
+ {635, {wxDC, deviceToLogicalXRel, 1}},
+ {636, {wxDC, deviceToLogicalY, 1}},
+ {637, {wxDC, deviceToLogicalYRel, 1}},
+ {638, {wxDC, drawArc, 3}},
+ {639, {wxDC, drawBitmap, 3}},
+ {640, {wxDC, drawCheckMark, 1}},
+ {641, {wxDC, drawCircle, 2}},
+ {643, {wxDC, drawEllipse_2, 2}},
+ {644, {wxDC, drawEllipse_1, 1}},
+ {645, {wxDC, drawEllipticArc, 4}},
+ {646, {wxDC, drawIcon, 2}},
+ {647, {wxDC, drawLabel, 3}},
+ {648, {wxDC, drawLine, 2}},
+ {649, {wxDC, drawLines, 3}},
+ {651, {wxDC, drawPolygon, 3}},
+ {653, {wxDC, drawPoint, 1}},
+ {655, {wxDC, drawRectangle_2, 2}},
+ {656, {wxDC, drawRectangle_1, 1}},
+ {657, {wxDC, drawRotatedText, 3}},
+ {659, {wxDC, drawRoundedRectangle_3, 3}},
+ {660, {wxDC, drawRoundedRectangle_2, 2}},
+ {661, {wxDC, drawText, 2}},
+ {662, {wxDC, endDoc, 0}},
+ {663, {wxDC, endPage, 0}},
+ {664, {wxDC, floodFill, 3}},
+ {665, {wxDC, getBackground, 0}},
+ {666, {wxDC, getBackgroundMode, 0}},
+ {667, {wxDC, getBrush, 0}},
+ {668, {wxDC, getCharHeight, 0}},
+ {669, {wxDC, getCharWidth, 0}},
+ {670, {wxDC, getClippingBox, 4}},
+ {672, {wxDC, getFont, 0}},
+ {673, {wxDC, getLayoutDirection, 0}},
+ {674, {wxDC, getLogicalFunction, 0}},
+ {675, {wxDC, getMapMode, 0}},
+ {676, {wxDC, getMultiLineTextExtent_4, 4}},
+ {677, {wxDC, getMultiLineTextExtent_1, 1}},
+ {678, {wxDC, getPartialTextExtents, 2}},
+ {679, {wxDC, getPen, 0}},
+ {680, {wxDC, getPixel, 2}},
+ {681, {wxDC, getPPI, 0}},
+ {683, {wxDC, getSize, 0}},
+ {685, {wxDC, getSizeMM, 0}},
+ {686, {wxDC, getTextBackground, 0}},
+ {687, {wxDC, getTextExtent_4, 4}},
+ {688, {wxDC, getTextExtent_1, 1}},
+ {690, {wxDC, getTextForeground, 0}},
+ {691, {wxDC, getUserScale, 2}},
+ {692, {wxDC, gradientFillConcentric_3, 3}},
+ {693, {wxDC, gradientFillConcentric_4, 4}},
+ {694, {wxDC, gradientFillLinear, 4}},
+ {695, {wxDC, logicalToDeviceX, 1}},
+ {696, {wxDC, logicalToDeviceXRel, 1}},
+ {697, {wxDC, logicalToDeviceY, 1}},
+ {698, {wxDC, logicalToDeviceYRel, 1}},
+ {699, {wxDC, maxX, 0}},
+ {700, {wxDC, maxY, 0}},
+ {701, {wxDC, minX, 0}},
+ {702, {wxDC, minY, 0}},
+ {703, {wxDC, isOk, 0}},
+ {704, {wxDC, resetBoundingBox, 0}},
+ {705, {wxDC, setAxisOrientation, 2}},
+ {706, {wxDC, setBackground, 1}},
+ {707, {wxDC, setBackgroundMode, 1}},
+ {708, {wxDC, setBrush, 1}},
+ {710, {wxDC, setClippingRegion_2, 2}},
+ {711, {wxDC, setClippingRegion_1_1, 1}},
+ {712, {wxDC, setClippingRegion_1_0, 1}},
+ {713, {wxDC, setDeviceOrigin, 2}},
+ {714, {wxDC, setFont, 1}},
+ {715, {wxDC, setLayoutDirection, 1}},
+ {716, {wxDC, setLogicalFunction, 1}},
+ {717, {wxDC, setMapMode, 1}},
+ {718, {wxDC, setPalette, 1}},
+ {719, {wxDC, setPen, 1}},
+ {720, {wxDC, setTextBackground, 1}},
+ {721, {wxDC, setTextForeground, 1}},
+ {722, {wxDC, setUserScale, 2}},
+ {723, {wxDC, startDoc, 1}},
+ {724, {wxDC, startPage, 0}},
+ {725, {wxMirrorDC, new, 2}},
+ {726, {wxMirrorDC, 'Destroy', undefined}},
+ {727, {wxScreenDC, new, 0}},
+ {728, {wxScreenDC, destruct, 0}},
+ {729, {wxPostScriptDC, new_0, 0}},
+ {730, {wxPostScriptDC, new_1, 1}},
+ {731, {wxPostScriptDC, destruct, 0}},
+ {732, {wxPostScriptDC, setResolution, 1}},
+ {733, {wxPostScriptDC, getResolution, 0}},
+ {734, {wxWindowDC, new_0, 0}},
+ {735, {wxWindowDC, new_1, 1}},
+ {736, {wxWindowDC, destruct, 0}},
+ {737, {wxClientDC, new_0, 0}},
+ {738, {wxClientDC, new_1, 1}},
+ {739, {wxClientDC, 'Destroy', undefined}},
+ {740, {wxPaintDC, new_0, 0}},
+ {741, {wxPaintDC, new_1, 1}},
+ {742, {wxPaintDC, 'Destroy', undefined}},
+ {744, {wxMemoryDC, new_1_0, 1}},
+ {745, {wxMemoryDC, new_1_1, 1}},
+ {746, {wxMemoryDC, new_0, 0}},
+ {748, {wxMemoryDC, destruct, 0}},
+ {749, {wxMemoryDC, selectObject, 1}},
+ {750, {wxMemoryDC, selectObjectAsSource, 1}},
+ {751, {wxBufferedDC, new_0, 0}},
+ {752, {wxBufferedDC, new_2, 2}},
+ {753, {wxBufferedDC, new_3, 3}},
+ {754, {wxBufferedDC, destruct, 0}},
+ {755, {wxBufferedDC, init_2, 2}},
+ {756, {wxBufferedDC, init_3, 3}},
+ {757, {wxBufferedPaintDC, new_3, 3}},
+ {758, {wxBufferedPaintDC, new_2, 2}},
+ {759, {wxBufferedPaintDC, destruct, 0}},
+ {760, {wxGraphicsObject, destruct, 0}},
+ {761, {wxGraphicsObject, getRenderer, 0}},
+ {762, {wxGraphicsObject, isNull, 0}},
+ {763, {wxGraphicsContext, destruct, 0}},
+ {764, {wxGraphicsContext, create_1_1, 1}},
+ {765, {wxGraphicsContext, create_1_0, 1}},
+ {766, {wxGraphicsContext, create_0, 0}},
+ {767, {wxGraphicsContext, createPen, 1}},
+ {768, {wxGraphicsContext, createBrush, 1}},
+ {769, {wxGraphicsContext, createRadialGradientBrush, 7}},
+ {770, {wxGraphicsContext, createLinearGradientBrush, 6}},
+ {771, {wxGraphicsContext, createFont, 2}},
+ {772, {wxGraphicsContext, createMatrix, 1}},
+ {773, {wxGraphicsContext, createPath, 0}},
+ {774, {wxGraphicsContext, clip_1, 1}},
+ {775, {wxGraphicsContext, clip_4, 4}},
+ {776, {wxGraphicsContext, resetClip, 0}},
+ {777, {wxGraphicsContext, drawBitmap, 5}},
+ {778, {wxGraphicsContext, drawEllipse, 4}},
+ {779, {wxGraphicsContext, drawIcon, 5}},
+ {780, {wxGraphicsContext, drawLines, 3}},
+ {781, {wxGraphicsContext, drawPath, 2}},
+ {782, {wxGraphicsContext, drawRectangle, 4}},
+ {783, {wxGraphicsContext, drawRoundedRectangle, 5}},
+ {784, {wxGraphicsContext, drawText_3, 3}},
+ {785, {wxGraphicsContext, drawText_4_0, 4}},
+ {786, {wxGraphicsContext, drawText_4_1, 4}},
+ {787, {wxGraphicsContext, drawText_5, 5}},
+ {788, {wxGraphicsContext, fillPath, 2}},
+ {789, {wxGraphicsContext, strokePath, 1}},
+ {790, {wxGraphicsContext, getPartialTextExtents, 2}},
+ {791, {wxGraphicsContext, getTextExtent, 5}},
+ {792, {wxGraphicsContext, rotate, 1}},
+ {793, {wxGraphicsContext, scale, 2}},
+ {794, {wxGraphicsContext, translate, 2}},
+ {795, {wxGraphicsContext, getTransform, 0}},
+ {796, {wxGraphicsContext, setTransform, 1}},
+ {797, {wxGraphicsContext, concatTransform, 1}},
+ {798, {wxGraphicsContext, setBrush_1_1, 1}},
+ {799, {wxGraphicsContext, setBrush_1_0, 1}},
+ {800, {wxGraphicsContext, setFont_1, 1}},
+ {801, {wxGraphicsContext, setFont_2, 2}},
+ {802, {wxGraphicsContext, setPen_1_0, 1}},
+ {803, {wxGraphicsContext, setPen_1_1, 1}},
+ {804, {wxGraphicsContext, strokeLine, 4}},
+ {805, {wxGraphicsContext, strokeLines, 2}},
+ {807, {wxGraphicsMatrix, concat, 1}},
+ {809, {wxGraphicsMatrix, get, 1}},
+ {810, {wxGraphicsMatrix, invert, 0}},
+ {811, {wxGraphicsMatrix, isEqual, 1}},
+ {813, {wxGraphicsMatrix, isIdentity, 0}},
+ {814, {wxGraphicsMatrix, rotate, 1}},
+ {815, {wxGraphicsMatrix, scale, 2}},
+ {816, {wxGraphicsMatrix, translate, 2}},
+ {817, {wxGraphicsMatrix, set, 1}},
+ {818, {wxGraphicsMatrix, transformPoint, 2}},
+ {819, {wxGraphicsMatrix, transformDistance, 2}},
+ {820, {wxGraphicsPath, moveToPoint_2, 2}},
+ {821, {wxGraphicsPath, moveToPoint_1, 1}},
+ {822, {wxGraphicsPath, addArc_6, 6}},
+ {823, {wxGraphicsPath, addArc_5, 5}},
+ {824, {wxGraphicsPath, addArcToPoint, 5}},
+ {825, {wxGraphicsPath, addCircle, 3}},
+ {826, {wxGraphicsPath, addCurveToPoint_6, 6}},
+ {827, {wxGraphicsPath, addCurveToPoint_3, 3}},
+ {828, {wxGraphicsPath, addEllipse, 4}},
+ {829, {wxGraphicsPath, addLineToPoint_2, 2}},
+ {830, {wxGraphicsPath, addLineToPoint_1, 1}},
+ {831, {wxGraphicsPath, addPath, 1}},
+ {832, {wxGraphicsPath, addQuadCurveToPoint, 4}},
+ {833, {wxGraphicsPath, addRectangle, 4}},
+ {834, {wxGraphicsPath, addRoundedRectangle, 5}},
+ {835, {wxGraphicsPath, closeSubpath, 0}},
+ {836, {wxGraphicsPath, contains_3, 3}},
+ {837, {wxGraphicsPath, contains_2, 2}},
+ {839, {wxGraphicsPath, getBox, 0}},
+ {841, {wxGraphicsPath, getCurrentPoint, 0}},
+ {842, {wxGraphicsPath, transform, 1}},
+ {843, {wxGraphicsRenderer, getDefaultRenderer, 0}},
+ {844, {wxGraphicsRenderer, createContext_1_1, 1}},
+ {845, {wxGraphicsRenderer, createContext_1_0, 1}},
+ {846, {wxGraphicsRenderer, createPen, 1}},
+ {847, {wxGraphicsRenderer, createBrush, 1}},
+ {848, {wxGraphicsRenderer, createLinearGradientBrush, 6}},
+ {849, {wxGraphicsRenderer, createRadialGradientBrush, 7}},
+ {850, {wxGraphicsRenderer, createFont, 2}},
+ {851, {wxGraphicsRenderer, createMatrix, 1}},
+ {852, {wxGraphicsRenderer, createPath, 0}},
+ {854, {wxMenuBar, new_1, 1}},
+ {856, {wxMenuBar, new_0, 0}},
+ {858, {wxMenuBar, destruct, 0}},
+ {859, {wxMenuBar, append, 2}},
+ {860, {wxMenuBar, check, 2}},
+ {861, {wxMenuBar, enable_2, 2}},
+ {862, {wxMenuBar, enable_1, 1}},
+ {863, {wxMenuBar, enableTop, 2}},
+ {864, {wxMenuBar, findMenu, 1}},
+ {865, {wxMenuBar, findMenuItem, 2}},
+ {866, {wxMenuBar, findItem, 2}},
+ {867, {wxMenuBar, getHelpString, 1}},
+ {868, {wxMenuBar, getLabel_1, 1}},
+ {869, {wxMenuBar, getLabel_0, 0}},
+ {870, {wxMenuBar, getLabelTop, 1}},
+ {871, {wxMenuBar, getMenu, 1}},
+ {872, {wxMenuBar, getMenuCount, 0}},
+ {873, {wxMenuBar, insert, 3}},
+ {874, {wxMenuBar, isChecked, 1}},
+ {875, {wxMenuBar, isEnabled_1, 1}},
+ {876, {wxMenuBar, isEnabled_0, 0}},
+ {877, {wxMenuBar, remove, 1}},
+ {878, {wxMenuBar, replace, 3}},
+ {879, {wxMenuBar, setHelpString, 2}},
+ {880, {wxMenuBar, setLabel_2, 2}},
+ {881, {wxMenuBar, setLabel_1, 1}},
+ {882, {wxMenuBar, setLabelTop, 2}},
+ {883, {wxControl, getLabel, 0}},
+ {884, {wxControl, setLabel, 1}},
+ {885, {wxControlWithItems, append_1, 1}},
+ {886, {wxControlWithItems, append_2, 2}},
+ {887, {wxControlWithItems, appendStrings_1, 1}},
+ {888, {wxControlWithItems, clear, 0}},
+ {889, {wxControlWithItems, delete, 1}},
+ {890, {wxControlWithItems, findString, 2}},
+ {891, {wxControlWithItems, getClientData, 1}},
+ {892, {wxControlWithItems, setClientData, 2}},
+ {893, {wxControlWithItems, getCount, 0}},
+ {894, {wxControlWithItems, getSelection, 0}},
+ {895, {wxControlWithItems, getString, 1}},
+ {896, {wxControlWithItems, getStringSelection, 0}},
+ {897, {wxControlWithItems, insert_2, 2}},
+ {898, {wxControlWithItems, insert_3, 3}},
+ {899, {wxControlWithItems, isEmpty, 0}},
+ {900, {wxControlWithItems, select, 1}},
+ {901, {wxControlWithItems, setSelection, 1}},
+ {902, {wxControlWithItems, setString, 2}},
+ {903, {wxControlWithItems, setStringSelection, 1}},
+ {906, {wxMenu, new_2, 2}},
+ {907, {wxMenu, new_1, 1}},
+ {909, {wxMenu, destruct, 0}},
+ {910, {wxMenu, append_3, 3}},
+ {911, {wxMenu, append_1, 1}},
+ {912, {wxMenu, append_4_0, 4}},
+ {913, {wxMenu, append_4_1, 4}},
+ {914, {wxMenu, appendCheckItem, 3}},
+ {915, {wxMenu, appendRadioItem, 3}},
+ {916, {wxMenu, appendSeparator, 0}},
+ {917, {wxMenu, break, 0}},
+ {918, {wxMenu, check, 2}},
+ {919, {wxMenu, delete_1_0, 1}},
+ {920, {wxMenu, delete_1_1, 1}},
+ {921, {wxMenu, destroy_1_0, 1}},
+ {922, {wxMenu, destroy_1_1, 1}},
+ {923, {wxMenu, enable, 2}},
+ {924, {wxMenu, findItem_1, 1}},
+ {925, {wxMenu, findItem_2, 2}},
+ {926, {wxMenu, findItemByPosition, 1}},
+ {927, {wxMenu, getHelpString, 1}},
+ {928, {wxMenu, getLabel, 1}},
+ {929, {wxMenu, getMenuItemCount, 0}},
+ {930, {wxMenu, getMenuItems, 0}},
+ {932, {wxMenu, getTitle, 0}},
+ {933, {wxMenu, insert_2, 2}},
+ {934, {wxMenu, insert_3, 3}},
+ {935, {wxMenu, insert_5_1, 5}},
+ {936, {wxMenu, insert_5_0, 5}},
+ {937, {wxMenu, insertCheckItem, 4}},
+ {938, {wxMenu, insertRadioItem, 4}},
+ {939, {wxMenu, insertSeparator, 1}},
+ {940, {wxMenu, isChecked, 1}},
+ {941, {wxMenu, isEnabled, 1}},
+ {942, {wxMenu, prepend_1, 1}},
+ {943, {wxMenu, prepend_2, 2}},
+ {944, {wxMenu, prepend_4_1, 4}},
+ {945, {wxMenu, prepend_4_0, 4}},
+ {946, {wxMenu, prependCheckItem, 3}},
+ {947, {wxMenu, prependRadioItem, 3}},
+ {948, {wxMenu, prependSeparator, 0}},
+ {949, {wxMenu, remove_1_0, 1}},
+ {950, {wxMenu, remove_1_1, 1}},
+ {951, {wxMenu, setHelpString, 2}},
+ {952, {wxMenu, setLabel, 2}},
+ {953, {wxMenu, setTitle, 1}},
+ {954, {wxMenuItem, new, 1}},
+ {956, {wxMenuItem, destruct, 0}},
+ {957, {wxMenuItem, check, 1}},
+ {958, {wxMenuItem, enable, 1}},
+ {959, {wxMenuItem, getBitmap, 0}},
+ {960, {wxMenuItem, getHelp, 0}},
+ {961, {wxMenuItem, getId, 0}},
+ {962, {wxMenuItem, getKind, 0}},
+ {963, {wxMenuItem, getLabel, 0}},
+ {964, {wxMenuItem, getLabelFromText, 1}},
+ {965, {wxMenuItem, getMenu, 0}},
+ {966, {wxMenuItem, getText, 0}},
+ {967, {wxMenuItem, getSubMenu, 0}},
+ {968, {wxMenuItem, isCheckable, 0}},
+ {969, {wxMenuItem, isChecked, 0}},
+ {970, {wxMenuItem, isEnabled, 0}},
+ {971, {wxMenuItem, isSeparator, 0}},
+ {972, {wxMenuItem, isSubMenu, 0}},
+ {973, {wxMenuItem, setBitmap, 1}},
+ {974, {wxMenuItem, setHelp, 1}},
+ {975, {wxMenuItem, setMenu, 1}},
+ {976, {wxMenuItem, setSubMenu, 1}},
+ {977, {wxMenuItem, setText, 1}},
+ {978, {wxToolBar, addControl, 1}},
+ {979, {wxToolBar, addSeparator, 0}},
+ {980, {wxToolBar, addTool_5, 5}},
+ {981, {wxToolBar, addTool_4_0, 4}},
+ {982, {wxToolBar, addTool_1, 1}},
+ {983, {wxToolBar, addTool_4_1, 4}},
+ {984, {wxToolBar, addTool_3, 3}},
+ {985, {wxToolBar, addTool_6, 6}},
+ {986, {wxToolBar, addCheckTool, 4}},
+ {987, {wxToolBar, addRadioTool, 4}},
+ {988, {wxToolBar, addStretchableSpace, 0}},
+ {989, {wxToolBar, insertStretchableSpace, 1}},
+ {990, {wxToolBar, deleteTool, 1}},
+ {991, {wxToolBar, deleteToolByPos, 1}},
+ {992, {wxToolBar, enableTool, 2}},
+ {993, {wxToolBar, findById, 1}},
+ {994, {wxToolBar, findControl, 1}},
+ {995, {wxToolBar, findToolForPosition, 2}},
+ {996, {wxToolBar, getToolSize, 0}},
+ {997, {wxToolBar, getToolBitmapSize, 0}},
+ {998, {wxToolBar, getMargins, 0}},
+ {999, {wxToolBar, getToolEnabled, 1}},
+ {1000, {wxToolBar, getToolLongHelp, 1}},
+ {1001, {wxToolBar, getToolPacking, 0}},
+ {1002, {wxToolBar, getToolPos, 1}},
+ {1003, {wxToolBar, getToolSeparation, 0}},
+ {1004, {wxToolBar, getToolShortHelp, 1}},
+ {1005, {wxToolBar, getToolState, 1}},
+ {1006, {wxToolBar, insertControl, 2}},
+ {1007, {wxToolBar, insertSeparator, 1}},
+ {1008, {wxToolBar, insertTool_5, 5}},
+ {1009, {wxToolBar, insertTool_2, 2}},
+ {1010, {wxToolBar, insertTool_4, 4}},
+ {1011, {wxToolBar, realize, 0}},
+ {1012, {wxToolBar, removeTool, 1}},
+ {1013, {wxToolBar, setMargins, 2}},
+ {1014, {wxToolBar, setToolBitmapSize, 1}},
+ {1015, {wxToolBar, setToolLongHelp, 2}},
+ {1016, {wxToolBar, setToolPacking, 1}},
+ {1017, {wxToolBar, setToolShortHelp, 2}},
+ {1018, {wxToolBar, setToolSeparation, 1}},
+ {1019, {wxToolBar, toggleTool, 2}},
+ {1021, {wxStatusBar, new_0, 0}},
+ {1022, {wxStatusBar, new_2, 2}},
+ {1024, {wxStatusBar, destruct, 0}},
+ {1025, {wxStatusBar, create, 2}},
+ {1026, {wxStatusBar, getFieldRect, 2}},
+ {1027, {wxStatusBar, getFieldsCount, 0}},
+ {1028, {wxStatusBar, getStatusText, 1}},
+ {1029, {wxStatusBar, popStatusText, 1}},
+ {1030, {wxStatusBar, pushStatusText, 2}},
+ {1031, {wxStatusBar, setFieldsCount, 2}},
+ {1032, {wxStatusBar, setMinHeight, 1}},
+ {1033, {wxStatusBar, setStatusText, 2}},
+ {1034, {wxStatusBar, setStatusWidths, 2}},
+ {1035, {wxStatusBar, setStatusStyles, 2}},
+ {1036, {wxBitmap, new_0, 0}},
+ {1037, {wxBitmap, new_3, 3}},
+ {1038, {wxBitmap, new_4, 4}},
+ {1039, {wxBitmap, new_2_0, 2}},
+ {1040, {wxBitmap, new_2_1, 2}},
+ {1041, {wxBitmap, destruct, 0}},
+ {1042, {wxBitmap, convertToImage, 0}},
+ {1043, {wxBitmap, copyFromIcon, 1}},
+ {1044, {wxBitmap, create, 3}},
+ {1045, {wxBitmap, getDepth, 0}},
+ {1046, {wxBitmap, getHeight, 0}},
+ {1047, {wxBitmap, getPalette, 0}},
+ {1048, {wxBitmap, getMask, 0}},
+ {1049, {wxBitmap, getWidth, 0}},
+ {1050, {wxBitmap, getSubBitmap, 1}},
+ {1051, {wxBitmap, loadFile, 2}},
+ {1052, {wxBitmap, ok, 0}},
+ {1053, {wxBitmap, saveFile, 3}},
+ {1054, {wxBitmap, setDepth, 1}},
+ {1055, {wxBitmap, setHeight, 1}},
+ {1056, {wxBitmap, setMask, 1}},
+ {1057, {wxBitmap, setPalette, 1}},
+ {1058, {wxBitmap, setWidth, 1}},
+ {1059, {wxIcon, new_0, 0}},
+ {1060, {wxIcon, new_2, 2}},
+ {1061, {wxIcon, new_1, 1}},
+ {1062, {wxIcon, copyFromBitmap, 1}},
+ {1063, {wxIcon, 'Destroy', undefined}},
+ {1064, {wxIconBundle, new_0, 0}},
+ {1065, {wxIconBundle, new_2, 2}},
+ {1066, {wxIconBundle, new_1_0, 1}},
+ {1067, {wxIconBundle, new_1_1, 1}},
+ {1068, {wxIconBundle, destruct, 0}},
+ {1069, {wxIconBundle, addIcon_2, 2}},
+ {1070, {wxIconBundle, addIcon_1, 1}},
+ {1071, {wxIconBundle, getIcon_1_1, 1}},
+ {1072, {wxIconBundle, getIcon_1_0, 1}},
+ {1073, {wxCursor, new_0, 0}},
+ {1074, {wxCursor, new_1_0, 1}},
+ {1075, {wxCursor, new_1_1, 1}},
+ {1076, {wxCursor, new_4, 4}},
+ {1077, {wxCursor, destruct, 0}},
+ {1078, {wxCursor, ok, 0}},
+ {1079, {wxMask, new_0, 0}},
+ {1080, {wxMask, new_2_1, 2}},
+ {1081, {wxMask, new_2_0, 2}},
+ {1082, {wxMask, new_1, 1}},
+ {1083, {wxMask, destruct, 0}},
+ {1084, {wxMask, create_2_1, 2}},
+ {1085, {wxMask, create_2_0, 2}},
+ {1086, {wxMask, create_1, 1}},
+ {1087, {wxImage, new_0, 0}},
+ {1088, {wxImage, new_3_0, 3}},
+ {1089, {wxImage, new_4, 4}},
+ {1090, {wxImage, new_5, 5}},
+ {1091, {wxImage, new_2, 2}},
+ {1092, {wxImage, new_3_1, 3}},
+ {1093, {wxImage, blur, 1}},
+ {1094, {wxImage, blurHorizontal, 1}},
+ {1095, {wxImage, blurVertical, 1}},
+ {1096, {wxImage, convertAlphaToMask, 1}},
+ {1097, {wxImage, convertToGreyscale, 1}},
+ {1098, {wxImage, convertToMono, 3}},
+ {1099, {wxImage, copy, 0}},
+ {1100, {wxImage, create_3, 3}},
+ {1101, {wxImage, create_4, 4}},
+ {1102, {wxImage, create_5, 5}},
+ {1103, {wxImage, 'Destroy', 0}},
+ {1104, {wxImage, findFirstUnusedColour, 4}},
+ {1105, {wxImage, getImageExtWildcard, 0}},
+ {1106, {wxImage, getAlpha_2, 2}},
+ {1107, {wxImage, getAlpha_0, 0}},
+ {1108, {wxImage, getBlue, 2}},
+ {1109, {wxImage, getData, 0}},
+ {1110, {wxImage, getGreen, 2}},
+ {1111, {wxImage, getImageCount, 2}},
+ {1112, {wxImage, getHeight, 0}},
+ {1113, {wxImage, getMaskBlue, 0}},
+ {1114, {wxImage, getMaskGreen, 0}},
+ {1115, {wxImage, getMaskRed, 0}},
+ {1116, {wxImage, getOrFindMaskColour, 3}},
+ {1117, {wxImage, getPalette, 0}},
+ {1118, {wxImage, getRed, 2}},
+ {1119, {wxImage, getSubImage, 1}},
+ {1120, {wxImage, getWidth, 0}},
+ {1121, {wxImage, hasAlpha, 0}},
+ {1122, {wxImage, hasMask, 0}},
+ {1123, {wxImage, getOption, 1}},
+ {1124, {wxImage, getOptionInt, 1}},
+ {1125, {wxImage, hasOption, 1}},
+ {1126, {wxImage, initAlpha, 0}},
+ {1127, {wxImage, initStandardHandlers, 0}},
+ {1128, {wxImage, isTransparent, 3}},
+ {1129, {wxImage, loadFile_2, 2}},
+ {1130, {wxImage, loadFile_3, 3}},
+ {1131, {wxImage, ok, 0}},
+ {1132, {wxImage, removeHandler, 1}},
+ {1133, {wxImage, mirror, 1}},
+ {1134, {wxImage, replace, 6}},
+ {1135, {wxImage, rescale, 3}},
+ {1136, {wxImage, resize, 3}},
+ {1137, {wxImage, rotate, 3}},
+ {1138, {wxImage, rotateHue, 1}},
+ {1139, {wxImage, rotate90, 1}},
+ {1140, {wxImage, saveFile_1, 1}},
+ {1141, {wxImage, saveFile_2_0, 2}},
+ {1142, {wxImage, saveFile_2_1, 2}},
+ {1143, {wxImage, scale, 3}},
+ {1144, {wxImage, size, 3}},
+ {1145, {wxImage, setAlpha_3, 3}},
+ {1146, {wxImage, setAlpha_2, 2}},
+ {1147, {wxImage, setData_2, 2}},
+ {1148, {wxImage, setData_4, 4}},
+ {1149, {wxImage, setMask, 1}},
+ {1150, {wxImage, setMaskColour, 3}},
+ {1151, {wxImage, setMaskFromImage, 4}},
+ {1152, {wxImage, setOption_2_1, 2}},
+ {1153, {wxImage, setOption_2_0, 2}},
+ {1154, {wxImage, setPalette, 1}},
+ {1155, {wxImage, setRGB_5, 5}},
+ {1156, {wxImage, setRGB_4, 4}},
+ {1157, {wxImage, 'Destroy', undefined}},
+ {1158, {wxBrush, new_0, 0}},
+ {1159, {wxBrush, new_2, 2}},
+ {1160, {wxBrush, new_1, 1}},
+ {1162, {wxBrush, destruct, 0}},
+ {1163, {wxBrush, getColour, 0}},
+ {1164, {wxBrush, getStipple, 0}},
+ {1165, {wxBrush, getStyle, 0}},
+ {1166, {wxBrush, isHatch, 0}},
+ {1167, {wxBrush, isOk, 0}},
+ {1168, {wxBrush, setColour_1, 1}},
+ {1169, {wxBrush, setColour_3, 3}},
+ {1170, {wxBrush, setStipple, 1}},
+ {1171, {wxBrush, setStyle, 1}},
+ {1172, {wxPen, new_0, 0}},
+ {1173, {wxPen, new_2, 2}},
+ {1174, {wxPen, destruct, 0}},
+ {1175, {wxPen, getCap, 0}},
+ {1176, {wxPen, getColour, 0}},
+ {1177, {wxPen, getJoin, 0}},
+ {1178, {wxPen, getStyle, 0}},
+ {1179, {wxPen, getWidth, 0}},
+ {1180, {wxPen, isOk, 0}},
+ {1181, {wxPen, setCap, 1}},
+ {1182, {wxPen, setColour_1, 1}},
+ {1183, {wxPen, setColour_3, 3}},
+ {1184, {wxPen, setJoin, 1}},
+ {1185, {wxPen, setStyle, 1}},
+ {1186, {wxPen, setWidth, 1}},
+ {1187, {wxRegion, new_0, 0}},
+ {1188, {wxRegion, new_4, 4}},
+ {1189, {wxRegion, new_2, 2}},
+ {1190, {wxRegion, new_1_1, 1}},
+ {1192, {wxRegion, new_1_0, 1}},
+ {1194, {wxRegion, destruct, 0}},
+ {1195, {wxRegion, clear, 0}},
+ {1196, {wxRegion, contains_2, 2}},
+ {1197, {wxRegion, contains_1_0, 1}},
+ {1198, {wxRegion, contains_4, 4}},
+ {1199, {wxRegion, contains_1_1, 1}},
+ {1200, {wxRegion, convertToBitmap, 0}},
+ {1201, {wxRegion, getBox, 0}},
+ {1202, {wxRegion, intersect_4, 4}},
+ {1203, {wxRegion, intersect_1_1, 1}},
+ {1204, {wxRegion, intersect_1_0, 1}},
+ {1205, {wxRegion, isEmpty, 0}},
+ {1206, {wxRegion, subtract_4, 4}},
+ {1207, {wxRegion, subtract_1_1, 1}},
+ {1208, {wxRegion, subtract_1_0, 1}},
+ {1209, {wxRegion, offset_2, 2}},
+ {1210, {wxRegion, offset_1, 1}},
+ {1211, {wxRegion, union_4, 4}},
+ {1212, {wxRegion, union_1_2, 1}},
+ {1213, {wxRegion, union_1_1, 1}},
+ {1214, {wxRegion, union_1_0, 1}},
+ {1215, {wxRegion, union_3, 3}},
+ {1216, {wxRegion, xor_4, 4}},
+ {1217, {wxRegion, xor_1_1, 1}},
+ {1218, {wxRegion, xor_1_0, 1}},
+ {1219, {wxAcceleratorTable, new_0, 0}},
+ {1220, {wxAcceleratorTable, new_2, 2}},
+ {1221, {wxAcceleratorTable, destruct, 0}},
+ {1222, {wxAcceleratorTable, ok, 0}},
+ {1223, {wxAcceleratorEntry, new_1_0, 1}},
+ {1224, {wxAcceleratorEntry, new_1_1, 1}},
+ {1225, {wxAcceleratorEntry, getCommand, 0}},
+ {1226, {wxAcceleratorEntry, getFlags, 0}},
+ {1227, {wxAcceleratorEntry, getKeyCode, 0}},
+ {1228, {wxAcceleratorEntry, set, 4}},
+ {1229, {wxAcceleratorEntry, 'Destroy', undefined}},
+ {1234, {wxCaret, new_3, 3}},
+ {1235, {wxCaret, new_2, 2}},
+ {1237, {wxCaret, destruct, 0}},
+ {1238, {wxCaret, create_3, 3}},
+ {1239, {wxCaret, create_2, 2}},
+ {1240, {wxCaret, getBlinkTime, 0}},
+ {1242, {wxCaret, getPosition, 0}},
+ {1244, {wxCaret, getSize, 0}},
+ {1245, {wxCaret, getWindow, 0}},
+ {1246, {wxCaret, hide, 0}},
+ {1247, {wxCaret, isOk, 0}},
+ {1248, {wxCaret, isVisible, 0}},
+ {1249, {wxCaret, move_2, 2}},
+ {1250, {wxCaret, move_1, 1}},
+ {1251, {wxCaret, setBlinkTime, 1}},
+ {1252, {wxCaret, setSize_2, 2}},
+ {1253, {wxCaret, setSize_1, 1}},
+ {1254, {wxCaret, show, 1}},
+ {1255, {wxSizer, add_2_1, 2}},
+ {1256, {wxSizer, add_2_0, 2}},
+ {1257, {wxSizer, add_3, 3}},
+ {1258, {wxSizer, add_2_3, 2}},
+ {1259, {wxSizer, add_2_2, 2}},
+ {1260, {wxSizer, addSpacer, 1}},
+ {1261, {wxSizer, addStretchSpacer, 1}},
+ {1262, {wxSizer, calcMin, 0}},
+ {1263, {wxSizer, clear, 1}},
+ {1264, {wxSizer, detach_1_2, 1}},
+ {1265, {wxSizer, detach_1_1, 1}},
+ {1266, {wxSizer, detach_1_0, 1}},
+ {1267, {wxSizer, fit, 1}},
+ {1268, {wxSizer, fitInside, 1}},
+ {1269, {wxSizer, getChildren, 0}},
+ {1270, {wxSizer, getItem_2_1, 2}},
+ {1271, {wxSizer, getItem_2_0, 2}},
+ {1272, {wxSizer, getItem_1, 1}},
+ {1273, {wxSizer, getSize, 0}},
+ {1274, {wxSizer, getPosition, 0}},
+ {1275, {wxSizer, getMinSize, 0}},
+ {1276, {wxSizer, hide_2_0, 2}},
+ {1277, {wxSizer, hide_2_1, 2}},
+ {1278, {wxSizer, hide_1, 1}},
+ {1279, {wxSizer, insert_3_1, 3}},
+ {1280, {wxSizer, insert_3_0, 3}},
+ {1281, {wxSizer, insert_4, 4}},
+ {1282, {wxSizer, insert_3_3, 3}},
+ {1283, {wxSizer, insert_3_2, 3}},
+ {1284, {wxSizer, insert_2, 2}},
+ {1285, {wxSizer, insertSpacer, 2}},
+ {1286, {wxSizer, insertStretchSpacer, 2}},
+ {1287, {wxSizer, isShown_1_2, 1}},
+ {1288, {wxSizer, isShown_1_1, 1}},
+ {1289, {wxSizer, isShown_1_0, 1}},
+ {1290, {wxSizer, layout, 0}},
+ {1291, {wxSizer, prepend_2_1, 2}},
+ {1292, {wxSizer, prepend_2_0, 2}},
+ {1293, {wxSizer, prepend_3, 3}},
+ {1294, {wxSizer, prepend_2_3, 2}},
+ {1295, {wxSizer, prepend_2_2, 2}},
+ {1296, {wxSizer, prepend_1, 1}},
+ {1297, {wxSizer, prependSpacer, 1}},
+ {1298, {wxSizer, prependStretchSpacer, 1}},
+ {1299, {wxSizer, recalcSizes, 0}},
+ {1300, {wxSizer, remove_1_1, 1}},
+ {1301, {wxSizer, remove_1_0, 1}},
+ {1302, {wxSizer, replace_3_1, 3}},
+ {1303, {wxSizer, replace_3_0, 3}},
+ {1304, {wxSizer, replace_2, 2}},
+ {1305, {wxSizer, setDimension, 4}},
+ {1306, {wxSizer, setMinSize_2, 2}},
+ {1307, {wxSizer, setMinSize_1, 1}},
+ {1308, {wxSizer, setItemMinSize_3_2, 3}},
+ {1309, {wxSizer, setItemMinSize_2_2, 2}},
+ {1310, {wxSizer, setItemMinSize_3_1, 3}},
+ {1311, {wxSizer, setItemMinSize_2_1, 2}},
+ {1312, {wxSizer, setItemMinSize_3_0, 3}},
+ {1313, {wxSizer, setItemMinSize_2_0, 2}},
+ {1314, {wxSizer, setSizeHints, 1}},
+ {1315, {wxSizer, setVirtualSizeHints, 1}},
+ {1316, {wxSizer, show_2_2, 2}},
+ {1317, {wxSizer, show_2_1, 2}},
+ {1318, {wxSizer, show_2_0, 2}},
+ {1319, {wxSizer, show_1, 1}},
+ {1320, {wxSizerFlags, new, 1}},
+ {1321, {wxSizerFlags, align, 1}},
+ {1322, {wxSizerFlags, border_2, 2}},
+ {1323, {wxSizerFlags, border_1, 1}},
+ {1324, {wxSizerFlags, center, 0}},
+ {1325, {wxSizerFlags, centre, 0}},
+ {1326, {wxSizerFlags, expand, 0}},
+ {1327, {wxSizerFlags, left, 0}},
+ {1328, {wxSizerFlags, proportion, 1}},
+ {1329, {wxSizerFlags, right, 0}},
+ {1330, {wxSizerFlags, 'Destroy', undefined}},
+ {1331, {wxSizerItem, new_5_1, 5}},
+ {1332, {wxSizerItem, new_2_1, 2}},
+ {1333, {wxSizerItem, new_5_0, 5}},
+ {1334, {wxSizerItem, new_2_0, 2}},
+ {1335, {wxSizerItem, new_6, 6}},
+ {1336, {wxSizerItem, new_3, 3}},
+ {1337, {wxSizerItem, new_0, 0}},
+ {1338, {wxSizerItem, destruct, 0}},
+ {1339, {wxSizerItem, calcMin, 0}},
+ {1340, {wxSizerItem, deleteWindows, 0}},
+ {1341, {wxSizerItem, detachSizer, 0}},
+ {1342, {wxSizerItem, getBorder, 0}},
+ {1343, {wxSizerItem, getFlag, 0}},
+ {1344, {wxSizerItem, getMinSize, 0}},
+ {1345, {wxSizerItem, getPosition, 0}},
+ {1346, {wxSizerItem, getProportion, 0}},
+ {1347, {wxSizerItem, getRatio, 0}},
+ {1348, {wxSizerItem, getRect, 0}},
+ {1349, {wxSizerItem, getSize, 0}},
+ {1350, {wxSizerItem, getSizer, 0}},
+ {1351, {wxSizerItem, getSpacer, 0}},
+ {1352, {wxSizerItem, getUserData, 0}},
+ {1353, {wxSizerItem, getWindow, 0}},
+ {1354, {wxSizerItem, isSizer, 0}},
+ {1355, {wxSizerItem, isShown, 0}},
+ {1356, {wxSizerItem, isSpacer, 0}},
+ {1357, {wxSizerItem, isWindow, 0}},
+ {1358, {wxSizerItem, setBorder, 1}},
+ {1359, {wxSizerItem, setDimension, 2}},
+ {1360, {wxSizerItem, setFlag, 1}},
+ {1361, {wxSizerItem, setInitSize, 2}},
+ {1362, {wxSizerItem, setMinSize_1, 1}},
+ {1363, {wxSizerItem, setMinSize_2, 2}},
+ {1364, {wxSizerItem, setProportion, 1}},
+ {1365, {wxSizerItem, setRatio_2, 2}},
+ {1366, {wxSizerItem, setRatio_1_1, 1}},
+ {1367, {wxSizerItem, setRatio_1_0, 1}},
+ {1368, {wxSizerItem, setSizer, 1}},
+ {1369, {wxSizerItem, setSpacer_1, 1}},
+ {1370, {wxSizerItem, setSpacer_2, 2}},
+ {1371, {wxSizerItem, setWindow, 1}},
+ {1372, {wxSizerItem, show, 1}},
+ {1373, {wxBoxSizer, new, 1}},
+ {1374, {wxBoxSizer, getOrientation, 0}},
+ {1375, {wxBoxSizer, 'Destroy', undefined}},
+ {1376, {wxStaticBoxSizer, new_2, 2}},
+ {1377, {wxStaticBoxSizer, new_3, 3}},
+ {1378, {wxStaticBoxSizer, getStaticBox, 0}},
+ {1379, {wxStaticBoxSizer, 'Destroy', undefined}},
+ {1380, {wxGridSizer, new_4, 4}},
+ {1381, {wxGridSizer, new_2, 2}},
+ {1382, {wxGridSizer, getCols, 0}},
+ {1383, {wxGridSizer, getHGap, 0}},
+ {1384, {wxGridSizer, getRows, 0}},
+ {1385, {wxGridSizer, getVGap, 0}},
+ {1386, {wxGridSizer, setCols, 1}},
+ {1387, {wxGridSizer, setHGap, 1}},
+ {1388, {wxGridSizer, setRows, 1}},
+ {1389, {wxGridSizer, setVGap, 1}},
+ {1390, {wxGridSizer, 'Destroy', undefined}},
+ {1391, {wxFlexGridSizer, new_4, 4}},
+ {1392, {wxFlexGridSizer, new_2, 2}},
+ {1393, {wxFlexGridSizer, addGrowableCol, 2}},
+ {1394, {wxFlexGridSizer, addGrowableRow, 2}},
+ {1395, {wxFlexGridSizer, getFlexibleDirection, 0}},
+ {1396, {wxFlexGridSizer, getNonFlexibleGrowMode, 0}},
+ {1397, {wxFlexGridSizer, removeGrowableCol, 1}},
+ {1398, {wxFlexGridSizer, removeGrowableRow, 1}},
+ {1399, {wxFlexGridSizer, setFlexibleDirection, 1}},
+ {1400, {wxFlexGridSizer, setNonFlexibleGrowMode, 1}},
+ {1401, {wxFlexGridSizer, 'Destroy', undefined}},
+ {1402, {wxGridBagSizer, new, 1}},
+ {1403, {wxGridBagSizer, add_3_2, 3}},
+ {1404, {wxGridBagSizer, add_3_1, 3}},
+ {1405, {wxGridBagSizer, add_4, 4}},
+ {1406, {wxGridBagSizer, add_1_0, 1}},
+ {1407, {wxGridBagSizer, add_2_1, 2}},
+ {1408, {wxGridBagSizer, add_2_0, 2}},
+ {1409, {wxGridBagSizer, add_3_0, 3}},
+ {1410, {wxGridBagSizer, add_1_1, 1}},
+ {1411, {wxGridBagSizer, calcMin, 0}},
+ {1412, {wxGridBagSizer, checkForIntersection_2, 2}},
+ {1413, {wxGridBagSizer, checkForIntersection_3, 3}},
+ {1414, {wxGridBagSizer, findItem_1_1, 1}},
+ {1415, {wxGridBagSizer, findItem_1_0, 1}},
+ {1416, {wxGridBagSizer, findItemAtPoint, 1}},
+ {1417, {wxGridBagSizer, findItemAtPosition, 1}},
+ {1418, {wxGridBagSizer, findItemWithData, 1}},
+ {1419, {wxGridBagSizer, getCellSize, 2}},
+ {1420, {wxGridBagSizer, getEmptyCellSize, 0}},
+ {1421, {wxGridBagSizer, getItemPosition_1_2, 1}},
+ {1422, {wxGridBagSizer, getItemPosition_1_1, 1}},
+ {1423, {wxGridBagSizer, getItemPosition_1_0, 1}},
+ {1424, {wxGridBagSizer, getItemSpan_1_2, 1}},
+ {1425, {wxGridBagSizer, getItemSpan_1_1, 1}},
+ {1426, {wxGridBagSizer, getItemSpan_1_0, 1}},
+ {1427, {wxGridBagSizer, setEmptyCellSize, 1}},
+ {1428, {wxGridBagSizer, setItemPosition_2_2, 2}},
+ {1429, {wxGridBagSizer, setItemPosition_2_1, 2}},
+ {1430, {wxGridBagSizer, setItemPosition_2_0, 2}},
+ {1431, {wxGridBagSizer, setItemSpan_2_2, 2}},
+ {1432, {wxGridBagSizer, setItemSpan_2_1, 2}},
+ {1433, {wxGridBagSizer, setItemSpan_2_0, 2}},
+ {1434, {wxGridBagSizer, 'Destroy', undefined}},
+ {1435, {wxStdDialogButtonSizer, new, 0}},
+ {1436, {wxStdDialogButtonSizer, addButton, 1}},
+ {1437, {wxStdDialogButtonSizer, realize, 0}},
+ {1438, {wxStdDialogButtonSizer, setAffirmativeButton, 1}},
+ {1439, {wxStdDialogButtonSizer, setCancelButton, 1}},
+ {1440, {wxStdDialogButtonSizer, setNegativeButton, 1}},
+ {1441, {wxStdDialogButtonSizer, 'Destroy', undefined}},
+ {1442, {wxFont, new_0, 0}},
+ {1443, {wxFont, new_1, 1}},
+ {1444, {wxFont, new_5, 5}},
+ {1446, {wxFont, destruct, 0}},
+ {1447, {wxFont, isFixedWidth, 0}},
+ {1448, {wxFont, getDefaultEncoding, 0}},
+ {1449, {wxFont, getFaceName, 0}},
+ {1450, {wxFont, getFamily, 0}},
+ {1451, {wxFont, getNativeFontInfoDesc, 0}},
+ {1452, {wxFont, getNativeFontInfoUserDesc, 0}},
+ {1453, {wxFont, getPointSize, 0}},
+ {1454, {wxFont, getStyle, 0}},
+ {1455, {wxFont, getUnderlined, 0}},
+ {1456, {wxFont, getWeight, 0}},
+ {1457, {wxFont, ok, 0}},
+ {1458, {wxFont, setDefaultEncoding, 1}},
+ {1459, {wxFont, setFaceName, 1}},
+ {1460, {wxFont, setFamily, 1}},
+ {1461, {wxFont, setPointSize, 1}},
+ {1462, {wxFont, setStyle, 1}},
+ {1463, {wxFont, setUnderlined, 1}},
+ {1464, {wxFont, setWeight, 1}},
+ {1465, {wxToolTip, enable, 1}},
+ {1466, {wxToolTip, setDelay, 1}},
+ {1467, {wxToolTip, new, 1}},
+ {1468, {wxToolTip, setTip, 1}},
+ {1469, {wxToolTip, getTip, 0}},
+ {1470, {wxToolTip, getWindow, 0}},
+ {1471, {wxToolTip, 'Destroy', undefined}},
+ {1473, {wxButton, new_3, 3}},
+ {1474, {wxButton, new_0, 0}},
+ {1475, {wxButton, destruct, 0}},
+ {1476, {wxButton, create, 3}},
+ {1477, {wxButton, getDefaultSize, 0}},
+ {1478, {wxButton, setDefault, 0}},
+ {1479, {wxButton, setLabel, 1}},
+ {1481, {wxBitmapButton, new_4, 4}},
+ {1482, {wxBitmapButton, new_0, 0}},
+ {1483, {wxBitmapButton, create, 4}},
+ {1484, {wxBitmapButton, getBitmapDisabled, 0}},
+ {1486, {wxBitmapButton, getBitmapFocus, 0}},
+ {1488, {wxBitmapButton, getBitmapLabel, 0}},
+ {1490, {wxBitmapButton, getBitmapSelected, 0}},
+ {1492, {wxBitmapButton, setBitmapDisabled, 1}},
+ {1493, {wxBitmapButton, setBitmapFocus, 1}},
+ {1494, {wxBitmapButton, setBitmapLabel, 1}},
+ {1495, {wxBitmapButton, setBitmapSelected, 1}},
+ {1496, {wxBitmapButton, 'Destroy', undefined}},
+ {1497, {wxToggleButton, new_0, 0}},
+ {1498, {wxToggleButton, new_4, 4}},
+ {1499, {wxToggleButton, create, 4}},
+ {1500, {wxToggleButton, getValue, 0}},
+ {1501, {wxToggleButton, setValue, 1}},
+ {1502, {wxToggleButton, 'Destroy', undefined}},
+ {1503, {wxCalendarCtrl, new_0, 0}},
+ {1504, {wxCalendarCtrl, new_3, 3}},
+ {1505, {wxCalendarCtrl, create, 3}},
+ {1506, {wxCalendarCtrl, destruct, 0}},
+ {1507, {wxCalendarCtrl, setDate, 1}},
+ {1508, {wxCalendarCtrl, getDate, 0}},
+ {1509, {wxCalendarCtrl, enableYearChange, 1}},
+ {1510, {wxCalendarCtrl, enableMonthChange, 1}},
+ {1511, {wxCalendarCtrl, enableHolidayDisplay, 1}},
+ {1512, {wxCalendarCtrl, setHeaderColours, 2}},
+ {1513, {wxCalendarCtrl, getHeaderColourFg, 0}},
+ {1514, {wxCalendarCtrl, getHeaderColourBg, 0}},
+ {1515, {wxCalendarCtrl, setHighlightColours, 2}},
+ {1516, {wxCalendarCtrl, getHighlightColourFg, 0}},
+ {1517, {wxCalendarCtrl, getHighlightColourBg, 0}},
+ {1518, {wxCalendarCtrl, setHolidayColours, 2}},
+ {1519, {wxCalendarCtrl, getHolidayColourFg, 0}},
+ {1520, {wxCalendarCtrl, getHolidayColourBg, 0}},
+ {1521, {wxCalendarCtrl, getAttr, 1}},
+ {1522, {wxCalendarCtrl, setAttr, 2}},
+ {1523, {wxCalendarCtrl, setHoliday, 1}},
+ {1524, {wxCalendarCtrl, resetAttr, 1}},
+ {1525, {wxCalendarCtrl, hitTest, 2}},
+ {1526, {wxCalendarDateAttr, new_0, 0}},
+ {1527, {wxCalendarDateAttr, new_2_1, 2}},
+ {1528, {wxCalendarDateAttr, new_2_0, 2}},
+ {1529, {wxCalendarDateAttr, setTextColour, 1}},
+ {1530, {wxCalendarDateAttr, setBackgroundColour, 1}},
+ {1531, {wxCalendarDateAttr, setBorderColour, 1}},
+ {1532, {wxCalendarDateAttr, setFont, 1}},
+ {1533, {wxCalendarDateAttr, setBorder, 1}},
+ {1534, {wxCalendarDateAttr, setHoliday, 1}},
+ {1535, {wxCalendarDateAttr, hasTextColour, 0}},
+ {1536, {wxCalendarDateAttr, hasBackgroundColour, 0}},
+ {1537, {wxCalendarDateAttr, hasBorderColour, 0}},
+ {1538, {wxCalendarDateAttr, hasFont, 0}},
+ {1539, {wxCalendarDateAttr, hasBorder, 0}},
+ {1540, {wxCalendarDateAttr, isHoliday, 0}},
+ {1541, {wxCalendarDateAttr, getTextColour, 0}},
+ {1542, {wxCalendarDateAttr, getBackgroundColour, 0}},
+ {1543, {wxCalendarDateAttr, getBorderColour, 0}},
+ {1544, {wxCalendarDateAttr, getFont, 0}},
+ {1545, {wxCalendarDateAttr, getBorder, 0}},
+ {1546, {wxCalendarDateAttr, 'Destroy', undefined}},
+ {1548, {wxCheckBox, new_4, 4}},
+ {1549, {wxCheckBox, new_0, 0}},
+ {1550, {wxCheckBox, create, 4}},
+ {1551, {wxCheckBox, getValue, 0}},
+ {1552, {wxCheckBox, get3StateValue, 0}},
+ {1553, {wxCheckBox, is3rdStateAllowedForUser, 0}},
+ {1554, {wxCheckBox, is3State, 0}},
+ {1555, {wxCheckBox, isChecked, 0}},
+ {1556, {wxCheckBox, setValue, 1}},
+ {1557, {wxCheckBox, set3StateValue, 1}},
+ {1558, {wxCheckBox, 'Destroy', undefined}},
+ {1559, {wxCheckListBox, new_0, 0}},
+ {1561, {wxCheckListBox, new_3, 3}},
+ {1562, {wxCheckListBox, check, 2}},
+ {1563, {wxCheckListBox, isChecked, 1}},
+ {1564, {wxCheckListBox, 'Destroy', undefined}},
+ {1567, {wxChoice, new_3, 3}},
+ {1568, {wxChoice, new_0, 0}},
+ {1570, {wxChoice, destruct, 0}},
+ {1572, {wxChoice, create, 6}},
+ {1573, {wxChoice, delete, 1}},
+ {1574, {wxChoice, getColumns, 0}},
+ {1575, {wxChoice, setColumns, 1}},
+ {1576, {wxComboBox, new_0, 0}},
+ {1578, {wxComboBox, new_3, 3}},
+ {1579, {wxComboBox, destruct, 0}},
+ {1581, {wxComboBox, create, 7}},
+ {1582, {wxComboBox, canCopy, 0}},
+ {1583, {wxComboBox, canCut, 0}},
+ {1584, {wxComboBox, canPaste, 0}},
+ {1585, {wxComboBox, canRedo, 0}},
+ {1586, {wxComboBox, canUndo, 0}},
+ {1587, {wxComboBox, copy, 0}},
+ {1588, {wxComboBox, cut, 0}},
+ {1589, {wxComboBox, getInsertionPoint, 0}},
+ {1590, {wxComboBox, getLastPosition, 0}},
+ {1591, {wxComboBox, getValue, 0}},
+ {1592, {wxComboBox, paste, 0}},
+ {1593, {wxComboBox, redo, 0}},
+ {1594, {wxComboBox, replace, 3}},
+ {1595, {wxComboBox, remove, 2}},
+ {1596, {wxComboBox, setInsertionPoint, 1}},
+ {1597, {wxComboBox, setInsertionPointEnd, 0}},
+ {1598, {wxComboBox, setSelection_1, 1}},
+ {1599, {wxComboBox, setSelection_2, 2}},
+ {1600, {wxComboBox, setValue, 1}},
+ {1601, {wxComboBox, undo, 0}},
+ {1602, {wxGauge, new_0, 0}},
+ {1603, {wxGauge, new_4, 4}},
+ {1604, {wxGauge, create, 4}},
+ {1605, {wxGauge, getBezelFace, 0}},
+ {1606, {wxGauge, getRange, 0}},
+ {1607, {wxGauge, getShadowWidth, 0}},
+ {1608, {wxGauge, getValue, 0}},
+ {1609, {wxGauge, isVertical, 0}},
+ {1610, {wxGauge, setBezelFace, 1}},
+ {1611, {wxGauge, setRange, 1}},
+ {1612, {wxGauge, setShadowWidth, 1}},
+ {1613, {wxGauge, setValue, 1}},
+ {1614, {wxGauge, pulse, 0}},
+ {1615, {wxGauge, 'Destroy', undefined}},
+ {1616, {wxGenericDirCtrl, new_0, 0}},
+ {1617, {wxGenericDirCtrl, new_2, 2}},
+ {1618, {wxGenericDirCtrl, destruct, 0}},
+ {1619, {wxGenericDirCtrl, create, 2}},
+ {1620, {wxGenericDirCtrl, init, 0}},
+ {1621, {wxGenericDirCtrl, collapseTree, 0}},
+ {1622, {wxGenericDirCtrl, expandPath, 1}},
+ {1623, {wxGenericDirCtrl, getDefaultPath, 0}},
+ {1624, {wxGenericDirCtrl, getPath, 0}},
+ {1625, {wxGenericDirCtrl, getFilePath, 0}},
+ {1626, {wxGenericDirCtrl, getFilter, 0}},
+ {1627, {wxGenericDirCtrl, getFilterIndex, 0}},
+ {1628, {wxGenericDirCtrl, getRootId, 0}},
+ {1629, {wxGenericDirCtrl, getTreeCtrl, 0}},
+ {1630, {wxGenericDirCtrl, reCreateTree, 0}},
+ {1631, {wxGenericDirCtrl, setDefaultPath, 1}},
+ {1632, {wxGenericDirCtrl, setFilter, 1}},
+ {1633, {wxGenericDirCtrl, setFilterIndex, 1}},
+ {1634, {wxGenericDirCtrl, setPath, 1}},
+ {1636, {wxStaticBox, new_4, 4}},
+ {1637, {wxStaticBox, new_0, 0}},
+ {1638, {wxStaticBox, create, 4}},
+ {1639, {wxStaticBox, 'Destroy', undefined}},
+ {1641, {wxStaticLine, new_2, 2}},
+ {1642, {wxStaticLine, new_0, 0}},
+ {1643, {wxStaticLine, create, 2}},
+ {1644, {wxStaticLine, isVertical, 0}},
+ {1645, {wxStaticLine, getDefaultSize, 0}},
+ {1646, {wxStaticLine, 'Destroy', undefined}},
+ {1649, {wxListBox, new_3, 3}},
+ {1650, {wxListBox, new_0, 0}},
+ {1652, {wxListBox, destruct, 0}},
+ {1654, {wxListBox, create, 6}},
+ {1655, {wxListBox, deselect, 1}},
+ {1656, {wxListBox, getSelections, 1}},
+ {1657, {wxListBox, insertItems, 2}},
+ {1658, {wxListBox, isSelected, 1}},
+ {1659, {wxListBox, set, 1}},
+ {1660, {wxListBox, hitTest, 1}},
+ {1661, {wxListBox, setFirstItem_1_0, 1}},
+ {1662, {wxListBox, setFirstItem_1_1, 1}},
+ {1663, {wxListCtrl, new_0, 0}},
+ {1664, {wxListCtrl, new_2, 2}},
+ {1665, {wxListCtrl, arrange, 1}},
+ {1666, {wxListCtrl, assignImageList, 2}},
+ {1667, {wxListCtrl, clearAll, 0}},
+ {1668, {wxListCtrl, create, 2}},
+ {1669, {wxListCtrl, deleteAllItems, 0}},
+ {1670, {wxListCtrl, deleteColumn, 1}},
+ {1671, {wxListCtrl, deleteItem, 1}},
+ {1672, {wxListCtrl, editLabel, 1}},
+ {1673, {wxListCtrl, ensureVisible, 1}},
+ {1674, {wxListCtrl, findItem_3_0, 3}},
+ {1675, {wxListCtrl, findItem_3_1, 3}},
+ {1676, {wxListCtrl, getColumn, 2}},
+ {1677, {wxListCtrl, getColumnCount, 0}},
+ {1678, {wxListCtrl, getColumnWidth, 1}},
+ {1679, {wxListCtrl, getCountPerPage, 0}},
+ {1680, {wxListCtrl, getEditControl, 0}},
+ {1681, {wxListCtrl, getImageList, 1}},
+ {1682, {wxListCtrl, getItem, 1}},
+ {1683, {wxListCtrl, getItemBackgroundColour, 1}},
+ {1684, {wxListCtrl, getItemCount, 0}},
+ {1685, {wxListCtrl, getItemData, 1}},
+ {1686, {wxListCtrl, getItemFont, 1}},
+ {1687, {wxListCtrl, getItemPosition, 2}},
+ {1688, {wxListCtrl, getItemRect, 3}},
+ {1689, {wxListCtrl, getItemSpacing, 0}},
+ {1690, {wxListCtrl, getItemState, 2}},
+ {1691, {wxListCtrl, getItemText, 1}},
+ {1692, {wxListCtrl, getItemTextColour, 1}},
+ {1693, {wxListCtrl, getNextItem, 2}},
+ {1694, {wxListCtrl, getSelectedItemCount, 0}},
+ {1695, {wxListCtrl, getTextColour, 0}},
+ {1696, {wxListCtrl, getTopItem, 0}},
+ {1697, {wxListCtrl, getViewRect, 0}},
+ {1698, {wxListCtrl, hitTest, 3}},
+ {1699, {wxListCtrl, insertColumn_2, 2}},
+ {1700, {wxListCtrl, insertColumn_3, 3}},
+ {1701, {wxListCtrl, insertItem_1, 1}},
+ {1702, {wxListCtrl, insertItem_2_1, 2}},
+ {1703, {wxListCtrl, insertItem_2_0, 2}},
+ {1704, {wxListCtrl, insertItem_3, 3}},
+ {1705, {wxListCtrl, refreshItem, 1}},
+ {1706, {wxListCtrl, refreshItems, 2}},
+ {1707, {wxListCtrl, scrollList, 2}},
+ {1708, {wxListCtrl, setBackgroundColour, 1}},
+ {1709, {wxListCtrl, setColumn, 2}},
+ {1710, {wxListCtrl, setColumnWidth, 2}},
+ {1711, {wxListCtrl, setImageList, 2}},
+ {1712, {wxListCtrl, setItem_1, 1}},
+ {1713, {wxListCtrl, setItem_4, 4}},
+ {1714, {wxListCtrl, setItemBackgroundColour, 2}},
+ {1715, {wxListCtrl, setItemCount, 1}},
+ {1716, {wxListCtrl, setItemData, 2}},
+ {1717, {wxListCtrl, setItemFont, 2}},
+ {1718, {wxListCtrl, setItemImage, 3}},
+ {1719, {wxListCtrl, setItemColumnImage, 3}},
+ {1720, {wxListCtrl, setItemPosition, 2}},
+ {1721, {wxListCtrl, setItemState, 3}},
+ {1722, {wxListCtrl, setItemText, 2}},
+ {1723, {wxListCtrl, setItemTextColour, 2}},
+ {1724, {wxListCtrl, setSingleStyle, 2}},
+ {1725, {wxListCtrl, setTextColour, 1}},
+ {1726, {wxListCtrl, setWindowStyleFlag, 1}},
+ {1727, {wxListCtrl, sortItems, 2}},
+ {1728, {wxListCtrl, 'Destroy', undefined}},
+ {1729, {wxListView, clearColumnImage, 1}},
+ {1730, {wxListView, focus, 1}},
+ {1731, {wxListView, getFirstSelected, 0}},
+ {1732, {wxListView, getFocusedItem, 0}},
+ {1733, {wxListView, getNextSelected, 1}},
+ {1734, {wxListView, isSelected, 1}},
+ {1735, {wxListView, select, 2}},
+ {1736, {wxListView, setColumnImage, 2}},
+ {1737, {wxListItem, new_0, 0}},
+ {1738, {wxListItem, new_1, 1}},
+ {1739, {wxListItem, destruct, 0}},
+ {1740, {wxListItem, clear, 0}},
+ {1741, {wxListItem, getAlign, 0}},
+ {1742, {wxListItem, getBackgroundColour, 0}},
+ {1743, {wxListItem, getColumn, 0}},
+ {1744, {wxListItem, getFont, 0}},
+ {1745, {wxListItem, getId, 0}},
+ {1746, {wxListItem, getImage, 0}},
+ {1747, {wxListItem, getMask, 0}},
+ {1748, {wxListItem, getState, 0}},
+ {1749, {wxListItem, getText, 0}},
+ {1750, {wxListItem, getTextColour, 0}},
+ {1751, {wxListItem, getWidth, 0}},
+ {1752, {wxListItem, setAlign, 1}},
+ {1753, {wxListItem, setBackgroundColour, 1}},
+ {1754, {wxListItem, setColumn, 1}},
+ {1755, {wxListItem, setFont, 1}},
+ {1756, {wxListItem, setId, 1}},
+ {1757, {wxListItem, setImage, 1}},
+ {1758, {wxListItem, setMask, 1}},
+ {1759, {wxListItem, setState, 1}},
+ {1760, {wxListItem, setStateMask, 1}},
+ {1761, {wxListItem, setText, 1}},
+ {1762, {wxListItem, setTextColour, 1}},
+ {1763, {wxListItem, setWidth, 1}},
+ {1764, {wxListItemAttr, new_0, 0}},
+ {1765, {wxListItemAttr, new_3, 3}},
+ {1766, {wxListItemAttr, getBackgroundColour, 0}},
+ {1767, {wxListItemAttr, getFont, 0}},
+ {1768, {wxListItemAttr, getTextColour, 0}},
+ {1769, {wxListItemAttr, hasBackgroundColour, 0}},
+ {1770, {wxListItemAttr, hasFont, 0}},
+ {1771, {wxListItemAttr, hasTextColour, 0}},
+ {1772, {wxListItemAttr, setBackgroundColour, 1}},
+ {1773, {wxListItemAttr, setFont, 1}},
+ {1774, {wxListItemAttr, setTextColour, 1}},
+ {1775, {wxListItemAttr, 'Destroy', undefined}},
+ {1776, {wxImageList, new_0, 0}},
+ {1777, {wxImageList, new_3, 3}},
+ {1778, {wxImageList, add_1, 1}},
+ {1779, {wxImageList, add_2_0, 2}},
+ {1780, {wxImageList, add_2_1, 2}},
+ {1781, {wxImageList, create, 3}},
+ {1783, {wxImageList, draw, 5}},
+ {1784, {wxImageList, getBitmap, 1}},
+ {1785, {wxImageList, getIcon, 1}},
+ {1786, {wxImageList, getImageCount, 0}},
+ {1787, {wxImageList, getSize, 3}},
+ {1788, {wxImageList, remove, 1}},
+ {1789, {wxImageList, removeAll, 0}},
+ {1790, {wxImageList, replace_2, 2}},
+ {1791, {wxImageList, replace_3, 3}},
+ {1792, {wxImageList, 'Destroy', undefined}},
+ {1793, {wxTextAttr, new_0, 0}},
+ {1794, {wxTextAttr, new_2, 2}},
+ {1795, {wxTextAttr, getAlignment, 0}},
+ {1796, {wxTextAttr, getBackgroundColour, 0}},
+ {1797, {wxTextAttr, getFont, 0}},
+ {1798, {wxTextAttr, getLeftIndent, 0}},
+ {1799, {wxTextAttr, getLeftSubIndent, 0}},
+ {1800, {wxTextAttr, getRightIndent, 0}},
+ {1801, {wxTextAttr, getTabs, 0}},
+ {1802, {wxTextAttr, getTextColour, 0}},
+ {1803, {wxTextAttr, hasBackgroundColour, 0}},
+ {1804, {wxTextAttr, hasFont, 0}},
+ {1805, {wxTextAttr, hasTextColour, 0}},
+ {1806, {wxTextAttr, getFlags, 0}},
+ {1807, {wxTextAttr, isDefault, 0}},
+ {1808, {wxTextAttr, setAlignment, 1}},
+ {1809, {wxTextAttr, setBackgroundColour, 1}},
+ {1810, {wxTextAttr, setFlags, 1}},
+ {1811, {wxTextAttr, setFont, 2}},
+ {1812, {wxTextAttr, setLeftIndent, 2}},
+ {1813, {wxTextAttr, setRightIndent, 1}},
+ {1814, {wxTextAttr, setTabs, 1}},
+ {1815, {wxTextAttr, setTextColour, 1}},
+ {1816, {wxTextAttr, 'Destroy', undefined}},
+ {1818, {wxTextCtrl, new_3, 3}},
+ {1819, {wxTextCtrl, new_0, 0}},
+ {1821, {wxTextCtrl, destruct, 0}},
+ {1822, {wxTextCtrl, appendText, 1}},
+ {1823, {wxTextCtrl, canCopy, 0}},
+ {1824, {wxTextCtrl, canCut, 0}},
+ {1825, {wxTextCtrl, canPaste, 0}},
+ {1826, {wxTextCtrl, canRedo, 0}},
+ {1827, {wxTextCtrl, canUndo, 0}},
+ {1828, {wxTextCtrl, clear, 0}},
+ {1829, {wxTextCtrl, copy, 0}},
+ {1830, {wxTextCtrl, create, 3}},
+ {1831, {wxTextCtrl, cut, 0}},
+ {1832, {wxTextCtrl, discardEdits, 0}},
+ {1833, {wxTextCtrl, changeValue, 1}},
+ {1834, {wxTextCtrl, emulateKeyPress, 1}},
+ {1835, {wxTextCtrl, getDefaultStyle, 0}},
+ {1836, {wxTextCtrl, getInsertionPoint, 0}},
+ {1837, {wxTextCtrl, getLastPosition, 0}},
+ {1838, {wxTextCtrl, getLineLength, 1}},
+ {1839, {wxTextCtrl, getLineText, 1}},
+ {1840, {wxTextCtrl, getNumberOfLines, 0}},
+ {1841, {wxTextCtrl, getRange, 2}},
+ {1842, {wxTextCtrl, getSelection, 2}},
+ {1843, {wxTextCtrl, getStringSelection, 0}},
+ {1844, {wxTextCtrl, getStyle, 2}},
+ {1845, {wxTextCtrl, getValue, 0}},
+ {1846, {wxTextCtrl, isEditable, 0}},
+ {1847, {wxTextCtrl, isModified, 0}},
+ {1848, {wxTextCtrl, isMultiLine, 0}},
+ {1849, {wxTextCtrl, isSingleLine, 0}},
+ {1850, {wxTextCtrl, loadFile, 2}},
+ {1851, {wxTextCtrl, markDirty, 0}},
+ {1852, {wxTextCtrl, paste, 0}},
+ {1853, {wxTextCtrl, positionToXY, 3}},
+ {1854, {wxTextCtrl, redo, 0}},
+ {1855, {wxTextCtrl, remove, 2}},
+ {1856, {wxTextCtrl, replace, 3}},
+ {1857, {wxTextCtrl, saveFile, 1}},
+ {1858, {wxTextCtrl, setDefaultStyle, 1}},
+ {1859, {wxTextCtrl, setEditable, 1}},
+ {1860, {wxTextCtrl, setInsertionPoint, 1}},
+ {1861, {wxTextCtrl, setInsertionPointEnd, 0}},
+ {1863, {wxTextCtrl, setMaxLength, 1}},
+ {1864, {wxTextCtrl, setSelection, 2}},
+ {1865, {wxTextCtrl, setStyle, 3}},
+ {1866, {wxTextCtrl, setValue, 1}},
+ {1867, {wxTextCtrl, showPosition, 1}},
+ {1868, {wxTextCtrl, undo, 0}},
+ {1869, {wxTextCtrl, writeText, 1}},
+ {1870, {wxTextCtrl, xYToPosition, 2}},
+ {1873, {wxNotebook, new_0, 0}},
+ {1874, {wxNotebook, new_3, 3}},
+ {1875, {wxNotebook, destruct, 0}},
+ {1876, {wxNotebook, addPage, 3}},
+ {1877, {wxNotebook, advanceSelection, 1}},
+ {1878, {wxNotebook, assignImageList, 1}},
+ {1879, {wxNotebook, create, 3}},
+ {1880, {wxNotebook, deleteAllPages, 0}},
+ {1881, {wxNotebook, deletePage, 1}},
+ {1882, {wxNotebook, removePage, 1}},
+ {1883, {wxNotebook, getCurrentPage, 0}},
+ {1884, {wxNotebook, getImageList, 0}},
+ {1886, {wxNotebook, getPage, 1}},
+ {1887, {wxNotebook, getPageCount, 0}},
+ {1888, {wxNotebook, getPageImage, 1}},
+ {1889, {wxNotebook, getPageText, 1}},
+ {1890, {wxNotebook, getRowCount, 0}},
+ {1891, {wxNotebook, getSelection, 0}},
+ {1892, {wxNotebook, getThemeBackgroundColour, 0}},
+ {1894, {wxNotebook, hitTest, 2}},
+ {1896, {wxNotebook, insertPage, 4}},
+ {1897, {wxNotebook, setImageList, 1}},
+ {1898, {wxNotebook, setPadding, 1}},
+ {1899, {wxNotebook, setPageSize, 1}},
+ {1900, {wxNotebook, setPageImage, 2}},
+ {1901, {wxNotebook, setPageText, 2}},
+ {1902, {wxNotebook, setSelection, 1}},
+ {1903, {wxNotebook, changeSelection, 1}},
+ {1904, {wxChoicebook, new_0, 0}},
+ {1905, {wxChoicebook, new_3, 3}},
+ {1906, {wxChoicebook, addPage, 3}},
+ {1907, {wxChoicebook, advanceSelection, 1}},
+ {1908, {wxChoicebook, assignImageList, 1}},
+ {1909, {wxChoicebook, create, 3}},
+ {1910, {wxChoicebook, deleteAllPages, 0}},
+ {1911, {wxChoicebook, deletePage, 1}},
+ {1912, {wxChoicebook, removePage, 1}},
+ {1913, {wxChoicebook, getCurrentPage, 0}},
+ {1914, {wxChoicebook, getImageList, 0}},
+ {1916, {wxChoicebook, getPage, 1}},
+ {1917, {wxChoicebook, getPageCount, 0}},
+ {1918, {wxChoicebook, getPageImage, 1}},
+ {1919, {wxChoicebook, getPageText, 1}},
+ {1920, {wxChoicebook, getSelection, 0}},
+ {1921, {wxChoicebook, hitTest, 2}},
+ {1922, {wxChoicebook, insertPage, 4}},
+ {1923, {wxChoicebook, setImageList, 1}},
+ {1924, {wxChoicebook, setPageSize, 1}},
+ {1925, {wxChoicebook, setPageImage, 2}},
+ {1926, {wxChoicebook, setPageText, 2}},
+ {1927, {wxChoicebook, setSelection, 1}},
+ {1928, {wxChoicebook, changeSelection, 1}},
+ {1929, {wxChoicebook, 'Destroy', undefined}},
+ {1930, {wxToolbook, new_0, 0}},
+ {1931, {wxToolbook, new_3, 3}},
+ {1932, {wxToolbook, addPage, 3}},
+ {1933, {wxToolbook, advanceSelection, 1}},
+ {1934, {wxToolbook, assignImageList, 1}},
+ {1935, {wxToolbook, create, 3}},
+ {1936, {wxToolbook, deleteAllPages, 0}},
+ {1937, {wxToolbook, deletePage, 1}},
+ {1938, {wxToolbook, removePage, 1}},
+ {1939, {wxToolbook, getCurrentPage, 0}},
+ {1940, {wxToolbook, getImageList, 0}},
+ {1942, {wxToolbook, getPage, 1}},
+ {1943, {wxToolbook, getPageCount, 0}},
+ {1944, {wxToolbook, getPageImage, 1}},
+ {1945, {wxToolbook, getPageText, 1}},
+ {1946, {wxToolbook, getSelection, 0}},
+ {1948, {wxToolbook, hitTest, 2}},
+ {1949, {wxToolbook, insertPage, 4}},
+ {1950, {wxToolbook, setImageList, 1}},
+ {1951, {wxToolbook, setPageSize, 1}},
+ {1952, {wxToolbook, setPageImage, 2}},
+ {1953, {wxToolbook, setPageText, 2}},
+ {1954, {wxToolbook, setSelection, 1}},
+ {1955, {wxToolbook, changeSelection, 1}},
+ {1956, {wxToolbook, 'Destroy', undefined}},
+ {1957, {wxListbook, new_0, 0}},
+ {1958, {wxListbook, new_3, 3}},
+ {1959, {wxListbook, addPage, 3}},
+ {1960, {wxListbook, advanceSelection, 1}},
+ {1961, {wxListbook, assignImageList, 1}},
+ {1962, {wxListbook, create, 3}},
+ {1963, {wxListbook, deleteAllPages, 0}},
+ {1964, {wxListbook, deletePage, 1}},
+ {1965, {wxListbook, removePage, 1}},
+ {1966, {wxListbook, getCurrentPage, 0}},
+ {1967, {wxListbook, getImageList, 0}},
+ {1969, {wxListbook, getPage, 1}},
+ {1970, {wxListbook, getPageCount, 0}},
+ {1971, {wxListbook, getPageImage, 1}},
+ {1972, {wxListbook, getPageText, 1}},
+ {1973, {wxListbook, getSelection, 0}},
+ {1975, {wxListbook, hitTest, 2}},
+ {1976, {wxListbook, insertPage, 4}},
+ {1977, {wxListbook, setImageList, 1}},
+ {1978, {wxListbook, setPageSize, 1}},
+ {1979, {wxListbook, setPageImage, 2}},
+ {1980, {wxListbook, setPageText, 2}},
+ {1981, {wxListbook, setSelection, 1}},
+ {1982, {wxListbook, changeSelection, 1}},
+ {1983, {wxListbook, 'Destroy', undefined}},
+ {1984, {wxTreebook, new_0, 0}},
+ {1985, {wxTreebook, new_3, 3}},
+ {1986, {wxTreebook, addPage, 3}},
+ {1987, {wxTreebook, advanceSelection, 1}},
+ {1988, {wxTreebook, assignImageList, 1}},
+ {1989, {wxTreebook, create, 3}},
+ {1990, {wxTreebook, deleteAllPages, 0}},
+ {1991, {wxTreebook, deletePage, 1}},
+ {1992, {wxTreebook, removePage, 1}},
+ {1993, {wxTreebook, getCurrentPage, 0}},
+ {1994, {wxTreebook, getImageList, 0}},
+ {1996, {wxTreebook, getPage, 1}},
+ {1997, {wxTreebook, getPageCount, 0}},
+ {1998, {wxTreebook, getPageImage, 1}},
+ {1999, {wxTreebook, getPageText, 1}},
+ {2000, {wxTreebook, getSelection, 0}},
+ {2001, {wxTreebook, expandNode, 2}},
+ {2002, {wxTreebook, isNodeExpanded, 1}},
+ {2004, {wxTreebook, hitTest, 2}},
+ {2005, {wxTreebook, insertPage, 4}},
+ {2006, {wxTreebook, insertSubPage, 4}},
+ {2007, {wxTreebook, setImageList, 1}},
+ {2008, {wxTreebook, setPageSize, 1}},
+ {2009, {wxTreebook, setPageImage, 2}},
+ {2010, {wxTreebook, setPageText, 2}},
+ {2011, {wxTreebook, setSelection, 1}},
+ {2012, {wxTreebook, changeSelection, 1}},
+ {2013, {wxTreebook, 'Destroy', undefined}},
+ {2016, {wxTreeCtrl, new_2, 2}},
+ {2017, {wxTreeCtrl, new_0, 0}},
+ {2019, {wxTreeCtrl, destruct, 0}},
+ {2020, {wxTreeCtrl, addRoot, 2}},
+ {2021, {wxTreeCtrl, appendItem, 3}},
+ {2022, {wxTreeCtrl, assignImageList, 1}},
+ {2023, {wxTreeCtrl, assignStateImageList, 1}},
+ {2024, {wxTreeCtrl, collapse, 1}},
+ {2025, {wxTreeCtrl, collapseAndReset, 1}},
+ {2026, {wxTreeCtrl, create, 2}},
+ {2027, {wxTreeCtrl, delete, 1}},
+ {2028, {wxTreeCtrl, deleteAllItems, 0}},
+ {2029, {wxTreeCtrl, deleteChildren, 1}},
+ {2030, {wxTreeCtrl, editLabel, 1}},
+ {2031, {wxTreeCtrl, ensureVisible, 1}},
+ {2032, {wxTreeCtrl, expand, 1}},
+ {2033, {wxTreeCtrl, getBoundingRect, 3}},
+ {2035, {wxTreeCtrl, getChildrenCount, 2}},
+ {2036, {wxTreeCtrl, getCount, 0}},
+ {2037, {wxTreeCtrl, getEditControl, 0}},
+ {2038, {wxTreeCtrl, getFirstChild, 2}},
+ {2039, {wxTreeCtrl, getNextChild, 2}},
+ {2040, {wxTreeCtrl, getFirstVisibleItem, 0}},
+ {2041, {wxTreeCtrl, getImageList, 0}},
+ {2042, {wxTreeCtrl, getIndent, 0}},
+ {2043, {wxTreeCtrl, getItemBackgroundColour, 1}},
+ {2044, {wxTreeCtrl, getItemData, 1}},
+ {2045, {wxTreeCtrl, getItemFont, 1}},
+ {2046, {wxTreeCtrl, getItemImage_1, 1}},
+ {2047, {wxTreeCtrl, getItemImage_2, 2}},
+ {2048, {wxTreeCtrl, getItemText, 1}},
+ {2049, {wxTreeCtrl, getItemTextColour, 1}},
+ {2050, {wxTreeCtrl, getLastChild, 1}},
+ {2051, {wxTreeCtrl, getNextSibling, 1}},
+ {2052, {wxTreeCtrl, getNextVisible, 1}},
+ {2053, {wxTreeCtrl, getItemParent, 1}},
+ {2054, {wxTreeCtrl, getPrevSibling, 1}},
+ {2055, {wxTreeCtrl, getPrevVisible, 1}},
+ {2056, {wxTreeCtrl, getRootItem, 0}},
+ {2057, {wxTreeCtrl, getSelection, 0}},
+ {2058, {wxTreeCtrl, getSelections, 1}},
+ {2059, {wxTreeCtrl, getStateImageList, 0}},
+ {2060, {wxTreeCtrl, hitTest, 2}},
+ {2062, {wxTreeCtrl, insertItem, 4}},
+ {2063, {wxTreeCtrl, isBold, 1}},
+ {2064, {wxTreeCtrl, isExpanded, 1}},
+ {2065, {wxTreeCtrl, isSelected, 1}},
+ {2066, {wxTreeCtrl, isVisible, 1}},
+ {2067, {wxTreeCtrl, itemHasChildren, 1}},
+ {2068, {wxTreeCtrl, isTreeItemIdOk, 1}},
+ {2069, {wxTreeCtrl, prependItem, 3}},
+ {2070, {wxTreeCtrl, scrollTo, 1}},
+ {2071, {wxTreeCtrl, selectItem_1, 1}},
+ {2072, {wxTreeCtrl, selectItem_2, 2}},
+ {2073, {wxTreeCtrl, setIndent, 1}},
+ {2074, {wxTreeCtrl, setImageList, 1}},
+ {2075, {wxTreeCtrl, setItemBackgroundColour, 2}},
+ {2076, {wxTreeCtrl, setItemBold, 2}},
+ {2077, {wxTreeCtrl, setItemData, 2}},
+ {2078, {wxTreeCtrl, setItemDropHighlight, 2}},
+ {2079, {wxTreeCtrl, setItemFont, 2}},
+ {2080, {wxTreeCtrl, setItemHasChildren, 2}},
+ {2081, {wxTreeCtrl, setItemImage_2, 2}},
+ {2082, {wxTreeCtrl, setItemImage_3, 3}},
+ {2083, {wxTreeCtrl, setItemText, 2}},
+ {2084, {wxTreeCtrl, setItemTextColour, 2}},
+ {2085, {wxTreeCtrl, setStateImageList, 1}},
+ {2086, {wxTreeCtrl, setWindowStyle, 1}},
+ {2087, {wxTreeCtrl, sortChildren, 1}},
+ {2088, {wxTreeCtrl, toggle, 1}},
+ {2089, {wxTreeCtrl, toggleItemSelection, 1}},
+ {2090, {wxTreeCtrl, unselect, 0}},
+ {2091, {wxTreeCtrl, unselectAll, 0}},
+ {2092, {wxTreeCtrl, unselectItem, 1}},
+ {2093, {wxScrollBar, new_0, 0}},
+ {2094, {wxScrollBar, new_3, 3}},
+ {2095, {wxScrollBar, destruct, 0}},
+ {2096, {wxScrollBar, create, 3}},
+ {2097, {wxScrollBar, getRange, 0}},
+ {2098, {wxScrollBar, getPageSize, 0}},
+ {2099, {wxScrollBar, getThumbPosition, 0}},
+ {2100, {wxScrollBar, getThumbSize, 0}},
+ {2101, {wxScrollBar, setThumbPosition, 1}},
+ {2102, {wxScrollBar, setScrollbar, 5}},
+ {2104, {wxSpinButton, new_2, 2}},
+ {2105, {wxSpinButton, new_0, 0}},
+ {2106, {wxSpinButton, create, 2}},
+ {2107, {wxSpinButton, getMax, 0}},
+ {2108, {wxSpinButton, getMin, 0}},
+ {2109, {wxSpinButton, getValue, 0}},
+ {2110, {wxSpinButton, setRange, 2}},
+ {2111, {wxSpinButton, setValue, 1}},
+ {2112, {wxSpinButton, 'Destroy', undefined}},
+ {2113, {wxSpinCtrl, new_0, 0}},
+ {2114, {wxSpinCtrl, new_2, 2}},
+ {2116, {wxSpinCtrl, create, 2}},
+ {2119, {wxSpinCtrl, setValue_1_1, 1}},
+ {2120, {wxSpinCtrl, setValue_1_0, 1}},
+ {2122, {wxSpinCtrl, getValue, 0}},
+ {2124, {wxSpinCtrl, setRange, 2}},
+ {2125, {wxSpinCtrl, setSelection, 2}},
+ {2127, {wxSpinCtrl, getMin, 0}},
+ {2129, {wxSpinCtrl, getMax, 0}},
+ {2130, {wxSpinCtrl, 'Destroy', undefined}},
+ {2131, {wxStaticText, new_0, 0}},
+ {2132, {wxStaticText, new_4, 4}},
+ {2133, {wxStaticText, create, 4}},
+ {2134, {wxStaticText, getLabel, 0}},
+ {2135, {wxStaticText, setLabel, 1}},
+ {2136, {wxStaticText, wrap, 1}},
+ {2137, {wxStaticText, 'Destroy', undefined}},
+ {2138, {wxStaticBitmap, new_0, 0}},
+ {2139, {wxStaticBitmap, new_4, 4}},
+ {2140, {wxStaticBitmap, create, 4}},
+ {2141, {wxStaticBitmap, getBitmap, 0}},
+ {2142, {wxStaticBitmap, setBitmap, 1}},
+ {2143, {wxStaticBitmap, 'Destroy', undefined}},
+ {2144, {wxRadioBox, new, 7}},
+ {2146, {wxRadioBox, destruct, 0}},
+ {2147, {wxRadioBox, create, 7}},
+ {2148, {wxRadioBox, enable_2, 2}},
+ {2149, {wxRadioBox, enable_1, 1}},
+ {2150, {wxRadioBox, getSelection, 0}},
+ {2151, {wxRadioBox, getString, 1}},
+ {2152, {wxRadioBox, setSelection, 1}},
+ {2153, {wxRadioBox, show_2, 2}},
+ {2154, {wxRadioBox, show_1, 1}},
+ {2155, {wxRadioBox, getColumnCount, 0}},
+ {2156, {wxRadioBox, getItemHelpText, 1}},
+ {2157, {wxRadioBox, getItemToolTip, 1}},
+ {2159, {wxRadioBox, getItemFromPoint, 1}},
+ {2160, {wxRadioBox, getRowCount, 0}},
+ {2161, {wxRadioBox, isItemEnabled, 1}},
+ {2162, {wxRadioBox, isItemShown, 1}},
+ {2163, {wxRadioBox, setItemHelpText, 2}},
+ {2164, {wxRadioBox, setItemToolTip, 2}},
+ {2165, {wxRadioButton, new_0, 0}},
+ {2166, {wxRadioButton, new_4, 4}},
+ {2167, {wxRadioButton, create, 4}},
+ {2168, {wxRadioButton, getValue, 0}},
+ {2169, {wxRadioButton, setValue, 1}},
+ {2170, {wxRadioButton, 'Destroy', undefined}},
+ {2172, {wxSlider, new_6, 6}},
+ {2173, {wxSlider, new_0, 0}},
+ {2174, {wxSlider, create, 6}},
+ {2175, {wxSlider, getLineSize, 0}},
+ {2176, {wxSlider, getMax, 0}},
+ {2177, {wxSlider, getMin, 0}},
+ {2178, {wxSlider, getPageSize, 0}},
+ {2179, {wxSlider, getThumbLength, 0}},
+ {2180, {wxSlider, getValue, 0}},
+ {2181, {wxSlider, setLineSize, 1}},
+ {2182, {wxSlider, setPageSize, 1}},
+ {2183, {wxSlider, setRange, 2}},
+ {2184, {wxSlider, setThumbLength, 1}},
+ {2185, {wxSlider, setValue, 1}},
+ {2186, {wxSlider, 'Destroy', undefined}},
+ {2188, {wxDialog, new_4, 4}},
+ {2189, {wxDialog, new_0, 0}},
+ {2191, {wxDialog, destruct, 0}},
+ {2192, {wxDialog, create, 4}},
+ {2193, {wxDialog, createButtonSizer, 1}},
+ {2194, {wxDialog, createStdDialogButtonSizer, 1}},
+ {2195, {wxDialog, endModal, 1}},
+ {2196, {wxDialog, getAffirmativeId, 0}},
+ {2197, {wxDialog, getReturnCode, 0}},
+ {2198, {wxDialog, isModal, 0}},
+ {2199, {wxDialog, setAffirmativeId, 1}},
+ {2200, {wxDialog, setReturnCode, 1}},
+ {2201, {wxDialog, show, 1}},
+ {2202, {wxDialog, showModal, 0}},
+ {2203, {wxColourDialog, new_0, 0}},
+ {2204, {wxColourDialog, new_2, 2}},
+ {2205, {wxColourDialog, destruct, 0}},
+ {2206, {wxColourDialog, create, 2}},
+ {2207, {wxColourDialog, getColourData, 0}},
+ {2208, {wxColourData, new_0, 0}},
+ {2209, {wxColourData, new_1, 1}},
+ {2210, {wxColourData, destruct, 0}},
+ {2211, {wxColourData, getChooseFull, 0}},
+ {2212, {wxColourData, getColour, 0}},
+ {2214, {wxColourData, getCustomColour, 1}},
+ {2215, {wxColourData, setChooseFull, 1}},
+ {2216, {wxColourData, setColour, 1}},
+ {2217, {wxColourData, setCustomColour, 2}},
+ {2218, {wxPalette, new_0, 0}},
+ {2219, {wxPalette, new_4, 4}},
+ {2221, {wxPalette, destruct, 0}},
+ {2222, {wxPalette, create, 4}},
+ {2223, {wxPalette, getColoursCount, 0}},
+ {2224, {wxPalette, getPixel, 3}},
+ {2225, {wxPalette, getRGB, 4}},
+ {2226, {wxPalette, isOk, 0}},
+ {2230, {wxDirDialog, new, 2}},
+ {2231, {wxDirDialog, destruct, 0}},
+ {2232, {wxDirDialog, getPath, 0}},
+ {2233, {wxDirDialog, getMessage, 0}},
+ {2234, {wxDirDialog, setMessage, 1}},
+ {2235, {wxDirDialog, setPath, 1}},
+ {2239, {wxFileDialog, new, 2}},
+ {2240, {wxFileDialog, destruct, 0}},
+ {2241, {wxFileDialog, getDirectory, 0}},
+ {2242, {wxFileDialog, getFilename, 0}},
+ {2243, {wxFileDialog, getFilenames, 1}},
+ {2244, {wxFileDialog, getFilterIndex, 0}},
+ {2245, {wxFileDialog, getMessage, 0}},
+ {2246, {wxFileDialog, getPath, 0}},
+ {2247, {wxFileDialog, getPaths, 1}},
+ {2248, {wxFileDialog, getWildcard, 0}},
+ {2249, {wxFileDialog, setDirectory, 1}},
+ {2250, {wxFileDialog, setFilename, 1}},
+ {2251, {wxFileDialog, setFilterIndex, 1}},
+ {2252, {wxFileDialog, setMessage, 1}},
+ {2253, {wxFileDialog, setPath, 1}},
+ {2254, {wxFileDialog, setWildcard, 1}},
+ {2255, {wxPickerBase, setInternalMargin, 1}},
+ {2256, {wxPickerBase, getInternalMargin, 0}},
+ {2257, {wxPickerBase, setTextCtrlProportion, 1}},
+ {2258, {wxPickerBase, setPickerCtrlProportion, 1}},
+ {2259, {wxPickerBase, getTextCtrlProportion, 0}},
+ {2260, {wxPickerBase, getPickerCtrlProportion, 0}},
+ {2261, {wxPickerBase, hasTextCtrl, 0}},
+ {2262, {wxPickerBase, getTextCtrl, 0}},
+ {2263, {wxPickerBase, isTextCtrlGrowable, 0}},
+ {2264, {wxPickerBase, setPickerCtrlGrowable, 1}},
+ {2265, {wxPickerBase, setTextCtrlGrowable, 1}},
+ {2266, {wxPickerBase, isPickerCtrlGrowable, 0}},
+ {2267, {wxFilePickerCtrl, new_0, 0}},
+ {2268, {wxFilePickerCtrl, new_3, 3}},
+ {2269, {wxFilePickerCtrl, create, 3}},
+ {2270, {wxFilePickerCtrl, getPath, 0}},
+ {2271, {wxFilePickerCtrl, setPath, 1}},
+ {2272, {wxFilePickerCtrl, 'Destroy', undefined}},
+ {2273, {wxDirPickerCtrl, new_0, 0}},
+ {2274, {wxDirPickerCtrl, new_3, 3}},
+ {2275, {wxDirPickerCtrl, create, 3}},
+ {2276, {wxDirPickerCtrl, getPath, 0}},
+ {2277, {wxDirPickerCtrl, setPath, 1}},
+ {2278, {wxDirPickerCtrl, 'Destroy', undefined}},
+ {2279, {wxColourPickerCtrl, new_0, 0}},
+ {2280, {wxColourPickerCtrl, new_3, 3}},
+ {2281, {wxColourPickerCtrl, create, 3}},
+ {2282, {wxColourPickerCtrl, getColour, 0}},
+ {2283, {wxColourPickerCtrl, setColour_1_1, 1}},
+ {2284, {wxColourPickerCtrl, setColour_1_0, 1}},
+ {2285, {wxColourPickerCtrl, 'Destroy', undefined}},
+ {2286, {wxDatePickerCtrl, new_0, 0}},
+ {2287, {wxDatePickerCtrl, new_3, 3}},
+ {2288, {wxDatePickerCtrl, getRange, 2}},
+ {2289, {wxDatePickerCtrl, getValue, 0}},
+ {2290, {wxDatePickerCtrl, setRange, 2}},
+ {2291, {wxDatePickerCtrl, setValue, 1}},
+ {2292, {wxDatePickerCtrl, 'Destroy', undefined}},
+ {2293, {wxFontPickerCtrl, new_0, 0}},
+ {2294, {wxFontPickerCtrl, new_3, 3}},
+ {2295, {wxFontPickerCtrl, create, 3}},
+ {2296, {wxFontPickerCtrl, getSelectedFont, 0}},
+ {2297, {wxFontPickerCtrl, setSelectedFont, 1}},
+ {2298, {wxFontPickerCtrl, getMaxPointSize, 0}},
+ {2299, {wxFontPickerCtrl, setMaxPointSize, 1}},
+ {2300, {wxFontPickerCtrl, 'Destroy', undefined}},
+ {2303, {wxFindReplaceDialog, new_0, 0}},
+ {2304, {wxFindReplaceDialog, new_4, 4}},
+ {2305, {wxFindReplaceDialog, destruct, 0}},
+ {2306, {wxFindReplaceDialog, create, 4}},
+ {2307, {wxFindReplaceDialog, getData, 0}},
+ {2308, {wxFindReplaceData, new_0, 0}},
+ {2309, {wxFindReplaceData, new_1, 1}},
+ {2310, {wxFindReplaceData, getFindString, 0}},
+ {2311, {wxFindReplaceData, getReplaceString, 0}},
+ {2312, {wxFindReplaceData, getFlags, 0}},
+ {2313, {wxFindReplaceData, setFlags, 1}},
+ {2314, {wxFindReplaceData, setFindString, 1}},
+ {2315, {wxFindReplaceData, setReplaceString, 1}},
+ {2316, {wxFindReplaceData, 'Destroy', undefined}},
+ {2317, {wxMultiChoiceDialog, new_0, 0}},
+ {2319, {wxMultiChoiceDialog, new_5, 5}},
+ {2320, {wxMultiChoiceDialog, getSelections, 0}},
+ {2321, {wxMultiChoiceDialog, setSelections, 1}},
+ {2322, {wxMultiChoiceDialog, 'Destroy', undefined}},
+ {2323, {wxSingleChoiceDialog, new_0, 0}},
+ {2325, {wxSingleChoiceDialog, new_5, 5}},
+ {2326, {wxSingleChoiceDialog, getSelection, 0}},
+ {2327, {wxSingleChoiceDialog, getStringSelection, 0}},
+ {2328, {wxSingleChoiceDialog, setSelection, 1}},
+ {2329, {wxSingleChoiceDialog, 'Destroy', undefined}},
+ {2330, {wxTextEntryDialog, new, 3}},
+ {2331, {wxTextEntryDialog, getValue, 0}},
+ {2332, {wxTextEntryDialog, setValue, 1}},
+ {2333, {wxTextEntryDialog, 'Destroy', undefined}},
+ {2334, {wxPasswordEntryDialog, new, 3}},
+ {2335, {wxPasswordEntryDialog, 'Destroy', undefined}},
+ {2336, {wxFontData, new_0, 0}},
+ {2337, {wxFontData, new_1, 1}},
+ {2338, {wxFontData, destruct, 0}},
+ {2339, {wxFontData, enableEffects, 1}},
+ {2340, {wxFontData, getAllowSymbols, 0}},
+ {2341, {wxFontData, getColour, 0}},
+ {2342, {wxFontData, getChosenFont, 0}},
+ {2343, {wxFontData, getEnableEffects, 0}},
+ {2344, {wxFontData, getInitialFont, 0}},
+ {2345, {wxFontData, getShowHelp, 0}},
+ {2346, {wxFontData, setAllowSymbols, 1}},
+ {2347, {wxFontData, setChosenFont, 1}},
+ {2348, {wxFontData, setColour, 1}},
+ {2349, {wxFontData, setInitialFont, 1}},
+ {2350, {wxFontData, setRange, 2}},
+ {2351, {wxFontData, setShowHelp, 1}},
+ {2355, {wxFontDialog, new_0, 0}},
+ {2357, {wxFontDialog, new_2, 2}},
+ {2359, {wxFontDialog, create, 2}},
+ {2360, {wxFontDialog, getFontData, 0}},
+ {2362, {wxFontDialog, 'Destroy', undefined}},
+ {2363, {wxProgressDialog, new, 3}},
+ {2364, {wxProgressDialog, destruct, 0}},
+ {2365, {wxProgressDialog, resume, 0}},
+ {2366, {wxProgressDialog, update_2, 2}},
+ {2367, {wxProgressDialog, update_0, 0}},
+ {2368, {wxMessageDialog, new, 3}},
+ {2369, {wxMessageDialog, destruct, 0}},
+ {2370, {wxPageSetupDialog, new, 2}},
+ {2371, {wxPageSetupDialog, destruct, 0}},
+ {2372, {wxPageSetupDialog, getPageSetupData, 0}},
+ {2373, {wxPageSetupDialog, showModal, 0}},
+ {2374, {wxPageSetupDialogData, new_0, 0}},
+ {2375, {wxPageSetupDialogData, new_1_0, 1}},
+ {2376, {wxPageSetupDialogData, new_1_1, 1}},
+ {2377, {wxPageSetupDialogData, destruct, 0}},
+ {2378, {wxPageSetupDialogData, enableHelp, 1}},
+ {2379, {wxPageSetupDialogData, enableMargins, 1}},
+ {2380, {wxPageSetupDialogData, enableOrientation, 1}},
+ {2381, {wxPageSetupDialogData, enablePaper, 1}},
+ {2382, {wxPageSetupDialogData, enablePrinter, 1}},
+ {2383, {wxPageSetupDialogData, getDefaultMinMargins, 0}},
+ {2384, {wxPageSetupDialogData, getEnableMargins, 0}},
+ {2385, {wxPageSetupDialogData, getEnableOrientation, 0}},
+ {2386, {wxPageSetupDialogData, getEnablePaper, 0}},
+ {2387, {wxPageSetupDialogData, getEnablePrinter, 0}},
+ {2388, {wxPageSetupDialogData, getEnableHelp, 0}},
+ {2389, {wxPageSetupDialogData, getDefaultInfo, 0}},
+ {2390, {wxPageSetupDialogData, getMarginTopLeft, 0}},
+ {2391, {wxPageSetupDialogData, getMarginBottomRight, 0}},
+ {2392, {wxPageSetupDialogData, getMinMarginTopLeft, 0}},
+ {2393, {wxPageSetupDialogData, getMinMarginBottomRight, 0}},
+ {2394, {wxPageSetupDialogData, getPaperId, 0}},
+ {2395, {wxPageSetupDialogData, getPaperSize, 0}},
+ {2397, {wxPageSetupDialogData, getPrintData, 0}},
+ {2398, {wxPageSetupDialogData, isOk, 0}},
+ {2399, {wxPageSetupDialogData, setDefaultInfo, 1}},
+ {2400, {wxPageSetupDialogData, setDefaultMinMargins, 1}},
+ {2401, {wxPageSetupDialogData, setMarginTopLeft, 1}},
+ {2402, {wxPageSetupDialogData, setMarginBottomRight, 1}},
+ {2403, {wxPageSetupDialogData, setMinMarginTopLeft, 1}},
+ {2404, {wxPageSetupDialogData, setMinMarginBottomRight, 1}},
+ {2405, {wxPageSetupDialogData, setPaperId, 1}},
+ {2406, {wxPageSetupDialogData, setPaperSize_1_1, 1}},
+ {2407, {wxPageSetupDialogData, setPaperSize_1_0, 1}},
+ {2408, {wxPageSetupDialogData, setPrintData, 1}},
+ {2409, {wxPrintDialog, new_2_0, 2}},
+ {2410, {wxPrintDialog, new_2_1, 2}},
+ {2411, {wxPrintDialog, destruct, 0}},
+ {2412, {wxPrintDialog, getPrintDialogData, 0}},
+ {2413, {wxPrintDialog, getPrintDC, 0}},
+ {2414, {wxPrintDialogData, new_0, 0}},
+ {2415, {wxPrintDialogData, new_1_1, 1}},
+ {2416, {wxPrintDialogData, new_1_0, 1}},
+ {2417, {wxPrintDialogData, destruct, 0}},
+ {2418, {wxPrintDialogData, enableHelp, 1}},
+ {2419, {wxPrintDialogData, enablePageNumbers, 1}},
+ {2420, {wxPrintDialogData, enablePrintToFile, 1}},
+ {2421, {wxPrintDialogData, enableSelection, 1}},
+ {2422, {wxPrintDialogData, getAllPages, 0}},
+ {2423, {wxPrintDialogData, getCollate, 0}},
+ {2424, {wxPrintDialogData, getFromPage, 0}},
+ {2425, {wxPrintDialogData, getMaxPage, 0}},
+ {2426, {wxPrintDialogData, getMinPage, 0}},
+ {2427, {wxPrintDialogData, getNoCopies, 0}},
+ {2428, {wxPrintDialogData, getPrintData, 0}},
+ {2429, {wxPrintDialogData, getPrintToFile, 0}},
+ {2430, {wxPrintDialogData, getSelection, 0}},
+ {2431, {wxPrintDialogData, getToPage, 0}},
+ {2432, {wxPrintDialogData, isOk, 0}},
+ {2433, {wxPrintDialogData, setCollate, 1}},
+ {2434, {wxPrintDialogData, setFromPage, 1}},
+ {2435, {wxPrintDialogData, setMaxPage, 1}},
+ {2436, {wxPrintDialogData, setMinPage, 1}},
+ {2437, {wxPrintDialogData, setNoCopies, 1}},
+ {2438, {wxPrintDialogData, setPrintData, 1}},
+ {2439, {wxPrintDialogData, setPrintToFile, 1}},
+ {2440, {wxPrintDialogData, setSelection, 1}},
+ {2441, {wxPrintDialogData, setToPage, 1}},
+ {2442, {wxPrintData, new_0, 0}},
+ {2443, {wxPrintData, new_1, 1}},
+ {2444, {wxPrintData, destruct, 0}},
+ {2445, {wxPrintData, getCollate, 0}},
+ {2446, {wxPrintData, getBin, 0}},
+ {2447, {wxPrintData, getColour, 0}},
+ {2448, {wxPrintData, getDuplex, 0}},
+ {2449, {wxPrintData, getNoCopies, 0}},
+ {2450, {wxPrintData, getOrientation, 0}},
+ {2451, {wxPrintData, getPaperId, 0}},
+ {2452, {wxPrintData, getPrinterName, 0}},
+ {2453, {wxPrintData, getQuality, 0}},
+ {2454, {wxPrintData, isOk, 0}},
+ {2455, {wxPrintData, setBin, 1}},
+ {2456, {wxPrintData, setCollate, 1}},
+ {2457, {wxPrintData, setColour, 1}},
+ {2458, {wxPrintData, setDuplex, 1}},
+ {2459, {wxPrintData, setNoCopies, 1}},
+ {2460, {wxPrintData, setOrientation, 1}},
+ {2461, {wxPrintData, setPaperId, 1}},
+ {2462, {wxPrintData, setPrinterName, 1}},
+ {2463, {wxPrintData, setQuality, 1}},
+ {2466, {wxPrintPreview, new_2, 2}},
+ {2467, {wxPrintPreview, new_3, 3}},
+ {2469, {wxPrintPreview, destruct, 0}},
+ {2470, {wxPrintPreview, getCanvas, 0}},
+ {2471, {wxPrintPreview, getCurrentPage, 0}},
+ {2472, {wxPrintPreview, getFrame, 0}},
+ {2473, {wxPrintPreview, getMaxPage, 0}},
+ {2474, {wxPrintPreview, getMinPage, 0}},
+ {2475, {wxPrintPreview, getPrintout, 0}},
+ {2476, {wxPrintPreview, getPrintoutForPrinting, 0}},
+ {2477, {wxPrintPreview, isOk, 0}},
+ {2478, {wxPrintPreview, paintPage, 2}},
+ {2479, {wxPrintPreview, print, 1}},
+ {2480, {wxPrintPreview, renderPage, 1}},
+ {2481, {wxPrintPreview, setCanvas, 1}},
+ {2482, {wxPrintPreview, setCurrentPage, 1}},
+ {2483, {wxPrintPreview, setFrame, 1}},
+ {2484, {wxPrintPreview, setPrintout, 1}},
+ {2485, {wxPrintPreview, setZoom, 1}},
+ {2486, {wxPreviewFrame, new, 3}},
+ {2487, {wxPreviewFrame, destruct, 0}},
+ {2488, {wxPreviewFrame, createControlBar, 0}},
+ {2489, {wxPreviewFrame, createCanvas, 0}},
+ {2490, {wxPreviewFrame, initialize, 0}},
+ {2491, {wxPreviewFrame, onCloseWindow, 1}},
+ {2492, {wxPreviewControlBar, new, 4}},
+ {2493, {wxPreviewControlBar, destruct, 0}},
+ {2494, {wxPreviewControlBar, createButtons, 0}},
+ {2495, {wxPreviewControlBar, getPrintPreview, 0}},
+ {2496, {wxPreviewControlBar, getZoomControl, 0}},
+ {2497, {wxPreviewControlBar, setZoomControl, 1}},
+ {2499, {wxPrinter, new, 1}},
+ {2500, {wxPrinter, createAbortWindow, 2}},
+ {2501, {wxPrinter, getAbort, 0}},
+ {2502, {wxPrinter, getLastError, 0}},
+ {2503, {wxPrinter, getPrintDialogData, 0}},
+ {2504, {wxPrinter, print, 3}},
+ {2505, {wxPrinter, printDialog, 1}},
+ {2506, {wxPrinter, reportError, 3}},
+ {2507, {wxPrinter, setup, 1}},
+ {2508, {wxPrinter, 'Destroy', undefined}},
+ {2509, {wxXmlResource, new_1, 1}},
+ {2510, {wxXmlResource, new_2, 2}},
+ {2511, {wxXmlResource, destruct, 0}},
+ {2512, {wxXmlResource, attachUnknownControl, 3}},
+ {2513, {wxXmlResource, clearHandlers, 0}},
+ {2514, {wxXmlResource, compareVersion, 4}},
+ {2515, {wxXmlResource, get, 0}},
+ {2516, {wxXmlResource, getFlags, 0}},
+ {2517, {wxXmlResource, getVersion, 0}},
+ {2518, {wxXmlResource, getXRCID, 2}},
+ {2519, {wxXmlResource, initAllHandlers, 0}},
+ {2520, {wxXmlResource, load, 1}},
+ {2521, {wxXmlResource, loadBitmap, 1}},
+ {2522, {wxXmlResource, loadDialog_2, 2}},
+ {2523, {wxXmlResource, loadDialog_3, 3}},
+ {2524, {wxXmlResource, loadFrame_2, 2}},
+ {2525, {wxXmlResource, loadFrame_3, 3}},
+ {2526, {wxXmlResource, loadIcon, 1}},
+ {2527, {wxXmlResource, loadMenu, 1}},
+ {2528, {wxXmlResource, loadMenuBar_2, 2}},
+ {2529, {wxXmlResource, loadMenuBar_1, 1}},
+ {2530, {wxXmlResource, loadPanel_2, 2}},
+ {2531, {wxXmlResource, loadPanel_3, 3}},
+ {2532, {wxXmlResource, loadToolBar, 2}},
+ {2533, {wxXmlResource, set, 1}},
+ {2534, {wxXmlResource, setFlags, 1}},
+ {2535, {wxXmlResource, unload, 1}},
+ {2536, {wxXmlResource, xrcctrl, 3}},
+ {2537, {wxHtmlEasyPrinting, new, 1}},
+ {2538, {wxHtmlEasyPrinting, destruct, 0}},
+ {2539, {wxHtmlEasyPrinting, getPrintData, 0}},
+ {2540, {wxHtmlEasyPrinting, getPageSetupData, 0}},
+ {2541, {wxHtmlEasyPrinting, previewFile, 1}},
+ {2542, {wxHtmlEasyPrinting, previewText, 2}},
+ {2543, {wxHtmlEasyPrinting, printFile, 1}},
+ {2544, {wxHtmlEasyPrinting, printText, 2}},
+ {2545, {wxHtmlEasyPrinting, pageSetup, 0}},
+ {2546, {wxHtmlEasyPrinting, setFonts, 3}},
+ {2547, {wxHtmlEasyPrinting, setHeader, 2}},
+ {2548, {wxHtmlEasyPrinting, setFooter, 2}},
+ {2550, {wxGLCanvas, new_2, 2}},
+ {2551, {wxGLCanvas, new_3_1, 3}},
+ {2552, {wxGLCanvas, new_3_0, 3}},
+ {2553, {wxGLCanvas, getContext, 0}},
+ {2555, {wxGLCanvas, setCurrent, 0}},
+ {2556, {wxGLCanvas, swapBuffers, 0}},
+ {2557, {wxGLCanvas, 'Destroy', undefined}},
+ {2558, {wxAuiManager, new, 1}},
+ {2559, {wxAuiManager, destruct, 0}},
+ {2560, {wxAuiManager, addPane_2_1, 2}},
+ {2561, {wxAuiManager, addPane_3, 3}},
+ {2562, {wxAuiManager, addPane_2_0, 2}},
+ {2563, {wxAuiManager, detachPane, 1}},
+ {2564, {wxAuiManager, getAllPanes, 0}},
+ {2565, {wxAuiManager, getArtProvider, 0}},
+ {2566, {wxAuiManager, getDockSizeConstraint, 2}},
+ {2567, {wxAuiManager, getFlags, 0}},
+ {2568, {wxAuiManager, getManagedWindow, 0}},
+ {2569, {wxAuiManager, getManager, 1}},
+ {2570, {wxAuiManager, getPane_1_1, 1}},
+ {2571, {wxAuiManager, getPane_1_0, 1}},
+ {2572, {wxAuiManager, hideHint, 0}},
+ {2573, {wxAuiManager, insertPane, 3}},
+ {2574, {wxAuiManager, loadPaneInfo, 2}},
+ {2575, {wxAuiManager, loadPerspective, 2}},
+ {2576, {wxAuiManager, savePaneInfo, 1}},
+ {2577, {wxAuiManager, savePerspective, 0}},
+ {2578, {wxAuiManager, setArtProvider, 1}},
+ {2579, {wxAuiManager, setDockSizeConstraint, 2}},
+ {2580, {wxAuiManager, setFlags, 1}},
+ {2581, {wxAuiManager, setManagedWindow, 1}},
+ {2582, {wxAuiManager, showHint, 1}},
+ {2583, {wxAuiManager, unInit, 0}},
+ {2584, {wxAuiManager, update, 0}},
+ {2585, {wxAuiPaneInfo, new_0, 0}},
+ {2586, {wxAuiPaneInfo, new_1, 1}},
+ {2587, {wxAuiPaneInfo, destruct, 0}},
+ {2588, {wxAuiPaneInfo, bestSize_1, 1}},
+ {2589, {wxAuiPaneInfo, bestSize_2, 2}},
+ {2590, {wxAuiPaneInfo, bottom, 0}},
+ {2591, {wxAuiPaneInfo, bottomDockable, 1}},
+ {2592, {wxAuiPaneInfo, caption, 1}},
+ {2593, {wxAuiPaneInfo, captionVisible, 1}},
+ {2594, {wxAuiPaneInfo, centre, 0}},
+ {2595, {wxAuiPaneInfo, centrePane, 0}},
+ {2596, {wxAuiPaneInfo, closeButton, 1}},
+ {2597, {wxAuiPaneInfo, defaultPane, 0}},
+ {2598, {wxAuiPaneInfo, destroyOnClose, 1}},
+ {2599, {wxAuiPaneInfo, direction, 1}},
+ {2600, {wxAuiPaneInfo, dock, 0}},
+ {2601, {wxAuiPaneInfo, dockable, 1}},
+ {2602, {wxAuiPaneInfo, fixed, 0}},
+ {2603, {wxAuiPaneInfo, float, 0}},
+ {2604, {wxAuiPaneInfo, floatable, 1}},
+ {2605, {wxAuiPaneInfo, floatingPosition_1, 1}},
+ {2606, {wxAuiPaneInfo, floatingPosition_2, 2}},
+ {2607, {wxAuiPaneInfo, floatingSize_1, 1}},
+ {2608, {wxAuiPaneInfo, floatingSize_2, 2}},
+ {2609, {wxAuiPaneInfo, gripper, 1}},
+ {2610, {wxAuiPaneInfo, gripperTop, 1}},
+ {2611, {wxAuiPaneInfo, hasBorder, 0}},
+ {2612, {wxAuiPaneInfo, hasCaption, 0}},
+ {2613, {wxAuiPaneInfo, hasCloseButton, 0}},
+ {2614, {wxAuiPaneInfo, hasFlag, 1}},
+ {2615, {wxAuiPaneInfo, hasGripper, 0}},
+ {2616, {wxAuiPaneInfo, hasGripperTop, 0}},
+ {2617, {wxAuiPaneInfo, hasMaximizeButton, 0}},
+ {2618, {wxAuiPaneInfo, hasMinimizeButton, 0}},
+ {2619, {wxAuiPaneInfo, hasPinButton, 0}},
+ {2620, {wxAuiPaneInfo, hide, 0}},
+ {2621, {wxAuiPaneInfo, isBottomDockable, 0}},
+ {2622, {wxAuiPaneInfo, isDocked, 0}},
+ {2623, {wxAuiPaneInfo, isFixed, 0}},
+ {2624, {wxAuiPaneInfo, isFloatable, 0}},
+ {2625, {wxAuiPaneInfo, isFloating, 0}},
+ {2626, {wxAuiPaneInfo, isLeftDockable, 0}},
+ {2627, {wxAuiPaneInfo, isMovable, 0}},
+ {2628, {wxAuiPaneInfo, isOk, 0}},
+ {2629, {wxAuiPaneInfo, isResizable, 0}},
+ {2630, {wxAuiPaneInfo, isRightDockable, 0}},
+ {2631, {wxAuiPaneInfo, isShown, 0}},
+ {2632, {wxAuiPaneInfo, isToolbar, 0}},
+ {2633, {wxAuiPaneInfo, isTopDockable, 0}},
+ {2634, {wxAuiPaneInfo, layer, 1}},
+ {2635, {wxAuiPaneInfo, left, 0}},
+ {2636, {wxAuiPaneInfo, leftDockable, 1}},
+ {2637, {wxAuiPaneInfo, maxSize_1, 1}},
+ {2638, {wxAuiPaneInfo, maxSize_2, 2}},
+ {2639, {wxAuiPaneInfo, maximizeButton, 1}},
+ {2640, {wxAuiPaneInfo, minSize_1, 1}},
+ {2641, {wxAuiPaneInfo, minSize_2, 2}},
+ {2642, {wxAuiPaneInfo, minimizeButton, 1}},
+ {2643, {wxAuiPaneInfo, movable, 1}},
+ {2644, {wxAuiPaneInfo, name, 1}},
+ {2645, {wxAuiPaneInfo, paneBorder, 1}},
+ {2646, {wxAuiPaneInfo, pinButton, 1}},
+ {2647, {wxAuiPaneInfo, position, 1}},
+ {2648, {wxAuiPaneInfo, resizable, 1}},
+ {2649, {wxAuiPaneInfo, right, 0}},
+ {2650, {wxAuiPaneInfo, rightDockable, 1}},
+ {2651, {wxAuiPaneInfo, row, 1}},
+ {2652, {wxAuiPaneInfo, safeSet, 1}},
+ {2653, {wxAuiPaneInfo, setFlag, 2}},
+ {2654, {wxAuiPaneInfo, show, 1}},
+ {2655, {wxAuiPaneInfo, toolbarPane, 0}},
+ {2656, {wxAuiPaneInfo, top, 0}},
+ {2657, {wxAuiPaneInfo, topDockable, 1}},
+ {2658, {wxAuiPaneInfo, window, 1}},
+ {2659, {wxAuiPaneInfo, getWindow, 0}},
+ {2660, {wxAuiPaneInfo, getFrame, 0}},
+ {2661, {wxAuiPaneInfo, getDirection, 0}},
+ {2662, {wxAuiPaneInfo, getLayer, 0}},
+ {2663, {wxAuiPaneInfo, getRow, 0}},
+ {2664, {wxAuiPaneInfo, getPosition, 0}},
+ {2665, {wxAuiPaneInfo, getFloatingPosition, 0}},
+ {2666, {wxAuiPaneInfo, getFloatingSize, 0}},
+ {2667, {wxAuiNotebook, new_0, 0}},
+ {2668, {wxAuiNotebook, new_2, 2}},
+ {2669, {wxAuiNotebook, addPage, 3}},
+ {2670, {wxAuiNotebook, create, 2}},
+ {2671, {wxAuiNotebook, deletePage, 1}},
+ {2672, {wxAuiNotebook, getArtProvider, 0}},
+ {2673, {wxAuiNotebook, getPage, 1}},
+ {2674, {wxAuiNotebook, getPageBitmap, 1}},
+ {2675, {wxAuiNotebook, getPageCount, 0}},
+ {2676, {wxAuiNotebook, getPageIndex, 1}},
+ {2677, {wxAuiNotebook, getPageText, 1}},
+ {2678, {wxAuiNotebook, getSelection, 0}},
+ {2679, {wxAuiNotebook, insertPage, 4}},
+ {2680, {wxAuiNotebook, removePage, 1}},
+ {2681, {wxAuiNotebook, setArtProvider, 1}},
+ {2682, {wxAuiNotebook, setFont, 1}},
+ {2683, {wxAuiNotebook, setPageBitmap, 2}},
+ {2684, {wxAuiNotebook, setPageText, 2}},
+ {2685, {wxAuiNotebook, setSelection, 1}},
+ {2686, {wxAuiNotebook, setTabCtrlHeight, 1}},
+ {2687, {wxAuiNotebook, setUniformBitmapSize, 1}},
+ {2688, {wxAuiNotebook, 'Destroy', undefined}},
+ {2689, {wxAuiTabArt, setFlags, 1}},
+ {2690, {wxAuiTabArt, setMeasuringFont, 1}},
+ {2691, {wxAuiTabArt, setNormalFont, 1}},
+ {2692, {wxAuiTabArt, setSelectedFont, 1}},
+ {2693, {wxAuiTabArt, setColour, 1}},
+ {2694, {wxAuiTabArt, setActiveColour, 1}},
+ {2695, {wxAuiDockArt, getColour, 1}},
+ {2696, {wxAuiDockArt, getFont, 1}},
+ {2697, {wxAuiDockArt, getMetric, 1}},
+ {2698, {wxAuiDockArt, setColour, 2}},
+ {2699, {wxAuiDockArt, setFont, 2}},
+ {2700, {wxAuiDockArt, setMetric, 2}},
+ {2701, {wxAuiSimpleTabArt, new, 0}},
+ {2702, {wxAuiSimpleTabArt, 'Destroy', undefined}},
+ {2703, {wxMDIParentFrame, new_0, 0}},
+ {2704, {wxMDIParentFrame, new_4, 4}},
+ {2705, {wxMDIParentFrame, destruct, 0}},
+ {2706, {wxMDIParentFrame, activateNext, 0}},
+ {2707, {wxMDIParentFrame, activatePrevious, 0}},
+ {2708, {wxMDIParentFrame, arrangeIcons, 0}},
+ {2709, {wxMDIParentFrame, cascade, 0}},
+ {2710, {wxMDIParentFrame, create, 4}},
+ {2711, {wxMDIParentFrame, getActiveChild, 0}},
+ {2712, {wxMDIParentFrame, getClientWindow, 0}},
+ {2713, {wxMDIParentFrame, tile, 1}},
+ {2714, {wxMDIChildFrame, new_0, 0}},
+ {2715, {wxMDIChildFrame, new_4, 4}},
+ {2716, {wxMDIChildFrame, destruct, 0}},
+ {2717, {wxMDIChildFrame, activate, 0}},
+ {2718, {wxMDIChildFrame, create, 4}},
+ {2719, {wxMDIChildFrame, maximize, 1}},
+ {2720, {wxMDIChildFrame, restore, 0}},
+ {2721, {wxMDIClientWindow, new_0, 0}},
+ {2722, {wxMDIClientWindow, new_2, 2}},
+ {2723, {wxMDIClientWindow, destruct, 0}},
+ {2724, {wxMDIClientWindow, createClient, 2}},
+ {2725, {wxLayoutAlgorithm, new, 0}},
+ {2726, {wxLayoutAlgorithm, layoutFrame, 2}},
+ {2727, {wxLayoutAlgorithm, layoutMDIFrame, 2}},
+ {2728, {wxLayoutAlgorithm, layoutWindow, 2}},
+ {2729, {wxLayoutAlgorithm, 'Destroy', undefined}},
+ {2730, {wxEvent, getId, 0}},
+ {2731, {wxEvent, getSkipped, 0}},
+ {2732, {wxEvent, getTimestamp, 0}},
+ {2733, {wxEvent, isCommandEvent, 0}},
+ {2734, {wxEvent, resumePropagation, 1}},
+ {2735, {wxEvent, shouldPropagate, 0}},
+ {2736, {wxEvent, skip, 1}},
+ {2737, {wxEvent, stopPropagation, 0}},
+ {2738, {wxCommandEvent, getClientData, 0}},
+ {2739, {wxCommandEvent, getExtraLong, 0}},
+ {2740, {wxCommandEvent, getInt, 0}},
+ {2741, {wxCommandEvent, getSelection, 0}},
+ {2742, {wxCommandEvent, getString, 0}},
+ {2743, {wxCommandEvent, isChecked, 0}},
+ {2744, {wxCommandEvent, isSelection, 0}},
+ {2745, {wxCommandEvent, setInt, 1}},
+ {2746, {wxCommandEvent, setString, 1}},
+ {2747, {wxScrollEvent, getOrientation, 0}},
+ {2748, {wxScrollEvent, getPosition, 0}},
+ {2749, {wxScrollWinEvent, getOrientation, 0}},
+ {2750, {wxScrollWinEvent, getPosition, 0}},
+ {2751, {wxMouseEvent, altDown, 0}},
+ {2752, {wxMouseEvent, button, 1}},
+ {2753, {wxMouseEvent, buttonDClick, 1}},
+ {2754, {wxMouseEvent, buttonDown, 1}},
+ {2755, {wxMouseEvent, buttonUp, 1}},
+ {2756, {wxMouseEvent, cmdDown, 0}},
+ {2757, {wxMouseEvent, controlDown, 0}},
+ {2758, {wxMouseEvent, dragging, 0}},
+ {2759, {wxMouseEvent, entering, 0}},
+ {2760, {wxMouseEvent, getButton, 0}},
+ {2763, {wxMouseEvent, getPosition, 0}},
+ {2764, {wxMouseEvent, getLogicalPosition, 1}},
+ {2765, {wxMouseEvent, getLinesPerAction, 0}},
+ {2766, {wxMouseEvent, getWheelRotation, 0}},
+ {2767, {wxMouseEvent, getWheelDelta, 0}},
+ {2768, {wxMouseEvent, getX, 0}},
+ {2769, {wxMouseEvent, getY, 0}},
+ {2770, {wxMouseEvent, isButton, 0}},
+ {2771, {wxMouseEvent, isPageScroll, 0}},
+ {2772, {wxMouseEvent, leaving, 0}},
+ {2773, {wxMouseEvent, leftDClick, 0}},
+ {2774, {wxMouseEvent, leftDown, 0}},
+ {2775, {wxMouseEvent, leftIsDown, 0}},
+ {2776, {wxMouseEvent, leftUp, 0}},
+ {2777, {wxMouseEvent, metaDown, 0}},
+ {2778, {wxMouseEvent, middleDClick, 0}},
+ {2779, {wxMouseEvent, middleDown, 0}},
+ {2780, {wxMouseEvent, middleIsDown, 0}},
+ {2781, {wxMouseEvent, middleUp, 0}},
+ {2782, {wxMouseEvent, moving, 0}},
+ {2783, {wxMouseEvent, rightDClick, 0}},
+ {2784, {wxMouseEvent, rightDown, 0}},
+ {2785, {wxMouseEvent, rightIsDown, 0}},
+ {2786, {wxMouseEvent, rightUp, 0}},
+ {2787, {wxMouseEvent, shiftDown, 0}},
+ {2788, {wxSetCursorEvent, getCursor, 0}},
+ {2789, {wxSetCursorEvent, getX, 0}},
+ {2790, {wxSetCursorEvent, getY, 0}},
+ {2791, {wxSetCursorEvent, hasCursor, 0}},
+ {2792, {wxSetCursorEvent, setCursor, 1}},
+ {2793, {wxKeyEvent, altDown, 0}},
+ {2794, {wxKeyEvent, cmdDown, 0}},
+ {2795, {wxKeyEvent, controlDown, 0}},
+ {2796, {wxKeyEvent, getKeyCode, 0}},
+ {2797, {wxKeyEvent, getModifiers, 0}},
+ {2800, {wxKeyEvent, getPosition, 0}},
+ {2801, {wxKeyEvent, getRawKeyCode, 0}},
+ {2802, {wxKeyEvent, getRawKeyFlags, 0}},
+ {2803, {wxKeyEvent, getUnicodeKey, 0}},
+ {2804, {wxKeyEvent, getX, 0}},
+ {2805, {wxKeyEvent, getY, 0}},
+ {2806, {wxKeyEvent, hasModifiers, 0}},
+ {2807, {wxKeyEvent, metaDown, 0}},
+ {2808, {wxKeyEvent, shiftDown, 0}},
+ {2809, {wxSizeEvent, getSize, 0}},
+ {2810, {wxMoveEvent, getPosition, 0}},
+ {2811, {wxEraseEvent, getDC, 0}},
+ {2812, {wxFocusEvent, getWindow, 0}},
+ {2813, {wxChildFocusEvent, getWindow, 0}},
+ {2814, {wxMenuEvent, getMenu, 0}},
+ {2815, {wxMenuEvent, getMenuId, 0}},
+ {2816, {wxMenuEvent, isPopup, 0}},
+ {2817, {wxCloseEvent, canVeto, 0}},
+ {2818, {wxCloseEvent, getLoggingOff, 0}},
+ {2819, {wxCloseEvent, setCanVeto, 1}},
+ {2820, {wxCloseEvent, setLoggingOff, 1}},
+ {2821, {wxCloseEvent, veto, 1}},
+ {2822, {wxShowEvent, setShow, 1}},
+ {2823, {wxShowEvent, getShow, 0}},
+ {2824, {wxIconizeEvent, iconized, 0}},
+ {2825, {wxJoystickEvent, buttonDown, 1}},
+ {2826, {wxJoystickEvent, buttonIsDown, 1}},
+ {2827, {wxJoystickEvent, buttonUp, 1}},
+ {2828, {wxJoystickEvent, getButtonChange, 0}},
+ {2829, {wxJoystickEvent, getButtonState, 0}},
+ {2830, {wxJoystickEvent, getJoystick, 0}},
+ {2831, {wxJoystickEvent, getPosition, 0}},
+ {2832, {wxJoystickEvent, getZPosition, 0}},
+ {2833, {wxJoystickEvent, isButton, 0}},
+ {2834, {wxJoystickEvent, isMove, 0}},
+ {2835, {wxJoystickEvent, isZMove, 0}},
+ {2836, {wxUpdateUIEvent, canUpdate, 1}},
+ {2837, {wxUpdateUIEvent, check, 1}},
+ {2838, {wxUpdateUIEvent, enable, 1}},
+ {2839, {wxUpdateUIEvent, show, 1}},
+ {2840, {wxUpdateUIEvent, getChecked, 0}},
+ {2841, {wxUpdateUIEvent, getEnabled, 0}},
+ {2842, {wxUpdateUIEvent, getShown, 0}},
+ {2843, {wxUpdateUIEvent, getSetChecked, 0}},
+ {2844, {wxUpdateUIEvent, getSetEnabled, 0}},
+ {2845, {wxUpdateUIEvent, getSetShown, 0}},
+ {2846, {wxUpdateUIEvent, getSetText, 0}},
+ {2847, {wxUpdateUIEvent, getText, 0}},
+ {2848, {wxUpdateUIEvent, getMode, 0}},
+ {2849, {wxUpdateUIEvent, getUpdateInterval, 0}},
+ {2850, {wxUpdateUIEvent, resetUpdateTime, 0}},
+ {2851, {wxUpdateUIEvent, setMode, 1}},
+ {2852, {wxUpdateUIEvent, setText, 1}},
+ {2853, {wxUpdateUIEvent, setUpdateInterval, 1}},
+ {2854, {wxMouseCaptureChangedEvent, getCapturedWindow, 0}},
+ {2855, {wxPaletteChangedEvent, setChangedWindow, 1}},
+ {2856, {wxPaletteChangedEvent, getChangedWindow, 0}},
+ {2857, {wxQueryNewPaletteEvent, setPaletteRealized, 1}},
+ {2858, {wxQueryNewPaletteEvent, getPaletteRealized, 0}},
+ {2859, {wxNavigationKeyEvent, getDirection, 0}},
+ {2860, {wxNavigationKeyEvent, setDirection, 1}},
+ {2861, {wxNavigationKeyEvent, isWindowChange, 0}},
+ {2862, {wxNavigationKeyEvent, setWindowChange, 1}},
+ {2863, {wxNavigationKeyEvent, isFromTab, 0}},
+ {2864, {wxNavigationKeyEvent, setFromTab, 1}},
+ {2865, {wxNavigationKeyEvent, getCurrentFocus, 0}},
+ {2866, {wxNavigationKeyEvent, setCurrentFocus, 1}},
+ {2867, {wxHelpEvent, getOrigin, 0}},
+ {2868, {wxHelpEvent, getPosition, 0}},
+ {2869, {wxHelpEvent, setOrigin, 1}},
+ {2870, {wxHelpEvent, setPosition, 1}},
+ {2871, {wxContextMenuEvent, getPosition, 0}},
+ {2872, {wxContextMenuEvent, setPosition, 1}},
+ {2873, {wxIdleEvent, canSend, 1}},
+ {2874, {wxIdleEvent, getMode, 0}},
+ {2875, {wxIdleEvent, requestMore, 1}},
+ {2876, {wxIdleEvent, moreRequested, 0}},
+ {2877, {wxIdleEvent, setMode, 1}},
+ {2878, {wxGridEvent, altDown, 0}},
+ {2879, {wxGridEvent, controlDown, 0}},
+ {2880, {wxGridEvent, getCol, 0}},
+ {2881, {wxGridEvent, getPosition, 0}},
+ {2882, {wxGridEvent, getRow, 0}},
+ {2883, {wxGridEvent, metaDown, 0}},
+ {2884, {wxGridEvent, selecting, 0}},
+ {2885, {wxGridEvent, shiftDown, 0}},
+ {2886, {wxNotifyEvent, allow, 0}},
+ {2887, {wxNotifyEvent, isAllowed, 0}},
+ {2888, {wxNotifyEvent, veto, 0}},
+ {2889, {wxSashEvent, getEdge, 0}},
+ {2890, {wxSashEvent, getDragRect, 0}},
+ {2891, {wxSashEvent, getDragStatus, 0}},
+ {2892, {wxListEvent, getCacheFrom, 0}},
+ {2893, {wxListEvent, getCacheTo, 0}},
+ {2894, {wxListEvent, getKeyCode, 0}},
+ {2895, {wxListEvent, getIndex, 0}},
+ {2896, {wxListEvent, getColumn, 0}},
+ {2897, {wxListEvent, getPoint, 0}},
+ {2898, {wxListEvent, getLabel, 0}},
+ {2899, {wxListEvent, getText, 0}},
+ {2900, {wxListEvent, getImage, 0}},
+ {2901, {wxListEvent, getData, 0}},
+ {2902, {wxListEvent, getMask, 0}},
+ {2903, {wxListEvent, getItem, 0}},
+ {2904, {wxListEvent, isEditCancelled, 0}},
+ {2905, {wxDateEvent, getDate, 0}},
+ {2906, {wxCalendarEvent, getWeekDay, 0}},
+ {2907, {wxFileDirPickerEvent, getPath, 0}},
+ {2908, {wxColourPickerEvent, getColour, 0}},
+ {2909, {wxFontPickerEvent, getFont, 0}},
+ {2910, {wxStyledTextEvent, getPosition, 0}},
+ {2911, {wxStyledTextEvent, getKey, 0}},
+ {2912, {wxStyledTextEvent, getModifiers, 0}},
+ {2913, {wxStyledTextEvent, getModificationType, 0}},
+ {2914, {wxStyledTextEvent, getText, 0}},
+ {2915, {wxStyledTextEvent, getLength, 0}},
+ {2916, {wxStyledTextEvent, getLinesAdded, 0}},
+ {2917, {wxStyledTextEvent, getLine, 0}},
+ {2918, {wxStyledTextEvent, getFoldLevelNow, 0}},
+ {2919, {wxStyledTextEvent, getFoldLevelPrev, 0}},
+ {2920, {wxStyledTextEvent, getMargin, 0}},
+ {2921, {wxStyledTextEvent, getMessage, 0}},
+ {2922, {wxStyledTextEvent, getWParam, 0}},
+ {2923, {wxStyledTextEvent, getLParam, 0}},
+ {2924, {wxStyledTextEvent, getListType, 0}},
+ {2925, {wxStyledTextEvent, getX, 0}},
+ {2926, {wxStyledTextEvent, getY, 0}},
+ {2927, {wxStyledTextEvent, getDragText, 0}},
+ {2928, {wxStyledTextEvent, getDragAllowMove, 0}},
+ {2929, {wxStyledTextEvent, getDragResult, 0}},
+ {2930, {wxStyledTextEvent, getShift, 0}},
+ {2931, {wxStyledTextEvent, getControl, 0}},
+ {2932, {wxStyledTextEvent, getAlt, 0}},
+ {2933, {utils, getKeyState, 1}},
+ {2934, {utils, getMousePosition, 2}},
+ {2935, {utils, getMouseState, 0}},
+ {2936, {utils, setDetectableAutoRepeat, 1}},
+ {2937, {utils, bell, 0}},
+ {2938, {utils, findMenuItemId, 3}},
+ {2939, {utils, genericFindWindowAtPoint, 1}},
+ {2940, {utils, findWindowAtPoint, 1}},
+ {2941, {utils, beginBusyCursor, 1}},
+ {2942, {utils, endBusyCursor, 0}},
+ {2943, {utils, isBusy, 0}},
+ {2944, {utils, shutdown, 1}},
+ {2945, {utils, shell, 1}},
+ {2946, {utils, launchDefaultBrowser, 2}},
+ {2947, {utils, getEmailAddress, 0}},
+ {2948, {utils, getUserId, 0}},
+ {2949, {utils, getHomeDir, 0}},
+ {2950, {utils, newId, 0}},
+ {2951, {utils, registerId, 1}},
+ {2952, {utils, getCurrentId, 0}},
+ {2953, {utils, getOsDescription, 0}},
+ {2954, {utils, isPlatformLittleEndian, 0}},
+ {2955, {utils, isPlatform64Bit, 0}},
+ {2956, {gdicmn, displaySize, 2}},
+ {2957, {gdicmn, setCursor, 1}},
+ {2958, {wxPrintout, new, 1}},
+ {2959, {wxPrintout, destruct, 0}},
+ {2960, {wxPrintout, getDC, 0}},
+ {2961, {wxPrintout, getPageSizeMM, 2}},
+ {2962, {wxPrintout, getPageSizePixels, 2}},
+ {2963, {wxPrintout, getPaperRectPixels, 0}},
+ {2964, {wxPrintout, getPPIPrinter, 2}},
+ {2965, {wxPrintout, getPPIScreen, 2}},
+ {2966, {wxPrintout, getTitle, 0}},
+ {2967, {wxPrintout, isPreview, 0}},
+ {2968, {wxPrintout, fitThisSizeToPaper, 1}},
+ {2969, {wxPrintout, fitThisSizeToPage, 1}},
+ {2970, {wxPrintout, fitThisSizeToPageMargins, 2}},
+ {2971, {wxPrintout, mapScreenSizeToPaper, 0}},
+ {2972, {wxPrintout, mapScreenSizeToPage, 0}},
+ {2973, {wxPrintout, mapScreenSizeToPageMargins, 1}},
+ {2974, {wxPrintout, mapScreenSizeToDevice, 0}},
+ {2975, {wxPrintout, getLogicalPaperRect, 0}},
+ {2976, {wxPrintout, getLogicalPageRect, 0}},
+ {2977, {wxPrintout, getLogicalPageMarginsRect, 1}},
+ {2978, {wxPrintout, setLogicalOrigin, 2}},
+ {2979, {wxPrintout, offsetLogicalOrigin, 2}},
+ {2980, {wxStyledTextCtrl, new_2, 2}},
+ {2981, {wxStyledTextCtrl, new_0, 0}},
+ {2982, {wxStyledTextCtrl, destruct, 0}},
+ {2983, {wxStyledTextCtrl, create, 2}},
+ {2984, {wxStyledTextCtrl, addText, 1}},
+ {2985, {wxStyledTextCtrl, addStyledText, 1}},
+ {2986, {wxStyledTextCtrl, insertText, 2}},
+ {2987, {wxStyledTextCtrl, clearAll, 0}},
+ {2988, {wxStyledTextCtrl, clearDocumentStyle, 0}},
+ {2989, {wxStyledTextCtrl, getLength, 0}},
+ {2990, {wxStyledTextCtrl, getCharAt, 1}},
+ {2991, {wxStyledTextCtrl, getCurrentPos, 0}},
+ {2992, {wxStyledTextCtrl, getAnchor, 0}},
+ {2993, {wxStyledTextCtrl, getStyleAt, 1}},
+ {2994, {wxStyledTextCtrl, redo, 0}},
+ {2995, {wxStyledTextCtrl, setUndoCollection, 1}},
+ {2996, {wxStyledTextCtrl, selectAll, 0}},
+ {2997, {wxStyledTextCtrl, setSavePoint, 0}},
+ {2998, {wxStyledTextCtrl, getStyledText, 2}},
+ {2999, {wxStyledTextCtrl, canRedo, 0}},
+ {3000, {wxStyledTextCtrl, markerLineFromHandle, 1}},
+ {3001, {wxStyledTextCtrl, markerDeleteHandle, 1}},
+ {3002, {wxStyledTextCtrl, getUndoCollection, 0}},
+ {3003, {wxStyledTextCtrl, getViewWhiteSpace, 0}},
+ {3004, {wxStyledTextCtrl, setViewWhiteSpace, 1}},
+ {3005, {wxStyledTextCtrl, positionFromPoint, 1}},
+ {3006, {wxStyledTextCtrl, positionFromPointClose, 2}},
+ {3007, {wxStyledTextCtrl, gotoLine, 1}},
+ {3008, {wxStyledTextCtrl, gotoPos, 1}},
+ {3009, {wxStyledTextCtrl, setAnchor, 1}},
+ {3010, {wxStyledTextCtrl, getCurLine, 1}},
+ {3011, {wxStyledTextCtrl, getEndStyled, 0}},
+ {3012, {wxStyledTextCtrl, convertEOLs, 1}},
+ {3013, {wxStyledTextCtrl, getEOLMode, 0}},
+ {3014, {wxStyledTextCtrl, setEOLMode, 1}},
+ {3015, {wxStyledTextCtrl, startStyling, 2}},
+ {3016, {wxStyledTextCtrl, setStyling, 2}},
+ {3017, {wxStyledTextCtrl, getBufferedDraw, 0}},
+ {3018, {wxStyledTextCtrl, setBufferedDraw, 1}},
+ {3019, {wxStyledTextCtrl, setTabWidth, 1}},
+ {3020, {wxStyledTextCtrl, getTabWidth, 0}},
+ {3021, {wxStyledTextCtrl, setCodePage, 1}},
+ {3022, {wxStyledTextCtrl, markerDefine, 3}},
+ {3023, {wxStyledTextCtrl, markerSetForeground, 2}},
+ {3024, {wxStyledTextCtrl, markerSetBackground, 2}},
+ {3025, {wxStyledTextCtrl, markerAdd, 2}},
+ {3026, {wxStyledTextCtrl, markerDelete, 2}},
+ {3027, {wxStyledTextCtrl, markerDeleteAll, 1}},
+ {3028, {wxStyledTextCtrl, markerGet, 1}},
+ {3029, {wxStyledTextCtrl, markerNext, 2}},
+ {3030, {wxStyledTextCtrl, markerPrevious, 2}},
+ {3031, {wxStyledTextCtrl, markerDefineBitmap, 2}},
+ {3032, {wxStyledTextCtrl, markerAddSet, 2}},
+ {3033, {wxStyledTextCtrl, markerSetAlpha, 2}},
+ {3034, {wxStyledTextCtrl, setMarginType, 2}},
+ {3035, {wxStyledTextCtrl, getMarginType, 1}},
+ {3036, {wxStyledTextCtrl, setMarginWidth, 2}},
+ {3037, {wxStyledTextCtrl, getMarginWidth, 1}},
+ {3038, {wxStyledTextCtrl, setMarginMask, 2}},
+ {3039, {wxStyledTextCtrl, getMarginMask, 1}},
+ {3040, {wxStyledTextCtrl, setMarginSensitive, 2}},
+ {3041, {wxStyledTextCtrl, getMarginSensitive, 1}},
+ {3042, {wxStyledTextCtrl, styleClearAll, 0}},
+ {3043, {wxStyledTextCtrl, styleSetForeground, 2}},
+ {3044, {wxStyledTextCtrl, styleSetBackground, 2}},
+ {3045, {wxStyledTextCtrl, styleSetBold, 2}},
+ {3046, {wxStyledTextCtrl, styleSetItalic, 2}},
+ {3047, {wxStyledTextCtrl, styleSetSize, 2}},
+ {3048, {wxStyledTextCtrl, styleSetFaceName, 2}},
+ {3049, {wxStyledTextCtrl, styleSetEOLFilled, 2}},
+ {3050, {wxStyledTextCtrl, styleResetDefault, 0}},
+ {3051, {wxStyledTextCtrl, styleSetUnderline, 2}},
+ {3052, {wxStyledTextCtrl, styleSetCase, 2}},
+ {3053, {wxStyledTextCtrl, styleSetHotSpot, 2}},
+ {3054, {wxStyledTextCtrl, setSelForeground, 2}},
+ {3055, {wxStyledTextCtrl, setSelBackground, 2}},
+ {3056, {wxStyledTextCtrl, getSelAlpha, 0}},
+ {3057, {wxStyledTextCtrl, setSelAlpha, 1}},
+ {3058, {wxStyledTextCtrl, setCaretForeground, 1}},
+ {3059, {wxStyledTextCtrl, cmdKeyAssign, 3}},
+ {3060, {wxStyledTextCtrl, cmdKeyClear, 2}},
+ {3061, {wxStyledTextCtrl, cmdKeyClearAll, 0}},
+ {3062, {wxStyledTextCtrl, setStyleBytes, 2}},
+ {3063, {wxStyledTextCtrl, styleSetVisible, 2}},
+ {3064, {wxStyledTextCtrl, getCaretPeriod, 0}},
+ {3065, {wxStyledTextCtrl, setCaretPeriod, 1}},
+ {3066, {wxStyledTextCtrl, setWordChars, 1}},
+ {3067, {wxStyledTextCtrl, beginUndoAction, 0}},
+ {3068, {wxStyledTextCtrl, endUndoAction, 0}},
+ {3069, {wxStyledTextCtrl, indicatorSetStyle, 2}},
+ {3070, {wxStyledTextCtrl, indicatorGetStyle, 1}},
+ {3071, {wxStyledTextCtrl, indicatorSetForeground, 2}},
+ {3072, {wxStyledTextCtrl, indicatorGetForeground, 1}},
+ {3073, {wxStyledTextCtrl, setWhitespaceForeground, 2}},
+ {3074, {wxStyledTextCtrl, setWhitespaceBackground, 2}},
+ {3075, {wxStyledTextCtrl, getStyleBits, 0}},
+ {3076, {wxStyledTextCtrl, setLineState, 2}},
+ {3077, {wxStyledTextCtrl, getLineState, 1}},
+ {3078, {wxStyledTextCtrl, getMaxLineState, 0}},
+ {3079, {wxStyledTextCtrl, getCaretLineVisible, 0}},
+ {3080, {wxStyledTextCtrl, setCaretLineVisible, 1}},
+ {3081, {wxStyledTextCtrl, getCaretLineBackground, 0}},
+ {3082, {wxStyledTextCtrl, setCaretLineBackground, 1}},
+ {3083, {wxStyledTextCtrl, autoCompShow, 2}},
+ {3084, {wxStyledTextCtrl, autoCompCancel, 0}},
+ {3085, {wxStyledTextCtrl, autoCompActive, 0}},
+ {3086, {wxStyledTextCtrl, autoCompPosStart, 0}},
+ {3087, {wxStyledTextCtrl, autoCompComplete, 0}},
+ {3088, {wxStyledTextCtrl, autoCompStops, 1}},
+ {3089, {wxStyledTextCtrl, autoCompSetSeparator, 1}},
+ {3090, {wxStyledTextCtrl, autoCompGetSeparator, 0}},
+ {3091, {wxStyledTextCtrl, autoCompSelect, 1}},
+ {3092, {wxStyledTextCtrl, autoCompSetCancelAtStart, 1}},
+ {3093, {wxStyledTextCtrl, autoCompGetCancelAtStart, 0}},
+ {3094, {wxStyledTextCtrl, autoCompSetFillUps, 1}},
+ {3095, {wxStyledTextCtrl, autoCompSetChooseSingle, 1}},
+ {3096, {wxStyledTextCtrl, autoCompGetChooseSingle, 0}},
+ {3097, {wxStyledTextCtrl, autoCompSetIgnoreCase, 1}},
+ {3098, {wxStyledTextCtrl, autoCompGetIgnoreCase, 0}},
+ {3099, {wxStyledTextCtrl, userListShow, 2}},
+ {3100, {wxStyledTextCtrl, autoCompSetAutoHide, 1}},
+ {3101, {wxStyledTextCtrl, autoCompGetAutoHide, 0}},
+ {3102, {wxStyledTextCtrl, autoCompSetDropRestOfWord, 1}},
+ {3103, {wxStyledTextCtrl, autoCompGetDropRestOfWord, 0}},
+ {3104, {wxStyledTextCtrl, registerImage, 2}},
+ {3105, {wxStyledTextCtrl, clearRegisteredImages, 0}},
+ {3106, {wxStyledTextCtrl, autoCompGetTypeSeparator, 0}},
+ {3107, {wxStyledTextCtrl, autoCompSetTypeSeparator, 1}},
+ {3108, {wxStyledTextCtrl, autoCompSetMaxWidth, 1}},
+ {3109, {wxStyledTextCtrl, autoCompGetMaxWidth, 0}},
+ {3110, {wxStyledTextCtrl, autoCompSetMaxHeight, 1}},
+ {3111, {wxStyledTextCtrl, autoCompGetMaxHeight, 0}},
+ {3112, {wxStyledTextCtrl, setIndent, 1}},
+ {3113, {wxStyledTextCtrl, getIndent, 0}},
+ {3114, {wxStyledTextCtrl, setUseTabs, 1}},
+ {3115, {wxStyledTextCtrl, getUseTabs, 0}},
+ {3116, {wxStyledTextCtrl, setLineIndentation, 2}},
+ {3117, {wxStyledTextCtrl, getLineIndentation, 1}},
+ {3118, {wxStyledTextCtrl, getLineIndentPosition, 1}},
+ {3119, {wxStyledTextCtrl, getColumn, 1}},
+ {3120, {wxStyledTextCtrl, setUseHorizontalScrollBar, 1}},
+ {3121, {wxStyledTextCtrl, getUseHorizontalScrollBar, 0}},
+ {3122, {wxStyledTextCtrl, setIndentationGuides, 1}},
+ {3123, {wxStyledTextCtrl, getIndentationGuides, 0}},
+ {3124, {wxStyledTextCtrl, setHighlightGuide, 1}},
+ {3125, {wxStyledTextCtrl, getHighlightGuide, 0}},
+ {3126, {wxStyledTextCtrl, getLineEndPosition, 1}},
+ {3127, {wxStyledTextCtrl, getCodePage, 0}},
+ {3128, {wxStyledTextCtrl, getCaretForeground, 0}},
+ {3129, {wxStyledTextCtrl, getReadOnly, 0}},
+ {3130, {wxStyledTextCtrl, setCurrentPos, 1}},
+ {3131, {wxStyledTextCtrl, setSelectionStart, 1}},
+ {3132, {wxStyledTextCtrl, getSelectionStart, 0}},
+ {3133, {wxStyledTextCtrl, setSelectionEnd, 1}},
+ {3134, {wxStyledTextCtrl, getSelectionEnd, 0}},
+ {3135, {wxStyledTextCtrl, setPrintMagnification, 1}},
+ {3136, {wxStyledTextCtrl, getPrintMagnification, 0}},
+ {3137, {wxStyledTextCtrl, setPrintColourMode, 1}},
+ {3138, {wxStyledTextCtrl, getPrintColourMode, 0}},
+ {3139, {wxStyledTextCtrl, findText, 4}},
+ {3140, {wxStyledTextCtrl, formatRange, 7}},
+ {3141, {wxStyledTextCtrl, getFirstVisibleLine, 0}},
+ {3142, {wxStyledTextCtrl, getLine, 1}},
+ {3143, {wxStyledTextCtrl, getLineCount, 0}},
+ {3144, {wxStyledTextCtrl, setMarginLeft, 1}},
+ {3145, {wxStyledTextCtrl, getMarginLeft, 0}},
+ {3146, {wxStyledTextCtrl, setMarginRight, 1}},
+ {3147, {wxStyledTextCtrl, getMarginRight, 0}},
+ {3148, {wxStyledTextCtrl, getModify, 0}},
+ {3149, {wxStyledTextCtrl, setSelection, 2}},
+ {3150, {wxStyledTextCtrl, getSelectedText, 0}},
+ {3151, {wxStyledTextCtrl, getTextRange, 2}},
+ {3152, {wxStyledTextCtrl, hideSelection, 1}},
+ {3153, {wxStyledTextCtrl, lineFromPosition, 1}},
+ {3154, {wxStyledTextCtrl, positionFromLine, 1}},
+ {3155, {wxStyledTextCtrl, lineScroll, 2}},
+ {3156, {wxStyledTextCtrl, ensureCaretVisible, 0}},
+ {3157, {wxStyledTextCtrl, replaceSelection, 1}},
+ {3158, {wxStyledTextCtrl, setReadOnly, 1}},
+ {3159, {wxStyledTextCtrl, canPaste, 0}},
+ {3160, {wxStyledTextCtrl, canUndo, 0}},
+ {3161, {wxStyledTextCtrl, emptyUndoBuffer, 0}},
+ {3162, {wxStyledTextCtrl, undo, 0}},
+ {3163, {wxStyledTextCtrl, cut, 0}},
+ {3164, {wxStyledTextCtrl, copy, 0}},
+ {3165, {wxStyledTextCtrl, paste, 0}},
+ {3166, {wxStyledTextCtrl, clear, 0}},
+ {3167, {wxStyledTextCtrl, setText, 1}},
+ {3168, {wxStyledTextCtrl, getText, 0}},
+ {3169, {wxStyledTextCtrl, getTextLength, 0}},
+ {3170, {wxStyledTextCtrl, getOvertype, 0}},
+ {3171, {wxStyledTextCtrl, setCaretWidth, 1}},
+ {3172, {wxStyledTextCtrl, getCaretWidth, 0}},
+ {3173, {wxStyledTextCtrl, setTargetStart, 1}},
+ {3174, {wxStyledTextCtrl, getTargetStart, 0}},
+ {3175, {wxStyledTextCtrl, setTargetEnd, 1}},
+ {3176, {wxStyledTextCtrl, getTargetEnd, 0}},
+ {3177, {wxStyledTextCtrl, replaceTarget, 1}},
+ {3178, {wxStyledTextCtrl, searchInTarget, 1}},
+ {3179, {wxStyledTextCtrl, setSearchFlags, 1}},
+ {3180, {wxStyledTextCtrl, getSearchFlags, 0}},
+ {3181, {wxStyledTextCtrl, callTipShow, 2}},
+ {3182, {wxStyledTextCtrl, callTipCancel, 0}},
+ {3183, {wxStyledTextCtrl, callTipActive, 0}},
+ {3184, {wxStyledTextCtrl, callTipPosAtStart, 0}},
+ {3185, {wxStyledTextCtrl, callTipSetHighlight, 2}},
+ {3186, {wxStyledTextCtrl, callTipSetBackground, 1}},
+ {3187, {wxStyledTextCtrl, callTipSetForeground, 1}},
+ {3188, {wxStyledTextCtrl, callTipSetForegroundHighlight, 1}},
+ {3189, {wxStyledTextCtrl, callTipUseStyle, 1}},
+ {3190, {wxStyledTextCtrl, visibleFromDocLine, 1}},
+ {3191, {wxStyledTextCtrl, docLineFromVisible, 1}},
+ {3192, {wxStyledTextCtrl, wrapCount, 1}},
+ {3193, {wxStyledTextCtrl, setFoldLevel, 2}},
+ {3194, {wxStyledTextCtrl, getFoldLevel, 1}},
+ {3195, {wxStyledTextCtrl, getLastChild, 2}},
+ {3196, {wxStyledTextCtrl, getFoldParent, 1}},
+ {3197, {wxStyledTextCtrl, showLines, 2}},
+ {3198, {wxStyledTextCtrl, hideLines, 2}},
+ {3199, {wxStyledTextCtrl, getLineVisible, 1}},
+ {3200, {wxStyledTextCtrl, setFoldExpanded, 2}},
+ {3201, {wxStyledTextCtrl, getFoldExpanded, 1}},
+ {3202, {wxStyledTextCtrl, toggleFold, 1}},
+ {3203, {wxStyledTextCtrl, ensureVisible, 1}},
+ {3204, {wxStyledTextCtrl, setFoldFlags, 1}},
+ {3205, {wxStyledTextCtrl, ensureVisibleEnforcePolicy, 1}},
+ {3206, {wxStyledTextCtrl, setTabIndents, 1}},
+ {3207, {wxStyledTextCtrl, getTabIndents, 0}},
+ {3208, {wxStyledTextCtrl, setBackSpaceUnIndents, 1}},
+ {3209, {wxStyledTextCtrl, getBackSpaceUnIndents, 0}},
+ {3210, {wxStyledTextCtrl, setMouseDwellTime, 1}},
+ {3211, {wxStyledTextCtrl, getMouseDwellTime, 0}},
+ {3212, {wxStyledTextCtrl, wordStartPosition, 2}},
+ {3213, {wxStyledTextCtrl, wordEndPosition, 2}},
+ {3214, {wxStyledTextCtrl, setWrapMode, 1}},
+ {3215, {wxStyledTextCtrl, getWrapMode, 0}},
+ {3216, {wxStyledTextCtrl, setWrapVisualFlags, 1}},
+ {3217, {wxStyledTextCtrl, getWrapVisualFlags, 0}},
+ {3218, {wxStyledTextCtrl, setWrapVisualFlagsLocation, 1}},
+ {3219, {wxStyledTextCtrl, getWrapVisualFlagsLocation, 0}},
+ {3220, {wxStyledTextCtrl, setWrapStartIndent, 1}},
+ {3221, {wxStyledTextCtrl, getWrapStartIndent, 0}},
+ {3222, {wxStyledTextCtrl, setLayoutCache, 1}},
+ {3223, {wxStyledTextCtrl, getLayoutCache, 0}},
+ {3224, {wxStyledTextCtrl, setScrollWidth, 1}},
+ {3225, {wxStyledTextCtrl, getScrollWidth, 0}},
+ {3226, {wxStyledTextCtrl, textWidth, 2}},
+ {3227, {wxStyledTextCtrl, getEndAtLastLine, 0}},
+ {3228, {wxStyledTextCtrl, textHeight, 1}},
+ {3229, {wxStyledTextCtrl, setUseVerticalScrollBar, 1}},
+ {3230, {wxStyledTextCtrl, getUseVerticalScrollBar, 0}},
+ {3231, {wxStyledTextCtrl, appendText, 1}},
+ {3232, {wxStyledTextCtrl, getTwoPhaseDraw, 0}},
+ {3233, {wxStyledTextCtrl, setTwoPhaseDraw, 1}},
+ {3234, {wxStyledTextCtrl, targetFromSelection, 0}},
+ {3235, {wxStyledTextCtrl, linesJoin, 0}},
+ {3236, {wxStyledTextCtrl, linesSplit, 1}},
+ {3237, {wxStyledTextCtrl, setFoldMarginColour, 2}},
+ {3238, {wxStyledTextCtrl, setFoldMarginHiColour, 2}},
+ {3239, {wxStyledTextCtrl, lineDown, 0}},
+ {3240, {wxStyledTextCtrl, lineDownExtend, 0}},
+ {3241, {wxStyledTextCtrl, lineUp, 0}},
+ {3242, {wxStyledTextCtrl, lineUpExtend, 0}},
+ {3243, {wxStyledTextCtrl, charLeft, 0}},
+ {3244, {wxStyledTextCtrl, charLeftExtend, 0}},
+ {3245, {wxStyledTextCtrl, charRight, 0}},
+ {3246, {wxStyledTextCtrl, charRightExtend, 0}},
+ {3247, {wxStyledTextCtrl, wordLeft, 0}},
+ {3248, {wxStyledTextCtrl, wordLeftExtend, 0}},
+ {3249, {wxStyledTextCtrl, wordRight, 0}},
+ {3250, {wxStyledTextCtrl, wordRightExtend, 0}},
+ {3251, {wxStyledTextCtrl, home, 0}},
+ {3252, {wxStyledTextCtrl, homeExtend, 0}},
+ {3253, {wxStyledTextCtrl, lineEnd, 0}},
+ {3254, {wxStyledTextCtrl, lineEndExtend, 0}},
+ {3255, {wxStyledTextCtrl, documentStart, 0}},
+ {3256, {wxStyledTextCtrl, documentStartExtend, 0}},
+ {3257, {wxStyledTextCtrl, documentEnd, 0}},
+ {3258, {wxStyledTextCtrl, documentEndExtend, 0}},
+ {3259, {wxStyledTextCtrl, pageUp, 0}},
+ {3260, {wxStyledTextCtrl, pageUpExtend, 0}},
+ {3261, {wxStyledTextCtrl, pageDown, 0}},
+ {3262, {wxStyledTextCtrl, pageDownExtend, 0}},
+ {3263, {wxStyledTextCtrl, editToggleOvertype, 0}},
+ {3264, {wxStyledTextCtrl, cancel, 0}},
+ {3265, {wxStyledTextCtrl, deleteBack, 0}},
+ {3266, {wxStyledTextCtrl, tab, 0}},
+ {3267, {wxStyledTextCtrl, backTab, 0}},
+ {3268, {wxStyledTextCtrl, newLine, 0}},
+ {3269, {wxStyledTextCtrl, formFeed, 0}},
+ {3270, {wxStyledTextCtrl, vCHome, 0}},
+ {3271, {wxStyledTextCtrl, vCHomeExtend, 0}},
+ {3272, {wxStyledTextCtrl, zoomIn, 0}},
+ {3273, {wxStyledTextCtrl, zoomOut, 0}},
+ {3274, {wxStyledTextCtrl, delWordLeft, 0}},
+ {3275, {wxStyledTextCtrl, delWordRight, 0}},
+ {3276, {wxStyledTextCtrl, lineCut, 0}},
+ {3277, {wxStyledTextCtrl, lineDelete, 0}},
+ {3278, {wxStyledTextCtrl, lineTranspose, 0}},
+ {3279, {wxStyledTextCtrl, lineDuplicate, 0}},
+ {3280, {wxStyledTextCtrl, lowerCase, 0}},
+ {3281, {wxStyledTextCtrl, upperCase, 0}},
+ {3282, {wxStyledTextCtrl, lineScrollDown, 0}},
+ {3283, {wxStyledTextCtrl, lineScrollUp, 0}},
+ {3284, {wxStyledTextCtrl, deleteBackNotLine, 0}},
+ {3285, {wxStyledTextCtrl, homeDisplay, 0}},
+ {3286, {wxStyledTextCtrl, homeDisplayExtend, 0}},
+ {3287, {wxStyledTextCtrl, lineEndDisplay, 0}},
+ {3288, {wxStyledTextCtrl, lineEndDisplayExtend, 0}},
+ {3289, {wxStyledTextCtrl, homeWrapExtend, 0}},
+ {3290, {wxStyledTextCtrl, lineEndWrap, 0}},
+ {3291, {wxStyledTextCtrl, lineEndWrapExtend, 0}},
+ {3292, {wxStyledTextCtrl, vCHomeWrap, 0}},
+ {3293, {wxStyledTextCtrl, vCHomeWrapExtend, 0}},
+ {3294, {wxStyledTextCtrl, lineCopy, 0}},
+ {3295, {wxStyledTextCtrl, moveCaretInsideView, 0}},
+ {3296, {wxStyledTextCtrl, lineLength, 1}},
+ {3297, {wxStyledTextCtrl, braceHighlight, 2}},
+ {3298, {wxStyledTextCtrl, braceBadLight, 1}},
+ {3299, {wxStyledTextCtrl, braceMatch, 1}},
+ {3300, {wxStyledTextCtrl, getViewEOL, 0}},
+ {3301, {wxStyledTextCtrl, setViewEOL, 1}},
+ {3302, {wxStyledTextCtrl, setModEventMask, 1}},
+ {3303, {wxStyledTextCtrl, getEdgeColumn, 0}},
+ {3304, {wxStyledTextCtrl, setEdgeColumn, 1}},
+ {3305, {wxStyledTextCtrl, setEdgeMode, 1}},
+ {3306, {wxStyledTextCtrl, getEdgeMode, 0}},
+ {3307, {wxStyledTextCtrl, getEdgeColour, 0}},
+ {3308, {wxStyledTextCtrl, setEdgeColour, 1}},
+ {3309, {wxStyledTextCtrl, searchAnchor, 0}},
+ {3310, {wxStyledTextCtrl, searchNext, 2}},
+ {3311, {wxStyledTextCtrl, searchPrev, 2}},
+ {3312, {wxStyledTextCtrl, linesOnScreen, 0}},
+ {3313, {wxStyledTextCtrl, usePopUp, 1}},
+ {3314, {wxStyledTextCtrl, selectionIsRectangle, 0}},
+ {3315, {wxStyledTextCtrl, setZoom, 1}},
+ {3316, {wxStyledTextCtrl, getZoom, 0}},
+ {3317, {wxStyledTextCtrl, getModEventMask, 0}},
+ {3318, {wxStyledTextCtrl, setSTCFocus, 1}},
+ {3319, {wxStyledTextCtrl, getSTCFocus, 0}},
+ {3320, {wxStyledTextCtrl, setStatus, 1}},
+ {3321, {wxStyledTextCtrl, getStatus, 0}},
+ {3322, {wxStyledTextCtrl, setMouseDownCaptures, 1}},
+ {3323, {wxStyledTextCtrl, getMouseDownCaptures, 0}},
+ {3324, {wxStyledTextCtrl, setSTCCursor, 1}},
+ {3325, {wxStyledTextCtrl, getSTCCursor, 0}},
+ {3326, {wxStyledTextCtrl, setControlCharSymbol, 1}},
+ {3327, {wxStyledTextCtrl, getControlCharSymbol, 0}},
+ {3328, {wxStyledTextCtrl, wordPartLeft, 0}},
+ {3329, {wxStyledTextCtrl, wordPartLeftExtend, 0}},
+ {3330, {wxStyledTextCtrl, wordPartRight, 0}},
+ {3331, {wxStyledTextCtrl, wordPartRightExtend, 0}},
+ {3332, {wxStyledTextCtrl, setVisiblePolicy, 2}},
+ {3333, {wxStyledTextCtrl, delLineLeft, 0}},
+ {3334, {wxStyledTextCtrl, delLineRight, 0}},
+ {3335, {wxStyledTextCtrl, getXOffset, 0}},
+ {3336, {wxStyledTextCtrl, chooseCaretX, 0}},
+ {3337, {wxStyledTextCtrl, setXCaretPolicy, 2}},
+ {3338, {wxStyledTextCtrl, setYCaretPolicy, 2}},
+ {3339, {wxStyledTextCtrl, getPrintWrapMode, 0}},
+ {3340, {wxStyledTextCtrl, setHotspotActiveForeground, 2}},
+ {3341, {wxStyledTextCtrl, setHotspotActiveBackground, 2}},
+ {3342, {wxStyledTextCtrl, setHotspotActiveUnderline, 1}},
+ {3343, {wxStyledTextCtrl, setHotspotSingleLine, 1}},
+ {3344, {wxStyledTextCtrl, paraDownExtend, 0}},
+ {3345, {wxStyledTextCtrl, paraUp, 0}},
+ {3346, {wxStyledTextCtrl, paraUpExtend, 0}},
+ {3347, {wxStyledTextCtrl, positionBefore, 1}},
+ {3348, {wxStyledTextCtrl, positionAfter, 1}},
+ {3349, {wxStyledTextCtrl, copyRange, 2}},
+ {3350, {wxStyledTextCtrl, copyText, 2}},
+ {3351, {wxStyledTextCtrl, setSelectionMode, 1}},
+ {3352, {wxStyledTextCtrl, getSelectionMode, 0}},
+ {3353, {wxStyledTextCtrl, lineDownRectExtend, 0}},
+ {3354, {wxStyledTextCtrl, lineUpRectExtend, 0}},
+ {3355, {wxStyledTextCtrl, charLeftRectExtend, 0}},
+ {3356, {wxStyledTextCtrl, charRightRectExtend, 0}},
+ {3357, {wxStyledTextCtrl, homeRectExtend, 0}},
+ {3358, {wxStyledTextCtrl, vCHomeRectExtend, 0}},
+ {3359, {wxStyledTextCtrl, lineEndRectExtend, 0}},
+ {3360, {wxStyledTextCtrl, pageUpRectExtend, 0}},
+ {3361, {wxStyledTextCtrl, pageDownRectExtend, 0}},
+ {3362, {wxStyledTextCtrl, stutteredPageUp, 0}},
+ {3363, {wxStyledTextCtrl, stutteredPageUpExtend, 0}},
+ {3364, {wxStyledTextCtrl, stutteredPageDown, 0}},
+ {3365, {wxStyledTextCtrl, stutteredPageDownExtend, 0}},
+ {3366, {wxStyledTextCtrl, wordLeftEnd, 0}},
+ {3367, {wxStyledTextCtrl, wordLeftEndExtend, 0}},
+ {3368, {wxStyledTextCtrl, wordRightEnd, 0}},
+ {3369, {wxStyledTextCtrl, wordRightEndExtend, 0}},
+ {3370, {wxStyledTextCtrl, setWhitespaceChars, 1}},
+ {3371, {wxStyledTextCtrl, setCharsDefault, 0}},
+ {3372, {wxStyledTextCtrl, autoCompGetCurrent, 0}},
+ {3373, {wxStyledTextCtrl, allocate, 1}},
+ {3374, {wxStyledTextCtrl, findColumn, 2}},
+ {3375, {wxStyledTextCtrl, getCaretSticky, 0}},
+ {3376, {wxStyledTextCtrl, setCaretSticky, 1}},
+ {3377, {wxStyledTextCtrl, toggleCaretSticky, 0}},
+ {3378, {wxStyledTextCtrl, setPasteConvertEndings, 1}},
+ {3379, {wxStyledTextCtrl, getPasteConvertEndings, 0}},
+ {3380, {wxStyledTextCtrl, selectionDuplicate, 0}},
+ {3381, {wxStyledTextCtrl, setCaretLineBackAlpha, 1}},
+ {3382, {wxStyledTextCtrl, getCaretLineBackAlpha, 0}},
+ {3383, {wxStyledTextCtrl, startRecord, 0}},
+ {3384, {wxStyledTextCtrl, stopRecord, 0}},
+ {3385, {wxStyledTextCtrl, setLexer, 1}},
+ {3386, {wxStyledTextCtrl, getLexer, 0}},
+ {3387, {wxStyledTextCtrl, colourise, 2}},
+ {3388, {wxStyledTextCtrl, setProperty, 2}},
+ {3389, {wxStyledTextCtrl, setKeyWords, 2}},
+ {3390, {wxStyledTextCtrl, setLexerLanguage, 1}},
+ {3391, {wxStyledTextCtrl, getProperty, 1}},
+ {3392, {wxStyledTextCtrl, getStyleBitsNeeded, 0}},
+ {3393, {wxStyledTextCtrl, getCurrentLine, 0}},
+ {3394, {wxStyledTextCtrl, styleSetSpec, 2}},
+ {3395, {wxStyledTextCtrl, styleSetFont, 2}},
+ {3396, {wxStyledTextCtrl, styleSetFontAttr, 7}},
+ {3397, {wxStyledTextCtrl, styleSetCharacterSet, 2}},
+ {3398, {wxStyledTextCtrl, styleSetFontEncoding, 2}},
+ {3399, {wxStyledTextCtrl, cmdKeyExecute, 1}},
+ {3400, {wxStyledTextCtrl, setMargins, 2}},
+ {3401, {wxStyledTextCtrl, getSelection, 2}},
+ {3402, {wxStyledTextCtrl, pointFromPosition, 1}},
+ {3403, {wxStyledTextCtrl, scrollToLine, 1}},
+ {3404, {wxStyledTextCtrl, scrollToColumn, 1}},
+ {3405, {wxStyledTextCtrl, setVScrollBar, 1}},
+ {3406, {wxStyledTextCtrl, setHScrollBar, 1}},
+ {3407, {wxStyledTextCtrl, getLastKeydownProcessed, 0}},
+ {3408, {wxStyledTextCtrl, setLastKeydownProcessed, 1}},
+ {3409, {wxStyledTextCtrl, saveFile, 1}},
+ {3410, {wxStyledTextCtrl, loadFile, 1}},
+ {3411, {wxStyledTextCtrl, doDragOver, 3}},
+ {3412, {wxStyledTextCtrl, doDropText, 3}},
+ {3413, {wxStyledTextCtrl, getUseAntiAliasing, 0}},
+ {3414, {wxStyledTextCtrl, addTextRaw, 1}},
+ {3415, {wxStyledTextCtrl, insertTextRaw, 2}},
+ {3416, {wxStyledTextCtrl, getCurLineRaw, 1}},
+ {3417, {wxStyledTextCtrl, getLineRaw, 1}},
+ {3418, {wxStyledTextCtrl, getSelectedTextRaw, 0}},
+ {3419, {wxStyledTextCtrl, getTextRangeRaw, 2}},
+ {3420, {wxStyledTextCtrl, setTextRaw, 1}},
+ {3421, {wxStyledTextCtrl, getTextRaw, 0}},
+ {3422, {wxStyledTextCtrl, appendTextRaw, 1}},
+ {3423, {wxArtProvider, getBitmap, 2}},
+ {3424, {wxArtProvider, getIcon, 2}},
+ {3425, {wxTreeEvent, getKeyCode, 0}},
+ {3426, {wxTreeEvent, getItem, 0}},
+ {3427, {wxTreeEvent, getKeyEvent, 0}},
+ {3428, {wxTreeEvent, getLabel, 0}},
+ {3429, {wxTreeEvent, getOldItem, 0}},
+ {3430, {wxTreeEvent, getPoint, 0}},
+ {3431, {wxTreeEvent, isEditCancelled, 0}},
+ {3432, {wxTreeEvent, setToolTip, 1}},
+ {3433, {wxNotebookEvent, getOldSelection, 0}},
+ {3434, {wxNotebookEvent, getSelection, 0}},
+ {3435, {wxNotebookEvent, setOldSelection, 1}},
+ {3436, {wxNotebookEvent, setSelection, 1}},
+ {3437, {wxFileDataObject, new, 0}},
+ {3438, {wxFileDataObject, addFile, 1}},
+ {3439, {wxFileDataObject, getFilenames, 0}},
+ {3440, {wxFileDataObject, 'Destroy', undefined}},
+ {3441, {wxTextDataObject, new, 1}},
+ {3442, {wxTextDataObject, getTextLength, 0}},
+ {3443, {wxTextDataObject, getText, 0}},
+ {3444, {wxTextDataObject, setText, 1}},
+ {3445, {wxTextDataObject, 'Destroy', undefined}},
+ {3446, {wxBitmapDataObject, new_1_1, 1}},
+ {3447, {wxBitmapDataObject, new_1_0, 1}},
+ {3448, {wxBitmapDataObject, getBitmap, 0}},
+ {3449, {wxBitmapDataObject, setBitmap, 1}},
+ {3450, {wxBitmapDataObject, 'Destroy', undefined}},
+ {3452, {wxClipboard, new, 0}},
+ {3453, {wxClipboard, destruct, 0}},
+ {3454, {wxClipboard, addData, 1}},
+ {3455, {wxClipboard, clear, 0}},
+ {3456, {wxClipboard, close, 0}},
+ {3457, {wxClipboard, flush, 0}},
+ {3458, {wxClipboard, getData, 1}},
+ {3459, {wxClipboard, isOpened, 0}},
+ {3460, {wxClipboard, open, 0}},
+ {3461, {wxClipboard, setData, 1}},
+ {3463, {wxClipboard, usePrimarySelection, 1}},
+ {3464, {wxClipboard, isSupported, 1}},
+ {3465, {wxClipboard, get, 0}},
+ {3466, {wxSpinEvent, getPosition, 0}},
+ {3467, {wxSpinEvent, setPosition, 1}},
+ {3468, {wxSplitterWindow, new_0, 0}},
+ {3469, {wxSplitterWindow, new_2, 2}},
+ {3470, {wxSplitterWindow, destruct, 0}},
+ {3471, {wxSplitterWindow, create, 2}},
+ {3472, {wxSplitterWindow, getMinimumPaneSize, 0}},
+ {3473, {wxSplitterWindow, getSashGravity, 0}},
+ {3474, {wxSplitterWindow, getSashPosition, 0}},
+ {3475, {wxSplitterWindow, getSplitMode, 0}},
+ {3476, {wxSplitterWindow, getWindow1, 0}},
+ {3477, {wxSplitterWindow, getWindow2, 0}},
+ {3478, {wxSplitterWindow, initialize, 1}},
+ {3479, {wxSplitterWindow, isSplit, 0}},
+ {3480, {wxSplitterWindow, replaceWindow, 2}},
+ {3481, {wxSplitterWindow, setSashGravity, 1}},
+ {3482, {wxSplitterWindow, setSashPosition, 2}},
+ {3483, {wxSplitterWindow, setSashSize, 1}},
+ {3484, {wxSplitterWindow, setMinimumPaneSize, 1}},
+ {3485, {wxSplitterWindow, setSplitMode, 1}},
+ {3486, {wxSplitterWindow, splitHorizontally, 3}},
+ {3487, {wxSplitterWindow, splitVertically, 3}},
+ {3488, {wxSplitterWindow, unsplit, 1}},
+ {3489, {wxSplitterWindow, updateSize, 0}},
+ {3490, {wxSplitterEvent, getSashPosition, 0}},
+ {3491, {wxSplitterEvent, getX, 0}},
+ {3492, {wxSplitterEvent, getY, 0}},
+ {3493, {wxSplitterEvent, getWindowBeingRemoved, 0}},
+ {3494, {wxSplitterEvent, setSashPosition, 1}},
+ {3495, {wxHtmlWindow, new_0, 0}},
+ {3496, {wxHtmlWindow, new_2, 2}},
+ {3497, {wxHtmlWindow, appendToPage, 1}},
+ {3498, {wxHtmlWindow, getOpenedAnchor, 0}},
+ {3499, {wxHtmlWindow, getOpenedPage, 0}},
+ {3500, {wxHtmlWindow, getOpenedPageTitle, 0}},
+ {3501, {wxHtmlWindow, getRelatedFrame, 0}},
+ {3502, {wxHtmlWindow, historyBack, 0}},
+ {3503, {wxHtmlWindow, historyCanBack, 0}},
+ {3504, {wxHtmlWindow, historyCanForward, 0}},
+ {3505, {wxHtmlWindow, historyClear, 0}},
+ {3506, {wxHtmlWindow, historyForward, 0}},
+ {3507, {wxHtmlWindow, loadFile, 1}},
+ {3508, {wxHtmlWindow, loadPage, 1}},
+ {3509, {wxHtmlWindow, selectAll, 0}},
+ {3510, {wxHtmlWindow, selectionToText, 0}},
+ {3511, {wxHtmlWindow, selectLine, 1}},
+ {3512, {wxHtmlWindow, selectWord, 1}},
+ {3513, {wxHtmlWindow, setBorders, 1}},
+ {3514, {wxHtmlWindow, setFonts, 3}},
+ {3515, {wxHtmlWindow, setPage, 1}},
+ {3516, {wxHtmlWindow, setRelatedFrame, 2}},
+ {3517, {wxHtmlWindow, setRelatedStatusBar, 1}},
+ {3518, {wxHtmlWindow, toText, 0}},
+ {3519, {wxHtmlWindow, 'Destroy', undefined}},
+ {3520, {wxHtmlLinkEvent, getLinkInfo, 0}},
+ {3521, {wxSystemSettings, getColour, 1}},
+ {3522, {wxSystemSettings, getFont, 1}},
+ {3523, {wxSystemSettings, getMetric, 2}},
+ {3524, {wxSystemSettings, getScreenType, 0}},
+ {3525, {wxSystemOptions, getOption, 1}},
+ {3526, {wxSystemOptions, getOptionInt, 1}},
+ {3527, {wxSystemOptions, hasOption, 1}},
+ {3528, {wxSystemOptions, isFalse, 1}},
+ {3529, {wxSystemOptions, setOption_2_1, 2}},
+ {3530, {wxSystemOptions, setOption_2_0, 2}},
+ {3531, {wxAuiNotebookEvent, setSelection, 1}},
+ {3532, {wxAuiNotebookEvent, getSelection, 0}},
+ {3533, {wxAuiNotebookEvent, setOldSelection, 1}},
+ {3534, {wxAuiNotebookEvent, getOldSelection, 0}},
+ {3535, {wxAuiNotebookEvent, setDragSource, 1}},
+ {3536, {wxAuiNotebookEvent, getDragSource, 0}},
+ {3537, {wxAuiManagerEvent, setManager, 1}},
+ {3538, {wxAuiManagerEvent, getManager, 0}},
+ {3539, {wxAuiManagerEvent, setPane, 1}},
+ {3540, {wxAuiManagerEvent, getPane, 0}},
+ {3541, {wxAuiManagerEvent, setButton, 1}},
+ {3542, {wxAuiManagerEvent, getButton, 0}},
+ {3543, {wxAuiManagerEvent, setDC, 1}},
+ {3544, {wxAuiManagerEvent, getDC, 0}},
+ {3545, {wxAuiManagerEvent, veto, 1}},
+ {3546, {wxAuiManagerEvent, getVeto, 0}},
+ {3547, {wxAuiManagerEvent, setCanVeto, 1}},
+ {3548, {wxAuiManagerEvent, canVeto, 0}},
+ {3549, {wxLogNull, new, 0}},
+ {3550, {wxLogNull, 'Destroy', undefined}},
+ {3551, {wxTaskBarIcon, new, 0}},
+ {3552, {wxTaskBarIcon, destruct, 0}},
+ {3553, {wxTaskBarIcon, popupMenu, 1}},
+ {3554, {wxTaskBarIcon, removeIcon, 0}},
+ {3555, {wxTaskBarIcon, setIcon, 2}},
+ {3556, {wxLocale, new_0, 0}},
+ {3558, {wxLocale, new_2, 2}},
+ {3559, {wxLocale, destruct, 0}},
+ {3561, {wxLocale, init, 1}},
+ {3562, {wxLocale, addCatalog_1, 1}},
+ {3563, {wxLocale, addCatalog_3, 3}},
+ {3564, {wxLocale, addCatalogLookupPathPrefix, 1}},
+ {3565, {wxLocale, getCanonicalName, 0}},
+ {3566, {wxLocale, getLanguage, 0}},
+ {3567, {wxLocale, getLanguageName, 1}},
+ {3568, {wxLocale, getLocale, 0}},
+ {3569, {wxLocale, getName, 0}},
+ {3570, {wxLocale, getString_2, 2}},
+ {3571, {wxLocale, getString_4, 4}},
+ {3572, {wxLocale, getHeaderValue, 2}},
+ {3573, {wxLocale, getSysName, 0}},
+ {3574, {wxLocale, getSystemEncoding, 0}},
+ {3575, {wxLocale, getSystemEncodingName, 0}},
+ {3576, {wxLocale, getSystemLanguage, 0}},
+ {3577, {wxLocale, isLoaded, 1}},
+ {3578, {wxLocale, isOk, 0}},
+ {3579, {wxActivateEvent, getActive, 0}},
+ {3581, {wxPopupWindow, new_2, 2}},
+ {3582, {wxPopupWindow, new_0, 0}},
+ {3584, {wxPopupWindow, destruct, 0}},
+ {3585, {wxPopupWindow, create, 2}},
+ {3586, {wxPopupWindow, position, 2}},
+ {3587, {wxPopupTransientWindow, new_0, 0}},
+ {3588, {wxPopupTransientWindow, new_2, 2}},
+ {3589, {wxPopupTransientWindow, destruct, 0}},
+ {3590, {wxPopupTransientWindow, popup, 1}},
+ {3591, {wxPopupTransientWindow, dismiss, 0}},
+ {3592, {wxOverlay, new, 0}},
+ {3593, {wxOverlay, destruct, 0}},
+ {3594, {wxOverlay, reset, 0}},
+ {3595, {wxDCOverlay, new_6, 6}},
+ {3596, {wxDCOverlay, new_2, 2}},
+ {3597, {wxDCOverlay, destruct, 0}},
+ {3598, {wxDCOverlay, clear, 0}},
  {-1, {mod, func, -1}}
 ].
 
diff --git a/lib/wx/src/gen/wxe_funcs.hrl b/lib/wx/src/gen/wxe_funcs.hrl
index 35688f3869..f5f839ac67 100644
--- a/lib/wx/src/gen/wxe_funcs.hrl
+++ b/lib/wx/src/gen/wxe_funcs.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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.
@@ -189,3183 +189,3187 @@
 -define(wxWindow_UpdateWindowUI, 281).
 -define(wxWindow_Validate, 282).
 -define(wxWindow_WarpPointer, 283).
--define(wxTopLevelWindow_GetIcon, 284).
--define(wxTopLevelWindow_GetIcons, 285).
--define(wxTopLevelWindow_GetTitle, 286).
--define(wxTopLevelWindow_IsActive, 287).
--define(wxTopLevelWindow_Iconize, 288).
--define(wxTopLevelWindow_IsFullScreen, 289).
--define(wxTopLevelWindow_IsIconized, 290).
--define(wxTopLevelWindow_IsMaximized, 291).
--define(wxTopLevelWindow_Maximize, 292).
--define(wxTopLevelWindow_RequestUserAttention, 293).
--define(wxTopLevelWindow_SetIcon, 294).
--define(wxTopLevelWindow_SetIcons, 295).
--define(wxTopLevelWindow_CenterOnScreen, 296).
--define(wxTopLevelWindow_CentreOnScreen, 297).
--define(wxTopLevelWindow_SetShape, 299).
--define(wxTopLevelWindow_SetTitle, 300).
--define(wxTopLevelWindow_ShowFullScreen, 301).
--define(wxFrame_new_4, 303).
--define(wxFrame_new_0, 304).
--define(wxFrame_destruct, 306).
--define(wxFrame_Create, 307).
--define(wxFrame_CreateStatusBar, 308).
--define(wxFrame_CreateToolBar, 309).
--define(wxFrame_GetClientAreaOrigin, 310).
--define(wxFrame_GetMenuBar, 311).
--define(wxFrame_GetStatusBar, 312).
--define(wxFrame_GetStatusBarPane, 313).
--define(wxFrame_GetToolBar, 314).
--define(wxFrame_ProcessCommand, 315).
--define(wxFrame_SendSizeEvent, 316).
--define(wxFrame_SetMenuBar, 317).
--define(wxFrame_SetStatusBar, 318).
--define(wxFrame_SetStatusBarPane, 319).
--define(wxFrame_SetStatusText, 320).
--define(wxFrame_SetStatusWidths, 321).
--define(wxFrame_SetToolBar, 322).
--define(wxMiniFrame_new_0, 323).
--define(wxMiniFrame_new_4, 324).
--define(wxMiniFrame_Create, 325).
--define(wxMiniFrame_destroy, 326).
--define(wxSplashScreen_new_0, 327).
--define(wxSplashScreen_new_6, 328).
--define(wxSplashScreen_destruct, 329).
--define(wxSplashScreen_GetSplashStyle, 330).
--define(wxSplashScreen_GetTimeout, 331).
--define(wxPanel_new_0, 332).
--define(wxPanel_new_6, 333).
--define(wxPanel_new_2, 334).
--define(wxPanel_destruct, 335).
--define(wxPanel_InitDialog, 336).
--define(wxPanel_SetFocusIgnoringChildren, 337).
--define(wxScrolledWindow_new_0, 338).
--define(wxScrolledWindow_new_2, 339).
--define(wxScrolledWindow_destruct, 340).
--define(wxScrolledWindow_CalcScrolledPosition_4, 341).
--define(wxScrolledWindow_CalcScrolledPosition_1, 342).
--define(wxScrolledWindow_CalcUnscrolledPosition_4, 343).
--define(wxScrolledWindow_CalcUnscrolledPosition_1, 344).
--define(wxScrolledWindow_EnableScrolling, 345).
--define(wxScrolledWindow_GetScrollPixelsPerUnit, 346).
--define(wxScrolledWindow_GetViewStart, 347).
--define(wxScrolledWindow_DoPrepareDC, 348).
--define(wxScrolledWindow_PrepareDC, 349).
--define(wxScrolledWindow_Scroll, 350).
--define(wxScrolledWindow_SetScrollbars, 351).
--define(wxScrolledWindow_SetScrollRate, 352).
--define(wxScrolledWindow_SetTargetWindow, 353).
--define(wxSashWindow_new_0, 354).
--define(wxSashWindow_new_2, 355).
--define(wxSashWindow_destruct, 356).
--define(wxSashWindow_GetSashVisible, 357).
--define(wxSashWindow_GetMaximumSizeX, 358).
--define(wxSashWindow_GetMaximumSizeY, 359).
--define(wxSashWindow_GetMinimumSizeX, 360).
--define(wxSashWindow_GetMinimumSizeY, 361).
--define(wxSashWindow_SetMaximumSizeX, 362).
--define(wxSashWindow_SetMaximumSizeY, 363).
--define(wxSashWindow_SetMinimumSizeX, 364).
--define(wxSashWindow_SetMinimumSizeY, 365).
--define(wxSashWindow_SetSashVisible, 366).
--define(wxSashLayoutWindow_new_0, 367).
--define(wxSashLayoutWindow_new_2, 368).
--define(wxSashLayoutWindow_Create, 369).
--define(wxSashLayoutWindow_GetAlignment, 370).
--define(wxSashLayoutWindow_GetOrientation, 371).
--define(wxSashLayoutWindow_SetAlignment, 372).
--define(wxSashLayoutWindow_SetDefaultSize, 373).
--define(wxSashLayoutWindow_SetOrientation, 374).
--define(wxSashLayoutWindow_destroy, 375).
--define(wxGrid_new_0, 376).
--define(wxGrid_new_3, 377).
--define(wxGrid_new_4, 378).
--define(wxGrid_destruct, 379).
--define(wxGrid_AppendCols, 380).
--define(wxGrid_AppendRows, 381).
--define(wxGrid_AutoSize, 382).
--define(wxGrid_AutoSizeColumn, 383).
--define(wxGrid_AutoSizeColumns, 384).
--define(wxGrid_AutoSizeRow, 385).
--define(wxGrid_AutoSizeRows, 386).
--define(wxGrid_BeginBatch, 387).
--define(wxGrid_BlockToDeviceRect, 388).
--define(wxGrid_CanDragColSize, 389).
--define(wxGrid_CanDragRowSize, 390).
--define(wxGrid_CanDragGridSize, 391).
--define(wxGrid_CanEnableCellControl, 392).
--define(wxGrid_CellToRect_2, 393).
--define(wxGrid_CellToRect_1, 394).
--define(wxGrid_ClearGrid, 395).
--define(wxGrid_ClearSelection, 396).
--define(wxGrid_CreateGrid, 397).
--define(wxGrid_DeleteCols, 398).
--define(wxGrid_DeleteRows, 399).
--define(wxGrid_DisableCellEditControl, 400).
--define(wxGrid_DisableDragColSize, 401).
--define(wxGrid_DisableDragGridSize, 402).
--define(wxGrid_DisableDragRowSize, 403).
--define(wxGrid_EnableCellEditControl, 404).
--define(wxGrid_EnableDragColSize, 405).
--define(wxGrid_EnableDragGridSize, 406).
--define(wxGrid_EnableDragRowSize, 407).
--define(wxGrid_EnableEditing, 408).
--define(wxGrid_EnableGridLines, 409).
--define(wxGrid_EndBatch, 410).
--define(wxGrid_Fit, 411).
--define(wxGrid_ForceRefresh, 412).
--define(wxGrid_GetBatchCount, 413).
--define(wxGrid_GetCellAlignment, 414).
--define(wxGrid_GetCellBackgroundColour, 415).
--define(wxGrid_GetCellEditor, 416).
--define(wxGrid_GetCellFont, 417).
--define(wxGrid_GetCellRenderer, 418).
--define(wxGrid_GetCellTextColour, 419).
--define(wxGrid_GetCellValue_2, 420).
--define(wxGrid_GetCellValue_1, 421).
--define(wxGrid_GetColLabelAlignment, 422).
--define(wxGrid_GetColLabelSize, 423).
--define(wxGrid_GetColLabelValue, 424).
--define(wxGrid_GetColMinimalAcceptableWidth, 425).
--define(wxGrid_GetDefaultCellAlignment, 426).
--define(wxGrid_GetDefaultCellBackgroundColour, 427).
--define(wxGrid_GetDefaultCellFont, 428).
--define(wxGrid_GetDefaultCellTextColour, 429).
--define(wxGrid_GetDefaultColLabelSize, 430).
--define(wxGrid_GetDefaultColSize, 431).
--define(wxGrid_GetDefaultEditor, 432).
--define(wxGrid_GetDefaultEditorForCell_2, 433).
--define(wxGrid_GetDefaultEditorForCell_1, 434).
--define(wxGrid_GetDefaultEditorForType, 435).
--define(wxGrid_GetDefaultRenderer, 436).
--define(wxGrid_GetDefaultRendererForCell, 437).
--define(wxGrid_GetDefaultRendererForType, 438).
--define(wxGrid_GetDefaultRowLabelSize, 439).
--define(wxGrid_GetDefaultRowSize, 440).
--define(wxGrid_GetGridCursorCol, 441).
--define(wxGrid_GetGridCursorRow, 442).
--define(wxGrid_GetGridLineColour, 443).
--define(wxGrid_GridLinesEnabled, 444).
--define(wxGrid_GetLabelBackgroundColour, 445).
--define(wxGrid_GetLabelFont, 446).
--define(wxGrid_GetLabelTextColour, 447).
--define(wxGrid_GetNumberCols, 448).
--define(wxGrid_GetNumberRows, 449).
--define(wxGrid_GetOrCreateCellAttr, 450).
--define(wxGrid_GetRowMinimalAcceptableHeight, 451).
--define(wxGrid_GetRowLabelAlignment, 452).
--define(wxGrid_GetRowLabelSize, 453).
--define(wxGrid_GetRowLabelValue, 454).
--define(wxGrid_GetRowSize, 455).
--define(wxGrid_GetScrollLineX, 456).
--define(wxGrid_GetScrollLineY, 457).
--define(wxGrid_GetSelectedCells, 458).
--define(wxGrid_GetSelectedCols, 459).
--define(wxGrid_GetSelectedRows, 460).
--define(wxGrid_GetSelectionBackground, 461).
--define(wxGrid_GetSelectionBlockTopLeft, 462).
--define(wxGrid_GetSelectionBlockBottomRight, 463).
--define(wxGrid_GetSelectionForeground, 464).
--define(wxGrid_GetViewWidth, 465).
--define(wxGrid_GetGridWindow, 466).
--define(wxGrid_GetGridRowLabelWindow, 467).
--define(wxGrid_GetGridColLabelWindow, 468).
--define(wxGrid_GetGridCornerLabelWindow, 469).
--define(wxGrid_HideCellEditControl, 470).
--define(wxGrid_InsertCols, 471).
--define(wxGrid_InsertRows, 472).
--define(wxGrid_IsCellEditControlEnabled, 473).
--define(wxGrid_IsCurrentCellReadOnly, 474).
--define(wxGrid_IsEditable, 475).
--define(wxGrid_IsInSelection_2, 476).
--define(wxGrid_IsInSelection_1, 477).
--define(wxGrid_IsReadOnly, 478).
--define(wxGrid_IsSelection, 479).
--define(wxGrid_IsVisible_3, 480).
--define(wxGrid_IsVisible_2, 481).
--define(wxGrid_MakeCellVisible_2, 482).
--define(wxGrid_MakeCellVisible_1, 483).
--define(wxGrid_MoveCursorDown, 484).
--define(wxGrid_MoveCursorLeft, 485).
--define(wxGrid_MoveCursorRight, 486).
--define(wxGrid_MoveCursorUp, 487).
--define(wxGrid_MoveCursorDownBlock, 488).
--define(wxGrid_MoveCursorLeftBlock, 489).
--define(wxGrid_MoveCursorRightBlock, 490).
--define(wxGrid_MoveCursorUpBlock, 491).
--define(wxGrid_MovePageDown, 492).
--define(wxGrid_MovePageUp, 493).
--define(wxGrid_RegisterDataType, 494).
--define(wxGrid_SaveEditControlValue, 495).
--define(wxGrid_SelectAll, 496).
--define(wxGrid_SelectBlock_5, 497).
--define(wxGrid_SelectBlock_3, 498).
--define(wxGrid_SelectCol, 499).
--define(wxGrid_SelectRow, 500).
--define(wxGrid_SetCellAlignment_4, 501).
--define(wxGrid_SetCellAlignment_3, 502).
--define(wxGrid_SetCellAlignment_1, 503).
--define(wxGrid_SetCellBackgroundColour_3_0, 504).
--define(wxGrid_SetCellBackgroundColour_1, 505).
--define(wxGrid_SetCellBackgroundColour_3_1, 506).
--define(wxGrid_SetCellEditor, 507).
--define(wxGrid_SetCellFont, 508).
--define(wxGrid_SetCellRenderer, 509).
--define(wxGrid_SetCellTextColour_3_0, 510).
--define(wxGrid_SetCellTextColour_3_1, 511).
--define(wxGrid_SetCellTextColour_1, 512).
--define(wxGrid_SetCellValue_3_0, 513).
--define(wxGrid_SetCellValue_2, 514).
--define(wxGrid_SetCellValue_3_1, 515).
--define(wxGrid_SetColAttr, 516).
--define(wxGrid_SetColFormatBool, 517).
--define(wxGrid_SetColFormatNumber, 518).
--define(wxGrid_SetColFormatFloat, 519).
--define(wxGrid_SetColFormatCustom, 520).
--define(wxGrid_SetColLabelAlignment, 521).
--define(wxGrid_SetColLabelSize, 522).
--define(wxGrid_SetColLabelValue, 523).
--define(wxGrid_SetColMinimalWidth, 524).
--define(wxGrid_SetColMinimalAcceptableWidth, 525).
--define(wxGrid_SetColSize, 526).
--define(wxGrid_SetDefaultCellAlignment, 527).
--define(wxGrid_SetDefaultCellBackgroundColour, 528).
--define(wxGrid_SetDefaultCellFont, 529).
--define(wxGrid_SetDefaultCellTextColour, 530).
--define(wxGrid_SetDefaultEditor, 531).
--define(wxGrid_SetDefaultRenderer, 532).
--define(wxGrid_SetDefaultColSize, 533).
--define(wxGrid_SetDefaultRowSize, 534).
--define(wxGrid_SetGridCursor, 535).
--define(wxGrid_SetGridLineColour, 536).
--define(wxGrid_SetLabelBackgroundColour, 537).
--define(wxGrid_SetLabelFont, 538).
--define(wxGrid_SetLabelTextColour, 539).
--define(wxGrid_SetMargins, 540).
--define(wxGrid_SetReadOnly, 541).
--define(wxGrid_SetRowAttr, 542).
--define(wxGrid_SetRowLabelAlignment, 543).
--define(wxGrid_SetRowLabelSize, 544).
--define(wxGrid_SetRowLabelValue, 545).
--define(wxGrid_SetRowMinimalHeight, 546).
--define(wxGrid_SetRowMinimalAcceptableHeight, 547).
--define(wxGrid_SetRowSize, 548).
--define(wxGrid_SetScrollLineX, 549).
--define(wxGrid_SetScrollLineY, 550).
--define(wxGrid_SetSelectionBackground, 551).
--define(wxGrid_SetSelectionForeground, 552).
--define(wxGrid_SetSelectionMode, 553).
--define(wxGrid_ShowCellEditControl, 554).
--define(wxGrid_XToCol, 555).
--define(wxGrid_XToEdgeOfCol, 556).
--define(wxGrid_YToEdgeOfRow, 557).
--define(wxGrid_YToRow, 558).
--define(wxGridCellRenderer_Draw, 559).
--define(wxGridCellRenderer_GetBestSize, 560).
--define(wxGridCellEditor_Create, 561).
--define(wxGridCellEditor_IsCreated, 562).
--define(wxGridCellEditor_SetSize, 563).
--define(wxGridCellEditor_Show, 564).
--define(wxGridCellEditor_PaintBackground, 565).
--define(wxGridCellEditor_BeginEdit, 566).
--define(wxGridCellEditor_EndEdit, 567).
--define(wxGridCellEditor_Reset, 568).
--define(wxGridCellEditor_StartingKey, 569).
--define(wxGridCellEditor_StartingClick, 570).
--define(wxGridCellEditor_HandleReturn, 571).
--define(wxGridCellBoolRenderer_new, 572).
--define(wxGridCellBoolRenderer_destroy, 573).
--define(wxGridCellBoolEditor_new, 574).
--define(wxGridCellBoolEditor_IsTrueValue, 575).
--define(wxGridCellBoolEditor_UseStringValues, 576).
--define(wxGridCellBoolEditor_destroy, 577).
--define(wxGridCellFloatRenderer_new, 578).
--define(wxGridCellFloatRenderer_GetPrecision, 579).
--define(wxGridCellFloatRenderer_GetWidth, 580).
--define(wxGridCellFloatRenderer_SetParameters, 581).
--define(wxGridCellFloatRenderer_SetPrecision, 582).
--define(wxGridCellFloatRenderer_SetWidth, 583).
--define(wxGridCellFloatRenderer_destroy, 584).
--define(wxGridCellFloatEditor_new, 585).
--define(wxGridCellFloatEditor_SetParameters, 586).
--define(wxGridCellFloatEditor_destroy, 587).
--define(wxGridCellStringRenderer_new, 588).
--define(wxGridCellStringRenderer_destroy, 589).
--define(wxGridCellTextEditor_new, 590).
--define(wxGridCellTextEditor_SetParameters, 591).
--define(wxGridCellTextEditor_destroy, 592).
--define(wxGridCellChoiceEditor_new, 594).
--define(wxGridCellChoiceEditor_SetParameters, 595).
--define(wxGridCellChoiceEditor_destroy, 596).
--define(wxGridCellNumberRenderer_new, 597).
--define(wxGridCellNumberRenderer_destroy, 598).
--define(wxGridCellNumberEditor_new, 599).
--define(wxGridCellNumberEditor_GetValue, 600).
--define(wxGridCellNumberEditor_SetParameters, 601).
--define(wxGridCellNumberEditor_destroy, 602).
--define(wxGridCellAttr_SetTextColour, 603).
--define(wxGridCellAttr_SetBackgroundColour, 604).
--define(wxGridCellAttr_SetFont, 605).
--define(wxGridCellAttr_SetAlignment, 606).
--define(wxGridCellAttr_SetReadOnly, 607).
--define(wxGridCellAttr_SetRenderer, 608).
--define(wxGridCellAttr_SetEditor, 609).
--define(wxGridCellAttr_HasTextColour, 610).
--define(wxGridCellAttr_HasBackgroundColour, 611).
--define(wxGridCellAttr_HasFont, 612).
--define(wxGridCellAttr_HasAlignment, 613).
--define(wxGridCellAttr_HasRenderer, 614).
--define(wxGridCellAttr_HasEditor, 615).
--define(wxGridCellAttr_GetTextColour, 616).
--define(wxGridCellAttr_GetBackgroundColour, 617).
--define(wxGridCellAttr_GetFont, 618).
--define(wxGridCellAttr_GetAlignment, 619).
--define(wxGridCellAttr_GetRenderer, 620).
--define(wxGridCellAttr_GetEditor, 621).
--define(wxGridCellAttr_IsReadOnly, 622).
--define(wxGridCellAttr_SetDefAttr, 623).
--define(wxDC_Blit, 624).
--define(wxDC_CalcBoundingBox, 625).
--define(wxDC_Clear, 626).
--define(wxDC_ComputeScaleAndOrigin, 627).
--define(wxDC_CrossHair, 628).
--define(wxDC_DestroyClippingRegion, 629).
--define(wxDC_DeviceToLogicalX, 630).
--define(wxDC_DeviceToLogicalXRel, 631).
--define(wxDC_DeviceToLogicalY, 632).
--define(wxDC_DeviceToLogicalYRel, 633).
--define(wxDC_DrawArc, 634).
--define(wxDC_DrawBitmap, 635).
--define(wxDC_DrawCheckMark, 636).
--define(wxDC_DrawCircle, 637).
--define(wxDC_DrawEllipse_2, 639).
--define(wxDC_DrawEllipse_1, 640).
--define(wxDC_DrawEllipticArc, 641).
--define(wxDC_DrawIcon, 642).
--define(wxDC_DrawLabel, 643).
--define(wxDC_DrawLine, 644).
--define(wxDC_DrawLines, 645).
--define(wxDC_DrawPolygon, 647).
--define(wxDC_DrawPoint, 649).
--define(wxDC_DrawRectangle_2, 651).
--define(wxDC_DrawRectangle_1, 652).
--define(wxDC_DrawRotatedText, 653).
--define(wxDC_DrawRoundedRectangle_3, 655).
--define(wxDC_DrawRoundedRectangle_2, 656).
--define(wxDC_DrawText, 657).
--define(wxDC_EndDoc, 658).
--define(wxDC_EndPage, 659).
--define(wxDC_FloodFill, 660).
--define(wxDC_GetBackground, 661).
--define(wxDC_GetBackgroundMode, 662).
--define(wxDC_GetBrush, 663).
--define(wxDC_GetCharHeight, 664).
--define(wxDC_GetCharWidth, 665).
--define(wxDC_GetClippingBox, 666).
--define(wxDC_GetFont, 668).
--define(wxDC_GetLayoutDirection, 669).
--define(wxDC_GetLogicalFunction, 670).
--define(wxDC_GetMapMode, 671).
--define(wxDC_GetMultiLineTextExtent_4, 672).
--define(wxDC_GetMultiLineTextExtent_1, 673).
--define(wxDC_GetPartialTextExtents, 674).
--define(wxDC_GetPen, 675).
--define(wxDC_GetPixel, 676).
--define(wxDC_GetPPI, 677).
--define(wxDC_GetSize, 679).
--define(wxDC_GetSizeMM, 681).
--define(wxDC_GetTextBackground, 682).
--define(wxDC_GetTextExtent_4, 683).
--define(wxDC_GetTextExtent_1, 684).
--define(wxDC_GetTextForeground, 686).
--define(wxDC_GetUserScale, 687).
--define(wxDC_GradientFillConcentric_3, 688).
--define(wxDC_GradientFillConcentric_4, 689).
--define(wxDC_GradientFillLinear, 690).
--define(wxDC_LogicalToDeviceX, 691).
--define(wxDC_LogicalToDeviceXRel, 692).
--define(wxDC_LogicalToDeviceY, 693).
--define(wxDC_LogicalToDeviceYRel, 694).
--define(wxDC_MaxX, 695).
--define(wxDC_MaxY, 696).
--define(wxDC_MinX, 697).
--define(wxDC_MinY, 698).
--define(wxDC_IsOk, 699).
--define(wxDC_ResetBoundingBox, 700).
--define(wxDC_SetAxisOrientation, 701).
--define(wxDC_SetBackground, 702).
--define(wxDC_SetBackgroundMode, 703).
--define(wxDC_SetBrush, 704).
--define(wxDC_SetClippingRegion_2, 706).
--define(wxDC_SetClippingRegion_1_1, 707).
--define(wxDC_SetClippingRegion_1_0, 708).
--define(wxDC_SetDeviceOrigin, 709).
--define(wxDC_SetFont, 710).
--define(wxDC_SetLayoutDirection, 711).
--define(wxDC_SetLogicalFunction, 712).
--define(wxDC_SetMapMode, 713).
--define(wxDC_SetPalette, 714).
--define(wxDC_SetPen, 715).
--define(wxDC_SetTextBackground, 716).
--define(wxDC_SetTextForeground, 717).
--define(wxDC_SetUserScale, 718).
--define(wxDC_StartDoc, 719).
--define(wxDC_StartPage, 720).
--define(wxMirrorDC_new, 721).
--define(wxMirrorDC_destroy, 722).
--define(wxScreenDC_new, 723).
--define(wxScreenDC_destruct, 724).
--define(wxPostScriptDC_new_0, 725).
--define(wxPostScriptDC_new_1, 726).
--define(wxPostScriptDC_destruct, 727).
--define(wxPostScriptDC_SetResolution, 728).
--define(wxPostScriptDC_GetResolution, 729).
--define(wxWindowDC_new_0, 730).
--define(wxWindowDC_new_1, 731).
--define(wxWindowDC_destruct, 732).
--define(wxClientDC_new_0, 733).
--define(wxClientDC_new_1, 734).
--define(wxClientDC_destroy, 735).
--define(wxPaintDC_new_0, 736).
--define(wxPaintDC_new_1, 737).
--define(wxPaintDC_destroy, 738).
--define(wxMemoryDC_new_1_0, 740).
--define(wxMemoryDC_new_1_1, 741).
--define(wxMemoryDC_new_0, 742).
--define(wxMemoryDC_destruct, 744).
--define(wxMemoryDC_SelectObject, 745).
--define(wxMemoryDC_SelectObjectAsSource, 746).
--define(wxBufferedDC_new_0, 747).
--define(wxBufferedDC_new_2, 748).
--define(wxBufferedDC_new_3, 749).
--define(wxBufferedDC_destruct, 750).
--define(wxBufferedDC_Init_2, 751).
--define(wxBufferedDC_Init_3, 752).
--define(wxBufferedPaintDC_new_3, 753).
--define(wxBufferedPaintDC_new_2, 754).
--define(wxBufferedPaintDC_destruct, 755).
--define(wxGraphicsObject_destruct, 756).
--define(wxGraphicsObject_GetRenderer, 757).
--define(wxGraphicsObject_IsNull, 758).
--define(wxGraphicsContext_destruct, 759).
--define(wxGraphicsContext_Create_1_1, 760).
--define(wxGraphicsContext_Create_1_0, 761).
--define(wxGraphicsContext_Create_0, 762).
--define(wxGraphicsContext_CreatePen, 763).
--define(wxGraphicsContext_CreateBrush, 764).
--define(wxGraphicsContext_CreateRadialGradientBrush, 765).
--define(wxGraphicsContext_CreateLinearGradientBrush, 766).
--define(wxGraphicsContext_CreateFont, 767).
--define(wxGraphicsContext_CreateMatrix, 768).
--define(wxGraphicsContext_CreatePath, 769).
--define(wxGraphicsContext_Clip_1, 770).
--define(wxGraphicsContext_Clip_4, 771).
--define(wxGraphicsContext_ResetClip, 772).
--define(wxGraphicsContext_DrawBitmap, 773).
--define(wxGraphicsContext_DrawEllipse, 774).
--define(wxGraphicsContext_DrawIcon, 775).
--define(wxGraphicsContext_DrawLines, 776).
--define(wxGraphicsContext_DrawPath, 777).
--define(wxGraphicsContext_DrawRectangle, 778).
--define(wxGraphicsContext_DrawRoundedRectangle, 779).
--define(wxGraphicsContext_DrawText_3, 780).
--define(wxGraphicsContext_DrawText_4_0, 781).
--define(wxGraphicsContext_DrawText_4_1, 782).
--define(wxGraphicsContext_DrawText_5, 783).
--define(wxGraphicsContext_FillPath, 784).
--define(wxGraphicsContext_StrokePath, 785).
--define(wxGraphicsContext_GetPartialTextExtents, 786).
--define(wxGraphicsContext_GetTextExtent, 787).
--define(wxGraphicsContext_Rotate, 788).
--define(wxGraphicsContext_Scale, 789).
--define(wxGraphicsContext_Translate, 790).
--define(wxGraphicsContext_GetTransform, 791).
--define(wxGraphicsContext_SetTransform, 792).
--define(wxGraphicsContext_ConcatTransform, 793).
--define(wxGraphicsContext_SetBrush_1_1, 794).
--define(wxGraphicsContext_SetBrush_1_0, 795).
--define(wxGraphicsContext_SetFont_1, 796).
--define(wxGraphicsContext_SetFont_2, 797).
--define(wxGraphicsContext_SetPen_1_0, 798).
--define(wxGraphicsContext_SetPen_1_1, 799).
--define(wxGraphicsContext_StrokeLine, 800).
--define(wxGraphicsContext_StrokeLines, 801).
--define(wxGraphicsMatrix_Concat, 803).
--define(wxGraphicsMatrix_Get, 805).
--define(wxGraphicsMatrix_Invert, 806).
--define(wxGraphicsMatrix_IsEqual, 807).
--define(wxGraphicsMatrix_IsIdentity, 809).
--define(wxGraphicsMatrix_Rotate, 810).
--define(wxGraphicsMatrix_Scale, 811).
--define(wxGraphicsMatrix_Translate, 812).
--define(wxGraphicsMatrix_Set, 813).
--define(wxGraphicsMatrix_TransformPoint, 814).
--define(wxGraphicsMatrix_TransformDistance, 815).
--define(wxGraphicsPath_MoveToPoint_2, 816).
--define(wxGraphicsPath_MoveToPoint_1, 817).
--define(wxGraphicsPath_AddArc_6, 818).
--define(wxGraphicsPath_AddArc_5, 819).
--define(wxGraphicsPath_AddArcToPoint, 820).
--define(wxGraphicsPath_AddCircle, 821).
--define(wxGraphicsPath_AddCurveToPoint_6, 822).
--define(wxGraphicsPath_AddCurveToPoint_3, 823).
--define(wxGraphicsPath_AddEllipse, 824).
--define(wxGraphicsPath_AddLineToPoint_2, 825).
--define(wxGraphicsPath_AddLineToPoint_1, 826).
--define(wxGraphicsPath_AddPath, 827).
--define(wxGraphicsPath_AddQuadCurveToPoint, 828).
--define(wxGraphicsPath_AddRectangle, 829).
--define(wxGraphicsPath_AddRoundedRectangle, 830).
--define(wxGraphicsPath_CloseSubpath, 831).
--define(wxGraphicsPath_Contains_3, 832).
--define(wxGraphicsPath_Contains_2, 833).
--define(wxGraphicsPath_GetBox, 835).
--define(wxGraphicsPath_GetCurrentPoint, 837).
--define(wxGraphicsPath_Transform, 838).
--define(wxGraphicsRenderer_GetDefaultRenderer, 839).
--define(wxGraphicsRenderer_CreateContext_1_1, 840).
--define(wxGraphicsRenderer_CreateContext_1_0, 841).
--define(wxGraphicsRenderer_CreatePen, 842).
--define(wxGraphicsRenderer_CreateBrush, 843).
--define(wxGraphicsRenderer_CreateLinearGradientBrush, 844).
--define(wxGraphicsRenderer_CreateRadialGradientBrush, 845).
--define(wxGraphicsRenderer_CreateFont, 846).
--define(wxGraphicsRenderer_CreateMatrix, 847).
--define(wxGraphicsRenderer_CreatePath, 848).
--define(wxMenuBar_new_1, 850).
--define(wxMenuBar_new_0, 852).
--define(wxMenuBar_destruct, 854).
--define(wxMenuBar_Append, 855).
--define(wxMenuBar_Check, 856).
--define(wxMenuBar_Enable_2, 857).
--define(wxMenuBar_Enable_1, 858).
--define(wxMenuBar_EnableTop, 859).
--define(wxMenuBar_FindMenu, 860).
--define(wxMenuBar_FindMenuItem, 861).
--define(wxMenuBar_FindItem, 862).
--define(wxMenuBar_GetHelpString, 863).
--define(wxMenuBar_GetLabel_1, 864).
--define(wxMenuBar_GetLabel_0, 865).
--define(wxMenuBar_GetLabelTop, 866).
--define(wxMenuBar_GetMenu, 867).
--define(wxMenuBar_GetMenuCount, 868).
--define(wxMenuBar_Insert, 869).
--define(wxMenuBar_IsChecked, 870).
--define(wxMenuBar_IsEnabled_1, 871).
--define(wxMenuBar_IsEnabled_0, 872).
--define(wxMenuBar_Remove, 873).
--define(wxMenuBar_Replace, 874).
--define(wxMenuBar_SetHelpString, 875).
--define(wxMenuBar_SetLabel_2, 876).
--define(wxMenuBar_SetLabel_1, 877).
--define(wxMenuBar_SetLabelTop, 878).
--define(wxControl_GetLabel, 879).
--define(wxControl_SetLabel, 880).
--define(wxControlWithItems_Append_1, 881).
--define(wxControlWithItems_Append_2, 882).
--define(wxControlWithItems_appendStrings_1, 883).
--define(wxControlWithItems_Clear, 884).
--define(wxControlWithItems_Delete, 885).
--define(wxControlWithItems_FindString, 886).
--define(wxControlWithItems_getClientData, 887).
--define(wxControlWithItems_setClientData, 888).
--define(wxControlWithItems_GetCount, 889).
--define(wxControlWithItems_GetSelection, 890).
--define(wxControlWithItems_GetString, 891).
--define(wxControlWithItems_GetStringSelection, 892).
--define(wxControlWithItems_Insert_2, 893).
--define(wxControlWithItems_Insert_3, 894).
--define(wxControlWithItems_IsEmpty, 895).
--define(wxControlWithItems_Select, 896).
--define(wxControlWithItems_SetSelection, 897).
--define(wxControlWithItems_SetString, 898).
--define(wxControlWithItems_SetStringSelection, 899).
--define(wxMenu_new_2, 902).
--define(wxMenu_new_1, 903).
--define(wxMenu_destruct, 905).
--define(wxMenu_Append_3, 906).
--define(wxMenu_Append_1, 907).
--define(wxMenu_Append_4_0, 908).
--define(wxMenu_Append_4_1, 909).
--define(wxMenu_AppendCheckItem, 910).
--define(wxMenu_AppendRadioItem, 911).
--define(wxMenu_AppendSeparator, 912).
--define(wxMenu_Break, 913).
--define(wxMenu_Check, 914).
--define(wxMenu_Delete_1_0, 915).
--define(wxMenu_Delete_1_1, 916).
--define(wxMenu_Destroy_1_0, 917).
--define(wxMenu_Destroy_1_1, 918).
--define(wxMenu_Enable, 919).
--define(wxMenu_FindItem_1, 920).
--define(wxMenu_FindItem_2, 921).
--define(wxMenu_FindItemByPosition, 922).
--define(wxMenu_GetHelpString, 923).
--define(wxMenu_GetLabel, 924).
--define(wxMenu_GetMenuItemCount, 925).
--define(wxMenu_GetMenuItems, 926).
--define(wxMenu_GetTitle, 928).
--define(wxMenu_Insert_2, 929).
--define(wxMenu_Insert_3, 930).
--define(wxMenu_Insert_5_1, 931).
--define(wxMenu_Insert_5_0, 932).
--define(wxMenu_InsertCheckItem, 933).
--define(wxMenu_InsertRadioItem, 934).
--define(wxMenu_InsertSeparator, 935).
--define(wxMenu_IsChecked, 936).
--define(wxMenu_IsEnabled, 937).
--define(wxMenu_Prepend_1, 938).
--define(wxMenu_Prepend_2, 939).
--define(wxMenu_Prepend_4_1, 940).
--define(wxMenu_Prepend_4_0, 941).
--define(wxMenu_PrependCheckItem, 942).
--define(wxMenu_PrependRadioItem, 943).
--define(wxMenu_PrependSeparator, 944).
--define(wxMenu_Remove_1_0, 945).
--define(wxMenu_Remove_1_1, 946).
--define(wxMenu_SetHelpString, 947).
--define(wxMenu_SetLabel, 948).
--define(wxMenu_SetTitle, 949).
--define(wxMenuItem_new, 950).
--define(wxMenuItem_destruct, 952).
--define(wxMenuItem_Check, 953).
--define(wxMenuItem_Enable, 954).
--define(wxMenuItem_GetBitmap, 955).
--define(wxMenuItem_GetHelp, 956).
--define(wxMenuItem_GetId, 957).
--define(wxMenuItem_GetKind, 958).
--define(wxMenuItem_GetLabel, 959).
--define(wxMenuItem_GetLabelFromText, 960).
--define(wxMenuItem_GetMenu, 961).
--define(wxMenuItem_GetText, 962).
--define(wxMenuItem_GetSubMenu, 963).
--define(wxMenuItem_IsCheckable, 964).
--define(wxMenuItem_IsChecked, 965).
--define(wxMenuItem_IsEnabled, 966).
--define(wxMenuItem_IsSeparator, 967).
--define(wxMenuItem_IsSubMenu, 968).
--define(wxMenuItem_SetBitmap, 969).
--define(wxMenuItem_SetHelp, 970).
--define(wxMenuItem_SetMenu, 971).
--define(wxMenuItem_SetSubMenu, 972).
--define(wxMenuItem_SetText, 973).
--define(wxToolBar_AddControl, 974).
--define(wxToolBar_AddSeparator, 975).
--define(wxToolBar_AddTool_5, 976).
--define(wxToolBar_AddTool_4_0, 977).
--define(wxToolBar_AddTool_1, 978).
--define(wxToolBar_AddTool_4_1, 979).
--define(wxToolBar_AddTool_3, 980).
--define(wxToolBar_AddTool_6, 981).
--define(wxToolBar_AddCheckTool, 982).
--define(wxToolBar_AddRadioTool, 983).
--define(wxToolBar_AddStretchableSpace, 984).
--define(wxToolBar_InsertStretchableSpace, 985).
--define(wxToolBar_DeleteTool, 986).
--define(wxToolBar_DeleteToolByPos, 987).
--define(wxToolBar_EnableTool, 988).
--define(wxToolBar_FindById, 989).
--define(wxToolBar_FindControl, 990).
--define(wxToolBar_FindToolForPosition, 991).
--define(wxToolBar_GetToolSize, 992).
--define(wxToolBar_GetToolBitmapSize, 993).
--define(wxToolBar_GetMargins, 994).
--define(wxToolBar_GetToolEnabled, 995).
--define(wxToolBar_GetToolLongHelp, 996).
--define(wxToolBar_GetToolPacking, 997).
--define(wxToolBar_GetToolPos, 998).
--define(wxToolBar_GetToolSeparation, 999).
--define(wxToolBar_GetToolShortHelp, 1000).
--define(wxToolBar_GetToolState, 1001).
--define(wxToolBar_InsertControl, 1002).
--define(wxToolBar_InsertSeparator, 1003).
--define(wxToolBar_InsertTool_5, 1004).
--define(wxToolBar_InsertTool_2, 1005).
--define(wxToolBar_InsertTool_4, 1006).
--define(wxToolBar_Realize, 1007).
--define(wxToolBar_RemoveTool, 1008).
--define(wxToolBar_SetMargins, 1009).
--define(wxToolBar_SetToolBitmapSize, 1010).
--define(wxToolBar_SetToolLongHelp, 1011).
--define(wxToolBar_SetToolPacking, 1012).
--define(wxToolBar_SetToolShortHelp, 1013).
--define(wxToolBar_SetToolSeparation, 1014).
--define(wxToolBar_ToggleTool, 1015).
--define(wxStatusBar_new_0, 1017).
--define(wxStatusBar_new_2, 1018).
--define(wxStatusBar_destruct, 1020).
--define(wxStatusBar_Create, 1021).
--define(wxStatusBar_GetFieldRect, 1022).
--define(wxStatusBar_GetFieldsCount, 1023).
--define(wxStatusBar_GetStatusText, 1024).
--define(wxStatusBar_PopStatusText, 1025).
--define(wxStatusBar_PushStatusText, 1026).
--define(wxStatusBar_SetFieldsCount, 1027).
--define(wxStatusBar_SetMinHeight, 1028).
--define(wxStatusBar_SetStatusText, 1029).
--define(wxStatusBar_SetStatusWidths, 1030).
--define(wxStatusBar_SetStatusStyles, 1031).
--define(wxBitmap_new_0, 1032).
--define(wxBitmap_new_3, 1033).
--define(wxBitmap_new_4, 1034).
--define(wxBitmap_new_2_0, 1035).
--define(wxBitmap_new_2_1, 1036).
--define(wxBitmap_destruct, 1037).
--define(wxBitmap_ConvertToImage, 1038).
--define(wxBitmap_CopyFromIcon, 1039).
--define(wxBitmap_Create, 1040).
--define(wxBitmap_GetDepth, 1041).
--define(wxBitmap_GetHeight, 1042).
--define(wxBitmap_GetPalette, 1043).
--define(wxBitmap_GetMask, 1044).
--define(wxBitmap_GetWidth, 1045).
--define(wxBitmap_GetSubBitmap, 1046).
--define(wxBitmap_LoadFile, 1047).
--define(wxBitmap_Ok, 1048).
--define(wxBitmap_SaveFile, 1049).
--define(wxBitmap_SetDepth, 1050).
--define(wxBitmap_SetHeight, 1051).
--define(wxBitmap_SetMask, 1052).
--define(wxBitmap_SetPalette, 1053).
--define(wxBitmap_SetWidth, 1054).
--define(wxIcon_new_0, 1055).
--define(wxIcon_new_2, 1056).
--define(wxIcon_new_1, 1057).
--define(wxIcon_CopyFromBitmap, 1058).
--define(wxIcon_destroy, 1059).
--define(wxIconBundle_new_0, 1060).
--define(wxIconBundle_new_2, 1061).
--define(wxIconBundle_new_1_0, 1062).
--define(wxIconBundle_new_1_1, 1063).
--define(wxIconBundle_destruct, 1064).
--define(wxIconBundle_AddIcon_2, 1065).
--define(wxIconBundle_AddIcon_1, 1066).
--define(wxIconBundle_GetIcon_1_1, 1067).
--define(wxIconBundle_GetIcon_1_0, 1068).
--define(wxCursor_new_0, 1069).
--define(wxCursor_new_1_0, 1070).
--define(wxCursor_new_1_1, 1071).
--define(wxCursor_new_4, 1072).
--define(wxCursor_destruct, 1073).
--define(wxCursor_Ok, 1074).
--define(wxMask_new_0, 1075).
--define(wxMask_new_2_1, 1076).
--define(wxMask_new_2_0, 1077).
--define(wxMask_new_1, 1078).
--define(wxMask_destruct, 1079).
--define(wxMask_Create_2_1, 1080).
--define(wxMask_Create_2_0, 1081).
--define(wxMask_Create_1, 1082).
--define(wxImage_new_0, 1083).
--define(wxImage_new_3_0, 1084).
--define(wxImage_new_4, 1085).
--define(wxImage_new_5, 1086).
--define(wxImage_new_2, 1087).
--define(wxImage_new_3_1, 1088).
--define(wxImage_Blur, 1089).
--define(wxImage_BlurHorizontal, 1090).
--define(wxImage_BlurVertical, 1091).
--define(wxImage_ConvertAlphaToMask, 1092).
--define(wxImage_ConvertToGreyscale, 1093).
--define(wxImage_ConvertToMono, 1094).
--define(wxImage_Copy, 1095).
--define(wxImage_Create_3, 1096).
--define(wxImage_Create_4, 1097).
--define(wxImage_Create_5, 1098).
--define(wxImage_Destroy, 1099).
--define(wxImage_FindFirstUnusedColour, 1100).
--define(wxImage_GetImageExtWildcard, 1101).
--define(wxImage_GetAlpha_2, 1102).
--define(wxImage_GetAlpha_0, 1103).
--define(wxImage_GetBlue, 1104).
--define(wxImage_GetData, 1105).
--define(wxImage_GetGreen, 1106).
--define(wxImage_GetImageCount, 1107).
--define(wxImage_GetHeight, 1108).
--define(wxImage_GetMaskBlue, 1109).
--define(wxImage_GetMaskGreen, 1110).
--define(wxImage_GetMaskRed, 1111).
--define(wxImage_GetOrFindMaskColour, 1112).
--define(wxImage_GetPalette, 1113).
--define(wxImage_GetRed, 1114).
--define(wxImage_GetSubImage, 1115).
--define(wxImage_GetWidth, 1116).
--define(wxImage_HasAlpha, 1117).
--define(wxImage_HasMask, 1118).
--define(wxImage_GetOption, 1119).
--define(wxImage_GetOptionInt, 1120).
--define(wxImage_HasOption, 1121).
--define(wxImage_InitAlpha, 1122).
--define(wxImage_InitStandardHandlers, 1123).
--define(wxImage_IsTransparent, 1124).
--define(wxImage_LoadFile_2, 1125).
--define(wxImage_LoadFile_3, 1126).
--define(wxImage_Ok, 1127).
--define(wxImage_RemoveHandler, 1128).
--define(wxImage_Mirror, 1129).
--define(wxImage_Replace, 1130).
--define(wxImage_Rescale, 1131).
--define(wxImage_Resize, 1132).
--define(wxImage_Rotate, 1133).
--define(wxImage_RotateHue, 1134).
--define(wxImage_Rotate90, 1135).
--define(wxImage_SaveFile_1, 1136).
--define(wxImage_SaveFile_2_0, 1137).
--define(wxImage_SaveFile_2_1, 1138).
--define(wxImage_Scale, 1139).
--define(wxImage_Size, 1140).
--define(wxImage_SetAlpha_3, 1141).
--define(wxImage_SetAlpha_2, 1142).
--define(wxImage_SetData_2, 1143).
--define(wxImage_SetData_4, 1144).
--define(wxImage_SetMask, 1145).
--define(wxImage_SetMaskColour, 1146).
--define(wxImage_SetMaskFromImage, 1147).
--define(wxImage_SetOption_2_1, 1148).
--define(wxImage_SetOption_2_0, 1149).
--define(wxImage_SetPalette, 1150).
--define(wxImage_SetRGB_5, 1151).
--define(wxImage_SetRGB_4, 1152).
--define(wxImage_destroy, 1153).
--define(wxBrush_new_0, 1154).
--define(wxBrush_new_2, 1155).
--define(wxBrush_new_1, 1156).
--define(wxBrush_destruct, 1158).
--define(wxBrush_GetColour, 1159).
--define(wxBrush_GetStipple, 1160).
--define(wxBrush_GetStyle, 1161).
--define(wxBrush_IsHatch, 1162).
--define(wxBrush_IsOk, 1163).
--define(wxBrush_SetColour_1, 1164).
--define(wxBrush_SetColour_3, 1165).
--define(wxBrush_SetStipple, 1166).
--define(wxBrush_SetStyle, 1167).
--define(wxPen_new_0, 1168).
--define(wxPen_new_2, 1169).
--define(wxPen_destruct, 1170).
--define(wxPen_GetCap, 1171).
--define(wxPen_GetColour, 1172).
--define(wxPen_GetJoin, 1173).
--define(wxPen_GetStyle, 1174).
--define(wxPen_GetWidth, 1175).
--define(wxPen_IsOk, 1176).
--define(wxPen_SetCap, 1177).
--define(wxPen_SetColour_1, 1178).
--define(wxPen_SetColour_3, 1179).
--define(wxPen_SetJoin, 1180).
--define(wxPen_SetStyle, 1181).
--define(wxPen_SetWidth, 1182).
--define(wxRegion_new_0, 1183).
--define(wxRegion_new_4, 1184).
--define(wxRegion_new_2, 1185).
--define(wxRegion_new_1_1, 1186).
--define(wxRegion_new_1_0, 1188).
--define(wxRegion_destruct, 1190).
--define(wxRegion_Clear, 1191).
--define(wxRegion_Contains_2, 1192).
--define(wxRegion_Contains_1_0, 1193).
--define(wxRegion_Contains_4, 1194).
--define(wxRegion_Contains_1_1, 1195).
--define(wxRegion_ConvertToBitmap, 1196).
--define(wxRegion_GetBox, 1197).
--define(wxRegion_Intersect_4, 1198).
--define(wxRegion_Intersect_1_1, 1199).
--define(wxRegion_Intersect_1_0, 1200).
--define(wxRegion_IsEmpty, 1201).
--define(wxRegion_Subtract_4, 1202).
--define(wxRegion_Subtract_1_1, 1203).
--define(wxRegion_Subtract_1_0, 1204).
--define(wxRegion_Offset_2, 1205).
--define(wxRegion_Offset_1, 1206).
--define(wxRegion_Union_4, 1207).
--define(wxRegion_Union_1_2, 1208).
--define(wxRegion_Union_1_1, 1209).
--define(wxRegion_Union_1_0, 1210).
--define(wxRegion_Union_3, 1211).
--define(wxRegion_Xor_4, 1212).
--define(wxRegion_Xor_1_1, 1213).
--define(wxRegion_Xor_1_0, 1214).
--define(wxAcceleratorTable_new_0, 1215).
--define(wxAcceleratorTable_new_2, 1216).
--define(wxAcceleratorTable_destruct, 1217).
--define(wxAcceleratorTable_Ok, 1218).
--define(wxAcceleratorEntry_new_1_0, 1219).
--define(wxAcceleratorEntry_new_1_1, 1220).
--define(wxAcceleratorEntry_GetCommand, 1221).
--define(wxAcceleratorEntry_GetFlags, 1222).
--define(wxAcceleratorEntry_GetKeyCode, 1223).
--define(wxAcceleratorEntry_Set, 1224).
--define(wxAcceleratorEntry_destroy, 1225).
--define(wxCaret_new_3, 1230).
--define(wxCaret_new_2, 1231).
--define(wxCaret_destruct, 1233).
--define(wxCaret_Create_3, 1234).
--define(wxCaret_Create_2, 1235).
--define(wxCaret_GetBlinkTime, 1236).
--define(wxCaret_GetPosition, 1238).
--define(wxCaret_GetSize, 1240).
--define(wxCaret_GetWindow, 1241).
--define(wxCaret_Hide, 1242).
--define(wxCaret_IsOk, 1243).
--define(wxCaret_IsVisible, 1244).
--define(wxCaret_Move_2, 1245).
--define(wxCaret_Move_1, 1246).
--define(wxCaret_SetBlinkTime, 1247).
--define(wxCaret_SetSize_2, 1248).
--define(wxCaret_SetSize_1, 1249).
--define(wxCaret_Show, 1250).
--define(wxSizer_Add_2_1, 1251).
--define(wxSizer_Add_2_0, 1252).
--define(wxSizer_Add_3, 1253).
--define(wxSizer_Add_2_3, 1254).
--define(wxSizer_Add_2_2, 1255).
--define(wxSizer_AddSpacer, 1256).
--define(wxSizer_AddStretchSpacer, 1257).
--define(wxSizer_CalcMin, 1258).
--define(wxSizer_Clear, 1259).
--define(wxSizer_Detach_1_2, 1260).
--define(wxSizer_Detach_1_1, 1261).
--define(wxSizer_Detach_1_0, 1262).
--define(wxSizer_Fit, 1263).
--define(wxSizer_FitInside, 1264).
--define(wxSizer_GetChildren, 1265).
--define(wxSizer_GetItem_2_1, 1266).
--define(wxSizer_GetItem_2_0, 1267).
--define(wxSizer_GetItem_1, 1268).
--define(wxSizer_GetSize, 1269).
--define(wxSizer_GetPosition, 1270).
--define(wxSizer_GetMinSize, 1271).
--define(wxSizer_Hide_2_0, 1272).
--define(wxSizer_Hide_2_1, 1273).
--define(wxSizer_Hide_1, 1274).
--define(wxSizer_Insert_3_1, 1275).
--define(wxSizer_Insert_3_0, 1276).
--define(wxSizer_Insert_4, 1277).
--define(wxSizer_Insert_3_3, 1278).
--define(wxSizer_Insert_3_2, 1279).
--define(wxSizer_Insert_2, 1280).
--define(wxSizer_InsertSpacer, 1281).
--define(wxSizer_InsertStretchSpacer, 1282).
--define(wxSizer_IsShown_1_2, 1283).
--define(wxSizer_IsShown_1_1, 1284).
--define(wxSizer_IsShown_1_0, 1285).
--define(wxSizer_Layout, 1286).
--define(wxSizer_Prepend_2_1, 1287).
--define(wxSizer_Prepend_2_0, 1288).
--define(wxSizer_Prepend_3, 1289).
--define(wxSizer_Prepend_2_3, 1290).
--define(wxSizer_Prepend_2_2, 1291).
--define(wxSizer_Prepend_1, 1292).
--define(wxSizer_PrependSpacer, 1293).
--define(wxSizer_PrependStretchSpacer, 1294).
--define(wxSizer_RecalcSizes, 1295).
--define(wxSizer_Remove_1_1, 1296).
--define(wxSizer_Remove_1_0, 1297).
--define(wxSizer_Replace_3_1, 1298).
--define(wxSizer_Replace_3_0, 1299).
--define(wxSizer_Replace_2, 1300).
--define(wxSizer_SetDimension, 1301).
--define(wxSizer_SetMinSize_2, 1302).
--define(wxSizer_SetMinSize_1, 1303).
--define(wxSizer_SetItemMinSize_3_2, 1304).
--define(wxSizer_SetItemMinSize_2_2, 1305).
--define(wxSizer_SetItemMinSize_3_1, 1306).
--define(wxSizer_SetItemMinSize_2_1, 1307).
--define(wxSizer_SetItemMinSize_3_0, 1308).
--define(wxSizer_SetItemMinSize_2_0, 1309).
--define(wxSizer_SetSizeHints, 1310).
--define(wxSizer_SetVirtualSizeHints, 1311).
--define(wxSizer_Show_2_2, 1312).
--define(wxSizer_Show_2_1, 1313).
--define(wxSizer_Show_2_0, 1314).
--define(wxSizer_Show_1, 1315).
--define(wxSizerFlags_new, 1316).
--define(wxSizerFlags_Align, 1317).
--define(wxSizerFlags_Border_2, 1318).
--define(wxSizerFlags_Border_1, 1319).
--define(wxSizerFlags_Center, 1320).
--define(wxSizerFlags_Centre, 1321).
--define(wxSizerFlags_Expand, 1322).
--define(wxSizerFlags_Left, 1323).
--define(wxSizerFlags_Proportion, 1324).
--define(wxSizerFlags_Right, 1325).
--define(wxSizerFlags_destroy, 1326).
--define(wxSizerItem_new_5_1, 1327).
--define(wxSizerItem_new_2_1, 1328).
--define(wxSizerItem_new_5_0, 1329).
--define(wxSizerItem_new_2_0, 1330).
--define(wxSizerItem_new_6, 1331).
--define(wxSizerItem_new_3, 1332).
--define(wxSizerItem_new_0, 1333).
--define(wxSizerItem_destruct, 1334).
--define(wxSizerItem_CalcMin, 1335).
--define(wxSizerItem_DeleteWindows, 1336).
--define(wxSizerItem_DetachSizer, 1337).
--define(wxSizerItem_GetBorder, 1338).
--define(wxSizerItem_GetFlag, 1339).
--define(wxSizerItem_GetMinSize, 1340).
--define(wxSizerItem_GetPosition, 1341).
--define(wxSizerItem_GetProportion, 1342).
--define(wxSizerItem_GetRatio, 1343).
--define(wxSizerItem_GetRect, 1344).
--define(wxSizerItem_GetSize, 1345).
--define(wxSizerItem_GetSizer, 1346).
--define(wxSizerItem_GetSpacer, 1347).
--define(wxSizerItem_GetUserData, 1348).
--define(wxSizerItem_GetWindow, 1349).
--define(wxSizerItem_IsSizer, 1350).
--define(wxSizerItem_IsShown, 1351).
--define(wxSizerItem_IsSpacer, 1352).
--define(wxSizerItem_IsWindow, 1353).
--define(wxSizerItem_SetBorder, 1354).
--define(wxSizerItem_SetDimension, 1355).
--define(wxSizerItem_SetFlag, 1356).
--define(wxSizerItem_SetInitSize, 1357).
--define(wxSizerItem_SetMinSize_1, 1358).
--define(wxSizerItem_SetMinSize_2, 1359).
--define(wxSizerItem_SetProportion, 1360).
--define(wxSizerItem_SetRatio_2, 1361).
--define(wxSizerItem_SetRatio_1_1, 1362).
--define(wxSizerItem_SetRatio_1_0, 1363).
--define(wxSizerItem_SetSizer, 1364).
--define(wxSizerItem_SetSpacer_1, 1365).
--define(wxSizerItem_SetSpacer_2, 1366).
--define(wxSizerItem_SetWindow, 1367).
--define(wxSizerItem_Show, 1368).
--define(wxBoxSizer_new, 1369).
--define(wxBoxSizer_GetOrientation, 1370).
--define(wxBoxSizer_destroy, 1371).
--define(wxStaticBoxSizer_new_2, 1372).
--define(wxStaticBoxSizer_new_3, 1373).
--define(wxStaticBoxSizer_GetStaticBox, 1374).
--define(wxStaticBoxSizer_destroy, 1375).
--define(wxGridSizer_new_4, 1376).
--define(wxGridSizer_new_2, 1377).
--define(wxGridSizer_GetCols, 1378).
--define(wxGridSizer_GetHGap, 1379).
--define(wxGridSizer_GetRows, 1380).
--define(wxGridSizer_GetVGap, 1381).
--define(wxGridSizer_SetCols, 1382).
--define(wxGridSizer_SetHGap, 1383).
--define(wxGridSizer_SetRows, 1384).
--define(wxGridSizer_SetVGap, 1385).
--define(wxGridSizer_destroy, 1386).
--define(wxFlexGridSizer_new_4, 1387).
--define(wxFlexGridSizer_new_2, 1388).
--define(wxFlexGridSizer_AddGrowableCol, 1389).
--define(wxFlexGridSizer_AddGrowableRow, 1390).
--define(wxFlexGridSizer_GetFlexibleDirection, 1391).
--define(wxFlexGridSizer_GetNonFlexibleGrowMode, 1392).
--define(wxFlexGridSizer_RemoveGrowableCol, 1393).
--define(wxFlexGridSizer_RemoveGrowableRow, 1394).
--define(wxFlexGridSizer_SetFlexibleDirection, 1395).
--define(wxFlexGridSizer_SetNonFlexibleGrowMode, 1396).
--define(wxFlexGridSizer_destroy, 1397).
--define(wxGridBagSizer_new, 1398).
--define(wxGridBagSizer_Add_3_2, 1399).
--define(wxGridBagSizer_Add_3_1, 1400).
--define(wxGridBagSizer_Add_4, 1401).
--define(wxGridBagSizer_Add_1_0, 1402).
--define(wxGridBagSizer_Add_2_1, 1403).
--define(wxGridBagSizer_Add_2_0, 1404).
--define(wxGridBagSizer_Add_3_0, 1405).
--define(wxGridBagSizer_Add_1_1, 1406).
--define(wxGridBagSizer_CalcMin, 1407).
--define(wxGridBagSizer_CheckForIntersection_2, 1408).
--define(wxGridBagSizer_CheckForIntersection_3, 1409).
--define(wxGridBagSizer_FindItem_1_1, 1410).
--define(wxGridBagSizer_FindItem_1_0, 1411).
--define(wxGridBagSizer_FindItemAtPoint, 1412).
--define(wxGridBagSizer_FindItemAtPosition, 1413).
--define(wxGridBagSizer_FindItemWithData, 1414).
--define(wxGridBagSizer_GetCellSize, 1415).
--define(wxGridBagSizer_GetEmptyCellSize, 1416).
--define(wxGridBagSizer_GetItemPosition_1_2, 1417).
--define(wxGridBagSizer_GetItemPosition_1_1, 1418).
--define(wxGridBagSizer_GetItemPosition_1_0, 1419).
--define(wxGridBagSizer_GetItemSpan_1_2, 1420).
--define(wxGridBagSizer_GetItemSpan_1_1, 1421).
--define(wxGridBagSizer_GetItemSpan_1_0, 1422).
--define(wxGridBagSizer_SetEmptyCellSize, 1423).
--define(wxGridBagSizer_SetItemPosition_2_2, 1424).
--define(wxGridBagSizer_SetItemPosition_2_1, 1425).
--define(wxGridBagSizer_SetItemPosition_2_0, 1426).
--define(wxGridBagSizer_SetItemSpan_2_2, 1427).
--define(wxGridBagSizer_SetItemSpan_2_1, 1428).
--define(wxGridBagSizer_SetItemSpan_2_0, 1429).
--define(wxGridBagSizer_destroy, 1430).
--define(wxStdDialogButtonSizer_new, 1431).
--define(wxStdDialogButtonSizer_AddButton, 1432).
--define(wxStdDialogButtonSizer_Realize, 1433).
--define(wxStdDialogButtonSizer_SetAffirmativeButton, 1434).
--define(wxStdDialogButtonSizer_SetCancelButton, 1435).
--define(wxStdDialogButtonSizer_SetNegativeButton, 1436).
--define(wxStdDialogButtonSizer_destroy, 1437).
--define(wxFont_new_0, 1438).
--define(wxFont_new_1, 1439).
--define(wxFont_new_5, 1440).
--define(wxFont_destruct, 1442).
--define(wxFont_IsFixedWidth, 1443).
--define(wxFont_GetDefaultEncoding, 1444).
--define(wxFont_GetFaceName, 1445).
--define(wxFont_GetFamily, 1446).
--define(wxFont_GetNativeFontInfoDesc, 1447).
--define(wxFont_GetNativeFontInfoUserDesc, 1448).
--define(wxFont_GetPointSize, 1449).
--define(wxFont_GetStyle, 1450).
--define(wxFont_GetUnderlined, 1451).
--define(wxFont_GetWeight, 1452).
--define(wxFont_Ok, 1453).
--define(wxFont_SetDefaultEncoding, 1454).
--define(wxFont_SetFaceName, 1455).
--define(wxFont_SetFamily, 1456).
--define(wxFont_SetPointSize, 1457).
--define(wxFont_SetStyle, 1458).
--define(wxFont_SetUnderlined, 1459).
--define(wxFont_SetWeight, 1460).
--define(wxToolTip_Enable, 1461).
--define(wxToolTip_SetDelay, 1462).
--define(wxToolTip_new, 1463).
--define(wxToolTip_SetTip, 1464).
--define(wxToolTip_GetTip, 1465).
--define(wxToolTip_GetWindow, 1466).
--define(wxToolTip_destroy, 1467).
--define(wxButton_new_3, 1469).
--define(wxButton_new_0, 1470).
--define(wxButton_destruct, 1471).
--define(wxButton_Create, 1472).
--define(wxButton_GetDefaultSize, 1473).
--define(wxButton_SetDefault, 1474).
--define(wxButton_SetLabel, 1475).
--define(wxBitmapButton_new_4, 1477).
--define(wxBitmapButton_new_0, 1478).
--define(wxBitmapButton_Create, 1479).
--define(wxBitmapButton_GetBitmapDisabled, 1480).
--define(wxBitmapButton_GetBitmapFocus, 1482).
--define(wxBitmapButton_GetBitmapLabel, 1484).
--define(wxBitmapButton_GetBitmapSelected, 1486).
--define(wxBitmapButton_SetBitmapDisabled, 1488).
--define(wxBitmapButton_SetBitmapFocus, 1489).
--define(wxBitmapButton_SetBitmapLabel, 1490).
--define(wxBitmapButton_SetBitmapSelected, 1491).
--define(wxBitmapButton_destroy, 1492).
--define(wxToggleButton_new_0, 1493).
--define(wxToggleButton_new_4, 1494).
--define(wxToggleButton_Create, 1495).
--define(wxToggleButton_GetValue, 1496).
--define(wxToggleButton_SetValue, 1497).
--define(wxToggleButton_destroy, 1498).
--define(wxCalendarCtrl_new_0, 1499).
--define(wxCalendarCtrl_new_3, 1500).
--define(wxCalendarCtrl_Create, 1501).
--define(wxCalendarCtrl_destruct, 1502).
--define(wxCalendarCtrl_SetDate, 1503).
--define(wxCalendarCtrl_GetDate, 1504).
--define(wxCalendarCtrl_EnableYearChange, 1505).
--define(wxCalendarCtrl_EnableMonthChange, 1506).
--define(wxCalendarCtrl_EnableHolidayDisplay, 1507).
--define(wxCalendarCtrl_SetHeaderColours, 1508).
--define(wxCalendarCtrl_GetHeaderColourFg, 1509).
--define(wxCalendarCtrl_GetHeaderColourBg, 1510).
--define(wxCalendarCtrl_SetHighlightColours, 1511).
--define(wxCalendarCtrl_GetHighlightColourFg, 1512).
--define(wxCalendarCtrl_GetHighlightColourBg, 1513).
--define(wxCalendarCtrl_SetHolidayColours, 1514).
--define(wxCalendarCtrl_GetHolidayColourFg, 1515).
--define(wxCalendarCtrl_GetHolidayColourBg, 1516).
--define(wxCalendarCtrl_GetAttr, 1517).
--define(wxCalendarCtrl_SetAttr, 1518).
--define(wxCalendarCtrl_SetHoliday, 1519).
--define(wxCalendarCtrl_ResetAttr, 1520).
--define(wxCalendarCtrl_HitTest, 1521).
--define(wxCalendarDateAttr_new_0, 1522).
--define(wxCalendarDateAttr_new_2_1, 1523).
--define(wxCalendarDateAttr_new_2_0, 1524).
--define(wxCalendarDateAttr_SetTextColour, 1525).
--define(wxCalendarDateAttr_SetBackgroundColour, 1526).
--define(wxCalendarDateAttr_SetBorderColour, 1527).
--define(wxCalendarDateAttr_SetFont, 1528).
--define(wxCalendarDateAttr_SetBorder, 1529).
--define(wxCalendarDateAttr_SetHoliday, 1530).
--define(wxCalendarDateAttr_HasTextColour, 1531).
--define(wxCalendarDateAttr_HasBackgroundColour, 1532).
--define(wxCalendarDateAttr_HasBorderColour, 1533).
--define(wxCalendarDateAttr_HasFont, 1534).
--define(wxCalendarDateAttr_HasBorder, 1535).
--define(wxCalendarDateAttr_IsHoliday, 1536).
--define(wxCalendarDateAttr_GetTextColour, 1537).
--define(wxCalendarDateAttr_GetBackgroundColour, 1538).
--define(wxCalendarDateAttr_GetBorderColour, 1539).
--define(wxCalendarDateAttr_GetFont, 1540).
--define(wxCalendarDateAttr_GetBorder, 1541).
--define(wxCalendarDateAttr_destroy, 1542).
--define(wxCheckBox_new_4, 1544).
--define(wxCheckBox_new_0, 1545).
--define(wxCheckBox_Create, 1546).
--define(wxCheckBox_GetValue, 1547).
--define(wxCheckBox_Get3StateValue, 1548).
--define(wxCheckBox_Is3rdStateAllowedForUser, 1549).
--define(wxCheckBox_Is3State, 1550).
--define(wxCheckBox_IsChecked, 1551).
--define(wxCheckBox_SetValue, 1552).
--define(wxCheckBox_Set3StateValue, 1553).
--define(wxCheckBox_destroy, 1554).
--define(wxCheckListBox_new_0, 1555).
--define(wxCheckListBox_new_3, 1557).
--define(wxCheckListBox_Check, 1558).
--define(wxCheckListBox_IsChecked, 1559).
--define(wxCheckListBox_destroy, 1560).
--define(wxChoice_new_3, 1563).
--define(wxChoice_new_0, 1564).
--define(wxChoice_destruct, 1566).
--define(wxChoice_Create, 1568).
--define(wxChoice_Delete, 1569).
--define(wxChoice_GetColumns, 1570).
--define(wxChoice_SetColumns, 1571).
--define(wxComboBox_new_0, 1572).
--define(wxComboBox_new_3, 1574).
--define(wxComboBox_destruct, 1575).
--define(wxComboBox_Create, 1577).
--define(wxComboBox_CanCopy, 1578).
--define(wxComboBox_CanCut, 1579).
--define(wxComboBox_CanPaste, 1580).
--define(wxComboBox_CanRedo, 1581).
--define(wxComboBox_CanUndo, 1582).
--define(wxComboBox_Copy, 1583).
--define(wxComboBox_Cut, 1584).
--define(wxComboBox_GetInsertionPoint, 1585).
--define(wxComboBox_GetLastPosition, 1586).
--define(wxComboBox_GetValue, 1587).
--define(wxComboBox_Paste, 1588).
--define(wxComboBox_Redo, 1589).
--define(wxComboBox_Replace, 1590).
--define(wxComboBox_Remove, 1591).
--define(wxComboBox_SetInsertionPoint, 1592).
--define(wxComboBox_SetInsertionPointEnd, 1593).
--define(wxComboBox_SetSelection_1, 1594).
--define(wxComboBox_SetSelection_2, 1595).
--define(wxComboBox_SetValue, 1596).
--define(wxComboBox_Undo, 1597).
--define(wxGauge_new_0, 1598).
--define(wxGauge_new_4, 1599).
--define(wxGauge_Create, 1600).
--define(wxGauge_GetBezelFace, 1601).
--define(wxGauge_GetRange, 1602).
--define(wxGauge_GetShadowWidth, 1603).
--define(wxGauge_GetValue, 1604).
--define(wxGauge_IsVertical, 1605).
--define(wxGauge_SetBezelFace, 1606).
--define(wxGauge_SetRange, 1607).
--define(wxGauge_SetShadowWidth, 1608).
--define(wxGauge_SetValue, 1609).
--define(wxGauge_Pulse, 1610).
--define(wxGauge_destroy, 1611).
--define(wxGenericDirCtrl_new_0, 1612).
--define(wxGenericDirCtrl_new_2, 1613).
--define(wxGenericDirCtrl_destruct, 1614).
--define(wxGenericDirCtrl_Create, 1615).
--define(wxGenericDirCtrl_Init, 1616).
--define(wxGenericDirCtrl_CollapseTree, 1617).
--define(wxGenericDirCtrl_ExpandPath, 1618).
--define(wxGenericDirCtrl_GetDefaultPath, 1619).
--define(wxGenericDirCtrl_GetPath, 1620).
--define(wxGenericDirCtrl_GetFilePath, 1621).
--define(wxGenericDirCtrl_GetFilter, 1622).
--define(wxGenericDirCtrl_GetFilterIndex, 1623).
--define(wxGenericDirCtrl_GetRootId, 1624).
--define(wxGenericDirCtrl_GetTreeCtrl, 1625).
--define(wxGenericDirCtrl_ReCreateTree, 1626).
--define(wxGenericDirCtrl_SetDefaultPath, 1627).
--define(wxGenericDirCtrl_SetFilter, 1628).
--define(wxGenericDirCtrl_SetFilterIndex, 1629).
--define(wxGenericDirCtrl_SetPath, 1630).
--define(wxStaticBox_new_4, 1632).
--define(wxStaticBox_new_0, 1633).
--define(wxStaticBox_Create, 1634).
--define(wxStaticBox_destroy, 1635).
--define(wxStaticLine_new_2, 1637).
--define(wxStaticLine_new_0, 1638).
--define(wxStaticLine_Create, 1639).
--define(wxStaticLine_IsVertical, 1640).
--define(wxStaticLine_GetDefaultSize, 1641).
--define(wxStaticLine_destroy, 1642).
--define(wxListBox_new_3, 1645).
--define(wxListBox_new_0, 1646).
--define(wxListBox_destruct, 1648).
--define(wxListBox_Create, 1650).
--define(wxListBox_Deselect, 1651).
--define(wxListBox_GetSelections, 1652).
--define(wxListBox_InsertItems, 1653).
--define(wxListBox_IsSelected, 1654).
--define(wxListBox_Set, 1655).
--define(wxListBox_HitTest, 1656).
--define(wxListBox_SetFirstItem_1_0, 1657).
--define(wxListBox_SetFirstItem_1_1, 1658).
--define(wxListCtrl_new_0, 1659).
--define(wxListCtrl_new_2, 1660).
--define(wxListCtrl_Arrange, 1661).
--define(wxListCtrl_AssignImageList, 1662).
--define(wxListCtrl_ClearAll, 1663).
--define(wxListCtrl_Create, 1664).
--define(wxListCtrl_DeleteAllItems, 1665).
--define(wxListCtrl_DeleteColumn, 1666).
--define(wxListCtrl_DeleteItem, 1667).
--define(wxListCtrl_EditLabel, 1668).
--define(wxListCtrl_EnsureVisible, 1669).
--define(wxListCtrl_FindItem_3_0, 1670).
--define(wxListCtrl_FindItem_3_1, 1671).
--define(wxListCtrl_GetColumn, 1672).
--define(wxListCtrl_GetColumnCount, 1673).
--define(wxListCtrl_GetColumnWidth, 1674).
--define(wxListCtrl_GetCountPerPage, 1675).
--define(wxListCtrl_GetEditControl, 1676).
--define(wxListCtrl_GetImageList, 1677).
--define(wxListCtrl_GetItem, 1678).
--define(wxListCtrl_GetItemBackgroundColour, 1679).
--define(wxListCtrl_GetItemCount, 1680).
--define(wxListCtrl_GetItemData, 1681).
--define(wxListCtrl_GetItemFont, 1682).
--define(wxListCtrl_GetItemPosition, 1683).
--define(wxListCtrl_GetItemRect, 1684).
--define(wxListCtrl_GetItemSpacing, 1685).
--define(wxListCtrl_GetItemState, 1686).
--define(wxListCtrl_GetItemText, 1687).
--define(wxListCtrl_GetItemTextColour, 1688).
--define(wxListCtrl_GetNextItem, 1689).
--define(wxListCtrl_GetSelectedItemCount, 1690).
--define(wxListCtrl_GetTextColour, 1691).
--define(wxListCtrl_GetTopItem, 1692).
--define(wxListCtrl_GetViewRect, 1693).
--define(wxListCtrl_HitTest, 1694).
--define(wxListCtrl_InsertColumn_2, 1695).
--define(wxListCtrl_InsertColumn_3, 1696).
--define(wxListCtrl_InsertItem_1, 1697).
--define(wxListCtrl_InsertItem_2_1, 1698).
--define(wxListCtrl_InsertItem_2_0, 1699).
--define(wxListCtrl_InsertItem_3, 1700).
--define(wxListCtrl_RefreshItem, 1701).
--define(wxListCtrl_RefreshItems, 1702).
--define(wxListCtrl_ScrollList, 1703).
--define(wxListCtrl_SetBackgroundColour, 1704).
--define(wxListCtrl_SetColumn, 1705).
--define(wxListCtrl_SetColumnWidth, 1706).
--define(wxListCtrl_SetImageList, 1707).
--define(wxListCtrl_SetItem_1, 1708).
--define(wxListCtrl_SetItem_4, 1709).
--define(wxListCtrl_SetItemBackgroundColour, 1710).
--define(wxListCtrl_SetItemCount, 1711).
--define(wxListCtrl_SetItemData, 1712).
--define(wxListCtrl_SetItemFont, 1713).
--define(wxListCtrl_SetItemImage, 1714).
--define(wxListCtrl_SetItemColumnImage, 1715).
--define(wxListCtrl_SetItemPosition, 1716).
--define(wxListCtrl_SetItemState, 1717).
--define(wxListCtrl_SetItemText, 1718).
--define(wxListCtrl_SetItemTextColour, 1719).
--define(wxListCtrl_SetSingleStyle, 1720).
--define(wxListCtrl_SetTextColour, 1721).
--define(wxListCtrl_SetWindowStyleFlag, 1722).
--define(wxListCtrl_SortItems, 1723).
--define(wxListCtrl_destroy, 1724).
--define(wxListView_ClearColumnImage, 1725).
--define(wxListView_Focus, 1726).
--define(wxListView_GetFirstSelected, 1727).
--define(wxListView_GetFocusedItem, 1728).
--define(wxListView_GetNextSelected, 1729).
--define(wxListView_IsSelected, 1730).
--define(wxListView_Select, 1731).
--define(wxListView_SetColumnImage, 1732).
--define(wxListItem_new_0, 1733).
--define(wxListItem_new_1, 1734).
--define(wxListItem_destruct, 1735).
--define(wxListItem_Clear, 1736).
--define(wxListItem_GetAlign, 1737).
--define(wxListItem_GetBackgroundColour, 1738).
--define(wxListItem_GetColumn, 1739).
--define(wxListItem_GetFont, 1740).
--define(wxListItem_GetId, 1741).
--define(wxListItem_GetImage, 1742).
--define(wxListItem_GetMask, 1743).
--define(wxListItem_GetState, 1744).
--define(wxListItem_GetText, 1745).
--define(wxListItem_GetTextColour, 1746).
--define(wxListItem_GetWidth, 1747).
--define(wxListItem_SetAlign, 1748).
--define(wxListItem_SetBackgroundColour, 1749).
--define(wxListItem_SetColumn, 1750).
--define(wxListItem_SetFont, 1751).
--define(wxListItem_SetId, 1752).
--define(wxListItem_SetImage, 1753).
--define(wxListItem_SetMask, 1754).
--define(wxListItem_SetState, 1755).
--define(wxListItem_SetStateMask, 1756).
--define(wxListItem_SetText, 1757).
--define(wxListItem_SetTextColour, 1758).
--define(wxListItem_SetWidth, 1759).
--define(wxListItemAttr_new_0, 1760).
--define(wxListItemAttr_new_3, 1761).
--define(wxListItemAttr_GetBackgroundColour, 1762).
--define(wxListItemAttr_GetFont, 1763).
--define(wxListItemAttr_GetTextColour, 1764).
--define(wxListItemAttr_HasBackgroundColour, 1765).
--define(wxListItemAttr_HasFont, 1766).
--define(wxListItemAttr_HasTextColour, 1767).
--define(wxListItemAttr_SetBackgroundColour, 1768).
--define(wxListItemAttr_SetFont, 1769).
--define(wxListItemAttr_SetTextColour, 1770).
--define(wxListItemAttr_destroy, 1771).
--define(wxImageList_new_0, 1772).
--define(wxImageList_new_3, 1773).
--define(wxImageList_Add_1, 1774).
--define(wxImageList_Add_2_0, 1775).
--define(wxImageList_Add_2_1, 1776).
--define(wxImageList_Create, 1777).
--define(wxImageList_Draw, 1779).
--define(wxImageList_GetBitmap, 1780).
--define(wxImageList_GetIcon, 1781).
--define(wxImageList_GetImageCount, 1782).
--define(wxImageList_GetSize, 1783).
--define(wxImageList_Remove, 1784).
--define(wxImageList_RemoveAll, 1785).
--define(wxImageList_Replace_2, 1786).
--define(wxImageList_Replace_3, 1787).
--define(wxImageList_destroy, 1788).
--define(wxTextAttr_new_0, 1789).
--define(wxTextAttr_new_2, 1790).
--define(wxTextAttr_GetAlignment, 1791).
--define(wxTextAttr_GetBackgroundColour, 1792).
--define(wxTextAttr_GetFont, 1793).
--define(wxTextAttr_GetLeftIndent, 1794).
--define(wxTextAttr_GetLeftSubIndent, 1795).
--define(wxTextAttr_GetRightIndent, 1796).
--define(wxTextAttr_GetTabs, 1797).
--define(wxTextAttr_GetTextColour, 1798).
--define(wxTextAttr_HasBackgroundColour, 1799).
--define(wxTextAttr_HasFont, 1800).
--define(wxTextAttr_HasTextColour, 1801).
--define(wxTextAttr_GetFlags, 1802).
--define(wxTextAttr_IsDefault, 1803).
--define(wxTextAttr_SetAlignment, 1804).
--define(wxTextAttr_SetBackgroundColour, 1805).
--define(wxTextAttr_SetFlags, 1806).
--define(wxTextAttr_SetFont, 1807).
--define(wxTextAttr_SetLeftIndent, 1808).
--define(wxTextAttr_SetRightIndent, 1809).
--define(wxTextAttr_SetTabs, 1810).
--define(wxTextAttr_SetTextColour, 1811).
--define(wxTextAttr_destroy, 1812).
--define(wxTextCtrl_new_3, 1814).
--define(wxTextCtrl_new_0, 1815).
--define(wxTextCtrl_destruct, 1817).
--define(wxTextCtrl_AppendText, 1818).
--define(wxTextCtrl_CanCopy, 1819).
--define(wxTextCtrl_CanCut, 1820).
--define(wxTextCtrl_CanPaste, 1821).
--define(wxTextCtrl_CanRedo, 1822).
--define(wxTextCtrl_CanUndo, 1823).
--define(wxTextCtrl_Clear, 1824).
--define(wxTextCtrl_Copy, 1825).
--define(wxTextCtrl_Create, 1826).
--define(wxTextCtrl_Cut, 1827).
--define(wxTextCtrl_DiscardEdits, 1828).
--define(wxTextCtrl_ChangeValue, 1829).
--define(wxTextCtrl_EmulateKeyPress, 1830).
--define(wxTextCtrl_GetDefaultStyle, 1831).
--define(wxTextCtrl_GetInsertionPoint, 1832).
--define(wxTextCtrl_GetLastPosition, 1833).
--define(wxTextCtrl_GetLineLength, 1834).
--define(wxTextCtrl_GetLineText, 1835).
--define(wxTextCtrl_GetNumberOfLines, 1836).
--define(wxTextCtrl_GetRange, 1837).
--define(wxTextCtrl_GetSelection, 1838).
--define(wxTextCtrl_GetStringSelection, 1839).
--define(wxTextCtrl_GetStyle, 1840).
--define(wxTextCtrl_GetValue, 1841).
--define(wxTextCtrl_IsEditable, 1842).
--define(wxTextCtrl_IsModified, 1843).
--define(wxTextCtrl_IsMultiLine, 1844).
--define(wxTextCtrl_IsSingleLine, 1845).
--define(wxTextCtrl_LoadFile, 1846).
--define(wxTextCtrl_MarkDirty, 1847).
--define(wxTextCtrl_Paste, 1848).
--define(wxTextCtrl_PositionToXY, 1849).
--define(wxTextCtrl_Redo, 1850).
--define(wxTextCtrl_Remove, 1851).
--define(wxTextCtrl_Replace, 1852).
--define(wxTextCtrl_SaveFile, 1853).
--define(wxTextCtrl_SetDefaultStyle, 1854).
--define(wxTextCtrl_SetEditable, 1855).
--define(wxTextCtrl_SetInsertionPoint, 1856).
--define(wxTextCtrl_SetInsertionPointEnd, 1857).
--define(wxTextCtrl_SetMaxLength, 1859).
--define(wxTextCtrl_SetSelection, 1860).
--define(wxTextCtrl_SetStyle, 1861).
--define(wxTextCtrl_SetValue, 1862).
--define(wxTextCtrl_ShowPosition, 1863).
--define(wxTextCtrl_Undo, 1864).
--define(wxTextCtrl_WriteText, 1865).
--define(wxTextCtrl_XYToPosition, 1866).
--define(wxNotebook_new_0, 1869).
--define(wxNotebook_new_3, 1870).
--define(wxNotebook_destruct, 1871).
--define(wxNotebook_AddPage, 1872).
--define(wxNotebook_AdvanceSelection, 1873).
--define(wxNotebook_AssignImageList, 1874).
--define(wxNotebook_Create, 1875).
--define(wxNotebook_DeleteAllPages, 1876).
--define(wxNotebook_DeletePage, 1877).
--define(wxNotebook_RemovePage, 1878).
--define(wxNotebook_GetCurrentPage, 1879).
--define(wxNotebook_GetImageList, 1880).
--define(wxNotebook_GetPage, 1882).
--define(wxNotebook_GetPageCount, 1883).
--define(wxNotebook_GetPageImage, 1884).
--define(wxNotebook_GetPageText, 1885).
--define(wxNotebook_GetRowCount, 1886).
--define(wxNotebook_GetSelection, 1887).
--define(wxNotebook_GetThemeBackgroundColour, 1888).
--define(wxNotebook_HitTest, 1890).
--define(wxNotebook_InsertPage, 1892).
--define(wxNotebook_SetImageList, 1893).
--define(wxNotebook_SetPadding, 1894).
--define(wxNotebook_SetPageSize, 1895).
--define(wxNotebook_SetPageImage, 1896).
--define(wxNotebook_SetPageText, 1897).
--define(wxNotebook_SetSelection, 1898).
--define(wxNotebook_ChangeSelection, 1899).
--define(wxChoicebook_new_0, 1900).
--define(wxChoicebook_new_3, 1901).
--define(wxChoicebook_AddPage, 1902).
--define(wxChoicebook_AdvanceSelection, 1903).
--define(wxChoicebook_AssignImageList, 1904).
--define(wxChoicebook_Create, 1905).
--define(wxChoicebook_DeleteAllPages, 1906).
--define(wxChoicebook_DeletePage, 1907).
--define(wxChoicebook_RemovePage, 1908).
--define(wxChoicebook_GetCurrentPage, 1909).
--define(wxChoicebook_GetImageList, 1910).
--define(wxChoicebook_GetPage, 1912).
--define(wxChoicebook_GetPageCount, 1913).
--define(wxChoicebook_GetPageImage, 1914).
--define(wxChoicebook_GetPageText, 1915).
--define(wxChoicebook_GetSelection, 1916).
--define(wxChoicebook_HitTest, 1917).
--define(wxChoicebook_InsertPage, 1918).
--define(wxChoicebook_SetImageList, 1919).
--define(wxChoicebook_SetPageSize, 1920).
--define(wxChoicebook_SetPageImage, 1921).
--define(wxChoicebook_SetPageText, 1922).
--define(wxChoicebook_SetSelection, 1923).
--define(wxChoicebook_ChangeSelection, 1924).
--define(wxChoicebook_destroy, 1925).
--define(wxToolbook_new_0, 1926).
--define(wxToolbook_new_3, 1927).
--define(wxToolbook_AddPage, 1928).
--define(wxToolbook_AdvanceSelection, 1929).
--define(wxToolbook_AssignImageList, 1930).
--define(wxToolbook_Create, 1931).
--define(wxToolbook_DeleteAllPages, 1932).
--define(wxToolbook_DeletePage, 1933).
--define(wxToolbook_RemovePage, 1934).
--define(wxToolbook_GetCurrentPage, 1935).
--define(wxToolbook_GetImageList, 1936).
--define(wxToolbook_GetPage, 1938).
--define(wxToolbook_GetPageCount, 1939).
--define(wxToolbook_GetPageImage, 1940).
--define(wxToolbook_GetPageText, 1941).
--define(wxToolbook_GetSelection, 1942).
--define(wxToolbook_HitTest, 1944).
--define(wxToolbook_InsertPage, 1945).
--define(wxToolbook_SetImageList, 1946).
--define(wxToolbook_SetPageSize, 1947).
--define(wxToolbook_SetPageImage, 1948).
--define(wxToolbook_SetPageText, 1949).
--define(wxToolbook_SetSelection, 1950).
--define(wxToolbook_ChangeSelection, 1951).
--define(wxToolbook_destroy, 1952).
--define(wxListbook_new_0, 1953).
--define(wxListbook_new_3, 1954).
--define(wxListbook_AddPage, 1955).
--define(wxListbook_AdvanceSelection, 1956).
--define(wxListbook_AssignImageList, 1957).
--define(wxListbook_Create, 1958).
--define(wxListbook_DeleteAllPages, 1959).
--define(wxListbook_DeletePage, 1960).
--define(wxListbook_RemovePage, 1961).
--define(wxListbook_GetCurrentPage, 1962).
--define(wxListbook_GetImageList, 1963).
--define(wxListbook_GetPage, 1965).
--define(wxListbook_GetPageCount, 1966).
--define(wxListbook_GetPageImage, 1967).
--define(wxListbook_GetPageText, 1968).
--define(wxListbook_GetSelection, 1969).
--define(wxListbook_HitTest, 1971).
--define(wxListbook_InsertPage, 1972).
--define(wxListbook_SetImageList, 1973).
--define(wxListbook_SetPageSize, 1974).
--define(wxListbook_SetPageImage, 1975).
--define(wxListbook_SetPageText, 1976).
--define(wxListbook_SetSelection, 1977).
--define(wxListbook_ChangeSelection, 1978).
--define(wxListbook_destroy, 1979).
--define(wxTreebook_new_0, 1980).
--define(wxTreebook_new_3, 1981).
--define(wxTreebook_AddPage, 1982).
--define(wxTreebook_AdvanceSelection, 1983).
--define(wxTreebook_AssignImageList, 1984).
--define(wxTreebook_Create, 1985).
--define(wxTreebook_DeleteAllPages, 1986).
--define(wxTreebook_DeletePage, 1987).
--define(wxTreebook_RemovePage, 1988).
--define(wxTreebook_GetCurrentPage, 1989).
--define(wxTreebook_GetImageList, 1990).
--define(wxTreebook_GetPage, 1992).
--define(wxTreebook_GetPageCount, 1993).
--define(wxTreebook_GetPageImage, 1994).
--define(wxTreebook_GetPageText, 1995).
--define(wxTreebook_GetSelection, 1996).
--define(wxTreebook_ExpandNode, 1997).
--define(wxTreebook_IsNodeExpanded, 1998).
--define(wxTreebook_HitTest, 2000).
--define(wxTreebook_InsertPage, 2001).
--define(wxTreebook_InsertSubPage, 2002).
--define(wxTreebook_SetImageList, 2003).
--define(wxTreebook_SetPageSize, 2004).
--define(wxTreebook_SetPageImage, 2005).
--define(wxTreebook_SetPageText, 2006).
--define(wxTreebook_SetSelection, 2007).
--define(wxTreebook_ChangeSelection, 2008).
--define(wxTreebook_destroy, 2009).
--define(wxTreeCtrl_new_2, 2012).
--define(wxTreeCtrl_new_0, 2013).
--define(wxTreeCtrl_destruct, 2015).
--define(wxTreeCtrl_AddRoot, 2016).
--define(wxTreeCtrl_AppendItem, 2017).
--define(wxTreeCtrl_AssignImageList, 2018).
--define(wxTreeCtrl_AssignStateImageList, 2019).
--define(wxTreeCtrl_Collapse, 2020).
--define(wxTreeCtrl_CollapseAndReset, 2021).
--define(wxTreeCtrl_Create, 2022).
--define(wxTreeCtrl_Delete, 2023).
--define(wxTreeCtrl_DeleteAllItems, 2024).
--define(wxTreeCtrl_DeleteChildren, 2025).
--define(wxTreeCtrl_EditLabel, 2026).
--define(wxTreeCtrl_EnsureVisible, 2027).
--define(wxTreeCtrl_Expand, 2028).
--define(wxTreeCtrl_GetBoundingRect, 2029).
--define(wxTreeCtrl_GetChildrenCount, 2031).
--define(wxTreeCtrl_GetCount, 2032).
--define(wxTreeCtrl_GetEditControl, 2033).
--define(wxTreeCtrl_GetFirstChild, 2034).
--define(wxTreeCtrl_GetNextChild, 2035).
--define(wxTreeCtrl_GetFirstVisibleItem, 2036).
--define(wxTreeCtrl_GetImageList, 2037).
--define(wxTreeCtrl_GetIndent, 2038).
--define(wxTreeCtrl_GetItemBackgroundColour, 2039).
--define(wxTreeCtrl_GetItemData, 2040).
--define(wxTreeCtrl_GetItemFont, 2041).
--define(wxTreeCtrl_GetItemImage_1, 2042).
--define(wxTreeCtrl_GetItemImage_2, 2043).
--define(wxTreeCtrl_GetItemText, 2044).
--define(wxTreeCtrl_GetItemTextColour, 2045).
--define(wxTreeCtrl_GetLastChild, 2046).
--define(wxTreeCtrl_GetNextSibling, 2047).
--define(wxTreeCtrl_GetNextVisible, 2048).
--define(wxTreeCtrl_GetItemParent, 2049).
--define(wxTreeCtrl_GetPrevSibling, 2050).
--define(wxTreeCtrl_GetPrevVisible, 2051).
--define(wxTreeCtrl_GetRootItem, 2052).
--define(wxTreeCtrl_GetSelection, 2053).
--define(wxTreeCtrl_GetSelections, 2054).
--define(wxTreeCtrl_GetStateImageList, 2055).
--define(wxTreeCtrl_HitTest, 2056).
--define(wxTreeCtrl_InsertItem, 2058).
--define(wxTreeCtrl_IsBold, 2059).
--define(wxTreeCtrl_IsExpanded, 2060).
--define(wxTreeCtrl_IsSelected, 2061).
--define(wxTreeCtrl_IsVisible, 2062).
--define(wxTreeCtrl_ItemHasChildren, 2063).
--define(wxTreeCtrl_IsTreeItemIdOk, 2064).
--define(wxTreeCtrl_PrependItem, 2065).
--define(wxTreeCtrl_ScrollTo, 2066).
--define(wxTreeCtrl_SelectItem_1, 2067).
--define(wxTreeCtrl_SelectItem_2, 2068).
--define(wxTreeCtrl_SetIndent, 2069).
--define(wxTreeCtrl_SetImageList, 2070).
--define(wxTreeCtrl_SetItemBackgroundColour, 2071).
--define(wxTreeCtrl_SetItemBold, 2072).
--define(wxTreeCtrl_SetItemData, 2073).
--define(wxTreeCtrl_SetItemDropHighlight, 2074).
--define(wxTreeCtrl_SetItemFont, 2075).
--define(wxTreeCtrl_SetItemHasChildren, 2076).
--define(wxTreeCtrl_SetItemImage_2, 2077).
--define(wxTreeCtrl_SetItemImage_3, 2078).
--define(wxTreeCtrl_SetItemText, 2079).
--define(wxTreeCtrl_SetItemTextColour, 2080).
--define(wxTreeCtrl_SetStateImageList, 2081).
--define(wxTreeCtrl_SetWindowStyle, 2082).
--define(wxTreeCtrl_SortChildren, 2083).
--define(wxTreeCtrl_Toggle, 2084).
--define(wxTreeCtrl_ToggleItemSelection, 2085).
--define(wxTreeCtrl_Unselect, 2086).
--define(wxTreeCtrl_UnselectAll, 2087).
--define(wxTreeCtrl_UnselectItem, 2088).
--define(wxScrollBar_new_0, 2089).
--define(wxScrollBar_new_3, 2090).
--define(wxScrollBar_destruct, 2091).
--define(wxScrollBar_Create, 2092).
--define(wxScrollBar_GetRange, 2093).
--define(wxScrollBar_GetPageSize, 2094).
--define(wxScrollBar_GetThumbPosition, 2095).
--define(wxScrollBar_GetThumbSize, 2096).
--define(wxScrollBar_SetThumbPosition, 2097).
--define(wxScrollBar_SetScrollbar, 2098).
--define(wxSpinButton_new_2, 2100).
--define(wxSpinButton_new_0, 2101).
--define(wxSpinButton_Create, 2102).
--define(wxSpinButton_GetMax, 2103).
--define(wxSpinButton_GetMin, 2104).
--define(wxSpinButton_GetValue, 2105).
--define(wxSpinButton_SetRange, 2106).
--define(wxSpinButton_SetValue, 2107).
--define(wxSpinButton_destroy, 2108).
--define(wxSpinCtrl_new_0, 2109).
--define(wxSpinCtrl_new_2, 2110).
--define(wxSpinCtrl_Create, 2112).
--define(wxSpinCtrl_SetValue_1_1, 2115).
--define(wxSpinCtrl_SetValue_1_0, 2116).
--define(wxSpinCtrl_GetValue, 2118).
--define(wxSpinCtrl_SetRange, 2120).
--define(wxSpinCtrl_SetSelection, 2121).
--define(wxSpinCtrl_GetMin, 2123).
--define(wxSpinCtrl_GetMax, 2125).
--define(wxSpinCtrl_destroy, 2126).
--define(wxStaticText_new_0, 2127).
--define(wxStaticText_new_4, 2128).
--define(wxStaticText_Create, 2129).
--define(wxStaticText_GetLabel, 2130).
--define(wxStaticText_SetLabel, 2131).
--define(wxStaticText_Wrap, 2132).
--define(wxStaticText_destroy, 2133).
--define(wxStaticBitmap_new_0, 2134).
--define(wxStaticBitmap_new_4, 2135).
--define(wxStaticBitmap_Create, 2136).
--define(wxStaticBitmap_GetBitmap, 2137).
--define(wxStaticBitmap_SetBitmap, 2138).
--define(wxStaticBitmap_destroy, 2139).
--define(wxRadioBox_new, 2140).
--define(wxRadioBox_destruct, 2142).
--define(wxRadioBox_Create, 2143).
--define(wxRadioBox_Enable_2, 2144).
--define(wxRadioBox_Enable_1, 2145).
--define(wxRadioBox_GetSelection, 2146).
--define(wxRadioBox_GetString, 2147).
--define(wxRadioBox_SetSelection, 2148).
--define(wxRadioBox_Show_2, 2149).
--define(wxRadioBox_Show_1, 2150).
--define(wxRadioBox_GetColumnCount, 2151).
--define(wxRadioBox_GetItemHelpText, 2152).
--define(wxRadioBox_GetItemToolTip, 2153).
--define(wxRadioBox_GetItemFromPoint, 2155).
--define(wxRadioBox_GetRowCount, 2156).
--define(wxRadioBox_IsItemEnabled, 2157).
--define(wxRadioBox_IsItemShown, 2158).
--define(wxRadioBox_SetItemHelpText, 2159).
--define(wxRadioBox_SetItemToolTip, 2160).
--define(wxRadioButton_new_0, 2161).
--define(wxRadioButton_new_4, 2162).
--define(wxRadioButton_Create, 2163).
--define(wxRadioButton_GetValue, 2164).
--define(wxRadioButton_SetValue, 2165).
--define(wxRadioButton_destroy, 2166).
--define(wxSlider_new_6, 2168).
--define(wxSlider_new_0, 2169).
--define(wxSlider_Create, 2170).
--define(wxSlider_GetLineSize, 2171).
--define(wxSlider_GetMax, 2172).
--define(wxSlider_GetMin, 2173).
--define(wxSlider_GetPageSize, 2174).
--define(wxSlider_GetThumbLength, 2175).
--define(wxSlider_GetValue, 2176).
--define(wxSlider_SetLineSize, 2177).
--define(wxSlider_SetPageSize, 2178).
--define(wxSlider_SetRange, 2179).
--define(wxSlider_SetThumbLength, 2180).
--define(wxSlider_SetValue, 2181).
--define(wxSlider_destroy, 2182).
--define(wxDialog_new_4, 2184).
--define(wxDialog_new_0, 2185).
--define(wxDialog_destruct, 2187).
--define(wxDialog_Create, 2188).
--define(wxDialog_CreateButtonSizer, 2189).
--define(wxDialog_CreateStdDialogButtonSizer, 2190).
--define(wxDialog_EndModal, 2191).
--define(wxDialog_GetAffirmativeId, 2192).
--define(wxDialog_GetReturnCode, 2193).
--define(wxDialog_IsModal, 2194).
--define(wxDialog_SetAffirmativeId, 2195).
--define(wxDialog_SetReturnCode, 2196).
--define(wxDialog_Show, 2197).
--define(wxDialog_ShowModal, 2198).
--define(wxColourDialog_new_0, 2199).
--define(wxColourDialog_new_2, 2200).
--define(wxColourDialog_destruct, 2201).
--define(wxColourDialog_Create, 2202).
--define(wxColourDialog_GetColourData, 2203).
--define(wxColourData_new_0, 2204).
--define(wxColourData_new_1, 2205).
--define(wxColourData_destruct, 2206).
--define(wxColourData_GetChooseFull, 2207).
--define(wxColourData_GetColour, 2208).
--define(wxColourData_GetCustomColour, 2210).
--define(wxColourData_SetChooseFull, 2211).
--define(wxColourData_SetColour, 2212).
--define(wxColourData_SetCustomColour, 2213).
--define(wxPalette_new_0, 2214).
--define(wxPalette_new_4, 2215).
--define(wxPalette_destruct, 2217).
--define(wxPalette_Create, 2218).
--define(wxPalette_GetColoursCount, 2219).
--define(wxPalette_GetPixel, 2220).
--define(wxPalette_GetRGB, 2221).
--define(wxPalette_IsOk, 2222).
--define(wxDirDialog_new, 2226).
--define(wxDirDialog_destruct, 2227).
--define(wxDirDialog_GetPath, 2228).
--define(wxDirDialog_GetMessage, 2229).
--define(wxDirDialog_SetMessage, 2230).
--define(wxDirDialog_SetPath, 2231).
--define(wxFileDialog_new, 2235).
--define(wxFileDialog_destruct, 2236).
--define(wxFileDialog_GetDirectory, 2237).
--define(wxFileDialog_GetFilename, 2238).
--define(wxFileDialog_GetFilenames, 2239).
--define(wxFileDialog_GetFilterIndex, 2240).
--define(wxFileDialog_GetMessage, 2241).
--define(wxFileDialog_GetPath, 2242).
--define(wxFileDialog_GetPaths, 2243).
--define(wxFileDialog_GetWildcard, 2244).
--define(wxFileDialog_SetDirectory, 2245).
--define(wxFileDialog_SetFilename, 2246).
--define(wxFileDialog_SetFilterIndex, 2247).
--define(wxFileDialog_SetMessage, 2248).
--define(wxFileDialog_SetPath, 2249).
--define(wxFileDialog_SetWildcard, 2250).
--define(wxPickerBase_SetInternalMargin, 2251).
--define(wxPickerBase_GetInternalMargin, 2252).
--define(wxPickerBase_SetTextCtrlProportion, 2253).
--define(wxPickerBase_SetPickerCtrlProportion, 2254).
--define(wxPickerBase_GetTextCtrlProportion, 2255).
--define(wxPickerBase_GetPickerCtrlProportion, 2256).
--define(wxPickerBase_HasTextCtrl, 2257).
--define(wxPickerBase_GetTextCtrl, 2258).
--define(wxPickerBase_IsTextCtrlGrowable, 2259).
--define(wxPickerBase_SetPickerCtrlGrowable, 2260).
--define(wxPickerBase_SetTextCtrlGrowable, 2261).
--define(wxPickerBase_IsPickerCtrlGrowable, 2262).
--define(wxFilePickerCtrl_new_0, 2263).
--define(wxFilePickerCtrl_new_3, 2264).
--define(wxFilePickerCtrl_Create, 2265).
--define(wxFilePickerCtrl_GetPath, 2266).
--define(wxFilePickerCtrl_SetPath, 2267).
--define(wxFilePickerCtrl_destroy, 2268).
--define(wxDirPickerCtrl_new_0, 2269).
--define(wxDirPickerCtrl_new_3, 2270).
--define(wxDirPickerCtrl_Create, 2271).
--define(wxDirPickerCtrl_GetPath, 2272).
--define(wxDirPickerCtrl_SetPath, 2273).
--define(wxDirPickerCtrl_destroy, 2274).
--define(wxColourPickerCtrl_new_0, 2275).
--define(wxColourPickerCtrl_new_3, 2276).
--define(wxColourPickerCtrl_Create, 2277).
--define(wxColourPickerCtrl_GetColour, 2278).
--define(wxColourPickerCtrl_SetColour_1_1, 2279).
--define(wxColourPickerCtrl_SetColour_1_0, 2280).
--define(wxColourPickerCtrl_destroy, 2281).
--define(wxDatePickerCtrl_new_0, 2282).
--define(wxDatePickerCtrl_new_3, 2283).
--define(wxDatePickerCtrl_GetRange, 2284).
--define(wxDatePickerCtrl_GetValue, 2285).
--define(wxDatePickerCtrl_SetRange, 2286).
--define(wxDatePickerCtrl_SetValue, 2287).
--define(wxDatePickerCtrl_destroy, 2288).
--define(wxFontPickerCtrl_new_0, 2289).
--define(wxFontPickerCtrl_new_3, 2290).
--define(wxFontPickerCtrl_Create, 2291).
--define(wxFontPickerCtrl_GetSelectedFont, 2292).
--define(wxFontPickerCtrl_SetSelectedFont, 2293).
--define(wxFontPickerCtrl_GetMaxPointSize, 2294).
--define(wxFontPickerCtrl_SetMaxPointSize, 2295).
--define(wxFontPickerCtrl_destroy, 2296).
--define(wxFindReplaceDialog_new_0, 2299).
--define(wxFindReplaceDialog_new_4, 2300).
--define(wxFindReplaceDialog_destruct, 2301).
--define(wxFindReplaceDialog_Create, 2302).
--define(wxFindReplaceDialog_GetData, 2303).
--define(wxFindReplaceData_new_0, 2304).
--define(wxFindReplaceData_new_1, 2305).
--define(wxFindReplaceData_GetFindString, 2306).
--define(wxFindReplaceData_GetReplaceString, 2307).
--define(wxFindReplaceData_GetFlags, 2308).
--define(wxFindReplaceData_SetFlags, 2309).
--define(wxFindReplaceData_SetFindString, 2310).
--define(wxFindReplaceData_SetReplaceString, 2311).
--define(wxFindReplaceData_destroy, 2312).
--define(wxMultiChoiceDialog_new_0, 2313).
--define(wxMultiChoiceDialog_new_5, 2315).
--define(wxMultiChoiceDialog_GetSelections, 2316).
--define(wxMultiChoiceDialog_SetSelections, 2317).
--define(wxMultiChoiceDialog_destroy, 2318).
--define(wxSingleChoiceDialog_new_0, 2319).
--define(wxSingleChoiceDialog_new_5, 2321).
--define(wxSingleChoiceDialog_GetSelection, 2322).
--define(wxSingleChoiceDialog_GetStringSelection, 2323).
--define(wxSingleChoiceDialog_SetSelection, 2324).
--define(wxSingleChoiceDialog_destroy, 2325).
--define(wxTextEntryDialog_new, 2326).
--define(wxTextEntryDialog_GetValue, 2327).
--define(wxTextEntryDialog_SetValue, 2328).
--define(wxTextEntryDialog_destroy, 2329).
--define(wxPasswordEntryDialog_new, 2330).
--define(wxPasswordEntryDialog_destroy, 2331).
--define(wxFontData_new_0, 2332).
--define(wxFontData_new_1, 2333).
--define(wxFontData_destruct, 2334).
--define(wxFontData_EnableEffects, 2335).
--define(wxFontData_GetAllowSymbols, 2336).
--define(wxFontData_GetColour, 2337).
--define(wxFontData_GetChosenFont, 2338).
--define(wxFontData_GetEnableEffects, 2339).
--define(wxFontData_GetInitialFont, 2340).
--define(wxFontData_GetShowHelp, 2341).
--define(wxFontData_SetAllowSymbols, 2342).
--define(wxFontData_SetChosenFont, 2343).
--define(wxFontData_SetColour, 2344).
--define(wxFontData_SetInitialFont, 2345).
--define(wxFontData_SetRange, 2346).
--define(wxFontData_SetShowHelp, 2347).
--define(wxFontDialog_new_0, 2351).
--define(wxFontDialog_new_2, 2353).
--define(wxFontDialog_Create, 2355).
--define(wxFontDialog_GetFontData, 2356).
--define(wxFontDialog_destroy, 2358).
--define(wxProgressDialog_new, 2359).
--define(wxProgressDialog_destruct, 2360).
--define(wxProgressDialog_Resume, 2361).
--define(wxProgressDialog_Update_2, 2362).
--define(wxProgressDialog_Update_0, 2363).
--define(wxMessageDialog_new, 2364).
--define(wxMessageDialog_destruct, 2365).
--define(wxPageSetupDialog_new, 2366).
--define(wxPageSetupDialog_destruct, 2367).
--define(wxPageSetupDialog_GetPageSetupData, 2368).
--define(wxPageSetupDialog_ShowModal, 2369).
--define(wxPageSetupDialogData_new_0, 2370).
--define(wxPageSetupDialogData_new_1_0, 2371).
--define(wxPageSetupDialogData_new_1_1, 2372).
--define(wxPageSetupDialogData_destruct, 2373).
--define(wxPageSetupDialogData_EnableHelp, 2374).
--define(wxPageSetupDialogData_EnableMargins, 2375).
--define(wxPageSetupDialogData_EnableOrientation, 2376).
--define(wxPageSetupDialogData_EnablePaper, 2377).
--define(wxPageSetupDialogData_EnablePrinter, 2378).
--define(wxPageSetupDialogData_GetDefaultMinMargins, 2379).
--define(wxPageSetupDialogData_GetEnableMargins, 2380).
--define(wxPageSetupDialogData_GetEnableOrientation, 2381).
--define(wxPageSetupDialogData_GetEnablePaper, 2382).
--define(wxPageSetupDialogData_GetEnablePrinter, 2383).
--define(wxPageSetupDialogData_GetEnableHelp, 2384).
--define(wxPageSetupDialogData_GetDefaultInfo, 2385).
--define(wxPageSetupDialogData_GetMarginTopLeft, 2386).
--define(wxPageSetupDialogData_GetMarginBottomRight, 2387).
--define(wxPageSetupDialogData_GetMinMarginTopLeft, 2388).
--define(wxPageSetupDialogData_GetMinMarginBottomRight, 2389).
--define(wxPageSetupDialogData_GetPaperId, 2390).
--define(wxPageSetupDialogData_GetPaperSize, 2391).
--define(wxPageSetupDialogData_GetPrintData, 2393).
--define(wxPageSetupDialogData_IsOk, 2394).
--define(wxPageSetupDialogData_SetDefaultInfo, 2395).
--define(wxPageSetupDialogData_SetDefaultMinMargins, 2396).
--define(wxPageSetupDialogData_SetMarginTopLeft, 2397).
--define(wxPageSetupDialogData_SetMarginBottomRight, 2398).
--define(wxPageSetupDialogData_SetMinMarginTopLeft, 2399).
--define(wxPageSetupDialogData_SetMinMarginBottomRight, 2400).
--define(wxPageSetupDialogData_SetPaperId, 2401).
--define(wxPageSetupDialogData_SetPaperSize_1_1, 2402).
--define(wxPageSetupDialogData_SetPaperSize_1_0, 2403).
--define(wxPageSetupDialogData_SetPrintData, 2404).
--define(wxPrintDialog_new_2_0, 2405).
--define(wxPrintDialog_new_2_1, 2406).
--define(wxPrintDialog_destruct, 2407).
--define(wxPrintDialog_GetPrintDialogData, 2408).
--define(wxPrintDialog_GetPrintDC, 2409).
--define(wxPrintDialogData_new_0, 2410).
--define(wxPrintDialogData_new_1_1, 2411).
--define(wxPrintDialogData_new_1_0, 2412).
--define(wxPrintDialogData_destruct, 2413).
--define(wxPrintDialogData_EnableHelp, 2414).
--define(wxPrintDialogData_EnablePageNumbers, 2415).
--define(wxPrintDialogData_EnablePrintToFile, 2416).
--define(wxPrintDialogData_EnableSelection, 2417).
--define(wxPrintDialogData_GetAllPages, 2418).
--define(wxPrintDialogData_GetCollate, 2419).
--define(wxPrintDialogData_GetFromPage, 2420).
--define(wxPrintDialogData_GetMaxPage, 2421).
--define(wxPrintDialogData_GetMinPage, 2422).
--define(wxPrintDialogData_GetNoCopies, 2423).
--define(wxPrintDialogData_GetPrintData, 2424).
--define(wxPrintDialogData_GetPrintToFile, 2425).
--define(wxPrintDialogData_GetSelection, 2426).
--define(wxPrintDialogData_GetToPage, 2427).
--define(wxPrintDialogData_IsOk, 2428).
--define(wxPrintDialogData_SetCollate, 2429).
--define(wxPrintDialogData_SetFromPage, 2430).
--define(wxPrintDialogData_SetMaxPage, 2431).
--define(wxPrintDialogData_SetMinPage, 2432).
--define(wxPrintDialogData_SetNoCopies, 2433).
--define(wxPrintDialogData_SetPrintData, 2434).
--define(wxPrintDialogData_SetPrintToFile, 2435).
--define(wxPrintDialogData_SetSelection, 2436).
--define(wxPrintDialogData_SetToPage, 2437).
--define(wxPrintData_new_0, 2438).
--define(wxPrintData_new_1, 2439).
--define(wxPrintData_destruct, 2440).
--define(wxPrintData_GetCollate, 2441).
--define(wxPrintData_GetBin, 2442).
--define(wxPrintData_GetColour, 2443).
--define(wxPrintData_GetDuplex, 2444).
--define(wxPrintData_GetNoCopies, 2445).
--define(wxPrintData_GetOrientation, 2446).
--define(wxPrintData_GetPaperId, 2447).
--define(wxPrintData_GetPrinterName, 2448).
--define(wxPrintData_GetQuality, 2449).
--define(wxPrintData_IsOk, 2450).
--define(wxPrintData_SetBin, 2451).
--define(wxPrintData_SetCollate, 2452).
--define(wxPrintData_SetColour, 2453).
--define(wxPrintData_SetDuplex, 2454).
--define(wxPrintData_SetNoCopies, 2455).
--define(wxPrintData_SetOrientation, 2456).
--define(wxPrintData_SetPaperId, 2457).
--define(wxPrintData_SetPrinterName, 2458).
--define(wxPrintData_SetQuality, 2459).
--define(wxPrintPreview_new_2, 2462).
--define(wxPrintPreview_new_3, 2463).
--define(wxPrintPreview_destruct, 2465).
--define(wxPrintPreview_GetCanvas, 2466).
--define(wxPrintPreview_GetCurrentPage, 2467).
--define(wxPrintPreview_GetFrame, 2468).
--define(wxPrintPreview_GetMaxPage, 2469).
--define(wxPrintPreview_GetMinPage, 2470).
--define(wxPrintPreview_GetPrintout, 2471).
--define(wxPrintPreview_GetPrintoutForPrinting, 2472).
--define(wxPrintPreview_IsOk, 2473).
--define(wxPrintPreview_PaintPage, 2474).
--define(wxPrintPreview_Print, 2475).
--define(wxPrintPreview_RenderPage, 2476).
--define(wxPrintPreview_SetCanvas, 2477).
--define(wxPrintPreview_SetCurrentPage, 2478).
--define(wxPrintPreview_SetFrame, 2479).
--define(wxPrintPreview_SetPrintout, 2480).
--define(wxPrintPreview_SetZoom, 2481).
--define(wxPreviewFrame_new, 2482).
--define(wxPreviewFrame_destruct, 2483).
--define(wxPreviewFrame_CreateControlBar, 2484).
--define(wxPreviewFrame_CreateCanvas, 2485).
--define(wxPreviewFrame_Initialize, 2486).
--define(wxPreviewFrame_OnCloseWindow, 2487).
--define(wxPreviewControlBar_new, 2488).
--define(wxPreviewControlBar_destruct, 2489).
--define(wxPreviewControlBar_CreateButtons, 2490).
--define(wxPreviewControlBar_GetPrintPreview, 2491).
--define(wxPreviewControlBar_GetZoomControl, 2492).
--define(wxPreviewControlBar_SetZoomControl, 2493).
--define(wxPrinter_new, 2495).
--define(wxPrinter_CreateAbortWindow, 2496).
--define(wxPrinter_GetAbort, 2497).
--define(wxPrinter_GetLastError, 2498).
--define(wxPrinter_GetPrintDialogData, 2499).
--define(wxPrinter_Print, 2500).
--define(wxPrinter_PrintDialog, 2501).
--define(wxPrinter_ReportError, 2502).
--define(wxPrinter_Setup, 2503).
--define(wxPrinter_destroy, 2504).
--define(wxXmlResource_new_1, 2505).
--define(wxXmlResource_new_2, 2506).
--define(wxXmlResource_destruct, 2507).
--define(wxXmlResource_AttachUnknownControl, 2508).
--define(wxXmlResource_ClearHandlers, 2509).
--define(wxXmlResource_CompareVersion, 2510).
--define(wxXmlResource_Get, 2511).
--define(wxXmlResource_GetFlags, 2512).
--define(wxXmlResource_GetVersion, 2513).
--define(wxXmlResource_GetXRCID, 2514).
--define(wxXmlResource_InitAllHandlers, 2515).
--define(wxXmlResource_Load, 2516).
--define(wxXmlResource_LoadBitmap, 2517).
--define(wxXmlResource_LoadDialog_2, 2518).
--define(wxXmlResource_LoadDialog_3, 2519).
--define(wxXmlResource_LoadFrame_2, 2520).
--define(wxXmlResource_LoadFrame_3, 2521).
--define(wxXmlResource_LoadIcon, 2522).
--define(wxXmlResource_LoadMenu, 2523).
--define(wxXmlResource_LoadMenuBar_2, 2524).
--define(wxXmlResource_LoadMenuBar_1, 2525).
--define(wxXmlResource_LoadPanel_2, 2526).
--define(wxXmlResource_LoadPanel_3, 2527).
--define(wxXmlResource_LoadToolBar, 2528).
--define(wxXmlResource_Set, 2529).
--define(wxXmlResource_SetFlags, 2530).
--define(wxXmlResource_Unload, 2531).
--define(wxXmlResource_xrcctrl, 2532).
--define(wxHtmlEasyPrinting_new, 2533).
--define(wxHtmlEasyPrinting_destruct, 2534).
--define(wxHtmlEasyPrinting_GetPrintData, 2535).
--define(wxHtmlEasyPrinting_GetPageSetupData, 2536).
--define(wxHtmlEasyPrinting_PreviewFile, 2537).
--define(wxHtmlEasyPrinting_PreviewText, 2538).
--define(wxHtmlEasyPrinting_PrintFile, 2539).
--define(wxHtmlEasyPrinting_PrintText, 2540).
--define(wxHtmlEasyPrinting_PageSetup, 2541).
--define(wxHtmlEasyPrinting_SetFonts, 2542).
--define(wxHtmlEasyPrinting_SetHeader, 2543).
--define(wxHtmlEasyPrinting_SetFooter, 2544).
--define(wxGLCanvas_new_2, 2546).
--define(wxGLCanvas_new_3_1, 2547).
--define(wxGLCanvas_new_3_0, 2548).
--define(wxGLCanvas_GetContext, 2549).
--define(wxGLCanvas_SetCurrent, 2551).
--define(wxGLCanvas_SwapBuffers, 2552).
--define(wxGLCanvas_destroy, 2553).
--define(wxAuiManager_new, 2554).
--define(wxAuiManager_destruct, 2555).
--define(wxAuiManager_AddPane_2_1, 2556).
--define(wxAuiManager_AddPane_3, 2557).
--define(wxAuiManager_AddPane_2_0, 2558).
--define(wxAuiManager_DetachPane, 2559).
--define(wxAuiManager_GetAllPanes, 2560).
--define(wxAuiManager_GetArtProvider, 2561).
--define(wxAuiManager_GetDockSizeConstraint, 2562).
--define(wxAuiManager_GetFlags, 2563).
--define(wxAuiManager_GetManagedWindow, 2564).
--define(wxAuiManager_GetManager, 2565).
--define(wxAuiManager_GetPane_1_1, 2566).
--define(wxAuiManager_GetPane_1_0, 2567).
--define(wxAuiManager_HideHint, 2568).
--define(wxAuiManager_InsertPane, 2569).
--define(wxAuiManager_LoadPaneInfo, 2570).
--define(wxAuiManager_LoadPerspective, 2571).
--define(wxAuiManager_SavePaneInfo, 2572).
--define(wxAuiManager_SavePerspective, 2573).
--define(wxAuiManager_SetArtProvider, 2574).
--define(wxAuiManager_SetDockSizeConstraint, 2575).
--define(wxAuiManager_SetFlags, 2576).
--define(wxAuiManager_SetManagedWindow, 2577).
--define(wxAuiManager_ShowHint, 2578).
--define(wxAuiManager_UnInit, 2579).
--define(wxAuiManager_Update, 2580).
--define(wxAuiPaneInfo_new_0, 2581).
--define(wxAuiPaneInfo_new_1, 2582).
--define(wxAuiPaneInfo_destruct, 2583).
--define(wxAuiPaneInfo_BestSize_1, 2584).
--define(wxAuiPaneInfo_BestSize_2, 2585).
--define(wxAuiPaneInfo_Bottom, 2586).
--define(wxAuiPaneInfo_BottomDockable, 2587).
--define(wxAuiPaneInfo_Caption, 2588).
--define(wxAuiPaneInfo_CaptionVisible, 2589).
--define(wxAuiPaneInfo_Centre, 2590).
--define(wxAuiPaneInfo_CentrePane, 2591).
--define(wxAuiPaneInfo_CloseButton, 2592).
--define(wxAuiPaneInfo_DefaultPane, 2593).
--define(wxAuiPaneInfo_DestroyOnClose, 2594).
--define(wxAuiPaneInfo_Direction, 2595).
--define(wxAuiPaneInfo_Dock, 2596).
--define(wxAuiPaneInfo_Dockable, 2597).
--define(wxAuiPaneInfo_Fixed, 2598).
--define(wxAuiPaneInfo_Float, 2599).
--define(wxAuiPaneInfo_Floatable, 2600).
--define(wxAuiPaneInfo_FloatingPosition_1, 2601).
--define(wxAuiPaneInfo_FloatingPosition_2, 2602).
--define(wxAuiPaneInfo_FloatingSize_1, 2603).
--define(wxAuiPaneInfo_FloatingSize_2, 2604).
--define(wxAuiPaneInfo_Gripper, 2605).
--define(wxAuiPaneInfo_GripperTop, 2606).
--define(wxAuiPaneInfo_HasBorder, 2607).
--define(wxAuiPaneInfo_HasCaption, 2608).
--define(wxAuiPaneInfo_HasCloseButton, 2609).
--define(wxAuiPaneInfo_HasFlag, 2610).
--define(wxAuiPaneInfo_HasGripper, 2611).
--define(wxAuiPaneInfo_HasGripperTop, 2612).
--define(wxAuiPaneInfo_HasMaximizeButton, 2613).
--define(wxAuiPaneInfo_HasMinimizeButton, 2614).
--define(wxAuiPaneInfo_HasPinButton, 2615).
--define(wxAuiPaneInfo_Hide, 2616).
--define(wxAuiPaneInfo_IsBottomDockable, 2617).
--define(wxAuiPaneInfo_IsDocked, 2618).
--define(wxAuiPaneInfo_IsFixed, 2619).
--define(wxAuiPaneInfo_IsFloatable, 2620).
--define(wxAuiPaneInfo_IsFloating, 2621).
--define(wxAuiPaneInfo_IsLeftDockable, 2622).
--define(wxAuiPaneInfo_IsMovable, 2623).
--define(wxAuiPaneInfo_IsOk, 2624).
--define(wxAuiPaneInfo_IsResizable, 2625).
--define(wxAuiPaneInfo_IsRightDockable, 2626).
--define(wxAuiPaneInfo_IsShown, 2627).
--define(wxAuiPaneInfo_IsToolbar, 2628).
--define(wxAuiPaneInfo_IsTopDockable, 2629).
--define(wxAuiPaneInfo_Layer, 2630).
--define(wxAuiPaneInfo_Left, 2631).
--define(wxAuiPaneInfo_LeftDockable, 2632).
--define(wxAuiPaneInfo_MaxSize_1, 2633).
--define(wxAuiPaneInfo_MaxSize_2, 2634).
--define(wxAuiPaneInfo_MaximizeButton, 2635).
--define(wxAuiPaneInfo_MinSize_1, 2636).
--define(wxAuiPaneInfo_MinSize_2, 2637).
--define(wxAuiPaneInfo_MinimizeButton, 2638).
--define(wxAuiPaneInfo_Movable, 2639).
--define(wxAuiPaneInfo_Name, 2640).
--define(wxAuiPaneInfo_PaneBorder, 2641).
--define(wxAuiPaneInfo_PinButton, 2642).
--define(wxAuiPaneInfo_Position, 2643).
--define(wxAuiPaneInfo_Resizable, 2644).
--define(wxAuiPaneInfo_Right, 2645).
--define(wxAuiPaneInfo_RightDockable, 2646).
--define(wxAuiPaneInfo_Row, 2647).
--define(wxAuiPaneInfo_SafeSet, 2648).
--define(wxAuiPaneInfo_SetFlag, 2649).
--define(wxAuiPaneInfo_Show, 2650).
--define(wxAuiPaneInfo_ToolbarPane, 2651).
--define(wxAuiPaneInfo_Top, 2652).
--define(wxAuiPaneInfo_TopDockable, 2653).
--define(wxAuiPaneInfo_Window, 2654).
--define(wxAuiPaneInfo_GetWindow, 2655).
--define(wxAuiPaneInfo_GetFrame, 2656).
--define(wxAuiPaneInfo_GetDirection, 2657).
--define(wxAuiPaneInfo_GetLayer, 2658).
--define(wxAuiPaneInfo_GetRow, 2659).
--define(wxAuiPaneInfo_GetPosition, 2660).
--define(wxAuiPaneInfo_GetFloatingPosition, 2661).
--define(wxAuiPaneInfo_GetFloatingSize, 2662).
--define(wxAuiNotebook_new_0, 2663).
--define(wxAuiNotebook_new_2, 2664).
--define(wxAuiNotebook_AddPage, 2665).
--define(wxAuiNotebook_Create, 2666).
--define(wxAuiNotebook_DeletePage, 2667).
--define(wxAuiNotebook_GetArtProvider, 2668).
--define(wxAuiNotebook_GetPage, 2669).
--define(wxAuiNotebook_GetPageBitmap, 2670).
--define(wxAuiNotebook_GetPageCount, 2671).
--define(wxAuiNotebook_GetPageIndex, 2672).
--define(wxAuiNotebook_GetPageText, 2673).
--define(wxAuiNotebook_GetSelection, 2674).
--define(wxAuiNotebook_InsertPage, 2675).
--define(wxAuiNotebook_RemovePage, 2676).
--define(wxAuiNotebook_SetArtProvider, 2677).
--define(wxAuiNotebook_SetFont, 2678).
--define(wxAuiNotebook_SetPageBitmap, 2679).
--define(wxAuiNotebook_SetPageText, 2680).
--define(wxAuiNotebook_SetSelection, 2681).
--define(wxAuiNotebook_SetTabCtrlHeight, 2682).
--define(wxAuiNotebook_SetUniformBitmapSize, 2683).
--define(wxAuiNotebook_destroy, 2684).
--define(wxAuiTabArt_SetFlags, 2685).
--define(wxAuiTabArt_SetMeasuringFont, 2686).
--define(wxAuiTabArt_SetNormalFont, 2687).
--define(wxAuiTabArt_SetSelectedFont, 2688).
--define(wxAuiTabArt_SetColour, 2689).
--define(wxAuiTabArt_SetActiveColour, 2690).
--define(wxAuiDockArt_GetColour, 2691).
--define(wxAuiDockArt_GetFont, 2692).
--define(wxAuiDockArt_GetMetric, 2693).
--define(wxAuiDockArt_SetColour, 2694).
--define(wxAuiDockArt_SetFont, 2695).
--define(wxAuiDockArt_SetMetric, 2696).
--define(wxAuiSimpleTabArt_new, 2697).
--define(wxAuiSimpleTabArt_destroy, 2698).
--define(wxMDIParentFrame_new_0, 2699).
--define(wxMDIParentFrame_new_4, 2700).
--define(wxMDIParentFrame_destruct, 2701).
--define(wxMDIParentFrame_ActivateNext, 2702).
--define(wxMDIParentFrame_ActivatePrevious, 2703).
--define(wxMDIParentFrame_ArrangeIcons, 2704).
--define(wxMDIParentFrame_Cascade, 2705).
--define(wxMDIParentFrame_Create, 2706).
--define(wxMDIParentFrame_GetActiveChild, 2707).
--define(wxMDIParentFrame_GetClientWindow, 2708).
--define(wxMDIParentFrame_Tile, 2709).
--define(wxMDIChildFrame_new_0, 2710).
--define(wxMDIChildFrame_new_4, 2711).
--define(wxMDIChildFrame_destruct, 2712).
--define(wxMDIChildFrame_Activate, 2713).
--define(wxMDIChildFrame_Create, 2714).
--define(wxMDIChildFrame_Maximize, 2715).
--define(wxMDIChildFrame_Restore, 2716).
--define(wxMDIClientWindow_new_0, 2717).
--define(wxMDIClientWindow_new_2, 2718).
--define(wxMDIClientWindow_destruct, 2719).
--define(wxMDIClientWindow_CreateClient, 2720).
--define(wxLayoutAlgorithm_new, 2721).
--define(wxLayoutAlgorithm_LayoutFrame, 2722).
--define(wxLayoutAlgorithm_LayoutMDIFrame, 2723).
--define(wxLayoutAlgorithm_LayoutWindow, 2724).
--define(wxLayoutAlgorithm_destroy, 2725).
--define(wxEvent_GetId, 2726).
--define(wxEvent_GetSkipped, 2727).
--define(wxEvent_GetTimestamp, 2728).
--define(wxEvent_IsCommandEvent, 2729).
--define(wxEvent_ResumePropagation, 2730).
--define(wxEvent_ShouldPropagate, 2731).
--define(wxEvent_Skip, 2732).
--define(wxEvent_StopPropagation, 2733).
--define(wxCommandEvent_getClientData, 2734).
--define(wxCommandEvent_GetExtraLong, 2735).
--define(wxCommandEvent_GetInt, 2736).
--define(wxCommandEvent_GetSelection, 2737).
--define(wxCommandEvent_GetString, 2738).
--define(wxCommandEvent_IsChecked, 2739).
--define(wxCommandEvent_IsSelection, 2740).
--define(wxCommandEvent_SetInt, 2741).
--define(wxCommandEvent_SetString, 2742).
--define(wxScrollEvent_GetOrientation, 2743).
--define(wxScrollEvent_GetPosition, 2744).
--define(wxScrollWinEvent_GetOrientation, 2745).
--define(wxScrollWinEvent_GetPosition, 2746).
--define(wxMouseEvent_AltDown, 2747).
--define(wxMouseEvent_Button, 2748).
--define(wxMouseEvent_ButtonDClick, 2749).
--define(wxMouseEvent_ButtonDown, 2750).
--define(wxMouseEvent_ButtonUp, 2751).
--define(wxMouseEvent_CmdDown, 2752).
--define(wxMouseEvent_ControlDown, 2753).
--define(wxMouseEvent_Dragging, 2754).
--define(wxMouseEvent_Entering, 2755).
--define(wxMouseEvent_GetButton, 2756).
--define(wxMouseEvent_GetPosition, 2759).
--define(wxMouseEvent_GetLogicalPosition, 2760).
--define(wxMouseEvent_GetLinesPerAction, 2761).
--define(wxMouseEvent_GetWheelRotation, 2762).
--define(wxMouseEvent_GetWheelDelta, 2763).
--define(wxMouseEvent_GetX, 2764).
--define(wxMouseEvent_GetY, 2765).
--define(wxMouseEvent_IsButton, 2766).
--define(wxMouseEvent_IsPageScroll, 2767).
--define(wxMouseEvent_Leaving, 2768).
--define(wxMouseEvent_LeftDClick, 2769).
--define(wxMouseEvent_LeftDown, 2770).
--define(wxMouseEvent_LeftIsDown, 2771).
--define(wxMouseEvent_LeftUp, 2772).
--define(wxMouseEvent_MetaDown, 2773).
--define(wxMouseEvent_MiddleDClick, 2774).
--define(wxMouseEvent_MiddleDown, 2775).
--define(wxMouseEvent_MiddleIsDown, 2776).
--define(wxMouseEvent_MiddleUp, 2777).
--define(wxMouseEvent_Moving, 2778).
--define(wxMouseEvent_RightDClick, 2779).
--define(wxMouseEvent_RightDown, 2780).
--define(wxMouseEvent_RightIsDown, 2781).
--define(wxMouseEvent_RightUp, 2782).
--define(wxMouseEvent_ShiftDown, 2783).
--define(wxSetCursorEvent_GetCursor, 2784).
--define(wxSetCursorEvent_GetX, 2785).
--define(wxSetCursorEvent_GetY, 2786).
--define(wxSetCursorEvent_HasCursor, 2787).
--define(wxSetCursorEvent_SetCursor, 2788).
--define(wxKeyEvent_AltDown, 2789).
--define(wxKeyEvent_CmdDown, 2790).
--define(wxKeyEvent_ControlDown, 2791).
--define(wxKeyEvent_GetKeyCode, 2792).
--define(wxKeyEvent_GetModifiers, 2793).
--define(wxKeyEvent_GetPosition, 2796).
--define(wxKeyEvent_GetRawKeyCode, 2797).
--define(wxKeyEvent_GetRawKeyFlags, 2798).
--define(wxKeyEvent_GetUnicodeKey, 2799).
--define(wxKeyEvent_GetX, 2800).
--define(wxKeyEvent_GetY, 2801).
--define(wxKeyEvent_HasModifiers, 2802).
--define(wxKeyEvent_MetaDown, 2803).
--define(wxKeyEvent_ShiftDown, 2804).
--define(wxSizeEvent_GetSize, 2805).
--define(wxMoveEvent_GetPosition, 2806).
--define(wxEraseEvent_GetDC, 2807).
--define(wxFocusEvent_GetWindow, 2808).
--define(wxChildFocusEvent_GetWindow, 2809).
--define(wxMenuEvent_GetMenu, 2810).
--define(wxMenuEvent_GetMenuId, 2811).
--define(wxMenuEvent_IsPopup, 2812).
--define(wxCloseEvent_CanVeto, 2813).
--define(wxCloseEvent_GetLoggingOff, 2814).
--define(wxCloseEvent_SetCanVeto, 2815).
--define(wxCloseEvent_SetLoggingOff, 2816).
--define(wxCloseEvent_Veto, 2817).
--define(wxShowEvent_SetShow, 2818).
--define(wxShowEvent_GetShow, 2819).
--define(wxIconizeEvent_Iconized, 2820).
--define(wxJoystickEvent_ButtonDown, 2821).
--define(wxJoystickEvent_ButtonIsDown, 2822).
--define(wxJoystickEvent_ButtonUp, 2823).
--define(wxJoystickEvent_GetButtonChange, 2824).
--define(wxJoystickEvent_GetButtonState, 2825).
--define(wxJoystickEvent_GetJoystick, 2826).
--define(wxJoystickEvent_GetPosition, 2827).
--define(wxJoystickEvent_GetZPosition, 2828).
--define(wxJoystickEvent_IsButton, 2829).
--define(wxJoystickEvent_IsMove, 2830).
--define(wxJoystickEvent_IsZMove, 2831).
--define(wxUpdateUIEvent_CanUpdate, 2832).
--define(wxUpdateUIEvent_Check, 2833).
--define(wxUpdateUIEvent_Enable, 2834).
--define(wxUpdateUIEvent_Show, 2835).
--define(wxUpdateUIEvent_GetChecked, 2836).
--define(wxUpdateUIEvent_GetEnabled, 2837).
--define(wxUpdateUIEvent_GetShown, 2838).
--define(wxUpdateUIEvent_GetSetChecked, 2839).
--define(wxUpdateUIEvent_GetSetEnabled, 2840).
--define(wxUpdateUIEvent_GetSetShown, 2841).
--define(wxUpdateUIEvent_GetSetText, 2842).
--define(wxUpdateUIEvent_GetText, 2843).
--define(wxUpdateUIEvent_GetMode, 2844).
--define(wxUpdateUIEvent_GetUpdateInterval, 2845).
--define(wxUpdateUIEvent_ResetUpdateTime, 2846).
--define(wxUpdateUIEvent_SetMode, 2847).
--define(wxUpdateUIEvent_SetText, 2848).
--define(wxUpdateUIEvent_SetUpdateInterval, 2849).
--define(wxMouseCaptureChangedEvent_GetCapturedWindow, 2850).
--define(wxPaletteChangedEvent_SetChangedWindow, 2851).
--define(wxPaletteChangedEvent_GetChangedWindow, 2852).
--define(wxQueryNewPaletteEvent_SetPaletteRealized, 2853).
--define(wxQueryNewPaletteEvent_GetPaletteRealized, 2854).
--define(wxNavigationKeyEvent_GetDirection, 2855).
--define(wxNavigationKeyEvent_SetDirection, 2856).
--define(wxNavigationKeyEvent_IsWindowChange, 2857).
--define(wxNavigationKeyEvent_SetWindowChange, 2858).
--define(wxNavigationKeyEvent_IsFromTab, 2859).
--define(wxNavigationKeyEvent_SetFromTab, 2860).
--define(wxNavigationKeyEvent_GetCurrentFocus, 2861).
--define(wxNavigationKeyEvent_SetCurrentFocus, 2862).
--define(wxHelpEvent_GetOrigin, 2863).
--define(wxHelpEvent_GetPosition, 2864).
--define(wxHelpEvent_SetOrigin, 2865).
--define(wxHelpEvent_SetPosition, 2866).
--define(wxContextMenuEvent_GetPosition, 2867).
--define(wxContextMenuEvent_SetPosition, 2868).
--define(wxIdleEvent_CanSend, 2869).
--define(wxIdleEvent_GetMode, 2870).
--define(wxIdleEvent_RequestMore, 2871).
--define(wxIdleEvent_MoreRequested, 2872).
--define(wxIdleEvent_SetMode, 2873).
--define(wxGridEvent_AltDown, 2874).
--define(wxGridEvent_ControlDown, 2875).
--define(wxGridEvent_GetCol, 2876).
--define(wxGridEvent_GetPosition, 2877).
--define(wxGridEvent_GetRow, 2878).
--define(wxGridEvent_MetaDown, 2879).
--define(wxGridEvent_Selecting, 2880).
--define(wxGridEvent_ShiftDown, 2881).
--define(wxNotifyEvent_Allow, 2882).
--define(wxNotifyEvent_IsAllowed, 2883).
--define(wxNotifyEvent_Veto, 2884).
--define(wxSashEvent_GetEdge, 2885).
--define(wxSashEvent_GetDragRect, 2886).
--define(wxSashEvent_GetDragStatus, 2887).
--define(wxListEvent_GetCacheFrom, 2888).
--define(wxListEvent_GetCacheTo, 2889).
--define(wxListEvent_GetKeyCode, 2890).
--define(wxListEvent_GetIndex, 2891).
--define(wxListEvent_GetColumn, 2892).
--define(wxListEvent_GetPoint, 2893).
--define(wxListEvent_GetLabel, 2894).
--define(wxListEvent_GetText, 2895).
--define(wxListEvent_GetImage, 2896).
--define(wxListEvent_GetData, 2897).
--define(wxListEvent_GetMask, 2898).
--define(wxListEvent_GetItem, 2899).
--define(wxListEvent_IsEditCancelled, 2900).
--define(wxDateEvent_GetDate, 2901).
--define(wxCalendarEvent_GetWeekDay, 2902).
--define(wxFileDirPickerEvent_GetPath, 2903).
--define(wxColourPickerEvent_GetColour, 2904).
--define(wxFontPickerEvent_GetFont, 2905).
--define(wxStyledTextEvent_GetPosition, 2906).
--define(wxStyledTextEvent_GetKey, 2907).
--define(wxStyledTextEvent_GetModifiers, 2908).
--define(wxStyledTextEvent_GetModificationType, 2909).
--define(wxStyledTextEvent_GetText, 2910).
--define(wxStyledTextEvent_GetLength, 2911).
--define(wxStyledTextEvent_GetLinesAdded, 2912).
--define(wxStyledTextEvent_GetLine, 2913).
--define(wxStyledTextEvent_GetFoldLevelNow, 2914).
--define(wxStyledTextEvent_GetFoldLevelPrev, 2915).
--define(wxStyledTextEvent_GetMargin, 2916).
--define(wxStyledTextEvent_GetMessage, 2917).
--define(wxStyledTextEvent_GetWParam, 2918).
--define(wxStyledTextEvent_GetLParam, 2919).
--define(wxStyledTextEvent_GetListType, 2920).
--define(wxStyledTextEvent_GetX, 2921).
--define(wxStyledTextEvent_GetY, 2922).
--define(wxStyledTextEvent_GetDragText, 2923).
--define(wxStyledTextEvent_GetDragAllowMove, 2924).
--define(wxStyledTextEvent_GetDragResult, 2925).
--define(wxStyledTextEvent_GetShift, 2926).
--define(wxStyledTextEvent_GetControl, 2927).
--define(wxStyledTextEvent_GetAlt, 2928).
--define(utils_wxGetKeyState, 2929).
--define(utils_wxGetMousePosition, 2930).
--define(utils_wxGetMouseState, 2931).
--define(utils_wxSetDetectableAutoRepeat, 2932).
--define(utils_wxBell, 2933).
--define(utils_wxFindMenuItemId, 2934).
--define(utils_wxGenericFindWindowAtPoint, 2935).
--define(utils_wxFindWindowAtPoint, 2936).
--define(utils_wxBeginBusyCursor, 2937).
--define(utils_wxEndBusyCursor, 2938).
--define(utils_wxIsBusy, 2939).
--define(utils_wxShutdown, 2940).
--define(utils_wxShell, 2941).
--define(utils_wxLaunchDefaultBrowser, 2942).
--define(utils_wxGetEmailAddress, 2943).
--define(utils_wxGetUserId, 2944).
--define(utils_wxGetHomeDir, 2945).
--define(utils_wxNewId, 2946).
--define(utils_wxRegisterId, 2947).
--define(utils_wxGetCurrentId, 2948).
--define(utils_wxGetOsDescription, 2949).
--define(utils_wxIsPlatformLittleEndian, 2950).
--define(utils_wxIsPlatform64Bit, 2951).
--define(gdicmn_wxDisplaySize, 2952).
--define(gdicmn_wxSetCursor, 2953).
--define(wxPrintout_new, 2954).
--define(wxPrintout_destruct, 2955).
--define(wxPrintout_GetDC, 2956).
--define(wxPrintout_GetPageSizeMM, 2957).
--define(wxPrintout_GetPageSizePixels, 2958).
--define(wxPrintout_GetPaperRectPixels, 2959).
--define(wxPrintout_GetPPIPrinter, 2960).
--define(wxPrintout_GetPPIScreen, 2961).
--define(wxPrintout_GetTitle, 2962).
--define(wxPrintout_IsPreview, 2963).
--define(wxPrintout_FitThisSizeToPaper, 2964).
--define(wxPrintout_FitThisSizeToPage, 2965).
--define(wxPrintout_FitThisSizeToPageMargins, 2966).
--define(wxPrintout_MapScreenSizeToPaper, 2967).
--define(wxPrintout_MapScreenSizeToPage, 2968).
--define(wxPrintout_MapScreenSizeToPageMargins, 2969).
--define(wxPrintout_MapScreenSizeToDevice, 2970).
--define(wxPrintout_GetLogicalPaperRect, 2971).
--define(wxPrintout_GetLogicalPageRect, 2972).
--define(wxPrintout_GetLogicalPageMarginsRect, 2973).
--define(wxPrintout_SetLogicalOrigin, 2974).
--define(wxPrintout_OffsetLogicalOrigin, 2975).
--define(wxStyledTextCtrl_new_2, 2976).
--define(wxStyledTextCtrl_new_0, 2977).
--define(wxStyledTextCtrl_destruct, 2978).
--define(wxStyledTextCtrl_Create, 2979).
--define(wxStyledTextCtrl_AddText, 2980).
--define(wxStyledTextCtrl_AddStyledText, 2981).
--define(wxStyledTextCtrl_InsertText, 2982).
--define(wxStyledTextCtrl_ClearAll, 2983).
--define(wxStyledTextCtrl_ClearDocumentStyle, 2984).
--define(wxStyledTextCtrl_GetLength, 2985).
--define(wxStyledTextCtrl_GetCharAt, 2986).
--define(wxStyledTextCtrl_GetCurrentPos, 2987).
--define(wxStyledTextCtrl_GetAnchor, 2988).
--define(wxStyledTextCtrl_GetStyleAt, 2989).
--define(wxStyledTextCtrl_Redo, 2990).
--define(wxStyledTextCtrl_SetUndoCollection, 2991).
--define(wxStyledTextCtrl_SelectAll, 2992).
--define(wxStyledTextCtrl_SetSavePoint, 2993).
--define(wxStyledTextCtrl_GetStyledText, 2994).
--define(wxStyledTextCtrl_CanRedo, 2995).
--define(wxStyledTextCtrl_MarkerLineFromHandle, 2996).
--define(wxStyledTextCtrl_MarkerDeleteHandle, 2997).
--define(wxStyledTextCtrl_GetUndoCollection, 2998).
--define(wxStyledTextCtrl_GetViewWhiteSpace, 2999).
--define(wxStyledTextCtrl_SetViewWhiteSpace, 3000).
--define(wxStyledTextCtrl_PositionFromPoint, 3001).
--define(wxStyledTextCtrl_PositionFromPointClose, 3002).
--define(wxStyledTextCtrl_GotoLine, 3003).
--define(wxStyledTextCtrl_GotoPos, 3004).
--define(wxStyledTextCtrl_SetAnchor, 3005).
--define(wxStyledTextCtrl_GetCurLine, 3006).
--define(wxStyledTextCtrl_GetEndStyled, 3007).
--define(wxStyledTextCtrl_ConvertEOLs, 3008).
--define(wxStyledTextCtrl_GetEOLMode, 3009).
--define(wxStyledTextCtrl_SetEOLMode, 3010).
--define(wxStyledTextCtrl_StartStyling, 3011).
--define(wxStyledTextCtrl_SetStyling, 3012).
--define(wxStyledTextCtrl_GetBufferedDraw, 3013).
--define(wxStyledTextCtrl_SetBufferedDraw, 3014).
--define(wxStyledTextCtrl_SetTabWidth, 3015).
--define(wxStyledTextCtrl_GetTabWidth, 3016).
--define(wxStyledTextCtrl_SetCodePage, 3017).
--define(wxStyledTextCtrl_MarkerDefine, 3018).
--define(wxStyledTextCtrl_MarkerSetForeground, 3019).
--define(wxStyledTextCtrl_MarkerSetBackground, 3020).
--define(wxStyledTextCtrl_MarkerAdd, 3021).
--define(wxStyledTextCtrl_MarkerDelete, 3022).
--define(wxStyledTextCtrl_MarkerDeleteAll, 3023).
--define(wxStyledTextCtrl_MarkerGet, 3024).
--define(wxStyledTextCtrl_MarkerNext, 3025).
--define(wxStyledTextCtrl_MarkerPrevious, 3026).
--define(wxStyledTextCtrl_MarkerDefineBitmap, 3027).
--define(wxStyledTextCtrl_MarkerAddSet, 3028).
--define(wxStyledTextCtrl_MarkerSetAlpha, 3029).
--define(wxStyledTextCtrl_SetMarginType, 3030).
--define(wxStyledTextCtrl_GetMarginType, 3031).
--define(wxStyledTextCtrl_SetMarginWidth, 3032).
--define(wxStyledTextCtrl_GetMarginWidth, 3033).
--define(wxStyledTextCtrl_SetMarginMask, 3034).
--define(wxStyledTextCtrl_GetMarginMask, 3035).
--define(wxStyledTextCtrl_SetMarginSensitive, 3036).
--define(wxStyledTextCtrl_GetMarginSensitive, 3037).
--define(wxStyledTextCtrl_StyleClearAll, 3038).
--define(wxStyledTextCtrl_StyleSetForeground, 3039).
--define(wxStyledTextCtrl_StyleSetBackground, 3040).
--define(wxStyledTextCtrl_StyleSetBold, 3041).
--define(wxStyledTextCtrl_StyleSetItalic, 3042).
--define(wxStyledTextCtrl_StyleSetSize, 3043).
--define(wxStyledTextCtrl_StyleSetFaceName, 3044).
--define(wxStyledTextCtrl_StyleSetEOLFilled, 3045).
--define(wxStyledTextCtrl_StyleResetDefault, 3046).
--define(wxStyledTextCtrl_StyleSetUnderline, 3047).
--define(wxStyledTextCtrl_StyleSetCase, 3048).
--define(wxStyledTextCtrl_StyleSetHotSpot, 3049).
--define(wxStyledTextCtrl_SetSelForeground, 3050).
--define(wxStyledTextCtrl_SetSelBackground, 3051).
--define(wxStyledTextCtrl_GetSelAlpha, 3052).
--define(wxStyledTextCtrl_SetSelAlpha, 3053).
--define(wxStyledTextCtrl_SetCaretForeground, 3054).
--define(wxStyledTextCtrl_CmdKeyAssign, 3055).
--define(wxStyledTextCtrl_CmdKeyClear, 3056).
--define(wxStyledTextCtrl_CmdKeyClearAll, 3057).
--define(wxStyledTextCtrl_SetStyleBytes, 3058).
--define(wxStyledTextCtrl_StyleSetVisible, 3059).
--define(wxStyledTextCtrl_GetCaretPeriod, 3060).
--define(wxStyledTextCtrl_SetCaretPeriod, 3061).
--define(wxStyledTextCtrl_SetWordChars, 3062).
--define(wxStyledTextCtrl_BeginUndoAction, 3063).
--define(wxStyledTextCtrl_EndUndoAction, 3064).
--define(wxStyledTextCtrl_IndicatorSetStyle, 3065).
--define(wxStyledTextCtrl_IndicatorGetStyle, 3066).
--define(wxStyledTextCtrl_IndicatorSetForeground, 3067).
--define(wxStyledTextCtrl_IndicatorGetForeground, 3068).
--define(wxStyledTextCtrl_SetWhitespaceForeground, 3069).
--define(wxStyledTextCtrl_SetWhitespaceBackground, 3070).
--define(wxStyledTextCtrl_GetStyleBits, 3071).
--define(wxStyledTextCtrl_SetLineState, 3072).
--define(wxStyledTextCtrl_GetLineState, 3073).
--define(wxStyledTextCtrl_GetMaxLineState, 3074).
--define(wxStyledTextCtrl_GetCaretLineVisible, 3075).
--define(wxStyledTextCtrl_SetCaretLineVisible, 3076).
--define(wxStyledTextCtrl_GetCaretLineBackground, 3077).
--define(wxStyledTextCtrl_SetCaretLineBackground, 3078).
--define(wxStyledTextCtrl_AutoCompShow, 3079).
--define(wxStyledTextCtrl_AutoCompCancel, 3080).
--define(wxStyledTextCtrl_AutoCompActive, 3081).
--define(wxStyledTextCtrl_AutoCompPosStart, 3082).
--define(wxStyledTextCtrl_AutoCompComplete, 3083).
--define(wxStyledTextCtrl_AutoCompStops, 3084).
--define(wxStyledTextCtrl_AutoCompSetSeparator, 3085).
--define(wxStyledTextCtrl_AutoCompGetSeparator, 3086).
--define(wxStyledTextCtrl_AutoCompSelect, 3087).
--define(wxStyledTextCtrl_AutoCompSetCancelAtStart, 3088).
--define(wxStyledTextCtrl_AutoCompGetCancelAtStart, 3089).
--define(wxStyledTextCtrl_AutoCompSetFillUps, 3090).
--define(wxStyledTextCtrl_AutoCompSetChooseSingle, 3091).
--define(wxStyledTextCtrl_AutoCompGetChooseSingle, 3092).
--define(wxStyledTextCtrl_AutoCompSetIgnoreCase, 3093).
--define(wxStyledTextCtrl_AutoCompGetIgnoreCase, 3094).
--define(wxStyledTextCtrl_UserListShow, 3095).
--define(wxStyledTextCtrl_AutoCompSetAutoHide, 3096).
--define(wxStyledTextCtrl_AutoCompGetAutoHide, 3097).
--define(wxStyledTextCtrl_AutoCompSetDropRestOfWord, 3098).
--define(wxStyledTextCtrl_AutoCompGetDropRestOfWord, 3099).
--define(wxStyledTextCtrl_RegisterImage, 3100).
--define(wxStyledTextCtrl_ClearRegisteredImages, 3101).
--define(wxStyledTextCtrl_AutoCompGetTypeSeparator, 3102).
--define(wxStyledTextCtrl_AutoCompSetTypeSeparator, 3103).
--define(wxStyledTextCtrl_AutoCompSetMaxWidth, 3104).
--define(wxStyledTextCtrl_AutoCompGetMaxWidth, 3105).
--define(wxStyledTextCtrl_AutoCompSetMaxHeight, 3106).
--define(wxStyledTextCtrl_AutoCompGetMaxHeight, 3107).
--define(wxStyledTextCtrl_SetIndent, 3108).
--define(wxStyledTextCtrl_GetIndent, 3109).
--define(wxStyledTextCtrl_SetUseTabs, 3110).
--define(wxStyledTextCtrl_GetUseTabs, 3111).
--define(wxStyledTextCtrl_SetLineIndentation, 3112).
--define(wxStyledTextCtrl_GetLineIndentation, 3113).
--define(wxStyledTextCtrl_GetLineIndentPosition, 3114).
--define(wxStyledTextCtrl_GetColumn, 3115).
--define(wxStyledTextCtrl_SetUseHorizontalScrollBar, 3116).
--define(wxStyledTextCtrl_GetUseHorizontalScrollBar, 3117).
--define(wxStyledTextCtrl_SetIndentationGuides, 3118).
--define(wxStyledTextCtrl_GetIndentationGuides, 3119).
--define(wxStyledTextCtrl_SetHighlightGuide, 3120).
--define(wxStyledTextCtrl_GetHighlightGuide, 3121).
--define(wxStyledTextCtrl_GetLineEndPosition, 3122).
--define(wxStyledTextCtrl_GetCodePage, 3123).
--define(wxStyledTextCtrl_GetCaretForeground, 3124).
--define(wxStyledTextCtrl_GetReadOnly, 3125).
--define(wxStyledTextCtrl_SetCurrentPos, 3126).
--define(wxStyledTextCtrl_SetSelectionStart, 3127).
--define(wxStyledTextCtrl_GetSelectionStart, 3128).
--define(wxStyledTextCtrl_SetSelectionEnd, 3129).
--define(wxStyledTextCtrl_GetSelectionEnd, 3130).
--define(wxStyledTextCtrl_SetPrintMagnification, 3131).
--define(wxStyledTextCtrl_GetPrintMagnification, 3132).
--define(wxStyledTextCtrl_SetPrintColourMode, 3133).
--define(wxStyledTextCtrl_GetPrintColourMode, 3134).
--define(wxStyledTextCtrl_FindText, 3135).
--define(wxStyledTextCtrl_FormatRange, 3136).
--define(wxStyledTextCtrl_GetFirstVisibleLine, 3137).
--define(wxStyledTextCtrl_GetLine, 3138).
--define(wxStyledTextCtrl_GetLineCount, 3139).
--define(wxStyledTextCtrl_SetMarginLeft, 3140).
--define(wxStyledTextCtrl_GetMarginLeft, 3141).
--define(wxStyledTextCtrl_SetMarginRight, 3142).
--define(wxStyledTextCtrl_GetMarginRight, 3143).
--define(wxStyledTextCtrl_GetModify, 3144).
--define(wxStyledTextCtrl_SetSelection, 3145).
--define(wxStyledTextCtrl_GetSelectedText, 3146).
--define(wxStyledTextCtrl_GetTextRange, 3147).
--define(wxStyledTextCtrl_HideSelection, 3148).
--define(wxStyledTextCtrl_LineFromPosition, 3149).
--define(wxStyledTextCtrl_PositionFromLine, 3150).
--define(wxStyledTextCtrl_LineScroll, 3151).
--define(wxStyledTextCtrl_EnsureCaretVisible, 3152).
--define(wxStyledTextCtrl_ReplaceSelection, 3153).
--define(wxStyledTextCtrl_SetReadOnly, 3154).
--define(wxStyledTextCtrl_CanPaste, 3155).
--define(wxStyledTextCtrl_CanUndo, 3156).
--define(wxStyledTextCtrl_EmptyUndoBuffer, 3157).
--define(wxStyledTextCtrl_Undo, 3158).
--define(wxStyledTextCtrl_Cut, 3159).
--define(wxStyledTextCtrl_Copy, 3160).
--define(wxStyledTextCtrl_Paste, 3161).
--define(wxStyledTextCtrl_Clear, 3162).
--define(wxStyledTextCtrl_SetText, 3163).
--define(wxStyledTextCtrl_GetText, 3164).
--define(wxStyledTextCtrl_GetTextLength, 3165).
--define(wxStyledTextCtrl_GetOvertype, 3166).
--define(wxStyledTextCtrl_SetCaretWidth, 3167).
--define(wxStyledTextCtrl_GetCaretWidth, 3168).
--define(wxStyledTextCtrl_SetTargetStart, 3169).
--define(wxStyledTextCtrl_GetTargetStart, 3170).
--define(wxStyledTextCtrl_SetTargetEnd, 3171).
--define(wxStyledTextCtrl_GetTargetEnd, 3172).
--define(wxStyledTextCtrl_ReplaceTarget, 3173).
--define(wxStyledTextCtrl_SearchInTarget, 3174).
--define(wxStyledTextCtrl_SetSearchFlags, 3175).
--define(wxStyledTextCtrl_GetSearchFlags, 3176).
--define(wxStyledTextCtrl_CallTipShow, 3177).
--define(wxStyledTextCtrl_CallTipCancel, 3178).
--define(wxStyledTextCtrl_CallTipActive, 3179).
--define(wxStyledTextCtrl_CallTipPosAtStart, 3180).
--define(wxStyledTextCtrl_CallTipSetHighlight, 3181).
--define(wxStyledTextCtrl_CallTipSetBackground, 3182).
--define(wxStyledTextCtrl_CallTipSetForeground, 3183).
--define(wxStyledTextCtrl_CallTipSetForegroundHighlight, 3184).
--define(wxStyledTextCtrl_CallTipUseStyle, 3185).
--define(wxStyledTextCtrl_VisibleFromDocLine, 3186).
--define(wxStyledTextCtrl_DocLineFromVisible, 3187).
--define(wxStyledTextCtrl_WrapCount, 3188).
--define(wxStyledTextCtrl_SetFoldLevel, 3189).
--define(wxStyledTextCtrl_GetFoldLevel, 3190).
--define(wxStyledTextCtrl_GetLastChild, 3191).
--define(wxStyledTextCtrl_GetFoldParent, 3192).
--define(wxStyledTextCtrl_ShowLines, 3193).
--define(wxStyledTextCtrl_HideLines, 3194).
--define(wxStyledTextCtrl_GetLineVisible, 3195).
--define(wxStyledTextCtrl_SetFoldExpanded, 3196).
--define(wxStyledTextCtrl_GetFoldExpanded, 3197).
--define(wxStyledTextCtrl_ToggleFold, 3198).
--define(wxStyledTextCtrl_EnsureVisible, 3199).
--define(wxStyledTextCtrl_SetFoldFlags, 3200).
--define(wxStyledTextCtrl_EnsureVisibleEnforcePolicy, 3201).
--define(wxStyledTextCtrl_SetTabIndents, 3202).
--define(wxStyledTextCtrl_GetTabIndents, 3203).
--define(wxStyledTextCtrl_SetBackSpaceUnIndents, 3204).
--define(wxStyledTextCtrl_GetBackSpaceUnIndents, 3205).
--define(wxStyledTextCtrl_SetMouseDwellTime, 3206).
--define(wxStyledTextCtrl_GetMouseDwellTime, 3207).
--define(wxStyledTextCtrl_WordStartPosition, 3208).
--define(wxStyledTextCtrl_WordEndPosition, 3209).
--define(wxStyledTextCtrl_SetWrapMode, 3210).
--define(wxStyledTextCtrl_GetWrapMode, 3211).
--define(wxStyledTextCtrl_SetWrapVisualFlags, 3212).
--define(wxStyledTextCtrl_GetWrapVisualFlags, 3213).
--define(wxStyledTextCtrl_SetWrapVisualFlagsLocation, 3214).
--define(wxStyledTextCtrl_GetWrapVisualFlagsLocation, 3215).
--define(wxStyledTextCtrl_SetWrapStartIndent, 3216).
--define(wxStyledTextCtrl_GetWrapStartIndent, 3217).
--define(wxStyledTextCtrl_SetLayoutCache, 3218).
--define(wxStyledTextCtrl_GetLayoutCache, 3219).
--define(wxStyledTextCtrl_SetScrollWidth, 3220).
--define(wxStyledTextCtrl_GetScrollWidth, 3221).
--define(wxStyledTextCtrl_TextWidth, 3222).
--define(wxStyledTextCtrl_GetEndAtLastLine, 3223).
--define(wxStyledTextCtrl_TextHeight, 3224).
--define(wxStyledTextCtrl_SetUseVerticalScrollBar, 3225).
--define(wxStyledTextCtrl_GetUseVerticalScrollBar, 3226).
--define(wxStyledTextCtrl_AppendText, 3227).
--define(wxStyledTextCtrl_GetTwoPhaseDraw, 3228).
--define(wxStyledTextCtrl_SetTwoPhaseDraw, 3229).
--define(wxStyledTextCtrl_TargetFromSelection, 3230).
--define(wxStyledTextCtrl_LinesJoin, 3231).
--define(wxStyledTextCtrl_LinesSplit, 3232).
--define(wxStyledTextCtrl_SetFoldMarginColour, 3233).
--define(wxStyledTextCtrl_SetFoldMarginHiColour, 3234).
--define(wxStyledTextCtrl_LineDown, 3235).
--define(wxStyledTextCtrl_LineDownExtend, 3236).
--define(wxStyledTextCtrl_LineUp, 3237).
--define(wxStyledTextCtrl_LineUpExtend, 3238).
--define(wxStyledTextCtrl_CharLeft, 3239).
--define(wxStyledTextCtrl_CharLeftExtend, 3240).
--define(wxStyledTextCtrl_CharRight, 3241).
--define(wxStyledTextCtrl_CharRightExtend, 3242).
--define(wxStyledTextCtrl_WordLeft, 3243).
--define(wxStyledTextCtrl_WordLeftExtend, 3244).
--define(wxStyledTextCtrl_WordRight, 3245).
--define(wxStyledTextCtrl_WordRightExtend, 3246).
--define(wxStyledTextCtrl_Home, 3247).
--define(wxStyledTextCtrl_HomeExtend, 3248).
--define(wxStyledTextCtrl_LineEnd, 3249).
--define(wxStyledTextCtrl_LineEndExtend, 3250).
--define(wxStyledTextCtrl_DocumentStart, 3251).
--define(wxStyledTextCtrl_DocumentStartExtend, 3252).
--define(wxStyledTextCtrl_DocumentEnd, 3253).
--define(wxStyledTextCtrl_DocumentEndExtend, 3254).
--define(wxStyledTextCtrl_PageUp, 3255).
--define(wxStyledTextCtrl_PageUpExtend, 3256).
--define(wxStyledTextCtrl_PageDown, 3257).
--define(wxStyledTextCtrl_PageDownExtend, 3258).
--define(wxStyledTextCtrl_EditToggleOvertype, 3259).
--define(wxStyledTextCtrl_Cancel, 3260).
--define(wxStyledTextCtrl_DeleteBack, 3261).
--define(wxStyledTextCtrl_Tab, 3262).
--define(wxStyledTextCtrl_BackTab, 3263).
--define(wxStyledTextCtrl_NewLine, 3264).
--define(wxStyledTextCtrl_FormFeed, 3265).
--define(wxStyledTextCtrl_VCHome, 3266).
--define(wxStyledTextCtrl_VCHomeExtend, 3267).
--define(wxStyledTextCtrl_ZoomIn, 3268).
--define(wxStyledTextCtrl_ZoomOut, 3269).
--define(wxStyledTextCtrl_DelWordLeft, 3270).
--define(wxStyledTextCtrl_DelWordRight, 3271).
--define(wxStyledTextCtrl_LineCut, 3272).
--define(wxStyledTextCtrl_LineDelete, 3273).
--define(wxStyledTextCtrl_LineTranspose, 3274).
--define(wxStyledTextCtrl_LineDuplicate, 3275).
--define(wxStyledTextCtrl_LowerCase, 3276).
--define(wxStyledTextCtrl_UpperCase, 3277).
--define(wxStyledTextCtrl_LineScrollDown, 3278).
--define(wxStyledTextCtrl_LineScrollUp, 3279).
--define(wxStyledTextCtrl_DeleteBackNotLine, 3280).
--define(wxStyledTextCtrl_HomeDisplay, 3281).
--define(wxStyledTextCtrl_HomeDisplayExtend, 3282).
--define(wxStyledTextCtrl_LineEndDisplay, 3283).
--define(wxStyledTextCtrl_LineEndDisplayExtend, 3284).
--define(wxStyledTextCtrl_HomeWrapExtend, 3285).
--define(wxStyledTextCtrl_LineEndWrap, 3286).
--define(wxStyledTextCtrl_LineEndWrapExtend, 3287).
--define(wxStyledTextCtrl_VCHomeWrap, 3288).
--define(wxStyledTextCtrl_VCHomeWrapExtend, 3289).
--define(wxStyledTextCtrl_LineCopy, 3290).
--define(wxStyledTextCtrl_MoveCaretInsideView, 3291).
--define(wxStyledTextCtrl_LineLength, 3292).
--define(wxStyledTextCtrl_BraceHighlight, 3293).
--define(wxStyledTextCtrl_BraceBadLight, 3294).
--define(wxStyledTextCtrl_BraceMatch, 3295).
--define(wxStyledTextCtrl_GetViewEOL, 3296).
--define(wxStyledTextCtrl_SetViewEOL, 3297).
--define(wxStyledTextCtrl_SetModEventMask, 3298).
--define(wxStyledTextCtrl_GetEdgeColumn, 3299).
--define(wxStyledTextCtrl_SetEdgeColumn, 3300).
--define(wxStyledTextCtrl_SetEdgeMode, 3301).
--define(wxStyledTextCtrl_GetEdgeMode, 3302).
--define(wxStyledTextCtrl_GetEdgeColour, 3303).
--define(wxStyledTextCtrl_SetEdgeColour, 3304).
--define(wxStyledTextCtrl_SearchAnchor, 3305).
--define(wxStyledTextCtrl_SearchNext, 3306).
--define(wxStyledTextCtrl_SearchPrev, 3307).
--define(wxStyledTextCtrl_LinesOnScreen, 3308).
--define(wxStyledTextCtrl_UsePopUp, 3309).
--define(wxStyledTextCtrl_SelectionIsRectangle, 3310).
--define(wxStyledTextCtrl_SetZoom, 3311).
--define(wxStyledTextCtrl_GetZoom, 3312).
--define(wxStyledTextCtrl_GetModEventMask, 3313).
--define(wxStyledTextCtrl_SetSTCFocus, 3314).
--define(wxStyledTextCtrl_GetSTCFocus, 3315).
--define(wxStyledTextCtrl_SetStatus, 3316).
--define(wxStyledTextCtrl_GetStatus, 3317).
--define(wxStyledTextCtrl_SetMouseDownCaptures, 3318).
--define(wxStyledTextCtrl_GetMouseDownCaptures, 3319).
--define(wxStyledTextCtrl_SetSTCCursor, 3320).
--define(wxStyledTextCtrl_GetSTCCursor, 3321).
--define(wxStyledTextCtrl_SetControlCharSymbol, 3322).
--define(wxStyledTextCtrl_GetControlCharSymbol, 3323).
--define(wxStyledTextCtrl_WordPartLeft, 3324).
--define(wxStyledTextCtrl_WordPartLeftExtend, 3325).
--define(wxStyledTextCtrl_WordPartRight, 3326).
--define(wxStyledTextCtrl_WordPartRightExtend, 3327).
--define(wxStyledTextCtrl_SetVisiblePolicy, 3328).
--define(wxStyledTextCtrl_DelLineLeft, 3329).
--define(wxStyledTextCtrl_DelLineRight, 3330).
--define(wxStyledTextCtrl_GetXOffset, 3331).
--define(wxStyledTextCtrl_ChooseCaretX, 3332).
--define(wxStyledTextCtrl_SetXCaretPolicy, 3333).
--define(wxStyledTextCtrl_SetYCaretPolicy, 3334).
--define(wxStyledTextCtrl_GetPrintWrapMode, 3335).
--define(wxStyledTextCtrl_SetHotspotActiveForeground, 3336).
--define(wxStyledTextCtrl_SetHotspotActiveBackground, 3337).
--define(wxStyledTextCtrl_SetHotspotActiveUnderline, 3338).
--define(wxStyledTextCtrl_SetHotspotSingleLine, 3339).
--define(wxStyledTextCtrl_ParaDownExtend, 3340).
--define(wxStyledTextCtrl_ParaUp, 3341).
--define(wxStyledTextCtrl_ParaUpExtend, 3342).
--define(wxStyledTextCtrl_PositionBefore, 3343).
--define(wxStyledTextCtrl_PositionAfter, 3344).
--define(wxStyledTextCtrl_CopyRange, 3345).
--define(wxStyledTextCtrl_CopyText, 3346).
--define(wxStyledTextCtrl_SetSelectionMode, 3347).
--define(wxStyledTextCtrl_GetSelectionMode, 3348).
--define(wxStyledTextCtrl_LineDownRectExtend, 3349).
--define(wxStyledTextCtrl_LineUpRectExtend, 3350).
--define(wxStyledTextCtrl_CharLeftRectExtend, 3351).
--define(wxStyledTextCtrl_CharRightRectExtend, 3352).
--define(wxStyledTextCtrl_HomeRectExtend, 3353).
--define(wxStyledTextCtrl_VCHomeRectExtend, 3354).
--define(wxStyledTextCtrl_LineEndRectExtend, 3355).
--define(wxStyledTextCtrl_PageUpRectExtend, 3356).
--define(wxStyledTextCtrl_PageDownRectExtend, 3357).
--define(wxStyledTextCtrl_StutteredPageUp, 3358).
--define(wxStyledTextCtrl_StutteredPageUpExtend, 3359).
--define(wxStyledTextCtrl_StutteredPageDown, 3360).
--define(wxStyledTextCtrl_StutteredPageDownExtend, 3361).
--define(wxStyledTextCtrl_WordLeftEnd, 3362).
--define(wxStyledTextCtrl_WordLeftEndExtend, 3363).
--define(wxStyledTextCtrl_WordRightEnd, 3364).
--define(wxStyledTextCtrl_WordRightEndExtend, 3365).
--define(wxStyledTextCtrl_SetWhitespaceChars, 3366).
--define(wxStyledTextCtrl_SetCharsDefault, 3367).
--define(wxStyledTextCtrl_AutoCompGetCurrent, 3368).
--define(wxStyledTextCtrl_Allocate, 3369).
--define(wxStyledTextCtrl_FindColumn, 3370).
--define(wxStyledTextCtrl_GetCaretSticky, 3371).
--define(wxStyledTextCtrl_SetCaretSticky, 3372).
--define(wxStyledTextCtrl_ToggleCaretSticky, 3373).
--define(wxStyledTextCtrl_SetPasteConvertEndings, 3374).
--define(wxStyledTextCtrl_GetPasteConvertEndings, 3375).
--define(wxStyledTextCtrl_SelectionDuplicate, 3376).
--define(wxStyledTextCtrl_SetCaretLineBackAlpha, 3377).
--define(wxStyledTextCtrl_GetCaretLineBackAlpha, 3378).
--define(wxStyledTextCtrl_StartRecord, 3379).
--define(wxStyledTextCtrl_StopRecord, 3380).
--define(wxStyledTextCtrl_SetLexer, 3381).
--define(wxStyledTextCtrl_GetLexer, 3382).
--define(wxStyledTextCtrl_Colourise, 3383).
--define(wxStyledTextCtrl_SetProperty, 3384).
--define(wxStyledTextCtrl_SetKeyWords, 3385).
--define(wxStyledTextCtrl_SetLexerLanguage, 3386).
--define(wxStyledTextCtrl_GetProperty, 3387).
--define(wxStyledTextCtrl_GetStyleBitsNeeded, 3388).
--define(wxStyledTextCtrl_GetCurrentLine, 3389).
--define(wxStyledTextCtrl_StyleSetSpec, 3390).
--define(wxStyledTextCtrl_StyleSetFont, 3391).
--define(wxStyledTextCtrl_StyleSetFontAttr, 3392).
--define(wxStyledTextCtrl_StyleSetCharacterSet, 3393).
--define(wxStyledTextCtrl_StyleSetFontEncoding, 3394).
--define(wxStyledTextCtrl_CmdKeyExecute, 3395).
--define(wxStyledTextCtrl_SetMargins, 3396).
--define(wxStyledTextCtrl_GetSelection, 3397).
--define(wxStyledTextCtrl_PointFromPosition, 3398).
--define(wxStyledTextCtrl_ScrollToLine, 3399).
--define(wxStyledTextCtrl_ScrollToColumn, 3400).
--define(wxStyledTextCtrl_SetVScrollBar, 3401).
--define(wxStyledTextCtrl_SetHScrollBar, 3402).
--define(wxStyledTextCtrl_GetLastKeydownProcessed, 3403).
--define(wxStyledTextCtrl_SetLastKeydownProcessed, 3404).
--define(wxStyledTextCtrl_SaveFile, 3405).
--define(wxStyledTextCtrl_LoadFile, 3406).
--define(wxStyledTextCtrl_DoDragOver, 3407).
--define(wxStyledTextCtrl_DoDropText, 3408).
--define(wxStyledTextCtrl_GetUseAntiAliasing, 3409).
--define(wxStyledTextCtrl_AddTextRaw, 3410).
--define(wxStyledTextCtrl_InsertTextRaw, 3411).
--define(wxStyledTextCtrl_GetCurLineRaw, 3412).
--define(wxStyledTextCtrl_GetLineRaw, 3413).
--define(wxStyledTextCtrl_GetSelectedTextRaw, 3414).
--define(wxStyledTextCtrl_GetTextRangeRaw, 3415).
--define(wxStyledTextCtrl_SetTextRaw, 3416).
--define(wxStyledTextCtrl_GetTextRaw, 3417).
--define(wxStyledTextCtrl_AppendTextRaw, 3418).
--define(wxArtProvider_GetBitmap, 3419).
--define(wxArtProvider_GetIcon, 3420).
--define(wxTreeEvent_GetKeyCode, 3421).
--define(wxTreeEvent_GetItem, 3422).
--define(wxTreeEvent_GetKeyEvent, 3423).
--define(wxTreeEvent_GetLabel, 3424).
--define(wxTreeEvent_GetOldItem, 3425).
--define(wxTreeEvent_GetPoint, 3426).
--define(wxTreeEvent_IsEditCancelled, 3427).
--define(wxTreeEvent_SetToolTip, 3428).
--define(wxNotebookEvent_GetOldSelection, 3429).
--define(wxNotebookEvent_GetSelection, 3430).
--define(wxNotebookEvent_SetOldSelection, 3431).
--define(wxNotebookEvent_SetSelection, 3432).
--define(wxFileDataObject_new, 3433).
--define(wxFileDataObject_AddFile, 3434).
--define(wxFileDataObject_GetFilenames, 3435).
--define(wxFileDataObject_destroy, 3436).
--define(wxTextDataObject_new, 3437).
--define(wxTextDataObject_GetTextLength, 3438).
--define(wxTextDataObject_GetText, 3439).
--define(wxTextDataObject_SetText, 3440).
--define(wxTextDataObject_destroy, 3441).
--define(wxBitmapDataObject_new_1_1, 3442).
--define(wxBitmapDataObject_new_1_0, 3443).
--define(wxBitmapDataObject_GetBitmap, 3444).
--define(wxBitmapDataObject_SetBitmap, 3445).
--define(wxBitmapDataObject_destroy, 3446).
--define(wxClipboard_new, 3448).
--define(wxClipboard_destruct, 3449).
--define(wxClipboard_AddData, 3450).
--define(wxClipboard_Clear, 3451).
--define(wxClipboard_Close, 3452).
--define(wxClipboard_Flush, 3453).
--define(wxClipboard_GetData, 3454).
--define(wxClipboard_IsOpened, 3455).
--define(wxClipboard_Open, 3456).
--define(wxClipboard_SetData, 3457).
--define(wxClipboard_UsePrimarySelection, 3459).
--define(wxClipboard_IsSupported, 3460).
--define(wxClipboard_Get, 3461).
--define(wxSpinEvent_GetPosition, 3462).
--define(wxSpinEvent_SetPosition, 3463).
--define(wxSplitterWindow_new_0, 3464).
--define(wxSplitterWindow_new_2, 3465).
--define(wxSplitterWindow_destruct, 3466).
--define(wxSplitterWindow_Create, 3467).
--define(wxSplitterWindow_GetMinimumPaneSize, 3468).
--define(wxSplitterWindow_GetSashGravity, 3469).
--define(wxSplitterWindow_GetSashPosition, 3470).
--define(wxSplitterWindow_GetSplitMode, 3471).
--define(wxSplitterWindow_GetWindow1, 3472).
--define(wxSplitterWindow_GetWindow2, 3473).
--define(wxSplitterWindow_Initialize, 3474).
--define(wxSplitterWindow_IsSplit, 3475).
--define(wxSplitterWindow_ReplaceWindow, 3476).
--define(wxSplitterWindow_SetSashGravity, 3477).
--define(wxSplitterWindow_SetSashPosition, 3478).
--define(wxSplitterWindow_SetSashSize, 3479).
--define(wxSplitterWindow_SetMinimumPaneSize, 3480).
--define(wxSplitterWindow_SetSplitMode, 3481).
--define(wxSplitterWindow_SplitHorizontally, 3482).
--define(wxSplitterWindow_SplitVertically, 3483).
--define(wxSplitterWindow_Unsplit, 3484).
--define(wxSplitterWindow_UpdateSize, 3485).
--define(wxSplitterEvent_GetSashPosition, 3486).
--define(wxSplitterEvent_GetX, 3487).
--define(wxSplitterEvent_GetY, 3488).
--define(wxSplitterEvent_GetWindowBeingRemoved, 3489).
--define(wxSplitterEvent_SetSashPosition, 3490).
--define(wxHtmlWindow_new_0, 3491).
--define(wxHtmlWindow_new_2, 3492).
--define(wxHtmlWindow_AppendToPage, 3493).
--define(wxHtmlWindow_GetOpenedAnchor, 3494).
--define(wxHtmlWindow_GetOpenedPage, 3495).
--define(wxHtmlWindow_GetOpenedPageTitle, 3496).
--define(wxHtmlWindow_GetRelatedFrame, 3497).
--define(wxHtmlWindow_HistoryBack, 3498).
--define(wxHtmlWindow_HistoryCanBack, 3499).
--define(wxHtmlWindow_HistoryCanForward, 3500).
--define(wxHtmlWindow_HistoryClear, 3501).
--define(wxHtmlWindow_HistoryForward, 3502).
--define(wxHtmlWindow_LoadFile, 3503).
--define(wxHtmlWindow_LoadPage, 3504).
--define(wxHtmlWindow_SelectAll, 3505).
--define(wxHtmlWindow_SelectionToText, 3506).
--define(wxHtmlWindow_SelectLine, 3507).
--define(wxHtmlWindow_SelectWord, 3508).
--define(wxHtmlWindow_SetBorders, 3509).
--define(wxHtmlWindow_SetFonts, 3510).
--define(wxHtmlWindow_SetPage, 3511).
--define(wxHtmlWindow_SetRelatedFrame, 3512).
--define(wxHtmlWindow_SetRelatedStatusBar, 3513).
--define(wxHtmlWindow_ToText, 3514).
--define(wxHtmlWindow_destroy, 3515).
--define(wxHtmlLinkEvent_GetLinkInfo, 3516).
--define(wxSystemSettings_GetColour, 3517).
--define(wxSystemSettings_GetFont, 3518).
--define(wxSystemSettings_GetMetric, 3519).
--define(wxSystemSettings_GetScreenType, 3520).
--define(wxSystemOptions_GetOption, 3521).
--define(wxSystemOptions_GetOptionInt, 3522).
--define(wxSystemOptions_HasOption, 3523).
--define(wxSystemOptions_IsFalse, 3524).
--define(wxSystemOptions_SetOption_2_1, 3525).
--define(wxSystemOptions_SetOption_2_0, 3526).
--define(wxAuiNotebookEvent_SetSelection, 3527).
--define(wxAuiNotebookEvent_GetSelection, 3528).
--define(wxAuiNotebookEvent_SetOldSelection, 3529).
--define(wxAuiNotebookEvent_GetOldSelection, 3530).
--define(wxAuiNotebookEvent_SetDragSource, 3531).
--define(wxAuiNotebookEvent_GetDragSource, 3532).
--define(wxAuiManagerEvent_SetManager, 3533).
--define(wxAuiManagerEvent_GetManager, 3534).
--define(wxAuiManagerEvent_SetPane, 3535).
--define(wxAuiManagerEvent_GetPane, 3536).
--define(wxAuiManagerEvent_SetButton, 3537).
--define(wxAuiManagerEvent_GetButton, 3538).
--define(wxAuiManagerEvent_SetDC, 3539).
--define(wxAuiManagerEvent_GetDC, 3540).
--define(wxAuiManagerEvent_Veto, 3541).
--define(wxAuiManagerEvent_GetVeto, 3542).
--define(wxAuiManagerEvent_SetCanVeto, 3543).
--define(wxAuiManagerEvent_CanVeto, 3544).
--define(wxLogNull_new, 3545).
--define(wxLogNull_destroy, 3546).
--define(wxTaskBarIcon_new, 3547).
--define(wxTaskBarIcon_destruct, 3548).
--define(wxTaskBarIcon_PopupMenu, 3549).
--define(wxTaskBarIcon_RemoveIcon, 3550).
--define(wxTaskBarIcon_SetIcon, 3551).
--define(wxLocale_new_0, 3552).
--define(wxLocale_new_2, 3554).
--define(wxLocale_destruct, 3555).
--define(wxLocale_Init, 3557).
--define(wxLocale_AddCatalog_1, 3558).
--define(wxLocale_AddCatalog_3, 3559).
--define(wxLocale_AddCatalogLookupPathPrefix, 3560).
--define(wxLocale_GetCanonicalName, 3561).
--define(wxLocale_GetLanguage, 3562).
--define(wxLocale_GetLanguageName, 3563).
--define(wxLocale_GetLocale, 3564).
--define(wxLocale_GetName, 3565).
--define(wxLocale_GetString_2, 3566).
--define(wxLocale_GetString_4, 3567).
--define(wxLocale_GetHeaderValue, 3568).
--define(wxLocale_GetSysName, 3569).
--define(wxLocale_GetSystemEncoding, 3570).
--define(wxLocale_GetSystemEncodingName, 3571).
--define(wxLocale_GetSystemLanguage, 3572).
--define(wxLocale_IsLoaded, 3573).
--define(wxLocale_IsOk, 3574).
--define(wxActivateEvent_GetActive, 3575).
--define(wxPopupWindow_new_2, 3577).
--define(wxPopupWindow_new_0, 3578).
--define(wxPopupWindow_destruct, 3580).
--define(wxPopupWindow_Create, 3581).
--define(wxPopupWindow_Position, 3582).
--define(wxPopupTransientWindow_new_0, 3583).
--define(wxPopupTransientWindow_new_2, 3584).
--define(wxPopupTransientWindow_destruct, 3585).
--define(wxPopupTransientWindow_Popup, 3586).
--define(wxPopupTransientWindow_Dismiss, 3587).
--define(wxOverlay_new, 3588).
--define(wxOverlay_destruct, 3589).
--define(wxOverlay_Reset, 3590).
--define(wxDCOverlay_new_6, 3591).
--define(wxDCOverlay_new_2, 3592).
--define(wxDCOverlay_destruct, 3593).
--define(wxDCOverlay_Clear, 3594).
+-define(wxWindow_SetTransparent, 284).
+-define(wxWindow_CanSetTransparent, 285).
+-define(wxWindow_IsDoubleBuffered, 286).
+-define(wxWindow_SetDoubleBuffered, 287).
+-define(wxTopLevelWindow_GetIcon, 288).
+-define(wxTopLevelWindow_GetIcons, 289).
+-define(wxTopLevelWindow_GetTitle, 290).
+-define(wxTopLevelWindow_IsActive, 291).
+-define(wxTopLevelWindow_Iconize, 292).
+-define(wxTopLevelWindow_IsFullScreen, 293).
+-define(wxTopLevelWindow_IsIconized, 294).
+-define(wxTopLevelWindow_IsMaximized, 295).
+-define(wxTopLevelWindow_Maximize, 296).
+-define(wxTopLevelWindow_RequestUserAttention, 297).
+-define(wxTopLevelWindow_SetIcon, 298).
+-define(wxTopLevelWindow_SetIcons, 299).
+-define(wxTopLevelWindow_CenterOnScreen, 300).
+-define(wxTopLevelWindow_CentreOnScreen, 301).
+-define(wxTopLevelWindow_SetShape, 303).
+-define(wxTopLevelWindow_SetTitle, 304).
+-define(wxTopLevelWindow_ShowFullScreen, 305).
+-define(wxFrame_new_4, 307).
+-define(wxFrame_new_0, 308).
+-define(wxFrame_destruct, 310).
+-define(wxFrame_Create, 311).
+-define(wxFrame_CreateStatusBar, 312).
+-define(wxFrame_CreateToolBar, 313).
+-define(wxFrame_GetClientAreaOrigin, 314).
+-define(wxFrame_GetMenuBar, 315).
+-define(wxFrame_GetStatusBar, 316).
+-define(wxFrame_GetStatusBarPane, 317).
+-define(wxFrame_GetToolBar, 318).
+-define(wxFrame_ProcessCommand, 319).
+-define(wxFrame_SendSizeEvent, 320).
+-define(wxFrame_SetMenuBar, 321).
+-define(wxFrame_SetStatusBar, 322).
+-define(wxFrame_SetStatusBarPane, 323).
+-define(wxFrame_SetStatusText, 324).
+-define(wxFrame_SetStatusWidths, 325).
+-define(wxFrame_SetToolBar, 326).
+-define(wxMiniFrame_new_0, 327).
+-define(wxMiniFrame_new_4, 328).
+-define(wxMiniFrame_Create, 329).
+-define(wxMiniFrame_destroy, 330).
+-define(wxSplashScreen_new_0, 331).
+-define(wxSplashScreen_new_6, 332).
+-define(wxSplashScreen_destruct, 333).
+-define(wxSplashScreen_GetSplashStyle, 334).
+-define(wxSplashScreen_GetTimeout, 335).
+-define(wxPanel_new_0, 336).
+-define(wxPanel_new_6, 337).
+-define(wxPanel_new_2, 338).
+-define(wxPanel_destruct, 339).
+-define(wxPanel_InitDialog, 340).
+-define(wxPanel_SetFocusIgnoringChildren, 341).
+-define(wxScrolledWindow_new_0, 342).
+-define(wxScrolledWindow_new_2, 343).
+-define(wxScrolledWindow_destruct, 344).
+-define(wxScrolledWindow_CalcScrolledPosition_4, 345).
+-define(wxScrolledWindow_CalcScrolledPosition_1, 346).
+-define(wxScrolledWindow_CalcUnscrolledPosition_4, 347).
+-define(wxScrolledWindow_CalcUnscrolledPosition_1, 348).
+-define(wxScrolledWindow_EnableScrolling, 349).
+-define(wxScrolledWindow_GetScrollPixelsPerUnit, 350).
+-define(wxScrolledWindow_GetViewStart, 351).
+-define(wxScrolledWindow_DoPrepareDC, 352).
+-define(wxScrolledWindow_PrepareDC, 353).
+-define(wxScrolledWindow_Scroll, 354).
+-define(wxScrolledWindow_SetScrollbars, 355).
+-define(wxScrolledWindow_SetScrollRate, 356).
+-define(wxScrolledWindow_SetTargetWindow, 357).
+-define(wxSashWindow_new_0, 358).
+-define(wxSashWindow_new_2, 359).
+-define(wxSashWindow_destruct, 360).
+-define(wxSashWindow_GetSashVisible, 361).
+-define(wxSashWindow_GetMaximumSizeX, 362).
+-define(wxSashWindow_GetMaximumSizeY, 363).
+-define(wxSashWindow_GetMinimumSizeX, 364).
+-define(wxSashWindow_GetMinimumSizeY, 365).
+-define(wxSashWindow_SetMaximumSizeX, 366).
+-define(wxSashWindow_SetMaximumSizeY, 367).
+-define(wxSashWindow_SetMinimumSizeX, 368).
+-define(wxSashWindow_SetMinimumSizeY, 369).
+-define(wxSashWindow_SetSashVisible, 370).
+-define(wxSashLayoutWindow_new_0, 371).
+-define(wxSashLayoutWindow_new_2, 372).
+-define(wxSashLayoutWindow_Create, 373).
+-define(wxSashLayoutWindow_GetAlignment, 374).
+-define(wxSashLayoutWindow_GetOrientation, 375).
+-define(wxSashLayoutWindow_SetAlignment, 376).
+-define(wxSashLayoutWindow_SetDefaultSize, 377).
+-define(wxSashLayoutWindow_SetOrientation, 378).
+-define(wxSashLayoutWindow_destroy, 379).
+-define(wxGrid_new_0, 380).
+-define(wxGrid_new_3, 381).
+-define(wxGrid_new_4, 382).
+-define(wxGrid_destruct, 383).
+-define(wxGrid_AppendCols, 384).
+-define(wxGrid_AppendRows, 385).
+-define(wxGrid_AutoSize, 386).
+-define(wxGrid_AutoSizeColumn, 387).
+-define(wxGrid_AutoSizeColumns, 388).
+-define(wxGrid_AutoSizeRow, 389).
+-define(wxGrid_AutoSizeRows, 390).
+-define(wxGrid_BeginBatch, 391).
+-define(wxGrid_BlockToDeviceRect, 392).
+-define(wxGrid_CanDragColSize, 393).
+-define(wxGrid_CanDragRowSize, 394).
+-define(wxGrid_CanDragGridSize, 395).
+-define(wxGrid_CanEnableCellControl, 396).
+-define(wxGrid_CellToRect_2, 397).
+-define(wxGrid_CellToRect_1, 398).
+-define(wxGrid_ClearGrid, 399).
+-define(wxGrid_ClearSelection, 400).
+-define(wxGrid_CreateGrid, 401).
+-define(wxGrid_DeleteCols, 402).
+-define(wxGrid_DeleteRows, 403).
+-define(wxGrid_DisableCellEditControl, 404).
+-define(wxGrid_DisableDragColSize, 405).
+-define(wxGrid_DisableDragGridSize, 406).
+-define(wxGrid_DisableDragRowSize, 407).
+-define(wxGrid_EnableCellEditControl, 408).
+-define(wxGrid_EnableDragColSize, 409).
+-define(wxGrid_EnableDragGridSize, 410).
+-define(wxGrid_EnableDragRowSize, 411).
+-define(wxGrid_EnableEditing, 412).
+-define(wxGrid_EnableGridLines, 413).
+-define(wxGrid_EndBatch, 414).
+-define(wxGrid_Fit, 415).
+-define(wxGrid_ForceRefresh, 416).
+-define(wxGrid_GetBatchCount, 417).
+-define(wxGrid_GetCellAlignment, 418).
+-define(wxGrid_GetCellBackgroundColour, 419).
+-define(wxGrid_GetCellEditor, 420).
+-define(wxGrid_GetCellFont, 421).
+-define(wxGrid_GetCellRenderer, 422).
+-define(wxGrid_GetCellTextColour, 423).
+-define(wxGrid_GetCellValue_2, 424).
+-define(wxGrid_GetCellValue_1, 425).
+-define(wxGrid_GetColLabelAlignment, 426).
+-define(wxGrid_GetColLabelSize, 427).
+-define(wxGrid_GetColLabelValue, 428).
+-define(wxGrid_GetColMinimalAcceptableWidth, 429).
+-define(wxGrid_GetDefaultCellAlignment, 430).
+-define(wxGrid_GetDefaultCellBackgroundColour, 431).
+-define(wxGrid_GetDefaultCellFont, 432).
+-define(wxGrid_GetDefaultCellTextColour, 433).
+-define(wxGrid_GetDefaultColLabelSize, 434).
+-define(wxGrid_GetDefaultColSize, 435).
+-define(wxGrid_GetDefaultEditor, 436).
+-define(wxGrid_GetDefaultEditorForCell_2, 437).
+-define(wxGrid_GetDefaultEditorForCell_1, 438).
+-define(wxGrid_GetDefaultEditorForType, 439).
+-define(wxGrid_GetDefaultRenderer, 440).
+-define(wxGrid_GetDefaultRendererForCell, 441).
+-define(wxGrid_GetDefaultRendererForType, 442).
+-define(wxGrid_GetDefaultRowLabelSize, 443).
+-define(wxGrid_GetDefaultRowSize, 444).
+-define(wxGrid_GetGridCursorCol, 445).
+-define(wxGrid_GetGridCursorRow, 446).
+-define(wxGrid_GetGridLineColour, 447).
+-define(wxGrid_GridLinesEnabled, 448).
+-define(wxGrid_GetLabelBackgroundColour, 449).
+-define(wxGrid_GetLabelFont, 450).
+-define(wxGrid_GetLabelTextColour, 451).
+-define(wxGrid_GetNumberCols, 452).
+-define(wxGrid_GetNumberRows, 453).
+-define(wxGrid_GetOrCreateCellAttr, 454).
+-define(wxGrid_GetRowMinimalAcceptableHeight, 455).
+-define(wxGrid_GetRowLabelAlignment, 456).
+-define(wxGrid_GetRowLabelSize, 457).
+-define(wxGrid_GetRowLabelValue, 458).
+-define(wxGrid_GetRowSize, 459).
+-define(wxGrid_GetScrollLineX, 460).
+-define(wxGrid_GetScrollLineY, 461).
+-define(wxGrid_GetSelectedCells, 462).
+-define(wxGrid_GetSelectedCols, 463).
+-define(wxGrid_GetSelectedRows, 464).
+-define(wxGrid_GetSelectionBackground, 465).
+-define(wxGrid_GetSelectionBlockTopLeft, 466).
+-define(wxGrid_GetSelectionBlockBottomRight, 467).
+-define(wxGrid_GetSelectionForeground, 468).
+-define(wxGrid_GetViewWidth, 469).
+-define(wxGrid_GetGridWindow, 470).
+-define(wxGrid_GetGridRowLabelWindow, 471).
+-define(wxGrid_GetGridColLabelWindow, 472).
+-define(wxGrid_GetGridCornerLabelWindow, 473).
+-define(wxGrid_HideCellEditControl, 474).
+-define(wxGrid_InsertCols, 475).
+-define(wxGrid_InsertRows, 476).
+-define(wxGrid_IsCellEditControlEnabled, 477).
+-define(wxGrid_IsCurrentCellReadOnly, 478).
+-define(wxGrid_IsEditable, 479).
+-define(wxGrid_IsInSelection_2, 480).
+-define(wxGrid_IsInSelection_1, 481).
+-define(wxGrid_IsReadOnly, 482).
+-define(wxGrid_IsSelection, 483).
+-define(wxGrid_IsVisible_3, 484).
+-define(wxGrid_IsVisible_2, 485).
+-define(wxGrid_MakeCellVisible_2, 486).
+-define(wxGrid_MakeCellVisible_1, 487).
+-define(wxGrid_MoveCursorDown, 488).
+-define(wxGrid_MoveCursorLeft, 489).
+-define(wxGrid_MoveCursorRight, 490).
+-define(wxGrid_MoveCursorUp, 491).
+-define(wxGrid_MoveCursorDownBlock, 492).
+-define(wxGrid_MoveCursorLeftBlock, 493).
+-define(wxGrid_MoveCursorRightBlock, 494).
+-define(wxGrid_MoveCursorUpBlock, 495).
+-define(wxGrid_MovePageDown, 496).
+-define(wxGrid_MovePageUp, 497).
+-define(wxGrid_RegisterDataType, 498).
+-define(wxGrid_SaveEditControlValue, 499).
+-define(wxGrid_SelectAll, 500).
+-define(wxGrid_SelectBlock_5, 501).
+-define(wxGrid_SelectBlock_3, 502).
+-define(wxGrid_SelectCol, 503).
+-define(wxGrid_SelectRow, 504).
+-define(wxGrid_SetCellAlignment_4, 505).
+-define(wxGrid_SetCellAlignment_3, 506).
+-define(wxGrid_SetCellAlignment_1, 507).
+-define(wxGrid_SetCellBackgroundColour_3_0, 508).
+-define(wxGrid_SetCellBackgroundColour_1, 509).
+-define(wxGrid_SetCellBackgroundColour_3_1, 510).
+-define(wxGrid_SetCellEditor, 511).
+-define(wxGrid_SetCellFont, 512).
+-define(wxGrid_SetCellRenderer, 513).
+-define(wxGrid_SetCellTextColour_3_0, 514).
+-define(wxGrid_SetCellTextColour_3_1, 515).
+-define(wxGrid_SetCellTextColour_1, 516).
+-define(wxGrid_SetCellValue_3_0, 517).
+-define(wxGrid_SetCellValue_2, 518).
+-define(wxGrid_SetCellValue_3_1, 519).
+-define(wxGrid_SetColAttr, 520).
+-define(wxGrid_SetColFormatBool, 521).
+-define(wxGrid_SetColFormatNumber, 522).
+-define(wxGrid_SetColFormatFloat, 523).
+-define(wxGrid_SetColFormatCustom, 524).
+-define(wxGrid_SetColLabelAlignment, 525).
+-define(wxGrid_SetColLabelSize, 526).
+-define(wxGrid_SetColLabelValue, 527).
+-define(wxGrid_SetColMinimalWidth, 528).
+-define(wxGrid_SetColMinimalAcceptableWidth, 529).
+-define(wxGrid_SetColSize, 530).
+-define(wxGrid_SetDefaultCellAlignment, 531).
+-define(wxGrid_SetDefaultCellBackgroundColour, 532).
+-define(wxGrid_SetDefaultCellFont, 533).
+-define(wxGrid_SetDefaultCellTextColour, 534).
+-define(wxGrid_SetDefaultEditor, 535).
+-define(wxGrid_SetDefaultRenderer, 536).
+-define(wxGrid_SetDefaultColSize, 537).
+-define(wxGrid_SetDefaultRowSize, 538).
+-define(wxGrid_SetGridCursor, 539).
+-define(wxGrid_SetGridLineColour, 540).
+-define(wxGrid_SetLabelBackgroundColour, 541).
+-define(wxGrid_SetLabelFont, 542).
+-define(wxGrid_SetLabelTextColour, 543).
+-define(wxGrid_SetMargins, 544).
+-define(wxGrid_SetReadOnly, 545).
+-define(wxGrid_SetRowAttr, 546).
+-define(wxGrid_SetRowLabelAlignment, 547).
+-define(wxGrid_SetRowLabelSize, 548).
+-define(wxGrid_SetRowLabelValue, 549).
+-define(wxGrid_SetRowMinimalHeight, 550).
+-define(wxGrid_SetRowMinimalAcceptableHeight, 551).
+-define(wxGrid_SetRowSize, 552).
+-define(wxGrid_SetScrollLineX, 553).
+-define(wxGrid_SetScrollLineY, 554).
+-define(wxGrid_SetSelectionBackground, 555).
+-define(wxGrid_SetSelectionForeground, 556).
+-define(wxGrid_SetSelectionMode, 557).
+-define(wxGrid_ShowCellEditControl, 558).
+-define(wxGrid_XToCol, 559).
+-define(wxGrid_XToEdgeOfCol, 560).
+-define(wxGrid_YToEdgeOfRow, 561).
+-define(wxGrid_YToRow, 562).
+-define(wxGridCellRenderer_Draw, 563).
+-define(wxGridCellRenderer_GetBestSize, 564).
+-define(wxGridCellEditor_Create, 565).
+-define(wxGridCellEditor_IsCreated, 566).
+-define(wxGridCellEditor_SetSize, 567).
+-define(wxGridCellEditor_Show, 568).
+-define(wxGridCellEditor_PaintBackground, 569).
+-define(wxGridCellEditor_BeginEdit, 570).
+-define(wxGridCellEditor_EndEdit, 571).
+-define(wxGridCellEditor_Reset, 572).
+-define(wxGridCellEditor_StartingKey, 573).
+-define(wxGridCellEditor_StartingClick, 574).
+-define(wxGridCellEditor_HandleReturn, 575).
+-define(wxGridCellBoolRenderer_new, 576).
+-define(wxGridCellBoolRenderer_destroy, 577).
+-define(wxGridCellBoolEditor_new, 578).
+-define(wxGridCellBoolEditor_IsTrueValue, 579).
+-define(wxGridCellBoolEditor_UseStringValues, 580).
+-define(wxGridCellBoolEditor_destroy, 581).
+-define(wxGridCellFloatRenderer_new, 582).
+-define(wxGridCellFloatRenderer_GetPrecision, 583).
+-define(wxGridCellFloatRenderer_GetWidth, 584).
+-define(wxGridCellFloatRenderer_SetParameters, 585).
+-define(wxGridCellFloatRenderer_SetPrecision, 586).
+-define(wxGridCellFloatRenderer_SetWidth, 587).
+-define(wxGridCellFloatRenderer_destroy, 588).
+-define(wxGridCellFloatEditor_new, 589).
+-define(wxGridCellFloatEditor_SetParameters, 590).
+-define(wxGridCellFloatEditor_destroy, 591).
+-define(wxGridCellStringRenderer_new, 592).
+-define(wxGridCellStringRenderer_destroy, 593).
+-define(wxGridCellTextEditor_new, 594).
+-define(wxGridCellTextEditor_SetParameters, 595).
+-define(wxGridCellTextEditor_destroy, 596).
+-define(wxGridCellChoiceEditor_new, 598).
+-define(wxGridCellChoiceEditor_SetParameters, 599).
+-define(wxGridCellChoiceEditor_destroy, 600).
+-define(wxGridCellNumberRenderer_new, 601).
+-define(wxGridCellNumberRenderer_destroy, 602).
+-define(wxGridCellNumberEditor_new, 603).
+-define(wxGridCellNumberEditor_GetValue, 604).
+-define(wxGridCellNumberEditor_SetParameters, 605).
+-define(wxGridCellNumberEditor_destroy, 606).
+-define(wxGridCellAttr_SetTextColour, 607).
+-define(wxGridCellAttr_SetBackgroundColour, 608).
+-define(wxGridCellAttr_SetFont, 609).
+-define(wxGridCellAttr_SetAlignment, 610).
+-define(wxGridCellAttr_SetReadOnly, 611).
+-define(wxGridCellAttr_SetRenderer, 612).
+-define(wxGridCellAttr_SetEditor, 613).
+-define(wxGridCellAttr_HasTextColour, 614).
+-define(wxGridCellAttr_HasBackgroundColour, 615).
+-define(wxGridCellAttr_HasFont, 616).
+-define(wxGridCellAttr_HasAlignment, 617).
+-define(wxGridCellAttr_HasRenderer, 618).
+-define(wxGridCellAttr_HasEditor, 619).
+-define(wxGridCellAttr_GetTextColour, 620).
+-define(wxGridCellAttr_GetBackgroundColour, 621).
+-define(wxGridCellAttr_GetFont, 622).
+-define(wxGridCellAttr_GetAlignment, 623).
+-define(wxGridCellAttr_GetRenderer, 624).
+-define(wxGridCellAttr_GetEditor, 625).
+-define(wxGridCellAttr_IsReadOnly, 626).
+-define(wxGridCellAttr_SetDefAttr, 627).
+-define(wxDC_Blit, 628).
+-define(wxDC_CalcBoundingBox, 629).
+-define(wxDC_Clear, 630).
+-define(wxDC_ComputeScaleAndOrigin, 631).
+-define(wxDC_CrossHair, 632).
+-define(wxDC_DestroyClippingRegion, 633).
+-define(wxDC_DeviceToLogicalX, 634).
+-define(wxDC_DeviceToLogicalXRel, 635).
+-define(wxDC_DeviceToLogicalY, 636).
+-define(wxDC_DeviceToLogicalYRel, 637).
+-define(wxDC_DrawArc, 638).
+-define(wxDC_DrawBitmap, 639).
+-define(wxDC_DrawCheckMark, 640).
+-define(wxDC_DrawCircle, 641).
+-define(wxDC_DrawEllipse_2, 643).
+-define(wxDC_DrawEllipse_1, 644).
+-define(wxDC_DrawEllipticArc, 645).
+-define(wxDC_DrawIcon, 646).
+-define(wxDC_DrawLabel, 647).
+-define(wxDC_DrawLine, 648).
+-define(wxDC_DrawLines, 649).
+-define(wxDC_DrawPolygon, 651).
+-define(wxDC_DrawPoint, 653).
+-define(wxDC_DrawRectangle_2, 655).
+-define(wxDC_DrawRectangle_1, 656).
+-define(wxDC_DrawRotatedText, 657).
+-define(wxDC_DrawRoundedRectangle_3, 659).
+-define(wxDC_DrawRoundedRectangle_2, 660).
+-define(wxDC_DrawText, 661).
+-define(wxDC_EndDoc, 662).
+-define(wxDC_EndPage, 663).
+-define(wxDC_FloodFill, 664).
+-define(wxDC_GetBackground, 665).
+-define(wxDC_GetBackgroundMode, 666).
+-define(wxDC_GetBrush, 667).
+-define(wxDC_GetCharHeight, 668).
+-define(wxDC_GetCharWidth, 669).
+-define(wxDC_GetClippingBox, 670).
+-define(wxDC_GetFont, 672).
+-define(wxDC_GetLayoutDirection, 673).
+-define(wxDC_GetLogicalFunction, 674).
+-define(wxDC_GetMapMode, 675).
+-define(wxDC_GetMultiLineTextExtent_4, 676).
+-define(wxDC_GetMultiLineTextExtent_1, 677).
+-define(wxDC_GetPartialTextExtents, 678).
+-define(wxDC_GetPen, 679).
+-define(wxDC_GetPixel, 680).
+-define(wxDC_GetPPI, 681).
+-define(wxDC_GetSize, 683).
+-define(wxDC_GetSizeMM, 685).
+-define(wxDC_GetTextBackground, 686).
+-define(wxDC_GetTextExtent_4, 687).
+-define(wxDC_GetTextExtent_1, 688).
+-define(wxDC_GetTextForeground, 690).
+-define(wxDC_GetUserScale, 691).
+-define(wxDC_GradientFillConcentric_3, 692).
+-define(wxDC_GradientFillConcentric_4, 693).
+-define(wxDC_GradientFillLinear, 694).
+-define(wxDC_LogicalToDeviceX, 695).
+-define(wxDC_LogicalToDeviceXRel, 696).
+-define(wxDC_LogicalToDeviceY, 697).
+-define(wxDC_LogicalToDeviceYRel, 698).
+-define(wxDC_MaxX, 699).
+-define(wxDC_MaxY, 700).
+-define(wxDC_MinX, 701).
+-define(wxDC_MinY, 702).
+-define(wxDC_IsOk, 703).
+-define(wxDC_ResetBoundingBox, 704).
+-define(wxDC_SetAxisOrientation, 705).
+-define(wxDC_SetBackground, 706).
+-define(wxDC_SetBackgroundMode, 707).
+-define(wxDC_SetBrush, 708).
+-define(wxDC_SetClippingRegion_2, 710).
+-define(wxDC_SetClippingRegion_1_1, 711).
+-define(wxDC_SetClippingRegion_1_0, 712).
+-define(wxDC_SetDeviceOrigin, 713).
+-define(wxDC_SetFont, 714).
+-define(wxDC_SetLayoutDirection, 715).
+-define(wxDC_SetLogicalFunction, 716).
+-define(wxDC_SetMapMode, 717).
+-define(wxDC_SetPalette, 718).
+-define(wxDC_SetPen, 719).
+-define(wxDC_SetTextBackground, 720).
+-define(wxDC_SetTextForeground, 721).
+-define(wxDC_SetUserScale, 722).
+-define(wxDC_StartDoc, 723).
+-define(wxDC_StartPage, 724).
+-define(wxMirrorDC_new, 725).
+-define(wxMirrorDC_destroy, 726).
+-define(wxScreenDC_new, 727).
+-define(wxScreenDC_destruct, 728).
+-define(wxPostScriptDC_new_0, 729).
+-define(wxPostScriptDC_new_1, 730).
+-define(wxPostScriptDC_destruct, 731).
+-define(wxPostScriptDC_SetResolution, 732).
+-define(wxPostScriptDC_GetResolution, 733).
+-define(wxWindowDC_new_0, 734).
+-define(wxWindowDC_new_1, 735).
+-define(wxWindowDC_destruct, 736).
+-define(wxClientDC_new_0, 737).
+-define(wxClientDC_new_1, 738).
+-define(wxClientDC_destroy, 739).
+-define(wxPaintDC_new_0, 740).
+-define(wxPaintDC_new_1, 741).
+-define(wxPaintDC_destroy, 742).
+-define(wxMemoryDC_new_1_0, 744).
+-define(wxMemoryDC_new_1_1, 745).
+-define(wxMemoryDC_new_0, 746).
+-define(wxMemoryDC_destruct, 748).
+-define(wxMemoryDC_SelectObject, 749).
+-define(wxMemoryDC_SelectObjectAsSource, 750).
+-define(wxBufferedDC_new_0, 751).
+-define(wxBufferedDC_new_2, 752).
+-define(wxBufferedDC_new_3, 753).
+-define(wxBufferedDC_destruct, 754).
+-define(wxBufferedDC_Init_2, 755).
+-define(wxBufferedDC_Init_3, 756).
+-define(wxBufferedPaintDC_new_3, 757).
+-define(wxBufferedPaintDC_new_2, 758).
+-define(wxBufferedPaintDC_destruct, 759).
+-define(wxGraphicsObject_destruct, 760).
+-define(wxGraphicsObject_GetRenderer, 761).
+-define(wxGraphicsObject_IsNull, 762).
+-define(wxGraphicsContext_destruct, 763).
+-define(wxGraphicsContext_Create_1_1, 764).
+-define(wxGraphicsContext_Create_1_0, 765).
+-define(wxGraphicsContext_Create_0, 766).
+-define(wxGraphicsContext_CreatePen, 767).
+-define(wxGraphicsContext_CreateBrush, 768).
+-define(wxGraphicsContext_CreateRadialGradientBrush, 769).
+-define(wxGraphicsContext_CreateLinearGradientBrush, 770).
+-define(wxGraphicsContext_CreateFont, 771).
+-define(wxGraphicsContext_CreateMatrix, 772).
+-define(wxGraphicsContext_CreatePath, 773).
+-define(wxGraphicsContext_Clip_1, 774).
+-define(wxGraphicsContext_Clip_4, 775).
+-define(wxGraphicsContext_ResetClip, 776).
+-define(wxGraphicsContext_DrawBitmap, 777).
+-define(wxGraphicsContext_DrawEllipse, 778).
+-define(wxGraphicsContext_DrawIcon, 779).
+-define(wxGraphicsContext_DrawLines, 780).
+-define(wxGraphicsContext_DrawPath, 781).
+-define(wxGraphicsContext_DrawRectangle, 782).
+-define(wxGraphicsContext_DrawRoundedRectangle, 783).
+-define(wxGraphicsContext_DrawText_3, 784).
+-define(wxGraphicsContext_DrawText_4_0, 785).
+-define(wxGraphicsContext_DrawText_4_1, 786).
+-define(wxGraphicsContext_DrawText_5, 787).
+-define(wxGraphicsContext_FillPath, 788).
+-define(wxGraphicsContext_StrokePath, 789).
+-define(wxGraphicsContext_GetPartialTextExtents, 790).
+-define(wxGraphicsContext_GetTextExtent, 791).
+-define(wxGraphicsContext_Rotate, 792).
+-define(wxGraphicsContext_Scale, 793).
+-define(wxGraphicsContext_Translate, 794).
+-define(wxGraphicsContext_GetTransform, 795).
+-define(wxGraphicsContext_SetTransform, 796).
+-define(wxGraphicsContext_ConcatTransform, 797).
+-define(wxGraphicsContext_SetBrush_1_1, 798).
+-define(wxGraphicsContext_SetBrush_1_0, 799).
+-define(wxGraphicsContext_SetFont_1, 800).
+-define(wxGraphicsContext_SetFont_2, 801).
+-define(wxGraphicsContext_SetPen_1_0, 802).
+-define(wxGraphicsContext_SetPen_1_1, 803).
+-define(wxGraphicsContext_StrokeLine, 804).
+-define(wxGraphicsContext_StrokeLines, 805).
+-define(wxGraphicsMatrix_Concat, 807).
+-define(wxGraphicsMatrix_Get, 809).
+-define(wxGraphicsMatrix_Invert, 810).
+-define(wxGraphicsMatrix_IsEqual, 811).
+-define(wxGraphicsMatrix_IsIdentity, 813).
+-define(wxGraphicsMatrix_Rotate, 814).
+-define(wxGraphicsMatrix_Scale, 815).
+-define(wxGraphicsMatrix_Translate, 816).
+-define(wxGraphicsMatrix_Set, 817).
+-define(wxGraphicsMatrix_TransformPoint, 818).
+-define(wxGraphicsMatrix_TransformDistance, 819).
+-define(wxGraphicsPath_MoveToPoint_2, 820).
+-define(wxGraphicsPath_MoveToPoint_1, 821).
+-define(wxGraphicsPath_AddArc_6, 822).
+-define(wxGraphicsPath_AddArc_5, 823).
+-define(wxGraphicsPath_AddArcToPoint, 824).
+-define(wxGraphicsPath_AddCircle, 825).
+-define(wxGraphicsPath_AddCurveToPoint_6, 826).
+-define(wxGraphicsPath_AddCurveToPoint_3, 827).
+-define(wxGraphicsPath_AddEllipse, 828).
+-define(wxGraphicsPath_AddLineToPoint_2, 829).
+-define(wxGraphicsPath_AddLineToPoint_1, 830).
+-define(wxGraphicsPath_AddPath, 831).
+-define(wxGraphicsPath_AddQuadCurveToPoint, 832).
+-define(wxGraphicsPath_AddRectangle, 833).
+-define(wxGraphicsPath_AddRoundedRectangle, 834).
+-define(wxGraphicsPath_CloseSubpath, 835).
+-define(wxGraphicsPath_Contains_3, 836).
+-define(wxGraphicsPath_Contains_2, 837).
+-define(wxGraphicsPath_GetBox, 839).
+-define(wxGraphicsPath_GetCurrentPoint, 841).
+-define(wxGraphicsPath_Transform, 842).
+-define(wxGraphicsRenderer_GetDefaultRenderer, 843).
+-define(wxGraphicsRenderer_CreateContext_1_1, 844).
+-define(wxGraphicsRenderer_CreateContext_1_0, 845).
+-define(wxGraphicsRenderer_CreatePen, 846).
+-define(wxGraphicsRenderer_CreateBrush, 847).
+-define(wxGraphicsRenderer_CreateLinearGradientBrush, 848).
+-define(wxGraphicsRenderer_CreateRadialGradientBrush, 849).
+-define(wxGraphicsRenderer_CreateFont, 850).
+-define(wxGraphicsRenderer_CreateMatrix, 851).
+-define(wxGraphicsRenderer_CreatePath, 852).
+-define(wxMenuBar_new_1, 854).
+-define(wxMenuBar_new_0, 856).
+-define(wxMenuBar_destruct, 858).
+-define(wxMenuBar_Append, 859).
+-define(wxMenuBar_Check, 860).
+-define(wxMenuBar_Enable_2, 861).
+-define(wxMenuBar_Enable_1, 862).
+-define(wxMenuBar_EnableTop, 863).
+-define(wxMenuBar_FindMenu, 864).
+-define(wxMenuBar_FindMenuItem, 865).
+-define(wxMenuBar_FindItem, 866).
+-define(wxMenuBar_GetHelpString, 867).
+-define(wxMenuBar_GetLabel_1, 868).
+-define(wxMenuBar_GetLabel_0, 869).
+-define(wxMenuBar_GetLabelTop, 870).
+-define(wxMenuBar_GetMenu, 871).
+-define(wxMenuBar_GetMenuCount, 872).
+-define(wxMenuBar_Insert, 873).
+-define(wxMenuBar_IsChecked, 874).
+-define(wxMenuBar_IsEnabled_1, 875).
+-define(wxMenuBar_IsEnabled_0, 876).
+-define(wxMenuBar_Remove, 877).
+-define(wxMenuBar_Replace, 878).
+-define(wxMenuBar_SetHelpString, 879).
+-define(wxMenuBar_SetLabel_2, 880).
+-define(wxMenuBar_SetLabel_1, 881).
+-define(wxMenuBar_SetLabelTop, 882).
+-define(wxControl_GetLabel, 883).
+-define(wxControl_SetLabel, 884).
+-define(wxControlWithItems_Append_1, 885).
+-define(wxControlWithItems_Append_2, 886).
+-define(wxControlWithItems_appendStrings_1, 887).
+-define(wxControlWithItems_Clear, 888).
+-define(wxControlWithItems_Delete, 889).
+-define(wxControlWithItems_FindString, 890).
+-define(wxControlWithItems_getClientData, 891).
+-define(wxControlWithItems_setClientData, 892).
+-define(wxControlWithItems_GetCount, 893).
+-define(wxControlWithItems_GetSelection, 894).
+-define(wxControlWithItems_GetString, 895).
+-define(wxControlWithItems_GetStringSelection, 896).
+-define(wxControlWithItems_Insert_2, 897).
+-define(wxControlWithItems_Insert_3, 898).
+-define(wxControlWithItems_IsEmpty, 899).
+-define(wxControlWithItems_Select, 900).
+-define(wxControlWithItems_SetSelection, 901).
+-define(wxControlWithItems_SetString, 902).
+-define(wxControlWithItems_SetStringSelection, 903).
+-define(wxMenu_new_2, 906).
+-define(wxMenu_new_1, 907).
+-define(wxMenu_destruct, 909).
+-define(wxMenu_Append_3, 910).
+-define(wxMenu_Append_1, 911).
+-define(wxMenu_Append_4_0, 912).
+-define(wxMenu_Append_4_1, 913).
+-define(wxMenu_AppendCheckItem, 914).
+-define(wxMenu_AppendRadioItem, 915).
+-define(wxMenu_AppendSeparator, 916).
+-define(wxMenu_Break, 917).
+-define(wxMenu_Check, 918).
+-define(wxMenu_Delete_1_0, 919).
+-define(wxMenu_Delete_1_1, 920).
+-define(wxMenu_Destroy_1_0, 921).
+-define(wxMenu_Destroy_1_1, 922).
+-define(wxMenu_Enable, 923).
+-define(wxMenu_FindItem_1, 924).
+-define(wxMenu_FindItem_2, 925).
+-define(wxMenu_FindItemByPosition, 926).
+-define(wxMenu_GetHelpString, 927).
+-define(wxMenu_GetLabel, 928).
+-define(wxMenu_GetMenuItemCount, 929).
+-define(wxMenu_GetMenuItems, 930).
+-define(wxMenu_GetTitle, 932).
+-define(wxMenu_Insert_2, 933).
+-define(wxMenu_Insert_3, 934).
+-define(wxMenu_Insert_5_1, 935).
+-define(wxMenu_Insert_5_0, 936).
+-define(wxMenu_InsertCheckItem, 937).
+-define(wxMenu_InsertRadioItem, 938).
+-define(wxMenu_InsertSeparator, 939).
+-define(wxMenu_IsChecked, 940).
+-define(wxMenu_IsEnabled, 941).
+-define(wxMenu_Prepend_1, 942).
+-define(wxMenu_Prepend_2, 943).
+-define(wxMenu_Prepend_4_1, 944).
+-define(wxMenu_Prepend_4_0, 945).
+-define(wxMenu_PrependCheckItem, 946).
+-define(wxMenu_PrependRadioItem, 947).
+-define(wxMenu_PrependSeparator, 948).
+-define(wxMenu_Remove_1_0, 949).
+-define(wxMenu_Remove_1_1, 950).
+-define(wxMenu_SetHelpString, 951).
+-define(wxMenu_SetLabel, 952).
+-define(wxMenu_SetTitle, 953).
+-define(wxMenuItem_new, 954).
+-define(wxMenuItem_destruct, 956).
+-define(wxMenuItem_Check, 957).
+-define(wxMenuItem_Enable, 958).
+-define(wxMenuItem_GetBitmap, 959).
+-define(wxMenuItem_GetHelp, 960).
+-define(wxMenuItem_GetId, 961).
+-define(wxMenuItem_GetKind, 962).
+-define(wxMenuItem_GetLabel, 963).
+-define(wxMenuItem_GetLabelFromText, 964).
+-define(wxMenuItem_GetMenu, 965).
+-define(wxMenuItem_GetText, 966).
+-define(wxMenuItem_GetSubMenu, 967).
+-define(wxMenuItem_IsCheckable, 968).
+-define(wxMenuItem_IsChecked, 969).
+-define(wxMenuItem_IsEnabled, 970).
+-define(wxMenuItem_IsSeparator, 971).
+-define(wxMenuItem_IsSubMenu, 972).
+-define(wxMenuItem_SetBitmap, 973).
+-define(wxMenuItem_SetHelp, 974).
+-define(wxMenuItem_SetMenu, 975).
+-define(wxMenuItem_SetSubMenu, 976).
+-define(wxMenuItem_SetText, 977).
+-define(wxToolBar_AddControl, 978).
+-define(wxToolBar_AddSeparator, 979).
+-define(wxToolBar_AddTool_5, 980).
+-define(wxToolBar_AddTool_4_0, 981).
+-define(wxToolBar_AddTool_1, 982).
+-define(wxToolBar_AddTool_4_1, 983).
+-define(wxToolBar_AddTool_3, 984).
+-define(wxToolBar_AddTool_6, 985).
+-define(wxToolBar_AddCheckTool, 986).
+-define(wxToolBar_AddRadioTool, 987).
+-define(wxToolBar_AddStretchableSpace, 988).
+-define(wxToolBar_InsertStretchableSpace, 989).
+-define(wxToolBar_DeleteTool, 990).
+-define(wxToolBar_DeleteToolByPos, 991).
+-define(wxToolBar_EnableTool, 992).
+-define(wxToolBar_FindById, 993).
+-define(wxToolBar_FindControl, 994).
+-define(wxToolBar_FindToolForPosition, 995).
+-define(wxToolBar_GetToolSize, 996).
+-define(wxToolBar_GetToolBitmapSize, 997).
+-define(wxToolBar_GetMargins, 998).
+-define(wxToolBar_GetToolEnabled, 999).
+-define(wxToolBar_GetToolLongHelp, 1000).
+-define(wxToolBar_GetToolPacking, 1001).
+-define(wxToolBar_GetToolPos, 1002).
+-define(wxToolBar_GetToolSeparation, 1003).
+-define(wxToolBar_GetToolShortHelp, 1004).
+-define(wxToolBar_GetToolState, 1005).
+-define(wxToolBar_InsertControl, 1006).
+-define(wxToolBar_InsertSeparator, 1007).
+-define(wxToolBar_InsertTool_5, 1008).
+-define(wxToolBar_InsertTool_2, 1009).
+-define(wxToolBar_InsertTool_4, 1010).
+-define(wxToolBar_Realize, 1011).
+-define(wxToolBar_RemoveTool, 1012).
+-define(wxToolBar_SetMargins, 1013).
+-define(wxToolBar_SetToolBitmapSize, 1014).
+-define(wxToolBar_SetToolLongHelp, 1015).
+-define(wxToolBar_SetToolPacking, 1016).
+-define(wxToolBar_SetToolShortHelp, 1017).
+-define(wxToolBar_SetToolSeparation, 1018).
+-define(wxToolBar_ToggleTool, 1019).
+-define(wxStatusBar_new_0, 1021).
+-define(wxStatusBar_new_2, 1022).
+-define(wxStatusBar_destruct, 1024).
+-define(wxStatusBar_Create, 1025).
+-define(wxStatusBar_GetFieldRect, 1026).
+-define(wxStatusBar_GetFieldsCount, 1027).
+-define(wxStatusBar_GetStatusText, 1028).
+-define(wxStatusBar_PopStatusText, 1029).
+-define(wxStatusBar_PushStatusText, 1030).
+-define(wxStatusBar_SetFieldsCount, 1031).
+-define(wxStatusBar_SetMinHeight, 1032).
+-define(wxStatusBar_SetStatusText, 1033).
+-define(wxStatusBar_SetStatusWidths, 1034).
+-define(wxStatusBar_SetStatusStyles, 1035).
+-define(wxBitmap_new_0, 1036).
+-define(wxBitmap_new_3, 1037).
+-define(wxBitmap_new_4, 1038).
+-define(wxBitmap_new_2_0, 1039).
+-define(wxBitmap_new_2_1, 1040).
+-define(wxBitmap_destruct, 1041).
+-define(wxBitmap_ConvertToImage, 1042).
+-define(wxBitmap_CopyFromIcon, 1043).
+-define(wxBitmap_Create, 1044).
+-define(wxBitmap_GetDepth, 1045).
+-define(wxBitmap_GetHeight, 1046).
+-define(wxBitmap_GetPalette, 1047).
+-define(wxBitmap_GetMask, 1048).
+-define(wxBitmap_GetWidth, 1049).
+-define(wxBitmap_GetSubBitmap, 1050).
+-define(wxBitmap_LoadFile, 1051).
+-define(wxBitmap_Ok, 1052).
+-define(wxBitmap_SaveFile, 1053).
+-define(wxBitmap_SetDepth, 1054).
+-define(wxBitmap_SetHeight, 1055).
+-define(wxBitmap_SetMask, 1056).
+-define(wxBitmap_SetPalette, 1057).
+-define(wxBitmap_SetWidth, 1058).
+-define(wxIcon_new_0, 1059).
+-define(wxIcon_new_2, 1060).
+-define(wxIcon_new_1, 1061).
+-define(wxIcon_CopyFromBitmap, 1062).
+-define(wxIcon_destroy, 1063).
+-define(wxIconBundle_new_0, 1064).
+-define(wxIconBundle_new_2, 1065).
+-define(wxIconBundle_new_1_0, 1066).
+-define(wxIconBundle_new_1_1, 1067).
+-define(wxIconBundle_destruct, 1068).
+-define(wxIconBundle_AddIcon_2, 1069).
+-define(wxIconBundle_AddIcon_1, 1070).
+-define(wxIconBundle_GetIcon_1_1, 1071).
+-define(wxIconBundle_GetIcon_1_0, 1072).
+-define(wxCursor_new_0, 1073).
+-define(wxCursor_new_1_0, 1074).
+-define(wxCursor_new_1_1, 1075).
+-define(wxCursor_new_4, 1076).
+-define(wxCursor_destruct, 1077).
+-define(wxCursor_Ok, 1078).
+-define(wxMask_new_0, 1079).
+-define(wxMask_new_2_1, 1080).
+-define(wxMask_new_2_0, 1081).
+-define(wxMask_new_1, 1082).
+-define(wxMask_destruct, 1083).
+-define(wxMask_Create_2_1, 1084).
+-define(wxMask_Create_2_0, 1085).
+-define(wxMask_Create_1, 1086).
+-define(wxImage_new_0, 1087).
+-define(wxImage_new_3_0, 1088).
+-define(wxImage_new_4, 1089).
+-define(wxImage_new_5, 1090).
+-define(wxImage_new_2, 1091).
+-define(wxImage_new_3_1, 1092).
+-define(wxImage_Blur, 1093).
+-define(wxImage_BlurHorizontal, 1094).
+-define(wxImage_BlurVertical, 1095).
+-define(wxImage_ConvertAlphaToMask, 1096).
+-define(wxImage_ConvertToGreyscale, 1097).
+-define(wxImage_ConvertToMono, 1098).
+-define(wxImage_Copy, 1099).
+-define(wxImage_Create_3, 1100).
+-define(wxImage_Create_4, 1101).
+-define(wxImage_Create_5, 1102).
+-define(wxImage_Destroy, 1103).
+-define(wxImage_FindFirstUnusedColour, 1104).
+-define(wxImage_GetImageExtWildcard, 1105).
+-define(wxImage_GetAlpha_2, 1106).
+-define(wxImage_GetAlpha_0, 1107).
+-define(wxImage_GetBlue, 1108).
+-define(wxImage_GetData, 1109).
+-define(wxImage_GetGreen, 1110).
+-define(wxImage_GetImageCount, 1111).
+-define(wxImage_GetHeight, 1112).
+-define(wxImage_GetMaskBlue, 1113).
+-define(wxImage_GetMaskGreen, 1114).
+-define(wxImage_GetMaskRed, 1115).
+-define(wxImage_GetOrFindMaskColour, 1116).
+-define(wxImage_GetPalette, 1117).
+-define(wxImage_GetRed, 1118).
+-define(wxImage_GetSubImage, 1119).
+-define(wxImage_GetWidth, 1120).
+-define(wxImage_HasAlpha, 1121).
+-define(wxImage_HasMask, 1122).
+-define(wxImage_GetOption, 1123).
+-define(wxImage_GetOptionInt, 1124).
+-define(wxImage_HasOption, 1125).
+-define(wxImage_InitAlpha, 1126).
+-define(wxImage_InitStandardHandlers, 1127).
+-define(wxImage_IsTransparent, 1128).
+-define(wxImage_LoadFile_2, 1129).
+-define(wxImage_LoadFile_3, 1130).
+-define(wxImage_Ok, 1131).
+-define(wxImage_RemoveHandler, 1132).
+-define(wxImage_Mirror, 1133).
+-define(wxImage_Replace, 1134).
+-define(wxImage_Rescale, 1135).
+-define(wxImage_Resize, 1136).
+-define(wxImage_Rotate, 1137).
+-define(wxImage_RotateHue, 1138).
+-define(wxImage_Rotate90, 1139).
+-define(wxImage_SaveFile_1, 1140).
+-define(wxImage_SaveFile_2_0, 1141).
+-define(wxImage_SaveFile_2_1, 1142).
+-define(wxImage_Scale, 1143).
+-define(wxImage_Size, 1144).
+-define(wxImage_SetAlpha_3, 1145).
+-define(wxImage_SetAlpha_2, 1146).
+-define(wxImage_SetData_2, 1147).
+-define(wxImage_SetData_4, 1148).
+-define(wxImage_SetMask, 1149).
+-define(wxImage_SetMaskColour, 1150).
+-define(wxImage_SetMaskFromImage, 1151).
+-define(wxImage_SetOption_2_1, 1152).
+-define(wxImage_SetOption_2_0, 1153).
+-define(wxImage_SetPalette, 1154).
+-define(wxImage_SetRGB_5, 1155).
+-define(wxImage_SetRGB_4, 1156).
+-define(wxImage_destroy, 1157).
+-define(wxBrush_new_0, 1158).
+-define(wxBrush_new_2, 1159).
+-define(wxBrush_new_1, 1160).
+-define(wxBrush_destruct, 1162).
+-define(wxBrush_GetColour, 1163).
+-define(wxBrush_GetStipple, 1164).
+-define(wxBrush_GetStyle, 1165).
+-define(wxBrush_IsHatch, 1166).
+-define(wxBrush_IsOk, 1167).
+-define(wxBrush_SetColour_1, 1168).
+-define(wxBrush_SetColour_3, 1169).
+-define(wxBrush_SetStipple, 1170).
+-define(wxBrush_SetStyle, 1171).
+-define(wxPen_new_0, 1172).
+-define(wxPen_new_2, 1173).
+-define(wxPen_destruct, 1174).
+-define(wxPen_GetCap, 1175).
+-define(wxPen_GetColour, 1176).
+-define(wxPen_GetJoin, 1177).
+-define(wxPen_GetStyle, 1178).
+-define(wxPen_GetWidth, 1179).
+-define(wxPen_IsOk, 1180).
+-define(wxPen_SetCap, 1181).
+-define(wxPen_SetColour_1, 1182).
+-define(wxPen_SetColour_3, 1183).
+-define(wxPen_SetJoin, 1184).
+-define(wxPen_SetStyle, 1185).
+-define(wxPen_SetWidth, 1186).
+-define(wxRegion_new_0, 1187).
+-define(wxRegion_new_4, 1188).
+-define(wxRegion_new_2, 1189).
+-define(wxRegion_new_1_1, 1190).
+-define(wxRegion_new_1_0, 1192).
+-define(wxRegion_destruct, 1194).
+-define(wxRegion_Clear, 1195).
+-define(wxRegion_Contains_2, 1196).
+-define(wxRegion_Contains_1_0, 1197).
+-define(wxRegion_Contains_4, 1198).
+-define(wxRegion_Contains_1_1, 1199).
+-define(wxRegion_ConvertToBitmap, 1200).
+-define(wxRegion_GetBox, 1201).
+-define(wxRegion_Intersect_4, 1202).
+-define(wxRegion_Intersect_1_1, 1203).
+-define(wxRegion_Intersect_1_0, 1204).
+-define(wxRegion_IsEmpty, 1205).
+-define(wxRegion_Subtract_4, 1206).
+-define(wxRegion_Subtract_1_1, 1207).
+-define(wxRegion_Subtract_1_0, 1208).
+-define(wxRegion_Offset_2, 1209).
+-define(wxRegion_Offset_1, 1210).
+-define(wxRegion_Union_4, 1211).
+-define(wxRegion_Union_1_2, 1212).
+-define(wxRegion_Union_1_1, 1213).
+-define(wxRegion_Union_1_0, 1214).
+-define(wxRegion_Union_3, 1215).
+-define(wxRegion_Xor_4, 1216).
+-define(wxRegion_Xor_1_1, 1217).
+-define(wxRegion_Xor_1_0, 1218).
+-define(wxAcceleratorTable_new_0, 1219).
+-define(wxAcceleratorTable_new_2, 1220).
+-define(wxAcceleratorTable_destruct, 1221).
+-define(wxAcceleratorTable_Ok, 1222).
+-define(wxAcceleratorEntry_new_1_0, 1223).
+-define(wxAcceleratorEntry_new_1_1, 1224).
+-define(wxAcceleratorEntry_GetCommand, 1225).
+-define(wxAcceleratorEntry_GetFlags, 1226).
+-define(wxAcceleratorEntry_GetKeyCode, 1227).
+-define(wxAcceleratorEntry_Set, 1228).
+-define(wxAcceleratorEntry_destroy, 1229).
+-define(wxCaret_new_3, 1234).
+-define(wxCaret_new_2, 1235).
+-define(wxCaret_destruct, 1237).
+-define(wxCaret_Create_3, 1238).
+-define(wxCaret_Create_2, 1239).
+-define(wxCaret_GetBlinkTime, 1240).
+-define(wxCaret_GetPosition, 1242).
+-define(wxCaret_GetSize, 1244).
+-define(wxCaret_GetWindow, 1245).
+-define(wxCaret_Hide, 1246).
+-define(wxCaret_IsOk, 1247).
+-define(wxCaret_IsVisible, 1248).
+-define(wxCaret_Move_2, 1249).
+-define(wxCaret_Move_1, 1250).
+-define(wxCaret_SetBlinkTime, 1251).
+-define(wxCaret_SetSize_2, 1252).
+-define(wxCaret_SetSize_1, 1253).
+-define(wxCaret_Show, 1254).
+-define(wxSizer_Add_2_1, 1255).
+-define(wxSizer_Add_2_0, 1256).
+-define(wxSizer_Add_3, 1257).
+-define(wxSizer_Add_2_3, 1258).
+-define(wxSizer_Add_2_2, 1259).
+-define(wxSizer_AddSpacer, 1260).
+-define(wxSizer_AddStretchSpacer, 1261).
+-define(wxSizer_CalcMin, 1262).
+-define(wxSizer_Clear, 1263).
+-define(wxSizer_Detach_1_2, 1264).
+-define(wxSizer_Detach_1_1, 1265).
+-define(wxSizer_Detach_1_0, 1266).
+-define(wxSizer_Fit, 1267).
+-define(wxSizer_FitInside, 1268).
+-define(wxSizer_GetChildren, 1269).
+-define(wxSizer_GetItem_2_1, 1270).
+-define(wxSizer_GetItem_2_0, 1271).
+-define(wxSizer_GetItem_1, 1272).
+-define(wxSizer_GetSize, 1273).
+-define(wxSizer_GetPosition, 1274).
+-define(wxSizer_GetMinSize, 1275).
+-define(wxSizer_Hide_2_0, 1276).
+-define(wxSizer_Hide_2_1, 1277).
+-define(wxSizer_Hide_1, 1278).
+-define(wxSizer_Insert_3_1, 1279).
+-define(wxSizer_Insert_3_0, 1280).
+-define(wxSizer_Insert_4, 1281).
+-define(wxSizer_Insert_3_3, 1282).
+-define(wxSizer_Insert_3_2, 1283).
+-define(wxSizer_Insert_2, 1284).
+-define(wxSizer_InsertSpacer, 1285).
+-define(wxSizer_InsertStretchSpacer, 1286).
+-define(wxSizer_IsShown_1_2, 1287).
+-define(wxSizer_IsShown_1_1, 1288).
+-define(wxSizer_IsShown_1_0, 1289).
+-define(wxSizer_Layout, 1290).
+-define(wxSizer_Prepend_2_1, 1291).
+-define(wxSizer_Prepend_2_0, 1292).
+-define(wxSizer_Prepend_3, 1293).
+-define(wxSizer_Prepend_2_3, 1294).
+-define(wxSizer_Prepend_2_2, 1295).
+-define(wxSizer_Prepend_1, 1296).
+-define(wxSizer_PrependSpacer, 1297).
+-define(wxSizer_PrependStretchSpacer, 1298).
+-define(wxSizer_RecalcSizes, 1299).
+-define(wxSizer_Remove_1_1, 1300).
+-define(wxSizer_Remove_1_0, 1301).
+-define(wxSizer_Replace_3_1, 1302).
+-define(wxSizer_Replace_3_0, 1303).
+-define(wxSizer_Replace_2, 1304).
+-define(wxSizer_SetDimension, 1305).
+-define(wxSizer_SetMinSize_2, 1306).
+-define(wxSizer_SetMinSize_1, 1307).
+-define(wxSizer_SetItemMinSize_3_2, 1308).
+-define(wxSizer_SetItemMinSize_2_2, 1309).
+-define(wxSizer_SetItemMinSize_3_1, 1310).
+-define(wxSizer_SetItemMinSize_2_1, 1311).
+-define(wxSizer_SetItemMinSize_3_0, 1312).
+-define(wxSizer_SetItemMinSize_2_0, 1313).
+-define(wxSizer_SetSizeHints, 1314).
+-define(wxSizer_SetVirtualSizeHints, 1315).
+-define(wxSizer_Show_2_2, 1316).
+-define(wxSizer_Show_2_1, 1317).
+-define(wxSizer_Show_2_0, 1318).
+-define(wxSizer_Show_1, 1319).
+-define(wxSizerFlags_new, 1320).
+-define(wxSizerFlags_Align, 1321).
+-define(wxSizerFlags_Border_2, 1322).
+-define(wxSizerFlags_Border_1, 1323).
+-define(wxSizerFlags_Center, 1324).
+-define(wxSizerFlags_Centre, 1325).
+-define(wxSizerFlags_Expand, 1326).
+-define(wxSizerFlags_Left, 1327).
+-define(wxSizerFlags_Proportion, 1328).
+-define(wxSizerFlags_Right, 1329).
+-define(wxSizerFlags_destroy, 1330).
+-define(wxSizerItem_new_5_1, 1331).
+-define(wxSizerItem_new_2_1, 1332).
+-define(wxSizerItem_new_5_0, 1333).
+-define(wxSizerItem_new_2_0, 1334).
+-define(wxSizerItem_new_6, 1335).
+-define(wxSizerItem_new_3, 1336).
+-define(wxSizerItem_new_0, 1337).
+-define(wxSizerItem_destruct, 1338).
+-define(wxSizerItem_CalcMin, 1339).
+-define(wxSizerItem_DeleteWindows, 1340).
+-define(wxSizerItem_DetachSizer, 1341).
+-define(wxSizerItem_GetBorder, 1342).
+-define(wxSizerItem_GetFlag, 1343).
+-define(wxSizerItem_GetMinSize, 1344).
+-define(wxSizerItem_GetPosition, 1345).
+-define(wxSizerItem_GetProportion, 1346).
+-define(wxSizerItem_GetRatio, 1347).
+-define(wxSizerItem_GetRect, 1348).
+-define(wxSizerItem_GetSize, 1349).
+-define(wxSizerItem_GetSizer, 1350).
+-define(wxSizerItem_GetSpacer, 1351).
+-define(wxSizerItem_GetUserData, 1352).
+-define(wxSizerItem_GetWindow, 1353).
+-define(wxSizerItem_IsSizer, 1354).
+-define(wxSizerItem_IsShown, 1355).
+-define(wxSizerItem_IsSpacer, 1356).
+-define(wxSizerItem_IsWindow, 1357).
+-define(wxSizerItem_SetBorder, 1358).
+-define(wxSizerItem_SetDimension, 1359).
+-define(wxSizerItem_SetFlag, 1360).
+-define(wxSizerItem_SetInitSize, 1361).
+-define(wxSizerItem_SetMinSize_1, 1362).
+-define(wxSizerItem_SetMinSize_2, 1363).
+-define(wxSizerItem_SetProportion, 1364).
+-define(wxSizerItem_SetRatio_2, 1365).
+-define(wxSizerItem_SetRatio_1_1, 1366).
+-define(wxSizerItem_SetRatio_1_0, 1367).
+-define(wxSizerItem_SetSizer, 1368).
+-define(wxSizerItem_SetSpacer_1, 1369).
+-define(wxSizerItem_SetSpacer_2, 1370).
+-define(wxSizerItem_SetWindow, 1371).
+-define(wxSizerItem_Show, 1372).
+-define(wxBoxSizer_new, 1373).
+-define(wxBoxSizer_GetOrientation, 1374).
+-define(wxBoxSizer_destroy, 1375).
+-define(wxStaticBoxSizer_new_2, 1376).
+-define(wxStaticBoxSizer_new_3, 1377).
+-define(wxStaticBoxSizer_GetStaticBox, 1378).
+-define(wxStaticBoxSizer_destroy, 1379).
+-define(wxGridSizer_new_4, 1380).
+-define(wxGridSizer_new_2, 1381).
+-define(wxGridSizer_GetCols, 1382).
+-define(wxGridSizer_GetHGap, 1383).
+-define(wxGridSizer_GetRows, 1384).
+-define(wxGridSizer_GetVGap, 1385).
+-define(wxGridSizer_SetCols, 1386).
+-define(wxGridSizer_SetHGap, 1387).
+-define(wxGridSizer_SetRows, 1388).
+-define(wxGridSizer_SetVGap, 1389).
+-define(wxGridSizer_destroy, 1390).
+-define(wxFlexGridSizer_new_4, 1391).
+-define(wxFlexGridSizer_new_2, 1392).
+-define(wxFlexGridSizer_AddGrowableCol, 1393).
+-define(wxFlexGridSizer_AddGrowableRow, 1394).
+-define(wxFlexGridSizer_GetFlexibleDirection, 1395).
+-define(wxFlexGridSizer_GetNonFlexibleGrowMode, 1396).
+-define(wxFlexGridSizer_RemoveGrowableCol, 1397).
+-define(wxFlexGridSizer_RemoveGrowableRow, 1398).
+-define(wxFlexGridSizer_SetFlexibleDirection, 1399).
+-define(wxFlexGridSizer_SetNonFlexibleGrowMode, 1400).
+-define(wxFlexGridSizer_destroy, 1401).
+-define(wxGridBagSizer_new, 1402).
+-define(wxGridBagSizer_Add_3_2, 1403).
+-define(wxGridBagSizer_Add_3_1, 1404).
+-define(wxGridBagSizer_Add_4, 1405).
+-define(wxGridBagSizer_Add_1_0, 1406).
+-define(wxGridBagSizer_Add_2_1, 1407).
+-define(wxGridBagSizer_Add_2_0, 1408).
+-define(wxGridBagSizer_Add_3_0, 1409).
+-define(wxGridBagSizer_Add_1_1, 1410).
+-define(wxGridBagSizer_CalcMin, 1411).
+-define(wxGridBagSizer_CheckForIntersection_2, 1412).
+-define(wxGridBagSizer_CheckForIntersection_3, 1413).
+-define(wxGridBagSizer_FindItem_1_1, 1414).
+-define(wxGridBagSizer_FindItem_1_0, 1415).
+-define(wxGridBagSizer_FindItemAtPoint, 1416).
+-define(wxGridBagSizer_FindItemAtPosition, 1417).
+-define(wxGridBagSizer_FindItemWithData, 1418).
+-define(wxGridBagSizer_GetCellSize, 1419).
+-define(wxGridBagSizer_GetEmptyCellSize, 1420).
+-define(wxGridBagSizer_GetItemPosition_1_2, 1421).
+-define(wxGridBagSizer_GetItemPosition_1_1, 1422).
+-define(wxGridBagSizer_GetItemPosition_1_0, 1423).
+-define(wxGridBagSizer_GetItemSpan_1_2, 1424).
+-define(wxGridBagSizer_GetItemSpan_1_1, 1425).
+-define(wxGridBagSizer_GetItemSpan_1_0, 1426).
+-define(wxGridBagSizer_SetEmptyCellSize, 1427).
+-define(wxGridBagSizer_SetItemPosition_2_2, 1428).
+-define(wxGridBagSizer_SetItemPosition_2_1, 1429).
+-define(wxGridBagSizer_SetItemPosition_2_0, 1430).
+-define(wxGridBagSizer_SetItemSpan_2_2, 1431).
+-define(wxGridBagSizer_SetItemSpan_2_1, 1432).
+-define(wxGridBagSizer_SetItemSpan_2_0, 1433).
+-define(wxGridBagSizer_destroy, 1434).
+-define(wxStdDialogButtonSizer_new, 1435).
+-define(wxStdDialogButtonSizer_AddButton, 1436).
+-define(wxStdDialogButtonSizer_Realize, 1437).
+-define(wxStdDialogButtonSizer_SetAffirmativeButton, 1438).
+-define(wxStdDialogButtonSizer_SetCancelButton, 1439).
+-define(wxStdDialogButtonSizer_SetNegativeButton, 1440).
+-define(wxStdDialogButtonSizer_destroy, 1441).
+-define(wxFont_new_0, 1442).
+-define(wxFont_new_1, 1443).
+-define(wxFont_new_5, 1444).
+-define(wxFont_destruct, 1446).
+-define(wxFont_IsFixedWidth, 1447).
+-define(wxFont_GetDefaultEncoding, 1448).
+-define(wxFont_GetFaceName, 1449).
+-define(wxFont_GetFamily, 1450).
+-define(wxFont_GetNativeFontInfoDesc, 1451).
+-define(wxFont_GetNativeFontInfoUserDesc, 1452).
+-define(wxFont_GetPointSize, 1453).
+-define(wxFont_GetStyle, 1454).
+-define(wxFont_GetUnderlined, 1455).
+-define(wxFont_GetWeight, 1456).
+-define(wxFont_Ok, 1457).
+-define(wxFont_SetDefaultEncoding, 1458).
+-define(wxFont_SetFaceName, 1459).
+-define(wxFont_SetFamily, 1460).
+-define(wxFont_SetPointSize, 1461).
+-define(wxFont_SetStyle, 1462).
+-define(wxFont_SetUnderlined, 1463).
+-define(wxFont_SetWeight, 1464).
+-define(wxToolTip_Enable, 1465).
+-define(wxToolTip_SetDelay, 1466).
+-define(wxToolTip_new, 1467).
+-define(wxToolTip_SetTip, 1468).
+-define(wxToolTip_GetTip, 1469).
+-define(wxToolTip_GetWindow, 1470).
+-define(wxToolTip_destroy, 1471).
+-define(wxButton_new_3, 1473).
+-define(wxButton_new_0, 1474).
+-define(wxButton_destruct, 1475).
+-define(wxButton_Create, 1476).
+-define(wxButton_GetDefaultSize, 1477).
+-define(wxButton_SetDefault, 1478).
+-define(wxButton_SetLabel, 1479).
+-define(wxBitmapButton_new_4, 1481).
+-define(wxBitmapButton_new_0, 1482).
+-define(wxBitmapButton_Create, 1483).
+-define(wxBitmapButton_GetBitmapDisabled, 1484).
+-define(wxBitmapButton_GetBitmapFocus, 1486).
+-define(wxBitmapButton_GetBitmapLabel, 1488).
+-define(wxBitmapButton_GetBitmapSelected, 1490).
+-define(wxBitmapButton_SetBitmapDisabled, 1492).
+-define(wxBitmapButton_SetBitmapFocus, 1493).
+-define(wxBitmapButton_SetBitmapLabel, 1494).
+-define(wxBitmapButton_SetBitmapSelected, 1495).
+-define(wxBitmapButton_destroy, 1496).
+-define(wxToggleButton_new_0, 1497).
+-define(wxToggleButton_new_4, 1498).
+-define(wxToggleButton_Create, 1499).
+-define(wxToggleButton_GetValue, 1500).
+-define(wxToggleButton_SetValue, 1501).
+-define(wxToggleButton_destroy, 1502).
+-define(wxCalendarCtrl_new_0, 1503).
+-define(wxCalendarCtrl_new_3, 1504).
+-define(wxCalendarCtrl_Create, 1505).
+-define(wxCalendarCtrl_destruct, 1506).
+-define(wxCalendarCtrl_SetDate, 1507).
+-define(wxCalendarCtrl_GetDate, 1508).
+-define(wxCalendarCtrl_EnableYearChange, 1509).
+-define(wxCalendarCtrl_EnableMonthChange, 1510).
+-define(wxCalendarCtrl_EnableHolidayDisplay, 1511).
+-define(wxCalendarCtrl_SetHeaderColours, 1512).
+-define(wxCalendarCtrl_GetHeaderColourFg, 1513).
+-define(wxCalendarCtrl_GetHeaderColourBg, 1514).
+-define(wxCalendarCtrl_SetHighlightColours, 1515).
+-define(wxCalendarCtrl_GetHighlightColourFg, 1516).
+-define(wxCalendarCtrl_GetHighlightColourBg, 1517).
+-define(wxCalendarCtrl_SetHolidayColours, 1518).
+-define(wxCalendarCtrl_GetHolidayColourFg, 1519).
+-define(wxCalendarCtrl_GetHolidayColourBg, 1520).
+-define(wxCalendarCtrl_GetAttr, 1521).
+-define(wxCalendarCtrl_SetAttr, 1522).
+-define(wxCalendarCtrl_SetHoliday, 1523).
+-define(wxCalendarCtrl_ResetAttr, 1524).
+-define(wxCalendarCtrl_HitTest, 1525).
+-define(wxCalendarDateAttr_new_0, 1526).
+-define(wxCalendarDateAttr_new_2_1, 1527).
+-define(wxCalendarDateAttr_new_2_0, 1528).
+-define(wxCalendarDateAttr_SetTextColour, 1529).
+-define(wxCalendarDateAttr_SetBackgroundColour, 1530).
+-define(wxCalendarDateAttr_SetBorderColour, 1531).
+-define(wxCalendarDateAttr_SetFont, 1532).
+-define(wxCalendarDateAttr_SetBorder, 1533).
+-define(wxCalendarDateAttr_SetHoliday, 1534).
+-define(wxCalendarDateAttr_HasTextColour, 1535).
+-define(wxCalendarDateAttr_HasBackgroundColour, 1536).
+-define(wxCalendarDateAttr_HasBorderColour, 1537).
+-define(wxCalendarDateAttr_HasFont, 1538).
+-define(wxCalendarDateAttr_HasBorder, 1539).
+-define(wxCalendarDateAttr_IsHoliday, 1540).
+-define(wxCalendarDateAttr_GetTextColour, 1541).
+-define(wxCalendarDateAttr_GetBackgroundColour, 1542).
+-define(wxCalendarDateAttr_GetBorderColour, 1543).
+-define(wxCalendarDateAttr_GetFont, 1544).
+-define(wxCalendarDateAttr_GetBorder, 1545).
+-define(wxCalendarDateAttr_destroy, 1546).
+-define(wxCheckBox_new_4, 1548).
+-define(wxCheckBox_new_0, 1549).
+-define(wxCheckBox_Create, 1550).
+-define(wxCheckBox_GetValue, 1551).
+-define(wxCheckBox_Get3StateValue, 1552).
+-define(wxCheckBox_Is3rdStateAllowedForUser, 1553).
+-define(wxCheckBox_Is3State, 1554).
+-define(wxCheckBox_IsChecked, 1555).
+-define(wxCheckBox_SetValue, 1556).
+-define(wxCheckBox_Set3StateValue, 1557).
+-define(wxCheckBox_destroy, 1558).
+-define(wxCheckListBox_new_0, 1559).
+-define(wxCheckListBox_new_3, 1561).
+-define(wxCheckListBox_Check, 1562).
+-define(wxCheckListBox_IsChecked, 1563).
+-define(wxCheckListBox_destroy, 1564).
+-define(wxChoice_new_3, 1567).
+-define(wxChoice_new_0, 1568).
+-define(wxChoice_destruct, 1570).
+-define(wxChoice_Create, 1572).
+-define(wxChoice_Delete, 1573).
+-define(wxChoice_GetColumns, 1574).
+-define(wxChoice_SetColumns, 1575).
+-define(wxComboBox_new_0, 1576).
+-define(wxComboBox_new_3, 1578).
+-define(wxComboBox_destruct, 1579).
+-define(wxComboBox_Create, 1581).
+-define(wxComboBox_CanCopy, 1582).
+-define(wxComboBox_CanCut, 1583).
+-define(wxComboBox_CanPaste, 1584).
+-define(wxComboBox_CanRedo, 1585).
+-define(wxComboBox_CanUndo, 1586).
+-define(wxComboBox_Copy, 1587).
+-define(wxComboBox_Cut, 1588).
+-define(wxComboBox_GetInsertionPoint, 1589).
+-define(wxComboBox_GetLastPosition, 1590).
+-define(wxComboBox_GetValue, 1591).
+-define(wxComboBox_Paste, 1592).
+-define(wxComboBox_Redo, 1593).
+-define(wxComboBox_Replace, 1594).
+-define(wxComboBox_Remove, 1595).
+-define(wxComboBox_SetInsertionPoint, 1596).
+-define(wxComboBox_SetInsertionPointEnd, 1597).
+-define(wxComboBox_SetSelection_1, 1598).
+-define(wxComboBox_SetSelection_2, 1599).
+-define(wxComboBox_SetValue, 1600).
+-define(wxComboBox_Undo, 1601).
+-define(wxGauge_new_0, 1602).
+-define(wxGauge_new_4, 1603).
+-define(wxGauge_Create, 1604).
+-define(wxGauge_GetBezelFace, 1605).
+-define(wxGauge_GetRange, 1606).
+-define(wxGauge_GetShadowWidth, 1607).
+-define(wxGauge_GetValue, 1608).
+-define(wxGauge_IsVertical, 1609).
+-define(wxGauge_SetBezelFace, 1610).
+-define(wxGauge_SetRange, 1611).
+-define(wxGauge_SetShadowWidth, 1612).
+-define(wxGauge_SetValue, 1613).
+-define(wxGauge_Pulse, 1614).
+-define(wxGauge_destroy, 1615).
+-define(wxGenericDirCtrl_new_0, 1616).
+-define(wxGenericDirCtrl_new_2, 1617).
+-define(wxGenericDirCtrl_destruct, 1618).
+-define(wxGenericDirCtrl_Create, 1619).
+-define(wxGenericDirCtrl_Init, 1620).
+-define(wxGenericDirCtrl_CollapseTree, 1621).
+-define(wxGenericDirCtrl_ExpandPath, 1622).
+-define(wxGenericDirCtrl_GetDefaultPath, 1623).
+-define(wxGenericDirCtrl_GetPath, 1624).
+-define(wxGenericDirCtrl_GetFilePath, 1625).
+-define(wxGenericDirCtrl_GetFilter, 1626).
+-define(wxGenericDirCtrl_GetFilterIndex, 1627).
+-define(wxGenericDirCtrl_GetRootId, 1628).
+-define(wxGenericDirCtrl_GetTreeCtrl, 1629).
+-define(wxGenericDirCtrl_ReCreateTree, 1630).
+-define(wxGenericDirCtrl_SetDefaultPath, 1631).
+-define(wxGenericDirCtrl_SetFilter, 1632).
+-define(wxGenericDirCtrl_SetFilterIndex, 1633).
+-define(wxGenericDirCtrl_SetPath, 1634).
+-define(wxStaticBox_new_4, 1636).
+-define(wxStaticBox_new_0, 1637).
+-define(wxStaticBox_Create, 1638).
+-define(wxStaticBox_destroy, 1639).
+-define(wxStaticLine_new_2, 1641).
+-define(wxStaticLine_new_0, 1642).
+-define(wxStaticLine_Create, 1643).
+-define(wxStaticLine_IsVertical, 1644).
+-define(wxStaticLine_GetDefaultSize, 1645).
+-define(wxStaticLine_destroy, 1646).
+-define(wxListBox_new_3, 1649).
+-define(wxListBox_new_0, 1650).
+-define(wxListBox_destruct, 1652).
+-define(wxListBox_Create, 1654).
+-define(wxListBox_Deselect, 1655).
+-define(wxListBox_GetSelections, 1656).
+-define(wxListBox_InsertItems, 1657).
+-define(wxListBox_IsSelected, 1658).
+-define(wxListBox_Set, 1659).
+-define(wxListBox_HitTest, 1660).
+-define(wxListBox_SetFirstItem_1_0, 1661).
+-define(wxListBox_SetFirstItem_1_1, 1662).
+-define(wxListCtrl_new_0, 1663).
+-define(wxListCtrl_new_2, 1664).
+-define(wxListCtrl_Arrange, 1665).
+-define(wxListCtrl_AssignImageList, 1666).
+-define(wxListCtrl_ClearAll, 1667).
+-define(wxListCtrl_Create, 1668).
+-define(wxListCtrl_DeleteAllItems, 1669).
+-define(wxListCtrl_DeleteColumn, 1670).
+-define(wxListCtrl_DeleteItem, 1671).
+-define(wxListCtrl_EditLabel, 1672).
+-define(wxListCtrl_EnsureVisible, 1673).
+-define(wxListCtrl_FindItem_3_0, 1674).
+-define(wxListCtrl_FindItem_3_1, 1675).
+-define(wxListCtrl_GetColumn, 1676).
+-define(wxListCtrl_GetColumnCount, 1677).
+-define(wxListCtrl_GetColumnWidth, 1678).
+-define(wxListCtrl_GetCountPerPage, 1679).
+-define(wxListCtrl_GetEditControl, 1680).
+-define(wxListCtrl_GetImageList, 1681).
+-define(wxListCtrl_GetItem, 1682).
+-define(wxListCtrl_GetItemBackgroundColour, 1683).
+-define(wxListCtrl_GetItemCount, 1684).
+-define(wxListCtrl_GetItemData, 1685).
+-define(wxListCtrl_GetItemFont, 1686).
+-define(wxListCtrl_GetItemPosition, 1687).
+-define(wxListCtrl_GetItemRect, 1688).
+-define(wxListCtrl_GetItemSpacing, 1689).
+-define(wxListCtrl_GetItemState, 1690).
+-define(wxListCtrl_GetItemText, 1691).
+-define(wxListCtrl_GetItemTextColour, 1692).
+-define(wxListCtrl_GetNextItem, 1693).
+-define(wxListCtrl_GetSelectedItemCount, 1694).
+-define(wxListCtrl_GetTextColour, 1695).
+-define(wxListCtrl_GetTopItem, 1696).
+-define(wxListCtrl_GetViewRect, 1697).
+-define(wxListCtrl_HitTest, 1698).
+-define(wxListCtrl_InsertColumn_2, 1699).
+-define(wxListCtrl_InsertColumn_3, 1700).
+-define(wxListCtrl_InsertItem_1, 1701).
+-define(wxListCtrl_InsertItem_2_1, 1702).
+-define(wxListCtrl_InsertItem_2_0, 1703).
+-define(wxListCtrl_InsertItem_3, 1704).
+-define(wxListCtrl_RefreshItem, 1705).
+-define(wxListCtrl_RefreshItems, 1706).
+-define(wxListCtrl_ScrollList, 1707).
+-define(wxListCtrl_SetBackgroundColour, 1708).
+-define(wxListCtrl_SetColumn, 1709).
+-define(wxListCtrl_SetColumnWidth, 1710).
+-define(wxListCtrl_SetImageList, 1711).
+-define(wxListCtrl_SetItem_1, 1712).
+-define(wxListCtrl_SetItem_4, 1713).
+-define(wxListCtrl_SetItemBackgroundColour, 1714).
+-define(wxListCtrl_SetItemCount, 1715).
+-define(wxListCtrl_SetItemData, 1716).
+-define(wxListCtrl_SetItemFont, 1717).
+-define(wxListCtrl_SetItemImage, 1718).
+-define(wxListCtrl_SetItemColumnImage, 1719).
+-define(wxListCtrl_SetItemPosition, 1720).
+-define(wxListCtrl_SetItemState, 1721).
+-define(wxListCtrl_SetItemText, 1722).
+-define(wxListCtrl_SetItemTextColour, 1723).
+-define(wxListCtrl_SetSingleStyle, 1724).
+-define(wxListCtrl_SetTextColour, 1725).
+-define(wxListCtrl_SetWindowStyleFlag, 1726).
+-define(wxListCtrl_SortItems, 1727).
+-define(wxListCtrl_destroy, 1728).
+-define(wxListView_ClearColumnImage, 1729).
+-define(wxListView_Focus, 1730).
+-define(wxListView_GetFirstSelected, 1731).
+-define(wxListView_GetFocusedItem, 1732).
+-define(wxListView_GetNextSelected, 1733).
+-define(wxListView_IsSelected, 1734).
+-define(wxListView_Select, 1735).
+-define(wxListView_SetColumnImage, 1736).
+-define(wxListItem_new_0, 1737).
+-define(wxListItem_new_1, 1738).
+-define(wxListItem_destruct, 1739).
+-define(wxListItem_Clear, 1740).
+-define(wxListItem_GetAlign, 1741).
+-define(wxListItem_GetBackgroundColour, 1742).
+-define(wxListItem_GetColumn, 1743).
+-define(wxListItem_GetFont, 1744).
+-define(wxListItem_GetId, 1745).
+-define(wxListItem_GetImage, 1746).
+-define(wxListItem_GetMask, 1747).
+-define(wxListItem_GetState, 1748).
+-define(wxListItem_GetText, 1749).
+-define(wxListItem_GetTextColour, 1750).
+-define(wxListItem_GetWidth, 1751).
+-define(wxListItem_SetAlign, 1752).
+-define(wxListItem_SetBackgroundColour, 1753).
+-define(wxListItem_SetColumn, 1754).
+-define(wxListItem_SetFont, 1755).
+-define(wxListItem_SetId, 1756).
+-define(wxListItem_SetImage, 1757).
+-define(wxListItem_SetMask, 1758).
+-define(wxListItem_SetState, 1759).
+-define(wxListItem_SetStateMask, 1760).
+-define(wxListItem_SetText, 1761).
+-define(wxListItem_SetTextColour, 1762).
+-define(wxListItem_SetWidth, 1763).
+-define(wxListItemAttr_new_0, 1764).
+-define(wxListItemAttr_new_3, 1765).
+-define(wxListItemAttr_GetBackgroundColour, 1766).
+-define(wxListItemAttr_GetFont, 1767).
+-define(wxListItemAttr_GetTextColour, 1768).
+-define(wxListItemAttr_HasBackgroundColour, 1769).
+-define(wxListItemAttr_HasFont, 1770).
+-define(wxListItemAttr_HasTextColour, 1771).
+-define(wxListItemAttr_SetBackgroundColour, 1772).
+-define(wxListItemAttr_SetFont, 1773).
+-define(wxListItemAttr_SetTextColour, 1774).
+-define(wxListItemAttr_destroy, 1775).
+-define(wxImageList_new_0, 1776).
+-define(wxImageList_new_3, 1777).
+-define(wxImageList_Add_1, 1778).
+-define(wxImageList_Add_2_0, 1779).
+-define(wxImageList_Add_2_1, 1780).
+-define(wxImageList_Create, 1781).
+-define(wxImageList_Draw, 1783).
+-define(wxImageList_GetBitmap, 1784).
+-define(wxImageList_GetIcon, 1785).
+-define(wxImageList_GetImageCount, 1786).
+-define(wxImageList_GetSize, 1787).
+-define(wxImageList_Remove, 1788).
+-define(wxImageList_RemoveAll, 1789).
+-define(wxImageList_Replace_2, 1790).
+-define(wxImageList_Replace_3, 1791).
+-define(wxImageList_destroy, 1792).
+-define(wxTextAttr_new_0, 1793).
+-define(wxTextAttr_new_2, 1794).
+-define(wxTextAttr_GetAlignment, 1795).
+-define(wxTextAttr_GetBackgroundColour, 1796).
+-define(wxTextAttr_GetFont, 1797).
+-define(wxTextAttr_GetLeftIndent, 1798).
+-define(wxTextAttr_GetLeftSubIndent, 1799).
+-define(wxTextAttr_GetRightIndent, 1800).
+-define(wxTextAttr_GetTabs, 1801).
+-define(wxTextAttr_GetTextColour, 1802).
+-define(wxTextAttr_HasBackgroundColour, 1803).
+-define(wxTextAttr_HasFont, 1804).
+-define(wxTextAttr_HasTextColour, 1805).
+-define(wxTextAttr_GetFlags, 1806).
+-define(wxTextAttr_IsDefault, 1807).
+-define(wxTextAttr_SetAlignment, 1808).
+-define(wxTextAttr_SetBackgroundColour, 1809).
+-define(wxTextAttr_SetFlags, 1810).
+-define(wxTextAttr_SetFont, 1811).
+-define(wxTextAttr_SetLeftIndent, 1812).
+-define(wxTextAttr_SetRightIndent, 1813).
+-define(wxTextAttr_SetTabs, 1814).
+-define(wxTextAttr_SetTextColour, 1815).
+-define(wxTextAttr_destroy, 1816).
+-define(wxTextCtrl_new_3, 1818).
+-define(wxTextCtrl_new_0, 1819).
+-define(wxTextCtrl_destruct, 1821).
+-define(wxTextCtrl_AppendText, 1822).
+-define(wxTextCtrl_CanCopy, 1823).
+-define(wxTextCtrl_CanCut, 1824).
+-define(wxTextCtrl_CanPaste, 1825).
+-define(wxTextCtrl_CanRedo, 1826).
+-define(wxTextCtrl_CanUndo, 1827).
+-define(wxTextCtrl_Clear, 1828).
+-define(wxTextCtrl_Copy, 1829).
+-define(wxTextCtrl_Create, 1830).
+-define(wxTextCtrl_Cut, 1831).
+-define(wxTextCtrl_DiscardEdits, 1832).
+-define(wxTextCtrl_ChangeValue, 1833).
+-define(wxTextCtrl_EmulateKeyPress, 1834).
+-define(wxTextCtrl_GetDefaultStyle, 1835).
+-define(wxTextCtrl_GetInsertionPoint, 1836).
+-define(wxTextCtrl_GetLastPosition, 1837).
+-define(wxTextCtrl_GetLineLength, 1838).
+-define(wxTextCtrl_GetLineText, 1839).
+-define(wxTextCtrl_GetNumberOfLines, 1840).
+-define(wxTextCtrl_GetRange, 1841).
+-define(wxTextCtrl_GetSelection, 1842).
+-define(wxTextCtrl_GetStringSelection, 1843).
+-define(wxTextCtrl_GetStyle, 1844).
+-define(wxTextCtrl_GetValue, 1845).
+-define(wxTextCtrl_IsEditable, 1846).
+-define(wxTextCtrl_IsModified, 1847).
+-define(wxTextCtrl_IsMultiLine, 1848).
+-define(wxTextCtrl_IsSingleLine, 1849).
+-define(wxTextCtrl_LoadFile, 1850).
+-define(wxTextCtrl_MarkDirty, 1851).
+-define(wxTextCtrl_Paste, 1852).
+-define(wxTextCtrl_PositionToXY, 1853).
+-define(wxTextCtrl_Redo, 1854).
+-define(wxTextCtrl_Remove, 1855).
+-define(wxTextCtrl_Replace, 1856).
+-define(wxTextCtrl_SaveFile, 1857).
+-define(wxTextCtrl_SetDefaultStyle, 1858).
+-define(wxTextCtrl_SetEditable, 1859).
+-define(wxTextCtrl_SetInsertionPoint, 1860).
+-define(wxTextCtrl_SetInsertionPointEnd, 1861).
+-define(wxTextCtrl_SetMaxLength, 1863).
+-define(wxTextCtrl_SetSelection, 1864).
+-define(wxTextCtrl_SetStyle, 1865).
+-define(wxTextCtrl_SetValue, 1866).
+-define(wxTextCtrl_ShowPosition, 1867).
+-define(wxTextCtrl_Undo, 1868).
+-define(wxTextCtrl_WriteText, 1869).
+-define(wxTextCtrl_XYToPosition, 1870).
+-define(wxNotebook_new_0, 1873).
+-define(wxNotebook_new_3, 1874).
+-define(wxNotebook_destruct, 1875).
+-define(wxNotebook_AddPage, 1876).
+-define(wxNotebook_AdvanceSelection, 1877).
+-define(wxNotebook_AssignImageList, 1878).
+-define(wxNotebook_Create, 1879).
+-define(wxNotebook_DeleteAllPages, 1880).
+-define(wxNotebook_DeletePage, 1881).
+-define(wxNotebook_RemovePage, 1882).
+-define(wxNotebook_GetCurrentPage, 1883).
+-define(wxNotebook_GetImageList, 1884).
+-define(wxNotebook_GetPage, 1886).
+-define(wxNotebook_GetPageCount, 1887).
+-define(wxNotebook_GetPageImage, 1888).
+-define(wxNotebook_GetPageText, 1889).
+-define(wxNotebook_GetRowCount, 1890).
+-define(wxNotebook_GetSelection, 1891).
+-define(wxNotebook_GetThemeBackgroundColour, 1892).
+-define(wxNotebook_HitTest, 1894).
+-define(wxNotebook_InsertPage, 1896).
+-define(wxNotebook_SetImageList, 1897).
+-define(wxNotebook_SetPadding, 1898).
+-define(wxNotebook_SetPageSize, 1899).
+-define(wxNotebook_SetPageImage, 1900).
+-define(wxNotebook_SetPageText, 1901).
+-define(wxNotebook_SetSelection, 1902).
+-define(wxNotebook_ChangeSelection, 1903).
+-define(wxChoicebook_new_0, 1904).
+-define(wxChoicebook_new_3, 1905).
+-define(wxChoicebook_AddPage, 1906).
+-define(wxChoicebook_AdvanceSelection, 1907).
+-define(wxChoicebook_AssignImageList, 1908).
+-define(wxChoicebook_Create, 1909).
+-define(wxChoicebook_DeleteAllPages, 1910).
+-define(wxChoicebook_DeletePage, 1911).
+-define(wxChoicebook_RemovePage, 1912).
+-define(wxChoicebook_GetCurrentPage, 1913).
+-define(wxChoicebook_GetImageList, 1914).
+-define(wxChoicebook_GetPage, 1916).
+-define(wxChoicebook_GetPageCount, 1917).
+-define(wxChoicebook_GetPageImage, 1918).
+-define(wxChoicebook_GetPageText, 1919).
+-define(wxChoicebook_GetSelection, 1920).
+-define(wxChoicebook_HitTest, 1921).
+-define(wxChoicebook_InsertPage, 1922).
+-define(wxChoicebook_SetImageList, 1923).
+-define(wxChoicebook_SetPageSize, 1924).
+-define(wxChoicebook_SetPageImage, 1925).
+-define(wxChoicebook_SetPageText, 1926).
+-define(wxChoicebook_SetSelection, 1927).
+-define(wxChoicebook_ChangeSelection, 1928).
+-define(wxChoicebook_destroy, 1929).
+-define(wxToolbook_new_0, 1930).
+-define(wxToolbook_new_3, 1931).
+-define(wxToolbook_AddPage, 1932).
+-define(wxToolbook_AdvanceSelection, 1933).
+-define(wxToolbook_AssignImageList, 1934).
+-define(wxToolbook_Create, 1935).
+-define(wxToolbook_DeleteAllPages, 1936).
+-define(wxToolbook_DeletePage, 1937).
+-define(wxToolbook_RemovePage, 1938).
+-define(wxToolbook_GetCurrentPage, 1939).
+-define(wxToolbook_GetImageList, 1940).
+-define(wxToolbook_GetPage, 1942).
+-define(wxToolbook_GetPageCount, 1943).
+-define(wxToolbook_GetPageImage, 1944).
+-define(wxToolbook_GetPageText, 1945).
+-define(wxToolbook_GetSelection, 1946).
+-define(wxToolbook_HitTest, 1948).
+-define(wxToolbook_InsertPage, 1949).
+-define(wxToolbook_SetImageList, 1950).
+-define(wxToolbook_SetPageSize, 1951).
+-define(wxToolbook_SetPageImage, 1952).
+-define(wxToolbook_SetPageText, 1953).
+-define(wxToolbook_SetSelection, 1954).
+-define(wxToolbook_ChangeSelection, 1955).
+-define(wxToolbook_destroy, 1956).
+-define(wxListbook_new_0, 1957).
+-define(wxListbook_new_3, 1958).
+-define(wxListbook_AddPage, 1959).
+-define(wxListbook_AdvanceSelection, 1960).
+-define(wxListbook_AssignImageList, 1961).
+-define(wxListbook_Create, 1962).
+-define(wxListbook_DeleteAllPages, 1963).
+-define(wxListbook_DeletePage, 1964).
+-define(wxListbook_RemovePage, 1965).
+-define(wxListbook_GetCurrentPage, 1966).
+-define(wxListbook_GetImageList, 1967).
+-define(wxListbook_GetPage, 1969).
+-define(wxListbook_GetPageCount, 1970).
+-define(wxListbook_GetPageImage, 1971).
+-define(wxListbook_GetPageText, 1972).
+-define(wxListbook_GetSelection, 1973).
+-define(wxListbook_HitTest, 1975).
+-define(wxListbook_InsertPage, 1976).
+-define(wxListbook_SetImageList, 1977).
+-define(wxListbook_SetPageSize, 1978).
+-define(wxListbook_SetPageImage, 1979).
+-define(wxListbook_SetPageText, 1980).
+-define(wxListbook_SetSelection, 1981).
+-define(wxListbook_ChangeSelection, 1982).
+-define(wxListbook_destroy, 1983).
+-define(wxTreebook_new_0, 1984).
+-define(wxTreebook_new_3, 1985).
+-define(wxTreebook_AddPage, 1986).
+-define(wxTreebook_AdvanceSelection, 1987).
+-define(wxTreebook_AssignImageList, 1988).
+-define(wxTreebook_Create, 1989).
+-define(wxTreebook_DeleteAllPages, 1990).
+-define(wxTreebook_DeletePage, 1991).
+-define(wxTreebook_RemovePage, 1992).
+-define(wxTreebook_GetCurrentPage, 1993).
+-define(wxTreebook_GetImageList, 1994).
+-define(wxTreebook_GetPage, 1996).
+-define(wxTreebook_GetPageCount, 1997).
+-define(wxTreebook_GetPageImage, 1998).
+-define(wxTreebook_GetPageText, 1999).
+-define(wxTreebook_GetSelection, 2000).
+-define(wxTreebook_ExpandNode, 2001).
+-define(wxTreebook_IsNodeExpanded, 2002).
+-define(wxTreebook_HitTest, 2004).
+-define(wxTreebook_InsertPage, 2005).
+-define(wxTreebook_InsertSubPage, 2006).
+-define(wxTreebook_SetImageList, 2007).
+-define(wxTreebook_SetPageSize, 2008).
+-define(wxTreebook_SetPageImage, 2009).
+-define(wxTreebook_SetPageText, 2010).
+-define(wxTreebook_SetSelection, 2011).
+-define(wxTreebook_ChangeSelection, 2012).
+-define(wxTreebook_destroy, 2013).
+-define(wxTreeCtrl_new_2, 2016).
+-define(wxTreeCtrl_new_0, 2017).
+-define(wxTreeCtrl_destruct, 2019).
+-define(wxTreeCtrl_AddRoot, 2020).
+-define(wxTreeCtrl_AppendItem, 2021).
+-define(wxTreeCtrl_AssignImageList, 2022).
+-define(wxTreeCtrl_AssignStateImageList, 2023).
+-define(wxTreeCtrl_Collapse, 2024).
+-define(wxTreeCtrl_CollapseAndReset, 2025).
+-define(wxTreeCtrl_Create, 2026).
+-define(wxTreeCtrl_Delete, 2027).
+-define(wxTreeCtrl_DeleteAllItems, 2028).
+-define(wxTreeCtrl_DeleteChildren, 2029).
+-define(wxTreeCtrl_EditLabel, 2030).
+-define(wxTreeCtrl_EnsureVisible, 2031).
+-define(wxTreeCtrl_Expand, 2032).
+-define(wxTreeCtrl_GetBoundingRect, 2033).
+-define(wxTreeCtrl_GetChildrenCount, 2035).
+-define(wxTreeCtrl_GetCount, 2036).
+-define(wxTreeCtrl_GetEditControl, 2037).
+-define(wxTreeCtrl_GetFirstChild, 2038).
+-define(wxTreeCtrl_GetNextChild, 2039).
+-define(wxTreeCtrl_GetFirstVisibleItem, 2040).
+-define(wxTreeCtrl_GetImageList, 2041).
+-define(wxTreeCtrl_GetIndent, 2042).
+-define(wxTreeCtrl_GetItemBackgroundColour, 2043).
+-define(wxTreeCtrl_GetItemData, 2044).
+-define(wxTreeCtrl_GetItemFont, 2045).
+-define(wxTreeCtrl_GetItemImage_1, 2046).
+-define(wxTreeCtrl_GetItemImage_2, 2047).
+-define(wxTreeCtrl_GetItemText, 2048).
+-define(wxTreeCtrl_GetItemTextColour, 2049).
+-define(wxTreeCtrl_GetLastChild, 2050).
+-define(wxTreeCtrl_GetNextSibling, 2051).
+-define(wxTreeCtrl_GetNextVisible, 2052).
+-define(wxTreeCtrl_GetItemParent, 2053).
+-define(wxTreeCtrl_GetPrevSibling, 2054).
+-define(wxTreeCtrl_GetPrevVisible, 2055).
+-define(wxTreeCtrl_GetRootItem, 2056).
+-define(wxTreeCtrl_GetSelection, 2057).
+-define(wxTreeCtrl_GetSelections, 2058).
+-define(wxTreeCtrl_GetStateImageList, 2059).
+-define(wxTreeCtrl_HitTest, 2060).
+-define(wxTreeCtrl_InsertItem, 2062).
+-define(wxTreeCtrl_IsBold, 2063).
+-define(wxTreeCtrl_IsExpanded, 2064).
+-define(wxTreeCtrl_IsSelected, 2065).
+-define(wxTreeCtrl_IsVisible, 2066).
+-define(wxTreeCtrl_ItemHasChildren, 2067).
+-define(wxTreeCtrl_IsTreeItemIdOk, 2068).
+-define(wxTreeCtrl_PrependItem, 2069).
+-define(wxTreeCtrl_ScrollTo, 2070).
+-define(wxTreeCtrl_SelectItem_1, 2071).
+-define(wxTreeCtrl_SelectItem_2, 2072).
+-define(wxTreeCtrl_SetIndent, 2073).
+-define(wxTreeCtrl_SetImageList, 2074).
+-define(wxTreeCtrl_SetItemBackgroundColour, 2075).
+-define(wxTreeCtrl_SetItemBold, 2076).
+-define(wxTreeCtrl_SetItemData, 2077).
+-define(wxTreeCtrl_SetItemDropHighlight, 2078).
+-define(wxTreeCtrl_SetItemFont, 2079).
+-define(wxTreeCtrl_SetItemHasChildren, 2080).
+-define(wxTreeCtrl_SetItemImage_2, 2081).
+-define(wxTreeCtrl_SetItemImage_3, 2082).
+-define(wxTreeCtrl_SetItemText, 2083).
+-define(wxTreeCtrl_SetItemTextColour, 2084).
+-define(wxTreeCtrl_SetStateImageList, 2085).
+-define(wxTreeCtrl_SetWindowStyle, 2086).
+-define(wxTreeCtrl_SortChildren, 2087).
+-define(wxTreeCtrl_Toggle, 2088).
+-define(wxTreeCtrl_ToggleItemSelection, 2089).
+-define(wxTreeCtrl_Unselect, 2090).
+-define(wxTreeCtrl_UnselectAll, 2091).
+-define(wxTreeCtrl_UnselectItem, 2092).
+-define(wxScrollBar_new_0, 2093).
+-define(wxScrollBar_new_3, 2094).
+-define(wxScrollBar_destruct, 2095).
+-define(wxScrollBar_Create, 2096).
+-define(wxScrollBar_GetRange, 2097).
+-define(wxScrollBar_GetPageSize, 2098).
+-define(wxScrollBar_GetThumbPosition, 2099).
+-define(wxScrollBar_GetThumbSize, 2100).
+-define(wxScrollBar_SetThumbPosition, 2101).
+-define(wxScrollBar_SetScrollbar, 2102).
+-define(wxSpinButton_new_2, 2104).
+-define(wxSpinButton_new_0, 2105).
+-define(wxSpinButton_Create, 2106).
+-define(wxSpinButton_GetMax, 2107).
+-define(wxSpinButton_GetMin, 2108).
+-define(wxSpinButton_GetValue, 2109).
+-define(wxSpinButton_SetRange, 2110).
+-define(wxSpinButton_SetValue, 2111).
+-define(wxSpinButton_destroy, 2112).
+-define(wxSpinCtrl_new_0, 2113).
+-define(wxSpinCtrl_new_2, 2114).
+-define(wxSpinCtrl_Create, 2116).
+-define(wxSpinCtrl_SetValue_1_1, 2119).
+-define(wxSpinCtrl_SetValue_1_0, 2120).
+-define(wxSpinCtrl_GetValue, 2122).
+-define(wxSpinCtrl_SetRange, 2124).
+-define(wxSpinCtrl_SetSelection, 2125).
+-define(wxSpinCtrl_GetMin, 2127).
+-define(wxSpinCtrl_GetMax, 2129).
+-define(wxSpinCtrl_destroy, 2130).
+-define(wxStaticText_new_0, 2131).
+-define(wxStaticText_new_4, 2132).
+-define(wxStaticText_Create, 2133).
+-define(wxStaticText_GetLabel, 2134).
+-define(wxStaticText_SetLabel, 2135).
+-define(wxStaticText_Wrap, 2136).
+-define(wxStaticText_destroy, 2137).
+-define(wxStaticBitmap_new_0, 2138).
+-define(wxStaticBitmap_new_4, 2139).
+-define(wxStaticBitmap_Create, 2140).
+-define(wxStaticBitmap_GetBitmap, 2141).
+-define(wxStaticBitmap_SetBitmap, 2142).
+-define(wxStaticBitmap_destroy, 2143).
+-define(wxRadioBox_new, 2144).
+-define(wxRadioBox_destruct, 2146).
+-define(wxRadioBox_Create, 2147).
+-define(wxRadioBox_Enable_2, 2148).
+-define(wxRadioBox_Enable_1, 2149).
+-define(wxRadioBox_GetSelection, 2150).
+-define(wxRadioBox_GetString, 2151).
+-define(wxRadioBox_SetSelection, 2152).
+-define(wxRadioBox_Show_2, 2153).
+-define(wxRadioBox_Show_1, 2154).
+-define(wxRadioBox_GetColumnCount, 2155).
+-define(wxRadioBox_GetItemHelpText, 2156).
+-define(wxRadioBox_GetItemToolTip, 2157).
+-define(wxRadioBox_GetItemFromPoint, 2159).
+-define(wxRadioBox_GetRowCount, 2160).
+-define(wxRadioBox_IsItemEnabled, 2161).
+-define(wxRadioBox_IsItemShown, 2162).
+-define(wxRadioBox_SetItemHelpText, 2163).
+-define(wxRadioBox_SetItemToolTip, 2164).
+-define(wxRadioButton_new_0, 2165).
+-define(wxRadioButton_new_4, 2166).
+-define(wxRadioButton_Create, 2167).
+-define(wxRadioButton_GetValue, 2168).
+-define(wxRadioButton_SetValue, 2169).
+-define(wxRadioButton_destroy, 2170).
+-define(wxSlider_new_6, 2172).
+-define(wxSlider_new_0, 2173).
+-define(wxSlider_Create, 2174).
+-define(wxSlider_GetLineSize, 2175).
+-define(wxSlider_GetMax, 2176).
+-define(wxSlider_GetMin, 2177).
+-define(wxSlider_GetPageSize, 2178).
+-define(wxSlider_GetThumbLength, 2179).
+-define(wxSlider_GetValue, 2180).
+-define(wxSlider_SetLineSize, 2181).
+-define(wxSlider_SetPageSize, 2182).
+-define(wxSlider_SetRange, 2183).
+-define(wxSlider_SetThumbLength, 2184).
+-define(wxSlider_SetValue, 2185).
+-define(wxSlider_destroy, 2186).
+-define(wxDialog_new_4, 2188).
+-define(wxDialog_new_0, 2189).
+-define(wxDialog_destruct, 2191).
+-define(wxDialog_Create, 2192).
+-define(wxDialog_CreateButtonSizer, 2193).
+-define(wxDialog_CreateStdDialogButtonSizer, 2194).
+-define(wxDialog_EndModal, 2195).
+-define(wxDialog_GetAffirmativeId, 2196).
+-define(wxDialog_GetReturnCode, 2197).
+-define(wxDialog_IsModal, 2198).
+-define(wxDialog_SetAffirmativeId, 2199).
+-define(wxDialog_SetReturnCode, 2200).
+-define(wxDialog_Show, 2201).
+-define(wxDialog_ShowModal, 2202).
+-define(wxColourDialog_new_0, 2203).
+-define(wxColourDialog_new_2, 2204).
+-define(wxColourDialog_destruct, 2205).
+-define(wxColourDialog_Create, 2206).
+-define(wxColourDialog_GetColourData, 2207).
+-define(wxColourData_new_0, 2208).
+-define(wxColourData_new_1, 2209).
+-define(wxColourData_destruct, 2210).
+-define(wxColourData_GetChooseFull, 2211).
+-define(wxColourData_GetColour, 2212).
+-define(wxColourData_GetCustomColour, 2214).
+-define(wxColourData_SetChooseFull, 2215).
+-define(wxColourData_SetColour, 2216).
+-define(wxColourData_SetCustomColour, 2217).
+-define(wxPalette_new_0, 2218).
+-define(wxPalette_new_4, 2219).
+-define(wxPalette_destruct, 2221).
+-define(wxPalette_Create, 2222).
+-define(wxPalette_GetColoursCount, 2223).
+-define(wxPalette_GetPixel, 2224).
+-define(wxPalette_GetRGB, 2225).
+-define(wxPalette_IsOk, 2226).
+-define(wxDirDialog_new, 2230).
+-define(wxDirDialog_destruct, 2231).
+-define(wxDirDialog_GetPath, 2232).
+-define(wxDirDialog_GetMessage, 2233).
+-define(wxDirDialog_SetMessage, 2234).
+-define(wxDirDialog_SetPath, 2235).
+-define(wxFileDialog_new, 2239).
+-define(wxFileDialog_destruct, 2240).
+-define(wxFileDialog_GetDirectory, 2241).
+-define(wxFileDialog_GetFilename, 2242).
+-define(wxFileDialog_GetFilenames, 2243).
+-define(wxFileDialog_GetFilterIndex, 2244).
+-define(wxFileDialog_GetMessage, 2245).
+-define(wxFileDialog_GetPath, 2246).
+-define(wxFileDialog_GetPaths, 2247).
+-define(wxFileDialog_GetWildcard, 2248).
+-define(wxFileDialog_SetDirectory, 2249).
+-define(wxFileDialog_SetFilename, 2250).
+-define(wxFileDialog_SetFilterIndex, 2251).
+-define(wxFileDialog_SetMessage, 2252).
+-define(wxFileDialog_SetPath, 2253).
+-define(wxFileDialog_SetWildcard, 2254).
+-define(wxPickerBase_SetInternalMargin, 2255).
+-define(wxPickerBase_GetInternalMargin, 2256).
+-define(wxPickerBase_SetTextCtrlProportion, 2257).
+-define(wxPickerBase_SetPickerCtrlProportion, 2258).
+-define(wxPickerBase_GetTextCtrlProportion, 2259).
+-define(wxPickerBase_GetPickerCtrlProportion, 2260).
+-define(wxPickerBase_HasTextCtrl, 2261).
+-define(wxPickerBase_GetTextCtrl, 2262).
+-define(wxPickerBase_IsTextCtrlGrowable, 2263).
+-define(wxPickerBase_SetPickerCtrlGrowable, 2264).
+-define(wxPickerBase_SetTextCtrlGrowable, 2265).
+-define(wxPickerBase_IsPickerCtrlGrowable, 2266).
+-define(wxFilePickerCtrl_new_0, 2267).
+-define(wxFilePickerCtrl_new_3, 2268).
+-define(wxFilePickerCtrl_Create, 2269).
+-define(wxFilePickerCtrl_GetPath, 2270).
+-define(wxFilePickerCtrl_SetPath, 2271).
+-define(wxFilePickerCtrl_destroy, 2272).
+-define(wxDirPickerCtrl_new_0, 2273).
+-define(wxDirPickerCtrl_new_3, 2274).
+-define(wxDirPickerCtrl_Create, 2275).
+-define(wxDirPickerCtrl_GetPath, 2276).
+-define(wxDirPickerCtrl_SetPath, 2277).
+-define(wxDirPickerCtrl_destroy, 2278).
+-define(wxColourPickerCtrl_new_0, 2279).
+-define(wxColourPickerCtrl_new_3, 2280).
+-define(wxColourPickerCtrl_Create, 2281).
+-define(wxColourPickerCtrl_GetColour, 2282).
+-define(wxColourPickerCtrl_SetColour_1_1, 2283).
+-define(wxColourPickerCtrl_SetColour_1_0, 2284).
+-define(wxColourPickerCtrl_destroy, 2285).
+-define(wxDatePickerCtrl_new_0, 2286).
+-define(wxDatePickerCtrl_new_3, 2287).
+-define(wxDatePickerCtrl_GetRange, 2288).
+-define(wxDatePickerCtrl_GetValue, 2289).
+-define(wxDatePickerCtrl_SetRange, 2290).
+-define(wxDatePickerCtrl_SetValue, 2291).
+-define(wxDatePickerCtrl_destroy, 2292).
+-define(wxFontPickerCtrl_new_0, 2293).
+-define(wxFontPickerCtrl_new_3, 2294).
+-define(wxFontPickerCtrl_Create, 2295).
+-define(wxFontPickerCtrl_GetSelectedFont, 2296).
+-define(wxFontPickerCtrl_SetSelectedFont, 2297).
+-define(wxFontPickerCtrl_GetMaxPointSize, 2298).
+-define(wxFontPickerCtrl_SetMaxPointSize, 2299).
+-define(wxFontPickerCtrl_destroy, 2300).
+-define(wxFindReplaceDialog_new_0, 2303).
+-define(wxFindReplaceDialog_new_4, 2304).
+-define(wxFindReplaceDialog_destruct, 2305).
+-define(wxFindReplaceDialog_Create, 2306).
+-define(wxFindReplaceDialog_GetData, 2307).
+-define(wxFindReplaceData_new_0, 2308).
+-define(wxFindReplaceData_new_1, 2309).
+-define(wxFindReplaceData_GetFindString, 2310).
+-define(wxFindReplaceData_GetReplaceString, 2311).
+-define(wxFindReplaceData_GetFlags, 2312).
+-define(wxFindReplaceData_SetFlags, 2313).
+-define(wxFindReplaceData_SetFindString, 2314).
+-define(wxFindReplaceData_SetReplaceString, 2315).
+-define(wxFindReplaceData_destroy, 2316).
+-define(wxMultiChoiceDialog_new_0, 2317).
+-define(wxMultiChoiceDialog_new_5, 2319).
+-define(wxMultiChoiceDialog_GetSelections, 2320).
+-define(wxMultiChoiceDialog_SetSelections, 2321).
+-define(wxMultiChoiceDialog_destroy, 2322).
+-define(wxSingleChoiceDialog_new_0, 2323).
+-define(wxSingleChoiceDialog_new_5, 2325).
+-define(wxSingleChoiceDialog_GetSelection, 2326).
+-define(wxSingleChoiceDialog_GetStringSelection, 2327).
+-define(wxSingleChoiceDialog_SetSelection, 2328).
+-define(wxSingleChoiceDialog_destroy, 2329).
+-define(wxTextEntryDialog_new, 2330).
+-define(wxTextEntryDialog_GetValue, 2331).
+-define(wxTextEntryDialog_SetValue, 2332).
+-define(wxTextEntryDialog_destroy, 2333).
+-define(wxPasswordEntryDialog_new, 2334).
+-define(wxPasswordEntryDialog_destroy, 2335).
+-define(wxFontData_new_0, 2336).
+-define(wxFontData_new_1, 2337).
+-define(wxFontData_destruct, 2338).
+-define(wxFontData_EnableEffects, 2339).
+-define(wxFontData_GetAllowSymbols, 2340).
+-define(wxFontData_GetColour, 2341).
+-define(wxFontData_GetChosenFont, 2342).
+-define(wxFontData_GetEnableEffects, 2343).
+-define(wxFontData_GetInitialFont, 2344).
+-define(wxFontData_GetShowHelp, 2345).
+-define(wxFontData_SetAllowSymbols, 2346).
+-define(wxFontData_SetChosenFont, 2347).
+-define(wxFontData_SetColour, 2348).
+-define(wxFontData_SetInitialFont, 2349).
+-define(wxFontData_SetRange, 2350).
+-define(wxFontData_SetShowHelp, 2351).
+-define(wxFontDialog_new_0, 2355).
+-define(wxFontDialog_new_2, 2357).
+-define(wxFontDialog_Create, 2359).
+-define(wxFontDialog_GetFontData, 2360).
+-define(wxFontDialog_destroy, 2362).
+-define(wxProgressDialog_new, 2363).
+-define(wxProgressDialog_destruct, 2364).
+-define(wxProgressDialog_Resume, 2365).
+-define(wxProgressDialog_Update_2, 2366).
+-define(wxProgressDialog_Update_0, 2367).
+-define(wxMessageDialog_new, 2368).
+-define(wxMessageDialog_destruct, 2369).
+-define(wxPageSetupDialog_new, 2370).
+-define(wxPageSetupDialog_destruct, 2371).
+-define(wxPageSetupDialog_GetPageSetupData, 2372).
+-define(wxPageSetupDialog_ShowModal, 2373).
+-define(wxPageSetupDialogData_new_0, 2374).
+-define(wxPageSetupDialogData_new_1_0, 2375).
+-define(wxPageSetupDialogData_new_1_1, 2376).
+-define(wxPageSetupDialogData_destruct, 2377).
+-define(wxPageSetupDialogData_EnableHelp, 2378).
+-define(wxPageSetupDialogData_EnableMargins, 2379).
+-define(wxPageSetupDialogData_EnableOrientation, 2380).
+-define(wxPageSetupDialogData_EnablePaper, 2381).
+-define(wxPageSetupDialogData_EnablePrinter, 2382).
+-define(wxPageSetupDialogData_GetDefaultMinMargins, 2383).
+-define(wxPageSetupDialogData_GetEnableMargins, 2384).
+-define(wxPageSetupDialogData_GetEnableOrientation, 2385).
+-define(wxPageSetupDialogData_GetEnablePaper, 2386).
+-define(wxPageSetupDialogData_GetEnablePrinter, 2387).
+-define(wxPageSetupDialogData_GetEnableHelp, 2388).
+-define(wxPageSetupDialogData_GetDefaultInfo, 2389).
+-define(wxPageSetupDialogData_GetMarginTopLeft, 2390).
+-define(wxPageSetupDialogData_GetMarginBottomRight, 2391).
+-define(wxPageSetupDialogData_GetMinMarginTopLeft, 2392).
+-define(wxPageSetupDialogData_GetMinMarginBottomRight, 2393).
+-define(wxPageSetupDialogData_GetPaperId, 2394).
+-define(wxPageSetupDialogData_GetPaperSize, 2395).
+-define(wxPageSetupDialogData_GetPrintData, 2397).
+-define(wxPageSetupDialogData_IsOk, 2398).
+-define(wxPageSetupDialogData_SetDefaultInfo, 2399).
+-define(wxPageSetupDialogData_SetDefaultMinMargins, 2400).
+-define(wxPageSetupDialogData_SetMarginTopLeft, 2401).
+-define(wxPageSetupDialogData_SetMarginBottomRight, 2402).
+-define(wxPageSetupDialogData_SetMinMarginTopLeft, 2403).
+-define(wxPageSetupDialogData_SetMinMarginBottomRight, 2404).
+-define(wxPageSetupDialogData_SetPaperId, 2405).
+-define(wxPageSetupDialogData_SetPaperSize_1_1, 2406).
+-define(wxPageSetupDialogData_SetPaperSize_1_0, 2407).
+-define(wxPageSetupDialogData_SetPrintData, 2408).
+-define(wxPrintDialog_new_2_0, 2409).
+-define(wxPrintDialog_new_2_1, 2410).
+-define(wxPrintDialog_destruct, 2411).
+-define(wxPrintDialog_GetPrintDialogData, 2412).
+-define(wxPrintDialog_GetPrintDC, 2413).
+-define(wxPrintDialogData_new_0, 2414).
+-define(wxPrintDialogData_new_1_1, 2415).
+-define(wxPrintDialogData_new_1_0, 2416).
+-define(wxPrintDialogData_destruct, 2417).
+-define(wxPrintDialogData_EnableHelp, 2418).
+-define(wxPrintDialogData_EnablePageNumbers, 2419).
+-define(wxPrintDialogData_EnablePrintToFile, 2420).
+-define(wxPrintDialogData_EnableSelection, 2421).
+-define(wxPrintDialogData_GetAllPages, 2422).
+-define(wxPrintDialogData_GetCollate, 2423).
+-define(wxPrintDialogData_GetFromPage, 2424).
+-define(wxPrintDialogData_GetMaxPage, 2425).
+-define(wxPrintDialogData_GetMinPage, 2426).
+-define(wxPrintDialogData_GetNoCopies, 2427).
+-define(wxPrintDialogData_GetPrintData, 2428).
+-define(wxPrintDialogData_GetPrintToFile, 2429).
+-define(wxPrintDialogData_GetSelection, 2430).
+-define(wxPrintDialogData_GetToPage, 2431).
+-define(wxPrintDialogData_IsOk, 2432).
+-define(wxPrintDialogData_SetCollate, 2433).
+-define(wxPrintDialogData_SetFromPage, 2434).
+-define(wxPrintDialogData_SetMaxPage, 2435).
+-define(wxPrintDialogData_SetMinPage, 2436).
+-define(wxPrintDialogData_SetNoCopies, 2437).
+-define(wxPrintDialogData_SetPrintData, 2438).
+-define(wxPrintDialogData_SetPrintToFile, 2439).
+-define(wxPrintDialogData_SetSelection, 2440).
+-define(wxPrintDialogData_SetToPage, 2441).
+-define(wxPrintData_new_0, 2442).
+-define(wxPrintData_new_1, 2443).
+-define(wxPrintData_destruct, 2444).
+-define(wxPrintData_GetCollate, 2445).
+-define(wxPrintData_GetBin, 2446).
+-define(wxPrintData_GetColour, 2447).
+-define(wxPrintData_GetDuplex, 2448).
+-define(wxPrintData_GetNoCopies, 2449).
+-define(wxPrintData_GetOrientation, 2450).
+-define(wxPrintData_GetPaperId, 2451).
+-define(wxPrintData_GetPrinterName, 2452).
+-define(wxPrintData_GetQuality, 2453).
+-define(wxPrintData_IsOk, 2454).
+-define(wxPrintData_SetBin, 2455).
+-define(wxPrintData_SetCollate, 2456).
+-define(wxPrintData_SetColour, 2457).
+-define(wxPrintData_SetDuplex, 2458).
+-define(wxPrintData_SetNoCopies, 2459).
+-define(wxPrintData_SetOrientation, 2460).
+-define(wxPrintData_SetPaperId, 2461).
+-define(wxPrintData_SetPrinterName, 2462).
+-define(wxPrintData_SetQuality, 2463).
+-define(wxPrintPreview_new_2, 2466).
+-define(wxPrintPreview_new_3, 2467).
+-define(wxPrintPreview_destruct, 2469).
+-define(wxPrintPreview_GetCanvas, 2470).
+-define(wxPrintPreview_GetCurrentPage, 2471).
+-define(wxPrintPreview_GetFrame, 2472).
+-define(wxPrintPreview_GetMaxPage, 2473).
+-define(wxPrintPreview_GetMinPage, 2474).
+-define(wxPrintPreview_GetPrintout, 2475).
+-define(wxPrintPreview_GetPrintoutForPrinting, 2476).
+-define(wxPrintPreview_IsOk, 2477).
+-define(wxPrintPreview_PaintPage, 2478).
+-define(wxPrintPreview_Print, 2479).
+-define(wxPrintPreview_RenderPage, 2480).
+-define(wxPrintPreview_SetCanvas, 2481).
+-define(wxPrintPreview_SetCurrentPage, 2482).
+-define(wxPrintPreview_SetFrame, 2483).
+-define(wxPrintPreview_SetPrintout, 2484).
+-define(wxPrintPreview_SetZoom, 2485).
+-define(wxPreviewFrame_new, 2486).
+-define(wxPreviewFrame_destruct, 2487).
+-define(wxPreviewFrame_CreateControlBar, 2488).
+-define(wxPreviewFrame_CreateCanvas, 2489).
+-define(wxPreviewFrame_Initialize, 2490).
+-define(wxPreviewFrame_OnCloseWindow, 2491).
+-define(wxPreviewControlBar_new, 2492).
+-define(wxPreviewControlBar_destruct, 2493).
+-define(wxPreviewControlBar_CreateButtons, 2494).
+-define(wxPreviewControlBar_GetPrintPreview, 2495).
+-define(wxPreviewControlBar_GetZoomControl, 2496).
+-define(wxPreviewControlBar_SetZoomControl, 2497).
+-define(wxPrinter_new, 2499).
+-define(wxPrinter_CreateAbortWindow, 2500).
+-define(wxPrinter_GetAbort, 2501).
+-define(wxPrinter_GetLastError, 2502).
+-define(wxPrinter_GetPrintDialogData, 2503).
+-define(wxPrinter_Print, 2504).
+-define(wxPrinter_PrintDialog, 2505).
+-define(wxPrinter_ReportError, 2506).
+-define(wxPrinter_Setup, 2507).
+-define(wxPrinter_destroy, 2508).
+-define(wxXmlResource_new_1, 2509).
+-define(wxXmlResource_new_2, 2510).
+-define(wxXmlResource_destruct, 2511).
+-define(wxXmlResource_AttachUnknownControl, 2512).
+-define(wxXmlResource_ClearHandlers, 2513).
+-define(wxXmlResource_CompareVersion, 2514).
+-define(wxXmlResource_Get, 2515).
+-define(wxXmlResource_GetFlags, 2516).
+-define(wxXmlResource_GetVersion, 2517).
+-define(wxXmlResource_GetXRCID, 2518).
+-define(wxXmlResource_InitAllHandlers, 2519).
+-define(wxXmlResource_Load, 2520).
+-define(wxXmlResource_LoadBitmap, 2521).
+-define(wxXmlResource_LoadDialog_2, 2522).
+-define(wxXmlResource_LoadDialog_3, 2523).
+-define(wxXmlResource_LoadFrame_2, 2524).
+-define(wxXmlResource_LoadFrame_3, 2525).
+-define(wxXmlResource_LoadIcon, 2526).
+-define(wxXmlResource_LoadMenu, 2527).
+-define(wxXmlResource_LoadMenuBar_2, 2528).
+-define(wxXmlResource_LoadMenuBar_1, 2529).
+-define(wxXmlResource_LoadPanel_2, 2530).
+-define(wxXmlResource_LoadPanel_3, 2531).
+-define(wxXmlResource_LoadToolBar, 2532).
+-define(wxXmlResource_Set, 2533).
+-define(wxXmlResource_SetFlags, 2534).
+-define(wxXmlResource_Unload, 2535).
+-define(wxXmlResource_xrcctrl, 2536).
+-define(wxHtmlEasyPrinting_new, 2537).
+-define(wxHtmlEasyPrinting_destruct, 2538).
+-define(wxHtmlEasyPrinting_GetPrintData, 2539).
+-define(wxHtmlEasyPrinting_GetPageSetupData, 2540).
+-define(wxHtmlEasyPrinting_PreviewFile, 2541).
+-define(wxHtmlEasyPrinting_PreviewText, 2542).
+-define(wxHtmlEasyPrinting_PrintFile, 2543).
+-define(wxHtmlEasyPrinting_PrintText, 2544).
+-define(wxHtmlEasyPrinting_PageSetup, 2545).
+-define(wxHtmlEasyPrinting_SetFonts, 2546).
+-define(wxHtmlEasyPrinting_SetHeader, 2547).
+-define(wxHtmlEasyPrinting_SetFooter, 2548).
+-define(wxGLCanvas_new_2, 2550).
+-define(wxGLCanvas_new_3_1, 2551).
+-define(wxGLCanvas_new_3_0, 2552).
+-define(wxGLCanvas_GetContext, 2553).
+-define(wxGLCanvas_SetCurrent, 2555).
+-define(wxGLCanvas_SwapBuffers, 2556).
+-define(wxGLCanvas_destroy, 2557).
+-define(wxAuiManager_new, 2558).
+-define(wxAuiManager_destruct, 2559).
+-define(wxAuiManager_AddPane_2_1, 2560).
+-define(wxAuiManager_AddPane_3, 2561).
+-define(wxAuiManager_AddPane_2_0, 2562).
+-define(wxAuiManager_DetachPane, 2563).
+-define(wxAuiManager_GetAllPanes, 2564).
+-define(wxAuiManager_GetArtProvider, 2565).
+-define(wxAuiManager_GetDockSizeConstraint, 2566).
+-define(wxAuiManager_GetFlags, 2567).
+-define(wxAuiManager_GetManagedWindow, 2568).
+-define(wxAuiManager_GetManager, 2569).
+-define(wxAuiManager_GetPane_1_1, 2570).
+-define(wxAuiManager_GetPane_1_0, 2571).
+-define(wxAuiManager_HideHint, 2572).
+-define(wxAuiManager_InsertPane, 2573).
+-define(wxAuiManager_LoadPaneInfo, 2574).
+-define(wxAuiManager_LoadPerspective, 2575).
+-define(wxAuiManager_SavePaneInfo, 2576).
+-define(wxAuiManager_SavePerspective, 2577).
+-define(wxAuiManager_SetArtProvider, 2578).
+-define(wxAuiManager_SetDockSizeConstraint, 2579).
+-define(wxAuiManager_SetFlags, 2580).
+-define(wxAuiManager_SetManagedWindow, 2581).
+-define(wxAuiManager_ShowHint, 2582).
+-define(wxAuiManager_UnInit, 2583).
+-define(wxAuiManager_Update, 2584).
+-define(wxAuiPaneInfo_new_0, 2585).
+-define(wxAuiPaneInfo_new_1, 2586).
+-define(wxAuiPaneInfo_destruct, 2587).
+-define(wxAuiPaneInfo_BestSize_1, 2588).
+-define(wxAuiPaneInfo_BestSize_2, 2589).
+-define(wxAuiPaneInfo_Bottom, 2590).
+-define(wxAuiPaneInfo_BottomDockable, 2591).
+-define(wxAuiPaneInfo_Caption, 2592).
+-define(wxAuiPaneInfo_CaptionVisible, 2593).
+-define(wxAuiPaneInfo_Centre, 2594).
+-define(wxAuiPaneInfo_CentrePane, 2595).
+-define(wxAuiPaneInfo_CloseButton, 2596).
+-define(wxAuiPaneInfo_DefaultPane, 2597).
+-define(wxAuiPaneInfo_DestroyOnClose, 2598).
+-define(wxAuiPaneInfo_Direction, 2599).
+-define(wxAuiPaneInfo_Dock, 2600).
+-define(wxAuiPaneInfo_Dockable, 2601).
+-define(wxAuiPaneInfo_Fixed, 2602).
+-define(wxAuiPaneInfo_Float, 2603).
+-define(wxAuiPaneInfo_Floatable, 2604).
+-define(wxAuiPaneInfo_FloatingPosition_1, 2605).
+-define(wxAuiPaneInfo_FloatingPosition_2, 2606).
+-define(wxAuiPaneInfo_FloatingSize_1, 2607).
+-define(wxAuiPaneInfo_FloatingSize_2, 2608).
+-define(wxAuiPaneInfo_Gripper, 2609).
+-define(wxAuiPaneInfo_GripperTop, 2610).
+-define(wxAuiPaneInfo_HasBorder, 2611).
+-define(wxAuiPaneInfo_HasCaption, 2612).
+-define(wxAuiPaneInfo_HasCloseButton, 2613).
+-define(wxAuiPaneInfo_HasFlag, 2614).
+-define(wxAuiPaneInfo_HasGripper, 2615).
+-define(wxAuiPaneInfo_HasGripperTop, 2616).
+-define(wxAuiPaneInfo_HasMaximizeButton, 2617).
+-define(wxAuiPaneInfo_HasMinimizeButton, 2618).
+-define(wxAuiPaneInfo_HasPinButton, 2619).
+-define(wxAuiPaneInfo_Hide, 2620).
+-define(wxAuiPaneInfo_IsBottomDockable, 2621).
+-define(wxAuiPaneInfo_IsDocked, 2622).
+-define(wxAuiPaneInfo_IsFixed, 2623).
+-define(wxAuiPaneInfo_IsFloatable, 2624).
+-define(wxAuiPaneInfo_IsFloating, 2625).
+-define(wxAuiPaneInfo_IsLeftDockable, 2626).
+-define(wxAuiPaneInfo_IsMovable, 2627).
+-define(wxAuiPaneInfo_IsOk, 2628).
+-define(wxAuiPaneInfo_IsResizable, 2629).
+-define(wxAuiPaneInfo_IsRightDockable, 2630).
+-define(wxAuiPaneInfo_IsShown, 2631).
+-define(wxAuiPaneInfo_IsToolbar, 2632).
+-define(wxAuiPaneInfo_IsTopDockable, 2633).
+-define(wxAuiPaneInfo_Layer, 2634).
+-define(wxAuiPaneInfo_Left, 2635).
+-define(wxAuiPaneInfo_LeftDockable, 2636).
+-define(wxAuiPaneInfo_MaxSize_1, 2637).
+-define(wxAuiPaneInfo_MaxSize_2, 2638).
+-define(wxAuiPaneInfo_MaximizeButton, 2639).
+-define(wxAuiPaneInfo_MinSize_1, 2640).
+-define(wxAuiPaneInfo_MinSize_2, 2641).
+-define(wxAuiPaneInfo_MinimizeButton, 2642).
+-define(wxAuiPaneInfo_Movable, 2643).
+-define(wxAuiPaneInfo_Name, 2644).
+-define(wxAuiPaneInfo_PaneBorder, 2645).
+-define(wxAuiPaneInfo_PinButton, 2646).
+-define(wxAuiPaneInfo_Position, 2647).
+-define(wxAuiPaneInfo_Resizable, 2648).
+-define(wxAuiPaneInfo_Right, 2649).
+-define(wxAuiPaneInfo_RightDockable, 2650).
+-define(wxAuiPaneInfo_Row, 2651).
+-define(wxAuiPaneInfo_SafeSet, 2652).
+-define(wxAuiPaneInfo_SetFlag, 2653).
+-define(wxAuiPaneInfo_Show, 2654).
+-define(wxAuiPaneInfo_ToolbarPane, 2655).
+-define(wxAuiPaneInfo_Top, 2656).
+-define(wxAuiPaneInfo_TopDockable, 2657).
+-define(wxAuiPaneInfo_Window, 2658).
+-define(wxAuiPaneInfo_GetWindow, 2659).
+-define(wxAuiPaneInfo_GetFrame, 2660).
+-define(wxAuiPaneInfo_GetDirection, 2661).
+-define(wxAuiPaneInfo_GetLayer, 2662).
+-define(wxAuiPaneInfo_GetRow, 2663).
+-define(wxAuiPaneInfo_GetPosition, 2664).
+-define(wxAuiPaneInfo_GetFloatingPosition, 2665).
+-define(wxAuiPaneInfo_GetFloatingSize, 2666).
+-define(wxAuiNotebook_new_0, 2667).
+-define(wxAuiNotebook_new_2, 2668).
+-define(wxAuiNotebook_AddPage, 2669).
+-define(wxAuiNotebook_Create, 2670).
+-define(wxAuiNotebook_DeletePage, 2671).
+-define(wxAuiNotebook_GetArtProvider, 2672).
+-define(wxAuiNotebook_GetPage, 2673).
+-define(wxAuiNotebook_GetPageBitmap, 2674).
+-define(wxAuiNotebook_GetPageCount, 2675).
+-define(wxAuiNotebook_GetPageIndex, 2676).
+-define(wxAuiNotebook_GetPageText, 2677).
+-define(wxAuiNotebook_GetSelection, 2678).
+-define(wxAuiNotebook_InsertPage, 2679).
+-define(wxAuiNotebook_RemovePage, 2680).
+-define(wxAuiNotebook_SetArtProvider, 2681).
+-define(wxAuiNotebook_SetFont, 2682).
+-define(wxAuiNotebook_SetPageBitmap, 2683).
+-define(wxAuiNotebook_SetPageText, 2684).
+-define(wxAuiNotebook_SetSelection, 2685).
+-define(wxAuiNotebook_SetTabCtrlHeight, 2686).
+-define(wxAuiNotebook_SetUniformBitmapSize, 2687).
+-define(wxAuiNotebook_destroy, 2688).
+-define(wxAuiTabArt_SetFlags, 2689).
+-define(wxAuiTabArt_SetMeasuringFont, 2690).
+-define(wxAuiTabArt_SetNormalFont, 2691).
+-define(wxAuiTabArt_SetSelectedFont, 2692).
+-define(wxAuiTabArt_SetColour, 2693).
+-define(wxAuiTabArt_SetActiveColour, 2694).
+-define(wxAuiDockArt_GetColour, 2695).
+-define(wxAuiDockArt_GetFont, 2696).
+-define(wxAuiDockArt_GetMetric, 2697).
+-define(wxAuiDockArt_SetColour, 2698).
+-define(wxAuiDockArt_SetFont, 2699).
+-define(wxAuiDockArt_SetMetric, 2700).
+-define(wxAuiSimpleTabArt_new, 2701).
+-define(wxAuiSimpleTabArt_destroy, 2702).
+-define(wxMDIParentFrame_new_0, 2703).
+-define(wxMDIParentFrame_new_4, 2704).
+-define(wxMDIParentFrame_destruct, 2705).
+-define(wxMDIParentFrame_ActivateNext, 2706).
+-define(wxMDIParentFrame_ActivatePrevious, 2707).
+-define(wxMDIParentFrame_ArrangeIcons, 2708).
+-define(wxMDIParentFrame_Cascade, 2709).
+-define(wxMDIParentFrame_Create, 2710).
+-define(wxMDIParentFrame_GetActiveChild, 2711).
+-define(wxMDIParentFrame_GetClientWindow, 2712).
+-define(wxMDIParentFrame_Tile, 2713).
+-define(wxMDIChildFrame_new_0, 2714).
+-define(wxMDIChildFrame_new_4, 2715).
+-define(wxMDIChildFrame_destruct, 2716).
+-define(wxMDIChildFrame_Activate, 2717).
+-define(wxMDIChildFrame_Create, 2718).
+-define(wxMDIChildFrame_Maximize, 2719).
+-define(wxMDIChildFrame_Restore, 2720).
+-define(wxMDIClientWindow_new_0, 2721).
+-define(wxMDIClientWindow_new_2, 2722).
+-define(wxMDIClientWindow_destruct, 2723).
+-define(wxMDIClientWindow_CreateClient, 2724).
+-define(wxLayoutAlgorithm_new, 2725).
+-define(wxLayoutAlgorithm_LayoutFrame, 2726).
+-define(wxLayoutAlgorithm_LayoutMDIFrame, 2727).
+-define(wxLayoutAlgorithm_LayoutWindow, 2728).
+-define(wxLayoutAlgorithm_destroy, 2729).
+-define(wxEvent_GetId, 2730).
+-define(wxEvent_GetSkipped, 2731).
+-define(wxEvent_GetTimestamp, 2732).
+-define(wxEvent_IsCommandEvent, 2733).
+-define(wxEvent_ResumePropagation, 2734).
+-define(wxEvent_ShouldPropagate, 2735).
+-define(wxEvent_Skip, 2736).
+-define(wxEvent_StopPropagation, 2737).
+-define(wxCommandEvent_getClientData, 2738).
+-define(wxCommandEvent_GetExtraLong, 2739).
+-define(wxCommandEvent_GetInt, 2740).
+-define(wxCommandEvent_GetSelection, 2741).
+-define(wxCommandEvent_GetString, 2742).
+-define(wxCommandEvent_IsChecked, 2743).
+-define(wxCommandEvent_IsSelection, 2744).
+-define(wxCommandEvent_SetInt, 2745).
+-define(wxCommandEvent_SetString, 2746).
+-define(wxScrollEvent_GetOrientation, 2747).
+-define(wxScrollEvent_GetPosition, 2748).
+-define(wxScrollWinEvent_GetOrientation, 2749).
+-define(wxScrollWinEvent_GetPosition, 2750).
+-define(wxMouseEvent_AltDown, 2751).
+-define(wxMouseEvent_Button, 2752).
+-define(wxMouseEvent_ButtonDClick, 2753).
+-define(wxMouseEvent_ButtonDown, 2754).
+-define(wxMouseEvent_ButtonUp, 2755).
+-define(wxMouseEvent_CmdDown, 2756).
+-define(wxMouseEvent_ControlDown, 2757).
+-define(wxMouseEvent_Dragging, 2758).
+-define(wxMouseEvent_Entering, 2759).
+-define(wxMouseEvent_GetButton, 2760).
+-define(wxMouseEvent_GetPosition, 2763).
+-define(wxMouseEvent_GetLogicalPosition, 2764).
+-define(wxMouseEvent_GetLinesPerAction, 2765).
+-define(wxMouseEvent_GetWheelRotation, 2766).
+-define(wxMouseEvent_GetWheelDelta, 2767).
+-define(wxMouseEvent_GetX, 2768).
+-define(wxMouseEvent_GetY, 2769).
+-define(wxMouseEvent_IsButton, 2770).
+-define(wxMouseEvent_IsPageScroll, 2771).
+-define(wxMouseEvent_Leaving, 2772).
+-define(wxMouseEvent_LeftDClick, 2773).
+-define(wxMouseEvent_LeftDown, 2774).
+-define(wxMouseEvent_LeftIsDown, 2775).
+-define(wxMouseEvent_LeftUp, 2776).
+-define(wxMouseEvent_MetaDown, 2777).
+-define(wxMouseEvent_MiddleDClick, 2778).
+-define(wxMouseEvent_MiddleDown, 2779).
+-define(wxMouseEvent_MiddleIsDown, 2780).
+-define(wxMouseEvent_MiddleUp, 2781).
+-define(wxMouseEvent_Moving, 2782).
+-define(wxMouseEvent_RightDClick, 2783).
+-define(wxMouseEvent_RightDown, 2784).
+-define(wxMouseEvent_RightIsDown, 2785).
+-define(wxMouseEvent_RightUp, 2786).
+-define(wxMouseEvent_ShiftDown, 2787).
+-define(wxSetCursorEvent_GetCursor, 2788).
+-define(wxSetCursorEvent_GetX, 2789).
+-define(wxSetCursorEvent_GetY, 2790).
+-define(wxSetCursorEvent_HasCursor, 2791).
+-define(wxSetCursorEvent_SetCursor, 2792).
+-define(wxKeyEvent_AltDown, 2793).
+-define(wxKeyEvent_CmdDown, 2794).
+-define(wxKeyEvent_ControlDown, 2795).
+-define(wxKeyEvent_GetKeyCode, 2796).
+-define(wxKeyEvent_GetModifiers, 2797).
+-define(wxKeyEvent_GetPosition, 2800).
+-define(wxKeyEvent_GetRawKeyCode, 2801).
+-define(wxKeyEvent_GetRawKeyFlags, 2802).
+-define(wxKeyEvent_GetUnicodeKey, 2803).
+-define(wxKeyEvent_GetX, 2804).
+-define(wxKeyEvent_GetY, 2805).
+-define(wxKeyEvent_HasModifiers, 2806).
+-define(wxKeyEvent_MetaDown, 2807).
+-define(wxKeyEvent_ShiftDown, 2808).
+-define(wxSizeEvent_GetSize, 2809).
+-define(wxMoveEvent_GetPosition, 2810).
+-define(wxEraseEvent_GetDC, 2811).
+-define(wxFocusEvent_GetWindow, 2812).
+-define(wxChildFocusEvent_GetWindow, 2813).
+-define(wxMenuEvent_GetMenu, 2814).
+-define(wxMenuEvent_GetMenuId, 2815).
+-define(wxMenuEvent_IsPopup, 2816).
+-define(wxCloseEvent_CanVeto, 2817).
+-define(wxCloseEvent_GetLoggingOff, 2818).
+-define(wxCloseEvent_SetCanVeto, 2819).
+-define(wxCloseEvent_SetLoggingOff, 2820).
+-define(wxCloseEvent_Veto, 2821).
+-define(wxShowEvent_SetShow, 2822).
+-define(wxShowEvent_GetShow, 2823).
+-define(wxIconizeEvent_Iconized, 2824).
+-define(wxJoystickEvent_ButtonDown, 2825).
+-define(wxJoystickEvent_ButtonIsDown, 2826).
+-define(wxJoystickEvent_ButtonUp, 2827).
+-define(wxJoystickEvent_GetButtonChange, 2828).
+-define(wxJoystickEvent_GetButtonState, 2829).
+-define(wxJoystickEvent_GetJoystick, 2830).
+-define(wxJoystickEvent_GetPosition, 2831).
+-define(wxJoystickEvent_GetZPosition, 2832).
+-define(wxJoystickEvent_IsButton, 2833).
+-define(wxJoystickEvent_IsMove, 2834).
+-define(wxJoystickEvent_IsZMove, 2835).
+-define(wxUpdateUIEvent_CanUpdate, 2836).
+-define(wxUpdateUIEvent_Check, 2837).
+-define(wxUpdateUIEvent_Enable, 2838).
+-define(wxUpdateUIEvent_Show, 2839).
+-define(wxUpdateUIEvent_GetChecked, 2840).
+-define(wxUpdateUIEvent_GetEnabled, 2841).
+-define(wxUpdateUIEvent_GetShown, 2842).
+-define(wxUpdateUIEvent_GetSetChecked, 2843).
+-define(wxUpdateUIEvent_GetSetEnabled, 2844).
+-define(wxUpdateUIEvent_GetSetShown, 2845).
+-define(wxUpdateUIEvent_GetSetText, 2846).
+-define(wxUpdateUIEvent_GetText, 2847).
+-define(wxUpdateUIEvent_GetMode, 2848).
+-define(wxUpdateUIEvent_GetUpdateInterval, 2849).
+-define(wxUpdateUIEvent_ResetUpdateTime, 2850).
+-define(wxUpdateUIEvent_SetMode, 2851).
+-define(wxUpdateUIEvent_SetText, 2852).
+-define(wxUpdateUIEvent_SetUpdateInterval, 2853).
+-define(wxMouseCaptureChangedEvent_GetCapturedWindow, 2854).
+-define(wxPaletteChangedEvent_SetChangedWindow, 2855).
+-define(wxPaletteChangedEvent_GetChangedWindow, 2856).
+-define(wxQueryNewPaletteEvent_SetPaletteRealized, 2857).
+-define(wxQueryNewPaletteEvent_GetPaletteRealized, 2858).
+-define(wxNavigationKeyEvent_GetDirection, 2859).
+-define(wxNavigationKeyEvent_SetDirection, 2860).
+-define(wxNavigationKeyEvent_IsWindowChange, 2861).
+-define(wxNavigationKeyEvent_SetWindowChange, 2862).
+-define(wxNavigationKeyEvent_IsFromTab, 2863).
+-define(wxNavigationKeyEvent_SetFromTab, 2864).
+-define(wxNavigationKeyEvent_GetCurrentFocus, 2865).
+-define(wxNavigationKeyEvent_SetCurrentFocus, 2866).
+-define(wxHelpEvent_GetOrigin, 2867).
+-define(wxHelpEvent_GetPosition, 2868).
+-define(wxHelpEvent_SetOrigin, 2869).
+-define(wxHelpEvent_SetPosition, 2870).
+-define(wxContextMenuEvent_GetPosition, 2871).
+-define(wxContextMenuEvent_SetPosition, 2872).
+-define(wxIdleEvent_CanSend, 2873).
+-define(wxIdleEvent_GetMode, 2874).
+-define(wxIdleEvent_RequestMore, 2875).
+-define(wxIdleEvent_MoreRequested, 2876).
+-define(wxIdleEvent_SetMode, 2877).
+-define(wxGridEvent_AltDown, 2878).
+-define(wxGridEvent_ControlDown, 2879).
+-define(wxGridEvent_GetCol, 2880).
+-define(wxGridEvent_GetPosition, 2881).
+-define(wxGridEvent_GetRow, 2882).
+-define(wxGridEvent_MetaDown, 2883).
+-define(wxGridEvent_Selecting, 2884).
+-define(wxGridEvent_ShiftDown, 2885).
+-define(wxNotifyEvent_Allow, 2886).
+-define(wxNotifyEvent_IsAllowed, 2887).
+-define(wxNotifyEvent_Veto, 2888).
+-define(wxSashEvent_GetEdge, 2889).
+-define(wxSashEvent_GetDragRect, 2890).
+-define(wxSashEvent_GetDragStatus, 2891).
+-define(wxListEvent_GetCacheFrom, 2892).
+-define(wxListEvent_GetCacheTo, 2893).
+-define(wxListEvent_GetKeyCode, 2894).
+-define(wxListEvent_GetIndex, 2895).
+-define(wxListEvent_GetColumn, 2896).
+-define(wxListEvent_GetPoint, 2897).
+-define(wxListEvent_GetLabel, 2898).
+-define(wxListEvent_GetText, 2899).
+-define(wxListEvent_GetImage, 2900).
+-define(wxListEvent_GetData, 2901).
+-define(wxListEvent_GetMask, 2902).
+-define(wxListEvent_GetItem, 2903).
+-define(wxListEvent_IsEditCancelled, 2904).
+-define(wxDateEvent_GetDate, 2905).
+-define(wxCalendarEvent_GetWeekDay, 2906).
+-define(wxFileDirPickerEvent_GetPath, 2907).
+-define(wxColourPickerEvent_GetColour, 2908).
+-define(wxFontPickerEvent_GetFont, 2909).
+-define(wxStyledTextEvent_GetPosition, 2910).
+-define(wxStyledTextEvent_GetKey, 2911).
+-define(wxStyledTextEvent_GetModifiers, 2912).
+-define(wxStyledTextEvent_GetModificationType, 2913).
+-define(wxStyledTextEvent_GetText, 2914).
+-define(wxStyledTextEvent_GetLength, 2915).
+-define(wxStyledTextEvent_GetLinesAdded, 2916).
+-define(wxStyledTextEvent_GetLine, 2917).
+-define(wxStyledTextEvent_GetFoldLevelNow, 2918).
+-define(wxStyledTextEvent_GetFoldLevelPrev, 2919).
+-define(wxStyledTextEvent_GetMargin, 2920).
+-define(wxStyledTextEvent_GetMessage, 2921).
+-define(wxStyledTextEvent_GetWParam, 2922).
+-define(wxStyledTextEvent_GetLParam, 2923).
+-define(wxStyledTextEvent_GetListType, 2924).
+-define(wxStyledTextEvent_GetX, 2925).
+-define(wxStyledTextEvent_GetY, 2926).
+-define(wxStyledTextEvent_GetDragText, 2927).
+-define(wxStyledTextEvent_GetDragAllowMove, 2928).
+-define(wxStyledTextEvent_GetDragResult, 2929).
+-define(wxStyledTextEvent_GetShift, 2930).
+-define(wxStyledTextEvent_GetControl, 2931).
+-define(wxStyledTextEvent_GetAlt, 2932).
+-define(utils_wxGetKeyState, 2933).
+-define(utils_wxGetMousePosition, 2934).
+-define(utils_wxGetMouseState, 2935).
+-define(utils_wxSetDetectableAutoRepeat, 2936).
+-define(utils_wxBell, 2937).
+-define(utils_wxFindMenuItemId, 2938).
+-define(utils_wxGenericFindWindowAtPoint, 2939).
+-define(utils_wxFindWindowAtPoint, 2940).
+-define(utils_wxBeginBusyCursor, 2941).
+-define(utils_wxEndBusyCursor, 2942).
+-define(utils_wxIsBusy, 2943).
+-define(utils_wxShutdown, 2944).
+-define(utils_wxShell, 2945).
+-define(utils_wxLaunchDefaultBrowser, 2946).
+-define(utils_wxGetEmailAddress, 2947).
+-define(utils_wxGetUserId, 2948).
+-define(utils_wxGetHomeDir, 2949).
+-define(utils_wxNewId, 2950).
+-define(utils_wxRegisterId, 2951).
+-define(utils_wxGetCurrentId, 2952).
+-define(utils_wxGetOsDescription, 2953).
+-define(utils_wxIsPlatformLittleEndian, 2954).
+-define(utils_wxIsPlatform64Bit, 2955).
+-define(gdicmn_wxDisplaySize, 2956).
+-define(gdicmn_wxSetCursor, 2957).
+-define(wxPrintout_new, 2958).
+-define(wxPrintout_destruct, 2959).
+-define(wxPrintout_GetDC, 2960).
+-define(wxPrintout_GetPageSizeMM, 2961).
+-define(wxPrintout_GetPageSizePixels, 2962).
+-define(wxPrintout_GetPaperRectPixels, 2963).
+-define(wxPrintout_GetPPIPrinter, 2964).
+-define(wxPrintout_GetPPIScreen, 2965).
+-define(wxPrintout_GetTitle, 2966).
+-define(wxPrintout_IsPreview, 2967).
+-define(wxPrintout_FitThisSizeToPaper, 2968).
+-define(wxPrintout_FitThisSizeToPage, 2969).
+-define(wxPrintout_FitThisSizeToPageMargins, 2970).
+-define(wxPrintout_MapScreenSizeToPaper, 2971).
+-define(wxPrintout_MapScreenSizeToPage, 2972).
+-define(wxPrintout_MapScreenSizeToPageMargins, 2973).
+-define(wxPrintout_MapScreenSizeToDevice, 2974).
+-define(wxPrintout_GetLogicalPaperRect, 2975).
+-define(wxPrintout_GetLogicalPageRect, 2976).
+-define(wxPrintout_GetLogicalPageMarginsRect, 2977).
+-define(wxPrintout_SetLogicalOrigin, 2978).
+-define(wxPrintout_OffsetLogicalOrigin, 2979).
+-define(wxStyledTextCtrl_new_2, 2980).
+-define(wxStyledTextCtrl_new_0, 2981).
+-define(wxStyledTextCtrl_destruct, 2982).
+-define(wxStyledTextCtrl_Create, 2983).
+-define(wxStyledTextCtrl_AddText, 2984).
+-define(wxStyledTextCtrl_AddStyledText, 2985).
+-define(wxStyledTextCtrl_InsertText, 2986).
+-define(wxStyledTextCtrl_ClearAll, 2987).
+-define(wxStyledTextCtrl_ClearDocumentStyle, 2988).
+-define(wxStyledTextCtrl_GetLength, 2989).
+-define(wxStyledTextCtrl_GetCharAt, 2990).
+-define(wxStyledTextCtrl_GetCurrentPos, 2991).
+-define(wxStyledTextCtrl_GetAnchor, 2992).
+-define(wxStyledTextCtrl_GetStyleAt, 2993).
+-define(wxStyledTextCtrl_Redo, 2994).
+-define(wxStyledTextCtrl_SetUndoCollection, 2995).
+-define(wxStyledTextCtrl_SelectAll, 2996).
+-define(wxStyledTextCtrl_SetSavePoint, 2997).
+-define(wxStyledTextCtrl_GetStyledText, 2998).
+-define(wxStyledTextCtrl_CanRedo, 2999).
+-define(wxStyledTextCtrl_MarkerLineFromHandle, 3000).
+-define(wxStyledTextCtrl_MarkerDeleteHandle, 3001).
+-define(wxStyledTextCtrl_GetUndoCollection, 3002).
+-define(wxStyledTextCtrl_GetViewWhiteSpace, 3003).
+-define(wxStyledTextCtrl_SetViewWhiteSpace, 3004).
+-define(wxStyledTextCtrl_PositionFromPoint, 3005).
+-define(wxStyledTextCtrl_PositionFromPointClose, 3006).
+-define(wxStyledTextCtrl_GotoLine, 3007).
+-define(wxStyledTextCtrl_GotoPos, 3008).
+-define(wxStyledTextCtrl_SetAnchor, 3009).
+-define(wxStyledTextCtrl_GetCurLine, 3010).
+-define(wxStyledTextCtrl_GetEndStyled, 3011).
+-define(wxStyledTextCtrl_ConvertEOLs, 3012).
+-define(wxStyledTextCtrl_GetEOLMode, 3013).
+-define(wxStyledTextCtrl_SetEOLMode, 3014).
+-define(wxStyledTextCtrl_StartStyling, 3015).
+-define(wxStyledTextCtrl_SetStyling, 3016).
+-define(wxStyledTextCtrl_GetBufferedDraw, 3017).
+-define(wxStyledTextCtrl_SetBufferedDraw, 3018).
+-define(wxStyledTextCtrl_SetTabWidth, 3019).
+-define(wxStyledTextCtrl_GetTabWidth, 3020).
+-define(wxStyledTextCtrl_SetCodePage, 3021).
+-define(wxStyledTextCtrl_MarkerDefine, 3022).
+-define(wxStyledTextCtrl_MarkerSetForeground, 3023).
+-define(wxStyledTextCtrl_MarkerSetBackground, 3024).
+-define(wxStyledTextCtrl_MarkerAdd, 3025).
+-define(wxStyledTextCtrl_MarkerDelete, 3026).
+-define(wxStyledTextCtrl_MarkerDeleteAll, 3027).
+-define(wxStyledTextCtrl_MarkerGet, 3028).
+-define(wxStyledTextCtrl_MarkerNext, 3029).
+-define(wxStyledTextCtrl_MarkerPrevious, 3030).
+-define(wxStyledTextCtrl_MarkerDefineBitmap, 3031).
+-define(wxStyledTextCtrl_MarkerAddSet, 3032).
+-define(wxStyledTextCtrl_MarkerSetAlpha, 3033).
+-define(wxStyledTextCtrl_SetMarginType, 3034).
+-define(wxStyledTextCtrl_GetMarginType, 3035).
+-define(wxStyledTextCtrl_SetMarginWidth, 3036).
+-define(wxStyledTextCtrl_GetMarginWidth, 3037).
+-define(wxStyledTextCtrl_SetMarginMask, 3038).
+-define(wxStyledTextCtrl_GetMarginMask, 3039).
+-define(wxStyledTextCtrl_SetMarginSensitive, 3040).
+-define(wxStyledTextCtrl_GetMarginSensitive, 3041).
+-define(wxStyledTextCtrl_StyleClearAll, 3042).
+-define(wxStyledTextCtrl_StyleSetForeground, 3043).
+-define(wxStyledTextCtrl_StyleSetBackground, 3044).
+-define(wxStyledTextCtrl_StyleSetBold, 3045).
+-define(wxStyledTextCtrl_StyleSetItalic, 3046).
+-define(wxStyledTextCtrl_StyleSetSize, 3047).
+-define(wxStyledTextCtrl_StyleSetFaceName, 3048).
+-define(wxStyledTextCtrl_StyleSetEOLFilled, 3049).
+-define(wxStyledTextCtrl_StyleResetDefault, 3050).
+-define(wxStyledTextCtrl_StyleSetUnderline, 3051).
+-define(wxStyledTextCtrl_StyleSetCase, 3052).
+-define(wxStyledTextCtrl_StyleSetHotSpot, 3053).
+-define(wxStyledTextCtrl_SetSelForeground, 3054).
+-define(wxStyledTextCtrl_SetSelBackground, 3055).
+-define(wxStyledTextCtrl_GetSelAlpha, 3056).
+-define(wxStyledTextCtrl_SetSelAlpha, 3057).
+-define(wxStyledTextCtrl_SetCaretForeground, 3058).
+-define(wxStyledTextCtrl_CmdKeyAssign, 3059).
+-define(wxStyledTextCtrl_CmdKeyClear, 3060).
+-define(wxStyledTextCtrl_CmdKeyClearAll, 3061).
+-define(wxStyledTextCtrl_SetStyleBytes, 3062).
+-define(wxStyledTextCtrl_StyleSetVisible, 3063).
+-define(wxStyledTextCtrl_GetCaretPeriod, 3064).
+-define(wxStyledTextCtrl_SetCaretPeriod, 3065).
+-define(wxStyledTextCtrl_SetWordChars, 3066).
+-define(wxStyledTextCtrl_BeginUndoAction, 3067).
+-define(wxStyledTextCtrl_EndUndoAction, 3068).
+-define(wxStyledTextCtrl_IndicatorSetStyle, 3069).
+-define(wxStyledTextCtrl_IndicatorGetStyle, 3070).
+-define(wxStyledTextCtrl_IndicatorSetForeground, 3071).
+-define(wxStyledTextCtrl_IndicatorGetForeground, 3072).
+-define(wxStyledTextCtrl_SetWhitespaceForeground, 3073).
+-define(wxStyledTextCtrl_SetWhitespaceBackground, 3074).
+-define(wxStyledTextCtrl_GetStyleBits, 3075).
+-define(wxStyledTextCtrl_SetLineState, 3076).
+-define(wxStyledTextCtrl_GetLineState, 3077).
+-define(wxStyledTextCtrl_GetMaxLineState, 3078).
+-define(wxStyledTextCtrl_GetCaretLineVisible, 3079).
+-define(wxStyledTextCtrl_SetCaretLineVisible, 3080).
+-define(wxStyledTextCtrl_GetCaretLineBackground, 3081).
+-define(wxStyledTextCtrl_SetCaretLineBackground, 3082).
+-define(wxStyledTextCtrl_AutoCompShow, 3083).
+-define(wxStyledTextCtrl_AutoCompCancel, 3084).
+-define(wxStyledTextCtrl_AutoCompActive, 3085).
+-define(wxStyledTextCtrl_AutoCompPosStart, 3086).
+-define(wxStyledTextCtrl_AutoCompComplete, 3087).
+-define(wxStyledTextCtrl_AutoCompStops, 3088).
+-define(wxStyledTextCtrl_AutoCompSetSeparator, 3089).
+-define(wxStyledTextCtrl_AutoCompGetSeparator, 3090).
+-define(wxStyledTextCtrl_AutoCompSelect, 3091).
+-define(wxStyledTextCtrl_AutoCompSetCancelAtStart, 3092).
+-define(wxStyledTextCtrl_AutoCompGetCancelAtStart, 3093).
+-define(wxStyledTextCtrl_AutoCompSetFillUps, 3094).
+-define(wxStyledTextCtrl_AutoCompSetChooseSingle, 3095).
+-define(wxStyledTextCtrl_AutoCompGetChooseSingle, 3096).
+-define(wxStyledTextCtrl_AutoCompSetIgnoreCase, 3097).
+-define(wxStyledTextCtrl_AutoCompGetIgnoreCase, 3098).
+-define(wxStyledTextCtrl_UserListShow, 3099).
+-define(wxStyledTextCtrl_AutoCompSetAutoHide, 3100).
+-define(wxStyledTextCtrl_AutoCompGetAutoHide, 3101).
+-define(wxStyledTextCtrl_AutoCompSetDropRestOfWord, 3102).
+-define(wxStyledTextCtrl_AutoCompGetDropRestOfWord, 3103).
+-define(wxStyledTextCtrl_RegisterImage, 3104).
+-define(wxStyledTextCtrl_ClearRegisteredImages, 3105).
+-define(wxStyledTextCtrl_AutoCompGetTypeSeparator, 3106).
+-define(wxStyledTextCtrl_AutoCompSetTypeSeparator, 3107).
+-define(wxStyledTextCtrl_AutoCompSetMaxWidth, 3108).
+-define(wxStyledTextCtrl_AutoCompGetMaxWidth, 3109).
+-define(wxStyledTextCtrl_AutoCompSetMaxHeight, 3110).
+-define(wxStyledTextCtrl_AutoCompGetMaxHeight, 3111).
+-define(wxStyledTextCtrl_SetIndent, 3112).
+-define(wxStyledTextCtrl_GetIndent, 3113).
+-define(wxStyledTextCtrl_SetUseTabs, 3114).
+-define(wxStyledTextCtrl_GetUseTabs, 3115).
+-define(wxStyledTextCtrl_SetLineIndentation, 3116).
+-define(wxStyledTextCtrl_GetLineIndentation, 3117).
+-define(wxStyledTextCtrl_GetLineIndentPosition, 3118).
+-define(wxStyledTextCtrl_GetColumn, 3119).
+-define(wxStyledTextCtrl_SetUseHorizontalScrollBar, 3120).
+-define(wxStyledTextCtrl_GetUseHorizontalScrollBar, 3121).
+-define(wxStyledTextCtrl_SetIndentationGuides, 3122).
+-define(wxStyledTextCtrl_GetIndentationGuides, 3123).
+-define(wxStyledTextCtrl_SetHighlightGuide, 3124).
+-define(wxStyledTextCtrl_GetHighlightGuide, 3125).
+-define(wxStyledTextCtrl_GetLineEndPosition, 3126).
+-define(wxStyledTextCtrl_GetCodePage, 3127).
+-define(wxStyledTextCtrl_GetCaretForeground, 3128).
+-define(wxStyledTextCtrl_GetReadOnly, 3129).
+-define(wxStyledTextCtrl_SetCurrentPos, 3130).
+-define(wxStyledTextCtrl_SetSelectionStart, 3131).
+-define(wxStyledTextCtrl_GetSelectionStart, 3132).
+-define(wxStyledTextCtrl_SetSelectionEnd, 3133).
+-define(wxStyledTextCtrl_GetSelectionEnd, 3134).
+-define(wxStyledTextCtrl_SetPrintMagnification, 3135).
+-define(wxStyledTextCtrl_GetPrintMagnification, 3136).
+-define(wxStyledTextCtrl_SetPrintColourMode, 3137).
+-define(wxStyledTextCtrl_GetPrintColourMode, 3138).
+-define(wxStyledTextCtrl_FindText, 3139).
+-define(wxStyledTextCtrl_FormatRange, 3140).
+-define(wxStyledTextCtrl_GetFirstVisibleLine, 3141).
+-define(wxStyledTextCtrl_GetLine, 3142).
+-define(wxStyledTextCtrl_GetLineCount, 3143).
+-define(wxStyledTextCtrl_SetMarginLeft, 3144).
+-define(wxStyledTextCtrl_GetMarginLeft, 3145).
+-define(wxStyledTextCtrl_SetMarginRight, 3146).
+-define(wxStyledTextCtrl_GetMarginRight, 3147).
+-define(wxStyledTextCtrl_GetModify, 3148).
+-define(wxStyledTextCtrl_SetSelection, 3149).
+-define(wxStyledTextCtrl_GetSelectedText, 3150).
+-define(wxStyledTextCtrl_GetTextRange, 3151).
+-define(wxStyledTextCtrl_HideSelection, 3152).
+-define(wxStyledTextCtrl_LineFromPosition, 3153).
+-define(wxStyledTextCtrl_PositionFromLine, 3154).
+-define(wxStyledTextCtrl_LineScroll, 3155).
+-define(wxStyledTextCtrl_EnsureCaretVisible, 3156).
+-define(wxStyledTextCtrl_ReplaceSelection, 3157).
+-define(wxStyledTextCtrl_SetReadOnly, 3158).
+-define(wxStyledTextCtrl_CanPaste, 3159).
+-define(wxStyledTextCtrl_CanUndo, 3160).
+-define(wxStyledTextCtrl_EmptyUndoBuffer, 3161).
+-define(wxStyledTextCtrl_Undo, 3162).
+-define(wxStyledTextCtrl_Cut, 3163).
+-define(wxStyledTextCtrl_Copy, 3164).
+-define(wxStyledTextCtrl_Paste, 3165).
+-define(wxStyledTextCtrl_Clear, 3166).
+-define(wxStyledTextCtrl_SetText, 3167).
+-define(wxStyledTextCtrl_GetText, 3168).
+-define(wxStyledTextCtrl_GetTextLength, 3169).
+-define(wxStyledTextCtrl_GetOvertype, 3170).
+-define(wxStyledTextCtrl_SetCaretWidth, 3171).
+-define(wxStyledTextCtrl_GetCaretWidth, 3172).
+-define(wxStyledTextCtrl_SetTargetStart, 3173).
+-define(wxStyledTextCtrl_GetTargetStart, 3174).
+-define(wxStyledTextCtrl_SetTargetEnd, 3175).
+-define(wxStyledTextCtrl_GetTargetEnd, 3176).
+-define(wxStyledTextCtrl_ReplaceTarget, 3177).
+-define(wxStyledTextCtrl_SearchInTarget, 3178).
+-define(wxStyledTextCtrl_SetSearchFlags, 3179).
+-define(wxStyledTextCtrl_GetSearchFlags, 3180).
+-define(wxStyledTextCtrl_CallTipShow, 3181).
+-define(wxStyledTextCtrl_CallTipCancel, 3182).
+-define(wxStyledTextCtrl_CallTipActive, 3183).
+-define(wxStyledTextCtrl_CallTipPosAtStart, 3184).
+-define(wxStyledTextCtrl_CallTipSetHighlight, 3185).
+-define(wxStyledTextCtrl_CallTipSetBackground, 3186).
+-define(wxStyledTextCtrl_CallTipSetForeground, 3187).
+-define(wxStyledTextCtrl_CallTipSetForegroundHighlight, 3188).
+-define(wxStyledTextCtrl_CallTipUseStyle, 3189).
+-define(wxStyledTextCtrl_VisibleFromDocLine, 3190).
+-define(wxStyledTextCtrl_DocLineFromVisible, 3191).
+-define(wxStyledTextCtrl_WrapCount, 3192).
+-define(wxStyledTextCtrl_SetFoldLevel, 3193).
+-define(wxStyledTextCtrl_GetFoldLevel, 3194).
+-define(wxStyledTextCtrl_GetLastChild, 3195).
+-define(wxStyledTextCtrl_GetFoldParent, 3196).
+-define(wxStyledTextCtrl_ShowLines, 3197).
+-define(wxStyledTextCtrl_HideLines, 3198).
+-define(wxStyledTextCtrl_GetLineVisible, 3199).
+-define(wxStyledTextCtrl_SetFoldExpanded, 3200).
+-define(wxStyledTextCtrl_GetFoldExpanded, 3201).
+-define(wxStyledTextCtrl_ToggleFold, 3202).
+-define(wxStyledTextCtrl_EnsureVisible, 3203).
+-define(wxStyledTextCtrl_SetFoldFlags, 3204).
+-define(wxStyledTextCtrl_EnsureVisibleEnforcePolicy, 3205).
+-define(wxStyledTextCtrl_SetTabIndents, 3206).
+-define(wxStyledTextCtrl_GetTabIndents, 3207).
+-define(wxStyledTextCtrl_SetBackSpaceUnIndents, 3208).
+-define(wxStyledTextCtrl_GetBackSpaceUnIndents, 3209).
+-define(wxStyledTextCtrl_SetMouseDwellTime, 3210).
+-define(wxStyledTextCtrl_GetMouseDwellTime, 3211).
+-define(wxStyledTextCtrl_WordStartPosition, 3212).
+-define(wxStyledTextCtrl_WordEndPosition, 3213).
+-define(wxStyledTextCtrl_SetWrapMode, 3214).
+-define(wxStyledTextCtrl_GetWrapMode, 3215).
+-define(wxStyledTextCtrl_SetWrapVisualFlags, 3216).
+-define(wxStyledTextCtrl_GetWrapVisualFlags, 3217).
+-define(wxStyledTextCtrl_SetWrapVisualFlagsLocation, 3218).
+-define(wxStyledTextCtrl_GetWrapVisualFlagsLocation, 3219).
+-define(wxStyledTextCtrl_SetWrapStartIndent, 3220).
+-define(wxStyledTextCtrl_GetWrapStartIndent, 3221).
+-define(wxStyledTextCtrl_SetLayoutCache, 3222).
+-define(wxStyledTextCtrl_GetLayoutCache, 3223).
+-define(wxStyledTextCtrl_SetScrollWidth, 3224).
+-define(wxStyledTextCtrl_GetScrollWidth, 3225).
+-define(wxStyledTextCtrl_TextWidth, 3226).
+-define(wxStyledTextCtrl_GetEndAtLastLine, 3227).
+-define(wxStyledTextCtrl_TextHeight, 3228).
+-define(wxStyledTextCtrl_SetUseVerticalScrollBar, 3229).
+-define(wxStyledTextCtrl_GetUseVerticalScrollBar, 3230).
+-define(wxStyledTextCtrl_AppendText, 3231).
+-define(wxStyledTextCtrl_GetTwoPhaseDraw, 3232).
+-define(wxStyledTextCtrl_SetTwoPhaseDraw, 3233).
+-define(wxStyledTextCtrl_TargetFromSelection, 3234).
+-define(wxStyledTextCtrl_LinesJoin, 3235).
+-define(wxStyledTextCtrl_LinesSplit, 3236).
+-define(wxStyledTextCtrl_SetFoldMarginColour, 3237).
+-define(wxStyledTextCtrl_SetFoldMarginHiColour, 3238).
+-define(wxStyledTextCtrl_LineDown, 3239).
+-define(wxStyledTextCtrl_LineDownExtend, 3240).
+-define(wxStyledTextCtrl_LineUp, 3241).
+-define(wxStyledTextCtrl_LineUpExtend, 3242).
+-define(wxStyledTextCtrl_CharLeft, 3243).
+-define(wxStyledTextCtrl_CharLeftExtend, 3244).
+-define(wxStyledTextCtrl_CharRight, 3245).
+-define(wxStyledTextCtrl_CharRightExtend, 3246).
+-define(wxStyledTextCtrl_WordLeft, 3247).
+-define(wxStyledTextCtrl_WordLeftExtend, 3248).
+-define(wxStyledTextCtrl_WordRight, 3249).
+-define(wxStyledTextCtrl_WordRightExtend, 3250).
+-define(wxStyledTextCtrl_Home, 3251).
+-define(wxStyledTextCtrl_HomeExtend, 3252).
+-define(wxStyledTextCtrl_LineEnd, 3253).
+-define(wxStyledTextCtrl_LineEndExtend, 3254).
+-define(wxStyledTextCtrl_DocumentStart, 3255).
+-define(wxStyledTextCtrl_DocumentStartExtend, 3256).
+-define(wxStyledTextCtrl_DocumentEnd, 3257).
+-define(wxStyledTextCtrl_DocumentEndExtend, 3258).
+-define(wxStyledTextCtrl_PageUp, 3259).
+-define(wxStyledTextCtrl_PageUpExtend, 3260).
+-define(wxStyledTextCtrl_PageDown, 3261).
+-define(wxStyledTextCtrl_PageDownExtend, 3262).
+-define(wxStyledTextCtrl_EditToggleOvertype, 3263).
+-define(wxStyledTextCtrl_Cancel, 3264).
+-define(wxStyledTextCtrl_DeleteBack, 3265).
+-define(wxStyledTextCtrl_Tab, 3266).
+-define(wxStyledTextCtrl_BackTab, 3267).
+-define(wxStyledTextCtrl_NewLine, 3268).
+-define(wxStyledTextCtrl_FormFeed, 3269).
+-define(wxStyledTextCtrl_VCHome, 3270).
+-define(wxStyledTextCtrl_VCHomeExtend, 3271).
+-define(wxStyledTextCtrl_ZoomIn, 3272).
+-define(wxStyledTextCtrl_ZoomOut, 3273).
+-define(wxStyledTextCtrl_DelWordLeft, 3274).
+-define(wxStyledTextCtrl_DelWordRight, 3275).
+-define(wxStyledTextCtrl_LineCut, 3276).
+-define(wxStyledTextCtrl_LineDelete, 3277).
+-define(wxStyledTextCtrl_LineTranspose, 3278).
+-define(wxStyledTextCtrl_LineDuplicate, 3279).
+-define(wxStyledTextCtrl_LowerCase, 3280).
+-define(wxStyledTextCtrl_UpperCase, 3281).
+-define(wxStyledTextCtrl_LineScrollDown, 3282).
+-define(wxStyledTextCtrl_LineScrollUp, 3283).
+-define(wxStyledTextCtrl_DeleteBackNotLine, 3284).
+-define(wxStyledTextCtrl_HomeDisplay, 3285).
+-define(wxStyledTextCtrl_HomeDisplayExtend, 3286).
+-define(wxStyledTextCtrl_LineEndDisplay, 3287).
+-define(wxStyledTextCtrl_LineEndDisplayExtend, 3288).
+-define(wxStyledTextCtrl_HomeWrapExtend, 3289).
+-define(wxStyledTextCtrl_LineEndWrap, 3290).
+-define(wxStyledTextCtrl_LineEndWrapExtend, 3291).
+-define(wxStyledTextCtrl_VCHomeWrap, 3292).
+-define(wxStyledTextCtrl_VCHomeWrapExtend, 3293).
+-define(wxStyledTextCtrl_LineCopy, 3294).
+-define(wxStyledTextCtrl_MoveCaretInsideView, 3295).
+-define(wxStyledTextCtrl_LineLength, 3296).
+-define(wxStyledTextCtrl_BraceHighlight, 3297).
+-define(wxStyledTextCtrl_BraceBadLight, 3298).
+-define(wxStyledTextCtrl_BraceMatch, 3299).
+-define(wxStyledTextCtrl_GetViewEOL, 3300).
+-define(wxStyledTextCtrl_SetViewEOL, 3301).
+-define(wxStyledTextCtrl_SetModEventMask, 3302).
+-define(wxStyledTextCtrl_GetEdgeColumn, 3303).
+-define(wxStyledTextCtrl_SetEdgeColumn, 3304).
+-define(wxStyledTextCtrl_SetEdgeMode, 3305).
+-define(wxStyledTextCtrl_GetEdgeMode, 3306).
+-define(wxStyledTextCtrl_GetEdgeColour, 3307).
+-define(wxStyledTextCtrl_SetEdgeColour, 3308).
+-define(wxStyledTextCtrl_SearchAnchor, 3309).
+-define(wxStyledTextCtrl_SearchNext, 3310).
+-define(wxStyledTextCtrl_SearchPrev, 3311).
+-define(wxStyledTextCtrl_LinesOnScreen, 3312).
+-define(wxStyledTextCtrl_UsePopUp, 3313).
+-define(wxStyledTextCtrl_SelectionIsRectangle, 3314).
+-define(wxStyledTextCtrl_SetZoom, 3315).
+-define(wxStyledTextCtrl_GetZoom, 3316).
+-define(wxStyledTextCtrl_GetModEventMask, 3317).
+-define(wxStyledTextCtrl_SetSTCFocus, 3318).
+-define(wxStyledTextCtrl_GetSTCFocus, 3319).
+-define(wxStyledTextCtrl_SetStatus, 3320).
+-define(wxStyledTextCtrl_GetStatus, 3321).
+-define(wxStyledTextCtrl_SetMouseDownCaptures, 3322).
+-define(wxStyledTextCtrl_GetMouseDownCaptures, 3323).
+-define(wxStyledTextCtrl_SetSTCCursor, 3324).
+-define(wxStyledTextCtrl_GetSTCCursor, 3325).
+-define(wxStyledTextCtrl_SetControlCharSymbol, 3326).
+-define(wxStyledTextCtrl_GetControlCharSymbol, 3327).
+-define(wxStyledTextCtrl_WordPartLeft, 3328).
+-define(wxStyledTextCtrl_WordPartLeftExtend, 3329).
+-define(wxStyledTextCtrl_WordPartRight, 3330).
+-define(wxStyledTextCtrl_WordPartRightExtend, 3331).
+-define(wxStyledTextCtrl_SetVisiblePolicy, 3332).
+-define(wxStyledTextCtrl_DelLineLeft, 3333).
+-define(wxStyledTextCtrl_DelLineRight, 3334).
+-define(wxStyledTextCtrl_GetXOffset, 3335).
+-define(wxStyledTextCtrl_ChooseCaretX, 3336).
+-define(wxStyledTextCtrl_SetXCaretPolicy, 3337).
+-define(wxStyledTextCtrl_SetYCaretPolicy, 3338).
+-define(wxStyledTextCtrl_GetPrintWrapMode, 3339).
+-define(wxStyledTextCtrl_SetHotspotActiveForeground, 3340).
+-define(wxStyledTextCtrl_SetHotspotActiveBackground, 3341).
+-define(wxStyledTextCtrl_SetHotspotActiveUnderline, 3342).
+-define(wxStyledTextCtrl_SetHotspotSingleLine, 3343).
+-define(wxStyledTextCtrl_ParaDownExtend, 3344).
+-define(wxStyledTextCtrl_ParaUp, 3345).
+-define(wxStyledTextCtrl_ParaUpExtend, 3346).
+-define(wxStyledTextCtrl_PositionBefore, 3347).
+-define(wxStyledTextCtrl_PositionAfter, 3348).
+-define(wxStyledTextCtrl_CopyRange, 3349).
+-define(wxStyledTextCtrl_CopyText, 3350).
+-define(wxStyledTextCtrl_SetSelectionMode, 3351).
+-define(wxStyledTextCtrl_GetSelectionMode, 3352).
+-define(wxStyledTextCtrl_LineDownRectExtend, 3353).
+-define(wxStyledTextCtrl_LineUpRectExtend, 3354).
+-define(wxStyledTextCtrl_CharLeftRectExtend, 3355).
+-define(wxStyledTextCtrl_CharRightRectExtend, 3356).
+-define(wxStyledTextCtrl_HomeRectExtend, 3357).
+-define(wxStyledTextCtrl_VCHomeRectExtend, 3358).
+-define(wxStyledTextCtrl_LineEndRectExtend, 3359).
+-define(wxStyledTextCtrl_PageUpRectExtend, 3360).
+-define(wxStyledTextCtrl_PageDownRectExtend, 3361).
+-define(wxStyledTextCtrl_StutteredPageUp, 3362).
+-define(wxStyledTextCtrl_StutteredPageUpExtend, 3363).
+-define(wxStyledTextCtrl_StutteredPageDown, 3364).
+-define(wxStyledTextCtrl_StutteredPageDownExtend, 3365).
+-define(wxStyledTextCtrl_WordLeftEnd, 3366).
+-define(wxStyledTextCtrl_WordLeftEndExtend, 3367).
+-define(wxStyledTextCtrl_WordRightEnd, 3368).
+-define(wxStyledTextCtrl_WordRightEndExtend, 3369).
+-define(wxStyledTextCtrl_SetWhitespaceChars, 3370).
+-define(wxStyledTextCtrl_SetCharsDefault, 3371).
+-define(wxStyledTextCtrl_AutoCompGetCurrent, 3372).
+-define(wxStyledTextCtrl_Allocate, 3373).
+-define(wxStyledTextCtrl_FindColumn, 3374).
+-define(wxStyledTextCtrl_GetCaretSticky, 3375).
+-define(wxStyledTextCtrl_SetCaretSticky, 3376).
+-define(wxStyledTextCtrl_ToggleCaretSticky, 3377).
+-define(wxStyledTextCtrl_SetPasteConvertEndings, 3378).
+-define(wxStyledTextCtrl_GetPasteConvertEndings, 3379).
+-define(wxStyledTextCtrl_SelectionDuplicate, 3380).
+-define(wxStyledTextCtrl_SetCaretLineBackAlpha, 3381).
+-define(wxStyledTextCtrl_GetCaretLineBackAlpha, 3382).
+-define(wxStyledTextCtrl_StartRecord, 3383).
+-define(wxStyledTextCtrl_StopRecord, 3384).
+-define(wxStyledTextCtrl_SetLexer, 3385).
+-define(wxStyledTextCtrl_GetLexer, 3386).
+-define(wxStyledTextCtrl_Colourise, 3387).
+-define(wxStyledTextCtrl_SetProperty, 3388).
+-define(wxStyledTextCtrl_SetKeyWords, 3389).
+-define(wxStyledTextCtrl_SetLexerLanguage, 3390).
+-define(wxStyledTextCtrl_GetProperty, 3391).
+-define(wxStyledTextCtrl_GetStyleBitsNeeded, 3392).
+-define(wxStyledTextCtrl_GetCurrentLine, 3393).
+-define(wxStyledTextCtrl_StyleSetSpec, 3394).
+-define(wxStyledTextCtrl_StyleSetFont, 3395).
+-define(wxStyledTextCtrl_StyleSetFontAttr, 3396).
+-define(wxStyledTextCtrl_StyleSetCharacterSet, 3397).
+-define(wxStyledTextCtrl_StyleSetFontEncoding, 3398).
+-define(wxStyledTextCtrl_CmdKeyExecute, 3399).
+-define(wxStyledTextCtrl_SetMargins, 3400).
+-define(wxStyledTextCtrl_GetSelection, 3401).
+-define(wxStyledTextCtrl_PointFromPosition, 3402).
+-define(wxStyledTextCtrl_ScrollToLine, 3403).
+-define(wxStyledTextCtrl_ScrollToColumn, 3404).
+-define(wxStyledTextCtrl_SetVScrollBar, 3405).
+-define(wxStyledTextCtrl_SetHScrollBar, 3406).
+-define(wxStyledTextCtrl_GetLastKeydownProcessed, 3407).
+-define(wxStyledTextCtrl_SetLastKeydownProcessed, 3408).
+-define(wxStyledTextCtrl_SaveFile, 3409).
+-define(wxStyledTextCtrl_LoadFile, 3410).
+-define(wxStyledTextCtrl_DoDragOver, 3411).
+-define(wxStyledTextCtrl_DoDropText, 3412).
+-define(wxStyledTextCtrl_GetUseAntiAliasing, 3413).
+-define(wxStyledTextCtrl_AddTextRaw, 3414).
+-define(wxStyledTextCtrl_InsertTextRaw, 3415).
+-define(wxStyledTextCtrl_GetCurLineRaw, 3416).
+-define(wxStyledTextCtrl_GetLineRaw, 3417).
+-define(wxStyledTextCtrl_GetSelectedTextRaw, 3418).
+-define(wxStyledTextCtrl_GetTextRangeRaw, 3419).
+-define(wxStyledTextCtrl_SetTextRaw, 3420).
+-define(wxStyledTextCtrl_GetTextRaw, 3421).
+-define(wxStyledTextCtrl_AppendTextRaw, 3422).
+-define(wxArtProvider_GetBitmap, 3423).
+-define(wxArtProvider_GetIcon, 3424).
+-define(wxTreeEvent_GetKeyCode, 3425).
+-define(wxTreeEvent_GetItem, 3426).
+-define(wxTreeEvent_GetKeyEvent, 3427).
+-define(wxTreeEvent_GetLabel, 3428).
+-define(wxTreeEvent_GetOldItem, 3429).
+-define(wxTreeEvent_GetPoint, 3430).
+-define(wxTreeEvent_IsEditCancelled, 3431).
+-define(wxTreeEvent_SetToolTip, 3432).
+-define(wxNotebookEvent_GetOldSelection, 3433).
+-define(wxNotebookEvent_GetSelection, 3434).
+-define(wxNotebookEvent_SetOldSelection, 3435).
+-define(wxNotebookEvent_SetSelection, 3436).
+-define(wxFileDataObject_new, 3437).
+-define(wxFileDataObject_AddFile, 3438).
+-define(wxFileDataObject_GetFilenames, 3439).
+-define(wxFileDataObject_destroy, 3440).
+-define(wxTextDataObject_new, 3441).
+-define(wxTextDataObject_GetTextLength, 3442).
+-define(wxTextDataObject_GetText, 3443).
+-define(wxTextDataObject_SetText, 3444).
+-define(wxTextDataObject_destroy, 3445).
+-define(wxBitmapDataObject_new_1_1, 3446).
+-define(wxBitmapDataObject_new_1_0, 3447).
+-define(wxBitmapDataObject_GetBitmap, 3448).
+-define(wxBitmapDataObject_SetBitmap, 3449).
+-define(wxBitmapDataObject_destroy, 3450).
+-define(wxClipboard_new, 3452).
+-define(wxClipboard_destruct, 3453).
+-define(wxClipboard_AddData, 3454).
+-define(wxClipboard_Clear, 3455).
+-define(wxClipboard_Close, 3456).
+-define(wxClipboard_Flush, 3457).
+-define(wxClipboard_GetData, 3458).
+-define(wxClipboard_IsOpened, 3459).
+-define(wxClipboard_Open, 3460).
+-define(wxClipboard_SetData, 3461).
+-define(wxClipboard_UsePrimarySelection, 3463).
+-define(wxClipboard_IsSupported, 3464).
+-define(wxClipboard_Get, 3465).
+-define(wxSpinEvent_GetPosition, 3466).
+-define(wxSpinEvent_SetPosition, 3467).
+-define(wxSplitterWindow_new_0, 3468).
+-define(wxSplitterWindow_new_2, 3469).
+-define(wxSplitterWindow_destruct, 3470).
+-define(wxSplitterWindow_Create, 3471).
+-define(wxSplitterWindow_GetMinimumPaneSize, 3472).
+-define(wxSplitterWindow_GetSashGravity, 3473).
+-define(wxSplitterWindow_GetSashPosition, 3474).
+-define(wxSplitterWindow_GetSplitMode, 3475).
+-define(wxSplitterWindow_GetWindow1, 3476).
+-define(wxSplitterWindow_GetWindow2, 3477).
+-define(wxSplitterWindow_Initialize, 3478).
+-define(wxSplitterWindow_IsSplit, 3479).
+-define(wxSplitterWindow_ReplaceWindow, 3480).
+-define(wxSplitterWindow_SetSashGravity, 3481).
+-define(wxSplitterWindow_SetSashPosition, 3482).
+-define(wxSplitterWindow_SetSashSize, 3483).
+-define(wxSplitterWindow_SetMinimumPaneSize, 3484).
+-define(wxSplitterWindow_SetSplitMode, 3485).
+-define(wxSplitterWindow_SplitHorizontally, 3486).
+-define(wxSplitterWindow_SplitVertically, 3487).
+-define(wxSplitterWindow_Unsplit, 3488).
+-define(wxSplitterWindow_UpdateSize, 3489).
+-define(wxSplitterEvent_GetSashPosition, 3490).
+-define(wxSplitterEvent_GetX, 3491).
+-define(wxSplitterEvent_GetY, 3492).
+-define(wxSplitterEvent_GetWindowBeingRemoved, 3493).
+-define(wxSplitterEvent_SetSashPosition, 3494).
+-define(wxHtmlWindow_new_0, 3495).
+-define(wxHtmlWindow_new_2, 3496).
+-define(wxHtmlWindow_AppendToPage, 3497).
+-define(wxHtmlWindow_GetOpenedAnchor, 3498).
+-define(wxHtmlWindow_GetOpenedPage, 3499).
+-define(wxHtmlWindow_GetOpenedPageTitle, 3500).
+-define(wxHtmlWindow_GetRelatedFrame, 3501).
+-define(wxHtmlWindow_HistoryBack, 3502).
+-define(wxHtmlWindow_HistoryCanBack, 3503).
+-define(wxHtmlWindow_HistoryCanForward, 3504).
+-define(wxHtmlWindow_HistoryClear, 3505).
+-define(wxHtmlWindow_HistoryForward, 3506).
+-define(wxHtmlWindow_LoadFile, 3507).
+-define(wxHtmlWindow_LoadPage, 3508).
+-define(wxHtmlWindow_SelectAll, 3509).
+-define(wxHtmlWindow_SelectionToText, 3510).
+-define(wxHtmlWindow_SelectLine, 3511).
+-define(wxHtmlWindow_SelectWord, 3512).
+-define(wxHtmlWindow_SetBorders, 3513).
+-define(wxHtmlWindow_SetFonts, 3514).
+-define(wxHtmlWindow_SetPage, 3515).
+-define(wxHtmlWindow_SetRelatedFrame, 3516).
+-define(wxHtmlWindow_SetRelatedStatusBar, 3517).
+-define(wxHtmlWindow_ToText, 3518).
+-define(wxHtmlWindow_destroy, 3519).
+-define(wxHtmlLinkEvent_GetLinkInfo, 3520).
+-define(wxSystemSettings_GetColour, 3521).
+-define(wxSystemSettings_GetFont, 3522).
+-define(wxSystemSettings_GetMetric, 3523).
+-define(wxSystemSettings_GetScreenType, 3524).
+-define(wxSystemOptions_GetOption, 3525).
+-define(wxSystemOptions_GetOptionInt, 3526).
+-define(wxSystemOptions_HasOption, 3527).
+-define(wxSystemOptions_IsFalse, 3528).
+-define(wxSystemOptions_SetOption_2_1, 3529).
+-define(wxSystemOptions_SetOption_2_0, 3530).
+-define(wxAuiNotebookEvent_SetSelection, 3531).
+-define(wxAuiNotebookEvent_GetSelection, 3532).
+-define(wxAuiNotebookEvent_SetOldSelection, 3533).
+-define(wxAuiNotebookEvent_GetOldSelection, 3534).
+-define(wxAuiNotebookEvent_SetDragSource, 3535).
+-define(wxAuiNotebookEvent_GetDragSource, 3536).
+-define(wxAuiManagerEvent_SetManager, 3537).
+-define(wxAuiManagerEvent_GetManager, 3538).
+-define(wxAuiManagerEvent_SetPane, 3539).
+-define(wxAuiManagerEvent_GetPane, 3540).
+-define(wxAuiManagerEvent_SetButton, 3541).
+-define(wxAuiManagerEvent_GetButton, 3542).
+-define(wxAuiManagerEvent_SetDC, 3543).
+-define(wxAuiManagerEvent_GetDC, 3544).
+-define(wxAuiManagerEvent_Veto, 3545).
+-define(wxAuiManagerEvent_GetVeto, 3546).
+-define(wxAuiManagerEvent_SetCanVeto, 3547).
+-define(wxAuiManagerEvent_CanVeto, 3548).
+-define(wxLogNull_new, 3549).
+-define(wxLogNull_destroy, 3550).
+-define(wxTaskBarIcon_new, 3551).
+-define(wxTaskBarIcon_destruct, 3552).
+-define(wxTaskBarIcon_PopupMenu, 3553).
+-define(wxTaskBarIcon_RemoveIcon, 3554).
+-define(wxTaskBarIcon_SetIcon, 3555).
+-define(wxLocale_new_0, 3556).
+-define(wxLocale_new_2, 3558).
+-define(wxLocale_destruct, 3559).
+-define(wxLocale_Init, 3561).
+-define(wxLocale_AddCatalog_1, 3562).
+-define(wxLocale_AddCatalog_3, 3563).
+-define(wxLocale_AddCatalogLookupPathPrefix, 3564).
+-define(wxLocale_GetCanonicalName, 3565).
+-define(wxLocale_GetLanguage, 3566).
+-define(wxLocale_GetLanguageName, 3567).
+-define(wxLocale_GetLocale, 3568).
+-define(wxLocale_GetName, 3569).
+-define(wxLocale_GetString_2, 3570).
+-define(wxLocale_GetString_4, 3571).
+-define(wxLocale_GetHeaderValue, 3572).
+-define(wxLocale_GetSysName, 3573).
+-define(wxLocale_GetSystemEncoding, 3574).
+-define(wxLocale_GetSystemEncodingName, 3575).
+-define(wxLocale_GetSystemLanguage, 3576).
+-define(wxLocale_IsLoaded, 3577).
+-define(wxLocale_IsOk, 3578).
+-define(wxActivateEvent_GetActive, 3579).
+-define(wxPopupWindow_new_2, 3581).
+-define(wxPopupWindow_new_0, 3582).
+-define(wxPopupWindow_destruct, 3584).
+-define(wxPopupWindow_Create, 3585).
+-define(wxPopupWindow_Position, 3586).
+-define(wxPopupTransientWindow_new_0, 3587).
+-define(wxPopupTransientWindow_new_2, 3588).
+-define(wxPopupTransientWindow_destruct, 3589).
+-define(wxPopupTransientWindow_Popup, 3590).
+-define(wxPopupTransientWindow_Dismiss, 3591).
+-define(wxOverlay_new, 3592).
+-define(wxOverlay_destruct, 3593).
+-define(wxOverlay_Reset, 3594).
+-define(wxDCOverlay_new_6, 3595).
+-define(wxDCOverlay_new_2, 3596).
+-define(wxDCOverlay_destruct, 3597).
+-define(wxDCOverlay_Clear, 3598).
diff --git a/lib/wx/src/wxe_server.erl b/lib/wx/src/wxe_server.erl
index ae9440f890..693a008e3d 100644
--- a/lib/wx/src/wxe_server.erl
+++ b/lib/wx/src/wxe_server.erl
@@ -272,7 +272,7 @@ invoke_callback(Pid, Ev, Ref) ->
 		 wx:set_env(Env),
 		 wxe_util:cast(?WXE_CB_START, <<>>),
 		 try
-		     case get_wx_object_state(Pid) of
+		     case get_wx_object_state(Pid, 5) of
 			 ignore ->
 			     %% Ignore early events
 			     wxEvent:skip(Ref);
@@ -307,16 +307,24 @@ invoke_callback_fun(Fun) ->
     wxe_util:cast(?WXE_CB_RETURN, Res).
 
 
-get_wx_object_state(Pid) ->
+get_wx_object_state(Pid, N) when N > 0 ->
     case process_info(Pid, dictionary) of
 	{dictionary, Dict} ->
 	    case lists:keysearch('_wx_object_',1,Dict) of
-		{value, {'_wx_object_', {_Mod, '_wx_init_'}}} -> ignore;
-		{value, {'_wx_object_', Value}} -> Value;
-		_ -> ignore
+		{value, {'_wx_object_', {_Mod, '_wx_init_'}}} ->
+		    timer:sleep(50),
+		    get_wx_object_state(Pid, N-1);
+		{value, {'_wx_object_', Value}} ->
+		    Value;
+		_ ->
+		    ignore
 	    end;
-	_ -> ignore
-    end.
+	_ ->
+	    ignore
+    end;
+get_wx_object_state(_, _) ->
+    ignore.
+
 
 attach_fun(Fun, S = #state{cb=CB,cb_cnt=Next}) ->
     case gb_trees:lookup(Fun,CB) of
diff --git a/lib/wx/test/wx_basic_SUITE.erl b/lib/wx/test/wx_basic_SUITE.erl
index 2c746158e5..0b919f6254 100644
--- a/lib/wx/test/wx_basic_SUITE.erl
+++ b/lib/wx/test/wx_basic_SUITE.erl
@@ -338,6 +338,20 @@ data_types(_Config) ->
     ?m(true, is_boolean(wxCalendarCtrl:setDate(Cal,DateTime))),
     ?m({Date,_}, wxCalendarCtrl:getDate(Cal)),
 
+    %% Images, test sending and reading binaries
+    Colors = << <<200:8, 199:8, 198:8 >> || _ <- lists:seq(1, 128*64) >>,
+    Alpha  = << <<255:8>> || _ <- lists:seq(1, 128*64) >>,
+    ImgRGB = ?mt(wxImage, wxImage:new(128, 64, Colors)),
+    ?m(true, wxImage:ok(ImgRGB)),
+    ?m(false, wxImage:hasAlpha(ImgRGB)),
+    ?m(Colors, wxImage:getData(ImgRGB)),
+
+    ImgRGBA = ?mt(wxImage, wxImage:new(128, 64, Colors, Alpha)),
+    ?m(true, wxImage:ok(ImgRGBA)),
+    ?m(true, wxImage:hasAlpha(ImgRGBA)),
+    ?m(Colors, wxImage:getData(ImgRGBA)),
+    ?m(Alpha, wxImage:getAlpha(ImgRGBA)),
+
     wxClientDC:destroy(CDC),
     %%wx_test_lib:wx_destroy(Frame,Config).
     wx:destroy().
diff --git a/lib/wx/test/wx_event_SUITE.erl b/lib/wx/test/wx_event_SUITE.erl
index 7e71d6ca69..516133e3e2 100644
--- a/lib/wx/test/wx_event_SUITE.erl
+++ b/lib/wx/test/wx_event_SUITE.erl
@@ -46,8 +46,8 @@ end_per_testcase(Func,Config) ->
 %% SUITE specification
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
-    [connect, disconnect, connect_msg_20, connect_cb_20,
+all() ->
+    [connect, disconnect, disconnect_cb, connect_msg_20, connect_cb_20,
      mouse_on_grid, spin_event, connect_in_callback, recursive,
      dialog, char_events, callback_clean
     ].
@@ -162,9 +162,33 @@ disconnect(Config) ->
     ?m([], wx_test_lib:flush()),
 
     wx_test_lib:wx_destroy(Frame, Config).
-    
 
 
+
+disconnect_cb(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
+disconnect_cb(Config) ->
+    ?mr(wx_ref, wx:new()),
+    Frame = ?mt(wxFrame, wxFrame:new(wx:null(), 1, "Event Testing")),
+    Panel = ?mt(wxPanel, wxPanel:new(Frame)),
+
+    Tester = self(),
+    CB = fun(#wx{event=#wxSize{},userData=UserD}, SizeEvent) ->
+		 ?mt(wxSizeEvent, SizeEvent),
+		 wxEvtHandler:disconnect(Frame, close_window),
+		 Tester ! {got_size, UserD}
+	 end,
+    ?m(ok, wxFrame:connect(Frame,  close_window)),
+    ?m(ok, wxFrame:connect(Frame,  size)),
+    ?m(ok, wxEvtHandler:connect(Panel, size, [{callback,CB},{userData, panel}])),
+
+    ?m(true, wxFrame:show(Frame)),
+
+    wxWindow:setSize(Panel, {200,100}),
+    get_size_messages(Frame, [frame, panel_cb]),
+    wx_test_lib:flush(),
+
+    wx_test_lib:wx_destroy(Frame, Config).
+
 %% Test that the msg events are forwarded as supposed to 
 connect_msg_20(TestInfo) 
   when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index a1bacb5d66..de723b2a2d 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 1.6
+WX_VSN = 1.6.1
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 19274e95ae..55367eb25e 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,20 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.10</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Suppress Dialyzer warnings. </p>
+          <p>
+	    Own Id: OTP-12862</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.9</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
index 2bbe0eea1a..2c5caab07b 100644
--- a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
+++ b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
@@ -152,6 +152,7 @@ parse_document(Rest, State) when is_record(State, xmerl_sax_parser_state) ->
 %%             [22] prolog ::= XMLDecl? Misc* (doctypedecl Misc*)?
 %%             [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>'
 %%----------------------------------------------------------------------
+-dialyzer({[no_fail_call, no_match], parse_xml_decl/2}).
 parse_xml_decl(?STRING_EMPTY, State) ->
     cf(?STRING_EMPTY, State, fun parse_xml_decl/2);
 parse_xml_decl(?BYTE_ORDER_MARK_1, State) ->
@@ -1205,6 +1206,7 @@ send_character_event(_, true, String, State) ->
 %% Description: Parse whitespaces.
 %%              [3] S ::= (#x20 | #x9 | #xD | #xA)+
 %%----------------------------------------------------------------------
+-dialyzer({no_fail_call, whitespace/3}).
 whitespace(?STRING_EMPTY, State, Acc) ->  
     case cf(?STRING_EMPTY, State, Acc, fun whitespace/3) of
 	{?STRING_EMPTY, State} ->
@@ -1716,6 +1718,7 @@ handle_external_entity({Tag, _Url}, State) ->
 %% Result    : {Rest, State}
 %% Description: Parse the external entity.
 %%----------------------------------------------------------------------
+-dialyzer({[no_fail_call, no_match], parse_external_entity_1/2}).
 parse_external_entity_1(?STRING_EMPTY, #xmerl_sax_parser_state{file_type=Type} = State) ->
     case catch cf(?STRING_EMPTY, State, fun parse_external_entity_1/2) of
 	{Rest, State1} when is_record(State1, xmerl_sax_parser_state) ->
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 2bf3172d87..829716dcdb 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -1010,7 +1010,7 @@ scan_optional_version(T,S) ->
 scan_enc_name([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_enc_name(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(expected_encoding_name, S1) end,
+      fatal_fun(expected_encoding_name),
       S);
 scan_enc_name([H|T], S0) when H >= $"; H =< $' ->
     ?bump_col(1),
@@ -1020,7 +1020,7 @@ scan_enc_name([H|T], S0) when H >= $"; H =< $' ->
 scan_enc_name([], S=#xmerl_scanner{continuation_fun = F}, Delim, Acc) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_enc_name(MoreBytes, S1, Delim, Acc) end,
-      fun(S1) -> ?fatal(expected_encoding_name, S1) end,
+      fatal_fun(expected_encoding_name),
       S);
 scan_enc_name([H|T], S0, Delim, Acc) when H >= $a, H =< $z ->
     ?bump_col(1),
@@ -1034,7 +1034,7 @@ scan_enc_name([H|_T],S,_Delim,_Acc) ->
 scan_enc_name2([], S=#xmerl_scanner{continuation_fun = F}, Delim, Acc) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_enc_name2(MoreBytes, S1, Delim, Acc) end,
-      fun(S1) -> ?fatal(expected_encoding_name, S1) end,
+      fatal_fun(expected_encoding_name),
       S);
 scan_enc_name2([H|T], S0, H, Acc) ->
     ?bump_col(1),
@@ -1058,7 +1058,7 @@ scan_enc_name2([H|T], S0, Delim, Acc) when H == $.; H == $_; H == $- ->
 scan_xml_vsn([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_xml_vsn(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_xml_vsn([H|T], S) when H==$"; H==$'->
     xml_vsn(T, S#xmerl_scanner{col = S#xmerl_scanner.col+1}, H, []).
@@ -1066,7 +1066,7 @@ scan_xml_vsn([H|T], S) when H==$"; H==$'->
 xml_vsn([], S=#xmerl_scanner{continuation_fun = F}, Delim, Acc) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> xml_vsn(MoreBytes, S1, Delim, Acc) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 xml_vsn([H|T], S=#xmerl_scanner{col = C}, H, Acc) ->
     {lists:reverse(Acc), T, S#xmerl_scanner{col = C+1}};
@@ -1089,7 +1089,7 @@ xml_vsn([H|T], S=#xmerl_scanner{col = C}, Delim, Acc) ->
 scan_pi([], S=#xmerl_scanner{continuation_fun = F}, Pos, Ps) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_pi(MoreBytes, S1, Pos, Ps) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_pi(Str = [H1,H2,H3 | T],S0=#xmerl_scanner{line = L, col = C}, Pos, Ps)
   when H1==$x;H1==$X ->
@@ -1125,7 +1125,7 @@ scan_pi([], S=#xmerl_scanner{continuation_fun = F}, Target,
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_pi(MoreBytes, S1, Target,
 				    L, C, Pos, Ps, Acc) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_pi("?>" ++ T, S0 = #xmerl_scanner{hook_fun = Hook,
 				       event_fun = Event},
@@ -1152,7 +1152,7 @@ scan_pi2([], S=#xmerl_scanner{continuation_fun = F}, Target,
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_pi2(MoreBytes, S1, Target,
 				     L, C, Pos, Ps, Acc) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_pi2("?>" ++ T, S0 = #xmerl_scanner{hook_fun = Hook,
 				       event_fun = Event},
@@ -1180,7 +1180,7 @@ scan_pi2(Str, S0, Target, L, C, Pos, Ps, Acc) ->
 scan_doctype([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_doctype(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_doctype(T, S) ->
     {_,T1,S1} = mandatory_strip(T,S),
@@ -1194,7 +1194,7 @@ scan_doctype(T, S) ->
 scan_doctype1([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_doctype1(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_doctype1("PUBLIC" ++ T, S0) ->
     ?bump_col(6),
@@ -1217,7 +1217,7 @@ scan_doctype1(T, S) ->
 scan_doctype2([], S=#xmerl_scanner{continuation_fun = F},DTD) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_doctype2(MoreBytes, S1, DTD) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_doctype2("[" ++ T, S0, DTD) ->
     ?bump_col(1),
@@ -1237,7 +1237,7 @@ scan_doctype2(_T,S,_DTD) ->
 scan_doctype3([], S=#xmerl_scanner{continuation_fun = F},DTD) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_doctype3(MoreBytes, S1,DTD) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_doctype3("%" ++ T, S0, DTD) ->
     ?bump_col(1),
@@ -1549,7 +1549,7 @@ scan_decl_sep(T,S) ->
 scan_conditional_sect([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_conditional_sect(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_conditional_sect("IGNORE" ++ T, S0) ->
     ?bump_col(6),
@@ -1582,7 +1582,7 @@ scan_ignore(Str,S) ->
 scan_ignore([], S=#xmerl_scanner{continuation_fun = F},Level) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_ignore(MoreBytes, S1,Level) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_ignore("<![" ++ T, S0,Level) ->
     %% nested conditional section. Topmost condition is ignore, though
@@ -1603,7 +1603,7 @@ scan_ignore([_H|T],S0,Level) ->
 scan_include([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_include(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_include("]]>" ++ T, S0) ->
     ?bump_col(3),
@@ -1745,7 +1745,7 @@ update_attributes1([],Acc) ->
 scan_attdef([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_attdef(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_attdef(T, S) ->
     scan_attdef(T, S, _AttrAcc = []).
@@ -1754,7 +1754,7 @@ scan_attdef(T, S) ->
 scan_attdef([], S=#xmerl_scanner{continuation_fun = F}, Attrs) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_attdef(MoreBytes, S1, Attrs) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_attdef(">" ++ T, S0, Attrs) ->
     ?bump_col(1),
@@ -1798,7 +1798,7 @@ scan_attdef2(T, S, Attrs) ->
 scan_att_type([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_att_type(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_att_type("CDATA" ++ T, S0) ->
     ?bump_col(5),
@@ -1856,7 +1856,7 @@ scan_att_type("%" ++ T, S0) ->
 scan_notation_type([], S=#xmerl_scanner{continuation_fun = F}, Acc) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_notation_type(MoreBytes, S1, Acc) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_notation_type(")" ++ T, S0, Acc) ->
     ?bump_col(1),
@@ -1889,7 +1889,7 @@ notation_exists(Name, #xmerl_scanner{rules_read_fun = Read,
 scan_enumeration([], S=#xmerl_scanner{continuation_fun = F}, Acc) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_enumeration(MoreBytes, S1, Acc) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_enumeration(")" ++ T, S0, Acc) ->
     ?bump_col(1),
@@ -1907,7 +1907,7 @@ scan_enumeration("|" ++ T, S0, Acc) ->
 scan_default_decl([], S=#xmerl_scanner{continuation_fun = F}, Type) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_default_decl(MoreBytes, S1, Type) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_default_decl("#REQUIRED" ++ T, S0, _Type) ->
     ?bump_col(9),
@@ -1936,7 +1936,7 @@ default_value(T, S, Type) ->
 scan_entity([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_entity(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_entity("%" ++ T, #xmerl_scanner{rules_write_fun = Write} = S0) ->
     %% parameter entity
@@ -1974,7 +1974,7 @@ scan_entity_completion(T,S) ->
 scan_entity_def([], S=#xmerl_scanner{continuation_fun = F}, EName) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_entity_def(MoreBytes, S1, EName) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_entity_def("'" ++ T, S0, EName) ->
     ?bump_col(1),
@@ -2015,7 +2015,7 @@ scan_entity_def(Str, S, EName) ->
 scan_ndata_decl([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_ndata_decl(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_ndata_decl(Str = ">"++_T, S) ->
     {[], Str, S};
@@ -2062,7 +2062,7 @@ scan_element("/", S=#xmerl_scanner{continuation_fun = F},
     F(fun(MoreBytes, S1) -> scan_element("/" ++ MoreBytes, S1,
 					 Pos, Name, StartL, StartC, Attrs,
 					 Lang,Parents,NSI,NS,SpaceDefault) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_element([], S=#xmerl_scanner{continuation_fun = F},
 	     Pos, Name, StartL, StartC, Attrs, Lang, Parents,
@@ -2071,7 +2071,7 @@ scan_element([], S=#xmerl_scanner{continuation_fun = F},
     F(fun(MoreBytes, S1) -> scan_element(MoreBytes, S1,
 					 Pos, Name, StartL, StartC, Attrs,
 					 Lang,Parents,NSI,NS,SpaceDefault) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_element("/>" ++ T, S0 = #xmerl_scanner{hook_fun = Hook,
 					    event_fun = Event,
@@ -2099,7 +2099,7 @@ scan_element(">", S=#xmerl_scanner{continuation_fun = F},
     F(fun(MoreBytes, S1) -> scan_element(">" ++ MoreBytes, S1,
 					 Pos, Name, StartL, StartC, Attrs,
 					 Lang,Parents,NSI,NS,SpaceDefault) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_element(">" ++ T, S0 = #xmerl_scanner{event_fun = Event,
 					   hook_fun = Hook,
@@ -2344,7 +2344,7 @@ keyreplaceadd(_K, _Pos, [], Obj) ->
 scan_att_value([], S=#xmerl_scanner{continuation_fun = F},AT) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_att_value(MoreBytes, S1, AT) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_att_value("%"++_T,S=#xmerl_scanner{environment=prolog},_AttType) ->
     ?fatal({error,{wfc_PEs_In_Internal_Subset}},S);
@@ -2385,7 +2385,7 @@ scan_att_chars([],S=#xmerl_scanner{continuation_fun=F},H,Acc,TmpAcc,AT,IsNorm)->
     F(fun(MoreBytes, S1) ->
 	      scan_att_chars(MoreBytes, S1, H, Acc,TmpAcc,AT,IsNorm)
       end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_att_chars([H|T], S0, H, Acc, TmpAcc,AttType,IsNorm) -> % End quote
     ?bump_col(1),
@@ -2518,7 +2518,7 @@ scan_content("<", S= #xmerl_scanner{continuation_fun = F},
     F(fun(MoreBytes, S1) -> scan_content("<" ++ MoreBytes, S1,
 					 Pos, Name, Attrs,
 					 Space, Lang, Parents, NS, Acc,[]) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_content([], S=#xmerl_scanner{environment={external,{entity,_}}},
              _Pos, _Name, _Attrs, _Space, _Lang, _Parents, _NS, Acc,_) ->
@@ -2532,7 +2532,7 @@ scan_content([], S=#xmerl_scanner{continuation_fun = F},
     F(fun(MoreBytes, S1) -> scan_content(MoreBytes, S1,
 					 Pos, Name, Attrs,
 					 Space, Lang, Parents, NS, Acc,[]) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_content("</" ++ T, S0, _Pos, Name, _Attrs, _Space, _Lang,
 	     _Parents, _NS, Acc,[]) ->
@@ -2636,7 +2636,7 @@ scan_content_markup([], S=#xmerl_scanner{continuation_fun = F},
     F(fun(MoreBytes, S1) -> scan_content_markup(
 			      MoreBytes,S1,Pos,Name,
 			      Attrs,Space,Lang,Parents,NS) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_content_markup("![CDATA[" ++ T, S0, Pos, _Name, _Attrs,
 		    _Space, _Lang, Parents, _NS) ->
@@ -2664,7 +2664,7 @@ scan_char_data([], S=#xmerl_scanner{environment=internal_parsed_entity},
 scan_char_data([], S=#xmerl_scanner{continuation_fun = F}, Space, _MUD,Acc) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_char_data(MoreBytes,S1,Space,_MUD,Acc) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_char_data([$&|T], S,Space,"&",Acc) ->
     scan_char_data(T, S, Space,[], [$&|Acc]);
@@ -2716,7 +2716,7 @@ scan_cdata(Str, S, Pos, Parents) ->
 scan_cdata([], S=#xmerl_scanner{continuation_fun = F}, Pos, Parents, Acc) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_cdata(MoreBytes, S1, Pos, Parents, Acc) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_cdata("]]>" ++ T, S0, Pos, Parents, Acc) ->
     ?bump_col(3),
@@ -2741,7 +2741,7 @@ scan_cdata(Str, S0, Pos, Parents, Acc) ->
 scan_reference([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_reference(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_reference("#x" ++ T, S0) ->
     %% [66] CharRef
@@ -2783,7 +2783,7 @@ scan_reference(T, S) ->
 scan_entity_ref([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_entity_ref(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_entity_ref("amp;" ++ T, S0) ->
     ?bump_col(4),
@@ -2868,7 +2868,7 @@ expand_reference(Name, #xmerl_scanner{rules_read_fun = Read} = S) ->
 scan_char_ref_dec([], S=#xmerl_scanner{continuation_fun = F}, Acc) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_char_ref_dec(MoreBytes, S1, Acc) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_char_ref_dec([H|T], S0, Acc) when H >= $0, H =< $9 ->
     ?bump_col(1),
@@ -2883,7 +2883,7 @@ scan_char_ref_dec(";" ++ T, S0, Acc) ->
 scan_char_ref_hex([], S=#xmerl_scanner{continuation_fun = F}, Acc) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_char_ref_hex(MoreBytes, S1, Acc) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_char_ref_hex([H|T], S0, Acc) when H >= $0, H =< $9 ->
     ?bump_col(1),
@@ -2957,7 +2957,7 @@ scan_name_no_colons(Str, S) ->
 scan_name([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_name(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_name(Str = [$:|T], S0 = #xmerl_scanner{namespace_conformant = NSC}) ->
     if NSC == false ->
@@ -3007,7 +3007,7 @@ scan_nmtoken(Str, S, Acc, NSC) ->
 scan_nmtoken([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_nmtoken(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_nmtoken("%"++T, S0=#xmerl_scanner{environment={external,_}}) ->
     ?bump_col(1),
@@ -3084,7 +3084,7 @@ isLatin1(_,_) ->
 scan_system_literal([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_system_literal(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_system_literal("\"" ++ T, S) ->
     scan_system_literal(T, S, $", []);
@@ -3096,7 +3096,7 @@ scan_system_literal([], S=#xmerl_scanner{continuation_fun = F},
 		    Delimiter, Acc) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_system_literal(MoreBytes,S1,Delimiter,Acc) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_system_literal([H|T], S, H, Acc) ->
     {lists:reverse(Acc), T, S#xmerl_scanner{col = S#xmerl_scanner.col+1}};
@@ -3114,7 +3114,7 @@ scan_system_literal(Str, S, Delimiter, Acc) ->
 scan_pubid_literal([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_pubid_literal(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_pubid_literal([H|T], S) when H == $"; H == $' ->
     scan_pubid_literal(T, S#xmerl_scanner{col = S#xmerl_scanner.col+1}, H, []);
@@ -3126,7 +3126,7 @@ scan_pubid_literal([], S=#xmerl_scanner{continuation_fun = F},
 		   Delimiter, Acc) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_pubid_literal(MoreBytes,S1,Delimiter,Acc) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_pubid_literal([H|T], S, H, Acc) ->
     {lists:reverse(Acc), T, S#xmerl_scanner{col = S#xmerl_scanner.col+1}};
@@ -3161,7 +3161,7 @@ is_pubid_char(X) ->
 scan_contentspec([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_contentspec(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_contentspec("EMPTY" ++ T, S0) ->
     ?bump_col(5),
@@ -3195,7 +3195,7 @@ scan_elem_content([], S=#xmerl_scanner{continuation_fun = F},
 		  Context, Mode, Acc) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes,S1) -> scan_elem_content(MoreBytes,S1,Context,Mode,Acc) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_elem_content(")" ++ T, S0, Context, Mode0, Acc0) ->
     ?bump_col(1),
@@ -3282,7 +3282,7 @@ format_elem_content(Other) -> Other.
 scan_occurrence([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_occurrence(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_occurrence([$?|T], S0) ->
     ?bump_col(1),
@@ -3433,7 +3433,7 @@ wfc_whitespace_betw_attrs([$> |_]=L,S) ->
 wfc_whitespace_betw_attrs([],S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> wfc_whitespace_betw_attrs(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 wfc_whitespace_betw_attrs(_,S) ->
     ?fatal({whitespace_required_between_attributes},S).
@@ -3477,7 +3477,7 @@ vc_Element_valid(_,_) ->
 scan_pe_def([], S=#xmerl_scanner{continuation_fun = F}, PEName) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_pe_def(MoreBytes, S1, PEName) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_pe_def("'" ++ T, S0, PEName) ->
     ?bump_col(1),
@@ -3510,7 +3510,7 @@ scan_notation_decl(T, #xmerl_scanner{rules_write_fun = Write,
 scan_notation_decl1([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_notation_decl1(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_notation_decl1("SYSTEM" ++ T, S0) ->
     ?bump_col(6),
@@ -3536,7 +3536,7 @@ scan_notation_decl1("PUBLIC" ++ T, S0) ->
 scan_external_id([], S=#xmerl_scanner{continuation_fun = F}) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_external_id(MoreBytes, S1) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_external_id("SYSTEM" ++ T, S0) ->
     ?bump_col(6),
@@ -3582,7 +3582,7 @@ scan_entity_value([], S=#xmerl_scanner{continuation_fun = F},
 	      scan_entity_value(MoreBytes,S1,
 				Delim,Acc,PEName,Namespace,PENesting)
       end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_entity_value([Delim|T], S=#xmerl_scanner{validation=dtd},
 		  Delim,_Acc,PEName,_NS,PENesting) when length(PENesting) /= 0 ->
@@ -3850,7 +3850,7 @@ scan_comment1([], S=#xmerl_scanner{continuation_fun = F},
 	     Pos, Comment, Acc) ->
     ?dbg("cont()...~n", []),
     F(fun(MoreBytes, S1) -> scan_comment1(MoreBytes, S1, Pos, Comment, Acc) end,
-      fun(S1) -> ?fatal(unexpected_end, S1) end,
+      fatal_fun(unexpected_end),
       S);
 scan_comment1("-->" ++ T, S0 = #xmerl_scanner{col = C,
 					     event_fun = Event,
@@ -4100,6 +4100,13 @@ handle_schema_result({error,Reason},S5) ->
 
 %%% Helper functions
 
+-compile({inline, [fatal_fun/1]}).
+
+-spec fatal_fun(_) -> fun((_) -> no_return()).
+
+fatal_fun(Reason) ->
+    fun(S) -> ?fatal(Reason, S) end.
+
 fatal(Reason, S) ->
     exit({fatal, {Reason,
 		  {file,S#xmerl_scanner.filename},
diff --git a/lib/xmerl/test/Makefile b/lib/xmerl/test/Makefile
index f9c03336c8..14e11d5fc4 100644
--- a/lib/xmerl/test/Makefile
+++ b/lib/xmerl/test/Makefile
@@ -84,7 +84,7 @@ RELSYSDIR = $(RELEASE_PATH)/xmerl_test
 # FLAGS
 # ----------------------------------------------------
 
-#ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include -I$(ERL_TOP)/lib/xmerl/include/ $(XMERL_PRESERV_TEST_DIRS)
+ERL_COMPILE_FLAGS +=
 
 
 # ----------------------------------------------------
diff --git a/lib/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl
index 7ddf1066de..672f8a43d1 100644
--- a/lib/xmerl/test/xmerl_SUITE.erl
+++ b/lib/xmerl/test/xmerl_SUITE.erl
@@ -27,7 +27,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 %%-include("xmerl.hrl").
 -include_lib("xmerl/include/xmerl.hrl").
 -include_lib("kernel/include/file.hrl").
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
index afd39b6598..2e026d7476 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
@@ -10,7 +10,7 @@
 -export([test/0, check_node_set/2, ticket_6873/0, ticket_7496/0, functions/0]).
 -export([namespaces/0]).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("xmerl/include/xmerl.hrl").
 
 test() ->
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_lib.erl b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_lib.erl
index 4cde46826e..f5c65b0c63 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_lib.erl
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_lib.erl
@@ -9,7 +9,7 @@
 
 -export([test/0,check_node_set/2,ticket_6873/0]).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("xmerl/include/xmerl.hrl").
 
 test() ->
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_text.erl b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_text.erl
index e39ad6bcb0..c3a1fb9c4d 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_text.erl
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_text.erl
@@ -9,7 +9,7 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("xmerl/include/xmerl.hrl").
 
 -import(xmerl_xs, 
diff --git a/lib/xmerl/test/xmerl_sax_SUITE.erl b/lib/xmerl/test/xmerl_sax_SUITE.erl
index a15d9bd57c..f0e80f81d3 100644
--- a/lib/xmerl/test/xmerl_sax_SUITE.erl
+++ b/lib/xmerl/test/xmerl_sax_SUITE.erl
@@ -27,7 +27,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
 %%======================================================================
diff --git a/lib/xmerl/test/xmerl_sax_std_SUITE.erl b/lib/xmerl/test/xmerl_sax_std_SUITE.erl
index 70e768ff04..b820bd5bc2 100644
--- a/lib/xmerl/test/xmerl_sax_std_SUITE.erl
+++ b/lib/xmerl/test/xmerl_sax_std_SUITE.erl
@@ -27,7 +27,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
 %%======================================================================
diff --git a/lib/xmerl/test/xmerl_std_SUITE.erl b/lib/xmerl/test/xmerl_std_SUITE.erl
index 0ef44bb04e..d3e28353e2 100644
--- a/lib/xmerl/test/xmerl_std_SUITE.erl
+++ b/lib/xmerl/test/xmerl_std_SUITE.erl
@@ -25,7 +25,7 @@
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 %%-include("xmerl.hrl").
 -include_lib("xmerl/include/xmerl.hrl").
 
diff --git a/lib/xmerl/test/xmerl_test_lib.erl b/lib/xmerl/test/xmerl_test_lib.erl
index 62689353f2..aa8a86138a 100644
--- a/lib/xmerl/test/xmerl_test_lib.erl
+++ b/lib/xmerl/test/xmerl_test_lib.erl
@@ -28,7 +28,7 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("xmerl/include/xmerl.hrl").
 
 %% cmp_element/2
diff --git a/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE.erl b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE.erl
index ee648dc455..7393a878e2 100644
--- a/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE.erl
+++ b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE.erl
@@ -27,7 +27,7 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("xmerl/include/xmerl.hrl").
 -include_lib("xmerl/include/xmerl_xsd.hrl").
 
diff --git a/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE.erl b/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE.erl
index 634e47ba7b..6a645b255e 100644
--- a/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE.erl
+++ b/lib/xmerl/test/xmerl_xsd_NIST2002-01-16_SUITE.erl
@@ -27,7 +27,7 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("xmerl/include/xmerl.hrl").
 -include_lib("xmerl/include/xmerl_xsd.hrl").
 
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE.erl b/lib/xmerl/test/xmerl_xsd_SUITE.erl
index 92c8287782..e1ce8525c7 100644
--- a/lib/xmerl/test/xmerl_xsd_SUITE.erl
+++ b/lib/xmerl/test/xmerl_xsd_SUITE.erl
@@ -25,7 +25,7 @@
 -compile(export_all).
 %%-export([Function/Arity, ...]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 %%-include("xmerl.hrl").
 -include_lib("xmerl/include/xmerl.hrl").
 
diff --git a/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE.erl b/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE.erl
index 5ad6bb94fb..5057e70956 100644
--- a/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE.erl
+++ b/lib/xmerl/test/xmerl_xsd_Sun2002-01-16_SUITE.erl
@@ -27,7 +27,7 @@
 
 -compile(export_all).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include_lib("xmerl/include/xmerl.hrl").
 -include_lib("xmerl/include/xmerl_xsd.hrl").
 
diff --git a/lib/xmerl/test/xmerl_xsd_lib.erl b/lib/xmerl/test/xmerl_xsd_lib.erl
index 892706609f..58fb6a27cc 100644
--- a/lib/xmerl/test/xmerl_xsd_lib.erl
+++ b/lib/xmerl/test/xmerl_xsd_lib.erl
@@ -32,7 +32,7 @@
 
 -compile(export_all).
 
--include("test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -include("xmerl.hrl").
 -include("xmerl_xsd.hrl").
 -include_lib("kernel/include/file.hrl").
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 0d6082e023..09d81e0533 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.9
+XMERL_VSN = 1.3.10
diff --git a/make/ose_lm.mk.in b/make/ose_lm.mk.in
deleted file mode 100644
index de8d351af3..0000000000
--- a/make/ose_lm.mk.in
+++ /dev/null
@@ -1,76 +0,0 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
-# ----------------------------------------------------
-# Template target for generating an OSE5 load module
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2013. 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%
-#
-# Author: Petre Pircalabu
-# ----------------------------------------------------
-
-# ----------------------------------------------------
-# 	build-ose-load-module
-#	Creates an OSE5 load module
-#	params:
-#		$(1) - The output target
-#		$(2) - Objects
-#		$(3) - Libraries
-#		$(4) - LM configuration file
-# ----------------------------------------------------
-
-ifeq ($(findstring ose,$(TARGET)),ose)
-LDR1FLAGS    = @erl_xcomp_ose_ldflags_pass1@
-LDR2FLAGS    = @erl_xcomp_ose_ldflags_pass2@
-OSEROOT	     = @erl_xcomp_ose_OSEROOT@
-LCF	     = @erl_xcomp_ose_LM_LCF@
-BEAM_LMCONF  = @erl_xcomp_ose_BEAM_LM_CONF@
-EPMD_LMCONF  = @erl_xcomp_ose_EPMD_LM_CONF@
-RUN_ERL_LMCONF = @erl_xcomp_ose_RUN_ERL_LM_CONF@
-STRIP	     = @erl_xcomp_ose_STRIP@
-LM_POST_LINK = @erl_xcomp_ose_LM_POST_LINK@
-LM_SET_CONF  = @erl_xcomp_ose_LM_SET_CONF@
-LM_ELF_SIZE  = @erl_xcomp_ose_LM_ELF_SIZE@
-OSE_CONFD    = @erl_xcomp_ose_CONFD@
-CRT0_LM      = @erl_xcomp_ose_CRT0_LM@
-endif
-
-define build-ose-load-module
-	@echo " --- Linking $(1)"
-
-	@echo " --- Linking $(1) (pass 1)"
-	$(ld_verbose)$(PURIFY) $(LD) -o $(1)_unconfigured_ro -r \
-	$(2) --start-group $(3) --end-group --cref --discard-none -M >  $(1)_1.map
-
-	@echo " --- Linking $(1) (pass 2)"
-	$(ld_verbose)$(PURIFY) $(LD) -o $(1)_unconfigured \
-	$(1)_unconfigured_ro -T $(LCF) -n --emit-relocs -e crt0_lm --cref \
-	--discard-none -M >  $(1)_2.map
-
-	@echo " --- Inserting configuration"
-	$(ld_verbose) $(LM_SET_CONF) $(1)_unconfigured < $(4)
-
-	@echo " --- Striping $(1)"
-#	$(ld_verbose) $(STRIP) $(1)_unconfigured
-
-	@echo " --- Postlinking $(1)"
-	$(ld_verbose) $(LM_POST_LINK) $(1)_unconfigured
-
-	@echo " --- Sizing $(1)"
-	$(ld_verbose) $(LM_ELF_SIZE) $(1)_unconfigured
-	mv $(1)_unconfigured $(1)
-endef
diff --git a/make/otp.mk.in b/make/otp.mk.in
index 723f83cb45..c05c499d66 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -90,14 +90,10 @@ OTP_RELEASE = @OTP_RELEASE@
 #	Erlang language section
 # ----------------------------------------------------
 EMULATOR = beam
-ifeq ($(findstring ose_ppc750,$(TARGET)),ose_ppc750)
-ERL_COMPILE_FLAGS += +compressed
+ifdef BOOTSTRAP
+  ERL_COMPILE_FLAGS += +slim
 else
-  ifdef BOOTSTRAP
-    ERL_COMPILE_FLAGS += +slim
-  else
-    ERL_COMPILE_FLAGS += +debug_info
-  endif
+  ERL_COMPILE_FLAGS += +debug_info
 endif
 ERLC_WFLAGS = -W
 ERLC = erlc $(ERLC_WFLAGS) $(ERLC_FLAGS)
diff --git a/otp_build b/otp_build
index ac99ced42a..57dc2e3a9c 100755
--- a/otp_build
+++ b/otp_build
@@ -26,7 +26,7 @@ EXPECTED_AUTOCONF_VERSION=2.59
 #
 # NOTE: lazy_configure depends on '.' always being last directory
 if [ -z "$ONLY_ERTS" ]; then
-    AUTOCONF_SUBDIRS="lib lib/* lib/test_server/src"
+    AUTOCONF_SUBDIRS="lib lib/* lib/common_test/test_server"
 fi
 AUTOCONF_SUBDIRS="$AUTOCONF_SUBDIRS erts ."
 
@@ -264,7 +264,7 @@ create_lib_configure_in()
 distribute_config_helpers ()
 {
     aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
-    autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/test_server/src ./lib/wx/autoconf"
+    autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
 
     aclocal_master="./erts/aclocal.m4"
     install_sh_master="./erts/autoconf/install-sh"
diff --git a/otp_versions.table b/otp_versions.table
index 9680aafae7..f339eab796 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -1,3 +1,7 @@
+OTP-18.3.1 : erts-7.3.1 inets-6.2.1 mnesia-4.13.4 # asn1-4.0.2 common_test-1.12 compiler-6.0.3 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2.1 cosProperty-1.2 cosTime-1.2.1 cosTransactions-1.3.1 crypto-3.6.3 debugger-4.1.2 dialyzer-2.9 diameter-1.11.2 edoc-0.7.18 eldap-1.2.1 erl_docgen-0.4.2 erl_interface-3.8.2 et-1.5.1 eunit-2.2.13 gs-1.6 hipe-3.15 ic-4.4 jinterface-1.6.1 kernel-4.2 megaco-3.18 observer-2.1.2 odbc-2.11.1 orber-3.8.1 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1.1 reltool-0.7 runtime_tools-1.9.3 sasl-2.7 snmp-5.2.2 ssh-4.2.2 ssl-7.3 stdlib-2.8 syntax_tools-1.7 test_server-3.10 tools-2.8.3 typer-0.9.10 webtool-0.9.1 wx-1.6.1 xmerl-1.3.10 :
+OTP-18.3 : asn1-4.0.2 common_test-1.12 compiler-6.0.3 cosNotification-1.2.1 cosTime-1.2.1 cosTransactions-1.3.1 crypto-3.6.3 debugger-4.1.2 dialyzer-2.9 diameter-1.11.2 edoc-0.7.18 eldap-1.2.1 erl_docgen-0.4.2 erl_interface-3.8.2 erts-7.3 eunit-2.2.13 hipe-3.15 inets-6.2 kernel-4.2 mnesia-4.13.3 observer-2.1.2 orber-3.8.1 public_key-1.1.1 runtime_tools-1.9.3 sasl-2.7 snmp-5.2.2 ssh-4.2.2 ssl-7.3 stdlib-2.8 test_server-3.10 tools-2.8.3 webtool-0.9.1 wx-1.6.1 xmerl-1.3.10 # cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosProperty-1.2 et-1.5.1 gs-1.6 ic-4.4 jinterface-1.6.1 megaco-3.18 odbc-2.11.1 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 reltool-0.7 syntax_tools-1.7 typer-0.9.10 :
+OTP-18.2.4 : common_test-1.11.2 # asn1-4.0.1 compiler-6.0.2 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6.2 debugger-4.1.1 dialyzer-2.8.2 diameter-1.11.1 edoc-0.7.17 eldap-1.2 erl_docgen-0.4.1 erl_interface-3.8.1 erts-7.2.1 et-1.5.1 eunit-2.2.12 gs-1.6 hipe-3.14 ic-4.4 inets-6.1.1 jinterface-1.6.1 kernel-4.1.1 megaco-3.18 mnesia-4.13.2 observer-2.1.1 odbc-2.11.1 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1 reltool-0.7 runtime_tools-1.9.2 sasl-2.6.1 snmp-5.2.1 ssh-4.2.1 ssl-7.2 stdlib-2.7 syntax_tools-1.7 test_server-3.9.1 tools-2.8.2 typer-0.9.10 webtool-0.9 wx-1.6 xmerl-1.3.9 :
+OTP-18.2.3 : inets-6.1.1 # asn1-4.0.1 common_test-1.11.1 compiler-6.0.2 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6.2 debugger-4.1.1 dialyzer-2.8.2 diameter-1.11.1 edoc-0.7.17 eldap-1.2 erl_docgen-0.4.1 erl_interface-3.8.1 erts-7.2.1 et-1.5.1 eunit-2.2.12 gs-1.6 hipe-3.14 ic-4.4 jinterface-1.6.1 kernel-4.1.1 megaco-3.18 mnesia-4.13.2 observer-2.1.1 odbc-2.11.1 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1 reltool-0.7 runtime_tools-1.9.2 sasl-2.6.1 snmp-5.2.1 ssh-4.2.1 ssl-7.2 stdlib-2.7 syntax_tools-1.7 test_server-3.9.1 tools-2.8.2 typer-0.9.10 webtool-0.9 wx-1.6 xmerl-1.3.9 :
 OTP-18.2.2 : ssh-4.2.1 # asn1-4.0.1 common_test-1.11.1 compiler-6.0.2 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6.2 debugger-4.1.1 dialyzer-2.8.2 diameter-1.11.1 edoc-0.7.17 eldap-1.2 erl_docgen-0.4.1 erl_interface-3.8.1 erts-7.2.1 et-1.5.1 eunit-2.2.12 gs-1.6 hipe-3.14 ic-4.4 inets-6.1 jinterface-1.6.1 kernel-4.1.1 megaco-3.18 mnesia-4.13.2 observer-2.1.1 odbc-2.11.1 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1 reltool-0.7 runtime_tools-1.9.2 sasl-2.6.1 snmp-5.2.1 ssl-7.2 stdlib-2.7 syntax_tools-1.7 test_server-3.9.1 tools-2.8.2 typer-0.9.10 webtool-0.9 wx-1.6 xmerl-1.3.9 :
 OTP-18.2.1 : erts-7.2.1 # asn1-4.0.1 common_test-1.11.1 compiler-6.0.2 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6.2 debugger-4.1.1 dialyzer-2.8.2 diameter-1.11.1 edoc-0.7.17 eldap-1.2 erl_docgen-0.4.1 erl_interface-3.8.1 et-1.5.1 eunit-2.2.12 gs-1.6 hipe-3.14 ic-4.4 inets-6.1 jinterface-1.6.1 kernel-4.1.1 megaco-3.18 mnesia-4.13.2 observer-2.1.1 odbc-2.11.1 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1 reltool-0.7 runtime_tools-1.9.2 sasl-2.6.1 snmp-5.2.1 ssh-4.2 ssl-7.2 stdlib-2.7 syntax_tools-1.7 test_server-3.9.1 tools-2.8.2 typer-0.9.10 webtool-0.9 wx-1.6 xmerl-1.3.9 :
 OTP-18.2 : asn1-4.0.1 common_test-1.11.1 compiler-6.0.2 crypto-3.6.2 dialyzer-2.8.2 diameter-1.11.1 erl_docgen-0.4.1 erl_interface-3.8.1 erts-7.2 eunit-2.2.12 hipe-3.14 inets-6.1 jinterface-1.6.1 kernel-4.1.1 observer-2.1.1 parsetools-2.1.1 public_key-1.1 runtime_tools-1.9.2 sasl-2.6.1 snmp-5.2.1 ssh-4.2 ssl-7.2 stdlib-2.7 test_server-3.9.1 tools-2.8.2 typer-0.9.10 wx-1.6 xmerl-1.3.9 # cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 debugger-4.1.1 edoc-0.7.17 eldap-1.2 et-1.5.1 gs-1.6 ic-4.4 megaco-3.18 mnesia-4.13.2 odbc-2.11.1 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 percept-0.8.11 reltool-0.7 syntax_tools-1.7 webtool-0.9 :
@@ -11,6 +15,8 @@ OTP-18.0.3 : erts-7.0.3 # asn1-4.0 common_test-1.11 compiler-6.0 cosEvent-2.2 co
 OTP-18.0.2 : erts-7.0.2 runtime_tools-1.9.1 # asn1-4.0 common_test-1.11 compiler-6.0 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6 debugger-4.1 dialyzer-2.8 diameter-1.10 edoc-0.7.17 eldap-1.2 erl_docgen-0.4 erl_interface-3.8 et-1.5.1 eunit-2.2.10 gs-1.6 hipe-3.12 ic-4.4 inets-6.0 jinterface-1.6 kernel-4.0 megaco-3.18 mnesia-4.13 observer-2.1 odbc-2.11 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1 percept-0.8.11 public_key-1.0 reltool-0.7 sasl-2.5 snmp-5.2 ssh-4.0 ssl-7.0 stdlib-2.5 syntax_tools-1.7 test_server-3.9 tools-2.8 typer-0.9.9 webtool-0.9 wx-1.4 xmerl-1.3.8 :
 OTP-18.0.1 : erts-7.0.1 # asn1-4.0 common_test-1.11 compiler-6.0 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6 debugger-4.1 dialyzer-2.8 diameter-1.10 edoc-0.7.17 eldap-1.2 erl_docgen-0.4 erl_interface-3.8 et-1.5.1 eunit-2.2.10 gs-1.6 hipe-3.12 ic-4.4 inets-6.0 jinterface-1.6 kernel-4.0 megaco-3.18 mnesia-4.13 observer-2.1 odbc-2.11 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1 percept-0.8.11 public_key-1.0 reltool-0.7 runtime_tools-1.9 sasl-2.5 snmp-5.2 ssh-4.0 ssl-7.0 stdlib-2.5 syntax_tools-1.7 test_server-3.9 tools-2.8 typer-0.9.9 webtool-0.9 wx-1.4 xmerl-1.3.8 :
 OTP-18.0 : asn1-4.0 common_test-1.11 compiler-6.0 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6 debugger-4.1 dialyzer-2.8 diameter-1.10 edoc-0.7.17 eldap-1.2 erl_docgen-0.4 erl_interface-3.8 erts-7.0 et-1.5.1 eunit-2.2.10 gs-1.6 hipe-3.12 ic-4.4 inets-6.0 jinterface-1.6 kernel-4.0 megaco-3.18 mnesia-4.13 observer-2.1 odbc-2.11 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1 percept-0.8.11 public_key-1.0 reltool-0.7 runtime_tools-1.9 sasl-2.5 snmp-5.2 ssh-4.0 ssl-7.0 stdlib-2.5 syntax_tools-1.7 test_server-3.9 tools-2.8 typer-0.9.9 webtool-0.9 wx-1.4 xmerl-1.3.8 # :
+OTP-17.5.6.9 : diameter-1.9.2.4 erts-6.4.1.6 ssl-6.0.1.2 # asn1-3.0.4 common_test-1.10.1 compiler-5.0.4 cosEvent-2.1.15 cosEventDomain-1.1.14 cosFileTransfer-1.1.16 cosNotification-1.1.21 cosProperty-1.1.17 cosTime-1.1.14 cosTransactions-1.2.14 crypto-3.5 debugger-4.0.3.1 dialyzer-2.7.4 edoc-0.7.16 eldap-1.1.1 erl_docgen-0.3.7 erl_interface-3.7.20 et-1.5 eunit-2.2.9 gs-1.5.16 hipe-3.11.3 ic-4.3.6 inets-5.10.9 jinterface-1.5.12 kernel-3.2.0.1 megaco-3.17.3 mnesia-4.12.5 observer-2.0.4 odbc-2.10.22 orber-3.7.1 os_mon-2.3.1 ose-1.0.2 otp_mibs-1.0.10 parsetools-2.0.12 percept-0.8.10 public_key-0.23 reltool-0.6.6 runtime_tools-1.8.16.1 sasl-2.4.1 snmp-5.1.2 ssh-3.2.4 stdlib-2.4 syntax_tools-1.6.18 test_server-3.8.1 tools-2.7.2 typer-0.9.8 webtool-0.8.10 wx-1.3.3 xmerl-1.3.7 :
+OTP-17.5.6.8 : diameter-1.9.2.3 # asn1-3.0.4 common_test-1.10.1 compiler-5.0.4 cosEvent-2.1.15 cosEventDomain-1.1.14 cosFileTransfer-1.1.16 cosNotification-1.1.21 cosProperty-1.1.17 cosTime-1.1.14 cosTransactions-1.2.14 crypto-3.5 debugger-4.0.3.1 dialyzer-2.7.4 edoc-0.7.16 eldap-1.1.1 erl_docgen-0.3.7 erl_interface-3.7.20 erts-6.4.1.5 et-1.5 eunit-2.2.9 gs-1.5.16 hipe-3.11.3 ic-4.3.6 inets-5.10.9 jinterface-1.5.12 kernel-3.2.0.1 megaco-3.17.3 mnesia-4.12.5 observer-2.0.4 odbc-2.10.22 orber-3.7.1 os_mon-2.3.1 ose-1.0.2 otp_mibs-1.0.10 parsetools-2.0.12 percept-0.8.10 public_key-0.23 reltool-0.6.6 runtime_tools-1.8.16.1 sasl-2.4.1 snmp-5.1.2 ssh-3.2.4 ssl-6.0.1.1 stdlib-2.4 syntax_tools-1.6.18 test_server-3.8.1 tools-2.7.2 typer-0.9.8 webtool-0.8.10 wx-1.3.3 xmerl-1.3.7 :
 OTP-17.5.6.7 : diameter-1.9.2.2 # asn1-3.0.4 common_test-1.10.1 compiler-5.0.4 cosEvent-2.1.15 cosEventDomain-1.1.14 cosFileTransfer-1.1.16 cosNotification-1.1.21 cosProperty-1.1.17 cosTime-1.1.14 cosTransactions-1.2.14 crypto-3.5 debugger-4.0.3.1 dialyzer-2.7.4 edoc-0.7.16 eldap-1.1.1 erl_docgen-0.3.7 erl_interface-3.7.20 erts-6.4.1.5 et-1.5 eunit-2.2.9 gs-1.5.16 hipe-3.11.3 ic-4.3.6 inets-5.10.9 jinterface-1.5.12 kernel-3.2.0.1 megaco-3.17.3 mnesia-4.12.5 observer-2.0.4 odbc-2.10.22 orber-3.7.1 os_mon-2.3.1 ose-1.0.2 otp_mibs-1.0.10 parsetools-2.0.12 percept-0.8.10 public_key-0.23 reltool-0.6.6 runtime_tools-1.8.16.1 sasl-2.4.1 snmp-5.1.2 ssh-3.2.4 ssl-6.0.1.1 stdlib-2.4 syntax_tools-1.6.18 test_server-3.8.1 tools-2.7.2 typer-0.9.8 webtool-0.8.10 wx-1.3.3 xmerl-1.3.7 :
 OTP-17.5.6.6 : erts-6.4.1.5 # asn1-3.0.4 common_test-1.10.1 compiler-5.0.4 cosEvent-2.1.15 cosEventDomain-1.1.14 cosFileTransfer-1.1.16 cosNotification-1.1.21 cosProperty-1.1.17 cosTime-1.1.14 cosTransactions-1.2.14 crypto-3.5 debugger-4.0.3.1 dialyzer-2.7.4 diameter-1.9.2.1 edoc-0.7.16 eldap-1.1.1 erl_docgen-0.3.7 erl_interface-3.7.20 et-1.5 eunit-2.2.9 gs-1.5.16 hipe-3.11.3 ic-4.3.6 inets-5.10.9 jinterface-1.5.12 kernel-3.2.0.1 megaco-3.17.3 mnesia-4.12.5 observer-2.0.4 odbc-2.10.22 orber-3.7.1 os_mon-2.3.1 ose-1.0.2 otp_mibs-1.0.10 parsetools-2.0.12 percept-0.8.10 public_key-0.23 reltool-0.6.6 runtime_tools-1.8.16.1 sasl-2.4.1 snmp-5.1.2 ssh-3.2.4 ssl-6.0.1.1 stdlib-2.4 syntax_tools-1.6.18 test_server-3.8.1 tools-2.7.2 typer-0.9.8 webtool-0.8.10 wx-1.3.3 xmerl-1.3.7 :
 OTP-17.5.6.5 : erts-6.4.1.4 kernel-3.2.0.1 ssl-6.0.1.1 # asn1-3.0.4 common_test-1.10.1 compiler-5.0.4 cosEvent-2.1.15 cosEventDomain-1.1.14 cosFileTransfer-1.1.16 cosNotification-1.1.21 cosProperty-1.1.17 cosTime-1.1.14 cosTransactions-1.2.14 crypto-3.5 debugger-4.0.3.1 dialyzer-2.7.4 diameter-1.9.2.1 edoc-0.7.16 eldap-1.1.1 erl_docgen-0.3.7 erl_interface-3.7.20 et-1.5 eunit-2.2.9 gs-1.5.16 hipe-3.11.3 ic-4.3.6 inets-5.10.9 jinterface-1.5.12 megaco-3.17.3 mnesia-4.12.5 observer-2.0.4 odbc-2.10.22 orber-3.7.1 os_mon-2.3.1 ose-1.0.2 otp_mibs-1.0.10 parsetools-2.0.12 percept-0.8.10 public_key-0.23 reltool-0.6.6 runtime_tools-1.8.16.1 sasl-2.4.1 snmp-5.1.2 ssh-3.2.4 stdlib-2.4 syntax_tools-1.6.18 test_server-3.8.1 tools-2.7.2 typer-0.9.8 webtool-0.8.10 wx-1.3.3 xmerl-1.3.7 :
diff --git a/system/doc/design_principles/spec_proc.xml b/system/doc/design_principles/spec_proc.xml
index 3d7a88da3f..5b156ac263 100644
--- a/system/doc/design_principles/spec_proc.xml
+++ b/system/doc/design_principles/spec_proc.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2014</year>
+      <year>1997</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -522,9 +522,36 @@ init(Parent, Name, Module) ->
 -module(db).
 -behaviour(simple_server).
 
--export([init/0, handle_req/2, terminate/0]).
+-export([init/1, handle_req/2, terminate/0]).
 
 ...</code>
+
+    <p>The contracts specified with <c>-callback</c> attributes in
+    behaviour modules can be further refined by adding <c>-spec</c>
+    attributes in callback modules. This can be useful as
+    <c>-callback</c> contracts are usually generic. The same callback
+    module with contracts for the callbacks:</p>
+    
+    <code type="none">
+-module(db).
+-behaviour(simple_server).
+
+-export([init/1, handle_req/2, terminate/0]).
+
+-record(state, {field1 :: [atom()], field2 :: integer()}).
+
+-type state()   :: #state{}.
+-type request() :: {'store', term(), term()};
+                   {'lookup', term()}.
+
+...
+
+-spec handle_req(request(), state()) -> {'ok', term()}.
+
+...</code>
+
+    <p>Each <c>-spec</c> contract is to be a subtype of the respective
+    <c>-callback</c> contract.</p>
+    
   </section>
 </chapter>
-
diff --git a/system/doc/design_principles/sup_princ.xml b/system/doc/design_principles/sup_princ.xml
index 5e2f6ba9cb..08c4b7c59e 100644
--- a/system/doc/design_principles/sup_princ.xml
+++ b/system/doc/design_principles/sup_princ.xml
@@ -229,7 +229,7 @@ child_spec() = #{id => child_id(),       % mandatory
           is <c>rest_for_one</c> or <c>one_for_all</c> and a sibling
           death causes the temporary process to be terminated).</item>
           <item>A <c>transient</c> child process is restarted only if it
-	  terminates abnormally, that is, with another exit reason than
+	  terminates abnormally, that is, with an exit reason other than
           <c>normal</c>, <c>shutdown</c>, or <c>{shutdown,Term}</c>.</item>
         </list>
 	<p>The <c>restart</c> key is optional. If it is not given, the
diff --git a/system/doc/programming_examples/funs.xmlsrc b/system/doc/programming_examples/funs.xmlsrc
index 8469f0871c..1e1002ccf9 100644
--- a/system/doc/programming_examples/funs.xmlsrc
+++ b/system/doc/programming_examples/funs.xmlsrc
@@ -212,7 +212,7 @@ f(...) ->
              ...
         end, ...)
     ...</code>
-    <p>instead of writng the following code:</p>
+    <p>instead of writing the following code:</p>
     <code type="none">
 f(...) ->
     Y = ...
diff --git a/system/doc/reference_manual/expressions.xml b/system/doc/reference_manual/expressions.xml
index 893398b71b..75486488e9 100644
--- a/system/doc/reference_manual/expressions.xml
+++ b/system/doc/reference_manual/expressions.xml
@@ -245,13 +245,13 @@ lists:keysearch(Name, 1, List)</code>
 handle(Msg, State)
 spawn(m, init, [])</code>
     <p><em>Examples</em> where <c>ExprF</c> is a fun:</p>
-    <code type="none">
-Fun1 = fun(X) -> X+1 end
-Fun1(3)
-=> 4
-
-fun lists:append/2([1,2], [3,4])
-=> [1,2,3,4]</code>
+    <pre>
+1> <input>Fun1 = fun(X) -> X+1 end,</input>
+<input>Fun1(3).</input>
+4
+2> <input>fun lists:append/2([1,2], [3,4]).</input>
+[1,2,3,4]
+3> </pre>
 
     <p>Notice that when calling a local function, there is a difference
     between using the implicitly or fully qualified function name.
@@ -1004,7 +1004,7 @@ M4 = M3#{a := 2, b := 3}.  % 'a' and 'b' was added in `M1` and `M2`.</code>
 	  </p>
 	  <list>
 		  <item><p>A <c>badmatch</c> exception.</p>
-		        <p>This is if it is used in the context of the matching operator
+		        <p>This is if it is used in the context of the match operator
 			  as in the example.</p>
 		  </item>
 		  <item><p>Or resulting in the next clause being tested in function heads and
@@ -1085,7 +1085,7 @@ Ei = Value |
     <p>Used in a bit string construction, <c>Value</c> is an expression
     that is to evaluate to an integer, float, or bit string.  If the
     expression is not a single literal or variable, it
-    is to be enclosed in parenthesis.</p>
+    is to be enclosed in parentheses.</p>
 
     <p>Used in a bit string matching, <c>Value</c> must be a variable,
     or an integer, float, or string.</p>
@@ -1319,7 +1319,7 @@ catch Expr</code>
 {'EXIT',{badarith,[...]}}</pre>
     <p>Notice that <c>catch</c> has low precedence and catch
       subexpressions often needs to be enclosed in a block
-      expression or in parenthesis:</p>
+      expression or in parentheses:</p>
     <pre>
 3> <input>A = catch 1+2.</input>
 ** 1: syntax error before: 'catch' **
@@ -1556,9 +1556,11 @@ end</pre>
     <p>Bit string comprehensions are written with
     the following syntax:</p>
     <pre>
-&lt;&lt; BitString || Qualifier1,...,QualifierN &gt;&gt;</pre>
-    <p>Here, <c>BitString</c> is a bit string expression and each
-      <c>Qualifier</c> is either a generator, a bit string generator or a filter.</p>
+&lt;&lt; BitStringExpr || Qualifier1,...,QualifierN &gt;&gt;</pre>
+    <p><c>BitStringExpr</c> is an expression that evalutes to a bit
+    string. If <c>BitStringExpr</c> is a function call, it must be
+    enclosed in parentheses.  Each <c>Qualifier</c> is either a
+    generator, a bit string generator or a filter.</p>
     <list type="bulleted">
  <item>A <em>generator</em> is written as:      <br></br>
       &nbsp;&nbsp;<c><![CDATA[Pattern <- ListExpr]]></c>.      <br></br>
diff --git a/system/doc/reference_manual/macros.xml b/system/doc/reference_manual/macros.xml
index 3b1f72e5d6..42ea639b54 100644
--- a/system/doc/reference_manual/macros.xml
+++ b/system/doc/reference_manual/macros.xml
@@ -146,6 +146,10 @@ bar(X) ->
       <item>The current line number.</item>
       <tag><c>?MACHINE</c>.</tag>
       <item>The machine name, <c>'BEAM'</c>.</item>
+      <tag><c>?FUNCTION_NAME</c></tag>
+      <item>The name of the current function.</item>
+      <tag><c>?FUNCTION_ARITY</c></tag>
+      <item>The arity (number of arguments) for the current function.</item>
     </taglist>
   </section>
 
diff --git a/system/doc/reference_manual/typespec.xml b/system/doc/reference_manual/typespec.xml
index 22627058c1..c5d24a96b5 100644
--- a/system/doc/reference_manual/typespec.xml
+++ b/system/doc/reference_manual/typespec.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2015</year>
+      <year>2003</year><year>2016</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -69,7 +69,7 @@
     <p>
       For integers and atoms, it is allowed for singleton types; for example,
       the integers
-      <c>-1</c> and <c>42</c>, or the atoms <c>'foo'</c> and <c>'bar'</c>).
+      <c>-1</c> and <c>42</c>, or the atoms <c>'foo'</c> and <c>'bar'</c>.
 
       All other types are built using unions of either predefined
       types or singleton types. In a type union between a type and one
@@ -148,9 +148,9 @@
   Union :: Type1 | Type2
 ]]></pre>
   <p>
-    The general form of bitstrings is <c>&lt;&lt;_:M, _:_*N&gt;&gt;</c>,
+    The general form of bit strings is <c>&lt;&lt;_:M, _:_*N&gt;&gt;</c>,
     where <c>M</c> and <c>N</c> are positive integers. It denotes a
-    bitstring that is <c>M + (k*N)</c> bits long (that is, a bitstring that
+    bit string that is <c>M + (k*N)</c> bits long (that is, a bit string that
     starts with <c>M</c> bits and continues with <c>k</c> segments of
     <c>N</c> bits each, where <c>k</c> is also a positive integer).
     The notations <c>&lt;&lt;_:_*N&gt;&gt;</c>, <c>&lt;&lt;_:M&gt;&gt;</c>,
@@ -495,7 +495,8 @@
     </p>
     <pre>  -spec id(X) -> X when X :: tuple().</pre>
     <p>
-      Currently, the <c>::</c> constraint (read as <c>is_subtype</c>) is
+      Currently, the <c>::</c> constraint
+      (read as &laquo;is a subtype of&raquo;) is
       the only guard constraint that can be used in the <c>'when'</c>
       part of a <c>'-spec'</c> attribute.
     </p>
@@ -513,7 +514,7 @@
 	<em>the same</em> tuple.
       </p>
       <p>
-	However, it is up to the tools that process the specificationss
+	However, it is up to the tools that process the specifications
         to choose whether to take this extra information into account
         or not.
       </p>
@@ -529,16 +530,6 @@
     <pre>
   -spec foo({X, integer()}) -> X when X :: atom()
          ; ([Y]) -> Y when Y :: number().</pre>
-    <note>
-      <p>
-      For backwards compatibility the following form is also allowed:
-      </p>
-      <pre>  -spec id(X) -> X when is_subtype(X, tuple()).</pre>
-      <p>
-	but its use is discouraged. It will be removed in a future
-	Erlang/OTP release.
-      </p>
-    </note>
     <p>
       Some functions in Erlang are not meant to return; 
       either because they define servers or because they are used to 
diff --git a/system/doc/top/templates/index.html.src b/system/doc/top/templates/index.html.src
index bdac3895b0..ef2e2916a4 100644
--- a/system/doc/top/templates/index.html.src
+++ b/system/doc/top/templates/index.html.src
@@ -145,10 +145,10 @@ verification, comment support including paragraph filling, skeletons,
 tags support and more. See the <a href="#tools#/index.html">
 Tools</a> application for details.  
 <p>
-There is also an 
-<a href="http://erlide.org/index.html">
-Erlang plugin (ErlIDE) for Eclipse</a> if you prefer a more graphical 
-environment. ErlIDE is under active development with new features in almost every release.
+There are also Erlang plugins for
+<a href="http://erlide.org/index.html">Eclipse (ErlIDE)</a> and
+<a href="http://ignatov.github.io/intellij-erlang/">IntelliJ IDEA</a>
+if you prefer a more graphical environment, which are both under active development.
 <li>When developing with Erlang/OTP you usually test your programs
 from the interactive shell (see <a href="getting_started/users_guide.html">
 Getting Started With Erlang</a>) where you can call individual
diff --git a/xcomp/erl-xcomp-powerpc-ose5.conf b/xcomp/erl-xcomp-powerpc-ose5.conf
deleted file mode 100644
index 88b2135593..0000000000
--- a/xcomp/erl-xcomp-powerpc-ose5.conf
+++ /dev/null
@@ -1,358 +0,0 @@
-## -*-shell-script-*-
-##
-## %CopyrightBegin%
-##
-## Copyright Ericsson AB 2009-2012. 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%
-##
-## File: erl-xcomp-sfk-linux-ose5.conf
-## Author: Petre Pircalabu
-##
-## -----------------------------------------------------------------------------
-## When cross compiling Erlang/OTP using `otp_build', copy this file and set
-## the variables needed below. Then pass the path to the copy of this file as
-## an argument to `otp_build' in the configure stage:
-##   `otp_build configure --xcomp-conf=<FILE>'
-## -----------------------------------------------------------------------------
-
-## Note that you cannot define arbitrary variables in a cross compilation
-## configuration file. Only the ones listed below will be guaranteed to be
-## visible throughout the whole execution of all `configure' scripts. Other
-## variables needs to be defined as arguments to `configure' or exported in
-## the environment.
-
-## -- Variables needed for an OSE5 build ---------------------------------------
-OSEROOT="/vobs/ose5/system"
-HOST="linux"
-
-GCCVERSION="4.4.3"
-GCCROOT="${OSEROOT}/gcc_linux_powerpc_${GCCVERSION}"
-
-OSEDEBUG="no"
-OSESSL="no"
-
-case ${GCCVERSION} in
-4.4.3)
-   GCCTARGET="powerpc-eabi"
-   ;;
-4.6.3)
-   GCCTARGET="powerpc-ose-eabi"
-   ;;
-*)
-   echo "Error: Unknown GCCVERSION: ${GCCVERSION}"
-   exit 1
-esac
-
-if [ ${OSEDEBUG} != "yes" ];
-then
-OPT_LEVEL="-O2"
-else
-OPT_LEVEL=""
-fi
-
-if [ ${OSESSL} = "yes" ];
-then
-## If your crypto is not in OSEROOT then you have to use --with-ssl to
-## point to the correct place. Also CRYPTO_LIB_PATH has to be modified to
-## point there as well.
-CRYPTO_CONFIG_OPTION="--disable-dynamic-ssl-lib"
-CRYPTO_NIF_PATH=",$ERL_TOP/lib/crypto/priv/lib/powerpc-unknown-ose/crypto.a"
-CRYPTO_LIB_PATH="${OSEROOT}/lib/powerpc/libsslcrypto.a"
-else
-CRYPTO_CONFIG_OPTION="--without-ssl"
-CRYPTO_NIF_PATH=""
-CRYPTO_LIB_PATH=""
-fi
-
-
-## -- Variables for `otp_build' Only -------------------------------------------
-
-## Variables in this section are only used, when configuring Erlang/OTP for
-## cross compilation using `$ERL_TOP/otp_build configure'.
-
-## *NOTE*! These variables currently have *no* effect if you configure using
-## the `configure' script directly.
-
-# * `erl_xcomp_build' - The build system used. This value will be passed as
-#   `--build=$erl_xcomp_build' argument to the `configure' script. It does
-#   not have to be a full `CPU-VENDOR-OS' triplet, but can be. The full
-#   `CPU-VENDOR-OS' triplet will be created by
-#   `$ERL_TOP/erts/autoconf/config.sub $erl_xcomp_build'. If set to `guess',
-#   the build system will be guessed using
-#   `$ERL_TOP/erts/autoconf/config.guess'.
-erl_xcomp_build=guess
-
-# * `erl_xcomp_host' - Cross host/target system to build for. This value will
-#   be passed as `--host=$erl_xcomp_host' argument to the `configure' script.
-#   It does not have to be a full `CPU-VENDOR-OS' triplet, but can be. The
-#   full `CPU-VENDOR-OS' triplet will be created by
-#   `$ERL_TOP/erts/autoconf/config.sub $erl_xcomp_host'.
-erl_xcomp_host="powerpc-ose"
-
-disabled_apps="--without-erl_interface --without-os_mon --without-megaco --without-observer --without-wx --without-appmon --without-cosEvent --without-cosEventDomain --without-cosFileTransfer --without-cosNotification --without-cosProperty --without-cosTime --without-cosTransactions --without-debugger --without-dialyzer --without-edoc --without-erl_docgen --without-eunit --without-gs --without-hipe --without-ic --without-orber --without-pman --without-toolbar --without-tv --without-webtool --without-typer"
-
-# * `erl_xcomp_configure_flags' - Extra configure flags to pass to the
-#   `configure' script.
-erl_xcomp_configure_flags="${CRYPTO_CONFIG_OPTION} --disable-kernel-poll --disable-hipe --without-termcap --without-javac ${disabled_apps} --enable-static-nifs=$ERL_TOP/lib/asn1/priv/lib/powerpc-unknown-ose/asn1rt_nif.a${CRYPTO_NIF_PATH}"
-
-## -- Cross Compiler and Other Tools -------------------------------------------
-
-## If the cross compilation tools are prefixed by `<HOST>-' you probably do
-## not need to set these variables (where `<HOST>' is what has been passed as
-## `--host=<HOST>' argument to `configure').
-
-## All variables in this section can also be used when native compiling.
-
-# * `CC' - C compiler.
-CC="$GCCROOT/bin/$GCCTARGET-gcc"
-
-# * `CFLAGS' - C compiler flags.
-CFLAGS="-msoft-float -g -fno-strict-aliasing -fno-builtin -fshort-wchar -Wall -Wno-unknown-pragmas -mpowerpc -nostdlib -I$GCCROOT/include/c++/$GCCVERSION -I$OSEROOT/include -I$OSEROOT/include/ose_spi -I$OSEROOT/include/gcc -MD -MP -D__OSE__ -DBIG_ENDIAN  -DCF_CONF_SIZE=0x800 ${OPT_LEVEL}"
-
-
-# * `STATIC_CFLAGS' - Static C compiler flags.
-#STATIC_CFLAGS=
-
-# * `CFLAG_RUNTIME_LIBRARY_PATH' - This flag should set runtime library
-#   search path for the shared libraries. Note that this actually is a
-#   linker flag, but it needs to be passed via the compiler.
-#CFLAG_RUNTIME_LIBRARY_PATH=
-
-# * `CPP' - C pre-processor.
-CPP="$GCCROOT/bin/$GCCTARGET-cpp"
-
-# * `CPPFLAGS' - C pre-processor flags.
-CPPFLAGS="-msoft-float -g -fno-strict-aliasing -fno-builtin -fshort-wchar -Wall -Wno-unknown-pragmas -mpowerpc -nostdlib -I$GCCROOT/include/c++/$GCCVERSION -I$OSEROOT/include -I$OSEROOT/include/ose_spi -I$OSEROOT/include/gcc -MD -MP -D__OSE__ -DBIG_ENDIAN -DCF_CONF_SIZE=0x800 ${OPT_LEVEL}"
-
-
-# * `CXX' - C++ compiler.
-CXX="$GCCROOT/bin/$GCCTARGET-g++"
-
-# * `CXXFLAGS' - C++ compiler flags.
-CXXFLAGS="-msoft-float -g -fno-strict-aliasing -ansi -I$GCCROOT/include/c++/$GCCVERSION -I$OSEROOT/include -I$OSEROOT/include/gcc ${OPT_LEVEL}"
-
-# * `LD' - Linker.
-LD="${GCCROOT}/bin/${GCCTARGET}-ld"
-
-# * `LDFLAGS' - Linker flags.
-LDFLAGS="-Wl,-ecrt0_lm -Wl,-T,${ERL_TOP}/erts/emulator/sys/ose/gcc_${GCCVERSION}_lm_ppc.lcf"
-
-# * `LIBS' - Libraries.
-LIBS="${OSEROOT}/lib/powerpc/libcrt.a ${OSEROOT}/lib/powerpc/libm.a ${GCCROOT}/lib/gcc/${GCCTARGET}/${GCCVERSION}/nof/libgcc.a ${CRYPTO_LIB_PATH}"
-
-## -- *D*ynamic *E*rlang *D*river Linking --
-
-## *NOTE*! Either set all or none of the `DED_LD*' variables.
-
-# * `DED_LD' - Linker for Dynamically loaded Erlang Drivers.
-DED_LD=
-
-# * `DED_LDFLAGS' - Linker flags to use with `DED_LD'.
-DED_LDFLAGS=
-
-# * `DED_LD_FLAG_RUNTIME_LIBRARY_PATH' - This flag should set runtime library
-#   search path for shared libraries when linking with `DED_LD'.
-DED_LD_FLAG_RUNTIME_LIBRARY_PATH=
-
-## -- Large File Support --
-
-## *NOTE*! Either set all or none of the `LFS_*' variables.
-
-# * `LFS_CFLAGS' - Large file support C compiler flags.
-#LFS_CFLAGS=
-
-# * `LFS_LDFLAGS' - Large file support linker flags.
-#LFS_LDFLAGS=
-
-# * `LFS_LIBS' - Large file support libraries.
-#LFS_LIBS=
-
-## -- Other Tools --
-
-# * `RANLIB' - `ranlib' archive index tool.
-RANLIB="$GCCROOT/bin/$GCCTARGET-ranlib"
-
-# * `AR' - `ar' archiving tool.
-AR="$GCCROOT/bin/$GCCTARGET-ar"
-
-# * `STRIP' - `strip
-STRIP="$GCCROOT/bin/$GCCTARGET-strip"
-
-# * `GETCONF' - `getconf' system configuration inspection tool. `getconf' is
-#   currently used for finding out large file support flags to use, and
-#   on Linux systems for finding out if we have an NPTL thread library or
-#   not.
-#GETCONF=
-
-## -- Cross System Root Locations ----------------------------------------------
-
-# * `erl_xcomp_sysroot' - The absolute path to the system root of the cross
-#   compilation environment. Currently, the `crypto', `odbc', `ssh' and
-#   `ssl' applications need the system root. These applications will be
-#   skipped if the system root has not been set. The system root might be
-#   needed for other things too. If this is the case and the system root
-#   has not been set, `configure' will fail and request you to set it.
-erl_xcomp_sysroot="$OSEROOT"
-
-# * `erl_xcomp_isysroot' - The absolute path to the system root for includes
-#   of the cross compilation environment. If not set, this value defaults
-#   to `$erl_xcomp_sysroot', i.e., only set this value if the include system
-#   root path is not the same as the system root path.
-#erl_xcomp_isysroot="$OSEROOT"
-
-## -- Optional Feature, and Bug Tests ------------------------------------------
-
-## These tests cannot (always) be done automatically when cross compiling. You
-## usually do not need to set these variables. Only set these if you really
-## know what you are doing.
-
-## Note that some of these values will override results of tests performed
-## by `configure', and some will not be used until `configure' is sure that
-## it cannot figure the result out.
-
-## The `configure' script will issue a warning when a default value is used.
-## When a variable has been set, no warning will be issued.
-
-# * `erl_xcomp_after_morecore_hook' - `yes|no'. Defaults to `no'. If `yes',
-#   the target system must have a working `__after_morecore_hook' that can be
-#   used for tracking used `malloc()' implementations core memory usage.
-#   This is currently only used by unsupported features.
-#erl_xcomp_after_morecore_hook=
-
-# * `erl_xcomp_bigendian' - `yes|no'. No default. If `yes', the target system
-#   must be big endian. If `no', little endian. This can often be
-#   automatically detected, but not always. If not automatically detected,
-#   `configure' will fail unless this variable is set. Since no default
-#   value is used, `configure' will try to figure this out automatically.
-#erl_xcomp_bigendian=
-
-# * `erl_xcomp_double_middle` - `yes|no`. No default. If `yes`, the
-#   target system must have doubles in "middle-endian" format. If
-#   `no`, it has "regular" endianness. This can often be automatically
-#   detected, but not always. If not automatically detected,
-#   `configure` will fail unless this variable is set. Since no
-#   default value is used, `configure` will try to figure this out
-#   automatically.
-#erl_xcomp_double_middle_endian
-
-# * `erl_xcomp_clock_gettime_cpu_time' - `yes|no'. Defaults to `no'. If `yes',
-#   the target system must have a working `clock_gettime()' implementation
-#   that can be used for retrieving process CPU time.
-#erl_xcomp_clock_gettime_cpu_time=
-
-# * `erl_xcomp_getaddrinfo' - `yes|no'. Defaults to `no'. If `yes', the target
-#   system must have a working `getaddrinfo()' implementation that can
-#   handle both IPv4 and IPv6.
-#erl_xcomp_getaddrinfo=
-
-# * `erl_xcomp_gethrvtime_procfs_ioctl' - `yes|no'. Defaults to `no'. If `yes',
-#   the target system must have a working `gethrvtime()' implementation and
-#   is used with procfs `ioctl()'.
-#erl_xcomp_gethrvtime_procfs_ioctl=
-
-# * `erl_xcomp_dlsym_brk_wrappers' - `yes|no'. Defaults to `no'. If `yes', the
-#   target system must have a working `dlsym(RTLD_NEXT, <S>)' implementation
-#   that can be used on `brk' and `sbrk' symbols used by the `malloc()'
-#   implementation in use, and by this track the `malloc()' implementations
-#   core memory usage. This is currently only used by unsupported features.
-#erl_xcomp_dlsym_brk_wrappers=
-
-# * `erl_xcomp_kqueue' - `yes|no'. Defaults to `no'. If `yes', the target
-#   system must have a working `kqueue()' implementation that returns a file
-#   descriptor which can be used by `poll()' and/or `select()'. If `no' and
-#   the target system has not got `epoll()' or `/dev/poll', the kernel-poll
-#   feature will be disabled.
-#erl_xcomp_kqueue=
-
-# * `erl_xcomp_linux_clock_gettime_correction' - `yes|no'. Defaults to `yes' on
-#   Linux; otherwise, `no'. If `yes', `clock_gettime(CLOCK_MONOTONIC, _)' on
-#   the target system must work. This variable is recommended to be set to
-#   `no' on Linux systems with kernel versions less than 2.6.
-#erl_xcomp_linux_clock_gettime_correction=
-
-# * `erl_xcomp_linux_nptl' - `yes|no'. Defaults to `yes' on Linux; otherwise,
-#   `no'. If `yes', the target system must have NPTL (Native POSIX Thread
-#   Library). Older Linux systems have LinuxThreads instead of NPTL (Linux
-#   kernel versions typically less than 2.6).
-#erl_xcomp_linux_nptl=
-
-# * `erl_xcomp_linux_usable_sigaltstack' - `yes|no'. Defaults to `yes' on Linux;
-#   otherwise, `no'. If `yes', `sigaltstack()' must be usable on the target
-#   system. `sigaltstack()' on Linux kernel versions less than 2.4 are
-#   broken.
-#erl_xcomp_linux_usable_sigaltstack=
-
-# * `erl_xcomp_linux_usable_sigusrx' - `yes|no'. Defaults to `yes'. If `yes',
-#   the `SIGUSR1' and `SIGUSR2' signals must be usable by the ERTS. Old
-#   LinuxThreads thread libraries (Linux kernel versions typically less than
-#   2.2) used these signals and made them unusable by the ERTS.
-#erl_xcomp_linux_usable_sigusrx=
-
-# * `erl_xcomp_poll' - `yes|no'. Defaults to `no' on Darwin/MacOSX; otherwise,
-#   `yes'. If `yes', the target system must have a working `poll()'
-#   implementation that also can handle devices. If `no', `select()' will be
-#   used instead of `poll()'.
-erl_xcomp_poll=no
-
-# * `erl_xcomp_putenv_copy' - `yes|no'. Defaults to `no'. If `yes', the target
-#   system must have a `putenv()' implementation that stores a copy of the
-#   key/value pair.
-#erl_xcomp_putenv_copy=
-
-# * `erl_xcomp_reliable_fpe' - `yes|no'. Defaults to `no'. If `yes', the target
-#   system must have reliable floating point exceptions.
-#erl_xcomp_reliable_fpe=
-# * `erl_xcomp_ose_ldflags_pass1` - Linker flags for the OSE module (pass 1)
-erl_xcomp_ose_ldflags_pass1="-r --no-omagic"
-
-# * `erl_xcomp_ose_ldflags_pass2` - Linker flags for the OSE module (pass 2)
-erl_xcomp_ose_ldflags_pass2="-n --emit-relocs -ecrt0_lm --no-omagic"
-
-# * `erl_xcomp_ose_OSEROOT` - OSE installation root directory
-erl_xcomp_ose_OSEROOT="${OSEROOT}"
-
-# * `erl_xcomp_ose_STRIP` - Strip utility shipped with the OSE distribution
-erl_xcomp_ose_STRIP="${GCCROOT}/bin/${GCCTARGET}-strip"
-
-# * `erl_xcomp_ose_LM_POST_LINK` - OSE postlink tool
-erl_xcomp_ose_LM_POST_LINK="${OSEROOT}/bin/${HOST}/lm_post_link"
-
-# * `erl_xcomp_ose_LM_SET_CONF` - Sets the configuration for an OSE load module
-erl_xcomp_ose_LM_SET_CONF="${OSEROOT}/bin/${HOST}/lm_set_conf"
-
-# * `erl_xcomp_ose_LM_ELF_SIZE` - OSE load module elf size tool
-erl_xcomp_ose_LM_ELF_SIZE="${OSEROOT}/bin/${HOST}/lm_elf_size"
-
-# * `erl_xcomp_ose_LM_LCF` - OSE load module linker configuration file
-erl_xcomp_ose_LM_LCF="${ERL_TOP}/erts/emulator/sys/ose/gcc_${GCCVERSION}_lm_ppc.lcf"
-
-# * `erl_xcomp_ose_BEAM_LM_CONF` - beam OSE load module configuration file
-erl_xcomp_ose_BEAM_LM_CONF="${ERL_TOP}/erts/emulator/sys/ose/beam.lmconf"
-
-# * `erl_xcomp_ose_RUN_ERL_LM_CONF` - run_erl_lm OSE load module configuration file
-erl_xcomp_ose_RUN_ERL_LM_CONF="${ERL_TOP}/erts/etc/ose/etc.lmconf"
-
-# * `erl_xcomp_ose_EPMD_LM_CONF` - epmd OSE load module configuration file
-erl_xcomp_ose_EPMD_LM_CONF="${ERL_TOP}/erts/etc/ose/etc.lmconf"
-
-# * `erl_xcomp_ose_CONFD` - OSE confd source file
-erl_xcomp_ose_CONFD="${OSEROOT}/src/ose_confd.c"
-
-# * `erl_xcomp_ose_CRT0_LM` - OSE crt0 lm source file
-erl_xcomp_ose_CRT0_LM="${OSEROOT}/src/crt0_lm.c"
-
-
-## -----------------------------------------------------------------------------
diff --git a/xcomp/erl-xcomp-sfk-linux-ose5.conf b/xcomp/erl-xcomp-sfk-linux-ose5.conf
deleted file mode 100644
index a4d64e5636..0000000000
--- a/xcomp/erl-xcomp-sfk-linux-ose5.conf
+++ /dev/null
@@ -1,305 +0,0 @@
-## -*-shell-script-*-
-##
-## %CopyrightBegin%
-##
-## Copyright Ericsson AB 2009-2012. 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%
-##
-## File: erl-xcomp-sfk-linux-ose5.conf
-## Author: Petre Pircalabu
-##
-## -----------------------------------------------------------------------------
-## When cross compiling Erlang/OTP using `otp_build', copy this file and set
-## the variables needed below. Then pass the path to the copy of this file as
-## an argument to `otp_build' in the configure stage:
-##   `otp_build configure --xcomp-conf=<FILE>'
-## -----------------------------------------------------------------------------
-
-## Note that you cannot define arbitrary variables in a cross compilation
-## configuration file. Only the ones listed below will be guaranteed to be
-## visible throughout the whole execution of all `configure' scripts. Other
-## variables needs to be defined as arguments to `configure' or exported in
-## the environment.
-
-## -- Variables needed for an OSE5 build ---------------------------------------
-OSEROOT="/vobs/ose5/system"
-HOST="linux"
-GCCVERSION="4.6.3"
-GCCROOT="${OSEROOT}/gcc_linux_x86_${GCCVERSION}"
-GCCTARGET="i386-elf"
-
-## -- Variables for `otp_build' Only -------------------------------------------
-
-## Variables in this section are only used, when configuring Erlang/OTP for
-## cross compilation using `$ERL_TOP/otp_build configure'.
-
-## *NOTE*! These variables currently have *no* effect if you configure using
-## the `configure' script directly.
-
-# * `erl_xcomp_build' - The build system used. This value will be passed as
-#   `--build=$erl_xcomp_build' argument to the `configure' script. It does
-#   not have to be a full `CPU-VENDOR-OS' triplet, but can be. The full
-#   `CPU-VENDOR-OS' triplet will be created by
-#   `$ERL_TOP/erts/autoconf/config.sub $erl_xcomp_build'. If set to `guess',
-#   the build system will be guessed using
-#   `$ERL_TOP/erts/autoconf/config.guess'.
-erl_xcomp_build=guess
-
-# * `erl_xcomp_host' - Cross host/target system to build for. This value will
-#   be passed as `--host=$erl_xcomp_host' argument to the `configure' script.
-#   It does not have to be a full `CPU-VENDOR-OS' triplet, but can be. The
-#   full `CPU-VENDOR-OS' triplet will be created by
-#   `$ERL_TOP/erts/autoconf/config.sub $erl_xcomp_host'.
-erl_xcomp_host="$GCCTARGET-ose"
-
-# * `erl_xcomp_configure_flags' - Extra configure flags to pass to the
-#   `configure' script.
-erl_xcomp_configure_flags="--disable-threads --disable-smp-support --disable-kernel-poll --disable-hipe --without-termcap --without-javac --disable-dynamic-ssl-lib --disable-shared-zlib --without-ssl --enable-static-nifs --enable-static-nifs=$ERL_TOP/lib/asn1/priv/lib/powerpc-unknown-ose/asn1rt_nif.a"
-
-## -- Cross Compiler and Other Tools -------------------------------------------
-
-## If the cross compilation tools are prefixed by `<HOST>-' you probably do
-## not need to set these variables (where `<HOST>' is what has been passed as
-## `--host=<HOST>' argument to `configure').
-
-## All variables in this section can also be used when native compiling.
-
-# * `CC' - C compiler.
-CC="$GCCROOT/bin/$GCCTARGET-gcc"
-
-# * `CFLAGS' - C compiler flags.
-CFLAGS="-g -fno-strict-aliasing -fno-builtin -fshort-wchar -Wall -Wno-unknown-pragmas -I$GCCROOT/include/c++/$GCCVERSION -I$OSEROOT/include -I$OSEROOT/include/ose_spi -I$OSEROOT/include/gcc -MD -MP -D__OSE__ -DLITTLE_ENDIAN -DCF_CONF_SIZE=0x800"
-
-# * `STATIC_CFLAGS' - Static C compiler flags.
-#STATIC_CFLAGS=
-
-# * `CFLAG_RUNTIME_LIBRARY_PATH' - This flag should set runtime library
-#   search path for the shared libraries. Note that this actually is a
-#   linker flag, but it needs to be passed via the compiler.
-#CFLAG_RUNTIME_LIBRARY_PATH=
-
-# * `CPP' - C pre-processor.
-#CPP=
-
-# * `CPPFLAGS' - C pre-processor flags.
-CPPFLAGS="-g -fno-strict-aliasing -fno-builtin -fshort-wchar -Wall -Wno-unknown-pragmas -I$GCCROOT/include/c++/$GCCVERSION -I$OSEROOT/include -I$OSEROOT/include/ose_spi -I$OSEROOT/include/gcc -MD -MP -D__OSE__ -DLITTLE_ENDIAN -DCF_CONF_SIZE=0x800"
-
-# * `CXX' - C++ compiler.
-#CXX=
-
-# * `CXXFLAGS' - C++ compiler flags.
-CXXFLAGS="-g -fno-strict-aliasing -ansi -I$GCCROOT/include/c++/$GCCVERSION -I$OSEROOT/include -I$OSEROOT/include/gcc "
-
-# * `LD' - Linker.
-LD="$GCCROOT/bin/$GCCTARGET-ld"
-
-# * `LDFLAGS' - Linker flags.
-LDFLAGS="-Wl,-ecrt0_lm -Wl,-T,$ERL_TOP/erts/emulator/sys/ose/gcc_lm_x86_$GCCVERSION.lcf"
-
-# * `LIBS' - Libraries.
-LIBS="$OSEROOT/lib/x86/libcrt.a $OSEROOT/lib/x86/libm.a $GCCROOT/lib/gcc/$GCCTARGET/$GCCVERSION/libgcc.a"
-
-## -- *D*ynamic *E*rlang *D*river Linking --
-
-## *NOTE*! Either set all or none of the `DED_LD*' variables.
-
-# * `DED_LD' - Linker for Dynamically loaded Erlang Drivers.
-#DED_LD=
-
-# * `DED_LDFLAGS' - Linker flags to use with `DED_LD'.
-#DED_LDFLAGS=
-
-# * `DED_LD_FLAG_RUNTIME_LIBRARY_PATH' - This flag should set runtime library
-#   search path for shared libraries when linking with `DED_LD'.
-#DED_LD_FLAG_RUNTIME_LIBRARY_PATH=
-
-## -- Large File Support --
-
-## *NOTE*! Either set all or none of the `LFS_*' variables.
-
-# * `LFS_CFLAGS' - Large file support C compiler flags.
-#LFS_CFLAGS=
-
-# * `LFS_LDFLAGS' - Large file support linker flags.
-#LFS_LDFLAGS=
-
-# * `LFS_LIBS' - Large file support libraries.
-#LFS_LIBS=
-
-## -- Other Tools --
-
-# * `RANLIB' - `ranlib' archive index tool.
-RANLIB="$GCCROOT/bin/$GCCTARGET-ranlib"
-
-# * `AR' - `ar' archiving tool.
-AR="$GCCROOT/bin/$GCCTARGET-ar"
-
-# * `STRIP' - `strip
-STRIP="$GCCROOT/bin/$GCCTARGET-strip"
-
-# * `GETCONF' - `getconf' system configuration inspection tool. `getconf' is
-#   currently used for finding out large file support flags to use, and
-#   on Linux systems for finding out if we have an NPTL thread library or
-#   not.
-#GETCONF=
-
-## -- Cross System Root Locations ----------------------------------------------
-
-# * `erl_xcomp_sysroot' - The absolute path to the system root of the cross
-#   compilation environment. Currently, the `crypto', `odbc', `ssh' and
-#   `ssl' applications need the system root. These applications will be
-#   skipped if the system root has not been set. The system root might be
-#   needed for other things too. If this is the case and the system root
-#   has not been set, `configure' will fail and request you to set it.
-erl_xcomp_sysroot="$OSEROOT"
-
-# * `erl_xcomp_isysroot' - The absolute path to the system root for includes
-#   of the cross compilation environment. If not set, this value defaults
-#   to `$erl_xcomp_sysroot', i.e., only set this value if the include system
-#   root path is not the same as the system root path.
-erl_xcomp_isysroot="$OSEROOT/include"
-
-## -- Optional Feature, and Bug Tests ------------------------------------------
-
-## These tests cannot (always) be done automatically when cross compiling. You
-## usually do not need to set these variables. Only set these if you really
-## know what you are doing.
-
-## Note that some of these values will override results of tests performed
-## by `configure', and some will not be used until `configure' is sure that
-## it cannot figure the result out.
-
-## The `configure' script will issue a warning when a default value is used.
-## When a variable has been set, no warning will be issued.
-
-# * `erl_xcomp_after_morecore_hook' - `yes|no'. Defaults to `no'. If `yes',
-#   the target system must have a working `__after_morecore_hook' that can be
-#   used for tracking used `malloc()' implementations core memory usage.
-#   This is currently only used by unsupported features.
-#erl_xcomp_after_morecore_hook=
-
-# * `erl_xcomp_bigendian' - `yes|no'. No default. If `yes', the target system
-#   must be big endian. If `no', little endian. This can often be
-#   automatically detected, but not always. If not automatically detected,
-#   `configure' will fail unless this variable is set. Since no default
-#   value is used, `configure' will try to figure this out automatically.
-#erl_xcomp_bigendian=
-
-# * `erl_xcomp_double_middle` - `yes|no`. No default. If `yes`, the
-#   target system must have doubles in "middle-endian" format. If
-#   `no`, it has "regular" endianness. This can often be automatically
-#   detected, but not always. If not automatically detected,
-#   `configure` will fail unless this variable is set. Since no
-#   default value is used, `configure` will try to figure this out
-#   automatically.
-#erl_xcomp_double_middle_endian
-
-# * `erl_xcomp_clock_gettime_cpu_time' - `yes|no'. Defaults to `no'. If `yes',
-#   the target system must have a working `clock_gettime()' implementation
-#   that can be used for retrieving process CPU time.
-#erl_xcomp_clock_gettime_cpu_time=
-
-# * `erl_xcomp_getaddrinfo' - `yes|no'. Defaults to `no'. If `yes', the target
-#   system must have a working `getaddrinfo()' implementation that can
-#   handle both IPv4 and IPv6.
-#erl_xcomp_getaddrinfo=
-
-# * `erl_xcomp_gethrvtime_procfs_ioctl' - `yes|no'. Defaults to `no'. If `yes',
-#   the target system must have a working `gethrvtime()' implementation and
-#   is used with procfs `ioctl()'.
-#erl_xcomp_gethrvtime_procfs_ioctl=
-
-# * `erl_xcomp_dlsym_brk_wrappers' - `yes|no'. Defaults to `no'. If `yes', the
-#   target system must have a working `dlsym(RTLD_NEXT, <S>)' implementation
-#   that can be used on `brk' and `sbrk' symbols used by the `malloc()'
-#   implementation in use, and by this track the `malloc()' implementations
-#   core memory usage. This is currently only used by unsupported features.
-#erl_xcomp_dlsym_brk_wrappers=
-
-# * `erl_xcomp_kqueue' - `yes|no'. Defaults to `no'. If `yes', the target
-#   system must have a working `kqueue()' implementation that returns a file
-#   descriptor which can be used by `poll()' and/or `select()'. If `no' and
-#   the target system has not got `epoll()' or `/dev/poll', the kernel-poll
-#   feature will be disabled.
-#erl_xcomp_kqueue=
-
-# * `erl_xcomp_linux_clock_gettime_correction' - `yes|no'. Defaults to `yes' on
-#   Linux; otherwise, `no'. If `yes', `clock_gettime(CLOCK_MONOTONIC, _)' on
-#   the target system must work. This variable is recommended to be set to
-#   `no' on Linux systems with kernel versions less than 2.6.
-#erl_xcomp_linux_clock_gettime_correction=
-
-# * `erl_xcomp_linux_nptl' - `yes|no'. Defaults to `yes' on Linux; otherwise,
-#   `no'. If `yes', the target system must have NPTL (Native POSIX Thread
-#   Library). Older Linux systems have LinuxThreads instead of NPTL (Linux
-#   kernel versions typically less than 2.6).
-#erl_xcomp_linux_nptl=
-
-# * `erl_xcomp_linux_usable_sigaltstack' - `yes|no'. Defaults to `yes' on Linux;
-#   otherwise, `no'. If `yes', `sigaltstack()' must be usable on the target
-#   system. `sigaltstack()' on Linux kernel versions less than 2.4 are
-#   broken.
-#erl_xcomp_linux_usable_sigaltstack=
-
-# * `erl_xcomp_linux_usable_sigusrx' - `yes|no'. Defaults to `yes'. If `yes',
-#   the `SIGUSR1' and `SIGUSR2' signals must be usable by the ERTS. Old
-#   LinuxThreads thread libraries (Linux kernel versions typically less than
-#   2.2) used these signals and made them unusable by the ERTS.
-#erl_xcomp_linux_usable_sigusrx=
-
-# * `erl_xcomp_poll' - `yes|no'. Defaults to `no' on Darwin/MacOSX; otherwise,
-#   `yes'. If `yes', the target system must have a working `poll()'
-#   implementation that also can handle devices. If `no', `select()' will be
-#   used instead of `poll()'.
-erl_xcomp_poll=no
-
-# * `erl_xcomp_putenv_copy' - `yes|no'. Defaults to `no'. If `yes', the target
-#   system must have a `putenv()' implementation that stores a copy of the
-#   key/value pair.
-#erl_xcomp_putenv_copy=
-
-# * `erl_xcomp_reliable_fpe' - `yes|no'. Defaults to `no'. If `yes', the target
-#   system must have reliable floating point exceptions.
-#erl_xcomp_reliable_fpe=
-
-# * `erl_xcomp_ose_ldflags_pass1` - Linker flags for the OSE module (pass 1)
-erl_xcomp_ose_ldflags_pass1="-r --no-omagic"
-
-# * `erl_xcomp_ose_ldflags_pass2` - Linker flags for the OSE module (pass 2)
-erl_xcomp_ose_ldflags_pass2="-n --emit-relocs -ecrt0_lm --no-omagic"
-
-# * `erl_xcomp_ose_OSEROOT` - OSE installation root directory
-erl_xcomp_ose_OSEROOT="$OSEROOT"
-
-# * `erl_xcomp_ose_STRIP` - Strip utility shipped with the OSE distribution
-erl_xcomp_ose_STRIP="$GCCROOT/bin/$GCCTARGET-strip"
-
-# * `erl_xcomp_ose_LM_POST_LINK` - OSE postlink tool
-erl_xcomp_ose_LM_POST_LINK="$OSEROOT/bin/$HOST/lm_post_link"
-
-# * `erl_xcomp_ose_LM_SET_CONF` - OSE load module configuration tool
-erl_xcomp_ose_LM_SET_CONF="$OSEROOT/bin/$HOST/lm_set_conf"
-
-# * `erl_xcomp_ose_LM_GET_CONF` - OSE load module elf size tool
-erl_xcomp_ose_LM_ELF_SIZE="$OSEROOT/bin/$HOST/lm_elf_size"
-
-# * `erl_xcomp_ose_LM_LCF` - OSE load module linker configuration file
-erl_xcomp_ose_LM_LCF="${ERL_TOP}/erts/emulator/sys/ose/gcc_lm_x86_$GCCVERSION.lcf"
-
-# * `erl_xcomp_ose_LM_CONF` - OSE load module default configuration file
-erl_xcomp_ose_LM_CONF="${ERL_TOP}/erts/emulator/sys/ose/default.lmconf"
-
-## -----------------------------------------------------------------------------
diff --git a/xcomp/erl-xcomp-vars.sh b/xcomp/erl-xcomp-vars.sh
index 0443867341..e864f7b96b 100644
--- a/xcomp/erl-xcomp-vars.sh
+++ b/xcomp/erl-xcomp-vars.sh
@@ -27,4 +27,4 @@
 #    and precious variables in $ERL_TOP/erts/aclocal.m4.
 #
 
-erl_xcomp_vars="erl_xcomp_sysroot erl_xcomp_isysroot erl_xcomp_bigendian erl_xcomp_double_middle_endian erl_xcomp_linux_clock_gettime_correction erl_xcomp_linux_nptl erl_xcomp_linux_usable_sigusrx erl_xcomp_linux_usable_sigaltstack erl_xcomp_poll erl_xcomp_kqueue erl_xcomp_putenv_copy erl_xcomp_reliable_fpe erl_xcomp_getaddrinfo erl_xcomp_gethrvtime_procfs_ioctl erl_xcomp_clock_gettime_cpu_time erl_xcomp_after_morecore_hook erl_xcomp_dlsym_brk_wrappers erl_xcomp_posix_memalign erl_xcomp_ose_ldflags_pass1 erl_xcomp_ose_ldflags_pass2 erl_xcomp_ose_OSEROOT erl_xcomp_ose_STRIP erl_xcomp_ose_LM_POST_LINK erl_xcomp_ose_LM_SET_CONF erl_xcomp_ose_LM_GET_CONF erl_xcomp_ose_LM_ELF_SIZE erl_xcomp_ose_LM_LCF erl_xcomp_ose_BEAM_LM_CONF erl_xcomp_ose_EPMD_LM_CONF erl_xcomp_ose_RUN_ERL_LM_CONF erl_xcomp_ose_CONFD erl_xcomp_ose_CRT0_LM"
+erl_xcomp_vars="erl_xcomp_sysroot erl_xcomp_isysroot erl_xcomp_bigendian erl_xcomp_double_middle_endian erl_xcomp_linux_clock_gettime_correction erl_xcomp_linux_nptl erl_xcomp_linux_usable_sigusrx erl_xcomp_linux_usable_sigaltstack erl_xcomp_poll erl_xcomp_kqueue erl_xcomp_putenv_copy erl_xcomp_reliable_fpe erl_xcomp_getaddrinfo erl_xcomp_gethrvtime_procfs_ioctl erl_xcomp_clock_gettime_cpu_time erl_xcomp_after_morecore_hook erl_xcomp_dlsym_brk_wrappers erl_xcomp_posix_memalign"